diff -Nru sdcc-3.1.0+dfsg/.version sdcc-3.2.0+dfsg/.version
--- sdcc-3.1.0+dfsg/.version	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/.version	2012-06-16 21:42:29.000000000 +0000
@@ -1 +1 @@
-3.1.0
+3.2.0
diff -Nru sdcc-3.1.0+dfsg/ChangeLog sdcc-3.2.0+dfsg/ChangeLog
--- sdcc-3.1.0+dfsg/ChangeLog	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/ChangeLog	2012-07-06 08:41:29.000000000 +0000
@@ -1,8 +1,3416 @@
+2012-07-06 Borut Razem <borut.razem AT gmail.com>
+
+	* src/pic16/main.c: bug patched with sdcc-3.2.0-config_fix.diff
+	  #3539804 - #pragma config and certain string constants,
+	  thanks to Herbert Potzl
+
+2012-06-30 Borut Razem <borut.razem AT gmail.com>
+
+	* support/scripts/sdcc.nsi:
+	  fixed 'Installer suggest "C:\Program Files\SDCC" instead of
+	  "C:\Program Files (x86)\SDCC"' problem
+
+2012-06-28 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/peep.c:
+	  Fix out-of-array read.
+
+2012-06-28 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* sdcc.sln,
+	* sdas/asrab/asrab.vcxproj: renamed output to sdasrab
+	* all.vcxproj: added sdasrab.exe and sdldrab.exe
+	* src/sdcc.vcxproj: removed parsing SDCC.y
+	* src/yacc.vcxproj: cosmetics
+	* sdas/as6808/m6808.h,
+	* sdas/as8051/i8051.h,
+	* sdas/asgb/gb.h,
+	* sdas/asrab/rabbit.h,
+	* sdas/asz80/z80.h: removed (conflicting) prototypes for machine and minit
+	* src/hc08/ralloc.c (packRegisters): fixed bug indicated by a warning
+	* src/pic14/gen.c (genDataPointerGet, genConstPointerGet),
+	* src/pic14/genarith.c (genAddLit),
+	* src/pic14/glue.c (pic14_constructAbsMap, emitInitVal)
+	* src/pic16/device.h (PIC16_device),
+	* src/pic16/gen.c (pic16_storeForReturn, genAnd, genXor, genAssign),
+	* src/pic16/glue.c (pic16_printIvalType, pic16_printIvalChar,
+	  pic16_printIvalBitFields, pic16_printIvalUnion),
+	* src/z80/ralloc2.cc (iy_reserved, Ainst_ok, omit_frame_ptr): fixed warnings
+
+2012-06-27 Borut Razem <borut.razem AT gmail.com>
+
+	* src/SDCC.lex:
+	  unescape file names from preprocessor, 2nd and 3rd try
+	* device/non-free/lib/pic16/libdev/Makefile.am,
+	  device/non-free/lib/pic16/libdev/Makefile.in,
+	  device/non-free/lib/pic14/libdev/Makefile.in:
+	  gputils supports all devices supported by SDCC
+
+2012-06-26 Borut Razem <borut.razem AT gmail.com>
+
+	* src/SDCC.lex, src/SDCCerr.c, src/SDCCerr.h:
+	  unescape file names from preprocessor
+
+2012-06-25 Borut Razem <borut.razem AT gmail.com>
+
+	* src/regression/Makefile:
+	  applied patch #3537593 - pic16 regression patch,
+	  thanks to Don Wooton
+
+2012-06-24 Borut Razem <borut.razem AT gmail.com>
+
+	* support/scripts/repack_release.sh: updated
+
+2012-06-24 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* src/mcs51/gen.c (genLeftShiftLiteral): commented out wassert to work
+	  around bug 3537338
+
+
+2012-06-21 Borut Razem <borut.razem AT gmail.com>
+
+	* device/non-free/lib/pic14/libdev/devices.txt,
+	  device/non-free/lib/pic14/libdev/Makefile.in,
+	  device/non-free/lib/pic14/libdev/pic16c782.c,
+	  device/non-free/lib/pic14/libdev/pic16f676.c,
+	  device/non-free/lib/pic14/libdev/pic16f1782.c,
+	  device/non-free/lib/pic14/libdev/pic16c770.c,
+	  device/non-free/lib/pic14/libdev/pic16f716.c,
+	  device/non-free/lib/pic14/libdev/pic16f1503.c,
+	  device/non-free/lib/pic14/libdev/pic16f1507.c,
+	  device/non-free/lib/pic14/libdev/pic16f1783.c,
+	  device/non-free/lib/pic14/libdev/pic16c771.c,
+	  device/non-free/lib/pic14/libdev/pic16c925.c,
+	  device/non-free/lib/pic14/libdev/pic16f1508.c,
+	  device/non-free/lib/pic14/libdev/pic16f1823.c,
+	  device/non-free/lib/pic14/libdev/pic16c432.c,
+	  device/non-free/lib/pic14/libdev/pic16c717.c,
+	  device/non-free/lib/pic14/libdev/pic16c781.c,
+	  device/non-free/lib/pic14/libdev/pic12f675.c,
+	  device/non-free/lib/pic14/libdev/pic16c926.c,
+	  device/non-free/lib/pic14/libdev/pic16f1509.c,
+	  device/non-free/lib/pic14/libdev/pic12f629.c,
+	  device/non-free/lib/pic14/libdev/pic16f684.c,
+	  device/non-free/lib/pic14/libdev/pic16f688.c,
+	  device/non-free/lib/pic14/libdev/pic16f630.c,
+	  device/non-free/lib/pic14/libdev/pic16f747.c,
+	  device/non-free/lib/pic14/libdev/pic16c946.c,
+	  device/non-free/include/pic14/pic16c782.h,
+	  device/non-free/include/pic14/pic16f676.h,
+	  device/non-free/include/pic14/pic16f1509.h,
+	  device/non-free/include/pic14/pic16c770.h,
+	  device/non-free/include/pic14/pic16f716.h,
+	  device/non-free/include/pic14/pic16f1782.h,
+	  device/non-free/include/pic14/pic16c771.h,
+	  device/non-free/include/pic14/pic16c925.h,
+	  device/non-free/include/pic14/pic16f1503.h,
+	  device/non-free/include/pic14/pic16f1507.h,
+	  device/non-free/include/pic14/pic16f1783.h,
+	  device/non-free/include/pic14/pic16c432.h,
+	  device/non-free/include/pic14/pic16c717.h,
+	  device/non-free/include/pic14/pic16c781.h,
+	  device/non-free/include/pic14/pic12f675.h,
+	  device/non-free/include/pic14/pic16c926.h,
+	  device/non-free/include/pic14/pic16f1508.h,
+	  device/non-free/include/pic14/pic16f1823.h,
+	  device/non-free/include/pic14/pic12f629.h,
+	  device/non-free/include/pic14/pic16f684.h,
+	  device/non-free/include/pic14/pic16f688.h,
+	  device/non-free/include/pic14/pic16f630.h:
+	  device/non-free/include/pic14/pic16f747.h:
+	  device/non-free/include/pic14/pic16c946.h:
+	  applied modified patch
+	  #3536909 - "Pic14 device and header upgrade.",
+	  thanks to Molnar Karoly
+	* support/scripts/inc2h.pl: applied modified patch
+	  #3536022 - "Error in the inc2h.pl program.",
+	  thanks to Molnar Karoly
+	* device/non-free/include/pic14/recreate.sh:
+	  generate NO_LEGACY_NAMES block if exists in the old version
+	* src/pic14/genarith.c: applied patch
+	  #3521376 - "pic14 incorrect asm op code",
+	  thanks to Raphael Neider
+
+2012-06-21 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/SDCCralloc.hpp,
+	  src/z80/ralloc2.c,
+	  src/z80/ralloc.h:
+	  Ugly hack to fix bug #3536902.
+
+2012-06-21 Leland Morrison <enigmalee AT sourceforge.net>
+
+	* sim/ucsim/z80.src/inst_r2k.cc:
+	  Fix flags for rl de, rr d, rr hl (merged by Philipp Klaus Krause from smallopts branch).
+
+2012-06-21 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/gen.c:
+	  Fix spilling of comitted pair after ex (sp), dd.
+
+2012-06-21 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* device/include/mcs51/cc2530.h: renamed TR0 to TESTREG0
+
+2012-06-19 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/peeph-z80.def,
+	  src/z80/peeph-r2k.def:
+	  Minor peephole fix.
+
+2012-06-18 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/SDCCopt.c,
+	  src/hc08/ralloc.c:
+	  Document relation between offsetFold() and packPointerOp().
+
+2012-06-18 Borut Razem <borut.razem AT gmail.com>
+
+	* doc/sdccman.lyx, device/include/pic14/pic14devices.txt,
+	  device/non-free/lib/pic14/libdev/devices.txt,
+	  device/non-free/lib/pic14/libdev/Makefile.in,
+	  device/non-free/include/pic14/pic16f883.h,
+	  device/non-free/include/pic14/pic16f884.h,
+	  device/non-free/include/pic14/pic16f882.h,
+	  device/non-free/lib/pic14/libdev/pic16f884.c,
+	  device/non-free/lib/pic14/libdev/pic16f882.c,
+	  device/non-free/lib/pic14/libdev/pic16f883.c:
+	  applied patch #3531530 - new CPU support (pic16f882, 883, 884),
+	  thanks to Molnar Karoly
+
+2012-06-17 Borut Razem <borut.razem AT gmail.com>
+
+	* support/scripts/sdcc.nsi:
+	  added removal of include\asm\r3ka\*.h
+	* device/non-free/include/pic14/pic16fam.h,
+	  support/scripts/pic16fam-h-gen.pl:
+	  applied patch #3531531 - The pic16fam-h-gen correction,
+	  thanks to Molnar Karoly
+	* support/scripts/repack_release.sh:
+	  remove unneeded directories produced by sdbinutils
+
+2012-06-17 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/SDCCerr.h,
+	  src/SDCCerr.c,
+	  src/SDCCval.c:
+	  Warn when encountering long long literals.
+
+2012-06-16 Leland Morrison <enigmalee AT sourceforge.net>
+
+	* sdas/asz80/z80mch.c: Change to report error for invalid operands
+	  to z180 tst instruction.
+
+2012-06-09 Borut Razem <borut.razem AT gmail.com>
+
+	* .version, sdcc.spec, doc/sdccman.lyx:
+	  changed sdcc version to 3.2.0
+
+2012-06-16 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/gen.c:
+	  Implement #3512989.
+
+2012-06-15 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/ports/pic14/support.c:
+	  Fix for renamed __asm.
+	* support/regression/tests/gcc-torture-execute-pr31169.c,
+	  support/regression/tests/bitfields.c,
+	  support/regression/tests/gcc-torture-execute-20100316-1.c,
+	  support/regression/tests/gcc-torture-execute-pr38422.c,
+	  support/regression/tests/gcc-torture-execute-921016-1.c:
+	  Disable tests that use bitfields of size greater than 8 bits, which is not yet supproted by the pic16 port.
+
+2012-06-15 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+ 	* support/regression/tests/and_survive.c:
+	  Test non-destructive and, regression test for #3534833.
+	* support/regression/tests/gcc-torture-execute-980707-1.c:
+	  Adapted and enabled test for mcs51.
+
+2012-06-14 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/gen.c:
+	  Fix cost calculation for branches.
+
+2012-06-13 Leland Morrison <enigmalee AT sourceforge.net>
+
+	* sdas/asz80/z80mch.c:  Allow the tst instruction for z180/.hd64 to
+	  use the two operand form (tst a,X) (fixes bug #3534833)
+
+2012-06-12 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCicode.c:
+	  Fix debug output for GET_VALUE_AT_ADDRESS right operand.
+
+2012-06-10 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* src/SDCCast.c (decorateType, &/|/^): optimize bool with literal,
+	  (optimizeGetAbit): prevent memory leak
+	* src/SDCCcse.c (algebraicOpts): optimize bool XOR literal
+	* src/SDCCsymt.c (computeType): also remove const from result,
+	  fixed bug 3531687 by removing wrong CHAR = ? 1 : 0 optimization to BOOL
+	* src/SDCCval.h,
+	* src/SDCCval.c (constBoolVal): new function
+	  (cheapestVal): added BOOL for 0 or 1,
+	* support/regression/tests/bug3531687.c: enabled test, removed unrelated
+	  and already covered test
+	* support/regression/tests/getbyte.c: new, added
+
+2012-06-09 Borut Razem <borut.razem AT gmail.com>
+
+	* support/regression/ports/pic14/spec.mk,
+	  support/regression/ports/pic16/spec.mk: 
+	  fixed pic -> pic14, --non-free -> --use-non-free
+
+2012-06-09 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/ralloc2.cc:
+	  Disallow source operand in h or l for >= 16-bit addition that also has a
+	  source operand on extended stack. Final part of fix for bug #3531660.
+	* support/regression/tests/bug3531687.c:
+	  Regression test for bug #3531687.
+
+2012-06-09 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCopt.c: fixed several missing def/use problems including 
+	  bug #3511517
+	* src/SDCCBBlock.c (addiCodeToeBBlock): fixed bug #3511516
+	* src/hc08/ralloc.c (packRegisters): fixed bug #3531045
+	* support/regression/tests/gcc-torture-execute-980604-1.c: reenabled
+	* support/regression/tests/gcc-torture-execute-980205.c: reenabled
+
+2012-06-07 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/main.c:
+	  Fix handling of --fomit-frame-pointer for z180, r2k and r3ka port.
+
+2012-06-07 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* src/ds390/gen.c (genAssign): no assignment for ruonly to ruonly
+	* src/SDCC.y,
+	* src/SDCCerr.c: W_COMP_RANGE, W_EMPTY_SOURCE_FILE & W_CONTROL_FLOW are pedantic
+	* src/SDCCast.c (processParms): no cast for signedness only,
+	  (resultTypePropagate): propagate for GETHBIT, GETABIT, GETBYTE & GETWORD,
+	  (decorateType: BITWISEAND): rearrange first,
+	  (decorateType: RETURN): no cast for signedness only,
+	  (optimizeGetHbit, optimizeGetAbit): use bitsForType instead of getSize and
+	   propagate resultType,
+	  (optimizeGetByte, optimizeGetWord): handle offset 0
+	* src/SDCClabel.c (deleteIfx),
+	* src/SDCCcse.c (ifxOptimize): W_CONTROL_FLOW is pedantic,
+	  (algebraicOpts: BITWISEAND, OR): use bitsForType instead of getSize
+	* src/SDCCicode.c (geniCodeLogic): W_COMP_RANGE is pedantic,
+	  (geniCodeUnary, geniCodeBinary): added param resType,
+	  (checkTypes): no cast for signedness only,
+	  (ast2iCode): propagate tree->ftype
+	* src/SDCCopt.c (optimizeCastCast): use bitsForType instead of getSize
+	* src/SDCCsymt.c (comparePtrType): only cast signedness if necessary
+	* src/SDCCsymt.h,
+	* src/SDCCicode.h: cosmetics
+
+2012-06-06 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c: fixed bugs #3531546 and #3531545
+
+2012-06-06 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Fix 16-Bit addition for interleaved pairs. Partial fix for bug #3531660.
+
+2012-06-06 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Fix POINTER_SET with surviving result partially in hl. Partial fix for bug #3531660.
+
+2012-06-06 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* device/lib/_autobaud.c: cosmetics
+	* device/lib/printfl.c: fixed bug 3513300
+
+2012-06-06 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c: Fixed bug #3531544. Fixed cast from h to hx.
+
+2012-06-05 Borut Razem <borut.razem AT gmail.com>
+
+	* support/sdbinutils/libiberty/makefile.in:
+	  excluded pex*.c files from build since pex-unix.c doesn't
+	  compile on cygwim mingw and they are not needed by sdbinutils
+	* doc/sdccman.lyx: compiler macro definitions not starting with
+	  double underscore characters are deprecated if --std-cXX
+	  command line option is defined;
+	  new compiler macros for processor definition were introduced
+	  for pic14 and pic16 targets
+
+2012-06-05 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/ralloc2.cc:
+	  Disallow surviving hl in addition with extended stack operands. Partial fix for bug #3531660.
+
+2012-06-05 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/mcs51/ralloc.c (packForPush),
+	* src/ds390/ralloc.c (packForPush),
+	* src/hc08/ralloc.c (packForPush),
+	* src/pic14/ralloc.c (packForPush),
+	* src/pic16/ralloc.c (packForPush): fixed bug #3527285
+
+2012-06-04 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Fix corner case in addition with extended stack right operand and low result byte in hl. Partial fix for bug #3531660.
+
+2012-06-04 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/ralloc2.cc:
+	  Disallow use of hl over comparison when there is an extended stack operand. Partial fix for bug #3531660.
+	* src/z80/gen.c:
+	  Save a during GET_VALUE_AT_ADDRESS when storing to extended stack operand. Partial fix for bug #3531660.
+
+2012-06-04 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c (loadRegIndex, storeRegIndexed): added missing
+	  rematOfs
+
+2012-06-03 Borut Razem <borut.razem AT gmail.com>
+
+	* src/pic14/main.c, src/pic16/main.c: re-enabled deprecated
+	  macros not starting with double underscore characters in
+	  combination with --std-cXX
+	* device/include/pic16/pic18fregs.h: modified for __SDCC_PICXXX
+
+2012-06-03 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/gen.c:
+	  Fix handling of extended stack operands in 16-bit unary minus and signed comparison. Partial fix for bug #3531660.
+
+2012-06-03 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCopt.c,
+	* src/hc08/ralloc.c: RFE 3526269 and 3526268
+
+2012-06-02 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/port.h:
+	  Fixed bug #3531540.
+
+2012-06-02 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/SDCCerr.c, src/SDCCerr.h: added W_STRING_CANNOT_BE_TERMINATED
+	  src/SDCCast.c (createIvalCharPtr): fixed #3007799: generate different warning
+	  for initializer strings that fit in buffer without terminating '\0'. According
+	  C99 $6.7.8:14 this is allowed. With --less-pedantic no warning is generated.
+	  Modified version of patch by Jan Waclawek.
+
+2012-06-02 Borut Razem <borut.razem AT gmail.com>
+
+	* src/SDCCmain.c, src/pic14/main.c, src/pic16/main.c,
+	  support/scripts/pic14fam-h-gen.pl,
+	  applied modified patch
+	  #3531337 - The pic14 port, automatically creates the -DpicXXX,
+	  thanks to Molnar Karoly
+	* support/scripts/pic16fam-h-gen.pl: modified for __SDCC_PICXXX
+	* device/non-free/include/pic14/pic14fam.h,
+	  device/non-free/include/pic16/pic16fam.h: (re)generated
+
+2012-06-01 Borut Razem <borut.razem AT gmail.com>
+
+	* doc/README.txt, doc/INSTALL.txt: updated for SDCC 3.2.0 release
+
+2012-06-01 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/peeph-z80.def,
+	  src/z80/peeph-r2k.def:
+	  Shift optimization.
+
+2012-06-01 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/gen.c:
+	  Always use 16-bit addition when an operand and the result are in hl.
+
+2012-06-01 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c: Preparations for further pointer offset
+	  optimizations. Bug fixes for certain register assignment cases
+	  in complement, unary minus, bitwise operators, and bitfield
+	  unpacking.
+
+2012-05-31 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Fix handling of a in casts, bug #3531118.
+
+2012-05-31 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* doc/sdccman.lyx:
+	  Updated manual (mostly r3ka and s08 port).
+
+2012-05-31 Borut Razem <borut.razem AT gmail.com>
+
+	* debugger/mcs51/cmd.c: fixed bug #3530998 - source code bug..
+
+2012-05-31 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCsymt.h: handle up to 8 registers per symbol for long long
+	  support
+
+2012-05-30 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/ralloc.h,
+	  src/z80/gen.c,
+	  src/z80/ralloc2.cc:
+	  More flexible handling of a during pointer access in z80-related ports.
+
+2012-05-30 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/peeph-r2k.def:
+	  Fix invalid stack-relative increment.
+	* src/z80/gen.c:
+	  More efficient handling of 16-bit stores to stack.
+
+2012-05-30 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* sim/ucsim/z80.src/inst_r2k.cc:
+	  Fix handling of carry in 16-bit shift rotate instructions.
+	* src/z80/gen.c:
+	  Better 16 bit signed comparison for z80 related (except gbz80).
+
+2012-05-30 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Allow result of GET_VALUE_AT_ADDRESS in A for z80-related ports.
+
+2012-05-30 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Improve storing of literals to stack for Rabbits.
+
+2012-05-30 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Fix multibyte global to global assignment on gbz80 with de alive.
+
+2012-05-30 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/ralloc2.cc (operand_sane): fixed erroneous rejection of
+	  single byte operand register assignment due to out of bounds
+	  dereference
+
+2012-05-29 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Fix for surviving pair in bitfield write.
+
+2012-05-29 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c,
+	  src/hc08/gen.c:
+	  Added assertions to debug rematerialization issues.
+
+2012-05-29 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/ralloc.c (moveSendToCall, packRegisters): move SEND iCodes
+	  to immediately precede their CALL/PCALL for better live range info.
+	* src/hc08/gen.c (genSend): fixed bug swapping SEND iCode order.
+
+2012-05-29 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Fixed bug #3530276.
+
+2012-05-29 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCbitv.c (bitVectSetBit, bitVectUnSetBit),
+	* src/hc08/ralloc2.cc (set_surviving_regs),
+	* src/z80/ralloc2.cc (set_surviving_regs): Prohibit negative bit
+	  position in bit vectors to avoid memory corruption
+	* device/lib/clean.mk: add s08 and r3ka ports to cleaning
+
+2012-05-28 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/gen.c:
+	  Use Rabbit's cast to bool instruction for zeroing h,
+	  more efficient loading of pairs in shifts.
+	* src/z80/peep.c:
+	  Handle bool in instruction size calculations.
+
+2012-05-28 Borut Razem <borut.razem AT gmail.com>
+
+	* src/pic16/main.c: allow underscore characters in #pragma config
+
+2012-05-26 Borut Razem <borut.razem AT gmail.com>
+
+	* src/pic16/main.c: allow space characters in #pragma config
+
+2012-05-25 Borut Razem <borut.razem AT gmail.com>
+
+	* doc/sdccman.lyx: corrected #pragma configure to #pragma config
+
+2012-05-25 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* src/hc08/gen.c (genPointerSet): fixed warning
+
+2012-05-25 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* support/scripts/sdcc.nsi: fix my typo in r3ka path
+
+2012-05-24 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/peeph-r2k.def,
+	  src/z80/peeph-z80.def,
+	  src/z80/peeph-gbz80.def:
+	  Jump optimization.
+
+2012-05-24 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/ralloc2.cc,
+	  src/z80/gen.c:
+	  Non-destructive & with bit literal.
+
+2012-05-24 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/peeph.def:
+	  Improve elimination of branches.
+
+2012-05-24 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* support/scripts/sdcc.nsi: added r3ka and s08 to installer
+	* support/sdbinutils/binutils/configure.in,
+	* support/sdbinutils/binutils/configure: fix bug #3527589
+	* src/SDCCcse.c (newCseDef): fix bug #3528899
+
+2012-05-23 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c: Preparations for further pointer offset
+	   optimizations
+
+2012-05-22 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/hc08/peeph.def:
+	  Allow disabling of tail-call and jump to return optimization.
+
+2012-05-22 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c: Fixed inconsistent offsets for 16-bit register
+	  accesses. Removed broken and unused AOP_STR type. Prohibit loading
+	  h via hx from volatile operands.
+
+2012-05-21 Philipp Klaus Krause <pkk AT spth.de>
+
+	* support/regression/tests/memory.c,
+	  src/z80/gen.c,
+	  src/port.h,
+	  src/SDCCglue.c,
+	  src/z80/main.c,
+	  src/z80/peep.c:
+	  Use lsidr for built-in memset() for r3ka.
+	* src/hc08/gen.c:
+	  Use ldhx, sthx for memory-to-memory assignment and cast.
+	* src/hc08/peeph.def:
+	  Basic tail call optimization.
+
+2012-05-21 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/hc08/gen.c:
+	  More efficient loading of H and HX for hc08 and s08.
+
+2012-05-21 Philipp Klaus Krause <pkk AT spth.de>
+
+	* support/regression/tests/setjmp.c:
+	  Enable test for r3ka.
+	* support/regression/tests/gcc-torture-execute-pr28982a.c,
+	  support/regression/tests/gcc-torture-execute-20010224-1.c,
+	  support/regression/tests/gcc-torture-execute-20030408-1.c:
+	  Disable tests for r3ka.
+	* support/regression/Makefile.in:
+	  Add ucr3ka target to z80 target.
+
+2012-05-21 Leland Morrison <enigmalee AT sourceforge.net>
+
+	* SDCCpeeph.c, peep.c: Fixed so that R2K instructions are
+	  recognized for -mr3ka target by the peephole optimizer.
+
+2012-05-20 Leland Morrison <enigmalee AT sourceforge.net>
+
+	* support/regression/Makefile.in, support/regression/ports/ucr3ka/*,
+	  support/regression/fwk/include/testfwk.h: added test-ucr3ka to
+	  run regression tests on the rabbit 3000A port
+
+2012-05-20 Leland Morrison <enigmalee AT sourceforge.net>
+
+	* device/include/sdcc-lib.h, device/include/math.h: Added conditional
+	  for rabbit 3000
+	* devince/include/asm/r3ka/features.h: Added to allow customizations
+	  for -mr3ka
+
+2012-05-20 Leland Morrison <enigmalee AT sourceforge.net>
+
+	* src/sdas/asrab/rabbitpst.c: Added mnemonics for rabbit 3000A
+	* src/sdas/asrab/rabbitmch.c: Added .r3k flag and rabbit 3000A
+	  instructions, changed much of the indentation to make gnu style,
+	  and update two functions declarations from K&R style
+	* src/sdas/asrab/rabbit.h: Added constants for rabbit 3000 support
+
+2012-05-20 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/hc08/gen.c:
+	  Emit cost information only when --fverbose-asm is used.
+
+2012-05-20 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c: Fixed yet more problems with registers possibly
+	  clobbered in division/modulus. Optimized GET_VALUE_AT_ADDRESS
+	  including handling non-zero right operand.
+	* src/hc08/ralloc.c: Allow packRegsForSupport() to optimize
+	  conditions computed for IFX. Handle non-zero right operand
+	  for GET_VALUE_AT_ADDRESS when generating pseudo symbol.
+	* src/SDCCopt.c: Let GET_VALUE_AT_ADDRESS have non-zero right
+	  operand for HC08-like ports. Fix def/use info on operands
+	  converted to integer support function calls.
+
+2012-05-20 Philipp Klaus Krause <pkk AT spth.de>
+
+	* sdccconf_in.h:
+	  Regenerated, so building with r3ka port disabled works now.
+
+2012-05-20 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/hc08/gen.c:
+	  Improved code for PCALL.
+
+2012-05-20 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/hc08/gen.c,
+	  src/hc08/ralloc2.cc:
+	  Improved code for GET_VALUE_AT_ADDRESS.
+
+2012-05-19 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/hc08/gen.c:
+	  Improve addition for hc08 and s08.
+	* src/z80/main.c:
+	  Fix name of r3ka library.
+	* src/hc08/main.c:
+	  Fix name of s08 library.
+
+2012-05-19 Philipp Klaus Krause <pkk AT spth.de>
+
+	* sim/ucsim/hc08.src/hc08.cc:
+	  Fix sthx with ext operand on s08.
+	* src/hc08/gen.c:
+	  Use ldhx, cphx and sthx with ext operands for s08 in places where we use them for hc08 with imm operands.
+
+2012-05-19 Philipp Klaus Krause <pkk AT spth.de>
+
+	* sdas/as6808/m08mch.c,
+	  sdas/as6808/m6808.h,
+	  sdas/as6808/m08pst.c,
+	  src/SDCCralloc.hpp,
+	  src/SDCCglue.c,
+	  src/hc08/main.c,
+	  src/hc08/ralloc2.cc:
+	  Asm for s08.
+
+2012-05-19 Philipp Klaus Krause <pkk AT spth.de>
+
+	* support/regression/tests/bug3223041.c:
+	  Do not handle hc08 as special case.
+
+2012-05-18 Philipp Klaus Krause <pkk AT spth.de>
+
+	* device/lib/r3ka/Makefile.in:
+	  Fix building of r3ka lib.
+	* device/lib/s08/Makefile.in:
+	  Fix building of s08 lib.
+	* support/regression/Makefile.in,
+	  support/regression/ports/s08,
+	  support/regression/fwk/include/testfwk.h,
+	  support/regression/tests/gcc-torture-execute-func-ptr-1.c,
+	  support/regression/tests/gcc-torture-execute-991112-1.c,
+	  support/regression/tests/gcc-torture-execute-921208-1.c,
+	  support/regression/tests/bug3379723.c,
+	  support/regression/tests/gcc-torture-execute-930702-1.c,
+	  support/regression/tests/float_single.c,
+	  support/regression/tests/gcc-torture-execute-20000412-2.c,
+	  support/regression/tests/gcc-torture-execute-20080529-1.c,
+	  support/regression/tests/gcc-torture-execute-20030209-1.c,
+	  support/regression/tests/gcc-torture-execute-950915-1.c,
+	  support/regression/tests/bug1723128.c,
+	  support/regression/tests/gcc-torture-execute-20001221-1.c,
+	  support/regression/tests/gcc-torture-execute-20030307-1.c,
+	  support/regression/tests/gcc-torture-execute-950612-1.c,
+	  support/regression/tests/gcc-torture-execute-20001108-1.c,
+	  support/regression/tests/cse.c:
+	  Regression testing for s08 port.
+	* device/include/stdarg.h:
+	  Fix variable arguments for s08.
+	* device/lib/_mullong.c:
+	  Fix long multiplication for s08.
+
+2012-05-18 Philipp Klaus Krause <pkk AT spth.de>
+
+	* configure.in,
+	  src/SDCCicode.c,
+	  src/SDCCsymt.c,
+	  src/SDCCmain.c,
+	  src/port.h,
+	  src/SDCCglue.c,
+	  src/hc08/main.c,
+	  src/SDCCpeeph.c,
+	  src/hc08/hc08.h,
+	  device/lib/Makefile.in,
+	  device/lib/s08:
+	  Dummy (behaves as HC08) S08 port.
+
+2012-05-18 Philipp Klaus Krause <pkk AT spth.de>
+
+	* device/include/stdarg.h,
+	  device/include/string.h,
+	  device/include/setjmp.h,
+	  device/lib/Makefile.in,
+	  configure.in,
+	  src/SDCCopt.c,
+	  src/z80/gen.c,
+	  src/z80/main.c,
+	  src/z80/z80.h,
+	  src/SDCCmain.c,
+	  src/port.h,
+	  sim/ucsim/aclocal.m4,
+	  sim/ucsim/configure,
+	  device/lib/r3ka:
+	  Dummy (behaves as Rabbit 2000/3000) Rabbit 3000A port.
+
+2012-05-17 Leland Morrison <enigmalee AT sourceforge.net>
+
+	* sim/ucsim/hc08/hc08.cc: Fix for opcodes 0xAE, 0xBE, and 0xCE op-decode
+
+2012-05-17 Philipp Klaus Krause <pkk AT spth.de>
+
+	* support/regression/tests/bug3521024.c:
+	  Regression test for bug #3521024.
+
+2012-05-17 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c: Use non-destructive bit tests when possible
+	  (rfe #3526285). Fixed loss of association between generated
+	  assembly and iCodes.
+	* src/hc08/peeph.def: Additional rules for conditional branches and
+	  to remove unused labels.
+
+2012-05-16 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* support/regression/Makefile.in: renamed test-z80 and test-gbz80 to test-rr...
+	* support/regression/ports/gbz80,
+	* support/regression/ports/rrgbz80: renamed to rrgbz80
+	* support/regression/ports/z80,
+	* support/regression/ports/rrz80: renamed to rrz80
+	* support/regression/tests/gcc-torture-execute-921013-1.c: disabled for xstack
+
+2012-05-15 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c (genAnd): added forgotten ifx->generated = TRUE
+
+2012-05-15 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* support/regression/tests/gcc-torture-execute-961017-2.c: use less loops to
+	  reduce test time
+
+2012-05-15 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* sim/ucsim/hc08.src/hc08.cc,
+	* sim/ucsim/hc08.src/inst.cc: Fixed simulation of brset/brclr. Keep
+	  track of instruction cycle times.
+	* src/hc08/gen.c (genAnd): Use brset/brclr where possible
+
+2012-05-14 Leland Morrison <enigmalee AT sourceforge.net>
+
+	* sim/ucsim/stypes.h,
+	* sim/ucsim/globals.cc: add R3KA (rabbit 3000A) processor type
+	* sim/ucsim/z80.src/r2k.cc,
+	* sim/ucsim/z80.src/simz80.cc: added initialization code for R3KA support
+	* sim/ucsim/z80.src/r2kcl.h,
+	* sim/ucsim/z80.src/inst_ed_r2k.cc: support for r3ka instructions
+	* sim/ucsim/z80.src/inst_ed.cc: change to allow overloading of inst_ed_
+
+2012-05-14 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c: correct some dry run costs, update genDivOneByte()
+	  and genModOneByte() to handle all register operand posibilities
+
+2012-05-13 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* sim/ucsim/pobj.cc,
+	* sim/ucsim/pobjcl.h: made cl_list::at inline
+	* sim/ucsim/s51.src/regs51.h: added AP
+	* sim/ucsim/s51.src/uc390.cc (inst_inc_dptr): fixed sel bug,
+	  (disass): show inc/dec dptr,
+	  (print_regs): show DPTR0, DPTR1 and AP	
+	* src/ds390/gen.c (genGenPointerGet, genGenPointerSet): fixed bug 3509705
+	* support/regression/compact-results.py: align results
+	* support/regression/tests/gcc-torture-execute-921013-1.c: enabled tests
+
+2012-05-11 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/ralloc2.cc,
+	  src/hc08/ralloc2.c:
+	  Bypass dry run for generated ic.
+
+2012-05-10 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* src/hc08/gen.h,
+	* src/hc08/gen.c (aopName): compile conditionally,
+	  (assignResultValue): MSVC has no true/false,
+	  (hasInchc08): fixed warning,
+	  (genReceive): declarations first
+	* src/hc08/ralloc.c: include dbuf_string.h,
+	  (createStackSpil): removed unused slocBuffer
+	* src/hc08/hc08.vcxproj.filters,
+	* src/hc08/hc08.vcxproj: added ralloc2.cc and boost include dir
+	* src/z80/gen.c (genCmp): fixed uninitialised warning
+	* src/SDCCicode.h: cosmetics
+
+2012-05-09 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/SDCCralloc.hpp,
+	  src/hc08/ralloc2.cc:
+	  Added some debug info code.
+
+2012-05-09 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/gen.c,
+	  src/hc08/ralloc.c:
+	  Remove some unused variables.
+
+2012-05-09 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c (aopOp): Handle spill location correctly even
+	  though it is not actually allocated during dry run
+
+2012-05-07 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/ports/ds390/spec.mk:
+	  Increase timeout from 40 to 60, since ds390 simulation on NetBSD is slow.
+
+2012-05-06 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c (aopAdrStr): handle incompletely initialized
+	  spill location symbols during dry run
+
+2012-05-06 Borut Razem <borut.razem AT gmail.com>
+
+	* .version, doc/sdccman.lyx: bumped version to 3.1.5
+	* ChangeLog: removed unicode BOM
+	* support/sdbinutils/binutils/Makefile.am,
+	  support/sdbinutils/binutils/Makefile.in:
+	  fixed the first part of bug #3518739 - Build weird behaviour...
+
+2012-05-05 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* support/regression/tests/gcc-torture-execute-pr44555.c: test was not
+	  disabled for gcc 4.4.3, now it is for all 4.x.x < 4.6.0
+
+2012-05-05 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/SDCCicode.c,
+	* src/SDCCicode.h,
+	* src/SDCCralloc.hpp,
+	* src/SDCCset.c,
+	* src/SDCCsymt.c,
+	* src/hc08/gen.c,
+	* src/hc08/gen.h,
+	* src/hc08/main.c,
+	* src/hc08/ralloc.c,
+	* src/hc08/ralloc.h,
+	* src/hc08/ralloc2.cc,
+	* src/yacc.vcxproj,
+	* src/z80/gen.c,
+	* src/z80/ralloc.c,
+	* src/z80/ralloc2.cc: Merged optralloc-hc08 branch
+
+2012-05-05 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* config.vcxproj,
+	* configure_vc.awk,
+	* doc/sdccman.lyx,
+	* sdcc_vc.h.in, sdcc_vc_in.h: renamed sdcc_vc_in.h to sdcc_vc.h.in
+	* src/SDCCval.c (byteOfVal),
+	* src/z80/gen.c (genLeftShiftLiteral, genPointerGet),
+	* src/mcs51/gen.c (genLeftShiftLiteral): fixed warnings
+	* src/SDCCnaddr.hpp: renamed cfg_node to cfg_naddr_node
+	* src/SDCCralloc.hpp: default_constructor_of_cfg_node_called and
+	  cfg_node constructor disabled to fix bug 3521407
+	* src/SDCCtree_dec.hpp: set svn properties
+	* support/regression/ports/mcs51-common/spec.mk: fixed SIM_TIMEOUT bug
+	* support/regression/tests/bug-3495411.c: enabled for mcs51
+	* support/regression/tests/gcc-torture-execute-20000622-1.c,
+	* support/regression/tests/gcc-torture-execute-20010924-1.c,
+	* support/regression/tests/gcc-torture-execute-961004-1.c,
+	* support/regression/tests/gcc-torture-execute-961125-1.c,
+	* support/regression/tests/gcc-torture-execute-990404-1.c: suppressed warnings
+
+2012-05-05 Philipp Klaus Krause <pkk AT spth.de>
+
+	* support/regression/tests/gcc-torture-execute-20080529-1.c:
+	  Disable test for gcc older than 5.0.
+
+2012-05-05 Borut Razem <borut.razem AT gmail.com>
+
+	* support/regression/ports/ds390/spec.mk,
+	  support/regression/ports/hc08/spec.mk,
+	  support/regression/ports/mcs51-common/spec.mk,
+	  support/regression/ports/pic14/spec.mk,
+	  support/regression/ports/pic16/spec.mk,
+	  support/regression/ports/ucgbz80/spec.mk,
+	  support/regression/ports/ucr2k/spec.mk,
+	  support/regression/ports/ucz180/spec.mk,
+	  support/regression/ports/ucz80/spec.mk: use SIM_TIMEOUT
+
+2012-05-04 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/ports/ucgbz80/spec.mk:
+	  Increase timeout from 20s to the 30s other ports use to get rid of NetBSD/sparc64 regression failure.
+
+2012-05-03 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/main.c,
+	  src/hc08/ralloc.c:
+	  Revive old register allocator for --oldralloc.
+
+2012-05-03 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCmain.c,
+	  src/z80/gen.c,
+	  src/z80/ralloc.c,
+	  src/z80/main.c,
+	  src/z80/z80.h,
+	  src/SDCCglobl.h:
+	  Made --oldralloc less port-specific.
+
+2012-05-03 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/z80/gen.c (aopPut3): added missing declarations
+
+2012-05-02 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/gen.c:
+	  Remove obsolete genPointerGetSetOfs().
+
+2012-05-02 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* configure: regenerated from new configure.in
+
+2012-05-02 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  More efficent storing of registers pairs to top of stack.
+
+2012-05-02 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/tests/gcc-torture-execute-20101013-1.c:
+	  Disable test until nonzero integer constants work.
+
+2012-05-02 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCval.h,
+	* src/SDCCval.c (byteOfVal): new function
+	* src/z80/gen.c (aopGet, gencjneshort),
+	* src/SCCglue.c (aopLiteralLong): use byteOfVal() to access value
+	* configure.in,
+	* sdcc_vc_in.h,
+	* sdccconf_in.h: find/define appropriate 64-bit integer
+	* src/SDCCsymt.h: start of support for 64-bit literal
+
+2012-04-30 Leland Morrison <enigmalee AT sourceforge.net>
+
+	* sim/ucsim/app.cc:  reduced the frequency of checks for user input
+	
+2012-04-26 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/gen.c:
+	  Improve code generation for comparison to zero.
+
+2012-04-26 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/librarian/sdcclib.c:
+	  Do not depend on PATH_MAX, fix #3521650.
+	* sdas/asxxsrc/asxxxx.h:
+	  Use FILENAME_MAX if PATH_MAX is not defined.
+
+2012-04-28 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c: Optimize access to h/hx on top of stack. Compute
+	  cost of SEND.
+	* src/hc08/ralloc2.cc: Compute cost of SEND. Support xa and ax
+	  with GETBYTE and GETWORD.
+
+2012-04-26 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c: Rewrite genSend to fix problem with register
+	  clobbering. Allow use of tsx with function return values.
+	* src/hc08/ralloc.c: Removed unneed constraint on stack operands
+
+2012-04-25 Borut Razem <borut.razem AT gmail.com>
+
+	* src/common.h, src/ds390/main.c: include SDCCsystem.h in common.h
+	* src/SDCCmain.c: added newline at end of file
+	* src/SDCCicode.c: use TRUE instead of undefined true
+	* src/SDCCicode.h: fixed declaration of isOperandLiteral()
+
+2012-04-25 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/peeph-gbz80.def:
+	  Removed peephole that resulted in invalid or operand on gbz80.
+
+2012-04-24 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Fix #3521024.
+
+2012-04-25 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c: Fixed bug with cpx use. Optimize stack adjustments
+	  of +/-1. Use mov #0 instead of clr with volatile operands to avoid
+	  read side effect. Avoid using x as stack frame base unless it saves
+	  clock cycles.
+
+2012-04-24 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCicode.c,
+	  src/SDCCopt.c,
+	  src/z80/gen.c:
+	  GET_VALUE_AT_ADDRESS with offset for z80, z180 and r2k.
+
+2012-04-24 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c: Index stack frame via x instead of sp when convenient
+
+2012-04-22 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c: Use msb to lsb order in assignment for compatibility
+	  with hardware hardware registers. Expanded use of cpx and ldhx
+	  instructions. Removed some old unused code. Fixed a stack bug in
+	  genPlusIncr.
+
+2012-04-23 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCicode.c:
+	  Enable replacing division by power of two by conditional addition and shift (for hc08, z80, z180, gbz80 and r2k).
+	* src/z80/gen.c,
+	  src/mcs51/gen.c:
+	  Fortify a "/* I assume that [...]" comment by an assertion that would have saved me some time.
+
+2012-04-20 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/main.c:
+	  Enable CSE for an approx. 0.1-0.2% code size reduction.
+
+2012-04-22 Raphael Neider <rneider AT web.de>
+
+	* device/lib/pic16/libsdcc/gptr/eeprom{8,16}_gptrput[1234].c:
+	  fix accessing EECON1.WREN
+
+2012-04-22 Raphael Neider <rneider AT web.de>
+
+	* device/non-free/lib/pic14/libdev/Makefile.in:
+	  build 16f72[01] only if --enable-new-pics is given, as the
+	  devices are not supported in the current gputils release 0.14.1
+
+2012-04-21 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* src/ds390/main.c: undo removed include to fix implicit declaration
+
+2012-04-21 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/SDCCicode.c:
+	  Preparations for replacing division by power of two by conditional addition and shift.
+	* support/regression/tests/longlong.c,
+	  support/regression/tests/gcc-torture-execute-pr42269-2.c,
+	  support/regression/tests/gcc-torture-execute-20080529-1.c,
+	  support/regression/tests/gcc-torture-execute-950503-1.c,
+	  support/regression/tests/float_single.c:
+	  Enable more tests for hc08.
+
+2012-04-22 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c: fix bugs in genRLC, genRRC, and genJumpTab; support large stack
+	  offsets in rmwWithAop; optimized asmopToBool
+	* src/hc08/ralloc.c: fix bug in findAssignToSym
+
+2012-04-20 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/ralloc2.cc,
+	  src/hc08/gen.c:
+	  Allow some use of ax.
+
+2012-04-20 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/ralloc2.cc,
+	  src/hc08/gen.c:
+	  Remove accuse.
+
+2012-04-19 Raphael Neider <rneider AT web.de>
+
+	* device/lib/pic16/libc/stdio/strmmssp.c:
+	  fixed use of access bank vs. BSR
+
+	* device/lib/pic16/libsdcc/gptr/eeprom{8,16}_gptr{get,put}[1234].c,
+	  device/lib/pic16/libsdcc/gptr/eeprom{8,16}_write.c:
+	  implement EEPROM read/write access
+
+	* device/lib/pic16/libsdcc/gptr/gptr{get,put}[1234].c:
+	  call EEPROM dispatchers on EEPROM accesses
+
+	* device/lib/pic16/libsdcc/Makefile.am:
+	  add gptr EEPROM accessors
+
+	* device/non-free/lib/pic16/libdev/gptr/*:
+	  dispatch EEPROM accesses to the appropriate implementations
+	  based on device capabilities (no eeprom, 8 or 16 bit EEPROM
+	  address space)
+
+	* device/non-free/lib/pic16/libdev/mkmk.sh,
+	  device/non-free/lib/pic16/libdev/newdevices.txt:
+	  improved to automatically add SSPBUF workaround
+	  plus EEPROM dispatchers as required by the devices
+
+	* device/non-free/lib/pic16/libdev/pic18f1330.c,
+	  device/non-free/lib/pic16/libdev/pic18f1220.c,
+	  device/non-free/lib/pic16/libdev/pic18f4450.c:
+	  removed manual SSPBUF workaround
+
+	* device/non-free/lib/pic16/libdev/fake_sspbuf.c:
+	  provide automatic SSPBUF workaround
+
+	* device/lib/pic16/libsdcc/Makefile.in,
+	  device/non-free/lib/pic16/libdev/Makefile.am,
+	  device/non-free/lib/pic16/libdev/Makefile.in:
+	  regenerated
+
+2012-04-20 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/ralloc2.cc,
+	  src/hc08/gen.c:
+	  Made hc08 code generation more robust wrt. surviving registers and register operands.
+
+2012-04-19 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c: rewrite genCast for register source/results
+
+2012-04-19 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/ralloc2.cc,
+	  src/hc08/gen.c:
+	  Fixes for the cost function (reducing code size and exposing code generation issues).
+
+2012-04-19 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/ralloc2.cc,
+	  src/hc08/gen.c:
+	  Made hc08 code generation more robust wrt. surviving registers and register operands.
+
+2012-04-19 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/gen.c:
+	  Preparations for removing accuse.
+
+2012-04-19 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/ralloc2.cc,
+	  src/hc08/gen.c:
+	  Fix xa to hx assignment.
+
+2012-04-19 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/ralloc2.cc:
+	  Fix assignment of nRegs and regs for accuse symbols.
+
+2012-04-19 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c: fixed div/mod sign ext. to work with register result
+
+2012-04-18 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/ralloc2.cc,
+	  src/hc08/gen.c:
+	  Made hc08 code generation more robust wrt. surviving registers and register operands.
+
+2012-04-17 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/ralloc2.cc,
+	  src/hc08/gen.c:
+	  Made hc08 code generation more robust wrt. surviving registers and register operands.
+
+2012-04-16 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/ralloc2.cc,
+	  src/hc08/gen.c:
+	  Handling of pointer access in new allocator.
+
+2012-04-16 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCralloc.hpp,
+	  src/SDCCicode.c,
+	  src/SDCCicode.h,
+	  src/z80/ralloc2.cc,
+	  src/hc08/gen.h,
+	  src/hc08/ralloc2.cc,
+	  src/hc08/gen.c:
+	  Improve hc08 cost function.
+
+2012-04-16 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/ralloc2.cc,
+	  src/hc08/gen.c:
+	  Made hc08 code generation more robust wrt. surviving registers and register operands.
+
+2012-04-14 Raphael Neider <rneider AT web.de>
+
+	* src/pic16/genarith.c (pic16_genMult8XLit_n,pic16_genMult8X8_n):
+	  work around early clobbering of input operands, fixes #3515677;
+	  clean up, eliminate dead code
+
+2012-04-14 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c: fix isDead status for register H
+
+2012-04-13 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCralloc.hpp,
+	  src/hc08/ralloc2.cc,
+	  src/hc08/gen.c:
+	  Made hc08 code generation more robust wrt. surviving registers and register operands.
+
+2012-04-13 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/ralloc.h,
+	  src/hc08/ralloc2.cc,
+	  src/hc08/gen.c,
+	  src/z80/ralloc2.cc:
+	  Introduce isDead for hc08 registers.
+
+2012-04-13 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c (asmOp): always keep pointer to operand in asmop
+	* src/hc08/ralloc2.cc (instruction_cost): reenable !, IFX, and CAST
+
+2012-04-13 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCsymt.c (newBoolLink): return bool instead of bit if no
+	  bit memory.
+	* src/hc08/gen.c: Fixed no register assigned to iTemp for IFX.
+	  Guarded more instances of emitLabel for dry run
+
+2012-04-12 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/gen.c:
+	  Fix genPointerGet with postincrement and result in h.
+
+2012-04-12 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/tests/gcc-torture-execute-920428-1.c:
+	  Reformatted test.
+
+2012-04-12 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/gen.c:
+	  Fix handling of isFree for register operands.
+
+2012-04-12 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/gen.c:
+	  More flexible use of A in cast.
+
+2012-04-12 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/ralloc2.cc:
+	  Fix checking of XA and reenable use of assignment.
+	* src/hc08/gen.c:
+	  Additional debugging output.
+
+2012-04-12 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCset.c:
+	  Additional assertion.
+	* src/hc08/ralloc.c:
+	  Avoid buffer overflow.
+	* src/hc08/ralloc2.cc:
+	  Do not use assignment for now.
+
+2012-04-12 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCicode.h,
+	  src/SDCCicode.c:
+	  Made isOperandLiteral() work on const operand *.
+
+2012-04-12 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/hc08/ralloc.c:
+	  Cleanup.
+	* src/hc08/gen.c:
+	  Made genDjnz() more flexible.
+	* src/hc08/ralloc2.cc:
+	  Disallow X, A for now.
+
+2012-04-12 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCralloc.hpp,
+	  src/z80/ralloc2.cc,
+	  src/hc08/ralloc2.cc:
+	  Make optimal register allocator less port-specific.
+
+2012-04-11 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCralloc.hpp,
+	  src/z80/gen.c,
+	  src/hc08/ralloc2.cc,
+	  src/hc08/gen.c,
+	  src/hc08/ralloc.c,
+	  src/SDCCicode.c:
+	  Optimal register allocator for hc08 working partially.
+
+2012-04-11 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCcse.c (ifOperandsHave): fixed bug #3516746
+
+2012-04-11 Philipp Klaus Krause <pkk AT spth.de>
+
+	* support/regression/tests/string.c:
+	  Added test for strrchr().
+	* src/z80/gen.c,
+	  src/SDCCpeeph.c:
+	  Fixed memory leaks.
+
+2012-04-10 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCralloc.hpp,
+	  src/z80/ralloc.c,
+	  src/hc08/ralloc.c,
+	  src/hc08/gen.c:
+	  Enable new allocator as dummy, spilling everything.
+
+2012-04-10 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/ralloc.c,
+	  src/hc08/ralloc2.cc,
+	  src/hc08/ralloc.c:
+	  Preparations for optimal register allocation for hc08.
+
+2012-04-09 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* support/regression/Makefile.in,
+	  support/regression/collate-results.py : another fix for bug #3477347
+	* support/regression/ports/hc08/spec.mk: increase timeout to 30 seconds
+
+2012-04-08 Borut Razem <borut.razem AT gmail.com>
+
+	* src/SDCCgen.c:
+	  don't emit leading whitespaces in inline asm, 2nd try
+	  fixed bug #3515390 - asm with leading whitespace passed to backends
+	* src/z80/peep.c: made z80instructionSize() function more
+	  ropbust: accept arbitrary number of arbitrary space characters
+	  between mnemonic and the first operand
+
+2012-04-07 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/ralloc2.cc:
+	  Fix invalid reads.
+	* src/z80/gen.c:
+	  Fix a memory leak.
+
+2012-04-07 Borut Razem <borut.razem AT gmail.com>
+
+	* src/common.h, SDCCglobal.h: fixed mingw32 build on derna:
+	  macros min and max should not be defined when compiled with C++
+	* src/pic16/device.c, src/pic16/genarith.c, src/pic16/gen.c,
+	  src/pic16/pcode.c, src/pic16/glue.c:
+	  applied patch #3515647 - Correction patch on the PIC16's branch,
+	  thanks to Molnar Karoly
+
+2012-04-07 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/SDCCralloc.hpp:
+	  Additional assertion to track down #3475617 and #3506333.
+
+2012-04-06 Borut Razem <borut.razem AT gmail.com>
+
+	* src/SDCCgen.c, src/SDCCgen.h, src/SDCCralloc.hpp, src/common.h,
+	  src/mcs51/gen.c, src/pic14/gen.c, src/z80/gen.c,
+	  src/pic16/gen.c, src/ds390/gen.c, src/hc08/gen.c:
+	  fixed NetBSD sparc64 build, code beautification,
+	  additional unification of target code generation
+	* support/cpp/configure.in, support/cpp/configure,
+	  support/cpp/system.h: fixed sdcc configure include paths
+	* src/SDCCgen.c: don't emit leading whitespaces in inline asm;
+	  fixed bug #3515390 - asm with leading whitespace passed to backends
+
+2012-04-05 Philipp Klaus Krause <pkk AT spth.de>
+
+	* support/regression/tests/gcc-torture-execute-20080529-1.c:
+	  Disable test for gcc older than 5.0.
+	* src/z80/ralloc2.cc,
+	  src/SDCCralloc.hpp,
+	  src/z80/gen.h,
+	  src/z80/gen.c:
+	  Made optimal allocator less z80-specific.
+
+2012-04-04 Borut Razem <borut.razem AT gmail.com>
+
+	* support/cpp/system.h, support/cpp/libiberty/filenames.h,
+	  support/cpp/libiberty/md5.c, support/cpp/libiberty/obstack.h:
+	  sdcpp partially synchronized with GCC CPP release version 4.7.0
+	* support/cpp/sdcpp.vcxproj: enhancements, added custom build messages
+
+2012-04-03 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/SDCCralloc.hpp:
+	  Additional assertions to track down #3475617 and #3506333.
+
+2012-04-02 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/SDCCsymt.c
+	  src/z80/main.c
+	  src/hc08/main.c
+	  src/hc08/gen.c
+	  src/hc08/ralloc.c
+	  device/include/stdint.h
+	  device/lib/_rlslonglong.c
+	  device/lib/_divslonglong.c
+	  device/lib/z180/Makefile.in
+	  device/lib/z180/stubs.s
+	  device/lib/_mullonglong.c
+	  device/lib/_rrslonglong.c
+	  device/lib/z80/Makefile.in
+	  device/lib/z80/stubs.s
+	  device/lib/gbz80/stubs.s
+	  device/lib/gbz80/Makefile.in
+	  device/lib/_rlulonglong.c
+	  device/lib/Makefile.in
+	  device/lib/_divulonglong.c
+	  device/lib/_divslonglong_rrx_s.c
+	  device/lib/_rrslonglong_rrx_s.c
+	  device/lib/_divulonglong_rrx_s.c
+	  device/lib/_rrulonglong_rrx_s.c
+	  device/lib/_rrulonglong.c
+	  device/lib/_rlslonglong_rrx_s.c
+	  device/lib/r2k/Makefile.in
+	  device/lib/r2k/stubs.s
+	  device/lib/_rlulonglong_rrx_s.c
+	  device/lib/hc08/Makefile.in
+	  device/lib/hc08/_ret.c
+	  support/regression/tests/gcc-torture-execute-991216-1.c
+	  support/regression/tests/gcc-torture-execute-pr47337.c
+	  support/regression/tests/gcc-torture-execute-991216-2.c
+	  support/regression/tests/gcc-torture-execute-pr20187-1.c
+	  support/regression/tests/gcc-torture-execute-20000121-1.c
+	  support/regression/tests/gcc-torture-execute-960801-1.c
+	  support/regression/tests/gcc-torture-execute-930111-1.c
+	  support/regression/tests/gcc-torture-execute-20001112-1.c
+	  support/regression/tests/gcc-torture-execute-20101013-1.c:
+	  long long for hc08.
+	* src/z80/gen.c,
+	  support/regression/tests/gcc-torture-execute-pr47337.c,
+	  support/regression/tests/gcc-torture-execute-961213-1.c:
+	  Fixed bug #3513892.
+	* src/SDCCralloc.hpp:
+	  Additional assertions to track down #3475617.
+	* src/z80/ralloc.c:
+	  Assertion for local variables outside of functions.
+
+2012-04-01 Philipp Klaus Krause <pkk AT spth.de>
+
+	* device/lib/Makefile.in,
+	  device/lib/*/Makefile.in,
+	  device/lib/*/stubs.s,
+	  device/lib/_divslonglong_rrx_s.c,
+	  device/lib/_rrslonglong_rrx_s.c,
+	  support/regression/tests/gcc-torture-execute-20101013-1.c,
+	  support/regression/tests/gcc-torture-execute-950512-1.c:
+	  long long division.
+	* support/regression/tests/gcc-torture-execute-920612-1.c,
+	  support/regression/tests/gcc-torture-execute-920711-1.c:
+	  Disable tests for gcc older than 5.0.
+	* support/regression/tests/longlong.c,
+	  support/regression/tests/gcc-torture-execute-960801-1.c,
+	  support/regression/tests/longlong.c:
+	  Disable long long tests since they fail on 32-bit systems.
+
+2012-03-31 Borut Razem <borut.razem AT gmail.com>
+
+	* src/SDCCgen.c, src/SDCCgen.h, src/ds390/gen.c,
+	  src/ds390/main.c, src/hc08/gen.c, src/hc08/main.c,
+	  src/mcs51/gen.c, src/pic14/gen.c, src/pic16/gen.c,
+	  src/z80/gen.c, src/z80/gen.h:
+	  introduced labelKey2num label handling macro
+
+2012-03-30 Borut Razem <borut.razem AT gmail.com>
+
+	* src/common.h, src/Makefile.in, src/SDCCgen.c, src/SDCCgen.h,
+	  src/SDCCasm.c, src/SDCCasm.h, src/SDCCdebug.c,
+	  src/SDCCdebug.h, src/SDCCpeeph.c, src/SDCCpeeph.h,
+	  src/avr/gen.c, src/ds390/gen.c, src/ds390/gen.h,
+	  src/ds390/main.c, src/ds390/main.h, src/hc08/gen.c,
+	  src/mcs51/gen.c, src/mcs51/main.c, src/mcs51/main.h,
+	  src/pic14/gen.c, src/pic16/gen.c, src/z80/gen.c,
+	  sdcc_vc_in.h, src/sdcc.vcxproj, src/sdcc.vcxproj.filters:
+	  unification of target code generation
+
+2012-03-30 Philipp Klaus Krause <pkk AT spth.de>
+
+	* device/lib/z180/stubs.s,
+	  device/lib/z80/stubs.s,
+	  device/lib/gbz80/stubs.s,
+	  support/regression/tests/longlong.c,
+	  support/regression/tests/gcc-torture-execute-*.c:
+	  Made TODO comments more specific wrt. to what sdcc functionality is required for enabling the test, enabled more long long tests.
+
+2012-03-30 Borut Razem <borut.razem AT gmail.com>
+
+	* configure.in, configure, sdccconf_in.h:
+	  added check if c supports tags in unnamed struct,
+	  fixed IS_VALID_OPTION
+	* sim/ucsim/configure.in, sim/ucsim/configure:
+	  fixed IS_VALID_OPTION
+	* sim/ucsim/aclocal.m4: regenerated
+	* src/pic14/Makefile.in: removed unneeded PORT
+
+2012-03-30 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/gen.c:
+	  Fix for returning long long, fixes #3512403.
+	* device/lib/z180/stubs.s,
+	  device/lib/z80/stubs.s,
+	  device/lib/gbz80/stubs.s,
+	  support/regression/tests/longlong.c:
+	  More tests for long long.
+	* support/regression/tests/gcc-torture-execute-*.c:
+	  Made TODO comments more specific wrt. to what sdcc functionality is required for enabling the test.
+	* device/lib/_rrslonglong_rrx_s.c,
+	  device/lib/_rrulonglong_rrx_s.c,
+	  device/lib/_rlulonglong_rrx_s.c:
+	  Fixes for long long shift.
+
+2012-03-29 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCsymt.c (initCSupport),
+	  device/lib/_rrslonglong_rrx_s.c,
+	  device/lib/_rrulonglong_rrx_s.c:
+	  Fixed declarations for shift support functions.
+	* device/lib/*z*/Makefile.in,
+	  device/lib/Makefile.in,
+	  device/lib/_r??longlong_rrx_s.c,
+	   device/lib/_mullonglong.c:
+	  Shift and multiplication support for long long.
+
+2012-03-29 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c,
+	  src/z80/ralloc2.cc:
+	  More flexible use of de for gbz80.
+
+2012-03-29 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCsymt.c (initCSupport): fixed declarations for shift support functions
+	* src/SDCCsymt.c (initBuiltIns),
+	  src/SDCCast.c (funcOfTypeVarg),
+	  src/SDCCast.h: added some const qualifiers 
+
+2012-03-29 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/gen.c,
+	  src/z80/ralloc2.cc:
+	  More flexible use of de for gbz80.
+
+2012-03-28 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/ralloc2.cc:
+	  Allow some use of de on gbz80.
+	* src/z80/gen.c:
+	  gbz80 >> fix.
+	* device/lib/_rrslonglong_rrx_s.c,
+	  device/lib/_rrulonglong_rrx_s.c:
+	  Support functions for shifting long long.
+
+2012-03-28 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/ralloc2.cc,
+	  src/z80/ralloc.c,
+	  src/z80/z80.h:
+	  Remove support for using the old allocator for A, while using the new allocator for other registers.
+
+2012-03-28 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/z80.h:
+	  Enabled exact cost function for gbz80.
+	* src/z80/gen.c:
+	  Fixed a gbz80 comparison bug.
+
+2012-03-28 Borut Razem <borut.razem AT gmail.com>
+
+	* src/SDCCval.c, src/SDCCval.h, src/SDCCicode.c:
+	  double2ul converted from macro to a function
+
+2012-03-28 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Better support for returning long long, now works for gbz80, too.
+
+2012-03-28 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Better assignment for large variables.
+	* src/z80/peep.c:
+	  Fix code size calculation bug.
+
+2012-03-28 Borut Razem <borut.razem AT gmail.com>
+
+	* configure.in, configure, sdccconf_in.h,
+	  sim/ucsim/configure.in, sim/ucsim/configure,
+	  sim/ucsim/ddconfig_in.h:
+	  use AC_C_BIGENDIAN instead of SDCC_BUILD_BIGENDIAN
+	* support/cpp/config.in: regenerated
+	* custom_in.h, sim/ucsim/custom_in.h: removed
+
+2012-03-28 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* device/include/stdint.h:
+	  Use long long for intmax_t where available.
+
+2012-03-28 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* support/regression/tests/gcc-torture-execute-981001-1.c: Revert my
+	  previous edit since it was not needed
+
+2012-03-28 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c,
+	  support/regression/tests/longlong.c:
+	  Fixed returning long long, and reenabled test.
+
+2012-03-28 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* support/regression/tests/gcc-torture-execute-981001-1.c: Only use
+	  __reentrant for SDCC and not for test-host
+	* support/regression/tests/gcc-torture-execute-930106-1.c: Reenabled
+
+2012-03-28 Philipp Klaus Krause <pkk AT spth.de>
+
+	* support/regression/tests/gcc-torture-execute-981001-1.c:
+	  Fixed #3511512 / #3511513.
+
+2012-03-27 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/SDCCsymt.c,
+	  src/z80/gen.c,
+	  support/regression/tests/gcc-torture-execute-960801-1.c,
+	  support/regression/tests/longlong.c:
+	  Support for returning long long and unsigned long long in z80, z180 and r2k port.
+
+2012-03-26 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Fixed stack unbalance bug.
+
+2012-03-26 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCasm.c (FileBaseName): fixed bug 3511092
+
+2012-03-26 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/tests/gcc-torture-execute-9*.c:
+	  Added some more tests from the execute part of the gcc torture regression test suite.
+
+2012-03-26 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/mcs51/ralloc.c (packForPush),
+	  src/ds390/ralloc.c (packForPush),
+	  src/hc08/ralloc.c (packForPush): fixed bug #3502628
+	* support/regression/tests/gcc-torture-execute-20010403-1.c: reenabled
+	* src/hc08/ralloc.c (packRegisters, packForPush): use packForPush
+	  for SEND iCodes too.
+
+2012-03-25 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* src/mcs51/ralloc.c (packForPush): fixed bug 3502621
+	* support/regression/tests/gcc-torture-execute-20030117-1.c: enabled test
+
+2012-03-25 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCast.c (isConformingBody): fixed bug #3509715
+	* support/regression/tests/gcc-torture-execute-930513-2.c: reenabled
+	* src/SDCCast.c (decorateType): fixed bug #3509713
+	* support/regression/tests/gcc-torture-execute-930429-1.c: reenabled
+	* src/SDCCicode.c (geniCodeAssign): fixed bug #3509712
+	* support/regression/tests/gcc-torture-execute-921016-1.c: reenabled
+	* src/SDCCopt.c (optimizeCastCast): fixed bug #3509711
+	* support/regression/tests/gcc-torture-execute-921218-1.c: reenabled
+
+2012-03-24 Borut Razem <borut.razem AT gmail.com>
+
+	* support/makebin/makebin.c: applied modified patch
+	  #3510671 - [makebin / gbz80] add nintendo logo info in ROM header,
+	  thanks to Noel Lemouel
+
+2012-03-24 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* support/regression/Makefile.in,
+	  support/regression/ports/ds390/spec.mk,
+	  support/regression/ports/hc08/spec.mk,
+	  support/regression/ports/mcs51-common/spec.mk,
+	  support/regression/ports/pic14/spec.mk,
+	  support/regression/ports/pic16/spec.mk,
+	  support/regression/ports/ucgbz80/spec.mk,
+	  support/regression/ports/ucr2k/spec.mk,
+	  support/regression/ports/ucz180/spec.mk,
+	  support/regression/ports/ucz80/spec.mk,
+	  support/regression/ports/xa51/spec.mk: attempt to fix bug #3477347
+	  
+2012-03-24 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCcse.h,
+	  src/SDCCcse.c: handle possible pointer aliasing more conservatively
+	* src/z80/gen.c (genFunction): reset stack.pushed at function start too
+
+2012-03-22 Philipp Klaus Krause <pkk AT spth.de>
+
+	* support/regression/tests/gcc-torture-execute-941021-1.c:
+	  Disable test for gcc older than 5.0.
+
+2012-03-22 Borut Razem <borut.razem AT gmail.com>
+
+	* doc/sdccman.lyx: double underlined keywords,
+	  fixed bug #3510011 - Wrong keyword
+	* src/sdcc.vcxproj, src/sdcc.vcxproj.filters:
+	  added some missing header files
+
+2012-03-22 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCsymt.h,
+	  src/SDCCsymt.c (initCSupport, typeFromStr, printTypeChainRaw),
+	  src/SDCCopt.c (cnvToFloatCast, cnvToFixed16x16Cast, cnvFromFloatCast, 
+	  cnvFromFixed16x16Cast, convilong): ongoing upgrades for long long type
+
+2012-03-22 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/gen.c (transferAopAop): fixed bug 3509707
+	* support/regression/tests/gcc-torture-execute-930603-1.c: reenabled
+
+2012-03-21 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/tests/gcc-torture-execute-92*,
+	  support/regression/tests/gcc-torture-execute-93*,
+	  support/regression/tests/gcc-torture-execute-94*:
+	  Added some more tests from the execute part of the gcc torture regression test suite.
+
+2012-03-20 Borut Razem <borut.razem AT gmail.com>
+
+	* src/mcs51/gen.c, src/SDCCasm.c, src/SDCCasm.h, src/z80/gen.c,
+	  src/SDCCutil.c, src/ds390/gen.c, src/hc08/gen.c:
+	  code cleaning, optimization, ...
+
+2012-03-20 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* device/include/stdint.h,
+	  device/include/string.h,
+	  device/include/stddef.h,
+	  device/include/stdlib.h,
+	  device/include/stdio.h,
+	  device/include/time.h,
+	  device/include/errno.h:
+	  rsize_t, errno_t, constraint_handler_t, RSIZE_MAX from annex K (bounds-checking) of the C11 standard.
+
+2012-03-19 Borut Razem <borut.razem AT gmail.com>
+
+	* src/SDCC.lex, doc/sdccman.lyx: removed asm() pseudo function
+	  since it is not standard-compliant
+
+2012-03-19 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCpeeph.c:
+	  Handle gbz80 (hl+) and (hl-).
+
+2012-03-19 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* support/regression/Makefile.in,
+	  support/regression/collate-results.py: Summarize any failures in a
+	  nicer format instead of all run together on one line
+	* src/ds390/gen.c (genPlusIncr): fix problem with dereferencing a
+	  generic pointer via a struct losing pointer type byte
+
+2012-03-18 Borut Razem <borut.razem AT gmail.com>
+
+	* doc/sdccman.lyx,src/avr/gen.c, src/ds390/gen.c,
+	  src/hc08/gen.c, src/mcs51/gen.c, src/pic14/gen.c,
+	  src/pic16/device.c, src/pic16/gen.c, src/pic16/glue.c,
+	  src/pic16/pcode.c, src/SDCC.lex, src/SDCC.y, src/SDCCast.c,
+	  src/SDCCglue.c, src/SDCCsymt.h, src/SDCCutil.c,
+	  src/SDCCutil.h, src/SDCCval.c:
+	  implemented feature request #2815320 - please add asm()
+	  pseudo function as alternate
+	* sdcc.sln, src/sdcc.vcxproj, src/sdcc.vcxproj.filters,
+	  src/yacc.vcxproj:
+	  re-itroduced yacc project
+	* .version, doc/sdccman.lyx: bumped version to 3.1.4
+	* config.vcxproj, src/ds390/ds390.vcxproj,
+	  src/hc08/hc08.vcxproj, src/mcs51/mcs51.vcxproj,
+	  src/pic14/pic14.vcxproj, src/pic16/pic16.vcxproj,
+	  src/sdcc.vcxproj, src/yacc.vcxproj, src/z80/z80.vcxproj,
+	  all.vcxproj, all.vcxproj.filters:
+	  VS project enhancements
+	* src/SDCC.y, src/SDCCsymt.h, src/SDCCutil.c, src/SDCCutil.h,
+	  src/SDCCval.c: fixed flaws in previous commit
+	* src/SDCCsymt.c, src/pic14/glue.c, src/cdbFile.c:
+	  fixed printing size_t type numbers
+
+2012-03-18 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* src/ds390/gen.c (aopGet, aopPut),
+	* src/mcs51/gen.c (aopGet, aopPut): fixed bug 3496842
+	* support/regression/tests/sfr16.c: enabled test and fixed for ds390
+
+2012-03-17 Borut Razem <borut.razem AT gmail.com>
+
+	* support/regression/tests/strstr.c,
+	  support/regression/tests/strcpy.c,
+	  support/regression/tests/strcmp.c,
+	  support/regression/tests/strtok.c,
+	  support/regression/tests/strncmp.c,
+	  support/regression/tests/strspn.c,
+	  support/regression/tests/strpbrk.c,
+	  support/regression/tests/string.c:
+	  merged strstr.c, strcpy.c, strcmp.c, strtok.c, strncmp.c,
+	  strspn.c, and strpbrk.c to string.c, added test for
+	  bug #3506236
+
+2012-03-16 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* sdas/linksrc/lkarea.c (lnksect2): applied fix from Tim Schuerewegen
+	  (bug 3495316)
+
+2012-03-16 Borut Razem <borut.razem AT gmail.com>
+
+	* sdcc.sln, src/sdcc.vcxproj, src/sdcc.vcxproj.filters,
+	  src/yacc.vcxproj:
+	  project src renamed to sdcc, removed project yacc
+	* doc/sdccman.lyx, src/SDCCasm.c, src/SDCCicode.h,
+	  src/SDCCast.c, src/SDCCast.h, src/pic16/main.c:
+	  implemeted pragma config for pic16 target, solution
+	  of bug #3486890 - pic16 port config directive warning
+	* src/Makefile.in, src/sdcc.vcxproj:
+	  fixed bug #3506236: sdcc.exe unicode problem? by generating
+	  8-bit scanner
+
+2012-03-16 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* sdas/linksrc/lkarea.c (allocate_space,find_empty_space): fixed bound
+	  checking errors on allocation bitmap (possbile fix for bug #3502626)
+
+2012-03-16 Raphael Neider <rneider AT web.de>
+
+	* device/non-free/lib/pic16/libdev/pic18f1330.c:
+	  add dummy SSPBUF symbol as required by __stream_putchar/printf
+	* device/non-free/lib/pic16/libdev/testall.sh:
+	  test using printf_tiny() for greater confidence
+
+2012-03-14 Borut Razem <borut.razem AT gmail.com>
+
+	* debugger/mcs51/sdcdb.c, src/mcs51/gen.c, src/SDCCopt.c,
+	  src/hc08/gen.c, src/hc08/ralloc.c, src/ds390/gen.c,
+	  src/ds390/ralloc.c, sim/ucsim/cmd.src/cmdset.cc,
+	  sim/ucsim/cmd.src/cmdstat.cc, sim/ucsim/cmd.src/cmdgui.cc,
+	  sim/ucsim/z80.src/inst.cci, sdas/asxxsrc/asout.c:
+	  fixed gcc 4.6.1 warnimgs, mainly warning: 'xxx' may be used
+	  uninitialized in this function [-Wuninitialized] 
+
+2012-03-14 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/ralloc.c,
+	  support/regression/tests/bug3502965.c:
+	  Fixed bug #3502965.
+	* support/regression/tests/gcc-torture-execute-20030209-1.c,
+	  support/regression/tests/gcc-torture-execute-20031012-1.c:
+	  Added explanation for why tests don't work on gbz80.
+	* src/SDCCmain.c:
+	  Reenable non-compliant SDCC macros (but not for --std-c89, --std-c99, --std-c11).
+	* src/z80/ralloc2.cc:
+	  More flexible handling of accumulator in multiplication and return.
+
+2012-03-14 Borut Razem <borut.razem AT gmail.com>
+
+	* device/non-free/include/*, device/non-free/lib/*:
+	  added info about "The header files should state that they are
+	  only to be used with authentic Microchip devices" Microchip
+	  requirement and GPL incompatibility
+
+2012-03-13 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/tests/gcc-torture-execute-20010224-1.c,
+	  support/regression/tests/gcc-torture-execute-20030714-1.c:
+	  Disable tests for gcc older than 5.0.
+
+2012-03-13 Borut Razem <borut.razem AT gmail.com>
+
+	* device/include/*, device/lib/*: corrected GPL license version
+	  from 2.1 to 2: GPLv2.1 does not exist
+
+2012-03-12 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/tests/gcc-torture-execute-2001*.c,
+	  support/regression/tests/gcc-torture-execute-2003*.c:
+	  Added some more tests from the execute part of the gcc torture regression test suite.
+
+2012-03-12 Borut Razem <borut.razem AT gmail.com>
+
+	* doc/TININative.txt: removed, available at 
+	  http://sourceforge.net/apps/trac/sdcc/wiki/Using%20SDCC%20to%20develop%20Native%20Java%20functions
+	* doc/Makefile.in:
+	  don't generate unusable html and txt versions of sdccman
+
+2012-03-11 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/SDCCpeeph.c,
+	  src/z80/peeph-r2k.def,
+	  src/z80/peeph-z80.def,
+	  support/regression/tests/bug3501942.c:
+	  Fixed bug #3501942.
+
+2012-03-11 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/gen.c:
+	  Fixed bug that made copying from hl to iy ineffcient on r2k,
+	  fix another check in commitPair(), improved stack adjustment
+	  after function call.
+
+2012-03-11 Raphael Neider <rneider AT web.de>
+
+	* device/lib/pic16/libio/usart/uopen.c:
+	  properly setup BAUDCONbits.BRG16, closes #3495815
+
+	* device/non-free/include/pic16/pic18f1220.h:
+	  added BAUDCON alias and structure definition for BAUDCTL
+
+2012-03-10 Borut Razem <borut.razem AT gmail.com>
+
+	* doc/sdccman.lyx:
+	  documented support for 18f1230/18f1330 device family
+
+2012-03-10 Raphael Neider <rneider AT web.de>
+
+	* Makefile.in:
+	  device/lib build depends on sdcc-sdbinutils
+
+	* device/include/pic16/adc.h,
+	  device/include/pic16/pic16devices.txt,
+	  device/include/pic16/pic18fregs.h,
+	  device/lib/pic16/libio/Makefile.am,
+	  device/lib/pic16/libio/adc/adcbusy.c,
+	  device/lib/pic16/libio/adc/adcopen.c,
+	  device/lib/pic16/libio/adc/adcsetch.c,
+	  device/lib/pic16/libio/i2c.ignore,
+	  device/lib/pic16/libio/usart/uopen.c,
+	  device/non-free/include/pic16/pic18f1230.h,
+	  device/non-free/include/pic16/pic18f1330.h,
+	  device/non-free/lib/pic16/libdev/Makefile.am,
+	  device/non-free/lib/pic16/libdev/pic18f1230.c,
+	  device/non-free/lib/pic16/libdev/pic18f1330.c,
+	  device/non-free/lib/pic16/pics.all,
+	  support/scripts/pic18fam-h-gen.pl:
+	  add support for 18f1230 and 18f1330 devices
+
+	* device/lib/pic16/libio/mkmk.sh:
+	  adjust path to pics.all
+
+	* device/lib/pic16/libdev:
+	  removed obsolete, empty directory
+
+	* device/lib/pic16/libio/Makefile.in,
+	  device/non-free/include/pic16/pic18fam.h,
+	  device/non-free/lib/pic16/libdev/Makefile.in:
+	  regenerated
+
+2012-03-10 Borut Razem <borut.razem AT gmail.com>
+
+	* doc/README.txt, doc/sdccman.lyx:
+	  backslashes replaced with slashes in non-free paths;
+	  obsoleted special sdcc keywords which are not preceded
+	  by a double underscore
+	* support/scripts/inc2h-pic16.pl, support/scripts/inc2h.pl:
+	  added comment about Microchip "The header files should state
+	  that they are only to be used with authentic Microchip
+	  devices" requirement.
+
+2012-03-10 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/gen.c:
+	  Fixed bug #3501019.
+
+2012-03-09 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/mcs51/gen.c (genCast): fixed bug #3486542
+	* support/regression/tests/gcc-torture-execute-pr15296.c: re-enabled
+
+2012-03-09 Borut Razem <borut.razem AT gmail.com>
+
+	* doc/README.txt:
+	  added info about included code from gcc test suite
+	* Makefile.in:
+	  replaced test -e with -f, since -e is not available in sh
+	  on Solaris
+
+2012-03-08 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Use 16-bit addition instructions for 8-bit additions when cheaper and possible.
+
+2012-03-07 Borut Razem <borut.razem AT gmail.com>
+
+	* Makefile.in: copy correct sdbinutils executables to bin
+
+2012-03-07 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCopt.c (getAddrspaceiCode),
+	  src/SDCCralloc.hpp (create_cfg): properly handle IFX and
+	  JUMPTABLE operands
+
+2012-03-06 Borut Razem <borut.razem AT gmail.com>
+
+	* Makefile.in, support/sdbinutils/binutils/Makefile.am,
+	  support/sdbinutils/binutils/Makefile.in,
+	  support/scripts/sdcc.nsi,
+	  support/sdbinutils/bfd/asxxxx.c,
+	  support/sdbinutils/binutils/nm.c:
+	  added sdnm sdbinutils utility
+
+2012-03-06 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Fixed bug #3496508.
+
+2012-03-05 Borut Razem <borut.razem AT gmail.com>
+
+	* src/SDCCicode.c:
+	  disable -O2 optimization for gcc 4.6.3, see bug #3285611
+	* support/scripts/sdcc_mingw32: minor cosmetical fix
+	* configure.in, configure, config.guess, config.sub:
+	  added host and build type detection
+	* device/lib/pic14/Makefile.in,
+	  device/lib/pic14/libm/Makefile.in: regenerated
+
+2012-03-05 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCopt.c (separateAddressSpaces): fixed bug #3476041
+
+2012-03-04 Borut Razem <borut.razem AT gmail.com>
+
+	* doc/README.txt, doc/sdccman.lyx: small corrections
+	* src/SDCC.lex: removed forward declaration of non existing
+	  function deprecated_keyword(), removed macro TKEYWORDSDCC
+	* support/cpp/opts.c, support/cpp/sdcpp.c,
+	  support/cpp/version.c, support/cpp/version.h:
+	  updated version to 4.6.3
+
+2012-03-04 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCsymt.h,
+	* src/SDCCerr.c,
+	* src/SDCCerr.h,
+	* src/SDCC.y: fix struct/union tag scope problems
+	  (including bug #3487670)
+	* support/regression/tests/structscope.c: new tests
+
+2012-03-03 Borut Razem <borut.razem AT gmail.com>
+
+	* support/regression/ports/ucz80/spec.mk,
+	  support/regression/ports/ucz180/spec.mk:
+	  simulation timeout doubled due to several tests
+	  failures on sparc64-unknown-netbsd platform
+
+2012-03-02 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/gen.c,
+	  src/z80/ralloc.c,
+	  support/regression/tests/bug-3495411.c,
+	  Fixed #3495411 and another --oldralloc bug.
+
+2012-03-02 Borut Razem <borut.razem AT gmail.com>
+
+	* doc/sdccman.lyx: fixed pdf generation;
+	  added chapter 1.2 SDCC Suite Licenses;
+	  libraries license should be at least as liberal as the GPLv2+LE;
+	  note about GPL incompatible pic device libraries;
+	  added link to "List of the SDCC library" wiki page;
+	  added link to "SDCC - Small Device C Compiler Wiki" wiki page;
+	  use term "SDCC suite";
+	  formatting cleaning
+	* doc/README.txt: changed chapters Licenses and Authors and interested persons
+
+2012-03-01 Borut Razem <borut.razem AT gmail.com>
+
+	* support/regression/ports/ucz80/spec.mk:
+	  simulation timeout increased to 20s due to several tests
+	  failures on sparc64-unknown-netbsd platform
+	* configure.in, configure: report CPPFLAGS and LDFLAGS settings
+	* support/sdbinutils/bfd/configure.in,
+	  support/sdbinutils/bfd/configure,
+	  PKGVERSION set to (sdbinutils derived from GNU Binutils),
+	  BUGURL set to http://sourceforge.net/tracker/?group_id=599&atid=100599
+	* support/sdbinutils/binutils/version.c:
+	  --vesion shows sd* names instead GNU *
+
+2012-03-01 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/tests/gcc-torture-execute-20080506-1.c,
+	  support/regression/tests/gcc-torture-execute-20080506-2.c:
+	  Disable tests for gcc versions earlier than 5.0.
+
+2012-03-01 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* support/regression/tests/cse.c: new tests checking for CSE problems
+
+2012-02-28 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/tests/2000*.c:
+	  More tests from gcc.
+
+2012-02-28 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/tests/gcc-torture-execute-20000402-1.c:
+	  Disable test since unsigned long long is not yet fully supported.
+	* support/regression/tests/gcc-torture-execute-20000314-1.c:
+	  Silence warning.
+
+2012-02-27 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/tests/2000*.c:
+	  More tests from gcc.
+
+2012-02-26 Borut Razem <borut.razem AT gmail.com>
+
+	* support/regression/ports/ds390/spec.mk:
+	  simulation timeout icreased to 40s due to
+	  gcc-torture-execute-20090113-1 test failure on
+	  x86_64-w64-mingw32 and sparc64-unknown-netbsd platforms
+	* doc/README.txt: added gbz80 to supported targets,
+	  explanation of sdcc run time libraries licensing
+
+2012-02-26 Philipp Klaus Krause <pkk AT spth.de>
+
+	* device/include/mcs51/compiler.h:
+	  Update for SDCC -> __SDCC rename.
+	* support/regression/tests/gcc-torture-execute-pr49161.c,
+	  support/regression/tests/gcc-torture-execute-pr49039.c,
+	  support/regression/tests/gcc-torture-execute-pr48809.c,
+	  support/regression/tests/gcc-torture-execute-pr48973-1.c,
+	  support/regression/tests/gcc-torture-execute-pr48973-2.c:
+	  Disable tests for all gcc older than 5.0.
+	* doc/sdccman.lyx:
+	  Document feature macro rename.
+
+2012-02-26 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/ds390/gen.c (genAssign): fixed bug #3463343
+	* support/regression/tests/gcc-torture-execute-string-opt-5.c:
+	  reenabled for ds390
+	* src/ds390/gen.c (genPlus, genMinus): fix bug #3486541
+	* support/regression/tests/gcc-torture-execute-pr20527-1.c:
+	  reenabled for ds390
+
+2012-02-26 Borut Razem <borut.razem AT gmail.com>
+
+	* doc/sdccman.lyx: documented support for 16f720/16f721
+
+2012-02-26 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* support/regression/tests/gcc-torture-execute-stdarg-4.c:
+	  reenabled for ds390
+
+2012-02-25 Borut Razem <borut.razem AT gmail.com>
+
+	* configure.in, configure, Makefile.in, sdcc.sln,
+	  doc/sdccman.lyx, support/sdranlib/*: support/sdranlib removed
+	* .version, doc/sdccman.lyx: bumped version to 3.1.3
+
+2012-02-25 Raphael Neider <rneider AT web.de>
+
+	* device/include/pic14/pic14devices.txt,
+	  device/non-free/include/pic14/pic16f720.h,
+	  device/non-free/include/pic14/pic16f721.h,
+	  device/non-free/lib/pic14/libdev/Makefile.in,
+	  device/non-free/lib/pic14/libdev/devices.txt,
+	  device/non-free/lib/pic14/libdev/pic16f720.c,
+	  device/non-free/lib/pic14/libdev/pic16f721.c:
+	  added support for 16f720/16f721
+
+	* device/non-free/include/pic14/pic14regs.h:
+	  fixed to use __SDCC_PROCESSOR instead of SDCC_PROCESSOR
+
+	* device/non-free/lib/pic16/libdev/testall.sh:
+	  test support for all devices by compiling a source file
+
+2012-02-25 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCcse.c: fixed bug #3473062
+	* src/z80/gen.c (genCmpGt, genCmpLt),
+	  src/hc08/gen.c (genCmp, genCmpEQorNE),
+	  src/pic16/gen.c (genCmpGt, genCmpLt),
+	  src/pic14/gen.c (genCmpGt, genCmpLt): fixed bug #3487025
+
+2012-02-24 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/tests/gcc-torture-execute-pr42833.c:
+	  Disable test for all gcc versions earlier than 5.0.
+
+2012-02-24 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCast.c (createDo): fixed bug #3489326
+
+2012-02-23 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  More efficient access to two-byte variables near the stack pointer for r2k, fix a bug when fetching 1-byte variables.
+
+2012-02-23 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c,
+	  src/z80/peeph-z80.def:
+	  More efficient access to two-byte variables near the stack pointer.
+	* support/regression/tests/gcc-torture-execute-pr42833.c:
+	  Disable test for even more gcc versions.
+
+2012-02-22 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCmain.c,
+	  device/*,
+	  support/regression/*:
+	  sdcc macro mess cleanup, fix #3490776.
+
+2012-02-22 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* support/regression/tests/bug2935162.c,
+	* device/include/limits.h: changed constants to be compatible with
+	  both C89 and C99 integer constant type rules
+	* src/SDCCval.c (constVal): fixed bug #3489899
+	* src/mcs51/peeph.def: don't tail call optimize longjmp()
+	* src/SDCCsymt.c (addSymChain): fixed bug #3489870
+
+2012-02-21 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* device/include/setjmp.h,
+	  support/regression/tests/setjmp.c,
+	  device/lib/_setjmp.c:
+	  Rename HIDE_LONGJMP to __SDCC_HIDE_LONGJMP for standard compliance, enable setjmp/longjmp for z180 and r2k.
+
+2012-02-21 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCcse.c (cseBBlock): fixed bug #3482753
+	* support/regression/tests/bug3482753.c: new
+
+2012-02-20 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCsymt.h,
+	  src/SDCCast.h,
+	  src/SDCCast.c (decorateType, processParms, checkPtrCast, copyAstValues):
+	  fixed bug #3438706
+
+2012-02-19 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/gen.c,
+	  support/regression/tests/gcc-torture-execute-pr39339.c:
+	  Fixed bug #3486544.
+
+2012-02-19 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/gen.c,
+	  support/regression/tests/gcc-torture-execute-pr43236.c,
+	  support/regression/tests/gcc-torture-execute-20090113-1.c:
+	  Fixed bugs #3486543 and #3487324.
+
+2012-02-19 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCsymt.h,
+	  src/SDCCsymt.c (findSymWithLevel),
+	  src/SDCCast.c (resolveSymbols, processBlockVars): fixed bugs 3403429,
+	  3153215, 3107914 
+	* support/regression/tests/bug3403429.c: enabled test
+
+2012-02-18 Philipp Klaus Krause <pkk AT spth.de>
+
+	* support/regression/tests/gcc-torture-execute-pr44468.c,
+	  support/regression/tests/gcc-torture-execute-pr43438.c,
+	  support/regression/tests/gcc-torture-execute-pr45034.c:
+	  Disable tests for older gcc.
+
+2012-02-17 Philipp Klaus Krause <pkk AT spth.de>
+
+	* device/lib/z80/divunsigned.s,
+	  device/lib/z180/divunsigned.s,
+	  device/lib/r2k/divunsigned.s:
+	  Remove some leftover code for handling division by zero (patch by parerga, #3488149).
+
+2012-02-17 Philipp Klaus Krause <pkk AT spth.de>
+
+	* support/regression/tests/gcc-torture-execute-pr37924.c:
+	  Fix gcc compilation failure.
+
+2012-02-16 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/peeph-r2k.def:
+	  Use some peepholes useful when omitting the frame pointer from z80 for r2k.
+	* src/z80/gen.c:
+	  Improve code generation for r2k when omitting frame pointer, enable use of ld iy, hl on r2k.
+
+2012-02-16 Borut Razem <borut.razem AT gmail.com>
+
+	* support/sdbinutils/include/opcode/sparc.h,
+	  support/sdbinutils/include/aout/sun4.h:
+	  added for NetBSD/sparc64 bfd build
+
+2012-02-15 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/hc08/main.c (hasExtBitOp),
+	  src/hc08/gen.c (genGetAbit, genGetByte, genGetWord, genhc08Code):
+	  implemented the GETABIT, GETBYTE, and GETWORD iCodes for HC08
+
+2012-02-15 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Cheaper signed comparison when right operand is a literal.
+	* support/regression/tests/gcc-torture-execute-pr37924.c:
+	  Disable even more of a test for older gcc.
+
+2012-02-15 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/tests/gcc-torture-execute-pr37924.c,
+	  support/regression/tests/gcc-torture-execute-pr33779-2.c:
+	  Disable tests for older gcc.
+	* src/SDCCast.c
+	  Fix setting of CurrFunc for non-functions.
+	* src/z80/main.c,
+	  src/z80/gen.h,
+	  src/z80/gen.c,
+	  src/z80/ralloc2.cc:
+	  Fixes for --fomit-frame-pointer, omit frame pointer by default for functions with low register pressure and few stack accesses.
+
+2012-02-15 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCast.c (createWhile, createDo, backPatchLabels): put label
+	  nodes above IFX nodes rather than between IFX and condition
+	* src/SDCCicode.c (geniCodeIfx, ast2iCode): fixed bug #3429793
+
+2012-02-14 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/ralloc2.cc,
+	  src/z80/gen.h,
+	  src/z80/gen.c:
+	  Omit frame pointer for functions with low register pressure and few parameter accesses.
+
+2012-02-14 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Fix addition when multiple operands are on the stack and --fomit-frame-pointer is used.
+
+2012-02-14 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/peeph-z80.def,
+	  src/z80/gen.c,
+	  src/z80/ralloc2.cc:
+	  Generate better code when using --fomit-frame-ppinter.
+
+2012-02-14 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/tests/gcc-torture-execute-pr28651.c:
+	  Disable test for older gcc.
+
+2012-02-13 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/tests/gcc-torture-execute-pr49073.c,
+	  support/regression/tests/gcc-torture-execute-pr36691.c:
+	  Disabled some tests for older gcc.
+	* support/regression/tests/gcc-torture-execute-*.c:
+	  Added some more tests from the execute part of the gcc torture regression test suite.
+	* src/z80/gen.c:
+	  Improve handling of bc, de in addition.
+	* src/SDCC.lex:
+	  Remove leftover legacy keyword function.
+
+2012-02-13 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/ralloc2.cc,
+	  src/z80/gen.c:
+	  Improve handling of hl in address calculations, minor decrement improvement.
+
+2012-02-13 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* support/regression/tests/gcc-torture-execute-pr34070-1.c,
+	  support/regression/tests/gcc-torture-execute-pr34070-2.c:
+	  Disable more tests for older gcc
+	* support/regression/tests/gcc-torture-execute-pr15296.c,
+	  support/regression/tests/bug1115321.c: Fix test to be compatible
+	  with hosts in which int and pointers differ in size.
+
+2012-02-12 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* support/regression/tests/gcc-torture-execute-pr42833.c:
+	  don't redefine ssize_t if host already defines
+
+2012-02-12 Raphael Neider <rneider AT web.de>
+
+	* src/pic14/pcode.c (newpCodeOpBit):
+	  prevent SIGSEGV on copying temporary registers
+
+	* src/pic14/gen.c (gen{,End}Function, gen{,End}Critical, genpic14Code),
+	  src/pic16/gen.c (gen{,End}Function, gen{,End}Critical, genpic16Code):
+	  implement __critical (block and function attribute, PIC14 limited to
+	  no-arg functions: arg0 in W would be corrupted)
+
+2012-02-12 Philipp Klaus Krause <pkk AT spth.de>
+
+	* support/regression/tests/gcc-torture-execute-pr42833.c,
+	  support/regression/tests/gcc-torture-execute-pr44555.c,
+	  support/regression/tests/gcc-torture-execute-pr48809.c,
+	  support/regression/tests/gcc-torture-execute-pr48973-1.c,
+	  support/regression/tests/gcc-torture-execute-pr48973-2.c,
+	  support/regression/tests/gcc-torture-execute-pr49039.c,
+	  support/regression/tests/gcc-torture-execute-pr49123.c,
+	  support/regression/tests/gcc-torture-execute-pr49161.c,
+	  support/regression/tests/gcc-torture-execute-pr49768.c:
+	  Disable some tests for older gcc.
+
+2012-02-12 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* support/sdbinutils/include/mach-o/*: added missing files for Mac OS
+
+2012-02-12 Raphael Neider <rneider AT web.de>
+
+	* src/pic14/gen.c (genGetABit, genpic14Code),
+	  src/pic14/main.c (hasExtBitOp),
+	  src/pic16/gen.c (genGetABit, genpic16Code),
+	  src/pic16/main.c (hasExtBitOp):
+	  implement GETABIT iCode, fixes #2986039
+
+2012-02-11 Raphael Neider <rneider AT web.de>
+
+	* device/include/pic16/signal.h:
+	  explicitly access SFRs via access bank, closes #3482876
+
+2012-02-11 Raphael Neider <rneider AT web.de>
+
+	* device/include/pic14/pic14devices.txt,
+	  device/non-free/include/pic14/pic16f1946.h,
+	  device/non-free/include/pic14/pic16f1947.h,
+	  device/non-free/lib/pic14/libdev/Makefile.in,
+	  device/non-free/lib/pic14/libdev/devices.txt,
+	  device/non-free/lib/pic14/libdev/pic16f1946.c,
+	  device/non-free/lib/pic14/libdev/pic16f1947.c,
+	  doc/sdccman.lyx:
+	  enabled/added devices
+
+	* device/non-free/lib/pic14/libdev/testall.sh:
+	  test support for all devices by compiling a source file
+
+	* device/non-free/lib/pic14/libdev/mkall.sh,
+	  support/scripts/inc2h.pl:
+	  improved regenerating device support files
+
+2012-02-11 Borut Razem <borut.razem AT gmail.com>
+
+	* device/include/pic14/pic14devices.txt,
+	  device/non-free/include/pic14/pic16f1503.h,
+	  device/non-free/include/pic14/pic16f1507.h,
+	  device/non-free/include/pic14/pic16f1508.h,
+	  device/non-free/include/pic14/pic16f1509.h,
+	  device/non-free/include/pic14/pic16f1516.h,
+	  device/non-free/include/pic14/pic16f1517.h,
+	  device/non-free/include/pic14/pic16f1518.h,
+	  device/non-free/include/pic14/pic16f1519.h,
+	  device/non-free/include/pic14/pic16f1526.h,
+	  device/non-free/include/pic14/pic16f1527.h,
+	  device/non-free/lib/pic14/libdev/Makefile.in,
+	  device/non-free/lib/pic14/libdev/devices.txt,
+	  device/non-free/lib/pic14/libdev/pic16f1503.c,
+	  device/non-free/lib/pic14/libdev/pic16f1507.c,
+	  device/non-free/lib/pic14/libdev/pic16f1508.c,
+	  device/non-free/lib/pic14/libdev/pic16f1509.c,
+	  device/non-free/lib/pic14/libdev/pic16f1516.c,
+	  device/non-free/lib/pic14/libdev/pic16f1517.c,
+	  device/non-free/lib/pic14/libdev/pic16f1518.c,
+	  device/non-free/lib/pic14/libdev/pic16f1519.c,
+	  device/non-free/lib/pic14/libdev/pic16f1526.c,
+	  device/non-free/lib/pic14/libdev/pic16f1527.c:
+	  applied patch #3471142: [PIC14] more enchanced core devices,
+	  thanks to Gal Zsolt
+	* doc/sdccman.lyx: added new 16f15xx devices to the list
+	* support/sdbinutils/include/fopen-bin.h:
+	  added, required by mingw build
+	* Makefile.in: added EXEEXT required by mingw build
+	* support/scripts/sdcc_mingw32: added TARGETAR
+
+2012-02-11 Philipp Klaus Krause <pkk AT spth.de>
+
+	* support/regression/tests/gcc-torture-execute-pr20601-1.c:
+	  Disabled test for host, since _Noreturn support is required.
+	* support/regression/tests/gcc-torture-execute-pr23047.c:
+	  Removed test, since it seems to test for implementation-defined behaviour.
+	* support/regression/tests/gcc-torture-execute-pr33779-1.c:
+	  Use exact-width integer types from stdint.h instead, no longer require long to be 32 bits.
+
+2012-02-10 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/ralloc2.cc,
+	  src/z80/gen.c:
+	  Increase flexibility of handling of register pair hl over function calls.
+
+2012-02-10 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/tests/*
+	  Added some more tests from the execute part of the gcc torture regression test suite.
+
+2012-02-10 Borut Razem <borut.razem AT gmail.com>
+
+	* configure, Makefile.in, configure.in, sdccconf_in.h,
+	  device/lib/z180/Makefile.in, device/lib/small/Makefile.in,
+	  device/lib/z80/Makefile.in, device/lib/gbz80/Makefile.in,
+	  device/lib/ds390/Makefile.in, device/lib/medium/Makefile.in,
+	  device/lib/Makefile.in, device/lib/ds400/Makefile.in,
+	  device/lib/mcs51/Makefile.in, device/lib/huge/Makefile.in,
+	  device/lib/large/Makefile.in, device/lib/r2k/Makefile.in,
+	  device/lib/hc08/Makefile.in, Makefile.common.in,
+	  support/scripts/sdcc.nsi, support/sdbinutils/*:
+	  device/lib/z180/Makefileadded sdbinutils: sdar and sdranlib
+	* device/lib/z180/Makefile:
+	  deleted, generated from device/lib/z180/Makefile.in
+
+2012-02-09 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Fix for yesterdays addition improvement, decide in which pair
+	  to increment in code generator instead of peephole optimizer.
+
+2012-02-08 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c,
+	  src/z80/peeph-z80.def:
+	  Minor addition improvement.
+
+2012-02-08 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Use bit instruction for & in jump condition.
+	* src/z80/peep.c,
+	  src/z80/peeph-z80.def:
+	  Minor peephole improvements.
+
+2012-02-07 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/ralloc2.cc,
+	  src/z80/gen.c:
+	  Improve handling of register pairs, in particular hl.
+
+2012-02-06 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/SDCCast.c:
+	  Fixed bug #3073647.
+	* src/SDCCsymt.c:
+	  Fixed #3034739.
+
+2012-02-06 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* support/regression/tests/bug2935162.c: don't assume 32-bit long host
+
+2012-02-06 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/gen.c:
+	  Fixed bug #3482732.
+	* src/SDCClrange.h,
+	  src/SDCClrange.c,
+	  src/SDCCopt.c,
+	  support/Regression/bug3482217.c:
+	  Fixed bug #3482217.
+
+2012-02-04 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* src/SDCCval.c (constVal): fixed bug 2935162
+	* support/regression/tests/bug2935162.c: new, added
+
+2012-02-03 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/gen.c,
+	  src/z80/z80.h,
+	  src/z80/ralloc2.cc:
+	  Fixes for #3482732, preparations for exact cost function in gbz80 port.
+
+2012-02-03 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Fix generation of invalid instructions when --reserve-regs-iy is used.
+
+2012-01-31 Borut Razem <borut.razem AT gmail.com>
+
+	* support/regression/ports/ucgbz80/spec.mk:
+	  simulation timeout increased to 20s due to timeout failure on
+	  gcc-torture-execute-divcmp-3 regressin test on
+	  mypants.neurotica.com NetBSD/Sparc64 build machine
+
+2012-01-31 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/ralloc2.cc,
+	  support/regression/tests/bug3482146.c:
+	  Fixed bug #3482146.
+
+2012-01-31 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/tests/bug3482146.c:
+	  Regression test for bug #3482146.
+
+2012-01-30 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Fixed bug #3480597.
+
+2012-01-29 Borut Razem <borut.razem AT gmail.com>
+
+	* support/regression/tests/key.c: fixed for Mac OS X
+
+2012-01-28 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* src/mcs51/gen.c (genJumpTab): fixed bug 3480545
+	* support/regression/tests/bug3480545.c: new, added
+
+2012-01-27 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c,
+	  support/regression/tests/gcc-torture-execute-stdarg-4.c:
+	  Fix bug #3463344.
+
+2012-01-27 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/peeph-gbz80.def:
+	  Fix remaining gbz80 regression failures when using --max-allocs-per-node 5.
+	* src/z80/gen.c:
+	  Fix right shift for gbz80 using --max-allocs-per-node 1.
+
+2012-01-26 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Fix comparison and unary minus for gbz80 when many operands are on the stack.
+
+2012-01-26 Raphael Neider <rneider AT web.de>
+
+	* src/pic14/pcodepeep.c,
+	  src/pic14/gen.c,
+	  src/pic14/glue.c,
+	  src/pic16/device.c,
+	  src/pic16/pcodepeep.c,
+	  src/pic16/gen.c,
+	  src/pic16/pcoderegs.c,
+	  src/pic16/ralloc.c,
+	  src/pic16/pcode.c,
+	  src/pic16/genutils.c: avoid compiler warnings
+
+2012-01-26 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/cpp/libcpp/internal.h,
+	  support/cpp/sdcpp.c,
+	  support/cpp/libcpp/lex.c:
+	  Remove support for _asm and _endasm, rename macros that had names reserved for the implementation.
+	* support/regression/tests/key.c:
+	  Regression test for obsolete keywords.
+
+2012-01-26 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Correctly handle some forgotten corner cases in the fix for #3427564.
+
+2012-01-25 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* doc/sdccman.lyx:
+	  Mention -mz180, -mr2k, named address spaces and use non-deprectaed form of sdcc-specific keywords.
+	* src/SDCC.lex:
+	  Remove support for deprecated keywords.
+	* src/z80/gen.c:
+	  Fixed bug #3427564.
+
+2012-01-25 Borut Razem <borut.razem AT gmail.com>
+
+	* device/lib/make51lib.bat: rewritten for ar / sdranlib
+
+2012-01-23 Borut Razem <borut.razem AT gmail.com>
+
+	* doc/sdccman.lyx: pic14 enhanced cores enabled by default
+
+2012-01-22 Borut Razem <borut.razem AT gmail.com>
+
+	* configure.in, configure: corrected test if ar accepts -S option
+
+2012-01-22 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* support/regression/tests/bug3475630.c,
+	* support/regression/tests/bug3475656.c: fixed for mcs51, native eol
+	* device/include/mcs51/stc12.h: new, added, thanks intron
+
+2012-01-21 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/ralloc2.cc,
+	  support/regression/tests/bug3475630.c:
+	  Fixed bug #3475630.
+	* support/regression/tests/bug3475656.c:
+	  Regression test for bug #3475656.
+
+2012-01-21 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/peeph-gbz80.def:
+	  Enable some more peephole rules for the gbz80.
+
+2012-01-21 Borut Razem <borut.razem AT gmail.com>
+
+	* support/regression/tests/bug2942343.c: corrected test if SDCC
+
+2012-01-20 Borut Razem <borut.razem AT gmail.com>
+
+	* device/lib/pic14/Makefile.am, device/lib/pic14/Makefile.in,
+	  device/lib/pic14/libm/Makefile.am,
+	  device/lib/pic14/libm/Makefile.in:
+	  added template for NEW_PICS 
+	* device/non-free/lib/pic14/libdev/Makefile.in:
+	  pic14 enhanced cores enabled by default
+
+2012-01-20 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* support/regression/tests/bug2942343.c: disable for test-host
+	* support/regression/tests/bug3475990.c: skip named address space
+	  declaration for test-host
+
+2012-01-19 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCnaddr.hpp:
+	  Fix preprocessing step for named address spaces.
+
+2012-01-19 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCnaddr.cc,
+	  src/SDCCnaddr.hpp,
+	  src/SDCCopt.c,
+	  src/SDCCopt.h,
+	  support/regression/tests/bug3475990.c:
+	  Fixed bug #3475990.
+
+2012-01-19 Borut Razem <borut.razem AT gmail.com>
+
+	* device/lib/pic14/configure.in, device/lib/pic14/configure,
+	  device/lib/pic14/Makefile.am, device/lib/pic14/Makefile.in,
+	  device/lib/pic14/libm/Makefile.am,
+	  device/lib/pic14/libm/Makefile.in:
+	  pic14 enhanced cores enabled by default; gputils 0.14.1 or
+	  newer required
+
+2012-01-18 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* device/lib/_fsget1arg.c,
+	* device/lib/_fsget2args.c: cosmetics
+	* device/lib/_fsnormalize.c: fixed bug 3474855
+	* support/regression/tests/bug3474855.c: new, added
+
+2012-01-16 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Fix signed comparison on gbz80.
+	* device/lib/_memmove.c:
+	  Fix comparison in pointer location for memmove().
+	* src/z80/peeph-gbz80.def:
+	  Enable some jump peepholes for gbz80.
+
+2012-01-15 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/gen.c:
+	  Fix #3473876.
+	* Changelog:
+	  Pretend to live in the year 2012 to not cause suspicion.
+	* device/lib/_memmove.c:
+	  Simplified test deciding copy direction for memmove().
+	* src/z80/peeph-gbz80.def:
+	  Use gbz80-specific load-and-increment/decrement instructions.
+	* src/z80/mappings.i:
+	  Use more intuitive add sp, d syntax instead of lda sp, d(sp).
+
+2012-01-15 Borut Razem <borut.razem AT gmail.com>
+
+	* sdas/asrab/Makefile.in: fixed linking with -lm math library
+	* src/SDCCnaddr.cc: removed unicode BOM
+	* device/lib/pic14/configure.in, device/lib/pic14/configure,
+	  device/lib/pic14/aclocal.m4: fixed transfer of gcc CFLAGS to
+	  sdcc while generating dependencies
+
+2012-01-14 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/gen.c:
+	  Fixed bug #3473863 in increment of pointers, fixed similar bug in equality comparison.
+	* support/regression/tests/memory.c:
+	  Enable a memchr() test.
+	* support/regression/tests/bug2729218.c:
+	  Move struct out of ROM for gbz80.
+
+2012-01-14 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/main.c:
+	  Remove unnecessary value calculation in _hasNativeMulFor().
+
+2012-01-14 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* .version,
+	* doc/sdccman.lyx: bumped version to 3.1.2
+	* src/SDCCicode.c (checkTypes): fixed bug 2942343
+	* src/SDCCnaddr.cc: svn properties
+	* src/SDCCnaddr.hpp: removed some typename keywords for MSVC,
+	  fixed warning
+	* src/src.vcxproj: added SDCCnaddr.*, added boost include path
+	* src/z80/z80.vcxproj: upgraded boost include path
+	* support/regression/tests/bug2942343.c: new, added
+
+2012-01-11 Borut Razem <borut.razem AT gmail.com>
+
+	* src/SDCC.lex: removed #line rule handled by preprocessor
+
+2012-01-11 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCglobl.h,
+	  src/z80/z80.h,
+	  src/z80/main.c,
+	  src/z80/ralloc2.cc,
+	  src/SDCCnaddr.hpp,
+	  src/SDCCmain.c,
+	  src/SDCCnaddr.cc:
+	  Make optimal placement of bank-selection instructions configurable using --max-allocs-per-node and --dump-graphs options.
+
+2012-01-10 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCnaddr.hpp,
+	  src/SDCCopt.c,
+	  src/SDCCopt.h:
+	  Optimal placement of bank-switching calls.
+
+2012-01-10 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCicode.h,
+	  src/SDCCnaddr.cc,
+	  src/SDCCnaddr.hpp,
+	  src/SDCCopt.c,
+	  src/z80/ralloc2.cc,
+	  src/SDCCopt.h,
+	  src/Makefile.in:
+	  Preparations for optimal placement of bank-switching calls.
+
+2012-01-10 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCicode.c: fixed bug 3466784
+
+2012-01-09 Leland Morrison <enigmalee AT sourceforge.net>
+	
+	* sim/ucsim/z80.src/glob_lr35902.cc: disassemble for gb processor
+	* sim/ucsim/z80.src/inst_lr35902.cc: instruction simulation for gb
+	* sim/ucsim/z80.src/lr35902.cc,
+	* sim/ucsim/z80.src/lr35902cl.h: definition of gb processor
+	* sim/ucsim/z80.src/z80cl.h,
+	* sim/ucsim/z80.src/z80.cc: added peek1 function to look at next opcode
+	* sim/ucsim/z80.src/glob.cc: fixes to disassembly for "ld e,<byte>",
+	  "inc (hl)", and "dec (hl)" for z80 processor
+	* sim/ucsim/z80.src/glob.h: added declaration for gb disassembly table
+	* sim/ucsim/z80.src/inst_r2k.h: fix to sign extension for add sp,d
+	* sim/ucsim/z80.src/simz80.cc: added -tlr35902 option for gameboy
+	* support/regression/Makefile.in,
+	* support/regression/ports/ucgbz80/*: added option to run regression
+	  tests for the gb processor using ucsim
+	
+2012-01-08 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* src/SDCC.lex: included io.h for read() declaration with MSVC,
+	  fixed linenr bug
+	* src/SDCCerr.c: made W_LIT_OVERFLOW pedantic
+	* src/SDCCglue.c (printIvalType, printIvalBitFields),
+	* src/SDCCicode.c checkTypes): removed lessPedantic check
+	* src/SDCCicode.c (geniCodeCast): fixed bug 3470368
+
+2012-01-06 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Fixed width of lower part of large literals.
+
+2012-01-06 Borut Razem <borut.razem AT gmail.com>
+
+	* sdas/linksrc/Makefile.in: removed LKLIB
+	* device/non-free/lib/Makefile.in: removed SOURCES
+
+2012-01-04 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/hc08/gen.c:
+	  More explicit stack size reporting for hc08.
+
+2012-01-04 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* src/SDCCopt.c (killDeadCode): fixed bug 2862308
+	* support/regression/tests/bug2862308.c: new, added
+
+2012-01-03 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c,
+	  support/regression/tests/gcc-torture-execute-string-opt-5.c:
+	  Fixed bug #3463342.
+
+2012-01-03 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* sdas/as6808/m08ext.c,
+	* sdas/as6808/as_hc08.vcxproj,
+	* sdas/as6808/as_hc08.vcxproj.filters,
+	* sdas/as6808/Makefile.in: removed m08ext.c
+	* sdas/as6808/m08adr.c,
+	* sdas/as6808/m08mch.c, 
+	* sdas/as6808/m08pst.c,
+	* sdas/as6808/m6808.h,
+	* sdas/asxxsrc/asout.c: synced with ASxxxx v5 to fix bug 2894291
+
+2012-01-02 Borut Razem <borut.razem AT gmail.com>
+
+	* sdcc/SDCC.lex: included unistd.h, needed by flex 2.5.4 on
+	  NetBSD 5.0.1 sparc64 for read() declaration
+	* sdas/linksrc/lkar.h: '\n' replaced by '\012'
+
+2012-01-02 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* src/src.vcxproj: increased stack size 32M/64M so it never overflows
+	* src/Makefile.in: added flex fast flag -f
+	* src/SDCC.lex: removed preprocessor warning and error rules,
+	  removed EOL after #... rules
+
+2011-12-29 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* device/lib/clean.mk: added z180 and r2k
+	* sim/ucsim/cmd.src/cmdlex.l: fixed unused yyunput warning
+	* src/hc08/main.c: removed unused BSEG
+	* src/SDCCglue.c (glue): suppress unused segments
+	* src/SDCCmem.c (allocMap, initMem): skip when name==NULL,
+	  (allocGlobal): use x_abs for __at on z80, fixed bug 2040874
+	* src/z80/main.c: removed ISEG, XSEG, BSEG, OVERLAY, added DABS (x_abs)
+	* support/regression/fwk/include/testfwk.h,
+	* support/regression/tests/absolute.c: z80 supports __at
+
+2011-12-29 Borut Razem <borut.razem AT gmail.com>
+
+	* support/cpp/libcpp/lex.c:
+	  partialy synchronized with sdcpp 4.6.[12]: no mmx, sse, altivec
+	* support/cpp/version.c: updated version to 4.6.2
+	* support/cpp/configure.in, support/cpp/configure,
+	  support/cpp/config.in: WORDS endianness detection
+
+2011-12-27 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* src/SDCC.lex,
+	* src/SDCC.y: fixed bugs 1810965 and 2698805
+	* src/SDCCsymt.c (checkSClass): removed old hack-o-matic
+	* support/regression/tests/bug1810965.c: new, added
+
+2011-12-26 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/SDCCralloc.hpp:
+	  Reduce stack space usage in recursion.
+
+2011-12-25 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* device/lib/r2k/setjmp.s,
+	* device/lib/z180/setjmp.s,
+	* device/lib/z80/setjmp.s: optimized
+	* device/lib/r2k/*,
+	* device/lib/z180/*,
+	* device/lib/z80/*: use native eol
+
+2011-12-24 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* device/include/setjmp.h: changed longjmp return type to void
+	* device/lib/_setjmp.c: but use int for the implementation
+
+2011-12-24 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCCopt.c (replaceRegEqv): fixed bug 2938101
+
+2011-12-23 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/SDCCerr.h,
+	  src/SDCCerr.c,
+	  src/SDCCicode.c:
+	  Warn about return statements in _Noreturn functions.
+	* device/include/setjmp.h,
+	  device/lib/_setjmp.c:
+	  Make longjmp() a _Noreturn function, as required by the C11 standard.
+	* src/SDCClabel.c,
+	  src/z80/gen.c:
+	  Do some basic optimizations for _Noreturn functions.
+
+2011-12-23 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+	* src/SDCClabel.c (labelIfx): fixed bug 3463455
+	* support/regression/tests/gcc-torture-execute-loop-12.c:
+	  reenable tests for hc08 and ds390
+	* support/regression/compact-results.py: wider test name field
+
+2011-12-22 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* src/SDCCerr.c: changed E_NONRENT_ARGS description
+
+2011-12-22 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCmain.c,
+	  src/SDCCglobl.h,
+	  src/SDCC.lex:
+	  Add option and pragma for ISO C11.
+	* support/regression/tests/gcc-torture-execute-anon-1.c:
+	  Disable for compilers other than sdcc and use sdcc in C11 mode.
+	* src/SDCCsymt.c,
+	  src/SDCCsymt.h,
+	  src/SDCC.y,
+	  src/SDCC.lex,
+	  device/include/stdnoreturn.h:
+	  Accept C11 keyword _Noreturn.
+	* device/include/stdio.h:
+	  Do not declare gets() in C11 mode.
+
+2011-12-21 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* sdas/as6808/Makefile.in,
+	* sdas/as8051/Makefile.in,
+	* sdas/asgb/Makefile.in,
+	* sdas/asrab/Makefile.in,
+	* sdas/asz80/Makefile.in: reverted as it fails to build without error
+
+2011-12-21 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/tests/gcc-torture-execute-pure-1.c,
+	  support/regression/tests/gcc-torture-execute-string-opt-17.c,
+	  support/regression/tests/gcc-torture-execute-pta-field-1.c,
+	  support/regression/tests/gcc-torture-execute-string-opt-18.c,
+	  support/regression/tests/gcc-torture-execute-struct-ini-1.c,
+	  support/regression/tests/gcc-torture-execute-pta-field-2.c,
+	  support/regression/tests/gcc-torture-execute-ptr-arith-1.c,
+	  support/regression/tests/gcc-torture-execute-unroll-1.c,
+	  support/regression/tests/gcc-torture-execute-struct-ini-2.c,
+	  support/regression/tests/gcc-torture-execute-struct-ini-3.c,
+	  support/regression/tests/gcc-torture-execute-string-opt-5.c,
+	  support/regression/tests/gcc-torture-execute-stdarg-3.c,
+	  support/regression/tests/gcc-torture-execute-shiftopt-1.c,
+	  support/regression/tests/gcc-torture-execute-struct-ini-4.c,
+	  support/regression/tests/gcc-torture-execute-stdarg-4.c,
+	  support/regression/tests/gcc-torture-execute-switch-1.c,
+	  support/regression/tests/gcc-torture-execute-scope-1.c,
+	  support/regression/tests/gcc-torture-execute-loop-10.c,
+	  support/regression/tests/gcc-torture-execute-loop-11.c,
+	  support/regression/tests/gcc-torture-execute-loop-12.c,
+	  support/regression/tests/gcc-torture-execute-loop-13.c,
+	  support/regression/tests/gcc-torture-execute-loop-14.c,
+	  support/regression/tests/gcc-torture-execute-loop-15.c,
+	  support/regression/tests/gcc-torture-execute-loop-1.c,
+	  support/regression/tests/gcc-torture-execute-loop-2.c,
+	  support/regression/tests/gcc-torture-execute-loop-2c.c,
+	  support/regression/tests/gcc-torture-execute-loop-2d.c,
+	  support/regression/tests/gcc-torture-execute-loop-3b.c,
+	  support/regression/tests/gcc-torture-execute-loop-3.c,
+	  support/regression/tests/gcc-torture-execute-loop-3c.c,
+	  support/regression/tests/gcc-torture-execute-loop-5.c,
+	  support/regression/tests/gcc-torture-execute-loop-6.c,
+	  support/regression/tests/gcc-torture-execute-loop-7.c,
+	  support/regression/tests/gcc-torture-execute-loop-8.c,
+	  support/regression/tests/gcc-torture-execute-loop-9.c,
+	  support/regression/tests/gcc-torture-execute-func-ptr-1.c,
+	  support/regression/tests/gcc-torture-execute-const-addr-expr-1.c,
+	  support/regression/tests/gcc-torture-execute-divmod-1.c,
+	  support/regression/tests/gcc-torture-execute-divcmp-4.c,
+	  support/regression/tests/gcc-torture-execute-divconst-1.c,
+	  support/regression/tests/gcc-torture-execute-compare-1.c,
+	  support/regression/tests/gcc-torture-execute-divconst-2.c,
+	  support/regression/tests/gcc-torture-execute-compare-2.c,
+	  support/regression/tests/gcc-torture-execute-compare-3.c,
+	  support/regression/tests/gcc-torture-execute-loop-12.c,
+	  support/regression/tests/gcc-torture-execute-doloop-1.c,
+	  support/regression/tests/gcc-torture-execute-doloop-2.c,
+	  support/regression/tests/gcc-torture-execute-enum-2.c,
+	  support/regression/tests/gcc-torture-execute-ifcvt-onecmpl-abs-1.c,
+	  support/regression/tests/gcc-torture-execute-divcmp-1.c,
+	  support/regression/tests/gcc-torture-execute-enum-3.c,
+	  support/regression/tests/gcc-torture-execute-cmpsf-1.c,
+	  support/regression/tests/gcc-torture-execute-mod-1.c,
+	  support/regression/tests/gcc-torture-execute-divcmp-2.c,
+	  support/regression/tests/gcc-torture-execute-int-compare.c,
+	  support/regression/tests/gcc-torture-execute-divcmp-3.c,
+	  support/regression/tests/gcc-torture-execute-anon-1.c,
+	  support/regression/tests/gcc-torture-execute-arith-1.c,
+	  support/regression/tests/gcc-torture-execute-postmod-1.c,
+	  support/regression/tests/gcc-torture-execute-bitfld-1.c,
+	  support/regression/tests/gcc-torture-execute-pending-4.c:
+	  Added some tests from the execute part of the gcc torture regression test suite.
+
+2011-12-20 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* sdas/as6808/Makefile.in,
+	* sdas/as8051/Makefile.in,
+	* sdas/asgb/Makefile.in,
+	* sdas/asrab/Makefile.in,
+	* sdas/asz80/Makefile.in: added dependencies
+
+2011-12-19 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* sdas/asz80/z80pst.c: forgot this one, probably sdas dependencies are
+	  insufficient too
+
+2011-12-18 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* debugger/mcs51/sdcdb.c (escapeQuotes): fixed warning
+	* sdas/asrab/rabbitmch.c: fixed bug 3461821 by calling outrb with 0
+	* sdas/as6808/m08pst.c,
+	* sdas/as8051/i51adr.c,
+	* sdas/as8051/i51mch.c,
+	* sdas/as8051/i51pst.c,
+	* sdas/as8051/i8051.h,
+	* sdas/asgb/gbpst.c,
+	* sdas/asxxsrc/asdata.c,
+	* sdas/asxxsrc/asexpr.c,
+	* sdas/asxxsrc/aslex.c,
+	* sdas/asxxsrc/aslist.c,
+	* sdas/asxxsrc/asmain.c,
+	* sdas/asxxsrc/asout.c,
+	* sdas/asxxsrc/assym.c,
+	* sdas/asxxsrc/asxxxx.h,
+	* sdas/asz80/z80mch.c,
+	* sdas/linksrc/aslink.h,
+	* sdas/linksrc/lkarea.c,
+	* sdas/linksrc/lkhead.c,
+	* sdas/linksrc/lklex.c,
+	* sdas/linksrc/lklist.c,
+	* sdas/linksrc/sdld.c,
+	* sdas/linksrc/sdld.h: another step towards ASxxxx v5
+	* sdas/asrab/rabbit.h,
+	* sdas/asrab/rabbitadr.c,
+	* sdas/asrab/rabbitext.c,
+	* sdas/asrab/rabbitpst.c: native line endings, no TABs
+	* src/ds390/main.c,
+	* src/mcs51/main.c,
+	* src/z80/main.c: asxxx -z flag is now case INsensitive
+	* src/hc08/main.c: fixed bug 1666106 by adding (PAG) to DSEG and OSEG
+	* src/SDCCglobl.h: fixed -E comment
+	* src/SDCCicode.c (geniCodeAdd),
+	* src/SDCCsymt.c (compStructSize): added error for unknown struct size
+	* src/SDCClabel.c: no TABs
+
+2011-12-17 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* device/include/mcs51/cc2530.h: new, added, thanks Zafi Ramarosandratana
+
+2011-12-08 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* device/lib/_atof.c,
+	* device/lib/_divuint.c,
+	* device/lib/_divulong.c,
+	* device/lib/_fsadd.c,
+	* device/lib/acosf.c,
+	* device/lib/asincosf.c,
+	* device/lib/asinf.c,
+	* device/lib/cosf.c,
+	* device/lib/cotf.c,
+	* device/lib/expf.c,
+	* device/lib/printf_large.c,
+	* device/lib/sincosf.c,
+	* device/lib/sincoshf.c,
+	* device/lib/sinf.c,
+	* device/lib/tancotf.c,
+	* device/lib/tanf.c,
+	* support/regression/tests/bug1337835.c,
+	* support/regression/tests/bug2719592.c,
+	* support/regression/tests/bug2805333.c,
+	* support/regression/tests/bug3223041.c,
+	* support/regression/tests/bug3290691.c,
+	* support/regression/tests/funptrs.c: changed BOOL to bool
+
+2011-12-07 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* device/include/stdbool.h: removed BOOL
+	* src/SDCCast.c (decorateType, addess of),
+	* src/SDCCsymt.c (checkSClass): fixed bug 2934292
+	* support/regression/tests/bool.c: enabled function pointer tests
+
+2011-12-07 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* sdas/linksrc/aslink.h,
+	* sdas/linksrc/lkarea.c,
+	* sdas/linksrc/lkbank.c,
+	* sdas/linksrc/lkdata.c,
+	* sdas/linksrc/lklex.c,
+	* sdas/linksrc/lklist.c,
+	* sdas/linksrc/lkmain.c,
+	* sdas/linksrc/lknoice.c,
+	* sdas/linksrc/lkout.c,
+	* sdas/linksrc/lkrloc.c,
+	* sdas/linksrc/lkrloc3.c,
+	* sdas/linksrc/lks19.c,
+	* sdas/linksrc/lksym.c,
+	* sdas/linksrc/Makefile.in: and another step towards ASxxxx v5
+
+2011-12-05 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/ralloc.c:
+	  Fixed bug #3441816.
+
+2011-12-04 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* sdas/linksrc/aslink.h,
+	* sdas/linksrc/aslink.vcxproj,
+	* sdas/linksrc/aslink.vcxproj.filters,
+	* sdas/linksrc/lkar.c,
+	* sdas/linksrc/lkarea.c,
+	* sdas/linksrc/lkbank.c,
+	* sdas/linksrc/lkdata.c,
+	* sdas/linksrc/lkhead.c,
+	* sdas/linksrc/lklex.c,
+	* sdas/linksrc/lklibr.c,
+	* sdas/linksrc/lklist.c,
+	* sdas/linksrc/lkmain.c,
+	* sdas/linksrc/lkmem.c,
+	* sdas/linksrc/lknoice.c,
+	* sdas/linksrc/lkout.c,
+	* sdas/linksrc/lkrloc.c,
+	* sdas/linksrc/lkrloc3.c,
+	* sdas/linksrc/lks19.c,
+	* sdas/linksrc/lksdcclib.c,
+	* sdas/linksrc/lksdcdb.c,
+	* sdas/linksrc/lksym.c,
+	* sdas/linksrc/Makefile.in: next step towards ASxxxx v5
+	* src/SDCCmem.c (allocIntoSeg): MSVC 2010 still needs all declarations at
+	  the start of a block in C mode
+	* src/z80/gen.c (genPointerSet): fixed warning
+	* src/SDCCast.c (processParms): removed incorrect function pointer check
+	* support/regression/tests/bug3440327.c: reenabled test for mcs51
+
+2011-12-03 Philipp Klaus Krause <pkk AT spth.de>
+
+	* support/regression/tests/bug3444293.c
+	  Fix warning in regression test.
+
+2011-12-02 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCcse.c,
+	  src/SDCCicode.h:
+	  Rename IS_ASSOCIATIVE to IS_COMMUTATIVE.
+
+2011-12-01 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/ralloc2.cc,
+	  src/z80/gen.c,
+	  src/z80/peeph-z80.def:
+	  Minor improvements in pointer handling for the z80 backends.
+
+2011-12-01 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCClabel.c:
+	  Disable hidden jump-to-jump optimization for mcs51, since it breaks large and huge.
+
+2011-11-30 Philipp Klaus Krause <pkk AT spth.de>
+
+	* support/regression/tests/bug3440327.c:
+	  Disable bug 3440327 test on mcs51.
+
+2011-11-30 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/SDCCsymt.c:
+	  Cleanup leftover warning.
+
+2011-11-29 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/ralloc2.cc,
+	  src/z80/gen.c,
+	  src/z80/peeph-z80.def:
+	  Some small improvements to the generated code.
+
+2011-11-29 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/ralloc2.cc,
+	  support/regression/tests/bug3444293.c:
+	  Fixed bug #3444293.
+
+2011-11-28 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* support/regression/tests/bug3440327.c:
+	  Regression test for bug #3440327.
+
+2011-11-28 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCClabel.c:
+	  Optimize hidden jump-to-jump.
+
+2011-11-28 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/z80/gen.c:
+	  Replaced some uses of isLastUse() by the safer isPairDead().
+
+2011-11-28 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* Merged the addrspacequal branch (named address spaces).
+
+2011-11-28 Borut Razem <borut.razem AT gmail.com>
+
+	* sim/ucsim/libltdl: direcrory removed since it is not used
+	* support/scripts/gen_known_bugs.pl: warious fixes
+	* src/pic16/ralloc.c, sim/ucsim/pobj.cc, sim/ucsim/utils.cc,
+	  sdas/linksrc/lkmain.c:
+	  fixed bug #3444387: Minor spelling fix in binary files;
+	  thanks to Gudjon I. Gudjonsson for the patch
+
+2011-11-27 Borut Razem <borut.razem AT gmail.com>
+
+	* Small Device C Compiler 3.1.0 released
+	* .version, doc/sdccman.lyx: changed sdcc version to 3.1.1
+	* support/scripts/gen_known_bugs.pl: adopted to the new SF bug tracker
+
 2011-11-21 Philipp Klaus Krause <pkk AT spth.de>
 
 	* src/z80/gen.c:
 	  Fixed bug #3440327.
 
+2011-11-17 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCsymt.h,
+	  src/SDCCsymt.c,
+	  src/SDCCast.c,
+	  src/SDCCopt.c:
+	  Error message for implicit casts between named address spaces, fix live-range analysis (regression tests passing now).
+
+2011-11-15 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCsymt.c,
+	  src/SDCCerr.h,
+	  src/SDCCerr.c:
+	  Error message for attemting to use named address spacces for auto variables.
+
+2011-11-15 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCopt.c:
+	  Fix broken control and data flow handling (regression tests passing now, exept for bug-895992.c).
+
+2011-11-14 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCopt.c:
+	  Improve handling of variables in named address space passed as parameters.
+
+2011-11-14 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCopt.c:
+	  Avoid emitting some unecessary bank switching calls.
+
+2011-11-14 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCast.c:
+	  Keep global named address spaces alive over functions.
+
+2011-11-14 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCicode.c,
+	  src/SDCCopt.c:
+	  Debug message cleanup, reenable address space splitting.
+
 2011-11-14 Raphael Neider <rneider AT web.de>
 
 	* device/include/pic14/pic14devices.txt,
@@ -29,6 +3437,23 @@
 	  single mnemonic per assembly line,
 	  available peephole functions
 
+2011-11-14 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCcse.c,
+	  src/SDCCicode.c,
+	  src/SDCCopt.c:
+	  Basic support for pointers into named address spaces.
+
+2011-11-14 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCicode.c,
+	  src/SDCCsymt.c,
+	  src/SDCCsymt.h,
+	  src/SDCC.y,
+	  src/SDCCopt.c,
+	  src/SDCCast.c:
+	  Debug messages related to pointers to named address spaces.
+
 2011-11-12 Borut Razem <borut.razem AT gmail.com>
 
 	* added XXX_bits deprecation note in chapter
@@ -78,7 +3503,40 @@
 2011-11-11 Borut Razem <borut.razem AT gmail.com>
 
 	* src/SDCCsystem.c: removed wine bug workaround:
-	  wine bug #25062 was fixed in wine 1.3.8
+	  wine bug #25062 was fixed in wine 1.3.
+
+2011-11-10 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCmem.h,
+	  src/SDCCmem.c,
+	  src/SDCCglue.c:
+	  Use named address space as segment name for the linker.
+
+2011-11-10 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCsymt.h,
+	  src/SDCCsymt.c,
+	  src/SDCC.y,
+	  src/SDCCopt.c:
+	  Basic compiler-side named address space support.
+
+2011-11-09 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCsymt.h,
+	  src/SDCC.y,
+	  src/SDCCopt.c,
+	  src/SDCCicode.c
+	  src/z80/ralloc.c:
+	  Preparations for named address space support.
+
+2011-11-08 Philipp Klaus Krause <philipp AT informatik.uni-frankfurt.de>
+
+	* src/SDCCsymt.c,
+	  src/SDCCsymt.h,
+	  src/SDCC.y,
+	  src/SDCC.lex,
+	  src/SDCCast.c:
+	  Preparations for named address space support.
 
 2011-11-05 Borut Razem <borut.razem AT gmail.com>
 
@@ -3900,7 +7358,7 @@
 2010-09-18 Borut Razem <borut.razem AT siol.net>
 
 	* debugger/mcs51/cmd.c:
-	  fixed warning: suggest explicit braces to avoid ambiguous ‘else’
+	  fixed warning: suggest explicit braces to avoid ambiguous 'else'
 
 2010-09-18 Philipp Klaus Krause <pkk AT spth.de>
 
@@ -4084,7 +7542,8 @@
 	* support/regression/tests/bug3037889.c:
 	  testBug3037889() renamed to Bug3037889()
 	  so that the function is compiled but not executed
-	* src/pic/ralloc.c: fixed gcc warnings: statement with no effect
+	* src/pic/ralloc.c:
+	  fixed bug #3038483: running make of revision 5905 produces warnings
 
 2010-08-13 Borut Razem <borut.razem AT siol.net>
 
@@ -20309,7 +23768,7 @@
 	wherever there is enough space for it, and IDATA can be anywhere
 	in internal RAM.  For now compile using	-Wl-Y[stack_size].
 	The mem file is different for this option as well, since it
-	makes no sense of talking about DSEG lenght.
+	makes no sense of talking about DSEG length.
 
 2004-01-02 Vangelis Rokas <vrokas AT otenet.gr>
 
@@ -23817,6 +27276,7 @@
 2001-11-07  Michael Hope  <michaelh AT juju.net.nz>
 
 	* support/regression/tests/float.c (testFloatAdd): Fixed up warning.
+
 2001-11-18  Bernhard Held  <bernhard AT bernhardheld.de>
 
 	* sdcc/support/regression/tests/bug-460010.c: fix seg violation on host
@@ -24380,4 +27840,4 @@
 	* as/mcs51/lklex.c:  accept everything as symbol name in rel-files, bug fix ID 452601
 	* as/mcs51/lksym.c:  accept everything as symbol name in rel-files, bug fix ID 452601
 
-$Revision: 7066 $
+$Revision: 8008 $
diff -Nru sdcc-3.1.0+dfsg/Makefile.common.in sdcc-3.2.0+dfsg/Makefile.common.in
--- sdcc-3.1.0+dfsg/Makefile.common.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/Makefile.common.in	2012-02-10 10:16:50.000000000 +0000
@@ -39,26 +39,28 @@
 lib_dir_suffix     = @lib_dir_suffix@
 
 # Modules to enable/disable
-OPT_DISABLE_AVR   = @OPT_DISABLE_AVR@
-OPT_DISABLE_DS390 = @OPT_DISABLE_DS390@
-OPT_DISABLE_DS400 = @OPT_DISABLE_DS400@
-OPT_DISABLE_HC08  = @OPT_DISABLE_HC08@
-OPT_DISABLE_MCS51 = @OPT_DISABLE_MCS51@
-OPT_DISABLE_PIC14 = @OPT_DISABLE_PIC14@
-OPT_DISABLE_PIC16 = @OPT_DISABLE_PIC16@
-OPT_DISABLE_XA51  = @OPT_DISABLE_XA51@
-OPT_DISABLE_Z80   = @OPT_DISABLE_Z80@
-OPT_DISABLE_Z180  = @OPT_DISABLE_Z180@
-OPT_DISABLE_R2K   = @OPT_DISABLE_R2K@
-OPT_DISABLE_GBZ80  = @OPT_DISABLE_GBZ80@
-
-OPT_DISABLE_UCSIM     = @OPT_DISABLE_UCSIM@
-OPT_DISABLE_DEVICE_LIB= @OPT_DISABLE_DEVICE_LIB@
-OPT_DISABLE_PACKIHX   = @OPT_DISABLE_PACKIHX@
-OPT_ENABLE_DOC        = @OPT_ENABLE_DOC@
-OPT_DISABLE_SDCPP     = @OPT_DISABLE_SDCPP@
+OPT_DISABLE_AVR         = @OPT_DISABLE_AVR@
+OOPT_DISABLE_DS390      = @OPT_DISABLE_DS390@
+OPT_DISABLE_DS400       = @OPT_DISABLE_DS400@
+OPT_DISABLE_GBZ80       = @OPT_DISABLE_GBZ80@
+OPT_DISABLE_HC08        = @OPT_DISABLE_HC08@
+OPT_DISABLE_MCS51       = @OPT_DISABLE_MCS51@
+OPT_DISABLE_PIC14       = @OPT_DISABLE_PIC14@
+OPT_DISABLE_PIC16       = @OPT_DISABLE_PIC16@
+OPT_DISABLE_R2K         = @OPT_DISABLE_R2K@
+OPT_DISABLE_XA51        = @OPT_DISABLE_XA51@
+OPT_DISABLE_Z180        = @OPT_DISABLE_Z180@
+OPT_DISABLE_Z80         = @OPT_DISABLE_Z80@
+
+OPT_ENABLE_DOC          = @OPT_ENABLE_DOC@
+
+OPT_DISABLE_DEVICE_LIB  = @OPT_DISABLE_DEVICE_LIB@
+OPT_DISABLE_PACKIHX     = @OPT_DISABLE_PACKIHX@
+OPT_DISABLE_SDBINUTILS  = @OPT_DISABLE_SDBINUTILS@
+OPT_DISABLE_SDCPP       = @OPT_DISABLE_SDCPP@
+OPT_DISABLE_UCSIM       = @OPT_DISABLE_UCSIM@
 
-SLIB                  = $(top_builddir)/support/util
+SLIB                    = $(top_builddir)/support/util
 
 EXEEXT          = @EXEEXT@
 transform       = @program_transform_name@
diff -Nru sdcc-3.1.0+dfsg/Makefile.in sdcc-3.2.0+dfsg/Makefile.in
--- sdcc-3.1.0+dfsg/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/Makefile.in	2012-03-10 17:53:10.000000000 +0000
@@ -1,5 +1,5 @@
 #
-#
+# sdcc project main Makefile
 #
 
 SHELL           = /bin/sh
@@ -9,6 +9,8 @@
 top_builddir    = @top_builddir@
 top_srcdir      = @top_srcdir@
 
+EXEEXT          = @EXEEXT@
+
 include Makefile.common
 
 SDCC_LIBS       = support/makebin
@@ -20,68 +22,76 @@
 
 SDCC_PACKIHX    = support/packihx
 SDCC_LIBRARIAN  = support/librarian
-SDCC_SDRANLIB   = support/sdranlib
+SDCC_SDBINUTILS = support/sdbinutils
 
-TARGETS         = sdcc-librarian sdcc-sdranlib
+TARGETS         = sdcc-librarian
 
 ifeq ($(OPT_DISABLE_HC08), 0)
-SDCC_AS         += sdas/as6808
-SDCC_LD         += sdcc-ld6808
+SDCC_AS        += sdas/as6808
+SDCC_LD        += sdcc-ld6808
 endif
 
 ifeq ($(OPT_DISABLE_MCS51), 0)
-SDCC_AS         += sdas/as8051
-SDCC_LD         += sdcc-ld8051
-SDCC_MISC       += debugger/mcs51
+SDCC_AS        += sdas/as8051
+SDCC_LD        += sdcc-ld8051
+SDCC_MISC      += debugger/mcs51
 endif
 
 ifeq ($(OPT_DISABLE_Z80), 0)
-SDCC_AS         += sdas/asz80
-SDCC_LD         += sdcc-ldz80
+SDCC_AS        += sdas/asz80
+SDCC_LD        += sdcc-ldz80
 endif
 
 ifeq ($(OPT_DISABLE_R2K), 0)
-SDCC_AS         += sdas/asrab
-SDCC_LD         += sdcc-ldz80
+SDCC_AS        += sdas/asrab
+SDCC_LD        += sdcc-ldz80
 endif
 
 ifeq ($(OPT_DISABLE_GBZ80), 0)
-SDCC_AS         += sdas/asgb
-SDCC_LD         += sdcc-ldgb
+SDCC_AS        += sdas/asgb
+SDCC_LD        += sdcc-ldgb
 endif
 
 ifeq ($(OPT_DISABLE_UCSIM), 0)
-TARGETS         += sdcc-misc
-SDCC_MISC       += sim/ucsim
-PKGS            += $(SDCC_MISC)
+TARGETS        += sdcc-misc
+SDCC_MISC      += sim/ucsim
+PKGS           += $(SDCC_MISC)
+endif
+
+SDCC_BINUTILS   = 
+ifeq ($(OPT_DISABLE_SDBINUTILS), 0)
+TARGETS        += sdcc-sdbinutils
+PKGS           += $(SDCC_SDBINUTILS)
+SDBINUTILS_BINS = sdar$(EXEEXT) sdranlib$(EXEEXT) sdnm$(EXEEXT)
+SDCC_BINUTILS   = sdcc-sdbinutils
 endif
 
 ifeq ($(OPT_DISABLE_DEVICE_LIB), 0)
-TARGETS         += sdcc-device-lib
-PKGS            += device/lib device/non-free/lib
+TARGETS        += sdcc-device-lib
+PKGS           += device/lib device/non-free/lib
 endif
 
 ifeq ($(OPT_DISABLE_PACKIHX), 0)
-TARGETS         += sdcc-packihx
-PKGS            += $(SDCC_PACKIHX)
+TARGETS        += sdcc-packihx
+PKGS           += $(SDCC_PACKIHX)
 endif
 
 ifeq ($(OPT_ENABLE_DOC), 1)
-TARGETS         += sdcc-doc
+TARGETS        += sdcc-doc
 endif
 # always install docs, which don't need to be built 
 PKGS            += $(SDCC_DOC)
 
 ifeq ($(OPT_DISABLE_SDCPP), 0)
-SDCC_LIBS       += support/cpp
+SDCC_LIBS      += support/cpp
 endif
 
-TARGETS         += sdcc-libs sdcc-cc sdcc-device-inc sdcc-as sdcc-ld sdcc-scripts
+TARGETS        += sdcc-libs sdcc-cc sdcc-device-inc sdcc-as sdcc-ld sdcc-scripts
 
-PKGS            += $(SDCC_LIBS) src device/include device/non-free/include $(SDCC_AS) sdas/linksrc $(SDCC_LIBRARIAN) $(SDCC_SDRANLIB) $(SDCC_SCRIPTS)
+PKGS           += $(SDCC_LIBS) src device/include device/non-free/include \
+                  $(SDCC_AS) sdas/linksrc $(SDCC_LIBRARIAN) \
+                  $(SDCC_SDBINUTILS) $(SDCC_SCRIPTS)
 
-PKGS_TINI       = $(SDCC_LIBS) $(SDCC_AS) sdas/linksrc \
-                  src device/include device/non-free/include $(SDCC_PACKIHX) $(SDCC_LIBRARIAN)
 PORTS           = $(shell cat ports.build)
 ALLPORTS        = $(shell cat ports.all)
 
@@ -115,14 +125,22 @@
 sdcc-librarian:
 	$(MAKE) -C $(SDCC_LIBRARIAN)
 
-sdcc-sdranlib:
-	$(MAKE) -C $(SDCC_SDRANLIB)
+sdcc-sdbinutils:
+	$(MAKE) -C $(SDCC_SDBINUTILS)
+	# in some cases (cygwin) the real binaries are in .libs
+	for bin in $(SDBINUTILS_BINS); do \
+	  if [ -f $(SDCC_SDBINUTILS)/binutils/.libs/$$bin ]; then \
+	    cp $(SDCC_SDBINUTILS)/binutils/.libs/$$bin bin; \
+	  else \
+	    cp $(SDCC_SDBINUTILS)/binutils/$$bin bin; \
+	  fi \
+	done
 
 sdcc-device-inc:
 	$(MAKE) -C device/include
 	$(MAKE) -C device/non-free/include
 
-sdcc-device-lib: sdcc-cc sdcc-as sdcc-ld
+sdcc-device-lib: sdcc-cc sdcc-as sdcc-ld $(SDCC_BINUTILS)
 	$(MAKE) -C device/lib
 	$(MAKE) -C device/non-free/lib
 
@@ -137,7 +155,7 @@
 
 sdcc: $(TARGETS)
 
-sdcc-tini: sdcc-librarian sdcc-sdranlib sdcc-cc sdcc-as sdcc-ld sdcc-device-tini sdcc-packihx
+sdcc-tini: sdcc-librarian sdcc-cc sdcc-as sdcc-ld sdcc-device-tini sdcc-packihx
 	$(MAKE) -f main.mk all
 
 # Some interesting sub rules
@@ -153,15 +171,6 @@
 	  $(MAKE) -C $$pkg install ;\
 	done
 
-install-tini: checkconf sdcc
-	$(MAKE) -f main.mk install
-	@for pkg in $(PKGS_TINI); do\
-	  $(MAKE) -C $$pkg install ;\
-	done
-	$(MAKE) -C device/lib install
-
-
-
 # Deleting all the installed files
 # --------------------------------
 uninstall:
@@ -170,7 +179,6 @@
 	  $(MAKE) -C $$pkg uninstall ;\
 	done
 
-
 # Deleting all files created by building the program
 # --------------------------------------------------
 clean:
@@ -202,7 +210,6 @@
 	  $(MAKE) -C $$pkg PORTS="$(PORTS)" EXEEXT=$(EXEEXT) mostlyclean ;\
 	done
 
-
 # Deleting everything that can reconstructed by this Makefile. It deletes
 # everything deleted by distclean plus files created by bison, stc.
 # -----------------------------------------------------------------------
@@ -212,7 +219,6 @@
 	  $(MAKE) -C $$pkg PORTS="$(PORTS)" EXEEXT=$(EXEEXT) realclean ;\
 	done
 
-
 # Creating distribution
 # ---------------------
 dist: distclean
@@ -222,17 +228,14 @@
 	  mkdist sdcc;\
 	fi
 
-
 # Performing self-test
 # --------------------
 check:
 
-
 # Performing installation test
 # ----------------------------
 installcheck:
 
-
 # Creating dependencies
 # ---------------------
 dep: $(SDCC_LIBS)
@@ -241,7 +244,6 @@
 	  $(MAKE) -C $$pkg dep ;\
 	done
 
-
 # My rules
 # --------
 newer: distclean
@@ -257,7 +259,6 @@
 putcopyright:
 	'put(c)' -s $(STARTYEAR) *.cc *.h *.y *.l
 
-
 # Remaking configuration
 # ----------------------
 configure: configure.in
diff -Nru sdcc-3.1.0+dfsg/all.vcxproj sdcc-3.2.0+dfsg/all.vcxproj
--- sdcc-3.1.0+dfsg/all.vcxproj	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/all.vcxproj	2012-06-28 14:09:28.000000000 +0000
@@ -59,94 +59,129 @@
   <ItemGroup>
     <CustomBuild Include="bin_vc\sdranlib.exe">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy bin_vc\sdranlib.exe  bin /y &gt; nul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bin\sdranlib.exe;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy bin_vc\sdranlib.exe  bin /y &gt; nul</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating: %(Outputs)</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bin\sdranlib.exe;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating: %(Outputs)</Message>
     </CustomBuild>
     <CustomBuild Include="bin_vc\sdcdb.exe">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy bin_vc\sdcdb.exe  bin /y &gt; nul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bin\sdcdb.exe;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy bin_vc\sdcdb.exe  bin /y &gt; nul</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating: %(Outputs)</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bin\sdcdb.exe;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating: %(Outputs)</Message>
     </CustomBuild>
     <None Include="ChangeLog" />
     <CustomBuild Include="bin_vc\makebin.exe">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy bin_vc\makebin.exe  bin /y &gt; nul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bin\makebin.exe;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy bin_vc\makebin.exe  bin /y &gt; nul</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating: %(Outputs)</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bin\makebin.exe;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating: %(Outputs)</Message>
     </CustomBuild>
     <CustomBuild Include="bin_vc\packihx.exe">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy bin_vc\packihx.exe  bin /y &gt; nul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bin\packihx.exe;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy bin_vc\packihx.exe  bin /y &gt; nul</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating: %(Outputs)</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bin\packihx.exe;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating: %(Outputs)</Message>
     </CustomBuild>
     <CustomBuild Include="bin_vc\sdas6808.exe">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy bin_vc\sdas6808.exe bin /y &gt; nul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bin\sdas6808.exe;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy bin_vc\sdas6808.exe bin /y &gt; nul</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating: %(Outputs)</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bin\sdas6808.exe;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating: %(Outputs)</Message>
     </CustomBuild>
     <CustomBuild Include="bin_vc\sdas8051.exe">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy bin_vc\sdas8051.exe  bin /y &gt; nul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bin\sdas8051.exe;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy bin_vc\sdas8051.exe  bin /y &gt; nul</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating: %(Outputs)</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bin\sdas8051.exe;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating: %(Outputs)</Message>
     </CustomBuild>
     <CustomBuild Include="bin_vc\sdasgb.exe">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy bin_vc\sdasgb.exe bin /y &gt; nul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bin\sdasgb.exe;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy bin_vc\sdasgb.exe bin /y &gt; nul</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating: %(Outputs)</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bin\sdasgb.exe;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating: %(Outputs)</Message>
+    </CustomBuild>
+    <CustomBuild Include="bin_vc\sdasrab.exe">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(Identity) bin /y &gt; nul</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bin\sdasrab.exe;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating: %(Outputs)</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(Identity) bin /y &gt; nul</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bin\sdasrab.exe;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating: %(Outputs)</Message>
     </CustomBuild>
     <CustomBuild Include="bin_vc\sdasz80.exe">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy bin_vc\sdasz80.exe bin /y &gt; nul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bin\sdasz80.exe;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy bin_vc\sdasz80.exe bin /y &gt; nul</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating: %(Outputs)</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bin\sdasz80.exe;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating: %(Outputs)</Message>
     </CustomBuild>
     <CustomBuild Include="bin_vc\sdcc.exe">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy bin_vc\sdcc.exe  bin /y &gt; nul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bin\sdcc.exe;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy bin_vc\sdcc.exe  bin /y &gt; nul</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating: %(Outputs)</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bin\sdcc.exe;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating: %(Outputs)</Message>
     </CustomBuild>
     <CustomBuild Include="bin_vc\sdcclib.exe">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy bin_vc\sdcclib.exe  bin /y &gt; nul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bin\sdcclib.exe;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy bin_vc\sdcclib.exe  bin /y &gt; nul</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating: %(Outputs)</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bin\sdcclib.exe;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating: %(Outputs)</Message>
     </CustomBuild>
     <CustomBuild Include="bin_vc\sdcpp.exe">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy bin_vc\sdcpp.exe  bin /y &gt; nul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bin\sdcpp.exe;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy bin_vc\sdcpp.exe  bin /y &gt; nul</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating: %(Outputs)</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(Identity) bin /y &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bin\sdcpp.exe;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating: %(Outputs)</Message>
     </CustomBuild>
     <CustomBuild Include="bin_vc\sdld.exe">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy bin_vc\sdld.exe bin\sdld.exe /y &gt; nul
-copy bin_vc\sdld.exe bin\sdldz80.exe /y &gt; nul
-copy bin_vc\sdld.exe bin\sdldgb.exe /y &gt; nul
-copy bin_vc\sdld.exe bin\sdld6808.exe /y &gt; nul</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bin\sdld.exe;bin\sdldz80.exe;bin\sdldgb.exe;bin\sdld6808.exe;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy bin_vc\sdld.exe bin\sdld.exe /y &gt; nul
-copy bin_vc\sdld.exe bin\sdldz80.exe /y &gt; nul
-copy bin_vc\sdld.exe bin\sdldgb.exe /y &gt; nul
-copy bin_vc\sdld.exe bin\sdld6808.exe /y &gt; nul</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bin\sdld.exe;bin\sdldz80.exe;bin\sdldgb.exe;bin\sdld6808.exe;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(Identity) bin\sdld.exe /y &gt; nul
+copy %(Identity) bin\sdldz80.exe /y &gt; nul
+copy %(Identity) bin\sdldrab.exe /y &gt; nul
+copy %(Identity) bin\sdldgb.exe /y &gt; nul
+copy %(Identity) bin\sdld6808.exe /y &gt; nul</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bin\sdld.exe;bin\sdldz80.exe;bin\sdldrab.exe;bin\sdldgb.exe;bin\sdld6808.exe;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating: %(Outputs)</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(Identity) bin\sdld.exe /y &gt; nul
+copy %(Identity) bin\sdldz80.exe /y &gt; nul
+copy %(Identity) bin\sdldrab.exe /y &gt; nul
+copy %(Identity) bin\sdldgb.exe /y &gt; nul
+copy %(Identity) bin\sdld6808.exe /y &gt; nul</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bin\sdld.exe;bin\sdldz80.exe;bin\sdldrab.exe;bin\sdldgb.exe;bin\sdld6808.exe;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating: %(Outputs)</Message>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
@@ -174,7 +209,7 @@
       <Project>{6e94db45-345e-4697-98da-6c72237d6eca}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="src\src.vcxproj">
+    <ProjectReference Include="src\sdcc.vcxproj">
       <Project>{f9485499-151b-4886-935c-7d687c4a0549}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
@@ -194,4 +229,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff -Nru sdcc-3.1.0+dfsg/all.vcxproj.filters sdcc-3.2.0+dfsg/all.vcxproj.filters
--- sdcc-3.1.0+dfsg/all.vcxproj.filters	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/all.vcxproj.filters	2012-03-18 18:25:04.000000000 +0000
@@ -22,10 +22,7 @@
     <CustomBuild Include="bin_vc\sdcclib.exe" />
     <CustomBuild Include="bin_vc\sdcpp.exe" />
     <CustomBuild Include="bin_vc\sdld.exe" />
-    <CustomBuild Include="bin_vc\sdld6808.exe" />
-    <CustomBuild Include="bin_vc\sdldgb.exe" />
-    <CustomBuild Include="bin_vc\sdldz80.exe" />
-    <CustomBuild Include="bin_vc\asranlib.exe" />
     <CustomBuild Include="bin_vc\sdcdb.exe" />
+    <CustomBuild Include="bin_vc\sdranlib.exe" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff -Nru sdcc-3.1.0+dfsg/cleanup-script.sh sdcc-3.2.0+dfsg/cleanup-script.sh
--- sdcc-3.1.0+dfsg/cleanup-script.sh	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/cleanup-script.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-#       clean upstream source to achieve DFSG compliance
-#       Copyright 2008 by Bdale Garbee.  GPL v2 or any later version.
-#
-rm -rf device/non-free
-rm -rf sim/ucsim/libltdl
-
-
diff -Nru sdcc-3.1.0+dfsg/config.guess sdcc-3.2.0+dfsg/config.guess
--- sdcc-3.1.0+dfsg/config.guess	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/config.guess	2012-03-05 20:14:11.000000000 +0000
@@ -0,0 +1,1530 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
+
+timestamp='2012-02-10'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+	echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[4567])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			esac ;;
+		    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+	exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+	exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+	exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+	exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    5000:UNIX_System_V:4.*:*)
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
+    i*:windows32*:*)
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    cris:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-gnu
+	exit ;;
+    crisv32:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-gnu
+	exit ;;
+    frv:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	;;
+    or32:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit ;;
+    sh64*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
+    x86_64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    xtensa*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+	# Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+		echo mips-nec-sysv${UNAME_RELEASE}
+	else
+		echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+	exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+	echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+	"4"
+#else
+	""
+#endif
+	); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    c34*)
+	echo c34-convex-bsd
+	exit ;;
+    c38*)
+	echo c38-convex-bsd
+	exit ;;
+    c4*)
+	echo c4-convex-bsd
+	exit ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff -Nru sdcc-3.1.0+dfsg/config.sub sdcc-3.2.0+dfsg/config.sub
--- sdcc-3.1.0+dfsg/config.sub	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/config.sub	2012-03-05 20:14:11.000000000 +0000
@@ -0,0 +1,1773 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
+
+timestamp='2012-02-10'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted GNU ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| aarch64 | aarch64_be \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
+	| bfin \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
+	| fido | fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 \
+	| ns16k | ns32k \
+	| open8 \
+	| or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pyramid \
+	| rl78 | rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| we32k \
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| aarch64-* | aarch64_be-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| be32-* | be64-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pyramid-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	microblaze)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc | ppcbe)	basic_machine=powerpc-unknown
+		;;
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+	# First match some system type aliases
+	# that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* | -aros* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	score-*)
+		os=-elf
+		;;
+	spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-cnk*|-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff -Nru sdcc-3.1.0+dfsg/config.vcxproj sdcc-3.2.0+dfsg/config.vcxproj
--- sdcc-3.1.0+dfsg/config.vcxproj	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/config.vcxproj	2012-05-05 14:39:36.000000000 +0000
@@ -60,29 +60,34 @@
     <CustomBuild Include="sdas\linksrc\asxxxx_config.h.in">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f configure_vc.awk sdas/linksrc/asxxxx_config.h.in &gt; sdas/linksrc/asxxxx_config.h</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">sdas/linksrc/asxxxx_config.h;%(Outputs)</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f configure_vc.awk sdas/linksrc/asxxxx_config.h.in &gt; sdas/linksrc/asxxxx_config.h</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">sdas/linksrc/asxxxx_config.h;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">sdas/linksrc/asxxxx_config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating: asxxxx_config.h</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating: asxxxx_config.h</Message>
     </CustomBuild>
-    <None Include="configure_vc.awk" />
-    <CustomBuild Include="src\version.awk">
+    <CustomBuild Include=".version">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f %(FullPath) ChangeLog  &gt; .\src\version.h</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f src/version.awk ChangeLog  &gt; ./src/version.h</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f src/version.awk ChangeLog  &gt; ./src/version.h</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ChangeLog;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\src\version.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f %(FullPath) ChangeLog  &gt; .\src\version.h</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ChangeLog;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\src\version.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./src/version.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./src/version.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating: version.h</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating: version.h</Message>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="sdcc_vc_in.h">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f configure_vc.awk sdcc_vc_in.h &gt; sdcc_vc.h</Command>
+    <CustomBuild Include="sdcc_vc.h.in">
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f configure_vc.awk sdcc_vc.h.in &gt; sdcc_vc.h</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f configure_vc.awk sdcc_vc.h.in &gt; sdcc_vc.h</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.version;configure_vc.awk;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">sdcc_vc.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f configure_vc.awk sdcc_vc_in.h &gt; sdcc_vc.h</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.version;configure_vc.awk;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">sdcc_vc.h;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">sdcc_vc.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating: sdcc_vc.h</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating: sdcc_vc.h</Message>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff -Nru sdcc-3.1.0+dfsg/configure sdcc-3.2.0+dfsg/configure
--- sdcc-3.1.0+dfsg/configure	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/configure	2012-05-18 16:09:24.000000000 +0000
@@ -1,11 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67.
+# Generated by GNU Autoconf 2.69.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -89,6 +87,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -133,6 +132,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -166,7 +190,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -211,14 +236,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -320,6 +356,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -441,6 +485,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -475,16 +523,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -496,28 +544,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -603,6 +631,7 @@
 LATEX2HTML
 LYX
 OPT_ENABLE_DOC
+OPT_DISABLE_SDBINUTILS
 OPT_DISABLE_SDCDB
 OPT_DISABLE_SDCPP
 OPT_DISABLE_PACKIHX
@@ -610,12 +639,14 @@
 OPT_DISABLE_UCSIM
 OPT_DISABLE_XA51
 OPT_DISABLE_AVR
+OPT_DISABLE_S08
 OPT_DISABLE_HC08
 OPT_DISABLE_PIC16
 OPT_DISABLE_PIC14
 OPT_DISABLE_DS400
 OPT_DISABLE_DS390
 OPT_DISABLE_GBZ80
+OPT_DISABLE_R3KA
 OPT_DISABLE_R2K
 OPT_DISABLE_Z180
 OPT_DISABLE_Z80
@@ -626,7 +657,6 @@
 include_dir_suffix
 LIB_TYPE
 sdccconf_h_dir_separator
-AR_S_FLAG
 C99_FLAG
 WALL_FLAG
 MAKEDEP
@@ -662,6 +692,14 @@
 VERSION
 PACKAGE
 AWK
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
 target_alias
 host_alias
 build_alias
@@ -708,12 +746,14 @@
 enable_z80_port
 enable_z180_port
 enable_r2k_port
+enable_r3ka_port
 enable_gbz80_port
 enable_ds390_port
 enable_ds400_port
 enable_pic14_port
 enable_pic16_port
 enable_hc08_port
+enable_s08_port
 enable_avr_port
 enable_xa51_port
 enable_ucsim
@@ -721,6 +761,7 @@
 enable_packihx
 enable_sdcpp
 enable_sdcdb
+enable_sdbinutils
 enable_doc
 enable_libgc
 '
@@ -748,6 +789,7 @@
 support/packihx
 sim/ucsim
 debugger/mcs51
+support/sdbinutils
 device/lib/pic14 device/non-free/lib/pic14
 device/lib/pic16 device/non-free/lib/pic16'
 
@@ -1153,7 +1195,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1204,8 +1246,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1352,6 +1392,10 @@
   --program-prefix=PREFIX            prepend PREFIX to installed program names
   --program-suffix=SUFFIX            append SUFFIX to installed program names
   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
 _ACEOF
 fi
 
@@ -1367,12 +1411,14 @@
   --disable-z80-port      Excludes the z80 port
   --disable-z180-port     Excludes the z180 port
   --disable-r2k-port      Excludes the r2k port
+  --disable-r3ka-port     Excludes the r3ka port
   --disable-gbz80-port    Excludes the Gameboy gbz80 port
   --disable-ds390-port    Excludes the DS390 port
   --disable-ds400-port    Excludes the DS400 port
   --disable-pic14-port    Excludes the PIC14 port
   --disable-pic16-port    Excludes the PIC16 port
   --disable-hc08-port     Excludes the HC08 port
+  --disable-s08-port      Excludes the S08 port
   --enable-avr-port       Includes the AVR port (disabled by default)
   --enable-xa51-port      Includes the XA51 port (disabled by default)
   --disable-ucsim         Disables configuring and building of ucsim
@@ -1380,6 +1426,7 @@
   --disable-packihx       Disables building packihx
   --disable-sdcpp         Disables building sdcpp
   --disable-sdcdb         Disables building sdcdb
+  --disable-sdbinutils    Disables configuring and building of sdbinutils
   --enable-doc            Enables building the documentation
   --enable-libgc          Use the Bohem memory allocator. Lower runtime
                           footprint.
@@ -1482,9 +1529,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.67
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1528,7 +1575,7 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1565,7 +1612,7 @@
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -1603,7 +1650,7 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_compile
@@ -1616,10 +1663,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
+  if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1682,7 +1729,7 @@
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -1691,7 +1738,7 @@
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 
@@ -1732,7 +1779,7 @@
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -1746,7 +1793,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1764,7 +1811,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
@@ -1800,7 +1847,7 @@
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_cpp
@@ -1813,10 +1860,10 @@
 ac_fn_cxx_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
+  if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1879,7 +1926,7 @@
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -1888,7 +1935,7 @@
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_cxx_check_header_mongrel
 
@@ -1919,7 +1966,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1933,7 +1980,7 @@
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -1946,7 +1993,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2001,7 +2048,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 
@@ -2022,7 +2069,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2038,7 +2086,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2064,7 +2113,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2080,7 +2130,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2114,7 +2165,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2178,7 +2230,7 @@
 rm -f conftest.val
 
   fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
@@ -2187,7 +2239,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2445,7 +2497,7 @@
       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -2535,7 +2587,111 @@
 
 
 
-ac_config_headers="$ac_config_headers sdccconf.h:sdccconf_in.h custom.h:custom_in.h sdas/linksrc/asxxxx_config.h"
+
+# Determine the host and build type.
+# ===========================================================================
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
+ac_config_headers="$ac_config_headers sdccconf.h:sdccconf_in.h sdas/linksrc/asxxxx_config.h"
 
 
 for ac_prog in gawk mawk nawk awk
@@ -2544,7 +2700,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -2556,7 +2712,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2654,7 +2810,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2666,7 +2822,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2694,7 +2850,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -2706,7 +2862,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2747,7 +2903,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2759,7 +2915,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2787,7 +2943,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2800,7 +2956,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -2846,7 +3002,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2858,7 +3014,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2890,7 +3046,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -2902,7 +3058,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2945,7 +3101,7 @@
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3060,7 +3216,7 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3103,7 +3259,7 @@
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3162,7 +3318,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
@@ -3173,7 +3329,7 @@
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3214,7 +3370,7 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -3224,7 +3380,7 @@
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3261,7 +3417,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -3339,7 +3495,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -3348,8 +3504,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3446,7 +3601,7 @@
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -3562,7 +3717,7 @@
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -3587,7 +3742,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
+if ${ac_cv_prog_CXX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -3599,7 +3754,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3631,7 +3786,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
@@ -3643,7 +3798,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3709,7 +3864,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3746,7 +3901,7 @@
 ac_save_CXXFLAGS=$CXXFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
+if ${ac_cv_prog_cxx_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -3828,35 +3983,6 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -3874,7 +4000,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3894,7 +4020,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -3955,7 +4081,7 @@
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -3967,7 +4093,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3995,7 +4121,7 @@
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -4007,7 +4133,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4046,7 +4172,7 @@
 set dummy autoconf; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AUTOCONF+set}" = set; then :
+if ${ac_cv_prog_AUTOCONF+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AUTOCONF"; then
@@ -4058,7 +4184,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AUTOCONF="autoconf"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4084,7 +4210,7 @@
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -4096,7 +4222,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4122,7 +4248,7 @@
 set dummy as; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AS+set}" = set; then :
+if ${ac_cv_prog_AS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AS"; then
@@ -4134,7 +4260,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AS="as"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4160,7 +4286,7 @@
 set dummy cp; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CP+set}" = set; then :
+if ${ac_cv_prog_CP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CP"; then
@@ -4172,7 +4298,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CP="cp"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4198,7 +4324,7 @@
 set dummy ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
+if ${ac_cv_prog_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
@@ -4210,7 +4336,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="ar"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4239,7 +4365,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LEX+set}" = set; then :
+if ${ac_cv_prog_LEX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LEX"; then
@@ -4251,7 +4377,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LEX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4283,7 +4409,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_YACC+set}" = set; then :
+if ${ac_cv_prog_YACC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$YACC"; then
@@ -4295,7 +4421,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_YACC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4343,7 +4469,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -4357,7 +4483,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4406,7 +4532,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4423,7 +4549,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -4473,7 +4599,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4628,7 +4754,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
 $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
+  if ${ac_cv_prog_CXXCPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
@@ -4744,7 +4870,7 @@
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=cpp
@@ -4773,7 +4899,7 @@
 for ac_header in boost/graph/adjacency_list.hpp
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "boost/graph/adjacency_list.hpp" "ac_cv_header_boost_graph_adjacency_list_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_graph_adjacency_list_hpp" = x""yes; then :
+if test "x$ac_cv_header_boost_graph_adjacency_list_hpp" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_BOOST_GRAPH_ADJACENCY_LIST_HPP 1
 _ACEOF
@@ -4802,7 +4928,7 @@
 set dummy ccache; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CCACHE+set}" = set; then :
+if ${ac_cv_prog_CCACHE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CCACHE"; then
@@ -4814,7 +4940,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CCACHE="ccache"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4846,7 +4972,7 @@
 for ac_func in strerror
 do :
   ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
-if test "x$ac_cv_func_strerror" = x""yes; then :
+if test "x$ac_cv_func_strerror" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRERROR 1
 _ACEOF
@@ -4871,24 +4997,24 @@
 # Macro definitions
 # ===========================================================================
 
-# _bor_EXECUTE_IFELSE_BODY(COMMAND)
+# _sdcc_EXECUTE_IFELSE_BODY(COMMAND)
 # -----------------------
 # Shell function body for _AC_EXECUTE_IFELSE.
-# _bor_EXECUTE_IFELSE_BODY
+# _sdcc_EXECUTE_IFELSE_BODY
 
-# bor_EXECUTE_IFELSE(COMMAND[ACTION-IF-TRUE], [ACTION-IF-FALSE])
+# sdcc_EXECUTE_IFELSE(COMMAND[ACTION-IF-TRUE], [ACTION-IF-FALSE])
 # ----------------------------------------------------------------
 # Try to execute COMMAND.
-# bor_EXECUTE_IFELSE
+# sdcc_EXECUTE_IFELSE
 
 # Check whether the compiler for the current language is SunPRO.
 
 
 
-# bor_IS_VALID_OPTION macro checks if the current compiler, selected by
+# sdcc_IS_VALID_OPTION macro checks if the current compiler, selected by
 # AC_LANG, supports option specified as the 1st parameter. The test fails if
 # the compiler returns an error or in case something is writeen to stderr.
-# For example: bor_VALID_OPT(fPIC)
+# For example: sdcc_VALID_OPT(-fPIC)
 
 
 
@@ -4959,7 +5085,7 @@
 if test "$ac_cv_c_compiler_gnu" = "yes"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether preprocessor accepts -MM or -M" >&5
 $as_echo_n "checking whether preprocessor accepts -MM or -M... " >&6; }
-if test "${sdcc_cv_MM+set}" = set; then :
+if ${sdcc_cv_MM+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   echo "#include <stdio.h>" >_test_.c
@@ -4976,14 +5102,15 @@
 $as_echo "$sdcc_cv_MM" >&6; }
 
   # This is the first time when CFLAGS are set/modified!!
-  ac_test_CFLAGS=${CFLAGS+set}
-bor_save_CFLAGS=$CFLAGS
+  arg1=`echo -ggdb | sed -e"s/^-*//" -e"s/-/_/"`
+ac_test_CFLAGS=${CFLAGS+set}
+sdcc_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C accepts -ggdb" >&5
 $as_echo_n "checking whether C accepts -ggdb... " >&6; }
-if test "${bor_cv_c_ggdb+set}" = set; then :
+if eval \${sdcc_cv_c_$arg1+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  bor_save_c_werror_flag=$ac_c_werror_flag
+  sdcc_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
 
    CFLAGS="-ggdb"
@@ -4999,30 +5126,32 @@
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  bor_cv_c_ggdb=yes
+  eval sdcc_cv_c_$arg1=yes
 else
-  bor_cv_c_ggdb=no
+  eval sdcc_cv_c_$arg1=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$bor_save_c_werror_flag
+   ac_c_werror_flag=$sdcc_save_c_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bor_cv_c_ggdb" >&5
-$as_echo "$bor_cv_c_ggdb" >&6; }
-   CFLAGS=$bor_save_CFLAGS
+eval ac_res=\$sdcc_cv_c_$arg1
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+   CFLAGS=$sdcc_save_CFLAGS
 
-  if test "$bor_cv_c_ggdb" = "yes"; then
+  if test "$sdcc_cv_c_ggdb" = "yes"; then
     CFLAGS="-ggdb ${CFLAGS}"
     CXXFLAGS="-ggdb ${CXXFLAGS}"
   fi
 
-  ac_test_CFLAGS=${CFLAGS+set}
-bor_save_CFLAGS=$CFLAGS
+  arg1=`echo -pipe | sed -e"s/^-*//" -e"s/-/_/"`
+ac_test_CFLAGS=${CFLAGS+set}
+sdcc_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C accepts -pipe" >&5
 $as_echo_n "checking whether C accepts -pipe... " >&6; }
-if test "${bor_cv_c_pipe+set}" = set; then :
+if eval \${sdcc_cv_c_$arg1+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  bor_save_c_werror_flag=$ac_c_werror_flag
+  sdcc_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
 
    CFLAGS="-pipe"
@@ -5038,18 +5167,19 @@
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  bor_cv_c_pipe=yes
+  eval sdcc_cv_c_$arg1=yes
 else
-  bor_cv_c_pipe=no
+  eval sdcc_cv_c_$arg1=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$bor_save_c_werror_flag
+   ac_c_werror_flag=$sdcc_save_c_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bor_cv_c_pipe" >&5
-$as_echo "$bor_cv_c_pipe" >&6; }
-   CFLAGS=$bor_save_CFLAGS
+eval ac_res=\$sdcc_cv_c_$arg1
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+   CFLAGS=$sdcc_save_CFLAGS
 
-  if test "$bor_cv_c_pipe" = "yes"; then
+  if test "$sdcc_cv_c_pipe" = "yes"; then
     CFLAGS="-pipe ${CFLAGS}"
     # Don't use "-pipe" on x86 Solaris g++, since src/z80/ralloc2.cc dies with:
     # Assembler: ralloc2.cc
@@ -5065,7 +5195,7 @@
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the SunPRO C compiler" >&5
 $as_echo_n "checking whether we are using the SunPRO C compiler... " >&6; }
-if test "${bor_cv_c_compiler_sunpro+set}" = set; then :
+if ${sdcc_cv_c_compiler_sunpro+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5083,17 +5213,16 @@
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  bor_compiler_sunpro=yes
+  sdcc_cv_c_compiler_sunpro=yes
 else
-  bor_compiler_sunpro=no
+  sdcc_cv_c_compiler_sunpro=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-bor_cv_c_compiler_sunpro=$bor_compiler_sunpro
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bor_cv_c_compiler_sunpro" >&5
-$as_echo "$bor_cv_c_compiler_sunpro" >&6; }
-  if test "$bor_cv_c_compiler_sunpro" = "yes"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sdcc_cv_c_compiler_sunpro" >&5
+$as_echo "$sdcc_cv_c_compiler_sunpro" >&6; }
+  if test "$sdcc_cv_c_compiler_sunpro" = "yes"; then
     C99_FLAG="-xc99"
     CFLAGS="-xO2 ${C99_FLAG} ${CFLAGS}"
     CXXFLAGS="-xO2 ${CXXFLAGS}"
@@ -5106,55 +5235,112 @@
 
 
 
-# does AR accept the -S flag
-echo '!<arch>' > conftest.ar
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $AR accepts -S" >&5
-$as_echo_n "checking whether $AR accepts -S... " >&6; }
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$AR -S -t conftest.ar "
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$AR -S -t conftest.ar ") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.out && {
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
+# SDCC_C_UNNAMED_STRUCT_TAG ()
+# chech whether C compiler supports tag in unnamed struct
+# -------------------------------------------------------------------------
+
+
+
+  if test "$ac_cv_c_compiler_gnu" = "yes"; then
+    arg1=`echo -fms-extensions | sed -e"s/^-*//" -e"s/-/_/"`
+ac_test_CFLAGS=${CFLAGS+set}
+sdcc_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C accepts -fms-extensions" >&5
+$as_echo_n "checking whether C accepts -fms-extensions... " >&6; }
+if eval \${sdcc_cv_c_$arg1+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  sdcc_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
 
-  if test "$ac_retval" = 0; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    AR_S_FLAG="-S"
+   CFLAGS="-fms-extensions"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval sdcc_cv_c_$arg1=yes
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    AR_S_FLAG=""
+  eval sdcc_cv_c_$arg1=no
 fi
-rm conftest.err conftest.out
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$sdcc_save_c_werror_flag
+fi
+eval ac_res=\$sdcc_cv_c_$arg1
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+   CFLAGS=$sdcc_save_CFLAGS
+
+  else
+    sdcc_cv_c_fms_extensions=no
+  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C supports tag in unnamed struct" >&5
+$as_echo_n "checking whether C supports tag in unnamed struct... " >&6; }
+if ${sdcc_cv_c_unnamed_struct_tag+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$sdcc_cv_c_fms_extensions" = "yes"; then
+      CFLAGS="-fms-extensions ${CFLAGS}"
+    fi
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+struct s1 {
+  int a;
+};
+
+struct s2 {
+  struct s1;
+  int b;
+};
+
+int
+main ()
+{
+
+  struct s2 s;
+
+  s.a = 1;
+  s.b = 2;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+        sdcc_cv_c_unnamed_struct_tag=yes
+
+cat >>confdefs.h <<_ACEOF
+#define UNNAMED_STRUCT_TAG 1
+_ACEOF
+
+
+else
 
-rm conftest.ar
+        sdcc_cv_c_unnamed_struct_tag=no
 
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sdcc_cv_c_unnamed_struct_tag" >&5
+$as_echo "$sdcc_cv_c_unnamed_struct_tag" >&6; }
 
 
 # Checks for typedefs, structures, and compiler characteristics.
 # ===========================================================================
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
 $as_echo_n "checking return type of signal handlers... " >&6; }
-if test "${ac_cv_type_signal+set}" = set; then :
+if ${ac_cv_type_signal+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5192,7 +5378,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5
 $as_echo_n "checking size of char... " >&6; }
-if test "${ac_cv_sizeof_char+set}" = set; then :
+if ${ac_cv_sizeof_char+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char"        "$ac_includes_default"; then :
@@ -5202,7 +5388,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (char)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_char=0
    fi
@@ -5225,7 +5411,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
 $as_echo_n "checking size of short... " >&6; }
-if test "${ac_cv_sizeof_short+set}" = set; then :
+if ${ac_cv_sizeof_short+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
@@ -5235,7 +5421,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (short)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_short=0
    fi
@@ -5258,7 +5444,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
 $as_echo_n "checking size of int... " >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then :
+if ${ac_cv_sizeof_int+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
@@ -5268,7 +5454,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (int)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_int=0
    fi
@@ -5291,7 +5477,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
 $as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then :
+if ${ac_cv_sizeof_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
@@ -5301,7 +5487,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
    fi
@@ -5318,9 +5504,42 @@
 _ACEOF
 
 
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+$as_echo_n "checking size of long long... " >&6; }
+if ${ac_cv_sizeof_long_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (long long)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_long_long=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
+$as_echo "$ac_cv_sizeof_long_long" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+_ACEOF
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5
 $as_echo_n "checking whether char is unsigned... " >&6; }
-if test "${ac_cv_c_char_unsigned+set}" = set; then :
+if ${ac_cv_c_char_unsigned+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5330,7 +5549,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(((char) -1) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -5369,6 +5589,10 @@
     echo "long"
     exit
   fi
+  if expr "$ac_cv_sizeof_long_long" '>=' "$1" >/dev/null; then
+    echo "long long"
+    exit
+  fi
   echo "long"
 }
 
@@ -5392,6 +5616,11 @@
 TYPE_DWORD=`type_name 4`
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TYPE_DWORD" >&5
 $as_echo "$TYPE_DWORD" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking type name for qword" >&5
+$as_echo_n "checking type name for qword... " >&6; }
+TYPE_QWORD=`type_name 8`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TYPE_QWORD" >&5
+$as_echo "$TYPE_QWORD" >&6; }
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5409,6 +5638,11 @@
 _ACEOF
 
 
+cat >>confdefs.h <<_ACEOF
+#define TYPE_QWORD $TYPE_QWORD
+_ACEOF
+
+
 
 cat >>confdefs.h <<_ACEOF
 #define TYPE_UBYTE unsigned $TYPE_CHAR
@@ -5425,29 +5659,68 @@
 _ACEOF
 
 
+cat >>confdefs.h <<_ACEOF
+#define TYPE_UQWORD unsigned $TYPE_QWORD
+_ACEOF
 
-# SDCC_BUILD_BIGENDIAN ([ACTION-IF-TRUE], [ACTION-IF-FALSE], [ACTION-IF-UNKNOWN])
-# -------------------------------------------------------------------------
-# SDCC_BUILD_BIGENDIAN
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether host machine byte ordering is bigendian" >&5
-$as_echo_n "checking whether host machine byte ordering is bigendian... " >&6; }
-if test "${sdcc_cv_build_bigendian+set}" = set; then :
+# Checking whether byte ordering is bigendian
+# ===========================================================================
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if ${ac_cv_c_bigendian+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  # See if sys/param.h defines the BYTE_ORDER macro.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+	# Check for potential -arch flags.  It is not universal unless
+	# there are at least two -arch flags with different values.
+	ac_arch=
+	ac_prev=
+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+	 if test -n "$ac_prev"; then
+	   case $ac_word in
+	     i?86 | x86_64 | ppc | ppc64)
+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+		 ac_arch=$ac_word
+	       else
+		 ac_cv_c_bigendian=universal
+		 break
+	       fi
+	       ;;
+	   esac
+	   ac_prev=
+	 elif test "x$ac_word" = "x-arch"; then
+	   ac_prev=arch
+	 fi
+       done
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+	     #include <sys/param.h>
 
 int
 main ()
 {
-#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-        && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
- bogus endian macros
-#endif
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
 
   ;
   return 0;
@@ -5455,61 +5728,116 @@
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   # It does; now see whether it defined to BIG_ENDIAN or not.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+		#include <sys/param.h>
 
 int
 main ()
 {
 #if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
+		 not big endian
+		#endif
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  sdcc_cv_build_bigendian=yes
+  ac_cv_c_bigendian=yes
 else
-  sdcc_cv_build_bigendian=no
+  ac_cv_c_bigendian=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  # It does not; compile a test program.
-if test "$cross_compiling" = yes; then :
-  # try to guess the endianness by grepping values into an object file
-  sdcc_cv_build_bigendian=unknown
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+#include <limits.h>
+
 int
 main ()
 {
- _ascii (); _ebcdic ();
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-  sdcc_cv_build_bigendian=yes
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
 fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-  if test "$sdcc_cv_build_bigendian" = unknown; then
-    sdcc_cv_build_bigendian=no
-  else
-    # finding both strings is unlikely to happen, but who knows?
-    sdcc_cv_build_bigendian=unknown
-  fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then :
+  # Try to guess by grepping values from an object file.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
@@ -5520,44 +5848,47 @@
 main ()
 {
 
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long int l;
-    char c[sizeof (long int)];
-  } u;
-  u.l = 1;
-  return u.c[sizeof (long int) - 1] == 1;
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  sdcc_cv_build_bigendian=no
+  ac_cv_c_bigendian=no
 else
-  sdcc_cv_build_bigendian=yes
+  ac_cv_c_bigendian=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
+    fi
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sdcc_cv_build_bigendian" >&5
-$as_echo "$sdcc_cv_build_bigendian" >&6; }
-case $sdcc_cv_build_bigendian in
-  yes)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+;; #(
+   no)
+      ;; #(
+   universal)
 
-$as_echo "#define BUILD_WORDS_BIGENDIAN 1" >>confdefs.h
- ;;
-  no)
-     ;;
-  *)
-    as_fn_error $? "unknown endianness
-presetting sdcc_cv_build_bigendian=no (or yes) will help" "$LINENO" 5  ;;
-esac
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
+     ;; #(
+   *)
+     as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
 
 
 # Set standard installation paths
@@ -6364,6 +6695,32 @@
   fi
 
 
+  # Check whether --enable-r3ka-port was given.
+if test "${enable_r3ka_port+set}" = set; then :
+  enableval=$enable_r3ka_port;
+fi
+
+
+  if test "$enable_r3ka_port" = "no"; then
+    OPT_DISABLE_R3KA=1
+  else
+    enable_r3ka_port="yes"
+    OPT_DISABLE_R3KA=0
+  fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define OPT_DISABLE_R3KA $OPT_DISABLE_R3KA
+_ACEOF
+
+
+
+  echo z80 >>ports.all
+  if test $OPT_DISABLE_R3KA = 0; then
+    echo z80 >>ports.build
+  fi
+
+
   # Check whether --enable-gbz80-port was given.
 if test "${enable_gbz80_port+set}" = set; then :
   enableval=$enable_gbz80_port;
@@ -6525,6 +6882,32 @@
   fi
 
 
+  # Check whether --enable-s08-port was given.
+if test "${enable_s08_port+set}" = set; then :
+  enableval=$enable_s08_port;
+fi
+
+
+  if test "$enable_s08_port" = "no"; then
+    OPT_DISABLE_S08=1
+  else
+    enable_s08_port="yes"
+    OPT_DISABLE_S08=0
+  fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define OPT_DISABLE_S08 $OPT_DISABLE_S08
+_ACEOF
+
+
+
+  echo hc08 >>ports.all
+  if test $OPT_DISABLE_S08 = 0; then
+    echo hc08 >>ports.build
+  fi
+
+
 # Unsupported targets
 
   # Check whether --enable-avr-port was given.
@@ -6690,6 +7073,28 @@
 
 
 
+  # Check whether --enable-sdbinutils was given.
+if test "${enable_sdbinutils+set}" = set; then :
+  enableval=$enable_sdbinutils;
+fi
+
+
+      arg1=`echo sdbinutils | sed s/-/_/`
+
+  if test "`eval echo \\$enable_$arg1`" = "no"; then
+    OPT_DISABLE_SDBINUTILS=1
+  else
+    OPT_DISABLE_SDBINUTILS=0
+  fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define OPT_DISABLE_SDBINUTILS $OPT_DISABLE_SDBINUTILS
+_ACEOF
+
+
+
+
 
   # Check whether --enable-doc was given.
 if test "${enable_doc+set}" = set; then :
@@ -6714,7 +7119,7 @@
 set dummy lyx; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LYX+set}" = set; then :
+if ${ac_cv_prog_LYX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LYX"; then
@@ -6726,7 +7131,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LYX="lyx"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6752,7 +7157,7 @@
 set dummy latex2html; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LATEX2HTML+set}" = set; then :
+if ${ac_cv_prog_LATEX2HTML+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LATEX2HTML"; then
@@ -6764,7 +7169,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LATEX2HTML="latex2html"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6790,7 +7195,7 @@
 set dummy pdflatex; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PDFLATEX+set}" = set; then :
+if ${ac_cv_prog_PDFLATEX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PDFLATEX"; then
@@ -6802,7 +7207,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_PDFLATEX="pdflatex"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6828,7 +7233,7 @@
 set dummy pdfopt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PDFOPT+set}" = set; then :
+if ${ac_cv_prog_PDFOPT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PDFOPT"; then
@@ -6840,7 +7245,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_PDFOPT="pdfopt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6866,7 +7271,7 @@
 set dummy makeindex; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_MAKEINDEX+set}" = set; then :
+if ${ac_cv_prog_MAKEINDEX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$MAKEINDEX"; then
@@ -6878,7 +7283,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MAKEINDEX="makeindex"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6947,7 +7352,7 @@
 if test $OPT_ENABLE_LIBGC = 1; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_malloc in -lgc" >&5
 $as_echo_n "checking for GC_malloc in -lgc... " >&6; }
-if test "${ac_cv_lib_gc_GC_malloc+set}" = set; then :
+if ${ac_cv_lib_gc_GC_malloc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6981,7 +7386,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_malloc" >&5
 $as_echo "$ac_cv_lib_gc_GC_malloc" >&6; }
-if test "x$ac_cv_lib_gc_GC_malloc" = x""yes; then :
+if test "x$ac_cv_lib_gc_GC_malloc" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBGC 1
 _ACEOF
@@ -7013,6 +7418,8 @@
 
 test $OPT_DISABLE_SDCDB   = 0 && subdirs="$subdirs debugger/mcs51"
 
+test $OPT_DISABLE_SDBINUTILS = 0 && subdirs="$subdirs support/sdbinutils"
+
 ac_config_files="$ac_config_files doc/Makefile"
 
 
@@ -7033,10 +7440,10 @@
 
 fi
 
-if test $OPT_DISABLE_HC08 = 0; then
+if test $OPT_DISABLE_HC08 = 0 || test $OPT_DISABLE_S08 = 0; then
   ac_config_files="$ac_config_files src/hc08/Makefile sdas/as6808/Makefile"
 
-  test $OPT_DISABLE_DEVICE_LIB = 0 && ac_config_files="$ac_config_files device/lib/hc08/Makefile"
+  test $OPT_DISABLE_DEVICE_LIB = 0 && ac_config_files="$ac_config_files device/lib/hc08/Makefile device/lib/s08/Makefile"
 
 fi
 
@@ -7063,7 +7470,7 @@
 test $OPT_DISABLE_XA51 = 0 && ac_config_files="$ac_config_files src/xa51/Makefile"
 
 
-if test $OPT_DISABLE_Z80 = 0 || test $OPT_DISABLE_Z180 = 0 || test $OPT_DISABLE_R2K = 0 || test $OPT_DISABLE_GBZ80 = 0; then
+if test $OPT_DISABLE_Z80 = 0 || test $OPT_DISABLE_Z180 = 0 || test $OPT_DISABLE_R2K = 0 || test $OPT_DISABLE_R3KA = 0 || test $OPT_DISABLE_GBZ80 = 0; then
   ac_config_files="$ac_config_files src/z80/Makefile"
 
 fi
@@ -7082,17 +7489,17 @@
 
 fi
 
-if test $OPT_DISABLE_R2K = 0; then
+if test $OPT_DISABLE_R2K = 0 || test $OPT_DISABLE_R3KA = 0; then
   ac_config_files="$ac_config_files sdas/asrab/Makefile"
 
-  test $OPT_DISABLE_DEVICE_LIB = 0 && ac_config_files="$ac_config_files device/lib/r2k/Makefile"
+  test $OPT_DISABLE_DEVICE_LIB = 0 && ac_config_files="$ac_config_files device/lib/r2k/Makefile device/lib/r3ka/Makefile"
 
 fi
 
 test $OPT_DISABLE_DEVICE_LIB = 0 && ac_config_files="$ac_config_files device/lib/Makefile device/non-free/lib/Makefile"
 
 
-ac_config_files="$ac_config_files main.mk:main_in.mk src/Makefile device/include/Makefile device/non-free/include/Makefile sdas/linksrc/Makefile support/sdranlib/Makefile support/librarian/Makefile support/makebin/Makefile support/regression/Makefile support/valdiag/Makefile support/scripts/Makefile support/regression/ports/host/spec.mk:support/regression/ports/host/spec.mk.in Makefile Makefile.common:Makefile.common.in"
+ac_config_files="$ac_config_files main.mk:main_in.mk src/Makefile device/include/Makefile device/non-free/include/Makefile sdas/linksrc/Makefile support/librarian/Makefile support/makebin/Makefile support/regression/Makefile support/valdiag/Makefile support/scripts/Makefile support/regression/ports/host/spec.mk:support/regression/ports/host/spec.mk.in Makefile Makefile.common:Makefile.common.in"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -7158,10 +7565,21 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -7193,7 +7611,8 @@
 
 
 
-: ${CONFIG_STATUS=./config.status}
+
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -7294,6 +7713,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7489,16 +7909,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -7558,28 +7978,16 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -7601,7 +8009,7 @@
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -7663,10 +8071,10 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.67,
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -7756,7 +8164,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -7786,7 +8194,6 @@
 do
   case $ac_config_target in
     "sdccconf.h") CONFIG_HEADERS="$CONFIG_HEADERS sdccconf.h:sdccconf_in.h" ;;
-    "custom.h") CONFIG_HEADERS="$CONFIG_HEADERS custom.h:custom_in.h" ;;
     "sdas/linksrc/asxxxx_config.h") CONFIG_HEADERS="$CONFIG_HEADERS sdas/linksrc/asxxxx_config.h" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "src/avr/Makefile") CONFIG_FILES="$CONFIG_FILES src/avr/Makefile" ;;
@@ -7797,6 +8204,7 @@
     "src/hc08/Makefile") CONFIG_FILES="$CONFIG_FILES src/hc08/Makefile" ;;
     "sdas/as6808/Makefile") CONFIG_FILES="$CONFIG_FILES sdas/as6808/Makefile" ;;
     "device/lib/hc08/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/hc08/Makefile" ;;
+    "device/lib/s08/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/s08/Makefile" ;;
     "src/mcs51/Makefile") CONFIG_FILES="$CONFIG_FILES src/mcs51/Makefile" ;;
     "sdas/as8051/Makefile") CONFIG_FILES="$CONFIG_FILES sdas/as8051/Makefile" ;;
     "device/lib/mcs51/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/mcs51/Makefile" ;;
@@ -7815,6 +8223,7 @@
     "device/lib/gbz80/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/gbz80/Makefile" ;;
     "sdas/asrab/Makefile") CONFIG_FILES="$CONFIG_FILES sdas/asrab/Makefile" ;;
     "device/lib/r2k/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/r2k/Makefile" ;;
+    "device/lib/r3ka/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/r3ka/Makefile" ;;
     "device/lib/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/Makefile" ;;
     "device/non-free/lib/Makefile") CONFIG_FILES="$CONFIG_FILES device/non-free/lib/Makefile" ;;
     "main.mk") CONFIG_FILES="$CONFIG_FILES main.mk:main_in.mk" ;;
@@ -7822,7 +8231,6 @@
     "device/include/Makefile") CONFIG_FILES="$CONFIG_FILES device/include/Makefile" ;;
     "device/non-free/include/Makefile") CONFIG_FILES="$CONFIG_FILES device/non-free/include/Makefile" ;;
     "sdas/linksrc/Makefile") CONFIG_FILES="$CONFIG_FILES sdas/linksrc/Makefile" ;;
-    "support/sdranlib/Makefile") CONFIG_FILES="$CONFIG_FILES support/sdranlib/Makefile" ;;
     "support/librarian/Makefile") CONFIG_FILES="$CONFIG_FILES support/librarian/Makefile" ;;
     "support/makebin/Makefile") CONFIG_FILES="$CONFIG_FILES support/makebin/Makefile" ;;
     "support/regression/Makefile") CONFIG_FILES="$CONFIG_FILES support/regression/Makefile" ;;
@@ -7832,7 +8240,7 @@
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "Makefile.common") CONFIG_FILES="$CONFIG_FILES Makefile.common:Makefile.common.in" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -7854,9 +8262,10 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -7864,12 +8273,13 @@
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -7891,7 +8301,7 @@
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -7919,7 +8329,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -7967,7 +8377,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -7999,7 +8409,7 @@
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
@@ -8033,7 +8443,7 @@
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -8045,8 +8455,8 @@
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
@@ -8147,7 +8557,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -8166,7 +8576,7 @@
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -8175,7 +8585,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -8201,8 +8611,8 @@
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -8332,21 +8742,22 @@
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
@@ -8357,20 +8768,20 @@
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
+      mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
@@ -8784,20 +9195,22 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result:
 sdcc ${VERSION} is now configured for
 
-  Build:                ${build_alias}
-  Host:                 ${host_alias}
+  Build:                ${build}
+  Host:                 ${host}
   Source directory:     ${srcdir}
   C compiler:           ${CC}
   CFLAGS:               ${CFLAGS}
   C++ compiler:         ${CXX}
   CXXFLAGS:             ${CXXFLAGS}
+  CPPFLAGS:             ${CPPFLAGS}
+  LDFLAGS:              ${LDFLAGS}
 
   ENABLED Ports:
     avr                 ${enable_avr_port}
     ds390               ${enable_ds390_port}
     ds400               ${enable_ds400_port}
-    gbz80               ${enable_gbz80_port}
     hc08                ${enable_hc08_port}
+    s08                 ${enable_s08_port}
     mcs51               ${enable_mcs51_port}
     pic14               ${enable_pic14_port}
     pic16               ${enable_pic16_port}
@@ -8805,12 +9218,15 @@
     z80                 ${enable_z80_port}
     z180                ${enable_z180_port}
     r2k                 ${enable_r2k_port}
+    r3ka                ${enable_r3ka_port}
+    gbz80               ${enable_gbz80_port}
 
   Disable packihx:      ${OPT_DISABLE_PACKIHX}
   Disable ucsim:        ${OPT_DISABLE_UCSIM}
   Disable device lib:   ${OPT_DISABLE_DEVICE_LIB}
   Disable sdcpp:        ${OPT_DISABLE_SDCPP}
   Disable sdcdb:        ${OPT_DISABLE_SDCDB}
+  Disable sdbinutil:    ${OPT_DISABLE_SDBINUTILS}
   Enable documentation: ${OPT_ENABLE_DOC}
   Enable libgc:         ${OPT_ENABLE_LIBGC}
 
@@ -8844,20 +9260,22 @@
 $as_echo "
 sdcc ${VERSION} is now configured for
 
-  Build:                ${build_alias}
-  Host:                 ${host_alias}
+  Build:                ${build}
+  Host:                 ${host}
   Source directory:     ${srcdir}
   C compiler:           ${CC}
   CFLAGS:               ${CFLAGS}
   C++ compiler:         ${CXX}
   CXXFLAGS:             ${CXXFLAGS}
+  CPPFLAGS:             ${CPPFLAGS}
+  LDFLAGS:              ${LDFLAGS}
 
   ENABLED Ports:
     avr                 ${enable_avr_port}
     ds390               ${enable_ds390_port}
     ds400               ${enable_ds400_port}
-    gbz80               ${enable_gbz80_port}
     hc08                ${enable_hc08_port}
+    s08                 ${enable_s08_port}
     mcs51               ${enable_mcs51_port}
     pic14               ${enable_pic14_port}
     pic16               ${enable_pic16_port}
@@ -8865,12 +9283,15 @@
     z80                 ${enable_z80_port}
     z180                ${enable_z180_port}
     r2k                 ${enable_r2k_port}
+    r3ka                ${enable_r3ka_port}
+    gbz80               ${enable_gbz80_port}
 
   Disable packihx:      ${OPT_DISABLE_PACKIHX}
   Disable ucsim:        ${OPT_DISABLE_UCSIM}
   Disable device lib:   ${OPT_DISABLE_DEVICE_LIB}
   Disable sdcpp:        ${OPT_DISABLE_SDCPP}
   Disable sdcdb:        ${OPT_DISABLE_SDCDB}
+  Disable sdbinutil:    ${OPT_DISABLE_SDBINUTILS}
   Enable documentation: ${OPT_ENABLE_DOC}
   Enable libgc:         ${OPT_ENABLE_LIBGC}
 
diff -Nru sdcc-3.1.0+dfsg/configure.in sdcc-3.2.0+dfsg/configure.in
--- sdcc-3.1.0+dfsg/configure.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/configure.in	2012-05-18 16:09:24.000000000 +0000
@@ -3,7 +3,12 @@
 AC_PREREQ(2.60)
 AC_INIT(.version)
 AC_CONFIG_SRCDIR([Makefile.in])
-AC_CONFIG_HEADER([sdccconf.h:sdccconf_in.h custom.h:custom_in.h sdas/linksrc/asxxxx_config.h])
+
+# Determine the host and build type.
+# ===========================================================================
+AC_CANONICAL_HOST
+
+AC_CONFIG_HEADER([sdccconf.h:sdccconf_in.h sdas/linksrc/asxxxx_config.h])
 
 AC_PROG_AWK
 
@@ -94,62 +99,62 @@
 # Macro definitions
 # ===========================================================================
 
-# _bor_EXECUTE_IFELSE_BODY(COMMAND)
+# _sdcc_EXECUTE_IFELSE_BODY(COMMAND)
 # -----------------------
 # Shell function body for _AC_EXECUTE_IFELSE.
-m4_define([_bor_EXECUTE_IFELSE_BODY],
+m4_define([_sdcc_EXECUTE_IFELSE_BODY],
 [  AS_LINENO_PUSH([$[]1])
   AS_IF([_AC_DO_STDERR([$1 $2]) > conftest.out && {
-	 test ! -s conftest.err
+         test ! -s conftest.err
        }],
       [ac_retval=0],
       [ac_retval=1])
   AS_LINENO_POP
-])# _bor_EXECUTE_IFELSE_BODY
+])# _sdcc_EXECUTE_IFELSE_BODY
 
-# bor_EXECUTE_IFELSE(COMMAND[ACTION-IF-TRUE], [ACTION-IF-FALSE])
+# sdcc_EXECUTE_IFELSE(COMMAND[ACTION-IF-TRUE], [ACTION-IF-FALSE])
 # ----------------------------------------------------------------
 # Try to execute COMMAND.
-AC_DEFUN([bor_EXECUTE_IFELSE],
+AC_DEFUN([sdcc_EXECUTE_IFELSE],
 [_$0_BODY($1)
   AS_IF([test "$ac_retval" = 0],
     [$2],
     [$3])
 rm conftest.err conftest.out
-])# bor_EXECUTE_IFELSE
+])# sdcc_EXECUTE_IFELSE
 
 # Check whether the compiler for the current language is SunPRO.
 
-AC_DEFUN([bor_IS_SUNPRO],
+AC_DEFUN([sdcc_IS_SUNPRO],
 [AC_CACHE_CHECK([whether we are using the SunPRO _AC_LANG compiler],
-  [bor_cv_[]_AC_LANG_ABBREV[]_compiler_sunpro],
+  [sdcc_cv_[]_AC_LANG_ABBREV[]_compiler_sunpro],
   [_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[#if !defined __SUNPRO_C && !defined __SUNPRO_CC
        choke me
 #endif
 ]])],
-    [bor_compiler_sunpro=yes],
-    [bor_compiler_sunpro=no])
-bor_cv_[]_AC_LANG_ABBREV[]_compiler_sunpro=$bor_compiler_sunpro
+    [sdcc_cv_[]_AC_LANG_ABBREV[]_compiler_sunpro=yes],
+    [sdcc_cv_[]_AC_LANG_ABBREV[]_compiler_sunpro=no])
 ])])
 
-# bor_IS_VALID_OPTION macro checks if the current compiler, selected by 
+# sdcc_IS_VALID_OPTION macro checks if the current compiler, selected by 
 # AC_LANG, supports option specified as the 1st parameter. The test fails if
 # the compiler returns an error or in case something is writeen to stderr.
-# For example: bor_VALID_OPT(fPIC)
+# For example: sdcc_VALID_OPT(-fPIC)
 
-AC_DEFUN([bor_IS_VALID_OPTION],
-[ac_test_[]_AC_LANG_PREFIX[]FLAGS=${[]_AC_LANG_PREFIX[]FLAGS+set}
-bor_save_[]_AC_LANG_PREFIX[]FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
-AC_CACHE_CHECK(whether _AC_LANG accepts -$1, bor_cv_[]_AC_LANG_ABBREV[]_$1,
-  [bor_save_[]_AC_LANG_ABBREV[]_werror_flag=$ac_[]_AC_LANG_ABBREV[]_werror_flag
+AC_DEFUN([sdcc_IS_VALID_OPTION],
+[arg1=`echo $1 | sed -e"s/^-*//" -e"s/-/_/"`
+ac_test_[]_AC_LANG_PREFIX[]FLAGS=${[]_AC_LANG_PREFIX[]FLAGS+set}
+sdcc_save_[]_AC_LANG_PREFIX[]FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
+AC_CACHE_CHECK(whether _AC_LANG accepts $1, sdcc_cv_[]_AC_LANG_ABBREV[]_$arg1,
+  [sdcc_save_[]_AC_LANG_ABBREV[]_werror_flag=$ac_[]_AC_LANG_ABBREV[]_werror_flag
    ac_[]_AC_LANG_ABBREV[]_werror_flag=yes
    
-   []_AC_LANG_PREFIX[]FLAGS="-$1"
+   []_AC_LANG_PREFIX[]FLAGS="$1"
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
-     [bor_cv_[]_AC_LANG_ABBREV[]_$1=yes],
-     [bor_cv_[]_AC_LANG_ABBREV[]_$1=no])
-   ac_[]_AC_LANG_ABBREV[]_werror_flag=$bor_save_[]_AC_LANG_ABBREV[]_werror_flag])
-   []_AC_LANG_PREFIX[]FLAGS=$bor_save_[]_AC_LANG_PREFIX[]FLAGS
+     [eval sdcc_cv_[]_AC_LANG_ABBREV[]_$arg1=yes],
+     [eval sdcc_cv_[]_AC_LANG_ABBREV[]_$arg1=no])
+   ac_[]_AC_LANG_ABBREV[]_werror_flag=$sdcc_save_[]_AC_LANG_ABBREV[]_werror_flag])
+   []_AC_LANG_PREFIX[]FLAGS=$sdcc_save_[]_AC_LANG_PREFIX[]FLAGS
 ])
 
 # This macro expands DIR and assigns it to RET.
@@ -376,14 +381,14 @@
   rm -f _test_.*)
 
   # This is the first time when CFLAGS are set/modified!!
-  bor_IS_VALID_OPTION(ggdb)
-  if test "$bor_cv_c_ggdb" = "yes"; then
+  sdcc_IS_VALID_OPTION(-ggdb)
+  if test "$sdcc_cv_c_ggdb" = "yes"; then
     CFLAGS="-ggdb ${CFLAGS}"
     CXXFLAGS="-ggdb ${CXXFLAGS}"
   fi
 
-  bor_IS_VALID_OPTION(pipe)
-  if test "$bor_cv_c_pipe" = "yes"; then
+  sdcc_IS_VALID_OPTION(-pipe)
+  if test "$sdcc_cv_c_pipe" = "yes"; then
     CFLAGS="-pipe ${CFLAGS}"
     # Don't use "-pipe" on x86 Solaris g++, since src/z80/ralloc2.cc dies with:
     # Assembler: ralloc2.cc
@@ -397,8 +402,8 @@
   C99_FLAG="--std=c99"
   MAKEDEP="$CC $sdcc_cv_MM"
 else
-  bor_IS_SUNPRO
-  if test "$bor_cv_c_compiler_sunpro" = "yes"; then
+  sdcc_IS_SUNPRO
+  if test "$sdcc_cv_c_compiler_sunpro" = "yes"; then
     C99_FLAG="-xc99"
     CFLAGS="-xO2 ${C99_FLAG} ${CFLAGS}"
     CXXFLAGS="-xO2 ${CXXFLAGS}"
@@ -411,17 +416,49 @@
 AC_SUBST(WALL_FLAG)
 AC_SUBST(C99_FLAG)
 
-# does AR accept the -S flag
-echo '!<arch>' > conftest.ar
-AC_MSG_CHECKING([whether $AR accepts -S])
-bor_EXECUTE_IFELSE([$AR -S -t conftest.ar],
-  [AC_MSG_RESULT([yes])
-    AR_S_FLAG="-S"],
-  [AC_MSG_RESULT([no])
-    AR_S_FLAG=""])
-rm conftest.ar
-AC_SUBST(AR_S_FLAG)
+# SDCC_C_UNNAMED_STRUCT_TAG ()
+# chech whether C compiler supports tag in unnamed struct
+# -------------------------------------------------------------------------
+AC_DEFUN([SDCC_C_UNNAMED_STRUCT_TAG],
+[
+  if test "$ac_cv_c_compiler_gnu" = "yes"; then
+    sdcc_IS_VALID_OPTION(-fms-extensions)
+  else
+    sdcc_cv_c_fms_extensions=no
+  fi
+  AC_CACHE_CHECK(whether C supports tag in unnamed struct, sdcc_cv_c_unnamed_struct_tag,
+    if test "$sdcc_cv_c_fms_extensions" = "yes"; then
+      CFLAGS="-fms-extensions ${CFLAGS}"
+    fi
+
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+      [
+struct s1 {
+  int a;
+};
+
+struct s2 {
+  struct s1;
+  int b;
+};
+      ],
+      [
+  struct s2 s;
+
+  s.a = 1;
+  s.b = 2;
+      ])],
+      [
+        sdcc_cv_[]_AC_LANG_ABBREV[]_unnamed_struct_tag=yes
+        AC_DEFINE_UNQUOTED(UNNAMED_STRUCT_TAG, 1, [Define to 1 if c supports tags in unnamed struct.])
+      ],
+      [
+        sdcc_cv_[]_AC_LANG_ABBREV[]_unnamed_struct_tag=no
+      ])
+  )
+])
 
+SDCC_C_UNNAMED_STRUCT_TAG
 
 # Checks for typedefs, structures, and compiler characteristics.
 # ===========================================================================
@@ -431,6 +468,7 @@
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(long long)
 AC_C_CHAR_UNSIGNED
 
 type_name()
@@ -451,6 +489,10 @@
     echo "long"
     exit
   fi
+  if expr "$ac_cv_sizeof_long_long" '>=' "$1" >/dev/null; then
+    echo "long long"
+    exit
+  fi
   echo "long"
 }
 
@@ -468,87 +510,23 @@
 AC_MSG_CHECKING(type name for dword)
 TYPE_DWORD=`type_name 4`
 AC_MSG_RESULT($TYPE_DWORD)
+AC_MSG_CHECKING(type name for qword)
+TYPE_QWORD=`type_name 8`
+AC_MSG_RESULT($TYPE_QWORD)
 
 AC_DEFINE_UNQUOTED(TYPE_BYTE,  $TYPE_BYTE,  [XXX])
 AC_DEFINE_UNQUOTED(TYPE_WORD,  $TYPE_WORD,  [XXX])
 AC_DEFINE_UNQUOTED(TYPE_DWORD, $TYPE_DWORD, [XXX])
+AC_DEFINE_UNQUOTED(TYPE_QWORD, $TYPE_QWORD, [XXX])
 
 AC_DEFINE_UNQUOTED(TYPE_UBYTE,  unsigned $TYPE_CHAR,  [XXX])
 AC_DEFINE_UNQUOTED(TYPE_UWORD,  unsigned $TYPE_WORD,  [XXX])
 AC_DEFINE_UNQUOTED(TYPE_UDWORD, unsigned $TYPE_DWORD, [XXX])
+AC_DEFINE_UNQUOTED(TYPE_UQWORD, unsigned $TYPE_QWORD, [XXX])
 
-
-# SDCC_BUILD_BIGENDIAN ([ACTION-IF-TRUE], [ACTION-IF-FALSE], [ACTION-IF-UNKNOWN])
-# -------------------------------------------------------------------------
-AC_DEFUN([SDCC_BUILD_BIGENDIAN],
-[AC_CACHE_CHECK(whether host machine byte ordering is bigendian, sdcc_cv_build_bigendian,
-[# See if sys/param.h defines the BYTE_ORDER macro.
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>
-#include <sys/param.h>
-],
-[#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-        && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
- bogus endian macros
-#endif
-])],
-[# It does; now see whether it defined to BIG_ENDIAN or not.
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>
-#include <sys/param.h>
-], [#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
-])], [sdcc_cv_build_bigendian=yes], [sdcc_cv_build_bigendian=no])],
-[# It does not; compile a test program.
-AC_RUN_IFELSE(
-[AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT], [[
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long int l;
-    char c[sizeof (long int)];
-  } u;
-  u.l = 1;
-  return u.c[sizeof (long int) - 1] == 1;
-]])],
-              [sdcc_cv_build_bigendian=no],
-              [sdcc_cv_build_bigendian=yes],
-[# try to guess the endianness by grepping values into an object file
-  sdcc_cv_build_bigendian=unknown
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-[[short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }]],
-[[ _ascii (); _ebcdic (); ]])],
-[if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-  sdcc_cv_build_bigendian=yes
-fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-  if test "$sdcc_cv_build_bigendian" = unknown; then
-    sdcc_cv_build_bigendian=no
-  else
-    # finding both strings is unlikely to happen, but who knows?
-    sdcc_cv_build_bigendian=unknown
-  fi
-fi])])])])
-case $sdcc_cv_build_bigendian in
-  yes)
-    m4_default([$1],
-      [AC_DEFINE([BUILD_WORDS_BIGENDIAN], 1,
-        [Define to 1 if your processor stores words with the most significant
-         byte first (like Motorola and SPARC, unlike Intel and VAX).])]) ;;
-  no)
-    $2 ;;
-  *)
-    m4_default([$3],
-      [AC_MSG_ERROR([unknown endianness
-presetting sdcc_cv_build_bigendian=no (or yes) will help])]) ;;
-esac
-])# SDCC_BUILD_BIGENDIAN
-
-SDCC_BUILD_BIGENDIAN
+# Checking whether byte ordering is bigendian
+# ===========================================================================
+AC_C_BIGENDIAN
 
 # Set standard installation paths
 # ===========================================================================
@@ -706,8 +684,7 @@
 # add include guard and custom stuff to sdccconf.h
 AH_TOP([#ifndef SDCCCONF_HEADER
 #define SDCCCONF_HEADER])
-AH_BOTTOM([#include "custom.h"
-#endif /* SDCCCONF_HEADER */])
+AH_BOTTOM([#endif /* SDCCCONF_HEADER */])
 
 # Port selection helper
 # ===========================================================================
@@ -807,7 +784,8 @@
 AC_DO_PORT(mcs51, mcs51, MCS51, [Excludes the Intel mcs51 port])
 AC_DO_PORT(z80,   z80,   Z80,   [Excludes the z80 port])
 AC_DO_PORT(z180,  z80,   Z180,  [Excludes the z180 port])
-AC_DO_PORT(r2k,   z80,   R2K,  [Excludes the r2k port])
+AC_DO_PORT(r2k,   z80,   R2K,   [Excludes the r2k port])
+AC_DO_PORT(r3ka,  z80,   R3KA,  [Excludes the r3ka port])
 AC_DO_PORT(gbz80, z80,   GBZ80, [Excludes the Gameboy gbz80 port])
 AC_DO_PORT(ds390, ds390, DS390, [Excludes the DS390 port])
 AC_DEFINE_UNQUOTED(OPT_DISABLE_TININative, $OPT_DISABLE_DS390, [XXX])
@@ -815,6 +793,7 @@
 AC_DO_PORT(pic14, pic14, PIC14, [Excludes the PIC14 port])
 AC_DO_PORT(pic16, pic16, PIC16, [Excludes the PIC16 port])
 AC_DO_PORT(hc08,  hc08,  HC08,  [Excludes the HC08 port])
+AC_DO_PORT(s08,   hc08,  S08,  [Excludes the S08 port])
 
 # Unsupported targets
 AC_DO_PORT_ENABLER(avr,   avr,   AVR,   [Includes the AVR port (disabled by default)])
@@ -825,6 +804,7 @@
 AC_DO_DISABLER(packihx,    PACKIHX,    [Disables building packihx])
 AC_DO_DISABLER(sdcpp,      SDCPP,      [Disables building sdcpp])
 AC_DO_DISABLER(sdcdb,      SDCDB,      [Disables building sdcdb])
+AC_DO_DISABLER(sdbinutils, SDBINUTILS, [Disables configuring and building of sdbinutils])
 
 AC_DO_ENABLER(doc,   DOC,   [Enables building the documentation])
 AC_CHECK_PROG([LYX],        [lyx],        [lyx],        [:])
@@ -861,6 +841,7 @@
 test $OPT_DISABLE_PACKIHX = 0 && AC_CONFIG_SUBDIRS(support/packihx)
 test $OPT_DISABLE_UCSIM   = 0 && AC_CONFIG_SUBDIRS(sim/ucsim)
 test $OPT_DISABLE_SDCDB   = 0 && AC_CONFIG_SUBDIRS(debugger/mcs51)
+test $OPT_DISABLE_SDBINUTILS = 0 && AC_CONFIG_SUBDIRS(support/sdbinutils)
 AC_CONFIG_FILES([doc/Makefile])
 
 test $OPT_DISABLE_AVR = 0 && AC_CONFIG_FILES([src/avr/Makefile])
@@ -875,10 +856,11 @@
   test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/ds400/Makefile])
 fi
 
-if test $OPT_DISABLE_HC08 = 0; then
+if test $OPT_DISABLE_HC08 = 0 || test $OPT_DISABLE_S08 = 0; then
   AC_CONFIG_FILES([src/hc08/Makefile
                    sdas/as6808/Makefile])
-  test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/hc08/Makefile])
+  test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/hc08/Makefile
+                                                       device/lib/s08/Makefile])
 fi
 
 if test $OPT_DISABLE_MCS51 = 0; then
@@ -902,7 +884,7 @@
 
 test $OPT_DISABLE_XA51 = 0 && AC_CONFIG_FILES([src/xa51/Makefile])
 
-if test $OPT_DISABLE_Z80 = 0 || test $OPT_DISABLE_Z180 = 0 || test $OPT_DISABLE_R2K = 0 || test $OPT_DISABLE_GBZ80 = 0; then
+if test $OPT_DISABLE_Z80 = 0 || test $OPT_DISABLE_Z180 = 0 || test $OPT_DISABLE_R2K = 0 || test $OPT_DISABLE_R3KA = 0 || test $OPT_DISABLE_GBZ80 = 0; then
   AC_CONFIG_FILES([src/z80/Makefile])
 fi
 
@@ -917,9 +899,10 @@
   test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/gbz80/Makefile])
 fi
 
-if test $OPT_DISABLE_R2K = 0; then
+if test $OPT_DISABLE_R2K = 0 || test $OPT_DISABLE_R3KA = 0; then
   AC_CONFIG_FILES([sdas/asrab/Makefile])
-  test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/r2k/Makefile])
+  test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/r2k/Makefile
+                                                       device/lib/r3ka/Makefile])
 fi
 
 test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/Makefile device/non-free/lib/Makefile])
@@ -929,7 +912,6 @@
 device/include/Makefile
 device/non-free/include/Makefile
 sdas/linksrc/Makefile
-support/sdranlib/Makefile
 support/librarian/Makefile
 support/makebin/Makefile
 support/regression/Makefile
@@ -970,20 +952,22 @@
 AC_MSG_RESULT([
 sdcc ${VERSION} is now configured for
 
-  Build:                ${build_alias}
-  Host:                 ${host_alias}
+  Build:                ${build}
+  Host:                 ${host}
   Source directory:     ${srcdir}
   C compiler:           ${CC}
   CFLAGS:               ${CFLAGS}
   C++ compiler:         ${CXX}
   CXXFLAGS:             ${CXXFLAGS}
+  CPPFLAGS:             ${CPPFLAGS}
+  LDFLAGS:              ${LDFLAGS}
 
   ENABLED Ports:
     avr                 ${enable_avr_port}
     ds390               ${enable_ds390_port}
     ds400               ${enable_ds400_port}
-    gbz80               ${enable_gbz80_port}
     hc08                ${enable_hc08_port}
+    s08                 ${enable_s08_port}
     mcs51               ${enable_mcs51_port}
     pic14               ${enable_pic14_port}
     pic16               ${enable_pic16_port}
@@ -991,12 +975,15 @@
     z80                 ${enable_z80_port}
     z180                ${enable_z180_port}
     r2k                 ${enable_r2k_port}
+    r3ka                ${enable_r3ka_port}
+    gbz80               ${enable_gbz80_port}
 
   Disable packihx:      ${OPT_DISABLE_PACKIHX}
   Disable ucsim:        ${OPT_DISABLE_UCSIM}
   Disable device lib:   ${OPT_DISABLE_DEVICE_LIB}
   Disable sdcpp:        ${OPT_DISABLE_SDCPP}
   Disable sdcdb:        ${OPT_DISABLE_SDCDB}
+  Disable sdbinutil:    ${OPT_DISABLE_SDBINUTILS}
   Enable documentation: ${OPT_ENABLE_DOC}
   Enable libgc:         ${OPT_ENABLE_LIBGC}
 
diff -Nru sdcc-3.1.0+dfsg/configure_vc.awk sdcc-3.2.0+dfsg/configure_vc.awk
--- sdcc-3.1.0+dfsg/configure_vc.awk	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/configure_vc.awk	2012-05-05 14:39:36.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/awk
 
-# configure_vc.awk - Genarate sdcc_vc.h using sdcc_vc_in.h as template
+# configure_vc.awk - Genarate sdcc_vc.h using sdcc_vc.h.in as template
 #                    and insert the version number definitions from .version
 #
 # Written By - Borut Razem borut.razem@siol.net
diff -Nru sdcc-3.1.0+dfsg/custom_in.h sdcc-3.2.0+dfsg/custom_in.h
--- sdcc-3.1.0+dfsg/custom_in.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/custom_in.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-/* custom.h -- manual additions to #include into sdccconf.h */
-
-/*
- * find out the endianess of host machine
- */
-#if defined __APPLE__ && (defined __BIG_ENDIAN__ || defined _BIG_ENDIAN)
-/* 1) trust the compiler
- * in order to be able to make Mac OS X unified binaries */
-# define WORDS_BIGENDIAN 1
-#elif defined __APPLE__ && (defined __LITTLE_ENDIAN__ || defined _LITTLE_ENDIAN)
-/* do nothing */
-#elif defined __sun && defined HAVE_SYS_ISA_DEFS_H
-/* Solaris defines endianness in <sys/isa_defs.h> */
-# include <sys/isa_defs.h>
-# ifdef _BIG_ENDIAN
-#   define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifdef HAVE_ENDIAN_H
-#   include <endian.h>
-# elif defined HAVE_SYS_ENDIAN_H
-#   include <sys/endian.h>
-# elif defined HAVE_MACHINE_ENDIAN_H
-#   include <machine/endian.h>
-# endif
-# if (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
-/* 2) trust the header files */
-#   if BYTE_ORDER == BIG_ENDIAN
-#     define WORDS_BIGENDIAN 1
-#   endif
-# else
-/* 3) trust the configure; this actually doesn't work for unified Mac OS X binaries :-( */
-#   if (defined BUILD_WORDS_BIGENDIAN && BUILD_WORDS_BIGENDIAN)
-#     define WORDS_BIGENDIAN  1
-#   endif
-/* 4) assume that host is a little endian machine */
-# endif
-#endif
diff -Nru sdcc-3.1.0+dfsg/debian/changelog sdcc-3.2.0+dfsg/debian/changelog
--- sdcc-3.1.0+dfsg/debian/changelog	2012-06-14 03:29:32.000000000 +0000
+++ sdcc-3.2.0+dfsg/debian/changelog	2013-03-23 06:32:54.000000000 +0000
@@ -1,12 +1,18 @@
-sdcc (3.1.0+dfsg-1ubuntu1) quantal; urgency=low
+sdcc (3.2.0+dfsg-1~precise2~ppa2) unstable; urgency=low
 
-  * Remove build-indep from build target. Add it as a requisite of the
-    install-indep target. This will keep it from being built on binary-arch
-    builds, but still work on full builds. Not ideal, but it will suffice
-    so that slow buildd's wont have to install all of lyx and tex just to
-    churn out a small binary.
+  * added documentation related tools to build dependencies to avoid issues
+    on Ubuntu Precise (dpkg-buildpackage calling build instead of  build-arch
+    and build-indep), this is probably not a proper fix, but it should work
 
- -- Ben Collins <bcollins@ubuntu.com>  Wed, 13 Jun 2012 23:27:54 -0400
+ -- Iztok Jeras <iztok.jeras@gmail.com>  Sat, 23 Mar 2013 07:22:50 +0100
+
+sdcc (3.2.0+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release (Closes: #422599, #671631)
+  * Remove patch 02_fix_spelling. Fixed in upstream.
+  * Update patch 01_disable_non-free
+
+ -- Gudjon I. Gudjonsson <gudjon@gudjon.org>  Fri, 13 Jul 2012 17:52:52 +0200
 
 sdcc (3.1.0+dfsg-1) unstable; urgency=low
 
diff -Nru sdcc-3.1.0+dfsg/debian/control sdcc-3.2.0+dfsg/debian/control
--- sdcc-3.1.0+dfsg/debian/control	2012-06-14 03:29:55.000000000 +0000
+++ sdcc-3.2.0+dfsg/debian/control	2013-03-23 06:20:20.000000000 +0000
@@ -1,12 +1,10 @@
 Source: sdcc
 Section: electronics
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Gudjon I. Gudjonsson <gudjon@gudjon.org>
+Maintainer: Gudjon I. Gudjonsson <gudjon@gudjon.org>
 Uploaders: Bdale Garbee <bdale@gag.com>
 Build-Depends: debhelper (>=8), autoconf, autotools-dev, libtool, flex, bison, 
- libncurses5-dev, gputils, libboost-dev
-Build-Depends-Indep: lyx, texlive-full, ghostscript,
+ libncurses5-dev, gputils, libboost-dev, lyx, texlive-full, ghostscript,
 Standards-Version: 3.9.3
 Homepage: http://sdcc.sourceforge.net
 Vcs-Git: git://anonscm.debian.org/collab-maint/sdcc.git
diff -Nru sdcc-3.1.0+dfsg/debian/patches/01_disable_non-free sdcc-3.2.0+dfsg/debian/patches/01_disable_non-free
--- sdcc-3.1.0+dfsg/debian/patches/01_disable_non-free	2012-06-04 18:21:53.000000000 +0000
+++ sdcc-3.2.0+dfsg/debian/patches/01_disable_non-free	2012-07-13 16:02:03.000000000 +0000
@@ -2,35 +2,31 @@
 compile the source files stripped of non-free files.
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -58,7 +58,7 @@
+@@ -68,7 +68,7 @@
  
  ifeq ($(OPT_DISABLE_DEVICE_LIB), 0)
- TARGETS         += sdcc-device-lib
--PKGS            += device/lib device/non-free/lib
-+PKGS            += device/lib
+ TARGETS        += sdcc-device-lib
+-PKGS           += device/lib device/non-free/lib
++PKGS           += device/lib
  endif
  
  ifeq ($(OPT_DISABLE_PACKIHX), 0)
-@@ -78,10 +78,10 @@
+@@ -88,7 +88,7 @@
  
- TARGETS         += sdcc-libs sdcc-cc sdcc-device-inc sdcc-as sdcc-ld sdcc-scripts
+ TARGETS        += sdcc-libs sdcc-cc sdcc-device-inc sdcc-as sdcc-ld sdcc-scripts
  
--PKGS            += $(SDCC_LIBS) src device/include device/non-free/include $(SDCC_AS) sdas/linksrc $(SDCC_LIBRARIAN) $(SDCC_SDRANLIB) $(SDCC_SCRIPTS)
-+PKGS            += $(SDCC_LIBS) src device/include $(SDCC_AS) sdas/linksrc $(SDCC_LIBRARIAN) $(SDCC_SDRANLIB) $(SDCC_SCRIPTS)
+-PKGS           += $(SDCC_LIBS) src device/include device/non-free/include \
++PKGS           += $(SDCC_LIBS) src device/include \
+                   $(SDCC_AS) sdas/linksrc $(SDCC_LIBRARIAN) \
+                   $(SDCC_SDBINUTILS) $(SDCC_SCRIPTS)
  
- PKGS_TINI       = $(SDCC_LIBS) $(SDCC_AS) sdas/linksrc \
--                  src device/include device/non-free/include $(SDCC_PACKIHX) $(SDCC_LIBRARIAN)
-+                  src device/include $(SDCC_PACKIHX) $(SDCC_LIBRARIAN)
- PORTS           = $(shell cat ports.build)
- ALLPORTS        = $(shell cat ports.all)
- 
-@@ -120,15 +120,12 @@
+@@ -138,15 +138,12 @@
  
  sdcc-device-inc:
  	$(MAKE) -C device/include
 -	$(MAKE) -C device/non-free/include
  
- sdcc-device-lib: sdcc-cc sdcc-as sdcc-ld
+ sdcc-device-lib: sdcc-cc sdcc-as sdcc-ld $(SDCC_BINUTILS)
  	$(MAKE) -C device/lib
 -	$(MAKE) -C device/non-free/lib
  
@@ -42,18 +38,18 @@
  # doc depends on latex and latex2html
 --- a/configure
 +++ b/configure
-@@ -747,9 +747,7 @@
- ac_subdirs_all='support/cpp
+@@ -789,9 +789,7 @@
  support/packihx
  sim/ucsim
--debugger/mcs51
+ debugger/mcs51
+-support/sdbinutils
 -device/lib/pic14 device/non-free/lib/pic14
 -device/lib/pic16 device/non-free/lib/pic16'
-+debugger/mcs51'
++support/sdbinutils'
  
  # Initialize some variables set by options.
  ac_init_help=
-@@ -5601,9 +5599,6 @@
+@@ -5932,9 +5930,6 @@
  # *nix default: "sdcc/non-free/include"
  
  
@@ -63,7 +59,7 @@
  
  # lib_dir_suffix:
  # *nix default: "sdcc/lib"
-@@ -7089,10 +7084,10 @@
+@@ -7496,10 +7491,10 @@
  
  fi
  
@@ -71,14 +67,14 @@
 +test $OPT_DISABLE_DEVICE_LIB = 0 && ac_config_files="$ac_config_files device/lib/Makefile"
  
  
--ac_config_files="$ac_config_files main.mk:main_in.mk src/Makefile device/include/Makefile device/non-free/include/Makefile sdas/linksrc/Makefile support/sdranlib/Makefile support/librarian/Makefile support/makebin/Makefile support/regression/Makefile support/valdiag/Makefile support/scripts/Makefile support/regression/ports/host/spec.mk:support/regression/ports/host/spec.mk.in Makefile Makefile.common:Makefile.common.in"
-+ac_config_files="$ac_config_files main.mk:main_in.mk src/Makefile device/include/Makefile sdas/linksrc/Makefile support/sdranlib/Makefile support/librarian/Makefile support/makebin/Makefile support/regression/Makefile support/valdiag/Makefile support/scripts/Makefile support/regression/ports/host/spec.mk:support/regression/ports/host/spec.mk.in Makefile Makefile.common:Makefile.common.in"
+-ac_config_files="$ac_config_files main.mk:main_in.mk src/Makefile device/include/Makefile device/non-free/include/Makefile sdas/linksrc/Makefile support/librarian/Makefile support/makebin/Makefile support/regression/Makefile support/valdiag/Makefile support/scripts/Makefile support/regression/ports/host/spec.mk:support/regression/ports/host/spec.mk.in Makefile Makefile.common:Makefile.common.in"
++ac_config_files="$ac_config_files main.mk:main_in.mk src/Makefile device/include/Makefile sdas/linksrc/Makefile support/librarian/Makefile support/makebin/Makefile support/regression/Makefile support/valdiag/Makefile support/scripts/Makefile support/regression/ports/host/spec.mk:support/regression/ports/host/spec.mk.in Makefile Makefile.common:Makefile.common.in"
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -7816,11 +7811,9 @@
-     "sdas/asrab/Makefile") CONFIG_FILES="$CONFIG_FILES sdas/asrab/Makefile" ;;
+@@ -8225,11 +8220,9 @@
      "device/lib/r2k/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/r2k/Makefile" ;;
+     "device/lib/r3ka/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/r3ka/Makefile" ;;
      "device/lib/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/Makefile" ;;
 -    "device/non-free/lib/Makefile") CONFIG_FILES="$CONFIG_FILES device/non-free/lib/Makefile" ;;
      "main.mk") CONFIG_FILES="$CONFIG_FILES main.mk:main_in.mk" ;;
@@ -86,5 +82,5 @@
      "device/include/Makefile") CONFIG_FILES="$CONFIG_FILES device/include/Makefile" ;;
 -    "device/non-free/include/Makefile") CONFIG_FILES="$CONFIG_FILES device/non-free/include/Makefile" ;;
      "sdas/linksrc/Makefile") CONFIG_FILES="$CONFIG_FILES sdas/linksrc/Makefile" ;;
-     "support/sdranlib/Makefile") CONFIG_FILES="$CONFIG_FILES support/sdranlib/Makefile" ;;
      "support/librarian/Makefile") CONFIG_FILES="$CONFIG_FILES support/librarian/Makefile" ;;
+     "support/makebin/Makefile") CONFIG_FILES="$CONFIG_FILES support/makebin/Makefile" ;;
diff -Nru sdcc-3.1.0+dfsg/debian/patches/02_fix_spelling sdcc-3.2.0+dfsg/debian/patches/02_fix_spelling
--- sdcc-3.1.0+dfsg/debian/patches/02_fix_spelling	2012-06-04 18:21:53.000000000 +0000
+++ sdcc-3.2.0+dfsg/debian/patches/02_fix_spelling	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-Fixes spelling errors in programs, minor lintian warnings
---- a/sim/ucsim/pobj.cc
-+++ b/sim/ucsim/pobj.cc
-@@ -157,7 +157,7 @@
-     {
-       char *s;
-       s= (char*)malloc(strlen(get_name("?"))+100);
--      sprintf(s, "childs of %s", get_name("?"));
-+      sprintf(s, "children of %s", get_name("?"));
-       children= new cl_list(1, 1, s);
-       free(s);
-     }
---- a/src/pic16/ralloc.c
-+++ b/src/pic16/ralloc.c
-@@ -311,7 +311,7 @@
-                 case SEND:              return "SEND";
-                 case DUMMY_READ_VOLATILE:       return "DUMMY_READ_VOLATILE";
-         }
--        sprintf (buffer, "unkown op %d %c", op, op & 0xff);
-+        sprintf (buffer, "unknown op %d %c", op, op & 0xff);
- 
-   return buffer;
- }
---- a/sim/ucsim/utils.cc
-+++ b/sim/ucsim/utils.cc
-@@ -142,7 +142,7 @@
-     name= o->get_name();
-   if (name && *name)
-     return(name);
--  return("(unkown)");
-+  return("(unknown)");
- }
- 
- 
---- a/sdas/linksrc/lkmain.c
-+++ b/sdas/linksrc/lkmain.c
-@@ -1100,7 +1100,7 @@
- 				default:
- 				err:
- 					fprintf(stderr,
--					    "Unkown option -%c ignored\n", c);
-+					    "Unknown option -%c ignored\n", c);
- 					break;
- 				}
- 			}
diff -Nru sdcc-3.1.0+dfsg/debian/patches/series sdcc-3.2.0+dfsg/debian/patches/series
--- sdcc-3.1.0+dfsg/debian/patches/series	2012-06-04 18:21:53.000000000 +0000
+++ sdcc-3.2.0+dfsg/debian/patches/series	2012-07-13 16:03:57.000000000 +0000
@@ -1,2 +1 @@
 01_disable_non-free
-02_fix_spelling
diff -Nru sdcc-3.1.0+dfsg/debian/rules sdcc-3.2.0+dfsg/debian/rules
--- sdcc-3.1.0+dfsg/debian/rules	2012-06-14 03:27:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/debian/rules	2012-06-04 18:21:53.000000000 +0000
@@ -74,7 +74,7 @@
 		--prefix=/usr
 	touch $@
 
-build: build-arch
+build: build-arch build-indep
 build-arch: build-arch-stamp
 build-arch-stamp: configure-stamp 
 	dh_testdir
@@ -88,7 +88,7 @@
 	touch $@
 
 install: install-arch install-indep
-install-indep: build-indep
+install-indep: build
 	dh_testdir
 	dh_testroot
 	dh_installdirs 
diff -Nru sdcc-3.1.0+dfsg/debugger/mcs51/aclocal.m4 sdcc-3.2.0+dfsg/debugger/mcs51/aclocal.m4
--- sdcc-3.1.0+dfsg/debugger/mcs51/aclocal.m4	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/debugger/mcs51/aclocal.m4	2012-05-18 10:47:44.000000000 +0000
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff -Nru sdcc-3.1.0+dfsg/debugger/mcs51/cmd.c sdcc-3.2.0+dfsg/debugger/mcs51/cmd.c
--- sdcc-3.1.0+dfsg/debugger/mcs51/cmd.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/debugger/mcs51/cmd.c	2012-05-31 08:33:34.000000000 +0000
@@ -1078,7 +1078,7 @@
         {
           if (!cctxt->func->mod)
             {
-              if (!applyToSet (functions, funcWithName, "main"))
+              if (!applyToSet (functions, funcWithName, "main", &func))
                 {
                   fprintf (stderr, "Function \"main\" not defined.\n");
                 }
@@ -3336,7 +3336,7 @@
         {
           if (!cctxt->func->mod)
             {
-              if (!applyToSet(functions,funcWithName,"main"))
+              if (!applyToSet (functions, funcWithName, "main", &func))
                   fprintf(stderr,"Function \"main\" not defined.\n");
               else
                   clearBPatModLine(func->mod,line);
diff -Nru sdcc-3.1.0+dfsg/debugger/mcs51/configure sdcc-3.2.0+dfsg/debugger/mcs51/configure
--- sdcc-3.1.0+dfsg/debugger/mcs51/configure	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/debugger/mcs51/configure	2012-05-18 10:47:44.000000000 +0000
@@ -1,11 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68.
+# Generated by GNU Autoconf 2.69.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -134,6 +132,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -167,7 +190,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -212,21 +236,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -328,6 +356,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -449,6 +485,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -483,16 +523,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -504,28 +544,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -1133,8 +1153,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1364,9 +1382,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1639,7 +1657,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1662,7 +1680,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2036,7 +2054,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2076,7 +2094,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2129,7 +2147,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2170,7 +2188,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -2228,7 +2246,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2272,7 +2290,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2718,8 +2736,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -2959,7 +2976,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -3025,7 +3042,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -3322,7 +3339,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3362,7 +3379,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3415,7 +3432,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3456,7 +3473,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -3514,7 +3531,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3558,7 +3575,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3754,8 +3771,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4043,7 +4059,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -4116,7 +4132,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4156,7 +4172,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4207,7 +4223,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AUTOCONF="autoconf"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4245,7 +4261,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4283,7 +4299,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AS="as"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4321,7 +4337,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CP="cp"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5187,16 +5203,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -5256,28 +5272,16 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -5299,7 +5303,7 @@
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -5361,10 +5365,10 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -5453,7 +5457,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
diff -Nru sdcc-3.1.0+dfsg/debugger/mcs51/sdcdb.c sdcc-3.2.0+dfsg/debugger/mcs51/sdcdb.c
--- sdcc-3.1.0+dfsg/debugger/mcs51/sdcdb.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/debugger/mcs51/sdcdb.c	2012-03-14 20:37:02.000000000 +0000
@@ -1708,11 +1708,11 @@
 /*-----------------------------------------------------------------*/
 /* escapeQuotes - escape double quotes                             */
 /*-----------------------------------------------------------------*/
-#define CHUNCK  256
+#define CHUNK  256
 
 static const char *escapeQuotes(const char *arg)
 {
-#define extend(n)  do { if (ps - str + (n) > strLen) str = Safe_realloc (str, strLen += CHUNCK); } while (0)
+#define extend(n)  do { if ((size_t)(ps - str + (n)) > strLen) str = Safe_realloc (str, strLen += CHUNK); } while (0)
 
   static char *str = NULL;
   static size_t strLen = 0;
@@ -1721,7 +1721,7 @@
 
   if (NULL == str)
     {
-      strLen = CHUNCK;
+      strLen = CHUNK;
       str = Safe_malloc (strLen);
     }
 
@@ -1757,8 +1757,8 @@
 
   if (NULL == cmd)
     {
-      cmd = Safe_malloc(CHUNCK);
-      cmdLen = CHUNCK;
+      cmd = Safe_malloc(CHUNK);
+      cmdLen = CHUNK;
     }
 
   for (i = 0; i < nargs; ++i)
@@ -2071,9 +2071,8 @@
 static void sigchld(int sig)
 {
   /* the only child can be the simulator */
-  int status, retpid;
-  retpid = wait ( &status );
-  /* if ( retpid == simPid ) */
+  int status;
+  wait ( &status );
   simactive = 0;
 }
 #endif
diff -Nru sdcc-3.1.0+dfsg/device/include/asm/default/features.h sdcc-3.2.0+dfsg/device/include/asm/default/features.h
--- sdcc-3.1.0+dfsg/device/include/asm/default/features.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/asm/default/features.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/asm/ds390/features.h sdcc-3.2.0+dfsg/device/include/asm/ds390/features.h
--- sdcc-3.1.0+dfsg/device/include/asm/ds390/features.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/asm/ds390/features.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -42,15 +42,15 @@
      char _AUTOMEM * pAr = Ar;
    }
 */
-#if defined(SDCC_STACK_AUTO)
-  #if defined(SDCC_USE_XSTACK)
+#if defined(__SDCC_STACK_AUTO)
+  #if defined(__SDCC_USE_XSTACK)
     #define _AUTOMEM __pdata
-  #elif defined(SDCC_STACK_TENBIT)
+  #elif defined(__SDCC_STACK_TENBIT)
     #define _AUTOMEM __xdata
   #else
     #define _AUTOMEM __idata
   #endif
-#elif defined(SDCC_MODEL_SMALL)
+#elif defined(__SDCC_MODEL_SMALL)
   #define _AUTOMEM __data
 #else
   #define _AUTOMEM __xdata
@@ -65,7 +65,7 @@
      char _STATMEM * pAr = Ar;
    }
 */
-#if defined(SDCC_MODEL_SMALL)
+#if defined(__SDCC_MODEL_SMALL)
   #define _STATMEM __data
 #else
   #define _STATMEM __xdata
diff -Nru sdcc-3.1.0+dfsg/device/include/asm/gbz80/features.h sdcc-3.2.0+dfsg/device/include/asm/gbz80/features.h
--- sdcc-3.1.0+dfsg/device/include/asm/gbz80/features.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/asm/gbz80/features.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/asm/mcs51/features.h sdcc-3.2.0+dfsg/device/include/asm/mcs51/features.h
--- sdcc-3.1.0+dfsg/device/include/asm/mcs51/features.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/asm/mcs51/features.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -42,15 +42,15 @@
      char _AUTOMEM * pAr = Ar;
    }
 */
-#if defined(SDCC_STACK_AUTO)
-  #if defined(SDCC_USE_XSTACK)
+#if defined(__SDCC_STACK_AUTO)
+  #if defined(__SDCC_USE_XSTACK)
     #define _AUTOMEM __pdata
   #else
     #define _AUTOMEM __idata
   #endif
-#elif defined(SDCC_MODEL_SMALL)
+#elif defined(__SDCC_MODEL_SMALL)
   #define _AUTOMEM __data
-#elif defined(SDCC_MODEL_MEDIUM)
+#elif defined(__SDCC_MODEL_MEDIUM)
   #define _AUTOMEM __pdata
 #else
   #define _AUTOMEM __xdata
@@ -65,9 +65,9 @@
      char _STATMEM * pAr = Ar;
    }
 */
-#if defined(SDCC_MODEL_SMALL)
+#if defined(__SDCC_MODEL_SMALL)
   #define _STATMEM __data
-#elif defined(SDCC_MODEL_MEDIUM)
+#elif defined(__SDCC_MODEL_MEDIUM)
   #define _STATMEM __pdata
 #else
   #define _STATMEM __xdata
@@ -76,7 +76,7 @@
 
 /* define _RETURN for correct returning from inline asm functions
 */
-#if defined(SDCC_MODEL_HUGE)
+#if defined(__SDCC_MODEL_HUGE)
  #define _RETURN ljmp __sdcc_banked_ret
 #else
  #define _RETURN ret
diff -Nru sdcc-3.1.0+dfsg/device/include/asm/pic14/features.h sdcc-3.2.0+dfsg/device/include/asm/pic14/features.h
--- sdcc-3.1.0+dfsg/device/include/asm/pic14/features.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/asm/pic14/features.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/asm/pic16/features.h sdcc-3.2.0+dfsg/device/include/asm/pic16/features.h
--- sdcc-3.1.0+dfsg/device/include/asm/pic16/features.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/asm/pic16/features.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/asm/r2k/features.h sdcc-3.2.0+dfsg/device/include/asm/r2k/features.h
--- sdcc-3.1.0+dfsg/device/include/asm/r2k/features.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/asm/r2k/features.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/asm/r3ka/features.h sdcc-3.2.0+dfsg/device/include/asm/r3ka/features.h
--- sdcc-3.1.0+dfsg/device/include/asm/r3ka/features.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/asm/r3ka/features.h	2012-05-21 00:13:27.000000000 +0000
@@ -0,0 +1,50 @@
+/*-------------------------------------------------------------------------
+   features.h - Rabbit 3000A specific features.
+
+   Copyright (C) 2001, Michael Hope
+   
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+#ifndef __SDCC_ASM_R3KA_FEATURES_H
+#define __SDCC_ASM_R3KA_FEATURES_H   1
+
+#define _REENTRANT
+#define _CODE
+#define _AUTOMEM
+#define _STATMEM
+
+#define _SDCC_MANGLES_SUPPORT_FUNS	1
+#define _SDCC_Z80_STYLE_LIB_OPT		1
+
+/* The following are disabled to make the dhrystone test more authentic.
+ */
+#define _SDCC_PORT_PROVIDES_MEMCPY	0
+#define _SDCC_PORT_PROVIDES_STRCMP	0
+/* Register allocator is as good as hand coded asm.  Cool. */
+#define _SDCC_PORT_PROVIDES_STRCPY	0
+
+#define _SDCC_MALLOC_TYPE_MLH		1
+
+#endif
+
diff -Nru sdcc-3.1.0+dfsg/device/include/asm/z180/features.h sdcc-3.2.0+dfsg/device/include/asm/z180/features.h
--- sdcc-3.1.0+dfsg/device/include/asm/z180/features.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/asm/z180/features.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/asm/z80/features.h sdcc-3.2.0+dfsg/device/include/asm/z80/features.h
--- sdcc-3.1.0+dfsg/device/include/asm/z80/features.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/asm/z80/features.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/assert.h sdcc-3.2.0+dfsg/device/include/assert.h
--- sdcc-3.1.0+dfsg/device/include/assert.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/assert.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/ctype.h sdcc-3.2.0+dfsg/device/include/ctype.h
--- sdcc-3.1.0+dfsg/device/include/ctype.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/ctype.h	2012-03-13 10:17:10.000000000 +0000
@@ -11,7 +11,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/ds390/serial390.h sdcc-3.2.0+dfsg/device/include/ds390/serial390.h
--- sdcc-3.1.0+dfsg/device/include/ds390/serial390.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/ds390/serial390.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/ds400/ds400rom.h sdcc-3.2.0+dfsg/device/include/ds400/ds400rom.h
--- sdcc-3.1.0+dfsg/device/include/ds400/ds400rom.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/ds400/ds400rom.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/ds80c390.h sdcc-3.2.0+dfsg/device/include/ds80c390.h
--- sdcc-3.1.0+dfsg/device/include/ds80c390.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/ds80c390.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/errno.h sdcc-3.2.0+dfsg/device/include/errno.h
--- sdcc-3.1.0+dfsg/device/include/errno.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/errno.h	2012-03-20 09:56:26.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -38,4 +38,15 @@
 #define EDOM        33  /* Math argument out of domain of functions */
 #define ERANGE      34  /* Math result not representable */
 
+/* Bounds-checking interfaces from annex K of the C11 standard. */
+#if defined (__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__
+
+#ifndef __ERRNO_T_DEFINED
+#define __ERRNO_T_DEFINED
+typedef int errno_t;
+#endif
+
+#endif
+
 #endif  /* _INC_ERRNO */
+
diff -Nru sdcc-3.1.0+dfsg/device/include/float.h sdcc-3.2.0+dfsg/device/include/float.h
--- sdcc-3.1.0+dfsg/device/include/float.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/float.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -76,7 +76,7 @@
 char __fsgt (float, float);
 
 
-#if defined(SDCC_FLOAT_LIB) && defined(SDCC_mcs51) && !defined(SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
+#if defined(__SDCC_FLOAT_LIB) && defined(__SDCC_mcs51) && !defined(__SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
 
 #define FLOAT_ASM_MCS51
 
diff -Nru sdcc-3.1.0+dfsg/device/include/hc08/mc68hc908apxx.h sdcc-3.2.0+dfsg/device/include/hc08/mc68hc908apxx.h
--- sdcc-3.1.0+dfsg/device/include/hc08/mc68hc908apxx.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/hc08/mc68hc908apxx.h	2012-03-13 10:17:10.000000000 +0000
@@ -8,7 +8,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/hc08/mc68hc908gp32.h sdcc-3.2.0+dfsg/device/include/hc08/mc68hc908gp32.h
--- sdcc-3.1.0+dfsg/device/include/hc08/mc68hc908gp32.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/hc08/mc68hc908gp32.h	2012-03-13 10:17:10.000000000 +0000
@@ -8,7 +8,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/hc08/mc68hc908jb8.h sdcc-3.2.0+dfsg/device/include/hc08/mc68hc908jb8.h
--- sdcc-3.1.0+dfsg/device/include/hc08/mc68hc908jb8.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/hc08/mc68hc908jb8.h	2012-03-13 10:17:10.000000000 +0000
@@ -7,7 +7,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/hc08/mc68hc908jkjl.h sdcc-3.2.0+dfsg/device/include/hc08/mc68hc908jkjl.h
--- sdcc-3.1.0+dfsg/device/include/hc08/mc68hc908jkjl.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/hc08/mc68hc908jkjl.h	2012-03-13 10:17:10.000000000 +0000
@@ -8,7 +8,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/hc08/mc68hc908qy.h sdcc-3.2.0+dfsg/device/include/hc08/mc68hc908qy.h
--- sdcc-3.1.0+dfsg/device/include/hc08/mc68hc908qy.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/hc08/mc68hc908qy.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/iso646.h sdcc-3.2.0+dfsg/device/include/iso646.h
--- sdcc-3.1.0+dfsg/device/include/iso646.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/iso646.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/limits.h sdcc-3.2.0+dfsg/device/include/limits.h
--- sdcc-3.1.0+dfsg/device/include/limits.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/limits.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -33,7 +33,7 @@
 #define SCHAR_MAX   127
 #define SCHAR_MIN  -128
 #define UCHAR_MAX   0xff
-#ifdef SDCC_CHAR_UNSIGNED
+#ifdef __SDCC_CHAR_UNSIGNED
 #define CHAR_MAX    UCHAR_MAX
 #define CHAR_MIN    0
 #else
@@ -49,13 +49,13 @@
 #define UINT_MIN    0
 #define USHRT_MAX   UINT_MAX
 #define USHRT_MIN   UINT_MIN
-#define LONG_MIN   -2147483648
-#define LONG_MAX    2147483647
+#define LONG_MIN    (-2147483647L-1)
+#define LONG_MAX    2147483647L
 #define ULONG_MAX   0xffffffff
 #define ULONG_MIN   0
-#define LLONG_MIN  -9223372036854775808
-#define LLONG_MAX   9223372036854775807
-#define ULLONG_MAX  18446744073709551615
+#define LLONG_MIN   (-9223372036854775807LL-1)
+#define LLONG_MAX   9223372036854775807LL
+#define ULLONG_MAX  18446744073709551615ULL
 
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/device/include/malloc.h sdcc-3.2.0+dfsg/device/include/malloc.h
--- sdcc-3.1.0+dfsg/device/include/malloc.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/malloc.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/math.h sdcc-3.2.0+dfsg/device/include/math.h
--- sdcc-3.1.0+dfsg/device/include/math.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/math.h	2012-05-21 00:13:27.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -53,7 +53,7 @@
     long l;
 };
 
-#if defined(SDCC_MATH_LIB) && defined(SDCC_mcs51) && !defined(SDCC_USE_XSTACK) && !defined(SDCC_STACK_AUTO) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
+#if defined(__SDCC_MATH_LIB) && defined(__SDCC_mcs51) && !defined(__SDCC_USE_XSTACK) && !defined(__SDCC_STACK_AUTO) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
 /* Compile the mcs51 assembly version only when all these
    conditions are met.  Since not all the functions are
    reentrant, do not compile with --stack-auto is used. */
@@ -63,7 +63,7 @@
 
 /* Functions on the z80 & gbz80 are always reentrant and so the "reentrant" */
 /* keyword is not defined. */
-#if defined(SDCC_z80) || defined(SDCC_z180) || defined(SDCC_r2k) || defined(SDCC_gbz80)
+#if defined(__SDCC_z80) || defined(__SDCC_z180) || defined(__SDCC_r2k) || defined(__SDCC_r3ka) || defined(__SDCC_r4k) || defined(__SDCC_gbz80)
 #define _FLOAT_FUNC_REENTRANT
 #else
 #define _FLOAT_FUNC_REENTRANT __reentrant
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/8051.h sdcc-3.2.0+dfsg/device/include/mcs51/8051.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/8051.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/8051.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/8052.h sdcc-3.2.0+dfsg/device/include/mcs51/8052.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/8052.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/8052.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/ADuC84x.h sdcc-3.2.0+dfsg/device/include/mcs51/ADuC84x.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/ADuC84x.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/ADuC84x.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/AT89C513xA.h sdcc-3.2.0+dfsg/device/include/mcs51/AT89C513xA.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/AT89C513xA.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/AT89C513xA.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051F000.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051F000.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051F000.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051F000.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051F018.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051F018.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051F018.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051F018.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051F020.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051F020.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051F020.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051F020.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051F040.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051F040.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051F040.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051F040.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051F060.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051F060.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051F060.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051F060.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051F120.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051F120.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051F120.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051F120.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051F200.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051F200.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051F200.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051F200.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051F300.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051F300.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051F300.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051F300.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051F310.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051F310.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051F310.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051F310.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051F320.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051F320.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051F320.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051F320.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051F326.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051F326.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051F326.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051F326.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051F330.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051F330.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051F330.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051F330.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051F336.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051F336.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051F336.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051F336.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051F340.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051F340.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051F340.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051F340.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051F350.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051F350.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051F350.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051F350.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051F360.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051F360.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051F360.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051F360.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051F410.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051F410.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051F410.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051F410.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051F520.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051F520.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051F520.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051F520.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051F920.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051F920.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051F920.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051F920.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051T600.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051T600.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051T600.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051T600.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051T610.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051T610.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051T610.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051T610.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/C8051T630.h sdcc-3.2.0+dfsg/device/include/mcs51/C8051T630.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/C8051T630.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/C8051T630.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/P89LPC925.h sdcc-3.2.0+dfsg/device/include/mcs51/P89LPC925.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/P89LPC925.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/P89LPC925.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/SST89x5xRDx.h sdcc-3.2.0+dfsg/device/include/mcs51/SST89x5xRDx.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/SST89x5xRDx.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/SST89x5xRDx.h	2012-03-13 10:17:10.000000000 +0000
@@ -7,7 +7,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/XC866.h sdcc-3.2.0+dfsg/device/include/mcs51/XC866.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/XC866.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/XC866.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/at89S8252.h sdcc-3.2.0+dfsg/device/include/mcs51/at89S8252.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/at89S8252.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/at89S8252.h	2012-03-13 10:17:10.000000000 +0000
@@ -16,7 +16,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/at89Sx051.h sdcc-3.2.0+dfsg/device/include/mcs51/at89Sx051.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/at89Sx051.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/at89Sx051.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/at89c51ed2.h sdcc-3.2.0+dfsg/device/include/mcs51/at89c51ed2.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/at89c51ed2.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/at89c51ed2.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/at89c51snd1c.h sdcc-3.2.0+dfsg/device/include/mcs51/at89c51snd1c.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/at89c51snd1c.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/at89c51snd1c.h	2012-03-13 10:17:10.000000000 +0000
@@ -8,7 +8,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/at89c55.h sdcc-3.2.0+dfsg/device/include/mcs51/at89c55.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/at89c55.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/at89c55.h	2012-03-13 10:17:10.000000000 +0000
@@ -8,7 +8,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/at89s53.h sdcc-3.2.0+dfsg/device/include/mcs51/at89s53.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/at89s53.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/at89s53.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/at89s8253.h sdcc-3.2.0+dfsg/device/include/mcs51/at89s8253.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/at89s8253.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/at89s8253.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/at89x051.h sdcc-3.2.0+dfsg/device/include/mcs51/at89x051.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/at89x051.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/at89x051.h	2012-03-13 10:17:10.000000000 +0000
@@ -7,7 +7,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/at89x51.h sdcc-3.2.0+dfsg/device/include/mcs51/at89x51.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/at89x51.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/at89x51.h	2012-03-13 10:17:10.000000000 +0000
@@ -8,7 +8,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/at89x52.h sdcc-3.2.0+dfsg/device/include/mcs51/at89x52.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/at89x52.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/at89x52.h	2012-03-13 10:17:10.000000000 +0000
@@ -8,7 +8,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/cc2430.h sdcc-3.2.0+dfsg/device/include/mcs51/cc2430.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/cc2430.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/cc2430.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/cc2510fx.h sdcc-3.2.0+dfsg/device/include/mcs51/cc2510fx.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/cc2510fx.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/cc2510fx.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/cc2530.h sdcc-3.2.0+dfsg/device/include/mcs51/cc2530.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/cc2530.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/cc2530.h	2012-06-21 09:00:27.000000000 +0000
@@ -0,0 +1,471 @@
+/*-------------------------------------------------------------------------
+   cc2530.h - Register Declarations for Chipcon/Texas Intruments CC2530
+   (Based on CC253x User's Guide (rev. B) SWRU191B)
+
+   Copyright (C) 2011, Zafi Ramarosandratana / zramaro at gmail.com
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+#ifndef REG_CC2530_H
+#define REG_CC2530_H
+
+#include <compiler.h>
+
+// Interrupt Vectors
+
+#define RFERR_VECTOR    0   // RF TX FIFO underflow and RX FIFO overflow.
+#define ADC_VECTOR      1   // ADC end of conversion
+#define URX0_VECTOR     2   // USART0 RX complete
+#define URX1_VECTOR     3   // USART1 RX complete
+#define ENC_VECTOR      4   // AES encryption/decryption complete
+#define ST_VECTOR       5   // Sleep Timer compare
+#define P2INT_VECTOR    6   // Port 2 inputs
+#define UTX0_VECTOR     7   // USART0 TX complete
+#define DMA_VECTOR      8   // DMA transfer complete
+#define T1_VECTOR       9   // Timer 1 (16-bit) capture/compare/overflow
+#define T2_VECTOR       10  // Timer 2 (MAC Timer)
+#define T3_VECTOR       11  // Timer 3 (8-bit) capture/compare/overflow
+#define T4_VECTOR       12  // Timer 4 (8-bit) capture/compare/overflow
+#define P0INT_VECTOR    13  // Port 0 inputs
+#define UTX1_VECTOR     14  // USART1 TX complete
+#define P1INT_VECTOR    15  // Port 1 inputs
+#define RF_VECTOR       16  // RF general interrupts
+#define WDT_VECTOR      17  // Watchdog overflow in timer mode
+
+// SFR Registers and BITs
+
+SFR(P0,       0x80); // Port 0
+   SBIT(P0_0,     0x80, 0); // Port 0 bit 0
+   SBIT(P0_1,     0x80, 1); // Port 0 bit 1
+   SBIT(P0_2,     0x80, 2); // Port 0 bit 2
+   SBIT(P0_3,     0x80, 3); // Port 0 bit 3
+   SBIT(P0_4,     0x80, 4); // Port 0 bit 4
+   SBIT(P0_5,     0x80, 5); // Port 0 bit 5
+   SBIT(P0_6,     0x80, 6); // Port 0 bit 6
+   SBIT(P0_7,     0x80, 7); // Port 0 bit 7
+SFR(SP,       0x81); // Stack Pointer
+SFR(DPL0,     0x82); // Data Pointer 0 Low Byte
+SFR(DPH0,     0x83); // Data Pointer 0 High Byte
+SFR(DPL1,     0x84); // Data Pointer 1 Low Byte
+SFR(DPH1,     0x85); // Data Pointer 1 High Byte
+SFR(U0CSR,    0x86); // USART 0 Control and Status
+SFR(PCON,     0x87); // Power Mode Control
+SFR(TCON,     0x88); // Interrupt Flags
+   SBIT(IT0,      0x88, 0); // reserved (must always be set to 1)
+   SBIT(RFERRIF,  0x88, 1); // RF TX/RX FIFO interrupt flag
+   SBIT(IT1,      0x88, 2); // reserved (must always be set to 1)
+   SBIT(URX0IF,   0x88, 3); // USART0 RX Interrupt Flag
+   SBIT(ADCIF,    0x88, 5); // ADC Interrupt Flag
+   SBIT(URX1IF,   0x88, 7); // USART1 RX Interrupt Flag
+SFR(P0IFG,    0x89); // Port 0 Interrupt Status Flag
+SFR(P1IFG,    0x8A); // Port 1 Interrupt Status Flag
+SFR(P2IFG,    0x8B); // Port 2 Interrupt Status Flag
+SFR(PICTL,    0x8C); // Port Interrupt Control
+SFR(P1IEN,    0x8D); // Port 1 Interrupt Mask
+SFR(P0INP,    0x8F); // Port 0 Input Mode
+SFR(P1,       0x90); // Port 1
+   SBIT(P1_0,     0x90, 0); // Port 1 bit 0
+   SBIT(P1_1,     0x90, 1); // Port 1 bit 1
+   SBIT(P1_2,     0x90, 2); // Port 1 bit 2
+   SBIT(P1_3,     0x90, 3); // Port 1 bit 3
+   SBIT(P1_4,     0x90, 4); // Port 1 bit 4
+   SBIT(P1_5,     0x90, 5); // Port 1 bit 5
+   SBIT(P1_6,     0x90, 6); // Port 1 bit 6
+   SBIT(P1_7,     0x90, 7); // Port 1 bit 7
+SFR(RFIRQF1,  0x91); // RF Interrupt Flags MSB
+SFR(DPS,      0x92); // Data Pointer Select
+SFR(MPAGE,    0x93); // Memory Page Select
+SFR(_XPAGE,   0x93); // XDATA/PDATA page alias for SDCC
+SFR(T2CTRL,   0x94); // Timer 2 Control
+SFR(ST0,      0x95); // Sleep Timer 0
+SFR(ST1,      0x96); // Sleep Timer 1
+SFR(ST2,      0x97); // Sleep Timer 2
+SFR(S0CON,    0x98); // Interrupt Flags 2
+   SBIT(ENCIF_0,  0x98, 0); // AES Interrupt Flag 0
+   SBIT(ENCIF_1,  0x98, 1); // AES Interrupt Flag 1
+SFR(IEN2,     0x9A); // Interrupt Enable 2
+SFR(S1CON,    0x9B); // Interrupt Flags 3
+SFR(T2EVTCFG, 0x9C); // Timer 2 Event Configuration
+SFR(SLEEPSTA, 0x9D); // Sleep Mode Control Status
+SFR(CLKCONSTA,0x9E); // Clock Control Status
+SFR(PSBANK,   0x9F); // Identifier Name used by the trampoline __sdcc_banked_call
+SFR(FMAP,     0x9F); // Flash Memory Bank Mapping
+SFR(P2,       0xA0); // Port 2
+   SBIT(P2_0,     0xA0, 0); // Port 2 bit 0
+   SBIT(P2_1,     0xA0, 1); // Port 2 bit 1
+   SBIT(P2_2,     0xA0, 2); // Port 2 bit 2
+   SBIT(P2_3,     0xA0, 3); // Port 2 bit 3
+   SBIT(P2_4,     0xA0, 4); // Port 2 bit 4
+   SBIT(P2_5,     0xA0, 5); // Port 2 bit 5
+   SBIT(P2_6,     0xA0, 6); // Port 2 bit 6
+   SBIT(P2_7,     0xA0, 7); // Port 2 bit 7
+SFR(T2IRQF,   0xA1); // Timer 2 Interrupt Flags
+SFR(T2M0,     0xA2); // Timer 2 Multiplexed Register 0
+SFR(T2M1,     0xA3); // Timer 2 Multiplexed Rgeister 1
+SFR(T2MOVF0,  0xA4); // Timer 2 Multiplexed Overflow Register 0
+SFR(T2MOVF1,  0xA5); // Timer 2 Multiplexed Overflow Register 1
+SFR(T2MOVF2,  0xA6); // Timer 2 Multiplexed Overflow Register 2
+SFR(T2IRQM,   0xA7); // Timer 2 Interrupt Mask
+SFR(IEN0,     0xA8); // Interrupt Enable 0
+   SBIT(RFERRIE,  0xA8, 0); // RF TX/RX FIFO interrupt Enable
+   SBIT(ADCIE,    0xA8, 1); // ADC Interrupt Enable
+   SBIT(URX0IE,   0xA8, 2); // USART0 RX Interrupt Enable
+   SBIT(URX1IE,   0xA8, 3); // USART1 RX Interrupt Enable
+   SBIT(ENCIE,    0xA8, 4); // AES Encryption/Decryption Interrupt Enable
+   SBIT(STIE,     0xA8, 5); // Sleep Timer Interrupt Enable
+   SBIT(EA,       0xA8, 7); // Global Interrupt Enable
+SFR(IP0,      0xA9); // Interrupt Priority 0
+SFR(P0IEN,    0xAB); // Port 0 Interrupt Mask
+SFR(P2IEN,    0xAC); // Port 2 Interrupt Mask
+SFR(STLOAD,   0xAD); // Sleep Timer Load Status
+SFR(PMUX,     0xAE); // Power Down Signal Mux
+SFR(T1STAT,   0xAF); // Timer 1 Status
+SFR(ENCDI,    0xB1); // Encryption Input Data
+SFR(ENCDO,    0xB2); // Encryption Output Data
+SFR(ENCCS,    0xB3); // Encryption Control and Status
+SFR(ADCCON1,  0xB4); // ADC Control 1
+SFR(ADCCON2,  0xB5); // ADC Control 2
+SFR(ADCCON3,  0xB6); // ADC Control 3
+SFR(IEN1,     0xB8); // Interrupt Enable 1
+   SBIT(DMAIE,    0xB8, 0); // DMA Transfer Interrupt Enable
+   SBIT(T1IE,     0xB8, 1); // Timer 1 Interrupt Enable
+   SBIT(T2IE,     0xB8, 2); // Timer 2 Interrupt Enable
+   SBIT(T3IE,     0xB8, 3); // Timer 3 Interrupt Enable
+   SBIT(T4IE,     0xB8, 4); // Timer 4 Interrupt Enable
+   SBIT(P0IE,     0xB8, 5); // Port 0 Interrupt Enable
+SFR(IP1,      0xB9); // Interrupt Priority 1
+SFR(ADCL,     0xBA); // ADC Data Low
+SFR(ADCH,     0xBB); // ADC Data High
+SFR(RNDL,     0xBC); // Random Number Generator Data Low Byte
+SFR(RNDH,     0xBD); // Random Number Generator Data High Byte
+SFR(SLEEPCMD, 0xBE); // Sleep Mode Control Command
+SFR(RFERRF,   0xBF); // RF Error Interrupt Flags
+SFR(IRCON,    0xC0); // Interrupt Flags 4
+   SBIT(DMAIF,    0xC0, 0); // DMA Complete Interrupt Flag
+   SBIT(T1IF,     0xC0, 1); // Timer 1 Interrupt Flag
+   SBIT(T2IF,     0xC0, 2); // Timer 2 Interrupt Flag
+   SBIT(T3IF,     0xC0, 3); // Timer 3 Interrupt Flag
+   SBIT(T4IF,     0xC0, 4); // Timer 4 Interrupt Flag
+   SBIT(P0IF,     0xC0, 5); // Port 0 Interrupt Flag
+   SBIT(STIF,     0xC0, 7); // Sleep Timer Interrupt Flag
+SFR(U0DBUF,   0xC1); // USART 0 Receive/Transmit Data Buffer
+SFR(U0BAUD,   0xC2); // USART 0 Baud Rate Control
+SFR(T2MSEL,   0xC3); // Timer 2 Multiplex Select
+SFR(U0UCR,    0xC4); // USART 0 UART Control
+SFR(U0GCR,    0xC5); // USART 0 Generic Control
+SFR(CLKCONCMD,0xC6); // Clock Control Command
+SFR(MEMCTR,   0xC7); // Memory Arbitrer Control
+SFR(WDCTL,    0xC9); // Watchdog Timer Control
+SFR(T3CNT,    0xCA); // Timer 3 Counter
+SFR(T3CTL,    0xCB); // Timer 3 Control
+SFR(T3CCTL0,  0xCC); // Timer 3 Channel 0 Capture/Compare Control
+SFR(T3CC0,    0xCD); // Timer 3 Channel 0 Capture/Compare Value
+SFR(T3CCTL1,  0xCE); // Timer 3 Channel 1 Capture/Compare Control
+SFR(T3CC1,    0xCF); // Timer 3 Channel 1 Capture/Compare Value
+SFR(PSW,      0xD0); // Program Status Word
+   SBIT(P,        0xD0, 0); // Parity Flag
+   SBIT(F1,       0xD0, 1); // User-Defined Flag
+   SBIT(OV,       0xD0, 2); // Overflow Flag
+   SBIT(RS0,      0xD0, 3); // Register Bank Select 0
+   SBIT(RS1,      0xD0, 4); // Register Bank Select 1
+   SBIT(F0,       0xD0, 5); // User-Defined Flag
+   SBIT(AC,       0xD0, 6); // Auxiliary Carry Flag
+   SBIT(CY,       0xD0, 7); // Carry Flag
+SFR(DMAIRQ,   0xD1); // DMA Interrupt Flag
+SFR(DMA1CFGL, 0xD2); // DMA Channel 1-4 Configuration Address Low Byte
+SFR(DMA1CFGH, 0xD3); // DMA Channel 1-4 Configuration Address High Byte
+SFR(DMA0CFGL, 0xD4); // DMA Channel 0 Configuration Address Low Byte
+SFR(DMA0CFGH, 0xD5); // DMA Channel 0 Configuration Address High Byte
+SFR(DMAARM,   0xD6); // DMA Channel Arm
+SFR(DMAREQ,   0xD7); // DMA Channel Start Request and Status
+SFR(TIMIF,    0xD8); // Timers 1/3/4 Interrupt Mask/Flag
+   SBIT(T3OVFIF,  0xD8, 0); // Timer 3 overflow interrupt flag 0:no pending 1:pending
+   SBIT(T3CH0IF,  0xD8, 1); // Timer 3 channel 0 interrupt flag 0:no pending 1:pending
+   SBIT(T3CH1IF,  0xD8, 2); // Timer 3 channel 1 interrupt flag 0:no pending 1:pending
+   SBIT(T4OVFIF,  0xD8, 3); // Timer 4 overflow interrupt flag 0:no pending 1:pending
+   SBIT(T4CH0IF,  0xD8, 4); // Timer 4 channel 0 interrupt flag 0:no pending 1:pending
+   SBIT(T4CH1IF,  0xD8, 5); // Timer 4 channel 1 interrupt flag 0:no pending 1:pending
+   SBIT(OVFIM,    0xD8, 6); // Timer 1 overflow interrupt mask
+SFR(RFD,      0xD9); // RF Data
+SFR(T1CC0L,   0xDA); // Timer 1 Channel 0 Capture/Compare Value Low
+SFR(T1CC0H,   0xDB); // Timer 1 Channel 0 Capture/Compare Value High
+SFR(T1CC1L,   0xDC); // Timer 1 Channel 1 Capture/Compare Value Low
+SFR(T1CC1H,   0xDD); // Timer 1 Channel 1 Capture/Compare Value High
+SFR(T1CC2L,   0xDE); // Timer 1 Channel 2 Capture/Compare Value Low
+SFR(T1CC2H,   0xDF); // Timer 1 Channel 2 Capture/Compare Value High
+SFR(ACC,      0xE0); // Accumulator
+   SBIT(ACC_0,    0xE0, 0); // Accumulator bit 0
+   SBIT(ACC_1,    0xE0, 1); // Accumulator bit 1
+   SBIT(ACC_2,    0xE0, 2); // Accumulator bit 2
+   SBIT(ACC_3,    0xE0, 3); // Accumulator bit 3
+   SBIT(ACC_4,    0xE0, 4); // Accumulator bit 4
+   SBIT(ACC_5,    0xE0, 5); // Accumulator bit 5
+   SBIT(ACC_6,    0xE0, 6); // Accumulator bit 6
+   SBIT(ACC_7,    0xE0, 7); // Accumulator bit 7
+SFR(RFST,     0xE1); // RF CSMA-CA / Strobe Processor
+SFR(T1CNTL,   0xE2); // Timer 1 Counter Low
+SFR(T1CNTH,   0xE3); // Timer 1 Counter High
+SFR(T1CTL,    0xE4); // Timer 1 Control and Status
+SFR(T1CCTL0,  0xE5); // Timer 1 Channel 0 Capture/Compare Control
+SFR(T1CCTL1,  0xE6); // Timer 1 Channel 1 Capture/Compare Control
+SFR(T1CCTL2,  0xE7); // Timer 1 Channel 2 Capture/Compare Control
+SFR(IRCON2,   0xE8); // Interrupt Flags 5
+   SBIT(P2IF,     0xE8, 0); // Port 2 Interrupt Flag
+   SBIT(UTX0IF,   0xE8, 1); // USART0 TX Interrupt Flag
+   SBIT(UTX1IF,   0xE8, 2); // USART1 TX Interrupt Flag
+   SBIT(P1IF,     0xE8, 3); // Port 1 Interrupt Flag
+   SBIT(WDTIF,    0xE8, 4); // Watchdog Timer Interrupt Flag
+SFR(RFIRQF0,  0xE9); // RF Interrupt Flags LSB
+SFR(T4CNT,    0xEA); // Timer 4 Counter
+SFR(T4CTL,    0xEB); // Timer 4 Control
+SFR(T4CCTL0,  0xEC); // Timer 4 Channel 0 Capture/Compare Control
+SFR(T4CC0,    0xED); // Timer 4 Channel 0 Capture/Compare Value
+SFR(T4CCTL1,  0xEE); // Timer 4 Channel 1 Capture/Compare Control
+SFR(T4CC1,    0xEF); // Timer 4 Channel 1 Capture/Compare Value
+SFR(B,        0xF0); // B Register
+   SBIT(B_0,      0xF0, 0); // Register B bit 0
+   SBIT(B_1,      0xF0, 1); // Register B bit 1
+   SBIT(B_2,      0xF0, 2); // Register B bit 2
+   SBIT(B_3,      0xF0, 3); // Register B bit 3
+   SBIT(B_4,      0xF0, 4); // Register B bit 4
+   SBIT(B_5,      0xF0, 5); // Register B bit 5
+   SBIT(B_6,      0xF0, 6); // Register B bit 6
+   SBIT(B_7,      0xF0, 7); // Register B bit 7
+SFR(PERCFG,   0xF1); // Peripheral I/O Control
+SFR(APCFG,    0xF2); // Analog Peripheral I/O Configuration
+SFR(P0SEL,    0xF3); // Port 0 Function Select
+SFR(P1SEL,    0xF4); // Port 1 Function Select
+SFR(P2SEL,    0xF5); // Port 2 Function Select
+SFR(P1INP,    0xF6); // Port 1 Input Mode
+SFR(P2INP,    0xF7); // Port 2 Input Mode
+SFR(U1CSR,    0xF8); // USART 1 Control and Status
+   SBIT(ACTIVE,   0xF8, 0); // USART transmit/receive active status 0:idle 1:busy
+   SBIT(TX_BYTE,  0xF8, 1); // Transmit byte status 0:Byte not transmitted 1:Last byte transmitted
+   SBIT(RX_BYTE,  0xF8, 2); // Receive byte status 0:No byte received 1:Received byte ready
+   SBIT(ERR,      0xF8, 3); // UART parity error status 0:No error 1:parity error
+   SBIT(FE,       0xF8, 4); // UART framing error status 0:No error 1:incorrect stop bit level
+   SBIT(SLAVE,    0xF8, 5); // SPI master or slave mode select 0:master 1:slave
+   SBIT(RE,       0xF8, 6); // UART receiver enable 0:disabled 1:enabled
+   SBIT(MODE,     0xF8, 7); // USART mode select 0:SPI 1:UART
+SFR(U1DBUF,   0xF9); // USART 1 Receive/Transmit Data Buffer
+SFR(U1BAUD,   0xFA); // USART 1 Baud Rate Control
+SFR(U1UCR,    0xFB); // USART 1 UART Control
+SFR(U1GCR,    0xFC); // USART 1 Generic Control
+SFR(P0DIR,    0xFD); // Port 0 Direction
+SFR(P1DIR,    0xFE); // Port 1 Direction
+SFR(P2DIR,    0xFF); // Port 2 Direction
+//
+//// From Table 2-2 : Overview of XREG Registers
+//
+SFRX(I2CCFG,     0x6230); // I2C control
+SFRX(I2CSTAT,    0x6231); // I2C status
+SFRX(I2CDATA,    0x6232); // I2C data
+SFRX(I2CADDR,    0x6233); // I2C own slave address
+SFRX(I2CWC,      0x6234); // Wrapper control
+SFRX(I2CIO,      0x6235); // GPIO
+SFRX(OBSSEL0,    0x6243); // Observation output control register 0
+SFRX(OBSSEL1,    0x6244); // Observation output control register 1
+SFRX(OBSSEL2,    0x6245); // Observation output control register 2
+SFRX(OBSSEL3,    0x6246); // Observation output control register 3
+SFRX(OBSSEL4,    0x6247); // Observation output control register 4
+SFRX(OBSSEL5,    0x6248); // Observation output control register 5
+SFRX(CHVER,      0x6249); // Chip version
+SFRX(CHIPID,     0x624A); // Chip identification
+SFRX(TESTREG0,   0x624B); // Test register 0, cannot use TR0 name from the datasheet due to TR0 (TCON.4) redefinition
+SFRX(DBGDATA,    0x6260); // Debug interface write data
+SFRX(SRCRC,      0x6262); // Sleep reset CRC
+SFRX(BATTMON,    0x6264); // Battery monitor
+SFRX(IVCTRL,     0x6265); // Analog control register
+SFRX(FCTL,       0x6270); // Flash control
+SFRX(FADDRL,     0x6271); // Flash address low
+SFRX(FADDRH,     0x6272); // Flash address high
+SFRX(FWDATA,     0x6273); // Flash write data
+SFRX(CHIPINFO0,  0x6276); // Chip information byte 0
+SFRX(CHIPINFO1,  0x6277); // Chip information byte 1
+SFRX(IRCTL,      0x6281); // Timer 1 IR generation control
+SFRX(CLD,        0x6290); // Clock-loss detection 
+SFRX(X_T1CCTL0,    0x62A0); // Timer 1 channel 0 capture/compare control (additional XREG mapping of SFR register)
+SFRX(X_T1CCTL1,    0x62A1); // Timer 1 channel 1 capture/compare control (additional XREG mapping of SFR register)
+SFRX(X_T1CCTL2,    0x62A2); // Timer 1 channel 2 capture/compare control (additional XREG mapping of SFR register)
+SFRX(T1CCTL3,    0x62A3); // Timer 1 channel 3 capture/compare control
+SFRX(T1CCTL4,    0x62A4); // Timer 1 channel 4 capture/compare control
+SFRX(X_T1CC0L,     0x62A6); // Timer 1 channel 0 capture/compare value low (additional XREG mapping of SFR register)
+SFRX(X_T1CC0H,     0x62A7); // Timer 1 channel 0 capture/compare value high (additional XREG mapping of SFR register)
+SFRX(X_T1CC1L,     0x62A8); // Timer 1 channel 1 capture/compare value low (additional XREG mapping of SFR register)
+SFRX(X_T1CC1H,     0x62A9); // Timer 1 channel 1 capture/compare value high (additional XREG mapping of SFR register)
+SFRX(X_T1CC2L,     0x62AA); // Timer 1 channel 2 capture/compare value low (additional XREG mapping of SFR register)
+SFRX(X_T1CC2H,     0x62AB); // Timer 1 channel 2 capture/compare value high (additional XREG mapping of SFR register)
+SFRX(T1CC3L,     0x62AC); // Timer 1 channel 3 capture/compare value low
+SFRX(T1CC3H,     0x62AD); // Timer 1 channel 3 capture/compare value high
+SFRX(T1CC4L,     0x62AE); // Timer 1 channel 4 capture/compare value low
+SFRX(T1CC4H,     0x62AF); // Timer 1 channel 4 capture/compare value high
+SFRX(STCC,       0x62B0); // Sleep Timer capture control
+SFRX(STCS,       0x62B1); // Sleep Timer capture status
+SFRX(STCV0,      0x62B2); // Sleep Timer capture value byte 0
+SFRX(STCV1,      0x62B3); // Sleep Timer capture value byte 1
+SFRX(STCV2,      0x62B4); // Sleep Timer capture value byte 2
+SFRX(OPAMPC,     0x62C0); // Operational amplifier control
+SFRX(OPAMPS,     0x62C1); // Operational amplifier status
+SFRX(CMPCTL,     0x62D0); // Analog comparator control and status
+//
+//// From Section 21.12 : USB Registers
+//
+SFRX(USBADDR,    0x6200); // Function Address
+SFRX(USBPOW,     0x6201); // Power/Control Register
+SFRX(USBIIF,     0x6202); // IN Endpoints and EP0 Interrupt Flags
+SFRX(USBOIF,     0x6204); // OUT-Endpoint Interrupt Flags
+SFRX(USBCIF,     0x6206); // Common USB Interrupt Flags
+SFRX(USBIIE,     0x6207); // IN Endpoints and EP0 Interrupt-Enable Mask
+SFRX(USBOIE,     0x6209); // Out Endpoints Interrupt Enable Mask
+SFRX(USBCIE,     0x620B); // Common USB Interrupt-Enable Mask
+SFRX(USBFRML,    0x620C); // Current Frame Number (Low Byte)
+SFRX(USBFRMH,    0x620D); // Current Frame Number (High Byte)
+SFRX(USBINDEX,   0x620E); // Current-Endpoint Index Register
+SFRX(USBCTRL,    0x620F); // USB Control Register
+SFRX(USBMAXI,    0x6210); // Max. Packet Size for IN Endpoint{1�5}
+SFRX(USBCS0,     0x6211); // EP0 Control and Status (USBINDEX = 0)
+SFRX(USBCSIL,    0x6211); // IN EP{1�5} Control and Status, Low
+SFRX(USBCSIH,    0x6212); // IN EP{1�5} Control and Status, High
+SFRX(USBMAXO,    0x6213); // Max. Packet Size for OUT EP{1�5}
+SFRX(USBCSOL,    0x6214); // OUT EP{1�5} Control and Status, Low
+SFRX(USBCSOH,    0x6215); // OUT EP{1�5} Control and Status, High
+SFRX(USBCNT0,    0x6216); // Number of Received Bytes in EP0 FIFO (USBINDEX = 0)
+SFRX(USBCNTL,    0x6216); // Number of Bytes in EP{1�5} OUT FIFO, Low
+SFRX(USBCNTH,    0x6217); // Number of Bytes in EP{1�5} OUT FIFO, High
+SFRX(USBF0,      0x6220); // Endpoint-0 FIFO
+SFRX(USBF1,      0x6222); // Endpoint-1 FIFO
+SFRX(USBF2,      0x6224); // Endpoint-2 FIFO
+SFRX(USBF3,      0x6226); // Endpoint-3 FIFO
+SFRX(USBF4,      0x6228); // Endpoint-4 FIFO
+SFRX(USBF5,      0x622A); // Endpoint-5 FIFO
+//
+//// From Table 23.1 : Frame Filtering
+//
+SFRX(SHORTADDRH, 0x6174); // Short Address High Byte
+SFRX(SHORTADDRL, 0x6175); // Short Address Low Byte
+SFRX(PANIDH,     0x6172); // PAN ID High Byte
+SFRX(PANIDL,     0x6173); // PAN ID Low Byte
+SFRX(IEEE_ADDR,  0x616A); // Extended Address MSB
+
+//
+//// From Table 23-5 : CC253x Radio Register Overview
+//
+SFRX(FRMFILT0,   0x6180); // Frame Filtering
+SFRX(FRMFILT1,   0x6181); // Frame Filtering
+SFRX(SRCMATCH,   0x6182); // Source Address Matching and Pending Bits
+SFRX(SRCSHORTEN0,0x6183); // Short Address Matching
+SFRX(SRCSHORTEN1,0x6184); // Short Address Matching
+SFRX(SRCSHORTEN2,0x6185); // Short Address Matching
+SFRX(SRCEXTEN0,  0x6186); // Extended Address Matching
+SFRX(SRCEXTEN1,  0x6187); // Extended Address Matching
+SFRX(SRCEXTEN2,  0x6188); // Extended Address Matching
+SFRX(FRMCTRL0,   0x6189); // Frame Handling
+SFRX(FRMCTRL1,   0x618A); // Frame Handling
+SFRX(RXENABLE,   0x618B); // RX Enabling
+SFRX(RXMASKSET,  0x618C); // RX Enabling
+SFRX(RXMASKCLR,  0x618D); // RX Disabling
+SFRX(FREQTUNE,   0x618E); // Crystal Oscillator Frequency Tuning
+SFRX(FREQCTRL,   0x618F); // Controls the RF Frequency
+SFRX(TXPOWER,    0x6190); // Controls the Output Power
+SFRX(TXCTRL,     0x6191); // Controls the TX Settings
+SFRX(FSMSTAT0,   0x6192); // Radio Status Register
+SFRX(FSMSTAT1,   0x6193); // Radio Status Register
+SFRX(FIFOPCTRL,  0x6194); // FIFOP Threshold
+SFRX(FSMCTRL,    0x6195); // FSM Options
+SFRX(CCACTRL0,   0x6196); // CCA Threshold
+SFRX(CCACTRL1,   0x6197); // Other CCA Options
+SFRX(RSSI,       0x6198); // RSSI Status Register
+SFRX(RSSISTAT,   0x6199); // RSSI Valid Status Register
+SFRX(RXFIRST,    0x619A); // First Byte in RXFIFO
+SFRX(RXFIFOCNT,  0x619B); // Number of Bytes in RXFIFO
+SFRX(TXFIFOCNT,  0x619C); // Number of Bytes in TXFIFO
+SFRX(RXFIRST_PTR,0x619D); // RXFIFO Pointer
+SFRX(RXLAST_PTR, 0x619E); // RXFIFO Pointer
+SFRX(RXP1_PTR,   0x619F); // RXFIFO Pointer
+SFRX(TXFIRST_PTR,0x61A1); // TXFIFO Pointer
+SFRX(TXLAST_PTR, 0x61A2); // TXFIFO Pointer
+SFRX(RFIRQM0,    0x61A3); // RF Interrupt Masks
+SFRX(RFIRQM1,    0x61A4); // RF Interrupt Masks
+SFRX(RFERRM,     0x61A5); // RF Error Interrupt Mask
+SFRX(OPAMPMC,    0x61A6); // Operational amplifier mode control
+SFRX(RFRND,      0x61A7); // Random Data
+SFRX(MDMCTRL0,   0x61A8); // Controls Modem
+SFRX(MDMCTRL1,   0x61A9); // Controls Modem
+SFRX(FREQEST,    0x61AA); // Estimated RF Frequency Offset
+SFRX(RXCTRL,     0x61AB); // Tune Receive Section
+SFRX(FSCTRL,     0x61AC); // Tune Frequency Synthesizer
+SFRX(FSCAL1,     0x61AE); // Tune Frequency Calibration
+SFRX(FSCAL2,     0x61AF); // Tune Frequency Calibration
+SFRX(FSCAL3,     0x61B0); // Tune Frequency Calibration
+SFRX(AGCCTRL0,   0x61B1); // AGC Dynamic Range Control
+SFRX(AGCCTRL1,   0x61B2); // AGC Reference Level
+SFRX(AGCCTRL2,   0x61B3); // AGC Gain Override
+SFRX(AGCCTRL3,   0x61B4); // AGC Control
+SFRX(ADCTEST0,   0x61B5); // ADC Tuning
+SFRX(ADCTEST1,   0x61B6); // ADC Tuning
+SFRX(ADCTEST2,   0x61B7); // ADC Tuning
+SFRX(MDMTEST0,   0x61B8); // Test Register for Modem
+SFRX(MDMTEST1,   0x61B9); // Test Register for Modem
+SFRX(DACTEST0,   0x61BA); // DAC Override Value
+SFRX(DACTEST1,   0x61BB); // DAC Override Value
+SFRX(DACTEST2,   0x61BC); // DAC Test Setting
+SFRX(ATEST,      0x61BD); // Analog Test Control
+SFRX(PTEST0,     0x61BE); // Override Power-Down Register
+SFRX(PTEST1,     0x61BF); // Override Power-Down Register
+SFRX(CSPPROG0,   0x61C0); // CSP Program 0
+SFRX(CSPPROG1,   0x61C1); // CSP Program 1
+SFRX(CSPPROG2,   0x61C2); // CSP Program 2
+SFRX(CSPPROG3,   0x61C3); // CSP Program 3
+SFRX(CSPPROG4,   0x61C4); // CSP Program 4
+SFRX(CSPPROG5,   0x61C5); // CSP Program 5
+SFRX(CSPPROG6,   0x61C6); // CSP Program 6
+SFRX(CSPPROG7,   0x61C7); // CSP Program 7
+SFRX(CSPPROG8,   0x61C8); // CSP Program 8
+SFRX(CSPPROG9,   0x61C9); // CSP Program 9
+SFRX(CSPPROG10,  0x61CA); // CSP Program 10
+SFRX(CSPPROG11,  0x61CB); // CSP Program 11
+SFRX(CSPPROG12,  0x61CC); // CSP Program 12
+SFRX(CSPPROG13,  0x61CD); // CSP Program 13
+SFRX(CSPPROG14,  0x61CE); // CSP Program 14
+SFRX(CSPPROG15,  0x61CF); // CSP Program 15
+SFRX(CSPPROG16,  0x61D0); // CSP Program 16
+SFRX(CSPPROG17,  0x61D1); // CSP Program 17
+SFRX(CSPPROG18,  0x61D2); // CSP Program 18
+SFRX(CSPPROG19,  0x61D3); // CSP Program 19
+SFRX(CSPPROG20,  0x61D4); // CSP Program 20
+SFRX(CSPPROG21,  0x61D5); // CSP Program 21
+SFRX(CSPPROG22,  0x61D6); // CSP Program 22
+SFRX(CSPPROG23,  0x61D7); // CSP Program 23
+SFRX(CSPCTRL,    0x61E0); // CSP Control Bit
+SFRX(CSPSTAT,    0x61E1); // CSP Status Register
+SFRX(CSPX,       0x61E2); // CSP X Register
+SFRX(CSPY,       0x61E3); // CSP Y Register
+SFRX(CSPZ,       0x61E4); // CSP Z Register
+SFRX(CSPT,       0x61E5); // CSP T Register
+SFRX(RFC_OBS_CTRL0, 0x61EB); // RF Observation Mux Control
+SFRX(RFC_OBS_CTRL1, 0x61EC); // RF Observation Mux Control
+SFRX(RFC_OBS_CTRL2, 0x61ED); // RF Observation Mux Control
+SFRX(TXFILTCFG,  0x61FA); // TX Filter Configuration
+
+#endif //REG_CC2530_H
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/compiler.h sdcc-3.2.0+dfsg/device/include/mcs51/compiler.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/compiler.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/compiler.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -70,7 +70,7 @@
 /** SDCC - Small Device C Compiler
   * http://sdcc.sf.net
  */
-#if defined SDCC
+#if defined (SDCC) || defined (__SDCC)
 # define SBIT(name, addr, bit)  __sbit  __at(addr+bit)                    name
 # define SFR(name, addr)        __sfr   __at(addr)                        name
 # define SFRX(name, addr)       __xdata volatile unsigned char __at(addr) name
@@ -183,3 +183,4 @@
 #endif
 
 #endif //COMPILER_H
+
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/lint.h sdcc-3.2.0+dfsg/device/include/mcs51/lint.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/lint.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/lint.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/mcs51reg.h sdcc-3.2.0+dfsg/device/include/mcs51/mcs51reg.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/mcs51reg.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/mcs51reg.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/msc1210.h sdcc-3.2.0+dfsg/device/include/mcs51/msc1210.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/msc1210.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/msc1210.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/msm8xc154s.h sdcc-3.2.0+dfsg/device/include/mcs51/msm8xc154s.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/msm8xc154s.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/msm8xc154s.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/p89c66x.h sdcc-3.2.0+dfsg/device/include/mcs51/p89c66x.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/p89c66x.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/p89c66x.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/p89lpc9321.h sdcc-3.2.0+dfsg/device/include/mcs51/p89lpc9321.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/p89lpc9321.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/p89lpc9321.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/p89lpc9331.h sdcc-3.2.0+dfsg/device/include/mcs51/p89lpc9331.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/p89lpc9331.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/p89lpc9331.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/p89lpc933_4.h sdcc-3.2.0+dfsg/device/include/mcs51/p89lpc933_4.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/p89lpc933_4.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/p89lpc933_4.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/p89lpc9351.h sdcc-3.2.0+dfsg/device/include/mcs51/p89lpc9351.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/p89lpc9351.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/p89lpc9351.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/p89lpc935_6.h sdcc-3.2.0+dfsg/device/include/mcs51/p89lpc935_6.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/p89lpc935_6.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/p89lpc935_6.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/p89lpc938.h sdcc-3.2.0+dfsg/device/include/mcs51/p89lpc938.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/p89lpc938.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/p89lpc938.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/p89v51rd2.h sdcc-3.2.0+dfsg/device/include/mcs51/p89v51rd2.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/p89v51rd2.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/p89v51rd2.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/p89v66x.h sdcc-3.2.0+dfsg/device/include/mcs51/p89v66x.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/p89v66x.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/p89v66x.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/reg51.h sdcc-3.2.0+dfsg/device/include/mcs51/reg51.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/reg51.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/reg51.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/reg764.h sdcc-3.2.0+dfsg/device/include/mcs51/reg764.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/reg764.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/reg764.h	2012-03-13 10:17:10.000000000 +0000
@@ -7,7 +7,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/regc515c.h sdcc-3.2.0+dfsg/device/include/mcs51/regc515c.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/regc515c.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/regc515c.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/sab80515.h sdcc-3.2.0+dfsg/device/include/mcs51/sab80515.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/sab80515.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/sab80515.h	2012-03-13 10:17:10.000000000 +0000
@@ -7,7 +7,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/ser.h sdcc-3.2.0+dfsg/device/include/mcs51/ser.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/ser.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/ser.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/ser_ir.h sdcc-3.2.0+dfsg/device/include/mcs51/ser_ir.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/ser_ir.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/ser_ir.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/serial.h sdcc-3.2.0+dfsg/device/include/mcs51/serial.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/serial.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/serial.h	2012-03-13 10:17:10.000000000 +0000
@@ -7,7 +7,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/serial_IO.h sdcc-3.2.0+dfsg/device/include/mcs51/serial_IO.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/serial_IO.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/serial_IO.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/stc12.h sdcc-3.2.0+dfsg/device/include/mcs51/stc12.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/stc12.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/stc12.h	2012-03-13 10:17:10.000000000 +0000
@@ -0,0 +1,320 @@
+/*-------------------------------------------------------------------------
+   stc12.h - Register Declarations for STC10/11/12 Series
+   Based on 8051.h and compiler.h
+
+   Copyright (c) 2012, intron@intron.ac
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/*
+   Brief:
+
+       STC10/11/12 series are 8051-compatible MCU's. The "official" website
+   is http://www.stcmcu.com/ (In Chinese Han only), and datasheets in Chinese
+   Han and English can be downloaded there.
+
+   Reference:
+
+   1. The "official" C header file (written for another C51 compiler):
+        http://www.stcmcu.com/datasheet/stc/STC-AD-PDF/STC_NEW_8051.H
+   2. Datasheets for STC12(C/LE)5Axx(S2/AD) series:
+      Chinese Han:
+        http://www.stcmcu.com/datasheet/stc/STC-AD-PDF/STC12C5A60S2.pdf
+      English:
+        http://www.stcmcu.com/datasheet/stc/STC-AD-PDF/STC12C5A60S2-english.pdf
+   3. Datasheets for STC12(C/LE)52xxAD series:
+      Chinese Han:
+        http://www.stcmcu.com/datasheet/stc/STC-AD-PDF/STC12C5201AD.pdf
+      English:
+        http://www.stcmcu.com/datasheet/stc/STC-AD-PDF/STC12C5201AD-english.pdf
+   4. Datasheets for STC11/10 series:
+      Chinese Han:
+        http://www.stcmcu.com/datasheet/stc/STC-AD-PDF/STC11F-10Fxx.pdf
+      English:
+        http://www.stcmcu.com/datasheet/stc/STC-AD-PDF/STC11F-10Fxx-english.pdf
+ */
+
+#ifndef _STC12_H_
+#define _STC12_H_
+
+#include <8051.h>
+#include <compiler.h>
+
+#ifdef REG8051_H
+#undef REG8051_H
+#endif
+
+/*
+ * Auxiliary Register
+ *   Bit Mapping: T0x12 T1x12 UART_M0x6 BRTR S2SMOD BRTx12 EXTRAM S1BRS
+ *   Reset Value: 0000,0000
+ */
+SFR(AUXR, 0x8E);
+
+/*
+ * Auxiliary Register 1
+ *   Bit Mapping: - PCA_P4 SPI_P4 S2_P4 GF2 ADRJ - DPS
+ *   Reset Value: x000,00x0
+ */
+SFR(AUXR1, 0xA2);
+
+/*
+ * Control Register for Clock Output and Power Down Wake-up
+ *   Bit Mapping: PCAWAKEUP RXD_PIN_IE T1_PIN_IE T0_PIN_IE
+ *                LVD_WAKE BRTCLKO T1CLKO T0CLKO
+ *                (Here "O" is the letter meaning "output", not the digit.)
+ *   Reset Value: 0000,0000
+ */
+SFR(WAKE_CLKO, 0x8F);
+
+/*
+ * Clock Devider Register
+ *   Bit Mapping: - - - - - CLKS2 CLKS1 CLKS0 
+ *   Reset Value: xxxx,x000
+ */
+SFR(CLK_DIV, 0x97);
+
+/*
+ * Stretch register
+ *   Bit Mapping: - - ALES1 ALES0 - RWS2 RWS1 RWS0
+ *   Reset Value: xx10,x011
+ */
+SFR(BUS_SPEED, 0xA1);
+
+/* Two extended bits in IE */
+SBIT(ELVD, 0xA8, 6); /* Enable Low Voltage Detection Interrupt */
+SBIT(EADC, 0xA8, 5); /* Enable ADC Interrupt */
+
+/*
+ * Auxiliary Interrupt Register
+ *   Bit Mapping: - - - - - - ESPI ES2
+ *   Reset Value: xxxx,xx00
+ */
+SFR(IE2, 0xAF);
+
+/* Three extended bits in IP */
+SBIT(PPCA, 0xB8, 7); /* Interrupt Priority for PCA */
+SBIT(PLVD, 0xB8, 6); /* Interrupt Priority for Low Voltage Detection */
+SBIT(PADC, 0xB8, 5); /* Interrupt Priority for ADC */
+
+/*
+ * Higher bits for Interrupt Priority
+ *   Bit Mapping: PPCAH PLVDH PADCH PSH PT1H PX1H PT0H PX0H
+ *   Reset Value: 0000,0000
+ */
+SFR(IPH, 0xB7);
+
+/*
+ * The 2nd Interrupt Priority Register, Lower bits
+ *   Bit Mapping: - - - - - - PSPI PS2
+ *   Reset Value: xxxx,xx00
+ */
+SFR(IP2, 0xB5);
+
+/*
+ * The 2nd Interrupt Priority Register, Higher bits
+ *   Bit Mapping: - - - - - - PSPIH PS2H
+ *   Reset Value: xxxx,xx00
+ */
+SFR(IP2H, 0xB6);
+
+/*
+ * Two Extended GPIO Ports: P4 and P5
+ * - For DIP-40 and QFN-40 packages, only higher 4 bits of P4 are available.
+ * - For PLCC-44 and LQFP-44 packages, only all 8 bits of P4 are available.
+ * - For LQFP-48 package, all 8 bits of P4 and lower 4 bits of P5 are
+ *   available.
+ */
+SFR(P4, 0xC0);
+    SBIT(P4_0, 0xC0, 0);
+    SBIT(P4_1, 0xC0, 1);
+    SBIT(P4_2, 0xC0, 2);
+    SBIT(P4_3, 0xC0, 3);
+    SBIT(P4_4, 0xC0, 4);
+    SBIT(P4_5, 0xC0, 5);
+    SBIT(P4_6, 0xC0, 6);
+    SBIT(P4_7, 0xC0, 7);
+SFR(P5, 0xC8); /* Only lower 4 bits */
+    SBIT(P5_0, 0xC8, 0);
+    SBIT(P5_1, 0xC8, 1);
+    SBIT(P5_2, 0xC8, 2);
+    SBIT(P5_3, 0xC8, 3);
+
+/* Working Mode Registers for P0, P1, P2, P3, P4 and P5 */
+SFR(P0M0, 0x94);
+SFR(P0M1, 0x93);
+SFR(P1M0, 0x92);
+SFR(P1M1, 0x91);
+SFR(P2M0, 0x96);
+SFR(P2M1, 0x95);
+SFR(P3M0, 0xB2);
+SFR(P3M1, 0xB1);
+SFR(P4M0, 0xB4);
+SFR(P4M1, 0xB3);
+SFR(P4SW, 0xBB); /* - LVD_P4.6 ALE_P4.5 NA_P4.4 - - - -   Reset: x000,xxxx */
+SFR(P5M0, 0xCA);
+SFR(P5M1, 0xC9);
+
+/* Slave Address Mask for Serial Communication */
+SFR(SADEN, 0xB9);
+
+/* Slave Address for Serial Communication */
+SFR(SADDR, 0xA9);
+
+/*
+ * The Control Register for the 2nd Serial Communication Port
+ *   Bit Mapping: S2SM0 S2SM1 S2SM2 S2REN S2TB8 S2RB8 S2TI S2RI
+ *   Reset Value: 0000,0000
+ */
+SFR(S2CON, 0x9A);
+
+/* Data Buffer Register for the 2nd Serial Communication Port */
+SFR(S2BUF, 0x9B);
+
+/*
+ * Reload Value Register for the Specific Baud Rate Generator
+ * (Independent from the 8051 Timer)
+ */
+SFR(BRT, 0x9C);
+
+/*
+ * Watchdog Timer Control Register
+ *   Bit Mapping: WDT_FLAG - EN_WDT CLR_WDT IDLE_WDT PS2 PS1 PS0
+ *   Reset Value: 0x00,0000
+ */
+SFR(WDT_CONTR, 0xC1);
+
+/*
+ * PCA Control Register
+ *   Bit Mapping: CF CR - - - - CCF1 CCF0
+ *   Reset Value: 00xx,xx00
+ */
+SFR(CCON, 0xD8);
+    SBIT(CF, 0xD8, 7);
+    SBIT(CR, 0xD8, 6);
+    SBIT(CCF1, 0xD8, 1);
+    SBIT(CCF0, 0xD8, 0);
+
+/*
+ * PCA Mode Register
+ *   Bit Mapping: CIDL - - - CPS2 CPS1 CPS0 ECF
+ *   Reset Value: 0xxx,x000
+ */
+SFR(CMOD, 0xD9);
+
+/* PCA Counter Registers */
+SFR(CL, 0xE9); /* Lower 8 bits */
+SFR(CH, 0xF9); /* Higher 8 bits */
+
+/*
+ * PCA Module 0 PWM Register
+ *   Bit Mapping: - ECOM0 CAPP0 CAPN0 MAT0 TOG0 PWM0 ECCF0
+ *   Reset Value: x000,0000
+ */
+SFR(CCAPM0, 0xDA);
+
+/*
+ * PCA Module 1 PWM Register
+ *   Bit Mapping: - ECOM1 CAPP1 CAPN1 MAT1 TOG1 PWM1 ECCF1
+ *   Reset Value: x000,0000
+ */
+SFR(CCAPM1, 0xDB);
+
+/* PCA Module 0/1 Capture/Comparison Registers */
+SFR(CCAP0L, 0xEA);
+SFR(CCAP0H, 0xFA);
+SFR(CCAP1L, 0xEB);
+SFR(CCAP1H, 0xFB);
+
+/*
+ * PCA Module 0 PWM Auxiliary Register
+ *   Bit Mapping: - - - - - - EPC0H EPC0L
+ *   Reset Value: xxxx,xx00
+ */
+SFR(PCA_PWM0, 0xF2);
+
+/*
+ * PCA Module 1 PWM Auxiliary Register
+ *   Bit Mapping: - - - - - - EPC1H EPC1L
+ *   Reset Value: xxxx,xx00
+ */
+SFR(PCA_PWM1, 0xF3);
+
+/* Switch P1 pins between ADC inputs and GPIO Port pins */
+SFR(P1ASF, 0x9D);
+
+/*
+ * ADC Control Register
+ *   Bit Mapping: ADC_POWER SPEED1 SPEED0 ADC_FLAG ADC_START CHS2 CHS1 CHS0
+ *   Reset Value: 0000,0000
+ */
+SFR(ADC_CONTR, 0xBC);
+
+/* ADC Converting Result Registers */
+SFR(ADC_RES, 0xBD); /* Higher Bits */
+SFR(ADC_RESL, 0xBE); /* Lower Bits */
+
+/*
+ * SPI Control Register
+ *   Bit Mapping: SSIG SPEN DORD MSTR CPOL CPHA SPR1 SPR0
+ *   Reset Value: 0000,0100
+ */
+SFR(SPCTL, 0xCE);
+
+/*
+ * SPI Status Register
+ *   Bit Mapping: SPIF WCOL - - - - - -
+ *   Reset Value: 00xx,xxxx
+ */
+SFR(SPSTAT, 0xCD);
+
+/* SPI Data Register */
+SFR(SPDAT, 0xCF);
+
+/* In-Application-Programming Data Register */
+SFR(IAP_DATA, 0xC2);
+
+/* In-Application-Programming Address Registers */
+SFR(IAP_ADDRH, 0xC3); /* Higher 8 bits */
+SFR(IAP_ADDRL, 0xC4); /* Lower 8 bits */
+
+/*
+ * In-Application-Programming Address Registers
+ *   Bit Mapping: - - - - - - MS1 MS0
+ *   Reset Value: xxxx,xx00
+ */
+SFR(IAP_CMD, 0xC5);
+
+/* In-Application-Programming Trigger Registers */
+SFR(IAP_TRIG, 0xC6);
+
+/*
+ * In-Application-Programming Control Register
+ *   Bit Mapping: IAPEN SWBS SWRST CFAIL - WT2 WT1 WT0
+ *   Reset Value: 0000,x000
+ */
+SFR(IAP_CONTR, 0xC7);
+
+#endif /* _STC12_H_ */
+
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/uPSD32xx.h sdcc-3.2.0+dfsg/device/include/mcs51/uPSD32xx.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/uPSD32xx.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/uPSD32xx.h	2012-03-13 10:17:10.000000000 +0000
@@ -9,7 +9,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/uPSD33xx.h sdcc-3.2.0+dfsg/device/include/mcs51/uPSD33xx.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/uPSD33xx.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/uPSD33xx.h	2012-03-13 10:17:10.000000000 +0000
@@ -7,7 +7,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/mcs51/w7100.h sdcc-3.2.0+dfsg/device/include/mcs51/w7100.h
--- sdcc-3.1.0+dfsg/device/include/mcs51/w7100.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/mcs51/w7100.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic14/errno.h sdcc-3.2.0+dfsg/device/include/pic14/errno.h
--- sdcc-3.1.0+dfsg/device/include/pic14/errno.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic14/errno.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic14/float.h sdcc-3.2.0+dfsg/device/include/pic14/float.h
--- sdcc-3.1.0+dfsg/device/include/pic14/float.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic14/float.h	2012-03-13 10:17:10.000000000 +0000
@@ -7,7 +7,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic14/limits.h sdcc-3.2.0+dfsg/device/include/pic14/limits.h
--- sdcc-3.1.0+dfsg/device/include/pic14/limits.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic14/limits.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -35,7 +35,7 @@
 #define SCHAR_MIN  -128
 #define UCHAR_MAX   0xff
 #define UCHAR_MIN   0
-#ifdef SDCC_CHAR_UNSIGNED
+#ifdef __SDCC_CHAR_UNSIGNED
 #define CHAR_MAX    UCHAR_MAX
 #define CHAR_MIN    UCHAR_MIN
 #else
diff -Nru sdcc-3.1.0+dfsg/device/include/pic14/math.h sdcc-3.2.0+dfsg/device/include/pic14/math.h
--- sdcc-3.1.0+dfsg/device/include/pic14/math.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic14/math.h	2012-03-13 10:17:10.000000000 +0000
@@ -7,7 +7,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic14/p16f_common.inc sdcc-3.2.0+dfsg/device/include/pic14/p16f_common.inc
--- sdcc-3.1.0+dfsg/device/include/pic14/p16f_common.inc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic14/p16f_common.inc	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic14/pic14devices.txt sdcc-3.2.0+dfsg/device/include/pic14/pic14devices.txt
--- sdcc-3.1.0+dfsg/device/include/pic14/pic14devices.txt	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic14/pic14devices.txt	2012-06-18 07:51:00.000000000 +0000
@@ -6,7 +6,7 @@
 #
 #  This library is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License as published by the
-#  Free Software Foundation; either version 2.1, or (at your option) any
+#  Free Software Foundation; either version 2, or (at your option) any
 #  later version.
 #
 #  This library is distributed in the hope that it will be useful,
@@ -298,6 +298,32 @@
 	memmap		0x0070 0x007f 0x080
 	memmap		0x00a0 0x00bf 0x000
 	
+processor 16f720,16lf720
+	program		2K
+	data		128
+	eeprom		0
+	io		18
+	maxram		0x0ff
+	bankmsk		0x180
+	config		0x2007 0x2008
+	regmap		0x180 0x00 0x02 0x03 0x04 0x0a 0x0b
+	regmap		0x100 0x01 0x81
+        memmap          0x0020 0x006f 0x000
+	memmap		0x0070 0x007f 0x180
+
+processor 16f721,16lf721
+	program		4K
+	data		256
+	eeprom		0
+	io		18
+	maxram		0x17f
+	bankmsk		0x180
+	config		0x2007 0x2008
+	regmap		0x180 0x00 0x02 0x03 0x04 0x0a 0x0b
+	regmap		0x100 0x01 0x81
+        memmap          0x0020 0x006f 0x000
+	memmap		0x0070 0x007f 0x180
+
 processor 16f737
 	program		4K
 	data		368
@@ -462,6 +488,50 @@
 	memmap		0x0110 0x016f 0x000
 	memmap		0x0190 0x01ef 0x000
 
+processor 16f882
+	program		2K
+	data		128
+	eeprom		128
+	io		24
+	maxram		0x1ff
+	bankmsk		0x180
+	config		0x2007 0x2008
+	regmap		0x180 0x00 0x02 0x03 0x04 0x0a 0x0b
+	regmap		0x100 0x01 0x81 0x06 0x86
+	memmap		0x0020 0x006f 0x000
+	memmap		0x0070 0x007f 0x180
+	memmap		0x00a0 0x00bf 0x000
+
+processor 16f883
+	program		4K
+	data		256
+	eeprom		256
+	io		24
+	maxram		0x1ff
+	bankmsk		0x180
+	config		0x2007 0x2008
+	regmap		0x180 0x00 0x02 0x03 0x04 0x0a 0x0b
+	regmap		0x100 0x01 0x81 0x06 0x86
+	memmap		0x0020 0x006f 0x000
+	memmap		0x0070 0x007f 0x180
+	memmap		0x00a0 0x00ef 0x000
+	memmap		0x0120 0x016f 0x000
+
+processor 16f884
+	program		4K
+	data		256
+	eeprom		256
+	io		35
+	maxram		0x1ff
+	bankmsk		0x180
+	config		0x2007 0x2008
+	regmap		0x180 0x00 0x02 0x03 0x04 0x0a 0x0b
+	regmap		0x100 0x01 0x81 0x06 0x86
+	memmap		0x0020 0x006f 0x000
+	memmap		0x0070 0x007f 0x180
+	memmap		0x00a0 0x00ef 0x000
+	memmap		0x0120 0x016f 0x000
+
 processor 16f886
 	program		8K
 	data		368
@@ -1060,10 +1130,10 @@
 #
 
 processor 16f1455, 16lf1455
-        program         0
-        data            0
+        program         8K
+        data            512
         eeprom          0
-        io              0
+        io              12
         enhanced        1
         maxram          0x07f
         bankmsk         0xf80
@@ -1073,10 +1143,10 @@
         memmap          0x70 0x7f 0xf80
 
 processor 16f1458, 16lf1458
-        program         0
-        data            0
+        program         4K
+        data            512
         eeprom          0
-        io              0
+        io              18
         enhanced        1
         maxram          0x07f
         bankmsk         0xf80
@@ -1086,10 +1156,10 @@
         memmap          0x70 0x7f 0xf80
 
 processor 16f1459, 16lf1459
-        program         0
-        data            0
+        program         8K
+        data            1024
         eeprom          0
-        io              0
+        io              18
         enhanced        1
         maxram          0x07f
         bankmsk         0xf80
@@ -1098,11 +1168,50 @@
         memmap          0x20 0x6f 0x000
         memmap          0x70 0x7f 0xf80
 
-processor 16f1507
+processor 16f1503, 16lf1503
         program         2K
         data            128
         eeprom          0
         enhanced        1
+        io              12
+        maxram          0x07f
+        bankmsk         0xf80
+        config          0x8007 0x8008
+        regmap          0xf80 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0x09 0x0a 0x0b
+        memmap          0x20 0x6f 0x000
+        memmap          0x70 0x7f 0xf80
+
+processor 16f1507, 16lf1507
+        program         2K
+        data            128
+        eeprom          0
+        enhanced        1
+        io              18
+        maxram          0x07f
+        bankmsk         0xf80
+        config          0x8007 0x8008
+        regmap          0xf80 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0x09 0x0a 0x0b
+        memmap          0x20 0x6f 0x000
+        memmap          0x70 0x7f 0xf80
+
+processor 16f1508, 16lf1508
+        program         4K
+        data            256
+        eeprom          0
+        enhanced        1
+        io              18
+        maxram          0x07f
+        bankmsk         0xf80
+        config          0x8007 0x8008
+        regmap          0xf80 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0x09 0x0a 0x0b
+        memmap          0x20 0x6f 0x000
+        memmap          0x70 0x7f 0xf80
+
+processor 16f1509, 16lf1509
+        program         8K
+        data            512
+        eeprom          0
+        enhanced        1
         io              18
         maxram          0x07f
         bankmsk         0xf80
@@ -1111,6 +1220,84 @@
         memmap          0x20 0x6f 0x000
         memmap          0x70 0x7f 0xf80
 
+processor 16f1516, 16lf1516
+        program         8K
+        data            512
+        eeprom          0
+        enhanced        1
+        io              25
+        maxram          0x07f
+        bankmsk         0xf80
+        config          0x8007 0x8008
+        regmap          0xf80 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0x09 0x0a 0x0b
+        memmap          0x20 0x6f 0x000
+        memmap          0x70 0x7f 0xf80
+
+processor 16f1517, 16lf1517
+        program         8K
+        data            512
+        eeprom          0
+        enhanced        1
+        io              36
+        maxram          0x07f
+        bankmsk         0xf80
+        config          0x8007 0x8008
+        regmap          0xf80 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0x09 0x0a 0x0b
+        memmap          0x20 0x6f 0x000
+        memmap          0x70 0x7f 0xf80
+
+processor 16f1518, 16lf1518
+        program         16K
+        data            1024
+        eeprom          0
+        enhanced        1
+        io              25
+        maxram          0x07f
+        bankmsk         0xf80
+        config          0x8007 0x8008
+        regmap          0xf80 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0x09 0x0a 0x0b
+        memmap          0x20 0x6f 0x000
+        memmap          0x70 0x7f 0xf80
+
+processor 16f1519, 16lf1519
+        program         16K
+        data            1024
+        eeprom          0
+        enhanced        1
+        io              36
+        maxram          0x07f
+        bankmsk         0xf80
+        config          0x8007 0x8008
+        regmap          0xf80 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0x09 0x0a 0x0b
+        memmap          0x20 0x6f 0x000
+        memmap          0x70 0x7f 0xf80
+
+processor 16f1526, 16lf1526
+        program         8K
+        data            768
+        eeprom          0
+        enhanced        1
+        io              55
+        maxram          0x07f
+        bankmsk         0xf80
+        config          0x8007 0x8008
+        regmap          0xf80 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0x09 0x0a 0x0b
+        memmap          0x20 0x6f 0x000
+        memmap          0x70 0x7f 0xf80
+
+processor 16f1527, 16lf1527
+        program         16K
+        data            1536
+        eeprom          0
+        enhanced        1
+        io              55
+        maxram          0x07f
+        bankmsk         0xf80
+        config          0x8007 0x8008
+        regmap          0xf80 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0x09 0x0a 0x0b
+        memmap          0x20 0x6f 0x000
+        memmap          0x70 0x7f 0xf80
+
 processor 16f1782, 16lf1782
         program         2K
         data            256
@@ -1138,7 +1325,7 @@
         memmap          0x70 0x7f 0xf80
 
 # PICxxF182x family
-processor 12f1822
+processor 12f1822, 12lf1822
         program         2K
         data            128
         eeprom          256
@@ -1151,7 +1338,7 @@
         memmap          0x20 0x6f 0x000
         memmap          0x70 0x7f 0xf80
 
-processor 16f1823
+processor 16f1823, 16lf1823
         program         2K
         data            128
         eeprom          256
@@ -1164,7 +1351,7 @@
         memmap          0x20 0x6f 0x000
         memmap          0x70 0x7f 0xf80
 
-processor 16f1824
+processor 16f1824, 16lf1824
         program         4K
         data            256
         eeprom          256
@@ -1177,7 +1364,7 @@
         memmap          0x20 0x6f 0x000
         memmap          0x70 0x7f 0xf80
 
-processor 16f1825
+processor 16f1825, 16lf1825
         program         8K
         data            1024
         eeprom          256
@@ -1190,7 +1377,7 @@
         memmap          0x20 0x6f 0x000
         memmap          0x70 0x7f 0xf80
 
-processor 16f1826
+processor 16f1826, 16lf1826
         program         2K
         data            256
         eeprom          256
@@ -1203,7 +1390,7 @@
         memmap          0x20 0x6f 0x000
         memmap          0x70 0x7f 0xf80
 
-processor 16f1827
+processor 16f1827, 16lf1827
         program         4K
         data            384
         eeprom          256
@@ -1216,7 +1403,7 @@
         memmap          0x20 0x6f 0x000
         memmap          0x70 0x7f 0xf80
 
-processor 16f1828
+processor 16f1828, 16lf1828
         program         4K
         data            256
         eeprom          256
@@ -1229,7 +1416,7 @@
         memmap          0x20 0x6f 0x000
         memmap          0x70 0x7f 0xf80
 
-processor 16f1829
+processor 16f1829, 16lf1829
         program         8K
         data            1024
         eeprom          256
@@ -1243,7 +1430,7 @@
         memmap          0x70 0x7f 0xf80
 
 # PICxxF184x family
-processor 12f1840
+processor 12f1840, 12lf1840
         program         4K
         data            256
         eeprom          256
@@ -1256,7 +1443,7 @@
         memmap          0x20 0x6f 0x000
         memmap          0x70 0x7f 0xf80
 
-processor 16f1847
+processor 16f1847, 16lf1847
         program         8K
         data            1024
         eeprom          256
@@ -1336,7 +1523,7 @@
         memmap          0x70 0x7f 0xf80
 
 # PIC16F193x family
-processor 16f1933
+processor 16f1933, 16lf1933
         program         4K
         data            256
         eeprom          256
@@ -1349,7 +1536,7 @@
         memmap          0x20 0x6f 0x000
         memmap          0x70 0x7f 0xf80
 
-processor 16f1934
+processor 16f1934, 16lf1934
         program         4K
         data            256
         eeprom          256
@@ -1362,7 +1549,7 @@
         memmap          0x20 0x6f 0x000
         memmap          0x70 0x7f 0xf80
 
-processor 16f1936
+processor 16f1936, 16lf1936
         program         8K
         data            512
         eeprom          256
@@ -1375,7 +1562,7 @@
         memmap          0x20 0x6f 0x000
         memmap          0x70 0x7f 0xf80
 
-processor 16f1937
+processor 16f1937, 16lf1937
         program         8K
         data            512
         eeprom          256
@@ -1388,7 +1575,7 @@
         memmap          0x20 0x6f 0x000
         memmap          0x70 0x7f 0xf80
 
-processor 16f1938
+processor 16f1938, 16lf1938
         program         16K
         data            1024
         eeprom          256
@@ -1401,7 +1588,7 @@
         memmap          0x20 0x6f 0x000
         memmap          0x70 0x7f 0xf80
 
-processor 16f1939
+processor 16f1939, 16lf1939
         program         16K
         data            1024
         eeprom          256
@@ -1413,3 +1600,29 @@
         regmap          0xf80 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0x09 0x0a 0x0b
         memmap          0x20 0x6f 0x000
         memmap          0x70 0x7f 0xf80
+
+processor 16f1946, 16lf1946
+        program         8K
+        data            512
+        eeprom          256
+        enhanced        1
+        io              53
+        maxram          0x07f
+        bankmsk         0xf80
+        config          0x8007 0x8008
+        regmap          0xf80 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0x09 0x0a 0x0b
+        memmap          0x20 0x6f 0x000
+        memmap          0x70 0x7f 0xf80
+
+processor 16f1947, 16lf1947
+        program         16K
+        data            1024
+        eeprom          256
+        enhanced        1
+        io              53
+        maxram          0x07f
+        bankmsk         0xf80
+        config          0x8007 0x8008
+        regmap          0xf80 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0x09 0x0a 0x0b
+        memmap          0x20 0x6f 0x000
+        memmap          0x70 0x7f 0xf80
diff -Nru sdcc-3.1.0+dfsg/device/include/pic14/sdcc-lib.h sdcc-3.2.0+dfsg/device/include/pic14/sdcc-lib.h
--- sdcc-3.1.0+dfsg/device/include/pic14/sdcc-lib.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic14/sdcc-lib.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/adc.h sdcc-3.2.0+dfsg/device/include/pic16/adc.h
--- sdcc-3.1.0+dfsg/device/include/pic16/adc.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/adc.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -171,37 +171,37 @@
  *   18f65j50-style devices multiplex ANCONx and ADCONx
  *
  * ADCON0:
- * bit  18f242  18f1220 18f13k50  18f2220 18f24j50  18f65j50  18f23k22
- *  0   ADON    ADON    ADON      ADON    ADON      ADON      ADON
- *  1   -       GO      GO        GO      GO        GO        GO
- *  2   GO      CHS0    CHS0      CHS0    CHS0      CHS0      CHS0
- *  3   CHS0    CHS1    CHS1      CHS1    CHS1      CHS1      CHS1
- *  4   CHS1    CHS2    CHS2      CHS2    CHS2      CHS2      CHS2
- *  5   CHS2    -       CHS3      CHS3    CHS3      CHS3      CHS3
- *  6   ADCS0   VCFG0   -         -       VCFG0     VCFG0     CHS4
- *  7   ADCS1   VCFG1   -         (ADCAL) VCFG1     VCFG1     -
+ * bit  18f242  18f1220 18f1230 18f13k50  18f2220 18f24j50  18f65j50  18f23k22
+ *  0   ADON    ADON    ADON    ADON      ADON    ADON      ADON      ADON
+ *  1   -       GO      GO      GO        GO      GO        GO        GO
+ *  2   GO      CHS0    CHS0    CHS0      CHS0    CHS0      CHS0      CHS0
+ *  3   CHS0    CHS1    CHS1    CHS1      CHS1    CHS1      CHS1      CHS1
+ *  4   CHS1    CHS2    -       CHS2      CHS2    CHS2      CHS2      CHS2
+ *  5   CHS2    -       -       CHS3      CHS3    CHS3      CHS3      CHS3
+ *  6   ADCS0   VCFG0   -       -         -       VCFG0     VCFG0     CHS4
+ *  7   ADCS1   VCFG1   SEVTEN  -         (ADCAL) VCFG1     VCFG1     -
  *
  * ADCON1:
- *  bit 18f242  18f1220 18f13k50  18f2220 18f24j50  18f65j50  18f23k22
- *   0  PCFG0   PCFG0   NVCFG0    PCFG0   ADCS0     ADCS0     NVCFG0
- *   1  PCFG1   PCFG1   NVCFG1    PCFG1   ADCS1     ADCS1     NVCFG1
- *   2  PCFG2   PCFG2   PVCFG0    PCFG2   ADCS2     ADCS2     PVCFG0
- *   3  PCFG3   PCFG3   PVCFG1    PCFG3   ACQT0     ACQT0     PVCFG1
- *   4  -       PCFG4   -         VCFG0   ACQT1     ACQT1     -
- *   5  -       PCFG5   -         VCFG1   ACQT2     ACQT2     -
- *   6  ADCS2   PCFG6   -         -       ADCAL     ADCAL     -
- *   7  ADFM    -       -         -       ADFM      ADFM      TRIGSEL
+ *  bit 18f242  18f1220 18f1230 18f13k50  18f2220 18f24j50  18f65j50  18f23k22
+ *   0  PCFG0   PCFG0   PCFG0   NVCFG0    PCFG0   ADCS0     ADCS0     NVCFG0
+ *   1  PCFG1   PCFG1   PCFG1   NVCFG1    PCFG1   ADCS1     ADCS1     NVCFG1
+ *   2  PCFG2   PCFG2   PCFG2   PVCFG0    PCFG2   ADCS2     ADCS2     PVCFG0
+ *   3  PCFG3   PCFG3   PCFG3   PVCFG1    PCFG3   ACQT0     ACQT0     PVCFG1
+ *   4  -       PCFG4   VCFG0   -         VCFG0   ACQT1     ACQT1     -
+ *   5  -       PCFG5           -         VCFG1   ACQT2     ACQT2     -
+ *   6  ADCS2   PCFG6           -         -       ADCAL     ADCAL     -
+ *   7  ADFM    -               -         -       ADFM      ADFM      TRIGSEL
  *
  * ADCON2:
- *  bit 18f242  18f1220 18f13k50  18f2220 18f24j50  18f65j50  18f23k22
- *   0                  ADCS0     ADCS0                       ADCS0
- *   1                  ADCS1     ADCS1                       ADCS1
- *   2                  ADCS2     ADCS2                       ADCS2
- *   3                  ACQT0     ADQT0                       ACQT0
- *   4                  ACQT1     ADQT1                       ACQT1
- *   5                  ACQT2     ADQT2                       ACQT2
- *   6                  -         -                           -
- *   7                  ADFM      ADFM                        ADFM
+ *  bit 18f242  18f1220 18f1230 18f13k50  18f2220 18f24j50  18f65j50  18f23k22
+ *   0                  ADCS0   ADCS0     ADCS0                       ADCS0
+ *   1                  ADCS1   ADCS1     ADCS1                       ADCS1
+ *   2                  ADCS2   ADCS2     ADCS2                       ADCS2
+ *   3                  ACQT0   ACQT0     ADQT0                       ACQT0
+ *   4                  ACQT1   ACQT1     ADQT1                       ACQT1
+ *   5                  ACQT2   ACQT2     ADQT2                       ACQT2
+ *   6                  -       -         -                           -
+ *   7                  ADFM    ADFM      ADFM                        ADFM
  */
 #include "pic18fam.h"
 
@@ -251,6 +251,28 @@
 #define ADC_CFG_1A      0x3e
 #define ADC_CFG_0A      0x3f
 
+#elif (__SDCC_ADC_STYLE == 1812300)
+
+/*
+ * These devices use a bitmask in ADCON1 to configure AN0..AN3
+ * as digital ports (bit set) or analog input (bit clear).
+ *
+ * These settings are selected based on their similarity with
+ * the 2220-style settings; 1230-style is more flexible, though.
+ *
+ * Reference voltages are configured via adc_open's config parameter
+ * using ADC_VCFG_*.
+ */
+
+#define ADC_CFG_4A      0x00
+#define ADC_CFG_3A      0x08
+#define ADC_CFG_2A      0x0c
+#define ADC_CFG_1A      0x0e
+#define ADC_CFG_0A      0x0f
+
+#define ADC_VCFG_AVDD   0x00    /* AVdd */
+#define ADC_VCFG_VREF   0x10    /* Vref+ */
+
 #elif (__SDCC_ADC_STYLE == 1813502)
 
 /*
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/ctype.h sdcc-3.2.0+dfsg/device/include/pic16/ctype.h
--- sdcc-3.1.0+dfsg/device/include/pic16/ctype.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/ctype.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/delay.h sdcc-3.2.0+dfsg/device/include/pic16/delay.h
--- sdcc-3.1.0+dfsg/device/include/pic16/delay.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/delay.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/errno.h sdcc-3.2.0+dfsg/device/include/pic16/errno.h
--- sdcc-3.1.0+dfsg/device/include/pic16/errno.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/errno.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/float.h sdcc-3.2.0+dfsg/device/include/pic16/float.h
--- sdcc-3.1.0+dfsg/device/include/pic16/float.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/float.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/gstack.h sdcc-3.2.0+dfsg/device/include/pic16/gstack.h
--- sdcc-3.1.0+dfsg/device/include/pic16/gstack.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/gstack.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/i2c.h sdcc-3.2.0+dfsg/device/include/pic16/i2c.h
--- sdcc-3.1.0+dfsg/device/include/pic16/i2c.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/i2c.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/limits.h sdcc-3.2.0+dfsg/device/include/pic16/limits.h
--- sdcc-3.1.0+dfsg/device/include/pic16/limits.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/limits.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/malloc.h sdcc-3.2.0+dfsg/device/include/pic16/malloc.h
--- sdcc-3.1.0+dfsg/device/include/pic16/malloc.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/malloc.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/math.h sdcc-3.2.0+dfsg/device/include/pic16/math.h
--- sdcc-3.1.0+dfsg/device/include/pic16/math.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/math.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/p18fxxx.inc sdcc-3.2.0+dfsg/device/include/pic16/p18fxxx.inc
--- sdcc-3.1.0+dfsg/device/include/pic16/p18fxxx.inc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/p18fxxx.inc	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/pic16devices.txt sdcc-3.2.0+dfsg/device/include/pic16/pic16devices.txt
--- sdcc-3.1.0+dfsg/device/include/pic16/pic16devices.txt	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/pic16devices.txt	2012-03-13 16:39:53.000000000 +0000
@@ -6,7 +6,7 @@
 #
 #  This library is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License as published by the
-#  Free Software Foundation; either version 2.1, or (at your option) any
+#  Free Software Foundation; either version 2, or (at your option) any
 #  later version.
 #
 #  This library is distributed in the hope that it will be useful,
@@ -74,10 +74,33 @@
 idlocrange  0x200000 0x200007
 
 
+name        18f1230
+ramsize     256
+split       0x80
+configrange 0x300001 0x30000d
+configword  0x300001 0xcf 0x73
+configword  0x300002 0x1f 0xff
+configword  0x300003 0x1f 0xff
+configword  0x300004 0x0e 0xff
+configword  0x300005 0x89 0xf7
+configword  0x300006 0xf1 0x8f
+configword  0x300008 0x03 0xff
+configword  0x300009 0xc0 0xff
+configword  0x30000a 0x03 0xff
+configword  0x30000b 0xe0 0xff
+configword  0x30000c 0x03 0xff
+configword  0x30000d 0x40 0xff
+idlocrange  0x200000 0x200007
+
+
 name        18f1320
 using       18f1220
 
 
+name        18f1330
+using       18f1230
+
+
 name        18f13k50
 ramsize     512
 split       0x60
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/pic18fregs.h sdcc-3.2.0+dfsg/device/include/pic16/pic18fregs.h
--- sdcc-3.1.0+dfsg/device/include/pic16/pic18fregs.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/pic18fregs.h	2012-06-03 17:48:05.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -29,373 +29,379 @@
 #ifndef __PIC18FREGS_H__
 #define __PIC18FREGS_H__
 
-#if defined(pic18f242)
+#if defined(__SDCC_PIC18F242)
 #  include <pic18f242.h>
 
-#elif defined(pic18f248)
+#elif defined(__SDCC_PIC18F248)
 #  include <pic18f248.h>
 
-#elif defined(pic18f252)
+#elif defined(__SDCC_PIC18F252)
 #  include <pic18f252.h>
 
-#elif defined(pic18f258)
+#elif defined(__SDCC_PIC18F258)
 #  include <pic18f258.h>
 
-#elif defined(pic18f442)
+#elif defined(__SDCC_PIC18F442)
 #  include <pic18f442.h>
 
-#elif defined(pic18f448)
+#elif defined(__SDCC_PIC18F448)
 #  include <pic18f448.h>
 
-#elif defined(pic18f452)
+#elif defined(__SDCC_PIC18F452)
 #  include <pic18f452.h>
 
-#elif defined(pic18f458)
+#elif defined(__SDCC_PIC18F458)
 #  include <pic18f458.h>
 
-#elif defined(pic18f1220)
+#elif defined(__SDCC_PIC18F1220)
 #  include <pic18f1220.h>
 
-#elif defined(pic18f1320)
+#elif defined(__SDCC_PIC18F1230)
+#  include <pic18f1230.h>
+
+#elif defined(__SDCC_PIC18F1320)
 #  include <pic18f1320.h>
 
-#elif defined(pic18f13k50)
+#elif defined(__SDCC_PIC18F1330)
+#  include <pic18f1330.h>
+
+#elif defined(__SDCC_PIC18F13K50)
 #  include <pic18f13k50.h>
 
-#elif defined(pic18f14k50)
+#elif defined(__SDCC_PIC18F14K50)
 #  include <pic18f14k50.h>
 
-#elif defined(pic18f2220)
+#elif defined(__SDCC_PIC18F2220)
 #  include <pic18f2220.h>
 
-#elif defined(pic18f2221)
+#elif defined(__SDCC_PIC18F2221)
 #  include <pic18f2221.h>
 
-#elif defined(pic18f2320)
+#elif defined(__SDCC_PIC18F2320)
 #  include <pic18f2320.h>
 
-#elif defined(pic18f2321)
+#elif defined(__SDCC_PIC18F2321)
 #  include <pic18f2321.h>
 
-#elif defined(pic18f2331)
+#elif defined(__SDCC_PIC18F2331)
 #  include <pic18f2331.h>
 
-#elif defined(pic18f23k20)
+#elif defined(__SDCC_PIC18F23K20)
 #  include <pic18f23k20.h>
 
-#elif defined(pic18f23k22)
+#elif defined(__SDCC_PIC18F23K22)
 #  include <pic18f23k22.h>
 
-#elif defined(pic18f2410)
+#elif defined(__SDCC_PIC18F2410)
 #  include <pic18f2410.h>
 
-#elif defined(pic18f2420)
+#elif defined(__SDCC_PIC18F2420)
 #  include <pic18f2420.h>
 
-#elif defined(pic18f2423)
+#elif defined(__SDCC_PIC18F2423)
 #  include <pic18f2423.h>
 
-#elif defined(pic18f2431)
+#elif defined(__SDCC_PIC18F2431)
 #  include <pic18f2431.h>
 
-#elif defined(pic18f2450)
+#elif defined(__SDCC_PIC18F2450)
 #  include <pic18f2450.h>
 
-#elif defined(pic18f2455)
+#elif defined(__SDCC_PIC18F2455)
 #  include <pic18f2455.h>
 
-#elif defined(pic18f2480)
+#elif defined(__SDCC_PIC18F2480)
 #  include <pic18f2480.h>
 
-#elif defined(pic18f24j10)
+#elif defined(__SDCC_PIC18F24J10)
 #  include <pic18f24j10.h>
 
-#elif defined(pic18f24j50)
+#elif defined(__SDCC_PIC18F24J50)
 #  include <pic18f24j50.h>
 
-#elif defined(pic18f24k20)
+#elif defined(__SDCC_PIC18F24K20)
 #  include <pic18f24k20.h>
 
-#elif defined(pic18f24k22)
+#elif defined(__SDCC_PIC18F24K22)
 #  include <pic18f24k22.h>
 
-#elif defined(pic18f2510)
+#elif defined(__SDCC_PIC18F2510)
 #  include <pic18f2510.h>
 
-#elif defined(pic18f2515)
+#elif defined(__SDCC_PIC18F2515)
 #  include <pic18f2515.h>
 
-#elif defined(pic18f2520)
+#elif defined(__SDCC_PIC18F2520)
 #  include <pic18f2520.h>
 
-#elif defined(pic18f2523)
+#elif defined(__SDCC_PIC18F2523)
 #  include <pic18f2523.h>
 
-#elif defined(pic18f2525)
+#elif defined(__SDCC_PIC18F2525)
 #  include <pic18f2525.h>
 
-#elif defined(pic18f2550)
+#elif defined(__SDCC_PIC18F2550)
 #  include <pic18f2550.h>
 
-#elif defined(pic18f2580)
+#elif defined(__SDCC_PIC18F2580)
 #  include <pic18f2580.h>
 
-#elif defined(pic18f2585)
+#elif defined(__SDCC_PIC18F2585)
 #  include <pic18f2585.h>
 
-#elif defined(pic18f25j10)
+#elif defined(__SDCC_PIC18F25J10)
 #  include <pic18f25j10.h>
 
-#elif defined(pic18f25j50)
+#elif defined(__SDCC_PIC18F25J50)
 #  include <pic18f25j50.h>
 
-#elif defined(pic18f25k20)
+#elif defined(__SDCC_PIC18F25K20)
 #  include <pic18f25k20.h>
 
-#elif defined(pic18f25k22)
+#elif defined(__SDCC_PIC18F25K22)
 #  include <pic18f25k22.h>
 
-#elif defined(pic18f2610)
+#elif defined(__SDCC_PIC18F2610)
 #  include <pic18f2610.h>
 
-#elif defined(pic18f2620)
+#elif defined(__SDCC_PIC18F2620)
 #  include <pic18f2620.h>
 
-#elif defined(pic18f2680)
+#elif defined(__SDCC_PIC18F2680)
 #  include <pic18f2680.h>
 
-#elif defined(pic18f2682)
+#elif defined(__SDCC_PIC18F2682)
 #  include <pic18f2682.h>
 
-#elif defined(pic18f2685)
+#elif defined(__SDCC_PIC18F2685)
 #  include <pic18f2685.h>
 
-#elif defined(pic18f26j50)
+#elif defined(__SDCC_PIC18F26J50)
 #  include <pic18f26j50.h>
 
-#elif defined(pic18f26k20)
+#elif defined(__SDCC_PIC18F26K20)
 #  include <pic18f26k20.h>
 
-#elif defined(pic18f26k22)
+#elif defined(__SDCC_PIC18F26K22)
 #  include <pic18f26k22.h>
 
-#elif defined(pic18f4220)
+#elif defined(__SDCC_PIC18F4220)
 #  include <pic18f4220.h>
 
-#elif defined(pic18f4221)
+#elif defined(__SDCC_PIC18F4221)
 #  include <pic18f4221.h>
 
-#elif defined(pic18f4320)
+#elif defined(__SDCC_PIC18F4320)
 #  include <pic18f4320.h>
 
-#elif defined(pic18f4321)
+#elif defined(__SDCC_PIC18F4321)
 #  include <pic18f4321.h>
 
-#elif defined(pic18f4331)
+#elif defined(__SDCC_PIC18F4331)
 #  include <pic18f4331.h>
 
-#elif defined(pic18f43k20)
+#elif defined(__SDCC_PIC18F43K20)
 #  include <pic18f43k20.h>
 
-#elif defined(pic18f43k22)
+#elif defined(__SDCC_PIC18F43K22)
 #  include <pic18f43k22.h>
 
-#elif defined(pic18f4410)
+#elif defined(__SDCC_PIC18F4410)
 #  include <pic18f4410.h>
 
-#elif defined(pic18f4420)
+#elif defined(__SDCC_PIC18F4420)
 #  include <pic18f4420.h>
 
-#elif defined(pic18f4423)
+#elif defined(__SDCC_PIC18F4423)
 #  include <pic18f4423.h>
 
-#elif defined(pic18f4431)
+#elif defined(__SDCC_PIC18F4431)
 #  include <pic18f4431.h>
 
-#elif defined(pic18f4450)
+#elif defined(__SDCC_PIC18F4450)
 #  include <pic18f4450.h>
 
-#elif defined(pic18f4455)
+#elif defined(__SDCC_PIC18F4455)
 #  include <pic18f4455.h>
 
-#elif defined(pic18f4480)
+#elif defined(__SDCC_PIC18F4480)
 #  include <pic18f4480.h>
 
-#elif defined(pic18f44j10)
+#elif defined(__SDCC_PIC18F44J10)
 #  include <pic18f44j10.h>
 
-#elif defined(pic18f44j50)
+#elif defined(__SDCC_PIC18F44J50)
 #  include <pic18f44j50.h>
 
-#elif defined(pic18f44k20)
+#elif defined(__SDCC_PIC18F44K20)
 #  include <pic18f44k20.h>
 
-#elif defined(pic18f44k22)
+#elif defined(__SDCC_PIC18F44K22)
 #  include <pic18f44k22.h>
 
-#elif defined(pic18f4510)
+#elif defined(__SDCC_PIC18F4510)
 #  include <pic18f4510.h>
 
-#elif defined(pic18f4515)
+#elif defined(__SDCC_PIC18F4515)
 #  include <pic18f4515.h>
 
-#elif defined(pic18f4520)
+#elif defined(__SDCC_PIC18F4520)
 #  include <pic18f4520.h>
 
-#elif defined(pic18f4523)
+#elif defined(__SDCC_PIC18F4523)
 #  include <pic18f4523.h>
 
-#elif defined(pic18f4525)
+#elif defined(__SDCC_PIC18F4525)
 #  include <pic18f4525.h>
 
-#elif defined(pic18f4550)
+#elif defined(__SDCC_PIC18F4550)
 #  include <pic18f4550.h>
 
-#elif defined(pic18f4580)
+#elif defined(__SDCC_PIC18F4580)
 #  include <pic18f4580.h>
 
-#elif defined(pic18f4585)
+#elif defined(__SDCC_PIC18F4585)
 #  include <pic18f4585.h>
 
-#elif defined(pic18f45j10)
+#elif defined(__SDCC_PIC18F45J10)
 #  include <pic18f45j10.h>
 
-#elif defined(pic18f45j50)
+#elif defined(__SDCC_PIC18F45J50)
 #  include <pic18f45j50.h>
 
-#elif defined(pic18f45k20)
+#elif defined(__SDCC_PIC18F45K20)
 #  include <pic18f45k20.h>
 
-#elif defined(pic18f45k22)
+#elif defined(__SDCC_PIC18F45K22)
 #  include <pic18f45k22.h>
 
-#elif defined(pic18f4610)
+#elif defined(__SDCC_PIC18F4610)
 #  include <pic18f4610.h>
 
-#elif defined(pic18f4620)
+#elif defined(__SDCC_PIC18F4620)
 #  include <pic18f4620.h>
 
-#elif defined(pic18f4680)
+#elif defined(__SDCC_PIC18F4680)
 #  include <pic18f4680.h>
 
-#elif defined(pic18f4682)
+#elif defined(__SDCC_PIC18F4682)
 #  include <pic18f4682.h>
 
-#elif defined(pic18f4685)
+#elif defined(__SDCC_PIC18F4685)
 #  include <pic18f4685.h>
 
-#elif defined(pic18f46j50)
+#elif defined(__SDCC_PIC18F46J50)
 #  include <pic18f46j50.h>
 
-#elif defined(pic18f46k20)
+#elif defined(__SDCC_PIC18F46K20)
 #  include <pic18f46k20.h>
 
-#elif defined(pic18f46k22)
+#elif defined(__SDCC_PIC18F46K22)
 #  include <pic18f46k22.h>
 
-#elif defined(pic18f6520)
+#elif defined(__SDCC_PIC18F6520)
 #  include <pic18f6520.h>
 
-#elif defined(pic18f6527)
+#elif defined(__SDCC_PIC18F6527)
 #  include <pic18f6527.h>
 
-#elif defined(pic18f6585)
+#elif defined(__SDCC_PIC18F6585)
 #  include <pic18f6585.h>
 
-#elif defined(pic18f65j50)
+#elif defined(__SDCC_PIC18F65J50)
 #  include <pic18f65j50.h>
 
-#elif defined(pic18f6620)
+#elif defined(__SDCC_PIC18F6620)
 #  include <pic18f6620.h>
 
-#elif defined(pic18f6622)
+#elif defined(__SDCC_PIC18F6622)
 #  include <pic18f6622.h>
 
-#elif defined(pic18f6627)
+#elif defined(__SDCC_PIC18F6627)
 #  include <pic18f6627.h>
 
-#elif defined(pic18f6680)
+#elif defined(__SDCC_PIC18F6680)
 #  include <pic18f6680.h>
 
-#elif defined(pic18f66j50)
+#elif defined(__SDCC_PIC18F66J50)
 #  include <pic18f66j50.h>
 
-#elif defined(pic18f66j55)
+#elif defined(__SDCC_PIC18F66J55)
 #  include <pic18f66j55.h>
 
-#elif defined(pic18f66j60)
+#elif defined(__SDCC_PIC18F66J60)
 #  include <pic18f66j60.h>
 
-#elif defined(pic18f66j65)
+#elif defined(__SDCC_PIC18F66J65)
 #  include <pic18f66j65.h>
 
-#elif defined(pic18f6720)
+#elif defined(__SDCC_PIC18F6720)
 #  include <pic18f6720.h>
 
-#elif defined(pic18f6722)
+#elif defined(__SDCC_PIC18F6722)
 #  include <pic18f6722.h>
 
-#elif defined(pic18f67j50)
+#elif defined(__SDCC_PIC18F67J50)
 #  include <pic18f67j50.h>
 
-#elif defined(pic18f67j60)
+#elif defined(__SDCC_PIC18F67J60)
 #  include <pic18f67j60.h>
 
-#elif defined(pic18f8520)
+#elif defined(__SDCC_PIC18F8520)
 #  include <pic18f8520.h>
 
-#elif defined(pic18f8527)
+#elif defined(__SDCC_PIC18F8527)
 #  include <pic18f8527.h>
 
-#elif defined(pic18f8585)
+#elif defined(__SDCC_PIC18F8585)
 #  include <pic18f8585.h>
 
-#elif defined(pic18f85j50)
+#elif defined(__SDCC_PIC18F85J50)
 #  include <pic18f85j50.h>
 
-#elif defined(pic18f8620)
+#elif defined(__SDCC_PIC18F8620)
 #  include <pic18f8620.h>
 
-#elif defined(pic18f8622)
+#elif defined(__SDCC_PIC18F8622)
 #  include <pic18f8622.h>
 
-#elif defined(pic18f8627)
+#elif defined(__SDCC_PIC18F8627)
 #  include <pic18f8627.h>
 
-#elif defined(pic18f8680)
+#elif defined(__SDCC_PIC18F8680)
 #  include <pic18f8680.h>
 
-#elif defined(pic18f86j50)
+#elif defined(__SDCC_PIC18F86J50)
 #  include <pic18f86j50.h>
 
-#elif defined(pic18f86j55)
+#elif defined(__SDCC_PIC18F86J55)
 #  include <pic18f86j55.h>
 
-#elif defined(pic18f86j60)
+#elif defined(__SDCC_PIC18F86J60)
 #  include <pic18f86j60.h>
 
-#elif defined(pic18f86j65)
+#elif defined(__SDCC_PIC18F86J65)
 #  include <pic18f86j65.h>
 
-#elif defined(pic18f8720)
+#elif defined(__SDCC_PIC18F8720)
 #  include <pic18f8720.h>
 
-#elif defined(pic18f8722)
+#elif defined(__SDCC_PIC18F8722)
 #  include <pic18f8722.h>
 
-#elif defined(pic18f87j50)
+#elif defined(__SDCC_PIC18F87J50)
 #  include <pic18f87j50.h>
 
-#elif defined(pic18f87j60)
+#elif defined(__SDCC_PIC18F87J60)
 #  include <pic18f87j60.h>
 
-#elif defined(pic18f96j60)
+#elif defined(__SDCC_PIC18F96J60)
 #  include <pic18f96j60.h>
 
-#elif defined(pic18f96j65)
+#elif defined(__SDCC_PIC18F96J65)
 #  include <pic18f96j65.h>
 
-#elif defined(pic18f97j60)
+#elif defined(__SDCC_PIC18F97J60)
 #  include <pic18f97j60.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/sdcc-lib.h sdcc-3.2.0+dfsg/device/include/pic16/sdcc-lib.h
--- sdcc-3.1.0+dfsg/device/include/pic16/sdcc-lib.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/sdcc-lib.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/signal.h sdcc-3.2.0+dfsg/device/include/pic16/signal.h
--- sdcc-3.1.0+dfsg/device/include/pic16/signal.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/signal.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -116,7 +116,7 @@
  * To be used together with DEF_INTHIGH and DEF_INTLOW.
  */
 #define DEF_HANDLER(sig, handler)               \
-    __asm btfsc sig __endasm;                   \
+    __asm btfsc sig, 0 __endasm;                \
     __asm goto  _ ## handler __endasm;
 
 /* Declare handler to be the handler function for the given signal.
@@ -127,9 +127,9 @@
  * To be used together with DEF_INTHIGH and DEF_INTLOW.
  */
 #define DEF_HANDLER2(sig1,sig2,handler)         \
-    __asm btfss sig1 __endasm;                  \
+    __asm btfss sig1, 0 __endasm;               \
     __asm bra   $+8 __endasm;                   \
-    __asm btfsc sig2 __endasm;                  \
+    __asm btfsc sig2, 0 __endasm;               \
     __asm goto  _ ## handler __endasm;
 
 /* Declare or define an interrupt handler function. */
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/stdarg.h sdcc-3.2.0+dfsg/device/include/pic16/stdarg.h
--- sdcc-3.1.0+dfsg/device/include/pic16/stdarg.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/stdarg.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/stddef.h sdcc-3.2.0+dfsg/device/include/pic16/stddef.h
--- sdcc-3.1.0+dfsg/device/include/pic16/stddef.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/stddef.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/stdint.h sdcc-3.2.0+dfsg/device/include/pic16/stdint.h
--- sdcc-3.1.0+dfsg/device/include/pic16/stdint.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/stdint.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/stdio.h sdcc-3.2.0+dfsg/device/include/pic16/stdio.h
--- sdcc-3.1.0+dfsg/device/include/pic16/stdio.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/stdio.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/stdlib.h sdcc-3.2.0+dfsg/device/include/pic16/stdlib.h
--- sdcc-3.1.0+dfsg/device/include/pic16/stdlib.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/stdlib.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/string.h sdcc-3.2.0+dfsg/device/include/pic16/string.h
--- sdcc-3.1.0+dfsg/device/include/pic16/string.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/string.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/pic16/usart.h sdcc-3.2.0+dfsg/device/include/pic16/usart.h
--- sdcc-3.1.0+dfsg/device/include/pic16/usart.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/pic16/usart.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/sdcc-lib.h sdcc-3.2.0+dfsg/device/include/sdcc-lib.h
--- sdcc-3.1.0+dfsg/device/include/sdcc-lib.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/sdcc-lib.h	2012-05-21 00:13:27.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -30,22 +30,25 @@
 #ifndef __SDC51_SDCC_LIB_H
 #define __SDC51_SDCC_LIB_H	1
 
-#if defined(__z80)
+#if defined(__SDCC_z80)
 #include <asm/z80/features.h>
 
-#elif defined(__z180)
+#elif defined(__SDCC_z180)
 #include <asm/z180/features.h>
 
-#elif defined(__r2k)
+#elif defined(__SDCC_r2k)
 #include <asm/r2k/features.h>
 
-#elif defined(__gbz80)
+#elif defined(__SDCC_r3ka)
+#include <asm/r3ka/features.h>
+
+#elif defined(__SDCC_gbz80)
 #include <asm/gbz80/features.h>
 
-#elif defined(__mcs51)
+#elif defined(__SDCC_mcs51)
 #include <asm/mcs51/features.h>
 
-#elif defined(__ds390)
+#elif defined(__SDCC_ds390)
 #include <asm/ds390/features.h>
 
 #else
@@ -55,3 +58,4 @@
 #endif
 
 #endif
+
diff -Nru sdcc-3.1.0+dfsg/device/include/setjmp.h sdcc-3.2.0+dfsg/device/include/setjmp.h
--- sdcc-3.1.0+dfsg/device/include/setjmp.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/setjmp.h	2012-05-18 10:47:44.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -26,18 +26,18 @@
    might be covered by the GNU General Public License.
 -------------------------------------------------------------------------*/
 
-#ifndef SDCC_SETJMP_H
-#define SDCC_SETJMP_H
+#ifndef __SDCC_SETJMP_H
+#define __SDCC_SETJMP_H
 
 #define SP_SIZE		1
 
-#ifdef SDCC_STACK_AUTO
+#ifdef __SDCC_STACK_AUTO
 #define BP_SIZE		SP_SIZE
 #else
 #define BP_SIZE		0
 #endif
 
-#ifdef SDCC_USE_XSTACK
+#ifdef __SDCC_USE_XSTACK
 #define SPX_SIZE	1
 #else
 #define SPX_SIZE	0
@@ -45,13 +45,13 @@
 
 #define BPX_SIZE	SPX_SIZE
 
-#ifdef SDCC_MODEL_HUGE
+#ifdef __SDCC_MODEL_HUGE
 #define RET_SIZE	3
 #else
 #define RET_SIZE	2
 #endif
 
-#ifdef SDCC_z80
+#if defined (__SDCC_z80) || defined (__SDCC_z180) || defined (__SDCC_r2k) || defined (__SDCC_r3ka)
 typedef unsigned char jmp_buf[6]; // 2 for the stack pointer, 2 for the return address, 2 for the frame pointer.
 #else
 typedef unsigned char jmp_buf[RET_SIZE + SP_SIZE + BP_SIZE + SPX_SIZE + BPX_SIZE];
@@ -62,7 +62,9 @@
 // C99 might require setjmp to be a macro. The standard seems self-contradicting on this issue.
 #define setjmp(jump_buf) __setjmp(jump_buf)
 
-int longjmp(jmp_buf, int);
+#ifndef __SDCC_HIDE_LONGJMP
+_Noreturn void longjmp(jmp_buf, int);
+#endif
 
 #undef RET_SIZE
 #undef SP_SIZE
diff -Nru sdcc-3.1.0+dfsg/device/include/stdarg.h sdcc-3.2.0+dfsg/device/include/stdarg.h
--- sdcc-3.1.0+dfsg/device/include/stdarg.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/stdarg.h	2012-05-18 16:31:18.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -30,19 +30,19 @@
 #ifndef __SDC51_STDARG_H
 #define __SDC51_STDARG_H 1
 
-#if defined(__z80) || defined(__z180) || defined(__r2k) || defined(__gbz80) || defined(__hc08)
+#if defined(__SDCC_z80) || defined(__SDCC_z180) || defined(__SDCC_r2k) || defined(__SDCC_r3ka) || defined(__SDCC_gbz80) || defined(__SDCC_hc08) || defined(__SDCC_s08)
 
 typedef unsigned char * va_list;
 #define va_start(marker, last)  { marker = (va_list)&last + sizeof(last); }
 #define va_arg(marker, type)    *((type *)((marker += sizeof(type)) - sizeof(type)))
 
-#elif defined(__ds390) || defined(__ds400)
+#elif defined(__SDCC_ds390) || defined(__SDCC_ds400)
 
 typedef unsigned char * va_list;
 #define va_start(marker, first) { marker = (va_list)&first; }
 #define va_arg(marker, type)    *((type *)(marker -= sizeof(type)))
 
-#elif defined(SDCC_USE_XSTACK)
+#elif defined(__SDCC_USE_XSTACK)
 
 typedef unsigned char __pdata * va_list;
 #define va_start(marker, first) { marker = (va_list)&first; }
@@ -60,3 +60,4 @@
 #define va_end(marker)          { marker = (va_list) 0; };
 
 #endif
+
diff -Nru sdcc-3.1.0+dfsg/device/include/stdbool.h sdcc-3.2.0+dfsg/device/include/stdbool.h
--- sdcc-3.1.0+dfsg/device/include/stdbool.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/stdbool.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -32,10 +32,9 @@
 #define true 1
 #define false 0
 
-#if defined (SDCC_ds390) || defined (SDCC_mcs51) || defined (SDCC_xa51)
+#if defined (__SDCC_ds390) || defined (__SDCC_mcs51) || defined (__SDCC_xa51)
  /* The ports that have __bit and use it as an imperfect substitute for bool */
  #define _Bool __bit
- #define BOOL  __bit
  #define bool  _Bool
  #define __bool_true_false_are_defined 1
  #define __SDCC_WEIRD_BOOL 1
diff -Nru sdcc-3.1.0+dfsg/device/include/stddef.h sdcc-3.2.0+dfsg/device/include/stddef.h
--- sdcc-3.1.0+dfsg/device/include/stddef.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/stddef.h	2012-03-20 09:56:26.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -36,7 +36,7 @@
 
 #ifndef __PTRDIFF_T_DEFINED
 #define __PTRDIFF_T_DEFINED
-#if defined (SDCC_mcs51) || defined (SDCC_ds390)
+#if defined (__SDCC_mcs51) || defined (__SDCC_ds390)
   typedef long int ptrdiff_t;
 #else
   typedef int ptrdiff_t;
@@ -53,6 +53,22 @@
   typedef char wchar_t;
 #endif
 
+/* Bounds-checking interfaces from annex K of the C11 standard. */
+#if defined (__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__
+
+#ifndef __RSIZE_T_DEFINED
+#define __RSIZE_T_DEFINED
+typedef size_t rsize_t;
+#endif
+
+#ifndef __ERRNO_T_DEFINED
+#define __ERRNO_T_DEFINED
+typedef int errno_t;
+#endif
+
+#endif
+
 #define offsetof(s, m) __builtin_offsetof (s, m)
 
 #endif
+
diff -Nru sdcc-3.1.0+dfsg/device/include/stdint.h sdcc-3.2.0+dfsg/device/include/stdint.h
--- sdcc-3.1.0+dfsg/device/include/stdint.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/stdint.h	2012-04-02 12:21:45.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -32,7 +32,7 @@
 
 /* Exact integral types.  */
 
-#if defined (SDCC_z80) || defined (SDCC_z180) || defined (SDCC_r2k) || defined (SDCC_gbz80)
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_ds400) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
 #if __STDC_VERSION__ >= 199901L
 #define __SDCC_LONGLONG
 #endif
@@ -92,7 +92,7 @@
 #endif
 
 /* Types for `void *' pointers.  */
-#if defined (SDCC_mcs51) || defined (SDCC_ds390)
+#if defined (__SDCC_mcs51) || defined (__SDCC_ds390)
   typedef long int              intptr_t;
   typedef unsigned long int     uintptr_t;
 #else
@@ -102,9 +102,13 @@
 
 
 /* Largest integral types.  */
+#ifndef __SDCC_LONGLONG
 typedef long int                intmax_t;
 typedef unsigned long int       uintmax_t;
-
+#else
+typedef long long int           intmax_t;
+typedef unsigned long long int  uintmax_t;
+#endif
 
 /* Limits of integral types.  */
 
@@ -181,7 +185,7 @@
 #endif
 
 /* Values to test for integral types holding `void *' pointer.  */
-#if defined (SDCC_mcs51) || defined (SDCC_ds390)
+#if defined (__SDCC_mcs51) || defined (__SDCC_ds390)
 #define INTPTR_MIN             (-2147483647L-1)
 #define INTPTR_MAX             (2147483647L)
 #define UINTPTR_MAX            (4294967295UL)
@@ -203,7 +207,7 @@
 /* Limits of other integer types.  */
 
 /* Limits of `ptrdiff_t' type.  */
-#if defined (SDCC_mcs51) || defined (SDCC_ds390)
+#if defined (__SDCC_mcs51) || defined (__SDCC_ds390)
 #define PTRDIFF_MIN           (-2147483647L-1)
 #define PTRDIFF_MAX           (2147483647L)
 #else
@@ -212,7 +216,7 @@
 #endif
 
 /* Limit of `size_t' type.  */
-#define SIZE_MAX               (65535)
+#define SIZE_MAX               (65535u)
 
 /* Signed.  */
 #define INT8_C(c)      c
@@ -245,4 +249,10 @@
 #define UINTMAX_C(c)   c ## UL
 #endif
 
+/* Bounds-checking interfaces from annex K of the C11 standard. */
+#if defined (__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__
+#define RSIZE_MAX SIZE_MAX
+#endif
+
 #endif /* stdint.h */
+
diff -Nru sdcc-3.1.0+dfsg/device/include/stdio.h sdcc-3.2.0+dfsg/device/include/stdio.h
--- sdcc-3.1.0+dfsg/device/include/stdio.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/stdio.h	2012-03-20 09:56:26.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -46,6 +46,21 @@
   typedef unsigned int size_t;
 #endif
 
+/* Bounds-checking interfaces from annex K of the C11 standard. */
+#if defined (__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__
+
+#ifndef __RSIZE_T_DEFINED
+#define __RSIZE_T_DEFINED
+typedef size_t rsize_t;
+#endif
+
+#ifndef __ERRNO_T_DEFINED
+#define __ERRNO_T_DEFINED
+typedef int errno_t;
+#endif
+
+#endif
+
 typedef void (*pfn_outputchar)(char c, void* p) _REENTRANT;
 
 extern int _print_format (pfn_outputchar pfn, void* pvoid, const char *format, va_list ap);
@@ -58,7 +73,11 @@
 extern int sprintf (char *, const char *, ...);
 extern int vsprintf (char *, const char *, va_list);
 extern int puts(const char *);
+
+#if __STDC_VERSION__ < 201112L
 extern char *gets(char *);
+#endif
+
 extern char getchar(void);
 extern void putchar(char);
 
diff -Nru sdcc-3.1.0+dfsg/device/include/stdlib.h sdcc-3.2.0+dfsg/device/include/stdlib.h
--- sdcc-3.1.0+dfsg/device/include/stdlib.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/stdlib.h	2012-03-20 09:56:26.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -52,4 +52,22 @@
 
 int rand(void);
 void srand(unsigned int seed);
+
+/* Bounds-checking interfaces from annex K of the C11 standard. */
+#if defined (__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__
+
+#ifndef __RSIZE_T_DEFINED
+#define __RSIZE_T_DEFINED
+typedef size_t rsize_t;
+#endif
+
+#ifndef __ERRNO_T_DEFINED
+#define __ERRNO_T_DEFINED
+typedef int errno_t;
+#endif
+
+typedef void (*constraint_handler_t)(const char *restrict msg, void *restrict ptr, errno_t error);
+
+#endif
+
 #endif
diff -Nru sdcc-3.1.0+dfsg/device/include/stdnoreturn.h sdcc-3.2.0+dfsg/device/include/stdnoreturn.h
--- sdcc-3.1.0+dfsg/device/include/stdnoreturn.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/stdnoreturn.h	2011-12-22 16:08:37.000000000 +0000
@@ -0,0 +1,7 @@
+#ifndef __SDC51_STDNORETURN_H
+#define __SDC51_STDNORETURN_H 1
+
+#define noreturn _Noreturn
+
+#endif
+
diff -Nru sdcc-3.1.0+dfsg/device/include/string.h sdcc-3.2.0+dfsg/device/include/string.h
--- sdcc-3.1.0+dfsg/device/include/string.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/string.h	2012-05-18 10:47:44.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -39,7 +39,22 @@
   typedef unsigned int size_t;
 #endif
 
-#if !defined(SDCC_z80) && !defined(SDCC_z180) && !defined(SDCC_gbz80)
+/* Bounds-checking interfaces from annex K of the C11 standard. */
+#if defined (__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__
+
+#ifndef __RSIZE_T_DEFINED
+#define __RSIZE_T_DEFINED
+typedef size_t rsize_t;
+#endif
+
+#ifndef __ERRNO_T_DEFINED
+#define __ERRNO_T_DEFINED
+typedef int errno_t;
+#endif
+
+#endif
+
+#if defined(__SDCC_mcs51) || defined(__SDCC_hc08) || defined(__SDCC_ds390) || defined(__SDCC_pic14) || defined(__SDCC_pic16)
 #define __SDCC_BROKEN_STRING_FUNCTIONS
 #endif
 
@@ -50,7 +65,7 @@
 /* Copying functions: */
 extern void *memcpy (void * /*restrict */ dest, const void * /*restrict*/ src, size_t n);
 extern void *memmove (void *dest, const void *src, size_t n);
-extern char *strcpy (char * /*restrit*/ dest, const char * /*restrict*/ src);
+extern char *strcpy (char * /*restrict*/ dest, const char * /*restrict*/ src);
 extern char *strncpy(char * /*restrict*/ dest, const char * /*restrict*/ src, size_t n);
 
 /* Concatenation functions: */
@@ -93,11 +108,11 @@
 /* extern char *strerror(int errnum); */
 extern size_t strlen (const char *s);
 
-#ifdef SDCC_ds390
+#ifdef __SDCC_ds390
 extern void __xdata * memcpyx(void __xdata *, void __xdata *, int) __naked;
 #endif
 
-#if defined(SDCC_z80) || defined(SDCC_z180) || defined(SDCC_r2k)
+#if defined(__SDCC_z80) || defined(__SDCC_z180) || defined(__SDCC_r2k) || defined(__SDCC_r3ka)
 #define memcpy(dst, src, n) __builtin_memcpy(dst, src, n)
 #define memset(dst, c, n) __builtin_memset(dst, c, n)
 #endif
diff -Nru sdcc-3.1.0+dfsg/device/include/time.h sdcc-3.2.0+dfsg/device/include/time.h
--- sdcc-3.1.0+dfsg/device/include/time.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/time.h	2012-03-20 09:56:26.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -33,6 +33,21 @@
 #define __TIME_UNSIGNED 1
 #endif
 
+/* Bounds-checking interfaces from annex K of the C11 standard. */
+#if defined (__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__
+
+#ifndef __RSIZE_T_DEFINED
+#define __RSIZE_T_DEFINED
+typedef size_t rsize_t;
+#endif
+
+#ifndef __ERRNO_T_DEFINED
+#define __ERRNO_T_DEFINED
+typedef int errno_t;
+#endif
+
+#endif
+
 #if __TIME_UNSIGNED
 struct tm
 {
diff -Nru sdcc-3.1.0+dfsg/device/include/tinibios.h sdcc-3.2.0+dfsg/device/include/tinibios.h
--- sdcc-3.1.0+dfsg/device/include/tinibios.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/tinibios.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -63,7 +63,7 @@
 #define SERIAL_1_RECEIVE_BUFFER_SIZE 64
 
 /* I know someone is fooling with the crystals */
-#if defined(SDCC_ds400)
+#if defined(__SDCC_ds400)
 # define OSCILLATOR 14745600L
 #else
 # define OSCILLATOR 18432000L
@@ -125,12 +125,12 @@
 void Serial0IrqHandler (void) __interrupt 4;
 void Serial1IrqHandler (void) __interrupt 7;
 
-#if !defined(SDCC_ds400)
+#if !defined(__SDCC_ds400)
 void ClockInit();
 void ClockIrqHandler (void) __interrupt 1 __naked;
 #endif
 
-#if defined(SDCC_ds400)
+#if defined(__SDCC_ds400)
 /* functions for dealing with the ds400 ROM firmware. */
 
 /* A wrapper which calls rom_init allocating all available RAM in CE0
diff -Nru sdcc-3.1.0+dfsg/device/include/typeof.h sdcc-3.2.0+dfsg/device/include/typeof.h
--- sdcc-3.1.0+dfsg/device/include/typeof.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/typeof.h	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/include/z180/z180.h sdcc-3.2.0+dfsg/device/include/z180/z180.h
--- sdcc-3.1.0+dfsg/device/include/z180/z180.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/include/z180/z180.h	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/Makefile.in sdcc-3.2.0+dfsg/device/lib/Makefile.in
--- sdcc-3.1.0+dfsg/device/lib/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/Makefile.in	2012-05-18 16:09:24.000000000 +0000
@@ -10,7 +10,6 @@
 SHELL           = /bin/sh
 INSTALL         = @INSTALL@
 CP              = @CP@
-AR_S            = @AR@ @AR_S_FLAG@
 
 LIB_TYPE        = @LIB_TYPE@
 
@@ -61,8 +60,8 @@
 OPT_DISABLE_AVR   = @OPT_DISABLE_AVR@
 OPT_DISABLE_DS390 = @OPT_DISABLE_DS390@
 OPT_DISABLE_DS400 = @OPT_DISABLE_DS400@
-OPT_DISABLE_GBZ80 = @OPT_DISABLE_GBZ80@
 OPT_DISABLE_HC08  = @OPT_DISABLE_HC08@
+OPT_DISABLE_S08   = @OPT_DISABLE_S08@
 OPT_DISABLE_MCS51 = @OPT_DISABLE_MCS51@
 OPT_DISABLE_PIC14 = @OPT_DISABLE_PIC14@
 OPT_DISABLE_PIC16 = @OPT_DISABLE_PIC16@
@@ -70,6 +69,8 @@
 OPT_DISABLE_Z80   = @OPT_DISABLE_Z80@
 OPT_DISABLE_Z180  = @OPT_DISABLE_Z180@
 OPT_DISABLE_R2K   = @OPT_DISABLE_R2K@
+OPT_DISABLE_R3KA  = @OPT_DISABLE_R3KA@
+OPT_DISABLE_GBZ80 = @OPT_DISABLE_GBZ80@
 
 SOURCES_FLOAT = $(COMMON_FLOAT) \
   _fscmp.c \
@@ -92,6 +93,15 @@
   _divulong.c \
   _mullong.c
 
+SOURCES_LONGLONG = $(COMMON_LONGLONG) \
+  _rrulonglong.c \
+  _rrslonglong.c \
+  _rlulonglong.c \
+  _rlslonglong.c \
+  _mullonglong.c \
+  _divslonglong.c \
+  _divulonglong.c
+
 SOURCES_SDCC = $(COMMON_SDCC) \
   _autobaud.c \
   _bp.c \
@@ -117,14 +127,15 @@
   printfl.c \
   bpx.c
 
-SOURCES = $(SOURCES_FLOAT) $(SOURCES_INT) $(SOURCES_LONG) $(SOURCES_SDCC)
+SOURCES = $(SOURCES_FLOAT) $(SOURCES_INT) $(SOURCES_LONG) $(SOURCES_LONGLONG) $(SOURCES_SDCC)
 
 OBJECTS_FLOAT = $(SOURCES_FLOAT:%.c=$(PORT)/%.rel)
 OBJECTS_INT = $(SOURCES_INT:%.c=$(PORT)/%.rel)
 OBJECTS_LONG = $(SOURCES_LONG:%.c=$(PORT)/%.rel)
+OBJECTS_LONGLONG = $(SOURCES_LONGLONG:%.c=$(PORT)/%.rel)
 OBJECTS_SDCC = $(SOURCES_SDCC:%.c=$(PORT)/%.rel)
 
-OBJECTS = $(OBJECTS_FLOAT) $(OBJECTS_INT) $(OBJECTS_LONG) $(OBJECTS_SDCC)
+OBJECTS = $(OBJECTS_FLOAT) $(OBJECTS_INT) $(OBJECTS_LONG) $(OBJECTS_LONGLONG) $(OBJECTS_SDCC)
 
 XA51_FLOAT = $(COMMON_FLOAT)
 
@@ -147,7 +158,7 @@
 XA51SOURCES = $(XA51_FLOAT) $(XA51_INT) $(XA51_LONG) $(XA51_SDCC)
 XA51OBJECTS = $(XA51SOURCES:%.c=$(PORT)/%.rel)
 
-LIB_FILES = $(PORTDIR)/libfloat.lib $(PORTDIR)/libint.lib $(PORTDIR)/liblong.lib $(PORTDIR)/libsdcc.lib
+LIB_FILES = $(PORTDIR)/libfloat.lib $(PORTDIR)/libint.lib $(PORTDIR)/liblong.lib $(PORTDIR)/liblonglong.lib $(PORTDIR)/libsdcc.lib
 
 OEXT            = .rel
 
@@ -165,6 +176,10 @@
 TARGETS        += model-hc08
 endif
 
+ifeq ($(OPT_DISABLE_S08), 0)
+TARGETS        += model-s08
+endif
+
 ifeq ($(OPT_DISABLE_MCS51), 0)
 TARGETS        += models small-mcs51-stack-auto
 endif
@@ -189,6 +204,10 @@
 TARGETS        += model-r2k
 endif
 
+ifeq ($(OPT_DISABLE_R3KA), 0)
+TARGETS        += model-r3ka
+endif
+
 ifeq ($(OPT_DISABLE_GBZ80), 0)
 TARGETS        += model-gbz80
 endif
@@ -259,14 +278,13 @@
 
 $(PORTDIR)/lib$(PORT).lib: $(XA51OBJECTS)
 ifeq ($(LIB_TYPE), SDCCLIB)
-	../../bin/sdcclib -a $(PORTDIR)/lib$(PORT).lib $(XA51OBJECTS)
+	$(top_builddir)/bin/sdcclib -a $(PORTDIR)/lib$(PORT).lib $(XA51OBJECTS)
 else
   ifeq ($(LIB_TYPE), AR)
-	$(AR_S) -q $(PORTDIR)/lib$(PORT).lib $(XA51OBJECTS)
+	$(top_builddir)/bin/sdar -rcS $(PORTDIR)/lib$(PORT).lib $(XA51OBJECTS)
   else
     ifeq ($(LIB_TYPE), RANLIB)
-	$(AR_S) -q $(PORTDIR)/lib$(PORT).lib $(XA51OBJECTS)
-	$(top_builddir)/bin/sdranlib $(PORTDIR)/lib$(PORT).lib
+	$(top_builddir)/bin/sdar -rc $(PORTDIR)/lib$(PORT).lib $(XA51OBJECTS)
     else
 	rm -f $(PORTDIR)/lib$(PORT).lib
 	for i in $(notdir $(basename $(XA51OBJECTS))); do echo $$i >> $(PORTDIR)/lib$(PORT).lib; done
@@ -290,6 +308,11 @@
 	  $(MAKE) MODELFLAGS="-mr2k" PORT=r2k objects-z80 OEXT=.o; \
 	fi
 
+model-r3ka:
+	if grep '^z80\>' $(top_builddir)/ports.build > /dev/null; then \
+	  $(MAKE) MODELFLAGS="-mr3ka" PORT=r3ka objects-z80 OEXT=.o; \
+	fi
+
 model-gbz80:
 	if grep '^z80\>' $(top_builddir)/ports.build > /dev/null; then \
 	  $(MAKE) MODELFLAGS="-mgbz80" PORT=gbz80 objects-z80 OEXT=.o; \
@@ -305,6 +328,11 @@
 	  $(MAKE) MODELFLAGS="-mhc08" PORT=hc08 objects-hc08; \
 	fi
 
+model-s08:
+	if grep '^hc08\>' $(top_builddir)/ports.build > /dev/null; then \
+	  $(MAKE) MODELFLAGS="-ms08" PORT=s08 objects-hc08; \
+	fi
+
 objects-hc08:
 	$(MAKE) build-dir
 	$(MAKE) port-specific-objects
@@ -363,46 +391,55 @@
 ifeq ($(LIB_TYPE), SDCCLIB)
 
 $(PORTDIR)/libfloat.lib: $(OBJECTS_FLOAT)
-	../../bin/sdcclib -a $(PORTDIR)/libfloat.lib $(OBJECTS_FLOAT)
+	$(top_builddir)/bin/sdcclib -a $(PORTDIR)/libfloat.lib $(OBJECTS_FLOAT)
 
 $(PORTDIR)/libint.lib: $(OBJECTS_INT)
-	../../bin/sdcclib -a $(PORTDIR)/libint.lib $(OBJECTS_INT)
+	$(top_builddir)/bin/sdcclib -a $(PORTDIR)/libint.lib $(OBJECTS_INT)
 
 $(PORTDIR)/liblong.lib: $(OBJECTS_LONG)
-	../../bin/sdcclib -a $(PORTDIR)/liblong.lib $(OBJECTS_LONG)
+	$(top_builddir)/bin/sdcclib -a $(PORTDIR)/liblong.lib $(OBJECTS_LONG)
+
+$(PORTDIR)/liblonglong.lib: $(OBJECTS_LONGLONG)
+	$(top_builddir)/bin/sdcclib -a $(PORTDIR)/liblonglong.lib $(OBJECTS_LONGLONG)
 
 $(PORTDIR)/libsdcc.lib: $(OBJECTS_SDCC)
-	../../bin/sdcclib -a $(PORTDIR)/libsdcc.lib $(OBJECTS_SDCC)
+	$(top_builddir)/bin/sdcclib -a $(PORTDIR)/libsdcc.lib $(OBJECTS_SDCC)
 
 else
   ifeq ($(LIB_TYPE), AR)
 
 $(PORTDIR)/libfloat.lib: $(OBJECTS_FLOAT)
-	$(AR_S) -cq $(PORTDIR)/libfloat.lib $(OBJECTS_FLOAT)
+	$(top_builddir)/bin/sdar -rcS $(PORTDIR)/libfloat.lib $(OBJECTS_FLOAT)
 
 $(PORTDIR)/libint.lib: $(OBJECTS_INT)
-	$(AR_S) -cq $(PORTDIR)/libint.lib $(OBJECTS_INT)
+	$(top_builddir)/bin/sdar -rcS $(PORTDIR)/libint.lib $(OBJECTS_INT)
 
 $(PORTDIR)/liblong.lib: $(OBJECTS_LONG)
-	$(AR_S) -cq $(PORTDIR)/liblong.lib $(OBJECTS_LONG)
+	$(top_builddir)/bin/sdar -rcS $(PORTDIR)/liblong.lib $(OBJECTS_LONG)
+
+$(PORTDIR)/liblonglong.lib: $(OBJECTS_LONGLONG)
+	$(top_builddir)/bin/sdar -rcS $(PORTDIR)/liblonglong.lib $(OBJECTS_LONGLONG)
 
 $(PORTDIR)/libsdcc.lib: $(OBJECTS_SDCC)
-	$(AR_S) -cq $(PORTDIR)/libsdcc.lib $(OBJECTS_SDCC)
+	$(top_builddir)/bin/sdar -rcS $(PORTDIR)/libsdcc.lib $(OBJECTS_SDCC)
 
   else
     ifeq ($(LIB_TYPE), RANLIB)
 
 $(PORTDIR)/libfloat.lib: $(OBJECTS_FLOAT)
-	$(AR_S) -cq $(PORTDIR)/libfloat.lib $(OBJECTS_FLOAT); $(top_builddir)/bin/sdranlib $(PORTDIR)/libfloat.lib
+	$(top_builddir)/bin/sdar -rc $(PORTDIR)/libfloat.lib $(OBJECTS_FLOAT)
 
 $(PORTDIR)/libint.lib: $(OBJECTS_INT)
-	$(AR_S) -cq $(PORTDIR)/libint.lib $(OBJECTS_INT); $(top_builddir)/bin/sdranlib $(PORTDIR)/libint.lib
+	$(top_builddir)/bin/sdar -rc $(PORTDIR)/libint.lib $(OBJECTS_INT)
 
 $(PORTDIR)/liblong.lib: $(OBJECTS_LONG)
-	$(AR_S) -cq $(PORTDIR)/liblong.lib $(OBJECTS_LONG); $(top_builddir)/bin/sdranlib $(PORTDIR)/liblong.lib
+	$(top_builddir)/bin/sdar -rc $(PORTDIR)/liblong.lib $(OBJECTS_LONG)
+
+$(PORTDIR)/liblonglong.lib: $(OBJECTS_LONGLONG)
+	$(top_builddir)/bin/sdar -rc $(PORTDIR)/liblonglong.lib $(OBJECTS_LONGLONG)
 
 $(PORTDIR)/libsdcc.lib: $(OBJECTS_SDCC)
-	$(AR_S) -cq $(PORTDIR)/libsdcc.lib $(OBJECTS_SDCC); $(top_builddir)/bin/sdranlib $(PORTDIR)/libsdcc.lib
+	$(top_builddir)/bin/sdar -rc $(PORTDIR)/libsdcc.lib $(OBJECTS_SDCC)
 
     else
 
@@ -421,6 +458,11 @@
 	for i in $(notdir $(basename $(OBJECTS_LONG))); do echo $$i >> $(PORTDIR)/liblong.lib; done
 	cp $(OBJECTS_LONG) $(PORTDIR)
 
+$(PORTDIR)/liblonglong.lib: $(OBJECTS_LONGLONG)
+	rm -f $(PORTDIR)/liblonglong.lib
+	for i in $(notdir $(basename $(OBJECTS_LONGLONG))); do echo $$i >> $(PORTDIR)/liblonglong.lib; done
+	cp $(OBJECTS_LONGLONG) $(PORTDIR)
+
 $(PORTDIR)/libsdcc.lib: $(OBJECTS_SDCC)
 	rm -f $(PORTDIR)/libsdcc.lib
 	for i in $(notdir $(basename $(OBJECTS_SDCC))); do echo $$i >> $(PORTDIR)/libsdcc.lib; done
@@ -444,11 +486,12 @@
 install: all installdirs
 	[ ! -d "$(BUILDDIR)" ] || $(CP_U) -r $(BUILDDIR)/* $(sdcc_libdir)
 	$(CP_U) -r $(MODELS) $(srcdir)/mcs51 $(srcdir)/ds390 $(srcdir)/ds400 \
-	                     $(srcdir)/z80 $(srcdir)/z180 $(srcdir)/r2k $(srcdir)/gbz80 $(srcdir)/hc08 \
+	                     $(srcdir)/z80 $(srcdir)/z180 $(srcdir)/r2k $(srcdir)/r3ka $(srcdir)/gbz80 \
+                         $(srcdir)/hc08 $(srcdir)/s08 \
 	                     $(srcdir)/pic14 $(srcdir)/pic16 $(srcdir)/*.c $(sdcc_libdir)/src
-	$(CP_U) -r $(MODELS) mcs51 ds390 ds400 z80 z180 r2k gbz80 hc08 $(sdcc_libdir)/src
+	$(CP_U) -r $(MODELS) mcs51 ds390 ds400 z80 z180 r2k r3ka gbz80 hc08 s08 $(sdcc_libdir)/src
 
-	for src in $(MODELS) ds390 ds400 z80 z180 r2k gbz80 hc08 pic14 pic16; do \
+	for src in $(MODELS) ds390 ds400 z80 z180 r2k r3ka gbz80 hc08 s08 pic14 pic16; do \
 	  find $(sdcc_libdir)/src/$$src -depth \
 	    \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \
 	    -name '*.lst' -o -name '*.asm' -o -name '.svn' -o -name 'autom4te.cache' -o \
@@ -484,7 +527,7 @@
 	for model in $(MODELS); do \
 	  mkdir -p $(sdcc_libdir)/$$model; \
 	done
-	for libdir in small-stack-auto ds390 ds400 hc08 pic16 pic14; do \
+	for libdir in small-stack-auto ds390 ds400 hc08 s08 pic16 pic14; do \
 	  mkdir -p $(sdcc_libdir)/$$libdir; \
 	done
 	mkdir -p $(sdcc_libdir)/src
diff -Nru sdcc-3.1.0+dfsg/device/lib/_atof.c sdcc-3.2.0+dfsg/device/lib/_atof.c
--- sdcc-3.1.0+dfsg/device/lib/_atof.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_atof.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -13,7 +13,7 @@
    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 
+   You should have received a copy of the GNU General Public License
    along with this library; see the file COPYING. If not, write to the
    Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
@@ -30,15 +30,11 @@
 #include <stdlib.h>
 #include <stdbool.h>
 
-#ifndef BOOL
-#define BOOL _Bool
-#endif
-
 float atof(const char * s)
 {
     float value, fraction;
     signed char iexp;
-    BOOL sign;
+    bool sign;
 
     //Skip leading blanks
     while (isspace(*s)) s++;
diff -Nru sdcc-3.1.0+dfsg/device/lib/_atoi.c sdcc-3.2.0+dfsg/device/lib/_atoi.c
--- sdcc-3.1.0+dfsg/device/lib/_atoi.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_atoi.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_atol.c sdcc-3.2.0+dfsg/device/lib/_atol.c
--- sdcc-3.1.0+dfsg/device/lib/_atol.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_atol.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_autobaud.c sdcc-3.2.0+dfsg/device/lib/_autobaud.c
--- sdcc-3.1.0+dfsg/device/lib/_autobaud.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_autobaud.c	2012-06-06 11:34:31.000000000 +0000
@@ -9,7 +9,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -58,45 +58,44 @@
 {
 
         /* get timer #1 ready for action (16 bit mode) */
-	TMOD=0x11;
-	TCON = 0;
-	TH1 = TL1 = 0;
-	
-	/* wait for start bit */
+        TMOD=0x11;
+        TCON = 0;
+        TH1 = TL1 = 0;
+        
+        /* wait for start bit */
 autobaud2:
         while(RXD) ; 
 
-	/*  check it a few more times to make
+        /*  check it a few more times to make
              sure we don't trigger on some noise*/
-	if (RXD) goto autobaud2;
-	if (RXD) goto autobaud2;
-	if (RXD) goto autobaud2;
-	if (RXD) goto autobaud2;
+        if (RXD) goto autobaud2;
+        if (RXD) goto autobaud2;
+        if (RXD) goto autobaud2;
+        if (RXD) goto autobaud2;
 
-        /* wait for bit #0 to begin	 */
-	while (!RXD);
+        /* wait for bit #0 to begin      */
+        while (!RXD);
         TR1 = 1; /* start the timer */
-	while (RXD);             // wait for bit #1 to begin
+        while (RXD);             // wait for bit #1 to begin
         while(!RXD);             // wait for bit #2 to begin
         while(RXD);              // wait for bit #4 to begin
         while (!RXD);            // wait for stop bit to begin
         TR1 = 0;                 // stop timing
 
-	/* ;grab bit 7... it's the lsb we want */
-	TH1 = (TH1 << 1) | (TL1 >> 7);
+        /* ;grab bit 7... it's the lsb we want */
+        TH1 = (TH1 << 1) | (TL1 >> 7);
 
-	/* round off if necessary */
+        /* round off if necessary */
         TH1 = (TH1 << 1) | ((TL1 >> 6) & 0x01);
 
-	/* invert since timer #1 will count up */
+        /* invert since timer #1 will count up */
         TH1 = ~TH1;
 
-	/* now TH1 has the correct reload value (I hope) */
-	TH1++ ;
+        /* now TH1 has the correct reload value (I hope) */
+        TH1++ ;
 
-	TL1 = TH1;
-	TMOD =  0x21     ;      // set timer #1 for 8 bit auto-reload
+        TL1 = TH1;
+        TMOD =  0x21     ;      // set timer #1 for 8 bit auto-reload
         PCON =  0x80     ;      // configure built-in uart
         SCON =  0x52     ;
 }
-
diff -Nru sdcc-3.1.0+dfsg/device/lib/_bp.c sdcc-3.2.0+dfsg/device/lib/_bp.c
--- sdcc-3.1.0+dfsg/device/lib/_bp.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_bp.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_calloc.c sdcc-3.2.0+dfsg/device/lib/_calloc.c
--- sdcc-3.1.0+dfsg/device/lib/_calloc.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_calloc.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_decdptr.c sdcc-3.2.0+dfsg/device/lib/_decdptr.c
--- sdcc-3.1.0+dfsg/device/lib/_decdptr.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_decdptr.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -35,7 +35,7 @@
         .globl  __decdptr
 __decdptr:
 
-#ifdef SDCC_ds390
+#ifdef __SDCC_ds390
         orl     dps, #0xc0
         inc     dptr
         anl     dps, #0x3f
diff -Nru sdcc-3.1.0+dfsg/device/lib/_divsint.c sdcc-3.2.0+dfsg/device/lib/_divsint.c
--- sdcc-3.1.0+dfsg/device/lib/_divsint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_divsint.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -39,10 +39,10 @@
      mcs51 small stack-auto
 */
 
-#if !defined(SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
-#  if defined(SDCC_mcs51)
-#    if defined(SDCC_MODEL_SMALL)
-#      if defined(SDCC_STACK_AUTO) && !defined(SDCC_PARMS_IN_BANK1)
+#if !defined(__SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
+#  if defined(__SDCC_mcs51)
+#    if defined(__SDCC_MODEL_SMALL)
+#      if defined(__SDCC_STACK_AUTO) && !defined(SDCC_PARMS_IN_BANK1)
 #        define _DIVSINT_ASM_SMALL_AUTO
 #      else
 #        define _DIVSINT_ASM_SMALL
diff -Nru sdcc-3.1.0+dfsg/device/lib/_divslong.c sdcc-3.2.0+dfsg/device/lib/_divslong.c
--- sdcc-3.1.0+dfsg/device/lib/_divslong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_divslong.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -38,10 +38,10 @@
      mcs51 small stack-auto
 */
 
-#if !defined(SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
-#  if defined(SDCC_mcs51)
-#    if defined(SDCC_MODEL_SMALL)
-#      if defined(SDCC_STACK_AUTO) && !defined(SDCC_PARMS_IN_BANK1)
+#if !defined(__SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
+#  if defined(__SDCC_mcs51)
+#    if defined(__SDCC_MODEL_SMALL)
+#      if defined(__SDCC_STACK_AUTO) && !defined(SDCC_PARMS_IN_BANK1)
 #        define _DIVSLONG_ASM_SMALL_AUTO
 #      else
 #        define _DIVSLONG_ASM_SMALL
diff -Nru sdcc-3.1.0+dfsg/device/lib/_divslonglong.c sdcc-3.2.0+dfsg/device/lib/_divslonglong.c
--- sdcc-3.1.0+dfsg/device/lib/_divslonglong.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_divslonglong.c	2012-04-02 09:59:13.000000000 +0000
@@ -0,0 +1,52 @@
+/*-------------------------------------------------------------------------
+   _divslonglong.c - routine for divsion of 64 bit unsigned long long
+
+   Copyright (C) 2012, Philipp Klaus Krause . pkk@spth.de
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+#pragma std_c99
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#ifdef __SDCC_LONGLONG
+long long 
+_divslonglong (long long numerator, long long denominator)
+{
+  bool numeratorneg = (numerator < 0);
+  bool denominatorneg = (denominator < 0);
+  long long d;
+
+  if (numeratorneg)
+    numerator = -numerator;
+  if (denominatorneg)
+    denominator = -denominator;
+
+  d = (unsigned long long)numerator / (unsigned long long)denominator;
+
+  return ((numeratorneg ^ denominatorneg) ? -d : d);
+}
+#endif
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/_divuint.c sdcc-3.2.0+dfsg/device/lib/_divuint.c
--- sdcc-3.1.0+dfsg/device/lib/_divuint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_divuint.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -13,7 +13,7 @@
    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 
+   You should have received a copy of the GNU General Public License
    along with this library; see the file COPYING. If not, write to the
    Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
@@ -33,10 +33,10 @@
 
 #include <stdbool.h>
 
-#if !defined(SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
-#  if defined(SDCC_mcs51)
-#    if defined(SDCC_MODEL_SMALL)
-#      if defined(SDCC_STACK_AUTO)
+#if !defined(__SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
+#  if defined(__SDCC_mcs51)
+#    if defined(__SDCC_MODEL_SMALL)
+#      if defined(__SDCC_STACK_AUTO)
 #        define _DIVUINT_ASM_SMALL_AUTO
 #      else
 #        define _DIVUINT_ASM_SMALL
@@ -66,7 +66,7 @@
 	#define yl      (b1_0)
 	#define yh      (b1_1)
 #else // SDCC_PARMS_IN_BANK1
-  #if defined(SDCC_STACK_AUTO)
+  #if defined(__SDCC_STACK_AUTO)
 
 	.globl __divint
 
@@ -87,7 +87,7 @@
 
   #else // SDCC_STACK_AUTO
 
-    #if defined(SDCC_NOOVERLAY)
+    #if defined(__SDCC_NOOVERLAY)
 	.area DSEG    (DATA)
     #else
 	.area OSEG    (OVR,DATA)
@@ -156,7 +156,7 @@
 {
   unsigned int reste = 0;
   unsigned char count = 16;
-  BOOL c;
+  bool c;
 
   do
   {
diff -Nru sdcc-3.1.0+dfsg/device/lib/_divulong.c sdcc-3.2.0+dfsg/device/lib/_divulong.c
--- sdcc-3.1.0+dfsg/device/lib/_divulong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_divulong.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -13,7 +13,7 @@
    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 
+   You should have received a copy of the GNU General Public License
    along with this library; see the file COPYING. If not, write to the
    Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
@@ -33,14 +33,10 @@
 
 #include <stdbool.h>
 
-#ifndef BOOL
-#define BOOL _Bool
-#endif
-
-#if !defined(SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
-#  if defined(SDCC_mcs51)
-#    if defined(SDCC_MODEL_SMALL)
-#      if defined(SDCC_STACK_AUTO) && !defined(SDCC_PARMS_IN_BANK1)
+#if !defined(__SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
+#  if defined(__SDCC_mcs51)
+#    if defined(__SDCC_MODEL_SMALL)
+#      if defined(__SDCC_STACK_AUTO) && !defined(SDCC_PARMS_IN_BANK1)
 #        define _DIVULONG_ASM_SMALL_AUTO
 #      else
 #        define _DIVULONG_ASM_SMALL
@@ -73,7 +69,7 @@
 	#define reste3	r7
 #if !defined(SDCC_PARMS_IN_BANK1)
 
-#if defined(SDCC_NOOVERLAY)
+#if defined(__SDCC_NOOVERLAY)
 	.area DSEG    (DATA)
 #else
 	.area OSEG    (OVR,DATA)
@@ -336,7 +332,7 @@
 {
   unsigned long reste = 0L;
   unsigned char count = 32;
-  BOOL c;
+  bool c;
 
   do
   {
diff -Nru sdcc-3.1.0+dfsg/device/lib/_divulonglong.c sdcc-3.2.0+dfsg/device/lib/_divulonglong.c
--- sdcc-3.1.0+dfsg/device/lib/_divulonglong.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_divulonglong.c	2012-04-02 09:59:13.000000000 +0000
@@ -0,0 +1,65 @@
+/*-------------------------------------------------------------------------
+   _divslonglong.c - routine for divsion of 64 bit unsigned long long
+
+   Copyright (C) 1999, Jean-Louis Vern <jlvern AT gmail.com>
+   Copyright (C) 2012, Philipp Klaus Krause . pkk@spth.de
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+#pragma std_c99
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#ifdef __SDCC_LONGLONG
+#define MSB_SET(x) ((x >> (8*sizeof(x)-1)) & 1)
+
+unsigned long long
+_divulonglong (unsigned long long x, unsigned long long y)
+{
+  unsigned long long reste = 0L;
+  unsigned char count = 64;
+  bool c;
+
+  do
+  {
+    // reste: x <- 0;
+    c = MSB_SET(x);
+    x <<= 1;
+    reste <<= 1;
+    if (c)
+      reste |= 1L;
+
+    if (reste >= y)
+    {
+      reste -= y;
+      // x <- (result = 1)
+      x |= 1L;
+    }
+  }
+  while (--count);
+  return x;
+}
+#endif
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/_free.c sdcc-3.2.0+dfsg/device/lib/_free.c
--- sdcc-3.1.0+dfsg/device/lib/_free.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_free.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -29,7 +29,7 @@
 #include <sdcc-lib.h>
 #include <malloc.h>
 
-#if defined(SDCC_STACK_AUTO) || defined(SDCC_z80) || defined(SDCC_z180) || defined(SDCC_gbz80)
+#if defined(__SDCC_STACK_AUTO) || defined(__SDCC_z80) || defined(__SDCC_z180) || defined(__SDCC_gbz80)
   #define CRITICAL __critical
 #else
   #define CRITICAL
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fs2schar.c sdcc-3.2.0+dfsg/device/lib/_fs2schar.c
--- sdcc-3.1.0+dfsg/device/lib/_fs2schar.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fs2schar.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@
 -------------------------------------------------------------------------*/
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fs2sint.c sdcc-3.2.0+dfsg/device/lib/_fs2sint.c
--- sdcc-3.1.0+dfsg/device/lib/_fs2sint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fs2sint.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@
 -------------------------------------------------------------------------*/
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fs2slong.c sdcc-3.2.0+dfsg/device/lib/_fs2slong.c
--- sdcc-3.1.0+dfsg/device/lib/_fs2slong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fs2slong.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@
 -------------------------------------------------------------------------*/
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fs2uchar.c sdcc-3.2.0+dfsg/device/lib/_fs2uchar.c
--- sdcc-3.1.0+dfsg/device/lib/_fs2uchar.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fs2uchar.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -26,7 +26,7 @@
    might be covered by the GNU General Public License.
 -------------------------------------------------------------------------*/
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fs2uint.c sdcc-3.2.0+dfsg/device/lib/_fs2uint.c
--- sdcc-3.1.0+dfsg/device/lib/_fs2uint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fs2uint.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -26,7 +26,7 @@
    might be covered by the GNU General Public License.
 -------------------------------------------------------------------------*/
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fs2ulong.c sdcc-3.2.0+dfsg/device/lib/_fs2ulong.c
--- sdcc-3.1.0+dfsg/device/lib/_fs2ulong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fs2ulong.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@
 -------------------------------------------------------------------------*/
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fsadd.c sdcc-3.2.0+dfsg/device/lib/_fsadd.c
--- sdcc-3.1.0+dfsg/device/lib/_fsadd.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fsadd.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -13,7 +13,7 @@
    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 
+   You should have received a copy of the GNU General Public License
    along with this library; see the file COPYING. If not, write to the
    Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
@@ -27,15 +27,11 @@
 -------------------------------------------------------------------------*/
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 #include <stdbool.h>
 #include <sdcc-lib.h>
 
-#ifndef BOOL
-#define BOOL _Bool
-#endif
-
 #ifdef FLOAT_ASM_MCS51
 
 // float __fsadd (float a, float b) __reentrant
@@ -177,7 +173,7 @@
   long _AUTOMEM *pfl1;
   long _AUTOMEM *pfl2;
   int exp1, exp2, expd;
-  BOOL sign = false;
+  bool sign = false;
 
   pfl2 = (long _AUTOMEM *)&a2;
   exp2 = EXP (*pfl2);
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fscmp.c sdcc-3.2.0+dfsg/device/lib/_fscmp.c
--- sdcc-3.1.0+dfsg/device/lib/_fscmp.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fscmp.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@
 -------------------------------------------------------------------------*/
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fsdiv.c sdcc-3.2.0+dfsg/device/lib/_fsdiv.c
--- sdcc-3.1.0+dfsg/device/lib/_fsdiv.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fsdiv.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@
 -------------------------------------------------------------------------*/
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fseq.c sdcc-3.2.0+dfsg/device/lib/_fseq.c
--- sdcc-3.1.0+dfsg/device/lib/_fseq.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fseq.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@
 -------------------------------------------------------------------------*/
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fsget1arg.c sdcc-3.2.0+dfsg/device/lib/_fsget1arg.c
--- sdcc-3.1.0+dfsg/device/lib/_fsget1arg.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fsget1arg.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@
 -------------------------------------------------------------------------*/
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
@@ -40,19 +40,19 @@
 	.globl	fsgetarg
 fsgetarg:
 	// extract the input, placing it into:
-	//      sign     exponent   mantiassa
-	//      ----     --------   ---------
-	//  a:  sign_a   exp_a     r4/r3/r2
+	//      sign     exponent   mantissa
+	//      ----     --------   --------
+	//  a:  sign_a   exp_a      r4/r3/r2
 	//
 	mov	r2, dpl
 	mov	r3, dph
 	mov	c, b.7
 	rlc	a
 	mov	sign_a, c
+	mov	exp_a, a
 	jz	00001$
 	setb	b.7
 00001$:
-	mov	exp_a, a
 	mov	r4, b
 	ret
 	__endasm;
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fsget2args.c sdcc-3.2.0+dfsg/device/lib/_fsget2args.c
--- sdcc-3.1.0+dfsg/device/lib/_fsget2args.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fsget2args.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -28,7 +28,7 @@
 
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
@@ -42,20 +42,20 @@
 	.globl	fsgetargs
 fsgetargs:
 	// extract the two inputs, placing them into:
-	//      sign     exponent   mantiassa
-	//      ----     --------   ---------
-	//  a:  sign_a   exp_a     r4/r3/r2
-	//  b:  sign_b   exp_b     r7/r6/r5
+	//      sign     exponent   mantissa
+	//      ----     --------   --------
+	//  a:  sign_a   exp_a      r4/r3/r2
+	//  b:  sign_b   exp_b      r7/r6/r5
 	//
 	mov	r2, dpl
 	mov	r3, dph
 	mov	c, b.7
 	rlc	a
 	mov	sign_a, c
+	mov	exp_a, a
 	jz	00001$
 	setb	b.7
 00001$:
-	mov	exp_a, a
 	mov	r4, b
 	// now extract the 2nd parameter from the stack
 	mov	a, sp
@@ -73,10 +73,10 @@
 	mov	c, b.7
 	rlc	a
 	mov	sign_b, c
+	mov	exp_b, a
 	jz	00002$
 	setb	b.7
 00002$:
-	mov	exp_b, a
 	mov	r7, b
 	ret
 	__endasm;
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fsgt.c sdcc-3.2.0+dfsg/device/lib/_fsgt.c
--- sdcc-3.1.0+dfsg/device/lib/_fsgt.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fsgt.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@
 -------------------------------------------------------------------------*/
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fslt.c sdcc-3.2.0+dfsg/device/lib/_fslt.c
--- sdcc-3.1.0+dfsg/device/lib/_fslt.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fslt.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@
 -------------------------------------------------------------------------*/
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fsmul.c sdcc-3.2.0+dfsg/device/lib/_fsmul.c
--- sdcc-3.1.0+dfsg/device/lib/_fsmul.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fsmul.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@
 -------------------------------------------------------------------------*/
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fsneq.c sdcc-3.2.0+dfsg/device/lib/_fsneq.c
--- sdcc-3.1.0+dfsg/device/lib/_fsneq.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fsneq.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@
 -------------------------------------------------------------------------*/
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fsnormalize.c sdcc-3.2.0+dfsg/device/lib/_fsnormalize.c
--- sdcc-3.1.0+dfsg/device/lib/_fsnormalize.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fsnormalize.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -28,7 +28,7 @@
 
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
@@ -41,9 +41,14 @@
 fs_normalize_a:
 #ifdef FLOAT_SHIFT_SPEEDUP
 	mov	r0, #4
-00001$:
 	mov	a, r4
+00001$:
 	jnz	00003$
+	mov	a, exp_a
+	add	a, #248
+	jnc	00002$	;denormalized
+	mov	exp_a, a
+	clr	a
 	xch	a, r1
 	xch	a, r2
 	xch	a, r3
@@ -52,19 +57,19 @@
 	//mov	r3, ar2
 	//mov	r2, ar1
 	//mov	r1, #0
-	mov	a, exp_a
-	add	a, #248
-	mov	exp_a, a
 	djnz	r0, 00001$
 	ret
-#else
-	mov	a, r4
 #endif
+00002$:
+	mov	a, r4
 00003$:
 	mov	r0, #32
-00005$:
+	inc	exp_a
+00004$:
 	jb	acc.7, 00006$
-	dec	exp_a
+	djnz	exp_a, 00005$
+	ret			;denormalized
+00005$:
 	clr	c
 	mov	a, r1
 	rlc	a
@@ -78,8 +83,9 @@
 	mov	a, r4
 	rlc	a
 	mov	r4, a
-	djnz	r0, 00005$
+	djnz	r0, 00004$
 00006$:
+	dec	exp_a
 	ret
 	__endasm;
 }
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fsreturnval.c sdcc-3.2.0+dfsg/device/lib/_fsreturnval.c
--- sdcc-3.1.0+dfsg/device/lib/_fsreturnval.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fsreturnval.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -28,7 +28,7 @@
 
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fsrshift.c sdcc-3.2.0+dfsg/device/lib/_fsrshift.c
--- sdcc-3.1.0+dfsg/device/lib/_fsrshift.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fsrshift.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -28,7 +28,7 @@
 
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fssub.c sdcc-3.2.0+dfsg/device/lib/_fssub.c
--- sdcc-3.1.0+dfsg/device/lib/_fssub.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fssub.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@
 -------------------------------------------------------------------------*/
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_fsswapargs.c sdcc-3.2.0+dfsg/device/lib/_fsswapargs.c
--- sdcc-3.1.0+dfsg/device/lib/_fsswapargs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_fsswapargs.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -28,7 +28,7 @@
 
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_gptrget.c sdcc-3.2.0+dfsg/device/lib/_gptrget.c
--- sdcc-3.1.0+dfsg/device/lib/_gptrget.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_gptrget.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -216,7 +216,7 @@
 
 #endif
 
-#ifdef SDCC_ds390
+#ifdef __SDCC_ds390
 /* the  return value is expected to be in acc/_ap, and not in the standard
  * location dpl/dph. Therefore we choose return type void here: */
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_gptrgetc.c sdcc-3.2.0+dfsg/device/lib/_gptrgetc.c
--- sdcc-3.1.0+dfsg/device/lib/_gptrgetc.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_gptrgetc.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_gptrput.c sdcc-3.2.0+dfsg/device/lib/_gptrput.c
--- sdcc-3.1.0+dfsg/device/lib/_gptrput.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_gptrput.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -187,7 +187,7 @@
 
 #endif
 
-#ifdef SDCC_ds390
+#ifdef __SDCC_ds390
 
 void
 _gptrputWord ()
diff -Nru sdcc-3.1.0+dfsg/device/lib/_heap.c sdcc-3.2.0+dfsg/device/lib/_heap.c
--- sdcc-3.1.0+dfsg/device/lib/_heap.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_heap.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_iscntrl.c sdcc-3.2.0+dfsg/device/lib/_iscntrl.c
--- sdcc-3.1.0+dfsg/device/lib/_iscntrl.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_iscntrl.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_isdigit.c sdcc-3.2.0+dfsg/device/lib/_isdigit.c
--- sdcc-3.1.0+dfsg/device/lib/_isdigit.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_isdigit.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_isgraph.c sdcc-3.2.0+dfsg/device/lib/_isgraph.c
--- sdcc-3.1.0+dfsg/device/lib/_isgraph.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_isgraph.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_islower.c sdcc-3.2.0+dfsg/device/lib/_islower.c
--- sdcc-3.1.0+dfsg/device/lib/_islower.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_islower.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_isprint.c sdcc-3.2.0+dfsg/device/lib/_isprint.c
--- sdcc-3.1.0+dfsg/device/lib/_isprint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_isprint.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_ispunct.c sdcc-3.2.0+dfsg/device/lib/_ispunct.c
--- sdcc-3.1.0+dfsg/device/lib/_ispunct.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_ispunct.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_isspace.c sdcc-3.2.0+dfsg/device/lib/_isspace.c
--- sdcc-3.1.0+dfsg/device/lib/_isspace.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_isspace.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_isupper.c sdcc-3.2.0+dfsg/device/lib/_isupper.c
--- sdcc-3.1.0+dfsg/device/lib/_isupper.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_isupper.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_isxdigit.c sdcc-3.2.0+dfsg/device/lib/_isxdigit.c
--- sdcc-3.1.0+dfsg/device/lib/_isxdigit.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_isxdigit.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_itoa.c sdcc-3.2.0+dfsg/device/lib/_itoa.c
--- sdcc-3.1.0+dfsg/device/lib/_itoa.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_itoa.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_logexpf.c sdcc-3.2.0+dfsg/device/lib/_logexpf.c
--- sdcc-3.1.0+dfsg/device/lib/_logexpf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_logexpf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -26,7 +26,7 @@
    might be covered by the GNU General Public License.
 -------------------------------------------------------------------------*/
 
-#define SDCC_MATH_LIB
+#define __SDCC_MATH_LIB
 #include <math.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_ltoa.c sdcc-3.2.0+dfsg/device/lib/_ltoa.c
--- sdcc-3.1.0+dfsg/device/lib/_ltoa.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_ltoa.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -46,7 +46,7 @@
 # warning _ltoa() and _ultoa() are not save for radix 2
 #endif
 
-#if defined (SDCC_mcs51) && defined (SDCC_MODEL_SMALL) && !defined (SDCC_STACK_AUTO)
+#if defined (__SDCC_mcs51) && defined (__SDCC_MODEL_SMALL) && !defined (__SDCC_STACK_AUTO)
 # define MEMSPACE_BUFFER __idata	/* eventually __pdata or __xdata */
 # pragma nogcse
 #else
@@ -81,3 +81,4 @@
   }
   _ultoa(value, string, radix);
 }
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/_malloc.c sdcc-3.2.0+dfsg/device/lib/_malloc.c
--- sdcc-3.1.0+dfsg/device/lib/_malloc.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_malloc.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -29,7 +29,7 @@
 #include <sdcc-lib.h>
 #include <malloc.h>
 
-#if defined(SDCC_STACK_AUTO) || defined(SDCC_z80) || defined(SDCC_z180) || defined(SDCC_gbz80)
+#if defined(__SDCC_STACK_AUTO) || defined(__SDCC_z80) || defined(__SDCC_z180) || defined(__SDCC_gbz80)
   #define CRITICAL __critical
 #else
   #define CRITICAL
@@ -241,3 +241,4 @@
 
             //END OF MODULE
 #endif
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/_memchr.c sdcc-3.2.0+dfsg/device/lib/_memchr.c
--- sdcc-3.1.0+dfsg/device/lib/_memchr.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_memchr.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_memcmp.c sdcc-3.2.0+dfsg/device/lib/_memcmp.c
--- sdcc-3.1.0+dfsg/device/lib/_memcmp.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_memcmp.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_memcpy.c sdcc-3.2.0+dfsg/device/lib/_memcpy.c
--- sdcc-3.1.0+dfsg/device/lib/_memcpy.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_memcpy.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_memmove.c sdcc-3.2.0+dfsg/device/lib/_memmove.c
--- sdcc-3.1.0+dfsg/device/lib/_memmove.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_memmove.c	2012-03-13 10:17:10.000000000 +0000
@@ -7,7 +7,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -28,6 +28,7 @@
    might be covered by the GNU General Public License.
 -------------------------------------------------------------------------*/
 #include "string.h" 
+#include <stdint.h>
 #include <sdcc-lib.h>
 
 #ifndef _SDCC_PORT_PROVIDES_MEMMOVE
@@ -46,7 +47,7 @@
 	char * d;
 	char * s;
 
-	if (((int)src < (int)dst) && ((((int)src)+acount) > (int)dst)) {
+	if ((uintptr_t)src < (uintptr_t)dst) {
 		/*
 		 * copy from higher addresses to lower addresses
 		 */
diff -Nru sdcc-3.1.0+dfsg/device/lib/_memset.c sdcc-3.2.0+dfsg/device/lib/_memset.c
--- sdcc-3.1.0+dfsg/device/lib/_memset.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_memset.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -31,9 +31,9 @@
 
 #undef memset /* Avoid conflict with builtin memset() in Z80 and some related ports */
 
-#if defined (_SDCC_NO_ASM_LIB_FUNCS) || !defined (SDCC_mcs51) || \
-    (!defined (SDCC_MODEL_SMALL) && !defined (SDCC_MODEL_LARGE)) || \
-     (defined (SDCC_STACK_AUTO) || defined (SDCC_PARMS_IN_BANK1) )
+#if defined (_SDCC_NO_ASM_LIB_FUNCS) || !defined (__SDCC_mcs51) || \
+    (!defined (__SDCC_MODEL_SMALL) && !defined (__SDCC_MODEL_LARGE)) || \
+     (defined (__SDCC_STACK_AUTO) || defined (__SDCC_PARMS_IN_BANK1) )
 
 #ifdef __SDCC_BROKEN_STRING_FUNCTIONS
 void *memset (void *s, unsigned char c, size_t n)
@@ -61,9 +61,9 @@
 
   /* assigning function parameters to registers.
      SDCC_PARMS_IN_BANK1 or SDCC_STACK_AUTO not yet implemented. */
-  #if defined (SDCC_MODEL_SMALL)
+  #if defined (__SDCC_MODEL_SMALL)
 
-    #if defined(SDCC_NOOVERLAY)
+    #if defined(__SDCC_NOOVERLAY)
         .area DSEG    (DATA)
     #else
         .area OSEG    (OVR,DATA)
diff -Nru sdcc-3.1.0+dfsg/device/lib/_modsint.c sdcc-3.2.0+dfsg/device/lib/_modsint.c
--- sdcc-3.1.0+dfsg/device/lib/_modsint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_modsint.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -38,10 +38,10 @@
      mcs51 small stack-auto
 */
 
-#if !defined(SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
-#  if defined(SDCC_mcs51)
-#    if defined(SDCC_MODEL_SMALL)
-#      if defined(SDCC_STACK_AUTO) && !defined(SDCC_PARMS_IN_BANK1)
+#if !defined(__SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
+#  if defined(__SDCC_mcs51)
+#    if defined(__SDCC_MODEL_SMALL)
+#      if defined(__SDCC_STACK_AUTO) && !defined(SDCC_PARMS_IN_BANK1)
 #        define _MODSINT_ASM_SMALL_AUTO
 #      else
 #        define _MODSINT_ASM_SMALL
diff -Nru sdcc-3.1.0+dfsg/device/lib/_modslong.c sdcc-3.2.0+dfsg/device/lib/_modslong.c
--- sdcc-3.1.0+dfsg/device/lib/_modslong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_modslong.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -37,10 +37,10 @@
      mcs51 small stack-auto
 */
 
-#if !defined(SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
-#  if defined(SDCC_mcs51)
-#    if defined(SDCC_MODEL_SMALL)
-#      if defined(SDCC_STACK_AUTO) && !defined(SDCC_PARMS_IN_BANK1)
+#if !defined(__SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
+#  if defined(__SDCC_mcs51)
+#    if defined(__SDCC_MODEL_SMALL)
+#      if defined(__SDCC_STACK_AUTO) && !defined(SDCC_PARMS_IN_BANK1)
 #        define _MODSLONG_ASM_SMALL_AUTO
 #      else
 #        define _MODSLONG_ASM_SMALL
diff -Nru sdcc-3.1.0+dfsg/device/lib/_moduint.c sdcc-3.2.0+dfsg/device/lib/_moduint.c
--- sdcc-3.1.0+dfsg/device/lib/_moduint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_moduint.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -32,10 +32,10 @@
      mcs51 small stack-auto
 */
 
-#if !defined(SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
-#  if defined(SDCC_mcs51)
-#    if defined(SDCC_MODEL_SMALL)
-#      if defined(SDCC_STACK_AUTO)
+#if !defined(__SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
+#  if defined(__SDCC_mcs51)
+#    if defined(__SDCC_MODEL_SMALL)
+#      if defined(__SDCC_STACK_AUTO)
 #        define _MODUINT_ASM_SMALL_AUTO
 #      else
 #        define _MODUINT_ASM_SMALL
@@ -59,7 +59,7 @@
 	#define al      dpl
 	#define ah      dph
 
-#if defined(SDCC_STACK_AUTO) && !defined(SDCC_PARMS_IN_BANK1)
+#if defined(__SDCC_STACK_AUTO) && !defined(SDCC_PARMS_IN_BANK1)
 
 	ar0 = 0			; BUG register set is not considered
 	ar1 = 1
@@ -82,7 +82,7 @@
 #else // SDCC_STACK_AUTO
 
 #if !defined(SDCC_PARMS_IN_BANK1)
-#if defined(SDCC_NOOVERLAY)
+#if defined(__SDCC_NOOVERLAY)
 	.area DSEG    (DATA)
 #else
 	.area OSEG    (OVR,DATA)
diff -Nru sdcc-3.1.0+dfsg/device/lib/_modulong.c sdcc-3.2.0+dfsg/device/lib/_modulong.c
--- sdcc-3.1.0+dfsg/device/lib/_modulong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_modulong.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -32,10 +32,10 @@
      mcs51 small stack-auto
 */
 
-#if !defined(SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
-#  if defined(SDCC_mcs51)
-#    if defined(SDCC_MODEL_SMALL)
-#      if defined(SDCC_STACK_AUTO) && !defined (SDCC_PARMS_IN_BANK1)
+#if !defined(__SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
+#  if defined(__SDCC_mcs51)
+#    if defined(__SDCC_MODEL_SMALL)
+#      if defined(__SDCC_STACK_AUTO) && !defined (SDCC_PARMS_IN_BANK1)
 #        define _MODULONG_ASM_SMALL_AUTO
 #      else
 #        define _MODULONG_ASM_SMALL
@@ -66,7 +66,7 @@
 	#define b2      (b1_2)
 	#define b3      (b1_3)
 #else
-#if defined(SDCC_NOOVERLAY)
+#if defined(__SDCC_NOOVERLAY)
 	.area DSEG    (DATA)
 #else
 	.area OSEG    (OVR,DATA)
@@ -363,3 +363,4 @@
 }
 
 #endif // _MODULONG_ASM
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/_mulint.c sdcc-3.2.0+dfsg/device/lib/_mulint.c
--- sdcc-3.1.0+dfsg/device/lib/_mulint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_mulint.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -36,20 +36,20 @@
      mcs51 large
 */
 
-#if !defined(SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
-#  if defined(SDCC_ds390)
-#    if !defined(SDCC_STACK_AUTO)
+#if !defined(__SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
+#  if defined(__SDCC_ds390)
+#    if !defined(__SDCC_STACK_AUTO)
 #      define _MULINT_ASM_LARGE
 #    endif
-#  elif defined(SDCC_mcs51)
-#    if defined(SDCC_MODEL_SMALL)
-#      if defined(SDCC_STACK_AUTO) && !defined(SDCC_PARMS_IN_BANK1)
+#  elif defined(__SDCC_mcs51)
+#    if defined(__SDCC_MODEL_SMALL)
+#      if defined(__SDCC_STACK_AUTO) && !defined(SDCC_PARMS_IN_BANK1)
 #        define _MULINT_ASM_SMALL_AUTO
 #      else
 #        define _MULINT_ASM_SMALL
 #      endif
 #    else // must be SDCC_MODEL_LARGE
-#      if !defined(SDCC_STACK_AUTO)
+#      if !defined(__SDCC_STACK_AUTO)
 #        define _MULINT_ASM_LARGE
 #     endif
 #   endif
@@ -126,9 +126,9 @@
 
 	.globl __mulint
 
-#if !defined(SDCC_STACK_AUTO) || defined(SDCC_PARMS_IN_BANK1)
+#if !defined(__SDCC_STACK_AUTO) || defined(SDCC_PARMS_IN_BANK1)
 
-#if defined(SDCC_NOOVERLAY)
+#if defined(__SDCC_NOOVERLAY)
 	.area DSEG    (DATA)
 #else
 	.area OSEG    (OVR,DATA)
@@ -216,7 +216,7 @@
 int
 _mulint (int a, int b)
 {
-#if !defined(SDCC_STACK_AUTO) && (defined(SDCC_MODEL_LARGE) || defined(SDCC_ds390))	// still needed for large
+#if !defined(__SDCC_STACK_AUTO) && (defined(__SDCC_MODEL_LARGE) || defined(__SDCC_ds390))	// still needed for large
 	union uu __xdata *x;
 	union uu __xdata *y;
 	union uu t;
@@ -239,3 +239,4 @@
 #endif
 
 #undef _MULINT_ASM
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/_mullong.c sdcc-3.2.0+dfsg/device/lib/_mullong.c
--- sdcc-3.1.0+dfsg/device/lib/_mullong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_mullong.c	2012-05-18 16:46:53.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -35,16 +35,16 @@
      mcs51 small stack-auto
 */
 
-#if !defined(SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
-#  if defined(SDCC_mcs51)
-#    if defined(SDCC_MODEL_SMALL)
-#      if defined(SDCC_STACK_AUTO) && !defined(SDCC_PARMS_IN_BANK1)
+#if !defined(__SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
+#  if defined(__SDCC_mcs51)
+#    if defined(__SDCC_MODEL_SMALL)
+#      if defined(__SDCC_STACK_AUTO) && !defined(SDCC_PARMS_IN_BANK1)
 #        define _MULLONG_ASM_SMALL_AUTO
 #      else
 #        define _MULLONG_ASM_SMALL
 #      endif
-#    elif defined(SDCC_MODEL_LARGE)
-#      if !defined(SDCC_STACK_AUTO)
+#    elif defined(__SDCC_MODEL_LARGE)
+#      if !defined(__SDCC_STACK_AUTO)
 #        define _MULLONG_ASM_LARGE
 #      endif
 #    endif
@@ -78,14 +78,14 @@
 	; c2  a2 * b0 + a1 * b1 + a0 * b2
 	; c3  a3 * b0 + a2 * b1 + a1 * b2 + a0 * b3
 
-#if !defined(SDCC_STACK_AUTO) || defined(SDCC_PARMS_IN_BANK1)
+#if !defined(__SDCC_STACK_AUTO) || defined(SDCC_PARMS_IN_BANK1)
 #if defined(SDCC_PARMS_IN_BANK1)
 	#define b0  (b1_0)
 	#define b1  (b1_1)
 	#define b2  (b1_2)
 	#define b3  (b1_3)
 #else
-#if defined(SDCC_NOOVERLAY)
+#if defined(__SDCC_NOOVERLAY)
 	.area DSEG    (DATA)
 #else
 	.area OSEG    (OVR,DATA)
@@ -490,7 +490,7 @@
 	__endasm;
 }
 
-#elif defined(SDCC_USE_XSTACK) && defined(SDCC_STACK_AUTO)
+#elif defined(__SDCC_USE_XSTACK) && defined(__SDCC_STACK_AUTO)
 
 void
 _mullong_dummy (void) __naked
@@ -629,7 +629,7 @@
 	short a ;
 	char b;
 	long c ;};
-#if defined(SDCC_hc08)
+#if defined(__SDCC_hc08) || defined(__SDCC_s08)
 /* big endian order */
 union bil {
         struct {unsigned char b3,b2,b1,b0 ;} b;
@@ -647,7 +647,7 @@
 } ;
 #endif
 
-#if defined(SDCC)
+#if defined(__SDCC)
  #include <sdcc-lib.h>
 #endif
 
@@ -671,7 +671,7 @@
                         |3.0|         G
                           |-------> only this side 32 x 32 -> 32
 */
-#if defined(SDCC_USE_XSTACK)
+#if defined(__SDCC_USE_XSTACK)
 // currently the original code without u fails with --xstack
 // it runs out of pointer registers
 long
diff -Nru sdcc-3.1.0+dfsg/device/lib/_mullonglong.c sdcc-3.2.0+dfsg/device/lib/_mullonglong.c
--- sdcc-3.1.0+dfsg/device/lib/_mullonglong.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_mullonglong.c	2012-04-02 09:59:13.000000000 +0000
@@ -0,0 +1,52 @@
+/*-------------------------------------------------------------------------
+   _mullonglong.c - routine for multiplication of 64 bit long long
+
+   Copyright (C) 2012, Philipp Klaus Krause . philipp@informatik.uni-frankfurt.de
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+#pragma std_c99
+
+#include <stdint.h>
+
+#ifdef __SDCC_LONGLONG
+
+long long _mullonglong(long long ll, long long lr)
+{
+  unsigned long long ret = 0ull;
+  unsigned char *l = (unsigned char *)(&ll);
+  unsigned char *r = (unsigned char *)(&lr);
+  unsigned char i, j;
+
+  for (i = 0; i < sizeof (long long); i++)
+    {
+      for(j = 0; (i + j) < sizeof (long long); j++)
+      ret += ((unsigned short)(l[i] * r [j])) << ((i + j) * 8);
+    }
+
+  return(ret);
+}
+
+#endif
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/_realloc.c sdcc-3.2.0+dfsg/device/lib/_realloc.c
--- sdcc-3.1.0+dfsg/device/lib/_realloc.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_realloc.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -30,7 +30,7 @@
 #include <malloc.h>
 #include <string.h>
 
-#if defined(SDCC_STACK_AUTO) || defined(SDCC_z80) || defined(SDCC_z180) || defined(SDCC_gbz80)
+#if defined(__SDCC_STACK_AUTO) || defined(__SDCC_z80) || defined(__SDCC_z180) || defined(__SDCC_gbz80)
   #define CRITICAL __critical
 #else
   #define CRITICAL
diff -Nru sdcc-3.1.0+dfsg/device/lib/_rlslonglong.c sdcc-3.2.0+dfsg/device/lib/_rlslonglong.c
--- sdcc-3.1.0+dfsg/device/lib/_rlslonglong.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_rlslonglong.c	2012-04-02 09:59:13.000000000 +0000
@@ -0,0 +1,41 @@
+/*-------------------------------------------------------------------------
+   _rlslonglong.c - routine for left shift of 64 bit long long
+
+   Copyright (C) 2012, Philipp Klaus Krause . philipp@informatik.uni-frankfurt.de
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+#pragma std_c99
+
+#include <stdint.h>
+
+#ifdef __SDCC_LONGLONG
+
+long long _rlslonglong(long long l, signed char s)
+{
+	return((unsigned long long)(l) << s);
+}
+
+#endif
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/_rlulonglong.c sdcc-3.2.0+dfsg/device/lib/_rlulonglong.c
--- sdcc-3.1.0+dfsg/device/lib/_rlulonglong.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_rlulonglong.c	2012-04-02 09:59:13.000000000 +0000
@@ -0,0 +1,58 @@
+/*-------------------------------------------------------------------------
+   _rlulonglong.c - routine for left shift of 64 bit unsigned long long
+
+   Copyright (C) 2012, Philipp Klaus Krause . philipp@informatik.uni-frankfurt.de
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+#pragma std_c99
+
+#include <stdint.h>
+
+#ifdef __SDCC_LONGLONG
+
+unsigned long long _rlulonglong(unsigned long long l, signed char s)
+{
+	uint32_t *const top = (uint32_t *)((char *)(&l) + 4);
+	uint16_t *const middle = (uint16_t *)((char *)(&l) + 2);
+	uint32_t *const bottom = (uint32_t *)(&l);
+	uint16_t *const b = (uint16_t *)(&l);
+
+	for(;s >= 16; s-= 16)
+	{
+		b[3] = b[2];
+		b[2] = b[1];
+		b[1] = b[0];
+		b[0] = 0;
+	}
+
+	(*top) <<= s;
+	(*top) |= (((uint32_t)((*middle) & 0xffffu) << s) >> 16);
+	(*bottom) <<= s;
+
+	return(l);
+}
+
+#endif
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/_rrslonglong.c sdcc-3.2.0+dfsg/device/lib/_rrslonglong.c
--- sdcc-3.1.0+dfsg/device/lib/_rrslonglong.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_rrslonglong.c	2012-04-02 09:59:13.000000000 +0000
@@ -0,0 +1,57 @@
+/*-------------------------------------------------------------------------
+   _rrulonglong.c - routine for right shift of 64 bit unsigned long long
+
+   Copyright (C) 2012, Philipp Klaus Krause . philipp@informatik.uni-frankfurt.de
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+#pragma std_c99
+
+#include <stdint.h>
+
+#ifdef __SDCC_LONGLONG
+// This function is the same as the one from rrulonglong_rrx_s.c, except for the type of top.
+long long _rrslonglong(long long l, signed char s)
+{
+	int32_t *top = (uint32_t *)((char *)(&l) + 4);
+	uint16_t *middle = (uint16_t *)((char *)(&l) + 3);
+	uint32_t *bottom = (uint32_t *)(&l);
+	uint16_t *b = (uint16_t *)(&l);
+
+	for(;s >= 16; s-= 16)
+	{
+		b[0] = b[1];
+		b[1] = b[2];
+		b[2] = b[3];
+		b[3] = (b[3] & 0x8000) ? 0xffff : 0x000000;
+	}
+
+	(*bottom) >>= s;
+	(*bottom) |= ((uint32_t)((*middle) >> s) << 16);
+	(*top) |= (((*middle) & 0xffff0000) >> s);
+
+	return(l);
+}
+#endif
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/_rrulonglong.c sdcc-3.2.0+dfsg/device/lib/_rrulonglong.c
--- sdcc-3.1.0+dfsg/device/lib/_rrulonglong.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_rrulonglong.c	2012-04-02 09:59:13.000000000 +0000
@@ -0,0 +1,57 @@
+/*-------------------------------------------------------------------------
+   _rrulonglong.c - routine for right shift of 64 bit unsigned long long
+
+   Copyright (C) 2012, Philipp Klaus Krause . philipp@informatik.uni-frankfurt.de
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+#pragma std_c99
+
+#include <stdint.h>
+
+#ifdef __SDCC_LONGLONG
+// This function is the same as the one from rrslonglong_rrx_s.c, except for the type of top, and b[3].
+unsigned long long _rrulonglong(unsigned long long l, signed char s)
+{
+	uint32_t *const top = (uint32_t *)((char *)(&l) + 4);
+	uint16_t *const middle = (uint16_t *)((char *)(&l) + 3);
+	uint32_t *const bottom = (uint32_t *)(&l);
+	uint16_t *const b = (uint16_t *)(&l);
+
+	for(;s >= 16; s -= 16)
+	{
+		b[0] = b[1];
+		b[1] = b[2];
+		b[2] = b[3];
+		b[3] = 0x000000;
+	}
+
+	(*bottom) >>= s;
+	(*middle) |= (((*middle) & 0xffff0000ul) >> s);
+	(*top) |= (((*middle) & 0xffff0000ul) >> s);
+
+	return(l);
+}
+#endif
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/_schar2fs.c sdcc-3.2.0+dfsg/device/lib/_schar2fs.c
--- sdcc-3.1.0+dfsg/device/lib/_schar2fs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_schar2fs.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@
 -------------------------------------------------------------------------*/
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_ser.c sdcc-3.2.0+dfsg/device/lib/_ser.c
--- sdcc-3.1.0+dfsg/device/lib/_ser.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_ser.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_setjmp.c sdcc-3.2.0+dfsg/device/lib/_setjmp.c
--- sdcc-3.1.0+dfsg/device/lib/_setjmp.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_setjmp.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -28,9 +28,10 @@
 
 #include <8051.h>
 #include <sdcc-lib.h>
+#define __SDCC_HIDE_LONGJMP
 #include <setjmp.h>
 
-#if defined(SDCC_STACK_AUTO) && defined(SDCC_USE_XSTACK)
+#if defined(__SDCC_STACK_AUTO) && defined(__SDCC_USE_XSTACK)
 
 static void dummy (void) __naked
 {
@@ -101,7 +102,7 @@
 ;     genPointerSet
 ;     genGenPointerSet
 	lcall	__gptrput
-#ifdef SDCC_MODEL_HUGE
+#ifdef __SDCC_MODEL_HUGE
 	inc	dptr
 ;../../device/lib/_setjmp.c:189:*buf   = *((unsigned char __data *)SP - 2);
 ;     genCast
@@ -187,9 +188,9 @@
 ;     genPointerSet
 ;     genNearPointerSet
 	mov	@r0,a
-#ifdef SDCC_MODEL_HUGE
+#ifdef __SDCC_MODEL_HUGE
 	inc	dptr
-;../../device/lib/_setjmp.c:199:*((unsigned char __data *) lsp - 1) = *buf;
+;../../device/lib/_setjmp.c:199:*((unsigned char __data *) lsp - 2) = *buf;
 ;     genMinus
 ;     genMinusDec
 	dec	r0
@@ -218,7 +219,7 @@
 	__endasm;
 }
 
-#elif defined(SDCC_STACK_AUTO)
+#elif defined(__SDCC_STACK_AUTO)
 
 static void dummy (void) __naked
 {
@@ -277,7 +278,7 @@
 ;     genPointerSet
 ;     genGenPointerSet
 	lcall	__gptrput
-#ifdef SDCC_MODEL_HUGE
+#ifdef __SDCC_MODEL_HUGE
 	inc	dptr
 ;../../device/lib/_setjmp.c:129:*buf++ = *((unsigned char __data *)SP - 2);
 ;     genCast
@@ -321,7 +322,7 @@
 	mov	r0,sp
 	dec	r0
 	dec	r0
-#ifdef SDCC_MODEL_HUGE
+#ifdef __SDCC_MODEL_HUGE
 	dec	r0
 #endif
 	mov	ar2,@r0
@@ -362,7 +363,7 @@
 ;     genPointerSet
 ;     genNearPointerSet
 	mov	@r0,a
-#ifdef SDCC_MODEL_HUGE
+#ifdef __SDCC_MODEL_HUGE
 	inc	dptr
 ;../../device/lib/_setjmp.c:34:*((unsigned char __data *) lsp - 2) = *buf;
 ;     genCast
@@ -405,7 +406,7 @@
     /* registers would have been saved on the
        stack anyway so we need to save SP
        and the return address */
-#ifdef SDCC_USE_XSTACK
+#ifdef __SDCC_USE_XSTACK
     *buf++ = spx;
     *buf++ = bpx;
 #endif
@@ -413,7 +414,7 @@
 //    *buf++ = bp;
     *buf++ = *((unsigned char __data *) SP - 0);
     *buf++ = *((unsigned char __data *) SP - 1);
-#ifdef SDCC_MODEL_HUGE
+#ifdef __SDCC_MODEL_HUGE
     *buf++ = *((unsigned char __data *) SP - 2);
 #endif
     return 0;
@@ -423,7 +424,7 @@
 {
     unsigned char lsp;
 
-#ifdef SDCC_USE_XSTACK
+#ifdef __SDCC_USE_XSTACK
     spx = *buf++;
     bpx = *buf++;
 #endif
@@ -431,7 +432,7 @@
 //    bp = *buf++;
     *((unsigned char __data *) lsp - 0) = *buf++;
     *((unsigned char __data *) lsp - 1) = *buf++;
-#ifdef SDCC_MODEL_HUGE
+#ifdef __SDCC_MODEL_HUGE
     *((unsigned char __data *) lsp - 2) = *buf++;
 #endif
     SP = lsp;
@@ -439,3 +440,4 @@
 }
 
 #endif
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/_sint2fs.c sdcc-3.2.0+dfsg/device/lib/_sint2fs.c
--- sdcc-3.1.0+dfsg/device/lib/_sint2fs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_sint2fs.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@
 -------------------------------------------------------------------------*/
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_slong2fs.c sdcc-3.2.0+dfsg/device/lib/_slong2fs.c
--- sdcc-3.1.0+dfsg/device/lib/_slong2fs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_slong2fs.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@
 -------------------------------------------------------------------------*/
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_spx.c sdcc-3.2.0+dfsg/device/lib/_spx.c
--- sdcc-3.1.0+dfsg/device/lib/_spx.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_spx.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_startup.c sdcc-3.2.0+dfsg/device/lib/_startup.c
--- sdcc-3.1.0+dfsg/device/lib/_startup.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_startup.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -35,12 +35,12 @@
    variables if external data memory needs to be
    enabled first. */
 
-#if defined(SDCC_ds390) || defined(SDCC_ds400)
+#if defined(__SDCC_ds390) || defined(__SDCC_ds400)
 
 /* Disable "ISO C forbids an empty source file" warning message */
 #pragma disable_warning 190
 
-#elif defined(SDCC_mcs51) || defined(SDCC_z80)
+#elif defined(__SDCC_mcs51) || defined(__SDCC_z80)
 
 unsigned char _sdcc_external_startup (void) __nonbanked
 {
diff -Nru sdcc-3.1.0+dfsg/device/lib/_strcat.c sdcc-3.2.0+dfsg/device/lib/_strcat.c
--- sdcc-3.1.0+dfsg/device/lib/_strcat.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_strcat.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_strchr.c sdcc-3.2.0+dfsg/device/lib/_strchr.c
--- sdcc-3.1.0+dfsg/device/lib/_strchr.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_strchr.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -13,7 +13,7 @@
    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 
+   You should have received a copy of the GNU General Public License
    along with this library; see the file COPYING. If not, write to the
    Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
diff -Nru sdcc-3.1.0+dfsg/device/lib/_strcmp.c sdcc-3.2.0+dfsg/device/lib/_strcmp.c
--- sdcc-3.1.0+dfsg/device/lib/_strcmp.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_strcmp.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_strcpy.c sdcc-3.2.0+dfsg/device/lib/_strcpy.c
--- sdcc-3.1.0+dfsg/device/lib/_strcpy.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_strcpy.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_strcspn.c sdcc-3.2.0+dfsg/device/lib/_strcspn.c
--- sdcc-3.1.0+dfsg/device/lib/_strcspn.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_strcspn.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_strlen.c sdcc-3.2.0+dfsg/device/lib/_strlen.c
--- sdcc-3.1.0+dfsg/device/lib/_strlen.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_strlen.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -29,7 +29,7 @@
 
 #include <string.h>
 
-#if (!defined (SDCC_mcs51))
+#if (!defined (__SDCC_mcs51))
 
   /* Generic routine first */
   size_t strlen ( const char * str )
@@ -44,7 +44,7 @@
 
 #else
 
-#if defined(SDCC)
+#if defined(__SDCC)
  #include <sdcc-lib.h>
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_strncat.c sdcc-3.2.0+dfsg/device/lib/_strncat.c
--- sdcc-3.1.0+dfsg/device/lib/_strncat.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_strncat.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_strncmp.c sdcc-3.2.0+dfsg/device/lib/_strncmp.c
--- sdcc-3.1.0+dfsg/device/lib/_strncmp.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_strncmp.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_strncpy.c sdcc-3.2.0+dfsg/device/lib/_strncpy.c
--- sdcc-3.1.0+dfsg/device/lib/_strncpy.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_strncpy.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_strpbrk.c sdcc-3.2.0+dfsg/device/lib/_strpbrk.c
--- sdcc-3.1.0+dfsg/device/lib/_strpbrk.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_strpbrk.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_strrchr.c sdcc-3.2.0+dfsg/device/lib/_strrchr.c
--- sdcc-3.1.0+dfsg/device/lib/_strrchr.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_strrchr.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_strspn.c sdcc-3.2.0+dfsg/device/lib/_strspn.c
--- sdcc-3.1.0+dfsg/device/lib/_strspn.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_strspn.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_strstr.c sdcc-3.2.0+dfsg/device/lib/_strstr.c
--- sdcc-3.1.0+dfsg/device/lib/_strstr.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_strstr.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/_strtok.c sdcc-3.2.0+dfsg/device/lib/_strtok.c
--- sdcc-3.1.0+dfsg/device/lib/_strtok.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_strtok.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -28,7 +28,7 @@
 
 #include "string.h" 
 
-#if defined(SDCC_MODEL_LARGE) || defined (SDCC_MODEL_FLAT24)
+#if defined(__SDCC_MODEL_LARGE) || defined (__SDCC_MODEL_FLAT24)
 #pragma noinduction
 #pragma noinvariant
 #endif
@@ -69,3 +69,4 @@
 	else
 		return NULL;
 }
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/_uchar2fs.c sdcc-3.2.0+dfsg/device/lib/_uchar2fs.c
--- sdcc-3.1.0+dfsg/device/lib/_uchar2fs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_uchar2fs.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@
 -------------------------------------------------------------------------*/
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_uint2fs.c sdcc-3.2.0+dfsg/device/lib/_uint2fs.c
--- sdcc-3.1.0+dfsg/device/lib/_uint2fs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_uint2fs.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -26,7 +26,7 @@
    might be covered by the GNU General Public License.
 -------------------------------------------------------------------------*/
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/_ulong2fs.c sdcc-3.2.0+dfsg/device/lib/_ulong2fs.c
--- sdcc-3.1.0+dfsg/device/lib/_ulong2fs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/_ulong2fs.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@
 -------------------------------------------------------------------------*/
 
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/abs.c sdcc-3.2.0+dfsg/device/lib/abs.c
--- sdcc-3.1.0+dfsg/device/lib/abs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/abs.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -28,9 +28,9 @@
 
 #include <stdlib.h>
 
-#if defined (SDCC_mcs51)
+#if defined (__SDCC_mcs51)
 
-#if defined(SDCC)
+#if defined(__SDCC)
  #include <sdcc-lib.h>
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/acosf.c sdcc-3.2.0+dfsg/device/lib/acosf.c
--- sdcc-3.1.0+dfsg/device/lib/acosf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/acosf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -13,7 +13,7 @@
    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 
+   You should have received a copy of the GNU General Public License
    along with this library; see the file COPYING. If not, write to the
    Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
@@ -31,11 +31,7 @@
 #include <math.h>
 #include <stdbool.h>
 
-#ifndef BOOL
-#define BOOL _Bool
-#endif
-
-float asincosf(const float x, const BOOL isacos);
+float asincosf(const float x, const bool isacos);
 
 float acosf(const float x) _FLOAT_FUNC_REENTRANT
 {
diff -Nru sdcc-3.1.0+dfsg/device/lib/asincosf.c sdcc-3.2.0+dfsg/device/lib/asincosf.c
--- sdcc-3.1.0+dfsg/device/lib/asincosf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/asincosf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -13,7 +13,7 @@
    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 
+   You should have received a copy of the GNU General Public License
    along with this library; see the file COPYING. If not, write to the
    Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
@@ -35,10 +35,6 @@
 #include <errno.h>
 #include <stdbool.h>
 
-#ifndef BOOL
-#define BOOL _Bool
-#endif
-
 #define P1  0.933935835E+0
 #define P2 -0.504400557E+0
 #define Q0  0.560363004E+1
@@ -48,11 +44,11 @@
 #define P(g) (P2 * g + P1)
 #define Q(g) ((Q2 * g + Q1) * g + Q0)
 
-float asincosf(const float x, const BOOL isacos)
+float asincosf(const float x, const bool isacos)
 {
     float y, g, r;
     unsigned char i;
-    BOOL quartPI = isacos;
+    bool quartPI = isacos;
 
     static const float a[2] = { 0.0, QUART_PI };
     static const float b[2] = { HALF_PI, QUART_PI };
diff -Nru sdcc-3.1.0+dfsg/device/lib/asinf.c sdcc-3.2.0+dfsg/device/lib/asinf.c
--- sdcc-3.1.0+dfsg/device/lib/asinf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/asinf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -13,7 +13,7 @@
    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 
+   You should have received a copy of the GNU General Public License
    along with this library; see the file COPYING. If not, write to the
    Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
@@ -31,11 +31,7 @@
 #include <math.h>
 #include <stdbool.h>
 
-#ifndef BOOL
-#define BOOL _Bool
-#endif
-
-float asincosf(const float x, const BOOL isacos);
+float asincosf(const float x, const bool isacos);
 
 float asinf(const float x) _FLOAT_FUNC_REENTRANT
 {
diff -Nru sdcc-3.1.0+dfsg/device/lib/assert.c sdcc-3.2.0+dfsg/device/lib/assert.c
--- sdcc-3.1.0+dfsg/device/lib/assert.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/assert.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/atan2f.c sdcc-3.2.0+dfsg/device/lib/atan2f.c
--- sdcc-3.1.0+dfsg/device/lib/atan2f.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/atan2f.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/atanf.c sdcc-3.2.0+dfsg/device/lib/atanf.c
--- sdcc-3.1.0+dfsg/device/lib/atanf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/atanf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2,1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -46,7 +46,7 @@
 #define K2  0.7320508076 /* sqrt(3)-1 */
 #define K3  1.7320508076 /* sqrt(3)   */
 
-#ifdef SDCC_mcs51
+#ifdef __SDCC_mcs51
    #define myconst __code
 #else
    #define myconst const
diff -Nru sdcc-3.1.0+dfsg/device/lib/bpx.c sdcc-3.2.0+dfsg/device/lib/bpx.c
--- sdcc-3.1.0+dfsg/device/lib/bpx.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/bpx.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -26,7 +26,7 @@
    might be covered by the GNU General Public License.
 -------------------------------------------------------------------------*/
 
-#if defined(SDCC_mcs51)
+#if defined(__SDCC_mcs51)
   __data unsigned char bpx ;
 #else
   __data unsigned int bpx ;
diff -Nru sdcc-3.1.0+dfsg/device/lib/ceilf.c sdcc-3.2.0+dfsg/device/lib/ceilf.c
--- sdcc-3.1.0+dfsg/device/lib/ceilf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/ceilf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/clean.mk sdcc-3.2.0+dfsg/device/lib/clean.mk
--- sdcc-3.1.0+dfsg/device/lib/clean.mk	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/clean.mk	2012-05-29 07:51:36.000000000 +0000
@@ -1,4 +1,4 @@
-CLEANALLPORTS = ds390 ds400 gbz80 hc08 huge large mcs51 medium pic pic16 small z80
+CLEANALLPORTS = ds390 ds400 gbz80 hc08 s08 huge large mcs51 medium pic pic16 small z80 z180 r2k r3ka
 include $(srcdir)/incl.mk
 
 # Deleting all files created by building the program
diff -Nru sdcc-3.1.0+dfsg/device/lib/cosf.c sdcc-3.2.0+dfsg/device/lib/cosf.c
--- sdcc-3.1.0+dfsg/device/lib/cosf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/cosf.c	2012-03-13 10:17:10.000000000 +0000
@@ -1,11 +1,11 @@
 /*-------------------------------------------------------------------------
    cosf.c - Computes cos(x) where x is a 32-bit float.
 
-   Copyright (C) 2001, 2002, Jesus Calvino-Fraga, jesusc@ieee.org 
+   Copyright (C) 2001, 2002, Jesus Calvino-Fraga, jesusc@ieee.org
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -13,7 +13,7 @@
    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 
+   You should have received a copy of the GNU General Public License
    along with this library; see the file COPYING. If not, write to the
    Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
@@ -31,11 +31,7 @@
 #include <math.h>
 #include <stdbool.h>
 
-#ifndef BOOL
-#define BOOL _Bool
-#endif
-
-float sincosf(const float x, const BOOL iscos);
+float sincosf(const float x, const bool iscos);
 
 float cosf(const float x) _FLOAT_FUNC_REENTRANT
 {
diff -Nru sdcc-3.1.0+dfsg/device/lib/coshf.c sdcc-3.2.0+dfsg/device/lib/coshf.c
--- sdcc-3.1.0+dfsg/device/lib/coshf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/coshf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/cotf.c sdcc-3.2.0+dfsg/device/lib/cotf.c
--- sdcc-3.1.0+dfsg/device/lib/cotf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/cotf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -13,7 +13,7 @@
    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 
+   You should have received a copy of the GNU General Public License
    along with this library; see the file COPYING. If not, write to the
    Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
@@ -32,11 +32,7 @@
 #include <errno.h>
 #include <stdbool.h>
 
-#ifndef BOOL
-#define BOOL _Bool
-#endif
-
-float tancotf(const float x, const BOOL iscotan);
+float tancotf(const float x, const bool iscotan);
 
 float cotf(const float x) _FLOAT_FUNC_REENTRANT
 {
diff -Nru sdcc-3.1.0+dfsg/device/lib/ds390/Makefile.in sdcc-3.2.0+dfsg/device/lib/ds390/Makefile.in
--- sdcc-3.1.0+dfsg/device/lib/ds390/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/ds390/Makefile.in	2012-02-10 10:16:50.000000000 +0000
@@ -1,19 +1,19 @@
+# libc/ds390 Makefile
+
 VPATH  = @srcdir@
 srcdir = @srcdir@
 top_builddir = @top_builddir@
 
-AR_S            = @AR@ @AR_S_FLAG@
-
-LIB_TYPE        = @LIB_TYPE@
+LIB_TYPE     = @LIB_TYPE@
 
-CC = ../../../bin/sdcc
+CC = $(top_builddir)/bin/sdcc
 
 # override PORTDIR defined by super (parent) makefile
 override PORTDIR = ../build/ds390
 
 #VERBOSE = --verbose
 
-OBJECTS = tinibios.rel memcpyx.rel  lcd390.rel i2c390.rel rtc390.rel putchar.rel gptr_cmp.rel
+OBJECTS = tinibios.rel memcpyx.rel lcd390.rel i2c390.rel rtc390.rel putchar.rel gptr_cmp.rel
 
 SOURCES = $(patsubst %.rel,%.c,$(OBJECTS))
 
@@ -32,14 +32,13 @@
 $(PORTDIR)/libds390.lib: $(OBJECTS)
 ifeq ($(LIB_TYPE), SDCCLIB)
 	rm -f $@; \
-	../../../bin/sdcclib -a $@ $(OBJECTS)
+	$(top_builddir)/bin/sdcclib -a $@ $(OBJECTS)
 else
   ifeq ($(LIB_TYPE), AR)
-	$(AR_S) -cq $@ $(OBJECTS)
+	$(top_builddir)/bin/sdar -rcS $@ $(OBJECTS)
   else
     ifeq ($(LIB_TYPE), RANLIB)
-	$(AR_S) -cq $@ $(OBJECTS)
-	$(top_builddir)/bin/sdranlib $@
+	$(top_builddir)/bin/sdar -rc $@ $(OBJECTS)
     else
 	rm -f $@;
 	for libfile in $(basename $(OBJECTS)); do echo $$libfile >>$@; done
diff -Nru sdcc-3.1.0+dfsg/device/lib/ds390/gptr_cmp.c sdcc-3.2.0+dfsg/device/lib/ds390/gptr_cmp.c
--- sdcc-3.1.0+dfsg/device/lib/ds390/gptr_cmp.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/ds390/gptr_cmp.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
@@ -26,7 +26,7 @@
 ;  might be covered by the GNU General Public License.
 ;------------------------------------------------------------------------*/
 
-#ifdef SDCC_MODEL_FLAT24
+#ifdef __SDCC_MODEL_FLAT24
 
 static void dummy(void) __naked
 {
@@ -95,3 +95,4 @@
 }
 
 #endif
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/ds390/i2c390.c sdcc-3.2.0+dfsg/device/lib/ds390/i2c390.c
--- sdcc-3.1.0+dfsg/device/lib/ds390/i2c390.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/ds390/i2c390.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/ds390/lcd390.c sdcc-3.2.0+dfsg/device/lib/ds390/lcd390.c
--- sdcc-3.1.0+dfsg/device/lib/ds390/lcd390.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/ds390/lcd390.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/ds390/memcpyx.c sdcc-3.2.0+dfsg/device/lib/ds390/memcpyx.c
--- sdcc-3.1.0+dfsg/device/lib/ds390/memcpyx.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/ds390/memcpyx.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/ds390/putchar.c sdcc-3.2.0+dfsg/device/lib/ds390/putchar.c
--- sdcc-3.1.0+dfsg/device/lib/ds390/putchar.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/ds390/putchar.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/ds390/rtc390.c sdcc-3.2.0+dfsg/device/lib/ds390/rtc390.c
--- sdcc-3.1.0+dfsg/device/lib/ds390/rtc390.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/ds390/rtc390.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/ds390/tinibios.c sdcc-3.2.0+dfsg/device/lib/ds390/tinibios.c
--- sdcc-3.1.0+dfsg/device/lib/ds390/tinibios.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/ds390/tinibios.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/ds400/Makefile.in sdcc-3.2.0+dfsg/device/lib/ds400/Makefile.in
--- sdcc-3.1.0+dfsg/device/lib/ds400/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/ds400/Makefile.in	2012-02-10 10:16:50.000000000 +0000
@@ -1,12 +1,12 @@
+# libc/ds400 Makefile
+
 VPATH  = @srcdir@
 srcdir = @srcdir@
 top_builddir = @top_builddir@
 
-AR_S            = @AR@ @AR_S_FLAG@
-
 LIB_TYPE     = @LIB_TYPE@
 
-CC = ../../../bin/sdcc
+CC = $(top_builddir)/bin/sdcc
 
 # override PORTDIR defined by super (parent) makefile
 override PORTDIR = ../build/ds400
@@ -32,14 +32,13 @@
 $(PORTDIR)/libds400.lib: $(OBJECTS)
 ifeq ($(LIB_TYPE), SDCCLIB)
 	rm -f $@; \
-	../../../bin/sdcclib -a $@ $(OBJECTS)
+	$(top_builddir)/bin/sdcclib -a $@ $(OBJECTS)
 else
   ifeq ($(LIB_TYPE), AR)
-	$(AR_S) -cq $@ $(OBJECTS)
+	$(top_builddir)/bin/sdar -rcS $@ $(OBJECTS)
   else
     ifeq ($(LIB_TYPE), RANLIB)
-	$(AR_S) -cq $@ $(OBJECTS)
-	$(top_builddir)/bin/sdranlib $@
+	$(top_builddir)/bin/sdar -rc $@ $(OBJECTS)
     else
 	rm -f $@;
 	for libfile in $(basename $(OBJECTS)); do echo $$libfile >>$@; done
diff -Nru sdcc-3.1.0+dfsg/device/lib/ds400/ds400rom.c sdcc-3.2.0+dfsg/device/lib/ds400/ds400rom.c
--- sdcc-3.1.0+dfsg/device/lib/ds400/ds400rom.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/ds400/ds400rom.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/ds400/memcpyx.c sdcc-3.2.0+dfsg/device/lib/ds400/memcpyx.c
--- sdcc-3.1.0+dfsg/device/lib/ds400/memcpyx.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/ds400/memcpyx.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/ds400/tinibios.c sdcc-3.2.0+dfsg/device/lib/ds400/tinibios.c
--- sdcc-3.1.0+dfsg/device/lib/ds400/tinibios.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/ds400/tinibios.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/errno.c sdcc-3.2.0+dfsg/device/lib/errno.c
--- sdcc-3.1.0+dfsg/device/lib/errno.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/errno.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/expf.c sdcc-3.2.0+dfsg/device/lib/expf.c
--- sdcc-3.1.0+dfsg/device/lib/expf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/expf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -13,7 +13,7 @@
    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 
+   You should have received a copy of the GNU General Public License
    along with this library; see the file COPYING. If not, write to the
    Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
@@ -31,18 +31,14 @@
 
 /* Version 1.0 - Initial release */
 
-#define SDCC_MATH_LIB
+#define __SDCC_MATH_LIB
 #include <math.h>
 #include <errno.h>
 #include <stdbool.h>
 
-#ifndef BOOL
-#define BOOL _Bool
-#endif
-
 #ifdef MATH_ASM_MCS51
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 // TODO: share with other temps
@@ -336,7 +332,7 @@
 {
     int n;
     float xn, g, r, z, y;
-	BOOL sign;
+    bool sign;
 
     if(x>=0.0)
         { y=x;  sign=0; }
diff -Nru sdcc-3.1.0+dfsg/device/lib/fabsf.c sdcc-3.2.0+dfsg/device/lib/fabsf.c
--- sdcc-3.1.0+dfsg/device/lib/fabsf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/fabsf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/floorf.c sdcc-3.2.0+dfsg/device/lib/floorf.c
--- sdcc-3.1.0+dfsg/device/lib/floorf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/floorf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/frexpf.c sdcc-3.2.0+dfsg/device/lib/frexpf.c
--- sdcc-3.1.0+dfsg/device/lib/frexpf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/frexpf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/gbz80/Makefile.in sdcc-3.2.0+dfsg/device/lib/gbz80/Makefile.in
--- sdcc-3.1.0+dfsg/device/lib/gbz80/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/gbz80/Makefile.in	2012-04-02 09:59:13.000000000 +0000
@@ -4,14 +4,10 @@
 srcdir = @srcdir@
 top_builddir = @top_builddir@
 
-AR_S            = @AR@ @AR_S_FLAG@
+LIB_TYPE     = @LIB_TYPE@
 
-LIB_TYPE        = @LIB_TYPE@
-
-TOPDIR = ../../..
-
-SCC = $(TOPDIR)/bin/sdcc -mgbz80
-SAS = $(TOPDIR)/bin/sdasgb
+SCC = $(top_builddir)/bin/sdcc -mgbz80
+SAS = $(top_builddir)/bin/sdasgb
 
 # override PORTDIR defined by super (parent) makefile
 override PORTDIR = ../build/gbz80
@@ -26,6 +22,15 @@
   _divulong.c \
   _mullong.c
 
+Z80_LONGLONG = $(COMMON_LONGLONG) \
+  _rrulonglong.c \
+  _rrslonglong.c \
+  _rlulonglong.c \
+  _rlslonglong.c \
+  _mullonglong.c \
+  _divslonglong.c \
+  _divulonglong.c
+
 Z80_SDCC = $(COMMON_SDCC) \
   _itoa.c \
   _ltoa.c \
@@ -35,8 +40,8 @@
   _strlen.c \
   _memmove.c
 
-Z80SOURCES = $(addprefix ../,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_SDCC))
-Z8OBJECTS = $(patsubst %.c,%.rel,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_SDCC))
+Z80SOURCES = $(addprefix ../,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_LONGLONG) $(Z80_SDCC))
+Z8OBJECTS = $(patsubst %.c,%.rel,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_LONGLONG) $(Z80_SDCC))
 
 OBJ = div.rel mul.rel \
       putchar.rel shift.rel stubs.rel crt0_rle.rel heap.rel fstubs.rel crtcall.rel
@@ -56,14 +61,13 @@
 $(PORTDIR)/$(LIB): $(OBJ) $(Z8OBJECTS) Makefile
 ifeq ($(LIB_TYPE), SDCCLIB)
 	rm -f $@; \
-	../../../bin/sdcclib -a $@ $(OBJ) $(Z8OBJECTS)
+	$(top_builddir)/bin/sdcclib -a $@ $(OBJ) $(Z8OBJECTS)
 else
   ifeq ($(LIB_TYPE), AR)
-	$(AR_S) -cq $@ $(OBJ) $(Z8OBJECTS)
+	$(top_builddir)/bin/sdar -rcS $@ $(OBJ) $(Z8OBJECTS)
   else
     ifeq ($(LIB_TYPE), RANLIB)
-	$(AR_S) -cq $@ $(OBJ) $(Z8OBJECTS)
-	$(top_builddir)/bin/sdranlib $@
+	$(top_builddir)/bin/sdar -rc $@ $(OBJ) $(Z8OBJECTS)
     else
 	rm -f $@; \
 	for i in $(basename $(OBJ) $(Z8OBJECTS)); do echo $$i >>$@; done
diff -Nru sdcc-3.1.0+dfsg/device/lib/gbz80/crt0.s sdcc-3.2.0+dfsg/device/lib/gbz80/crt0.s
--- sdcc-3.1.0+dfsg/device/lib/gbz80/crt0.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/gbz80/crt0.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/gbz80/crt0_rle.s sdcc-3.2.0+dfsg/device/lib/gbz80/crt0_rle.s
--- sdcc-3.1.0+dfsg/device/lib/gbz80/crt0_rle.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/gbz80/crt0_rle.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/gbz80/crtcall.s sdcc-3.2.0+dfsg/device/lib/gbz80/crtcall.s
--- sdcc-3.1.0+dfsg/device/lib/gbz80/crtcall.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/gbz80/crtcall.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/gbz80/div.s sdcc-3.2.0+dfsg/device/lib/gbz80/div.s
--- sdcc-3.1.0+dfsg/device/lib/gbz80/div.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/gbz80/div.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/gbz80/fstubs.s sdcc-3.2.0+dfsg/device/lib/gbz80/fstubs.s
--- sdcc-3.1.0+dfsg/device/lib/gbz80/fstubs.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/gbz80/fstubs.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/gbz80/heap.s sdcc-3.2.0+dfsg/device/lib/gbz80/heap.s
--- sdcc-3.1.0+dfsg/device/lib/gbz80/heap.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/gbz80/heap.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/gbz80/mul.s sdcc-3.2.0+dfsg/device/lib/gbz80/mul.s
--- sdcc-3.1.0+dfsg/device/lib/gbz80/mul.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/gbz80/mul.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/gbz80/putchar.s sdcc-3.2.0+dfsg/device/lib/gbz80/putchar.s
--- sdcc-3.1.0+dfsg/device/lib/gbz80/putchar.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/gbz80/putchar.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/gbz80/shift.s sdcc-3.2.0+dfsg/device/lib/gbz80/shift.s
--- sdcc-3.1.0+dfsg/device/lib/gbz80/shift.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/gbz80/shift.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/gbz80/stubs.s sdcc-3.2.0+dfsg/device/lib/gbz80/stubs.s
--- sdcc-3.1.0+dfsg/device/lib/gbz80/stubs.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/gbz80/stubs.s	2012-04-02 09:59:13.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
@@ -29,28 +29,34 @@
 ; Just stubs - not copyrightable
 
         ;; Stubs to match between function names
-        .area   _CODE
+        .area	_CODE
 
         .globl  __mullong
         .globl  __modslong
         .globl  __modulong
         .globl  __divslong
         .globl  __divulong
-        .globl  __divschar_rrx_s
-        .globl  __divsint_rrx_s
-        .globl  __divuchar_rrx_s
-        .globl  __divuint_rrx_s
-        .globl  __mulschar_rrx_s
-        .globl  __muluchar_rrx_s
-        .globl  __mulint_rrx_s
-        .globl  __moduchar_rrx_s
+        .globl	__divschar_rrx_s
+        .globl	__divuchar_rrx_s
+        .globl	__divsuchar_rrx_s
+        .globl	__divuschar_rrx_s
+        .globl	__divsint_rrx_s
+        .globl	__divuint_rrx_s
+        .globl	__mulschar_rrx_s
+        .globl	__muluchar_rrx_s
+        .globl	__mulsuchar_rrx_s
+        .globl	__muluschar_rrx_s
+        .globl	__mulint_rrx_s
         .globl  __modschar_rrx_s
+        .globl  __moduchar_rrx_s
+        .globl  __modsuchar_rrx_s
+        .globl  __moduschar_rrx_s
         .globl  __moduint_rrx_s
         .globl  __modsint_rrx_s
-        .globl  __rrulong_rrx_s
-        .globl  __rrslong_rrx_s
-        .globl  __rlulong_rrx_s
-        .globl  __rlslong_rrx_s
+        .globl	__rrulong_rrx_s
+        .globl	__rrslong_rrx_s
+        .globl	__rlulong_rrx_s
+        .globl	__rlslong_rrx_s
 
 __mullong_rrx_s::
 __mullong_rrf_s::
@@ -75,74 +81,106 @@
 __mulint_rrf_s::
         ld      a,#5
         rst     0x08
-        jp      __mulint_rrx_s
+        jp	__mulint_rrx_s
 
 __divsint_rrf_s::
         ld      a,#5
         rst     0x08
-        jp      __divsint_rrx_s
+        jp	__divsint_rrx_s
 
 __divuint_rrf_s::
         ld      a,#5
         rst     0x08
-        jp      __divuint_rrx_s
+        jp	__divuint_rrx_s
 
 __mulschar_rrf_s::
         ld      a,#5
         rst     0x08
-        jp      __mulschar_rrx_s
+        jp	__mulschar_rrx_s
 
 __divschar_rrf_s::
         ld      a,#5
         rst     0x08
-        jp      __divschar_rrx_s
+        jp	__divschar_rrx_s
+
+__modschar_rrf_s::
+        ld      a,#5
+        rst     0x08
+        jp	__modschar_rrx_s
 
 __muluchar_rrf_s::
         ld      a,#5
         rst     0x08
-        jp      __muluchar_rrx_s
+        jp	__muluchar_rrx_s
 
 __divuchar_rrf_s::
         ld      a,#5
         rst     0x08
-        jp      __divuchar_rrx_s
+        jp	__divuchar_rrx_s
 
-__modschar_rrf_s::
+__moduchar_rrf_s::
         ld      a,#5
         rst     0x08
-        jp      __modschar_rrx_s
+        jp	__moduchar_rrx_s
 
-__moduchar_rrf_s::
+__mulsuchar_rrf_s::
+        ld      a,#5
+        rst     0x08
+        jp	__mulsuchar_rrx_s
+
+__divsuchar_rrf_s::
+        ld      a,#5
+        rst     0x08
+        jp	__divsuchar_rrx_s
+
+__modsuchar_rrf_s::
         ld      a,#5
         rst     0x08
-        jp      __moduchar_rrx_s
+        jp	__modsuchar_rrx_s
+
+__muluschar_rrf_s::
+        ld      a,#5
+        rst     0x08
+        jp	__muluschar_rrx_s
+
+__divuschar_rrf_s::
+        ld      a,#5
+        rst     0x08
+        jp	__divuschar_rrx_s
+
+__moduschar_rrf_s::
+        ld      a,#5
+        rst     0x08
+        jp	__moduschar_rrx_s
 
 __modsint_rrf_s::
         ld      a,#5
         rst     0x08
-        jp      __modsint_rrx_s
+        jp	__modsint_rrx_s
 
 __moduint_rrf_s::
         ld      a,#5
         rst     0x08
-        jp      __moduint_rrx_s
+        jp	__moduint_rrx_s
 
 __rrulong_rrf_s::
         ld      a,#5
         rst     0x08
-        jp      __rrulong_rrx_s
+        jp	__rrulong_rrx_s
 
 __rrslong_rrf_s::
         ld      a,#5
         rst     0x08
-        jp      __rrslong_rrx_s
+        jp	__rrslong_rrx_s
 
 __rlulong_rrf_s::
         ld      a,#5
         rst     0x08
-        jp      __rlulong_rrx_s
+        jp	__rlulong_rrx_s
 
 __rlslong_rrf_s::
         ld      a,#5
         rst     0x08
-        jp      __rlslong_rrx_s
+        jp	__rlslong_rrx_s
+
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/gets.c sdcc-3.2.0+dfsg/device/lib/gets.c
--- sdcc-3.1.0+dfsg/device/lib/gets.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/gets.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/hc08/Makefile.in sdcc-3.2.0+dfsg/device/lib/hc08/Makefile.in
--- sdcc-3.1.0+dfsg/device/lib/hc08/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/hc08/Makefile.in	2012-04-02 09:59:13.000000000 +0000
@@ -4,14 +4,10 @@
 srcdir = @srcdir@
 top_builddir = @top_builddir@
 
-AR_S            = @AR@ @AR_S_FLAG@
+LIB_TYPE     = @LIB_TYPE@
 
-LIB_TYPE        = @LIB_TYPE@
-
-TOPDIR = ../../..
-
-SCC = $(TOPDIR)/bin/sdcc -mhc08
-SAS = $(TOPDIR)/bin/sdas6808
+SCC = $(top_builddir)/bin/sdcc -mhc08
+SAS = $(top_builddir)/bin/sdas6808
 
 # override PORTDIR defined by super (parent) makefile
 override PORTDIR = ../build/hc08
@@ -27,6 +23,15 @@
 
 HC08_LONG = $(COMMON_LONG)
 
+HC08_LONGLONG = $(COMMON_LONGLONG) \
+  _rrulonglong.c \
+  _rrslonglong.c \
+  _rlulonglong.c \
+  _rlslonglong.c \
+  _mullonglong.c \
+  _divslonglong.c \
+  _divulonglong.c
+
 HC08_SDCC = $(COMMON_SDCC) \
   _itoa.c \
   _ltoa.c \
@@ -38,8 +43,8 @@
   sprintf.c \
   vprintf.c
 
-HC08SOURCES = $(addprefix ../,$(HC08_FLOAT) $(HC08_INT) $(HC08_LONG) $(HC08_SDCC))
-HC08OBJECTS = $(patsubst %.c,%.rel,$(HC08_FLOAT) $(HC08_INT) $(HC08_LONG) $(HC08_SDCC))
+HC08SOURCES = $(addprefix ../,$(HC08_FLOAT) $(HC08_INT) $(HC08_LONG) $(HC08_LONGLONG) $(HC08_SDCC))
+HC08OBJECTS = $(patsubst %.c,%.rel,$(HC08_FLOAT) $(HC08_INT) $(HC08_LONG) $(HC08_LONGLONG) $(HC08_SDCC))
 
 OBJ = _ret.rel _divuint.rel _divulong.rel _mulint.rel _mullong.rel
 
@@ -55,14 +60,13 @@
 $(PORTDIR)/$(LIB): $(OBJ) $(HC08OBJECTS) Makefile
 ifeq ($(LIB_TYPE), SDCCLIB)
 	rm -f $@; \
-	../../../bin/sdcclib -a $@ $(OBJ) $(HC08OBJECTS)
+	$(top_builddir)/bin/sdcclib -a $@ $(OBJ) $(HC08OBJECTS)
 else
   ifeq ($(LIB_TYPE), AR)
-	$(AR_S) -cq $@ $(OBJ) $(HC08OBJECTS)
+	$(top_builddir)/bin/sdar -rcS $@ $(OBJ) $(HC08OBJECTS)
   else
     ifeq ($(LIB_TYPE), RANLIB)
-	$(AR_S) -cq $@ $(OBJ) $(HC08OBJECTS)
-	$(top_builddir)/bin/sdranlib $@
+	$(top_builddir)/bin/sdar -rc $@ $(OBJ) $(HC08OBJECTS)
     else
 	rm -f $@
 	for i in $(basename $(OBJ) $(HC08OBJECTS)); do echo $$i >>$@; done
diff -Nru sdcc-3.1.0+dfsg/device/lib/hc08/_divuint.c sdcc-3.2.0+dfsg/device/lib/hc08/_divuint.c
--- sdcc-3.1.0+dfsg/device/lib/hc08/_divuint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/hc08/_divuint.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/hc08/_divulong.c sdcc-3.2.0+dfsg/device/lib/hc08/_divulong.c
--- sdcc-3.1.0+dfsg/device/lib/hc08/_divulong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/hc08/_divulong.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/hc08/_mulint.c sdcc-3.2.0+dfsg/device/lib/hc08/_mulint.c
--- sdcc-3.1.0+dfsg/device/lib/hc08/_mulint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/hc08/_mulint.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -44,7 +44,7 @@
 {
   a,b;	/* reference to make compiler happy */
 
-#if !defined(SDCC_STACK_AUTO)
+#if !defined(__SDCC_STACK_AUTO)
     __asm
    	ais #-2
 	psha
@@ -112,7 +112,7 @@
 int
 _mulint (int a, int b)
 {
-#if !defined(SDCC_STACK_AUTO) && (defined(SDCC_MODEL_LARGE) || defined(SDCC_ds390))	// still needed for large
+#if !defined(__SDCC_STACK_AUTO) && (defined(__SDCC_MODEL_LARGE) || defined(__SDCC_ds390))	// still needed for large
 	union uu __xdata *x;
 	union uu __xdata *y;
 	union uu t;
@@ -135,3 +135,4 @@
 
 
 #undef _MULINT_ASM
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/hc08/_mullong.c sdcc-3.2.0+dfsg/device/lib/hc08/_mullong.c
--- sdcc-3.1.0+dfsg/device/lib/hc08/_mullong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/hc08/_mullong.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/hc08/_ret.c sdcc-3.2.0+dfsg/device/lib/hc08/_ret.c
--- sdcc-3.1.0+dfsg/device/lib/hc08/_ret.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/hc08/_ret.c	2012-04-02 09:59:13.000000000 +0000
@@ -2,10 +2,12 @@
    _ret.c
 
    Copyright (C) 2003, Erik Petrich
+   Copyright (C) 2012, Philipp Klaus Krause
+   Considering how short this file is, it is probably not copyrightable, though.
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -26,5 +28,10 @@
    might be covered by the GNU General Public License.
 -------------------------------------------------------------------------*/
 
-__data unsigned char _ret2;
-__data unsigned char _ret3;
+__data unsigned char __SDCC_hc08_ret2;
+__data unsigned char __SDCC_hc08_ret3;
+__data unsigned char __SDCC_hc08_ret4;
+__data unsigned char __SDCC_hc08_ret5;
+__data unsigned char __SDCC_hc08_ret6;
+__data unsigned char __SDCC_hc08_ret7;
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/huge/Makefile.in sdcc-3.2.0+dfsg/device/lib/huge/Makefile.in
--- sdcc-3.1.0+dfsg/device/lib/huge/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/huge/Makefile.in	2012-02-10 10:16:50.000000000 +0000
@@ -1,3 +1,5 @@
+# libc/huge Makefile
+
 all:
 	$(MAKE) -C ../mcs51 all
 	cp ../mcs51/*.rel .
@@ -7,4 +9,4 @@
 	rm -f *.rel *.sym *.lst *.asm *~ *.lib
 
 distclean: clean
-	rm -f Makefile
\ No newline at end of file
+	rm -f Makefile
diff -Nru sdcc-3.1.0+dfsg/device/lib/labs.c sdcc-3.2.0+dfsg/device/lib/labs.c
--- sdcc-3.1.0+dfsg/device/lib/labs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/labs.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -28,9 +28,9 @@
 
 #include <stdlib.h>
 
-#if defined (SDCC_mcs51)
+#if defined (__SDCC_mcs51)
 
-#if defined(SDCC)
+#if defined(__SDCC)
  #include <sdcc-lib.h>
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/large/Makefile.in sdcc-3.2.0+dfsg/device/lib/large/Makefile.in
--- sdcc-3.1.0+dfsg/device/lib/large/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/large/Makefile.in	2012-02-10 10:16:50.000000000 +0000
@@ -1,3 +1,5 @@
+# libc/large Makefile
+
 all:
 	$(MAKE) -C ../mcs51 all
 	cp ../mcs51/*.rel .
@@ -7,4 +9,4 @@
 	rm -f *.rel *.sym *.lst *.asm *~ *.lib
 
 distclean: clean
-	rm -f Makefile
\ No newline at end of file
+	rm -f Makefile
diff -Nru sdcc-3.1.0+dfsg/device/lib/ldexpf.c sdcc-3.2.0+dfsg/device/lib/ldexpf.c
--- sdcc-3.1.0+dfsg/device/lib/ldexpf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/ldexpf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/log10f.c sdcc-3.2.0+dfsg/device/lib/log10f.c
--- sdcc-3.1.0+dfsg/device/lib/log10f.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/log10f.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/logf.c sdcc-3.2.0+dfsg/device/lib/logf.c
--- sdcc-3.1.0+dfsg/device/lib/logf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/logf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -31,14 +31,14 @@
 
 /* Version 1.0 - Initial release */
 
-#define SDCC_MATH_LIB
+#define __SDCC_MATH_LIB
 #include <math.h>
 #include <errno.h>
 
 
 #ifdef MATH_ASM_MCS51
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 // TODO: share with other temps
@@ -215,8 +215,8 @@
 
 float logf(const float x) _FLOAT_FUNC_REENTRANT
 {
-#if     defined(SDCC_mcs51) && defined(SDCC_MODEL_SMALL) \
-    && !defined(SDCC_NOOVERLAY)
+#if     defined(__SDCC_mcs51) && defined(__SDCC_MODEL_SMALL) \
+    && !defined(__SDCC_NOOVERLAY)
     volatile
 #endif
     float Rz;
diff -Nru sdcc-3.1.0+dfsg/device/lib/make51lib.bat sdcc-3.2.0+dfsg/device/lib/make51lib.bat
--- sdcc-3.1.0+dfsg/device/lib/make51lib.bat	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/make51lib.bat	2012-01-24 23:50:33.000000000 +0000
@@ -1,37 +1,34 @@
-del small\*.lib
-set SDCCLIB_CC=sdcc --use-stdout --model-small -c
-sdcclib -l small\libfloat.lib libfloat.lib
-sdcclib -l small\libint.lib libint.lib
-sdcclib -l small\liblong.lib liblong.lib
-sdcclib -l small\libsdcc.lib libsdcc.lib
-cd mcs51
-@for %%I in (*.asm) do sdas8051 -plosgff %%I
-@for %%I in (*.rel) do sdcclib ..\small\mcs51.lib %%I
-cd..
-del *.rel *.sym *.asm *.lst *.adb
+setlocal
+set AR=ar
+set RANLIB=sdranlib
 
-del medium\*.lib
-set SDCCLIB_CC=sdcc --use-stdout --model-medium -c
-sdcclib -l medium\libfloat.lib libfloat.lib
-sdcclib -l medium\libint.lib libint.lib
-sdcclib -l medium\liblong.lib liblong.lib
-sdcclib -l medium\libsdcc.lib libsdcc.lib
-cd mcs51
-@for %%I in (*.asm) do sdas8051 -plosgff %%I
-@for %%I in (*.rel) do sdcclib ..\medium\mcs51.lib %%I
-cd..
-del *.rel *.sym *.asm *.lst *.adb
+set REL_FLOAT=_atof.rel _schar2fs.rel _sint2fs.rel _slong2fs.rel _uchar2fs.rel _uint2fs.rel _ulong2fs.rel _fs2schar.rel _fs2sint.rel _fs2slong.rel _fs2uchar.rel _fs2uint.rel _fs2ulong.rel _fsadd.rel _fsdiv.rel _fsmul.rel _fssub.rel _fseq.rel _fsgt.rel _fslt.rel _fsneq.rel fabsf.rel frexpf.rel ldexpf.rel expf.rel powf.rel sincosf.rel sinf.rel cosf.rel logf.rel log10f.rel sqrtf.rel tancotf.rel tanf.rel cotf.rel asincosf.rel asinf.rel acosf.rel atanf.rel atan2f.rel sincoshf.rel sinhf.rel coshf.rel tanhf.rel floorf.rel ceilf.rel modff.rel errno.rel
+set REL_LONG=_divslong.rel _modslong.rel _modulong.rel
+set REL_SDCC=_atoi.rel _atol.rel abs.rel labs.rel rand.rel _iscntrl.rel _isdigit.rel _isgraph.rel _isprint.rel _ispunct.rel _isspace.rel _islower.rel _isupper.rel _isxdigit.rel _strcat.rel _strchr.rel _strcmp.rel _strcpy.rel _strcspn.rel _strncat.rel _strncmp.rel _strncpy.rel _strpbrk.rel _strrchr.rel _strspn.rel _strstr.rel _strtok.rel _memchr.rel _memcmp.rel _memcpy.rel _memset.rel _calloc.rel _malloc.rel _realloc.rel _free.rel printf_large.rel puts.rel gets.rel assert.rel time.rel
 
-del large\*.lib
-set SDCCLIB_CC=sdcc --use-stdout --model-large -DUSE_FLOATS -c
-sdcclib -l large\libfloat.lib libfloat.lib
-sdcclib -l large\libint.lib libint.lib
-sdcclib -l large\liblong.lib liblong.lib
-sdcclib -l large\libsdcc.lib libsdcc.lib
-cd mcs51
-@for %%I in (*.asm) do sdas8051 -plosgff %%I
-@for %%I in (*.rel) do sdcclib ..\large\mcs51.lib %%I
-cd..
-del *.rel *.sym *.asm *.lst *.adb
+set REL_FLOAT=%REL_FLOAT% _fscmp.rel _fsget1arg.rel _fsget2args.rel _fsnormalize.rel _fsreturnval.rel _fsrshift.rel _fsswapargs.rel _logexpf.rel
+set REL_INT=%REL_INT% _divsint.rel _divuint.rel _modsint.rel _moduint.rel _mulint.rel
+set REL_LONG=%REL_LONG% _divulong.rel _mullong.rel
+set REL_SDCC=%REL_SDCC% _autobaud.rel _bp.rel _decdptr.rel _gptrget.rel _gptrgetc.rel _gptrput.rel _ser.rel _setjmp.rel serial.rel _itoa.rel _ltoa.rel _spx.rel _startup.rel _strlen.rel _memmove.rel _heap.rel sprintf.rel vprintf.rel printf_fast.rel printf_fast_f.rel printf_tiny.rel printfl.rel bpx.rel
 
-set SDCCLIB_CC=
\ No newline at end of file
+set MODELS=small medium large
+
+for %%M in (%MODELS%) do (
+  pushd %%M
+  del *.lib
+  set SDCCLIB_CC=sdcc --use-stdout --model-%%M -c
+  %AR% -S -cq libfloat.lib %REL_FLOAT%
+  %RANLIB% libfloat.lib
+  %AR% -S -cq libint.lib %REL_INT%
+  %RANLIB% libint.lib
+  %AR% -S -cq liblong.lib %REL_LONG%
+  %RANLIB% liblong.lib
+  %AR% -S -cq libsdcc.lib %REL_SDCC%
+  %RANLIB% libsdcc.lib
+  cd ..\mcs51
+  for %%I in (*.asm) do sdas8051 -plosgff %%I
+  for %%I in (*.rel) do %AR% -S -cq ..\%%M\mcs51.lib %%I
+  %RANLIB% ..\%%M\mcs51.lib
+  popd
+)
+endlocal
diff -Nru sdcc-3.1.0+dfsg/device/lib/mcs51/Makefile.in sdcc-3.2.0+dfsg/device/lib/mcs51/Makefile.in
--- sdcc-3.1.0+dfsg/device/lib/mcs51/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/mcs51/Makefile.in	2012-02-10 10:16:50.000000000 +0000
@@ -1,12 +1,12 @@
+# libc/mcs51 Makefile
+
 VPATH  = @srcdir@
 srcdir = @srcdir@
 
 top_srcdir   = @top_srcdir@
 top_builddir = @top_builddir@
 
-AR_S            = @AR@ @AR_S_FLAG@
-
-LIB_TYPE        = @LIB_TYPE@
+LIB_TYPE     = @LIB_TYPE@
 SAS = $(top_builddir)/bin/sdas8051
 SCC = $(top_builddir)/bin/sdcc
 
@@ -31,14 +31,13 @@
 $(PORTDIR)/$(LIB): $(OBJ) Makefile
 ifeq ($(LIB_TYPE), SDCCLIB)
 	rm -f $@; \
-	../../../bin/sdcclib -a $@ $(OBJ)
+	$(top_builddir)/bin/sdcclib -a $@ $(OBJ)
 else
   ifeq ($(LIB_TYPE), AR)
-	$(AR_S) -cq $@ $(OBJ)
+	$(top_builddir)/bin/sdar -rcS $@ $(OBJ)
   else
     ifeq ($(LIB_TYPE), RANLIB)
-	$(AR_S) -cq $@ $(OBJ)
-	$(top_builddir)/bin/sdranlib $@
+	$(top_builddir)/bin/sdar -rc $@ $(OBJ)
     else
 	rm -f $@
 	for i in $(basename $(OBJ)); do echo $$i >>$@; done
diff -Nru sdcc-3.1.0+dfsg/device/lib/mcs51/crtbank.asm sdcc-3.2.0+dfsg/device/lib/mcs51/crtbank.asm
--- sdcc-3.1.0+dfsg/device/lib/mcs51/crtbank.asm	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/mcs51/crtbank.asm	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/mcs51/crtcall.asm sdcc-3.2.0+dfsg/device/lib/mcs51/crtcall.asm
--- sdcc-3.1.0+dfsg/device/lib/mcs51/crtcall.asm	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/mcs51/crtcall.asm	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/mcs51/crtclear.asm sdcc-3.2.0+dfsg/device/lib/mcs51/crtclear.asm
--- sdcc-3.1.0+dfsg/device/lib/mcs51/crtclear.asm	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/mcs51/crtclear.asm	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/mcs51/crtpagesfr.asm sdcc-3.2.0+dfsg/device/lib/mcs51/crtpagesfr.asm
--- sdcc-3.1.0+dfsg/device/lib/mcs51/crtpagesfr.asm	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/mcs51/crtpagesfr.asm	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/mcs51/crtstart.asm sdcc-3.2.0+dfsg/device/lib/mcs51/crtstart.asm
--- sdcc-3.1.0+dfsg/device/lib/mcs51/crtstart.asm	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/mcs51/crtstart.asm	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/mcs51/crtxclear.asm sdcc-3.2.0+dfsg/device/lib/mcs51/crtxclear.asm
--- sdcc-3.1.0+dfsg/device/lib/mcs51/crtxclear.asm	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/mcs51/crtxclear.asm	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/mcs51/crtxinit.asm sdcc-3.2.0+dfsg/device/lib/mcs51/crtxinit.asm
--- sdcc-3.1.0+dfsg/device/lib/mcs51/crtxinit.asm	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/mcs51/crtxinit.asm	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/mcs51/crtxpop.asm sdcc-3.2.0+dfsg/device/lib/mcs51/crtxpop.asm
--- sdcc-3.1.0+dfsg/device/lib/mcs51/crtxpop.asm	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/mcs51/crtxpop.asm	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/mcs51/crtxpopr0.asm sdcc-3.2.0+dfsg/device/lib/mcs51/crtxpopr0.asm
--- sdcc-3.1.0+dfsg/device/lib/mcs51/crtxpopr0.asm	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/mcs51/crtxpopr0.asm	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/mcs51/crtxpush.asm sdcc-3.2.0+dfsg/device/lib/mcs51/crtxpush.asm
--- sdcc-3.1.0+dfsg/device/lib/mcs51/crtxpush.asm	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/mcs51/crtxpush.asm	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/mcs51/crtxpushr0.asm sdcc-3.2.0+dfsg/device/lib/mcs51/crtxpushr0.asm
--- sdcc-3.1.0+dfsg/device/lib/mcs51/crtxpushr0.asm	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/mcs51/crtxpushr0.asm	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/mcs51/crtxstack.asm sdcc-3.2.0+dfsg/device/lib/mcs51/crtxstack.asm
--- sdcc-3.1.0+dfsg/device/lib/mcs51/crtxstack.asm	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/mcs51/crtxstack.asm	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/mcs51/gptr_cmp.asm sdcc-3.2.0+dfsg/device/lib/mcs51/gptr_cmp.asm
--- sdcc-3.1.0+dfsg/device/lib/mcs51/gptr_cmp.asm	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/mcs51/gptr_cmp.asm	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/medium/Makefile.in sdcc-3.2.0+dfsg/device/lib/medium/Makefile.in
--- sdcc-3.1.0+dfsg/device/lib/medium/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/medium/Makefile.in	2012-02-10 10:16:50.000000000 +0000
@@ -1,3 +1,5 @@
+# libc/medium Makefile
+
 all:
 	$(MAKE) -C ../mcs51 all
 	cp ../mcs51/*.rel .
@@ -7,4 +9,4 @@
 	rm -f *.rel *.sym *.lst *.asm *~ *.lib
 
 distclean: clean
-	rm -f Makefile
\ No newline at end of file
+	rm -f Makefile
diff -Nru sdcc-3.1.0+dfsg/device/lib/modff.c sdcc-3.2.0+dfsg/device/lib/modff.c
--- sdcc-3.1.0+dfsg/device/lib/modff.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/modff.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/Makefile.am sdcc-3.2.0+dfsg/device/lib/pic14/Makefile.am
--- sdcc-3.1.0+dfsg/device/lib/pic14/Makefile.am	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/Makefile.am	2012-01-20 17:19:33.000000000 +0000
@@ -1,10 +1,10 @@
 ## Process this file with Automake to create Makefile.in
 
-SUBDIRS = libm libsdcc/regular
+SUBDIRS = libm libsdcc/regular libsdcc/enhanced
 
 if HAVE_NEW_PICS
-SUBDIRS += libsdcc/enhanced
+# add new pics subdirs here
+SUBDIRS +=
 endif
 
 include $(top_srcdir)/Makefile.common
-
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/Makefile.in sdcc-3.2.0+dfsg/device/lib/pic14/Makefile.in
--- sdcc-3.1.0+dfsg/device/lib/pic14/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/Makefile.in	2012-07-06 09:07:10.000000000 +0000
@@ -31,7 +31,9 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-@HAVE_NEW_PICS_TRUE@am__append_1 = libsdcc/enhanced
+
+# add new pics subdirs here
+@HAVE_NEW_PICS_TRUE@am__append_1 = 
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/Makefile.common $(top_srcdir)/configure NEWS \
@@ -63,7 +65,7 @@
 	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = libm libsdcc/regular libsdcc/enhanced
+DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -188,7 +190,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = libm libsdcc/regular $(am__append_1)
+SUBDIRS = libm libsdcc/regular libsdcc/enhanced $(am__append_1)
 AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic14 \
 	-I$(top_srcdir)/../../non-free/include/pic14
 #AM_CFLAGS += --asm="$(CCAS)"
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/TEMPLATE.S sdcc-3.2.0+dfsg/device/lib/pic14/TEMPLATE.S
--- sdcc-3.1.0+dfsg/device/lib/pic14/TEMPLATE.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/TEMPLATE.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/TEMPLATE.c sdcc-3.2.0+dfsg/device/lib/pic14/TEMPLATE.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/TEMPLATE.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/TEMPLATE.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/aclocal.m4 sdcc-3.2.0+dfsg/device/lib/pic14/aclocal.m4
--- sdcc-3.1.0+dfsg/device/lib/pic14/aclocal.m4	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/aclocal.m4	2012-07-06 09:07:05.000000000 +0000
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/autom4te.cache/output.0 sdcc-3.2.0+dfsg/device/lib/pic14/autom4te.cache/output.0
--- sdcc-3.1.0+dfsg/device/lib/pic14/autom4te.cache/output.0	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/autom4te.cache/output.0	2012-07-06 09:07:04.000000000 +0000
@@ -1325,7 +1325,7 @@
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-new-pics       Enable use of PIC devices added to gputils after the
-                          0.13.7 release. Requires custom-built gputils
+                          0.14.1 release. Requires custom-built gputils
                           obtained from their SVN repository!
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
@@ -2491,7 +2491,9 @@
         ;;
 esac;
 
+CFLAGS=""
 
+CCASFLAGS=""
 
 LDFLAGS="-m -l -w"
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/autom4te.cache/output.1 sdcc-3.2.0+dfsg/device/lib/pic14/autom4te.cache/output.1
--- sdcc-3.1.0+dfsg/device/lib/pic14/autom4te.cache/output.1	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/autom4te.cache/output.1	2012-07-06 09:07:07.000000000 +0000
@@ -0,0 +1,4311 @@
+@%:@! /bin/sh
+@%:@ Guess values for system-dependent variables and create Makefiles.
+@%:@ Generated by GNU Autoconf 2.63 for pic14lib 0.1.
+@%:@
+@%:@ Report bugs to <tecodev AT users sourceforge net>.
+@%:@ 
+@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+@%:@ 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+@%:@ This configure script is free software; the Free Software Foundation
+@%:@ gives unlimited permission to copy, distribute and modify it.
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# CDPATH.
+$as_unset CDPATH
+
+
+if test "x$CONFIG_SHELL" = x; then
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+
+  if test $as_have_required = yes &&	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  case $as_dir in
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	   done;;
+       esac
+done
+IFS=$as_save_IFS
+
+
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+  break
+fi
+
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+    
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell bug-autoconf@gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
+}
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+
+exec 7<&0 </dev/null 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIB@&t@OBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Identity of this package.
+PACKAGE_NAME='pic14lib'
+PACKAGE_TARNAME='pic14lib'
+PACKAGE_VERSION='0.1'
+PACKAGE_STRING='pic14lib 0.1'
+PACKAGE_BUGREPORT='tecodev AT users sourceforge net'
+
+ac_unique_file="libsdcc/idata.c"
+ac_subst_vars='LTLIBOBJS
+LIB@&t@OBJS
+am__fastdepCCAS_FALSE
+am__fastdepCCAS_TRUE
+CCASDEPMODE
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+RANLIB
+ARFLAGS
+LDFLAGS
+CCASFLAGS
+CFLAGS
+AR
+LD
+CCAS
+CC
+EARCH
+ARCH
+HAVE_NEW_PICS_FALSE
+HAVE_NEW_PICS_TRUE
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_new_pics
+enable_dependency_tracking
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; }
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
+   { (exit 1); exit 1; }; }
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+   { (exit 1); exit 1; }; }
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { (exit 1); exit 1; }; }
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
+   { (exit 1); exit 1; }; }
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures pic14lib 0.1 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root @<:@DATAROOTDIR/doc/pic14lib@:>@
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of pic14lib 0.1:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-new-pics       Enable use of PIC devices added to gputils after the
+                          0.14.1 release. Requires custom-built gputils
+                          obtained from their SVN repository!
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
+
+Report bugs to <tecodev AT users sourceforge net>.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+pic14lib configure 0.1
+generated by GNU Autoconf 2.63
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by pic14lib $as_me 0.1, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+@%:@@%:@ --------- @%:@@%:@
+@%:@@%:@ Platform. @%:@@%:@
+@%:@@%:@ --------- @%:@@%:@
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  $as_echo "PATH: $as_dir"
+done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+@%:@@%:@ ----------- @%:@@%:@
+@%:@@%:@ Core tests. @%:@@%:@
+@%:@@%:@ ----------- @%:@@%:@
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    2)
+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      ac_configure_args="$ac_configure_args '$ac_arg'"
+      ;;
+    esac
+  done
+done
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    cat <<\_ASBOX
+@%:@@%:@ ---------------- @%:@@%:@
+@%:@@%:@ Cache variables. @%:@@%:@
+@%:@@%:@ ---------------- @%:@@%:@
+_ASBOX
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    cat <<\_ASBOX
+@%:@@%:@ ----------------- @%:@@%:@
+@%:@@%:@ Output variables. @%:@@%:@
+@%:@@%:@ ----------------- @%:@@%:@
+_ASBOX
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      cat <<\_ASBOX
+@%:@@%:@ ------------------- @%:@@%:@
+@%:@@%:@ File substitutions. @%:@@%:@
+@%:@@%:@ ------------------- @%:@@%:@
+_ASBOX
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      cat <<\_ASBOX
+@%:@@%:@ ----------- @%:@@%:@
+@%:@@%:@ confdefs.h. @%:@@%:@
+@%:@@%:@ ----------- @%:@@%:@
+_ASBOX
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+@%:@define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+@%:@define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+@%:@define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+@%:@define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+@%:@define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  ac_site_file1=$CONFIG_SITE
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test -r "$ac_site_file"; then
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special
+  # files actually), so we avoid doing that.
+  if test -f "$cache_file"; then
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+am__api_version='1.11'
+
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+  ./ | .// | /cC/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
+$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
+$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" >&5
+$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+Check your system clock" >&5
+$as_echo "$as_me: error: newly created file is older than distributed files!
+Check your system clock" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='pic14lib'
+ VERSION='0.1'
+
+
+cat >>confdefs.h <<_ACEOF
+@%:@define PACKAGE "$PACKAGE"
+_ACEOF
+
+ 
+cat >>confdefs.h <<_ACEOF
+@%:@define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+
+
+
+
+
+ac_config_headers="$ac_config_headers config.h"
+
+
+
+NEWPICS=no;
+@%:@ Check whether --enable-new-pics was given.
+if test "${enable_new_pics+set}" = set; then
+  enableval=$enable_new_pics;  case "x$enableval" in
+      xyes) NEWPICS=yes;
+            { $as_echo "$as_me:$LINENO: Enabling support for PICs from unreleased gputils -- make sure you have up-to-date gputils from SVN." >&5
+$as_echo "$as_me: Enabling support for PICs from unreleased gputils -- make sure you have up-to-date gputils from SVN." >&6;};;
+      xno) NEWPICS=no;;
+      *) { { $as_echo "$as_me:$LINENO: error: bad value \"${enableval}\" for --enable-new-pics" >&5
+$as_echo "$as_me: error: bad value \"${enableval}\" for --enable-new-pics" >&2;}
+   { (exit 1); exit 1; }; };;
+      esac
+else
+   NEWPICS=no 
+
+fi
+
+
+ if  test x$NEWPICS = xyes ; then
+  HAVE_NEW_PICS_TRUE=
+  HAVE_NEW_PICS_FALSE='#'
+else
+  HAVE_NEW_PICS_TRUE='#'
+  HAVE_NEW_PICS_FALSE=
+fi
+
+
+# SDCC setup
+case $srcdir in
+    \\/*|?:\\/*) abs_srcdir="$srcdir";
+        ;;
+    *) abs_srcdir="$ac_pwd/$srcdir";
+        ;;
+esac
+case $ac_top_build_prefix in
+    \\/*|?:\\/*)
+        abs_top_builddir="$ac_top_build_prefix";
+        ;;
+    *) abs_top_builddir="$ac_pwd/$ac_top_build_prefix";
+        ;;
+esac
+
+libdir=$libdir/pic14
+
+# Checks for programs.
+# The default architectures (regular and enhanced cores) can be selected at
+# configure time by setting the environment variables ARCH and/or EARCH to
+# the desired device (16fxxx).
+ARCH=${ARCH:-16f877}
+
+EARCH=${EARCH:-16f1934}
+
+
+# We cannot use AC_PROG_CC(sdcc) as sdcc might not be built at configure-time...
+CC=\'$abs_top_builddir/../../../bin/sdcc\'
+
+# Extract the first word of "gpasm", so it can be a program name with args.
+set dummy gpasm; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_CCAS+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $CCAS in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CCAS="$CCAS" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_CCAS="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_CCAS" && ac_cv_path_CCAS=":"
+  ;;
+esac
+fi
+CCAS=$ac_cv_path_CCAS
+if test -n "$CCAS"; then
+  { $as_echo "$as_me:$LINENO: result: $CCAS" >&5
+$as_echo "$CCAS" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "gplink", so it can be a program name with args.
+set dummy gplink; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_LD+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $LD in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_LD="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_LD" && ac_cv_path_LD=":"
+  ;;
+esac
+fi
+LD=$ac_cv_path_LD
+if test -n "$LD"; then
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "gplib", so it can be a program name with args.
+set dummy gplib; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_AR+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $AR in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_AR="$AR" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_AR" && ac_cv_path_AR=":"
+  ;;
+esac
+fi
+AR=$ac_cv_path_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+case ":$CCAS:$LD:$AR:" in
+    *:::*)
+        { { $as_echo "$as_me:$LINENO: error: gputils (gpasm, gplink, and gplib) are required but not found.
+Either install gputils or reconfigure with --disable-pic14-port and --disable-pic16-port." >&5
+$as_echo "$as_me: error: gputils (gpasm, gplink, and gplib) are required but not found.
+Either install gputils or reconfigure with --disable-pic14-port and --disable-pic16-port." >&2;}
+   { (exit 1); exit 1; }; }
+        ;;
+esac;
+
+CFLAGS=""
+
+CCASFLAGS=""
+
+LDFLAGS="-m -l -w"
+
+ARFLAGS="-c"
+
+CCAS=\'$CCAS\'
+
+LD=\'$LD\'
+
+AR=\'$AR\'
+
+
+# $RANLIB is called by the autotools but not provided nor required
+RANLIB=:
+
+OBJEXT=o
+
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+
+
+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+@%:@ Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then
+  enableval=$enable_dependency_tracking; 
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if 
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+
+depcc="$CCAS"   am_compiler_list=
+
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CCAS_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CCAS_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CCAS_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; }
+CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type
+
+ if 
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then
+  am__fastdepCCAS_TRUE=
+  am__fastdepCCAS_FALSE='#'
+else
+  am__fastdepCCAS_TRUE='#'
+  am__fastdepCCAS_FALSE=
+fi
+
+
+
+# Checks for libraries.
+
+# Checks for header files.
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+
+ac_config_files="$ac_config_files Makefile libsdcc/enhanced/Makefile libsdcc/regular/Makefile libm/Makefile"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    test "x$cache_file" != "x/dev/null" &&
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+    cat confcache >$cache_file
+  else
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIB@&t@OBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+
+if test -z "${HAVE_NEW_PICS_TRUE}" && test -z "${HAVE_NEW_PICS_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_NEW_PICS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"HAVE_NEW_PICS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+: ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# CDPATH.
+$as_unset CDPATH
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+
+# Save the log message, to keep $[0] and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by pic14lib $as_me 0.1, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTION]... [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE] 
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE] 
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to <bug-autoconf@gnu.org>."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_version="\\
+pic14lib config.status 0.1
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright (C) 2008 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    { $as_echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
+@%:@@%:@ Running $as_me. @%:@@%:@
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "libsdcc/enhanced/Makefile") CONFIG_FILES="$CONFIG_FILES libsdcc/enhanced/Makefile" ;;
+    "libsdcc/regular/Makefile") CONFIG_FILES="$CONFIG_FILES libsdcc/regular/Makefile" ;;
+    "libm/Makefile") CONFIG_FILES="$CONFIG_FILES libm/Makefile" ;;
+
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp=
+  trap 'exit_status=$?
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} ||
+{
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
+   { (exit 1); exit 1; }
+}
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+   { (exit 1); exit 1; }; };;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+   { (exit 1); exit 1; }; };;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  { as_dir="$ac_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+    s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&2;}
+
+  rm -f "$tmp/stdin"
+  case $ac_file in
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+  
+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      { as_dir=$dirpart/$fdir
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+ ;;
+
+  esac
+done # for ac_tag
+
+
+{ (exit 0); exit 0; }
+_ACEOF
+chmod +x $CONFIG_STATUS
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || { (exit 1); exit 1; }
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/autom4te.cache/requests sdcc-3.2.0+dfsg/device/lib/pic14/autom4te.cache/requests
--- sdcc-3.1.0+dfsg/device/lib/pic14/autom4te.cache/requests	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/autom4te.cache/requests	2012-07-06 09:07:18.000000000 +0000
@@ -11,29 +11,97 @@
                       ],
                       [
                         '/home/sdcc-builder/local-cf-x86/share/autoconf/autoconf/autoconf.m4f',
+                        '/usr/share/aclocal-1.11/amversion.m4',
+                        '/usr/share/aclocal-1.11/auxdir.m4',
+                        '/usr/share/aclocal-1.11/cond.m4',
+                        '/usr/share/aclocal-1.11/depend.m4',
+                        '/usr/share/aclocal-1.11/depout.m4',
+                        '/usr/share/aclocal-1.11/init.m4',
+                        '/usr/share/aclocal-1.11/install-sh.m4',
+                        '/usr/share/aclocal-1.11/lead-dot.m4',
+                        '/usr/share/aclocal-1.11/make.m4',
+                        '/usr/share/aclocal-1.11/missing.m4',
+                        '/usr/share/aclocal-1.11/mkdirp.m4',
+                        '/usr/share/aclocal-1.11/options.m4',
+                        '/usr/share/aclocal-1.11/runlog.m4',
+                        '/usr/share/aclocal-1.11/sanity.m4',
+                        '/usr/share/aclocal-1.11/silent.m4',
+                        '/usr/share/aclocal-1.11/strip.m4',
+                        '/usr/share/aclocal-1.11/substnot.m4',
+                        '/usr/share/aclocal-1.11/tar.m4',
+                        'configure.in'
+                      ],
+                      {
+                        'm4_pattern_forbid' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'AC_DEFUN' => 1,
+                        'AM_PROG_MKDIR_P' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        '_m4_warn' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'include' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AM_RUN_LOG' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'm4_pattern_allow' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'm4_include' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'AU_DEFUN' => 1,
+                        'AM_MAKE_INCLUDE' => 1
+                      }
+                    ], 'Autom4te::Request' ),
+             bless( [
+                      '1',
+                      1,
+                      [
+                        '/home/sdcc-builder/local-cf-x86/share/autoconf'
+                      ],
+                      [
+                        '/home/sdcc-builder/local-cf-x86/share/autoconf/autoconf/autoconf.m4f',
                         'aclocal.m4',
                         'configure.in'
                       ],
                       {
-                        '_LT_AC_TAGCONFIG' => 1,
                         'AM_PROG_F77_C_O' => 1,
-                        'AC_INIT' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
                         'm4_pattern_forbid' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
+                        'AC_INIT' => 1,
                         '_AM_COND_IF' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
                         'AC_SUBST' => 1,
-                        'AC_CANONICAL_HOST' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
                         'AC_FC_SRCEXT' => 1,
+                        'AC_CANONICAL_HOST' => 1,
                         'AC_PROG_LIBTOOL' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
                         'AC_CONFIG_SUBDIRS' => 1,
                         'AM_AUTOMAKE_VERSION' => 1,
                         'LT_CONFIG_LTDL_DIR' => 1,
-                        'AC_CONFIG_LINKS' => 1,
                         'AC_REQUIRE_AUX_FILE' => 1,
-                        'm4_sinclude' => 1,
+                        'AC_CONFIG_LINKS' => 1,
                         'LT_SUPPORTED_TAG' => 1,
+                        'm4_sinclude' => 1,
                         'AM_MAINTAINER_MODE' => 1,
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
                         '_m4_warn' => 1,
@@ -46,17 +114,17 @@
                         'include' => 1,
                         'AM_GNU_GETTEXT' => 1,
                         'AC_LIBSOURCE' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
                         'AM_PROG_FC_C_O' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
                         'AC_FC_FREEFORM' => 1,
                         'AH_OUTPUT' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
                         '_AM_SUBST_NOTMAKE' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'sinclude' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
                         'm4_pattern_allow' => 1,
-                        'AM_CONDITIONAL' => 1,
+                        'sinclude' => 1,
+                        'AM_PROG_CC_C_O' => 1,
                         'AC_CANONICAL_SYSTEM' => 1,
+                        'AM_CONDITIONAL' => 1,
                         'AC_CONFIG_HEADERS' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
                         'm4_include' => 1,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/autom4te.cache/traces.0 sdcc-3.2.0+dfsg/device/lib/pic14/autom4te.cache/traces.0
--- sdcc-3.1.0+dfsg/device/lib/pic14/autom4te.cache/traces.0	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/autom4te.cache/traces.0	2012-07-06 09:07:04.000000000 +0000
@@ -1,4 +1,579 @@
-m4trace:configure.in:18: -1- AC_INIT([pic14lib], [0.1], [tecodev AT users sourceforge net])
+m4trace:/usr/share/aclocal-1.11/amversion.m4:14: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.11'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.11.1], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+m4trace:/usr/share/aclocal-1.11/amversion.m4:33: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.11.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+m4trace:/usr/share/aclocal-1.11/auxdir.m4:47: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+m4trace:/usr/share/aclocal-1.11/cond.m4:15: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+m4trace:/usr/share/aclocal-1.11/depend.m4:28: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+m4trace:/usr/share/aclocal-1.11/depend.m4:163: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+m4trace:/usr/share/aclocal-1.11/depend.m4:171: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+])
+m4trace:/usr/share/aclocal-1.11/depout.m4:14: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+])
+m4trace:/usr/share/aclocal-1.11/depout.m4:75: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+m4trace:/usr/share/aclocal-1.11/init.m4:26: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.62])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+		  [_AM_DEPENDENCIES(CC)],
+		  [define([AC_PROG_CC],
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+		  [_AM_DEPENDENCIES(CXX)],
+		  [define([AC_PROG_CXX],
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+		  [_AM_DEPENDENCIES(OBJC)],
+		  [define([AC_PROG_OBJC],
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
+m4trace:/usr/share/aclocal-1.11/init.m4:126: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+m4trace:/usr/share/aclocal-1.11/install-sh.m4:11: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+AC_SUBST(install_sh)])
+m4trace:/usr/share/aclocal-1.11/lead-dot.m4:12: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+m4trace:/usr/share/aclocal-1.11/make.m4:14: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+m4trace:/usr/share/aclocal-1.11/missing.m4:14: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+m4trace:/usr/share/aclocal-1.11/missing.m4:24: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+m4trace:/usr/share/aclocal-1.11/mkdirp.m4:11: -1- AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+m4trace:/usr/share/aclocal-1.11/options.m4:13: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+m4trace:/usr/share/aclocal-1.11/options.m4:19: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+m4trace:/usr/share/aclocal-1.11/options.m4:25: -1- AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+m4trace:/usr/share/aclocal-1.11/options.m4:31: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+m4trace:/usr/share/aclocal-1.11/runlog.m4:12: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+m4trace:/usr/share/aclocal-1.11/sanity.m4:14: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+m4trace:/usr/share/aclocal-1.11/silent.m4:14: -1- AC_DEFUN([AM_SILENT_RULES], [AC_ARG_ENABLE([silent-rules],
+[  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')])
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+m4trace:/usr/share/aclocal-1.11/strip.m4:17: -1- AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+m4trace:/usr/share/aclocal-1.11/substnot.m4:14: -1- AC_DEFUN([_AM_SUBST_NOTMAKE])
+m4trace:/usr/share/aclocal-1.11/substnot.m4:19: -1- AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+m4trace:/usr/share/aclocal-1.11/tar.m4:24: -1- AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+])
 m4trace:configure.in:18: -1- m4_pattern_forbid([^_?A[CHUM]_])
 m4trace:configure.in:18: -1- m4_pattern_forbid([_AC_])
 m4trace:configure.in:18: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
@@ -6,346 +581,173 @@
 m4trace:configure.in:18: -1- m4_pattern_forbid([^_?m4_])
 m4trace:configure.in:18: -1- m4_pattern_forbid([^dnl$])
 m4trace:configure.in:18: -1- m4_pattern_forbid([^_?AS_])
-m4trace:configure.in:18: -1- AC_SUBST([SHELL], [${CONFIG_SHELL-/bin/sh}])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([SHELL])
 m4trace:configure.in:18: -1- m4_pattern_allow([^SHELL$])
-m4trace:configure.in:18: -1- AC_SUBST([PATH_SEPARATOR])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([PATH_SEPARATOR])
 m4trace:configure.in:18: -1- m4_pattern_allow([^PATH_SEPARATOR$])
-m4trace:configure.in:18: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME],      ['AC_PACKAGE_NAME'])])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([PACKAGE_NAME])
 m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_NAME$])
-m4trace:configure.in:18: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME],   ['AC_PACKAGE_TARNAME'])])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([PACKAGE_TARNAME])
 m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-m4trace:configure.in:18: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION],   ['AC_PACKAGE_VERSION'])])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([PACKAGE_VERSION])
 m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-m4trace:configure.in:18: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING],    ['AC_PACKAGE_STRING'])])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([PACKAGE_STRING])
 m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_STRING$])
-m4trace:configure.in:18: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT])
 m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-m4trace:configure.in:18: -1- AC_SUBST([exec_prefix], [NONE])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([exec_prefix])
 m4trace:configure.in:18: -1- m4_pattern_allow([^exec_prefix$])
-m4trace:configure.in:18: -1- AC_SUBST([prefix], [NONE])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([prefix])
 m4trace:configure.in:18: -1- m4_pattern_allow([^prefix$])
-m4trace:configure.in:18: -1- AC_SUBST([program_transform_name], [s,x,x,])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([program_transform_name])
 m4trace:configure.in:18: -1- m4_pattern_allow([^program_transform_name$])
-m4trace:configure.in:18: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([bindir])
 m4trace:configure.in:18: -1- m4_pattern_allow([^bindir$])
-m4trace:configure.in:18: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([sbindir])
 m4trace:configure.in:18: -1- m4_pattern_allow([^sbindir$])
-m4trace:configure.in:18: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([libexecdir])
 m4trace:configure.in:18: -1- m4_pattern_allow([^libexecdir$])
-m4trace:configure.in:18: -1- AC_SUBST([datarootdir], ['${prefix}/share'])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([datarootdir])
 m4trace:configure.in:18: -1- m4_pattern_allow([^datarootdir$])
-m4trace:configure.in:18: -1- AC_SUBST([datadir], ['${datarootdir}'])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([datadir])
 m4trace:configure.in:18: -1- m4_pattern_allow([^datadir$])
-m4trace:configure.in:18: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([sysconfdir])
 m4trace:configure.in:18: -1- m4_pattern_allow([^sysconfdir$])
-m4trace:configure.in:18: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([sharedstatedir])
 m4trace:configure.in:18: -1- m4_pattern_allow([^sharedstatedir$])
-m4trace:configure.in:18: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([localstatedir])
 m4trace:configure.in:18: -1- m4_pattern_allow([^localstatedir$])
-m4trace:configure.in:18: -1- AC_SUBST([includedir], ['${prefix}/include'])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([includedir])
 m4trace:configure.in:18: -1- m4_pattern_allow([^includedir$])
-m4trace:configure.in:18: -1- AC_SUBST([oldincludedir], ['/usr/include'])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([oldincludedir])
 m4trace:configure.in:18: -1- m4_pattern_allow([^oldincludedir$])
-m4trace:configure.in:18: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
-				     ['${datarootdir}/doc/${PACKAGE_TARNAME}'],
-				     ['${datarootdir}/doc/${PACKAGE}'])])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([docdir])
 m4trace:configure.in:18: -1- m4_pattern_allow([^docdir$])
-m4trace:configure.in:18: -1- AC_SUBST([infodir], ['${datarootdir}/info'])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([infodir])
 m4trace:configure.in:18: -1- m4_pattern_allow([^infodir$])
-m4trace:configure.in:18: -1- AC_SUBST([htmldir], ['${docdir}'])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([htmldir])
 m4trace:configure.in:18: -1- m4_pattern_allow([^htmldir$])
-m4trace:configure.in:18: -1- AC_SUBST([dvidir], ['${docdir}'])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([dvidir])
 m4trace:configure.in:18: -1- m4_pattern_allow([^dvidir$])
-m4trace:configure.in:18: -1- AC_SUBST([pdfdir], ['${docdir}'])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([pdfdir])
 m4trace:configure.in:18: -1- m4_pattern_allow([^pdfdir$])
-m4trace:configure.in:18: -1- AC_SUBST([psdir], ['${docdir}'])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([psdir])
 m4trace:configure.in:18: -1- m4_pattern_allow([^psdir$])
-m4trace:configure.in:18: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([libdir])
 m4trace:configure.in:18: -1- m4_pattern_allow([^libdir$])
-m4trace:configure.in:18: -1- AC_SUBST([localedir], ['${datarootdir}/locale'])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([localedir])
 m4trace:configure.in:18: -1- m4_pattern_allow([^localedir$])
-m4trace:configure.in:18: -1- AC_SUBST([mandir], ['${datarootdir}/man'])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([mandir])
 m4trace:configure.in:18: -1- m4_pattern_allow([^mandir$])
-m4trace:configure.in:18: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
 m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_NAME$])
-m4trace:configure.in:18: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
-#undef PACKAGE_NAME])
-m4trace:configure.in:18: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
 m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-m4trace:configure.in:18: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME])
-m4trace:configure.in:18: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
 m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-m4trace:configure.in:18: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
-#undef PACKAGE_VERSION])
-m4trace:configure.in:18: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
 m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_STRING$])
-m4trace:configure.in:18: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING])
-m4trace:configure.in:18: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
 m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-m4trace:configure.in:18: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT])
-m4trace:configure.in:18: -1- AC_SUBST([DEFS])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([DEFS])
 m4trace:configure.in:18: -1- m4_pattern_allow([^DEFS$])
-m4trace:configure.in:18: -1- AC_SUBST([ECHO_C])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([ECHO_C])
 m4trace:configure.in:18: -1- m4_pattern_allow([^ECHO_C$])
-m4trace:configure.in:18: -1- AC_SUBST([ECHO_N])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([ECHO_N])
 m4trace:configure.in:18: -1- m4_pattern_allow([^ECHO_N$])
-m4trace:configure.in:18: -1- AC_SUBST([ECHO_T])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([ECHO_T])
 m4trace:configure.in:18: -1- m4_pattern_allow([^ECHO_T$])
-m4trace:configure.in:18: -1- AC_SUBST([LIBS])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([LIBS])
 m4trace:configure.in:18: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.in:18: -1- AC_SUBST([build_alias])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([build_alias])
 m4trace:configure.in:18: -1- m4_pattern_allow([^build_alias$])
-m4trace:configure.in:18: -1- AC_SUBST([host_alias])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([host_alias])
 m4trace:configure.in:18: -1- m4_pattern_allow([^host_alias$])
-m4trace:configure.in:18: -1- AC_SUBST([target_alias])
-m4trace:configure.in:18: -1- AC_SUBST_TRACE([target_alias])
 m4trace:configure.in:18: -1- m4_pattern_allow([^target_alias$])
 m4trace:configure.in:19: -1- AM_INIT_AUTOMAKE([foreign])
 m4trace:configure.in:19: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
+m4trace:configure.in:19: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
 m4trace:configure.in:19: -1- AM_AUTOMAKE_VERSION([1.11.1])
-m4trace:configure.in:19: -1- AC_REQUIRE_AUX_FILE([install-sh])
-m4trace:configure.in:19: -1- AC_SUBST([INSTALL_PROGRAM])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
+m4trace:configure.in:19: -1- _AM_AUTOCONF_VERSION([2.63])
 m4trace:configure.in:19: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-m4trace:configure.in:19: -1- AC_SUBST([INSTALL_SCRIPT])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
 m4trace:configure.in:19: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-m4trace:configure.in:19: -1- AC_SUBST([INSTALL_DATA])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([INSTALL_DATA])
 m4trace:configure.in:19: -1- m4_pattern_allow([^INSTALL_DATA$])
-m4trace:configure.in:19: -1- AC_SUBST([am__isrc], [' -I$(srcdir)'])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([am__isrc])
 m4trace:configure.in:19: -1- m4_pattern_allow([^am__isrc$])
 m4trace:configure.in:19: -1- _AM_SUBST_NOTMAKE([am__isrc])
-m4trace:configure.in:19: -1- AC_SUBST([CYGPATH_W])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([CYGPATH_W])
 m4trace:configure.in:19: -1- m4_pattern_allow([^CYGPATH_W$])
-m4trace:configure.in:19: -1- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([PACKAGE])
+m4trace:configure.in:19: -1- _AM_SET_OPTIONS([foreign])
+m4trace:configure.in:19: -1- _AM_SET_OPTION([foreign])
+m4trace:configure.in:19: -2- _AM_MANGLE_OPTION([foreign])
 m4trace:configure.in:19: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.in:19: -1- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([VERSION])
 m4trace:configure.in:19: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.in:19: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
+m4trace:configure.in:19: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
+m4trace:configure.in:19: -2- _AM_MANGLE_OPTION([no-define])
 m4trace:configure.in:19: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.in:19: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
-#undef PACKAGE])
-m4trace:configure.in:19: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
 m4trace:configure.in:19: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.in:19: -1- AH_OUTPUT([VERSION], [/* Version number of package */
-#undef VERSION])
-m4trace:configure.in:19: -1- AC_REQUIRE_AUX_FILE([missing])
-m4trace:configure.in:19: -1- AC_SUBST([ACLOCAL])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([ACLOCAL])
+m4trace:configure.in:19: -1- AM_SANITY_CHECK
+m4trace:configure.in:19: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+m4trace:configure.in:19: -1- AM_MISSING_HAS_RUN
+m4trace:configure.in:19: -1- AM_AUX_DIR_EXPAND
 m4trace:configure.in:19: -1- m4_pattern_allow([^ACLOCAL$])
-m4trace:configure.in:19: -1- AC_SUBST([AUTOCONF])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([AUTOCONF])
+m4trace:configure.in:19: -1- AM_MISSING_PROG([AUTOCONF], [autoconf])
 m4trace:configure.in:19: -1- m4_pattern_allow([^AUTOCONF$])
-m4trace:configure.in:19: -1- AC_SUBST([AUTOMAKE])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([AUTOMAKE])
+m4trace:configure.in:19: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
 m4trace:configure.in:19: -1- m4_pattern_allow([^AUTOMAKE$])
-m4trace:configure.in:19: -1- AC_SUBST([AUTOHEADER])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([AUTOHEADER])
+m4trace:configure.in:19: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader])
 m4trace:configure.in:19: -1- m4_pattern_allow([^AUTOHEADER$])
-m4trace:configure.in:19: -1- AC_SUBST([MAKEINFO])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([MAKEINFO])
+m4trace:configure.in:19: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo])
 m4trace:configure.in:19: -1- m4_pattern_allow([^MAKEINFO$])
-m4trace:configure.in:19: -1- AC_SUBST([install_sh])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([install_sh])
+m4trace:configure.in:19: -1- AM_PROG_INSTALL_SH
 m4trace:configure.in:19: -1- m4_pattern_allow([^install_sh$])
-m4trace:configure.in:19: -1- AC_SUBST([STRIP])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([STRIP])
+m4trace:configure.in:19: -1- AM_PROG_INSTALL_STRIP
 m4trace:configure.in:19: -1- m4_pattern_allow([^STRIP$])
-m4trace:configure.in:19: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([INSTALL_STRIP_PROGRAM])
 m4trace:configure.in:19: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
-m4trace:configure.in:19: -1- AC_REQUIRE_AUX_FILE([install-sh])
-m4trace:configure.in:19: -1- AC_SUBST([MKDIR_P])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.in:19: -1- AM_PROG_MKDIR_P
 m4trace:configure.in:19: -1- m4_pattern_allow([^MKDIR_P$])
-m4trace:configure.in:19: -1- AC_SUBST([mkdir_p], ["$MKDIR_P"])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([mkdir_p])
 m4trace:configure.in:19: -1- m4_pattern_allow([^mkdir_p$])
-m4trace:configure.in:19: -1- AC_SUBST([AWK])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([AWK])
 m4trace:configure.in:19: -1- m4_pattern_allow([^AWK$])
-m4trace:configure.in:19: -1- AC_SUBST([SET_MAKE])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([SET_MAKE])
 m4trace:configure.in:19: -1- m4_pattern_allow([^SET_MAKE$])
-m4trace:configure.in:19: -1- AC_SUBST([am__leading_dot])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([am__leading_dot])
+m4trace:configure.in:19: -1- AM_SET_LEADING_DOT
 m4trace:configure.in:19: -1- m4_pattern_allow([^am__leading_dot$])
-m4trace:configure.in:19: -1- AC_SUBST([AMTAR])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([AMTAR])
+m4trace:configure.in:19: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
+m4trace:configure.in:19: -2- _AM_MANGLE_OPTION([tar-ustar])
+m4trace:configure.in:19: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])])
+m4trace:configure.in:19: -2- _AM_MANGLE_OPTION([tar-pax])
+m4trace:configure.in:19: -1- _AM_PROG_TAR([v7])
+m4trace:configure.in:19: -1- AM_MISSING_PROG([AMTAR], [tar])
 m4trace:configure.in:19: -1- m4_pattern_allow([^AMTAR$])
-m4trace:configure.in:19: -1- AC_SUBST([am__tar])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([am__tar])
 m4trace:configure.in:19: -1- m4_pattern_allow([^am__tar$])
-m4trace:configure.in:19: -1- AC_SUBST([am__untar])
-m4trace:configure.in:19: -1- AC_SUBST_TRACE([am__untar])
 m4trace:configure.in:19: -1- m4_pattern_allow([^am__untar$])
-m4trace:configure.in:21: -1- AC_CONFIG_HEADERS([config.h])
+m4trace:configure.in:19: -1- _AM_IF_OPTION([no-dependencies], [], [AC_PROVIDE_IFELSE([AC_PROG_CC],
+		  [_AM_DEPENDENCIES(CC)],
+		  [define([AC_PROG_CC],
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+		  [_AM_DEPENDENCIES(CXX)],
+		  [define([AC_PROG_CXX],
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+		  [_AM_DEPENDENCIES(OBJC)],
+		  [define([AC_PROG_OBJC],
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+m4trace:configure.in:19: -2- _AM_MANGLE_OPTION([no-dependencies])
+m4trace:configure.in:19: -1- _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])
+m4trace:configure.in:19: -2- _AM_MANGLE_OPTION([silent-rules])
 m4trace:configure.in:37: -1- AM_CONDITIONAL([HAVE_NEW_PICS], [ test x$NEWPICS = xyes ])
-m4trace:configure.in:37: -1- AC_SUBST([HAVE_NEW_PICS_TRUE])
-m4trace:configure.in:37: -1- AC_SUBST_TRACE([HAVE_NEW_PICS_TRUE])
 m4trace:configure.in:37: -1- m4_pattern_allow([^HAVE_NEW_PICS_TRUE$])
-m4trace:configure.in:37: -1- AC_SUBST([HAVE_NEW_PICS_FALSE])
-m4trace:configure.in:37: -1- AC_SUBST_TRACE([HAVE_NEW_PICS_FALSE])
 m4trace:configure.in:37: -1- m4_pattern_allow([^HAVE_NEW_PICS_FALSE$])
 m4trace:configure.in:37: -1- _AM_SUBST_NOTMAKE([HAVE_NEW_PICS_TRUE])
 m4trace:configure.in:37: -1- _AM_SUBST_NOTMAKE([HAVE_NEW_PICS_FALSE])
-m4trace:configure.in:60: -1- AC_SUBST([ARCH], [${ARCH:-16f877}])
-m4trace:configure.in:60: -1- AC_SUBST_TRACE([ARCH])
 m4trace:configure.in:60: -1- m4_pattern_allow([^ARCH$])
-m4trace:configure.in:61: -1- AC_SUBST([EARCH], [${EARCH:-16f1934}])
-m4trace:configure.in:61: -1- AC_SUBST_TRACE([EARCH])
 m4trace:configure.in:61: -1- m4_pattern_allow([^EARCH$])
-m4trace:configure.in:64: -1- AC_SUBST([CC], [\'$abs_top_builddir/../../../bin/sdcc\'])
-m4trace:configure.in:64: -1- AC_SUBST_TRACE([CC])
 m4trace:configure.in:64: -1- m4_pattern_allow([^CC$])
-m4trace:configure.in:65: -1- AC_SUBST([CCAS])
-m4trace:configure.in:65: -1- AC_SUBST_TRACE([CCAS])
 m4trace:configure.in:65: -1- m4_pattern_allow([^CCAS$])
-m4trace:configure.in:66: -1- AC_SUBST([LD])
-m4trace:configure.in:66: -1- AC_SUBST_TRACE([LD])
 m4trace:configure.in:66: -1- m4_pattern_allow([^LD$])
-m4trace:configure.in:67: -1- AC_SUBST([AR])
-m4trace:configure.in:67: -1- AC_SUBST_TRACE([AR])
 m4trace:configure.in:67: -1- m4_pattern_allow([^AR$])
-m4trace:configure.in:76: -1- AC_SUBST([CFLAGS], [])
-m4trace:configure.in:76: -1- AC_SUBST_TRACE([CFLAGS])
 m4trace:configure.in:76: -1- m4_pattern_allow([^CFLAGS$])
-m4trace:configure.in:77: -1- AC_SUBST([CCASFLAGS], [])
-m4trace:configure.in:77: -1- AC_SUBST_TRACE([CCASFLAGS])
 m4trace:configure.in:77: -1- m4_pattern_allow([^CCASFLAGS$])
-m4trace:configure.in:78: -1- AC_SUBST([LDFLAGS], ["-m -l -w"])
-m4trace:configure.in:78: -1- AC_SUBST_TRACE([LDFLAGS])
 m4trace:configure.in:78: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.in:79: -1- AC_SUBST([ARFLAGS], ["-c"])
-m4trace:configure.in:79: -1- AC_SUBST_TRACE([ARFLAGS])
 m4trace:configure.in:79: -1- m4_pattern_allow([^ARFLAGS$])
-m4trace:configure.in:80: -1- AC_SUBST([CCAS], [\'$CCAS\'])
-m4trace:configure.in:80: -1- AC_SUBST_TRACE([CCAS])
 m4trace:configure.in:80: -1- m4_pattern_allow([^CCAS$])
-m4trace:configure.in:81: -1- AC_SUBST([LD], [\'$LD\'])
-m4trace:configure.in:81: -1- AC_SUBST_TRACE([LD])
 m4trace:configure.in:81: -1- m4_pattern_allow([^LD$])
-m4trace:configure.in:82: -1- AC_SUBST([AR], [\'$AR\'])
-m4trace:configure.in:82: -1- AC_SUBST_TRACE([AR])
 m4trace:configure.in:82: -1- m4_pattern_allow([^AR$])
-m4trace:configure.in:85: -1- AC_SUBST([RANLIB], [:])
-m4trace:configure.in:85: -1- AC_SUBST_TRACE([RANLIB])
 m4trace:configure.in:85: -1- m4_pattern_allow([^RANLIB$])
-m4trace:configure.in:86: -1- AC_SUBST([OBJEXT], [o])
-m4trace:configure.in:86: -1- AC_SUBST_TRACE([OBJEXT])
 m4trace:configure.in:86: -1- m4_pattern_allow([^OBJEXT$])
-m4trace:configure.in:88: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([DEPDIR])
+m4trace:configure.in:88: -1- _AM_DEPENDENCIES([CC])
+m4trace:configure.in:88: -1- AM_SET_DEPDIR
 m4trace:configure.in:88: -1- m4_pattern_allow([^DEPDIR$])
-m4trace:configure.in:88: -1- AC_SUBST([am__include])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([am__include])
+m4trace:configure.in:88: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.in:88: -1- AM_MAKE_INCLUDE
 m4trace:configure.in:88: -1- m4_pattern_allow([^am__include$])
-m4trace:configure.in:88: -1- AC_SUBST([am__quote])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([am__quote])
 m4trace:configure.in:88: -1- m4_pattern_allow([^am__quote$])
+m4trace:configure.in:88: -1- AM_DEP_TRACK
 m4trace:configure.in:88: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-m4trace:configure.in:88: -1- AC_SUBST([AMDEP_TRUE])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([AMDEP_TRUE])
 m4trace:configure.in:88: -1- m4_pattern_allow([^AMDEP_TRUE$])
-m4trace:configure.in:88: -1- AC_SUBST([AMDEP_FALSE])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([AMDEP_FALSE])
 m4trace:configure.in:88: -1- m4_pattern_allow([^AMDEP_FALSE$])
 m4trace:configure.in:88: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
 m4trace:configure.in:88: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
-m4trace:configure.in:88: -1- AC_SUBST([AMDEPBACKSLASH])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([AMDEPBACKSLASH])
 m4trace:configure.in:88: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
 m4trace:configure.in:88: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
-m4trace:configure.in:88: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([CCDEPMODE])
 m4trace:configure.in:88: -1- m4_pattern_allow([^CCDEPMODE$])
 m4trace:configure.in:88: -1- AM_CONDITIONAL([am__fastdepCC], [
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
-m4trace:configure.in:88: -1- AC_SUBST([am__fastdepCC_TRUE])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE])
 m4trace:configure.in:88: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
-m4trace:configure.in:88: -1- AC_SUBST([am__fastdepCC_FALSE])
-m4trace:configure.in:88: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE])
 m4trace:configure.in:88: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
 m4trace:configure.in:88: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
 m4trace:configure.in:88: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
-m4trace:configure.in:89: -1- AC_SUBST([CCASDEPMODE], [depmode=$am_cv_CCAS_dependencies_compiler_type])
-m4trace:configure.in:89: -1- AC_SUBST_TRACE([CCASDEPMODE])
+m4trace:configure.in:89: -1- _AM_DEPENDENCIES([CCAS])
 m4trace:configure.in:89: -1- m4_pattern_allow([^CCASDEPMODE$])
 m4trace:configure.in:89: -1- AM_CONDITIONAL([am__fastdepCCAS], [
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3])
-m4trace:configure.in:89: -1- AC_SUBST([am__fastdepCCAS_TRUE])
-m4trace:configure.in:89: -1- AC_SUBST_TRACE([am__fastdepCCAS_TRUE])
 m4trace:configure.in:89: -1- m4_pattern_allow([^am__fastdepCCAS_TRUE$])
-m4trace:configure.in:89: -1- AC_SUBST([am__fastdepCCAS_FALSE])
-m4trace:configure.in:89: -1- AC_SUBST_TRACE([am__fastdepCCAS_FALSE])
 m4trace:configure.in:89: -1- m4_pattern_allow([^am__fastdepCCAS_FALSE$])
 m4trace:configure.in:89: -1- _AM_SUBST_NOTMAKE([am__fastdepCCAS_TRUE])
 m4trace:configure.in:89: -1- _AM_SUBST_NOTMAKE([am__fastdepCCAS_FALSE])
-m4trace:configure.in:99: -1- AC_CONFIG_FILES([Makefile
-                 libsdcc/enhanced/Makefile
-                 libsdcc/regular/Makefile
-		 libm/Makefile])
-m4trace:configure.in:103: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.in:103: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
 m4trace:configure.in:103: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.in:103: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.in:103: -1- AC_SUBST_TRACE([LTLIBOBJS])
 m4trace:configure.in:103: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.in:103: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.in:103: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.in:103: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.in:103: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.in:103: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.in:103: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.in:103: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.in:103: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.in:103: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.in:103: -1- AC_SUBST_TRACE([INSTALL])
-m4trace:configure.in:103: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.in:103: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
+m4trace:configure.in:103: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/autom4te.cache/traces.1 sdcc-3.2.0+dfsg/device/lib/pic14/autom4te.cache/traces.1
--- sdcc-3.1.0+dfsg/device/lib/pic14/autom4te.cache/traces.1	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/autom4te.cache/traces.1	2012-07-06 09:07:07.000000000 +0000
@@ -0,0 +1,351 @@
+m4trace:configure.in:18: -1- AC_INIT([pic14lib], [0.1], [tecodev AT users sourceforge net])
+m4trace:configure.in:18: -1- m4_pattern_forbid([^_?A[CHUM]_])
+m4trace:configure.in:18: -1- m4_pattern_forbid([_AC_])
+m4trace:configure.in:18: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
+m4trace:configure.in:18: -1- m4_pattern_allow([^AS_FLAGS$])
+m4trace:configure.in:18: -1- m4_pattern_forbid([^_?m4_])
+m4trace:configure.in:18: -1- m4_pattern_forbid([^dnl$])
+m4trace:configure.in:18: -1- m4_pattern_forbid([^_?AS_])
+m4trace:configure.in:18: -1- AC_SUBST([SHELL], [${CONFIG_SHELL-/bin/sh}])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([SHELL])
+m4trace:configure.in:18: -1- m4_pattern_allow([^SHELL$])
+m4trace:configure.in:18: -1- AC_SUBST([PATH_SEPARATOR])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([PATH_SEPARATOR])
+m4trace:configure.in:18: -1- m4_pattern_allow([^PATH_SEPARATOR$])
+m4trace:configure.in:18: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME],      ['AC_PACKAGE_NAME'])])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([PACKAGE_NAME])
+m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_NAME$])
+m4trace:configure.in:18: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME],   ['AC_PACKAGE_TARNAME'])])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([PACKAGE_TARNAME])
+m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
+m4trace:configure.in:18: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION],   ['AC_PACKAGE_VERSION'])])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([PACKAGE_VERSION])
+m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_VERSION$])
+m4trace:configure.in:18: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING],    ['AC_PACKAGE_STRING'])])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([PACKAGE_STRING])
+m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_STRING$])
+m4trace:configure.in:18: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT])
+m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
+m4trace:configure.in:18: -1- AC_SUBST([exec_prefix], [NONE])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([exec_prefix])
+m4trace:configure.in:18: -1- m4_pattern_allow([^exec_prefix$])
+m4trace:configure.in:18: -1- AC_SUBST([prefix], [NONE])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([prefix])
+m4trace:configure.in:18: -1- m4_pattern_allow([^prefix$])
+m4trace:configure.in:18: -1- AC_SUBST([program_transform_name], [s,x,x,])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([program_transform_name])
+m4trace:configure.in:18: -1- m4_pattern_allow([^program_transform_name$])
+m4trace:configure.in:18: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([bindir])
+m4trace:configure.in:18: -1- m4_pattern_allow([^bindir$])
+m4trace:configure.in:18: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([sbindir])
+m4trace:configure.in:18: -1- m4_pattern_allow([^sbindir$])
+m4trace:configure.in:18: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([libexecdir])
+m4trace:configure.in:18: -1- m4_pattern_allow([^libexecdir$])
+m4trace:configure.in:18: -1- AC_SUBST([datarootdir], ['${prefix}/share'])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([datarootdir])
+m4trace:configure.in:18: -1- m4_pattern_allow([^datarootdir$])
+m4trace:configure.in:18: -1- AC_SUBST([datadir], ['${datarootdir}'])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([datadir])
+m4trace:configure.in:18: -1- m4_pattern_allow([^datadir$])
+m4trace:configure.in:18: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([sysconfdir])
+m4trace:configure.in:18: -1- m4_pattern_allow([^sysconfdir$])
+m4trace:configure.in:18: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([sharedstatedir])
+m4trace:configure.in:18: -1- m4_pattern_allow([^sharedstatedir$])
+m4trace:configure.in:18: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([localstatedir])
+m4trace:configure.in:18: -1- m4_pattern_allow([^localstatedir$])
+m4trace:configure.in:18: -1- AC_SUBST([includedir], ['${prefix}/include'])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([includedir])
+m4trace:configure.in:18: -1- m4_pattern_allow([^includedir$])
+m4trace:configure.in:18: -1- AC_SUBST([oldincludedir], ['/usr/include'])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([oldincludedir])
+m4trace:configure.in:18: -1- m4_pattern_allow([^oldincludedir$])
+m4trace:configure.in:18: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
+				     ['${datarootdir}/doc/${PACKAGE_TARNAME}'],
+				     ['${datarootdir}/doc/${PACKAGE}'])])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([docdir])
+m4trace:configure.in:18: -1- m4_pattern_allow([^docdir$])
+m4trace:configure.in:18: -1- AC_SUBST([infodir], ['${datarootdir}/info'])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([infodir])
+m4trace:configure.in:18: -1- m4_pattern_allow([^infodir$])
+m4trace:configure.in:18: -1- AC_SUBST([htmldir], ['${docdir}'])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([htmldir])
+m4trace:configure.in:18: -1- m4_pattern_allow([^htmldir$])
+m4trace:configure.in:18: -1- AC_SUBST([dvidir], ['${docdir}'])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([dvidir])
+m4trace:configure.in:18: -1- m4_pattern_allow([^dvidir$])
+m4trace:configure.in:18: -1- AC_SUBST([pdfdir], ['${docdir}'])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([pdfdir])
+m4trace:configure.in:18: -1- m4_pattern_allow([^pdfdir$])
+m4trace:configure.in:18: -1- AC_SUBST([psdir], ['${docdir}'])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([psdir])
+m4trace:configure.in:18: -1- m4_pattern_allow([^psdir$])
+m4trace:configure.in:18: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([libdir])
+m4trace:configure.in:18: -1- m4_pattern_allow([^libdir$])
+m4trace:configure.in:18: -1- AC_SUBST([localedir], ['${datarootdir}/locale'])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([localedir])
+m4trace:configure.in:18: -1- m4_pattern_allow([^localedir$])
+m4trace:configure.in:18: -1- AC_SUBST([mandir], ['${datarootdir}/man'])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([mandir])
+m4trace:configure.in:18: -1- m4_pattern_allow([^mandir$])
+m4trace:configure.in:18: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
+m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_NAME$])
+m4trace:configure.in:18: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
+#undef PACKAGE_NAME])
+m4trace:configure.in:18: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
+m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
+m4trace:configure.in:18: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME])
+m4trace:configure.in:18: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
+m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_VERSION$])
+m4trace:configure.in:18: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
+#undef PACKAGE_VERSION])
+m4trace:configure.in:18: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
+m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_STRING$])
+m4trace:configure.in:18: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING])
+m4trace:configure.in:18: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
+m4trace:configure.in:18: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
+m4trace:configure.in:18: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT])
+m4trace:configure.in:18: -1- AC_SUBST([DEFS])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([DEFS])
+m4trace:configure.in:18: -1- m4_pattern_allow([^DEFS$])
+m4trace:configure.in:18: -1- AC_SUBST([ECHO_C])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([ECHO_C])
+m4trace:configure.in:18: -1- m4_pattern_allow([^ECHO_C$])
+m4trace:configure.in:18: -1- AC_SUBST([ECHO_N])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([ECHO_N])
+m4trace:configure.in:18: -1- m4_pattern_allow([^ECHO_N$])
+m4trace:configure.in:18: -1- AC_SUBST([ECHO_T])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([ECHO_T])
+m4trace:configure.in:18: -1- m4_pattern_allow([^ECHO_T$])
+m4trace:configure.in:18: -1- AC_SUBST([LIBS])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([LIBS])
+m4trace:configure.in:18: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.in:18: -1- AC_SUBST([build_alias])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([build_alias])
+m4trace:configure.in:18: -1- m4_pattern_allow([^build_alias$])
+m4trace:configure.in:18: -1- AC_SUBST([host_alias])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([host_alias])
+m4trace:configure.in:18: -1- m4_pattern_allow([^host_alias$])
+m4trace:configure.in:18: -1- AC_SUBST([target_alias])
+m4trace:configure.in:18: -1- AC_SUBST_TRACE([target_alias])
+m4trace:configure.in:18: -1- m4_pattern_allow([^target_alias$])
+m4trace:configure.in:19: -1- AM_INIT_AUTOMAKE([foreign])
+m4trace:configure.in:19: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
+m4trace:configure.in:19: -1- AM_AUTOMAKE_VERSION([1.11.1])
+m4trace:configure.in:19: -1- AC_REQUIRE_AUX_FILE([install-sh])
+m4trace:configure.in:19: -1- AC_SUBST([INSTALL_PROGRAM])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
+m4trace:configure.in:19: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+m4trace:configure.in:19: -1- AC_SUBST([INSTALL_SCRIPT])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
+m4trace:configure.in:19: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+m4trace:configure.in:19: -1- AC_SUBST([INSTALL_DATA])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([INSTALL_DATA])
+m4trace:configure.in:19: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.in:19: -1- AC_SUBST([am__isrc], [' -I$(srcdir)'])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([am__isrc])
+m4trace:configure.in:19: -1- m4_pattern_allow([^am__isrc$])
+m4trace:configure.in:19: -1- _AM_SUBST_NOTMAKE([am__isrc])
+m4trace:configure.in:19: -1- AC_SUBST([CYGPATH_W])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([CYGPATH_W])
+m4trace:configure.in:19: -1- m4_pattern_allow([^CYGPATH_W$])
+m4trace:configure.in:19: -1- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([PACKAGE])
+m4trace:configure.in:19: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.in:19: -1- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([VERSION])
+m4trace:configure.in:19: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.in:19: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
+m4trace:configure.in:19: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.in:19: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
+#undef PACKAGE])
+m4trace:configure.in:19: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
+m4trace:configure.in:19: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.in:19: -1- AH_OUTPUT([VERSION], [/* Version number of package */
+#undef VERSION])
+m4trace:configure.in:19: -1- AC_REQUIRE_AUX_FILE([missing])
+m4trace:configure.in:19: -1- AC_SUBST([ACLOCAL])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([ACLOCAL])
+m4trace:configure.in:19: -1- m4_pattern_allow([^ACLOCAL$])
+m4trace:configure.in:19: -1- AC_SUBST([AUTOCONF])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([AUTOCONF])
+m4trace:configure.in:19: -1- m4_pattern_allow([^AUTOCONF$])
+m4trace:configure.in:19: -1- AC_SUBST([AUTOMAKE])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([AUTOMAKE])
+m4trace:configure.in:19: -1- m4_pattern_allow([^AUTOMAKE$])
+m4trace:configure.in:19: -1- AC_SUBST([AUTOHEADER])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([AUTOHEADER])
+m4trace:configure.in:19: -1- m4_pattern_allow([^AUTOHEADER$])
+m4trace:configure.in:19: -1- AC_SUBST([MAKEINFO])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([MAKEINFO])
+m4trace:configure.in:19: -1- m4_pattern_allow([^MAKEINFO$])
+m4trace:configure.in:19: -1- AC_SUBST([install_sh])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([install_sh])
+m4trace:configure.in:19: -1- m4_pattern_allow([^install_sh$])
+m4trace:configure.in:19: -1- AC_SUBST([STRIP])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([STRIP])
+m4trace:configure.in:19: -1- m4_pattern_allow([^STRIP$])
+m4trace:configure.in:19: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([INSTALL_STRIP_PROGRAM])
+m4trace:configure.in:19: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
+m4trace:configure.in:19: -1- AC_REQUIRE_AUX_FILE([install-sh])
+m4trace:configure.in:19: -1- AC_SUBST([MKDIR_P])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.in:19: -1- m4_pattern_allow([^MKDIR_P$])
+m4trace:configure.in:19: -1- AC_SUBST([mkdir_p], ["$MKDIR_P"])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([mkdir_p])
+m4trace:configure.in:19: -1- m4_pattern_allow([^mkdir_p$])
+m4trace:configure.in:19: -1- AC_SUBST([AWK])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([AWK])
+m4trace:configure.in:19: -1- m4_pattern_allow([^AWK$])
+m4trace:configure.in:19: -1- AC_SUBST([SET_MAKE])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([SET_MAKE])
+m4trace:configure.in:19: -1- m4_pattern_allow([^SET_MAKE$])
+m4trace:configure.in:19: -1- AC_SUBST([am__leading_dot])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([am__leading_dot])
+m4trace:configure.in:19: -1- m4_pattern_allow([^am__leading_dot$])
+m4trace:configure.in:19: -1- AC_SUBST([AMTAR])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([AMTAR])
+m4trace:configure.in:19: -1- m4_pattern_allow([^AMTAR$])
+m4trace:configure.in:19: -1- AC_SUBST([am__tar])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([am__tar])
+m4trace:configure.in:19: -1- m4_pattern_allow([^am__tar$])
+m4trace:configure.in:19: -1- AC_SUBST([am__untar])
+m4trace:configure.in:19: -1- AC_SUBST_TRACE([am__untar])
+m4trace:configure.in:19: -1- m4_pattern_allow([^am__untar$])
+m4trace:configure.in:21: -1- AC_CONFIG_HEADERS([config.h])
+m4trace:configure.in:37: -1- AM_CONDITIONAL([HAVE_NEW_PICS], [ test x$NEWPICS = xyes ])
+m4trace:configure.in:37: -1- AC_SUBST([HAVE_NEW_PICS_TRUE])
+m4trace:configure.in:37: -1- AC_SUBST_TRACE([HAVE_NEW_PICS_TRUE])
+m4trace:configure.in:37: -1- m4_pattern_allow([^HAVE_NEW_PICS_TRUE$])
+m4trace:configure.in:37: -1- AC_SUBST([HAVE_NEW_PICS_FALSE])
+m4trace:configure.in:37: -1- AC_SUBST_TRACE([HAVE_NEW_PICS_FALSE])
+m4trace:configure.in:37: -1- m4_pattern_allow([^HAVE_NEW_PICS_FALSE$])
+m4trace:configure.in:37: -1- _AM_SUBST_NOTMAKE([HAVE_NEW_PICS_TRUE])
+m4trace:configure.in:37: -1- _AM_SUBST_NOTMAKE([HAVE_NEW_PICS_FALSE])
+m4trace:configure.in:60: -1- AC_SUBST([ARCH], [${ARCH:-16f877}])
+m4trace:configure.in:60: -1- AC_SUBST_TRACE([ARCH])
+m4trace:configure.in:60: -1- m4_pattern_allow([^ARCH$])
+m4trace:configure.in:61: -1- AC_SUBST([EARCH], [${EARCH:-16f1934}])
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([EARCH])
+m4trace:configure.in:61: -1- m4_pattern_allow([^EARCH$])
+m4trace:configure.in:64: -1- AC_SUBST([CC], [\'$abs_top_builddir/../../../bin/sdcc\'])
+m4trace:configure.in:64: -1- AC_SUBST_TRACE([CC])
+m4trace:configure.in:64: -1- m4_pattern_allow([^CC$])
+m4trace:configure.in:65: -1- AC_SUBST([CCAS])
+m4trace:configure.in:65: -1- AC_SUBST_TRACE([CCAS])
+m4trace:configure.in:65: -1- m4_pattern_allow([^CCAS$])
+m4trace:configure.in:66: -1- AC_SUBST([LD])
+m4trace:configure.in:66: -1- AC_SUBST_TRACE([LD])
+m4trace:configure.in:66: -1- m4_pattern_allow([^LD$])
+m4trace:configure.in:67: -1- AC_SUBST([AR])
+m4trace:configure.in:67: -1- AC_SUBST_TRACE([AR])
+m4trace:configure.in:67: -1- m4_pattern_allow([^AR$])
+m4trace:configure.in:76: -1- AC_SUBST([CFLAGS], [""])
+m4trace:configure.in:76: -1- AC_SUBST_TRACE([CFLAGS])
+m4trace:configure.in:76: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.in:77: -1- AC_SUBST([CCASFLAGS], [""])
+m4trace:configure.in:77: -1- AC_SUBST_TRACE([CCASFLAGS])
+m4trace:configure.in:77: -1- m4_pattern_allow([^CCASFLAGS$])
+m4trace:configure.in:78: -1- AC_SUBST([LDFLAGS], ["-m -l -w"])
+m4trace:configure.in:78: -1- AC_SUBST_TRACE([LDFLAGS])
+m4trace:configure.in:78: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.in:79: -1- AC_SUBST([ARFLAGS], ["-c"])
+m4trace:configure.in:79: -1- AC_SUBST_TRACE([ARFLAGS])
+m4trace:configure.in:79: -1- m4_pattern_allow([^ARFLAGS$])
+m4trace:configure.in:80: -1- AC_SUBST([CCAS], [\'$CCAS\'])
+m4trace:configure.in:80: -1- AC_SUBST_TRACE([CCAS])
+m4trace:configure.in:80: -1- m4_pattern_allow([^CCAS$])
+m4trace:configure.in:81: -1- AC_SUBST([LD], [\'$LD\'])
+m4trace:configure.in:81: -1- AC_SUBST_TRACE([LD])
+m4trace:configure.in:81: -1- m4_pattern_allow([^LD$])
+m4trace:configure.in:82: -1- AC_SUBST([AR], [\'$AR\'])
+m4trace:configure.in:82: -1- AC_SUBST_TRACE([AR])
+m4trace:configure.in:82: -1- m4_pattern_allow([^AR$])
+m4trace:configure.in:85: -1- AC_SUBST([RANLIB], [:])
+m4trace:configure.in:85: -1- AC_SUBST_TRACE([RANLIB])
+m4trace:configure.in:85: -1- m4_pattern_allow([^RANLIB$])
+m4trace:configure.in:86: -1- AC_SUBST([OBJEXT], [o])
+m4trace:configure.in:86: -1- AC_SUBST_TRACE([OBJEXT])
+m4trace:configure.in:86: -1- m4_pattern_allow([^OBJEXT$])
+m4trace:configure.in:88: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([DEPDIR])
+m4trace:configure.in:88: -1- m4_pattern_allow([^DEPDIR$])
+m4trace:configure.in:88: -1- AC_SUBST([am__include])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([am__include])
+m4trace:configure.in:88: -1- m4_pattern_allow([^am__include$])
+m4trace:configure.in:88: -1- AC_SUBST([am__quote])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([am__quote])
+m4trace:configure.in:88: -1- m4_pattern_allow([^am__quote$])
+m4trace:configure.in:88: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+m4trace:configure.in:88: -1- AC_SUBST([AMDEP_TRUE])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([AMDEP_TRUE])
+m4trace:configure.in:88: -1- m4_pattern_allow([^AMDEP_TRUE$])
+m4trace:configure.in:88: -1- AC_SUBST([AMDEP_FALSE])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([AMDEP_FALSE])
+m4trace:configure.in:88: -1- m4_pattern_allow([^AMDEP_FALSE$])
+m4trace:configure.in:88: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
+m4trace:configure.in:88: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
+m4trace:configure.in:88: -1- AC_SUBST([AMDEPBACKSLASH])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([AMDEPBACKSLASH])
+m4trace:configure.in:88: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
+m4trace:configure.in:88: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
+m4trace:configure.in:88: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([CCDEPMODE])
+m4trace:configure.in:88: -1- m4_pattern_allow([^CCDEPMODE$])
+m4trace:configure.in:88: -1- AM_CONDITIONAL([am__fastdepCC], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
+m4trace:configure.in:88: -1- AC_SUBST([am__fastdepCC_TRUE])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE])
+m4trace:configure.in:88: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
+m4trace:configure.in:88: -1- AC_SUBST([am__fastdepCC_FALSE])
+m4trace:configure.in:88: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE])
+m4trace:configure.in:88: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
+m4trace:configure.in:88: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
+m4trace:configure.in:88: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
+m4trace:configure.in:89: -1- AC_SUBST([CCASDEPMODE], [depmode=$am_cv_CCAS_dependencies_compiler_type])
+m4trace:configure.in:89: -1- AC_SUBST_TRACE([CCASDEPMODE])
+m4trace:configure.in:89: -1- m4_pattern_allow([^CCASDEPMODE$])
+m4trace:configure.in:89: -1- AM_CONDITIONAL([am__fastdepCCAS], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3])
+m4trace:configure.in:89: -1- AC_SUBST([am__fastdepCCAS_TRUE])
+m4trace:configure.in:89: -1- AC_SUBST_TRACE([am__fastdepCCAS_TRUE])
+m4trace:configure.in:89: -1- m4_pattern_allow([^am__fastdepCCAS_TRUE$])
+m4trace:configure.in:89: -1- AC_SUBST([am__fastdepCCAS_FALSE])
+m4trace:configure.in:89: -1- AC_SUBST_TRACE([am__fastdepCCAS_FALSE])
+m4trace:configure.in:89: -1- m4_pattern_allow([^am__fastdepCCAS_FALSE$])
+m4trace:configure.in:89: -1- _AM_SUBST_NOTMAKE([am__fastdepCCAS_TRUE])
+m4trace:configure.in:89: -1- _AM_SUBST_NOTMAKE([am__fastdepCCAS_FALSE])
+m4trace:configure.in:99: -1- AC_CONFIG_FILES([Makefile
+                 libsdcc/enhanced/Makefile
+                 libsdcc/regular/Makefile
+		 libm/Makefile])
+m4trace:configure.in:103: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.in:103: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.in:103: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.in:103: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.in:103: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.in:103: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.in:103: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.in:103: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.in:103: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.in:103: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.in:103: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.in:103: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.in:103: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.in:103: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.in:103: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.in:103: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.in:103: -1- AC_SUBST_TRACE([MKDIR_P])
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/configure sdcc-3.2.0+dfsg/device/lib/pic14/configure
--- sdcc-3.1.0+dfsg/device/lib/pic14/configure	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/configure	2012-07-06 09:07:11.000000000 +0000
@@ -1,24 +1,20 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for pic14lib 0.1.
+# Generated by GNU Autoconf 2.63 for pic14lib 0.1.
 #
 # Report bugs to <tecodev AT users sourceforge net>.
 #
-#
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
-#
-#
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -26,15 +22,23 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
 esac
+
 fi
 
 
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
 as_nl='
 '
 export as_nl
@@ -42,13 +46,7 @@
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -59,7 +57,7 @@
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in #(
+      case $arg in
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -82,6 +80,13 @@
   }
 fi
 
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -91,15 +96,15 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
+case $0 in
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
 IFS=$as_save_IFS
 
      ;;
@@ -111,16 +116,12 @@
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
+  { (exit 1); exit 1; }
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 done
 PS1='$ '
 PS2='> '
@@ -132,299 +133,330 @@
 LANGUAGE=C
 export LANGUAGE
 
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
 # CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+$as_unset CDPATH
+
 
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
 else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
+  as_have_required=no
 fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
+
+  if test $as_have_required = yes &&	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
 
 exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
 
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
 else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
 else
-  as_have_required=no
+  exitcode=1
+  echo positional parameters were not saved.
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
 else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
+  as_candidate_shells=
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
+  case $as_dir in
 	 /*)
 	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
 	   done;;
        esac
-  as_found=false
 done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
 IFS=$as_save_IFS
 
 
-      if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
 
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and tecodev AT users
-$0: sourceforge net about your system, including any error
-$0: possibly output before this message. Then install a
-$0: modern shell, or manually run the script under such a
-$0: shell if you do have one."
-  fi
-  exit 1
-fi
 fi
+
+
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
 
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
+
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
 }
-as_unset=as_fn_unset
 
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
 
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
 
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
 
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
 
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
 else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
+  exitcode=1
+  echo positional parameters were not saved.
+fi
 
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
+test $exitcode = 0) || { (exit 1); exit 1; }
 
+(
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
+_ASEOF
+}; then
+  break
+fi
 
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
 else
-  as_expr=false
+  exitcode=1
+  echo as_func_success failed.
 fi
 
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
 else
-  as_basename=false
+  exitcode=1
+  echo as_func_ret_success failed.
 fi
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
 else
-  as_dirname=false
+  exitcode=1
+  echo positional parameters were not saved.
 fi
 
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell bug-autoconf@gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
+}
 
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -441,7 +473,8 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
@@ -451,18 +484,29 @@
   exit
 }
 
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
+case `echo -n x` in
 -n*)
-  case `echo 'xy\c'` in
+  case `echo 'x\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
+  *)   ECHO_C='\c';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -492,7 +536,7 @@
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
+  as_mkdir_p=:
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -511,10 +555,10 @@
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in #(
+	case $1 in
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -528,11 +572,11 @@
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
+
+exec 7<&0 </dev/null 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -547,6 +591,7 @@
 subdirs=
 MFLAGS=
 MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME='pic14lib'
@@ -554,7 +599,6 @@
 PACKAGE_VERSION='0.1'
 PACKAGE_STRING='pic14lib 0.1'
 PACKAGE_BUGREPORT='tecodev AT users sourceforge net'
-PACKAGE_URL=''
 
 ac_unique_file="libsdcc/idata.c"
 ac_subst_vars='LTLIBOBJS
@@ -638,7 +682,6 @@
 program_transform_name
 prefix
 exec_prefix
-PACKAGE_URL
 PACKAGE_BUGREPORT
 PACKAGE_STRING
 PACKAGE_VERSION
@@ -717,9 +760,8 @@
   fi
 
   case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -764,7 +806,8 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -790,7 +833,8 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -994,7 +1038,8 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1010,7 +1055,8 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1040,17 +1086,17 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-    esac
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
@@ -1067,13 +1113,15 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1096,7 +1144,8 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; }
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1110,8 +1159,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1126,9 +1175,11 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
+   { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+   { (exit 1); exit 1; }; }
 
 
 # Find the source files, if location was not specified.
@@ -1167,11 +1218,13 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
+   { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1211,7 +1264,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
+  -q, --quiet, --silent   do not print \`checking...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1272,7 +1325,7 @@
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-new-pics       Enable use of PIC devices added to gputils after the
-                          0.13.7 release. Requires custom-built gputils
+                          0.14.1 release. Requires custom-built gputils
                           obtained from their SVN repository!
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
@@ -1341,24 +1394,21 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 pic14lib configure 0.1
-generated by GNU Autoconf 2.67
+generated by GNU Autoconf 2.63
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by pic14lib $as_me 0.1, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
 
@@ -1394,8 +1444,8 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
+  $as_echo "PATH: $as_dir"
+done
 IFS=$as_save_IFS
 
 } >&5
@@ -1432,9 +1482,9 @@
       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
     2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -1450,13 +1500,13 @@
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      as_fn_append ac_configure_args " '$ac_arg'"
+      ac_configure_args="$ac_configure_args '$ac_arg'"
       ;;
     esac
   done
 done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
@@ -1468,9 +1518,11 @@
   {
     echo
 
-    $as_echo "## ---------------- ##
+    cat <<\_ASBOX
+## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -1479,13 +1531,13 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
+      *) $as_unset $ac_var ;;
       esac ;;
     esac
   done
@@ -1504,9 +1556,11 @@
 )
     echo
 
-    $as_echo "## ----------------- ##
+    cat <<\_ASBOX
+## ----------------- ##
 ## Output variables. ##
-## ----------------- ##"
+## ----------------- ##
+_ASBOX
     echo
     for ac_var in $ac_subst_vars
     do
@@ -1519,9 +1573,11 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      cat <<\_ASBOX
+## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##"
+## ------------------- ##
+_ASBOX
       echo
       for ac_var in $ac_subst_files
       do
@@ -1535,9 +1591,11 @@
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      cat <<\_ASBOX
+## ----------- ##
 ## confdefs.h. ##
-## ----------- ##"
+## ----------- ##
+_ASBOX
       echo
       cat confdefs.h
       echo
@@ -1551,39 +1609,37 @@
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-$as_echo "/* confdefs.h */" > confdefs.h
-
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
+
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
+
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
+
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
 
 cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
 
@@ -1592,12 +1648,7 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -1608,23 +1659,19 @@
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+  if test -r "$ac_site_file"; then
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+    . "$ac_site_file"
   fi
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+  # Some versions of bash will fail to source /dev/null (special
+  # files actually), so we avoid doing that.
+  if test -f "$cache_file"; then
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -1632,7 +1679,7 @@
     esac
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
 $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1647,11 +1694,11 @@
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
@@ -1661,17 +1708,17 @@
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
 $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
 $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
@@ -1683,20 +1730,43 @@
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -1724,7 +1794,9 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1750,10 +1822,10 @@
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if test "${ac_cv_path_install+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -1761,11 +1833,11 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
+  # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+  ./ | .// | /cC/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -1802,7 +1874,7 @@
     ;;
 esac
 
-  done
+done
 IFS=$as_save_IFS
 
 rm -rf conftest.one conftest.two conftest.dir
@@ -1818,7 +1890,7 @@
     INSTALL=$ac_install_sh
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
 $as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -1829,7 +1901,7 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
 # Just in case
 sleep 1
@@ -1840,11 +1912,15 @@
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+    { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
+$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
+   { (exit 1); exit 1; }; };;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+    { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
+$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
+   { (exit 1); exit 1; }; };;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -1866,8 +1942,11 @@
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" >&5
+$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" >&2;}
+   { (exit 1); exit 1; }; }
    fi
 
    test "$2" = conftest.file
@@ -1876,10 +1955,13 @@
    # Ok.
    :
 else
-   as_fn_error $? "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+Check your system clock" >&5
+$as_echo "$as_me: error: newly created file is older than distributed files!
+Check your system clock" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
@@ -1907,7 +1989,7 @@
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
@@ -1928,9 +2010,9 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -1941,24 +2023,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
 $as_echo "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -1968,9 +2050,9 @@
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -1981,24 +2063,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
 $as_echo "$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2007,7 +2089,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2020,10 +2102,10 @@
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then :
+  if test "${ac_cv_path_mkdir+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2031,7 +2113,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
+  for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
 	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
@@ -2043,12 +2125,11 @@
 	   esac
 	 done
        done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 
-  test -d ./--version && rmdir ./--version
   if test "${ac_cv_path_mkdir+set}" = set; then
     MKDIR_P="$ac_cv_path_mkdir -p"
   else
@@ -2056,10 +2137,11 @@
     # value for MKDIR_P within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
 mkdir_p="$MKDIR_P"
@@ -2072,9 +2154,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if test "${ac_cv_prog_AWK+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -2085,24 +2167,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
 $as_echo "$AWK" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2110,11 +2192,11 @@
   test -n "$AWK" && break
 done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2122,7 +2204,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2132,11 +2214,11 @@
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2156,7 +2238,9 @@
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+   { (exit 1); exit 1; }; }
   fi
 fi
 
@@ -2219,13 +2303,15 @@
 
 NEWPICS=no;
 # Check whether --enable-new-pics was given.
-if test "${enable_new_pics+set}" = set; then :
+if test "${enable_new_pics+set}" = set; then
   enableval=$enable_new_pics;  case "x$enableval" in
       xyes) NEWPICS=yes;
-            { $as_echo "$as_me:${as_lineno-$LINENO}: Enabling support for PICs from unreleased gputils -- make sure you have up-to-date gputils from SVN." >&5
+            { $as_echo "$as_me:$LINENO: Enabling support for PICs from unreleased gputils -- make sure you have up-to-date gputils from SVN." >&5
 $as_echo "$as_me: Enabling support for PICs from unreleased gputils -- make sure you have up-to-date gputils from SVN." >&6;};;
       xno) NEWPICS=no;;
-      *) as_fn_error $? "bad value \"${enableval}\" for --enable-new-pics" "$LINENO" 5 ;;
+      *) { { $as_echo "$as_me:$LINENO: error: bad value \"${enableval}\" for --enable-new-pics" >&5
+$as_echo "$as_me: error: bad value \"${enableval}\" for --enable-new-pics" >&2;}
+   { (exit 1); exit 1; }; };;
       esac
 else
    NEWPICS=no
@@ -2273,9 +2359,9 @@
 
 # Extract the first word of "gpasm", so it can be a program name with args.
 set dummy gpasm; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CCAS+set}" = set; then :
+if test "${ac_cv_path_CCAS+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $CCAS in
@@ -2288,14 +2374,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CCAS="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_CCAS" && ac_cv_path_CCAS=":"
@@ -2304,19 +2390,19 @@
 fi
 CCAS=$ac_cv_path_CCAS
 if test -n "$CCAS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCAS" >&5
+  { $as_echo "$as_me:$LINENO: result: $CCAS" >&5
 $as_echo "$CCAS" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "gplink", so it can be a program name with args.
 set dummy gplink; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_LD+set}" = set; then :
+if test "${ac_cv_path_LD+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $LD in
@@ -2329,14 +2415,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_LD="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_LD" && ac_cv_path_LD=":"
@@ -2345,19 +2431,19 @@
 fi
 LD=$ac_cv_path_LD
 if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
 $as_echo "$LD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "gplib", so it can be a program name with args.
 set dummy gplib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_AR+set}" = set; then :
+if test "${ac_cv_path_AR+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $AR in
@@ -2370,14 +2456,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_AR" && ac_cv_path_AR=":"
@@ -2386,10 +2472,10 @@
 fi
 AR=$ac_cv_path_AR
 if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
 $as_echo "$AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2397,12 +2483,17 @@
 
 case ":$CCAS:$LD:$AR:" in
     *:::*)
-        as_fn_error $? "gputils (gpasm, gplink, and gplib) are required but not found.
-Either install gputils or reconfigure with --disable-pic14-port and --disable-pic16-port." "$LINENO" 5
+        { { $as_echo "$as_me:$LINENO: error: gputils (gpasm, gplink, and gplib) are required but not found.
+Either install gputils or reconfigure with --disable-pic14-port and --disable-pic16-port." >&5
+$as_echo "$as_me: error: gputils (gpasm, gplink, and gplib) are required but not found.
+Either install gputils or reconfigure with --disable-pic14-port and --disable-pic16-port." >&2;}
+   { (exit 1); exit 1; }; }
         ;;
 esac;
 
+CFLAGS=""
 
+CCASFLAGS=""
 
 LDFLAGS="-m -l -w"
 
@@ -2433,7 +2524,7 @@
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
 $as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
@@ -2461,12 +2552,12 @@
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
 $as_echo "$_am_result" >&6; }
 rm -f confinc confmf
 
 # Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
+if test "${enable_dependency_tracking+set}" = set; then
   enableval=$enable_dependency_tracking;
 fi
 
@@ -2486,9 +2577,9 @@
 
 depcc="$CC"   am_compiler_list=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -2596,7 +2687,7 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
@@ -2614,9 +2705,9 @@
 
 depcc="$CCAS"   am_compiler_list=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then :
+if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -2722,7 +2813,7 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5
 $as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; }
 CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type
 
@@ -2775,13 +2866,13 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
+      *) $as_unset $ac_var ;;
       esac ;;
     esac
   done
@@ -2789,8 +2880,8 @@
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -2813,11 +2904,11 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -2831,15 +2922,14 @@
 
 ac_libobjs=
 ac_ltlibobjs=
-U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -2848,30 +2938,41 @@
 
 
 if test -z "${HAVE_NEW_PICS_TRUE}" && test -z "${HAVE_NEW_PICS_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_NEW_PICS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_NEW_PICS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"HAVE_NEW_PICS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -2881,18 +2982,17 @@
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-
 SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -2900,15 +3000,23 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
 esac
+
 fi
 
 
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
 as_nl='
 '
 export as_nl
@@ -2916,13 +3024,7 @@
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -2933,7 +3035,7 @@
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in #(
+      case $arg in
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -2956,6 +3058,13 @@
   }
 fi
 
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -2965,15 +3074,15 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
+case $0 in
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
 IFS=$as_save_IFS
 
      ;;
@@ -2985,16 +3094,12 @@
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
+  { (exit 1); exit 1; }
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 done
 PS1='$ '
 PS2='> '
@@ -3006,89 +3111,7 @@
 LANGUAGE=C
 export LANGUAGE
 
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
+# Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -3102,12 +3125,8 @@
   as_basename=false
 fi
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
 
+# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
@@ -3127,25 +3146,76 @@
 	  }
 	  s/.*/./; q'`
 
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+# CDPATH.
+$as_unset CDPATH
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
+case `echo -n x` in
 -n*)
-  case `echo 'xy\c'` in
+  case `echo 'x\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
+  *)   ECHO_C='\c';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -3174,56 +3244,8 @@
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
+  as_mkdir_p=:
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -3242,10 +3264,10 @@
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in #(
+	case $1 in
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -3260,19 +3282,13 @@
 
 
 exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
+# Save the log message, to keep $[0] and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 This file was extended by pic14lib $as_me 0.1, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -3304,15 +3320,13 @@
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
+\`$as_me' instantiates files from templates according to the
+current configuration.
 
-Usage: $0 [OPTION]... [TAG]...
+Usage: $0 [OPTION]... [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -3331,17 +3345,16 @@
 Configuration commands:
 $config_commands
 
-Report bugs to <tecodev AT users sourceforge net>."
+Report bugs to <bug-autoconf@gnu.org>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 pic14lib config.status 0.1
-configured by $0, generated by GNU Autoconf 2.67,
-  with options \\"\$ac_cs_config\\"
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -3359,16 +3372,11 @@
 while test $# != 0
 do
   case $1 in
-  --*=?*)
+  --*=*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -3382,29 +3390,27 @@
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
     esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
+    { $as_echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; };;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
@@ -3412,10 +3418,11 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; } ;;
 
-  *) as_fn_append ac_config_targets " $1"
+  *) ac_config_targets="$ac_config_targets $1"
      ac_need_defaults=false ;;
 
   esac
@@ -3473,7 +3480,9 @@
     "libsdcc/regular/Makefile") CONFIG_FILES="$CONFIG_FILES libsdcc/regular/Makefile" ;;
     "libm/Makefile") CONFIG_FILES="$CONFIG_FILES libm/Makefile" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
   esac
 done
 
@@ -3500,7 +3509,7 @@
   trap 'exit_status=$?
   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
-  trap 'as_fn_exit 1' 1 2 13 15
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
@@ -3511,7 +3520,11 @@
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+} ||
+{
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
+   { (exit 1); exit 1; }
+}
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -3519,13 +3532,7 @@
 if test -n "$CONFIG_FILES"; then
 
 
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
+ac_cr='
'
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
   ac_cs_awk_cr='\\r'
@@ -3542,18 +3549,24 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -3575,7 +3588,7 @@
 t delim
 :nl
 h
-s/\(.\{148\}\)..*/\1/
+s/\(.\{148\}\).*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -3589,7 +3602,7 @@
 t nl
 :delim
 h
-s/\(.\{148\}\)..*/\1/
+s/\(.\{148\}\).*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
@@ -3642,28 +3655,22 @@
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
 s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -3691,7 +3698,9 @@
   if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+   { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -3776,7 +3785,9 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -3789,7 +3800,9 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+   { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -3817,10 +3830,12 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+   { (exit 1); exit 1; }; };;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
@@ -3831,7 +3846,7 @@
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
 $as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
@@ -3844,7 +3859,9 @@
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -3872,7 +3889,47 @@
 	    q
 	  }
 	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
+  { as_dir="$ac_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
@@ -3929,6 +3986,7 @@
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
+
 ac_sed_dataroot='
 /datarootdir/ {
   p
@@ -3938,11 +3996,12 @@
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
-/@mandir@/p'
+/@mandir@/p
+'
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -3952,7 +4011,7 @@
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
+    s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
@@ -3981,22 +4040,26 @@
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
+which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
   :H)
   #
@@ -4007,19 +4070,25 @@
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
     } >"$tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -4057,7 +4126,7 @@
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
 $as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
@@ -4152,7 +4221,47 @@
 	    q
 	  }
 	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      { as_dir=$dirpart/$fdir
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
       # echo "creating $dirpart/$file"
       echo '# dummy' > "$dirpart/$file"
     done
@@ -4164,12 +4273,15 @@
 done # for ac_tag
 
 
-as_fn_exit 0
+{ (exit 0); exit 0; }
 _ACEOF
+chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -4190,10 +4302,10 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
+  $ac_cs_success || { (exit 1); exit 1; }
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/configure.in sdcc-3.2.0+dfsg/device/lib/pic14/configure.in
--- sdcc-3.1.0+dfsg/device/lib/pic14/configure.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/configure.in	2012-01-18 23:52:23.000000000 +0000
@@ -10,7 +10,7 @@
 # Adopted for the SDCC/pic14 library by
 #	Raphael Neider <rneider AT web.de>
 #
-# $Id: configure.in 7001 2011-11-01 16:35:46Z tecodev $
+# $Id: configure.in 7239 2012-01-18 23:52:23Z borutr $
 #
 
 # Process this file with autoconf to produce a configure script.
@@ -24,7 +24,7 @@
 NEWPICS=no;
 AC_ARG_ENABLE(
     [new-pics],
-    AS_HELP_STRING([--enable-new-pics], [Enable use of PIC devices added to gputils after the 0.13.7 release. Requires custom-built gputils obtained from their SVN repository!]),
+    AS_HELP_STRING([--enable-new-pics], [Enable use of PIC devices added to gputils after the 0.14.1 release. Requires custom-built gputils obtained from their SVN repository!]),
     [ case "x$enableval" in
       xyes) NEWPICS=yes;
             AC_MSG_NOTICE([Enabling support for PICs from unreleased gputils -- make sure you have up-to-date gputils from SVN.]);;
@@ -73,8 +73,8 @@
         ;;
 esac;
 
-AC_SUBST(CFLAGS, [])
-AC_SUBST(CCASFLAGS, [])
+AC_SUBST(CFLAGS, [""])
+AC_SUBST(CCASFLAGS, [""])
 AC_SUBST(LDFLAGS, ["-m -l -w"])
 AC_SUBST(ARFLAGS, ["-c"])
 AC_SUBST(CCAS, [\'$CCAS\'])
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/Makefile.am sdcc-3.2.0+dfsg/device/lib/pic14/libm/Makefile.am
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/Makefile.am	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/Makefile.am	2012-01-20 17:19:33.000000000 +0000
@@ -1,6 +1,6 @@
 ## Process this file with Automake to create Makefile.in
 
-noinst_LIBRARIES = libm.a
+noinst_LIBRARIES = libm.a libme.a
 
 libm_a_SOURCES =
 libm_a_SOURCES += acosf.c
@@ -33,13 +33,23 @@
 
 libm_a_CFLAGS = -p$(ARCH) $(AM_CFLAGS)
 
-if HAVE_NEW_PICS
-noinst_LIBRARIES += libme.a
-
 libme_a_SOURCES = $(libm_a_SOURCES)
 
 limbe_a_CFLAGS = -p$(EARCH) $(AM_CFLAGS)
+
+if HAVE_NEW_PICS
+# add new pics libraries to be built here
+noinst_LIBRARIES +=
+
+## replace <new_pics> with the new library name,
+## add sources for new libraries and
+## uncomment the following line
+#<new_pics>_a_SOURCES = $(libm_a_SOURCES)
+
+## replace <new_pics> with the new library name,
+## add CFLAGS for compiling new libraries and
+## uncomment the following line
+#<new_pics>_a_CFLAGS = -p$(EARCH) $(AM_CFLAGS)
 endif
 
 include $(top_srcdir)/Makefile.common
-
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/Makefile.in sdcc-3.2.0+dfsg/device/lib/pic14/libm/Makefile.in
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/Makefile.in	2012-07-06 09:07:08.000000000 +0000
@@ -32,7 +32,9 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-@HAVE_NEW_PICS_TRUE@am__append_1 = libme.a
+
+# add new pics libraries to be built here
+@HAVE_NEW_PICS_TRUE@am__append_1 = 
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/Makefile.common
 subdir = libm
@@ -64,10 +66,6 @@
 libm_a_OBJECTS = $(am_libm_a_OBJECTS)
 libme_a_AR = $(AR) $(ARFLAGS)
 libme_a_LIBADD =
-am__libme_a_SOURCES_DIST = acosf.c asincosf.c asinf.c atan2f.c atanf.c \
-	ceilf.c cosf.c coshf.c cotf.c errno.c expf.c fabsf.c floorf.c \
-	frexpf.c ldexpf.c log10f.c logf.c modff.c powf.c sincosf.c \
-	sincoshf.c sinf.c sinhf.c sqrtf.c tancotf.c tanf.c tanhf.c
 am__objects_1 = acosf.$(OBJEXT) asincosf.$(OBJEXT) asinf.$(OBJEXT) \
 	atan2f.$(OBJEXT) atanf.$(OBJEXT) ceilf.$(OBJEXT) \
 	cosf.$(OBJEXT) coshf.$(OBJEXT) cotf.$(OBJEXT) errno.$(OBJEXT) \
@@ -77,7 +75,7 @@
 	sincosf.$(OBJEXT) sincoshf.$(OBJEXT) sinf.$(OBJEXT) \
 	sinhf.$(OBJEXT) sqrtf.$(OBJEXT) tancotf.$(OBJEXT) \
 	tanf.$(OBJEXT) tanhf.$(OBJEXT)
-@HAVE_NEW_PICS_TRUE@am_libme_a_OBJECTS = $(am__objects_1)
+am_libme_a_OBJECTS = $(am__objects_1)
 libme_a_OBJECTS = $(am_libme_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -88,7 +86,7 @@
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libm_a_SOURCES) $(libme_a_SOURCES)
-DIST_SOURCES = $(libm_a_SOURCES) $(am__libme_a_SOURCES_DIST)
+DIST_SOURCES = $(libm_a_SOURCES) $(libme_a_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -180,14 +178,14 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-noinst_LIBRARIES = libm.a $(am__append_1)
+noinst_LIBRARIES = libm.a libme.a $(am__append_1)
 libm_a_SOURCES = acosf.c asincosf.c asinf.c atan2f.c atanf.c ceilf.c \
 	cosf.c coshf.c cotf.c errno.c expf.c fabsf.c floorf.c frexpf.c \
 	ldexpf.c log10f.c logf.c modff.c powf.c sincosf.c sincoshf.c \
 	sinf.c sinhf.c sqrtf.c tancotf.c tanf.c tanhf.c
 libm_a_CFLAGS = -p$(ARCH) $(AM_CFLAGS)
-@HAVE_NEW_PICS_TRUE@libme_a_SOURCES = $(libm_a_SOURCES)
-@HAVE_NEW_PICS_TRUE@limbe_a_CFLAGS = -p$(EARCH) $(AM_CFLAGS)
+libme_a_SOURCES = $(libm_a_SOURCES)
+limbe_a_CFLAGS = -p$(EARCH) $(AM_CFLAGS)
 AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic14 \
 	-I$(top_srcdir)/../../non-free/include/pic14
 #AM_CFLAGS += --asm="$(CCAS)"
@@ -916,6 +914,10 @@
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@); \
 	done
 
+#<new_pics>_a_SOURCES = $(libm_a_SOURCES)
+
+#<new_pics>_a_CFLAGS = -p$(EARCH) $(AM_CFLAGS)
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/acosf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/acosf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/acosf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/acosf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/asincosf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/asincosf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/asincosf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/asincosf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/asinf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/asinf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/asinf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/asinf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/atan2f.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/atan2f.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/atan2f.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/atan2f.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/atanf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/atanf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/atanf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/atanf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/ceilf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/ceilf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/ceilf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/ceilf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/cosf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/cosf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/cosf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/cosf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/coshf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/coshf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/coshf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/coshf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/cotf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/cotf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/cotf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/cotf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/errno.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/errno.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/errno.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/errno.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/expf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/expf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/expf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/expf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/fabsf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/fabsf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/fabsf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/fabsf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/floorf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/floorf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/floorf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/floorf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/frexpf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/frexpf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/frexpf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/frexpf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/ldexpf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/ldexpf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/ldexpf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/ldexpf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/log10f.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/log10f.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/log10f.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/log10f.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/logf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/logf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/logf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/logf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/modff.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/modff.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/modff.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/modff.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/powf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/powf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/powf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/powf.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/sincosf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/sincosf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/sincosf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/sincosf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/sincoshf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/sincoshf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/sincoshf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/sincoshf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/sinf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/sinf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/sinf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/sinf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/sinhf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/sinhf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/sinhf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/sinhf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/sqrtf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/sqrtf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/sqrtf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/sqrtf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/tancotf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/tancotf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/tancotf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/tancotf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/tanf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/tanf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/tanf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/tanf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libm/tanhf.c sdcc-3.2.0+dfsg/device/lib/pic14/libm/tanhf.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libm/tanhf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libm/tanhf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_divschar.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_divschar.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_divschar.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_divschar.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_divsint.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_divsint.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_divsint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_divsint.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_divslong.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_divslong.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_divslong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_divslong.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_divuchar.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_divuchar.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_divuchar.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_divuchar.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_divuint.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_divuint.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_divuint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_divuint.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_divulong.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_divulong.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_divulong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_divulong.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_modschar.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_modschar.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_modschar.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_modschar.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_modsint.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_modsint.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_modsint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_modsint.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_modslong.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_modslong.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_modslong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_modslong.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_moduchar.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_moduchar.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_moduchar.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_moduchar.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_moduint.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_moduint.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_moduint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_moduint.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_modulong.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_modulong.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_modulong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_modulong.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_mulchar.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_mulchar.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_mulchar.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_mulchar.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_mulint.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_mulint.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_mulint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_mulint.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_mullong.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_mullong.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/_mullong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/_mullong.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrget1.S sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrget1.S
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrget1.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrget1.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrget2.S sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrget2.S
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrget2.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrget2.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrget3.S sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrget3.S
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrget3.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrget3.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrget4.S sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrget4.S
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrget4.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrget4.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrput1.S sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrput1.S
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrput1.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrput1.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrput2.S sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrput2.S
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrput2.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrput2.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrput3.S sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrput3.S
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrput3.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrput3.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrput4.S sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrput4.S
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrput4.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/enhanced/_gptrput4.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fs2schar.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fs2schar.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fs2schar.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fs2schar.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fs2sint.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fs2sint.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fs2sint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fs2sint.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fs2slong.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fs2slong.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fs2slong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fs2slong.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fs2uchar.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fs2uchar.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fs2uchar.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fs2uchar.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fs2uint.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fs2uint.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fs2uint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fs2uint.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fs2ulong.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fs2ulong.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fs2ulong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fs2ulong.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fsadd.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fsadd.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fsadd.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fsadd.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fsdiv.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fsdiv.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fsdiv.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fsdiv.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fseq.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fseq.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fseq.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fseq.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fsgt.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fsgt.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fsgt.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fsgt.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fslt.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fslt.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fslt.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fslt.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fsmul.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fsmul.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fsmul.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fsmul.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fsneq.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fsneq.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fsneq.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fsneq.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fssub.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fssub.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/fssub.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/fssub.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/idata.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/idata.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/idata.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/idata.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrget1.S sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrget1.S
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrget1.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrget1.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrget2.S sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrget2.S
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrget2.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrget2.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrget3.S sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrget3.S
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrget3.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrget3.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrget4.S sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrget4.S
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrget4.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrget4.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrput1.S sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrput1.S
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrput1.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrput1.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrput2.S sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrput2.S
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrput2.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrput2.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrput3.S sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrput3.S
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrput3.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrput3.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrput4.S sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrput4.S
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrput4.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/regular/_gptrput4.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/regular/shadowregs.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/regular/shadowregs.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/regular/shadowregs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/regular/shadowregs.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/schar2fs.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/schar2fs.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/schar2fs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/schar2fs.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/sint2fs.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/sint2fs.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/sint2fs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/sint2fs.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/slong2fs.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/slong2fs.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/slong2fs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/slong2fs.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/uchar2fs.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/uchar2fs.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/uchar2fs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/uchar2fs.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/uint2fs.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/uint2fs.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/uint2fs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/uint2fs.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/ulong2fs.c sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/ulong2fs.c
--- sdcc-3.1.0+dfsg/device/lib/pic14/libsdcc/ulong2fs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic14/libsdcc/ulong2fs.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/configure sdcc-3.2.0+dfsg/device/lib/pic16/configure
--- sdcc-3.1.0+dfsg/device/lib/pic16/configure	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/configure	2012-05-05 12:10:45.000000000 +0000
@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for pic16lib 0.3.
+# Generated by GNU Autoconf 2.69 for pic16lib 0.3.
 #
 # Report bugs to <tecodev AT users sourceforge net>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -91,6 +89,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -135,6 +134,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -168,7 +192,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -212,14 +237,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -318,10 +354,18 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -358,19 +402,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -443,6 +487,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -477,16 +525,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -498,28 +546,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -532,7 +560,7 @@
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -717,8 +745,9 @@
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -763,7 +792,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -789,7 +818,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -993,7 +1022,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1009,7 +1038,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1039,8 +1068,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1048,7 +1077,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1058,7 +1087,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1066,13 +1095,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1095,7 +1124,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1109,8 +1138,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1125,9 +1152,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1166,11 +1193,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1210,7 +1237,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1341,9 +1368,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 pic16lib configure 0.3
-generated by GNU Autoconf 2.65
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1358,7 +1385,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by pic16lib $as_me 0.3, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -1468,11 +1495,9 @@
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -1506,11 +1531,9 @@
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -1523,11 +1546,9 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -1541,11 +1562,9 @@
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -1600,7 +1619,12 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -1615,7 +1639,11 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -1691,7 +1719,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -1708,16 +1736,22 @@
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1746,7 +1780,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -1766,7 +1800,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -1833,11 +1867,11 @@
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -1859,7 +1893,7 @@
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" "$LINENO" 5
    fi
 
@@ -1869,7 +1903,7 @@
    # Ok.
    :
 else
-   as_fn_error "newly created file is older than distributed files!
+   as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -1923,7 +1957,7 @@
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -1935,7 +1969,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -1963,7 +1997,7 @@
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -1975,7 +2009,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2016,7 +2050,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then :
+  if ${ac_cv_path_mkdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2026,7 +2060,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -2067,7 +2101,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -2079,7 +2113,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2107,7 +2141,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2115,7 +2149,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2149,7 +2183,7 @@
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -2244,7 +2278,7 @@
             { $as_echo "$as_me:${as_lineno-$LINENO}: Enabling support for PICs from unreleased gputils -- make sure you have up-to-date gputils from SVN." >&5
 $as_echo "$as_me: Enabling support for PICs from unreleased gputils -- make sure you have up-to-date gputils from SVN." >&6;};;
       xno) NEWPICS=no;;
-      *) as_fn_error "bad value \"${enableval}\" for --enable-new-pics" "$LINENO" 5;;
+      *) as_fn_error $? "bad value \"${enableval}\" for --enable-new-pics" "$LINENO" 5;;
       esac
 else
    NEWPICS=no
@@ -2275,7 +2309,7 @@
 set dummy gpasm; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CCAS+set}" = set; then :
+if ${ac_cv_path_CCAS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $CCAS in
@@ -2289,7 +2323,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_CCAS="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2316,7 +2350,7 @@
 set dummy gplink; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_LD+set}" = set; then :
+if ${ac_cv_path_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $LD in
@@ -2330,7 +2364,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_LD="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2357,7 +2391,7 @@
 set dummy gplib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_AR+set}" = set; then :
+if ${ac_cv_path_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $AR in
@@ -2371,7 +2405,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2397,7 +2431,7 @@
 
 case ":$CCAS:$LD:$AR:" in
     *:::*)
-        as_fn_error "gputils (gpasm, gplink, and gplib) are required but not found.
+        as_fn_error $? "gputils (gpasm, gplink, and gplib) are required but not found.
 Either install gputils or reconfigure with --disable-pic14-port and --disable-pic16-port." "$LINENO" 5
         ;;
 esac;
@@ -2488,7 +2522,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -2616,7 +2650,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CCAS_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -2812,10 +2846,21 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -2831,6 +2876,7 @@
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -2847,23 +2893,23 @@
 
 
 if test -z "${HAVE_NEW_PICS_TRUE}" && test -z "${HAVE_NEW_PICS_FALSE}"; then
-  as_fn_error "conditional \"HAVE_NEW_PICS\" was never defined.
+  as_fn_error $? "conditional \"HAVE_NEW_PICS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error "conditional \"AMDEP\" was never defined.
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCCAS\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -2964,6 +3010,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3009,19 +3056,19 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -3159,16 +3206,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -3217,7 +3264,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -3228,28 +3275,16 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -3271,7 +3306,7 @@
 # values after options handling.
 ac_log="
 This file was extended by pic16lib $as_me 0.3, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -3337,10 +3372,10 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 pic16lib config.status 0.3
-configured by $0, generated by GNU Autoconf 2.65,
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -3358,11 +3393,16 @@
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -3384,6 +3424,7 @@
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -3396,7 +3437,7 @@
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
+    as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -3405,7 +3446,7 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
+  -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -3425,7 +3466,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -3469,7 +3510,7 @@
     "libsdcc/Makefile") CONFIG_FILES="$CONFIG_FILES libsdcc/Makefile" ;;
     "startup/Makefile") CONFIG_FILES="$CONFIG_FILES startup/Makefile" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -3492,9 +3533,10 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -3502,12 +3544,13 @@
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -3524,12 +3567,12 @@
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -3538,18 +3581,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -3557,7 +3600,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -3605,7 +3648,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -3637,21 +3680,29 @@
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -3663,7 +3714,7 @@
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -3675,11 +3726,11 @@
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -3764,7 +3815,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -3777,7 +3828,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -3796,7 +3847,7 @@
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -3805,7 +3856,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -3831,8 +3882,8 @@
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -3968,23 +4019,24 @@
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -3993,21 +4045,21 @@
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -4157,7 +4209,7 @@
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -4178,7 +4230,7 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/debug/gstack/gstack.c sdcc-3.2.0+dfsg/device/lib/pic16/debug/gstack/gstack.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/debug/gstack/gstack.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/debug/gstack/gstack.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/ctype/iscntrl.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/ctype/iscntrl.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/ctype/iscntrl.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/ctype/iscntrl.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/ctype/isdigit.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/ctype/isdigit.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/ctype/isdigit.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/ctype/isdigit.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/ctype/isgraph.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/ctype/isgraph.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/ctype/isgraph.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/ctype/isgraph.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/ctype/islower.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/ctype/islower.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/ctype/islower.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/ctype/islower.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/ctype/isprint.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/ctype/isprint.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/ctype/isprint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/ctype/isprint.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/ctype/ispunct.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/ctype/ispunct.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/ctype/ispunct.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/ctype/ispunct.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/ctype/isspace.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/ctype/isspace.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/ctype/isspace.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/ctype/isspace.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/ctype/isupper.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/ctype/isupper.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/ctype/isupper.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/ctype/isupper.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/ctype/isxdigit.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/ctype/isxdigit.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/ctype/isxdigit.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/ctype/isxdigit.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/delay/delay100ktcy.S sdcc-3.2.0+dfsg/device/lib/pic16/libc/delay/delay100ktcy.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/delay/delay100ktcy.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/delay/delay100ktcy.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/delay/delay100tcy.S sdcc-3.2.0+dfsg/device/lib/pic16/libc/delay/delay100tcy.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/delay/delay100tcy.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/delay/delay100tcy.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/delay/delay10ktcy.S sdcc-3.2.0+dfsg/device/lib/pic16/libc/delay/delay10ktcy.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/delay/delay10ktcy.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/delay/delay10ktcy.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/delay/delay10tcy.S sdcc-3.2.0+dfsg/device/lib/pic16/libc/delay/delay10tcy.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/delay/delay10tcy.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/delay/delay10tcy.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/delay/delay1ktcy.S sdcc-3.2.0+dfsg/device/lib/pic16/libc/delay/delay1ktcy.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/delay/delay1ktcy.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/delay/delay1ktcy.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/delay/delay1mtcy.S sdcc-3.2.0+dfsg/device/lib/pic16/libc/delay/delay1mtcy.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/delay/delay1mtcy.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/delay/delay1mtcy.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/fprintf.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/fprintf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/fprintf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/fprintf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/printf.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/printf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/printf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/printf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/printf_small.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/printf_small.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/printf_small.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/printf_small.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/printf_tiny.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/printf_tiny.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/printf_tiny.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/printf_tiny.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/putchar.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/putchar.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/putchar.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/putchar.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/sprintf.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/sprintf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/sprintf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/sprintf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/streams.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/streams.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/streams.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/streams.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/strmgpsim.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/strmgpsim.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/strmgpsim.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/strmgpsim.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/strmmssp.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/strmmssp.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/strmmssp.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/strmmssp.c	2012-04-19 22:14:15.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -26,7 +26,6 @@
    might be covered by the GNU General Public License.
 -------------------------------------------------------------------------*/
 
-extern WREG;
 extern SSPBUF;
 
 /* note that USART should already been initialized */
@@ -35,7 +34,7 @@
 {
   (void)c;
   __asm
-    MOVWF       _SSPBUF
+    MOVWF       _SSPBUF, 0
     RETURN
   __endasm;
 }
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/strmputchar.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/strmputchar.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/strmputchar.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/strmputchar.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/strmusart.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/strmusart.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/strmusart.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/strmusart.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/vfprintf.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/vfprintf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/vfprintf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/vfprintf.c	2012-03-13 10:17:10.000000000 +0000
@@ -7,7 +7,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/vprintf.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/vprintf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/vprintf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/vprintf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/vsprintf.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/vsprintf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdio/vsprintf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdio/vsprintf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/atof.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/atof.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/atof.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/atof.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/atoi.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/atoi.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/atoi.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/atoi.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/atol.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/atol.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/atol.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/atol.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/calloc.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/calloc.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/calloc.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/calloc.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/crc16.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/crc16.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/crc16.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/crc16.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/free.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/free.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/free.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/free.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/g_ftoa.S sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/g_ftoa.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/g_ftoa.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/g_ftoa.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/itoa.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/itoa.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/itoa.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/itoa.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/ltoa.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/ltoa.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/ltoa.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/ltoa.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/malloc.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/malloc.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/malloc.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/malloc.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/memfree.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/memfree.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/memfree.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/memfree.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/memfreemax.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/memfreemax.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/memfreemax.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/memfreemax.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/memmisc.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/memmisc.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/memmisc.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/memmisc.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/rand.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/rand.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/rand.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/rand.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/realloc.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/realloc.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/realloc.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/realloc.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/x_ftoa.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/x_ftoa.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/stdlib/x_ftoa.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/stdlib/x_ftoa.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memccpy.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memccpy.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memccpy.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memccpy.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memchr.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memchr.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memchr.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memchr.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memchrpgm.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memchrpgm.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memchrpgm.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memchrpgm.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memchrram.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memchrram.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memchrram.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memchrram.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memcmp.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memcmp.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memcmp.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memcmp.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memcpy.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memcpy.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memcpy.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memcpy.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memcpypgm2ram.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memcpypgm2ram.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memcpypgm2ram.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memcpypgm2ram.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memcpyram2ram.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memcpyram2ram.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memcpyram2ram.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memcpyram2ram.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memmove.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memmove.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memmove.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memmove.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memrchr.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memrchr.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memrchr.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memrchr.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memset.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memset.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/memset.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/memset.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strcat.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strcat.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strcat.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strcat.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strchr.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strchr.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strchr.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strchr.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strcmp.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strcmp.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strcmp.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strcmp.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strcpy.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strcpy.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strcpy.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strcpy.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strcspn.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strcspn.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strcspn.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strcspn.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strlen.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strlen.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strlen.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strlen.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strlwr.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strlwr.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strlwr.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strlwr.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strncat.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strncat.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strncat.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strncat.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strncmp.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strncmp.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strncmp.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strncmp.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strncpy.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strncpy.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strncpy.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strncpy.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strpbrk.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strpbrk.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strpbrk.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strpbrk.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strrchr.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strrchr.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strrchr.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strrchr.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strspn.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strspn.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strspn.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strspn.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strstr.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strstr.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strstr.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strstr.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strtok.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strtok.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strtok.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strtok.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strupr.c sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strupr.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/string/strupr.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/string/strupr.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/utils/cnvfrac.S sdcc-3.2.0+dfsg/device/lib/pic16/libc/utils/cnvfrac.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/utils/cnvfrac.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/utils/cnvfrac.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/utils/cnvint.S sdcc-3.2.0+dfsg/device/lib/pic16/libc/utils/cnvint.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/utils/cnvint.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/utils/cnvint.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libc/utils/cvtdec.S sdcc-3.2.0+dfsg/device/lib/pic16/libc/utils/cvtdec.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libc/utils/cvtdec.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libc/utils/cvtdec.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/Makefile.am sdcc-3.2.0+dfsg/device/lib/pic16/libio/Makefile.am
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/Makefile.am	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/Makefile.am	2012-03-10 17:53:10.000000000 +0000
@@ -13,6 +13,16 @@
 libio18f1220_a_SOURCES += usart/usartd.c
 libio18f1220_a_CFLAGS = -p18f1220 $(AM_CFLAGS)
 
+lib_LIBRARIES += libio18f1230.a
+libio18f1230_a_SOURCES = dummy.c
+libio18f1230_a_SOURCES += adc/adcbusy.c adc/adcclose.c adc/adcconv.c
+libio18f1230_a_SOURCES += adc/adcopen.c adc/adcread.c adc/adcsetch.c
+libio18f1230_a_SOURCES += usart/ubaud.c usart/ubusy.c usart/uclose.c
+libio18f1230_a_SOURCES += usart/udrdy.c usart/ugetc.c usart/ugets.c
+libio18f1230_a_SOURCES += usart/uopen.c usart/uputc.c usart/uputs.c
+libio18f1230_a_SOURCES += usart/usartd.c
+libio18f1230_a_CFLAGS = -p18f1230 $(AM_CFLAGS)
+
 lib_LIBRARIES += libio18f1320.a
 libio18f1320_a_SOURCES = dummy.c
 libio18f1320_a_SOURCES += adc/adcbusy.c adc/adcclose.c adc/adcconv.c
@@ -23,6 +33,16 @@
 libio18f1320_a_SOURCES += usart/usartd.c
 libio18f1320_a_CFLAGS = -p18f1320 $(AM_CFLAGS)
 
+lib_LIBRARIES += libio18f1330.a
+libio18f1330_a_SOURCES = dummy.c
+libio18f1330_a_SOURCES += adc/adcbusy.c adc/adcclose.c adc/adcconv.c
+libio18f1330_a_SOURCES += adc/adcopen.c adc/adcread.c adc/adcsetch.c
+libio18f1330_a_SOURCES += usart/ubaud.c usart/ubusy.c usart/uclose.c
+libio18f1330_a_SOURCES += usart/udrdy.c usart/ugetc.c usart/ugets.c
+libio18f1330_a_SOURCES += usart/uopen.c usart/uputc.c usart/uputs.c
+libio18f1330_a_SOURCES += usart/usartd.c
+libio18f1330_a_CFLAGS = -p18f1330 $(AM_CFLAGS)
+
 lib_LIBRARIES += libio18f13k50.a
 libio18f13k50_a_SOURCES = dummy.c
 libio18f13k50_a_SOURCES += adc/adcbusy.c adc/adcclose.c adc/adcconv.c
@@ -136,9 +156,7 @@
 libio18f23k20_a_SOURCES += usart/usartd.c
 libio18f23k20_a_CFLAGS = -p18f23k20 $(AM_CFLAGS)
 
-if HAVE_NEW_PICS
 lib_LIBRARIES += libio18f23k22.a
-endif HAVE_NEW_PICS
 libio18f23k22_a_SOURCES = dummy.c
 libio18f23k22_a_SOURCES += adc/adcbusy.c adc/adcclose.c adc/adcconv.c
 libio18f23k22_a_SOURCES += adc/adcopen.c adc/adcread.c adc/adcsetch.c
@@ -321,9 +339,7 @@
 libio18f24k20_a_SOURCES += usart/usartd.c
 libio18f24k20_a_CFLAGS = -p18f24k20 $(AM_CFLAGS)
 
-if HAVE_NEW_PICS
 lib_LIBRARIES += libio18f24k22.a
-endif HAVE_NEW_PICS
 libio18f24k22_a_SOURCES = dummy.c
 libio18f24k22_a_SOURCES += adc/adcbusy.c adc/adcclose.c adc/adcconv.c
 libio18f24k22_a_SOURCES += adc/adcopen.c adc/adcread.c adc/adcsetch.c
@@ -533,9 +549,7 @@
 libio18f25k20_a_SOURCES += usart/usartd.c
 libio18f25k20_a_CFLAGS = -p18f25k20 $(AM_CFLAGS)
 
-if HAVE_NEW_PICS
 lib_LIBRARIES += libio18f25k22.a
-endif HAVE_NEW_PICS
 libio18f25k22_a_SOURCES = dummy.c
 libio18f25k22_a_SOURCES += adc/adcbusy.c adc/adcclose.c adc/adcconv.c
 libio18f25k22_a_SOURCES += adc/adcopen.c adc/adcread.c adc/adcsetch.c
@@ -655,9 +669,7 @@
 libio18f26k20_a_SOURCES += usart/usartd.c
 libio18f26k20_a_CFLAGS = -p18f26k20 $(AM_CFLAGS)
 
-if HAVE_NEW_PICS
 lib_LIBRARIES += libio18f26k22.a
-endif HAVE_NEW_PICS
 libio18f26k22_a_SOURCES = dummy.c
 libio18f26k22_a_SOURCES += adc/adcbusy.c adc/adcclose.c adc/adcconv.c
 libio18f26k22_a_SOURCES += adc/adcopen.c adc/adcread.c adc/adcsetch.c
@@ -755,9 +767,7 @@
 libio18f43k20_a_SOURCES += usart/usartd.c
 libio18f43k20_a_CFLAGS = -p18f43k20 $(AM_CFLAGS)
 
-if HAVE_NEW_PICS
 lib_LIBRARIES += libio18f43k22.a
-endif HAVE_NEW_PICS
 libio18f43k22_a_SOURCES = dummy.c
 libio18f43k22_a_SOURCES += adc/adcbusy.c adc/adcclose.c adc/adcconv.c
 libio18f43k22_a_SOURCES += adc/adcopen.c adc/adcread.c adc/adcsetch.c
@@ -940,9 +950,7 @@
 libio18f44k20_a_SOURCES += usart/usartd.c
 libio18f44k20_a_CFLAGS = -p18f44k20 $(AM_CFLAGS)
 
-if HAVE_NEW_PICS
 lib_LIBRARIES += libio18f44k22.a
-endif HAVE_NEW_PICS
 libio18f44k22_a_SOURCES = dummy.c
 libio18f44k22_a_SOURCES += adc/adcbusy.c adc/adcclose.c adc/adcconv.c
 libio18f44k22_a_SOURCES += adc/adcopen.c adc/adcread.c adc/adcsetch.c
@@ -1152,9 +1160,7 @@
 libio18f45k20_a_SOURCES += usart/usartd.c
 libio18f45k20_a_CFLAGS = -p18f45k20 $(AM_CFLAGS)
 
-if HAVE_NEW_PICS
 lib_LIBRARIES += libio18f45k22.a
-endif HAVE_NEW_PICS
 libio18f45k22_a_SOURCES = dummy.c
 libio18f45k22_a_SOURCES += adc/adcbusy.c adc/adcclose.c adc/adcconv.c
 libio18f45k22_a_SOURCES += adc/adcopen.c adc/adcread.c adc/adcsetch.c
@@ -1274,9 +1280,7 @@
 libio18f46k20_a_SOURCES += usart/usartd.c
 libio18f46k20_a_CFLAGS = -p18f46k20 $(AM_CFLAGS)
 
-if HAVE_NEW_PICS
 lib_LIBRARIES += libio18f46k22.a
-endif HAVE_NEW_PICS
 libio18f46k22_a_SOURCES = dummy.c
 libio18f46k22_a_SOURCES += adc/adcbusy.c adc/adcclose.c adc/adcconv.c
 libio18f46k22_a_SOURCES += adc/adcopen.c adc/adcread.c adc/adcsetch.c
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/Makefile.in sdcc-3.2.0+dfsg/device/lib/pic16/libio/Makefile.in
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/Makefile.in	2012-07-06 09:08:36.000000000 +0000
@@ -32,14 +32,6 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-@HAVE_NEW_PICS_TRUE@am__append_1 = libio18f23k22.a
-@HAVE_NEW_PICS_TRUE@am__append_2 = libio18f24k22.a
-@HAVE_NEW_PICS_TRUE@am__append_3 = libio18f25k22.a
-@HAVE_NEW_PICS_TRUE@am__append_4 = libio18f26k22.a
-@HAVE_NEW_PICS_TRUE@am__append_5 = libio18f43k22.a
-@HAVE_NEW_PICS_TRUE@am__append_6 = libio18f44k22.a
-@HAVE_NEW_PICS_TRUE@am__append_7 = libio18f45k22.a
-@HAVE_NEW_PICS_TRUE@am__append_8 = libio18f46k22.a
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/Makefile.common
 subdir = libio
@@ -89,6 +81,21 @@
 	libio18f1220_a-uopen.$(OBJEXT) libio18f1220_a-uputc.$(OBJEXT) \
 	libio18f1220_a-uputs.$(OBJEXT) libio18f1220_a-usartd.$(OBJEXT)
 libio18f1220_a_OBJECTS = $(am_libio18f1220_a_OBJECTS)
+libio18f1230_a_AR = $(AR) $(ARFLAGS)
+libio18f1230_a_LIBADD =
+am_libio18f1230_a_OBJECTS = libio18f1230_a-dummy.$(OBJEXT) \
+	libio18f1230_a-adcbusy.$(OBJEXT) \
+	libio18f1230_a-adcclose.$(OBJEXT) \
+	libio18f1230_a-adcconv.$(OBJEXT) \
+	libio18f1230_a-adcopen.$(OBJEXT) \
+	libio18f1230_a-adcread.$(OBJEXT) \
+	libio18f1230_a-adcsetch.$(OBJEXT) \
+	libio18f1230_a-ubaud.$(OBJEXT) libio18f1230_a-ubusy.$(OBJEXT) \
+	libio18f1230_a-uclose.$(OBJEXT) libio18f1230_a-udrdy.$(OBJEXT) \
+	libio18f1230_a-ugetc.$(OBJEXT) libio18f1230_a-ugets.$(OBJEXT) \
+	libio18f1230_a-uopen.$(OBJEXT) libio18f1230_a-uputc.$(OBJEXT) \
+	libio18f1230_a-uputs.$(OBJEXT) libio18f1230_a-usartd.$(OBJEXT)
+libio18f1230_a_OBJECTS = $(am_libio18f1230_a_OBJECTS)
 libio18f1320_a_AR = $(AR) $(ARFLAGS)
 libio18f1320_a_LIBADD =
 am_libio18f1320_a_OBJECTS = libio18f1320_a-dummy.$(OBJEXT) \
@@ -104,6 +111,21 @@
 	libio18f1320_a-uopen.$(OBJEXT) libio18f1320_a-uputc.$(OBJEXT) \
 	libio18f1320_a-uputs.$(OBJEXT) libio18f1320_a-usartd.$(OBJEXT)
 libio18f1320_a_OBJECTS = $(am_libio18f1320_a_OBJECTS)
+libio18f1330_a_AR = $(AR) $(ARFLAGS)
+libio18f1330_a_LIBADD =
+am_libio18f1330_a_OBJECTS = libio18f1330_a-dummy.$(OBJEXT) \
+	libio18f1330_a-adcbusy.$(OBJEXT) \
+	libio18f1330_a-adcclose.$(OBJEXT) \
+	libio18f1330_a-adcconv.$(OBJEXT) \
+	libio18f1330_a-adcopen.$(OBJEXT) \
+	libio18f1330_a-adcread.$(OBJEXT) \
+	libio18f1330_a-adcsetch.$(OBJEXT) \
+	libio18f1330_a-ubaud.$(OBJEXT) libio18f1330_a-ubusy.$(OBJEXT) \
+	libio18f1330_a-uclose.$(OBJEXT) libio18f1330_a-udrdy.$(OBJEXT) \
+	libio18f1330_a-ugetc.$(OBJEXT) libio18f1330_a-ugets.$(OBJEXT) \
+	libio18f1330_a-uopen.$(OBJEXT) libio18f1330_a-uputc.$(OBJEXT) \
+	libio18f1330_a-uputs.$(OBJEXT) libio18f1330_a-usartd.$(OBJEXT)
+libio18f1330_a_OBJECTS = $(am_libio18f1330_a_OBJECTS)
 libio18f13k50_a_AR = $(AR) $(ARFLAGS)
 libio18f13k50_a_LIBADD =
 am_libio18f13k50_a_OBJECTS = libio18f13k50_a-dummy.$(OBJEXT) \
@@ -3623,7 +3645,8 @@
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libio18f1220_a_SOURCES) $(libio18f1320_a_SOURCES) \
+SOURCES = $(libio18f1220_a_SOURCES) $(libio18f1230_a_SOURCES) \
+	$(libio18f1320_a_SOURCES) $(libio18f1330_a_SOURCES) \
 	$(libio18f13k50_a_SOURCES) $(libio18f14k50_a_SOURCES) \
 	$(libio18f2220_a_SOURCES) $(libio18f2221_a_SOURCES) \
 	$(libio18f2320_a_SOURCES) $(libio18f2321_a_SOURCES) \
@@ -3685,7 +3708,8 @@
 	$(libio18f87j50_a_SOURCES) $(libio18f87j60_a_SOURCES) \
 	$(libio18f96j60_a_SOURCES) $(libio18f96j65_a_SOURCES) \
 	$(libio18f97j60_a_SOURCES)
-DIST_SOURCES = $(libio18f1220_a_SOURCES) $(libio18f1320_a_SOURCES) \
+DIST_SOURCES = $(libio18f1220_a_SOURCES) $(libio18f1230_a_SOURCES) \
+	$(libio18f1320_a_SOURCES) $(libio18f1330_a_SOURCES) \
 	$(libio18f13k50_a_SOURCES) $(libio18f14k50_a_SOURCES) \
 	$(libio18f2220_a_SOURCES) $(libio18f2221_a_SOURCES) \
 	$(libio18f2320_a_SOURCES) $(libio18f2321_a_SOURCES) \
@@ -3837,50 +3861,62 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-lib_LIBRARIES = libio18f1220.a libio18f1320.a libio18f13k50.a \
-	libio18f14k50.a libio18f2220.a libio18f2221.a libio18f2320.a \
-	libio18f2321.a libio18f2331.a libio18f23k20.a $(am__append_1) \
-	libio18f2410.a libio18f242.a libio18f2420.a libio18f2423.a \
-	libio18f2431.a libio18f2450.a libio18f2455.a libio18f248.a \
-	libio18f2480.a libio18f24j10.a libio18f24j50.a libio18f24k20.a \
-	$(am__append_2) libio18f2510.a libio18f2515.a libio18f252.a \
-	libio18f2520.a libio18f2523.a libio18f2525.a libio18f2550.a \
-	libio18f258.a libio18f2580.a libio18f2585.a libio18f25j10.a \
-	libio18f25j50.a libio18f25k20.a $(am__append_3) libio18f2610.a \
-	libio18f2620.a libio18f2680.a libio18f2682.a libio18f2685.a \
-	libio18f26j50.a libio18f26k20.a $(am__append_4) libio18f4220.a \
-	libio18f4221.a libio18f4320.a libio18f4321.a libio18f4331.a \
-	libio18f43k20.a $(am__append_5) libio18f4410.a libio18f442.a \
-	libio18f4420.a libio18f4423.a libio18f4431.a libio18f4450.a \
-	libio18f4455.a libio18f448.a libio18f4480.a libio18f44j10.a \
-	libio18f44j50.a libio18f44k20.a $(am__append_6) libio18f4510.a \
-	libio18f4515.a libio18f452.a libio18f4520.a libio18f4523.a \
-	libio18f4525.a libio18f4550.a libio18f458.a libio18f4580.a \
-	libio18f4585.a libio18f45j10.a libio18f45j50.a libio18f45k20.a \
-	$(am__append_7) libio18f4610.a libio18f4620.a libio18f4680.a \
-	libio18f4682.a libio18f4685.a libio18f46j50.a libio18f46k20.a \
-	$(am__append_8) libio18f6520.a libio18f6527.a libio18f6585.a \
-	libio18f65j50.a libio18f6620.a libio18f6622.a libio18f6627.a \
-	libio18f6680.a libio18f66j50.a libio18f66j55.a libio18f66j60.a \
-	libio18f66j65.a libio18f6720.a libio18f6722.a libio18f67j50.a \
-	libio18f67j60.a libio18f8520.a libio18f8527.a libio18f8585.a \
-	libio18f85j50.a libio18f8620.a libio18f8622.a libio18f8627.a \
-	libio18f8680.a libio18f86j50.a libio18f86j55.a libio18f86j60.a \
-	libio18f86j65.a libio18f8720.a libio18f8722.a libio18f87j50.a \
-	libio18f87j60.a libio18f96j60.a libio18f96j65.a \
-	libio18f97j60.a
+lib_LIBRARIES = libio18f1220.a libio18f1230.a libio18f1320.a \
+	libio18f1330.a libio18f13k50.a libio18f14k50.a libio18f2220.a \
+	libio18f2221.a libio18f2320.a libio18f2321.a libio18f2331.a \
+	libio18f23k20.a libio18f23k22.a libio18f2410.a libio18f242.a \
+	libio18f2420.a libio18f2423.a libio18f2431.a libio18f2450.a \
+	libio18f2455.a libio18f248.a libio18f2480.a libio18f24j10.a \
+	libio18f24j50.a libio18f24k20.a libio18f24k22.a libio18f2510.a \
+	libio18f2515.a libio18f252.a libio18f2520.a libio18f2523.a \
+	libio18f2525.a libio18f2550.a libio18f258.a libio18f2580.a \
+	libio18f2585.a libio18f25j10.a libio18f25j50.a libio18f25k20.a \
+	libio18f25k22.a libio18f2610.a libio18f2620.a libio18f2680.a \
+	libio18f2682.a libio18f2685.a libio18f26j50.a libio18f26k20.a \
+	libio18f26k22.a libio18f4220.a libio18f4221.a libio18f4320.a \
+	libio18f4321.a libio18f4331.a libio18f43k20.a libio18f43k22.a \
+	libio18f4410.a libio18f442.a libio18f4420.a libio18f4423.a \
+	libio18f4431.a libio18f4450.a libio18f4455.a libio18f448.a \
+	libio18f4480.a libio18f44j10.a libio18f44j50.a libio18f44k20.a \
+	libio18f44k22.a libio18f4510.a libio18f4515.a libio18f452.a \
+	libio18f4520.a libio18f4523.a libio18f4525.a libio18f4550.a \
+	libio18f458.a libio18f4580.a libio18f4585.a libio18f45j10.a \
+	libio18f45j50.a libio18f45k20.a libio18f45k22.a libio18f4610.a \
+	libio18f4620.a libio18f4680.a libio18f4682.a libio18f4685.a \
+	libio18f46j50.a libio18f46k20.a libio18f46k22.a libio18f6520.a \
+	libio18f6527.a libio18f6585.a libio18f65j50.a libio18f6620.a \
+	libio18f6622.a libio18f6627.a libio18f6680.a libio18f66j50.a \
+	libio18f66j55.a libio18f66j60.a libio18f66j65.a libio18f6720.a \
+	libio18f6722.a libio18f67j50.a libio18f67j60.a libio18f8520.a \
+	libio18f8527.a libio18f8585.a libio18f85j50.a libio18f8620.a \
+	libio18f8622.a libio18f8627.a libio18f8680.a libio18f86j50.a \
+	libio18f86j55.a libio18f86j60.a libio18f86j65.a libio18f8720.a \
+	libio18f8722.a libio18f87j50.a libio18f87j60.a libio18f96j60.a \
+	libio18f96j65.a libio18f97j60.a
 libio18f1220_a_SOURCES = dummy.c adc/adcbusy.c adc/adcclose.c \
 	adc/adcconv.c adc/adcopen.c adc/adcread.c adc/adcsetch.c \
 	usart/ubaud.c usart/ubusy.c usart/uclose.c usart/udrdy.c \
 	usart/ugetc.c usart/ugets.c usart/uopen.c usart/uputc.c \
 	usart/uputs.c usart/usartd.c
 libio18f1220_a_CFLAGS = -p18f1220 $(AM_CFLAGS)
+libio18f1230_a_SOURCES = dummy.c adc/adcbusy.c adc/adcclose.c \
+	adc/adcconv.c adc/adcopen.c adc/adcread.c adc/adcsetch.c \
+	usart/ubaud.c usart/ubusy.c usart/uclose.c usart/udrdy.c \
+	usart/ugetc.c usart/ugets.c usart/uopen.c usart/uputc.c \
+	usart/uputs.c usart/usartd.c
+libio18f1230_a_CFLAGS = -p18f1230 $(AM_CFLAGS)
 libio18f1320_a_SOURCES = dummy.c adc/adcbusy.c adc/adcclose.c \
 	adc/adcconv.c adc/adcopen.c adc/adcread.c adc/adcsetch.c \
 	usart/ubaud.c usart/ubusy.c usart/uclose.c usart/udrdy.c \
 	usart/ugetc.c usart/ugets.c usart/uopen.c usart/uputc.c \
 	usart/uputs.c usart/usartd.c
 libio18f1320_a_CFLAGS = -p18f1320 $(AM_CFLAGS)
+libio18f1330_a_SOURCES = dummy.c adc/adcbusy.c adc/adcclose.c \
+	adc/adcconv.c adc/adcopen.c adc/adcread.c adc/adcsetch.c \
+	usart/ubaud.c usart/ubusy.c usart/uclose.c usart/udrdy.c \
+	usart/ugetc.c usart/ugets.c usart/uopen.c usart/uputc.c \
+	usart/uputs.c usart/usartd.c
+libio18f1330_a_CFLAGS = -p18f1330 $(AM_CFLAGS)
 libio18f13k50_a_SOURCES = dummy.c adc/adcbusy.c adc/adcclose.c \
 	adc/adcconv.c adc/adcopen.c adc/adcread.c adc/adcsetch.c \
 	i2c/i2cack.c i2c/i2cclose.c i2c/i2cdrdy.c i2c/i2cidle.c \
@@ -5034,10 +5070,18 @@
 	-rm -f libio18f1220.a
 	$(libio18f1220_a_AR) libio18f1220.a $(libio18f1220_a_OBJECTS) $(libio18f1220_a_LIBADD)
 	$(RANLIB) libio18f1220.a
+libio18f1230.a: $(libio18f1230_a_OBJECTS) $(libio18f1230_a_DEPENDENCIES) 
+	-rm -f libio18f1230.a
+	$(libio18f1230_a_AR) libio18f1230.a $(libio18f1230_a_OBJECTS) $(libio18f1230_a_LIBADD)
+	$(RANLIB) libio18f1230.a
 libio18f1320.a: $(libio18f1320_a_OBJECTS) $(libio18f1320_a_DEPENDENCIES) 
 	-rm -f libio18f1320.a
 	$(libio18f1320_a_AR) libio18f1320.a $(libio18f1320_a_OBJECTS) $(libio18f1320_a_LIBADD)
 	$(RANLIB) libio18f1320.a
+libio18f1330.a: $(libio18f1330_a_OBJECTS) $(libio18f1330_a_DEPENDENCIES) 
+	-rm -f libio18f1330.a
+	$(libio18f1330_a_AR) libio18f1330.a $(libio18f1330_a_OBJECTS) $(libio18f1330_a_LIBADD)
+	$(RANLIB) libio18f1330.a
 libio18f13k50.a: $(libio18f13k50_a_OBJECTS) $(libio18f13k50_a_DEPENDENCIES) 
 	-rm -f libio18f13k50.a
 	$(libio18f13k50_a_AR) libio18f13k50.a $(libio18f13k50_a_OBJECTS) $(libio18f13k50_a_LIBADD)
@@ -5546,6 +5590,23 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1220_a-uputc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1220_a-uputs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1220_a-usartd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1230_a-adcbusy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1230_a-adcclose.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1230_a-adcconv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1230_a-adcopen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1230_a-adcread.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1230_a-adcsetch.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1230_a-dummy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1230_a-ubaud.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1230_a-ubusy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1230_a-uclose.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1230_a-udrdy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1230_a-ugetc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1230_a-ugets.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1230_a-uopen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1230_a-uputc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1230_a-uputs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1230_a-usartd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1320_a-adcbusy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1320_a-adcclose.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1320_a-adcconv.Po@am__quote@
@@ -5563,6 +5624,23 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1320_a-uputc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1320_a-uputs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1320_a-usartd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1330_a-adcbusy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1330_a-adcclose.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1330_a-adcconv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1330_a-adcopen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1330_a-adcread.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1330_a-adcsetch.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1330_a-dummy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1330_a-ubaud.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1330_a-ubusy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1330_a-uclose.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1330_a-udrdy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1330_a-ugetc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1330_a-ugets.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1330_a-uopen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1330_a-uputc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1330_a-uputs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f1330_a-usartd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f13k50_a-adcbusy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f13k50_a-adcclose.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libio18f13k50_a-adcconv.Po@am__quote@
@@ -9344,6 +9422,244 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1220_a_CFLAGS) $(CFLAGS) -c -o libio18f1220_a-usartd.obj `if test -f 'usart/usartd.c'; then $(CYGPATH_W) 'usart/usartd.c'; else $(CYGPATH_W) '$(srcdir)/usart/usartd.c'; fi`
 
+libio18f1230_a-dummy.o: dummy.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-dummy.o -MD -MP -MF $(DEPDIR)/libio18f1230_a-dummy.Tpo -c -o libio18f1230_a-dummy.o `test -f 'dummy.c' || echo '$(srcdir)/'`dummy.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-dummy.Tpo $(DEPDIR)/libio18f1230_a-dummy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dummy.c' object='libio18f1230_a-dummy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-dummy.o `test -f 'dummy.c' || echo '$(srcdir)/'`dummy.c
+
+libio18f1230_a-dummy.obj: dummy.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-dummy.obj -MD -MP -MF $(DEPDIR)/libio18f1230_a-dummy.Tpo -c -o libio18f1230_a-dummy.obj `if test -f 'dummy.c'; then $(CYGPATH_W) 'dummy.c'; else $(CYGPATH_W) '$(srcdir)/dummy.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-dummy.Tpo $(DEPDIR)/libio18f1230_a-dummy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dummy.c' object='libio18f1230_a-dummy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-dummy.obj `if test -f 'dummy.c'; then $(CYGPATH_W) 'dummy.c'; else $(CYGPATH_W) '$(srcdir)/dummy.c'; fi`
+
+libio18f1230_a-adcbusy.o: adc/adcbusy.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-adcbusy.o -MD -MP -MF $(DEPDIR)/libio18f1230_a-adcbusy.Tpo -c -o libio18f1230_a-adcbusy.o `test -f 'adc/adcbusy.c' || echo '$(srcdir)/'`adc/adcbusy.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-adcbusy.Tpo $(DEPDIR)/libio18f1230_a-adcbusy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcbusy.c' object='libio18f1230_a-adcbusy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-adcbusy.o `test -f 'adc/adcbusy.c' || echo '$(srcdir)/'`adc/adcbusy.c
+
+libio18f1230_a-adcbusy.obj: adc/adcbusy.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-adcbusy.obj -MD -MP -MF $(DEPDIR)/libio18f1230_a-adcbusy.Tpo -c -o libio18f1230_a-adcbusy.obj `if test -f 'adc/adcbusy.c'; then $(CYGPATH_W) 'adc/adcbusy.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcbusy.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-adcbusy.Tpo $(DEPDIR)/libio18f1230_a-adcbusy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcbusy.c' object='libio18f1230_a-adcbusy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-adcbusy.obj `if test -f 'adc/adcbusy.c'; then $(CYGPATH_W) 'adc/adcbusy.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcbusy.c'; fi`
+
+libio18f1230_a-adcclose.o: adc/adcclose.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-adcclose.o -MD -MP -MF $(DEPDIR)/libio18f1230_a-adcclose.Tpo -c -o libio18f1230_a-adcclose.o `test -f 'adc/adcclose.c' || echo '$(srcdir)/'`adc/adcclose.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-adcclose.Tpo $(DEPDIR)/libio18f1230_a-adcclose.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcclose.c' object='libio18f1230_a-adcclose.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-adcclose.o `test -f 'adc/adcclose.c' || echo '$(srcdir)/'`adc/adcclose.c
+
+libio18f1230_a-adcclose.obj: adc/adcclose.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-adcclose.obj -MD -MP -MF $(DEPDIR)/libio18f1230_a-adcclose.Tpo -c -o libio18f1230_a-adcclose.obj `if test -f 'adc/adcclose.c'; then $(CYGPATH_W) 'adc/adcclose.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcclose.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-adcclose.Tpo $(DEPDIR)/libio18f1230_a-adcclose.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcclose.c' object='libio18f1230_a-adcclose.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-adcclose.obj `if test -f 'adc/adcclose.c'; then $(CYGPATH_W) 'adc/adcclose.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcclose.c'; fi`
+
+libio18f1230_a-adcconv.o: adc/adcconv.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-adcconv.o -MD -MP -MF $(DEPDIR)/libio18f1230_a-adcconv.Tpo -c -o libio18f1230_a-adcconv.o `test -f 'adc/adcconv.c' || echo '$(srcdir)/'`adc/adcconv.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-adcconv.Tpo $(DEPDIR)/libio18f1230_a-adcconv.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcconv.c' object='libio18f1230_a-adcconv.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-adcconv.o `test -f 'adc/adcconv.c' || echo '$(srcdir)/'`adc/adcconv.c
+
+libio18f1230_a-adcconv.obj: adc/adcconv.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-adcconv.obj -MD -MP -MF $(DEPDIR)/libio18f1230_a-adcconv.Tpo -c -o libio18f1230_a-adcconv.obj `if test -f 'adc/adcconv.c'; then $(CYGPATH_W) 'adc/adcconv.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcconv.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-adcconv.Tpo $(DEPDIR)/libio18f1230_a-adcconv.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcconv.c' object='libio18f1230_a-adcconv.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-adcconv.obj `if test -f 'adc/adcconv.c'; then $(CYGPATH_W) 'adc/adcconv.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcconv.c'; fi`
+
+libio18f1230_a-adcopen.o: adc/adcopen.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-adcopen.o -MD -MP -MF $(DEPDIR)/libio18f1230_a-adcopen.Tpo -c -o libio18f1230_a-adcopen.o `test -f 'adc/adcopen.c' || echo '$(srcdir)/'`adc/adcopen.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-adcopen.Tpo $(DEPDIR)/libio18f1230_a-adcopen.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcopen.c' object='libio18f1230_a-adcopen.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-adcopen.o `test -f 'adc/adcopen.c' || echo '$(srcdir)/'`adc/adcopen.c
+
+libio18f1230_a-adcopen.obj: adc/adcopen.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-adcopen.obj -MD -MP -MF $(DEPDIR)/libio18f1230_a-adcopen.Tpo -c -o libio18f1230_a-adcopen.obj `if test -f 'adc/adcopen.c'; then $(CYGPATH_W) 'adc/adcopen.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcopen.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-adcopen.Tpo $(DEPDIR)/libio18f1230_a-adcopen.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcopen.c' object='libio18f1230_a-adcopen.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-adcopen.obj `if test -f 'adc/adcopen.c'; then $(CYGPATH_W) 'adc/adcopen.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcopen.c'; fi`
+
+libio18f1230_a-adcread.o: adc/adcread.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-adcread.o -MD -MP -MF $(DEPDIR)/libio18f1230_a-adcread.Tpo -c -o libio18f1230_a-adcread.o `test -f 'adc/adcread.c' || echo '$(srcdir)/'`adc/adcread.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-adcread.Tpo $(DEPDIR)/libio18f1230_a-adcread.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcread.c' object='libio18f1230_a-adcread.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-adcread.o `test -f 'adc/adcread.c' || echo '$(srcdir)/'`adc/adcread.c
+
+libio18f1230_a-adcread.obj: adc/adcread.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-adcread.obj -MD -MP -MF $(DEPDIR)/libio18f1230_a-adcread.Tpo -c -o libio18f1230_a-adcread.obj `if test -f 'adc/adcread.c'; then $(CYGPATH_W) 'adc/adcread.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcread.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-adcread.Tpo $(DEPDIR)/libio18f1230_a-adcread.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcread.c' object='libio18f1230_a-adcread.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-adcread.obj `if test -f 'adc/adcread.c'; then $(CYGPATH_W) 'adc/adcread.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcread.c'; fi`
+
+libio18f1230_a-adcsetch.o: adc/adcsetch.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-adcsetch.o -MD -MP -MF $(DEPDIR)/libio18f1230_a-adcsetch.Tpo -c -o libio18f1230_a-adcsetch.o `test -f 'adc/adcsetch.c' || echo '$(srcdir)/'`adc/adcsetch.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-adcsetch.Tpo $(DEPDIR)/libio18f1230_a-adcsetch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcsetch.c' object='libio18f1230_a-adcsetch.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-adcsetch.o `test -f 'adc/adcsetch.c' || echo '$(srcdir)/'`adc/adcsetch.c
+
+libio18f1230_a-adcsetch.obj: adc/adcsetch.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-adcsetch.obj -MD -MP -MF $(DEPDIR)/libio18f1230_a-adcsetch.Tpo -c -o libio18f1230_a-adcsetch.obj `if test -f 'adc/adcsetch.c'; then $(CYGPATH_W) 'adc/adcsetch.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcsetch.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-adcsetch.Tpo $(DEPDIR)/libio18f1230_a-adcsetch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcsetch.c' object='libio18f1230_a-adcsetch.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-adcsetch.obj `if test -f 'adc/adcsetch.c'; then $(CYGPATH_W) 'adc/adcsetch.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcsetch.c'; fi`
+
+libio18f1230_a-ubaud.o: usart/ubaud.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-ubaud.o -MD -MP -MF $(DEPDIR)/libio18f1230_a-ubaud.Tpo -c -o libio18f1230_a-ubaud.o `test -f 'usart/ubaud.c' || echo '$(srcdir)/'`usart/ubaud.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-ubaud.Tpo $(DEPDIR)/libio18f1230_a-ubaud.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/ubaud.c' object='libio18f1230_a-ubaud.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-ubaud.o `test -f 'usart/ubaud.c' || echo '$(srcdir)/'`usart/ubaud.c
+
+libio18f1230_a-ubaud.obj: usart/ubaud.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-ubaud.obj -MD -MP -MF $(DEPDIR)/libio18f1230_a-ubaud.Tpo -c -o libio18f1230_a-ubaud.obj `if test -f 'usart/ubaud.c'; then $(CYGPATH_W) 'usart/ubaud.c'; else $(CYGPATH_W) '$(srcdir)/usart/ubaud.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-ubaud.Tpo $(DEPDIR)/libio18f1230_a-ubaud.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/ubaud.c' object='libio18f1230_a-ubaud.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-ubaud.obj `if test -f 'usart/ubaud.c'; then $(CYGPATH_W) 'usart/ubaud.c'; else $(CYGPATH_W) '$(srcdir)/usart/ubaud.c'; fi`
+
+libio18f1230_a-ubusy.o: usart/ubusy.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-ubusy.o -MD -MP -MF $(DEPDIR)/libio18f1230_a-ubusy.Tpo -c -o libio18f1230_a-ubusy.o `test -f 'usart/ubusy.c' || echo '$(srcdir)/'`usart/ubusy.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-ubusy.Tpo $(DEPDIR)/libio18f1230_a-ubusy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/ubusy.c' object='libio18f1230_a-ubusy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-ubusy.o `test -f 'usart/ubusy.c' || echo '$(srcdir)/'`usart/ubusy.c
+
+libio18f1230_a-ubusy.obj: usart/ubusy.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-ubusy.obj -MD -MP -MF $(DEPDIR)/libio18f1230_a-ubusy.Tpo -c -o libio18f1230_a-ubusy.obj `if test -f 'usart/ubusy.c'; then $(CYGPATH_W) 'usart/ubusy.c'; else $(CYGPATH_W) '$(srcdir)/usart/ubusy.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-ubusy.Tpo $(DEPDIR)/libio18f1230_a-ubusy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/ubusy.c' object='libio18f1230_a-ubusy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-ubusy.obj `if test -f 'usart/ubusy.c'; then $(CYGPATH_W) 'usart/ubusy.c'; else $(CYGPATH_W) '$(srcdir)/usart/ubusy.c'; fi`
+
+libio18f1230_a-uclose.o: usart/uclose.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-uclose.o -MD -MP -MF $(DEPDIR)/libio18f1230_a-uclose.Tpo -c -o libio18f1230_a-uclose.o `test -f 'usart/uclose.c' || echo '$(srcdir)/'`usart/uclose.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-uclose.Tpo $(DEPDIR)/libio18f1230_a-uclose.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/uclose.c' object='libio18f1230_a-uclose.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-uclose.o `test -f 'usart/uclose.c' || echo '$(srcdir)/'`usart/uclose.c
+
+libio18f1230_a-uclose.obj: usart/uclose.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-uclose.obj -MD -MP -MF $(DEPDIR)/libio18f1230_a-uclose.Tpo -c -o libio18f1230_a-uclose.obj `if test -f 'usart/uclose.c'; then $(CYGPATH_W) 'usart/uclose.c'; else $(CYGPATH_W) '$(srcdir)/usart/uclose.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-uclose.Tpo $(DEPDIR)/libio18f1230_a-uclose.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/uclose.c' object='libio18f1230_a-uclose.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-uclose.obj `if test -f 'usart/uclose.c'; then $(CYGPATH_W) 'usart/uclose.c'; else $(CYGPATH_W) '$(srcdir)/usart/uclose.c'; fi`
+
+libio18f1230_a-udrdy.o: usart/udrdy.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-udrdy.o -MD -MP -MF $(DEPDIR)/libio18f1230_a-udrdy.Tpo -c -o libio18f1230_a-udrdy.o `test -f 'usart/udrdy.c' || echo '$(srcdir)/'`usart/udrdy.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-udrdy.Tpo $(DEPDIR)/libio18f1230_a-udrdy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/udrdy.c' object='libio18f1230_a-udrdy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-udrdy.o `test -f 'usart/udrdy.c' || echo '$(srcdir)/'`usart/udrdy.c
+
+libio18f1230_a-udrdy.obj: usart/udrdy.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-udrdy.obj -MD -MP -MF $(DEPDIR)/libio18f1230_a-udrdy.Tpo -c -o libio18f1230_a-udrdy.obj `if test -f 'usart/udrdy.c'; then $(CYGPATH_W) 'usart/udrdy.c'; else $(CYGPATH_W) '$(srcdir)/usart/udrdy.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-udrdy.Tpo $(DEPDIR)/libio18f1230_a-udrdy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/udrdy.c' object='libio18f1230_a-udrdy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-udrdy.obj `if test -f 'usart/udrdy.c'; then $(CYGPATH_W) 'usart/udrdy.c'; else $(CYGPATH_W) '$(srcdir)/usart/udrdy.c'; fi`
+
+libio18f1230_a-ugetc.o: usart/ugetc.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-ugetc.o -MD -MP -MF $(DEPDIR)/libio18f1230_a-ugetc.Tpo -c -o libio18f1230_a-ugetc.o `test -f 'usart/ugetc.c' || echo '$(srcdir)/'`usart/ugetc.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-ugetc.Tpo $(DEPDIR)/libio18f1230_a-ugetc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/ugetc.c' object='libio18f1230_a-ugetc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-ugetc.o `test -f 'usart/ugetc.c' || echo '$(srcdir)/'`usart/ugetc.c
+
+libio18f1230_a-ugetc.obj: usart/ugetc.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-ugetc.obj -MD -MP -MF $(DEPDIR)/libio18f1230_a-ugetc.Tpo -c -o libio18f1230_a-ugetc.obj `if test -f 'usart/ugetc.c'; then $(CYGPATH_W) 'usart/ugetc.c'; else $(CYGPATH_W) '$(srcdir)/usart/ugetc.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-ugetc.Tpo $(DEPDIR)/libio18f1230_a-ugetc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/ugetc.c' object='libio18f1230_a-ugetc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-ugetc.obj `if test -f 'usart/ugetc.c'; then $(CYGPATH_W) 'usart/ugetc.c'; else $(CYGPATH_W) '$(srcdir)/usart/ugetc.c'; fi`
+
+libio18f1230_a-ugets.o: usart/ugets.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-ugets.o -MD -MP -MF $(DEPDIR)/libio18f1230_a-ugets.Tpo -c -o libio18f1230_a-ugets.o `test -f 'usart/ugets.c' || echo '$(srcdir)/'`usart/ugets.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-ugets.Tpo $(DEPDIR)/libio18f1230_a-ugets.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/ugets.c' object='libio18f1230_a-ugets.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-ugets.o `test -f 'usart/ugets.c' || echo '$(srcdir)/'`usart/ugets.c
+
+libio18f1230_a-ugets.obj: usart/ugets.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-ugets.obj -MD -MP -MF $(DEPDIR)/libio18f1230_a-ugets.Tpo -c -o libio18f1230_a-ugets.obj `if test -f 'usart/ugets.c'; then $(CYGPATH_W) 'usart/ugets.c'; else $(CYGPATH_W) '$(srcdir)/usart/ugets.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-ugets.Tpo $(DEPDIR)/libio18f1230_a-ugets.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/ugets.c' object='libio18f1230_a-ugets.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-ugets.obj `if test -f 'usart/ugets.c'; then $(CYGPATH_W) 'usart/ugets.c'; else $(CYGPATH_W) '$(srcdir)/usart/ugets.c'; fi`
+
+libio18f1230_a-uopen.o: usart/uopen.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-uopen.o -MD -MP -MF $(DEPDIR)/libio18f1230_a-uopen.Tpo -c -o libio18f1230_a-uopen.o `test -f 'usart/uopen.c' || echo '$(srcdir)/'`usart/uopen.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-uopen.Tpo $(DEPDIR)/libio18f1230_a-uopen.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/uopen.c' object='libio18f1230_a-uopen.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-uopen.o `test -f 'usart/uopen.c' || echo '$(srcdir)/'`usart/uopen.c
+
+libio18f1230_a-uopen.obj: usart/uopen.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-uopen.obj -MD -MP -MF $(DEPDIR)/libio18f1230_a-uopen.Tpo -c -o libio18f1230_a-uopen.obj `if test -f 'usart/uopen.c'; then $(CYGPATH_W) 'usart/uopen.c'; else $(CYGPATH_W) '$(srcdir)/usart/uopen.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-uopen.Tpo $(DEPDIR)/libio18f1230_a-uopen.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/uopen.c' object='libio18f1230_a-uopen.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-uopen.obj `if test -f 'usart/uopen.c'; then $(CYGPATH_W) 'usart/uopen.c'; else $(CYGPATH_W) '$(srcdir)/usart/uopen.c'; fi`
+
+libio18f1230_a-uputc.o: usart/uputc.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-uputc.o -MD -MP -MF $(DEPDIR)/libio18f1230_a-uputc.Tpo -c -o libio18f1230_a-uputc.o `test -f 'usart/uputc.c' || echo '$(srcdir)/'`usart/uputc.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-uputc.Tpo $(DEPDIR)/libio18f1230_a-uputc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/uputc.c' object='libio18f1230_a-uputc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-uputc.o `test -f 'usart/uputc.c' || echo '$(srcdir)/'`usart/uputc.c
+
+libio18f1230_a-uputc.obj: usart/uputc.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-uputc.obj -MD -MP -MF $(DEPDIR)/libio18f1230_a-uputc.Tpo -c -o libio18f1230_a-uputc.obj `if test -f 'usart/uputc.c'; then $(CYGPATH_W) 'usart/uputc.c'; else $(CYGPATH_W) '$(srcdir)/usart/uputc.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-uputc.Tpo $(DEPDIR)/libio18f1230_a-uputc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/uputc.c' object='libio18f1230_a-uputc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-uputc.obj `if test -f 'usart/uputc.c'; then $(CYGPATH_W) 'usart/uputc.c'; else $(CYGPATH_W) '$(srcdir)/usart/uputc.c'; fi`
+
+libio18f1230_a-uputs.o: usart/uputs.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-uputs.o -MD -MP -MF $(DEPDIR)/libio18f1230_a-uputs.Tpo -c -o libio18f1230_a-uputs.o `test -f 'usart/uputs.c' || echo '$(srcdir)/'`usart/uputs.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-uputs.Tpo $(DEPDIR)/libio18f1230_a-uputs.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/uputs.c' object='libio18f1230_a-uputs.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-uputs.o `test -f 'usart/uputs.c' || echo '$(srcdir)/'`usart/uputs.c
+
+libio18f1230_a-uputs.obj: usart/uputs.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-uputs.obj -MD -MP -MF $(DEPDIR)/libio18f1230_a-uputs.Tpo -c -o libio18f1230_a-uputs.obj `if test -f 'usart/uputs.c'; then $(CYGPATH_W) 'usart/uputs.c'; else $(CYGPATH_W) '$(srcdir)/usart/uputs.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-uputs.Tpo $(DEPDIR)/libio18f1230_a-uputs.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/uputs.c' object='libio18f1230_a-uputs.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-uputs.obj `if test -f 'usart/uputs.c'; then $(CYGPATH_W) 'usart/uputs.c'; else $(CYGPATH_W) '$(srcdir)/usart/uputs.c'; fi`
+
+libio18f1230_a-usartd.o: usart/usartd.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-usartd.o -MD -MP -MF $(DEPDIR)/libio18f1230_a-usartd.Tpo -c -o libio18f1230_a-usartd.o `test -f 'usart/usartd.c' || echo '$(srcdir)/'`usart/usartd.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-usartd.Tpo $(DEPDIR)/libio18f1230_a-usartd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/usartd.c' object='libio18f1230_a-usartd.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-usartd.o `test -f 'usart/usartd.c' || echo '$(srcdir)/'`usart/usartd.c
+
+libio18f1230_a-usartd.obj: usart/usartd.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -MT libio18f1230_a-usartd.obj -MD -MP -MF $(DEPDIR)/libio18f1230_a-usartd.Tpo -c -o libio18f1230_a-usartd.obj `if test -f 'usart/usartd.c'; then $(CYGPATH_W) 'usart/usartd.c'; else $(CYGPATH_W) '$(srcdir)/usart/usartd.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1230_a-usartd.Tpo $(DEPDIR)/libio18f1230_a-usartd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/usartd.c' object='libio18f1230_a-usartd.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1230_a_CFLAGS) $(CFLAGS) -c -o libio18f1230_a-usartd.obj `if test -f 'usart/usartd.c'; then $(CYGPATH_W) 'usart/usartd.c'; else $(CYGPATH_W) '$(srcdir)/usart/usartd.c'; fi`
+
 libio18f1320_a-dummy.o: dummy.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1320_a_CFLAGS) $(CFLAGS) -MT libio18f1320_a-dummy.o -MD -MP -MF $(DEPDIR)/libio18f1320_a-dummy.Tpo -c -o libio18f1320_a-dummy.o `test -f 'dummy.c' || echo '$(srcdir)/'`dummy.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1320_a-dummy.Tpo $(DEPDIR)/libio18f1320_a-dummy.Po
@@ -9582,6 +9898,244 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1320_a_CFLAGS) $(CFLAGS) -c -o libio18f1320_a-usartd.obj `if test -f 'usart/usartd.c'; then $(CYGPATH_W) 'usart/usartd.c'; else $(CYGPATH_W) '$(srcdir)/usart/usartd.c'; fi`
 
+libio18f1330_a-dummy.o: dummy.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-dummy.o -MD -MP -MF $(DEPDIR)/libio18f1330_a-dummy.Tpo -c -o libio18f1330_a-dummy.o `test -f 'dummy.c' || echo '$(srcdir)/'`dummy.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-dummy.Tpo $(DEPDIR)/libio18f1330_a-dummy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dummy.c' object='libio18f1330_a-dummy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-dummy.o `test -f 'dummy.c' || echo '$(srcdir)/'`dummy.c
+
+libio18f1330_a-dummy.obj: dummy.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-dummy.obj -MD -MP -MF $(DEPDIR)/libio18f1330_a-dummy.Tpo -c -o libio18f1330_a-dummy.obj `if test -f 'dummy.c'; then $(CYGPATH_W) 'dummy.c'; else $(CYGPATH_W) '$(srcdir)/dummy.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-dummy.Tpo $(DEPDIR)/libio18f1330_a-dummy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dummy.c' object='libio18f1330_a-dummy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-dummy.obj `if test -f 'dummy.c'; then $(CYGPATH_W) 'dummy.c'; else $(CYGPATH_W) '$(srcdir)/dummy.c'; fi`
+
+libio18f1330_a-adcbusy.o: adc/adcbusy.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-adcbusy.o -MD -MP -MF $(DEPDIR)/libio18f1330_a-adcbusy.Tpo -c -o libio18f1330_a-adcbusy.o `test -f 'adc/adcbusy.c' || echo '$(srcdir)/'`adc/adcbusy.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-adcbusy.Tpo $(DEPDIR)/libio18f1330_a-adcbusy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcbusy.c' object='libio18f1330_a-adcbusy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-adcbusy.o `test -f 'adc/adcbusy.c' || echo '$(srcdir)/'`adc/adcbusy.c
+
+libio18f1330_a-adcbusy.obj: adc/adcbusy.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-adcbusy.obj -MD -MP -MF $(DEPDIR)/libio18f1330_a-adcbusy.Tpo -c -o libio18f1330_a-adcbusy.obj `if test -f 'adc/adcbusy.c'; then $(CYGPATH_W) 'adc/adcbusy.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcbusy.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-adcbusy.Tpo $(DEPDIR)/libio18f1330_a-adcbusy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcbusy.c' object='libio18f1330_a-adcbusy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-adcbusy.obj `if test -f 'adc/adcbusy.c'; then $(CYGPATH_W) 'adc/adcbusy.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcbusy.c'; fi`
+
+libio18f1330_a-adcclose.o: adc/adcclose.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-adcclose.o -MD -MP -MF $(DEPDIR)/libio18f1330_a-adcclose.Tpo -c -o libio18f1330_a-adcclose.o `test -f 'adc/adcclose.c' || echo '$(srcdir)/'`adc/adcclose.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-adcclose.Tpo $(DEPDIR)/libio18f1330_a-adcclose.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcclose.c' object='libio18f1330_a-adcclose.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-adcclose.o `test -f 'adc/adcclose.c' || echo '$(srcdir)/'`adc/adcclose.c
+
+libio18f1330_a-adcclose.obj: adc/adcclose.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-adcclose.obj -MD -MP -MF $(DEPDIR)/libio18f1330_a-adcclose.Tpo -c -o libio18f1330_a-adcclose.obj `if test -f 'adc/adcclose.c'; then $(CYGPATH_W) 'adc/adcclose.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcclose.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-adcclose.Tpo $(DEPDIR)/libio18f1330_a-adcclose.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcclose.c' object='libio18f1330_a-adcclose.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-adcclose.obj `if test -f 'adc/adcclose.c'; then $(CYGPATH_W) 'adc/adcclose.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcclose.c'; fi`
+
+libio18f1330_a-adcconv.o: adc/adcconv.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-adcconv.o -MD -MP -MF $(DEPDIR)/libio18f1330_a-adcconv.Tpo -c -o libio18f1330_a-adcconv.o `test -f 'adc/adcconv.c' || echo '$(srcdir)/'`adc/adcconv.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-adcconv.Tpo $(DEPDIR)/libio18f1330_a-adcconv.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcconv.c' object='libio18f1330_a-adcconv.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-adcconv.o `test -f 'adc/adcconv.c' || echo '$(srcdir)/'`adc/adcconv.c
+
+libio18f1330_a-adcconv.obj: adc/adcconv.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-adcconv.obj -MD -MP -MF $(DEPDIR)/libio18f1330_a-adcconv.Tpo -c -o libio18f1330_a-adcconv.obj `if test -f 'adc/adcconv.c'; then $(CYGPATH_W) 'adc/adcconv.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcconv.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-adcconv.Tpo $(DEPDIR)/libio18f1330_a-adcconv.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcconv.c' object='libio18f1330_a-adcconv.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-adcconv.obj `if test -f 'adc/adcconv.c'; then $(CYGPATH_W) 'adc/adcconv.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcconv.c'; fi`
+
+libio18f1330_a-adcopen.o: adc/adcopen.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-adcopen.o -MD -MP -MF $(DEPDIR)/libio18f1330_a-adcopen.Tpo -c -o libio18f1330_a-adcopen.o `test -f 'adc/adcopen.c' || echo '$(srcdir)/'`adc/adcopen.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-adcopen.Tpo $(DEPDIR)/libio18f1330_a-adcopen.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcopen.c' object='libio18f1330_a-adcopen.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-adcopen.o `test -f 'adc/adcopen.c' || echo '$(srcdir)/'`adc/adcopen.c
+
+libio18f1330_a-adcopen.obj: adc/adcopen.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-adcopen.obj -MD -MP -MF $(DEPDIR)/libio18f1330_a-adcopen.Tpo -c -o libio18f1330_a-adcopen.obj `if test -f 'adc/adcopen.c'; then $(CYGPATH_W) 'adc/adcopen.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcopen.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-adcopen.Tpo $(DEPDIR)/libio18f1330_a-adcopen.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcopen.c' object='libio18f1330_a-adcopen.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-adcopen.obj `if test -f 'adc/adcopen.c'; then $(CYGPATH_W) 'adc/adcopen.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcopen.c'; fi`
+
+libio18f1330_a-adcread.o: adc/adcread.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-adcread.o -MD -MP -MF $(DEPDIR)/libio18f1330_a-adcread.Tpo -c -o libio18f1330_a-adcread.o `test -f 'adc/adcread.c' || echo '$(srcdir)/'`adc/adcread.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-adcread.Tpo $(DEPDIR)/libio18f1330_a-adcread.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcread.c' object='libio18f1330_a-adcread.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-adcread.o `test -f 'adc/adcread.c' || echo '$(srcdir)/'`adc/adcread.c
+
+libio18f1330_a-adcread.obj: adc/adcread.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-adcread.obj -MD -MP -MF $(DEPDIR)/libio18f1330_a-adcread.Tpo -c -o libio18f1330_a-adcread.obj `if test -f 'adc/adcread.c'; then $(CYGPATH_W) 'adc/adcread.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcread.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-adcread.Tpo $(DEPDIR)/libio18f1330_a-adcread.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcread.c' object='libio18f1330_a-adcread.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-adcread.obj `if test -f 'adc/adcread.c'; then $(CYGPATH_W) 'adc/adcread.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcread.c'; fi`
+
+libio18f1330_a-adcsetch.o: adc/adcsetch.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-adcsetch.o -MD -MP -MF $(DEPDIR)/libio18f1330_a-adcsetch.Tpo -c -o libio18f1330_a-adcsetch.o `test -f 'adc/adcsetch.c' || echo '$(srcdir)/'`adc/adcsetch.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-adcsetch.Tpo $(DEPDIR)/libio18f1330_a-adcsetch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcsetch.c' object='libio18f1330_a-adcsetch.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-adcsetch.o `test -f 'adc/adcsetch.c' || echo '$(srcdir)/'`adc/adcsetch.c
+
+libio18f1330_a-adcsetch.obj: adc/adcsetch.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-adcsetch.obj -MD -MP -MF $(DEPDIR)/libio18f1330_a-adcsetch.Tpo -c -o libio18f1330_a-adcsetch.obj `if test -f 'adc/adcsetch.c'; then $(CYGPATH_W) 'adc/adcsetch.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcsetch.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-adcsetch.Tpo $(DEPDIR)/libio18f1330_a-adcsetch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adc/adcsetch.c' object='libio18f1330_a-adcsetch.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-adcsetch.obj `if test -f 'adc/adcsetch.c'; then $(CYGPATH_W) 'adc/adcsetch.c'; else $(CYGPATH_W) '$(srcdir)/adc/adcsetch.c'; fi`
+
+libio18f1330_a-ubaud.o: usart/ubaud.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-ubaud.o -MD -MP -MF $(DEPDIR)/libio18f1330_a-ubaud.Tpo -c -o libio18f1330_a-ubaud.o `test -f 'usart/ubaud.c' || echo '$(srcdir)/'`usart/ubaud.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-ubaud.Tpo $(DEPDIR)/libio18f1330_a-ubaud.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/ubaud.c' object='libio18f1330_a-ubaud.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-ubaud.o `test -f 'usart/ubaud.c' || echo '$(srcdir)/'`usart/ubaud.c
+
+libio18f1330_a-ubaud.obj: usart/ubaud.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-ubaud.obj -MD -MP -MF $(DEPDIR)/libio18f1330_a-ubaud.Tpo -c -o libio18f1330_a-ubaud.obj `if test -f 'usart/ubaud.c'; then $(CYGPATH_W) 'usart/ubaud.c'; else $(CYGPATH_W) '$(srcdir)/usart/ubaud.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-ubaud.Tpo $(DEPDIR)/libio18f1330_a-ubaud.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/ubaud.c' object='libio18f1330_a-ubaud.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-ubaud.obj `if test -f 'usart/ubaud.c'; then $(CYGPATH_W) 'usart/ubaud.c'; else $(CYGPATH_W) '$(srcdir)/usart/ubaud.c'; fi`
+
+libio18f1330_a-ubusy.o: usart/ubusy.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-ubusy.o -MD -MP -MF $(DEPDIR)/libio18f1330_a-ubusy.Tpo -c -o libio18f1330_a-ubusy.o `test -f 'usart/ubusy.c' || echo '$(srcdir)/'`usart/ubusy.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-ubusy.Tpo $(DEPDIR)/libio18f1330_a-ubusy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/ubusy.c' object='libio18f1330_a-ubusy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-ubusy.o `test -f 'usart/ubusy.c' || echo '$(srcdir)/'`usart/ubusy.c
+
+libio18f1330_a-ubusy.obj: usart/ubusy.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-ubusy.obj -MD -MP -MF $(DEPDIR)/libio18f1330_a-ubusy.Tpo -c -o libio18f1330_a-ubusy.obj `if test -f 'usart/ubusy.c'; then $(CYGPATH_W) 'usart/ubusy.c'; else $(CYGPATH_W) '$(srcdir)/usart/ubusy.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-ubusy.Tpo $(DEPDIR)/libio18f1330_a-ubusy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/ubusy.c' object='libio18f1330_a-ubusy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-ubusy.obj `if test -f 'usart/ubusy.c'; then $(CYGPATH_W) 'usart/ubusy.c'; else $(CYGPATH_W) '$(srcdir)/usart/ubusy.c'; fi`
+
+libio18f1330_a-uclose.o: usart/uclose.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-uclose.o -MD -MP -MF $(DEPDIR)/libio18f1330_a-uclose.Tpo -c -o libio18f1330_a-uclose.o `test -f 'usart/uclose.c' || echo '$(srcdir)/'`usart/uclose.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-uclose.Tpo $(DEPDIR)/libio18f1330_a-uclose.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/uclose.c' object='libio18f1330_a-uclose.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-uclose.o `test -f 'usart/uclose.c' || echo '$(srcdir)/'`usart/uclose.c
+
+libio18f1330_a-uclose.obj: usart/uclose.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-uclose.obj -MD -MP -MF $(DEPDIR)/libio18f1330_a-uclose.Tpo -c -o libio18f1330_a-uclose.obj `if test -f 'usart/uclose.c'; then $(CYGPATH_W) 'usart/uclose.c'; else $(CYGPATH_W) '$(srcdir)/usart/uclose.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-uclose.Tpo $(DEPDIR)/libio18f1330_a-uclose.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/uclose.c' object='libio18f1330_a-uclose.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-uclose.obj `if test -f 'usart/uclose.c'; then $(CYGPATH_W) 'usart/uclose.c'; else $(CYGPATH_W) '$(srcdir)/usart/uclose.c'; fi`
+
+libio18f1330_a-udrdy.o: usart/udrdy.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-udrdy.o -MD -MP -MF $(DEPDIR)/libio18f1330_a-udrdy.Tpo -c -o libio18f1330_a-udrdy.o `test -f 'usart/udrdy.c' || echo '$(srcdir)/'`usart/udrdy.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-udrdy.Tpo $(DEPDIR)/libio18f1330_a-udrdy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/udrdy.c' object='libio18f1330_a-udrdy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-udrdy.o `test -f 'usart/udrdy.c' || echo '$(srcdir)/'`usart/udrdy.c
+
+libio18f1330_a-udrdy.obj: usart/udrdy.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-udrdy.obj -MD -MP -MF $(DEPDIR)/libio18f1330_a-udrdy.Tpo -c -o libio18f1330_a-udrdy.obj `if test -f 'usart/udrdy.c'; then $(CYGPATH_W) 'usart/udrdy.c'; else $(CYGPATH_W) '$(srcdir)/usart/udrdy.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-udrdy.Tpo $(DEPDIR)/libio18f1330_a-udrdy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/udrdy.c' object='libio18f1330_a-udrdy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-udrdy.obj `if test -f 'usart/udrdy.c'; then $(CYGPATH_W) 'usart/udrdy.c'; else $(CYGPATH_W) '$(srcdir)/usart/udrdy.c'; fi`
+
+libio18f1330_a-ugetc.o: usart/ugetc.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-ugetc.o -MD -MP -MF $(DEPDIR)/libio18f1330_a-ugetc.Tpo -c -o libio18f1330_a-ugetc.o `test -f 'usart/ugetc.c' || echo '$(srcdir)/'`usart/ugetc.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-ugetc.Tpo $(DEPDIR)/libio18f1330_a-ugetc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/ugetc.c' object='libio18f1330_a-ugetc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-ugetc.o `test -f 'usart/ugetc.c' || echo '$(srcdir)/'`usart/ugetc.c
+
+libio18f1330_a-ugetc.obj: usart/ugetc.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-ugetc.obj -MD -MP -MF $(DEPDIR)/libio18f1330_a-ugetc.Tpo -c -o libio18f1330_a-ugetc.obj `if test -f 'usart/ugetc.c'; then $(CYGPATH_W) 'usart/ugetc.c'; else $(CYGPATH_W) '$(srcdir)/usart/ugetc.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-ugetc.Tpo $(DEPDIR)/libio18f1330_a-ugetc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/ugetc.c' object='libio18f1330_a-ugetc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-ugetc.obj `if test -f 'usart/ugetc.c'; then $(CYGPATH_W) 'usart/ugetc.c'; else $(CYGPATH_W) '$(srcdir)/usart/ugetc.c'; fi`
+
+libio18f1330_a-ugets.o: usart/ugets.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-ugets.o -MD -MP -MF $(DEPDIR)/libio18f1330_a-ugets.Tpo -c -o libio18f1330_a-ugets.o `test -f 'usart/ugets.c' || echo '$(srcdir)/'`usart/ugets.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-ugets.Tpo $(DEPDIR)/libio18f1330_a-ugets.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/ugets.c' object='libio18f1330_a-ugets.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-ugets.o `test -f 'usart/ugets.c' || echo '$(srcdir)/'`usart/ugets.c
+
+libio18f1330_a-ugets.obj: usart/ugets.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-ugets.obj -MD -MP -MF $(DEPDIR)/libio18f1330_a-ugets.Tpo -c -o libio18f1330_a-ugets.obj `if test -f 'usart/ugets.c'; then $(CYGPATH_W) 'usart/ugets.c'; else $(CYGPATH_W) '$(srcdir)/usart/ugets.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-ugets.Tpo $(DEPDIR)/libio18f1330_a-ugets.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/ugets.c' object='libio18f1330_a-ugets.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-ugets.obj `if test -f 'usart/ugets.c'; then $(CYGPATH_W) 'usart/ugets.c'; else $(CYGPATH_W) '$(srcdir)/usart/ugets.c'; fi`
+
+libio18f1330_a-uopen.o: usart/uopen.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-uopen.o -MD -MP -MF $(DEPDIR)/libio18f1330_a-uopen.Tpo -c -o libio18f1330_a-uopen.o `test -f 'usart/uopen.c' || echo '$(srcdir)/'`usart/uopen.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-uopen.Tpo $(DEPDIR)/libio18f1330_a-uopen.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/uopen.c' object='libio18f1330_a-uopen.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-uopen.o `test -f 'usart/uopen.c' || echo '$(srcdir)/'`usart/uopen.c
+
+libio18f1330_a-uopen.obj: usart/uopen.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-uopen.obj -MD -MP -MF $(DEPDIR)/libio18f1330_a-uopen.Tpo -c -o libio18f1330_a-uopen.obj `if test -f 'usart/uopen.c'; then $(CYGPATH_W) 'usart/uopen.c'; else $(CYGPATH_W) '$(srcdir)/usart/uopen.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-uopen.Tpo $(DEPDIR)/libio18f1330_a-uopen.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/uopen.c' object='libio18f1330_a-uopen.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-uopen.obj `if test -f 'usart/uopen.c'; then $(CYGPATH_W) 'usart/uopen.c'; else $(CYGPATH_W) '$(srcdir)/usart/uopen.c'; fi`
+
+libio18f1330_a-uputc.o: usart/uputc.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-uputc.o -MD -MP -MF $(DEPDIR)/libio18f1330_a-uputc.Tpo -c -o libio18f1330_a-uputc.o `test -f 'usart/uputc.c' || echo '$(srcdir)/'`usart/uputc.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-uputc.Tpo $(DEPDIR)/libio18f1330_a-uputc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/uputc.c' object='libio18f1330_a-uputc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-uputc.o `test -f 'usart/uputc.c' || echo '$(srcdir)/'`usart/uputc.c
+
+libio18f1330_a-uputc.obj: usart/uputc.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-uputc.obj -MD -MP -MF $(DEPDIR)/libio18f1330_a-uputc.Tpo -c -o libio18f1330_a-uputc.obj `if test -f 'usart/uputc.c'; then $(CYGPATH_W) 'usart/uputc.c'; else $(CYGPATH_W) '$(srcdir)/usart/uputc.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-uputc.Tpo $(DEPDIR)/libio18f1330_a-uputc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/uputc.c' object='libio18f1330_a-uputc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-uputc.obj `if test -f 'usart/uputc.c'; then $(CYGPATH_W) 'usart/uputc.c'; else $(CYGPATH_W) '$(srcdir)/usart/uputc.c'; fi`
+
+libio18f1330_a-uputs.o: usart/uputs.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-uputs.o -MD -MP -MF $(DEPDIR)/libio18f1330_a-uputs.Tpo -c -o libio18f1330_a-uputs.o `test -f 'usart/uputs.c' || echo '$(srcdir)/'`usart/uputs.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-uputs.Tpo $(DEPDIR)/libio18f1330_a-uputs.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/uputs.c' object='libio18f1330_a-uputs.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-uputs.o `test -f 'usart/uputs.c' || echo '$(srcdir)/'`usart/uputs.c
+
+libio18f1330_a-uputs.obj: usart/uputs.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-uputs.obj -MD -MP -MF $(DEPDIR)/libio18f1330_a-uputs.Tpo -c -o libio18f1330_a-uputs.obj `if test -f 'usart/uputs.c'; then $(CYGPATH_W) 'usart/uputs.c'; else $(CYGPATH_W) '$(srcdir)/usart/uputs.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-uputs.Tpo $(DEPDIR)/libio18f1330_a-uputs.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/uputs.c' object='libio18f1330_a-uputs.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-uputs.obj `if test -f 'usart/uputs.c'; then $(CYGPATH_W) 'usart/uputs.c'; else $(CYGPATH_W) '$(srcdir)/usart/uputs.c'; fi`
+
+libio18f1330_a-usartd.o: usart/usartd.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-usartd.o -MD -MP -MF $(DEPDIR)/libio18f1330_a-usartd.Tpo -c -o libio18f1330_a-usartd.o `test -f 'usart/usartd.c' || echo '$(srcdir)/'`usart/usartd.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-usartd.Tpo $(DEPDIR)/libio18f1330_a-usartd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/usartd.c' object='libio18f1330_a-usartd.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-usartd.o `test -f 'usart/usartd.c' || echo '$(srcdir)/'`usart/usartd.c
+
+libio18f1330_a-usartd.obj: usart/usartd.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -MT libio18f1330_a-usartd.obj -MD -MP -MF $(DEPDIR)/libio18f1330_a-usartd.Tpo -c -o libio18f1330_a-usartd.obj `if test -f 'usart/usartd.c'; then $(CYGPATH_W) 'usart/usartd.c'; else $(CYGPATH_W) '$(srcdir)/usart/usartd.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f1330_a-usartd.Tpo $(DEPDIR)/libio18f1330_a-usartd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usart/usartd.c' object='libio18f1330_a-usartd.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f1330_a_CFLAGS) $(CFLAGS) -c -o libio18f1330_a-usartd.obj `if test -f 'usart/usartd.c'; then $(CYGPATH_W) 'usart/usartd.c'; else $(CYGPATH_W) '$(srcdir)/usart/usartd.c'; fi`
+
 libio18f13k50_a-dummy.o: dummy.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libio18f13k50_a_CFLAGS) $(CFLAGS) -MT libio18f13k50_a-dummy.o -MD -MP -MF $(DEPDIR)/libio18f13k50_a-dummy.Tpo -c -o libio18f13k50_a-dummy.o `test -f 'dummy.c' || echo '$(srcdir)/'`dummy.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libio18f13k50_a-dummy.Tpo $(DEPDIR)/libio18f13k50_a-dummy.Po
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/adc/adcbusy.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/adc/adcbusy.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/adc/adcbusy.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/adc/adcbusy.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -46,6 +46,7 @@
     return
   __endasm;
 #elif (__SDCC_ADC_STYLE == 1812200) \
+   || (__SDCC_ADC_STYLE == 1812300) \
    || (__SDCC_ADC_STYLE == 1813502) \
    || (__SDCC_ADC_STYLE == 1822200) \
    || (__SDCC_ADC_STYLE == 1823222) \
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/adc/adcclose.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/adc/adcclose.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/adc/adcclose.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/adc/adcclose.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/adc/adcconv.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/adc/adcconv.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/adc/adcconv.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/adc/adcconv.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/adc/adcopen.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/adc/adcopen.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/adc/adcopen.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/adc/adcopen.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -34,7 +34,7 @@
  * parameters are:
  *   channel: one of ADC_CHN_*
  *   fosc:    one of ADC_FOSC_* | ADC_ACQT_* | ADC_CAL
- *   pcfg:    one of ADC_CFG_* (a bitmask with set bits denoting digital ports for 1220/65j50-style)
+ *   pcfg:    one of ADC_CFG_* (a bitmask with set bits denoting digital ports for many styles)
  *   config:  ADC_FRM_* | ADC_INT_* | ADC_VCFG_* | ADC_NVCFG_* | ADC_PVCFG_*
  */
 
@@ -57,6 +57,10 @@
   ADCON0 = ((channel & 0x07) | (config & ADC_VCFG_AN3_AN2)) << 2;
   ADCON1 = (pcfg & 0x7f);
   ADCON2 = (ADCON2 & 0x38) | (fosc & 0x07) | (config & ADC_FRM_RJUST);
+#elif (__SDCC_ADC_STYLE == 1812300)
+  ADCON0 = ((channel & 0x03) << 2);
+  ADCON1 = (pcfg & 0x0f) | (config & ADC_VCFG_VREF);
+  ADCON2 = (fosc & 0x7f) | (config & ADC_FRM_RJUST);
 #elif (__SDCC_ADC_STYLE == 1813502)
   ANSEL = pcfg;
   ANSELH = (pcfg >> 8);
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/adc/adcread.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/adc/adcread.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/adc/adcread.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/adc/adcread.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/adc/adcsetch.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/adc/adcsetch.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/adc/adcsetch.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/adc/adcsetch.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -36,6 +36,8 @@
   ADCON0 = (ADCON0 & ~(0x07 << 3)) | ((channel & 0x07) << 3);
 #elif (__SDCC_ADC_STYLE == 1812200)
   ADCON0 = (ADCON0 & ~(0x07 << 2)) | ((channel & 0x07) << 2);
+#elif (__SDCC_ADC_STYLE == 1812300)
+  ADCON0 = (ADCON0 & ~(0x03 << 2)) | ((channel & 0x03) << 2);
 #elif (__SDCC_ADC_STYLE == 1813502)
   ADCON0 = (ADCON0 & ~(0x0f << 2)) | ((channel & 0x0f) << 2);
 #elif (__SDCC_ADC_STYLE == 1822200)
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2cack.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2cack.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2cack.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2cack.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2cclose.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2cclose.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2cclose.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2cclose.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2cdrdy.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2cdrdy.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2cdrdy.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2cdrdy.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2cidle.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2cidle.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2cidle.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2cidle.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2cnack.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2cnack.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2cnack.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2cnack.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2copen.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2copen.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2copen.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2copen.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2creadc.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2creadc.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2creadc.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2creadc.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2creads.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2creads.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2creads.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2creads.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2crestart.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2crestart.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2crestart.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2crestart.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2cstart.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2cstart.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2cstart.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2cstart.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2cstop.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2cstop.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2cstop.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2cstop.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2cwritec.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2cwritec.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2cwritec.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2cwritec.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2cwrites.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2cwrites.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c/i2cwrites.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c/i2cwrites.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c.ignore sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c.ignore
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/i2c.ignore	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/i2c.ignore	2012-03-10 17:53:10.000000000 +0000
@@ -1,5 +1,7 @@
 1220
+1230
 1320
+1330
 
 2331
 2431
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/mkmk.sh sdcc-3.2.0+dfsg/device/lib/pic16/libio/mkmk.sh
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/mkmk.sh	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/mkmk.sh	2012-03-10 17:53:10.000000000 +0000
@@ -17,7 +17,7 @@
 
 HEREDOC
 
-sed -e 's/\s*#.*$//' ../pics.all | grep -v "^\s*$" | sort | while read arch; do
+sed -e 's/\s*#.*$//' ../../../non-free/lib/pic16/pics.all | grep -v "^\s*$" | sort | while read arch; do
     echo "Generating for device >>${arch}<<" >&2;
     cat <<HERE
 lib_LIBRARIES += libio18f${arch}.a
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/usart/ubaud.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/usart/ubaud.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/usart/ubaud.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/usart/ubaud.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/usart/ubusy.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/usart/ubusy.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/usart/ubusy.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/usart/ubusy.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/usart/uclose.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/usart/uclose.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/usart/uclose.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/usart/uclose.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/usart/udrdy.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/usart/udrdy.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/usart/udrdy.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/usart/udrdy.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/usart/ugetc.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/usart/ugetc.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/usart/ugetc.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/usart/ugetc.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/usart/ugets.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/usart/ugets.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/usart/ugets.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/usart/ugets.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/usart/uopen.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/usart/uopen.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/usart/uopen.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/usart/uopen.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -62,9 +62,16 @@
     RCSTAbits.SREN = 1;
 
   if (config & 0x10)
-    TXSTAbits.BRGH = 1;
+    {
+      TXSTAbits.BRGH = 1;
+#if !__SDCC_NO_SPBRGH
+      BAUDCONbits.BRG16 = 1;
+    }
   else
-    TXSTAbits.BRGH = 0;
+    {
+      BAUDCONbits.BRG16 = 0;
+#endif  /* !__SDCC_NO_SPBRGH */
+    }
 
   /* TX interrupts */
 #if defined(pic18f66j60) || defined(pic18f66j65) || \
@@ -122,6 +129,10 @@
   /* Configure RX/TX pins as inputs. */
   TRISBbits.TRISB1 = 1;
   TRISBbits.TRISB4 = 1;
+#elif (__SDCC_USART_STYLE == 1812300)
+  /* Configure RX/TX pins as inputs. */
+  TRISAbits.TRISA2 = 1;
+  TRISAbits.TRISA3 = 1;
 #elif (__SDCC_USART_STYLE == 1813502)
   /* Configure RX pin as digital pin. */
   ANSELHbits.ANS11 = 0;
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/usart/uputc.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/usart/uputc.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/usart/uputc.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/usart/uputc.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/usart/uputs.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/usart/uputs.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/usart/uputs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/usart/uputs.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libio/usart/usartd.c sdcc-3.2.0+dfsg/device/lib/pic16/libio/usart/usartd.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libio/usart/usartd.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libio/usart/usartd.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/acosf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/acosf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/acosf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/acosf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/asincosf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/asincosf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/asincosf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/asincosf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/asinf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/asinf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/asinf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/asinf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/atan2f.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/atan2f.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/atan2f.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/atan2f.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/atanf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/atanf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/atanf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/atanf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/ceilf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/ceilf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/ceilf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/ceilf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/cosf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/cosf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/cosf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/cosf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/coshf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/coshf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/coshf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/coshf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/cotf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/cotf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/cotf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/cotf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/errno.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/errno.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/errno.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/errno.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/expf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/expf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/expf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/expf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/fabsf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/fabsf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/fabsf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/fabsf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/floorf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/floorf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/floorf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/floorf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/frexpf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/frexpf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/frexpf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/frexpf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/ldexpf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/ldexpf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/ldexpf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/ldexpf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/log10f.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/log10f.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/log10f.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/log10f.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/logf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/logf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/logf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/logf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/modff.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/modff.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/modff.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/modff.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/powf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/powf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/powf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/powf.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/sincosf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/sincosf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/sincosf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/sincosf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/sincoshf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/sincoshf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/sincoshf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/sincoshf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/sinf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/sinf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/sinf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/sinf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/sinhf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/sinhf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/sinhf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/sinhf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/sqrtf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/sqrtf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/sqrtf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/sqrtf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/tancotf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/tancotf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/tancotf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/tancotf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/tanf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/tanf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/tanf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/tanf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libm/tanhf.c sdcc-3.2.0+dfsg/device/lib/pic16/libm/tanhf.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libm/tanhf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libm/tanhf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/Makefile.am sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/Makefile.am
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/Makefile.am	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/Makefile.am	2012-04-19 22:14:15.000000000 +0000
@@ -58,6 +58,24 @@
 libsdcc_a_SOURCES += gptr/gptrput2.c
 libsdcc_a_SOURCES += gptr/gptrput3.c
 libsdcc_a_SOURCES += gptr/gptrput4.c
+libsdcc_a_SOURCES += gptr/eeprom8_gptrget1.c
+libsdcc_a_SOURCES += gptr/eeprom8_gptrget2.c
+libsdcc_a_SOURCES += gptr/eeprom8_gptrget3.c
+libsdcc_a_SOURCES += gptr/eeprom8_gptrget4.c
+libsdcc_a_SOURCES += gptr/eeprom8_gptrput1.c
+libsdcc_a_SOURCES += gptr/eeprom8_gptrput2.c
+libsdcc_a_SOURCES += gptr/eeprom8_gptrput3.c
+libsdcc_a_SOURCES += gptr/eeprom8_gptrput4.c
+libsdcc_a_SOURCES += gptr/eeprom8_write.c
+libsdcc_a_SOURCES += gptr/eeprom16_gptrget1.c
+libsdcc_a_SOURCES += gptr/eeprom16_gptrget2.c
+libsdcc_a_SOURCES += gptr/eeprom16_gptrget3.c
+libsdcc_a_SOURCES += gptr/eeprom16_gptrget4.c
+libsdcc_a_SOURCES += gptr/eeprom16_gptrput1.c
+libsdcc_a_SOURCES += gptr/eeprom16_gptrput2.c
+libsdcc_a_SOURCES += gptr/eeprom16_gptrput3.c
+libsdcc_a_SOURCES += gptr/eeprom16_gptrput4.c
+libsdcc_a_SOURCES += gptr/eeprom16_write.c
 libsdcc_a_SOURCES += int/divsint.c
 libsdcc_a_SOURCES += int/divuint.c
 libsdcc_a_SOURCES += int/modsint.c
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/Makefile.in sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/Makefile.in
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/Makefile.in	2012-07-06 09:08:38.000000000 +0000
@@ -89,11 +89,21 @@
 	uchar2fs.$(OBJEXT) uint2fs.$(OBJEXT) ulong2fs.$(OBJEXT) \
 	gptrget1.$(OBJEXT) gptrget2.$(OBJEXT) gptrget3.$(OBJEXT) \
 	gptrget4.$(OBJEXT) gptrput1.$(OBJEXT) gptrput2.$(OBJEXT) \
-	gptrput3.$(OBJEXT) gptrput4.$(OBJEXT) divsint.$(OBJEXT) \
-	divuint.$(OBJEXT) modsint.$(OBJEXT) moduint.$(OBJEXT) \
-	mulint.$(OBJEXT) divslong.$(OBJEXT) divulong.$(OBJEXT) \
-	modslong.$(OBJEXT) modulong.$(OBJEXT) mullong.$(OBJEXT) \
-	lrrest.$(OBJEXT) lrst.$(OBJEXT) stack.$(OBJEXT)
+	gptrput3.$(OBJEXT) gptrput4.$(OBJEXT) \
+	eeprom8_gptrget1.$(OBJEXT) eeprom8_gptrget2.$(OBJEXT) \
+	eeprom8_gptrget3.$(OBJEXT) eeprom8_gptrget4.$(OBJEXT) \
+	eeprom8_gptrput1.$(OBJEXT) eeprom8_gptrput2.$(OBJEXT) \
+	eeprom8_gptrput3.$(OBJEXT) eeprom8_gptrput4.$(OBJEXT) \
+	eeprom8_write.$(OBJEXT) eeprom16_gptrget1.$(OBJEXT) \
+	eeprom16_gptrget2.$(OBJEXT) eeprom16_gptrget3.$(OBJEXT) \
+	eeprom16_gptrget4.$(OBJEXT) eeprom16_gptrput1.$(OBJEXT) \
+	eeprom16_gptrput2.$(OBJEXT) eeprom16_gptrput3.$(OBJEXT) \
+	eeprom16_gptrput4.$(OBJEXT) eeprom16_write.$(OBJEXT) \
+	divsint.$(OBJEXT) divuint.$(OBJEXT) modsint.$(OBJEXT) \
+	moduint.$(OBJEXT) mulint.$(OBJEXT) divslong.$(OBJEXT) \
+	divulong.$(OBJEXT) modslong.$(OBJEXT) modulong.$(OBJEXT) \
+	mullong.$(OBJEXT) lrrest.$(OBJEXT) lrst.$(OBJEXT) \
+	stack.$(OBJEXT)
 libsdcc_a_OBJECTS = $(am_libsdcc_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -219,7 +229,16 @@
 	float/uchar2fs.c float/uint2fs.c float/ulong2fs.c \
 	gptr/gptrget1.c gptr/gptrget2.c gptr/gptrget3.c \
 	gptr/gptrget4.c gptr/gptrput1.c gptr/gptrput2.c \
-	gptr/gptrput3.c gptr/gptrput4.c int/divsint.c int/divuint.c \
+	gptr/gptrput3.c gptr/gptrput4.c gptr/eeprom8_gptrget1.c \
+	gptr/eeprom8_gptrget2.c gptr/eeprom8_gptrget3.c \
+	gptr/eeprom8_gptrget4.c gptr/eeprom8_gptrput1.c \
+	gptr/eeprom8_gptrput2.c gptr/eeprom8_gptrput3.c \
+	gptr/eeprom8_gptrput4.c gptr/eeprom8_write.c \
+	gptr/eeprom16_gptrget1.c gptr/eeprom16_gptrget2.c \
+	gptr/eeprom16_gptrget3.c gptr/eeprom16_gptrget4.c \
+	gptr/eeprom16_gptrput1.c gptr/eeprom16_gptrput2.c \
+	gptr/eeprom16_gptrput3.c gptr/eeprom16_gptrput4.c \
+	gptr/eeprom16_write.c int/divsint.c int/divuint.c \
 	int/modsint.c int/moduint.c int/mulint.c long/divslong.c \
 	long/divulong.c long/modslong.c long/modulong.c long/mullong.c \
 	lregs/lrrest.c lregs/lrst.c stack/stack.S
@@ -326,6 +345,24 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/divuchar.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/divuint.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/divulong.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eeprom16_gptrget1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eeprom16_gptrget2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eeprom16_gptrget3.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eeprom16_gptrget4.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eeprom16_gptrput1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eeprom16_gptrput2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eeprom16_gptrput3.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eeprom16_gptrput4.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eeprom16_write.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eeprom8_gptrget1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eeprom8_gptrget2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eeprom8_gptrget3.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eeprom8_gptrget4.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eeprom8_gptrput1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eeprom8_gptrput2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eeprom8_gptrput3.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eeprom8_gptrput4.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eeprom8_write.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fps16x162schar.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fps16x162sfloat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fps16x162sint.Po@am__quote@
@@ -1201,6 +1238,258 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gptrput4.obj `if test -f 'gptr/gptrput4.c'; then $(CYGPATH_W) 'gptr/gptrput4.c'; else $(CYGPATH_W) '$(srcdir)/gptr/gptrput4.c'; fi`
 
+eeprom8_gptrget1.o: gptr/eeprom8_gptrget1.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom8_gptrget1.o -MD -MP -MF $(DEPDIR)/eeprom8_gptrget1.Tpo -c -o eeprom8_gptrget1.o `test -f 'gptr/eeprom8_gptrget1.c' || echo '$(srcdir)/'`gptr/eeprom8_gptrget1.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom8_gptrget1.Tpo $(DEPDIR)/eeprom8_gptrget1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom8_gptrget1.c' object='eeprom8_gptrget1.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom8_gptrget1.o `test -f 'gptr/eeprom8_gptrget1.c' || echo '$(srcdir)/'`gptr/eeprom8_gptrget1.c
+
+eeprom8_gptrget1.obj: gptr/eeprom8_gptrget1.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom8_gptrget1.obj -MD -MP -MF $(DEPDIR)/eeprom8_gptrget1.Tpo -c -o eeprom8_gptrget1.obj `if test -f 'gptr/eeprom8_gptrget1.c'; then $(CYGPATH_W) 'gptr/eeprom8_gptrget1.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom8_gptrget1.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom8_gptrget1.Tpo $(DEPDIR)/eeprom8_gptrget1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom8_gptrget1.c' object='eeprom8_gptrget1.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom8_gptrget1.obj `if test -f 'gptr/eeprom8_gptrget1.c'; then $(CYGPATH_W) 'gptr/eeprom8_gptrget1.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom8_gptrget1.c'; fi`
+
+eeprom8_gptrget2.o: gptr/eeprom8_gptrget2.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom8_gptrget2.o -MD -MP -MF $(DEPDIR)/eeprom8_gptrget2.Tpo -c -o eeprom8_gptrget2.o `test -f 'gptr/eeprom8_gptrget2.c' || echo '$(srcdir)/'`gptr/eeprom8_gptrget2.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom8_gptrget2.Tpo $(DEPDIR)/eeprom8_gptrget2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom8_gptrget2.c' object='eeprom8_gptrget2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom8_gptrget2.o `test -f 'gptr/eeprom8_gptrget2.c' || echo '$(srcdir)/'`gptr/eeprom8_gptrget2.c
+
+eeprom8_gptrget2.obj: gptr/eeprom8_gptrget2.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom8_gptrget2.obj -MD -MP -MF $(DEPDIR)/eeprom8_gptrget2.Tpo -c -o eeprom8_gptrget2.obj `if test -f 'gptr/eeprom8_gptrget2.c'; then $(CYGPATH_W) 'gptr/eeprom8_gptrget2.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom8_gptrget2.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom8_gptrget2.Tpo $(DEPDIR)/eeprom8_gptrget2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom8_gptrget2.c' object='eeprom8_gptrget2.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom8_gptrget2.obj `if test -f 'gptr/eeprom8_gptrget2.c'; then $(CYGPATH_W) 'gptr/eeprom8_gptrget2.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom8_gptrget2.c'; fi`
+
+eeprom8_gptrget3.o: gptr/eeprom8_gptrget3.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom8_gptrget3.o -MD -MP -MF $(DEPDIR)/eeprom8_gptrget3.Tpo -c -o eeprom8_gptrget3.o `test -f 'gptr/eeprom8_gptrget3.c' || echo '$(srcdir)/'`gptr/eeprom8_gptrget3.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom8_gptrget3.Tpo $(DEPDIR)/eeprom8_gptrget3.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom8_gptrget3.c' object='eeprom8_gptrget3.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom8_gptrget3.o `test -f 'gptr/eeprom8_gptrget3.c' || echo '$(srcdir)/'`gptr/eeprom8_gptrget3.c
+
+eeprom8_gptrget3.obj: gptr/eeprom8_gptrget3.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom8_gptrget3.obj -MD -MP -MF $(DEPDIR)/eeprom8_gptrget3.Tpo -c -o eeprom8_gptrget3.obj `if test -f 'gptr/eeprom8_gptrget3.c'; then $(CYGPATH_W) 'gptr/eeprom8_gptrget3.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom8_gptrget3.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom8_gptrget3.Tpo $(DEPDIR)/eeprom8_gptrget3.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom8_gptrget3.c' object='eeprom8_gptrget3.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom8_gptrget3.obj `if test -f 'gptr/eeprom8_gptrget3.c'; then $(CYGPATH_W) 'gptr/eeprom8_gptrget3.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom8_gptrget3.c'; fi`
+
+eeprom8_gptrget4.o: gptr/eeprom8_gptrget4.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom8_gptrget4.o -MD -MP -MF $(DEPDIR)/eeprom8_gptrget4.Tpo -c -o eeprom8_gptrget4.o `test -f 'gptr/eeprom8_gptrget4.c' || echo '$(srcdir)/'`gptr/eeprom8_gptrget4.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom8_gptrget4.Tpo $(DEPDIR)/eeprom8_gptrget4.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom8_gptrget4.c' object='eeprom8_gptrget4.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom8_gptrget4.o `test -f 'gptr/eeprom8_gptrget4.c' || echo '$(srcdir)/'`gptr/eeprom8_gptrget4.c
+
+eeprom8_gptrget4.obj: gptr/eeprom8_gptrget4.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom8_gptrget4.obj -MD -MP -MF $(DEPDIR)/eeprom8_gptrget4.Tpo -c -o eeprom8_gptrget4.obj `if test -f 'gptr/eeprom8_gptrget4.c'; then $(CYGPATH_W) 'gptr/eeprom8_gptrget4.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom8_gptrget4.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom8_gptrget4.Tpo $(DEPDIR)/eeprom8_gptrget4.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom8_gptrget4.c' object='eeprom8_gptrget4.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom8_gptrget4.obj `if test -f 'gptr/eeprom8_gptrget4.c'; then $(CYGPATH_W) 'gptr/eeprom8_gptrget4.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom8_gptrget4.c'; fi`
+
+eeprom8_gptrput1.o: gptr/eeprom8_gptrput1.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom8_gptrput1.o -MD -MP -MF $(DEPDIR)/eeprom8_gptrput1.Tpo -c -o eeprom8_gptrput1.o `test -f 'gptr/eeprom8_gptrput1.c' || echo '$(srcdir)/'`gptr/eeprom8_gptrput1.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom8_gptrput1.Tpo $(DEPDIR)/eeprom8_gptrput1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom8_gptrput1.c' object='eeprom8_gptrput1.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom8_gptrput1.o `test -f 'gptr/eeprom8_gptrput1.c' || echo '$(srcdir)/'`gptr/eeprom8_gptrput1.c
+
+eeprom8_gptrput1.obj: gptr/eeprom8_gptrput1.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom8_gptrput1.obj -MD -MP -MF $(DEPDIR)/eeprom8_gptrput1.Tpo -c -o eeprom8_gptrput1.obj `if test -f 'gptr/eeprom8_gptrput1.c'; then $(CYGPATH_W) 'gptr/eeprom8_gptrput1.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom8_gptrput1.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom8_gptrput1.Tpo $(DEPDIR)/eeprom8_gptrput1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom8_gptrput1.c' object='eeprom8_gptrput1.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom8_gptrput1.obj `if test -f 'gptr/eeprom8_gptrput1.c'; then $(CYGPATH_W) 'gptr/eeprom8_gptrput1.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom8_gptrput1.c'; fi`
+
+eeprom8_gptrput2.o: gptr/eeprom8_gptrput2.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom8_gptrput2.o -MD -MP -MF $(DEPDIR)/eeprom8_gptrput2.Tpo -c -o eeprom8_gptrput2.o `test -f 'gptr/eeprom8_gptrput2.c' || echo '$(srcdir)/'`gptr/eeprom8_gptrput2.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom8_gptrput2.Tpo $(DEPDIR)/eeprom8_gptrput2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom8_gptrput2.c' object='eeprom8_gptrput2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom8_gptrput2.o `test -f 'gptr/eeprom8_gptrput2.c' || echo '$(srcdir)/'`gptr/eeprom8_gptrput2.c
+
+eeprom8_gptrput2.obj: gptr/eeprom8_gptrput2.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom8_gptrput2.obj -MD -MP -MF $(DEPDIR)/eeprom8_gptrput2.Tpo -c -o eeprom8_gptrput2.obj `if test -f 'gptr/eeprom8_gptrput2.c'; then $(CYGPATH_W) 'gptr/eeprom8_gptrput2.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom8_gptrput2.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom8_gptrput2.Tpo $(DEPDIR)/eeprom8_gptrput2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom8_gptrput2.c' object='eeprom8_gptrput2.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom8_gptrput2.obj `if test -f 'gptr/eeprom8_gptrput2.c'; then $(CYGPATH_W) 'gptr/eeprom8_gptrput2.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom8_gptrput2.c'; fi`
+
+eeprom8_gptrput3.o: gptr/eeprom8_gptrput3.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom8_gptrput3.o -MD -MP -MF $(DEPDIR)/eeprom8_gptrput3.Tpo -c -o eeprom8_gptrput3.o `test -f 'gptr/eeprom8_gptrput3.c' || echo '$(srcdir)/'`gptr/eeprom8_gptrput3.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom8_gptrput3.Tpo $(DEPDIR)/eeprom8_gptrput3.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom8_gptrput3.c' object='eeprom8_gptrput3.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom8_gptrput3.o `test -f 'gptr/eeprom8_gptrput3.c' || echo '$(srcdir)/'`gptr/eeprom8_gptrput3.c
+
+eeprom8_gptrput3.obj: gptr/eeprom8_gptrput3.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom8_gptrput3.obj -MD -MP -MF $(DEPDIR)/eeprom8_gptrput3.Tpo -c -o eeprom8_gptrput3.obj `if test -f 'gptr/eeprom8_gptrput3.c'; then $(CYGPATH_W) 'gptr/eeprom8_gptrput3.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom8_gptrput3.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom8_gptrput3.Tpo $(DEPDIR)/eeprom8_gptrput3.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom8_gptrput3.c' object='eeprom8_gptrput3.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom8_gptrput3.obj `if test -f 'gptr/eeprom8_gptrput3.c'; then $(CYGPATH_W) 'gptr/eeprom8_gptrput3.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom8_gptrput3.c'; fi`
+
+eeprom8_gptrput4.o: gptr/eeprom8_gptrput4.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom8_gptrput4.o -MD -MP -MF $(DEPDIR)/eeprom8_gptrput4.Tpo -c -o eeprom8_gptrput4.o `test -f 'gptr/eeprom8_gptrput4.c' || echo '$(srcdir)/'`gptr/eeprom8_gptrput4.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom8_gptrput4.Tpo $(DEPDIR)/eeprom8_gptrput4.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom8_gptrput4.c' object='eeprom8_gptrput4.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom8_gptrput4.o `test -f 'gptr/eeprom8_gptrput4.c' || echo '$(srcdir)/'`gptr/eeprom8_gptrput4.c
+
+eeprom8_gptrput4.obj: gptr/eeprom8_gptrput4.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom8_gptrput4.obj -MD -MP -MF $(DEPDIR)/eeprom8_gptrput4.Tpo -c -o eeprom8_gptrput4.obj `if test -f 'gptr/eeprom8_gptrput4.c'; then $(CYGPATH_W) 'gptr/eeprom8_gptrput4.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom8_gptrput4.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom8_gptrput4.Tpo $(DEPDIR)/eeprom8_gptrput4.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom8_gptrput4.c' object='eeprom8_gptrput4.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom8_gptrput4.obj `if test -f 'gptr/eeprom8_gptrput4.c'; then $(CYGPATH_W) 'gptr/eeprom8_gptrput4.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom8_gptrput4.c'; fi`
+
+eeprom8_write.o: gptr/eeprom8_write.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom8_write.o -MD -MP -MF $(DEPDIR)/eeprom8_write.Tpo -c -o eeprom8_write.o `test -f 'gptr/eeprom8_write.c' || echo '$(srcdir)/'`gptr/eeprom8_write.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom8_write.Tpo $(DEPDIR)/eeprom8_write.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom8_write.c' object='eeprom8_write.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom8_write.o `test -f 'gptr/eeprom8_write.c' || echo '$(srcdir)/'`gptr/eeprom8_write.c
+
+eeprom8_write.obj: gptr/eeprom8_write.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom8_write.obj -MD -MP -MF $(DEPDIR)/eeprom8_write.Tpo -c -o eeprom8_write.obj `if test -f 'gptr/eeprom8_write.c'; then $(CYGPATH_W) 'gptr/eeprom8_write.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom8_write.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom8_write.Tpo $(DEPDIR)/eeprom8_write.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom8_write.c' object='eeprom8_write.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom8_write.obj `if test -f 'gptr/eeprom8_write.c'; then $(CYGPATH_W) 'gptr/eeprom8_write.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom8_write.c'; fi`
+
+eeprom16_gptrget1.o: gptr/eeprom16_gptrget1.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom16_gptrget1.o -MD -MP -MF $(DEPDIR)/eeprom16_gptrget1.Tpo -c -o eeprom16_gptrget1.o `test -f 'gptr/eeprom16_gptrget1.c' || echo '$(srcdir)/'`gptr/eeprom16_gptrget1.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom16_gptrget1.Tpo $(DEPDIR)/eeprom16_gptrget1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom16_gptrget1.c' object='eeprom16_gptrget1.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom16_gptrget1.o `test -f 'gptr/eeprom16_gptrget1.c' || echo '$(srcdir)/'`gptr/eeprom16_gptrget1.c
+
+eeprom16_gptrget1.obj: gptr/eeprom16_gptrget1.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom16_gptrget1.obj -MD -MP -MF $(DEPDIR)/eeprom16_gptrget1.Tpo -c -o eeprom16_gptrget1.obj `if test -f 'gptr/eeprom16_gptrget1.c'; then $(CYGPATH_W) 'gptr/eeprom16_gptrget1.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom16_gptrget1.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom16_gptrget1.Tpo $(DEPDIR)/eeprom16_gptrget1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom16_gptrget1.c' object='eeprom16_gptrget1.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom16_gptrget1.obj `if test -f 'gptr/eeprom16_gptrget1.c'; then $(CYGPATH_W) 'gptr/eeprom16_gptrget1.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom16_gptrget1.c'; fi`
+
+eeprom16_gptrget2.o: gptr/eeprom16_gptrget2.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom16_gptrget2.o -MD -MP -MF $(DEPDIR)/eeprom16_gptrget2.Tpo -c -o eeprom16_gptrget2.o `test -f 'gptr/eeprom16_gptrget2.c' || echo '$(srcdir)/'`gptr/eeprom16_gptrget2.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom16_gptrget2.Tpo $(DEPDIR)/eeprom16_gptrget2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom16_gptrget2.c' object='eeprom16_gptrget2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom16_gptrget2.o `test -f 'gptr/eeprom16_gptrget2.c' || echo '$(srcdir)/'`gptr/eeprom16_gptrget2.c
+
+eeprom16_gptrget2.obj: gptr/eeprom16_gptrget2.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom16_gptrget2.obj -MD -MP -MF $(DEPDIR)/eeprom16_gptrget2.Tpo -c -o eeprom16_gptrget2.obj `if test -f 'gptr/eeprom16_gptrget2.c'; then $(CYGPATH_W) 'gptr/eeprom16_gptrget2.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom16_gptrget2.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom16_gptrget2.Tpo $(DEPDIR)/eeprom16_gptrget2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom16_gptrget2.c' object='eeprom16_gptrget2.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom16_gptrget2.obj `if test -f 'gptr/eeprom16_gptrget2.c'; then $(CYGPATH_W) 'gptr/eeprom16_gptrget2.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom16_gptrget2.c'; fi`
+
+eeprom16_gptrget3.o: gptr/eeprom16_gptrget3.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom16_gptrget3.o -MD -MP -MF $(DEPDIR)/eeprom16_gptrget3.Tpo -c -o eeprom16_gptrget3.o `test -f 'gptr/eeprom16_gptrget3.c' || echo '$(srcdir)/'`gptr/eeprom16_gptrget3.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom16_gptrget3.Tpo $(DEPDIR)/eeprom16_gptrget3.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom16_gptrget3.c' object='eeprom16_gptrget3.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom16_gptrget3.o `test -f 'gptr/eeprom16_gptrget3.c' || echo '$(srcdir)/'`gptr/eeprom16_gptrget3.c
+
+eeprom16_gptrget3.obj: gptr/eeprom16_gptrget3.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom16_gptrget3.obj -MD -MP -MF $(DEPDIR)/eeprom16_gptrget3.Tpo -c -o eeprom16_gptrget3.obj `if test -f 'gptr/eeprom16_gptrget3.c'; then $(CYGPATH_W) 'gptr/eeprom16_gptrget3.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom16_gptrget3.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom16_gptrget3.Tpo $(DEPDIR)/eeprom16_gptrget3.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom16_gptrget3.c' object='eeprom16_gptrget3.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom16_gptrget3.obj `if test -f 'gptr/eeprom16_gptrget3.c'; then $(CYGPATH_W) 'gptr/eeprom16_gptrget3.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom16_gptrget3.c'; fi`
+
+eeprom16_gptrget4.o: gptr/eeprom16_gptrget4.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom16_gptrget4.o -MD -MP -MF $(DEPDIR)/eeprom16_gptrget4.Tpo -c -o eeprom16_gptrget4.o `test -f 'gptr/eeprom16_gptrget4.c' || echo '$(srcdir)/'`gptr/eeprom16_gptrget4.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom16_gptrget4.Tpo $(DEPDIR)/eeprom16_gptrget4.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom16_gptrget4.c' object='eeprom16_gptrget4.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom16_gptrget4.o `test -f 'gptr/eeprom16_gptrget4.c' || echo '$(srcdir)/'`gptr/eeprom16_gptrget4.c
+
+eeprom16_gptrget4.obj: gptr/eeprom16_gptrget4.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom16_gptrget4.obj -MD -MP -MF $(DEPDIR)/eeprom16_gptrget4.Tpo -c -o eeprom16_gptrget4.obj `if test -f 'gptr/eeprom16_gptrget4.c'; then $(CYGPATH_W) 'gptr/eeprom16_gptrget4.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom16_gptrget4.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom16_gptrget4.Tpo $(DEPDIR)/eeprom16_gptrget4.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom16_gptrget4.c' object='eeprom16_gptrget4.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom16_gptrget4.obj `if test -f 'gptr/eeprom16_gptrget4.c'; then $(CYGPATH_W) 'gptr/eeprom16_gptrget4.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom16_gptrget4.c'; fi`
+
+eeprom16_gptrput1.o: gptr/eeprom16_gptrput1.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom16_gptrput1.o -MD -MP -MF $(DEPDIR)/eeprom16_gptrput1.Tpo -c -o eeprom16_gptrput1.o `test -f 'gptr/eeprom16_gptrput1.c' || echo '$(srcdir)/'`gptr/eeprom16_gptrput1.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom16_gptrput1.Tpo $(DEPDIR)/eeprom16_gptrput1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom16_gptrput1.c' object='eeprom16_gptrput1.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom16_gptrput1.o `test -f 'gptr/eeprom16_gptrput1.c' || echo '$(srcdir)/'`gptr/eeprom16_gptrput1.c
+
+eeprom16_gptrput1.obj: gptr/eeprom16_gptrput1.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom16_gptrput1.obj -MD -MP -MF $(DEPDIR)/eeprom16_gptrput1.Tpo -c -o eeprom16_gptrput1.obj `if test -f 'gptr/eeprom16_gptrput1.c'; then $(CYGPATH_W) 'gptr/eeprom16_gptrput1.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom16_gptrput1.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom16_gptrput1.Tpo $(DEPDIR)/eeprom16_gptrput1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom16_gptrput1.c' object='eeprom16_gptrput1.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom16_gptrput1.obj `if test -f 'gptr/eeprom16_gptrput1.c'; then $(CYGPATH_W) 'gptr/eeprom16_gptrput1.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom16_gptrput1.c'; fi`
+
+eeprom16_gptrput2.o: gptr/eeprom16_gptrput2.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom16_gptrput2.o -MD -MP -MF $(DEPDIR)/eeprom16_gptrput2.Tpo -c -o eeprom16_gptrput2.o `test -f 'gptr/eeprom16_gptrput2.c' || echo '$(srcdir)/'`gptr/eeprom16_gptrput2.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom16_gptrput2.Tpo $(DEPDIR)/eeprom16_gptrput2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom16_gptrput2.c' object='eeprom16_gptrput2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom16_gptrput2.o `test -f 'gptr/eeprom16_gptrput2.c' || echo '$(srcdir)/'`gptr/eeprom16_gptrput2.c
+
+eeprom16_gptrput2.obj: gptr/eeprom16_gptrput2.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom16_gptrput2.obj -MD -MP -MF $(DEPDIR)/eeprom16_gptrput2.Tpo -c -o eeprom16_gptrput2.obj `if test -f 'gptr/eeprom16_gptrput2.c'; then $(CYGPATH_W) 'gptr/eeprom16_gptrput2.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom16_gptrput2.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom16_gptrput2.Tpo $(DEPDIR)/eeprom16_gptrput2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom16_gptrput2.c' object='eeprom16_gptrput2.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom16_gptrput2.obj `if test -f 'gptr/eeprom16_gptrput2.c'; then $(CYGPATH_W) 'gptr/eeprom16_gptrput2.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom16_gptrput2.c'; fi`
+
+eeprom16_gptrput3.o: gptr/eeprom16_gptrput3.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom16_gptrput3.o -MD -MP -MF $(DEPDIR)/eeprom16_gptrput3.Tpo -c -o eeprom16_gptrput3.o `test -f 'gptr/eeprom16_gptrput3.c' || echo '$(srcdir)/'`gptr/eeprom16_gptrput3.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom16_gptrput3.Tpo $(DEPDIR)/eeprom16_gptrput3.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom16_gptrput3.c' object='eeprom16_gptrput3.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom16_gptrput3.o `test -f 'gptr/eeprom16_gptrput3.c' || echo '$(srcdir)/'`gptr/eeprom16_gptrput3.c
+
+eeprom16_gptrput3.obj: gptr/eeprom16_gptrput3.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom16_gptrput3.obj -MD -MP -MF $(DEPDIR)/eeprom16_gptrput3.Tpo -c -o eeprom16_gptrput3.obj `if test -f 'gptr/eeprom16_gptrput3.c'; then $(CYGPATH_W) 'gptr/eeprom16_gptrput3.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom16_gptrput3.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom16_gptrput3.Tpo $(DEPDIR)/eeprom16_gptrput3.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom16_gptrput3.c' object='eeprom16_gptrput3.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom16_gptrput3.obj `if test -f 'gptr/eeprom16_gptrput3.c'; then $(CYGPATH_W) 'gptr/eeprom16_gptrput3.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom16_gptrput3.c'; fi`
+
+eeprom16_gptrput4.o: gptr/eeprom16_gptrput4.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom16_gptrput4.o -MD -MP -MF $(DEPDIR)/eeprom16_gptrput4.Tpo -c -o eeprom16_gptrput4.o `test -f 'gptr/eeprom16_gptrput4.c' || echo '$(srcdir)/'`gptr/eeprom16_gptrput4.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom16_gptrput4.Tpo $(DEPDIR)/eeprom16_gptrput4.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom16_gptrput4.c' object='eeprom16_gptrput4.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom16_gptrput4.o `test -f 'gptr/eeprom16_gptrput4.c' || echo '$(srcdir)/'`gptr/eeprom16_gptrput4.c
+
+eeprom16_gptrput4.obj: gptr/eeprom16_gptrput4.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom16_gptrput4.obj -MD -MP -MF $(DEPDIR)/eeprom16_gptrput4.Tpo -c -o eeprom16_gptrput4.obj `if test -f 'gptr/eeprom16_gptrput4.c'; then $(CYGPATH_W) 'gptr/eeprom16_gptrput4.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom16_gptrput4.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom16_gptrput4.Tpo $(DEPDIR)/eeprom16_gptrput4.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom16_gptrput4.c' object='eeprom16_gptrput4.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom16_gptrput4.obj `if test -f 'gptr/eeprom16_gptrput4.c'; then $(CYGPATH_W) 'gptr/eeprom16_gptrput4.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom16_gptrput4.c'; fi`
+
+eeprom16_write.o: gptr/eeprom16_write.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom16_write.o -MD -MP -MF $(DEPDIR)/eeprom16_write.Tpo -c -o eeprom16_write.o `test -f 'gptr/eeprom16_write.c' || echo '$(srcdir)/'`gptr/eeprom16_write.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom16_write.Tpo $(DEPDIR)/eeprom16_write.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom16_write.c' object='eeprom16_write.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom16_write.o `test -f 'gptr/eeprom16_write.c' || echo '$(srcdir)/'`gptr/eeprom16_write.c
+
+eeprom16_write.obj: gptr/eeprom16_write.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eeprom16_write.obj -MD -MP -MF $(DEPDIR)/eeprom16_write.Tpo -c -o eeprom16_write.obj `if test -f 'gptr/eeprom16_write.c'; then $(CYGPATH_W) 'gptr/eeprom16_write.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom16_write.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/eeprom16_write.Tpo $(DEPDIR)/eeprom16_write.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gptr/eeprom16_write.c' object='eeprom16_write.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eeprom16_write.obj `if test -f 'gptr/eeprom16_write.c'; then $(CYGPATH_W) 'gptr/eeprom16_write.c'; else $(CYGPATH_W) '$(srcdir)/gptr/eeprom16_write.c'; fi`
+
 divsint.o: int/divsint.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT divsint.o -MD -MP -MF $(DEPDIR)/divsint.Tpo -c -o divsint.o `test -f 'int/divsint.c' || echo '$(srcdir)/'`int/divsint.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/divsint.Tpo $(DEPDIR)/divsint.Po
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/char/divschar.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/char/divschar.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/char/divschar.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/char/divschar.c	2012-03-13 10:17:10.000000000 +0000
@@ -8,7 +8,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/char/divuchar.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/char/divuchar.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/char/divuchar.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/char/divuchar.c	2012-03-13 10:17:10.000000000 +0000
@@ -7,7 +7,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/char/modschar.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/char/modschar.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/char/modschar.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/char/modschar.c	2012-03-13 10:17:10.000000000 +0000
@@ -7,7 +7,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/char/moduchar.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/char/moduchar.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/char/moduchar.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/char/moduchar.c	2012-03-13 10:17:10.000000000 +0000
@@ -8,7 +8,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162schar.S sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162schar.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162schar.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162schar.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162sfloat.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162sfloat.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162sfloat.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162sfloat.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162sint.S sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162sint.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162sint.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162sint.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162slong.S sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162slong.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162slong.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162slong.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162uchar.S sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162uchar.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162uchar.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162uchar.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162uint.S sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162uint.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162uint.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162uint.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162ulong.S sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162ulong.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162ulong.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x162ulong.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_add.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_add.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_add.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_add.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_div.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_div.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_div.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_div.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_eq.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_eq.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_eq.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_eq.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_gt.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_gt.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_gt.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_gt.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_gteq.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_gteq.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_gteq.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_gteq.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_lt.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_lt.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_lt.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_lt.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_lteq.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_lteq.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_lteq.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_lteq.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_mul.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_mul.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_mul.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_mul.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_neq.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_neq.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_neq.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_neq.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_sub.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_sub.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_sub.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/fps16x16_sub.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/schar2fps16x16.S sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/schar2fps16x16.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/schar2fps16x16.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/schar2fps16x16.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/sint2fps16x16.S sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/sint2fps16x16.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/sint2fps16x16.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/sint2fps16x16.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/slong2fps16x16.S sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/slong2fps16x16.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/slong2fps16x16.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/slong2fps16x16.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/uchar2fps16x16.S sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/uchar2fps16x16.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/uchar2fps16x16.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/uchar2fps16x16.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/uint2fps16x16.S sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/uint2fps16x16.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/uint2fps16x16.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/uint2fps16x16.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/ulong2fps16x16.S sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/ulong2fps16x16.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/ulong2fps16x16.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/fixed16x16/ulong2fps16x16.S	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fs2schar.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fs2schar.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fs2schar.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fs2schar.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fs2sint.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fs2sint.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fs2sint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fs2sint.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fs2slong.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fs2slong.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fs2slong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fs2slong.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fs2uchar.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fs2uchar.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fs2uchar.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fs2uchar.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fs2uint.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fs2uint.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fs2uint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fs2uint.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fs2ulong.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fs2ulong.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fs2ulong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fs2ulong.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fsadd.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fsadd.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fsadd.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fsadd.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fsdiv.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fsdiv.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fsdiv.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fsdiv.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fseq.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fseq.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fseq.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fseq.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fsgt.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fsgt.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fsgt.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fsgt.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fslt.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fslt.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fslt.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fslt.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fsmul.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fsmul.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fsmul.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fsmul.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fsneq.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fsneq.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fsneq.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fsneq.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fssub.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fssub.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/fssub.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/fssub.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/schar2fs.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/schar2fs.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/schar2fs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/schar2fs.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/sint2fs.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/sint2fs.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/sint2fs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/sint2fs.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/slong2fs.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/slong2fs.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/slong2fs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/slong2fs.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/uchar2fs.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/uchar2fs.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/uchar2fs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/uchar2fs.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/uint2fs.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/uint2fs.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/uint2fs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/uint2fs.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/ulong2fs.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/ulong2fs.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/float/ulong2fs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/float/ulong2fs.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrget1.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrget1.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrget1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrget1.c	2012-04-19 22:14:15.000000000 +0000
@@ -0,0 +1,62 @@
+/*-------------------------------------------------------------------------
+   eeprom16_gptrget1.c - get 1 byte value from EEPROM via a generic pointer
+
+   Copyright (C) 2012 Raphael Neider <rneider AT web.de>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/* the return value is expected to be in (FSR0H, PRODH, PRODL, WREG),
+ * therefore we choose return type void here. Generic pointer is expected
+ * to be in (WREG, PRODL, FSR0L), so function arguments are void, too */
+
+extern EEADR;
+extern EEADRH;
+extern EECON1;
+extern EEDATA;
+extern FSR0L;
+extern INTCON;
+extern PRODL;
+extern TBLPTRL;
+
+void
+__eeprom16_gptrget1(void) __naked
+{
+    __asm
+        MOVFF   _INTCON, _TBLPTRL   ; save previous interupt state
+        BCF     _INTCON, 7, 0       ; GIE = 0: disable interrupts
+
+        BCF     _EECON1, 7, 0       ; EEPGD = 0: access EEPROM, not program memory
+        BCF     _EECON1, 6, 0       ; CFGS = 0: access EEPROM, not config words
+
+        MOVFF   _FSR0L, _EEADR      ; address first byte
+        MOVFF   _PRODL, _EEADRH     ; high address bits
+        BSF     _EECON1, 0, 0       ; RD = 1: read EEPROM
+        MOVF    _EEDATA, 0, 0       ; W = EEPROM[adr]
+
+        BTFSC   _TBLPTRL, 7, 0      ; check previous interrupt state
+        BSF     _INTCON, 7, 0       ; conditionally re-enable interrupts
+
+        RETURN
+    __endasm;
+}
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrget2.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrget2.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrget2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrget2.c	2012-04-19 22:14:15.000000000 +0000
@@ -0,0 +1,67 @@
+/*-------------------------------------------------------------------------
+   eeprom16_gptrget2.c - get 2 byte value from EEPROM via a generic pointer
+
+   Copyright (C) 2012 Raphael Neider <rneider AT web.de>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/* the return value is expected to be in (FSR0H, PRODH, PRODL, WREG),
+ * therefore we choose return type void here. Generic pointer is expected
+ * to be in (WREG, PRODL, FSR0L), so function arguments are void, too */
+
+extern EEADR;
+extern EEADRH;
+extern EECON1;
+extern EEDATA;
+extern FSR0L;
+extern INTCON;
+extern PRODL;
+extern TBLPTRL;
+
+void
+__eeprom16_gptrget2(void) __naked
+{
+    __asm
+        MOVFF   _INTCON, _TBLPTRL   ; save previous interupt state
+        BCF     _INTCON, 7, 0       ; GIE = 0: disable interrupts
+
+        BCF     _EECON1, 7, 0       ; EEPGD = 0: access EEPROM, not program memory
+        BCF     _EECON1, 6, 0       ; CFGS = 0: access EEPROM, not config words
+
+        MOVFF   _FSR0L, _EEADR      ; address first byte
+        MOVFF   _PRODL, _EEADRH     ; address first byte, high address bits
+        BSF     _EECON1, 0, 0       ; RD = 1: read EEPROM
+        MOVF    _EEDATA, 0, 0       ; W = EEPROM[adr]
+
+        INFSNZ  _EEADR, 1, 0        ; address second byte
+        INCF    _EEADRH, 1, 0       ; high address bits
+        BSF     _EECON1, 0, 0       ; RD = 1: read EEPROM
+        MOVFF   _EEDATA, _PRODL     ; PRODL = EEPROM[adr+1]
+
+        BTFSC   _TBLPTRL, 7, 0      ; check previous interrupt state
+        BSF     _INTCON, 7, 0       ; conditionally re-enable interrupts
+
+        RETURN
+    __endasm;
+}
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrget3.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrget3.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrget3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrget3.c	2012-04-19 22:14:15.000000000 +0000
@@ -0,0 +1,73 @@
+/*-------------------------------------------------------------------------
+   eeprom16_gptrget3.c - get 3 byte value from EEPROM via a generic pointer
+
+   Copyright (C) 2012 Raphael Neider <rneider AT web.de>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/* the return value is expected to be in (FSR0H, PRODH, PRODL, WREG),
+ * therefore we choose return type void here. Generic pointer is expected
+ * to be in (WREG, PRODL, FSR0L), so function arguments are void, too */
+
+extern EEADR;
+extern EEADRH;
+extern EECON1;
+extern EEDATA;
+extern FSR0L;
+extern INTCON;
+extern PRODH;
+extern PRODL;
+extern TBLPTRL;
+
+void
+__eeprom16_gptrget3(void) __naked
+{
+    __asm
+        MOVFF   _INTCON, _TBLPTRL   ; save previous interupt state
+        BCF     _INTCON, 7, 0       ; GIE = 0: disable interrupts
+
+        BCF     _EECON1, 7, 0       ; EEPGD = 0: access EEPROM, not program memory
+        BCF     _EECON1, 6, 0       ; CFGS = 0: access EEPROM, not config words
+
+        MOVFF   _FSR0L, _EEADR      ; address first byte
+        MOVFF   _PRODL, _EEADRH     ; high address bits
+        BSF     _EECON1, 0, 0       ; RD = 1: read EEPROM
+        MOVF    _EEDATA, 0, 0       ; W = EEPROM[adr]
+
+        INFSNZ  _EEADR, 1, 0        ; address second byte
+        INCF    _EEADRH, 1, 0       ; high address bits
+        BSF     _EECON1, 0, 0       ; RD = 1: read EEPROM
+        MOVFF   _EEDATA, _PRODL     ; PRODL = EEPROM[adr+1]
+
+        INFSNZ  _EEADR, 1, 0        ; address third byte
+        INCF    _EEADRH, 1, 0       ; high address bits
+        BSF     _EECON1, 0, 0       ; RD = 1: read EEPROM
+        MOVFF   _EEDATA, _PRODH     ; PRODH = EEPROM[adr+2]
+
+        BTFSC   _TBLPTRL, 7, 0      ; check previous interrupt state
+        BSF     _INTCON, 7, 0       ; conditionally re-enable interrupts
+
+        RETURN
+    __endasm;
+}
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrget4.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrget4.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrget4.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrget4.c	2012-04-19 22:14:15.000000000 +0000
@@ -0,0 +1,79 @@
+/*-------------------------------------------------------------------------
+   eeprom16_gptrget4.c - get 4 byte value from EEPROM via a generic pointer
+
+   Copyright (C) 2012 Raphael Neider <rneider AT web.de>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/* the return value is expected to be in (FSR0H, PRODH, PRODL, WREG),
+ * therefore we choose return type void here. Generic pointer is expected
+ * to be in (WREG, PRODL, FSR0L), so function arguments are void, too */
+
+extern EEADR;
+extern EEADRH;
+extern EECON1;
+extern EEDATA;
+extern FSR0H;
+extern FSR0L;
+extern INTCON;
+extern PRODH;
+extern PRODL;
+extern TBLPTRL;
+
+void
+__eeprom16_gptrget4(void) __naked
+{
+    __asm
+        MOVFF   _INTCON, _TBLPTRL   ; save previous interupt state
+        BCF     _INTCON, 7, 0       ; GIE = 0: disable interrupts
+
+        BCF     _EECON1, 7, 0       ; EEPGD = 0: access EEPROM, not program memory
+        BCF     _EECON1, 6, 0       ; CFGS = 0: access EEPROM, not config words
+
+        MOVFF   _FSR0L, _EEADR      ; address first byte
+        MOVFF   _PRODL, _EEADRH     ; high address bits
+        BSF     _EECON1, 0, 0       ; RD = 1: read EEPROM
+        MOVF    _EEDATA, 0, 0       ; W = EEPROM[adr]
+
+        INFSNZ  _EEADR, 1, 0        ; address second byte
+        INCF    _EEADRH, 1, 0       ; high address bits
+        BSF     _EECON1, 0, 0       ; RD = 1: read EEPROM
+        MOVFF   _EEDATA, _PRODL     ; PRODL = EEPROM[adr+1]
+
+        INFSNZ  _EEADR, 1, 0        ; address third byte
+        INCF    _EEADRH, 1, 0       ; high address bits
+        BSF     _EECON1, 0, 0       ; RD = 1: read EEPROM
+        MOVFF   _EEDATA, _PRODH     ; PRODH = EEPROM[adr+2]
+
+        INFSNZ  _EEADR, 1, 0        ; address fourth byte
+        INCF    _EEADRH, 1, 0       ; high address bits
+        BSF     _EECON1, 0, 0       ; RD = 1: read EEPROM
+        MOVFF   _EEDATA, _FSR0H     ; FSR0H = EEPROM[adr+3]
+
+        BTFSC   _TBLPTRL, 7, 0      ; check previous interrupt state
+        BSF     _INTCON, 7, 0       ; conditionally re-enable interrupts
+
+        RETURN
+    __endasm;
+}
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrput1.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrput1.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrput1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrput1.c	2012-04-22 12:54:57.000000000 +0000
@@ -0,0 +1,67 @@
+/*-------------------------------------------------------------------------
+   eeprom16_gptrput1.c - write 1 byte value to EEPROM via a generic pointer
+
+   Copyright (C) 2012 Raphael Neider <rneider AT web.de>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/* write address is expected to be in WREG:PRODL:FSR0L while
+ * write value is in TBLPTRH:TBLPTRL:PRODH:[stack] */
+
+extern EEADR;
+extern EEADRH;
+extern EECON1;
+extern EEDATA;
+extern FSR0H;
+extern FSR0L;
+extern INTCON;
+extern PREINC1;
+extern PRODL;
+extern __eeprom16_write;
+
+void
+__eeprom16_gptrput1(void) __naked
+{
+    __asm
+        MOVFF   _INTCON, _FSR0H     ; save previous interupt state
+        BCF     _INTCON, 7, 0       ; GIE = 0: disable interrupts
+
+        BCF     _EECON1, 7, 0       ; EEPGD = 0: access EEPROM, not program memory
+        BCF     _EECON1, 6, 0       ; CFGS = 0: access EEPROM, not config words
+        BSF     _EECON1, 2, 0       ; WREN = 1: enable write access
+
+        MOVFF   _FSR0L, _EEADR      ; address first byte
+        MOVFF   _PRODL, _EEADRH     ; high address bits
+
+        MOVFF   _PREINC1, _EEDATA   ; load first byte
+        CALL    ___eeprom16_write   ; write and address next byte
+
+        BCF     _EECON1, 2, 0       ; WREN = 0: disable write access
+
+        BTFSC   _FSR0H, 7, 0        ; check previous interrupt state
+        BSF     _INTCON, 7, 0       ; conditionally re-enable interrupts
+
+        RETURN
+    __endasm;
+}
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrput2.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrput2.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrput2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrput2.c	2012-04-22 12:54:57.000000000 +0000
@@ -0,0 +1,71 @@
+/*-------------------------------------------------------------------------
+   eeprom16_gptrput2.c - write 2 byte value to EEPROM via a generic pointer
+
+   Copyright (C) 2012 Raphael Neider <rneider AT web.de>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/* write address is expected to be in WREG:PRODL:FSR0L while
+ * write value is in TBLPTRH:TBLPTRL:PRODH:[stack] */
+
+extern EEADR;
+extern EEADRH;
+extern EECON1;
+extern EEDATA;
+extern FSR0H;
+extern FSR0L;
+extern INTCON;
+extern PREINC1;
+extern PRODH;
+extern PRODL;
+extern __eeprom16_write;
+
+void
+__eeprom16_gptrput2(void) __naked
+{
+    __asm
+        MOVFF   _INTCON, _FSR0H     ; save previous interupt state
+        BCF     _INTCON, 7, 0       ; GIE = 0: disable interrupts
+
+        BCF     _EECON1, 7, 0       ; EEPGD = 0: access EEPROM, not program memory
+        BCF     _EECON1, 6, 0       ; CFGS = 0: access EEPROM, not config words
+        BSF     _EECON1, 2, 0       ; WREN = 1: enable write access
+
+        MOVFF   _FSR0L, _EEADR      ; address first byte
+        MOVFF   _PRODL, _EEADRH     ; high address bits
+
+        MOVFF   _PREINC1, _EEDATA   ; load first byte
+        CALL    ___eeprom16_write   ; write and address next byte
+
+        MOVFF   _PRODH, _EEDATA     ; load second byte
+        CALL    ___eeprom16_write   ; write and address next byte
+
+        BCF     _EECON1, 2, 0       ; WREN = 0: disable write access
+
+        BTFSC   _FSR0H, 7, 0        ; check previous interrupt state
+        BSF     _INTCON, 7, 0       ; conditionally re-enable interrupts
+
+        RETURN
+    __endasm;
+}
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrput3.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrput3.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrput3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrput3.c	2012-04-22 12:54:57.000000000 +0000
@@ -0,0 +1,75 @@
+/*-------------------------------------------------------------------------
+   eeprom16_gptrput3.c - write 3 byte value to EEPROM via a generic pointer
+
+   Copyright (C) 2012 Raphael Neider <rneider AT web.de>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/* write address is expected to be in WREG:PRODL:FSR0L while
+ * write value is in TBLPTRH:TBLPTRL:PRODH:[stack] */
+
+extern EEADR;
+extern EEADRH;
+extern EECON1;
+extern EEDATA;
+extern FSR0H;
+extern FSR0L;
+extern INTCON;
+extern PREINC1;
+extern PRODH;
+extern PRODL;
+extern TBLPTRL;
+extern __eeprom16_write;
+
+void
+__eeprom16_gptrput3(void) __naked
+{
+    __asm
+        MOVFF   _INTCON, _FSR0H     ; save previous interupt state
+        BCF     _INTCON, 7, 0       ; GIE = 0: disable interrupts
+
+        BCF     _EECON1, 7, 0       ; EEPGD = 0: access EEPROM, not program memory
+        BCF     _EECON1, 6, 0       ; CFGS = 0: access EEPROM, not config words
+        BSF     _EECON1, 2, 0       ; WREN = 1: enable write access
+
+        MOVFF   _FSR0L, _EEADR      ; address first byte
+        MOVFF   _PRODL, _EEADRH     ; high address bits
+
+        MOVFF   _PREINC1, _EEDATA   ; load first byte
+        CALL    ___eeprom16_write   ; write and address next byte
+
+        MOVFF   _PRODH, _EEDATA     ; load second byte
+        CALL    ___eeprom16_write   ; write and address next byte
+
+        MOVFF   _TBLPTRL, _EEDATA   ; load third byte
+        CALL    ___eeprom16_write   ; write and address next byte
+
+        BCF     _EECON1, 2, 0       ; WREN = 0: disable write access
+
+        BTFSC   _FSR0H, 7, 0        ; check previous interrupt state
+        BSF     _INTCON, 7, 0       ; conditionally re-enable interrupts
+
+        RETURN
+    __endasm;
+}
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrput4.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrput4.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrput4.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_gptrput4.c	2012-04-22 12:54:57.000000000 +0000
@@ -0,0 +1,79 @@
+/*-------------------------------------------------------------------------
+   eeprom16_gptrput4.c - write 4 byte value to EEPROM via a generic pointer
+
+   Copyright (C) 2012 Raphael Neider <rneider AT web.de>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/* write address is expected to be in WREG:PRODL:FSR0L while
+ * write value is in TBLPTRH:TBLPTRL:PRODH:[stack] */
+
+extern EEADR;
+extern EEADRH;
+extern EECON1;
+extern EEDATA;
+extern FSR0H;
+extern FSR0L;
+extern INTCON;
+extern PREINC1;
+extern PRODH;
+extern PRODL;
+extern TBLPTRL;
+extern TBLPTRH;
+extern __eeprom16_write;
+
+void
+__eeprom16_gptrput4(void) __naked
+{
+    __asm
+        MOVFF   _INTCON, _FSR0H     ; save previous interupt state
+        BCF     _INTCON, 7, 0       ; GIE = 0: disable interrupts
+
+        BCF     _EECON1, 7, 0       ; EEPGD = 0: access EEPROM, not program memory
+        BCF     _EECON1, 6, 0       ; CFGS = 0: access EEPROM, not config words
+        BSF     _EECON1, 2, 0       ; WREN = 1: enable write access
+
+        MOVFF   _FSR0L, _EEADR      ; address first byte
+        MOVFF   _PRODL, _EEADRH     ; high address bits
+
+        MOVFF   _PREINC1, _EEDATA   ; load first byte
+        CALL    ___eeprom16_write   ; write and address next byte
+
+        MOVFF   _PRODH, _EEDATA     ; load second byte
+        CALL    ___eeprom16_write   ; write and address next byte
+
+        MOVFF   _TBLPTRL, _EEDATA   ; load third byte
+        CALL    ___eeprom16_write   ; write and address next byte
+
+        MOVFF   _TBLPTRH, _EEDATA   ; load fourth byte
+        CALL    ___eeprom16_write   ; write and address next byte
+
+        BCF     _EECON1, 2, 0       ; WREN = 0: disable write access
+
+        BTFSC   _FSR0H, 7, 0        ; check previous interrupt state
+        BSF     _INTCON, 7, 0       ; conditionally re-enable interrupts
+
+        RETURN
+    __endasm;
+}
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_write.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_write.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_write.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom16_write.c	2012-04-19 22:14:15.000000000 +0000
@@ -0,0 +1,51 @@
+/*-------------------------------------------------------------------------
+   eeprom_write16.c - write one byte to EEPROM and wait for completion
+
+   Copyright (C) 1999, Sandeep Dutta . sandeep.dutta@usa.net
+   Adopted for pic16 port by Vangelis Rokas, 2004 <vrokas AT otenet.gr>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+extern char EEADR;
+extern char EEADRH;
+extern char EECON1;
+extern char EECON2;
+
+void __eeprom16_write(void) __naked
+{
+  __asm
+    movlw       0x55
+    movwf       _EECON2, 0
+    movlw       0xAA
+    movwf       _EECON2, 0
+    bsf         _EECON1, 1, 0   ; WR
+
+    wait_till_done:
+    btfsc       _EECON1, 1, 0   ; WR still set?
+    bra         wait_till_done
+
+    infsnz      _EEADR, 1, 0    ; address next byte
+    incf        _EEADRH, 1, 0   ; address next byte
+  __endasm;
+}
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrget1.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrget1.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrget1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrget1.c	2012-04-19 22:14:15.000000000 +0000
@@ -0,0 +1,59 @@
+/*-------------------------------------------------------------------------
+   eeprom8_gptrget1.c - get 1 byte value from EEPROM via a generic pointer
+
+   Copyright (C) 2012 Raphael Neider <rneider AT web.de>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/* the return value is expected to be in (FSR0H, PRODH, PRODL, WREG),
+ * therefore we choose return type void here. Generic pointer is expected
+ * to be in (WREG, PRODL, FSR0L), so function arguments are void, too */
+
+extern EEADR;
+extern EECON1;
+extern EEDATA;
+extern FSR0L;
+extern INTCON;
+extern TBLPTRL;
+
+void
+__eeprom8_gptrget1(void) __naked
+{
+    __asm
+        MOVFF   _INTCON, _TBLPTRL   ; save previous interupt state
+        BCF     _INTCON, 7, 0       ; GIE = 0: disable interrupts
+
+        BCF     _EECON1, 7, 0       ; EEPGD = 0: access EEPROM, not program memory
+        BCF     _EECON1, 6, 0       ; CFGS = 0: access EEPROM, not config words
+
+        MOVFF   _FSR0L, _EEADR      ; address first byte
+        BSF     _EECON1, 0, 0       ; RD = 1
+        MOVF    _EEDATA, 0, 0       ; W = EEPROM[adr]
+
+        BTFSC   _TBLPTRL, 7, 0      ; check previous interrupt state
+        BSF     _INTCON, 7, 0       ; conditionally re-enable interrupts
+
+        RETURN
+    __endasm;
+}
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrget2.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrget2.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrget2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrget2.c	2012-04-19 22:14:15.000000000 +0000
@@ -0,0 +1,64 @@
+/*-------------------------------------------------------------------------
+   eeprom8_gptrget2.c - get 2 byte value from EEPROM via a generic pointer
+
+   Copyright (C) 2012 Raphael Neider <rneider AT web.de>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/* the return value is expected to be in (FSR0H, PRODH, PRODL, WREG),
+ * therefore we choose return type void here. Generic pointer is expected
+ * to be in (WREG, PRODL, FSR0L), so function arguments are void, too */
+
+extern EEADR;
+extern EECON1;
+extern EEDATA;
+extern FSR0L;
+extern INTCON;
+extern PRODL;
+extern TBLPTRL;
+
+void
+__eeprom8_gptrget2(void) __naked
+{
+    __asm
+        MOVFF   _INTCON, _TBLPTRL   ; save previous interupt state
+        BCF     _INTCON, 7, 0       ; GIE = 0: disable interrupts
+
+        BCF     _EECON1, 7, 0       ; EEPGD = 0: access EEPROM, not program memory
+        BCF     _EECON1, 6, 0       ; CFGS = 0: access EEPROM, not config words
+
+        MOVFF   _FSR0L, _EEADR      ; address first byte
+        BSF     _EECON1, 0, 0       ; RD = 1
+        MOVF    _EEDATA, 0, 0       ; W = EEPROM[adr]
+
+        INCF    _EEADR, 1, 0        ; address second byte
+        BSF     _EECON1, 0, 0       ; RD = 1
+        MOVFF   _EEDATA, _PRODL     ; PRODL = EEPROM[adr+1]
+
+        BTFSC   _TBLPTRL, 7, 0      ; check previous interrupt state
+        BSF     _INTCON, 7, 0       ; conditionally re-enable interrupts
+
+        RETURN
+    __endasm;
+}
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrget3.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrget3.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrget3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrget3.c	2012-04-19 22:14:15.000000000 +0000
@@ -0,0 +1,69 @@
+/*-------------------------------------------------------------------------
+   eeprom8_gptrget3.c - get 3 byte value from EEPROM via a generic pointer
+
+   Copyright (C) 2012 Raphael Neider <rneider AT web.de>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/* the return value is expected to be in (FSR0H, PRODH, PRODL, WREG),
+ * therefore we choose return type void here. Generic pointer is expected
+ * to be in (WREG, PRODL, FSR0L), so function arguments are void, too */
+
+extern EEADR;
+extern EECON1;
+extern EEDATA;
+extern FSR0L;
+extern INTCON;
+extern PRODH;
+extern PRODL;
+extern TBLPTRL;
+
+void
+__eeprom8_gptrget3(void) __naked
+{
+    __asm
+        MOVFF   _INTCON, _TBLPTRL   ; save previous interupt state
+        BCF     _INTCON, 7, 0       ; GIE = 0: disable interrupts
+
+        BCF     _EECON1, 7, 0       ; EEPGD = 0: access EEPROM, not program memory
+        BCF     _EECON1, 6, 0       ; CFGS = 0: access EEPROM, not config words
+
+        MOVFF   _FSR0L, _EEADR      ; address first byte
+        BSF     _EECON1, 0, 0       ; RD = 1
+        MOVF    _EEDATA, 0, 0       ; W = EEPROM[adr]
+
+        INCF    _EEADR, 1, 0        ; address second byte
+        BSF     _EECON1, 0, 0       ; RD = 1
+        MOVFF   _EEDATA, _PRODL     ; PRODL = EEPROM[adr+1]
+
+        INCF    _EEADR, 1, 0        ; address third byte
+        BSF     _EECON1, 0, 0       ; RD = 1
+        MOVFF   _EEDATA, _PRODH     ; PRODH = EEPROM[adr+2]
+
+        BTFSC   _TBLPTRL, 7, 0      ; check previous interrupt state
+        BSF     _INTCON, 7, 0       ; conditionally re-enable interrupts
+
+        RETURN
+    __endasm;
+}
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrget4.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrget4.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrget4.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrget4.c	2012-04-19 22:14:15.000000000 +0000
@@ -0,0 +1,74 @@
+/*-------------------------------------------------------------------------
+   eeprom8_gptrget4.c - get 4 byte value from EEPROM via a generic pointer
+
+   Copyright (C) 2012 Raphael Neider <rneider AT web.de>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/* the return value is expected to be in (FSR0H, PRODH, PRODL, WREG),
+ * therefore we choose return type void here. Generic pointer is expected
+ * to be in (WREG, PRODL, FSR0L), so function arguments are void, too */
+
+extern EEADR;
+extern EECON1;
+extern EEDATA;
+extern FSR0H;
+extern FSR0L;
+extern INTCON;
+extern PRODH;
+extern PRODL;
+extern TBLPTRL;
+
+void
+__eeprom8_gptrget4(void) __naked
+{
+    __asm
+        MOVFF   _INTCON, _TBLPTRL   ; save previous interupt state
+        BCF     _INTCON, 7, 0       ; GIE = 0: disable interrupts
+
+        BCF     _EECON1, 7, 0       ; EEPGD = 0: access EEPROM, not program memory
+        BCF     _EECON1, 6, 0       ; CFGS = 0: access EEPROM, not config words
+
+        MOVFF   _FSR0L, _EEADR      ; address first byte
+        BSF     _EECON1, 0, 0       ; RD = 1
+        MOVF    _EEDATA, 0, 0       ; W = EEPROM[adr]
+
+        INCF    _EEADR, 1, 0        ; address second byte
+        BSF     _EECON1, 0, 0       ; RD = 1
+        MOVFF   _EEDATA, _PRODL     ; PRODL = EEPROM[adr+1]
+
+        INCF    _EEADR, 1, 0        ; address third byte
+        BSF     _EECON1, 0, 0       ; RD = 1
+        MOVFF   _EEDATA, _PRODH     ; PRODH = EEPROM[adr+2]
+
+        INCF    _EEADR, 1, 0        ; address fourth byte
+        BSF     _EECON1, 0, 0       ; RD = 1
+        MOVFF   _EEDATA, _FSR0H     ; PRODL = EEPROM[adr+3]
+
+        BTFSC   _TBLPTRL, 7, 0      ; check previous interrupt state
+        BSF     _INTCON, 7, 0       ; conditionally re-enable interrupts
+
+        RETURN
+    __endasm;
+}
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrput1.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrput1.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrput1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrput1.c	2012-04-22 12:54:57.000000000 +0000
@@ -0,0 +1,64 @@
+/*-------------------------------------------------------------------------
+   eeprom8_gptrput1.c - write 1 byte value to EEPROM via a generic pointer
+
+   Copyright (C) 2012 Raphael Neider <rneider AT web.de>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/* write address is expected to be in WREG:PRODL:FSR0L while
+ * write value is in TBLPTRH:TBLPTRL:PRODH:[stack] */
+
+extern EEADR;
+extern EECON1;
+extern EEDATA;
+extern FSR0H;
+extern FSR0L;
+extern INTCON;
+extern PREINC1;
+extern __eeprom8_write;
+
+void
+__eeprom8_gptrput1(void) __naked
+{
+    __asm
+        MOVFF   _INTCON, _FSR0H     ; save previous interupt state
+        BCF     _INTCON, 7, 0       ; GIE = 0: disable interrupts
+
+        BCF     _EECON1, 7, 0       ; EEPGD = 0: access EEPROM, not program memory
+        BCF     _EECON1, 6, 0       ; CFGS = 0: access EEPROM, not config words
+        BSF     _EECON1, 2, 0       ; WREN = 1: enable write access
+
+        MOVFF   _FSR0L, _EEADR      ; address first byte
+
+        MOVFF   _PREINC1, _EEDATA   ; load first byte
+        CALL    ___eeprom8_write    ; write and address next byte
+
+        BCF     _EECON1, 2, 0       ; WREN = 0: disable write access
+
+        BTFSC   _FSR0H, 7, 0        ; check previous interrupt state
+        BSF     _INTCON, 7, 0       ; conditionally re-enable interrupts
+
+        RETURN
+    __endasm;
+}
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrput2.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrput2.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrput2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrput2.c	2012-04-22 12:54:57.000000000 +0000
@@ -0,0 +1,68 @@
+/*-------------------------------------------------------------------------
+   eeprom8_gptrput2.c - write 2 byte value to EEPROM via a generic pointer
+
+   Copyright (C) 2012 Raphael Neider <rneider AT web.de>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/* write address is expected to be in WREG:PRODL:FSR0L while
+ * write value is in TBLPTRH:TBLPTRL:PRODH:[stack] */
+
+extern EEADR;
+extern EECON1;
+extern EEDATA;
+extern FSR0H;
+extern FSR0L;
+extern INTCON;
+extern PREINC1;
+extern PRODH;
+extern __eeprom8_write;
+
+void
+__eeprom8_gptrput2(void) __naked
+{
+    __asm
+        MOVFF   _INTCON, _FSR0H     ; save previous interupt state
+        BCF     _INTCON, 7, 0       ; GIE = 0: disable interrupts
+
+        BCF     _EECON1, 7, 0       ; EEPGD = 0: access EEPROM, not program memory
+        BCF     _EECON1, 6, 0       ; CFGS = 0: access EEPROM, not config words
+        BSF     _EECON1, 2, 0       ; WREN = 1: enable write access
+
+        MOVFF   _FSR0L, _EEADR      ; address first byte
+
+        MOVFF   _PREINC1, _EEDATA   ; load first byte
+        CALL    ___eeprom8_write    ; write and address next byte
+
+        MOVFF   _PRODH, _EEDATA     ; load second byte
+        CALL    ___eeprom8_write    ; write and address next byte
+
+        BCF     _EECON1, 2, 0       ; WREN = 0: disable write access
+
+        BTFSC   _FSR0H, 7, 0        ; check previous interrupt state
+        BSF     _INTCON, 7, 0       ; conditionally re-enable interrupts
+
+        RETURN
+    __endasm;
+}
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrput3.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrput3.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrput3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrput3.c	2012-04-22 12:54:57.000000000 +0000
@@ -0,0 +1,72 @@
+/*-------------------------------------------------------------------------
+   eeprom8_gptrput3.c - write 3 byte value to EEPROM via a generic pointer
+
+   Copyright (C) 2012 Raphael Neider <rneider AT web.de>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/* write address is expected to be in WREG:PRODL:FSR0L while
+ * write value is in TBLPTRH:TBLPTRL:PRODH:[stack] */
+
+extern EEADR;
+extern EECON1;
+extern EEDATA;
+extern FSR0H;
+extern FSR0L;
+extern INTCON;
+extern PREINC1;
+extern PRODH;
+extern TBLPTRL;
+extern __eeprom8_write;
+
+void
+__eeprom8_gptrput3(void) __naked
+{
+    __asm
+        MOVFF   _INTCON, _FSR0H     ; save previous interupt state
+        BCF     _INTCON, 7, 0       ; GIE = 0: disable interrupts
+
+        BCF     _EECON1, 7, 0       ; EEPGD = 0: access EEPROM, not program memory
+        BCF     _EECON1, 6, 0       ; CFGS = 0: access EEPROM, not config words
+        BSF     _EECON1, 2, 0       ; WREN = 1: enable write access
+
+        MOVFF   _FSR0L, _EEADR      ; address first byte
+
+        MOVFF   _PREINC1, _EEDATA   ; load first byte
+        CALL    ___eeprom8_write    ; write and address next byte
+
+        MOVFF   _PRODH, _EEDATA     ; load second byte
+        CALL    ___eeprom8_write    ; write and address next byte
+
+        MOVFF   _TBLPTRL, _EEDATA   ; load third byte
+        CALL    ___eeprom8_write    ; write and address next byte
+
+        BCF     _EECON1, 2, 0       ; WREN = 0: disable write access
+
+        BTFSC   _FSR0H, 7, 0        ; check previous interrupt state
+        BSF     _INTCON, 7, 0       ; conditionally re-enable interrupts
+
+        RETURN
+    __endasm;
+}
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrput4.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrput4.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrput4.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_gptrput4.c	2012-04-22 12:54:57.000000000 +0000
@@ -0,0 +1,75 @@
+/*-------------------------------------------------------------------------
+   eeprom8_gptrput4.c - write 4 byte value to EEPROM via a generic pointer
+
+   Copyright (C) 2012 Raphael Neider <rneider AT web.de>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/* write address is expected to be in WREG:PRODL:FSR0L while
+ * write value is in TBLPTRH:TBLPTRL:PRODH:[stack] */
+
+extern EEADR;
+extern EECON1;
+extern EEDATA;
+extern FSR0H;
+extern FSR0L;
+extern INTCON;
+extern PREINC1;
+extern PRODH;
+extern TBLPTRL;
+extern TBLPTRH;
+extern __eeprom8_write;
+
+void
+__eeprom8_gptrput4(void) __naked
+{
+    __asm
+        MOVFF   _INTCON, _FSR0H     ; save previous interupt state
+        BCF     _INTCON, 7, 0       ; GIE = 0: disable interrupts
+
+        BCF     _EECON1, 7, 0       ; EEPGD = 0: access EEPROM, not program memory
+        BCF     _EECON1, 6, 0       ; CFGS = 0: access EEPROM, not config words
+        BSF     _EECON1, 2, 0       ; WREN = 1: enable write access
+
+        MOVFF   _FSR0L, _EEADR      ; address first byte
+        MOVFF   _PREINC1, _EEDATA   ; load first byte
+        CALL    ___eeprom8_write    ; write and address next byte
+
+        MOVFF   _PRODH, _EEDATA     ; load second byte
+        CALL    ___eeprom8_write    ; write and address next byte
+
+        MOVFF   _TBLPTRL, _EEDATA   ; load third byte
+        CALL    ___eeprom8_write    ; write and address next byte
+
+        MOVFF   _TBLPTRH, _EEDATA   ; load fourth byte
+        CALL    ___eeprom8_write    ; write and address next byte
+
+        BCF     _EECON1, 2, 0       ; WREN = 0: disable write access
+
+        BTFSC   _FSR0H, 7, 0        ; check previous interrupt state
+        BSF     _INTCON, 7, 0       ; conditionally re-enable interrupts
+
+        RETURN
+    __endasm;
+}
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_write.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_write.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_write.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/eeprom8_write.c	2012-04-19 22:14:15.000000000 +0000
@@ -0,0 +1,49 @@
+/*-------------------------------------------------------------------------
+   eeprom_write8.c - write one byte to EEPROM and wait for completion
+
+   Copyright (C) 1999, Sandeep Dutta . sandeep.dutta@usa.net
+   Adopted for pic16 port by Vangelis Rokas, 2004 <vrokas AT otenet.gr>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+extern char EEADR;
+extern char EECON1;
+extern char EECON2;
+
+void __eeprom8_write(void) __naked
+{
+  __asm
+    movlw       0x55
+    movwf       _EECON2, 0
+    movlw       0xAA
+    movwf       _EECON2, 0
+    bsf         _EECON1, 1, 0   ; WR
+
+    wait_till_done:
+    btfsc       _EECON1, 1, 0   ; WR still set?
+    bra         wait_till_done
+
+    infsnz      _EEADR, 1, 0    ; address next byte
+  __endasm;
+}
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrget1.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrget1.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrget1.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrget1.c	2012-04-19 22:14:15.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,13 +27,11 @@
    might be covered by the GNU General Public License.
 -------------------------------------------------------------------------*/
 
-/* the return value is expected to be in WREG, therefore we choose return
- * type void here. Generic pointer is expected to be in WREG:PRODL:FSR0L,
- * so function arguments are void, too */
+/* the return value is expected to be in (FSR0H, PRODH, PRODL, WREG),
+ * therefore we choose return type void here. Generic pointer is expected
+ * to be in (WREG, PRODL, FSR0L), so function arguments are void, too */
 
 extern POSTINC0;
-extern POSTINC1;
-extern PREINC1;
 extern INDF0;
 extern FSR0L;
 extern FSR0H;
@@ -43,7 +41,7 @@
 extern TBLPTRU;
 extern TABLAT;
 extern PRODL;
-
+extern __eeprom_gptrget1;
 
 void _gptrget1(void) __naked
 {
@@ -52,44 +50,38 @@
      * 00 -> code
      * 01 -> EEPROM
      * 10 -> data
-     * 11 -> unimplemented
+     * 11 -> data
+     *
+     * address in (WREG, PRODL, FSR0L)
+     * result in (FSR0L, PRODH, PRODL, WREG)
      */
-    btfss	_WREG, 7
+    btfss	_WREG, 7, 0
     bra		_lab_01_
     
-    ; data pointer
-    ; data are already in FSR0
-    movff	_PRODL, _FSR0H    
-
-    movf	_POSTINC0, w
-
+    /* data pointer  */
+    /* FSR0L is already set up */
+    movff	_PRODL, _FSR0H
+    
+    movf	_POSTINC0, 0, 0
+    
     return
     
 
 _lab_01_:
-    ; code or eeprom
-    btfsc	_WREG, 6
-    bra		_lab_02_
+    /* code or eeprom */
+    btfsc	_WREG, 6, 0
+    goto        ___eeprom_gptrget1
     
     ; code pointer
-    movff	_FSR0L, _TBLPTRL
+    movff	_FSR0L, _TBLPTRL    
     movff	_PRODL, _TBLPTRH
-    movwf	_TBLPTRU
-    
-    tblrd*+
-    
-    ; result in WREG
-    movf	_TABLAT, w
+    movwf	_TBLPTRU, 0
     
+    /* fetch first byte */
+    TBLRD*+
+    movf	_TABLAT, 0, 0
+
     return 
   
-_lab_02_:
-    ; EEPROM pointer
-
-    ; unimplemented yet
-
-_end_:
-
-  return
   __endasm;
 }
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrget2.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrget2.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrget2.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrget2.c	2012-04-19 22:14:15.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,9 +27,9 @@
    might be covered by the GNU General Public License.
 -------------------------------------------------------------------------*/
 
-/* the return value is expected to be in WREG:PRODL, therefore we choose return
- * type void here. Generic pointer is expected to be in WREG:PRODL:FSR0L,
- * so function arguments are void, too */
+/* the return value is expected to be in (FSR0H, PRODH, PRODL, WREG),
+ * therefore we choose return type void here. Generic pointer is expected
+ * to be in (WREG, PRODL, FSR0L), so function arguments are void, too */
 
 extern POSTINC0;
 extern INDF0;
@@ -41,6 +41,7 @@
 extern TBLPTRU;
 extern TABLAT;
 extern PRODL;
+extern __eeprom_gptrget2;
 
 void _gptrget2(void) __naked
 {
@@ -49,16 +50,19 @@
      * 00 -> code
      * 01 -> EEPROM
      * 10 -> data
-     * 11 -> unimplemented
+     * 11 -> data
+     *
+     * address in (WREG, PRODL, FSR0L)
+     * result in (FSR0L, PRODH, PRODL, WREG)
      */
-    btfss	_WREG, 7
+    btfss	_WREG, 7, 0
     bra		_lab_01_
     
     /* data pointer  */
-    /* data are already in FSR0 */
+    /* FSR0L is already set up */
     movff	_PRODL, _FSR0H
     
-    movf	_POSTINC0, w
+    movf	_POSTINC0, 0, 0
     movff	_POSTINC0, _PRODL
     
     return
@@ -66,32 +70,23 @@
 
 _lab_01_:
     /* code or eeprom */
-    btfsc	_WREG, 6
-    bra		_lab_02_
+    btfsc	_WREG, 6, 0
+    goto        ___eeprom_gptrget2
     
     ; code pointer
     movff	_FSR0L, _TBLPTRL    
     movff	_PRODL, _TBLPTRH
-    movwf	_TBLPTRU
+    movwf	_TBLPTRU, 0
     
     /* fetch first byte */
     TBLRD*+
-    movf	_TABLAT, w
+    movf	_TABLAT, 0, 0
 
     /* fetch second byte  */
     TBLRD*+
     movff	_TABLAT, _PRODL
     
-    return
- 
-  
-_lab_02_:
-    /* EEPROM pointer */
-
-    /* unimplemented yet */
-
-_end_:
+    return 
 
-  return
   __endasm;
 }
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrget3.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrget3.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrget3.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrget3.c	2012-04-19 22:14:15.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,9 +27,9 @@
    might be covered by the GNU General Public License.
 -------------------------------------------------------------------------*/
 
-/* the return value is expected to be in WREG:PRODL:PRODH, therefore we choose return
- * type void here. Generic pointer is expected to be in WREG:PRODL:FSR0L,
- * so function arguments are void, too */
+/* the return value is expected to be in (FSR0H, PRODH, PRODL, WREG),
+ * therefore we choose return type void here. Generic pointer is expected
+ * to be in (WREG, PRODL, FSR0L), so function arguments are void, too */
 
 extern POSTINC0;
 extern INDF0;
@@ -42,6 +42,7 @@
 extern TABLAT;
 extern PRODL;
 extern PRODH;
+extern __eeprom_gptrget3;
 
 void _gptrget3(void) __naked
 {
@@ -50,16 +51,19 @@
      * 00 -> code
      * 01 -> EEPROM
      * 10 -> data
-     * 11 -> unimplemented
+     * 11 -> data
+     *
+     * address in (WREG, PRODL, FSR0L)
+     * result in (FSR0L, PRODH, PRODL, WREG)
      */
-    btfss	_WREG, 7
+    btfss	_WREG, 7, 0
     bra		_lab_01_
     
     /* data pointer  */
-    /* data are already in FSR0 */
+    /* FSR0L is already set up */
     movff	_PRODL, _FSR0H
     
-    movf	_POSTINC0, w
+    movf	_POSTINC0, 0, 0
     movff	_POSTINC0, _PRODL
     movff	_POSTINC0, _PRODH
     
@@ -68,17 +72,17 @@
 
 _lab_01_:
     /* code or eeprom */
-    btfsc	_WREG, 6
-    bra		_lab_02_
+    btfsc	_WREG, 6, 0
+    goto        ___eeprom_gptrget3
     
     ; code pointer
     movff	_FSR0L, _TBLPTRL    
     movff	_PRODL, _TBLPTRH
-    movwf	_TBLPTRU
+    movwf	_TBLPTRU, 0
     
     /* fetch first byte */
     TBLRD*+
-    movf	_TABLAT, w
+    movf	_TABLAT, 0, 0
 
     /* fetch second byte  */
     TBLRD*+
@@ -88,14 +92,7 @@
     TBLRD*+
     movff	_TABLAT, _PRODH
     
-    return
- 
+    return 
   
-_lab_02_:
-    /* EEPROM pointer */
-
-    /* unimplemented yet */
-
-  return
   __endasm;
 }
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrget4.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrget4.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrget4.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrget4.c	2012-04-19 22:14:15.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,9 +27,9 @@
    might be covered by the GNU General Public License.
 -------------------------------------------------------------------------*/
 
-/* the return value is expected to be in WREG:PRODL, therefore we choose return
- * type void here. Generic pointer is expected to be in WREG:PRODL:FSR0L,
- * so function arguments are void, too */
+/* the return value is expected to be in (FSR0H, PRODH, PRODL, WREG),
+ * therefore we choose return type void here. Generic pointer is expected
+ * to be in (WREG, PRODL, FSR0L), so function arguments are void, too */
 
 extern POSTINC0;
 extern INDF0;
@@ -42,6 +42,7 @@
 extern TABLAT;
 extern PRODL;
 extern PRODH;
+extern __eeprom_gptrget4;
 
 void _gptrget4(void) __naked
 {
@@ -50,16 +51,19 @@
      * 00 -> code
      * 01 -> EEPROM
      * 10 -> data
-     * 11 -> unimplemented
+     * 11 -> data
+     *
+     * address in (WREG, PRODL, FSR0L)
+     * result in (FSR0L, PRODH, PRODL, WREG)
      */
-    btfss	_WREG, 7
+    btfss	_WREG, 7, 0
     bra		_lab_01_
     
     /* data pointer  */
-    /* data are already in FSR0 */
+    /* FSR0L is already set up */
     movff	_PRODL, _FSR0H
     
-    movf	_POSTINC0, w
+    movf	_POSTINC0, 0, 0
     movff	_POSTINC0, _PRODL
     movff	_POSTINC0, _PRODH
     movff	_POSTINC0, _FSR0L
@@ -69,17 +73,17 @@
 
 _lab_01_:
     /* code or eeprom */
-    btfsc	_WREG, 6
-    bra		_lab_02_
+    btfsc	_WREG, 6, 0
+    goto        ___eeprom_gptrget4
     
     ; code pointer
     movff	_FSR0L, _TBLPTRL    
     movff	_PRODL, _TBLPTRH
-    movwf	_TBLPTRU
+    movwf	_TBLPTRU, 0
     
     /* fetch first byte */
     TBLRD*+
-    movf	_TABLAT, w
+    movf	_TABLAT, 0, 0
 
     /* fetch second byte  */
     TBLRD*+
@@ -95,12 +99,5 @@
     
     return 
   
-_lab_02_:
-    /* EEPROM pointer */
-
-    /* unimplemented yet */
-
-  return
-  
   __endasm;
 }
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrput1.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrput1.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrput1.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrput1.c	2012-04-19 22:14:15.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -28,35 +28,32 @@
 -------------------------------------------------------------------------*/
 
 /* write address is expected to be in WREG:PRODL:FSR0L while
- * write value is in TBLPTRL:TBLPTRH:PRODH:[stack] */
+ * write value is in TBLPTRH:TBLPTRL:PRODH:[stack] */
  
+extern FSR0H;
 extern POSTINC0;
 extern PREINC1;
-extern INDF0;
-extern FSR0L;
-extern FSR0H;
-extern WREG;
-extern TBLPTRL;
-extern TBLPTRH;
-extern TBLPTRU;
-extern TABLAT;
 extern PRODL;
-extern PRODH;
+extern WREG;
+extern __eeprom_gptrput1;
 
 void _gptrput1(void) __naked
 {
   __asm
     /* decode generic pointer MSB (in WREG) bits 6 and 7:
      * 00 -> code (unimplemented)
-     * 01 -> EEPROM (unimplemented)
+     * 01 -> EEPROM
      * 10 -> data
-     * 11 -> unimplemented
+     * 11 -> data
+     *
+     * address: (WREG, PRODL, FSR0L)
+     * value: (TBLPTRH, TBLPTRL, PRODH, STACK1[+1])
      */
     btfss	_WREG, 7
     bra		_lab_01_
     
     /* data pointer  */
-    /* data are already in FSR0 */
+    /* FSR0L is already set up */
     movff	_PRODL, _FSR0H
     
     movff	_PREINC1, _POSTINC0
@@ -66,17 +63,11 @@
 
 _lab_01_:
     /* code or eeprom */
-    btfss	_WREG, 6
-    return
-    
-    /* code pointer, cannot write code pointers */
-    
-_lab_02_:
-    /* EEPROM pointer */
-
-    /* unimplemented yet */
+    btfsc	_WREG, 6
+    goto        ___eeprom_gptrput1
 
+    /* code pointer, cannot write code pointers */
+    return
 
-  return
   __endasm;
 }
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrput2.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrput2.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrput2.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrput2.c	2012-04-19 22:14:15.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -28,35 +28,33 @@
 -------------------------------------------------------------------------*/
 
 /* write address is expected to be in WREG:PRODL:FSR0L while
- * write value is in TBLPTRL:TBLPTRH:PRODH:[stack] */
+ * write value is in TBLPTRH:TBLPTRL:PRODH:[stack] */
  
+extern FSR0H;
 extern POSTINC0;
 extern PREINC1;
-extern INDF0;
-extern FSR0L;
-extern FSR0H;
-extern WREG;
-extern TBLPTRL;
-extern TBLPTRH;
-extern TBLPTRU;
-extern TABLAT;
-extern PRODL;
 extern PRODH;
+extern PRODL;
+extern WREG;
+extern __eeprom_gptrput2;
 
 void _gptrput2(void) __naked
 {
   __asm
     /* decode generic pointer MSB (in WREG) bits 6 and 7:
      * 00 -> code (unimplemented)
-     * 01 -> EEPROM (unimplemented)
+     * 01 -> EEPROM
      * 10 -> data
-     * 11 -> unimplemented
+     * 11 -> data
+     *
+     * address: (WREG, PRODL, FSR0L)
+     * value: (TBLPTRH, TBLPTRL, PRODH, STACK1[+1])
      */
     btfss	_WREG, 7
     bra		_lab_01_
     
     /* data pointer  */
-    /* data are already in FSR0 */
+    /* FSR0L is already set up */
     movff	_PRODL, _FSR0H
     
     movff	_PREINC1, _POSTINC0
@@ -67,18 +65,11 @@
 
 _lab_01_:
     /* code or eeprom */
-    btfss	_WREG, 6
-    return
-    
-    /* code pointer, cannot write code pointers */
-    
-  
-_lab_02_:
-    /* EEPROM pointer */
-
-    /* unimplemented yet */
+    btfsc	_WREG, 6
+    goto        ___eeprom_gptrput2
 
+    /* code pointer, cannot write code pointers */
+    return
 
-  return
   __endasm;
 }
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrput3.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrput3.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrput3.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrput3.c	2012-04-19 22:14:15.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,36 +27,35 @@
    might be covered by the GNU General Public License.
 -------------------------------------------------------------------------*/
 
-/* write address is expected to be in WREG:FSR0H:FSR0L while
+/* write address is expected to be in WREG:PRODL:FSR0L while
  * write value is in TBLPTRH:TBLPTRL:PRODH:[stack] */
  
+extern FSR0H;
 extern POSTINC0;
 extern PREINC1;
-extern INDF0;
-extern FSR0L;
-extern FSR0H;
-extern WREG;
-extern TBLPTRL;
-extern TBLPTRH;
-extern TBLPTRU;
-extern TABLAT;
-extern PRODL;
 extern PRODH;
+extern PRODL;
+extern TBLPTRL;
+extern WREG;
+extern __eeprom_gptrput3;
 
 void _gptrput3(void) __naked
 {
   __asm
     /* decode generic pointer MSB (in WREG) bits 6 and 7:
      * 00 -> code (unimplemented)
-     * 01 -> EEPROM (unimplemented)
+     * 01 -> EEPROM
      * 10 -> data
-     * 11 -> unimplemented
+     * 11 -> data
+     *
+     * address: (WREG, PRODL, FSR0L)
+     * value: (TBLPTRH, TBLPTRL, PRODH, STACK1[+1])
      */
     btfss	_WREG, 7
     bra		_lab_01_
     
     /* data pointer  */
-    /* data are already in FSR0 */
+    /* FSR0L is already set up */
     movff	_PRODL, _FSR0H
     
     movff	_PREINC1, _POSTINC0
@@ -68,18 +67,11 @@
 
 _lab_01_:
     /* code or eeprom */
-    btfss	_WREG, 6
-    return
-    
-    /* code pointer, cannot write code pointers */
-    
-  
-_lab_02_:
-    /* EEPROM pointer */
-
-    /* unimplemented yet */
+    btfsc	_WREG, 6
+    goto        ___eeprom_gptrput3
 
+    /* code pointer, cannot write code pointers */
+    return
 
-  return
   __endasm;
 }
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrput4.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrput4.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrput4.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/gptr/gptrput4.c	2012-04-19 22:14:15.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -27,36 +27,36 @@
    might be covered by the GNU General Public License.
 -------------------------------------------------------------------------*/
 
-/* write address is expected to be in WREG:FSR0H:FSR0L while
+/* write address is expected to be in WREG:PRODL:FSR0L while
  * write value is in TBLPTRH:TBLPTRL:PRODH:[stack] */
  
+extern FSR0H;
 extern POSTINC0;
 extern PREINC1;
-extern INDF0;
-extern FSR0L;
-extern FSR0H;
-extern WREG;
-extern TBLPTRL;
-extern TBLPTRH;
-extern TBLPTRU;
-extern TABLAT;
-extern PRODL;
 extern PRODH;
+extern PRODL;
+extern TBLPTRH;
+extern TBLPTRL;
+extern WREG;
+extern __eeprom_gptrput4;
 
 void _gptrput4(void) __naked
 {
   __asm
     /* decode generic pointer MSB (in WREG) bits 6 and 7:
      * 00 -> code (unimplemented)
-     * 01 -> EEPROM (unimplemented)
+     * 01 -> EEPROM
      * 10 -> data
-     * 11 -> unimplemented
+     * 11 -> data
+     *
+     * address: (WREG, PRODL, FSR0L)
+     * value: (TBLPTRH, TBLPTRL, PRODH, STACK1[+1])
      */
     btfss	_WREG, 7
     bra		_lab_01_
     
     /* data pointer  */
-    /* data are already in FSR0 */
+    /* FSR0L is already set up */
     movff	_PRODL, _FSR0H
     
     movff	_PREINC1, _POSTINC0
@@ -69,18 +69,11 @@
 
 _lab_01_:
     /* code or eeprom */
-    btfss	_WREG, 6
-    return
-    
+    btfsc	_WREG, 6
+    goto        ___eeprom_gptrput4
+
     /* code pointer, cannot write code pointers */
+    return
     
-  
-_lab_02_:
-    /* EEPROM pointer */
-
-    /* unimplemented yet */
-
-
-  return
   __endasm;
 }
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/int/divsint.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/int/divsint.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/int/divsint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/int/divsint.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/int/divuint.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/int/divuint.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/int/divuint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/int/divuint.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/int/modsint.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/int/modsint.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/int/modsint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/int/modsint.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/int/moduint.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/int/moduint.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/int/moduint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/int/moduint.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/int/mulint.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/int/mulint.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/int/mulint.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/int/mulint.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/long/divslong.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/long/divslong.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/long/divslong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/long/divslong.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/long/divulong.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/long/divulong.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/long/divulong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/long/divulong.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/long/modslong.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/long/modslong.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/long/modslong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/long/modslong.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/long/modulong.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/long/modulong.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/long/modulong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/long/modulong.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/long/mullong.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/long/mullong.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/long/mullong.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/long/mullong.c	2012-03-13 10:17:10.000000000 +0000
@@ -7,7 +7,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/lregs/lrrest.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/lregs/lrrest.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/lregs/lrrest.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/lregs/lrrest.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/lregs/lrst.c sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/lregs/lrst.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/lregs/lrst.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/lregs/lrst.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/stack/stack.S sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/stack/stack.S
--- sdcc-3.1.0+dfsg/device/lib/pic16/libsdcc/stack/stack.S	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/libsdcc/stack/stack.S	2012-03-13 10:17:10.000000000 +0000
@@ -7,7 +7,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/startup/crt0.c sdcc-3.2.0+dfsg/device/lib/pic16/startup/crt0.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/startup/crt0.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/startup/crt0.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/startup/crt0i.c sdcc-3.2.0+dfsg/device/lib/pic16/startup/crt0i.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/startup/crt0i.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/startup/crt0i.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/pic16/startup/crt0iz.c sdcc-3.2.0+dfsg/device/lib/pic16/startup/crt0iz.c
--- sdcc-3.1.0+dfsg/device/lib/pic16/startup/crt0iz.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/pic16/startup/crt0iz.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/powf.c sdcc-3.2.0+dfsg/device/lib/powf.c
--- sdcc-3.1.0+dfsg/device/lib/powf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/powf.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/printf_fast.c sdcc-3.2.0+dfsg/device/lib/printf_fast.c
--- sdcc-3.1.0+dfsg/device/lib/printf_fast.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/printf_fast.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -110,7 +110,7 @@
 #endif
 
 #ifdef FLOAT
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 static __bit continue_float;
 #ifndef FLOAT_FIXED4
@@ -132,10 +132,10 @@
 #endif
 
 
-#if !defined(SDCC_mcs51) || defined(SDCC_USE_XSTACK) || defined(_SDCC_NO_ASM_LIB_FUNCS)
+#if !defined(__SDCC_mcs51) || defined(__SDCC_USE_XSTACK) || defined(_SDCC_NO_ASM_LIB_FUNCS)
 // Does printf_fast really work on ds390 and ds400?
 // If it does, enable them in the line above
-#if defined(SDCC_USE_XSTACK)
+#if defined(__SDCC_USE_XSTACK)
 #warning "printf_fast not built, does not support --xstack"
 #elif defined(_SDCC_NO_ASM_LIB_FUNCS)
 #warning "printf_fast not built, _SDCC_NO_ASM_LIB_FUNCS defined"
diff -Nru sdcc-3.1.0+dfsg/device/lib/printf_fast_f.c sdcc-3.2.0+dfsg/device/lib/printf_fast_f.c
--- sdcc-3.1.0+dfsg/device/lib/printf_fast_f.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/printf_fast_f.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -26,7 +26,7 @@
    might be covered by the GNU General Public License.
 -------------------------------------------------------------------------*/
 
-#define SDCC_FLOAT_LIB
+#define __SDCC_FLOAT_LIB
 #include <float.h>
 
 #ifdef FLOAT_ASM_MCS51
diff -Nru sdcc-3.1.0+dfsg/device/lib/printf_large.c sdcc-3.2.0+dfsg/device/lib/printf_large.c
--- sdcc-3.1.0+dfsg/device/lib/printf_large.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/printf_large.c	2012-03-13 10:17:10.000000000 +0000
@@ -7,7 +7,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -28,7 +28,7 @@
    might be covered by the GNU General Public License.
 -------------------------------------------------------------------------*/
 
-#if defined (SDCC_ds390) || defined (SDCC_USE_XSTACK) || defined (SDCC_MODEL_HUGE)
+#if defined (__SDCC_ds390) || defined (__SDCC_USE_XSTACK) || defined (__SDCC_MODEL_HUGE)
 #define USE_FLOATS 1
 #endif
 
@@ -39,18 +39,14 @@
 #include <stdbool.h>
 #include <sdcc-lib.h>
 
-#ifndef BOOL
-#define BOOL _Bool
-#endif
-
 #define PTR value.ptr
 
-#ifdef SDCC_ds390
+#ifdef __SDCC_ds390
 #define NULL_STRING "<NULL>"
 #define NULL_STRING_LENGTH 6
 #endif
 
-#if defined (SDCC_mcs51) && defined (SDCC_MODEL_SMALL) && !defined (SDCC_STACK_AUTO)
+#if defined (__SDCC_mcs51) && defined (__SDCC_MODEL_SMALL) && !defined (__SDCC_STACK_AUTO)
 # define MEM_SPACE_BUF __idata
 # define MEM_SPACE_BUF_PP __idata
 #else
@@ -91,8 +87,8 @@
   const char     *ptr;
 } value_t;
 
-#ifndef SDCC_STACK_AUTO
-  static BOOL lower_case;
+#ifndef __SDCC_STACK_AUTO
+  static bool lower_case;
   static pfn_outputchar output_char;
   static void* p;
   static value_t value;
@@ -101,7 +97,7 @@
 
 /****************************************************************************/
 
-#ifdef SDCC_STACK_AUTO
+#ifdef __SDCC_STACK_AUTO
   #define OUTPUT_CHAR(c, p) { output_char (c, p); charsOutputted++; }
 #else
   #define OUTPUT_CHAR(c, p) _output_char (c)
@@ -115,9 +111,9 @@
 
 /*--------------------------------------------------------------------------*/
 
-#ifdef SDCC_STACK_AUTO
+#ifdef __SDCC_STACK_AUTO
   static void
-  output_digit (unsigned char n, BOOL lower_case, pfn_outputchar output_char, void* p)
+  output_digit (unsigned char n, bool lower_case, pfn_outputchar output_char, void* p)
   {
     register unsigned char c = n + (unsigned char)'0';
 
@@ -147,10 +143,10 @@
 
 /*--------------------------------------------------------------------------*/
 
-#ifdef SDCC_STACK_AUTO
+#ifdef __SDCC_STACK_AUTO
   #define OUTPUT_2DIGITS( B )   { output_2digits( B, lower_case, output_char, p ); charsOutputted += 2; }
   static void
-  output_2digits (unsigned char b, BOOL lower_case, pfn_outputchar output_char, void* p)
+  output_2digits (unsigned char b, bool lower_case, pfn_outputchar output_char, void* p)
   {
     output_digit( b>>4,   lower_case, output_char, p );
     output_digit( b&0x0F, lower_case, output_char, p );
@@ -167,7 +163,7 @@
 
 /*--------------------------------------------------------------------------*/
 
-#if defined SDCC_STACK_AUTO
+#if defined __SDCC_STACK_AUTO
 static void
 calculate_digit (value_t _AUTOMEM * value, unsigned char radix)
 {
@@ -225,16 +221,16 @@
 
 #define DEFAULT_FLOAT_PRECISION 6
 
-#ifdef SDCC_STACK_AUTO
+#ifdef __SDCC_STACK_AUTO
 #define OUTPUT_FLOAT(F, W, D, L, Z, S, P)       output_float(F, W, D, L, Z, S, P, output_char, p)
 static unsigned char
 output_float (float f, unsigned char reqWidth,
               signed char reqDecimals,
-              BOOL left, BOOL zero, BOOL sign, BOOL space,
+              bool left, bool zero, bool sign, bool space,
               pfn_outputchar output_char, void* p)
 {
   unsigned char charsOutputted = 0;
- #if defined (SDCC_mcs51)
+ #if defined (__SDCC_mcs51)
   char fpBuffer[16];      //mcs51 has only a small stack
  #else
   char fpBuffer[128];
@@ -244,11 +240,11 @@
 static void
 output_float (float f, unsigned char reqWidth,
               signed char reqDecimals,
-              BOOL left, BOOL zero, BOOL sign, BOOL space)
+              bool left, bool zero, bool sign, bool space)
 {
   __xdata char fpBuffer[128];
-#endif //SDCC_STACK_AUTO
-  BOOL negative = 0;
+#endif //__SDCC_STACK_AUTO
+  bool negative = 0;
   unsigned long integerPart;
   float rounding;
   float decimalPart;
@@ -426,31 +422,31 @@
     OUTPUT_CHAR ('0'+exp/10, p);
     OUTPUT_CHAR ('0'+exp%10, p);
   }
-#ifdef SDCC_STACK_AUTO
+#ifdef __SDCC_STACK_AUTO
   return charsOutputted;
 #else
   return;
-#endif //SDCC_STACK_AUTO
+#endif //__SDCC_STACK_AUTO
 }
 #endif //USE_FLOATS
 
 int
 _print_format (pfn_outputchar pfn, void* pvoid, const char *format, va_list ap)
 {
-  BOOL   left_justify;
-  BOOL   zero_padding;
-  BOOL   prefix_sign;
-  BOOL   prefix_space;
-  BOOL   signed_argument;
-  BOOL   char_argument;
-  BOOL   long_argument;
-  BOOL   float_argument;
-#ifdef SDCC_STACK_AUTO
-  BOOL   lower_case;
+  bool   left_justify;
+  bool   zero_padding;
+  bool   prefix_sign;
+  bool   prefix_space;
+  bool   signed_argument;
+  bool   char_argument;
+  bool   long_argument;
+  bool   float_argument;
+#ifdef __SDCC_STACK_AUTO
+  bool   lower_case;
   value_t value;
   int charsOutputted;
 #endif
-  BOOL   lsd;
+  bool   lsd;
 
   unsigned char radix;
   unsigned char  width;
@@ -458,7 +454,7 @@
   unsigned char  length;
   char           c;
 
-#ifdef SDCC_STACK_AUTO
+#ifdef __SDCC_STACK_AUTO
   #define output_char   pfn
   #define p             pvoid
 #else
@@ -469,7 +465,7 @@
   // reset output chars
   charsOutputted = 0;
 
-#ifdef SDCC_ds390
+#ifdef __SDCC_ds390
   if (format==0)
   {
     format=NULL_STRING;
@@ -572,7 +568,7 @@
       case 'S':
         PTR = va_arg(ap,ptr_t);
 
-#ifdef SDCC_ds390
+#ifdef __SDCC_ds390
         if (PTR==0)
         {
           PTR=NULL_STRING;
@@ -617,7 +613,7 @@
       case 'P':
         PTR = va_arg(ap,ptr_t);
 
-#if defined (SDCC_ds390)
+#if defined (__SDCC_ds390)
         {
           unsigned char memtype = value.byte[3];
           if (memtype >= 0x80)
@@ -636,7 +632,7 @@
         OUTPUT_2DIGITS( value.byte[2] );
         OUTPUT_2DIGITS( value.byte[1] );
         OUTPUT_2DIGITS( value.byte[0] );
-#elif defined (SDCC_mcs51)
+#elif defined (__SDCC_mcs51)
         {
           unsigned char memtype = value.byte[2];
           if (memtype >= 0x80)
@@ -710,13 +706,13 @@
         //width=8;
 #else
         // ignore b and l conversion spec for now
-#ifdef SDCC_STACK_AUTO
+#ifdef __SDCC_STACK_AUTO
         charsOutputted += OUTPUT_FLOAT(value.f, width, decimals, left_justify,
                                      zero_padding, prefix_sign, prefix_space);
 #else
         OUTPUT_FLOAT(value.f, width, decimals, left_justify,
                      zero_padding, prefix_sign, prefix_space);
-#endif //SDCC_STACK_AUTO
+#endif //__SDCC_STACK_AUTO
 #endif //USE_FLOATS
       }
       else if (radix != 0)
@@ -761,7 +757,7 @@
 
         do {
           value.byte[4] = 0;
-#if defined SDCC_STACK_AUTO
+#if defined __SDCC_STACK_AUTO
           calculate_digit(&value, radix);
 #else
           calculate_digit(radix);
@@ -850,7 +846,7 @@
           {
             value.byte[4] = *pstore & 0x0F;
           }
-#ifdef SDCC_STACK_AUTO
+#ifdef __SDCC_STACK_AUTO
           output_digit( value.byte[4], lower_case, output_char, p );
           charsOutputted++;
 #else
diff -Nru sdcc-3.1.0+dfsg/device/lib/printf_tiny.c sdcc-3.2.0+dfsg/device/lib/printf_tiny.c
--- sdcc-3.1.0+dfsg/device/lib/printf_tiny.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/printf_tiny.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -64,13 +64,13 @@
 #define print_zero_flag PSW.5
 
 
-#if !defined(SDCC_mcs51) || defined(SDCC_USE_XSTACK) || defined(_SDCC_NO_ASM_LIB_FUNCS)
+#if !defined(__SDCC_mcs51) || defined(__SDCC_USE_XSTACK) || defined(_SDCC_NO_ASM_LIB_FUNCS)
 /* Does printf_tiny really work on ds390 and ds400?
    If it does, enable them in the line above */
 #if defined(_SDCC_BUILD_LIB)
 /* Disable all warnings if building a library */
 #pragma disable_warning 190
-#elif defined(SDCC_USE_XSTACK)
+#elif defined(__SDCC_USE_XSTACK)
 #warning "printf_tiny not built, does not support --xstack"
 #elif defined(_SDCC_NO_ASM_LIB_FUNCS)
 #warning "printf_tiny not built, _SDCC_NO_ASM_LIB_FUNCS defined"
diff -Nru sdcc-3.1.0+dfsg/device/lib/printfl.c sdcc-3.2.0+dfsg/device/lib/printfl.c
--- sdcc-3.1.0+dfsg/device/lib/printfl.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/printfl.c	2012-06-06 11:34:31.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -45,10 +45,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#ifndef __ds390
-/* just for the SP */
-#include <8051.h>
-#endif
 
 static __data char radix ;
 static __bit  long_flag = 0;
@@ -60,7 +56,7 @@
 /* This great loop fails with the ds390 port (2003-01-13).
 
    At the beginning resp. end of the loop the compiler inserts a "push ar2"
-   resp. "pop ar2", which badly interfers with the push/pop in the source.
+   resp. "pop ar2", which badly interferes with the push/pop in the source.
 
    Library functions should be rock solid and portable. There's an _ltoa in
    the library, so let's use it and don't reinvent the wheel.
@@ -69,6 +65,9 @@
 */
 
 #if NICE_LIFO_IMPLEMENTATION_BUT_NOT_PORTABLE
+/* just for the SP */
+#include <8051.h>
+
 static __data volatile char ch;
 static __bit sign;
 
@@ -85,12 +84,12 @@
         }
         else { sign = 0; lval = val;}
 
-	if (!long_flag) {
-	  lval &= 0x0000ffff;
-	}
+        if (!long_flag) {
+          lval &= 0x0000ffff;
+        }
         if (char_flag) {
-	  lval &= 0x000000ff;
-	}
+          lval &= 0x000000ff;
+        }
 
         do
         {
@@ -101,7 +100,7 @@
                 __asm push _ch __endasm;
                 lval /= radix;
 #  else
-		// This only looks more efficient, but isn't. see the .map
+                // This only looks more efficient, but isn't. see the .map
                 ch = (lval % radix) + '0';
                 if (ch>'9') ch+=7;
                 __asm push _ch __endasm;
diff -Nru sdcc-3.1.0+dfsg/device/lib/puts.c sdcc-3.2.0+dfsg/device/lib/puts.c
--- sdcc-3.1.0+dfsg/device/lib/puts.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/puts.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/r2k/Makefile.in sdcc-3.2.0+dfsg/device/lib/r2k/Makefile.in
--- sdcc-3.1.0+dfsg/device/lib/r2k/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r2k/Makefile.in	2012-04-02 09:59:13.000000000 +0000
@@ -1,17 +1,13 @@
-# libc/z80 Makefile
+# libc/r2k Makefile
 
 VPATH  = @srcdir@
 srcdir = @srcdir@
 top_builddir = @top_builddir@
 
-AR_S            = @AR@ @AR_S_FLAG@
+LIB_TYPE     = @LIB_TYPE@
 
-LIB_TYPE        = @LIB_TYPE@
-
-TOPDIR = ../../..
-
-SCC = $(TOPDIR)/bin/sdcc -mr2k
-SAS = $(TOPDIR)/bin/sdasrab
+SCC = $(top_builddir)/bin/sdcc -mr2k
+SAS = $(top_builddir)/bin/sdasrab
 
 # override PORTDIR defined by super (parent) makefile
 override PORTDIR = ../build/r2k
@@ -26,6 +22,15 @@
   _divulong.c \
   _mullong.c
 
+Z80_LONGLONG = $(COMMON_LONGLONG) \
+  _rrulonglong.c \
+  _rrslonglong.c \
+  _rlulonglong.c \
+  _rlslonglong.c \
+  _mullonglong.c \
+  _divslonglong.c \
+  _divulonglong.c
+
 Z80_SDCC = $(COMMON_SDCC) \
   _itoa.c \
   _ltoa.c \
@@ -34,8 +39,8 @@
   vprintf.c \
   _strlen.c
 
-Z80SOURCES = $(addprefix ../,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_SDCC))
-Z8OBJECTS = $(patsubst %.c,%.rel,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_SDCC))
+Z80SOURCES = $(addprefix ../,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_LONGLONG) $(Z80_SDCC))
+Z8OBJECTS = $(patsubst %.c,%.rel,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_LONGLONG) $(Z80_SDCC))
 
 OBJ = divunsigned.rel divsigned.rel divmixed.rel modunsigned.rel modsigned.rel modmixed.rel mul.rel mulchar.rel \
       putchar.rel shift.rel stubs.rel crt0_rle.rel heap.rel fstubs.rel memmove.rel abs.rel crtcall.rel \
@@ -56,14 +61,13 @@
 $(PORTDIR)/$(LIB): $(OBJ) $(Z8OBJECTS) Makefile
 ifeq ($(LIB_TYPE), SDCCLIB)
 	rm -f $@; \
-	../../../bin/sdcclib -a $@ $(OBJ) $(Z8OBJECTS)
+	$(top_builddir)/bin/sdcclib -a $@ $(OBJ) $(Z8OBJECTS)
 else
   ifeq ($(LIB_TYPE), AR)
-	$(AR_S) -cq $@ $(OBJ) $(Z8OBJECTS)
+	$(top_builddir)/bin/sdar -rcS $@ $(OBJ) $(Z8OBJECTS)
   else
     ifeq ($(LIB_TYPE), RANLIB)
-	$(AR_S) -cq $@ $(OBJ) $(Z8OBJECTS)
-	$(top_builddir)/bin/sdranlib $@
+	$(top_builddir)/bin/sdar -rc $@ $(OBJ) $(Z8OBJECTS)
     else
 	rm -f $@; \
 	for i in $(basename $(OBJ) $(Z8OBJECTS)); do echo $$i >>$@; done
diff -Nru sdcc-3.1.0+dfsg/device/lib/r2k/abs.s sdcc-3.2.0+dfsg/device/lib/r2k/abs.s
--- sdcc-3.1.0+dfsg/device/lib/r2k/abs.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r2k/abs.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/r2k/crt0.s sdcc-3.2.0+dfsg/device/lib/r2k/crt0.s
--- sdcc-3.1.0+dfsg/device/lib/r2k/crt0.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r2k/crt0.s	2012-03-13 10:17:10.000000000 +0000
@@ -7,7 +7,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/r2k/crt0_rle.s sdcc-3.2.0+dfsg/device/lib/r2k/crt0_rle.s
--- sdcc-3.1.0+dfsg/device/lib/r2k/crt0_rle.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r2k/crt0_rle.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/r2k/crtcall.s sdcc-3.2.0+dfsg/device/lib/r2k/crtcall.s
--- sdcc-3.1.0+dfsg/device/lib/r2k/crtcall.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r2k/crtcall.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/r2k/divmixed.s sdcc-3.2.0+dfsg/device/lib/r2k/divmixed.s
--- sdcc-3.1.0+dfsg/device/lib/r2k/divmixed.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r2k/divmixed.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/r2k/divsigned.s sdcc-3.2.0+dfsg/device/lib/r2k/divsigned.s
--- sdcc-3.1.0+dfsg/device/lib/r2k/divsigned.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r2k/divsigned.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/r2k/divunsigned.s sdcc-3.2.0+dfsg/device/lib/r2k/divunsigned.s
--- sdcc-3.1.0+dfsg/device/lib/r2k/divunsigned.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r2k/divunsigned.s	2012-03-13 10:17:10.000000000 +0000
@@ -1,11 +1,11 @@
 ;--------------------------------------------------------------------------
 ;  divunsigned.s
 ;
-;  Copyright (C) 2000-2010, Michael Hope, Philipp Klaus Krause, Marco Bodrato
+;  Copyright (C) 2000-2012, Michael Hope, Philipp Klaus Krause, Marco Bodrato
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
@@ -64,19 +64,16 @@
         ;; Exit conditions
         ;;   HL = quotient
         ;;   DE = remainder
-        ;;   If divisor is non-zero, carry=0
-        ;;   If divisor is 0, carry=1 and both quotient and remainder are 0
+        ;;   carry = 0
+        ;;   If divisor is 0, quotient is set to "infinity", i.e HL = 0xFFFF.
         ;;
         ;; Register used: AF,B,DE,HL
 __divuint_rrx_hds::
 __divu16::
-        ;; Check for division by zero
-        ld      a,e
-        or      a,d
         ;; Two algorithms: one assumes divisor <2^7, the second
         ;; assumes divisor >=2^7; choose the applicable one.
+        ld      a,e
         and     a,#0x80
-        jr      NZ,.morethan7bits
         or      a,d
         jr      NZ,.morethan7bits
         ;; Both algorithms "rotate" 24 bits (H,L,A) but roles change.
diff -Nru sdcc-3.1.0+dfsg/device/lib/r2k/fstubs.s sdcc-3.2.0+dfsg/device/lib/r2k/fstubs.s
--- sdcc-3.1.0+dfsg/device/lib/r2k/fstubs.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r2k/fstubs.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/r2k/heap.s sdcc-3.2.0+dfsg/device/lib/r2k/heap.s
--- sdcc-3.1.0+dfsg/device/lib/r2k/heap.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r2k/heap.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/r2k/memmove.s sdcc-3.2.0+dfsg/device/lib/r2k/memmove.s
--- sdcc-3.1.0+dfsg/device/lib/r2k/memmove.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r2k/memmove.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/r2k/modmixed.s sdcc-3.2.0+dfsg/device/lib/r2k/modmixed.s
--- sdcc-3.1.0+dfsg/device/lib/r2k/modmixed.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r2k/modmixed.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/r2k/modsigned.s sdcc-3.2.0+dfsg/device/lib/r2k/modsigned.s
--- sdcc-3.1.0+dfsg/device/lib/r2k/modsigned.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r2k/modsigned.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/r2k/modunsigned.s sdcc-3.2.0+dfsg/device/lib/r2k/modunsigned.s
--- sdcc-3.1.0+dfsg/device/lib/r2k/modunsigned.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r2k/modunsigned.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/r2k/mul.s sdcc-3.2.0+dfsg/device/lib/r2k/mul.s
--- sdcc-3.1.0+dfsg/device/lib/r2k/mul.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r2k/mul.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/r2k/mulchar.s sdcc-3.2.0+dfsg/device/lib/r2k/mulchar.s
--- sdcc-3.1.0+dfsg/device/lib/r2k/mulchar.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r2k/mulchar.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/r2k/putchar.s sdcc-3.2.0+dfsg/device/lib/r2k/putchar.s
--- sdcc-3.1.0+dfsg/device/lib/r2k/putchar.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r2k/putchar.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/r2k/setjmp.s sdcc-3.2.0+dfsg/device/lib/r2k/setjmp.s
--- sdcc-3.1.0+dfsg/device/lib/r2k/setjmp.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r2k/setjmp.s	2012-03-13 10:17:10.000000000 +0000
@@ -1,11 +1,11 @@
 ;--------------------------------------------------------------------------
-;  abs.s
+;  setjmp.s
 ;
 ;  Copyright (C) 2011, Philipp Klaus Krause
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
@@ -44,7 +44,6 @@
 	xor	a, a
 	ld	l, a
 	ld	h, a
-	ld	hl, #0
 	add	hl, sp
 	ld	2(iy), l
 	ld	3(iy), h
@@ -84,8 +83,7 @@
 	ld	l, 2(iy)
 	ld	h, 3(iy)
 	ld	sp, hl
-	inc	sp
-	inc	sp
+	pop	hl
 
 	; Move return value into hl.
 	ex	de, hl
@@ -95,4 +93,3 @@
 	ld	b, 1(iy)
 	push	bc
 	ret
-
diff -Nru sdcc-3.1.0+dfsg/device/lib/r2k/shift.s sdcc-3.2.0+dfsg/device/lib/r2k/shift.s
--- sdcc-3.1.0+dfsg/device/lib/r2k/shift.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r2k/shift.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/r2k/stubs.s sdcc-3.2.0+dfsg/device/lib/r2k/stubs.s
--- sdcc-3.1.0+dfsg/device/lib/r2k/stubs.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r2k/stubs.s	2012-04-02 09:59:13.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
@@ -182,3 +182,4 @@
         ld      a,#5
         rst     #0x28
         jp	__rlslong_rrx_s
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/r3ka/Makefile.in sdcc-3.2.0+dfsg/device/lib/r3ka/Makefile.in
--- sdcc-3.1.0+dfsg/device/lib/r3ka/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r3ka/Makefile.in	2012-05-18 16:23:38.000000000 +0000
@@ -0,0 +1,95 @@
+# libc/r3ka Makefile
+
+VPATH  = @srcdir@
+srcdir = @srcdir@
+top_builddir = @top_builddir@
+
+LIB_TYPE     = @LIB_TYPE@
+
+SCC = $(top_builddir)/bin/sdcc -mr3ka
+SAS = $(top_builddir)/bin/sdasrab
+
+# override PORTDIR defined by super (parent) makefile
+override PORTDIR = ../build/r3ka
+
+include $(srcdir)/../incl.mk
+
+Z80_FLOAT = $(COMMON_FLOAT)
+
+Z80_INT = $(COMMON_INT)
+
+Z80_LONG = $(COMMON_LONG) \
+  _divulong.c \
+  _mullong.c
+
+Z80_LONGLONG = $(COMMON_LONGLONG) \
+  _rrulonglong.c \
+  _rrslonglong.c \
+  _rlulonglong.c \
+  _rlslonglong.c \
+  _mullonglong.c \
+  _divslonglong.c \
+  _divulonglong.c
+
+Z80_SDCC = $(COMMON_SDCC) \
+  _itoa.c \
+  _ltoa.c \
+  _startup.c \
+  sprintf.c \
+  vprintf.c \
+  _strlen.c
+
+Z80SOURCES = $(addprefix ../,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_LONGLONG) $(Z80_SDCC))
+Z8OBJECTS = $(patsubst %.c,%.rel,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_LONGLONG) $(Z80_SDCC))
+
+OBJ = divunsigned.rel divsigned.rel divmixed.rel modunsigned.rel modsigned.rel modmixed.rel mul.rel mulchar.rel \
+      putchar.rel shift.rel stubs.rel crt0_rle.rel heap.rel fstubs.rel memmove.rel abs.rel crtcall.rel \
+      setjmp.rel
+
+LIB = r3ka.lib
+CC = $(SCC)
+AS = $(SAS)
+ASFLAGS = -plosgff
+
+CFLAGS = -I$(srcdir)/../../include -I. --std-c99
+
+all: $(PORTDIR)/$(LIB) $(PORTDIR)/crt0.rel
+
+$(PORTDIR)/crt0.rel: crt0.rel
+	cp crt0.rel $(PORTDIR)/crt0.rel
+
+$(PORTDIR)/$(LIB): $(OBJ) $(Z8OBJECTS) Makefile
+ifeq ($(LIB_TYPE), SDCCLIB)
+	rm -f $@; \
+	$(top_builddir)/bin/sdcclib -a $@ $(OBJ) $(Z8OBJECTS)
+else
+  ifeq ($(LIB_TYPE), AR)
+	$(top_builddir)/bin/sdar -rcS $@ $(OBJ) $(Z8OBJECTS)
+  else
+    ifeq ($(LIB_TYPE), RANLIB)
+	$(top_builddir)/bin/sdar -rc $@ $(OBJ) $(Z8OBJECTS)
+    else
+	rm -f $@; \
+	for i in $(basename $(OBJ) $(Z8OBJECTS)); do echo $$i >>$@; done
+	cp $(OBJ) $(Z8OBJECTS) $(PORTDIR)
+    endif
+  endif
+endif
+
+%.rel: %.c
+	$(CC) $(CFLAGS) -c $<
+
+%.rel: %.s
+	@# TODO: sdas should place it\'s output in the current dir
+	test $(srcdir) = . || cp $< .
+	-$(AS) $(ASFLAGS) $(notdir $<)
+	test $(srcdir) = . || rm $(notdir $<)
+
+%.rel: ../%.c
+	$(CC) $(CFLAGS) -c $<
+
+clean:
+	rm -f *.rel *.sym *.lst *~ $(CLEANSPEC) *.dump* *.asm *.lib
+
+distclean: clean
+	rm -f Makefile
diff -Nru sdcc-3.1.0+dfsg/device/lib/r3ka/abs.s sdcc-3.2.0+dfsg/device/lib/r3ka/abs.s
--- sdcc-3.1.0+dfsg/device/lib/r3ka/abs.s	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r3ka/abs.s	2012-05-18 10:47:44.000000000 +0000
@@ -0,0 +1,61 @@
+;--------------------------------------------------------------------------
+;  abs.s
+;
+;  Copyright (C) 2010, Philipp Klaus Krause
+;
+;  This library is free software; you can redistribute it and/or modify it
+;  under the terms of the GNU General Public License as published by the
+;  Free Software Foundation; either version 2, or (at your option) any
+;  later version.
+;
+;  This library 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 library; see the file COPYING. If not, write to the
+;  Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;   MA 02110-1301, USA.
+;
+;  As a special exception, if you link this library with other files,
+;  some of which are compiled with SDCC, to produce an executable,
+;  this library does not by itself cause the resulting executable to
+;  be covered by the GNU General Public License. This exception does
+;  not however invalidate any other reasons why the executable file
+;   might be covered by the GNU General Public License.
+;--------------------------------------------------------------------------
+
+	.area   _CODE
+
+	.globl _abs
+
+; 12B; 86T for nonnegative arguments, 78T for negative.
+_abs:
+	pop	hl
+	pop	de
+	push	de
+	push	hl
+	xor	a, a
+	ld	l, a
+	ld	h, a
+	sbc	hl, de
+	ret	P
+	ex	de, hl
+	ret
+
+; 14B; 59T for nonegative arguments, 94T for negative:
+;_abs:
+;	pop	de
+;	pop	hl
+;	push	hl
+;	push	de
+;	bit	7, h
+;	ret	Z
+;	xor	a, a
+;	ld	e, a
+;	ld	d, a
+;	ex	de, hl
+;	sbc	hl, de
+;	ret
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/r3ka/crt0.s sdcc-3.2.0+dfsg/device/lib/r3ka/crt0.s
--- sdcc-3.1.0+dfsg/device/lib/r3ka/crt0.s	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r3ka/crt0.s	2012-05-18 10:47:44.000000000 +0000
@@ -0,0 +1,93 @@
+;--------------------------------------------------------------------------
+;  crt0.s - Generic crt0.s for a rabbit 2000
+;	derived from "Generic crt0.s for a Z80"
+;
+;  Copyright (C) 2000, Michael Hope
+;  Modified for rabbit by Leland Morrison 2011
+;
+;  This library is free software; you can redistribute it and/or modify it
+;  under the terms of the GNU General Public License as published by the
+;  Free Software Foundation; either version 2, or (at your option) any
+;  later version.
+;
+;  This library 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 library; see the file COPYING. If not, write to the
+;  Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;   MA 02110-1301, USA.
+;
+;  As a special exception, if you link this library with other files,
+;  some of which are compiled with SDCC, to produce an executable,
+;  this library does not by itself cause the resulting executable to
+;  be covered by the GNU General Public License. This exception does
+;  not however invalidate any other reasons why the executable file
+;   might be covered by the GNU General Public License.
+;--------------------------------------------------------------------------
+
+        .module crt0
+       	.globl	_main
+
+	.area	_HEADER (ABS)
+	;; Reset vector
+	.org 	0
+	jp	init
+
+	.org	0x08
+	reti
+	.org	0x10
+	reti
+	.org	0x18
+	reti
+	.org	0x20
+	reti
+	.org	0x28
+	reti
+	.org	0x30
+	reti
+	.org	0x38
+	reti
+
+	.org	0x100
+init:
+	;; Stack at the top of memory.
+	ld	sp,#0xffff
+
+        ;; Initialise global variables
+        call    gsinit
+	call	_main
+	jp	_exit
+
+	;; Ordering of segments for the linker.
+	.area	_HOME
+	.area	_CODE
+        .area   _GSINIT
+        .area   _GSFINAL
+
+	.area	_DATA
+	.area	_BSEG
+        .area   _BSS
+        .area   _HEAP
+
+        .area   _CODE
+__clock::
+	ld	a,#2
+        rst     #0x28
+	ret
+
+_exit::
+	;; Exit - special code to the emulator
+	ld	a,#0
+        rst     #0x28
+1$:
+	;halt		; opcode for halt used for 'altd' on rabbit processors
+	jr	1$
+
+        .area   _GSINIT
+gsinit::
+
+        .area   _GSFINAL
+        ret
diff -Nru sdcc-3.1.0+dfsg/device/lib/r3ka/crt0_rle.s sdcc-3.2.0+dfsg/device/lib/r3ka/crt0_rle.s
--- sdcc-3.1.0+dfsg/device/lib/r3ka/crt0_rle.s	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r3ka/crt0_rle.s	2012-05-18 10:47:44.000000000 +0000
@@ -0,0 +1,73 @@
+;--------------------------------------------------------------------------
+;  crt0_rle.s
+;
+;  Copyright (C) 2001, Michael Hope
+;
+;  This library is free software; you can redistribute it and/or modify it
+;  under the terms of the GNU General Public License as published by the
+;  Free Software Foundation; either version 2, or (at your option) any
+;  later version.
+;
+;  This library 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 library; see the file COPYING. If not, write to the
+;  Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;   MA 02110-1301, USA.
+;
+;  As a special exception, if you link this library with other files,
+;  some of which are compiled with SDCC, to produce an executable,
+;  this library does not by itself cause the resulting executable to
+;  be covered by the GNU General Public License. This exception does
+;  not however invalidate any other reasons why the executable file
+;   might be covered by the GNU General Public License.
+;--------------------------------------------------------------------------
+
+        .area   _CODE
+
+        ;; Special RLE decoder used for initing global data
+__initrleblock::
+        ;; Pull the destination address out
+        ld      c,l
+        ld      b,h
+
+        ;; Pop the return address
+        pop     hl
+1$:
+        ;; Fetch the run
+        ld      e,(hl)
+        inc     hl
+        ;; Negative means a run
+        bit     7,e
+        jp      Z,2$
+        ;; Code for expanding a run
+        ld      a,(hl)
+        inc     hl
+3$:
+        ld      (bc),a
+        inc     bc
+        inc     e
+        jp      NZ,3$
+        jp      1$
+2$:
+        ;; Zero means end of a block
+        xor     a,a
+        or      a,e
+        jp      Z,4$
+        ;; Code for expanding a block
+5$:
+        ld      a,(hl)
+        inc     hl
+        ld      (bc),a
+        inc     bc
+        dec     e
+        jp      NZ,5$
+        jp      1$
+4$:
+        ;; Push the return address back onto the stack
+        push    hl
+        ret
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/r3ka/crtcall.s sdcc-3.2.0+dfsg/device/lib/r3ka/crtcall.s
--- sdcc-3.1.0+dfsg/device/lib/r3ka/crtcall.s	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r3ka/crtcall.s	2012-05-18 10:47:44.000000000 +0000
@@ -0,0 +1,36 @@
+;--------------------------------------------------------------------------
+;  crtcall.s
+;
+;  Copyright (C) 2011, Maarten Brock
+;
+;  This library is free software; you can redistribute it and/or modify it
+;  under the terms of the GNU General Public License as published by the
+;  Free Software Foundation; either version 2, or (at your option) any
+;  later version.
+;
+;  This library 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 library; see the file COPYING. If not, write to the
+;  Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;   MA 02110-1301, USA.
+;
+;  As a special exception, if you link this library with other files,
+;  some of which are compiled with SDCC, to produce an executable,
+;  this library does not by itself cause the resulting executable to
+;  be covered by the GNU General Public License. This exception does
+;  not however invalidate any other reasons why the executable file
+;   might be covered by the GNU General Public License.
+;--------------------------------------------------------------------------
+
+        .area   _CODE
+
+	.globl __sdcc_call_hl
+
+; The Z80 has the jp (hl) instruction, which is perfect for implementing function pointers.
+
+__sdcc_call_hl:
+	jp	(hl)
diff -Nru sdcc-3.1.0+dfsg/device/lib/r3ka/divmixed.s sdcc-3.2.0+dfsg/device/lib/r3ka/divmixed.s
--- sdcc-3.1.0+dfsg/device/lib/r3ka/divmixed.s	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r3ka/divmixed.s	2012-05-18 10:47:44.000000000 +0000
@@ -0,0 +1,55 @@
+;--------------------------------------------------------------------------
+;  divmixed.s
+;
+;  Copyright (C) 2010, Philipp Klaus Krause
+;
+;  This library is free software; you can redistribute it and/or modify it
+;  under the terms of the GNU General Public License as published by the
+;  Free Software Foundation; either version 2, or (at your option) any
+;  later version.
+;
+;  This library 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 library; see the file COPYING. If not, write to the
+;  Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;   MA 02110-1301, USA.
+;
+;  As a special exception, if you link this library with other files,
+;  some of which are compiled with SDCC, to produce an executable,
+;  this library does not by itself cause the resulting executable to
+;  be covered by the GNU General Public License. This exception does
+;  not however invalidate any other reasons why the executable file
+;   might be covered by the GNU General Public License.
+;--------------------------------------------------------------------------
+
+__divsuchar_rrx_s::
+        ld      hl,#2+1
+        add     hl,sp
+
+        ld      e,(hl)
+        dec     hl
+        ld      l,(hl)
+        ld      h,#0
+
+        jp      __div_signexte
+
+__divuschar_rrx_s::
+        ld      hl,#2+1
+        ld      d, h
+        add     hl,sp
+
+        ld      e,(hl)
+        dec     hl
+        ld      l,(hl)
+
+        ld      a,l             ; Sign extend
+        rlca
+        sbc     a,a
+        ld      h,a
+
+        jp      __div16
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/r3ka/divsigned.s sdcc-3.2.0+dfsg/device/lib/r3ka/divsigned.s
--- sdcc-3.1.0+dfsg/device/lib/r3ka/divsigned.s	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r3ka/divsigned.s	2012-05-18 10:47:44.000000000 +0000
@@ -0,0 +1,137 @@
+;--------------------------------------------------------------------------
+;  divsigned.s
+;
+;  Copyright (C) 2000-2010, Michael Hope, Philipp Klaus Krause
+;
+;  This library is free software; you can redistribute it and/or modify it
+;  under the terms of the GNU General Public License as published by the
+;  Free Software Foundation; either version 2, or (at your option) any
+;  later version.
+;
+;  This library 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 library; see the file COPYING. If not, write to the
+;  Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;   MA 02110-1301, USA.
+;
+;  As a special exception, if you link this library with other files,
+;  some of which are compiled with SDCC, to produce an executable,
+;  this library does not by itself cause the resulting executable to
+;  be covered by the GNU General Public License. This exception does
+;  not however invalidate any other reasons why the executable file
+;   might be covered by the GNU General Public License.
+;--------------------------------------------------------------------------
+
+        .area   _CODE
+
+__divsint_rrx_s::
+        pop     af
+        pop     hl
+        pop     de
+        push    de
+        push    hl
+        push    af
+
+        jp      __div16
+
+__divschar_rrx_s::
+        ld      hl, #2+1
+        add     hl, sp
+
+        ld      e, (hl)
+        dec     hl
+        ld      l, (hl)
+
+        ;; Fall through
+__divschar_rrx_hds::
+__div8::
+        ld      a, l            ; Sign extend
+        rlca
+        sbc     a,a
+        ld      h, a
+__div_signexte::
+        ld      a, e            ; Sign extend
+        rlca
+        sbc     a,a
+        ld      d, a
+        ; Fall through to __div16
+
+        ;; signed 16-bit division
+        ;;
+        ;; Entry conditions
+        ;;   HL = dividend
+        ;;   DE = divisor
+        ;;
+        ;; Exit conditions
+        ;;   HL = quotient
+        ;;   DE = remainder
+        ;;
+        ;; Register used: AF,B,DE,HL
+__divsint_rrx_hds::
+__div16::
+        ;; Determine sign of quotient by xor-ing high bytes of dividend
+        ;;  and divisor. Quotient is positive if signs are the same, negative
+        ;;  if signs are different
+        ;; Remainder has same sign as dividend
+        ld      a, h            ; Get high byte of dividend
+        xor     a, d            ; Xor with high byte of divisor
+        rla                     ; Sign of quotient goes into the carry
+        ld      a, h            ; Get high byte of dividend
+        push    af              ; Save sign of both quotient and reminder
+
+        ; Take absolute value of dividend
+        rla
+        jr      NC, .chkde      ; Jump if dividend is positive
+        sub     a, a            ; Substract dividend from 0
+        sub     a, l
+        ld      l, a
+        sbc     a, a            ; Propagate borrow (A=0xFF if borrow)
+        sub     a, h
+        ld      h, a
+
+        ; Take absolute value of divisor
+.chkde:
+        bit     7, d
+        jr      Z, .dodiv       ; Jump if divisor is positive
+        sub     a, a            ; Subtract divisor from 0
+        sub     a, e
+        ld      e, a
+        sbc     a, a            ; Propagate borrow (A=0xFF if borrow)
+        sub     a, d
+        ld      d, a
+
+        ; Divide absolute values
+.dodiv:
+        call    __divu16
+
+.fix_quotient:
+        ; Negate quotient if it is negative
+        pop     af              ; recover sign of quotient
+        ret	NC		; Jump if quotient is positive
+        ld      b, a
+        sub     a, a            ; Subtract quotient from 0
+        sub     a, l
+        ld      l, a
+        sbc     a, a            ; Propagate borrow (A=0xFF if borrow)
+        sub     a, h
+        ld      h, a
+        ld      a, b
+	ret
+
+__get_remainder::
+        ; Negate remainder if it is negative and move it into hl
+        rla
+	ex	de, hl
+        ret     NC              ; Return if remainder is positive
+        sub     a, a            ; Subtract remainder from 0
+        sub     a, l
+        ld      l, a
+        sbc     a, a             ; Propagate remainder (A=0xFF if borrow)
+        sub     a, h
+        ld      h, a
+        ret
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/r3ka/divunsigned.s sdcc-3.2.0+dfsg/device/lib/r3ka/divunsigned.s
--- sdcc-3.1.0+dfsg/device/lib/r3ka/divunsigned.s	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r3ka/divunsigned.s	2012-05-18 10:47:44.000000000 +0000
@@ -0,0 +1,142 @@
+;--------------------------------------------------------------------------
+;  divunsigned.s
+;
+;  Copyright (C) 2000-2012, Michael Hope, Philipp Klaus Krause, Marco Bodrato
+;
+;  This library is free software; you can redistribute it and/or modify it
+;  under the terms of the GNU General Public License as published by the
+;  Free Software Foundation; either version 2, or (at your option) any
+;  later version.
+;
+;  This library 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 library; see the file COPYING. If not, write to the
+;  Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;   MA 02110-1301, USA.
+;
+;  As a special exception, if you link this library with other files,
+;  some of which are compiled with SDCC, to produce an executable,
+;  this library does not by itself cause the resulting executable to
+;  be covered by the GNU General Public License. This exception does
+;  not however invalidate any other reasons why the executable file
+;   might be covered by the GNU General Public License.
+;--------------------------------------------------------------------------
+
+        ;; Originally from GBDK by Pascal Felber.
+
+        .area   _CODE
+
+__divuint_rrx_s::
+        pop     af
+        pop     hl
+        pop     de
+        push    de
+        push    hl
+        push    af
+
+        jr      __divu16
+
+__divuchar_rrx_s::
+        ld      hl,#2+1
+        add     hl,sp
+
+        ld      e,(hl)
+        dec     hl
+        ld      l,(hl)
+
+        ;; Fall through
+__divuchar_rrx_hds::
+__divu8::
+        ld      h,#0x00
+        ld      d,h
+        ; Fall through to __divu16
+
+        ;; unsigned 16-bit division
+        ;;
+        ;; Entry conditions
+        ;;   HL = dividend
+        ;;   DE = divisor
+        ;;
+        ;; Exit conditions
+        ;;   HL = quotient
+        ;;   DE = remainder
+        ;;   carry = 0
+        ;;   If divisor is 0, quotient is set to "infinity", i.e HL = 0xFFFF.
+        ;;
+        ;; Register used: AF,B,DE,HL
+__divuint_rrx_hds::
+__divu16::
+        ;; Two algorithms: one assumes divisor <2^7, the second
+        ;; assumes divisor >=2^7; choose the applicable one.
+        ld      a,e
+        and     a,#0x80
+        or      a,d
+        jr      NZ,.morethan7bits
+        ;; Both algorithms "rotate" 24 bits (H,L,A) but roles change.
+
+        ;; unsigned 16/7-bit division
+.atmost7bits:
+        ld      b,#16           ; bits in dividend and possible quotient
+        ;; Carry cleared by AND/OR, this "0" bit will pass trough HL.[*]
+        adc     hl,hl
+.dvloop7:
+        ;; HL holds both dividend and quotient. While we shift a bit from
+        ;;  MSB of dividend, we shift next bit of quotient in from carry.
+        ;; A holds remainder.
+        rla
+
+        ;; If remainder is >= divisor, next bit of quotient is 1.  We try
+        ;;  to compute the difference.
+        sub     a,e
+        jr      NC,.nodrop7     ; Jump if remainder is >= dividend
+        add     a,e             ; Otherwise, restore remainder
+        ;; The add above sets the carry, because sbc a,e did set it.
+.nodrop7:
+        ccf                     ; Complement borrow so 1 indicates a
+                                ;  successful substraction (this is the
+                                ;  next bit of quotient)
+        adc     hl,hl
+        djnz    .dvloop7
+        ;; Carry now contains the same value it contained before
+        ;; entering .dvloop7[*]: "0" = valid result.
+        ld      e,a             ; DE = remainder, HL = quotient
+        ret
+
+.morethan7bits:
+        ld      b,#9            ; at most 9 bits in quotient.
+        ld      a,l             ; precompute the first 7 shifts, by
+        ld      l,h             ;  doing 8
+        ld      h,#0
+        rr      l               ;  undoing 1
+.dvloop:
+        ;; Shift next bit of quotient into bit 0 of dividend
+        ;; Shift next MSB of dividend into LSB of remainder
+        ;; A holds both dividend and quotient. While we shift a bit from
+        ;;  MSB of dividend, we shift next bit of quotient in from carry
+        ;; HL holds remainder
+        adc     hl,hl           ; HL < 2^(7+9), no carry, ever.
+
+        ;; If remainder is >= divisor, next bit of quotient is 1. We try
+        ;;  to compute the difference.
+        sbc     hl,de
+        jr      NC,.nodrop      ; Jump if remainder is >= dividend
+        add     hl,de           ; Otherwise, restore remainder
+	;; The add above sets the carry, because sbc hl,de did set it.
+.nodrop:
+        ccf                     ; Complement borrow so 1 indicates a
+                                ;  successful substraction (this is the
+                                ;  next bit of quotient)
+        rla
+        djnz    .dvloop
+        ;; Take care of the ninth quotient bit! after the loop B=0.
+        rl      b               ; BA = quotient
+        ;; Carry now contains "0" = valid result.
+        ld      d,b
+        ld      e,a             ; DE = quotient, HL = remainder
+        ex      de,hl           ; HL = quotient, DE = remainder
+        ret
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/r3ka/fstubs.s sdcc-3.2.0+dfsg/device/lib/r3ka/fstubs.s
--- sdcc-3.1.0+dfsg/device/lib/r3ka/fstubs.s	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r3ka/fstubs.s	2012-05-18 10:47:44.000000000 +0000
@@ -0,0 +1,35 @@
+;--------------------------------------------------------------------------
+;  fstubs.s
+;
+;  Copyright (C) 2001, Michael Hope
+;
+;  This library is free software; you can redistribute it and/or modify it
+;  under the terms of the GNU General Public License as published by the
+;  Free Software Foundation; either version 2, or (at your option) any
+;  later version.
+;
+;  This library 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 library; see the file COPYING. If not, write to the
+;  Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;   MA 02110-1301, USA.
+;
+;  As a special exception, if you link this library with other files,
+;  some of which are compiled with SDCC, to produce an executable,
+;  this library does not by itself cause the resulting executable to
+;  be covered by the GNU General Public License. This exception does
+;  not however invalidate any other reasons why the executable file
+;   might be covered by the GNU General Public License.
+;--------------------------------------------------------------------------
+
+; Just stubs - not copyrightable
+
+        ;; Stubs to match between function names
+        .area	_CODE
+
+___slong2fs_rrx_s::
+        jp      ___slong2fs
diff -Nru sdcc-3.1.0+dfsg/device/lib/r3ka/heap.s sdcc-3.2.0+dfsg/device/lib/r3ka/heap.s
--- sdcc-3.1.0+dfsg/device/lib/r3ka/heap.s	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r3ka/heap.s	2012-05-18 10:47:44.000000000 +0000
@@ -0,0 +1,44 @@
+;--------------------------------------------------------------------------
+;  heap.s
+;
+;  Copyright (C) 2001, Michael Hope
+;
+;  This library is free software; you can redistribute it and/or modify it
+;  under the terms of the GNU General Public License as published by the
+;  Free Software Foundation; either version 2, or (at your option) any
+;  later version.
+;
+;  This library 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 library; see the file COPYING. If not, write to the
+;  Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;   MA 02110-1301, USA.
+;
+;  As a special exception, if you link this library with other files,
+;  some of which are compiled with SDCC, to produce an executable,
+;  this library does not by itself cause the resulting executable to
+;  be covered by the GNU General Public License. This exception does
+;  not however invalidate any other reasons why the executable file
+;   might be covered by the GNU General Public License.
+;--------------------------------------------------------------------------
+
+; Just stubs - not copyrightable
+
+        ;; Stubs that hook the heap in
+        .globl  __sdcc_heap_init
+
+        .area   _GSINIT
+        call    __sdcc_heap_init
+
+        .area   _HEAP
+__sdcc_heap_start::
+        ;; For now just allocate 1k of heap.
+        .ds     1023
+
+        .area   _HEAP_END
+__sdcc_heap_end::
+        .ds     1
diff -Nru sdcc-3.1.0+dfsg/device/lib/r3ka/memmove.s sdcc-3.2.0+dfsg/device/lib/r3ka/memmove.s
--- sdcc-3.1.0+dfsg/device/lib/r3ka/memmove.s	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r3ka/memmove.s	2012-05-18 10:47:44.000000000 +0000
@@ -0,0 +1,65 @@
+;--------------------------------------------------------------------------
+;  memmove.s
+;
+;  Copyright (C) 2008-2009, Philipp Klaus Krause, Marco Bodrato
+;
+;  This library is free software; you can redistribute it and/or modify it
+;  under the terms of the GNU General Public License as published by the
+;  Free Software Foundation; either version 2, or (at your option) any
+;  later version.
+;
+;  This library 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 library; see the file COPYING. If not, write to the
+;  Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;   MA 02110-1301, USA.
+;
+;  As a special exception, if you link this library with other files,
+;  some of which are compiled with SDCC, to produce an executable,
+;  this library does not by itself cause the resulting executable to
+;  be covered by the GNU General Public License. This exception does
+;  not however invalidate any other reasons why the executable file
+;   might be covered by the GNU General Public License.
+;--------------------------------------------------------------------------
+
+        .area   _CODE
+
+	.globl _memmove
+
+; The Z80 has the ldir and lddr instructions, which are perfect for implementing memmove().
+
+_memmove:
+	pop	af
+	pop	hl
+	pop	de
+	pop	bc
+	push	bc
+	push	de
+	push	hl
+	push	af
+	ld	a, c
+	or	a, b
+	ret	Z
+	push	hl
+	sbc	hl, de		; or above cleared carry.
+	add	hl, de		; same carry as the line before
+	jr	C, memmove_up
+memmove_down:
+	dec	bc
+	add	hl, bc
+	ex      de, hl
+	add	hl, bc
+	inc	bc
+	lddr
+	pop	hl
+	ret
+memmove_up:
+	ex      de, hl
+	ldir
+	pop	hl
+	ret
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/r3ka/modmixed.s sdcc-3.2.0+dfsg/device/lib/r3ka/modmixed.s
--- sdcc-3.1.0+dfsg/device/lib/r3ka/modmixed.s	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r3ka/modmixed.s	2012-05-18 10:47:44.000000000 +0000
@@ -0,0 +1,59 @@
+;--------------------------------------------------------------------------
+;  modmixed.s
+;
+;  Copyright (C) 2010, Philipp Klaus Krause
+;
+;  This library is free software; you can redistribute it and/or modify it
+;  under the terms of the GNU General Public License as published by the
+;  Free Software Foundation; either version 2, or (at your option) any
+;  later version.
+;
+;  This library 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 library; see the file COPYING. If not, write to the
+;  Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;   MA 02110-1301, USA.
+;
+;  As a special exception, if you link this library with other files,
+;  some of which are compiled with SDCC, to produce an executable,
+;  this library does not by itself cause the resulting executable to
+;  be covered by the GNU General Public License. This exception does
+;  not however invalidate any other reasons why the executable file
+;   might be covered by the GNU General Public License.
+;--------------------------------------------------------------------------
+
+__modsuchar_rrx_s::
+        ld      hl,#2+1
+        add     hl,sp
+
+        ld      e,(hl)
+        dec     hl
+        ld      l,(hl)
+        ld      h,#0
+
+        call    __div_signexte
+
+	jp	__get_remainder
+
+__moduschar_rrx_s::
+        ld      hl,#2+1
+        ld      d, h
+        add     hl,sp
+
+        ld      e,(hl)
+        dec     hl
+        ld      l,(hl)
+
+        ld      a,l             ; Sign extend
+        rlca
+        sbc     a,a
+        ld      h,a
+
+	call	__div16
+
+        jp	__get_remainder
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/r3ka/modsigned.s sdcc-3.2.0+dfsg/device/lib/r3ka/modsigned.s
--- sdcc-3.1.0+dfsg/device/lib/r3ka/modsigned.s	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r3ka/modsigned.s	2012-05-18 10:47:44.000000000 +0000
@@ -0,0 +1,58 @@
+;--------------------------------------------------------------------------
+;  modsigned.s
+;
+;  Copyright (C) 2009, Philipp Klaus Krause
+;
+;  This library is free software; you can redistribute it and/or modify it
+;  under the terms of the GNU General Public License as published by the
+;  Free Software Foundation; either version 2, or (at your option) any
+;  later version.
+;
+;  This library 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 library; see the file COPYING. If not, write to the
+;  Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;   MA 02110-1301, USA.
+;
+;  As a special exception, if you link this library with other files,
+;  some of which are compiled with SDCC, to produce an executable,
+;  this library does not by itself cause the resulting executable to
+;  be covered by the GNU General Public License. This exception does
+;  not however invalidate any other reasons why the executable file
+;   might be covered by the GNU General Public License.
+;--------------------------------------------------------------------------
+
+        .area   _CODE
+
+__modschar_rrx_s::
+        ld      hl,#2+1
+        add     hl,sp
+
+        ld      e,(hl)
+        dec     hl
+        ld      l,(hl)
+
+        ;; Fall through
+__modschar_rrx_hds::
+        call    __div8
+
+        jp	__get_remainder
+
+__modsint_rrx_s::
+        pop     af
+        pop     hl
+        pop     de
+        push    de
+        push    hl
+        push    af
+
+        ;; Fall through
+__modsint_rrx_hds::
+        call    __div16
+
+        jp	__get_remainder
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/r3ka/modunsigned.s sdcc-3.2.0+dfsg/device/lib/r3ka/modunsigned.s
--- sdcc-3.1.0+dfsg/device/lib/r3ka/modunsigned.s	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r3ka/modunsigned.s	2012-05-18 10:47:44.000000000 +0000
@@ -0,0 +1,62 @@
+;--------------------------------------------------------------------------
+;  modunsigned.s
+;
+;  Copyright (C) 2009-2010, Philipp Klaus Krause
+;
+;  This library is free software; you can redistribute it and/or modify it
+;  under the terms of the GNU General Public License as published by the
+;  Free Software Foundation; either version 2, or (at your option) any
+;  later version.
+;
+;  This library 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 library; see the file COPYING. If not, write to the
+;  Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;   MA 02110-1301, USA.
+;
+;  As a special exception, if you link this library with other files,
+;  some of which are compiled with SDCC, to produce an executable,
+;  this library does not by itself cause the resulting executable to
+;  be covered by the GNU General Public License. This exception does
+;  not however invalidate any other reasons why the executable file
+;   might be covered by the GNU General Public License.
+;--------------------------------------------------------------------------
+
+        .area   _CODE
+
+__moduchar_rrx_s::
+        ld      hl,#2+1
+        add     hl,sp
+
+        ld      e,(hl)
+        dec     hl
+        ld      l,(hl)
+
+        ;; Fall through
+__moduchar_rrx_hds::
+        call    __divu8
+
+	ex	de,hl
+
+        ret
+
+__moduint_rrx_s::
+        pop     af
+        pop     hl
+        pop     de
+        push    de
+        push    hl
+        push    af
+
+        ;; Fall through
+__moduint_rrx_hds::
+        call    __divu16
+
+        ex      de,hl
+
+        ret
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/r3ka/mul.s sdcc-3.2.0+dfsg/device/lib/r3ka/mul.s
--- sdcc-3.1.0+dfsg/device/lib/r3ka/mul.s	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r3ka/mul.s	2012-05-18 10:47:44.000000000 +0000
@@ -0,0 +1,81 @@
+;--------------------------------------------------------------------------
+;  mulchar.s
+;
+;  Copyright (C) 2000, Michael Hope
+;
+;  This library is free software; you can redistribute it and/or modify it
+;  under the terms of the GNU General Public License as published by the
+;  Free Software Foundation; either version 2, or (at your option) any
+;  later version.
+;
+;  This library 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 library; see the file COPYING. If not, write to the
+;  Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;   MA 02110-1301, USA.
+;
+;  As a special exception, if you link this library with other files,
+;  some of which are compiled with SDCC, to produce an executable,
+;  this library does not by itself cause the resulting executable to
+;  be covered by the GNU General Public License. This exception does
+;  not however invalidate any other reasons why the executable file
+;   might be covered by the GNU General Public License.
+;--------------------------------------------------------------------------
+
+        .area   _CODE
+
+__mulint_rrx_s::
+        pop     af
+        pop     hl
+        pop     de
+        push    de
+        push    hl
+        push    af
+
+        ;; Fall through
+
+__muluchar_rrx_hds::
+__mulint_rrx_hds::
+	;; Parameters:
+	;;	hl, de (left, right irrelevant)
+	ld	b,h
+	ld	c,l
+
+	;; 16-bit multiplication
+	;;
+	;; Entry conditions
+	;; bc = multiplicand
+	;; de = multiplier
+	;;
+	;; Exit conditions
+	;; hl = less significant word of product
+	;;
+	;; Register used: AF,BC,DE,HL
+__mul16::
+	xor	a,a
+	ld	l,a
+	or	a,b
+	ld	b,#16
+
+        ;; Optimise for the case when this side has 8 bits of data or
+        ;; less.  This is often the case with support address calls.
+        jr      NZ,2$
+        ld      b,#8
+        ld      a,c
+1$:
+        ;; Taken from z88dk, which originally borrowed from the
+        ;; Spectrum rom.
+        add     hl,hl
+2$:
+        rl      c
+        rla                     ;DLE 27/11/98
+        jr      NC,3$
+        add     hl,de
+3$:
+        djnz    1$
+        ret
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/r3ka/mulchar.s sdcc-3.2.0+dfsg/device/lib/r3ka/mulchar.s
--- sdcc-3.1.0+dfsg/device/lib/r3ka/mulchar.s	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r3ka/mulchar.s	2012-05-18 10:47:44.000000000 +0000
@@ -0,0 +1,101 @@
+;--------------------------------------------------------------------------
+;  mulchar.s
+;
+;  Copyright (C) 2009, Philipp Klaus Krause
+;
+;  This library is free software; you can redistribute it and/or modify it
+;  under the terms of the GNU General Public License as published by the
+;  Free Software Foundation; either version 2, or (at your option) any
+;  later version.
+;
+;  This library 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 library; see the file COPYING. If not, write to the
+;  Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;   MA 02110-1301, USA.
+;
+;  As a special exception, if you link this library with other files,
+;  some of which are compiled with SDCC, to produce an executable,
+;  this library does not by itself cause the resulting executable to
+;  be covered by the GNU General Public License. This exception does
+;  not however invalidate any other reasons why the executable file
+;   might be covered by the GNU General Public License.
+;--------------------------------------------------------------------------
+
+        .area   _CODE
+
+; This multiplication routine is similar to the one
+; from Rodnay Zaks, "Programming the Z80".
+
+; Now replaced by a builtin for code generation, but
+; still called from some asm files in this directory.
+__muluchar_rrx_s::
+        ld      hl, #2+1
+        ld      d, h
+        add     hl, sp
+        ld      e, (hl)
+        dec     hl
+        ld      h, (hl)
+        ld      l, d
+        ld      b, #8
+muluchar_rrx_s_loop:
+        add     hl, hl
+        jr      nc, muluchar_rrx_s_noadd
+        add     hl, de
+muluchar_rrx_s_noadd:
+        djnz    muluchar_rrx_s_loop
+        ret
+
+; operands have different sign
+
+__mulsuchar_rrx_s::
+        ld      hl,#2+1
+        ld      b, h
+        add     hl,sp
+
+        ld      e,(hl)
+        dec     hl
+        ld      c,(hl)
+        jr      signexte
+
+__muluschar_rrx_s::
+        ld      hl,#2
+        ld      b, h
+        add     hl,sp
+
+        ld      e,(hl)
+        inc     hl
+        ld      c,(hl)
+        jr      signexte
+
+;; Originally from GBDK by Pascal Felber.
+
+__mulschar_rrx_s::
+        ld      hl,#2+1
+        add     hl,sp
+
+        ld      e,(hl)
+        dec     hl
+        ld      l,(hl)
+
+        ;; Fall through
+__mulschar_rrx_hds::
+        ;; Need to sign extend before going in.
+        ld      c,l
+
+        ld      a,l
+        rla
+        sbc     a,a
+        ld      b,a
+signexte:
+        ld      a,e
+        rla
+        sbc     a,a
+        ld      d,a
+
+        jp      __mul16
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/r3ka/putchar.s sdcc-3.2.0+dfsg/device/lib/r3ka/putchar.s
--- sdcc-3.1.0+dfsg/device/lib/r3ka/putchar.s	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r3ka/putchar.s	2012-05-18 10:47:44.000000000 +0000
@@ -0,0 +1,47 @@
+;--------------------------------------------------------------------------
+;  putchar.s
+;
+;  Copyright (C) 2000, Michael Hope
+;
+;  This library is free software; you can redistribute it and/or modify it
+;  under the terms of the GNU General Public License as published by the
+;  Free Software Foundation; either version 2, or (at your option) any
+;  later version.
+;
+;  This library 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 library; see the file COPYING. If not, write to the
+;  Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;   MA 02110-1301, USA.
+;
+;  As a special exception, if you link this library with other files,
+;  some of which are compiled with SDCC, to produce an executable,
+;  this library does not by itself cause the resulting executable to
+;  be covered by the GNU General Public License. This exception does
+;  not however invalidate any other reasons why the executable file
+;   might be covered by the GNU General Public License.
+;--------------------------------------------------------------------------
+
+        .area   _CODE
+_putchar::
+_putchar_rr_s::
+        ld      hl,#2
+        add     hl,sp
+
+        ld      l,(hl)
+        ld      a,#1
+        rst     #0x28
+
+        ret
+
+_putchar_rr_dbs::
+        ld      l,e
+        ld      a,#1
+        rst     #0x28
+
+        ret
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/r3ka/setjmp.s sdcc-3.2.0+dfsg/device/lib/r3ka/setjmp.s
--- sdcc-3.1.0+dfsg/device/lib/r3ka/setjmp.s	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r3ka/setjmp.s	2012-05-18 10:47:44.000000000 +0000
@@ -0,0 +1,95 @@
+;--------------------------------------------------------------------------
+;  setjmp.s
+;
+;  Copyright (C) 2011, Philipp Klaus Krause
+;
+;  This library is free software; you can redistribute it and/or modify it
+;  under the terms of the GNU General Public License as published by the
+;  Free Software Foundation; either version 2, or (at your option) any
+;  later version.
+;
+;  This library 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 library; see the file COPYING. If not, write to the
+;  Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;   MA 02110-1301, USA.
+;
+;  As a special exception, if you link this library with other files,
+;  some of which are compiled with SDCC, to produce an executable,
+;  this library does not by itself cause the resulting executable to
+;  be covered by the GNU General Public License. This exception does
+;  not however invalidate any other reasons why the executable file
+;   might be covered by the GNU General Public License.
+;--------------------------------------------------------------------------
+
+	.area   _CODE
+
+	.globl ___setjmp
+
+___setjmp:
+	pop	hl
+	pop	iy
+	push	af
+	push	hl
+
+	; Store return address.
+	ld	0(iy), l
+	ld	1(iy), h
+
+	; Store stack pointer.
+	xor	a, a
+	ld	l, a
+	ld	h, a
+	add	hl, sp
+	ld	2(iy), l
+	ld	3(iy), h
+
+	; Store frame pointer.
+	push	ix
+	pop	hl
+	ld	4(iy), l
+	ld	5(iy), h
+
+	; Return 0.
+	ld	l, a
+	ld	h, a
+	ret
+
+.globl _longjmp
+
+_longjmp:
+	pop	af
+	pop	iy
+	pop	de
+
+	; Ensure that return value is non-zero.
+	ld	a, e
+	or	a, d
+	jr	NZ, jump
+	ld	de, #1
+jump:
+
+	; Restore frame pointer.
+	ld	l, 4(iy)
+	ld	h, 5(iy)
+	push	hl
+	pop	ix
+
+	; Adjust stack pointer.
+	ld	l, 2(iy)
+	ld	h, 3(iy)
+	ld	sp, hl
+	pop	hl
+
+	; Move return value into hl.
+	ex	de, hl
+
+	; Jump.
+	ld	c, 0(iy)
+	ld	b, 1(iy)
+	push	bc
+	ret
diff -Nru sdcc-3.1.0+dfsg/device/lib/r3ka/shift.s sdcc-3.2.0+dfsg/device/lib/r3ka/shift.s
--- sdcc-3.1.0+dfsg/device/lib/r3ka/shift.s	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r3ka/shift.s	2012-05-18 10:47:44.000000000 +0000
@@ -0,0 +1,103 @@
+;--------------------------------------------------------------------------
+;  putchar.s
+;
+;  Copyright (C) 2001, Michael Hope
+;
+;  This library is free software; you can redistribute it and/or modify it
+;  under the terms of the GNU General Public License as published by the
+;  Free Software Foundation; either version 2, or (at your option) any
+;  later version.
+;
+;  This library 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 library; see the file COPYING. If not, write to the
+;  Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;   MA 02110-1301, USA.
+;
+;  As a special exception, if you link this library with other files,
+;  some of which are compiled with SDCC, to produce an executable,
+;  this library does not by itself cause the resulting executable to
+;  be covered by the GNU General Public License. This exception does
+;  not however invalidate any other reasons why the executable file
+;   might be covered by the GNU General Public License.
+;--------------------------------------------------------------------------
+
+        ;;
+__rrulong_rrx_s::
+        ld      hl,#2+4
+        add     hl,sp
+
+        ld      a,(hl)
+        or      a,a
+	pop     bc
+	pop     hl
+	pop     de
+	push    de
+	push    hl
+	push    bc
+        ret     Z
+        ld      b,a
+        ld      a,e
+1$:
+        srl     d
+        rra
+        rr	h
+        rr      l
+
+        djnz    1$
+        ld      e,a
+        ret
+
+__rrslong_rrx_s::
+        ld      hl,#2+4
+        add     hl,sp
+
+        ld      a,(hl)
+        or      a,a
+	pop     bc
+	pop     hl
+	pop     de
+	push    de
+	push    hl
+	push    bc
+        ret     Z
+        ld      b,a
+        ld      a,e
+2$:
+        sra     d
+        rra
+        rr	h
+        rr      l
+
+        djnz    2$
+        ld      e,a
+        ret
+
+__rlslong_rrx_s::
+__rlulong_rrx_s::
+        ld      hl,#2+4
+        add     hl,sp
+
+        ld      a,(hl)
+        or      a,a
+	pop     bc
+	pop     hl
+	pop     de
+	push    de
+	push    hl
+	push    bc
+        ret     Z
+        ld      b,a
+        ld      a,e
+3$:
+        add     hl,hl
+        rla
+        rl	d
+
+        djnz    3$
+        ld      e,a
+        ret
diff -Nru sdcc-3.1.0+dfsg/device/lib/r3ka/stubs.s sdcc-3.2.0+dfsg/device/lib/r3ka/stubs.s
--- sdcc-3.1.0+dfsg/device/lib/r3ka/stubs.s	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/r3ka/stubs.s	2012-05-18 10:47:44.000000000 +0000
@@ -0,0 +1,185 @@
+;--------------------------------------------------------------------------
+;  stubs.s
+;
+;  Copyright (C) 2001, Michael Hope
+;
+;  This library is free software; you can redistribute it and/or modify it
+;  under the terms of the GNU General Public License as published by the
+;  Free Software Foundation; either version 2, or (at your option) any
+;  later version.
+;
+;  This library 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 library; see the file COPYING. If not, write to the
+;  Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+;   MA 02110-1301, USA.
+;
+;  As a special exception, if you link this library with other files,
+;  some of which are compiled with SDCC, to produce an executable,
+;  this library does not by itself cause the resulting executable to
+;  be covered by the GNU General Public License. This exception does
+;  not however invalidate any other reasons why the executable file
+;   might be covered by the GNU General Public License.
+;--------------------------------------------------------------------------
+
+; Just stubs - not copyrightable
+
+        ;; Stubs to match between function names
+        .area	_CODE
+
+        .globl  __mullong
+        .globl  __modslong
+        .globl  __modulong
+        .globl  __divslong
+        .globl  __divulong
+        .globl	__divschar_rrx_s
+        .globl	__divuchar_rrx_s
+        .globl	__divsuchar_rrx_s
+        .globl	__divuschar_rrx_s
+        .globl	__divsint_rrx_s
+        .globl	__divuint_rrx_s
+        .globl	__mulschar_rrx_s
+        .globl	__muluchar_rrx_s
+        .globl	__mulsuchar_rrx_s
+        .globl	__muluschar_rrx_s
+        .globl	__mulint_rrx_s
+        .globl  __modschar_rrx_s
+        .globl  __moduchar_rrx_s
+        .globl  __modsuchar_rrx_s
+        .globl  __moduschar_rrx_s
+        .globl  __moduint_rrx_s
+        .globl  __modsint_rrx_s
+        .globl	__rrulong_rrx_s
+        .globl	__rrslong_rrx_s
+        .globl	__rlulong_rrx_s
+        .globl	__rlslong_rrx_s
+
+__mullong_rrx_s::
+__mullong_rrf_s::
+        jp      __mullong
+
+__modslong_rrx_s::
+__modslong_rrf_s::
+        jp      __modslong
+
+__modulong_rrx_s::
+__modulong_rrf_s::
+        jp      __modulong
+
+__divslong_rrx_s::
+__divslong_rrf_s::
+        jp      __divslong
+
+__divulong_rrx_s::
+__divulong_rrf_s::
+        jp      __divulong
+
+__mulint_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__mulint_rrx_s
+
+__divsint_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__divsint_rrx_s
+
+__divuint_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__divuint_rrx_s
+
+__mulschar_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__mulschar_rrx_s
+
+__divschar_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__divschar_rrx_s
+
+__modschar_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__modschar_rrx_s
+
+__muluchar_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__muluchar_rrx_s
+
+__divuchar_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__divuchar_rrx_s
+
+__moduchar_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__moduchar_rrx_s
+
+__mulsuchar_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__mulsuchar_rrx_s
+
+__divsuchar_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__divsuchar_rrx_s
+
+__modsuchar_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__modsuchar_rrx_s
+
+__muluschar_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__muluschar_rrx_s
+
+__divuschar_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__divuschar_rrx_s
+
+__moduschar_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__moduschar_rrx_s
+
+__modsint_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__modsint_rrx_s
+
+__moduint_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__moduint_rrx_s
+
+__rrulong_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__rrulong_rrx_s
+
+__rrslong_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__rrslong_rrx_s
+
+__rlulong_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__rlulong_rrx_s
+
+__rlslong_rrf_s::
+        ld      a,#5
+        rst     #0x28
+        jp	__rlslong_rrx_s
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/rand.c sdcc-3.2.0+dfsg/device/lib/rand.c
--- sdcc-3.1.0+dfsg/device/lib/rand.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/rand.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/s08/Makefile.in sdcc-3.2.0+dfsg/device/lib/s08/Makefile.in
--- sdcc-3.1.0+dfsg/device/lib/s08/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/s08/Makefile.in	2012-05-18 16:23:38.000000000 +0000
@@ -0,0 +1,88 @@
+# libc/s08 Makefile
+
+VPATH  = @srcdir@
+srcdir = @srcdir@
+top_builddir = @top_builddir@
+
+LIB_TYPE     = @LIB_TYPE@
+
+SCC = $(top_builddir)/bin/sdcc -ms08
+SAS = $(top_builddir)/bin/sdas6808
+
+# override PORTDIR defined by super (parent) makefile
+override PORTDIR = ../build/s08
+
+include $(srcdir)/../incl.mk
+
+HC08_FLOAT = $(COMMON_FLOAT)
+
+HC08_INT = $(COMMON_INT) \
+  _divsint.c \
+  _modsint.c \
+  _moduint.c
+
+HC08_LONG = $(COMMON_LONG)
+
+HC08_LONGLONG = $(COMMON_LONGLONG) \
+  _rrulonglong.c \
+  _rrslonglong.c \
+  _rlulonglong.c \
+  _rlslonglong.c \
+  _mullonglong.c \
+  _divslonglong.c \
+  _divulonglong.c
+
+HC08_SDCC = $(COMMON_SDCC) \
+  _itoa.c \
+  _ltoa.c \
+  _spx.c \
+  _startup.c \
+  _strlen.c \
+  _memmove.c \
+  _heap.c \
+  sprintf.c \
+  vprintf.c
+
+HC08SOURCES = $(addprefix ../,$(HC08_FLOAT) $(HC08_INT) $(HC08_LONG) $(HC08_LONGLONG) $(HC08_SDCC))
+HC08OBJECTS = $(patsubst %.c,%.rel,$(HC08_FLOAT) $(HC08_INT) $(HC08_LONG) $(HC08_LONGLONG) $(HC08_SDCC))
+
+OBJ = _ret.rel _divuint.rel _divulong.rel _mulint.rel _mullong.rel
+
+LIB = s08.lib
+CC = $(SCC)
+AS = $(SAS)
+ASFLAGS = -plosgff
+
+CFLAGS = -I$(srcdir)/../../include -I. --std-c99
+
+all: $(PORTDIR)/$(LIB)
+
+$(PORTDIR)/$(LIB): $(OBJ) $(HC08OBJECTS) Makefile
+ifeq ($(LIB_TYPE), SDCCLIB)
+	rm -f $@; \
+	$(top_builddir)/bin/sdcclib -a $@ $(OBJ) $(HC08OBJECTS)
+else
+  ifeq ($(LIB_TYPE), AR)
+	$(top_builddir)/bin/sdar -rcS $@ $(OBJ) $(HC08OBJECTS)
+  else
+    ifeq ($(LIB_TYPE), RANLIB)
+	$(top_builddir)/bin/sdar -rc $@ $(OBJ) $(HC08OBJECTS)
+    else
+	rm -f $@
+	for i in $(basename $(OBJ) $(HC08OBJECTS)); do echo $$i >>$@; done
+	cp $(OBJ) $(HC08OBJECTS) $(PORTDIR)
+    endif
+  endif
+endif
+
+%.rel: %.c
+	$(CC) $(CFLAGS) -c $<
+
+%.rel: ../%.c
+	$(CC) $(CFLAGS) -c $<
+
+clean:
+	rm -f *.rel *.sym *.lst *~ $(CLEANSPEC) *.dump* *.asm *.lib
+
+distclean: clean
+	rm -f Makefile
diff -Nru sdcc-3.1.0+dfsg/device/lib/s08/_divuint.c sdcc-3.2.0+dfsg/device/lib/s08/_divuint.c
--- sdcc-3.1.0+dfsg/device/lib/s08/_divuint.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/s08/_divuint.c	2012-05-18 16:09:24.000000000 +0000
@@ -0,0 +1,179 @@
+/*-------------------------------------------------------------------------
+   _divuint.c - routine for unsigned int (16 bit) division
+
+   Copyright (C) 1999, Jean-Louis Vern <jlvern AT gmail.com>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/*   Assembler-functions are provided for:
+     mcs51 small
+     mcs51 small stack-auto
+*/
+
+#if !defined(SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
+#  if defined(SDCC_mcs51)
+#    if defined(SDCC_MODEL_SMALL)
+#      if defined(SDCC_STACK_AUTO)
+#        define _DIVUINT_ASM_SMALL_AUTO
+#      else
+#        define _DIVUINT_ASM_SMALL
+#      endif
+#    endif
+#  endif
+#endif
+
+#if defined _DIVUINT_ASM_SMALL || defined _DIVUINT_ASM_SMALL_AUTO
+
+static void
+_divuint_dummy (void) _naked
+{
+  __asm
+
+    .globl __divuint
+
+  __divuint:
+
+    #define count   r2
+    #define reste_l r3
+    #define reste_h r4
+    #define al      dpl
+    #define ah      dph
+
+#if defined(SDCC_STACK_AUTO) && !defined(SDCC_PARMS_IN_BANK1)
+
+    ar0 = 0     ; BUG register set is not considered
+    ar1 = 1
+
+    .globl __divint
+
+    mov a,sp
+    add a,#-2   ; 2 bytes return address
+    mov r0,a    ; r0 points to bh
+    mov ar1,@r0   ; load bh
+    dec r0
+    mov ar0,@r0   ; load bl
+
+    #define bl      r0
+    #define bh      r1
+
+  __divint:     ; entry point for __divsint
+
+
+#else // SDCC_STACK_AUTO
+
+#if !defined(SDCC_PARMS_IN_BANK1)
+#if defined(SDCC_NOOVERLAY)
+    .area DSEG    (DATA)
+#else
+    .area OSEG    (OVR,DATA)
+#endif
+
+    .globl __divuint_PARM_2
+    .globl __divsint_PARM_2
+
+  __divuint_PARM_2:
+  __divsint_PARM_2:
+    .ds 2
+
+    .area CSEG    (CODE)
+#endif // !SDCC_PARMS_IN_BANK1
+#if defined(SDCC_PARMS_IN_BANK1)
+    #define bl      (b1_0)
+    #define bh      (b1_1)
+#else
+    #define bl      (__divuint_PARM_2)
+    #define bh      (__divuint_PARM_2 + 1)
+#endif // SDCC_PARMS_IN_BANK1
+#endif // SDCC_STACK_AUTO
+
+    mov count,#16
+    clr a
+    mov reste_l,a
+    mov reste_h,a
+
+  loop: mov a,al    ; a <<= 1
+    add a,acc
+    mov al,a
+    mov a,ah
+    rlc a
+    mov ah,a
+
+    mov a,reste_l ; reste <<= 1
+    rlc a   ;   feed in carry
+    mov reste_l,a
+    mov a,reste_h
+    rlc a
+    mov reste_h,a
+
+    mov a,reste_l ; reste - b
+    subb  a,bl    ; here carry is always clear, because
+          ; reste <<= 1 never overflows
+    mov b,a
+    mov a,reste_h
+    subb  a,bh
+
+    jc  smaller   ; reste >= b?
+
+    mov reste_h,a ; -> yes;  reste = reste - b;
+    mov reste_l,b
+    orl al,#1
+  smaller:      ; -> no
+    djnz  count,loop
+    ret
+
+  __endasm ;
+}
+
+#else  // defined _DIVUINT_ASM_SMALL || defined _DIVUINT_ASM_SMALL_AUTO
+
+#define MSB_SET(x) ((x >> (8*sizeof(x)-1)) & 1)
+
+unsigned int
+_divuint (unsigned int a, unsigned int b)
+{
+  unsigned int reste = 0;
+  unsigned char count = 16;
+  char c;
+
+  do
+  {
+    // reste: a <- 0;
+    c = MSB_SET(a);
+    a <<= 1;
+    reste <<= 1;
+    if (c)
+      reste |= 1;
+
+    if (reste >= b)
+    {
+      reste -= b;
+      // a <- (result = 1)
+      a |= 1;
+    }
+  }
+  while (--count);
+  return a;
+}
+
+#endif  // defined _DIVUINT_ASM_SMALL || defined _DIVUINT_ASM_SMALL_AUTO
diff -Nru sdcc-3.1.0+dfsg/device/lib/s08/_divulong.c sdcc-3.2.0+dfsg/device/lib/s08/_divulong.c
--- sdcc-3.1.0+dfsg/device/lib/s08/_divulong.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/s08/_divulong.c	2012-05-18 16:09:24.000000000 +0000
@@ -0,0 +1,357 @@
+/*-------------------------------------------------------------------------
+   _divulong.c - routine for division of 32 bit unsigned long
+
+   Copyright (C) 1999, Jean-Louis Vern <jlvern AT gmail.com>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/*   Assembler-functions are provided for:
+     mcs51 small
+     mcs51 small stack-auto
+*/
+
+#if !defined(SDCC_USE_XSTACK) && !defined(_SDCC_NO_ASM_LIB_FUNCS)
+#  if defined(SDCC_mcs51)
+#    if defined(SDCC_MODEL_SMALL)
+#      if defined(SDCC_STACK_AUTO) && !defined(SDCC_PARMS_IN_BANK1)
+#        define _DIVULONG_ASM_SMALL_AUTO
+#      else
+#        define _DIVULONG_ASM_SMALL
+#      endif
+#    endif
+#  endif
+#endif
+
+#if defined _DIVULONG_ASM_SMALL
+
+static void
+_divlong_dummy (void) _naked
+{
+  __asm
+
+    .globl __divulong
+
+  __divulong:
+
+    #define count   r2
+
+    #define a0  dpl
+    #define a1  dph
+    #define a2  b
+    #define a3  r3
+
+    #define reste0  r4
+    #define reste1  r5
+    #define reste2  r6
+    #define reste3  r7
+#if !defined(SDCC_PARMS_IN_BANK1)
+
+#if defined(SDCC_NOOVERLAY)
+    .area DSEG    (DATA)
+#else
+    .area OSEG    (OVR,DATA)
+#endif
+
+    .globl __divulong_PARM_2
+    .globl __divslong_PARM_2
+
+  __divulong_PARM_2:
+  __divslong_PARM_2:
+    .ds 4
+
+    .area CSEG    (CODE)
+
+    #define b0      (__divulong_PARM_2)
+    #define b1      (__divulong_PARM_2 + 1)
+    #define b2      (__divulong_PARM_2 + 2)
+    #define b3      (__divulong_PARM_2 + 3)
+#else
+    #define b0      (b1_0)
+    #define b1      (b1_1)
+    #define b2      (b1_2)
+    #define b3      (b1_3)
+#endif // !SDCC_PARMS_IN_BANK1
+          ; parameter a comes in a, b, dph, dpl
+    mov a3,a    ; save parameter a3
+
+    mov count,#32
+    clr a
+    mov reste0,a
+    mov reste1,a
+    mov reste2,a
+    mov reste3,a
+
+  ; optimization  loop in lp0 until the first bit is shifted into rest
+
+  lp0:  mov a,a0    ; a <<= 1
+    add a,a0
+    mov a0,a
+    mov a,a1
+    rlc a
+    mov a1,a
+    mov a,a2
+    rlc a
+    mov a2,a
+    mov a,a3
+    rlc a
+    mov a3,a
+
+    jc  in_lp
+    djnz  count,lp0
+
+    sjmp  exit
+
+  loop: mov a,a0    ; a <<= 1
+    add a,a0
+    mov a0,a
+    mov a,a1
+    rlc a
+    mov a1,a
+    mov a,a2
+    rlc a
+    mov a2,a
+    mov a,a3
+    rlc a
+    mov a3,a
+
+  in_lp:  mov a,reste0  ; reste <<= 1
+    rlc a   ;   feed in carry
+    mov reste0,a
+    mov a,reste1
+    rlc a
+    mov reste1,a
+    mov a,reste2
+    rlc a
+    mov reste2,a
+    mov a,reste3
+    rlc a
+    mov reste3,a
+
+    mov a,reste0  ; reste - b
+    subb  a,b0    ; carry is always clear here, because
+                  ; reste <<= 1 never overflows
+    mov a,reste1
+    subb  a,b1
+    mov a,reste2
+    subb  a,b2
+    mov a,reste3
+    subb  a,b3
+
+    jc  minus   ; reste >= b?
+
+          ; -> yes;  reste -= b;
+    mov a,reste0
+    subb  a,b0    ; carry is always clear here (jc)
+    mov reste0,a
+    mov a,reste1
+    subb  a,b1
+    mov reste1,a
+    mov a,reste2
+    subb  a,b2
+    mov reste2,a
+    mov a,reste3
+    subb  a,b3
+    mov reste3,a
+
+    orl a0,#1
+
+  minus:  djnz  count,loop  ; -> no
+
+  exit: mov a,a3    ; prepare the return value
+    ret
+
+  __endasm ;
+}
+
+#elif defined _DIVULONG_ASM_SMALL_AUTO
+
+static void
+_divlong_dummy (void) _naked
+{
+  __asm
+
+    .globl __divulong
+
+  __divulong:
+
+    #define count   r2
+
+    #define a0  dpl
+    #define a1  dph
+    #define a2  b
+    #define a3  r3
+
+    #define reste0  r4
+    #define reste1  r5
+    #define reste2  r6
+    #define reste3  r7
+
+    .globl __divlong  ; entry point for __divslong
+
+    #define b0  r1
+
+    ar0 = 0     ; BUG register set is not considered
+    ar1 = 1
+
+          ; parameter a comes in a, b, dph, dpl
+    mov a3,a    ; save parameter a3
+
+    mov a,sp
+    add a,#-2-3   ; 2 bytes return address, 3 bytes param b
+    mov r0,a    ; r0 points to b0
+
+  __divlong:      ; entry point for __divslong
+
+    mov ar1,@r0   ; load b0
+    inc r0    ; r0 points to b1
+
+    mov count,#32
+    clr a
+    mov reste0,a
+    mov reste1,a
+    mov reste2,a
+    mov reste3,a
+
+  ; optimization  loop in lp0 until the first bit is shifted into rest
+
+  lp0:  mov a,a0    ; a <<= 1
+    add a,a0
+    mov a0,a
+    mov a,a1
+    rlc a
+    mov a1,a
+    mov a,a2
+    rlc a
+    mov a2,a
+    mov a,a3
+    rlc a
+    mov a3,a
+
+    jc  in_lp
+    djnz  count,lp0
+
+    sjmp  exit
+
+  loop: mov a,a0    ; a <<= 1
+    add a,a0
+    mov a0,a
+    mov a,a1
+    rlc a
+    mov a1,a
+    mov a,a2
+    rlc a
+    mov a2,a
+    mov a,a3
+    rlc a
+    mov a3,a
+
+  in_lp:  mov a,reste0  ; reste <<= 1
+    rlc a   ;   feed in carry
+    mov reste0,a
+    mov a,reste1
+    rlc a
+    mov reste1,a
+    mov a,reste2
+    rlc a
+    mov reste2,a
+    mov a,reste3
+    rlc a
+    mov reste3,a
+
+    mov a,reste0  ; reste - b
+    subb  a,b0    ; carry is always clear here, because
+          ; reste <<= 1 never overflows
+    mov a,reste1
+    subb  a,@r0   ; b1
+    mov a,reste2
+    inc r0
+    subb  a,@r0   ; b2
+    mov a,reste3
+    inc r0
+    subb  a,@r0   ; b3
+    dec r0
+    dec r0
+
+    jc  minus   ; reste >= b?
+
+          ; -> yes;  reste -= b;
+    mov a,reste0
+    subb  a,b0    ; carry is always clear here (jc)
+    mov reste0,a
+    mov a,reste1
+    subb  a,@r0   ; b1
+    mov reste1,a
+    mov a,reste2
+    inc r0
+    subb  a,@r0   ; b2
+    mov reste2,a
+    mov a,reste3
+    inc r0
+    subb  a,@r0   ; b3
+    mov reste3,a
+    dec r0
+    dec r0
+
+    orl a0,#1
+
+  minus:  djnz  count,loop  ; -> no
+
+  exit: mov a,a3    ; prepare the return value
+    ret
+
+  __endasm ;
+}
+
+#else // _DIVULONG_ASM
+
+#define MSB_SET(x) ((x >> (8*sizeof(x)-1)) & 1)
+
+unsigned long
+_divulong (unsigned long a, unsigned long b)
+{
+  unsigned long reste = 0L;
+  unsigned char count = 32;
+  char c;
+
+  do
+  {
+    // reste: a <- 0;
+    c = MSB_SET(a);
+    a <<= 1;
+    reste <<= 1;
+    if (c)
+      reste |= 1L;
+
+    if (reste >= b)
+    {
+      reste -= b;
+      // a <- (result = 1)
+      a |= 1L;
+    }
+  }
+  while (--count);
+  return a;
+}
+
+#endif // _DIVULONG_ASM
diff -Nru sdcc-3.1.0+dfsg/device/lib/s08/_mulint.c sdcc-3.2.0+dfsg/device/lib/s08/_mulint.c
--- sdcc-3.1.0+dfsg/device/lib/s08/_mulint.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/s08/_mulint.c	2012-05-18 16:09:24.000000000 +0000
@@ -0,0 +1,138 @@
+/*-------------------------------------------------------------------------
+   _mulint.c - routine for (unsigned) int (16 bit) multiplication
+
+   Copyright (C) 1999, Sandeep Dutta . sandeep.dutta@usa.net
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/* Signed and unsigned multiplication are the same - as long as the output
+   has the same precision as the input.
+
+   Assembler-functions are provided for:
+     hc08
+     hc08 stack-auto
+*/
+
+
+#if !defined(_SDCC_NO_ASM_LIB_FUNCS)
+
+#pragma save
+#pragma less_pedantic
+int
+_mulint (int a, int b)
+{
+  a,b;	/* reference to make compiler happy */
+
+#if !defined(__SDCC_STACK_AUTO)
+    __asm
+   	ais #-2
+	psha
+	pshx
+
+	ldx __mulint_PARM_2+1
+	mul
+	sta 4,s
+	stx 3,s
+
+	lda 1,s
+	ldx __mulint_PARM_2+1
+	mul
+	add 3,s
+	sta 3,s
+
+	lda 2,s
+	ldx __mulint_PARM_2
+	mul
+	add 3,s
+	sta 3,s
+
+	ais #2
+	pulx
+	pula
+    __endasm;
+#else
+    __asm
+   	ais #-2
+	psha
+	pshx
+
+	ldx 8,s
+	mul
+	sta 4,s
+	stx 3,s
+
+	lda 1,s
+	ldx 8,s
+	mul
+	add 3,s
+	sta 3,s
+
+	lda 2,s
+	ldx 7,s
+	mul
+	add 3,s
+	sta 3,s
+
+	ais #2
+	pulx
+	pula
+    __endasm;
+#endif
+}
+#pragma restore
+
+#else
+
+union uu {
+	struct { unsigned char hi,lo ;} s;
+        unsigned int t;
+} ;
+
+int
+_mulint (int a, int b)
+{
+#if !defined(__SDCC_STACK_AUTO) && (defined(__SDCC_MODEL_LARGE) || defined(__SDCC_ds390))	// still needed for large
+	union uu __xdata *x;
+	union uu __xdata *y;
+	union uu t;
+        x = (union uu __xdata *)&a;
+        y = (union uu __xdata *)&b;
+#else
+	register union uu *x;
+	register union uu *y;
+	union uu t;
+        x = (union uu *)&a;
+        y = (union uu *)&b;
+#endif
+
+        t.t = x->s.lo * y->s.lo;
+        t.s.hi += (x->s.lo * y->s.hi) + (x->s.hi * y->s.lo);
+
+       return t.t;
+}
+#endif
+
+
+#undef _MULINT_ASM
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/s08/_mullong.c sdcc-3.2.0+dfsg/device/lib/s08/_mullong.c
--- sdcc-3.1.0+dfsg/device/lib/s08/_mullong.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/s08/_mullong.c	2012-05-18 16:09:24.000000000 +0000
@@ -0,0 +1,99 @@
+/*-------------------------------------------------------------------------
+   _mullong.c - routine for multiplication of 32 bit (unsigned) long
+
+   Copyright (C) 1999, Jean-Louis Vern <jlvern AT gmail.com>
+   Copyright (C) 1999, Sandeep Dutta <sandeep.dutta AT ieee.org>
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+/* Signed and unsigned multiplication are the same - as long as the output
+   has the same precision as the input.
+
+   Assembler-functions are provided for:
+     mcs51 small
+     mcs51 small stack-auto
+*/
+
+
+struct some_struct {
+	short a ;
+	char b;
+	long c ;};
+union bil {
+        struct {unsigned char b3,b2,b1,b0 ;} b;
+        struct {unsigned short hi,lo ;} i;
+        unsigned long l;
+        struct { unsigned char b3; unsigned short i12; unsigned char b0;} bi;
+} ;
+
+#  define bcast(x) ((union bil *)&(x))
+
+/*
+                     3   2   1   0
+       X             3   2   1   0
+       ----------------------------
+                   0.3 0.2 0.1 0.0
+               1.3 1.2 1.1 1.0
+           2.3 2.2 2.1 2.0
+       3.3 3.2 3.1 3.0
+       ----------------------------
+                  |3.3|1.3|0.2|0.0|   A
+                    |2.3|0.3|0.1|     B
+                    |3.2|1.2|1.0|     C
+                      |2.2|1.1|       D
+                      |3.1|2.0|       E
+                        |2.1|         F
+                        |3.0|         G
+                          |-------> only this side 32 x 32 -> 32
+*/
+long
+_mullong (long a, long b)
+{
+        union bil t;
+
+        t.i.hi = bcast(a)->b.b0 * bcast(b)->b.b2;       // A
+        t.i.lo = bcast(a)->b.b0 * bcast(b)->b.b0;       // A
+        t.b.b3 += bcast(a)->b.b3 *
+                                  bcast(b)->b.b0;       // G
+        t.b.b3 += bcast(a)->b.b2 *
+                                  bcast(b)->b.b1;       // F
+        t.i.hi += bcast(a)->b.b2 * bcast(b)->b.b0;      // E <- b lost in .lst
+        // bcast(a)->i.hi is free !
+        t.i.hi += bcast(a)->b.b1 * bcast(b)->b.b1;      // D <- b lost in .lst
+
+        bcast(a)->bi.b3 = bcast(a)->b.b1 *
+                                          bcast(b)->b.b2;
+        bcast(a)->bi.i12 = bcast(a)->b.b1 *
+                           bcast(b)->b.b0;              // C
+
+        bcast(b)->bi.b3 = bcast(a)->b.b0 *
+                                          bcast(b)->b.b3;
+        bcast(b)->bi.i12 = bcast(a)->b.b0 *
+                           bcast(b)->b.b1;              // B
+        bcast(b)->bi.b0 = 0;                            // B
+        bcast(a)->bi.b0 = 0;                            // C
+        t.l += a;
+
+        return t.l + b;
+}
diff -Nru sdcc-3.1.0+dfsg/device/lib/s08/_ret.c sdcc-3.2.0+dfsg/device/lib/s08/_ret.c
--- sdcc-3.1.0+dfsg/device/lib/s08/_ret.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/s08/_ret.c	2012-05-18 16:09:24.000000000 +0000
@@ -0,0 +1,37 @@
+/*-------------------------------------------------------------------------
+   _ret.c
+
+   Copyright (C) 2003, Erik Petrich
+   Copyright (C) 2012, Philipp Klaus Krause
+   Considering how short this file is, it is probably not copyrightable, though.
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This library 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 library; see the file COPYING. If not, write to the
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   As a special exception, if you link this library with other files,
+   some of which are compiled with SDCC, to produce an executable,
+   this library does not by itself cause the resulting executable to
+   be covered by the GNU General Public License. This exception does
+   not however invalidate any other reasons why the executable file
+   might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
+
+__data unsigned char __SDCC_hc08_ret2;
+__data unsigned char __SDCC_hc08_ret3;
+__data unsigned char __SDCC_hc08_ret4;
+__data unsigned char __SDCC_hc08_ret5;
+__data unsigned char __SDCC_hc08_ret6;
+__data unsigned char __SDCC_hc08_ret7;
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/ser_ir.c sdcc-3.2.0+dfsg/device/lib/ser_ir.c
--- sdcc-3.1.0+dfsg/device/lib/ser_ir.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/ser_ir.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/ser_ir_cts_rts.c sdcc-3.2.0+dfsg/device/lib/ser_ir_cts_rts.c
--- sdcc-3.1.0+dfsg/device/lib/ser_ir_cts_rts.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/ser_ir_cts_rts.c	2012-03-13 10:17:10.000000000 +0000
@@ -9,7 +9,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/serial.c sdcc-3.2.0+dfsg/device/lib/serial.c
--- sdcc-3.1.0+dfsg/device/lib/serial.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/serial.c	2012-03-13 10:17:10.000000000 +0000
@@ -7,7 +7,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/sincosf.c sdcc-3.2.0+dfsg/device/lib/sincosf.c
--- sdcc-3.1.0+dfsg/device/lib/sincosf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/sincosf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -13,7 +13,7 @@
    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 
+   You should have received a copy of the GNU General Public License
    along with this library; see the file COPYING. If not, write to the
    Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
@@ -35,10 +35,6 @@
 #include <errno.h>
 #include <stdbool.h>
 
-#ifndef BOOL
-#define BOOL _Bool
-#endif
-
 #define r1      -0.1666665668E+0
 #define r2       0.8333025139E-2
 #define r3      -0.1980741872E-3
@@ -51,11 +47,11 @@
 /*A reasonable value for YMAX is the int part of PI*B**(t/2)=3.1416*2**(12)*/
 #define YMAX     12867.0
 
-float sincosf(const float x, const BOOL iscos)
+float sincosf(const float x, const bool iscos)
 {
     float y, f, r, g, XN;
     int N;
-    BOOL sign;
+    bool sign;
 
     if(iscos)
     {
diff -Nru sdcc-3.1.0+dfsg/device/lib/sincoshf.c sdcc-3.2.0+dfsg/device/lib/sincoshf.c
--- sdcc-3.1.0+dfsg/device/lib/sincoshf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/sincoshf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -13,7 +13,7 @@
    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 
+   You should have received a copy of the GNU General Public License
    along with this library; see the file COPYING. If not, write to the
    Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
@@ -35,10 +35,6 @@
 #include <errno.h>
 #include <stdbool.h>
 
-#ifndef BOOL
-#define BOOL _Bool
-#endif
-
 #define P0 -0.713793159E+1
 #define P1 -0.190333999E+0
 #define Q0 -0.428277109E+2
@@ -60,7 +56,7 @@
 float sincoshf(const float x, const int iscosh)
 {
     float y, w, z;
-	BOOL sign;
+    bool sign;
 
     if (x<0.0) { y=-x; sign=1; }
           else { y=x;  sign=0; }
diff -Nru sdcc-3.1.0+dfsg/device/lib/sinf.c sdcc-3.2.0+dfsg/device/lib/sinf.c
--- sdcc-3.1.0+dfsg/device/lib/sinf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/sinf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -13,7 +13,7 @@
    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 
+   You should have received a copy of the GNU General Public License
    along with this library; see the file COPYING. If not, write to the
    Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
@@ -31,11 +31,7 @@
 #include <math.h>
 #include <stdbool.h>
 
-#ifndef BOOL
-#define BOOL _Bool
-#endif
-
-float sincosf(const float x, const BOOL iscos);
+float sincosf(const float x, const bool iscos);
 
 float sinf(const float x) _FLOAT_FUNC_REENTRANT
 {
diff -Nru sdcc-3.1.0+dfsg/device/lib/sinhf.c sdcc-3.2.0+dfsg/device/lib/sinhf.c
--- sdcc-3.1.0+dfsg/device/lib/sinhf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/sinhf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/small/Makefile.in sdcc-3.2.0+dfsg/device/lib/small/Makefile.in
--- sdcc-3.1.0+dfsg/device/lib/small/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/small/Makefile.in	2012-02-10 10:16:50.000000000 +0000
@@ -1,3 +1,5 @@
+# libc/small Makefile
+
 all:
 	$(MAKE) -C ../mcs51 all
 	cp ../mcs51/*.rel .
@@ -7,4 +9,4 @@
 	rm -f *.rel *.sym *.lst *.asm *~ *.lib
 
 distclean: clean
-	rm -f Makefile
\ No newline at end of file
+	rm -f Makefile
diff -Nru sdcc-3.1.0+dfsg/device/lib/sprintf.c sdcc-3.2.0+dfsg/device/lib/sprintf.c
--- sdcc-3.1.0+dfsg/device/lib/sprintf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/sprintf.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/sqrtf.c sdcc-3.2.0+dfsg/device/lib/sqrtf.c
--- sdcc-3.1.0+dfsg/device/lib/sqrtf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/sqrtf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/strxfrm.c sdcc-3.2.0+dfsg/device/lib/strxfrm.c
--- sdcc-3.1.0+dfsg/device/lib/strxfrm.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/strxfrm.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/tancotf.c sdcc-3.2.0+dfsg/device/lib/tancotf.c
--- sdcc-3.1.0+dfsg/device/lib/tancotf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/tancotf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -13,7 +13,7 @@
    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 
+   You should have received a copy of the GNU General Public License
    along with this library; see the file COPYING. If not, write to the
    Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
@@ -35,10 +35,6 @@
 #include <errno.h>
 #include <stdbool.h>
 
-#ifndef BOOL
-#define BOOL _Bool
-#endif
-
 #define P0  0.100000000E+1
 #define P1 -0.958017723E-1
 #define Q0  0.100000000E+1
@@ -54,7 +50,7 @@
 //A reasonable choice for YMAX is the integer part of B**(t/2)*PI/2:
 #define YMAX 6433.0
 
-float tancotf(const float x, const BOOL iscotan)
+float tancotf(const float x, const bool iscotan)
 {
     float f, g, xn, xnum, xden;
     int n;
diff -Nru sdcc-3.1.0+dfsg/device/lib/tanf.c sdcc-3.2.0+dfsg/device/lib/tanf.c
--- sdcc-3.1.0+dfsg/device/lib/tanf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/tanf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
@@ -13,7 +13,7 @@
    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 
+   You should have received a copy of the GNU General Public License
    along with this library; see the file COPYING. If not, write to the
    Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
@@ -31,11 +31,7 @@
 #include <math.h>
 #include <stdbool.h>
 
-#ifndef BOOL
-#define BOOL _Bool
-#endif
-
-float tancotf(const float x, const BOOL iscotan);
+float tancotf(const float x, const bool iscotan);
 
 float tanf(const float x) _FLOAT_FUNC_REENTRANT
 {
diff -Nru sdcc-3.1.0+dfsg/device/lib/tanhf.c sdcc-3.2.0+dfsg/device/lib/tanhf.c
--- sdcc-3.1.0+dfsg/device/lib/tanhf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/tanhf.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/time.c sdcc-3.2.0+dfsg/device/lib/time.c
--- sdcc-3.1.0+dfsg/device/lib/time.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/time.c	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/vprintf.c sdcc-3.2.0+dfsg/device/lib/vprintf.c
--- sdcc-3.1.0+dfsg/device/lib/vprintf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/vprintf.c	2012-03-13 10:17:10.000000000 +0000
@@ -6,7 +6,7 @@
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2.1, or (at your option) any
+   Free Software Foundation; either version 2, or (at your option) any
    later version.
 
    This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/Makefile sdcc-3.2.0+dfsg/device/lib/z180/Makefile
--- sdcc-3.1.0+dfsg/device/lib/z180/Makefile	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/Makefile	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-# libc/z80 Makefile
-
-
-srcdir = .
-top_builddir = ../../..
-
-AR_S            = ar -S
-
-LIB_TYPE        = RANLIB
-
-TOPDIR = ../../..
-
-SCC = $(TOPDIR)/bin/sdcc -mz180
-SAS = $(TOPDIR)/bin/sdasz80
-
-# override PORTDIR defined by super (parent) makefile
-override PORTDIR = ../build/z180
-
-include $(srcdir)/../incl.mk
-
-Z80_FLOAT = $(COMMON_FLOAT)
-
-Z80_INT = $(COMMON_INT)
-
-Z80_LONG = $(COMMON_LONG) \
-  _divulong.c \
-  _mullong.c
-
-Z80_SDCC = $(COMMON_SDCC) \
-  _itoa.c \
-  _ltoa.c \
-  _startup.c \
-  sprintf.c \
-  vprintf.c
-
-Z80SOURCES = $(addprefix ../,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_SDCC))
-Z8OBJECTS = $(patsubst %.c,%.rel,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_SDCC))
-
-OBJ = divunsigned.rel divsigned.rel divmixed.rel modunsigned.rel modsigned.rel modmixed.rel mul.rel mulchar.rel \
-      putchar.rel shift.rel stubs.rel crt0_rle.rel heap.rel fstubs.rel memmove.rel strlen.rel abs.rel crtcall.rel \
-      setjmp.rel
-
-LIB = z180.lib
-CC = $(SCC)
-AS = $(SAS)
-ASFLAGS = -plosgff
-
-CFLAGS = -I$(srcdir)/../../include -I. --std-c99
-
-all: $(PORTDIR)/$(LIB) $(PORTDIR)/crt0.rel
-
-$(PORTDIR)/crt0.rel: crt0.rel
-	cp crt0.rel $(PORTDIR)/crt0.rel
-
-$(PORTDIR)/$(LIB): $(OBJ) $(Z8OBJECTS) Makefile
-ifeq ($(LIB_TYPE), SDCCLIB)
-	rm -f $@; \
-	../../../bin/sdcclib -a $@ $(OBJ) $(Z8OBJECTS)
-else
-  ifeq ($(LIB_TYPE), AR)
-	$(AR_S) -cq $@ $(OBJ) $(Z8OBJECTS)
-  else
-    ifeq ($(LIB_TYPE), RANLIB)
-	$(AR_S) -cq $@ $(OBJ) $(Z8OBJECTS)
-	$(top_builddir)/bin/sdranlib $@
-    else
-	rm -f $@; \
-	for i in $(basename $(OBJ) $(Z8OBJECTS)); do echo $$i >>$@; done
-	cp $(OBJ) $(Z8OBJECTS) $(PORTDIR)
-    endif
-  endif
-endif
-
-%.rel: %.c
-	$(CC) $(CFLAGS) -c $<
-
-%.rel: %.s
-	@# TODO: sdas should place it\'s output in the current dir
-	test $(srcdir) = . || cp $< .
-	-$(AS) $(ASFLAGS) $(notdir $<)
-	test $(srcdir) = . || rm $(notdir $<)
-
-%.rel: ../%.c
-	$(CC) $(CFLAGS) -c $<
-
-clean:
-	rm -f *.rel *.sym *.lst *~ $(CLEANSPEC) *.dump* *.asm *.lib
-
-distclean: clean
-	rm -f Makefile
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/Makefile.in sdcc-3.2.0+dfsg/device/lib/z180/Makefile.in
--- sdcc-3.1.0+dfsg/device/lib/z180/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/Makefile.in	2012-04-02 09:59:13.000000000 +0000
@@ -1,17 +1,13 @@
-# libc/z80 Makefile
+# libc/z180 Makefile
 
 VPATH  = @srcdir@
 srcdir = @srcdir@
 top_builddir = @top_builddir@
 
-AR_S            = @AR@ @AR_S_FLAG@
+LIB_TYPE     = @LIB_TYPE@
 
-LIB_TYPE        = @LIB_TYPE@
-
-TOPDIR = ../../..
-
-SCC = $(TOPDIR)/bin/sdcc -mz180
-SAS = $(TOPDIR)/bin/sdasz80
+SCC = $(top_builddir)/bin/sdcc -mz180
+SAS = $(top_builddir)/bin/sdasz80
 
 # override PORTDIR defined by super (parent) makefile
 override PORTDIR = ../build/z180
@@ -26,6 +22,15 @@
   _divulong.c \
   _mullong.c
 
+Z80_LONGLONG = $(COMMON_LONGLONG) \
+  _rrulonglong.c \
+  _rrslonglong.c \
+  _rlulonglong.c \
+  _rlslonglong.c \
+  _mullonglong.c \
+  _divslonglong.c \
+  _divulonglong.c
+
 Z80_SDCC = $(COMMON_SDCC) \
   _itoa.c \
   _ltoa.c \
@@ -33,8 +38,8 @@
   sprintf.c \
   vprintf.c
 
-Z80SOURCES = $(addprefix ../,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_SDCC))
-Z8OBJECTS = $(patsubst %.c,%.rel,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_SDCC))
+Z80SOURCES = $(addprefix ../,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_LONGLONG) $(Z80_SDCC))
+Z8OBJECTS = $(patsubst %.c,%.rel,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_LONGLONG) $(Z80_SDCC))
 
 OBJ = divunsigned.rel divsigned.rel divmixed.rel modunsigned.rel modsigned.rel modmixed.rel mul.rel mulchar.rel \
       putchar.rel shift.rel stubs.rel crt0_rle.rel heap.rel fstubs.rel memmove.rel strlen.rel abs.rel crtcall.rel \
@@ -55,14 +60,13 @@
 $(PORTDIR)/$(LIB): $(OBJ) $(Z8OBJECTS) Makefile
 ifeq ($(LIB_TYPE), SDCCLIB)
 	rm -f $@; \
-	../../../bin/sdcclib -a $@ $(OBJ) $(Z8OBJECTS)
+	$(top_builddir)/bin/sdcclib -a $@ $(OBJ) $(Z8OBJECTS)
 else
   ifeq ($(LIB_TYPE), AR)
-	$(AR_S) -cq $@ $(OBJ) $(Z8OBJECTS)
+	$(top_builddir)/bin/sdar -rcS $@ $(OBJ) $(Z8OBJECTS)
   else
     ifeq ($(LIB_TYPE), RANLIB)
-	$(AR_S) -cq $@ $(OBJ) $(Z8OBJECTS)
-	$(top_builddir)/bin/sdranlib $@
+	$(top_builddir)/bin/sdar -rc $@ $(OBJ) $(Z8OBJECTS)
     else
 	rm -f $@; \
 	for i in $(basename $(OBJ) $(Z8OBJECTS)); do echo $$i >>$@; done
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/abs.s sdcc-3.2.0+dfsg/device/lib/z180/abs.s
--- sdcc-3.1.0+dfsg/device/lib/z180/abs.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/abs.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/crt0.s sdcc-3.2.0+dfsg/device/lib/z180/crt0.s
--- sdcc-3.1.0+dfsg/device/lib/z180/crt0.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/crt0.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/crt0_rle.s sdcc-3.2.0+dfsg/device/lib/z180/crt0_rle.s
--- sdcc-3.1.0+dfsg/device/lib/z180/crt0_rle.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/crt0_rle.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/crtcall.s sdcc-3.2.0+dfsg/device/lib/z180/crtcall.s
--- sdcc-3.1.0+dfsg/device/lib/z180/crtcall.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/crtcall.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/divmixed.s sdcc-3.2.0+dfsg/device/lib/z180/divmixed.s
--- sdcc-3.1.0+dfsg/device/lib/z180/divmixed.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/divmixed.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/divsigned.s sdcc-3.2.0+dfsg/device/lib/z180/divsigned.s
--- sdcc-3.1.0+dfsg/device/lib/z180/divsigned.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/divsigned.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/divunsigned.s sdcc-3.2.0+dfsg/device/lib/z180/divunsigned.s
--- sdcc-3.1.0+dfsg/device/lib/z180/divunsigned.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/divunsigned.s	2012-03-13 10:17:10.000000000 +0000
@@ -1,11 +1,11 @@
 ;--------------------------------------------------------------------------
 ;  divunsigned.s
 ;
-;  Copyright (C) 2000-2010, Michael Hope, Philipp Klaus Krause, Marco Bodrato
+;  Copyright (C) 2000-2012, Michael Hope, Philipp Klaus Krause, Marco Bodrato
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
@@ -64,19 +64,16 @@
         ;; Exit conditions
         ;;   HL = quotient
         ;;   DE = remainder
-        ;;   If divisor is non-zero, carry=0
-        ;;   If divisor is 0, carry=1 and both quotient and remainder are 0
+        ;;   carry = 0
+        ;;   If divisor is 0, quotient is set to "infinity", i.e HL = 0xFFFF.
         ;;
         ;; Register used: AF,B,DE,HL
 __divuint_rrx_hds::
 __divu16::
-        ;; Check for division by zero
-        ld      a,e
-        or      d
         ;; Two algorithms: one assumes divisor <2^7, the second
         ;; assumes divisor >=2^7; choose the applicable one.
-        and     #0x80
-        jr      NZ,.morethan7bits
+        ld      a,e
+        and     a,#0x80
         or      d
         jr      NZ,.morethan7bits
         ;; Both algorithms "rotate" 24 bits (H,L,A) but roles change.
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/fstubs.s sdcc-3.2.0+dfsg/device/lib/z180/fstubs.s
--- sdcc-3.1.0+dfsg/device/lib/z180/fstubs.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/fstubs.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/heap.s sdcc-3.2.0+dfsg/device/lib/z180/heap.s
--- sdcc-3.1.0+dfsg/device/lib/z180/heap.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/heap.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/memmove.s sdcc-3.2.0+dfsg/device/lib/z180/memmove.s
--- sdcc-3.1.0+dfsg/device/lib/z180/memmove.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/memmove.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/modmixed.s sdcc-3.2.0+dfsg/device/lib/z180/modmixed.s
--- sdcc-3.1.0+dfsg/device/lib/z180/modmixed.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/modmixed.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/modsigned.s sdcc-3.2.0+dfsg/device/lib/z180/modsigned.s
--- sdcc-3.1.0+dfsg/device/lib/z180/modsigned.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/modsigned.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/modunsigned.s sdcc-3.2.0+dfsg/device/lib/z180/modunsigned.s
--- sdcc-3.1.0+dfsg/device/lib/z180/modunsigned.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/modunsigned.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/mul.s sdcc-3.2.0+dfsg/device/lib/z180/mul.s
--- sdcc-3.1.0+dfsg/device/lib/z180/mul.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/mul.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/mulchar.s sdcc-3.2.0+dfsg/device/lib/z180/mulchar.s
--- sdcc-3.1.0+dfsg/device/lib/z180/mulchar.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/mulchar.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/putchar.s sdcc-3.2.0+dfsg/device/lib/z180/putchar.s
--- sdcc-3.1.0+dfsg/device/lib/z180/putchar.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/putchar.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/setjmp.s sdcc-3.2.0+dfsg/device/lib/z180/setjmp.s
--- sdcc-3.1.0+dfsg/device/lib/z180/setjmp.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/setjmp.s	2012-03-13 10:17:10.000000000 +0000
@@ -1,11 +1,11 @@
 ;--------------------------------------------------------------------------
-;  abs.s
+;  setjmp.s
 ;
 ;  Copyright (C) 2011, Philipp Klaus Krause
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
@@ -44,7 +44,6 @@
 	xor	a, a
 	ld	l, a
 	ld	h, a
-	ld	hl, #0
 	add	hl, sp
 	ld	2(iy), l
 	ld	3(iy), h
@@ -84,8 +83,7 @@
 	ld	l, 2(iy)
 	ld	h, 3(iy)
 	ld	sp, hl
-	inc	sp
-	inc	sp
+	pop	hl
 
 	; Move return value into hl.
 	ex	de, hl
@@ -95,4 +93,3 @@
 	ld	b, 1(iy)
 	push	bc
 	ret
-
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/shift.s sdcc-3.2.0+dfsg/device/lib/z180/shift.s
--- sdcc-3.1.0+dfsg/device/lib/z180/shift.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/shift.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/strlen.s sdcc-3.2.0+dfsg/device/lib/z180/strlen.s
--- sdcc-3.1.0+dfsg/device/lib/z180/strlen.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/strlen.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z180/stubs.s sdcc-3.2.0+dfsg/device/lib/z180/stubs.s
--- sdcc-3.1.0+dfsg/device/lib/z180/stubs.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z180/stubs.s	2012-04-02 09:59:13.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
@@ -182,3 +182,5 @@
         ld      a,#5
         rst     0x08
         jp	__rlslong_rrx_s
+
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/Makefile.in sdcc-3.2.0+dfsg/device/lib/z80/Makefile.in
--- sdcc-3.1.0+dfsg/device/lib/z80/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/Makefile.in	2012-04-02 09:59:13.000000000 +0000
@@ -4,14 +4,10 @@
 srcdir = @srcdir@
 top_builddir = @top_builddir@
 
-AR_S            = @AR@ @AR_S_FLAG@
+LIB_TYPE     = @LIB_TYPE@
 
-LIB_TYPE        = @LIB_TYPE@
-
-TOPDIR = ../../..
-
-SCC = $(TOPDIR)/bin/sdcc -mz80
-SAS = $(TOPDIR)/bin/sdasz80
+SCC = $(top_builddir)/bin/sdcc -mz80
+SAS = $(top_builddir)/bin/sdasz80
 
 # override PORTDIR defined by super (parent) makefile
 override PORTDIR = ../build/z80
@@ -26,6 +22,15 @@
   _divulong.c \
   _mullong.c
 
+Z80_LONGLONG = $(COMMON_LONGLONG) \
+  _rrulonglong.c \
+  _rrslonglong.c \
+  _rlulonglong.c \
+  _rlslonglong.c \
+  _mullonglong.c \
+  _divslonglong.c \
+  _divulonglong.c
+
 Z80_SDCC = $(COMMON_SDCC) \
   _itoa.c \
   _ltoa.c \
@@ -33,8 +38,8 @@
   sprintf.c \
   vprintf.c
 
-Z80SOURCES = $(addprefix ../,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_SDCC))
-Z8OBJECTS = $(patsubst %.c,%.rel,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_SDCC))
+Z80SOURCES = $(addprefix ../,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_LONGLONG) $(Z80_SDCC))
+Z8OBJECTS = $(patsubst %.c,%.rel,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_LONGLONG) $(Z80_SDCC))
 
 OBJ = divunsigned.rel divsigned.rel divmixed.rel modunsigned.rel modsigned.rel modmixed.rel mul.rel mulchar.rel \
       putchar.rel shift.rel stubs.rel crt0_rle.rel heap.rel fstubs.rel memmove.rel strlen.rel abs.rel crtcall.rel \
@@ -55,14 +60,13 @@
 $(PORTDIR)/$(LIB): $(OBJ) $(Z8OBJECTS) Makefile
 ifeq ($(LIB_TYPE), SDCCLIB)
 	rm -f $@; \
-	../../../bin/sdcclib -a $@ $(OBJ) $(Z8OBJECTS)
+	$(top_builddir)/bin/sdcclib -a $@ $(OBJ) $(Z8OBJECTS)
 else
   ifeq ($(LIB_TYPE), AR)
-	$(AR_S) -cq $@ $(OBJ) $(Z8OBJECTS)
+	$(top_builddir)/bin/sdar -rcS $@ $(OBJ) $(Z8OBJECTS)
   else
     ifeq ($(LIB_TYPE), RANLIB)
-	$(AR_S) -cq $@ $(OBJ) $(Z8OBJECTS)
-	$(top_builddir)/bin/sdranlib $@
+	$(top_builddir)/bin/sdar -rc $@ $(OBJ) $(Z8OBJECTS)
     else
 	rm -f $@; \
 	for i in $(basename $(OBJ) $(Z8OBJECTS)); do echo $$i >>$@; done
@@ -88,3 +92,4 @@
 
 distclean: clean
 	rm -f Makefile
+
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/abs.s sdcc-3.2.0+dfsg/device/lib/z80/abs.s
--- sdcc-3.1.0+dfsg/device/lib/z80/abs.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/abs.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/crt0.s sdcc-3.2.0+dfsg/device/lib/z80/crt0.s
--- sdcc-3.1.0+dfsg/device/lib/z80/crt0.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/crt0.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/crt0_rle.s sdcc-3.2.0+dfsg/device/lib/z80/crt0_rle.s
--- sdcc-3.1.0+dfsg/device/lib/z80/crt0_rle.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/crt0_rle.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/crtcall.s sdcc-3.2.0+dfsg/device/lib/z80/crtcall.s
--- sdcc-3.1.0+dfsg/device/lib/z80/crtcall.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/crtcall.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/divmixed.s sdcc-3.2.0+dfsg/device/lib/z80/divmixed.s
--- sdcc-3.1.0+dfsg/device/lib/z80/divmixed.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/divmixed.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/divsigned.s sdcc-3.2.0+dfsg/device/lib/z80/divsigned.s
--- sdcc-3.1.0+dfsg/device/lib/z80/divsigned.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/divsigned.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/divunsigned.s sdcc-3.2.0+dfsg/device/lib/z80/divunsigned.s
--- sdcc-3.1.0+dfsg/device/lib/z80/divunsigned.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/divunsigned.s	2012-03-13 10:17:10.000000000 +0000
@@ -1,11 +1,11 @@
 ;--------------------------------------------------------------------------
 ;  divunsigned.s
 ;
-;  Copyright (C) 2000-2010, Michael Hope, Philipp Klaus Krause, Marco Bodrato
+;  Copyright (C) 2000-2012, Michael Hope, Philipp Klaus Krause, Marco Bodrato
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
@@ -64,20 +64,17 @@
         ;; Exit conditions
         ;;   HL = quotient
         ;;   DE = remainder
-        ;;   If divisor is non-zero, carry=0
-        ;;   If divisor is 0, carry=1 and both quotient and remainder are 0
+        ;;   carry = 0
+        ;;   If divisor is 0, quotient is set to "infinity", i.e HL = 0xFFFF.
         ;;
         ;; Register used: AF,B,DE,HL
 __divuint_rrx_hds::
 __divu16::
-        ;; Check for division by zero
-        ld      a,e
-        or      d
         ;; Two algorithms: one assumes divisor <2^7, the second
         ;; assumes divisor >=2^7; choose the applicable one.
-        and     #0x80
-        jr      NZ,.morethan7bits
-        or      d
+        ld      a,e
+        and     a,#0x80
+        or      a,d
         jr      NZ,.morethan7bits
         ;; Both algorithms "rotate" 24 bits (H,L,A) but roles change.
 
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/fstubs.s sdcc-3.2.0+dfsg/device/lib/z80/fstubs.s
--- sdcc-3.1.0+dfsg/device/lib/z80/fstubs.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/fstubs.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/heap.s sdcc-3.2.0+dfsg/device/lib/z80/heap.s
--- sdcc-3.1.0+dfsg/device/lib/z80/heap.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/heap.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/memmove.s sdcc-3.2.0+dfsg/device/lib/z80/memmove.s
--- sdcc-3.1.0+dfsg/device/lib/z80/memmove.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/memmove.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/modmixed.s sdcc-3.2.0+dfsg/device/lib/z80/modmixed.s
--- sdcc-3.1.0+dfsg/device/lib/z80/modmixed.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/modmixed.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/modsigned.s sdcc-3.2.0+dfsg/device/lib/z80/modsigned.s
--- sdcc-3.1.0+dfsg/device/lib/z80/modsigned.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/modsigned.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/modunsigned.s sdcc-3.2.0+dfsg/device/lib/z80/modunsigned.s
--- sdcc-3.1.0+dfsg/device/lib/z80/modunsigned.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/modunsigned.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/mul.s sdcc-3.2.0+dfsg/device/lib/z80/mul.s
--- sdcc-3.1.0+dfsg/device/lib/z80/mul.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/mul.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/mulchar.s sdcc-3.2.0+dfsg/device/lib/z80/mulchar.s
--- sdcc-3.1.0+dfsg/device/lib/z80/mulchar.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/mulchar.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/putchar.s sdcc-3.2.0+dfsg/device/lib/z80/putchar.s
--- sdcc-3.1.0+dfsg/device/lib/z80/putchar.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/putchar.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/setjmp.s sdcc-3.2.0+dfsg/device/lib/z80/setjmp.s
--- sdcc-3.1.0+dfsg/device/lib/z80/setjmp.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/setjmp.s	2012-03-13 10:17:10.000000000 +0000
@@ -1,11 +1,11 @@
 ;--------------------------------------------------------------------------
-;  abs.s
+;  setjmp.s
 ;
 ;  Copyright (C) 2011, Philipp Klaus Krause
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
@@ -44,7 +44,6 @@
 	xor	a, a
 	ld	l, a
 	ld	h, a
-	ld	hl, #0
 	add	hl, sp
 	ld	2(iy), l
 	ld	3(iy), h
@@ -84,8 +83,7 @@
 	ld	l, 2(iy)
 	ld	h, 3(iy)
 	ld	sp, hl
-	inc	sp
-	inc	sp
+	pop	hl
 
 	; Move return value into hl.
 	ex	de, hl
@@ -95,4 +93,3 @@
 	ld	b, 1(iy)
 	push	bc
 	ret
-
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/shift.s sdcc-3.2.0+dfsg/device/lib/z80/shift.s
--- sdcc-3.1.0+dfsg/device/lib/z80/shift.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/shift.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/strlen.s sdcc-3.2.0+dfsg/device/lib/z80/strlen.s
--- sdcc-3.1.0+dfsg/device/lib/z80/strlen.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/strlen.s	2012-03-13 10:17:10.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
diff -Nru sdcc-3.1.0+dfsg/device/lib/z80/stubs.s sdcc-3.2.0+dfsg/device/lib/z80/stubs.s
--- sdcc-3.1.0+dfsg/device/lib/z80/stubs.s	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/device/lib/z80/stubs.s	2012-04-02 09:59:13.000000000 +0000
@@ -5,7 +5,7 @@
 ;
 ;  This library is free software; you can redistribute it and/or modify it
 ;  under the terms of the GNU General Public License as published by the
-;  Free Software Foundation; either version 2.1, or (at your option) any
+;  Free Software Foundation; either version 2, or (at your option) any
 ;  later version.
 ;
 ;  This library is distributed in the hope that it will be useful,
@@ -182,3 +182,5 @@
         ld      a,#5
         rst     0x08
         jp	__rlslong_rrx_s
+
+
diff -Nru sdcc-3.1.0+dfsg/doc/INSTALL.txt sdcc-3.2.0+dfsg/doc/INSTALL.txt
--- sdcc-3.1.0+dfsg/doc/INSTALL.txt	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/doc/INSTALL.txt	2012-06-01 17:44:12.000000000 +0000
@@ -10,7 +10,7 @@
     cd ~
     mkdir tmp
     cd tmp
-    tar xjf path/to/binary/kit/sdcc-3.1.0-i386-unknown-linux2.5.tar.bz2
+    tar xjf path/to/binary/kit/sdcc-3.2.0-i386-unknown-linux2.5.tar.bz2
 
 * Change to the sdcc directory and copy all files to /usr/local
     cd sdcc
@@ -30,7 +30,7 @@
 
 Even if the default search paths look into /usr/local, sdcc is fully
 relocatable. Try `sdcc --print-search-dirs` if you have problems with header
-or library files. See sdccman.[txt|pdf|html] for more detailed information.
+or library files. See sdccman.pdf for more detailed information.
 
 
 For Windows 9X/NT/2000/XP users:
@@ -39,7 +39,7 @@
 
 * If you would like to keep a copy of your previous version,
   rename the directory where it's installed first
-* Run sdcc-3.1.0-setup.exe
+* Run sdcc-3.2.0-setup.exe
 
 By default this will install sdcc binaries into: C:\Program Files\SDCC\bin\
 header files into:                               C:\Program Files\SDCC\include\
@@ -54,8 +54,8 @@
 This should return sdcc's version number.
 
 sdcc for win32 is fully relocatable. Try `sdcc --print-search-dirs` if you
-have problems with header or library files. See sdccman.[txt|pdf|html] for
-more detailed information.
+have problems with header or library files. See sdccman.pdf for more
+detailed information.
 
 
 For Mac OS X users:
@@ -67,7 +67,7 @@
     cd ~
     mkdir tmp
     cd tmp
-    tar xjf path/to/binary/kit/sdcc-3.1.0-universal-apple-macosx.tar.bz2
+    tar xjf path/to/binary/kit/sdcc-3.2.0-universal-apple-macosx.tar.bz2
 
 * Change to the sdcc directory and copy all files to /Developer/sdcc
     cp -r sdcc /Developer/sdcc
@@ -86,4 +86,4 @@
 
 Even if the default search paths look into /usr/local, sdcc is fully
 relocatable. Try `sdcc --print-search-dirs` if you have problems with header
-or library files. See sdccman.[txt|pdf|html] for more detailed information.
+or library files. See sdccman.pdf for more detailed information.
diff -Nru sdcc-3.1.0+dfsg/doc/Makefile.in sdcc-3.2.0+dfsg/doc/Makefile.in
--- sdcc-3.1.0+dfsg/doc/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/doc/Makefile.in	2012-03-12 13:19:06.000000000 +0000
@@ -7,13 +7,14 @@
 MAKEINDEX  = @MAKEINDEX@
 PDFOPT     = @PDFOPT@
 
-QUIET	   = >/dev/null 2>/dev/null
+QUIET      = >/dev/null 2>/dev/null
 
 include ../Makefile.common
 
 MANUAL = sdccman
 
-all: $(MANUAL).pdf $(MANUAL).html/index.html $(MANUAL).txt
+#all: $(MANUAL).pdf $(MANUAL).html/index.html $(MANUAL).txt
+all: $(MANUAL).pdf
 
 install:
 	$(INSTALL) -d $(DESTDIR)$(docdir)
diff -Nru sdcc-3.1.0+dfsg/doc/README.txt sdcc-3.2.0+dfsg/doc/README.txt
--- sdcc-3.1.0+dfsg/doc/README.txt	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/doc/README.txt	2012-06-01 17:44:12.000000000 +0000
@@ -1,13 +1,14 @@
 SDCC - free open source, retargettable, optimizing ANSI-C compiler
 ------------------------------------------------------------------
 
-SDCC 3.1.0 release is dedicated to the memory of Dennis M. Ritchie,
-father of the C programming language.
-
-Welcome to SDCC, free open source, retargettable, optimizing ANSI C compiler
-that supports a growing list of processors including the Intel 8051,
-Maxim 80DS390, Zilog Z80, Z180, Rabbit 2000, Motorola 68HC08 and the
-PIC16 and PIC18 familiy.
+Welcome to SDCC, free open source, retargettable, optimizing ANSI C
+compiler suite that targets a growing list of processors including the
+Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim
+(formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) HC08
+based (hc08, s08) and Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit
+2000/3000, Rabbit 3000A). Work is in progress on supporting the
+Microchip PIC16 and PIC18 targets. It can be retargeted for other
+microprocessors.
 
 See share/sdcc/doc/INSTALL.txt for the installation instructions for
 the binary kits.
@@ -17,44 +18,65 @@
 See http://sdcc.sourceforge.net/ for the latest information on sdcc.
 
 
-License:
-SDCC is licensed under the GNU Public license (GPL) v2.  Note that
-this license covers the code to the compiler and other executables,
-but explicitly does not cover any code or objects generated by sdcc.
-We have not yet decided on a license for the run time libraries, but
-it will not put any requirements on code linked against it. See:
+Licenses:
+~~~~~~~~~
+SDCC compiler suite is a collection of several components derived from
+different sources with different FOSS licenses. See the sdccman.pdf
+document, chapter "SDCC Suite Licenses" for details.
+
+The code or object files generated by SDCC suite are not licensed, so
+they can be used in FLOSS or proprietary (closed source) applications.
+
+The great majority of sdcc run-time libraries are licensed under the
+GPLv2+LE which allows linking of sdcc run time libraries with
+proprietary (closed source) applications.
+
+Exception are pic device libraries and header files which are derived
+from Microchip header (.inc) and linker script (.lkr) files. Microchip
+requires that "The header files should state that they are only to be
+used with authentic Microchip devices" which makes them incompatible
+with the GPL. Pic device libraries and header files are located at
+non-free/lib and non-free/include directories respectively. Sdcc should
+be run with the --use-non-free command line option in order to include
+non-free header files and libraries.
+
+See:
 
  http://www.gnu.org/copyleft/gpl.html
 
+ http://sourceforge.net/apps/trac/sdcc/wiki/SDCC%20Library%20Licenses
+
 
 Support:
-SDCC is a collaborative effort between a group of volunteers.  Please
-feel free to report bugs via the Sourceforge bug tracker, or to ask
-questions on the user mailing list.  See:
+~~~~~~~~
+SDCC compiler suite is a collaborative effort between a group of
+volunteers. Please feel free to report bugs via the Sourceforge bug
+tracker, or to ask questions on the user mailing list. See:
 
  http://sourceforge.net/tracker/?atid=100599&group_id=599&func=browse
 
  http://sourceforge.net/mail/?group_id=599
 
-
 Notes:
 * The ds400, pic14 and pic16 are currently experimental, but work is in
 progress. Please check http://sdcc.sourceforge.net/snap.php for snapshots.
-* The TININative, gbz80, avr and xa51 targets are no longer maintained.
+* The TININative, avr and xa51 targets are no longer maintained.
+
 
 Roadmap:
-COPYING         - GPL v2
-as/             - Assembler, derived from asxxxx
-debugger/
-device/         - Device libraries and examples
-doc/            - sdcc and target specific documentation
-link/           - Linker, also derived from asxxxx
-sim/            - Simulator (mcs51 only)
-src/            - Source to the C compiler and targets
-support/        - Libraries and apps that may not be provided by your system.
+~~~~~~~~
+COPYING    - GPL v2
+debugger/  - sdcdb debugger
+device/    - Device libraries and examples
+doc/       - sdcc and target specific documentation
+sdas/      - Assemblers and linkers, derived from asxxxx
+sim/       - ucsim simulator
+src/       - Source to the C compiler and targets
+support/   - Libraries and apps that may not be provided by your system.
 
 
 Authors and interested persons:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 * Sandeep Dutta (sandeep AT users.sourceforge.net)
 
 * Jean Loius-VERN      <jlvern AT writeme.com>
@@ -79,9 +101,9 @@
 * Leland Morrison      <enigmalee.AT.sourceforget.net>
 
 SDCC includes code from:
-* Alan Baldwin      <baldwin AT shop-pdp.kent.edu>
+* Alan Baldwin <baldwin AT shop-pdp.kent.edu>
    Initial version of ASXXXX and  ASLINK. 
-* John Hartman      <noice AT noicedebugger.com>
+* John Hartman <noice AT noicedebugger.com>
    Porting ASXXXX and ASLINK for 8051.
 * Dmitry S. Obukhov <dso AT usa.net>
    malloc and serial I/O routines.
@@ -89,4 +111,13 @@
    Some of the Z80 related files are borrowed from the Gameboy
    Development Kit (GBDK).
 * The GCC development team http://gcc.gnu.org/
-   The basis of sdcpp preprocessor
+   for GNU C preprocessor, the basis of sdcpp preprocessor and
+   gcc test suite, partially included into the SDCC regression test suite
+* The GNU Binutils development team http://www.gnu.org/software/binutils/
+   for GNU Binutils, the basis of sdbinutils
+* Boost Community http://www.boost.org/
+   for Boost C++ libraries used in sdcc compiler
+* Timo Bingmann http://idlebox.net/2007/stx-btree/
+   for TX B+ Tree C++ Template Classes used in sdcc compiler
+* Malini Dutta <malini AT mediaone.net>
+   Sandeep's wife, for her patience and support.
diff -Nru sdcc-3.1.0+dfsg/doc/TININative.txt sdcc-3.2.0+dfsg/doc/TININative.txt
--- sdcc-3.1.0+dfsg/doc/TININative.txt	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/doc/TININative.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,171 +0,0 @@
-Using SDCC to develop Native Java functions
--------------------------------------------
-
-Prerequisites
---------------
-
-1) Download the latest compiler sources from http://sdcc.sourceforge.net (Subversion download), build & 
-   install the compiler.
-2) Download & install tini development kit. SDCC uses 'a390' assembler to generate Native libraries,
-   it is NOT distributed with the compiler. Tested with Version 1.02d.
-
-
-Small Example
--------------
-
-Hello.java :-
-
-import com.dalsemi.comm.*;
-import com.dalsemi.system.*;
-
-public class Hello
-{
-	public static native int method1(int i,int j);    
-	static void main(String args[])
-	{	
-		System.out.println("Hello Started");
-		try {
-		    System.loadLibrary("myn.tlib");
-		    System.out.println("Load Success");       
-		    System.out.println("Native method1 returned " + method1(200,100));	    
-		} 
-		catch (Throwable t) {
-		      System.out.println(t);
-		}
-	}
-}
-
-myn.c :-
-
-long Native_method1() _JavaNative
-{
-    long l = NatLib_LoadInt(0);
-    long k = NatLib_LoadInt(1);
-    return l-k;
-}
-
-Before you start compiling make sure
-a) 'macro' & 'a390' are in the PATH
-b) The files tini.inc, ds80c390.inc, tinimacro.inc & apiequ.inc are in the SAME directory as
-   the C file.
-
-> javac -bootclasspath <path to>/tiniclasses.jar Hello.java
-> java -cp <path to>/tini.jar TINIConvertor -f Hello.class -o Hello.tini -d <path to>/tini.db
-> sdcc -mTININative myn.c
-
-Load Hello.tini & myn.tlib into the TINI board then
-
-TINI /> java Hello.tini
-Hello Started
-Load Success
-Native method1 returned 100
-
-TINI />
-
-Details you MUST know
----------------------
-SDCC has a completely different and incompatible parameter passing and register usage
-than the TINI java environment. The Native API has been implemented using the __builtin, 
-or intrinsic function support in SDCC . Each of the Native API functions are mapped to an 
-SDCC intrinsic function, the code generator for the intrinsic function takes care of mapping 
-the registers and parameters to the TINI Java environment's expectations .
-
-The _JavaNative keyword is used to map the return value from a Native function to R4:R0, by 
-default SDCC uses DPTR:b:a to return a value.
-
-	Type Mapping
-	------------
-
-	SDCC can support types that are upto 4 bytes (32 bits).
-
-	Java				SDCC
-	----				----
-	char				char
-	short				short/int
-	int				long
-	long				NOT SUPPORTED
-	double				NOT SUPPORTED
-
-	_bpx & _ap
-	---------
-	SDCC requires a 16 bit frame pointer to access local variables (on the stack), and
-	function parameters . In the TININative environment _bpx is mapped to R7_B3:R6_B3 
-	(register R7:R6 in bank3). The compiler also uses AP as a temp register, for the
-	TINI environment this is mapped to R5_B3.
-
-Limitations
------------
-
-The TININative environment does not have a linker. Multiplication & Division of 16 & 32 bit
-numbers are implemented in SDCC as library functions this implies that , division & multiplication
-of these numbers are not supported in the TININative environment. The compiler transforms div/mul by
-power of 2 to shifts . For other mul/divs there are two ways around .
-
-a) Copy the library function from the library to your code . The sources can be found in
-   sdcc/device/lib.
-b) Use the --use-accelerator option, with this option the compiler will generate code to use
-   the on-chip arithmetic accelerator for 16 bit multiplication & division & modulus. 
-   NOTE The compiler will disable interrupts during this operation to prevent corruption of
-	MA & MB registers. MUL/DIV/MOD of unsigned quantities are more efficient than signed
-	quantities.
-
-API Mappings
-------------
-As mentioned earlier the Native APIs are implemented using compiler intrinsic functions, at this
-time only the following functions have been mapped (more will be mapped in the future). Some
-Native API calls return multiple values, I haven't found a good way to handle this yet, in most
-cases these return a HANDLE and a pointer to ABSOLUTE memory in DPTR, in such cases SDCC will
-return ONLY the HANDLE and ignore the POINTER value. The HANDLE can then be used with MM_Deref to
-obtain the POINTER value again (I hope my assumption is correct here).
-
-SDCC Prototype					   Native API
---------------					   ----------
-char NatLib_LoadByte (char parmnum);		   NatLib_LoadPrimitive
-int  NatLib_LoadShort(char parmnum);		   NatLib_LoadPrimitive
-long NatLib_LoadInt  (char parmnum);		   NatLib_LoadPrimitive
-char *NatLib_LoadPointer (char parmnum);	   NatLib_LoadPointer
-
-/* in the following cases the compiler will fill in the pointer to LibraryID when required*/
-/* NatLib_Get* return mutiple values return value is HANDLE , pointer is ignored */
-  
-char NatLib_InstallImmutableStateBlock(void *state_block,int handle);
-					           NatLib_InstallImmutableStateBlock
-char NatLib_InstallEphemeralStateBlock(void *state_block,int handle);
-					           NatLib_InstallEphemeralStateBlock
-void NatLib_RemoveImmutableStateBlock ();	   NatLib_RemoveImmutableStateBlock
-void NatLib_RemoveEphemeralStateBlock ();	   NatLib_RemoveEphemeralStateBlock
-int  NatLib_GetImmutableStateBlock();              NatLib_GetImmutableStateBlock
-int  NatLib_GetEphemeralStateBlock();              NatLib_GetEphemeralStateBlock
-
-int MM_XMalloc (long size);			   MM_XMalloc	/* returns HANDLE */
-int MM_Malloc (int size);			   MM_Malloc    /* return HANDLE  */
-int MM_ApplicationMalloc ( int size );		   MM_ApplicationMalloc /* returns HANDLE */
-int MM_Free (int handle);			   MM_Free
-char *MM_Deref (int handle);			   MM_Deref
-char MM_UnrestrictedPersist(int handle);           MM_UnrestrictedPersist
-
-char System_ExecJavaProcess(char *image,int handle-to-processname)
-						   System_ExecJavaProcess
-void System_GetRTCRegisters(char *regsavearea)     System_GetRTCRegisters
-void System_SetRTCRegisters(char *regsavearea)     System_SetRTCRegisters
-void System_ThreadSleep(long timeout)              System_ThreadSleep
-void System_ThreadSleep_ExitCriticalSection(long timeout)              System_ThreadSleep_ExitCriticalSection
-void System_ThreadResume(char threadid,char processid)		       System_ThreadResume
-void System_SaveJavaThreadState()                  System_SaveJavaThreadState
-void System_RestoreJavaThreadState()               System_RestoreJavaThreadState
-void System_ProcessSleep(long timeout)             System_ProcessSleep
-void System_ProcessSleep_ExitCriticalSection(long timeout)             System_ProcessSleep_ExitCriticalSection
-void System_ProcessYield()                         System_ProcessYield
-void System_ProcessSuspend()                       System_ProcessSuspend
-void System_ProcessResume(char processid)          System_ProcessResume
-char System_RegisterPoll((void *)(funcpointer)())  System_RegisterPoll
-char System_RemovePoll((void *)(funcpointer)())    System_RemovePoll
-char System_GetCurrentThreadId()		   System_GetCurrentThreadId
-char System_GetCurrentProcessId()		   System_GetCurrentProcessId
-
-
-Some Notes
-----------
-
-The register convention mapping causes a lot of push & pops to be generated. 
-The source for the built in functions can be found in file src/ds390/gen.c.
\ No newline at end of file
diff -Nru sdcc-3.1.0+dfsg/doc/sdccman.lyx sdcc-3.2.0+dfsg/doc/sdccman.lyx
--- sdcc-3.1.0+dfsg/doc/sdccman.lyx	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/doc/sdccman.lyx	2012-06-18 07:51:00.000000000 +0000
@@ -1,9 +1,17 @@
-#LyX 1.6.5 created this file. For more info see http://www.lyx.org/
+#LyX 1.6.10 created this file. For more info see http://www.lyx.org/
 \lyxformat 345
 \begin_document
 \begin_header
 \textclass book
 \begin_preamble
+% Added by lyx2lyx
+%  for proper underlining
+\PassOptionsToPackage{normalem}{ulem}
+\usepackage{ulem}
+\let\cite@rig\cite
+\newcommand{\b@xcite}[2][\%]{\def\def@pt{\%}\def\pas@pt{#1}
+  \mbox{\ifx\def@pt\pas@pt\cite@rig{#2}\else\cite@rig[#1]{#2}\fi}}
+\renewcommand{\underbar}[1]{{\let\cite\b@xcite\uline{#1}}}
 \pdfoptionpdfminorversion=3
 \usepackage[
   pdftitle={SDCC Compiler User Guide},
@@ -117,17 +125,17 @@
 \begin_layout Date
 
 \size normal
-SDCC 3.1.0
+SDCC 3.2.0
 \size footnotesize
 
 \begin_inset Newline newline
 \end_inset
 
-$Date:: 2011-11-13 #$ 
+$Date:: 2012-06-18 #$ 
 \begin_inset Newline newline
 \end_inset
 
-$Revision: 7037 $
+$Revision: 7931 $
 \end_layout
 
 \begin_layout Standard
@@ -182,7 +190,7 @@
 C
 \emph default
 ompiler) is free open source, retargettable, optimizing ANSI-C compiler
- by 
+ suite by 
 \series bold
 Sandeep Dutta
 \series default
@@ -198,13 +206,14 @@
 
 \end_inset
 
-, etc.), Dallas DS80C390 variants, Freescale (formerly Motorola) HC08 and
- Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000
+, etc.), Dallas DS80C390 variants, Freescale (formerly Motorola) HC08 based
+ (hc08, s08) and Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000,
+ Rabbit 3000A
 \begin_inset Index
-status open
+status collapsed
 
 \begin_layout Plain Layout
-Z80, Z180, GBZ80, Rabbit 2000/3000 CPU
+Z80, Z180, GBZ80, Rabbit 2000/3000, Rabbit 3000A CPU
 \end_layout
 
 \end_inset
@@ -245,8 +254,19 @@
 Warning: Large parts of this manual apply to the mc51 port only
 \emph default
 .
- Further information on the z80, z180, r2k and gbz80 ports and standard
- compliance can be found in the sdcc wiki.
+ Further information on the z80, z180, r2k, r3ka and gbz80 ports and standard
+ compliance can be found in the sdcc wiki 
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://sourceforge.net/apps/trac/sdcc/
+\end_layout
+
+\end_inset
+
+.
 \begin_inset Newline newline
 \end_inset
 
@@ -290,7 +310,6 @@
 \begin_layout Standard
 For the back-end SDCC uses a global register allocation scheme which should
  be well suited for other 8 bit MCUs.
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -300,7 +319,6 @@
 
 The peep hole optimizer uses a rule based substitution mechanism which is
  MCU independent.
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -309,6 +327,10 @@
 \end_inset
 
 Supported data-types are:
+\begin_inset Newline newline
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
@@ -609,10 +631,11 @@
 \begin_layout Plain Layout
 long long
 \begin_inset Foot
-status open
+status collapsed
 
 \begin_layout Plain Layout
-only supported in the z80, z180, r2k and gbz80 ports as of sdcc 3.1.0
+only supported in the hc08, s08, z80, z180, r2k, r3ka and gbz80 ports as
+ of sdcc 3.2.0
 \end_layout
 
 \end_inset
@@ -799,7 +822,6 @@
 -cyclomatic) to report the relative complexity of a function.
  These functions can then be further optimized, or hand coded in assembly
  if needed.
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -859,54 +881,413 @@
 \end_layout
 
 \begin_layout Section
-Open Source
+SDCC Suite Licenses
 \end_layout
 
 \begin_layout Standard
-All packages used in this compiler system are 
-\emph on
-free open source
-\emph default
-; source code for all the sub-packages (pre-processor, assemblers, linkers
- etc.) is distributed with the package.
- This documentation is maintained using a free open source word processor
- (LyX).
+SDCC suite is a collection of several components derived from different
+ sources with different licenses:
+\end_layout
+
+\begin_layout Itemize
+executables:
+\end_layout
+
+\begin_deeper
+\begin_layout Itemize
+sdcc compiler:
 \begin_inset Newline newline
 \end_inset
 
-This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License
+sdcc compiler is licensed under the GPLv2.
+\begin_inset Newline newline
+\end_inset
+
+The code or object files generated by SDCC suite are not licensed, so they
+ can be used in FLOSS or proprietary (closed source) applications.
+\end_layout
+
+\begin_layout Itemize
+sdcpp preprocessor:
+\begin_inset Newline newline
+\end_inset
+
+derived from GCC cpp preprocessor 
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://gcc.gnu.org/
+\end_layout
+
+\end_inset
+
+; GPLv3 license
+\end_layout
+
+\begin_layout Itemize
+sdas assemblers and sdld linker:
+\begin_inset Newline newline
+\end_inset
+
+derived from ASXXXX 
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://shop-pdp.kent.edu/ashtml/asxxxx.htm
+\end_layout
+
+\end_inset
+
+; GPLv3 license
+\end_layout
+
+\begin_layout Itemize
+SDCC run-time libraries:
+\begin_inset Newline newline
+\end_inset
+
+The great majority of SDCC run-time libraries are licensed under the GPLv2+LE
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-GNU General Public License, GPL
+GPLv2+LE
 \end_layout
 
 \end_inset
 
- as published by the Free Software Foundation; either version 2, or (at
- your option) any later version.
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty
+ which allows linking of SDCC run-time libraries with proprietary (closed
+ source) applications.
+\begin_inset Newline newline
+\end_inset
+
+Exception are pic device libraries and header files which are derived from
+ Microchip header (.inc) and linker script (.lkr) files.
+ Microchip requires that "The header files should state that they are only
+ to be used with authentic Microchip devices" which makes them incompatible
+ with the GPL.
+ Pic device libraries and header files are located at non-free/lib and non-free/
+include directories respectively.
+ Sdcc should be run with the 
+\series bold
+-
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+/
+\end_layout
+
+\end_inset
+
+-
+\series default
+use-non-free
+\series bold
+
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-warranty
+-
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+/
+\end_layout
+
+\end_inset
+
+-use-non-free
+\end_layout
+
+\end_inset
+
+
+\series default
+ command line option in order to include non-free header files and libraries.
+ 
+\end_layout
+
+\begin_layout Itemize
+sdbinutils utilities (sdar, sdranlib, sdnm):
+\begin_inset Newline newline
+\end_inset
+
+derived from GNU Binutils 
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://www.gnu.org/software/binutils/
+\end_layout
+
+\end_inset
+
+; GPLv3 license
+\end_layout
+
+\begin_layout Itemize
+sdcclib librarian:
+\begin_inset Newline newline
+\end_inset
+
+GPLv2 license
+\end_layout
+
+\begin_layout Itemize
+ucsim simulators:
+\begin_inset Newline newline
+\end_inset
+
+GPLv2 license
+\end_layout
+
+\begin_layout Itemize
+sdcdb debugger:
+\begin_inset Newline newline
+\end_inset
+
+GPLv2 license
+\end_layout
+
+\begin_layout Itemize
+gcc-test regression tests:
+\begin_inset Newline newline
+\end_inset
+
+derived from gcc-testsuite; no license explicitely specified, but since
+ it is a part of GCC is probably GPLv3 licensed
 \end_layout
 
+\begin_layout Itemize
+packihx:
+\begin_inset Newline newline
 \end_inset
 
- of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, 59 Temple
- Place - Suite 330, Boston, MA 02111-1307, USA.
- In other words, you are welcome to use, share and improve this program.
- You are forbidden to forbid anyone else to use, share and improve what
- you give them.
- Help stamp out software-hoarding! 
+public domain
+\end_layout
+
+\begin_layout Itemize
+makebin:
+\begin_inset Newline newline
+\end_inset
+
+zlib/libpng License
+\end_layout
+
+\end_deeper
+\begin_layout Itemize
+libraries:
+\end_layout
+
+\begin_deeper
+\begin_layout Itemize
+dbuf library:
+\begin_inset Newline newline
+\end_inset
+
+zlib/libpng License
+\end_layout
+
+\begin_layout Itemize
+Boost C++ libraries:
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://www.boost.org/
+\end_layout
+
+\end_inset
+
+; Boost Software License 1.0 (BSL-1.0)
+\end_layout
+
+\begin_layout Itemize
+STX B+ Tree C++ Template Classes:
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://idlebox.net/2007/stx-btree/
+\end_layout
+
+\end_inset
+
+; LGPLv2.1
+\end_layout
+
+\end_deeper
+\begin_layout Standard
+Links to licenses:
+\end_layout
+
+\begin_layout Itemize
+GPLv2 license
+\begin_inset Index
+status collapsed
+
+\begin_layout Plain Layout
+GPLv2 license
+\end_layout
+
+\end_inset
+
+: 
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
+LGPLv2.1 license
+\begin_inset Index
+status collapsed
+
+\begin_layout Plain Layout
+LGPLv2.1 license
+\end_layout
+
+\end_inset
+
+: 
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
+GPLv3 license
+\begin_inset Index
+status collapsed
+
+\begin_layout Plain Layout
+GPLv3 license
+\end_layout
+
+\end_inset
+
+: 
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://www.gnu.org/licenses/gpl.html
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
+zlib/libpng License
+\begin_inset Index
+status collapsed
+
+\begin_layout Plain Layout
+zlib/libpng License
+\end_layout
+
+\end_inset
+
+: 
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://www.opensource.org/licenses/Zlib
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
+Boost Software License 1.0 (BSL-1.0)
+\begin_inset Index
+status collapsed
+
+\begin_layout Plain Layout
+Boost Software License 1.0 (BSL-1.0)
+\end_layout
+
+\end_inset
+
+: 
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://www.opensource.org/licenses/BSL-1.0
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Section
+Documentation
+\end_layout
+
+\begin_layout Standard
+This documentation is maintained using a free open source word processor
+ (LyX) 
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://www.lyx.org/
+\end_layout
+
+\end_inset
+
+.
 \end_layout
 
 \begin_layout Section
@@ -998,10 +1379,6 @@
 \end_inset
 
 
-\begin_inset Newline newline
-\end_inset
-
-
 \end_layout
 
 \begin_layout Itemize
@@ -1619,20 +1996,7 @@
 status collapsed
 
 \begin_layout Plain Layout
-̃
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-/
-\end_layout
-
-\end_inset
-
- Operator
+~ Operator
 \end_layout
 
 \end_inset
@@ -1997,7 +2361,7 @@
  See section 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sub:Using-ar-to"
+reference "sub:Using-sdar-to"
 
 \end_inset
 
@@ -2005,19 +2369,6 @@
 \end_layout
 
 \begin_layout Itemize
-special sdcc keywords which are not preceded by a double underscore are
- deprecated in version 3.0.0 and higher.
- See section 
-\begin_inset CommandInset ref
-LatexCommand ref
-reference "sub:ANSI-Compliance"
-
-\end_inset
-
- ANSI-Compliance.
-\end_layout
-
-\begin_layout Itemize
 targets for xa51 and avr are disabled by default in version 3.0.0 and higher.
 \end_layout
 
@@ -2060,6 +2411,84 @@
 .
 \end_layout
 
+\begin_layout Itemize
+sdar archive managing utility and sdnm utilityes were introduced in version
+ 3.2.0.
+ sdar, sdranlib and sdnm are derived from GNU Binutils package.
+\end_layout
+
+\begin_layout Itemize
+with sdcc version 3.2.0 the sdcclib utility is deprecated.
+ Sdar utility should be used to create sdcc object file archives.
+ Sdcclib utility will become obsolete in one of next sdcc releases and will
+ be removed from sdcc packages.
+\end_layout
+
+\begin_layout Itemize
+special sdcc keywords which are not preceded by a double underscore are
+ obsoleted (removed) in version 3.2.0 and higher.
+ See section 
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sub:ANSI-Compliance"
+
+\end_inset
+
+ ANSI-Compliance.
+\end_layout
+
+\begin_layout Itemize
+in sdcc version 3.2.0 compiler macro definitions not starting with double
+ underscore characters are deprecated if --std-cXX command line option is
+ defined.
+ They will be oboleted (removed) in one of next sdcc releases.
+\end_layout
+
+\begin_layout Itemize
+in sdcc version 3.2.0 new compiler macros for processor definition were introduced
+ for pic14 and pic16 targets: -D__SDCC_PIC16XXXX and -D__SDCC_PIC18FXXX
+ respectively.
+ The pic16 macro definition -D__18fXXX is deprecated.
+ It will be obsoleted (removed) in one of next sdcc releases.
+\end_layout
+
+\begin_layout Itemize
+pragma config for pic16 target was introduced in version 3.2.0.
+ See section 
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sub:PIC16_Pragmas"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Itemize
+new inline assembler format 
+\family typewriter
+__asm__ (inline_assembler_code
+\begin_inset Quotes srd
+\end_inset
+
+);
+\family default
+ as an addition to 
+\family typewriter
+__asm ...
+ __endasem;
+\family default
+ format introduced in version 3.2.0.
+ See section 
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:Inline-Assembler-Code"
+
+\end_inset
+
+
+\end_layout
+
 \begin_layout Section
 System Requirements
 \end_layout
@@ -2189,10 +2618,6 @@
 \end_inset
 
 .
-\begin_inset Newline newline
-\end_inset
-
-
 \end_layout
 
 \begin_layout Chapter
@@ -2461,7 +2886,7 @@
 
 \end_inset
 
--disable-gbz80-port Excludes the GameBoy gbz80 port
+-disable-z80-port Excludes the z80 port
 \end_layout
 
 \begin_layout List
@@ -2479,7 +2904,61 @@
 
 \end_inset
 
--disable-z80-port Excludes the z80 port
+-disable-z180-port Excludes the z180 port
+\end_layout
+
+\begin_layout List
+\labelwidthstring 00.00.0000
+-
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+/
+\end_layout
+
+\end_inset
+
+-disable-r2k-port Excludes the r2k port
+\end_layout
+
+\begin_layout List
+\labelwidthstring 00.00.0000
+-
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+/
+\end_layout
+
+\end_inset
+
+-disable-r3ka-port Excludes the r3ka port
+\end_layout
+
+\begin_layout List
+\labelwidthstring 00.00.0000
+-
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+/
+\end_layout
+
+\end_inset
+
+-disable-gbz80-port Excludes the GameBoy gbz80 port
 \end_layout
 
 \begin_layout List
@@ -2551,6 +3030,24 @@
 
 \end_inset
 
+-disable-s08-port Excludes the S08 port
+\end_layout
+
+\begin_layout List
+\labelwidthstring 00.00.0000
+-
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+/
+\end_layout
+
+\end_inset
+
 -disable-pic-port Excludes the PIC14 port
 \end_layout
 
@@ -2660,17 +3157,7 @@
 \end_inset
 
 -enable-new-pics Enables support for PIC devices that are not supported
- by the current 0.13.7 release of gputils, namely 12f1822, 16f1933, 16f1934,
- 16f1936, and 16f1937 for the PIC14 target and 18f[24][3456]k22 for PIC16.
- Enabling this probably requires gputils
-\begin_inset Formula $\geq$
-\end_inset
-
-0.14.0 or a recent SVN revision!
-\begin_inset Newline newline
-\end_inset
-
-
+ by the current 0.14.2 release of gputils
 \end_layout
 
 \begin_layout List
@@ -2808,7 +3295,7 @@
 \begin_layout Standard
 See the examples, how to pass the Win32 settings to 'configure'.
  The other Win32 builds using VC or whatever don't use 'configure', but
- a header file sdcc_vc_in.h is the same as sdccconf.h built by 'configure'
+ a header file sdcc_vc.h.in is the same as sdccconf.h built by 'configure'
  for Win32.
 \begin_inset Newline newline
 \end_inset
@@ -3485,7 +3972,7 @@
 
  
 \backslash
- 
+
 \begin_inset Newline newline
 \end_inset
 
@@ -3954,13 +4441,6 @@
 \end_layout
 
 \begin_layout Standard
-\begin_inset VSpace medskip
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
 \align center
 \begin_inset Tabular
 <lyxtabular version="3" rows="7" columns="4">
@@ -5160,7 +5640,7 @@
 \end_inset
 
 3.
- Library files 
+ Library files
 \begin_inset Newline newline
 \end_inset
 
@@ -5195,7 +5675,6 @@
 \shape default
  is auto-appended by the compiler (e.g.
  small, large, z80, ds390 etc.).
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -6563,7 +7042,7 @@
 \backslash
 util
 \backslash
-' and add these lines: 
+' and add these lines:
 \begin_inset Newline newline
 \end_inset
 
@@ -6710,7 +7189,7 @@
 \emph on
 sdcc-x.y.z-setup.exe
 \emph default
- for an official release from 
+ for an official release from
 \begin_inset Newline newline
 \end_inset
 
@@ -7262,7 +7741,6 @@
 \end_inset
 
 .
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -7288,7 +7766,6 @@
 \end_inset
 
 .
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -8064,11 +8541,11 @@
 \end_layout
 
 \begin_layout Itemize
-sdcclib - A tool for creating sdcc libraries
+sdcclib - A tool for creating sdcc libraries (deprecated)
 \end_layout
 
 \begin_layout Itemize
-sdranlib - A tool for indexing sdcc ar libraries
+sdar, sdranlib, sdnm - The sdcc archive managing and indexing utilites.
 \end_layout
 
 \begin_layout Itemize
@@ -8242,7 +8719,7 @@
 \begin_layout Standard
 s51
 \begin_inset Index
-status open
+status collapsed
 
 \begin_layout Plain Layout
 s51 (simulator)
@@ -8252,7 +8729,7 @@
 
 , sz80
 \begin_inset Index
-status open
+status collapsed
 
 \begin_layout Plain Layout
 sz80 (simulator)
@@ -8262,7 +8739,7 @@
 
  and shc08
 \begin_inset Index
-status open
+status collapsed
 
 \begin_layout Plain Layout
 shc08 (simulator)
@@ -8989,7 +9466,7 @@
 \series default
 An example for a more complex command line
 \begin_inset Foot
-status open
+status collapsed
 
 \begin_layout Plain Layout
 the command backfills
@@ -9117,10 +9594,6 @@
 
 \size default
 The first two files will need to be compiled separately with the commands:
-\size footnotesize
- 
-\size default
-
 \begin_inset Newline newline
 \end_inset
 
@@ -9184,7 +9657,7 @@
 
 \end_inset
 
- the files together with the following command: 
+ the files together with the following command:
 \begin_inset Newline newline
 \end_inset
 
@@ -9232,7 +9705,7 @@
 \emph on
 foomain.c
 \emph default
- can be separately compiled as well: 
+ can be separately compiled as well:
 \family sans
 \series bold
 
@@ -9397,7 +9870,70 @@
 \end_layout
 
 \begin_layout Subsection
-Using sdcclib to Create and Manage Libraries
+Using sdar to Create and Manage Libraries
+\begin_inset Index
+status collapsed
+
+\begin_layout Plain Layout
+sdar
+\end_layout
+
+\end_inset
+
+
+\begin_inset CommandInset label
+LatexCommand label
+name "sub:Using-sdar-to"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Support for sdar format libraries was introduced in sdcc 2.9.0.
+\series bold
+
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+
+\series default
+Both the GNU and BSD ar format variants are supported by sdld linkers.
+\series bold
+
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+
+\series default
+To create a library containing sdas object files, you should use the following
+ sequence:
+\series bold
+
+\begin_inset Newline newline
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\family sans
+\series bold
+sdar -rc <library name>.lib <list of .rel files>
+\end_layout
+
+\begin_layout Subsection
+Using sdcclib to Create and Manage Libraries (deprecated)
 \begin_inset Index
 status collapsed
 
@@ -9408,6 +9944,19 @@
 \end_inset
 
 
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+With sdcc version 3.2.0 the sdcclib utility is deprecated.
+ Sdar utility should be used to create sdcc object file archives.
+ Sdcclib utility will become obsolete in one of next sdcc releases and will
+ be removed from sdcc packages.
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
@@ -9431,7 +9980,7 @@
 \series bold
 sdcclib -?
 \begin_inset Index
-status open
+status collapsed
 
 \begin_layout Plain Layout
 sdcclib
@@ -9515,7 +10064,7 @@
 \family default
 
 \begin_inset Index
-status open
+status collapsed
 
 \begin_layout Plain Layout
 sdcclib
@@ -9914,13 +10463,13 @@
  sections.
 \end_layout
 
-\begin_layout Subsection
-Using ar to Create and Manage Libraries
+\begin_layout Section
+Command Line Options
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-ar
+Command Line Options
 \end_layout
 
 \end_inset
@@ -9928,264 +10477,235 @@
 
 \begin_inset CommandInset label
 LatexCommand label
-name "sub:Using-ar-to"
+name "sec:Command-Line-Options"
 
 \end_inset
 
 
 \end_layout
 
-\begin_layout Standard
-Support for ar format libraries was introduced in sdcc 2.9.0.
- Ar is a standard archive managing utility on unices (Linux, Mac OS X, several
- unix flavors) so it is not included in the sdcc package.
-\series bold
-
-\begin_inset Newline newline
-\end_inset
-
-
-\begin_inset Newline newline
-\end_inset
-
-
-\series default
-For Windows platform you can find ar utility in GNU binutils package included
- in several projects: Cygwin at 
-\begin_inset Flex URL
+\begin_layout Subsection
+Processor Selection Options
+\begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-
-http://www.cygwin.com/
+Options processor selection
 \end_layout
 
 \end_inset
 
-, MinGW at 
-\begin_inset Flex URL
+
+\begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-
-http://www.mingw.org/
+Processor selection options
 \end_layout
 
 \end_inset
 
-.
-\series bold
-
-\begin_inset Newline newline
-\end_inset
-
 
-\begin_inset Newline newline
-\end_inset
+\end_layout
 
+\begin_layout List
+\labelwidthstring 00.00.0000
 
-\series default
-Both the GNU and BSD ar format variants are supported by sdld linkers.
- Ar doesn't natively understand the sdas object file format, so there is
- a special version of ranlib distributed with sdcc, called sdranlib, which
- produces the ar symbol lookup table.
 \series bold
+-mmcs51
+\begin_inset Index
+status collapsed
 
-\begin_inset Newline newline
-\end_inset
-
+\begin_layout Plain Layout
+-mmcs51
+\end_layout
 
-\begin_inset Newline newline
 \end_inset
 
 
 \series default
-To create a library containing sdas object files, you should use the following
- sequence:
-\series bold
-
-\begin_inset Newline newline
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-
-\family sans
-\series bold
-ar -Sq <library name>.lib <list of .rel files>
-\end_layout
-
-\begin_layout Standard
+ Generate code for the Intel MCS51
+\begin_inset Index
+status collapsed
 
-\family sans
-\series bold
-sdranlib <library name>.lib
+\begin_layout Plain Layout
+MCS51
 \end_layout
 
-\begin_layout Standard
-\begin_inset VSpace bigskip
 \end_inset
 
-
+ family of processors.
+ This is the default processor target.
 \end_layout
 
-\begin_layout Section
-Command Line Options
+\begin_layout List
+\labelwidthstring 00.00.0000
+
+\series bold
+-mds390
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-Command Line Options
+-mds390
 \end_layout
 
 \end_inset
 
 
-\begin_inset CommandInset label
-LatexCommand label
-name "sec:Command-Line-Options"
+\series default
+ Generate code for the Dallas DS80C390
+\begin_inset Index
+status collapsed
 
-\end_inset
+\begin_layout Plain Layout
+DS80C390
+\end_layout
 
+\end_inset
 
+ processor.
 \end_layout
 
-\begin_layout Subsection
-Processor Selection Options
+\begin_layout List
+\labelwidthstring 00.00.0000
+
+\series bold
+-mds400
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-Options processor selection
+-mds400
 \end_layout
 
 \end_inset
 
 
+\series default
+ Generate code for the Dallas DS80C400
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-Processor selection options
+DS80C400
 \end_layout
 
 \end_inset
 
-
+ processor.
 \end_layout
 
 \begin_layout List
 \labelwidthstring 00.00.0000
 
 \series bold
--mmcs51
+-mhc08
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
--mmcs51
+-mhc08
 \end_layout
 
 \end_inset
 
 
 \series default
- Generate code for the Intel MCS51
+ Generate code for the Freescale/Motorola HC08 (aks 68HC08) 
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-MCS51
+HC08
 \end_layout
 
 \end_inset
 
  family of processors.
- This is the default processor target.
 \end_layout
 
 \begin_layout List
 \labelwidthstring 00.00.0000
 
 \series bold
--mds390
+-ms08
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
--mds390
+-ms08
 \end_layout
 
 \end_inset
 
 
 \series default
- Generate code for the Dallas DS80C390
+ Generate code for the Freescale/Motorola S08 (aks 68HCS08, HCS08, CS08)
+ 
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-DS80C390
+S08
 \end_layout
 
 \end_inset
 
- processor.
+ family of processors.
 \end_layout
 
 \begin_layout List
 \labelwidthstring 00.00.0000
 
 \series bold
--mds400
+-mz80
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
--mds400
+-mz80
 \end_layout
 
 \end_inset
 
 
 \series default
- Generate code for the Dallas DS80C400
+ Generate code for the Zilog Z80
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-DS80C400
+Z80
 \end_layout
 
 \end_inset
 
- processor.
+ family of processors.
 \end_layout
 
 \begin_layout List
 \labelwidthstring 00.00.0000
 
 \series bold
--mhc08
+-mz180
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
--mhc08
+-mz180
 \end_layout
 
 \end_inset
 
 
 \series default
- Generate code for the Freescale/Motorola HC08
+ Generate code for the Zilog Z180
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-HC08
+Z180
 \end_layout
 
 \end_inset
@@ -10197,29 +10717,38 @@
 \labelwidthstring 00.00.0000
 
 \series bold
--mz80
+-mr2k
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
--mz80
+-mr2k
 \end_layout
 
 \end_inset
 
 
 \series default
- Generate code for the Zilog Z80
+ Generate code for the Rabbit 2000 / Rabbit 3000 family of processors.
+\end_layout
+
+\begin_layout List
+\labelwidthstring 00.00.0000
+
+\series bold
+-mr3ka
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-Z80
+-mr3ka
 \end_layout
 
 \end_inset
 
- family of processors.
+
+\series default
+ Generate code for the Rabbit 3000A family of processors.
 \end_layout
 
 \begin_layout List
@@ -10379,13 +10908,6 @@
  Option -m has higher priority than setting from program name.
 \end_layout
 
-\begin_layout Standard
-\begin_inset VSpace bigskip
-\end_inset
-
-
-\end_layout
-
 \begin_layout Subsection
 Preprocessor Options
 \begin_inset Index
@@ -10846,13 +11368,6 @@
  
 \end_layout
 
-\begin_layout Standard
-\begin_inset VSpace bigskip
-\end_inset
-
-
-\end_layout
-
 \begin_layout Subsection
 Linker Options
 \begin_inset Index
@@ -11873,7 +12388,7 @@
 
 \end_inset
 
- processors)
+ and S08 processors)
 \end_layout
 
 \begin_layout List
@@ -11931,13 +12446,6 @@
  File sdcc/sdas/doc/asxhtm.html has more on linker options.
 \end_layout
 
-\begin_layout Standard
-\begin_inset VSpace bigskip
-\end_inset
-
-
-\end_layout
-
 \begin_layout Subsection
 MCS51 Options
 \begin_inset Index
@@ -12594,13 +13102,6 @@
  lcall/ljmp instructions..
 \end_layout
 
-\begin_layout Standard
-\begin_inset VSpace bigskip
-\end_inset
-
-
-\end_layout
-
 \begin_layout Subsection
 DS390 / DS400 Options
 \begin_inset Index
@@ -12899,7 +13400,7 @@
 \series bold
 -
 \begin_inset ERT
-status open
+status collapsed
 
 \begin_layout Plain Layout
 
@@ -13055,13 +13556,6 @@
  
 \end_layout
 
-\begin_layout Standard
-\begin_inset VSpace bigskip
-\end_inset
-
-
-\end_layout
-
 \begin_layout Subsection
 Z80 Options
 \begin_inset Index
@@ -13421,14 +13915,6 @@
  
 \end_layout
 
-\begin_layout List
-\labelwidthstring 00.00.0000
-\begin_inset VSpace bigskip
-\end_inset
-
-
-\end_layout
-
 \begin_layout Subsection
 GBZ80 Options
 \begin_inset Index
@@ -13692,13 +14178,6 @@
  Use <Value> for the const segment name.
 \end_layout
 
-\begin_layout Standard
-\begin_inset VSpace bigskip
-\end_inset
-
-
-\end_layout
-
 \begin_layout Subsection
 Optimization Options
 \begin_inset Index
@@ -14767,11 +15246,55 @@
  Frame pointer will be omitted when the function uses no local variables.
 \end_layout
 
-\begin_layout Standard
-\begin_inset VSpace bigskip
+\begin_layout List
+\labelwidthstring 00.00.0000
+-
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+/
+\end_layout
+
+\end_inset
+
+-
+\series bold
+max-allocs-per-node
+\series default
+
+\begin_inset Index
+status open
+
+\begin_layout Plain Layout
+-
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+/
+\end_layout
+
 \end_inset
 
+-max-allocs-per-node
+\end_layout
+
+\end_inset
 
+ Setting this to a high value will result in increased compilation time
+ and more optimized code being generated.
+ Setting it to lower valeus speed up compilation, but does not optimize
+ as much.
+ The default value is 3000.
+ This option currently only affects the hc08, s08, z80, z180, r2k, r3ka
+ and gbz80 ports.
 \end_layout
 
 \begin_layout Subsection
@@ -15719,7 +16242,7 @@
 \series bold
 
 \begin_inset ERT
-status open
+status collapsed
 
 \begin_layout Plain Layout
 
@@ -16105,7 +16628,7 @@
 \series bold
 
 \begin_inset ERT
-status open
+status collapsed
 
 \begin_layout Plain Layout
 
@@ -17218,13 +17741,6 @@
 
 \end_layout
 
-\begin_layout Standard
-\begin_inset VSpace bigskip
-\end_inset
-
-
-\end_layout
-
 \begin_layout Subsection
 Intermediate Dump Options
 \begin_inset CommandInset label
@@ -17791,13 +18307,6 @@
 Will cause all the above mentioned dumps to be created.
 \end_layout
 
-\begin_layout Standard
-\begin_inset VSpace bigskip
-\end_inset
-
-
-\end_layout
-
 \begin_layout Subsection
 Redirecting output on Windows Shells
 \end_layout
@@ -17965,12 +18474,6 @@
 \series bold
 \emph default
 -model-large -c $(InputPath)
-\series default
-
-\begin_inset VSpace bigskip
-\end_inset
-
-
 \end_layout
 
 \begin_layout Section
@@ -18237,7 +18740,7 @@
  are mainly used for debugging purposes.
  They can change or disappear very quickly, and will never be documented
 \begin_inset Foot
-status open
+status collapsed
 
 \begin_layout Plain Layout
 if you are curious search in SDCC's sources for 
@@ -18266,11 +18769,6 @@
 \end_inset
 
 .
- 
-\begin_inset VSpace bigskip
-\end_inset
-
-
 \end_layout
 
 \begin_layout Section
@@ -18297,17 +18795,7 @@
 \end_layout
 
 \begin_layout Subsubsection
-data
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-data (mcs51, ds390 storage class)
-\end_layout
-
-\end_inset
-
-
+__data
 \begin_inset Index
 status collapsed
 
@@ -18342,17 +18830,7 @@
 
 \end_inset
 
- / near
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-near (storage class)
-\end_layout
-
-\end_inset
-
-
+ / __near
 \begin_inset Index
 status collapsed
 
@@ -18395,23 +18873,7 @@
 \series bold
 default
 \series default
- storage class for the Small Memory model (
-\emph on
-data
-\emph default
- and 
-\emph on
-near
-\emph default
- or the more ANSI-C compliant forms 
-\emph on
-__data
-\emph default
- and 
-\emph on
-__near
-\emph default
- can be used synonymously).
+ storage class for the Small Memory model.
  Variables declared with this storage class will be allocated in the directly
  addressable portion of the internal RAM of a 8051, e.g.:
 \end_layout
@@ -18453,17 +18915,7 @@
 \end_layout
 
 \begin_layout Subsubsection
-xdata
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-xdata (mcs51, ds390 storage class)
-\end_layout
-
-\end_inset
-
-
+__xdata
 \begin_inset Index
 status collapsed
 
@@ -18498,17 +18950,7 @@
 
 \end_inset
 
- / far
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-far (storage class)
-\end_layout
-
-\end_inset
-
-
+ / __far
 \begin_inset Index
 status collapsed
 
@@ -18589,7 +19031,7 @@
 \begin_inset space ~
 \end_inset
 
-dptr,#_test_xdata 
+dptr,#_test_xdata
 \begin_inset Newline newline
 \end_inset
 
@@ -18629,7 +19071,7 @@
 \begin_inset space ~
 \end_inset
 
-a,#0x01 
+a,#0x01
 \begin_inset Newline newline
 \end_inset
 
@@ -18677,17 +19119,7 @@
 \end_layout
 
 \begin_layout Subsubsection
-idata
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-idata (mcs51, ds390 storage class)
-\end_layout
-
-\end_inset
-
-
+__idata
 \begin_inset Index
 status collapsed
 
@@ -18845,17 +19277,7 @@
 \end_layout
 
 \begin_layout Subsubsection
-pdata
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-pdata (mcs51, ds390 storage class)
-\end_layout
-
-\end_inset
-
-
+__pdata
 \begin_inset Index
 status collapsed
 
@@ -18991,7 +19413,7 @@
 \begin_inset space ~
 \end_inset
 
-mov a,#0x01 
+mov a,#0x01
 \begin_inset Newline newline
 \end_inset
 
@@ -19076,17 +19498,7 @@
 \end_layout
 
 \begin_layout Subsubsection
-code
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-code
-\end_layout
-
-\end_inset
-
-
+__code
 \begin_inset Index
 status collapsed
 
@@ -19347,17 +19759,7 @@
 \end_layout
 
 \begin_layout Subsubsection
-bit
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-bit
-\end_layout
-
-\end_inset
-
-
+__bit
 \begin_inset Index
 status collapsed
 
@@ -19452,7 +19854,6 @@
 \begin_layout Standard
 The bit addressable memory consists of 128 bits which are located from 0x20
  to 0x2f in data memory.
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -19484,17 +19885,7 @@
 \end_layout
 
 \begin_layout Subsubsection
-sfr
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-sfr
-\end_layout
-
-\end_inset
-
-
+__sfr
 \begin_inset Index
 status collapsed
 
@@ -19529,17 +19920,7 @@
 
 \end_inset
 
- / sfr16
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-sfr16
-\end_layout
-
-\end_inset
-
-
+ / __sfr16
 \begin_inset Index
 status collapsed
 
@@ -19574,17 +19955,7 @@
 
 \end_inset
 
- / sfr32
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-sfr32
-\end_layout
-
-\end_inset
-
-
+ / __sfr32
 \begin_inset Index
 status collapsed
 
@@ -19619,42 +19990,7 @@
 
 \end_inset
 
- / sbit
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-_
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-_
-\end_layout
-
-\end_inset
-
-sbit
-\end_layout
-
-\end_inset
-
-
+ / __sbit
 \begin_inset Index
 status collapsed
 
@@ -19670,7 +20006,7 @@
 \begin_layout Standard
 Like the bit keyword, 
 \emph on
-sfr / sfr16 / sfr32 / sbit
+__sfr / __sfr16 / __sfr32 / __sbit
 \emph default
  signify both a data-type and storage class, they are used to describe the
  
@@ -19685,13 +20021,9 @@
 \emph on
 r
 \emph default
-egisters and 
-\emph on
-s
-\emph default
-pecial 
+egisters and special 
 \emph on
-bit
+__bit
 \emph default
  variables of a 8051, eg:
 \end_layout
@@ -19704,16 +20036,6 @@
 status collapsed
 
 \begin_layout Plain Layout
-at
-\end_layout
-
-\end_inset
-
-
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
 \begin_inset ERT
 status collapsed
 
@@ -19785,16 +20107,6 @@
 status collapsed
 
 \begin_layout Plain Layout
-at
-\end_layout
-
-\end_inset
-
-
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
 \begin_inset ERT
 status collapsed
 
@@ -19856,7 +20168,7 @@
 Special function registers which are located on an address dividable by
  8 are bit-addressable, an 
 \emph on
-sbit
+__sbit
 \emph default
  addresses a specific bit within these sfr.
 \begin_inset Newline newline
@@ -19865,11 +20177,11 @@
 16 Bit and 32 bit special function register combinations which require a
  certain access order are better not declared using 
 \emph on
-sfr16
+__sfr16
 \emph default
  or 
 \emph on
-sfr32.
+__sfr32.
 
 \emph default
  Allthough SDCC usually accesses them Least Significant Byte (LSB) first,
@@ -19908,7 +20220,7 @@
 \family typewriter
 
 \begin_inset Marginal
-status open
+status collapsed
 
 \begin_layout Plain Layout
 
@@ -20014,7 +20326,7 @@
 
 \family typewriter
 /* pointer physically in internal ram pointing to object in external ram
- */ 
+ */
 \begin_inset Newline newline
 \end_inset
 
@@ -20027,7 +20339,7 @@
 \end_inset
 
 /* pointer physically in external ram pointing to object in internal ram
- */ 
+ */
 \begin_inset Newline newline
 \end_inset
 
@@ -20039,7 +20351,7 @@
 \begin_inset Newline newline
 \end_inset
 
-/* pointer physically in code rom pointing to data in xdata space */ 
+/* pointer physically in code rom pointing to data in xdata space */
 \begin_inset Newline newline
 \end_inset
 
@@ -20051,7 +20363,7 @@
 \begin_inset Newline newline
 \end_inset
 
-/* pointer physically in code space pointing to data in code space */ 
+/* pointer physically in code space pointing to data in code space */
 \begin_inset Newline newline
 \end_inset
 
@@ -20106,7 +20418,6 @@
 
 \begin_layout Standard
 Well you get the idea.
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -20119,7 +20430,6 @@
 generic
 \emph default
  pointers.
- 
 \size small
 
 \begin_inset Newline newline
@@ -20191,7 +20501,6 @@
 \end_inset
 
 - Bytes 00-1F - 32 bytes to hold up to 4 banks of the registers R0 to R7,
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -20205,7 +20514,7 @@
 
 \end_inset
 
- variables and, 
+ variables and,
 \begin_inset Newline newline
 \end_inset
 
@@ -20402,7 +20711,7 @@
  of registers (register bank 0), but it is possible to specify that other
  banks of registers (keyword 
 \emph on
-using
+__using
 \emph default
  
 \emph on
@@ -20852,10 +21161,6 @@
  allocation, take a look at either the .map or .mem files to find out what
  the problem is.
  The .mem file may even suggest a solution to the problem.
-\begin_inset VSpace bigskip
-\end_inset
-
-
 \end_layout
 
 \begin_layout Subsection
@@ -20873,17 +21178,7 @@
 \end_layout
 
 \begin_layout Subsubsection
-sfr
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-sfr
-\end_layout
-
-\end_inset
-
-
+__sfr
 \begin_inset Index
 status collapsed
 
@@ -21056,16 +21351,6 @@
 status collapsed
 
 \begin_layout Plain Layout
-sfr
-\end_layout
-
-\end_inset
-
-
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
 \begin_inset ERT
 status collapsed
 
@@ -21102,7 +21387,7 @@
 \begin_layout Standard
 The keyword 
 \emph on
-banked
+__banked
 \emph default
  is used to support 16 bit addresses in I/O memory e.g.:
 \end_layout
@@ -21115,16 +21400,6 @@
 status collapsed
 
 \begin_layout Plain Layout
-at
-\end_layout
-
-\end_inset
-
-
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
 \begin_inset ERT
 status collapsed
 
@@ -21205,7 +21480,7 @@
 \begin_inset space ~
 \end_inset
 
-ld a,#0x01 
+ld a,#0x01
 \begin_inset Newline newline
 \end_inset
 
@@ -21237,17 +21512,7 @@
 \end_layout
 
 \begin_layout Subsubsection
-sfr
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-sfr
-\end_layout
-
-\end_inset
-
-
+__sfr
 \begin_inset Index
 status collapsed
 
@@ -21380,14 +21645,10 @@
 \family default
 .
  If you include the file z180.h this will be set automatically.
-\begin_inset VSpace bigskip
-\end_inset
-
-
 \end_layout
 
 \begin_layout Subsection
-HC08 Storage Class
+HC08/S08 Storage Class
 \begin_inset Index
 status collapsed
 
@@ -21401,17 +21662,7 @@
 \end_layout
 
 \begin_layout Subsubsection
-data
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-data (hc08 storage class)
-\end_layout
-
-\end_inset
-
-
+__data
 \begin_inset Index
 status collapsed
 
@@ -21450,7 +21701,7 @@
 \end_layout
 
 \begin_layout Standard
-The data storage class declares a variable that resides in the first 256
+The __data storage class declares a variable that resides in the first 256
  bytes of memory (the direct page).
  The HC08
 \begin_inset Index
@@ -21466,17 +21717,7 @@
 \end_layout
 
 \begin_layout Subsubsection
-xdata
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-xdata (hc08 storage class)
-\end_layout
-
-\end_inset
-
-
+__xdata
 \begin_inset Index
 status collapsed
 
@@ -21515,14 +21756,10 @@
 \end_layout
 
 \begin_layout Standard
-The xdata storage class declares a variable that can reside anywhere in
+The __xdata storage class declares a variable that can reside anywhere in
  memory.
  This is the default if no storage class is specified.
  
-\begin_inset VSpace bigskip
-\end_inset
-
-
 \end_layout
 
 \begin_layout Section
@@ -21548,13 +21785,80 @@
  This feature is only enabled when the compiler is invoked using --std-sdccxx.
 \end_layout
 
-\begin_layout Standard
-\begin_inset VSpace bigskip
+\begin_layout Subsection
+Named address spaces
+\end_layout
+
+\begin_layout Standard
+SDCC supports named address spaces.
+ See the Embedded C standard for more information on them.
+ So far SDCC only supports them for bank-switching.
+ You need to have a function that switches to the desired memory bank and
+ declare a corresponding named address space:
+\end_layout
+
+\begin_layout Standard
+
+\family typewriter
+\begin_inset listings
+inline false
+status collapsed
+
+\begin_layout Plain Layout
+
+void setb0(void); // The function that sets the currently active memory
+ bank to b0
+\end_layout
+
+\begin_layout Plain Layout
+
+void setb1(void); // The function that sets the currently active memory
+ bank to b1
+\end_layout
+
+\begin_layout Plain Layout
+
+__addressmod setb0 spaceb0; // Declare a named address space called spaceb0
+ that uses setb0()
+\end_layout
+
+\begin_layout Plain Layout
+
+__addressmod setb1 spaceb1; // Declare a named address space called spaceb1
+ that uses setb1()
+\end_layout
+
+\begin_layout Plain Layout
+
+\end_layout
+
+\begin_layout Plain Layout
+
+spaceb0 int x; // An int in address space spaceb0
+\end_layout
+
+\begin_layout Plain Layout
+
+spaceb1 int *y; // A pointer to an int in address space spaceb1
+\end_layout
+
+\begin_layout Plain Layout
+
+spaceb0 int *spaceb1 z; //A pointer in address space sapceb1 that points
+ to an int in address space spaceb0
+\end_layout
+
 \end_inset
 
 
 \end_layout
 
+\begin_layout Standard
+SDCC will automatically insert calls to the correspionding function before
+ accessing the variable.
+ SDCC inserts the minimum possible number calls to the bank selection functions.
+\end_layout
+
 \begin_layout Section
 Absolute Addressing
 \begin_inset Index
@@ -21572,7 +21876,7 @@
 \begin_layout Standard
 Data items can be assigned an absolute address with the 
 \emph on
-at
+__at
 \begin_inset Index
 status collapsed
 
@@ -21950,7 +22254,7 @@
 \begin_inset Newline newline
 \end_inset
 
-unsigned char spi_io(unsigned char out_byte) 
+unsigned char spi_io(unsigned char out_byte)
 \begin_inset Newline newline
 \end_inset
 
@@ -22030,7 +22334,7 @@
 \begin_inset space ~
 \end_inset
 
-MOSI = out_byte & 0x80; 
+MOSI = out_byte & 0x80;
 \begin_inset Newline newline
 \end_inset
 
@@ -22102,7 +22406,7 @@
 \begin_inset space ~
 \end_inset
 
-MCLK = 1; 
+MCLK = 1;
 \begin_inset Newline newline
 \end_inset
 
@@ -22206,7 +22510,7 @@
 \begin_inset space ~
 \end_inset
 
-if(MISO) 
+if(MISO)
 \begin_inset Newline newline
 \end_inset
 
@@ -22258,7 +22562,7 @@
 \begin_inset space ~
 \end_inset
 
-out_byte += 1; 
+out_byte += 1;
 \begin_inset Newline newline
 \end_inset
 
@@ -22294,7 +22598,7 @@
 \begin_inset space ~
 \end_inset
 
-MCLK = 0; 
+MCLK = 0;
 \begin_inset Newline newline
 \end_inset
 
@@ -22334,7 +22638,7 @@
 \begin_inset space ~
 \end_inset
 
-return out_byte; 
+return out_byte;
 \begin_inset Newline newline
 \end_inset
 
@@ -22533,10 +22837,6 @@
  for example in a library.
  This is somehow similar to sbit, but only one absolute address has to be
  specified in the whole project.
-\begin_inset VSpace bigskip
-\end_inset
-
-
 \end_layout
 
 \begin_layout Section
@@ -22700,7 +23000,7 @@
 
  or by using the 
 \emph on
-reentrant
+__reentrant
 \begin_inset Index
 status collapsed
 
@@ -22718,7 +23018,7 @@
 \begin_layout Verse
 
 \family typewriter
-unsigned char foo(char i) __reentrant 
+unsigned char foo(char i) __reentrant
 \begin_inset Newline newline
 \end_inset
 
@@ -22753,7 +23053,7 @@
 \begin_layout Standard
 Since stack space on 8051 is limited, the 
 \emph on
-reentrant
+__reentrant
 \emph default
  keyword or the 
 \emph on
@@ -22822,7 +23122,7 @@
 \begin_layout Verse
 
 \family typewriter
-unsigned char foo(__xdata int parm) 
+unsigned char foo(__xdata int parm)
 \begin_inset Newline newline
 \end_inset
 
@@ -23152,7 +23452,7 @@
 \begin_layout Verse
 
 \family typewriter
-#pragma save 
+#pragma save
 \begin_inset Newline newline
 \end_inset
 
@@ -23178,11 +23478,11 @@
 
 \end_inset
 
- 
+
 \begin_inset Newline newline
 \end_inset
 
-void set_error(unsigned char errcd) 
+void set_error(unsigned char errcd)
 \begin_inset Newline newline
 \end_inset
 
@@ -23214,7 +23514,7 @@
 \begin_inset Newline newline
 \end_inset
 
-#pragma restore 
+#pragma restore
 \begin_inset Newline newline
 \end_inset
 
@@ -23297,7 +23597,6 @@
 \end_inset
 
 ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -23325,10 +23624,6 @@
 
 nooverlay ensures that the parameters and local variables for the function
  are NOT overlaid.
-\begin_inset VSpace bigskip
-\end_inset
-
-
 \end_layout
 
 \begin_layout Section
@@ -23365,11 +23660,11 @@
 \begin_layout Verse
 
 \family typewriter
-void timer_isr (void) __interrupt (1) __using (1) 
+void timer_isr (void) __interrupt (1) __using (1)
 \begin_inset Newline newline
 \end_inset
 
-{ 
+{
 \begin_inset Newline newline
 \end_inset
 
@@ -23390,7 +23685,6 @@
 \end_inset
 
 ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -23400,7 +23694,7 @@
 \begin_layout Standard
 The optional number following the 
 \emph on
-interrupt
+__interrupt
 \begin_inset Index
 status collapsed
 
@@ -23469,7 +23763,7 @@
 .
  The optional (8051 specific) keyword 
 \emph on
-using
+__using
 \begin_inset Index
 status collapsed
 
@@ -23518,7 +23812,6 @@
 \emph default
  can be used to tell the compiler to use the specified register bank when
  generating code for this function.
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -23991,10 +24284,6 @@
 \end_inset
 
 about Functions using private register banks.
-\begin_inset VSpace bigskip
-\end_inset
-
-
 \end_layout
 
 \begin_layout Subsection
@@ -24314,7 +24603,7 @@
 \begin_layout Standard
 If the interrupt service routine is defined without 
 \emph on
-using
+__using
 \begin_inset Index
 status collapsed
 
@@ -24363,7 +24652,7 @@
 \emph default
  a register bank or with register bank 0 (
 \emph on
-using
+__using
 \emph default
  0), the compiler will save the registers used by itself on the stack upon
  entry and restore them at exit, however if such an interrupt service routine
@@ -24393,10 +24682,6 @@
 
 .
  This scheme is recommended for larger interrupt service routines.
-\begin_inset VSpace bigskip
-\end_inset
-
-
 \end_layout
 
 \begin_layout Subsection
@@ -24438,10 +24723,6 @@
 \end_inset
 
  for details on customizing startup.
-\begin_inset VSpace bigskip
-\end_inset
-
-
 \end_layout
 
 \begin_layout Subsection
@@ -24480,7 +24761,7 @@
  To write an interrupt handler for the non-maskable interrupt, which needs
  a RETN instruction instead, add the 
 \emph on
-critical
+__critical
 \emph default
  keyword:
 \end_layout
@@ -24488,11 +24769,11 @@
 \begin_layout Verse
 
 \family typewriter
-void nmi_isr (void) critical interrupt
+void nmi_isr (void) __critical __interrupt
 \begin_inset Newline newline
 \end_inset
 
-{ 
+{
 \begin_inset Newline newline
 \end_inset
 
@@ -24513,7 +24794,6 @@
 \end_inset
 
 ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -24524,15 +24804,11 @@
 However if you need to create a non-interruptable interrupt service routine
  you would also require the 
 \emph on
-critical
+__critical
 \emph default
  keyword.
  To distinguish between this and an nmi_isr you must provide an interrupt
  number.
-\begin_inset VSpace bigskip
-\end_inset
-
-
 \end_layout
 
 \begin_layout Section
@@ -24547,7 +24823,7 @@
 A special keyword may be associated with a block or a function declaring
  it as 
 \emph on
-critical
+__critical
 \emph default
 .
  SDCC will generate code to disable all interrupts
@@ -24623,11 +24899,11 @@
 
 \end_inset
 
- 
+
 \begin_inset Newline newline
 \end_inset
 
-{ 
+{
 \begin_inset Newline newline
 \end_inset
 
@@ -24648,7 +24924,6 @@
 \end_inset
 
 ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -24669,7 +24944,6 @@
 \end_inset
 
 ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -24687,7 +24961,7 @@
 
 The keyword 
 \emph on
-critical
+__critical
 \emph default
  may also be used to disable interrupts more locally:
 \end_layout
@@ -25305,9 +25579,35 @@
 \end_layout
 
 \begin_layout Verse
+or gor SDCC version 3.2.0 or newer:
+\end_layout
+
+\begin_layout Verse
 
 \family typewriter
-...
+#define CLI asm (
+\begin_inset Quotes sld
+\end_inset
+
+cli
+\begin_inset Quotes srd
+\end_inset
+
+); 
+\end_layout
+
+\begin_layout Verse
+
+\family typewriter
+#define SEI asm (
+\begin_inset Quotes sld
+\end_inset
+
+sei
+\begin_inset Quotes srd
+\end_inset
+
+); 
 \end_layout
 
 \begin_layout Standard
@@ -25479,7 +25779,7 @@
 
 \end_inset
 
- bit resource_is_free; 
+ bit resource_is_free;
 \begin_inset Newline newline
 \end_inset
 
@@ -25487,7 +25787,7 @@
 \begin_inset Newline newline
 \end_inset
 
-if (resource_is_free) 
+if (resource_is_free)
 \begin_inset Newline newline
 \end_inset
 
@@ -25499,7 +25799,7 @@
 \begin_inset space ~
 \end_inset
 
-{ 
+{
 \begin_inset Newline newline
 \end_inset
 
@@ -25519,7 +25819,7 @@
 \begin_inset space ~
 \end_inset
 
-resource_is_free=0; 
+resource_is_free=0;
 \begin_inset Newline newline
 \end_inset
 
@@ -25540,7 +25840,6 @@
 \end_inset
 
 ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -25610,7 +25909,7 @@
 Some architectures have support for quickly changing register sets.
  SDCC supports this feature with the 
 \emph on
-using
+__using
 \begin_inset Index
 status collapsed
 
@@ -25690,7 +25989,7 @@
 \begin_layout Standard
 The 
 \emph on
-using
+__using
 \emph default
  attribute will have no effect on the generated code for a 
 \emph on
@@ -25720,7 +26019,7 @@
 \emph on
 (pending: Note, nowadays the
 \emph default
- using 
+ __using 
 \emph on
 attribute has an effect on
 \emph default
@@ -25794,10 +26093,6 @@
  It is very inefficient to call a function using a different, non-zero bank
  from an ISR.
  
-\begin_inset VSpace bigskip
-\end_inset
-
-
 \end_layout
 
 \begin_layout Section
@@ -28676,13 +28971,6 @@
  is generated.
 \end_layout
 
-\begin_layout Standard
-\begin_inset VSpace bigskip
-\end_inset
-
-
-\end_layout
-
 \begin_layout Subsection
 HC08 Startup Code
 \end_layout
@@ -28699,10 +28987,6 @@
 \end_inset
 
  startup code follows the same scheme as the MCS51 startup code.
-\begin_inset VSpace bigskip
-\end_inset
-
-
 \end_layout
 
 \begin_layout Subsection
@@ -28770,14 +29054,17 @@
 
  and provide your own crt0.rel.
  
-\begin_inset VSpace bigskip
-\end_inset
-
-
 \end_layout
 
 \begin_layout Section
 Inline Assembler Code
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:Inline-Assembler-Code"
+
+\end_inset
+
+
 \begin_inset Index
 status collapsed
 
@@ -28791,6 +29078,159 @@
 \end_layout
 
 \begin_layout Subsection
+Inline Assemblere Code Formats
+\end_layout
+
+\begin_layout Standard
+SDCC supports two formats for inline assembler code definition:
+\end_layout
+
+\begin_layout Subsubsection
+Old __asm ...
+ __endasm; Format
+\end_layout
+
+\begin_layout Standard
+Most of inline assembler code examples in this manual use the old inline
+ assembler code format, but the new format could be used equivalently.
+\end_layout
+
+\begin_layout Standard
+Example:
+\end_layout
+
+\begin_layout Verse
+
+\family typewriter
+__asm
+\family default
+
+\begin_inset Newline newline
+\end_inset
+
+
+\family typewriter
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+; This is a comment
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+label:
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+nop
+\begin_inset Newline newline
+\end_inset
+
+__endasm;
+\end_layout
+
+\begin_layout Subsubsection
+New __asm__ (
+\begin_inset Quotes sld
+\end_inset
+
+inline_assembler_code
+\begin_inset Quotes srd
+\end_inset
+
+) Format
+\end_layout
+
+\begin_layout Standard
+The __asm__ inline assembler code format was introduced in SDCC version
+ 3.2.0.
+\end_layout
+
+\begin_layout Standard
+Example:
+\end_layout
+
+\begin_layout Verse
+
+\family typewriter
+__asm__ (
+\begin_inset Quotes sld
+\end_inset
+
+; This is a comment
+\backslash
+nlabel:
+\backslash
+n
+\backslash
+tnop
+\begin_inset Quotes srd
+\end_inset
+
+);
+\end_layout
+
+\begin_layout Subsection
 A Step by Step Introduction
 \begin_inset CommandInset label
 LatexCommand label
@@ -29566,7 +30006,7 @@
 \begin_inset space ~
 \end_inset
 
-r2,dpl 
+r2,dpl
 \begin_inset Newline newline
 \end_inset
 
@@ -29632,7 +30072,7 @@
 \begin_inset space ~
 \end_inset
 
-a,_tail 
+a,_tail
 \begin_inset Newline newline
 \end_inset
 
@@ -29660,7 +30100,7 @@
 \begin_inset space ~
 \end_inset
 
-a 
+a
 \begin_inset Newline newline
 \end_inset
 
@@ -29688,7 +30128,7 @@
 \begin_inset space ~
 \end_inset
 
-r3,a 
+r3,a
 \begin_inset Newline newline
 \end_inset
 
@@ -29716,7 +30156,7 @@
 \begin_inset space ~
 \end_inset
 
-a,_head 
+a,_head
 \begin_inset Newline newline
 \end_inset
 
@@ -29736,7 +30176,7 @@
 \begin_inset space ~
 \end_inset
 
-cjne a,ar3,00106$ 
+cjne a,ar3,00106$
 \begin_inset Newline newline
 \end_inset
 
@@ -29760,7 +30200,7 @@
 \begin_inset Newline newline
 \end_inset
 
-00106$: 
+00106$:
 \begin_inset Newline newline
 \end_inset
 
@@ -29802,7 +30242,7 @@
 \begin_inset space ~
 \end_inset
 
-r3,_head 
+r3,_head
 \begin_inset Newline newline
 \end_inset
 
@@ -29830,7 +30270,7 @@
 \begin_inset space ~
 \end_inset
 
-_head 
+_head
 \begin_inset Newline newline
 \end_inset
 
@@ -29858,7 +30298,7 @@
 \begin_inset space ~
 \end_inset
 
-dpl,r3 
+dpl,r3
 \begin_inset Newline newline
 \end_inset
 
@@ -29886,7 +30326,7 @@
 \begin_inset space ~
 \end_inset
 
-dph,#(_buf >> 8) 
+dph,#(_buf >> 8)
 \begin_inset Newline newline
 \end_inset
 
@@ -29914,7 +30354,7 @@
 \begin_inset space ~
 \end_inset
 
-a,r2 
+a,r2
 \begin_inset Newline newline
 \end_inset
 
@@ -29934,11 +30374,11 @@
 \begin_inset space ~
 \end_inset
 
-movx @dptr,a 
+movx @dptr,a
 \begin_inset Newline newline
 \end_inset
 
-00103$: 
+00103$:
 \begin_inset Newline newline
 \end_inset
 
@@ -30295,7 +30735,6 @@
 \end_inset
 
 ; save used registers here.
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -30332,7 +30771,6 @@
 \end_inset
 
 ; If we were still using r2,r3 we would have to push them here.
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -30888,7 +31326,7 @@
 \begin_inset space ~
 \end_inset
 
-; restore used registers here 
+; restore used registers here
 \begin_inset Newline newline
 \end_inset
 
@@ -31463,7 +31901,7 @@
 \begin_layout Standard
 A special keyword may be associated with a function declaring it as 
 \emph on
-_naked
+__naked
 \begin_inset Index
 status collapsed
 
@@ -32713,7 +33151,7 @@
 
 \end_inset
 
- 
+
 \begin_inset Newline newline
 \end_inset
 
@@ -32753,11 +33191,11 @@
 \begin_inset space ~
 \end_inset
 
-b,#10 
+b,#10
 \begin_inset Newline newline
 \end_inset
 
-00001$: 
+00001$:
 \begin_inset Newline newline
 \end_inset
 
@@ -32793,7 +33231,7 @@
 \begin_inset space ~
 \end_inset
 
-b,00001$ 
+b,00001$
 \begin_inset Newline newline
 \end_inset
 
@@ -32875,7 +33313,7 @@
 \begin_layout Verse
 
 \family typewriter
-foo() { 
+foo() {
 \begin_inset Newline newline
 \end_inset
 
@@ -32895,7 +33333,7 @@
 \begin_inset space ~
 \end_inset
 
-/* some c code */ 
+/* some c code */
 \begin_inset Newline newline
 \end_inset
 
@@ -32915,7 +33353,7 @@
 \begin_inset space ~
 \end_inset
 
-__asm 
+__asm
 \begin_inset Newline newline
 \end_inset
 
@@ -32943,7 +33381,7 @@
 \begin_inset space ~
 \end_inset
 
-; some assembler code 
+; some assembler code
 \begin_inset Newline newline
 \end_inset
 
@@ -32971,7 +33409,7 @@
 \begin_inset space ~
 \end_inset
 
-ljmp 0003$ 
+ljmp 0003$
 \begin_inset Newline newline
 \end_inset
 
@@ -32991,7 +33429,7 @@
 \begin_inset space ~
 \end_inset
 
-__endasm; 
+__endasm;
 \begin_inset Newline newline
 \end_inset
 
@@ -33011,7 +33449,7 @@
 \begin_inset space ~
 \end_inset
 
-/* some more c code */ 
+/* some more c code */
 \begin_inset Newline newline
 \end_inset
 
@@ -33078,7 +33516,7 @@
 \begin_inset space ~
 \end_inset
 
-0003$: ;label (can be referenced by inline assembler only) 
+0003$: ;label (can be referenced by inline assembler only)
 \begin_inset Newline newline
 \end_inset
 
@@ -33155,7 +33593,7 @@
 
 \end_inset
 
- ; 
+ ;
 \begin_inset Newline newline
 \end_inset
 
@@ -33485,7 +33923,7 @@
 , the caller will swap register banks around the call, if caller and callee
  use different register banks (having them defined by the 
 \family typewriter
-_using
+__using
 \family default
  modifier).
  
@@ -33635,7 +34073,38 @@
 \begin_layout Verse
 
 \family typewriter
-.globl _asm_func_PARM_2 
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset space ~
+\end_inset
+
+.globl _asm_func_PARM_2
 \begin_inset Newline newline
 \end_inset
 
@@ -33671,7 +34140,7 @@
 \begin_inset space ~
 \end_inset
 
-.globl _asm_func 
+.globl _asm_func
 \begin_inset Newline newline
 \end_inset
 
@@ -33707,7 +34176,7 @@
 \begin_inset space ~
 \end_inset
 
-.area OSEG 
+.area OSEG
 \begin_inset Newline newline
 \end_inset
 
@@ -33747,7 +34216,7 @@
 \begin_inset space ~
 \end_inset
 
-.ds    1 
+.ds    1
 \begin_inset Newline newline
 \end_inset
 
@@ -33783,11 +34252,11 @@
 \begin_inset space ~
 \end_inset
 
-.area CSEG 
+.area CSEG
 \begin_inset Newline newline
 \end_inset
 
-_asm_func: 
+_asm_func:
 \begin_inset Newline newline
 \end_inset
 
@@ -33839,7 +34308,7 @@
 \begin_inset space ~
 \end_inset
 
-a,dpl 
+a,dpl
 \begin_inset Newline newline
 \end_inset
 
@@ -33891,7 +34360,7 @@
 \begin_inset space ~
 \end_inset
 
-a,_asm_func_PARM_2 
+a,_asm_func_PARM_2
 \begin_inset Newline newline
 \end_inset
 
@@ -33943,7 +34412,7 @@
 \begin_inset space ~
 \end_inset
 
-dpl,a 
+dpl,a
 \begin_inset Newline newline
 \end_inset
 
@@ -34005,7 +34474,7 @@
 
 \end_inset
 
-,#0x00 
+,#0x00
 \begin_inset Newline newline
 \end_inset
 
@@ -34167,7 +34636,7 @@
 \begin_inset Newline newline
 \end_inset
 
-{ 
+{
 \begin_inset Newline newline
 \end_inset
 
@@ -34187,11 +34656,11 @@
 \begin_inset space ~
 \end_inset
 
-return asm_func(i,j,k); 
+return asm_func(i,j,k);
 \begin_inset Newline newline
 \end_inset
 
-} 
+}
 \begin_inset Newline newline
 \end_inset
 
@@ -34199,11 +34668,11 @@
 \begin_inset Newline newline
 \end_inset
 
-int main() 
+int main()
 \begin_inset Newline newline
 \end_inset
 
-{ 
+{
 \begin_inset Newline newline
 \end_inset
 
@@ -34223,7 +34692,7 @@
 \begin_inset space ~
 \end_inset
 
-return c_func(10,9,8); 
+return c_func(10,9,8);
 \begin_inset Newline newline
 \end_inset
 
@@ -34237,11 +34706,11 @@
 \begin_layout Verse
 
 \family typewriter
-.globl _asm_func 
+.globl _asm_func
 \begin_inset Newline newline
 \end_inset
 
-_asm_func: 
+_asm_func:
 \begin_inset Newline newline
 \end_inset
 
@@ -34265,7 +34734,7 @@
 \begin_inset space ~
 \end_inset
 
-_bp 
+_bp
 \begin_inset Newline newline
 \end_inset
 
@@ -34449,7 +34918,7 @@
 \begin_inset space ~
 \end_inset
 
-r0,a 
+r0,a
 \begin_inset Newline newline
 \end_inset
 
@@ -34477,7 +34946,7 @@
 \begin_inset space ~
 \end_inset
 
-a,_bp 
+a,_bp
 \begin_inset Newline newline
 \end_inset
 
@@ -34553,7 +35022,7 @@
 \begin_inset space ~
 \end_inset
 
-r1,a 
+r1,a
 \begin_inset Newline newline
 \end_inset
 
@@ -34753,7 +35222,7 @@
 \begin_inset space ~
 \end_inset
 
-dph,#0x00 
+dph,#0x00
 \begin_inset Newline newline
 \end_inset
 
@@ -34781,7 +35250,7 @@
 \begin_inset space ~
 \end_inset
 
-sp,_bp 
+sp,_bp
 \begin_inset Newline newline
 \end_inset
 
@@ -34809,7 +35278,7 @@
 \begin_inset space ~
 \end_inset
 
-_bp 
+_bp
 \begin_inset Newline newline
 \end_inset
 
@@ -34852,13 +35321,6 @@
  functions from Small-C.
 \end_layout
 
-\begin_layout Standard
-\begin_inset VSpace bigskip
-\end_inset
-
-
-\end_layout
-
 \begin_layout Section
 int (16 bit)
 \begin_inset Index
@@ -35965,10 +36427,6 @@
  Also notice that you don't have to call this routines directly.
  The compiler will use them automatically every time a floating point operation
  is required.
-\begin_inset VSpace bigskip
-\end_inset
-
-
 \end_layout
 
 \begin_layout Section
@@ -35988,10 +36446,21 @@
 \begin_layout Standard
 
 \emph on
-<pending: this is messy and incomplete - a little more information is in
- sdcc/doc/libdoc.txt
+<pending: this is messy and incomplete - a little more information is at
+ 
 \emph default
- >
+
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://sourceforge.net/apps/trac/sdcc/wiki/List%20of%20the%20SDCC%20library
+\end_layout
+
+\end_inset
+
+>
 \end_layout
 
 \begin_layout Subsection
@@ -36086,7 +36555,7 @@
 \begin_layout Verse
 
 \family typewriter
-void putchar (char c) { 
+void putchar (char c) {
 \begin_inset Newline newline
 \end_inset
 
@@ -36300,7 +36769,7 @@
 \emph on
 -
 \begin_inset ERT
-status open
+status collapsed
 
 \begin_layout Plain Layout
 
@@ -37736,42 +38205,22 @@
 
 \end_inset
 
- included in SDCC should have a license at least as liberal as the GNU Lesser
- General Public License
+ included in SDCC should have a license at least as liberal as the GPLv2+LE
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-GNU Lesser General Public License, LGPL
+GNUv2+LE
 \end_layout
 
 \end_inset
 
- 
-\emph on
-LGPL
-\emph default
 .
-\end_layout
-
-\begin_layout Standard
-\begin_inset Note Note
-status collapsed
-
-\begin_layout Plain Layout
-license statements for the libraries are missing.
- sdcc/device/lib/ser_ir.c
-\end_layout
-
-\begin_layout Plain Layout
-or _decdptr f.e.
- come with a GPL (as opposed to LGPL) License - this will not be liberal
- enough for many embedded programmers.
-\end_layout
-
-\end_inset
-
-
+ Exception are pic device libraries and header files which are derived from
+ Microchip header (.inc) and linker script (.lkr) files.
+ Microchip requires that "The header files should state that they are only
+ to be used with authentic Microchip devices" which makes them incompatible
+ with GPL.
 \end_layout
 
 \begin_layout Standard
@@ -37802,10 +38251,6 @@
  enthusiastic, so don't expect a big hurray but as the mailing list is searchabl
 e these references are very valuable.
  Let's help to create a climate where information is shared.
-\begin_inset VSpace bigskip
-\end_inset
-
-
 \end_layout
 
 \begin_layout Section
@@ -38184,7 +38629,6 @@
 -model-large
 \emph default
  option, variables will by default be placed into the XDATA segment.
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -38576,7 +39020,11 @@
 \end_inset
 
 .
- See also the related keyword _naked
+ See also the related keyword 
+\emph on
+__naked
+\emph default
+
 \begin_inset Index
 status collapsed
 
@@ -39004,7 +39452,11 @@
  table (e.g.
  for the autovector feature of the Cypress EZ-USB FX2).
  More elegantly this can be achieved by omitting the optional interrupt
- number after the interrupt keyword, see section 
+ number after the 
+\emph on
+__interrupt
+\emph default
+ keyword, see section 
 \begin_inset CommandInset ref
 LatexCommand ref
 reference "sub:Interrupt-Service-Routines"
@@ -40222,7 +40674,7 @@
 \begin_inset Newline newline
 \end_inset
 
-{ 
+{
 \begin_inset Newline newline
 \end_inset
 
@@ -40239,7 +40691,6 @@
 \end_inset
 
 ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -40272,11 +40723,10 @@
 \end_inset
 
 ...
- 
 \begin_inset Newline newline
 \end_inset
 
-} 
+}
 \begin_inset Newline newline
 \end_inset
 
@@ -40537,7 +40987,7 @@
 \begin_inset space ~
 \end_inset
 
-/* save the current settings */ 
+/* save the current settings */
 \begin_inset Newline newline
 \end_inset
 
@@ -40583,7 +41033,7 @@
 \begin_inset space ~
 \end_inset
 
-/* turnoff global subexpression elimination */ 
+/* turnoff global subexpression elimination */
 \begin_inset Newline newline
 \end_inset
 
@@ -40609,15 +41059,15 @@
 
 \end_inset
 
- /* turn off induction optimizations */ 
+ /* turn off induction optimizations */
 \begin_inset Newline newline
 \end_inset
 
-int foo () 
+int foo ()
 \begin_inset Newline newline
 \end_inset
 
-{ 
+{
 \begin_inset Newline newline
 \end_inset
 
@@ -40630,7 +41080,6 @@
 \end_inset
 
  ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -40642,7 +41091,7 @@
 \begin_inset space ~
 \end_inset
 
- /* large code */ 
+ /* large code */
 \begin_inset Newline newline
 \end_inset
 
@@ -40655,11 +41104,10 @@
 \end_inset
 
  ...
- 
 \begin_inset Newline newline
 \end_inset
 
-} 
+}
 \begin_inset Newline newline
 \end_inset
 
@@ -40686,176 +41134,24 @@
 \end_inset
 
  /* turn the optimizations back on */
-\end_layout
-
-\begin_layout Standard
-The compiler will generate a warning message when extra space is allocated.
- It is strongly recommended that the save and restore pragmas be used when
- changing options for a function.
-\begin_inset Newline newline
-\end_inset
-
-
-\begin_inset Newline newline
-\end_inset
-
-
-\begin_inset Newline newline
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section
-Defines Created by the Compiler
-\end_layout
-
-\begin_layout Standard
-The compiler creates the following #defines
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-#
-\end_layout
-
-\end_inset
-
-defines
-\end_layout
-
-\end_inset
-
-
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-Defines created by the compiler
-\end_layout
-
-\end_inset
-
-:
-\begin_inset Newline newline
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset Tabular
-<lyxtabular version="3" rows="17" columns="2">
-<features>
-<column alignment="left" valignment="top" width="3in">
-<column alignment="left" valignment="top" width="3in">
-<row>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\series bold
-#define
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\series bold
-Description
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-SDCC
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-SDCC!Defines!SDCC (version macro)
-\end_layout
-
-\end_inset
-
-
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-version macro
-\end_layout
-
-\end_inset
-
- 
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Always defined.
- Since version 2.5.6 the version number as an int (ex.
- 256)
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-SDCC_mcs51
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-SDCC!Defines!SDCC
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-_
-\end_layout
-
-\end_inset
+\end_layout
 
-mcs51
+\begin_layout Standard
+The compiler will generate a warning message when extra space is allocated.
+ It is strongly recommended that the save and restore pragmas be used when
+ changing options for a function.
 \end_layout
 
-\end_inset
+\begin_layout Section
+Defines Created by the Compiler
+\end_layout
 
- or SDCC_ds390
+\begin_layout Standard
+The compiler creates the following #defines
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-SDCC!Defines!SDCC
 \begin_inset ERT
 status collapsed
 
@@ -40863,49 +41159,58 @@
 
 
 \backslash
-_
+#
 \end_layout
 
 \end_inset
 
-ds390
+defines
 \end_layout
 
 \end_inset
 
- or SDCC_z80
-\begin_inset Index
-status collapsed
 
-\begin_layout Plain Layout
-SDCC!Defines!SDCC
-\begin_inset ERT
+\begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-
-
-\backslash
-_
+Defines created by the compiler
 \end_layout
 
 \end_inset
 
-z80
+:
+\begin_inset Newline newline
+\end_inset
+
+
 \end_layout
 
-\end_inset
+\begin_layout Standard
+\begin_inset Tabular
+<lyxtabular version="3" rows="16" columns="2">
+<features>
+<column alignment="left" valignment="top" width="3in">
+<column alignment="left" valignment="top" width="3in">
+<row>
+<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
 
-, etc.
+\begin_layout Plain Layout
+
+\series bold
+#define
 \end_layout
 
 \end_inset
 </cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-depending on the model used (e.g.: -mds390)
+
+\series bold
+Description
 \end_layout
 
 \end_inset
@@ -40916,59 +41221,57 @@
 \begin_inset Text
 
 \begin_layout Plain Layout
-__mcs51
+__SDCC
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-_
+SDCC!Defines!__SDCC (version macro)
 \end_layout
 
 \end_inset
 
 
-\begin_inset ERT
+\begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-
-
-\backslash
-_
+version macro
 \end_layout
 
 \end_inset
 
-mcs51
+ 
 \end_layout
 
 \end_inset
-
-, __ds390
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-\begin_inset ERT
-status collapsed
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
 
 \begin_layout Plain Layout
-
-
-\backslash
-_
+Always defined.
+ Version number string (e.g.
+ SDCC_3_2_0 for sdcc 3.2.0).
+ In older versions SDCC was always defined instead.
+ From version 2.5.6 SDCC was the version number as an int (ex.
+ 256).
 \end_layout
 
 \end_inset
+</cell>
+</row>
+<row>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
 
+\begin_layout Plain Layout
+__SDCC_mcs51
+\begin_inset Index
+status collapsed
 
+\begin_layout Plain Layout
+SDCC!Defines!__SDCC
 \begin_inset ERT
 status collapsed
 
@@ -40981,16 +41284,17 @@
 
 \end_inset
 
-ds390
+mcs51
 \end_layout
 
 \end_inset
 
-, __hc08
+ or __SDCC_ds390
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
+SDCC!Defines!__SDCC
 \begin_inset ERT
 status collapsed
 
@@ -41003,42 +41307,17 @@
 
 \end_inset
 
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-_
-\end_layout
-
-\end_inset
-
-hc08
+ds390
 \end_layout
 
 \end_inset
 
-, __z80
+ or __SDCC_z80
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-_
-\end_layout
-
-\end_inset
-
-
+SDCC!Defines!__SDCC
 \begin_inset ERT
 status collapsed
 
@@ -41056,7 +41335,7 @@
 
 \end_inset
 
-, etc
+, etc.
 \end_layout
 
 \end_inset
@@ -41065,8 +41344,9 @@
 \begin_inset Text
 
 \begin_layout Plain Layout
-depending on the model used (e.g.
- -mz80)
+depending on the model used (e.g.: -mds390).
+ Older versions used SDCC_mcs51, etc instead.
+ 
 \end_layout
 
 \end_inset
@@ -41077,7 +41357,7 @@
 \begin_inset Text
 
 \begin_layout Plain Layout
-SDCC_STACK_AUTO
+__SDCC_STACK_AUTO
 \begin_inset Index
 status collapsed
 
@@ -41150,7 +41430,7 @@
 \begin_inset Text
 
 \begin_layout Plain Layout
-SDCC_MODEL_SMALL
+__SDCC_MODEL_SMALL
 \begin_inset Index
 status collapsed
 
@@ -41223,7 +41503,7 @@
 \begin_inset Text
 
 \begin_layout Plain Layout
-SDCC_MODEL_MEDIUM
+__SDCC_MODEL_MEDIUM
 \begin_inset Index
 status collapsed
 
@@ -41296,7 +41576,7 @@
 \begin_inset Text
 
 \begin_layout Plain Layout
-SDCC_MODEL_LARGE
+__SDCC_MODEL_LARGE
 \begin_inset Index
 status collapsed
 
@@ -41369,7 +41649,7 @@
 \begin_inset Text
 
 \begin_layout Plain Layout
-SDCC_MODEL_HUGE
+__SDCC_MODEL_HUGE
 \begin_inset Index
 status collapsed
 
@@ -41442,7 +41722,7 @@
 \begin_inset Text
 
 \begin_layout Plain Layout
-SDCC_USE_XSTACK
+__SDCC_USE_XSTACK
 \begin_inset Index
 status collapsed
 
@@ -41515,7 +41795,7 @@
 \begin_inset Text
 
 \begin_layout Plain Layout
-SDCC_CHAR_UNSIGNED
+__SDCC_CHAR_UNSIGNED
 \begin_inset Index
 status collapsed
 
@@ -41588,7 +41868,7 @@
 \begin_inset Text
 
 \begin_layout Plain Layout
-SDCC_STACK_TENBIT
+__SDCC_STACK_TENBIT
 \begin_inset Index
 status collapsed
 
@@ -41648,7 +41928,7 @@
 \begin_inset Text
 
 \begin_layout Plain Layout
-SDCC_MODEL_FLAT24
+__SDCC_MODEL_FLAT24
 \begin_inset Index
 status collapsed
 
@@ -41708,7 +41988,7 @@
 \begin_inset Text
 
 \begin_layout Plain Layout
-SDCC_REVISION
+__SDCC_REVISION
 \begin_inset Index
 status collapsed
 
@@ -41741,7 +42021,8 @@
 
 \begin_layout Plain Layout
 Always defined.
- SDCC svn revision number
+ SDCC svn revision number.
+ Older versions of sdcc used SDCC_REVISION instead.
 \end_layout
 
 \end_inset
@@ -41838,7 +42119,7 @@
 \begin_inset Text
 
 \begin_layout Plain Layout
-SDCC_FLOAT_REENT
+__SDCC_FLOAT_REENT
 \begin_inset Index
 status collapsed
 
@@ -41911,7 +42192,7 @@
 \begin_inset Text
 
 \begin_layout Plain Layout
-SDCC_INT_LONG_REENT
+__SDCC_INT_LONG_REENT
 \begin_inset Index
 status collapsed
 
@@ -42411,7 +42692,7 @@
 To create a function that can be called from another bank it requires the
  keyword 
 \emph on
-banked
+__banked
 \emph default
 
 \begin_inset Index
@@ -42428,7 +42709,7 @@
  needs it for a proper return.
  Called functions within the same bank as the caller do not need the 
 \emph on
-banked
+__banked
 \emph default
  keyword nor do functions in the common area.
  Beware: SDCC does not know or check if functions are in the same bank.
@@ -42505,13 +42786,6 @@
  The linker will not check for overflows, again this is your responsibility.
 \end_layout
 
-\begin_layout Standard
-\begin_inset VSpace bigskip
-\end_inset
-
-
-\end_layout
-
 \begin_layout Section
 DS400 port
 \end_layout
@@ -42556,14 +42830,10 @@
 
 .
  
-\begin_inset VSpace bigskip
-\end_inset
-
-
 \end_layout
 
 \begin_layout Section
-The Z80, Z180, Rabbit 2000/3000 and GBZ80 ports
+The Z80, Z180, Rabbit 2000/3000, Rabbit 3000A and GBZ80 ports
 \end_layout
 
 \begin_layout Standard
@@ -42577,7 +42847,8 @@
 
 \end_inset
 
-, Z180, Rabbit 2000/3000 and the Nintendo GameBoy's Z80-like gbz80
+, Z180, Rabbit 2000/3000, Rabbit 3000A and LR35902, the Nintendo GameBoy's
+ Z80-like gbz80
 \begin_inset Index
 status collapsed
 
@@ -42588,7 +42859,7 @@
 \end_inset
 
 .
- The Z80 port is passed through the same 
+ These ports passed through the same 
 \emph on
 regressions tests
 \begin_inset Index
@@ -42645,14 +42916,28 @@
  The gbz80 port use the same set of registers for the return values, but
  in a different order of significance: E (one byte), DE (two bytes), or
  HLDE (four bytes).
-\begin_inset VSpace bigskip
-\end_inset
+\end_layout
+
+\begin_layout Standard
+When enabling optimizations using --opt-code size and a sufficiently high
+ value for --max-allocs-per-node sdcc typically generates much better code
+ for these architectures than any other compiler.
+ A comparison of compilers for these architecture can be found at 
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
 
+https://sourceforge.net/apps/trac/sdcc/wiki/z80%20code%20size
+\end_layout
+
+\end_inset
 
+.
 \end_layout
 
 \begin_layout Section
-The HC08 port
+The HC08 and S08 ports
 \end_layout
 
 \begin_layout Standard
@@ -42666,16 +42951,24 @@
 
 \end_inset
 
- family has been added in October 2003, and is still undergoing some basic
- development.
- The code generator is complete, but the register allocation is still quite
- unoptimized.
- Some of the SDCC's standard C library functions have embedded non-HC08
- inline assembly and so are not yet usable.
+ and S08 does not yet generated code as compact as that generated by some
+ non-free compilers.
+ A comparison of compilers for these architecture can be found at 
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+https://sourceforge.net/apps/trac/sdcc/wiki/hc08%20code%20size
+\end_layout
+
+\end_inset
+
+.
 \end_layout
 
 \begin_layout Standard
-The HC08 port passes the regression test suite (see section 
+The HC08 and S08 ports pass the regression test suite (see section 
 \begin_inset CommandInset ref
 LatexCommand ref
 reference "sec:Quality-control"
@@ -42683,10 +42976,6 @@
 \end_inset
 
 ).
-\begin_inset VSpace bigskip
-\end_inset
-
-
 \end_layout
 
 \begin_layout Section
@@ -42777,12 +43066,12 @@
 \end_layout
 
 \begin_layout Standard
-16F: 716, 72, 73, 737, 74, 747, 76, 767, 77, 777, 785
+16F: 716, 72, 720, 721, 73, 737, 74, 747, 76, 767, 77, 777, 785
 \end_layout
 
 \begin_layout Standard
 16F: 818, 819, 84, 84a, 87, 870, 871, 872, 873, 873a, 874, 874a, 876, 876a,
- 877, 877a, 88, 886, 887
+ 877, 877a, 88, 882, 883, 884, 886, 887
 \end_layout
 
 \begin_layout Standard
@@ -42804,7 +43093,8 @@
 \end_layout
 
 \begin_layout Standard
-16F: 1455, 1458, 1459, 1507, 1782, 1783
+16F: 1455, 1458, 1459, 1503, 1507, 1508, 1509, 1516, 1517, 1518, 1519, 1526,
+ 1527, 1782, 1783
 \end_layout
 
 \begin_layout Standard
@@ -42812,7 +43102,7 @@
 \end_layout
 
 \begin_layout Standard
-16F: 1933, 1934, 1936, 1937, 1938, 1939
+16F: 1933, 1934, 1936, 1937, 1938, 1939, 1946, 1947
 \end_layout
 
 \begin_layout Standard
@@ -42906,7 +43196,7 @@
 \begin_layout Standard
 Adding support for a new 14
 \begin_inset ERT
-status open
+status collapsed
 
 \begin_layout Plain Layout
 
@@ -42971,9 +43261,13 @@
 \end_layout
 
 \begin_layout Standard
-For the interrupt function, use the keyword `__interrupt'
+For the interrupt function, use the keyword 
+\emph on
+__interrupt
+\emph default
+
 \begin_inset Index
-status collapsed
+status open
 
 \begin_layout Plain Layout
 PIC14!interrupt
@@ -43158,7 +43452,7 @@
 
 -use-non-free
 \begin_inset Index
-status open
+status collapsed
 
 \begin_layout Plain Layout
 -
@@ -43244,7 +43538,7 @@
 \begin_inset space ~
 \end_inset
 
-sdcc -V --use-non-free -mpic14 -p16f877 -c $< 
+sdcc -V --use-non-free -mpic14 -p16f877 -c $<
 \begin_inset Newline newline
 \end_inset
 
@@ -43252,7 +43546,7 @@
 \begin_inset Newline newline
 \end_inset
 
-$(PRJ).hex: $(OBJS) 
+$(PRJ).hex: $(OBJS)
 \begin_inset Newline newline
 \end_inset
 
@@ -43338,7 +43632,7 @@
 \begin_inset space ~
 \end_inset
 
-sdcc -S -V --use-non-free -mpic14 -p16f877 $< 
+sdcc -S -V --use-non-free -mpic14 -p16f877 $<
 \begin_inset Newline newline
 \end_inset
 
@@ -43382,7 +43676,7 @@
 \begin_inset Newline newline
 \end_inset
 
-$(PRJ).hex: $(OBJS) 
+$(PRJ).hex: $(OBJS)
 \begin_inset Newline newline
 \end_inset
 
@@ -43958,7 +44252,7 @@
 This warning can usually be ignored due to the very good compatibility amongst
  14
 \begin_inset ERT
-status open
+status collapsed
 
 \begin_layout Plain Layout
 
@@ -44022,15 +44316,6 @@
  However, many smaller projects have successfully used SDCC in the past...
 \end_layout
 
-\begin_layout Standard
-
-\size footnotesize
-\begin_inset Newpage newpage
-\end_inset
-
-
-\end_layout
-
 \begin_layout Section
 The PIC16
 \begin_inset Index
@@ -44084,7 +44369,7 @@
 \end_layout
 
 \begin_layout Standard
-18F: 1220, 1320, 13k50, 14k50
+18F: 1220, 1230, 1320, 1330, 13k50, 14k50
 \end_layout
 
 \begin_layout Standard
@@ -45027,7 +45312,7 @@
 \begin_layout Standard
 \align center
 \begin_inset Tabular
-<lyxtabular version="3" rows="6" columns="2">
+<lyxtabular version="3" rows="5" columns="2">
 <features>
 <column alignment="center" valignment="top" width="0">
 <column alignment="center" valignment="top" width="0">
@@ -45056,12 +45341,12 @@
 \begin_inset Text
 
 \begin_layout Plain Layout
-SDCC_pic16
+__SDCC_pic16
 \begin_inset Index
 status collapsed
 
 \begin_layout Plain Layout
-SDCC!Defines!SDCC
+SDCC!Defines!__SDCC
 \begin_inset ERT
 status collapsed
 
@@ -45099,75 +45384,6 @@
 \begin_inset Text
 
 \begin_layout Plain Layout
-_
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-/
-\end_layout
-
-\end_inset
-
-_pic16
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-PIC16!Defines!
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-_
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-_
-\end_layout
-
-\end_inset
-
-pic16
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Port identification (same as above)
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
 pic18fxxxx
 \begin_inset Index
 status collapsed
@@ -45394,7 +45610,7 @@
 \begin_inset Text
 
 \begin_layout Plain Layout
-SDCC_MODEL_nnn
+__SDCC_MODEL_nnn
 \end_layout
 
 \end_inset
@@ -45453,6 +45669,10 @@
 \end_inset
 
  port uses the following directories for searching header files and libraries.
+\begin_inset Newline newline
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
@@ -45840,10 +46060,6 @@
 \end_inset
 
 The format is as follows:
-\begin_inset Newline newline
-\end_inset
-
-
 \end_layout
 
 \begin_layout LyX-Code
@@ -45934,7 +46150,30 @@
 \end_layout
 
 \begin_layout Description
-library instructs the linker to use a library module.
+library
+\begin_inset Index
+status collapsed
+
+\begin_layout Plain Layout
+PIC16!Pragmas!
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+#
+\end_layout
+
+\end_inset
+
+pragma library
+\end_layout
+
+\end_inset
+
+ instructs the linker to use a library module.
 \begin_inset Newline newline
 \end_inset
 
@@ -46189,8 +46428,31 @@
 \end_layout
 
 \begin_layout Description
-udata The pragma udata instructs the compiler to emit code so that linker
- will place a variable at a specific memory bank.
+udata
+\begin_inset Index
+status collapsed
+
+\begin_layout Plain Layout
+PIC16!Pragmas!
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+#
+\end_layout
+
+\end_inset
+
+pragma udata
+\end_layout
+
+\end_inset
+
+ The pragma udata instructs the compiler to emit code so that linker will
+ place a variable at a specific memory bank.
 \end_layout
 
 \begin_layout LyX-Code
@@ -46333,6 +46595,68 @@
  the SECTION line in the linker script file.
 \end_layout
 
+\begin_layout Description
+config
+\begin_inset Index
+status collapsed
+
+\begin_layout Plain Layout
+PIC16!Pragmas!
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+#
+\end_layout
+
+\end_inset
+
+pragma config
+\end_layout
+
+\end_inset
+
+ The pragma config instructs the compiler to emit config directive.
+\begin_inset Newline newline
+\end_inset
+
+The format is as follows:
+\end_layout
+
+\begin_layout LyX-Code
+#pragma config setting=value [, setting=value]
+\end_layout
+
+\begin_layout LyX-Code
+
+\end_layout
+
+\begin_layout Standard
+Multiple settings may be defined on a single line, separated by commas.
+ Settings for a single configuration byte may also be defined on separate
+ lines.
+ 
+\end_layout
+
+\begin_layout LyX-Code
+Example:
+\end_layout
+
+\begin_layout LyX-Code
+
+\end_layout
+
+\begin_layout LyX-Code
+#pragma config CP0=OFF,OSCS=ON,OSC=LP,BOR=ON,BORV=25,WDT=ON,WDTPS=128,CCP2MUX=ON
+\end_layout
+
+\begin_layout LyX-Code
+#pragma config STVR=ON 
+\end_layout
+
 \begin_layout Subsection
 Header Files and Libraries
 \begin_inset CommandInset label
@@ -47328,7 +47652,7 @@
 \end_layout
 
 \begin_layout Description
-wparam
+__wparam
 \begin_inset Index
 status collapsed
 
@@ -47346,7 +47670,7 @@
 \end_layout
 
 \begin_layout LyX-Code
-void func_wparam(int a) wparam
+void func_wparam(int a) __wparam
 \end_layout
 
 \begin_layout LyX-Code
@@ -47371,7 +47695,7 @@
 \end_layout
 
 \begin_layout Description
-shadowregs
+__shadowregs
 \begin_inset Index
 status collapsed
 
@@ -47386,17 +47710,17 @@
  registers.
  This can be done by adding the keyword 
 \emph on
-shadowregs
+__shadowregs
 \emph default
  before the 
 \emph on
-interrupt
+__interrupt
 \emph default
  keyword in the function's header.
 \end_layout
 
 \begin_layout LyX-Code
-void isr_shadow(void) shadowregs interrupt 1
+void isr_shadow(void) __shadowregs __interrupt 1
 \end_layout
 
 \begin_layout LyX-Code
@@ -47414,7 +47738,7 @@
 \begin_layout Standard
 
 \emph on
-shadowregs
+__shadowregs
 \emph default
  instructs the code generator not to store/restore WREG, STATUS, BSR when
  entering/exiting the ISR.
@@ -47581,13 +47905,13 @@
 
  service routine (ISR) is declared using the 
 \emph on
-interrupt
+__interrupt
 \emph default
  keyword.
 \end_layout
 
 \begin_layout LyX-Code
-void isr(void) interrupt 
+void isr(void) __interrupt 
 \emph on
 n
 \end_layout
@@ -48191,7 +48515,7 @@
 \begin_inset Newline newline
 \end_inset
 
-static __code char __at(__CONFIG1L) configword1l = 
+static __code char __at(__CONFIG1L) configword1l =
 \begin_inset Newline newline
 \end_inset
 
@@ -48649,7 +48973,10 @@
 \emph on
 putchar
 \emph default
- is declared in stdio.h as having its parameter in WREG (it has the wparam
+ is declared in stdio.h as having its parameter in WREG (it has the 
+\emph on
+__wparam
+\emph default
  keyword).
  In stdio.h exists the macro PUTCHAR(arg) that defines the putchar function
  in a user-friendly way.
@@ -48686,7 +49013,7 @@
 \end_layout
 
 \begin_layout LyX-Code
-} 
+}
 \begin_inset Newline newline
 \end_inset
 
@@ -50516,7 +50843,7 @@
 
 \begin_layout Standard
 \begin_inset Note Note
-status open
+status collapsed
 
 \begin_layout Plain Layout
 Check that the double quotes or an apostrophe within the command line survive
@@ -50573,7 +50900,7 @@
 \family typewriter
 (load-file sdcdbsrc.el)
 \family default
- 
+
 \begin_inset Newline newline
 \end_inset
 
@@ -50585,7 +50912,7 @@
  The files can also be loaded dynamically while XEmacs is running, set the
  environment variable 'EMACSLOADPATH' to the installation bin directory
  (<installdir>/bin), then enter the following command ESC-x load-file sdcdbsrc.
- To start the interface enter the following command: 
+ To start the interface enter the following command:
 \begin_inset Newline newline
 \end_inset
 
@@ -50608,7 +50935,6 @@
 \end_inset
 
 You will prompted to enter the file name to be debugged.
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -50651,7 +50977,7 @@
 \begin_inset space ~
 \end_inset
 
-Current Listing :: 
+Current Listing ::
 \begin_inset Newline newline
 \end_inset
 
@@ -50799,7 +51125,7 @@
 \begin_inset space ~
 \end_inset
 
-Comment 
+Comment
 \begin_inset Newline newline
 \end_inset
 
@@ -51059,7 +51385,7 @@
 \begin_inset space ~
 \end_inset
 
-SDCDB next command 
+SDCDB next command
 \begin_inset Newline newline
 \end_inset
 
@@ -51167,7 +51493,7 @@
 \begin_inset space ~
 \end_inset
 
-SDCDB back command 
+SDCDB back command
 \begin_inset Newline newline
 \end_inset
 
@@ -51383,7 +51709,7 @@
 \begin_inset space ~
 \end_inset
 
-SDCDB step command 
+SDCDB step command
 \begin_inset Newline newline
 \end_inset
 
@@ -51491,7 +51817,7 @@
 \begin_inset space ~
 \end_inset
 
-SDCDB ptypecommand for data at 
+SDCDB ptypecommand for data at
 \begin_inset Newline newline
 \end_inset
 
@@ -51683,7 +52009,7 @@
 \begin_inset space ~
 \end_inset
 
-buffer point 
+buffer point
 \begin_inset Newline newline
 \end_inset
 
@@ -51807,7 +52133,7 @@
 \begin_inset space ~
 \end_inset
 
-SDCDB Delete all breakpoints if no arg 
+SDCDB Delete all breakpoints if no arg
 \begin_inset Newline newline
 \end_inset
 
@@ -51999,7 +52325,7 @@
 \begin_inset space ~
 \end_inset
 
-given or delete arg (C-u arg x) 
+given or delete arg (C-u arg x)
 \begin_inset Newline newline
 \end_inset
 
@@ -52127,7 +52453,7 @@
 \begin_inset space ~
 \end_inset
 
-SDCDB Display current frame if no arg, 
+SDCDB Display current frame if no arg,
 \begin_inset Newline newline
 \end_inset
 
@@ -52319,7 +52645,7 @@
 \begin_inset space ~
 \end_inset
 
-given or display frame arg 
+given or display frame arg
 \begin_inset Newline newline
 \end_inset
 
@@ -52511,7 +52837,7 @@
 \begin_inset space ~
 \end_inset
 
-buffer point 
+buffer point
 \begin_inset Newline newline
 \end_inset
 
@@ -52619,7 +52945,7 @@
 \begin_inset space ~
 \end_inset
 
-Goto the SDCDB output buffer 
+Goto the SDCDB output buffer
 \begin_inset Newline newline
 \end_inset
 
@@ -52731,7 +53057,7 @@
 \begin_inset space ~
 \end_inset
 
-SDCDB print command for data at 
+SDCDB print command for data at
 \begin_inset Newline newline
 \end_inset
 
@@ -52923,7 +53249,7 @@
 \begin_inset space ~
 \end_inset
 
-buffer point 
+buffer point
 \begin_inset Newline newline
 \end_inset
 
@@ -53031,7 +53357,7 @@
 \begin_inset space ~
 \end_inset
 
-Goto the SDCDB output buffer 
+Goto the SDCDB output buffer
 \begin_inset Newline newline
 \end_inset
 
@@ -53163,11 +53489,11 @@
 \begin_inset space ~
 \end_inset
 
-Toggles Sdcdbsrc mode (turns it off) 
+Toggles Sdcdbsrc mode (turns it off)
 \begin_inset Newline newline
 \end_inset
 
-;; 
+;;
 \begin_inset Newline newline
 \end_inset
 
@@ -53247,11 +53573,11 @@
 \begin_inset space ~
 \end_inset
 
-SDCDB finish command 
+SDCDB finish command
 \begin_inset Newline newline
 \end_inset
 
-;; 
+;;
 \begin_inset Newline newline
 \end_inset
 
@@ -53371,7 +53697,7 @@
 \begin_inset space ~
 \end_inset
 
-Set break for line with point 
+Set break for line with point
 \begin_inset Newline newline
 \end_inset
 
@@ -53491,7 +53817,7 @@
 \begin_inset space ~
 \end_inset
 
-Toggle Sdcdbsrc mode 
+Toggle Sdcdbsrc mode
 \begin_inset Newline newline
 \end_inset
 
@@ -53599,21 +53925,11 @@
 \begin_inset space ~
 \end_inset
 
-Toggle list mode 
-\begin_inset Newline newline
-\end_inset
-
-;; 
+Toggle list mode
 \begin_inset Newline newline
 \end_inset
 
-
-\family default
-
-\begin_inset Newpage newpage
-\end_inset
-
-
+;;
 \end_layout
 
 \begin_layout Chapter
@@ -53728,7 +54044,6 @@
 (int) uc * (int) uc = (int) 0xfe * (int) 0xfe = (int) 0xfc04 = -1024
 \family default
 .
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -54037,20 +54352,7 @@
 status collapsed
 
 \begin_layout Plain Layout
-̃
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-/
-\end_layout
-
-\end_inset
-
- Operator
+~ Operator
 \end_layout
 
 \end_inset
@@ -55059,7 +55361,7 @@
 
 
 \begin_inset Flex URL
-status open
+status collapsed
 
 \begin_layout Plain Layout
 
@@ -57060,10 +57362,6 @@
 \end_inset
 
 
-\begin_inset Newline newline
-\end_inset
-
-
 \end_layout
 
 \begin_layout Section
@@ -58607,10 +58905,6 @@
 \begin_layout Standard
 then SDCC is probably among the first choices.
  Well, probably SDCC might be the only choice.
-\begin_inset Newpage newpage
-\end_inset
-
-
 \end_layout
 
 \begin_layout Chapter
@@ -58674,7 +58968,7 @@
 \begin_layout Verse
 
 \family typewriter
-i = x + y + 1; 
+i = x + y + 1;
 \begin_inset Newline newline
 \end_inset
 
@@ -58688,11 +58982,11 @@
 \begin_layout Verse
 
 \family typewriter
-iTemp = x + y; 
+iTemp = x + y;
 \begin_inset Newline newline
 \end_inset
 
-i = iTemp + 1; 
+i = iTemp + 1;
 \begin_inset Newline newline
 \end_inset
 
@@ -58706,7 +59000,7 @@
 \begin_layout Verse
 
 \family typewriter
-a->b[i].c = 10; 
+a->b[i].c = 10;
 \begin_inset Newline newline
 \end_inset
 
@@ -58721,11 +59015,11 @@
 \begin_layout Verse
 
 \family typewriter
-iTemp = a->b[i]; 
+iTemp = a->b[i];
 \begin_inset Newline newline
 \end_inset
 
-iTemp.c = 10; 
+iTemp.c = 10;
 \begin_inset Newline newline
 \end_inset
 
@@ -58761,7 +59055,7 @@
 \begin_inset Newline newline
 \end_inset
 
-void f () { 
+void f () {
 \begin_inset Newline newline
 \end_inset
 
@@ -58773,7 +59067,7 @@
 \begin_inset space ~
 \end_inset
 
-int i; 
+int i;
 \begin_inset Newline newline
 \end_inset
 
@@ -58805,7 +59099,7 @@
 \begin_inset space ~
 \end_inset
 
-/* dead store */ 
+/* dead store */
 \begin_inset Newline newline
 \end_inset
 
@@ -58821,7 +59115,7 @@
 \begin_inset space ~
 \end_inset
 
-/* dead store */ 
+/* dead store */
 \begin_inset Newline newline
 \end_inset
 
@@ -58833,7 +59127,7 @@
 \begin_inset space ~
 \end_inset
 
-global = 2; 
+global = 2;
 \begin_inset Newline newline
 \end_inset
 
@@ -58845,7 +59139,7 @@
 \begin_inset space ~
 \end_inset
 
-return; 
+return;
 \begin_inset Newline newline
 \end_inset
 
@@ -58861,7 +59155,7 @@
 \begin_inset space ~
 \end_inset
 
-/* unreachable */ 
+/* unreachable */
 \begin_inset Newline newline
 \end_inset
 
@@ -58919,7 +59213,7 @@
 \begin_layout Verse
 
 \family typewriter
-int f() { 
+int f() {
 \begin_inset Newline newline
 \end_inset
 
@@ -58931,7 +59225,7 @@
 \begin_inset space ~
 \end_inset
 
-int i, j; 
+int i, j;
 \begin_inset Newline newline
 \end_inset
 
@@ -58943,7 +59237,7 @@
 \begin_inset space ~
 \end_inset
 
-i = 10; 
+i = 10;
 \begin_inset Newline newline
 \end_inset
 
@@ -58955,7 +59249,7 @@
 \begin_inset space ~
 \end_inset
 
-j = i; 
+j = i;
 \begin_inset Newline newline
 \end_inset
 
@@ -58967,7 +59261,7 @@
 \begin_inset space ~
 \end_inset
 
-return j; 
+return j;
 \begin_inset Newline newline
 \end_inset
 
@@ -58981,7 +59275,7 @@
 \begin_layout Verse
 
 \family typewriter
-int f() { 
+int f() {
 \begin_inset Newline newline
 \end_inset
 
@@ -58993,7 +59287,7 @@
 \begin_inset space ~
 \end_inset
 
-int i, j; 
+int i, j;
 \begin_inset Newline newline
 \end_inset
 
@@ -59005,7 +59299,7 @@
 \begin_inset space ~
 \end_inset
 
-i = 10; 
+i = 10;
 \begin_inset Newline newline
 \end_inset
 
@@ -59017,7 +59311,7 @@
 \begin_inset space ~
 \end_inset
 
-j = 10; 
+j = 10;
 \begin_inset Newline newline
 \end_inset
 
@@ -59029,7 +59323,7 @@
 \begin_inset space ~
 \end_inset
 
-return 10; 
+return 10;
 \begin_inset Newline newline
 \end_inset
 
@@ -59153,7 +59447,7 @@
 \begin_layout Verse
 
 \family typewriter
-for (i = 0 ; i < 100 ; i ++) 
+for (i = 0 ; i < 100 ; i ++)
 \begin_inset Newline newline
 \end_inset
 
@@ -59183,11 +59477,11 @@
 \begin_layout Verse
 
 \family typewriter
-itemp = k + l; 
+itemp = k + l;
 \begin_inset Newline newline
 \end_inset
 
-for (i = 0; i < 100; i++) 
+for (i = 0; i < 100; i++)
 \begin_inset Newline newline
 \end_inset
 
@@ -59266,15 +59560,15 @@
 \begin_layout Verse
 
 \family typewriter
-itemp1 = 0; 
+itemp1 = 0;
 \begin_inset Newline newline
 \end_inset
 
-itemp2 = 0; 
+itemp2 = 0;
 \begin_inset Newline newline
 \end_inset
 
-for (i=0;i< 100;i++) { 
+for (i=0;i< 100;i++) {
 \begin_inset Newline newline
 \end_inset
 
@@ -59294,7 +59588,7 @@
 \begin_inset space ~
 \end_inset
 
-ar[itemp1] = itemp2; 
+ar[itemp1] = itemp2;
 \begin_inset Newline newline
 \end_inset
 
@@ -59314,7 +59608,7 @@
 \begin_inset space ~
 \end_inset
 
-itemp1 += 5; 
+itemp1 += 5;
 \begin_inset Newline newline
 \end_inset
 
@@ -59334,7 +59628,7 @@
 \begin_inset space ~
 \end_inset
 
-itemp2 += 3; 
+itemp2 += 3;
 \begin_inset Newline newline
 \end_inset
 
@@ -59502,7 +59796,7 @@
 \begin_inset space ~
 \end_inset
 
- i = j; 
+ i = j;
 \begin_inset Newline newline
 \end_inset
 
@@ -59550,7 +59844,7 @@
 \begin_inset space ~
 \end_inset
 
- i >>= 1; 
+ i >>= 1;
 \begin_inset Newline newline
 \end_inset
 
@@ -59586,7 +59880,7 @@
 \begin_inset space ~
 \end_inset
 
- i = 0; 
+ i = 0;
 \begin_inset Newline newline
 \end_inset
 
@@ -59791,7 +60085,7 @@
 \begin_inset space ~
 \end_inset
 
-switch (i) { 
+switch (i) {
 \begin_inset Newline newline
 \end_inset
 
@@ -59912,7 +60206,6 @@
 \end_inset
 
 case 0: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -60033,7 +60326,6 @@
 \end_inset
 
 case 1: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -60274,7 +60566,6 @@
 \end_inset
 
 case 3: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -60395,7 +60686,6 @@
 \end_inset
 
 case 4: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -60516,7 +60806,6 @@
 \end_inset
 
 case 5: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -60637,7 +60926,6 @@
 \end_inset
 
 case 6: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -60754,7 +61042,6 @@
 \end_inset
 
 case 7: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -60871,7 +61158,6 @@
 \end_inset
 
 case 8: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61057,7 +61343,7 @@
 \begin_layout Verse
 
 \family typewriter
-switch (i) { 
+switch (i) {
 \begin_inset Newline newline
 \end_inset
 
@@ -61070,7 +61356,6 @@
 \end_inset
 
 case 1: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61083,7 +61368,6 @@
 \end_inset
 
 case 2: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61096,7 +61380,6 @@
 \end_inset
 
 case 3: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61109,7 +61392,6 @@
 \end_inset
 
 case 4: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61122,7 +61404,6 @@
 \end_inset
 
 case 5: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61135,7 +61416,6 @@
 \end_inset
 
 case 6: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61148,7 +61428,6 @@
 \end_inset
 
 case 7: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61161,7 +61440,6 @@
 \end_inset
 
 case 101: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61174,7 +61452,6 @@
 \end_inset
 
 case 102: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61187,7 +61464,6 @@
 \end_inset
 
 case 103: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61200,7 +61476,6 @@
 \end_inset
 
 case 104: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61213,7 +61488,6 @@
 \end_inset
 
 case 105: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61226,7 +61500,6 @@
 \end_inset
 
 case 106: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61239,7 +61512,6 @@
 \end_inset
 
 case 107: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61253,7 +61525,7 @@
 \begin_layout Verse
 
 \family typewriter
-switch (i) { 
+switch (i) {
 \begin_inset Newline newline
 \end_inset
 
@@ -61266,7 +61538,6 @@
 \end_inset
 
 case 1: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61279,7 +61550,6 @@
 \end_inset
 
 case 2: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61292,7 +61562,6 @@
 \end_inset
 
 case 3: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61305,7 +61574,6 @@
 \end_inset
 
 case 4: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61318,7 +61586,6 @@
 \end_inset
 
 case 5: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61331,7 +61598,6 @@
 \end_inset
 
 case 6: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61344,7 +61610,6 @@
 \end_inset
 
 case 7: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61358,7 +61623,7 @@
 \begin_layout Verse
 
 \family typewriter
-switch (i) { 
+switch (i) {
 \begin_inset Newline newline
 \end_inset
 
@@ -61371,7 +61636,6 @@
 \end_inset
 
 case 101: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61384,7 +61648,6 @@
 \end_inset
 
 case 102: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61397,7 +61660,6 @@
 \end_inset
 
 case 103: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61410,7 +61672,6 @@
 \end_inset
 
 case 104: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61423,7 +61684,6 @@
 \end_inset
 
 case 105: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61436,7 +61696,6 @@
 \end_inset
 
 case 106: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61449,7 +61708,6 @@
 \end_inset
 
 case 107: ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -61558,11 +61816,10 @@
 \end_inset
 
 ...
- 
 \begin_inset Newline newline
 \end_inset
 
-i >>= 4; 
+i >>= 4;
 \begin_inset Newline newline
 \end_inset
 
@@ -61580,11 +61837,11 @@
 \begin_inset space ~
 \end_inset
 
- a,_i 
+ a,_i
 \begin_inset Newline newline
 \end_inset
 
-swap a 
+swap a
 \begin_inset Newline newline
 \end_inset
 
@@ -61592,7 +61849,7 @@
 \begin_inset space ~
 \end_inset
 
- a,#0x0f 
+ a,#0x0f
 \begin_inset Newline newline
 \end_inset
 
@@ -61611,16 +61868,15 @@
 \begin_layout Verse
 
 \family typewriter
-unsigned int i; 
+unsigned int i;
 \begin_inset Newline newline
 \end_inset
 
 ...
- 
 \begin_inset Newline newline
 \end_inset
 
-i >>= 9; 
+i >>= 9;
 \begin_inset Newline newline
 \end_inset
 
@@ -61642,7 +61898,7 @@
 \begin_inset space ~
 \end_inset
 
-a,(_i + 1) 
+a,(_i + 1)
 \begin_inset Newline newline
 \end_inset
 
@@ -61654,7 +61910,7 @@
 \begin_inset space ~
 \end_inset
 
-(_i + 1),#0x00 
+(_i + 1),#0x00
 \begin_inset Newline newline
 \end_inset
 
@@ -61666,7 +61922,7 @@
 \begin_inset space ~
 \end_inset
 
-c 
+c
 \begin_inset Newline newline
 \end_inset
 
@@ -61678,7 +61934,7 @@
 \begin_inset space ~
 \end_inset
 
-a 
+a
 \begin_inset Newline newline
 \end_inset
 
@@ -61779,18 +62035,17 @@
 \begin_inset space ~
 \end_inset
 
-/* unsigned is needed for rotation */ 
+/* unsigned is needed for rotation */
 \begin_inset Newline newline
 \end_inset
 
 ...
- 
 \begin_inset Newline newline
 \end_inset
 
 i = ((i << 1) | (i >> 7));
 \family default
- 
+
 \begin_inset Newline newline
 \end_inset
 
@@ -61814,7 +62069,7 @@
 \begin_inset space ~
 \end_inset
 
-a,_i 
+a,_i
 \begin_inset Newline newline
 \end_inset
 
@@ -61830,7 +62085,7 @@
 \begin_inset space ~
 \end_inset
 
-a 
+a
 \begin_inset Newline newline
 \end_inset
 
@@ -61888,7 +62143,7 @@
 \begin_inset space ~
 \end_inset
 
-char i; 
+char i;
 \begin_inset Newline newline
 \end_inset
 
@@ -61904,12 +62159,11 @@
 \begin_inset space ~
 \end_inset
 
-int j; 
+int j;
 \begin_inset Newline newline
 \end_inset
 
 ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -62052,7 +62306,7 @@
 \begin_layout Verse
 
 \family typewriter
-unsigned int gint; 
+unsigned int gint;
 \begin_inset Newline newline
 \end_inset
 
@@ -62060,7 +62314,7 @@
 \begin_inset Newline newline
 \end_inset
 
-foo () { 
+foo () {
 \begin_inset Newline newline
 \end_inset
 
@@ -62072,7 +62326,7 @@
 \begin_inset space ~
 \end_inset
 
-unsigned char hob1, aob1; 
+unsigned char hob1, aob1;
 \begin_inset Newline newline
 \end_inset
 
@@ -62084,7 +62338,7 @@
 \begin_inset space ~
 \end_inset
 
-bit hob2, hob3, aob2, aob3; 
+bit hob2, hob3, aob2, aob3;
 \begin_inset Newline newline
 \end_inset
 
@@ -62097,7 +62351,6 @@
 \end_inset
 
 ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -62109,7 +62362,7 @@
 \begin_inset space ~
 \end_inset
 
-hob1 = (gint >> 15) & 1; 
+hob1 = (gint >> 15) & 1;
 \begin_inset Newline newline
 \end_inset
 
@@ -62121,7 +62374,7 @@
 \begin_inset space ~
 \end_inset
 
-hob2 = (gint >> 15) & 1; 
+hob2 = (gint >> 15) & 1;
 \begin_inset Newline newline
 \end_inset
 
@@ -62133,7 +62386,7 @@
 \begin_inset space ~
 \end_inset
 
-hob3 = gint & 0x8000; 
+hob3 = gint & 0x8000;
 \begin_inset Newline newline
 \end_inset
 
@@ -62145,7 +62398,7 @@
 \begin_inset space ~
 \end_inset
 
-aob1 = (gint >> 9) & 1; 
+aob1 = (gint >> 9) & 1;
 \begin_inset Newline newline
 \end_inset
 
@@ -62157,7 +62410,7 @@
 \begin_inset space ~
 \end_inset
 
-aob2 = (gint >> 8) & 1; 
+aob2 = (gint >> 8) & 1;
 \begin_inset Newline newline
 \end_inset
 
@@ -62169,7 +62422,7 @@
 \begin_inset space ~
 \end_inset
 
-aob3 = gint & 0x0800; 
+aob3 = gint & 0x0800;
 \begin_inset Newline newline
 \end_inset
 
@@ -62181,8 +62434,7 @@
 \begin_inset space ~
 \end_inset
 
-..
- 
+...
 \begin_inset Newline newline
 \end_inset
 
@@ -62299,7 +62551,7 @@
 \begin_inset space ~
 \end_inset
 
- hob.c 7 
+ hob.c 7
 \begin_inset Newline newline
 \end_inset
 
@@ -62403,7 +62655,7 @@
 \begin_inset space ~
 \end_inset
 
- a,(_gint + 1) 
+ a,(_gint + 1)
 \begin_inset Newline newline
 \end_inset
 
@@ -62523,7 +62775,7 @@
 \begin_inset space ~
 \end_inset
 
- a 
+ a
 \begin_inset Newline newline
 \end_inset
 
@@ -62627,7 +62879,7 @@
 \begin_inset space ~
 \end_inset
 
- a,#0x01 
+ a,#0x01
 \begin_inset Newline newline
 \end_inset
 
@@ -62731,7 +62983,7 @@
 \begin_inset space ~
 \end_inset
 
- _foo_hob1_1_1,a 
+ _foo_hob1_1_1,a
 \begin_inset Newline newline
 \end_inset
 
@@ -62839,7 +63091,7 @@
 \begin_inset space ~
 \end_inset
 
- hob.c 8 
+ hob.c 8
 \begin_inset Newline newline
 \end_inset
 
@@ -62943,7 +63195,7 @@
 \begin_inset space ~
 \end_inset
 
- a,(_gint + 1) 
+ a,(_gint + 1)
 \begin_inset Newline newline
 \end_inset
 
@@ -63059,7 +63311,7 @@
 \begin_inset space ~
 \end_inset
 
- a 
+ a
 \begin_inset Newline newline
 \end_inset
 
@@ -63163,7 +63415,7 @@
 \begin_inset space ~
 \end_inset
 
- _foo_hob2_1_1,c 
+ _foo_hob2_1_1,c
 \begin_inset Newline newline
 \end_inset
 
@@ -63271,7 +63523,7 @@
 \begin_inset space ~
 \end_inset
 
- hob.c 9 
+ hob.c 9
 \begin_inset Newline newline
 \end_inset
 
@@ -63375,7 +63627,7 @@
 \begin_inset space ~
 \end_inset
 
- a,(_gint + 1) 
+ a,(_gint + 1)
 \begin_inset Newline newline
 \end_inset
 
@@ -63491,7 +63743,7 @@
 \begin_inset space ~
 \end_inset
 
- a 
+ a
 \begin_inset Newline newline
 \end_inset
 
@@ -63595,7 +63847,7 @@
 \begin_inset space ~
 \end_inset
 
- _foo_hob3_1_1,c 
+ _foo_hob3_1_1,c
 \begin_inset Newline newline
 \end_inset
 
@@ -63703,7 +63955,7 @@
 \begin_inset space ~
 \end_inset
 
- hob.c 10 
+ hob.c 10
 \begin_inset Newline newline
 \end_inset
 
@@ -63807,7 +64059,7 @@
 \begin_inset space ~
 \end_inset
 
- a,(_gint + 1) 
+ a,(_gint + 1)
 \begin_inset Newline newline
 \end_inset
 
@@ -63927,7 +64179,7 @@
 \begin_inset space ~
 \end_inset
 
- a 
+ a
 \begin_inset Newline newline
 \end_inset
 
@@ -64031,7 +64283,7 @@
 \begin_inset space ~
 \end_inset
 
- a,#0x01 
+ a,#0x01
 \begin_inset Newline newline
 \end_inset
 
@@ -64135,7 +64387,7 @@
 \begin_inset space ~
 \end_inset
 
- _foo_aob1_1_1,a 
+ _foo_aob1_1_1,a
 \begin_inset Newline newline
 \end_inset
 
@@ -64243,7 +64495,7 @@
 \begin_inset space ~
 \end_inset
 
- hob.c 11 
+ hob.c 11
 \begin_inset Newline newline
 \end_inset
 
@@ -64347,7 +64599,7 @@
 \begin_inset space ~
 \end_inset
 
- a,(_gint + 1) 
+ a,(_gint + 1)
 \begin_inset Newline newline
 \end_inset
 
@@ -64463,7 +64715,7 @@
 \begin_inset space ~
 \end_inset
 
- a 
+ a
 \begin_inset Newline newline
 \end_inset
 
@@ -64567,7 +64819,7 @@
 \begin_inset space ~
 \end_inset
 
- _foo_aob2_1_1,c 
+ _foo_aob2_1_1,c
 \begin_inset Newline newline
 \end_inset
 
@@ -64675,7 +64927,7 @@
 \begin_inset space ~
 \end_inset
 
- hob.c 12 
+ hob.c 12
 \begin_inset Newline newline
 \end_inset
 
@@ -64779,7 +65031,7 @@
 \begin_inset space ~
 \end_inset
 
- a,(_gint + 1) 
+ a,(_gint + 1)
 \begin_inset Newline newline
 \end_inset
 
@@ -64883,7 +65135,7 @@
 \begin_inset space ~
 \end_inset
 
- c,acc[3] 
+ c,acc[3]
 \begin_inset Newline newline
 \end_inset
 
@@ -64987,7 +65239,7 @@
 \begin_inset space ~
 \end_inset
 
- _foo_aob3_1_1,c 
+ _foo_aob3_1_1,c
 \end_layout
 
 \begin_layout Standard
@@ -65046,11 +65298,11 @@
 \begin_layout Verse
 
 \family typewriter
-unsigned int gint; 
+unsigned int gint;
 \begin_inset Newline newline
 \end_inset
 
-unsigned long int glong; 
+unsigned long int glong;
 \begin_inset Newline newline
 \end_inset
 
@@ -65058,7 +65310,7 @@
 \begin_inset Newline newline
 \end_inset
 
-foo () { 
+foo () {
 \begin_inset Newline newline
 \end_inset
 
@@ -65070,7 +65322,7 @@
 \begin_inset space ~
 \end_inset
 
-unsigned char hob1, hob2; 
+unsigned char hob1, hob2;
 \begin_inset Newline newline
 \end_inset
 
@@ -65082,7 +65334,7 @@
 \begin_inset space ~
 \end_inset
 
-unsigned int how1, how2; 
+unsigned int how1, how2;
 \begin_inset Newline newline
 \end_inset
 
@@ -65095,7 +65347,6 @@
 \end_inset
 
 ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -65107,7 +65358,7 @@
 \begin_inset space ~
 \end_inset
 
-hob1 = (gint >> 8) & 0xFF; 
+hob1 = (gint >> 8) & 0xFF;
 \begin_inset Newline newline
 \end_inset
 
@@ -65119,7 +65370,7 @@
 \begin_inset space ~
 \end_inset
 
-hob2 = glong >> 24; 
+hob2 = glong >> 24;
 \begin_inset Newline newline
 \end_inset
 
@@ -65131,7 +65382,7 @@
 \begin_inset space ~
 \end_inset
 
-how1 = (glong >> 16) & 0xFFFF; 
+how1 = (glong >> 16) & 0xFFFF;
 \begin_inset Newline newline
 \end_inset
 
@@ -65143,7 +65394,7 @@
 \begin_inset space ~
 \end_inset
 
-how2 = glong >> 8; 
+how2 = glong >> 8;
 \begin_inset Newline newline
 \end_inset
 
@@ -65155,8 +65406,7 @@
 \begin_inset space ~
 \end_inset
 
-..
- 
+...
 \begin_inset Newline newline
 \end_inset
 
@@ -65273,7 +65523,7 @@
 \begin_inset space ~
 \end_inset
 
- hob.c 15 
+ hob.c 15
 \begin_inset Newline newline
 \end_inset
 
@@ -65365,7 +65615,7 @@
 \begin_inset space ~
 \end_inset
 
- _foo_hob1_1_1,(_gint + 1) 
+ _foo_hob1_1_1,(_gint + 1)
 \begin_inset Newline newline
 \end_inset
 
@@ -65473,7 +65723,7 @@
 \begin_inset space ~
 \end_inset
 
- hob.c 16 
+ hob.c 16
 \begin_inset Newline newline
 \end_inset
 
@@ -65565,7 +65815,7 @@
 \begin_inset space ~
 \end_inset
 
- _foo_hob2_1_1,(_glong + 3) 
+ _foo_hob2_1_1,(_glong + 3)
 \begin_inset Newline newline
 \end_inset
 
@@ -65673,7 +65923,7 @@
 \begin_inset space ~
 \end_inset
 
- hob.c 17 
+ hob.c 17
 \begin_inset Newline newline
 \end_inset
 
@@ -65765,7 +66015,7 @@
 \begin_inset space ~
 \end_inset
 
- _foo_how1_1_1,(_glong + 2) 
+ _foo_how1_1_1,(_glong + 2)
 \begin_inset Newline newline
 \end_inset
 
@@ -65857,7 +66107,7 @@
 \begin_inset space ~
 \end_inset
 
- (_foo_how1_1_1 + 1),(_glong + 3) 
+ (_foo_how1_1_1 + 1),(_glong + 3)
 \begin_inset Newline newline
 \end_inset
 
@@ -65949,7 +66199,7 @@
 \begin_inset space ~
 \end_inset
 
- _foo_how2_1_1,(_glong + 1) 
+ _foo_how2_1_1,(_glong + 1)
 \begin_inset Newline newline
 \end_inset
 
@@ -66041,7 +66291,7 @@
 \begin_inset space ~
 \end_inset
 
- (_foo_how2_1_1 + 1),(_glong + 2) 
+ (_foo_how2_1_1 + 1),(_glong + 2)
 \end_layout
 
 \begin_layout Standard
@@ -66152,7 +66402,7 @@
 \begin_layout Verse
 
 \family typewriter
-replace { 
+replace {
 \begin_inset Newline newline
 \end_inset
 
@@ -66164,7 +66414,7 @@
 \begin_inset space ~
 \end_inset
 
-mov %1,a 
+mov %1,a
 \begin_inset Newline newline
 \end_inset
 
@@ -66216,7 +66466,7 @@
 \begin_layout Verse
 
 \family typewriter
-mov r1,a 
+mov r1,a
 \begin_inset Newline newline
 \end_inset
 
@@ -66245,7 +66495,7 @@
 \begin_layout Verse
 
 \family typewriter
-mov r1,a 
+mov r1,a
 \begin_inset Newline newline
 \end_inset
 
@@ -66319,7 +66569,7 @@
 \begin_layout Verse
 
 \family typewriter
-replace { lcall %1 } by { acall %1 } 
+replace { lcall %1 } by { acall %1 }
 \begin_inset Newline newline
 \end_inset
 
@@ -66400,7 +66650,7 @@
 \family typewriter
 rule := replace [ restart ] '{' <assembly sequence> '
 \backslash
-n' 
+n'
 \begin_inset Newline newline
 \end_inset
 
@@ -66462,7 +66712,7 @@
 
  '}' by '{' '
 \backslash
-n' 
+n'
 \begin_inset Newline newline
 \end_inset
 
@@ -66532,7 +66782,7 @@
 
  <assembly sequence> '
 \backslash
-n' 
+n'
 \begin_inset Newline newline
 \end_inset
 
@@ -66594,7 +66844,7 @@
 
  '}' [if <functionName> ] '
 \backslash
-n' 
+n'
 \end_layout
 
 \begin_layout Standard
@@ -66620,7 +66870,7 @@
 \begin_layout Verse
 
 \family typewriter
-replace restart { 
+replace restart {
 \begin_inset Newline newline
 \end_inset
 
@@ -66632,7 +66882,7 @@
 \begin_inset space ~
 \end_inset
 
-pop %1 
+pop %1
 \begin_inset Newline newline
 \end_inset
 
@@ -66644,7 +66894,7 @@
 \begin_inset space ~
 \end_inset
 
-push %1 } by { 
+push %1 } by {
 \begin_inset Newline newline
 \end_inset
 
@@ -66656,7 +66906,7 @@
 \begin_inset space ~
 \end_inset
 
-; nop 
+; nop
 \begin_inset Newline newline
 \end_inset
 
@@ -66672,15 +66922,15 @@
 \begin_layout Verse
 
 \family typewriter
-pop ar1 
+pop ar1
 \begin_inset Newline newline
 \end_inset
 
-pop ar2 
+pop ar2
 \begin_inset Newline newline
 \end_inset
 
-push ar2 
+push ar2
 \begin_inset Newline newline
 \end_inset
 
@@ -66694,11 +66944,11 @@
 \begin_layout Verse
 
 \family typewriter
-pop ar1 
+pop ar1
 \begin_inset Newline newline
 \end_inset
 
-; nop 
+; nop
 \begin_inset Newline newline
 \end_inset
 
@@ -66717,7 +66967,7 @@
 \begin_layout Verse
 
 \family typewriter
-; nop 
+; nop
 \begin_inset Newline newline
 \end_inset
 
@@ -66733,7 +66983,7 @@
 \begin_layout Verse
 
 \family typewriter
-replace { 
+replace {
 \begin_inset Newline newline
 \end_inset
 
@@ -66749,7 +66999,7 @@
 \begin_inset space ~
 \end_inset
 
-ljmp %5 
+ljmp %5
 \begin_inset Newline newline
 \end_inset
 
@@ -66757,7 +67007,7 @@
 \begin_inset Newline newline
 \end_inset
 
-} by { 
+} by {
 \begin_inset Newline newline
 \end_inset
 
@@ -66773,7 +67023,7 @@
 \begin_inset space ~
 \end_inset
 
-sjmp %5 
+sjmp %5
 \begin_inset Newline newline
 \end_inset
 
@@ -66995,19 +67245,19 @@
 
 \family typewriter
 struct s { ...
- }; 
+ };
 \begin_inset Newline newline
 \end_inset
 
-struct s s1, s2; 
+struct s s1, s2;
 \begin_inset Newline newline
 \end_inset
 
-foo() 
+foo()
 \begin_inset Newline newline
 \end_inset
 
-{ 
+{
 \begin_inset Newline newline
 \end_inset
 
@@ -67028,7 +67278,6 @@
 \end_inset
 
 ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -67048,7 +67297,7 @@
 \begin_inset space ~
 \end_inset
 
-s1 = s2 ; /* is invalid in SDCC although allowed in ANSI */ 
+s1 = s2 ; /* is invalid in SDCC although allowed in ANSI */
 \begin_inset Newline newline
 \end_inset
 
@@ -67069,7 +67318,6 @@
 \end_inset
 
 ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -67095,7 +67343,7 @@
 \begin_inset Newline newline
 \end_inset
 
-{ 
+{
 \begin_inset Newline newline
 \end_inset
 
@@ -67115,7 +67363,7 @@
 \begin_inset space ~
 \end_inset
 
-struct s rets; 
+struct s rets;
 \begin_inset Newline newline
 \end_inset
 
@@ -67136,7 +67384,6 @@
 \end_inset
 
 ...
- 
 \begin_inset Newline newline
 \end_inset
 
@@ -67156,7 +67403,7 @@
 \begin_inset space ~
 \end_inset
 
-return rets; /* is invalid in SDCC although allowed in ANSI */ 
+return rets; /* is invalid in SDCC although allowed in ANSI */
 \begin_inset Newline newline
 \end_inset
 
@@ -67279,11 +67526,11 @@
 \begin_layout Verse
 
 \family typewriter
-foo(i,j) /* this old style of function declarations */ 
+foo(i,j) /* this old style of function declarations */
 \begin_inset Newline newline
 \end_inset
 
-int i,j; /* is valid in ANSI but not valid in SDCC */ 
+int i,j; /* is valid in ANSI but not valid in SDCC */
 \begin_inset Newline newline
 \end_inset
 
@@ -67418,53 +67665,11 @@
 
 \series default
  command line options are used.
- These may include (depending on the selected processor): 'at', 'banked',
- 'bit', 'code', 'critical', 'data', 'eeprom', 'far', 'flash', 'idata', 'interrup
-t', 'near', 'nonbanked', 'pdata', 'reentrant', 'sbit', 'sfr', 'shadowregs',
- 'sram', 'using', 'wparam', 'xdata', '_overlay', '_asm', '_endasm', and
- '_naked'.
- The compiler displays a warning "keyword <keyword> is deprecated, use '__<keywo
-rd>' instead" in such cases.
- The warning can be disabled by using "#pragma disable_warning 197" in the
- source file or "--disable-warning 197" command line option.
- Compliant equivalents of these keywords are always available in a form
- that begin with two underscores
-\begin_inset Index
-status collapsed
-
-\begin_layout Plain Layout
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-_
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-_
-\end_layout
-
-\end_inset
-
- (prefix for extended keywords)
-\end_layout
-
-\end_inset
-
-, f.e.
- '__data' instead of 'data' and '__asm' instead of '_asm'.
+ These may include (depending on the selected processor): '__at', '__banked',
+ '__bit', '__code', '__critical', '__data', '__eeprom', '__far', '__flash',
+ '__idata', '__interrupt', '__near', '__nonbanked', '__pdata', '__reentrant',
+ '__sbit', '__sfr', '__shadowregs', '__sram', '__using', '__wparam', '__xdata',
+ '__overlay', '__asm', '__endasm', and '__naked'.
 \end_layout
 
 \begin_layout Itemize
@@ -67991,8 +68196,8 @@
 August 2000
 \series default
 .
- It's a little outdated (the compiler is much more efficient now and user/develo
-per friendly), but pretty well exposes the guts of it all.
+ It's outdated (the compiler is much more efficient now and user/developer
+ friendly), but pretty well exposes the guts of it all.
 \shape default
 
 \begin_inset Newline newline
@@ -70235,7 +70440,7 @@
 \begin_inset space ~
 \end_inset
 
-while (*x) *x++ = *p++; 
+while (*x) *x++ = *p++;
 \begin_inset Newline newline
 \end_inset
 
@@ -70255,7 +70460,7 @@
 \begin_inset space ~
 \end_inset
 
-sum = 0 ; 
+sum = 0 ;
 \begin_inset Newline newline
 \end_inset
 
@@ -72222,7 +72427,8 @@
 \end_layout
 
 \begin_layout Standard
-This document was initially written by Sandeep Dutta
+This document was initially written by Sandeep Dutta and updated bu SDCC
+ developers.
 \end_layout
 
 \begin_layout Standard
diff -Nru sdcc-3.1.0+dfsg/sdas/as6808/Makefile.in sdcc-3.2.0+dfsg/sdas/as6808/Makefile.in
--- sdcc-3.1.0+dfsg/sdas/as6808/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/as6808/Makefile.in	2012-01-03 09:28:29.000000000 +0000
@@ -49,7 +49,7 @@
 ASXXLIBSRC = asdbg.c asdata.c asexpr.c aslex.c aslist.c asmain.c asout.c assubr.c assym.c sdas.c strcmpi.c
 ASXXLIBOBJS = $(ASXXLIBSRC:%.c=$(OBJDIR)/%.o)
 
-SRC = m08ext.c m08pst.c m08mch.c m08adr.c
+SRC = m08pst.c m08mch.c m08adr.c
 OBJS = $(SRC:%.c=$(OBJDIR)/%.o)
 
 ASSOURCES = $(SRC) $(ASXXLIBSRC:%.c=$(ASXXLIB)/%.c) $(UTILSRC:%.c=$(UTILLIB)/%.c)
diff -Nru sdcc-3.1.0+dfsg/sdas/as6808/as_hc08.vcxproj sdcc-3.2.0+dfsg/sdas/as6808/as_hc08.vcxproj
--- sdcc-3.1.0+dfsg/sdas/as6808/as_hc08.vcxproj	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/as6808/as_hc08.vcxproj	2012-01-03 09:28:29.000000000 +0000
@@ -197,12 +197,6 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="m08ext.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
     <ClCompile Include="m08mch.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff -Nru sdcc-3.1.0+dfsg/sdas/as6808/as_hc08.vcxproj.filters sdcc-3.2.0+dfsg/sdas/as6808/as_hc08.vcxproj.filters
--- sdcc-3.1.0+dfsg/sdas/as6808/as_hc08.vcxproj.filters	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/as6808/as_hc08.vcxproj.filters	2012-01-03 09:28:29.000000000 +0000
@@ -47,9 +47,6 @@
     <ClCompile Include="m08adr.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="m08ext.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="m08mch.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff -Nru sdcc-3.1.0+dfsg/sdas/as6808/m08adr.c sdcc-3.2.0+dfsg/sdas/as6808/m08adr.c
--- sdcc-3.1.0+dfsg/sdas/as6808/m08adr.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/as6808/m08adr.c	2012-01-03 09:28:29.000000000 +0000
@@ -1,23 +1,27 @@
-/* m08adr.c
+/* m08adr.c */
 
-   Copyright (C) 1989-1995 Alan R. Baldwin
-   721 Berkeley St., Kent, Ohio 44240
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+/*
+ *  Copyright (C) 1989-2009  Alan R. Baldwin
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ * Alan R. Baldwin
+ * 721 Berkeley St.
+ * Kent, Ohio  44240
+ */
 
-#include <stdio.h>
-#include <setjmp.h>
 #include "asxxxx.h"
 #include "m6808.h"
 
@@ -54,8 +58,6 @@
         } else if (c == '*') {
                 expr(esp, 0);
                 esp->e_mode = S_DIR;
-                if (esp->e_addr & ~0xFF)
-                        err('d');
                 if (more()) {
                         comma(1);
                         tcp = ip;
diff -Nru sdcc-3.1.0+dfsg/sdas/as6808/m08ext.c sdcc-3.2.0+dfsg/sdas/as6808/m08ext.c
--- sdcc-3.1.0+dfsg/sdas/as6808/m08ext.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/as6808/m08ext.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-/* m08ext.c
-
-   Copyright (C) 1989-1995 Alan R. Baldwin
-   721 Berkeley St., Kent, Ohio 44240
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdio.h>
-#include <setjmp.h>
-#include "asxxxx.h"
-#include "m6808.h"
-
-char	*cpu	= "Motorola 68HC08";
-int	hilo	= 1;
-char	*dsft	= "asm";
diff -Nru sdcc-3.1.0+dfsg/sdas/as6808/m08mch.c sdcc-3.2.0+dfsg/sdas/as6808/m08mch.c
--- sdcc-3.1.0+dfsg/sdas/as6808/m08mch.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/as6808/m08mch.c	2012-05-19 08:49:12.000000000 +0000
@@ -1,26 +1,36 @@
-/* m08mch.c
+/* m08mch.c */
 
-   Copyright (C) 1989-1995 Alan R. Baldwin
-   721 Berkeley St., Kent, Ohio 44240
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+/*
+ *  Copyright (C) 1993-2009  Alan R. Baldwin
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ * Alan R. Baldwin
+ * 721 Berkeley St.
+ * Kent, Ohio  44240
+ */
 
-#include <stdio.h>
-#include <setjmp.h>
 #include "asxxxx.h"
 #include "m6808.h"
 
+int allow_cs08_code;
+
+char	*cpu	= "Motorola 68HC(S)08";
+int	hilo	= 1;
+char	*dsft	= "asm";
+
 /*
  * Process a machine op.
  */
@@ -38,7 +48,7 @@
 	clrexpr(&e1);
 	clrexpr(&e2);
 	clrexpr(&e3);
-	op = mp->m_valu;
+	op = (int) mp->m_valu;
 	type = mp->m_type;
 	switch (type) {
 
@@ -77,7 +87,7 @@
 		expr(&e1, 0);
 		outab(op);
 		if (mchpcr(&e1)) {
-			v1 = e1.e_addr - dot.s_addr - 1;
+			v1 = (int) (e1.e_addr - dot.s_addr - 1);
 			if ((v1 < -128) || (v1 > 127))
 				aerr();
 			outab(v1);
@@ -205,7 +215,7 @@
 		outab(op + 2*(espv&0x07));
 		outrb(&e2, R3_PAG0);
 		if (mchpcr(&e3)) {
-			v1 = e3.e_addr - dot.s_addr - 1;
+			v1 = (int) (e3.e_addr - dot.s_addr - 1);
 			if ((v1 < -128) || (v1 > 127))
 				aerr();
 			outab(v1);
@@ -221,7 +231,7 @@
 		if (t1 == S_IMMED) {
 			outab(op);
 			if (e1.e_flag == 0 && e1.e_base.e_ap == NULL) {
-				v1 = e1.e_addr;
+				v1 = (int) e1.e_addr;
 				if ((v1 < -128) || (v1 > 127))
 					aerr();
 				outab(v1);
@@ -234,15 +244,83 @@
 		break;
 
 	case S_TYPHX:
+// Code below from Gary Osborne (gary@s-4.com)
+// G.O.
+// This block of code was copied from a later version of the asxxxx assembler
+// distribution.  The later version supports the cs08.  The SDCC version of
+// the assembler did not.  The cs08 ldhx, sthx, and cphx instructions allow
+// more addressing modes than the hc08.  That is the only difference in the
+// instruction sets.
+
+// The new asxxxx assemblers have other nice features that could be retrofitted
+// one day, but we can limp along without them for a few years yet.  They
+// are less important when the primary user writes in C.  It would probably
+// be easier to customize the new asxxxx files rather than try to upgrade
+// the SDCC version.
+
 		t1 = addr(&e1);
 		if (t1 == S_IMMED) {
 			if (op == 0x25)
-				aerr();
+			aerr();
 			outab(op);
 			outrw(&e1, 0);
 			break;
 		}
-		if (t1 == S_DIR || t1 == S_EXT) {
+		if (allow_cs08_code) {
+			if (t1 == S_EXT) {
+				switch (op) {
+					default:
+					case 0x25:  outab(0x96);   break;
+					case 0x45:  outab(0x32);   break;
+					case 0x65:  outab(0x3E);   break;
+				}
+				outrw(&e1, 0);
+				break;
+			}
+			if ((t1 == S_SP1) || (t1 == S_SP2)) {
+				outab(0x9E);
+				switch (op) {
+				default:
+				case 0x25:  outab(0xFF);   break;
+				case 0x45:  outab(0xFE);   break;
+				case 0x65:  outab(0xF3);   break;
+				}
+				outrb(&e1, R3_USGN);
+				// The SDCC version of outrb() is not fully compatible.  Work around it.
+				// Not an asxxxx error.
+				if (t1==S_SP2) {      // ldhx 0x100,s etc should show error tag
+					aerr();
+				}
+				break;
+			}
+			if ((t1 == S_IX) && (op == 0x45)) {
+				outab(0x9E);
+				outab(0xAE);
+				break;
+			}
+			if ((t1 == S_IX1) && (op == 0x45)) {
+				outab(0x9E);
+				outab(0xCE);
+				outrb(&e1, R3_USGN);
+				break;
+			}
+			if ((t1 == S_IX2) && (op == 0x45)) {
+				outab(0x9E);
+				outab(0xBE);
+				outrw(&e1, 0);
+				break;
+			}
+		} else {
+			if (t1 == S_EXT) {
+				t1 = S_DIR;
+				// The SDCC version of outrb() is not fully compatible.  Work around it.
+				// Not an asxxxx error, at least not in the newer versions.
+				if (e1.e_addr > 0xFF) {
+					err('d');
+				}
+			}
+		}
+		if (t1 == S_DIR) {
 			outab(op | 0x10);
 			outrb(&e1, R3_PAG0);
 			break;
@@ -250,6 +328,8 @@
 		aerr();
 		break;
 
+// end G.O.
+
 	case S_CBEQ:
 		t1 = addr(&e1);
 		comma(1);
@@ -282,7 +362,7 @@
 			break;
 		}
 		if (mchpcr(&e2)) {
-			v1 = e2.e_addr - dot.s_addr - 1;
+			v1 = (int) (e2.e_addr - dot.s_addr - 1);
 			if ((v1 < -128) || (v1 > 127))
 				aerr();
 			outab(v1);
@@ -302,7 +382,7 @@
 		outab(op);
 		outrb(&e1, 0);
 		if (mchpcr(&e2)) {
-			v1 = e2.e_addr - dot.s_addr - 1;
+			v1 = (int) (e2.e_addr - dot.s_addr - 1);
 			if ((v1 < -128) || (v1 > 127))
 				aerr();
 			outab(v1);
@@ -341,7 +421,7 @@
 			break;
 		}
 		if (mchpcr(&e2)) {
-			v1 = e2.e_addr - dot.s_addr - 1;
+			v1 = (int) (e2.e_addr - dot.s_addr - 1);
 			if ((v1 < -128) || (v1 > 127))
 				aerr();
 			outab(v1);
@@ -356,7 +436,7 @@
 		expr(&e1, 0);
 		outab(op);
 		if (mchpcr(&e1)) {
-			v1 = e1.e_addr - dot.s_addr - 1;
+			v1 = (int) (e1.e_addr - dot.s_addr - 1);
 			if ((v1 < -128) || (v1 > 127))
 				aerr();
 			outab(v1);
@@ -404,8 +484,13 @@
 		aerr();
 		break;
 
+	case X_CS08:
+		++allow_cs08_code;
+		break;
+
 	default:
 		err('o');
+		break;
 	}
 }
 
@@ -455,4 +540,9 @@
 VOID
 minit()
 {
+	/*
+	 * Byte Order
+	 */
+	hilo = 1;
+
 }
diff -Nru sdcc-3.1.0+dfsg/sdas/as6808/m08pst.c sdcc-3.2.0+dfsg/sdas/as6808/m08pst.c
--- sdcc-3.1.0+dfsg/sdas/as6808/m08pst.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/as6808/m08pst.c	2012-05-19 08:49:12.000000000 +0000
@@ -1,23 +1,27 @@
-/* m08pst.c
+/* m08pst.c */
 
-   Copyright (C) 1989-1995 Alan R. Baldwin
-   721 Berkeley St., Kent, Ohio 44240
+/*
+ *  Copyright (C) 1993-2009  Alan R. Baldwin
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ * Alan R. Baldwin
+ * 721 Berkeley St.
+ * Kent, Ohio  44240
+ */
 
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdio.h>
-#include <setjmp.h>
 #include "asxxxx.h"
 #include "m6808.h"
 
@@ -40,35 +44,35 @@
     {	NULL,	"LOAD",		S_ATYP,		0,	A_LOAD	},
     {	NULL,	"NOLOAD",	S_ATYP,		0,	A_NOLOAD },
 
+    {	NULL,	".page",	S_PAGE,		0,	0	},
+    {	NULL,	".title",	S_TITLE,	0,	0	},
+    {	NULL,	".sbttl",	S_SBTL,		0,	0	},
+    {	NULL,	".module",	S_MODUL,	0,	0	},
+    {	NULL,	".include",	S_INCL,		0,	0	},
+    {	NULL,	".area",	S_DAREA,	0,	0	},
+    {	NULL,	".org",		S_ORG,		0,	0	},
+    {	NULL,	".radix",	S_RADIX,	0,	0	},
+    {	NULL,	".globl",	S_GLOBL,	0,	0	},
+    {	NULL,	".if",		S_IF,		0,	0	},
+    {	NULL,	".else",	S_ELSE,		0,	0	},
+    {	NULL,	".endif",	S_ENDIF,	0,	0	},
     {	NULL,	".uleb128",	S_ULEB128,	0,	0	},
     {	NULL,	".sleb128",	S_SLEB128,	0,	0	},
     {	NULL,	".byte",	S_BYTE,		0,	1	},
     {	NULL,	".db",		S_BYTE,		0,	1	},
     {	NULL,	".word",	S_WORD,		0,	2	},
     {	NULL,	".dw",		S_WORD,		0,	2	},
-    {	NULL,	".ascii",	S_ASCII,	0,	0	},
-    {	NULL,	".asciz",	S_ASCIZ,	0,	0	},
     {	NULL,	".blkb",	S_BLK,		0,	1	},
     {	NULL,	".ds",		S_BLK,		0,	1	},
     {	NULL,	".blkw",	S_BLK,		0,	2	},
-    {	NULL,	".page",	S_PAGE,		0,	0	},
-    {	NULL,	".title",	S_TITLE,	0,	0	},
-    {	NULL,	".sbttl",	S_SBTL,		0,	0	},
-    {	NULL,	".globl",	S_GLOBL,	0,	0	},
-    {	NULL,	".area",	S_DAREA,	0,	0	},
-    {	NULL,	".even",	S_EVEN,		0,	0	},
-    {	NULL,	".odd",		S_ODD,		0,	0	},
-    {	NULL,	".if",		S_IF,		0,	0	},
-    {	NULL,	".else",	S_ELSE,		0,	0	},
-    {	NULL,	".endif",	S_ENDIF,	0,	0	},
-    {	NULL,	".include",	S_INCL,		0,	0	},
-    {	NULL,	".radix",	S_RADIX,	0,	0	},
-    {	NULL,	".org",		S_ORG,		0,	0	},
-    {	NULL,	".module",	S_MODUL,	0,	0	},
+    {	NULL,	".ascii",	S_ASCII,	0,	0	},
     {	NULL,	".ascis",	S_ASCIS,	0,	0	},
+    {	NULL,	".asciz",	S_ASCIZ,	0,	0	},
 /* sdas specific */
     {	NULL,	".optsdcc",	S_OPTSDCC,	0,	0	},
 /* end sdas specific */
+    {	NULL,	".even",	S_EVEN,		0,	0	},
+    {	NULL,	".odd",		S_ODD,		0,	0	},
 //    {	NULL,	".assume",	S_ERROR,	0,	0	},
 //    {	NULL,	".error",	S_ERROR,	0,	1	},
 
@@ -207,5 +211,10 @@
     {	NULL,	"sei",		S_INH,		0,	0x9B	},
     {	NULL,	"rsp",		S_INH,		0,	0x9C	},
     {	NULL,	"nop",		S_INH,		0,	0x9D	},
-    {	NULL,	"txa",		S_INH,		S_END,	0x9F	}
+    {	NULL,	"txa",		S_INH,		0,	0x9F},
+
+	/* S08/CS08/HCS08/68HCS08 */
+
+    {	NULL,	".cs08",	X_CS08,		S_EOL,	0 }
 };
+
diff -Nru sdcc-3.1.0+dfsg/sdas/as6808/m6808.h sdcc-3.2.0+dfsg/sdas/as6808/m6808.h
--- sdcc-3.1.0+dfsg/sdas/as6808/m6808.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/as6808/m6808.h	2012-06-28 14:09:28.000000000 +0000
@@ -1,20 +1,26 @@
-/* m6808.h
+/* m6808.h */
 
-   Copyright (C) 1989-1995 Alan R. Baldwin
-   721 Berkeley St., Kent, Ohio 44240
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+/*
+ *  Copyright (C) 1993-2009  Alan R. Baldwin
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ * Alan R. Baldwin
+ * 721 Berkeley St.
+ * Kent, Ohio  44240
+ */
 
 /*)BUILD
 	$(PROGRAM) =	AS6808
@@ -23,11 +29,11 @@
 		M6808.H
 	}
 	$(FILES) = {
-		M08EXT.C
 		M08MCH.C
 		M08ADR.C
 		M08PST.C
 		ASMAIN.C
+		ASDBG.C
 		ASLEX.C
 		ASSYM.C
 		ASSUBR.C
@@ -82,10 +88,30 @@
 #define	S_DZAX	71
 #define	S_MOV	72
 
+#define	S_INH8	73
+#define	S_INH8S	74
+#define	S_BRA8	75
+
 /*
- * Set Direct Pointer
+ * Special Types
  */
 #define	S_SDP	80
+#define	S_CPU	81
+
+/*
+ * CS08 Instructions
+ */
+#define	X_CS08	90
+
+/*
+ * Processor Types (S_CPU)
+ */
+#define	X_HC08	0
+#define X_HCS08	1
+#define	X_6805	2
+#define	X_HC05	3
+
+
 
 
 	/* machine dependent functions */
@@ -100,10 +126,8 @@
 extern	int		srch(char *str);
 
 	/* m08mch.c */
-extern	VOID		machine(struct mne *mp);
 extern	int		chkindx(struct expr *exp);
 extern	int		mchpcr(struct expr *esp);
-extern	VOID		minit(void);
 
 #else
 
@@ -115,10 +139,8 @@
 extern	int		srch();
 
 	/* m08mch.c */
-extern	VOID		machine();
 extern	int		chkindx();
 extern	int		mchpcr();
-extern	VOID		minit();
 
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/sdas/as8051/i51adr.c sdcc-3.2.0+dfsg/sdas/as8051/i51adr.c
--- sdcc-3.1.0+dfsg/sdas/as8051/i51adr.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/as8051/i51adr.c	2011-12-18 17:44:59.000000000 +0000
@@ -1,28 +1,33 @@
-/* i51adr.c
-
-   Copyright (C) 1989-1995 Alan R. Baldwin
-   721 Berkeley St., Kent, Ohio 44240
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+/* i51adr.c */
 
 /*
- * Ported from 8085 to 8051 by John Hartman 30-Apr-1995
- * Continued, 29-May-95
+ *  Copyright (C) 1998-2009  Alan R. Baldwin
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ * Alan R. Baldwin
+ * 721 Berkeley St.
+ * Kent, Ohio  44240
+ *
+ *      This Assember Ported by
+ *      John L. Hartman (JLH)
+ *      jhartman at compuserve dot com
+ *      noice at noicedebugger dot com
+ *
  */
 
-#include <stdio.h>
-#include <setjmp.h>
 #include "asxxxx.h"
 #include "i8051.h"
 
@@ -46,8 +51,7 @@
 
 /*  Classify argument as to address mode */
 int
-addr(esp)
-struct expr *esp;
+addr(struct expr *esp)
 {
         int c;
         unsigned rd;
@@ -138,6 +142,7 @@
                         }
                 } else {
                         /* Must be an expression */
+                        esp->e_addr = 0;
                         expr(esp, 0);
                         if ((!esp->e_flag)
                                 && (esp->e_base.e_ap==NULL)
@@ -157,11 +162,10 @@
  * -1 for no match.
  */
 int
-admode(sp)
-register struct adsym *sp;
+admode(struct adsym *sp)
 {
-        register char *ptr;
-        register int i;
+        char *ptr;
+        int i;
         unget(getnb());
         i = 0;
         while ( *(ptr = &sp[i].a_str[0]) ) {
@@ -177,8 +181,7 @@
  *      srch --- does string match ?
  */
 int
-srch(str)
-char *str;
+srch(char *str)
 {
         char *ptr;
         ptr = ip;
@@ -206,9 +209,7 @@
  *      any --- does str contain c?
  */
 int
-any(c,str)
-int c;
-char *str;
+any(int c, char *str)
 {
         while (*str)
                 if(*str++ == c)
@@ -220,7 +221,7 @@
  * Read a register name.  Return register value, -1 if no register found
  */
 int
-reg()
+reg(void)
 {
         struct mne *mp;
         char id[NCPS];
diff -Nru sdcc-3.1.0+dfsg/sdas/as8051/i51mch.c sdcc-3.2.0+dfsg/sdas/as8051/i51mch.c
--- sdcc-3.1.0+dfsg/sdas/as8051/i51mch.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/as8051/i51mch.c	2011-12-18 17:44:59.000000000 +0000
@@ -1,28 +1,33 @@
-/* i85mch.c
-
-   Copyright (C) 1989-1995 Alan R. Baldwin
-   721 Berkeley St., Kent, Ohio 44240
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+/* i51mch.c */
 
 /*
- * 28-Oct-97 Ported from 8085 to 8051 by John Hartman
+ *  Copyright (C) 1998-2009  Alan R. Baldwin
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ * Alan R. Baldwin
+ * 721 Berkeley St.
+ * Kent, Ohio  44240
+ *
+ *   This Assember Ported by
+ *      John L. Hartman	(JLH)
+ *      jhartman at compuserve dot com
+ *      noice at noicedebugger dot com
+ *
  */
 
-#include <stdio.h>
-#include <setjmp.h>
-#include <string.h>
 #include "asxxxx.h"
 #include "i8051.h"
 
@@ -30,11 +35,10 @@
  * Process machine ops.
  */
 VOID
-machine(mp)
-struct mne *mp;
+machine(struct mne *mp)
 {
-        register unsigned op;
-        register int t, t1, v1;
+        unsigned op;
+        int t, t1, v1;
         struct expr e, e1;
 
         clrexpr(&e);
@@ -489,6 +493,7 @@
 
                 default:
                         aerr();
+                        break;
                 }
 
                 /* branch destination */
@@ -684,6 +689,7 @@
                 case S_AT_R:
                         outab(op + e1.e_addr);
                         break;
+
                 default:
                         aerr();
                 }
@@ -698,8 +704,7 @@
  * Branch/Jump PCR Mode Check
  */
 int
-mchpcr(esp)
-struct expr *esp;
+mchpcr(struct expr *esp)
 {
         if (esp->e_base.e_ap == dot.s_area) {
                 return(1);
@@ -719,14 +724,14 @@
         return(0);
 }
 
- /*
-  * Machine specific initialization
-  */
+/*
+ * Machine specific initialization
+ */
 
-static int beenHere=0;      /* set non-zero if we have done that... */
+static int beenHere = 0;        /* set non-zero if we have done that... */
 
 VOID
-minit()
+minit(void)
 {
         struct sym      *sp;
         struct PreDef   *pd;
diff -Nru sdcc-3.1.0+dfsg/sdas/as8051/i51pst.c sdcc-3.2.0+dfsg/sdas/as8051/i51pst.c
--- sdcc-3.1.0+dfsg/sdas/as8051/i51pst.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/as8051/i51pst.c	2011-12-18 17:44:59.000000000 +0000
@@ -1,147 +1,157 @@
-/* i85pst.c
-
-   Copyright (C) 1989-1995 Alan R. Baldwin
-   721 Berkeley St., Kent, Ohio 44240
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+/* i51pst.c */
 
 /*
- * 28-Oct-97 Ported from 8085 to 8051 by John Hartman
- * 30-Jan-98 JLH: add memory-space flags for .AREA
+ *  Copyright (C) 1998-2009  Alan R. Baldwin
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ * Alan R. Baldwin
+ * 721 Berkeley St.
+ * Kent, Ohio  44240
+ *
+ *   This Assember Ported by
+ *      John L. Hartman	(JLH)
+ *      jhartman at compuserve dot com
+ *      noice at noicedebugger dot com
+ *
  */
 
-#include <stdio.h>
-#include <setjmp.h>
 #include "asxxxx.h"
 #include "i8051.h"
 
+/*
+ * Mnemonic Structure
+ */
 struct  mne     mne[] = {
 
         /* machine */
 
         /* system */
 
-        { NULL, "CON",          S_ATYP,         0,      A3_CON},
-        { NULL, "OVR",          S_ATYP,         0,      A3_OVR},
-        { NULL, "REL",          S_ATYP,         0,      A3_REL},
-        { NULL, "ABS",          S_ATYP,         0,      A3_ABS},
-        { NULL, "NOPAG",        S_ATYP,         0,      A3_NOPAG},
-        { NULL, "PAG",          S_ATYP,         0,      A3_PAG},
-
-        { NULL, "CODE",         S_ATYP,         0,      A_CODE},
-        { NULL, "DATA",         S_ATYP,         0,      A_DATA},
-        { NULL, "XDATA",        S_ATYP,         0,      A_XDATA},
-        { NULL, "BIT",          S_ATYP,         0,      A_BIT},
-
-        { NULL, ".byte",        S_BYTE,         0,      0},
-        { NULL, ".db",          S_BYTE,         0,      0},
-        { NULL, ".word",        S_WORD,         0,      0},
-        { NULL, ".dw",          S_WORD,         0,      0},
-        { NULL, ".ascii",       S_ASCII,        0,      0},
-        { NULL, ".asciz",       S_ASCIZ,        0,      0},
-        { NULL, ".blkb",        S_BLK,          0,      1},
-        { NULL, ".ds",          S_BLK,          0,      1},
-        { NULL, ".blkw",        S_BLK,          0,      2},
-        { NULL, ".page",        S_PAGE,         0,      0},
-        { NULL, ".title",       S_TITLE,        0,      0},
-        { NULL, ".sbttl",       S_SBTL,         0,      0},
-        { NULL, ".globl",       S_GLOBL,        0,      0},
-        { NULL, ".area",        S_DAREA,        0,      0},
-        { NULL, ".even",        S_EVEN,         0,      0},
-        { NULL, ".odd",         S_ODD,          0,      0},
-        { NULL, ".if",          S_IF,           0,      0},
-        { NULL, ".else",        S_ELSE,         0,      0},
-        { NULL, ".endif",       S_ENDIF,        0,      0},
-        { NULL, ".include",     S_INCL,         0,      0},
-        { NULL, ".radix",       S_RADIX,        0,      0},
-        { NULL, ".org",         S_ORG,          0,      0},
-        { NULL, ".module",      S_MODUL,        0,      0},
-        { NULL, ".ascis",       S_ASCIS,        0,      0},
-        { NULL, ".flat24",      S_FLAT24,       0,      0},
+        { NULL, "CON",          S_ATYP,         0,      A3_CON  },
+        { NULL, "OVR",          S_ATYP,         0,      A3_OVR  },
+        { NULL, "REL",          S_ATYP,         0,      A3_REL  },
+        { NULL, "ABS",          S_ATYP,         0,      A3_ABS  },
+        { NULL, "NOPAG",        S_ATYP,         0,      A3_NOPAG },
+        { NULL, "PAG",          S_ATYP,         0,      A3_PAG  },
+
+        { NULL, "CODE",         S_ATYP,         0,      A_CODE  },
+        { NULL, "DATA",         S_ATYP,         0,      A_DATA  },
+        { NULL, "XDATA",        S_ATYP,         0,      A_XDATA },
+        { NULL, "BIT",          S_ATYP,         0,      A_BIT   },
+
+        { NULL, ".page",        S_PAGE,         0,      0       },
+        { NULL, ".title",       S_TITLE,        0,      0       },
+        { NULL, ".sbttl",       S_SBTL,         0,      0       },
+        { NULL, ".module",      S_MODUL,        0,      0       },
+        { NULL, ".include",     S_INCL,         0,      0       },
+        { NULL, ".area",        S_DAREA,        0,      0       },
+        { NULL, ".org",         S_ORG,          0,      0       },
+        { NULL, ".radix",       S_RADIX,        0,      0       },
+        { NULL, ".globl",       S_GLOBL,        0,      0       },
+        { NULL, ".if",          S_IF,           0,      0       },
+        { NULL, ".else",        S_ELSE,         0,      0       },
+        { NULL, ".endif",       S_ENDIF,        0,      0       },
+
+        { NULL, ".flat24",      S_FLAT24,       0,      0       },
 /* sdas specific */
-        { NULL, ".optsdcc",     S_OPTSDCC,      0,      0},
+        { NULL, ".optsdcc",     S_OPTSDCC,      0,      0       },
 /* end sdas specific */
+        { NULL, ".byte",        S_BYTE,         0,      0       },
+        { NULL, ".db",          S_BYTE,         0,      0       },
+        { NULL, ".word",        S_WORD,         0,      0       },
+        { NULL, ".dw",          S_WORD,         0,      0       },
+        { NULL, ".ascii",       S_ASCII,        0,      0       },
+        { NULL, ".ascis",       S_ASCIS,        0,      0       },
+        { NULL, ".asciz",       S_ASCIZ,        0,      0       },
+        { NULL, ".blkb",        S_BLK,          0,      1       },
+        { NULL, ".ds",          S_BLK,          0,      1       },
+        { NULL, ".blkw",        S_BLK,          0,      2       },
+        { NULL, ".even",        S_EVEN,         0,      0       },
+        { NULL, ".odd",         S_ODD,          0,      0       },
 
         /* 8051 */
+	/* machine */
 
-        { NULL, "a",            S_A,            0,      A},
-        { NULL, "ab",           S_AB,           0,      0},
-        { NULL, "dptr",         S_DPTR,         0,      DPTR},
-        { NULL, "pc",           S_PC,           0,      PC},
-        { NULL, "r0",           S_REG,          0,      R0},
-        { NULL, "r1",           S_REG,          0,      R1},
-        { NULL, "r2",           S_REG,          0,      R2},
-        { NULL, "r3",           S_REG,          0,      R3},
-        { NULL, "r4",           S_REG,          0,      R4},
-        { NULL, "r5",           S_REG,          0,      R5},
-        { NULL, "r6",           S_REG,          0,      R6},
-        { NULL, "r7",           S_REG,          0,      R7},
-
-        { NULL, "nop",          S_INH,          0,      0x00},
-        { NULL, "ret",          S_INH,          0,      0x22},
-        { NULL, "reti",         S_INH,          0,      0x32},
-
-        { NULL, "ajmp",         S_JMP11,        0,      0x01},
-        { NULL, "acall",        S_JMP11,        0,      0x11},
-        { NULL, "ljmp",         S_JMP16,        0,      0x02},
-        { NULL, "lcall",        S_JMP16,        0,      0x12},
-
-        { NULL, "rr",           S_ACC,          0,      0x03},
-        { NULL, "rrc",          S_ACC,          0,      0x13},
-        { NULL, "rl",           S_ACC,          0,      0x23},
-        { NULL, "rlc",          S_ACC,          0,      0x33},
-        { NULL, "swap",         S_ACC,          0,      0xC4},
-        { NULL, "da",           S_ACC,          0,      0xD4},
-
-        { NULL, "inc",          S_TYP1,         0,      0x00},
-        { NULL, "dec",          S_TYP1,         0,      0x10},
-
-        { NULL, "add",          S_TYP2,         0,      0x20},
-        { NULL, "addc",         S_TYP2,         0,      0x30},
-        { NULL, "subb",         S_TYP2,         0,      0x90},
-
-        { NULL, "orl",          S_TYP3,         0,      0x40},
-        { NULL, "anl",          S_TYP3,         0,      0x50},
-        { NULL, "xrl",          S_TYP3,         0,      0x60},
-
-        { NULL, "xch",          S_TYP4,         0,      0xC0},
-
-        { NULL, "mov",          S_MOV,          0,      0x00},
-
-        { NULL, "jbc",          S_BITBR,        0,      0x10},
-        { NULL, "jb",           S_BITBR,        0,      0x20},
-        { NULL, "jnb",          S_BITBR,        0,      0x30},
-
-        { NULL, "jc",           S_BR,           0,      0x40},
-        { NULL, "jnc",          S_BR,           0,      0x50},
-        { NULL, "jz",           S_BR,           0,      0x60},
-        { NULL, "jnz",          S_BR,           0,      0x70},
-        { NULL, "sjmp",         S_BR,           0,      0x80},
-
-        { NULL, "cjne",         S_CJNE,         0,      0xB0},
-        { NULL, "djnz",         S_DJNZ,         0,      0xD0},
-        { NULL, "jmp",          S_JMP,          0,      0x73},
-        { NULL, "movc",         S_MOVC,         0,      0x83},
-        { NULL, "movx",         S_MOVX,         0,      0x00},
-        { NULL, "div",          S_AB,           0,      0x84},
-        { NULL, "mul",          S_AB,           0,      0xA4},
-        { NULL, "clr",          S_ACBIT,        0,      0xC2},
-        { NULL, "cpl",          S_ACBIT,        0,      0xB2},
-        { NULL, "setb",         S_SETB,         0,      0xD2},
-        { NULL, "push",         S_DIRECT,       0,      0xC0},
-        { NULL, "pop",          S_DIRECT,       0,      0xD0},
-        { NULL, "xchd",         S_XCHD,         S_END,  0xD6}
+        { NULL, "a",            S_A,            0,      A       },
+        { NULL, "ab",           S_AB,           0,      0       },
+        { NULL, "dptr",         S_DPTR,         0,      DPTR    },
+        { NULL, "pc",           S_PC,           0,      PC      },
+        { NULL, "r0",           S_REG,          0,      R0      },
+        { NULL, "r1",           S_REG,          0,      R1      },
+        { NULL, "r2",           S_REG,          0,      R2      },
+        { NULL, "r3",           S_REG,          0,      R3      },
+        { NULL, "r4",           S_REG,          0,      R4      },
+        { NULL, "r5",           S_REG,          0,      R5      },
+        { NULL, "r6",           S_REG,          0,      R6      },
+        { NULL, "r7",           S_REG,          0,      R7      },
+
+        { NULL, "nop",          S_INH,          0,      0x00    },
+        { NULL, "ret",          S_INH,          0,      0x22    },
+        { NULL, "reti",         S_INH,          0,      0x32    },
+
+        { NULL, "ajmp",         S_JMP11,        0,      0x01    },
+        { NULL, "acall",        S_JMP11,        0,      0x11    },
+        { NULL, "ljmp",         S_JMP16,        0,      0x02    },
+        { NULL, "lcall",        S_JMP16,        0,      0x12    },
+
+        { NULL, "rr",           S_ACC,          0,      0x03    },
+        { NULL, "rrc",          S_ACC,          0,      0x13    },
+        { NULL, "rl",           S_ACC,          0,      0x23    },
+        { NULL, "rlc",          S_ACC,          0,      0x33    },
+        { NULL, "swap",         S_ACC,          0,      0xC4    },
+        { NULL, "da",           S_ACC,          0,      0xD4    },
+
+        { NULL, "inc",          S_TYP1,         0,      0x00    },
+        { NULL, "dec",          S_TYP1,         0,      0x10    },
+
+        { NULL, "add",          S_TYP2,         0,      0x20    },
+        { NULL, "addc",         S_TYP2,         0,      0x30    },
+        { NULL, "subb",         S_TYP2,         0,      0x90    },
+
+        { NULL, "orl",          S_TYP3,         0,      0x40    },
+        { NULL, "anl",          S_TYP3,         0,      0x50    },
+        { NULL, "xrl",          S_TYP3,         0,      0x60    },
+
+        { NULL, "xch",          S_TYP4,         0,      0xC0    },
+
+        { NULL, "mov",          S_MOV,          0,      0x00    },
+
+        { NULL, "jbc",          S_BITBR,        0,      0x10    },
+        { NULL, "jb",           S_BITBR,        0,      0x20    },
+        { NULL, "jnb",          S_BITBR,        0,      0x30    },
+
+        { NULL, "jc",           S_BR,           0,      0x40    },
+        { NULL, "jnc",          S_BR,           0,      0x50    },
+        { NULL, "jz",           S_BR,           0,      0x60    },
+        { NULL, "jnz",          S_BR,           0,      0x70    },
+        { NULL, "sjmp",         S_BR,           0,      0x80    },
+
+        { NULL, "cjne",         S_CJNE,         0,      0xB0    },
+        { NULL, "djnz",         S_DJNZ,         0,      0xD0    },
+        { NULL, "jmp",          S_JMP,          0,      0x73    },
+        { NULL, "movc",         S_MOVC,         0,      0x83    },
+        { NULL, "movx",         S_MOVX,         0,      0x00    },
+        { NULL, "div",          S_AB,           0,      0x84    },
+        { NULL, "mul",          S_AB,           0,      0xA4    },
+        { NULL, "clr",          S_ACBIT,        0,      0xC2    },
+        { NULL, "cpl",          S_ACBIT,        0,      0xB2    },
+        { NULL, "setb",         S_SETB,         0,      0xD2    },
+        { NULL, "push",         S_DIRECT,       0,      0xC0    },
+        { NULL, "pop",          S_DIRECT,       0,      0xD0    },
+        { NULL, "xchd",         S_XCHD,         S_EOL,  0xD6    }
 };
 
 struct PreDef preDef[] = {
diff -Nru sdcc-3.1.0+dfsg/sdas/as8051/i8051.h sdcc-3.2.0+dfsg/sdas/as8051/i8051.h
--- sdcc-3.1.0+dfsg/sdas/as8051/i8051.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/as8051/i8051.h	2012-06-28 14:09:28.000000000 +0000
@@ -1,24 +1,31 @@
-/* i8051.h
-
-   Copyright (C) 1989-1995 Alan R. Baldwin
-   721 Berkeley St., Kent, Ohio 44240
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+/* i8051.h */
 
 /*
- * Ported from 8085 to 8051 by John Hartman 30-Apr-1995
- * Continued, 2-Jun-95
+ *  Copyright (C) 1998-2009  Alan R. Baldwin
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ * Alan R. Baldwin
+ * 721 Berkeley St.
+ * Kent, Ohio  44240
+ *
+ *   This Assember Ported by
+ *      John L. Hartman	(JLH)
+ *      jhartman at compuserve dot com
+ *      noice at noicedebugger dot com
+ *
  */
 
 /*)BUILD
@@ -132,11 +139,10 @@
 extern  int             reg(void);
 
         /* i51mch.c */
-extern  VOID            machine(struct mne *mp);
 extern  int             mchpcr(struct expr *esp);
-extern  VOID            minit(void);
 
 #else
+
         /* i51adr.c */
 extern  struct  adsym   reg51[];
 extern  int             addr();
@@ -146,7 +152,6 @@
 extern  int             reg();
 
         /* i51mch.c */
-extern  VOID            machine();
 extern  int             mchpcr();
-extern  VOID            minit();
+
 #endif
diff -Nru sdcc-3.1.0+dfsg/sdas/asgb/gb.h sdcc-3.2.0+dfsg/sdas/asgb/gb.h
--- sdcc-3.1.0+dfsg/sdas/asgb/gb.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/asgb/gb.h	2012-06-28 14:09:28.000000000 +0000
@@ -154,9 +154,7 @@
 
 	/* gbmch.c */
 extern	int		genop(int pop, int op, struct expr *esp, int f);
-extern	VOID		machine(struct mne *mp);
 extern	int		mchpcr(struct expr *esp);
-extern	VOID		minit(void);
 
 #else
 	/* gbadr.c */
@@ -167,7 +165,5 @@
 
 	/* gbmch.c */
 extern	int		genop();
-extern	VOID		machine() ;
 extern	int		mchpcr();
-extern	VOID		minit();
 #endif
diff -Nru sdcc-3.1.0+dfsg/sdas/asgb/gbpst.c sdcc-3.2.0+dfsg/sdas/asgb/gbpst.c
--- sdcc-3.1.0+dfsg/sdas/asgb/gbpst.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/asgb/gbpst.c	2011-12-18 17:44:59.000000000 +0000
@@ -124,5 +124,5 @@
     { NULL,	"reti",		S_INH1,		0,	0xD9 },
     { NULL,	"ldh",		S_LDH,		0,	0xE0 },
     { NULL,	"lda",		S_LDA,		0,	0xE8 },
-    { NULL,	"ldhl",		S_LDHL,		S_END,	0xF }
+    { NULL,	"ldhl",		S_LDHL,		S_EOL,	0xF }
 };
diff -Nru sdcc-3.1.0+dfsg/sdas/asrab/Makefile.in sdcc-3.2.0+dfsg/sdas/asrab/Makefile.in
--- sdcc-3.1.0+dfsg/sdas/asrab/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/asrab/Makefile.in	2012-01-15 08:31:23.000000000 +0000
@@ -36,7 +36,8 @@
 
 CPPFLAGS        = @CPPFLAGS@ -DSDCDB -DNOICE -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/util
 CFLAGS          = @CFLAGS@ @WALL_FLAG@ $(CPPFLAGS)
-LDFLAGS         = @LDFLAGS@ -lm
+LDFLAGS         = @LDFLAGS@
+LIBS            = -lm
 
 OBJDIR = obj
 
@@ -65,7 +66,7 @@
 all: checkconf $(ASX)
 
 $(ASX): $(ASOBJECTS)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS) $(LIBS)
 
 # Compiling and installing everything and running test
 # ----------------------------------------------------
diff -Nru sdcc-3.1.0+dfsg/sdas/asrab/asrab.vcxproj sdcc-3.2.0+dfsg/sdas/asrab/asrab.vcxproj
--- sdcc-3.1.0+dfsg/sdas/asrab/asrab.vcxproj	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/asrab/asrab.vcxproj	2012-06-28 14:09:28.000000000 +0000
@@ -37,6 +37,7 @@
     <ProjectGuid>{F47A26F0-2D57-4A1F-86CF-6E3F82D3E877}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>asrab</RootNamespace>
+    <ProjectName>sdasrab</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff -Nru sdcc-3.1.0+dfsg/sdas/asrab/rabbit.h sdcc-3.2.0+dfsg/sdas/asrab/rabbit.h
--- sdcc-3.1.0+dfsg/sdas/asrab/rabbit.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/asrab/rabbit.h	2012-06-28 14:09:28.000000000 +0000
@@ -24,71 +24,71 @@
  */
 
 /*)BUILD
-	$(PROGRAM) =	asrab
-	$(INCLUDE) = {
-		ASXXXX.H
-		rabbit.H
-	}
-	$(FILES) = {
-		rabbitext.c
-		rabbitmch.c
-		rabbitadr.c
-		rabbitpst.c
-		ASMAIN.C
-		ASLEX.C
-		ASSYM.C
-		ASSUBR.C
-		ASEXPR.C
-		ASDATA.C
-		ASLIST.C
-		ASOUT.C
-	}
-	$(STACK) = 3000
+        $(PROGRAM) =    asrab
+        $(INCLUDE) = {
+                ASXXXX.H
+                rabbit.H
+        }
+        $(FILES) = {
+                rabbitext.c
+                rabbitmch.c
+                rabbitadr.c
+                rabbitpst.c
+                ASMAIN.C
+                ASLEX.C
+                ASSYM.C
+                ASSUBR.C
+                ASEXPR.C
+                ASDATA.C
+                ASLIST.C
+                ASOUT.C
+        }
+        $(STACK) = 3000
 */
 
 /*
  * Indirect Addressing delimeters
  */
-#define	LFIND	'('
-#define RTIND	')'
+#define LFIND   '('
+#define RTIND   ')'
 
 /*
  * Registers
  */
-#define B	0
-#define C	1
-#define D	2
-#define E	3
-#define H	4
-#define L	5
-#define A	7
+#define B       0
+#define C       1
+#define D       2
+#define E       3
+#define H       4
+#define L       5
+#define A       7
 
-#define IIR	0x47
-#define EIR	0x4F
+#define IIR     0x47
+#define EIR     0x4F
 #define IP      0x76
 
-#define BC	0
-#define DE	1
-#define HL	2
-#define SP	3
-#define AF	4
-#define IX	5
-#define IY	6
+#define BC      0
+#define DE      1
+#define HL      2
+#define SP      3
+#define AF      4
+#define IX      5
+#define IY      6
 
-#define BCDE	1
+#define BCDE    1
 #define JKHL    1
 
 /*
  * Conditional definitions
  */
-#define	NZ	0
-#define	Z	1
-#define	NC	2
-#define	CS	3
-#define	PO	4
-#define	PE	5
-#define	P	6
-#define	M	7
+#define NZ      0
+#define Z       1
+#define NC      2
+#define CS      3
+#define PO      4
+#define PE      5
+#define P       6
+#define M       7
 
 /*
  * Alternate set of conditional definitions for some rabbit 4000 instructions
@@ -105,13 +105,13 @@
 /*
  * Symbol types
  */
-#define	S_IMMED	30
-#define	S_R8	31
-#define	S_R8X	32
-#define	S_R16	33
-#define	S_R16X	34
-#define	S_CND	35
-#define	S_FLAG	36
+#define S_IMMED 30
+#define S_R8    31
+#define S_R8X   32
+#define S_R16   33
+#define S_R16X  34
+#define S_CND   35
+#define S_FLAG  36
 
 #define S_R32_BCDE   37
 #define S_R32_JKHL   38
@@ -120,56 +120,56 @@
 /*
  * Indexing modes
  */
-#define	S_INDB	40
-#define	S_IDC	41
-#define	S_INDR	50
-#define	S_IDBC	50
-#define	S_IDDE	51
-#define	S_IDHL	52
-#define	S_IDSP	53
-#define	S_IDIX	55
-#define	S_IDIY	56
-#define	S_INDM	57
+#define S_INDB  40
+#define S_IDC   41
+#define S_INDR  50
+#define S_IDBC  50
+#define S_IDDE  51
+#define S_IDHL  52
+#define S_IDSP  53
+#define S_IDIX  55
+#define S_IDIY  56
+#define S_INDM  57
 #define S_IDHL_OFFSET  58
 
 /*
  * Instruction types
  */
-#define	S_LD	60
-#define	S_CALL	61
-#define	S_JP	62
-#define	S_JR	63
-#define	S_RET	64
-#define	S_BIT	65
-#define	S_INC	66
-#define	S_DEC	67
-#define	S_ADD	68
-#define	S_ADC	69
-#define	S_AND	70
-#define	S_EX	71
-#define	S_PUSH	72
-#define	S_IN	73
-#define	S_OUT	74
-#define	S_RL	75
-#define	S_RST	76
-#define	S_IM	77
-#define	S_INH1	78
-#define	S_INH2	79
-#define	S_DJNZ	80
-#define	S_SUB	81
-#define	S_SBC	82
+#define S_LD    60
+#define S_CALL  61
+#define S_JP    62
+#define S_JR    63
+#define S_RET   64
+#define S_BIT   65
+#define S_INC   66
+#define S_DEC   67
+#define S_ADD   68
+#define S_ADC   69
+#define S_AND   70
+#define S_EX    71
+#define S_PUSH  72
+#define S_IN    73
+#define S_OUT   74
+#define S_RL    75
+#define S_RST   76
+#define S_IM    77
+#define S_INH1  78
+#define S_INH2  79
+#define S_DJNZ  80
+#define S_SUB   81
+#define S_SBC   82
 #define S_NEG   83
 
 /*
  * HD64180 Instructions
  */
-#define	X_HD64	90
-#define	X_INH2	91
-#define	X_IN	92
-#define	X_OUT	93
-#define	X_MLT	94
-#define	X_TST	95
-#define	X_TSTIO	96
+#define X_HD64  90
+#define X_INH2  91
+#define X_IN    92
+#define X_OUT   93
+#define X_MLT   94
+#define X_TST   95
+#define X_TSTIO 96
 
 /*
  * Rabbit 2000 / Rabbit 4000 specific Instructions
@@ -178,67 +178,68 @@
 #define X_LCALL      98
 #define X_BOOL       99
 
-#define X_R4K_MODE  101
+#define X_R3K_MODE  101
+#define R3K_INH1    102
+#define R3K_INH2    103
+
+#define X_R4K_MODE  105
 /* the remaining instructions are only on Rabbit 4000: */
-#define X_R4K_MULU  102   
-#define X_JRE       103
-#define X_CLR       104
+#define X_R4K_MULU  106   
+#define X_JRE       107
+#define X_CLR       108
+#define R4K_INH2    109
 
 #define BCDE_PG   0xDD
 #define JKHL_PG   0xFD
 
 struct adsym
 {
-	char	a_str[8];	/* addressing string */
-	int	a_val;		/* addressing mode value */
+        char    a_str[8];       /* addressing string */
+        int     a_val;          /* addressing mode value */
 };
 
-	/* register names are in rabbitadr.c: */
-extern	struct	adsym	R8[];
-extern	struct	adsym	R8X[];
-extern	struct	adsym	R8IP[];
-extern	struct	adsym	R16[];
-extern	struct	adsym	R16X[];
+        /* register names are in rabbitadr.c: */
+extern  struct  adsym   R8[];
+extern  struct  adsym   R8X[];
+extern  struct  adsym   R8IP[];
+extern  struct  adsym   R16[];
+extern  struct  adsym   R16X[];
 
 extern  struct  adsym   R32_JKHL[];
 extern  struct  adsym   R32_BCDE[];
 extern  struct  adsym   RXPC[];
 
-extern	struct	adsym	CND[];
+extern  struct  adsym   CND[];
 extern  struct  adsym   ALT_CND[];
 
-	/* machine dependent functions */
+        /* machine dependent functions */
+
+#ifdef  OTHERSYSTEM
+        
+        /* rabbitadr.c */
+extern  int             addr(struct expr *esp);
+extern  int             admode(struct adsym *sp);
+extern  int             any(char c, char *str);
+extern  int             srch(char *str);
+
 
-#ifdef	OTHERSYSTEM
-	
-	/* rabbitadr.c */
-extern	int		addr(struct expr *esp);
-extern	int		admode(struct adsym *sp);
-extern	int		any(char c, char *str);
-extern	int		srch(char *str);
-
-
-	/* rabbitmch.c */
-extern	int		genop(int pop, int op, struct expr *esp, int f);
-extern	int		gixiy(int v);
-extern	VOID		machine(struct mne *mp);
-extern	int		mchpcr(struct expr *esp);
-extern	VOID		minit(void);
+        /* rabbitmch.c */
+extern  int             genop(int pop, int op, struct expr *esp, int f);
+extern  int             gixiy(int v);
+extern  int             mchpcr(struct expr *esp);
 
 #else
 
-	/* rabbitadr.c */
-extern	int		addr();
-extern	int		admode();
-extern	int		any();
-extern	int		srch();
-
-	/* rabbitmch.c */
-extern	int		genop();
-extern	int		gixiy();
-extern	VOID		machine();
-extern	int		mchpcr();
-extern	VOID		minit();
+        /* rabbitadr.c */
+extern  int             addr();
+extern  int             admode();
+extern  int             any();
+extern  int             srch();
+
+        /* rabbitmch.c */
+extern  int             genop();
+extern  int             gixiy();
+extern  int             mchpcr();
 
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/sdas/asrab/rabbitadr.c sdcc-3.2.0+dfsg/sdas/asrab/rabbitadr.c
--- sdcc-3.1.0+dfsg/sdas/asrab/rabbitadr.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/asrab/rabbitadr.c	2011-12-18 17:44:59.000000000 +0000
@@ -53,20 +53,20 @@
                 expr(esp, 0);
                 esp->e_mode = S_IMMED;
 #if 0
-		/* ljm - leading digit is used for offset for dd(ix|iy|sp) */
+                /* ljm - leading digit is used for offset for dd(ix|iy|sp) */
         } else if ((c == '-') || ((c >= '0') && (c <= '9'))) {
           unget(c);
-	  expr(esp, 0);
-	  esp->e_mode = S_IMMED;
+          expr(esp, 0);
+          esp->e_mode = S_IMMED;
 #endif
-	} else
+        } else
         if (c == LFIND) {
-	  /* ljm comment -
-	   *      '(' number ')'   
-	   *  or  '(' register=[hl,ix,iy,sp,bc,de] ')'
-	   *     ref to memory, scan the next 'symbol' to see if
-	   *     it is a register or an absolute address
-	   */
+          /* ljm comment -
+           *      '(' number ')'   
+           *  or  '(' register=[hl,ix,iy,sp,bc,de] ')'
+           *     ref to memory, scan the next 'symbol' to see if
+           *     it is a register or an absolute address
+           */
                 if ((indx = admode(R8)) != 0) {
                         mode = S_INDB;
                 } else
@@ -81,7 +81,7 @@
                         mode = S_R16X;
                         aerr();
                 } else {
-			mode = S_INDM;
+                        mode = S_INDM;
                         expr(esp, 0);
                         esp->e_mode = mode;
                 }
@@ -89,25 +89,25 @@
                         esp->e_mode = (mode + indx)&0xFF;
                         esp->e_base.e_ap = NULL;
                 }
-		/* ljm comment -
-		 *   flag an error if the closing paren is absent
-		 */
+                /* ljm comment -
+                 *   flag an error if the closing paren is absent
+                 */
                 if ((c = getnb()) != RTIND)
                         qerr();
         } else {
                 unget(c);
-	  /* ljm -
-	   *   cases:
-	   *     register
-	   *     symbol
-	   *     symbol(register)
-	   *     number
-	   *     number(register)
-	   *
-	   * scan the list(s) of registers to see if the
-	   * name matches the name of one of the processor
-	   * registers
-	   */
+          /* ljm -
+           *   cases:
+           *     register
+           *     symbol
+           *     symbol(register)
+           *     number
+           *     number(register)
+           *
+           * scan the list(s) of registers to see if the
+           * name matches the name of one of the processor
+           * registers
+           */
                 if ((indx = admode(R8)) != 0) {
                         mode = S_R8;
                 } else
@@ -119,17 +119,17 @@
                 } else
                 if ((indx = admode(R16X)) != 0) {
                         mode = S_R16X;
-		} else
-		if ((indx = admode(R32_JKHL)) != 0) {
-		        mode = S_R32_JKHL;
-		} else
-		if ((indx = admode(R32_BCDE)) != 0) {
-		        mode = S_R32_BCDE;
-		} else
-		if ((indx = admode(RXPC)) != 0) {
-		        mode = S_RXPC;
+                } else
+                if ((indx = admode(R32_JKHL)) != 0) {
+                        mode = S_R32_JKHL;
+                } else
+                if ((indx = admode(R32_BCDE)) != 0) {
+                        mode = S_R32_BCDE;
+                } else
+                if ((indx = admode(RXPC)) != 0) {
+                        mode = S_RXPC;
                 } else {
-			mode = S_USER;
+                        mode = S_USER;
                         expr(esp, 0);
                         esp->e_mode = mode;
                 }
@@ -139,14 +139,14 @@
                         esp->e_base.e_ap = NULL;
                 }
                 if ((c = getnb()) == LFIND) {
-		  indx=admode(R16);
-		  if ((indx&0xFF)==IX || (indx&0xFF)==IY ||
-		      (indx&0xFF)==SP)
-		  {
-		    esp->e_mode = S_INDR + (indx&0xFF);
-		  } else if ( (indx&0xFF)==HL ) {
-		    esp->e_mode = S_IDHL_OFFSET;
-		  } else {
+                  indx=admode(R16);
+                  if ((indx&0xFF)==IX || (indx&0xFF)==IY ||
+                      (indx&0xFF)==SP)
+                  {
+                    esp->e_mode = S_INDR + (indx&0xFF);
+                  } else if ( (indx&0xFF)==HL ) {
+                    esp->e_mode = S_IDHL_OFFSET;
+                  } else {
                                 aerr();
                         }
                         if ((c = getnb()) != RTIND)
@@ -175,7 +175,7 @@
         unget(getnb());
 
         i = 0;
-	while ( *(ptr = &sp[i].a_str[0]) ) {
+        while ( *(ptr = &sp[i].a_str[0]) ) {
                 if (srch(ptr)) {
                         return(sp[i].a_val);
                 }
@@ -264,7 +264,7 @@
 };
 
 struct  adsym   R16X[] = {
-    { "af'",    AF|0400 },	/* af' must be first !!! */
+    { "af'",    AF|0400 },      /* af' must be first !!! */
     { "af",     AF|0400 },
     { "",       0000 }
 };
diff -Nru sdcc-3.1.0+dfsg/sdas/asrab/rabbitext.c sdcc-3.2.0+dfsg/sdas/asrab/rabbitext.c
--- sdcc-3.1.0+dfsg/sdas/asrab/rabbitext.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/asrab/rabbitext.c	2011-12-18 17:44:59.000000000 +0000
@@ -28,6 +28,6 @@
 #include "asxxxx.h"
 #include "rabbit.h"
 
-char	*cpu	= "Rabbit 2000/4000";
-int	hilo	= 0;
-char	*dsft	= "asm";
+char    *cpu    = "Rabbit 2000/4000";
+int     hilo    = 0;
+char    *dsft   = "asm";
diff -Nru sdcc-3.1.0+dfsg/sdas/asrab/rabbitmch.c sdcc-3.2.0+dfsg/sdas/asrab/rabbitmch.c
--- sdcc-3.1.0+dfsg/sdas/asrab/rabbitmch.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/asrab/rabbitmch.c	2012-05-20 23:43:48.000000000 +0000
@@ -23,1036 +23,1059 @@
  *   and rabbit 4000 instruction sets (2011)
  */
 
-#include <stdio.h>
-#include <setjmp.h>
 #include "asxxxx.h"
 #include "rabbit.h"
 
-char	imtab[3] = { 0x46, 0x56, 0x5E };
-int	hd64;
+char    imtab[3] = { 0x46, 0x56, 0x5E };
+int     hd64;
 
+int     r3k_mode;
 int     r4k_mode;
 /* when set, generate op-code for Rabbit-4000 instead of Rabbit 2000/3000 */
 
 /*
  * Process a machine op.
  */
-VOID
-machine(mp)
-struct mne *mp;
+VOID  machine(struct mne * const mp)
 {
-	int op, t1, t2;
-	struct expr e1, e2;
-	int rf, v1, v2;
-
-	clrexpr(&e1);
-	clrexpr(&e2);
-	op = (int) mp->m_valu;
-	rf = mp->m_type;
+  int op, t1, t2;
+  struct expr e1, e2;
+  int rf, v1, v2;
+  
+  clrexpr(&e1);
+  clrexpr(&e2);
+  op = (int) mp->m_valu;
+  rf = mp->m_type;
 #if 0
-	if (!hd64 && rf>X_HD64)
-		rf = 0;
-#else
-	if (!r4k_mode && rf > X_R4K_MODE)
-	  rf = 0;
+  if (!hd64 && rf>X_HD64)
+    rf = 0;
 #endif
-	switch (rf) {
-
-	case S_INH1:
-		outab(op);
-		break;
-
-	case S_INH2:
-		outab(0xED);
-		outab(op);
-		break;
-
-	case S_RET:
-		if (more()) {
-			if ((v1 = admode(CND)) != 0) {
-				outab(op | (v1<<3));
-			} else {
-				qerr();
-			}
-		} else {
-			outab(0xC9);
-		}
-		break;
-
-	case S_PUSH:
-		if (admode(R16X)) {
-			outab(op+0x30);
-			break;
-		} else if ((v1 = admode(R8IP)) != 0) {
-		  outab(0xED);
-		  if (op == 0xC5) 
-		    outab(0x76);  /* push */
-		  else
-		    outab(0x7E);  /* pop  */
-		  break;
-		} else
-		if ((v1 = admode(R16)) != 0 && (v1 &= 0xFF) != SP) {
-			if (v1 != gixiy(v1)) {
-				outab(op+0x20);
-				break;
-			}
-			outab(op | (v1<<4));
-			break;
-		} else if (r4k_mode) {
-		  if ( (v1 = admode(R32_JKHL)) != 0 ) {
-		    outab(JKHL_PG);
-		    outab(op+0x30);
-		    break;
-		  } else if ( (v1 = admode(R32_BCDE)) != 0 ) {
-		    outab(BCDE_PG);
-		    outab(op+0x30);
-		    break;
-		  }
-		}
-		aerr();
-		break;
-
-	case S_RST:
-		v1 = (int) absexpr();
-		/* ljm comment -
-		 *   block RST 00, 08, and 30 b/c those opcodes
-		 *   are assigned to different instructions in the
-		 *   rabbit processor
-		 */
-		if ((v1 == 0x00) || (v1 == 0x08) || (v1 == 0x30)) {
-		  aerr( );
-		  v1 = 0;
-		}
-		if (v1 & ~0x38) {
-			aerr();
-			v1 = 0;
-		}
-		outab(op|v1);
-		break;
-
+  
+  if (!r4k_mode && rf > X_R4K_MODE)
+    rf = 0;
+  
+  switch (rf)
+    {
+    case S_INH1:
+      outab(op);
+      break;
+      
+    case S_INH2:
+      outab(0xED);
+      outab(op);
+      break;
+      
+    case S_RET:
+      if (more()) {
+        if ((v1 = admode(CND)) != 0) {
+          outab(op | (v1<<3));
+        } else {
+          qerr();
+        }
+      } else {
+        outab(0xC9);
+      }
+      break;
+      
+    case S_PUSH:
+      if (admode(R16X)) {
+        outab(op+0x30);
+        break;
+      } else if ((v1 = admode(R8IP)) != 0) {
+        outab(0xED);
+        if (op == 0xC5) 
+          outab(0x76);  /* push */
+        else
+          outab(0x7E);  /* pop  */
+        break;
+      } else
+        if ((v1 = admode(R16)) != 0 && (v1 &= 0xFF) != SP) {
+          if (v1 != gixiy(v1)) {
+            outab(op+0x20);
+            break;
+          }
+          outab(op | (v1<<4));
+          break;
+        } else if (r4k_mode) {
+          if ( (v1 = admode(R32_JKHL)) != 0 ) {
+            outab(JKHL_PG);
+            outab(op+0x30);
+            break;
+          } else if ( (v1 = admode(R32_BCDE)) != 0 ) {
+            outab(BCDE_PG);
+            outab(op+0x30);
+            break;
+          }
+        }
+      aerr();
+      break;
+      
+    case S_RST:
+      v1 = (int) absexpr();
+      /* ljm comment -
+       *   block RST 00, 08, and 30 b/c those opcodes
+       *   are assigned to different instructions in the
+       *   rabbit processor
+       */
+      if ((v1 == 0x00) || (v1 == 0x08) || (v1 == 0x30)) {
+        aerr( );
+        v1 = 0;
+      }
+      if (v1 & ~0x38) {
+        aerr();
+        v1 = 0;
+      }
+      outab(op|v1);
+      break;
+      
 #if 0
-		/* IM x set interrupt mode on Z-80 */
-		/* Rabbit processor use the opcode to set interrupt level */
-	case S_IM:
-		expr(&e1, 0);
-		abscheck(&e1);
-		if (e1.e_addr > 2) {
-			aerr();
-			e1.e_addr = 0;
-		}
-		outab(op);
-		outab(imtab[(int) e1.e_addr]);
-		break;
+      /* IM x set interrupt mode on Z-80 */
+      /* Rabbit processor use the opcode to set interrupt level */
+    case S_IM:
+      expr(&e1, 0);
+      abscheck(&e1);
+      if (e1.e_addr > 2) {
+        aerr();
+        e1.e_addr = 0;
+      }
+      outab(op);
+      outab(imtab[(int) e1.e_addr]);
+      break;
 #endif
-		
-	case S_BIT:
-		expr(&e1, 0);
-		t1 = 0;
-		v1 = (int) e1.e_addr;
-		if (v1 > 7) {
-			++t1;
-			v1 &= 0x07;
-		}
-		op |= (v1<<3);
-		comma(1);
-		addr(&e2);
-		abscheck(&e1);
-		if (genop(0xCB, op, &e2, 0) || t1)
-			aerr();
-		break;
-
-	case S_RL:
-		t1 = 0;
-		t2 = addr(&e2);
-		if ((t2 == S_IMMED) && r4k_mode)
-		{
-		  v1 = (int) e2.e_addr;
-		  /* v1 should be shift count of 1,2,4, or 8 */
-		  comma(1);
-		  clrexpr(&e2);
-		  t2 = addr(&e2);
-		  
-		  if ((t2 != S_R32_BCDE) && (t2 != S_R32_JKHL))
-		    aerr( );
-		  
-		  if (v1 == 1)
-		    v1 = 0x48;
-		  else if (v1 == 2)
-		    v1 = 0x49;
-		  else if (v1 == 4)
-		    v1 = 0x4B;
-		  else if ((v1 == 8) && (op < 0x20 /* op is rlc|rrc|rl|rr */))
-		    v1 = 0x4F;
-		  else {
-		    err('o');
-		    break;
-		  }
-		  
-		  /* 00 rlc, 08 rrc, 10 rl , 18 rr                    *
-		   * 20 sla, 28 sra,         38 srl,  [30 sll == sla] */
-		  outab( ((t2 == S_R32_JKHL)?JKHL_PG:BCDE_PG) );
-		  outab(v1 + (op << 1));
-		  break;
-		}
-		else if (more()) {
-			if ((t2 != S_R8) || (e2.e_addr != A))
-				++t1;
-			comma(1);
-			clrexpr(&e2);
-			t2 = addr(&e2);
-		} else if (t2 == S_R16) {
-		  v2 = (int) e2.e_addr;
-		  if ((v2 == DE) && 
-		      ((op == 0x10 /* rl */) || (op == 0x18 /* rr */))) {
-		    outab( 0xF3 - 0x10 + op );
-		    break;
-		  }
-		  
-		  if ((v2 == HL) && (op == 0x18 /* rr */)) {
-		    outab( 0xFC );
-		    break;
-		  }
-
-		  if (r4k_mode) {
-		    if ((v2 == HL) && (op == 0x10 /* rl */)) {
-		      outab( 0x42 );
-		      break;
-		    }
-		    if (((v2 == BC)||(v2 == DE)) &&
-			(op < 0x20 /* 00 rlc, 08 rrc, 10 rl, 18 rr */)) {
-		      outab( 0x50 + (op >> 3) + ((v2==BC)?0x10:0x00) );
-		      break;
-		    }
-		  }
-		  
-		  aerr( );
-		}
-		if (genop(0xCB, op, &e2, 0) || t1)
-			aerr();
-		break;
-
-	case S_AND:  /* and, xor, or, cp */
-	case S_SUB:  /* sub */
-	case S_SBC:  /* sbc */
-		t1 = addr(&e1);
+      
+    case S_BIT:
+      expr(&e1, 0);
+      t1 = 0;
+      v1 = (int) e1.e_addr;
+      if (v1 > 7) {
+        ++t1;
+        v1 &= 0x07;
+      }
+      op |= (v1<<3);
+      comma(1);
+      addr(&e2);
+      abscheck(&e1);
+      if (genop(0xCB, op, &e2, 0) || t1)
+        aerr();
+      break;
+      
+    case S_RL:
+      t1 = 0;
+      t2 = addr(&e2);
+      if ((t2 == S_IMMED) && r4k_mode)
+        {
+          v1 = (int) e2.e_addr;
+          /* v1 should be shift count of 1,2,4, or 8 */
+          comma(1);
+          clrexpr(&e2);
+          t2 = addr(&e2);
+          
+          if ((t2 != S_R32_BCDE) && (t2 != S_R32_JKHL))
+            aerr( );
+          
+          if (v1 == 1)
+            v1 = 0x48;
+          else if (v1 == 2)
+            v1 = 0x49;
+          else if (v1 == 4)
+            v1 = 0x4B;
+          else if ((v1 == 8) && (op < 0x20 /* op is rlc|rrc|rl|rr */))
+            v1 = 0x4F;
+          else {
+            err('o');
+            break;
+          }
+          
+          /* 00 rlc, 08 rrc, 10 rl , 18 rr                    *
+           * 20 sla, 28 sra,         38 srl,  [30 sll == sla] */
+          outab( ((t2 == S_R32_JKHL)?JKHL_PG:BCDE_PG) );
+          outab(v1 + (op << 1));
+          break;
+        }
+      else if (more()) {
+        if ((t2 != S_R8) || (e2.e_addr != A))
+          ++t1;
+        comma(1);
+        clrexpr(&e2);
+        t2 = addr(&e2);
+      } else if (t2 == S_R16) {
+        v2 = (int) e2.e_addr;
+        if ((v2 == DE) && 
+            ((op == 0x10 /* rl */) || (op == 0x18 /* rr */))) {
+          outab( 0xF3 - 0x10 + op );
+          break;
+        }
+        
+        if ((v2 == HL) && (op == 0x18 /* rr */)) {
+          outab( 0xFC );
+          break;
+        }
+        
+        if (r4k_mode) {
+          if ((v2 == HL) && (op == 0x10 /* rl */)) {
+            outab( 0x42 );
+            break;
+          }
+          if (((v2 == BC)||(v2 == DE)) &&
+              (op < 0x20 /* 00 rlc, 08 rrc, 10 rl, 18 rr */)) {
+            outab( 0x50 + (op >> 3) + ((v2==BC)?0x10:0x00) );
+            break;
+          }
+        }
+        
+        aerr( );
+      }
+      if (genop(0xCB, op, &e2, 0) || t1)
+        aerr();
+      break;
+      
+    case S_AND:  /* and, xor, or, cp */
+    case S_SUB:  /* sub */
+    case S_SBC:  /* sbc */
+      t1 = addr(&e1);
 #if 0
-		if (!(more())) {
-		  /* handle case for implicit target of 'A' register */
-		  /* TODO */
-		  aerr( );
-		}
+      if (!(more())) {
+        /* handle case for implicit target of 'A' register */
+        /* TODO */
+        aerr( );
+      }
 #endif
-		comma(1);
-		t2 = addr(&e2);
-		
-		v1 = (int) e1.e_addr;
-		v2 = (int) e2.e_addr;
-		
-		if ((t1 == S_R8) && (v1 == A)) {
-		  if ( ((t2 == S_R8) && (v2 == A)) &&
-		       ((op == 0xA8) || (op == 0xB0)) ) {
-		    /* AF: "xor a,a"  ||  B7: "or a,a" */
-		    outab( op | 0x07 );
-		    break;
-		  }
-		  
-		  if ((t2 == S_R8) || (t2 == S_IDHL)) {
-		    /* ljm - rabbit 4000 support
-		     * (sub,sbc,and,xor,or,cp) A,R  or A,(HL)
-		     * needs a 0x7F prefix byte when
-		     * operating in rabbit 4000 mode
-		     */
-		    if (r4k_mode)
-		      outab(0x7F);
-		  }
-		  
+      comma(1);
+      t2 = addr(&e2);
+      
+      v1 = (int) e1.e_addr;
+      v2 = (int) e2.e_addr;
+      
+      if ((t1 == S_R8) && (v1 == A)) {
+        if ( ((t2 == S_R8) && (v2 == A)) &&
+             ((op == 0xA8) || (op == 0xB0)) ) {
+          /* AF: "xor a,a"  ||  B7: "or a,a" */
+          outab( op | 0x07 );
+          break;
+        }
+        
+        if ((t2 == S_R8) || (t2 == S_IDHL)) {
+          /* ljm - rabbit 4000 support
+           * (sub,sbc,and,xor,or,cp) A,R  or A,(HL)
+           * needs a 0x7F prefix byte when
+           * operating in rabbit 4000 mode
+           */
+          if (r4k_mode)
+            outab(0x7F);
+        }
+        
 #if 0
-		  if (t2 == S_IMMED) {  /* AND,XOR,OR,CP,SUB A, #n */
-		    /* opcode for (sub,sbc,and,xor,or,cp) A,#immediate 
-		     * do not need 0x7F prefix byte
-		     */
-		    outab(op|0x46);  /* 0xA0 | 0x46 => 0xE6, etc */
-		    outrb(&e2,0);
-		  } else
+        if (t2 == S_IMMED) {  /* AND,XOR,OR,CP,SUB A, #n */
+          /* opcode for (sub,sbc,and,xor,or,cp) A,#immediate 
+           * do not need 0x7F prefix byte
+           */
+          outab(op|0x46);  /* 0xA0 | 0x46 => 0xE6, etc */
+          outrb(&e2, 0);
+        } else
 #endif
-		    
-		    if (genop(0, op, &e2, 1))
-		      aerr();
-		  
-		  break;
-		}
-		if ((t1 == S_R16) && (v1 == HL) &&
-		    (t2 == S_R16) && (rf == S_SBC)) {
-		  /* sbc  hl, [bc|de|hl|sp] */
-		  if ( v2 != gixiy(v2) )
-		    /* sorry, sbc hl, [ix|iy] do not exist */
-		    aerr( );
-		  
-		  outab(0xED);
-		  outab(0x42 | v2 << 4);
-		  break;
-		}
-		if ((t1 == S_R16) && (v1 == HL) &&
-		    (t2 == S_R16) && (v2 == DE)) {
-		  /*  55     sub  hl, de */
-		  /*         sbc  hl, de  does not exist */
-		  /*  DC     and  hl, de */
-		  /*  54     xor  hl, de */
-		  /*  EC     or   hl, de */
-		  /*  ED 48  cp   hl, de */
-		  if (rf == S_SBC) /* op == 0x98 */
-		    aerr( );
-		  
-		  switch( op ) {
-		  case 0x90:  /* sub */ outab(0x55); break;
-		  case 0xA0:  /* and */ outab(0xDC); break;
-		  case 0xA8:  /* xor */ outab(0x54); break;
-		  case 0xB0:  /* or  */ outab(0xEC); break;
-		  case 0xB8:  /* cp  */
-		    outab( 0xED );
-		    outab( 0x48 );
-		    break;
-		  }
-		  break;
-		}
-		
-		if ((t1 == S_R16) && ((v1 == IX) || (v1 == IY)) &&
-		    (t2 == S_R16) && (v2 == DE) &&
-		    ((op == 0xA0 /* and */) || (op == 0xB0 /* or */))) {
-		  v1 = gixiy(v1);
-		  outab(op + 0x3C);
-		  break;
-		}
-		
-		if ((t1 == S_R32_JKHL) && (t2 == S_R32_BCDE)) {
-		  /* ED D6   sub  jkhl, bcde  */
-		  /*         sbc  jkhl, bcde does not exist */
-		  /* ED E6   and  jkhl, bcde  */
-		  /* ED EE   xor  jkhl, bcde  */
-		  /* ED F6   or   jkhl, bcde  */
-		  /* ED 58   cp   jkhl, bcde  */
-		  if (rf == S_SBC) /* op == 0x98 */
-		    aerr( );
-		  
-		  outab(0xED);
-		  switch( op ) {
-		  case 0x90:  /* sub */ outab(0xD6); break;
-		  case 0xA0:  /* and */ outab(0xE6); break;
-		  case 0xA8:  /* xor */ outab(0xEE); break;
-		  case 0xB0:  /* or  */ outab(0xF6); break;
-		  case 0xB8:  /* cp  */ outab(0x58); break;
-		  }
-		  break;
-		}
-		
-		if ((t1 == S_R16) && (v1 == HL) && (t2 == S_IMMED)) {
-		  /* cp  hl, #signed displacement */
-		  outab(0x48);
-		  outrb(&e2);
-		  break;
-		}
-		
-		aerr( );
-		break;
-
-	case S_ADD:
-	case S_ADC:
-		t1 = addr(&e1);
-		t2 = 0;
-		if (more()) {
-			comma(1);
-			t2 = addr(&e2);
-		}
-		if (t2 == 0) {
-		  /* implied destination of the 8-bit 'a' register */
-		  if ((t1 == S_R8) || (t1 == S_IDHL)) {
-		    /* ljm - rabbit 4000 support
-		     * (add,adc,sub,sbc,and,xor,or,cp) A,R  or A,(HL)
-		     * needs a 0x7F prefix byte when
-		     * operating in rabbit 4000 mode
-		     */
-		    if (r4k_mode)
-		      outab(0x7F);
-		  }
-		  
-		  if (genop(0, op, &e1, 1))
-		    aerr();
-		  break;
-		}
-		if ((t1 == S_R8) && (e1.e_addr == A)) {
-		  if ( ((t2 == S_R8) || (t2 == S_IDHL)) && r4k_mode )
-		    /* ljm - rabbit 4000 support, see note in t2==0 */
-		      outab(0x7F);
-
-			if (genop(0, op, &e2, 1))
-				aerr();
-			break;
-		}
-		
-		if ((t1 == S_R32_JKHL) && (t2 == S_R32_BCDE) &&
-		    (rf == S_ADD)) {
-		  /* rabbit 4000 - ED C6   "add  jkhl, bcde"  */
-		  outab(0xED);
-		  outab(0xC6);
-		  break;
-		}
-		
-		v1 = (int) e1.e_addr;
-		v2 = (int) e2.e_addr;
-		
-		if ((t1 == S_R16) && (v1 == SP) && (t2 == S_IMMED)) {
-		  /* rabbit 4000 - add sp,#n  n=signed displacement */
-		  outab(0x27);
-		  outrb(&e2);
-		  break;
-		}
-		
-		if ((t1 == S_R16) && (v1 == HL) && (t2 == S_R16)) {
-		  if (v2 > SP)
-		    aerr( );
-		  
-		  if (rf == S_ADC)
-		    outab(0xED);
-		  
-		  op = (rf == S_ADD) ? 0x09 : 0x4A;
-		  outab(op | (v2 << 4) );
-		  break;
-		}
-		
-		if ((t1 == S_R16) && ((v1 == IX) || (v1 == IY)) &&
-		    (t2 == S_R16))
-		{
-		  if ((v2 == HL) ||
-		      (((v2 == IX) || (v2 == IY)) && (v2 != v1)))
-		    aerr( );
-		  
-		  if ((v2 == IX) || (v2 == IY))
-		    v2 = HL;
-		  
-		  gixiy(v1);
-		  outab(0x09 | (v2 << 4));
-		  break;
-		}
-		aerr();
-		break;
-
-	case S_LD:
-		t1 = addr(&e1);
-		comma(1);
-		t2 = addr(&e2);
-		
-		v1 = (int) e1.e_addr;
-		v2 = (int) e2.e_addr;
-		if (t1 == S_R8)
-		{
-		  if (t2 == S_IMMED) {
-		    outab((e1.e_addr<<3) | 0x06);
-		    outrb(&e2,0);
-		    break;
-		  }
-		  
-		  if (r4k_mode && (v1 == A) && (t2 == S_R8) && (v2 == A)) {
-		    /* exception for "ld a,a" 
-		     * on rabbit 4000 0x7F is a prefix instead of "ld a,a"
-		     */
-		    aerr( );
-		  }
-		  
-		  if ((v1 == A) && (t2 == S_R8)) {
-		    /* "ld  a,r", (except "ld a,a") */
-		    v1 = op | e1.e_addr<<3;
-		    if (genop(0, v1, &e2, 0))
-			aerr( );
-		    break;
-		  }
-		  
-		  /* ld [b,c,d,e,h,l,a], _ */
-		  if ((t2 == S_R8) && (v2 != A)) {
-		    /* 8-bit register to 8-bit register */
-		    /* use 0x7F prefix when in rabbit 4000 mode */
-			v1 = op | e1.e_addr<<3;
-			if (r4k_mode)
-			  outab(0x7F);
-			if (genop(0, v1, &e2, 0) == 0)
-				break;
-			
-			aerr( );
-		  }
-		  
-		  if ((t2 == S_R8) && (v2 == A) &&
-		      ((v1 != A) || (!r4k_mode))) {
-		    /* "ld  r,a", but except "ld a,a" 
-		     * on rabbit 4000 0x7F is a prefix instead of "ld a,a" */
-		    v1 = op | e1.e_addr<<3;
-		    if (genop(0, v1, &e2, 0))
-			aerr( );
-		    break;
-		  }
-		  
-		  if ((t2 == S_IDHL) || (t2 == S_IDIX) || (t2 == S_IDIY)) {
-		    /* "ld r,(hl)" or "ld r,disp (ix|iy)" */
-		    v1 = op | e1.e_addr<<3;
-		    if (genop(0, v1, &e2, 0))
-		      aerr( );
-		    break;
-		  }
-		}
-
-		if ((t1 == S_R16) && (t2 == S_IMMED)) {
-		  v1 = gixiy(v1);  /* generayes prefix when ix or iy */
-			outab(0x01|(v1<<4));
-			outrw(&e2, 0);
-			break;
-		}
-		if ((t1 == S_R16) && (t2 == S_INDM)) {
-			if (gixiy(v1) == HL) {
-				outab(0x2A);
-			} else {
-				outab(0xED);
-				outab(0x4B | (v1<<4));
-			}
-			outrw(&e2, 0);
-			break;
-		}
-		if ((t1 == S_R16) && (v1 == HL))
-		{
-		  if ((t2 == S_IDIX) || (t2 == S_IDIY) ||
-		      (t2 == S_IDHL) || (t2 == S_IDHL_OFFSET))
-		  {
-		    /* ljm - added rabbit instruction LD HL,n(IX|HL|IY) */
-		    if (t2 == S_IDIY)
-		      outab( 0xFD ); 
-		    else if ((t2 == S_IDHL) || (t2 == S_IDHL_OFFSET))
-		      /* ljm - added rabbit instruction LD HL,n(IY)
-		       * normally 0xFD generated by "gixiy(v1)", but
-		       * 0xDD results in n(HL) instead of n(IX)
-		       */
-		      outab( 0xDD );
-		    
-		    outab( 0xE4 );
-		    outrb( &e2 );
-		    break;
-		  }
-		  if ((t2 == S_R16) && ((v2 == IX) || (v2 == IY))) {
-		    outab( ((v2==IX)?0xDD:0xFD) );
-		    outab(0x7C);
-		    break;
-		  }
-		  if (r4k_mode) {
-		    if ((t2 == S_R16) && ((v2 == BC) || (v2 == DE))) {
-		      outab( 0x81 + ((v2 == DE) ? 0x20 : 0) );
-		      break;
-		    }
-		  }
-		}
-		if ((t2 == S_R16) && (v2 == HL)) /* ld n(IX|IY|HL), HL */
-		{
-		  if ((t1 == S_IDIY) || (t1 == S_IDHL) ||
-		      (t1 == S_IDHL_OFFSET))
-		    outab( ((t1==S_IDIY) ? 0xFD : 0xDD) );
-		  
-		  if ((t1 == S_IDIY) || (t1 == S_IDIX) ||
-		      (t1 == S_IDHL) || (t1 == S_IDHL_OFFSET)) {
-		    outab( 0xF4 );
-		    outrb( &e2 );
-		    break;
-		  }
-		  
-		  if ((t1 == S_R16) && ((v1 == IX) || (v1 == IY))) {
-		    outab( ((v1==IX)?0xDD:0xFD) );
-		    outab(0x7D);
-		    break;
-		  }
-		}
-		if ((t1 == S_INDM) && (t2 == S_R16)) {
-			if (gixiy(v2) == HL) {
-				outab(0x22);
-			} else {
-				outab(0xED);
-				outab(0x43 | (v2<<4));
-			}
-			outrw(&e1, 0);
-			break;
-		}
-		if ((t1 == S_R8) && (v1 == A) && (t2 == S_INDM)) {
-			outab(0x3A);
-			outrw(&e2, 0);
-			break;
-		}
-		if ((t1 == S_INDM) && (t2 == S_R8) && (v2 == A)) {
-			outab(0x32);
-			outrw(&e1, 0);
-			break;
-		}
-		if ((t2 == S_R8) && (gixiy(t1) == S_IDHL)) {
-			outab(0x70|v2);
-			if (t1 != S_IDHL)
-				outrb(&e1, 0);
-			break;
-		}
-		if ((t2 == S_IMMED) && (gixiy(t1) == S_IDHL)) {
-			outab(0x36);
-			if (t1 != S_IDHL)
-				outrb(&e1, 0);
-			outrb(&e2, 0);
-			break;
-		}
-		if ((t1 == S_R8X) && (t2 == S_R8) && (v2 == A)) {
-			outab(0xED);
-			outab(v1);
-			break;
-		}
-		if ((t1 == S_R8) && (v1 == A) && (t2 == S_R8X)) {
-			outab(0xED);
-			outab(v2|0x10);
-			break;
-		}
-		if ((t1 == S_R16) && (v1 == SP)) {
-			if ((t2 == S_R16) && (gixiy(v2) == HL)) {
-				outab(0xF9);
-				break;
-			}
-		}
-		if ((t1 == S_R16) && (t2 == S_IDSP))
-		{
-		  if ( (v1=gixiy(v1)) == HL ) {
-		    /* ljm - added rabbit instruction:
-		     * LD HL|IX|IY, n(SP)
-		     */
-		    outab(0xC4);
-		    outrb(&e2);
-		    break;
-		  }
-		}
-		
-		if ((t1 == S_IDSP) && (t2 == S_R16))
-		{
-		  //printf( "at %s: %d, t1=%d, v1=%d, t2=%d, v2=%d\n",
-		  //  __FILE__, __LINE__, t1, v1, t2, v2 );
-		  if ( (v2=gixiy(v2)) == HL ) {
-		    /* ljm - added rabbit instruction:
-		     * LD HL|IX|IY, n(SP)
-		     */
-		    outab(0xD4);
-		    outrb(&e1);
-		    break;
-		  }
-		}
-		if ((t1 == S_R8) && (v1 == A)) {
-			if ((t2 == S_IDBC) || (t2 == S_IDDE)) {
-				outab(0x0A | ((t2-S_INDR)<<4));
-				break;
-			}
-		}
-		if ((t2 == S_R8) && (v2 == A)) {
-			if ((t1 == S_IDBC) || (t1 == S_IDDE)) {
-				outab(0x02 | ((t1-S_INDR)<<4));
-				break;
-			}
-		}
-		
-		/* load/save code bank register "xpc" */
-		if ((t1 == S_RXPC) && (t2 == S_R8) && (v2 == A)) {
-		  outab(0xED);
-		  outab(0x67);
-		  break;
-		}
-		
-		if ((t1 == S_RXPC) && r4k_mode &&
-		    (t2 == S_R16) && (v2 == HL)) {
-		  outab(0x97);
-		  break;
-		}
-		
-		if ((t2 == S_RXPC) && (t1 == S_R8) && (v1 == A)) {
-		  outab(0xED);
-		  outab(0x77);
-		  break;
-		}
-		
-		if ((t2 == S_RXPC) && r4k_mode &&
-		    (t1 == S_R16) && (v1 == HL)) {
-		  outab(0x9F);
-		  break;
-		}
-		
-		/* 16-bit operations valid only in rabbit 4000 mode */
-		if (r4k_mode && (t1 == S_R16) && (t2 == S_R16)) {
-		  if ((v1 == HL) && ((v2 == BC) || (v2 == DE))) {
-		    outab( 0x81 + ((v2==DE)?0x20:0x00) );
-		    break;
-		  }
-		  if ((v2 == HL) && ((v1 == BC) || (v1 == DE))) {
-		    outab( 0x91 + ((v1==DE)?0x20:0x00) );
-		    break;
-		  }
-		}
-		
-		/* 32-bit operations valid in rabbit 4000 mode */
-		if (r4k_mode && ((t1 == S_R32_JKHL) || (t1 == S_R32_BCDE))) {
-		  if (t2 == S_IDHL) {
-		    outab( ((t1 == S_R32_JKHL)?JKHL_PG:BCDE_PG) );
-		    outab( 0x1A );
-		    break;
-		  }
-		  if ((t2 == S_IDIX) || (t2 == S_IDIY) || (t2 == S_IDSP)) {
-		    outab( ((t1 == S_R32_JKHL)?JKHL_PG:BCDE_PG) );
-		    if (t2 == S_IDSP)
-		      v2 = 0x20;
-		    else 
-		      v2 = ((t2 == S_IDIY) ? 0x10 : 0x00);
-		    
-		    outab( 0xCE + v2 );
-		    outrb(&e2);
-		    break;
-		  }
-		  if (t2 == S_INDM) {
-		    outab( 0x93 + ((t1 == S_R32_JKHL) ? 1 : 0) );
-		    outrw(&e2, 0);
-		    break;
-		  }
-		  if (t2 == S_IMMED) {
-		    outab( 0xA3 + ((t1 == S_R32_JKHL) ? 1 : 0) );
-		    outrb(&e2);
-		    break;
-		  }
-		}
-		
-		if (r4k_mode && ((t2 == S_R32_JKHL) || (t2 == S_R32_BCDE))) {
-		  if (t1 == S_IDHL) {
-		    outab( ((t2 == S_R32_JKHL)?JKHL_PG:BCDE_PG) );
-		    outab( 0x1B );
-		    break;
-		  }
-		  if ((t1 == S_IDIX) || (t1 == S_IDIY) || (t1 == S_IDSP)) {
-		    outab( ((t2 == S_R32_JKHL)?JKHL_PG:BCDE_PG) );
-		    if (t1 == S_IDSP)
-		      v1 = 0x20;
-		    else 
-		      v1 = ((t1 == S_IDIY) ? 0x10 : 0x00);
-		    
-		    outab( 0xCF + v1 );
-		    outrb(&e1);
-		    break;
-		  }
-		  if (t1 == S_INDM) {
-		    outab( 0x83 + ((t2 == S_R32_JKHL) ? 1 : 0) );
-		    outrw(&e1, 0);
-		    break;
-		  }
-		}
-		aerr();
-		break;
-
-
-
-
-	case S_EX:
-		t1 = addr(&e1);
-		comma(1);
-		t2 = addr(&e2);
-		if (t2 == S_R16) {
-			v1 = (int) e1.e_addr;
-			v2 = (int) e2.e_addr;
-			if (t1 == S_R16) {
-				if ((v1 == DE) && (v2 == HL)) {
-					outab(0xEB);
-					break;
-				}
-				if (r4k_mode && (v1==BC) && (v2==HL)) {
-				  outab(0xB3);
-				  break;
-				}
-			}
-
-			if ((t1 == S_IDSP) && (v1 == 0) && (v2!=HL)) {
-			  /* 0xE3 is EX DE',HL on rabbit 2000 
-			   * but DD/FD E3 "ex (sp),ix|iy" is valid
-			   */
-				if (gixiy(v2) == HL) {
-					outab(op);
-					break;
-				}
-			}
-
-		}
-		if ((t1 == S_R16X) && (t2 == S_R16X)) {
-			outab(0x08);
-			break;
-		}
-		if ((t1==S_R32_JKHL) && (t2==S_R32_BCDE)) {
-		  outab(0xB4);
-		  break;
-		}
-		aerr();
-		break;
-
-	case S_IN:
-	case S_OUT:
-		outab(op);
-		break;
-
-	case S_DEC:
-	case S_INC:
-		t1 = addr(&e1);
-		v1 = (int) e1.e_addr;
-		if (t1 == S_R8) {
-			outab(op|(v1<<3));
-			break;
-		}
-		if (t1 == S_IDHL) {
-			outab(op|0x30);
-			break;
-		}
-		if (t1 != gixiy(t1)) {
-			outab(op|0x30);
-			outrb(&e1,0);
-			break;
-		}
-		if (t1 == S_R16) {
-			v1 = gixiy(v1);
-			if (rf == S_INC) {
-				outab(0x03|(v1<<4));
-				break;
-			}
-			if (rf == S_DEC) {
-				outab(0x0B|(v1<<4));
-				break;
-			}
-		}
-		aerr();
-		break;
-
-	case S_NEG:
-	  if (!more()) {
-	    /* "neg" implies "neg a" */
-		outab(0xED);
-		outab(op);
-		break;
-	  }
-	  t1 = addr(&e1);
-	  v1 = (int) e1.e_addr;
-	  if ((t1 == S_R8) && (v1 == A)) { /* "neg a" */
-	    outab(0xED);
-	    outab(op);
-	    break;
-	  }
-	  
-	  if ((t1 == S_R16) && (v1 == HL) && r4k_mode) { /* "neg hl" */
-	    outab(0x4D);
-	    break;
-	  }
-	  
-	  if (r4k_mode &&
-	      ((t1 == S_R32_JKHL) || (t1 == S_R32_BCDE))) {
-	    /* neg jkhl|bcde */
-	    outab( ( (t1 == S_R32_BCDE) ? 0xDD : 0xFD ) );
-	    outab(0x4D);
-	    break;
-	  }
-	  break;
-
-	case S_DJNZ:
-	case S_JR:
-		if ((v1 = admode(CND)) != 0 && rf != S_DJNZ) {
-			if ((v1 &= 0xFF) <= 0x03) {
-				op += (v1+1)<<3;
-			} else {
-				aerr();
-			}
-			comma(1);
-		}
-		expr(&e2, 0);
-		outab(op);
-		if (mchpcr(&e2)) {
-			v2 = (int) (e2.e_addr - dot.s_addr - 1);
-			if (pass == 2 && ((v2 < -128) || (v2 > 127)))
-				aerr();
-			outab(v2);
-		} else {
-			outrb(&e2, R3_PCR);
-		}
-		if (e2.e_mode != S_USER)
-			rerr();
-		break;
-
-	case S_CALL:
-		op = 0xCD;
-		expr(&e1, 0);
-		outab(op);
-		outrw(&e1, 0);
-		break;
-
-	case S_JP:
-		if ((v1 = admode(CND)) != 0) {
-			op |= (v1&0xFF)<<3;
-			comma(1);
-			expr(&e1, 0);
-			outab(op);
-			outrw(&e1, 0);
-			break;
-		}
-		t1 = addr(&e1);
-		if (t1 == S_USER) {
-			outab(0xC3);
-			outrw(&e1, 0);
-			break;
-		}
-		if ((e1.e_addr == 0) && (gixiy(t1) == S_IDHL)) {
-			outab(0xE9);
-			break;
-		}
-		aerr();
-		break;
-
-	case X_HD64:
-		++hd64;
-		break;
-
-	case X_INH2:
-		outab(0xED);
-		outab(op);
-		break;
-
-	case X_IN:
-	case X_OUT:
-		if (rf == X_IN) {
-			t1 = addr(&e1);
-			comma(1);
-			t2 = addr(&e2);
-		} else {
-			t2 = addr(&e2);
-			comma(1);
-			t1 = addr(&e1);
-		}
-		if ((t1 == S_R8) && (t2 == S_INDM)) {
-			outab(0xED);
-			outab(op | (e1.e_addr<<3));
-			outrb(&e2, 0);
-			break;
-		}
-		aerr();
-		break;
-
-	case X_MLT:
-		t1 = addr(&e1);
-		if ((t1 == S_R16) && ((v1 = (int) e1.e_addr) <= SP)) {
-			outab(0xED);
-			outab(op | (v1<<4));
-			break;
-		}
-		aerr();
-		break;
-
-	case X_TST:
-		t1 = addr(&e1);
-		if (t1 == S_R8) {
-			outab(0xED);
-			outab(op | (e1.e_addr<<3));
-			break;
-		}
-		if (t1 == S_IDHL) {
-			outab(0xED);
-			outab(0x34);
-			break;
-		}
-		if (t1 == S_IMMED) {
-			outab(0xED);
-			outab(0x64);
-			outrb(&e1, 0);
-			break;
-		}
-		aerr();
-		break;
-
-	case X_TSTIO:
-		t1 = addr(&e1);
-		if (t1 == S_IMMED) {
-			outab(0xED);
-			outab(op);
-			outrb(&e1, 0);
-			break;
-		}
-		aerr();
-		break;
-
-	case X_LJP:
-	case X_LCALL:
-	  /* bank jump or call for rabbit processor */
-	  t1 = addr(&e1);
-	  comma(1);
-	  t2 = addr(&e2);
-	  v1 = (int) e1.e_addr;
-	  if ((t1 == S_USER) && (t2 == S_IMMED)) {
-	    outab(op);
-	    outrw(&e1, 0);
-	    outrb(&e2, 0);
-	    break;
-	  }
-	  break;
-	  
-	case X_BOOL:
-	  t1 = addr(&e1);
-	  v1 = (int) e1.e_addr;
-	  if ((t1 == S_R16) && ((v1 == HL) || (v1 == IX) || (v1 == IY))) {
-	    v1 = gixiy(v1);
-	    outab(op);
-	    break;
-	  }
-	  aerr( );
-	  break;
-	  
-	case X_R4K_MODE:
-	  r4k_mode=1;
-	  break;
-
-	case X_R4K_MULU:
-	  if (!r4k_mode)
-	    err('o');
-	  
-	  outab(op);
-	  break;
-	  
-	case X_JRE:
-	  if (!r4k_mode)
-	    err('o');
-	  
-	  if ((v1 = admode(ALT_CND)) != 0) {
-	    op += v1<<3;
-	    comma(1);
-	  } else {
-	    op = 0x98;
-	  }
-	  expr(&e2, 0);
-	  outab(op);
-	  if (mchpcr(&e2)) {
-	    v2 = (int) (e2.e_addr - dot.s_addr - 1);
-	    if (pass == 2 && ((v2 < -32768) || (v2 > 32767)))
-	      aerr();
-	    outab( (v2 & 0xFF) );
-	    outab( (v2 >> 8) );
-	  } else {
-	    outrb(&e2, R3_PCR);
-	  }
-	  if (e2.e_mode != S_USER)
-	    rerr();
-	  break;
-
-	case X_CLR:
-	  if (!r4k_mode)
-	    err('o');
-	  t1 = addr(&e1);
-	  v1 = (int) e1.e_addr;
-	  if ((t1 == S_R16) && (v1 == HL)) {
-	    outab(op);
-	    break;
-	  }
-	  aerr( );
-	  break;
-	  
-	default:
-		err('o');
-	}
+          
+          if (genop(0, op, &e2, 1))
+            aerr();
+        
+        break;
+      }
+      
+      if ((t1 == S_R16) && (v1 == HL) &&
+          (t2 == S_R16) && (rf == S_SBC)) {
+        /* sbc  hl, [bc|de|hl|sp] */
+        if ( v2 != gixiy(v2) )
+          /* sorry, sbc hl, [ix|iy] do not exist */
+          aerr( );
+                  
+        outab(0xED);
+        outab(0x42 | v2 << 4);
+        break;
+      }
+      if ((t1 == S_R16) && (v1 == HL) &&
+          (t2 == S_R16) && (v2 == DE)) {
+        /*  55     sub  hl, de */
+        /*         sbc  hl, de  does not exist */
+        /*  DC     and  hl, de */
+        /*  54     xor  hl, de */
+        /*  EC     or   hl, de */
+        /*  ED 48  cp   hl, de */
+        if (rf == S_SBC) /* op == 0x98 */
+          aerr( );
+        
+        switch( op ) {
+        case 0x90:  /* sub */ outab(0x55); break;
+        case 0xA0:  /* and */ outab(0xDC); break;
+        case 0xA8:  /* xor */ outab(0x54); break;
+        case 0xB0:  /* or  */ outab(0xEC); break;
+        case 0xB8:  /* cp  */
+          outab( 0xED );
+          outab( 0x48 );
+          break;
+        }
+        break;
+      }
+      
+      if ((t1 == S_R16) && ((v1 == IX) || (v1 == IY)) &&
+          (t2 == S_R16) && (v2 == DE) &&
+          ((op == 0xA0 /* and */) || (op == 0xB0 /* or */))) {
+        v1 = gixiy(v1);
+        outab(op + 0x3C);
+        break;
+      }
+      
+      if ((t1 == S_R32_JKHL) && (t2 == S_R32_BCDE)) {
+        /* ED D6   sub  jkhl, bcde  */
+        /*         sbc  jkhl, bcde does not exist */
+        /* ED E6   and  jkhl, bcde  */
+        /* ED EE   xor  jkhl, bcde  */
+        /* ED F6   or   jkhl, bcde  */
+        /* ED 58   cp   jkhl, bcde  */
+        if (rf == S_SBC) /* op == 0x98 */
+          aerr( );
+        
+        outab(0xED);
+        switch( op ) {
+        case 0x90:  /* sub */ outab(0xD6); break;
+        case 0xA0:  /* and */ outab(0xE6); break;
+        case 0xA8:  /* xor */ outab(0xEE); break;
+        case 0xB0:  /* or  */ outab(0xF6); break;
+        case 0xB8:  /* cp  */ outab(0x58); break;
+        }
+        break;
+      }
+      
+      if ((t1 == S_R16) && (v1 == HL) && (t2 == S_IMMED)) {
+        /* cp  hl, #signed displacement */
+        outab(0x48);
+        outrb(&e2, 0);
+        break;
+      }
+      
+      aerr( );
+      break;
+      
+    case S_ADD:
+    case S_ADC:
+      t1 = addr(&e1);
+      t2 = 0;
+      if (more()) {
+        comma(1);
+        t2 = addr(&e2);
+      }
+      if (t2 == 0) {
+        /* implied destination of the 8-bit 'a' register */
+        if ((t1 == S_R8) || (t1 == S_IDHL)) {
+          /* ljm - rabbit 4000 support
+           * (add,adc,sub,sbc,and,xor,or,cp) A,R  or A,(HL)
+           * needs a 0x7F prefix byte when
+           * operating in rabbit 4000 mode
+           */
+          if (r4k_mode)
+            outab(0x7F);
+        }
+        
+        if (genop(0, op, &e1, 1))
+          aerr();
+        break;
+      }
+      if ((t1 == S_R8) && (e1.e_addr == A)) {
+        if ( ((t2 == S_R8) || (t2 == S_IDHL)) && r4k_mode )
+          /* ljm - rabbit 4000 support, see note in t2==0 */
+          outab(0x7F);
+        
+        if (genop(0, op, &e2, 1))
+          aerr();
+        break;
+      }
+      
+      if ((t1 == S_R32_JKHL) && (t2 == S_R32_BCDE) &&
+          (rf == S_ADD)) {
+        /* rabbit 4000 - ED C6   "add  jkhl, bcde"  */
+        outab(0xED);
+        outab(0xC6);
+        break;
+      }
+      
+      v1 = (int) e1.e_addr;
+      v2 = (int) e2.e_addr;
+      
+      if ((t1 == S_R16) && (v1 == SP) && (t2 == S_IMMED)) {
+        /* rabbit 4000 - add sp,#n  n=signed displacement */
+        outab(0x27);
+        outrb(&e2, 0);
+        break;
+      }
+      
+      if ((t1 == S_R16) && (v1 == HL) && (t2 == S_R16)) {
+        if (v2 > SP)
+          aerr( );
+        
+        if (rf == S_ADC)
+          outab(0xED);
+        
+        op = (rf == S_ADD) ? 0x09 : 0x4A;
+        outab(op | (v2 << 4) );
+        break;
+      }
+      
+      if ((t1 == S_R16) && ((v1 == IX) || (v1 == IY)) &&
+          (t2 == S_R16))
+        {
+          if ((v2 == HL) ||
+              (((v2 == IX) || (v2 == IY)) && (v2 != v1)))
+            aerr( );
+          
+          if ((v2 == IX) || (v2 == IY))
+            v2 = HL;
+          
+          gixiy(v1);
+          outab(0x09 | (v2 << 4));
+          break;
+        }
+      aerr();
+      break;
+      
+    case S_LD:
+      t1 = addr(&e1);
+      comma(1);
+      t2 = addr(&e2);
+      
+      v1 = (int) e1.e_addr;
+      v2 = (int) e2.e_addr;
+      if (t1 == S_R8)
+        {
+          if (t2 == S_IMMED) {
+            outab((e1.e_addr<<3) | 0x06);
+            outrb(&e2, 0);
+            break;
+          }
+          
+          if (r4k_mode && (v1 == A) && (t2 == S_R8) && (v2 == A)) {
+            /* exception for "ld a,a" 
+             * on rabbit 4000 0x7F is a prefix instead of "ld a,a"
+             */
+            aerr( );
+          }
+          
+          if ((v1 == A) && (t2 == S_R8)) {
+            /* "ld  a,r", (except "ld a,a") */
+            v1 = op | e1.e_addr<<3;
+            if (genop(0, v1, &e2, 0))
+              aerr( );
+            break;
+          }
+          
+          /* ld [b,c,d,e,h,l,a], _ */
+          if ((t2 == S_R8) && (v2 != A)) {
+            /* 8-bit register to 8-bit register */
+            /* use 0x7F prefix when in rabbit 4000 mode */
+            v1 = op | e1.e_addr<<3;
+            if (r4k_mode)
+              outab(0x7F);
+            if (genop(0, v1, &e2, 0) == 0)
+              break;
+            
+            aerr( );
+          }
+          
+          if ((t2 == S_R8) && (v2 == A) &&
+              ((v1 != A) || (!r4k_mode))) {
+            /* "ld  r,a", but except "ld a,a" 
+             * on rabbit 4000 0x7F is a prefix instead of "ld a,a" */
+            v1 = op | e1.e_addr<<3;
+            if (genop(0, v1, &e2, 0))
+              aerr( );
+            break;
+          }
+          
+          if ((t2 == S_IDHL) || (t2 == S_IDIX) || (t2 == S_IDIY)) {
+            /* "ld r,(hl)" or "ld r,disp (ix|iy)" */
+            v1 = op | e1.e_addr<<3;
+            if (genop(0, v1, &e2, 0))
+              aerr( );
+            break;
+          }
+        }
+      
+      if ((t1 == S_R16) && (t2 == S_IMMED)) {
+        v1 = gixiy(v1);  /* generayes prefix when ix or iy */
+        outab(0x01|(v1<<4));
+        outrw(&e2, 0);
+        break;
+      }
+      if ((t1 == S_R16) && (t2 == S_INDM)) {
+        if (gixiy(v1) == HL) {
+          outab(0x2A);
+        } else {
+          outab(0xED);
+          outab(0x4B | (v1<<4));
+        }
+        outrw(&e2, 0);
+        break;
+      }
+      if ((t1 == S_R16) && (v1 == HL))
+        {
+          if ((t2 == S_IDIX) || (t2 == S_IDIY) ||
+              (t2 == S_IDHL) || (t2 == S_IDHL_OFFSET))
+            {
+              /* ljm - added rabbit instruction LD HL,n(IX|HL|IY) */
+              if (t2 == S_IDIY)
+                outab(0xFD); 
+              else if ((t2 == S_IDHL) || (t2 == S_IDHL_OFFSET))
+                /* ljm - added rabbit instruction LD HL,n(IY)
+                 * normally 0xFD generated by "gixiy(v1)", but
+                 * 0xDD results in n(HL) instead of n(IX)
+                 */
+                outab(0xDD);
+              
+              outab(0xE4);
+              outrb(&e2, 0);
+              break;
+            }
+          if ((t2 == S_R16) && ((v2 == IX) || (v2 == IY))) {
+            outab( ((v2==IX)?0xDD:0xFD) );
+            outab(0x7C);
+            break;
+          }
+          if (r4k_mode) {
+            if ((t2 == S_R16) && ((v2 == BC) || (v2 == DE))) {
+              outab( 0x81 + ((v2 == DE) ? 0x20 : 0) );
+              break;
+            }
+          }
+        }
+      if ((t2 == S_R16) && (v2 == HL)) /* ld n(IX|IY|HL), HL */
+        {
+          if ((t1 == S_IDIY) || (t1 == S_IDHL) ||
+              (t1 == S_IDHL_OFFSET))
+            outab( ((t1==S_IDIY) ? 0xFD : 0xDD) );
+          
+          if ((t1 == S_IDIY) || (t1 == S_IDIX) ||
+              (t1 == S_IDHL) || (t1 == S_IDHL_OFFSET)) {
+            outab(0xF4);
+            outrb(&e2, 0);
+            break;
+          }
+          
+          if ((t1 == S_R16) && ((v1 == IX) || (v1 == IY))) {
+            outab( ((v1==IX)?0xDD:0xFD) );
+            outab(0x7D);
+            break;
+          }
+        }
+      if ((t1 == S_INDM) && (t2 == S_R16)) {
+        if (gixiy(v2) == HL) {
+          outab(0x22);
+        } else {
+          outab(0xED);
+          outab(0x43 | (v2<<4));
+        }
+        outrw(&e1, 0);
+        break;
+      }
+      if ((t1 == S_R8) && (v1 == A) && (t2 == S_INDM)) {
+        outab(0x3A);
+        outrw(&e2, 0);
+        break;
+      }
+      if ((t1 == S_INDM) && (t2 == S_R8) && (v2 == A)) {
+        outab(0x32);
+        outrw(&e1, 0);
+        break;
+      }
+      if ((t2 == S_R8) && (gixiy(t1) == S_IDHL)) {
+        outab(0x70|v2);
+        if (t1 != S_IDHL)
+          outrb(&e1, 0);
+        break;
+      }
+      if ((t2 == S_IMMED) && (gixiy(t1) == S_IDHL)) {
+        outab(0x36);
+        if (t1 != S_IDHL)
+          outrb(&e1, 0);
+        outrb(&e2, 0);
+        break;
+      }
+      if ((t1 == S_R8X) && (t2 == S_R8) && (v2 == A)) {
+        outab(0xED);
+        outab(v1);
+        break;
+      }
+      if ((t1 == S_R8) && (v1 == A) && (t2 == S_R8X)) {
+        outab(0xED);
+        outab(v2|0x10);
+        break;
+      }
+      if ((t1 == S_R16) && (v1 == SP)) {
+        if ((t2 == S_R16) && (gixiy(v2) == HL)) {
+          outab(0xF9);
+          break;
+        }
+      }
+      if ((t1 == S_R16) && (t2 == S_IDSP))
+        {
+          if ( (v1=gixiy(v1)) == HL ) {
+            /* ljm - added rabbit instruction:
+             * LD HL|IX|IY, n(SP)
+             */
+            outab(0xC4);
+            outrb(&e2, 0);
+            break;
+          }
+        }
+      
+      if ((t1 == S_IDSP) && (t2 == S_R16))
+        {
+          //printf( "at %s: %d, t1=%d, v1=%d, t2=%d, v2=%d\n",
+          //  __FILE__, __LINE__, t1, v1, t2, v2 );
+          if ( (v2=gixiy(v2)) == HL ) {
+            /* ljm - added rabbit instruction:
+             * LD HL|IX|IY, n(SP)
+             */
+            outab(0xD4);
+            outrb(&e1, 0);
+            break;
+          }
+        }
+      if ((t1 == S_R8) && (v1 == A)) {
+        if ((t2 == S_IDBC) || (t2 == S_IDDE)) {
+          outab(0x0A | ((t2-S_INDR)<<4));
+          break;
+        }
+      }
+      if ((t2 == S_R8) && (v2 == A)) {
+        if ((t1 == S_IDBC) || (t1 == S_IDDE)) {
+          outab(0x02 | ((t1-S_INDR)<<4));
+          break;
+        }
+      }
+      
+      /* load/save code bank register "xpc" */
+      if ((t1 == S_RXPC) && (t2 == S_R8) && (v2 == A)) {
+        outab(0xED);
+        outab(0x67);
+        break;
+      }
+      
+      if ((t1 == S_RXPC) && r4k_mode &&
+          (t2 == S_R16) && (v2 == HL)) {
+        outab(0x97);
+        break;
+      }
+      
+      if ((t2 == S_RXPC) && (t1 == S_R8) && (v1 == A)) {
+        outab(0xED);
+        outab(0x77);
+        break;
+      }
+      
+      if ((t2 == S_RXPC) && r4k_mode &&
+          (t1 == S_R16) && (v1 == HL)) {
+        outab(0x9F);
+        break;
+      }
+      
+      /* 16-bit operations valid only in rabbit 4000 mode */
+      if (r4k_mode && (t1 == S_R16) && (t2 == S_R16)) {
+        if ((v1 == HL) && ((v2 == BC) || (v2 == DE))) {
+          outab( 0x81 + ((v2==DE)?0x20:0x00) );
+          break;
+        }
+        if ((v2 == HL) && ((v1 == BC) || (v1 == DE))) {
+          outab( 0x91 + ((v1==DE)?0x20:0x00) );
+          break;
+        }
+      }
+      
+      /* 32-bit operations valid in rabbit 4000 mode */
+      if (r4k_mode && ((t1 == S_R32_JKHL) || (t1 == S_R32_BCDE))) {
+        if (t2 == S_IDHL) {
+          outab( ((t1 == S_R32_JKHL)?JKHL_PG:BCDE_PG) );
+          outab( 0x1A );
+          break;
+        }
+        if ((t2 == S_IDIX) || (t2 == S_IDIY) || (t2 == S_IDSP)) {
+          outab( ((t1 == S_R32_JKHL)?JKHL_PG:BCDE_PG) );
+          if (t2 == S_IDSP)
+            v2 = 0x20;
+          else 
+            v2 = ((t2 == S_IDIY) ? 0x10 : 0x00);
+          
+          outab( 0xCE + v2 );
+          outrb(&e2, 0);
+          break;
+        }
+        if (t2 == S_INDM) {
+          outab( 0x93 + ((t1 == S_R32_JKHL) ? 1 : 0) );
+          outrw(&e2, 0);
+          break;
+        }
+        if (t2 == S_IMMED) {
+          outab( 0xA3 + ((t1 == S_R32_JKHL) ? 1 : 0) );
+          outrb(&e2, 0);
+          break;
+        }
+      }
+      
+      if (r4k_mode && ((t2 == S_R32_JKHL) || (t2 == S_R32_BCDE))) {
+        if (t1 == S_IDHL) {
+          outab( ((t2 == S_R32_JKHL)?JKHL_PG:BCDE_PG) );
+          outab( 0x1B );
+          break;
+        }
+        if ((t1 == S_IDIX) || (t1 == S_IDIY) || (t1 == S_IDSP)) {
+          outab( ((t2 == S_R32_JKHL)?JKHL_PG:BCDE_PG) );
+          if (t1 == S_IDSP)
+            v1 = 0x20;
+          else 
+            v1 = ((t1 == S_IDIY) ? 0x10 : 0x00);
+          
+          outab( 0xCF + v1 );
+          outrb(&e1, 0);
+          break;
+        }
+        if (t1 == S_INDM) {
+          outab( 0x83 + ((t2 == S_R32_JKHL) ? 1 : 0) );
+          outrw(&e1, 0);
+          break;
+        }
+      }
+      aerr();
+      break;
+      
+    case S_EX:
+      t1 = addr(&e1);
+      comma(1);
+      t2 = addr(&e2);
+      if (t2 == S_R16) {
+        v1 = (int) e1.e_addr;
+        v2 = (int) e2.e_addr;
+        if (t1 == S_R16) {
+          if ((v1 == DE) && (v2 == HL)) {
+            outab(0xEB);
+            break;
+          }
+          if (r4k_mode && (v1==BC) && (v2==HL)) {
+            outab(0xB3);
+            break;
+          }
+        }
+        
+        if ((t1 == S_IDSP) && (v1 == 0) && (v2!=HL)) {
+          /* 0xE3 is EX DE',HL on rabbit 2000 
+           * but DD/FD E3 "ex (sp),ix|iy" is valid
+           */
+          if (gixiy(v2) == HL) {
+            outab(op);
+            break;
+          }
+        }
+        
+      }
+      if ((t1 == S_R16X) && (t2 == S_R16X)) {
+        outab(0x08);
+        break;
+      }
+      if ((t1==S_R32_JKHL) && (t2==S_R32_BCDE)) {
+        outab(0xB4);
+        break;
+      }
+      aerr();
+      break;
+      
+    case S_IN:
+    case S_OUT:
+      outab(op);
+      break;
+      
+    case S_DEC:
+    case S_INC:
+      t1 = addr(&e1);
+      v1 = (int) e1.e_addr;
+      if (t1 == S_R8) {
+        outab(op|(v1<<3));
+        break;
+      }
+      if (t1 == S_IDHL) {
+        outab(op|0x30);
+        break;
+      }
+      if (t1 != gixiy(t1)) {
+        outab(op|0x30);
+        outrb(&e1, 0);
+        break;
+      }
+      if (t1 == S_R16) {
+        v1 = gixiy(v1);
+        if (rf == S_INC) {
+          outab(0x03|(v1<<4));
+          break;
+        }
+        if (rf == S_DEC) {
+          outab(0x0B|(v1<<4));
+          break;
+        }
+      }
+      aerr();
+      break;
+      
+    case S_NEG:
+      if (!more()) {
+        /* "neg" implies "neg a" */
+        outab(0xED);
+        outab(op);
+        break;
+      }
+      t1 = addr(&e1);
+      v1 = (int) e1.e_addr;
+      if ((t1 == S_R8) && (v1 == A)) { /* "neg a" */
+        outab(0xED);
+        outab(op);
+        break;
+      }
+      
+      if ((t1 == S_R16) && (v1 == HL) && r4k_mode) { /* "neg hl" */
+        outab(0x4D);
+        break;
+      }
+      
+      if (r4k_mode &&
+          ((t1 == S_R32_JKHL) || (t1 == S_R32_BCDE))) {
+        /* neg jkhl|bcde */
+        outab( ( (t1 == S_R32_BCDE) ? 0xDD : 0xFD ) );
+        outab(0x4D);
+        break;
+      }
+      break;
+      
+    case S_DJNZ:
+    case S_JR:
+      if ((v1 = admode(CND)) != 0 && rf != S_DJNZ) {
+        if ((v1 &= 0xFF) <= 0x03) {
+          op += (v1+1)<<3;
+        } else {
+          aerr();
+        }
+        comma(1);
+      }
+      expr(&e2, 0);
+      outab(op);
+      if (mchpcr(&e2)) {
+        v2 = (int) (e2.e_addr - dot.s_addr - 1);
+        if (pass == 2 && ((v2 < -128) || (v2 > 127)))
+          aerr();
+        outab(v2);
+      } else {
+        outrb(&e2, R3_PCR);
+      }
+      if (e2.e_mode != S_USER)
+        rerr();
+      break;
+      
+    case S_CALL:
+      op = 0xCD;
+      expr(&e1, 0);
+      outab(op);
+      outrw(&e1, 0);
+      break;
+      
+    case S_JP:
+      if ((v1 = admode(CND)) != 0) {
+        op |= (v1&0xFF)<<3;
+        comma(1);
+        expr(&e1, 0);
+        outab(op);
+        outrw(&e1, 0);
+        break;
+      }
+      t1 = addr(&e1);
+      if (t1 == S_USER) {
+        outab(0xC3);
+        outrw(&e1, 0);
+        break;
+      }
+      if ((e1.e_addr == 0) && (gixiy(t1) == S_IDHL)) {
+        outab(0xE9);
+        break;
+      }
+      aerr();
+      break;
+      
+    case X_HD64:
+      ++hd64;
+      break;
+      
+    case X_INH2:
+      outab(0xED);
+      outab(op);
+      break;
+      
+    case X_IN:
+    case X_OUT:
+      if (rf == X_IN) {
+        t1 = addr(&e1);
+        comma(1);
+        t2 = addr(&e2);
+      } else {
+        t2 = addr(&e2);
+        comma(1);
+        t1 = addr(&e1);
+      }
+      if ((t1 == S_R8) && (t2 == S_INDM)) {
+        outab(0xED);
+        outab(op | (e1.e_addr<<3));
+        outrb(&e2, 0);
+        break;
+      }
+      aerr();
+      break;
+      
+    case X_MLT:
+      t1 = addr(&e1);
+      if ((t1 == S_R16) && ((v1 = (int) e1.e_addr) <= SP)) {
+        outab(0xED);
+        outab(op | (v1<<4));
+        break;
+      }
+      aerr();
+      break;
+      
+    case X_TST:
+      t1 = addr(&e1);
+      if (t1 == S_R8) {
+        outab(0xED);
+        outab(op | (e1.e_addr<<3));
+        break;
+      }
+      if (t1 == S_IDHL) {
+        outab(0xED);
+        outab(0x34);
+        break;
+      }
+      if (t1 == S_IMMED) {
+        outab(0xED);
+        outab(0x64);
+        outrb(&e1, 0);
+        break;
+      }
+      aerr();
+      break;
+      
+    case X_TSTIO:
+      t1 = addr(&e1);
+      if (t1 == S_IMMED) {
+        outab(0xED);
+        outab(op);
+        outrb(&e1, 0);
+        break;
+      }
+      aerr();
+      break;
+      
+    case X_LJP:
+    case X_LCALL:
+      /* bank jump or call for rabbit processor */
+      t1 = addr(&e1);
+      comma(1);
+      t2 = addr(&e2);
+      v1 = (int) e1.e_addr;
+      if ((t1 == S_USER) && (t2 == S_IMMED)) {
+        outab(op);
+        outrw(&e1, 0);
+        outrb(&e2, 0);
+        break;
+      }
+      break;
+      
+    case X_BOOL:
+      t1 = addr(&e1);
+      v1 = (int) e1.e_addr;
+      if ((t1 == S_R16) && ((v1 == HL) || (v1 == IX) || (v1 == IY))) {
+        v1 = gixiy(v1);
+        outab(op);
+        break;
+      }
+      aerr( );
+      break;
+      
+    case X_R3K_MODE:
+      r3k_mode=1;
+      break;
+      
+    case R3K_INH1:
+      if (!(r3k_mode || r4k_mode))
+        err('o');
+      
+      outab(op);
+      break;
+      
+    case R3K_INH2:
+      if (!(r3k_mode || r4k_mode))
+        err('o');
+      
+      outab(0xED);
+      outab(op);
+      break;
+      
+    case X_R4K_MODE:
+      r4k_mode=1;
+      break;
+      
+    case R4K_INH2:
+      if (!r4k_mode)
+        err('o');
+      
+      outab(0xED);
+      outab(op);
+      break;
+      
+    case X_R4K_MULU:
+      if (!r4k_mode)
+        err('o');
+      
+      outab(op);
+      break;
+      
+    case X_JRE:
+      if (!r4k_mode)
+        err('o');
+      
+      if ((v1 = admode(ALT_CND)) != 0) {
+        op += v1<<3;
+        comma(1);
+      } else {
+        op = 0x98;
+      }
+      expr(&e2, 0);
+      outab(op);
+      if (mchpcr(&e2)) {
+        v2 = (int) (e2.e_addr - dot.s_addr - 1);
+        if (pass == 2 && ((v2 < -32768) || (v2 > 32767)))
+          aerr();
+        outab( (v2 & 0xFF) );
+        outab( (v2 >> 8) );
+      } else {
+        outrb(&e2, R3_PCR);
+      }
+      if (e2.e_mode != S_USER)
+        rerr();
+      break;
+      
+    case X_CLR:
+      if (!r4k_mode)
+        err('o');
+      t1 = addr(&e1);
+      v1 = (int) e1.e_addr;
+      if ((t1 == S_R16) && (v1 == HL)) {
+        outab(op);
+        break;
+      }
+      aerr( );
+      break;
+      
+    default:
+      err('o');
+    }
 }
 
 /*
@@ -1060,67 +1083,73 @@
  * return(0) if general addressing mode output, else
  * return(esp->e_mode)
  */
-int
-genop(pop, op, esp, f)
-int pop, op;
-struct expr *esp;
-int f;
+int  genop(int pop, int op, struct expr *esp, int f)
 {
-	int t1;
-	if ((t1 = esp->e_mode) == S_R8) {
-		if (pop)
-			outab(pop);
-		outab(op|esp->e_addr);
-		return(0);
-	}
-	if (t1 == S_IDHL) {
-		if (pop)
-			outab(pop);
-		outab(op|0x06);
-		return(0);
-	}
-	if (gixiy(t1) == S_IDHL) {
-		if (pop) {
-			outab(pop);
-			outrb(esp,0);
-			outab(op|0x06);
-		} else {
-			outab(op|0x06);
-			outrb(esp,0);
-		}
-		return(0);
-	}
-	if ((t1 == S_IMMED) && (f)) {
-		if (pop)
-			outab(pop);
-		outab(op|0x46);
-		outrb(esp,0);
-		return(0);
-	}
-	return(t1);
+  int t1;
+  
+  if ((t1 = esp->e_mode) == S_R8)
+    {
+      if (pop)
+        outab(pop);
+      
+      outab(op|esp->e_addr);
+      return(0);
+    }
+  
+  if (t1 == S_IDHL)
+    {
+      if (pop)
+        outab(pop);
+      
+      outab(op|0x06);
+      return(0);
+    }
+  
+  if (gixiy(t1) == S_IDHL)
+    {
+      if (pop) {
+        outab(pop);
+        outrb(esp, 0);
+        outab(op|0x06);
+      } else {
+        outab(op|0x06);
+        outrb(esp, 0);
+      }
+      return(0);
+    }
+  
+  if ((t1 == S_IMMED) && (f))
+    {
+      if (pop)
+        outab(pop);
+      
+      outab(op|0x46);
+      outrb(esp, 0);
+      return(0);
+    }
+  
+  return(t1);
 }
 
 /*
  * IX and IY prebyte check
  */
-int
-gixiy(v)
-int v;
+int  gixiy(int v)
 {
-	if (v == IX) {
-		v = HL;
-		outab(0xDD);
-	} else if (v == IY) {
-		v = HL;
-		outab(0xFD);
-	} else if (v == S_IDIX) {
-		v = S_IDHL;
-		outab(0xDD);
-	} else if (v == S_IDIY) {
-		v = S_IDHL;
-		outab(0xFD);
-	}
-	return(v);
+        if (v == IX) {
+                v = HL;
+                outab(0xDD);
+        } else if (v == IY) {
+                v = HL;
+                outab(0xFD);
+        } else if (v == S_IDIX) {
+                v = S_IDHL;
+                outab(0xDD);
+        } else if (v == S_IDIY) {
+                v = S_IDHL;
+                outab(0xFD);
+        }
+        return(v);
 }
 
 /*
@@ -1130,30 +1159,30 @@
 mchpcr(esp)
 struct expr *esp;
 {
-	if (esp->e_base.e_ap == dot.s_area) {
-		return(1);
-	}
-	if (esp->e_flag==0 && esp->e_base.e_ap==NULL) {
-		/*
-		 * Absolute Destination
-		 *
-		 * Use the global symbol '.__.ABS.'
-		 * of value zero and force the assembler
-		 * to use this absolute constant as the
-		 * base value for the relocation.
-		 */
-		esp->e_flag = 1;
-		esp->e_base.e_sp = &sym[1];
-	}
-	return(0);
+        if (esp->e_base.e_ap == dot.s_area) {
+                return(1);
+        }
+        if (esp->e_flag==0 && esp->e_base.e_ap==NULL) {
+                /*
+                 * Absolute Destination
+                 *
+                 * Use the global symbol '.__.ABS.'
+                 * of value zero and force the assembler
+                 * to use this absolute constant as the
+                 * base value for the relocation.
+                 */
+                esp->e_flag = 1;
+                esp->e_base.e_sp = &sym[1];
+        }
+        return(0);
 }
 
 /*
  * Machine dependent initialization
  */
-VOID
-minit()
+VOID  minit()
 {
-	hd64 = 0;
-	r4k_mode = 0;
+  hd64 = 0;
+  r3k_mode = 0;
+  r4k_mode = 0;
 }
diff -Nru sdcc-3.1.0+dfsg/sdas/asrab/rabbitpst.c sdcc-3.2.0+dfsg/sdas/asrab/rabbitpst.c
--- sdcc-3.1.0+dfsg/sdas/asrab/rabbitpst.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/asrab/rabbitpst.c	2012-05-20 23:43:48.000000000 +0000
@@ -23,154 +23,169 @@
  *   and rabbit 4000 instruction sets (2011)
  */
 
-#include <stdio.h>
-#include <setjmp.h>
 #include "asxxxx.h"
 #include "rabbit.h"
 
-struct	mne	mne[] = {
+struct  mne     mne[] = {
 
-	/* machine */
+        /* machine */
 
-	/* system */
+        /* system */
 
-    { NULL,	"CON",		S_ATYP,		0,	A3_CON },
-    { NULL,	"OVR",		S_ATYP,		0,	A3_OVR },
-    { NULL,	"REL",		S_ATYP,		0,	A3_REL },
-    { NULL,	"ABS",		S_ATYP,		0,	A3_ABS },
-    { NULL,	"NOPAG",	S_ATYP,		0,	A3_NOPAG },
-    { NULL,	"PAG",		S_ATYP,		0,	A3_PAG },
-
-    { NULL,	".byte",	S_BYTE,		0,	0 },
-    { NULL,	".db",		S_BYTE,		0,	0 },
-    { NULL,	".word",	S_WORD,		0,	0 },
-    { NULL,	".dw",		S_WORD,		0,	0 },
-    { NULL,	".df",		S_FLOAT,	0,	0 },
-    { NULL,	".ascii",	S_ASCII,	0,	0 },
-    { NULL,	".asciz",	S_ASCIZ,	0,	0 },
-    { NULL,	".blkb",	S_BLK,		0,	1 },
-    { NULL,	".ds",		S_BLK,		0,	1 },
-    { NULL,	".blkw",	S_BLK,		0,	2 },
-    { NULL,	".page",	S_PAGE,		0,	0 },
-    { NULL,	".title",	S_TITLE,	0,	0 },
-    { NULL,	".sbttl",	S_SBTL,		0,	0 },
-    { NULL,	".globl",	S_GLOBL,	0,	0 },
-    { NULL,	".area",	S_DAREA,	0,	0 },
-    { NULL,	".even",	S_EVEN,		0,	0 },
-    { NULL,	".odd",		S_ODD,		0,	0 },
-    { NULL,	".if",		S_IF,		0,	0 },
-    { NULL,	".else",	S_ELSE,		0,	0 },
-    { NULL,	".endif",	S_ENDIF,	0,	0 },
-    { NULL,	".include",	S_INCL,		0,	0 },
-    { NULL,	".radix",	S_RADIX,	0,	0 },
-    { NULL,	".org",		S_ORG,		0,	0 },
-    { NULL,	".module",	S_MODUL,	0,	0 },
-    { NULL,	".ascis",	S_ASCIS,	0,	0 },
+    { NULL,     "CON",          S_ATYP,         0,      A3_CON },
+    { NULL,     "OVR",          S_ATYP,         0,      A3_OVR },
+    { NULL,     "REL",          S_ATYP,         0,      A3_REL },
+    { NULL,     "ABS",          S_ATYP,         0,      A3_ABS },
+    { NULL,     "NOPAG",        S_ATYP,         0,      A3_NOPAG },
+    { NULL,     "PAG",          S_ATYP,         0,      A3_PAG },
+
+    { NULL,     ".byte",        S_BYTE,         0,      0 },
+    { NULL,     ".db",          S_BYTE,         0,      0 },
+    { NULL,     ".word",        S_WORD,         0,      0 },
+    { NULL,     ".dw",          S_WORD,         0,      0 },
+    { NULL,     ".df",          S_FLOAT,        0,      0 },
+    { NULL,     ".ascii",       S_ASCII,        0,      0 },
+    { NULL,     ".asciz",       S_ASCIZ,        0,      0 },
+    { NULL,     ".blkb",        S_BLK,          0,      1 },
+    { NULL,     ".ds",          S_BLK,          0,      1 },
+    { NULL,     ".blkw",        S_BLK,          0,      2 },
+    { NULL,     ".page",        S_PAGE,         0,      0 },
+    { NULL,     ".title",       S_TITLE,        0,      0 },
+    { NULL,     ".sbttl",       S_SBTL,         0,      0 },
+    { NULL,     ".globl",       S_GLOBL,        0,      0 },
+    { NULL,     ".area",        S_DAREA,        0,      0 },
+    { NULL,     ".even",        S_EVEN,         0,      0 },
+    { NULL,     ".odd",         S_ODD,          0,      0 },
+    { NULL,     ".if",          S_IF,           0,      0 },
+    { NULL,     ".else",        S_ELSE,         0,      0 },
+    { NULL,     ".endif",       S_ENDIF,        0,      0 },
+    { NULL,     ".include",     S_INCL,         0,      0 },
+    { NULL,     ".radix",       S_RADIX,        0,      0 },
+    { NULL,     ".org",         S_ORG,          0,      0 },
+    { NULL,     ".module",      S_MODUL,        0,      0 },
+    { NULL,     ".ascis",       S_ASCIS,        0,      0 },
 /* sdas specific */
-    { NULL,	".optsdcc",	S_OPTSDCC,	0,	0 },
+    { NULL,     ".optsdcc",     S_OPTSDCC,      0,      0 },
 /* end sdas specific */
 
-	/* rabbit (warning: derived from "z80 / hd64180") */
+        /* rabbit (warning: derived from "z80 / hd64180") */
 
-    { NULL,	"ld",		S_LD,		0,	0x40 },
+    { NULL,     "ld",           S_LD,           0,      0x40 },
 
-    { NULL,	"call",		S_CALL,		0,	0xC4 },
-    { NULL,	"jp",		S_JP,		0,	0xC2 },
-    { NULL,	"jr",		S_JR,		0,	0x18 },
-    { NULL,	"djnz",		S_DJNZ,		0,	0x10 },
-    { NULL,	"ret",		S_RET,		0,	0xC0 },
-
-    { NULL,	"bit",		S_BIT,		0,	0x40 },
-    { NULL,	"res",		S_BIT,		0,	0x80 },
-    { NULL,	"set",		S_BIT,		0,	0xC0 },
-
-    { NULL,	"inc",		S_INC,		0,	0x04 },
-    { NULL,	"dec",		S_DEC,		0,	0x05 },
-
-    { NULL,	"add",		S_ADD,		0,	0x80 },
-    { NULL,	"adc",		S_ADC,		0,	0x88 },
-    { NULL,	"sub",		S_SUB,		0,	0x90 },
-    { NULL,	"sbc",		S_SBC,		0,	0x98 },
-
-    { NULL,	"and",		S_AND,		0,	0xA0 },
-    { NULL,	"cp",		S_AND,		0,	0xB8 },
-    { NULL,	"or",		S_AND,		0,	0xB0 },
-    { NULL,	"xor",		S_AND,		0,	0xA8 },
-
-    { NULL,	"ex",		S_EX,		0,	0xE3 },
-
-    { NULL,	"push",		S_PUSH,		0,	0xC5 },
-    { NULL,	"pop",		S_PUSH,		0,	0xC1 },
-
-    /* { NULL,	"in",		S_IN,		0,	0xDB }, */
-    /* { NULL,	"out",		S_OUT,		0,	0xD3 }, */
-    { NULL,	"ioi",		S_IN,		0,	0xD3 },
-    { NULL,	"ioe",		S_OUT,		0,	0xDB },
-
-    { NULL,	"rl",		S_RL,		0,	0x10 },
-    { NULL,	"rlc",		S_RL,		0,	0x00 },
-    { NULL,	"rr",		S_RL,		0,	0x18 },
-    { NULL,	"rrc",		S_RL,		0,	0x08 },
-    { NULL,	"sla",		S_RL,		0,	0x20 },
-    { NULL,	"sra",		S_RL,		0,	0x28 },
-    { NULL,	"srl",		S_RL,		0,	0x38 },
-
-    { NULL,	"rst",		S_RST,		0,	0xC7 },
-
-    /* { NULL,	"im",		S_IM,		0,	0xED }, */
-
-    { NULL,	"ccf",		S_INH1,		0,	0x3F },
-    { NULL,	"cpl",		S_INH1,		0,	0x2F },
-    /* { NULL,	"daa",		S_INH1,		0,	0x27 }, */
-    /* { NULL,	"di",		S_INH1,		0,	0xF3 }, */
-    /* { NULL,	"ei",		S_INH1,		0,	0xFB }, */
+    { NULL,     "call",         S_CALL,         0,      0xC4 },
+    { NULL,     "jp",           S_JP,           0,      0xC2 },
+    { NULL,     "jr",           S_JR,           0,      0x18 },
+    { NULL,     "djnz",         S_DJNZ,         0,      0x10 },
+    { NULL,     "ret",          S_RET,          0,      0xC0 },
+
+    { NULL,     "bit",          S_BIT,          0,      0x40 },
+    { NULL,     "res",          S_BIT,          0,      0x80 },
+    { NULL,     "set",          S_BIT,          0,      0xC0 },
+
+    { NULL,     "inc",          S_INC,          0,      0x04 },
+    { NULL,     "dec",          S_DEC,          0,      0x05 },
+
+    { NULL,     "add",          S_ADD,          0,      0x80 },
+    { NULL,     "adc",          S_ADC,          0,      0x88 },
+    { NULL,     "sub",          S_SUB,          0,      0x90 },
+    { NULL,     "sbc",          S_SBC,          0,      0x98 },
+
+    { NULL,     "and",          S_AND,          0,      0xA0 },
+    { NULL,     "cp",           S_AND,          0,      0xB8 },
+    { NULL,     "or",           S_AND,          0,      0xB0 },
+    { NULL,     "xor",          S_AND,          0,      0xA8 },
+
+    { NULL,     "ex",           S_EX,           0,      0xE3 },
+
+    { NULL,     "push",         S_PUSH,         0,      0xC5 },
+    { NULL,     "pop",          S_PUSH,         0,      0xC1 },
+
+    /* { NULL,  "in",           S_IN,           0,      0xDB }, */
+    /* { NULL,  "out",          S_OUT,          0,      0xD3 }, */
+    { NULL,     "ioi",          S_IN,           0,      0xD3 },
+    { NULL,     "ioe",          S_OUT,          0,      0xDB },
+
+    { NULL,     "rl",           S_RL,           0,      0x10 },
+    { NULL,     "rlc",          S_RL,           0,      0x00 },
+    { NULL,     "rr",           S_RL,           0,      0x18 },
+    { NULL,     "rrc",          S_RL,           0,      0x08 },
+    { NULL,     "sla",          S_RL,           0,      0x20 },
+    { NULL,     "sra",          S_RL,           0,      0x28 },
+    { NULL,     "srl",          S_RL,           0,      0x38 },
+
+    { NULL,     "rst",          S_RST,          0,      0xC7 },
+
+    /* { NULL,  "im",           S_IM,           0,      0xED }, */
+
+    { NULL,     "ccf",          S_INH1,         0,      0x3F },
+    { NULL,     "cpl",          S_INH1,         0,      0x2F },
+    /* { NULL,  "daa",          S_INH1,         0,      0x27 }, */
+    /* { NULL,  "di",           S_INH1,         0,      0xF3 }, */
+    /* { NULL,  "ei",           S_INH1,         0,      0xFB }, */
     { NULL,     "ipset0",       S_INH2,         0,      0x46 },
     { NULL,     "ipset1",       S_INH2,         0,      0x56 },
     { NULL,     "ipset2",       S_INH2,         0,      0x4E },
     { NULL,     "ipset3",       S_INH2,         0,      0x5E },
     { NULL,     "ipres",        S_INH2,         0,      0x5D },
-    { NULL,	"exx",		S_INH1,		0,	0xD9 },
-    { NULL,	"nop",		S_INH1,		0,	0x00 },
+    { NULL,     "exx",          S_INH1,         0,      0xD9 },
+    { NULL,     "nop",          S_INH1,         0,      0x00 },
 
-    /* { NULL,	"halt",		S_INH1,		0,	0x76 }, */
-    { NULL,	"altd",		S_INH1,		0,	0x76 },
+    /* { NULL,  "halt",         S_INH1,         0,      0x76 }, */
+    { NULL,     "altd",         S_INH1,         0,      0x76 },
 
-    { NULL,	"rla",		S_INH1,		0,	0x17 },
-    { NULL,	"rlca",		S_INH1,		0,	0x07 },
-    { NULL,	"rra",		S_INH1,		0,	0x1F },
-    { NULL,	"rrca",		S_INH1,		0,	0x0F },
-    { NULL,	"scf",		S_INH1,		0,	0x37 },
-
-    /* { NULL,	"cpd",		S_INH2,		0,	0xA9 }, */
-    /* { NULL,	"cpdr",		S_INH2,		0,	0xB9 }, */
-    /* { NULL,	"cpi",		S_INH2,		0,	0xA1 }, */
-    /* { NULL,	"cpir",		S_INH2,		0,	0xB1 }, */
-    /* { NULL,	"ind",		S_INH2,		0,	0xAA }, */
-    /* { NULL,	"indr",		S_INH2,		0,	0xBA }, */
-    /* { NULL,	"ini",		S_INH2,		0,	0xA2 }, */
-    /* { NULL,	"inir",		S_INH2,		0,	0xB2 }, */
-    { NULL,	"ldd",		S_INH2,		0,	0xA8 },
-    { NULL,	"lddr",		S_INH2,		0,	0xB8 },
-    { NULL,	"ldi",		S_INH2,		0,	0xA0 },
-    { NULL,	"ldir",		S_INH2,		0,	0xB0 },
-    { NULL,	"neg",		S_NEG,		0,	0x44 },
-    /* { NULL,	"outd",		S_INH2,		0,	0xAB }, */
-    /* { NULL,	"otdr",		S_INH2,		0,	0xBB }, */
-    /* { NULL,	"outi",		S_INH2,		0,	0xA3 }, */
-    /* { NULL,	"otir",		S_INH2,		0,	0xB3 }, */
-    { NULL,	"reti",		S_INH2,		0,	0x4D },
-    /* { NULL,	"retn",		S_INH2,		0,	0x45 },*/
-    { NULL,	"lret",		S_INH2,		0,	0x45 },
-    /* { NULL,	"rld",		S_INH2,		0,	0x6F }, */
-    /* { NULL,	"rrd",		S_INH2,		S_END,	0x67 } */
-
-    { NULL,     ".r4k",         X_R4K_MODE,     0,      0 },
+    { NULL,     "rla",          S_INH1,         0,      0x17 },
+    { NULL,     "rlca",         S_INH1,         0,      0x07 },
+    { NULL,     "rra",          S_INH1,         0,      0x1F },
+    { NULL,     "rrca",         S_INH1,         0,      0x0F },
+    { NULL,     "scf",          S_INH1,         0,      0x37 },
+
+    /* { NULL,  "cpd",          S_INH2,         0,      0xA9 }, */
+    /* { NULL,  "cpdr",         S_INH2,         0,      0xB9 }, */
+    /* { NULL,  "cpi",          S_INH2,         0,      0xA1 }, */
+    /* { NULL,  "cpir",         S_INH2,         0,      0xB1 }, */
+    /* { NULL,  "ind",          S_INH2,         0,      0xAA }, */
+    /* { NULL,  "indr",         S_INH2,         0,      0xBA }, */
+    /* { NULL,  "ini",          S_INH2,         0,      0xA2 }, */
+    /* { NULL,  "inir",         S_INH2,         0,      0xB2 }, */
+    { NULL,     "ldd",          S_INH2,         0,      0xA8 },
+    { NULL,     "lddr",         S_INH2,         0,      0xB8 },
+    { NULL,     "ldi",          S_INH2,         0,      0xA0 },
+    { NULL,     "ldir",         S_INH2,         0,      0xB0 },
+    { NULL,     "neg",          S_NEG,          0,      0x44 },
+    /* { NULL,  "outd",         S_INH2,         0,      0xAB }, */
+    /* { NULL,  "otdr",         S_INH2,         0,      0xBB }, */
+    /* { NULL,  "outi",         S_INH2,         0,      0xA3 }, */
+    /* { NULL,  "otir",         S_INH2,         0,      0xB3 }, */
+    { NULL,     "reti",         S_INH2,         0,      0x4D },
+    /* { NULL,  "retn",         S_INH2,         0,      0x45 },*/
+    { NULL,     "lret",         S_INH2,         0,      0x45 },
+    /* { NULL,  "rld",          S_INH2,         0,      0x6F }, */
+    /* { NULL,  "rrd",          S_INH2,         S_EOL,  0x67 } */
+    
     { NULL,     "mul",          S_INH1,         0,      0xF7 },
+    
+    { NULL,     ".r3k",         X_R3K_MODE,     0,      0 },
+    { NULL,     "idet",         R3K_INH1,       0,      0x5B },
+    { NULL,     "lddsr",        R3K_INH2,       0,      0x98 },
+    { NULL,     "ldisr",        R3K_INH2,       0,      0x90 },
+    { NULL,     "lsddr",        R3K_INH2,       0,      0xD8 },
+    { NULL,     "lsdr",         R3K_INH2,       0,      0xF8 },
+    { NULL,     "lsidr",        R3K_INH2,       0,      0xD0 },
+    { NULL,     "lsir",         R3K_INH2,       0,      0xF0 },
+    { NULL,     "rdmode",       R3K_INH2,       0,      0x7F },
+    { NULL,     "setusr",       R3K_INH2,       0,      0x6F },
+    { NULL,     "sures",        R3K_INH2,       0,      0x7D },
+    { NULL,     "uma",          R3K_INH2,       0,      0xC0 },
+    { NULL,     "ums",          R3K_INH2,       0,      0xC8 },
+    
+    { NULL,     ".r4k",         X_R4K_MODE,     0,      0 },
     { NULL,     "jre",          X_JRE,          0,      0xA3 },
     { NULL,     "clr",          X_CLR,          0,      0xBF },
     { NULL,     "ljp",          X_LJP,          0,      0xC7 },
     { NULL,     "lcall",        X_LCALL,        0,      0xCF },
     { NULL,     "lret",         S_INH2,         0,      0x45 },
     { NULL,     "bool",         X_BOOL,         0,      0xCC },
-    { NULL,     "mulu",         X_R4K_MULU,     S_END,  0xA7 }
+    { NULL,     "syscall",      R4K_INH2,       0,      0x75 },
+    { NULL,     "sysret",       R4K_INH2,       0,      0x83 },
+    { NULL,     "mulu",         X_R4K_MULU,     S_EOL,  0xA7 }
 };
diff -Nru sdcc-3.1.0+dfsg/sdas/asxxsrc/asdata.c sdcc-3.2.0+dfsg/sdas/asxxsrc/asdata.c
--- sdcc-3.1.0+dfsg/sdas/asxxsrc/asdata.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/asxxsrc/asdata.c	2011-12-18 17:44:59.000000000 +0000
@@ -98,7 +98,7 @@
                          */
 int     wflag;          /*      -w, enable wide listing format
                          */
-int     zflag;          /*      -z, enable symbol case sensitivity
+int     zflag;          /*      -z, disable symbol case sensitivity
                          */
 int     xflag;          /*      -x, listing radix flag
                          */
@@ -212,7 +212,7 @@
  */
 struct  sym     sym[] = {
     {NULL,      NULL,   ".",            S_USER, 0,                      NULL,   0,      0,      0},
-    {NULL,      NULL,   ".__.ABS.",     S_USER, S_ASG|S_GBL|S_END,      NULL,   0,      0,      0}
+    {NULL,      NULL,   ".__.ABS.",     S_USER, S_ASG|S_GBL|S_EOL,      NULL,   0,      0,      0}
 };
 
 struct  sym     *symp;          /*      pointer to a symbol structure
diff -Nru sdcc-3.1.0+dfsg/sdas/asxxsrc/asexpr.c sdcc-3.2.0+dfsg/sdas/asxxsrc/asexpr.c
--- sdcc-3.1.0+dfsg/sdas/asxxsrc/asexpr.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/asxxsrc/asexpr.c	2011-12-18 17:44:59.000000000 +0000
@@ -374,6 +374,8 @@
         if (c == '\'') {
                 esp->e_mode = S_USER;
                 esp->e_addr = getmap(-1)&0377;
+                c = get();
+                if (c != '\'') { unget(c); }
                 return;
         }
         if (c == '\"') {
@@ -385,6 +387,8 @@
                     esp->e_addr  = (getmap(-1)&0377);
                     esp->e_addr |= (getmap(-1)&0377)<<8;
                 }
+                c = get();
+                if (c != '\"') { unget(c); }
                 return;
         }
         if (c == '>' || c == '<') {
diff -Nru sdcc-3.1.0+dfsg/sdas/asxxsrc/aslex.c sdcc-3.2.0+dfsg/sdas/asxxsrc/aslex.c
--- sdcc-3.1.0+dfsg/sdas/asxxsrc/aslex.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/asxxsrc/aslex.c	2011-12-18 17:44:59.000000000 +0000
@@ -39,8 +39,8 @@
  *      aslex.c contains the following functions:
  *              char    endline()
  *              char    get()
- *              VOID    getid(id,c)
- *              int     as_getline()
+ *              VOID    getid()
+ *              int     nxtline()
  *              int     getmap()
  *              char    getnb()
  *              VOID    getst()
@@ -62,7 +62,7 @@
  *
  *      The function getid() scans the current assembler-source text line
  *      from the current position copying the next LETTER | DIGIT string
- *      into the external string buffer (id).  The string ends when a non
+ *      into the external string buffer id[].  The string ends when a non
  *      LETTER or DIGIT character is found. The maximum number of characters
  *      copied is NCPS-1.  If the input string is larger than NCPS-1
  *      characters then the string is truncated.  The string is always
@@ -83,22 +83,21 @@
  *                                      being processed.
  *
  *      called functions:
- *              char    get()           aslex.c
- *              char    getnb()         aslex.c
+ *              int     get()           aslex.c
+ *              int     getnb()         aslex.c
  *              VOID    unget()         aslex.c
+ *              VOID    qerr()          assubr.c
  *
  *      side effects:
- *              use of getnb(), get(), and unget() updates the
+ *              Use of getnb(), get(), and unget() updates the
  *              global pointer ip, the position in the current
  *              assembler-source text line.
  */
 
 VOID
-getid(id, c)
-register int c;
-char *id;
+getid(char *id, int c)
 {
-        register char *p;
+        char *p;
 
         if (c < 0) {
                 c = getnb();
@@ -158,9 +157,7 @@
  */
 
 VOID
-getst(id, c)
-register int c;
-char *id;
+getst(char *id, int c)
 {
         register char *p;
 
@@ -198,10 +195,10 @@
  *              in the current assembler-source text line
  */
 
-char
-getnb()
+int
+getnb(void)
 {
-        register int c;
+        int c;
 
         while ((c=get()) == ' ' || c == '\t')
                 ;
@@ -231,10 +228,10 @@
  *              line, ip is not updated.
  */
 
-char
-get()
+int
+get(void)
 {
-        register int c;
+        int c;
 
         if ((c = *ip) != 0)
                 ++ip;
@@ -270,8 +267,7 @@
  */
 
 VOID
-unget(c)
-int c;
+unget(int c)
 {
         if (c)
                 if (ip != ib)
@@ -309,8 +305,7 @@
  */
 
 int
-getmap(d)
-int d;
+getmap(int d)
 {
         register int c, n, v;
 
@@ -391,8 +386,7 @@
  */
 
 int
-comma(flag)
-int flag;
+comma(int flag)
 {
         int c;
 
@@ -407,18 +401,18 @@
         return(1);
 }
 
-/*)Function     int     as_getline()
+/*)Function     int     nxtline()
  *
- *      The function as_getline() reads a line of assembler-source text
+ *      The function nxtline() reads a line of assembler-source text
  *      from an assembly source text file or an include file.
  *      Lines of text are processed from assembler-source files until
  *      all files have been read.  If an include file is opened then
  *      lines of text are read from the include file (or nested
  *      include file) until the end of the include file is found.
- *      The input text line is copied into the global string ib[]
- *      and converted to a NULL terminated string.  The function
- *      as_getline() returns a (1) after succesfully reading a line
- *      or a (0) if all files have been read.
+ *      The input text line is transferred into the global string
+ *      ib[] and converted to a NULL terminated string.  The function
+ *      nxtline() returns a (1) after succesfully reading
+ *      a line, or a (0) if all files have been read.
  *
  *      local variables:
  *              int     i               string length
@@ -458,7 +452,7 @@
  */
 
 int
-as_getline(void)
+nxtline(void)
 {
   static struct dbuf_s dbuf;
   static char dbufInitialized = 0;
@@ -542,7 +536,7 @@
  */
 
 int
-more()
+more(void)
 {
         register int c;
 
@@ -574,7 +568,7 @@
  */
 
 char
-endline()
+endline(void)
 {
         register int c;
 
diff -Nru sdcc-3.1.0+dfsg/sdas/asxxsrc/aslist.c sdcc-3.2.0+dfsg/sdas/asxxsrc/aslist.c
--- sdcc-3.1.0+dfsg/sdas/asxxsrc/aslist.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/asxxsrc/aslist.c	2011-12-18 17:44:59.000000000 +0000
@@ -87,7 +87,7 @@
  */
 
 VOID
-list()
+list(void)
 {
         char *wp;
         int *wpt;
@@ -291,9 +291,7 @@
  */
 
 VOID
-list1(wp, wpt, nb, f)
-char *wp;
-int *wpt, nb, f;
+list1(char *wp, int *wpt, int nb, int f)
 {
         int i;
 
@@ -405,8 +403,7 @@
  */
 
 VOID
-list2(t)
-int t;
+list2(int t)
 {
         int c;
 
@@ -479,9 +476,7 @@
  */
 
 VOID
-slew(fp,flag)
-FILE *fp;
-int flag;
+slew(FILE *fp, int flag)
 {
         if ((lop++ >= NLPP) && flag) {
                 fprintf(fp, "\fASxxxx Assembler %s  (%s), page %u.\n",
@@ -546,8 +541,7 @@
  */
 
 VOID
-lstsym(fp)
-FILE *fp;
+lstsym(FILE *fp)
 {
         int i, j, k;
         char *ptr;
diff -Nru sdcc-3.1.0+dfsg/sdas/asxxsrc/asmain.c sdcc-3.2.0+dfsg/sdas/asxxsrc/asmain.c
--- sdcc-3.1.0+dfsg/sdas/asxxsrc/asmain.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/asxxsrc/asmain.c	2011-12-18 17:44:59.000000000 +0000
@@ -193,7 +193,7 @@
  *              int     tlevel          current conditional level
  *              int     wflag           -w, enable wide listing format
  *              int     xflag           -x, listing radix flag
- *              int     zflag           -z, enable symbol case sensitivity
+ *              int     zflag           -z, disable symbol case sensitivity
  *              FILE *  lfp             list output file handle
  *              FILE *  ofp             relocation output file handle
  *              FILE *  tfp             symbol table output file handle
@@ -206,7 +206,7 @@
  *              VOID    diag()          assubr.c
  *              VOID    err()           assubr.c
  *              int     fprintf()       c-library
- *              int     as_getline()    aslex.c
+ *              int     nxtline()       aslex.c
  *              VOID    list()          aslist.c
  *              VOID    lstsym()        aslist.c
  *              VOID    minit()         ___mch.c
@@ -230,9 +230,7 @@
 /* end sdas specific */
 
 int
-main(argc, argv)
-int argc;
-char *argv[];
+main(int argc, char *argv[])
 {
         char *p = NULL;
         char *q = NULL;
@@ -406,7 +404,7 @@
                 outchk(0,0);
                 symp = &dot;
                 minit();
-                while (as_getline()) {
+                while (nxtline()) {
                         cp = cb;
                         cpt = cbt;
                         ep = eb;
@@ -472,8 +470,7 @@
  */
 
 VOID
-asexit(i)
-int i;
+asexit(int i)
 {
         int j;
 
@@ -589,7 +586,7 @@
  */
 
 VOID
-asmbl()
+asmbl(void)
 {
         struct mne *mp;
         struct sym *sp;
@@ -874,7 +871,7 @@
                 do {
                         double f1, f2;
                         unsigned int mantissa, exponent;
-                        const char readbuffer[80];
+                        char readbuffer[80];
 
                         getid(readbuffer, ' '); /* Hack :) */
                         if ((c = getnb()) == '.') {
@@ -1263,10 +1260,7 @@
  */
 
 FILE *
-afile(fn, ft, wf)
-char *fn;
-char *ft;
-int wf;
+afile(char *fn, char *ft, int wf)
 {
         char *p2, *p3;
         int c;
@@ -1334,8 +1328,7 @@
  */
 
 VOID
-newdot(nap)
-struct area *nap;
+newdot(struct area *nap)
 {
         struct area *oap;
 
@@ -1401,9 +1394,7 @@
  */
 
 VOID
-phase(ap, a)
-struct area *ap;
-a_uint a;
+phase(struct area *ap, a_uint a)
 {
         if (ap != dot.s_area || a != dot.s_addr)
                 err('p');
@@ -1456,7 +1447,7 @@
  */
 
 VOID
-usage(n)
+usage(int n)
 {
         char **dp;
 
diff -Nru sdcc-3.1.0+dfsg/sdas/asxxsrc/asout.c sdcc-3.2.0+dfsg/sdas/asxxsrc/asout.c
--- sdcc-3.1.0+dfsg/sdas/asxxsrc/asout.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/asxxsrc/asout.c	2012-03-14 20:37:02.000000000 +0000
@@ -1,20 +1,27 @@
-/* asout.c
+/* asout.c */
 
-   Copyright (C) 1989-1995 Alan R. Baldwin
-   721 Berkeley St., Kent, Ohio 44240
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+/*
+ *  Copyright (C) 1989-2009  Alan R. Baldwin
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ * Alan R. Baldwin
+ * 721 Berkeley St.
+ * Kent, Ohio  44240
+ *
+ */
 
 /*
  * 28-Oct-97 JLH:
@@ -22,9 +29,6 @@
  *           - Added outr11 to support 8051's 11 bit destination address
  */
 
-#include <stdio.h>
-#include <setjmp.h>
-#include <string.h>
 #include "sdas.h"
 #include "asxxxx.h"
 
@@ -62,7 +66,8 @@
  *
  *      The  first  line  of  an object module contains the [XDQ][HL]
  *      format specifier (i.e.  XH indicates  a  hexadecimal  file  with
- *      most significant byte first) for the following designators.
+ *      most significant byte first) for the
+ *      following designators.
  *
  *
  *      (2)     Header Line
@@ -348,7 +353,9 @@
  *      is loaded into the txt and rel buffers.
  *
  *      local variables:
- *              int     n               symbol/area reference number
+ *		int	m		signed value mask
+ *		int	n		unsigned value mask
+ *					symbol/area reference number
  *              int *   relp            pointer to rel array
  *              int *   txtp            pointer to txt array
  *
@@ -370,7 +377,7 @@
 VOID
 outrb(struct expr *esp, int r)
 {
-        register int n;
+        a_uint n;
 
         if (pass == 2) {
                 if (esp->e_flag==0 && esp->e_base.e_ap==NULL) {
@@ -378,6 +385,14 @@
                          * const byte to the T line and don't
                          * generate any relocation info.
                          */
+			n = (a_uint) ~0x000000FF;		/* 1 byte  */
+			/*
+			 * Page0 Range Check
+			 */
+			if (((r & (R3_SGND | R3_USGN | R3_PAG0 | R3_PAG | R3_PCR)) == R3_PAG0) &&
+			   ((n & esp->e_addr) != 0))
+				err('d');
+
                         out_lb(lobyte(esp->e_addr),0);
                         if (oflag) {
                                 outchk(1, 0);
@@ -1140,10 +1155,10 @@
  */
 
 VOID
-out_lb(register int b, register int t)
+out_lb(a_uint v, int t)
 {
         if (cp < &cb[NCODE]) {
-                *cp++ = b;
+                *cp++ = v;
                 *cpt++ = t;
         }
 }
@@ -1172,14 +1187,14 @@
  */
 
 VOID
-out_lw(register int n, register int t)
+out_lw(a_uint v, int t)
 {
         if (hilo) {
-                out_lb(hibyte(n),t ? t|R_HIGH : 0);
-                out_lb(lobyte(n),t);
+                out_lb(hibyte(v),t ? t|R_HIGH : 0);
+                out_lb(lobyte(v),t);
         } else {
-                out_lb(lobyte(n),t);
-                out_lb(hibyte(n),t ? t|R_HIGH : 0);
+                out_lb(lobyte(v),t);
+                out_lb(hibyte(v),t ? t|R_HIGH : 0);
         }
 }
 
@@ -1244,20 +1259,20 @@
  */
 
 VOID
-out_rw(register int n)
+out_rw(a_uint v)
 {
         if (hilo) {
-                *relp++ = hibyte(n);
-                *relp++ = lobyte(n);
+                *relp++ = hibyte(v);
+                *relp++ = lobyte(v);
         } else {
-                *relp++ = lobyte(n);
-                *relp++ = hibyte(n);
+                *relp++ = lobyte(v);
+                *relp++ = hibyte(v);
         }
 }
 
 /*)Function     VOID    out_tw(n)
  *
- *              int     n               data word
+ *              a_uint  n               data word
  *
  *      The function out_tw() outputs the text (T)
  *      data word as two bytes ordered according to hilo.
@@ -1277,7 +1292,7 @@
  */
 
 VOID
-out_tw(register int n)
+out_tw(a_uint n)
 {
         if (hilo) {
                 *txtp++ = hibyte(n);
@@ -1346,9 +1361,9 @@
  */
 
 int
-lobyte(int n)
+lobyte(a_uint v)
 {
-        return (n&0377);
+        return (v&0377);
 }
 
 /*)Function     int     hibyte(n)
@@ -1372,9 +1387,9 @@
  */
 
 int
-hibyte(int n)
+hibyte(a_uint v)
 {
-        return ((n>>8)&0377);
+        return ((v>>8)&0377);
 }
 
 /*
diff -Nru sdcc-3.1.0+dfsg/sdas/asxxsrc/assym.c sdcc-3.2.0+dfsg/sdas/asxxsrc/assym.c
--- sdcc-3.1.0+dfsg/sdas/asxxsrc/assym.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/asxxsrc/assym.c	2011-12-18 17:44:59.000000000 +0000
@@ -101,21 +101,21 @@
 VOID
 syminit(void)
 {
-        register struct mne  *mp;
+        struct mne  *mp;
         struct mne **mpp;
-        register struct sym  *sp;
+        struct sym  *sp;
         struct sym **spp;
-        register int h;
+        int h;
 
         mpp = &mnehash[0];
         while (mpp < &mnehash[NHASH])
                 *mpp++ = NULL;
         mp = &mne[0];
         for (;;) {
-                h = hash(mp->m_id);
+                h = hash(mp->m_id, 1);
                 mp->m_mp = mnehash[h];
                 mnehash[h] = mp;
-                if (mp->m_flag&S_END)
+                if (mp->m_flag&S_EOL)
                         break;
                 ++mp;
         }
@@ -125,10 +125,10 @@
                 *spp++ = NULL;
         sp = &sym[0];
         for (;;) {
-                h = hash(sp->s_id);
+                h = hash(sp->s_id, zflag);
                 sp->s_sp = symhash[h];
                 symhash[h] = sp;
-                if (sp->s_flag&S_END)
+                if (sp->s_flag&S_EOL)
                         break;
                 ++sp;
         }
@@ -200,16 +200,16 @@
 struct mne *
 mlookup(char *id)
 {
-        register struct mne *mp;
-        register int h;
+        struct mne *mp;
+        int h;
 
-        h = hash(id);
+        /*
+         * JLH: case insensitive lookup always
+         */
+        h = hash(id, 1);
         mp = mnehash[h];
         while (mp) {
-                /*
-                 * JLH: case insensitive lookup always
-                 */
-                if(symeq(id, mp->m_id, 0))
+                if(symeq(id, mp->m_id, 1))
                         return (mp);
                 mp = mp->m_mp;
         }
@@ -231,10 +231,10 @@
  *              sym *   sp              pointer to a sym structure
  *
  *      global varaibles:
- *              sym * symhash[]         array of pointers to NHASH
+ *              sym *   symhash[]       array of pointers to NHASH
  *                                      linked symbol lists
-  *             int     zflag           enable symbol case sensitivity
-*
+ *              int     zflag           disable symbol case sensitivity
+ *
  *      functions called:
  *              int     hash()          assym.c
  *              VOID *  new()           assym.c
@@ -247,12 +247,12 @@
  */
 
 struct sym *
-lookup(char *id)
+lookup(const char *id)
 {
-        register struct sym *sp;
-        register int h;
+        struct sym *sp;
+        int h;
 
-        h = hash(id);
+        h = hash(id, zflag);
         sp = symhash[h];
         while (sp) {
                 if(symeq(id, sp->s_id, zflag))
@@ -296,8 +296,8 @@
 VOID
 symglob(void)
 {
-        register struct sym *sp;
-        register int i;
+        struct sym *sp;
+        int i;
 
         for (i=0; i<NHASH; ++i) {
                 sp = symhash[i];
@@ -333,8 +333,8 @@
 VOID
 allglob(void)
 {
-        register struct sym *sp;
-        register int i;
+        struct sym *sp;
+        int i;
 
         for (i=0; i<NHASH; ++i) {
                 sp = symhash[i];
@@ -346,17 +346,17 @@
         }
 }
 
-/*)Function     int     symeq(p1, p2, cflag)
+/*)Function     int     symeq(p1, p2, flag)
  *
- *              int     cflag           case sensitive flag
+ *              int     flag            case sensitive flag
  *              char *  p1              name string
  *              char *  p2              name string
  *
  *      The function symeq() compares the two name strings for a match.
  *      The return value is 1 for a match and 0 for no match.
  *
- *              cflag == 0      case insensitve compare
- *              cflag != 0      case sensitive compare
+ *              flag == 0      case sensitive compare
+ *              flag != 0      case insensitive compare
  *
  *      local variables:
  *              int     n               loop counter
@@ -374,39 +374,42 @@
  */
 
 int
-symeq(p1, p2, cflag)
-register char *p1, *p2;
-int cflag;
+symeq(const char *p1, const char *p2, int flag)
 {
-        register size_t n;
+        size_t n;
 
         n = strlen(p1) + 1;
-        if(cflag) {
+        if(flag) {
                 /*
-                 * Case Sensitive Compare
+                 * Case Insensitive Compare
                  */
                 do {
-                        if (*p1++ != *p2++)
+                        if (ccase[*p1++ & 0x007F] != ccase[*p2++ & 0x007F])
                                 return (0);
                 } while (--n);
         } else {
                 /*
-                 * Case Insensitive Compare
+                 * Case Sensitive Compare
                  */
                 do {
-                        if (ccase[*p1++ & 0x007F] != ccase[*p2++ & 0x007F])                             return (0);
+                        if (*p1++ != *p2++)
+                                return (0);
                 } while (--n);
         }
         return (1);
 }
 
-/*)Function     int     hash(p)
+/*)Function     int     hash(p, flag)
  *
  *              char *  p               pointer to string to hash
+ *              int     flag            case sensitive flag
  *
  *      The function hash() computes a hash code using the sum
  *      of all characters mod table size algorithm.
  *
+ *              flag == 0       case insensitve hash
+ *              flag != 0       case sensitive hash
+ *
  *      local variables:
  *              int     h               accumulated character sum
  *              int     n               loop counter
@@ -423,18 +426,23 @@
  */
 
 int
-hash(char *p)
+hash(const char *p, int flag)
 {
-        register int h;
+        int h;
 
         h = 0;
         while (*p) {
-                /*
-                 * JLH: case insensitive hash:
-                 * Doesn't much affect hashing, and allows
-                 * same function for mnemonics and symbols.
-                 */
-                h += ccase[*p++ & 0x007F];
+                if(flag) {
+                        /*
+                         * Case Insensitive Hash
+                         */
+                        h += ccase[*p++ & 0x007F];
+                } else {
+                        /*
+                         * Case Sensitive Hash
+                         */
+                        h += *p++;
+                }
         }
         return (h&HMASK);
 }
@@ -479,17 +487,17 @@
 static  int     bytes = 0;
 
 char *
-strsto(char *str)
+strsto(const char *str)
 {
-        int  l;
+        int  len;
         char *p;
 
         /*
          * What we need, including a null.
          */
-        l = strlen(str) + 1;
+        len = strlen(str) + 1;
 
-        if (l > bytes) {
+        if (len > bytes) {
                 /*
                  * No space.  Allocate a new hunk.
                  * We lose the pointer to any old hunk.
@@ -503,10 +511,10 @@
          * Copy the name and terminating null.
          */
         p = pnext;
-        strncpy(p, str, l);
+        strncpy(p, str, len);
 
-        pnext += l;
-        bytes -= l;
+        pnext += len;
+        bytes -= len;
 
         return(p);
 }
@@ -538,11 +546,11 @@
 VOID *
 new(unsigned int n)
 {
-        register VOID *p;
+        VOID *p;
 
         if ((p = (VOID *) malloc(n)) == NULL) {
                 fprintf(stderr, "Out of space!\n");
-                asexit(1);
+                asexit(ER_FATAL);
         }
         return (p);
 }
diff -Nru sdcc-3.1.0+dfsg/sdas/asxxsrc/asxxxx.h sdcc-3.2.0+dfsg/sdas/asxxsrc/asxxxx.h
--- sdcc-3.1.0+dfsg/sdas/asxxsrc/asxxxx.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/asxxsrc/asxxxx.h	2012-04-26 14:48:07.000000000 +0000
@@ -1,24 +1,42 @@
-/* asxxxx.h
+/* asxxxx.h */
 
-   Copyright (C) 1989-1995 Alan R. Baldwin
-   721 Berkeley St., Kent, Ohio 44240
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+/*
+ *  Copyright (C) 1989-2010  Alan R. Baldwin
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ * Alan R. Baldwin
+ * 721 Berkeley St.
+ * Kent, Ohio  44240
+ *
+ *   With enhancements from
+ *
+ *	John L. Hartman	(JLH)
+ *	jhartman at compuserve dot com
+ *
+ *	Bill McKinnon (BM)
+ *	w_mckinnon at conknet dot com
+ *
+ *	Boisy G. Petri (BGP)
+ *	boisy at boisypitre dot com
+ *
+ *	Mike McCarty
+ *	mike dot mccarty at sbcglobal dot net
+ */
 
 /*
- * 10-Nov-07 borutr:
- *      - change a_id from [NCPS] to pointer
  * 28-Oct-97 JLH:
  *      - add proto for strsto
  *      - change s_id from [NCPS] to pointer
@@ -36,6 +54,8 @@
  *
  *  3-Feb-00 KV:
  *      - add DS80C390 flat mode support.
+ * 10-Nov-07 borutr:
+ *      - change a_id from [NCPS] to pointer
  */
 
 /*
@@ -57,9 +77,9 @@
  *
  *      The module asxxxx.h contains the definitions for constants,
  *      structures, global variables, and ASxxxx functions
- *      contained in the ASxxxx.c files.  The two functions
- *      and three global variables from the machine dependent
- *      files are also defined.
+ *      contained in the ASxxxx.c files.  The functions and
+ *      global variables from the machine dependent files are
+ *      also defined.
  */
 
 /*
@@ -69,7 +89,7 @@
 /* DECUS C void definition */
 /* File/extension seperator */
 
-#ifdef  decus
+#ifdef  DECUS
 #define VOID    char
 #define FSEPX   '.'
 #endif
@@ -100,7 +120,7 @@
 #include <stdlib.h>
 #define PATH_MAX        _MAX_PATH
 #else
-#define PATH_MAX                                /* define a reasonable value */
+#define PATH_MAX        FILENAME_MAX            /* define a reasonable value */
 #endif
 #endif
 
@@ -121,39 +141,42 @@
 /*
  * Error definitions
  */
-#define ER_NONE         0       /* No error */
-#define ER_WARNING      1       /* Warning */
-#define ER_ERROR        2       /* Assembly error */
-#define ER_FATAL        3       /* Fatal error */
+#define ER_NONE     0           /* No error */
+#define ER_WARNING  1           /* Warning */
+#define ER_ERROR    2           /* Assembly error */
+#define ER_FATAL    3           /* Fatal error */
 
 /*
  * Assembler definitions.
  */
-#define LFTERM  '('             /* Left expression delimeter */
-#define RTTERM  ')'             /* Right expression delimeter */
+#define LFTERM      '('         /* Left expression delimeter */
+#define RTTERM      ')'         /* Right expression delimeter */
 
-#define NCPS    80              /* Characters per symbol */
+#define NCPS        80          /* Characters per symbol */
 #define ASXXXX_HUGE 1000        /* A huge number */
-#define NERR    3               /* Errors per line */
-#define NINPUT  1024            /* Input buffer size */
-#define NCODE   128             /* Listing code buffer size */
-#define NTITL   80              /* Title buffer size */
-#define NSBTL   80              /* SubTitle buffer size */
-#define NHASH   64              /* Buckets in hash table */
-#define HMASK   077             /* Hash mask */
-#define NLPP    60              /* Lines per page */
-#define MAXFIL  6               /* Maximum command line input files */
-#define MAXINC  6               /* Maximum nesting of include files */
-#define MAXIF   10              /* Maximum nesting of if/else/endif */
-#define FILSPC  256             /* Chars. in filespec */
-
-#define NLIST   0               /* No listing */
-#define SLIST   1               /* Source only */
-#define ALIST   2               /* Address only */
-#define BLIST   3               /* Address only with allocation */
-#define CLIST   4               /* Code */
-#define ELIST   5               /* Equate only */
+#define NERR        3           /* Errors per line */
+#define NINPUT      1024        /* Input buffer size */
+#define NCODE       128         /* Listing code buffer size */
+#define NTITL       80          /* Title buffer size */
+#define NSBTL       80          /* SubTitle buffer size */
+#define NHASH       (1 << 6)    /* Buckets in hash table */
+#define HMASK       (NHASH - 1) /* Hash mask */
+#define NLPP        60          /* Lines per page */
+#define MAXFIL      6           /* Maximum command line input files */
+#define MAXINC      6           /* Maximum nesting of include files */
+#define MAXIF       10          /* Maximum nesting of if/else/endif */
+#define FILSPC      256         /* Chars. in filespec */
+
+#define NLIST       0           /* No listing */
+#define SLIST       1           /* Source only */
+#define ALIST       2           /* Address only */
+#define BLIST       3           /* Address only with allocation */
+#define CLIST       4           /* Code */
+#define ELIST       5           /* Equate only */
 
+/*
+ * Internal Definitions
+ */
 #define dot     sym[0]          /* Dot, current loc */
 #define dca     area[0]         /* Dca, default code area */
 
@@ -257,17 +280,17 @@
 #define R3_MSB   0x80            /* high byte */
 
 #define R_BYT3  0x100           /* if R3_BYTE is set, this is a
-                                                         * 3 byte address, of which
-                                                         * the linker must select one byte.
-                                                         */
-#define R_HIB   0x200                   /* If R3_BYTE & R_BYT3 are set, linker
-                                         * will select byte 3 of the relocated
-                                         * 24 bit address.
-                                         */
+                                 * 3 byte address, of which
+                                 * the linker must select one byte.
+                                 */
+#define R_HIB   0x200           /* If R3_BYTE & R_BYT3 are set, linker
+                                 * will select byte 3 of the relocated
+                                 * 24 bit address.
+                                 */
 
 #define R_BIT   0x400           /* Linker will convert from byte-addressable
-                                                         * space to bit-addressable space.
-                                                         */
+                                 * space to bit-addressable space.
+                                 */
 
 #define R_J11           (R3_WORD|R3_BYTX)          /* JLH: 11 bit JMP and CALL (8051) */
 #define R_J19           (R3_WORD|R3_BYTX|R3_MSB)   /* 19 bit JMP/CALL (DS80C390)      */
@@ -325,8 +348,8 @@
  *      defined in asdata.c.  The entry 'struct tsym *s_tsym'
  *      links any temporary symbols following this symbol and
  *      preceeding the next normal symbol.  The structure also
- *      contains the symbol's name, type (USER or NEW), flag
- *      (global, assigned, and multiply defined), a pointer
+ *      contains the symbol's name, type (NEW or USER),
+ *      flag (global, assigned, and multiply defined), a pointer
  *      to the area structure defining where the symbol is
  *      located, a reference number assigned by outgsd() in
  *      asout.c, and the symbols address relative to the base
@@ -347,13 +370,15 @@
 /* end sdas specific */
 };
 
+#define S_EOL           010     /* End mark for ___pst files */
+
 #define S_GBL           01      /* Global */
 #define S_ASG           02      /* Assigned */
 #define S_MDF           04      /* Mult. def */
-#define S_END           010     /* End mark for ___pst files */
 
-#define S_NEW           0       /* New name */
-#define S_USER          1       /* User name */
+
+#define S_NEW           0       /* New Name (External) */
+#define S_USER          1       /* User Name (Assigned) */
                                 /* unused slot */
                                 /* unused slot */
                                 /* unused slot */
@@ -401,12 +426,9 @@
 struct  tsym
 {
         struct  tsym *t_lnk;    /* Link to next */
-/* sandeep changed to 'int' from 'char' */
-/* this will increase the number temp symbols
-   that can be defined from 255 to INT_MAX */
-        int t_num;              /* 0-INT_MAX$ */
+	a_uint	t_num;		/* 0-65535$      for a 16-bit int */
+				/* 0-4294967295$ for a 32-bit int */
         int t_flg;              /* flags */
-
         struct  area *t_area;   /* Area */
         a_uint  t_addr;         /* Address */
 };
@@ -440,14 +462,12 @@
 extern  int     iflvl[MAXIF+1]; /*      array of IF-ELSE-ENDIF flevel
                                  *      values indexed by tlevel
                                  */
-extern  char
-        afn[FILSPC];            /*      afile() temporary filespec
+extern  char    afn[FILSPC];    /*      afile() temporary filespec
                                  */
 extern  char
         srcfn[MAXFIL][FILSPC];  /*      array of source file names
                                  */
-extern  int
-        srcline[MAXFIL];        /*      current source file line
+extern  int srcline[MAXFIL];    /*      current source file line
                                  */
 extern  char
         incfn[MAXINC][FILSPC];  /*      array of include file names
@@ -459,8 +479,7 @@
                                  *      2 (binary), 8 (octal), 10 (decimal),
                                  *      16 (hexadecimal)
                                  */
-extern  int     line;           /*      current assembler source
-                                 *      line number
+extern  int     line;           /*      current assembler source line number
                                  */
 extern  int     page;           /*      current page number
                                  */
@@ -468,28 +487,31 @@
                                  */
 extern  int     pass;           /*      assembler pass number
                                  */
-extern  int     lflag;          /*      -l, generate listing flag
+extern  int     aflag;          /*      -a, make all symbols global flag
+                                 */
+extern  int     fflag;          /*      -f(f), relocations flagged flag
                                  */
 extern  int     gflag;          /*      -g, make undefined symbols global flag
                                  */
-extern  int     aflag;          /*      -a, make all symbols global flag
+extern  int     jflag;          /*      -j, generate debug information flag
                                  */
-extern  int     oflag;          /*      -o, generate relocatable output flag
+
+extern  int     lflag;          /*      -l, generate listing flag
                                  */
-extern  int     sflag;          /*      -s, generate symbol table flag
+extern  int     oflag;          /*      -o, generate relocatable output flag
                                  */
 extern  int     pflag;          /*      -p, enable listing pagination
                                  */
-extern  int     wflag;          /*      -w, enable wide format listing
+extern  int     sflag;          /*      -s, generate symbol table flag
                                  */
-extern  int     zflag;          /*      -z, enable symbol case sensitivity
+extern  int     wflag;          /*      -w, enable wide listing format
                                  */
 extern  int     xflag;          /*      -x, listing radix flag
                                  */
-extern  int     fflag;          /*      -f(f), relocations flagged flag
+extern  int     zflag;          /*      -z, disable symbol case sensitivity
                                  */
-extern  a_uint  laddr;          /*      address of current assembler line
-                                 *      or value of .if argument
+extern  a_uint  laddr;          /*      address of current assembler line,
+                                 *      equate, or value of .if argument
                                  */
 extern  a_uint  fuzz;           /*      tracks pass to pass changes in the
                                  *      address of symbols caused by
@@ -552,10 +574,10 @@
                                  */
 extern  FILE    *ifp[MAXINC];   /*      array of include-file file handles
                                  */
-extern  unsigned char   ctype[128];     /*      array of character types, one per
+extern  unsigned char ctype[128]; /*    array of character types, one per
                                  *      ASCII character
                                  */
-extern  char    ccase[128];     /* an array of characters which
+extern  char    ccase[128];     /*      an array of characters which
                                  *      perform the case translation function
                                  */
 /*sdas specific */
@@ -565,8 +587,6 @@
                                  */
 extern  int     cflag;          /*      -c, generate sdcdb debug information
                                  */
-extern  int     jflag;          /*      -j, generate debug information flag
-                                 */
 extern  char    *optsdcc;       /*      sdcc compile options
                                  */
 extern  int     flat24Mode;     /*      non-zero if we are using DS390 24 bit
@@ -643,80 +663,119 @@
 /* Machine independent functions */
 
 #ifdef  OTHERSYSTEM
+
+/* asmain.c */
+extern	FILE *		afile(char *fn, char *ft, int wf);
+extern	VOID		asexit(int i);
+extern	VOID		asmbl(void);
+extern	VOID		newdot(struct area *nap);
+extern	VOID		phase(struct area *ap, a_uint a);
+extern	VOID		usage(int n);
+
 /* aslex.c */
 extern  int             comma(int flag);
+extern	char		endline(void);
+extern	int		get(void);
+extern	VOID		getid(char *id, int c);
+extern	int		getmap(int d);
+extern	int		getnb(void);
+extern	VOID		getst(char *id, int c);
+extern	int		more(void);
+extern	int		nxtline(void);
+extern	VOID		unget(int c);
 
 /* assym.c */
-extern  char *          strsto(char *str);
+extern	VOID		allglob(void);
+extern	struct	area *	alookup(char *id);
+extern	int		hash(const char *p, int flag);
+extern	struct	sym *	lookup(const char *id);
+extern	struct	mne *	mlookup(char *id);
+extern	VOID *		new(unsigned int n);
+extern  char *          strsto(const char *str);
+extern	int		symeq(const char *p1, const char *p2, int flag);
+extern	VOID		syminit(void);
+extern	VOID		symglob(void);
 
 /* assubr.c */
+extern	VOID		aerr(void);
+extern	VOID		diag(void);
+extern	VOID		err(int c);
+extern	char *		geterr(int c);
+extern	VOID		qerr(void);
+extern	VOID		rerr(void);
 /* sdas specific */
 extern  VOID            warnBanner(void);
 /* end sdas specific */
 
+/* asexpr.c */
+extern	VOID		abscheck(struct expr *esp);
+extern	a_uint		absexpr(void);
+extern	VOID		clrexpr(struct expr *esp);
+extern	int		digit(int c, int r);
+extern	VOID		expr(struct expr *esp, int n);
+extern	int		is_abs(struct expr *esp);
+extern	int		oprio(int c);
+extern	VOID		term(struct expr *esp);
+
+/* asdbg */
+extern  VOID            DefineNoICE_Line(void);
+extern  VOID            DefineSDCC_Line(void);
+
+/* aslist.c */
+extern	VOID		list(void);
+extern	VOID		list1(char *wp, int *wpt, int nb, int f);
+extern	VOID		list2(int t);
+extern	VOID		lstsym(FILE *fp);
+extern	VOID		slew(FILE *fp, int flag);
+
 /* asout.c */
-extern  VOID            outrw(struct expr *, int);
+extern	int		lobyte(a_uint v);
+extern	int		hibyte(a_uint v);
+extern	VOID		outab(int v);
+extern	VOID		out(char *p, int n);
+extern	VOID		outarea(struct area *ap);
+extern	VOID		outall(void);
+extern	VOID		outdot(void);
+extern	VOID		outbuf(char *s);
+extern	VOID		outchk(int nt, int nr);
+extern	VOID		outgsd(void);
+extern	VOID		outsym(struct sym *sp);
+extern	VOID		outrb(struct expr *esp, int r);
+extern  VOID            outrw(struct expr *esp, int r);
+extern	VOID		out_lb(a_uint v, int t);
+extern	VOID		out_lw(a_uint v, int t);
+extern	VOID		out_rw(a_uint v);
+extern  VOID            out_tw(a_uint n);
 /* sdas specific */
 extern  int             byte3(int);
+extern  VOID            outr11();       /* JLH */
 extern  VOID            outr24(struct expr *, int);
 extern  VOID            out_l24(int, int);
 extern  VOID            out_t24(int);
 extern  VOID            outr19(struct expr *, int, int);
 extern  VOID            outdp(struct area *, struct expr *);
-
-/* asdbg */
-extern  VOID            DefineNoICE_Line(void);
-extern  VOID            DefineSDCC_Line(void);
 /* end sdas specific */
 
+/* Machine dependent variables */
+
+extern  int             hilo;
+extern	char *		cpu;
+extern	char *		dsft;
+extern	struct	mne	mne[];
+
 /* Machine dependent functions */
 
+extern  VOID            machine(struct mne *mp);
 extern  VOID            minit(void);
-extern  VOID            machine(struct mne *);
+
 
 /* sdas specific */
 /* strcmpi.c */
 extern  int as_strcmpi(const char *s1, const char *s2);
 extern  int as_strncmpi(const char *s1, const char *s2, size_t n);
 /* end sdas specific */
-#else
-/* aslex.c */
-extern  int             comma();
-
-/* assym.c */
-extern  char *          strsto();
 
-/* assubr.c */
-/* sdas specific */
-extern  VOID            warnBanner();
-/* end sdas specific */
-
-/* asout.c */
-extern  VOID            outrw();
-/* sdas specific */
-extern  int             byte3();
-extern  VOID            outr24();
-extern  VOID            out_l24();
-extern  VOID            out_t24();
-extern  VOID            outr19(t);
-extern  VOID            outdp();
-
-/* asdbg */
-extern  VOID            DefineNoICE_Line();
-extern  VOID            DefineSDCC_Line();
-/* end sdas specific */
-
-/* Machine dependent functions */
-
-extern  VOID            minit();
-extern  VOID            machine();
-
-/* sdas specific */
-/* strcmpi.c */
-extern  int as_strcmpi();
-extern  int as_strncmpi();
-/* end sdas specific */
-#endif
+#else
 
 /* asmain.c */
 extern  FILE *          afile();
@@ -728,45 +787,55 @@
 extern  VOID            usage();
 
 /* aslex.c */
+extern  int             comma();
 extern  char            endline();
 extern  char            get();
 extern  VOID            getid();
-extern  int             as_getline();
 extern  int             getmap();
 extern  char            getnb();
 extern  VOID            getst();
 extern  int             more();
+extern  int             nxtline();
 extern  VOID            unget();
 
 /* assym.c */
+extern  VOID            allglob();
 extern  struct  area *  alookup();
-extern  struct  mne *   mlookup();
+
 extern  int             hash();
 extern  struct  sym *   lookup();
+extern  struct  mne *   mlookup();
 extern  VOID *          new();
+extern  char *          strsto();
 extern  int             symeq();
 extern  VOID            syminit();
 extern  VOID            symglob();
-extern  VOID            allglob();
 
 /* assubr.c */
 extern  VOID            aerr();
 extern  VOID            diag();
-extern  VOID            err(register int c);
+extern  VOID            err();
 extern  char *          geterr();
 extern  VOID            qerr();
 extern  VOID            rerr();
+/* sdas specific */
+extern  VOID            warnBanner();
+/* end sdas specific */
 
 /* asexpr.c */
 extern  VOID            abscheck();
 extern  a_uint          absexpr();
 extern  VOID            clrexpr();
 extern  int             digit();
-extern  int             is_abs();
 extern  VOID            expr();
+extern  int             is_abs();
 extern  int             oprio();
 extern  VOID            term();
 
+/* asdbg */
+extern  VOID            DefineNoICE_Line();
+extern  VOID            DefineSDCC_Line();
+
 /* aslist.c */
 extern  VOID            list();
 extern  VOID            list1();
@@ -775,20 +844,29 @@
 extern  VOID            slew();
 
 /* asout.c */
-extern  int             hibyte();
 extern  int             lobyte();
+extern  int             hibyte();
 extern  VOID            out();
-extern  VOID            outab();
 extern  VOID            outarea();
-extern  VOID            outaw();
+extern  VOID            outdp();
 extern  VOID            outall();
 extern  VOID            outdot();
 extern  VOID            outbuf();
 extern  VOID            outchk();
 extern  VOID            outgsd();
+extern  VOID            outsym();
+extern  VOID            outab();
+extern  VOID            outaw();
 extern  VOID            outrb();
+extern  VOID            outrw();
+/* sdas specific */
+extern  int             byte3();
 extern  VOID            outr11();       /* JLH */
-extern  VOID            outsym();
+extern  VOID            outr24();
+extern  VOID            out_l24();
+extern  VOID            out_t24();
+extern  VOID            outr19(t);
+/* end sdas specific */
 extern  VOID            out_lb();
 extern  VOID            out_lw();
 extern  VOID            out_rw();
@@ -800,3 +878,15 @@
 extern  char *          dsft;
 extern  int             hilo;
 extern  struct  mne     mne[];
+/* Machine dependent functions */
+
+extern  VOID            machine();
+extern  VOID            minit();
+
+/* sdas specific */
+/* strcmpi.c */
+extern  int as_strcmpi();
+extern  int as_strncmpi();
+/* end sdas specific */
+#endif
+
diff -Nru sdcc-3.1.0+dfsg/sdas/asz80/z80.h sdcc-3.2.0+dfsg/sdas/asz80/z80.h
--- sdcc-3.1.0+dfsg/sdas/asz80/z80.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/asz80/z80.h	2012-06-28 14:09:28.000000000 +0000
@@ -172,9 +172,7 @@
 	/* z80mch.c */
 extern	int		genop(int pop, int op, struct expr *esp, int f);
 extern	int		gixiy(int v);
-extern	VOID		machine(struct mne *mp);
 extern	int		mchpcr(struct expr *esp);
-extern	VOID		minit(void);
 
 #else
 
@@ -187,9 +185,7 @@
 	/* z80mch.c */
 extern	int		genop();
 extern	int		gixiy();
-extern	VOID		machine();
 extern	int		mchpcr();
-extern	VOID		minit();
 
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/sdas/asz80/z80mch.c sdcc-3.2.0+dfsg/sdas/asz80/z80mch.c
--- sdcc-3.1.0+dfsg/sdas/asz80/z80mch.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/asz80/z80mch.c	2012-06-16 22:04:35.000000000 +0000
@@ -20,8 +20,6 @@
  * Extensions: P. Felber
  */
 
-#include <stdio.h>
-#include <setjmp.h>
 #include "asxxxx.h"
 #include "z80.h"
 
@@ -488,21 +486,29 @@
 		break;
 
 	case X_TST:
-		t1 = addr(&e1);
-		if (t1 == S_R8) {
+		t2 = addr(&e2);
+		if (more())
+                  {
+                    if ((t2 != S_R8) || (e2.e_addr != A))
+                      aerr();
+                    comma(1);
+                    clrexpr(&e2);
+                    t2 = addr(&e2);
+                  }
+		if (t2 == S_R8) {
 			outab(0xED);
-			outab(op | (e1.e_addr<<3));
+			outab(op | (e2.e_addr<<3));
 			break;
 		}
-		if (t1 == S_IDHL) {
+		if (t2 == S_IDHL) {
 			outab(0xED);
 			outab(0x34);
 			break;
 		}
-		if (t1 == S_IMMED) {
+		if (t2 == S_IMMED) {
 			outab(0xED);
 			outab(0x64);
-			outrb(&e1, 0);
+			outrb(&e2, 0);
 			break;
 		}
 		aerr();
diff -Nru sdcc-3.1.0+dfsg/sdas/asz80/z80pst.c sdcc-3.2.0+dfsg/sdas/asz80/z80pst.c
--- sdcc-3.1.0+dfsg/sdas/asz80/z80pst.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/asz80/z80pst.c	2011-12-19 19:23:24.000000000 +0000
@@ -166,5 +166,5 @@
     { NULL,	"mlt",		X_MLT,		0,	0x4C },
 
     { NULL,	"tst",		X_TST,		0,	0x04 },
-    { NULL,	"tstio",	X_TSTIO,	S_END,	0x74 }
+    { NULL,	"tstio",	X_TSTIO,	S_EOL,	0x74 }
 };
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/Makefile.in sdcc-3.2.0+dfsg/sdas/linksrc/Makefile.in
--- sdcc-3.1.0+dfsg/sdas/linksrc/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/Makefile.in	2012-01-06 08:30:10.000000000 +0000
@@ -42,13 +42,11 @@
 
 ASXXLIB = $(srcdir)/../asxxsrc
 
-LKLIB = $(srcdir)/..
-
 ASXXLIBSRC = strcmpi.c
 
 SRC = lk_readnl.c lkaomf51.c lkar.c lkarea.c lkdata.c lkelf.c lkeval.c \
-        lkhead.c lkihx.c lklex.c lklib.c lklibr.c lklist.c lkmain.c \
-        lkmem.c lknoice.c lkrel.c lkrloc.c lks19.c lksdcclib.c \
+        lkhead.c lklex.c lklib.c lklibr.c lklist.c lkmain.c lkmem.c \
+        lknoice.c lkout.c lkrel.c lkrloc.c lkrloc3.c lks19.c lksdcclib.c \
         lksym.c sdld.c lksdcdb.c lkbank.c
 
 LKSOURCES = $(SRC) $(ASXXLIBSRC:%.c=$(ASXXLIB)/%.c)
@@ -57,6 +55,8 @@
 ASXXLIBOBJS = $(ASXXLIBSRC:%.c=$(OBJDIR)/%.o)
 LKOBJECTS = $(OBJS) $(LKOBJS) $(ASXXLIBOBJS)
 
+$(LKOBJECTS) : aslink.h
+
 ASLINK          = $(top_builddir)/bin/sdld$(EXEEXT)
 
 transform       = @program_transform_name@
@@ -117,7 +117,7 @@
 # ---------------------
 dep: Makefile.dep
 
-Makefile.dep: $(LKSOURCES) $(LKLIB)/*.h $(top_builddir)/*.h
+Makefile.dep: $(LKSOURCES) $(top_builddir)/*.h
 	$(MAKEDEP) $(CPPFLAGS) $(filter %.c,$^) >Makefile.dep
 
 ifeq "$(findstring $(MAKECMDGOALS),uninstall check installcheck installdirs \
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/aslink.h sdcc-3.2.0+dfsg/sdas/linksrc/aslink.h
--- sdcc-3.1.0+dfsg/sdas/linksrc/aslink.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/aslink.h	2011-12-18 17:44:59.000000000 +0000
@@ -22,8 +22,8 @@
  * Kent, Ohio  44240
  *
  *   With enhancements from
- *	John L. Hartman	(JLH)
- *	jhartman@compuserve.com
+ *      John L. Hartman (JLH)
+ *      jhartman@compuserve.com
  */
 
 /*
@@ -39,7 +39,7 @@
  * Local Definitions
  */
 
-#define VERSION "V02.00 + NoICE + sdld"
+#define VERSION "V03.00 + NoICE + sdld"
 
 /*
  * To include NoICE Debugging set non-zero
@@ -65,75 +65,76 @@
 /* Turbo C++ 3.0 for DOS */
 /* 'int' is 16-bits, 'long' is 32-bits */
 
-#ifdef	__TURBOC__
-#define		INT32	long
-#define		LONGINT
+#ifdef  __TURBOC__
+#define         INT32   long
+#define         LONGINT
 #endif
 
 /* Symantec C++ V6.x/V7.x for DOS (not DOSX) */
 /* 'int' is 16-bits, 'long' is 32-bits */
 
-#ifdef	__SC__
-#define		INT32	long
-#define		LONGINT
+#ifdef  __SC__
+#define         INT32   long
+#define         LONGINT
 #endif
 
 /* The DEFAULT is 'int' is 32 bits */
-#ifndef	INT32
-#define		INT32	int
+#ifndef INT32
+#define         INT32   int
 #endif
 
 
-/*)Module	aslink.h
+/*)Module       aslink.h
  *
- *	The module aslink.h contains the definitions for constants,
- *	structures, global variables, and LKxxxx functions
- *	contained in the LKxxxx.c files.
+ *      The module aslink.h contains the definitions for constants,
+ *      structures, global variables, and LKxxxx functions
+ *      contained in the LKxxxx.c files.
  */
 
 /*)BUILD
-	$(PROGRAM) =	ASLINK
-	$(INCLUDE) =	ASLINK.H
-	$(FILES) = {
-		LKMAIN.C
-		LKLEX.C
-		LKAREA.C
-		LKBANK.C
-		LKHEAD.C
-		LKSYM.C
-		LKEVAL.C
-		LKDATA.C
-		LKLIST.C
-		LKNOICE.C
-		LKSDCDB.C
-		LKRLOC.C
-		LKLIBR.C
-		LKS19.C
-		LKIHX.C
-	}
-	$(STACK) = 2000
+        $(PROGRAM) =    ASLINK
+        $(INCLUDE) =    ASLINK.H
+        $(FILES) = {
+                LKMAIN.C
+                LKLEX.C
+                LKAREA.C
+                LKBANK.C
+                LKHEAD.C
+                LKSYM.C
+                LKEVAL.C
+                LKDATA.C
+                LKLIST.C
+                LKNOICE.C
+                LKSDCDB.C
+                LKRLOC.C
+                LKRLOC3.C
+                LKLIBR.C
+                LKOUT.C
+                LKS19.C
+        }
+        $(STACK) = 2000
 */
 
 #if defined  DECUS
 /* DECUS C void definition */
 /* File/extension seperator */
 
-#define VOID	    char
-#define FSEPX	    '.'
+#define VOID        char
+#define FSEPX       '.'
 
 #elif defined  PDOS
 /* PDOS C void definition */
 /* File/extension seperator */
 
-#define VOID	    char
-#define FSEPX	    ':'
+#define VOID        char
+#define FSEPX       ':'
 
 #elif defined UNIX
 /* UNIX void definition */
 /* File/extension seperator */
 
-#define VOID	    void
-#define FSEPX	    '.'
+#define VOID        void
+#define FSEPX       '.'
 #define LKDIRSEP    '/'
 #define LKDIRSEPSTR "/"
 #define OTHERSYSTEM
@@ -142,8 +143,8 @@
 /* DOS/WINDOWS void definition */
 /* File/extension seperator */
 
-#define VOID	    void
-#define FSEPX	    '.'
+#define VOID        void
+#define FSEPX       '.'
 #define LKDIRSEP    '\\'
 #define LKDIRSEPSTR "\\"
 #define OTHERSYSTEM
@@ -154,53 +155,56 @@
  * PATH_MAX
  */
 #include <limits.h>
-#ifndef PATH_MAX		/* POSIX, but not required   */
+#ifndef PATH_MAX                /* POSIX, but not required   */
  #if defined(__BORLANDC__) || defined(_MSC_VER)
   #include <stdlib.h>
-  #define PATH_MAX	_MAX_PATH
+  #define PATH_MAX      _MAX_PATH
  #else
-  #define PATH_MAX	255	/* define a reasonable value */
+  #define PATH_MAX      255     /* define a reasonable value */
  #endif
 #endif
 
-#define LKOBJEXT	"rel"
+#define LKOBJEXT        "rel"
 
 /*
  * Global symbol types.
  */
-#define S_REF	1		/* referenced */
-#define S_DEF	2		/* defined */
+#define S_REF   1               /* referenced */
+#define S_DEF   2               /* defined */
 
 /*
  * File types
  */
-#define	F_OUT	0		/* File.ixx / File.sxx */
-#define	F_STD	1		/* stdin */
-#define	F_LNK	2		/* File.lnk */
-#define	F_REL	3		/* File.rel */
+#define F_OUT   0               /* File.ixx / File.sxx */
+#define F_STD   1               /* stdin */
+#define F_LNK   2               /* File.lnk */
+#define F_REL   3               /* File.rel */
 
 /*
  * Error definitions
  */
-#define	ER_NONE		0	/* No error */
-#define	ER_WARNING	1	/* Warning */
-#define	ER_ERROR	2	/* Assembly error */
-#define	ER_FATAL	3	/* Fatal error */
+#define ER_NONE         0       /* No error */
+#define ER_WARNING      1       /* Warning */
+#define ER_ERROR        2       /* Assembly error */
+#define ER_FATAL        3       /* Fatal error */
 
 /*
  * This file defines the format of the
  * relocatable binary file.
  */
 
-#define NCPS	PATH_MAX	/* characters per symbol */
-#define NINPUT	PATH_MAX	/* Input buffer size */
-#define NHASH	(1 << 6)	/* Buckets in hash table */
-#define HMASK	(NHASH - 1)	/* Hash mask */
-#define NLPP	60		/* Lines per page */
-#define	NMAX	78		/* Maximum S19/IHX line length */
-#define	FILSPC	PATH_MAX	/* File spec length */
+#define NCPS    PATH_MAX        /* characters per symbol */
+#define NINPUT  PATH_MAX        /* Input buffer size */
+#define NHASH   (1 << 6)        /* Buckets in hash table */
+#define HMASK   (NHASH - 1)     /* Hash mask */
+#define NLPP    60              /* Lines per page */
+#define NMAX    78              /* IXX/SXX/DBX Buffer Length */
+#define         IXXMAXBYTES     32      /* NMAX > (2 * IXXMAXBYTES) */
+#define         SXXMAXBYTES     32      /* NMAX > (2 * SXXMAXBYTES) */
+#define         DBXMAXBYTES     64      /* NMAX > (  DBXMAXBYTES  ) */
+#define FILSPC  PATH_MAX        /* File spec length */
 
-#define NDATA	16		/* actual data */
+#define NDATA   16              /* actual data */
 /*
  * NTXT must be defined to have the same value in
  * the ASxxxx assemblers and ASLink.
@@ -209,656 +213,900 @@
  * the T Line index.  The MAXIMUM value for NTXT
  * is 16.  It should not be changed.
  */
-#define NTXT	16		/* T values */
+#define NTXT    16              /* T values */
 
 /*
  * Internal ASxxxx Version Variable
  */
-extern	int	ASxxxx_VERSION;
+extern  int     ASxxxx_VERSION;
 
 
 /*
- *	ASLINK - Version 3 Definitions
+ *      ASLINK - Version 3 Definitions
  */
 
 /*
- *	The "A3_" area constants define values used in
- *	generating the assembler area output data.
+ *      The "A3_" area constants define values used in
+ *      generating the assembler area output data.
  *
  * Area flags
  *
- *	   7     6     5     4     3     2     1     0
- *	+-----+-----+-----+-----+-----+-----+-----+-----+
- *	|     |     |     | PAG | ABS | OVR |     |     |
- *	+-----+-----+-----+-----+-----+-----+-----+-----+
+ *         7     6     5     4     3     2     1     0
+ *      +-----+-----+-----+-----+-----+-----+-----+-----+
+ *      |     |     |     | PAG | ABS | OVR |     |     |
+ *      +-----+-----+-----+-----+-----+-----+-----+-----+
  */
 
-#define A3_CON	  000		/* concatenate */
-#define A3_OVR	  004		/* overlay */
-#define A3_REL	  000		/* relocatable */
-#define A3_ABS	  010		/* absolute */
-#define A3_NOPAG  000		/* non-paged */
-#define A3_PAG	  020		/* paged */
+#define A3_CON    000           /* concatenate */
+#define A3_OVR    004           /* overlay */
+#define A3_REL    000           /* relocatable */
+#define A3_ABS    010           /* absolute */
+#define A3_NOPAG  000           /* non-paged */
+#define A3_PAG    020           /* paged */
 
 /* sdld specific */
 /* Additional flags for 8051 address spaces */
-#define A_DATA	  0000		/* data space (default)*/
-#define A_CODE	  0040		/* code space */
-#define A_XDATA   0100		/* external data space */
-#define A_BIT	  0200		/* bit addressable space */
+#define A_DATA    0000          /* data space (default)*/
+#define A_CODE    0040          /* code space */
+#define A_XDATA   0100          /* external data space */
+#define A_BIT     0200          /* bit addressable space */
 
 /* Additional flags for hc08 */
-#define A_NOLOAD  0400		/* nonloadable */
-#define A_LOAD	  0000		/* loadable (default) */
+#define A_NOLOAD  0400          /* nonloadable */
+#define A_LOAD    0000          /* loadable (default) */
 /* end sdld specific */
 
 /*
- *	The "R3_" relocation constants define values used in
- *	generating the assembler relocation output data for
- *	areas, symbols, and code.
+ *      The "R3_" relocation constants define values used in
+ *      generating the assembler relocation output data for
+ *      areas, symbols, and code.
  *
  *
- *	Relocation types.
+ *      Relocation types.
  *
- *	       7     6	   5	 4     3     2	   1	 0
- *	    +-----+-----+-----+-----+-----+-----+-----+-----+
- *	    | MSB | PAGn| PAG0| USGN| BYT2| PCR | SYM | BYT |
- *	    +-----+-----+-----+-----+-----+-----+-----+-----+
+ *             7     6     5     4     3     2     1     0
+ *          +-----+-----+-----+-----+-----+-----+-----+-----+
+ *          | MSB | PAGn| PAG0| USGN| BYT2| PCR | SYM | BYT |
+ *          +-----+-----+-----+-----+-----+-----+-----+-----+
  */
 
-#define R3_WORD	 0x00		/* 16 bit */
-#define R3_BYTE	 0x01		/*  8 bit */
+#define R3_WORD  0x00           /* 16 bit */
+#define R3_BYTE  0x01           /*  8 bit */
 
-#define R3_AREA	 0x00		/* Base type */
-#define R3_SYM	 0x02
+#define R3_AREA  0x00           /* Base type */
+#define R3_SYM   0x02
 
-#define R3_NORM	 0x00		/* PC adjust */
-#define R3_PCR	 0x04
+#define R3_NORM  0x00           /* PC adjust */
+#define R3_PCR   0x04
 
-#define R3_BYT1	 0x00		/* Byte count for R_BYTE = 1 */
-#define R3_BYTX  0x08		/* Byte count for R_BYTE = X */
+#define R3_BYT1  0x00           /* Byte count for R_BYTE = 1 */
+#define R3_BYTX  0x08           /* Byte count for R_BYTE = X */
 
-#define R3_SGND  0x00		/* Signed value */
-#define R3_USGN  0x10		/* Unsigned value */
+#define R3_SGND  0x00           /* Signed value */
+#define R3_USGN  0x10           /* Unsigned value */
 
-#define R3_NOPAG 0x00		/* Page Mode */
-#define R3_PAG0	 0x20		/* Page '0' */
-#define R3_PAG	 0x40		/* Page 'nnn' */
+#define R3_NOPAG 0x00           /* Page Mode */
+#define R3_PAG0  0x20           /* Page '0' */
+#define R3_PAG   0x40           /* Page 'nnn' */
 
-#define R3_LSB	 0x00		/* output low byte */
-#define R3_MSB	 0x80		/* output high byte */
+#define R3_LSB   0x00           /* output low byte */
+#define R3_MSB   0x80           /* output high byte */
 
 /*
- *	Additional "R3_" functionality is required to support
- *	some microprocesssor architectures.   The 'illegal'
- *	"R3_" mode of R3_WORD | R3_BYTX is used as a designator
- *	of the extended R3_ modes.  The extended modes replace
- *	the PAGING modes and are being added in an adhoc manner
- *	as follows:
+ *      Additional "R3_" functionality is required to support
+ *      some microprocesssor architectures.   The 'illegal'
+ *      "R3_" mode of R3_WORD | R3_BYTX is used as a designator
+ *      of the extended R3_ modes.  The extended modes replace
+ *      the PAGING modes and are being added in an adhoc manner
+ *      as follows:
  *
  * Extended Mode relocation flags
  *
- *	   7	 6     5     4	   3	 2     1     0
- *	+-----+-----+-----+-----+-----+-----+-----+-----+
- *	| MSB |  x  |  x  | USGN|  1  | PCR | SYM |  0	|
- *	+-----+-----+-----+-----+-----+-----+-----+-----+
+ *         7     6     5     4     3     2     1     0
+ *      +-----+-----+-----+-----+-----+-----+-----+-----+
+ *      | MSB |  x  |  x  | USGN|  1  | PCR | SYM |  0  |
+ *      +-----+-----+-----+-----+-----+-----+-----+-----+
  */
 
-#define	R3_ECHEK	0011		/* Extended Mode Check Bits */
-#define	R3_EXTND	0010		/* Extended Mode Code */
-#define	R3_EMASK	0151		/* Extended Mode Mask */
+#define R3_ECHEK        0011            /* Extended Mode Check Bits */
+#define R3_EXTND        0010            /* Extended Mode Code */
+#define R3_EMASK        0151            /* Extended Mode Mask */
 
-/* #define R3_AREA 0000 */	/* Base type */
+/* #define R3_AREA 0000 */      /* Base type */
 /* #define R3_SYM  0002 */
 
-/* #define R3_NORM 0000 */	/* PC adjust */
+/* #define R3_NORM 0000 */      /* PC adjust */
 /* #define R3_PCR  0004 */
 
-/* #define R3_SGND 0000 */	/* Signed value */
-/* #define R3_USGN 0020 */	/* Unsigned value */
+/* #define R3_SGND 0000 */      /* Signed value */
+/* #define R3_USGN 0020 */      /* Unsigned value */
 
-/* #define R3_LSB  0000 */	/* output low byte */
-/* #define R3_MSB  0200 */	/* output high byte */
+/* #define R3_LSB  0000 */      /* output low byte */
+/* #define R3_MSB  0200 */      /* output high byte */
 
-#define R_J11	(R3_WORD|R3_BYTX) /* JLH: 11 bit JMP and CALL (8051) */
-#define R_J19	(R3_WORD|R3_BYTX|R3_MSB) /* 19 bit JMP and CALL (DS80C390) */
-#define R_C24	(R3_WORD|R3_BYT1|R3_MSB) /* 24 bit address (DS80C390) */
+#define R3_J11     (R3_WORD|R3_BYTX)        /* JLH: 11 bit JMP and CALL (8051) */
+#define R3_J19     (R3_WORD|R3_BYTX|R3_MSB) /* BM:  19 bit JMP and CALL (DS80C390) */
+#define R_C24      (R3_WORD|R3_BYT1|R3_MSB) /* 24 bit address (DS80C390) */
 #define R_J19_MASK (R3_BYTE|R3_BYTX|R3_MSB)
 
-#define IS_R_J19(x) (((x) & R_J19_MASK) == R_J19)
-#define IS_R_J11(x) (((x) & R_J19_MASK) == R_J11)
+#define IS_R_J19(x) (((x) & R_J19_MASK) == R3_J19)
+#define IS_R_J11(x) (((x) & R_J19_MASK) == R3_J11)
 #define IS_C24(x) (((x) & R_J19_MASK) == R_C24)
 
 /* sdld specific */
-#define R_BYT3	0x100		/* if R3_BYTE is set, this is a
-				 * 3 byte address, of which
-				 * the linker must select one byte.
-				 */
-#define R_HIB	0x200		/* If R3_BYTE & R_BYT3 are set, linker
-				 * will select byte 3 of the relocated
-				 * 24 bit address.
-				 */
-
-#define R_BIT	0x400		/* Linker will convert from byte-addressable
-				 * space to bit-addressable space.
-				 */
-
-#define R_ESCAPE_MASK	0xf0	/* Used to escape relocation modes
-				 * greater than 0xff in the .rel
-				 * file.
-				 */
+#define R_BYT3  0x100           /* if R3_BYTE is set, this is a
+                                 * 3 byte address, of which
+                                 * the linker must select one byte.
+                                 */
+#define R_HIB   0x200           /* If R3_BYTE & R_BYT3 are set, linker
+                                 * will select byte 3 of the relocated
+                                 * 24 bit address.
+                                 */
+
+#define R_BIT   0x400           /* Linker will convert from byte-addressable
+                                 * space to bit-addressable space.
+                                 */
+
+#define R_ESCAPE_MASK   0xf0    /* Used to escape relocation modes
+                                 * greater than 0xff in the .rel
+                                 * file.
+                                 */
 /* end sdld specific */
 
+
+/*
+ *      ASLINK - Version 4 Definitions
+ */
+
+/*
+ *      The "A4_" area constants define values used in
+ *      generating the assembler area output data.
+ *
+ * Area flags
+ *
+ *         7     6     5     4     3     2     1     0
+ *      +-----+-----+-----+-----+-----+-----+-----+-----+
+ *      | BNK | SEG |     | PAG | ABS | OVR | WL1 | WL0 |
+ *      +-----+-----+-----+-----+-----+-----+-----+-----+
+ */
+
+#define A4_BYTE         0x0000          /*  8 bit */
+#define A4_WORD         0x0001          /* 16 bit */
+
+#define A4_1BYTE        0x0000          /* 1 Byte Word Length */
+#define A4_2BYTE        0x0001          /* 2 Byte Word Length */
+#define A4_3BYTE        0x0002          /* 3 Byte Word Length */
+#define A4_4BYTE        0x0003          /* 4 Byte Word Length */
+#define A4_WLMSK        0x0003          /* Word Length Mask */
+
+#define A4_CON          0x0400          /* Concatenating */
+#define A4_OVR          0x0404          /* Overlaying */
+#define A4_REL          0x0800          /* Relocatable */
+#define A4_ABS          0x0808          /* absolute */
+#define A4_NOPAG        0x1000          /* Non-Paged */
+#define A4_PAG          0x1010          /* Paged */
+
+#define A4_CSEG         0x4000          /* CSEG */
+#define A4_DSEG         0x4040          /* DSEG */
+#define A4_NOBNK        0x8000          /* Non-Banked */
+#define A4_BNK          0x8080          /* Banked */
+
+#define A4_OUT          0x0100          /* Output Code Flag */
+
+/*
+ *      The "R4_" relocation constants define values used in
+ *      generating the assembler relocation output data for
+ *      areas, symbols, and code.
+ *
+ * Note:  The PAGE modes, PCR modes, Signed, Unsigned,
+ *        and MSB codes are mutually exclusive !!!
+ *
+ *
+ * Relocation flags
+ *
+ *         7     6     5     4     3     2     1     0
+ *      +-----+-----+-----+-----+-----+-----+-----+-----+
+ *      | SYM | PCR | PAGn| PAG0| USGN| SGND| BYT1| BYT0|
+ *      +-----+-----+-----+-----+-----+-----+-----+-----+
+ */
+
+#define R4_BYTE         0x0000          /*  8 bit */
+#define R4_WORD         0x0001          /* 16 bit */
+
+#define R4_1BYTE        0x0000          /* 1 Byte */
+#define R4_2BYTE        0x0001          /* 2 Byte */
+#define R4_3BYTE        0x0002          /* 3 Byte */
+#define R4_4BYTE        0x0003          /* 4 Byte */
+#define R4_BYTES        0x0003          /* Data Size */
+
+#define R4_SGND         0x0004          /* Signed */
+#define R4_USGN         0x0008          /* Unsigned */
+#define R4_OVRF         0x0008          /* Overflow */
+
+#define R4_MBRS         0x0004          /* Merge Bit Range Signed */
+                                        /* An alias for Signed */
+#define R4_MBRU         0x0008          /* Merge Bit Range Unsigned */
+                                        /* An alias for Unsigned */
+#define R4_MBRO         0x0008          /* Merge Bit Range Overflow */
+                                        /* An alias for Unsigned */
+
+#define R4_MSB          0x000C          /* MSB */
+                                        /* Mutually exclusive with Signed / Unsigned */
+
+#define R4_AREA         0x0000          /* Base type */
+#define R4_SYM          0x0080
+
+/*
+ * Paging Modes:
+ */
+
+#define R4_NOPAG        0x0000          /* Page Mode */
+#define R4_PBITS        0x003C          /* Paging Bits */
+#define R4_PAGE         0x0030          /* Paged Addressing */
+#define R4_PAG0         0x0010          /* Page '0'    .setdp */
+#define R4_PAGN         0x0020          /* Page 'nnn'  .setdp */
+#define R4_PAGX         0x0030          /* Page 'x', Extended Relocation Mode */
+#define R4_PAGX0        0x0030          /* Page 'x', pc + 0 */
+#define R4_PAGX1        0x0034          /* Page 'x', pc + 1 */
+#define R4_PAGX2        0x0038          /* Page 'x', pc + 2 */
+#define R4_PAGX3        0x003C          /* Page 'x', pc + 3 */
+
+/*
+ * PCR Modes:
+ */
+
+#define R4_PCR          0x0040          /* PC adjust (default)    */
+#define R4_PCRN         0x0050          /* PC adjust (default) no range check */
+
+#define R4_PCR0         0x0054          /* PC adjust (offset = 0) */
+#define R4_PCR1         0x0060          /* PC adjust (offset = 1) */
+#define R4_PCR2         0x0064          /* PC adjust (offset = 2) */
+#define R4_PCR3         0x0068          /* PC adjust (offset = 3) */
+#define R4_PCR4         0x006C          /* PC adjust (offset = 4) */
+
+#define R4_PCR0N        0x0058          /* PC adjust (offset = 0) no range check */
+#define R4_PCR1N        0x0070          /* PC adjust (offset = 1) no range check */
+#define R4_PCR2N        0x0074          /* PC adjust (offset = 2) no range check */
+#define R4_PCR3N        0x0078          /* PC adjust (offset = 3) no range check */
+#define R4_PCR4N        0x007C          /* PC adjust (offset = 4) no range check */
+
+/*
+ * Basic Relocation Modes
+ */
+
+#define R4_NORM         0x0000          /* No Bit Positioning */
+
+
 /*
- *	The defined type 'a_uint' is used for all address and
- *	unsigned variable value calculations.  Its size is
- *	required to be at least 32-bits to allow upto
- *	32-bit addressing or 32-bit value manipulation.
- */
-typedef	unsigned INT32 a_uint;
-
-/*
- *	The defined type 'v_sint' is used for address and
- *	variable value calculations requiring a sign.
- *	Its size is required to be at least 32-bits to allow
- *	upto 32-bit addressing or 32-bit value manipulation.
- */
-typedef	signed INT32 v_sint;
-
-/*
- *	The structures of head, area, areax, and sym
- *	are created as the REL files are read during the first
- *	pass of the linker.  The struct head is created upon
- *	encountering a H directive in the REL file.  The
- *	structure contains a link to a link file structure
- *	(struct lfile) which describes the file containing the H
- *	directive, the number of data/code areas
- *	contained in this header segment, the number of
- *	symbols referenced/defined in this header segment, a pointer
- *	to an array of pointers to areax structures (struct areax)
- *	created as each A directive is read, and a pointer to an
- *	array of pointers to symbol structures (struct sym) for
- *	all referenced/defined symbols.  As H directives are read
- *	from the REL files a linked list of head structures is
- *	created by placing a link to the new head structure
- *	in the previous head structure.
+ *      The defined type 'a_uint' is used for all address and
+ *      unsigned variable value calculations.  Its size is
+ *      required to be at least 32-bits to allow upto
+ *      32-bit addressing or 32-bit value manipulation.
  */
-struct	head
+typedef unsigned INT32 a_uint;
+
+/*
+ *      The defined type 'v_sint' is used for address and
+ *      variable value calculations requiring a sign.
+ *      Its size is required to be at least 32-bits to allow
+ *      upto 32-bit addressing or 32-bit value manipulation.
+ */
+typedef signed INT32 v_sint;
+
+/*
+ *      The structures of head, mode, bank, area, areax, and sym
+ *      are created as the REL files are read during the first
+ *      pass of the linker.  The struct head is created upon
+ *      encountering a H directive in the REL file.  The
+ *      structure contains a link to a link file structure
+ *      (struct lfile) which describes the file containing the H
+ *      directive, a pointer to an array of merge mode
+ *      definition pointers, the number of data/code areas
+ *      contained in this header segment, the number of
+ *      symbols referenced/defined in this header segment, a pointer
+ *      to an array of pointers to areax structures (struct areax)
+ *      created as each A directive is read, a pointer to an
+ *      array of pointers to symbol structures (struct sym) for
+ *      all referenced/defined symbols and a pointer to an array
+ *      of pointers to bank structures (struct bank) referenced
+ *      by this module.  As H directives are read
+ *      from the REL files a linked list of head structures is
+ *      created by placing a link to the new head structure
+ *      in the previous head structure.
+ */
+struct  head
+{
+        struct  head  *h_hp;    /* Header link */
+        struct  lfile *h_lfile; /* Associated file */
+        int     h_narea;        /* # of areas */
+        struct  areax **a_list; /* Area list */
+        int     h_nsym; /* # of symbols */
+        struct  sym   **s_list; /* Symbol list */
+        int     h_nbank;        /* # of banks */
+        struct  bank  **b_list; /* Bank list */
+        int     h_nmode;        /* # of modes */
+        struct  mode  **m_list; /* Mode list */
+        char *  m_id;           /* Module name */
+};
+
+/*
+ *      The MODE structure contains the specification of one of the
+ *      assemblers' relocation modes.  Each assembler must specify
+ *      at least one relocation mode.  The relocation specification
+ *      allows arbitrarily defined active bits and bit positions.
+ *      The 32 element arrays are indexed from 0 to 31.
+ *      Index 0 corresponds to bit 0, ..., and 31 corresponds to bit 31
+ *      of a normal integer value.
+ *
+ *      The value an array element defines if the normal integer bit is
+ *      active (bit <7> is set, 0x80) and what destination bit
+ *      (bits <4:0>, 0 - 31) should be loaded with this normal
+ *      integer bit.
+ *
+ *      The specification for a 32-bit integer:
+ *
+ *      char mode_[32] = {
+ *              0x80,   0x81,   0x82,   0x83,   0x84,   0x85,   0x86,   0x87,
+ *              0x88,   0x89,   0x8A,   0x8B,   0x8C,   0x8D,   0x8E,   0x8F,
+ *              0x90,   0x91,   0x92,   0x93,   0x94,   0x95,   0x96,   0x97,
+ *              0x98,   0x99,   0x9A,   0x9B,   0x9C,   0x9D,   0x9E,   0x9F
+ *      };
+ *
+ *
+ *      The specification for the 11-bit 8051 addressing mode:
+ *
+ *      char mode_[32] = {
+ *              0x80,   0x81,   0x82,   0x83,   0x84,   0x85,   0x86,   0x87,
+ *              0x8D,   0x8E,   0x8F,   0x0B,   0x0C,   0x0D,   0x0E,   0x0F,
+ *              0x10,   0x11,   0x12,   0x13,   0x14,   0x15,   0x16,   0x17,
+ *              0x18,   0x19,   0x1A,   0x1B,   0x1C,   0x1D,   0x1E,   0x1F
+ *      };
+ *
+ *
+ *      m_def is the bit relocation definition array.
+ *      m_flag indicates that bit position swapping is required.
+ *      m_dbits contains the active bit positions for the output.
+ *      m_sbits contains the active bit positions for the input.
+ */
+struct  mode
 {
-	struct	head  *h_hp;	/* Header link */
-	struct	lfile *h_lfile;	/* Associated file */
-	int	h_narea;	/* # of areas */
-	struct	areax **a_list; /* Area list */
-	int	h_nsym;	/* # of symbols */
-	struct	sym   **s_list; /* Symbol list */
-	char *	m_id;		/* Module name */
+        char    m_def[32];      /* Bit Relocation Definition */
+        int     m_flag;         /* Bit Swapping Flag */
+        a_uint  m_dbits;        /* Destination Bit Mask */
+        a_uint  m_sbits;        /* Source Bit Mask */
 };
 
 /*
- *	A structure area is created for each 'unique' data/code
- *	area definition found as the REL files are read.  The
- *	struct area contains the name of the area, a flag byte
- *	which contains the area attributes (REL/CON/OVR/ABS),
- *	the area subtype (not used in this assembler), and the
- *	area base address and total size which will be filled
- *	in at the end of the first pass through the REL files.
- *	As A directives are read from the REL files a linked
- *	list of unique area structures is created by placing a
- *	link to the new area structure in the previous area structure.
+ *      The bank structure contains the parameter values for a
+ *      specific program or data bank.  The bank structure
+ *      is a linked list of banks.  The initial default bank
+ *      is unnamed and is defined in lkdata.c, the next bank structure
+ *      will be linked to this structure through the structure
+ *      element 'struct bank *b_bp'.  The structure contains the
+ *      bank name, the bank base address (default = 0), the bank size
+ *      (default = 0, whole addressing space), the bank mapping,
+ *      and the file name suffix. (default is none)  These optional
+ *      parameters are from  the .bank assembler directive.
+ *      The bank structure also contains the bank data output
+ *      file specification, file handle pointer and the
+ *      bank first output flag.
  */
-struct	area
+struct  bank
 {
-	struct	area	*a_ap;	/* Area link */
-	struct	areax	*a_axp; /* Area extension link */
-	a_uint	a_addr;		/* Beginning address of area */
-	a_uint	a_size;		/* Total size of the area */
+        struct  bank *b_bp;     /* Bank link */
+        char *  b_id;           /* Bank Name */
+        char *  b_fsfx;         /* Bank File Suffix / File Specification */
+        a_uint  b_base;         /* Bank base address */
+        a_uint  b_size;         /* Bank size */
+        a_uint  b_map;          /* Bank mapping */
+        int     b_flag;         /* Bank flags */
+        char *  b_fspec;        /* Bank File Specification */
+        FILE *  b_ofp;          /* Bank File Handle */
+        char *  b_ofspec;       /* Bank Output File Specification */
+        int     b_oflag;        /* Bank has output flag */
+        int     b_rtaflg;       /* Bank First Output flag */
+};
+
+#define B_BASE  0001            /* 'base' address specified */
+#define B_SIZE  0002            /* 'size' of bank specified */
+#define B_FSFX  0004            /* File suffix specified */
+#define B_MAP   0010            /* Mapped Bank Flag */
+
+/*
+ *      A structure area is created for each 'unique' data/code
+ *      area definition found as the REL files are read.  The
+ *      struct area contains the name of the area, a flag byte
+ *      which contains the area attributes (REL/CON/OVR/ABS),
+ *      the area base address set flag byte (-b option), and the
+ *      area base address and total size which will be filled
+ *      in at the end of the first pass through the REL files.
+ *      The area structure also contains a link to the bank
+ *      this area is a part of and a data output file handle
+ *      pointer which is loaded from from the bank structure.
+ *      As A directives are read from the REL files a linked
+ *      list of unique area structures is created by placing a
+ *      link to the new area structure in the previous area structure.
+ */
+struct  area
+{
+        struct  area    *a_ap;  /* Area link */
+        struct  areax   *a_axp; /* Area extension link */
+        struct  bank    *a_bp;  /* Bank link */
+        FILE *  a_ofp;          /* Area File Handle */
+        a_uint  a_addr;         /* Beginning address of area */
+        a_uint  a_size;         /* Total size of the area */
+        int     a_bset;         /* Area base address set */
 /* sdld specific */
-	a_uint	a_unaloc;	/* Total number of unallocated bytes, for error reporting */
+        a_uint  a_unaloc;       /* Total number of unallocated bytes, for error reporting */
 /* end sdld specific */
-	char	a_type;		/* Area subtype */
-	int	a_flag;		/* Flags */
-	char *	a_id;		/* Name */
+        int     a_flag;         /* Flags */
+        char *  a_id;           /* Name */
 /* sdld specific */
-	char	*a_image;	/* Something for hc08/lkelf */
-	char	*a_used;	/* Something for hc08/lkelf */
+        char    *a_image;       /* Something for hc08/lkelf */
+        char    *a_used;        /* Something for hc08/lkelf */
 /* end sdld specific */
 };
 
 /*
- *	An areax structure is created for every A directive found
- *	while reading the REL files.  The struct areax contains a
- *	link to the 'unique' area structure referenced by the A
- *	directive and to the head structure this area segment is
- *	a part of.  The size of this area segment as read from the
- *	A directive is placed in the areax structure.  The beginning
- *	address of this segment will be filled in at the end of the
- *	first pass through the REL files.  As A directives are read
- *	from the REL files a linked list of areax structures is
- *	created for each unique area.  The final areax linked
- *	list has at its head the 'unique' area structure linked
- *	to the linked areax structures (one areax structure for
- *	each A directive for this area).
+ *      An areax structure is created for every A directive found
+ *      while reading the REL files.  The struct areax contains a
+ *      link to the 'unique' area structure referenced by the A
+ *      directive and to the head structure this area segment is
+ *      a part of.  The size of this area segment as read from the
+ *      A directive is placed in the areax structure.  The beginning
+ *      address of this segment will be filled in at the end of the
+ *      first pass through the REL files.  As A directives are read
+ *      from the REL files a linked list of areax structures is
+ *      created for each unique area.  The final areax linked
+ *      list has at its head the 'unique' area structure linked
+ *      to the linked areax structures (one areax structure for
+ *      each A directive for this area).
  */
-struct	areax
+struct  areax
 {
-	struct	areax	*a_axp; /* Area extension link */
-	struct	area	*a_bap; /* Base area link */
-	struct	head	*a_bhp; /* Base header link */
-	a_uint	a_addr;		/* Beginning address of section */
-	a_uint	a_size;		/* Size of the area in section */
+        struct  areax   *a_axp; /* Area extension link */
+        struct  area    *a_bap; /* Base area link */
+        struct  head    *a_bhp; /* Base header link */
+        a_uint  a_addr;         /* Beginning address of section */
+        a_uint  a_size;         /* Size of the area in section */
 };
 
 /*
- *	A sym structure is created for every unique symbol
- *	referenced/defined while reading the REL files.  The
- *	struct sym contains the symbol's name, a flag value
- *	(not used in this linker), a symbol type denoting
- *	referenced/defined, and an address which is loaded
- *	with the relative address within the area in which
- *	the symbol was defined.  The sym structure also
- *	contains a link to the area where the symbol was defined.
- *	The sym structures are linked into linked lists using
- *	the symbol link element.
+ *      A sym structure is created for every unique symbol
+ *      referenced/defined while reading the REL files.  The
+ *      struct sym contains the symbol's name, a flag value
+ *      (not used in this linker), a symbol type denoting
+ *      referenced/defined, and an address which is loaded
+ *      with the relative address within the area in which
+ *      the symbol was defined.  The sym structure also
+ *      contains a link to the area where the symbol was defined.
+ *      The sym structures are linked into linked lists using
+ *      the symbol link element.
  */
-struct	sym
+struct  sym
 {
-	struct	sym	*s_sp;	/* Symbol link */
-	struct	areax	*s_axp; /* Symbol area link */
-	char	s_type;		/* Symbol subtype */
-	char	s_flag;		/* Flag byte */
-	a_uint	s_addr;		/* Address */
-	char	*s_id;		/* Name (JLH) */
-	char	*m_id;		/* Module symbol define in */
+        struct  sym     *s_sp;  /* Symbol link */
+        struct  areax   *s_axp; /* Symbol area link */
+        char    s_type;         /* Symbol subtype */
+        char    s_flag;         /* Flag byte */
+        a_uint  s_addr;         /* Address */
+        char    *s_id;          /* Name (JLH) */
+        char    *m_id;          /* Module symbol define in */
 };
 
 /*
- *	The structure lfile contains a pointer to a
- *	file specification string, the file type, and
- *	a link to the next lfile structure.
+ *      The structure lfile contains a pointer to a
+ *      file specification string, an index which points
+ *      to the file name (past the 'path'), the file type,
+ *      an object output flag, and a link to the next
+ *      lfile structure.
  */
-struct	lfile
+struct  lfile
 {
-	struct	lfile	*f_flp; /* lfile link */
-	int	f_type;		/* File type */
-	char	*f_idp;		/* Pointer to file spec */
-	int	f_idx;		/* Index to file name */
+        struct  lfile   *f_flp; /* lfile link */
+        int     f_type;         /* File type */
+        char    *f_idp;         /* Pointer to file spec */
+        int     f_idx;          /* Index to file name */
+        int     f_obj;          /* Object output flag */
 };
 
 /*
- *	The struct base contains a pointer to a
- *	base definition string and a link to the next
- *	base structure.
+ *      The struct base contains a pointer to a
+ *      base definition string and a link to the next
+ *      base structure.
  */
-struct	base
+struct  base
 {
-	struct	base  *b_base;	/* Base link */
-	char	      *b_strp;	/* String pointer */
+        struct  base  *b_base;  /* Base link */
+        char          *b_strp;  /* String pointer */
 };
 
 /*
- *	The struct globl contains a pointer to a
- *	global definition string and a link to the next
- *	global structure.
+ *      The struct globl contains a pointer to a
+ *      global definition string and a link to the next
+ *      global structure.
  */
-struct	globl
+struct  globl
 {
-	struct	globl *g_globl; /* Global link */
-	char	      *g_strp;	/* String pointer */
+        struct  globl *g_globl; /* Global link */
+        char          *g_strp;  /* String pointer */
 };
 
 /*
- *	A structure sdp is created for each 'unique' paged
- *	area definition found as the REL files are read.
- *	As P directives are read from the REL files a linked
- *	list of unique sdp structures is created by placing a
- *	link to the new sdp structure in the previous area structure.
+ *      A structure sdp is created for each 'unique' paged
+ *      area definition found as the REL files are read.
+ *      As P directives are read from the REL files a linked
+ *      list of unique sdp structures is created by placing a
+ *      link to the new sdp structure in the previous area structure.
  */
-struct	sdp
+struct  sdp
 {
-	struct	area  *s_area;	/* Paged Area link */
-	struct	areax *s_areax; /* Paged Area Extension Link */
-	a_uint	s_addr;		/* Page address offset */
+        struct  area  *s_area;  /* Paged Area link */
+        struct  areax *s_areax; /* Paged Area Extension Link */
+        a_uint  s_addr;         /* Page address offset */
 };
 
 /*
- *	The structure rerr is loaded with the information
- *	required to report an error during the linking
- *	process.  The structure contains an index value
- *	which selects the areax structure from the header
- *	areax structure list, a mode value which selects
- *	symbol or area relocation, the base address in the
- *	area section, an area/symbol list index value, and
- *	an area/symbol offset value.
+ *      The structure rerr is loaded with the information
+ *      required to report an error during the linking
+ *      process.  The structure contains an index value
+ *      which selects the areax structure from the header
+ *      areax structure list, a mode value which selects
+ *      symbol or area relocation, the base address in the
+ *      area section, an area/symbol list index value, and
+ *      an area/symbol offset value.
  */
-struct	rerr
+struct  rerr
 {
-	int	aindex;		/* Linking area */
-	int	mode;		/* Relocation mode */
-	a_uint	rtbase;		/* Base address in section */
-	int	rindex;		/* Area/Symbol reloaction index */
-	a_uint	rval;		/* Area/Symbol offset value */
+        int     aindex;         /* Linking area */
+        int     mode;           /* Relocation mode */
+        a_uint  rtbase;         /* Base address in section */
+        int     rindex;         /* Area/Symbol reloaction index */
+        a_uint  rval;           /* Area/Symbol offset value */
 };
 
 /*
- *	The structure lbpath is created for each library
- *	path specification input by the -k option.  The
- *	lbpath structures are linked into a list using
- *	the next link element.
+ *      The structure lbpath is created for each library
+ *      path specification input by the -k option.  The
+ *      lbpath structures are linked into a list using
+ *      the next link element.
  */
 struct lbpath {
-	struct	lbpath	*next;
-	char		*path;
+        struct  lbpath  *next;
+        char            *path;
 };
 
 /*
- *	The structure lbname is created for all combinations of the
- *	library path specifications (input by the -k option) and the
- *	library file specifications (input by the -l option) that
- *	lead to an existing file.  The element path points to
- *	the path string, element libfil points to the library
- *	file string, and the element libspc is the concatenation
- *	of the valid path and libfil strings.
- *
- *	The lbpath structures are linked into a list
- *	using the next link element.
+ *      The structure lbname is created for all combinations of the
+ *      library path specifications (input by the -k option) and the
+ *      library file specifications (input by the -l option) that
+ *      lead to an existing file.  The element path points to
+ *      the path string, element libfil points to the library
+ *      file string, and the element libspc is the concatenation
+ *      of the valid path and libfil strings.
+ *
+ *      The lbpath structures are linked into a list
+ *      using the next link element.
  *
- *	Each library file contains a list of object files
- *	that are contained in the particular library. e.g.:
+ *      Each library file contains a list of object files
+ *      that are contained in the particular library. e.g.:
  *
- *		\iolib\termio
- *		\inilib\termio
+ *              \iolib\termio
+ *              \inilib\termio
  *
- *	Only one specification per line is allowed.
+ *      Only one specification per line is allowed.
  */
 struct lbname {
-	struct	lbname	*next;
-	char		*path;
-	char		*libfil;
-	char		*libspc;
+        struct  lbname  *next;
+        char            *path;
+        char            *libfil;
+        char            *libspc;
+        int             f_obj;
 };
 
 /*
- *	The function fndsym() searches through all combinations of the
- *	library path specifications (input by the -k option) and the
- *	library file specifications (input by the -l option) that
- *	lead to an existing file for a symbol definition.
- *
- *	The structure lbfile is created for the first library
- *	object file which contains the definition for the
- *	specified undefined symbol.
- *
- *	The element libspc points to the library file path specification
- *	and element relfil points to the object file specification string.
- *	The element filspc is the complete path/file specification for
- *	the library file to be imported into the linker.  The
- *	file specicifation may be formed in one of two ways:
- *
- *	(1)	If the library file contained an absolute
- *		path/file specification then this becomes filspc.
- *		(i.e. C:\...)
- *
- *	(2)	If the library file contains a relative path/file
- *		specification then the concatenation of the path
- *		and this file specification becomes filspc.
- *		(i.e. \...)
+ *      The function fndsym() searches through all combinations of the
+ *      library path specifications (input by the -k option) and the
+ *      library file specifications (input by the -l option) that
+ *      lead to an existing file for a symbol definition.
+ *
+ *      The structure lbfile is created for the first library
+ *      object file which contains the definition for the
+ *      specified undefined symbol.
+ *
+ *      The element libspc points to the library file path specification
+ *      and element relfil points to the object file specification string.
+ *      The element filspc is the complete path/file specification for
+ *      the library file to be imported into the linker.  The f_obj
+ *      flag specifies if the object code from this file is
+ *      to be output by the linker.  The file specification
+ *      may be formed in one of two ways:
+ *
+ *      (1)     If the library file contained an absolute
+ *              path/file specification then this becomes filspc.
+ *              (i.e. C:\...)
+ *
+ *      (2)     If the library file contains a relative path/file
+ *              specification then the concatenation of the path
+ *              and this file specification becomes filspc.
+ *              (i.e. \...)
  *
- *	The lbpath structures are linked into a list
- *	using the next link element.
+ *      The lbpath structures are linked into a list
+ *      using the next link element.
  */
 struct lbfile {
-	struct	lbfile	*next;
-	char		*libspc;
-	char		*relfil;
-	char		*filspc;
+        struct  lbfile  *next;
+        char            *libspc;
+        char            *relfil;
+        char            *filspc;
+        int             f_obj;
 /* sdld specific */
-	long		offset;
-	unsigned int	type;
+        long            offset;
+        unsigned int    type;
 /* end sdld specific */
 };
 
 /*
- *	External Definitions for all Global Variables
+ *      External Definitions for all Global Variables
  */
 
-extern	char	*_abs_;		/*	= { ".  .ABS." };
-				 */
-extern	int	lkerr;		/*	ASLink error flag
-				 */
-extern	char	*ip;		/*	pointer into the REL file
-				 *	text line in ib[]
-				 */
-extern	char	ib[NINPUT];	/*	REL file text line
-				 */
-extern	char	*rp;		/*	pointer into the LST file
-				 *	text line in rb[]
-				 */
-extern	char	rb[NINPUT];	/*	LST file text line being
-				 *	address relocated
-				 */
-extern	char	ctype[];	/*	array of character types, one per
-				 *	ASCII character
-				 */
-
-/*
- *	Character Type Definitions
- */
-#define	SPACE	'\000'
-#define ETC	'\000'
-#define	LETTER	'\001'
-#define	DIGIT	'\002'
-#define	BINOP	'\004'
-#define	RAD2	'\010'
-#define	RAD8	'\020'
-#define	RAD10	'\040'
-#define	RAD16	'\100'
-#define	ILL	'\200'
-
-#define	DGT2	DIGIT|RAD16|RAD10|RAD8|RAD2
-#define	DGT8	DIGIT|RAD16|RAD10|RAD8
-#define	DGT10	DIGIT|RAD16|RAD10
-#define	LTR16	LETTER|RAD16
-
-extern	char	afspec[];	/*	The filespec created by afile()
-				 */
-extern	char	ccase[];	/*	an array of characters which
-				 *	perform the case translation function
-				 */
-
-extern	struct	lfile	*filep; /*	The pointers (lfile *) filep,
-				 *	(lfile *) cfp, and (FILE *) sfp
-				 *	are used in conjunction with
-				 *	the routine nxtline() to read
-				 *	aslink commands from
-				 *	(1) the standard input or
-				 *	(2) or a command file
-				 *	and to read the REL files
-				 *	sequentially as defined by the
-				 *	aslink input commands.
-				 *
-				 *	The pointer *filep points to the
-				 *	beginning of a linked list of
-				 *	lfile structures.
-				 */
-extern	struct	lfile	*cfp;	/*	The pointer *cfp points to the
-				 *	current lfile structure
-				 */
-extern	struct	lfile	*startp;/*	aslink startup file structure
-				 */
-extern	struct	lfile	*linkp; /*	pointer to first lfile structure
-				 *	containing an input REL file
-				 *	specification
-				 */
-extern	struct	lfile	*lfp;	/*	pointer to current lfile structure
-				 *	being processed by parse()
-				 */
-extern	struct	head	*headp; /*	The pointer to the first
-				 *	head structure of a linked list
-				 */
-extern	struct	head	*hp;	/*	Pointer to the current
-				 *	head structure
-				 */
-extern	struct	area	*areap; /*	The pointer to the first
-				 *	area structure of a linked list
-				 */
-extern	struct	area	*ap;	/*	Pointer to the current
-				 *	area structure
-				 */
-extern	struct	areax	*axp;	/*	Pointer to the current
-				 *	areax structure
-				 */
-extern	struct	sym *symhash[NHASH]; /* array of pointers to NHASH
-				      * linked symbol lists
-				      */
-extern	struct	base	*basep; /*	The pointer to the first
-				 *	base structure
-				 */
-extern	struct	base	*bsp;	/*	Pointer to the current
-				 *	base structure
-				 */
-extern	struct	globl	*globlp;/*	The pointer to the first
-				 *	globl structure
-				 */
-extern	struct	globl	*gsp;	/*	Pointer to the current
-				 *	globl structure
-				 */
-extern	struct	sdp	sdp;	/*	Base Paged structure
-				 */
-extern	struct	rerr	rerr;	/*	Structure containing the
-				 *	linker error information
-				 */
-extern	FILE	*ofp;		/*	Linker Output file handle
-				 */
+extern  char    *_abs_;         /*      = { ".  .ABS." };
+                                 */
+extern  int     lkerr;          /*      ASLink error flag
+                                 */
+extern  char    *ip;            /*      pointer into the REL file
+                                 *      text line in ib[]
+                                 */
+extern  char    ib[NINPUT];     /*      REL file text line
+                                 */
+extern  char    *rp;            /*      pointer into the LST file
+                                 *      text line in rb[]
+                                 */
+extern  char    rb[NINPUT];     /*      LST file text line being
+                                 *      address relocated
+                                 */
+extern  char    ctype[];        /*      array of character types, one per
+                                 *      ASCII character
+                                 */
+
+/*
+ *      Character Type Definitions
+ */
+#define SPACE   '\000'
+#define ETC     '\000'
+#define LETTER  '\001'
+#define DIGIT   '\002'
+#define BINOP   '\004'
+#define RAD2    '\010'
+#define RAD8    '\020'
+#define RAD10   '\040'
+#define RAD16   '\100'
+#define ILL     '\200'
+
+#define DGT2    DIGIT|RAD16|RAD10|RAD8|RAD2
+#define DGT8    DIGIT|RAD16|RAD10|RAD8
+#define DGT10   DIGIT|RAD16|RAD10
+#define LTR16   LETTER|RAD16
+
+extern  char    afspec[];       /*      The filespec created by afile()
+                                 */
+extern  char    ccase[];        /*      an array of characters which
+                                 *      perform the case translation function
+                                 */
+
+extern  struct  lfile   *filep; /*      The pointers (lfile *) filep,
+                                 *      (lfile *) cfp, and (FILE *) sfp
+                                 *      are used in conjunction with
+                                 *      the routine nxtline() to read
+                                 *      aslink commands from
+                                 *      (1) the standard input or
+                                 *      (2) or a command file
+                                 *      and to read the REL files
+                                 *      sequentially as defined by the
+                                 *      aslink input commands.
+                                 *
+                                 *      The pointer *filep points to the
+                                 *      beginning of a linked list of
+                                 *      lfile structures.
+                                 */
+extern  struct  lfile   *cfp;   /*      The pointer *cfp points to the
+                                 *      current lfile structure
+                                 */
+extern  struct  lfile   *startp;/*      aslink startup file structure
+                                 */
+extern  struct  lfile   *linkp; /*      pointer to first lfile structure
+                                 *      containing an input REL file
+                                 *      specification
+                                 */
+extern  struct  lfile   *lfp;   /*      pointer to current lfile structure
+                                 *      being processed by parse()
+                                 */
+extern  struct  head    *headp; /*      The pointer to the first
+                                 *      head structure of a linked list
+                                 */
+extern  struct  head    *hp;    /*      Pointer to the current
+                                 *      head structure
+                                 */
+extern  struct  bank    *bankp; /*      The pointer to the first
+                                 *      bank structure of a linked list
+                                 */
+extern  struct  bank    *bp;    /*      Pointer to the current
+                                 *      bank structure
+                                 */
+extern  struct  area    *areap; /*      The pointer to the first
+                                 *      area structure of a linked list
+                                 */
+extern  struct  area    *ap;    /*      Pointer to the current
+                                 *      area structure
+                                 */
+extern  struct  areax   *axp;   /*      Pointer to the current
+                                 *      areax structure
+                                 */
+extern  struct  sym *symhash[NHASH]; /* array of pointers to NHASH
+                                      * linked symbol lists
+                                      */
+extern  struct  base    *basep; /*      The pointer to the first
+                                 *      base structure
+                                 */
+extern  struct  base    *bsp;   /*      Pointer to the current
+                                 *      base structure
+                                 */
+extern  struct  globl   *globlp;/*      The pointer to the first
+                                 *      globl structure
+                                 */
+extern  struct  globl   *gsp;   /*      Pointer to the current
+                                 *      globl structure
+                                 */
+extern  struct  sdp     sdp;    /*      Base Paged structure
+                                 */
+extern  struct  rerr    rerr;   /*      Structure containing the
+                                 *      linker error information
+                                 */
+extern  FILE    *nbofp;         /*      Non Banked Linker Output
+                                 *      File Handle
+                                 */
+extern  FILE    *ofp;           /*      Linker Output file handle
+                                 */
 
 #if NOICE
-extern	FILE	*jfp;		/*	NoICE output file handle
-				 */
+extern  FILE    *jfp;           /*      NoICE output file handle
+                                 */
 #endif
 
-extern	FILE	*mfp;		/*	Map output file handle
-				 */
-extern	FILE	*rfp;		/*	File handle for output
-				 *	address relocated ASxxxx
-				 *	listing file
-				 */
-extern	FILE	*sfp;		/*	The file handle sfp points to the
-				 *	currently open file
-				 */
-extern	FILE	*tfp;		/*	File handle for input
-				 *	ASxxxx listing file
-				 */
+extern  FILE    *mfp;           /*      Map output file handle
+                                 */
+extern  FILE    *rfp;           /*      File handle for output
+                                 *      address relocated ASxxxx
+                                 *      listing file
+                                 */
+extern  FILE    *sfp;           /*      The file handle sfp points to the
+                                 *      currently open file
+                                 */
+extern  FILE    *tfp;           /*      File handle for input
+                                 *      ASxxxx listing file
+                                 */
 
 #if SDCDB
-extern	FILE	*yfp;		/*	SDCDB output file handle
-				 */
+extern  FILE    *yfp;           /*      SDCDB output file handle
+                                 */
 #endif
 
-extern	int	oflag;		/*	Output file type flag
-				 */
+extern  int     oflag;          /*      Output file type flag
+                                 */
+extern  int     objflg;         /*      Linked file/library object output flag
+                                 */
+
 #if NOICE
-extern	int	jflag;		/*	-j, enable NoICE Debug output
-				 */
+extern  int     jflag;          /*      -j, enable NoICE Debug output
+                                 */
 #endif
 
-extern	int	mflag;		/*	Map output flag
-				 */
-extern	int	xflag;		/*	Map file radix type flag
-				 */
+extern  int     mflag;          /*      Map output flag
+                                 */
+extern  int     xflag;          /*      Map file radix type flag
+                                 */
 
 #if SDCDB
-extern	int	yflag;		/*	-y, enable SDCC Debug output
-				 */
+extern  int     yflag;          /*      -y, enable SDCC Debug output
+                                 */
 #endif
 
-extern	int	pflag;		/*	print linker command file flag
-				 */
-extern	int	uflag;		/*	Listing relocation flag
-				 */
-extern	int	wflag;		/*	Enable wide format listing
-				 */
-extern	int	zflag;		/*	Disable symbol case sensitivity
-				 */
-extern	int	radix;		/*	current number conversion radix:
-				 *	2 (binary), 8 (octal), 10 (decimal),
-				 *	16 (hexadecimal)
-				 */
-extern	int	line;		/*	current line number
-				 */
-extern	int	page;		/*	current page number
-				 */
-extern	int	lop;		/*	current line number on page
-				 */
-extern	int	pass;		/*	linker pass number
-				 */
-extern	int	pcb;		/*	current bytes per pc word
-				 */
-extern	int	rtcnt;		/*	count of elements in the
-				 *	rtval[] and rtflg[] arrays
-				 */
-extern	a_uint	rtval[];	/*	data associated with relocation
-				 */
-extern	int	rtflg[];	/*	indicates if rtval[] value is
-				 *	to be sent to the output file.
-				 */
-extern	int	rterr[];	/*	indicates if rtval[] value should
-				 *	be flagged as a relocation error.
-				 */
-extern	char	rtbuf[];	/*	S19/IHX output buffer
-				 */
-				/*	rtbuf[] processing
-				 */
-extern	a_uint	rtadr0;		/*
-				 */
-extern	a_uint	rtadr1;		/*
-				 */
-extern	a_uint	rtadr2;		/*
-				 */
-extern	int	a_bytes;	/*	REL file T Line address length
-				 */
-extern	int	hilo;		/*	REL file byte ordering
-				 */
-extern	a_uint	a_mask;		/*	Address Mask
-				 */
-extern	a_uint	s_mask;		/*	Sign Mask
-				 */
-extern	a_uint	v_mask;		/*	Value Mask
-				 */
-extern	int	gline;		/*	LST file relocation active
-				 *	for current line
-				 */
-extern	int	gcntr;		/*	LST file relocation active
-				 *	counter
-				 */
-extern	struct lbpath *lbphead; /*	pointer to the first
-				 *	library path structure
-				 */
-extern	struct lbname *lbnhead; /*	pointer to the first
-				 *	library name structure
-				 */
-extern	struct lbfile *lbfhead; /*	pointer to the first
-				 *	library file structure
-				 */
+extern  int     pflag;          /*      print linker command file flag
+                                 */
+extern  int     uflag;          /*      Listing relocation flag
+                                 */
+extern  int     wflag;          /*      Enable wide format listing
+                                 */
+extern  int     zflag;          /*      Disable symbol case sensitivity
+                                 */
+extern  int     radix;          /*      current number conversion radix:
+                                 *      2 (binary), 8 (octal), 10 (decimal),
+                                 *      16 (hexadecimal)
+                                 */
+extern  int     line;           /*      current line number
+                                 */
+extern  int     page;           /*      current page number
+                                 */
+extern  int     lop;            /*      current line number on page
+                                 */
+extern  int     pass;           /*      linker pass number
+                                 */
+extern  a_uint  pc;             /*      current relocation address
+                                 */
+extern  int     pcb;            /*      current bytes per pc word
+                                 */
+extern  int     rtcnt;          /*      count of elements in the
+                                 *      rtval[] and rtflg[] arrays
+                                 */
+extern  a_uint  rtval[];        /*      data associated with relocation
+                                 */
+extern  int     rtflg[];        /*      indicates if rtval[] value is
+                                 *      to be sent to the output file.
+                                 */
+extern  int     rterr[];        /*      indicates if rtval[] value should
+                                 *      be flagged as a relocation error.
+                                 */
+extern  char    rtbuf[];        /*      S19/IHX output buffer
+                                 */
+extern  struct  bank *rtabnk;   /*      rtbuf[] processing
+                                 */
+extern  int     rtaflg;         /*      rtbuf[] processing
+                                 */
+extern  a_uint  rtadr0;         /*
+                                 */
+extern  a_uint  rtadr1;         /*
+                                 */
+extern  a_uint  rtadr2;         /*
+                                 */
+extern  int     obj_flag;       /*      Linked file/library object output flag
+                                 */
+extern  int     a_bytes;        /*      REL file T Line address length
+                                 */
+extern  int     hilo;           /*      REL file byte ordering
+                                 */
+extern  a_uint  a_mask;         /*      Address Mask
+                                 */
+extern  a_uint  s_mask;         /*      Sign Mask
+                                 */
+extern  a_uint  v_mask;         /*      Value Mask
+                                 */
+extern  int     gline;          /*      LST file relocation active
+                                 *      for current line
+                                 */
+extern  int     gcntr;          /*      LST file relocation active
+                                 *      counter
+                                 */
+extern  struct lbpath *lbphead; /*      pointer to the first
+                                 *      library path structure
+                                 */
+extern  struct lbname *lbnhead; /*      pointer to the first
+                                 *      library name structure
+                                 */
+extern  struct lbfile *lbfhead; /*      pointer to the first
+                                 *      library file structure
+                                 */
 /* sdld specific */
-extern	int	sflag;		/*	JCF: Memory usage output flag
-				 */
-extern	int	packflag;	/*	Pack data memory flag
-				 */
-extern	int	stacksize;	/*	Pack data memory flag
-				 */
-extern int	rflag;		/*	Extended linear address record flag.
-				*/
-extern	a_uint iram_size;	/*	internal ram size
-				 */
-extern	long xram_size;		/*	external ram size
-				 */
-extern	long code_size;		/*	code size
-				 */
-extern	char *sdld_output;	/*	output file name, --output argument
-				 */
+extern  int     sflag;          /*      JCF: Memory usage output flag
+                                 */
+extern  int     packflag;       /*      Pack data memory flag
+                                 */
+extern  int     stacksize;      /*      Pack data memory flag
+                                 */
+extern int      rflag;          /*      Extended linear address record flag.
+                                */
+extern  a_uint iram_size;       /*      internal ram size
+                                 */
+extern  long xram_size;         /*      external ram size
+                                 */
+extern  long code_size;         /*      code size
+                                 */
+extern  char *sdld_output;      /*      output file name, --output argument
+                                 */
 extern char *optsdcc;
 extern char *optsdcc_module;
 /* sdld 8015 specific */
-extern	char idatamap[];	/* 0:not used, 1:used
-				 */
+extern  char idatamap[];        /* 0:not used, 1:used
+                                 */
 /* end sdld 8051 specific */
 /* end sdld specific */
 
@@ -866,164 +1114,179 @@
 
 /* C Library function definitions */
 /* for reference only
-extern	VOID		exit();
-extern	int		fclose();
-extern	char *		fgets();
-extern	FILE *		fopen();
-extern	int		fprintf();
-extern	VOID		free();
-extern	VOID *		malloc();
-extern	char		putc();
-extern	char *		sprintf();
-extern	char *		strcpy();
-extern	int		strlen();
-extern	char *		strncpy();
-extern	char *		strrchr();
+extern  VOID            exit();
+extern  int             fclose();
+extern  char *          fgets();
+extern  FILE *          fopen();
+extern  int             fprintf();
+extern  VOID            free();
+extern  VOID *          malloc();
+extern  char            putc();
+extern  char *          sprintf();
+extern  char *          strcpy();
+extern  int             strlen();
+extern  char *          strncpy();
+extern  char *          strrchr();
 */
 
 /* Program function definitions */
 
-#ifdef	OTHERSYSTEM
+#ifdef  OTHERSYSTEM
 
 /* lkmain.c */
-extern	FILE *		afile(char *fn, char *ft, int wf);
-extern	VOID		bassav(void);
-extern	int		fndidx(char *str);
-extern	int		fndext(char *str);
-extern	VOID		gblsav(void);
-extern	int		intsiz(void);
-extern	VOID		iramsav(void);
-extern	VOID		xramsav(void);
-extern	VOID		codesav(void);
-extern	VOID		iramcheck(void);
-extern	VOID		link_main(void);
-extern	VOID		lkexit(int i);
-extern	int		main(int argc, char *argv[]);
-extern	VOID		map(void);
-extern	VOID		sym(void);
-extern	int		parse(void);
-extern	VOID		doparse(void);
-extern	VOID		setbas(void);
-extern	VOID		setgbl(void);
-extern	VOID		usage(int n);
-extern	VOID		copyfile (FILE *dest, FILE *src);
+extern  FILE *          afile(char *fn, char *ft, int wf);
+extern  VOID            bassav(void);
+extern  int             fndidx(char *str);
+extern  int             fndext(char *str);
+extern  VOID            gblsav(void);
+extern  int             intsiz(void);
+extern  VOID            iramsav(void);
+extern  VOID            xramsav(void);
+extern  VOID            codesav(void);
+extern  VOID            iramcheck(void);
+extern  VOID            link_main(void);
+extern  VOID            lkexit(int i);
+extern  int             main(int argc, char *argv[]);
+extern  VOID            map(void);
+extern  VOID            sym(void);
+extern  int             parse(void);
+extern  VOID            doparse(void);
+extern  VOID            setarea(void);
+extern  VOID            setgbl(void);
+extern  VOID            usage(int n);
+extern  VOID            copyfile (FILE *dest, FILE *src);
 
 /* lklex.c */
-extern	VOID		chopcrlf(char *str);
-extern	char		endline(void);
-extern	int		get(void);
-extern	VOID		getfid(char *str, int c);
-extern	VOID		getid(char *id, int c);
-extern	VOID		getSid(char *id);
-extern	int		getmap(int d);
-extern	int		getnb(void);
-extern	int		more(void);
-extern	int		nxtline(void);
-extern	VOID		skip(int c);
-extern	VOID		unget(int c);
+extern  VOID            chopcrlf(char *str);
+extern  char            endline(void);
+extern  int             get(void);
+extern  VOID            getfid(char *str, int c);
+extern  VOID            getid(char *id, int c);
+extern  VOID            getSid(char *id);
+extern  int             getmap(int d);
+extern  int             getnb(void);
+extern  int             more(void);
+extern  int             nxtline(void);
+extern  VOID            skip(int c);
+extern  VOID            unget(int c);
 
 /* lkarea.c */
-extern	VOID		lkparea(char *id);
-extern	VOID		lnkarea(void);
-extern	VOID		lnkarea2(void);
-extern	VOID		newarea(void);
+extern  VOID            lkparea(char *id);
+extern  VOID            lnkarea(void);
+extern  VOID            lnkarea2(void);
+extern  VOID            newarea(void);
 
 /* lkbank.c */
-extern	VOID		lkfclose(void);
-extern	VOID		lkfopen(void);
+extern  VOID            chkbank(FILE *fp);
+extern  VOID            lkfclose(void);
+extern  VOID            lkfopen(void);
+extern  VOID            lkpbank(char * id);
+extern  VOID            newbank(void);
+extern  VOID            setbank(void);
 
 /* lkhead.c */
-extern	VOID		module(void);
-extern	VOID		newhead(void);
+extern  VOID            module(void);
+extern  VOID            newhead(void);
+extern  VOID            newmode(void);
 
 /* lksym.c */
-extern	int		hash(char *p, int cflag);
-extern	struct	sym *	lkpsym(char *id, int f);
-extern	char *		new(unsigned int n);
-extern	struct	sym *	newsym(void);
-extern	char *		strsto(char *str);
-extern	VOID		symdef(FILE *fp);
-extern	int		symeq(char *p1, char *p2, int cflag);
-extern	VOID		syminit(void);
-extern	VOID		symmod(FILE *fp, struct sym *tsp);
-extern	a_uint		symval(struct sym *tsp);
+extern  int             hash(char *p, int cflag);
+extern  struct  sym *   lkpsym(char *id, int f);
+extern  char *          new(unsigned int n);
+extern  struct  sym *   newsym(void);
+extern  char *          strsto(char *str);
+extern  VOID            symdef(FILE *fp);
+extern  int             symeq(char *p1, char *p2, int cflag);
+extern  VOID            syminit(void);
+extern  VOID            symmod(FILE *fp, struct sym *tsp);
+extern  a_uint          symval(struct sym *tsp);
 
 /* lkeval.c */
-extern	int		digit(int c, int r);
-extern	a_uint		eval(void);
-extern	a_uint		expr(int n);
-extern	int		oprio(int c);
-extern	a_uint		term(void);
+extern  int             digit(int c, int r);
+extern  a_uint          eval(void);
+extern  a_uint          expr(int n);
+extern  int             oprio(int c);
+extern  a_uint          term(void);
 
 /* lklist.c */
-extern	int		dgt(int rdx, char *str, int n);
-extern	VOID		newpag(FILE *fp);
-extern	VOID		slew(struct area *xp);
-extern	VOID		lstarea(struct area *xp);
-extern	VOID		lkulist(int i);
-extern	VOID		lkalist(a_uint cpc);
-extern	VOID		lkglist(a_uint cpc, int v, int err);
+extern  int             dgt(int rdx, char *str, int n);
+extern  VOID            newpag(FILE *fp);
+extern  VOID            slew(struct area *xp, struct bank *yp);
+extern  VOID            lstarea(struct area *xp, struct bank *yp);
+extern  VOID            lkulist(int i);
+extern  VOID            lkalist(a_uint cpc);
+extern  VOID            lkglist(a_uint cpc, int v, int err);
 
 /* lknoice.c */
-extern	VOID		NoICEfopen(void);
-extern	VOID		DefineNoICE( char *name, a_uint value, int page );
-
+extern  VOID            NoICEfopen(void);
+extern  VOID            NoICEmagic(void);
+extern  VOID            DefineNoICE(char *name, a_uint value, struct bank *yp);
+extern  VOID            DefineGlobal(char *name, a_uint value, struct bank *yp);
+extern  VOID            DefineScoped(char *name, a_uint value, struct bank *yp);
+extern  VOID            DefineFile(char *name, a_uint value, struct bank *yp);
+extern  VOID            DefineFunction(char *name, a_uint value, struct bank *yp);
+extern  VOID            DefineStaticFunction(char *name, a_uint value, struct bank *yp);
+extern  VOID            DefineEndFunction(a_uint value, struct bank *yp);
+extern  VOID            DefineLine(char *lineString, a_uint value, struct bank *yp);
+extern  VOID            PagedAddress(a_uint value, struct bank *yp);
 
 /* lksdcdb.c */
-extern	VOID		SDCDBfopen(void);
-extern	VOID		SDCDBcopy(char * str);
-extern	VOID		DefineSDCDB(char *name, a_uint value);
+extern  VOID            SDCDBfopen(void);
+extern  VOID            SDCDBcopy(char * str);
+extern  VOID            DefineSDCDB(char *name, a_uint value);
 
 /* lkrloc.c */
-extern	a_uint		adb_b(a_uint v, int i);
-extern	a_uint		adb_bit(a_uint v, int i);
-extern	a_uint		adb_24_bit(a_uint v, int i);
-extern	a_uint		adb_24_hi(a_uint v, int i);
-extern	a_uint		adb_24_mid(a_uint v, int i);
-extern	a_uint		adb_24_lo(a_uint v, int i);
-extern	a_uint		adw_w(a_uint v, int i);
-extern	a_uint		adw_24(a_uint v, int i);
-extern	a_uint		adw_hi(a_uint v, int i);
-extern	a_uint		adw_lo(a_uint v, int i);
-extern	a_uint		evword(void);
-extern	VOID		prntval(FILE *fptr, a_uint v);
-extern	a_uint		adb_hi(a_uint  v, int i);
-extern	a_uint		adb_lo(a_uint  v, int i);
-extern	char *		errmsg[];
-extern	VOID		errdmp(FILE *fptr, char *str);
-extern	VOID		erpdmp(FILE *fptr, char *str);
-extern	VOID		rele(VOID);
-extern	VOID		reloc(char c);
-extern	VOID		relt(VOID);
-extern	VOID		relr(VOID);
-extern	VOID		relp(VOID);
-extern	VOID		relerr(char *str);
-extern	VOID		relerp(char *str);
-extern	int		lastExtendedAddress;
+extern  a_uint          adb_1b(a_uint v, int i);
+extern  a_uint          adb_2b(a_uint v, int i);
+extern  a_uint          adb_3b(a_uint v, int i);
+extern  a_uint          adb_4b(a_uint v, int i);
+extern  a_uint          adb_xb(a_uint v, int i);
+extern  a_uint          evword(void);
+extern  VOID            prntval(FILE *fptr, a_uint v);
+extern  VOID            reloc(int c);
+
+/* lkrloc3.c */
+extern  a_uint          adb_bit(a_uint v, int i);
+extern  a_uint          adb_24_bit(a_uint v, int i);
+extern  a_uint          adb_24_hi(a_uint v, int i);
+extern  a_uint          adb_24_mid(a_uint v, int i);
+extern  a_uint          adb_24_lo(a_uint v, int i);
+extern  a_uint          adb_hi(a_uint  v, int i);
+extern  a_uint          adb_lo(a_uint  v, int i);
+extern  char *          errmsg3[];
+extern  VOID            errdmp3(FILE *fptr, char *str);
+extern  VOID            erpdmp3(FILE *fptr, char *str);
+extern  VOID            rele3(void);
+extern  VOID            reloc3(int c);
+extern  VOID            relt3(void);
+extern  VOID            relr3(void);
+extern  VOID            relp3(void);
+extern  VOID            relerr3(char *str);
+extern  VOID            relerp3(char *str);
 
 /* lklibr.c */
-extern	int		addfile(char *path, char *libfil);
-extern	VOID		addlib(void);
-extern	VOID		addpath(void);
-extern	int		fndsym(char *name);
-extern	VOID		library(void);
-extern	VOID		loadfile(char *filspc);
-extern	VOID		search(void);
-
-/* lkihx.c */
-extern	VOID		ihx(int i);
-extern	VOID		iflush(void);
-/* sdld specific */
-extern	VOID		ihxExtendedLinearAddress(a_uint);
-extern	VOID		ihxNewArea();
-/* end sdld specific */
+extern  int             addfile(char *path, char *libfil);
+extern  VOID            addlib(void);
+extern  VOID            addpath(void);
+extern  int             fndsym(char *name);
+extern  VOID            library(void);
+extern  VOID            loadfile(char *filspc);
+extern  VOID            search(void);
+
+/* lkout.c */
+extern  VOID            lkout(int i);
+extern  VOID            lkflush(void);
+extern  VOID            ixx(int i);
+extern  VOID            iflush(void);
+extern  VOID            dbx(int i);
+extern  VOID            dflush(void);
 
 /* lks19.c */
-extern	VOID		s19(int i);
-extern	VOID		sflush(void);
+extern  VOID            s19(int i);
+extern  VOID            sflush(void);
 
 /* EEP: lkelf.c */
-extern	VOID		elf();
+extern  VOID            elf();
 
 /* JCF: lkmem.c */
 extern int summary(struct area * xp);
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/aslink.vcxproj sdcc-3.2.0+dfsg/sdas/linksrc/aslink.vcxproj
--- sdcc-3.1.0+dfsg/sdas/linksrc/aslink.vcxproj	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/aslink.vcxproj	2011-12-03 23:42:25.000000000 +0000
@@ -134,6 +134,8 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="lkbank.c" />
+    <ClCompile Include="lkout.c" />
+    <ClCompile Include="lkrloc3.c" />
     <ClCompile Include="lksdcdb.c" />
     <ClCompile Include="lk_readnl.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -183,12 +185,6 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="lkihx.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
     <ClCompile Include="lklex.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -277,7 +273,6 @@
   <ItemGroup>
     <ClInclude Include="aslink.h" />
     <ClInclude Include="asxxxx_config.h" />
-    <ClInclude Include="getline.h" />
     <ClInclude Include="lk_readnl.h" />
     <ClInclude Include="lkar.h" />
     <ClInclude Include="lklibr.h" />
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/aslink.vcxproj.filters sdcc-3.2.0+dfsg/sdas/linksrc/aslink.vcxproj.filters
--- sdcc-3.1.0+dfsg/sdas/linksrc/aslink.vcxproj.filters	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/aslink.vcxproj.filters	2011-12-03 23:42:25.000000000 +0000
@@ -35,9 +35,6 @@
     <ClCompile Include="lkhead.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="lkihx.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="lklex.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -86,6 +83,12 @@
     <ClCompile Include="lkbank.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="lkrloc3.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="lkout.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="aslink.h">
@@ -94,9 +97,6 @@
     <ClInclude Include="asxxxx_config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="getline.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="lk_readnl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/lkar.c sdcc-3.2.0+dfsg/sdas/linksrc/lkar.c
--- sdcc-3.1.0+dfsg/sdas/linksrc/lkar.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/lkar.c	2011-12-03 23:42:25.000000000 +0000
@@ -678,12 +678,10 @@
       if (lbnh->path != NULL)
         {
           strcpy (filspc, lbnh->path);
-#ifdef  OTHERSYSTEM
           if (*filspc != '\0' && (filspc[strlen (filspc) - 1] != '/') && (filspc[strlen (filspc) - 1] != LKDIRSEP))
             {
               strcat (filspc, LKDIRSEPSTR);
             }
-#endif
         }
 
       if (AR_IS_SYMBOL_TABLE (obj_name))
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/lkar.h sdcc-3.2.0+dfsg/sdas/linksrc/lkar.h
--- sdcc-3.1.0+dfsg/sdas/linksrc/lkar.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/lkar.h	2012-01-02 20:18:12.000000000 +0000
@@ -1,6 +1,6 @@
 /* lkar.h - ar library format handling
 
-   Copyright (C) 2008-2009 Borut Razem, borut dot razem at siol dot net
+   Copyright (C) 2008-2012 Borut Razem, borut dot razem at siol dot net
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -32,10 +32,14 @@
 #define sgetl(buf)  (((((((unsigned char)(buf)[0] << 8) + (unsigned char)(buf)[1]) << 8) + (unsigned char)(buf)[2]) << 8) + (unsigned char)(buf)[3])
 #define sputl(value, buf)  ((buf)[0] = (value) >> 24, (buf)[1] = (value) >> 16, (buf)[2] = (value) >> 8, (buf)[3] = (value))
 
-#define ARMAG   "!<arch>\n"           /* magic string */
+/* Note that the usual '\n' in magic strings may translate to different
+   characters, as allowed by ANSI.  '\012' has a fixed value, and remains
+   compatible with existing BSDish archives. */
+
+#define ARMAG   "!<arch>\012"         /* magic string */
 #define SARMAG  (sizeof (ARMAG) - 1)  /* length of magic string */
 
-#define ARFMAG  "`\n"                 /* header trailer string */
+#define ARFMAG  "`\012"               /* header trailer string */
 
 #define AR_NAME_OFFSET  0
 #define AR_NAME_LEN     16
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/lkarea.c sdcc-3.2.0+dfsg/sdas/linksrc/lkarea.c
--- sdcc-3.1.0+dfsg/sdas/linksrc/lkarea.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/lkarea.c	2012-03-17 06:13:59.000000000 +0000
@@ -1,330 +1,338 @@
-/* lkarea.c
+/* lkarea.c */
 
-   Copyright (C) 1989-1998 Alan R. Baldwin
-   721 Berkeley St., Kent, Ohio 44240
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+/*
+ *  Copyright (C) 1989-2009  Alan R. Baldwin
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ * Alan R. Baldwin
+ * 721 Berkeley St.
+ * Kent, Ohio  44240
+ */
 
 /*
- *	3-Nov-97 JLH:
- *			 - change lkparea to use a_type == 0 as "virgin area" flag
  * 02-Apr-98 JLH: add code to link 8051 data spaces
  */
 
 #include "aslink.h"
 
-/*)Module	lkarea.c
+/*)Module       lkarea.c
  *
- *	The module lkarea.c contains the functions which
- *	create and link together all area definitions read
- *	from the .rel file(s).
- *
- *	lkarea.c contains the following functions:
- *		VOID	lnkarea()
- *		VOID	lnksect()
- *		VOID	lkparea()
- *		VOID	newarea()
+ *      The module lkarea.c contains the functions which
+ *      create and link together all area definitions read
+ *      from the .rel file(s).
+ *
+ *      lkarea.c contains the following functions:
+ *              VOID    lnkarea()
+ *              VOID    lnksect()
+ *              VOID    lkparea()
+ *              VOID    newarea()
+ *              VOID    setarea()
  *
- *	lkarea.c contains no global variables.
+ *      lkarea.c contains no global variables.
  */
 
-/*)Function VOID	newarea()
+/*)Function VOID        newarea()
  *
- *	The function newarea() creates and/or modifies area
- *	and areax structures for each A directive read from
- *	the .rel file(s).  The function lkparea() is called
- *	to find the area structure associated with this name.
- *	If the area does not yet exist then a new area
- *	structure is created and linked to any existing
- *	linked area structures. The area flags are copied
- *	into the area flag variable.  For each occurence of
- *	an A directive an areax structure is created and
- *	linked to the areax structures associated with this
- *	area.  The size of this area section is placed into
- *	the areax structure.  The flag value for all subsequent
- *	area definitions for the same area are compared and
- *	flagged as an error if they are not identical.
- *	The areax structure created for every occurence of
- *	an A directive is loaded with a pointer to the base
- *	area structure and a pointer to the associated
- *	head structure.  And finally, a pointer to this
- *	areax structure is loaded into the list of areax
- *	structures in the head structure.  Refer to lkdata.c
- *	for details of the structures and their linkage.
- *
- *	local variables:
- *		areax **halp		pointer to an array of pointers
- *		int	i		counter, loop variable, value
- *		char	id[]		id string
- *		int	narea		number of areas in this head structure
- *		areax *	taxp		pointer to an areax structure
- *					to areax structures
- *
- *	global variables:
- *		area	*ap		Pointer to the current
- *				 	area structure
- *		areax	*axp		Pointer to the current
- *				 	areax structure
- *		head	*hp		Pointer to the current
- *				 	head structure
- *		int	lkerr		error flag
- *
- *	functions called:
- *		addr_t	eval()		lkeval.c
- *		VOID	exit()		c_library
- *		int	fprintf()	c_library
- *		VOID	getid()		lklex.c
- *		VOID	lkparea()	lkarea.c
- *		VOID	skip()		lklex.c
- *
- *	side effects:
- *		The area and areax structures are created and
- *		linked with the appropriate head structures.
- *		Failure to allocate area or areax structure
- *		space will terminate the linker.  Other internal
- *		errors most likely caused by corrupted .rel
- *		files will also terminate the linker.
+ *      The function newarea() creates and/or modifies area
+ *      and areax structures for each A directive read from
+ *      the .rel file(s).  The function lkparea() is called
+ *      to find the area structure associated with this name.
+ *      If the area does not yet exist then a new area
+ *      structure is created and linked to any existing
+ *      linked area structures. The area flags are copied
+ *      into the area flag variable.  For each occurence of
+ *      an A directive an areax structure is created and
+ *      linked to the areax structures associated with this
+ *      area.  The size of this area section is placed into
+ *      the areax structure.  The flag value for all subsequent
+ *      area definitions for the same area are compared and
+ *      flagged as an error if they are not identical.
+ *      The areax structure created for every occurence of
+ *      an A directive is loaded with a pointer to the base
+ *      area structure and a pointer to the associated
+ *      head structure.  And finally, a pointer to this
+ *      areax structure is loaded into the list of areax
+ *      structures in the head structure.  Refer to lkdata.c
+ *      for details of the structures and their linkage.
+ *
+ *      local variables:
+ *              areax **halp            pointer to an array of pointers
+ *              a_uint  i               value
+ *              char    id[]            id string
+ *              int     k               counter, loop variable
+ *              int     narea           number of areas in this head structure
+ *              areax * taxp            pointer to an areax structure
+ *                                      to areax structures
+ *
+ *      global variables:
+ *              area    *ap             Pointer to the current
+ *                                      area structure
+ *              areax   *axp            Pointer to the current
+ *                                      areax structure
+ *              head    *hp             Pointer to the current
+ *                                      head structure
+ *              int     lkerr           error flag
+ *
+ *      functions called:
+ *              a_uint  eval()          lkeval.c
+ *              VOID    exit()          c_library
+ *              int     fprintf()       c_library
+ *              VOID    getid()         lklex.c
+ *              VOID    lkparea()       lkarea.c
+ *              VOID    skip()          lklex.c
+ *
+ *      side effects:
+ *              The area and areax structures are created and
+ *              linked with the appropriate head structures.
+ *              Failure to allocate area or areax structure
+ *              space will terminate the linker.  Other internal
+ *              errors most likely caused by corrupted .rel
+ *              files will also terminate the linker.
  */
 
 /*
  * Create an area entry.
  *
- * A xxxxxx size nnnn flags mm
- *   |           |          |
- *   |           |          `--  ap->a_flag
- *   |           `------------- axp->a_size
- *   `-------------------------  ap->a_id
+ * A xxxxxx size nnnn flags mm bank n
+ *   |           |          |       |
+ *   |           |          |       `--  ap->a_bank
+ *   |           |          `----------  ap->a_flag
+ *   |           `--------------------- axp->a_size
+ *   `---------------------------------  ap->a_id
  *
  */
 VOID
-newarea()
+newarea(void)
 {
-	int i, narea;
-	struct areax *taxp;
-	struct areax **halp;
-	char id[NCPS];
-
-	/*
-	 * Create Area entry
-	 */
-	getid(id, -1);
-	lkparea(id);
-	/*
-	 * Evaluate area size
-	 */
-	skip(-1);
-	axp->a_size = eval();
-	/*
-	 * Evaluate flags
-	 */
-	skip(-1);
-	i = 0;
-	taxp = ap->a_axp;
-	while (taxp->a_axp) {
-		++i;
-		taxp = taxp->a_axp;
-	}
-	if (i == 0) {
-		ap->a_flag = eval();
-	} else {
-		i = eval();
-		if ((!is_sdld() || TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_GB) &&
-			i && (ap->a_flag != i)) {
-			fprintf(stderr, "Conflicting flags in area %8s\n", id);
-			lkerr++;
-		}
-	}
-	if (is_sdld() && !(TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_GB)) {
-		/*
-		 * Evaluate area address
-		 */
-		skip(-1);
-		axp->a_addr = eval();
-	}
-	/*
-	 * Place pointer in header area list
-	 */
-	if (headp == NULL) {
-		fprintf(stderr, "No header defined\n");
-		lkexit(1);
-	}
-	narea = hp->h_narea;
-	halp = hp->a_list;
-	for (i=0; i < narea ;++i) {
-		if (halp[i] == NULL) {
-			halp[i] = taxp;
-			return;
-		}
-	}
-	fprintf(stderr, "Header area list overflow\n");
-	lkexit(1);
+        a_uint i;
+        int k, narea;
+        struct areax *taxp;
+        struct areax **halp;
+        char id[NCPS];
+
+        if (headp == NULL) {
+                fprintf(stderr, "No header defined\n");
+                lkexit(ER_FATAL);
+        }
+        /*
+         * Create Area entry
+         */
+        getid(id, -1);
+        lkparea(id);
+        /*
+         * Evaluate area size
+         */
+        skip(-1);
+        axp->a_size = eval();
+        /*
+         * Evaluate flags
+         */
+        skip(-1);
+        i = 0;
+        taxp = ap->a_axp;
+        while (taxp->a_axp) {
+                ++i;
+                taxp = taxp->a_axp;
+        }
+        if (i == 0) {
+                ap->a_flag = eval();
+        } else {
+                i = eval();
+                if ((!is_sdld() || TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_GB) &&
+                        i && (ap->a_flag != i)) {
+                        fprintf(stderr, "Conflicting flags in area %8s\n", id);
+                        lkerr++;
+                }
+        }
+        if (is_sdld() && !(TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_GB)) {
+                /*
+                 * Evaluate area address
+                 */
+                skip(-1);
+                axp->a_addr = eval();
+        }
+        /*
+         * Place pointer in header area list
+         */
+        narea = hp->h_narea;
+        halp = hp->a_list;
+        for (k=0; k < narea ;++k) {
+                if (halp[k] == NULL) {
+                        halp[k] = taxp;
+                        return;
+                }
+        }
+        fprintf(stderr, "Header area list overflow\n");
+        lkexit(ER_FATAL);
 }
 
-/*)Function	VOID	lkparea(id)
+/*)Function     VOID    lkparea(id)
  *
- *		char *	id		pointer to the area name string
+ *              char *  id              pointer to the area name string
  *
- *	The function lkparea() searches the linked area structures
- *	for a name match.  If the name is not found then an area
- *	structure is created.  An areax structure is created and
- *	appended to the areax structures linked to the area structure.
- *	The associated base area and head structure pointers are
- *	loaded into the areax structure.
- *
- *	local variables:
- *		area *	tap		pointer to an area structure
- *		areax *	taxp		pointer to an areax structure
- *
- *	global variables:
- *		area	*ap		Pointer to the current
- *				 	area structure
- *		area	*areap		The pointer to the first
- *				 	area structure of a linked list
- *		areax	*axp		Pointer to the current
- *				 	areax structure
- *
- *	functions called:
- *		VOID *	new()		lksym()
- *		char *	strsto()	lksym.c
- *		int	symeq()		lksym.c
- *
- *	side effects:
- *		Area and/or areax structures are created.
- *		Failure to allocate space for created structures
- *		will terminate the linker.
+ *      The function lkparea() searches the linked area structures
+ *      for a name match.  If the name is not found then an area
+ *      structure is created.  An areax structure is created and
+ *      appended to the areax structures linked to the area structure.
+ *      The associated base area and head structure pointers are
+ *      loaded into the areax structure.
+ *
+ *      local variables:
+ *              area *  tap             pointer to an area structure
+ *              areax * taxp            pointer to an areax structure
+ *
+ *      global variables:
+ *              area    *ap             Pointer to the current
+ *                                      area structure
+ *              area    *areap          The pointer to the first
+ *                                      area structure of a linked list
+ *              areax   *axp            Pointer to the current
+ *                                      areax structure
+ *
+ *      functions called:
+ *              VOID *  new()           lksym()
+ *              char *  strsto()        lksym.c
+ *              int     symeq()         lksym.c
+ *
+ *      side effects:
+ *              Area and/or areax structures are created.
+ *              Failure to allocate space for created structures
+ *              will terminate the linker.
  */
 
 VOID
 lkparea(char *id)
 {
-	struct area *tap;
-	struct areax *taxp;
+        struct area *tap;
+        struct areax *taxp;
 
-	ap = areap;
-	axp = (struct areax *) new (sizeof(struct areax));
-	if (is_sdld() && !(TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_GB))
-		axp->a_addr = -1; /* default: no address yet */
-	while (ap) {
-		if (symeq(id, ap->a_id, 1)) {
-			taxp = ap->a_axp;
-			while (taxp->a_axp)
-				taxp = taxp->a_axp;
-			taxp->a_axp = axp;
-			axp->a_bap = ap;
-			axp->a_bhp = hp;
-			return;
-		}
-		ap = ap->a_ap;
-	}
-	ap = (struct area *) new (sizeof(struct area));
-	if (areap == NULL) {
-		areap = ap;
-	} else {
-		tap = areap;
-		while (tap->a_ap)
-			tap = tap->a_ap;
-		tap->a_ap = ap;
-	}
-	ap->a_axp = axp;
-	axp->a_bap = ap;
-	axp->a_bhp = hp;
-	ap->a_id = strsto(id);
-	if (is_sdld() && !(TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_GB))
-		ap->a_addr = 0;
+        ap = areap;
+        axp = (struct areax *) new (sizeof(struct areax));
+        if (is_sdld() && !(TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_GB))
+                axp->a_addr = -1; /* default: no address yet */
+        while (ap) {
+                if (symeq(id, ap->a_id, 1)) {
+                        taxp = ap->a_axp;
+                        while (taxp->a_axp)
+                                taxp = taxp->a_axp;
+                        taxp->a_axp = axp;
+                        axp->a_bap = ap;
+                        axp->a_bhp = hp;
+                        return;
+                }
+                ap = ap->a_ap;
+        }
+        ap = (struct area *) new (sizeof(struct area));
+        if (areap == NULL) {
+                areap = ap;
+        } else {
+                tap = areap;
+                while (tap->a_ap)
+                        tap = tap->a_ap;
+                tap->a_ap = ap;
+        }
+        ap->a_axp = axp;
+        axp->a_bap = ap;
+        axp->a_bhp = hp;
+        ap->a_id = strsto(id);
+        if (is_sdld() && !(TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_GB))
+                ap->a_addr = 0;
 }
 
-/*)Function	VOID	lnkarea()
+/*)Function     VOID    lnkarea()
  *
- *	The function lnkarea() resolves all area addresses.
- *	The function evaluates each area structure (and all
- *	the associated areax structures) in sequence.  The
- *	linking process supports four (4) possible area types:
- *
- *	ABS/OVR	-	All sections (each individual areax
- *			section) starts at the identical base
- *			area address overlaying all other
- *			areax sections for this area.  The
- *			size of the area is largest of the area
- *			sections.
- *
- *	ABS/CON -	All sections (each individual areax
- *			section) are concatenated with the
- *			first section starting at the base
- *			area address.  The size of the area
- *			is the sum of the section sizes.
- *
- *	NOTE:		Multiple absolute (ABS) areas are
- *			never concatenated with each other,
- *			thus absolute area A and absolute area
- *			B will overlay each other if they begin
- *			at the same location (the default is
- *			always address 0 for absolute areas).
- *
- *	REL/OVR	-	All sections (each individual areax
- *			section) starts at the identical base
- *			area address overlaying all other
- *			areax sections for this area.  The
- *			size of the area is largest of the area
- *			sections.
- *
- *	REL/CON -	All sections (each individual areax
- *			section) are concatenated with the
- *			first section starting at the base
- *			area address.  The size of the area
- *			is the sum of the section sizes.
- *
- *		NOTE:	Relocatable (REL) areas are always concatenated
- *			with each other, thus relocatable area B
- *			(defined after area A) will follow
- *			relocatable area A independent of the
- *			starting address of area A.  Within a
- *			specific area each areax section may be
- *			overlayed or concatenated with other
- *			areax sections.
- *
- *
- *	If a base address for an area is specified then the
- *	area will start at that address.  Any relocatable
- *	areas defined subsequently will be concatenated to the
- *	previous relocatable area if it does not have a base
- *	address specified.
- *
- *	The names s_<areaname> and l_<areaname> are created to
- *	define the starting address and length of each area.
- *
- *	local variables:
- *		a_uint	rloc		;current relocation address
- *		char	temp[]		;temporary string
- *		struct symbol	*sp	;symbol structure
- *
- *	global variables:
- *		area	*ap		Pointer to the current
- *				 	area structure
- *		area	*areap		The pointer to the first
- *				 	area structure of a linked list
- *
- *	functions called:
- *		int	fprintf()	c_library
- *		VOID	lnksect()	lkarea.c
- *		symbol *lkpsym()	lksysm.c
- *		char *	strncpy()	c_library
- *		int	symeq()		lksysm.c
- *
- *	side effects:
- *		All area and areax addresses and sizes are
- *		determined and saved in their respective
- *		structures.
+ *      The function lnkarea() resolves all area addresses.
+ *      The function evaluates each area structure (and all
+ *      the associated areax structures) in sequence.  The
+ *      linking process supports four (4) possible area types:
+ *
+ *      ABS/OVR -       All sections (each individual areax
+ *                      section) starts at the identical base
+ *                      area address overlaying all other
+ *                      areax sections for this area.  The
+ *                      size of the area is largest of the area
+ *                      sections.
+ *
+ *      ABS/CON -       All sections (each individual areax
+ *                      section) are concatenated with the
+ *                      first section starting at the base
+ *                      area address.  The size of the area
+ *                      is the sum of the section sizes.
+ *
+ *      NOTE:           Multiple absolute (ABS) areas are
+ *                      never concatenated with each other,
+ *                      thus absolute area A and absolute area
+ *                      B will overlay each other if they begin
+ *                      at the same location (the default is
+ *                      always address 0 for absolute areas).
+ *
+ *      REL/OVR -       All sections (each individual areax
+ *                      section) starts at the identical base
+ *                      area address overlaying all other
+ *                      areax sections for this area.  The
+ *                      size of the area is largest of the area
+ *                      sections.
+ *
+ *      REL/CON -       All sections (each individual areax
+ *                      section) are concatenated with the
+ *                      first section starting at the base
+ *                      area address.  The size of the area
+ *                      is the sum of the section sizes.
+ *
+ *              NOTE:   Relocatable (REL) areas are always concatenated
+ *                      with each other, thus relocatable area B
+ *                      (defined after area A) will follow
+ *                      relocatable area A independent of the
+ *                      starting address of area A.  Within a
+ *                      specific area each areax section may be
+ *                      overlayed or concatenated with other
+ *                      areax sections.
+ *
+ *
+ *      If a base address for an area is specified then the
+ *      area will start at that address.  Any relocatable
+ *      areas defined subsequently will be concatenated to the
+ *      previous relocatable area if it does not have a base
+ *      address specified.
+ *
+ *      The names s_<areaname> and l_<areaname> are created to
+ *      define the starting address and length of each area.
+ *
+ *      local variables:
+ *              a_uint  rloc            ;current relocation address
+ *              char    temp[]          ;temporary string
+ *              struct symbol   *sp     ;symbol structure
+ *
+ *      global variables:
+ *              area    *ap             Pointer to the current
+ *                                      area structure
+ *              area    *areap          The pointer to the first
+ *                                      area structure of a linked list
+ *
+ *      functions called:
+ *              int     fprintf()       c_library
+ *              VOID    lnksect()       lkarea.c
+ *              symbol *lkpsym()        lksysm.c
+ *              char *  strncpy()       c_library
+ *              int     symeq()         lksysm.c
+ *
+ *      side effects:
+ *              All area and areax addresses and sizes are
+ *              determined and saved in their respective
+ *              structures.
  */
 
 /* sdld6808 specific */
@@ -334,355 +342,420 @@
 VOID lnksect(struct area *tap);
 /* end sdld specific */
 /*
- * Resolve all area addresses.
+ * Resolve all bank/area addresses.
  */
 VOID
-lnkarea()
+lnkarea(void)
 {
-	/* sdld specific */
-	a_uint rloc[4] = { 0, 0, 0, 0 };
-	int  locIndex;
-	/* end sdld specific */
-	/* sdld8051 & sdld6808 specific */
-	/*JCF: used to save the REG_BANK_[0-3] and SBIT_BYTES area pointers*/
-	struct area *ta[5];
-	int j;
-	/* end sdld8051 & sdld6808 specific */
-	/* sdld6800 specific */
-	a_uint gs_size = 0;
-	struct area *abs_ap = NULL;
-	struct area *gs0_ap = NULL;
-	/* end sdld6800 specific */
-	char temp[NCPS+2];
-	struct sym *sp;
-
-	if (TARGET_IS_6808) {
-		memset(codemap6808, 0, sizeof(codemap6808));
-
-		/* first sort all absolute areas to the front */
-		ap = areap;
-		/* no need to check first area, it's in front anyway */
-		while (ap && ap->a_ap) {
-			if (ap->a_ap->a_flag & A3_ABS)
-			{/* next area is absolute, move it to front,
-				reversed sequence is no problem for absolutes */
-				abs_ap = ap->a_ap;
-				ap->a_ap = abs_ap->a_ap;
-				abs_ap->a_ap = areap;
-				areap = abs_ap;
-			}
-			else {
-				ap = ap->a_ap;
-			}
-		}
-
-		/* next accumulate all GSINITx/GSFINAL area sizes
-		   into GSINIT so they stay together */
-		ap = areap;
-		while (ap) {
-			if (!strncmp(ap->a_id, "GS", 2))
-			{/* GSxxxxx area */
-				if (ap->a_size == 0)
-				{
-					axp = ap->a_axp;
-					while (axp)
-					{
-						ap->a_size += axp->a_size;
-						axp = axp->a_axp;
-					}
-				}
-				gs_size += ap->a_size;
-				if (!strcmp(ap->a_id, "GSINIT0"))
-				{/* GSINIT0 area */
-					gs0_ap = ap;
-				}
-			}
-			ap = ap->a_ap;
-		}
-		if (gs0_ap)
-			gs0_ap->a_size = gs_size;
-	}
-
-   ap = areap;
-   while (ap) {
-		if (ap->a_flag&A3_ABS) {
-			/*
-			 * Absolute sections
-			 */
-			lnksect(ap);
-		} else {
-			/* sdld specific */
-			/* Determine memory space */
-			locIndex = 0;
-			if ((TARGET_IS_8051)) {
-				if (ap->a_flag & A_CODE) {
-					locIndex = 1;
-				}
-				if (ap->a_flag & A_XDATA) {
-					locIndex = 2;
-				}
-				if (ap->a_flag & A_BIT) {
-					locIndex = 3;
-				}
-			}
-			/*
-			 * Relocatable sections
-			 */
-			if (!is_sdld() || TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_GB) {
-				if (ap->a_addr == 0)
-					ap->a_addr = rloc[locIndex];
-			}
-			else if (ap->a_type == 0) {  /* JLH */
-				if (TARGET_IS_6808 && ap->a_flag & A_NOLOAD) {
-					locIndex = 2;
-					ap->a_addr = 0;
-				}
-				else {
-					ap->a_addr = rloc[locIndex];
-				}
-				ap->a_type = 1;
-			}
-			lnksect(ap);
-			rloc[ locIndex ] = ap->a_addr + ap->a_size;
-			/* end sdld specific */
-		}
-
-		/*
-		 * Create symbols called:
-		 *	s_<areaname>	the start address of the area
-		 *	l_<areaname>	the length of the area
-		 */
-
-		if (! symeq(ap->a_id, _abs_, 1)) {
-			strcpy(temp+2, ap->a_id);
-			*(temp+1) = '_';
-
-			*temp = 's';
-			sp = lkpsym(temp, 1);
-			sp->s_addr = ap->a_addr ;
-			if (!is_sdld() || TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_GB)
-				sp->s_axp = NULL;
-			sp->s_type |= S_DEF;
-
-			*temp = 'l';
-			sp = lkpsym(temp, 1);
-			sp->s_addr = ap->a_size;
-			sp->s_axp = NULL;
-			sp->s_type |= S_DEF;
-		}
-
-		if (is_sdld() && !(TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_GB)) {
-			/*JCF: Since area BSEG is defined just before BSEG_BYTES, use the bit size of BSEG
-			to compute the byte size of BSEG_BYTES: */
-			if (!strcmp(ap->a_id, "BSEG")) {
-				if (TARGET_IS_8051)
-					ap->a_ap->a_axp->a_size += ((ap->a_addr + ap->a_size + 7)/8); /*Bits to bytes*/
-				else
-					ap->a_ap->a_axp->a_size=(ap->a_addr/8)+((ap->a_size+7)/8); /*Bits to bytes*/
-			}
-			else if (!strcmp(ap->a_id, "REG_BANK_0")) ta[0]=ap;
-			else if (!strcmp(ap->a_id, "REG_BANK_1")) ta[1]=ap;
-			else if (!strcmp(ap->a_id, "REG_BANK_2")) ta[2]=ap;
-			else if (!strcmp(ap->a_id, "REG_BANK_3")) ta[3]=ap;
-			else if (!strcmp(ap->a_id, "BSEG_BYTES"))
-			{
-				ta[4]=ap;
-				for(j=4; j>1; j--)
-				{
-					/*If upper register banks are not used roll back the relocation counter*/
-					if ( (ta[j]->a_size==0) && (ta[j-1]->a_size==0) )
-					{
-						rloc[0]-=8;
-					}
-					else break;
-				}
-			}
-		}
-		ap = ap->a_ap;
-	}
+        /* sdld specific */
+        a_uint rloc[4] = { 0, 0, 0, 0 };
+        int  locIndex;
+        /* end sdld specific */
+        /* sdld8051 & sdld6808 specific */
+        /*JCF: used to save the REG_BANK_[0-3] and SBIT_BYTES area pointers*/
+        struct area *ta[5];
+        int j;
+        /* end sdld8051 & sdld6808 specific */
+        /* sdld6800 specific */
+        a_uint gs_size = 0;
+        struct area *abs_ap = NULL;
+        struct area *gs0_ap = NULL;
+        /* end sdld6800 specific */
+        char temp[NCPS+2];
+        struct sym *sp;
+
+        if (TARGET_IS_6808) {
+                memset(codemap6808, 0, sizeof(codemap6808));
+
+                /* first sort all absolute areas to the front */
+                ap = areap;
+                /* no need to check first area, it's in front anyway */
+                while (ap && ap->a_ap) {
+                        if (ap->a_ap->a_flag & A3_ABS)
+                        {/* next area is absolute, move it to front,
+                                reversed sequence is no problem for absolutes */
+                                abs_ap = ap->a_ap;
+                                ap->a_ap = abs_ap->a_ap;
+                                abs_ap->a_ap = areap;
+                                areap = abs_ap;
+                        }
+                        else {
+                                ap = ap->a_ap;
+                        }
+                }
+
+                /* next accumulate all GSINITx/GSFINAL area sizes
+                   into GSINIT so they stay together */
+                ap = areap;
+                while (ap) {
+                        if (!strncmp(ap->a_id, "GS", 2))
+                        {/* GSxxxxx area */
+                                if (ap->a_size == 0)
+                                {
+                                        axp = ap->a_axp;
+                                        while (axp)
+                                        {
+                                                ap->a_size += axp->a_size;
+                                                axp = axp->a_axp;
+                                        }
+                                }
+                                gs_size += ap->a_size;
+                                if (!strcmp(ap->a_id, "GSINIT0"))
+                                {/* GSINIT0 area */
+                                        gs0_ap = ap;
+                                }
+                        }
+                        ap = ap->a_ap;
+                }
+                if (gs0_ap)
+                        gs0_ap->a_size = gs_size;
+        }
+
+        ap = areap;
+        while (ap) {
+                if (ap->a_flag & A3_ABS) {
+                        /*
+                         * Absolute sections
+                         */
+                        lnksect(ap);
+                } else {
+                        /* sdld specific */
+                        /* Determine memory space */
+                        locIndex = 0;
+                        if ((TARGET_IS_8051)) {
+                                if (ap->a_flag & A_CODE) {
+                                        locIndex = 1;
+                                }
+                                if (ap->a_flag & A_XDATA) {
+                                        locIndex = 2;
+                                }
+                                if (ap->a_flag & A_BIT) {
+                                        locIndex = 3;
+                                }
+                        }
+                        /*
+                         * Relocatable sections
+                         */
+                        if (!is_sdld() || TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_GB) {
+                                if (ap->a_addr == 0)
+                                        ap->a_addr = rloc[locIndex];
+                        }
+                        else if (ap->a_bset == 0) {
+                                if (TARGET_IS_6808 && ap->a_flag & A_NOLOAD) {
+                                        locIndex = 2;
+                                        ap->a_addr = 0;
+                                }
+                                else {
+                                        ap->a_addr = rloc[locIndex];
+                                }
+                                ap->a_bset = 1;
+                        }
+                        lnksect(ap);
+                        rloc[ locIndex ] = ap->a_addr + ap->a_size;
+                        /* end sdld specific */
+                }
+
+                /*
+                 * Create symbols called:
+                 *      s_<areaname>    the start address of the area
+                 *      l_<areaname>    the length of the area
+                 */
+
+                if (! symeq(ap->a_id, _abs_, 1)) {
+                        strcpy(temp+2, ap->a_id);
+                        *(temp+1) = '_';
+
+                        *temp = 's';
+                        sp = lkpsym(temp, 1);
+                        sp->s_addr = ap->a_addr;
+                        if (!is_sdld() || TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_GB)
+                                sp->s_axp = NULL;
+                        sp->s_type |= S_DEF;
+
+                        *temp = 'l';
+                        sp = lkpsym(temp, 1);
+                        sp->s_addr = ap->a_size;
+                        sp->s_axp = NULL;
+                        sp->s_type |= S_DEF;
+                }
+
+                if (is_sdld() && !(TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_GB)) {
+                        /*JCF: Since area BSEG is defined just before BSEG_BYTES, use the bit size of BSEG
+                        to compute the byte size of BSEG_BYTES: */
+                        if (!strcmp(ap->a_id, "BSEG")) {
+                                if (TARGET_IS_8051)
+                                        ap->a_ap->a_axp->a_size += ((ap->a_addr + ap->a_size + 7)/8); /*Bits to bytes*/
+                                else
+                                        ap->a_ap->a_axp->a_size=(ap->a_addr/8)+((ap->a_size+7)/8); /*Bits to bytes*/
+                        }
+                        else if (!strcmp(ap->a_id, "REG_BANK_0")) ta[0]=ap;
+                        else if (!strcmp(ap->a_id, "REG_BANK_1")) ta[1]=ap;
+                        else if (!strcmp(ap->a_id, "REG_BANK_2")) ta[2]=ap;
+                        else if (!strcmp(ap->a_id, "REG_BANK_3")) ta[3]=ap;
+                        else if (!strcmp(ap->a_id, "BSEG_BYTES"))
+                        {
+                                ta[4]=ap;
+                                for(j=4; j>1; j--)
+                                {
+                                        /*If upper register banks are not used roll back the relocation counter*/
+                                        if ( (ta[j]->a_size==0) && (ta[j-1]->a_size==0) )
+                                        {
+                                                rloc[0]-=8;
+                                        }
+                                        else break;
+                                }
+                        }
+                }
+                ap = ap->a_ap;
+        }
 }
 
 /* sdld specific */
 static
 a_uint find_empty_space(a_uint start, a_uint size, char *id, unsigned long *map, unsigned int map_size)
 {
-	int i, j, k;
-	unsigned long mask, b;
-
-	while (1) {
-		a_uint a = start;
-		i = start >> 5;
-		j = (start + size) >> 5;
-		mask = -(1 << (start & 0x1F));
-
-		if (j >= map_size) {
-			fprintf(stderr, "internal memory limit is exceeded for %s; memory size = 0x%06X, address = 0x%06X\n", id, map_size << 5, start + size - 1);
-		}
-		else {
-			while (i < j) {
-				if (map[i] & mask) {
-					k = 32;
-					for (b=0x80000000; b!=0; b>>=1, k--) {
-						if (map[i] & b)
-							break;
-					}
-					start = a + k;
-					break;
-				}
-				i++;
-				mask = 0xFFFFFFFF;
-				a += 32;
-			}
-			if (start > a)
-				continue;
-
-			mask &= (1 << ((start + size) & 0x1F)) - 1;
-			if (map[i] & mask) {
-				k = 32;
-				for (b=0x80000000; b!=0; b>>=1, k--) {
-					if (map[i] & b)
-						break;
-				}
-				start = (a & ~0x1F) + k;
-			}
-			if (start <= a)
-				break;
-		}
-	}
-	return start;
+        a_uint i, j, k;
+        unsigned long mask, b;
+        map_size /= sizeof(*map); /* Convert from bytes to number of elements */
+
+        while (1) {
+                a_uint a = start;
+                i = start >> 5;
+                j = (start + size) >> 5;
+                mask = -(1 << (start & 0x1F));
+
+                if (j > map_size) {
+                        fprintf(stderr, "internal memory limit is exceeded for %s; memory size = 0x%06X, address = 0x%06X\n", id, map_size << 5, start + size - 1);
+                        break;
+                }
+                else {
+                        while (i < j) {
+                                if (map[i] & mask) {
+                                        k = 32;
+                                        for (b=0x80000000; b!=0; b>>=1, k--) {
+                                                if (map[i] & b)
+                                                        break;
+                                        }
+                                        start = a + k;
+                                        break;
+                                }
+                                i++;
+                                mask = 0xFFFFFFFF;
+                                a += 32;
+                        }
+                        if (start > a)
+                                continue;
+
+                        mask &= (1 << ((start + size) & 0x1F)) - 1;
+                        if (i < map_size && map[i] & mask) {
+                                k = 32;
+                                for (b=0x80000000; b!=0; b>>=1, k--) {
+                                        if (map[i] & b)
+                                                break;
+                                }
+                                start = (a & ~0x1F) + k;
+                        }
+                        if (start <= a)
+                                break;
+                }
+        }
+        return start;
 }
 
 static
 a_uint allocate_space(a_uint start, a_uint size, char *id, unsigned long *map,  unsigned int map_size)
 {
-	int i, j;
-	unsigned long mask;
-	a_uint a = start;
-	i = start >> 5;
-	j = (start + size) >> 5;
-	mask = -(1 << (start & 0x1F));
-
-	if (j >= map_size) {
-		fprintf(stderr, "internal memory limit is exceeded for %s; memory size = 0x%06X, address = 0x%06X\n", id, map_size << 5, start + size - 1);
-	}
-	else {
-		while (i < j) {
-			if (map[i] & mask) {
-				fprintf(stderr, "memory overlap near 0x%X for %s\n", a, id);
-			}
-			map[i++] |= mask;
-			mask = 0xFFFFFFFF;
-			a += 32;
-		}
-		mask &= (1 << ((start + size) & 0x1F)) - 1;
-		if (map[i] & mask) {
-			fprintf(stderr, "memory overlap near 0x%X for %s\n", a, id);
-		}
-		map[i] |= mask;
-	}
-	return start;
+        a_uint i, j;
+        unsigned long mask;
+        a_uint a = start;
+        i = start >> 5;
+        j = (start + size) >> 5;
+        mask = -(1 << (start & 0x1F));
+        map_size /= sizeof(*map); /* Convert from bytes to number of elements */
+
+        if (j > map_size) {
+                fprintf(stderr, "internal memory limit is exceeded for %s; memory size = 0x%06X, address = 0x%06X\n", id, map_size << 5, start + size - 1);
+        }
+        else {
+                while (i < j) {
+                        if (map[i] & mask) {
+                                fprintf(stderr, "memory overlap near 0x%X for %s\n", a, id);
+                        }
+                        map[i++] |= mask;
+                        mask = 0xFFFFFFFF;
+                        a += 32;
+                }
+                mask &= (1 << ((start + size) & 0x1F)) - 1;
+                if (i < map_size && map[i] & mask) {
+                        fprintf(stderr, "memory overlap near 0x%X for %s\n", a, id);
+                }
+                map[i] |= mask;
+        }
+        return start;
 }
 /* end sdld specific */
 
-/*)Function VOID	lnksect()
+/*)Function VOID        lnksect(tap)
  *
- *		area *	tap			pointer to an area structure
+ *              area *  tap                     pointer to an area structure
  *
- *	The function lnksect() is the function called by
- *	lnkarea() to resolve the areax addresses.  Refer
- *	to the function lnkarea() for more detail. Pageing
- *	boundary and length errors will be reported by this
- *	function.
- *
- *	local variables:
- *		a_uint	size		size of area
- *		a_uint	addr		address of area
- *		areax * taxp		pointer to an areax structure
- *
- *	global variables:
- *		int		lkerr		error flag
- *
- *	functions called:
- *		none
- *
- *	side effects:
- *		All area and areax addresses and sizes area determined
- *		and linked into the structures.
+ *      The function lnksect() is the function called by
+ *      lnkarea() to resolve the areax addresses.  Refer
+ *      to the function lnkarea() for more detail. Pageing
+ *      boundary and length errors will be reported by this
+ *      function.
+ *
+ *      local variables:
+ *              a_uint  size            size of area
+ *              a_uint  addr            address of area
+ *              areax * taxp            pointer to an areax structure
+ *
+ *      global variables:
+ *              int             lkerr           error flag
+ *
+ *      functions called:
+ *              none
+ *
+ *      side effects:
+ *              All area and areax addresses and sizes are determined
+ *              and linked into the structures.
  */
 
 VOID
 lnksect(struct area *tap)
 {
-	a_uint size, addr;
-	struct areax *taxp;
+        a_uint size, addr;
+        struct areax *taxp;
+
+        size = 0;
+        addr = tap->a_addr;
+        taxp = tap->a_axp;
+        if (tap->a_flag & A3_OVR) {
+                /*
+                 * Overlayed sections
+                 */
+                while (taxp) {
+                        taxp->a_addr = addr;
+                        if (taxp->a_size > size)
+                                size = taxp->a_size;
+                        taxp = taxp->a_axp;
+                }
+        } else if (TARGET_IS_6808 && tap->a_flag & A3_ABS) {
+                /*
+                 * Absolute sections
+                 */
+                while (taxp) {
+                        allocate_space(taxp->a_addr, taxp->a_size, tap->a_id, codemap6808, sizeof (codemap6808));
+                        taxp->a_addr = 0; /* reset to zero so relative addresses become absolute */
+                        size += taxp->a_size;
+                        taxp = taxp->a_axp;
+                }
+        } else {
+                /*
+                 * Concatenated sections
+                 */
+                if (TARGET_IS_6808 && tap->a_size) {
+                        addr = find_empty_space(addr, tap->a_size, tap->a_id, codemap6808, sizeof (codemap6808));
+                }
+                while (taxp) {
+                        /* find next unused address now */
+                        if (TARGET_IS_6808 && taxp->a_size) {
+                                addr = find_empty_space(addr, taxp->a_size, tap->a_id, codemap6808, sizeof (codemap6808));
+                                allocate_space(addr, taxp->a_size, tap->a_id, codemap6808, sizeof (codemap6808));
+                        }
+                        taxp->a_addr = addr;
+                        addr += taxp->a_size;
+                        size += taxp->a_size;
+                        taxp = taxp->a_axp;
+                }
+        }
+        tap->a_size = size;
+        if ((tap->a_flag & A3_PAG) && (size > 256)) {
+                fprintf(stderr,
+                        "\n?ASlink-Warning-Paged Area %s Length Error\n",
+                        tap->a_id);
+                lkerr++;
+        }
+        if (TARGET_IS_8051 &&
+                (tap->a_flag & A3_PAG) && (tap->a_size) &&
+                ((tap->a_addr & 0xFFFFFF00) != ((addr-1) & 0xFFFFFF00)))
+        {
+                fprintf(stderr,
+                        "\n?ASlink-Warning-Paged Area %s Boundary Error\n",
+                        tap->a_id);
+                lkerr++;
+        }
+}
+
+
+/*)Function     VOID    setarea()
+ *
+ *      The function setarea() scans the base address lines in the
+ *      basep structure, evaluates the arguments, and sets the beginning
+ *      address of the specified areas.
+ *
+ *      local variables:
+ *              a_uint  v               expression value
+ *              char    id[]            base id string
+ *
+ *      global variables:
+ *              area    *ap             Pointer to the current
+ *                                      area structure
+ *              area    *areap          The pointer to the first
+ *                                      area structure of a linked list
+ *              base    *basep          The pointer to the first
+ *                                      base structure
+ *              base    *bsp            Pointer to the current
+ *                                      base structure
+ *              char    *ip             pointer into the REL file
+ *                                      text line in ib[]
+ *              int     lkerr           error flag
+ *
+ *       functions called:
+ *              a_uint  expr()          lkeval.c
+ *              int     fprintf()       c_library
+ *              VOID    getid()         lklex.c
+ *              int     getnb()         lklex.c
+ *              int     symeq()         lksym.c
+ *
+ *      side effects:
+ *              The base address of an area is set.
+ */
+
+VOID
+setarea(void)
+{
+        a_uint v;
+        char id[NCPS];
 
-	size = 0;
-	addr = tap->a_addr;
-	if (!TARGET_IS_8051 &&
-		(tap->a_flag&A3_PAG) && (addr & 0xFF)) {
-		fprintf(stderr,
-			"\n?ASlink-Warning-Paged Area %s Boundary Error\n",
-			tap->a_id);
-		lkerr++;
-	}
-	taxp = tap->a_axp;
-	if (tap->a_flag&A3_OVR) {
-		/*
-		 * Overlayed sections
-		 */
-		while (taxp) {
-			taxp->a_addr = addr;
-			if (taxp->a_size > size)
-				size = taxp->a_size;
-			taxp = taxp->a_axp;
-		}
-	} else if (TARGET_IS_6808 && tap->a_flag & A3_ABS) {
-		/*
-		 * Absolute sections
-		 */
-		while (taxp) {
-			allocate_space(taxp->a_addr, taxp->a_size, tap->a_id, codemap6808, sizeof (codemap6808));
-			taxp->a_addr = 0; /* reset to zero so relative addresses become absolute */
-			size += taxp->a_size;
-			taxp = taxp->a_axp;
-		}
-	} else {
-		/*
-		 * Concatenated sections
-		 */
-		if (TARGET_IS_6808 && tap->a_size) {
-			addr = find_empty_space(addr, tap->a_size, tap->a_id, codemap6808, sizeof (codemap6808));
-		}
-		while (taxp) {
-			/* find next unused address now */
-			if (TARGET_IS_6808 && taxp->a_size) {
-				addr = find_empty_space(addr, taxp->a_size, tap->a_id, codemap6808, sizeof (codemap6808));
-				allocate_space(addr, taxp->a_size, tap->a_id, codemap6808, sizeof (codemap6808));
-			}
-			taxp->a_addr = addr;
-			addr += taxp->a_size;
-			size += taxp->a_size;
-			taxp = taxp->a_axp;
-		}
-	}
-	tap->a_size = size;
-	if ((tap->a_flag&A3_PAG) && (size > 256)) {
-		fprintf(stderr,
-			"\n?ASlink-Warning-Paged Area %s Length Error\n",
-			tap->a_id);
-		lkerr++;
-	}
-	if (TARGET_IS_8051 &&
-		(tap->a_flag&A3_PAG) && (tap->a_size) &&
-		((tap->a_addr & 0xFFFFFF00) != ((addr-1) & 0xFFFFFF00)))
-	{
-		fprintf(stderr,
-			"\n?ASlink-Warning-Paged Area %s Boundary Error\n",
-			tap->a_id);
-		lkerr++;
-	}
+        bsp = basep;
+        while (bsp) {
+                ip = bsp->b_strp;
+                getid(id, -1);
+                if (getnb() == '=') {
+                        v = expr(0);
+                        for (ap = areap; ap != NULL; ap = ap->a_ap) {
+                                if (symeq(id, ap->a_id, 1))
+                                        break;
+                        }
+                        if (ap == NULL) {
+                                fprintf(stderr,
+                                "ASlink-Warning-No definition of area %s\n", id);
+                                lkerr++;
+                        } else {
+                                ap->a_addr = v;
+                                ap->a_bset = 1;
+                        }
+                } else {
+                        fprintf(stderr, "ASlink-Warning-No '=' in base expression");
+                        lkerr++;
+                }
+                bsp = bsp->b_base;
+        }
 }
 
+
+
 /* sdld specific */
 a_uint lnksect2 (struct area *tap, int locIndex);
 unsigned long codemap8051[524288];
@@ -694,526 +767,518 @@
 /*Modified version of the functions for packing variables in internal data memory*/
 VOID lnkarea2 (void)
 {
-	a_uint rloc[4]={0, 0, 0, 0};
-	a_uint gs_size = 0;
-	int  locIndex;
-	char temp[NCPS+2];
-	struct sym *sp;
-	int j;
-	struct area *bseg_ap = NULL;
-	struct area *abs_ap = NULL;
-	struct area *gs0_ap = NULL;
-	struct sym *sp_dseg_s=NULL, *sp_dseg_l=NULL;
-
-	for(j=0; j<256; j++) idatamap[j]=' ';
-	memset(codemap8051, 0, sizeof(codemap8051));
-	memset(xdatamap, 0, sizeof(xdatamap));
-
-	/* first sort all absolute areas to the front */
-	ap = areap;
-	/* no need to check first area, it's in front anyway */
-	while (ap && ap->a_ap)
-	{
-		if (ap->a_ap->a_flag & A3_ABS)
-		{/* next area is absolute, move it to front,
-			reversed sequence is no problem for absolutes */
-			abs_ap = ap->a_ap;
-			ap->a_ap = abs_ap->a_ap;
-			abs_ap->a_ap = areap;
-			areap = abs_ap;
-		}
-		else
-		{
-			ap = ap->a_ap;
-		}
-	}
-
-	/* next accumulate all GSINITx/GSFINAL area sizes
-	   into GSINIT so they stay together */
-	ap = areap;
-	abs_ap = areap;
-	while (ap)
-	{
-		if (ap->a_flag & A3_ABS)
-		{
-			abs_ap = ap; /* Remember the last abs area */
-		}
-		if (!strncmp(ap->a_id, "GS", 2))
-		{/* GSxxxxx area */
-			if (ap->a_size == 0)
-			{
-				axp = ap->a_axp;
-				while (axp)
-				{
-					ap->a_size += axp->a_size;
-					axp = axp->a_axp;
-				}
-			}
-			gs_size += ap->a_size;
-			if (!strcmp(ap->a_id, "GSINIT0"))
-			{/* GSINIT0 area */
-				gs0_ap = ap;
-			}
-		}
-		/*Since area BSEG is defined just before BSEG_BYTES, use the bit size of BSEG
-		to compute the byte size of BSEG_BYTES: */
-		else if (!strcmp(ap->a_id, "BSEG"))
-		{
-			bseg_ap = ap->a_ap;			   //BSEG_BYTES
-			for (axp=ap->a_axp; axp; axp=axp->a_axp)
-				ap->a_size += axp->a_size;
-			bseg_ap->a_axp->a_size = ((ap->a_addr + ap->a_size + 7)/8); /*Bits to bytes*/
-			ap->a_ap = bseg_ap->a_ap;	   //removed BSEG_BYTES from list
-			bseg_ap->a_ap = abs_ap->a_ap;
-			abs_ap->a_ap = bseg_ap;		   //inserted BSEG_BYTES after abs
-			bseg_ap = ap;				   //BSEG
-		}
-		else if (!strcmp(ap->a_id, "DSEG"))
-		{
-			dseg_ap = ap; /*Need it later*/
-			dram_start = ap->a_addr;
-		}
-		else if (!strcmp(ap->a_id, "ISEG"))
-		{
-			iram_start = ap->a_addr;
-		}
-		ap = ap->a_ap;
-	}
-	if (gs0_ap)
-		gs0_ap->a_size = gs_size;
-
-	ap = areap;
-	while (ap)
-	{
-		/* Determine memory space */
-			 if (ap->a_flag & A_CODE)  locIndex = 1;
-		else if (ap->a_flag & A_XDATA) locIndex = 2;
-		else if (ap->a_flag & A_BIT)   locIndex = 3;
-		else locIndex = 0;
-
-		if (ap->a_flag & A3_ABS) /* Absolute sections */
-		{
-			lnksect2(ap, locIndex);
-		}
-		else /* Relocatable sections */
-		{
-			if (ap->a_type == 0)
-			{
-				ap->a_addr = rloc[locIndex];
-				ap->a_type = 1;
-			}
-
-			rloc[locIndex] = lnksect2(ap, locIndex);
-		}
-
-		if (!strcmp(ap->a_id, "BSEG_BYTES"))
-		{
-			bseg_ap->a_addr += (ap->a_axp->a_addr - 0x20) * 8; /*Bytes to bits*/
-		}
-		/*
-		 * Create symbols called:
-		 *	s_<areaname>	the start address of the area
-		 *	l_<areaname>	the length of the area
-		 */
-
-		if (! symeq(ap->a_id, _abs_, 1))
-		{
-			strcpy(temp+2,ap->a_id);
-			*(temp+1) = '_';
-
-			*temp = 's';
-			sp = lkpsym(temp, 1);
-			sp->s_addr = ap->a_addr;
-			sp->s_type |= S_DEF;
-			if (!strcmp(ap->a_id, "DSEG")) sp_dseg_s=sp;
-
-			*temp = 'l';
-			sp = lkpsym(temp, 1);
-			sp->s_addr = ap->a_size;
-			sp->s_axp = NULL;
-			sp->s_type |= S_DEF;
-			if (!strcmp(ap->a_id, "DSEG")) sp_dseg_l=sp;
-		}
-
-		ap = ap->a_ap;
-	}
-
-	/*Compute the size of DSEG*/
-	if(dseg_ap!=NULL)
-	{
-		dseg_ap->a_addr=0;
-		dseg_ap->a_size=0;
-		for(j=0; j<0x80; j++) if(idatamap[j]!=' ') dseg_ap->a_size++;
-	}
-	if(sp_dseg_s!=NULL) sp_dseg_s->s_addr=0;
-	if(sp_dseg_l!=NULL) sp_dseg_l->s_addr=dseg_ap->a_size;
+        a_uint rloc[4]={0, 0, 0, 0};
+        a_uint gs_size = 0;
+        int  locIndex;
+        char temp[NCPS+2];
+        struct sym *sp;
+        int j;
+        struct area *bseg_ap = NULL;
+        struct area *abs_ap = NULL;
+        struct area *gs0_ap = NULL;
+        struct sym *sp_dseg_s=NULL, *sp_dseg_l=NULL;
+
+        for(j=0; j<256; j++) idatamap[j]=' ';
+        memset(codemap8051, 0, sizeof(codemap8051));
+        memset(xdatamap, 0, sizeof(xdatamap));
+
+        /* first sort all absolute areas to the front */
+        ap = areap;
+        /* no need to check first area, it's in front anyway */
+        while (ap && ap->a_ap)
+        {
+                if (ap->a_ap->a_flag & A3_ABS)
+                {/* next area is absolute, move it to front,
+                        reversed sequence is no problem for absolutes */
+                        abs_ap = ap->a_ap;
+                        ap->a_ap = abs_ap->a_ap;
+                        abs_ap->a_ap = areap;
+                        areap = abs_ap;
+                }
+                else
+                {
+                        ap = ap->a_ap;
+                }
+        }
+
+        /* next accumulate all GSINITx/GSFINAL area sizes
+           into GSINIT so they stay together */
+        ap = areap;
+        abs_ap = areap;
+        while (ap)
+        {
+                if (ap->a_flag & A3_ABS)
+                {
+                        abs_ap = ap; /* Remember the last abs area */
+                }
+                if (!strncmp(ap->a_id, "GS", 2))
+                {/* GSxxxxx area */
+                        if (ap->a_size == 0)
+                        {
+                                axp = ap->a_axp;
+                                while (axp)
+                                {
+                                        ap->a_size += axp->a_size;
+                                        axp = axp->a_axp;
+                                }
+                        }
+                        gs_size += ap->a_size;
+                        if (!strcmp(ap->a_id, "GSINIT0"))
+                        {/* GSINIT0 area */
+                                gs0_ap = ap;
+                        }
+                }
+                /*Since area BSEG is defined just before BSEG_BYTES, use the bit size of BSEG
+                to compute the byte size of BSEG_BYTES: */
+                else if (!strcmp(ap->a_id, "BSEG"))
+                {
+                        bseg_ap = ap->a_ap;                        //BSEG_BYTES
+                        for (axp=ap->a_axp; axp; axp=axp->a_axp)
+                                ap->a_size += axp->a_size;
+                        bseg_ap->a_axp->a_size = ((ap->a_addr + ap->a_size + 7)/8); /*Bits to bytes*/
+                        ap->a_ap = bseg_ap->a_ap;          //removed BSEG_BYTES from list
+                        bseg_ap->a_ap = abs_ap->a_ap;
+                        abs_ap->a_ap = bseg_ap;            //inserted BSEG_BYTES after abs
+                        bseg_ap = ap;                              //BSEG
+                }
+                else if (!strcmp(ap->a_id, "DSEG"))
+                {
+                        dseg_ap = ap; /*Need it later*/
+                        dram_start = ap->a_addr;
+                }
+                else if (!strcmp(ap->a_id, "ISEG"))
+                {
+                        iram_start = ap->a_addr;
+                }
+                ap = ap->a_ap;
+        }
+        if (gs0_ap)
+                gs0_ap->a_size = gs_size;
+
+        ap = areap;
+        while (ap)
+        {
+                /* Determine memory space */
+                     if (ap->a_flag & A_CODE)  locIndex = 1;
+                else if (ap->a_flag & A_XDATA) locIndex = 2;
+                else if (ap->a_flag & A_BIT)   locIndex = 3;
+                else locIndex = 0;
+
+                if (ap->a_flag & A3_ABS) /* Absolute sections */
+                {
+                        lnksect2(ap, locIndex);
+                }
+                else /* Relocatable sections */
+                {
+                        if (ap->a_bset == 0)
+                        {
+                                ap->a_addr = rloc[locIndex];
+                                ap->a_bset = 1;
+                        }
+
+                        rloc[locIndex] = lnksect2(ap, locIndex);
+                }
+
+                if (!strcmp(ap->a_id, "BSEG_BYTES"))
+                {
+                        bseg_ap->a_addr += (ap->a_axp->a_addr - 0x20) * 8; /*Bytes to bits*/
+                }
+                /*
+                 * Create symbols called:
+                 *      s_<areaname>    the start address of the area
+                 *      l_<areaname>    the length of the area
+                 */
+
+                if (! symeq(ap->a_id, _abs_, 1))
+                {
+                        strcpy(temp+2,ap->a_id);
+                        *(temp+1) = '_';
+
+                        *temp = 's';
+                        sp = lkpsym(temp, 1);
+                        sp->s_addr = ap->a_addr;
+                        sp->s_type |= S_DEF;
+                        if (!strcmp(ap->a_id, "DSEG")) sp_dseg_s=sp;
+
+                        *temp = 'l';
+                        sp = lkpsym(temp, 1);
+                        sp->s_addr = ap->a_size;
+                        sp->s_axp = NULL;
+                        sp->s_type |= S_DEF;
+                        if (!strcmp(ap->a_id, "DSEG")) sp_dseg_l=sp;
+                }
+
+                ap = ap->a_ap;
+        }
+
+        /*Compute the size of DSEG*/
+        if(dseg_ap!=NULL)
+        {
+                dseg_ap->a_addr=0;
+                dseg_ap->a_size=0;
+                for(j=0; j<0x80; j++) if(idatamap[j]!=' ') dseg_ap->a_size++;
+        }
+        if(sp_dseg_s!=NULL) sp_dseg_s->s_addr=0;
+        if(sp_dseg_l!=NULL) sp_dseg_l->s_addr=dseg_ap->a_size;
 }
 
 a_uint lnksect2 (struct area *tap, int locIndex)
 {
-	a_uint size, addr;
-	struct areax *taxp;
-	int j, k, ramlimit, ramstart;
-	char fchar=' ', dchar='a';
-	char ErrMsg[]="?ASlink-Error-Could not get %d consecutive byte%s"
-				  " in internal RAM for area %s.\n";
-
-	tap->a_unaloc=0;
-
-	/*Notice that only ISEG and SSEG can be in the indirectly addressable internal RAM*/
-	if( (!strcmp(tap->a_id, "ISEG")) || (!strcmp(tap->a_id, "SSEG")) )
-	{
-		ramstart = iram_start;
-
-		if ((iram_size <= 0) || (ramstart + iram_size > 0x100))
-			ramlimit = 0x100;
-		else
-			ramlimit = ramstart + iram_size;
-	}
-	else
-	{
-		ramstart = dram_start;
-
-		if ((iram_size <= 0) || (ramstart + iram_size > 0x80))
-			ramlimit = 0x80;
-		else
-			ramlimit = ramstart + iram_size;
-	}
-
-	size = 0;
-	addr = tap->a_addr;
-#if 0
-	if ((tap->a_flag&A3_PAG) && (addr & 0xFF))
-	{
-		fprintf(stderr,
-			"\n?ASlink-Warning-Paged Area %s Boundary Error\n",
-			tap->a_id);
-		lkerr++;
-	}
-#endif
-	taxp = tap->a_axp;
-
-	/*Use a letter to identify each area in the internal RAM layout map*/
-	if (locIndex==0)
-	{
-		/**/ if(!strcmp(tap->a_id, "DSEG"))
-			fchar='D'; /*It will be converted to letters 'a' to 'z' later for each areax*/
-		else if(!strcmp(tap->a_id, "ISEG"))
-			fchar='I';
-		else if(!strcmp(tap->a_id, "SSEG"))
-			fchar='S';
-		else if(!strcmp(tap->a_id, "OSEG"))
-			fchar='Q';
-		else if(!strcmp(tap->a_id, "REG_BANK_0"))
-			fchar='0';
-		else if(!strcmp(tap->a_id, "REG_BANK_1"))
-			fchar='1';
-		else if(!strcmp(tap->a_id, "REG_BANK_2"))
-			fchar='2';
-		else if(!strcmp(tap->a_id, "REG_BANK_3"))
-			fchar='3';
-		else if(!strcmp(tap->a_id, "BSEG_BYTES"))
-			fchar='B';
-		else if(!strcmp(tap->a_id, "BIT_BANK"))
-			fchar='T';
-		else
-			fchar=' ';/*???*/
-	}
-	else if (locIndex == 1)
-	{
-		/**/ if(!strcmp(tap->a_id, "GSINIT"))
-			fchar='G';
-	}
-	else if (locIndex == 2)
-	{
-		/**/ if(!strcmp(tap->a_id, "XSTK"))
-			fchar='K';
-	}
-
-	if (tap->a_flag&A3_OVR) /* Overlayed sections */
-	{
-		while (taxp)
-		{
-			if(taxp->a_size == 0)
-			{
-				taxp = taxp->a_axp;
-				continue;
-			}
-
-			if ( (fchar=='0')||(fchar=='1')||(fchar=='2')||(fchar=='3') ) /*Reg banks*/
-			{
-				addr=(fchar-'0')*8;
-				taxp->a_addr=addr;
-				size=taxp->a_size;
-				for(j=addr; (j<(int)(addr+size)) && (j<ramlimit); j++)
-					idatamap[j]=fchar;
-			}
-			else if( (fchar=='S') || (fchar=='Q') ) /*Overlay and stack in internal RAM*/
-			{
-				/*Find the size of the space currently used for this areax overlay*/
-				for(j=ramstart, size=0; j<ramlimit; j++)
-					if(idatamap[j]==fchar) size++;
-
-				if( (fchar=='S') && (stacksize==0) )
-				{
-				   /*Search for the largest space available and use it for stack*/
-					for(j=ramstart, k=0, taxp->a_size=0; j<ramlimit; j++)
-					{
-						if(idatamap[j]==' ')
-						{
-							if((++k)>(int)taxp->a_size)
-								taxp->a_size=k;
-						}
-						else
-						{
-							k=0;
-						}
-					}
-					stacksize=taxp->a_size;
-				}
-
-				/*If more space required, release the previously allocated areax in
-				internal RAM and search for a bigger one*/
-				if((int)taxp->a_size>size)
-				{
-					size=(int)taxp->a_size;
-
-					for(j=ramstart; j<ramlimit; j++)
-						if(idatamap[j]==fchar) idatamap[j]=' ';
-
-					/*Search for a space large enough in data memory for this overlay areax*/
-					for(j=ramstart, k=0; j<ramlimit; j++)
-					{
-						if(idatamap[j]==' ')
-							k++;
-						else
-							k=0;
-					if(k==(int)taxp->a_size)
-							break;
-					}
-
-					/*Mark the memory used for overlay*/
-					if(k==(int)taxp->a_size)
-					{
-						addr = j-k+1;
-						for(j=addr; (j<(int)(addr+size)); j++)
-							idatamap[j]=fchar;
-					}
-					else /*Couldn't find a chunk big enough: report the problem.*/
-					{
-						tap->a_unaloc=taxp->a_size;
-						fprintf(stderr, ErrMsg, taxp->a_size, taxp->a_size>1?"s":"", tap->a_id);
-						lkerr++;
-					}
-				}
-			}
-			else if (fchar=='T') /*Bit addressable bytes in internal RAM*/
-			{
-				/*Find the size of the space currently used for this areax overlay*/
-//				for(j=0x20, size=0; j<0x30; j++)
-//					if(idatamap[j]==fchar) size++;
-
-				/*If more space required, release the previously allocated areax in
-				internal RAM and search for a bigger one*/
-				if((int)taxp->a_size>size)
-				{
-					size=(int)taxp->a_size;
-
-					for(j=0x20; j<0x30; j++)
-						if(idatamap[j]==fchar) idatamap[j]=' ';
-
-					/*Search for a space large enough in data memory for this overlay areax*/
-					for(j=0x20, k=0; j<0x30; j++)
-					{
-						if(idatamap[j]==' ')
-							k++;
-						else
-							k=0;
-						if(k==(int)taxp->a_size)
-							break;
-					}
-
-					/*Mark the memory used for overlay*/
-					if(k==(int)size)
-					{
-						addr = j-k+1;
-						for(j=addr; (j<(int)(addr+size)); j++)
-							idatamap[j]=fchar;
-					}
-					else /*Couldn't find a chunk big enough: report the problem.*/
-					{
-						tap->a_unaloc=taxp->a_size;
-						fprintf(stderr, ErrMsg, taxp->a_size, taxp->a_size>1?"s":"", tap->a_id);
-						lkerr++;
-					}
-				}
-			}
-			else /*Overlay areas not in internal ram*/
-			{
-				taxp->a_addr = addr;
-				if (taxp->a_size > size) size = taxp->a_size;
-			}
-			taxp = taxp->a_axp;
-		}
-		/*Now set all overlayed areax to the same start address*/
-		taxp = tap->a_axp;
-		while (taxp)
-		{
-			taxp->a_addr = addr;
-			taxp = taxp->a_axp;
-		}
-	}
-	else if (tap->a_flag & A3_ABS) /* Absolute sections */
-	{
-		while (taxp)
-		{
-			if (locIndex == 0)
-			{
-				for (j=taxp->a_addr; (j<(int)(taxp->a_addr+taxp->a_size)) && (j<256); j++)
-				{
-					if (idatamap[j] == ' ')
-						idatamap[j] = 'A';
-					else
-						fprintf(stderr, "memory overlap at 0x%X for %s\n", j, tap->a_id);
-				}
-			}
-			else if (locIndex == 1)
-			{
-				allocate_space(taxp->a_addr, taxp->a_size, tap->a_id, codemap8051, sizeof (codemap8051));
-			}
-			else if (locIndex == 2)
-			{
-				allocate_space(taxp->a_addr, taxp->a_size, tap->a_id, xdatamap, sizeof (xdatamap));
-			}
-			taxp->a_addr = 0; /* reset to zero so relative addresses become absolute */
-			size += taxp->a_size;
-			taxp = taxp->a_axp;
-		}
-	}
-	else /* Concatenated sections */
-	{
-		if ((locIndex == 1) && tap->a_size)
-		{
-			addr = find_empty_space(addr, tap->a_size, tap->a_id, codemap8051, sizeof (codemap6808));
-		}
-		if ((locIndex == 2) && tap->a_size)
-		{
-			addr = find_empty_space(addr, tap->a_size, tap->a_id, xdatamap, sizeof (xdatamap));
-		}
-		while (taxp)
-		{
-			if( (fchar=='D') || (fchar=='I') )
-			{
-				if(taxp->a_size)
-				{
-					/*Search for a space large enough in internal RAM for this areax*/
-					for(j=ramstart, k=0; j<ramlimit; j++)
-					{
-						if(idatamap[j]==' ')
-							k++;
-						else
-							k=0;
-						if(k==(int)taxp->a_size)
-							break;
-					}
-
-					if(k==(int)taxp->a_size)
-					{
-						taxp->a_addr = j-k+1;
-
-						size += taxp->a_size;
-
-						for(j=taxp->a_addr; (j<(int)(taxp->a_addr+taxp->a_size)) && (j<ramlimit); j++)
-							idatamap[j]=(fchar=='D')?dchar:fchar;
-						if((taxp->a_size>0)&&(fchar=='D'))dchar++;
-						if((dchar<'a')||(dchar>'z')) dchar='D'; /*Ran out of letters?*/
-					}
-					else /*We are in trouble, there is not enough memory for an areax chunk*/
-					{
-						taxp->a_addr = addr;
-						addr += taxp->a_size;
-						size += taxp->a_size;
-						tap->a_unaloc+=taxp->a_size;
-						fprintf(stderr, ErrMsg, taxp->a_size, taxp->a_size>1?"s":"", tap->a_id);
-						lkerr++;
-					}
-			   }
-			   taxp = taxp->a_axp;
-			}
-			else if(fchar=='B')
-			{
-				if(taxp->a_size!=0)
-				{
-					/*Search for a space large enough in data memory for this areax*/
-					for(j=0x20, k=0; j<0x30; j++)
-					{
-						if(idatamap[j]==' ')
-							k++;
-						else
-							k=0;
-						if(k==(int)taxp->a_size) break;
-					}
-
-					/*Mark the memory used*/
-					if(k==(int)taxp->a_size)
-					{
-						taxp->a_addr = j-k+1;
-						for(j=taxp->a_addr; (j<(int)(taxp->a_addr+taxp->a_size)) && (j<0x30); j++)
-							idatamap[j]=fchar;
-					}
-					else /*Couldn't find a chunk big enough: report the problem.*/
-					{
-						tap->a_unaloc=taxp->a_size;
-						fprintf(stderr, ErrMsg, taxp->a_size, taxp->a_size>1?"s":"", tap->a_id);
-						lkerr++;
-					}
-				}
-				size += taxp->a_size;
-				taxp = taxp->a_axp;
-			}
-			else /*For concatenated BIT, CODE, and XRAM areax's*/
-			{
-				if((fchar=='K') && (taxp->a_size == 1))
-				{
-					taxp->a_size = 256-(addr & 0xFF);
-				}
-				//find next unused address now
-				if ((locIndex == 1) && taxp->a_size)
-				{
-					addr = find_empty_space(addr, taxp->a_size, tap->a_id, codemap8051, sizeof (codemap8051));
-					allocate_space(addr, taxp->a_size, tap->a_id, codemap8051, sizeof (codemap8051));
-				}
-				if ((locIndex == 2) && taxp->a_size)
-				{
-					addr = find_empty_space(addr, taxp->a_size, tap->a_id, xdatamap, sizeof (xdatamap));
-					allocate_space(addr, taxp->a_size, tap->a_id, xdatamap, sizeof (xdatamap));
-				}
-				taxp->a_addr = addr;
-				addr += taxp->a_size;
-				size += taxp->a_size;
-				taxp = taxp->a_axp;
-			}
-		}
-	}
-	tap->a_size = size;
-	tap->a_addr = tap->a_axp->a_addr;
-
-	if ((tap->a_flag&A3_PAG) && (size > 256))
-	{
-		fprintf(stderr,
-			"\n?ASlink-Warning-Paged Area %s Length Error\n",
-			tap->a_id);
-		lkerr++;
-	}
-	if ((tap->a_flag&A3_PAG) && (tap->a_size) &&
-		((tap->a_addr & 0xFFFFFF00) != ((addr-1) & 0xFFFFFF00)))
-	{
-		fprintf(stderr,
-			"\n?ASlink-Warning-Paged Area %s Boundary Error\n",
-			tap->a_id);
-		lkerr++;
-	}
-	return addr;
+        a_uint size, addr;
+        struct areax *taxp;
+        int j, k, ramlimit, ramstart;
+        char fchar=' ', dchar='a';
+        char ErrMsg[]="?ASlink-Error-Could not get %d consecutive byte%s"
+                                  " in internal RAM for area %s.\n";
+
+        tap->a_unaloc=0;
+
+        /*Notice that only ISEG and SSEG can be in the indirectly addressable internal RAM*/
+        if( (!strcmp(tap->a_id, "ISEG")) || (!strcmp(tap->a_id, "SSEG")) )
+        {
+                ramstart = iram_start;
+
+                if ((iram_size <= 0) || (ramstart + iram_size > 0x100))
+                        ramlimit = 0x100;
+                else
+                        ramlimit = ramstart + iram_size;
+        }
+        else
+        {
+                ramstart = dram_start;
+
+                if ((iram_size <= 0) || (ramstart + iram_size > 0x80))
+                        ramlimit = 0x80;
+                else
+                        ramlimit = ramstart + iram_size;
+        }
+
+        size = 0;
+        addr = tap->a_addr;
+        taxp = tap->a_axp;
+
+        /*Use a letter to identify each area in the internal RAM layout map*/
+        if (locIndex==0)
+        {
+                /**/ if(!strcmp(tap->a_id, "DSEG"))
+                        fchar='D'; /*It will be converted to letters 'a' to 'z' later for each areax*/
+                else if(!strcmp(tap->a_id, "ISEG"))
+                        fchar='I';
+                else if(!strcmp(tap->a_id, "SSEG"))
+                        fchar='S';
+                else if(!strcmp(tap->a_id, "OSEG"))
+                        fchar='Q';
+                else if(!strcmp(tap->a_id, "REG_BANK_0"))
+                        fchar='0';
+                else if(!strcmp(tap->a_id, "REG_BANK_1"))
+                        fchar='1';
+                else if(!strcmp(tap->a_id, "REG_BANK_2"))
+                        fchar='2';
+                else if(!strcmp(tap->a_id, "REG_BANK_3"))
+                        fchar='3';
+                else if(!strcmp(tap->a_id, "BSEG_BYTES"))
+                        fchar='B';
+                else if(!strcmp(tap->a_id, "BIT_BANK"))
+                        fchar='T';
+                else
+                        fchar=' ';/*???*/
+        }
+        else if (locIndex == 1)
+        {
+                /**/ if(!strcmp(tap->a_id, "GSINIT"))
+                        fchar='G';
+        }
+        else if (locIndex == 2)
+        {
+                /**/ if(!strcmp(tap->a_id, "XSTK"))
+                        fchar='K';
+        }
+
+        if (tap->a_flag & A3_OVR) /* Overlayed sections */
+        {
+                while (taxp)
+                {
+                        if(taxp->a_size == 0)
+                        {
+                                taxp = taxp->a_axp;
+                                continue;
+                        }
+
+                        if ( (fchar=='0')||(fchar=='1')||(fchar=='2')||(fchar=='3') ) /*Reg banks*/
+                        {
+                                addr=(fchar-'0')*8;
+                                taxp->a_addr=addr;
+                                size=taxp->a_size;
+                                for(j=addr; (j<(int)(addr+size)) && (j<ramlimit); j++)
+                                        idatamap[j]=fchar;
+                        }
+                        else if( (fchar=='S') || (fchar=='Q') ) /*Overlay and stack in internal RAM*/
+                        {
+                                /*Find the size of the space currently used for this areax overlay*/
+                                for(j=ramstart, size=0; j<ramlimit; j++)
+                                        if(idatamap[j]==fchar) size++;
+
+                                if( (fchar=='S') && (stacksize==0) )
+                                {
+                                   /*Search for the largest space available and use it for stack*/
+                                        for(j=ramstart, k=0, taxp->a_size=0; j<ramlimit; j++)
+                                        {
+                                                if(idatamap[j]==' ')
+                                                {
+                                                        if((++k)>(int)taxp->a_size)
+                                                                taxp->a_size=k;
+                                                }
+                                                else
+                                                {
+                                                        k=0;
+                                                }
+                                        }
+                                        stacksize=taxp->a_size;
+                                }
+
+                                /*If more space required, release the previously allocated areax in
+                                internal RAM and search for a bigger one*/
+                                if((int)taxp->a_size>size)
+                                {
+                                        size=(int)taxp->a_size;
+
+                                        for(j=ramstart; j<ramlimit; j++)
+                                                if(idatamap[j]==fchar) idatamap[j]=' ';
+
+                                        /*Search for a space large enough in data memory for this overlay areax*/
+                                        for(j=ramstart, k=0; j<ramlimit; j++)
+                                        {
+                                                if(idatamap[j]==' ')
+                                                        k++;
+                                                else
+                                                        k=0;
+                                        if(k==(int)taxp->a_size)
+                                                        break;
+                                        }
+
+                                        /*Mark the memory used for overlay*/
+                                        if(k==(int)taxp->a_size)
+                                        {
+                                                addr = j-k+1;
+                                                for(j=addr; (j<(int)(addr+size)); j++)
+                                                        idatamap[j]=fchar;
+                                        }
+                                        else /*Couldn't find a chunk big enough: report the problem.*/
+                                        {
+                                                tap->a_unaloc=taxp->a_size;
+                                                fprintf(stderr, ErrMsg, taxp->a_size, taxp->a_size>1?"s":"", tap->a_id);
+                                                lkerr++;
+                                        }
+                                }
+                        }
+                        else if (fchar=='T') /*Bit addressable bytes in internal RAM*/
+                        {
+                                /*Find the size of the space currently used for this areax overlay*/
+//                              for(j=0x20, size=0; j<0x30; j++)
+//                                      if(idatamap[j]==fchar) size++;
+
+                                /*If more space required, release the previously allocated areax in
+                                internal RAM and search for a bigger one*/
+                                if((int)taxp->a_size>size)
+                                {
+                                        size=(int)taxp->a_size;
+
+                                        for(j=0x20; j<0x30; j++)
+                                                if(idatamap[j]==fchar) idatamap[j]=' ';
+
+                                        /*Search for a space large enough in data memory for this overlay areax*/
+                                        for(j=0x20, k=0; j<0x30; j++)
+                                        {
+                                                if(idatamap[j]==' ')
+                                                        k++;
+                                                else
+                                                        k=0;
+                                                if(k==(int)taxp->a_size)
+                                                        break;
+                                        }
+
+                                        /*Mark the memory used for overlay*/
+                                        if(k==(int)size)
+                                        {
+                                                addr = j-k+1;
+                                                for(j=addr; (j<(int)(addr+size)); j++)
+                                                        idatamap[j]=fchar;
+                                        }
+                                        else /*Couldn't find a chunk big enough: report the problem.*/
+                                        {
+                                                tap->a_unaloc=taxp->a_size;
+                                                fprintf(stderr, ErrMsg, taxp->a_size, taxp->a_size>1?"s":"", tap->a_id);
+                                                lkerr++;
+                                        }
+                                }
+                        }
+                        else /*Overlay areas not in internal ram*/
+                        {
+                                taxp->a_addr = addr;
+                                if (taxp->a_size > size) size = taxp->a_size;
+                        }
+                        taxp = taxp->a_axp;
+                }
+                /*Now set all overlayed areax to the same start address*/
+                taxp = tap->a_axp;
+                while (taxp)
+                {
+                        taxp->a_addr = addr;
+                        taxp = taxp->a_axp;
+                }
+        }
+        else if (tap->a_flag & A3_ABS) /* Absolute sections */
+        {
+                while (taxp)
+                {
+                        if (locIndex == 0)
+                        {
+                                for (j=taxp->a_addr; (j<(int)(taxp->a_addr+taxp->a_size)) && (j<256); j++)
+                                {
+                                        if (idatamap[j] == ' ')
+                                                idatamap[j] = 'A';
+                                        else
+                                                fprintf(stderr, "memory overlap at 0x%X for %s\n", j, tap->a_id);
+                                }
+                        }
+                        else if (locIndex == 1)
+                        {
+                                allocate_space(taxp->a_addr, taxp->a_size, tap->a_id, codemap8051, sizeof (codemap8051));
+                        }
+                        else if (locIndex == 2)
+                        {
+                                allocate_space(taxp->a_addr, taxp->a_size, tap->a_id, xdatamap, sizeof (xdatamap));
+                        }
+                        taxp->a_addr = 0; /* reset to zero so relative addresses become absolute */
+                        size += taxp->a_size;
+                        taxp = taxp->a_axp;
+                }
+        }
+        else /* Concatenated sections */
+        {
+                if ((locIndex == 1) && tap->a_size)
+                {
+                        addr = find_empty_space(addr, tap->a_size, tap->a_id, codemap8051, sizeof (codemap8051));
+                }
+                if ((locIndex == 2) && tap->a_size)
+                {
+                        addr = find_empty_space(addr, tap->a_size, tap->a_id, xdatamap, sizeof (xdatamap));
+                }
+                while (taxp)
+                {
+                        if( (fchar=='D') || (fchar=='I') )
+                        {
+                                if(taxp->a_size)
+                                {
+                                        /*Search for a space large enough in internal RAM for this areax*/
+                                        for(j=ramstart, k=0; j<ramlimit; j++)
+                                        {
+                                                if(idatamap[j]==' ')
+                                                        k++;
+                                                else
+                                                        k=0;
+                                                if(k==(int)taxp->a_size)
+                                                        break;
+                                        }
+
+                                        if(k==(int)taxp->a_size)
+                                        {
+                                                taxp->a_addr = j-k+1;
+
+                                                size += taxp->a_size;
+
+                                                for(j=taxp->a_addr; (j<(int)(taxp->a_addr+taxp->a_size)) && (j<ramlimit); j++)
+                                                        idatamap[j]=(fchar=='D')?dchar:fchar;
+                                                if((taxp->a_size>0)&&(fchar=='D'))dchar++;
+                                                if((dchar<'a')||(dchar>'z')) dchar='D'; /*Ran out of letters?*/
+                                        }
+                                        else /*We are in trouble, there is not enough memory for an areax chunk*/
+                                        {
+                                                taxp->a_addr = addr;
+                                                addr += taxp->a_size;
+                                                size += taxp->a_size;
+                                                tap->a_unaloc+=taxp->a_size;
+                                                fprintf(stderr, ErrMsg, taxp->a_size, taxp->a_size>1?"s":"", tap->a_id);
+                                                lkerr++;
+                                        }
+                                }
+                                taxp = taxp->a_axp;
+                        }
+                        else if(fchar=='B')
+                        {
+                                if(taxp->a_size!=0)
+                                {
+                                        /*Search for a space large enough in data memory for this areax*/
+                                        for(j=0x20, k=0; j<0x30; j++)
+                                        {
+                                                if(idatamap[j]==' ')
+                                                        k++;
+                                                else
+                                                        k=0;
+                                                if(k==(int)taxp->a_size) break;
+                                        }
+
+                                        /*Mark the memory used*/
+                                        if(k==(int)taxp->a_size)
+                                        {
+                                                taxp->a_addr = j-k+1;
+                                                for(j=taxp->a_addr; (j<(int)(taxp->a_addr+taxp->a_size)) && (j<0x30); j++)
+                                                        idatamap[j]=fchar;
+                                        }
+                                        else /*Couldn't find a chunk big enough: report the problem.*/
+                                        {
+                                                tap->a_unaloc=taxp->a_size;
+                                                fprintf(stderr, ErrMsg, taxp->a_size, taxp->a_size>1?"s":"", tap->a_id);
+                                                lkerr++;
+                                        }
+                                }
+                                size += taxp->a_size;
+                                taxp = taxp->a_axp;
+                        }
+                        else /*For concatenated BIT, CODE, and XRAM areax's*/
+                        {
+                                //expand external stack
+                                if((fchar=='K') && (taxp->a_size == 1))
+                                {
+                                        taxp->a_size = 256-(addr & 0xFF);
+                                }
+                                //find next unused address now
+                                if ((locIndex == 1) && taxp->a_size)
+                                {
+                                        addr = find_empty_space(addr, taxp->a_size, tap->a_id, codemap8051, sizeof (codemap8051));
+                                        allocate_space(addr, taxp->a_size, tap->a_id, codemap8051, sizeof (codemap8051));
+                                }
+                                if ((locIndex == 2) && taxp->a_size)
+                                {
+                                        addr = find_empty_space(addr, taxp->a_size, tap->a_id, xdatamap, sizeof (xdatamap));
+                                        allocate_space(addr, taxp->a_size, tap->a_id, xdatamap, sizeof (xdatamap));
+                                }
+                                taxp->a_addr = addr;
+                                addr += taxp->a_size;
+                                size += taxp->a_size;
+                                taxp = taxp->a_axp;
+                        }
+                }
+        }
+        tap->a_size = size;
+        tap->a_addr = tap->a_axp->a_addr;
+
+        if ((tap->a_flag & A3_PAG) && (size > 256))
+        {
+                fprintf(stderr,
+                        "\n?ASlink-Warning-Paged Area %s Length Error\n",
+                        tap->a_id);
+                lkerr++;
+        }
+        if ((tap->a_flag & A3_PAG) && (tap->a_size) &&
+                ((tap->a_addr & 0xFFFFFF00) != ((addr-1) & 0xFFFFFF00)))
+        {
+                fprintf(stderr,
+                        "\n?ASlink-Warning-Paged Area %s Boundary Error\n",
+                        tap->a_id);
+                lkerr++;
+        }
+        return addr;
 }
 /* end sdld specific */
 
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/lkbank.c sdcc-3.2.0+dfsg/sdas/linksrc/lkbank.c
--- sdcc-3.1.0+dfsg/sdas/linksrc/lkbank.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/lkbank.c	2011-12-06 23:01:37.000000000 +0000
@@ -24,128 +24,621 @@
 
 #include "aslink.h"
 
-/*Module	lkbank.c
+/*Module        lkbank.c
  *
- *	The module lkbank.c contains the function newbank() which
- *	creates a bank structure and the function module() which
- *	loads the module name into the current head structure.
- *
- *	lkbank.c contains the following functions:
- *		VOID	lkfopen()
- *		VOID	lkfclose()
- *
- *	lkbank.c contains no local variables.
- */
-
-/*)Function	VOID	lkfopen()
- *
- *	The function lkfopen() will
- *	open output data files.
- *
- *	local variables:
- *		File *	fp		temporary file handle
- *		char *	frmt		temporary file type string
- *
- *
- *	global variables:
- *		int	a_bytes		T line address bytes
- *		char	afspec[]	Filespec from afile()
- *		FILE *	jfp		NoICE output file handle
- *		int	oflag		data output type flag
- *		FILE *	ofp		Output file handle
- *		FILE *	stderr		Standard Error Output handle
- *
- *	functions called:
- *		FILE *	afile()		lkmain.c
- *		int	fprintf()	c_library
- *		VOID	lkexit()	lkmain.c
- *
- *	side effects:
- *		All data output files are opened.
- */
-
-VOID
-lkfopen()
-{
-	char * frmt;
-	FILE * fp;
-
-	if (oflag == 0) return;
-
-	fp = stderr;
-	/*
-	 * Open output file
-	 */
-	if (oflag == 1) {
-		switch(a_bytes) {
-		default:
-		case 2: frmt = "ihx"; break;
-		}
-		fp = afile(linkp->f_idp, frmt, 1);
-	} else
-	if (oflag == 2) {
-		switch(a_bytes) {
-		default:
-		case 2: frmt = "s19"; break;
-		}
-		fp = afile(linkp->f_idp, frmt, 1);
-	} else
-	if (oflag == 3) {
-		switch(a_bytes) {
-		default:
-		case 2: frmt = "bin"; break;
-		case 3: frmt = "bi3"; break;
-		case 4: frmt = "bi4"; break;
-		}
-		fp = afile(linkp->f_idp, frmt, 2);
-	}
-	/* sdld specific */
-	if (oflag == 4) {
-		fp = afile(linkp->f_idp, "elf", 2);
-	}
-	/* end sdld specific */
-	if (fp != stderr) {
-		if (fp == NULL) {
-			lkexit(ER_FATAL);
-		}
+ *      The module lkbank.c contains the function newbank() which
+ *      creates a bank structure and the function module() which
+ *      loads the module name into the current head structure.
+ *
+ *      lkbank.c contains the following functions:
+ *              VOID    newbank()
+ *              VOID    lkpbank()
+ *              VOID    setbank()
+ *              VOID    chkbank()
+ *              VOID    lkfopen()
+ *              VOID    lkfclose()
+ *
+ *      lkbank.c contains no local variables.
+ */
+
+/*)Function     VOID    newbank()
+ *
+ *      The function newbank() creates and/or modifies bank
+ *      structures for each B directive read from
+ *      the .rel file(s).  The function lkpbank() is called
+ *      to find the bank structure associated with this name.
+ *      If the bank does not yet exist then a new bank
+ *      structure is created and linked to any existing
+ *      linked bank structures. The bank flags are copied
+ *      into the bank flag variable.  Refer to lkdata.c for
+ *      details of the structures and their linkage.
+ *
+ *      local variables:
+ *              bank    **hblp          pointer to an array of pointers
+ *              int     i               counter, loop variable, value
+ *              char    id[]            id string
+ *              int     nbank           number of banks in this head structure
+ *              a_uint  v               temporary value
+ *
+ *      global variables:
+ *              bank    *bp             Pointer to the current
+ *                                      bank structure
+ *              head    *hp             Pointer to the current
+ *                                      head structure
+ *              int     lkerr           error flag
+ *
+ *      functions called:
+ *              a_uint  eval()          lkeval.c
+ *              VOID    exit()          c_library
+ *              int     fprintf()       c_library
+ *              VOID    getid()         lklex.c
+ *              VOID    lkpbank()       lkbank.c
+ *              VOID    skip()          lklex.c
+ *
+ *      side effects:
+ *              The bank structure is created and
+ *              linked with the appropriate head structures.
+ *              Failure to allocate bank structure
+ *              space will terminate the linker.  Other internal
+ *              errors most likely caused by corrupted .rel
+ *              files will also terminate the linker.
+ */
+
+/*
+ * Create a bank entry.
+ *
+ * B xxxxxx base nnnn size nnnn map nnn flags n fsfx xxxxxx
+ *   |           |         |        |         |      |
+ *   |           |         |        |         |      `-- bp->b_fsfx
+ *   |           |         |        |         `--------- bp->b_flag
+ *   |           |         |        `--------------------bp->b_map
+ *   |           |         `---------------------------- bp->b_size
+ *   |           `-------------------------------------- bp->b_base
+ *   `-------------------------------------------------- bp->b_id
+ *
+ */
+VOID
+newbank(void)
+{
+        int i;
+        a_uint v;
+        char id[NCPS];
+        int nbank;
+        struct bank **hblp;
+
+        if (headp == NULL) {
+                fprintf(stderr, "No header defined\n");
+                lkexit(ER_FATAL);
+        }
+        /*
+         * Create bank entry
+         */
+        getid(id, -1);
+        lkpbank(id);
+        /*
+         * Evaluate Parameters
+         */
+        while (more()) {
+                getid(id, -1);
+                /*
+                 * Evaluate base address
+                 */
+                if (symeq("base", id, 1)) {
+                        v = eval();
+                        if (bp->b_base == 0) {
+                                bp->b_base = v;
+                        } else {
+                                if (v && (bp->b_base != v)) {
+                                        fprintf(stderr, "Conflicting address in bank %s\n", id);
+                                        lkerr++;
+                                }
+                        }
+                } else
+                /*
+                 * Evaluate bank size
+                 */
+                if (symeq("size", id, 1)) {
+                        v = eval();
+                        if (bp->b_size == 0) {
+                                bp->b_size = v;
+                        } else {
+                                if (v && (bp->b_size != v)) {
+                                        fprintf(stderr, "Conflicting size in bank %s\n", id);
+                                        lkerr++;
+                                }
+                        }
+                } else
+                /*
+                 * Evaluate bank mapping
+                 */
+                if (symeq("map", id, 1)) {
+                        v = eval();
+                        if (bp->b_map == 0) {
+                                bp->b_map = v;
+                        } else {
+                                if (v && (bp->b_map != v)) {
+                                        fprintf(stderr, "Conflicting mapping in bank %s\n", id);
+                                        lkerr++;
+                                }
+                        }
+                } else
+                /*
+                 * Evaluate flags
+                 */
+                if (symeq("flags", id, 1)) {
+                        i = (int) eval();
+                        if (bp->b_flag == 0) {
+                                bp->b_flag = i;
+                        } else {
+                                if (i && (bp->b_flag != i)) {
+                                        fprintf(stderr, "Conflicting flags in bank %s\n", id);
+                                        lkerr++;
+                                }
+                        }
+                } else
+                /*
+                 * File Suffix
+                 */
+                if (symeq("fsfx", id, 1)) {
+                        if (more()) {
+                                getid(id, -1);
+                                if (bp->b_fsfx == NULL) {
+                                        bp->b_fsfx = strsto(id);
+                                } else {
+                                        if (!symeq(bp->b_fsfx, id, 1)) {
+                                                fprintf(stderr, "Conflicting fsfx in bank %s\n", id);
+                                                lkerr++;
+                                        }
+                                }
+                        }
+                }
+        }
+        /*
+         * Place pointer in header bank list
+         */
+        nbank = hp->h_nbank;
+        hblp = hp->b_list;
+        for (i=0; i < nbank; i++) {
+                if (hblp[i] == NULL) {
+                        hblp[i] = bp;
+                        return;
+                }
+        }
+        fprintf(stderr, "Header bank list overflow\n");
+        lkexit(ER_FATAL);
+}
+
+/*)Function     VOID    lkpbank(id)
+ *
+ *              char *  id              pointer to the bank name string
+ *
+ *      The function lkpbank() searches the linked bank structures
+ *      for a name match.  If the name is not found then a bank
+ *      structure is created.  The linker flag, rtaflg, for initializing
+ *      i86 format output is set.
+ *
+ *      local variables:
+ *              area *  tbp             pointer to a bank structure
+ *
+ *      global variables:
+ *              bank    *bp             Pointer to the current
+ *                                      bank structure
+ *              bank    *bankp          The pointer to the first
+ *                                      bank structure of a linked list
+ *
+ *      functions called:
+ *              VOID *  new()           lksym()
+ *              char *  strsto()        lksym.c
+ *              int     symeq()         lksym.c
+ *
+ *      side effects:
+ *              Bank structure may be created.
+ *              Failure to allocate space for a structure
+ *              will terminate the linker.
+ */
+
+VOID
+lkpbank(char *id)
+{
+        struct bank *tbp;
+
+        bp = bankp;
+        while (bp) {
+                if (symeq(id, bp->b_id, 1)) {
+                        return;
+                }
+                bp = bp->b_bp;
+        }
+        bp = (struct bank *) new (sizeof(struct bank));
+        tbp = bankp;
+        while (tbp->b_bp)
+                tbp = tbp->b_bp;
+        tbp->b_bp = bp;
+        bp->b_id = strsto(id);
+        bp->b_rtaflg = 1;
+}
+
+
+/*)Function     VOID    setbank()
+ *
+ *      The function setbank() sets the base address of the bank by
+ *      finding the first area in the bank and initializing the
+ *      value to the bank base address.  The bank base address is always
+ *      specified in 'byte' addressing.  A first area which is not 'byte'
+ *      addressed (e.g. a processor addressed by a 'word' of 2 or more bytes)
+ *      has the base address scaled to begin at the 'byte' address.
+ *
+ *      If the area base address has been set using the -b linker
+ *      option then the bank base address is NOT set.
+ *
+ *      The function setbank() also scans all the areas searching
+ *      for non-banked entries.  All non-banked areas are linked
+ *      to bank[0] which does not have a bank file suffix.
+ *
+ *      local variables:
+ *              a_uint  base            base address in 'bytes'
+ *              int     bytes           size of PC increment in bytes
+ *
+ *      global variables:
+ *              area    *ap             Pointer to the current
+ *                                      area structure
+ *              area    *areap          The pointer to the first
+ *                                      area structure of a linked list
+ *              bank    *bp             Pointer to the current
+ *                                      bank structure
+ *              bank    *bankp          The pointer to the first
+ *                                      bank structure of a linked list
+ *
+ *      functions called:
+ *              none
+ *
+ *      side effects:
+ *              Base starting address may be set and non-banked
+ *              areas linked to bank[0].
+ */
+
+VOID
+setbank(void)
+{
+        a_uint base;
+        int bytes;
+
+        /*
+         * For each bank structure with a defined base address value
+         * scan the area structures for the first relocatable area
+         * in the bank and all absolute areas in the bank.
+         * Load the base address value into the area address if the
+         * bank base address has not been overridden by a -b option.
+         * The bank base address is always expressed in 'bytes'.
+         */
+        for (bp = bankp; bp != NULL; bp = bp->b_bp) {
+                if ((bp->b_flag & B_BASE) == 0)
+                        continue;
+                for (ap = areap; ap != NULL; ap = ap->a_ap) {
+                        if (ap->a_bp != bp)
+                                continue;
+                        if ((ap->a_flag & A4_BNK) != A4_BNK)
+                                continue;
+                        if (ap->a_bset)
+                                continue;
+                        bytes = 1 + (ap->a_flag & A4_WLMSK);
+                        base = bp->b_base;
+                        ap->a_addr = (base/bytes) + ((base % bytes) ? 1 : 0);
+                        ap->a_bset = 1;
+                        if ((ap->a_flag & A4_ABS) == A4_ABS) {
+                                continue;
+                        } else {
+                                break;
+                        }
+                }
+        }
+
+        /*
+         * Scan all the area structures for non-banked
+         * areas.  Set the area bank pointer to reference
+         * bank[0] which has no file suffix.
+         */
+         for (ap = areap; ap != NULL; ap = ap->a_ap) {
+                if ((ap->a_flag & A4_BNK) == 0) {
+                        ap->a_bp = bankp;
+                }
+        }
+}
+
+
+/*)Function     VOID    chkbank(fp)
+ *
+ *              FILE    *fp             file handle
+ *
+ *      The function chkbank() scans the bank/area structures to
+ *      determine the length of a bank.  Banks exceeding the size
+ *      specified from a bank size option are flagged.  The bank
+ *      size is always in 'byte' units.
+ *
+ *      local variables:
+ *              a_uint  alow            lowest  address in a bank
+ *              a_uint  ahigh           highest address in a bank
+ *              a_uint  blimit          bank size limit
+ *
+ *      global variables:
+ *              area    *ap             Pointer to the current
+ *                                      area structure
+ *              area    *areap          The pointer to the first
+ *                                      area structure of a linked list
+ *              bank    *bp             Pointer to the current
+ *                                      bank structure
+ *              bank    *bankp          The pointer to the first
+ *                                      bank structure of a linked list
+ *
+ *      functions called:
+ *              none
+ *
+ *      side effects:
+ *              Bank size may be flagged.
+ */
+
+VOID
+chkbank(FILE *fp)
+{
+        a_uint alow, ahigh, blimit, bytes;
+
+        for (bp = bankp; bp != NULL; bp = bp->b_bp) {
+                if ((bp->b_flag & B_SIZE) == 0) {
+                        continue;
+                }
+                blimit = bp->b_size;
+                if (blimit == 0) {
+                        continue;
+                }
+                alow = ~0;
+                ahigh = 0;
+                for (ap = areap; ap != NULL; ap = ap->a_ap) {
+                        if (ap->a_bp != bp) {
+                                continue;
+                        }
+                        if ((ap->a_flag & A4_BNK) != A4_BNK) {
+                                continue;
+                        }
+                        bytes = ap->a_addr * (1 + (ap->a_flag & A4_WLMSK));
+                        if (bytes < alow) {
+                                alow = bytes;
+                        }
+                        bytes = (ap->a_addr + ap->a_size) * (1 + (ap->a_flag & A4_WLMSK));
+                        if (bytes > ahigh) {
+                                ahigh = bytes;
+                        }
+                }
+                if ((ahigh - alow) > blimit) {
+                        fprintf(fp,
+                        "\n?ASlink-Warning-Size limit exceeded in bank %s\n", bp->b_id);
+                        lkerr++;
+                }
+        }
+}
+
+
+/*)Function     VOID    lkfopen()
+ *
+ *      The function lkfopen() scans the bank/area structures to
+ *      open output data files for banks with any data.  Files
+ *      are not opened for banks/areas with no output data.
+ *
+ *      The bank structures are first scanned to create the
+ *      file specification from the output file name combined
+ *      with any given file suffixs.
+ *
+ *      local variables:
+ *              int     idx             position of FSEPX in file specification
+ *              File *  fp              temporary file handle
+ *              char *  frmt            temporary file type string
+ *              char    str[]           File Specification String
+ *              struct bank *tbp        temporary bank pointer
+ *
+ *
+ *      global variables:
+ *              int     a_bytes         T line address bytes
+ *              area    *ap             Pointer to the current
+ *                                      area structure
+ *              area    *areap          The pointer to the first
+ *                                      area structure of a linked list
+ *              char    afspec[]        Filespec from afile()
+ *              bank    *bp             Pointer to the current
+ *                                      bank structure
+ *              bank    *bankp          The pointer to the first
+ *                                      bank structure of a linked list
+ *              FILE *  jfp             NoICE output file handle
+ *              int     oflag           data output type flag
+ *              FILE *  stderr          Standard Error Output handle
+ *
+ *      functions called:
+ *              FILE *  afile()         lkmain.c
+ *              int     fclose()        c_library
+ *              int     fprintf()       c_library
+ *              VOID    lkexit()        lkmain.c
+ *              char *  strcpy()        c_library
+ *              char *  strsto()        lksym.c
+ *              char *  symeq()         lksym.c
+ *
+ *      side effects:
+ *              All data output files are opened.
+ */
+
+VOID
+lkfopen(void)
+{
+        int idx;
+        char * frmt;
+        char str[NCPS+NCPS];
+        struct bank *tbp;
+        struct sym *sp;
+        FILE * fp;
+
+        if (oflag == 0) return;
+
+        /*
+         * Scan bank structures preparing
+         * the output file specifications.
+         */
+        idx = linkp->f_idx + fndext(linkp->f_idp + linkp->f_idx);
+        strncpy(str, linkp->f_idp, idx);
+        str[idx] = 0;
+
+        for (bp = bankp; bp != NULL; bp = bp->b_bp) {
+                if (bp->b_flag & B_FSFX) {
+                        strcpy(str + idx, bp->b_fsfx);
+                }
+                bp->b_fspec = strsto(str);
+                str[idx] = 0;
+        }
+
+        /*
+         * If .__.END. is defined force
+         * an output file to be opened.
+         */
+        sp = lkpsym(".__.END.", 0);
+        if (sp) {
+                sp->s_axp->a_bap->a_flag |= A4_OUT;
+        }
+
+        /*
+         * Scan the area list opening the appropriate
+         * output file if there is data in the area.
+         */
+        ap = areap;
+        while (ap) {
+                if ((ap->a_flag & A4_BNK) != A4_BNK) {
+                        ap->a_bp = bankp;
+                }
+                if ((ap->a_flag & A4_OUT) || (ap->a_size != 0)) {
+                        bp = ap->a_bp;
+                        if (bp->b_ofp == NULL) {
+                                /*
+                                 * Scan file specifications for
+                                 * identical file already opened.
+                                 */
+                                for (tbp = bankp; tbp != NULL; tbp = tbp->b_bp) {
+                                        if (symeq(tbp->b_fspec, bp->b_fspec, 1)) {
+                                                if (tbp->b_ofp != NULL) {
+                                                        bp->b_ofp = tbp->b_ofp;
+                                                        bp->b_ofspec = tbp->b_ofspec;
+                                                }
+                                        }
+                                }
+                        }
+                        if (bp->b_ofp == NULL) {
+                                fp = stderr;
+                                /*
+                                 * Open output file
+                                 */
+                                if (oflag == 1) {
+                                        switch(a_bytes) {
+                                        default:
+                                        case 2: frmt = "ihx"; break;
+                                        }
+                                        fp = afile(bp->b_fspec, frmt, 1);
+                                } else
+                                if (oflag == 2) {
+                                        switch(a_bytes) {
+                                        default:
+                                        case 2: frmt = "s19"; break;
+                                        case 3: frmt = "s28"; break;
+                                        case 4: frmt = "s37"; break;
+                                        }
+                                        fp = afile(bp->b_fspec, frmt, 1);
+                                } else
+                                if (oflag == 3) {
+                                        switch(a_bytes) {
+                                        default:
+                                        case 2: frmt = "bin"; break;
+                                        case 3: frmt = "bi3"; break;
+                                        case 4: frmt = "bi4"; break;
+                                        }
+                                        fp = afile(bp->b_fspec, frmt, 2);
+                                } else
+                                /* sdld specific */
+                                if (oflag == 4) {
+                                        fp = afile(bp->b_fspec, "elf", 2);
+                                }
+                                /* end sdld specific */
+                                if (fp != stderr) {
+                                        if (fp == NULL) {
+                                                lkexit(ER_FATAL);
+                                        }
+                                        bp->b_ofspec = strsto(afspec);
 #if NOICE
-		/*
-		 * Include NoICE command to load file
-		 */
-		if (jfp) {
-			fprintf(jfp, "LOAD %s\n", afspec);
-		}
+                                        /*
+                                         * Include NoICE command to load file
+                                         */
+                                        if (jfp) {
+                                                fprintf(jfp, "LOAD %s\n", bp->b_ofspec);
+                                        }
 #endif
-		ofp = fp;
-	}
+                                }
+                                bp->b_ofp = fp;
+                        }
+                        ap->a_ofp = bp->b_ofp;
+                } else {
+                        ap->a_ofp = NULL;
+                }
+                ap = ap->a_ap;
+        }
 }
 
 
-/*)Function	VOID	lkfclose()
- *
- *	The function lkfclose() will
- *	close all open data output files.
+/*)Function     VOID    lkfclose()
  *
- *	local variables:
+ *      The function lkfclose() scans the bank structures to
+ *      close all open data output files.
  *
- *	global variables:
- *		FILE *	ofp		Output file handle
- *		FILE *	stderr		Standard Error Output handle
+ *      local variables:
+ *              struct bank *tbp        temporary bank pointer
  *
- *	functions called:
- *		int	fclose()	c_library
+ *      global variables:
+ *              bank    *bp             Pointer to the current
+ *                                      bank structure
+ *              bank    *bankp          The pointer to the first
+ *                                      bank structure of a linked list
+ *              FILE *  ofp             Output file handle
+ *              FILE *  stderr          Standard Error Output handle
+ *
+ *      functions called:
+ *              VOID    lkout()         lkout.c
+ *              int     fclose()        c_library
  *
- *	side effects:
- *		All open data output files are closed.
+ *      side effects:
+ *              All open data output files are closed.
  */
 
 VOID
-lkfclose()
+lkfclose(void)
 {
-	if (ofp != NULL) {
-		if (ofp != stderr) {
-			fclose(ofp);
-		}
-		ofp = NULL;
-	}
+        struct bank *tbp;
+
+        /*
+         * Scan Bank Structure
+         * Output data terminations
+         * and close open files
+         */
+        bp = bankp;
+        while (bp != NULL) {
+                ofp = bp->b_ofp;
+                if (ofp != NULL) {
+                        lkout(0);
+                        if (ofp != stderr) {
+                                fclose(ofp);
+                        }
+                        /*
+                         * Scan bank structure for
+                         * identical file handles.
+                         */
+                        for (tbp = bp->b_bp; tbp != NULL; tbp = tbp->b_bp) {
+                                if (tbp->b_ofp == ofp) {
+                                        tbp->b_ofp = NULL;
+                                }
+                        }
+                        ofp = NULL;
+                        bp->b_ofp = NULL;
+                }
+                bp = bp->b_bp;
+        }
 }
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/lkdata.c sdcc-3.2.0+dfsg/sdas/linksrc/lkdata.c
--- sdcc-3.1.0+dfsg/sdas/linksrc/lkdata.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/lkdata.c	2011-12-06 23:01:37.000000000 +0000
@@ -22,534 +22,602 @@
  * Kent, Ohio  44240
  *
  *   With enhancements from
- *	John L. Hartman	(JLH)
- *	jhartman@compuserve.com
+ *      John L. Hartman (JLH)
+ *      jhartman@compuserve.com
  *
  */
 
 #include "aslink.h"
 
-/*)Module	lkdata.c
+/*)Module       lkdata.c
  *
- *	The module lkdata contains the global variables
- *	and structures used in the linker aslink.
+ *      The module lkdata contains the global variables
+ *      and structures used in the linker aslink.
  */
 
 /*
  * Internal ASxxxx Version Variable
  */
-int	ASxxxx_VERSION;
+int     ASxxxx_VERSION;
 
 
 /*
- *	Definitions for all Global Variables
+ *      Definitions for all Global Variables
  */
 
-char	*_abs_	= { ".	.ABS." };
+char    *_abs_  = { ".  .ABS." };
+
+char    afspec[FILSPC]; /*      The filespec created by afile()
+                         */
+int     lkerr;          /*      Linker error flag
+                         */
+char    *ip;            /*      Pointer into the REL file text line in ib[]
+                         */
+char    ib[NINPUT];     /*      REL file text line
+                         */
+char    *rp;            /*      pointer into the LST file
+                         *      text line in rb[]
+                         */
+char    rb[NINPUT];     /*      LST file text line being
+                         *      address relocated
+                         */
+int     oflag;          /*      Output file type flag
+                         */
+int     objflg;         /*      Linked file/library object output flag
+                         */
 
-char	afspec[FILSPC];	/*	The filespec created by afile()
-			 */
-int	lkerr;		/*	Linker error flag
-			 */
-char	*ip;		/*	Pointer into the REL file text line in ib[]
-			 */
-char	ib[NINPUT];	/*	REL file text line
-			 */
-char	*rp;		/*	pointer into the LST file
-			 *	text line in rb[]
-			 */
-char	rb[NINPUT];	/*	LST file text line being
-			 *	address relocated
-			 */
-int	oflag;		/*	Output file type flag
-			 */
 #if NOICE
-int	jflag;		/*	NoICE output flag
-			 */
+int     jflag;          /*      NoICE output flag
+                         */
 #endif
 
 #if SDCDB
-int	yflag;		/*	SDCDB output flag
-			 */
+int     yflag;          /*      SDCDB output flag
+                         */
 #endif
 
-int	mflag;		/*	Map output flag
-			 */
-int	xflag;		/*	Map file radix type flag
-			 */
-int	pflag;		/*	print linker command file flag
-			 */
-int	uflag;		/*	Listing relocation flag
-			 */
-int	wflag;		/*	Enable wide format listing
-			 */
-int	zflag;		/*	Disable symbol case sensitivity
-			 */
-int	radix;		/*	current number conversion radix:
-			 *	2 (binary), 8 (octal), 10 (decimal),
-			 *	16 (hexadecimal)
-			 */
-int	line;		/*	current line number
-			 */
-int	page;		/*	current page number
-			 */
-int	lop;		/*	current line number on page
-			 */
-int	pass;		/*	linker pass number
-			 */
-int	pcb;		/*	current bytes per pc word
-			 */
-int	rtcnt;		/*	count of elements in the
-			 *	rtval[] and rtflg[] arrays
-			 */
-a_uint	rtval[NTXT];	/*	data associated with relocation
-			 */
-int	rtflg[NTXT];	/*	indicates if rtval[] value is
-			 *	to be sent to the output file.
-			 */
-int	rterr[NTXT];	/*	indicates if rtval[] value should
-			 *	be flagged as a relocation error.
-			 */
-char	rtbuf[NMAX];	/*	S19/IHX output buffer
-			 */
-			/*	rtbuf[] processing
-			 */
-a_uint	rtadr0 = 0;	/*
-			 */
-a_uint	rtadr1 = 0;	/*
-			 */
-a_uint	rtadr2 = 0;	/*
-			 */
-int	a_bytes;	/*	REL file T Line address length
-			 */
-int	hilo;		/*	REL file byte ordering
-			 */
-a_uint	a_mask;		/*	Address Mask
-			 */
-a_uint	s_mask;		/*	Sign Mask
-			 */
-a_uint	v_mask;		/*	Value Mask
-			 */
-int	gline;		/*	LST file relocation active
-			 *	for current line
-			 */
-int	gcntr;		/*	LST file relocation active
-			 *	counter
-			 */
+int     mflag;          /*      Map output flag
+                         */
+int     xflag;          /*      Map file radix type flag
+                         */
+int     pflag;          /*      print linker command file flag
+                         */
+int     uflag;          /*      Listing relocation flag
+                         */
+int     wflag;          /*      Enable wide format listing
+                         */
+int     zflag;          /*      Disable symbol case sensitivity
+                         */
+int     radix;          /*      current number conversion radix:
+                         *      2 (binary), 8 (octal), 10 (decimal),
+                         *      16 (hexadecimal)
+                         */
+int     line;           /*      current line number
+                         */
+int     page;           /*      current page number
+                         */
+int     lop;            /*      current line number on page
+                         */
+int     pass;           /*      linker pass number
+                         */
+a_uint  pc;             /*      current relocation address
+                         */
+int     pcb;            /*      current bytes per pc word
+                         */
+int     rtcnt;          /*      count of elements in the
+                         *      rtval[] and rtflg[] arrays
+                         */
+a_uint  rtval[NTXT];    /*      data associated with relocation
+                         */
+int     rtflg[NTXT];    /*      indicates if rtval[] value is
+                         *      to be sent to the output file.
+                         */
+int     rterr[NTXT];    /*      indicates if rtval[] value should
+                         *      be flagged as a relocation error.
+                         */
+char    rtbuf[NMAX];    /*      S19/IHX output buffer
+                         */
+struct  bank * rtabnk;  /*      rtbuf[] processing
+                         */
+int     rtaflg;         /*      rtbuf[] processing
+                         */
+a_uint  rtadr0 = 0;     /*
+                         */
+a_uint  rtadr1 = 0;     /*
+                         */
+a_uint  rtadr2 = 0;     /*
+                         */
+int     obj_flag = 0;   /*      Linked file/library object output flag
+                         */
+int     a_bytes;        /*      REL file T Line address length
+                         */
+int     hilo;           /*      REL file byte ordering
+                         */
+a_uint  a_mask;         /*      Address Mask
+                         */
+a_uint  s_mask;         /*      Sign Mask
+                         */
+a_uint  v_mask;         /*      Value Mask
+                         */
+int     gline;          /*      LST file relocation active
+                         *      for current line
+                         */
+int     gcntr;          /*      LST file relocation active
+                         *      counter
+                         */
 /* sdld specific */
-char	*optsdcc;
-char	*optsdcc_module;
-int	sflag;		/*	JCF: Memory usage output flag
-			 */
-int	packflag=0;	/*	JCF: Pack internal memory flag
-			 */
-int	stacksize=0;	/*	JCF: Stack size
-			 */
-int	aflag;		/*	Overlapping area warning flag
-			 */
-int	rflag;		/*	Extended linear address record flag.
-			 */
-a_uint	iram_size;	/*	internal ram size
-			 */
-long	xram_size = -1;	/*	external ram size
-			 */
-long	code_size = -1;	/*	code size
-			 */
+char    *optsdcc;
+char    *optsdcc_module;
+int     sflag;          /*      JCF: Memory usage output flag
+                         */
+int     packflag=0;     /*      JCF: Pack internal memory flag
+                         */
+int     stacksize=0;    /*      JCF: Stack size
+                         */
+int     aflag;          /*      Overlapping area warning flag
+                         */
+int     rflag;          /*      Extended linear address record flag.
+                         */
+a_uint  iram_size;      /*      internal ram size
+                         */
+long    xram_size = -1; /*      external ram size
+                         */
+long    code_size = -1; /*      code size
+                         */
 /* end sdld specific */
 
 /*
- *	The structure lfile contains a pointer to a
- *	file specification string, the file type,
- *	and a link to the next
- *	lfile structure.
- *
- *	struct	lfile
- *	{
- *		struct	lfile	*f_flp;		lfile link
- *		int	f_type;			File type
- *		char	*f_idp;			Pointer to file spec
- *	};
- */
-struct	lfile	*filep; /*	The pointers (lfile *) filep,
-			 *	(lfile *) cfp, and (FILE *) sfp
-			 *	are used in conjunction with
-			 *	the routine nxtline() to read
-			 *	asmlnk commands from
-			 *	(1) the standard input or
-			 *	(2) or a command file
-			 *	and to read the REL files
-			 *	sequentially as defined by the
-			 *	asmlnk input commands.
-			 *
-			 *	The pointer *filep points to the
-			 *	beginning of a linked list of
-			 *	lfile structures.
-			 */
-struct	lfile	*cfp;	/*	The pointer *cfp points to the
-			 *	current lfile structure
-			 */
-struct	lfile	*startp;/*	aslink startup file structure
-			 */
-struct	lfile	*linkp; /*	pointer to first lfile structure
-			 *	containing an input REL file
-			 *	specification
-			 */
-struct	lfile	*lfp;	/*	pointer to current lfile structure
-			 *	being processed by parse()
-			 */
-FILE	*ofp = NULL;	/*	Output file handle
-			 *	for word formats
-			 */
+ *      The structure lfile contains a pointer to a
+ *      file specification string, an index which points
+ *      to the file name (past the 'path'), the file type,
+ *      an object output flag, and a link to the next
+ *      lfile structure.
+ *
+ *      struct  lfile
+ *      {
+ *              struct  lfile   *f_flp;         lfile link
+ *              int     f_type;                 File type
+ *              char    *f_idp;                 Pointer to file spec
+ *              int     f_obj;                  Object output flag
+ *      };
+ */
+struct  lfile   *filep; /*      The pointers (lfile *) filep,
+                         *      (lfile *) cfp, and (FILE *) sfp
+                         *      are used in conjunction with
+                         *      the routine nxtline() to read
+                         *      asmlnk commands from
+                         *      (1) the standard input or
+                         *      (2) or a command file
+                         *      and to read the REL files
+                         *      sequentially as defined by the
+                         *      asmlnk input commands.
+                         *
+                         *      The pointer *filep points to the
+                         *      beginning of a linked list of
+                         *      lfile structures.
+                         */
+struct  lfile   *cfp;   /*      The pointer *cfp points to the
+                         *      current lfile structure
+                         */
+struct  lfile   *startp;/*      aslink startup file structure
+                         */
+struct  lfile   *linkp; /*      pointer to first lfile structure
+                         *      containing an input REL file
+                         *      specification
+                         */
+struct  lfile   *lfp;   /*      pointer to current lfile structure
+                         *      being processed by parse()
+                         */
+FILE    *ofp = NULL;    /*      Output file handle
+                         *      for word formats
+                         */
 
 #if NOICE
-FILE	*jfp = NULL;	/*	NoICE output file handle
-			 */
+FILE    *jfp = NULL;    /*      NoICE output file handle
+                         */
 #endif
 
 #if SDCDB
-FILE	*yfp = NULL;	/*	SDCDB output file handle
-			 */
+FILE    *yfp = NULL;    /*      SDCDB output file handle
+                         */
 #endif
 
-FILE	*mfp = NULL;	/*	Map output file handle
-			 */
-FILE	*rfp = NULL;	/*	File handle for output
-			 *	address relocated ASxxxx
-			 *	listing file
-			 */
-FILE	*sfp = NULL;	/*	The file handle sfp points to the
-			 *	currently open file
-			 */
-FILE	*tfp = NULL;	/*	File handle for input
-			 *	ASxxxx listing file
-			 */
-
-/*
- *	The structures of head, area, areax, and sym
- *	are created as the REL files are read during the first
- *	pass of the linker.  The struct head is created upon
- *	encountering a H directive in the REL file.  The
- *	structure contains a link to a link file structure
- *	(struct lfile) which describes the file containing the H
- *	directive, the number of data/code areas
- *	contained in this header segment, the number of
- *	symbols referenced/defined in this header segment, a pointer
- *	to an array of pointers to areax structures (struct areax)
- *	created as each A directive is read, and a pointer to an
- *	array of pointers to symbol structures (struct sym) for
- *	all referenced/defined symbols.  As H directives are read
- *	from the REL files a linked list of head structures is
- *	created by placing a link to the new head structure
- *	in the previous head structure.
- *
- *	struct	head
- *	{
- *		struct	head   *h_hp;		Header link
- *		struct	lfile  *h_lfile;	Associated file
- *		int	h_narea;		# of areas
- *		struct	areax **a_list;		Area list
- *		int	h_nsym;			# of symbols
- *		struct	sym   **s_list;		Symbol list
- *		char *	m_id;			Module name
- *	};
- */
-struct	head	*headp; /*	The pointer to the first
-			 *	head structure of a linked list
-			 */
-struct	head	*hp;	/*	Pointer to the current
-			 *	head structure
-			 */
-
-/*
- *	A structure area is created for each 'unique' data/code
- *	area definition found as the REL files are read.  The
- *	struct area contains the name of the area, a flag byte
- *	which contains the area attributes (REL/CON/OVR/ABS),
- *	the area subtype (not used in this assembler), and the
- *	area base address and total size which will be filled
- *	in at the end of the first pass through the REL files.
- *	As A directives are read from the REL files a linked
- *	list of unique area structures is created by placing a
- *	link to the new area structure in the previous area structure.
- *
- *	struct	area
- *	{
- *		struct	area	*a_ap;		Area link
- *		struct	areax	*a_axp;		Area extension link
- *		a_uint	a_addr;			Beginning address of area
- *		a_uint	a_size;			Total size of the area
- *		char	a_type;			Area subtype
- *		int	a_flag;			Flags
- *		char *	a_id;			Name
- *	};
- */
-struct	area	*areap; /*	The pointer to the first
-			 *	area structure of a linked list
-			 */
-struct	area	*ap;	/*	Pointer to the current
-			 *	area structure
-			 */
-
-/*
- *	An areax structure is created for every A directive found
- *	while reading the REL files.  The struct areax contains a
- *	link to the 'unique' area structure referenced by the A
- *	directive and to the head structure this area segment is
- *	a part of.  The size of this area segment as read from the
- *	A directive is placed in the areax structure.  The beginning
- *	address of this segment will be filled in at the end of the
- *	first pass through the REL files.  As A directives are read
- *	from the REL files a linked list of areax structures is
- *	created for each unique area.  The final areax linked
- *	list has at its head the 'unique' area structure linked
- *	to the linked areax structures (one areax structure for
- *	each A directive for this area).
- *
- *	struct	areax
- *	{
- *		struct	areax	*a_axp;		Area extension link
- *		struct	area	*a_bap;		Base area link
- *		struct	head	*a_bhp;		Base header link
- *		a_uint	a_addr;			Beginning address of section
- *		a_uint	a_size;			Size of the area in section
- *	};
- */
-struct	areax	*axp;	/*	Pointer to the current
-			 *	areax structure
-			 */
-
-/*
- *	A sym structure is created for every unique symbol
- *	referenced/defined while reading the REL files.  The
- *	struct sym contains the symbol's name, a flag value
- *	(not used in this linker), a symbol type denoting
- *	referenced/defined, and an address which is loaded
- *	with the relative address within the area in which
- *	the symbol was defined.  The sym structure also
- *	contains a link to the area where the symbol was defined.
- *	The sym structures are linked into linked lists using
- *	the symbol link element.
- *
- *	struct	sym
- *	{
- *		struct	sym	*s_sp;		Symbol link
- *		struct	areax	*s_axp;		Symbol area link
- *		char	s_type;			Symbol subtype
- *		char	s_flag;			Flag byte
- *		a_uint	s_addr;			Address
- *		char	*s_id;			Name (JLH)
- *		char	*m_id;			Module
- *	};
- */
-struct	sym *symhash[NHASH]; /* array of pointers to NHASH
-			      * linked symbol lists
-			      */
-/*
- *	The struct base contains a pointer to a
- *	base definition string and a link to the next
- *	base structure.
- *
- *	struct	base
- *	{
- *		struct	base  *b_base;		Base link
- *		char	      *b_strp;		String pointer
- *	};
- */
-struct	base	*basep; /*	The pointer to the first
-			 *	base structure
-			 */
-struct	base	*bsp;	/*	Pointer to the current
-			 *	base structure
-			 */
-
-/*
- *	The struct globl contains a pointer to a
- *	global definition string and a link to the next
- *	global structure.
- *
- *	struct	globl
- *	{
- *		struct	globl *g_globl;		Global link
- *		char	      *g_strp;		String pointer
- *	};
- */
-struct	globl	*globlp;/*	The pointer to the first
-			 *	globl structure
-			 */
-struct	globl	*gsp;	/*	Pointer to the current
-			 *	globl structure
-			 */
-
-/*
- *	A structure sdp is created for each 'unique' paged
- *	area definition found as the REL files are read.
- *	As P directives are read from the REL files a linked
- *	list of unique sdp structures is created by placing a
- *	link to the new sdp structure in the previous area structure.
- *
- *	struct	sdp
- *	{
- *		struct	area  *s_area;	Paged Area link
- *		struct	areax *s_areax; Paged Area Extension Link
- *		a_uint	s_addr;		Page address offset
- *	};
- */
-struct	sdp	sdp;	/* Base Page Structure */
-
-/*
- *	The structure rerr is loaded with the information
- *	required to report an error during the linking
- *	process.  The structure contains an index value
- *	which selects the areax structure from the header
- *	areax structure list, a mode value which selects
- *	symbol or area relocation, the base address in the
- *	area section, an area/symbol list index value, and
- *	an area/symbol offset value.
- *
- *	struct	rerr
- *	{
- *		int	aindex;		Linking area
- *		int	mode;		Relocation mode
- *		a_uint	rtbase;		Base address in section
- *		int	rindex;		Area/Symbol relocation index
- *		a_uint	rval;		Area/Symbol offset value
- *	};
- */
-struct	rerr	rerr;	/*	Structure containing the
-			 *	linker error information
-			 */
-
-/*
- *	The structure lbpath is created for each library
- *	path specification input by the -k option.  The
- *	lbpath structures are linked into a list using
- *	the next link element.
- *
- *	struct lbpath {
- *		struct	lbpath	*next;
- *		char		*path;
- *	};
- */
-struct	lbpath	*lbphead;	/*	pointer to the first
-				 *	library path structure
-				 */
-
-/*
- *	The structure lbname is created for all combinations of the
- *	library path specifications (input by the -k option) and the
- *	library file specifications (input by the -l option) that
- *	lead to an existing file.  The element path points to
- *	the path string, element libfil points to the library
- *	file string, and the element libspc is the concatenation
- *	of the valid path and libfil strings.
- *
- *	The lbpath structures are linked into a list
- *	using the next link element.
- *
- *	Each library file contains a list of object files
- *	that are contained in the particular library. e.g.:
- *
- *		\iolib\termio
- *		\inilib\termio
- *
- *	Only one specification per line is allowed.
- *
- *	struct lbname {
- *		struct	lbname	*next;
- *		char		*path;
- *		char		*libfil;
- *		char		*libspc;
- *	};
- */
-struct	lbname	*lbnhead;	/*	pointer to the first
-				 *	library name structure
-				 */
-
-/*
- *	The function fndsym() searches through all combinations of the
- *	library path specifications (input by the -k option) and the
- *	library file specifications (input by the -l option) that
- *	lead to an existing file for a symbol definition.
- *
- *	The structure lbfile is created for the first library
- *	object file which contains the definition for the
- *	specified undefined symbol.
- *
- *	The element libspc points to the library file path specification
- *	and element relfil points to the object file specification string.
- *	The element filspc is the complete path/file specification for
- *	the library file to be imported into the linker.
- *	The file specification
- *	may be formed in one of two ways:
- *
- *	(1)	If the library file contained an absolute
- *		path/file specification then this becomes filspc.
- *		(i.e. C:\...)
- *
- *	(2)	If the library file contains a relative path/file
- *		specification then the concatenation of the path
- *		and this file specification becomes filspc.
- *		(i.e. \...)
- *
- *	The lbpath structures are linked into a list
- *	using the next link element.
- *
- *	struct lbfile {
- *		struct	lbfile	*next;
- *		char		*libspc;
- *		char		*relfil;
- *		char		*filspc;
- *	};
- */
-struct	lbfile	*lbfhead;	/*	pointer to the first
-				 *	library file structure
-				 */
-/* sdld 8015 specific */
+FILE    *mfp = NULL;    /*      Map output file handle
+                         */
+FILE    *rfp = NULL;    /*      File handle for output
+                         *      address relocated ASxxxx
+                         *      listing file
+                         */
+FILE    *sfp = NULL;    /*      The file handle sfp points to the
+                         *      currently open file
+                         */
+FILE    *tfp = NULL;    /*      File handle for input
+                         *      ASxxxx listing file
+                         */
+
+/*
+ *      The structures of head, bank, area, areax, and sym
+ *      are created as the REL files are read during the first
+ *      pass of the linker.  The struct head is created upon
+ *      encountering a H directive in the REL file.  The
+ *      structure contains a link to a link file structure
+ *      (struct lfile) which describes the file containing the H
+ *      directive, a pointer to an array of merge mode
+ *      definition pointers, the number of data/code areas
+ *      contained in this header segment, the number of
+ *      symbols referenced/defined in this header segment, a pointer
+ *      to an array of pointers to areax structures (struct areax)
+ *      created as each A directive is read, a pointer to an
+ *      array of pointers to symbol structures (struct sym) for
+ *      all referenced/defined symbols and a pointer to an array
+ *      of pointers to bank structures (struct bank) referenced
+ *      by this module.  As H directives are read
+ *      from the REL files a linked list of head structures is
+ *      created by placing a link to the new head structure
+ *      in the previous head structure.
+ *
+ *      struct  head
+ *      {
+ *              struct  head   *h_hp;           Header link
+ *              struct  lfile  *h_lfile;        Associated file
+ *              int     h_narea;                # of areas
+ *              struct  areax **a_list;         Area list
+ *              int     h_nsym;                 # of symbols
+ *              struct  sym   **s_list;         Symbol list
+ *              int     h_nbank;                # of banks
+ *              struct  bank  **b_list;         Bank list
+ *              int     h_nmode;                # of modes
+ *              struct  mode  **m_list;         Mode list
+ *              char *  m_id;                   Module name
+ *      };
+ */
+struct  head    *headp; /*      The pointer to the first
+                         *      head structure of a linked list
+                         */
+struct  head    *hp;    /*      Pointer to the current
+                         *      head structure
+                         */
+
+/*
+ *      The bank structure contains the parameter values for a
+ *      specific program or data bank.  The bank structure
+ *      is a linked list of banks.  The initial default bank
+ *      is unnamed and is defined in lkdata.c, the next bank structure
+ *      will be linked to this structure through the structure
+ *      element 'struct bank *b_bp'.  The structure contains the
+ *      bank name, the bank base address (default = 0)
+ *      the bank size, (default = 0, whole addressing space)
+ *      and the file name suffix. (default is none)  These optional
+ *      parameters are from  the .bank assembler directive.
+ *      The bank structure also contains the bank data output
+ *      file specificatiion, file handle pointer and the
+ *      bank first output flag.
+ *
+ *      struct  bank
+ *      {
+ *              struct  bank *b_bp;     Bank link
+ *              char *  b_id;           Bank Name
+ *              char *  b_fsfx;         Bank File Suffix
+ *              a_uint  b_base;         Bank base address
+ *              a_uint  b_size;         Bank size
+ *              a_uint  b_map           Bank mapping
+ *              int     b_flag;         Bank flags
+ *              char *  b_fspec;        Bank File Specification
+ *              FILE *  b_ofp;          Bank File Handle
+ *              int     b_oflag;        Bank has output flag
+ *              int     b_rtaflg        Bank First Output flag
+ *      };
+ */
+struct  bank    bank[1] = {
+    {   NULL,   "",     "",     0,      0,      0,      0,      "",     NULL,   0,      1       }
+};
+
+struct  bank    *bankp = &bank[0];
+                        /*      The pointer to the first
+                         *      bank structure
+                         */
+struct  bank    *bp;    /*      Pointer to the current
+                         *      bank structure
+                         */
+
+/*
+ *      A structure area is created for each 'unique' data/code
+ *      area definition found as the REL files are read.  The
+ *      struct area contains the name of the area, a flag byte
+ *      which contains the area attributes (REL/CON/OVR/ABS),
+ *      the area base address set flag byte (-b option), and the
+ *      area base address and total size which will be filled
+ *      in at the end of the first pass through the REL files.
+ *      The area structure also contains a link to the bank
+ *      this area is a part of and a data output file handle
+ *      pointer which is loaded from from the bank structure.
+ *      As A directives are read from the REL files a linked
+ *      list of unique area structures is created by placing a
+ *      link to the new area structure in the previous area structure.
+ *
+ *      struct  area
+ *      {
+ *              struct  area    *a_ap;          Area link
+ *              struct  areax   *a_axp;         Area extension link
+ *              struct  bank    *a_bp;          Bank link
+ *              FILE *  a_ofp;                  Area File Handle
+ *              a_uint  a_addr;                 Beginning address of area
+ *              a_uint  a_size;                 Total size of the area
+ *              int     a_bset;                 Area base address set
+ *              int     a_flag;                 Flags
+ *              char *  a_id;                   Name
+ *      };
+ */
+struct  area    *areap; /*      The pointer to the first
+                         *      area structure of a linked list
+                         */
+struct  area    *ap;    /*      Pointer to the current
+                         *      area structure
+                         */
+
+/*
+ *      An areax structure is created for every A directive found
+ *      while reading the REL files.  The struct areax contains a
+ *      link to the 'unique' area structure referenced by the A
+ *      directive and to the head structure this area segment is
+ *      a part of.  The size of this area segment as read from the
+ *      A directive is placed in the areax structure.  The beginning
+ *      address of this segment will be filled in at the end of the
+ *      first pass through the REL files.  As A directives are read
+ *      from the REL files a linked list of areax structures is
+ *      created for each unique area.  The final areax linked
+ *      list has at its head the 'unique' area structure linked
+ *      to the linked areax structures (one areax structure for
+ *      each A directive for this area).
+ *
+ *      struct  areax
+ *      {
+ *              struct  areax   *a_axp;         Area extension link
+ *              struct  area    *a_bap;         Base area link
+ *              struct  head    *a_bhp;         Base header link
+ *              a_uint  a_addr;                 Beginning address of section
+ *              a_uint  a_size;                 Size of the area in section
+ *      };
+ */
+struct  areax   *axp;   /*      Pointer to the current
+                         *      areax structure
+                         */
+
+/*
+ *      A sym structure is created for every unique symbol
+ *      referenced/defined while reading the REL files.  The
+ *      struct sym contains the symbol's name, a flag value
+ *      (not used in this linker), a symbol type denoting
+ *      referenced/defined, and an address which is loaded
+ *      with the relative address within the area in which
+ *      the symbol was defined.  The sym structure also
+ *      contains a link to the area where the symbol was defined.
+ *      The sym structures are linked into linked lists using
+ *      the symbol link element.
+ *
+ *      struct  sym
+ *      {
+ *              struct  sym     *s_sp;          Symbol link
+ *              struct  areax   *s_axp;         Symbol area link
+ *              char    s_type;                 Symbol subtype
+ *              char    s_flag;                 Flag byte
+ *              a_uint  s_addr;                 Address
+ *              char    *s_id;                  Name (JLH)
+ *              char    *m_id;                  Module
+ *      };
+ */
+struct  sym *symhash[NHASH]; /* array of pointers to NHASH
+                              * linked symbol lists
+                              */
+/*
+ *      The struct base contains a pointer to a
+ *      base definition string and a link to the next
+ *      base structure.
+ *
+ *      struct  base
+ *      {
+ *              struct  base  *b_base;          Base link
+ *              char          *b_strp;          String pointer
+ *      };
+ */
+struct  base    *basep; /*      The pointer to the first
+                         *      base structure
+                         */
+struct  base    *bsp;   /*      Pointer to the current
+                         *      base structure
+                         */
+
+/*
+ *      The struct globl contains a pointer to a
+ *      global definition string and a link to the next
+ *      global structure.
+ *
+ *      struct  globl
+ *      {
+ *              struct  globl *g_globl;         Global link
+ *              char          *g_strp;          String pointer
+ *      };
+ */
+struct  globl   *globlp;/*      The pointer to the first
+                         *      globl structure
+                         */
+struct  globl   *gsp;   /*      Pointer to the current
+                         *      globl structure
+                         */
+
+/*
+ *      A structure sdp is created for each 'unique' paged
+ *      area definition found as the REL files are read.
+ *      As P directives are read from the REL files a linked
+ *      list of unique sdp structures is created by placing a
+ *      link to the new sdp structure in the previous area structure.
+ *
+ *      struct  sdp
+ *      {
+ *              struct  area  *s_area;  Paged Area link
+ *              struct  areax *s_areax; Paged Area Extension Link
+ *              a_uint  s_addr;         Page address offset
+ *      };
+ */
+struct  sdp     sdp;    /* Base Page Structure */
+
+/*
+ *      The structure rerr is loaded with the information
+ *      required to report an error during the linking
+ *      process.  The structure contains an index value
+ *      which selects the areax structure from the header
+ *      areax structure list, a mode value which selects
+ *      symbol or area relocation, the base address in the
+ *      area section, an area/symbol list index value, and
+ *      an area/symbol offset value.
+ *
+ *      struct  rerr
+ *      {
+ *              int     aindex;         Linking area
+ *              int     mode;           Relocation mode
+ *              a_uint  rtbase;         Base address in section
+ *              int     rindex;         Area/Symbol relocation index
+ *              a_uint  rval;           Area/Symbol offset value
+ *      };
+ */
+struct  rerr    rerr;   /*      Structure containing the
+                         *      linker error information
+                         */
+
+/*
+ *      The structure lbpath is created for each library
+ *      path specification input by the -k option.  The
+ *      lbpath structures are linked into a list using
+ *      the next link element.
+ *
+ *      struct lbpath {
+ *              struct  lbpath  *next;
+ *              char            *path;
+ *      };
+ */
+struct  lbpath  *lbphead;       /*      pointer to the first
+                                 *      library path structure
+                                 */
+
+/*
+ *      The structure lbname is created for all combinations of the
+ *      library path specifications (input by the -k option) and the
+ *      library file specifications (input by the -l option) that
+ *      lead to an existing file.  The element path points to
+ *      the path string, element libfil points to the library
+ *      file string, and the element libspc is the concatenation
+ *      of the valid path and libfil strings.
+ *
+ *      The lbpath structures are linked into a list
+ *      using the next link element.
+ *
+ *      Each library file contains a list of object files
+ *      that are contained in the particular library. e.g.:
+ *
+ *              \iolib\termio
+ *              \inilib\termio
+ *
+ *      Only one specification per line is allowed.
+ *
+ *      struct lbname {
+ *              struct  lbname  *next;
+ *              char            *path;
+ *              char            *libfil;
+ *              char            *libspc;
+ *              char            f_obj;
+ *      };
+ */
+struct  lbname  *lbnhead;       /*      pointer to the first
+                                 *      library name structure
+                                 */
+
+/*
+ *      The function fndsym() searches through all combinations of the
+ *      library path specifications (input by the -k option) and the
+ *      library file specifications (input by the -l option) that
+ *      lead to an existing file for a symbol definition.
+ *
+ *      The structure lbfile is created for the first library
+ *      object file which contains the definition for the
+ *      specified undefined symbol.
+ *
+ *      The element libspc points to the library file path specification
+ *      and element relfil points to the object file specification string.
+ *      The element filspc is the complete path/file specification for
+ *      the library file to be imported into the linker.  The f_obj
+ *      flag specifies if the object code from this file is
+ *      to be output by the linker.  The file specification
+ *      may be formed in one of two ways:
+ *
+ *      (1)     If the library file contained an absolute
+ *              path/file specification then this becomes filspc.
+ *              (i.e. C:\...)
+ *
+ *      (2)     If the library file contains a relative path/file
+ *              specification then the concatenation of the path
+ *              and this file specification becomes filspc.
+ *              (i.e. \...)
+ *
+ *      The lbpath structures are linked into a list
+ *      using the next link element.
+ *
+ *      struct lbfile {
+ *              struct  lbfile  *next;
+ *              char            *libspc;
+ *              char            *relfil;
+ *              char            *filspc;
+ *              int             f_obj;
+ *      };
+ */
+struct  lbfile  *lbfhead;       /*      pointer to the first
+                                 *      library file structure
+                                 */
+/* sdld 8051 specific */
 char idatamap[256];
-/* end sdld 8015 specific */
+/* end sdld 8051 specific */
 
 /*
- *	array of character types, one per
- *	ASCII character
+ *      array of character types, one per
+ *      ASCII character
  */
 char   ctype[128] = {
-/*NUL*/ ILL,	ILL,	ILL,	ILL,	ILL,	ILL,	ILL,	ILL,
-/*BS*/	ILL,	SPACE,	ILL,	ILL,	SPACE,	ILL,	ILL,	ILL,
-/*DLE*/ ILL,	ILL,	ILL,	ILL,	ILL,	ILL,	ILL,	ILL,
-/*CAN*/ ILL,	ILL,	ILL,	ILL,	ILL,	ILL,	ILL,	ILL,
-/*SPC*/ SPACE,	ETC,	ETC,	ETC,	LETTER, BINOP,	BINOP,	ETC,
-/*(*/	ETC,	ETC,	BINOP,	BINOP,	ETC,	BINOP,	LETTER, BINOP,
-/*0*/	DGT2,	DGT2,	DGT8,	DGT8,	DGT8,	DGT8,	DGT8,	DGT8,
-/*8*/	DGT10,	DGT10,	ETC,	ETC,	BINOP,	ETC,	BINOP,	ETC,
-/*@*/	ETC,	LTR16,	LTR16,	LTR16,	LTR16,	LTR16,	LTR16,	LETTER,
-/*H*/	LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER,
-/*P*/	LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER,
-/*X*/	LETTER, LETTER, LETTER, BINOP,	ETC,	ETC,	BINOP,	LETTER,
-/*`*/	ETC,	LTR16,	LTR16,	LTR16,	LTR16,	LTR16,	LTR16,	LETTER,
-/*h*/	LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER,
-/*p*/	LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER,
-/*x*/	LETTER, LETTER, LETTER, ETC,	BINOP,	ETC,	ETC,	ETC
+/*NUL*/ ILL,    ILL,    ILL,    ILL,    ILL,    ILL,    ILL,    ILL,
+/*BS*/  ILL,    SPACE,  ILL,    ILL,    SPACE,  ILL,    ILL,    ILL,
+/*DLE*/ ILL,    ILL,    ILL,    ILL,    ILL,    ILL,    ILL,    ILL,
+/*CAN*/ ILL,    ILL,    ILL,    ILL,    ILL,    ILL,    ILL,    ILL,
+/*SPC*/ SPACE,  ETC,    ETC,    ETC,    LETTER, BINOP,  BINOP,  ETC,
+/*(*/   ETC,    ETC,    BINOP,  BINOP,  ETC,    BINOP,  LETTER, BINOP,
+/*0*/   DGT2,   DGT2,   DGT8,   DGT8,   DGT8,   DGT8,   DGT8,   DGT8,
+/*8*/   DGT10,  DGT10,  ETC,    ETC,    BINOP,  ETC,    BINOP,  ETC,
+/*@*/   ETC,    LTR16,  LTR16,  LTR16,  LTR16,  LTR16,  LTR16,  LETTER,
+/*H*/   LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER,
+/*P*/   LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER,
+/*X*/   LETTER, LETTER, LETTER, BINOP,  ETC,    ETC,    BINOP,  LETTER,
+/*`*/   ETC,    LTR16,  LTR16,  LTR16,  LTR16,  LTR16,  LTR16,  LETTER,
+/*h*/   LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER,
+/*p*/   LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER, LETTER,
+/*x*/   LETTER, LETTER, LETTER, ETC,    BINOP,  ETC,    ETC,    ETC
 };
 
 /*
- *	an array of characters which
- *	perform the case translation function
+ *      an array of characters which
+ *      perform the case translation function
  */
-char	ccase[128] = {
+char    ccase[128] = {
 /*NUL*/ '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-/*BS*/	'\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+/*BS*/  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
 /*DLE*/ '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
 /*CAN*/ '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
 /*SPC*/ '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
-/*(*/	'\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
-/*0*/	'\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
-/*8*/	'\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
-/*@*/	'\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-/*H*/	'\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-/*P*/	'\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-/*X*/	'\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
-/*`*/	'\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-/*h*/	'\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-/*p*/	'\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-/*x*/	'\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177'
+/*(*/   '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+/*0*/   '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+/*8*/   '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+/*@*/   '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+/*H*/   '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+/*P*/   '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+/*X*/   '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+/*`*/   '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+/*h*/   '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+/*p*/   '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+/*x*/   '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177'
 };
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/lkhead.c sdcc-3.2.0+dfsg/sdas/linksrc/lkhead.c
--- sdcc-3.1.0+dfsg/sdas/linksrc/lkhead.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/lkhead.c	2011-12-18 17:44:59.000000000 +0000
@@ -27,11 +27,13 @@
 /*Module	lkhead.c
  *
  *	The module lkhead.c contains the function newhead() which
- *	creates a head structure and the function module() which
- *	loads the module name into the current head structure.
+ *	creates a head structure, the function module() which
+ *	loads the module name into the current head structure,
+ *	and newmode() which loads the linker merge modes.
  *
  *	lkhead.c contains the following functions:
  *		VOID	newhead()
+ *		VOID	newmode()
  *		VOID	module()
  *
  *	lkhead.c contains no local variables.
@@ -45,6 +47,7 @@
  *
  *	local variables:
  *		int	i		evaluation value
+ *		char	id[]		temporary string
  *		head *	thp		temporary pointer
  *					to a header structure
  *
@@ -60,14 +63,20 @@
  *
  *	functions called:
  *		a_uint	expr()		lkeval.c
+ *		a_uint	eval()		lkeval.c
+ *		VOID	getid()		lklex.c
  *		VOID *	new()		lksym.c
  *		VOID	lkparea()	lkarea.c
+ *		int	more()		lklex.c
+ *		int	symeq()		lksym.c
  *
  *	side effects:
  *		A new head structure is created and linked to any
  *		existing linked head structure.  The head structure
- *		parameters of file handle, number of areas, and number
- *		of global symbols are loaded into the structure.
+ *		parameters of file handle, number of areas, number
+ *		of global symbols, number of banks and number of
+ *		merge modes are loaded into the structure.  The
+ *		area, bank, symbol, and mode structure lists are created.
  *		The default area "_abs_" is created when the first
  *		head structure is created and an areax structure is
  *		created for every head structure called.
@@ -76,16 +85,19 @@
 /*
  * Create a new header entry.
  *
- * H n areas n global symbols
- *   |	     |
- *   |	     `---- hp->h_nsym
- *   `------------ hp->h_narea
+ * H n areas n global symbols n banks n modes
+ *   |       |                |       |
+ *   |       |                |       `----- G Lines
+ *   |       |                `------------- B Lines
+ *   |	     `------------------------------ hp->h_nsym
+ *   `-------------------------------------- hp->h_narea
  *
  */
 VOID
 newhead()
 {
 	int i;
+	char id[NCPS];
 	struct head *thp;
 
 	hp = (struct head *) new (sizeof(struct head));
@@ -103,18 +115,45 @@
 	hp->h_lfile = cfp;		/* Set file pointer */
 	hp->m_id = "";			/* No Module */
 	/*
-	 * Evaluate and build Area pointer list
+	 * Scan for Parameters	 
 	 */
-	i = hp->h_narea = eval();
-	if (i)
-		hp->a_list = (struct areax **) new (i*sizeof(struct areax *));
-	/*
-	 * Evaluate and build Global symbol pointer list
-	 */
-	skip(-1);
-	i = hp->h_nsym = eval();
-	if (i)
-		hp->s_list = (struct sym **) new (i*sizeof(struct sym *));
+	while (more()) {
+		i = (int) eval();
+		getid(id, -1);
+		/*
+		 * Area pointer list
+		 */
+		if (symeq("areas", id, 1)) {
+			hp->h_narea = i;
+			if (i)
+				hp->a_list = (struct areax **) new (i*sizeof(struct areax *));
+		} else
+		/*
+		 * Symbol pointer list
+		 */
+		if (symeq("global", id, 1)) {
+			hp->h_nsym = i;
+			if (i)
+				hp->s_list = (struct sym **) new (i*sizeof(struct sym *));
+			skip(-1);
+		} else
+		/*
+		 * Bank pointer list
+		 */
+		if (symeq("banks", id, 1)) {
+			hp->h_nbank = i;
+			if (i)
+				hp->b_list = (struct bank **) new (i*sizeof(struct bank *));
+		} else
+		/*
+		 * Mode pointer list
+		 */
+		if (symeq("modes", id, 1)) {
+			hp->h_nmode = i;
+			if (i)
+				hp->m_list = (struct mode **) new (i*sizeof(struct mode *));
+		}
+	}
 	/*
 	 * Setup Absolute DEF linkage.
 	 */
@@ -124,6 +163,116 @@
 }
 
 
+/*)Function	VOID	newmode()
+ *
+ *	The function newmode() creates / fills in a merge mode
+ *	definition for this module.
+ *
+ *	The MODE structure contains the specification of one of the
+ *	assemblers' relocation modes.  Each assembler must specify
+ *	at least one relocation mode.  The relocation specification
+ *	allows arbitrarily defined active bits and bit positions.
+ *	The 32 element arrays are indexed from 0 to 31.
+ *	Index 0 corresponds to bit 0, ..., and 31 corresponds to bit 31
+ *	of a normal integer value.
+ *
+ *	The value an array element defines if the normal integer bit is
+ *	active (bit <7> is set, 0x80) and what destination bit
+ *	(bits <4:0>, 0 - 31) should be loaded with this normal
+ *	integer bit.
+ *
+ *	The mode structure also contains a flag indicating if bit
+ *	positioning is required, a mask word containing the active
+ *	bits for merging, and an address paging mask.
+ *
+ *	local variables:
+ *		int	index		bit index of mode definition
+ *		int	n		counter
+ *		struct mode *mp		pointer to a mode structure
+ *
+ *	global variables:
+ *		head	*headp		The pointer to the first
+ *				 	head structure of a linked list
+ *		head	*hp		Pointer to the current
+ *				 	head structure
+ *		FILE *	stderr		standard library error handle
+ *
+ *	functions called:
+ *		a_uint	eval()		lkexpr.c
+ *		int	fprintf()	c_library
+ *		VOID	lkexit()	lkmain.c
+ *		int	more()		lklex.c
+ *		char *	new()		lksym.c
+ *
+ *	side effects:
+ *		The merge mode structure is created / updated with
+ *		the definition values.
+ */
+
+VOID
+newmode()
+{
+	int index, n;
+	a_uint v;
+	struct mode *mp;
+
+	if (headp == NULL) {
+		fprintf(stderr, "No header defined\n");
+		lkexit(ER_FATAL);
+	}
+	/*
+	 * Mode number
+	 */
+	n = (int) eval();
+	if (n >= hp->h_nmode) {
+		fprintf(stderr, "Header mode list overflow\n");
+		lkexit(ER_FATAL);
+	}
+	/*
+	 * Bit index
+	 */
+	index = (int) eval();
+	if (index == 0) {
+		mp = (struct mode *) new (sizeof(struct mode));
+		hp->m_list[n] = mp;
+		/*
+		 * Initialize Mode
+		 */
+		for (n=0; n<32; n++) {
+			mp->m_def[n] = n;
+		}
+	} else {
+		mp = hp->m_list[n];
+	}
+	/*
+	 * Load Bits
+	 */
+	while (more() && (index < 32)) {
+		n = (int) eval();
+		if (mp->m_def[index] != (n & 0x1F)) {
+			mp->m_flag |= 1;
+		}
+		mp->m_def[index] = n;
+		if (n & 0x80) {
+			mp->m_dbits |= (((a_uint) 1) << (n & 0x1F));
+			mp->m_sbits |= (((a_uint) 1) << index);
+		}
+		index += 1;
+	}
+	/*
+	 * Set Missing Low Order Bits
+	 */
+	for (n=0; n<32; n++) {
+		v = 1 << n;
+		if (mp->m_sbits & v) {
+			break;
+		} else {
+			mp->m_sbits |= v;
+		}
+	}
+}
+
+
 /*)Function	VOID	module()
  *
  *	The function module() copies the module name into
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/lklex.c sdcc-3.2.0+dfsg/sdas/linksrc/lklex.c
--- sdcc-3.1.0+dfsg/sdas/linksrc/lklex.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/lklex.c	2011-12-18 17:44:59.000000000 +0000
@@ -24,650 +24,646 @@
 
 #include "aslink.h"
 
-/*)Module	lklex.c
+/*)Module       lklex.c
  *
- *	The module lklex.c contains the general lexical analysis
- *	functions used to scan the text lines from the .rel files.
+ *      The module lklex.c contains the general lexical analysis
+ *      functions used to scan the text lines from the .rel files.
  *
- *	lklex.c contains the following functions:
- *		VOID	chopcrlf()
- *		char	endline()
- *		int	get()
- *		VOID	getfid()
- *		VOID	getid()
- *		VOID	getSid()
- *		int	getmap()
- *		int	getnb()
- *		int	more()
- *		int	nxtline()
- *		VOID	skip()
- *		VOID	unget()
- *
- *	lklex.c contains no local variables.
- */
-
-/*)Function	VOID	getid(id,c)
- *
- *		char *	id		a pointer to a string of
- *					maximum length NCPS-1
- *		int	c		mode flag
- *					>=0	this is first character to
- *						copy to the string buffer
- *					<0	skip white space
- *
- *	The function getid() scans the current input text line
- *	from the current position copying the next LETTER | DIGIT string
- *	into the external string buffer (id).  The string ends when a non
- *	LETTER or DIGIT character is found. The maximum number of characters
- *	copied is NCPS-1.  If the input string is larger than NCPS-1
- *	characters then the string is truncated.  The string is always
- *	NULL terminated.  If the mode argument (c) is >=0 then (c) is
- *	the first character copied to the string buffer, if (c) is <0
- *	then intervening white space (SPACES and TABS) are skipped.
- *
- *	local variables:
- *		char *	p		pointer to external string buffer
- *		int	c		current character value
- *
- *	global variables:
- *		char	ctype[]		a character array which defines the
- *					type of character being processed.
- *					This index is the character
- *					being processed.
- *
- *	called functions:
- *		int	get()		lklex.c
- *		int	getnb()		lklex.c
- *		VOID	unget()		lklex.c
- *
- *	side effects:
- *		use of getnb(), get(), and unget() updates the
- *		global pointer ip the position in the current
- *		input text line.
+ *      lklex.c contains the following functions:
+ *              VOID    chopcrlf()
+ *              char    endline()
+ *              int     get()
+ *              VOID    getfid()
+ *              VOID    getid()
+ *              VOID    getSid()
+ *              int     getmap()
+ *              int     getnb()
+ *              int     more()
+ *              int     nxtline()
+ *              VOID    skip()
+ *              VOID    unget()
+ *
+ *      lklex.c contains no local variables.
+ */
+
+/*)Function     VOID    getid(id,c)
+ *
+ *              char *  id              a pointer to a string of
+ *                                      maximum length NCPS-1
+ *              int     c               mode flag
+ *                                      >=0     this is first character to
+ *                                              copy to the string buffer
+ *                                      <0      skip white space
+ *
+ *      The function getid() scans the current input text line
+ *      from the current position copying the next LETTER | DIGIT string
+ *      into the external string buffer (id).  The string ends when a non
+ *      LETTER or DIGIT character is found. The maximum number of characters
+ *      copied is NCPS-1.  If the input string is larger than NCPS-1
+ *      characters then the string is truncated.  The string is always
+ *      NULL terminated.  If the mode argument (c) is >=0 then (c) is
+ *      the first character copied to the string buffer, if (c) is <0
+ *      then intervening white space (SPACES and TABS) are skipped.
+ *
+ *      local variables:
+ *              char *  p               pointer to external string buffer
+ *              int     c               current character value
+ *
+ *      global variables:
+ *              char    ctype[]         a character array which defines the
+ *                                      type of character being processed.
+ *                                      This index is the character
+ *                                      being processed.
+ *
+ *      called functions:
+ *              int     get()           lklex.c
+ *              int     getnb()         lklex.c
+ *              VOID    unget()         lklex.c
+ *
+ *      side effects:
+ *              use of getnb(), get(), and unget() updates the
+ *              global pointer ip the position in the current
+ *              input text line.
  */
 
 VOID
-getid(id, c)
-int c;
-char *id;
+getid(char *id, int c)
 {
-	char *p;
+        char *p;
 
-	if (c < 0) {
-		c = getnb();
-	}
-	p = id;
-	do {
-		if (p < &id[NCPS-1])
-			*p++ = c;
-	} while (ctype[c=get()] & (LETTER|DIGIT));
-	unget(c);
-	*p++ = 0;
+        if (c < 0) {
+                c = getnb();
+        }
+        p = id;
+        do {
+                if (p < &id[NCPS-1])
+                        *p++ = c;
+        } while (ctype[c=get()] & (LETTER|DIGIT));
+        unget(c);
+        *p++ = 0;
 }
 
-/*)Function	VOID	getSid (char *id)
+/*)Function     VOID    getSid (char *id)
  *
- *		char *	id		a pointer to a string of
- *					maximum length NCPS-1
+ *              char *  id              a pointer to a string of
+ *                                      maximum length NCPS-1
  *
  *  getSid is derived from getid. It is called from newsym()
  *  in lksym.c, when an S-record has to be scanned. getSid accepts
  *  much more characters than getid, which is necessary for SDCC.
  *
- *	The function getSid() scans the current input text line
- *	from the current position copying the next string
- *	into the external string buffer (id).  The string ends when a space
- *  character (space, tab, \0) is found. The maximum number of
- *	characters copied is NCPS.  If the input string is larger than
- *	NCPS characters then the string is truncated, if the input string
- *	is shorter than NCPS characters then the string is NULL filled.
- *	Intervening white space (SPACES and TABS) are skipped.
- *
- *	local variables:
- *		char *	p		pointer to external string buffer
- *		int	c		current character value
- *
- *	global variables:
- *		char	ctype[]		a character array which defines the
- *					type of character being processed.
- *					This index is the character
- *					being processed.
- *
- *	called functions:
- *		int	get()		lklex.c
- *		int	getnb()		lklex.c
- *		VOID	unget()		lklex.c
- *
- *	side effects:
- *		use of getnb(), get(), and unget() updates the
- *		global pointer ip the position in the current
- *		input text line.
+ *      The function getSid() scans the current input text line
+ *      from the current position copying the next string
+ *      into the external string buffer (id).  The string ends when a space
+ *      character (space, tab, \0) is found. The maximum number of
+ *      characters copied is NCPS.  If the input string is larger than
+ *      NCPS characters then the string is truncated, if the input string
+ *      is shorter than NCPS characters then the string is NULL filled.
+ *      Intervening white space (SPACES and TABS) are skipped.
+ *
+ *      local variables:
+ *              char *  p               pointer to external string buffer
+ *              int     c               current character value
+ *
+ *      global variables:
+ *              none
+ *
+ *      called functions:
+ *              int     get()           lklex.c
+ *              int     getnb()         lklex.c
+ *              VOID    unget()         lklex.c
+ *
+ *      side effects:
+ *              use of getnb(), get(), and unget() updates the
+ *              global pointer ip the position in the current
+ *              input text line.
  */
 
 VOID
 getSid (char *id)
 {
-	int c;
-	char *p;
+        int c;
+        char *p;
 
-	c = getnb();
-	p = id;
-	do {
-		if (p < &id[NCPS-1])
-			*p++ = c;
-		c = get();
-	} while (c != '\0' && c != ' ' && c != '\t');
-	unget(c);
-	*p++ = 0;
-}
-
-/*)Function	VOID	getfid(str,c)
- *
- *		char *	str		a pointer to a string of
- *					maximum length FILSPC-1
- *		int	c		this is first character to
- *					copy to the string buffer
- *
- *	asxxxx version:
- *
- *	The function getfid() copies a string of characters from
- *	the current text line into the external string buffer (str).
- *	The maximum number of characters copied is FILSPC-1.  The
- *	string is terminated by a 'space', 'tab' or end of string.
- *
- *	sdld version:
- *
- *	The function getfid() scans the current input text line from
- *	the current position copying the next string into the external
- *	string buffer (str).  The string ends when end of line is found.
- *	Trailing spaces are removed. The maximum number of characters
- *	copied is FILSPC-1. If the input string is larger than FILSPC-1
- *	characters then the string is truncated. The string is NULL
- *	terminated.
- *
- *	local variables:
- *		char *	p		pointer to external string buffer
- *		int	c		current character value
- *
- *	global variables:
- *		char	ctype[]		a character array which defines the
- *					type of character being processed.
- *					This index is the character
- *					being processed.
- *
- *	called functions:
- *		int	get()		lklex.c
- *
- *	side effects:
- *		use of get() updates the global pointer ip
- *		the position in the current input text line.
+        c = getnb();
+        p = id;
+        do {
+                if (p < &id[NCPS-1])
+                        *p++ = c;
+                c = get();
+        } while (c != '\0' && c != ' ' && c != '\t');
+        unget(c);
+        *p++ = 0;
+}
+
+/*)Function     VOID    getfid(str,c)
+ *
+ *              char *  str             a pointer to a string of
+ *                                      maximum length FILSPC-1
+ *              int     c               this is first character to
+ *                                      copy to the string buffer
+ *
+ *      asxxxx version:
+ *
+ *      The function getfid() copies a string of characters from
+ *      the current text line into the external string buffer (str).
+ *      The maximum number of characters copied is FILSPC-1.  The
+ *      string is terminated by a 'space', 'tab' or end of string.
+ *
+ *      sdld version:
+ *
+ *      The function getfid() scans the current input text line from
+ *      the current position copying the next string into the external
+ *      string buffer (str).  The string ends when end of line is found.
+ *      Trailing spaces are removed. The maximum number of characters
+ *      copied is FILSPC-1. If the input string is larger than FILSPC-1
+ *      characters then the string is truncated. The string is NULL
+ *      terminated.
+ *
+ *      local variables:
+ *              char *  p               pointer to external string buffer
+ *              int     c               current character value
+ *
+ *      global variables:
+ *              char    ctype[]         a character array which defines the
+ *                                      type of character being processed.
+ *                                      This index is the character
+ *                                      being processed.
+ *
+ *      called functions:
+ *              int     get()           lklex.c
+ *
+ *      side effects:
+ *              use of get() updates the global pointer ip
+ *              the position in the current input text line.
  */
 
 VOID
-getfid(str, c)
-int c;
-char *str;
+getfid(char *str, int c)
 {
-	char *p;
+        char *p;
 
-	p = str;
-	if (!is_sdld()) {
-		do {
-			if (p < &str[FILSPC-1])
-				*p++ = c;
-			c = get();
-		} while ((c != 0) && (c != ' ') && (c != '\t'));
-		*p++ = 0;
-	}
-	else {
-		do {
-			if (p < &str[FILSPC-1])
-				*p++ = c;
-			c = get();
-			/* skip comment */
-			if (c == ';')
-				while (c)
-					c = get();
-		} while (c);
-		/* trim trailing spaces */
-		--p;
-		while (p >= str && ctype[(int)*p] == SPACE)
-			--p;
-		/* terminate the string */
-		*(++p) = '\0';
-	}
-}
-
-/*)Function	int	getnb()
- *
- *	The function getnb() scans the current input text
- *	line returning the first character not a SPACE or TAB.
- *
- *	local variables:
- *		int	c		current character from input
- *
- *	global variables:
- *		none
- *
- *	called functions:
- *		int	get()		lklex.c
- *
- *	side effects:
- *		use of get() updates the global pointer ip, the position
- *		in the current input text line
+        p = str;
+        if (!is_sdld()) {
+                do {
+                        if (p < &str[FILSPC-1])
+                                *p++ = c;
+                        c = get();
+                } while ((c != 0) && (c != ' ') && (c != '\t'));
+                *p++ = 0;
+        }
+        else {
+                do {
+                        if (p < &str[FILSPC-1])
+                                *p++ = c;
+                        c = get();
+                        /* skip comment */
+                        if (c == ';')
+                                while (c)
+                                        c = get();
+                } while (c);
+                /* trim trailing spaces */
+                --p;
+                while (p >= str && ctype[*p & 0x007F] == SPACE)
+                        --p;
+                /* terminate the string */
+                *(++p) = '\0';
+        }
+}
+
+/*)Function     int     getnb()
+ *
+ *      The function getnb() scans the current input text
+ *      line returning the first character not a SPACE or TAB.
+ *
+ *      local variables:
+ *              int     c               current character from input
+ *
+ *      global variables:
+ *              none
+ *
+ *      called functions:
+ *              int     get()           lklex.c
+ *
+ *      side effects:
+ *              use of get() updates the global pointer ip, the position
+ *              in the current input text line
  */
 
 int
 getnb()
 {
-	int c;
+        int c;
 
-	while ((c=get())==' ' || c=='\t')
-		;
-	return (c);
+        while ((c=get())==' ' || c=='\t')
+                ;
+        return (c);
 }
 
-/*)Function	VOID	skip(c)
+/*)Function     VOID    skip(c)
  *
- *	The function skip() scans the input text skipping all
- *	letters and digits.
+ *      The function skip() scans the input text skipping all
+ *      letters and digits.
  *
- *	local variables:
- *		int	c		last character read
- *		none
+ *      local variables:
+ *              int     c               last character read
+ *              none
  *
- *	global variables:
- *		char	ctype[]		array of character types, one per
- *					ASCII character
+ *      global variables:
+ *              char    ctype[]         array of character types, one per
+ *                                      ASCII character
  *
- *	functions called:
- *		int	get()		lklex.c
- *		int	getnb()		lklex.c
- *		VOID	unget()		lklex.c
+ *      functions called:
+ *              int     get()           lklex.c
+ *              int     getnb()         lklex.c
+ *              VOID    unget()         lklex.c
  *
- *	side effects:
- *		Input letters and digits are skipped.
+ *      side effects:
+ *              Input letters and digits are skipped.
  */
 
 VOID
 skip(c)
 int c;
 {
-	if (c < 0)
-		c = getnb();
-	while (ctype[c=get()] & (LETTER|DIGIT)) { ; }
-	unget(c);
+        if (c < 0)
+                c = getnb();
+        while (ctype[c=get()] & (LETTER|DIGIT)) { ; }
+        unget(c);
 }
 
-/*)Function	int	get()
+/*)Function     int     get()
  *
- *	The function get() returns the next character in the
- *	input text line, at the end of the line a
- *	NULL character is returned.
+ *      The function get() returns the next character in the
+ *      input text line, at the end of the line a
+ *      NULL character is returned.
  *
- *	local variables:
- *		int	c		current character from
- *					input text line
+ *      local variables:
+ *              int     c               current character from
+ *                                      input text line
  *
- *	global variables:
- *		char *	ip		pointer into the current
- *					input text line
+ *      global variables:
+ *              char *  ip              pointer into the current
+ *                                      input text line
  *
- *	called functions:
- *		none
+ *      called functions:
+ *              none
  *
- *	side effects:
- *		updates ip to the next character position in the
- *		input text line.  If ip is at the end of the
- *		line, ip is not updated.
+ *      side effects:
+ *              updates ip to the next character position in the
+ *              input text line.  If ip is at the end of the
+ *              line, ip is not updated.
  */
 
 int
 get()
 {
-	int c;
+        int c;
 
-	if ((c = *ip) != 0)
-		++ip;
-	return (c);
+        if ((c = *ip) != 0)
+                ++ip;
+        return (c & 0x007F);
 }
 
-/*)Function	VOID	unget(c)
+/*)Function     VOID    unget(c)
  *
- *		int	c		value of last character
- *					read from input text line
+ *              int     c               value of last character
+ *                                      read from input text line
  *
- *	If (c) is not a NULL character then the global pointer ip
- *	is updated to point to the preceeding character in the
- *	input text line.
+ *      If (c) is not a NULL character then the global pointer ip
+ *      is updated to point to the preceeding character in the
+ *      input text line.
  *
- *	NOTE:	This function does not push the character (c)
- *		back into the input text line, only
- *		the pointer ip is changed.
+ *      NOTE:   This function does not push the character (c)
+ *              back into the input text line, only
+ *              the pointer ip is changed.
  *
- *	local variables:
- *		int	c		last character read
- *					from input text line
+ *      local variables:
+ *              int     c               last character read
+ *                                      from input text line
  *
- *	global variables:
- *		char *	ip		position into the current
- *					input text line
+ *      global variables:
+ *              char *  ip              position into the current
+ *                                      input text line
  *
- *	called functions:
- *		none
+ *      called functions:
+ *              none
  *
- *	side effects:
- *		ip decremented by 1 character position
+ *      side effects:
+ *              ip decremented by 1 character position
  */
 
 VOID
 unget(c)
 int c;
 {
-	if (c != 0)
-		--ip;
+        if (c != 0)
+                --ip;
 }
 
-/*)Function	int	getmap(d)
+/*)Function     int     getmap(d)
  *
- *		int	d		value to compare with the
- *					input text line character
+ *              int     d               value to compare with the
+ *                                      input text line character
  *
- *	The function getmap() converts the 'C' style characters \b, \f,
- *	\n, \r, and \t to their equivalent ascii values and also
- *	converts 'C' style octal constants '\123' to their equivalent
- *	numeric values.  If the first character is equivalent to (d) then
- *	a (-1) is returned, if the end of the line is detected then
- *	a 'q' error terminates the parse for this line, or if the first
- *	character is not a \ then the character value is returned.
- *
- *	local variables:
- *		int	c		value of character
- *					from input text line
- *		int	n		looping counter
- *		int	v		current value of numeric conversion
- *
- *	global variables:
- *		none
- *
- *	called functions:
- *		int	get()		lklex.c
- *		VOID	unget()		lklex.c
- *
- *	side effects:
- *		use of get() updates the global pointer ip the position
- *		in the current input text line
+ *      The function getmap() converts the 'C' style characters \b, \f,
+ *      \n, \r, and \t to their equivalent ascii values and also
+ *      converts 'C' style octal constants '\123' to their equivalent
+ *      numeric values.  If the first character is equivalent to (d) then
+ *      a (-1) is returned, if the end of the line is detected then
+ *      a 'q' error terminates the parse for this line, or if the first
+ *      character is not a \ then the character value is returned.
+ *
+ *      local variables:
+ *              int     c               value of character
+ *                                      from input text line
+ *              int     n               looping counter
+ *              int     v               current value of numeric conversion
+ *
+ *      global variables:
+ *              none
+ *
+ *      called functions:
+ *              int     get()           lklex.c
+ *              VOID    unget()         lklex.c
+ *
+ *      side effects:
+ *              use of get() updates the global pointer ip the position
+ *              in the current input text line
  */
 
 int
 getmap(d)
 int d;
 {
-	int c, n, v;
+        int c, n, v;
 
-	if ((c = get()) == '\0')
-		return (-1);
-	if (c == d)
-		return (-1);
-	if (c == '\\') {
-		c = get();
-		switch (c) {
-
-		case 'b':
-			c = '\b';
-			break;
-
-		case 'f':
-			c = '\f';
-			break;
-
-		case 'n':
-			c = '\n';
-			break;
-
-		case 'r':
-			c = '\r';
-			break;
-
-		case 't':
-			c = '\t';
-			break;
-
-		case '0':
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-		case '7':
-			n = 0;
-			v = 0;
-			while (++n<=3 && c>='0' && c<='7') {
-				v = (v<<3) + c - '0';
-				c = get();
-			}
-			unget(c);
-			c = v;
-			break;
-		}
-	}
-	return (c);
-}
-
-/*)Function	int	nxtline()
- *
- *	The function nxtline() reads a line of input text from a
- *	.rel source text file, a .lnk command file or from stdin.
- *	Lines of text are processed from a single .lnk file or
- *	multiple .rel files until all files have been read.
- *	The input text line is copied into the global string ib[]
- *	and converted to a NULL terminated string.  The function
- *	nxtline() returns a (1) after succesfully reading a line
- *	or a (0) if all files have been read.
- *	This function also opens each input .lst file and output
- *	.rst file as each .rel file is processed.
- *
- *	local variables:
- *		int	ftype		file type
- *		char *	fid		file name
- *
- *	global variables:
- *		lfile	*cfp		The pointer *cfp points to the
- *					current lfile structure
- *		lfile	*filep		The pointer *filep points to the
- *					beginning of a linked list of
- *					lfile structures.
- *		int	gline		get a line from the LST file
- *					to translate for the RST file
- *		char	ib[NINPUT]	REL file text line
- *		int	pass		linker pass number
- *		int	pflag		print linker command file flag
- *		FILE	*rfp		The file handle to the current
- *					output RST file
- *		FILE	*sfp		The file handle sfp points to the
- *					currently open file
- *		FILE *	stdin		c_library
- *		FILE *	stdout		c_library
- *		FILE	*tfp		The file handle to the current
- *					LST file being scanned
- *		int	uflag		update listing flag
- *
- *	called functions:
- *		VOID	chopcrlf()	lklex.c
- *		FILE *	afile()		lkmain.c
- *		int	fclose()	c_library
- *		char *	fgets()		c_library
- *		int	fprintf()	c_library
- *		VOID	lkulist()	lklist.c
- *		VOID	lkexit()	lkmain.c
- *
- *	side effects:
- *		The input stream is scanned.  The .rel files will be
- *		opened and closed sequentially scanning each in turn.
+        if ((c = get()) == '\0')
+                return (-1);
+        if (c == d)
+                return (-1);
+        if (c == '\\') {
+                c = get();
+                switch (c) {
+
+                case 'b':
+                        c = '\b';
+                        break;
+
+                case 'f':
+                        c = '\f';
+                        break;
+
+                case 'n':
+                        c = '\n';
+                        break;
+
+                case 'r':
+                        c = '\r';
+                        break;
+
+                case 't':
+                        c = '\t';
+                        break;
+
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                        n = 0;
+                        v = 0;
+                        while (++n<=3 && c>='0' && c<='7') {
+                                v = (v<<3) + c - '0';
+                                c = get();
+                        }
+                        unget(c);
+                        c = v;
+                        break;
+                }
+        }
+        return (c);
+}
+
+/*)Function     int     nxtline()
+ *
+ *      The function nxtline() reads a line of input text from a
+ *      .rel source text file, a .lnk command file or from stdin.
+ *      Lines of text are processed from a single .lnk file or
+ *      multiple .rel files until all files have been read.
+ *      The input text line is copied into the global string ib[]
+ *      and converted to a NULL terminated string.  The function
+ *      nxtline() returns a (1) after succesfully reading a line
+ *      or a (0) if all files have been read.
+ *      This function also opens each input .lst file and output
+ *      .rst file as each .rel file is processed.
+ *
+ *      local variables:
+ *              int     ftype           file type
+ *              char *  fid             file name
+ *
+ *      global variables:
+ *              lfile   *cfp            The pointer *cfp points to the
+ *                                      current lfile structure
+ *              lfile   *filep          The pointer *filep points to the
+ *                                      beginning of a linked list of
+ *                                      lfile structures.
+ *              int     gline           get a line from the LST file
+ *                                      to translate for the RST file
+ *              char    ib[NINPUT]      REL file text line
+ *              int     pass            linker pass number
+ *              int     pflag           print linker command file flag
+ *              FILE    *rfp            The file handle to the current
+ *                                      output RST file
+ *              FILE    *sfp            The file handle sfp points to the
+ *                                      currently open file
+ *              FILE *  stdin           c_library
+ *              FILE *  stdout          c_library
+ *              FILE    *tfp            The file handle to the current
+ *                                      LST file being scanned
+ *              int     uflag           update listing flag
+ *              int     obj_flag        linked file/library object output flag
+ *
+ *      called functions:
+ *              VOID    chopcrlf()      lklex.c
+ *              FILE *  afile()         lkmain.c
+ *              int     fclose()        c_library
+ *              char *  fgets()         c_library
+ *              int     fprintf()       c_library
+ *              VOID    lkulist()       lklist.c
+ *              VOID    lkexit()        lkmain.c
+ *
+ *      side effects:
+ *              The input stream is scanned.  The .rel files will be
+ *              opened and closed sequentially scanning each in turn.
  */
 
 int
 nxtline()
 {
-	int ftype;
-	char *fid;
+        int ftype;
+        char *fid;
 
-loop:	if (pflag && cfp && cfp->f_type == F_STD)
-		fprintf(stdout, "ASlink >> ");
+loop:   if (pflag && cfp && cfp->f_type == F_STD)
+                fprintf(stdout, "ASlink >> ");
 
-	if (sfp == NULL || fgets(ib, sizeof(ib), sfp) == NULL) {
-		if (sfp) {
-			if(sfp != stdin) {
-				fclose(sfp);
-			}
-			sfp = NULL;
-			lkulist(0);
-		}
-		if (cfp == NULL) {
-			cfp = filep;
-		} else {
-			cfp = cfp->f_flp;
-		}
-		if (cfp) {
-			ftype = cfp->f_type;
-			fid = cfp->f_idp;
-			if (ftype == F_STD) {
-				sfp = stdin;
-			} else
-			if (ftype == F_LNK) {
-				sfp = afile(fid, strrchr(fid, FSEPX) ? "" : "lk", 0);
-			} else
-			if (ftype == F_REL) {
-				sfp = afile(fid, "", 0);
-				if (sfp) {
-					if (uflag && (pass != 0)) {
-						if (is_sdld())
-							SaveLinkedFilePath(fid); //Save the linked path for aomf51
-						if ((tfp = afile(fid, "lst", 0)) != NULL) {
-							if ((rfp = afile(fid, "rst", 1)) == NULL) {
-								fclose(tfp);
-								tfp = NULL;
-							}
-						}
-					}
-				}
+        if (sfp == NULL || fgets(ib, sizeof(ib), sfp) == NULL) {
+                obj_flag = 0;
+                if (sfp) {
+                        if(sfp != stdin) {
+                                fclose(sfp);
+                        }
+                        sfp = NULL;
+                        lkulist(0);
+                }
+                if (cfp == NULL) {
+                        cfp = filep;
+                } else {
+                        cfp = cfp->f_flp;
+                }
+                if (cfp) {
+                        ftype = cfp->f_type;
+                        fid = cfp->f_idp;
+                        if (ftype == F_STD) {
+                                sfp = stdin;
+                        } else
+                        if (ftype == F_LNK) {
+                                sfp = afile(fid, strrchr(fid, FSEPX) ? "" : "lnk", 0);
+                        } else
+                        if (ftype == F_REL) {
+                                obj_flag = cfp->f_obj;
+                                sfp = afile(fid, "", 0);
+                                if (sfp && (obj_flag == 0)) {
+                                        if (uflag && (pass != 0)) {
+                                                if (is_sdld())
+                                                        SaveLinkedFilePath(fid); //Save the linked path for aomf51
+                                                if ((tfp = afile(fid, "lst", 0)) != NULL) {
+                                                        if ((rfp = afile(fid, "rst", 1)) == NULL) {
+                                                                fclose(tfp);
+                                                                tfp = NULL;
+                                                        }
+                                                }
+                                        }
+                                }
 
 #if SDCDB
-				if (sfp && (pass == 0)) {
-					SDCDBcopy(fid);
-				}
+                                if (sfp && (pass == 0)) {
+                                        SDCDBcopy(fid);
+                                }
 #endif
 
-				gline = 1;
-			} else {
-				fprintf(stderr, "Invalid file type\n");
-				lkexit(ER_FATAL);
-			}
-			if (sfp == NULL) {
-				lkexit(ER_FATAL);
-			}
-			goto loop;
-		} else {
-			filep = NULL;
-			return(0);
-		}
-	}
-	chopcrlf(ib);
-	return (1);
-}
-
-/*)Function	int	more()
- *
- *	The function more() scans the input text line
- *	skipping white space (SPACES and TABS) and returns a (0)
- *	if the end of the line or a comment delimeter (;) is found,
- *	or a (1) if their are additional characters in the line.
- *
- *	local variables:
- *		int	c		next character from
- *					the input text line
- *
- *	global variables:
- *		none
- *
- *	called functions:
- *		int	getnb()		lklex.c
- *		VOID	unget()		lklex.c
- *
- *	side effects:
- *		use of getnb() and unget() updates the global pointer ip
- *		the position in the current input text line
+                                gline = 1;
+                        } else {
+                                fprintf(stderr, "Invalid file type\n");
+                                lkexit(ER_FATAL);
+                        }
+                        if (sfp == NULL) {
+                                lkexit(ER_FATAL);
+                        }
+                        goto loop;
+                } else {
+                        filep = NULL;
+                        return(0);
+                }
+        }
+        chopcrlf(ib);
+        return (1);
+}
+
+/*)Function     int     more()
+ *
+ *      The function more() scans the input text line
+ *      skipping white space (SPACES and TABS) and returns a (0)
+ *      if the end of the line or a comment delimeter (;) is found,
+ *      or a (1) if their are additional characters in the line.
+ *
+ *      local variables:
+ *              int     c               next character from
+ *                                      the input text line
+ *
+ *      global variables:
+ *              none
+ *
+ *      called functions:
+ *              int     getnb()         lklex.c
+ *              VOID    unget()         lklex.c
+ *
+ *      side effects:
+ *              use of getnb() and unget() updates the global pointer ip
+ *              the position in the current input text line
  */
 
 int
 more()
 {
-	int c;
+        int c;
 
-	c = getnb();
-	unget(c);
-	return( (c == '\0' || c == ';') ? 0 : 1 );
+        c = getnb();
+        unget(c);
+        return( (c == '\0' || c == ';') ? 0 : 1 );
 }
 
-/*)Function	char	endline()
+/*)Function     char    endline()
  *
- *	The function endline() scans the input text line
- *	skipping white space (SPACES and TABS) and returns the next
- *	character or a (0) if the end of the line is found or a
- *	comment delimiter (;) is found.
+ *      The function endline() scans the input text line
+ *      skipping white space (SPACES and TABS) and returns the next
+ *      character or a (0) if the end of the line is found or a
+ *      comment delimiter (;) is found.
  *
- *	local variables:
- *		int	c		next character from
- *					the input text line
+ *      local variables:
+ *              int     c               next character from
+ *                                      the input text line
  *
- *	global variables:
- *		none
+ *      global variables:
+ *              none
  *
- *	called functions:
- *		int	getnb()		lklex.c
+ *      called functions:
+ *              int     getnb()         lklex.c
  *
- *	side effects:
- *		Use of getnb() updates the global pointer ip the
- *		position in the current input text line.
+ *      side effects:
+ *              Use of getnb() updates the global pointer ip the
+ *              position in the current input text line.
  */
 
 char
 endline()
 {
-	int c;
+        int c;
 
-	c = getnb();
-	return( (c == '\0' || c == ';') ? 0 : c );
+        c = getnb();
+        return( (c == '\0' || c == ';') ? 0 : c );
 }
 
-/*)Function	VOID	chopcrlf(str)
+/*)Function     VOID    chopcrlf(str)
  *
- *		char	*str		string to chop
+ *              char    *str            string to chop
  *
- *	The function chop_crlf() removes trailing LF or CR/LF from
- *	str, if present.
+ *      The function chop_crlf() removes trailing LF or CR/LF from
+ *      str, if present.
  *
- *	local variables:
- *		int	i		string length
+ *      local variables:
+ *              int     i               string length
  *
- *	global variables:
- *		none
+ *      global variables:
+ *              none
  *
- *	functions called:
- *		none
+ *      functions called:
+ *              none
  *
- *	side effects:
- *		none
+ *      side effects:
+ *              none
  */
 
 VOID
 chopcrlf(str)
 char *str;
 {
-	int i;
+        int i;
 
-	i = strlen(str);
-	if (i >= 1 && str[i-1] == '\n') str[i-1] = 0;
-	if (i >= 2 && str[i-2] == '\r') str[i-2] = 0;
+        i = strlen(str);
+        if (i >= 1 && str[i-1] == '\n') str[i-1] = 0;
+        if (i >= 2 && str[i-2] == '\r') str[i-2] = 0;
 }
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/lklibr.c sdcc-3.2.0+dfsg/sdas/linksrc/lklibr.c
--- sdcc-3.1.0+dfsg/sdas/linksrc/lklibr.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/lklibr.c	2011-12-03 23:42:25.000000000 +0000
@@ -198,8 +198,9 @@
  *	char *	strend		end of path pointer
  *
  *  global variables:
- *	lbname	*lbnhead    The pointer to the first
- *			    path structure
+ *	lbname	*lbnhead	The pointer to the first
+ *				path structure
+ *	int	objflg		linked file/library object output flag
  *
  *   functions called:
  *	int	getnb()     lklex.c
@@ -316,6 +317,7 @@
       lbnh->path = path;
       lbnh->libfil = strdup (libfil);
       lbnh->libspc = str;
+      lbnh->f_obj = objflg;
       return 1;
     }
   else
@@ -444,6 +446,7 @@
  *			    name structure
  *	lbfile	*lbfhead    The pointer to the first
  *			    file structure
+ *	int	obj_flag    linked file/library object output flag
  *
  *   functions called:
  *	int	fclose()    c_library
@@ -828,6 +831,7 @@
  *
  *  global variables:
  *	lbfile	*lbfhead    pointer to first lbfile structure
+ *	int	obj_flag    linked file/library object output flag
  *
  *   functions called:
  *	VOID	loadfile    lklibr.c
@@ -841,8 +845,10 @@
 {
   struct lbfile *lbfh;
 
-  for (lbfh = lbfhead; lbfh; lbfh = lbfh->next)
+  for (lbfh = lbfhead; lbfh; lbfh = lbfh->next) {
+    obj_flag = lbfh->f_obj;
     (*aslib_targets[lbfh->type]->loadfile) (lbfh);
+  }
 
 #ifdef INDEXLIB
   freelibraryindex ();
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/lklist.c sdcc-3.2.0+dfsg/sdas/linksrc/lklist.c
--- sdcc-3.1.0+dfsg/sdas/linksrc/lklist.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/lklist.c	2011-12-18 17:44:59.000000000 +0000
@@ -25,306 +25,301 @@
 
 /*
  * 28-Oct-97 JLH:
- *	     - lstarea: show s_id as string rather than array [NCPS]
- *	     - lstarea: show a_id as string rather than array [NCPS]
+ *           - lstarea: show s_id as string rather than array [NCPS]
+ *           - lstarea: show a_id as string rather than array [NCPS]
  * 31-Oct-97 JLH: add NoICE output file genration in lstarea
  * 02-Apr-98 JLH: add XDATA, DATA, BIT flags to area output
  */
 
 #include "aslink.h"
 
-/*)Module	lklist.c
+/*)Module       lklist.c
  *
- *	The module lklist.c contains the functions which
- *	output the linker .map file and produce a relocated
- *	listing .rst file.
- *
- *	lklist.c contains the following functions:
- *		int	dgt()
- *		VOID	newpag()
- *		VOID	slew()
- *		VOID	lstarea()
- *		VOID	lkulist()
- *		VOID	lkalist()
- *		VOID	lkglist()
+ *      The module lklist.c contains the functions which
+ *      output the linker .map file and produce a relocated
+ *      listing .rst file.
+ *
+ *      lklist.c contains the following functions:
+ *              int     dgt()
+ *              VOID    newpag()
+ *              VOID    slew()
+ *              VOID    lstarea()
+ *              VOID    lkulist()
+ *              VOID    lkalist()
+ *              VOID    lkglist()
  *
- *	lklist.c contains no local variables.
+ *      lklist.c contains no local variables.
  */
 
-/*)Function	VOID	newpag()
+/*)Function     VOID    newpag()
  *
- *	The function newpag() outputs a page skip, writes the
- *	first page header line, sets the line count to 1, and
- *	increments the page counter.
+ *      The function newpag() outputs a page skip, writes the
+ *      first page header line, sets the line count to 1, and
+ *      increments the page counter.
  *
- *	local variables:
- *		none
+ *      local variables:
+ *              none
  *
- *	global variables:
- *		int	lop		current line number on page
- *		int	page		current page number
+ *      global variables:
+ *              int     lop             current line number on page
+ *              int     page            current page number
  *
- *	functions called:
- *		int	fprintf()	c_library
+ *      functions called:
+ *              int     fprintf()       c_library
  *
- *	side effects:
- *		The page and line counters are updated.
+ *      side effects:
+ *              The page and line counters are updated.
  */
 
 VOID
 newpag(FILE *fp)
 {
-	fprintf(fp, "\fASxxxx Linker %s,  page %u.\n", VERSION, ++page);
-	lop = 1;
+        fprintf(fp, "\fASxxxx Linker %s,  page %u.\n", VERSION, ++page);
+        lop = 1;
 }
 
-/*)Function	int	dgt(rdx,str,n)
+/*)Function     int     dgt(rdx,str,n)
  *
- *		int	rdx		radix bit code
- *		char	*str		pointer to the test string
- *		int	n		number of characters to check
+ *              int     rdx             radix bit code
+ *              char    *str            pointer to the test string
+ *              int     n               number of characters to check
  *
- *	The function dgt() verifies that the string under test
- *	is of the specified radix.
+ *      The function dgt() verifies that the string under test
+ *      is of the specified radix.
  *
- *	local variables:
- *		int	i		loop counter
+ *      local variables:
+ *              int     i               loop counter
  *
- *	global variables:
- *		ctype[]			array of character types
+ *      global variables:
+ *              ctype[]                 array of character types
  *
- *	functions called:
- *		none
+ *      functions called:
+ *              none
  *
- *	side effects:
- *		none
+ *      side effects:
+ *              none
  */
 
 int
 dgt(int rdx, char *str, int n)
 {
-	int i;
+        int i;
 
-	for (i=0; i<n; i++) {
-		if ((ctype[(unsigned char)(*str++)] & rdx) == 0)
-			return(0);
-	}
-	return(1);
+        for (i=0; i<n; i++) {
+                if ((ctype[*str++ & 0x007F] & rdx) == 0)
+                        return(0);
+        }
+        return(1);
 }
 
-/*)Function	VOID	slew(xp)
+/*)Function     VOID    slew(xp, yp)
  *
- *		area *	xp		pointer to an area structure
+ *              area *  xp              pointer to an area structure
+ *              bank *  yp              pointer to a  bank structure
  *
- *	The function slew() increments the page line counter.
- *	If the number of lines exceeds the maximum number of
- *	lines per page then a page skip and a page header are
- *	output.
- *
- *	local variables:
- *		a_uint	ai		temporary
- *		a_uint	aj		temporary
- *		int	i		loop counter
- *		int	n		repeat counter
- *		char *	frmta		temporary format specifier
- *		char *	frmtb		temporary format specifier
- *		char *	ptr		pointer to an id string
- *
- *	global variables:
- *		int	a_bytes		T line address bytes
- *		int	lop		current line number on page
- *		FILE	*mfp		Map output file handle
- *		int	wflag		Wide format listing
- *		int	xflag		Map file radix type flag
- *
- *	functions called:
- *		int	fprintf()	c_library
- *		VOID	newpag()	lklist.c
- *		char	putc()		c_library
+ *      The function slew() increments the page line counter.
+ *      If the number of lines exceeds the maximum number of
+ *      lines per page then a page skip and a page header are
+ *      output.
+ *
+ *      local variables:
+ *              a_uint  ai              temporary
+ *              a_uint  aj              temporary
+ *              int     i               loop counter
+ *              int     n               repeat counter
+ *              char *  frmta           temporary format specifier
+ *              char *  frmtb           temporary format specifier
+ *              char *  ptr             pointer to an id string
+ *
+ *      global variables:
+ *              int     a_bytes         T line address bytes
+ *              int     a_mask          addressing mask
+ *              int     lop             current line number on page
+ *              FILE    *mfp            Map output file handle
+ *              int     wflag           Wide format listing
+ *              int     xflag           Map file radix type flag
+ *
+ *      functions called:
+ *              int     fprintf()       c_library
+ *              VOID    newpag()        lklist.c
+ *              char    putc()          c_library
  *
- *	side effects:
- *		The page line and the page count may be updated.
+ *      side effects:
+ *              The page line and the page count may be updated.
  */
 
 VOID
-slew(struct area *xp)
+slew(struct area *xp, struct bank *yp)
 {
-	int i, n;
-	char *frmta, *frmtb, *ptr;
-	a_uint	ai, aj;
-
-	if (lop++ >= NLPP) {
-		newpag(mfp);
-		switch(xflag) {
-		default:
-		case 0: frmta = "Hexadecimal"; break;
-		case 1: frmta = "Octal"; break;
-		case 2: frmta = "Decimal"; break;
-		}
-		fprintf(mfp, "%s  [%d-Bits]\n", frmta, a_bytes*8);
-		fprintf(mfp, "\n");
-		if (wflag) {
-			fprintf(mfp,
-				"Area                                    Addr");
-			fprintf(mfp,
-				"        Size        Decimal Bytes (Attributes)\n");
-			fprintf(mfp,
-				"--------------------------------        ----");
-			fprintf(mfp,
-				"        ----        ------- ----- ------------\n");
-		} else {
-			fprintf(mfp,
-				"Area                       Addr   ");
-			fprintf(mfp,
-				"     Size        Decimal Bytes (Attributes)\n");
-			fprintf(mfp,
-				"--------------------       ----   ");
-			fprintf(mfp,
-				"     ----        ------- ----- ------------\n");
-		}
-
-		ai = xp->a_addr;
-		aj = xp->a_size;
-
-		/*
-		 * Output Area Header
-		 */
-		ptr = &xp->a_id[0];
-		if (wflag) {
-			fprintf(mfp, "%-32.32s", ptr);
-		} else {
-			fprintf(mfp, "%-19.19s", ptr);
-		}
-#ifdef	LONGINT
-		switch(a_bytes) {
-		default:
-		case 2:
-			switch(xflag) {
-			default:
-			case 0: frmta = "        %04lX        %04lX"; break;
-			case 1: frmta = "      %06lo      %06lo"; break;
-			case 2: frmta = "       %05lu       %05lu"; break;
-			}
-			frmtb = " =      %6lu. bytes "; break;
-		case 3:
-			switch(xflag) {
-			default:
-			case 0: frmta = "      %06lX      %06lX"; break;
-			case 1: frmta = "    %08lo    %08lo"; break;
-			case 2: frmta = "    %08lu    %08lu"; break;
-			}
-			frmtb = " =    %8lu. bytes "; break;
-		case 4:
-			switch(xflag) {
-			default:
-			case 0: frmta = "    %08lX    %08lX"; break;
-			case 1: frmta = " %011lo %011lo"; break;
-			case 2: frmta = "  %010lu  %010lu"; break;
-			}
-			frmtb = " =  %10lu. bytes "; break;
-		}
+        int i, n;
+        char *frmta, *frmtb, *ptr;
+        a_uint  ai, aj;
+
+        if (lop++ >= NLPP) {
+                newpag(mfp);
+                switch(xflag) {
+                default:
+                case 0: frmta = "Hexadecimal"; break;
+                case 1: frmta = "Octal"; break;
+                case 2: frmta = "Decimal"; break;
+                }
+                fprintf(mfp, "%s  [%d-Bits]\n", frmta, a_bytes*8);
+                if (*yp->b_id) {
+                        fprintf(mfp, "[ Bank == %s ]\n", yp->b_id);
+                        lop += 1;
+                }
+                fprintf(mfp, "\n");
+                if (wflag) {
+                        fprintf(mfp,
+                                "Area                                    Addr");
+                        fprintf(mfp,
+                                "        Size        Decimal Bytes (Attributes)\n");
+                        fprintf(mfp,
+                                "--------------------------------        ----");
+                        fprintf(mfp,
+                                "        ----        ------- ----- ------------\n");
+                } else {
+                        fprintf(mfp,
+                                "Area                       Addr   ");
+                        fprintf(mfp,
+                                "     Size        Decimal Bytes (Attributes)\n");
+                        fprintf(mfp,
+                                "--------------------       ----   ");
+                        fprintf(mfp,
+                                "     ----        ------- ----- ------------\n");
+                }
+
+                ai = xp->a_addr & a_mask;
+                aj = xp->a_size & a_mask;
+
+                /*
+                 * Output Area Header
+                 */
+                ptr = &xp->a_id[0];
+                if (wflag) {
+                        fprintf(mfp, "%-32.32s", ptr);
+                } else {
+                        fprintf(mfp, "%-19.19s", ptr);
+                }
+#ifdef  LONGINT
+                switch(a_bytes) {
+                default:
+                case 2:
+                        switch(xflag) {
+                        default:
+                        case 0: frmta = "        %04lX        %04lX"; break;
+                        case 1: frmta = "      %06lo      %06lo"; break;
+                        case 2: frmta = "       %05lu       %05lu"; break;
+                        }
+                        frmtb = " =      %6lu. bytes "; break;
+                case 3:
+                        switch(xflag) {
+                        default:
+                        case 0: frmta = "      %06lX      %06lX"; break;
+                        case 1: frmta = "    %08lo    %08lo"; break;
+                        case 2: frmta = "    %08lu    %08lu"; break;
+                        }
+                        frmtb = " =    %8lu. bytes "; break;
+                case 4:
+                        switch(xflag) {
+                        default:
+                        case 0: frmta = "    %08lX    %08lX"; break;
+                        case 1: frmta = " %011lo %011lo"; break;
+                        case 2: frmta = "  %010lu  %010lu"; break;
+                        }
+                        frmtb = " =  %10lu. bytes "; break;
+                }
 #else
-		switch(a_bytes) {
-		default:
-		case 2:
-			switch(xflag) {
-			default:
-			case 0: frmta = "        %04X        %04X"; break;
-			case 1: frmta = "      %06o      %06o"; break;
-			case 2: frmta = "       %05u       %05u"; break;
-			}
-			frmtb = " =      %6u. bytes "; break;
-		case 3:
-			switch(xflag) {
-			default:
-			case 0: frmta = "      %06X      %06X"; break;
-			case 1: frmta = "    %08o    %08o"; break;
-			case 2: frmta = "    %08u    %08u"; break;
-			}
-			frmtb = " =    %8u. bytes "; break;
-		case 4:
-			switch(xflag) {
-			default:
-			case 0: frmta = "    %08X    %08X"; break;
-			case 1: frmta = " %011o %011o"; break;
-			case 2: frmta = "  %010u  %010u"; break;
-			}
-			frmtb = " =  %10u. bytes "; break;
-		}
+                switch(a_bytes) {
+                default:
+                case 2:
+                        switch(xflag) {
+                        default:
+                        case 0: frmta = "        %04X        %04X"; break;
+                        case 1: frmta = "      %06o      %06o"; break;
+                        case 2: frmta = "       %05u       %05u"; break;
+                        }
+                        frmtb = " =      %6u. bytes "; break;
+                case 3:
+                        switch(xflag) {
+                        default:
+                        case 0: frmta = "      %06X      %06X"; break;
+                        case 1: frmta = "    %08o    %08o"; break;
+                        case 2: frmta = "    %08u    %08u"; break;
+                        }
+                        frmtb = " =    %8u. bytes "; break;
+                case 4:
+                        switch(xflag) {
+                        default:
+                        case 0: frmta = "    %08X    %08X"; break;
+                        case 1: frmta = " %011o %011o"; break;
+                        case 2: frmta = "  %010u  %010u"; break;
+                        }
+                        frmtb = " =  %10u. bytes "; break;
+                }
 #endif
-		fprintf(mfp, frmta, ai, aj);
-		fprintf(mfp, frmtb, aj);
+                fprintf(mfp, frmta, ai, aj);
+                fprintf(mfp, frmtb, aj);
 
-		if (xp->a_flag & A3_ABS) {
-			fprintf(mfp, "(ABS");
-		} else {
-			fprintf(mfp, "(REL");
-		}
-		if (xp->a_flag & A3_OVR) {
-			fprintf(mfp, ",OVR");
-		} else {
-			fprintf(mfp, ",CON");
-		}
-		if (xp->a_flag & A3_PAG) {
-			fprintf(mfp, ",PAG");
-		}
-
-		/* sdld specific */
-		if (xp->a_flag & A_CODE) {
-			fprintf(mfp, ",CODE");
-		}
-		if (xp->a_flag & A_XDATA) {
-			fprintf(mfp, ",XDATA");
-		}
-		if (xp->a_flag & A_BIT) {
-			fprintf(mfp, ",BIT");
-		}
-		/* end sdld specific */
-
-		fprintf(mfp, ")\n");
-
-		if (xp->a_flag & A3_PAG) {
-			ai = (ai & 0xFF);
-			aj = (aj > 256);
-			if (ai || aj) { fprintf(mfp, "  "); lop += 1; }
-			if (ai)      { fprintf(mfp, " Boundary"); }
-			if (ai & aj)  { fprintf(mfp, " /"); }
-			if (aj)      { fprintf(mfp, " Length"); }
-			if (ai || aj) { fprintf(mfp, " Error\n"); }
-		}
-
-		if (wflag) {
-			putc('\n', mfp);
-			fprintf(mfp,
-			"      Value  Global                           ");
-			fprintf(mfp,
-			"   Global Defined In Module\n");
-			fprintf(mfp,
-			"      -----  --------------------------------");
-			fprintf(mfp,
-			"   ------------------------\n");
-		} else {
-			switch(a_bytes) {
-			default:
-			case 2:	frmta = "   Value  Global   ";
-				frmtb = "   -----  ------   ";
-				n = 4; break;
-			case 3:
-			case 4:	frmta = "        Value  Global    ";
-				frmtb = "        -----  ------    ";
-				n = 3; break;
-			}
-			putc('\n', mfp);
-			for(i=0;i<n;++i)
-				fprintf(mfp, "%s", frmta);
-			putc('\n', mfp);
-			for(i=0;i<n;++i)
-				fprintf(mfp, "%s", frmtb);
-			putc('\n', mfp);
-		}
+                if (xp->a_flag & A3_ABS) {
+                        fprintf(mfp, "(ABS");
+                } else {
+                        fprintf(mfp, "(REL");
+                }
+                if (xp->a_flag & A3_OVR) {
+                        fprintf(mfp, ",OVR");
+                } else {
+                        fprintf(mfp, ",CON");
+                }
+                if (xp->a_flag & A3_PAG) {
+                        fprintf(mfp, ",PAG");
+                }
+
+                /* sdld specific */
+                if (xp->a_flag & A_CODE) {
+                        fprintf(mfp, ",CODE");
+                }
+                if (xp->a_flag & A_XDATA) {
+                        fprintf(mfp, ",XDATA");
+                }
+                if (xp->a_flag & A_BIT) {
+                        fprintf(mfp, ",BIT");
+                }
+                /* end sdld specific */
+
+                fprintf(mfp, ")\n");
+                if (wflag) {
+                        putc('\n', mfp);
+                        fprintf(mfp,
+                        "      Value  Global                           ");
+                        fprintf(mfp,
+                        "   Global Defined In Module\n");
+                        fprintf(mfp,
+                        "      -----  --------------------------------");
+                        fprintf(mfp,
+                        "   ------------------------\n");
+                } else {
+                        switch(a_bytes) {
+                        default:
+                        case 2: frmta = "   Value  Global   ";
+                                frmtb = "   -----  ------   ";
+                                n = 4; break;
+                        case 3:
+                        case 4: frmta = "        Value  Global    ";
+                                frmtb = "        -----  ------    ";
+                                n = 3; break;
+                        }
+                        putc('\n', mfp);
+                        for(i=0;i<n;++i)
+                                fprintf(mfp, "%s", frmta);
+                        putc('\n', mfp);
+                        for(i=0;i<n;++i)
+                                fprintf(mfp, "%s", frmtb);
+                        putc('\n', mfp);
+                }
 
-		lop += 9;
-	}
+                lop += 9;
+        }
 }
 
 /* sdld specific */
@@ -334,439 +329,461 @@
     struct sym **s1 = (struct sym **)(p1);
     struct sym **s2 = (struct sym **)(p2);
     int delta = ((*s1)->s_addr + (*s1)->s_axp->a_addr) -
-		((*s2)->s_addr + (*s2)->s_axp->a_addr);
+                ((*s2)->s_addr + (*s2)->s_axp->a_addr);
 
     /* Sort first by address, then by name. */
     if (delta)
     {
-	return delta;
+        return delta;
     }
     return strcmp((*s1)->s_id,(*s2)->s_id);
 }
 /* end sdld specific */
 
-/*)Function	VOID	lstarea(xp)
+/*)Function     VOID    lstarea(xp, yp)
  *
- *		area *	xp		pointer to an area structure
+ *              area *  xp              pointer to an area structure
+ *              bank *  yp              pointer to a  bank structure
  *
- *	The function lstarea() creates the linker map output for
- *	the area specified by pointer xp.  The generated output
- *	area header includes the area name, starting address,
- *	size of area, number of words (in decimal), and the
- *	area attributes.  The symbols defined in this area are
- *	sorted by ascending address and output four per line
- *	in the selected radix (one per line in wide format).
- *
- *	local variables:
- *		areax * oxp		pointer to an area extension structure
- *		int	c		character value
- *		int	i		loop counter
- *		int	n		repeat counter
- *		char *	frmt		temporary format specifier
- *		char *	ptr		pointer to an id string
- *		int	nmsym		number of symbols in area
- *		a_uint	ai		temporary
- *		a_uint	aj		temporary
- *		sym *	sp		pointer to a symbol structure
- *		sym **	p		pointer to an array of
- *					pointers to symbol structures
- *
- *	global variables:
- *		int	a_bytes		T line address bytes
- *		FILE	*mfp		Map output file handle
- *		sym *symhash[NHASH]	array of pointers to NHASH
- *					linked symbol lists
- *		int	wflag		Wide format listing
- *		int	xflag		Map file radix type flag
- *
- *	functions called:
- *		int	fprintf()	c_library
- *		VOID	free()		c_library
- *		char *	malloc()	c_library
- *		char	putc()		c_library
- *		VOID	slew()		lklist.c
+ *      The function lstarea() creates the linker map output for
+ *      the area specified by pointer xp.  The generated output
+ *      area header includes the area name, starting address,
+ *      size of area, number of words (in decimal), and the
+ *      area attributes.  The symbols defined in this area are
+ *      sorted by ascending address and output four per line
+ *      in the selected radix (one per line in wide format).
+ *
+ *      local variables:
+ *              areax * oxp             pointer to an area extension structure
+ *              int     i               loop counter
+ *              int     j               bubble sort update status
+ *              int     n               repeat counter
+ *              char *  frmt            temporary format specifier
+ *              char *  ptr             pointer to an id string
+ *              int     nmsym           number of symbols in area
+ *              a_uint  a0              temporary
+ *              a_uint  ai              temporary
+ *              a_uint  aj              temporary
+ *              sym *   sp              pointer to a symbol structure
+ *              sym **  p               pointer to an array of
+ *                                      pointers to symbol structures
+ *
+ *      global variables:
+ *              int     a_bytes         T line address bytes
+ *              FILE    *mfp            Map output file handle
+ *              sym *symhash[NHASH]     array of pointers to NHASH
+ *                                      linked symbol lists
+ *              int     wflag           Wide format listing
+ *              int     xflag           Map file radix type flag
+ *
+ *      functions called:
+ *              int     fprintf()       c_library
+ *              VOID    free()          c_library
+ *              char *  malloc()        c_library
+ *              char    putc()          c_library
+ *              VOID    slew()          lklist.c
  *
- *	side effects:
- *		Map output generated.
+ *      side effects:
+ *              Map output generated.
  */
 
 VOID
-lstarea(struct area *xp)
+lstarea(struct area *xp, struct bank *yp)
 {
-	struct areax *oxp;
-	int i, n;
-	char *frmt, *ptr;
-	int nmsym;
-	a_uint aj;
-	struct sym *sp;
-	struct sym **p;
-	/* sdld spcific */
-	int memPage;
-	/* end sdld spcific */
-
-	/*
-	 * Find number of symbols in area
-	 */
-	nmsym = 0;
-	oxp = xp->a_axp;
-	while (oxp) {
-		for (i=0; i<NHASH; i++) {
-			sp = symhash[i];
-			while (sp != NULL) {
-				if (oxp == sp->s_axp)
-					++nmsym;
-				sp = sp->s_sp;
-			}
-		}
-		oxp = oxp->a_axp;
-	}
-
-	if ((nmsym == 0) && (xp->a_size == 0)) {
-		return;
-	}
-
-	lop = NLPP;
-	slew(xp);
-
-	if (nmsym == 0) {
-		return;
-	}
-
-	/*
-	 * Allocate space for an array of pointers to symbols
-	 * and load array.
-	 */
-	if ( (p = (struct sym **) malloc (nmsym*sizeof(struct sym *))) == NULL) {
-		fprintf(mfp, "Insufficient space to build Map Segment.\n");
-		return;
-	}
-	nmsym = 0;
-	oxp = xp->a_axp;
-	while (oxp) {
-		for (i=0; i<NHASH; i++) {
-			sp = symhash[i];
-			while (sp != NULL) {
-				if (oxp == sp->s_axp) {
-					p[nmsym++] = sp;
-				}
-				sp = sp->s_sp;
-			}
-		}
-		oxp = oxp->a_axp;
-	}
-
-	/* sdld specific */
-	/* asxxxx use bubble sort */
-	qsort(p, nmsym, sizeof(struct sym *), _cmpSymByAddr);
-	/* end sdld specific */
-
-	/*
-	 * Repeat Counter
-	 */
-	switch(a_bytes) {
-	default:
-	case 2: n = 4; break;
-	case 3:
-	case 4: n = 3; break;
-	}
-
-	/*
-	 * Symbol Table Output
-	 */
-	/* sdld spcific */
-	memPage = (xp->a_flag & A_CODE) ? 0x0C : ((xp->a_flag & A_XDATA) ? 0x0D : ((xp->a_flag & A_BIT) ? 0x0B : 0x00));
-	/* end sdld spcific */
-	i = 0;
-	while (i < nmsym) {
-		if (wflag) {
-			slew(xp);
-			switch(a_bytes) {
-			default:
-			case 2: frmt = "        "; break;
-			case 3:
-			case 4: frmt = "   "; break;
-			}
-			fprintf(mfp, "%s", frmt);
-		} else
-		if ((i % n) == 0) {
-			slew(xp);
-			switch(a_bytes) {
-			default:
-			case 2: frmt = "  "; break;
-			case 3:
-			case 4: frmt = "  "; break;
-			}
-			fprintf(mfp, "%s", frmt);
-		}
-
-		if (is_sdld()) {
-			int memPage = (xp->a_flag & A_CODE) ? 0x0C : ((xp->a_flag & A_XDATA) ? 0x0D : ((xp->a_flag & A_BIT) ? 0x0B : 0x00));
-			if (memPage != 0)
-				fprintf(mfp, "  %02X:", memPage);
-			else
-				fprintf(mfp, "     ");
-		}
-
-		sp = p[i];
-		aj = (sp->s_addr + sp->s_axp->a_addr) & a_mask;
-#ifdef	LONGINT
-		switch(a_bytes) {
-		default:
-		case 2:
-			switch(xflag) {
-			default:
-			case 0: frmt = "  %04lX  "; break;
-			case 1: frmt = "%06lo  "; break;
-			case 2: frmt = " %05lu  "; break;
-			}
-			break;
-		case 3:
-			switch(xflag) {
-			default:
-			case 0: frmt = "     %06lX  "; break;
-			case 1: frmt = "   %08lo  "; break;
-			case 2: frmt = "   %08lu  "; break;
-			}
-			break;
-		case 4:
-			switch(xflag) {
-			default:
-			case 0: frmt = "   %08lX  "; break;
-			case 1: frmt = "%011lo  "; break;
-			case 2: frmt = " %010lu  "; break;
-			}
-			break;
-		}
+        struct areax *oxp;
+        int i, j, n;
+        char *frmt, *ptr;
+        int nmsym;
+        a_uint a0, ai, aj;
+        struct sym *sp;
+        struct sym **p;
+        /* sdld specific */
+        int memPage;
+        /* end sdld specific */
+
+        /*
+         * Find number of symbols in area
+         */
+        nmsym = 0;
+        oxp = xp->a_axp;
+        while (oxp) {
+                for (i=0; i<NHASH; i++) {
+                        sp = symhash[i];
+                        while (sp != NULL) {
+                                if (oxp == sp->s_axp)
+                                        ++nmsym;
+                                sp = sp->s_sp;
+                        }
+                }
+                oxp = oxp->a_axp;
+        }
+
+        if ((nmsym == 0) && (xp->a_size == 0)) {
+                return;
+        }
+
+        lop = NLPP;
+        slew(xp, yp);
+
+        if (nmsym == 0) {
+                return;
+        }
+
+        /*
+         * Allocate space for an array of pointers to symbols
+         * and load array.
+         */
+        if ( (p = (struct sym **) malloc (nmsym*sizeof(struct sym *))) == NULL) {
+                fprintf(mfp, "Insufficient space to build Map Segment.\n");
+                return;
+        }
+        nmsym = 0;
+        oxp = xp->a_axp;
+        while (oxp) {
+                for (i=0; i<NHASH; i++) {
+                        sp = symhash[i];
+                        while (sp != NULL) {
+                                if (oxp == sp->s_axp) {
+                                        p[nmsym++] = sp;
+                                }
+                                sp = sp->s_sp;
+                        }
+                }
+                oxp = oxp->a_axp;
+        }
+
+        if (is_sdld()) {
+                /*
+                 * Quick Sort of Addresses in Symbol Table Array
+                 */
+                qsort(p, nmsym, sizeof(struct sym *), _cmpSymByAddr);
+        } else {
+                /*
+                 * Bubble Sort of Addresses in Symbol Table Array
+                 */
+                j = 1;
+                while (j) {
+                        j = 0;
+                        sp = p[0];
+                        a0 = sp->s_addr + sp->s_axp->a_addr;
+                        for (i=1; i<nmsym; ++i) {
+                                sp = p[i];
+                                ai = sp->s_addr + sp->s_axp->a_addr;
+                                if (a0 > ai) {
+                                        j = 1;
+                                        p[i] = p[i-1];
+                                        p[i-1] = sp;
+                                }
+                                a0 = ai;
+                        }
+                }
+        }
+
+        /*
+         * Repeat Counter
+         */
+        switch(a_bytes) {
+        default:
+        case 2: n = 4; break;
+        case 3:
+        case 4: n = 3; break;
+        }
+
+        /*
+         * Symbol Table Output
+         */
+        /* sdld specific */
+        memPage = (xp->a_flag & A_CODE) ? 0x0C : ((xp->a_flag & A_XDATA) ? 0x0D : ((xp->a_flag & A_BIT) ? 0x0B : 0x00));
+        /* end sdld specific */
+        i = 0;
+        while (i < nmsym) {
+                if (wflag) {
+                        slew(xp, yp);
+                        if (is_sdld()) {
+                                switch(a_bytes) {
+                                default:
+                                case 2: frmt = "     "; break;
+                                case 3:
+                                case 4: frmt = ""; break;
+                                }
+                                if (memPage != 0)
+                                        fprintf(mfp, "%s%X:", frmt, memPage);
+                                else
+                                        fprintf(mfp, "%s  ", frmt);
+                        } else {
+                                switch(a_bytes) {
+                                default:
+                                case 2: frmt = "        "; break;
+                                case 3:
+                                case 4: frmt = "   "; break;
+                                }
+                                fprintf(mfp, "%s", frmt);
+                        }
+                } else
+                if ((i % n) == 0) {
+                        slew(xp, yp);
+                        switch(a_bytes) {
+                        default:
+                        case 2: frmt = "  "; break;
+                        case 3:
+                        case 4: frmt = "  "; break;
+                        }
+                        fprintf(mfp, "%s", frmt);
+                }
+
+                sp = p[i];
+                aj = (sp->s_addr + sp->s_axp->a_addr) & a_mask;
+#ifdef  LONGINT
+                switch(a_bytes) {
+                default:
+                case 2:
+                        switch(xflag) {
+                        default:
+                        case 0: frmt = "  %04lX  "; break;
+                        case 1: frmt = "%06lo  "; break;
+                        case 2: frmt = " %05lu  "; break;
+                        }
+                        break;
+                case 3:
+                        switch(xflag) {
+                        default:
+                        case 0: frmt = "     %06lX  "; break;
+                        case 1: frmt = "   %08lo  "; break;
+                        case 2: frmt = "   %08lu  "; break;
+                        }
+                        break;
+                case 4:
+                        switch(xflag) {
+                        default:
+                        case 0: frmt = "   %08lX  "; break;
+                        case 1: frmt = "%011lo  "; break;
+                        case 2: frmt = " %010lu  "; break;
+                        }
+                        break;
+                }
 #else
-		switch(a_bytes) {
-		default:
-		case 2:
-			switch(xflag) {
-			default:
-			case 0: frmt = "  %04X  "; break;
-			case 1: frmt = "%06o  "; break;
-			case 2: frmt = " %05u  "; break;
-			}
-			break;
-		case 3:
-			switch(xflag) {
-			default:
-			case 0: frmt = "     %06X  "; break;
-			case 1: frmt = "   %08o  "; break;
-			case 2: frmt = "   %08u  "; break;
-			}
-			break;
-		case 4:
-			switch(xflag) {
-			default:
-			case 0: frmt = "   %08X  "; break;
-			case 1: frmt = "%011o  "; break;
-			case 2: frmt = " %010u  "; break;
-			}
-			break;
-		}
+                switch(a_bytes) {
+                default:
+                case 2:
+                        switch(xflag) {
+                        default:
+                        case 0: frmt = "  %04X  "; break;
+                        case 1: frmt = "%06o  "; break;
+                        case 2: frmt = " %05u  "; break;
+                        }
+                        break;
+                case 3:
+                        switch(xflag) {
+                        default:
+                        case 0: frmt = "     %06X  "; break;
+                        case 1: frmt = "   %08o  "; break;
+                        case 2: frmt = "   %08u  "; break;
+                        }
+                        break;
+                case 4:
+                        switch(xflag) {
+                        default:
+                        case 0: frmt = "   %08X  "; break;
+                        case 1: frmt = "%011o  "; break;
+                        case 2: frmt = " %010u  "; break;
+                        }
+                        break;
+                }
 #endif
-		fprintf(mfp, frmt, aj);
+                fprintf(mfp, frmt, aj);
 
-		ptr = &sp->s_id[0];
+                ptr = &sp->s_id[0];
 
 #if NOICE
-		/*
-		 * NoICE output of symbol
-		 */
-		if (jflag) DefineNoICE( ptr, aj, memPage );
+                /*
+                 * NoICE output of symbol
+                 */
+                if (jflag) DefineNoICE(ptr, aj, yp);
 #endif
 
 #if SDCDB
-		/*
-		 * SDCDB output of symbol
-		 */
-		if (yflag) DefineSDCDB(ptr, aj);
+                /*
+                 * SDCDB output of symbol
+                 */
+                if (yflag) DefineSDCDB(ptr, aj);
 #endif
 
-		if (wflag) {
-			fprintf(mfp, "%-32.32s", ptr);
-			i++;
-			ptr = &sp->m_id[0];
-			if(ptr) {
-				fprintf(mfp, "   %-.28s", ptr);
-			}
-		} else {
-			switch(a_bytes) {
-			default:
-			case 2: frmt = "%-8.8s"; break;
-			case 3:
-			case 4: frmt = "%-9.9s"; break;
-			}
-			fprintf(mfp, frmt, ptr);
-			if (++i < nmsym)
-				if (i % n != 0)
-					fprintf(mfp, " | ");
-		}
-		if (wflag || (i % n == 0)) {
-			putc('\n', mfp);
-		}
-	}
-	if (i % n != 0) {
-		putc('\n', mfp);
-	}
-	free(p);
+                if (wflag) {
+                        fprintf(mfp, "%-32.32s", ptr);
+                        i++;
+                        ptr = &sp->m_id[0];
+                        if(ptr) {
+                                fprintf(mfp, "   %-.28s", ptr);
+                        }
+                } else {
+                        switch(a_bytes) {
+                        default:
+                        case 2: frmt = "%-8.8s"; break;
+                        case 3:
+                        case 4: frmt = "%-9.9s"; break;
+                        }
+                        fprintf(mfp, frmt, ptr);
+                        if (++i < nmsym)
+                                if (i % n != 0)
+                                        fprintf(mfp, " | ");
+                }
+                if (wflag || (i % n == 0)) {
+                        putc('\n', mfp);
+                }
+        }
+        if (i % n != 0) {
+                putc('\n', mfp);
+        }
+        free(p);
 }
 
-/*)Function	VOID	lkulist(i)
+/*)Function     VOID    lkulist(i)
  *
- *		int	i	i # 0	process LST to RST file
- *				i = 0	copy remainder of LST file
- *					to RST file and close files
- *
- *	The function lkulist() creates a relocated listing (.rst)
- *	output file from the ASxxxx assembler listing (.lst)
- *	files.	The .lst file's program address and code bytes
- *	are changed to reflect the changes made by ASlink as
- *	the .rel files are combined into a single relocated
- *	output file.
- *
- *	local variables:
- *		a_uint	cpc		current program counter address in PC increments
- *		int	cbytes		bytes so far in T line
- *
- *	global variables:
- *		int	a_bytes		T Line Address Bytes
- *		int	hilo		byte order
- *		int	gline		get a line from the LST file
- *					to translate for the RST file
- *		int	pcb		bytes per instruction word
- *		char	rb[]		read listing file text line
- *		FILE	*rfp		The file handle to the current
- *					output RST file
- *		int	rtcnt		count of data words
- *		int	rtflg[]		output the data flag
- *		a_uint	rtval[]		relocated data
- *		int	rterr[]		error flag ???
- *		FILE	*tfp		The file handle to the current
- *					LST file being scanned
- *
- *	functions called:
- *		int	fclose()	c_library
- *		int	fgets()		c_library
- *		int	fprintf()	c_library
- *		VOID	lkalist()	lklist.c
- *		VOID	lkglist()	lklist.c
- *
- *	side effects:
- *		A .rst file is created for each available .lst
- *		file associated with a .rel file.
+ *              int     i       i # 0   process LST to RST file
+ *                              i = 0   copy remainder of LST file
+ *                                      to RST file and close files
+ *
+ *      The function lkulist() creates a relocated listing (.rst)
+ *      output file from the ASxxxx assembler listing (.lst)
+ *      files.  The .lst file's program address and code bytes
+ *      are changed to reflect the changes made by ASlink as
+ *      the .rel files are combined into a single relocated
+ *      output file.
+ *
+ *      local variables:
+ *              a_uint  cpc             current program counter address in PC increments
+ *              int     cbytes          bytes so far in T line
+ *
+ *      global variables:
+ *              int     a_bytes         T Line Address Bytes
+ *              int     hilo            byte order
+ *              int     gline           get a line from the LST file
+ *                                      to translate for the RST file
+ *              a_uint  pc              current program counter address in bytes
+ *              int     pcb             bytes per instruction word
+ *              char    rb[]            read listing file text line
+ *              FILE    *rfp            The file handle to the current
+ *                                      output RST file
+ *              int     rtcnt           count of data words
+ *              int     rtflg[]         output the data flag
+ *              a_uint  rtval[]         relocated data
+ *              int     rterr[]         error flag ???
+ *              FILE    *tfp            The file handle to the current
+ *                                      LST file being scanned
+ *
+ *      functions called:
+ *              int     fclose()        c_library
+ *              int     fgets()         c_library
+ *              int     fprintf()       c_library
+ *              VOID    lkalist()       lklist.c
+ *              VOID    lkglist()       lklist.c
+ *
+ *      side effects:
+ *              A .rst file is created for each available .lst
+ *              file associated with a .rel file.
  */
 
 VOID
 lkulist(int i)
 {
-	a_uint cpc;
-	int cbytes;
+        a_uint cpc;
+        int cbytes;
 
-	/*
-	 * Exit if listing file is not open
-	 */
-	if (tfp == NULL)
-		return;
-
-	/*
-	 * Normal processing of LST to RST
-	 */
-	if (i) {
-		/*
-		 * Evaluate current code address
-		 */
-		if (hilo == 0) {
-			cpc = ((rtval[1] & 0xFF) << 8) + (rtval[0] & 0xFF);
-		} else {
-			cpc = ((rtval[0] & 0xFF) << 8) + (rtval[1] & 0xFF);
-		}
-
-		/*
-		 * Line with only address
-		 */
-		if (rtcnt == a_bytes) {
-			lkalist(cpc);
-
-		/*
-		 * Line with address and code
-		 */
-		} else {
-			cbytes = 0;
-			for (i=a_bytes; i < rtcnt; i++) {
-				if (rtflg[i]) {
-					lkglist(cpc, (int) (rtval[i] & 0xFF), rterr[i]);
-					cbytes += 1;
-					cpc += (cbytes % pcb) ? 0 : 1;
-				}
-			}
-		}
-	/*
-	 * Copy remainder of LST to RST
-	 */
-	} else {
-		if (gline == 0)
-			fprintf(rfp, "%s", rb);
-
-		while (fgets(rb, sizeof(rb)-2, tfp) != 0) {
-			fprintf(rfp, "%s", rb);
-		}
-		fclose(tfp);
-		tfp = NULL;
-		fclose(rfp);
-		rfp = NULL;
-	}
+        /*
+         * Exit if listing file is not open
+         */
+        if (tfp == NULL)
+                return;
+
+        /*
+         * Normal processing of LST to RST
+         */
+        if (i) {
+                /*
+                 * Line with only address
+                 */
+                if (rtcnt == a_bytes) {
+                        lkalist(pc);
+
+                /*
+                 * Line with address and code
+                 */
+                } else {
+                        cpc = pc;
+                        cbytes = 0;
+                        for (i=a_bytes; i < rtcnt; i++) {
+                                if (rtflg[i]) {
+                                        lkglist(cpc, (int) (rtval[i] & 0xFF), rterr[i]);
+                                        cbytes += 1;
+                                        cpc += (cbytes % pcb) ? 0 : 1;
+                                }
+                        }
+                }
+        /*
+         * Copy remainder of LST to RST
+         */
+        } else {
+                if (gline == 0)
+                        fprintf(rfp, "%s", rb);
+
+                while (fgets(rb, sizeof(rb)-2, tfp) != 0) {
+                        fprintf(rfp, "%s", rb);
+                }
+                fclose(tfp);
+                tfp = NULL;
+                fclose(rfp);
+                rfp = NULL;
+        }
 }
 
-/*)Function	VOID	lkalist(cpc)
+/*)Function     VOID    lkalist(cpc)
  *
- *		int	cpc		current program counter value
+ *              int     cpc             current program counter value
  *
- *	The function lkalist() performs the following functions:
+ *      The function lkalist() performs the following functions:
  *
- *	(1)	if the value of gline = 0 then the current listing
- *		file line is copied to the relocated listing file output.
+ *      (1)     if the value of gline = 0 then the current listing
+ *              file line is copied to the relocated listing file output.
  *
- *	(2)	the listing file is read line by line and copied to
- *		the relocated listing file until a valid source
- *		line number and a program counter value of the correct
- *		radix is found.  The new relocated pc value is substituted
- *		and the line is written to the RST file.
- *
- *	local variables:
- *		int	i		loop counter
- *		int	m		character count
- *		int	n		character index
- *		int	r		character radix
- *		char *	frmt		temporary format specifier
- *		char	str[]		temporary string
- *
- *	global variables:
- *		int	a_bytes		T Line Address Bytes
- *		a_uint	a_mask		address masking parameter
- *		int	gcntr		data byte counter
- *		int	gline		get a line from the LST file
- *					to translate for the RST file
- *		char	rb[]		read listing file text line
- *		char	*rp		pointer to listing file text line
- *		FILE	*rfp		The file handle to the current
- *					output RST file
- *		FILE	*tfp		The file handle to the current
- *					LST file being scanned
- *
- *	functions called:
- *		int	dgt()		lklist.c
- *		int	fclose()	c_library
- *		int	fgets()		c_library
- *		int	fprintf()	c_library
- *		int	sprintf()	c_library
- *		char *	strncpy()	c_library
- *
- *	side effects:
- *		Lines of the LST file are copied to the RST file,
- *		the last line copied has the code address
- *		updated to reflect the program relocation.
+ *      (2)     the listing file is read line by line and copied to
+ *              the relocated listing file until a valid source
+ *              line number and a program counter value of the correct
+ *              radix is found.  The new relocated pc value is substituted
+ *              and the line is written to the RST file.
+ *
+ *      local variables:
+ *              int     i               loop counter
+ *              int     m               character count
+ *              int     n               character index
+ *              int     r               character radix
+ *              char *  frmt            temporary format specifier
+ *              char    str[]           temporary string
+ *
+ *      global variables:
+ *              int     a_bytes         T Line Address Bytes
+ *              a_uint  a_mask          address masking parameter
+ *              int     gcntr           data byte counter
+ *              int     gline           get a line from the LST file
+ *                                      to translate for the RST file
+ *              char    rb[]            read listing file text line
+ *              char    *rp             pointer to listing file text line
+ *              FILE    *rfp            The file handle to the current
+ *                                      output RST file
+ *              FILE    *tfp            The file handle to the current
+ *                                      LST file being scanned
+ *
+ *      functions called:
+ *              int     dgt()           lklist.c
+ *              int     fclose()        c_library
+ *              int     fgets()         c_library
+ *              int     fprintf()       c_library
+ *              int     sprintf()       c_library
+ *              char *  strncpy()       c_library
+ *
+ *      side effects:
+ *              Lines of the LST file are copied to the RST file,
+ *              the last line copied has the code address
+ *              updated to reflect the program relocation.
  */
 
 /* The Output Formats,  No Cycle Count
@@ -774,34 +791,34 @@
           11111111112222222222333333333344444-----
 012345678901234567890123456789012345678901234-----
    |    |               |     | |
-ee XXXX xx xx xx xx xx xx LLLLL *************	HEX(16)
-ee 000000 ooo ooo ooo ooo LLLLL *************	OCTAL(16)
-ee  DDDDD ddd ddd ddd ddd LLLLL *************	DECIMAL(16)
+ee XXXX xx xx xx xx xx xx LLLLL *************   HEX(16)
+ee 000000 ooo ooo ooo ooo LLLLL *************   OCTAL(16)
+ee  DDDDD ddd ddd ddd ddd LLLLL *************   DECIMAL(16)
                      XXXX
-		   OOOOOO
-		    DDDDD
+                   OOOOOO
+                    DDDDD
 
 | Tabs- |       |       |       |       |       |
           11111111112222222222333333333344444-----
 012345678901234567890123456789012345678901234-----
      |       |                  |     | |
-ee    XXXXXX xx xx xx xx xx xx xx LLLLL *********	HEX(24)
-ee   OO000000 ooo ooo ooo ooo ooo LLLLL *********	OCTAL(24)
-ee   DDDDDDDD ddd ddd ddd ddd ddd LLLLL *********	DECIMAL(24)
+ee    XXXXXX xx xx xx xx xx xx xx LLLLL *********       HEX(24)
+ee   OO000000 ooo ooo ooo ooo ooo LLLLL *********       OCTAL(24)
+ee   DDDDDDDD ddd ddd ddd ddd ddd LLLLL *********       DECIMAL(24)
                            XXXXXX
-			 OOOOOOOO
-			 DDDDDDDD
+                         OOOOOOOO
+                         DDDDDDDD
 
 | Tabs- |       |       |       |       |       |
           11111111112222222222333333333344444-----
 012345678901234567890123456789012345678901234-----
   |          |                  |     | |
-ee  XXXXXXXX xx xx xx xx xx xx xx LLLLL *********	HEX(32)
-eeOOOOO000000 ooo ooo ooo ooo ooo LLLLL *********	OCTAL(32)
-ee DDDDDDDDDD ddd ddd ddd ddd ddd LLLLL *********	DECIMAL(32)
+ee  XXXXXXXX xx xx xx xx xx xx xx LLLLL *********       HEX(32)
+eeOOOOO000000 ooo ooo ooo ooo ooo LLLLL *********       OCTAL(32)
+ee DDDDDDDDDD ddd ddd ddd ddd ddd LLLLL *********       DECIMAL(32)
                          XXXXXXXX
-		      OOOOOOOOOOO
-		       DDDDDDDDDD
+                      OOOOOOOOOOO
+                       DDDDDDDDDD
 */
 
 /* The Output Formats,  With Cycle Count [nn]
@@ -809,229 +826,229 @@
           11111111112222222222333333333344444-----
 012345678901234567890123456789012345678901234-----
    |    |               |     | |
-ee XXXX xx xx xx xx xx[nn]LLLLL *************	HEX(16)
-ee 000000 ooo ooo ooo [nn]LLLLL *************	OCTAL(16)
-ee  DDDDD ddd ddd ddd [nn]LLLLL *************	DECIMAL(16)
+ee XXXX xx xx xx xx xx[nn]LLLLL *************   HEX(16)
+ee 000000 ooo ooo ooo [nn]LLLLL *************   OCTAL(16)
+ee  DDDDD ddd ddd ddd [nn]LLLLL *************   DECIMAL(16)
                      XXXX
-		   OOOOOO
-		    DDDDD
+                   OOOOOO
+                    DDDDD
 
 | Tabs- |       |       |       |       |       |
           11111111112222222222333333333344444-----
 012345678901234567890123456789012345678901234-----
      |       |                  |     | |
-ee    XXXXXX xx xx xx xx xx xx[nn]LLLLL *********	HEX(24)
-ee   OO000000 ooo ooo ooo ooo [nn]LLLLL *********	OCTAL(24)
-ee   DDDDDDDD ddd ddd ddd ddd [nn]LLLLL *********	DECIMAL(24)
+ee    XXXXXX xx xx xx xx xx xx[nn]LLLLL *********       HEX(24)
+ee   OO000000 ooo ooo ooo ooo [nn]LLLLL *********       OCTAL(24)
+ee   DDDDDDDD ddd ddd ddd ddd [nn]LLLLL *********       DECIMAL(24)
                            XXXXXX
-			 OOOOOOOO
-			 DDDDDDDD
+                         OOOOOOOO
+                         DDDDDDDD
 
 | Tabs- |       |       |       |       |       |
           11111111112222222222333333333344444-----
 012345678901234567890123456789012345678901234-----
   |          |                  |     | |
-ee  XXXXXXXX xx xx xx xx xx xx[nn]LLLLL *********	HEX(32)
-eeOOOOO000000 ooo ooo ooo ooo [nn]LLLLL *********	OCTAL(32)
-ee DDDDDDDDDD ddd ddd ddd ddd [nn]LLLLL *********	DECIMAL(32)
+ee  XXXXXXXX xx xx xx xx xx xx[nn]LLLLL *********       HEX(32)
+eeOOOOO000000 ooo ooo ooo ooo [nn]LLLLL *********       OCTAL(32)
+ee DDDDDDDDDD ddd ddd ddd ddd [nn]LLLLL *********       DECIMAL(32)
                          XXXXXXXX
-		      OOOOOOOOOOO
-		       DDDDDDDDDD
+                      OOOOOOOOOOO
+                       DDDDDDDDDD
 */
 
 VOID
 lkalist(a_uint cpc)
 {
-	char str[16];
-	char *frmt;
-	int i, m, n, r;
-
-	/*
-	 * Truncate (int) to N-Bytes
-	 */
-	cpc &= a_mask;
-
-	/*
-	 * Exit if listing file is not open
-	 */
-loop:	if (tfp == NULL)
-		return;
-
-	/*
-	 * Copy current LST to RST
-	 */
-	if (gline == 0) {
-		fprintf(rfp, "%s", rb);
-		gline = 1;
-	}
-
-	/*
-	 * Clear text line buffer
-	 */
-	for (i=0,rp=rb; i<sizeof(rb); i++) {
-		*rp++ = 0;
-	}
-
-	/*
-	 * Get next LST text line
-	 */
-	if (fgets(rb, sizeof(rb)-2, tfp) == NULL) {
-		fclose(tfp);
-		tfp = NULL;
-		fclose(rfp);
-		rfp = NULL;
-		return;
-	}
-
-	/*
-	 * Must have an ASxxxx Listing line number
-	 */
-	 switch(a_bytes) {
-	 default:
-	 case 2: n = 30; break;
-	 case 3:
-	 case 4: n = 38; break;
-	 }
-	 if (!dgt(RAD10, &rb[n], 1)) {
-		fprintf(rfp, "%s", rb);
-		goto loop;
-	}
-
-	/*
-	 * Must have an address in the expected radix
-	 */
-#ifdef	LONGINT
-	switch(radix) {
-	default:
-	case 16:
-		r = RAD16;
-		switch(a_bytes) {
-		default:
-		case 2: n = 3; m = 4; frmt = "%04lX"; break;
-		case 3: n = 6; m = 6; frmt = "%06lX"; break;
-		case 4: n = 4; m = 8; frmt = "%08lX"; break;
-		}
-		break;
-	case 10:
-		r = RAD10;
-		switch(a_bytes) {
-		default:
-		case 2: n = 4; m = 5; frmt = "%05lu"; break;
-		case 3: n = 5; m = 8; frmt = "%08lu"; break;
-		case 4: n = 3; m = 10; frmt = "%010lu"; break;
-		}
-		break;
-	case 8:
-		r = RAD8;
-		switch(a_bytes) {
-		default:
-		case 2: n = 3; m = 6; frmt = "%06lo"; break;
-		case 3: n = 5; m = 8; frmt = "%08lo"; break;
-		case 4: n = 2; m = 11; frmt = "%011lo"; break;
-		}
-		break;
-	}
+        char str[16];
+        char *frmt;
+        int i, m, n, r;
+
+        /*
+         * Truncate (int) to N-Bytes
+         */
+        cpc &= a_mask;
+
+        /*
+         * Exit if listing file is not open
+         */
+loop:   if (tfp == NULL)
+                return;
+
+        /*
+         * Copy current LST to RST
+         */
+        if (gline == 0) {
+                fprintf(rfp, "%s", rb);
+                gline = 1;
+        }
+
+        /*
+         * Clear text line buffer
+         */
+        for (i=0,rp=rb; i<sizeof(rb); i++) {
+                *rp++ = 0;
+        }
+
+        /*
+         * Get next LST text line
+         */
+        if (fgets(rb, sizeof(rb)-2, tfp) == NULL) {
+                fclose(tfp);
+                tfp = NULL;
+                fclose(rfp);
+                rfp = NULL;
+                return;
+        }
+
+        /*
+         * Must have an ASxxxx Listing line number
+         */
+         switch(a_bytes) {
+         default:
+         case 2: n = 30; break;
+         case 3:
+         case 4: n = 38; break;
+         }
+         if (!dgt(RAD10, &rb[n], 1)) {
+                fprintf(rfp, "%s", rb);
+                goto loop;
+        }
+
+        /*
+         * Must have an address in the expected radix
+         */
+#ifdef  LONGINT
+        switch(radix) {
+        default:
+        case 16:
+                r = RAD16;
+                switch(a_bytes) {
+                default:
+                case 2: n = 3; m = 4; frmt = "%04lX"; break;
+                case 3: n = 6; m = 6; frmt = "%06lX"; break;
+                case 4: n = 4; m = 8; frmt = "%08lX"; break;
+                }
+                break;
+        case 10:
+                r = RAD10;
+                switch(a_bytes) {
+                default:
+                case 2: n = 4; m = 5; frmt = "%05lu"; break;
+                case 3: n = 5; m = 8; frmt = "%08lu"; break;
+                case 4: n = 3; m = 10; frmt = "%010lu"; break;
+                }
+                break;
+        case 8:
+                r = RAD8;
+                switch(a_bytes) {
+                default:
+                case 2: n = 3; m = 6; frmt = "%06lo"; break;
+                case 3: n = 5; m = 8; frmt = "%08lo"; break;
+                case 4: n = 2; m = 11; frmt = "%011lo"; break;
+                }
+                break;
+        }
 #else
-	switch(radix) {
-	default:
-	case 16:
-		r = RAD16;
-		switch(a_bytes) {
-		default:
-		case 2: n = 3; m = 4; frmt = "%04X"; break;
-		case 3: n = 6; m = 6; frmt = "%06X"; break;
-		case 4: n = 4; m = 8; frmt = "%08X"; break;
-		}
-		break;
-	case 10:
-		r = RAD10;
-		switch(a_bytes) {
-		default:
-		case 2: n = 4; m = 5; frmt = "%05u"; break;
-		case 3: n = 5; m = 8; frmt = "%08u"; break;
-		case 4: n = 3; m = 10; frmt = "%010u"; break;
-		}
-		break;
-	case 8:
-		r = RAD8;
-		switch(a_bytes) {
-		default:
-		case 2: n = 3; m = 6; frmt = "%06o"; break;
-		case 3: n = 5; m = 8; frmt = "%08o"; break;
-		case 4: n = 2; m = 11; frmt = "%011o"; break;
-		}
-		break;
-	}
+        switch(radix) {
+        default:
+        case 16:
+                r = RAD16;
+                switch(a_bytes) {
+                default:
+                case 2: n = 3; m = 4; frmt = "%04X"; break;
+                case 3: n = 6; m = 6; frmt = "%06X"; break;
+                case 4: n = 4; m = 8; frmt = "%08X"; break;
+                }
+                break;
+        case 10:
+                r = RAD10;
+                switch(a_bytes) {
+                default:
+                case 2: n = 4; m = 5; frmt = "%05u"; break;
+                case 3: n = 5; m = 8; frmt = "%08u"; break;
+                case 4: n = 3; m = 10; frmt = "%010u"; break;
+                }
+                break;
+        case 8:
+                r = RAD8;
+                switch(a_bytes) {
+                default:
+                case 2: n = 3; m = 6; frmt = "%06o"; break;
+                case 3: n = 5; m = 8; frmt = "%08o"; break;
+                case 4: n = 2; m = 11; frmt = "%011o"; break;
+                }
+                break;
+        }
 #endif
-	if (!dgt(r, &rb[n], m)) {
-			fprintf(rfp, "%s", rb);
-			goto loop;
-		}
-	sprintf(str, frmt, cpc);
-	strncpy(&rb[n], str, m);
-
-	/*
-	 * Copy updated LST text line to RST
-	 */
-	fprintf(rfp, "%s", rb);
-	gcntr = 0;
+        if (!dgt(r, &rb[n], m)) {
+                        fprintf(rfp, "%s", rb);
+                        goto loop;
+                }
+        sprintf(str, frmt, cpc);
+        strncpy(&rb[n], str, m);
+
+        /*
+         * Copy updated LST text line to RST
+         */
+        fprintf(rfp, "%s", rb);
+        gcntr = 0;
 }
 
-/*)Function	VOID	lkglist(cpc,v,err)
+/*)Function     VOID    lkglist(cpc,v,err)
  *
- *		int	cpc		current program counter value
- *		int	v		value of byte at this address
- *		int	err		error flag for this value
- *
- *	The function lkglist() performs the following functions:
- *
- *	(1)	if the value of gline = 1 then the listing file
- *		is read line by line and copied to the
- *		relocated listing file until a valid source
- *		line number and a program counter value of the correct
- *		radix is found.
- *
- *	(2)	The new relocated values and code address are
- *		substituted and the line may be written to the RST file.
- *
- *	local variables:
- *		int	a		string index for first byte
- *		int	i		loop counter
- *		int	m		character count
- *		int	n		character index
- *		int	r		character radix
- *		int	s		spacing
- *		int	u		repeat counter
- *		char *	afrmt		temporary format specifier
- *		char *	frmt		temporary format specifier
- *		char	str[]		temporary string
- *
- *	global variables:
- *		int	a_bytes		T Line Address Bytes
- *		a_uint	a_mask		address masking parameter
- *		int	gcntr		data byte counter
- *					set to -1 for a continuation line
- *		int	gline		get a line from the LST file
- *					to translate for the RST file
- *		char	rb[]		read listing file text line
- *		char	*rp		pointer to listing file text line
- *		FILE	*rfp		The file handle to the current
- *					output RST file
- *		FILE	*tfp		The file handle to the current
- *					LST file being scanned
- *		char	*errmsg[]	array of pointers to error strings
- *
- *	functions called:
- *		int	dgt()		lklist.c
- *		int	fclose()	c_library
- *		int	fgets()		c_library
- *		int	fprintf()	c_library
- *		int	sprintf()	c_library
- *		char *	strncpy()	c_library
- *
- *	side effects:
- *		Lines of the LST file are copied to the RST file
- *		with updated data values and code addresses.
+ *              int     cpc             current program counter value
+ *              int     v               value of byte at this address
+ *              int     err             error flag for this value
+ *
+ *      The function lkglist() performs the following functions:
+ *
+ *      (1)     if the value of gline = 1 then the listing file
+ *              is read line by line and copied to the
+ *              relocated listing file until a valid source
+ *              line number and a program counter value of the correct
+ *              radix is found.
+ *
+ *      (2)     The new relocated values and code address are
+ *              substituted and the line may be written to the RST file.
+ *
+ *      local variables:
+ *              int     a               string index for first byte
+ *              int     i               loop counter
+ *              int     m               character count
+ *              int     n               character index
+ *              int     r               character radix
+ *              int     s               spacing
+ *              int     u               repeat counter
+ *              char *  afrmt           temporary format specifier
+ *              char *  frmt            temporary format specifier
+ *              char    str[]           temporary string
+ *
+ *      global variables:
+ *              int     a_bytes         T Line Address Bytes
+ *              a_uint  a_mask          address masking parameter
+ *              int     gcntr           data byte counter
+ *                                      set to -1 for a continuation line
+ *              int     gline           get a line from the LST file
+ *                                      to translate for the RST file
+ *              char    rb[]            read listing file text line
+ *              char    *rp             pointer to listing file text line
+ *              FILE    *rfp            The file handle to the current
+ *                                      output RST file
+ *              FILE    *tfp            The file handle to the current
+ *                                      LST file being scanned
+ *              char    *errmsg3[]      array of pointers to error strings
+ *
+ *      functions called:
+ *              int     dgt()           lklist.c
+ *              int     fclose()        c_library
+ *              int     fgets()         c_library
+ *              int     fprintf()       c_library
+ *              int     sprintf()       c_library
+ *              char *  strncpy()       c_library
+ *
+ *      side effects:
+ *              Lines of the LST file are copied to the RST file
+ *              with updated data values and code addresses.
  */
 
 /* The Output Formats, No Cycle Count
@@ -1039,34 +1056,34 @@
           11111111112222222222333333333344444-----
 012345678901234567890123456789012345678901234-----
    |    |               |     | |
-ee XXXX xx xx xx xx xx xx LLLLL *************	HEX(16)
-ee 000000 ooo ooo ooo ooo LLLLL *************	OCTAL(16)
-ee  DDDDD ddd ddd ddd ddd LLLLL *************	DECIMAL(16)
+ee XXXX xx xx xx xx xx xx LLLLL *************   HEX(16)
+ee 000000 ooo ooo ooo ooo LLLLL *************   OCTAL(16)
+ee  DDDDD ddd ddd ddd ddd LLLLL *************   DECIMAL(16)
                      XXXX
-		   OOOOOO
-		    DDDDD
+                   OOOOOO
+                    DDDDD
 
 | Tabs- |       |       |       |       |       |
           11111111112222222222333333333344444-----
 012345678901234567890123456789012345678901234-----
      |       |                  |     | |
-ee    XXXXXX xx xx xx xx xx xx xx LLLLL *********	HEX(24)
-ee   OO000000 ooo ooo ooo ooo ooo LLLLL *********	OCTAL(24)
-ee   DDDDDDDD ddd ddd ddd ddd ddd LLLLL *********	DECIMAL(24)
+ee    XXXXXX xx xx xx xx xx xx xx LLLLL *********       HEX(24)
+ee   OO000000 ooo ooo ooo ooo ooo LLLLL *********       OCTAL(24)
+ee   DDDDDDDD ddd ddd ddd ddd ddd LLLLL *********       DECIMAL(24)
                            XXXXXX
-			 OOOOOOOO
-			 DDDDDDDD
+                         OOOOOOOO
+                         DDDDDDDD
 
 | Tabs- |       |       |       |       |       |
           11111111112222222222333333333344444-----
 012345678901234567890123456789012345678901234-----
   |          |                  |     | |
-ee  XXXXXXXX xx xx xx xx xx xx xx LLLLL *********	HEX(32)
-eeOOOOO000000 ooo ooo ooo ooo ooo LLLLL *********	OCTAL(32)
-ee DDDDDDDDDD ddd ddd ddd ddd ddd LLLLL *********	DECIMAL(32)
+ee  XXXXXXXX xx xx xx xx xx xx xx LLLLL *********       HEX(32)
+eeOOOOO000000 ooo ooo ooo ooo ooo LLLLL *********       OCTAL(32)
+ee DDDDDDDDDD ddd ddd ddd ddd ddd LLLLL *********       DECIMAL(32)
                          XXXXXXXX
-		      OOOOOOOOOOO
-		       DDDDDDDDDD
+                      OOOOOOOOOOO
+                       DDDDDDDDDD
 */
 
 /* The Output Formats,  With Cycle Count [nn]
@@ -1074,213 +1091,213 @@
           11111111112222222222333333333344444-----
 012345678901234567890123456789012345678901234-----
    |    |               |     | |
-ee XXXX xx xx xx xx xx[nn]LLLLL *************	HEX(16)
-ee 000000 ooo ooo ooo [nn]LLLLL *************	OCTAL(16)
-ee  DDDDD ddd ddd ddd [nn]LLLLL *************	DECIMAL(16)
+ee XXXX xx xx xx xx xx[nn]LLLLL *************   HEX(16)
+ee 000000 ooo ooo ooo [nn]LLLLL *************   OCTAL(16)
+ee  DDDDD ddd ddd ddd [nn]LLLLL *************   DECIMAL(16)
                      XXXX
-		   OOOOOO
-		    DDDDD
+                   OOOOOO
+                    DDDDD
 
 | Tabs- |       |       |       |       |       |
           11111111112222222222333333333344444-----
 012345678901234567890123456789012345678901234-----
      |       |                  |     | |
-ee    XXXXXX xx xx xx xx xx xx[nn]LLLLL *********	HEX(24)
-ee   OO000000 ooo ooo ooo ooo [nn]LLLLL *********	OCTAL(24)
-ee   DDDDDDDD ddd ddd ddd ddd [nn]LLLLL *********	DECIMAL(24)
+ee    XXXXXX xx xx xx xx xx xx[nn]LLLLL *********       HEX(24)
+ee   OO000000 ooo ooo ooo ooo [nn]LLLLL *********       OCTAL(24)
+ee   DDDDDDDD ddd ddd ddd ddd [nn]LLLLL *********       DECIMAL(24)
                            XXXXXX
-			 OOOOOOOO
-			 DDDDDDDD
+                         OOOOOOOO
+                         DDDDDDDD
 
 | Tabs- |       |       |       |       |       |
           11111111112222222222333333333344444-----
 012345678901234567890123456789012345678901234-----
   |          |                  |     | |
-ee  XXXXXXXX xx xx xx xx xx xx[nn]LLLLL *********	HEX(32)
-eeOOOOO000000 ooo ooo ooo ooo [nn]LLLLL *********	OCTAL(32)
-ee DDDDDDDDDD ddd ddd ddd ddd [nn]LLLLL *********	DECIMAL(32)
+ee  XXXXXXXX xx xx xx xx xx xx[nn]LLLLL *********       HEX(32)
+eeOOOOO000000 ooo ooo ooo ooo [nn]LLLLL *********       OCTAL(32)
+ee DDDDDDDDDD ddd ddd ddd ddd [nn]LLLLL *********       DECIMAL(32)
                          XXXXXXXX
-		      OOOOOOOOOOO
-		       DDDDDDDDDD
+                      OOOOOOOOOOO
+                       DDDDDDDDDD
 */
 
 VOID
 lkglist(a_uint cpc, int v, int err)
 {
-	char str[16];
-	char *afrmt, *frmt;
-	int a, i, n, m, r, s, u;
-
-	/*
-	 * Truncate (int) to N-Bytes
-	 */
-	 cpc &= a_mask;
-
-	/*
-	 * Exit if listing file is not open
-	 */
-loop:	if (tfp == NULL)
-		return;
-
-	/*
-	 * Get next LST text line
-	 */
-	if (gline) {
-		/*
-		 * Clear text line buffer
-		 */
-		for (i=0,rp=rb; i<sizeof(rb); i++) {
-			*rp++ = 0;
-		}
-
-		/*
-		 * Get next LST text line
-		 */
-		if (fgets(rb, sizeof(rb)-2, tfp) == NULL) {
-			fclose(tfp);
-			tfp = NULL;
-			fclose(rfp);
-			rfp = NULL;
-			return;
-		}
-
-		/*
-		 * Check for a listing line number if required
-		 */
-		if (gcntr != -1) {
-			switch(a_bytes) {
-			default:
-			case 2: n = 30; break;
-			case 3:
-			case 4: n = 38; break;
-			}
-			if (!dgt(RAD10, &rb[n], 1)) {
-				fprintf(rfp, "%s", rb);
-				goto loop;
-			}
-			gcntr = 0;
-		}
-		gline = 0;
-	}
-
-	/*
-	 * Hex Listing
-	 */
-#ifdef	LONGINT
-	 switch(radix) {
-	 default:
-	 case 16:
-		r = RAD16;
-		switch(a_bytes) {
-		default:
-		case 2:	a = 8; s = 3; n = 3; m = 4; u = 6; afrmt = "%04lX"; break;
-		case 3: a = 13; s = 3; n = 6; m = 6; u = 7; afrmt = "%06lX"; break;
-		case 4: a = 13; s = 3; n = 4; m = 8; u = 7; afrmt = "%08lX"; break;
-		}
-		frmt = " %02X"; break;
-	case 10:
-		r = RAD10;
-		switch(a_bytes) {
-		default:
-		case 2:	a = 10; s = 4; n = 4; m = 5; u = 4; afrmt = "%05lu"; break;
-		case 3: a = 14; s = 4; n = 5; m = 8; u = 5; afrmt = "%08lu"; break;
-		case 4: a = 14; s = 4; n = 3; m = 10; u = 5; afrmt = "%010lu"; break;
-		}
-		frmt = " %03u"; break;
-	case 8:
-		r = RAD8;
-		switch(a_bytes) {
-		default:
-		case 2:	a = 10; s = 4; n = 3; m = 6; u = 4; afrmt = "%06lo"; break;
-		case 3: a = 14; s = 4; n = 5; m = 8; u = 5; afrmt = "%08lo"; break;
-		case 4: a = 14; s = 4; n = 2; m = 11; u = 5; afrmt = "%011lo"; break;
-		}
-		frmt = " %03o"; break;
-			}
+        char str[16];
+        char *afrmt, *frmt;
+        int a, i, n, m, r, s, u;
+
+        /*
+         * Truncate (int) to N-Bytes
+         */
+         cpc &= a_mask;
+
+        /*
+         * Exit if listing file is not open
+         */
+loop:   if (tfp == NULL)
+                return;
+
+        /*
+         * Get next LST text line
+         */
+        if (gline) {
+                /*
+                 * Clear text line buffer
+                 */
+                for (i=0,rp=rb; i<sizeof(rb); i++) {
+                        *rp++ = 0;
+                }
+
+                /*
+                 * Get next LST text line
+                 */
+                if (fgets(rb, sizeof(rb)-2, tfp) == NULL) {
+                        fclose(tfp);
+                        tfp = NULL;
+                        fclose(rfp);
+                        rfp = NULL;
+                        return;
+                }
+
+                /*
+                 * Check for a listing line number if required
+                 */
+                if (gcntr != -1) {
+                        switch(a_bytes) {
+                        default:
+                        case 2: n = 30; break;
+                        case 3:
+                        case 4: n = 38; break;
+                        }
+                        if (!dgt(RAD10, &rb[n], 1)) {
+                                fprintf(rfp, "%s", rb);
+                                goto loop;
+                        }
+                        gcntr = 0;
+                }
+                gline = 0;
+        }
+
+        /*
+         * Hex Listing
+         */
+#ifdef  LONGINT
+         switch(radix) {
+         default:
+         case 16:
+                r = RAD16;
+                switch(a_bytes) {
+                default:
+                case 2: a = 8; s = 3; n = 3; m = 4; u = 6; afrmt = "%04lX"; break;
+                case 3: a = 13; s = 3; n = 6; m = 6; u = 7; afrmt = "%06lX"; break;
+                case 4: a = 13; s = 3; n = 4; m = 8; u = 7; afrmt = "%08lX"; break;
+                }
+                frmt = " %02X"; break;
+        case 10:
+                r = RAD10;
+                switch(a_bytes) {
+                default:
+                case 2: a = 10; s = 4; n = 4; m = 5; u = 4; afrmt = "%05lu"; break;
+                case 3: a = 14; s = 4; n = 5; m = 8; u = 5; afrmt = "%08lu"; break;
+                case 4: a = 14; s = 4; n = 3; m = 10; u = 5; afrmt = "%010lu"; break;
+                }
+                frmt = " %03u"; break;
+        case 8:
+                r = RAD8;
+                switch(a_bytes) {
+                default:
+                case 2: a = 10; s = 4; n = 3; m = 6; u = 4; afrmt = "%06lo"; break;
+                case 3: a = 14; s = 4; n = 5; m = 8; u = 5; afrmt = "%08lo"; break;
+                case 4: a = 14; s = 4; n = 2; m = 11; u = 5; afrmt = "%011lo"; break;
+                }
+                frmt = " %03o"; break;
+                        }
 #else
-	 switch(radix) {
-	 default:
-	 case 16:
-		r = RAD16;
-		switch(a_bytes) {
-		default:
-		case 2:	a = 8; s = 3; n = 3; m = 4; u = 6; afrmt = "%04X"; break;
-		case 3: a = 13; s = 3; n = 6; m = 6; u = 7; afrmt = "%06X"; break;
-		case 4: a = 13; s = 3; n = 4; m = 8; u = 7; afrmt = "%08X"; break;
-		}
-		frmt = " %02X"; break;
-	case 10:
-		r = RAD10;
-		switch(a_bytes) {
-		default:
-		case 2:	a = 10; s = 4; n = 4; m = 5; u = 4; afrmt = "%05u"; break;
-		case 3: a = 14; s = 4; n = 5; m = 8; u = 5; afrmt = "%08u"; break;
-		case 4: a = 14; s = 4; n = 3; m = 10; u = 5; afrmt = "%010u"; break;
-		}
-		frmt = " %03u"; break;
-	case 8:
-		r = RAD8;
-		switch(a_bytes) {
-		default:
-		case 2:	a = 10; s = 4; n = 3; m = 6; u = 4; afrmt = "%06o"; break;
-		case 3: a = 14; s = 4; n = 5; m = 8; u = 5; afrmt = "%08o"; break;
-		case 4: a = 14; s = 4; n = 2; m = 11; u = 5; afrmt = "%011o"; break;
-		}
-		frmt = " %03o"; break;
-	}
+         switch(radix) {
+         default:
+         case 16:
+                r = RAD16;
+                switch(a_bytes) {
+                default:
+                case 2: a = 8; s = 3; n = 3; m = 4; u = 6; afrmt = "%04X"; break;
+                case 3: a = 13; s = 3; n = 6; m = 6; u = 7; afrmt = "%06X"; break;
+                case 4: a = 13; s = 3; n = 4; m = 8; u = 7; afrmt = "%08X"; break;
+                }
+                frmt = " %02X"; break;
+        case 10:
+                r = RAD10;
+                switch(a_bytes) {
+                default:
+                case 2: a = 10; s = 4; n = 4; m = 5; u = 4; afrmt = "%05u"; break;
+                case 3: a = 14; s = 4; n = 5; m = 8; u = 5; afrmt = "%08u"; break;
+                case 4: a = 14; s = 4; n = 3; m = 10; u = 5; afrmt = "%010u"; break;
+                }
+                frmt = " %03u"; break;
+        case 8:
+                r = RAD8;
+                switch(a_bytes) {
+                default:
+                case 2: a = 10; s = 4; n = 3; m = 6; u = 4; afrmt = "%06o"; break;
+                case 3: a = 14; s = 4; n = 5; m = 8; u = 5; afrmt = "%08o"; break;
+                case 4: a = 14; s = 4; n = 2; m = 11; u = 5; afrmt = "%011o"; break;
+                }
+                frmt = " %03o"; break;
+        }
 #endif
-	/*
-	 * Data Byte Pointer
-	 */
-	if (gcntr == -1) {
-		rp = &rb[a];
-	} else {
-		rp = &rb[a + (s * gcntr)];
-	}
-	/*
-	 * Number must be of proper radix
-	 */
-	if (!dgt(r, rp, s-1)) {
-		fprintf(rfp, "%s", rb);
-		gline = 1;
-		goto loop;
-	}
-	/*
-	 * Output new data value, overwrite relocation codes
-	 */
-	sprintf(str, frmt, v);
-	strncpy(rp-1, str, s);
-	if (gcntr == -1) {
-		gcntr = 0;
-	}
-	/*
-	 * Output relocated code address
-	 */
-	if (gcntr == 0) {
-		if (dgt(r, &rb[n], m)) {
-			sprintf(str, afrmt, cpc);
-			strncpy(&rb[n], str, m);
-		}
-	}
-	/*
-	 * Output an error line if required
-	 */
-	if (err) {
-		switch(ASxxxx_VERSION) {
-		case 3:
-			fprintf(rfp, "?ASlink-Warning-%s\n", errmsg[err]);
-			break;
-
-		default:
-			break;
-		}
-	}
-	/*
-	 * Output text line when updates finished
-	 */
-	if (++gcntr == u) {
-		fprintf(rfp, "%s", rb);
-		gline = 1;
-		gcntr = -1;
-	}
+        /*
+         * Data Byte Pointer
+         */
+        if (gcntr == -1) {
+                rp = &rb[a];
+        } else {
+                rp = &rb[a + (s * gcntr)];
+        }
+        /*
+         * Number must be of proper radix
+         */
+        if (!dgt(r, rp, s-1)) {
+                fprintf(rfp, "%s", rb);
+                gline = 1;
+                goto loop;
+        }
+        /*
+         * Output new data value, overwrite relocation codes
+         */
+        sprintf(str, frmt, v);
+        strncpy(rp-1, str, s);
+        if (gcntr == -1) {
+                gcntr = 0;
+        }
+        /*
+         * Output relocated code address
+         */
+        if (gcntr == 0) {
+                if (dgt(r, &rb[n], m)) {
+                        sprintf(str, afrmt, cpc);
+                        strncpy(&rb[n], str, m);
+                }
+        }
+        /*
+         * Output an error line if required
+         */
+        if (err) {
+                switch(ASxxxx_VERSION) {
+                case 3:
+                        fprintf(rfp, "?ASlink-Warning-%s\n", errmsg3[err]);
+                        break;
+
+                default:
+                        break;
+                }
+        }
+        /*
+         * Output text line when updates finished
+         */
+        if (++gcntr == u) {
+                fprintf(rfp, "%s", rb);
+                gline = 1;
+                gcntr = -1;
+        }
 }
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/lkmain.c sdcc-3.2.0+dfsg/sdas/linksrc/lkmain.c
--- sdcc-3.1.0+dfsg/sdas/linksrc/lkmain.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/lkmain.c	2011-12-06 23:01:37.000000000 +0000
@@ -22,1613 +22,1564 @@
  * Kent, Ohio  44240
  */
 
-/*
- *	3-Nov-97 JLH:
- *			 - use a_type == 0 as "virgin area" flag: set == 1 if -b
- */
-
 #include "aslink.h"
 
-/*)Module	lkmain.c
+/*)Module       lkmain.c
  *
- *	The module lkmain.c contains the functions which
- *	(1) input the linker options, parameters, and specifications
- *	(2) perform a two pass link
- *	(3) produce the appropriate linked data output and/or
- *	    link map file and/or relocated listing files.
- *
- *	lkmain.c contains the following functions:
- *		FILE *	afile()
- *		VOID	bassav()
- *		VOID	gblsav()
- *		int	intsiz()
- *		VOID	link_main()
- *		VOID	lkexit()
- *		int	fndext()
- *		int	fndidx()
- *		int	main()
- *		VOID	map()
- *		int	parse()
- *		VOID	doparse()
- *		VOID	setbas()
- *		VOID	setgbl()
- *		VOID	usage()
- *
- *	lkmain.c contains the following local variables:
- *		char *	usetext[]	array of pointers to the
- *					command option tect lines
+ *      The module lkmain.c contains the functions which
+ *      (1) input the linker options, parameters, and specifications
+ *      (2) perform a two pass link
+ *      (3) produce the appropriate linked data output and/or
+ *          link map file and/or relocated listing files.
+ *
+ *      lkmain.c contains the following functions:
+ *              FILE *  afile()
+ *              VOID    bassav()
+ *              VOID    gblsav()
+ *              int     intsiz()
+ *              VOID    link_main()
+ *              VOID    lkexit()
+ *              int     fndext()
+ *              int     fndidx()
+ *              int     main()
+ *              VOID    map()
+ *              int     parse()
+ *              VOID    doparse()
+ *              VOID    setgbl()
+ *              VOID    usage()
+ *
+ *      lkmain.c contains the following local variables:
+ *              char *  usetext[]       array of pointers to the
+ *                                      command option tect lines
  *
  */
 
 /* sdld 8051 & 6808 specific */
-/*JCF:	Creates some of the default areas so they are allocated in the right order.*/
+/*JCF:  Creates some of the default areas so they are allocated in the right order.*/
 void Areas51 (void)
 {
-	char * rel[] = {
-		"XH",
-		"H 7 areas 0 global symbols",
-		"A _CODE size 0 flags 0",		/*Each .rel has one, so...*/
-		"A REG_BANK_0 size 0 flags 4",	/*Register banks are overlayable*/
-		"A REG_BANK_1 size 0 flags 4",
-		"A REG_BANK_2 size 0 flags 4",
-		"A REG_BANK_3 size 0 flags 4",
-		"A BSEG size 0 flags 80",		/*BSEG must be just before BITS*/
-		"A BSEG_BYTES size 0 flags 0",	/*Size will be obtained from BSEG in lnkarea()*/
-		""
-	};
-
-	char * rel2[] = {
-		"XH",
-		"H C areas 0 global symbols",
-		"A _CODE size 0 flags 0",		/*Each .rel has one, so...*/
-		"A REG_BANK_0 size 0 flags 4",	/*Register banks are overlayable*/
-		"A REG_BANK_1 size 0 flags 4",
-		"A REG_BANK_2 size 0 flags 4",
-		"A REG_BANK_3 size 0 flags 4",
-		"A BSEG size 0 flags 80",		/*BSEG must be just before BITS*/
-		"A BSEG_BYTES size 0 flags 0",	/*Size will be obtained from BSEG in lnkarea()*/
-		"A BIT_BANK size 0 flags 4",	/*Bit register bank is overlayable*/
-		"A DSEG size 0 flags 0",
-		"A OSEG size 0 flags 4",
-		"A ISEG size 0 flags 0",
-		"A SSEG size 0 flags 4",
-		""
-	};
-	int j;
-	struct sym * sp;
-
-	if (packflag) {
-		for (j = 0; rel2[j][0] != 0; j++) {
-			ip = rel2[j];
-			link_main();
-		}
-	}
-	else {
-		for (j = 0; rel[j][0] != 0; j++) {
-			ip = rel[j];
-			link_main();
-		}
-	}
-
-	/*Set the start address of the default areas:*/
-	for (ap = areap; ap; ap = ap->a_ap) {
-		/**/ if (!strcmp(ap->a_id, "REG_BANK_0")) { ap->a_addr = 0x00; ap->a_type = 1; }
-		else if (!strcmp(ap->a_id, "REG_BANK_1")) { ap->a_addr = 0x08; ap->a_type = 1; }
-		else if (!strcmp(ap->a_id, "REG_BANK_2")) { ap->a_addr = 0x10; ap->a_type = 1; }
-		else if (!strcmp(ap->a_id, "REG_BANK_3")) { ap->a_addr = 0x18; ap->a_type = 1; }
-		else if (!strcmp(ap->a_id, "BSEG_BYTES")) { ap->a_addr = 0x20; ap->a_type = 1; }
-		else if (TARGET_IS_8051 && !strcmp(ap->a_id, "SSEG")) {
-			if (stacksize) ap->a_axp->a_size = stacksize;
-		}
-	}
-
-	if (TARGET_IS_8051) {
-		sp = lkpsym("l_IRAM", 1);
-		sp->s_addr = ((iram_size>0) && (iram_size<=0x100)) ? iram_size : 0x0100;
-		sp->s_axp = NULL;
-		sp->s_type |= S_DEF;
-	}
+        char * rel[] = {
+                "XH",
+                "H 7 areas 0 global symbols",
+                "A _CODE size 0 flags 0",               /*Each .rel has one, so...*/
+                "A REG_BANK_0 size 0 flags 4",  /*Register banks are overlayable*/
+                "A REG_BANK_1 size 0 flags 4",
+                "A REG_BANK_2 size 0 flags 4",
+                "A REG_BANK_3 size 0 flags 4",
+                "A BSEG size 0 flags 80",               /*BSEG must be just before BITS*/
+                "A BSEG_BYTES size 0 flags 0",  /*Size will be obtained from BSEG in lnkarea()*/
+                ""
+        };
+
+        char * rel2[] = {
+                "XH",
+                "H C areas 0 global symbols",
+                "A _CODE size 0 flags 0",               /*Each .rel has one, so...*/
+                "A REG_BANK_0 size 0 flags 4",  /*Register banks are overlayable*/
+                "A REG_BANK_1 size 0 flags 4",
+                "A REG_BANK_2 size 0 flags 4",
+                "A REG_BANK_3 size 0 flags 4",
+                "A BSEG size 0 flags 80",               /*BSEG must be just before BITS*/
+                "A BSEG_BYTES size 0 flags 0",  /*Size will be obtained from BSEG in lnkarea()*/
+                "A BIT_BANK size 0 flags 4",    /*Bit register bank is overlayable*/
+                "A DSEG size 0 flags 0",
+                "A OSEG size 0 flags 4",
+                "A ISEG size 0 flags 0",
+                "A SSEG size 0 flags 4",
+                ""
+        };
+        int j;
+        struct sym * sp;
+
+        if (packflag) {
+                for (j = 0; rel2[j][0] != 0; j++) {
+                        ip = rel2[j];
+                        link_main();
+                }
+        }
+        else {
+                for (j = 0; rel[j][0] != 0; j++) {
+                        ip = rel[j];
+                        link_main();
+                }
+        }
+
+        /*Set the start address of the default areas:*/
+        for (ap = areap; ap; ap = ap->a_ap) {
+                /**/ if (!strcmp(ap->a_id, "REG_BANK_0")) { ap->a_addr = 0x00; ap->a_bset = 1; }
+                else if (!strcmp(ap->a_id, "REG_BANK_1")) { ap->a_addr = 0x08; ap->a_bset = 1; }
+                else if (!strcmp(ap->a_id, "REG_BANK_2")) { ap->a_addr = 0x10; ap->a_bset = 1; }
+                else if (!strcmp(ap->a_id, "REG_BANK_3")) { ap->a_addr = 0x18; ap->a_bset = 1; }
+                else if (!strcmp(ap->a_id, "BSEG_BYTES")) { ap->a_addr = 0x20; ap->a_bset = 1; }
+                else if (TARGET_IS_8051 && !strcmp(ap->a_id, "SSEG")) {
+                        if (stacksize) ap->a_axp->a_size = stacksize;
+                }
+        }
+
+        if (TARGET_IS_8051) {
+                sp = lkpsym("l_IRAM", 1);
+                sp->s_addr = ((iram_size>0) && (iram_size<=0x100)) ? iram_size : 0x0100;
+                sp->s_axp = NULL;
+                sp->s_type |= S_DEF;
+        }
 }
 /* end sdld 8051 & 6808 specific */
 
-/*)Function	int	main(argc,argv)
+/*)Function     int     main(argc,argv)
  *
- *		int	argc		number of command line arguments + 1
- *		char *	argv[]		array of pointers to the command line
- *					arguments
- *
- *	The function main() evaluates the command line arguments to
- *	determine if the linker parameters are to input through 'stdin'
- *	or read from a command file.  The functions nxtline() and parse()
- *	are to input and evaluate the linker parameters.  The linking process
- *	proceeds by making the first pass through each .rel file in the order
- *	presented to the linker.  At the end of the first pass the setbase(),
- *	lnkarea(), setgbl(), and symdef() functions are called to evaluate
- *	the base address terms, link all areas, define global variables,
- *	and look for undefined symbols.  Following these routines a linker
- *	map file may be produced and the linker output files may be opened.
- *	The second pass through the .rel files will output the linked data
- *	in one of the supported formats.
- *
- *	local variables:
- *		int	c		character from argument string
- *		int	i		loop counter
- *		int	j		loop counter
- *		int	k		loop counter
- *
- *	global variables:
- *					text line in ib[]
- *		lfile	*cfp		The pointer *cfp points to the
- *					current lfile structure
- *		char	ctype[]		array of character types, one per
- *					ASCII character
- *		lfile	*filep		The pointer *filep points to the
- *					beginning of a linked list of
- *					lfile structures.
- *		head	*hp		Pointer to the current
- *					head structure
- *		char	ib[NINPUT]	.rel file text line
- *		char	*ip		pointer into the .rel file
- *		lfile	*linkp		pointer to first lfile structure
- *					containing an input .rel file
- *					specification
- *		int	lkerr		error flag
- *		int	mflag		Map output flag
- *		int	oflag		Output file type flag
- *		FILE	*ofp		Output file handle
- *					for word formats
- *		FILE	*ofph		Output file handle
- *					for high byte format
- *		FILE	*ofpl		Output file handle
- *					for low byte format
- *		int	pass		linker pass number
- *		int	pflag		print linker command file flag
- *		int	radix		current number conversion radix
- *		FILE	*sfp		The file handle sfp points to the
- *					currently open file
- *		lfile	*startp		aslink startup file structure
- *		FILE *	stdout		c_library
- *
- *	functions called:
- *		int	fclose()	c_library
- *		int	fprintf()	c_library
- *		VOID	library()	lklibr.c
- *		VOID	link_main()	lkmain.c
- *		VOID	lkexit()	lkmain.c
- *		VOID	lkfopen()	lkbank.c
- *		VOID	lnkarea()	lkarea.c
- *		VOID	map()		lkmain.c
- *		VOID	new()		lksym.c
- *		int	nxtline()	lklex.c
- *		int	parse()		lkmain.c
- *		VOID	reloc()		lkreloc.c
- *		VOID	search()	lklibr.c
- *		VOID	setbas()	lkmain.c
- *		VOID	setgbl()	lkmain.c
- *		char *	sprintf()	c_library
- *		VOID	symdef()	lksym.c
- *		VOID	usage()		lkmain.c
- *		int	fndidx()	lkmain.c
- *
- *	side effects:
- *		Completion of main() completes the linking process
- *		and may produce a map file (.map) and/or a linked
- *		data files (.ihx or .s19) and/or one or more
- *		relocated listing files (.rst).
+ *              int     argc            number of command line arguments + 1
+ *              char *  argv[]          array of pointers to the command line
+ *                                      arguments
+ *
+ *      The function main() evaluates the command line arguments to
+ *      determine if the linker parameters are to input through 'stdin'
+ *      or read from a command file.  The functions nxtline() and parse()
+ *      are to input and evaluate the linker parameters.  The linking process
+ *      proceeds by making the first pass through each .rel file in the order
+ *      presented to the linker.  At the end of the first pass the setarea(),
+ *      lnkarea(), setgbl(), and symdef() functions are called to evaluate
+ *      the base address terms, link all areas, define global variables,
+ *      and look for undefined symbols.  Following these routines a linker
+ *      map file may be produced and the linker output files may be opened.
+ *      The second pass through the .rel files will output the linked data
+ *      in one of the supported formats.
+ *
+ *      local variables:
+ *              int     c               character from argument string
+ *              int     i               loop counter
+ *              int     j               loop counter
+ *              int     k               loop counter
+ *
+ *      global variables:
+ *                                      text line in ib[]
+ *              lfile   *cfp            The pointer *cfp points to the
+ *                                      current lfile structure
+ *              char    ctype[]         array of character types, one per
+ *                                      ASCII character
+ *              lfile   *filep          The pointer *filep points to the
+ *                                      beginning of a linked list of
+ *                                      lfile structures.
+ *              head    *hp             Pointer to the current
+ *                                      head structure
+ *              char    ib[NINPUT]      .rel file text line
+ *              char    *ip             pointer into the .rel file
+ *              lfile   *linkp          pointer to first lfile structure
+ *                                      containing an input .rel file
+ *                                      specification
+ *              int     lkerr           error flag
+ *              int     oflag           Output file type flag
+ *              int     objflg          Linked file/library output object flag
+ *              int     pass            linker pass number
+ *              int     pflag           print linker command file flag
+ *              int     radix           current number conversion radix
+ *              FILE    *sfp            The file handle sfp points to the
+ *                                      currently open file
+ *              lfile   *startp         aslink startup file structure
+ *              FILE *  stdout          c_library
+ *
+ *      functions called:
+ *              VOID    chkbank()       lkbank.c
+ *              int     fclose()        c_library
+ *              int     fprintf()       c_library
+ *              VOID    library()       lklibr.c
+ *              VOID    link_main()     lkmain.c
+ *              VOID    lkexit()        lkmain.c
+ *              VOID    lkfopen()       lkbank.c
+ *              VOID    lnkarea()       lkarea.c
+ *              VOID    map()           lkmain.c
+ *              VOID    new()           lksym.c
+ *              int     nxtline()       lklex.c
+ *              int     parse()         lkmain.c
+ *              VOID    reloc()         lkreloc.c
+ *              VOID    search()        lklibr.c
+ *              VOID    setarea()       lkarea.c
+ *              VOID    setbank()       lkbank.c
+ *              VOID    setgbl()        lkmain.c
+ *              char *  sprintf()       c_library
+ *              VOID    symdef()        lksym.c
+ *              VOID    usage()         lkmain.c
+ *              int     fndidx()        lkmain.c
+ *
+ *      side effects:
+ *              Completion of main() completes the linking process
+ *              and may produce a map file (.map) and/or a linked
+ *              data files (.ihx or .s19) and/or one or more
+ *              relocated listing files (.rst).
  */
 
 int
 main(int argc, char *argv[])
 {
-	int c, i, j, k;
+        int c, i, j, k;
 
-	if (intsiz() < 4) {
-		fprintf(stderr, "?ASlink-Error-Size of INT32 is not 32 bits or larger.\n\n");
-		exit(ER_FATAL);
-	}
-
-	/* sdas specific */
-	/* sdas initialization */
-	sdld_init(argv[0]);
-
-	/* use these defaults for parsing the .lk script */
-	a_bytes = 4;
-	a_mask = 0xFFFFFFFF;
-	s_mask = 0x80000000;
-	v_mask = 0x7FFFFFFF;
-	/* end sdas specific */
-
-	if (!is_sdld())
-		fprintf(stdout, "\n");
-
-	startp = (struct lfile *) new (sizeof (struct lfile));
-	startp->f_idp = "";
-
-	pflag = 1;
-
-	for(i=1; i<argc; i++) {
-		ip = ib;
-		if(argv[i][0] == '-') {
-			j = i;
-			k = 1;
-			while((c = argv[j][k]) != '\0') {
-				ip = ib;
-				sprintf(ip, "-%c", c);
-				switch(c) {
-
-				/*
-				 * Options with arguments
-				 */
-				case 'b':
-				case 'B':
-
-				case 'g':
-				case 'G':
-
-				case 'k':
-				case 'K':
-
-				case 'l':
-				case 'L':
-
-				case 'f':
-				case 'F':
-
-				case 'I':
-				case 'X':
-				case 'C':
-				case 'S':
-					strcat(ip, " ");
-					strcat(ip, argv[++i]);
-					break;
-
-				/*
-				 * Preprocess these commands
-				 */
-				case 'n':
-				case 'N':
-					pflag = 0;
-					break;
-
-				case 'p':
-				case 'P':
-					pflag = 1;
-					break;
-
-				/*
-				 * Options without arguments
-				 */
-				default:
-					break;
-				}
-				if(pflag)
-					fprintf(stdout, "ASlink >> %s\n", ip);
-				parse();
-				k++;
-			}
-		} else {
-			strcpy(ip, argv[i]);
-			if(pflag)
-				fprintf(stdout, "ASlink >> %s\n", ip);
-			parse();
-		}
-	}
-
-	if (linkp == NULL)
-		usage(ER_FATAL);
-
-	/*
-	 * If no input file is specified
-	 * then assume a single file with
-	 * the same name as the output file.
-	 */
-	if (lfp == linkp) {
-		lfp->f_flp = (struct lfile *) new (sizeof (struct lfile));
-		lfp = lfp->f_flp;
-		lfp->f_idp = strsto(linkp->f_idp);
-		lfp->f_type = F_REL;
-	}
+        if (intsiz() < 4) {
+                fprintf(stderr, "?ASlink-Error-Size of INT32 is not 32 bits or larger.\n\n");
+                exit(ER_FATAL);
+        }
+
+        /* sdas specific */
+        /* sdas initialization */
+        sdld_init(argv[0]);
+
+        /* use these defaults for parsing the .lk script */
+        a_bytes = 4;
+        a_mask = 0xFFFFFFFF;
+        s_mask = 0x80000000;
+        v_mask = 0x7FFFFFFF;
+        /* end sdas specific */
+
+        if (!is_sdld())
+                fprintf(stdout, "\n");
+
+        startp = (struct lfile *) new (sizeof (struct lfile));
+        startp->f_idp = "";
+
+        pflag = 1;
+
+        for(i=1; i<argc; i++) {
+                ip = ib;
+                if(argv[i][0] == '-') {
+                        j = i;
+                        k = 1;
+                        while((c = argv[j][k]) != '\0') {
+                                ip = ib;
+                                sprintf(ip, "-%c", c);
+                                switch(c) {
+
+                                /*
+                                 * Options with arguments
+                                 */
+                                case 'b':
+                                case 'B':
+
+                                case 'g':
+                                case 'G':
+
+                                case 'k':
+                                case 'K':
+
+                                case 'l':
+                                case 'L':
+
+                                case 'f':
+                                case 'F':
+
+                                case 'I':
+                                case 'X':
+                                case 'C':
+                                case 'S':
+                                        strcat(ip, " ");
+                                        strcat(ip, argv[++i]);
+                                        break;
+
+                                /*
+                                 * Preprocess these commands
+                                 */
+                                case 'n':
+                                case 'N':
+                                        pflag = 0;
+                                        break;
+
+                                case 'p':
+                                case 'P':
+                                        pflag = 1;
+                                        break;
+
+                                /*
+                                 * Options without arguments
+                                 */
+                                default:
+                                        break;
+                                }
+                                if(pflag)
+                                        fprintf(stdout, "ASlink >> %s\n", ip);
+                                parse();
+                                k++;
+                        }
+                } else {
+                        strcpy(ip, argv[i]);
+                        if(pflag)
+                                fprintf(stdout, "ASlink >> %s\n", ip);
+                        parse();
+                }
+        }
+
+        if (linkp == NULL)
+                usage(ER_FATAL);
+
+        /*
+         * If no input file is specified
+         * then assume a single file with
+         * the same name as the output file.
+         */
+        if (lfp == linkp) {
+                lfp->f_flp = (struct lfile *) new (sizeof (struct lfile));
+                lfp = lfp->f_flp;
+                lfp->f_idp = strsto(linkp->f_idp);
+                lfp->f_idx = fndidx(linkp->f_idp);
+                lfp->f_obj = objflg;
+                lfp->f_type = F_REL;
+        }
 
-	syminit();
+        syminit();
 
 #if SDCDB
-	/*
-	 * Open SDCC Debug output file
-	 */
-	SDCDBfopen();
+        /*
+         * Open SDCC Debug output file
+         */
+        SDCDBfopen();
 #endif
 
-	for (pass=0; pass<2; ++pass) {
-		cfp = NULL;
-		sfp = NULL;
-		filep = linkp->f_flp;
-		hp = NULL;
-		radix = 10;
-
-		/* sdld specific */
-		if (TARGET_IS_8051 || TARGET_IS_6808)
-			Areas51(); /*JCF: Create the default 8051 areas in the right order*/
-		/* end sdld specific */
-
-		while (nxtline()) {
-			ip = ib;
-
-			/* sdld specific */
-			/* pass any "magic comments" to NoICE output */
-			if ((ip[0] == ';') && (ip[1] == '!') && jfp) {
-				fprintf( jfp, "%s\n", &ip[2] );
-			}
-			/* end sdld specific */
-
-			link_main();
-		}
-		if (pass == 0) {
-			/*
-			 * Search libraries for global symbols
-			 */
-			search();
-
-			/* sdas specific */
-			/* use these defaults for parsing the .lk script */
-			a_bytes = 4;
-			a_mask = 0xFFFFFFFF;
-			s_mask = 0x80000000;
-			v_mask = 0x7FFFFFFF;
-			/* end sdas specific */
-
-			/*
-			 * Set area base addresses.
-			 */
-			setbas();
-
-			/*
-			 * Link all area addresses.
-			 */
-			if (!packflag)
-				lnkarea();
-			else {
-				/* sdld 8051 specific */
-				lnkarea2();
-				/* end sdld 8051 specific */
-			}
-			/*
-			 * Process global definitions.
-			 */
-			setgbl();
-			/*
-			 * Check for undefined globals.
-			 */
-			symdef(stderr);
+        for (pass=0; pass<2; ++pass) {
+                cfp = NULL;
+                sfp = NULL;
+                filep = linkp->f_flp;
+                hp = NULL;
+                radix = 10;
+
+                /* sdld specific */
+                if (TARGET_IS_8051 || TARGET_IS_6808)
+                        Areas51(); /*JCF: Create the default 8051 areas in the right order*/
+                /* end sdld specific */
+
+                while (nxtline()) {
+                        ip = ib;
+                        link_main();
+                }
+                if (pass == 0) {
+                        /*
+                         * Search libraries for global symbols
+                         */
+                        search();
+
+                        /* sdas specific */
+                        /* use these defaults for parsing the .lk script */
+                        a_bytes = 4;
+                        a_mask = 0xFFFFFFFF;
+                        s_mask = 0x80000000;
+                        v_mask = 0x7FFFFFFF;
+                        /* end sdas specific */
+
+                        /*
+                         * Set area base addresses.
+                         */
+                        setarea();
+                        /*
+                         * Set bank base addresses.
+                         */
+                        setbank();
+                        /*
+                         * Link all area addresses.
+                         */
+                        if (!packflag)
+                                lnkarea();
+                        else {
+                                /* sdld 8051 specific */
+                                lnkarea2();
+                                /* end sdld 8051 specific */
+                        }
+                        /*
+                         * Check bank size limits.
+                         */
+                        chkbank(stderr);
+                        /*
+                         * Process global definitions.
+                         */
+                        setgbl();
+                        /*
+                         * Check for undefined globals.
+                         */
+                        symdef(stderr);
 #if NOICE
-			/*
-			 * Open NoICE output file
-			 */
-			NoICEfopen();
+                        /*
+                         * Open NoICE output file
+                         */
+                        NoICEfopen();
 #endif
-			/*
-			 * Output Link Map.
-			 */
-			map();
-
-			/* sdld specific */
-			if (sflag) {	/*JCF: memory usage summary output*/
-				if (!packflag) {
-					if (summary(areap)) lkexit(1);
-				}
-				else {
-					/* sdld 8051 specific */
-					if (summary2(areap)) lkexit(1);
-					/* end sdld 8051 specific */
-				}
-			}
-
-			if ((iram_size) && (!packflag))
-				iramcheck();
-			/* end sdld specific */
-
-			/*
-			 * Open output file(s)
-			 */
-			lkfopen();
-		} else {
-			/*
-			 * Link in library files
-			 */
-			library();
-			/*
-			 * Complete Processing
-			 */
-			reloc('E');
-		}
-	}
-	if (TARGET_IS_8051) {
-		//JCF:
-		CreateAOMF51();
-	}
-
-	lkexit(lkerr ? ER_ERROR : ER_NONE);
-	return(0);
-}
-
-/*)Function	int	intsiz()
- *
- *	The function intsiz() returns the size of INT32
+                        /*
+                         * Output Link Map.
+                         */
+                        map();
+
+                        /* sdld specific */
+                        if (sflag) {    /*JCF: memory usage summary output*/
+                                if (!packflag) {
+                                        if (summary(areap)) lkexit(1);
+                                }
+                                else {
+                                        /* sdld 8051 specific */
+                                        if (summary2(areap)) lkexit(1);
+                                        /* end sdld 8051 specific */
+                                }
+                        }
+
+                        if ((iram_size) && (!packflag))
+                                iramcheck();
+                        /* end sdld specific */
+
+                        /*
+                         * Open output file(s)
+                         */
+                        lkfopen();
+                } else {
+                        /*
+                         * Link in library files
+                         */
+                        library();
+                        /*
+                         * Complete Processing
+                         */
+                        reloc('E');
+                }
+        }
+        if (TARGET_IS_8051) {
+                //JCF:
+                CreateAOMF51();
+        }
+
+        lkexit(lkerr ? ER_ERROR : ER_NONE);
+        return(0);
+}
+
+/*)Function     int     intsiz()
+ *
+ *      The function intsiz() returns the size of INT32
+ *
+ *      local variables:
+ *              none
  *
- *	local variables:
- *		none
+ *      global variables:
+ *              none
  *
- *	global variables:
- *		none
+ *      functions called:
+ *              none
  *
- *	functions called:
- *		none
- *
- *	side effects:
- *		none
+ *      side effects:
+ *              none
  */
 
 int
 intsiz()
 {
-	return(sizeof(a_uint));
+        return(sizeof(a_uint));
 }
 
-/*)Function	VOID	lkexit(i)
+/*)Function     VOID    lkexit(i)
+ *
+ *                      int     i       exit code
+ *
+ *      The function lkexit() explicitly closes all open
+ *      files and then terminates the program.
  *
- *			int	i	exit code
+ *      local variables:
+ *              none
  *
- *	The function lkexit() explicitly closes all open
- *	files and then terminates the program.
+ *      global variables:
+ *              FILE *  jfp             file handle for .noi
+ *              FILE *  mfp             file handle for .map
+ *              FILE *  rfp             file hanlde for .rst
+ *              FILE *  sfp             file handle for .rel
+ *              FILE *  tfp             file handle for .lst
  *
- *	local variables:
- *		none
- *
- *	global variables:
- *		FILE *	jfp		file handle for .noi
- *		FILE *	mfp		file handle for .map
- *		FILE *	rfp		file hanlde for .rst
- *		FILE *	sfp		file handle for .rel
- *		FILE *	tfp		file handle for .lst
- *
- *	functions called:
- *		int	fclose()	c_library
- *		VOID	exit()		c_library
- *		VOID	lkfclose()	lkbank.c
+ *      functions called:
+ *              int     fclose()        c_library
+ *              VOID    exit()          c_library
+ *              VOID    lkfclose()      lkbank.c
  *
- *	side effects:
- *		All files closed. Program terminates.
+ *      side effects:
+ *              All files closed. Program terminates.
  */
 
 VOID
 lkexit(i)
 int i;
 {
-	lkfclose();
+        lkfclose();
 #if NOICE
-	if (jfp != NULL) fclose(jfp);
+        if (jfp != NULL) fclose(jfp);
 #endif
-	if (mfp != NULL) fclose(mfp);
-	if (rfp != NULL) fclose(rfp);
-	if (sfp != NULL) { if (sfp != stdin) fclose(sfp); }
-	if (tfp != NULL) fclose(tfp);
+        if (mfp != NULL) fclose(mfp);
+        if (rfp != NULL) fclose(rfp);
+        if (sfp != NULL) { if (sfp != stdin) fclose(sfp); }
+        if (tfp != NULL) fclose(tfp);
 #if SDCDB
-	if (yfp != NULL) fclose(yfp);
+        if (yfp != NULL) fclose(yfp);
 #endif
-	exit(i);
+        exit(i);
 }
 
-/*)Function	link_main()
+/*)Function     link_main()
  *
- *	The function link_main() evaluates the directives for each line of
- *	text read from the .rel file(s).  The valid directives processed
- *	are:
- *		X, D, Q, H, M, A, S, T, R, and P.
- *
- *	local variables:
- *		int	c		first non blank character of a line
- *
- *	global variables:
- *		head	*headp		The pointer to the first
- *					head structure of a linked list
- *		head	*hp		Pointer to the current
- *					head structure
- *		int	a_bytes		T Line address bytes
- *		int	hilo		Byte ordering
- *		int	pass		linker pass number
- *		int	radix		current number conversion radix
- *
- *	functions called:
- *		char	endline()	lklex.c
- *		VOID	module()	lkhead.c
- *		VOID	newarea()	lkarea.c
- *		VOID	newhead()	lkhead.c
- *		sym *	newsym()	lksym.c
- *		VOID	reloc()		lkreloc.c
- *
- *	side effects:
- *		Head, area, and symbol structures are created and
- *		the radix is set as the .rel file(s) are read.
+ *      The function link_main() evaluates the directives for each line of
+ *      text read from the .rel file(s).  The valid directives processed
+ *      are:
+ *              X, D, Q, H, M, A, S, T, R, and P.
+ *
+ *      local variables:
+ *              int     c               first non blank character of a line
+ *
+ *      global variables:
+ *              head    *headp          The pointer to the first
+ *                                      head structure of a linked list
+ *              head    *hp             Pointer to the current
+ *                                      head structure
+ *              int     a_bytes         T Line address bytes
+ *              int     hilo            Byte ordering
+ *              int     pass            linker pass number
+ *              int     radix           current number conversion radix
+ *
+ *      functions called:
+ *              char    endline()       lklex.c
+ *              VOID    module()        lkhead.c
+ *              VOID    newarea()       lkarea.c
+ *              VOID    newhead()       lkhead.c
+ *              sym *   newsym()        lksym.c
+ *              VOID    NoICEmagic()    lknoice.c
+ *              VOID    reloc()         lkreloc.c
+ *
+ *      side effects:
+ *              Head, area, and symbol structures are created and
+ *              the radix is set as the .rel file(s) are read.
  */
 
 VOID
 link_main()
 {
-	char c;
+        char c;
 
-	if ((c=endline()) == 0) { return; }
-	switch (c) {
+        if ((c=endline()) == 0) { return; }
+        switch (c) {
 
-	/* sdld specific */
-	case 'O': /* For some important sdcc options */
-		if (is_sdld() && pass == 0) {
-			if (NULL == optsdcc) {
-				optsdcc = strsto(&ip[1]);
-				optsdcc_module = hp->m_id;
-			}
-			else {
-				if (strcmp(optsdcc, &ip[1]) != 0) {
-					fprintf(stderr,
-						"?ASlink-Warning-Conflicting sdcc options:\n"
-						"   \"%s\" in module \"%s\" and\n"
-						"   \"%s\" in module \"%s\".\n",
-						optsdcc, optsdcc_module, &ip[1], hp->m_id);
-					lkerr++;
-				}
-			}
-		}
-		break;
-	/* end sdld specific */
-
-	case 'X':
-	case 'D':
-	case 'Q':
-		ASxxxx_VERSION = 3;
-		a_bytes = 2;	/* use default if unspecified */
-		hilo = 0;	/* use default if unspecified */
-		if (c == 'X') { radix = 16; } else
-		if (c == 'D') { radix = 10; } else
-		if (c == 'Q') { radix = 8;  }
-
-		while ((c = get()) != 0) {
-			switch(c) {
-			case 'H':
-				hilo = 1;
-				break;
-
-			case 'L':
-				hilo = 0;
-				break;
-
-			case '2':
-				a_bytes = 2;
-				break;
-
-			case '3':
-				a_bytes = 3;
-				break;
-
-			case '4':
-				a_bytes = 4;
-				break;
-
-			default:
-				break;
-			}
-		}
-#ifdef	LONGINT
-		switch(a_bytes) {
-		default:
-			a_bytes = 2;
-		case 2:
-			a_mask = 0x0000FFFFl;
-			s_mask = 0x00008000l;
-			v_mask = 0x00007FFFl;
-			break;
-
-		case 3:
-			a_mask = 0x00FFFFFFl;
-			s_mask = 0x00800000l;
-			v_mask = 0x007FFFFFl;
-			break;
-
-		case 4:
-			a_mask = 0xFFFFFFFFl;
-			s_mask = 0x80000000l;
-			v_mask = 0x7FFFFFFFl;
-				break;
-			}
+        /* sdld specific */
+        case 'O': /* For some important sdcc options */
+                if (is_sdld() && pass == 0) {
+                        if (NULL == optsdcc) {
+                                optsdcc = strsto(&ip[1]);
+                                optsdcc_module = hp->m_id;
+                        }
+                        else {
+                                if (strcmp(optsdcc, &ip[1]) != 0) {
+                                        fprintf(stderr,
+                                                "?ASlink-Warning-Conflicting sdcc options:\n"
+                                                "   \"%s\" in module \"%s\" and\n"
+                                                "   \"%s\" in module \"%s\".\n",
+                                                optsdcc, optsdcc_module, &ip[1], hp->m_id);
+                                        lkerr++;
+                                }
+                        }
+                }
+                break;
+        /* end sdld specific */
+
+        case 'X':
+        case 'D':
+        case 'Q':
+                ASxxxx_VERSION = 3;
+                a_bytes = 2;    /* use default if unspecified */
+                hilo = 0;       /* use default if unspecified */
+                if (c == 'X') { radix = 16; } else
+                if (c == 'D') { radix = 10; } else
+                if (c == 'Q') { radix = 8;  }
+
+                while ((c = get()) != 0) {
+                        switch(c) {
+                        case 'H':
+                                hilo = 1;
+                                break;
+
+                        case 'L':
+                                hilo = 0;
+                                break;
+
+                        case '2':
+                                a_bytes = 2;
+                                break;
+
+                        case '3':
+                                a_bytes = 3;
+                                break;
+
+                        case '4':
+                                a_bytes = 4;
+                                break;
+
+                        default:
+                                break;
+                        }
+                }
+#ifdef  LONGINT
+                switch(a_bytes) {
+                default:
+                        a_bytes = 2;
+                case 2:
+                        a_mask = 0x0000FFFFl;
+                        s_mask = 0x00008000l;
+                        v_mask = 0x00007FFFl;
+                        break;
+
+                case 3:
+                        a_mask = 0x00FFFFFFl;
+                        s_mask = 0x00800000l;
+                        v_mask = 0x007FFFFFl;
+                        break;
+
+                case 4:
+                        a_mask = 0xFFFFFFFFl;
+                        s_mask = 0x80000000l;
+                        v_mask = 0x7FFFFFFFl;
+                                break;
+                        }
 #else
-		switch(a_bytes) {
-		default:
-			a_bytes = 2;
-		case 2:
-			a_mask = 0x0000FFFF;
-			s_mask = 0x00008000;
-			v_mask = 0x00007FFF;
-			break;
-
-		case 3:
-			a_mask = 0x00FFFFFF;
-			s_mask = 0x00800000;
-			v_mask = 0x007FFFFF;
-			break;
-
-		case 4:
-			a_mask = 0xFFFFFFFF;
-			s_mask = 0x80000000;
-			v_mask = 0x7FFFFFFF;
-			break;
-		}
+                switch(a_bytes) {
+                default:
+                        a_bytes = 2;
+                case 2:
+                        a_mask = 0x0000FFFF;
+                        s_mask = 0x00008000;
+                        v_mask = 0x00007FFF;
+                        break;
+
+                case 3:
+                        a_mask = 0x00FFFFFF;
+                        s_mask = 0x00800000;
+                        v_mask = 0x007FFFFF;
+                        break;
+
+                case 4:
+                        a_mask = 0xFFFFFFFF;
+                        s_mask = 0x80000000;
+                        v_mask = 0x7FFFFFFF;
+                        break;
+                }
 #endif
-		break;
+                break;
 
-	case 'H':
-		if (pass == 0) {
-			newhead();
-		} else {
-			if (hp == 0) {
-				hp = headp;
-			} else {
-				hp = hp->h_hp;
-			}
-		}
-		sdp.s_area = NULL;
-		sdp.s_areax = NULL;
-		sdp.s_addr = 0;
-		break;
-
-	case 'M':
-		if (pass == 0)
-			module();
-		break;
-
-	case 'A':
-		if (pass == 0)
-			newarea();
-		if (sdp.s_area == NULL) {
-			sdp.s_area = areap;
-			sdp.s_areax = areap->a_axp;
-			sdp.s_addr = 0;
-		}
-		break;
-
-	case 'S':
-		if (pass == 0)
-			newsym();
-		break;
-
-	case 'T':
-	case 'R':
-	case 'P':
-		if (pass == 0)
-			break;
-		reloc(c);
-		break;
-
-	default:
-		break;
-	}
-}
+        case 'H':
+                if (pass == 0) {
+                        newhead();
+                } else {
+                        if (hp == 0) {
+                                hp = headp;
+                        } else {
+                                hp = hp->h_hp;
+                        }
+                }
+                sdp.s_area = NULL;
+                sdp.s_areax = NULL;
+                sdp.s_addr = 0;
+                break;
+
+        case 'M':
+                if (pass == 0)
+                        module();
+                break;
+
+        case 'A':
+                if (pass == 0)
+                        newarea();
+                if (sdp.s_area == NULL) {
+                        sdp.s_area = areap;
+                        sdp.s_areax = areap->a_axp;
+                        sdp.s_addr = 0;
+                }
+                break;
+
+        case 'S':
+                if (pass == 0)
+                        newsym();
+                break;
+
+        case 'T':
+        case 'R':
+        case 'P':
+                if (pass == 0)
+                        break;
+                reloc(c);
+                break;
 
-/*)Function	VOID	map()
- *
- *	The function map() opens the output map file and calls the various
- *	routines to
- *	(1) output the variables in each area,
- *	(2) list the files processed with module names,
- *	(3) list the libraries file processed,
- *	(4) list base address definitions,
- *	(5) list global variable definitions, and
- *	(6) list any undefined variables.
- *
- *	local variables:
- *		int	i		counter
- *		head *	hdp		pointer to head structure
- *		lbfile *lbfh		pointer to library file structure
- *
- *	global variables:
- *		area	*ap		Pointer to the current
- *					area structure
- *		area	*areap		The pointer to the first
- *					area structure of a linked list
- *		base	*basep		The pointer to the first
- *					base structure
- *		base	*bsp		Pointer to the current
- *					base structure
- *		lfile	*filep		The pointer *filep points to the
- *					beginning of a linked list of
- *					lfile structures.
- *		globl	*globlp		The pointer to the first
- *					globl structure
- *		globl	*gsp		Pointer to the current
- *					globl structure
- *		head	*headp		The pointer to the first
- *					head structure of a linked list
- *		lbfile	*lbfhead	The pointer to the first
- *					lbfile structure of a linked list
- *		lfile	*linkp		pointer to first lfile structure
- *					containing an input REL file
- *					specification
- *		int	lop		current line number on page
- *		int	mflag		Map output flag
- *		FILE	*mfp		Map output file handle
- *		int	page		current page number
- *
- *	functions called:
- *		FILE *	afile()		lkmain.c
- *		int	fprintf()	c_library
- *		VOID	lkexit()	lkmain.c
- *		VOID	lstarea()	lklist.c
- *		VOID	newpag()	lklist.c
- *		VOID	symdef()	lksym.c
+#if NOICE
+        case ';':
+                unget(c);
+                NoICEmagic();
+                break;
+#endif
+
+        default:
+                break;
+        }
+}
+
+/*)Function     VOID    map()
+ *
+ *      The function map() opens the output map file and calls the various
+ *      routines to
+ *      (1) output the variables in each area,
+ *      (2) list the files processed with module names,
+ *      (3) list the libraries file processed,
+ *      (4) list base address definitions,
+ *      (5) list global variable definitions, and
+ *      (6) list any undefined variables.
+ *
+ *      local variables:
+ *              int     i               counter
+ *              head *  hdp             pointer to head structure
+ *              lbfile *lbfh            pointer to library file structure
+ *
+ *      global variables:
+ *              area    *ap             Pointer to the current
+ *                                      area structure
+ *              area    *areap          The pointer to the first
+ *                                      area structure of a linked list
+ *              base    *basep          The pointer to the first
+ *                                      base structure
+ *              base    *bsp            Pointer to the current
+ *                                      base structure
+ *              lfile   *filep          The pointer *filep points to the
+ *                                      beginning of a linked list of
+ *                                      lfile structures.
+ *              globl   *globlp         The pointer to the first
+ *                                      globl structure
+ *              globl   *gsp            Pointer to the current
+ *                                      globl structure
+ *              head    *headp          The pointer to the first
+ *                                      head structure of a linked list
+ *              lbfile  *lbfhead        The pointer to the first
+ *                                      lbfile structure of a linked list
+ *              lfile   *linkp          pointer to first lfile structure
+ *                                      containing an input REL file
+ *                                      specification
+ *              int     lop             current line number on page
+ *              int     mflag           Map output flag
+ *              FILE    *mfp            Map output file handle
+ *              int     page            current page number
+ *
+ *      functions called:
+ *              FILE *  afile()         lkmain.c
+ *              int     fprintf()       c_library
+ *              VOID    lkexit()        lkmain.c
+ *              VOID    lstarea()       lklist.c
+ *              VOID    newpag()        lklist.c
+ *              VOID    chkbank()       lkbank.c
+ *              VOID    symdef()        lksym.c
  *
- *	side effects:
- *		The map file is created.
+ *      side effects:
+ *              The map file is created.
  */
 
 VOID
 map(void)
 {
-	int i;
-	struct head *hdp;
-	struct lbfile *lbfh;
-
-	if (mflag == 0) return;
-
-	/*
-	 * Open Map File
-	 */
-	mfp = afile(linkp->f_idp, "map", 1);
-	if (mfp == NULL) {
-		lkexit(ER_FATAL);
-	}
-
-	/*
-	 * Output Map Area Lists
-	 */
-	page = 0;
-	lop  = NLPP;
-	for (ap = areap; ap != NULL; ap = ap->a_ap) {
-		lstarea(ap);
-	}
-
-	/*
-	 * List Linked Files
-	 */
-	newpag(mfp);
-	fprintf(mfp, "\nFiles Linked                              [ module(s) ]\n\n");
-	hdp = headp;
-	filep = linkp->f_flp;
-	while (filep) {
-		if (strlen (filep->f_idp) > 40)
-			fprintf(mfp, "%s\n%40s  [ ", filep->f_idp, "");
-		else
-			fprintf(mfp, "%-40.40s  [ ", filep->f_idp);
-		i = 0;
-		while ((hdp != NULL) && (hdp->h_lfile == filep)) {
-			if (i)
-				fprintf(mfp, ",\n%44s", "");
-			fprintf(mfp, "%-.32s", hdp->m_id);
-			hdp = hdp->h_hp;
-			i++;
-		}
-		fprintf(mfp, " ]\n");
-		filep = filep->f_flp;
-	}
-	fprintf(mfp, "\n");
-	/*
-	 * List Linked Libraries
-	 */
-	if (lbfhead != NULL) {
-		fprintf(mfp, "\nLibraries Linked                          [ object file ]\n\n");
-		for (lbfh=lbfhead; lbfh; lbfh=lbfh->next) {
-			if (strlen (lbfh->libspc) > 40)
-				fprintf(mfp, "%s\n%40s  [ %-.32s ]\n",
-					lbfh->libspc, "", lbfh->relfil);
-			else
-				fprintf(mfp, "%-40.40s  [ %-.32s ]\n",
-					lbfh->libspc, lbfh->relfil);
-		}
-		fprintf(mfp, "\n");
-	}
-	/*
-	 * List Base Address Definitions
-	 */
-	if (basep) {
-		newpag(mfp);
-		fprintf(mfp, "\nUser Base Address Definitions\n\n");
-		bsp = basep;
-		while (bsp) {
-			fprintf(mfp, "%s\n", bsp->b_strp);
-			bsp = bsp->b_base;
-		}
-	}
-	/*
-	 * List Global Definitions
-	 */
-	if (globlp) {
-		newpag(mfp);
-		fprintf(mfp, "\nUser Global Definitions\n\n");
-		gsp = globlp;
-		while (gsp) {
-			fprintf(mfp, "%s\n", gsp->g_strp);
-			gsp = gsp->g_globl;
-		}
-	}
-	fprintf(mfp, "\n\f");
-	symdef(mfp);
-}
-
-/*)Function	int	parse()
- *
- *	The function parse() evaluates all command line or file input
- *	linker directives and updates the appropriate variables.
- *
- *	local variables:
- *		int	c		character value
- *		int	sv_type		save type of processing
- *		char	fid[]		file id string
- *
- *	global variables:
- *		char	ctype[]		array of character types, one per
- *					ASCII character
- *		lfile	*lfp		pointer to current lfile structure
- *					being processed by parse()
- *		lfile	*linkp		pointer to first lfile structure
- *					containing an input REL file
- *					specification
- *		int	mflag		Map output flag
- *		int	oflag		Output file type flag
- *		int	pflag		print linker command file flag
- *		FILE *	stderr		c_library
- *		int	uflag		Relocated listing flag
- *		int	xflag		Map file radix type flag
- *		int	wflag		Wide listing format
- *		int	zflag		Disable symbol case sensitivity
- *
- *	Functions called:
- *		VOID	addlib()	lklibr.c
- *		VOID	addpath()	lklibr.c
- *		VOID	bassav()	lkmain.c
- *		VOID	doparse()	lkmain.c
- *		int	fprintf()	c_library
- *		VOID	gblsav()	lkmain.c
- *		VOID	getfid()	lklex.c
- *		int	getnb()		lklex.c
- *		VOID	lkexit()	lkmain.c
- *		char *	strsto()	lksym.c
- *		int	strlen()	c_library
- *		int	fndidx()	lkmain.c
- *
- *	side effects:
- *		Various linker flags are updated and the linked
- *		structure lfile is created.
+        int i;
+        struct head *hdp;
+        struct lbfile *lbfh;
+
+        if (mflag == 0) return;
+
+        /*
+         * Open Map File
+         */
+        mfp = afile(linkp->f_idp, "map", 1);
+        if (mfp == NULL) {
+                lkexit(ER_FATAL);
+        }
+
+        /*
+         * Output Map Bank/Area Lists
+         */
+        page = 0;
+        lop  = NLPP;
+        for (bp = bankp; bp != NULL; bp = bp->b_bp) {
+                for (ap = areap; ap != NULL; ap = ap->a_ap) {
+                        if (ap->a_bp == bp)
+                                lstarea(ap, bp);
+                }
+        }
+
+        /*
+         * List Linked Files
+         */
+        newpag(mfp);
+        fprintf(mfp, "\nFiles Linked                              [ module(s) ]\n\n");
+        hdp = headp;
+        filep = linkp->f_flp;
+        while (filep) {
+                if (strlen (filep->f_idp) > 40)
+                        fprintf(mfp, "%s\n%40s  [ ", filep->f_idp, "");
+                else
+                        fprintf(mfp, "%-40.40s  [ ", filep->f_idp);
+                i = 0;
+                while ((hdp != NULL) && (hdp->h_lfile == filep)) {
+                        if (i)
+                                fprintf(mfp, ",\n%44s", "");
+                        fprintf(mfp, "%-.32s", hdp->m_id);
+                        hdp = hdp->h_hp;
+                        i++;
+                }
+                fprintf(mfp, " ]\n");
+                filep = filep->f_flp;
+        }
+        fprintf(mfp, "\n");
+        /*
+         * List Linked Libraries
+         */
+        if (lbfhead != NULL) {
+                fprintf(mfp, "\nLibraries Linked                          [ object file ]\n\n");
+                for (lbfh=lbfhead; lbfh; lbfh=lbfh->next) {
+                        if (strlen (lbfh->libspc) > 40)
+                                fprintf(mfp, "%s\n%40s  [ %-.32s ]\n",
+                                        lbfh->libspc, "", lbfh->relfil);
+                        else
+                                fprintf(mfp, "%-40.40s  [ %-.32s ]\n",
+                                        lbfh->libspc, lbfh->relfil);
+                }
+                fprintf(mfp, "\n");
+        }
+        /*
+         * List Base Address Definitions
+         */
+        if (basep) {
+                newpag(mfp);
+                fprintf(mfp, "\nUser Base Address Definitions\n\n");
+                bsp = basep;
+                while (bsp) {
+                        fprintf(mfp, "%s\n", bsp->b_strp);
+                        bsp = bsp->b_base;
+                }
+        }
+        /*
+         * List Global Definitions
+         */
+        if (globlp) {
+                newpag(mfp);
+                fprintf(mfp, "\nUser Global Definitions\n\n");
+                gsp = globlp;
+                while (gsp) {
+                        fprintf(mfp, "%s\n", gsp->g_strp);
+                        gsp = gsp->g_globl;
+                }
+        }
+        fprintf(mfp, "\n\f");
+        chkbank(mfp);
+        symdef(mfp);
+}
+
+/*)Function     int     parse()
+ *
+ *      The function parse() evaluates all command line or file input
+ *      linker directives and updates the appropriate variables.
+ *
+ *      local variables:
+ *              int     c               character value
+ *              int     sv_type         save type of processing
+ *              char    fid[]           file id string
+ *
+ *      global variables:
+ *              char    ctype[]         array of character types, one per
+ *                                      ASCII character
+ *              lfile   *lfp            pointer to current lfile structure
+ *                                      being processed by parse()
+ *              lfile   *linkp          pointer to first lfile structure
+ *                                      containing an input REL file
+ *                                      specification
+ *              int     mflag           Map output flag
+ *              int     oflag           Output file type flag
+ *              int     objflg          Linked file/library output object flag
+ *              int     pflag           print linker command file flag
+ *              FILE *  stderr          c_library
+ *              int     uflag           Relocated listing flag
+ *              int     xflag           Map file radix type flag
+ *              int     wflag           Wide listing format
+ *              int     zflag           Disable symbol case sensitivity
+ *
+ *      Functions called:
+ *              VOID    addlib()        lklibr.c
+ *              VOID    addpath()       lklibr.c
+ *              VOID    bassav()        lkmain.c
+ *              VOID    doparse()       lkmain.c
+ *              int     fprintf()       c_library
+ *              VOID    gblsav()        lkmain.c
+ *              VOID    getfid()        lklex.c
+ *              int     get()           lklex.c
+ *              int     getnb()         lklex.c
+ *              VOID    lkexit()        lkmain.c
+ *              char *  strsto()        lksym.c
+ *              int     strlen()        c_library
+ *              int     fndidx()        lkmain.c
+ *
+ *      side effects:
+ *              Various linker flags are updated and the linked
+ *              structure lfile is created.
  */
 
 int
 parse()
 {
-	int c;
-	char fid[NINPUT];
-
-	int sv_type;
-
-	while ((c = getnb()) != 0) {
-		/* sdld specific */
-		if ( c == ';')
-			return(0);
-		/* end sdld specific */
-		if ( c == '-') {
-			while (ctype[c=get()] & LETTER) {
-				switch(c) {
-
-				case 'C':
-					if (is_sdld() && !(TARGET_IS_Z80 || TARGET_IS_GB)) {
-						codesav();
-						return(0);
-					}
-					// else fall through
-				case 'c':
-					if (startp->f_type != 0)
-						break;
-					startp->f_type = F_STD;
-					doparse();
-					return(0);
-
-				case 'f':
-				case 'F':
-					if (startp->f_type == F_LNK)
-						return(0);
-					unget(getnb());
-					if (*ip == 0)
-						usage(ER_FATAL);
-					sv_type = startp->f_type;
-					startp->f_idp = strsto(ip);
-					startp->f_idx = fndidx(ip);
-					startp->f_type = F_LNK;
-					doparse();
-					if (sv_type == F_STD) {
-						cfp = NULL;
-						sfp = NULL;
-						startp->f_type = F_STD;
-						filep = startp;
-					}
-					return(0);
-
-				case 'I':
-					if (is_sdld() && !(TARGET_IS_Z80 || TARGET_IS_GB)) {
-						iramsav();
-						return(0);
-					}
-					// else fall through
-				case 'i':
-					oflag = 1;
-					break;
-
-				case 'S':
-					if (TARGET_IS_8051) {
-						unget(getnb());
-						if (ip && *ip)
-						{
-							stacksize = expr(0);
-							if (stacksize > 256) stacksize = 256;
-							else if (stacksize < 0) stacksize = 0;
-						}
-						return(0);
-					}
-					// else fall through
-				case 's':
-					oflag = 2;
-					break;
-
-				case 't':
-				case 'T':
-					oflag = 3;
-					break;
-
-				case 'M':
-					/*JCF: memory usage summary output*/
-					if (is_sdld()) {
-						sflag = 1;
-					}
-					// else fall through
-				case 'm':
-					mflag = 1;
-					break;
+        int c;
+        int sv_type;
+        char fid[NINPUT];
+
+        while ((c = getnb()) != 0) {
+                /* sdld specific */
+                if ( c == ';')
+                        return(0);
+                /* end sdld specific */
+                if ( c == '-') {
+                        while (ctype[c=get()] & LETTER) {
+                                switch(c) {
+
+                                case 'C':
+                                        if (is_sdld() && !(TARGET_IS_Z80 || TARGET_IS_GB)) {
+                                                codesav();
+                                                return(0);
+                                        }
+                                        // else fall through
+                                case 'c':
+                                        if (startp->f_type != 0)
+                                                break;
+                                        startp->f_type = F_STD;
+                                        doparse();
+                                        return(0);
+
+                                case 'f':
+                                case 'F':
+                                        if (startp->f_type == F_LNK)
+                                                return(0);
+                                        unget(getnb());
+                                        if (*ip == 0)
+                                                usage(ER_FATAL);
+                                        sv_type = startp->f_type;
+                                        startp->f_idp = strsto(ip);
+                                        startp->f_idx = fndidx(ip);
+                                        startp->f_type = F_LNK;
+                                        doparse();
+                                        if (sv_type == F_STD) {
+                                                cfp = NULL;
+                                                sfp = NULL;
+                                                startp->f_type = F_STD;
+                                                filep = startp;
+                                        }
+                                        return(0);
+
+                                case 'I':
+                                        if (is_sdld() && !(TARGET_IS_Z80 || TARGET_IS_GB)) {
+                                                iramsav();
+                                                return(0);
+                                        }
+                                        // else fall through
+                                case 'i':
+                                        oflag = 1;
+                                        break;
+
+                                case 'S':
+                                        if (TARGET_IS_8051) {
+                                                unget(getnb());
+                                                if (ip && *ip)
+                                                {
+                                                        stacksize = expr(0);
+                                                        if (stacksize > 256) stacksize = 256;
+                                                        else if (stacksize < 0) stacksize = 0;
+                                                }
+                                                return(0);
+                                        }
+                                        // else fall through
+                                case 's':
+                                        oflag = 2;
+                                        break;
+
+                                case 't':
+                                case 'T':
+                                        oflag = 3;
+                                        break;
+
+                                case 'o':
+                                case 'O':
+                                        objflg = 0;
+                                        break;
+
+                                case 'v':
+                                case 'V':
+                                        objflg = 1;
+                                        break;
+
+                                case 'M':
+                                        /*JCF: memory usage summary output*/
+                                        if (is_sdld()) {
+                                                sflag = 1;
+                                                break;
+                                        }
+                                        // else fall through
+                                case 'm':
+                                        mflag = 1;
+                                        break;
 
 #if NOICE
-				case 'j':
-				case 'J':
-					jflag = 1;
-					break;
+                                case 'j':
+                                case 'J':
+                                        jflag = 1;
+                                        break;
 #endif
 
-				case 'r':
-				case 'R':
-					if (is_sdld() && !(TARGET_IS_Z80 || TARGET_IS_GB))
-						rflag = 1;
-					else
-						goto err;
-					break;
-
-				case 'u':
-				case 'U':
-					uflag = 1;
-					break;
-
-				case 'X':
-					if (is_sdld() && !(TARGET_IS_Z80 || TARGET_IS_GB)) {
-						xramsav();
-						return(0);
-					}
-					// else fall through
-				case 'x':
-					xflag = 0;
-					break;
-
-				case 'q':
-				case 'Q':
-					xflag = 1;
-					break;
-
-				case 'd':
-				case 'D':
-					xflag = 2;
-					break;
-
-				case 'E':
-					if (TARGET_IS_6808) {
-						oflag = 4;
-						break;
-					}
-					// else fall through
-				case 'e':
-					return(1);
-
-				case 'n':
-				case 'N':
-					pflag = 0;
-					break;
-
-				case 'p':
-				case 'P':
-					pflag = 1;
-					break;
-
-				case 'b':
-				case 'B':
-					bassav();
-					return(0);
-
-				case 'g':
-				case 'G':
-					gblsav();
-					return(0);
-
-				case 'k':
-				case 'K':
-					addpath();
-					return(0);
-
-				case 'l':
-				case 'L':
-					addlib();
-					return(0);
-
-				case 'w':
-				case 'W':
-					wflag = 1;
-					break;
+                                case 'r':
+                                case 'R':
+                                        if (is_sdld() && !(TARGET_IS_Z80 || TARGET_IS_GB))
+                                                rflag = 1;
+                                        else
+                                                goto err;
+                                        break;
+
+                                case 'u':
+                                case 'U':
+                                        uflag = 1;
+                                        break;
+
+                                case 'X':
+                                        if (is_sdld() && !(TARGET_IS_Z80 || TARGET_IS_GB)) {
+                                                xramsav();
+                                                return(0);
+                                        }
+                                        // else fall through
+                                case 'x':
+                                        xflag = 0;
+                                        break;
+
+                                case 'q':
+                                case 'Q':
+                                        xflag = 1;
+                                        break;
+
+                                case 'd':
+                                case 'D':
+                                        xflag = 2;
+                                        break;
+
+                                case 'E':
+                                        if (TARGET_IS_6808) {
+                                                oflag = 4;
+                                                break;
+                                        }
+                                        // else fall through
+                                case 'e':
+                                        return(1);
+
+                                case 'n':
+                                case 'N':
+                                        pflag = 0;
+                                        break;
+
+                                case 'p':
+                                case 'P':
+                                        pflag = 1;
+                                        break;
+
+                                case 'b':
+                                case 'B':
+                                        bassav();
+                                        return(0);
+
+                                case 'g':
+                                case 'G':
+                                        gblsav();
+                                        return(0);
+
+                                case 'k':
+                                case 'K':
+                                        addpath();
+                                        return(0);
+
+                                case 'l':
+                                case 'L':
+                                        addlib();
+                                        return(0);
+
+                                case 'w':
+                                case 'W':
+                                        wflag = 1;
+                                        break;
 
 #if SDCDB
-				case 'Y':
-					if (TARGET_IS_8051) {
-						unget(getnb());
-						packflag=1;
-					}
-					// else fall through
-				case 'y':
-					yflag = 1;
-					break;
+                                case 'Y':
+                                        if (TARGET_IS_8051) {
+                                                unget(getnb());
+                                                packflag=1;
+                                                break;
+                                        }
+                                        // else fall through
+                                case 'y':
+                                        yflag = 1;
+                                        break;
 #endif
 
-				case 'z':
-				case 'Z':
-					zflag = 1;
-					break;
-
-				default:
-				err:
-					fprintf(stderr,
-					    "Unkown option -%c ignored\n", c);
-					break;
-				}
-			}
-			/* sdld specific */
-			if ( c == ';')
-				return(0);
-			/* end sdld specific */
-		} else
-		if (!(ctype[c] & ILL)) {
-			if (linkp == NULL) {
-				linkp = (struct lfile *)
-					new (sizeof (struct lfile));
-				lfp = linkp;
-				lfp->f_type = F_OUT;
-			} else {
-				lfp->f_flp = (struct lfile *)
-						new (sizeof (struct lfile));
-				lfp = lfp->f_flp;
-				lfp->f_type = F_REL;
-			}
-			getfid(fid, c);
-			lfp->f_idp = strsto(fid);
-		} else {
-			fprintf(stderr, "Invalid input\n");
-			lkexit(ER_FATAL);
-		}
-	}
-	return(0);
-}
-
-/*)Function	VOID	doparse()
- *
- *	The function doparse() evaluates all interactive
- *	command line or file input linker directives and
- *	updates the appropriate variables.
- *
- *	local variables:
- *		none
- *
- *	global variables:
- *		FILE *	stdin		standard input
- *		FILE *	stdout		standard output
- *		lfile	*cfp		The pointer *cfp points to the
- *				 	current lfile structure
- *		FILE	*sfp		The file handle sfp points to the
- *				 	currently open file
- *		char	ib[NINPUT]	.rel file text line
- *		char	*ip		pointer into the .rel file
- *		lfile	*filep	 	The pointer *filep points to the
- *				 	beginning of a linked list of
- *				 	lfile structures.
- *		lfile	*startp		asmlnk startup file structure
- *		int	pflag		print linker command file flag
- *
- *	Functions called:
- *		int	fclose()	c_library
- *		int	fprintf()	c_library
- *		VOID	getfid()	lklex.c
- *		int	nxtline()	lklex.c
- *		int	parse()		lkmain.c
- *
- *	side effects:
- *		Various linker flags are updated and the linked
- *		structure lfile may be updated.
+                                case 'z':
+                                case 'Z':
+                                        zflag = 1;
+                                        break;
+
+                                default:
+                                err:
+                                        fprintf(stderr,
+                                            "Unknown option -%c ignored\n", c);
+                                        break;
+                                }
+                        }
+                        /* sdld specific */
+                        if ( c == ';')
+                                return(0);
+                        /* end sdld specific */
+                } else
+                if (!(ctype[c] & ILL)) {
+                        if (linkp == NULL) {
+                                linkp = (struct lfile *)
+                                        new (sizeof (struct lfile));
+                                lfp = linkp;
+                                lfp->f_type = F_OUT;
+                        } else {
+                                lfp->f_flp = (struct lfile *)
+                                                new (sizeof (struct lfile));
+                                lfp = lfp->f_flp;
+                                lfp->f_type = F_REL;
+                        }
+                        getfid(fid, c);
+                        lfp->f_idp = strsto(fid);
+                        lfp->f_obj = objflg;
+                } else {
+                        fprintf(stderr, "Invalid input\n");
+                        lkexit(ER_FATAL);
+                }
+        }
+        return(0);
+}
+
+/*)Function     VOID    doparse()
+ *
+ *      The function doparse() evaluates all interactive
+ *      command line or file input linker directives and
+ *      updates the appropriate variables.
+ *
+ *      local variables:
+ *              none
+ *
+ *      global variables:
+ *              FILE *  stdin           standard input
+ *              FILE *  stdout          standard output
+ *              lfile   *cfp            The pointer *cfp points to the
+ *                                      current lfile structure
+ *              FILE    *sfp            The file handle sfp points to the
+ *                                      currently open file
+ *              char    ib[NINPUT]      .rel file text line
+ *              char    *ip             pointer into the .rel file
+ *              lfile   *filep          The pointer *filep points to the
+ *                                      beginning of a linked list of
+ *                                      lfile structures.
+ *              lfile   *startp         asmlnk startup file structure
+ *              int     pflag           print linker command file flag
+ *
+ *      Functions called:
+ *              int     fclose()        c_library
+ *              int     fprintf()       c_library
+ *              VOID    getfid()        lklex.c
+ *              int     nxtline()       lklex.c
+ *              int     parse()         lkmain.c
+ *
+ *      side effects:
+ *              Various linker flags are updated and the linked
+ *              structure lfile may be updated.
  */
 
 VOID
 doparse()
 {
-	cfp = NULL;
-	sfp = NULL;
-	filep = startp;
-	while (1) {
-		ip = ib;
-		if (nxtline() == 0)
-			break;
-		if (pflag && cfp->f_type != F_STD)
-			fprintf(stdout, "ASlink >> %s\n", ip);
-		if (*ip == 0 || parse())
-			break;
-	}
-	if((sfp != NULL) && (sfp != stdin)) {
-		fclose(sfp);
-	}
-	sfp = NULL;
-	startp->f_idp = "";
-	startp->f_idx = 0;
-	startp->f_type = 0;
-}
-
-/*)Function	VOID	bassav()
- *
- *	The function bassav() creates a linked structure containing
- *	the base address strings input to the linker.
- *
- *	local variables:
- *		none
- *
- *	global variables:
- *		base	*basep		The pointer to the first
- *					base structure
- *		base	*bsp		Pointer to the current
- *					base structure
- *		char	*ip		pointer into the REL file
- *					text line in ib[]
- *
- *	 functions called:
- *		int	getnb()		lklex.c
- *		VOID *	new()		lksym.c
- *		int	strlen()	c_library
- *		char *	strcpy()	c_library
- *		VOID	unget()		lklex.c
+        cfp = NULL;
+        sfp = NULL;
+        filep = startp;
+        while (1) {
+                ip = ib;
+                if (nxtline() == 0)
+                        break;
+                if (pflag && cfp->f_type != F_STD)
+                        fprintf(stdout, "ASlink >> %s\n", ip);
+                if (*ip == 0 || parse())
+                        break;
+        }
+        if((sfp != NULL) && (sfp != stdin)) {
+                fclose(sfp);
+        }
+        sfp = NULL;
+        startp->f_idp = "";
+        startp->f_idx = 0;
+        startp->f_type = 0;
+}
+
+/*)Function     VOID    bassav()
+ *
+ *      The function bassav() creates a linked structure containing
+ *      the base address strings input to the linker.
+ *
+ *      local variables:
+ *              none
+ *
+ *      global variables:
+ *              base    *basep          The pointer to the first
+ *                                      base structure
+ *              base    *bsp            Pointer to the current
+ *                                      base structure
+ *              char    *ip             pointer into the REL file
+ *                                      text line in ib[]
+ *
+ *       functions called:
+ *              int     getnb()         lklex.c
+ *              VOID *  new()           lksym.c
+ *              int     strlen()        c_library
+ *              char *  strcpy()        c_library
+ *              VOID    unget()         lklex.c
  *
- *	side effects:
- *		The basep structure is created.
+ *      side effects:
+ *              The basep structure is created.
  */
 
 VOID
 bassav()
 {
-	if (basep == NULL) {
-		basep = (struct base *)
-			new (sizeof (struct base));
-		bsp = basep;
-	} else {
-		bsp->b_base = (struct base *)
-				new (sizeof (struct base));
-		bsp = bsp->b_base;
-	}
-	unget(getnb());
-	bsp->b_strp = (char *) new (strlen(ip)+1);
-	strcpy(bsp->b_strp, ip);
+        if (basep == NULL) {
+                basep = (struct base *)
+                        new (sizeof (struct base));
+                bsp = basep;
+        } else {
+                bsp->b_base = (struct base *)
+                                new (sizeof (struct base));
+                bsp = bsp->b_base;
+        }
+        unget(getnb());
+        bsp->b_strp = (char *) new (strlen(ip)+1);
+        strcpy(bsp->b_strp, ip);
 }
 
-/*)Function	VOID	setbas()
- *
- *	The function setbas() scans the base address lines in the
- *	basep structure, evaluates the arguments, and sets beginning
- *	address of the specified areas.
- *
- *	local variables:
- *		int	v		expression value
- *		char	id[]		base id string
- *
- *	global variables:
- *		area	*ap		Pointer to the current
- *					area structure
- *		area	*areap		The pointer to the first
- *					area structure of a linked list
- *		base	*basep		The pointer to the first
- *					base structure
- *		base	*bsp		Pointer to the current
- *					base structure
- *		char	*ip		pointer into the REL file
- *					text line in ib[]
- *		int	lkerr		error flag
- *
- *	 functions called:
- *		a_uint	expr()		lkeval.c
- *		int	fprintf()	c_library
- *		VOID	getid()		lklex.c
- *		int	getnb()		lklex.c
- *		int	symeq()		lksym.c
- *
- *	side effects:
- *		The base address of an area is set.
- */
 
-VOID
-setbas()
-{
-	int v;
-	char id[NCPS];
-
-	bsp = basep;
-	while (bsp) {
-		ip = bsp->b_strp;
-		getid(id, -1);
-		if (getnb() == '=') {
-			v = expr(0);
-			for (ap = areap; ap != NULL; ap = ap->a_ap) {
-				if (symeq(id, ap->a_id, 1))
-					break;
-			}
-			if (ap == NULL) {
-				fprintf(stderr,
-				"ASlink-Warning-No definition of area %s\n", id);
-				lkerr++;
-			} else {
-				ap->a_addr = v;
-				/* sdld specific */
-				ap->a_type = 1; /* JLH: value set */
-				/* end sdld specific */
-			}
-		} else {
-			fprintf(stderr, "ASlink-Warning-No '=' in base expression");
-			lkerr++;
-		}
-		bsp = bsp->b_base;
-	}
-}
-
-/*)Function	VOID	gblsav()
- *
- *	The function gblsav() creates a linked structure containing
- *	the global variable strings input to the linker.
- *
- *	local variable:
- *		none
+/*)Function     VOID    gblsav()
+ *
+ *      The function gblsav() creates a linked structure containing
+ *      the global variable strings input to the linker.
+ *
+ *      local variable:
+ *              none
+ *
+ *      global variables:
+ *              globl   *globlp         The pointer to the first
+ *                                      globl structure
+ *              globl   *gsp            Pointer to the current
+ *                                      globl structure
+ *              char    *ip             pointer into the REL file
+ *                                      text line in ib[]
+ *              int     lkerr           error flag
+ *
+ *      functions called:
+ *              int     getnb()         lklex.c
+ *              VOID *  new()           lksym.c
+ *              int     strlen()        c_library
+ *              char *  strcpy()        c_library
+ *              VOID    unget()         lklex.c
  *
- *	global variables:
- *		globl	*globlp		The pointer to the first
- *					globl structure
- *		globl	*gsp		Pointer to the current
- *					globl structure
- *		char	*ip		pointer into the REL file
- *					text line in ib[]
- *		int	lkerr		error flag
- *
- *	functions called:
- *		int	getnb()		lklex.c
- *		VOID *	new()		lksym.c
- *		int	strlen()	c_library
- *		char *	strcpy()	c_library
- *		VOID	unget()		lklex.c
- *
- *	side effects:
- *		The globlp structure is created.
+ *      side effects:
+ *              The globlp structure is created.
  */
 
 VOID
 gblsav()
 {
-	if (globlp == NULL) {
-		globlp = (struct globl *)
-			new (sizeof (struct globl));
-		gsp = globlp;
-	} else {
-		gsp->g_globl = (struct globl *)
-				new (sizeof (struct globl));
-		gsp = gsp->g_globl;
-	}
-	unget(getnb());
-	gsp->g_strp = (char *) new (strlen(ip)+1);
-	strcpy(gsp->g_strp, ip);
+        if (globlp == NULL) {
+                globlp = (struct globl *)
+                        new (sizeof (struct globl));
+                gsp = globlp;
+        } else {
+                gsp->g_globl = (struct globl *)
+                                new (sizeof (struct globl));
+                gsp = gsp->g_globl;
+        }
+        unget(getnb());
+        gsp->g_strp = (char *) new (strlen(ip)+1);
+        strcpy(gsp->g_strp, ip);
 }
 
 
-/*)Function	VOID	setgbl()
- *
- *	The function setgbl() scans the global variable lines in the
- *	globlp structure, evaluates the arguments, and sets a variable
- *	to this value.
- *
- *	local variables:
- *		int	v		expression value
- *		char	id[]		base id string
- *		sym *	sp		pointer to a symbol structure
- *
- *	global variables:
- *		char	*ip		pointer into the REL file
- *					text line in ib[]
- *		globl	*globlp		The pointer to the first
- *					globl structure
- *		globl	*gsp		Pointer to the current
- *					globl structure
- *		FILE *	stderr		c_library
- *		int	lkerr		error flag
- *
- *	 functions called:
- *		a_uint	expr()		lkeval.c
- *		int	fprintf()	c_library
- *		VOID	getid()		lklex.c
- *		int	getnb()		lklex.c
- *		sym *	lkpsym()	lksym.c
+/*)Function     VOID    setgbl()
+ *
+ *      The function setgbl() scans the global variable lines in the
+ *      globlp structure, evaluates the arguments, and sets a variable
+ *      to this value.
+ *
+ *      local variables:
+ *              int     v               expression value
+ *              char    id[]            base id string
+ *              sym *   sp              pointer to a symbol structure
+ *
+ *      global variables:
+ *              char    *ip             pointer into the REL file
+ *                                      text line in ib[]
+ *              globl   *globlp         The pointer to the first
+ *                                      globl structure
+ *              globl   *gsp            Pointer to the current
+ *                                      globl structure
+ *              FILE *  stderr          c_library
+ *              int     lkerr           error flag
+ *
+ *       functions called:
+ *              a_uint  expr()          lkeval.c
+ *              int     fprintf()       c_library
+ *              VOID    getid()         lklex.c
+ *              int     getnb()         lklex.c
+ *              sym *   lkpsym()        lksym.c
  *
- *	side effects:
- *		The value of a variable is set.
+ *      side effects:
+ *              The value of a variable is set.
  */
 
 VOID
 setgbl()
 {
-	int v;
-	struct sym *sp;
-	char id[NCPS];
-
-	gsp = globlp;
-	while (gsp) {
-		ip = gsp->g_strp;
-		getid(id, -1);
-		if (getnb() == '=') {
-			v = (int) expr(0);
-			sp = lkpsym(id, 0);
-			if (sp == NULL) {
-				fprintf(stderr,
-				"No definition of symbol %s\n", id);
-				lkerr++;
-			} else {
-				if (sp->s_type & S_DEF) {
-					fprintf(stderr,
-					"Redefinition of symbol %s\n", id);
-					lkerr++;
-					sp->s_axp = NULL;
-				}
-				sp->s_addr = v;
-				sp->s_type |= S_DEF;
-			}
-		} else {
-			fprintf(stderr, "No '=' in global expression");
-			lkerr++;
-		}
-		gsp = gsp->g_globl;
-	}
-}
-
-/*)Function	FILE *	afile(fn, ft, wf)
- *
- *		char *	fn		file specification string
- *		char *	ft		file type string
- *		int	wf		0 ==>> read
- *					1 ==>> write
- *					2 ==>> binary write
- *
- *	The function afile() opens a file for reading or writing.
- *		(1)	If the file type specification string ft
- *			is not NULL then a file specification is
- *			constructed with the file path\name in fn
- *			and the extension in ft.
- *		(2)	If the file type specification string ft
- *			is NULL then the file specification is
- *			constructed from fn.  If fn does not have
- *			a file type then the default .rel file
- *			type is appended to the file specification.
- *
- *	afile() returns a file handle for the opened file or aborts
- *	the assembler on an open error.
- *
- *	local variables:
- *		int	c		character value
- *		FILE *	fp		filehandle for opened file
- *		char *	p1		pointer to filespec string fn
- *		char *	p2		pointer to filespec string fb
- *		char *	p3		pointer to filetype string ft
- *
- *	global variables:
- *		char	afspec[]	constructed file specification string
- *		int	lkerr		error flag
- *
- *	functions called:
- *		int	fndidx()	lkmain.c
- *		FILE *	fopen()		c_library
- *		int	fprintf()	c_library
+        int v;
+        struct sym *sp;
+        char id[NCPS];
+
+        gsp = globlp;
+        while (gsp) {
+                ip = gsp->g_strp;
+                getid(id, -1);
+                if (getnb() == '=') {
+                        v = (int) expr(0);
+                        sp = lkpsym(id, 0);
+                        if (sp == NULL) {
+                                fprintf(stderr,
+                                "No definition of symbol %s\n", id);
+                                lkerr++;
+                        } else {
+                                if (sp->s_type & S_DEF) {
+                                        fprintf(stderr,
+                                        "Redefinition of symbol %s\n", id);
+                                        lkerr++;
+                                        sp->s_axp = NULL;
+                                }
+                                sp->s_addr = v;
+                                sp->s_type |= S_DEF;
+                        }
+                } else {
+                        fprintf(stderr, "No '=' in global expression");
+                        lkerr++;
+                }
+                gsp = gsp->g_globl;
+        }
+}
+
+/*)Function     FILE *  afile(fn, ft, wf)
+ *
+ *              char *  fn              file specification string
+ *              char *  ft              file type string
+ *              int     wf              0 ==>> read
+ *                                      1 ==>> write
+ *                                      2 ==>> binary write
+ *
+ *      The function afile() opens a file for reading or writing.
+ *              (1)     If the file type specification string ft
+ *                      is not NULL then a file specification is
+ *                      constructed with the file path\name in fn
+ *                      and the extension in ft.
+ *              (2)     If the file type specification string ft
+ *                      is NULL then the file specification is
+ *                      constructed from fn.  If fn does not have
+ *                      a file type then the default .rel file
+ *                      type is appended to the file specification.
+ *
+ *      afile() returns a file handle for the opened file or aborts
+ *      the assembler on an open error.
+ *
+ *      local variables:
+ *              int     c               character value
+ *              FILE *  fp              filehandle for opened file
+ *              char *  p1              pointer to filespec string fn
+ *              char *  p2              pointer to filespec string fb
+ *              char *  p3              pointer to filetype string ft
+ *
+ *      global variables:
+ *              char    afspec[]        constructed file specification string
+ *              int     lkerr           error flag
+ *
+ *      functions called:
+ *              int     fndidx()        lkmain.c
+ *              FILE *  fopen()         c_library
+ *              int     fprintf()       c_library
  *
- *	side effects:
- *		File is opened for read or write.
+ *      side effects:
+ *              File is opened for read or write.
  */
 
 FILE *
 afile(char *fn, char *ft, int wf)
 {
-	char *p1, *p2;
-	int c;
-	char * frmt;
-	FILE *fp;
-
-	if (strlen(fn) > (FILSPC-7)) {
-		fprintf(stderr, "?ASlink-Error-<filspc too long> : \"%s\"\n", fn);
-		lkerr++;
-		return(NULL);
-	}
-
-	/*
-	 * Skip The Path
-	 */
-	strcpy(afspec, fn);
-	c = fndidx(afspec);
-
-	/*
-	 * Skip to File Extension separator
-	 */
-	p1 = strrchr(&afspec[c], FSEPX);
-
-	/*
-	 * Copy File Extension
-	 */
-	p2 = ft ? ft : "";
-	if (*p2 == 0) {
-		if (p1 == NULL) {
-			p2 = LKOBJEXT;
-		} else {
-			p2 = strrchr(&fn[c], FSEPX) + 1;
-		}
-	}
-	if (p1 == NULL) {
-		p1 = &afspec[strlen(afspec)];
-	}
-	*p1++ = FSEPX;
-	while ((c = *p2++) != 0) {
-		if (p1 < &afspec[FILSPC-1])
-			*p1++ = c;
-	}
-	*p1++ = 0;
-
-	/*
-	 * Select Read/Write/Binary Write
-	 */
-	switch(wf) {
-	default:
-	case 0:	frmt = "r";	break;
-	case 1:	frmt = "w";	break;
-#ifdef	DECUS
-	case 2:	frmt = "wn";	break;
+        char *p1, *p2;
+        int c;
+        char * frmt;
+        FILE *fp;
+
+        if (strlen(fn) > (FILSPC-7)) {
+                fprintf(stderr, "?ASlink-Error-<filspc too long> : \"%s\"\n", fn);
+                lkerr++;
+                return(NULL);
+        }
+
+        /*
+         * Skip The Path
+         */
+        strcpy(afspec, fn);
+        c = fndidx(afspec);
+
+        /*
+         * Skip to File Extension separator
+         */
+        p1 = strrchr(&afspec[c], FSEPX);
+
+        /*
+         * Copy File Extension
+         */
+        p2 = ft ? ft : "";
+        if (*p2 == 0) {
+                if (p1 == NULL) {
+                        p2 = LKOBJEXT;
+                } else {
+                        p2 = strrchr(&fn[c], FSEPX) + 1;
+                }
+        }
+        if (p1 == NULL) {
+                p1 = &afspec[strlen(afspec)];
+        }
+        *p1++ = FSEPX;
+        while ((c = *p2++) != 0) {
+                if (p1 < &afspec[FILSPC-1])
+                        *p1++ = c;
+        }
+        *p1++ = 0;
+
+        /*
+         * Select Read/Write/Binary Write
+         */
+        switch(wf) {
+        default:
+        case 0: frmt = "r";     break;
+        case 1: frmt = "w";     break;
+#ifdef  DECUS
+        case 2: frmt = "wn";    break;
 #else
-	case 2:	frmt = "wb";	break;
+        case 2: frmt = "wb";    break;
 #endif
-	}
-	if ((fp = fopen(afspec, frmt)) == NULL && strcmp(ft,"adb") != 0) { /* Do not complain for optional adb files */
-		fprintf(stderr, "?ASlink-Error-<cannot %s> : \"%s\"\n", wf?"create":"open", afspec);
-		lkerr++;
-	}
-	return (fp);
+        }
+        if ((fp = fopen(afspec, frmt)) == NULL && strcmp(ft,"adb") != 0) { /* Do not complain for optional adb files */
+                fprintf(stderr, "?ASlink-Error-<cannot %s> : \"%s\"\n", wf?"create":"open", afspec);
+                lkerr++;
+        }
+        return (fp);
 }
 
-/*)Function	int	fndidx(str)
+/*)Function     int     fndidx(str)
  *
- *		char *	str		file specification string
+ *              char *  str             file specification string
  *
- *	The function fndidx() scans the file specification string
- *	to find the index to the file name.  If the file
- *	specification contains a 'path' then the index will
- *	be non zero.
+ *      The function fndidx() scans the file specification string
+ *      to find the index to the file name.  If the file
+ *      specification contains a 'path' then the index will
+ *      be non zero.
  *
- *	fndidx() returns the index value.
+ *      fndidx() returns the index value.
  *
- *	local variables:
- *		char *	p1		temporary pointer
- *		char *	p2		temporary pointer
+ *      local variables:
+ *              char *  p1              temporary pointer
+ *              char *  p2              temporary pointer
  *
- *	global variables:
- *		none
+ *      global variables:
+ *              none
  *
- *	functions called:
- *		char *	strrchr()	c_library
+ *      functions called:
+ *              char *  strrchr()       c_library
  *
- *	side effects:
- *		none
+ *      side effects:
+ *              none
  */
 
 int
 fndidx(str)
 char *str;
 {
-	char *p1, *p2;
+        char *p1, *p2;
 
-	/*
-	 * Skip Path Delimiters
-	 */
-	p1 = str;
-	if ((p2 = strrchr(p1,  ':')) != NULL) { p1 = p2 + 1; }
-	if ((p2 = strrchr(p1,  '/')) != NULL) { p1 = p2 + 1; }
-	if ((p2 = strrchr(p1, '\\')) != NULL) { p1 = p2 + 1; }
+        /*
+         * Skip Path Delimiters
+         */
+        p1 = str;
+        if ((p2 = strrchr(p1,  ':')) != NULL) { p1 = p2 + 1; }
+        if ((p2 = strrchr(p1,  '/')) != NULL) { p1 = p2 + 1; }
+        if ((p2 = strrchr(p1, '\\')) != NULL) { p1 = p2 + 1; }
 
-	return((int) (p1 - str));
+        return((int) (p1 - str));
 }
 
-/*)Function	int	fndext(str)
+/*)Function     int     fndext(str)
  *
- *		char *	str		file specification string
+ *              char *  str             file specification string
  *
- *	The function fndext() scans the file specification string
- *	to find the file.ext separater.
+ *      The function fndext() scans the file specification string
+ *      to find the file.ext separater.
  *
- *	fndext() returns the index to FSEPX or the end of the string.
+ *      fndext() returns the index to FSEPX or the end of the string.
  *
- *	local variables:
- *		char *	p1		temporary pointer
- *		char *	p2		temporary pointer
+ *      local variables:
+ *              char *  p1              temporary pointer
+ *              char *  p2              temporary pointer
  *
- *	global variables:
- *		none
+ *      global variables:
+ *              none
  *
- *	functions called:
- *		char *	strrchr()	c_library
+ *      functions called:
+ *              char *  strrchr()       c_library
  *
- *	side effects:
- *		none
+ *      side effects:
+ *              none
  */
 
 int
 fndext(str)
 char * str;
 {
-	char *p1, *p2;
+        char *p1, *p2;
 
-	/*
-	 * Find the file separator
-	 */
-	p1 = str + strlen(str);
-	if ((p2 = strrchr(str,  FSEPX)) != NULL) { p1 = p2; }
+        /*
+         * Find the file separator
+         */
+        p1 = str + strlen(str);
+        if ((p2 = strrchr(str,  FSEPX)) != NULL) { p1 = p2; }
 
-	return((int) (p1 - str));
+        return((int) (p1 - str));
 }
 
 /* sdld specific */
-/*)Function	VOID	iramsav()
+/*)Function     VOID    iramsav()
  *
- *	The function iramsav() stores the size of the chip's internal RAM.
- *	This is used after linking to check that variable assignment to this
- *	dataspace didn't overflow into adjoining segments.	Variables in the
- *	DSEG, OSEG, and ISEG are assigned to this dataspace.
- *
- *	local variables:
- *		none
- *
- *	global variables:
- *		char	*ip		pointer into the REL file
- *					text line in ib[]
- *		unsigned int		size of chip's internal
- *		iram_size		RAM segment
- *
- *	 functions called:
- *		int	getnb()		lklex.c
- *		VOID	unget()		lklex.c
- *		a_uint	expr()		lkeval.c
+ *      The function iramsav() stores the size of the chip's internal RAM.
+ *      This is used after linking to check that variable assignment to this
+ *      dataspace didn't overflow into adjoining segments.      Variables in the
+ *      DSEG, OSEG, and ISEG are assigned to this dataspace.
+ *
+ *      local variables:
+ *              none
+ *
+ *      global variables:
+ *              char    *ip             pointer into the REL file
+ *                                      text line in ib[]
+ *              unsigned int            size of chip's internal
+ *              iram_size               RAM segment
+ *
+ *       functions called:
+ *              int     getnb()         lklex.c
+ *              VOID    unget()         lklex.c
+ *              a_uint  expr()          lkeval.c
  *
- *	side effects:
- *		The iram_size may be modified.
+ *      side effects:
+ *              The iram_size may be modified.
  */
 
 VOID
@@ -1636,11 +1587,11 @@
 {
   unget(getnb());
   if (ip && *ip)
-	iram_size = expr(0);	/* evaluate size expression */
+        iram_size = expr(0);    /* evaluate size expression */
   else
-	iram_size = 128;		/* Default is 128 (0x80) bytes */
+        iram_size = 128;                /* Default is 128 (0x80) bytes */
   if ((iram_size<=0) || (iram_size>256))
-	iram_size = 128;		/* Default is 128 (0x80) bytes */
+        iram_size = 128;                /* Default is 128 (0x80) bytes */
 }
 
 /*Similar to iramsav but for xram memory*/
@@ -1649,9 +1600,9 @@
 {
   unget(getnb());
   if (ip && *ip)
-	xram_size = expr(0);	/* evaluate size expression */
+        xram_size = expr(0);    /* evaluate size expression */
   else
-	xram_size = rflag?0x1000000:0x10000;
+        xram_size = rflag?0x1000000:0x10000;
 }
 
 /*Similar to iramsav but for code memory*/
@@ -1660,31 +1611,31 @@
 {
   unget(getnb());
   if (ip && *ip)
-	code_size = expr(0);	/* evaluate size expression */
+        code_size = expr(0);    /* evaluate size expression */
   else
-	code_size = rflag?0x1000000:0x10000;
+        code_size = rflag?0x1000000:0x10000;
 }
 
 
-/*)Function	VOID	iramcheck()
+/*)Function     VOID    iramcheck()
  *
- *	The function iramcheck() is used at the end of linking to check that
- *	the internal RAM area wasn't overflowed by too many variable
- *	assignments.  Variables in the DSEG, ISEG, and OSEG are assigned to
- *	the chip's internal RAM.
+ *      The function iramcheck() is used at the end of linking to check that
+ *      the internal RAM area wasn't overflowed by too many variable
+ *      assignments.  Variables in the DSEG, ISEG, and OSEG are assigned to
+ *      the chip's internal RAM.
  *
- *	local variables:
- *		none
+ *      local variables:
+ *              none
  *
- *	global variables:
- *		unsigned int		size of chip's internal
- *		iram_size		RAM segment
- *		struct area		linked list of memory
- *		*areap			areas
+ *      global variables:
+ *              unsigned int            size of chip's internal
+ *              iram_size               RAM segment
+ *              struct area             linked list of memory
+ *              *areap                  areas
  *
- *	 functions called:
+ *       functions called:
  *
- *	side effects:
+ *      side effects:
  */
 
 VOID
@@ -1694,252 +1645,252 @@
   register struct area *ap;
 
   for (ap = areap; ap; ap=ap->a_ap) {
-	if ((ap->a_size != 0) &&
-		(!strcmp(ap->a_id, "DSEG") ||
-		 !strcmp(ap->a_id, "OSEG") ||
-		 !strcmp(ap->a_id, "ISEG")
-		)
-	   )
-	{
-	  last_addr = ap->a_addr + ap->a_size - 1;
-	  if (last_addr >= iram_size)
-		fprintf(stderr,
-		  "\nWARNING! Segment %s extends past the end\n"
-		  "         of internal RAM.  Check map file.\n",
-		  ap->a_id);
-	}
+        if ((ap->a_size != 0) &&
+                (!strcmp(ap->a_id, "DSEG") ||
+                 !strcmp(ap->a_id, "OSEG") ||
+                 !strcmp(ap->a_id, "ISEG")
+                )
+           )
+        {
+          last_addr = ap->a_addr + ap->a_size - 1;
+          if (last_addr >= iram_size)
+                fprintf(stderr,
+                  "\nWARNING! Segment %s extends past the end\n"
+                  "         of internal RAM.  Check map file.\n",
+                  ap->a_id);
+        }
   }
 }
 /* end sdld specific */
 
 char *usetxt[] = {
-	"Usage: [-Options] [-Option with arg] file",
-	"Usage: [-Options] [-Option with arg] outfile file1 [file2 ...]",
-	"Startup:",
-	"  -p   Echo commands to stdout (default)",
-	"  -n   No echo of commands to stdout",
-	"Alternates to Command Line Input:",
-	"  -c                   ASlink >> prompt input",
-	"  -f   file[.lk]       Command File input",
-	"Libraries:",
-	"  -k   Library path specification, one per -k",
-	"  -l   Library file specification, one per -l",
-	"Relocation:",
-	"  -b   area base address = expression",
-	"  -g   global symbol = expression",
-	"Map format:",
-	"  -m   Map output generated as (out)file[.map]",
-	"  -w   Wide listing format for map file",
-	"  -x   Hexadecimal (default)",
-	"  -d   Decimal",
-	"  -q   Octal",
-	"Output:",
-	"  -i   Intel Hex as (out)file[.ihx]",
-	"  -s   Motorola S Record as (out)file[.s19]",
-//	"  -t   Tandy CoCo Disk BASIC binary as (out)file[.bi-]",
+        "Usage: [-Options] [-Option with arg] file",
+        "Usage: [-Options] [-Option with arg] outfile file1 [file2 ...]",
+        "Startup:",
+        "  -p   Echo commands to stdout (default)",
+        "  -n   No echo of commands to stdout",
+        "Alternates to Command Line Input:",
+        "  -c                   ASlink >> prompt input",
+        "  -f   file[.lk]       Command File input",
+        "Libraries:",
+        "  -k   Library path specification, one per -k",
+        "  -l   Library file specification, one per -l",
+        "Relocation:",
+        "  -b   area base address = expression",
+        "  -g   global symbol = expression",
+        "Map format:",
+        "  -m   Map output generated as (out)file[.map]",
+        "  -w   Wide listing format for map file",
+        "  -x   Hexadecimal (default)",
+        "  -d   Decimal",
+        "  -q   Octal",
+        "Output:",
+        "  -i   Intel Hex as (out)file[.ihx]",
+        "  -s   Motorola S Record as (out)file[.s19]",
+//      "  -t   Tandy CoCo Disk BASIC binary as (out)file[.bi-]",
 #if NOICE
-	"  -j   NoICE Debug output as (out)file[.noi]",
+        "  -j   NoICE Debug output as (out)file[.noi]",
 #endif
 #if SDCDB
-	"  -y   SDCDB Debug output as (out)file[.cdb]",
+        "  -y   SDCDB Debug output as (out)file[.cdb]",
 #endif
-//	"  -o   Linked file/library object output enable (default)",
-//	"  -v   Linked file/library object output disable",
-	"List:",
-	"  -u   Update listing file(s) with link data as file(s)[.rst]",
-	"Case Sensitivity:",
-	"  -z   Disable Case Sensitivity for Symbols",
-	"End:",
-	"  -e   or null line terminates input",
-	"",
-	0
+//      "  -o   Linked file/library object output enable (default)",
+//      "  -v   Linked file/library object output disable",
+        "List:",
+        "  -u   Update listing file(s) with link data as file(s)[.rst]",
+        "Case Sensitivity:",
+        "  -z   Disable Case Sensitivity for Symbols",
+        "End:",
+        "  -e   or null line terminates input",
+        "",
+        0
 };
 
 char *usetxt_8051[] = {
-	"Usage: [-Options] [-Option with arg] file",
-	"Usage: [-Options] [-Option with arg] outfile file1 [file2 ...]",
-	"Startup:",
-	"  -p   Echo commands to stdout (default)",
-	"  -n   No echo of commands to stdout",
-	"Alternates to Command Line Input:",
-	"  -c                   ASlink >> prompt input",
-	"  -f   file[.lk]       Command File input",
-	"Libraries:",
-	"  -k   Library path specification, one per -k",
-	"  -l   Library file specification, one per -l",
-	"Relocation:",
-	"  -b   area base address = expression",
-	"  -g   global symbol = expression",
-	"Map format:",
-	"  -m   Map output generated as (out)file[.map]",
-	"  -w   Wide listing format for map file",
-	"  -x   Hexadecimal (default)",
-	"  -d   Decimal",
-	"  -q   Octal",
-	"Output:",
-	"  -i   Intel Hex as (out)file[.ihx]",
-	"  -s   Motorola S Record as (out)file[.s19]",
+        "Usage: [-Options] [-Option with arg] file",
+        "Usage: [-Options] [-Option with arg] outfile file1 [file2 ...]",
+        "Startup:",
+        "  -p   Echo commands to stdout (default)",
+        "  -n   No echo of commands to stdout",
+        "Alternates to Command Line Input:",
+        "  -c                   ASlink >> prompt input",
+        "  -f   file[.lk]       Command File input",
+        "Libraries:",
+        "  -k   Library path specification, one per -k",
+        "  -l   Library file specification, one per -l",
+        "Relocation:",
+        "  -b   area base address = expression",
+        "  -g   global symbol = expression",
+        "Map format:",
+        "  -m   Map output generated as (out)file[.map]",
+        "  -w   Wide listing format for map file",
+        "  -x   Hexadecimal (default)",
+        "  -d   Decimal",
+        "  -q   Octal",
+        "Output:",
+        "  -i   Intel Hex as (out)file[.ihx]",
+        "  -s   Motorola S Record as (out)file[.s19]",
 #if NOICE
-	"  -j   NoICE Debug output as (out)file[.noi]",
+        "  -j   NoICE Debug output as (out)file[.noi]",
 #endif
 #if SDCDB
-	"  -y   SDCDB Debug output as (out)file[.cdb]",
+        "  -y   SDCDB Debug output as (out)file[.cdb]",
 #endif
-	"List:",
-	"  -u   Update listing file(s) with link data as file(s)[.rst]",
-	"Case Sensitivity:",
-	"  -z   Disable Case Sensitivity for Symbols",
-	"Miscellaneous:\n"
-	"  -I   [iram-size] Check for internal RAM overflow",
-	"  -X   [xram-size] Check for external RAM overflow",
-	"  -C   [code-size] Check for code overflow",
-	"  -M   Generate memory usage summary file[.mem]",
-	"  -Y   Pack internal ram",
-	"  -S   [stack-size] Allocate space for stack",
-	"End:",
-	"  -e   or null line terminates input",
-	"",
-	0
+        "List:",
+        "  -u   Update listing file(s) with link data as file(s)[.rst]",
+        "Case Sensitivity:",
+        "  -z   Disable Case Sensitivity for Symbols",
+        "Miscellaneous:\n"
+        "  -I   [iram-size] Check for internal RAM overflow",
+        "  -X   [xram-size] Check for external RAM overflow",
+        "  -C   [code-size] Check for code overflow",
+        "  -M   Generate memory usage summary file[.mem]",
+        "  -Y   Pack internal ram",
+        "  -S   [stack-size] Allocate space for stack",
+        "End:",
+        "  -e   or null line terminates input",
+        "",
+        0
 };
 
 char *usetxt_6808[] = {
-	"Usage: [-Options] [-Option with arg] file",
-	"Usage: [-Options] [-Option with arg] outfile file1 [file2 ...]",
-	"Startup:",
-	"  -p   Echo commands to stdout (default)",
-	"  -n   No echo of commands to stdout",
-	"Alternates to Command Line Input:",
-	"  -c                   ASlink >> prompt input",
-	"  -f   file[.lk]       Command File input",
-	"Libraries:",
-	"  -k   Library path specification, one per -k",
-	"  -l   Library file specification, one per -l",
-	"Relocation:",
-	"  -b   area base address = expression",
-	"  -g   global symbol = expression",
-	"Map format:",
-	"  -m   Map output generated as (out)file[.map]",
-	"  -w   Wide listing format for map file",
-	"  -x   Hexadecimal (default)",
-	"  -d   Decimal",
-	"  -q   Octal",
-	"Output:",
-	"  -i   Intel Hex as (out)file[.ihx]",
-	"  -s   Motorola S Record as (out)file[.s19]",
-	"  -E   ELF executable as file[.elf]",
+        "Usage: [-Options] [-Option with arg] file",
+        "Usage: [-Options] [-Option with arg] outfile file1 [file2 ...]",
+        "Startup:",
+        "  -p   Echo commands to stdout (default)",
+        "  -n   No echo of commands to stdout",
+        "Alternates to Command Line Input:",
+        "  -c                   ASlink >> prompt input",
+        "  -f   file[.lk]       Command File input",
+        "Libraries:",
+        "  -k   Library path specification, one per -k",
+        "  -l   Library file specification, one per -l",
+        "Relocation:",
+        "  -b   area base address = expression",
+        "  -g   global symbol = expression",
+        "Map format:",
+        "  -m   Map output generated as (out)file[.map]",
+        "  -w   Wide listing format for map file",
+        "  -x   Hexadecimal (default)",
+        "  -d   Decimal",
+        "  -q   Octal",
+        "Output:",
+        "  -i   Intel Hex as (out)file[.ihx]",
+        "  -s   Motorola S Record as (out)file[.s19]",
+        "  -E   ELF executable as file[.elf]",
 #if NOICE
-	"  -j   NoICE Debug output as (out)file[.noi]",
+        "  -j   NoICE Debug output as (out)file[.noi]",
 #endif
 #if SDCDB
-	"  -y   SDCDB Debug output as (out)file[.cdb]",
+        "  -y   SDCDB Debug output as (out)file[.cdb]",
 #endif
-	"List:",
-	"  -u   Update listing file(s) with link data as file(s)[.rst]",
-	"Case Sensitivity:",
-	"  -z   Disable Case Sensitivity for Symbols",
-	"Miscellaneous:\n"
-	"  -I   [iram-size] Check for internal RAM overflow",
-	"  -X   [xram-size] Check for external RAM overflow",
-	"  -C   [code-size] Check for code overflow",
-	"  -M   Generate memory usage summary file[.mem]",
-	"End:",
-	"  -e   or null line terminates input",
-	"",
-	0
+        "List:",
+        "  -u   Update listing file(s) with link data as file(s)[.rst]",
+        "Case Sensitivity:",
+        "  -z   Disable Case Sensitivity for Symbols",
+        "Miscellaneous:\n"
+        "  -I   [iram-size] Check for internal RAM overflow",
+        "  -X   [xram-size] Check for external RAM overflow",
+        "  -C   [code-size] Check for code overflow",
+        "  -M   Generate memory usage summary file[.mem]",
+        "End:",
+        "  -e   or null line terminates input",
+        "",
+        0
 };
 
 char *usetxt_z80_gb[] = {
-	"Usage: [-Options] [-Option with arg] file",
-	"Usage: [-Options] [-Option with arg] outfile file1 [file2 ...]",
-	"Startup:",
-	"  -p   Echo commands to stdout (default)",
-	"  -n   No echo of commands to stdout",
-	"Alternates to Command Line Input:",
-	"  -c                   ASlink >> prompt input",
-	"  -f   file[.lk]       Command File input",
-	"Libraries:",
-	"  -k   Library path specification, one per -k",
-	"  -l   Library file specification, one per -l",
-	"Relocation:",
-	"  -b   area base address = expression",
-	"  -g   global symbol = expression",
-	"Map format:",
-	"  -m   Map output generated as (out)file[.map]",
-	"  -w   Wide listing format for map file",
-	"  -x   Hexadecimal (default)",
-	"  -d   Decimal",
-	"  -q   Octal",
-	"Output:",
-	"  -i   Intel Hex as (out)file[.ihx]",
-	"  -s   Motorola S Record as (out)file[.s19]",
+        "Usage: [-Options] [-Option with arg] file",
+        "Usage: [-Options] [-Option with arg] outfile file1 [file2 ...]",
+        "Startup:",
+        "  -p   Echo commands to stdout (default)",
+        "  -n   No echo of commands to stdout",
+        "Alternates to Command Line Input:",
+        "  -c                   ASlink >> prompt input",
+        "  -f   file[.lk]       Command File input",
+        "Libraries:",
+        "  -k   Library path specification, one per -k",
+        "  -l   Library file specification, one per -l",
+        "Relocation:",
+        "  -b   area base address = expression",
+        "  -g   global symbol = expression",
+        "Map format:",
+        "  -m   Map output generated as (out)file[.map]",
+        "  -w   Wide listing format for map file",
+        "  -x   Hexadecimal (default)",
+        "  -d   Decimal",
+        "  -q   Octal",
+        "Output:",
+        "  -i   Intel Hex as (out)file[.ihx]",
+        "  -s   Motorola S Record as (out)file[.s19]",
 #if SDCDB
-	"  -y   SDCDB Debug output as (out)file[.cdb]",
+        "  -y   SDCDB Debug output as (out)file[.cdb]",
 #endif
-	"List:",
-	"  -u   Update listing file(s) with link data as file(s)[.rst]",
-	"Case Sensitivity:",
-	"  -z	Disable Case Sensitivity for Symbols",
-	"End:",
-	"  -e   or null line terminates input",
-	"",
-	0
+        "List:",
+        "  -u   Update listing file(s) with link data as file(s)[.rst]",
+        "Case Sensitivity:",
+        "  -z   Disable Case Sensitivity for Symbols",
+        "End:",
+        "  -e   or null line terminates input",
+        "",
+        0
 };
 
-/*)Function	VOID	usage(n)
+/*)Function     VOID    usage(n)
  *
- *		int	n		exit code
+ *              int     n               exit code
  *
- *	The function usage() outputs to the stderr device the
- *	linker name and version and a list of valid linker options.
+ *      The function usage() outputs to the stderr device the
+ *      linker name and version and a list of valid linker options.
  *
- *	local variables:
- *		char ** dp		pointer to an array of
- *					text string pointers.
+ *      local variables:
+ *              char ** dp              pointer to an array of
+ *                                      text string pointers.
  *
- *	global variables:
- *		FILE *	stderr		c_library
+ *      global variables:
+ *              FILE *  stderr          c_library
  *
- *	functions called:
- *		int	fprintf()	c_library
+ *      functions called:
+ *              int     fprintf()       c_library
  *
- *	side effects:
- *		none
+ *      side effects:
+ *              none
  */
 
 VOID
 usage(int n)
 {
-	char	**dp;
+        char    **dp;
 
-	/* sdld specific */
-	fprintf(stderr, "\n%s Linker %s\n\n", is_sdld() ? "sdld" : "ASxxxx", VERSION);
-	for (dp = TARGET_IS_8051 ? usetxt_8051 : (TARGET_IS_6808 ? usetxt_6808 : ((TARGET_IS_Z80 || TARGET_IS_GB) ? usetxt_z80_gb : usetxt)); *dp; dp++)
-		fprintf(stderr, "%s\n", *dp);
-	/* end sdld specific */
-	lkexit(n);
+        /* sdld specific */
+        fprintf(stderr, "\n%s Linker %s\n\n", is_sdld() ? "sdld" : "ASxxxx", VERSION);
+        for (dp = TARGET_IS_8051 ? usetxt_8051 : (TARGET_IS_6808 ? usetxt_6808 : ((TARGET_IS_Z80 || TARGET_IS_GB) ? usetxt_z80_gb : usetxt)); *dp; dp++)
+                fprintf(stderr, "%s\n", *dp);
+        /* end sdld specific */
+        lkexit(n);
 }
 
-/*)Function	VOID	copyfile()
+/*)Function     VOID    copyfile()
  *
- *		FILE	*dest		destination file
- *		FILE	*src		source file
+ *              FILE    *dest           destination file
+ *              FILE    *src            source file
  *
- *		function will copy source file to destination file
+ *              function will copy source file to destination file
  *
  *
- *	functions called:
- *		int	fgetc()			c_library
- *		int	fputc()			c_library
+ *      functions called:
+ *              int     fgetc()                 c_library
+ *              int     fputc()                 c_library
  *
- *	side effects:
- *		none
+ *      side effects:
+ *              none
  */
 VOID
 copyfile (FILE *dest, FILE *src)
 {
-	int ch;
+        int ch;
 
-	while ((ch = fgetc(src)) != EOF) {
-		fputc(ch,dest);
-	}
+        while ((ch = fgetc(src)) != EOF) {
+                fputc(ch,dest);
+        }
 }
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/lkmem.c sdcc-3.2.0+dfsg/sdas/linksrc/lkmem.c
--- sdcc-3.1.0+dfsg/sdas/linksrc/lkmem.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/lkmem.c	2011-12-03 23:42:25.000000000 +0000
@@ -614,8 +614,8 @@
 
     /*Report the position of the begining of the stack*/
     if(Stack_Start!=256)
-        fprintf(of, "\n%stack starts at: 0x%02lx (sp set to 0x%02lx) with %ld bytes available.",
-            rflag ? "16 bit mode initial s" : "S", Stack_Start, Stack_Start-1, Stack_Size);
+        fprintf(of, "\n%s starts at: 0x%02lx (sp set to 0x%02lx) with %ld bytes available.",
+            rflag ? "16 bit mode initial stack" : "Stack", Stack_Start, Stack_Start-1, Stack_Size);
     else
         fprintf(of, "\nI don't have a clue where the stack ended up! Sorry...");
 
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/lknoice.c sdcc-3.2.0+dfsg/sdas/linksrc/lknoice.c
--- sdcc-3.1.0+dfsg/sdas/linksrc/lknoice.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/lknoice.c	2011-12-06 23:01:37.000000000 +0000
@@ -27,101 +27,267 @@
  * 31-Oct-1997 by John Hartman
  * 30-Jan-98 JLH add page to DefineNoICE for 8051
  *  2-Feb-98 JLH Allow optional .nest on local vars - C scoping rules...
+ * 27-May-01 ARB Updated for ASxxxx V4
  */
 
 #include "aslink.h"
 
-static void DefineGlobal( char *name, a_uint value, int page );
-static void DefineScoped( char *name, a_uint value, int page );
-static void DefineFile( char *name, a_uint value, int page );
-static void DefineFunction( char *name, a_uint value, int page );
-static void DefineStaticFunction( char *name, a_uint value, int page );
-static void DefineEndFunction( a_uint value, int page );
-static void DefineLine( char *lineString, a_uint value, int page );
-static void PagedAddress( a_uint value, int page );
-
-/*)Function	VOID	NoICEfopen()
- * 
- *	The function NoICEfile() opens the NoICE output file
- *	and sets the map flag, mflag, to create a map file.
- *	NoICE processing is performed during map generation.
- *
- *	local variables:
- *		none
- *
- *	global variables:
- *		int	jflag		NoICE Debug flag
- *		FILE *	jfp		NoICE Debug File handle
- *		struct lfile *linkp	Pointer to the Linker output file name
- *		int	mflag		Map output flag
- *
- *	functions called:
- *		FILE *	afile()		lkmain.c
- *		VOID	lkexit()	lkmain.c
- *
- *	side effects:
- *		The NoICE output file is opened.
- *		Failure to open the file will
- *		terminate the linker.
+
+#if NOICE
+
+/*Module        lknoice.c
+ *
+ *      The module lknoice.c contains the functions
+ *      required to create a NoICE debug file.
+ *
+ *      lknoice.c contains the following functions:
+ *              VOID    NoICEfopen()
+ *              VOID    NoICEmagic()
+ *              VOID    DefineNoICE()
+ *              VOID    DefineGlobal()
+ *              VOID    DefineScoped()
+ *              VOID    DefineFile()
+ *              VOID    DefineFunction()
+ *              VOID    DefineStaticFunction()
+ *              VOID    DefineEndFunction()
+ *              VOID    DefineLine()
+ *              VOID    PagedAddress()
+ *
+ *      lknoice.c contains these local variables:
+ *              struct noicebn *noicebnp        pointer to linked structure of
+ *                                              ';!FILE' specifications
+ *              char currentFile[]              file being processed
+ *              char currentFunction[]          function being processed
+ */
+
+struct  noicefn {
+        struct  noicefn *n_np;  /* noicefn link */
+        char *  n_id;           /* file name */
+};
+
+static struct noicefn *noicefnp = NULL;
+
+static char currentFile[NCPS];
+static char currentFunction[NCPS];
+
+
+/*)Function     VOID    NoICEfopen()
+ *
+ *      The function NoICEfopen() opens the NoICE output file
+ *      and sets the map flag, mflag, to create a map file.
+ *      NoICE processing is performed during map generation.
+ *
+ *      local variables:
+ *              none
+ *
+ *      global variables:
+ *              int     jflag           NoICE Debug flag
+ *              FILE *  jfp             NoICE Debug File handle
+ *              struct lfile *linkp     Pointer to the Linker output file name
+ *              int     mflag           Map output flag
+ *
+ *      functions called:
+ *              FILE *  afile()         lkmain.c
+ *              VOID    lkexit()        lkmain.c
+ *
+ *      side effects:
+ *              The NoICE output file is opened.
+ *              Failure to open the file will
+ *              terminate the linker.
  */
 
 VOID NoICEfopen(void)
 {
-	if (jflag) {
-		jfp = afile(linkp->f_idp, "noi", 1);
-		if (jfp == NULL) {
-			lkexit(1);
-		}
-		mflag = 1;
-	}
+        if (jflag) {
+                jfp = afile(linkp->f_idp, "noi", 1);
+                if (jfp == NULL) {
+                        lkexit(1);
+                }
+                mflag = 1;
+        }
+}
+
+
+/*)Function     VOID    NoICEmagic()
+ *
+ *      The function NoICEmagic() passes any "magic Comments"
+ *      to the NoICE output file.  Magic comments are those
+ *      beginning with ";!".  Also a linked list of file names
+ *      specified in ";!FILE" magic comments is created.  These
+ *      file names are used to verify that symbols in the
+ *      ASxxxx .rel files of the form str1.str2 are NoICE symbols.
+ *
+ *      local variables:
+ *              char    id[]            id string
+ *              struct noicefn * np     pointer to new structure
+ *              char *  p1              temporary string pointer
+ *              char *  p2              temporary string pointer
+ *              struct noicefn * tnp    temporary pointer to noicefn structure
+ *
+ *      global variables:
+ *              char *  ip              position into the current
+ *                                      input text line
+ *              FILE *  jfp             NoICE Debug File handle
+ *
+ *      functions called:
+ *              VOID    getid()         lklex.c
+ *              VOID *  new()           lksym.c
+ *              int     fprintf()       c_library
+ *              char *  strrchr()       c_library
+ *              char *  strsto()        lksym.c
+ *              int     symeq()         lksym.c
+ *
+ *      side effects:
+ *              The NoICE "magic comments" are passed
+ *              to the output file.  A list of assembler
+ *              file names is created.
+ */
+
+VOID NoICEmagic(void)
+{
+        char id[NCPS];
+        char *p1, *p2;
+        struct noicefn *np, *tnp;
+
+        /*
+         * Pass any "magic comments" to NoICE output
+         */
+        if ((ip[0] == ';') && (ip[1] == '!')) {
+                if (jfp) {
+                        fprintf(jfp, "%s\n", &ip[2]);
+                }
+                if (pass == 0) {
+                        getid(id, -1);
+                        if (symeq(id, ";!FILE", 1)) {
+                                getid(id, -1);
+                                /*
+                                 * The name starts after the last
+                                 * '/' (Unices) or
+                                 * ':' or '\' (DOS)
+                                 *
+                                 * and ends at the last
+                                 * separator 'FSEPX'
+                                 */
+                                p1 = id;
+                                if ((p2 = strrchr(p1,  '\\')) != NULL)  p1 = ++p2;
+                                if ((p2 = strrchr(p1,   '/')) != NULL)  p1 = ++p2;
+                                if ((p2 = strrchr(p1,   ':')) != NULL)  p1 = ++p2;
+                                if ((p2 = strrchr(p1, FSEPX)) != NULL) *p2 = 0;
+
+                                np = (struct noicefn *) new (sizeof(struct noicefn));
+                                if (noicefnp == NULL) {
+                                        noicefnp = np;
+                                } else {
+                                        tnp = noicefnp;
+                                        while (tnp->n_np)
+                                                tnp = tnp->n_np;
+                                        tnp->n_np = np;
+                                }
+                                np->n_id = strsto(p1);
+                        }
+                }
+        }
 }
 
-/*
- * Called from lstarea in lklist.c for each symbol.
+
+/*)Function     VOID    DefineNoICE()
+ *
+ *              char *          name    pointer to the symbol string
+ *              a_uint          value   value of symbol
+ *              struct bank *   yp      pointer to associated bank
+ *
+ *      The function DefineNoICE() processes the symbols into
+ *      NoICE commands for inclusion in the NoICE output file.
+ *
+ *      The function is called from lstarea in lklist.c
+ *      for each symbol.
+ *
+ *      local variables:
+ *              int     j               parsed argument count
+ *              int     k               parsed argument count
+ *              int     level           function level
+ *              char    token1[]        parsed string
+ *              char    token2[]        parsed string
+ *              char    token2[]        parsed string
+ *              char    sep1            parsed character
+ *              char    sep2            parsed character
+ *              struct noicefn * tnp    temporary pointer to noicefn structure
  *
- * Generates appropriate NoICE commands into output file, if any is open
+ *      global variables:
+ *              FILE *  jfp             NoICE Debug File handle
  *
+ *      functions called:
+ *              VOID    DefineFile()            lknoice.c
+ *              VOID    DefineFunction()        lknoice.c
+ *              VOID    DefineStaticFunction()  lknoice.c
+ *              VOID    DefineEndFunction()     lknoice.c
+ *              VOID    DefineScoped()          lknoice.c
+ *              VOID    DefineLine()            lknoice.c
+ *              VOID    DefineGlobal()          lknoice.c
+ *              VOID    PagedAddress()          lknoice.c
+ *              int     sprintf()               c_library
+ *              int     sscanf()                c_library
+ *              int     symeq()                 lksym.c
+ *
+ *      side effects:
+ *              NoICE debug commands are placed
+ *              into the output file.
  */
 
-void DefineNoICE( char *name, a_uint value, int page )
+void DefineNoICE( char *name, a_uint value, struct bank *yp )
 {
         char token1[NCPS];                      /* parse for file.function.symbol */
         char token2[NCPS];
         char token3[NCPS];
         char sep1, sep2;
-        int  j, level;
+        int  j, k, level;
+        struct noicefn *np;
 
         /* no output if file is not open */
         if (jfp == NULL) return;
 
         j = sscanf( name, "%[^.]%c%[^.]%c%s", token1, &sep1, token2, &sep2, token3 );
+        if (j > 1) {
+                /* verify that first token is a file name */
+                k = 1;
+                np = noicefnp;
+                while (np != NULL) {
+                        if (symeq(token1, np->n_id, 1)) {
+                                k = j;
+                                break;
+                        }
+                        np = np->n_np;
+                }
+                j = k;
+        }
+
         switch (j)
         {
                 /* file.function.symbol, or file.function..SPECIAL */
                 case 5:
-                        DefineFile( token1, 0, 0 );
+                        DefineFile( token1, 0, NULL );
                         if (token3[0] == '.')
                         {
                                 if (symeq( token3, ".FN", 1 ) != 0)
                                 {
                                         /* Global function */
-                                        DefineFunction( token2, value, page );
+                                        DefineFunction( token2, value, yp );
                                 }
                                 else if (symeq( token3, ".SFN", 1 ) != 0)
                                 {
                                         /* Static (file-scope) function */
-                                        DefineStaticFunction( token2, value, page );
+                                        DefineStaticFunction( token2, value, yp );
                                 }
                                 else if (symeq( token3, ".EFN", 1 ) != 0)
                                 {
                                         /* End of function */
-                                        DefineEndFunction( value, page );
+                                        DefineEndFunction( value, yp );
                                 }
                         }
                         else
                         {
                                 /* Function-scope var. */
-                                DefineFunction( token2, 0, 0 );
+                                DefineFunction( token2, 0, NULL );
 
                                 /* Look for optional level integer */
                                 j = sscanf( token3, "%[^.]%c%u", token1, &sep1, &level );
@@ -129,72 +295,133 @@
                                 {
                                         sprintf( &token1[ strlen(token1) ], "_%u", level );
                                 }
-                                DefineScoped( token1, value, page );
+                                DefineScoped( token1, value, yp );
                         }
                         break;
 
                 /* either file.symbol or file.line# */
                 case 3:
-                        DefineFile( token1, 0, 0 );
+                        DefineFile( token1, 0, NULL );
                         if ((token2[0] >= '0') && (token2[0] <= '9'))
                         {
                                 /* Line number */
-                                DefineLine( token2, value, page );
+                                DefineLine( token2, value, yp );
                         }
                         else
                         {
                                 /* File-scope symbol.  (Kill any function) */
-                                DefineEndFunction( 0, 0 );
-                                DefineScoped( token2, value, page );
+                                DefineEndFunction( 0, NULL );
+                                DefineScoped( token2, value, yp );
                         }
                         break;
 
                 /* NoICE file.func. is illegal */
                 case 4:
-                        break;
 
                 /* NoICE symbol. is illegal */
                 case 2:
-                        break;
 
                 /* just a symbol */
                 case 1:
-                        DefineGlobal( token1, value, page );
+
+                /* NoICE .symbol is illegal */
+                case 0:
+                default:
+                        DefineGlobal( name, value, yp );
                         break;
         }
 }
 
-static char currentFile[NCPS];
-static char currentFunction[NCPS];
 
-/*
- * static function:
- * Define "name" as a global symbol
+/*)Function     VOID    DefineGlobal()
+ *
+ *              char *          name    pointer to the symbol string
+ *              a_uint          value   value of symbol
+ *              struct bank *   yp      pointer to associated bank
+ *
+ *      The function DefineGlobal() places a DEF statement
+ *      in the .noi debug file for the global symbol.
+ *
+ *      local variables:
+ *              none
+ *
+ *      global variables:
+ *              FILE *  jfp             NoICE Debug File handle
+ *
+ *      functions called:
+ *              int     fprintf()       c_library
+ *              VOID    PagedAddress()  lknoice.c
+ *
+ *      side effects:
+ *              A global symbol definition is
+ *              placed in the .noi debug file.
  */
 
-void DefineGlobal( char *name, a_uint value, int page )
+void DefineGlobal( char *name, a_uint value, struct bank *yp )
 {
         fprintf( jfp, "DEF %s ", name );
-        PagedAddress( value, page );
+        PagedAddress( value, yp );
 }
 
-/*
- * static function:
- * Define "name" as a static (scoped) symbol
+
+/*)Function     VOID    DefineScoped()
+ *
+ *              char *          name    pointer to the symbol string
+ *              a_uint          value   value of symbol
+ *              struct bank *   yp      pointer to associated bank
+ *
+ *      The function DefineScoped() places a DEFS statement
+ *      in the .noi debug file for the scoped symbol.
+ *
+ *      local variables:
+ *              none
+ *
+ *      global variables:
+ *              FILE *  jfp             NoICE Debug File handle
+ *
+ *      functions called:
+ *              int     fprintf()       c_library
+ *              VOID    PagedAddress()  lknoice.c
+ *
+ *      side effects:
+ *              A scoped symbol definition is
+ *              placed in the .noi debug file.
  */
 
-void DefineScoped( char *name, a_uint value, int page )
+void DefineScoped( char *name, a_uint value, struct bank *yp )
 {
         fprintf( jfp, "DEFS %s ", name );
-        PagedAddress( value, page );
+        PagedAddress( value, yp );
 }
 
-/*
- * static function:
- * Define "name" as the current file
+
+/*)Function     VOID    DefineFile()
+ *
+ *              char *          name    pointer to the symbol string
+ *              a_uint          value   value of symbol
+ *              struct bank *   yp      pointer to associated bank
+ *
+ *      The function DefineFile() places a FILE statement
+ *      in the .noi debug file for the processed file.
+ *
+ *      local variables:
+ *              none
+ *
+ *      global variables:
+ *              FILE *  jfp             NoICE Debug File handle
+ *
+ *      functions called:
+ *              int     fprintf()       c_library
+ *              VOID    PagedAddress()  lknoice.c
+ *              char *  strcpy()        c_library
+ *              int     symeq()         lksym.c
+ *
+ *      side effects:
+ *              A file name definition is
+ *              placed in the .noi debug file.
  */
 
-void DefineFile( char *name, a_uint value, int page )
+void DefineFile( char *name, a_uint value, struct bank *yp )
 {
         if (symeq( name, currentFile, 1 ) == 0)
         {
@@ -202,7 +429,7 @@
                 if (value != 0)
                 {
                         fprintf( jfp, "FILE %s ", name );
-                        PagedAddress( value, page );
+                        PagedAddress( value, yp );
                 }
                 else
                 {
@@ -211,12 +438,36 @@
         }
 }
 
-/*
- * static function:
- * Define "name" as the current function
+
+/*)Function     VOID    DefineFunction()
+ *
+ *              char *          name    pointer to the symbol string
+ *              a_uint          value   value of symbol
+ *              struct bank *   yp      pointer to associated bank
+ *
+ *      The function DefineFunction() places a FUNC statement
+ *      in the .noi debug file for the processed symbol.  If
+ *      a vaulue is present then a preceeding DEF statement is
+ *      also placed in the .noi debug file.
+ *
+ *      local variables:
+ *              none
+ *
+ *      global variables:
+ *              FILE *  jfp             NoICE Debug File handle
+ *
+ *      functions called:
+ *              int     fprintf()       c_library
+ *              VOID    PagedAddress()  lknoice.c
+ *              char *  strcpy()        c_library
+ *              int     symeq()         lksym.c
+ *
+ *      side effects:
+ *              A function definition is
+ *              placed in the .noi debug file.
  */
 
-void DefineFunction( char *name, a_uint value, int page )
+void DefineFunction( char *name, a_uint value, struct bank *yp )
 {
         if (symeq( name, currentFunction, 1 ) == 0)
         {
@@ -224,9 +475,9 @@
                 if (value != 0)
                 {
                         fprintf( jfp, "DEF %s ", name );
-                        PagedAddress( value, page );
+                        PagedAddress( value, yp );
                         fprintf( jfp, "FUNC %s ", name );
-                        PagedAddress( value, page );
+                        PagedAddress( value, yp );
                 }
                 else
                 {
@@ -235,12 +486,36 @@
         }
 }
 
-/*
- * static function:
- * Define "name" as the current static (scoped) function
+
+/*)Function     VOID    DefineStaticFunction()
+ *
+ *              char *          name    pointer to the symbol string
+ *              a_uint          value   value of symbol
+ *              struct bank *   yp      pointer to associated bank
+ *
+ *      The function DefineStaticFunction() places a SFUNC statement
+ *      in the .noi debug file for the processed file.  If
+ *      a value is present then a preceeding DEFS statement is
+ *      also placed in the .noi debug file.
+ *
+ *      local variables:
+ *              none
+ *
+ *      global variables:
+ *              FILE *  jfp             NoICE Debug File handle
+ *
+ *      functions called:
+ *              int     fprintf()       c_library
+ *              VOID    PagedAddress()  lknoice.c
+ *              char *  strcpy()        c_library
+ *              int     symeq()         lksym.c
+ *
+ *      side effects:
+ *              A static function definition is
+ *              placed in the .noi debug file.
  */
 
-void DefineStaticFunction( char *name, a_uint value, int page )
+void DefineStaticFunction( char *name, a_uint value, struct bank *yp )
 {
         if (symeq( name, currentFunction, 1 ) == 0)
         {
@@ -248,9 +523,9 @@
                 if (value != 0)
                 {
                         fprintf( jfp, "DEFS %s ", name );
-                        PagedAddress( value, page );
+                        PagedAddress( value, yp );
                         fprintf( jfp, "SFUNC %s ", name );
-                        PagedAddress( value, page );
+                        PagedAddress( value, yp );
                 }
                 else
                 {
@@ -259,19 +534,41 @@
         }
 }
 
-/*
- * static function:
- * Define the end of the current function
+
+/*)Function     VOID    DefineEndFunction()
+ *
+ *              char *          name    pointer to the symbol string
+ *              a_uint          value   value of symbol
+ *              struct bank *   yp      pointer to associated bank
+ *
+ *      The function DefineEndFunction() places an ENDF statement
+ *      in the .noi debug file for the processed file.
+ *
+ *      local variables:
+ *              none
+ *
+ *      global variables:
+ *              FILE *  jfp             NoICE Debug File handle
+ *
+ *      functions called:
+ *              int     fprintf()       c_library
+ *              VOID    PagedAddress()  lknoice.c
+ *              char *  strcpy()        c_library
+ *              int     symeq()         lksym.c
+ *
+ *      side effects:
+ *              An end function definition is
+ *              placed in the .noi debug file.
  */
 
-void DefineEndFunction( a_uint value, int page )
+void DefineEndFunction( a_uint value, struct bank *yp )
 {
         if (currentFunction[0] != 0)
         {
                 if (value != 0)
                 {
                         fprintf( jfp, "ENDF " );
-                        PagedAddress( value, page );
+                        PagedAddress( value, yp );
                 }
                 else
                 {
@@ -282,12 +579,34 @@
         }
 }
 
-/*
- * static function:
- * Define "lineNumber" as a line in the current file
+
+/*)Function     VOID    DefineLine()
+ *
+ *              char *          name    pointer to the symbol string
+ *              a_uint          value   value of symbol
+ *              struct bank *   yp      pointer to associated bank
+ *
+ *      The function DefineLine() places a LINE statement
+ *      in the .noi debug file for the processed file.
+ *
+ *      local variables:
+ *              int     indigit         converted digit
+ *              int     lineNumber      converted line number
+ *
+ *      global variables:
+ *              FILE *  jfp             NoICE Debug File handle
+ *
+ *      functions called:
+ *              int     fprintf()       c_library
+ *              VOID    PagedAddress()  lknoice.c
+ *              int     digit()         lkeval.c
+ *
+ *      side effects:
+ *              A Line definition is
+ *              placed in the .noi debug file.
  */
 
-void DefineLine( char *lineString, a_uint value, int page )
+void DefineLine( char *lineString, a_uint value, struct bank *yp )
 {
         int indigit, lineNumber;
 
@@ -297,13 +616,41 @@
                 lineNumber = 10*lineNumber + indigit;
         }
         fprintf( jfp, "LINE %u ", lineNumber );
-        PagedAddress( value, page );
+        PagedAddress( value, yp );
 }
 
-/*
+
+/*)Function     VOID    PagedAddress()
+ *
+ *              a_uint          value   value of symbol
+ *              struct bank *   yp      pointer to associated bank
+ *
+ *      The function PagedAddress() places the value
+ *      in the .noi debug file for the processed value.
+ *      If the current bank is "mapped" then the page
+ *      number preceeds the value as xx:.
+ *
+ *      local variables:
+ *              none
+ *
+ *      global variables:
+ *              FILE *  jfp             NoICE Debug File handle
+ *
+ *      functions called:
+ *              int     fprintf()       c_library
+ *
+ *      side effects:
+ *              A value is appended to the current
+ *              line placed in the .noi debug file.
  */
 
-void PagedAddress( a_uint value, int page )
+void PagedAddress( a_uint value, struct bank *yp )
 {
-        fprintf( jfp, "%X:0x%X\n", page, value );
+        if (yp->b_flag & B_MAP) {
+                fprintf( jfp, "%X:0x%X\n", yp->b_map, value );
+        } else {
+                fprintf( jfp, "0x%X\n", value );
+        }
 }
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/lkout.c sdcc-3.2.0+dfsg/sdas/linksrc/lkout.c
--- sdcc-3.1.0+dfsg/sdas/linksrc/lkout.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/lkout.c	2011-12-06 23:01:37.000000000 +0000
@@ -0,0 +1,965 @@
+/* lkout.c */
+
+/*
+ *  Copyright (C) 1989-2009  Alan R. Baldwin
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ * Alan R. Baldwin
+ * 721 Berkeley St.
+ * Kent, Ohio  44240
+ *
+ *   With enhancements by
+ *
+ *      G. Osborn
+ *      gary@s-4.com.
+ */
+
+#include "aslink.h"
+
+/*)Module       lkout.c
+ *
+ *      The module lkout.c contains the dispatch
+ *      function to create the relocated object
+ *      code output in the required format.
+ *
+ *      lkout.c contains the following functions:
+ *              VOID    lkout()
+ *              VOID    lkflush()
+ *              VOID    ixx()
+ *              VOID    iflush()
+ *              VOID    dbx()
+ *              VOID    dflush()
+ *
+ *      lkout.c contains no local variables.
+ */
+
+/*)Function     lkout(i)
+ *
+ *              int     i               1 - process data
+ *                                      0 - end of data
+ *
+ *      The function lkout() dispatches to the
+ *      required output format routine.
+ *
+ *      local variables:
+ *              none
+ *
+ *      global variables:
+ *              int     oflag           output type flag
+ *              int     obj_flag        Output enabled flag
+ *              FILE *  ofp             output file handle
+ *              a_uint  pc              Current relocation address
+ *              int     pcb             Current pc bytes per address
+ *
+ *      functions called:
+ *              VOID    ixx()           lkout.c
+ *              VOID    s19()           lks19.c
+ *              VOID    dbx()           lkout.c
+ *              VOID    elf()           lkelf.c
+ *
+ *      side effects:
+ *              The REL data is output in the required format.
+ */
+
+VOID
+lkout(int i)
+{
+        int j;
+
+        if (i && obj_flag) { return; }
+        if (ofp == NULL)   { return; }
+
+        /*
+         * Create the Byte Output Address
+         */
+        for (j=1; j<pcb; j++) {
+                adb_xb(pc, 0);
+        }
+
+        /*
+         * Intel Formats
+         */
+        if (oflag == 1) {
+                ixx(i);
+        } else
+        /*
+         * Motorola Formats
+         */
+        if (oflag == 2) {
+                s19(i);
+        } else
+        /*
+         * Disk Basic Formats
+         */
+        if (oflag == 3) {
+                dbx(i);
+        } else
+        /*
+         * Elf Formats
+         */
+        if (oflag == 4) {
+                elf(i);
+        }
+}
+
+
+/*)Function     lkflush()
+ *
+ *      The function lkflush() dispatches
+ *      to the required data flushing routine.
+ *
+ *      local variables:
+ *              none
+ *
+ *      global variables:
+ *              int     oflag           output type flag
+ *              FILE *  ofp             output file handle
+ *
+ *      functions called:
+ *              VOID    iflush()        lkout.c
+ *              VOID    sflush()        lks19.c
+ *              VOID    dflush()        lkout.c
+ *
+ *      side effects:
+ *              Any remaining REL data is flushed
+ *              to the output file.
+ */
+
+VOID
+lkflush()
+{
+        if (ofp == NULL)   { return; }
+
+        /*
+         * Intel Formats
+         */
+        if (oflag == 1) {
+                iflush();
+        } else
+        /*
+         * Motorola Formats
+         */
+        if (oflag == 2) {
+                sflush();
+        } else
+        /*
+         * Disk Basic Formats
+         */
+        if (oflag == 3) {
+                dflush();
+        }
+}
+
+
+/*Intel Format
+ *      Record Mark Field    -  This  field  signifies  the  start  of a
+ *                              record, and consists of an  ascii  colon
+ *                              (:).
+ *
+ *      Record Length Field  -  This   field   consists   of  two  ascii
+ *                              characters which indicate the number  of
+ *                              data   bytes   in   this   record.   The
+ *                              characters are the result of  converting
+ *                              the  number  of  bytes  in binary to two
+ *                              ascii characters, high digit first.   An
+ *                              End  of  File  record contains two ascii
+ *                              zeros in this field.
+ *
+ *      Load Address Field   -  This  field  consists  of the four ascii
+ *                              characters which result from  converting
+ *                              the  the  binary value of the address in
+ *                              which to begin loading this record.  The
+ *                              order is as follows:
+ *
+ *                                  High digit of high byte of address.
+ *                                  Low digit of high byte of address.
+ *                                  High digit of low byte of address.
+ *                                  Low digit of low byte of address.
+ *
+ *                              In an End of File record this field con-
+ *                              sists of four ascii zeros, in a start
+ *                              address record this is the program entry
+ *                              address (low), or in a segment record
+ *                              this is the high order address.
+ *
+ *      Record Type Field    -  This  field  identifies the record type,
+ *                              which is either 0 for data records,  1
+ *                              for an End of File record, 3 for a
+ *                              start address, or 4 for a
+ *                              segment record.  It consists
+ *                              of two ascii characters, with  the  high
+ *                              digit of the record type first, followed
+ *                              by the low digit of the record type.
+ *
+ *      Data Field           -  This  field consists of the actual data,
+ *                              converted to two ascii characters,  high
+ *                              digit first.  There are no data bytes in
+ *                              the End of File record.
+ *
+ *      Checksum Field       -  The  checksum  field is the 8 bit binary
+ *                              sum of the record length field, the load
+ *                              address  field,  the  record type field,
+ *                              and the data field.  This  sum  is  then
+ *                              negated  (2's  complement) and converted
+ *                              to  two  ascii  characters,  high  digit
+ *                              first.
+ */
+
+/*)Function     ixx(i)
+ *
+ *              int     i               1 - process data
+ *                                      0 - end of data
+ *
+ *      The function ixx() loads the output buffer with
+ *      the relocated data.
+ *
+ *      local variables:
+ *              a_uint  chksum          byte checksum
+ *              a_uint  lo_addr         address within segment
+ *              a_uint  hi_addr         segment number
+ *              int     i               loop counter
+ *              a_uint  j               temporary
+ *              int     k               loop counter
+ *              struct sym *sp          symbol pointer
+ *              a_uint  symadr          symbol address
+ *
+ *      global variables:
+ *              int     a_bytes         T Line Address Bytes
+ *              int     hilo            byte order
+ *              FILE *  ofp             output file handle
+ *              int     rtaflg          first output flag
+ *              int     rtcnt           count of data words
+ *              int     rtflg[]         output the data flag
+ *              a_uint  rtval[]         relocated data
+ *              char    rtbuf[]         output buffer
+ *              a_uint  rtadr0          address temporary
+ *              a_uint  rtadr1          address temporary
+ *              a_uint  rtadr2          address temporary
+ *
+ *      functions called:
+ *              int     fprintf()       c_library
+ *              VOID    iflush()        lkout.c
+ *
+ *      side effects:
+ *              The data is placed into the output buffer.
+ */
+
+/*
+ * The number of Data Field bytes is:
+ *
+ *      1       Record Mark Field
+ *      2       Record Length Field
+ *      4       Load Address Field
+ *      2       Record Type Field
+ *      2       Checksum Field
+ *
+ *      Plus 32 data bytes (64 characters)
+ */
+
+VOID
+ixx(int i)
+{
+        int k;
+        struct sym *sp;
+        a_uint j, lo_addr, hi_addr, symadr, chksum;
+
+
+        if (i) {
+                if (TARGET_IS_6808 && ap->a_flag & A_NOLOAD)
+                        return;
+
+                if (hilo == 0) {
+                        switch(a_bytes){
+                        default:
+                        case 2:
+                                j = rtval[0];
+                                rtval[0] = rtval[1];
+                                rtval[1] = j;
+                                break;
+                        case 3:
+                                j = rtval[0];
+                                rtval[0] = rtval[2];
+                                rtval[2] = j;
+                                break;
+                        case 4:
+                                j = rtval[0];
+                                rtval[0] = rtval[3];
+                                rtval[3] = j;
+                                j = rtval[2];
+                                rtval[2] = rtval[1];
+                                rtval[1] = j;
+                                break;
+                        }
+                }
+                for (i=0,rtadr2=0; i<a_bytes; i++) {
+                        rtadr2 = (rtadr2 << 8) | rtval[i];
+                }
+                if ((rtadr2 != rtadr1) || rtaflg) {
+                        /*
+                         * data bytes not contiguous between records
+                         */
+                        iflush();
+                        rtadr0 = rtadr1 = rtadr2;
+                        rtaflg = 0;
+                }
+                for (k=a_bytes; k<rtcnt; k++) {
+                        if (rtflg[k]) {
+                                rtbuf[(int) (rtadr1++ - rtadr0)] = rtval[k];
+                                if ((rtadr1 & 0xffff) == 0) {
+                                        iflush();
+                                }
+                                if (rtadr1 - rtadr0 == IXXMAXBYTES) {
+                                        iflush();
+                                }
+                        }
+                }
+        } else {
+                sp = lkpsym(".__.END.", 0);
+                if (sp && (sp->s_axp->a_bap->a_ofp == ofp)) {
+                        symadr = symval(sp);
+                        lo_addr = symadr & 0xffff;
+                        if (a_bytes > 2) {
+                                hi_addr = (symadr >> 16) & 0xffff;
+                                chksum =  0x00;
+                                chksum += hi_addr;
+                                chksum += hi_addr >> 8;
+                                chksum += 0x04;
+#ifdef  LONGINT
+                                fprintf(ofp, ":00%04lX04%02lX\n", hi_addr, (~chksum + 1) & 0x00ff);
+#else
+                                fprintf(ofp, ":00%04X04%02X\n", hi_addr, (~chksum + 1) & 0x00ff);
+#endif
+                        }
+                        chksum =  0x00;
+                        chksum += lo_addr;
+                        chksum += lo_addr >> 8;
+                        chksum += 0x03;
+#ifdef  LONGINT
+                        fprintf(ofp, ":00%04lX03%02lX\n", lo_addr, (~chksum + 1) & 0x00ff);
+#else
+                        fprintf(ofp, ":00%04X03%02X\n", lo_addr, (~chksum + 1) & 0x00ff);
+#endif
+                }
+
+                fprintf(ofp, ":00000001FF\n");
+        }
+}
+
+
+/*)Function     iflush()
+ *
+ *      The function iflush() outputs the relocated data
+ *      in the standard Intel format.
+ *
+ *      local variables:
+ *              a_uint  chksum          byte checksum
+ *              a_uint  lo_addr         address within segment
+ *              a_uint  hi_addr         segment number
+ *              int     i               loop counter
+ *              int     max             number of data bytes
+ *              int     reclen          record length
+ *
+ *      global variables:
+ *              int     a_bytes         T Line Address Bytes
+ *              FILE *  ofp             output file handle
+ *              int     rtaflg          first output flag
+ *              char    rtbuf[]         output buffer
+ *              a_uint  rtadr0          address temporary
+ *              a_uint  rtadr1          address temporary
+ *
+ *      functions called:
+ *              int     fprintf()       c_library
+ *
+ *      side effects:
+ *              The data is output to the file defined by ofp.
+ */
+
+/*
+ * This function derived from the work
+ * of G. Osborn, gary@s-4.com.
+ * The new version concatenates the assembler
+ * output records when they represent contiguous
+ * memory segments to produce IXXMAXBYTES data byte
+ * Intel Hex output lines whenever possible, resulting
+ * in a substantial reduction in file size.
+ * More importantly, the download time
+ * to the target system is much improved.
+ */
+
+VOID
+iflush()
+{
+        int i, max, reclen;
+        a_uint chksum, lo_addr, hi_addr;
+
+        max = (int) (rtadr1 - rtadr0);
+        if (max) {
+                if (a_bytes > 2) {
+                        static a_uint prev_hi_addr = 0;
+
+                        hi_addr = (rtadr0 >> 16) & 0xffff;
+                        if ((hi_addr != prev_hi_addr) || rtaflg) {
+                                chksum =  0x00;
+                                chksum += hi_addr;
+                                chksum += hi_addr >> 8;
+                                chksum += 0x04;
+#ifdef  LONGINT
+                                fprintf(ofp, ":00%04lX04%02lX\n", hi_addr, (~chksum + 1) & 0x00ff);
+#else
+                                fprintf(ofp, ":00%04X04%02X\n", hi_addr, (~chksum + 1) & 0x00ff);
+#endif
+                                prev_hi_addr = hi_addr;
+                        }
+                }
+
+                /*
+                 * Only the ":" and the checksum itself are excluded
+                 * from the checksum.  The record length includes
+                 * only the data bytes.
+                 */
+                lo_addr = rtadr0 & 0xffff;
+                reclen = max;
+                chksum = reclen;
+                chksum += lo_addr;
+                chksum += lo_addr >> 8;
+#ifdef  LONGINT
+                fprintf(ofp, ":%02X%04lX00", reclen, lo_addr);
+#else
+                fprintf(ofp, ":%02X%04X00", reclen, lo_addr);
+#endif
+                for (i=0; i<max; i++) {
+                        chksum += rtbuf[i];
+                        fprintf(ofp, "%02X", rtbuf[i] & 0x00ff);
+                }
+                /*
+                 * 2's complement
+                 */
+#ifdef  LONGINT
+                fprintf(ofp, "%02lX\n", (~chksum + 1) & 0x00ff);
+#else
+                fprintf(ofp, "%02X\n", (~chksum + 1) & 0x00ff);
+#endif
+                rtadr0 = rtadr1;
+        }
+
+}
+
+#if 0
+/*)S19/S28/S37 Formats
+ *      Record Type Field    -  This  field  signifies  the  start  of a
+ *                              record and  identifies  the  the  record
+ *                              type as follows:
+ *
+ *             2-Byte Address:      Ascii S1 - Data Record
+ *                                  Ascii S9 - End of File Record
+ *             3-Byte Address:      Ascii S2 - Data Record
+ *                                  Ascii S8 - End of File Record
+ *             4-Byte Address:      Ascii S3 - Data Record
+ *                                  Ascii S7 - End of File Record
+ *
+ *      Record Length Field  -  This  field  specifies the record length
+ *                              which includes the  address,  data,  and
+ *                              checksum   fields.   The  8  bit  record
+ *                              length value is converted to  two  ascii
+ *                              characters, high digit first.
+ *
+ *      Load Address Field   -  This  field  consists  of the 4/6/8 ascii
+ *                              characters which result from  converting
+ *                              the  the  binary value of the address in
+ *                              which to begin loading this record.  The
+ *                              order is as follows:
+ *
+ *           S37:                   High digit of fourth byte of address.
+ *                                  Low digit of fourth byte of address.
+ *           S28/S37:               High digit of third byte of address.
+ *                                  Low digit of third byte of address.
+ *           S19/S28/S37:           High digit of high byte of address.
+ *                                  Low digit of high byte of address.
+ *                                  High digit of low byte of address.
+ *                                  Low digit of low byte of address.
+ *
+ *                              In an End of File record this field con-
+ *                              sists of either 4/6/8 ascii zeros or  the
+ *                              program  entry  address.
+ *
+ *      Data Field           -  This  field consists of the actual data,
+ *                              converted to two ascii characters,  high
+ *                              digit first.  There are no data bytes in
+ *                              the End of File record.
+ *
+ *      Checksum Field       -  The  checksum  field is the 8 bit binary
+ *                              sum of the record length field, the load
+ *                              address field, and the data field.  This
+ *                              sum is then  complemented  (1's  comple-
+ *                              ment)   and   converted   to  two  ascii
+ *                              characters, high digit first.
+ */
+
+/*)Function     sxx(i)
+ *
+ *              int     i               1 - process data
+ *                                      0 - end of data
+ *
+ *      The function s19() loads the output buffer with
+ *      the relocated data.
+ *
+ *      local variables:
+ *              a_uint  addr            address temporary
+ *              a_uint  chksum          byte checksum
+ *              char *  frmt            format string pointer
+ *              int     i               loop counter
+ *              a_uint  j               temporary
+ *              int     k               loop counter
+ *              int     max             number of data bytes
+ *              int     reclen          record length
+ *              struct sym *sp          symbol pointer
+ *              a_uint  symadr          symbol address
+ *
+ *      global variables:
+ *              int     a_bytes         T Line Address Bytes
+ *              int     hilo            byte order
+ *              FILE *  ofp             output file handle
+ *              int     rtcnt           count of data words
+ *              int     rtflg[]         output the data flag
+ *              a_uint  rtval[]         relocated data
+ *              char    rtbuf[]         output buffer
+ *              a_uint  rtadr0          address temporary
+ *              a_uint  rtadr1          address temporary
+ *              a_uint  rtadr2          address temporary
+ *
+ *      functions called:
+ *              int     fprintf()       c_library
+ *              VOID    sflush()        lkout.c
+ *
+ *      side effects:
+ *              The data is placed into the output buffer.
+ */
+
+/*
+ * Number of Data Field bytes is:
+ *
+ *      2       Record Type Field
+ *      2       Record Length Field
+ *      4/6/8   Load Address Field
+ *      2       Checksum Field
+ *
+ *      Plus 32 data bytes (64 characters)
+ */
+
+VOID
+sxx(i)
+int i;
+{
+        struct sym *sp;
+        char *frmt;
+        int k, reclen;
+        a_uint  j, addr, symadr, chksum;
+
+        if (i) {
+                if (hilo == 0) {
+                        switch(a_bytes){
+                        default:
+                        case 2:
+                                j = rtval[0];
+                                rtval[0] = rtval[1];
+                                rtval[1] = j;
+                                break;
+                        case 3:
+                                j = rtval[0];
+                                rtval[0] = rtval[2];
+                                rtval[2] = j;
+                                break;
+                        case 4:
+                                j = rtval[0];
+                                rtval[0] = rtval[3];
+                                rtval[3] = j;
+                                j = rtval[2];
+                                rtval[2] = rtval[1];
+                                rtval[1] = j;
+                                break;
+                        }
+                }
+                for (i=0,rtadr2=0; i<a_bytes; i++) {
+                        rtadr2 = (rtadr2 << 8) | rtval[i];
+                }
+
+                if (rtadr2 != rtadr1) {
+                        /*
+                         * data bytes not contiguous between records
+                         */
+                        sflush();
+                        rtadr0 = rtadr1 = rtadr2;
+                }
+                for (k=a_bytes; k<rtcnt; k++) {
+                        if (rtflg[k]) {
+                                rtbuf[(int) (rtadr1++ - rtadr0)] = rtval[k];
+                                if (rtadr1 - rtadr0 == SXXMAXBYTES) {
+                                        sflush();
+                                }
+                        }
+                }
+        } else {
+                /*
+                 * Only the "S_" and the checksum itself are excluded
+                 * from the checksum.  The record length does not
+                 * include "S_" and the pair count.  It does
+                 * include the address bytes, the data bytes,
+                 * and the checksum.
+                 */
+                reclen = 1 + a_bytes;
+                chksum = reclen;
+                sp = lkpsym(".__.END.", 0);
+                if (sp && (sp->s_axp->a_bap->a_ofp == ofp)) {
+                        symadr = symval(sp);
+                        for (i=0,addr=symadr; i<a_bytes; i++,addr>>=8) {
+                                chksum += addr;
+                        }
+                } else {
+                        symadr = 0;
+                }
+#ifdef  LONGINT
+                switch(a_bytes) {
+                default:
+                case 2: frmt = "S9%02X%04lX"; addr = symadr & 0x0000ffffl; break;
+                case 3: frmt = "S8%02X%06lX"; addr = symadr & 0x00ffffffl; break;
+                case 4: frmt = "S7%02X%08lX"; addr = symadr & 0xffffffffl; break;
+                }
+#else
+                switch(a_bytes) {
+                default:
+                case 2: frmt = "S9%02X%04X"; addr = symadr & 0x0000ffff; break;
+                case 3: frmt = "S8%02X%06X"; addr = symadr & 0x00ffffff; break;
+                case 4: frmt = "S7%02X%08X"; addr = symadr & 0xffffffff; break;
+                }
+#endif
+                fprintf(ofp, frmt, reclen, addr);
+                /*
+                 * 1's complement
+                 */
+#ifdef  LONGINT
+                fprintf(ofp, "%02lX\n", (~chksum) & 0x00ff);
+#else
+                fprintf(ofp, "%02X\n", (~chksum) & 0x00ff);
+#endif
+        }
+}
+
+
+/*)Function     sflush()
+ *
+ *      The function sflush() outputs the relocated data
+ *      in the standard Motorola format.
+ *
+ *      local variables:
+ *              a_uint  addr            address temporary
+ *              a_uint  chksum          byte checksum
+ *              char *  frmt            format string pointer
+ *              int     i               loop counter
+ *              int     max             number of data bytes
+ *              int     reclen          record length
+ *
+ *      global variables:
+ *              int     a_bytes         T Line Address Bytes
+ *              FILE *  ofp             output file handle
+ *              char    rtbuf[]         output buffer
+ *              a_uint  rtadr0          address temporary
+ *              a_uint  rtadr1          address temporary
+ *
+ *      functions called:
+ *              int     fprintf()       c_library
+ *
+ *      side effects:
+ *              The data is output to the file defined by ofp.
+ */
+
+/*
+ * Written by G. Osborn, gary@s-4.com, 6-17-98.
+ * The new version concatenates the assembler
+ * output records when they represent contiguous
+ * memory segments to produce SXXMAXBYTES data byte
+ * S_ output lines whenever possible, resulting
+ * in a substantial reduction in file size.
+ * More importantly, the download time
+ * to the target system is much improved.
+ */
+
+VOID
+sflush()
+{
+        char *frmt;
+        int i, max, reclen;
+        a_uint  addr, chksum;
+
+        max = (int) (rtadr1 - rtadr0);
+        if (max == 0) {
+                return;
+        }
+
+        /*
+         * Only the "S_" and the checksum itself are excluded
+         * from the checksum.  The record length does not
+         * include "S_" and the pair count.  It does
+         * include the address bytes, the data bytes,
+         * and the checksum.
+         */
+        reclen = max + 1 + a_bytes;
+        chksum = reclen;
+        for (i=0,addr=rtadr0; i<a_bytes; i++,addr>>=8) {
+                chksum += addr;
+        }
+#ifdef  LONGINT
+        switch(a_bytes) {
+        default:
+        case 2: frmt = "S1%02X%04lX"; addr = rtadr0 & 0x0000ffffl; break;
+        case 3: frmt = "S2%02X%06lX"; addr = rtadr0 & 0x00ffffffl; break;
+        case 4: frmt = "S3%02X%08lX"; addr = rtadr0 & 0xffffffffl; break;
+        }
+#else
+        switch(a_bytes) {
+        default:
+        case 2: frmt = "S1%02X%04X"; addr = rtadr0 & 0x0000ffff; break;
+        case 3: frmt = "S2%02X%06X"; addr = rtadr0 & 0x00ffffff; break;
+        case 4: frmt = "S3%02X%08X"; addr = rtadr0 & 0xffffffff; break;
+        }
+#endif
+        fprintf(ofp, frmt, reclen, addr);
+        for (i=0; i<max; i++) {
+                chksum += rtbuf[i];
+                fprintf(ofp, "%02X", rtbuf[i] & 0x00ff);
+        }
+        /*
+         * 1's complement
+         */
+#ifdef  LONGINT
+        fprintf(ofp, "%02lX\n", (~chksum) & 0x00ff);
+#else
+        fprintf(ofp, "%02X\n", (~chksum) & 0x00ff);
+#endif
+        rtadr0 = rtadr1;
+}
+#endif
+
+/*)Disk BASIC Format
+ *
+ * Each code segment starts with the following record:
+ *
+ *      Record Preamble      -  This field is either $00 (for start of new
+ *                              record) or $FF (for last record in file).
+ *
+ *      Record Length Field  -  This field specifies the record length
+ *                              that follows the Load Address Field.
+ *
+ *           16-Bit Length   -  2-bytes
+ *           24-Bit Length   -  3-bytes
+ *           32-Bit Length   -  4-bytes
+ *
+ *      Load Address Field   -  This field consists of the address where
+ *                              the record will be loaded into memory.
+ *
+ *           16-Bit Address  -  2-bytes
+ *           24-Bit Address  -  3-bytes
+ *           32-Bit Address  -  4-bytes
+ *
+ *      Binary Data Bytes    -  Record Length data bytes.
+ *
+ * After the last code segment, a final record like the one above is
+ * placed.  In this final segment, the Record Preamble is $FF, the
+ * Record Length Field is $0000 and the Load Adress Field is the
+ * execution address.
+ */
+
+/*)Function     dbx(i)
+ *
+ *              int     i               1 - process data
+ *                                      0 - end of data
+ *
+ *      The function decb() loads the output buffer with
+ *      the relocated data.
+ *
+ *      local variables:
+ *              int     k               loop counter
+ *              struct sym *sp          symbol pointer
+ *              a_uint  symadr          start address
+ *
+ *      global variables:
+ *              int     a_bytes         T Line Address Bytes
+ *              FILE *  ofp             output file handle
+ *              int     rtcnt           count of data words
+ *              int     rtflg[]         output the data flag
+ *              a_uint  rtval[]         relocated data
+ *              char    rtbuf[]         output buffer
+ *              a_uint  rtadr0          address temporary
+ *              a_uint  rtadr1          address temporary
+ *              a_uint  rtadr2          address temporary
+ *
+ *      functions called:
+ *              int     putc()          c_library
+ *              VOID    dflush()        lkout.c
+ *
+ *      side effects:
+ *              The data is placed into the output buffer.
+ */
+
+VOID
+dbx(i)
+int i;
+{
+        struct sym *sp;
+        int k;
+        a_uint  j, symadr;
+
+        if (i) {
+                if (hilo == 0) {
+                        switch(a_bytes){
+                        default:
+                        case 2:
+                                j = rtval[0];
+                                rtval[0] = rtval[1];
+                                rtval[1] = j;
+                                break;
+                        case 3:
+                                j = rtval[0];
+                                rtval[0] = rtval[2];
+                                rtval[2] = j;
+                                break;
+                        case 4:
+                                j = rtval[0];
+                                rtval[0] = rtval[3];
+                                rtval[3] = j;
+                                j = rtval[2];
+                                rtval[2] = rtval[1];
+                                rtval[1] = j;
+                                break;
+                        }
+                }
+                for (i=0,rtadr2=0; i<a_bytes; i++) {
+                        rtadr2 = (rtadr2 << 8) | rtval[i];
+                }
+
+                if (rtadr2 != rtadr1) {
+                        /*
+                         * data bytes not contiguous between records
+                         */
+                        dflush();
+                        rtadr0 = rtadr1 = rtadr2;
+                }
+                for (k=a_bytes; k<rtcnt; k++) {
+                        if (rtflg[k]) {
+                                rtbuf[(int) (rtadr1++ - rtadr0)] = rtval[k];
+                                if (rtadr1 - rtadr0 == (unsigned) (DBXMAXBYTES - (2 * a_bytes) - 1)) {
+                                        dflush();
+                                }
+                        }
+                }
+        } else {
+                /* Disk BASIC BIN Trailer */
+                sp = lkpsym(".__.END.", 0);
+                if (sp && (sp->s_axp->a_bap->a_ofp == ofp)) {
+                        symadr = symval(sp);
+                } else {
+                        symadr = 0;
+                }
+                /* Terminator */
+                putc(0xFF, ofp);
+
+                /* Size (0) */
+                switch(a_bytes) {
+                case 4: putc((int) (0 >> 24) & 0xFF, ofp);
+                case 3: putc((int) (0 >> 16) & 0xFF, ofp);
+                default:
+                case 2: putc((int) (0 >>  8) & 0xFF, ofp);
+                        putc((int) (0 >>  0) & 0xFF, ofp);
+                        break;
+                }
+
+                /* Starting Address */
+                switch(a_bytes) {
+                case 4: putc((int) (symadr >> 24) & 0xFF, ofp);
+                case 3: putc((int) (symadr >> 16) & 0xFF, ofp);
+                default:
+                case 2: putc((int) (symadr >>  8) & 0xFF, ofp);
+                        putc((int) (symadr >>  0) & 0xFF, ofp);
+                        break;
+                }
+        }
+}
+
+
+/*)Function     dflush()
+ *
+ *      The function dflush() outputs the relocated data
+ *      in the Disk BASIC loadable format
+ *
+ *      local variables:
+ *              int     i               loop counter
+ *              int     max             number of data bytes
+ *
+ *      global variables:
+ *              FILE *  ofp             output file handle
+ *              char    rtbuf[]         output buffer
+ *              a_uint  rtadr0          address temporary
+ *              a_uint  rtadr1          address temporary
+ *
+ *      functions called:
+ *              int     putc()          c_library
+ *
+ *      side effects:
+ *              The data is output to the file defined by ofp.
+ */
+
+/*
+ * Written by Boisy G. Pitre, boisy@boisypitre.com, 6-7-04
+ */
+
+VOID
+dflush()
+{
+        int i, max;
+
+        max = (int) (rtadr1 - rtadr0);
+        if (max == 0) {
+                return;
+        }
+
+        /* Preamble Byte */
+        putc(0, ofp);
+
+        /* Record Size */
+        switch(a_bytes){
+        case 4: putc((int) (max >> 24) & 0xFF, ofp);
+        case 3: putc((int) (max >> 16) & 0xFF, ofp);
+        default:
+        case 2: putc((int) (max >>  8) & 0xFF, ofp);
+                putc((int) (max >>  0) & 0xFF, ofp);
+                break;
+        }
+
+        /* Load Address */
+        switch(a_bytes){
+        case 4: putc((int) (rtadr0 >> 24) & 0xFF, ofp);
+        case 3: putc((int) (rtadr0 >> 16) & 0xFF, ofp);
+        default:
+        case 2: putc((int) (rtadr0 >>  8) & 0xFF, ofp);
+                putc((int) (rtadr0 >>  0) & 0xFF, ofp);
+                break;
+        }
+
+        for (i = 0; i < max; i++) {
+                putc(rtbuf[i], ofp);
+        }
+
+        rtadr0 = rtadr1;
+}
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/lkrloc.c sdcc-3.2.0+dfsg/sdas/linksrc/lkrloc.c
--- sdcc-3.1.0+dfsg/sdas/linksrc/lkrloc.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/lkrloc.c	2011-12-06 23:01:37.000000000 +0000
@@ -23,1531 +23,358 @@
  *
  *   With enhancements from:
  *
- *	John L. Hartman	(JLH)
- *	jhartman@compuserve.com
+ *      John L. Hartman (JLH)
+ *      jhartman@compuserve.com
  *
- *	Bill McKinnon (BM)
- *	w_mckinnon@conknet.com
+ *      Bill McKinnon (BM)
+ *      w_mckinnon@conknet.com
  */
 
 #include <ctype.h>
 #include "aslink.h"
 
-/*)Module	lkrloc.c
+/*)Module       lkrloc.c
  *
- *	The module lkrloc.c contains the functions which
- *	perform the relocation calculations.
+ *      The module lkrloc.c contains the functions which
+ *      perform the relocation calculations.
  *
- *	lkrloc.c contains the following functions:
- *		a_uint	adb_b()
- *		a_uint	adb_lo()
- *		a_uint	adb_hi()
- *		a_uint	adw_w()
- *		a_uint	adw_lo()
- *		a_uint	adw_hi()
- *		VOID	erpdmp()
- *		VOID	errdmp()
- *		a_uint	evword()
- *		VOID	prntval()
- *		VOID	rele()
- *		VOID	relerr()
- *		VOID	relerp()
- *		VOID	reloc()
- *		VOID	relp()
- *		VOID	relr()
- *		VOID	relt()
+ *      lkrloc.c contains the following functions:
+ *              a_uint  adb_1b()
+ *              a_uint  adb_2b()
+ *              a_uint  adb_3b()
+ *              a_uint  adb_4b()
+ *              a_uint  adb_xb()
+ *              a_uint  evword()
+ *              VOID    prntval()
+ *              VOID    reloc()
  *
- *	lkrloc.c the local variable errmsg[].
  *
  */
 
-/* sdld specific */
-/* Global which holds the upper 16 bits of the last 32 bit area adress
- * output. Useful only for iHex mode.
- */
-int    lastExtendedAddress=-1;
-
-/* Static variable which holds the index of last processed area.
- * Useful only for iHex mode.
- */
-static int lastAreaIndex = -1;
-/* end sdld specific */
-
-/*)Function VOID	reloc(c)
- *
- *			char c		process code
- *
- *	The function reloc() calls a particular relocation
- *	function determined by the process code.
- *
- *	local variable:
- *		none
- *
- *	global variables:
- *		int lkerr			error flag
- *
- *	called functions:
- *		int fprintf()		c_library
- *		VOID	rele()		lkrloc.c
- *		VOID	relp()		lkrloc.c
- *		VOID	relr()		lkrloc.c
- *		VOId	relt()		lkrloc.c
- *
- *	side effects:
- *		Refer to the called relocation functions.
- *
- */
-
-VOID
-reloc(c)
-char c;
-{
-	switch(c) {
-
-	case 'T':
-		relt();
-		break;
-
-	case 'R':
-		relr();
-		break;
-
-	case 'P':
-		relp();
-		break;
-
-	case 'E':
-		rele();
-		break;
-
-	default:
-		fprintf(stderr, "Undefined Relocation Operation\n");
-		lkerr++;
-		break;
-
-	}
-}
-
-
-/*)Function VOID	relt()
- *
- *	The function relt() evaluates a T line read by
- *	the linker. Each byte value read is saved in the
- *	rtval[] array, rtflg[] is set, and the number of
- *	evaluations is maintained in rtcnt.
- *
- *		T Line
- *
- *		T xx xx nn nn nn nn nn ...
- *
+/*)Function VOID        reloc(c)
  *
- *		In: "T n0 n1 n2 n3 ... nn"
+ *                      int c           process code
  *
- *		Out:	 0	 1	  2    ..  rtcnt
- *			  +----+----+----+----+----+
- *		rtval | n0 | n1 | n2 | .. | nn |
- *			  +----+----+----+----+----+
- *		rtflag|  1 |  1 |  1 |	1 |  1 |
- *			  +----+----+----+----+----+
- *
- *	The T line contains the assembled code output by the assem-
- *	bler with xx xx being the offset address from the current area
- *	base address and nn being the assembled instructions and data in
- *	byte format.
- *
- *	local variable:
- *		none
- *
- *	global variables:
- *		int rtcnt		number of values evaluated
- *		int rtflg[]		array of evaluation flags
- *		int rtval[]		array of evaluation values
- *
- *	called functions:
- *		int eval()		lkeval.c
- *		int more()		lklex.c
- *
- *	side effects:
- *		Linker input T line evaluated.
- *
- */
-
-VOID
-relt()
-{
-	rtcnt = 0;
-	while (more()) {
-		if (rtcnt < NTXT) {
-			rtval[rtcnt] = eval();
-			rtflg[rtcnt] = 1;
-			rtcnt++;
-		}
-	}
-}
-
-/*)Function	VOID	relr()
- *
- *	The function relr() evaluates a R line read by
- *	the linker.  The R line data is combined with the
- *	previous T line data to perform the relocation of
- *	code and data bytes.  The S19 / IHX output and
- *	translation of the LST files to RST files may be
- *	performed.
- *
- *		R Line 
- *
- *		R 0 0 nn nn n1 n2 xx xx ...  
- *
- * 	The R line provides the relocation information to the linker.
- *	The nn nn value is the current area index, i.e.  which area  the
- *	current  values  were  assembled.  Relocation information is en-
- *	coded in groups of 4 bytes:  
- *
- *	1.  n1 is the relocation mode and object format 
- *	 	1.  bit 0 word(0x00)/byte(0x01) 
- *	 	2.  bit 1 relocatable area(0x00)/symbol(0x02) 
- *	 	3.  bit 2 normal(0x00)/PC relative(0x04) relocation 
- *	 	4.  bit  3  1-byte(0x00)/2-byte(0x08) object format for
- *		    byte data 
- *	 	5.  bit 4 signed(0x00)/unsigned(0x10) byte data 
- *	 	6.  bit 5 normal(0x00)/page '0'(0x20) reference 
- *	 	7.  bit 6 normal(0x00)/page 'nnn'(0x40) reference 
- *
- *	2.  n2  is  a byte index into the corresponding (i.e.  pre-
- *	 	ceeding) T line data (i.e.  a pointer to the data to be
- *	 	updated  by  the  relocation).   The T line data may be
- *	 	1-byte or  2-byte  byte  data  format  or  2-byte  word
- *	 	format.  
- *
- *	3.  xx xx  is the area/symbol index for the area/symbol be-
- *	 	ing referenced.  the corresponding area/symbol is found
- *		in the header area/symbol lists.  
- *
- *	The groups of 4 bytes are repeated for each item requiring relo-
- *	cation in the preceeding T line.  
- *
- *	local variable:
- *		areax	**a		pointer to array of area pointers
- *		int	aindex		area index
- *		char	*errmsg[]	array of pointers to error strings
- *		int	error		error code
- *		int	lkerr		error flag
- *		int	mode		relocation mode
- *		adrr_t	paga		paging base area address
- *		a_uint	pags		paging symbol address
- *		a_uint	pc		relocated base address
- *		a_uint	r		PCR relocation value
- *		a_uint	reli		relocation initial value
- *		a_uint	relv		relocation final value
- *		int	rindex		symbol / area index
- *		a_uint	rtbase		base code address
- *		a_uint	rtofst		rtval[] index offset
- *		int rtp			index into T data
- *		sym **s			pointer to array of symbol pointers
- *
- *	global variables:
- *		head	*hp		pointer to the head structure
- *		rerr	rerr		linker error structure
- *		FILE	*stderr		standard error device
- *
- *	called functions:
- *		a_uint	adb_b()		lkrloc.c
- *		a_uint	adb_lo()	lkrloc.c
- *		a_uint	adb_hi()	lkrloc.c
- *		a_uint	adw_w()		lkrloc.c
- * sdld specific
- *		VOID	elf()		lkelf.c
- *		VOID	gb()		lkgb.c
- * end sdld specific
- *		a_uint	evword()	lkrloc.c
- *		int	eval()		lkeval.c
- *		int	fprintf()		c_library
- *		VOID	ihx()		lkihx.c
- *		int	lkulist		lklist.c
- *		int	more()		lklex.c
- *		VOID	relerr()	lkrloc.c
- *		VOID	s19()		lks19.c
- *		int	symval()		lksym.c
- *
- *	side effects:
- *		The R and T lines are combined to produce
- *		relocated code and data.  Output S19 / IHX
- *		and relocated listing files may be produced.
- *
- */
-
-VOID
-relr()
-{
-	register int mode;
-	register a_uint reli, relv;
-	int aindex, rindex, rtp, error;
-	a_uint r, rtbase, rtofst, paga = 0, pags = 0, pc;
-	struct areax **a;
-	struct sym **s;
-
-	/*
-	 * Get area and symbol lists
-	 */
-	a = hp->a_list;
-	s = hp->s_list;
-
-	/*
-	 * Verify Area Mode
-	 */
-	if (eval() != (R3_WORD | R3_AREA) || eval()) {
-		fprintf(stderr, "R input error\n");
-		lkerr++;
-	}
-
-	/*
-	 * Get area pointer
-	 */
-	aindex = evword();
-	if (aindex >= hp->h_narea) {
-		fprintf(stderr, "R area error\n");
-		lkerr++;
-		return;
-	}
-	if (TARGET_IS_6808)
-		ap = a[aindex]->a_bap;
-
-	/*
-	 * Base values
-	 */
-	rtbase = adw_w(0, 0);
-	rtofst = 2;
-
-	/*
-	 * Relocate address
-	 */
-	pc = adw_w(a[aindex]->a_addr, 0);
-
-	/*
-	 * Number of 'bytes' per PC address
-	 */
-	pcb = 1;
-
-	#if 0
-	printf("area %d base address: 0x%x size: 0x%x rtbase: 0x%x\n", aindex,
-		a[aindex]->a_addr, a[aindex]->a_size, rtbase);
-	#endif
-	/*
-	 * Do remaining relocations
-	 */
-	while (more()) {
-		error = 0;
-		mode = eval();
-
-		if ((mode & R_ESCAPE_MASK) == R_ESCAPE_MASK)
-		{
-			mode = ((mode & ~R_ESCAPE_MASK) << 8) | eval();
-			/* printf("unescaping rmode\n"); */
-		}
-
-		rtp = eval();
-		rindex = evword();
-
-		/*
-		 * R3_SYM or R3_AREA references
-		 */
-		if (mode & R3_SYM) {
-			if (rindex >= hp->h_nsym) {
-				fprintf(stderr, "R symbol error\n");
-				lkerr++;
-				return;
-			}
-			reli = symval(s[rindex]);
-		}
-/* sdld specific */
-		else if ((IS_R_J11(mode) || IS_R_J19(mode)) && (rindex == 0xFFFF)) {
-			/* absolute acall/ajmp address */
-			reli = 0;
-		}
-/* end sdld specific */
-		else {
-			if (rindex >= hp->h_narea) {
-				fprintf(stderr, "R area error\n");
-				lkerr++;
-				return;
-			}
-			reli = a[rindex]->a_addr;
-		}
-
-		/*
-		 * R3_PCR addressing
-		 */
-		if (mode & R3_PCR) {
-			if (mode & R3_BYTE) {
-				reli -= (pc + (rtp-rtofst) + 1);
-			} else {
-				reli -= (pc + (rtp-rtofst) + 2);
-			}
-		}
-
-		/*
-		 * R3_PAG0 or R3_PAG addressing
-		 */
-		if (mode & (R3_PAG0 | R3_PAG)) {
-			paga  = sdp.s_area->a_addr;
-			pags  = sdp.s_addr;
-			reli -= paga + pags;
-		}
-
-		/*
-		 * R3_BYTE or R3_WORD operation
-		 */
-		if (mode & R3_BYTE) {
-			if (mode & R_BYT3)
-			{
-				/* This is a three byte address, of which
-				 * we will select one byte.
-				 */
-/* sdld specific */
-				if (mode & R_BIT)
-				{
-					relv = adb_24_bit(reli, rtp);
-				}
-/* sdld specific */
-				else if (mode & R_HIB)
-				{
-					/* printf("24 bit address selecting hi byte.\n"); */
-					relv = adb_24_hi(reli, rtp);
-				}
-				else if (mode & R3_MSB)
-				{
-					/* Note that in 24 bit mode, R3_MSB
-					 * is really the middle byte, not
-					 * the most significant byte.
-					 *
-					 * This is ugly and I can only apologize
-					 * for any confusion.
-					 */
-					/* printf("24 bit address selecting middle byte.\n"); */
-					relv = adb_24_mid(reli, rtp);
-				}
-				else
-				{
-					/* printf("24 bit address selecting lo byte.\n"); */
-					relv = adb_24_lo(reli, rtp);
-				}
-			}
-			else if (mode & R3_BYTX) {
-				/* This is a two byte address, of
-				 * which we will select one byte.
-				 */
-				if (mode & R_BIT) {
-					relv = adb_bit(reli, rtp);
-				} else if (mode & R3_MSB) {
-					relv = adb_hi(reli, rtp);
-				} else {
-					relv = adb_lo(reli, rtp);
-				}
-			} else {
-				relv = adb_b(reli, rtp);
-			}
-		} else if (IS_R_J11(mode)) {
-			/* JLH: 11 bit jump destination for 8051.  Forms
-			/  two byte instruction with op-code bits
-			/  in the MIDDLE!
-			/  rtp points at 3 byte locus: first two
-			/  will get the instructiion. third one
-			/  has raw op-code.
-			*/
-
-			/* Calculate absolute destination
-			/  relv must be on same 2K page as pc
-			*/
-			relv = adw_w(reli, rtp);
-
-			if ((relv & ~0x7ff) != ((pc + rtp - rtofst) & ~0x7ff)) {
-					error = 2;
-			}
-
-			/* Merge MSB (byte 0) with op-code, ignoring
-			/  top 5 bits of address.  Then hide the op-code
-			*/
-			rtval[rtp] = ((rtval[rtp] & 0x07)<<5) | rtval[rtp+2];
-			rtflg[rtp+2] = 0;
-			rtofst += 1;
-		}
-		else if (IS_R_J19(mode)) {
-			/* 19 bit jump destination for DS80C390.  Forms
-			/  three byte instruction with op-code bits
-			/  in the MIDDLE!
-			/  rtp points at 4 byte locus: first three
-			/  will get the instructiion. fourth one
-			/  has raw op-code.
-			 */
-
-			/* Calculate absolute destination
-			/  relv must be on same 512K page as pc
-			*/
-			relv = adw_24(reli, rtp);
-
-			if ((relv & ~0x7ffff) != ((pc + rtp - rtofst) & ~0x7ffff)) {
-				error = 2;
-			}
-
-			/* Merge MSB (byte 0) with op-code, ignoring
-			/  top 5 bits of address.  Then hide the op-code
-			*/
-			rtval[rtp] = ((rtval[rtp] & 0x07)<<5) | rtval[rtp+3];
-			rtflg[rtp+3] = 0;
-			rtofst += 1;
-		}
-		else if (IS_C24(mode))
-		{
-			/* 24 bit address */
-			relv = adw_24(reli, rtp);
-			}
-		else
-		{
-			/* 16 bit address. */
-			relv = adw_w(reli, rtp);
-		}
-
-		/*
-		 * R3_BYTE with R3_BYTX offset adjust
-		 */
-		if (mode & R3_BYTE) {
-			if (mode & R3_BYTX) {
-				rtofst += 1;
-			}
-		}
-
-		/*
-		 * Unsigned Byte Checking
-		 */
-		if (mode & R3_USGN && mode & R3_BYTE && relv & ~0xFF)
-			error = 1;
-
-		/*
-		 * PCR Relocation Error Checking
-		 */
-		if (mode & R3_PCR && mode & R3_BYTE) {
-			r = relv & ~0x7F;
-			if (r != (a_uint) ~0x7F && r != 0)
-				error = 2;
-		}
-
-		/*
-		 * Page Relocation Error Checking
-		 */
-		if ((TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_GB) &&
-			mode & R3_PAG0 && (relv & ~0xFF || paga || pags))
-			error = 3;
-		if (mode & R3_PAG  && (relv & ~0xFF))
-			error = 4;
-/* sdld specific */
-		if ((mode & R_BIT) && (relv & ~0x87FF))
-			error = 5;
-/* end sdld specific */
-
-		/*
-		 * Error Processing
-		 */
-		if (error) {
-			rerr.aindex = aindex;
-			rerr.mode = mode;
-			rerr.rtbase = rtbase + rtp - rtofst - 1;
-			rerr.rindex = rindex;
-			rerr.rval = relv - reli;
-			relerr(errmsg[error-1]);
-		}
-	}
-	if (uflag != 0) {
-		lkulist(1);
-	}
-
-	/* JLH: output only if data (beyond two byte address) */
-	if ((TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_GB) && oflag == 1) {
-		ihx(1);
-	}
-	else if ((oflag == 1) && (rtcnt > 2)) {
-		int extendedAddress = (a[aindex]->a_addr >> 16) & 0xffff;
-
-		/* Boy, is this a hack: for ABS sections, the
-		 * base address is stored as zero, and the T records
-		 * indicate the offset from zero.
-		 *
-		 * Since T records can only indicate a 16 bit offset, this
-		 * obviously creates a problem for ABS segments located
-		 * above 64K (this is only meaningful in flat24 mode).
-		 *
-		 * However, the size of an ABS area is stored as
-		 * base address + section size (I suspect this is a bug,
-		 * but it's a handy one right now). So the upper 8 bits of
-		 * the 24 bit address are stored in the size record.
-		 * Thus we add it in.
-		 *
-		 * This is another reason why we can't have areas greater
-		 * than 64K yet, even in flat24 mode.
-		 */
-	//	extendedAddress += ((a[aindex]->a_size) >> 16 & 0xffff);
-	//	commented out by jr
-
-		if (lastAreaIndex != aindex) {
-			lastAreaIndex = aindex;
-			ihxNewArea();
-		}
-
-		if (TARGET_IS_8051 && extendedAddress != lastExtendedAddress)
-		{
-
-			if (lastExtendedAddress!=-1) {
-			  printf("output extended linear address record 0x%x 0x%x\n",
-				 extendedAddress, lastExtendedAddress);
-			}
-
-			if (rflag)
-			{
-				ihxExtendedLinearAddress(extendedAddress);
-			}
-			else if (extendedAddress)
-			{
-				/* Not allowed to generate extended address records,
-				 * but one is called for here...
-				 */
-				fprintf(stderr,
-					"warning: extended linear address encountered; "
-					"you probably want the -r flag.\n");
-			}
-			lastExtendedAddress = extendedAddress;
-		}
-		ihx(1);
-	} else
-	if ((oflag == 2) && (rtcnt > 2)) {
-		s19(1);
-	}
-/* sdld specific */
-	else
-	if ((oflag == 4) && (rtcnt > 2)) {
-		elf(1);
-	}
-/* end sdld specific */
-}
-
-char *errmsg[] = {
-	"Unsigned Byte error",
-	"Byte PCR relocation error",
-	"Page0 relocation error",
-	"Page Mode relocation error",
-/* sdld specific */
-	"Bit-addressable relocation error"
-/* end sdld specific */
-};
-
-
-/*)Function VOID	relp()
- *
- *	The function relp() evaluates a P line read by
- *	the linker.  The P line data is combined with the
- *	previous T line data to set the base page address
- *	and test the paging boundary and length.
- *
- *		P Line
- *
- *		P 0 0 nn nn n1 n2 xx xx
- *
- *	The P line provides the paging information to the linker as
- *	specified by a .setdp directive.  The format of the relocation
- *	information is identical to that of the R line.  The correspond-
- *	ing T line has the following information:
- *		T xx xx aa aa bb bb
- *
- *	Where aa aa is the area reference number which specifies the
- *	selected page area and bb bb is the base address of the page.
- *	bb bb will require relocation processing if the 'n1 n2 xx xx' is
- *	specified in the P line.  The linker will verify that the base
- *	address is on a 256 byte boundary and that the page length of an
- *	area defined with the PAG type is not larger than 256 bytes.
- *
- *	local variable:
- *		areax	**a		pointer to array of area pointers
- *		int aindex		area index
- *		int mode		relocation mode
- *		a_uint	relv	relocation value
- *		int rindex		symbol / area index
- *		int rtp			index into T data
- *		sym **s			pointer to array of symbol pointers
- *
- *	global variables:
- *		head *hp		pointer to the head structure
- *		int lkerr		error flag
- *		sdp sdp			base page structure
- *		FILE *stderr	standard error device
- *
- *	called functions:
- *		a_uint adw_w()	lkrloc.c
- *		a_uint evword() lkrloc.c
- *		int eval()		lkeval.c
- *		int fprintf()	c_library
- *		int more()		lklex.c
- *		int symval()	lksym.c
- *
- *	side effects:
- *		The P and T lines are combined to set
- *		the base page address and report any
- *		paging errors.
- *
- */
-
-VOID
-relp()
-{
-	register int aindex, rindex;
-	int mode, rtp;
-	a_uint relv;
-	struct areax **a;
-	struct sym **s;
-
-	/*
-	 * Get area and symbol lists
-	 */
-	a = hp->a_list;
-	s = hp->s_list;
-
-	/*
-	 * Verify Area Mode
-	 */
-	if (eval() != (R3_WORD | R3_AREA) || eval()) {
-		fprintf(stderr, "P input error\n");
-		lkerr++;
-	}
-
-	/*
-	 * Get area pointer
-	 */
-	aindex = evword();
-	if (aindex >= hp->h_narea) {
-		fprintf(stderr, "P area error\n");
-		lkerr++;
-		return;
-	}
-
-	/*
-	 * Do remaining relocations
-	 */
-	while (more()) {
-		mode = eval();
-		rtp = eval();
-		rindex = evword();
-
-		/*
-		 * R3_SYM or R3_AREA references
-		 */
-		if (mode & R3_SYM) {
-			if (rindex >= hp->h_nsym) {
-				fprintf(stderr, "P symbol error\n");
-				lkerr++;
-				return;
-			}
-			relv = symval(s[rindex]);
-		} else {
-			if (rindex >= hp->h_narea) {
-				fprintf(stderr, "P area error\n");
-				lkerr++;
-				return;
-			}
-			relv = a[rindex]->a_addr;
-		}
-		adw_w(relv, rtp);
-	}
-
-	/*
-	 * Paged values
-	 */
-	aindex = adw_w(0,2);
-	if (aindex >= hp->h_narea) {
-		fprintf(stderr, "P area error\n");
-		lkerr++;
-		return;
-	}
-	sdp.s_areax = a[aindex];
-	sdp.s_area = sdp.s_areax->a_bap;
-	sdp.s_addr = adw_w(0,4);
-	if (sdp.s_area->a_addr & 0xFF || sdp.s_addr & 0xFF)
-		relerp("Page Definition Boundary Error");
-}
-
-/*)Function VOID	rele()
+ *      The function reloc() calls the proper version
+ *      of the linker code.
  *
- *	The function rele() closes all open output files
- *	at the end of the linking process.
+ *      local variable:
+ *              none
  *
- *	local variable:
- *		none
+ *      global variables:
+ *              ASxxxx_VERSION          ASxxxx REL file version
  *
- *	global variables:
- *		int oflag		output type flag
- *		int uflag		relocation listing flag
- *
- *	called functions:
- * sdld specific
- *		VOID	elf()		lkelf.c
- *		VOID	gb()		lkgb.c
- * end sdld specific
- *		VOID	ihx()		lkihx.c
- *		VOID	lkulist()	lklist.c
- *		VOID	s19()		lks19.c
+ *      called functions:
+ *              VOID    reloc3()        lkrloc3.c
+ *              VOID    reloc4()        lkrloc4.c
  *
- *	side effects:
- *		All open output files are closed.
+ *      side effects:
+ *              Refer to the called relocation functions.
  *
  */
 
 VOID
-rele()
+reloc(int c)
 {
-	if (uflag != 0) {
-		lkulist(0);
-	}
-	if (oflag == 1) {
-		ihx(0);
-	} else
-	if (oflag == 2) {
-		s19(0);
-	}
-/* sdld specific */
-	else
-	if (oflag == 4) {
-		elf(0);
-	}
-/* end sdld specific */
-}
-
-/*)Function a_uint		evword()
- *
- *	The function evword() combines two byte values
- *	into a single word value.
- *
- *	local variable:
- *		a_uint	v		temporary evaluation variable
- *
- *	global variables:
- *		hilo			byte ordering parameter
- *
- *	called functions:
- *		int eval()		lkeval.c
- *
- *	side effects:
- *		Relocation text line is scanned to combine
- *		two byte values into a single word value.
- *
- */
+        switch(ASxxxx_VERSION) {
+        case 3:
+                reloc3(c);
+                break;
 
-a_uint
-evword()
-{
-	register a_uint v;
+//      case 4:
+//              reloc4(c);
+//              break;
 
-	if (hilo) {
-		v =  (eval() << 8);
-		v +=  eval();
-	} else {
-		v =   eval();
-		v += (eval() << 8);
-	}
-	return(v);
+        default:
+                fprintf(stderr, "Internal Version Error");
+                lkexit(ER_FATAL);
+                break;
+        }
 }
 
-/*)Function a_uint		adb_b(v, i)
- *
- *		int v		value to add to byte
- *		int i		rtval[] index
- *
- *	The function adb_b() adds the value of v to
- *	the single byte value contained in rtval[i].
- *	The new value of rtval[i] is returned.
- *
- *	local variable:
- *		none
- *
- *	global variables:
- *		none
- *
- *	called functions:
- *		none
- *
- *	side effects:
- *		The value of rtval[] is changed.
- *
- */
-
-a_uint
-adb_b(v, i)
-register a_uint v;
-register int i;
-{
-	return(rtval[i] += v);
-}
 
-/* sdld specific */
-/*)Function a_uint		adb_bit(v, i)
- *
- *		int v		value to add to byte
- *		int i		rtval[] index
+/*)Function a_uint              evword()
  *
- *	The function adb_bit() converts the single
- *	byte address value contained in rtval[i] to bit-
- *	addressable space and adds the value of v to it.
- *	The new value of rtval[i] is returned.
+ *      The function evword() combines two byte values
+ *      into a single word value.
  *
- *	local variable:
- *		a_uint	j		temporary evaluation variable
+ *      local variable:
+ *              a_uint  v               temporary evaluation variable
  *
- *	global variables:
- *		none
+ *      global variables:
+ *              hilo                    byte ordering parameter
  *
- *	called functions:
- *		none
+ *      called functions:
+ *              int eval()              lkeval.c
  *
- *	side effects:
- *		The value of rtval[] is changed.
+ *      side effects:
+ *              Relocation text line is scanned to combine
+ *              two byte values into a single word value.
  *
  */
 
 a_uint
-adb_bit(v, i)
-register a_uint v;
-register int i;
+evword(void)
 {
-	register a_uint j;
+        a_uint v;
 
-	j = adb_lo(v, i) & 0xFF;
-	if ((j >= 0x20) && (j <= 0x2F)) {
-		j = (j - 0x20) * 8;
-	} else if ((j < 0x80) || ((j & 0x07) != 0)) {
-		return(0x100);//error
-	}
-
-	if (hilo) {
-		j = rtval[i+1] = j + (rtval[i] & 0x07);
-	} else {
-		j = rtval[i] = j + (rtval[i+1] & 0x07);
-	}
-	return(j);
+        if (hilo) {
+                v =  (eval() << 8);
+                v +=  eval();
+        } else {
+                v =   eval();
+                v += (eval() << 8);
+        }
+        return(v);
 }
-/* end sdld specific */
 
-/*)Function a_uint		adb_lo(v, i)
+/*)Function a_uint              adb_1b(v, i)
  *
- *		int v		value to add to byte
- *		int i		rtval[] index
+ *              a_uint v        value to add to byte
+ *              int i           rtval[] index
  *
- *	The function adb_lo() adds the value of v to the
- *	double byte value contained in rtval[i] and rtval[i+1].
- *	The new value of rtval[i] / rtval[i+1] is returned.
- *	The MSB rtflg[] is cleared.
+ *      The function adb_1b() adds the value of v to
+ *      the single byte value contained in rtval[i].
+ *      The new value of rtval[i] is returned.
  *
- *	local variable:
- *		a_uint	j		temporary evaluation variable
+ *      local variable:
+ *              a_uint  j               temporary evaluation variable
  *
- *	global variables:
- *		hilo			byte ordering parameter
+ *      global variables:
+ *              none
  *
- *	called functions:
- *		none
+ *      called functions:
+ *              none
  *
- *	side effects:
- *		The value of rtval[] is changed.
- *		The rtflg[] value corresponding to the
- *		MSB of the word value is cleared to reflect
- *		the fact that the LSB is the selected byte.
+ *      side effects:
+ *              The byte value of rtval[] is changed.
  *
  */
 
 a_uint
-adb_lo(v, i)
-a_uint v;
-int i;
+adb_1b(a_uint v, int i)
 {
-	register a_uint j;
-
-	j = adw_w(v, i);
-	/*
-	 * Remove Hi byte
-	 */
-	if (hilo) {
-		rtflg[i] = 0;
-	} else {
-		rtflg[i+1] = 0;
-	}
-	return (j);
-}
+        a_uint j;
 
-/*)Function a_uint		adb_hi(v, i)
- *
- *		int v		value to add to byte
- *		int i		rtval[] index
- *
- *	The function adb_hi() adds the value of v to the
- *	double byte value contained in rtval[i] and rtval[i+1].
- *	The new value of rtval[i] / rtval[i+1] is returned.
- *	The LSB rtflg[] is cleared.
- *
- *	local variable:
- *		a_uint	j		temporary evaluation variable
- *
- *	global variables:
- *		hilo			byte ordering parameter
- *
- *	called functions:
- *		none
- *
- *	side effects:
- *		The value of rtval[] is changed.
- *		The rtflg[] value corresponding to the
- *		LSB of the word value is cleared to reflect
- *		the fact that the MSB is the selected byte.
- *
- */
-
-a_uint
-adb_hi(v, i)
-a_uint v;
-int i;
-{
-	register a_uint j;
+        j = v + rtval[i];
+        rtval[i] = j & ((a_uint) 0x000000FF);
 
-	j = adw_w(v, i);
-	/*
-	 * Remove Lo byte
-	 */
-	if (hilo) {
-		rtflg[i+1] = 0;
-	} else {
-		rtflg[i] = 0;
-	}
-	return (j);
+        return(j);
 }
 
-/* sdld specific */
-/*)Function a_uint		adb_24_bit(v, i)
+/*)Function     a_uint  adb_2b(v, i)
  *
- *		int v		value to add to byte
- *		int i		rtval[] index
+ *              a_uint  v               value to add to word
+ *              int     i               rtval[] index
  *
- *	The function adb_24_bit() converts the single
- *	byte address value contained in rtval[i] to bit-
- *	addressable space and adds the value of v to it.
- *	The new value of rtval[i] is returned.
+ *      The function adb_2b() adds the value of v to the
+ *      2 byte value contained in rtval[i] and rtval[i+1].
+ *      The new value of rtval[i] / rtval[i+1] is returned.
  *
- *	local variable:
- *		a_uint	j		temporary evaluation variable
+ *      local variable:
+ *              a_uint  j               temporary evaluation variable
  *
- *	global variables:
- *		none
+ *      global variables:
+ *              hilo                    byte ordering parameter
  *
- *	called functions:
- *		none
+ *      called functions:
+ *              none
  *
- *	side effects:
- *		The value of rtval[] is changed.
+ *      side effects:
+ *              The 2 byte value of rtval[] is changed.
  *
  */
 
 a_uint
-adb_24_bit(v, i)
-a_uint v;
-int i;
+adb_2b(a_uint v, int i)
 {
-	register a_uint j;
+        a_uint j;
 
-	j = adb_24_lo(v, i) & 0xFF;
-	if ((j >= 0x20) && (j <= 0x2F)) {
-		j = (j - 0x20) * 8;
-	} else if ((j < 0x80) || ((j & 0x07) != 0)) {
-		return(0x100);//error
-	}
-
-	if (hilo) {
-		j = rtval[i+2] = j + (rtval[i+1] & 0x07);
-	} else {
-		j = rtval[i] = j + (rtval[i+1] & 0x07);
-	}
-	return(j);
+        if (hilo) {
+                j = v + (rtval[i+0] << 8) +
+                        (rtval[i+1] << 0);
+                rtval[i+0] = (j >> 8) & ((a_uint) 0x000000FF);
+                rtval[i+1] = (j >> 0) & ((a_uint) 0x000000FF);
+        } else {
+                j = v + (rtval[i+0] << 0) +
+                        (rtval[i+1] << 8);
+                rtval[i+0] = (j >> 0) & ((a_uint) 0x000000FF);
+                rtval[i+1] = (j >> 8) & ((a_uint) 0x000000FF);
+        }
+        return(j);
 }
 
-/*)Function a_uint		adb_24_hi(v, i)
+/*)Function     a_uint  adb_3b(v, i)
  *
- *		int v		value to add to byte
- *		int i		rtval[] index
- *
- *	The function adb_24_hi() adds the value of v to the
- *	24 bit value contained in rtval[i] - rtval[i+2].
- *	The new value of rtval[i] / rtval[i+1] is returned.
- *	The LSB & middle byte rtflg[] is cleared.
- *
- *	local variable:
- *		a_uint	j		temporary evaluation variable
- *
- *	global variables:
- *		hilo			byte ordering parameter
- *
- *	called functions:
- *		none
- *
- *	side effects:
- *		The value of rtval[] is changed.
- *		The rtflg[] value corresponding to the
- *		LSB & middle byte of the word value is cleared to
- *		reflect the fact that the MSB is the selected byte.
- *
- */
-
-a_uint
-adb_24_hi(v, i)
-a_uint v;
-int i;
-{
-	register a_uint j;
-
-	j = adw_24(v, i);
-
-	/* Remove the lower two bytes. */
-	if (hilo)
-	{
-		rtflg[i+2] = 0;
-	}
-	else
-	{
-		rtflg[i] = 0;
-	}
-	rtflg[i+1] = 0;
-
-	return (j);
-}
-
-/*)Function a_uint		adb_24_mid(v, i)
+ *              a_uint  v               value to add to word
+ *              int     i               rtval[] index
  *
- *		int v		value to add to byte
- *		int i		rtval[] index
+ *      The function adb_3b() adds the value of v to the
+ *      three byte value contained in rtval[i], rtval[i+1], and rtval[i+2].
+ *      The new value of rtval[i] / rtval[i+1] / rtval[i+2] is returned.
  *
- *	The function adb_24_mid() adds the value of v to the
- *	24 bit value contained in rtval[i] - rtval[i+2].
- *	The new value of rtval[i] / rtval[i+1] is returned.
- *	The LSB & MSB byte rtflg[] is cleared.
- *
- *	local variable:
- *		a_uint	j		temporary evaluation variable
- *
- *	global variables:
- *		hilo			byte ordering parameter
- *
- *	called functions:
- *		none
- *
- *	side effects:
- *		The value of rtval[] is changed.
- *		The rtflg[] value corresponding to the
- *		LSB & MSB of the 24 bit value is cleared to reflect
- *		the fact that the middle byte is the selected byte.
+ *      local variable:
+ *              a_uint  j               temporary evaluation variable
  *
- */
-
-a_uint
-adb_24_mid(v, i)
-a_uint v;
-int i;
-{
-	register a_uint j;
-
-	j = adw_24(v, i);
-
-	/* remove the MSB & LSB. */
-	rtflg[i+2] = 0;
-	rtflg[i] = 0;
-
-	return (j);
-}
-
-/*)Function a_uint		adb_24_lo(v, i)
+ *      global variables:
+ *              hilo                    byte ordering parameter
  *
- *		int v		value to add to byte
- *		int i		rtval[] index
+ *      called functions:
+ *              none
  *
- *	The function adb_24_lo() adds the value of v to the
- *	24 bit value contained in rtval[i] - rtval[i+2].
- *	The new value of rtval[i] / rtval[i+1] is returned.
- *	The MSB & middle byte rtflg[] is cleared.
- *
- *	local variable:
- *		a_uint	j		temporary evaluation variable
- *
- *	global variables:
- *		hilo			byte ordering parameter
- *
- *	called functions:
- *		none
- *
- *	side effects:
- *		The value of rtval[] is changed.
- *		The rtflg[] value corresponding to the
- *		MSB & middle byte  of the word value is cleared to
- *		reflect the fact that the LSB is the selected byte.
+ *      side effects:
+ *              The 3 byte value of rtval[] is changed.
  *
  */
 
 a_uint
-adb_24_lo(v, i)
-a_uint v;
-int i;
+adb_3b(a_uint v, int i)
 {
-	register a_uint j;
-
-	j = adw_24(v, i);
+        a_uint j;
 
-	/* Remove the upper two bytes. */
-	if (hilo)
-	{
-		rtflg[i] = 0;
-	}
-	else
-	{
-		rtflg[i+2] = 0;
-	}
-	rtflg[i+1] = 0;
-
-	return (j);
+        if (hilo) {
+                j = v + (rtval[i+0] << 16) +
+                        (rtval[i+1] <<  8) +
+                        (rtval[i+2] <<  0);
+                rtval[i+0] = (j >> 16) & ((a_uint) 0x000000FF);
+                rtval[i+1] = (j >>  8) & ((a_uint) 0x000000FF);
+                rtval[i+2] = (j >>  0) & ((a_uint) 0x000000FF);
+        } else {
+                j = v + (rtval[i+0] <<  0) +
+                        (rtval[i+1] <<  8) +
+                        (rtval[i+2] << 16);
+                rtval[i+0] = (j >>  0) & ((a_uint) 0x000000FF);
+                rtval[i+1] = (j >>  8) & ((a_uint) 0x000000FF);
+                rtval[i+2] = (j >> 16) & ((a_uint) 0x000000FF);
+        }
+        return(j);
 }
-/* end sdld specific */
 
-/*)Function a_uint		adw_w(v, i)
+/*)Function     a_uint  adb_4b(v, i)
  *
- *		int v		value to add to word
- *		int i		rtval[] index
+ *              a_uint  v               value to add to word
+ *              int     i               rtval[] index
  *
- *	The function adw_w() adds the value of v to the
- *	word value contained in rtval[i] and rtval[i+1].
- *	The new value of rtval[i] / rtval[i+1] is returned.
+ *      The function adb_4b() adds the value of v to the
+ *      four byte value contained in rtval[i], ..., rtval[i+3].
+ *      The new value of rtval[i], ...,  rtval[i+3] is returned.
  *
- *	local variable:
- *		a_uint	j		temporary evaluation variable
+ *      local variable:
+ *              a_uint  j               temporary evaluation variable
  *
- *	global variables:
- *		hilo			byte ordering parameter
+ *      global variables:
+ *              hilo                    byte ordering parameter
  *
- *	called functions:
- *		none
+ *      called functions:
+ *              none
  *
- *	side effects:
- *		The word value of rtval[] is changed.
+ *      side effects:
+ *              The 4 byte value of rtval[] is changed.
  *
  */
 
 a_uint
-adw_w(v, i)
-a_uint v;
-int i;
-{
-	register a_uint j;
-
-	if (hilo) {
-		j = v + (rtval[i] << 8) + (rtval[i+1] & 0xff);
-		rtval[i] = (j >> 8) & 0xff;
-		rtval[i+1] = j & 0xff;
-	} else {
-		j = v + (rtval[i] & 0xff) + (rtval[i+1] << 8);
-		rtval[i] = j & 0xff;
-		rtval[i+1] = (j >> 8) & 0xff;
-	}
-	return(j);
-}
-
-/* sdld specific */
-/*)Function a_uint		adw_24(v, i)
- *
- *		int v		value to add to word
- *		int i		rtval[] index
- *
- *	The function adw_w() adds the value of v to the
- *	24 bit value contained in rtval[i] - rtval[i+2].
- *	The new value of rtval[i] - rtval[i+2] is returned.
- *
- *	local variable:
- *		a_uint	j		temporary evaluation variable
- *
- *	global variables:
- *		hilo			byte ordering parameter
- *
- *	called functions:
- *		none
- *
- *	side effects:
- *		The word value of rtval[] is changed.
- *
- */
-a_uint
-adw_24(v, i)
-a_uint v;
-int i;
+adb_4b(a_uint v, int i)
 {
-	register a_uint j;
+        a_uint j;
 
-	if (hilo) {
-		j = v + ((rtval[i] & 0xff) << 16)
-			  + ((rtval[i+1] & 0xff) << 8)
-			  + (rtval[i+2] & 0xff);
-		rtval[i] = (j >> 16) & 0xff;
-		rtval[i+1] = (j >> 8) & 0xff;
-		rtval[i+2] = j & 0xff;
-	} else {
-		j = v + (rtval[i] & 0xff)
-			  + ((rtval[i+1] & 0xff) << 8)
-			  + ((rtval[i+2] & 0xff) << 16);
-		rtval[i] = j & 0xff;
-		rtval[i+1] = (j >> 8) & 0xff;
-		rtval[i+2] = (j >> 16) & 0xff;
-	}
-	return(j);
+        if (hilo) {
+                j = v + (rtval[i+0] << 24) +
+                        (rtval[i+1] << 16) +
+                        (rtval[i+2] <<  8) +
+                        (rtval[i+3] <<  0);
+                rtval[i+0] = (j >> 24) & ((a_uint) 0x000000FF);
+                rtval[i+1] = (j >> 16) & ((a_uint) 0x000000FF);
+                rtval[i+2] = (j >>  8) & ((a_uint) 0x000000FF);
+                rtval[i+3] = (j >>  0) & ((a_uint) 0x000000FF);
+        } else {
+                j = v + (rtval[i+0] <<  0) +
+                        (rtval[i+1] <<  8) +
+                        (rtval[i+2] << 16) +
+                        (rtval[i+3] << 24);
+                rtval[i+0] = (j >>  0) & ((a_uint) 0x000000FF);
+                rtval[i+1] = (j >>  8) & ((a_uint) 0x000000FF);
+                rtval[i+2] = (j >> 16) & ((a_uint) 0x000000FF);
+                rtval[i+3] = (j >> 24) & ((a_uint) 0x000000FF);
+        }
+        return(j);
 }
-/* end sdld specific */
 
-/*)Function a_uint		adw_lo(v, i)
- *
- *		int v		value to add to byte
- *		int i		rtval[] index
- *
- *	The function adw_lo() adds the value of v to the
- *	double byte value contained in rtval[i] and rtval[i+1].
- *	The new value of rtval[i] / rtval[i+1] is returned.
- *	The MSB rtval[] is zeroed.
+/*)Function     a_uint  adb_xb(v, i)
  *
- *	local variable:
- *		a_uint	j		temporary evaluation variable
+ *              a_uint  v               value to add to x-bytes
+ *              int     i               rtval[] index
  *
- *	global variables:
- *		hilo			byte ordering parameter
+ *      The function adb_xb() adds the value of v to
+ *      the value contained in rtval[i] for x-bytes.
+ *      The new value of rtval[i] for x-bytes is returned.
  *
- *	called functions:
- *		none
+ *      local variable:
+ *              none
  *
- *	side effects:
- *		The value of rtval[] is changed.
- *		The MSB of the word value is cleared to reflect
- *		the fact that the LSB is the selected byte.
- *
- */
-
-a_uint
-adw_lo(v, i)
-a_uint v;
-int i;
-{
-	register a_uint j;
-
-	j = adw_w(v, i);
-	/*
-	 * Clear Hi byte
-	 */
-	if (hilo) {
-		rtval[i] = 0;
-	} else {
-		rtval[i+1] = 0;
-	}
-	return (j);
-}
-
-/*)Function a_uint		adw_hi(v, i)
+ *      global variables:
+ *              int     a_bytes         T Line Address Bytes
  *
- *		int v		value to add to byte
- *		int i		rtval[] index
+ *      called functions:
+ *              a_uint  adb_1b()        lkrloc.c
+ *              a_uint  adb_2b()        lkrloc.c
+ *              a_uint  adb_3b()        lkrloc.c
+ *              a_uint  adb_4b()        lkrloc.c
  *
- *	The function adw_hi() adds the value of v to the
- *	double byte value contained in rtval[i] and rtval[i+1].
- *	The new value of rtval[i] / rtval[i+1] is returned.
- *	The MSB and LSB values are interchanged.
- *	The MSB rtval[] is zeroed.
- *
- *	local variable:
- *		a_uint	j		temporary evaluation variable
- *
- *	global variables:
- *		hilo			byte ordering parameter
- *
- *	called functions:
- *		none
- *
- *	side effects:
- *		The value of rtval[] is changed.
- *		The MSB and LSB values are interchanged and
- *		then the MSB cleared.
+ *      side effects:
+ *              The x-byte value of rtval[] is changed.
  *
  */
 
 a_uint
-adw_hi(v, i)
-a_uint v;
-int i;
-{
-	register a_uint j;
-
-	j = adw_w(v, i);
-	/*
-	 * LSB = MSB, Clear MSB
-	 */
-	if (hilo) {
-		rtval[i+1] = rtval[i];
-		rtval[i] = 0;
-	} else {
-		rtval[i] = rtval[i+1];
-		rtval[i+1] = 0;
-	}
-	return (j);
-}
-
-/*)Function VOID	relerr(str)
- *
- *		char	*str		error string
- *
- *	The function relerr() outputs the error string to
- *	stderr and to the map file (if it is open).
- *
- *	local variable:
- *		none
- *
- *	global variables:
- *		FILE	*mfp		handle for the map file
- *
- *	called functions:
- *		VOID	errdmp()	lkrloc.c
- *
- *	side effects:
- *		Error message inserted into map file.
- *
- */
-
-VOID
-relerr(str)
-char *str;
+adb_xb(a_uint v, int i)
 {
-	errdmp(stderr, str);
-	if (mfp)
-		errdmp(mfp, str);
-}
-
-/*)Function VOID	errdmp(fptr, str)
- *
- *		FILE	*fptr		output file handle
- *		char	*str		error string
- *
- *	The function errdmp() outputs the error string str
- *	to the device specified by fptr.  Additional information
- *	is output about the definition and referencing of
- *	the symbol / area error.
- *
- *	local variable:
- *		int mode		error mode
- *		int aindex		area index
- *		int lkerr		error flag
- *		int rindex		error index
- *		sym **s		pointer to array of symbol pointers
- *		areax	**a		pointer to array of area pointers
- *		areax	*raxp		error area extension pointer
- *
- *	global variables:
- *		sdp sdp		base page structure
- *
- *	called functions:
- *		int fprintf()	c_library
- *		VOID	prntval()	lkrloc.c
- *
- *	side effects:
- *		Error reported.
- *
- */
+        a_uint j;
 
-VOID
-errdmp(fptr, str)
-FILE *fptr;
-char *str;
-{
-	int mode, aindex, rindex;
-	struct sym **s;
-	struct areax **a;
-	struct areax *raxp;
-
-	a = hp->a_list;
-	s = hp->s_list;
-
-	mode = rerr.mode;
-	aindex = rerr.aindex;
-	rindex = rerr.rindex;
-
-	/*
-	 * Print Error
-	 */
-	fprintf(fptr, "\n?ASlink-Warning-%s", str);
-	lkerr++;
-
-	/*
-	 * Print symbol if symbol based
-	 */
-	if (mode & R3_SYM) {
-		fprintf(fptr, " for symbol  %s\n",
-			&s[rindex]->s_id[0]);
-	} else {
-		fprintf(fptr, "\n");
-	}
-
-	/*
-	 * Print Ref Info
-	 */
-/*         111111111122222222223333333333444444444455555555556666666666777*/
-/*123456789012345678901234567890123456789012345678901234567890123456789012*/
-	fprintf(fptr,
-"         file              module            area              offset\n");
-	fprintf(fptr,
-"  Refby  %-14.14s    %-14.14s    %-14.14s    ",
-			hp->h_lfile->f_idp,
-			&hp->m_id[0],
-			&a[aindex]->a_bap->a_id[0]);
-	prntval(fptr, rerr.rtbase);
-
-	/*
-	 * Print Def Info
-	 */
-	if (mode & R3_SYM) {
-		raxp = s[rindex]->s_axp;
-	} else {
-		raxp = a[rindex];
-	}
-/*         111111111122222222223333333333444444444455555555556666666666777*/
-/*123456789012345678901234567890123456789012345678901234567890123456789012*/
-	fprintf(fptr,
-"  Defin  %-14.14s    %-14.14s    %-14.14s    ",
-			raxp->a_bhp->h_lfile->f_idp,
-			&raxp->a_bhp->m_id[0],
-			&raxp->a_bap->a_id[0]);
-	if (mode & R3_SYM) {
-		prntval(fptr, s[rindex]->s_addr);
-	} else {
-		prntval(fptr, rerr.rval);
-	}
+        switch(a_bytes){
+        case 1:
+                j = adb_1b(v, i);
+                j = (j & ((a_uint) 0x00000080) ? j | ~((a_uint) 0x0000007F) : j & ((a_uint) 0x0000007F));
+                break;
+        case 2:
+                j = adb_2b(v, i);
+                j = (j & ((a_uint) 0x00008000) ? j | ~((a_uint) 0x00007FFF) : j & ((a_uint) 0x00007FFF));
+                break;
+        case 3:
+                j = adb_3b(v, i);
+                j = (j & ((a_uint) 0x00800000) ? j | ~((a_uint) 0x007FFFFF) : j & ((a_uint) 0x007FFFFF));
+                break;
+        case 4:
+                j = adb_4b(v, i);
+                j = (j & ((a_uint) 0x80000000) ? j | ~((a_uint) 0x7FFFFFFF) : j & ((a_uint) 0x7FFFFFFF));
+                break;
+        default:
+                j = 0;
+                break;
+        }
+        return(j);
 }
 
 /*)Function VOID prntval(fptr, v)
  *
- *		FILE	*fptr	output file handle
- *		a_uint	v		value to output
+ *              FILE    *fptr           output file handle
+ *              a_uint  v               value to output
  *
- *	The function prntval() outputs the value v, in the
- *	currently selected radix, to the device specified
- *	by fptr.
+ *      The function prntval() outputs the value v, in the
+ *      currently selected radix, to the device specified
+ *      by fptr.
  *
- *	local variable:
- *		none
+ *      local variable:
+ *              none
  *
- *	global variables:
- *		int xflag		current radix
+ *      global variables:
+ *              int xflag               current radix
  *
- *	called functions:
- *		int fprintf()	c_library
+ *      called functions:
+ *              int fprintf()   c_library
  *
- *	side effects:
- *		none
+ *      side effects:
+ *              none
  *
  */
 
@@ -1556,98 +383,34 @@
 FILE *fptr;
 a_uint v;
 {
-	if (xflag == 0) {
-		fprintf(fptr, "%04X\n", v);
-	} else
-	if (xflag == 1) {
-		fprintf(fptr, "%06o\n", v);
-	} else
-	if (xflag == 2) {
-		fprintf(fptr, "%05u\n", v);
-	}
-}
-
-/*)Function VOID	relerp(str)
- *
- *		char	*str		error string
- *
- *	The function relerp() outputs the paging error string to
- *	stderr and to the map file (if it is open).
- *
- *	local variable:
- *		none
- *
- *	global variables:
- *		FILE	*mfp		handle for the map file
- *
- *	called functions:
- *		VOID	erpdmp()	lkrloc.c
- *
- *	side effects:
- *		Error message inserted into map file.
- *
- */
-
-VOID
-relerp(str)
-char *str;
-{
-	erpdmp(stderr, str);
-	if (mfp)
-		erpdmp(mfp, str);
-}
-
-/*)Function VOID	erpdmp(fptr, str)
- *
- *		FILE	*fptr		output file handle
- *		char	*str		error string
- *
- *	The function erpdmp() outputs the error string str
- *	to the device specified by fptr.
- *
- *	local variable:
- *		head	*thp		pointer to head structure
- *
- *	global variables:
- *		int		lkerr		error flag
- *		sdp		sdp			base page structure
- *
- *	called functions:
- *		int fprintf()		c_library
- *		VOID	prntval()	lkrloc.c
- *
- *	side effects:
- *		Error reported.
- *
- */
-
-VOID
-erpdmp(fptr, str)
-FILE *fptr;
-char *str;
-{
-	register struct head *thp;
-
-	thp = sdp.s_areax->a_bhp;
+        char *frmt;
 
-	/*
-	 * Print Error
-	 */
-	fprintf(fptr, "\n?ASlink-Warning-%s\n", str);
-	lkerr++;
-
-	/*
-	 * Print PgDef Info
-	 */
-/*         111111111122222222223333333333444444444455555555556666666666777*/
-/*123456789012345678901234567890123456789012345678901234567890123456789012*/
-	fprintf(fptr,
-"         file              module            pgarea            pgoffset\n");
-	fprintf(fptr,
-"  PgDef  %-14.14s    %-14.14s    %-14.14s    ",
-			thp->h_lfile->f_idp,
-			&thp->m_id[0],
-			&sdp.s_area->a_id[0]);
-	prntval(fptr, sdp.s_area->a_addr + sdp.s_addr);
+        switch(xflag) {
+        default:
+        case 0:
+                switch(a_bytes) {
+                default:
+                case 2: frmt = "       %04X\n"; break;
+                case 3: frmt = "     %06X\n"; break;
+                case 4: frmt = "   %08X\n"; break;
+                }
+                break;
+        case 1:
+                switch(a_bytes) {
+                default:
+                case 2: frmt = "     %06o\n"; break;
+                case 3: frmt = "   %08o\n"; break;
+                case 4: frmt = "%011o\n"; break;
+                }
+                break;
+        case 2:
+                switch(a_bytes) {
+                default:
+                case 2: frmt = "      %05u\n"; break;
+                case 3: frmt = "   %08u\n"; break;
+                case 4: frmt = " %010u\n"; break;
+                }
+                break;
+        }
+        fprintf(fptr, frmt, v & a_mask);
 }
-
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/lkrloc3.c sdcc-3.2.0+dfsg/sdas/linksrc/lkrloc3.c
--- sdcc-3.1.0+dfsg/sdas/linksrc/lkrloc3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/lkrloc3.c	2011-12-06 23:01:37.000000000 +0000
@@ -0,0 +1,1302 @@
+/* lkrloc3.c */
+
+/*
+ *  Copyright (C) 1989-2010  Alan R. Baldwin
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ * Alan R. Baldwin
+ * 721 Berkeley St.
+ * Kent, Ohio  44240
+ *
+ *   With enhancements from:
+ *
+ *      John L. Hartman (JLH)
+ *      jhartman@compuserve.com
+ *
+ *      Bill McKinnon (BM)
+ *      w_mckinnon@conknet.com
+ */
+
+#include "aslink.h"
+
+/*)Module       lkrloc3.c
+ *
+ *      The module lkrloc3.c contains the functions which
+ *      perform the version 3 relocation calculations.
+ *
+ *      lkrloc3.c contains the following functions:
+ *              a_uint  adb_lo()
+ *              a_uint  adb_hi()
+ *              VOID    erpdmp3()
+ *              VOID    errdmp3()
+ *              VOID    rele3()
+ *              VOID    relerr3()
+ *              VOID    relerp3()
+ *              VOID    reloc3()
+ *              VOID    relp3()
+ *              VOID    relr3()
+ *              VOID    relt3()
+ *
+ *      lkrloc3.c the local variable errmsg3[].
+ *
+ */
+
+/*)Function VOID        reloc3(c)
+ *
+ *                      int c           process code
+ *
+ *      The function reloc3() calls a particular relocation
+ *      function determined by the process code.
+ *
+ *      local variable:
+ *              none
+ *
+ *      global variables:
+ *              int lkerr                       error flag
+ *
+ *      called functions:
+ *              int fprintf()           c_library
+ *              VOID    rele3()         lkrloc3.c
+ *              VOID    relp3()         lkrloc3.c
+ *              VOID    relr3()         lkrloc3.c
+ *              VOId    relt3()         lkrloc3.c
+ *
+ *      side effects:
+ *              Refer to the called relocation functions.
+ *
+ */
+
+VOID
+reloc3(int c)
+{
+        switch(c) {
+
+        case 'T':
+                relt3();
+                break;
+
+        case 'R':
+                relr3();
+                break;
+
+        case 'P':
+                relp3();
+                break;
+
+        case 'E':
+                rele3();
+                break;
+
+        default:
+                fprintf(stderr, "Undefined Relocation Operation\n");
+                lkerr++;
+                break;
+
+        }
+}
+
+
+/*)Function VOID        relt3()
+ *
+ *      The function relt3() evaluates a T line read by
+ *      the linker. Each byte value read is saved in the
+ *      rtval[] array, rtflg[] is set, and the number of
+ *      evaluations is maintained in rtcnt.
+ *
+ *              T Line
+ *
+ *              T xx xx nn nn nn nn nn ...
+ *
+ *
+ *              In: "T n0 n1 n2 n3 ... nn"
+ *
+ *              Out:     0       1        2    ..  rtcnt
+ *                        +----+----+----+----+----+
+ *              rtval | n0 | n1 | n2 | .. | nn |
+ *                        +----+----+----+----+----+
+ *              rtflag|  1 |  1 |  1 |  1 |  1 |
+ *                        +----+----+----+----+----+
+ *
+ *      The T line contains the assembled code output by the assem-
+ *      bler with xx xx being the offset address from the current area
+ *      base address and nn being the assembled instructions and data in
+ *      byte format.
+ *
+ *      local variable:
+ *              none
+ *
+ *      global variables:
+ *              int rtcnt               number of values evaluated
+ *              int rtflg[]             array of evaluation flags
+ *              int rtval[]             array of evaluation values
+ *
+ *      called functions:
+ *              int eval()              lkeval.c
+ *              int more()              lklex.c
+ *
+ *      side effects:
+ *              Linker input T line evaluated.
+ *
+ */
+
+VOID
+relt3(void)
+{
+        rtcnt = 0;
+        while (more()) {
+                if (rtcnt < NTXT) {
+                        rtval[rtcnt] = eval();
+                        rtflg[rtcnt] = 1;
+                        rterr[rtcnt] = 0;
+                        rtcnt++;
+                }
+        }
+}
+
+/*)Function     VOID    relr3()
+ *
+ *      The function relr3() evaluates a R line read by
+ *      the linker.  The R line data is combined with the
+ *      previous T line data to perform the relocation of
+ *      code and data bytes.  The S19 / IHX output and
+ *      translation of the LST files to RST files may be
+ *      performed.
+ *
+ *              R Line
+ *
+ *              R 0 0 nn nn n1 n2 xx xx ...
+ *
+ *      The R line provides the relocation information to the linker.
+ *      The nn nn value is the current area index, i.e.  which area  the
+ *      current  values  were  assembled.  Relocation information is en-
+ *      coded in groups of 4 bytes:
+ *
+ *      1.  n1 is the relocation mode and object format
+ *              1.  bit 0 word(0x00)/byte(0x01)
+ *              2.  bit 1 relocatable area(0x00)/symbol(0x02)
+ *              3.  bit 2 normal(0x00)/PC relative(0x04) relocation
+ *              4.  bit 3 1-byte(0x00)/2-byte(0x08) byte data
+ *              5.  bit 4 signed(0x00)/unsigned(0x10) byte data
+ *              6.  bit 5 normal(0x00)/page '0'(0x20) reference
+ *              7.  bit 6 normal(0x00)/page 'nnn'(0x40) reference
+ *
+ *      2.  n2  is  a byte index into the corresponding (i.e.  pre-
+ *              ceeding) T line data (i.e.  a pointer to the data to be
+ *              updated  by  the  relocation).   The T line data may be
+ *              1-byte or  2-byte  byte  data  format  or  2-byte  word
+ *              format.
+ *
+ *      3.  xx xx  is the area/symbol index for the area/symbol be-
+ *              ing referenced.  the corresponding area/symbol is found
+ *              in the header area/symbol lists.
+ *
+ *      The groups of 4 bytes are repeated for each item requiring relo-
+ *      cation in the preceeding T line.
+ *
+ *      local variable:
+ *              areax   **a             pointer to array of area pointers
+ *              int     aindex          area index
+ *              char    *errmsg3[]      array of pointers to error strings
+ *              int     error           error code
+ *              int     mode            relocation mode
+ *              adrr_t  paga            paging base area address
+ *              a_uint  pags            paging symbol address
+ *              a_uint  r               PCR relocation value
+ *              a_uint  reli            relocation initial value
+ *              a_uint  relv            relocation final value
+ *              int     rindex          symbol / area index
+ *              a_uint  rtbase          base code address
+ *              a_uint  rtofst          rtval[] index offset
+ *              int rtp                 index into T data
+ *              sym **s                 pointer to array of symbol pointers
+ *
+ *      global variables:
+ *              head    *hp             pointer to the head structure
+ *              int     lkerr           error flag
+ *              a_uint  pc              relocated base address
+ *              int     pcb             bytes per instruction word
+ *              rerr    rerr            linker error structure
+ *              FILE    *stderr         standard error device
+ *
+ *      called functions:
+ *              a_uint  adb_1b()        lkrloc.c
+ *              a_uint  adb_2b()        lkrloc.c
+ *              a_uint  adb_lo()        lkrloc3.c
+ *              a_uint  adb_hi()        lkrloc3.c
+ * sdld specific
+ *              VOID    elf()           lkelf.c
+ *              VOID    gb()            lkgb.c
+ * end sdld specific
+ *              a_uint  evword()        lkrloc.c
+ *              int     eval()          lkeval.c
+ *              int     fprintf()       c_library
+ *              VOID    ihx()           lkihx.c
+ *              VOID    s19()           lks19.c
+ *              VOID    lkulist         lklist.c
+ *              int     more()          lklex.c
+ *              VOID    relerr3()       lkrloc3.c
+ *              int     symval()        lksym.c
+ *
+ *      side effects:
+ *              The R and T lines are combined to produce
+ *              relocated code and data.  Output Sxx / Ixx
+ *              and relocated listing files may be produced.
+ *
+ */
+
+VOID
+relr3(void)
+{
+        int mode;
+        a_uint reli, relv;
+        int aindex, rindex, rtp, error, i;
+        a_uint r, rtbase, rtofst, paga = 0, pags = 0;
+        struct areax **a;
+        struct sym **s;
+
+        /*
+         * Get area and symbol lists
+         */
+        a = hp->a_list;
+        s = hp->s_list;
+
+        /*
+         * Verify Area Mode
+         */
+        if (eval() != (R3_WORD | R3_AREA) || eval()) {
+                fprintf(stderr, "R input error\n");
+                lkerr++;
+                return;
+        }
+
+        /*
+         * Get area pointer
+         */
+        aindex = (int) evword();
+        if (aindex >= hp->h_narea) {
+                fprintf(stderr, "R area error\n");
+                lkerr++;
+                return;
+        }
+
+        /*
+         * Select Output File
+         */
+        if (oflag != 0) {
+                ap = a[aindex]->a_bap;
+                if (ofp != NULL) {
+                        rtabnk->b_rtaflg = rtaflg;
+                        if (ofp != ap->a_ofp) {
+                                lkflush();
+                        }
+                }
+                ofp = ap->a_ofp;
+                rtabnk = ap->a_bp;
+                rtaflg = rtabnk->b_rtaflg;
+        }
+
+        /*
+         * Base values
+         */
+        rtbase = adb_2b(0, 0);
+        rtofst = 2;
+
+        /*
+         * Relocate address
+         */
+        pc = adb_2b(a[aindex]->a_addr, 0);
+
+        /*
+         * Number of 'bytes' per PC address
+         */
+        pcb = 1;
+
+        #if 0
+        printf("area %d base address: 0x%x size: 0x%x rtbase: 0x%x\n", aindex,
+                a[aindex]->a_addr, a[aindex]->a_size, rtbase);
+        #endif
+        /*
+         * Do remaining relocations
+         */
+        while (more()) {
+                error = 0;
+                mode = (int) eval();
+
+                if ((mode & R_ESCAPE_MASK) == R_ESCAPE_MASK)
+                {
+                        mode = ((mode & ~R_ESCAPE_MASK) << 8) | eval();
+                        /* printf("unescaping rmode\n"); */
+                }
+
+                rtp = (int) eval();
+                rindex = (int) evword();
+
+                /*
+                 * R3_SYM or R3_AREA references
+                 */
+                if (mode & R3_SYM) {
+                        if (rindex >= hp->h_nsym) {
+                                fprintf(stderr, "R symbol error\n");
+                                lkerr++;
+                                return;
+                        }
+                        reli = symval(s[rindex]);
+                }
+/* sdld specific */
+                else if ((IS_R_J11(mode) || IS_R_J19(mode)) && (rindex == 0xFFFF)) {
+                        /* absolute acall/ajmp address */
+                        reli = 0;
+                }
+/* end sdld specific */
+                else {
+                        if (rindex >= hp->h_narea) {
+                                fprintf(stderr, "R area error\n");
+                                lkerr++;
+                                return;
+                        }
+                        reli = a[rindex]->a_addr;
+                }
+
+                /*
+                 * R3_PCR addressing
+                 */
+                if (mode & R3_PCR) {
+                        if (mode & R3_BYTE) {
+                                reli -= (pc + (rtp-rtofst) + 1);
+                        } else {
+                                reli -= (pc + (rtp-rtofst) + 2);
+                        }
+                }
+
+                /*
+                 * R3_PAG0 or R3_PAG addressing
+                 */
+                if (mode & (R3_PAG0 | R3_PAG)) {
+                        paga  = sdp.s_area->a_addr;
+                        pags  = sdp.s_addr;
+                        reli -= paga + pags;
+                }
+
+                /*
+                 * R3_BYTE or R3_WORD operation
+                 */
+                if (mode & R3_BYTE) {
+                        if (mode & R_BYT3)
+                        {
+                                /* This is a three byte address, of which
+                                 * we will select one byte.
+                                 */
+/* sdld specific */
+                                if (mode & R_BIT)
+                                {
+                                        relv = adb_24_bit(reli, rtp);
+                                }
+/* sdld specific */
+                                else if (mode & R_HIB)
+                                {
+                                        /* printf("24 bit address selecting hi byte.\n"); */
+                                        relv = adb_24_hi(reli, rtp);
+                                }
+                                else if (mode & R3_MSB)
+                                {
+                                        /* Note that in 24 bit mode, R3_MSB
+                                         * is really the middle byte, not
+                                         * the most significant byte.
+                                         *
+                                         * This is ugly and I can only apologize
+                                         * for any confusion.
+                                         */
+                                        /* printf("24 bit address selecting middle byte.\n"); */
+                                        relv = adb_24_mid(reli, rtp);
+                                }
+                                else
+                                {
+                                        /* printf("24 bit address selecting lo byte.\n"); */
+                                        relv = adb_24_lo(reli, rtp);
+                                }
+                        }
+                        else if (mode & R3_BYTX) {
+                                /* This is a two byte address, of
+                                 * which we will select one byte.
+                                 */
+                                if (mode & R_BIT) {
+                                        relv = adb_bit(reli, rtp);
+                                } else if (mode & R3_MSB) {
+                                        relv = adb_hi(reli, rtp);
+                                } else {
+                                        relv = adb_lo(reli, rtp);
+                                }
+                        } else {
+                                relv = adb_1b(reli, rtp);
+                        }
+                } else if (IS_R_J11(mode)) {
+                        /*
+                         * JLH: 11 bit jump destination for 8051.
+                         * Forms two byte instruction with
+                         * op-code bits in the MIDDLE!
+                         * rtp points at 3 byte locus:
+                         * first two will get the address,
+                         * third one has raw op-code
+                        */
+
+                        /*
+                         * Calculate absolute destination
+                         * relv must be on same 2K page as pc
+                        */
+                        relv = adb_2b(reli, rtp);
+
+                        if ((relv & ~((a_uint) 0x000007FF)) !=
+                            ((pc + rtp - rtofst) & ~((a_uint) 0x000007FF))) {
+                                        error = 6;
+                        }
+
+                        /*
+                         * Merge MSB with op-code,
+                         * ignoring top 5 bits of address.
+                         * Then hide the op-code.
+                        */
+                        rtval[rtp] = ((rtval[rtp] & 0x07)<<5) | rtval[rtp+2];
+                        rtflg[rtp + 2] = 0;
+                        rtofst += 1;
+                }
+                else if (IS_R_J19(mode)) {
+                        /*
+                         * BK: 19 bit jump destination for DS80C390.
+                         * Forms four byte instruction with
+                         * op-code bits in the MIDDLE!
+                         * rtp points at 4 byte locus:
+                         * first three will get the address,
+                         * fourth one has raw op-code
+                         */
+                        relv = adb_3b(reli, rtp);
+
+                        /*
+                         * Calculate absolute destination
+                         *  relv must be on same 512K page as pc
+                        */
+                        if ((relv & ~((a_uint) 0x0007FFFF)) !=
+                            ((pc + rtp - rtofst) & ~((a_uint) 0x0007FFFF))) {
+                                error = 7;
+                        }
+
+                        /*
+                         * Merge MSB with op-code,
+                         * ignoring top 5 bits of address.
+                         * Then hide the op-code.
+                        */
+                        rtval[rtp] = ((rtval[rtp] & 0x07)<<5) | rtval[rtp+3];
+                        rtflg[rtp + 3] = 0;
+                        rtofst += 1;
+                }
+                else if (IS_C24(mode))
+                {
+                        /*
+                         * 24 bit destination
+                         */
+                        relv = adb_3b(reli, rtp);
+                        }
+                else
+                {
+                        /* 16 bit address. */
+                        relv = adb_2b(reli, rtp);
+                }
+
+                /*
+                 * R3_BYTE with R3_BYTX offset adjust
+                 */
+                if (mode & R3_BYTE) {
+                        if (mode & R3_BYTX) {
+                                rtofst += 1;
+                        }
+                }
+
+                /*
+                 * Unsigned Byte Checking
+                 */
+                if (mode & R3_USGN && mode & R3_BYTE && relv & ~((a_uint) 0x000000FF))
+                        error = 1;
+
+                /*
+                 * PCR Relocation Error Checking
+                 */
+                if (mode & R3_PCR && mode & R3_BYTE) {
+                        r = relv & ~0x7F;
+                        if (r != (a_uint) ~0x7F && r != 0)
+                                error = 2;
+                }
+
+                /*
+                 * Page Relocation Error Checking
+                 */
+                if ((TARGET_IS_GB || TARGET_IS_Z80) &&
+                        mode & R3_PAG0 && (relv & ~0xFF || paga || pags))
+                        error = 4;
+                if (mode & R3_PAG  && (relv & ~0xFF))
+                        error = 5;
+/* sdld specific */
+                if ((mode & R_BIT) && (relv & ~0x87FF))
+                        error = 10;
+/* end sdld specific */
+
+                /*
+                 * Error Processing
+                 */
+                if (error) {
+                        rerr.aindex = aindex;
+                        rerr.mode = mode;
+                        rerr.rtbase = rtbase + rtp - rtofst - 1;
+                        rerr.rindex = rindex;
+                        rerr.rval = relv - reli;
+                        relerr3(errmsg3[error]);
+
+                        for (i=rtp; i<rtp+a_bytes; i++) {
+                                if (rtflg[i]) {
+                                        rterr[i] = error;
+                                        break;
+                                }
+                        }
+                }
+        }
+        if (uflag != 0) {
+                lkulist(1);
+        }
+        if (oflag != 0) {
+                lkout(1);
+        }
+}
+
+char *errmsg3[] = {
+/* 0 */ "LKRLOC3 Error List",
+/* 1 */ "Unsigned Byte error",
+/* 2 */ "Byte PCR relocation error",
+/* 3 */ "",
+/* 4 */ "Page0 relocation error",
+/* 5 */ "Page Mode relocation error",
+/* 6 */ "2K Page relocation error",
+/* 7 */ "512K Page relocation error",
+/* 8 */ "",
+/* 9 */ "",
+/* sdld specific */
+/* 10 */        "Bit-addressable relocation error"
+/* end sdld specific */
+};
+
+
+/*)Function VOID        relp3()
+ *
+ *      The function relp3() evaluates a P line read by
+ *      the linker.  The P line data is combined with the
+ *      previous T line data to set the base page address
+ *      and test the paging boundary and length.
+ *
+ *              P Line
+ *
+ *              P 0 0 nn nn n1 n2 xx xx
+ *
+ *      The P line provides the paging information to the linker as
+ *      specified by a .setdp directive.  The format of the relocation
+ *      information is identical to that of the R line.  The correspond-
+ *      ing T line has the following information:
+ *              T xx xx aa aa bb bb
+ *
+ *      Where aa aa is the area reference number which specifies the
+ *      selected page area and bb bb is the base address of the page.
+ *      bb bb will require relocation processing if the 'n1 n2 xx xx' is
+ *      specified in the P line.  The linker will verify that the base
+ *      address is on a 256 byte boundary and that the page length of an
+ *      area defined with the PAG type is not larger than 256 bytes.
+ *
+ *      local variable:
+ *              areax   **a             pointer to array of area pointers
+ *              int aindex              area index
+ *              int mode                relocation mode
+ *              a_uint  relv    relocation value
+ *              int rindex              symbol / area index
+ *              int rtp                 index into T data
+ *              sym **s                 pointer to array of symbol pointers
+ *
+ *      global variables:
+ *              head *hp                pointer to the head structure
+ *              int lkerr               error flag
+ *              sdp sdp                 base page structure
+ *              FILE *stderr    standard error device
+ *
+ *      called functions:
+ *              a_uint adb_2b() lkrloc.c
+ *              a_uint evword() lkrloc.c
+ *              int eval()              lkeval.c
+ *              int fprintf()   c_library
+ *              int more()              lklex.c
+ *              int symval()    lksym.c
+ *
+ *      side effects:
+ *              The P and T lines are combined to set
+ *              the base page address and report any
+ *              paging errors.
+ *
+ */
+
+VOID
+relp3()
+{
+        int aindex, rindex;
+        int mode, rtp;
+        a_uint relv;
+        struct areax **a;
+        struct sym **s;
+
+        /*
+         * Get area and symbol lists
+         */
+        a = hp->a_list;
+        s = hp->s_list;
+
+        /*
+         * Verify Area Mode
+         */
+        if (eval() != (R3_WORD | R3_AREA) || eval()) {
+                fprintf(stderr, "P input error\n");
+                lkerr++;
+        }
+
+        /*
+         * Get area pointer
+         */
+        aindex = (int) evword();
+        if (aindex >= hp->h_narea) {
+                fprintf(stderr, "P area error\n");
+                lkerr++;
+                return;
+        }
+
+        /*
+         * Do remaining relocations
+         */
+        while (more()) {
+                mode = (int) eval();
+                rtp = (int) eval();
+                rindex = (int) evword();
+
+                /*
+                 * R3_SYM or R3_AREA references
+                 */
+                if (mode & R3_SYM) {
+                        if (rindex >= hp->h_nsym) {
+                                fprintf(stderr, "P symbol error\n");
+                                lkerr++;
+                                return;
+                        }
+                        relv = symval(s[rindex]);
+                } else {
+                        if (rindex >= hp->h_narea) {
+                                fprintf(stderr, "P area error\n");
+                                lkerr++;
+                                return;
+                        }
+                        relv = a[rindex]->a_addr;
+                }
+                adb_2b(relv, rtp);
+        }
+
+        /*
+         * Paged values
+         */
+        aindex = (int) adb_2b(0, 2);
+        if (aindex >= hp->h_narea) {
+                fprintf(stderr, "P area error\n");
+                lkerr++;
+                return;
+        }
+        sdp.s_areax = a[aindex];
+        sdp.s_area = sdp.s_areax->a_bap;
+        sdp.s_addr = adb_2b(0, 4);
+        if (sdp.s_area->a_addr & 0xFF || sdp.s_addr & 0xFF)
+                relerp3("Page Definition Boundary Error");
+}
+
+/*)Function VOID        rele3()
+ *
+ *      The function rele3() closes all open output files
+ *      at the end of the linking process.
+ *
+ *      local variable:
+ *              none
+ *
+ *      global variables:
+ *              int oflag               output type flag
+ *              int uflag               relocation listing flag
+ *
+ *      called functions:
+ *              VOID    lkfclose()      lkbank.c
+ *              VOID    lkflush()       lkout.c
+ *              VOID    lkulist()       lklist.c
+ *
+ *      side effects:
+ *              All open output files are closed.
+ *
+ */
+
+VOID
+rele3()
+{
+        if (uflag != 0) {
+                lkulist(0);
+        }
+        if (oflag != 0) {
+                lkflush();
+                lkfclose();
+        }
+}
+
+/*)Function VOID        relerr3(str)
+ *
+ *              char    *str            error string
+ *
+ *      The function relerr3() outputs the error string to
+ *      stderr and to the map file (if it is open).
+ *
+ *      local variable:
+ *              none
+ *
+ *      global variables:
+ *              FILE    *mfp            handle for the map file
+ *
+ *      called functions:
+ *              VOID    errdmp3()       lkrloc3.c
+ *
+ *      side effects:
+ *              Error message inserted into map file.
+ *
+ */
+
+VOID
+relerr3(char *str)
+{
+        errdmp3(stderr, str);
+        if (mfp)
+                errdmp3(mfp, str);
+}
+
+/*)Function VOID        errdmp3(fptr, str)
+ *
+ *              FILE    *fptr           output file handle
+ *              char    *str            error string
+ *
+ *      The function errdmp3() outputs the error string str
+ *      to the device specified by fptr.  Additional information
+ *      is output about the definition and referencing of
+ *      the symbol / area error.
+ *
+ *      local variable:
+ *              int mode                error mode
+ *              int aindex              area index
+ *              int lkerr               error flag
+ *              int rindex              error index
+ *              sym **s         pointer to array of symbol pointers
+ *              areax   **a             pointer to array of area pointers
+ *              areax   *raxp           error area extension pointer
+ *
+ *      global variables:
+ *              sdp sdp         base page structure
+ *
+ *      called functions:
+ *              int fprintf()   c_library
+ *              VOID    prntval()       lkrloc.c
+ *
+ *      side effects:
+ *              Error reported.
+ *
+ */
+
+VOID
+errdmp3(FILE *fptr, char *str)
+{
+        int mode, aindex, rindex;
+        struct sym **s;
+        struct areax **a;
+        struct areax *raxp;
+
+        a = hp->a_list;
+        s = hp->s_list;
+
+        mode = rerr.mode;
+        aindex = rerr.aindex;
+        rindex = rerr.rindex;
+
+        /*
+         * Print Error
+         */
+        fprintf(fptr, "\n?ASlink-Warning-%s", str);
+        lkerr++;
+
+        /*
+         * Print symbol if symbol based
+         */
+        if (mode & R3_SYM) {
+                fprintf(fptr, " for symbol  %s\n",
+                        &s[rindex]->s_id[0]);
+        } else {
+                fprintf(fptr, "\n");
+        }
+
+        /*
+         * Print Ref Info
+         */
+/*         11111111112222222222333333333344444444445555555555666666666677777*/
+/*12345678901234567890123456789012345678901234567890123456789012345678901234*/
+/*        |                 |                 |                 |           */
+        fprintf(fptr,
+"         file              module            area              offset\n");
+        fprintf(fptr,
+"  Refby  %-14.14s    %-14.14s    %-14.14s    ",
+                        hp->h_lfile->f_idp,
+                        &hp->m_id[0],
+                        &a[aindex]->a_bap->a_id[0]);
+        prntval(fptr, rerr.rtbase);
+
+        /*
+         * Print Def Info
+         */
+        if (mode & R3_SYM) {
+                raxp = s[rindex]->s_axp;
+        } else {
+                raxp = a[rindex];
+        }
+/*         11111111112222222222333333333344444444445555555555666666666677777*/
+/*12345678901234567890123456789012345678901234567890123456789012345678901234*/
+/*        |                 |                 |                 |           */
+        fprintf(fptr,
+"  Defin  %-14.14s    %-14.14s    %-14.14s    ",
+                        raxp->a_bhp->h_lfile->f_idp,
+                        &raxp->a_bhp->m_id[0],
+                        &raxp->a_bap->a_id[0]);
+        if (mode & R3_SYM) {
+                prntval(fptr, s[rindex]->s_addr);
+        } else {
+                prntval(fptr, rerr.rval);
+        }
+}
+
+/*)Function VOID        relerp3(str)
+ *
+ *              char    *str            error string
+ *
+ *      The function relerp3() outputs the paging error string to
+ *      stderr and to the map file (if it is open).
+ *
+ *      local variable:
+ *              none
+ *
+ *      global variables:
+ *              FILE    *mfp            handle for the map file
+ *
+ *      called functions:
+ *              VOID    erpdmp3()       lkrloc3.c
+ *
+ *      side effects:
+ *              Error message inserted into map file.
+ *
+ */
+
+VOID
+relerp3(char *str)
+{
+        erpdmp3(stderr, str);
+        if (mfp)
+                erpdmp3(mfp, str);
+}
+
+/*)Function VOID        erpdmp3(fptr, str)
+ *
+ *              FILE    *fptr           output file handle
+ *              char    *str            error string
+ *
+ *      The function erpdmp3() outputs the error string str
+ *      to the device specified by fptr.
+ *
+ *      local variable:
+ *              head    *thp            pointer to head structure
+ *
+ *      global variables:
+ *              int             lkerr           error flag
+ *              sdp             sdp                     base page structure
+ *
+ *      called functions:
+ *              int fprintf()           c_library
+ *              VOID    prntval()       lkrloc.c
+ *
+ *      side effects:
+ *              Error reported.
+ *
+ */
+
+VOID
+erpdmp3(FILE *fptr, char *str)
+{
+        struct head *thp;
+
+        thp = sdp.s_areax->a_bhp;
+
+        /*
+         * Print Error
+         */
+        fprintf(fptr, "\n?ASlink-Warning-%s\n", str);
+        lkerr++;
+
+        /*
+         * Print PgDef Info
+         */
+/*         111111111122222222223333333333444444444455555555556666666666777*/
+/*123456789012345678901234567890123456789012345678901234567890123456789012*/
+        fprintf(fptr,
+"         file              module            pgarea            pgoffset\n");
+        fprintf(fptr,
+"  PgDef  %-14.14s    %-14.14s    %-14.14s    ",
+                        thp->h_lfile->f_idp,
+                        &thp->m_id[0],
+                        &sdp.s_area->a_id[0]);
+        prntval(fptr, sdp.s_area->a_addr + sdp.s_addr);
+}
+
+/* sdld specific */
+/*)Function a_uint              adb_bit(v, i)
+ *
+ *              a_uint v        value to add to byte
+ *              int i           rtval[] index
+ *
+ *      The function adb_bit() converts the single
+ *      byte address value contained in rtval[i] to bit-
+ *      addressable space and adds the value of v to it.
+ *      The new value of rtval[i] is returned.
+ *
+ *      local variable:
+ *              a_uint  j               temporary evaluation variable
+ *
+ *      global variables:
+ *              none
+ *
+ *      called functions:
+ *              none
+ *
+ *      side effects:
+ *              The value of rtval[] is changed.
+ *
+ */
+
+a_uint
+adb_bit(a_uint v, int i)
+{
+        a_uint j;
+
+        j = adb_lo(v, i) & 0xFF;
+        if ((j >= 0x20) && (j <= 0x2F)) {
+                j = (j - 0x20) * 8;
+        } else if ((j < 0x80) || ((j & 0x07) != 0)) {
+                return(0x100);//error
+        }
+
+        if (hilo) {
+                j = rtval[i+1] = j + (rtval[i] & 0x07);
+        } else {
+                j = rtval[i] = j + (rtval[i+1] & 0x07);
+        }
+        return(j);
+}
+/* end sdld specific */
+
+/*)Function a_uint              adb_lo(v, i)
+ *
+ *              int v           value to add to byte
+ *              int i           rtval[] index
+ *
+ *      The function adb_lo() adds the value of v to the
+ *      double byte value contained in rtval[i] and rtval[i+1].
+ *      The new value of rtval[i] / rtval[i+1] is returned.
+ *      The MSB rtflg[] is cleared.
+ *
+ *      local variable:
+ *              a_uint  j               temporary evaluation variable
+ *
+ *      global variables:
+ *              hilo                    byte ordering parameter
+ *
+ *      called functions:
+ *              none
+ *
+ *      side effects:
+ *              The value of rtval[] is changed.
+ *              The rtflg[] value corresponding to the
+ *              MSB of the word value is cleared to reflect
+ *              the fact that the LSB is the selected byte.
+ *
+ */
+
+a_uint
+adb_lo(v, i)
+a_uint v;
+int i;
+{
+        a_uint j;
+
+        j = adb_2b(v, i);
+        /*
+         * Remove Hi byte
+         */
+        if (hilo) {
+                rtflg[i] = 0;
+        } else {
+                rtflg[i+1] = 0;
+        }
+        return (j);
+}
+
+/*)Function a_uint              adb_hi(v, i)
+ *
+ *              int v           value to add to byte
+ *              int i           rtval[] index
+ *
+ *      The function adb_hi() adds the value of v to the
+ *      double byte value contained in rtval[i] and rtval[i+1].
+ *      The new value of rtval[i] / rtval[i+1] is returned.
+ *      The LSB rtflg[] is cleared.
+ *
+ *      local variable:
+ *              a_uint  j               temporary evaluation variable
+ *
+ *      global variables:
+ *              hilo                    byte ordering parameter
+ *
+ *      called functions:
+ *              none
+ *
+ *      side effects:
+ *              The value of rtval[] is changed.
+ *              The rtflg[] value corresponding to the
+ *              LSB of the word value is cleared to reflect
+ *              the fact that the MSB is the selected byte.
+ *
+ */
+
+a_uint
+adb_hi(v, i)
+a_uint v;
+int i;
+{
+        a_uint j;
+
+        j = adb_2b(v, i);
+        /*
+         * Remove Lo byte
+         */
+        if (hilo) {
+                rtflg[i+1] = 0;
+        } else {
+                rtflg[i] = 0;
+        }
+        return (j);
+}
+
+/* sdld specific */
+/*)Function a_uint              adb_24_bit(v, i)
+ *
+ *              a_uint v        value to add to byte
+ *              int i           rtval[] index
+ *
+ *      The function adb_24_bit() converts the single
+ *      byte address value contained in rtval[i] to bit-
+ *      addressable space and adds the value of v to it.
+ *      The new value of rtval[i] is returned.
+ *
+ *      local variable:
+ *              a_uint  j               temporary evaluation variable
+ *
+ *      global variables:
+ *              none
+ *
+ *      called functions:
+ *              none
+ *
+ *      side effects:
+ *              The value of rtval[] is changed.
+ *
+ */
+
+a_uint
+adb_24_bit(v, i)
+a_uint v;
+int i;
+{
+        a_uint j;
+
+        j = adb_24_lo(v, i) & 0xFF;
+        if ((j >= 0x20) && (j <= 0x2F)) {
+                j = (j - 0x20) * 8;
+        } else if ((j < 0x80) || ((j & 0x07) != 0)) {
+                return(0x100);//error
+        }
+
+        if (hilo) {
+                j = rtval[i+2] = j + (rtval[i+1] & 0x07);
+        } else {
+                j = rtval[i] = j + (rtval[i+1] & 0x07);
+        }
+        return(j);
+}
+
+/*)Function a_uint              adb_24_hi(v, i)
+ *
+ *              a_uint v        value to add to byte
+ *              int i           rtval[] index
+ *
+ *      The function adb_24_hi() adds the value of v to the
+ *      24 bit value contained in rtval[i] - rtval[i+2].
+ *      The new value of rtval[i] / rtval[i+1] is returned.
+ *      The LSB & middle byte rtflg[] is cleared.
+ *
+ *      local variable:
+ *              a_uint  j               temporary evaluation variable
+ *
+ *      global variables:
+ *              hilo                    byte ordering parameter
+ *
+ *      called functions:
+ *              none
+ *
+ *      side effects:
+ *              The value of rtval[] is changed.
+ *              The rtflg[] value corresponding to the
+ *              LSB & middle byte of the word value is cleared to
+ *              reflect the fact that the MSB is the selected byte.
+ *
+ */
+
+a_uint
+adb_24_hi(v, i)
+a_uint v;
+int i;
+{
+        a_uint j;
+
+        j = adb_3b(v, i);
+
+        /* Remove the lower two bytes. */
+        if (hilo)
+        {
+                rtflg[i+2] = 0;
+        }
+        else
+        {
+                rtflg[i] = 0;
+        }
+        rtflg[i+1] = 0;
+
+        return (j);
+}
+
+/*)Function a_uint              adb_24_mid(v, i)
+ *
+ *              a_uint v        value to add to byte
+ *              int i           rtval[] index
+ *
+ *      The function adb_24_mid() adds the value of v to the
+ *      24 bit value contained in rtval[i] - rtval[i+2].
+ *      The new value of rtval[i] / rtval[i+1] is returned.
+ *      The LSB & MSB byte rtflg[] is cleared.
+ *
+ *      local variable:
+ *              a_uint  j               temporary evaluation variable
+ *
+ *      global variables:
+ *              hilo                    byte ordering parameter
+ *
+ *      called functions:
+ *              none
+ *
+ *      side effects:
+ *              The value of rtval[] is changed.
+ *              The rtflg[] value corresponding to the
+ *              LSB & MSB of the 24 bit value is cleared to reflect
+ *              the fact that the middle byte is the selected byte.
+ *
+ */
+
+a_uint
+adb_24_mid(v, i)
+a_uint v;
+int i;
+{
+        a_uint j;
+
+        j = adb_3b(v, i);
+
+        /* remove the MSB & LSB. */
+        rtflg[i+2] = 0;
+        rtflg[i] = 0;
+
+        return (j);
+}
+
+/*)Function a_uint              adb_24_lo(v, i)
+ *
+ *              a_uint v        value to add to byte
+ *              int i           rtval[] index
+ *
+ *      The function adb_24_lo() adds the value of v to the
+ *      24 bit value contained in rtval[i] - rtval[i+2].
+ *      The new value of rtval[i] / rtval[i+1] is returned.
+ *      The MSB & middle byte rtflg[] is cleared.
+ *
+ *      local variable:
+ *              a_uint  j               temporary evaluation variable
+ *
+ *      global variables:
+ *              hilo                    byte ordering parameter
+ *
+ *      called functions:
+ *              none
+ *
+ *      side effects:
+ *              The value of rtval[] is changed.
+ *              The rtflg[] value corresponding to the
+ *              MSB & middle byte  of the word value is cleared to
+ *              reflect the fact that the LSB is the selected byte.
+ *
+ */
+
+a_uint
+adb_24_lo(v, i)
+a_uint v;
+int i;
+{
+        a_uint j;
+
+        j = adb_3b(v, i);
+
+        /* Remove the upper two bytes. */
+        if (hilo)
+        {
+                rtflg[i] = 0;
+        }
+        else
+        {
+                rtflg[i+2] = 0;
+        }
+        rtflg[i+1] = 0;
+
+        return (j);
+}
+
+/* end sdld specific */
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/lks19.c sdcc-3.2.0+dfsg/sdas/linksrc/lks19.c
--- sdcc-3.1.0+dfsg/sdas/linksrc/lks19.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/lks19.c	2011-12-06 23:01:37.000000000 +0000
@@ -21,162 +21,163 @@
 #include "sdld.h"
 #include "aslink.h"
 
-/*)Module	lks19.c
+/*)Module       lks19.c
  *
- *	The module lks19.c contains the functions to
- *	output the relocated object code in the
- *	Motorola S19 format.
+ *      The module lks19.c contains the functions to
+ *      output the relocated object code in the
+ *      Motorola S19 format.
  *
- *	lks19.c contains the following functions:
- *		VOID	s19()
- *		VOID	sflush()
+ *      lks19.c contains the following functions:
+ *              VOID    s19()
+ *              VOID    sflush()
  *
- *	lks19.c contains no local variables.
+ *      lks19.c contains no local variables.
  */
 
 /*)S19 Format
  *      Record Type Field    -  This  field  signifies  the  start  of a
  *                              record and  identifies  the  the  record
- *                              type as follows:  
+ *                              type as follows:
  *
- *                                  Ascii S1 - Data Record 
- *                                  Ascii S9 - End of File Record 
+ *                                  Ascii S1 - Data Record
+ *                                  Ascii S9 - End of File Record
  *
  *      Record Length Field  -  This  field  specifies the record length
  *                              which includes the  address,  data,  and
  *                              checksum   fields.   The  8  bit  record
  *                              length value is converted to  two  ascii
- *                              characters, high digit first.  
+ *                              characters, high digit first.
  *
  *      Load Address Field   -  This  field  consists  of the four ascii
  *                              characters which result from  converting
  *                              the  the  binary value of the address in
  *                              which to begin loading this record.  The
- *                              order is as follows:  
+ *                              order is as follows:
  *
- *                                  High digit of high byte of address. 
- *                                  Low digit of high byte of address.  
- *                                  High digit of low byte of address.  
- *                                  Low digit of low byte of address.  
+ *                                  High digit of high byte of address.
+ *                                  Low digit of high byte of address.
+ *                                  High digit of low byte of address.
+ *                                  Low digit of low byte of address.
  *
  *                              In an End of File record this field con-
  *                              sists of either four ascii zeros or  the
  *                              program  entry  address.   Currently the
- *                              entry address option is not supported.  
+ *                              entry address option is not supported.
  *
  *      Data Field           -  This  field consists of the actual data,
  *                              converted to two ascii characters,  high
  *                              digit first.  There are no data bytes in
- *                              the End of File record.  
+ *                              the End of File record.
  *
  *      Checksum Field       -  The  checksum  field is the 8 bit binary
  *                              sum of the record length field, the load
  *                              address field, and the data field.  This
  *                              sum is then  complemented  (1's  comple-
  *                              ment)   and   converted   to  two  ascii
- *                              characters, high digit first.  
+ *                              characters, high digit first.
  */
 
-/*)Function	s19(i)
+/*)Function     s19(i)
  *
- *		int	i		0 - process data
- *					1 - end of data
+ *              int     i               0 - process data
+ *                                      1 - end of data
  *
- *	The function s19() loads the output buffer with
- *	the relocated data.
+ *      The function s19() loads the output buffer with
+ *      the relocated data.
  *
- *	local variables:
- *		a_uint	j		temporary
+ *      local variables:
+ *              a_uint  j               temporary
  *
- *	global variables:
- *		int	hilo		byte order
- *		FILE *	ofp		output file handle
- *		int	rtcnt		count of data words
- *		int	rtflg[]		output the data flag
- *		a_uint	rtval[]		relocated data
- *		char	rtbuf[]		output buffer
- *		a_uint	rtadr0		address temporary
- *		a_uint	rtadr1		address temporary
- *		a_uint	rtadr2		address temporary
+ *      global variables:
+ *              int     hilo            byte order
+ *              FILE *  ofp             output file handle
+ *              int     rtcnt           count of data words
+ *              int     rtflg[]         output the data flag
+ *              a_uint  rtval[]         relocated data
+ *              char    rtbuf[]         output buffer
+ *              a_uint  rtadr0          address temporary
+ *              a_uint  rtadr1          address temporary
+ *              a_uint  rtadr2          address temporary
  *
- *	functions called:
- *		int	fprintf()	c_library
- *		VOID	sflush()	lks19.c
+ *      functions called:
+ *              int     fprintf()       c_library
+ *              VOID    sflush()        lks19.c
  *
- *	side effects:
- *		The data is placed into the output buffer.
+ *      side effects:
+ *              The data is placed into the output buffer.
  */
 
 /*
  * The maximum number of Data Field bytes is NMAX less:
- *	2	Record Type Field
- *	2	Record Length Field
- *	4	Load Address Field
- *	2	Checksum Field
+ *      2       Record Type Field
+ *      2       Record Length Field
+ *      4       Load Address Field
+ *      2       Checksum Field
  *
- *	Divided by 2 (2 characters per byte)
+ *      Divided by 2 (2 characters per byte)
  */
 
-#define	MAXBYTES	((NMAX - 10)/2)
+#define MAXBYTES        ((NMAX - 10)/2)
 
 VOID
 s19(int i)
 {
-	register a_uint j;
+        a_uint j;
+        int k;
 
-	if (i) {
-		if (TARGET_IS_6808 && ap->a_flag & A_NOLOAD)
-			return;
-
-		if (hilo == 0) {
-			j = rtval[0];
-			rtval[0] = rtval[1];
-			rtval[1] = j;
-		}
-		rtadr2 = rtval[0] << 8 | rtval[1];
-		if (rtadr2 != rtadr1) {
-			/*
-			 * data bytes not contiguous between records
-			 */
-			sflush();
-			rtadr0 = rtadr1 = rtadr2;
-		}
-		for (j=2; j<rtcnt; j++) {
-			if (rtflg[j]) {
-				rtbuf[rtadr1++ - rtadr0] = rtval[j];
-				if (rtadr1 - rtadr0 == MAXBYTES) {
-					sflush();
-				}
-			}
-		}
-	} else {
-		sflush();
-		fprintf(ofp, "S9030000FC\n");
-	}
+        if (i) {
+                if (TARGET_IS_6808 && ap->a_flag & A_NOLOAD)
+                        return;
+
+                if (hilo == 0) {
+                        j = rtval[0];
+                        rtval[0] = rtval[1];
+                        rtval[1] = j;
+                }
+                rtadr2 = rtval[0] << 8 | rtval[1];
+                if (rtadr2 != rtadr1) {
+                        /*
+                         * data bytes not contiguous between records
+                         */
+                        sflush();
+                        rtadr0 = rtadr1 = rtadr2;
+                }
+                for (k=2; k<rtcnt; k++) {
+                        if (rtflg[k]) {
+                                rtbuf[rtadr1++ - rtadr0] = rtval[k];
+                                if (rtadr1 - rtadr0 == MAXBYTES) {
+                                        sflush();
+                                }
+                        }
+                }
+        } else {
+                sflush();
+                fprintf(ofp, "S9030000FC\n");
+        }
 }
 
-/*)Function	sflush()
+/*)Function     sflush()
  *
- *	The function sflush() outputs the relocated data
- *	in the standard Motorola S19 format.
+ *      The function sflush() outputs the relocated data
+ *      in the standard Motorola S19 format.
  *
- *	local variables:
- *		a_uint	chksum		byte checksum
- *		int	i		loop counter
- *		int	max		number of data bytes
- *		int	reclen		record length
- *
- *	global variables:
- *		FILE *	ofp		output file handle
- *		char	rtbuf[]		output buffer
- *		a_uint	rtadr0		address temporary
- *		a_uint	rtadr1		address temporary
+ *      local variables:
+ *              a_uint  chksum          byte checksum
+ *              int     i               loop counter
+ *              int     max             number of data bytes
+ *              int     reclen          record length
+ *
+ *      global variables:
+ *              FILE *  ofp             output file handle
+ *              char    rtbuf[]         output buffer
+ *              a_uint  rtadr0          address temporary
+ *              a_uint  rtadr1          address temporary
  *
- *	functions called:
- *		int	fprintf()	c_library
+ *      functions called:
+ *              int     fprintf()       c_library
  *
- *	side effects:
- *		The data is output to the file defined by ofp.
+ *      side effects:
+ *              The data is output to the file defined by ofp.
  */
 
 /*
@@ -193,33 +194,33 @@
 VOID
 sflush()
 {
-	a_uint	chksum;
-	register int i,max,reclen;
+        a_uint chksum;
+        a_uint i, max, reclen;
 
-	max = rtadr1 - rtadr0;
-	if (max == 0) {
-		return;
-	}
-
-	/*
-	 * Only the "S1" and the checksum itself are excluded
-	 * from the checksum.  The record length does not
-	 * include "S1" and the pair count.  It does
-	 * include the two address bytes, the data bytes,
-	 * and the checksum.
-	 */
-	reclen = max + 3;
-	chksum = reclen;
-	chksum += rtadr0;
-	chksum += rtadr0 >> 8;
-	fprintf(ofp, "S1%02X%04X", reclen, rtadr0);
-	for (i=0; i<max; i++) {
-		chksum += rtbuf[i];
-		fprintf(ofp, "%02X", rtbuf[i] & 0x00ff);
-	}
-	/*
-	 * 1's complement
-	 */
-	fprintf(ofp, "%02X\n", (-chksum-1) & 0x00ff);
-	rtadr0 = rtadr1;
+        max = rtadr1 - rtadr0;
+        if (max == 0) {
+                return;
+        }
+
+        /*
+         * Only the "S1" and the checksum itself are excluded
+         * from the checksum.  The record length does not
+         * include "S1" and the pair count.  It does
+         * include the two address bytes, the data bytes,
+         * and the checksum.
+         */
+        reclen = max + 3;
+        chksum = reclen;
+        chksum += rtadr0;
+        chksum += rtadr0 >> 8;
+        fprintf(ofp, "S1%02X%04X", reclen, rtadr0);
+        for (i=0; i<max; i++) {
+                chksum += rtbuf[i];
+                fprintf(ofp, "%02X", rtbuf[i] & 0x00ff);
+        }
+        /*
+         * 1's complement
+         */
+        fprintf(ofp, "%02X\n", (~chksum) & 0x00ff);
+        rtadr0 = rtadr1;
 }
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/lksdcclib.c sdcc-3.2.0+dfsg/sdas/linksrc/lksdcclib.c
--- sdcc-3.1.0+dfsg/sdas/linksrc/lksdcclib.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/lksdcclib.c	2011-12-03 23:42:25.000000000 +0000
@@ -325,8 +325,10 @@
                   lbfh->libspc = lbnh->libspc;
                   lbfh->filspc = strdup (filspc);
                   lbfh->relfil = strdup (ModName);
+                  lbfh->f_obj = lbnh->f_obj;
                   /* Library embedded file, so lbfh->offset must be >=0 */
                   lbfh->offset = IndexOffset + FileOffset;
+                  obj_flag = lbfh->f_obj;
 
                   /* Jump to where the .rel begins and load it. */
                   fseek (libfp, lbfh->offset, SEEK_SET);
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/lksdcdb.c sdcc-3.2.0+dfsg/sdas/linksrc/lksdcdb.c
--- sdcc-3.1.0+dfsg/sdas/linksrc/lksdcdb.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/lksdcdb.c	2011-12-03 23:42:25.000000000 +0000
@@ -70,6 +70,7 @@
 		if (yfp == NULL) {
 			lkexit(1);
 		}
+		mflag = 1;
 	}
 }
 
@@ -78,7 +79,7 @@
  * 
  *		char *	str		pointer to the file spec
  *
- *	The function SDCDBcopy() copies an existing cdb file
+ *	The function SDCDBcopy() copies an existing adb file
  *	into the linker cdb file.
  *
  * 	The function is called from lklex.c and lklibr.c
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/lksym.c sdcc-3.2.0+dfsg/sdas/linksrc/lksym.c
--- sdcc-3.1.0+dfsg/sdas/linksrc/lksym.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/lksym.c	2011-12-06 23:01:37.000000000 +0000
@@ -22,8 +22,8 @@
  * Kent, Ohio  44240
  *
  *   With enhancements from
- *	John L. Hartman	(JLH)
- *	jhartman@compuserve.com
+ *      John L. Hartman (JLH)
+ *      jhartman@compuserve.com
  *
  */
 
@@ -39,17 +39,17 @@
  *              sym *   lkpsym()
  *              char *  new()
  *              sym *   newsym()
- *		char *	strsto()
+ *              char *  strsto()
  *              VOID    symdef()
  *              int     symeq()
  *              VOID    syminit()
  *              VOID    symmod()
  *              a_uint  symval()
  *
- *	lksym.c contains the static variables:
- *		char *	pnext
- *		int	bytes
- *	used by the string store function.
+ *      lksym.c contains the static variables:
+ *              char *  pnext
+ *              int     bytes
+ *      used by the string store function.
  */
 
 /*)Function     VOID    syminit()
@@ -142,7 +142,7 @@
 struct sym *
 newsym(void)
 {
-	a_uint ev;
+        a_uint ev;
         int c, i, nsym;
         struct sym *tsp;
         struct sym **s;
@@ -152,10 +152,10 @@
                 fprintf(stderr, "No header defined\n");
                 lkexit(ER_FATAL);
         }
-	/*
-	 * Create symbol entry
-	 */
-        getSid(id);     // old: getid(id, -1);
+        /*
+         * Create symbol entry
+         */
+        getSid(id);
         tsp = lkpsym(id, 1);
         c = getnb();get();get();
         if (c == 'R') {
@@ -168,7 +168,7 @@
         if (c == 'D') {
                 ev = eval();
                 if (tsp->s_type & S_DEF &&
-                    !(tsp->s_addr == ev && ((tsp->s_axp->a_bap->a_flag & A3_ABS) == A3_ABS))) {
+                    !(tsp->s_addr == ev && tsp->s_axp && tsp->s_axp->a_bap && ((tsp->s_axp->a_bap->a_flag & A3_ABS) == A3_ABS))) {
                         fprintf(stderr,
                                 "Multiple definition of %s\n", id);
                         lkerr++;
@@ -395,8 +395,8 @@
  *      The function symeq() compares the two name strings for a match.
  *      The return value is 1 for a match and 0 for no match.
  *
- *		cflag == 0	case sensitive compare
- *		cflag != 0	case insensitive compare
+ *              cflag == 0      case sensitive compare
+ *              cflag != 0      case insensitive compare
  *
  *      local variables:
  *              int     n               loop counter
@@ -416,122 +416,122 @@
 int
 symeq(char *p1, char *p2, int cflag)
 {
-	int n;
+        int n;
+
+        n = strlen(p1) + 1;
+        if(cflag) {
+                /*
+                 * Case Insensitive Compare
+                 */
+                do {
+                        if (ccase[*p1++ & 0x007F] != ccase[*p2++ & 0x007F])
+                                return (0);
+                } while (--n);
+        } else {
+                /*
+                 * Case Sensitive Compare
+                 */
+                do {
+                        if (*p1++ != *p2++)
+                                return (0);
+                } while (--n);
+        }
+        return (1);
+}
 
-	n = strlen(p1) + 1;
-	if(cflag) {
-		/*
-		 * Case Insensitive Compare
-		 */
-		do {
-			if (ccase[*p1++ & 0x007F] != ccase[*p2++ & 0x007F])
-				return (0);
-		} while (--n);
-	} else {
-		/*
-		 * Case Sensitive Compare
-		 */
-		do {
-			if (*p1++ != *p2++)
-				return (0);
-		} while (--n);
-	}
-	return (1);
-}
-
-/*)Function	int	hash(p, cflag)
- *
- *		char *	p		pointer to string to hash
- *		int	cflag		case sensitive flag
- *
- *	The function hash() computes a hash code using the sum
- *	of all characters mod table size algorithm.
- *
- *		cflag == 0	case sensitive hash
- *		cflag != 0	case insensitive hash
- *
- *	local variables:
- *		int	h		accumulated character sum
- *
- *	global variables:
- *		char	ccase[]		an array of characters which
- *					perform the case translation function
+/*)Function     int     hash(p, cflag)
  *
- *	functions called:
- *		none
+ *              char *  p               pointer to string to hash
+ *              int     cflag           case sensitive flag
  *
- *	side effects:
- *		none
+ *      The function hash() computes a hash code using the sum
+ *      of all characters mod table size algorithm.
+ *
+ *              cflag == 0      case sensitive hash
+ *              cflag != 0      case insensitive hash
+ *
+ *      local variables:
+ *              int     h               accumulated character sum
+ *
+ *      global variables:
+ *              char    ccase[]         an array of characters which
+ *                                      perform the case translation function
+ *
+ *      functions called:
+ *              none
+ *
+ *      side effects:
+ *              none
  */
 
 int
 hash(char *p, int cflag)
 {
-	int h;
+        int h;
 
-	h = 0;
-	while (*p) {
-		if(cflag) {
-			/*
-			 * Case Insensitive Hash
-			 */
-			h += ccase[*p++ & 0x007F];
-		} else {
-			/*
-			 * Case Sensitive Hash
-			 */
-			h += *p++;
-		}
-	}
-	return (h&HMASK);
-}
-
-#if	decus
-
-/*)Function	char *	strsto(str)
- *
- *		char *	str		pointer to string to save
- *
- *	Allocate space for "str", copy str into new space.
- *	Return a pointer to the allocated string.
- *
- *	This function based on code by
- *		John L. Hartman
- *		jhartman@compuserve.com
- *
- *	local variables:
- *		int	l		string length + 1
- *		char *	p		string location
- *
- *	global variables:
- *		none
- *
- *	functions called:
- *		char *	new()		assym.c
- *		char *	strncpy()	c_library
- *
- *	side effects:
- *		Space allocated for string, string copied
- *		to space.  Out of Space terminates linker.
+        h = 0;
+        while (*p) {
+                if(cflag) {
+                        /*
+                         * Case Insensitive Hash
+                         */
+                        h += ccase[*p++ & 0x007F];
+                } else {
+                        /*
+                         * Case Sensitive Hash
+                         */
+                        h += *p++;
+                }
+        }
+        return (h&HMASK);
+}
+
+#if     decus
+
+/*)Function     char *  strsto(str)
+ *
+ *              char *  str             pointer to string to save
+ *
+ *      Allocate space for "str", copy str into new space.
+ *      Return a pointer to the allocated string.
+ *
+ *      This function based on code by
+ *              John L. Hartman
+ *              jhartman@compuserve.com
+ *
+ *      local variables:
+ *              int     l               string length + 1
+ *              char *  p               string location
+ *
+ *      global variables:
+ *              none
+ *
+ *      functions called:
+ *              char *  new()           assym.c
+ *              char *  strncpy()       c_library
+ *
+ *      side effects:
+ *              Space allocated for string, string copied
+ *              to space.  Out of Space terminates linker.
  */
 
 char *
 strsto(char *str)
 {
-	int  l;
-	char *p;
+        int  l;
+        char *p;
 
-	/*
-	 * What we need, including a null.
-	 */
-	l = strlen(str) + 1;
-	p = (char *) new (l);
-
-	/*
-	 * Copy the name and terminating null.
-	 */
-	strncpy(p, str, l);
-	return(p);
+        /*
+         * What we need, including a null.
+         */
+        l = strlen(str) + 1;
+        p = (char *) new (l);
+
+        /*
+         * Copy the name and terminating null.
+         */
+        strncpy(p, str, l);
+        return(p);
 }
 
 /*
@@ -548,38 +548,38 @@
  * requirement.
  */
 
-/*)Function	char *	new(n)
+/*)Function     char *  new(n)
  *
- *		unsigned int	n	allocation size in bytes
+ *              unsigned int    n       allocation size in bytes
+ *
+ *      The function new() allocates n bytes of space and returns
+ *      a pointer to this memory.  If no space is available the
+ *      linker is terminated.
+ *
+ *      Allocate space for "str", copy str into new space.
+ *      Return a pointer to the allocated string.
+ *
+ *      This function based on code by
+ *              John L. Hartman
+ *              jhartman@compuserve.com
+ *
+ *      local variables:
+ *              int     bytes           bytes remaining in buffer area
+ *              int     i               loop counter
+ *              char *  p               pointer to head of copied string
+ *              char *  pnext           next location in buffer area
+ *              char *  q               a general pointer
  *
- *	The function new() allocates n bytes of space and returns
- *	a pointer to this memory.  If no space is available the
- *	linker is terminated.
- *
- *	Allocate space for "str", copy str into new space.
- *	Return a pointer to the allocated string.
- *
- *	This function based on code by
- *		John L. Hartman
- *		jhartman@compuserve.com
- *
- *	local variables:
- *		int	bytes		bytes remaining in buffer area
- *		int	i		loop counter
- *		char *	p		pointer to head of copied string
- *		char *	pnext		next location in buffer area
- *		char *	q		a general pointer
- *
- *	global variables:
- *		none
- *
- *	functions called:
- *		int	fprintf()	c_library
- *		VOID *	malloc()	c_library
- *
- *	side effects:
- *		Memory is allocated, if allocation fails
- *		the linker is terminated.
+ *      global variables:
+ *              none
+ *
+ *      functions called:
+ *              int     fprintf()       c_library
+ *              VOID *  malloc()        c_library
+ *
+ *      side effects:
+ *              Memory is allocated, if allocation fails
+ *              the linker is terminated.
  */
 
 /*
@@ -588,86 +588,86 @@
  * These static variables remember our hunk.
  */
 
-#define	STR_SPC	1024
-#define	STR_MIN	16
-static	char *	pnext = NULL;
-static	int	bytes = 0;
+#define STR_SPC 1024
+#define STR_MIN 16
+static  char *  pnext = NULL;
+static  int     bytes = 0;
 
 char *
 new(unsigned int n)
 {
-	char *p,*q;
-	unsigned int i;
+        char *p,*q;
+        unsigned int i;
 
-	/*
-	 * Always an even byte count
-	 */
-	n = (n+1) & 0xFFFE;
-
-	if (n > STR_MIN) {
-		/*
-		 * For allocations larger than
-		 * most structures and short strings
-		 * allocate the space directly.
-		 */
-		p = (char *) malloc(n);
-	} else {
-		/*
-		 * For smaller structures and
-		 * strings allocate from the hunk.
-		 */
-		if (n > bytes) {
-			/*
-			 * No space.  Allocate a new hunk.
-			 * We lose the pointer to any old hunk.
-			 * We don't care, as the pieces are never deleted.
-			*/
-			pnext = (char *) malloc (STR_SPC);
-			bytes = STR_SPC;
-		}
-		p = pnext;
-		pnext += n;
-		bytes -= n;
-	}
-	if (p == NULL) {
-		fprintf(stderr, "Out of space!\n");
-		lkexit(ER_FATAL);
-	}
-	for (i=0,q=p; i<n; i++) {
-		*q++ = 0;
-	}
-	return (p);
+        /*
+         * Always an even byte count
+         */
+        n = (n+1) & 0xFFFE;
+
+        if (n > STR_MIN) {
+                /*
+                 * For allocations larger than
+                 * most structures and short strings
+                 * allocate the space directly.
+                 */
+                p = (char *) malloc(n);
+        } else {
+                /*
+                 * For smaller structures and
+                 * strings allocate from the hunk.
+                 */
+                if (n > bytes) {
+                        /*
+                         * No space.  Allocate a new hunk.
+                         * We lose the pointer to any old hunk.
+                         * We don't care, as the pieces are never deleted.
+                        */
+                        pnext = (char *) malloc (STR_SPC);
+                        bytes = STR_SPC;
+                }
+                p = pnext;
+                pnext += n;
+                bytes -= n;
+        }
+        if (p == NULL) {
+                fprintf(stderr, "Out of space!\n");
+                lkexit(ER_FATAL);
+        }
+        for (i=0,q=p; i<n; i++) {
+                *q++ = 0;
+        }
+        return (p);
 }
 
 #else
 
-/*)Function	char *	strsto(str)
+/*)Function     char *  strsto(str)
  *
- *		char *	str		pointer to string to save
+ *              char *  str             pointer to string to save
  *
- *	Allocate space for "str", copy str into new space.
- *	Return a pointer to the allocated string.
+ *      Allocate space for "str", copy str into new space.
+ *      Return a pointer to the allocated string.
  *
- *	This function based on code by
- *		John L. Hartman
- *		jhartman@compuserve.com
+ *      This function based on code by
+ *              John L. Hartman
+ *              jhartman@compuserve.com
  *
- *	local variables:
- *		int	l		string length + 1
- *		int	bytes		bytes remaining in buffer area
- *		char *	p		pointer to head of copied string
- *		char *	pnext		next location in buffer area
+ *      local variables:
+ *              int     l               string length + 1
+ *              int     bytes           bytes remaining in buffer area
+ *              char *  p               pointer to head of copied string
+ *              char *  pnext           next location in buffer area
  *
- *	global variables:
- *		none
+ *      global variables:
+ *              none
  *
- *	functions called:
- *		char *	new()		assym.c
- *		char *	strncpy()	c_library
+ *      functions called:
+ *              char *  new()           assym.c
+ *              char *  strncpy()       c_library
  *
- *	side effects:
- *		Space allocated for string, string copied
- *		to space.  Out of Space terminates assembler.
+ *      side effects:
+ *              Space allocated for string, string copied
+ *              to space.  Out of Space terminates assembler.
  */
 
 /*
@@ -676,81 +676,81 @@
  * These static variables remember our hunk
  */
 
-#define	STR_SPC	1024
-static	char *	pnext = NULL;
-static	int	bytes = 0;
+#define STR_SPC 1024
+static  char *  pnext = NULL;
+static  int     bytes = 0;
 
 char *
 strsto(char *str)
 {
-	int  l;
-	char *p;
+        int  l;
+        char *p;
+
+        /*
+         * What we need, including a null.
+         */
+        l = strlen(str) + 1;
 
-	/*
-	 * What we need, including a null.
-	 */
-	l = strlen(str) + 1;
-
-	if (l > bytes) {
-		/*
-		 * No space.  Allocate a new hunk.
-		 * We lose the pointer to any old hunk.
-		 * We don't care, as the strings are never deleted.
-		*/
-		pnext = (char *) new (STR_SPC);
-		bytes = STR_SPC;
-	}
-
-	/*
-	 * Copy the name and terminating null.
-	 */
-	p = pnext;
-	strncpy(p, str, l);
-
-	pnext += l;
-	bytes -= l;
-
-	return(p);
-}
-
-/*)Function	char *	new(n)
- *
- *		unsigned int	n	allocation size in bytes
- *
- *	The function new() allocates n bytes of space and returns
- *	a pointer to this memory.  If no space is available the
- *	linker is terminated.
- *
- *	local variables:
- *		char *	p		a general pointer
- *		char *	q		a general pointer
- *
- *	global variables:
- *		none
- *
- *	functions called:
- *		int	fprintf()	c_library
- *		VOID *	malloc()	c_library
- *
- *	side effects:
- *		Memory is allocated, if allocation fails
- *		the linker is terminated.
+        if (l > bytes) {
+                /*
+                 * No space.  Allocate a new hunk.
+                 * We lose the pointer to any old hunk.
+                 * We don't care, as the strings are never deleted.
+                */
+                pnext = (char *) new (STR_SPC);
+                bytes = STR_SPC;
+        }
+
+        /*
+         * Copy the name and terminating null.
+         */
+        p = pnext;
+        strncpy(p, str, l);
+
+        pnext += l;
+        bytes -= l;
+
+        return(p);
+}
+
+/*)Function     char *  new(n)
+ *
+ *              unsigned int    n       allocation size in bytes
+ *
+ *      The function new() allocates n bytes of space and returns
+ *      a pointer to this memory.  If no space is available the
+ *      linker is terminated.
+ *
+ *      local variables:
+ *              char *  p               a general pointer
+ *              char *  q               a general pointer
+ *
+ *      global variables:
+ *              none
+ *
+ *      functions called:
+ *              int     fprintf()       c_library
+ *              VOID *  malloc()        c_library
+ *
+ *      side effects:
+ *              Memory is allocated, if allocation fails
+ *              the linker is terminated.
  */
 
 char *
 new(unsigned int n)
 {
-	char *p,*q;
-	unsigned int i;
+        char *p,*q;
+        unsigned int i;
 
-	if ((p = (char *) malloc(n)) == NULL) {
-		fprintf(stderr, "Out of space!\n");
-		lkexit(ER_FATAL);
-	}
-	for (i=0,q=p; i<n; i++) {
-		*q++ = 0;
-	}
-	return (p);
+        if ((p = (char *) malloc(n)) == NULL) {
+                fprintf(stderr, "Out of space!\n");
+                lkexit(ER_FATAL);
+        }
+        for (i=0,q=p; i<n; i++) {
+                *q++ = 0;
+        }
+        return (p);
 }
 
 #endif
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/sdld.c sdcc-3.2.0+dfsg/sdas/linksrc/sdld.c
--- sdcc-3.1.0+dfsg/sdas/linksrc/sdld.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/sdld.c	2011-12-18 17:44:59.000000000 +0000
@@ -69,8 +69,8 @@
     char *str;
     enum sdld_target_e target;
   } tgt[] = {
-    { "gb", TARGET_ID_GB, },
-    { "z80", TARGET_ID_Z80, },
+    { "gb",   TARGET_ID_GB,   },
+    { "z80",  TARGET_ID_Z80,  },
     { "z180", TARGET_ID_Z180, },
     { "8051", TARGET_ID_8051, },
     { "6808", TARGET_ID_6808, },
diff -Nru sdcc-3.1.0+dfsg/sdas/linksrc/sdld.h sdcc-3.2.0+dfsg/sdas/linksrc/sdld.h
--- sdcc-3.1.0+dfsg/sdas/linksrc/sdld.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdas/linksrc/sdld.h	2011-12-18 17:44:59.000000000 +0000
@@ -35,7 +35,7 @@
 
 #define TARGET_IS_GB	(get_sdld_target() == TARGET_ID_GB)
 #define TARGET_IS_Z80   (get_sdld_target() == TARGET_ID_Z80)
-#define TARGET_IS_Z180   (get_sdld_target() == TARGET_ID_Z180)
+#define TARGET_IS_Z180  (get_sdld_target() == TARGET_ID_Z180)
 #define TARGET_IS_8051  (get_sdld_target() == TARGET_ID_8051)
 #define TARGET_IS_6808 	(get_sdld_target() == TARGET_ID_6808)
 
diff -Nru sdcc-3.1.0+dfsg/sdcc.sln sdcc-3.2.0+dfsg/sdcc.sln
--- sdcc-3.1.0+dfsg/sdcc.sln	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdcc.sln	2012-06-28 14:09:28.000000000 +0000
@@ -3,8 +3,8 @@
 # Visual C++ Express 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all.vcxproj", "{5339F39B-0A44-4248-972C-F8833B0F5537}"
 	ProjectSection(ProjectDependencies) = postProject
-		{58C6355B-ED8A-4F0D-8911-D8A77E7E2096} = {58C6355B-ED8A-4F0D-8911-D8A77E7E2096}
 		{B823D5B9-6B5A-4CC8-AF07-DDFE8C8E3488} = {B823D5B9-6B5A-4CC8-AF07-DDFE8C8E3488}
+		{F47A26F0-2D57-4A1F-86CF-6E3F82D3E877} = {F47A26F0-2D57-4A1F-86CF-6E3F82D3E877}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdas6808", "sdas\as6808\as_hc08.vcxproj", "{C81F84D7-F847-4100-969F-0791A95D2E4C}"
@@ -21,8 +21,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdld", "sdas\linksrc\aslink.vcxproj", "{6E94DB45-345E-4697-98DA-6C72237D6ECA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdranlib", "support\sdranlib\sdranlib.vcxproj", "{58C6355B-ED8A-4F0D-8911-D8A77E7E2096}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdas8051", "sdas\as8051\asx8051.vcxproj", "{C14982C0-731B-46A0-9DD2-845E3811CF18}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2F87BA6F-8EE1-48D0-9817-6BA30BDDB3C1} = {2F87BA6F-8EE1-48D0-9817-6BA30BDDB3C1}
@@ -60,7 +58,10 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdcpp", "support\cpp\sdcpp.vcxproj", "{57BCB0F8-EF4A-4688-9B36-55A8F6DC93BF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "src", "src\src.vcxproj", "{F9485499-151B-4886-935C-7D687C4A0549}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdcc", "src\sdcc.vcxproj", "{F9485499-151B-4886-935C-7D687C4A0549}"
+	ProjectSection(ProjectDependencies) = postProject
+		{EA40C4BB-7537-4422-AE03-629A05F3D4C5} = {EA40C4BB-7537-4422-AE03-629A05F3D4C5}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "z80", "src\z80\z80.vcxproj", "{7444A72F-C7C6-4F90-9A62-2D46240B52DB}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -77,7 +78,7 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yacc", "src\yacc.vcxproj", "{EA40C4BB-7537-4422-AE03-629A05F3D4C5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asrab", "sdas\asrab\asrab.vcxproj", "{F47A26F0-2D57-4A1F-86CF-6E3F82D3E877}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdasrab", "sdas\asrab\asrab.vcxproj", "{F47A26F0-2D57-4A1F-86CF-6E3F82D3E877}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -105,10 +106,6 @@
 		{6E94DB45-345E-4697-98DA-6C72237D6ECA}.Debug|Win32.Build.0 = Debug|Win32
 		{6E94DB45-345E-4697-98DA-6C72237D6ECA}.Release|Win32.ActiveCfg = Release|Win32
 		{6E94DB45-345E-4697-98DA-6C72237D6ECA}.Release|Win32.Build.0 = Release|Win32
-		{58C6355B-ED8A-4F0D-8911-D8A77E7E2096}.Debug|Win32.ActiveCfg = Debug|Win32
-		{58C6355B-ED8A-4F0D-8911-D8A77E7E2096}.Debug|Win32.Build.0 = Debug|Win32
-		{58C6355B-ED8A-4F0D-8911-D8A77E7E2096}.Release|Win32.ActiveCfg = Release|Win32
-		{58C6355B-ED8A-4F0D-8911-D8A77E7E2096}.Release|Win32.Build.0 = Release|Win32
 		{C14982C0-731B-46A0-9DD2-845E3811CF18}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C14982C0-731B-46A0-9DD2-845E3811CF18}.Debug|Win32.Build.0 = Debug|Win32
 		{C14982C0-731B-46A0-9DD2-845E3811CF18}.Release|Win32.ActiveCfg = Release|Win32
diff -Nru sdcc-3.1.0+dfsg/sdcc.spec sdcc-3.2.0+dfsg/sdcc.spec
--- sdcc-3.1.0+dfsg/sdcc.spec	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdcc.spec	2012-06-16 21:42:29.000000000 +0000
@@ -8,7 +8,7 @@
 Group:         Applications/Engineering
 Summary:       Small Device C Compiler
 Requires:      sdcc-common
-Version:       3.1.0
+Version:       3.2.0
 Release:       2
 Source:        %{name}-src-%{version}.tar.gz
 URL:           http://sdcc.sourceforge.net/
@@ -16,10 +16,14 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 
 %description
-SDCC is a C compiler for 8051 class and similar microcontrollers.
-The package includes the compiler, assemblers and linkers, a device
-simulator and a core library. The processors supported (to a varying
-degree) include the 8051, ds390, z80, hc08, and PIC.
+SDCC is a free open source, retargettable, optimizing ANSI C compiler
+suite that targets a growing list of processors including the Intel
+MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim
+(formerly Dallas) DS80C390 variants, Freescale (formerly Motorola)
+HC08 based (hc08, s08) and Zilog Z80 based MCUs (z80, z180, gbz80,
+Rabbit 2000/3000, Rabbit 3000A). Work is in progress on supporting
+the Microchip PIC16 and PIC18 targets. It can be retargeted for other
+microprocessors.
 
 %package common
 License:       GPL, LGPL
@@ -28,10 +32,14 @@
 Requires:      sdcc
 
 %description common
-SDCC is a C compiler for 8051 class and similar microcontrollers.
-The package includes the compiler, assemblers and linkers, a device
-simulator and a core library. The processors supported (to a varying
-degree) include the 8051, ds390, z80, hc08, and PIC.
+SDCC is a free open source, retargettable, optimizing ANSI C compiler
+suite that targets a growing list of processors including the Intel
+MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim
+(formerly Dallas) DS80C390 variants, Freescale (formerly Motorola)
+HC08 based (hc08, s08) and Zilog Z80 based MCUs (z80, z180, gbz80,
+Rabbit 2000/3000, Rabbit 3000A). Work is in progress on supporting
+the Microchip PIC16 and PIC18 targets. It can be retargeted for other
+microprocessors.
 
 %package doc
 License:       GPL
@@ -39,10 +47,14 @@
 Summary:       Documentation for the SDCC C compiler
 
 %description doc
-SDCC is a C compiler for 8051 class and similar microcontrollers.
-The package includes the compiler, assemblers and linkers, a device
-simulator and a core library. The processors supported (to a varying
-degree) include the 8051, ds390, z80, hc08, and PIC.
+SDCC is a free open source, retargettable, optimizing ANSI C compiler
+suite that targets a growing list of processors including the Intel
+MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim
+(formerly Dallas) DS80C390 variants, Freescale (formerly Motorola)
+HC08 based (hc08, s08) and Zilog Z80 based MCUs (z80, z180, gbz80,
+Rabbit 2000/3000, Rabbit 3000A). Work is in progress on supporting
+the Microchip PIC16 and PIC18 targets. It can be retargeted for other
+microprocessors.
 
 %prep
 %setup -n sdcc
@@ -80,6 +92,8 @@
 %doc %{_defaultdocdir}
 
 %changelog
+* Fri Jun 12 2012 - borut.razem AT siol.net
+- version updated to 3.2.0
 * Sat Oct 08 2010 - borut.razem AT siol.net
 - added non-free include and lib directories
 - version updated to 3.1.0
diff -Nru sdcc-3.1.0+dfsg/sdcc_vc.h.in sdcc-3.2.0+dfsg/sdcc_vc.h.in
--- sdcc-3.1.0+dfsg/sdcc_vc.h.in	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdcc_vc.h.in	2012-05-05 14:39:36.000000000 +0000
@@ -0,0 +1,88 @@
+#ifndef SDCC_VC_HEADER
+#define SDCC_VC_HEADER
+
+
+#undef SDCC_VERSION_HI
+#undef SDCC_VERSION_LO
+#undef SDCC_VERSION_P
+#undef SDCC_VERSION_STR
+
+#ifndef __FUNCTION__
+#define __FUNCTION__  __FILE__
+#endif
+
+#define __func__      __FUNCTION__
+
+#define DIR_SEPARATOR_STRING "\\"
+#define DIR_SEPARATOR_CHAR   '\\'
+
+#define PREFIX                "\\sdcc"
+#define EXEC_PREFIX           "\\sdcc"
+#define BIN_PREFIX            "\\sdcc\\bin"
+#define DATADIR               "\\sdcc"
+
+#define INCLUDE_DIR_SUFFIX    "\\include"
+#define LIB_DIR_SUFFIX        "\\lib"
+#define NON_FREE_INCLUDE_DIR_SUFFIX   "\\non-free\\include"
+#define NON_FREE_LIB_DIR_SUFFIX       "\\non-free\\lib"
+
+#define BIN2DATA_DIR          "\\.."
+#define PREFIX2BIN_DIR        "\\bin"
+#define PREFIX2DATA_DIR       ""
+#define BINDIR PREFIX         "\\bin"
+
+/* environment variables */
+#define SDCC_DIR_NAME "SDCC_HOME"
+#define SDCC_INCLUDE_NAME "SDCC_INCLUDE"
+#define SDCC_LIB_NAME "SDCC_LIB"
+
+/* standard libraries */
+#define STD_LIB               "libsdcc"
+#define STD_INT_LIB           "libint"
+#define STD_LONG_LIB          "liblong"
+#define STD_FP_LIB            "libfloat"
+#define STD_DS390_LIB         "libds390"
+#define STD_DS400_LIB         "libds400"
+#define STD_XA51_LIB          NULL
+
+/* #undef HAVE_SYS_SOCKET_H */
+
+#undef HAVE_STRERROR
+#define HAVE_VSNPRINTF
+#define vsnprintf _vsnprintf
+#undef HAVE_SPRINTF
+#undef HAVE_VSPRINTF
+#undef HAVE_MKSTEMP
+#define pclose  _pclose
+
+#define RETSIGTYPE void
+
+#define TYPE_BYTE char
+#define TYPE_WORD short
+#define TYPE_DWORD int
+#define TYPE_QWORD long long
+#define TYPE_UBYTE unsigned TYPE_BYTE
+#define TYPE_UWORD unsigned TYPE_WORD
+#define TYPE_UDWORD unsigned TYPE_DWORD
+#define TYPE_UQWORD unsigned TYPE_QWORD
+
+/* #undef WORDS_BIGENDIAN */
+
+/* for flex 2.5.35 and greater */
+#define YY_NO_UNISTD_H    1
+
+#undef OPT_DISABLE_MCS51
+#undef OPT_DISABLE_GBZ80
+#undef OPT_DISABLE_Z80
+#define OPT_DISABLE_AVR   1
+#undef OPT_DISABLE_TININative
+#undef OPT_DISABLE_PIC14
+#undef OPT_DISABLE_PIC16
+#define OPT_DISABLE_XA51  1
+
+/* Define to 1 if c supports tags in unnamed struct. */
+#define UNNAMED_STRUCT_TAG 1
+
+#endif  /* SDCC_VC_HEADER */
+
+/* End of sdcc_vc.h */
diff -Nru sdcc-3.1.0+dfsg/sdcc_vc_in.h sdcc-3.2.0+dfsg/sdcc_vc_in.h
--- sdcc-3.1.0+dfsg/sdcc_vc_in.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdcc_vc_in.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-#ifndef SDCC_VC_HEADER
-#define SDCC_VC_HEADER
-
-
-#undef SDCC_VERSION_HI
-#undef SDCC_VERSION_LO
-#undef SDCC_VERSION_P
-#undef SDCC_VERSION_STR
-
-#ifndef __FUNCTION__
-#define __FUNCTION__  __FILE__
-#endif
-
-#define __func__      __FUNCTION__
-
-#define DIR_SEPARATOR_STRING "\\"
-#define DIR_SEPARATOR_CHAR   '\\'
-
-#define PREFIX                "\\sdcc"
-#define EXEC_PREFIX           "\\sdcc"
-#define BIN_PREFIX            "\\sdcc\\bin"
-#define DATADIR               "\\sdcc"
-
-#define INCLUDE_DIR_SUFFIX    "\\include"
-#define LIB_DIR_SUFFIX        "\\lib"
-#define NON_FREE_INCLUDE_DIR_SUFFIX   "\\non-free\\include"
-#define NON_FREE_LIB_DIR_SUFFIX       "\\non-free\\lib"
-
-#define BIN2DATA_DIR          "\\.."
-#define PREFIX2BIN_DIR        "\\bin"
-#define PREFIX2DATA_DIR       ""
-#define BINDIR PREFIX         "\\bin"
-
-/* environment variables */
-#define SDCC_DIR_NAME "SDCC_HOME"
-#define SDCC_INCLUDE_NAME "SDCC_INCLUDE"
-#define SDCC_LIB_NAME "SDCC_LIB"
-
-/* standard libraries */
-#define STD_LIB               "libsdcc"
-#define STD_INT_LIB           "libint"
-#define STD_LONG_LIB          "liblong"
-#define STD_FP_LIB            "libfloat"
-#define STD_DS390_LIB         "libds390"
-#define STD_DS400_LIB         "libds400"
-#define STD_XA51_LIB          NULL
-
-/* #undef HAVE_SYS_SOCKET_H */
-
-#undef HAVE_STRERROR
-#define HAVE_VSNPRINTF
-#define vsnprintf _vsnprintf
-#undef HAVE_SPRINTF
-#undef HAVE_VSPRINTF
-#undef HAVE_MKSTEMP
-#define pclose  _pclose
-
-#define RETSIGTYPE void
-
-#define TYPE_BYTE char
-#define TYPE_WORD short
-#define TYPE_DWORD int
-#define TYPE_UBYTE unsigned TYPE_BYTE
-#define TYPE_UWORD unsigned TYPE_WORD
-#define TYPE_UDWORD unsigned TYPE_DWORD
-
-/* #undef WORDS_BIGENDIAN */
-
-/* for flex 2.5.35 and greater */
-#define YY_NO_UNISTD_H  1
-
-#undef OPT_DISABLE_MCS51
-#undef OPT_DISABLE_GBZ80
-#undef OPT_DISABLE_Z80
-#define OPT_DISABLE_AVR	1
-#undef OPT_DISABLE_TININative
-#undef OPT_DISABLE_PIC14
-#undef OPT_DISABLE_PIC16
-#define OPT_DISABLE_XA51	1
-
-#endif  /* SDCC_VC_HEADER */
-
-/* End of sdcc_vc.h */
diff -Nru sdcc-3.1.0+dfsg/sdccconf_in.h sdcc-3.2.0+dfsg/sdccconf_in.h
--- sdcc-3.1.0+dfsg/sdccconf_in.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sdccconf_in.h	2012-05-20 08:53:56.000000000 +0000
@@ -3,16 +3,15 @@
 #ifndef SDCCCONF_HEADER
 #define SDCCCONF_HEADER
 
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
 /* XXX */
 #undef BIN2DATA_DIR
 
 /* XXX */
 #undef BINDIR
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef BUILD_WORDS_BIGENDIAN
-
 /* XXX */
 #undef DATADIR
 
@@ -138,6 +137,15 @@
 #undef OPT_DISABLE_R2K
 
 /* XXX */
+#undef OPT_DISABLE_R3KA
+
+/* XXX */
+#undef OPT_DISABLE_S08
+
+/* XXX */
+#undef OPT_DISABLE_SDBINUTILS
+
+/* XXX */
 #undef OPT_DISABLE_SDCDB
 
 /* XXX */
@@ -224,6 +232,9 @@
 /* The size of `long', as computed by sizeof. */
 #undef SIZEOF_LONG
 
+/* The size of `long long', as computed by sizeof. */
+#undef SIZEOF_LONG_LONG
+
 /* The size of `short', as computed by sizeof. */
 #undef SIZEOF_SHORT
 
@@ -258,21 +269,41 @@
 #undef TYPE_DWORD
 
 /* XXX */
+#undef TYPE_QWORD
+
+/* XXX */
 #undef TYPE_UBYTE
 
 /* XXX */
 #undef TYPE_UDWORD
 
 /* XXX */
+#undef TYPE_UQWORD
+
+/* XXX */
 #undef TYPE_UWORD
 
 /* XXX */
 #undef TYPE_WORD
 
+/* Define to 1 if c supports tags in unnamed struct. */
+#undef UNNAMED_STRUCT_TAG
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
+
 /* Define to 1 if type `char' is unsigned and you are not using gcc.  */
 #ifndef __CHAR_UNSIGNED__
 # undef __CHAR_UNSIGNED__
 #endif
 
-#include "custom.h"
 #endif /* SDCCCONF_HEADER */
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/aclocal.m4 sdcc-3.2.0+dfsg/sim/ucsim/aclocal.m4
--- sdcc-3.1.0+dfsg/sim/ucsim/aclocal.m4	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/aclocal.m4	2012-05-18 10:47:44.000000000 +0000
@@ -1,7 +1,22 @@
+# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -10,7 +25,8 @@
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -37,7 +53,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ])
 
-# serial 56 LT_INIT
+# serial 57 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -66,6 +82,7 @@
 # ------------------
 AC_DEFUN([LT_INIT],
 [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_BEFORE([$0], [LT_LANG])dnl
 AC_BEFORE([$0], [LT_OUTPUT])dnl
 AC_BEFORE([$0], [LTDL_INIT])dnl
@@ -82,6 +99,8 @@
 AC_REQUIRE([LTOBSOLETE_VERSION])dnl
 m4_require([_LT_PROG_LTMAIN])dnl
 
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
 dnl Parse OPTIONS
 _LT_SET_OPTIONS([$0], [$1])
 
@@ -118,7 +137,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 ])
 
 
@@ -138,6 +157,11 @@
 m4_defun([_LT_SETUP],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -160,10 +184,13 @@
 dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
 m4_require([_LT_CMD_RELOAD])dnl
 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
 
 _LT_CONFIG_LIBTOOL_INIT([
 # See if we are running on zsh, and set the options which allow our
@@ -179,7 +206,6 @@
 _LT_CHECK_OBJDIR
 
 m4_require([_LT_TAG_COMPILER])dnl
-_LT_PROG_ECHO_BACKSLASH
 
 case $host_os in
 aix3*)
@@ -193,23 +219,6 @@
   ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
 # Global variables:
 ofile=libtool
 can_build_shared=yes
@@ -250,6 +259,28 @@
 ])# _LT_SETUP
 
 
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
 # _LT_PROG_LTMAIN
 # ---------------
 # Note that this code is called both from `configure', and `config.status'
@@ -263,9 +294,6 @@
 ])# _LT_PROG_LTMAIN
 
 
-## ------------------------------------- ##
-## Accumulate code for creating libtool. ##
-## ------------------------------------- ##
 
 # So that we can recreate a full libtool script including additional
 # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
@@ -319,9 +347,6 @@
 
 
 
-## ------------------------ ##
-## FIXME: Eliminate VARNAME ##
-## ------------------------ ##
 
 
 # _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
@@ -408,7 +433,7 @@
 # declaration there will have the same value as in `configure'.  VARNAME
 # must have a single quote delimited value for this to work.
 m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
 
 
 # _LT_CONFIG_STATUS_DECLARATIONS
@@ -418,7 +443,7 @@
 # embedded single quotes properly.  In configure, this macro expands
 # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
 #
-#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
 m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
 [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
     [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
@@ -517,12 +542,20 @@
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
 # Quote evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -533,9 +566,9 @@
 # Double-quote double-evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -543,16 +576,38 @@
     esac
 done
 
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\[$]0 --fallback-echo"')dnl "
-  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
-  ;;
-esac
-
 _LT_OUTPUT_LIBTOOL_INIT
 ])
 
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# `#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
 
 # LT_OUTPUT
 # ---------
@@ -562,20 +617,11 @@
 AC_DEFUN([LT_OUTPUT],
 [: ${CONFIG_LT=./config.lt}
 AC_MSG_NOTICE([creating $CONFIG_LT])
-cat >"$CONFIG_LT" <<_LTEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-
-lt_cl_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_LTEOF
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
 
 cat >>"$CONFIG_LT" <<\_LTEOF
-AS_SHELL_SANITIZE
-_AS_PREPARE
-
-exec AS_MESSAGE_FD>&1
+lt_cl_silent=false
 exec AS_MESSAGE_LOG_FD>>config.log
 {
   echo
@@ -601,7 +647,7 @@
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -646,15 +692,13 @@
 # appending to config.log, which fails on DOS, as config.log is still kept
 # open by configure.  Here we exec the FD to /dev/null, effectively closing
 # config.log, so it can be properly (re)opened and appended to by config.lt.
-if test "$no_create" != yes; then
-  lt_cl_success=:
-  test "$silent" = yes &&
-    lt_config_lt_args="$lt_config_lt_args --quiet"
-  exec AS_MESSAGE_LOG_FD>/dev/null
-  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-  exec AS_MESSAGE_LOG_FD>>config.log
-  $lt_cl_success || AS_EXIT(1)
-fi
+lt_cl_success=:
+test "$silent" = yes &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
 ])# LT_OUTPUT
 
 
@@ -717,15 +761,12 @@
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_XSI_SHELLFNS
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
 
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
+  _LT_PROG_REPLACE_SHELLFNS
 
-  mv -f "$cfgfile" "$ofile" ||
+   mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 ],
@@ -770,6 +811,7 @@
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
   [Fortran],		[_LT_LANG(FC)],
@@ -791,6 +833,29 @@
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_GO], [
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -821,6 +886,10 @@
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -831,11 +900,13 @@
 AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
 AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
 AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
 dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
 dnl AC_DEFUN([AC_LIBTOOL_F77], [])
 dnl AC_DEFUN([AC_LIBTOOL_FC], [])
 dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
 
 
 # _LT_TAG_COMPILER
@@ -921,7 +992,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -929,6 +1006,7 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi])
+
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -940,6 +1018,34 @@
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
     case $host_os in
     rhapsody* | darwin1.[[012]])
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -967,7 +1073,7 @@
     else
       _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
     fi
-    if test "$DSYMUTIL" != ":"; then
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -977,8 +1083,8 @@
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -987,7 +1093,13 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_automatic, $1)=yes
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
   _LT_TAGVAR(link_all_deplibs, $1)=yes
   _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
   case $cc_basename in
@@ -995,7 +1107,7 @@
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
+    output_verbose_link_cmd=func_echo_all
     _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -1011,203 +1123,142 @@
   fi
 ])
 
-# _LT_SYS_MODULE_PATH_AIX
-# -----------------------
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
 # Links a minimal program and checks the executable
 # for the system default hardcoded library path. In most cases,
 # this is /usr/lib:/lib, but when the MPI compilers are used
 # the location of the communication and MPI libs are included too.
 # If we don't find anything, use the default library path according
 # to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
 m4_defun([_LT_SYS_MODULE_PATH_AIX],
 [m4_require([_LT_DECL_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
 ])# _LT_SYS_MODULE_PATH_AIX
 
 
 # _LT_SHELL_INIT(ARG)
 # -------------------
 m4_define([_LT_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_SHELL_INIT
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
 
 
 # _LT_PROG_ECHO_BACKSLASH
 # -----------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script which will find a shell with a builtin
+# printf (which we can use as an echo command).
 m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[_LT_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
 else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-[$]*
-_LT_EOF
-  exit 0
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
 fi
 
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*" 
+}
 
-	  if test "$prev" != 'sed 50q "[$]0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
-	  fi
-        fi
-      fi
-    fi
-  fi
-fi
+case "$ECHO" in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
 
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
 
-AC_SUBST(lt_ECHO)
-])
 _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1],
-    [An echo program that does not interpret backslashes])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
 ])# _LT_PROG_ECHO_BACKSLASH
 
 
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[  --with-sysroot[=DIR] Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([${with_sysroot}])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and in which our libraries should be installed.])])
+
 # _LT_ENABLE_LOCK
 # ---------------
 m4_defun([_LT_ENABLE_LOCK],
@@ -1236,7 +1287,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     if test "$lt_cv_prog_gnu_ld" = yes; then
       case `/usr/bin/file conftest.$ac_objext` in
@@ -1329,14 +1380,27 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1354,14 +1418,47 @@
 ])# _LT_ENABLE_LOCK
 
 
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
 # _LT_CMD_OLD_ARCHIVE
 # -------------------
 m4_defun([_LT_CMD_OLD_ARCHIVE],
-[AC_CHECK_TOOL(AR, ar, false)
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1])
+[_LT_PROG_AR
 
 AC_CHECK_TOOL(STRIP, strip, :)
 test -z "$STRIP" && STRIP=:
@@ -1380,18 +1477,27 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
 _LT_DECL([], [old_postinstall_cmds], [2])
 _LT_DECL([], [old_postuninstall_cmds], [2])
 _LT_TAGDECL([], [old_archive_cmds], [2],
     [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
 ])# _LT_CMD_OLD_ARCHIVE
 
 
@@ -1416,15 +1522,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        $2=yes
@@ -1464,7 +1570,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          $2=yes
@@ -1527,6 +1633,11 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
   amigaos*)
     # On AmigaOS with pdksh, this test takes hours, literally.
     # So we just punt and use a minimum line length of 8192.
@@ -1552,6 +1663,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1591,8 +1707,8 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
         i=`expr $i + 1`
@@ -1643,7 +1759,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-[#line __oline__ "configure"
+[#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -1684,7 +1800,13 @@
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -1693,7 +1815,11 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
@@ -1869,16 +1995,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
@@ -2037,6 +2163,7 @@
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_OBJDUMP])dnl
 m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
 AC_MSG_CHECKING([dynamic linker characteristics])
 m4_if([$1],
 	[], [
@@ -2045,16 +2172,23 @@
     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
     *) lt_awk_arg="/^libraries:/" ;;
   esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
   # Ok, now we have the path, separated by spaces, we can step through it
   # and add multilib dir if necessary.
   lt_tmp_lt_search_path_spec=
@@ -2067,7 +2201,7 @@
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
 BEGIN {RS=" "; FS="/|\n";} {
   lt_foo="";
   lt_count=0;
@@ -2087,7 +2221,13 @@
   if (lt_foo != "") { lt_freq[[lt_foo]]++; }
   if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
 }'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi])
@@ -2113,7 +2253,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -2122,7 +2262,7 @@
   ;;
 
 aix[[4-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -2175,7 +2315,7 @@
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
@@ -2187,7 +2327,7 @@
   ;;
 
 bsdi[[45]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -2206,8 +2346,9 @@
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
@@ -2228,36 +2369,83 @@
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
+    # Assume MSVC wrapper
     library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -2278,7 +2466,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2286,10 +2474,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -2297,7 +2481,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -2315,7 +2499,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2335,12 +2519,26 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -2386,12 +2584,14 @@
     soname_spec='${libname}${release}${shared_ext}$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
   ;;
 
 interix[[3-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2407,7 +2607,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -2444,9 +2644,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2454,16 +2654,21 @@
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+
   # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-       [shlibpath_overrides_runpath=yes])])
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
@@ -2472,7 +2677,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -2516,7 +2721,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -2585,7 +2790,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2610,7 +2815,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -2634,7 +2839,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -2665,7 +2870,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2675,7 +2880,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -2717,6 +2922,8 @@
     The last name is the one that the linker finds with -lNAME]])
 _LT_DECL([], [soname_spec], [1],
     [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
 _LT_DECL([], [postinstall_cmds], [2],
     [Command to use after installation of a shared archive])
 _LT_DECL([], [postuninstall_cmds], [2],
@@ -2829,6 +3036,7 @@
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 m4_require([_LT_DECL_SED])dnl
 m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
 
 AC_ARG_WITH([gnu-ld],
     [AS_HELP_STRING([--with-gnu-ld],
@@ -2950,6 +3158,11 @@
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
   darwin*)
     if test "$GCC" = yes; then
       reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -2958,8 +3171,8 @@
     fi
     ;;
 esac
-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_DECL([], [reload_cmds], [2])dnl
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
 ])# _LT_CMD_RELOAD
 
 
@@ -3011,16 +3224,18 @@
   # Base MSYS/MinGW do not provide the 'file' command needed by
   # func_win32_libid shell function, so use a weaker test based on 'objdump',
   # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   ;;
 
-cegcc)
+cegcc*)
   # use the weaker test based on 'objdump'. See mingw*.
   lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -3050,6 +3265,10 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
@@ -3058,11 +3277,11 @@
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
     ;;
   hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
     ;;
   *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
     lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
@@ -3083,8 +3302,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -3162,14 +3381,33 @@
   ;;
 esac
 ])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
 
-_LT_DECL([], [deplibs_check_method], [1],
-    [Method to check whether dependent libraries are shared objects])
-_LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method == "file_magic"])
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
 ])# _LT_CHECK_MAGIC_METHOD
 
 
@@ -3226,7 +3464,19 @@
   NM="$lt_cv_path_NM"
 else
   # Didn't find any BSD compatible name lister, look for dumpbin.
-  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
   AC_SUBST([DUMPBIN])
   if test "$DUMPBIN" != ":"; then
     NM="$DUMPBIN"
@@ -3239,13 +3489,13 @@
 AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
   [lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
   cat conftest.out >&AS_MESSAGE_LOG_FD
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -3260,6 +3510,67 @@
 dnl AC_DEFUN([AM_PROG_NM], [])
 dnl AC_DEFUN([AC_PROG_NM], [])
 
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
 
 # LT_LIB_M
 # --------
@@ -3268,7 +3579,7 @@
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
 case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
   # These system don't have libm, or don't need it
   ;;
 *-ncr-sysv4.3*)
@@ -3296,7 +3607,12 @@
 _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 
 if test "$GCC" = yes; then
-  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
 
   _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
     lt_cv_prog_compiler_rtti_exceptions,
@@ -3313,6 +3629,7 @@
 m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([LT_PATH_NM])dnl
 AC_REQUIRE([LT_PATH_LD])dnl
 m4_require([_LT_DECL_SED])dnl
@@ -3380,8 +3697,8 @@
 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -3405,6 +3722,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -3417,6 +3735,7 @@
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -3438,7 +3757,7 @@
   if AC_TRY_EVAL(ac_compile); then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -3450,6 +3769,18 @@
       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -3461,7 +3792,7 @@
 	  cat <<_LT_EOF >> conftest.$ac_ext
 
 /* The mapping between symbol names and symbols.  */
-const struct {
+LT@&t@_DLSYM_CONST struct {
   const char *name;
   void       *address;
 }
@@ -3487,15 +3818,15 @@
 _LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
 	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
 	else
 	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
 	fi
@@ -3528,6 +3859,13 @@
   AC_MSG_RESULT(ok)
 fi
 
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
     [Take the output of nm and produce a listing of raw symbols and C names])
 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
@@ -3538,6 +3876,8 @@
 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
     [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
     [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
 ]) # _LT_CMD_GLOBAL_SYMBOLS
 
 
@@ -3549,7 +3889,6 @@
 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 _LT_TAGVAR(lt_prog_compiler_static, $1)=
 
-AC_MSG_CHECKING([for $compiler option to produce PIC])
 m4_if([$1], [CXX], [
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -3600,6 +3939,11 @@
       # DJGPP does not support shared libraries at all
       _LT_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
     interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
@@ -3649,6 +3993,12 @@
 	  ;;
 	esac
 	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
       dgux*)
 	case $cc_basename in
 	  ec++*)
@@ -3705,7 +4055,7 @@
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -3738,8 +4088,8 @@
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    ;;
-	  xlc* | xlC*)
-	    # IBM XL 8.0 on PPC
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -3801,7 +4151,7 @@
 	;;
       solaris*)
 	case $cc_basename in
-	  CC*)
+	  CC* | sunCC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -3905,6 +4255,12 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@ -3947,6 +4303,15 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       ;;
     esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
@@ -3989,7 +4354,7 @@
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -4010,7 +4375,13 @@
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
 	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -4022,25 +4393,40 @@
         # All Alpha code is PIC.
         _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
         ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
 	esac
 	;;
@@ -4072,7 +4458,7 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95*)
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
       *)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
@@ -4129,9 +4515,11 @@
     _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
     ;;
 esac
-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
 
 #
 # Check to make sure the PIC flag actually works.
@@ -4150,6 +4538,8 @@
 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
 	[Additional compiler flags for building library objects])
 
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
 #
 # Check to make sure the static flag actually works.
 #
@@ -4170,6 +4560,7 @@
 m4_defun([_LT_LINKER_SHLIBS],
 [AC_REQUIRE([LT_PATH_LD])dnl
 AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_EGREP])dnl
 m4_require([_LT_DECL_SED])dnl
@@ -4178,30 +4569,40 @@
 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 m4_if([$1], [CXX], [
   _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
   case $host_os in
   aix[[4-9]]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     else
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
     _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
+    ;;
   cygwin* | mingw* | cegcc*)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  linux* | k*bsd*-gnu)
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
     _LT_TAGVAR(link_all_deplibs, $1)=no
-  ;;
+    ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
+    ;;
   esac
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 ], [
   runpath_var=
   _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -4216,7 +4617,6 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4261,13 +4661,39 @@
   openbsd*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu)
+  linux* | k*bsd*-gnu | gnu*)
     _LT_TAGVAR(link_all_deplibs, $1)=no
     ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
   if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
@@ -4285,6 +4711,7 @@
     fi
     supports_anon_versioning=no
     case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -4300,11 +4727,12 @@
 	_LT_TAGVAR(ld_shlibs, $1)=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
 *** to be unable to reliably create shared libraries on AIX.
 *** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
 
 _LT_EOF
       fi
@@ -4340,10 +4768,12 @@
       # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
       # as there is no search path for DLLs.
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_TAGVAR(always_export_symbols, $1)=no
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -4361,6 +4791,11 @@
       fi
       ;;
 
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
     interix[[3-9]]*)
       _LT_TAGVAR(hardcode_direct, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -4376,7 +4811,7 @@
       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | tpf* | k*bsd*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test "$host_os" = linux-dietlibc; then
 	case $cc_basename in
@@ -4386,15 +4821,16 @@
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 	 && test "$tmp_diet" = no
       then
-	tmp_addflag=
+	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -4405,13 +4841,17 @@
 	lf95*)				# Lahey Fortran 8.1
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
 	  tmp_sharedflag='--shared' ;;
-	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  _LT_TAGVAR(compiler_needs_object, $1)=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
@@ -4427,17 +4867,16 @@
         fi
 
 	case $cc_basename in
-	xlf*)
+	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
 	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
 	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -4451,8 +4890,8 @@
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -4470,8 +4909,8 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -4517,8 +4956,8 @@
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -4558,8 +4997,10 @@
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	else
 	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	fi
@@ -4647,9 +5088,9 @@
 	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        _LT_SYS_MODULE_PATH_AIX
+        _LT_SYS_MODULE_PATH_AIX([$1])
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
       else
 	if test "$host_cpu" = ia64; then
 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -4658,14 +5099,19 @@
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX
+	 _LT_SYS_MODULE_PATH_AIX([$1])
 	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
 	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
 	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 	  # This is similar to how AIX traditionally builds its shared libraries.
 	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -4697,20 +5143,64 @@
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -4723,10 +5213,6 @@
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -4739,7 +5225,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -4748,7 +5234,7 @@
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -4756,7 +5242,7 @@
 
     hpux9*)
       if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
 	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
@@ -4771,14 +5257,13 @@
       ;;
 
     hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -4790,16 +5275,16 @@
       ;;
 
     hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
 	hppa*64*)
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
@@ -4811,7 +5296,14 @@
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
 	  ;;
 	esac
       fi
@@ -4839,19 +5331,34 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        AC_LINK_IFELSE(int foo(void) {},
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-        )
-        LDFLAGS="$save_LDFLAGS"
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS="$save_LDFLAGS"])
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
       fi
       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -4913,17 +5420,17 @@
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
       fi
       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -4933,13 +5440,13 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
       else
 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -4952,9 +5459,9 @@
       _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
@@ -5130,36 +5637,38 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-        _LT_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
       ;;
     esac
   fi
@@ -5196,9 +5705,6 @@
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
     [Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -5224,8 +5730,6 @@
     to runtime path list])
 _LT_TAGDECL([], [link_all_deplibs], [0],
     [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [fix_srcfile_path], [1],
-    [Fix the shell variable $srcfile for the compiler])
 _LT_TAGDECL([], [always_export_symbols], [0],
     [Set to "yes" if exported symbols are required])
 _LT_TAGDECL([], [export_symbols_cmds], [2],
@@ -5236,6 +5740,8 @@
     [Symbols that must always be exported])
 _LT_TAGDECL([], [prelink_cmds], [2],
     [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
 _LT_TAGDECL([], [file_list_spec], [1],
     [Specify filename containing input files])
 dnl FIXME: Not yet implemented
@@ -5276,10 +5782,6 @@
 _LT_COMPILER_BOILERPLATE
 _LT_LINKER_BOILERPLATE
 
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
 if test -n "$compiler"; then
   _LT_COMPILER_NO_RTTI($1)
   _LT_COMPILER_PIC($1)
@@ -5329,37 +5831,22 @@
 ])# _LT_LANG_C_CONFIG
 
 
-# _LT_PROG_CXX
-# ------------
-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-# compiler, we have our own version here.
-m4_defun([_LT_PROG_CXX],
-[
-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-AC_PROG_CXX
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_CXX
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_CXX], [])
-
-
 # _LT_LANG_CXX_CONFIG([TAG])
 # --------------------------
 # Ensure that the configuration variables for a C++ compiler are suitably
 # defined.  These variables are subsequently used by _LT_CONFIG to write
 # the compiler configuration to `libtool'.
 m4_defun([_LT_LANG_CXX_CONFIG],
-[AC_REQUIRE([_LT_PROG_CXX])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
 
 AC_LANG_PUSH(C++)
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -5371,7 +5858,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -5381,6 +5867,8 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -5412,6 +5900,7 @@
 
   # Allow CC to be a program name with arguments.
   lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
   lt_save_LD=$LD
   lt_save_GCC=$GCC
   GCC=$GXX
@@ -5429,6 +5918,7 @@
   fi
   test -z "${LDCXX+set}" || LD=$LDCXX
   CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
   compiler=$CC
   _LT_TAGVAR(compiler, $1)=$CC
   _LT_CC_BASENAME([$compiler])
@@ -5450,8 +5940,8 @@
       # Check if GNU C++ uses GNU ld as the underlying linker, since the
       # archiving commands below assume that GNU ld is being used.
       if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -5483,7 +5973,7 @@
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
     else
       GXX=no
@@ -5592,10 +6082,10 @@
           _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
           # Determine the default libpath from the value encoded in an empty
           # executable.
-          _LT_SYS_MODULE_PATH_AIX
+          _LT_SYS_MODULE_PATH_AIX([$1])
           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
         else
           if test "$host_cpu" = ia64; then
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -5604,14 +6094,19 @@
           else
 	    # Determine the default libpath from the value encoded in an
 	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX
+	    _LT_SYS_MODULE_PATH_AIX([$1])
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 	    # Warning - without using the other run time loading flags,
 	    # -berok will link without error, but may produce a broken library.
 	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
 	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 	    # This is similar to how AIX traditionally builds its shared
 	    # libraries.
@@ -5641,28 +6136,75 @@
         ;;
 
       cygwin* | mingw* | pw32* | cegcc*)
-        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-        # as there is no search path for DLLs.
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-        _LT_TAGVAR(always_export_symbols, $1)=no
-        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-          # If the export-symbols file already is a .def file (1st line
-          # is EXPORTS), use it as is; otherwise, prepend...
-          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    cp $export_symbols $output_objdir/$soname.def;
-          else
-	    echo EXPORTS > $output_objdir/$soname.def;
-	    cat $export_symbols >> $output_objdir/$soname.def;
-          fi~
-          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-        else
-          _LT_TAGVAR(ld_shlibs, $1)=no
-        fi
-        ;;
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
       darwin* | rhapsody*)
         _LT_DARWIN_LINKER_FEATURES($1)
 	;;
@@ -5685,7 +6227,7 @@
         esac
         ;;
 
-      freebsd[[12]]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -5704,6 +6246,11 @@
       gnu*)
         ;;
 
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
       hpux9*)
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -5728,11 +6275,11 @@
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
             ;;
           *)
             if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
             else
               # FIXME: insert proper C++ library support
               _LT_TAGVAR(ld_shlibs, $1)=no
@@ -5793,7 +6340,7 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
           *)
 	    if test "$GXX" = yes; then
@@ -5803,10 +6350,10 @@
 	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	        esac
 	      fi
@@ -5836,7 +6383,7 @@
         case $cc_basename in
           CC*)
 	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -5847,9 +6394,9 @@
           *)
 	    if test "$GXX" = yes; then
 	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
 	      fi
 	    fi
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -5860,7 +6407,7 @@
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -5878,7 +6425,7 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -5915,26 +6462,26 @@
           pgCC* | pgcpp*)
             # Portland Group C++ compiler
 	    case `$CC -V` in
-	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
 	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
 	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
 		$RANLIB $oldlib'
 	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 	      ;;
-	    *) # Version 6 will use weak symbols
+	    *) # Version 6 and above use weak symbols
 	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 	      ;;
@@ -5942,7 +6489,7 @@
 
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
             ;;
 	  cxx*)
 	    # Compaq C++
@@ -5961,9 +6508,9 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
 	    ;;
-	  xl*)
+	  xl* | mpixl* | bgxl*)
 	    # IBM XL 8.0 on PPC, with GNU ld
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -5983,13 +6530,13 @@
 	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	      _LT_TAGVAR(compiler_needs_object, $1)=yes
 
 	      # Not sure whether something based on
 	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
 	      # would be better.
-	      output_verbose_link_cmd='echo'
+	      output_verbose_link_cmd='func_echo_all'
 
 	      # Archives containing C++ object files must be created using
 	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -6058,7 +6605,7 @@
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
 	  fi
-	  output_verbose_link_cmd=echo
+	  output_verbose_link_cmd=func_echo_all
 	else
 	  _LT_TAGVAR(ld_shlibs, $1)=no
 	fi
@@ -6093,15 +6640,15 @@
 	    case $host in
 	      osf3*)
 	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 		;;
 	      *)
 	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
 	          $RM $lib.exp'
 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 		;;
@@ -6117,17 +6664,17 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
 	  *)
 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 	      case $host in
 	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	      esac
 
@@ -6137,7 +6684,7 @@
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -6173,7 +6720,7 @@
 
       solaris*)
         case $cc_basename in
-          CC*)
+          CC* | sunCC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
             _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
 	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -6194,7 +6741,7 @@
 	    esac
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
 
-	    output_verbose_link_cmd='echo'
+	    output_verbose_link_cmd='func_echo_all'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -6214,14 +6761,14 @@
 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      else
 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
 	        # platform.
@@ -6232,7 +6779,7 @@
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      fi
 
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -6286,6 +6833,10 @@
           CC*)
 	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+	      '"$_LT_TAGVAR(reload_cmds, $1)"
 	    ;;
 	  *)
 	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -6341,6 +6892,7 @@
   fi # test -n "$compiler"
 
   CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
   LDCXX=$LD
   LD=$lt_save_LD
   GCC=$lt_save_GCC
@@ -6355,6 +6907,29 @@
 ])# _LT_LANG_CXX_CONFIG
 
 
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
 # ---------------------------------
 # Figure out "hidden" library dependencies from verbose
@@ -6363,6 +6938,7 @@
 # objects, libraries and library flags.
 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
 # Dependencies to place before and after the object being linked:
 _LT_TAGVAR(predep_objects, $1)=
 _LT_TAGVAR(postdep_objects, $1)=
@@ -6412,7 +6988,20 @@
   }
 };
 _LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 ])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
 dnl Parse the compiler output and extract the necessary
 dnl objects, libraries and library flags.
 if AC_TRY_EVAL(ac_compile); then
@@ -6424,7 +7013,7 @@
   pre_test_object_deps_done=no
 
   for p in `eval "$output_verbose_link_cmd"`; do
-    case $p in
+    case ${prev}${p} in
 
     -L* | -R* | -l*)
        # Some compilers place space between "-{L,R}" and the path.
@@ -6433,13 +7022,22 @@
           test $p = "-R"; then
 	 prev=$p
 	 continue
-       else
-	 prev=
        fi
 
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
        if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
+	 case ${prev} in
+	 -L | -R)
 	   # Internal compiler library paths should come after those
 	   # provided the user.  The postdeps already come after the
 	   # user supplied libs so there is no need to process them.
@@ -6459,8 +7057,10 @@
 	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
 	 fi
        fi
+       prev=
        ;;
 
+    *.lto.$objext) ;; # Ignore GCC LTO objects
     *.$objext)
        # This assumes that the test object file only shows up
        # once in the compiler output.
@@ -6496,6 +7096,7 @@
 fi
 
 $RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
 
 # PORTME: override above test on systems where it is broken
 m4_if([$1], [CXX],
@@ -6532,7 +7133,7 @@
 
 solaris*)
   case $cc_basename in
-  CC*)
+  CC* | sunCC*)
     # The more standards-conforming stlport4 library is
     # incompatible with the Cstd library. Avoid specifying
     # it if it's in CXXFLAGS. Ignore libCrun as
@@ -6576,32 +7177,16 @@
 ])# _LT_SYS_HIDDEN_LIBDEPS
 
 
-# _LT_PROG_F77
-# ------------
-# Since AC_PROG_F77 is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_F77],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
-AC_PROG_F77
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_F77
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_F77], [])
-
-
 # _LT_LANG_F77_CONFIG([TAG])
 # --------------------------
 # Ensure that the configuration variables for a Fortran 77 compiler are
 # suitably defined.  These variables are subsequently used by _LT_CONFIG
 # to write the compiler configuration to `libtool'.
 m4_defun([_LT_LANG_F77_CONFIG],
-[AC_REQUIRE([_LT_PROG_F77])dnl
-AC_LANG_PUSH(Fortran 77)
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
 
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -6611,7 +7196,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -6620,6 +7204,8 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -6659,7 +7245,9 @@
   # Allow CC to be a program name with arguments.
   lt_save_CC="$CC"
   lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
   CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
   compiler=$CC
   _LT_TAGVAR(compiler, $1)=$CC
   _LT_CC_BASENAME([$compiler])
@@ -6713,38 +7301,24 @@
 
   GCC=$lt_save_GCC
   CC="$lt_save_CC"
+  CFLAGS="$lt_save_CFLAGS"
 fi # test "$_lt_disable_F77" != yes
 
 AC_LANG_POP
 ])# _LT_LANG_F77_CONFIG
 
 
-# _LT_PROG_FC
-# -----------
-# Since AC_PROG_FC is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_FC],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-AC_PROG_FC
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_FC
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_FC], [])
-
-
 # _LT_LANG_FC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for a Fortran compiler are
 # suitably defined.  These variables are subsequently used by _LT_CONFIG
 # to write the compiler configuration to `libtool'.
 m4_defun([_LT_LANG_FC_CONFIG],
-[AC_REQUIRE([_LT_PROG_FC])dnl
-AC_LANG_PUSH(Fortran)
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
 
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -6754,7 +7328,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -6763,6 +7336,8 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -6802,7 +7377,9 @@
   # Allow CC to be a program name with arguments.
   lt_save_CC="$CC"
   lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
   CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
   compiler=$CC
   GCC=$ac_cv_fc_compiler_gnu
 
@@ -6858,7 +7435,8 @@
   fi # test -n "$compiler"
 
   GCC=$lt_save_GCC
-  CC="$lt_save_CC"
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
 fi # test "$_lt_disable_FC" != yes
 
 AC_LANG_POP
@@ -6895,10 +7473,12 @@
 _LT_LINKER_BOILERPLATE
 
 # Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=yes
 CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
 _LT_TAGVAR(LD, $1)="$LD"
@@ -6908,11 +7488,9 @@
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
 if test -n "$compiler"; then
   _LT_COMPILER_NO_RTTI($1)
   _LT_COMPILER_PIC($1)
@@ -6927,10 +7505,78 @@
 AC_LANG_RESTORE
 
 GCC=$lt_save_GCC
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -6962,9 +7608,11 @@
 
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
+lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=
 CC=${RC-"windres"}
+CFLAGS=
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
 _LT_CC_BASENAME([$compiler])
@@ -6977,7 +7625,8 @@
 
 GCC=$lt_save_GCC
 AC_LANG_RESTORE
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_RC_CONFIG
 
 
@@ -6997,6 +7646,13 @@
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
@@ -7036,6 +7692,15 @@
 AC_SUBST([OBJDUMP])
 ])
 
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
 
 # _LT_DECL_SED
 # ------------
@@ -7051,12 +7716,10 @@
 ])# _LT_DECL_SED
 
 m4_ifndef([AC_PROG_SED], [
-############################################################
 # NOTE: This macro has been submitted for inclusion into   #
 #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
 #  a released version of Autoconf we should remove this    #
 #  macro and use it instead.                               #
-############################################################
 
 m4_defun([AC_PROG_SED],
 [AC_MSG_CHECKING([for a sed that does not truncate output])
@@ -7129,8 +7792,8 @@
 # Try some XSI features
 xsi_shell=no
 ( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
     && eval 'test $(( 1 + 1 )) -eq 2 \
     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
   && xsi_shell=yes
@@ -7169,223 +7832,177 @@
 ])# _LT_CHECK_SHELL_FEATURES
 
 
-# _LT_PROG_XSI_SHELLFNS
-# ---------------------
-# Bourne and XSI compatible variants of some useful shell functions.
-m4_defun([_LT_PROG_XSI_SHELLFNS],
-[case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $[*] ))
-}
+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# ------------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
+m4_defun([_LT_PROG_FUNCTION_REPLACE],
+[dnl {
+sed -e '/^$1 ()$/,/^} # $1 /c\
+$1 ()\
+{\
+m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+])
 
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
 
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
+# _LT_PROG_REPLACE_SHELLFNS
+# -------------------------
+# Replace existing portable implementations of several shell functions with
+# equivalent extended shell implementations where those features are available..
+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
+[if test x"$xsi_shell" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac
+    func_basename_result="${1##*/}"])
 
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
+  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary parameter first.
+    func_stripname_result=${3}
+    func_stripname_result=${func_stripname_result#"${1}"}
+    func_stripname_result=${func_stripname_result%"${2}"}])
 
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+    func_split_long_opt_name=${1%%=*}
+    func_split_long_opt_arg=${1#*=}])
 
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
+  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
+    func_split_short_opt_arg=${1#??}
+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
 
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
+  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
+    case ${1} in
+      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+      *)    func_lo2o_result=${1} ;;
+    esac])
 
-# sed scripts:
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
+  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
 
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
 
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
+fi
 
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-}
+if test x"$lt_shell_append" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
 
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$[@]"`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
+    func_quote_for_eval "${2}"
+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
+    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
 
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
 
-_LT_EOF
-esac
+if test x"$_lt_function_replace_fail" = x":"; then
+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
 
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]+=\$[2]"
-}
-_LT_EOF
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine which file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
     ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]=\$$[1]\$[2]"
-}
-
-_LT_EOF
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
     ;;
-  esac
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
 ])
-
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
 
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+#   Inc.
 #   Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 6 ltoptions.m4
+# serial 7 ltoptions.m4
 
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -7463,9 +8080,6 @@
 ])# _LT_SET_OPTIONS
 
 
-## --------------------------------- ##
-## Macros to handle LT_INIT options. ##
-## --------------------------------- ##
 
 # _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
 # -----------------------------------------
@@ -7503,7 +8117,7 @@
 [enable_win32_dll=yes
 
 case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -7511,13 +8125,13 @@
 esac
 
 test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [0], [Assembler program])dnl
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
 
 test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
 
 test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
 ])# win32-dll
 
 AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
@@ -7703,9 +8317,24 @@
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
     [pic_mode=default])
 
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
@@ -7727,9 +8356,6 @@
 dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
 
-## ----------------- ##
-## LTDL_INIT Options ##
-## ----------------- ##
 
 m4_define([_LTDL_MODE], [])
 LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
@@ -7745,32 +8371,6 @@
 LT_OPTION_DEFINE([LTDL_INIT], [convenience],
 		 [m4_define([_LTDL_TYPE], [convenience])])
 
-
-# ltversion.m4 -- version numbers			-*- Autoconf -*-
-#
-#   Copyright (C) 2004 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# Generated from ltversion.in.
-
-# serial 3012 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
-m4_define([LT_PACKAGE_REVISION], [1.3012])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6'
-macro_revision='1.3012'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
-
-
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
 # Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
@@ -7895,17 +8495,40 @@
 		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
 ])
 
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# @configure_input@
+
+# serial 3337 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.4.2'
+macro_revision='1.3337'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
 
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 4 lt~obsolete.m4
+# serial 5 lt~obsolete.m4
 
 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
@@ -7975,7 +8598,6 @@
 m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
 m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
 m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
 m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
 m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
 m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
@@ -7988,3 +8610,11 @@
 m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
 m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
+
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/app.cc sdcc-3.2.0+dfsg/sim/ucsim/app.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/app.cc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/app.cc	2012-05-02 15:49:38.000000000 +0000
@@ -153,7 +153,8 @@
 cl_app::run(void)
 {
   int done= 0;
-
+  unsigned  input_check_skip = 0;
+  
   while (!done &&
          going)
     {
@@ -161,10 +162,19 @@
         {
           if (sim->state & SIM_GO)
             {
-              if (commander->input_avail())
-                done= commander->proc_input();
+              if ((!input_check_skip) && (commander->input_avail()))
+                {
+                  done= commander->proc_input();
+                  
+                  // run a few steps before checking for more input
+                  ++input_check_skip;
+                }
               else
-                sim->step();
+                {
+                  sim->step();
+                  
+                  input_check_skip = (input_check_skip + 1) % 50;
+                }
             }
           else
             {
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/cmd.src/cmdgui.cc sdcc-3.2.0+dfsg/sim/ucsim/cmd.src/cmdgui.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/cmd.src/cmdgui.cc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/cmd.src/cmdgui.cc	2012-03-14 20:37:02.000000000 +0000
@@ -47,23 +47,7 @@
 //                        class cl_cmdline *cmdline, class cl_console_base *con)
 COMMAND_DO_WORK_UC(cl_gui_start_cmd)
 {
-  class cl_hw *hw;
-  class cl_memory *mem;
-  t_addr start, end;
-  class cl_cmd_arg *params[4]= { cmdline->param(0),
-                                 cmdline->param(1),
-                                 cmdline->param(2),
-                                 cmdline->param(3) };
-
-  if (cmdline->syntax_match(uc, HW)) {
-    hw= params[0]->value.hw;
-  }
-  else if (cmdline->syntax_match(uc, MEMORY ADDRESS ADDRESS)) {
-    mem= params[0]->value.memory.memory;
-    start= params[1]->value.address;
-    end= params[2]->value.address;
-  }
-  else
+  if (!cmdline->syntax_match(uc, HW) && !cmdline->syntax_match(uc, MEMORY ADDRESS ADDRESS))
     {
       con->dd_printf("Error: wrong syntax\n"
                      "%s\n", short_help?short_help:"no help");
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/cmd.src/cmdlex.l sdcc-3.2.0+dfsg/sim/ucsim/cmd.src/cmdlex.l
--- sdcc-3.1.0+dfsg/sim/ucsim/cmd.src/cmdlex.l	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/cmd.src/cmdlex.l	2011-12-29 13:55:21.000000000 +0000
@@ -8,6 +8,8 @@
 #define YY_INPUT(buf,result,max_size) result = uc_yy_input(buf, max_size) 
 %}
 
+%option nounput
+
 %%
 
 [ \t]*			;
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/cmd.src/cmdset.cc sdcc-3.2.0+dfsg/sim/ucsim/cmd.src/cmdset.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/cmd.src/cmdset.cc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/cmd.src/cmdset.cc	2012-03-14 20:37:02.000000000 +0000
@@ -207,13 +207,11 @@
 //                   class cl_cmdline *cmdline, class cl_console_base *con)
 COMMAND_DO_WORK_APP(cl_help_cmd)
 {
-  class cl_sim *sim;
   class cl_commander_base *commander;
   class cl_cmdset *cmdset= 0;
   int i;
   class cl_cmd_arg *parm= cmdline->param(0);
 
-  sim= app->get_sim();
   if ((commander= app->get_commander()) != 0)
     cmdset= commander->cmdset;
   if (!cmdset)
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/cmd.src/cmdstat.cc sdcc-3.2.0+dfsg/sim/ucsim/cmd.src/cmdstat.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/cmd.src/cmdstat.cc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/cmd.src/cmdstat.cc	2012-03-14 20:37:02.000000000 +0000
@@ -48,7 +48,6 @@
 //                     class cl_cmdline *cmdline, class cl_console_base *con)
 COMMAND_DO_WORK_UC(cl_statistic_cmd)
 {
-  class cl_hw *hw;
   class cl_address_space *mem;
   t_addr start= 0, end= 0;
   bool addresses= DD_FALSE;
@@ -57,10 +56,7 @@
                                  cmdline->param(2),
                                  cmdline->param(3) };
 
-  if (cmdline->syntax_match(uc, HW)) {
-    hw= params[0]->value.hw;
-  }
-  else {
+  if (!cmdline->syntax_match(uc, HW)) {
     mem= 0;
     if (cmdline->syntax_match(uc, MEMORY ADDRESS ADDRESS)) {
       mem= params[0]->value.memory.address_space;
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/configure sdcc-3.2.0+dfsg/sim/ucsim/configure
--- sdcc-3.1.0+dfsg/sim/ucsim/configure	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/configure	2012-05-18 10:47:44.000000000 +0000
@@ -1,11 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68.
+# Generated by GNU Autoconf 2.69.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -134,6 +132,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -167,11 +190,20 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
 test \$(( 1 + 1 )) = 2 || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
@@ -212,21 +244,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -328,6 +364,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -449,6 +493,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -483,16 +531,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -504,28 +552,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -533,155 +561,8 @@
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
-
-
-# Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-$*
-_LT_EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
-
-	  if test "$prev" != 'sed 50q "$0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
-	  fi
-        fi
-      fi
-    fi
-  fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
@@ -773,8 +654,10 @@
 LIPO
 NMEDIT
 DSYMUTIL
-lt_ECHO
+MANIFEST_TOOL
+ac_ct_AR
 AR
+DLLTOOL
 OBJDUMP
 LN_S
 NM
@@ -878,6 +761,7 @@
 with_pic
 enable_fast_install
 with_gnu_ld
+with_sysroot
 enable_libtool_lock
 '
       ac_precious_vars='build_alias
@@ -1351,8 +1235,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1527,9 +1409,11 @@
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-sysroot=DIR Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).
 
 Some influential environment variables:
   docdir      documentation installation directory
@@ -1618,9 +1502,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1771,7 +1655,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1994,7 +1878,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -2226,7 +2110,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2242,7 +2127,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2268,7 +2154,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2284,7 +2171,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2318,7 +2206,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -2391,7 +2280,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2739,7 +2628,7 @@
 
 
 
-ac_config_headers="$ac_config_headers ddconfig.h:ddconfig_in.h custom.h:custom_in.h"
+ac_config_headers="$ac_config_headers ddconfig.h:ddconfig_in.h"
 
 
 for ac_prog in gawk mawk nawk awk
@@ -2760,7 +2649,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2961,7 +2850,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3005,7 +2894,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3639,7 +3528,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -3712,7 +3601,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3752,7 +3641,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3804,7 +3693,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3839,8 +3728,8 @@
 
 
 
-macro_version='2.2.6'
-macro_revision='1.3012'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -3927,6 +3816,75 @@
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case "$ECHO" in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3949,7 +3907,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3989,7 +3947,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4042,7 +4000,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4083,7 +4041,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -4141,7 +4099,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4185,7 +4143,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4381,8 +4339,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4489,7 +4446,7 @@
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+      as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -4565,7 +4522,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4631,7 +4588,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -4698,7 +4655,7 @@
     for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+      as_fn_executable_p "$ac_path_FGREP" || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
 case `"$ac_path_FGREP" --version 2>&1` in
@@ -4932,8 +4889,11 @@
   NM="$lt_cv_path_NM"
 else
   # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -4951,7 +4911,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4977,7 +4937,7 @@
 fi
 if test -z "$DUMPBIN"; then
   ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+  for ac_prog in dumpbin "link -dump"
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4995,7 +4955,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5032,6 +4992,15 @@
   fi
 fi
 
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
 
   if test "$DUMPBIN" != ":"; then
     NM="$DUMPBIN"
@@ -5051,13 +5020,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5054: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5057: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5060: output\"" >&5)
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5114,6 +5083,11 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
   amigaos*)
     # On AmigaOS with pdksh, this test takes hours, literally.
     # So we just punt and use a minimum line length of 8192.
@@ -5139,6 +5113,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -5178,8 +5157,8 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
         i=`expr $i + 1`
@@ -5221,8 +5200,8 @@
 # Try some XSI features
 xsi_shell=no
 ( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
     && eval 'test $(( 1 + 1 )) -eq 2 \
     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
   && xsi_shell=yes
@@ -5271,6 +5250,80 @@
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 $as_echo_n "checking for $LD option to reload object files... " >&6; }
 if ${lt_cv_ld_reload_flag+:} false; then :
@@ -5287,6 +5340,11 @@
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
   darwin*)
     if test "$GCC" = yes; then
       reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -5321,7 +5379,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5361,7 +5419,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5450,16 +5508,18 @@
   # Base MSYS/MinGW do not provide the 'file' command needed by
   # func_win32_libid shell function, so use a weaker test based on 'objdump',
   # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   ;;
 
-cegcc)
+cegcc*)
   # use the weaker test based on 'objdump'. See mingw*.
   lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -5489,6 +5549,10 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
@@ -5497,11 +5561,11 @@
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
     ;;
   hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
     ;;
   *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
     lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
@@ -5522,8 +5586,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -5604,6 +5668,21 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
 $as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -5619,16 +5698,26 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
+if ${ac_cv_prog_DLLTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -5636,8 +5725,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -5647,10 +5736,10 @@
 
 fi
 fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -5658,17 +5747,17 @@
 
 
 fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -5676,8 +5765,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AR="ar"
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -5687,17 +5776,17 @@
 
 fi
 fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -5705,17 +5794,54 @@
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    AR=$ac_ct_AR
+    DLLTOOL=$ac_ct_DLLTOOL
   fi
 else
-  AR="$ac_cv_prog_AR"
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
 fi
 
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+
+
+
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sharedlib_from_linklib_cmd='unknown'
 
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
 
 
@@ -5725,15 +5851,17 @@
 
 
 if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
+  for ac_prog in ar
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if ${ac_cv_prog_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -5741,8 +5869,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -5752,28 +5880,32 @@
 
 fi
 fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
+    test -n "$AR" && break
+  done
 fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -5781,7 +5913,172 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+fi
+
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5840,7 +6137,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5880,7 +6177,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5930,15 +6227,27 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
 
 
 
@@ -6046,8 +6355,8 @@
 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -6071,6 +6380,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -6083,6 +6393,7 @@
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -6108,8 +6419,8 @@
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "$nlist"; then
@@ -6124,6 +6435,18 @@
       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -6135,7 +6458,7 @@
 	  cat <<_LT_EOF >> conftest.$ac_ext
 
 /* The mapping between symbol names and symbols.  */
-const struct {
+LT_DLSYM_CONST struct {
   const char *name;
   void       *address;
 }
@@ -6161,8 +6484,8 @@
 _LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
@@ -6172,8 +6495,8 @@
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
 	else
 	  echo "cannot find nm_test_func in $nlist" >&5
 	fi
@@ -6210,6 +6533,20 @@
 $as_echo "ok" >&6; }
 fi
 
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+
+
+
+
+
+
+
 
 
 
@@ -6229,6 +6566,40 @@
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+  withval=$with_sysroot;
+else
+  with_sysroot=no
+fi
+
+
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
+$as_echo "${with_sysroot}" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
 
 
 
@@ -6263,7 +6634,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6266 "configure"' > conftest.$ac_ext
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6398,7 +6769,7 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -6409,7 +6780,20 @@
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -6425,6 +6809,123 @@
 
 need_locks="$enable_libtool_lock"
 
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+
+
+
+
+
 
   case $host_os in
     rhapsody* | darwin*)
@@ -6445,7 +6946,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6485,7 +6986,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6537,7 +7038,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6577,7 +7078,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6629,7 +7130,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6669,7 +7170,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6721,7 +7222,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6761,7 +7262,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6813,7 +7314,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6853,7 +7354,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6932,7 +7433,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -6943,6 +7450,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -6975,11 +7483,46 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
     darwin*) # darwin 5.x on
       # if running on 10.5 or later, the deployment target defaults
       # to the OS version, if on x86, and 10.4, the deployment
@@ -7002,7 +7545,7 @@
     else
       _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
     fi
-    if test "$DSYMUTIL" != ":"; then
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -7192,502 +7735,115 @@
 
 fi
 
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
-
-  fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-else
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-if test -z "$CXXCPP"; then
-  if ${ac_cv_prog_CXXCPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <ac_nonexistent.h>
+#include <stdlib.h>
+
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
-  # Passes both tests.
-ac_preproc_ok=:
-break
+  ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest*
 
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
 fi
 
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
 else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 #else
-# include <assert.h>
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
 #endif
-		     Syntax error
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"; then :
 
 else
-  # Broken: fails on valid input.
-continue
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
+
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
 
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-_lt_caught_CXX_error=yes; }
-fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
 
-else
-  _lt_caught_CXX_error=yes
 fi
 
+done
+
+
+
+
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+
 
 
 
@@ -7765,7 +7921,22 @@
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   pic_mode=default
 fi
@@ -7842,6 +8013,11 @@
 
 
 
+
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -7891,19 +8067,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 case $host_os in
 aix3*)
   # AIX sometimes has problems with the GCC collect2 program.  For some
@@ -7916,23 +8079,6 @@
   ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
 # Global variables:
 ofile=libtool
 can_build_shared=yes
@@ -7961,7 +8107,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 
 
 # Only perform the check for file, if the check method requires it
@@ -8161,16 +8307,17 @@
 $RM -r conftest*
 
 
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
 if test -n "$compiler"; then
 
 lt_prog_compiler_no_builtin_flag=
 
 if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
@@ -8190,15 +8337,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8193: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8197: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
@@ -8227,8 +8374,6 @@
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -8276,6 +8421,12 @@
       lt_prog_compiler_pic='-fno-common'
       ;;
 
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@ -8318,6 +8469,15 @@
       lt_prog_compiler_pic='-fPIC'
       ;;
     esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
+      ;;
+    esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
@@ -8359,7 +8519,7 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -8380,7 +8540,13 @@
 	lt_prog_compiler_pic='--shared'
 	lt_prog_compiler_static='--static'
 	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	lt_prog_compiler_wl='-Wl,'
@@ -8392,25 +8558,40 @@
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-qpic'
 	lt_prog_compiler_static='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
 	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
 	  ;;
 	esac
 	;;
@@ -8442,7 +8623,7 @@
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95*)
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 	lt_prog_compiler_wl='-Qoption ld ';;
       *)
 	lt_prog_compiler_wl='-Wl,';;
@@ -8499,13 +8680,17 @@
     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
     ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
-
-
-
-
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
@@ -8529,15 +8714,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8532: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8536: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
@@ -8566,6 +8751,11 @@
 
 
 
+
+
+
+
+
 #
 # Check to make sure the static flag actually works.
 #
@@ -8585,7 +8775,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
@@ -8634,16 +8824,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8637: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8641: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
@@ -8689,16 +8879,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8692: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8696: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
@@ -8764,7 +8954,6 @@
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -8808,13 +8997,39 @@
   openbsd*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu)
+  linux* | k*bsd*-gnu | gnu*)
     link_all_deplibs=no
     ;;
   esac
 
   ld_shlibs=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
   if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
@@ -8832,6 +9047,7 @@
     fi
     supports_anon_versioning=no
     case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -8847,11 +9063,12 @@
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
 *** to be unable to reliably create shared libraries on AIX.
 *** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
 
 _LT_EOF
       fi
@@ -8887,10 +9104,12 @@
       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='${wl}--export-all-symbols'
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -8908,6 +9127,11 @@
       fi
       ;;
 
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+
     interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
@@ -8923,7 +9147,7 @@
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | tpf* | k*bsd*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test "$host_os" = linux-dietlibc; then
 	case $cc_basename in
@@ -8933,15 +9157,16 @@
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 	 && test "$tmp_diet" = no
       then
-	tmp_addflag=
+	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -8952,13 +9177,17 @@
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
 	  tmp_sharedflag='--shared' ;;
-	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  compiler_needs_object=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
@@ -8974,17 +9203,16 @@
         fi
 
 	case $cc_basename in
-	xlf*)
+	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
 	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
 	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -8998,8 +9226,8 @@
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -9017,8 +9245,8 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -9064,8 +9292,8 @@
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -9105,8 +9333,10 @@
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	else
 	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	fi
@@ -9194,7 +9424,13 @@
 	allow_undefined_flag='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -9207,25 +9443,32 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
 
         hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
       else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
@@ -9234,7 +9477,13 @@
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -9247,30 +9496,42 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
 
 	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
 	  no_undefined_flag=' ${wl}-bernotok'
 	  allow_undefined_flag=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec='$convenience'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
 	  archive_cmds_need_lc=yes
 	  # This is similar to how AIX traditionally builds its shared libraries.
 	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -9302,20 +9563,64 @@
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_from_new_cmds='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	always_export_symbols=yes
+	file_list_spec='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds='chmod 644 $oldlib'
+	postlink_cmds='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	old_archive_from_new_cmds='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes=yes
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -9325,7 +9630,12 @@
   hardcode_direct=no
   hardcode_automatic=yes
   hardcode_shlibpath_var=unsupported
-  whole_archive_flag_spec=''
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec=''
+  fi
   link_all_deplibs=yes
   allow_undefined_flag="$_lt_dar_allow_undefined"
   case $cc_basename in
@@ -9333,7 +9643,7 @@
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
+    output_verbose_link_cmd=func_echo_all
     archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -9351,10 +9661,6 @@
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -9367,7 +9673,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -9376,7 +9682,7 @@
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       hardcode_shlibpath_var=no
@@ -9384,7 +9690,7 @@
 
     hpux9*)
       if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
 	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
@@ -9399,14 +9705,13 @@
       ;;
 
     hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -9418,16 +9723,16 @@
       ;;
 
     hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
 	hppa*64*)
 	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
@@ -9439,7 +9744,46 @@
 	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test x"$lt_cv_prog_compiler__b" = xyes; then
+    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
 	  ;;
 	esac
       fi
@@ -9467,26 +9811,39 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	# This should be the same for all languages, so no per-tag cache variable.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-int foo(void) {}
+int foo (void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-        LDFLAGS="$save_LDFLAGS"
+           LDFLAGS="$save_LDFLAGS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
       else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
       fi
       archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -9548,17 +9905,17 @@
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
       old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
       fi
       archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -9568,13 +9925,13 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -9587,9 +9944,9 @@
       no_undefined_flag=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
@@ -9777,44 +10134,50 @@
       # to ld, don't add -lc before -lgcc.
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl
-	pic_flag=$lt_prog_compiler_pic
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag
-        allow_undefined_flag=
-        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag
+	  allow_undefined_flag=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-        then
-	  archive_cmds_need_lc=no
-        else
-	  archive_cmds_need_lc=yes
-        fi
-        allow_undefined_flag=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
       ;;
     esac
   fi
@@ -9972,11 +10335,6 @@
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -9985,16 +10343,23 @@
     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
     *) lt_awk_arg="/^libraries:/" ;;
   esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
   # Ok, now we have the path, separated by spaces, we can step through it
   # and add multilib dir if necessary.
   lt_tmp_lt_search_path_spec=
@@ -10007,7 +10372,7 @@
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
 BEGIN {RS=" "; FS="/|\n";} {
   lt_foo="";
   lt_count=0;
@@ -10027,7 +10392,13 @@
   if (lt_foo != "") { lt_freq[lt_foo]++; }
   if (lt_freq[lt_foo] == 1) { print lt_foo; }
 }'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
@@ -10053,7 +10424,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -10062,7 +10433,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -10115,7 +10486,7 @@
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
@@ -10127,7 +10498,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -10146,8 +10517,9 @@
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
@@ -10168,36 +10540,83 @@
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
+    # Assume MSVC wrapper
     library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -10218,7 +10637,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -10226,10 +10645,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -10237,7 +10652,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -10255,7 +10670,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -10275,12 +10690,26 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -10326,12 +10755,14 @@
     soname_spec='${libname}${release}${shared_ext}$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -10347,7 +10778,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -10384,9 +10815,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10394,12 +10825,17 @@
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+
   # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -10412,13 +10848,17 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  shlibpath_overrides_runpath=yes
+  lt_cv_shlibpath_overrides_runpath=yes
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
@@ -10427,7 +10867,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -10471,7 +10911,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -10540,7 +10980,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10565,7 +11005,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -10589,7 +11029,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -10620,7 +11060,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10630,7 +11070,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -10742,6 +11182,11 @@
 
 
 
+
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
@@ -11072,7 +11517,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11075 "configure"
+#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11113,7 +11558,13 @@
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -11122,7 +11573,11 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
@@ -11168,7 +11623,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11171 "configure"
+#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11209,7 +11664,13 @@
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -11218,7 +11679,11 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
@@ -11336,45 +11801,184 @@
 $as_echo_n "checking whether to build shared libraries... " >&6; }
   test "$can_build_shared" = "no" && enable_shared=no
 
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[4-9]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+
+
+
+
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC="$lt_save_CC"
+
+      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+  if ${ac_cv_prog_CXXCPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
 
-  aix[4-9]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
 
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
 
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
 
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
 fi
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-CC="$lt_save_CC"
-
+else
+  _lt_caught_CXX_error=yes
+fi
 
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -11391,7 +11995,6 @@
 hardcode_direct_CXX=no
 hardcode_direct_absolute_CXX=no
 hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
 hardcode_libdir_separator_CXX=
 hardcode_minus_L_CXX=no
 hardcode_shlibpath_var_CXX=unsupported
@@ -11401,6 +12004,8 @@
 module_expsym_cmds_CXX=
 link_all_deplibs_CXX=unknown
 old_archive_cmds_CXX=$old_archive_cmds
+reload_flag_CXX=$reload_flag
+reload_cmds_CXX=$reload_cmds
 no_undefined_flag_CXX=
 whole_archive_flag_spec_CXX=
 enable_shared_with_static_runtimes_CXX=no
@@ -11456,6 +12061,7 @@
 
   # Allow CC to be a program name with arguments.
   lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
   lt_save_LD=$LD
   lt_save_GCC=$GCC
   GCC=$GXX
@@ -11473,6 +12079,7 @@
   fi
   test -z "${LDCXX+set}" || LD=$LDCXX
   CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
   compiler=$CC
   compiler_CXX=$CC
   for cc_temp in $compiler""; do
@@ -11483,7 +12090,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 
 
   if test -n "$compiler"; then
@@ -11612,8 +12219,8 @@
       # Check if GNU C++ uses GNU ld as the underlying linker, since the
       # archiving commands below assume that GNU ld is being used.
       if test "$with_gnu_ld" = yes; then
-        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
         hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
         export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -11645,7 +12252,7 @@
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
     else
       GXX=no
@@ -11755,7 +12362,13 @@
           allow_undefined_flag_CXX='-berok'
           # Determine the default libpath from the value encoded in an empty
           # executable.
-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -11768,26 +12381,33 @@
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
 
           hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
         else
           if test "$host_cpu" = ia64; then
 	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
@@ -11796,7 +12416,13 @@
           else
 	    # Determine the default libpath from the value encoded in an
 	    # empty executable.
-	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	    if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -11809,30 +12435,42 @@
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
 
 	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
 	    # Warning - without using the other run time loading flags,
 	    # -berok will link without error, but may produce a broken library.
 	    no_undefined_flag_CXX=' ${wl}-bernotok'
 	    allow_undefined_flag_CXX=' ${wl}-berok'
-	    # Exported symbols can be pulled into shared objects from archives
-	    whole_archive_flag_spec_CXX='$convenience'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      whole_archive_flag_spec_CXX='$convenience'
+	    fi
 	    archive_cmds_need_lc_CXX=yes
 	    # This is similar to how AIX traditionally builds its shared
 	    # libraries.
@@ -11862,28 +12500,75 @@
         ;;
 
       cygwin* | mingw* | pw32* | cegcc*)
-        # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-        # as there is no search path for DLLs.
-        hardcode_libdir_flag_spec_CXX='-L$libdir'
-        allow_undefined_flag_CXX=unsupported
-        always_export_symbols_CXX=no
-        enable_shared_with_static_runtimes_CXX=yes
-
-        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-          archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-          # If the export-symbols file already is a .def file (1st line
-          # is EXPORTS), use it as is; otherwise, prepend...
-          archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    cp $export_symbols $output_objdir/$soname.def;
-          else
-	    echo EXPORTS > $output_objdir/$soname.def;
-	    cat $export_symbols >> $output_objdir/$soname.def;
-          fi~
-          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-        else
-          ld_shlibs_CXX=no
-        fi
-        ;;
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  hardcode_libdir_flag_spec_CXX=' '
+	  allow_undefined_flag_CXX=unsupported
+	  always_export_symbols_CXX=yes
+	  file_list_spec_CXX='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
+	  enable_shared_with_static_runtimes_CXX=yes
+	  # Don't use ranlib
+	  old_postinstall_cmds_CXX='chmod 644 $oldlib'
+	  postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  hardcode_libdir_flag_spec_CXX='-L$libdir'
+	  export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
+	  allow_undefined_flag_CXX=unsupported
+	  always_export_symbols_CXX=no
+	  enable_shared_with_static_runtimes_CXX=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    ld_shlibs_CXX=no
+	  fi
+	  ;;
+	esac
+	;;
       darwin* | rhapsody*)
 
 
@@ -11891,7 +12576,12 @@
   hardcode_direct_CXX=no
   hardcode_automatic_CXX=yes
   hardcode_shlibpath_var_CXX=unsupported
-  whole_archive_flag_spec_CXX=''
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec_CXX=''
+  fi
   link_all_deplibs_CXX=yes
   allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
   case $cc_basename in
@@ -11899,7 +12589,7 @@
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
+    output_verbose_link_cmd=func_echo_all
     archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -11933,7 +12623,7 @@
         esac
         ;;
 
-      freebsd[12]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         ld_shlibs_CXX=no
@@ -11952,6 +12642,11 @@
       gnu*)
         ;;
 
+      haiku*)
+        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        link_all_deplibs_CXX=yes
+        ;;
+
       hpux9*)
         hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
         hardcode_libdir_separator_CXX=:
@@ -11976,11 +12671,11 @@
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
             ;;
           *)
             if test "$GXX" = yes; then
-              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
             else
               # FIXME: insert proper C++ library support
               ld_shlibs_CXX=no
@@ -12041,7 +12736,7 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
           *)
 	    if test "$GXX" = yes; then
@@ -12051,10 +12746,10 @@
 	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          ia64*)
-	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          *)
-	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	        esac
 	      fi
@@ -12084,7 +12779,7 @@
         case $cc_basename in
           CC*)
 	    # SGI C++
-	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -12095,9 +12790,9 @@
           *)
 	    if test "$GXX" = yes; then
 	      if test "$with_gnu_ld" = no; then
-	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	      else
-	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
 	      fi
 	    fi
 	    link_all_deplibs_CXX=yes
@@ -12108,7 +12803,7 @@
         inherit_rpath_CXX=yes
         ;;
 
-      linux* | k*bsd*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -12126,7 +12821,7 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 
 	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
 	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -12163,26 +12858,26 @@
           pgCC* | pgcpp*)
             # Portland Group C++ compiler
 	    case `$CC -V` in
-	    *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
+	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
 	      prelink_cmds_CXX='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
 	      old_archive_cmds_CXX='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
 		$RANLIB $oldlib'
 	      archive_cmds_CXX='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 	      archive_expsym_cmds_CXX='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 	      ;;
-	    *) # Version 6 will use weak symbols
+	    *) # Version 6 and above use weak symbols
 	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 	      ;;
@@ -12190,7 +12885,7 @@
 
 	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
 	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
             ;;
 	  cxx*)
 	    # Compaq C++
@@ -12209,9 +12904,9 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
 	    ;;
-	  xl*)
+	  xl* | mpixl* | bgxl*)
 	    # IBM XL 8.0 on PPC, with GNU ld
 	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -12231,13 +12926,13 @@
 	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
 	      hardcode_libdir_flag_spec_CXX='-R$libdir'
-	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	      compiler_needs_object_CXX=yes
 
 	      # Not sure whether something based on
 	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
 	      # would be better.
-	      output_verbose_link_cmd='echo'
+	      output_verbose_link_cmd='func_echo_all'
 
 	      # Archives containing C++ object files must be created using
 	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -12306,7 +13001,7 @@
 	    export_dynamic_flag_spec_CXX='${wl}-E'
 	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
 	  fi
-	  output_verbose_link_cmd=echo
+	  output_verbose_link_cmd=func_echo_all
 	else
 	  ld_shlibs_CXX=no
 	fi
@@ -12341,15 +13036,15 @@
 	    case $host in
 	      osf3*)
 	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 		;;
 	      *)
 	        allow_undefined_flag_CXX=' -expect_unresolved \*'
-	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
 	          $RM $lib.exp'
 	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
 		;;
@@ -12365,17 +13060,17 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
 	  *)
 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
 	      case $host in
 	        osf3*)
-	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	        *)
-	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	      esac
 
@@ -12385,7 +13080,7 @@
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -12421,7 +13116,7 @@
 
       solaris*)
         case $cc_basename in
-          CC*)
+          CC* | sunCC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
             archive_cmds_need_lc_CXX=yes
 	    no_undefined_flag_CXX=' -zdefs'
@@ -12442,7 +13137,7 @@
 	    esac
 	    link_all_deplibs_CXX=yes
 
-	    output_verbose_link_cmd='echo'
+	    output_verbose_link_cmd='func_echo_all'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -12462,14 +13157,14 @@
 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      else
 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
 	        # platform.
@@ -12480,7 +13175,7 @@
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      fi
 
 	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -12534,6 +13229,10 @@
           CC*)
 	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
+	      '"$old_archive_cmds_CXX"
+	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
+	      '"$reload_cmds_CXX"
 	    ;;
 	  *)
 	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -12595,6 +13294,14 @@
 };
 _LT_EOF
 
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -12608,7 +13315,7 @@
   pre_test_object_deps_done=no
 
   for p in `eval "$output_verbose_link_cmd"`; do
-    case $p in
+    case ${prev}${p} in
 
     -L* | -R* | -l*)
        # Some compilers place space between "-{L,R}" and the path.
@@ -12617,13 +13324,22 @@
           test $p = "-R"; then
 	 prev=$p
 	 continue
-       else
-	 prev=
        fi
 
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
        if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
+	 case ${prev} in
+	 -L | -R)
 	   # Internal compiler library paths should come after those
 	   # provided the user.  The postdeps already come after the
 	   # user supplied libs so there is no need to process them.
@@ -12643,8 +13359,10 @@
 	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
 	 fi
        fi
+       prev=
        ;;
 
+    *.lto.$objext) ;; # Ignore GCC LTO objects
     *.$objext)
        # This assumes that the test object file only shows up
        # once in the compiler output.
@@ -12680,6 +13398,7 @@
 fi
 
 $RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
 
 # PORTME: override above test on systems where it is broken
 case $host_os in
@@ -12715,7 +13434,7 @@
 
 solaris*)
   case $cc_basename in
-  CC*)
+  CC* | sunCC*)
     # The more standards-conforming stlport4 library is
     # incompatible with the Cstd library. Avoid specifying
     # it if it's in CXXFLAGS. Ignore libCrun as
@@ -12780,8 +13499,6 @@
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -12831,6 +13548,11 @@
       # DJGPP does not support shared libraries at all
       lt_prog_compiler_pic_CXX=
       ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static_CXX=
+      ;;
     interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
@@ -12880,6 +13602,11 @@
 	  ;;
 	esac
 	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+	;;
       dgux*)
 	case $cc_basename in
 	  ec++*)
@@ -12936,7 +13663,7 @@
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -12969,8 +13696,8 @@
 	    lt_prog_compiler_pic_CXX=
 	    lt_prog_compiler_static_CXX='-non_shared'
 	    ;;
-	  xlc* | xlC*)
-	    # IBM XL 8.0 on PPC
+	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-qpic'
 	    lt_prog_compiler_static_CXX='-qstaticlink'
@@ -13032,7 +13759,7 @@
 	;;
       solaris*)
 	case $cc_basename in
-	  CC*)
+	  CC* | sunCC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-Bstatic'
@@ -13097,10 +13824,17 @@
     lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
     ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
-
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
 
 #
 # Check to make sure the PIC flag actually works.
@@ -13124,15 +13858,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13127: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13131: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works_CXX=yes
@@ -13158,6 +13892,8 @@
 
 
 
+
+
 #
 # Check to make sure the static flag actually works.
 #
@@ -13177,7 +13913,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works_CXX=yes
@@ -13223,16 +13959,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13226: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13230: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_CXX=yes
@@ -13275,16 +14011,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13278: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13282: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_CXX=yes
@@ -13335,30 +14071,40 @@
 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   case $host_os in
   aix[4-9]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     else
       export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
     export_symbols_cmds_CXX="$ltdll_cmds"
-  ;;
+    ;;
   cygwin* | mingw* | cegcc*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  linux* | k*bsd*-gnu)
+    case $cc_basename in
+    cl*)
+      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+      ;;
+    esac
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
     link_all_deplibs_CXX=no
-  ;;
+    ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
+    ;;
   esac
-  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
 $as_echo "$ld_shlibs_CXX" >&6; }
@@ -13390,44 +14136,50 @@
       # to ld, don't add -lc before -lgcc.
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_CXX
-	pic_flag=$lt_prog_compiler_pic_CXX
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-        allow_undefined_flag_CXX=
-        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl_CXX
+	  pic_flag=$lt_prog_compiler_pic_CXX
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+	  allow_undefined_flag_CXX=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-        then
-	  archive_cmds_need_lc_CXX=no
-        else
-	  archive_cmds_need_lc_CXX=yes
-        fi
-        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
-$as_echo "$archive_cmds_need_lc_CXX" >&6; }
+	  then
+	    lt_cv_archive_cmds_need_lc_CXX=no
+	  else
+	    lt_cv_archive_cmds_need_lc_CXX=yes
+	  fi
+	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
+      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
       ;;
     esac
   fi
@@ -13495,8 +14247,6 @@
 
 
 
-
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -13522,7 +14272,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -13531,7 +14281,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -13584,7 +14334,7 @@
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
@@ -13596,7 +14346,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -13615,8 +14365,9 @@
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
@@ -13637,36 +14388,82 @@
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
+    # Assume MSVC wrapper
     library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -13686,7 +14483,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -13694,10 +14491,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -13705,7 +14498,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -13723,7 +14516,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -13742,13 +14535,27 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux
+gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
+  dynamic_linker="$host_os runtime_loader"
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -13794,12 +14601,14 @@
     soname_spec='${libname}${release}${shared_ext}$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -13815,7 +14624,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -13852,9 +14661,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -13862,12 +14671,17 @@
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+
   # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
-       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -13880,13 +14694,17 @@
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  shlibpath_overrides_runpath=yes
+  lt_cv_shlibpath_overrides_runpath=yes
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
@@ -13895,7 +14713,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -13939,7 +14757,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -14008,7 +14826,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14033,7 +14851,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -14057,7 +14875,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -14088,7 +14906,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14098,7 +14916,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -14159,6 +14977,8 @@
 
 
 
+
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_CXX=
@@ -14206,6 +15026,7 @@
   fi # test -n "$compiler"
 
   CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
   LDCXX=$LD
   LD=$lt_save_LD
   GCC=$lt_save_GCC
@@ -14234,6 +15055,8 @@
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -14262,7 +15085,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LEX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -14294,7 +15117,8 @@
 b { REJECT; }
 c { yymore (); }
 d { yyless (1); }
-e { yyless (input () != 0); }
+e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument.  */
+    yyless ((input () != 0)); }
 f { unput (yytext[0]); }
 . { BEGIN INITIAL; }
 %%
@@ -14425,7 +15249,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_YACC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15520,10 +16344,10 @@
 
 
 
-# bor_IS_VALID_OPTION macro checks if the current compiler, selected by
+# sdcc_IS_VALID_OPTION macro checks if the current compiler, selected by
 # AC_LANG, supports option specified as the 1st parameter. The test fails if
 # the compiler returns an error or in case something is writeen to stderr.
-# For example: bor_VALID_OPT(fPIC)
+# For example: sdcc_VALID_OPT(-fPIC)
 
 
 
@@ -15541,28 +16365,63 @@
   ac_cv_sizeof_long_long=4
 fi
 
-# SDCC_BUILD_BIGENDIAN ([ACTION-IF-TRUE], [ACTION-IF-FALSE], [ACTION-IF-UNKNOWN])
-# -------------------------------------------------------------------------
-# SDCC_BUILD_BIGENDIAN
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether host machine byte ordering is bigendian" >&5
-$as_echo_n "checking whether host machine byte ordering is bigendian... " >&6; }
-if ${sdcc_cv_build_bigendian+:} false; then :
+# Checking whether byte ordering is bigendian
+# --------------------------------------------------------
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if ${ac_cv_c_bigendian+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  # See if sys/param.h defines the BYTE_ORDER macro.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+	# Check for potential -arch flags.  It is not universal unless
+	# there are at least two -arch flags with different values.
+	ac_arch=
+	ac_prev=
+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+	 if test -n "$ac_prev"; then
+	   case $ac_word in
+	     i?86 | x86_64 | ppc | ppc64)
+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+		 ac_arch=$ac_word
+	       else
+		 ac_cv_c_bigendian=universal
+		 break
+	       fi
+	       ;;
+	   esac
+	   ac_prev=
+	 elif test "x$ac_word" = "x-arch"; then
+	   ac_prev=arch
+	 fi
+       done
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+	     #include <sys/param.h>
 
 int
 main ()
 {
-#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
- bogus endian macros
-#endif
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
 
   ;
   return 0;
@@ -15570,61 +16429,116 @@
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
   # It does; now see whether it defined to BIG_ENDIAN or not.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+		#include <sys/param.h>
 
 int
 main ()
 {
 #if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
+		 not big endian
+		#endif
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  sdcc_cv_build_bigendian=yes
+  ac_cv_c_bigendian=yes
 else
-  sdcc_cv_build_bigendian=no
+  ac_cv_c_bigendian=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  # It does not; compile a test program.
-if test "$cross_compiling" = yes; then :
-  # try to guess the endianness by grepping values into an object file
-  sdcc_cv_build_bigendian=unknown
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+#include <limits.h>
+
 int
 main ()
 {
- _ascii (); _ebcdic ();
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-  sdcc_cv_build_bigendian=yes
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
 fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-  if test "$sdcc_cv_build_bigendian" = unknown; then
-    sdcc_cv_build_bigendian=no
-  else
-    # finding both strings is unlikely to happen, but who knows?
-    sdcc_cv_build_bigendian=unknown
-  fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then :
+  # Try to guess by grepping values from an object file.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
@@ -15635,44 +16549,47 @@
 main ()
 {
 
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long int l;
-    char c[sizeof (long int)];
-  } u;
-  u.l = 1;
-  return u.c[sizeof (long int) - 1] == 1;
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_run "$LINENO"; then :
-  sdcc_cv_build_bigendian=no
+  ac_cv_c_bigendian=no
 else
-  sdcc_cv_build_bigendian=yes
+  ac_cv_c_bigendian=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
+    fi
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sdcc_cv_build_bigendian" >&5
-$as_echo "$sdcc_cv_build_bigendian" >&6; }
-case $sdcc_cv_build_bigendian in
-  yes)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+;; #(
+   no)
+      ;; #(
+   universal)
 
-$as_echo "#define BUILD_WORDS_BIGENDIAN 1" >>confdefs.h
- ;;
-  no)
-     ;;
-  *)
-    as_fn_error $? "unknown endianness
-presetting sdcc_cv_build_bigendian=no (or yes) will help" "$LINENO" 5 ;;
-esac
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
+     ;; #(
+   *)
+     as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
 
 
 PICOPT=""
@@ -15699,14 +16616,15 @@
 
   # This is the first time when CFLAGS are set/modified!!
 
-  ac_test_CXXFLAGS=${CXXFLAGS+set}
-bor_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -ggdb" >&5
-$as_echo_n "checking whether $CXX accepts -ggdb... " >&6; }
-if ${bor_cv_cxx_ggdb+:} false; then :
+  arg1=`echo -ggdb | sed -e"s/^-*//" -e"s/-/_/"`
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+sdcc_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ accepts -ggdb" >&5
+$as_echo_n "checking whether C++ accepts -ggdb... " >&6; }
+if eval \${sdcc_cv_cxx_$arg1+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  bor_save_cxx_werror_flag=$ac_cxx_werror_flag
+  sdcc_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
 
    CXXFLAGS="-ggdb"
@@ -15722,25 +16640,27 @@
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  bor_cv_cxx_ggdb=yes
+  eval sdcc_cv_cxx_$arg1=yes
 else
-  bor_cv_cxx_ggdb=no
+  eval sdcc_cv_cxx_$arg1=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$bor_save_cxx_werror_flag
+   ac_cxx_werror_flag=$sdcc_save_cxx_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bor_cv_cxx_ggdb" >&5
-$as_echo "$bor_cv_cxx_ggdb" >&6; }
-   CXXFLAGS=$bor_save_CXXFLAGS
+eval ac_res=\$sdcc_cv_cxx_$arg1
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+   CXXFLAGS=$sdcc_save_CXXFLAGS
 
-  ac_test_CXXFLAGS=${CXXFLAGS+set}
-bor_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -gstabs" >&5
-$as_echo_n "checking whether $CXX accepts -gstabs... " >&6; }
-if ${bor_cv_cxx_gstabs+:} false; then :
+  arg1=`echo -gstabs | sed -e"s/^-*//" -e"s/-/_/"`
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+sdcc_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ accepts -gstabs" >&5
+$as_echo_n "checking whether C++ accepts -gstabs... " >&6; }
+if eval \${sdcc_cv_cxx_$arg1+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  bor_save_cxx_werror_flag=$ac_cxx_werror_flag
+  sdcc_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
 
    CXXFLAGS="-gstabs"
@@ -15756,16 +16676,17 @@
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  bor_cv_cxx_gstabs=yes
+  eval sdcc_cv_cxx_$arg1=yes
 else
-  bor_cv_cxx_gstabs=no
+  eval sdcc_cv_cxx_$arg1=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$bor_save_cxx_werror_flag
+   ac_cxx_werror_flag=$sdcc_save_cxx_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bor_cv_cxx_gstabs" >&5
-$as_echo "$bor_cv_cxx_gstabs" >&6; }
-   CXXFLAGS=$bor_save_CXXFLAGS
+eval ac_res=\$sdcc_cv_cxx_$arg1
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+   CXXFLAGS=$sdcc_save_CXXFLAGS
 
   if test "$ucsim_cv_cxx_gstabs" = "yes"; then
     gopt="-gstabs+ -g3"
@@ -15780,14 +16701,15 @@
     CXXFLAGS="$CXXFLAGS $gopt"
   fi
 
-  ac_test_CXXFLAGS=${CXXFLAGS+set}
-bor_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -pipe" >&5
-$as_echo_n "checking whether $CXX accepts -pipe... " >&6; }
-if ${bor_cv_cxx_pipe+:} false; then :
+  arg1=`echo -pipe | sed -e"s/^-*//" -e"s/-/_/"`
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+sdcc_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ accepts -pipe" >&5
+$as_echo_n "checking whether C++ accepts -pipe... " >&6; }
+if eval \${sdcc_cv_cxx_$arg1+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  bor_save_cxx_werror_flag=$ac_cxx_werror_flag
+  sdcc_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
 
    CXXFLAGS="-pipe"
@@ -15803,16 +16725,17 @@
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  bor_cv_cxx_pipe=yes
+  eval sdcc_cv_cxx_$arg1=yes
 else
-  bor_cv_cxx_pipe=no
+  eval sdcc_cv_cxx_$arg1=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$bor_save_cxx_werror_flag
+   ac_cxx_werror_flag=$sdcc_save_cxx_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bor_cv_cxx_pipe" >&5
-$as_echo "$bor_cv_cxx_pipe" >&6; }
-   CXXFLAGS=$bor_save_CXXFLAGS
+eval ac_res=\$sdcc_cv_cxx_$arg1
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+   CXXFLAGS=$sdcc_save_CXXFLAGS
 
   if test "$ucsim_cv_cxx_pipe" = "yes"; then
     CXXFLAGS="$CXXFLAGS -pipe"
@@ -15823,7 +16746,7 @@
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the SunPRO C++ compiler" >&5
 $as_echo_n "checking whether we are using the SunPRO C++ compiler... " >&6; }
-if ${bor_cv_cxx_compiler_sunpro+:} false; then :
+if ${sdcc_cv_cxx_compiler_sunpro+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15841,17 +16764,16 @@
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  bor_compiler_sunpro=yes
+  sdcc_cv_cxx_compiler_sunpro=yes
 else
-  bor_compiler_sunpro=no
+  sdcc_cv_cxx_compiler_sunpro=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-bor_cv_cxx_compiler_sunpro=$bor_compiler_sunpro
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bor_cv_cxx_compiler_sunpro" >&5
-$as_echo "$bor_cv_cxx_compiler_sunpro" >&6; }
-  if test "$bor_cv_cxx_compiler_sunpro" = "yes"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sdcc_cv_cxx_compiler_sunpro" >&5
+$as_echo "$sdcc_cv_cxx_compiler_sunpro" >&6; }
+  if test "$sdcc_cv_cxx_compiler_sunpro" = "yes"; then
     CXXFLAGS="-xO2 $CXXFLAGS"
     MAKEDEP="$CXX -xM1"
     WALL_FLAG=
@@ -16303,6 +17225,7 @@
 
 
 
+
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
@@ -16600,16 +17523,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -16669,28 +17592,16 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -16712,7 +17623,7 @@
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -16778,10 +17689,10 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -16871,7 +17782,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -16904,184 +17815,208 @@
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
-predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
-postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
-predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
-postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
-LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
+predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
+postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
+reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
+reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
 
 LTCC='$LTCC'
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
 # Quote evaled strings.
-for var in SED \
+for var in SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
 GREP \
 EGREP \
 FGREP \
@@ -17094,8 +18029,13 @@
 OBJDUMP \
 deplibs_check_method \
 file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+DLLTOOL \
+sharedlib_from_linklib_cmd \
 AR \
 AR_FLAGS \
+archiver_list_spec \
 STRIP \
 RANLIB \
 CC \
@@ -17105,14 +18045,14 @@
 lt_cv_sys_global_symbol_to_cdecl \
 lt_cv_sys_global_symbol_to_c_name_address \
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-SHELL \
-ECHO \
+nm_file_list_spec \
 lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_wl \
 lt_prog_compiler_pic \
+lt_prog_compiler_wl \
 lt_prog_compiler_static \
 lt_cv_prog_compiler_c_o \
 need_locks \
+MANIFEST_TOOL \
 DSYMUTIL \
 NMEDIT \
 LIPO \
@@ -17126,9 +18066,7 @@
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
-fix_srcfile_path \
 exclude_expsyms \
 include_expsyms \
 file_list_spec \
@@ -17136,6 +18074,7 @@
 libname_spec \
 library_names_spec \
 soname_spec \
+install_override_mode \
 finish_eval \
 old_striplib \
 striplib \
@@ -17146,10 +18085,11 @@
 postdeps \
 compiler_lib_search_path \
 LD_CXX \
+reload_flag_CXX \
 compiler_CXX \
 lt_prog_compiler_no_builtin_flag_CXX \
-lt_prog_compiler_wl_CXX \
 lt_prog_compiler_pic_CXX \
+lt_prog_compiler_wl_CXX \
 lt_prog_compiler_static_CXX \
 lt_cv_prog_compiler_c_o_CXX \
 export_dynamic_flag_spec_CXX \
@@ -17159,9 +18099,7 @@
 allow_undefined_flag_CXX \
 no_undefined_flag_CXX \
 hardcode_libdir_flag_spec_CXX \
-hardcode_libdir_flag_spec_ld_CXX \
 hardcode_libdir_separator_CXX \
-fix_srcfile_path_CXX \
 exclude_expsyms_CXX \
 include_expsyms_CXX \
 file_list_spec_CXX \
@@ -17171,9 +18109,9 @@
 predeps_CXX \
 postdeps_CXX \
 compiler_lib_search_path_CXX; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -17195,11 +18133,13 @@
 module_expsym_cmds \
 export_symbols_cmds \
 prelink_cmds \
+postlink_cmds \
 postinstall_cmds \
 postuninstall_cmds \
 finish_cmds \
 sys_lib_search_path_spec \
 sys_lib_dlsearch_path_spec \
+reload_cmds_CXX \
 old_archive_cmds_CXX \
 old_archive_from_new_cmds_CXX \
 old_archive_from_expsyms_cmds_CXX \
@@ -17208,10 +18148,11 @@
 module_cmds_CXX \
 module_expsym_cmds_CXX \
 export_symbols_cmds_CXX \
-prelink_cmds_CXX; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+prelink_cmds_CXX \
+postlink_cmds_CXX; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -17219,12 +18160,6 @@
     esac
 done
 
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
-  ;;
-esac
-
 ac_aux_dir='$ac_aux_dir'
 xsi_shell='$xsi_shell'
 lt_shell_append='$lt_shell_append'
@@ -17256,7 +18191,6 @@
 do
   case $ac_config_target in
     "ddconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS ddconfig.h:ddconfig_in.h" ;;
-    "custom.h") CONFIG_HEADERS="$CONFIG_HEADERS custom.h:custom_in.h" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "main.mk") CONFIG_FILES="$CONFIG_FILES main.mk:main_in.mk" ;;
@@ -17847,7 +18781,8 @@
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -17895,6 +18830,15 @@
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
 
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -17944,9 +18888,11 @@
 # turn newlines into spaces.
 NL2SP=$lt_lt_NL2SP
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
 # An object symbol dumper.
 OBJDUMP=$lt_OBJDUMP
@@ -17954,13 +18900,30 @@
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
 
-# Command to use when deplibs_check_method == "file_magic".
+# Command to use when deplibs_check_method = "file_magic".
 file_magic_cmd=$lt_file_magic_cmd
 
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
 # The archiver.
 AR=$lt_AR
+
+# Flags to create an archive.
 AR_FLAGS=$lt_AR_FLAGS
 
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
 # A symbol stripping program.
 STRIP=$lt_STRIP
 
@@ -17969,6 +18932,9 @@
 old_postinstall_cmds=$lt_old_postinstall_cmds
 old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
 # A C compiler.
 LTCC=$lt_CC
 
@@ -17987,14 +18953,14 @@
 # Transform the output of nm in a C name address pair when lib prefix is needed.
 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
 
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
+# The root where to search for dependent libraries,and in which our libraries should be installed.
+lt_sysroot=$lt_sysroot
 
-# An echo program that does not interpret backslashes.
-ECHO=$lt_ECHO
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
 
 # Used to examine libraries when file_magic_cmd begins with "file".
 MAGIC_CMD=$MAGIC_CMD
@@ -18002,6 +18968,9 @@
 # Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
 DSYMUTIL=$lt_DSYMUTIL
 
@@ -18058,6 +19027,9 @@
 # The coded name of the library, if different from the real name.
 soname_spec=$lt_soname_spec
 
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
 # Command to use after installation of a shared archive.
 postinstall_cmds=$lt_postinstall_cmds
 
@@ -18097,6 +19069,10 @@
 # The linker used to build libraries.
 LD=$lt_LD
 
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds
 
@@ -18109,12 +19085,12 @@
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
 
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
 # Additional compiler flags for building library objects.
 pic_flag=$lt_lt_prog_compiler_pic
 
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static
 
@@ -18164,10 +19140,6 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
@@ -18201,9 +19173,6 @@
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
 # Set to "yes" if exported symbols are required.
 always_export_symbols=$always_export_symbols
 
@@ -18219,6 +19188,9 @@
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds
 
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec
 
@@ -18265,212 +19237,169 @@
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $* ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[^=]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$@"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1+=\$2"
-}
-_LT_EOF
-    ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1=\$$1\$2"
-}
-
-_LT_EOF
-    ;;
-  esac
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
 
+  if test x"$xsi_shell" = xyes; then
+  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
+func_dirname ()\
+{\
+\    case ${1} in\
+\      */*) func_dirname_result="${1%/*}${2}" ;;\
+\      *  ) func_dirname_result="${3}" ;;\
+\    esac\
+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_basename ()$/,/^} # func_basename /c\
+func_basename ()\
+{\
+\    func_basename_result="${1##*/}"\
+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
+func_dirname_and_basename ()\
+{\
+\    case ${1} in\
+\      */*) func_dirname_result="${1%/*}${2}" ;;\
+\      *  ) func_dirname_result="${3}" ;;\
+\    esac\
+\    func_basename_result="${1##*/}"\
+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
+func_stripname ()\
+{\
+\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
+\    # positional parameters, so assign one to ordinary parameter first.\
+\    func_stripname_result=${3}\
+\    func_stripname_result=${func_stripname_result#"${1}"}\
+\    func_stripname_result=${func_stripname_result%"${2}"}\
+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
+func_split_long_opt ()\
+{\
+\    func_split_long_opt_name=${1%%=*}\
+\    func_split_long_opt_arg=${1#*=}\
+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
+func_split_short_opt ()\
+{\
+\    func_split_short_opt_arg=${1#??}\
+\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
+func_lo2o ()\
+{\
+\    case ${1} in\
+\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
+\      *)    func_lo2o_result=${1} ;;\
+\    esac\
+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_xform ()$/,/^} # func_xform /c\
+func_xform ()\
+{\
+    func_xform_result=${1%.*}.lo\
+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_arith ()$/,/^} # func_arith /c\
+func_arith ()\
+{\
+    func_arith_result=$(( $* ))\
+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_len ()$/,/^} # func_len /c\
+func_len ()\
+{\
+    func_len_result=${#1}\
+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+fi
+
+if test x"$lt_shell_append" = xyes; then
+  sed -e '/^func_append ()$/,/^} # func_append /c\
+func_append ()\
+{\
+    eval "${1}+=\\${2}"\
+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
+func_append_quoted ()\
+{\
+\    func_quote_for_eval "${2}"\
+\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
+fi
 
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
 
-  mv -f "$cfgfile" "$ofile" ||
+   mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 
@@ -18482,6 +19411,10 @@
 # The linker used to build libraries.
 LD=$lt_LD_CXX
 
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag_CXX
+reload_cmds=$lt_reload_cmds_CXX
+
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds_CXX
 
@@ -18494,12 +19427,12 @@
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
 
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
 # Additional compiler flags for building library objects.
 pic_flag=$lt_lt_prog_compiler_pic_CXX
 
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static_CXX
 
@@ -18549,10 +19482,6 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
 
@@ -18586,9 +19515,6 @@
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs_CXX
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path_CXX
-
 # Set to "yes" if exported symbols are required.
 always_export_symbols=$always_export_symbols_CXX
 
@@ -18604,6 +19530,9 @@
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds_CXX
 
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds_CXX
+
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec_CXX
 
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/configure.in sdcc-3.2.0+dfsg/sim/ucsim/configure.in
--- sdcc-3.1.0+dfsg/sim/ucsim/configure.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/configure.in	2012-03-30 10:48:18.000000000 +0000
@@ -3,7 +3,7 @@
 AC_PREREQ(2.60)
 AC_INIT
 AC_CONFIG_SRCDIR(.version)
-AC_CONFIG_HEADER(ddconfig.h:ddconfig_in.h custom.h:custom_in.h)
+AC_CONFIG_HEADER(ddconfig.h:ddconfig_in.h)
 
 AC_PROG_AWK
 
@@ -375,36 +375,36 @@
 
 # Check whether the compiler for the current language is SunPRO.
 
-AC_DEFUN([bor_IS_SUNPRO],
+AC_DEFUN([sdcc_IS_SUNPRO],
 [AC_CACHE_CHECK([whether we are using the SunPRO _AC_LANG compiler],
-  [bor_cv_[]_AC_LANG_ABBREV[]_compiler_sunpro],
+  [sdcc_cv_[]_AC_LANG_ABBREV[]_compiler_sunpro],
   [_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[#if !defined __SUNPRO_C && !defined __SUNPRO_CC
        choke me
 #endif
 ]])],
-    [bor_compiler_sunpro=yes],
-    [bor_compiler_sunpro=no])
-bor_cv_[]_AC_LANG_ABBREV[]_compiler_sunpro=$bor_compiler_sunpro
+    [sdcc_cv_[]_AC_LANG_ABBREV[]_compiler_sunpro=yes],
+    [sdcc_cv_[]_AC_LANG_ABBREV[]_compiler_sunpro=no])
 ])])
 
-# bor_IS_VALID_OPTION macro checks if the current compiler, selected by 
+# sdcc_IS_VALID_OPTION macro checks if the current compiler, selected by 
 # AC_LANG, supports option specified as the 1st parameter. The test fails if
 # the compiler returns an error or in case something is writeen to stderr.
-# For example: bor_VALID_OPT(fPIC)
+# For example: sdcc_VALID_OPT(-fPIC)
 
-AC_DEFUN([bor_IS_VALID_OPTION],
-[ac_test_[]_AC_LANG_PREFIX[]FLAGS=${[]_AC_LANG_PREFIX[]FLAGS+set}
-bor_save_[]_AC_LANG_PREFIX[]FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
-AC_CACHE_CHECK(whether $_AC_LANG_PREFIX accepts -$1, bor_cv_[]_AC_LANG_ABBREV[]_$1,
-  [bor_save_[]_AC_LANG_ABBREV[]_werror_flag=$ac_[]_AC_LANG_ABBREV[]_werror_flag
+AC_DEFUN([sdcc_IS_VALID_OPTION],
+[arg1=`echo $1 | sed -e"s/^-*//" -e"s/-/_/"`
+ac_test_[]_AC_LANG_PREFIX[]FLAGS=${[]_AC_LANG_PREFIX[]FLAGS+set}
+sdcc_save_[]_AC_LANG_PREFIX[]FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
+AC_CACHE_CHECK(whether _AC_LANG accepts $1, sdcc_cv_[]_AC_LANG_ABBREV[]_$arg1,
+  [sdcc_save_[]_AC_LANG_ABBREV[]_werror_flag=$ac_[]_AC_LANG_ABBREV[]_werror_flag
    ac_[]_AC_LANG_ABBREV[]_werror_flag=yes
    
-   []_AC_LANG_PREFIX[]FLAGS="-$1"
+   []_AC_LANG_PREFIX[]FLAGS="$1"
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
-     [bor_cv_[]_AC_LANG_ABBREV[]_$1=yes],
-     [bor_cv_[]_AC_LANG_ABBREV[]_$1=no])
-   ac_[]_AC_LANG_ABBREV[]_werror_flag=$bor_save_[]_AC_LANG_ABBREV[]_werror_flag])
-   []_AC_LANG_PREFIX[]FLAGS=$bor_save_[]_AC_LANG_PREFIX[]FLAGS
+     [eval sdcc_cv_[]_AC_LANG_ABBREV[]_$arg1=yes],
+     [eval sdcc_cv_[]_AC_LANG_ABBREV[]_$arg1=no])
+   ac_[]_AC_LANG_ABBREV[]_werror_flag=$sdcc_save_[]_AC_LANG_ABBREV[]_werror_flag])
+   []_AC_LANG_PREFIX[]FLAGS=$sdcc_save_[]_AC_LANG_PREFIX[]FLAGS
 ])
 
 # Checking characteristics of compilers and other programs
@@ -421,77 +421,9 @@
   ac_cv_sizeof_long_long=4
 fi
 
-# SDCC_BUILD_BIGENDIAN ([ACTION-IF-TRUE], [ACTION-IF-FALSE], [ACTION-IF-UNKNOWN])
-# -------------------------------------------------------------------------
-AC_DEFUN([SDCC_BUILD_BIGENDIAN],
-[AC_CACHE_CHECK(whether host machine byte ordering is bigendian, sdcc_cv_build_bigendian,
-[# See if sys/param.h defines the BYTE_ORDER macro.
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>
-#include <sys/param.h>
-],
-[#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
- bogus endian macros
-#endif
-])],
-[# It does; now see whether it defined to BIG_ENDIAN or not.
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>
-#include <sys/param.h>
-], [#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
-])], [sdcc_cv_build_bigendian=yes], [sdcc_cv_build_bigendian=no])],
-[# It does not; compile a test program.
-AC_RUN_IFELSE(
-[AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT], [[
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long int l;
-    char c[sizeof (long int)];
-  } u;
-  u.l = 1;
-  return u.c[sizeof (long int) - 1] == 1;
-]])],
-	      [sdcc_cv_build_bigendian=no],
-	      [sdcc_cv_build_bigendian=yes],
-[# try to guess the endianness by grepping values into an object file
-  sdcc_cv_build_bigendian=unknown
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-[[short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }]],
-[[ _ascii (); _ebcdic (); ]])],
-[if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-  sdcc_cv_build_bigendian=yes
-fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-  if test "$sdcc_cv_build_bigendian" = unknown; then
-    sdcc_cv_build_bigendian=no
-  else
-    # finding both strings is unlikely to happen, but who knows?
-    sdcc_cv_build_bigendian=unknown
-  fi
-fi])])])])
-case $sdcc_cv_build_bigendian in
-  yes)
-    m4_default([$1],
-      [AC_DEFINE([BUILD_WORDS_BIGENDIAN], 1,
-	[Define to 1 if your processor stores words with the most significant
-	 byte first (like Motorola and SPARC, unlike Intel and VAX).])]) ;;
-  no)
-    $2 ;;
-  *)
-    m4_default([$3],
-      [AC_MSG_ERROR([unknown endianness
-presetting sdcc_cv_build_bigendian=no (or yes) will help])]) ;;
-esac
-])# SDCC_BUILD_BIGENDIAN
-
-SDCC_BUILD_BIGENDIAN
+# Checking whether byte ordering is bigendian
+# --------------------------------------------------------
+AC_C_BIGENDIAN
 
 PICOPT=""
 SHAREDLIB="no"
@@ -510,8 +442,8 @@
 
   # This is the first time when CFLAGS are set/modified!!
 
-  bor_IS_VALID_OPTION(ggdb)
-  bor_IS_VALID_OPTION(gstabs)
+  sdcc_IS_VALID_OPTION(-ggdb)
+  sdcc_IS_VALID_OPTION(-gstabs)
   if test "$ucsim_cv_cxx_gstabs" = "yes"; then
     gopt="-gstabs+ -g3"
   elif test "$ucsim_cv_cxx_ggdb" = "yes"; then
@@ -525,7 +457,7 @@
     CXXFLAGS="$CXXFLAGS $gopt"
   fi
 
-  bor_IS_VALID_OPTION(pipe)
+  sdcc_IS_VALID_OPTION(-pipe)
   if test "$ucsim_cv_cxx_pipe" = "yes"; then
     CXXFLAGS="$CXXFLAGS -pipe"
   fi
@@ -533,8 +465,8 @@
   MAKEDEP="$CXX $ucsim_cv_MM"
   WALL_FLAG="-Wall"
 else
-  bor_IS_SUNPRO
-  if test "$bor_cv_cxx_compiler_sunpro" = "yes"; then
+  sdcc_IS_SUNPRO
+  if test "$sdcc_cv_cxx_compiler_sunpro" = "yes"; then
     CXXFLAGS="-xO2 $CXXFLAGS"
     MAKEDEP="$CXX -xM1"
     WALL_FLAG=
@@ -624,7 +556,10 @@
 
 AH_TOP([#ifndef DDCONFIG_HEADER
 #define DDCONFIG_HEADER])
-AH_BOTTOM([#include "custom.h"
+AH_BOTTOM([/* ucsim custom defines */
+#define DD_TRUE     1
+#define DD_FALSE    0
+#define NIL         0
 #endif /* DDCONFIG_HEADER */])
 
 if echo $TYPE_DWORD|grep short >/dev/null; then
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/custom_in.h sdcc-3.2.0+dfsg/sim/ucsim/custom_in.h
--- sdcc-3.1.0+dfsg/sim/ucsim/custom_in.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/custom_in.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-/*
- * Simulator of microcontrollers (custom.h)
- *
- * This file contains manual additions to #include into ddconfig.h
- *
- * Copyright (C) 1999,99 Drotos Daniel, Talker Bt.
- *
- * To contact author send email to drdani@mazsola.iit.uni-miskolc.hu
- *
- */
-
-/* This file is part of microcontroller simulator: ucsim.
-
-UCSIM is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-UCSIM 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 UCSIM; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA. */
-/*@1@*/
-
-#define DD_TRUE     1
-#define DD_FALSE    0
-#define NIL         0
-
-/*
- * find out the endianess of host machine
- */
-#if defined __APPLE__ && (defined __BIG_ENDIAN__ || defined _BIG_ENDIAN)
-/* 1) trust the compiler
- * in order to be able to make Mac OS X unified binaries */
-# define WORDS_BIGENDIAN 1
-#elif defined __APPLE__ && (defined __LITTLE_ENDIAN__ || defined _LITTLE_ENDIAN)
-/* do nothing */
-#elif defined __sun && defined HAVE_SYS_ISA_DEFS_H
-/* Solaris defines endianness in <sys/isa_defs.h> */
-# include <sys/isa_defs.h>
-# ifdef _BIG_ENDIAN
-#   define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifdef HAVE_ENDIAN_H
-#   include <endian.h>
-# elif defined HAVE_SYS_ENDIAN_H
-#   include <sys/endian.h>
-# elif defined HAVE_MACHINE_ENDIAN_H
-#   include <machine/endian.h>
-# endif
-# if (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
-/* 2) trust the header files */
-#   if BYTE_ORDER == BIG_ENDIAN
-#     define WORDS_BIGENDIAN 1
-#   endif
-# else
-/* 3) trust the configure; this actually doesn't work for unified Mac OS X binaries :-( */
-#   if (defined BUILD_WORDS_BIGENDIAN && BUILD_WORDS_BIGENDIAN)
-#     define WORDS_BIGENDIAN  1
-#   endif
-/* 4) assume that host is a little endian machine */
-# endif
-#endif
-
-/* End of custom.h */
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/ddconfig_in.h sdcc-3.2.0+dfsg/sim/ucsim/ddconfig_in.h
--- sdcc-3.1.0+dfsg/sim/ucsim/ddconfig_in.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/ddconfig_in.h	2012-03-28 12:38:08.000000000 +0000
@@ -6,9 +6,8 @@
 /* Define to be the type of length parameter of accept (without the \*'). */
 #undef ACCEPT_SOCKLEN_T
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef BUILD_WORDS_BIGENDIAN
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
 
 /* XXX */
 #undef FD_HEADER_OK
@@ -254,6 +253,18 @@
 /* XXX */
 #undef VERSIONSTR
 
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
+
 /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
    `char[]'. */
 #undef YYTEXT_POINTER
@@ -264,5 +275,8 @@
 /* XXX */
 #undef _M_
 
-#include "custom.h"
+/* ucsim custom defines */
+#define DD_TRUE     1
+#define DD_FALSE    0
+#define NIL         0
 #endif /* DDCONFIG_HEADER */
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/globals.cc sdcc-3.2.0+dfsg/sim/ucsim/globals.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/globals.cc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/globals.cc	2012-05-15 03:59:44.000000000 +0000
@@ -409,9 +409,11 @@
 
 struct cpu_entry cpus_z80[]=
 {
-  {"Z80"   , CPU_Z80, 0},
-  {"Z180"  , CPU_Z180,0},
-  {"R2K"   , CPU_R2K, 0},
+  {"Z80"    , CPU_Z80,     0},
+  {"Z180"   , CPU_Z180,    0},
+  {"R2K"    , CPU_R2K,     0},
+  {"R3KA"   , CPU_R3KA,    0},
+  {"LR35902", CPU_LR35902, 0},
   {NULL, 0, 0}
 };
 
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/hc08.src/hc08.cc sdcc-3.2.0+dfsg/sim/ucsim/hc08.src/hc08.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/hc08.src/hc08.cc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/hc08.src/hc08.cc	2012-05-19 12:33:25.000000000 +0000
@@ -489,7 +489,8 @@
         case 0x2:
         case 0x3: return(inst_condbranch(code, false));
         case 0x4:
-        case 0x5:
+        case 0x5: return(inst_transfer(code, false));
+        case 0x6: return(inst_sthx(code, false));
         case 0x7:
         case 0xf: return(inst_transfer(code, false));
         case 0x8:
@@ -500,6 +501,7 @@
         case 0xd: return(inst_nop(code, false));
         case 0xe:
           code = fetch();
+          tick(1);
           switch ((code >> 4) & 0xf) {
             case 0x6:
               switch (code & 0xf) {
@@ -519,18 +521,18 @@
                 default: return(resHALT);
               }
             case 0xa:
-              switch (code & 0x5) {
-                case 0xe: return(inst_ldhx(code,true));
+              switch (code) {
+                case 0xae: return(inst_ldhx(code,true));
                 default: return(resHALT);
               }
             case 0xb:
-              switch (code & 0x5) {
-                case 0xe: return(inst_ldhx(code,true));
+              switch (code) {
+                case 0xbe: return(inst_ldhx(code,true));
                 default: return(resHALT);
               }
             case 0xc:
-              switch (code & 0x5) {
-                case 0xe: return(inst_ldhx(code,true));
+              switch (code) {
+                case 0xce: return(inst_ldhx(code,true));
                 default: return(resHALT);
               }
             case 0xd:
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/hc08.src/inst.cc sdcc-3.2.0+dfsg/sim/ucsim/hc08.src/inst.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/hc08.src/inst.cc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/hc08.src/inst.cc	2012-05-15 09:51:32.000000000 +0000
@@ -52,6 +52,7 @@
   int result;
   result = fetch() << 8;
   result |= fetch();
+  tick(2);
   return result;
 }
 
@@ -63,12 +64,15 @@
     case 0x1:
     case 0x3:
     case 0xb:
+      tick(1);
       return fetch(); // Direct
     case 0x7:
     case 0xf:
+      tick(1); // extra cycle needed, even without fetch
       return (regs.H << 8) | regs.X;  // IX
     case 0x6:
     case 0xe:
+      tick(1);
       if (!prefix)
         return ((unsigned char)fetch())+((regs.H << 8) | regs.X); // IX1
       else
@@ -171,6 +175,7 @@
 cl_hc08::inst_lda(t_mem code, bool prefix)
 {
   regs.A = OPERAND(code, prefix);
+  tick(1);
   FLAG_CLEAR(BIT_V);
   FLAG_NZ(regs.A);
   return(resGO);
@@ -180,6 +185,7 @@
 cl_hc08::inst_ldx(t_mem code, bool prefix)
 {
   regs.X = OPERAND(code, prefix);
+  tick(1);
   FLAG_CLEAR(BIT_V);
   FLAG_NZ(regs.X);
   return(resGO);
@@ -190,11 +196,10 @@
 {
   int ea = fetchea(code, prefix);
 
-  //fprintf (stdout, "ea = 0x%04x\n", ea);
-    
   FLAG_CLEAR(BIT_V);
   FLAG_NZ(regs.A);
   store1(ea, regs.A);
+  tick(1);
   return(resGO);
 }
 
@@ -206,6 +211,7 @@
   FLAG_CLEAR(BIT_V);
   FLAG_NZ(regs.X);
   store1(ea, regs.X);
+  tick(1);
   return(resGO);
 }
 
@@ -216,12 +222,13 @@
 
   operand1 = regs.A;
   operand2 = OPERAND(code, prefix);
+  tick(1);
   result = operand1 + operand2;
   FLAG_NZ (result);
   FLAG_ASSIGN (BIT_V, 0x80 & (operand1 ^ operand2 ^ result ^ (result >>1)));
   FLAG_ASSIGN (BIT_C, 0x100 & result);
   FLAG_ASSIGN (BIT_H, 0x10 & (operand1 ^ operand2 ^ result));
-  
+
   regs.A = result & 0xff;
   return(resGO);
 }
@@ -234,6 +241,7 @@
 
   operand1 = regs.A;
   operand2 = OPERAND(code, prefix);
+  tick(1);
   result = operand1 + operand2 + carryin;
   FLAG_NZ (result);
   FLAG_ASSIGN (BIT_V, 0x80 & (operand1 ^ operand2 ^ result ^ (result >>1)));
@@ -251,6 +259,7 @@
 
   operand1 = regs.A;
   operand2 = OPERAND(code, prefix);
+  tick(1);
   result = operand1 - operand2;
   FLAG_NZ (result);
   FLAG_ASSIGN (BIT_V, 0x80 & (operand1 ^ operand2 ^ result ^ (result >>1)));
@@ -268,6 +277,7 @@
 
   operand1 = regs.A;
   operand2 = OPERAND(code, prefix);
+  tick(1);
   result = operand1 - operand2 - carryin;
   FLAG_NZ (result);
   FLAG_ASSIGN (BIT_V, 0x80 & (operand1 ^ operand2 ^ result ^ (result >>1)));
@@ -284,6 +294,7 @@
 
   operand1 = regs.A;
   operand2 = OPERAND(code, prefix);
+  tick(1);
   result = operand1 - operand2;
   FLAG_NZ (result);
   FLAG_ASSIGN (BIT_V, 0x80 & (operand1 ^ operand2 ^ result ^ (result >>1)));
@@ -299,6 +310,7 @@
 
   operand1 = regs.X;
   operand2 = OPERAND(code, prefix);
+  tick(1);
   result = operand1 - operand2;
   FLAG_NZ (result);
   FLAG_ASSIGN (BIT_V, 0x80 & (operand1 ^ operand2 ^ result ^ (result >>1)));
@@ -311,7 +323,7 @@
 cl_hc08::inst_jmp(t_mem code, bool prefix)
 {
   PC = fetchea(code, prefix);
-
+  tick(1); // extra cycle to reload pipeline
   return(resGO);
 }
 
@@ -319,9 +331,11 @@
 cl_hc08::inst_jsr(t_mem code, bool prefix)
 {
   int newPC = fetchea(code, prefix);
-  
+
   push2(PC);
+  tick(2);
   PC = newPC;
+  tick(1); // extra cycle to reload pipeline
 
   return(resGO);
 }
@@ -330,9 +344,11 @@
 cl_hc08::inst_bsr(t_mem code, bool prefix)
 {
   signed char ofs = fetch();
-  
+
   push2(PC);
+  tick(2);
   PC += ofs;
+  tick(1); // extra cycle to reload pipeline
 
   return(resGO);
 }
@@ -349,6 +365,7 @@
 {
   int hx = (regs.H << 8) | (regs.X);
   hx += (signed char)fetch();
+  tick(1);
   regs.H = (hx >> 8) & 0xff;
   regs.X = hx & 0xff;
   return(resGO);
@@ -358,6 +375,7 @@
 cl_hc08::inst_and(t_mem code, bool prefix)
 {
   regs.A = regs.A & OPERAND(code, prefix);
+  tick(1);
   FLAG_CLEAR(BIT_V);
   FLAG_NZ(regs.A);
   return(resGO);
@@ -367,6 +385,7 @@
 cl_hc08::inst_bit(t_mem code, bool prefix)
 {
   uchar operand = regs.A & OPERAND(code, prefix);
+  tick(1);
   FLAG_CLEAR(BIT_V);
   FLAG_NZ(operand);
   return(resGO);
@@ -376,6 +395,7 @@
 cl_hc08::inst_ora(t_mem code, bool prefix)
 {
   regs.A = regs.A | OPERAND(code, prefix);
+  tick(1);
   FLAG_CLEAR(BIT_V);
   FLAG_NZ(regs.A);
   return(resGO);
@@ -385,6 +405,7 @@
 cl_hc08::inst_eor(t_mem code, bool prefix)
 {
   regs.A = regs.A ^ OPERAND(code, prefix);
+  tick(1);
   FLAG_CLEAR(BIT_V);
   FLAG_NZ(regs.A);
   return(resGO);
@@ -403,6 +424,7 @@
   else {
     ea = fetchea(code,prefix);
     operand = get1(ea);
+    tick(1);
   }
 
   FLAG_ASSIGN (BIT_C, operand & 1);
@@ -416,6 +438,9 @@
     regs.X = operand;
   else {
     store1(ea, operand);
+    tick(1);
+    if ((code & 0x70) != 0x70)
+      tick(1);
   }
 
   return(resGO);
@@ -435,6 +460,7 @@
   else {
     ea = fetchea(code,prefix);
     operand = get1(ea);
+    tick(1);
   }
 
   FLAG_ASSIGN (BIT_C, operand & 1);
@@ -448,6 +474,9 @@
     regs.X = operand;
   else {
     store1(ea, operand);
+    tick(1);
+    if ((code & 0x70) != 0x70)
+      tick(1);
   }
   return(resGO);
 }
@@ -466,6 +495,7 @@
   else {
     ea = fetchea(code,prefix);
     operand = get1(ea);
+    tick(1);
   }
 
   FLAG_ASSIGN (BIT_C, operand & 0x80);
@@ -479,6 +509,9 @@
     regs.X = operand;
   else {
     store1(ea, operand);
+    tick(1);
+    if ((code & 0x70) != 0x70)
+      tick(1);
   }
   return(resGO);
 }
@@ -498,6 +531,7 @@
   else {
     ea = fetchea(code,prefix);
     operand = get1(ea);
+    tick(1);
   }
 
   FLAG_ASSIGN (BIT_C, operand & 0x80);
@@ -511,6 +545,9 @@
     regs.X = operand;
   else {
     store1(ea, operand);
+    tick(1);
+    if ((code & 0x70) != 0x70)
+      tick(1);
   }
   return(resGO);
 }
@@ -530,6 +567,7 @@
   else {
     ea = fetchea(code,prefix);
     operand = get1(ea);
+    tick(1);
   }
 
   FLAG_ASSIGN (BIT_C, operand & 1);
@@ -543,6 +581,9 @@
     regs.X = operand;
   else {
     store1(ea, operand);
+    tick(1);
+    if ((code & 0x70) != 0x70)
+      tick(1);
   }
   return(resGO);
 }
@@ -561,6 +602,7 @@
   else {
     ea = fetchea(code,prefix);
     operand = get1(ea);
+    tick(1);
   }
 
   operand++;
@@ -573,6 +615,9 @@
     regs.X = operand;
   else {
     store1(ea, operand);
+    tick(1);
+    if ((code & 0x70) != 0x70)
+      tick(1);
   }
   return(resGO);
 }
@@ -591,6 +636,7 @@
   else {
     ea = fetchea(code,prefix);
     operand = get1(ea);
+    tick(1);
   }
 
   operand--;
@@ -603,6 +649,9 @@
     regs.X = operand;
   else {
     store1(ea, operand);
+    tick(1);
+    if ((code & 0x70) != 0x70)
+      tick(1);
   }
   return(resGO);
 }
@@ -621,6 +670,7 @@
   else {
     ea = fetchea(code,prefix);
     operand = get1(ea);
+    tick(1);
   }
 
   operand--;
@@ -633,11 +683,16 @@
     regs.X = operand;
   else {
     store1(ea, operand);
+    tick(1);
+    if ((code & 0x70) != 0x70)
+      tick(1);
   }
 
   ofs = fetch();
+  tick(1);
   if (operand)
     PC += ofs;
+  tick(1); // extra cycle to reload pipeline
 
   return(resGO);
 }
@@ -648,7 +703,7 @@
 {
   int ea = 0xffff;
   uchar operand;
-  
+
   if ((code & 0xf0) == 0x40)
     operand = regs.A;
   else if ((code & 0xf0) == 0x50)
@@ -656,10 +711,13 @@
   else {
     ea = fetchea(code,prefix);
     operand = get1(ea);
+    tick(1);
   }
 
   FLAG_NZ (operand);
   FLAG_CLEAR (BIT_V);
+  if ((code & 0xf0) == 0x30 || (code & 0xf0) == 0x60)
+    tick(1);
 
   return(resGO);
 }
@@ -670,7 +728,18 @@
 {
   int ea = 0xffff;
   uchar operand;
-  
+
+  // clr uses read-modify-write cycles, so simulate the read even if the data isn't used
+  if ((code & 0xf0) == 0x40)
+    operand = regs.A;
+  else if ((code & 0xf0) == 0x50)
+    operand = regs.X;
+  else {
+    ea = fetchea(code,prefix);
+    operand = get1(ea);
+    tick(1);
+  }
+
   operand = 0;
   FLAG_CLEAR (BIT_V);
   FLAG_CLEAR (BIT_N);
@@ -681,8 +750,9 @@
   else if ((code & 0xf0) == 0x50)
     regs.X = operand;
   else {
-    ea = fetchea(code,prefix);
     store1(ea, operand);
+    if ((code & 0x70) != 0x70)
+      tick(1);
   }
   return(resGO);
 }
@@ -712,6 +782,7 @@
   else {
     ea = fetchea(code,prefix);
     operand = get1(ea);
+    tick(1);
   }
 
   operand = ~operand;
@@ -725,6 +796,8 @@
     regs.X = operand;
   else {
     store1(ea, operand);
+    if ((code & 0x70) != 0x70)
+      tick(1);
   }
   return(resGO);
 }
@@ -743,6 +816,7 @@
   else {
     ea = fetchea(code,prefix);
     operand = get1(ea);
+    tick(1);
   }
 
   FLAG_ASSIGN (BIT_V, operand==0x80);
@@ -756,6 +830,8 @@
     regs.X = operand;
   else {
     store1(ea, operand);
+    if ((code & 0x70) != 0x70)
+      tick(1);
   }
   return(resGO);
 }
@@ -768,21 +844,27 @@
   switch (code) {
     case 0x86:
       pop1(regs.A);
+      tick(2);
       break;
     case 0x87:
       push1(regs.A);
+      tick(1);
       break;
     case 0x88:
       pop1(regs.X);
+      tick(2);
       break;
     case 0x89:
       push1(regs.X);
+      tick(1);
       break;
     case 0x8a:
       pop1(regs.H);
+      tick(2);
       break;
     case 0x8b:
       push1(regs.H);
+      tick(1);
       break;
     default:
       return(resHALT);
@@ -844,6 +926,7 @@
   regs.X = (result >> 8) & 0xff;
   FLAG_CLEAR (BIT_C);
   FLAG_CLEAR (BIT_H);
+  tick(4);
   return(resGO);
 }
 
@@ -865,6 +948,7 @@
       FLAG_SET (BIT_C);  // overflow
   } else
     FLAG_SET (BIT_C);    // division by zero
+  tick(5);
 
   return(resGO);
 }
@@ -927,8 +1011,10 @@
     taken = ! taken;
   
   ofs = fetch();
+  tick(1);
   if (taken)
     PC += ofs;
+  tick(1); // extra cycle to reload pipeline
 
   return(resGO);
 }
@@ -939,12 +1025,15 @@
   uchar bit = (code >> 1) & 7;
   int ea = fetchea(code, prefix);
   uchar operand = get1(ea);
+  tick(1);
 
   if (code & 1)
     operand &= ~(1 << bit);
   else
     operand |= (1 << bit);
+  tick(1);
   store1(ea, operand);
+  tick(1);
   return(resGO);
 }
 
@@ -956,15 +1045,18 @@
   uchar operand = get1(ea);
   signed char ofs;
   bool taken;
-  
+
+  tick(1);
   if (code & 1)
-    taken = operand & (1 << bit);
+    taken = !(operand & (1 << bit));  // brclr
   else
-    taken = !(operand & (1 << bit));
+    taken = (operand & (1 << bit));   // brset
 
   ofs = fetch();
+  tick(1);
   if (taken)
     PC += ofs;
+  tick(1); // extra cycle to reload pipeline
 
   FLAG_ASSIGN (BIT_C, operand & (1 << bit));
   return(resGO);
@@ -980,24 +1072,29 @@
   if ((code & 0xf0) == 0x40) {
     operand1 = regs.A;
     operand2 = fetch();
+    tick(1);
   }
   else if ((code & 0xf0) == 0x50) {
     operand1 = regs.X;
     operand2 = fetch();
+    tick(1);
   }
   else {
     ea = fetchea(code,prefix);
     operand1 = get1(ea);
+    tick(1);
     operand2 = regs.A;
   }
 
   ofs = fetch();
+  tick(1);
   if (operand1==operand2)
     PC += ofs;  
 
-  if (code==0x71)
+  if (code == 0x71 || code == 0x61)
     incx();
-    
+  tick(1); // extra cycle to reload pipeline
+
   return(resGO);
 }
 
@@ -1005,11 +1102,16 @@
 cl_hc08::inst_rti(t_mem code, bool prefix)
 {
   pop1(regs.P);
+  tick(1);
   regs.P |= 0x60;
   pop1(regs.A);
+  tick(1);
   pop1(regs.X);
+  tick(1);
   pop2(PC);
-  
+  tick(2);
+  tick(3); // pipeline reload and some extra overhead?
+
   return(resGO);
 }
 
@@ -1017,7 +1119,9 @@
 cl_hc08::inst_rts(t_mem code, bool prefix)
 {
   pop2(PC);
-  
+  tick(2);
+  tick(3); // pipeline reload and some extra overhead?
+
   return(resGO);
 }
 
@@ -1033,35 +1137,45 @@
   switch (code) {
     case 0x4e:	//mov opr8a,opr8a
       operand = get1(fetch());
+      tick(2);
       ea = fetch();
+      tick(1);
       aix = 0;
       break;
     case 0x5e:	//mov opr8a,x+
       operand = get1(fetch());
+      tick(2);
+      tick(1);
       ea = hx;
       aix = 1;
       break;
     case 0x6e:	//mov #opr8i,opr8a
       operand = fetch();
+      tick(1);
       ea = fetch();
+      tick(1);
       aix = 0;
       break;
     case 0x7e:	//mov x+,opr8a
       operand = get1(hx);
+      tick(1);
       ea = fetch();
+      tick(1);
+      tick(1);
       aix = 1;
       break;
     default:
       return(resHALT);
   }
-  
+
   store1(ea, operand);
+  tick(1);
   if (aix)
     incx();
 
   FLAG_NZ(operand);
   FLAG_CLEAR(BIT_V);
-    
+
   return(resGO);
 }
 
@@ -1073,20 +1187,25 @@
   
   if (code == 0x35) {
     ea = fetch();
+    tick(1);
   }
   else if ((code == 0x96) && (type == CPU_HCS08))
   {
     ea = fetch2();
+    tick(2);
   }
   else if (prefix && (code == 0xff) && (type == CPU_HCS08))
   {
     ea = regs.SP + fetch();
+    tick(1);
   }
   else
     return(resHALT);
   
   store1(ea, regs.H);
+  tick(1);
   store1((ea+1) & 0xffff, regs.X);
+  tick(1);
 
   FLAG_CLEAR(BIT_V);
   FLAG_ASSIGN(BIT_N, regs.H & 0x80);
@@ -1101,37 +1220,57 @@
   
   if (code == 0x45) {
     regs.H = fetch();
+    tick(1);
     regs.X = fetch();
+    tick(1);
   }
   else if (code == 0x55) {
     ea = fetch();
+    tick(1);
     regs.H = get1(ea);
+    tick(1);
     regs.X = get1(ea+1);
+    tick(1);
   }
   else if ((code == 0x32) && (type == CPU_HCS08)) {
     ea = fetch2();
+    tick(2);
     regs.H = get1(ea);
+    tick(1);
     regs.X = get1(ea+1);
+    tick(1);
   }
   else if (prefix && (code == 0xae) && (type == CPU_HCS08)) {
     ea = (regs.H << 8) | regs.X;
+    tick(1);
     regs.H = get1(ea);
+    tick(1);
     regs.X = get1(ea+1);
+    tick(1);
   }
   else if (prefix && (code == 0xbe) && (type == CPU_HCS08)) {
     ea = ((regs.H << 8) | regs.X) + fetch2();
+    tick(2);
     regs.H = get1(ea);
+    tick(1);
     regs.X = get1(ea+1);
+    tick(1);
   }
   else if (prefix && (code == 0xce) && (type == CPU_HCS08)) {
     ea = ((regs.H << 8) | regs.X) + fetch();
+    tick(1);
     regs.H = get1(ea);
+    tick(1);
     regs.X = get1(ea+1);
+    tick(1);
   }
   else if (prefix && (code == 0xfe) && (type == CPU_HCS08)) {
     ea = regs.SP + fetch();
+    tick(1);
     regs.H = get1(ea);
+    tick(1);
     regs.X = get1(ea+1);
+    tick(1);
   }
   else
     return(resHALT);
@@ -1153,18 +1292,28 @@
   
   if (code == 0x65) {
     operand = fetch2();
+    tick(2);
   }
   else if (code == 0x75) {
     ea = fetch();
+    tick(1);
     operand = (get1(ea) << 8) | get1(ea+1);
+    tick(2);
+    tick(1);
   }
   else if ((code == 0x3e) && (type == CPU_HCS08)) {
     ea = fetch2();
+    tick(2);
     operand = (get1(ea) << 8) | get1(ea+1);
+    tick(2);
+    tick(1);
   }
   else if (prefix && (code == 0xf3) && (type == CPU_HCS08)) {
     ea = ((unsigned char)fetch())+regs.SP;
+    tick(1);
     operand = (get1(ea) << 8) | get1(ea+1);
+    tick(2);
+    tick(1);
   }
   else
     return(resHALT);
@@ -1176,7 +1325,7 @@
   FLAG_ASSIGN (BIT_C, 0x10000 & result);
   FLAG_ASSIGN(BIT_N, result & 0x8000);
   FLAG_ASSIGN(BIT_Z, !(result & 0xffff));
-                              
+
   return(resGO);
 }
 
@@ -1184,12 +1333,18 @@
 cl_hc08::inst_swi(t_mem code, bool prefix)
 {
   push2(PC);
+  tick(2);
   push1(regs.X);
+  tick(1);
   push1(regs.A);
+  tick(1);
   push1(regs.P);
+  tick(1);
   FLAG_CLEAR(BIT_I);
-  
+
   PC = get2(0xfffc);
+  tick(2);
+  tick(3);
 
   return(resGO);
 }
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/pobj.cc sdcc-3.2.0+dfsg/sim/ucsim/pobj.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/pobj.cc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/pobj.cc	2012-05-13 10:47:19.000000000 +0000
@@ -2,7 +2,7 @@
  * Simulator of microcontrollers (pobj.cc)
  *
  * Copyright (C) 1999,99 Drotos Daniel, Talker Bt.
- * 
+ *
  * To contact author send email to drdani@mazsola.iit.uni-miskolc.hu
  *
  */
@@ -42,7 +42,7 @@
 									    *
 */
 
-/* 
+/*
  * Initializing the object
  */
 
@@ -54,7 +54,7 @@
 }
 
 
-/* 
+/*
  * Destructing the object: calling hte virtual Done method
  */
 
@@ -157,7 +157,7 @@
     {
       char *s;
       s= (char*)malloc(strlen(get_name("?"))+100);
-      sprintf(s, "childs of %s", get_name("?"));
+      sprintf(s, "children of %s", get_name("?"));
       children= new cl_list(1, 1, s);
       free(s);
     }
@@ -261,7 +261,7 @@
 									    *
 */
 
-/* 
+/*
  * Initializing a collection
  */
 
@@ -277,7 +277,7 @@
 }
 
 
-/* 
+/*
  * Disposing object's variables
  */
 
@@ -292,14 +292,14 @@
  * Get indexed item from the collection
  */
 
-void *
+/*void *
 cl_list::at(t_index index)
 {
   if (index < 0 ||
       index >= count)
     error(1, index);
   return(Items[index]);
-}
+}*/
 
 class cl_base *
 cl_list::object_at(t_index index)
@@ -316,7 +316,7 @@
   if (index < 0 ||
       index >= count)
     error(1, 0);
-  return(Items[index]);  
+  return(Items[index]);
 }*/
 
 
@@ -359,7 +359,7 @@
 }
 
 
-/* 
+/*
  * Deleting all the items from the collection but not disposing them
  */
 
@@ -426,7 +426,7 @@
 }
 
 
-/* 
+/*
  * Put a new item to the collection. This function replaces an existing
  * item with a new one but it does not delete or dispose the old item!
  */
@@ -440,21 +440,21 @@
 }
 
 
-/* 
+/*
  * Action taken when an error occure
  */
 
 void
 cl_list::error(t_index code, t_index info)
 {
-  fprintf(stderr, 
+  fprintf(stderr,
 	  "Collection index error. Code= %d, Info= %d.\n",
 	  code, info);
   exit(code);
 }
 
 
-/* 
+/*
  * Iterator method. This function calls 'Test' using every items as Test's
  * argument until Test returns TRUE.
  */
@@ -470,7 +470,7 @@
 }
 
 
-/* 
+/*
  * Iterator method. This function calls 'Action' using every items as
  * Action's argument.
  */
@@ -483,7 +483,7 @@
 }
 
 
-/* 
+/*
  * Disposing an item.
  */
 
@@ -494,7 +494,7 @@
 }
 
 
-/* 
+/*
  * Get the number of collected items.
  */
 
@@ -525,7 +525,7 @@
 }
 
 
-/* 
+/*
  * Returning the index of an item.
  */
 
@@ -566,7 +566,7 @@
 }
 
 
-/* 
+/*
  * Inserting a new item to the collection.
  */
 
@@ -597,7 +597,7 @@
 }
 
 
-/* 
+/*
  * Iterator method. This function calls 'Test' using every items
  * (in reversed order) as Test's argument until Test returns TRUE.
  */
@@ -673,7 +673,7 @@
 									    *
 */
 
-/* 
+/*
  * Initilizing the sorted collection
  */
 
@@ -687,7 +687,7 @@
 cl_sorted_list::~cl_sorted_list(void) {}
 
 
-/* 
+/*
  * Get the address of the key field in an item.
  */
 
@@ -698,7 +698,7 @@
 }
 
 
-/* 
+/*
  * Get index of an item.
  */
 
@@ -751,7 +751,7 @@
   t_index l  = 0;
   t_index h  = count - 1;
   bool    res= DD_FALSE;
-  
+
   while (l <= h)
     {
       t_index i= (l + h) >> 1;
@@ -780,7 +780,7 @@
 									    *
 */
 
-/* 
+/*
  * Initilizing the string collection
  */
 
@@ -794,7 +794,7 @@
 cl_strings::~cl_strings(void) {}
 
 
-/* 
+/*
  * Comapare two string from the collection
  */
 
@@ -805,7 +805,7 @@
 }
 
 
-/* 
+/*
  * Deallocate string item of the collection
  */
 
@@ -846,7 +846,7 @@
 }
 
 
-/* 
+/*
  * Searching an item using linear search.
  */
 
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/pobjcl.h sdcc-3.2.0+dfsg/sim/ucsim/pobjcl.h
--- sdcc-3.1.0+dfsg/sim/ucsim/pobjcl.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/pobjcl.h	2012-05-13 10:47:19.000000000 +0000
@@ -2,7 +2,7 @@
  * Simulator of microcontrollers (pobjcl.h)
  *
  * Copyright (C) 1999,99 Drotos Daniel, Talker Bt.
- * 
+ *
  * To contact author send email to drdani@mazsola.iit.uni-miskolc.hu
  *
  */
@@ -14,12 +14,12 @@
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
-  
+
   UCSIM 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 UCSIM; see the file COPYING.  If not, write to the Free
   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
@@ -95,7 +95,7 @@
 public:
   cl_event(enum event what_event);
   virtual ~cl_event(void);
-  
+
   bool is_handled(void) { return(handled); }
   virtual void handle(void) { handled= DD_TRUE; }
 };
@@ -121,7 +121,12 @@
   cl_list(t_index alimit, t_index adelta, const char *aname);
   virtual ~cl_list(void);
 
-	  void	   *at(t_index index);
+  inline  void	   *at(t_index index)
+  {
+    if (index < 0 || index >= count)
+      error(1, index);
+    return (Items[index]);
+  }
   class cl_base *object_at(t_index index);
   virtual t_index  index_of(void *item);
   virtual bool     index_of(void *item, t_index *idx);
@@ -169,7 +174,7 @@
 public:
   cl_sorted_list(t_index alimit, t_index adelta, const char *aname);
   virtual ~cl_sorted_list(void);
-  
+
   virtual bool	   search(const void *key, t_index& index);
   virtual t_index  index_of(void *item);
   virtual t_index  add(void *item);
@@ -191,7 +196,7 @@
 public:
   cl_strings(t_index alimit, t_index adelta, const char *aname);
   virtual ~cl_strings(void);
-  
+
 private:
   virtual int	   compare(const void *key1, const void *key2);
   virtual void	   free_item(void *item);
@@ -210,7 +215,7 @@
 public:
   cl_ustrings(t_index alimit, t_index adelta, const char *aname);
   virtual ~cl_ustrings(void);
-  
+
 private:
   virtual int	   compare(const void *key1, const void *key2);
   virtual bool	   search(const void *key, t_index &index);
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/s51.src/regs51.h sdcc-3.2.0+dfsg/sim/ucsim/s51.src/regs51.h
--- sdcc-3.1.0+dfsg/sim/ucsim/s51.src/regs51.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/s51.src/regs51.h	2012-05-13 10:47:19.000000000 +0000
@@ -74,6 +74,7 @@
 #define DPX     0x93 /* Data Pointer HHigh byte */
 #define DPX1    0x95 /* Data Pointer HHigh byte */
 #define ESP     0x9b /* Extended Stack Pointer */
+#define AP      0x9c /* Address Page */
 #define ACON    0x9d /* */
 #define P5      0xa1
 #define P5CNT   0xa2 /* */
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/s51.src/uc390.cc sdcc-3.2.0+dfsg/sim/ucsim/s51.src/uc390.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/s51.src/uc390.cc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/s51.src/uc390.cc	2012-05-13 10:47:19.000000000 +0000
@@ -220,7 +220,7 @@
   { 0xa0, 0xff, ' ', 2, "ORL C,/%b"},
   { 0xa1, 0xff, 'A', 3, "AJMP %A"},
   { 0xa2, 0xff, ' ', 2, "MOV C,%b"},
-  { 0xa3, 0xff, ' ', 1, "INC DPTR"},
+  { 0xa3, 0xff, ' ', 1, "%i DPTR"},
   { 0xa4, 0xff, ' ', 1, "MUL AB"},
   { 0xa5, 0xff, '_', 1, "-"},
   { 0xa6, 0xff, ' ', 2, "MOV @R0,%a"},
@@ -561,7 +561,7 @@
 {
   ulong dptr;
 
-  uchar pl, ph, px, dps;
+  uchar pl, ph, px, dps, dec;
 
   dps = sfr->get (DPS);
   if (dps & 0x01)
@@ -569,18 +569,20 @@
       pl = DPL1;
       ph = DPH1;
       px = DPX1;
+      dec = 0x80;
     }
   else
     {
       pl = DPL;
       ph = DPH;
       px = DPX;
+      dec = 0x040;
     }
 
   dptr = sfr->read (ph) * 256 + sfr->read (pl);
   if (sfr->get (ACON) & 0x02) /* AM1 set: 24-bit flat? */
     dptr += sfr->read (px) *256*256;
-  if (dps & 0x80) /* decr set */
+  if (dps & dec) /* decr set */
     dptr--;
   else
     dptr++;
@@ -1087,6 +1089,7 @@
   const char *b;
   char *buf, *p, *t;
   t_mem code;
+  uchar dps;
 
   if (! (sfr->get (ACON) & 0x02)) /* AM1 set: 24-bit flat? */
     return cl_51core::disass (addr, sep);
@@ -1101,18 +1104,18 @@
           b++;
           switch (*(b++))
             {
-              case 'A': // absolute address
-                // stock:
-                // sprintf (temp, "%04lx",
-                //          (addr & 0xf800)|
-                //          (((code >> 5) & 0x07) * 256 +
-                //          rom->get (addr + 1)));
-
-                sprintf (temp, "%06lx",
-                         (addr & 0xf80000L) |
-                         (((code >> 5) & 0x07) * (256 * 256) +
-                         (rom->get (addr + 1) * 256) +
-                          rom->get (addr + 2)));
+            case 'A': // absolute address
+              // stock:
+              // sprintf (temp, "%04lx",
+              //          (addr & 0xf800)|
+              //          (((code >> 5) & 0x07) * 256 +
+              //          rom->get (addr + 1)));
+
+              sprintf (temp, "%06lx",
+                       (addr & 0xf80000L) |
+                       (((code >> 5) & 0x07) * (256 * 256) +
+                       (rom->get (addr + 1) * 256) +
+                        rom->get (addr + 2)));
               break;
             case 'l': // long address
               sprintf (temp, "%06lx",
@@ -1122,8 +1125,8 @@
                        // rom->get (addr + 1) * 256 + rom->get (addr + 2));
               break;
             case 'a': // addr8 (direct address) at 2nd byte
-               if (!get_name (rom->get (addr + 1), sfr_tbl (), temp))
-                 sprintf (temp, "%02"_M_"x", rom->get (addr + 1));
+              if (!get_name (rom->get (addr + 1), sfr_tbl (), temp))
+                sprintf (temp, "%02"_M_"x", rom->get (addr + 1));
               break;
             case '8': // addr8 (direct address) at 3rd byte
               if (!get_name (rom->get (addr + 2), sfr_tbl (), temp))
@@ -1159,6 +1162,10 @@
             case 'D': // data8 at 3rd byte
               sprintf (temp, "%02"_M_"x", rom->get (addr + 2));
               break;
+            case 'i': // inc/dec dptr
+              dps = sfr->get(DPS);
+              sprintf (temp, ((dps & 0x01) ? (dps & 0x80) : (dps & 0x40)) ? "DEC" : "INC");
+              break;
             default:
               strcpy (temp, "?");
               break;
@@ -1200,6 +1207,7 @@
 {
   t_addr start;
   t_mem data;
+  uchar dps;
 
   if (! (sfr->get (ACON) & 0x02)) /* AM1 set: 24-bit flat? */
     {
@@ -1211,21 +1219,30 @@
   iram->dump (start, start + 7, 8, con);
   start = sfr->get (PSW) & 0x18;
   data = iram->get (iram->get (start));
-  con->dd_printf("%06x %02x %c",
+  con->dd_printf ("%06x %02x %c",
                   iram->get (start), data, isprint (data) ? data : '.');
-  con->dd_printf("  ACC= 0x%02x %3d %c  B= 0x%02x",
-                 sfr->get (ACC), sfr->get (ACC),
-                 isprint (sfr->get (ACC)) ?
-                 (sfr->get (ACC)) : '.', sfr->get (B));
+  con->dd_printf ("  ACC= 0x%02x %3d %c  B= 0x%02x",
+                  sfr->get (ACC), sfr->get (ACC),
+                  isprint (sfr->get (ACC)) ?
+                  (sfr->get (ACC)) : '.', sfr->get (B));
   eram2xram ();
+  dps = sfr->get(DPS);
   data = get_mem (MEM_XRAM_ID,
                   sfr->get (DPX) * 256*256 + sfr->get (DPH) * 256 + sfr->get (DPL));
-  con->dd_printf ("   DPTR= 0x%02x%02x%02x @DPTR= 0x%02x %3d %c\n",
+  con->dd_printf ("  %cDPTR0= 0x%02x%02x%02x @DPTR0= 0x%02x %3d %c",
+                  dps & 0x01 ? ' ' : dps & 0x20 ? 't' : '*',
                   sfr->get (DPX), sfr->get (DPH), sfr->get (DPL),
                   data, data, isprint (data) ? data : '.');
+  data = get_mem (MEM_XRAM_ID,
+                  sfr->get (DPX1) * 256*256 + sfr->get (DPH1) * 256 + sfr->get (DPL1));
+  con->dd_printf ("  %cDPTR1= 0x%02x%02x%02x @DPTR1= 0x%02x %3d %c\n",
+                  dps & 0x01 ? dps & 0x20 ? 't' : '*' : ' ',
+                  sfr->get (DPX1), sfr->get (DPH1), sfr->get (DPL1),
+                  data, data, isprint (data) ? data : '.');
   data = iram->get (iram->get (start + 1));
   con->dd_printf ("%06x %02x %c", iram->get (start + 1), data,
                   isprint (data) ? data : '.');
+  con->dd_printf ("  AP= 0x%02x", sfr->get (AP));
   data= sfr->get (PSW);
   con->dd_printf ("  PSW= 0x%02x CY=%c AC=%c OV=%c P=%c    ",
                   data,
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/stypes.h sdcc-3.2.0+dfsg/sim/ucsim/stypes.h
--- sdcc-3.1.0+dfsg/sim/ucsim/stypes.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/stypes.h	2012-05-15 03:59:44.000000000 +0000
@@ -92,8 +92,10 @@
 
 #define CPU_Z80		0x0001
 #define CPU_Z180	0x0002
-#define CPU_R2K		0x0004
-#define CPU_ALL_Z80	(CPU_Z80|CPU_Z180|CPU_R2K)
+#define CPU_LR35902	0x0004
+#define CPU_R2K		0x0008
+#define CPU_R3KA        0x0010
+#define CPU_ALL_Z80	(CPU_Z80|CPU_Z180|CPU_R2K|CPU_LR35902|CPU_R3KA)
 
 #define CPU_XA		0x0001
 #define CPU_ALL_XA	(CPU_XA)
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/utils.cc sdcc-3.2.0+dfsg/sim/ucsim/utils.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/utils.cc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/utils.cc	2011-11-28 19:54:35.000000000 +0000
@@ -142,7 +142,7 @@
     name= o->get_name();
   if (name && *name)
     return(name);
-  return("(unkown)");
+  return("(unknown)");
 }
 
 
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/z80.src/Makefile.in sdcc-3.2.0+dfsg/sim/ucsim/z80.src/Makefile.in
--- sdcc-3.1.0+dfsg/sim/ucsim/z80.src/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/z80.src/Makefile.in	2012-01-10 04:32:27.000000000 +0000
@@ -56,6 +56,7 @@
 		  inst_ddcb.o \
 		  inst_fdcb.o \
 		  glob_r2k.o inst_r2k.o inst_ed_r2k.o r2k.o \
+		  glob_lr35902.o inst_lr35902.o lr35902.o \
 		  simz80.o z80.o
 OBJECTS_EXE	= sz80.o
 OBJECTS		= $(OBJECTS_SHARED) $(OBJECTS_EXE)
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/z80.src/glob.cc sdcc-3.2.0+dfsg/sim/ucsim/z80.src/glob.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/z80.src/glob.cc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/z80.src/glob.cc	2012-01-10 04:32:27.000000000 +0000
@@ -77,7 +77,7 @@
   { 0x001b, 0x00ff, ' ', 1, "DEC DE" },
   { 0x001c, 0x00ff, ' ', 1, "INC E" },
   { 0x001d, 0x00ff, ' ', 1, "DEC E" },
-  { 0x001e, 0x00ff, ' ', 2, "LD E" },
+  { 0x001e, 0x00ff, ' ', 2, "LD E,%b" },
   { 0x001f, 0x00ff, ' ', 1, "RRA" },
 
   { 0x0020, 0x00ff, 'R', 2, "JR NZ,%d" },
@@ -106,8 +106,8 @@
   { 0x0031, 0x00ff, ' ', 3, "LD SP,%w" },
   { 0x0032, 0x00ff, ' ', 3, "LD (%w),A" },
   { 0x0033, 0x00ff, ' ', 1, "INC SP" },
-  { 0x0034, 0x00ff, ' ', 1, "INC HL" },
-  { 0x0035, 0x00ff, ' ', 1, "DEC HL" },
+  { 0x0034, 0x00ff, ' ', 1, "INC (HL)" },
+  { 0x0035, 0x00ff, ' ', 1, "DEC (HL)" },
   { 0x0036, 0x00ff, ' ', 2, "LD (HL),%b" },
   { 0x0037, 0x00ff, ' ', 1, "SCF" },
 
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/z80.src/glob.h sdcc-3.2.0+dfsg/sim/ucsim/z80.src/glob.h
--- sdcc-3.1.0+dfsg/sim/ucsim/z80.src/glob.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/z80.src/glob.h	2012-01-10 04:32:27.000000000 +0000
@@ -49,6 +49,9 @@
 extern struct dis_entry disass_r2k_ddcb[];
 extern struct dis_entry disass_r2k_fdcb[];
 
+extern struct dis_entry disass_lr35902[];
+extern struct dis_entry disass_lr35902_cb[];
+
 #endif
 
 /* End of z80.src/glob.h */
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/z80.src/glob_lr35902.cc sdcc-3.2.0+dfsg/sim/ucsim/z80.src/glob_lr35902.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/z80.src/glob_lr35902.cc	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/z80.src/glob_lr35902.cc	2012-01-10 04:32:27.000000000 +0000
@@ -0,0 +1,596 @@
+/*
+ * Disassembly table for LR35902, a Z-80 derivative used
+ * by the Gameboy (glob_lr35902.cc)
+ *
+ */
+/* Derived from z80 glob.cc by Leland Morrison 2011 */
+
+/* This file is part of microcontroller simulator: ucsim.
+   
+   UCSIM is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   UCSIM 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 UCSIM; see the file COPYING.  If not, write to the Free
+   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA. 
+*/
+/*@1@*/
+#include <stdio.h>
+
+#include "stypes.h"
+
+#define  DISASS_NAME(X)  disass_lr35902##X
+
+
+/* 
+%d - signed compl.,byte jump 
+%w - 2-byte jump or imm. value
+%b - byte imm. value
+  */
+/*  uint  code, mask;  char  branch;  uchar length;  char  *mnemonic; */
+
+struct dis_entry DISASS_NAME() []= {
+  { 0x0000, 0x00ff, ' ', 1, "NOP" },
+  { 0x0001, 0x00ff, ' ', 3, "LD BC,%w" },
+  { 0x0002, 0x00ff, ' ', 1, "LD (BC),A" },
+  { 0x0003, 0x00ff, ' ', 1, "INC BC" },
+  { 0x0004, 0x00ff, ' ', 1, "INC B" },
+  { 0x0005, 0x00ff, ' ', 1, "DEC B" },
+  { 0x0006, 0x00ff, ' ', 2, "LD b,%b" },
+  { 0x0007, 0x00ff, ' ', 1, "RLCA" },
+
+  { 0x0008, 0x00ff, ' ', 3, "LD (%w),SP" },  // unique to LR35902
+  { 0x0009, 0x00ff, ' ', 1, "ADD HL,BC" },
+  { 0x000a, 0x00ff, ' ', 1, "LD A,(BC)" },
+  { 0x000b, 0x00ff, ' ', 1, "DEC BC" },
+  { 0x000c, 0x00ff, ' ', 1, "INC C" },
+  { 0x000d, 0x00ff, ' ', 1, "DEC C" },
+  { 0x000e, 0x00ff, ' ', 2, "LD C,%b" },
+  { 0x000f, 0x00ff, ' ', 1, "RRCA" },
+
+#if 1
+  { 0x0010, 0x00ff, ' ', 2, "STOP 0" },  // unique to LR35902
+#else
+  { 0x0010, 0x00ff, 'R', 2, "DJNZ %d" },
+#endif
+  { 0x0011, 0x00ff, ' ', 3, "LD DE,%w" },
+  { 0x0012, 0x00ff, ' ', 1, "LD (DE),A" },
+  { 0x0013, 0x00ff, ' ', 1, "INC DE" },
+  { 0x0014, 0x00ff, ' ', 1, "INC D" },
+  { 0x0015, 0x00ff, ' ', 1, "DEC D" },
+  { 0x0016, 0x00ff, ' ', 2, "LD D,%b" },
+  { 0x0017, 0x00ff, ' ', 1, "RLA" },
+
+  { 0x0018, 0x00ff, 'R', 2, "JR %d" },
+  { 0x0019, 0x00ff, ' ', 3, "ADD HL,DE" },
+  { 0x001a, 0x00ff, ' ', 1, "LD A,(DE)" },
+  { 0x001b, 0x00ff, ' ', 1, "DEC DE" },
+  { 0x001c, 0x00ff, ' ', 1, "INC E" },
+  { 0x001d, 0x00ff, ' ', 1, "DEC E" },
+  { 0x001e, 0x00ff, ' ', 2, "LD E,%b" },
+  { 0x001f, 0x00ff, ' ', 1, "RRA" },
+
+  { 0x0020, 0x00ff, 'R', 2, "JR NZ,%d" },
+  { 0x0021, 0x00ff, ' ', 3, "LD HL,%w" },
+  { 0x0022, 0x00ff, ' ', 1, "LDI (HL),A" },// unique to LR35902
+  { 0x0023, 0x00ff, ' ', 1, "INC HL" },
+  { 0x0024, 0x00ff, ' ', 1, "INC H" },
+  { 0x0025, 0x00ff, ' ', 1, "DEC H" },
+  { 0x0026, 0x00ff, ' ', 2, "LD H,%b" },
+  { 0x0027, 0x00ff, ' ', 1, "DAA" },
+
+  { 0x0028, 0x00ff, 'R', 2, "JR Z,%d" },
+  { 0x0029, 0x00ff, ' ', 1, "ADD HL,HL" },
+  { 0x002a, 0x00ff, ' ', 1, "LDI A,(HL)" },// unique to LR35902
+  { 0x002b, 0x00ff, ' ', 1, "DEC HL" },
+  { 0x002c, 0x00ff, ' ', 1, "INC L" },
+  { 0x002d, 0x00ff, ' ', 1, "DEC L" },
+  { 0x002e, 0x00ff, ' ', 2, "LD L, %b" },
+  { 0x002f, 0x00ff, ' ', 1, "CPL" },
+
+  { 0x0030, 0x00ff, 'R', 2, "JR NC,%d" },
+  { 0x0031, 0x00ff, ' ', 3, "LD SP,%w" },
+  { 0x0032, 0x00ff, ' ', 1, "LDD (HL),A" },  // unique to LR35902
+  { 0x0033, 0x00ff, ' ', 1, "INC SP" },
+  { 0x0034, 0x00ff, ' ', 1, "INC (HL)" },
+  { 0x0035, 0x00ff, ' ', 1, "DEC (HL)" },
+  { 0x0036, 0x00ff, ' ', 2, "LD (HL),%b" },
+  { 0x0037, 0x00ff, ' ', 1, "SCF" },
+
+  { 0x0038, 0x00ff, 'R', 2, "JR C,%d" },
+  { 0x0039, 0x00ff, ' ', 1, "ADD HL,SP" },
+  { 0x003a, 0x00ff, ' ', 1, "LDD A,(HL)" },  // unique to LR35902
+  { 0x003b, 0x00ff, ' ', 1, "DEC SP" },
+  { 0x003c, 0x00ff, ' ', 1, "INC A" },
+  { 0x003d, 0x00ff, ' ', 1, "DEC A" },
+  { 0x003e, 0x00ff, ' ', 2, "LD A,%b" },
+  { 0x003f, 0x00ff, ' ', 1, "CCF" },
+
+  { 0x0040, 0x00ff, ' ', 1, "LD B,B" },
+  { 0x0041, 0x00ff, ' ', 1, "LD B,C" },
+  { 0x0042, 0x00ff, ' ', 1, "LD B,D" },
+  { 0x0043, 0x00ff, ' ', 1, "LD B,E" },
+  { 0x0044, 0x00ff, ' ', 1, "LD B,H" },
+  { 0x0045, 0x00ff, ' ', 1, "LD B,L" },
+  { 0x0046, 0x00ff, ' ', 1, "LD B,(HL)" },
+  { 0x0047, 0x00ff, ' ', 1, "LD B,a" },
+
+  { 0x0048, 0x00ff, ' ', 1, "LD C,B" },
+  { 0x0049, 0x00ff, ' ', 1, "LD C,C" },
+  { 0x004a, 0x00ff, ' ', 1, "LD C,D" },
+  { 0x004b, 0x00ff, ' ', 1, "LD C,E" },
+  { 0x004c, 0x00ff, ' ', 1, "LD C,H" },
+  { 0x004d, 0x00ff, ' ', 1, "LD C,L" },
+  { 0x004e, 0x00ff, ' ', 1, "LD C,(HL)" },
+  { 0x004f, 0x00ff, ' ', 1, "LD C,A" },
+
+  { 0x0050, 0x00ff, ' ', 1, "LD D,B" },
+  { 0x0051, 0x00ff, ' ', 1, "LD D,C" },
+  { 0x0052, 0x00ff, ' ', 1, "LD D,D" },
+  { 0x0053, 0x00ff, ' ', 1, "LD D,E" },
+  { 0x0054, 0x00ff, ' ', 1, "LD D,H" },
+  { 0x0055, 0x00ff, ' ', 1, "LD D,L" },
+  { 0x0056, 0x00ff, ' ', 1, "LD D,(HL)" },
+  { 0x0057, 0x00ff, ' ', 1, "LD D,A" },
+
+  { 0x0058, 0x00ff, ' ', 1, "LD E,B" },
+  { 0x0059, 0x00ff, ' ', 1, "LD E,C" },
+  { 0x005a, 0x00ff, ' ', 1, "LD E,D" },
+  { 0x005b, 0x00ff, ' ', 1, "LD E,E" },
+  { 0x005c, 0x00ff, ' ', 1, "LD E,H" },
+  { 0x005d, 0x00ff, ' ', 1, "LD E,L" },
+  { 0x005e, 0x00ff, ' ', 1, "LD E,(HL)" },
+  { 0x005f, 0x00ff, ' ', 1, "LD E,A" },
+
+  { 0x0060, 0x00ff, ' ', 1, "LD H,B" },
+  { 0x0061, 0x00ff, ' ', 1, "LD H,C" },
+  { 0x0062, 0x00ff, ' ', 1, "LD H,D" },
+  { 0x0063, 0x00ff, ' ', 1, "LD H,E" },
+  { 0x0064, 0x00ff, ' ', 1, "LD H,H" },
+  { 0x0065, 0x00ff, ' ', 1, "LD H,L" },
+  { 0x0066, 0x00ff, ' ', 1, "LD H,(HL)" },
+  { 0x0067, 0x00ff, ' ', 1, "LD H,A" },
+
+  { 0x0068, 0x00ff, ' ', 1, "LD L,B" },
+  { 0x0069, 0x00ff, ' ', 1, "LD L,C" },
+  { 0x006a, 0x00ff, ' ', 1, "LD L,D" },
+  { 0x006b, 0x00ff, ' ', 1, "LD L,E" },
+  { 0x006c, 0x00ff, ' ', 1, "LD L,H" },
+  { 0x006d, 0x00ff, ' ', 1, "LD L,L" },
+  { 0x006e, 0x00ff, ' ', 1, "LD L,(HL)" },
+  { 0x006f, 0x00ff, ' ', 1, "LD L,A" },
+
+  { 0x0070, 0x00ff, ' ', 1, "LD (HL),B" },
+  { 0x0071, 0x00ff, ' ', 1, "LD (HL),C" },
+  { 0x0072, 0x00ff, ' ', 1, "LD (HL),D" },
+  { 0x0073, 0x00ff, ' ', 1, "LD (HL),E" },
+  { 0x0074, 0x00ff, ' ', 1, "LD (HL),H" },
+  { 0x0075, 0x00ff, ' ', 1, "LD (HL),L" },
+  { 0x0076, 0x00ff, ' ', 1, "HALT" },
+  { 0x0077, 0x00ff, ' ', 1, "LD (HL),A" },
+
+  { 0x0078, 0x00ff, ' ', 1, "LD A,B" },
+  { 0x0079, 0x00ff, ' ', 1, "LD A,C" },
+  { 0x007a, 0x00ff, ' ', 1, "LD A,D" },
+  { 0x007b, 0x00ff, ' ', 1, "LD A,E" },
+  { 0x007c, 0x00ff, ' ', 1, "LD A,H" },
+  { 0x007d, 0x00ff, ' ', 1, "LD A,L" },
+  { 0x007e, 0x00ff, ' ', 1, "LD A,(HL)" },
+  { 0x007f, 0x00ff, ' ', 1, "LD A,A" },
+
+  { 0x0080, 0x00ff, ' ', 1, "ADD A,B" },
+  { 0x0081, 0x00ff, ' ', 1, "ADD A,C" },
+  { 0x0082, 0x00ff, ' ', 1, "ADD A,D" },
+  { 0x0083, 0x00ff, ' ', 1, "ADD A,E" },
+  { 0x0084, 0x00ff, ' ', 1, "ADD A,H" },
+  { 0x0085, 0x00ff, ' ', 1, "ADD A,L" },
+  { 0x0086, 0x00ff, ' ', 1, "ADD A,(HL)" },
+  { 0x0087, 0x00ff, ' ', 1, "ADD A,A" },
+
+  { 0x0088, 0x00ff, ' ', 1, "ADC A,B" },
+  { 0x0089, 0x00ff, ' ', 1, "ADC A,C" },
+  { 0x008a, 0x00ff, ' ', 1, "ADC A,D" },
+  { 0x008b, 0x00ff, ' ', 1, "ADC A,E" },
+  { 0x008c, 0x00ff, ' ', 1, "ADC A,H" },
+  { 0x008d, 0x00ff, ' ', 1, "ADC A,L" },
+  { 0x008e, 0x00ff, ' ', 1, "ADC A,(HL)" },
+  { 0x008f, 0x00ff, ' ', 1, "ADC A,A" },
+
+  { 0x0090, 0x00ff, ' ', 1, "SUB A,B"},
+  { 0x0091, 0x00ff, ' ', 1, "SUB A,C"},
+  { 0x0092, 0x00ff, ' ', 1, "SUB A,D"},
+  { 0x0093, 0x00ff, ' ', 1, "SUB A,E"},
+  { 0x0094, 0x00ff, ' ', 1, "SUB A,H"},
+  { 0x0095, 0x00ff, ' ', 1, "SUB A,L"},
+  { 0x0096, 0x00ff, ' ', 1, "SUB A,(HL)"},
+  { 0x0097, 0x00ff, ' ', 1, "SUB A,A"},
+
+  { 0x0098, 0x00ff, ' ', 1, "SBC A,B" },
+  { 0x0099, 0x00ff, ' ', 1, "SBC A,C" },
+  { 0x009a, 0x00ff, ' ', 1, "SBC A,D" },
+  { 0x009b, 0x00ff, ' ', 1, "SBC A,E" },
+  { 0x009c, 0x00ff, ' ', 1, "SBC A,H" },
+  { 0x009d, 0x00ff, ' ', 1, "SBC A,L" },
+  { 0x009e, 0x00ff, ' ', 1, "SBC A,(HL)" },
+  { 0x009f, 0x00ff, ' ', 1, "SBC A,A" },
+
+  { 0x00a0, 0x00ff, ' ', 1, "AND B" },
+  { 0x00a1, 0x00ff, ' ', 1, "AND C" },
+  { 0x00a2, 0x00ff, ' ', 1, "AND D" },
+  { 0x00a3, 0x00ff, ' ', 1, "AND E" },
+  { 0x00a4, 0x00ff, ' ', 1, "AND H" },
+  { 0x00a5, 0x00ff, ' ', 1, "AND L" },
+  { 0x00a6, 0x00ff, ' ', 1, "AND (HL)" },
+  { 0x00a7, 0x00ff, ' ', 1, "AND A" },
+
+  { 0x00a8, 0x00ff, ' ', 1, "XOR B" },
+  { 0x00a9, 0x00ff, ' ', 1, "XOR C" },
+  { 0x00aa, 0x00ff, ' ', 1, "XOR D" },
+  { 0x00ab, 0x00ff, ' ', 1, "XOR E" },
+  { 0x00ac, 0x00ff, ' ', 1, "XOR H" },
+  { 0x00ad, 0x00ff, ' ', 1, "XOR L" },
+  { 0x00ae, 0x00ff, ' ', 1, "XOR (HL)" },
+  { 0x00af, 0x00ff, ' ', 1, "XOR A" },
+
+  { 0x00b0, 0x00ff, ' ', 1, "OR B" },
+  { 0x00b1, 0x00ff, ' ', 1, "OR C" },
+  { 0x00b2, 0x00ff, ' ', 1, "OR D" },
+  { 0x00b3, 0x00ff, ' ', 1, "OR E" },
+  { 0x00b4, 0x00ff, ' ', 1, "OR H" },
+  { 0x00b5, 0x00ff, ' ', 1, "OR L" },
+  { 0x00b6, 0x00ff, ' ', 1, "OR (HL)" },
+  { 0x00b7, 0x00ff, ' ', 1, "OR A" },
+
+  { 0x00b8, 0x00ff, ' ', 1, "CP B" },
+  { 0x00b9, 0x00ff, ' ', 1, "CP C" },
+  { 0x00ba, 0x00ff, ' ', 1, "CP D" },
+  { 0x00bb, 0x00ff, ' ', 1, "CP E" },
+  { 0x00bc, 0x00ff, ' ', 1, "CP H" },
+  { 0x00bd, 0x00ff, ' ', 1, "CP L" },
+  { 0x00be, 0x00ff, ' ', 1, "CP (HL)" },
+  { 0x00bf, 0x00ff, ' ', 1, "CP A" },
+
+  { 0x00c0, 0x00ff, ' ', 1, "RET NZ" },
+  { 0x00c1, 0x00ff, ' ', 1, "POP BC" },
+  { 0x00c2, 0x00ff, 'A', 3, "JP NZ, %w" },
+  { 0x00c3, 0x00ff, 'A', 3, "JP %w" },
+  { 0x00c4, 0x00ff, 'l', 3, "CALL NZ,%w" },
+  { 0x00c5, 0x00ff, ' ', 1, "PUSH BC" },
+  { 0x00c6, 0x00ff, ' ', 2, "ADD A,%b" },
+  { 0x00c7, 0x00ff, ' ', 1, "RST 0" },
+
+  { 0x00c8, 0x00ff, ' ', 1, "RET Z" },
+  { 0x00c9, 0x00ff, ' ', 1, "RET" },
+  { 0x00ca, 0x00ff, 'A', 3, "JP Z,%w" },
+  { 0x00cb, 0x00ff, ' ', 2, "?cb?" }, /* ESC code to lots of op-codes, all 2-byte */
+
+  { 0x00cc, 0x00ff, 'l', 3, "CALL Z,%w" },
+  { 0x00cd, 0x00ff, 'l', 3, "CALL %w" },
+  { 0x00ce, 0x00ff, ' ', 2, "ADC A,%b" },
+  { 0x00cf, 0x00ff, ' ', 1, "RST 8" },
+  
+  { 0x00d0, 0x00ff, ' ', 1, "RET NC" },
+  { 0x00d1, 0x00ff, ' ', 1, "POP DE" },
+  { 0x00d2, 0x00ff, 'A', 3, "JP NC,%w" },
+  { 0x00d3, 0x00ff, ' ', 2, "Illegal Op" },  // in/out do not exist on LR35902
+  { 0x00d4, 0x00ff, 'l', 3, "CALL NC,%w" },
+  { 0x00d5, 0x00ff, ' ', 1, "PUSH DE" },
+  { 0x00d6, 0x00ff, ' ', 2, "sub %b" },
+  { 0x00d7, 0x00ff, ' ', 1, "RST 10H" },
+
+  { 0x00d8, 0x00ff, ' ', 1, "RET C" },
+  { 0x00d9, 0x00ff, ' ', 1, "RETI" },  // unique to LR35902
+  { 0x00da, 0x00ff, 'A', 3, "JP C,%w" },
+  { 0x00db, 0x00ff, ' ', 2, "Illegal Op" },  // in/out do not exist on LR35902
+  { 0x00dc, 0x00ff, 'l', 3, "CALL C,%w" },
+  { 0x00dd, 0x00ff, ' ', 2, "Illegal Op" },  /* 0xdd - ESC codes,about 284, vary lengths, IX centric */
+  { 0x00de, 0x00ff, ' ', 2, "SBC A,%b" },
+  { 0x00df, 0x00ff, ' ', 1, "RST 18H" },
+
+  { 0x00e0, 0x00ff, ' ', 2, "LDH (0xFF00+%b),A" },  // unique to LR35902
+  { 0x00e1, 0x00ff, ' ', 1, "POP HL" },
+  { 0x00e2, 0x00ff, 'A', 2, "LD (0xFF00+C),A" },  // unique to LR35902
+  { 0x00e3, 0x00ff, ' ', 1, "Illegal Op" },
+  { 0x00e4, 0x00ff, 'l', 1, "Illegal Op" },
+  { 0x00e5, 0x00ff, ' ', 1, "PUSH HL" },
+  { 0x00e6, 0x00ff, ' ', 2, "AND %b" },
+  { 0x00e7, 0x00ff, ' ', 1, "RST 20H" },
+
+  { 0x00e8, 0x00ff, ' ', 2, "ADD SP,%d" },  // unique to LR35902
+  { 0x00e9, 0x00ff, 'A', 1, "JP (HL)" },
+  { 0x00ea, 0x00ff, ' ', 3, "LD (%w),A" },  // unique to LR35902
+  { 0x00eb, 0x00ff, ' ', 1, "Illegal Op" },
+  { 0x00ec, 0x00ff, 'l', 1, "Illegal Op" },
+  { 0x00ed, 0x00ff, ' ', 1, "Illegal Op" },
+  { 0x00ee, 0x00ff, ' ', 2, "XOR %b" },
+  { 0x00ef, 0x00ff, ' ', 1, "RST 28H" },
+
+  { 0x00f0, 0x00ff, ' ', 2, "LDH A,(0xFF00+%b)" },  // unique to LR35902
+  { 0x00f1, 0x00ff, ' ', 1, "POP AF" },
+  { 0x00f2, 0x00ff, ' ', 2, "LD A,(0xFF00+C)" },  // unique to LR35902
+  { 0x00f3, 0x00ff, ' ', 1, "DI" },
+  { 0x00f4, 0x00ff, 'l', 3, "Illegal Op" },
+  { 0x00f5, 0x00ff, ' ', 1, "PUSH AF" },
+  { 0x00f6, 0x00ff, ' ', 2, "OR %b" },
+  { 0x00f7, 0x00ff, ' ', 1, "RST 30H" },
+
+  { 0x00f8, 0x00ff, ' ', 2, "LD HL,SP+%d" },  // unique to LR35902
+  { 0x00f9, 0x00ff, ' ', 1, "LD SP,HL" },
+  { 0x00fa, 0x00ff, ' ', 3, "LD A,(%w)" },  // unique to LR35902
+  { 0x00fb, 0x00ff, ' ', 1, "EI" },
+  { 0x00fc, 0x00ff, 'l', 1, "Illegal Op" },
+  { 0x00fd, 0x00ff, ' ', 1, "Illegal Op" },
+  { 0x00fe, 0x00ff, ' ', 2, "CP %b" },
+  { 0x00ff, 0x00ff, ' ', 1, "RST 38H" },
+
+  { 0, 0, 0, 0, NULL }
+};
+
+
+struct dis_entry DISASS_NAME(_cb)[]= {
+  { 0x0000, 0x00ff, ' ', 1, "RLC B" },
+  { 0x0001, 0x00ff, ' ', 1, "RLC C" },
+  { 0x0002, 0x00ff, ' ', 1, "RLC D" },
+  { 0x0003, 0x00ff, ' ', 1, "RLC E" },
+  { 0x0004, 0x00ff, ' ', 1, "RLC H" },
+  { 0x0005, 0x00ff, ' ', 1, "RLC L" },
+  { 0x0006, 0x00ff, ' ', 1, "RLC (HL)" },
+  { 0x0007, 0x00ff, ' ', 1, "RLC A" },
+  { 0x0008, 0x00ff, ' ', 1, "RRC B" },
+  { 0x0009, 0x00ff, ' ', 1, "RRC C" },
+  { 0x000A, 0x00ff, ' ', 1, "RRC D" },
+  { 0x000B, 0x00ff, ' ', 1, "RRC E" },
+  { 0x000C, 0x00ff, ' ', 1, "RRC H" },
+  { 0x000D, 0x00ff, ' ', 1, "RRC L" },
+  { 0x000E, 0x00ff, ' ', 1, "RRC (HL)" },
+  { 0x000F, 0x00ff, ' ', 1, "RRC A" },
+  { 0x0010, 0x00ff, ' ', 1, "RL B" },
+  { 0x0011, 0x00ff, ' ', 1, "RL C" },
+  { 0x0012, 0x00ff, ' ', 1, "RL D" },
+  { 0x0013, 0x00ff, ' ', 1, "RL E" },
+  { 0x0014, 0x00ff, ' ', 1, "RL H" },
+  { 0x0015, 0x00ff, ' ', 1, "RL L" },
+  { 0x0016, 0x00ff, ' ', 1, "RL (HL)" },
+  { 0x0017, 0x00ff, ' ', 1, "RL A" },
+  { 0x0018, 0x00ff, ' ', 1, "RR B" },
+  { 0x0019, 0x00ff, ' ', 1, "RR C" },
+  { 0x001A, 0x00ff, ' ', 1, "RR D" },
+  { 0x001B, 0x00ff, ' ', 1, "RR E" },
+  { 0x001C, 0x00ff, ' ', 1, "RR H" },
+  { 0x001D, 0x00ff, ' ', 1, "RR L" },
+  { 0x001E, 0x00ff, ' ', 1, "RR (HL)" },
+  { 0x001F, 0x00ff, ' ', 1, "RR A" },
+  { 0x0020, 0x00ff, ' ', 1, "SLA B" },
+  { 0x0021, 0x00ff, ' ', 1, "SLA C" },
+  { 0x0022, 0x00ff, ' ', 1, "SLA D" },
+  { 0x0023, 0x00ff, ' ', 1, "SLA E" },
+  { 0x0024, 0x00ff, ' ', 1, "SLA H" },
+  { 0x0025, 0x00ff, ' ', 1, "SLA L" },
+  { 0x0026, 0x00ff, ' ', 1, "SLA (HL)" },
+  { 0x0027, 0x00ff, ' ', 1, "SLA A" },
+  { 0x0028, 0x00ff, ' ', 1, "SRA B" },
+  { 0x0029, 0x00ff, ' ', 1, "SRA C" },
+  { 0x002A, 0x00ff, ' ', 1, "SRA D" },
+  { 0x002B, 0x00ff, ' ', 1, "SRA E" },
+  { 0x002C, 0x00ff, ' ', 1, "SRA H" },
+  { 0x002D, 0x00ff, ' ', 1, "SRA L" },
+  { 0x002E, 0x00ff, ' ', 1, "SRA (HL)" },
+  { 0x002F, 0x00ff, ' ', 1, "SRA A" },
+  { 0x0030, 0x00ff, ' ', 1, "SWAP B" },
+  { 0x0031, 0x00ff, ' ', 1, "SWAP C" },
+  { 0x0032, 0x00ff, ' ', 1, "SWAP D" },
+  { 0x0033, 0x00ff, ' ', 1, "SWAP E" },
+  { 0x0034, 0x00ff, ' ', 1, "SWAP H" },
+  { 0x0035, 0x00ff, ' ', 1, "SWAP L" },
+  { 0x0036, 0x00ff, ' ', 1, "SWAP (HL)" },
+  { 0x0037, 0x00ff, ' ', 1, "SWAP A" },
+  { 0x0038, 0x00ff, ' ', 1, "SRL B" },
+  { 0x0039, 0x00ff, ' ', 1, "SRL C" },
+  { 0x003A, 0x00ff, ' ', 1, "SRL D" },
+  { 0x003B, 0x00ff, ' ', 1, "SRL E" },
+  { 0x003C, 0x00ff, ' ', 1, "SRL H" },
+  { 0x003D, 0x00ff, ' ', 1, "SRL L" },
+  { 0x003E, 0x00ff, ' ', 1, "SRL (HL)" },
+  { 0x003F, 0x00ff, ' ', 1, "SRL A" },
+  { 0x0040, 0x00ff, ' ', 1, "BIT 0,B" },
+  { 0x0041, 0x00ff, ' ', 1, "BIT 0,C" },
+  { 0x0042, 0x00ff, ' ', 1, "BIT 0,D" },
+  { 0x0043, 0x00ff, ' ', 1, "BIT 0,E" },
+  { 0x0044, 0x00ff, ' ', 1, "BIT 0,H" },
+  { 0x0045, 0x00ff, ' ', 1, "BIT 0,L" },
+  { 0x0046, 0x00ff, ' ', 1, "BIT 0,(HL)" },
+  { 0x0047, 0x00ff, ' ', 1, "BIT 0,A" },
+  { 0x0048, 0x00ff, ' ', 1, "BIT 1,B" },
+  { 0x0049, 0x00ff, ' ', 1, "BIT 1,C" },
+  { 0x004A, 0x00ff, ' ', 1, "BIT 1,D" },
+  { 0x004B, 0x00ff, ' ', 1, "BIT 1,E" },
+  { 0x004C, 0x00ff, ' ', 1, "BIT 1,H" },
+  { 0x004D, 0x00ff, ' ', 1, "BIT 1,L" },
+  { 0x004E, 0x00ff, ' ', 1, "BIT 1,(HL)" },
+  { 0x004F, 0x00ff, ' ', 1, "BIT 1,A" },
+  { 0x0050, 0x00ff, ' ', 1, "BIT 2,B" },
+  { 0x0051, 0x00ff, ' ', 1, "BIT 2,C" },
+  { 0x0052, 0x00ff, ' ', 1, "BIT 2,D" },
+  { 0x0053, 0x00ff, ' ', 1, "BIT 2,E" },
+  { 0x0054, 0x00ff, ' ', 1, "BIT 2,H" },
+  { 0x0055, 0x00ff, ' ', 1, "BIT 2,L" },
+  { 0x0056, 0x00ff, ' ', 1, "BIT 2,(HL)" },
+  { 0x0057, 0x00ff, ' ', 1, "BIT 2,A" },
+  { 0x0058, 0x00ff, ' ', 1, "BIT 3,B" },
+  { 0x0059, 0x00ff, ' ', 1, "BIT 3,C" },
+  { 0x005A, 0x00ff, ' ', 1, "BIT 3,D" },
+  { 0x005B, 0x00ff, ' ', 1, "BIT 3,E" },
+  { 0x005C, 0x00ff, ' ', 1, "BIT 3,H" },
+  { 0x005D, 0x00ff, ' ', 1, "BIT 3,L" },
+  { 0x005E, 0x00ff, ' ', 1, "BIT 3,(HL)" },
+  { 0x005F, 0x00ff, ' ', 1, "BIT 3,A" },
+  { 0x0060, 0x00ff, ' ', 1, "BIT 4,B" },
+  { 0x0061, 0x00ff, ' ', 1, "BIT 4,C" },
+  { 0x0062, 0x00ff, ' ', 1, "BIT 4,D" },
+  { 0x0063, 0x00ff, ' ', 1, "BIT 4,E" },
+  { 0x0064, 0x00ff, ' ', 1, "BIT 4,H" },
+  { 0x0065, 0x00ff, ' ', 1, "BIT 4,L" },
+  { 0x0066, 0x00ff, ' ', 1, "BIT 4,(HL)" },
+  { 0x0067, 0x00ff, ' ', 1, "BIT 4,A" },
+  { 0x0068, 0x00ff, ' ', 1, "BIT 5,B" },
+  { 0x0069, 0x00ff, ' ', 1, "BIT 5,C" },
+  { 0x006A, 0x00ff, ' ', 1, "BIT 5,D" },
+  { 0x006B, 0x00ff, ' ', 1, "BIT 5,E" },
+  { 0x006C, 0x00ff, ' ', 1, "BIT 5,H" },
+  { 0x006D, 0x00ff, ' ', 1, "BIT 5,L" },
+  { 0x006E, 0x00ff, ' ', 1, "BIT 5,(HL)" },
+  { 0x006F, 0x00ff, ' ', 1, "BIT 5,A" },
+  { 0x0070, 0x00ff, ' ', 1, "BIT 6,B" },
+  { 0x0071, 0x00ff, ' ', 1, "BIT 6,C" },
+  { 0x0072, 0x00ff, ' ', 1, "BIT 6,D" },
+  { 0x0073, 0x00ff, ' ', 1, "BIT 6,E" },
+  { 0x0074, 0x00ff, ' ', 1, "BIT 6,H" },
+  { 0x0075, 0x00ff, ' ', 1, "BIT 6,L" },
+  { 0x0076, 0x00ff, ' ', 1, "BIT 6,(HL)" },
+  { 0x0077, 0x00ff, ' ', 1, "BIT 6,A" },
+  { 0x0078, 0x00ff, ' ', 1, "BIT 7,B" },
+  { 0x0079, 0x00ff, ' ', 1, "BIT 7,C" },
+  { 0x007A, 0x00ff, ' ', 1, "BIT 7,D" },
+  { 0x007B, 0x00ff, ' ', 1, "BIT 7,E" },
+  { 0x007C, 0x00ff, ' ', 1, "BIT 7,H" },
+  { 0x007D, 0x00ff, ' ', 1, "BIT 7,L" },
+  { 0x007E, 0x00ff, ' ', 1, "BIT 7,(HL)" },
+  { 0x007F, 0x00ff, ' ', 1, "BIT 7,A" },
+  { 0x0080, 0x00ff, ' ', 1, "RES 0,B" },
+  { 0x0081, 0x00ff, ' ', 1, "RES 0,C" },
+  { 0x0082, 0x00ff, ' ', 1, "RES 0,D" },
+  { 0x0083, 0x00ff, ' ', 1, "RES 0,E" },
+  { 0x0084, 0x00ff, ' ', 1, "RES 0,H" },
+  { 0x0085, 0x00ff, ' ', 1, "RES 0,L" },
+  { 0x0086, 0x00ff, ' ', 1, "RES 0,(HL)" },
+  { 0x0087, 0x00ff, ' ', 1, "RES 0,A" },
+  { 0x0088, 0x00ff, ' ', 1, "RES 1,B" },
+  { 0x0089, 0x00ff, ' ', 1, "RES 1,C" },
+  { 0x008A, 0x00ff, ' ', 1, "RES 1,D" },
+  { 0x008B, 0x00ff, ' ', 1, "RES 1,E" },
+  { 0x008C, 0x00ff, ' ', 1, "RES 1,H" },
+  { 0x008D, 0x00ff, ' ', 1, "RES 1,L" },
+  { 0x008E, 0x00ff, ' ', 1, "RES 1,(HL)" },
+  { 0x008F, 0x00ff, ' ', 1, "RES 1,A" },
+  { 0x0090, 0x00ff, ' ', 1, "RES 2,B" },
+  { 0x0091, 0x00ff, ' ', 1, "RES 2,C" },
+  { 0x0092, 0x00ff, ' ', 1, "RES 2,D" },
+  { 0x0093, 0x00ff, ' ', 1, "RES 2,E" },
+  { 0x0094, 0x00ff, ' ', 1, "RES 2,H" },
+  { 0x0095, 0x00ff, ' ', 1, "RES 2,L" },
+  { 0x0096, 0x00ff, ' ', 1, "RES 2,(HL)" },
+  { 0x0097, 0x00ff, ' ', 1, "RES 2,A" },
+  { 0x0098, 0x00ff, ' ', 1, "RES 3,B" },
+  { 0x0099, 0x00ff, ' ', 1, "RES 3,C" },
+  { 0x009A, 0x00ff, ' ', 1, "RES 3,D" },
+  { 0x009B, 0x00ff, ' ', 1, "RES 3,E" },
+  { 0x009C, 0x00ff, ' ', 1, "RES 3,H" },
+  { 0x009D, 0x00ff, ' ', 1, "RES 3,L" },
+  { 0x009E, 0x00ff, ' ', 1, "RES 3,(HL)" },
+  { 0x009F, 0x00ff, ' ', 1, "RES 3,A" },
+  { 0x00A0, 0x00ff, ' ', 1, "RES 4,B" },
+  { 0x00A1, 0x00ff, ' ', 1, "RES 4,C" },
+  { 0x00A2, 0x00ff, ' ', 1, "RES 4,D" },
+  { 0x00A3, 0x00ff, ' ', 1, "RES 4,E" },
+  { 0x00A4, 0x00ff, ' ', 1, "RES 4,H" },
+  { 0x00A5, 0x00ff, ' ', 1, "RES 4,L" },
+  { 0x00A6, 0x00ff, ' ', 1, "RES 4,(HL)" },
+  { 0x00A7, 0x00ff, ' ', 1, "RES 4,A" },
+  { 0x00A8, 0x00ff, ' ', 1, "RES 5,B" },
+  { 0x00A9, 0x00ff, ' ', 1, "RES 5,C" },
+  { 0x00AA, 0x00ff, ' ', 1, "RES 5,D" },
+  { 0x00AB, 0x00ff, ' ', 1, "RES 5,E" },
+  { 0x00AC, 0x00ff, ' ', 1, "RES 5,H" },
+  { 0x00AD, 0x00ff, ' ', 1, "RES 5,L" },
+  { 0x00AE, 0x00ff, ' ', 1, "RES 5,(HL)" },
+  { 0x00AF, 0x00ff, ' ', 1, "RES 5,A" },
+  { 0x00B0, 0x00ff, ' ', 1, "RES 6,B" },
+  { 0x00B1, 0x00ff, ' ', 1, "RES 6,C" },
+  { 0x00B2, 0x00ff, ' ', 1, "RES 6,D" },
+  { 0x00B3, 0x00ff, ' ', 1, "RES 6,E" },
+  { 0x00B4, 0x00ff, ' ', 1, "RES 6,H" },
+  { 0x00B5, 0x00ff, ' ', 1, "RES 6,L" },
+  { 0x00B6, 0x00ff, ' ', 1, "RES 6,(HL)" },
+  { 0x00B7, 0x00ff, ' ', 1, "RES 6,A" },
+  { 0x00B8, 0x00ff, ' ', 1, "RES 7,B" },
+  { 0x00B9, 0x00ff, ' ', 1, "RES 7,C" },
+  { 0x00BA, 0x00ff, ' ', 1, "RES 7,D" },
+  { 0x00BB, 0x00ff, ' ', 1, "RES 7,E" },
+  { 0x00BC, 0x00ff, ' ', 1, "RES 7,H" },
+  { 0x00BD, 0x00ff, ' ', 1, "RES 7,L" },
+  { 0x00BE, 0x00ff, ' ', 1, "RES 7,(HL)" },
+  { 0x00BF, 0x00ff, ' ', 1, "RES 7,A" },
+  { 0x00C0, 0x00ff, ' ', 1, "SET 0,B" },
+  { 0x00C1, 0x00ff, ' ', 1, "SET 0,C" },
+  { 0x00C2, 0x00ff, ' ', 1, "SET 0,D" },
+  { 0x00C3, 0x00ff, ' ', 1, "SET 0,E" },
+  { 0x00C4, 0x00ff, ' ', 1, "SET 0,H" },
+  { 0x00C5, 0x00ff, ' ', 1, "SET 0,L" },
+  { 0x00C6, 0x00ff, ' ', 1, "SET 0,(HL)" },
+  { 0x00C7, 0x00ff, ' ', 1, "SET 0,A" },
+  { 0x00C8, 0x00ff, ' ', 1, "SET 1,B" },
+  { 0x00C9, 0x00ff, ' ', 1, "SET 1,C" },
+  { 0x00CA, 0x00ff, ' ', 1, "SET 1,D" },
+  { 0x00CB, 0x00ff, ' ', 1, "SET 1,E" },
+  { 0x00CC, 0x00ff, ' ', 1, "SET 1,H" },
+  { 0x00CD, 0x00ff, ' ', 1, "SET 1,L" },
+  { 0x00CE, 0x00ff, ' ', 1, "SET 1,(HL)" },
+  { 0x00CF, 0x00ff, ' ', 1, "SET 1,A" },
+  { 0x00D0, 0x00ff, ' ', 1, "SET 2,B" },
+  { 0x00D1, 0x00ff, ' ', 1, "SET 2,C" },
+  { 0x00D2, 0x00ff, ' ', 1, "SET 2,D" },
+  { 0x00D3, 0x00ff, ' ', 1, "SET 2,E" },
+  { 0x00D4, 0x00ff, ' ', 1, "SET 2,H" },
+  { 0x00D5, 0x00ff, ' ', 1, "SET 2,L" },
+  { 0x00D6, 0x00ff, ' ', 1, "SET 2,(HL)" },
+  { 0x00D7, 0x00ff, ' ', 1, "SET 2,A" },
+  { 0x00D8, 0x00ff, ' ', 1, "SET 3,B" },
+  { 0x00D9, 0x00ff, ' ', 1, "SET 3,C" },
+  { 0x00DA, 0x00ff, ' ', 1, "SET 3,D" },
+  { 0x00DB, 0x00ff, ' ', 1, "SET 3,E" },
+  { 0x00DC, 0x00ff, ' ', 1, "SET 3,H" },
+  { 0x00DD, 0x00ff, ' ', 1, "SET 3,L" },
+  { 0x00DE, 0x00ff, ' ', 1, "SET 3,(HL)" },
+  { 0x00DF, 0x00ff, ' ', 1, "SET 3,A" },
+  { 0x00E0, 0x00ff, ' ', 1, "SET 4,B" },
+  { 0x00E1, 0x00ff, ' ', 1, "SET 4,C" },
+  { 0x00E2, 0x00ff, ' ', 1, "SET 4,D" },
+  { 0x00E3, 0x00ff, ' ', 1, "SET 4,E" },
+  { 0x00E4, 0x00ff, ' ', 1, "SET 4,H" },
+  { 0x00E5, 0x00ff, ' ', 1, "SET 4,L" },
+  { 0x00E6, 0x00ff, ' ', 1, "SET 4,(HL)" },
+  { 0x00E7, 0x00ff, ' ', 1, "SET 4,A" },
+  { 0x00E8, 0x00ff, ' ', 1, "SET 5,B" },
+  { 0x00E9, 0x00ff, ' ', 1, "SET 5,C" },
+  { 0x00EA, 0x00ff, ' ', 1, "SET 5,D" },
+  { 0x00EB, 0x00ff, ' ', 1, "SET 5,E" },
+  { 0x00EC, 0x00ff, ' ', 1, "SET 5,H" },
+  { 0x00ED, 0x00ff, ' ', 1, "SET 5,L" },
+  { 0x00EE, 0x00ff, ' ', 1, "SET 5,(HL)" },
+  { 0x00EF, 0x00ff, ' ', 1, "SET 5,A" },
+  { 0x00F0, 0x00ff, ' ', 1, "SET 6,B" },
+  { 0x00F1, 0x00ff, ' ', 1, "SET 6,C" },
+  { 0x00F2, 0x00ff, ' ', 1, "SET 6,D" },
+  { 0x00F3, 0x00ff, ' ', 1, "SET 6,E" },
+  { 0x00F4, 0x00ff, ' ', 1, "SET 6,H" },
+  { 0x00F5, 0x00ff, ' ', 1, "SET 6,L" },
+  { 0x00F6, 0x00ff, ' ', 1, "SET 6,(HL)" },
+  { 0x00F7, 0x00ff, ' ', 1, "SET 6,A" },
+  { 0x00F8, 0x00ff, ' ', 1, "SET 7,B" },
+  { 0x00F9, 0x00ff, ' ', 1, "SET 7,C" },
+  { 0x00FA, 0x00ff, ' ', 1, "SET 7,D" },
+  { 0x00FB, 0x00ff, ' ', 1, "SET 7,E" },
+  { 0x00FC, 0x00ff, ' ', 1, "SET 7,H" },
+  { 0x00FD, 0x00ff, ' ', 1, "SET 7,L" },
+  { 0x00FE, 0x00ff, ' ', 1, "SET 7,(HL)" },
+  { 0x00FF, 0x00ff, ' ', 1, "SET 7,A" },
+  { 0, 0, 0, 0, NULL }
+};
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/z80.src/inst.cc sdcc-3.2.0+dfsg/sim/ucsim/z80.src/inst.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/z80.src/inst.cc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/z80.src/inst.cc	2012-03-14 20:37:02.000000000 +0000
@@ -1068,15 +1068,13 @@
 int
 cl_z80::inst_call(t_mem code)
 {
-  int jnk;
-
   switch(code) {
     case 0xC4: // CALL NZ,nnnn
       if (!(regs.F & BIT_Z)) {
         push2(PC+2);
         PC = fetch2();
       } else {
-        jnk = fetch2();
+        fetch2();
       }
     break;
     case 0xCC: // CALL Z,nnnn
@@ -1084,7 +1082,7 @@
         push2(PC+2);
         PC = fetch2();
       } else {
-        jnk = fetch2();
+        fetch2();
       }
     break;
     case 0xCD: // CALL nnnn
@@ -1096,7 +1094,7 @@
         push2(PC+2);
         PC = fetch2();
       } else {
-        jnk = fetch2();
+        fetch2();
       }
     break;
     case 0xDC: // CALL C,nnnn
@@ -1104,7 +1102,7 @@
         push2(PC+2);
         PC = fetch2();
       } else {
-        jnk = fetch2();
+        fetch2();
       }
     break;
     case 0xE4: // CALL PO,nnnn
@@ -1112,7 +1110,7 @@
         push2(PC+2);
         PC = fetch2();
       } else {
-        jnk = fetch2();
+        fetch2();
       }
     break;
     case 0xEC: // CALL PE,nnnn
@@ -1120,7 +1118,7 @@
         push2(PC+2);
         PC = fetch2();
       } else {
-        jnk = fetch2();
+        fetch2();
       }
     break;
     case 0xF4: // CALL P,nnnn
@@ -1128,7 +1126,7 @@
         push2(PC+2);
         PC = fetch2();
       } else {
-        jnk = fetch2();
+        fetch2();
       }
     break;
     case 0xFC: // CALL M,nnnn
@@ -1136,7 +1134,7 @@
         push2(PC+2);
         PC = fetch2();
       } else {
-        jnk = fetch2();
+        fetch2();
       }
     break;
     default:
@@ -1280,14 +1278,12 @@
 int
 cl_z80::inst_jp(t_mem code)
 {
-  int jnk;
-
   switch (code) {
     case 0xC2: // JP NZ,nnnn
       if (!(regs.F & BIT_Z)) {
         PC = fetch2();
       } else {
-        jnk = fetch2();
+        fetch2();
       }
     break;
 
@@ -1299,7 +1295,7 @@
       if (regs.F & BIT_Z) {
         PC = fetch2();
       } else {
-        jnk = fetch2();
+        fetch2();
       }
     break;
 
@@ -1307,7 +1303,7 @@
       if (!(regs.F & BIT_C)) {
         PC = fetch2();
       } else {
-        jnk = fetch2();
+        fetch2();
       }
     break;
 
@@ -1315,7 +1311,7 @@
       if (regs.F & BIT_C) {
         PC = fetch2();
       } else {
-        jnk = fetch2();
+        fetch2();
       }
     break;
 
@@ -1323,7 +1319,7 @@
       if (!(regs.F & BIT_P)) {
         PC = fetch2();
       } else {
-        jnk = fetch2();
+        fetch2();
       }
     break;
 
@@ -1335,7 +1331,7 @@
       if (regs.F & BIT_P) {
         PC = fetch2();
       } else {
-        jnk = fetch2();
+        fetch2();
       }
     break;
 
@@ -1343,7 +1339,7 @@
       if (!(regs.F & BIT_S)) {
         PC = fetch2();
       } else {
-        jnk = fetch2();
+        fetch2();
       }
     break;
 
@@ -1351,7 +1347,7 @@
       if (regs.F & BIT_S) {
         PC = fetch2();
       } else {
-        jnk = fetch2();
+        fetch2();
       }
     break;
     default:
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/z80.src/inst_ed.cc sdcc-3.2.0+dfsg/sim/ucsim/z80.src/inst_ed.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/z80.src/inst_ed.cc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/z80.src/inst_ed.cc	2012-05-15 03:59:44.000000000 +0000
@@ -34,39 +34,25 @@
 #include "z80mac.h"
 
 
-int
-cl_z80::inst_ed_(t_mem code)
+int  cl_z80::inst_ed_(t_mem code)
 {
-  switch(code) {
-  }
-  return(resGO);
-}
-
-/******** start ED codes *****************/
-int
-cl_z80::inst_ed(void)
-{
-  t_mem code;
   unsigned short tw;
-
-  if (fetch(&code))
-    return(resBREAKPOINT);
-
-  switch (code)
-  {
+  
+  switch(code)
+    {
 #if 0
     case 0x40: // IN B,(C)
-    return(resGO);
+      return(resGO);
     case 0x41: // OUT (C),B
-    return(resGO);
+      return(resGO);
 #endif
     case 0x42: // SBC HL,BC
       sbc_HL_wordreg(regs.BC);
-    return(resGO);
+      return(resGO);
     case 0x43: // LD (nnnn),BC
       tw = fetch2();
       store2(tw, regs.BC);
-    return(resGO);
+      return(resGO);
     case 0x44: // NEG
       regs.F &= ~(BIT_ALL);  /* clear these */
       if (regs.A != 0)    regs.F |= BIT_C;
@@ -76,156 +62,156 @@
       regs.F |= BIT_N; /* not addition */
       if (regs.A == 0)    regs.F |= BIT_Z;
       if (regs.A & 0x80)  regs.F |= BIT_S;
-    return(resGO);
+      return(resGO);
     case 0x45: // RETN (return from non-maskable interrupt)
       pop2(PC);
-    return(resGO);
+      return(resGO);
 #if 0
     case 0x46: // IM 0
       /* interrupt device puts opcode on data bus */
-    return(resGO);
+      return(resGO);
 #endif
     case 0x47: // LD IV,A
       regs.iv = regs.A;
-    return(resGO);
+      return(resGO);
 
     case 0x48: // IN C,(C)
-    return(resGO);
+      return(resGO);
     case 0x49: // OUT (C),C
-    return(resGO);
+      return(resGO);
 
     case 0x4A: // ADC HL,BC
       adc_HL_wordreg(regs.BC);
-    return(resGO);
+      return(resGO);
     case 0x4B: // LD BC,(nnnn)
       tw = fetch2();
       regs.BC = get2(tw);
-    return(resGO);
-	case 0x4C: // MLT BC
+      return(resGO);
+    case 0x4C: // MLT BC
       if(type != CPU_Z180)
         return(resINV_INST);
       regs.BC = (unsigned long)(regs.bc.h) * (unsigned long)(regs.bc.l);
-    return(resGO);
+      return(resGO);
     case 0x4D: // RETI (return from interrupt)
       pop2(PC);
-    return(resGO);
+      return(resGO);
     case 0x4F: // LD R,A
       /* Load "refresh" register(whats that?) */
-    return(resGO);
+      return(resGO);
 
     case 0x50: // IN D,(C)
-    return(resGO);
+      return(resGO);
     case 0x51: // OUT (C),D
-    return(resGO);
+      return(resGO);
 
     case 0x52: // SBC HL,DE
       sbc_HL_wordreg(regs.DE);
-    return(resGO);
+      return(resGO);
     case 0x53: // LD (nnnn),DE
       tw = fetch2();
       store2(tw, regs.DE);
-    return(resGO);
+      return(resGO);
 #if 0
     case 0x56: // IM 1
-    return(resGO);
+      return(resGO);
 #endif
     case 0x57: // LD A,IV
       regs.A = regs.iv;
-    return(resGO);
+      return(resGO);
 
     case 0x58: // IN E,(C)
-    return(resGO);
+      return(resGO);
     case 0x59: // OUT (C),E
-    return(resGO);
+      return(resGO);
 
     case 0x5A: // ADC HL,DE
       adc_HL_wordreg(regs.DE);
-    return(resGO);
+      return(resGO);
     case 0x5B: // LD DE,(nnnn)
       tw = fetch2();
       regs.DE = get2(tw);
-    return(resGO);
+      return(resGO);
     case 0x5C: // MLT DE
       if(type != CPU_Z180)
         return(resINV_INST);
       regs.DE = (unsigned long)(regs.de.h) * (unsigned long)(regs.de.l);
-    return(resGO);
+      return(resGO);
 #if 0
     case 0x5E: // IM 2
-    return(resGO);
+      return(resGO);
     case 0x5F: // LD A,R
-    return(resGO);
+      return(resGO);
     case 0x60: // IN H,(C)
-    return(resGO);
+      return(resGO);
     case 0x61: // OUT (C),H
-    return(resGO);
+      return(resGO);
 #endif
     case 0x62: // SBC HL,HL
       sbc_HL_wordreg(regs.HL);
-    return(resGO);
+      return(resGO);
     case 0x63: // LD (nnnn),HL opcode 22 does the same faster
       tw = fetch2();
       store2(tw, regs.HL);
-    return(resGO);
+      return(resGO);
 
 #if 0
     case 0x67: // RRD
-    return(resGO);
+      return(resGO);
 #endif
     case 0x68: // IN L,(C)
-    return(resGO);
+      return(resGO);
     case 0x69: // OUT (C),L
-    return(resGO);
+      return(resGO);
 
     case 0x6A: // ADC HL,HL
       adc_HL_wordreg(regs.HL);
-    return(resGO);
+      return(resGO);
     case 0x6B: // LD HL,(nnnn) opcode 2A does the same faster
       tw = fetch2();
       regs.HL = get2(tw);
-    return(resGO);
+      return(resGO);
     case 0x6C: // MLT HL
       if(type != CPU_Z180)
         return(resINV_INST);
       regs.HL = (unsigned long)(regs.hl.h) * (unsigned long)(regs.hl.l);
-    return(resGO);
+      return(resGO);
 #if 0
     case 0x6F: // RLD
       /* rotate 1 bcd digit left between ACC and memory location */
-    return(resGO);
+      return(resGO);
 #endif
 
     case 0x70: // IN (C)  set flags only (TSTI)
-    return(resGO);
+      return(resGO);
     case 0x71: //  OUT (C),0
-    return(resGO);
+      return(resGO);
 
     case 0x72: // SBC HL,SP
       sbc_HL_wordreg(regs.SP);
-    return(resGO);
+      return(resGO);
     case 0x73: // LD (nnnn),SP
       tw = fetch2();
       store2(tw, regs.SP);
-    return(resGO);
+      return(resGO);
 
     case 0x78: // IN A,(C)
-    return(resGO);
+      return(resGO);
     case 0x79: // OUT (C),A
-    return(resGO);
+      return(resGO);
 
     case 0x7A: // ADC HL,SP
       adc_HL_wordreg(regs.SP);
-    return(resGO);
+      return(resGO);
     case 0x7B: // LD SP,(nnnn)
       tw = fetch2();
       regs.SP = get2(tw);
-    return(resGO);
+      return(resGO);
 
     case 0x7C: // MLT SP
       //if(type != CPU_Z180)
-        return(resINV_INST);
+      return(resINV_INST);
       //regs.SP = (unsigned long)(regs.sp.h) * (unsigned long)(regs.sp.l);
-    return(resGO);
+      return(resGO);
     case 0xA0: // LDI
       // BC - count, sourc=HL, dest=DE.  *DE++ = *HL++, --BC until zero
       regs.F &= ~(BIT_P | BIT_N | BIT_A);  /* clear these */
@@ -234,7 +220,7 @@
       ++regs.DE;
       --regs.BC;
       if (regs.BC != 0) regs.F |= BIT_P;
-    return(resGO);
+      return(resGO);
     case 0xA1: // CPI
       // compare acc with mem(HL), if ACC=0 set Z flag.  Incr HL, decr BC.
       {
@@ -245,12 +231,12 @@
         --regs.BC;
         if (regs.BC != 0) regs.F |= BIT_P;
       }
-    return(resGO);
+      return(resGO);
 
     case 0xA2: // INI
-    return(resGO);
+      return(resGO);
     case 0xA3: // OUTI
-    return(resGO);
+      return(resGO);
 
     case 0xA8: // LDD
       // BC - count, source=HL, dest=DE.  *DE-- = *HL--, --BC until zero
@@ -260,7 +246,7 @@
       --regs.DE;
       --regs.BC;
       if (regs.BC != 0) regs.F |= BIT_P;
-    return(resGO);
+      return(resGO);
     case 0xA9: // CPD
 /* fixme: checkme, compare to other emul. */
 
@@ -272,12 +258,12 @@
       --regs.BC;
       if (regs.BC != 0) regs.F |= BIT_P;
 
-    return(resGO);
+      return(resGO);
 
     case 0xAA: // IND
-    return(resGO);
+      return(resGO);
     case 0xAB: // OUTD
-    return(resGO);
+      return(resGO);
 
     case 0xB0: // LDIR
       // BC - count, sourc=HL, dest=DE.  *DE++ = *HL++, --BC until zero
@@ -288,7 +274,7 @@
         ++regs.DE;
         --regs.BC;
       } while (regs.BC != 0);
-    return(resGO);
+      return(resGO);
 
     case 0xB1: // CPIR
       // compare acc with mem(HL), if ACC=0 set Z flag.  Incr HL, decr BC.
@@ -310,12 +296,12 @@
       if(regs.BC != 0)
         regs.F |= BIT_P;
 
-    return(resGO);
+      return(resGO);
 #if 0
     case 0xB2: // INIR
-    return(resGO);
+      return(resGO);
     case 0xB3: // OTIR
-    return(resGO);
+      return(resGO);
 #endif
     case 0xB8: // LDDR
       // BC - count, source=HL, dest=DE.  *DE-- = *HL--, --BC until zero
@@ -326,7 +312,7 @@
         --regs.DE;
         --regs.BC;
       } while (regs.BC != 0);
-    return(resGO);
+      return(resGO);
     case 0xB9: // CPDR
       // compare acc with mem(HL), if ACC=0 set Z flag.  Incr HL, decr BC.
       regs.F &= ~(BIT_ALL);  /* clear these */
@@ -338,19 +324,30 @@
         --regs.HL;
         --regs.BC;
       } while (regs.BC != 0);
-    return(resGO);
+      return(resGO);
 #if 0
     case 0xBA: // INDR
-    return(resGO);
+      return(resGO);
     case 0xBB: // OTDR
-    return(resGO);
+      return(resGO);
 #endif
 
     default:
-    return(resINV_INST);
-  }
+      return(resINV_INST);
+    }
+  
+  return(resGO);
+}
 
-  return(resINV_INST);
+/******** start ED codes *****************/
+int  cl_z80::inst_ed(void)
+{
+  t_mem code;
+
+  if (fetch(&code))
+    return(resBREAKPOINT);
+  
+  return inst_ed_(code);
 }
 
 /* End of z80.src/inst_ed.cc */
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/z80.src/inst_ed_r2k.cc sdcc-3.2.0+dfsg/sim/ucsim/z80.src/inst_ed_r2k.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/z80.src/inst_ed_r2k.cc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/z80.src/inst_ed_r2k.cc	2012-05-15 03:59:44.000000000 +0000
@@ -25,6 +25,7 @@
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA. */
 /*@1@*/
+#include <stdint.h>
 
 #include "ddconfig.h"
 
@@ -33,26 +34,12 @@
 #include "z80mac.h"
 
 
-int
-cl_r2k::inst_ed_(t_mem code)
+int  cl_r2k::inst_ed_(t_mem code)
 {
-  switch(code) {
-  }
-  return(resGO);
-}
-
-/******** start ED codes *****************/
-int
-cl_r2k::inst_ed(void)
-{
-  t_mem code;
   unsigned short tw;
-
-  if (fetch(&code))
-    return(resBREAKPOINT);
-
-  switch (code)
-  {
+  
+  switch(code)
+    {
   case 0x41:
     regs.aBC = regs.DE;
     break;
@@ -243,23 +230,29 @@
   case 0xB0: // LDIR
     // BC - count, sourc=HL, dest=DE.  *DE++ = *HL++, --BC until zero
     regs.F &= ~(BIT_P | BIT_N | BIT_A);  /* clear these */
-    do {
-      store1(regs.DE, get1(regs.HL));
-      ++regs.HL;
-      ++regs.DE;
-      --regs.BC;
-    } while (regs.BC != 0);
+    
+    tw = get1(regs.HL);
+    store1(regs.DE, tw);
+    ++regs.HL;
+    ++regs.DE;
+    --regs.BC;
+    
+    if (regs.BC != 0)
+      PC = ins_start;
     return(resGO);
     
   case 0xB8: // LDDR
     // BC - count, source=HL, dest=DE.  *DE-- = *HL--, --BC until zero
     regs.F &= ~(BIT_P | BIT_N | BIT_A);  /* clear these */
-    do {
-      store1(regs.DE, get1(regs.HL));
-      --regs.HL;
-      --regs.DE;
-      --regs.BC;
-    } while (regs.BC != 0);
+    
+    tw = get1(regs.HL);
+    store1(regs.DE, tw);
+    --regs.HL;
+    --regs.DE;
+    --regs.BC;
+    
+    if (regs.BC != 0)
+      PC = ins_start;
     return(resGO);
     
   case 0xEA: // CALL (HL)
@@ -270,7 +263,174 @@
   
   default:
     return(resINV_INST);
-  }
+    }
   
   return(resGO);
 }
+
+int  cl_r3ka::inst_ed_(t_mem code)
+{
+  TYPE_UBYTE  tb;
+  
+  switch(code)
+    {
+    case  0x66:  // PUSH SU
+      push1(SU);
+      return(resGO);
+      
+    case  0x6E:  // POP  SU
+      SU = get1(regs.SP);
+      regs.SP++;
+      return(resGO);
+      
+    case  0x6F:  // SETUSR
+      SU = ((SU << 2) & 0xFC) | 0x01;
+      return(resGO);
+      
+    case  0x7D:  // SURES
+      SU = ((SU >> 2) & 0x3F) | ((SU << 6) & 0xC0);
+      return(resGO);
+      
+    case  0x7F:  // RDMODE
+      regs.F &= ~(BIT_C);
+      if (SU & 0x01)
+        regs.F |= BIT_C;
+      return(resGO);
+      
+    case  0x90:  // LDISR
+      // repeat (cnt=BC) { (DE) <= (HL++) }  /* normally has io prefix */
+      /* TODO: fix IOI/IOE behavior */
+      tb = get1(regs.HL);
+      store1( regs.DE, tb );
+      regs.HL++;
+      regs.BC--;
+      if (regs.BC)
+        PC = ins_start;
+      return(resGO);
+      
+    case  0x98:  // LDDSR
+      /* TODO: fix IOI/IOE behavior */
+      // repeat (cnt=BC) { (DE) <= (HL--) }  /* normally has io prefix */
+      tb = get1(regs.HL);
+      store1( regs.DE, tb );
+      regs.HL--;
+      regs.BC--;
+      if (regs.BC)
+        PC = ins_start;
+      return(resGO);
+
+    case  0xC0:  // UMA
+      // repeat while BC != 0:
+      // {CF:DE':(HL)} <= (IX) + [(IY)*DE + DE' + CF];
+      // BC--; IX++; IY++; HL++;
+      {
+        uint32_t  tmp;
+        
+        /* scale a sum for operand pointed to by IY */
+        tmp  = get1(regs.IY);
+        tmp *= regs.DE;
+        tmp += regs.aDE;
+        tmp += (regs.F & BIT_C) ? 1 : 0;
+        
+        /* simple add for operand pointed to by IX */
+        tmp += get1(regs.IX);
+        
+        /* store the result(s) */
+        store1( regs.HL, tmp & 0xFF );
+        regs.aDE = ((tmp >> 8) & 0xFFFF);
+        regs.F &= ~(BIT_C);
+        regs.F |= (tmp >> 24) ? BIT_C : 0;
+      }
+      
+      regs.IX++;
+      regs.IY++;
+      regs.HL++;
+      regs.BC--;
+      if (regs.BC)
+        PC = ins_start;
+      return(resGO);
+      
+    case  0xC8:  // UMS
+      // repeat while BC != 0:
+      // {CF:DE':(HL)} <= (IX) - [(IY)*DE + DE' + CF];
+      // BC--; IX++; IY++; HL++;
+      {
+        uint32_t  tmp;
+        
+        /* scale a sum for operand pointed to by IY */
+        tmp  = get1(regs.IY);
+        tmp *= regs.DE;
+        tmp += regs.aDE;
+        tmp += (regs.F & BIT_C) ? 1 : 0;
+        
+        /* subtract above from operand pointed to by IX */
+        tmp = get1(regs.IX) - tmp;
+        
+        /* store the result(s) */
+        store1( regs.HL, tmp & 0xFF );
+        regs.aDE = ((tmp >> 8) & 0xFFFF);
+        regs.F &= ~(BIT_C);
+        regs.F |= (tmp >> 24) ? BIT_C : 0;
+      }
+      
+      regs.IX++;
+      regs.IY++;
+      regs.HL++;
+      regs.BC--;
+      if (regs.BC)
+        PC = ins_start;
+      return(resGO);
+
+    case  0xD0:  // LSIDR
+      /* TODO: fix IOI/IOE behavior */
+      // repeat (cnt=BC) { (DE++) <= (HL) }  /* normally has io prefix */
+      tb = get1( regs.HL );
+      store1( regs.DE, tb );
+      regs.DE++;
+      regs.BC--;
+      if (regs.BC)
+        PC = ins_start;
+      return(resGO);
+      
+    case 0xD8:   // LSDDR
+      /* TODO: fix IOI/IOE behavior */
+      // repeat (cnt=BC) { (DE--) <= (HL) }  /* normally has io prefix */
+      tb = get1( regs.HL );
+      store1( regs.DE, tb );
+      regs.DE--;
+      regs.BC--;
+      if (regs.BC)
+        PC = ins_start;
+      return(resGO);
+      
+    case  0xF0:  // LSIR
+      /* TODO: fix IOI/IOE behavior */
+      //  repeat (cnt=BC) { (DE++) <= (HL++) }
+      tb = get1( regs.HL );
+      store1( regs.DE, tb );
+      regs.DE++;
+      regs.HL++;
+      regs.BC--;
+      if (regs.BC)
+        PC = ins_start;
+      return(resGO);
+      
+    case  0xF8:  // LSDR
+      /* TODO: fix IOI/IOE behavior */
+      //  repeat (cnt=BC) { (DE--) <= (HL--) }
+      tb = get1( regs.HL );
+      store1( regs.DE, tb );
+      regs.DE--;
+      regs.HL--;
+      regs.BC--;
+      if (regs.BC)
+        PC = ins_start;
+      return(resGO);
+      
+    default:
+      return cl_r2k::inst_ed_(code);
+    }
+}
+
+//IDET        system mode violation interrupt if in user mode
+
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/z80.src/inst_lr35902.cc sdcc-3.2.0+dfsg/sim/ucsim/z80.src/inst_lr35902.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/z80.src/inst_lr35902.cc	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/z80.src/inst_lr35902.cc	2012-01-15 19:03:15.000000000 +0000
@@ -0,0 +1,176 @@
+/*
+ * Simulated instructions specific to the LR35902, the Z-80 derivative used
+ * in the gameboy.
+ *
+ * 2011-12-21  created by Leland Morrison
+ *
+ *
+
+This file is part of microcontroller simulator: ucsim.
+
+UCSIM is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+UCSIM 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 UCSIM; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA. */
+/*@1@*/
+#include "ddconfig.h"
+
+#include "lr35902cl.h"
+
+static TYPE_UBYTE  swap_nibbles(TYPE_UBYTE  val) {
+  return ((val >> 4) & 0x0f) | ((val << 4) & 0xf0);
+}
+
+int cl_lr35902::inst_cb(void) {
+  TYPE_UBYTE  result;
+  t_mem       code;
+  
+  if ( (peek1( ) & 0xf8) != 0x30 )
+    return cl_z80::inst_cb( );
+  
+  code = fetch1();
+  
+  /* perform SWAP instead of slia */
+  switch(code) {
+  case 0x30: result = regs.bc.h = swap_nibbles(regs.bc.h); break; /* b */
+  case 0x31: result = regs.bc.l = swap_nibbles(regs.bc.l); break; /* c */
+  case 0x32: result = regs.de.h = swap_nibbles(regs.de.h); break; /* d */
+  case 0x33: result = regs.de.l = swap_nibbles(regs.de.l); break; /* e */
+  case 0x34: result = regs.hl.l = swap_nibbles(regs.hl.h); break; /* h */
+  case 0x35: result = regs.hl.h = swap_nibbles(regs.hl.l); break; /* l */
+  case 0x36: /* SWAP (HL) */
+    {
+      result = swap_nibbles(get1(regs.HL));
+      store1(regs.HL, result);
+    }
+    break;
+    
+  case 0x37: result = regs.A = swap_nibbles(regs.A); break; /* swap a */
+  default: return resINV_INST;
+  }
+  regs.F = (result)?0:0x80;  // all except zero are simply cleared
+  return(resGO);
+}
+
+int cl_lr35902::inst_st_sp_abs(t_mem code) {
+  if (code == 0x08) {
+    TYPE_UWORD addr = fetch2( );
+    store2( addr, regs.SP );
+    return(resGO);
+  }
+  
+  return resINV_INST;
+}
+
+int cl_lr35902::inst_stop0    (t_mem code) {
+  // TODO: change to wait for a signal for simulated hardware
+  return resHALT;
+}
+
+int cl_lr35902::inst_ldi   (t_mem code) {
+  if (code == 0x22) {
+    store1( regs.HL, regs.A );
+    regs.HL ++;
+    return resGO;
+  } else if (code == 0x2A) {
+    regs.A = get1( regs.HL );
+    regs.HL ++;
+    return resGO;
+  }
+  
+  return resINV_INST;
+}
+
+int cl_lr35902::inst_ldd   (t_mem code) {
+  if (code == 0x32) {
+    store1( regs.HL, regs.A );
+    regs.HL --;
+    return resGO;
+  } else if (code == 0x3A) {
+    regs.A = get1( regs.HL );
+    regs.HL --;
+    return resGO;
+  }
+  
+  return resINV_INST;
+}
+
+int cl_lr35902::inst_ldh   (t_mem code) {
+  TYPE_UWORD addr = 0xFF00 + fetch1( );
+  
+  if (code == 0xE0) {
+    store1( addr, regs.A );
+    return resGO;
+  } else if (code == 0xF0) {
+    regs.A = get1( addr );
+    return resGO;
+  }
+  
+  return resINV_INST;
+}
+  
+int cl_lr35902::inst_reti  (t_mem code) {
+  /* enable interrupts */
+  cl_z80::inst_ei(0xFB);
+  
+  /* pop2(PC); */
+  PC=get2(regs.SP);
+  regs.SP+=2;
+  
+  return resGO;
+}
+
+int cl_lr35902::inst_add_sp_d(t_mem code) {
+  TYPE_UWORD  d = fetch( );
+  /* sign-extend d from 8-bits to 16-bits */
+  d |= (d>>7)*0xFF00;
+  
+  regs.F &= ~(BIT_ALL);  /* clear these */
+  if ((regs.SP & 0x0FFF) + (d & 0x0FFF) > 0x0FFF)
+    regs.F |= BIT_A;
+  if (regs.SP + (int)(d) > 0xffff)
+    regs.F |= BIT_C;
+  
+  regs.SP = (regs.SP + d) & 0xffff;
+
+  return(resGO);
+}
+
+int cl_lr35902::inst_ld16  (t_mem code) {
+  TYPE_UWORD addr = fetch2( );
+  if (code == 0xEA) {
+    store1( addr, regs.A );
+    return resGO;
+  } else if (code == 0xFA) {
+    regs.A = get1( addr );
+    return resGO;
+  }
+  
+  return resINV_INST;
+}
+
+int cl_lr35902::inst_ldhl_sp (t_mem code) {
+  TYPE_UWORD  d = fetch( );
+  /* sign-extend d from 8-bits to 16-bits */
+  d |= (d>>7)*0xFF00;
+
+  regs.F &= ~(BIT_ALL);  /* clear these */
+  if ((regs.SP & 0x0FFF) + (d & 0x0FFF) > 0x0FFF)
+    regs.F |= BIT_A;
+  if (regs.SP + (int)(d) > 0xffff)
+    regs.F |= BIT_C;
+  
+  regs.HL = (regs.SP + d) & 0xffff;
+  return resGO;
+}
+
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/z80.src/inst_r2k.cc sdcc-3.2.0+dfsg/sim/ucsim/z80.src/inst_r2k.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/z80.src/inst_r2k.cc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/z80.src/inst_r2k.cc	2012-06-21 15:18:30.000000000 +0000
@@ -170,7 +170,10 @@
 
 /******** start rabbit 2000 specific codes *****************/
 int cl_r2k::inst_add_sp_d(t_mem code) {
-  regs.SP = add_u16_disp(regs.SP, fetch());
+  TYPE_UWORD  d = fetch( );
+  /* sign-extend d from 8-bits to 16-bits */
+  d |= (d>>7)*0xFF00;
+  regs.SP = (regs.SP + d) & 0xffff;
   return(resGO);
 }
 
@@ -292,8 +295,11 @@
 }
 
 int cl_r2k::inst_rl_de(t_mem code) {
-  regs.F = (regs.F & ~BIT_C) | (((regs.DE >> 15) & 1U) << BITPOS_C);
-  regs.DE = (regs.DE << 1) | ((regs.F & BIT_C) >> BITPOS_C);
+  unsigned int oldcarry = (regs.F & BIT_C);
+  
+  regs.F &= ~BIT_ALL;
+  regs.F |= (((regs.DE >> 15) & 1U) << BITPOS_C);
+  regs.DE = (regs.DE << 1) | (oldcarry >> BITPOS_C);
   
   if (regs.DE & 0x8000)
     regs.F |= BIT_S;
@@ -305,8 +311,11 @@
 }
 
 int cl_r2k::inst_rr_de(t_mem code) {
-  regs.F = (regs.F & ~BIT_C) | ((regs.DE & 1) << BITPOS_C);
-  regs.DE = (regs.DE >> 1) | ((regs.F & BIT_C) << (15 - BITPOS_C));
+  unsigned int oldcarry = (regs.F & BIT_C);
+
+  regs.F &= ~BIT_ALL;
+  regs.F |= ((regs.DE & 1) << BITPOS_C);
+  regs.DE = (regs.DE >> 1) | (oldcarry << (15 - BITPOS_C));
   
   if (regs.DE & 0x8000)
     regs.F |= BIT_S;
@@ -319,8 +328,11 @@
 
 int cl_r2k::inst_rr_hl(t_mem code)    // RR HL
 {
-  regs.F = (regs.F & ~BIT_C) | ((regs.HL & 1) << BITPOS_C);
-  regs.HL = (regs.HL >> 1) | ((regs.F & BIT_C) << (15 - BITPOS_C));
+  unsigned int oldcarry = (regs.F & BIT_C);
+  
+  regs.F &= ~BIT_ALL;
+  regs.F |= ((regs.HL & 1) << BITPOS_C);
+  regs.HL = (regs.HL >> 1) | (oldcarry << (15 - BITPOS_C));
   
   if (regs.HL & 0x8000)
     regs.F |= BIT_S;
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/z80.src/lr35902.cc sdcc-3.2.0+dfsg/sim/ucsim/z80.src/lr35902.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/z80.src/lr35902.cc	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/z80.src/lr35902.cc	2012-01-10 04:32:27.000000000 +0000
@@ -0,0 +1,571 @@
+/*
+ * Simulator for the LR35902 used in the gb console.
+ * The processor is closely related to the Z-80, so the C++
+ * emulator object inherits from it.
+ *
+ */
+
+/* This file is part of microcontroller simulator: ucsim.
+
+ UCSIM is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ 
+ UCSIM 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 UCSIM; see the file COPYING.  If not, write to the Free
+ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA. */
+/*@1@*/
+
+#include "ddconfig.h"
+
+#include <stdarg.h> /* for va_list */
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include "i_string.h"
+
+// prj
+#include "pobjcl.h"
+
+// sim
+#include "simcl.h"
+
+// local
+#include "z80cl.h"
+#include "lr35902cl.h"
+#include "glob.h"
+
+#define uint32 t_addr
+#define uint8 unsigned char
+
+/*******************************************************************/
+
+lr35902_memory::lr35902_memory( cl_uc &uc_parent_ref ):uc_r(uc_parent_ref) { }
+
+cl_lr35902::cl_lr35902(int Itype, int Itech, class cl_sim *asim):
+  cl_z80(Itype, Itech, asim), mem(*this)
+{
+  type= Itype;
+}
+
+int
+cl_lr35902::init(void)
+{
+  cl_uc::init(); /* Memories now exist */
+
+  rom= address_space(MEM_ROM_ID);  // code goes here...
+  
+  //  ram= mem(MEM_XRAM);
+  ram= address_space(MEM_XRAM_ID);  // data goes here...
+  
+  
+  // zero out ram(this is assumed in regression tests)
+  for (int i=0xA000; i<0xFF80; i++) {
+    ram->set((t_addr) i, 0);
+  }
+
+  return(0);
+}
+
+const char *
+cl_lr35902::id_string(void)
+{
+  return("LR35902");
+}
+
+
+void
+cl_lr35902::mk_hw_elements(void)
+{
+  //class cl_base *o;
+  /* t_uc::mk_hw() does nothing */
+}
+
+void lr35902_memory::init(void) {
+  cl_address_space *as_rom;
+  cl_address_space *as_ram;
+  
+  as_rom = new cl_address_space(MEM_ROM_ID,
+				lr35902_rom_start, lr35902_rom_size, 8);
+  as_rom->init();
+  uc_r.address_spaces->add(as_rom);
+  rom = as_rom;
+  
+  as_ram = new cl_address_space(MEM_XRAM_ID,
+				lr35902_ram_start, lr35902_ram_size, 8);
+  as_ram->init();
+  uc_r.address_spaces->add(as_ram);
+  ram = as_ram;
+}
+
+void
+cl_lr35902::make_memories(void)
+{
+  mem.init( );
+}
+
+
+void cl_lr35902::store1( TYPE_UWORD addr, t_mem val ) {
+  mem.store1( addr, val );
+}
+
+void cl_lr35902::store2( TYPE_UWORD addr, TYPE_UWORD val ) {
+  mem.store2( addr, val );
+}
+
+TYPE_UBYTE  cl_lr35902::get1( TYPE_UWORD addr ) {
+  return mem.get1( addr );
+}
+
+TYPE_UWORD  cl_lr35902::get2( TYPE_UWORD addr ) {
+  return mem.get2( addr );
+}
+
+void lr35902_memory::store1( TYPE_UWORD addr, t_mem val ) {
+  if (addr < lr35902_ram_start) {
+    /* flag illegal operation ? */
+    return;
+  }
+  
+  if ((addr- lr35902_ram_start) < lr35902_ram_size) {
+    ram->set(addr, val);
+  }
+}
+
+void lr35902_memory::store2( TYPE_UWORD addr, TYPE_UWORD val ) {
+  store1(addr,   val & 0xff);
+  store1(addr+1, (val >> 8) & 0xff);
+}
+
+TYPE_UBYTE  lr35902_memory::get1( TYPE_UWORD addr ) {
+  if (addr < lr35902_rom_size) {
+    return rom->get(addr);    
+  }
+  
+  if (addr < lr35902_ram_start) {
+    /* flag illegal operation ? */
+    return (addr & 0xff);
+  }
+  
+  if ((addr-lr35902_ram_start) < lr35902_ram_size) {
+    return ram->get(addr);
+  }
+  
+  return (addr & 0xff);
+}
+
+TYPE_UWORD  lr35902_memory::get2( TYPE_UWORD addr ) {
+  TYPE_UWORD  l, h;
+  
+  l = get1(addr  );
+  h = get1(addr+1);
+  
+  return (h << 8) | l;
+}
+
+/*
+ * Help command interpreter
+ */
+
+struct dis_entry *
+cl_lr35902::dis_tbl(void)
+{
+  return(disass_lr35902);
+}
+
+
+int
+cl_lr35902::inst_length(t_addr addr)
+{
+  int len = 0;
+
+  get_disasm_info(addr, &len, NULL, NULL);
+
+  return len;
+}
+
+int
+cl_lr35902::inst_branch(t_addr addr)
+{
+  int b;
+
+  get_disasm_info(addr, NULL, &b, NULL);
+
+  return b;
+}
+
+int
+cl_lr35902::longest_inst(void)
+{
+  return 4;
+}
+
+
+const char *
+cl_lr35902::get_disasm_info(t_addr addr,
+                        int *ret_len,
+                        int *ret_branch,
+                        int *immed_offset)
+{
+  const char *b = NULL;
+  uint code;
+  int len = 0;
+  int immed_n = 0;
+  int i;
+  int start_addr = addr;
+  struct dis_entry *dis_e;
+
+  code= get_mem(MEM_ROM_ID, addr++);
+  dis_e = NULL;
+
+  switch(code) {
+    case 0xcb:  /* ESC code to lots of op-codes, all 2-byte */
+      code= get_mem(MEM_ROM_ID, addr++);
+      i= 0;
+      while ((code & disass_lr35902_cb[i].mask) != disass_lr35902_cb[i].code &&
+        disass_lr35902_cb[i].mnemonic)
+        i++;
+      dis_e = &disass_lr35902_cb[i];
+      b= disass_lr35902_cb[i].mnemonic;
+      if (b != NULL)
+        len += (disass_lr35902_cb[i].length + 1);
+    break;
+
+    default:
+      i= 0;
+      while ((code & disass_lr35902[i].mask) != disass_lr35902[i].code &&
+             disass_lr35902[i].mnemonic)
+        i++;
+      dis_e = &disass_lr35902[i];
+      b= disass_lr35902[i].mnemonic;
+      if (b != NULL)
+        len += (disass_lr35902[i].length);
+    break;
+  }
+
+
+  if (ret_branch) {
+    *ret_branch = dis_e->branch;
+  }
+
+  if (immed_offset) {
+    if (immed_n > 0)
+         *immed_offset = immed_n;
+    else *immed_offset = (addr - start_addr);
+  }
+
+  if (len == 0)
+    len = 1;
+
+  if (ret_len)
+    *ret_len = len;
+
+  return b;
+}
+
+const char *
+cl_lr35902::disass(t_addr addr, const char *sep)
+{
+  char work[256], temp[20];
+  const char *b;
+  char *buf, *p, *t;
+  int len = 0;
+  int immed_offset = 0;
+
+  p= work;
+
+  b = get_disasm_info(addr, &len, NULL, &immed_offset);
+
+  if (b == NULL) {
+    buf= (char*)malloc(30);
+    strcpy(buf, "UNKNOWN/INVALID");
+    return(buf);
+  }
+
+  while (*b)
+    {
+      if (*b == '%')
+        {
+          b++;
+          switch (*(b++))
+            {
+            case 'd': // d    jump relative target, signed? byte immediate operand
+              sprintf(temp, "#%d", (char)get_mem(MEM_ROM_ID, addr+immed_offset));
+              ++immed_offset;
+              break;
+            case 'w': // w    word immediate operand
+              sprintf(temp, "#0x%04x",
+                 (uint)((get_mem(MEM_ROM_ID, addr+immed_offset)) |
+                        (get_mem(MEM_ROM_ID, addr+immed_offset+1)<<8)) );
+              ++immed_offset;
+              ++immed_offset;
+              break;
+            case 'b': // b    byte immediate operand
+              sprintf(temp, "#0x%02x", (uint)get_mem(MEM_ROM_ID, addr+immed_offset));
+              ++immed_offset;
+              break;
+            default:
+              strcpy(temp, "?");
+              break;
+            }
+          t= temp;
+          while (*t)
+            *(p++)= *(t++);
+        }
+      else
+        *(p++)= *(b++);
+    }
+  *p= '\0';
+
+  p= strchr(work, ' ');
+  if (!p)
+    {
+      buf= strdup(work);
+      return(buf);
+    }
+  if (sep == NULL)
+    buf= (char *)malloc(6+strlen(p)+1);
+  else
+    buf= (char *)malloc((p-work)+strlen(sep)+strlen(p)+1);
+  for (p= work, t= buf; *p != ' '; p++, t++)
+    *t= *p;
+  p++;
+  *t= '\0';
+  if (sep == NULL)
+    {
+      while (strlen(buf) < 6)
+        strcat(buf, " ");
+    }
+  else
+    strcat(buf, sep);
+  strcat(buf, p);
+  return(buf);
+}
+
+
+void
+cl_lr35902::print_regs(class cl_console_base *con)
+{
+  con->dd_printf("SZ-A-PNC  Flags= 0x%02x %3d %c  ",
+                 regs.F, regs.F, isprint(regs.F)?regs.F:'.');
+  con->dd_printf("A= 0x%02x %3d %c\n",
+                 regs.A, regs.A, isprint(regs.A)?regs.A:'.');
+  con->dd_printf("%c%c-%c-%c%c%c\n",
+                 (regs.F&BIT_S)?'1':'0',
+                 (regs.F&BIT_Z)?'1':'0',
+                 (regs.F&BIT_A)?'1':'0',
+                 (regs.F&BIT_P)?'1':'0',
+                 (regs.F&BIT_N)?'1':'0',
+                 (regs.F&BIT_C)?'1':'0');
+  con->dd_printf("BC= 0x%04x [BC]= %02x %3d %c  ",
+                 regs.BC, ram->get(regs.BC), ram->get(regs.BC),
+                 isprint(ram->get(regs.BC))?ram->get(regs.BC):'.');
+  con->dd_printf("DE= 0x%04x [DE]= %02x %3d %c  ",
+                 regs.DE, ram->get(regs.DE), ram->get(regs.DE),
+                 isprint(ram->get(regs.DE))?ram->get(regs.DE):'.');
+  con->dd_printf("HL= 0x%04x [HL]= %02x %3d %c\n",
+                 regs.HL, ram->get(regs.HL), ram->get(regs.HL),
+                 isprint(ram->get(regs.HL))?ram->get(regs.HL):'.');
+  con->dd_printf("SP= 0x%04x [SP]= %02x %3d %c\n",
+                 regs.SP, ram->get(regs.SP), ram->get(regs.SP),
+                 isprint(ram->get(regs.SP))?ram->get(regs.SP):'.');
+
+  print_disass(PC, con);
+}
+
+/*
+ * Execution
+ */
+
+int
+cl_lr35902::exec_inst(void)
+{
+  t_mem code;
+
+  if (fetch(&code))
+    return(resBREAKPOINT);
+  tick(1);
+  
+  switch (code)
+    {
+    case 0x00: return(inst_nop(code));
+    case 0x01: case 0x02: case 0x06: return(inst_ld(code));
+    case 0x03: case 0x04: return(inst_inc(code));
+    case 0x05: return(inst_dec(code));
+    case 0x07: return(inst_rlca(code));
+
+    case 0x08: return(inst_st_sp_abs(code));
+    case 0x09: return(inst_add(code));
+    case 0x0a: case 0x0e: return(inst_ld(code));
+    case 0x0b: case 0x0d: return(inst_dec(code));
+    case 0x0c: return(inst_inc(code));
+    case 0x0f: return(inst_rrca(code));
+
+
+    case 0x10: return(inst_stop0(code));
+    case 0x11: case 0x12: case 0x16: return(inst_ld(code));
+    case 0x13: case 0x14: return(inst_inc(code));
+    case 0x15: return(inst_dec(code));
+    case 0x17: return(inst_rla(code));
+
+    case 0x18: return(inst_jr(code));
+    case 0x19: return(inst_add(code));
+    case 0x1a: case 0x1e: return(inst_ld(code));
+    case 0x1b: case 0x1d: return(inst_dec(code));
+    case 0x1c: return(inst_inc(code));
+    case 0x1f: return(inst_rra(code));
+
+
+    case 0x20: return(inst_jr(code));
+    case 0x21: case 0x26: return(inst_ld(code));
+    case 0x22: return inst_ldi(code);
+    case 0x23: case 0x24: return(inst_inc(code));
+    case 0x25: return(inst_dec(code));
+    case 0x27: return(inst_daa(code));
+      
+    case 0x28: return(inst_jr(code));
+    case 0x29: return(inst_add(code));
+    case 0x2a: return(inst_ldi(code));
+    case 0x2b: case 0x2d: return(inst_dec(code));
+    case 0x2c: return(inst_inc(code));
+    case 0x2e: return(inst_ld(code));
+    case 0x2f: return(inst_cpl(code));
+
+    case 0x30: return(inst_jr(code));
+    case 0x31: case 0x36: return(inst_ld(code));
+    case 0x32: return(inst_ldd(code));
+    case 0x33: case 0x34: return(inst_inc(code));
+    case 0x35: return(inst_dec(code));
+    case 0x37: return(inst_scf(code));
+      
+    case 0x38: return(inst_jr(code));
+    case 0x39: return(inst_add(code));
+    case 0x3a: return inst_ldd(code);
+    case 0x3b: case 0x3d: return(inst_dec(code));
+    case 0x3c: return(inst_inc(code));
+    case 0x3e: return(inst_ld(code));
+    case 0x3f: return(inst_ccf(code));
+
+    case 0x40: case 0x41: case 0x42: case 0x43: case 0x44: case 0x45: case 0x46: case 0x47:
+    case 0x48: case 0x49: case 0x4a: case 0x4b: case 0x4c: case 0x4d: case 0x4e: case 0x4f:
+      return(inst_ld(code));
+
+    case 0x50: case 0x51: case 0x52: case 0x53: case 0x54: case 0x55: case 0x56: case 0x57:
+    case 0x58: case 0x59: case 0x5a: case 0x5b: case 0x5c: case 0x5d: case 0x5e: case 0x5f:
+      return(inst_ld(code));
+
+    case 0x60: case 0x61: case 0x62: case 0x63: case 0x64: case 0x65: case 0x66: case 0x67:
+    case 0x68: case 0x69: case 0x6a: case 0x6b: case 0x6c: case 0x6d: case 0x6e: case 0x6f:
+      return(inst_ld(code));
+
+    case 0x70: case 0x71: case 0x72: case 0x73: case 0x74: case 0x75: case 0x77:
+    case 0x78: case 0x79: case 0x7a: case 0x7b: case 0x7c: case 0x7d: case 0x7e: case 0x7f:
+      return(inst_ld(code));
+    case 0x76: return(inst_halt(code));
+
+    case 0x80: case 0x81: case 0x82: case 0x83: case 0x84: case 0x85: case 0x86: case 0x87:
+      return(inst_add(code));
+    case 0x88: case 0x89: case 0x8a: case 0x8b: case 0x8c: case 0x8d: case 0x8e: case 0x8f:
+      return(inst_adc(code));
+
+    case 0x90: case 0x91: case 0x92: case 0x93: case 0x94: case 0x95: case 0x96: case 0x97:
+      return(inst_sub(code));
+    case 0x98: case 0x99: case 0x9a: case 0x9b: case 0x9c: case 0x9d: case 0x9e: case 0x9f:
+      return(inst_sbc(code));
+
+    case 0xa0: case 0xa1: case 0xa2: case 0xa3: case 0xa4: case 0xa5: case 0xa6: case 0xa7:
+      return(inst_and(code));
+    case 0xa8: case 0xa9: case 0xaa: case 0xab: case 0xac: case 0xad: case 0xae: case 0xaf:
+      return(inst_xor(code));
+
+    case 0xb0: case 0xb1: case 0xb2: case 0xb3: case 0xb4: case 0xb5: case 0xb6: case 0xb7:
+      return(inst_or(code));
+    case 0xb8: case 0xb9: case 0xba: case 0xbb: case 0xbc: case 0xbd: case 0xbe: case 0xbf:
+      return(inst_cp(code));
+
+    case 0xc0: return(inst_ret(code));
+    case 0xc1: return(inst_pop(code));
+    case 0xc2: case 0xc3: return(inst_jp(code));
+    case 0xc4: return(inst_call(code));
+    case 0xc5: return(inst_push(code));
+    case 0xc6: return(inst_add(code));
+    case 0xc7: return(inst_rst(code));
+
+    case 0xc8: case 0xc9: return(inst_ret(code));
+    case 0xca: return(inst_jp(code));
+
+      /* CB escapes out to 2 byte opcodes(CB include), opcodes
+         to do register bit manipulations */
+    case 0xcb: return(inst_cb( ));
+    case 0xcc: case 0xcd: return(inst_call(code));
+    case 0xce: return(inst_adc(code));
+    case 0xcf: return(inst_rst(code));
+
+    case 0xd0: return(inst_ret(code));
+    case 0xd1: return(inst_pop(code));
+    case 0xd2: return(inst_jp(code));
+    case 0xd3: break;
+    case 0xd4: return(inst_call(code));
+    case 0xd5: return(inst_push(code));
+    case 0xd6: return(inst_sub(code));
+    case 0xd7: return(inst_rst(code));
+
+    case 0xd8: return(inst_ret(code));
+ case 0xd9: return(inst_reti(code));
+    case 0xda: return(inst_jp(code));
+    case 0xdb: break;
+    case 0xdc: return(inst_call(code));
+      
+ case 0xdd: break;  /* IX register doesn't exist on the LR35902 */
+    case 0xde: return(inst_sbc(code));
+    case 0xdf: return(inst_rst(code));
+      
+      
+    case 0xe0: return(inst_ldh(code));
+    case 0xe1: return(inst_pop(code));
+    case 0xe2: return(inst_ldh(code));
+    case 0xe3:
+ case 0xe4: break;
+    case 0xe5: return(inst_push(code));
+    case 0xe6: return(inst_and(code));
+    case 0xe7: return(inst_rst(code));
+
+    case 0xe8: return(inst_add_sp_d(code));
+    case 0xe9: return(inst_jp(code));
+    case 0xea: return(inst_ld16(code));
+    case 0xeb:
+    case 0xec: case 0xed: break;
+    case 0xee: return(inst_xor(code));
+    case 0xef: return(inst_rst(code));
+      
+    case 0xf0: return(inst_ldh(code));
+    case 0xf1: return(inst_pop(code));
+ case 0xf2: return(inst_ldh(code));
+    case 0xf3: return(inst_di(code));
+    case 0xf4: break;
+    case 0xf5: return(inst_push(code));
+    case 0xf6: return(inst_or(code));
+    case 0xf7: return(inst_rst(code));
+
+    case 0xf8: return(inst_ldhl_sp(code));
+    case 0xf9: return(inst_ld(code));
+    case 0xfa: return(inst_ld16(code));
+    case 0xfb: return(inst_ei(code));
+    case 0xfc: 
+    case 0xfd: break;
+    case 0xfe: return(inst_cp(code));
+    case 0xff: return(inst_rst(code));
+    }
+
+  PC= rom->inc_address(PC, -1);
+
+  sim->stop(resINV_INST);
+  return(resINV_INST);
+}
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/z80.src/lr35902cl.h sdcc-3.2.0+dfsg/sim/ucsim/z80.src/lr35902cl.h
--- sdcc-3.1.0+dfsg/sim/ucsim/z80.src/lr35902cl.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/z80.src/lr35902cl.h	2012-01-10 04:32:27.000000000 +0000
@@ -0,0 +1,116 @@
+/*
+ * Simulator of microcontrollers (lr35902cl.h)
+ *
+ */
+
+/* This file is part of microcontroller simulator: ucsim.
+
+UCSIM is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+UCSIM 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 UCSIM; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA. */
+/*@1@*/
+
+#ifndef LR35902_CL
+#define LR35902_CL
+
+#include "z80cl.h"
+
+class cl_lr35902;
+
+const t_addr  lr35902_rom_start = 0x0000;
+const t_addr  lr35902_rom_size  = 0x6000;
+
+const t_addr  lr35902_ram_start = 0xA000;
+const t_addr  lr35902_ram_size  = 0x5F80;
+
+class lr35902_memory
+{
+ protected:
+  cl_uc  &uc_r;
+  
+ public:
+  cl_memory *rom;
+  cl_memory *ram;
+  
+  lr35902_memory( cl_uc &uc_p );
+  
+  virtual void init( void );
+  
+  
+  virtual void store1( TYPE_UWORD addr, t_mem val );
+  virtual void store2( TYPE_UWORD addr, TYPE_UWORD val );
+  
+  virtual TYPE_UBYTE  get1( TYPE_UWORD addr );
+  virtual TYPE_UWORD  get2( TYPE_UWORD addr );
+  
+  // fetch not included b/c it only uses the rom
+};
+
+
+class cl_lr35902: public cl_z80
+{
+public:
+  lr35902_memory    mem;
+  
+public:
+  cl_lr35902(int Itype, int Itech, class cl_sim *asim);
+  virtual int init(void);
+  virtual const char *id_string(void);
+  
+  //virtual t_addr get_mem_size(enum mem_class type);
+  virtual void mk_hw_elements(void);
+  virtual void make_memories(void);
+  
+  virtual struct dis_entry *dis_tbl(void);
+  virtual int inst_length(t_addr addr);
+  virtual int inst_branch(t_addr addr);
+  virtual int longest_inst(void);
+  virtual const char *disass(t_addr addr, const char *sep);
+  virtual void print_regs(class cl_console_base *con);
+
+  virtual int exec_inst(void);
+
+  virtual const char *get_disasm_info(t_addr addr,
+                        int *ret_len,
+                        int *ret_branch,
+                        int *immed_offset);
+  
+
+  // memory access altered to use the 'mem' object
+  virtual void store1( TYPE_UWORD addr, t_mem val );
+  virtual void store2( TYPE_UWORD addr, TYPE_UWORD val );
+  
+  virtual TYPE_UBYTE  get1( TYPE_UWORD addr );
+  virtual TYPE_UWORD  get2( TYPE_UWORD addr );
+  
+  
+  // see #include "instcl.h" for Z80 versions
+  /* instruction function that are add / modified from the Z80 versions */
+  virtual int inst_cb(void);
+  
+  virtual int inst_st_sp_abs(t_mem code);
+  virtual int inst_stop0    (t_mem code);
+  
+  virtual int inst_ldi   (t_mem code);
+  virtual int inst_ldd   (t_mem code);
+  virtual int inst_ldh   (t_mem code);
+  
+  virtual int inst_reti    (t_mem code);
+  virtual int inst_add_sp_d(t_mem code);
+  virtual int inst_ld16    (t_mem code);
+  virtual int inst_ldhl_sp (t_mem code);
+  
+};
+
+#endif /* LR35902_CL */
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/z80.src/r2k.cc sdcc-3.2.0+dfsg/sim/ucsim/z80.src/r2k.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/z80.src/r2k.cc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/z80.src/r2k.cc	2012-05-15 04:39:50.000000000 +0000
@@ -66,6 +66,12 @@
   type= Itype;
 }
 
+cl_r3ka::cl_r3ka(int Itype, int Itech, class cl_sim *asim):
+  cl_r2k(Itype, Itech, asim)
+{
+  SU = 0;
+}
+
 int
 cl_r2k::init(void)
 {
@@ -89,6 +95,11 @@
   return("rabbit 2000");
 }
 
+const char *
+cl_r3ka::id_string(void)
+{
+  return("rabbit 3000A");
+}
 
 /*
  * Making elements of the controller
@@ -436,7 +447,9 @@
 cl_r2k::exec_inst(void)
 {
   t_mem code;
-
+  
+  ins_start = PC;
+  
   if (fetch(&code))
     return(resBREAKPOINT);
   tick(1);
@@ -444,13 +457,18 @@
   /* handling for IOI and IOE prefixes */
   mmu.io_flag = 0;
   if ((code == 0xd3) || (code == 0xdb)) {
-    mmu.io_flag = (code == 0xdb) ? IOI : IOE;
+    mmu.io_flag = (code == 0xd3) ? IOI : IOE;
     
     if (fetch(&code))
       return(resBREAKPOINT);
     tick(1);
   }
   
+  return exec_code( code );
+}
+
+int cl_r2k::exec_code(t_mem code)
+{
   switch (code)
     {
     case 0x00: return(inst_nop(code));
@@ -466,7 +484,6 @@
     case 0x0c: return(inst_inc(code));
     case 0x0f: return(inst_rrca(code));
 
-
     case 0x10: return(inst_djnz(code));
     case 0x11: case 0x12: case 0x16: return(inst_ld(code));
     case 0x13: case 0x14: return(inst_inc(code));
@@ -642,5 +659,17 @@
   return(resINV_INST);
 }
 
+int cl_r3ka::exec_code(t_mem code)
+{
+  if (code == 0x5B)
+    {
+      // IDET
+      // if (EDMR && (SU & 0x01))
+      //  system violation interrupt...
+      ;
+    }
+  
+  return cl_r2k::exec_code(code);
+}
 
 /* End of z80.src/z80.cc */
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/z80.src/r2kcl.h sdcc-3.2.0+dfsg/sim/ucsim/z80.src/r2kcl.h
--- sdcc-3.1.0+dfsg/sim/ucsim/z80.src/r2kcl.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/z80.src/r2kcl.h	2012-05-15 03:59:44.000000000 +0000
@@ -73,7 +73,7 @@
   
   rabbit_mmu   mmu;
 
-  
+  TYPE_UWORD ins_start;  /* PC value for start of the current instruction */
   TYPE_UBYTE ip;  /* interrupt priority register */
   
   /* iir, eir registers are not full supported */
@@ -101,7 +101,8 @@
   virtual void print_regs(class cl_console_base *con);
 
   virtual int exec_inst(void);
-
+  virtual int exec_code(t_mem code);
+  
   virtual const char *get_disasm_info(t_addr addr,
                         int *ret_len,
                         int *ret_branch,
@@ -144,9 +145,23 @@
   virtual int inst_rr_hl(t_mem code);
 
   virtual int inst_xd(t_mem prefix);
-  virtual int inst_ed(void);
+  
+  //virtual int inst_ed(void);
   virtual int inst_ed_(t_mem code);
   
 };
 
+class cl_r3ka: public cl_r2k {
+ public:
+  
+  TYPE_UBYTE  SU;
+  
+  cl_r3ka(int Itype, int Itech, class cl_sim *asim);
+  virtual const char *id_string(void);
+  
+  virtual int exec_code(t_mem code);
+  
+  virtual int inst_ed_(t_mem code);
+};
+
 #endif /* R2KCL_HEADER */
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/z80.src/simz80.cc sdcc-3.2.0+dfsg/sim/ucsim/z80.src/simz80.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/z80.src/simz80.cc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/z80.src/simz80.cc	2012-05-15 03:59:44.000000000 +0000
@@ -31,6 +31,7 @@
 #include "simz80cl.h"
 #include "z80cl.h"
 #include "r2kcl.h"
+#include "lr35902cl.h"
 
 cl_simz80::cl_simz80(class cl_app *the_app):
   cl_sim(the_app)
@@ -67,7 +68,13 @@
     // Add Rabbits, etc here.
 
     case CPU_R2K:
-      return(new cl_r2k(cpus_z80[i].type, cpus_z80[i].technology, this));
+      return(new cl_r2k (cpus_z80[i].type, cpus_z80[i].technology, this));
+      
+    case CPU_R3KA:
+      return(new cl_r3ka(cpus_z80[i].type, cpus_z80[i].technology, this));
+      
+    case CPU_LR35902:
+      return(new cl_lr35902(cpus_z80[i].type, cpus_z80[i].technology, this));
     }
 
   return(NULL);
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/z80.src/z80.cc sdcc-3.2.0+dfsg/sim/ucsim/z80.src/z80.cc
--- sdcc-3.1.0+dfsg/sim/ucsim/z80.src/z80.cc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/z80.src/z80.cc	2012-01-10 04:32:27.000000000 +0000
@@ -658,4 +658,8 @@
   return (c2 << 8) | c1;
 }
 
+t_mem       cl_z80::peek1 ( void ) {
+  return rom->read(PC);
+}
+
 /* End of z80.src/z80.cc */
diff -Nru sdcc-3.1.0+dfsg/sim/ucsim/z80.src/z80cl.h sdcc-3.2.0+dfsg/sim/ucsim/z80.src/z80cl.h
--- sdcc-3.1.0+dfsg/sim/ucsim/z80.src/z80cl.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/sim/ucsim/z80.src/z80cl.h	2012-01-10 04:32:27.000000000 +0000
@@ -75,6 +75,7 @@
   
   virtual t_mem       fetch1( void );
   virtual TYPE_UWORD  fetch2( void );
+  virtual t_mem       peek1 ( void );
   
   //virtual t_mem fetch(void);
 
diff -Nru sdcc-3.1.0+dfsg/src/Makefile.in sdcc-3.2.0+dfsg/src/Makefile.in
--- sdcc-3.1.0+dfsg/src/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/Makefile.in	2012-03-30 20:01:27.000000000 +0000
@@ -34,7 +34,7 @@
                   SDCCBBlock.o SDCCloop.o SDCCcse.o SDCCcflow.o SDCCdflow.o \
                   SDCClrange.o SDCCptropt.o SDCCpeeph.o SDCCglue.o \
                   SDCCasm.o SDCCmacro.o SDCCutil.o SDCCdebug.o cdbFile.o SDCCdwarf2.o\
-                  SDCCerr.o SDCCsystem.o
+                  SDCCerr.o SDCCsystem.o SDCCgen.o
 
 SPECIAL         = SDCCy.h 
 ifeq ($(USE_ALT_LEX), 1)
@@ -45,7 +45,11 @@
 endif
 
 SLIBSOURCES     = $(patsubst %.o,$(SLIB)/%.c,$(SLIBOBJS))
-SOURCES         = $(patsubst %.o,%.c,$(OBJECTS))
+SOURCES         := $(patsubst %.o,%.c,$(OBJECTS))
+
+# C++ sources (.cc extension)
+CXXSOURCES      += $(notdir $(wildcard $(srcdir)/*.cc))
+OBJECTS         += $(patsubst %.cc,%.o,$(CXXSOURCES))
 
 TARGET          = $(top_builddir)/bin/sdcc$(EXEEXT)
 
@@ -93,8 +97,8 @@
 # ---------------------
 dep: version.h Makefile.dep
 
-Makefile.dep: version.h $(SOURCES) $(SLIBSOURCES) $(SPECIAL)
-	$(MAKEDEP) $(CPPFLAGS) $(filter %.c,$^) >Makefile.dep
+Makefile.dep: version.h $(SOURCES) $(CXXSOURCES) $(SLIBSOURCES) $(SPECIAL)
+	$(MAKEDEP) $(CPPFLAGS) $(filter %.c,$^) $(filter %.cc,$^) >Makefile.dep
 
 # don't include Makefile.dep for the listed targets:
 ifeq "$(findstring $(MAKECMDGOALS),uninstall check installcheck installdirs checkconf \
@@ -126,7 +130,7 @@
 	$(YACC) -d -v -o $@ $<
 
 SDCClex.c: SDCC.lex SDCCy.h
-	$(LEX) -t $< >$@
+	$(LEX) -8 -f -t $< >$@
 
 version.h: ../ChangeLog
 	$(AWK) -f $(srcdir)/version.awk $< > $@
diff -Nru sdcc-3.1.0+dfsg/src/SDCC.lex sdcc-3.2.0+dfsg/src/SDCC.lex
--- sdcc-3.1.0+dfsg/src/SDCC.lex	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCC.lex	2012-06-27 18:05:30.000000000 +0000
@@ -38,13 +38,18 @@
 #include "common.h"
 #include "newalloc.h"
 #include "dbuf_string.h"
+/* Needed by flex 2.5.4 on NetBSD 5.0.1 sparc64 */
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+/* MSVC has no unistd.h but has read() declaration in io.h */
+#if defined(_MSC_VER)
+# include <io.h>
+#endif
 
 #define TKEYWORD(token) return (isTargetKeyword(yytext) ? token :\
                                 check_type())
 
-#define TKEYWORDSDCC(token) return (options.std_sdcc && isTargetKeyword(yytext)\
-                                    ? deprecated_keyword (yytext), token : check_type())
-
 #define TKEYWORD99(token) return (options.std_c99 ? token : check_type())
 
 int column = 0;         /* current column */
@@ -64,21 +69,13 @@
 static int process_pragma (const char *);
 static int check_type (void);
 static int isTargetKeyword (const char *s);
-static int checkCurrFile (const char *s);
-static void deprecated_keyword (char *yytext);
+static void checkCurrFile (const char *s);
 %}
 
 %x asm
 %%
-_?"_asm"         {
+"__asm"                {
   count ();
-  if (yytext[1] != '_') /* deprecated single underscore */
-    {
-      if (!options.std_sdcc)
-        return check_type ();
-      else
-        deprecated_keyword (yytext);
-    }
   if (asmbuff.buf == NULL)
     dbuf_init (&asmbuff, INITIAL_INLINEASM);
   else
@@ -86,129 +83,90 @@
 
   BEGIN (asm);
 }
-<asm>_?"_endasm" {
+<asm>"__endasm"        {
   count ();
-  if (yytext[1] != '_') /* deprecated single underscore */
-    {
-      if (!options.std_sdcc)
-        dbuf_append_str (&asmbuff, yytext);
-      else
-        {
-          deprecated_keyword (yytext);
-          yylval.yyinline = dbuf_c_str (&asmbuff);
-          BEGIN (INITIAL);
-          return INLINEASM;
-        }
-    }
-  else
-    {
-      yylval.yyinline = dbuf_c_str (&asmbuff);
-      BEGIN (INITIAL);
-      return INLINEASM;
-    }
+  yylval.yystr = dbuf_c_str (&asmbuff);
+  BEGIN (INITIAL);
+  return INLINEASM;
 }
-<asm>\n        {
+<asm>\n                 {
   count ();
   dbuf_append_char(&asmbuff, *yytext);
 }
-<asm>.         {
+<asm>.                  {
   dbuf_append_char(&asmbuff, *yytext);
 }
-"at"           { count (); TKEYWORDSDCC (AT); }
-"__at"         { count (); TKEYWORD (AT); }
-"auto"         { count (); return AUTO; }
-"bit"          { count (); TKEYWORDSDCC (BIT); }
-"__bit"        { count (); TKEYWORD (BIT); }
-"_Bool"        { count (); TKEYWORD99 (SD_BOOL); }
-"break"        { count (); return BREAK; }
-"case"         { count (); return CASE; }
-"char"         { count (); return SD_CHAR; }
-"code"         { count (); TKEYWORDSDCC (CODE); }
-"__code"       { count (); TKEYWORD (CODE); }
-"const"        { count (); return SD_CONST; }
-"continue"     { count (); return CONTINUE; }
-"critical"     { count (); TKEYWORDSDCC (CRITICAL); }
-"__critical"   { count (); TKEYWORD (CRITICAL); }
-"data"         { count (); TKEYWORDSDCC (DATA); }
-"__data"       { count (); TKEYWORD (DATA); }
-"default"      { count (); return DEFAULT; }
-"do"           { count (); return DO; }
-"double"       { count (); werror (W_DOUBLE_UNSUPPORTED); return SD_FLOAT; }
-"else"         { count (); return ELSE; }
-"enum"         { count (); return ENUM; }
-"extern"       { count (); return EXTERN; }
-"far"          { count (); TKEYWORDSDCC (XDATA); }
-"__far"        { count (); TKEYWORD (XDATA); }
-"eeprom"       { count (); TKEYWORDSDCC (EEPROM); }
-"__eeprom"     { count (); TKEYWORD (EEPROM); }
-"float"        { count (); return SD_FLOAT; }
-"fixed16x16"   { count (); TKEYWORDSDCC (FIXED16X16); }
-"__fixed16x16" { count (); TKEYWORD (FIXED16X16); }
-"flash"        { count (); TKEYWORDSDCC (CODE); }
-"__flash"      { count (); TKEYWORD (CODE); }
-"for"          { count (); return FOR; }
-"goto"         { count (); return GOTO; }
-"idata"        { count (); TKEYWORDSDCC (IDATA); }
-"__idata"      { count (); TKEYWORD (IDATA); }
-"if"           { count (); return IF; }
-"int"          { count (); return SD_INT; }
-"interrupt"    { count (); TKEYWORDSDCC (INTERRUPT); }
-"__interrupt"  { count (); TKEYWORD (INTERRUPT); }
-"nonbanked"    { count (); TKEYWORDSDCC (NONBANKED); }
-"__nonbanked"  { count (); TKEYWORD (NONBANKED); }
-"banked"       { count (); TKEYWORDSDCC (BANKED); }
-"__banked"     { count (); TKEYWORD (BANKED); }
-"long"         { count (); return SD_LONG; }
-"near"         { count (); TKEYWORDSDCC (DATA); }
-"__near"       { count (); TKEYWORD (DATA); }
-"pdata"        { count (); TKEYWORDSDCC (PDATA); }
-"__pdata"      { count (); TKEYWORD (PDATA); }
-"reentrant"    { count (); TKEYWORDSDCC (REENTRANT); }
-"__reentrant"  { count (); TKEYWORD (REENTRANT); }
-"shadowregs"   { count (); TKEYWORDSDCC (SHADOWREGS); }
-"__shadowregs" { count (); TKEYWORD (SHADOWREGS); }
-"wparam"       { count (); TKEYWORDSDCC (SD_WPARAM); }
-"__wparam"     { count (); TKEYWORD (SD_WPARAM); }
-"register"     { count (); return REGISTER; }
-"return"       { count (); return RETURN; }
-"sfr"          { count (); TKEYWORDSDCC (SFR); }
-"__sfr"        { count (); TKEYWORD (SFR); }
-"sfr16"        { count (); TKEYWORDSDCC (SFR16); }
-"__sfr16"      { count (); TKEYWORD (SFR16); }
-"sfr32"        { count (); TKEYWORDSDCC (SFR32); }
-"__sfr32"      { count (); TKEYWORD (SFR32); }
-"sbit"         { count (); TKEYWORDSDCC (SBIT); }
-"__sbit"       { count (); TKEYWORD (SBIT); }
-"short"        { count (); return SD_SHORT; }
-"signed"       { count (); return SIGNED; }
-"sizeof"       { count (); return SIZEOF; }
-"__builtin_offsetof" { count (); return OFFSETOF; }
-"sram"         { count (); TKEYWORDSDCC (XDATA); }
-"__sram"       { count (); TKEYWORD (XDATA); }
-"static"       { count (); return STATIC; }
-"struct"       { count (); return STRUCT; }
-"switch"       { count (); return SWITCH; }
-"typedef"      { count (); return TYPEDEF; }
-"union"        { count (); return UNION; }
-"unsigned"     { count (); return UNSIGNED; }
-"void"         { count (); return SD_VOID; }
-"volatile"     { count (); return VOLATILE; }
-"using"        { count (); TKEYWORDSDCC (USING); }
-"__using"      { count (); TKEYWORD (USING); }
-"_naked"       { count (); TKEYWORDSDCC (NAKED); }
-"__naked"      { count (); TKEYWORD (NAKED); }
-"while"        { count (); return WHILE; }
-"xdata"        { count (); TKEYWORDSDCC (XDATA); }
-"__xdata"      { count (); TKEYWORD (XDATA); }
-"..."          { count (); return VAR_ARGS; }
-"__typeof"     { count (); return TYPEOF; }
-"_JavaNative"  { count (); TKEYWORD (JAVANATIVE); }
-"_overlay"     { count (); TKEYWORDSDCC (OVERLAY); }
-"__overlay"    { count (); TKEYWORD (OVERLAY); }
-"inline"       { count (); TKEYWORD99 (INLINE); }
-"restrict"     { count (); TKEYWORD99 (RESTRICT); }
-"__smallc"     { count (); return SMALLC; }
-{L}({L}|{D})*  {
+"__asm__"               { count (); return ASM; }
+"__at"                  { count (); TKEYWORD (AT); }
+"auto"                  { count (); return AUTO; }
+"__bit"                 { count (); TKEYWORD (BIT); }
+"_Bool"                 { count (); TKEYWORD99 (SD_BOOL); }
+"break"                 { count (); return BREAK; }
+"case"                  { count (); return CASE; }
+"char"                  { count (); return SD_CHAR; }
+"__code"                { count (); TKEYWORD (CODE); }
+"const"                 { count (); return SD_CONST; }
+"continue"              { count (); return CONTINUE; }
+"__critical"            { count (); TKEYWORD (CRITICAL); }
+"__data"                { count (); TKEYWORD (DATA); }
+"default"               { count (); return DEFAULT; }
+"do"                    { count (); return DO; }
+"double"                { count (); werror (W_DOUBLE_UNSUPPORTED); return SD_FLOAT; }
+"else"                  { count (); return ELSE; }
+"enum"                  { count (); return ENUM; }
+"extern"                { count (); return EXTERN; }
+"__far"                 { count (); TKEYWORD (XDATA); }
+"__eeprom"              { count (); TKEYWORD (EEPROM); }
+"float"                 { count (); return SD_FLOAT; }
+"__fixed16x16"          { count (); TKEYWORD (FIXED16X16); }
+"__flash"               { count (); TKEYWORD (CODE); }
+"for"                   { count (); return FOR; }
+"goto"                  { count (); return GOTO; }
+"__idata"               { count (); TKEYWORD (IDATA); }
+"if"                    { count (); return IF; }
+"int"                   { count (); return SD_INT; }
+"__interrupt"           { count (); TKEYWORD (INTERRUPT); }
+"__nonbanked"           { count (); TKEYWORD (NONBANKED); }
+"__banked"              { count (); TKEYWORD (BANKED); }
+"long"                  { count (); return SD_LONG; }
+"__near"                { count (); TKEYWORD (DATA); }
+"__pdata"               { count (); TKEYWORD (PDATA); }
+"__reentrant"           { count (); TKEYWORD (REENTRANT); }
+"__shadowregs"          { count (); TKEYWORD (SHADOWREGS); }
+"__wparam"              { count (); TKEYWORD (SD_WPARAM); }
+"register"              { count (); return REGISTER; }
+"return"                { count (); return RETURN; }
+"__sfr"                 { count (); TKEYWORD (SFR); }
+"__sfr16"               { count (); TKEYWORD (SFR16); }
+"__sfr32"               { count (); TKEYWORD (SFR32); }
+"__sbit"                { count (); TKEYWORD (SBIT); }
+"short"                 { count (); return SD_SHORT; }
+"signed"                { count (); return SIGNED; }
+"sizeof"                { count (); return SIZEOF; }
+"__builtin_offsetof"    { count (); return OFFSETOF; }
+"__sram"                { count (); TKEYWORD (XDATA); }
+"static"                { count (); return STATIC; }
+"struct"                { count (); return STRUCT; }
+"switch"                { count (); return SWITCH; }
+"typedef"               { count (); return TYPEDEF; }
+"union"                 { count (); return UNION; }
+"unsigned"              { count (); return UNSIGNED; }
+"void"                  { count (); return SD_VOID; }
+"volatile"              { count (); return VOLATILE; }
+"__using"               { count (); TKEYWORD (USING); }
+"__naked"               { count (); TKEYWORD (NAKED); }
+"while"                 { count (); return WHILE; }
+"__xdata"               { count (); TKEYWORD (XDATA); }
+"..."                   { count (); return VAR_ARGS; }
+"__typeof"              { count (); return TYPEOF; }
+"_JavaNative"           { count (); TKEYWORD (JAVANATIVE); }
+"__overlay"             { count (); TKEYWORD (OVERLAY); }
+"inline"                { count (); TKEYWORD99 (INLINE); }
+"_Noreturn"             { count (); return NORETURN;}
+"restrict"              { count (); TKEYWORD99 (RESTRICT); }
+"__smallc"              { count (); return SMALLC; }
+"__addressmod"          { count (); return ADDRESSMOD; }
+{L}({L}|{D})*           {
   if (!options.dollars_in_ident && strchr (yytext, '$'))
     {
       yyerror ("stray '$' in program");
@@ -216,7 +174,7 @@
   count ();
   return check_type();
 }
-0[bB]{B}+{IS}? {
+0[bB]{B}+{IS}?          {
   if (!options.std_sdcc)
     {
       yyerror ("binary (0b) constants are not allowed in ISO C");
@@ -225,68 +183,66 @@
   yylval.val = constVal (yytext);
   return CONSTANT;
 }
-0[xX]{H}+{IS}? { count (); yylval.val = constVal (yytext); return CONSTANT; }
-0[0-7]*{IS}?     { count (); yylval.val = constVal (yytext); return CONSTANT; }
-[1-9]{D}*{IS}?      { count (); yylval.val = constVal (yytext); return CONSTANT; }
-'(\\.|[^\\'])+' { count (); yylval.val = charVal (yytext); return CONSTANT; /* ' make syntax highliter happy */ }
-{D}+{E}{FS}?   { count (); yylval.val = constFloatVal (yytext);return CONSTANT; }
-{D}*"."{D}+({E})?{FS}?  { count (); yylval.val = constFloatVal (yytext);return CONSTANT; }
-{D}+"."{D}*({E})?{FS}?  { count (); yylval.val = constFloatVal (yytext);return CONSTANT; }
-\"             { count (); yylval.val = strVal (stringLiteral ()); return STRING_LITERAL; }
-">>="          { count (); yylval.yyint = RIGHT_ASSIGN; return RIGHT_ASSIGN; }
-"<<="          { count (); yylval.yyint = LEFT_ASSIGN; return LEFT_ASSIGN; }
-"+="           { count (); yylval.yyint = ADD_ASSIGN; return ADD_ASSIGN; }
-"-="           { count (); yylval.yyint = SUB_ASSIGN; return SUB_ASSIGN; }
-"*="           { count (); yylval.yyint = MUL_ASSIGN; return MUL_ASSIGN; }
-"/="           { count (); yylval.yyint = DIV_ASSIGN; return DIV_ASSIGN; }
-"%="           { count (); yylval.yyint = MOD_ASSIGN; return MOD_ASSIGN; }
-"&="           { count (); yylval.yyint = AND_ASSIGN; return AND_ASSIGN; }
-"^="           { count (); yylval.yyint = XOR_ASSIGN; return XOR_ASSIGN; }
-"|="           { count (); yylval.yyint = OR_ASSIGN; return OR_ASSIGN; }
-">>"           { count (); return RIGHT_OP; }
-"<<"           { count (); return LEFT_OP; }
-"++"           { count (); return INC_OP; }
-"--"           { count (); return DEC_OP; }
-"->"           { count (); return PTR_OP; }
-"&&"           { count (); return AND_OP; }
-"||"           { count (); return OR_OP; }
-"<="           { count (); return LE_OP; }
-">="           { count (); return GE_OP; }
-"=="           { count (); return EQ_OP; }
-"!="           { count (); return NE_OP; }
-";"            { count (); return ';'; }
-"{"|"<%"       { count (); ++NestLevel; ignoreTypedefType = 0; return '{'; }
-"}"|"%>"       { count (); --NestLevel; return '}'; }
-","            { count (); return ','; }
-":"            { count (); return ':'; }
-"="            { count (); return '='; }
-"("            { count (); ignoreTypedefType = 0; return '('; }
-")"            { count (); return ')'; }
-"["|"<:"       { count (); return '['; }
-"]"|":>"       { count (); return ']'; }
-"."            { count (); return '.'; }
-"&"            { count (); return '&'; }
-"!"            { count (); return '!'; }
-"~"            { count (); return '~'; }
-"-"            { count (); return '-'; }
-"+"            { count (); return '+'; }
-"*"            { count (); return '*'; }
-"/"            { count (); return '/'; }
-"%"            { count (); return '%'; }
-"<"            { count (); return '<'; }
-">"            { count (); return '>'; }
-"^"            { count (); return '^'; }
-"|"            { count (); return '|'; }
-"?"            { count (); return '?'; }
-^{HASH}pragma.*$    { count (); process_pragma (yytext); }
-^({HASH}line.*"\n")|({HASH}.*"\n") { count (); checkCurrFile (yytext); }
-
-^[^(]+"("[0-9]+") : error"[^\n]+ { werror (E_PRE_PROC_FAILED, yytext); count (); }
-^[^(]+"("[0-9]+") : warning"[^\n]+ { werror (W_PRE_PROC_WARNING, yytext); count (); }
-"\r\n"         { count (); }
-"\n"           { count (); }
-[ \t\v\f]      { count (); }
-\\ {
+0[xX]{H}+{IS}?          { count (); yylval.val = constVal (yytext); return CONSTANT; }
+0[0-7]*{IS}?            { count (); yylval.val = constVal (yytext); return CONSTANT; }
+[1-9]{D}*{IS}?          { count (); yylval.val = constVal (yytext); return CONSTANT; }
+'(\\.|[^\\'])+'         { count (); yylval.val = charVal (yytext); return CONSTANT; /* ' make syntax highliter happy */ }
+{D}+{E}{FS}?            { count (); yylval.val = constFloatVal (yytext); return CONSTANT; }
+{D}*"."{D}+({E})?{FS}?  { count (); yylval.val = constFloatVal (yytext); return CONSTANT; }
+{D}+"."{D}*({E})?{FS}?  { count (); yylval.val = constFloatVal (yytext); return CONSTANT; }
+\"                      { count (); yylval.yystr = stringLiteral (); return STRING_LITERAL; }
+">>="                   { count (); yylval.yyint = RIGHT_ASSIGN; return RIGHT_ASSIGN; }
+"<<="                   { count (); yylval.yyint = LEFT_ASSIGN; return LEFT_ASSIGN; }
+"+="                    { count (); yylval.yyint = ADD_ASSIGN; return ADD_ASSIGN; }
+"-="                    { count (); yylval.yyint = SUB_ASSIGN; return SUB_ASSIGN; }
+"*="                    { count (); yylval.yyint = MUL_ASSIGN; return MUL_ASSIGN; }
+"/="                    { count (); yylval.yyint = DIV_ASSIGN; return DIV_ASSIGN; }
+"%="                    { count (); yylval.yyint = MOD_ASSIGN; return MOD_ASSIGN; }
+"&="                    { count (); yylval.yyint = AND_ASSIGN; return AND_ASSIGN; }
+"^="                    { count (); yylval.yyint = XOR_ASSIGN; return XOR_ASSIGN; }
+"|="                    { count (); yylval.yyint = OR_ASSIGN; return OR_ASSIGN; }
+">>"                    { count (); return RIGHT_OP; }
+"<<"                    { count (); return LEFT_OP; }
+"++"                    { count (); return INC_OP; }
+"--"                    { count (); return DEC_OP; }
+"->"                    { count (); return PTR_OP; }
+"&&"                    { count (); return AND_OP; }
+"||"                    { count (); return OR_OP; }
+"<="                    { count (); return LE_OP; }
+">="                    { count (); return GE_OP; }
+"=="                    { count (); return EQ_OP; }
+"!="                    { count (); return NE_OP; }
+";"                     { count (); return ';'; }
+"{"|"<%"                { count (); ignoreTypedefType = 0; return '{'; }
+"}"|"%>"                { count (); return '}'; }
+","                     { count (); return ','; }
+":"                     { count (); return ':'; }
+"="                     { count (); return '='; }
+"("                     { count (); ignoreTypedefType = 0; return '('; }
+")"                     { count (); return ')'; }
+"["|"<:"                { count (); return '['; }
+"]"|":>"                { count (); return ']'; }
+"."                     { count (); return '.'; }
+"&"                     { count (); return '&'; }
+"!"                     { count (); return '!'; }
+"~"                     { count (); return '~'; }
+"-"                     { count (); return '-'; }
+"+"                     { count (); return '+'; }
+"*"                     { count (); return '*'; }
+"/"                     { count (); return '/'; }
+"%"                     { count (); return '%'; }
+"<"                     { count (); return '<'; }
+">"                     { count (); return '>'; }
+"^"                     { count (); return '^'; }
+"|"                     { count (); return '|'; }
+"?"                     { count (); return '?'; }
+^{HASH}pragma.*         { count (); process_pragma (yytext); }
+^{HASH}.*               { count (); checkCurrFile (yytext); }
+
+"\r\n"                  { count (); }
+"\n"                    { count (); }
+[ \t\v\f]               { count (); }
+\\                      {
   int ch = input ();
 
   if (ch == '\n')
@@ -298,7 +254,7 @@
       unput (ch);
     }
 }
-.              { count (); }
+.                       { count (); }
 %%
 
 /* flex 2.5.31 undefines yytext_ptr, so we have to define it again */
@@ -307,86 +263,67 @@
 #endif
 
 static void
-deprecated_keyword (char *yytext)
-{
-  struct dbuf_s dbuf;
-
-  dbuf_init (&dbuf, 32);
-
-  dbuf_append_char (&dbuf, '_');
-  if ('_' != yytext[0])
-    dbuf_append_char (&dbuf, '_');
-  dbuf_append_str (&dbuf, yytext);
-  werror (W_DEPRECATED_KEYWORD, yytext, dbuf_c_str(&dbuf));
-  dbuf_destroy (&dbuf);
-}
-
-static int
 checkCurrFile (const char *s)
 {
-  int  lNum;
+  int lNum;
   char *tptr;
 
   /* skip '#' character */
   if (*s++ != '#')
-    return 0;
-
-  /* check if this is a #line
-    this is not standard and can be removed in the future */
-#define LINE_STR  "line"
-#define LINE_LEN  ((sizeof LINE_STR) - 1)
-
-  if (strncmp(s, LINE_STR, LINE_LEN) == 0)
-    s += LINE_LEN;
+    return;
 
   /* get the line number */
-  lNum = strtol(s, &tptr, 10);
-  if (tptr == s || !isspace((unsigned char)*tptr))
-    return 0;
+  lNum = strtol (s, &tptr, 10);
+  if (tptr == s || !isspace ((unsigned char) *tptr))
+    return;
   s = tptr;
 
   /* adjust the line number */
-  lineno = lexLineno = lNum;
+  lineno = lexLineno = lNum - 1;
 
   /* now see if we have a file name */
   while (*s != '"' && *s)
     ++s;
 
-  if (!*s)
-    {
-      /* no file name: return */
-      return 0;
-    }
-
-  /* skip the double quote */
-  ++s;
-
-  /* get the file name and see if it is different from current one.
-     in c1mode fullSrcFileName is NULL */
-  if (fullSrcFileName &&
-    strncmp(s, fullSrcFileName, strlen(fullSrcFileName)) == 0 && fullSrcFileName[strlen(fullSrcFileName) - 1] == '"')
+  if (*s)
     {
-      lexFilename = (char *) fullSrcFileName;
-    }
-  else
-    {
-      const char *sb = s;
-      char *tmpFname;
-
-      /* find the end of the file name */
+      /* there is a file name */
+      const char *sb;
+      struct dbuf_s dbuf;
+
+      dbuf_init (&dbuf, 128);
+
+      /* skip the double quote */
+      sb = ++s;
+
+      /* preprocessor emits escaped file names
+       * (e.g. double backslashes on MSDOS-ish file systems),
+       * so we have to unescape it */
       while (*s && *s != '"')
-        ++s;
+        {
+          if (*s == '\\')
+            {
+              /* append chars before backslash */
+              dbuf_append (&dbuf, sb, s - sb);
+              if (*++s)
+                {
+                  /* append char after backslash */
+                  dbuf_append (&dbuf, s, 1);
+                  sb = ++s;
+                }
+            }
+          else
+            ++s;
+        }
+      dbuf_append (&dbuf, sb, s - sb);
 
-      tmpFname = Safe_malloc(s - sb + 1);
-      memcpy(tmpFname, sb, s - sb);
-      tmpFname[s - sb] = '\0';
+      /* DON'T free the file name referenced by lexFilename
+       * since it will be dereferenced in the future at least
+       * by function printCLine(), see struct iCode members
+       * filename in SDCCicode.c */
 
-      lexFilename = Safe_malloc(s - sb + 1);
-      copyStr(lexFilename, tmpFname);
+      filename = lexFilename = dbuf_detach_c_str (&dbuf);
     }
-  filename = lexFilename;
-
-  return 0;
 }
 
 static void
@@ -429,17 +366,20 @@
   if (!ignoreTypedefType && sym && IS_SPEC (sym->etype)
       && SPEC_TYPEDEF (sym->etype) && findSym(TypedefTab, NULL, yytext))
     return (TYPE_NAME);
+  /* check if it is a named address space */
+  else if (findSym (AddrspaceTab, NULL, yytext))
+    return (ADDRSPACE_NAME);
   else
     return(IDENTIFIER);
 }
 
 /*
- * Change by JTV 2001-05-19 to not concantenate strings
+ * Change by JTV 2001-05-19 to not concatenate strings
  * to support ANSI hex and octal escape sequences in string literals
  */
 
-static const char
-*stringLiteral (void)
+static const char *
+stringLiteral (void)
 {
 #define STR_BUF_CHUNCK_LEN  1024
   int ch;
@@ -601,6 +541,7 @@
    P_OPTCODEBALANCED,
    P_STD_C89,
    P_STD_C99,
+   P_STD_C11,
    P_STD_SDCC89,
    P_STD_SDCC99,
    P_CODESEG,
@@ -945,6 +886,7 @@
         }
 
       options.std_c99 = 0;
+      options.std_c11 = 0;
       options.std_sdcc = 0;
       break;
 
@@ -960,6 +902,19 @@
       options.std_sdcc = 0;
       break;
 
+    case P_STD_C11:
+      cp = get_pragma_token(cp, &token);
+      if (TOKEN_EOL != token.type)
+        {
+          err = 1;
+          break;
+        }
+
+      options.std_c99 = 1;
+      options.std_c11 = 1;
+      options.std_sdcc = 0;
+      break;
+
     case P_STD_SDCC89:
       cp = get_pragma_token(cp, &token);
       if (TOKEN_EOL != token.type)
@@ -969,6 +924,7 @@
         }
 
       options.std_c99 = 0;
+      options.std_c11 = 0;
       options.std_sdcc = 1;
       break;
 
@@ -981,6 +937,7 @@
         }
 
       options.std_c99 = 1;
+      options.std_c11 = 0;
       options.std_sdcc = 1;
       break;
 
@@ -1050,6 +1007,7 @@
   { "opt_code_balanced", P_OPTCODEBALANCED, 0, doPragma },
   { "std_c89",           P_STD_C89,         0, doPragma },
   { "std_c99",           P_STD_C99,         0, doPragma },
+  { "std_c11",           P_STD_C11,         0, doPragma },
   { "std_sdcc89",        P_STD_SDCC89,      0, doPragma },
   { "std_sdcc99",        P_STD_SDCC99,      0, doPragma },
   { "codeseg",           P_CODESEG,         0, doPragma },
@@ -1174,13 +1132,7 @@
 {
   fflush(stdout);
 
-  if(options.vc_err_style)
-    fprintf(stderr, "\n%s(%d) : %s: token -> '%s' ; column %d\n",
-      lexFilename, lexLineno, s, yytext, column);
-  else
-    fprintf(stderr, "\n%s:%d: %s: token -> '%s' ; column %d\n",
-      lexFilename, lexLineno, s ,yytext, column);
-  fatalError++;
+  werror (S_SYNTAX_ERROR, yytext, column);
 
   return 0;
 }
diff -Nru sdcc-3.1.0+dfsg/src/SDCC.y sdcc-3.2.0+dfsg/src/SDCC.y
--- sdcc-3.1.0+dfsg/src/SDCC.y	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCC.y	2012-06-07 17:36:23.000000000 +0000
@@ -38,19 +38,19 @@
 
 extern int yyerror (char *);
 extern FILE     *yyin;
-int NestLevel = 0 ;     /* current NestLevel       */
-int stackPtr  = 1 ;     /* stack pointer           */
-int xstackPtr = 0 ;     /* xstack pointer          */
-int reentrant = 0 ;
-int blockNo   = 0 ;     /* sequential block number  */
-int currBlockno=0 ;
-int inCritical= 0 ;
-int seqPointNo= 1 ;     /* sequence point number */
+int NestLevel = 0;      /* current NestLevel       */
+int stackPtr  = 1;      /* stack pointer           */
+int xstackPtr = 0;      /* xstack pointer          */
+int reentrant = 0;
+int blockNo   = 0;      /* sequential block number  */
+int currBlockno=0;
+int inCritical= 0;
+int seqPointNo= 1;      /* sequence point number */
 int ignoreTypedefType=0;
 extern int yylex();
 int yyparse(void);
-extern int noLineno ;
-char lbuff[1024];      /* local buffer */
+extern int noLineno;
+char lbuff[1024];       /* local buffer */
 
 /* break & continue stacks */
 STACK_DCL(continueStack  ,symbol *,MAX_NEST_LEVEL)
@@ -59,7 +59,7 @@
 STACK_DCL(swStk   ,ast   *,MAX_NEST_LEVEL)
 STACK_DCL(blockNum,int,MAX_NEST_LEVEL*3)
 
-value *cenum = NULL  ;  /* current enumeration  type chain*/
+value *cenum = NULL;        /* current enumeration  type chain*/
 bool uselessDecl = TRUE;
 
 #define YYDEBUG 1
@@ -68,39 +68,40 @@
 %expect 6
 
 %union {
-    symbol     *sym ;      /* symbol table pointer       */
-    structdef  *sdef;      /* structure definition       */
+    symbol     *sym;        /* symbol table pointer                   */
+    structdef  *sdef;       /* structure definition                   */
     char       yychar[SDCC_NAME_MAX+1];
-    sym_link   *lnk ;      /* declarator  or specifier   */
-    int        yyint;      /* integer value returned     */
-    value      *val ;      /* for integer constant       */
-    initList   *ilist;     /* initial list               */
-    designation*dsgn;      /* designator                 */
-    const char *yyinline;  /* inlined assembler code     */
-    ast        *asts;      /* expression tree            */
+    sym_link   *lnk;        /* declarator  or specifier               */
+    int        yyint;       /* integer value returned                 */
+    value      *val;        /* for integer constant                   */
+    initList   *ilist;      /* initial list                           */
+    designation*dsgn;       /* designator                             */
+    const char *yystr;      /* pointer to dynamicaly allocated string */
+    ast        *asts;       /* expression tree                        */
 }
 
-%token <yychar> IDENTIFIER TYPE_NAME
-%token <val> CONSTANT STRING_LITERAL
+%token <yychar> IDENTIFIER TYPE_NAME ADDRSPACE_NAME
+%token <val> CONSTANT
 %token SIZEOF TYPEOF OFFSETOF
 %token PTR_OP INC_OP DEC_OP LEFT_OP RIGHT_OP LE_OP GE_OP EQ_OP NE_OP
 %token AND_OP OR_OP
 %token <yyint> MUL_ASSIGN DIV_ASSIGN MOD_ASSIGN ADD_ASSIGN
 %token <yyint> SUB_ASSIGN LEFT_ASSIGN RIGHT_ASSIGN AND_ASSIGN
 %token <yyint> XOR_ASSIGN OR_ASSIGN
-%token TYPEDEF EXTERN STATIC AUTO REGISTER CODE EEPROM INTERRUPT SFR SFR16 SFR32
+%token TYPEDEF EXTERN STATIC AUTO REGISTER CODE EEPROM INTERRUPT SFR SFR16 SFR32 ADDRESSMOD
 %token AT SBIT REENTRANT USING  XDATA DATA IDATA PDATA VAR_ARGS CRITICAL
 %token NONBANKED BANKED SHADOWREGS SD_WPARAM
 %token SD_BOOL SD_CHAR SD_SHORT SD_INT SD_LONG SIGNED UNSIGNED SD_FLOAT DOUBLE FIXED16X16 SD_CONST VOLATILE SD_VOID BIT
 %token STRUCT UNION ENUM RANGE SD_FAR
 %token CASE DEFAULT IF ELSE SWITCH WHILE DO FOR GOTO CONTINUE BREAK RETURN
 %token NAKED JAVANATIVE OVERLAY
-%token <yyinline> INLINEASM
+%token <yystr> STRING_LITERAL INLINEASM
 %token IFX ADDRESS_OF GET_VALUE_AT_ADDRESS SPIL UNSPIL GETHBIT GETABIT GETBYTE GETWORD
 %token BITWISEAND UNARYMINUS IPUSH IPOP PCALL  ENDFUNCTION JUMPTABLE
 %token RRC RLC
 %token CAST CALL PARAM NULLOP BLOCK LABEL RECEIVE SEND ARRAYINIT
-%token DUMMY_READ_VOLATILE ENDCRITICAL SWAP INLINE RESTRICT SMALLC
+%token DUMMY_READ_VOLATILE ENDCRITICAL SWAP INLINE NORETURN RESTRICT SMALLC
+%token ASM
 
 %type <yyint> Interrupt_storage
 %type <sym> identifier declarator declarator2 declarator3 enumerator_list enumerator
@@ -109,6 +110,7 @@
 %type <sym> declaration init_declarator_list init_declarator
 %type <sym> declaration_list identifier_list
 %type <sym> declarator2_function_attributes while do for critical
+%type <sym> addressmod
 %type <lnk> pointer type_specifier_list type_specifier_list_ type_specifier type_name
 %type <lnk> storage_class_specifier struct_or_union_specifier function_specifier
 %type <lnk> declaration_specifiers declaration_specifiers_ sfr_reg_bit sfr_attributes
@@ -124,11 +126,12 @@
 %type <asts> expr argument_expr_list function_definition expr_opt
 %type <asts> statement_list statement labeled_statement compound_statement
 %type <asts> expression_statement selection_statement iteration_statement
-%type <asts> jump_statement function_body else_statement string_literal
-%type <asts> critical_statement
+%type <asts> jump_statement function_body else_statement string_literal_val
+%type <asts> critical_statement asm_statement
 %type <dsgn> designator designator_list designation designation_opt
 %type <ilist> initializer initializer_list
 %type <yyint> unary_operator assignment_operator struct_or_union
+%type <yystr> asm_string_literal
 
 %start file
 
@@ -136,8 +139,8 @@
 
 file
    : /* empty */
-        { if (!options.lessPedantic)
-                    werror(W_EMPTY_SOURCE_FILE);
+        {
+          werror(W_EMPTY_SOURCE_FILE);
         }
    | program
    ;
@@ -148,32 +151,32 @@
    ;
 
 external_definition
-   : function_definition     {
-                               blockNo=0;
-                             }
-   | declaration             {
-                               ignoreTypedefType = 0;
-                               if ($1 && $1->type
-                                && IS_FUNC($1->type))
-                               {
-                                   /* The only legal storage classes for
-                                    * a function prototype (declaration)
-                                    * are extern and static. extern is the
-                                    * default. Thus, if this function isn't
-                                    * explicitly marked static, mark it
-                                    * extern.
-                                    */
-                                   if ($1->etype
-                                    && IS_SPEC($1->etype)
-                                    && !SPEC_STAT($1->etype))
-                                   {
-                                        SPEC_EXTR($1->etype) = 1;
-                                   }
-                               }
-                               addSymChain (&$1);
-                               allocVariables ($1) ;
-                               cleanUpLevel (SymbolTab,1);
-                             }
+   : function_definition
+        {
+          // blockNo = 0;
+        }
+   | declaration
+        {
+          ignoreTypedefType = 0;
+          if ($1 && $1->type && IS_FUNC($1->type))
+            {
+              /* The only legal storage classes for
+               * a function prototype (declaration)
+               * are extern and static. extern is the
+               * default. Thus, if this function isn't
+               * explicitly marked static, mark it
+               * extern.
+               */
+              if ($1->etype && IS_SPEC($1->etype) && !SPEC_STAT($1->etype))
+                {
+                  SPEC_EXTR($1->etype) = 1;
+                }
+            }
+          addSymChain (&$1);
+          allocVariables ($1);
+          cleanUpLevel (SymbolTab, 1);
+        }
+   | addressmod
    ;
 
 function_definition
@@ -197,7 +200,7 @@
 
 function_attributes
    :  USING constant_expr {
-                        $$ = newLink(SPECIFIER) ;
+                        $$ = newLink(SPECIFIER);
                         FUNC_REGBANK($$) = (int) ulFromVal(constExprValue($2,TRUE));
                      }
    |  REENTRANT      {  $$ = newLink (SPECIFIER);
@@ -235,8 +238,8 @@
                      }
    |  Interrupt_storage
                      {
-                        $$ = newLink (SPECIFIER) ;
-                        FUNC_INTNO($$) = $1 ;
+                        $$ = newLink (SPECIFIER);
+                        FUNC_INTNO($$) = $1;
                         FUNC_ISISR($$) = 1;
                      }
    |  SMALLC         {  $$ = newLink (SPECIFIER);
@@ -248,7 +251,7 @@
    : compound_statement
    | declaration_list compound_statement
                      {
-                       werror (E_OLD_STYLE, ($1 ? $1->name: "")) ;
+                       werror (E_OLD_STYLE, ($1 ? $1->name: ""));
                        exit (1);
                      }
    ;
@@ -260,7 +263,7 @@
                        ignoreTypedefType = 0;
                        $4 = newSymbol ($4->name, NestLevel);
                        $4->implicit = 1;
-                       $$ = newNode ('.', $1, newAst_VALUE (symbolVal ($4))) ;
+                       $$ = newNode ('.', $1, newAst_VALUE (symbolVal ($4)));
                      }
    | offsetof_member_designator '[' expr ']'
                      {
@@ -271,22 +274,22 @@
 primary_expr
    : identifier      { $$ = newAst_VALUE (symbolVal ($1)); }
    | CONSTANT        { $$ = newAst_VALUE ($1); }
-   | string_literal
+   | string_literal_val
    | '(' expr ')'    { $$ = $2; }
    ;
 
-string_literal
-    : STRING_LITERAL                    { $$ = newAst_VALUE($1); }
+string_literal_val
+    : STRING_LITERAL                    { $$ = newAst_VALUE (strVal ($1)); }
     ;
 
 postfix_expr
    : primary_expr
-   | postfix_expr '[' expr ']'          { $$ = newNode  ('[', $1, $3) ; }
+   | postfix_expr '[' expr ']'          { $$ = newNode  ('[', $1, $3); }
    | postfix_expr '(' ')'               { $$ = newNode  (CALL,$1,NULL);
                                           $$->left->funcName = 1;}
    | postfix_expr '(' argument_expr_list ')'
           {
-            $$ = newNode  (CALL,$1,$3) ; $$->left->funcName = 1;
+            $$ = newNode  (CALL,$1,$3); $$->left->funcName = 1;
           }
    | postfix_expr '.' { ignoreTypedefType = 1; } identifier
                       {
@@ -325,12 +328,12 @@
    ;
 
 unary_operator
-   : '&'    { $$ = '&' ;}
-   | '*'    { $$ = '*' ;}
-   | '+'    { $$ = '+' ;}
-   | '-'    { $$ = '-' ;}
-   | '~'    { $$ = '~' ;}
-   | '!'    { $$ = '!' ;}
+   : '&'    { $$ = '&';}
+   | '*'    { $$ = '*';}
+   | '+'    { $$ = '+';}
+   | '-'    { $$ = '-';}
+   | '~'    { $$ = '~';}
+   | '!'    { $$ = '!';}
    ;
 
 cast_expr
@@ -402,8 +405,8 @@
    : logical_or_expr
    | logical_or_expr '?' { seqPointNo++;} logical_or_expr ':' conditional_expr
                      {
-                        $$ = newNode(':',$4,$6) ;
-                        $$ = newNode('?',$1,$$) ;
+                        $$ = newNode(':',$4,$6);
+                        $$ = newNode('?',$1,$$);
                      }
    ;
 
@@ -454,7 +457,7 @@
 ;
 
 assignment_operator
-   : '='             { $$ = '=' ;}
+   : '='             { $$ = '=';}
    | MUL_ASSIGN
    | DIV_ASSIGN
    | MOD_ASSIGN
@@ -479,10 +482,27 @@
 declaration
    : declaration_specifiers ';'
       {
+         /* Special case: if incomplete struct/union declared without name, */
+         /* make sure an incomplete type for it exists in the current scope */
+         if (IS_STRUCT($1))
+           {
+             structdef *sdef = SPEC_STRUCT($1);
+             structdef *osdef;
+             osdef = findSymWithBlock (StructTab, sdef->tagsym, currBlockno);
+             if (osdef && osdef->block != currBlockno)
+               {
+                 sdef = newStruct(osdef->tagsym->name);
+                 sdef->level = NestLevel;
+                 sdef->block = currBlockno;
+                 sdef->tagsym = newSymbol (osdef->tagsym->name, NestLevel);
+                 addSym (StructTab, sdef, sdef->tag, sdef->level, currBlockno, 0);
+                 uselessDecl = FALSE;
+               }
+           }
          if (uselessDecl)
            werror(W_USELESS_DECL);
          uselessDecl = TRUE;
-         $$ = NULL ;
+         $$ = NULL;
       }
    | declaration_specifiers init_declarator_list ';'
       {
@@ -493,15 +513,15 @@
              sym_link *lnk = copyLinkChain($1);
              /* do the pointer stuff */
              pointerTypes(sym->type,lnk);
-             addDecl (sym,0,lnk) ;
+             addDecl (sym,0,lnk);
          }
 
          uselessDecl = TRUE;
-         $$ = sym1 ;
+         $$ = sym1;
       }
    ;
 
-declaration_specifiers : declaration_specifiers_ { $$ = finalizeSpec($1); } ;
+declaration_specifiers : declaration_specifiers_ { $$ = finalizeSpec($1); };
 
 declaration_specifiers_
    : storage_class_specifier                                            { $$ = $1; }
@@ -526,12 +546,12 @@
 
 init_declarator_list
    : init_declarator
-   | init_declarator_list ',' init_declarator      { $3->next = $1 ; $$ = $3;}
+   | init_declarator_list ',' init_declarator      { $3->next = $1; $$ = $3;}
    ;
 
 init_declarator
-   : declarator                  { $1->ival = NULL ; }
-   | declarator '=' initializer  { $1->ival = $3   ; }
+   : declarator                  { $1->ival = NULL; }
+   | declarator '=' initializer  { $1->ival = $3; }
    ;
 
 designation_opt
@@ -576,36 +596,40 @@
 
 storage_class_specifier
    : TYPEDEF   {
-                  $$ = newLink (SPECIFIER) ;
-                  SPEC_TYPEDEF($$) = 1 ;
+                  $$ = newLink (SPECIFIER);
+                  SPEC_TYPEDEF($$) = 1;
                }
    | EXTERN    {
                   $$ = newLink(SPECIFIER);
-                  SPEC_EXTR($$) = 1 ;
+                  SPEC_EXTR($$) = 1;
                }
    | STATIC    {
                   $$ = newLink (SPECIFIER);
-                  SPEC_STAT($$) = 1 ;
+                  SPEC_STAT($$) = 1;
                }
    | AUTO      {
-                  $$ = newLink (SPECIFIER) ;
-                  SPEC_SCLS($$) = S_AUTO  ;
+                  $$ = newLink (SPECIFIER);
+                  SPEC_SCLS($$) = S_AUTO;
                }
    | REGISTER  {
                   $$ = newLink (SPECIFIER);
-                  SPEC_SCLS($$) = S_REGISTER ;
+                  SPEC_SCLS($$) = S_REGISTER;
                }
    ;
 
 function_specifier
    : INLINE    {
-                  $$ = newLink (SPECIFIER) ;
-                  SPEC_INLINE($$) = 1 ;
+                  $$ = newLink (SPECIFIER);
+                  SPEC_INLINE($$) = 1;
+               }
+   | NORETURN  {
+                  $$ = newLink (SPECIFIER);
+                  SPEC_NORETURN($$) = 1;
                }
    ;
 
 Interrupt_storage
-   : INTERRUPT { $$ = INTNO_UNSPEC ; }
+   : INTERRUPT { $$ = INTNO_UNSPEC; }
    | INTERRUPT constant_expr
         { int intno = (int) ulFromVal(constExprValue($2,TRUE));
           if ((intno >= 0) && (intno <= INTNO_MAX))
@@ -621,27 +645,27 @@
 type_specifier
    : SD_BOOL   {
                   $$=newLink(SPECIFIER);
-                  SPEC_NOUN($$) = V_BOOL   ;
+                  SPEC_NOUN($$) = V_BOOL;
                   ignoreTypedefType = 1;
                }
    | SD_CHAR   {
                   $$=newLink(SPECIFIER);
-                  SPEC_NOUN($$) = V_CHAR  ;
+                  SPEC_NOUN($$) = V_CHAR;
                   ignoreTypedefType = 1;
                }
    | SD_SHORT  {
                   $$=newLink(SPECIFIER);
-                  SPEC_SHORT($$) = 1 ;
+                  SPEC_SHORT($$) = 1;
                   ignoreTypedefType = 1;
                }
    | SD_INT    {
                   $$=newLink(SPECIFIER);
-                  SPEC_NOUN($$) = V_INT   ;
+                  SPEC_NOUN($$) = V_INT;
                   ignoreTypedefType = 1;
                }
    | SD_LONG   {
                   $$=newLink(SPECIFIER);
-                  SPEC_LONG($$) = 1       ;
+                  SPEC_LONG($$) = 1;
                   ignoreTypedefType = 1;
                }
    | SIGNED    {
@@ -651,12 +675,12 @@
                }
    | UNSIGNED  {
                   $$=newLink(SPECIFIER);
-                  SPEC_USIGN($$) = 1      ;
+                  SPEC_USIGN($$) = 1;
                   ignoreTypedefType = 1;
                }
    | SD_VOID   {
                   $$=newLink(SPECIFIER);
-                  SPEC_NOUN($$) = V_VOID  ;
+                  SPEC_NOUN($$) = V_VOID;
                   ignoreTypedefType = 1;
                }
    | SD_CONST  {
@@ -665,11 +689,15 @@
                }
    | VOLATILE  {
                   $$=newLink(SPECIFIER);
-                  SPEC_VOLATILE($$) = 1 ;
+                  SPEC_VOLATILE($$) = 1;
                }
    | RESTRICT  {
                   $$=newLink(SPECIFIER);
-                  SPEC_RESTRICT($$) = 1 ;
+                  SPEC_RESTRICT($$) = 1;
+               }
+   | ADDRSPACE_NAME {
+                  $$=newLink(SPECIFIER);
+                  SPEC_ADDRSPACE($$) = findSym (AddrspaceTab, 0, $1);
                }
    | SD_FLOAT  {
                   $$=newLink(SPECIFIER);
@@ -683,61 +711,59 @@
                }
    | XDATA     {
                   $$ = newLink (SPECIFIER);
-                  SPEC_SCLS($$) = S_XDATA  ;
+                  SPEC_SCLS($$) = S_XDATA;
                }
    | CODE      {
-                  $$ = newLink (SPECIFIER) ;
-                  SPEC_SCLS($$) = S_CODE ;
+                  $$ = newLink (SPECIFIER);
+                  SPEC_SCLS($$) = S_CODE;
                }
    | EEPROM    {
-                  $$ = newLink (SPECIFIER) ;
-                  SPEC_SCLS($$) = S_EEPROM ;
+                  $$ = newLink (SPECIFIER);
+                  SPEC_SCLS($$) = S_EEPROM;
                }
    | DATA      {
                   $$ = newLink (SPECIFIER);
-                  SPEC_SCLS($$) = S_DATA   ;
+                  SPEC_SCLS($$) = S_DATA;
                }
    | IDATA     {
                   $$ = newLink (SPECIFIER);
-                  SPEC_SCLS($$) = S_IDATA  ;
+                  SPEC_SCLS($$) = S_IDATA;
                }
    | PDATA     {
                   $$ = newLink (SPECIFIER);
-                  SPEC_SCLS($$) = S_PDATA  ;
+                  SPEC_SCLS($$) = S_PDATA;
                }
    | BIT       {
                   $$=newLink(SPECIFIER);
-                  SPEC_NOUN($$) = V_BIT   ;
-                  SPEC_SCLS($$) = S_BIT   ;
+                  SPEC_NOUN($$) = V_BIT;
+                  SPEC_SCLS($$) = S_BIT;
                   SPEC_BLEN($$) = 1;
                   SPEC_BSTR($$) = 0;
                   ignoreTypedefType = 1;
                }
-
    | AT constant_expr {
                   $$=newLink(SPECIFIER);
                   /* add this to the storage class specifier  */
                   SPEC_ABSA($$) = 1;   /* set the absolute addr flag */
                   /* now get the abs addr from value */
-                  SPEC_ADDR($$) = (unsigned int) ulFromVal(constExprValue($2,TRUE)) ;
+                  SPEC_ADDR($$) = (unsigned int) ulFromVal(constExprValue($2,TRUE));
                }
-
    | struct_or_union_specifier  {
                                    uselessDecl = FALSE;
-                                   $$ = $1 ;
+                                   $$ = $1;
                                    ignoreTypedefType = 1;
                                 }
    | enum_specifier     {
-                           cenum = NULL ;
+                           cenum = NULL;
                            uselessDecl = FALSE;
                            ignoreTypedefType = 1;
-                           $$ = $1 ;
+                           $$ = $1;
                         }
    | TYPE_NAME
          {
             symbol *sym;
-            sym_link   *p  ;
-            sym = findSym(TypedefTab,NULL,$1) ;
+            sym_link *p;
+            sym = findSym(TypedefTab,NULL,$1);
             $$ = p = copyLinkChain(sym ? sym->type : NULL);
             SPEC_TYPEDEF(getSpec(p)) = 0;
             ignoreTypedefType = 1;
@@ -747,7 +773,7 @@
 
 sfr_reg_bit
    :  SBIT  {
-               $$ = newLink(SPECIFIER) ;
+               $$ = newLink(SPECIFIER);
                SPEC_NOUN($$) = V_SBIT;
                SPEC_SCLS($$) = S_SBIT;
                SPEC_BLEN($$) = 1;
@@ -759,37 +785,37 @@
 
 sfr_attributes
    : SFR    {
-               $$ = newLink(SPECIFIER) ;
+               $$ = newLink(SPECIFIER);
                FUNC_REGBANK($$) = 0;
                SPEC_NOUN($$)    = V_CHAR;
-               SPEC_SCLS($$)    = S_SFR ;
-               SPEC_USIGN($$)   = 1 ;
+               SPEC_SCLS($$)    = S_SFR;
+               SPEC_USIGN($$)   = 1;
                ignoreTypedefType = 1;
             }
    | SFR BANKED {
-               $$ = newLink(SPECIFIER) ;
+               $$ = newLink(SPECIFIER);
                FUNC_REGBANK($$) = 1;
                SPEC_NOUN($$)    = V_CHAR;
-               SPEC_SCLS($$)    = S_SFR ;
-               SPEC_USIGN($$)   = 1 ;
+               SPEC_SCLS($$)    = S_SFR;
+               SPEC_USIGN($$)   = 1;
                ignoreTypedefType = 1;
             }
    ;
 
 sfr_attributes
    : SFR16  {
-               $$ = newLink(SPECIFIER) ;
+               $$ = newLink(SPECIFIER);
                FUNC_REGBANK($$) = 0;
                SPEC_NOUN($$)    = V_INT;
                SPEC_SCLS($$)    = S_SFR;
-               SPEC_USIGN($$)   = 1 ;
+               SPEC_USIGN($$)   = 1;
                ignoreTypedefType = 1;
             }
    ;
 
 sfr_attributes
    : SFR32  {
-               $$ = newLink(SPECIFIER) ;
+               $$ = newLink(SPECIFIER);
                FUNC_REGBANK($$) = 0;
                SPEC_NOUN($$)    = V_INT;
                SPEC_SCLS($$)    = S_SFR;
@@ -802,291 +828,358 @@
 struct_or_union_specifier
    : struct_or_union opt_stag
         {
-           if (!$2->type)
-             {
-               $2->type = $1;
-             }
-           else
-             {
-               if ($2->type != $1)
-                 werror(E_BAD_TAG, $2->tag, $1==STRUCT ? "struct" : "union");
-             }
+          structdef *sdef;
 
+          if (! $2->tagsym)
+            {
+              /* no tag given, so new struct def for current scope */
+              addSym (StructTab, $2, $2->tag, $2->level, currBlockno, 0);
+            }
+          else
+            {
+              sdef = findSymWithBlock (StructTab, $2->tagsym, currBlockno);
+              if (sdef)
+                {
+                  /* Error if a complete type already defined in this scope */
+                  if (sdef->block == currBlockno)
+                    {
+                      if (sdef->fields)
+                        {
+                          werror(E_STRUCT_REDEF, $2->tag);
+                          werrorfl(sdef->tagsym->fileDef, sdef->tagsym->lineDef, E_PREVIOUS_DEF);
+                        }
+                      else
+                        {
+                          $2 = sdef; /* We are completing an incomplete type */
+                        }
+                    }
+                  else
+                    {
+                      /* There is an existing struct def in an outer scope. */
+                      /* Create new struct def for current scope */
+                      addSym (StructTab, $2, $2->tag, $2->level, currBlockno, 0);
+                    }
+                }
+              else
+               {
+                 /* There is no existing struct def at all. */
+                 /* Create new struct def for current scope */
+                 addSym (StructTab, $2, $2->tag, $2->level, currBlockno, 0);
+               }
+            }
+
+          if (!$2->type)
+            {
+              $2->type = $1;
+            }
+          else
+            {
+              if ($2->type != $1)
+                  werror(E_BAD_TAG, $2->tag, $1==STRUCT ? "struct" : "union");
+            }
         }
-           '{' struct_declaration_list '}'
+     '{' struct_declaration_list '}'
         {
-           structdef *sdef ;
-           symbol *sym, *dsym;
+          structdef *sdef;
+          symbol *sym, *dsym;
 
-           // check for errors in structure members
-           for (sym=$5; sym; sym=sym->next) {
-             if (IS_ABSOLUTE(sym->etype)) {
-               werrorfl(sym->fileDef, sym->lineDef, E_NOT_ALLOWED, "'at'");
-               SPEC_ABSA(sym->etype) = 0;
-             }
-             if (IS_SPEC(sym->etype) && SPEC_SCLS(sym->etype)) {
-               werrorfl(sym->fileDef, sym->lineDef, E_NOT_ALLOWED, "storage class");
-               printTypeChainRaw (sym->type,NULL);
-               SPEC_SCLS(sym->etype) = 0;
-             }
-             for (dsym=sym->next; dsym; dsym=dsym->next) {
-               if (*dsym->name && strcmp(sym->name, dsym->name)==0) {
-                 werrorfl(sym->fileDef, sym->lineDef, E_DUPLICATE_MEMBER,
-                        $1==STRUCT ? "struct" : "union", sym->name);
-                 werrorfl(dsym->fileDef, dsym->lineDef, E_PREVIOUS_DEF);
-               }
-             }
-           }
+          // check for errors in structure members
+          for (sym=$5; sym; sym=sym->next)
+            {
+              if (IS_ABSOLUTE(sym->etype))
+                {
+                  werrorfl(sym->fileDef, sym->lineDef, E_NOT_ALLOWED, "'at'");
+                  SPEC_ABSA(sym->etype) = 0;
+                }
+              if (IS_SPEC(sym->etype) && SPEC_SCLS(sym->etype))
+                {
+                  werrorfl(sym->fileDef, sym->lineDef, E_NOT_ALLOWED, "storage class");
+                  printTypeChainRaw (sym->type, NULL);
+                  SPEC_SCLS(sym->etype) = 0;
+                }
+              for (dsym=sym->next; dsym; dsym=dsym->next)
+                {
+                  if (*dsym->name && strcmp(sym->name, dsym->name)==0)
+                    {
+                      werrorfl(sym->fileDef, sym->lineDef, E_DUPLICATE_MEMBER,
+                               $1==STRUCT ? "struct" : "union", sym->name);
+                      werrorfl(dsym->fileDef, dsym->lineDef, E_PREVIOUS_DEF);
+                    }
+                }
+            }
 
-           /* Create a structdef   */
-           sdef = $2 ;
-           sdef->fields   = reverseSyms($5) ;   /* link the fields */
-           sdef->size  = compStructSize($1,sdef);   /* update size of  */
-           promoteAnonStructs ($1, sdef);
-
-           /* Create the specifier */
-           $$ = newLink (SPECIFIER) ;
-           SPEC_NOUN($$) = V_STRUCT;
-           SPEC_STRUCT($$)= sdef ;
+          /* Create a structdef   */
+          sdef = $2;
+          sdef->fields = reverseSyms($5);        /* link the fields */
+          sdef->size = compStructSize($1, sdef); /* update size of  */
+          promoteAnonStructs ($1, sdef);
+
+          /* Create the specifier */
+          $$ = newLink (SPECIFIER);
+          SPEC_NOUN($$) = V_STRUCT;
+          SPEC_STRUCT($$)= sdef;
         }
    | struct_or_union stag
-         {
-            $$ = newLink(SPECIFIER) ;
-            SPEC_NOUN($$) = V_STRUCT;
-            SPEC_STRUCT($$) = $2;
+        {
+          structdef *sdef;
 
-           if (!$2->type)
-             {
-               $2->type = $1;
-             }
-           else
-             {
-               if ($2->type != $1)
-                 werror(E_BAD_TAG, $2->tag, $1==STRUCT ? "struct" : "union");
-             }
-         }
+          sdef = findSymWithBlock (StructTab, $2->tagsym, currBlockno);
+          if (sdef)
+            $2 = sdef;
+          else
+            {
+              /* new struct def for current scope */
+              addSym (StructTab, $2, $2->tag, $2->level, currBlockno, 0);
+            }
+          $$ = newLink(SPECIFIER);
+          SPEC_NOUN($$) = V_STRUCT;
+          SPEC_STRUCT($$) = $2;
+
+          if (!$2->type)
+            {
+              $2->type = $1;
+            }
+          else
+            {
+              if ($2->type != $1)
+                  werror(E_BAD_TAG, $2->tag, $1==STRUCT ? "struct" : "union");
+            }
+        }
    ;
 
 struct_or_union
-   : STRUCT          { $$ = STRUCT ; ignoreTypedefType = 1; }
-   | UNION           { $$ = UNION  ; ignoreTypedefType = 1; }
+   : STRUCT          { $$ = STRUCT; ignoreTypedefType = 1; }
+   | UNION           { $$ = UNION; ignoreTypedefType = 1; }
    ;
 
 opt_stag
-: stag
-|  {  /* synthesize a name add to structtable */
-     ignoreTypedefType = 0;
-     $$ = newStruct(genSymName(NestLevel)) ;
-     $$->level = NestLevel ;
-     addSym (StructTab, $$, $$->tag, $$->level, currBlockno, 0);
-};
+   : stag
+   |    {  /* synthesize a name add to structtable */
+          ignoreTypedefType = 0;
+          $$ = newStruct(genSymName(NestLevel));
+          $$->level = NestLevel;
+          $$->block = currBlockno;
+          $$->tagsym = NULL;
+          //addSym (StructTab, $$, $$->tag, $$->level, currBlockno, 0);
+        }
+   ;
 
 stag
-:  identifier  {  /* add name to structure table */
-     ignoreTypedefType = 0;
-     $$ = findSymWithBlock (StructTab, $1, currBlockno);
-     if (! $$ ) {
-       $$ = newStruct($1->name) ;
-       $$->level = NestLevel ;
-       addSym (StructTab, $$, $$->tag, $$->level, currBlockno, 0);
-     }
-};
-
+   : identifier
+        {  /* add name to structure table */
+          ignoreTypedefType = 0;
+          $$ = newStruct($1->name);
+          $$->level = NestLevel;
+          $$->block = currBlockno;
+          $$->tagsym = $1;
+          //$$ = findSymWithBlock (StructTab, $1, currBlockno);
+          //if (! $$ )
+          //  {
+          //    $$ = newStruct($1->name);
+          //    $$->level = NestLevel;
+          //    $$->tagsym = $1;
+          //    //addSym (StructTab, $$, $$->tag, $$->level, currBlockno, 0);
+          //  }
+        }
+   ;
 
 struct_declaration_list
    : struct_declaration
    | struct_declaration_list struct_declaration
-       {
-           symbol *sym=$2;
+        {
+          symbol *sym = $2;
 
-           /* go to the end of the chain */
-           while (sym->next) sym=sym->next;
-           sym->next = $1 ;
+          /* go to the end of the chain */
+          while (sym->next) sym = sym->next;
+          sym->next = $1;
 
            $$ = $2;
-       }
+        }
    ;
 
 struct_declaration
    : type_specifier_list struct_declarator_list ';'
-       {
-           /* add this type to all the symbols */
-           symbol *sym ;
-           for ( sym = $2 ; sym != NULL ; sym = sym->next ) {
-               sym_link *btype = copyLinkChain($1);
-
-               /* make the symbol one level up */
-               sym->level-- ;
-
-               pointerTypes(sym->type,btype);
-               if (!sym->type) {
-                   sym->type = btype;
-                   sym->etype = getSpec(sym->type);
-               }
-               else
-                 addDecl (sym,0,btype);
-               /* make sure the type is complete and sane */
-               checkTypeSanity(sym->etype, sym->name);
-           }
-           ignoreTypedefType = 0;
-           $$ = $2;
-       }
+        {
+          /* add this type to all the symbols */
+          symbol *sym;
+          for ( sym = $2; sym != NULL; sym = sym->next )
+            {
+              sym_link *btype = copyLinkChain($1);
+
+              pointerTypes(sym->type, btype);
+              if (!sym->type)
+                {
+                  sym->type = btype;
+                  sym->etype = getSpec(sym->type);
+                }
+              else
+                  addDecl (sym, 0, btype);
+              /* make sure the type is complete and sane */
+              checkTypeSanity(sym->etype, sym->name);
+            }
+          ignoreTypedefType = 0;
+          $$ = $2;
+        }
    ;
 
 struct_declarator_list
    : struct_declarator
    | struct_declarator_list ',' struct_declarator
-       {
-           $3->next  = $1 ;
-           $$ = $3 ;
-       }
+        {
+          $3->next  = $1;
+          $$ = $3;
+        }
    ;
 
 struct_declarator
    : declarator
-   | ':' constant_expr  {
-                           unsigned int bitsize;
-                           $$ = newSymbol (genSymName(NestLevel),NestLevel) ;
-                           bitsize = (unsigned int) ulFromVal(constExprValue($2,TRUE));
-                           if (bitsize > (port->s.int_size * 8)) {
-                             bitsize = port->s.int_size * 8;
-                             werror(E_BITFLD_SIZE, bitsize);
-                           }
-                           if (!bitsize)
-                             bitsize = BITVAR_PAD;
-                           $$->bitVar = bitsize;
-                           $$->bitUnnamed = 1;
-                        }
+   | ':' constant_expr
+        {
+          unsigned int bitsize;
+          $$ = newSymbol (genSymName(NestLevel), NestLevel);
+          bitsize = (unsigned int) ulFromVal(constExprValue($2, TRUE));
+          if (bitsize > (port->s.int_size * 8))
+            {
+              bitsize = port->s.int_size * 8;
+              werror(E_BITFLD_SIZE, bitsize);
+            }
+          if (!bitsize)
+              bitsize = BITVAR_PAD;
+          $$->bitVar = bitsize;
+          $$->bitUnnamed = 1;
+        }
    | declarator ':' constant_expr
-                        {
-                          unsigned int bitsize;
-                          bitsize = (unsigned int) ulFromVal(constExprValue($3,TRUE));
-                          if (bitsize > (port->s.int_size * 8)) {
-                            bitsize = port->s.int_size * 8;
-                            werror(E_BITFLD_SIZE, bitsize);
-                          }
-                          if (!bitsize) {
-                            $$ = newSymbol (genSymName(NestLevel),NestLevel) ;
-                            $$->bitVar = BITVAR_PAD;
-                            werror(W_BITFLD_NAMED);
-                          }
-                          else
-                            $1->bitVar = bitsize;
-                        }
-   | { $$ = newSymbol ("", NestLevel) ; }
-
+        {
+          unsigned int bitsize;
+          bitsize = (unsigned int) ulFromVal(constExprValue($3, TRUE));
+          if (bitsize > (port->s.int_size * 8))
+            {
+              bitsize = port->s.int_size * 8;
+              werror(E_BITFLD_SIZE, bitsize);
+            }
+          if (!bitsize)
+            {
+              $$ = newSymbol (genSymName(NestLevel), NestLevel);
+              $$->bitVar = BITVAR_PAD;
+              werror(W_BITFLD_NAMED);
+            }
+          else
+              $1->bitVar = bitsize;
+        }
+   | { $$ = newSymbol ("", NestLevel); }
    ;
 
 enum_specifier
-   : ENUM            '{' enumerator_list '}' {
-           $$ = newEnumType ($3);       //copyLinkChain(cenum->type);
-           SPEC_SCLS(getSpec($$)) = 0;
-         }
+   : ENUM '{' enumerator_list '}'
+        {
+          $$ = newEnumType ($3);
+          SPEC_SCLS(getSpec($$)) = 0;
+        }
+   | ENUM identifier '{' enumerator_list '}'
+        {
+          symbol *csym;
+          sym_link *enumtype;
 
-   | ENUM identifier '{' enumerator_list '}' {
-     symbol *csym ;
-     sym_link *enumtype;
-
-     csym=findSym(enumTab,$2,$2->name);
-     if ((csym && csym->level == $2->level))
-       {
-         werrorfl($2->fileDef, $2->lineDef, E_DUPLICATE_TYPEDEF,csym->name);
-         werrorfl(csym->fileDef, csym->lineDef, E_PREVIOUS_DEF);
-       }
+          csym = findSymWithLevel(enumTab, $2);
+          if ((csym && csym->level == $2->level))
+            {
+              werrorfl($2->fileDef, $2->lineDef, E_DUPLICATE_TYPEDEF, csym->name);
+              werrorfl(csym->fileDef, csym->lineDef, E_PREVIOUS_DEF);
+            }
 
-     enumtype = newEnumType ($4);       //copyLinkChain(cenum->type);
-     SPEC_SCLS(getSpec(enumtype)) = 0;
-     $2->type = enumtype;
-
-     /* add this to the enumerator table */
-     if (!csym)
-       addSym ( enumTab,$2,$2->name,$2->level,$2->block, 0);
-     $$ = copyLinkChain(enumtype);
-   }
-   | ENUM identifier                         {
-     symbol *csym ;
+          enumtype = newEnumType ($4);
+          SPEC_SCLS(getSpec(enumtype)) = 0;
+          $2->type = enumtype;
+
+          /* add this to the enumerator table */
+          if (!csym)
+              addSym (enumTab, $2, $2->name, $2->level, $2->block, 0);
+          $$ = copyLinkChain(enumtype);
+        }
+   | ENUM identifier
+        {
+          symbol *csym;
 
-     /* check the enumerator table */
-     if ((csym = findSym(enumTab,$2,$2->name)))
-       $$ = copyLinkChain(csym->type);
-     else  {
-       $$ = newLink(SPECIFIER) ;
-       SPEC_NOUN($$) = V_INT   ;
-     }
-   }
+          /* check the enumerator table */
+          if ((csym = findSymWithLevel(enumTab, $2)))
+              $$ = copyLinkChain(csym->type);
+          else
+            {
+              $$ = newLink(SPECIFIER);
+              SPEC_NOUN($$) = V_INT;
+            }
+        }
    ;
 
 enumerator_list
-    : enumerator
-    | enumerator_list ','
-    | enumerator_list ',' enumerator
-      {
-        $3->next = $1 ;
-        $$ = $3  ;
-      }
-    ;
+   : enumerator
+   | enumerator_list ','
+   | enumerator_list ',' enumerator
+        {
+          $3->next = $1;
+          $$ = $3;
+        }
+   ;
 
 enumerator
-    : identifier opt_assign_expr
-      {
-        symbol *sym;
+   : identifier opt_assign_expr
+        {
+          symbol *sym;
 
-        /* make the symbol one level up */
-        $1->level-- ;
-        // check if the symbol at the same level already exists
-        if ((sym = findSymWithLevel (SymbolTab, $1)) &&
-          sym->level == $1->level)
-          {
-            werrorfl ($1->fileDef, $1->lineDef, E_DUPLICATE_MEMBER, "enum", $1->name);
-            werrorfl (sym->fileDef, sym->lineDef, E_PREVIOUS_DEF);
-          }
-        $1->type = copyLinkChain ($2->type);
-        $1->etype= getSpec ($1->type);
-        SPEC_ENUM ($1->etype) = 1;
-        $$ = $1 ;
-        // do this now, so we can use it for the next enums in the list
-        addSymChain (&$1);
-      }
-    ;
+          // check if the symbol at the same level already exists
+          if ((sym = findSymWithLevel (SymbolTab, $1)) && sym->level == $1->level)
+            {
+              werrorfl ($1->fileDef, $1->lineDef, E_DUPLICATE_MEMBER, "enum", $1->name);
+              werrorfl (sym->fileDef, sym->lineDef, E_PREVIOUS_DEF);
+            }
+          $1->type = copyLinkChain ($2->type);
+          $1->etype = getSpec ($1->type);
+          SPEC_ENUM ($1->etype) = 1;
+          $$ = $1;
+          // do this now, so we can use it for the next enums in the list
+          addSymChain (&$1);
+        }
+   ;
 
 opt_assign_expr
-   :  '='   constant_expr  {
-                              value *val ;
+   : '=' constant_expr
+        {
+          value *val;
 
-                              val = constExprValue($2,TRUE);
-                              if (!IS_INT(val->type) && !IS_CHAR(val->type) && !IS_BOOL(val->type))
-                                {
-                                  werror(E_ENUM_NON_INTEGER);
-                                  SNPRINTF(lbuff, sizeof(lbuff),
-                                          "%d", (int) ulFromVal(val));
-                                  val = constVal(lbuff);
-                                }
-                              $$ = cenum = val ;
-                           }
-   |                       {
-                              if (cenum)  {
-                                 SNPRINTF(lbuff, sizeof(lbuff),
-                                          "%d", (int) ulFromVal(cenum)+1);
-                                 $$ = cenum = constVal(lbuff);
-                              }
-                              else {
-                                 $$ = cenum = constCharVal(0);
-                              }
-                           }
+          val = constExprValue($2, TRUE);
+          if (!IS_INT(val->type) && !IS_CHAR(val->type) && !IS_BOOL(val->type))
+            {
+              werror(E_ENUM_NON_INTEGER);
+              SNPRINTF(lbuff, sizeof(lbuff), "%d", (int) ulFromVal(val));
+              val = constVal(lbuff);
+            }
+          $$ = cenum = val;
+        }
+   |    {
+          if (cenum)
+            {
+              SNPRINTF(lbuff, sizeof(lbuff), "%d", (int) ulFromVal(cenum)+1);
+              $$ = cenum = constVal(lbuff);
+            }
+          else
+            {
+              $$ = cenum = constCharVal(0);
+            }
+        }
    ;
 
 declarator
-   : declarator3                        { $$ = $1 ; }
+   : declarator3                        { $$ = $1; }
    | pointer declarator3
          {
              addDecl ($2,0,reverseLink($1));
-             $$ = $2 ;
+             $$ = $2;
          }
    ;
 
 declarator3
-   : declarator2_function_attributes    { $$ = $1 ; }
-   | declarator2                        { $$ = $1 ; }
+   : declarator2_function_attributes    { $$ = $1; }
+   | declarator2                        { $$ = $1; }
    ;
 
 function_declarator
@@ -1094,12 +1187,12 @@
    | pointer declarator2_function_attributes
          {
              addDecl ($2,0,reverseLink($1));
-             $$ = $2 ;
+             $$ = $2;
          }
    ;
 
 declarator2_function_attributes
-   : function_declarator2                 { $$ = $1 ; }
+   : function_declarator2                 { $$ = $1; }
    | function_declarator2 function_attribute  {
            // copy the functionAttributes (not the args and hasVargs !!)
            struct value *args;
@@ -1139,8 +1232,8 @@
             sym_link   *p;
 
             p = newLink (DECLARATOR);
-            DCL_TYPE(p) = ARRAY ;
-            DCL_ELEM(p) = 0     ;
+            DCL_TYPE(p) = ARRAY;
+            DCL_ELEM(p) = 0;
             addDecl($1,0,p);
          }
    | declarator3 '[' constant_expr ']'
@@ -1175,84 +1268,94 @@
    ;
 
 function_declarator2
-   : declarator2 '('  ')'       {  addDecl ($1,FUNCTION,NULL) ;   }
-   | declarator2 '('            { NestLevel++ ; currBlockno++;  }
-                     parameter_type_list ')'
-         {
-             sym_link *funcType;
+   : declarator2 '('  ')'
+        {
+          addDecl ($1, FUNCTION, NULL);
+        }
+   | declarator2 '('
+        {
+          NestLevel++;
+          STACK_PUSH(blockNum, currBlockno);
+          currBlockno = ++blockNo;
+        }
+     parameter_type_list ')'
+        {
+          sym_link *funcType;
 
-             addDecl ($1,FUNCTION,NULL) ;
+          addDecl ($1, FUNCTION, NULL);
 
-             funcType = $1->type;
-             while (funcType && !IS_FUNC(funcType))
-               funcType = funcType->next;
+          funcType = $1->type;
+          while (funcType && !IS_FUNC(funcType))
+              funcType = funcType->next;
 
-             assert (funcType);
+          assert (funcType);
 
-             FUNC_HASVARARGS(funcType) = IS_VARG($4);
-             FUNC_ARGS(funcType) = reverseVal($4);
+          FUNC_HASVARARGS(funcType) = IS_VARG($4);
+          FUNC_ARGS(funcType) = reverseVal($4);
 
-             /* nest level was incremented to take care of the parms  */
-             NestLevel-- ;
-             currBlockno--;
+          /* nest level was incremented to take care of the parms  */
+          NestLevel--;
+          currBlockno = STACK_POP(blockNum);
 
-             // if this was a pointer (to a function)
-             if (!IS_FUNC($1->type))
-               cleanUpLevel(SymbolTab,NestLevel+1);
+          // if this was a pointer (to a function)
+          if (!IS_FUNC($1->type))
+              cleanUpLevel(SymbolTab, NestLevel + 1);
 
-             $$ = $1;
-         }
+          $$ = $1;
+        }
    | declarator2 '(' identifier_list ')'
-         {
-           werror(E_OLD_STYLE,$1->name) ;
-           /* assume it returns an int */
-           $1->type = $1->etype = newIntLink();
-           $$ = $1 ;
-         }
+        {
+          werror(E_OLD_STYLE,$1->name);
+          /* assume it returns an int */
+          $1->type = $1->etype = newIntLink();
+          $$ = $1;
+        }
    ;
 
 pointer
-   : unqualified_pointer { $$ = $1 ;}
+   : unqualified_pointer { $$ = $1;}
    | unqualified_pointer type_specifier_list
          {
-             $$ = $1  ;
+             $$ = $1;
              if (IS_SPEC($2)) {
                  DCL_TSPEC($1) = $2;
                  DCL_PTR_CONST($1) = SPEC_CONST($2);
                  DCL_PTR_VOLATILE($1) = SPEC_VOLATILE($2);
                  DCL_PTR_RESTRICT($1) = SPEC_RESTRICT($2);
+                 DCL_PTR_ADDRSPACE($1) = SPEC_ADDRSPACE($2);
              }
              else
                  werror (W_PTR_TYPE_INVALID);
          }
    | unqualified_pointer pointer
          {
-             $$ = $1 ;
-             $$->next = $2 ;
+             $$ = $1;
+             $$->next = $2;
              DCL_TYPE($2)=port->unqualified_pointer;
          }
    | unqualified_pointer type_specifier_list pointer
          {
-             $$ = $1 ;
+             $$ = $1;
              if (IS_SPEC($2) && DCL_TYPE($3) == UPOINTER) {
                  DCL_PTR_CONST($1) = SPEC_CONST($2);
                  DCL_PTR_VOLATILE($1) = SPEC_VOLATILE($2);
                  DCL_PTR_RESTRICT($1) = SPEC_RESTRICT($2);
+                 DCL_PTR_ADDRSPACE($1) = SPEC_ADDRSPACE($2);
                  switch (SPEC_SCLS($2)) {
                  case S_XDATA:
                      DCL_TYPE($3) = FPOINTER;
                      break;
                  case S_IDATA:
-                     DCL_TYPE($3) = IPOINTER ;
+                     DCL_TYPE($3) = IPOINTER;
                      break;
                  case S_PDATA:
-                     DCL_TYPE($3) = PPOINTER ;
+                     DCL_TYPE($3) = PPOINTER;
                      break;
                  case S_DATA:
-                     DCL_TYPE($3) = POINTER ;
+                     DCL_TYPE($3) = POINTER;
                      break;
                  case S_CODE:
-                     DCL_TYPE($3) = CPOINTER ;
+                     DCL_TYPE($3) = CPOINTER;
                      break;
                  case S_EEPROM:
                      DCL_TYPE($3) = EEPPOINTER;
@@ -1265,7 +1368,7 @@
              }
              else
                  werror (W_PTR_TYPE_INVALID);
-             $$->next = $3 ;
+             $$->next = $3;
          }
    ;
 
@@ -1277,7 +1380,7 @@
       }
    ;
 
-type_specifier_list : type_specifier_list_ { $$ = finalizeSpec($1); } ;
+type_specifier_list : type_specifier_list_ { $$ = finalizeSpec($1); };
 
 type_specifier_list_
    : type_specifier
@@ -1294,7 +1397,7 @@
    | identifier_list ',' identifier
          {
            $3->next = $1;
-           $$ = $3 ;
+           $$ = $3;
          }
    ;
 
@@ -1307,8 +1410,8 @@
    : parameter_declaration
    | parameter_list ',' parameter_declaration
          {
-            $3->next = $1 ;
-            $$ = $3 ;
+            $3->next = $1;
+            $$ = $3;
          }
    ;
 
@@ -1365,9 +1468,9 @@
             }
           else
             {
-              p->next = $1 ;
+              p->next = $1;
             }
-          $$ = $2 ;
+          $$ = $2;
           ignoreTypedefType = 0;
         }
    ;
@@ -1375,38 +1478,38 @@
 abstract_declarator
    : pointer { $$ = reverseLink($1); }
    | abstract_declarator2
-   | pointer abstract_declarator2   { $1 = reverseLink($1); $1->next = $2 ; $$ = $1;
+   | pointer abstract_declarator2   { $1 = reverseLink($1); $1->next = $2; $$ = $1;
           if (IS_PTR($1) && IS_FUNC($2))
             DCL_TYPE($1) = CPOINTER;
         }
    ;
 
 abstract_declarator2
-   : '(' abstract_declarator ')'    { $$ = $2 ; }
+   : '(' abstract_declarator ')'    { $$ = $2; }
    | '[' ']'                        {
                                        $$ = newLink (DECLARATOR);
-                                       DCL_TYPE($$) = ARRAY ;
-                                       DCL_ELEM($$) = 0     ;
+                                       DCL_TYPE($$) = ARRAY;
+                                       DCL_ELEM($$) = 0;
                                     }
    | '[' constant_expr ']'          {
-                                       value *val ;
+                                       value *val;
                                        $$ = newLink (DECLARATOR);
-                                       DCL_TYPE($$) = ARRAY ;
+                                       DCL_TYPE($$) = ARRAY;
                                        DCL_ELEM($$) = (int) ulFromVal(val = constExprValue($2,TRUE));
                                     }
    | abstract_declarator2 '[' ']'   {
                                        $$ = newLink (DECLARATOR);
-                                       DCL_TYPE($$) = ARRAY ;
-                                       DCL_ELEM($$) = 0     ;
-                                       $$->next = $1 ;
+                                       DCL_TYPE($$) = ARRAY;
+                                       DCL_ELEM($$) = 0;
+                                       $$->next = $1;
                                     }
    | abstract_declarator2 '[' constant_expr ']'
                                     {
-                                       value *val ;
+                                       value *val;
                                        $$ = newLink (DECLARATOR);
-                                       DCL_TYPE($$) = ARRAY ;
+                                       DCL_TYPE($$) = ARRAY;
                                        DCL_ELEM($$) = (int) ulFromVal(val = constExprValue($3,TRUE));
-                                       $$->next = $1 ;
+                                       $$->next = $1;
                                     }
    | '(' ')'                        { $$ = NULL;}
    | '(' parameter_type_list ')'    { $$ = NULL;}
@@ -1422,27 +1525,35 @@
      }
      $1->next=p;
    }
-   | abstract_declarator2 '(' { NestLevel++ ; currBlockno++; } parameter_type_list ')' {
-       sym_link *p = newLink(DECLARATOR);
-       DCL_TYPE(p) = FUNCTION;
-
-       FUNC_HASVARARGS(p) = IS_VARG($4);
-       FUNC_ARGS(p) = reverseVal($4);
-
-       /* nest level was incremented to take care of the parms  */
-       NestLevel--;
-       currBlockno--;
-       if (!$1) {
-         /* ((void (code *) (void)) 0) () */
-         $1 = newLink(DECLARATOR);
-         DCL_TYPE($1) = CPOINTER;
-         $$ = $1;
-       }
-       $1->next = p;
+   | abstract_declarator2 '('
+        {
+          NestLevel++;
+          STACK_PUSH(blockNum, currBlockno);
+          currBlockno = ++blockNo;
+        }
+     parameter_type_list ')'
+        {
+          sym_link *p = newLink(DECLARATOR);
+          DCL_TYPE(p) = FUNCTION;
+
+          FUNC_HASVARARGS(p) = IS_VARG($4);
+          FUNC_ARGS(p) = reverseVal($4);
 
-       // disabled to fix bug 3190029
-//       // remove the symbol args (if any)
-//       cleanUpLevel(SymbolTab, NestLevel+1);
+          /* nest level was incremented to take care of the parms  */
+          NestLevel--;
+          currBlockno = STACK_POP(blockNum);
+          if (!$1)
+            {
+              /* ((void (code *) (void)) 0) () */
+              $1 = newLink(DECLARATOR);
+              DCL_TYPE($1) = CPOINTER;
+              $$ = $1;
+            }
+          $1->next = p;
+
+          // disabled to fix bug 3190029
+//        // remove the symbol args (if any)
+//        cleanUpLevel(SymbolTab, NestLevel + 1);
    }
    ;
 
@@ -1470,14 +1581,7 @@
    | iteration_statement
    | jump_statement
    | critical_statement
-   | INLINEASM  ';'      {
-                            ast *ex;
-                            seqPointNo++;
-                            ex = newNode(INLINEASM,NULL,NULL);
-                            ex->values.inlineasm = strdup($1);
-                            seqPointNo++;
-                            $$ = ex;
-                         }
+   | asm_statement
    ;
 
 critical
@@ -1518,25 +1622,40 @@
      }
    ;
 
-start_block : '{'
-              {
-                STACK_PUSH(blockNum, currBlockno);
-                currBlockno = ++blockNo ;
-                ignoreTypedefType = 0;
-              }
-            ;
+start_block
+   : '{'
+        {
+          NestLevel++;
+          STACK_PUSH(blockNum, currBlockno);
+          currBlockno = ++blockNo;
+          ignoreTypedefType = 0;
+        }
+   ;
 
-end_block   : '}'     { currBlockno = STACK_POP(blockNum); }
-            ;
+end_block
+   : '}'
+        {
+          NestLevel--;
+          currBlockno = STACK_POP(blockNum);
+        }
+   ;
 
 compound_statement
    : start_block end_block                    { $$ = createBlock(NULL, NULL); }
    | start_block statement_list end_block     { $$ = createBlock(NULL, $2); }
-   | start_block declaration_list end_block   { $$ = createBlock($2, NULL); }
+   | start_block declaration_list end_block
+     {
+       $$ = createBlock($2, NULL); 
+       cleanUpLevel(StructTab, NestLevel + 1);
+     }
    | start_block
           declaration_list statement_list
-     end_block                                {$$ = createBlock($2, $3); }
-   | error ';'                                { $$ = NULL ; }
+     end_block
+     {
+       $$ = createBlock($2, $3); 
+       cleanUpLevel(StructTab, NestLevel + 1);
+     }
+   | error ';'                                { $$ = NULL; }
    ;
 
 declaration_list
@@ -1545,10 +1664,10 @@
        /* if this is typedef declare it immediately */
        if ( $1 && IS_TYPEDEF($1->etype)) {
          allocVariables ($1);
-         $$ = NULL ;
+         $$ = NULL;
        }
        else
-         $$ = $1 ;
+         $$ = $1;
        ignoreTypedefType = 0;
        addSymChain(&$1);
      }
@@ -1560,18 +1679,18 @@
        /* if this is a typedef */
        if ($2 && IS_TYPEDEF($2->etype)) {
          allocVariables ($2);
-         $$ = $1 ;
+         $$ = $1;
        }
        else {
          /* get to the end of the previous decl */
          if ( $1 ) {
-           $$ = sym = $1 ;
+           $$ = sym = $1;
            while (sym->next)
-             sym = sym->next ;
+             sym = sym->next;
            sym->next = $2;
          }
          else
-           $$ = $2 ;
+           $$ = $2;
        }
        ignoreTypedefType = 0;
        addSymChain(&$2);
@@ -1580,7 +1699,7 @@
 
 statement_list
    : statement
-   | statement_list statement          {  $$ = newNode(NULLOP,$1,$2) ;}
+   | statement_list statement          {  $$ = newNode(NULLOP,$1,$2);}
    ;
 
 expression_statement
@@ -1589,29 +1708,29 @@
    ;
 
 else_statement
-   :  ELSE  statement   { $$ = $2  ; }
-   |                    { $$ = NULL;}
+   :  ELSE  statement   { $$ = $2; }
+   |                    { $$ = NULL; }
    ;
 
 
 selection_statement
    : IF '(' expr ')' { seqPointNo++;} statement else_statement
                            {
-                              noLineno++ ;
+                              noLineno++;
                               $$ = createIf ($3, $6, $7 );
                               $$->lineno = $3->lineno;
                               $$->filename = $3->filename;
                               noLineno--;
                            }
    | SWITCH '(' expr ')'   {
-                              ast *ex ;
-                              static   int swLabel = 0 ;
+                              ast *ex;
+                              static   int swLabel = 0;
 
                               seqPointNo++;
                               /* create a node for expression  */
                               ex = newNode(SWITCH,$3,NULL);
                               STACK_PUSH(swStk,ex);   /* save it in the stack */
-                              ex->values.switchVals.swNum = swLabel ;
+                              ex->values.switchVals.swNum = swLabel;
 
                               /* now create the label */
                               SNPRINTF(lbuff, sizeof(lbuff),
@@ -1622,14 +1741,14 @@
                            }
      statement             {
                               /* get back the switch form the stack  */
-                              $$ = STACK_POP(swStk)  ;
+                              $$ = STACK_POP(swStk);
                               $$->right = newNode (NULLOP,$6,createLabel($<sym>5,NULL));
                               STACK_POP(breakStack);
                            }
         ;
 
 while : WHILE  {  /* create and push the continue , break & body labels */
-                  static int Lblnum = 0 ;
+                  static int Lblnum = 0;
                   /* continue */
                   SNPRINTF (lbuff, sizeof(lbuff), "_whilecontinue_%d",Lblnum);
                   STACK_PUSH(continueStack,newSymbol(lbuff,NestLevel));
@@ -1643,7 +1762,7 @@
    ;
 
 do : DO {  /* create and push the continue , break & body Labels */
-           static int Lblnum = 0 ;
+           static int Lblnum = 0;
 
            /* continue */
            SNPRINTF(lbuff, sizeof(lbuff), "_docontinue_%d",Lblnum);
@@ -1658,7 +1777,7 @@
    ;
 
 for : FOR { /* create & push continue, break & body labels */
-            static int Lblnum = 0 ;
+            static int Lblnum = 0;
 
             /* continue */
             SNPRINTF(lbuff, sizeof(lbuff), "_forcontinue_%d",Lblnum);
@@ -1678,26 +1797,26 @@
 iteration_statement
    : while '(' expr ')' { seqPointNo++;}  statement
                          {
-                           noLineno++ ;
+                           noLineno++;
                            $$ = createWhile ( $1, STACK_POP(continueStack),
                                               STACK_POP(breakStack), $3, $6 );
                            $$->lineno = $1->lineDef;
                            $$->filename = $1->fileDef;
-                           noLineno-- ;
+                           noLineno--;
                          }
    | do statement   WHILE '(' expr ')' ';'
                         {
                           seqPointNo++;
-                          noLineno++ ;
+                          noLineno++;
                           $$ = createDo ( $1 , STACK_POP(continueStack),
                                           STACK_POP(breakStack), $5, $2);
                           $$->lineno = $1->lineDef;
                           $$->filename = $1->fileDef;
-                          noLineno-- ;
+                          noLineno--;
                         }
    | for '(' expr_opt   ';' expr_opt ';' expr_opt ')'  statement
                         {
-                          noLineno++ ;
+                          noLineno++;
 
                           /* if break or continue statement present
                              then create a general case loop */
@@ -1712,19 +1831,19 @@
                               AST_FOR($$,trueLabel) = $1;
                               AST_FOR($$,continueLabel) =  STACK_POP(continueStack);
                               AST_FOR($$,falseLabel) = STACK_POP(breakStack);
-                              AST_FOR($$,condLabel)  = STACK_POP(forStack)  ;
+                              AST_FOR($$,condLabel)  = STACK_POP(forStack);
                               AST_FOR($$,initExpr)   = $3;
                               AST_FOR($$,condExpr)   = $5;
                               AST_FOR($$,loopExpr)   = $7;
                           }
 
-                          noLineno-- ;
+                          noLineno--;
                         }
 ;
 
 expr_opt
-        :                       { $$ = NULL ; seqPointNo++; }
-        |       expr            { $$ = $1 ; seqPointNo++; }
+        :                       { $$ = NULL; seqPointNo++; }
+        |       expr            { $$ = $1; seqPointNo++; }
         ;
 
 jump_statement
@@ -1776,7 +1895,48 @@
    }
    ;
 
+asm_string_literal
+   : STRING_LITERAL
+   ;
+
+asm_statement
+   : ASM '(' asm_string_literal ')' ';'
+      {
+        ast *ex;
+
+        seqPointNo++;
+        ex = newNode(INLINEASM, NULL, NULL);
+        ex->values.inlineasm = copyStr ($3, NULL);
+        seqPointNo++;
+        $$ = ex;
+     }
+   | INLINEASM ';'
+      {
+        ast *ex;
+
+        seqPointNo++;
+        ex = newNode(INLINEASM, NULL, NULL);
+        ex->values.inlineasm = strdup($1);
+        seqPointNo++;
+        $$ = ex;
+      }
+   ;
+
+addressmod
+   : ADDRESSMOD identifier identifier ';' {
+     symbol *sym;
+     if ((sym = findSymWithLevel (AddrspaceTab, $3)) && sym->level == $3->level)
+       werrorfl (sym->fileDef, sym->lineDef, E_PREVIOUS_DEF);
+     if (!findSymWithLevel (SymbolTab, $2))
+       werror (E_ID_UNDEF, $2->name);
+     addSym (AddrspaceTab, $3, $3->name, $3->level, $3->block, 0);
+     sym = findSymWithLevel (AddrspaceTab, $3);
+     sym->addressmod[0] = findSymWithLevel (SymbolTab, $2);
+     sym->addressmod[1] = 0;
+   }
+   ;
+
 identifier
-   : IDENTIFIER   { $$ = newSymbol ($1,NestLevel) ; }
+   : IDENTIFIER   { $$ = newSymbol ($1, NestLevel); }
    ;
 %%
diff -Nru sdcc-3.1.0+dfsg/src/SDCCBBlock.c sdcc-3.2.0+dfsg/src/SDCCBBlock.c
--- sdcc-3.1.0+dfsg/src/SDCCBBlock.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCBBlock.c	2012-06-09 08:45:58.000000000 +0000
@@ -439,6 +439,7 @@
     {
       ic->filename = ip->filename;
       ic->lineno = ip->lineno;
+      ic->eBBlockNum = ip->eBBlockNum;
       ic->prev = ip->prev;
       ip->prev = ic;
       ic->next = ip;
diff -Nru sdcc-3.1.0+dfsg/src/SDCCasm.c sdcc-3.2.0+dfsg/src/SDCCasm.c
--- sdcc-3.1.0+dfsg/src/SDCCasm.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCasm.c	2012-03-30 20:01:27.000000000 +0000
@@ -1,8 +1,7 @@
 /*-------------------------------------------------------------------------
   SDCCasm.c - header file for all types of stuff to support different assemblers.
 
-
-  Written By - Michael Hope <michaelh@juju.net.nz> 2000
+  Copyright (C) 2000, Michael Hope <michaelh@juju.net.nz>
 
   This program is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by the
@@ -17,74 +16,68 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-  In other words, you are welcome to use, share and improve this program.
-  You are forbidden to forbid anyone else to use, share and improve
-  what you give them.   Help stamp out software-hoarding!
 -------------------------------------------------------------------------*/
 
-/*  Provides output functions that modify the output string
-    based on the input tokens and the assembler token mapping
-    specification loaded.
-
-    Note that the functions below only handle digit format modifiers.
-    eg %02X is ok, but %lu and %.4u will fail.
-*/
+/* Provides output functions that modify the output string
+   based on the input tokens and the assembler token mapping
+   specification loaded.
+
+   Note that the functions below only handle digit format modifiers.
+   eg %02X is ok, but %lu and %.4u will fail.
+
+   A 'token' is like !blah or %24f and is under the programmers
+   control. */
 
 #include <errno.h>
 
 #include "common.h"
 #include "dbuf_string.h"
 
-/* A 'token' is like !blah or %24f and is under the programmers
-   control. */
-
 static hTab *_h;
 
-char *
-FileBaseName (char *fileFullName)
+const char *
+FileBaseName (const char *fileFullName)
 {
-  char *p = fileFullName;
+  const char *p;
 
   if (!fileFullName)
     {
       return "unknown";
     }
 
-  while (*fileFullName)
-    {
-      if ((*fileFullName == '/') || (*fileFullName == '\\') || (*fileFullName == ':'))
-        {
-          p = fileFullName;
-          p++;
-        }
-      fileFullName++;
-    }
-  return p;
+  for (p = fileFullName + strlen (fileFullName) - 1;
+       p >= fileFullName && (*p != '/' && *p != '\\' && *p != ':');
+       --p)
+    ;
+
+  return p + 1;
 }
 
 void
 dbuf_tvprintf (struct dbuf_s *dbuf, const char *format, va_list ap)
 {
-  // Under Linux PPC va_list is a structure instead of a primitive type,
-  // and doesnt like being passed around.  This version turns everything
-  // into one function.
-
-  // Supports:
-  //  !tokens
-  //  %[CIFN] - special formats with no argument (ie list isnt touched)
-  //  All of the system formats
-
-  // This is acheived by expanding the tokens and zero arg formats into
-  // one big format string, which is passed to the native printf.
+  /*
+     Under Linux PPC va_list is a structure instead of a primitive type,
+     and doesnt like being passed around.  This version turns everything
+     into one function.
+
+     Supports:
+      !tokens
+      %[CIFN] - special formats with no argument (ie list isnt touched)
+      All of the system formats
+
+     This is acheived by expanding the tokens and zero arg formats into
+     one big format string, which is passed to the native printf.
+   */
   static int count;
   struct dbuf_s tmpDBuf;
   const char *noTokens;
   const char *sz = format;
+  const char *begin = NULL;
 
+  /* First pass: expand all of the macros */
   dbuf_init (&tmpDBuf, INITIAL_INLINEASM);
 
-  /* First pass: expand all of the macros */
   while (*sz)
     {
       if (*sz == '!')
@@ -94,8 +87,15 @@
           const char *t;
           struct dbuf_s token;
 
+          if (begin)
+            {
+              /* copy what we have until now */
+              dbuf_append (&tmpDBuf, begin, sz - begin);
+              begin = NULL;
+            }
+
           dbuf_init (&token, 64);
-          sz++;
+          ++sz;
           while (isalpha ((unsigned char) *sz) || *sz == '*')
             {
               dbuf_append (&token, sz++, 1);
@@ -115,10 +115,19 @@
         }
       else
         {
-          dbuf_append_char (&tmpDBuf, *sz++);
+          if (!begin)
+            begin = sz;
+          ++sz;
         }
     }
 
+  if (begin)
+    {
+      /* copy what we have until now */
+      dbuf_append (&tmpDBuf, begin, sz - begin);
+      begin = NULL;
+    }
+
   /* Second pass: Expand any macros that we own */
   sz = noTokens = dbuf_detach_c_str (&tmpDBuf);
 
@@ -129,32 +138,39 @@
     {
       if (*sz == '%')
         {
+          if (begin)
+            {
+              /* copy what we have until now */
+              dbuf_append (&tmpDBuf, begin, sz - begin);
+              begin = NULL;
+            }
+
           // See if its one that we handle.
-          sz++;
+          ++sz;
           switch (*sz)
             {
             case 'C':
               // Code segment name.
               dbuf_append_str (&tmpDBuf, CODE_NAME);
-              sz++;
+              ++sz;
               break;
 
             case 'F':
               // Source file name.
               dbuf_append_str (&tmpDBuf, fullSrcFileName);
-              sz++;
+              ++sz;
               break;
 
             case 'N':
               // Current function name.
               dbuf_append_str (&tmpDBuf, currFunc->rname);
-              sz++;
+              ++sz;
               break;
 
             case 'I':
               // Unique ID.
               dbuf_printf (&tmpDBuf, "%u", ++count);
-              sz++;
+              ++sz;
               break;
 
             default:
@@ -164,14 +180,24 @@
                 dbuf_append_char (&tmpDBuf, *sz++);
 
               dbuf_append_char (&tmpDBuf, *sz++);
+              break;
             }
         }
       else
         {
-          dbuf_append_char (&tmpDBuf, *sz++);
+          if (!begin)
+            begin = sz;
+          ++sz;
         }
     }
 
+  if (begin)
+    {
+      /* copy what we have until now */
+      dbuf_append (&tmpDBuf, begin, sz - begin);
+      begin = NULL;
+    }
+
   dbuf_free (noTokens);
 
   dbuf_vprintf (dbuf, dbuf_c_str (&tmpDBuf), ap);
@@ -193,7 +219,6 @@
 {
   va_list ap;
   struct dbuf_s dbuf;
-  size_t len;
 
   dbuf_init (&dbuf, INITIAL_INLINEASM);
 
@@ -201,8 +226,7 @@
   dbuf_tvprintf (&dbuf, szFormat, ap);
   va_end (ap);
 
-  len = dbuf_get_length (&dbuf);
-  fwrite (dbuf_get_buf (&dbuf), 1, len, fp);
+  fwrite (dbuf_get_buf (&dbuf), 1, dbuf_get_length (&dbuf), fp);
   dbuf_destroy (&dbuf);
 }
 
@@ -228,36 +252,25 @@
 const char *
 printILine (iCode * ic)
 {
-  char *verbalICode;
   struct dbuf_s tmpBuf;
-  size_t len;
   iCodeTable *icTab = getTableEntry (ic->op);
 
   dbuf_init (&tmpBuf, 1024);
 
   if (INLINEASM == ic->op)
-    dbuf_append (&tmpBuf, "inline", (sizeof "inline") - 1);
+    dbuf_append_str (&tmpBuf, "inline");
   else
     {
       /* stuff the temporary file with the readable icode */
       icTab->iCodePrint (&tmpBuf, ic, icTab->printName);
     }
 
-  len = dbuf_get_length (&tmpBuf);
-
   /* null terminate the buffer */
-  dbuf_c_str (&tmpBuf);
-  verbalICode = dbuf_detach (&tmpBuf);
-
-  /* kill the trailing NL */
-  if (len > 0 && '\n' == verbalICode[len - 1])
-    verbalICode[--len] = '\0';
+  dbuf_chomp (&tmpBuf);
 
-  /* and throw it up */
-  return verbalICode;
+  return dbuf_detach_c_str (&tmpBuf);
 }
 
-
 /*-----------------------------------------------------------------*/
 /* skipLine - skip the line from file infp                         */
 /*-----------------------------------------------------------------*/
@@ -335,7 +348,7 @@
              don't panic, just return the error message */
           dbuf_printf (&line, "ERROR: %s", strerror (errno));
 
-          return dbuf_c_str (&line);
+          return dbuf_detach_c_str (&line);
         }
       else
         {
@@ -363,20 +376,18 @@
   /* get the line */
   if (0 != (len = dbuf_getline (&line, inFile)))
     {
-      const char *inLineString = dbuf_c_str (&line);
+      const char *inLineString;
 
       ++inLineNo;
 
       /* remove the trailing NL */
-      if (len > 0 && '\n' == inLineString[len - 1])
-        {
-          dbuf_set_length (&line, --len);
-          inLineString = dbuf_c_str (&line);
-        }
+      dbuf_chomp (&line);
+
+      inLineString = dbuf_detach_c_str (&line);
 
       /* skip leading spaces */
       while (isspace (*inLineString))
-        inLineString++;
+        ++inLineString;
 
       return inLineString;
     }
@@ -384,7 +395,7 @@
 err_no_line:
   dbuf_printf (&line, "ERROR: no line number %d in file %s", lineno, srcFile);
 
-  return dbuf_c_str (&line);
+  return dbuf_detach_c_str (&line);
 }
 
 static const ASM_MAPPING _asxxxx_mapping[] = {
diff -Nru sdcc-3.1.0+dfsg/src/SDCCasm.h sdcc-3.2.0+dfsg/src/SDCCasm.h
--- sdcc-3.1.0+dfsg/src/SDCCasm.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCasm.h	2012-03-30 20:01:27.000000000 +0000
@@ -1,7 +1,7 @@
 /*-------------------------------------------------------------------------
   SDCCasm.h - header file for all types of stuff to support different assemblers.
 
-  Written By - Michael Hope <michaelh@juju.net.nz> 2000
+  Copyright (C) 2000, Michael Hope <michaelh@juju.net.nz>
 
   This program is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by the
@@ -16,10 +16,6 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-  In other words, you are welcome to use, share and improve this program.
-  You are forbidden to forbid anyone else to use, share and improve
-  what you give them.   Help stamp out software-hoarding!
 -------------------------------------------------------------------------*/
 
 #ifndef SDCCASM_H
@@ -59,7 +55,7 @@
  */
 void asm_addTree (const ASM_MAPPINGS * pMappings);
 
-char *FileBaseName (char *fileFullName);
+const char *FileBaseName (const char *fileFullName);
 
 const char *printILine (iCode * ic);
 const char *printCLine (const char *srcFile, int lineno);
diff -Nru sdcc-3.1.0+dfsg/src/SDCCast.c sdcc-3.2.0+dfsg/src/SDCCast.c
--- sdcc-3.1.0+dfsg/src/SDCCast.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCast.c	2012-06-10 12:32:06.000000000 +0000
@@ -71,6 +71,7 @@
 int inInitMode = 0;
 memmap *GcurMemmap = NULL;      /* points to the memmap that's currently active */
 struct dbuf_s *codeOutBuf;
+
 int
 ptt (ast * tree)
 {
@@ -78,7 +79,6 @@
   return 0;
 }
 
-
 /*-----------------------------------------------------------------*/
 /* newAst - creates a fresh node for an expression tree            */
 /*-----------------------------------------------------------------*/
@@ -200,6 +200,12 @@
       AST_FOR (dest, initExpr) = copyAst (AST_FOR (src, initExpr));
       AST_FOR (dest, condExpr) = copyAst (AST_FOR (src, condExpr));
       AST_FOR (dest, loopExpr) = copyAst (AST_FOR (src, loopExpr));
+      break;
+
+    case CAST:
+      dest->values.cast.literalFromCast = src->values.cast.literalFromCast;
+      dest->values.cast.removedCast = src->values.cast.removedCast;
+      dest->values.cast.implicitCast = src->values.cast.implicitCast;
     }
 }
 
@@ -537,6 +543,13 @@
         }
     }
 
+  if (tree->type == EX_OP && tree->opval.op == FOR)
+    {
+      AST_FOR (tree, initExpr) = resolveSymbols (AST_FOR (tree, initExpr));
+      AST_FOR (tree, condExpr) = resolveSymbols (AST_FOR (tree, condExpr));
+      AST_FOR (tree, loopExpr) = resolveSymbols (AST_FOR (tree, loopExpr));
+    }
+
   /* if this is a label resolve it from the labelTab */
   if (IS_AST_VALUE (tree) && tree->opval.val->sym && tree->opval.val->sym->islbl)
     {
@@ -599,6 +612,28 @@
         }
     }
 
+    /* If entering a block with symbols defined, mark the symbols in-scope */
+    /* before continuing down the tree, and mark them out-of-scope again   */
+    /* on the way back up */ 
+    if (tree->type == EX_OP && tree->opval.op == BLOCK && tree->values.sym)
+      {
+        symbol * sym = tree->values.sym;
+        while (sym)
+          {
+            sym->isinscope = 1;
+            sym = sym->next;
+          }
+        resolveSymbols (tree->left);
+        resolveSymbols (tree->right);
+        sym = tree->values.sym;
+        while (sym)
+          {
+            sym->isinscope = 0;
+            sym = sym->next;
+          }
+        return tree;
+      }
+      
 resolveChildren:
   resolveSymbols (tree->left);
   resolveSymbols (tree->right);
@@ -668,7 +703,7 @@
 /* funcOfTypeVarg :- function of type with name and argtype        */
 /*-----------------------------------------------------------------*/
 symbol *
-funcOfTypeVarg (char *name, char *rtype, int nArgs, char **atypes)
+funcOfTypeVarg (const char *name, const char *rtype, int nArgs, const char **atypes)
 {
   symbol *sym;
   int i;
@@ -771,20 +806,6 @@
   else
     functype = func->ftype;
 
-  /* if the function is being called via a pointer &  */
-  /* it has not been defined reentrant then we cannot */
-  /* have parameters                                  */
-  /* PIC16 port can... */
-  if (!TARGET_IS_PIC16)
-    {
-      if (func->type != EX_VALUE && !IFFUNC_ISREENT (functype) && !options.stackAuto)
-        {
-          werror (E_NONRENT_ARGS);
-          fatalError++;
-          return 1;
-        }
-    }
-
   /* if defined parameters ended but actual parameters */
   /* exist and this is not defined as a variable arg   */
   if (!defParm && *actParm && !IFFUNC_HASVARARGS (functype))
@@ -894,6 +915,7 @@
           *actParm = newNode (CAST, newType, *actParm);
           (*actParm)->filename = (*actParm)->right->filename;
           (*actParm)->lineno = (*actParm)->right->lineno;
+          AST_VALUES (*actParm, cast.implicitCast) = 1;
 
           *actParm = decorateType (*actParm, resultType);
         }
@@ -916,19 +938,18 @@
             werrorfl ((*actParm)->filename, (*actParm)->lineno, E_STRUCT_AS_ARG, (*actParm)->opval.val->name);
           else
             werrorfl ((*actParm)->filename, (*actParm)->lineno, E_STRUCT_AS_ARG, "");
-          return 1;
         }
       else
         {
           werror (E_INCOMPAT_TYPES);
           printFromToType ((*actParm)->ftype, defParm->type);
-          return 1;
         }
+      return 1;
     }
 
   /* if the parameter is castable then add the cast */
   if ((IS_ARRAY((*actParm)->ftype) && IS_PTR(defParm->type)) ||
-      (compareType (defParm->type, (*actParm)->ftype) < 0))
+      (compareType (defParm->type, (*actParm)->ftype) == -1))
     {
       ast *pTree;
 
@@ -936,11 +957,10 @@
       pTree = resolveSymbols (copyAst (*actParm));
 
       /* now change the current one to a cast */
-      (*actParm)->type = EX_OP;
-      (*actParm)->opval.op = CAST;
-      (*actParm)->left = newAst_LINK (defParm->type);
-      (*actParm)->right = pTree;
-      (*actParm)->decorated = 0;        /* force typechecking */
+      *actParm = newNode (CAST, newAst_LINK (defParm->type), pTree);
+      (*actParm)->filename = (*actParm)->right->filename;
+      (*actParm)->lineno = (*actParm)->right->lineno;
+      AST_VALUES (*actParm, cast.implicitCast) = 1;
       *actParm = decorateType (*actParm, IS_GENPTR (defParm->type) ? RESULT_TYPE_GPTR : resultType);
     }
 
@@ -1227,7 +1247,6 @@
   return decorateType (resolveSymbols (rast), RESULT_TYPE_NONE);
 }
 
-
 /*-----------------------------------------------------------------*/
 /* createIvalCharPtr - generates initial values for char pointers  */
 /*-----------------------------------------------------------------*/
@@ -1269,7 +1288,7 @@
     {
       /* for each character generate an assignment */
       /* to the array element */
-      char *s = SPEC_CVAL (iexpr->etype).v_char;
+      const char *s = SPEC_CVAL (iexpr->etype).v_char;
       unsigned int i = 0;
       unsigned int symsize = getSize (type);
 
@@ -1280,7 +1299,13 @@
             {
               char *name = (IS_AST_SYM_VALUE (sym)) ? AST_SYMBOL (sym)->name : "";
 
-              werrorfl (iexpr->filename, iexpr->lineno, W_EXCESS_INITIALIZERS, "string", name);
+              if (options.std_c99 && s[symsize] == '\0' && size == symsize + 1)
+                { 
+                  if (!options.lessPedantic)
+                    werrorfl (iexpr->filename, iexpr->lineno, W_STRING_CANNOT_BE_TERMINATED, name);
+                }
+              else
+                werrorfl (iexpr->filename, iexpr->lineno, W_EXCESS_INITIALIZERS, "string", name);
             }
           size = symsize;
         }
@@ -1581,6 +1606,13 @@
   if (tree->type == EX_OP && tree->opval.op == BLOCK)
     {
       ast *autoInit;
+      symbol * sym = tree->values.sym;
+
+      while (sym)
+        {
+          sym->isinscope = 1;
+          sym = sym->next;
+        }
 
       if (action == ALLOCATE)
         {
@@ -1597,6 +1629,19 @@
 
   processBlockVars (tree->left, stack, action);
   processBlockVars (tree->right, stack, action);
+
+  /* if this is a block */
+  if (tree->type == EX_OP && tree->opval.op == BLOCK)
+    {
+      symbol * sym = tree->values.sym;
+
+      while (sym)
+        {
+          sym->isinscope = 0;
+          sym = sym->next;
+        }
+    }
+    
   return tree;
 }
 
@@ -2014,7 +2059,6 @@
             return FALSE;
         }
 
-
 /*------------------------------------------------------------------*/
     case '|':
     case '^':
@@ -2117,9 +2161,9 @@
       /*       function call        */
       /*----------------------------*/
     case CALL:
-      /* if local & not passed as parameter &
+      /* if local & no parameters &
          not used to find the function then ok */
-      if (sym->level && !astHasSymbol (pbody->right, sym) && !astHasSymbol (pbody->left, sym))
+      if (sym->level && !pbody->right && !astHasSymbol (pbody->left, sym))
         {
           return TRUE;
         }
@@ -2409,6 +2453,10 @@
     case '~':
     case LEFT_OP:
     case LABEL:
+    case GETHBIT:
+    case GETABIT:
+    case GETBYTE:
+    case GETWORD:
       return resultType;
     case '*':
     case '+':
@@ -2494,6 +2542,7 @@
 
           assignee->type = copyLinkChain (TTYPE (dtr));
           assignee->etype = getSpec (assignee->type);
+          SPEC_ADDRSPACE (assignee->etype) = 0;
           SPEC_SCLS (assignee->etype) = S_AUTO;
           SPEC_OCLS (assignee->etype) = NULL;
           SPEC_EXTR (assignee->etype) = 0;
@@ -2565,6 +2614,14 @@
 checkPtrCast (sym_link * newType, sym_link * orgType, bool implicit)
 {
   int errors = 0;
+  
+  if (IS_ARRAY (orgType))
+    {
+      value *val;
+      val = aggregateToPointer (valFromType (orgType));
+      orgType = val->type;
+      Safe_free (val);
+    }
 
   if (IS_PTR (newType))         // to a pointer
     {
@@ -2604,7 +2661,11 @@
         }
       else                      // from a pointer to a pointer
         {
-          if (IS_GENPTR (newType) && IS_VOID (newType->next))
+          if (implicit && getAddrspace (newType->next) != getAddrspace (orgType->next))
+            {
+              errors += werror (E_INCOMPAT_PTYPES);
+            }
+          else if (IS_GENPTR (newType) && IS_VOID (newType->next))
             {                   // cast to void* is always allowed
             }
           else if (IS_GENPTR (orgType) && IS_VOID (orgType->next))
@@ -2735,7 +2796,10 @@
             }
         }
       else
-        wassert (0);            /* unreached: all values are literals or symbols */
+        {
+          /* unreached: all values are literals or symbols */
+          wassert (0);
+        }
 
       return tree;
     }
@@ -2917,6 +2981,7 @@
         {
           setOClass (LTYPE (tree), TETYPE (tree));
           SPEC_SCLS (TETYPE (tree)) = sclsFromPtr (LTYPE (tree));
+          SPEC_ADDRSPACE (TETYPE (tree)) = DCL_PTR_ADDRSPACE (LTYPE (tree));
         }
       /* This breaks with extern declarations, bit-fields, and perhaps other */
       /* cases (gcse). Let's leave this optimization disabled for now and   */
@@ -2980,10 +3045,12 @@
       /*----------------------------*/
       /*  bitwise and               */
       /*----------------------------*/
-    case '&':                  /* can be unary   */
-      /* if right is NULL then unary operation  */
-      if (tree->right)          /* not an unary operation */
+    case '&':                  /* can be unary */
+      /* if right is NULL then unary operation */
+      if (tree->right)          /* not a unary operation */
         {
+          ast *otree;
+
           if (!IS_INTEGRAL (LTYPE (tree)) || !IS_INTEGRAL (RTYPE (tree)))
             {
               werrorfl (tree->filename, tree->lineno, E_BITWISE_OP);
@@ -3007,42 +3074,6 @@
               return tree;
             }
 
-          /* see if this is a GETHBIT operation if yes
-             then return that */
-          {
-            ast *otree = optimizeGetHbit (tree, resultType);
-
-            if (otree != tree)
-              return decorateType (otree, RESULT_TYPE_NONE);
-          }
-
-          /* see if this is a GETABIT operation if yes
-             then return that */
-          {
-            ast *otree = optimizeGetAbit (tree, resultType);
-
-            if (otree != tree)
-              return decorateType (otree, RESULT_TYPE_NONE);
-          }
-
-          /* see if this is a GETBYTE operation if yes
-             then return that */
-          {
-            ast *otree = optimizeGetByte (tree, resultType);
-
-            if (otree != tree)
-              return decorateType (otree, RESULT_TYPE_NONE);
-          }
-
-          /* see if this is a GETWORD operation if yes
-             then return that */
-          {
-            ast *otree = optimizeGetWord (tree, resultType);
-
-            if (otree != tree)
-              return decorateType (otree, RESULT_TYPE_NONE);
-          }
-
           /* if left is a literal exchange left & right */
           if (IS_LITERAL (LTYPE (tree)))
             {
@@ -3068,6 +3099,37 @@
                 }
             }
 
+          /* if ANDing boolean with literal then reduce literal LSB to boolean */
+          if (IS_LITERAL (RTYPE (tree)) && IS_BOOLEAN (LTYPE (tree)))
+            {
+              unsigned long litval = AST_ULONG_VALUE (tree->right);
+              tree->right = decorateType (newAst_VALUE (constBoolVal (litval & 1)), resultType);
+            }
+
+          /* see if this is a GETHBIT operation if yes
+             then return that */
+          otree = optimizeGetHbit (tree, resultType);
+          if (otree != tree)
+            return decorateType (otree, RESULT_TYPE_NONE);
+
+          /* see if this is a GETABIT operation if yes
+             then return that */
+          otree = optimizeGetAbit (tree, resultType);
+          if (otree != tree)
+            return decorateType (otree, RESULT_TYPE_NONE);
+
+          /* see if this is a GETBYTE operation if yes
+             then return that */
+          otree = optimizeGetByte (tree, resultType);
+          if (otree != tree)
+            return decorateType (otree, RESULT_TYPE_NONE);
+
+          /* see if this is a GETWORD operation if yes
+             then return that */
+          otree = optimizeGetWord (tree, resultType);
+          if (otree != tree)
+            return decorateType (otree, RESULT_TYPE_NONE);
+
           LRVAL (tree) = RRVAL (tree) = 1;
 
           TTYPE (tree) = computeType (LTYPE (tree), RTYPE (tree), resultType, tree->opval.op);
@@ -3080,9 +3142,14 @@
       /*----------------------------*/
       /*  address of                */
       /*----------------------------*/
-      p = newLink (DECLARATOR);
+      if (IS_FUNC (LTYPE (tree)))
+        {
+          // this ought to be ignored
+          return (tree->left);
+        }
+
       /* if bit field then error */
-      if (IS_BITFIELD (tree->left->etype) || (IS_BITVAR (tree->left->etype) && (TARGET_IS_MCS51 || TARGET_IS_XA51 || TARGET_IS_DS390)))
+      if (IS_BITFIELD (tree->left->etype) || (IS_BITVAR (tree->left->etype) && TARGET_MCS51_LIKE))
         {
           werrorfl (tree->filename, tree->lineno, E_ILLEGAL_ADDR, "address of bit variable");
           goto errorTreeReturn;
@@ -3094,12 +3161,6 @@
           goto errorTreeReturn;
         }
 
-      if (IS_FUNC (LTYPE (tree)))
-        {
-          // this ought to be ignored
-          return (tree->left);
-        }
-
       if (IS_LITERAL (LTYPE (tree)))
         {
           werrorfl (tree->filename, tree->lineno, E_ILLEGAL_ADDR, "address of literal");
@@ -3111,6 +3172,8 @@
           werrorfl (tree->filename, tree->lineno, E_LVALUE_REQUIRED, "address of");
           goto errorTreeReturn;
         }
+
+      p = newLink (DECLARATOR);
       if (!LETYPE (tree))
         DCL_TYPE (p) = POINTER;
       else if (SPEC_SCLS (LETYPE (tree)) == S_CODE)
@@ -3196,6 +3259,17 @@
               decorateType (parent, resultType);
             }
         }
+
+      /* if ORing boolean with literal then reduce literal to boolean */
+      if (IS_LITERAL (RTYPE (tree)) &&
+          IS_BOOLEAN (LTYPE (tree)) &&
+          IS_INTEGRAL (RTYPE (tree)) &&
+          resultType == RESULT_TYPE_BIT)
+        {
+          unsigned long litval = AST_ULONG_VALUE (tree->right);
+          tree->right = decorateType (newAst_VALUE (constBoolVal (litval != 0)), resultType);
+        }
+
       /* fall through */
 
       /*------------------------------------------------------------------*/
@@ -3250,6 +3324,27 @@
             }
         }
 
+      /* if XORing boolean with literal then reduce literal to boolean */
+      if (IS_LITERAL (RTYPE (tree)) &&
+          IS_BOOLEAN (LTYPE (tree)) &&
+          IS_INTEGRAL (RTYPE (tree)) &&
+          resultType == RESULT_TYPE_BIT &&
+          tree->opval.op == '^')   /* the same source is used by 'bitwise or' */
+        {
+          unsigned long litval = AST_ULONG_VALUE (tree->right);
+          if (litval == 0 || litval == 1)
+            {
+              tree->right = decorateType (newAst_VALUE (constBoolVal (litval != 0)), resultType);
+            }
+          else
+            {
+              tree->opval.op = '|';
+              tree->right = newAst_VALUE (constBoolVal (1));
+              tree->decorated = 0;
+              return decorateType (tree, resultType);
+            }
+        }
+
       LRVAL (tree) = RRVAL (tree) = 1;
 
       TTYPE (tree) = computeType (LTYPE (tree), RTYPE (tree), resultType, tree->opval.op);
@@ -3594,7 +3689,6 @@
       /* if right is null then unary */
       if (!tree->right)
         {
-
           if (!IS_ARITHMETIC (LTYPE (tree)))
             {
               werrorfl (tree->filename, tree->lineno, E_UNARY_OP, tree->opval.op);
@@ -3905,10 +3999,11 @@
           if (tree->opval.op == LEFT_OP || (tree->opval.op == RIGHT_OP && SPEC_USIGN (LETYPE (tree))))
             {
               werrorfl (tree->filename, tree->lineno, W_SHIFT_CHANGED, (tree->opval.op == LEFT_OP ? "left" : "right"));
-              tree->type = EX_VALUE;
-              tree->left = tree->right = NULL;
-              tree->opval.val = constCharVal (0);
-              TETYPE (tree) = TTYPE (tree) = tree->opval.val->type;
+	      /* Change shift op to comma op and replace the right operand with 0. */
+	      /* This preserves the left operand in case there were side-effects. */
+              tree->opval.op = ',';
+              tree->right->opval.val = constCharVal (0);
+              TETYPE (tree) = TTYPE (tree) = tree->right->opval.val->type;
               return tree;
             }
         }
@@ -4020,7 +4115,6 @@
                   break;
                 default:
                   gptype = 0;
-
                   if (TARGET_IS_PIC16 && (SPEC_SCLS (sym->etype) == S_FIXED))
                     gptype = GPTYPE_NEAR;
                 }
@@ -4111,7 +4205,7 @@
                       gpVal &= (1 << (getSize (LTYPE (tree)) * 8)) - 1;
                     }
                 }
-              checkPtrCast (LTYPE (tree), RTYPE (tree), FALSE);
+              checkPtrCast (LTYPE (tree), RTYPE (tree), tree->values.cast.implicitCast);
               LRVAL (tree) = 1;
               tree->type = EX_VALUE;
               tree->opval.val = valCastLiteral (LTYPE (tree), gpVal | ulFromVal (valFromType (RTYPE (tree))));
@@ -4123,7 +4217,7 @@
               return tree;
             }
         }
-      checkPtrCast (LTYPE (tree), RTYPE (tree), FALSE);
+      checkPtrCast (LTYPE (tree), RTYPE (tree), tree->values.cast.implicitCast);
       if (IS_GENPTR (LTYPE (tree)) && IS_PTR (RTYPE (tree)) && !IS_GENPTR (RTYPE (tree)) && (resultType != RESULT_TYPE_GPTR))
         {
           DCL_TYPE (LTYPE (tree)) = DCL_TYPE (RTYPE (tree));
@@ -4243,8 +4337,7 @@
           {
           case CCR_ALWAYS_TRUE:
           case CCR_ALWAYS_FALSE:
-            if (!options.lessPedantic)
-              werrorfl (tree->filename, tree->lineno, W_COMP_RANGE, ccr_result == CCR_ALWAYS_TRUE ? "true" : "false");
+            werrorfl (tree->filename, tree->lineno, W_COMP_RANGE, ccr_result == CCR_ALWAYS_TRUE ? "true" : "false");
             return decorateType (newAst_VALUE (constCharVal ((unsigned char) (ccr_result == CCR_ALWAYS_TRUE))), resultType);
           case CCR_OK:
           default:
@@ -4582,7 +4675,6 @@
       TETYPE (tree) = getSpec (TTYPE (tree));
       return tree;
 
-
 #if 0                           // assignment operators are converted by the parser
       /*------------------------------------------------------------------*/
       /*----------------------------*/
@@ -4753,6 +4845,8 @@
           if (IS_CONSTANT (LTYPE (tree)))
             werrorfl (tree->filename, tree->lineno, E_CODE_WRITE, "=");
         }
+      if (tree->initMode && SPEC_STAT (getSpec (LTYPE (tree))) && !constExprTree (tree->right))
+        werrorfl (tree->filename, tree->lineno, E_CONST_EXPECTED, "=");
       if (LRVAL (tree))
         {
           werrorfl (tree->filename, tree->lineno, E_LVALUE_REQUIRED, "=");
@@ -4842,12 +4936,13 @@
         }
 
       /* if there is going to be a casting required then add it */
-      if (compareType (currFunc->type->next, RTYPE (tree)) < 0)
+      if (compareType (currFunc->type->next, RTYPE (tree)) == -1)
         {
-          tree->right =
-            decorateType (newNode (CAST,
-                                   newAst_LINK (copyLinkChain (currFunc->type->next)),
-                                   tree->right), IS_GENPTR (currFunc->type->next) ? RESULT_TYPE_GPTR : RESULT_TYPE_NONE);
+          tree->right = newNode (CAST,
+                                 newAst_LINK (copyLinkChain (currFunc->type->next)),
+                                 tree->right);
+          tree->right->values.cast.implicitCast = 1;
+          tree->right = decorateType (tree->right, IS_GENPTR (currFunc->type->next) ? RESULT_TYPE_GPTR : RESULT_TYPE_NONE);
         }
 
       RRVAL (tree) = 1;
@@ -4958,7 +5053,6 @@
   return val;
 }
 
-
 #define IS_AND(ex) (ex->type == EX_OP && ex->opval.op == AND_OP )
 #define IS_OR(ex)  (ex->type == EX_OP && ex->opval.op == OR_OP )
 #define IS_NOT(ex) (ex->type == EX_OP && ex->opval.op == '!' )
@@ -4973,7 +5067,6 @@
 static ast *
 backPatchLabels (ast * tree, symbol * trueLabel, symbol * falseLabel)
 {
-
   if (!tree)
     return NULL;
 
@@ -5011,8 +5104,8 @@
       if (IS_IFX (tree->right))
         return newNode (NULLOP, tree->left, createLabel (localLabel, tree->right));
 
-      tree->right = createLabel (localLabel, tree->right);
       tree->right = newIfxNode (tree->right, trueLabel, falseLabel);
+      tree->right = createLabel (localLabel, tree->right);
 
       return newNode (NULLOP, tree->left, tree->right);
     }
@@ -5040,8 +5133,8 @@
       if (IS_IFX (tree->right))
         return newNode (NULLOP, tree->left, createLabel (localLabel, tree->right));
 
-      tree->right = createLabel (localLabel, tree->right);
       tree->right = newIfxNode (tree->right, trueLabel, falseLabel);
+      tree->right = createLabel (localLabel, tree->right);
 
       return newNode (NULLOP, tree->left, tree->right);
     }
@@ -5071,7 +5164,6 @@
   return tree;
 }
 
-
 /*-----------------------------------------------------------------*/
 /* createBlock - create expression tree for block                  */
 /*-----------------------------------------------------------------*/
@@ -5328,16 +5420,18 @@
 {
   ast *doTree;
 
-
   /* if the body does not exist then it is simple */
   if (!doBody)
     {
       condAst = backPatchLabels (condAst, continueLabel, falseLabel);
-      doTree = (IS_IFX (condAst) ? createLabel (continueLabel, condAst)
-                : newNode (IFX, createLabel (continueLabel, condAst), NULL));
-      doTree->trueLabel = continueLabel;
-      doTree->falseLabel = NULL;
+      if (condAst && !IS_IFX (condAst))
+        {
+          condAst = newNode (IFX, condAst, NULL);
+          condAst->trueLabel = continueLabel;
+          condAst->falseLabel = NULL;
+        }
 
+      doTree = createLabel (continueLabel, condAst);
       doTree = newNode (NULLOP, doTree, createLabel (falseLabel, NULL));
       return doTree;
     }
@@ -5392,7 +5486,6 @@
   if (condExpr && !IS_IFX (condExpr))
     condExpr = newIfxNode (condExpr, trueLabel, falseLabel);
 
-
   /* attach condition label to condition */
   condExpr = createLabel (condLabel, condExpr);
 
@@ -5432,9 +5525,16 @@
 
   /* put the continue label */
   condExpr = backPatchLabels (condExpr, trueLabel, falseLabel);
-  condExpr = createLabel (continueLabel, condExpr);
-  condExpr->filename = NULL;
-  condExpr->lineno = 0;
+  if (condExpr && !IS_IFX (condExpr))
+    {
+      condExpr = newNode (IFX, condExpr, NULL);
+      /* put the true & false labels in place */
+      condExpr->trueLabel = trueLabel;
+      condExpr->falseLabel = falseLabel;
+    }
+  whileTree = createLabel (continueLabel, condExpr);
+  whileTree->filename = NULL;
+  whileTree->lineno = 0;
 
   /* put the body label in front of the body */
   whileBody = createLabel (trueLabel, whileBody);
@@ -5446,16 +5546,6 @@
                        whileBody, newNode (GOTO, newAst_VALUE (symbolVal (continueLabel)), createLabel (falseLabel, NULL)));
 
   /* put it all together */
-  if (IS_IFX (condExpr))
-    whileTree = condExpr;
-  else
-    {
-      whileTree = newNode (IFX, condExpr, NULL);
-      /* put the true & false labels in place */
-      whileTree->trueLabel = trueLabel;
-      whileTree->falseLabel = falseLabel;
-    }
-
   return newNode (NULLOP, whileTree, whileBody);
 }
 
@@ -5507,30 +5597,32 @@
 ast *
 optimizeGetHbit (ast * tree, RESULT_TYPE resultType)
 {
-  unsigned int i, j;
+  unsigned int bit, msb;
   ast *expr;
 
   expr = isShiftRightLitVal_BitAndLitVal (tree);
   if (expr)
     {
       if ((AST_ULONG_VALUE (tree->right) != 1) ||
-          ((i = AST_ULONG_VALUE (tree->left->right)) != (j = (getSize (TTYPE (expr)) * 8 - 1))))
+          ((bit = AST_ULONG_VALUE (tree->left->right)) != (msb = (bitsForType (TTYPE (expr)) - 1))))
         expr = NULL;
     }
   if (!expr && (resultType == RESULT_TYPE_BIT))
     {
+      int bit = isBitAndPow2 (tree);
       expr = tree->left;
-      if (isBitAndPow2 (tree) != (signed) getSize (TTYPE (expr)) * 8 - 1)
+      msb = bitsForType (TTYPE (expr)) - 1;
+      if ((bit < 0) || (bit != (int) msb))
         expr = NULL;
     }
-  if (!expr)
+  if (!expr || IS_BOOLEAN (TTYPE (expr)))
     return tree;
 
   /* make sure the port supports GETHBIT */
   if (port->hasExtBitOp && !port->hasExtBitOp (GETHBIT, getSize (TTYPE (expr))))
     return tree;
 
-  return decorateType (newNode (GETHBIT, expr, NULL), RESULT_TYPE_NONE);
+  return decorateType (newNode (GETHBIT, expr, NULL), resultType);
 }
 
 /*-----------------------------------------------------------------*/
@@ -5552,7 +5644,7 @@
   if (!expr && (resultType == RESULT_TYPE_BIT))
     {
       int p2 = isBitAndPow2 (tree);
-      if (p2 >= 0)
+      if (p2 >= 0 && !IS_BOOLEAN (TTYPE (tree->left)))
         {
           expr = tree->left;
           count = newAst_VALUE (valueFromLit (p2));
@@ -5565,7 +5657,7 @@
   if (port->hasExtBitOp && !port->hasExtBitOp (GETABIT, getSize (TTYPE (expr))))
     return tree;
 
-  return decorateType (newNode (GETABIT, expr, count), RESULT_TYPE_NONE);
+  return decorateType (newNode (GETABIT, expr, count), resultType);
 }
 
 /*-----------------------------------------------------------------*/
@@ -5574,7 +5666,7 @@
 ast *
 optimizeGetByte (ast * tree, RESULT_TYPE resultType)
 {
-  unsigned int i = 0;
+  unsigned int i = 1;
   ast *expr;
   ast *count = NULL;
 
@@ -5596,7 +5688,7 @@
           expr = tree->left;
         }
     }
-  if (!expr || (i == 0) || (i % 8) || (i >= getSize (TTYPE (expr)) * 8))
+  if (!expr || (i % 8) || (i >= getSize (TTYPE (expr)) * 8))
     return tree;
 
   /* make sure the port supports GETBYTE */
@@ -5612,7 +5704,7 @@
 ast *
 optimizeGetWord (ast * tree, RESULT_TYPE resultType)
 {
-  unsigned int i = 0;
+  unsigned int i = 1;
   ast *expr;
   ast *count = NULL;
 
@@ -5634,7 +5726,7 @@
           expr = tree->left;
         }
     }
-  if (!expr || (i == 0) || (i % 8) || (i >= (getSize (TTYPE (expr)) - 1) * 8))
+  if (!expr || (i % 8) || (i >= (getSize (TTYPE (expr)) - 1) * 8))
     return tree;
 
   /* make sure the port supports GETWORD */
@@ -5761,7 +5853,6 @@
   /* (?symbol << 7) | (?symbol >> 1) */
   if (IS_RIGHT_OP (root->right) && IS_LEFT_OP (root->left))
     {
-
       if (!SPEC_USIGN (TETYPE (root->left->left)))
         return root;
 
@@ -5784,7 +5875,6 @@
 
       /* whew got the first case : create the AST */
       return newNode (RRC, root->left->left, NULL);
-
     }
 
   /* not found return root */
@@ -5835,7 +5925,6 @@
       return newNode (SWAP, root->left->left, NULL);
     }
 
-
   /* not found return root */
   return root;
 }
@@ -6061,7 +6150,6 @@
     }
 }
 
-
 /*-----------------------------------------------------------------*/
 /* fixupInline - perform various fixups on an inline function tree */
 /*               to take into account that it is no longer a       */
@@ -6250,10 +6338,16 @@
   SPEC_OCLS (sym->etype) = NULL;
   SPEC_EXTR (sym->etype) = 0;
   SPEC_STAT (sym->etype) = 0;
-  if IS_SPEC
-    (sym->type) SPEC_VOLATILE (sym->type) = 0;
+  if (IS_SPEC (sym->type))
+    {
+      SPEC_VOLATILE (sym->type) = 0;
+      SPEC_ADDRSPACE (sym->type) = 0;
+    }
   else
-    DCL_PTR_VOLATILE (sym->type) = 0;
+    {
+      DCL_PTR_VOLATILE (sym->type) = 0;
+      DCL_PTR_ADDRSPACE (sym->type) = 0;
+    }
   SPEC_ABSA (sym->etype) = 0;
 
   return sym;
@@ -6319,7 +6413,6 @@
     }
 }
 
-
 /*-----------------------------------------------------------------*/
 /* expandInlineFuncs - replace calls to inline functions with the  */
 /*                     function itself                             */
@@ -6370,7 +6463,6 @@
           copyAstLoc (temptree, tree);
           inlinetree2 = temptree;
 
-
           /* Handle the return type */
           if (!IS_VOID (func->type->next))
             {
@@ -6387,7 +6479,6 @@
               inlineAddDecl (retsym, block, TRUE, TRUE);
             }
 
-
           inlinetree = newNode (BLOCK, NULL, inlinetree2);
           copyAstLoc (inlinetree, tree);
 
@@ -6639,7 +6730,6 @@
     }
 
 skipall:
-
   /* dealloc the block variables */
   processBlockVars (body, &stack, DEALLOCATE);
   outputDebugStackSymbols ();
@@ -6664,12 +6754,43 @@
   cleanUpLevel (LabelTab, 0);
   cleanUpBlock (StructTab, 1);
   cleanUpBlock (TypedefTab, 1);
+  cleanUpBlock (AddrspaceTab, 1);
 
   xstack->syms = NULL;
   istack->syms = NULL;
+  currFunc = NULL;
   return NULL;
 }
 
+/*-----------------------------------------------------------------*/
+/* createConfigure - This is the key node that calls the iCode for */
+/*                  generating the code for a pic16 cofigure. Note */
+/*                  code is generated function by function, later  */
+/*                  when add inter-procedural analysis this will   */
+/*                  change                                         */
+/*-----------------------------------------------------------------*/
+ast *
+createConfigure (ast * body, const char * str)
+{
+  ast *ex;
+
+  ex = newNode (INLINEASM, NULL, NULL);
+  ex->values.inlineasm = str;
+  ex->decorated = 1;
+
+  if (options.dump_tree)
+    PA (ex);
+
+  if (!fatalError)
+    {
+      /* create the node & generate intermediate code */
+      GcurMemmap = code;
+      codeOutBuf = &code->oBuf;
+      eBBlockFromiCode (iCodeFromAst (ex));
+    }
+
+  return NULL;
+}
 
 #define INDENT(x,f) do { fprintf (f, "%s:%d:", tree->filename, tree->lineno); fprintf (f, "%*s", (x) & 0xff, ""); } while (0)
 /*-----------------------------------------------------------------*/
@@ -6983,7 +7104,6 @@
       ast_print (tree->right, outfile, indent + 2);
       return;
 
-
     /*------------------------------------------------------------------*/
     /*----------------------------*/
     /*    unary '+' operator      */
@@ -7514,12 +7634,12 @@
  * >   info node:   (gcc-4.1)Offsetof
  * >
  * >      primary:
- * >      	"__builtin_offsetof" "(" `typename' "," offsetof_member_designator ")"
+ * >        "__builtin_offsetof" "(" `typename' "," offsetof_member_designator ")"
  * >
  * >      offsetof_member_designator:
- * >      	  `identifier'
- * >      	| offsetof_member_designator "." `identifier'
- * >      	| offsetof_member_designator "[" `expr' "]"
+ * >          `identifier'
+ * >        | offsetof_member_designator "." `identifier'
+ * >        | offsetof_member_designator "[" `expr' "]"
  * >
  * >  This extension is sufficient such that
  * >
diff -Nru sdcc-3.1.0+dfsg/src/SDCCast.h sdcc-3.2.0+dfsg/src/SDCCast.h
--- sdcc-3.1.0+dfsg/src/SDCCast.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCast.h	2012-03-29 09:06:54.000000000 +0000
@@ -66,7 +66,7 @@
   /* union for special processing */
   union
   {
-    char *inlineasm;            /* pointer to inline assembler code */
+    const char *inlineasm;      /* pointer to inline assembler code */
     literalList *constlist;     /* init list for array initializer. */
     symbol *sym;                /* if block then -> symbols */
     value *args;                /* if function then args    */
@@ -97,6 +97,7 @@
                                          * type resulting from a typecast.
                                          */
       unsigned removedCast:1;   /* true if the explicit cast has been removed */
+      unsigned implicitCast:1;  /* true if compiler added this cast */
     } cast;
     int argreg;                 /* argreg number when operand type == EX_OPERAND */
   }
@@ -200,6 +201,7 @@
 value *evalStmnt (ast *);
 ast *createRMW (ast *, unsigned, ast *);
 ast *createFunction (symbol *, ast *);
+ast *createConfigure (ast *, const char * str);
 ast *createBlock (symbol *, ast *);
 ast *createLabel (symbol *, ast *);
 ast *createCase (ast *, ast *, ast *);
@@ -219,7 +221,7 @@
 bool constExprTree (ast *);
 int setAstFileLine (ast *, char *, int);
 symbol *funcOfType (const char *, sym_link *, sym_link *, int, int);
-symbol *funcOfTypeVarg (char *, char *, int, char **);
+symbol *funcOfTypeVarg (const char *, const char *, int, const char **);
 ast *initAggregates (symbol *, initList *, ast *);
 bool hasSEFcalls (ast *);
 void addSymToBlock (symbol *, ast *);
diff -Nru sdcc-3.1.0+dfsg/src/SDCCbitv.c sdcc-3.2.0+dfsg/src/SDCCbitv.c
--- sdcc-3.1.0+dfsg/src/SDCCbitv.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCbitv.c	2012-05-29 07:51:36.000000000 +0000
@@ -97,6 +97,7 @@
   int byteSize;
   int offset;
 
+  assert (pos>=0);
   /* if set is null then allocate it */
   if (!bvp)
     bvp = newBitVect (bitVectDefault);	/* allocate for twice the size */
@@ -119,6 +120,7 @@
   int byteSize;
   int offset;
 
+  assert (pos>=0);
   if (!bvp)
     return;
 
@@ -140,6 +142,7 @@
   int byteSize;
   int offset;
 
+  assert (pos>=0);
   if (!bvp)
     return 0;
 
diff -Nru sdcc-3.1.0+dfsg/src/SDCCcse.c sdcc-3.2.0+dfsg/src/SDCCcse.c
--- sdcc-3.1.0+dfsg/src/SDCCcse.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCcse.c	2012-06-10 12:32:06.000000000 +0000
@@ -34,6 +34,7 @@
 newCseDef (operand * sym, iCode * ic)
 {
   cseDef *cdp;
+  memmap *map;
 
   assert (sym);
   cdp = Safe_alloc (sizeof (cseDef));
@@ -45,18 +46,28 @@
   cdp->fromGlobal = 0;
   cdp->fromAddrTaken = 0;
 
-  if (ic->op!=IF && ic->op!=JUMPTABLE)
+  if (ic->op != IF && ic->op != JUMPTABLE)
     {
-      if (IC_LEFT (ic) && IS_SYMOP (IC_LEFT (ic)))
+      if (ic->op != ADDRESS_OF && IC_LEFT (ic) && IS_SYMOP (IC_LEFT (ic)))
         {
           bitVectSetBit (cdp->ancestors, IC_LEFT (ic)->key);
-          cdp->fromGlobal |= isOperandGlobal (IC_LEFT (ic));
+          if (isOperandGlobal (IC_LEFT (ic)))
+            {
+              map = SPEC_OCLS (getSpec (operandType (IC_LEFT (ic))));
+              if (map)
+                cdp->fromGlobal |= (1 << map->ptrType);
+            }
           cdp->fromAddrTaken |= OP_SYMBOL (IC_LEFT (ic))->addrtaken;
         }
       if (IC_RIGHT (ic) && IS_SYMOP (IC_RIGHT (ic)))
         {
           bitVectSetBit (cdp->ancestors, IC_RIGHT (ic)->key);
-          cdp->fromGlobal |= isOperandGlobal (IC_RIGHT (ic));
+          if (isOperandGlobal (IC_RIGHT (ic)))
+            {
+              map = SPEC_OCLS (getSpec (operandType (IC_RIGHT (ic))));
+              if (map)
+                cdp->fromGlobal |= (1 << map->ptrType);
+            }
           cdp->fromAddrTaken |= OP_SYMBOL (IC_RIGHT (ic))->addrtaken;
         }
     }
@@ -73,7 +84,7 @@
 
   if (ic->op!=IF && ic->op!=JUMPTABLE)
     {
-      if (IC_LEFT (ic) && IS_SYMOP (IC_LEFT (ic)))
+      if (ic->op != ADDRESS_OF && IC_LEFT (ic) && IS_SYMOP (IC_LEFT (ic)))
         {
           bitVectSetBit (cdp->ancestors, IC_LEFT (ic)->key);
           for (sl = cseSet; sl; sl = sl->next)
@@ -121,7 +132,6 @@
 
   return (src->key == dest->key &&
           src->diCode == dest->diCode);
-
 }
 
 /*-----------------------------------------------------------------*/
@@ -345,7 +355,7 @@
 
   /* not found it yet check if this is the one */
   /* and this is not the defining one          */
-  if (cop->key == cdp->key)
+  if (cop->key && cop->key == cdp->key)
     {
       /* do a special check this will help in */
       /* constant propagation & dead code elim */
@@ -482,6 +492,7 @@
   V_ARG (operand *, rop);
 
   if (POINTER_SET (cdp->diCode) &&
+      op->key &&
       IC_RESULT (cdp->diCode)->key == op->key &&
       !isOperandVolatile (IC_RESULT (cdp->diCode), TRUE) &&
       !isOperandVolatile (IC_RIGHT (cdp->diCode), TRUE) &&
@@ -530,7 +541,7 @@
   /* if iCodes are not the same */
   /* see the operands maybe interchanged */
   if (ic->op == cdp->diCode->op &&
-      IS_ASSOCIATIVE(ic) &&
+      IS_COMMUTATIVE (ic) &&
       isOperandEqual (IC_LEFT (ic), IC_RIGHT (cdp->diCode)) &&
       isOperandEqual (IC_RIGHT (ic), IC_LEFT (cdp->diCode)))
     {
@@ -565,6 +576,23 @@
   return cdp->fromGlobal;
 }
 
+/*-------------------------------------------------------------------*/
+/* ifFromGlobalAliasableByPtr - if definition is derived from global */
+/*   that may be aliasble by a particular pointer type               */
+/*-------------------------------------------------------------------*/
+DEFSETFUNC (ifFromGlobalAliasableByPtr)
+{
+  cseDef *cdp = item;
+  V_ARG (DECLARATOR_TYPE, decl);
+
+  if (decl == GPOINTER && cdp->fromGlobal)
+    return 1;
+  else if (cdp->fromGlobal & (1 << decl))
+    return 1;
+  else
+    return 0;
+}
+
 /*-----------------------------------------------------------------*/
 /* ifDefGlobal - if definition is global                           */
 /*-----------------------------------------------------------------*/
@@ -575,6 +603,24 @@
   return (isOperandGlobal (cdp->sym));
 }
 
+/*-----------------------------------------------------------------*/
+/* ifDefGlobalAliasableByPtr - if definition is global             */
+/*   and may be aliasble by a particular pointer type              */
+/*-----------------------------------------------------------------*/
+DEFSETFUNC (ifDefGlobalAliasableByPtr)
+{
+  cseDef *cdp = item;
+  V_ARG (DECLARATOR_TYPE, decl);
+  memmap *map;
+
+  if (!isOperandGlobal (cdp->sym))
+    return 0;
+  if (decl == GPOINTER)
+    return 1;
+  map = SPEC_OCLS (getSpec (operandType (cdp->sym)));
+  return (map->ptrType == decl);
+}
+
 /*-------------------------------------------------------------------*/
 /* ifFromAddrTaken - if definition is derived from a symbol whose    */
 /*                   address was taken                               */
@@ -600,6 +646,48 @@
 }
 
 /*-----------------------------------------------------------------*/
+/* ifAnyUnrestrictedGetPointer - if get pointer icode              */
+/*-----------------------------------------------------------------*/
+DEFSETFUNC (ifAnyUnrestrictedGetPointer)
+{
+  cseDef *cdp = item;
+  V_ARG (DECLARATOR_TYPE, decl);
+
+  if (cdp->diCode && POINTER_GET (cdp->diCode))
+    {
+      sym_link *ptype;
+      ptype = operandType (IC_LEFT (cdp->diCode));
+      if (!IS_PTR_RESTRICT (ptype))
+        {
+	  if (DCL_TYPE (ptype) == decl || IS_GENPTR (ptype))
+            return 1;
+	}
+    }
+  return 0;
+}
+
+/*-----------------------------------------------------------------*/
+/* ifAnyUnrestrictedSetPointer - if set pointer icode              */
+/*-----------------------------------------------------------------*/
+DEFSETFUNC (ifAnyUnrestrictedSetPointer)
+{
+  cseDef *cdp = item;
+  V_ARG (DECLARATOR_TYPE, decl);
+
+  if (cdp->diCode && POINTER_SET (cdp->diCode))
+    {
+      sym_link *ptype;
+      ptype = operandType (IC_RESULT (cdp->diCode));
+      if (!IS_PTR_RESTRICT (ptype))
+        {
+	  if (DCL_TYPE (ptype) == decl || IS_GENPTR (ptype))
+            return 1;
+	}
+    }
+  return 0;
+}
+
+/*-----------------------------------------------------------------*/
 /* ifOperandsHave - if any of the operand are the same as this     */
 /*-----------------------------------------------------------------*/
 DEFSETFUNC (ifOperandsHave)
@@ -620,6 +708,11 @@
       IC_RIGHT (cdp->diCode)->key == op->key)
     return 1;
 
+  if (POINTER_SET (cdp->diCode) &&
+      IS_SYMOP (IC_RESULT (cdp->diCode)) &&
+      IC_RESULT (cdp->diCode)->key == op->key)
+    return 1;
+
   /* or if any of the operands are volatile */
   if (IC_LEFT (cdp->diCode) &&
       IS_OP_VOLATILE (IC_LEFT (cdp->diCode)))
@@ -667,7 +760,7 @@
   V_ARG (operand *, op);
   int match;
 
-  if (op && cdp->sym)
+  if (op && cdp->sym && op->key)
     match = cdp->sym->key == op->key;
   else
     match = (isOperandEqual (cdp->sym, op));
@@ -711,7 +804,7 @@
   iCode *dic = cdp->diCode;
   operand *left = IC_LEFT (cdp->diCode);
 
-  if (POINTER_GET (dic) && left->key == op->key)
+  if (POINTER_GET (dic) && op->key && left->key == op->key)
     return 1;
 
   return 0;
@@ -725,7 +818,7 @@
   cseDef *cdp = item;
   V_ARG (operand *, op);
 
-  if (POINTER_SET (cdp->diCode) &&
+  if (POINTER_SET (cdp->diCode) && op->key &&
       IC_RESULT (cdp->diCode)->key == op->key)
     return 1;
 
@@ -823,6 +916,11 @@
           IC_RESULT (ic) = operandFromOperand (IC_RESULT (ic));
           IC_RESULT (ic)->isaddr = 0;
           setOperandType (IC_RESULT (ic), operandType (IC_RIGHT (ic)));
+          if (IS_DECL (operandType (IC_RESULT (ic))))
+            {
+              DCL_PTR_VOLATILE (operandType (IC_RESULT (ic))) = 0;
+              DCL_PTR_ADDRSPACE (operandType (IC_RESULT (ic))) = 0;
+            }
           return;
         }
 
@@ -1221,6 +1319,8 @@
         }
       if (IS_OP_LITERAL (IC_RIGHT (ic)))
         {
+          unsigned val;
+
           /* if BITWISEAND then check if one of them is a zero */
           /* if yes turn it into 0 assignment */
           if (operandLitValue (IC_RIGHT (ic)) == 0.0)
@@ -1240,24 +1340,24 @@
             }
           /* if BITWISEAND then check if one of them is 0xff... */
           /* if yes turn it into assignment */
-          {
-            unsigned val;
-
-            switch (getSize (operandType (IC_RIGHT (ic))))
-              {
-              case 1:
-                val = 0xff;
-                break;
-              case 2:
-                val = 0xffff;
-                break;
-              case 4:
-                val = 0xffffffff;
-                break;
-              default:
-                return;
-              }
-            if (((unsigned) double2ul (operandLitValue (IC_RIGHT (ic))) & val) == val)
+          switch (bitsForType (operandType (IC_RIGHT (ic))))
+            {
+            case 1:
+              val = 0x01;
+              break;
+            case 8:
+              val = 0xff;
+              break;
+            case 16:
+              val = 0xffff;
+              break;
+            case 32:
+              val = 0xffffffff;
+              break;
+            default:
+              return;
+            }
+          if (((unsigned) double2ul (operandLitValue (IC_RIGHT (ic))) & val) == val)
             {
               ic->op = '=';
               IC_RIGHT (ic) = IC_LEFT (ic);
@@ -1265,7 +1365,6 @@
               SET_RESULT_RIGHT (ic);
               return;
             }
-          }
         }
       break;
     case '|':
@@ -1311,15 +1410,18 @@
             }
           /* if BITWISEOR then check if one of them is 0xff... */
           /* if yes turn it into 0xff... assignment */
-          switch (getSize (operandType (IC_RIGHT (ic))))
+          switch (bitsForType (operandType (IC_RIGHT (ic))))
             {
               case 1:
+                val = 0x01;
+                break;
+              case 8:
                 val = 0xff;
                 break;
-              case 2:
+              case 16:
                 val = 0xffff;
                 break;
-              case 4:
+              case 32:
                 val = 0xffffffff;
                 break;
               default:
@@ -1389,6 +1491,29 @@
               return;
             }
         }
+      /* if XOR then check if one of them is a zero or one */
+      /* if yes turn it into assignment or invert */
+      if (IS_OP_LITERAL (IC_RIGHT (ic)) &&
+          IS_BOOLEAN (operandType (IC_LEFT (ic))) &&
+          IS_BOOLEAN (operandType (IC_RESULT (ic)))
+         )
+        {
+          double litval = operandLitValue (IC_RIGHT (ic));
+          if (litval == 1.0)
+            {
+              ic->op = '!';
+              IC_RIGHT (ic) = NULL;
+              return;
+            }
+          else
+            {
+              ic->op = '=';
+              IC_RIGHT (ic) = operandFromLit (1);
+              IC_LEFT (ic) = NULL;
+              SET_RESULT_RIGHT (ic);
+              return;
+            }
+        }
       break;
     }
 
@@ -1575,10 +1700,7 @@
       /* too often, if it does happen then the user pays */
       /* the price */
       computeControlFlow (ebbi);
-      if (!options.lessPedantic)
-        {
-          werrorfl (ic->filename, ic->lineno, W_CONTROL_FLOW);
-        }
+      werrorfl (ic->filename, ic->lineno, W_CONTROL_FLOW);
       return;
     }
 
@@ -1589,10 +1711,7 @@
   if (elementsInSet (ebb->succList) == 1 &&
       isinSet (ebb->succList, eBBWithEntryLabel (ebbi, label)))
     {
-      if (!options.lessPedantic)
-        {
-          werrorfl (ic->filename, ic->lineno, W_CONTROL_FLOW);
-        }
+      werrorfl (ic->filename, ic->lineno, W_CONTROL_FLOW);
       if (IS_OP_VOLATILE (IC_COND (ic)))
         {
           IC_RIGHT (ic) = IC_COND (ic);
@@ -1984,7 +2103,7 @@
         }
 
       /* clear the def & use chains for the operands involved */
-      /* in this operation . since it can change due to opts  */
+      /* in this operation since it can change due to opts    */
       unsetDefsAndUses (ic);
 
       if (ic->op == PCALL || ic->op == CALL || ic->op == RECEIVE)
@@ -2226,6 +2345,7 @@
         {
           algebraicOpts (ic, ebb);
           while (constFold (ic, cseSet));
+          while (boolCast (ic, cseSet));
         }
 
       /* if after all this it becomes an assignment to self
@@ -2329,8 +2449,18 @@
       if (!(POINTER_SET (ic)) && IS_SYMOP (IC_RESULT (ic)))
         {
           deleteItemIf (&cseSet, ifOperandsHave, IC_RESULT (ic));
+          deleteItemIf (&ptrSetSet, ifOperandsHave, IC_RESULT (ic));
           /* delete any previous definitions */
           ebb->defSet = bitVectCplAnd (ebb->defSet, OP_DEFS (IC_RESULT (ic)));
+
+         /* Until pointer tracking is complete, by conservative and delete all */
+         /* pointer accesses that might alias this symbol. */
+         if (isOperandGlobal (IC_RESULT (ic)))
+           {
+             memmap *map = SPEC_OCLS (getSpec (operandType (IC_RESULT (ic))));
+             deleteItemIf (&cseSet, ifAnyUnrestrictedGetPointer, map->ptrType);
+             deleteItemIf (&ptrSetSet, ifAnyUnrestrictedSetPointer, map->ptrType);
+           }
         }
 
       /* add the left & right to the defUse set */
@@ -2353,6 +2483,8 @@
       if (POINTER_SET (defic) &&
 		  (IS_SYMOP (IC_RESULT (ic)) || IS_OP_LITERAL (IC_RESULT (ic))))
         {
+          sym_link *ptype = operandType (IC_RESULT (ic));
+
           if (IS_SYMOP (IC_RESULT (ic)))
             {
               OP_USES (IC_RESULT (ic)) =
@@ -2371,6 +2503,20 @@
           deleteItemIf (&ptrSetSet, ifPointerSet, IC_RESULT (ic));
           /* add to the local pointerset set */
           addSetHead (&ptrSetSet, newCseDef (IC_RESULT (ic), ic));
+
+          /* A write via a non-restrict pointer may modify a global */
+          /* variable used by this function, so delete them */
+          /* and any derived symbols from cseSet. */
+          if (!IS_PTR_RESTRICT (ptype))
+            {
+              deleteItemIf (&cseSet, ifDefGlobalAliasableByPtr);
+              deleteItemIf (&cseSet, ifFromGlobalAliasableByPtr, DCL_TYPE(ptype));
+            }
+
+          /* This could be made more specific for better optimization, but */
+          /* for safety, delete anything this write may have modified. */
+          deleteItemIf (&cseSet, ifFromAddrTaken);
+          deleteItemIf (&cseSet, ifAnyGetPointer);
         }
       else
         {
diff -Nru sdcc-3.1.0+dfsg/src/SDCCcse.h sdcc-3.2.0+dfsg/src/SDCCcse.h
--- sdcc-3.1.0+dfsg/src/SDCCcse.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCcse.h	2012-03-24 06:04:28.000000000 +0000
@@ -35,7 +35,7 @@
     operand *sym;		/* defining symbol */
     iCode *diCode;		/* defining instruction */
     bitVect *ancestors;		/* keys of the symbol's ancestors */
-    int fromGlobal:1;		/* defining symbol's value computed from a global */
+    int fromGlobal;		/* defining symbol's value computed from a global */
     int fromAddrTaken:1;	/* defining symbol's value computed from a */
 				/*   symbol whose address was taken */
   }
diff -Nru sdcc-3.1.0+dfsg/src/SDCCdebug.c sdcc-3.2.0+dfsg/src/SDCCdebug.c
--- sdcc-3.1.0+dfsg/src/SDCCdebug.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCdebug.c	2012-03-30 20:01:27.000000000 +0000
@@ -1,3 +1,23 @@
+/*-------------------------------------------------------------------------
+  SDCCdebug.c - source file for debug infrastructure
+
+  Copyright (C) 2003, Lenny Story and Bernhard Held
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-------------------------------------------------------------------------*/
+
 #include "common.h"
 
 extern DEBUGFILE cdbDebugFile;
diff -Nru sdcc-3.1.0+dfsg/src/SDCCdebug.h sdcc-3.2.0+dfsg/src/SDCCdebug.h
--- sdcc-3.1.0+dfsg/src/SDCCdebug.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCdebug.h	2012-03-30 20:01:27.000000000 +0000
@@ -1,3 +1,22 @@
+/*-------------------------------------------------------------------------
+  SDCCdebug.h - header file debug infrastructure
+
+  Copyright (C) 2003, Lenny Story and Bernhard Held
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-------------------------------------------------------------------------*/
 
 #ifndef _DEBUG_INCLUDE_
 #define _DEBUG_INCLUDE_
diff -Nru sdcc-3.1.0+dfsg/src/SDCCerr.c sdcc-3.2.0+dfsg/src/SDCCerr.c
--- sdcc-3.1.0+dfsg/src/SDCCerr.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCerr.c	2012-06-26 20:34:19.000000000 +0000
@@ -236,10 +236,10 @@
   { E_EXTERN_MISMATCH, ERROR_LEVEL_ERROR,
      "extern definition for '%s' mismatches with declaration.", 0 },
   { E_NONRENT_ARGS, ERROR_LEVEL_ERROR,
-     "Functions called via pointers must be 'reentrant' to take this many arguments", 0 },
+     "Functions called via pointers must be 'reentrant' to take this many (bytes for) arguments", 0 },
   { W_DOUBLE_UNSUPPORTED, ERROR_LEVEL_WARNING,
      "type 'double' not supported assuming 'float'", 0 },
-  { W_COMP_RANGE, ERROR_LEVEL_WARNING,
+  { W_COMP_RANGE, ERROR_LEVEL_PEDANTIC,
      "comparison is always %s due to limited range of data type", 0 },
   { W_FUNC_NO_RETURN, ERROR_LEVEL_WARNING,
      "no 'return' statement found for function '%s'", 0 },
@@ -369,7 +369,7 @@
      "symbol name too long, truncated to %d chars", 0 },
   { W_CAST_STRUCT_PTR, ERROR_LEVEL_WARNING,
      "cast of struct %s * to struct %s * ", 0 },
-  { W_LIT_OVERFLOW, ERROR_LEVEL_WARNING,
+  { W_LIT_OVERFLOW, ERROR_LEVEL_PEDANTIC,
      "overflow in implicit constant conversion", 0 },
   { E_PARAM_NAME_OMITTED, ERROR_LEVEL_ERROR,
      "in function %s: name omitted for parameter %d", 0 },
@@ -434,7 +434,7 @@
      "flexible array member not at end of struct", 0 },
   { E_FLEXARRAY_INEMPTYSTRCT, ERROR_LEVEL_ERROR,
      "flexible array in otherwise empty struct", 0 },
-  { W_EMPTY_SOURCE_FILE, ERROR_LEVEL_WARNING,
+  { W_EMPTY_SOURCE_FILE, ERROR_LEVEL_PEDANTIC,
      "ISO C forbids an empty source file", 0 },
   { W_BAD_PRAGMA_ARGUMENTS, ERROR_LEVEL_WARNING,
      "#pragma %s: bad argument(s); pragma ignored", 0 },
@@ -470,35 +470,46 @@
      "invalid combination of short / long", 0 },
   { E_INTEGERSUFFIX, ERROR_LEVEL_ERROR,
      "Invalid integer suffix '%s' in integer constant", 0},
+  { E_AUTO_ADDRSPACE, ERROR_LEVEL_ERROR,
+     "named address space not allowed for automatic var '%s'", 0},
+  { W_NORETURNRETURN, ERROR_LEVEL_WARNING,
+     "return in _Noreturn function", 0},
+  { E_STRUCT_REDEF, ERROR_LEVEL_ERROR,
+     "struct/union '%s' redefined", 0 },
+  { W_STRING_CANNOT_BE_TERMINATED, ERROR_LEVEL_PEDANTIC,
+    "string '%s'cannot be terminated within array", 0 },
+  { W_LONGLONG_LITERAL, ERROR_LEVEL_WARNING,
+    "support for long long literals is incomplete", 0 },
+  { S_SYNTAX_ERROR, ERROR_LEVEL_SYNTAX_ERROR,
+    "token -> '%s' ; column %d", 0 },
 };
 
-/*
--------------------------------------------------------------------------------
-SetErrorOut - Set the error output file
-
--------------------------------------------------------------------------------
-*/
-
+/* -------------------------------------------------------------------------------
+ * SetErrorOut - Set the error output file
+ * -------------------------------------------------------------------------------
+ */
 FILE *
 SetErrorOut (FILE *NewErrorOut)
 {
-  _SDCCERRG.out = NewErrorOut ;
+  _SDCCERRG.out = NewErrorOut;
 
-  return NewErrorOut ;
+  return NewErrorOut;
 }
 
+/* -------------------------------------------------------------------------------
+ * setErrorLogLevel - Set the error log level:
+ *                    which level has to be treated as an error
+ * -------------------------------------------------------------------------------
+ */
 void setErrorLogLevel (ERROR_LOG_LEVEL level)
 {
   _SDCCERRG.logLevel = level;
 }
 
-/*
--------------------------------------------------------------------------------
-vwerror - Output a standard error message with variable number of arguments
-
--------------------------------------------------------------------------------
-*/
-
+/* -------------------------------------------------------------------------------
+ * vwerror - Output a standard error message with variable number of arguments
+ * -------------------------------------------------------------------------------
+ */
 int
 vwerror (int errNum, va_list marker)
 {
@@ -509,28 +520,28 @@
 
   if (errNum > NELEM (ErrTab))
     {
-      fprintf (_SDCCERRG.out, 
+      fprintf (_SDCCERRG.out,
               "Internal error: bad error number %d.", errNum);
       return 0;
     }
   if (NELEM (ErrTab) != NUMBER_OF_ERROR_MESSAGES || ErrTab[errNum].errIndex != errNum)
     {
-      fprintf (_SDCCERRG.out, 
+      fprintf (_SDCCERRG.out,
               "Internal error: error table entry for %d inconsistent.", errNum);
       return 0;
     }
 
   if ((ErrTab[errNum].errType >= _SDCCERRG.logLevel) && (!ErrTab[errNum].disabled))
     {
-      if (ErrTab[errNum].errType == ERROR_LEVEL_ERROR || _SDCCERRG.werror)
-        fatalError++ ;
-  
+      if (ErrTab[errNum].errType >= ERROR_LEVEL_ERROR || _SDCCERRG.werror)
+        fatalError++;
+
       if (filename && lineno)
         {
           if (_SDCCERRG.style)
-            fprintf (_SDCCERRG.out, "%s(%d) : ",filename,lineno);
+            fprintf (_SDCCERRG.out, "%s(%d) : ", filename, lineno);
           else
-            fprintf (_SDCCERRG.out, "%s:%d: ",filename,lineno);
+            fprintf (_SDCCERRG.out, "%s:%d: ", filename, lineno);
         }
       else if (lineno)
         {
@@ -543,6 +554,10 @@
 
       switch (ErrTab[errNum].errType)
         {
+        case ERROR_LEVEL_SYNTAX_ERROR:
+          fprintf (_SDCCERRG.out, "syntax error: ");
+          break;
+
         case ERROR_LEVEL_ERROR:
           fprintf (_SDCCERRG.out, "error %d: ", errNum);
           break;
@@ -560,12 +575,12 @@
           break;
 
         default:
-          break;                  
+          break;
         }
-    
-        vfprintf (_SDCCERRG.out, ErrTab[errNum].errText,marker);
-        fprintf (_SDCCERRG.out, "\n");
-        return 1;
+
+      vfprintf (_SDCCERRG.out, ErrTab[errNum].errText, marker);
+      fprintf (_SDCCERRG.out, "\n");
+      return 1;
     }
   else
     {
@@ -574,13 +589,10 @@
     }
 }
 
-/*
--------------------------------------------------------------------------------
-werror - Output a standard error message with variable number of arguments
-
--------------------------------------------------------------------------------
-*/
-
+/* -------------------------------------------------------------------------------
+ * werror - Output a standard error message with variable number of arguments
+ * -------------------------------------------------------------------------------
+ */
 int
 werror (int errNum, ...)
 {
@@ -592,14 +604,11 @@
   return ret;
 }
 
-/*
--------------------------------------------------------------------------------
-werrorfl - Output a standard error message with variable number of arguments.
-           Use a specified filename and line number instead of the default.
-
--------------------------------------------------------------------------------
-*/
-
+/* -------------------------------------------------------------------------------
+ * werrorfl - Output a standard error message with variable number of arguments.
+ *            Use a specified filename and line number instead of the default.
+ * -------------------------------------------------------------------------------
+ */
 int
 werrorfl (char *newFilename, int newLineno, int errNum, ...)
 {
@@ -620,13 +629,11 @@
   return ret;
 }
 
-
-/*
--------------------------------------------------------------------------------
-fatal - Output a standard error message with variable number of arguments and
-        call exit()
--------------------------------------------------------------------------------
-*/
+/* -------------------------------------------------------------------------------
+ * fatal - Output a standard error message with variable number of arguments and
+ *         call exit()
+ * -------------------------------------------------------------------------------
+ */
 void
 fatal (int exitCode, int errNum, ...)
 {
@@ -638,24 +645,20 @@
   exit (exitCode);
 }
 
-/*
--------------------------------------------------------------------------------
-style - Change the output error style to MSVC
--------------------------------------------------------------------------------
-*/
-
+/* -------------------------------------------------------------------------------
+ * style - Change the output error style to MSVC
+ * -------------------------------------------------------------------------------
+ */
 void
 MSVC_style (int style)
 {
   _SDCCERRG.style = style;
 }
 
-/*
--------------------------------------------------------------------------------
-disabled - Disable output of specified warning
--------------------------------------------------------------------------------
-*/
-
+/* -------------------------------------------------------------------------------
+ * disabled - Disable output of specified warning
+ * -------------------------------------------------------------------------------
+ */
 void
 setWarningDisabled (int errNum)
 {
@@ -663,12 +666,10 @@
     ErrTab[errNum].disabled = 1;
 }
 
-/*
--------------------------------------------------------------------------------
-Set the flag to treat warnings as errors
--------------------------------------------------------------------------------
-*/
-
+/* -------------------------------------------------------------------------------
+ * Set the flag to treat warnings as errors
+ * -------------------------------------------------------------------------------
+ */
 void
 setWError (int flag)
 {
diff -Nru sdcc-3.1.0+dfsg/src/SDCCerr.h sdcc-3.2.0+dfsg/src/SDCCerr.h
--- sdcc-3.1.0+dfsg/src/SDCCerr.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCerr.h	2012-06-26 20:34:19.000000000 +0000
@@ -234,6 +234,12 @@
   W_UNIVERSAL_C99               = 205, /* universal character names are only valid in C99 */
   E_SHORTLONG                   = 206, /* Invalid combination of short / long */
   E_INTEGERSUFFIX               = 207, /* Invalid integer suffix */
+  E_AUTO_ADDRSPACE              = 208, /* named address space for auto var */
+  W_NORETURNRETURN              = 209, /* return in _noreturn function */
+  E_STRUCT_REDEF                = 210, /* struct or union tag redefined */
+  W_STRING_CANNOT_BE_TERMINATED = 211, /* string cannot be terminated within array */
+  W_LONGLONG_LITERAL            = 212, /* long long literal */
+  S_SYNTAX_ERROR                = 213, /* syntax error */
 
   /* don't touch this! */
   NUMBER_OF_ERROR_MESSAGES             /* Number of error messages */
@@ -265,7 +271,9 @@
   /** Most warnings. */
   ERROR_LEVEL_WARNING,
   /** Errors only. */
-  ERROR_LEVEL_ERROR
+  ERROR_LEVEL_ERROR,
+  /** Syntax error only. */
+  ERROR_LEVEL_SYNTAX_ERROR
 };
 
 typedef enum _ERROR_LOG_LEVEL ERROR_LOG_LEVEL;
diff -Nru sdcc-3.1.0+dfsg/src/SDCCgen.c sdcc-3.2.0+dfsg/src/SDCCgen.c
--- sdcc-3.1.0+dfsg/src/SDCCgen.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCgen.c	2012-04-08 15:21:34.000000000 +0000
@@ -0,0 +1,336 @@
+/*-------------------------------------------------------------------------
+  SDCCgen.c - source files for target code generation common functions
+
+  Copyright (C) 2012, Borut Razem
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-------------------------------------------------------------------------*/
+
+#include "common.h"
+#include "dbuf_string.h"
+
+/* Use the D macro for basic (unobtrusive) debugging messages */
+#define D(x) do if (options.verboseAsm) {x;} while(0)
+
+genLine_t genLine;
+
+/*-----------------------------------------------------------------*/
+/* newLineNode - creates a new peep line                           */
+/*-----------------------------------------------------------------*/
+lineNode *
+newLineNode (const char *line)
+{
+  lineNode *pl;
+
+  pl = Safe_alloc (sizeof (lineNode));
+  pl->line = Safe_strdup (line);
+  pl->ic = NULL;
+  return pl;
+}
+
+/*-----------------------------------------------------------------*/
+/* connectLine - connects two lines                                */
+/*-----------------------------------------------------------------*/
+lineNode *
+connectLine (lineNode * pl1, lineNode * pl2)
+{
+  if (!pl1 || !pl2)
+    {
+      fprintf (stderr, "trying to connect null line\n");
+      return NULL;
+    }
+
+  pl2->prev = pl1;
+  pl1->next = pl2;
+
+  return pl2;
+}
+
+void
+destroy_line_list (void)
+{
+  lineNode *pl;
+
+  pl = genLine.lineCurr;
+
+  while (pl)
+    {
+      lineNode *p;
+
+      if (pl->line)
+        Safe_free (pl->line);
+
+      if (pl->aln)
+        Safe_free (pl->aln);
+
+      p = pl;
+      pl = pl->prev;
+      Safe_free (p);
+    }
+  genLine.lineHead = genLine.lineCurr = NULL;
+}
+
+/*-----------------------------------------------------------------*/
+/* emit_raw - emit raw unformatted line                            */
+/*-----------------------------------------------------------------*/
+static void
+add_line_node (const char *line)
+{
+  lineNode *pl;
+
+  pl = Safe_alloc (sizeof (lineNode));
+
+#if 1
+  memcpy (pl, (lineElem_t *) & genLine.lineElement, sizeof (lineElem_t));
+#else
+  pl->ic = genLine.lineElement.ic;
+  pl->isInline = genLine.lineElement.isInline;
+  pl->isComment = genLine.lineElement.isComment;
+  pl->isDebug = genLine.lineElement.isDebug;
+  pl->isLabel = genLine.lineElement.isLabel;
+  pl->visited = genLine.lineElement.visited;
+  pl->aln = genLine.lineElement.aln;
+#endif
+
+  pl->line = Safe_strdup (line);
+
+  if (genLine.lineCurr)
+    {
+      pl->next = NULL;
+      genLine.lineCurr->next = pl;
+      pl->prev = genLine.lineCurr;
+      genLine.lineCurr = pl;
+    }
+  else
+    {
+      pl->prev = pl->next = NULL;
+      genLine.lineCurr = genLine.lineHead = pl;
+    }
+}
+
+void
+emit_raw (const char *line)
+{
+  const char *p = line;
+
+  while (isspace ((unsigned char) *p))
+    p++;
+
+  if (*p)
+    {
+      genLine.lineElement.isComment = (*p == ';');
+      add_line_node (line);
+    }
+}
+
+/*-----------------------------------------------------------------*/
+/* format_opcode - format the opcode and arguments for emitting    */
+/*-----------------------------------------------------------------*/
+const char *
+format_opcode (const char *inst, const char *fmt, va_list ap)
+{
+  struct dbuf_s dbuf;
+
+  dbuf_init (&dbuf, INITIAL_INLINEASM);
+
+  if (inst && *inst)
+    {
+      dbuf_append_str (&dbuf, inst);
+
+      if (fmt && *fmt)
+        {
+          dbuf_append_char (&dbuf, '\t');
+          dbuf_tvprintf (&dbuf, fmt, ap);
+        }
+    }
+  else
+    {
+      if (fmt && *fmt)
+        {
+          dbuf_tvprintf (&dbuf, fmt, ap);
+        }
+    }
+
+  return dbuf_detach_c_str (&dbuf);
+}
+
+void
+va_emitcode (const char *inst, const char *fmt, va_list ap)
+{
+  const char *line = format_opcode (inst, fmt, ap);
+  emit_raw (line);
+  dbuf_free (line);
+}
+
+/*-----------------------------------------------------------------*/
+/* emitcode - writes the code into a file : for now it is simple   */
+/*-----------------------------------------------------------------*/
+void
+emitcode (const char *inst, const char *fmt, ...)
+{
+  va_list ap;
+
+  va_start (ap, fmt);
+  va_emitcode (inst, fmt, ap);
+  va_end (ap);
+}
+
+void
+emitLabel (symbol * tlbl)
+{
+  emitcode ("", "!tlabeldef", labelKey2num (tlbl->key));
+  genLine.lineCurr->isLabel = 1;
+}
+
+/*-----------------------------------------------------------------*/
+/* genInline - write the inline code out                           */
+/*-----------------------------------------------------------------*/
+void
+genInline (iCode * ic)
+{
+  char *buf, *bp, *begin;
+  bool inComment = FALSE;
+
+  D (emitcode (";", "genInline"));
+
+  genLine.lineElement.isInline += (!options.asmpeep);
+
+  buf = bp = begin = Safe_strdup (IC_INLINE (ic));
+
+  /* Emit each line as a code */
+  while (*bp)
+    {
+      switch (*bp)
+        {
+        case ';':
+          inComment = TRUE;
+          ++bp;
+          break;
+
+        case '\x87':
+        case '\n':
+          inComment = FALSE;
+          *bp++ = '\0';
+
+          /* Don't emit leading whitespaces */
+          while (isspace (*begin))
+            ++begin;
+
+          if (*begin)
+            emitcode (begin, NULL);
+
+          begin = bp;
+          break;
+
+        default:
+          /* Add \n for labels, not dirs such as c:\mydir */
+          if (!inComment && (*bp == ':') && (isspace ((unsigned char) bp[1])))
+            {
+              ++bp;
+              *bp = '\0';
+              ++bp;
+              emitcode (begin, NULL);
+              begin = bp;
+            }
+          else
+            ++bp;
+          break;
+        }
+    }
+  if (begin != bp)
+    {
+      /* Don't emit leading whitespaces */
+      while (isspace (*begin))
+        ++begin;
+
+      if (*begin)
+        emitcode (begin, NULL);
+    }
+
+  Safe_free (buf);
+
+  /* consumed; we can free it here */
+  dbuf_free (IC_INLINE (ic));
+
+  genLine.lineElement.isInline -= (!options.asmpeep);
+}
+
+/*-----------------------------------------------------------------*/
+/* printLine - prints a line chain into a given file               */
+/*-----------------------------------------------------------------*/
+void
+printLine (lineNode * head, struct dbuf_s *oBuf)
+{
+  iCode *last_ic = NULL;
+  bool debug_iCode_tracking = (getenv ("DEBUG_ICODE_TRACKING") != NULL);
+
+  while (head)
+    {
+      if (head->ic != last_ic)
+        {
+          last_ic = head->ic;
+          if (debug_iCode_tracking)
+            {
+              if (head->ic)
+                dbuf_printf (oBuf, "; block = %d, seq = %d\n", head->ic->block, head->ic->seq);
+              else
+                dbuf_append_str (oBuf, "; iCode lost\n");
+            }
+        }
+
+      /* don't indent comments & labels */
+      if (head->line && (head->isComment || head->isLabel))
+        {
+          dbuf_printf (oBuf, "%s\n", head->line);
+        }
+      else
+        {
+          if (head->isInline && *head->line == '#')
+            {
+              /* comment out preprocessor directives in inline asm */
+              dbuf_append_char (oBuf, ';');
+            }
+          dbuf_printf (oBuf, "\t%s\n", head->line);
+        }
+      head = head->next;
+    }
+}
+
+/*-----------------------------------------------------------------*/
+/* ifxForOp - returns the icode containing the ifx for operand     */
+/*-----------------------------------------------------------------*/
+iCode *
+ifxForOp (operand * op, const iCode * ic)
+{
+  iCode *ifxIc;
+
+  /* if true symbol then needs to be assigned */
+  if (!IS_TRUE_SYMOP (op))
+    {
+      /* if this has register type condition and
+         while skipping ipop's (see bug 1509084),
+         the next instruction is ifx with the same operand
+         and live to of the operand is upto the ifx only then */
+      for (ifxIc = ic->next; ifxIc && ifxIc->op == IPOP; ifxIc = ifxIc->next)
+        ;
+
+      if (ifxIc && ifxIc->op == IFX &&
+        IC_COND (ifxIc)->key == op->key &&
+        OP_SYMBOL (op)->liveTo <= ifxIc->seq)
+        return ifxIc;
+    }
+
+  return NULL;
+}
diff -Nru sdcc-3.1.0+dfsg/src/SDCCgen.h sdcc-3.2.0+dfsg/src/SDCCgen.h
--- sdcc-3.1.0+dfsg/src/SDCCgen.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCgen.h	2012-04-06 10:47:44.000000000 +0000
@@ -0,0 +1,105 @@
+/*-------------------------------------------------------------------------
+  SDCCgen.h - header file for target code generation common functions
+
+  Copyright (C) 2012, Borut Razem
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-------------------------------------------------------------------------*/
+
+#ifndef SDCCGEN_H
+#define SDCCGEN_H 1
+
+#include <stdarg.h>
+
+#include <SDCCicode.h>
+
+#define initGenLineElement()  memset (&genLine.lineElement, 0, sizeof (lineElem_t))
+#define labelKey2num(key)     ((key) + 100)
+
+/* can be inherited by each port */
+typedef struct asmLineNodeBase
+{
+  int size;
+  bitVect *regsRead;
+  bitVect *regsWritten;
+}
+asmLineNodeBase;
+
+typedef struct lineElem_s
+{
+  char *line;
+  iCode *ic;
+  unsigned int isInline:1;
+  unsigned int isComment:1;
+  unsigned int isDebug:1;
+  unsigned int isLabel:1;
+  unsigned int visited:1;
+  asmLineNodeBase *aln;
+}
+lineElem_t;
+
+typedef struct lineNode_s
+{
+#ifdef UNNAMED_STRUCT_TAG
+  struct lineElem_s;
+#else
+  /* exactly the same members as of struct lineElem_s */
+  char *line;
+  iCode *ic;
+  unsigned int isInline:1;
+  unsigned int isComment:1;
+  unsigned int isDebug:1;
+  unsigned int isLabel:1;
+  unsigned int visited:1;
+  asmLineNodeBase *aln;
+#endif
+  struct lineNode_s *prev;
+  struct lineNode_s *next;
+}
+lineNode;
+
+typedef struct genLine_s
+{
+  /* double linked list of lines */
+  lineNode *lineHead;
+  lineNode *lineCurr;
+
+  /* global line */
+  lineElem_t lineElement;
+} genLine_t;
+
+extern genLine_t genLine;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+lineNode *newLineNode (const char *line);
+lineNode *connectLine (lineNode * pl1, lineNode * pl2);
+void destroy_line_list (void);
+const char *format_opcode (const char *inst, const char *fmt, va_list ap);
+void emit_raw (const char *line);
+void va_emitcode (const char *inst, const char *fmt, va_list ap);
+void emitcode (const char *inst, const char *fmt, ...);
+void emitLabel (symbol * tlbl);
+void genInline (iCode * ic);
+void printLine (lineNode *, struct dbuf_s *);
+iCode *ifxForOp (operand *op, const iCode *ic);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/src/SDCCglobl.h sdcc-3.2.0+dfsg/src/SDCCglobl.h
--- sdcc-3.1.0+dfsg/src/SDCCglobl.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCglobl.h	2012-05-03 09:43:26.000000000 +0000
@@ -1,4 +1,22 @@
-/* SDCCglobl.h - global macros etc required by all files */
+/*-------------------------------------------------------------------------
+  SDCCglobl.h - global macros etc required by all files
+
+  Copyright (C) 1998, Sandeep Dutta . sandeep.dutta@usa.net
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-------------------------------------------------------------------------*/
 
 #ifndef SDCCGLOBL_H
 #define SDCCGLOBL_H
@@ -10,17 +28,29 @@
 
 #ifndef __cplusplus
 # ifndef _MSC_VER
-#  include <stdbool.h>
-#  define  TRUE  true
-#  define  FALSE false
+#   include <stdbool.h>
+#   ifndef TRUE
+#     define TRUE   true
+#   endif
+#   ifndef FALSE
+#     define FALSE  false
+#   endif
 # else
 typedef unsigned char bool;
-#  define  TRUE   1
-#  define  FALSE  0
+#   ifndef TRUE
+#     define TRUE   1
+#   endif
+#   ifndef FALSE
+#     define FALSE  0
+#   endif
 # endif
 #else
-#  define  TRUE   true
-#  define  FALSE  false
+# ifndef TRUE
+#   define TRUE     true
+# endif
+# ifndef FALSE
+#   define FALSE    false
+# endif
 #endif
 
 #include "SDCCset.h"
@@ -33,37 +63,37 @@
 #define UNIX_DIR_SEPARATOR_CHAR    '/'
 
 #if defined(__BORLANDC__) || defined(_MSC_VER)
-#define STRCASECMP stricmp
-#define STRNCASECMP strnicmp
+# define STRCASECMP   stricmp
+# define STRNCASECMP  strnicmp
 #else
-#define STRCASECMP strcasecmp
-#define STRNCASECMP strncasecmp
+# define STRCASECMP   strcasecmp
+# define STRNCASECMP  strncasecmp
 #endif
 
 #if defined(__MSDOS__) || defined(_WIN32) || defined(__OS2__) || defined (__CYGWIN__)
 
-#ifndef HAVE_DOS_BASED_FILE_SYSTEM
-#define HAVE_DOS_BASED_FILE_SYSTEM 1
-#endif
+# ifndef HAVE_DOS_BASED_FILE_SYSTEM
+#   define HAVE_DOS_BASED_FILE_SYSTEM 1
+# endif
 
-#define IS_DIR_SEPARATOR(c)     ((c) == DIR_SEPARATOR_CHAR || (c) == UNIX_DIR_SEPARATOR_CHAR)
+# define IS_DIR_SEPARATOR(c)    ((c) == DIR_SEPARATOR_CHAR || (c) == UNIX_DIR_SEPARATOR_CHAR)
 /* Note that IS_ABSOLUTE_PATH accepts d:foo as well, although it is
    only semi-absolute.  This is because the users of IS_ABSOLUTE_PATH
    want to know whether to prepend the current working directory to
    a file name, which should not be done with a name like d:foo.  */
-#define IS_ABSOLUTE_PATH(f)     (IS_DIR_SEPARATOR((f)[0]) || (((f)[0]) && ((f)[1] == ':')))
-#define FILENAME_CMP(s1, s2)    STRCASECMP(s1, s2)
+# define IS_ABSOLUTE_PATH(f)    (IS_DIR_SEPARATOR((f)[0]) || (((f)[0]) && ((f)[1] == ':')))
+# define FILENAME_CMP(s1, s2)   STRCASECMP(s1, s2)
 
 #else  /* not DOSish */
 
-#define IS_DIR_SEPARATOR(c)     ((c) == DIR_SEPARATOR_CHAR)
-#define IS_ABSOLUTE_PATH(f)     (IS_DIR_SEPARATOR((f)[0]))
-#define FILENAME_CMP(s1, s2)    strcmp(s1, s2)
+# define IS_DIR_SEPARATOR(c)    ((c) == DIR_SEPARATOR_CHAR)
+# define IS_ABSOLUTE_PATH(f)    (IS_DIR_SEPARATOR((f)[0]))
+# define FILENAME_CMP(s1, s2)   strcmp(s1, s2)
 
 #endif /* not DOSish */
 
 #ifdef WIN32
-# define NATIVE_WIN32          1
+# define NATIVE_WIN32           1
 # ifndef __MINGW32__
 #   define  PATH_MAX  _MAX_PATH
 # endif
@@ -84,47 +114,49 @@
 
 #include <limits.h>             /* PATH_MAX                  */
 #if !defined(PATH_MAX) || (PATH_MAX < 2048)
-#  undef  PATH_MAX
-#  define PATH_MAX 2048         /* define a reasonable value */
+# undef PATH_MAX
+# define PATH_MAX     2048      /* define a reasonable value */
 #endif
 
-#define  MAX_REG_PARMS  1
+#define MAX_REG_PARMS 1
 
-#ifndef max
-#  define max(a,b) (a > b ? a : b)
-#endif
-
-#ifndef min
-#  define min(a,b) (a < b ? a : b)
-#endif
+/* C++ doesn't like min and max macros */
+#ifndef __cplusplus
+# ifndef max
+#   define max(a,b)   (a > b ? a : b)
+# endif
+# ifndef min
+#   define min(a,b)   (a < b ? a : b)
+# endif
+#endif /* __cplusplus */
 
 #ifndef THROWS
-#define THROWS
-#define THROW_NONE  0
-#define THROW_SRC   1
-#define THROW_DEST  2
-#define THROW_BOTH  3
+# define THROWS
+# define THROW_NONE  0
+# define THROW_SRC   1
+# define THROW_DEST  2
+# define THROW_BOTH  3
 #endif
 
 /* size's in bytes  */
-#define BOOLSIZE    port->s.char_size
-#define CHARSIZE    port->s.char_size
-#define SHORTSIZE   port->s.short_size
-#define INTSIZE     port->s.int_size
-#define LONGSIZE    port->s.long_size
-#define LONGLONGSIZE port->s.longlong_size
-#define PTRSIZE     port->s.ptr_size
-#define FPTRSIZE    port->s.fptr_size
-#define GPTRSIZE    port->s.gptr_size
-#define BITSIZE     port->s.bit_size
-#define FLOATSIZE   port->s.float_size
-#define MAXBASESIZE port->s.max_base_size
+#define BOOLSIZE      port->s.char_size
+#define CHARSIZE      port->s.char_size
+#define SHORTSIZE     port->s.short_size
+#define INTSIZE       port->s.int_size
+#define LONGSIZE      port->s.long_size
+#define LONGLONGSIZE  port->s.longlong_size
+#define PTRSIZE       port->s.ptr_size
+#define FPTRSIZE      port->s.fptr_size
+#define GPTRSIZE      port->s.gptr_size
+#define BITSIZE       port->s.bit_size
+#define FLOATSIZE     port->s.float_size
+#define MAXBASESIZE   port->s.max_base_size
 
-#define  SMALL_MODEL 0
-#define  LARGE_MODEL 1
+#define  SMALL_MODEL  0
+#define  LARGE_MODEL  1
 
-#define MAX_TVAR 6
-#define INITIAL_INLINEASM 4*1024
+#define MAX_TVAR      6
+#define INITIAL_INLINEASM (4 * 1024)
 #define DEFPOOLSTACK(type,size)     \
     type       *type##Pool        ; \
     type *type##FreeStack [size]  ; \
@@ -142,7 +174,7 @@
 #endif
 
 
-#define COPYTYPE(start,end,from) (end = getSpec (start = from))
+#define COPYTYPE(start,end,from)  (end = getSpec (start = from))
 
 
 /* general purpose stack related macros */
@@ -247,10 +279,11 @@
     int dump_pack;              /* dump after register packing */
     int dump_rassgn;            /* dump after register assignment */
     int dump_tree;              /* dump front-end tree before lowering to iCode */
+    int dump_graphs;            /* Dump graphs in .dot format (control-flow, conflict, etc) */
     int cc_only;                /* compile only flag              */
     int intlong_rent;           /* integer & long support routines reentrant */
     int float_rent;             /* floating point routines are reentrant */
-    int out_fmt;                /* 0 = undefined, 'i' = intel Hex format, 's' = motorola S19 format, 't' = elf format, 'Z' = gb format */
+    int out_fmt;                /* 0 = undefined, 'i' = intel Hex format, 's' = motorola S19 format, 'E' = elf format, 'Z' = gb format */
     int cyclomatic;             /* print cyclomatic information */
     int noOverlay;              /* don't overlay local variables & parameters */
     int mainreturn;             /* issue a return after main */
@@ -302,6 +335,7 @@
     int use_stdout;             /* send errors to stdout instead of stderr */
     int no_std_crt0;            /* for the z80/gbz80 do not link default crt0.o*/
     int std_c99;                /* enable C99 keywords/constructs */
+    int std_c11;                /* enable C11 keywords/constructs */
     int std_sdcc;               /* enable SDCC extensions to C */
     int dollars_in_ident;       /* zero means dollar signs are punctuation */
     int unsigned_char;          /* use unsigned for char without signed/unsigned modifier */
@@ -311,8 +345,9 @@
     set *calleeSavesSet;        /* list of functions using callee save */
     set *excludeRegsSet;        /* registers excluded from saving */
 /*  set *olaysSet;               * not implemented yet: overlay segments used in #pragma OVERLAY */
-    int max_allocs_per_node;    /* Maximum number of allocations considered at each node in the tree-decomposition based register allocator */
-    int noOptsdccInAsm;         /* Do not emit .optsdcc in asm */
+    int max_allocs_per_node;    /* Maximum number of allocations / combinations considered at each node in the tree-decomposition based algorithms */
+    bool noOptsdccInAsm;        /* Do not emit .optsdcc in asm */
+    bool oldralloc;             /* Use old register allocator */
   };
 
 /* forward definition for variables accessed globally */
diff -Nru sdcc-3.1.0+dfsg/src/SDCCglue.c sdcc-3.2.0+dfsg/src/SDCCglue.c
--- sdcc-3.1.0+dfsg/src/SDCCglue.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCglue.c	2012-05-21 21:40:35.000000000 +0000
@@ -70,13 +70,7 @@
 char *
 aopLiteralLong (value * val, int offset, int size)
 {
-  union
-  {
-    float f;
-    unsigned char c[4];
-  }
-  fl;
-  unsigned long v = ulFromVal (val);
+  unsigned long v;
   struct dbuf_s dbuf;
 
   if (!val)
@@ -87,40 +81,28 @@
 
   dbuf_init (&dbuf, 128);
 
-  /* if it is a float then it gets tricky */
-  /* otherwise it is fairly simple */
-  if (!IS_FLOAT (val->type))
+  switch (size)
     {
-      v >>= (offset * 8);
-      switch (size)
-        {
-        case 1:
-          dbuf_tprintf (&dbuf, "!immedbyte", (unsigned int) v & 0xff);
-          break;
-        case 2:
-          dbuf_tprintf (&dbuf, "!immedword", (unsigned int) v & 0xffff);
-          break;
-        case 3:
-          // we don't have a !immedword24 yet for ds390
-          dbuf_printf (&dbuf, "#0x%06X", (unsigned int) v & 0xffffff);
-          break;
-        default:
-          /* Hmm.  Too big for now. */
-          assert (0);
-        }
-      return dbuf_detach_c_str (&dbuf);
+    case 1:
+      v = byteOfVal (val, offset);
+      dbuf_tprintf (&dbuf, "!immedbyte", (unsigned int) v & 0xff);
+      break;
+    case 2:
+      v = byteOfVal (val, offset+1);
+      v = (v << 8) | byteOfVal (val, offset);
+      dbuf_tprintf (&dbuf, "!immedword", (unsigned int) v & 0xffff);
+      break;
+    case 3:
+      v = byteOfVal (val, offset+2);
+      v = (v << 8) | byteOfVal (val, offset+1);
+      v = (v << 8) | byteOfVal (val, offset);
+      // we don't have a !immedword24 yet for ds390
+      dbuf_printf (&dbuf, "#0x%06X", (unsigned int) v & 0xffffff);
+      break;
+    default:
+      /* Hmm.  Too big for now. */
+      assert (0);
     }
-
-  /* PENDING: For now size must be 1 */
-  assert (size == 1);
-
-  /* it is type float */
-  fl.f = (float) floatFromVal (val);
-#ifdef WORDS_BIGENDIAN
-  dbuf_tprintf (&dbuf, "!immedbyte", fl.c[3 - offset]);
-#else
-  dbuf_tprintf (&dbuf, "!immedbyte", fl.c[offset]);
-#endif
   return dbuf_detach_c_str (&dbuf);
 }
 
@@ -548,7 +530,7 @@
 /* printChar - formats and prints a characater string with DB      */
 /*-----------------------------------------------------------------*/
 void
-printChar (struct dbuf_s *oBuf, char *s, int plen)
+printChar (struct dbuf_s *oBuf, const char *s, int plen)
 {
   int i;
   int len = plen;
@@ -704,7 +686,7 @@
     }
 
   /* check if the literal value is within bounds */
-  if (checkConstantRange (type, val->etype, '=', FALSE) == CCR_OVL && !options.lessPedantic)
+  if (checkConstantRange (type, val->etype, '=', FALSE) == CCR_OVL)
     {
       werror (W_LIT_OVERFLOW);
     }
@@ -830,7 +812,7 @@
             size = (bit_length + 7) / 8;
 
           /* check if the literal value is within bounds */
-          if (val && checkConstantRange (lsym->etype, val->etype, '=', FALSE) == CCR_OVL && !options.lessPedantic)
+          if (val && checkConstantRange (lsym->etype, val->etype, '=', FALSE) == CCR_OVL)
             {
               werror (W_LIT_OVERFLOW);
             }
@@ -935,7 +917,7 @@
 /* printIvalChar - generates initital value for character array    */
 /*-----------------------------------------------------------------*/
 int
-printIvalChar (symbol * sym, sym_link * type, initList * ilist, struct dbuf_s *oBuf, char *s, bool check)
+printIvalChar (symbol * sym, sym_link * type, initList * ilist, struct dbuf_s *oBuf, const char *s, bool check)
 {
   value *val;
   unsigned int size = DCL_ELEM (type);
@@ -1541,13 +1523,16 @@
 void
 emitMaps (void)
 {
+  namedspacemap *nm;
   int publicsfr = TARGET_IS_MCS51;      /* Ideally, this should be true for all  */
-  /* ports but let's be conservative - EEP */
+                                        /* ports but let's be conservative - EEP */
 
   inInitMode++;
   /* no special considerations for the following
      data, idata & bit & xdata */
   emitRegularMap (data, TRUE, TRUE);
+  for (nm = namedspacemaps; nm; nm = nm->next)
+    emitRegularMap (nm->map, TRUE, TRUE);
   emitRegularMap (idata, TRUE, TRUE);
   emitRegularMap (d_abs, TRUE, TRUE);
   emitRegularMap (i_abs, TRUE, TRUE);
@@ -1691,9 +1676,6 @@
 {
   set *ovrset;
 
-  if (!elementsInSet (ovrSetSets))
-    dbuf_tprintf (aBuf, "\t!area\n", port->mem.overlay_name);
-
   /* for each of the sets in the overlay segment do */
   for (ovrset = setFirstItem (ovrSetSets); ovrset; ovrset = setNextItem (ovrSetSets))
     {
@@ -1701,7 +1683,7 @@
 
       if (elementsInSet (ovrset))
         {
-          /* output the area informtion */
+          /* output the area information */
           dbuf_printf (aBuf, "\t.area\t%s\n", port->mem.overlay_name);  /* MOF */
         }
 
@@ -1774,6 +1756,7 @@
   struct dbuf_s asmFileName;
   FILE *asmFile;
   int mcs51_like;
+  namedspacemap *nm;
 
   dbuf_init (&vBuf, 4096);
   dbuf_init (&ovrBuf, 4096);
@@ -1824,8 +1807,12 @@
   /* initial comments */
   initialComments (asmFile);
 
-  if (TARGET_IS_Z180)
+  if (TARGET_IS_S08)
+    fprintf (asmFile, "\t.cs08\n");
+  else if (TARGET_IS_Z180)
     fprintf (asmFile, "\t.hd64\n");
+  else if (TARGET_IS_R3KA)
+    fprintf (asmFile, "\t.r3k\n");
 
   /* print module name */
   tfprintf (asmFile, "\t!module\n", moduleName);
@@ -1871,7 +1858,7 @@
         fprintf (asmFile, " --parms-in-bank1");
       fprintf (asmFile, "\n");
     }
-  else if ((TARGET_Z80_LIKE || TARGET_IS_HC08) && !options.noOptsdccInAsm)
+  else if ((TARGET_Z80_LIKE || TARGET_HC08_LIKE) && !options.noOptsdccInAsm)
     {
       fprintf (asmFile, "\t.optsdcc -m%s\n", port->target);
     }
@@ -1941,16 +1928,24 @@
 
   /* copy the data segment */
   fprintf (asmFile, "%s", iComments2);
-  fprintf (asmFile, "; %s ram data\n", mcs51_like ? "internal" : "");
+  fprintf (asmFile, ";%s ram data\n", mcs51_like ? " internal" : "");
   fprintf (asmFile, "%s", iComments2);
   dbuf_write_and_destroy (&data->oBuf, asmFile);
 
+  /* copy segments for named address spaces */
+  for (nm = namedspacemaps; nm; nm = nm->next)
+    {
+      fprintf (asmFile, "%s", iComments2);
+      fprintf (asmFile, "; %s ram data\n", nm->name);
+      fprintf (asmFile, "%s", iComments2);
+      dbuf_write_and_destroy (&nm->map->oBuf, asmFile);
+    }
 
   /* create the overlay segments */
   if (overlay)
     {
       fprintf (asmFile, "%s", iComments2);
-      fprintf (asmFile, "; overlayable items in %s ram \n", mcs51_like ? "internal" : "");
+      fprintf (asmFile, "; overlayable items in%s ram \n", mcs51_like ? " internal" : "");
       fprintf (asmFile, "%s", iComments2);
       dbuf_write_and_destroy (&ovrBuf, asmFile);
     }
@@ -1965,7 +1960,7 @@
     }
 
   /* create the idata segment */
-  if ((idata) && (mcs51_like))
+  if (idata)
     {
       fprintf (asmFile, "%s", iComments2);
       fprintf (asmFile, "; indirectly addressable internal ram data\n");
@@ -1974,17 +1969,19 @@
     }
 
   /* create the absolute idata/data segment */
-  if ((i_abs) && (mcs51_like))
+  if (d_abs || i_abs)
     {
       fprintf (asmFile, "%s", iComments2);
-      fprintf (asmFile, "; absolute internal ram data\n");
+      fprintf (asmFile, "; absolute%s ram data\n", mcs51_like ? " internal" : "");
       fprintf (asmFile, "%s", iComments2);
-      dbuf_write_and_destroy (&d_abs->oBuf, asmFile);
-      dbuf_write_and_destroy (&i_abs->oBuf, asmFile);
+      if (d_abs)
+        dbuf_write_and_destroy (&d_abs->oBuf, asmFile);
+      if (i_abs)
+        dbuf_write_and_destroy (&i_abs->oBuf, asmFile);
     }
 
   /* copy the bit segment */
-  if (mcs51_like)
+  if (bit)
     {
       fprintf (asmFile, "%s", iComments2);
       fprintf (asmFile, "; bit data\n");
@@ -1993,7 +1990,7 @@
     }
 
   /* copy paged external ram data */
-  if (mcs51_like)
+  if (pdata)
     {
       fprintf (asmFile, "%s", iComments2);
       fprintf (asmFile, "; paged external ram data\n");
@@ -2011,7 +2008,7 @@
     }
 
   /* copy external ram data */
-  if (mcs51_like)
+  if (xdata && mcs51_like)
     {
       fprintf (asmFile, "%s", iComments2);
       fprintf (asmFile, "; external ram data\n");
@@ -2020,7 +2017,7 @@
     }
 
   /* create the absolute xdata segment */
-  if (mcs51_like || TARGET_IS_HC08)
+  if (x_abs)
     {
       fprintf (asmFile, "%s", iComments2);
       fprintf (asmFile, "; absolute external ram data\n");
@@ -2029,10 +2026,13 @@
     }
 
   /* copy external initialized ram data */
-  fprintf (asmFile, "%s", iComments2);
-  fprintf (asmFile, "; external initialized ram data\n");
-  fprintf (asmFile, "%s", iComments2);
-  dbuf_write_and_destroy (&xidata->oBuf, asmFile);
+  if (xidata)
+    {
+      fprintf (asmFile, "%s", iComments2);
+      fprintf (asmFile, "; external initialized ram data\n");
+      fprintf (asmFile, "%s", iComments2);
+      dbuf_write_and_destroy (&xidata->oBuf, asmFile);
+    }
 
   /* If the port wants to generate any extra areas, let it do so. */
   if (port->extraAreas.genExtraAreaDeclaration)
diff -Nru sdcc-3.1.0+dfsg/src/SDCChasht.h sdcc-3.2.0+dfsg/src/SDCChasht.h
--- sdcc-3.1.0+dfsg/src/SDCChasht.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCChasht.h	2011-11-28 14:42:14.000000000 +0000
@@ -100,7 +100,10 @@
 hTab *hTabFromTable (hTab *);
 int isHtabsEqual (hTab *, hTab *, int (*compareFunc) (void *, void *));
 hashtItem *hTabSearch (hTab *, int);
+
+/* return the first item with the given key */
 void *hTabItemWithKey (hTab *, int);
+
 void hTabAddItemIfNotP (hTab **, int, void *);
 void hTabDeleteAll (hTab *);
 void *hTabFirstItemWK (hTab * htab, int wk);
diff -Nru sdcc-3.1.0+dfsg/src/SDCCicode.c sdcc-3.2.0+dfsg/src/SDCCicode.c
--- sdcc-3.1.0+dfsg/src/SDCCicode.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCicode.c	2012-06-12 07:56:02.000000000 +0000
@@ -285,6 +285,11 @@
   dbuf_append_str (dbuf, " = ");
   dbuf_append_str (dbuf, "@[");
   dbuf_printOperand (IC_LEFT (ic), dbuf);
+  if (IC_RIGHT (ic))
+    {
+      dbuf_append_str (dbuf, " + ");
+      dbuf_printOperand (IC_RIGHT (ic), dbuf);
+    }
   dbuf_append_str (dbuf, "]\n");
 }
 
@@ -783,6 +788,12 @@
       SPEC_SCLS (itmp->etype) = S_REGISTER;
       SPEC_OCLS (itmp->etype) = reg;
     }
+    
+  /* iTemps always live in the default address space */
+  if (IS_DECL (itmp->type))
+    DCL_PTR_ADDRSPACE (itmp->type) = 0;
+  else
+    SPEC_ADDRSPACE (itmp->etype) = 0;
 
   op->svt.symOperand = itmp;
   op->key = itmp->key = ++operandKey;
@@ -793,8 +804,10 @@
 /* operandType - returns the type chain for an operand             */
 /*-----------------------------------------------------------------*/
 sym_link *
-operandType (const operand * op)
+operandType (const operand *op)
 {
+  wassert (op);
+
   /* depending on type of operand */
   switch (op->type)
     {
@@ -887,7 +900,7 @@
 /* isOperandLiteral - returns 1 if an operand contains a literal   */
 /*-----------------------------------------------------------------*/
 int
-isOperandLiteral (operand * op)
+isOperandLiteral (const operand *const op)
 {
   sym_link *opetype;
 
@@ -1128,13 +1141,6 @@
   return ic;
 }
 
-/* This seems to be a GCC 4.6.[01] bug on i386 Linux and mingw platforms
- * see http://sourceforge.net/tracker/?func=detail&aid=3285611&group_id=599&atid=300599
- */
-#if (defined(__linux__) || defined(__MINGW32__)) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 6 && (__GNUC_PATCHLEVEL__ == 0 || __GNUC_PATCHLEVEL__ == 1)
-#pragma GCC push_options
-#pragma GCC optimize ("O0")
-#endif
 /*-----------------------------------------------------------------*/
 /* operandOperation - performs operations on operands              */
 /*-----------------------------------------------------------------*/
@@ -1390,18 +1396,12 @@
 
   return retval;
 }
-/* This seems to be a GCC 4.6.[01] bug on i386 Linux and mingw platforms
- * see http://sourceforge.net/tracker/?func=detail&aid=3285611&group_id=599&atid=300599
- */
-#if (defined(__linux__) || defined(__MINGW32__)) && defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 6 && (__GNUC_PATCHLEVEL__ == 0 || __GNUC_PATCHLEVEL__ == 1)
-#pragma GCC pop_options
-#endif
 
 /*-----------------------------------------------------------------*/
 /* isOperandEqual - compares two operand & return 1 if they are =  */
 /*-----------------------------------------------------------------*/
 int
-isOperandEqual (operand * left, operand * right)
+isOperandEqual (const operand * left, const operand * right)
 {
   /* if the pointers are equal then they are equal */
   if (left == right)
@@ -1583,7 +1583,7 @@
   /* under the following conditions create a
      register equivalent for a local symbol */
   if (sym->level && sym->etype && SPEC_OCLS (sym->etype) &&
-      (IN_FARSPACE (SPEC_OCLS (sym->etype)) && !TARGET_IS_HC08 && (!(options.model == MODEL_FLAT24))) && options.stackAuto == 0)
+      (IN_FARSPACE (SPEC_OCLS (sym->etype)) && !TARGET_HC08_LIKE && (!(options.model == MODEL_FLAT24))) && options.stackAuto == 0)
     {
       ok = 0;
     }
@@ -1880,7 +1880,7 @@
     return op;
 
   /* if this is not a temp symbol then */
-  if (!IS_ITEMP (op) && !force && !(IN_FARSPACE (SPEC_OCLS (etype)) && !TARGET_IS_HC08))
+  if (!IS_ITEMP (op) && !force && !(IN_FARSPACE (SPEC_OCLS (etype)) && !TARGET_HC08_LIKE))
     {
       op = operandFromOperand (op);
       op->isaddr = 0;
@@ -1888,14 +1888,14 @@
     }
 
   if (IS_SPEC (type) &&
-      IS_TRUE_SYMOP (op) && (!(IN_FARSPACE (SPEC_OCLS (etype)) && !TARGET_IS_HC08) || (options.model == MODEL_FLAT24)))
+      IS_TRUE_SYMOP (op) && (!(IN_FARSPACE (SPEC_OCLS (etype)) && !TARGET_HC08_LIKE) || (options.model == MODEL_FLAT24)))
     {
       op = operandFromOperand (op);
       op->isaddr = 0;
       return op;
     }
 
-  ic = newiCode (GET_VALUE_AT_ADDRESS, op, NULL);
+  ic = newiCode (GET_VALUE_AT_ADDRESS, op, operandFromLit (0));
   if (IS_PTR (type) && op->isaddr && force)
     type = type->next;
 
@@ -1970,15 +1970,7 @@
   ic = newiCode (CAST, operandFromLink (type), geniCodeRValue (op, FALSE));
   IC_RESULT (ic) = newiTempOperand (type, 0);
 
-  /* preserve the storage class & output class */
-  /* of the original variable                  */
   restype = getSpec (operandType (IC_RESULT (ic)));
-  if (!IS_LITERAL (opetype) && !IS_BIT (opetype))
-    {
-      SPEC_SCLS (restype) = SPEC_SCLS (opetype);
-      SPEC_OCLS (restype) = SPEC_OCLS (opetype);
-    }
-
   /* Convert cast to _Bool bitfield members to casts to _Bool. */
   if (SPEC_NOUN (restype) == V_BBITFIELD)
     SPEC_NOUN (restype) = V_BOOL;
@@ -2075,11 +2067,18 @@
   return IC_RESULT (ic);
 }
 
+static operand *
+geniCodeAdd (operand *left, operand *right, RESULT_TYPE resultType, int lvl);
+static operand *
+geniCodeLogic (operand *left, operand *right, int op, ast *tree);
+operand *
+geniCodeRightShift (operand *left, operand *right);
+
 /*-----------------------------------------------------------------*/
 /* geniCodeDivision - gen intermediate code for division           */
 /*-----------------------------------------------------------------*/
 static operand *
-geniCodeDivision (operand * left, operand * right, RESULT_TYPE resultType)
+geniCodeDivision (operand *left, operand *right, RESULT_TYPE resultType)
 {
   iCode *ic;
   int p2 = 0;
@@ -2092,9 +2091,33 @@
   resType = usualBinaryConversions (&left, &right, resultType, '/');
 
   /* if the right is a literal & power of 2
+     and left is signed then make it a conditional addition
+     followed by right shift */
+#if 1
+  if (IS_LITERAL (retype) &&
+      !IS_FLOAT (letype) &&
+      !IS_FIXED (letype) && !IS_UNSIGNED (letype) && ((p2 = powof2 ((TYPE_TARGET_ULONG) ulFromVal (OP_VALUE (right)))) > 0) &&
+      (TARGET_Z80_LIKE || TARGET_HC08_LIKE))
+    {
+      operand *tmp;
+      symbol *label = newiTempLabel (NULL);
+
+      tmp = newiTempOperand (ltype, 0);
+      geniCodeAssign (tmp, left, 0, 0);
+
+      ic = newiCodeCondition (geniCodeLogic (tmp, operandFromLit (0), '<', 0), 0, label);
+      ADDTOCHAIN (ic);
+
+      geniCodeAssign (tmp, geniCodeAdd (tmp, operandFromLit ((1 << p2) - 1), 0, 0), 0, 0);
+      geniCodeLabel (label);
+      return (geniCodeCast (resType, geniCodeRightShift (tmp, operandFromLit (p2)), TRUE));
+    }
+  /* if the right is a literal & power of 2
      and left is unsigned then make it a
      right shift */
-  if (IS_LITERAL (retype) &&
+  else
+#endif
+       if (IS_LITERAL (retype) &&
       !IS_FLOAT (letype) &&
       !IS_FIXED (letype) && IS_UNSIGNED (letype) && ((p2 = powof2 ((TYPE_TARGET_ULONG) ulFromVal (OP_VALUE (right)))) > 0))
     {
@@ -2227,6 +2250,7 @@
 {
   iCode *ic;
   sym_link *resType;
+  unsigned int nBytes;
   operand *size;
   int isarray = 0;
   bool indexUnsigned;
@@ -2245,10 +2269,13 @@
   if (IS_PTR (ltype) || IS_ARRAY (ltype))
     {
       isarray = left->isaddr;
+      nBytes = getSize (ltype->next);
+      if (nBytes == 0)
+        werror (E_UNKNOWN_SIZE, IS_SYMOP (left) ? OP_SYMBOL (left)->name : "<no name>");
       // there is no need to multiply with 1
-      if (getSize (ltype->next) != 1)
+      if (nBytes != 1)
         {
-          size = operandFromLit (getSize (ltype->next));
+          size = operandFromLit (nBytes);
           SPEC_USIGN (getSpec (operandType (size))) = 1;
           indexUnsigned = IS_UNSIGNED (getSpec (operandType (right)));
           right = geniCodeMultiply (right, size, resultType);
@@ -2274,8 +2301,7 @@
   IC_RESULT (ic) = newiTempOperand (resType, 1);
   IC_RESULT (ic)->isaddr = (isarray ? 1 : 0);
 
-  /* if left or right is a float then support
-     routine */
+  /* if left or right is a float then support routine */
   if (IS_FLOAT (ltype) || IS_FLOAT (rtype) || IS_FIXED (ltype) || IS_FIXED (rtype))
     ic->supportRtn = 1;
 
@@ -2390,8 +2416,9 @@
 
   ic = newiCode ('+', left, right);
 
-  IC_RESULT (ic) = newiTempOperand (((IS_PTR (ltype) &&
-                                      !IS_AGGREGATE (ltype->next) && !IS_PTR (ltype->next)) ? ltype : ltype->next), 0);
+  IC_RESULT (ic) = newiTempOperand ((IS_PTR (ltype) &&
+                                     !IS_AGGREGATE (ltype->next) &&
+                                     !IS_PTR (ltype->next)) ? ltype : ltype->next, 0);
 
   if (!IS_AGGREGATE (ltype->next))
     {
@@ -2784,6 +2811,16 @@
   if (!isLvaluereq (lvl))
     op = geniCodeRValue (op, TRUE);
 
+  if (IS_DECL (rtype))
+    {
+      DCL_PTR_ADDRSPACE (rtype) = 0;
+      DCL_PTR_VOLATILE (rtype) = 0;
+    }
+  else
+    {
+      SPEC_ADDRSPACE (rtype) = 0;
+      SPEC_VOLATILE (rtype) = 0;
+    }
   setOperandType (op, rtype);
 
   return op;
@@ -2858,8 +2895,7 @@
         {
         case CCR_ALWAYS_TRUE:
         case CCR_ALWAYS_FALSE:
-          if (!options.lessPedantic)
-            werror (W_COMP_RANGE, "true resp. false");
+          werror (W_COMP_RANGE, "true resp. false");
           return operandFromLit (ccr_result == CCR_ALWAYS_TRUE ? 1 : 0);
         default:
           break;
@@ -2997,11 +3033,11 @@
 /* geniCodeUnary - for a generic unary operation                   */
 /*-----------------------------------------------------------------*/
 operand *
-geniCodeUnary (operand * op, int oper)
+geniCodeUnary (operand * op, int oper, sym_link * resType)
 {
   iCode *ic = newiCode (oper, op, NULL);
 
-  IC_RESULT (ic) = newiTempOperand (operandType (op), 0);
+  IC_RESULT (ic) = newiTempOperand (resType, 0);
   ADDTOCHAIN (ic);
   return IC_RESULT (ic);
 }
@@ -3010,11 +3046,11 @@
 /* geniCodeBinary - for a generic binary operation                 */
 /*-----------------------------------------------------------------*/
 operand *
-geniCodeBinary (operand * left, operand * right, int oper)
+geniCodeBinary (operand * left, operand * right, int oper, sym_link * resType)
 {
   iCode *ic = newiCode (oper, left, right);
 
-  IC_RESULT (ic) = newiTempOperand (operandType (left), 0);
+  IC_RESULT (ic) = newiTempOperand (resType, 0);
   ADDTOCHAIN (ic);
   return IC_RESULT (ic);
 }
@@ -3065,14 +3101,7 @@
 {
   sym_link *ltype = operandType (left);
   sym_link *rtype = operandType (right);
-
-  /* left is integral type and right is literal then
-     check if the literal value is within bounds */
-  if (IS_INTEGRAL (ltype) && right->type == VALUE && IS_LITERAL (rtype) &&
-      checkConstantRange (ltype, rtype, '=', FALSE) == CCR_OVL && !options.lessPedantic)
-    {
-      werror (W_LIT_OVERFLOW);
-    }
+  bool always_cast = FALSE;
 
   /* if the left & right type don't exactly match */
   /* if pointer set then make sure the check is
@@ -3084,22 +3113,25 @@
     {
       if (left->aggr2ptr)
         {
-          right = geniCodeCast (ltype, right, TRUE);
-          checkPtrQualifiers (ltype, rtype);
+          always_cast = TRUE;
         }
       else
         {
-          if (compareType (ltype->next, rtype) < 0)
-            right = geniCodeCast (ltype->next, right, TRUE);
-          checkPtrQualifiers (ltype->next, rtype);
+          ltype = ltype->next;
         }
     }
-  else
+
+  /* left is integral type and right is literal then
+     check if the literal value is within bounds */
+  if (IS_INTEGRAL (ltype) && right->type == VALUE && IS_LITERAL (rtype) &&
+      checkConstantRange (ltype, rtype, '=', FALSE) == CCR_OVL)
     {
-      if (compareType (ltype, rtype) < 0)
-        right = geniCodeCast (ltype, right, TRUE);
-      checkPtrQualifiers (ltype, rtype);
+      werror (W_LIT_OVERFLOW);
     }
+
+  if (always_cast || compareType (ltype, rtype) == -1)
+    right = geniCodeCast (ltype, right, TRUE);
+  checkPtrQualifiers (ltype, rtype);
   return right;
 }
 
@@ -3110,6 +3142,7 @@
 geniCodeAssign (operand * left, operand * right, int nosupdate, int strictLval)
 {
   iCode *ic;
+  sym_link *ltype;
 
   if (!left->isaddr && (!IS_ITEMP (left) || strictLval))
     {
@@ -3154,7 +3187,11 @@
   ic->nosupdate = nosupdate;
   /* left could be a pointer assignment,
      return the properly casted right instead */
-  return right;
+  ltype = operandType (left);
+  if ((IS_PTR (ltype) && IS_BITVAR (ltype->next)) || IS_BITVAR (ltype))
+    return left;
+  else
+    return right;
 }
 
 /*-----------------------------------------------------------------*/
@@ -3394,7 +3431,7 @@
           if (!sym->addrtaken && !IS_VOLATILE (sym->etype))
             {
 
-              if ((IN_FARSPACE (SPEC_OCLS (sym->etype)) && !TARGET_IS_HC08) &&
+              if ((IN_FARSPACE (SPEC_OCLS (sym->etype)) && !TARGET_HC08_LIKE) &&
                   options.stackAuto == 0 && (!(options.model == MODEL_FLAT24)))
                 {
                 }
@@ -3496,6 +3533,10 @@
 {
   iCode *ic;
 
+  /* return in _Noreturn function */ 
+  if (currFunc && IFFUNC_ISNORETURN (currFunc->type))
+    werror (W_NORETURNRETURN);
+
   /* if the operand is present force an rvalue */
   if (op)
     op = geniCodeRValue (op, FALSE);
@@ -3554,7 +3595,10 @@
     }
 
 exit:
-  ast2iCode (tree->right, lvl + 1);
+  if (tree->right && tree->right->type == EX_VALUE)
+    geniCodeDummyRead (ast2iCode (tree->right, lvl + 1));
+  else
+    ast2iCode (tree->right, lvl + 1);
 }
 
 /*-----------------------------------------------------------------*/
@@ -3817,7 +3861,6 @@
       caseVals = caseVals->next;
     }
 
-
 defaultOrBreak:
   /* if default is present then goto break else break */
   dbuf_init (&dbuf, 128);
@@ -3887,7 +3930,7 @@
   operand *op = NULL;
   sym_link *type;
 
-  if (!options.stackAuto && !TARGET_IS_HC08)
+  if (!options.stackAuto && !TARGET_HC08_LIKE)
     {
       type = newLink (SPECIFIER);
       SPEC_VOLATILE (type) = 1;
@@ -4186,30 +4229,26 @@
     case RRC:
     case RLC:
     case SWAP:
-      return geniCodeUnary (geniCodeRValue (left, FALSE), tree->opval.op);
+      return geniCodeUnary (geniCodeRValue (left, FALSE), tree->opval.op, tree->ftype);
 
     case '!':
     case GETHBIT:
       {
-        operand *op = geniCodeUnary (geniCodeRValue (left, FALSE), tree->opval.op);
-        if (!IS_BOOLEAN (operandType (op)))
-          setOperandType (op, UCHARTYPE);
+        operand *op = geniCodeUnary (geniCodeRValue (left, FALSE), tree->opval.op, tree->ftype);
         return op;
       }
     case GETABIT:
       {
         operand *op = geniCodeBinary (geniCodeRValue (left, FALSE),
                                       geniCodeRValue (right, FALSE),
-                                      tree->opval.op);
-        if (!IS_BOOLEAN (operandType (op)))
-          setOperandType (op, UCHARTYPE);
+                                      tree->opval.op, tree->ftype);
         return op;
       }
     case GETBYTE:
       {
         operand *op = geniCodeBinary (geniCodeRValue (left, FALSE),
                                       geniCodeRValue (right, FALSE),
-                                      tree->opval.op);
+                                      tree->opval.op, tree->ftype);
         setOperandType (op, UCHARTYPE);
         return op;
       }
@@ -4217,7 +4256,7 @@
       {
         operand *op = geniCodeBinary (geniCodeRValue (left, FALSE),
                                       geniCodeRValue (right, FALSE),
-                                      tree->opval.op);
+                                      tree->opval.op, tree->ftype);
         setOperandType (op, UINTTYPE);
         return op;
       }
@@ -4346,7 +4385,13 @@
 
     case LABEL:
       geniCodeLabel (OP_SYMBOL (ast2iCode (tree->left, lvl + 1)));
-      return ast2iCode (tree->right, lvl + 1);
+      if (tree->right && tree->right->type == EX_VALUE)
+        {
+          geniCodeDummyRead (ast2iCode (tree->right, lvl + 1));
+	  return NULL;
+	}
+      else
+	return ast2iCode (tree->right, lvl + 1);
 
     case GOTO:
       geniCodeGoto (OP_SYMBOL (ast2iCode (tree->left, lvl + 1)));
diff -Nru sdcc-3.1.0+dfsg/src/SDCCicode.h sdcc-3.2.0+dfsg/src/SDCCicode.h
--- sdcc-3.1.0+dfsg/src/SDCCicode.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCicode.h	2012-06-07 17:36:23.000000000 +0000
@@ -73,28 +73,28 @@
 /* typedef for operand */
 typedef struct operand
 {
-  OPTYPE type;                  /* type of operand */
-  unsigned int isaddr:1;        /* is an address   */
-  unsigned int aggr2ptr:2;      /* 1: must change aggregate to pointer to aggregate */
+  OPTYPE type;                      /* type of operand */
+  unsigned int isaddr:1;            /* is an address   */
+  unsigned int aggr2ptr:2;          /* 1: must change aggregate to pointer to aggregate */
   /* 2: aggregate has been changed to pointer to aggregate */
-  unsigned int isvolatile:1;    /* is a volatile operand */
-  unsigned int isGlobal:1;      /* is a global operand */
-  unsigned int isPtr:1;         /* is assigned a pointer */
-  unsigned int isGptr:1;        /* is a generic pointer  */
-  unsigned int isParm:1;        /* is a parameter        */
-  unsigned int isLiteral:1;     /* operand is literal    */
+  unsigned int isvolatile:1;        /* is a volatile operand */
+  unsigned int isGlobal:1;          /* is a global operand */
+  unsigned int isPtr:1;             /* is assigned a pointer */
+  unsigned int isGptr:1;            /* is a generic pointer  */
+  unsigned int isParm:1;            /* is a parameter        */
+  unsigned int isLiteral:1;         /* operand is literal    */
 
   int key;
   union
   {
-    struct symbol *symOperand;  /* operand is of type symbol */
-    struct value *valOperand;   /* operand is of type value  */
-    struct sym_link *typeOperand;       /* operand is of type typechain */
+    struct symbol *symOperand;      /* operand is of type symbol */
+    struct value *valOperand;       /* operand is of type value  */
+    struct sym_link *typeOperand;   /* operand is of type typechain */
   }
   svt;
 
-  bitVect *usesDefs;            /* which definitions are used by this */
-  struct asmop *aop;            /* asm op for this operand */
+  bitVect *usesDefs;                /* which definitions are used by this */
+  struct asmop *aop;                /* asm op for this operand */
 }
 operand;
 
@@ -117,16 +117,16 @@
 #define OP_TYPE(op)          validateOpType(op, "OP_TYPE", #op, TYPE, __FILE__, __LINE__)->svt.typeOperand
 
 /* definition for intermediate code */
-#define IC_RESULT(x) (x)->ulrrcnd.lrr.result
-#define IC_LEFT(x)   (x)->ulrrcnd.lrr.left
-#define IC_RIGHT(x)  (x)->ulrrcnd.lrr.right
-#define IC_COND(x)   (x)->ulrrcnd.cnd.condition
-#define IC_TRUE(x)   (x)->ulrrcnd.cnd.trueLabel
-#define IC_FALSE(x)  (x)->ulrrcnd.cnd.falseLabel
-#define IC_LABEL(x)  (x)->label
-#define IC_JTCOND(x) (x)->ulrrcnd.jmpTab.condition
-#define IC_JTLABELS(x) (x)->ulrrcnd.jmpTab.labels
-#define IC_INLINE(x) (x)->inlineAsm
+#define IC_RESULT(x)     (x)->ulrrcnd.lrr.result
+#define IC_LEFT(x)       (x)->ulrrcnd.lrr.left
+#define IC_RIGHT(x)      (x)->ulrrcnd.lrr.right
+#define IC_COND(x)       (x)->ulrrcnd.cnd.condition
+#define IC_TRUE(x)       (x)->ulrrcnd.cnd.trueLabel
+#define IC_FALSE(x)      (x)->ulrrcnd.cnd.falseLabel
+#define IC_LABEL(x)      (x)->label
+#define IC_JTCOND(x)     (x)->ulrrcnd.jmpTab.condition
+#define IC_JTLABELS(x)   (x)->ulrrcnd.jmpTab.labels
+#define IC_INLINE(x)     (x)->inlineAsm
 #define IC_ARRAYILIST(x) (x)->arrayInitList
 
 typedef struct iCode
@@ -185,7 +185,7 @@
 
   symbol *label;                /* for a goto statement     */
 
-  char *inlineAsm;              /* pointer to inline assembler code */
+  const char *inlineAsm;        /* pointer to inline assembler code */
   literalList *arrayInitList;   /* point to array initializer list. */
 
   int lineno;                   /* file & lineno for debug information */
@@ -260,7 +260,7 @@
                                 x->op == '|'        || \
                                 x->op == '^'))
 
-#define IS_ASSOCIATIVE(x) (x && (x->op == EQ_OP      || \
+#define IS_COMMUTATIVE(x) (x && (x->op == EQ_OP      || \
                                  x->op == NE_OP      || \
                                  x->op == '+'        || \
                                  x->op == '*'        || \
@@ -311,9 +311,9 @@
 void initiCode ();
 iCode *iCodeFromAst (ast *);
 int isiCodeEqual (iCode *, iCode *);
-int isOperandEqual (operand *, operand *);
+int isOperandEqual (const operand *, const operand *);
 iCodeTable *getTableEntry (int);
-int isOperandLiteral (operand *);
+int isOperandLiteral (const operand * const);
 operand *operandOperation (operand *, operand *, int, sym_link *);
 double operandLitValue (operand *);
 operand *operandFromLit (double);
diff -Nru sdcc-3.1.0+dfsg/src/SDCClabel.c sdcc-3.2.0+dfsg/src/SDCClabel.c
--- sdcc-3.1.0+dfsg/src/SDCClabel.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCClabel.c	2012-06-07 17:36:23.000000000 +0000
@@ -43,27 +43,27 @@
   for (lic = ic; lic; lic = lic->next)
     {
       if (lic->op == GOTO)
-	hTabAddItem (&labelRef, (IC_LABEL (lic))->key, lic);
+        hTabAddItem (&labelRef, (IC_LABEL (lic))->key, lic);
 
       if (lic->op == JUMPTABLE)
-	{
-	  symbol *lbl;
-	  for (lbl = setFirstItem (IC_JTLABELS (lic)); lbl;
-	       lbl = setNextItem (IC_JTLABELS (lic)))
-	    {
-	      hTabAddItem (&labelRef, lbl->key, lic);
-	    }
-	}
+        {
+          symbol *lbl;
+          for (lbl = setFirstItem (IC_JTLABELS (lic)); lbl;
+               lbl = setNextItem (IC_JTLABELS (lic)))
+            {
+              hTabAddItem (&labelRef, lbl->key, lic);
+            }
+        }
 
       if (lic->op == IFX)
-	{
-	  if (IC_TRUE (lic))
-	    hTabAddItem (&labelRef, (IC_TRUE (lic))->key, lic);
-	  else
-	    hTabAddItem (&labelRef, (IC_FALSE (lic))->key, lic);
-	}
+        {
+          if (IC_TRUE (lic))
+            hTabAddItem (&labelRef, (IC_TRUE (lic))->key, lic);
+          else
+            hTabAddItem (&labelRef, (IC_FALSE (lic))->key, lic);
+        }
       if (lic->op == LABEL)
-	hTabAddItem (&labelDef, (IC_LABEL (lic))->key, lic);
+        hTabAddItem (&labelDef, (IC_LABEL (lic))->key, lic);
 
     }
 }
@@ -80,16 +80,16 @@
   for (loop = ic; loop; loop = loop->next)
     {
 
-      if (loop->op == GOTO &&	/* if this is a goto */
-	  loop->next &&		/* and we have a next one */
-	  loop->next->op == LABEL &&	/* next one is a label */
-	  loop->next->label->key == loop->label->key)	/* same label */
-	{
-	  loop->prev->next = loop->next;	/* get this out of the chain */
-	  loop->next->prev = loop->prev;
-	  hTabDeleteItem (&labelRef, (IC_LABEL (loop))->key, loop, DELETE_ITEM, NULL);
-	  change++;
-	}
+      if (loop->op == GOTO &&   /* if this is a goto */
+          loop->next &&         /* and we have a next one */
+          loop->next->op == LABEL &&    /* next one is a label */
+          loop->next->label->key == loop->label->key)   /* same label */
+        {
+          loop->prev->next = loop->next;        /* get this out of the chain */
+          loop->next->prev = loop->prev;
+          hTabDeleteItem (&labelRef, (IC_LABEL (loop))->key, loop, DELETE_ITEM, NULL);
+          change++;
+        }
     }
 
   return change;
@@ -101,12 +101,9 @@
 static void
 deleteIfx (iCode * loop, int key)
 {
-  if (!options.lessPedantic)
-    {
-      werrorfl (loop->filename, loop->lineno, W_CONTROL_FLOW);
-    }
+  werrorfl (loop->filename, loop->lineno, W_CONTROL_FLOW);
   hTabDeleteItem (&labelRef, key, loop, DELETE_ITEM, NULL);
-	      
+
   /* If the condition was volatile, convert IFX to */
   /* DUMMY_READ_VOLATILE. Otherwise just delete the */
   /* IFX iCode */
@@ -132,6 +129,7 @@
 labelIfx (iCode * ic)
 {
   iCode *loop;
+  iCode *stat;
   int change = 0;
 
   for (loop = ic; loop; loop = loop->next)
@@ -142,7 +140,7 @@
          regardless of the condition in this case the 
          condition can be eliminated with a WARNING ofcource */
       if (loop->op == IFX &&
-	    loop->next &&
+            loop->next &&
         loop->next->op == GOTO)
         {
           if (IC_TRUE (loop) && IC_TRUE (loop)->key == IC_LABEL (loop->next)->key)
@@ -165,10 +163,10 @@
       /* if condition goto label */
       /* label:                  */
       if (loop->op == IFX &&
-	  loop->next &&
-	  loop->next->op == LABEL &&
-	  ((IC_TRUE (loop) && IC_TRUE (loop)->key == IC_LABEL (loop->next)->key) ||
-	   (IC_FALSE (loop) && IC_FALSE (loop)->key == IC_LABEL (loop->next)->key)))
+          loop->next &&
+          loop->next->op == LABEL &&
+          ((IC_TRUE (loop) && IC_TRUE (loop)->key == IC_LABEL (loop->next)->key) ||
+           (IC_FALSE (loop) && IC_FALSE (loop)->key == IC_LABEL (loop->next)->key)))
         {
           deleteIfx (loop, IC_LABEL (loop->next)->key);
           change++;
@@ -194,7 +192,7 @@
       /* _falseLabel :                                    */
       /*       ...                                        */
       if (loop->op == IFX && loop->next && loop->next->op == GOTO &&
-	    loop->next->next && loop->next->next->op == LABEL)
+            loop->next->next && loop->next->next->op == LABEL)
         {
           if (IC_TRUE (loop) && (IC_TRUE (loop))->key != (IC_LABEL (loop->next->next))->key ||
             (IC_FALSE (loop) && (IC_FALSE (loop))->key != (IC_LABEL (loop->next->next))->key))
@@ -204,26 +202,25 @@
           /* referenece to the _trueLabel        */
           if (IC_TRUE (loop) && hTabItemWithKey (labelRef, (IC_TRUE (loop))->key))
             {
-
-	      /* we just change the falseLabel */
-	      /* to the next goto statement    */
-	      /* unreferenced label will take  */
-	      /* care of removing the label    */
-	      /* delete reference to the true label */
-
-	      hTabDeleteItem (&labelRef, (IC_TRUE (loop))->key, loop, DELETE_ITEM, NULL);
-	      IC_TRUE (loop) = NULL;
-	      IC_FALSE (loop) = IC_LABEL (loop->next);
-	      /* add reference to the LABEL */
-	      hTabAddItem (&labelRef, (IC_FALSE (loop))->key, loop);
-	      /* next remove the goto */
-	      hTabDeleteItem (&labelRef,
-	       (IC_LABEL (loop->next))->key, loop->next, DELETE_ITEM, NULL);
-	      loop->next = loop->next->next;
-	      loop->next->prev = loop;
-	      change++;
-	      continue;
-	    }
+              /* we just change the falseLabel */
+              /* to the next goto statement    */
+              /* unreferenced label will take  */
+              /* care of removing the label    */
+              /* delete reference to the true label */
+
+              hTabDeleteItem (&labelRef, (IC_TRUE (loop))->key, loop, DELETE_ITEM, NULL);
+              IC_TRUE (loop) = NULL;
+              IC_FALSE (loop) = IC_LABEL (loop->next);
+              /* add reference to the LABEL */
+              hTabAddItem (&labelRef, (IC_FALSE (loop))->key, loop);
+              /* next remove the goto */
+              hTabDeleteItem (&labelRef,
+               (IC_LABEL (loop->next))->key, loop->next, DELETE_ITEM, NULL);
+              loop->next = loop->next->next;
+              loop->next->prev = loop;
+              change++;
+              continue;
+            }
 
           /* now do the same with the false labels */
           if (IC_FALSE (loop) && hTabItemWithKey (labelRef, (IC_FALSE (loop))->key))
@@ -239,6 +236,66 @@
               continue;
             }
         }
+
+      /* Optimize hidden jump-to-jump:
+         Simplify
+           v = 1;              stat->prev
+           goto l1;            stat
+         l0:
+           v = 0;              loop->prev
+         l1:                   loop
+           if (v) goto l3;     loop->next
+         Into
+           v = 1;
+           goto l3;
+         l0:
+           v = 0;
+         l1: */
+      if (loop->op == LABEL &&
+          loop->next && loop->next->op == IFX &&
+          (stat = hTabFirstItemWK (labelRef, (IC_LABEL (loop))->key)) &&
+          !hTabNextItemWK (labelRef) &&
+          stat && stat->op == GOTO &&
+          stat->prev && stat->prev->op == '=' && IS_OP_LITERAL (IC_RIGHT (stat->prev)) &&
+          loop->prev && loop->prev->op == '=' && IS_OP_LITERAL (IC_RIGHT (loop->prev)) &&
+          IC_RESULT (stat->prev)->key == IC_COND (loop->next)->key &&
+          IC_RESULT (loop->prev)->key == IC_COND (loop->next)->key &&
+          !IS_OP_VOLATILE (IC_COND (loop->next)) &&
+          (!operandLitValue (IC_RIGHT (stat->prev)) ^ !operandLitValue (IC_RIGHT (loop->prev))))
+        {
+          if (IC_FALSE (loop->next) && !operandLitValue (IC_RIGHT (loop->prev)) ||
+              IC_TRUE (loop->next)  && operandLitValue (IC_RIGHT (loop->prev)))
+            /* Complicated case: Insert goto, remove conditional jump. */
+            {
+              /* Change IFX to GOTO. */
+              stat = loop->next;
+              IC_LABEL (stat) = IC_TRUE (stat) ? IC_TRUE (stat) : IC_FALSE (stat);
+              stat->op = GOTO;
+
+             /* Move to desired location. */
+              if (loop->next->next)
+                loop->next->next->prev = loop;
+              loop->next = loop->next->next;
+              stat->prev = loop->prev;
+              stat->prev->next = stat;
+              stat->next = loop;
+              loop->prev = stat;
+              change++;
+              continue;
+            }
+          else /* Simple case: Redirect goto, remove conditional jump. */
+            {
+              hTabDeleteItem (&labelRef, (IC_LABEL (stat))->key, stat, DELETE_ITEM, NULL);
+              IC_LABEL (stat) = IC_TRUE (loop->next) ? IC_TRUE (loop->next) : IC_FALSE (loop->next);
+              hTabAddItem (&labelRef, (IC_LABEL (stat))->key, stat);
+              hTabDeleteItem (&labelRef, IC_LABEL (stat)->key, loop->next, DELETE_ITEM, NULL);
+              if (loop->next->next)
+                loop->next->next->prev = loop;
+              loop->next = loop->next->next;
+              change++;
+              continue;
+            }
+        }
     }
 
   return change;
@@ -259,60 +316,60 @@
       symbol *sLabel = NULL;
       stat = NULL;
       switch (loop->op)
-	{
-	case GOTO:		/* for a goto statement */
-	  stat = hTabItemWithKey (labelDef, (sLabel = IC_LABEL (loop))->key);
-	  break;
-	case IFX:		/* for a conditional jump */
-	  if (IC_TRUE (loop))
-	    stat = hTabItemWithKey (labelDef, (sLabel = IC_TRUE (loop))->key);
-	  else
-	    stat = hTabItemWithKey (labelDef, (sLabel = IC_FALSE (loop))->key);
-	}
+        {
+        case GOTO:              /* for a goto statement */
+          stat = hTabItemWithKey (labelDef, (sLabel = IC_LABEL (loop))->key);
+          break;
+        case IFX:               /* for a conditional jump */
+          if (IC_TRUE (loop))
+            stat = hTabItemWithKey (labelDef, (sLabel = IC_TRUE (loop))->key);
+          else
+            stat = hTabItemWithKey (labelDef, (sLabel = IC_FALSE (loop))->key);
+        }
 
       /* if we have a target statement then check if the next */
       /* one is a goto: this means target of goto is a goto   */
       if (stat && stat->next &&
-	  (stat->next->op == GOTO ||
-	   stat->next->op == LABEL) &&
-	  stat->next != loop)
-	{
-
-	  symbol *repLabel = stat->next->label;	/* replace with label */
-
-	  /* if they are the same then continue */
-	  if (repLabel->key == sLabel->key)
-	    continue;
-
-	  /* replacement depends on the statement type */
-	  switch (loop->op)
-	    {
-
-	    case GOTO:		/* for a goto statement */
-
-	      hTabDeleteItem (&labelRef, (IC_LABEL (loop))->key, loop, DELETE_ITEM, NULL);
-	      loop->label = repLabel;
-	      hTabAddItem (&labelRef, repLabel->key, loop);
-	      break;
-
-	    case IFX:		/* for a conditional jump */
-	      if (IC_TRUE (loop))
-		{
-
-		  hTabDeleteItem (&labelRef, (IC_TRUE (loop))->key, loop, DELETE_ITEM, NULL);
-		  IC_TRUE (loop) = repLabel;
-		}
-	      else
-		{
-
-		  hTabDeleteItem (&labelRef, (IC_FALSE (loop))->key, loop, DELETE_ITEM, NULL);
-		  IC_FALSE (loop) = repLabel;
-		}
-	      hTabAddItem (&labelRef, repLabel->key, loop);
-
-	    }
-	  change++;
-	}
+          (stat->next->op == GOTO ||
+           stat->next->op == LABEL) &&
+          stat->next != loop)
+        {
+
+          symbol *repLabel = stat->next->label; /* replace with label */
+
+          /* if they are the same then continue */
+          if (repLabel->key == sLabel->key)
+            continue;
+
+          /* replacement depends on the statement type */
+          switch (loop->op)
+            {
+
+            case GOTO:          /* for a goto statement */
+
+              hTabDeleteItem (&labelRef, (IC_LABEL (loop))->key, loop, DELETE_ITEM, NULL);
+              loop->label = repLabel;
+              hTabAddItem (&labelRef, repLabel->key, loop);
+              break;
+
+            case IFX:           /* for a conditional jump */
+              if (IC_TRUE (loop))
+                {
+
+                  hTabDeleteItem (&labelRef, (IC_TRUE (loop))->key, loop, DELETE_ITEM, NULL);
+                  IC_TRUE (loop) = repLabel;
+                }
+              else
+                {
+
+                  hTabDeleteItem (&labelRef, (IC_FALSE (loop))->key, loop, DELETE_ITEM, NULL);
+                  IC_FALSE (loop) = repLabel;
+                }
+              hTabAddItem (&labelRef, repLabel->key, loop);
+
+            }
+          change++;
+        }
     }
 
   return change;
@@ -332,19 +389,19 @@
 
       /* if this is a label */
       if (loop->op == LABEL)
-	{
-	  if (((IC_LABEL (loop))->key == returnLabel->key) ||
-	      ((IC_LABEL (loop))->key == entryLabel->key))
-	    continue;
-
-	  if (hTabItemWithKey (labelRef, (IC_LABEL (loop))->key))
-	    continue;
-
-	  /* else eliminitate this one */
-	  loop->prev->next = loop->next;	/* get this out of the chain */
-	  loop->next->prev = loop->prev;
-	  change++;
-	}
+        {
+          if (((IC_LABEL (loop))->key == returnLabel->key) ||
+              ((IC_LABEL (loop))->key == entryLabel->key))
+            continue;
+
+          if (hTabItemWithKey (labelRef, (IC_LABEL (loop))->key))
+            continue;
+
+          /* else eliminitate this one */
+          loop->prev->next = loop->next;        /* get this out of the chain */
+          loop->next->prev = loop->prev;
+          change++;
+        }
     }
 
   return change;
@@ -368,45 +425,45 @@
 
       /* found a goto || return && the next */
       /* statement is not a label           */
-      if (loop->op == GOTO || loop->op == RETURN)
-	{
-	  if (loop->next &&
-	      (loop->next->op == LABEL ||
-	       loop->next->op == ENDFUNCTION))
-	    continue;
-
-	  /* loop till we find a label */
-	  loop2 = loop->next;
-	  while (loop2 && loop2->op != LABEL)
-	    loop2 = loop2->next;
-
-	  /* throw away those in between */
-	  for (tic = loop->next; tic && tic != loop2; tic = tic->next)
-	    {
-	      /* remove label references if any */
-	      switch (tic->op)
-		{
-		case GOTO:
-		  hTabDeleteItem (&labelRef, IC_LABEL (tic)->key, tic, DELETE_ITEM, NULL);
-		  break;
-		case IFX:
-		  werrorfl (tic->filename, tic->lineno, W_CODE_UNREACH);
-		  if (IC_TRUE (tic))
-		    hTabDeleteItem (&labelRef, IC_TRUE (tic)->key, tic, DELETE_ITEM, NULL);
-		  else
-		    hTabDeleteItem (&labelRef, IC_FALSE (tic)->key, tic, DELETE_ITEM, NULL);
-		  break;
-		default:
-		  werrorfl (tic->filename, tic->lineno, W_CODE_UNREACH);
-		}
-	    }
-
-	  /* now set up the pointers */
-	  loop->next = loop2;
-	  if (loop2)
-	    loop2->prev = loop;
-	  change++;
-	}
+      if (loop->op == GOTO || loop->op == RETURN ||
+        loop->op == CALL && IFFUNC_ISNORETURN (operandType (IC_LEFT (loop))))
+        {
+          if (loop->next &&
+              (loop->next->op == LABEL || loop->next->op == ENDFUNCTION))
+            continue;
+
+          /* loop till we find a label */
+          loop2 = loop->next;
+          while (loop2 && loop2->op != LABEL)
+            loop2 = loop2->next;
+
+          /* throw away those in between */
+          for (tic = loop->next; tic && tic != loop2; tic = tic->next)
+            {
+              /* remove label references if any */
+              switch (tic->op)
+                {
+                case GOTO:
+                  hTabDeleteItem (&labelRef, IC_LABEL (tic)->key, tic, DELETE_ITEM, NULL);
+                  break;
+                case IFX:
+                  werrorfl (tic->filename, tic->lineno, W_CODE_UNREACH);
+                  if (IC_TRUE (tic))
+                    hTabDeleteItem (&labelRef, IC_TRUE (tic)->key, tic, DELETE_ITEM, NULL);
+                  else
+                    hTabDeleteItem (&labelRef, IC_FALSE (tic)->key, tic, DELETE_ITEM, NULL);
+                  break;
+                default:
+                  werrorfl (tic->filename, tic->lineno, W_CODE_UNREACH);
+                }
+            }
+
+          /* now set up the pointers */
+          loop->next = loop2;
+          if (loop2)
+            loop2->prev = loop;
+          change++;
+        }
     }
   return change;
 }
@@ -452,8 +509,8 @@
       /* remove unreachable code */
       change += labelUnreach (ic);
 
-      if (!change)		/* fixed point reached */
-	break;
+      if (!change)              /* fixed point reached */
+        break;
     }
 
   return ic;
diff -Nru sdcc-3.1.0+dfsg/src/SDCClabel.h sdcc-3.2.0+dfsg/src/SDCClabel.h
--- sdcc-3.1.0+dfsg/src/SDCClabel.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCClabel.h	2011-11-28 14:42:14.000000000 +0000
@@ -36,3 +36,4 @@
 
 
 #endif
+
diff -Nru sdcc-3.1.0+dfsg/src/SDCClrange.c sdcc-3.2.0+dfsg/src/SDCClrange.c
--- sdcc-3.1.0+dfsg/src/SDCClrange.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCClrange.c	2012-02-05 23:57:16.000000000 +0000
@@ -814,7 +814,7 @@
 /*-----------------------------------------------------------------*/
 /* adjustIChain - correct the sch and ech pointers                 */
 /*-----------------------------------------------------------------*/
-static void
+void
 adjustIChain (eBBlock ** ebbs, int count)
 {
   int i;
diff -Nru sdcc-3.1.0+dfsg/src/SDCClrange.h sdcc-3.2.0+dfsg/src/SDCClrange.h
--- sdcc-3.1.0+dfsg/src/SDCClrange.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCClrange.h	2012-02-05 23:57:16.000000000 +0000
@@ -38,4 +38,6 @@
 void setToRange (operand *, int, bool);
 void hashiCodeKeys (eBBlock **, int);
 
+void adjustIChain (eBBlock ** ebbs, int count);
+
 #endif
diff -Nru sdcc-3.1.0+dfsg/src/SDCCmain.c sdcc-3.2.0+dfsg/src/SDCCmain.c
--- sdcc-3.1.0+dfsg/src/SDCCmain.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCmain.c	2012-06-02 13:19:46.000000000 +0000
@@ -32,13 +32,9 @@
 #include <signal.h>
 #include "common.h"
 #include <ctype.h>
-#include "newalloc.h"
 #include "dbuf_string.h"
 #include "SDCCerr.h"
-#include "SDCCsystem.h"
 #include "SDCCmacro.h"
-#include "SDCCutil.h"
-#include "SDCCdebug.h"
 #include "SDCCargs.h"
 
 #ifdef _WIN32
@@ -139,6 +135,7 @@
 #define OPTION_OPT_CODE_SIZE    "--opt-code-size"
 #define OPTION_STD_C89          "--std-c89"
 #define OPTION_STD_C99          "--std-c99"
+#define OPTION_STD_C11          "--std-c11"
 #define OPTION_STD_SDCC89       "--std-sdcc89"
 #define OPTION_STD_SDCC99       "--std-sdcc99"
 #define OPTION_CODE_SEG         "--codeseg"
@@ -149,6 +146,8 @@
 #define OPTION_PEEP_RETURN      "--peep-return"
 #define OPTION_NO_PEEP_RETURN   "--no-peep-return"
 #define OPTION_NO_OPTSDCC_IN_ASM "--no-optsdcc-in-asm"
+#define OPTION_DUMP_GRAPHS      "--dump-graphs"
+#define OPTION_MAX_ALLOCS_PER_NODE  "--max-allocs-per-node"
 
 static const OPTION optionsTable[] = {
   {0,   NULL, NULL, "General options"},
@@ -178,10 +177,11 @@
   {0,   OPTION_WERROR, NULL, "Treat the warnings as errors"},
   {0,   OPTION_DEBUG, NULL, "Enable debugging symbol output"},
   {0,   "--cyclomatic", &options.cyclomatic, "Display complexity of compiled functions"},
-  {0,   OPTION_STD_C89, NULL, "Use C89 standard only"},
+  {0,   OPTION_STD_C89, NULL, "Use C89 standard (sligthly incomplete)"},
   {0,   OPTION_STD_SDCC89, NULL, "Use C89 standard with SDCC extensions (default)"},
-  {0,   OPTION_STD_C99, NULL, "Use C99 standard only (incomplete)"},
-  {0,   OPTION_STD_SDCC99, NULL, "Use C99 standard with SDCC extensions (incomplete)"},
+  {0,   OPTION_STD_C99, NULL, "Use C99 standard (incomplete)"},
+  {0,   OPTION_STD_SDCC99, NULL, "Use C99 standard with SDCC extensions"},
+  {0,   OPTION_STD_C11, NULL, "Use C11 standard (very incomplete)"},
   {0,   OPTION_DOLLARS_IN_IDENT, &options.dollars_in_ident, "Permit '$' as an identifier character"},
   {0,   OPTION_UNSIGNED_CHAR, &options.unsigned_char, "Make \"char\" unsigned by default"},
   {0,   OPTION_USE_NON_FREE, &options.use_non_free, "Search / include non-free licensed libraries and header files"},
@@ -228,6 +228,7 @@
   {0,   OPTION_PEEP_FILE, &options.peep_file, "<file> use this extra peephole file", CLAT_STRING},
   {0,   OPTION_OPT_CODE_SPEED, NULL, "Optimize for code speed rather than size"},
   {0,   OPTION_OPT_CODE_SIZE, NULL, "Optimize for code size rather than speed"},
+  {0,   OPTION_MAX_ALLOCS_PER_NODE, &options.max_allocs_per_node, "Maximum number of register assignments considered at each node of the tree decomposition", CLAT_INTEGER},
 
   {0,   NULL, NULL, "Internal debugging options"},
   {0,   "--dumpraw", &options.dump_raw, "Dump the internal structure after the initial parse"},
@@ -240,6 +241,7 @@
   {0,   "--dumptree", &options.dump_tree, "dump front-end AST before generating iCode"},
   {0,   OPTION_DUMP_ALL, NULL, "Dump the internal structure at all stages"},
   {0,   OPTION_ICODE_IN_ASM, &options.iCodeInAsm, "include i-code as comments in the asm file"},
+  {0,   OPTION_DUMP_GRAPHS, &options.dump_graphs, "Dump graphs (control-flow, conflict, etc)"},
 
   {0,   NULL, NULL, "Linker options"},
   {'l', NULL, NULL, "Include the given library in the link"},
@@ -316,6 +318,9 @@
 #if !OPT_DISABLE_R2K
   &r2k_port,
 #endif
+#if !OPT_DISABLE_R3KA
+  &r3ka_port,
+#endif
 #if !OPT_DISABLE_AVR
   &avr_port,
 #endif
@@ -340,6 +345,9 @@
 #if !OPT_DISABLE_HC08
   &hc08_port,
 #endif
+#if !OPT_DISABLE_S08
+  &s08_port,
+#endif
 };
 
 #define NUM_PORTS (sizeof(_ports)/sizeof(_ports[0]))
@@ -585,11 +593,12 @@
   options.shortis8bits = 0;
   options.std_sdcc = 1;         /* enable SDCC language extensions */
   options.std_c99 = 0;          /* default to C89 until more C99 support */
+  options.std_c11 = 0;          /* default to C89 until more C11 support */
   options.code_seg = CODE_NAME ? Safe_strdup (CODE_NAME) : NULL;        /* default to CSEG for generated code */
   options.const_seg = CONST_NAME ? Safe_strdup (CONST_NAME) : NULL;     /* default to CONST for generated code */
   options.stack10bit = 0;
   options.out_fmt = 0;
-  options.max_allocs_per_node = 3000;
+  options.dump_graphs = 0;
 
   /* now for the optimizations */
   /* turn on the everything */
@@ -600,6 +609,7 @@
   optimize.label4 = 1;
   optimize.loopInvariant = 1;
   optimize.loopInduction = 1;
+  options.max_allocs_per_node = 3000;
 
   /* now for the ports */
   port->setDefaultOptions ();
@@ -1114,6 +1124,14 @@
               continue;
             }
 
+          if (strcmp (argv[i], OPTION_STD_C11) == 0)
+            {
+              options.std_c99 = 1;
+              options.std_c11 = 1;
+              options.std_sdcc = 0;
+              continue;
+            }
+
           if (strcmp (argv[i], OPTION_STD_SDCC89) == 0)
             {
               options.std_c99 = 0;
@@ -1617,7 +1635,7 @@
           WRITE_SEG_LOC (BIT_NAME, 0);
 
           /* stack start */
-          if ((options.stack_loc) && (options.stack_loc < 0x100) && !TARGET_IS_HC08)
+          if ((options.stack_loc) && (options.stack_loc < 0x100) && !TARGET_HC08_LIKE)
             {
               WRITE_SEG_LOC ("SSEG", options.stack_loc);
             }
@@ -1945,57 +1963,83 @@
 
       /* if using external stack define the macro */
       if (options.useXstack)
+        addSet (&preArgvSet, Safe_strdup ("-D__SDCC_USE_XSTACK"));
+      if (options.std_sdcc && options.useXstack)
         addSet (&preArgvSet, Safe_strdup ("-DSDCC_USE_XSTACK"));
 
       /* set the macro for stack autos  */
       if (options.stackAuto)
+        addSet (&preArgvSet, Safe_strdup ("-D__SDCC_STACK_AUTO"));
+      if (options.std_sdcc && options.stackAuto)
         addSet (&preArgvSet, Safe_strdup ("-DSDCC_STACK_AUTO"));
 
       /* set the macro for stack autos  */
       if (options.stack10bit)
+        addSet (&preArgvSet, Safe_strdup ("-D__SDCC_STACK_TENBIT"));
+      if (options.std_sdcc && options.stack10bit)
         addSet (&preArgvSet, Safe_strdup ("-DSDCC_STACK_TENBIT"));
 
       /* set the macro for no overlay  */
       if (options.noOverlay)
+        addSet (&preArgvSet, Safe_strdup ("-D__SDCC_NOOVERLAY"));
+      if (options.std_sdcc && options.noOverlay)
         addSet (&preArgvSet, Safe_strdup ("-DSDCC_NOOVERLAY"));
 
       /* set the macro for unsigned char  */
       if (options.unsigned_char)
+        addSet (&preArgvSet, Safe_strdup ("-D__SDCC_CHAR_UNSIGNED"));
+      if (options.std_sdcc && options.unsigned_char)
         addSet (&preArgvSet, Safe_strdup ("-DSDCC_CHAR_UNSIGNED"));
 
       /* set the macro for non-free  */
       if (options.use_non_free)
+        addSet (&preArgvSet, Safe_strdup ("-D__SDCC_USE_NON_FREE"));
+      if (options.std_sdcc && options.use_non_free)
         addSet (&preArgvSet, Safe_strdup ("-DSDCC_USE_NON_FREE"));
 
       /* set the macro for large model  */
       switch (options.model)
         {
         case MODEL_LARGE:
-          addSet (&preArgvSet, Safe_strdup ("-DSDCC_MODEL_LARGE"));
+          addSet (&preArgvSet, Safe_strdup ("-D__SDCC_MODEL_LARGE"));
+          if (options.std_sdcc)
+            addSet (&preArgvSet, Safe_strdup ("-DSDCC_MODEL_LARGE"));
           break;
 
         case MODEL_SMALL:
-          addSet (&preArgvSet, Safe_strdup ("-DSDCC_MODEL_SMALL"));
+          addSet (&preArgvSet, Safe_strdup ("-D__SDCC_MODEL_SMALL"));
+          if (options.std_sdcc)
+            addSet (&preArgvSet, Safe_strdup ("-DSDCC_MODEL_SMALL"));
           break;
 
         case MODEL_COMPACT:
-          addSet (&preArgvSet, Safe_strdup ("-DSDCC_MODEL_COMPACT"));
+          addSet (&preArgvSet, Safe_strdup ("-D__SDCC_MODEL_COMPACT"));
+          if (options.std_sdcc)
+            addSet (&preArgvSet, Safe_strdup ("-DSDCC_MODEL_COMPACT"));
           break;
 
         case MODEL_MEDIUM:
-          addSet (&preArgvSet, Safe_strdup ("-DSDCC_MODEL_MEDIUM"));
+          addSet (&preArgvSet, Safe_strdup ("-D__SDCC_MODEL_MEDIUM"));
+          if (options.std_sdcc)
+            addSet (&preArgvSet, Safe_strdup ("-DSDCC_MODEL_MEDIUM"));
           break;
 
         case MODEL_HUGE:
-          addSet (&preArgvSet, Safe_strdup ("-DSDCC_MODEL_HUGE"));
+          addSet (&preArgvSet, Safe_strdup ("-D__SDCC_MODEL_HUGE"));
+          if (options.std_sdcc)
+            addSet (&preArgvSet, Safe_strdup ("-DSDCC_MODEL_HUGE"));
           break;
 
         case MODEL_FLAT24:
-          addSet (&preArgvSet, Safe_strdup ("-DSDCC_MODEL_FLAT24"));
+          addSet (&preArgvSet, Safe_strdup ("-D__SDCC_MODEL_FLAT24"));
+          if (options.std_sdcc)
+            addSet (&preArgvSet, Safe_strdup ("-DSDCC_MODEL_FLAT24"));
           break;
 
         case MODEL_PAGE0:
-          addSet (&preArgvSet, Safe_strdup ("-DSDCC_MODEL_PAGE0"));
+          addSet (&preArgvSet, Safe_strdup ("-D__SDCC_MODEL_PAGE0"));
+          if (options.std_sdcc)
+            addSet (&preArgvSet, Safe_strdup ("-DSDCC_MODEL_PAGE0"));
           break;
 
         case NO_MODEL:
@@ -2008,10 +2052,14 @@
 
       /* set macro corresponding to compiler option */
       if (options.intlong_rent)
+        addSet (&preArgvSet, Safe_strdup ("-D__SDCC_INT_LONG_REENT"));
+      if (options.std_sdcc && options.intlong_rent)
         addSet (&preArgvSet, Safe_strdup ("-DSDCC_INT_LONG_REENT"));
 
       /* set macro corresponding to compiler option */
       if (options.float_rent)
+        addSet (&preArgvSet, Safe_strdup ("-D__SDCC_FLOAT_REENT"));
+      if (options.std_sdcc && options.float_rent)
         addSet (&preArgvSet, Safe_strdup ("-DSDCC_FLOAT_REENT"));
 
       /* add SDCC version number */
@@ -2019,32 +2067,49 @@
         struct dbuf_s dbuf;
 
         dbuf_init (&dbuf, 20);
-        dbuf_printf (&dbuf, "-DSDCC=%d%d%d", SDCC_VERSION_HI, SDCC_VERSION_LO, SDCC_VERSION_P);
+        dbuf_printf (&dbuf, "-D__SDCC=%d_%d_%d", SDCC_VERSION_HI, SDCC_VERSION_LO, SDCC_VERSION_P);
         addSet (&preArgvSet, dbuf_detach_c_str (&dbuf));
       }
+      if (options.std_sdcc)
+        {
+          struct dbuf_s dbuf;
+
+          dbuf_init (&dbuf, 20);
+          dbuf_printf (&dbuf, "-DSDCC=%d%d%d", SDCC_VERSION_HI, SDCC_VERSION_LO, SDCC_VERSION_P);
+          addSet (&preArgvSet, dbuf_detach_c_str (&dbuf));
+        }
 
       /* add SDCC revision number */
       {
         struct dbuf_s dbuf;
 
         dbuf_init (&dbuf, 20);        
-        dbuf_printf (&dbuf, "-DSDCC_REVISION=%s", getBuildNumber ());
+        dbuf_printf (&dbuf, "-D__SDCC_REVISION=%s", getBuildNumber ());
         addSet (&preArgvSet, dbuf_detach_c_str (&dbuf));
       }
-
-      /* add port (processor information to processor */
-      addSet (&preArgvSet, Safe_strdup ("-DSDCC_{port}"));
-      addSet (&preArgvSet, Safe_strdup ("-D__{port}"));
-
-      if (port && port->processor && TARGET_IS_PIC14)
+      if (options.std_sdcc)
         {
           struct dbuf_s dbuf;
 
-          dbuf_init (&dbuf, 512);        
-          dbuf_printf (&dbuf, "-DSDCC_PROCESSOR=\"%s\"", port->processor);
+          dbuf_init (&dbuf, 20);        
+          dbuf_printf (&dbuf, "-DSDCC_REVISION=%s", getBuildNumber ());
           addSet (&preArgvSet, dbuf_detach_c_str (&dbuf));
         }
 
+      /* add port (processor information to processor */
+      addSet (&preArgvSet, Safe_strdup ("-D__SDCC_{port}"));
+      if (options.std_sdcc)
+        {
+          addSet (&preArgvSet, Safe_strdup ("-DSDCC_{port}"));
+          addSet (&preArgvSet, Safe_strdup ("-D__{port}"));
+        }
+
+      /* Optinal C features not (yet) supported by sdcc */
+      addSet (&preArgvSet, Safe_strdup ("-D__STDC_NO_COMPLEX__"));
+      addSet (&preArgvSet, Safe_strdup ("-D__STDC_NO_THREADS__"));
+      addSet (&preArgvSet, Safe_strdup ("-D__STDC_NO_ATOMICS__"));
+      addSet (&preArgvSet, Safe_strdup ("-D__STDC_NO_VLA__"));
+
       /* standard include path */
       if (!options.nostdinc)
         {
@@ -2313,16 +2378,8 @@
    * Make sure the preprocessor is called with the "-std" option
    * corresponding to the --std used to start sdcc
    */
-  if (options.std_c99)
-    {
-      if (!options.std_sdcc)
-        setMainValue ("cppstd", "-std=c99 ");
-    }
-  else
-    {
-      if (!options.std_sdcc)
-        setMainValue ("cppstd", "-std=c89 ");
-    }
+  if (!options.std_sdcc)
+    setMainValue ("cppstd", options.std_c11 ? "-std=c11 " : (options.std_c99 ? "-std=c99 " : "-std=c89 "));
 }
 
 static void
diff -Nru sdcc-3.1.0+dfsg/src/SDCCmem.c sdcc-3.2.0+dfsg/src/SDCCmem.c
--- sdcc-3.1.0+dfsg/src/SDCCmem.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCmem.c	2011-12-29 13:55:21.000000000 +0000
@@ -48,31 +48,35 @@
 memmap *overlay = NULL;         /* overlay segment             */
 memmap *eeprom = NULL;          /* eeprom location             */
 memmap *home = NULL;            /* Unswitchable code bank      */
+namedspacemap *namedspacemaps = 0; /* memory segments for named address spaces */
 
 /* this is a set of sets each set containing
    symbols in a single overlay */
 set *ovrSetSets = NULL;
 
-int fatalError = 0;             /* fatal error flag                   */
+int fatalError = 0;             /* fatal error flag            */
 
 /*-----------------------------------------------------------------*/
 /* allocMap - allocates a memory map                               */
 /*-----------------------------------------------------------------*/
 memmap *
-allocMap (char rspace,          /* sfr space            */
-          char farmap,          /* far or near segment  */
-          char paged,           /* can this segment be paged  */
-          char direct,          /* directly addressable */
-          char bitaddr,         /* bit addressable space */
-          char codemap,         /* this is code space   */
-          unsigned sloc,        /* starting location    */
-          const char *name,     /* 2 character name     */
-          char dbName,          /* debug name                 */
+allocMap (char rspace,          /* sfr space                   */
+          char farmap,          /* far or near segment         */
+          char paged,           /* can this segment be paged   */
+          char direct,          /* directly addressable        */
+          char bitaddr,         /* bit addressable space       */
+          char codemap,         /* this is code space          */
+          unsigned sloc,        /* starting location           */
+          const char *name,     /* 8 character name            */
+          char dbName,          /* debug name                  */
           int ptrType           /* pointer type for this space */
 )
 {
   memmap *map;
 
+  if (!name)
+    return NULL;
+
   if (!(map = Safe_alloc (sizeof (memmap))))
     {
       werror (E_OUT_OF_MEM, __FILE__, sizeof (memmap));
@@ -126,14 +130,7 @@
      DEBUG-NAME     -   'B'
      POINTER-TYPE   -   POINTER
    */
-  if (ISTACK_NAME)
-    {
-      istack = allocMap (0, 0, 0, 0, 0, 0, options.stack_loc, ISTACK_NAME, 'B', POINTER);
-    }
-  else
-    {
-      istack = NULL;
-    }
+  istack = allocMap (0, 0, 0, 0, 0, 0, options.stack_loc, ISTACK_NAME, 'B', POINTER);
 
   /* code  segment ;
      SFRSPACE       -   NO
@@ -205,14 +202,7 @@
      DEBUG-NAME     -   'E'
      POINTER-TYPE   -   POINTER
    */
-  if (IABS_NAME)
-    {
-      d_abs = allocMap (0, 0, 0, 1, 0, 0, options.data_loc, IABS_NAME, 'E', POINTER);
-    }
-  else
-    {
-      d_abs = NULL;
-    }
+  d_abs = allocMap (0, 0, 0, 1, 0, 0, options.data_loc, IABS_NAME, 'E', POINTER);
 
   /* overlay segment - same as internal storage segment ;
      SFRSPACE       -   NO
@@ -225,13 +215,7 @@
      POINTER-TYPE   -   POINTER
    */
   if (OVERLAY_NAME)
-    {
       overlay = allocMap (0, 0, 0, 1, 0, 0, options.data_loc, DATA_NAME, 'E', POINTER);
-    }
-  else
-    {
-      overlay = NULL;
-    }
 
   /* Xternal paged segment ;   
      SFRSPACE       -   NO
@@ -243,14 +227,7 @@
      DEBUG-NAME     -   'P'
      POINTER-TYPE   -   PPOINTER
    */
-  if (PDATA_NAME)
-    {
-      pdata = allocMap (0, 0, 1, 0, 0, 0, options.xstack_loc, PDATA_NAME, 'P', PPOINTER);
-    }
-  else
-    {
-      pdata = NULL;
-    }
+  pdata = allocMap (0, 0, 1, 0, 0, 0, options.xstack_loc, PDATA_NAME, 'P', PPOINTER);
 
   /* Xternal Data segment -
      SFRSPACE       -   NO
@@ -276,14 +253,7 @@
      DEBUG-NAME     -   'F'
      POINTER-TYPE   -   FPOINTER
    */
-  if (XABS_NAME)
-    {
-      x_abs = allocMap (0, 1, 0, 0, 0, 0, options.xdata_loc, XABS_NAME, 'F', FPOINTER);
-    }
-  else
-    {
-      x_abs = NULL;
-    }
+  x_abs = allocMap (0, 1, 0, 0, 0, 0, options.xdata_loc, XABS_NAME, 'F', FPOINTER);
 
   /* Indirectly addressed internal data segment
      SFRSPACE       -   NO
@@ -295,14 +265,7 @@
      DEBUG-NAME     -   'G'
      POINTER-TYPE   -   IPOINTER
    */
-  if (IDATA_NAME)
-    {
-      idata = allocMap (0, 0, 0, 0, 0, 0, options.idata_loc, IDATA_NAME, 'G', IPOINTER);
-    }
-  else
-    {
-      idata = NULL;
-    }
+  idata = allocMap (0, 0, 0, 0, 0, 0, options.idata_loc, IDATA_NAME, 'G', IPOINTER);
 
   /* Indirectly addressed absolute internal segment
      SFRSPACE       -   NO
@@ -314,14 +277,7 @@
      DEBUG-NAME     -   'E'
      POINTER-TYPE   -   IPOINTER
    */
-  if (IABS_NAME)
-    {
-      i_abs = allocMap (0, 0, 0, 0, 0, 0, options.data_loc, IABS_NAME, 'E', IPOINTER);
-    }
-  else
-    {
-      i_abs = NULL;
-    }
+  i_abs = allocMap (0, 0, 0, 0, 0, 0, options.data_loc, IABS_NAME, 'E', IPOINTER);
 
   /* Bit space ;
      SFRSPACE       -   NO
@@ -392,9 +348,32 @@
 /* allocIntoSeg - puts a symbol into a memory segment              */
 /*-----------------------------------------------------------------*/
 void
-allocIntoSeg (symbol * sym)
+allocIntoSeg (symbol *sym)
 {
-  memmap *segment = SPEC_OCLS (sym->etype);
+  memmap *segment;
+
+  if (SPEC_ADDRSPACE (sym->etype))
+    {
+      namedspacemap *nm;
+      for (nm = namedspacemaps; nm; nm = nm->next)
+        if (!strcmp (nm->name, SPEC_ADDRSPACE (sym->etype)->name))
+          break;
+
+      if (!nm)
+        {
+          nm = Safe_alloc (sizeof (namedspacemap));
+          nm->name = Safe_alloc (strlen(SPEC_ADDRSPACE (sym->etype)->name) + 1);
+          strcpy (nm->name, SPEC_ADDRSPACE (sym->etype)->name);
+          nm->map = allocMap (0, 0, 0, 1, 0, 0, options.data_loc, SPEC_ADDRSPACE (sym->etype)->name, 'E', POINTER);
+          nm->next = namedspacemaps;
+          namedspacemaps = nm;
+        }
+
+      addSet (&nm->map->syms, sym);
+
+      return;
+    }
+  segment = SPEC_OCLS (sym->etype);
   addSet (&segment->syms, sym);
   if (segment == pdata)
     sym->iaccess = 1;
@@ -406,9 +385,10 @@
 /*-----------------------------------------------------------------*/
 void deleteFromSeg(symbol *sym)
 {
-    if (SPEC_OCLS(sym->etype)) {
-        memmap *segment = SPEC_OCLS (sym->etype);
-        deleteSetItem(&segment->syms,sym);
+  if (SPEC_OCLS(sym->etype))
+    {
+      memmap *segment = SPEC_OCLS (sym->etype);
+      deleteSetItem(&segment->syms, sym);
     }
 }
 
@@ -416,7 +396,7 @@
 /* defaultOClass - set the output segment based on SCLASS          */
 /*-----------------------------------------------------------------*/
 bool
-defaultOClass (symbol * sym)
+defaultOClass (symbol *sym)
 {
   switch (SPEC_SCLS (sym->etype))
     {
@@ -504,7 +484,7 @@
     {
       allocIntoSeg (sym);
       return TRUE;
-  }
+    }
   return FALSE;
 }
 
@@ -520,9 +500,10 @@
               "%s%s", port->fun_prefix, sym->name);
 
   /* add it to the operandKey reset */
-  if (!isinSet (operKeyReset, sym)) {
-    addSet(&operKeyReset, sym);
-  }
+  if (!isinSet (operKeyReset, sym))
+    {
+      addSet(&operKeyReset, sym);
+    }
 
   /* if this is a literal e.g. enumerated type */
   /* put it in the data segment & do nothing   */
@@ -538,9 +519,9 @@
       SPEC_OCLS (sym->etype) = code;
       /* if this is an interrupt service routine
          then put it in the interrupt service array */
-      if (FUNC_ISISR (sym->type) && !options.noiv
-          && (FUNC_INTNO (sym->type) != INTNO_UNSPEC))
-            {
+      if (FUNC_ISISR (sym->type) && !options.noiv &&
+          (FUNC_INTNO (sym->type) != INTNO_UNSPEC))
+        {
           if (interrupts[FUNC_INTNO (sym->type)])
             werror (E_INT_DEFINED,
                     FUNC_INTNO (sym->type),
@@ -551,7 +532,7 @@
           /* automagically extend the maximum interrupts */
           if (FUNC_INTNO (sym->type) >= maxInterrupts)
             maxInterrupts = FUNC_INTNO (sym->type) + 1;
-            }
+        }
       /* if it is not compiler defined */
       if (!sym->cdef)
         allocIntoSeg (sym);
@@ -568,26 +549,38 @@
       return;
     }
 
-  if(!TARGET_IS_PIC16 || (TARGET_IS_PIC16 && sym->level))
-  /* register storage class ignored changed to FIXED */
-  if (SPEC_SCLS (sym->etype) == S_REGISTER)
-    SPEC_SCLS (sym->etype) = S_FIXED;
+  if (!TARGET_IS_PIC16 || sym->level)
+    /* register storage class ignored changed to FIXED */
+    if (SPEC_SCLS (sym->etype) == S_REGISTER)
+      SPEC_SCLS (sym->etype) = S_FIXED;
 
   /* if it is fixed, then allocate depending on the */
   /* current memory model, same for automatics      */
   if (SPEC_SCLS (sym->etype) == S_FIXED ||
       (TARGET_IS_PIC16 && (SPEC_SCLS (sym->etype) == S_REGISTER) && (sym->level==0)) ||
-      SPEC_SCLS (sym->etype) == S_AUTO) {
-    if (port->mem.default_globl_map != xdata) {
-      /* set the output class */
-      SPEC_OCLS (sym->etype) = port->mem.default_globl_map;
-      /* generate the symbol  */
-      allocIntoSeg (sym);
-      return;
-    } else {
-      SPEC_SCLS (sym->etype) = S_XDATA;
+      SPEC_SCLS (sym->etype) == S_AUTO)
+    {
+      if (port->mem.default_globl_map != xdata)
+        {
+          if (sym->ival && SPEC_ABSA (sym->etype))
+            {
+              /* absolute initialized global */
+              SPEC_OCLS (sym->etype) = x_abs;
+            }
+          else
+            {
+              /* set the output class */
+              SPEC_OCLS (sym->etype) = port->mem.default_globl_map;
+            }
+          /* generate the symbol  */
+          allocIntoSeg (sym);
+          return;
+        }
+      else
+        {
+          SPEC_SCLS (sym->etype) = S_XDATA;
+        }
     }
-  }
 
   allocDefault (sym);
   return;
@@ -700,7 +693,7 @@
 }
 
 /*-----------------------------------------------------------------*/
-/* deallocParms - parameters are always passed on stack                */
+/* deallocParms - parameters are always passed on stack            */
 /*-----------------------------------------------------------------*/
 void
 deallocParms (value * val)
@@ -783,26 +776,33 @@
   /* this is automatic           */
 
   /* if it's to be placed on the stack */
-  if (options.stackAuto || reentrant) {
-    sym->onStack = 1;
-    if (options.useXstack) {
-      /* PENDING: stack direction for xstack */
-      SPEC_OCLS (sym->etype) = xstack;
-      SPEC_STAK (sym->etype) = sym->stack = (xstackPtr + 1);
-      xstackPtr += getSize (sym->type);
-    } else {
-      SPEC_OCLS (sym->etype) = istack;
-      if (port->stack.direction > 0) {
-        SPEC_STAK (sym->etype) = sym->stack = (stackPtr + 1);
-        stackPtr += getSize (sym->type);
-      } else {
-        stackPtr -= getSize (sym->type);
-        SPEC_STAK (sym->etype) = sym->stack = stackPtr;
-      }
+  if (options.stackAuto || reentrant)
+    {
+      sym->onStack = 1;
+      if (options.useXstack)
+        {
+          /* PENDING: stack direction for xstack */
+          SPEC_OCLS (sym->etype) = xstack;
+          SPEC_STAK (sym->etype) = sym->stack = (xstackPtr + 1);
+          xstackPtr += getSize (sym->type);
+        }
+      else
+        {
+          SPEC_OCLS (sym->etype) = istack;
+          if (port->stack.direction > 0)
+            {
+              SPEC_STAK (sym->etype) = sym->stack = (stackPtr + 1);
+              stackPtr += getSize (sym->type);
+            }
+          else
+            {
+              stackPtr -= getSize (sym->type);
+              SPEC_STAK (sym->etype) = sym->stack = stackPtr;
+            }
+        }
+      allocIntoSeg (sym);
+      return;
     }
-    allocIntoSeg (sym);
-    return;
-  }
 
   /* else depending on the storage class specified */
 
@@ -837,12 +837,15 @@
   /* again note that we have put it into the overlay segment
      will remove and put into the 'data' segment if required after
      overlay  analysis has been done */
-  if (options.model == MODEL_SMALL) {
+  if (options.model == MODEL_SMALL)
+    {
       SPEC_OCLS (sym->etype) =
         (options.noOverlay ? port->mem.default_local_map : overlay);
-  } else {
+    }
+  else
+    {
       SPEC_OCLS (sym->etype) = port->mem.default_local_map;
-  }
+    }
   allocIntoSeg (sym);
 }
 
@@ -894,7 +897,6 @@
     }
 
   setToNull ((void *) &overlay->syms);
-
 }
 
 /*-----------------------------------------------------------------*/
@@ -916,7 +918,6 @@
 
   setToNull ((void *) &overlay->syms);
   addSet (&ovrSetSets, oset);
-
 }
 
 /*-----------------------------------------------------------------*/
@@ -933,7 +934,6 @@
   /* go thru the symbol chain   */
   for (sym = symChain; sym; sym = sym->next)
     {
-
       /* if this is a typedef then add it */
       /* to the typedef table             */
       if (IS_TYPEDEF (sym->etype))
@@ -1008,8 +1008,7 @@
      on the stack. We will eliminate those variables
      which do not have the allocReq flag thus reducing
      the stack space */
-  for (sym = setFirstItem (istack->syms); sym;
-       sym = setNextItem (istack->syms))
+  for (sym = setFirstItem (istack->syms); sym; sym = setNextItem (istack->syms))
     {
       int size = getSize (sym->type);
       /* nothing to do with parameters so continue */
@@ -1054,8 +1053,7 @@
 
   /* do the same for the external stack */
 
-  for (sym = setFirstItem (xstack->syms); sym;
-       sym = setNextItem (xstack->syms))
+  for (sym = setFirstItem (xstack->syms); sym; sym = setNextItem (xstack->syms))
     {
       int size = getSize (sym->type);
       /* nothing to do with parameters so continue */
@@ -1081,7 +1079,6 @@
       SPEC_STAK (sym->etype) = sym->stack = (xsPtr + 1);
       xsPtr += size;
     }
-
 }
 
 #define SP_BP(sp, bp) (options.omitFramePtr ? sp : bp)
@@ -1170,9 +1167,9 @@
        (IFFUNC_ISREENT (currFunc->type) ||
         FUNC_ISISR (currFunc->type))) ||
       elementsInSet (overlay->syms) == 0)
-
-    return FALSE;
-
+    {
+      return FALSE;
+    }
   /* if this is a forces overlay */
   if (IFFUNC_ISOVERLAY(currFunc->type)) return TRUE;
 
@@ -1183,12 +1180,18 @@
       iCode *ic;
 
       for (ic = ebbs[i]->sch; ic; ic = ic->next)
-          if (ic) {
-              if (ic->op == CALL) {
+          if (ic)
+            {
+              if (ic->op == CALL)
+                {
                   sym_link *ftype = operandType(IC_LEFT(ic));
                   /* builtins only can use overlays */
                   if (!IFFUNC_ISBUILTIN(ftype)) return FALSE;
-              } else if (ic->op == PCALL) return FALSE;
+                }
+              else if (ic->op == PCALL)
+                {
+                  return FALSE;
+                }
           }
     }
 
@@ -1202,9 +1205,8 @@
 void
 doOverlays (eBBlock ** ebbs, int count)
 {
-  if (!overlay) {
+  if (!overlay)
     return;
-  }
 
   /* check if the parameters and local variables
      of this function can be put in the overlay segment
@@ -1229,6 +1231,8 @@
 {
 #define BREAKLINE ";------------------------------------------------------------\n"
   int cnt = 0;
+  set *ovrset;
+  set *tempOverlaySyms;
 
   if (!func)
     return;
@@ -1247,19 +1251,16 @@
   cnt += printAllocInfoSeg (sfr, func, oBuf);
   cnt += printAllocInfoSeg (sfrbit, func, oBuf);
 
-  {
-    set *ovrset;
-    set *tempOverlaySyms = overlay->syms;
-
-    /* search the set of overlay sets for local variables/parameters */
-    for (ovrset = setFirstItem (ovrSetSets); ovrset;
-         ovrset = setNextItem (ovrSetSets))
-      {
-        overlay->syms = ovrset;
-        cnt += printAllocInfoSeg (overlay, func, oBuf);
-      }
-    overlay->syms = tempOverlaySyms;
-  }
+  tempOverlaySyms = overlay->syms;
+
+  /* search the set of overlay sets for local variables/parameters */
+  for (ovrset = setFirstItem (ovrSetSets); ovrset;
+       ovrset = setNextItem (ovrSetSets))
+    {
+      overlay->syms = ovrset;
+      cnt += printAllocInfoSeg (overlay, func, oBuf);
+    }
+  overlay->syms = tempOverlaySyms;
 
   if (cnt)
     dbuf_append_str (oBuf, BREAKLINE);
diff -Nru sdcc-3.1.0+dfsg/src/SDCCmem.h sdcc-3.2.0+dfsg/src/SDCCmem.h
--- sdcc-3.1.0+dfsg/src/SDCCmem.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCmem.h	2011-11-28 11:07:02.000000000 +0000
@@ -30,6 +30,15 @@
   }
 memmap;
 
+/* For performance we might want to use a hash map instead of the linked list */
+typedef struct namedspacemap
+  {
+    char *name;
+    memmap *map;
+    struct namedspacemap *next;
+  }
+namedspacemap;
+
 extern FILE *junkFile;
 
 /* memory map prefixes  MOF added the DATA,CODE,XDATA,BIT */
@@ -76,6 +85,8 @@
 extern memmap *eeprom;          /* eeprom space                 */
 extern memmap *home;            /* Non-banked home space        */
 
+extern namedspacemap *namedspacemaps;
+
 extern int fatalError;
 
 extern struct set *ovrSetSets;
diff -Nru sdcc-3.1.0+dfsg/src/SDCCnaddr.cc sdcc-3.2.0+dfsg/src/SDCCnaddr.cc
--- sdcc-3.1.0+dfsg/src/SDCCnaddr.cc	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCnaddr.cc	2012-01-19 13:14:56.000000000 +0000
@@ -0,0 +1,42 @@
+// Philipp Klaus Krause, philipp@informatik.uni-frankfurt.de, pkk@spth.de, 2011
+//
+// (c) 2011 Goethe-Universität Frankfurt
+//
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option) any
+// later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+//
+// Optimal placement of bank switching instructions for named address spaces.
+
+#include "SDCCnaddr.hpp"
+
+int
+switchAddressSpacesOptimally (iCode *ic, ebbIndex *ebbi)
+{
+  cfg_t control_flow_graph;
+  tree_dec_naddr_t tree_decomposition;
+  std::map<naddrspace_t, const symbol *> addrspaces;
+
+  create_cfg_naddr(control_flow_graph, ic, ebbi);
+  annotate_cfg_naddr(control_flow_graph, addrspaces);
+
+  if(options.dump_graphs)
+    dump_cfg_naddr(control_flow_graph);
+
+  thorup_tree_decomposition(tree_decomposition, control_flow_graph);
+  nicify(tree_decomposition);
+
+  return(tree_dec_address_switch(tree_decomposition, control_flow_graph, addrspaces));
+}
+
diff -Nru sdcc-3.1.0+dfsg/src/SDCCnaddr.hpp sdcc-3.2.0+dfsg/src/SDCCnaddr.hpp
--- sdcc-3.1.0+dfsg/src/SDCCnaddr.hpp	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCnaddr.hpp	2012-05-05 14:39:36.000000000 +0000
@@ -0,0 +1,510 @@
+// Philipp Klaus Krause, philipp@informatik.uni-frankfurt.de, pkk@spth.de, 2011
+//
+// (c) 2011 Goethe-Universität Frankfurt
+//
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option) any
+// later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+//
+// Optimal placement of bank switching instructions for named address spaces.
+
+#ifndef SDCCNADDR_HH
+#define SDCCNADDR_HH 1
+
+
+#include <map>
+#include <vector>
+#include <sstream>
+#include <fstream>
+
+#include <boost/graph/graphviz.hpp>
+
+#include "SDCCtree_dec.hpp"
+
+extern "C"
+{
+#include "SDCCsymt.h"
+#include "SDCCicode.h"
+#include "SDCCBBlock.h"
+#include "SDCCopt.h"
+#include "SDCCy.h"
+}
+
+#ifdef HAVE_STX_BTREE_SET_H
+#include <stx/btree_set.h>
+#endif
+
+typedef short int naddrspace_t; // Named address spaces. -1: Undefined, Others: see map.
+
+#ifdef HAVE_STX_BTREE_SET_H
+typedef stx::btree_set<naddrspace_t> naddrspaceset_t; // Faster than std::set
+#else
+typedef std::set<naddrspace_t> naddrspaceset_t;
+#endif
+
+struct assignment_naddr
+{
+  float s;
+  naddrspaceset_t local;
+  std::vector<naddrspace_t> global;
+
+  bool operator<(const assignment_naddr& a) const
+  {
+    naddrspaceset_t::const_iterator i, ai, i_end, ai_end;
+
+    i_end = local.end();
+    ai_end = a.local.end();
+
+    for (i = local.begin(), ai = a.local.begin();; ++i, ++ai)
+      {
+        if (i == i_end)
+          return(true);
+        if (ai == ai_end)
+          return(false);
+
+        if (*i < *ai)
+          return(true);
+        if (*i > *ai)
+          return(false);
+
+        if (global[*i] < a.global[*ai])
+          return(true);
+        if (global[*i] > a.global[*ai])
+          return(false);
+      }
+  }
+};
+
+bool assignments_naddr_locally_same(const assignment_naddr &a1, const assignment_naddr &a2)
+{
+  if (a1.local != a2.local)
+    return(false);
+
+  naddrspaceset_t::const_iterator i, i_end;
+  for (i = a1.local.begin(), i_end = a1.local.end(); i != i_end; ++i)
+    if (a1.global[*i] != a2.global[*i])
+      return(false);
+
+  return(true);
+}
+
+struct cfg_naddr_node
+{
+  iCode *ic;
+  naddrspaceset_t possible_naddrspaces;
+};
+
+typedef std::list<assignment_naddr> assignment_list_naddr_t;
+
+struct tree_dec_naddr_node
+{
+  std::set<unsigned int> bag;
+  assignment_list_naddr_t assignments;
+};
+
+typedef boost::adjacency_list<boost::vecS, boost::vecS, boost::bidirectionalS, cfg_naddr_node, float> cfg_t; // The edge property is the cost of subdividing he edge and inserting a bank switching instruction.
+typedef boost::adjacency_list<boost::vecS, boost::vecS, boost::bidirectionalS, tree_dec_naddr_node> tree_dec_naddr_t;
+
+// A quick-and-dirty function to get the CFG from sdcc (a simplified version of the function from SDCCralloc.hpp).
+void
+create_cfg_naddr(cfg_t &cfg, iCode *start_ic, ebbIndex *ebbi)
+{
+  iCode *ic;
+
+  std::map<int, unsigned int> key_to_index;
+  {
+    int i;
+
+    for (ic = start_ic, i = 0; ic; ic = ic->next, i++)
+      {
+        boost::add_vertex(cfg);
+        key_to_index[ic->key] = i;
+        cfg[i].ic = ic;
+      }
+  }
+
+  // Get control flow graph from sdcc.
+  for (ic = start_ic; ic; ic = ic->next)
+    {
+      if (ic->op != GOTO && ic->op != RETURN && ic->op != JUMPTABLE && ic->next)
+        boost::add_edge(key_to_index[ic->key], key_to_index[ic->next->key], 3.0f, cfg);
+
+      if (ic->op == GOTO)
+        boost::add_edge(key_to_index[ic->key], key_to_index[eBBWithEntryLabel(ebbi, ic->label)->sch->key], 6.0f, cfg);
+      else if (ic->op == RETURN)
+        boost::add_edge(key_to_index[ic->key], key_to_index[eBBWithEntryLabel(ebbi, returnLabel)->sch->key], 6.0f, cfg);
+      else if (ic->op == IFX)
+        boost::add_edge(key_to_index[ic->key], key_to_index[eBBWithEntryLabel(ebbi, IC_TRUE(ic) ? IC_TRUE(ic) : IC_FALSE(ic))->sch->key], 6.0f, cfg);
+      else if (ic->op == JUMPTABLE)
+        for (symbol *lbl = (symbol *)(setFirstItem (IC_JTLABELS (ic))); lbl; lbl = (symbol *)(setNextItem (IC_JTLABELS (ic))))
+          boost::add_edge(key_to_index[ic->key], key_to_index[eBBWithEntryLabel(ebbi, lbl)->sch->key], 6.0f, cfg);
+    }
+}
+
+// Annotate nodes of the control flow graph with the set of possible named address spaces active there.
+void annotate_cfg_naddr(cfg_t &cfg, std::map<naddrspace_t, const symbol *> &addrspaces)
+{
+  /* MSVC 2010 doesn't like the typename here, though it accepts it elsewhere */
+  typedef /*typename*/ boost::graph_traits<cfg_t>::vertex_descriptor vertex_t;
+
+  std::map<const symbol *, naddrspace_t> sym_to_index;
+  naddrspace_t na_max = -1;
+
+  std::vector<bool> predetermined(boost::num_vertices (cfg), false);
+
+  // Initialize the cfg vertices where there is information on the desired named address space.
+  for (vertex_t i = 0; i < boost::num_vertices (cfg); i++)
+    {
+      const iCode *ic = cfg[i].ic;
+      const symbol *addrspace;
+
+      // We do not know the current named address space when entering a function or after calling one.
+      if (ic->op == CALL || ic->op == PCALL || ic->op == FUNCTION)
+        predetermined[i] = true;
+      
+      // Set the required named address spaces
+      if (addrspace = getAddrspaceiCode (ic))
+        {
+          naddrspace_t na;
+
+          if (sym_to_index.find (addrspace) == sym_to_index.end ())
+            sym_to_index[addrspace] = ++na_max;
+          na = sym_to_index[addrspace];
+          addrspaces[na] = addrspace;
+
+          cfg[i].possible_naddrspaces.insert (na);
+          predetermined[i] = true;
+        }
+      else
+        cfg[i].possible_naddrspaces.insert(-1);
+    }
+
+  // Extend.
+  bool change;
+  do
+    {
+      change = false;
+      for (vertex_t i = 0; i < boost::num_vertices (cfg); i++)
+      {
+        if (predetermined[i])
+          continue;
+
+        size_t oldsize = cfg[i].possible_naddrspaces.size();
+        {
+          /* MSVC 2010 doesn't like the typename here, though it accepts it elsewhere */
+          typedef /*typename*/ boost::graph_traits<cfg_t>::out_edge_iterator n_iter_t;
+          n_iter_t n, n_end;    
+          for (boost::tie(n, n_end) = boost::out_edges(i, cfg);  n != n_end; ++n)
+            {
+              vertex_t v = boost::target(*n, cfg);
+              cfg[i].possible_naddrspaces.insert(cfg[v].possible_naddrspaces.begin(), cfg[v].possible_naddrspaces.end());
+            }
+        }
+        {
+          /* MSVC 2010 doesn't like the typename here, though it accepts it elsewhere */
+          typedef /*typename*/ boost::graph_traits<cfg_t>::in_edge_iterator n_iter_t;
+          n_iter_t n, n_end;    
+          for (boost::tie(n, n_end) = boost::in_edges(i, cfg);  n != n_end; ++n)
+            {
+              vertex_t v = boost::source(*n, cfg);
+              cfg[i].possible_naddrspaces.insert(cfg[v].possible_naddrspaces.begin(), cfg[v].possible_naddrspaces.end());
+            }
+        }
+
+        if (oldsize != cfg[i].possible_naddrspaces.size())
+          change = true;
+      }
+    }
+  while(change);
+}
+
+// Handle Leaf nodes in the nice tree decomposition
+template <class T_t, class G_t>
+void tree_dec_naddrswitch_leaf(T_t &T, typename boost::graph_traits<T_t>::vertex_descriptor t, const G_t &G)
+{
+  assignment_naddr a;
+  assignment_list_naddr_t &alist = T[t].assignments;
+
+  a.s = 0;
+  a.global.resize(boost::num_vertices(G), -2);
+  alist.push_back(a);
+}
+
+// Handle introduce nodes in the nice tree decomposition
+template <class T_t, class G_t>
+int tree_dec_naddrswitch_introduce(T_t &T, typename boost::graph_traits<T_t>::vertex_descriptor t, const G_t &G)
+{
+  typedef typename boost::graph_traits<T_t>::adjacency_iterator adjacency_iter_t;
+  adjacency_iter_t c, c_end;
+  assignment_list_naddr_t::iterator ai;
+  boost::tie(c, c_end) = adjacent_vertices(t, T);
+
+  assignment_list_naddr_t &alist2 = T[t].assignments;
+  assignment_list_naddr_t &alist = T[*c].assignments;
+
+  std::set<unsigned short> new_inst;
+  std::set_difference(T[t].bag.begin(), T[t].bag.end(), T[*c].bag.begin(), T[*c].bag.end(), std::inserter(new_inst, new_inst.end()));
+  unsigned short int i = *(new_inst.begin());
+
+  for(ai = alist.begin(); ai != alist.end(); ++ai)
+    {
+      ai->local.insert(i);
+
+      naddrspaceset_t::const_iterator ni, ni_end;
+      for(ni = G[i].possible_naddrspaces.begin(), ni_end = G[i].possible_naddrspaces.end(); ni != ni_end; ++ni)
+        {
+          ai->global[i] = *ni;
+          alist2.push_back(*ai);
+        }
+    }
+
+  alist.clear();
+
+  return((int)alist2.size() <= options.max_allocs_per_node ? 0 : -1);
+}
+
+// Handle forget nodes in the nice tree decomposition
+template <class T_t, class G_t>
+void tree_dec_naddrswitch_forget(T_t &T, typename boost::graph_traits<T_t>::vertex_descriptor t, const G_t &G)
+{
+  typedef typename boost::graph_traits<T_t>::adjacency_iterator adjacency_iter_t;
+  adjacency_iter_t c, c_end;
+  boost::tie(c, c_end) = adjacent_vertices(t, T);
+
+  assignment_list_naddr_t &alist = T[t].assignments;
+
+  std::swap(alist, T[*c].assignments);
+
+  std::set<unsigned short int> old_inst;
+  std::set_difference(T[*c].bag.begin(), T[*c].bag.end(), T[t].bag.begin(), T[t].bag.end(), std::inserter(old_inst, old_inst.end()));
+  unsigned short int i = *(old_inst.begin());
+
+  assignment_list_naddr_t::iterator ai, aif;
+
+  // Restrict assignments (locally) to current variables.
+  for (ai = alist.begin(); ai != alist.end(); ++ai)
+    {
+      ai->local.erase(i);
+      {
+        typedef typename boost::graph_traits<cfg_t>::out_edge_iterator n_iter_t;
+        n_iter_t n, n_end;    
+        for (boost::tie(n, n_end) = boost::out_edges(i, G);  n != n_end; ++n)
+          {
+            if (ai->local.find(boost::target(*n, G)) == ai->local.end() || ai->global[boost::target(*n, G)] == -1)
+              continue;
+            if (ai->global[boost::source(*n, G)] == ai->global[boost::target(*n, G)])
+              continue;
+            ai->s += G[*n];
+          }
+      }
+      {
+        typedef typename boost::graph_traits<cfg_t>::in_edge_iterator n_iter_t;
+        n_iter_t n, n_end;    
+        for (boost::tie(n, n_end) = boost::in_edges(i, G);  n != n_end; ++n)
+          {
+            if (ai->local.find(boost::source(*n, G)) == ai->local.end() || ai->global[boost::target(*n, G)] == -1)
+              continue;
+            if (ai->global[boost::source(*n, G)] == ai->global[boost::target(*n, G)])
+              continue;
+            ai->s += G[*n];
+          }
+      }
+    }
+
+  alist.sort();
+
+  // Collapse (locally) identical assignments.
+  for (ai = alist.begin(); ai != alist.end();)
+    {
+      aif = ai;
+
+      for (++ai; ai != alist.end() && assignments_naddr_locally_same(*aif, *ai);)
+        {
+          if (aif->s > ai->s)
+            {
+              alist.erase(aif);
+              aif = ai;
+              ++ai;
+            }
+          else
+            {
+              alist.erase(ai);
+              ai = aif;
+              ++ai;
+            }
+        }
+    }
+}
+
+// Handle join nodes in the nice tree decomposition
+template <class T_t, class G_t>
+void tree_dec_naddrswitch_join(T_t &T, typename boost::graph_traits<T_t>::vertex_descriptor t, const G_t &G)
+{
+  typedef typename boost::graph_traits<T_t>::adjacency_iterator adjacency_iter_t;
+  adjacency_iter_t c, c_end, c2, c3;
+  boost::tie(c, c_end) = adjacent_vertices(t, T);
+
+  c2 = c;
+  ++c;
+  c3 = c;
+
+  assignment_list_naddr_t &alist1 = T[t].assignments;
+  assignment_list_naddr_t &alist2 = T[*c2].assignments;
+  assignment_list_naddr_t &alist3 = T[*c3].assignments;
+
+  alist2.sort();
+  alist3.sort();
+
+  assignment_list_naddr_t::iterator ai2, ai3;
+  for (ai2 = alist2.begin(), ai3 = alist3.begin(); ai2 != alist2.end() && ai3 != alist3.end();)
+    {
+      if (assignments_naddr_locally_same(*ai2, *ai3))
+        {
+          ai2->s += ai3->s;
+          for (size_t i = 0; i < ai2->global.size(); i++)
+            ai2->global[i] = ((ai2->global[i] != -2) ? ai2->global[i] : ai3->global[i]);
+          alist1.push_back(*ai2);
+          ++ai2;
+          ++ai3;
+        }
+      else if (*ai2 < *ai3)
+        {
+          ++ai2;
+          continue;
+        }
+      else if (*ai3 < *ai2)
+        {
+          ++ai3;
+          continue;
+        }
+    }
+
+  alist2.clear();
+  alist3.clear();
+}
+
+template <class T_t, class G_t>
+int tree_dec_naddrswitch_nodes(T_t &T, typename boost::graph_traits<T_t>::vertex_descriptor t, const G_t &G)
+{
+  typedef typename boost::graph_traits<T_t>::adjacency_iterator adjacency_iter_t;
+
+  adjacency_iter_t c, c_end;
+  typename boost::graph_traits<T_t>::vertex_descriptor c0, c1;
+
+  boost::tie(c, c_end) = adjacent_vertices(t, T);
+
+  switch (out_degree(t, T))
+    {
+    case 0:
+      tree_dec_naddrswitch_leaf(T, t, G);
+      break;
+    case 1:
+      c0 = *c;
+      tree_dec_naddrswitch_nodes(T, c0, G);
+      if (T[c0].bag.size() < T[t].bag.size())
+        {
+        if (tree_dec_naddrswitch_introduce(T, t, G))
+          return(-1);
+        }
+      else
+        tree_dec_naddrswitch_forget(T, t, G);
+      break;
+    case 2:
+      c0 = *c++;
+      c1 = *c;
+      tree_dec_naddrswitch_nodes(T, c0, G);
+      tree_dec_naddrswitch_nodes(T, c1, G);
+      tree_dec_naddrswitch_join(T, t, G);
+      break;
+    default:
+      std::cerr << "Not nice.\n";
+      break;
+    }
+  return(0);
+}
+
+template <class G_t>
+void implement_assignment(const assignment_naddr &a, const G_t &G, const std::map<naddrspace_t, const symbol *> addrspaces)
+{
+  typedef typename boost::graph_traits<G_t>::vertex_descriptor vertex_t;
+  typedef typename boost::graph_traits<G_t>::edge_iterator ei_t;
+  ei_t e, e_end;
+
+  for(boost::tie(e, e_end) = boost::edges(G); e != e_end; ++e)
+    {
+      const vertex_t source = boost::source(*e, G);
+      const vertex_t target = boost::target(*e, G);
+      const naddrspace_t sourcespace = a.global[source];
+      const naddrspace_t targetspace = a.global[target];
+
+      // Nothing to do if the space doesn't change, or we just forget it.
+      if(targetspace == -1 || sourcespace == targetspace)
+        continue;
+
+      // This shouldn't happen with the CFGs sdcc generates and a cost function based on code size.
+      if(G[source].ic->next != G[target].ic)
+        std::cerr << "Trying to switch address space at weird edge in CFG.";
+
+      switchAddressSpaceAt(G[target].ic, addrspaces.find(targetspace)->second);
+    }
+}
+
+template <class T_t, class G_t>
+int tree_dec_address_switch(T_t &T, const G_t &G, const std::map<naddrspace_t, const symbol *> addrspaces)
+{
+  if(tree_dec_naddrswitch_nodes(T, find_root(T), G))
+    return(-1);
+
+  const assignment_naddr &winner = *(T[find_root(T)].assignments.begin());
+
+#if 0
+  std::cout << "Winner: ";
+  for(unsigned int i = 0; i < boost::num_vertices(G); i++)
+  {
+  	std::cout << "(" << i << ", " << int(winner.global[i]) << ") ";
+  }
+  std::cout << "\n";
+  std::cout << "Cost: " << winner.s << "\n";
+  std::cout.flush();
+#endif
+
+  implement_assignment(winner, G, addrspaces);
+
+  return(0);
+}
+
+// Dump cfg, with numbered nodes, show possible address spaces at each node.
+void dump_cfg_naddr(const cfg_t &cfg)
+{
+  if(!currFunc)
+    return;
+
+  std::ofstream dump_file((std::string(dstFileName) + ".dumpnaddrcfg" + currFunc->rname + ".dot").c_str());
+
+  std::string *name = new std::string[num_vertices(cfg)];
+  for (unsigned int i = 0; i < boost::num_vertices(cfg); i++)
+    {
+      std::ostringstream os;
+      os << i << ", " << cfg[i].ic->key << ": ";
+      naddrspaceset_t::const_iterator n;
+      for (n = cfg[i].possible_naddrspaces.begin(); n != cfg[i].possible_naddrspaces.end(); ++n)
+        os << *n << " ";
+      name[i] = os.str();
+    }
+  boost::write_graphviz(dump_file, cfg, boost::make_label_writer(name));
+  delete[] name;
+}
+
+#endif
+
diff -Nru sdcc-3.1.0+dfsg/src/SDCCopt.c sdcc-3.2.0+dfsg/src/SDCCopt.c
--- sdcc-3.1.0+dfsg/src/SDCCopt.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCopt.c	2012-06-18 16:14:27.000000000 +0000
@@ -73,6 +73,8 @@
       bitVectUnSetBit (OP_USES (left), ic->key);
   if (IS_SYMOP (right))
       bitVectUnSetBit (OP_USES (right), ic->key);
+  if (IS_SYMOP (IC_RESULT (ic)))
+      bitVectUnSetBit (OP_DEFS (IC_RESULT (ic)), ic->key);
 
   if (IS_FLOAT (operandType (right)))
     {
@@ -228,7 +230,7 @@
   newic = newiCode (CALL, operandFromSymbol (func), NULL);
   IC_RESULT (newic) = IC_RESULT (ic);
   bitVectUnSetBit (OP_DEFS (IC_RESULT (ic)), ic->key);
-  OP_USES (IC_RESULT (newic)) = bitVectSetBit (OP_USES (IC_RESULT (newic)), newic->key);
+  OP_DEFS (IC_RESULT (newic)) = bitVectSetBit (OP_DEFS (IC_RESULT (newic)), newic->key);
   newic->filename = filename;
   newic->lineno = lineno;
   newic->parmBytes += bytesPushed;
@@ -270,8 +272,13 @@
   ip = ic->next;
   /* remove it from the iCode */
   remiCodeFromeBBlock (ebp, ic);
+  if (IS_SYMOP (IC_RIGHT (ic)))
+      bitVectUnSetBit (OP_USES (IC_RIGHT (ic)), ic->key);
+  if (IS_SYMOP (IC_RESULT (ic)))
+      bitVectUnSetBit (OP_DEFS (IC_RESULT (ic)), ic->key);
+
   /* depending on the type */
-  for (bwd = 0; bwd < 3; bwd++)
+  for (bwd = 0; bwd < 4; bwd++)
     {
       for (su = 0; su < 2; su++)
         {
@@ -285,7 +292,7 @@
 
   if (compareType (type, fixed16x16Type) == 1)
     {
-      func = fp16x16conv[0][3][0];
+      func = fp16x16conv[0][4][0];
       goto found;
     }
 
@@ -309,6 +316,8 @@
       addiCodeToeBBlock (ebp, newic, ip);
       newic->filename = filename;
       newic->lineno = linenno;
+      if (IS_SYMOP (IC_RIGHT (ic)))
+          OP_USES (IC_RIGHT (ic)) = bitVectSetBit (OP_USES (IC_RIGHT (ic)), newic->key);
     }
   else
     {
@@ -327,6 +336,8 @@
       addiCodeToeBBlock (ebp, newic, ip);
       newic->filename = filename;
       newic->lineno = linenno;
+      if (IS_SYMOP (IC_RIGHT (ic)))
+          OP_USES (IC_RIGHT (ic)) = bitVectSetBit (OP_USES (IC_RIGHT (ic)), newic->key);
     }
 
   /* make the call */
@@ -355,6 +366,8 @@
   addiCodeToeBBlock (ebp, newic, ip);
   newic->filename = filename;
   newic->lineno = linenno;
+  if (IS_SYMOP (IC_RESULT (ic)))
+    OP_DEFS (IC_RESULT (ic)) = bitVectSetBit (OP_DEFS (IC_RESULT (ic)), newic->key);
 }
 
 /*----------------------------------------------------------------------*/
@@ -373,8 +386,13 @@
   ip = ic->next;
   /* remove it from the iCode */
   remiCodeFromeBBlock (ebp, ic);
+  if (IS_SYMOP (IC_RIGHT (ic)))
+      bitVectUnSetBit (OP_USES (IC_RIGHT (ic)), ic->key);
+  if (IS_SYMOP (IC_RESULT (ic)))
+      bitVectUnSetBit (OP_DEFS (IC_RESULT (ic)), ic->key);
+
   /* depending on the type */
-  for (bwd = 0; bwd < 3; bwd++)
+  for (bwd = 0; bwd < 4; bwd++)
     {
       for (su = 0; su < 2; su++)
         {
@@ -405,6 +423,8 @@
       addiCodeToeBBlock (ebp, newic, ip);
       newic->filename = filename;
       newic->lineno = linenno;
+      if (IS_SYMOP (IC_RIGHT (ic)))
+          OP_USES (IC_RIGHT (ic)) = bitVectSetBit (OP_USES (IC_RIGHT (ic)), newic->key);
     }
   else
     {
@@ -423,6 +443,8 @@
       addiCodeToeBBlock (ebp, newic, ip);
       newic->filename = filename;
       newic->lineno = linenno;
+      if (IS_SYMOP (IC_RIGHT (ic)))
+          OP_USES (IC_RIGHT (ic)) = bitVectSetBit (OP_USES (IC_RIGHT (ic)), newic->key);
     }
 
   /* make the call */
@@ -451,6 +473,8 @@
   addiCodeToeBBlock (ebp, newic, ip);
   newic->filename = filename;
   newic->lineno = linenno;
+  if (IS_SYMOP (IC_RESULT (ic)))
+    OP_DEFS (IC_RESULT (ic)) = bitVectSetBit (OP_DEFS (IC_RESULT (ic)), newic->key);
 }
 
 /*-----------------------------------------------------------------*/
@@ -470,9 +494,13 @@
   ip = ic->next;
   /* remove it from the iCode */
   remiCodeFromeBBlock (ebp, ic);
+  if (IS_SYMOP (IC_RIGHT (ic)))
+      bitVectUnSetBit (OP_USES (IC_RIGHT (ic)), ic->key);
+  if (IS_SYMOP (IC_RESULT (ic)))
+      bitVectUnSetBit (OP_DEFS (IC_RESULT (ic)), ic->key);
 
   /* depending on the type */
-  for (bwd = 0; bwd < 3; bwd++)
+  for (bwd = 0; bwd < 4; bwd++)
     {
       for (su = 0; su < 2; su++)
         {
@@ -503,6 +531,8 @@
       addiCodeToeBBlock (ebp, newic, ip);
       newic->filename = filename;
       newic->lineno = lineno;
+      if (IS_SYMOP (IC_RIGHT (ic)))
+          OP_USES (IC_RIGHT (ic)) = bitVectSetBit (OP_USES (IC_RIGHT (ic)), newic->key);
     }
   else
     {
@@ -521,6 +551,8 @@
       addiCodeToeBBlock (ebp, newic, ip);
       newic->filename = filename;
       newic->lineno = lineno;
+      if (IS_SYMOP (IC_RIGHT (ic)))
+          OP_USES (IC_RIGHT (ic)) = bitVectSetBit (OP_USES (IC_RIGHT (ic)), newic->key);
     }
 
   /* make the call */
@@ -549,6 +581,8 @@
   addiCodeToeBBlock (ebp, newic, ip);
   newic->filename = filename;
   newic->lineno = lineno;
+  if (IS_SYMOP (IC_RESULT (ic)))
+    OP_DEFS (IC_RESULT (ic)) = bitVectSetBit (OP_DEFS (IC_RESULT (ic)), newic->key);
 }
 
 /*--------------------------------------------------------------------------*/
@@ -568,9 +602,13 @@
   ip = ic->next;
   /* remove it from the iCode */
   remiCodeFromeBBlock (ebp, ic);
+  if (IS_SYMOP (IC_RIGHT (ic)))
+      bitVectUnSetBit (OP_USES (IC_RIGHT (ic)), ic->key);
+  if (IS_SYMOP (IC_RESULT (ic)))
+      bitVectUnSetBit (OP_DEFS (IC_RESULT (ic)), ic->key);
 
   /* depending on the type */
-  for (bwd = 0; bwd < 3; bwd++)
+  for (bwd = 0; bwd < 4; bwd++)
     {
       for (su = 0; su < 2; su++)
         {
@@ -584,7 +622,7 @@
 
   if (compareType (type, floatType) == 1)
     {
-      func = fp16x16conv[1][3][0];
+      func = fp16x16conv[1][4][0];
       goto found;
     }
 
@@ -608,6 +646,8 @@
       addiCodeToeBBlock (ebp, newic, ip);
       newic->filename = filename;
       newic->lineno = lineno;
+      if (IS_SYMOP (IC_RIGHT (ic)))
+          OP_USES (IC_RIGHT (ic)) = bitVectSetBit (OP_USES (IC_RIGHT (ic)), newic->key);
     }
   else
     {
@@ -626,6 +666,8 @@
       addiCodeToeBBlock (ebp, newic, ip);
       newic->filename = filename;
       newic->lineno = lineno;
+      if (IS_SYMOP (IC_RIGHT (ic)))
+          OP_USES (IC_RIGHT (ic)) = bitVectSetBit (OP_USES (IC_RIGHT (ic)), newic->key);
     }
 
   /* make the call */
@@ -654,6 +696,8 @@
   addiCodeToeBBlock (ebp, newic, ip);
   newic->filename = filename;
   newic->lineno = lineno;
+  if (IS_SYMOP (IC_RESULT (ic)))
+    OP_DEFS (IC_RESULT (ic)) = bitVectSetBit (OP_DEFS (IC_RESULT (ic)), newic->key);
 }
 
 extern operand *geniCodeRValue (operand *, bool);
@@ -673,11 +717,21 @@
   int bwd;
   int su;
   int bytesPushed=0;
+  operand *left;
+  operand *right;
   sym_link *leftType = operandType (IC_LEFT (ic));
   sym_link *rightType = operandType (IC_RIGHT (ic));
 
   remiCodeFromeBBlock (ebp, ic);
 
+  left = IC_LEFT (ic);
+  right = IC_RIGHT (ic);
+
+  if (IS_SYMOP (left))
+      bitVectUnSetBit (OP_USES (left), ic->key);
+  if (IS_SYMOP (right))
+      bitVectUnSetBit (OP_USES (right), ic->key);
+
   if (getSize (leftType) == 1 && getSize (rightType) == 1)
     {
       int muldivmod;
@@ -703,7 +757,7 @@
     }
 
   /* depending on the type */
-  for (bwd = 0; bwd < 3; bwd++)
+  for (bwd = 0; bwd < 4; bwd++)
     {
       for (su = 0; su < 2; su++)
         {
@@ -737,7 +791,7 @@
             }
         }
     }
-  werror (E_INVALID_OP);
+  werrorfl (filename, lineno, E_INVALID_OP, "");
   return;
 found:
   /* if int & long support routines NOT compiled as reentrant */
@@ -757,6 +811,8 @@
       addiCodeToeBBlock (ebp, newic, ip);
       newic->filename = filename;
       newic->lineno = lineno;
+      if (IS_SYMOP (left))
+          OP_USES (left) = bitVectSetBit (OP_USES (left), newic->key);
 
       /* second one */
       if (IS_REGPARM (FUNC_ARGS(func->type)->next->etype))
@@ -772,6 +828,8 @@
       addiCodeToeBBlock (ebp, newic, ip);
       newic->filename = filename;
       newic->lineno = lineno;
+      if (IS_SYMOP (right))
+          OP_USES (right) = bitVectSetBit (OP_USES (right), newic->key);
     }
   else
     {
@@ -792,6 +850,8 @@
       addiCodeToeBBlock (ebp, newic, ip);
       newic->filename = filename;
       newic->lineno = lineno;
+      if (IS_SYMOP (right))
+          OP_USES (right) = bitVectSetBit (OP_USES (right), newic->key);
 
       /* insert push left */
       if (IS_REGPARM (FUNC_ARGS(func->type)->etype))
@@ -809,11 +869,15 @@
       addiCodeToeBBlock (ebp, newic, ip);
       newic->filename = filename;
       newic->lineno = lineno;
+      if (IS_SYMOP (left))
+          OP_USES (left) = bitVectSetBit (OP_USES (left), newic->key);
     }
 
   /* for the result */
   newic = newiCode (CALL, operandFromSymbol (func), NULL);
   IC_RESULT (newic) = IC_RESULT (ic);
+  bitVectUnSetBit (OP_DEFS (IC_RESULT (ic)), ic->key);
+  OP_DEFS (IC_RESULT (newic)) = bitVectSetBit (OP_DEFS (IC_RESULT (newic)), newic->key);
   newic->filename = filename;
   newic->lineno = lineno;
   newic->parmBytes+=bytesPushed; // to clear the stack after the call
@@ -870,7 +934,7 @@
 
   /* Now we can be sure to have found a builtin function. */
 
-  if ((TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_R2K) && (!strcmp (bif->name, "__builtin_memcpy") || !strcmp (bif->name, "__builtin_memset")))
+  if ((TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_RABBIT) && (!strcmp (bif->name, "__builtin_memcpy") || !strcmp (bif->name, "__builtin_memset")))
     {
       /* Replace iff return value is used or last parameter is not an integer constant. */
       if (bitVectIsZero (OP_USES (IC_RESULT (icc))) && IS_OP_LITERAL (IC_LEFT (lastparam)))
@@ -916,31 +980,32 @@
 static void
 convsmallc (iCode *ic, eBBlock *ebp)
 {
-  iCode *icc, *icp, *ico;
+  iCode *icc, *icp, *ico = NULL;
 
   assert (ic->op == CALL || ic->op == PCALL);
 
-  for(icc = ic->prev; icc && icc->op == IPUSH; icc = icc->prev);
+  for (icc = ic->prev; icc && icc->op == IPUSH; icc = icc->prev)
+    ;
   icp = icc;
   ic = icp->next;
 
   /* Reverse parameters. */
   for (icc = ic; icc->op != CALL && icc->op != PCALL; icc = icc->next)
     {
-      if(icc->next->op != CALL && icc->next->op != PCALL)
+      if (icc->next->op != CALL && icc->next->op != PCALL)
         icc->prev = icc->next;
       else
         icc->prev = icp;
     }
-  if(icc != ic)
+  if (icc != ic)
     {
-      if(icp)
+      if (icp)
         icp->next = icc->prev;
       icc->prev = ic;
     }
-  for(; icc != icp; ico = icc, icc = icc->prev)
+  for (; icc != icp; ico = icc, icc = icc->prev)
     {
-      if(icc->op != CALL && icc->op != PCALL)
+      if (icc->op != CALL && icc->op != PCALL)
         icc->next = ico;
     }
 }
@@ -1108,7 +1173,7 @@
             case LE_OP:
             case '>':
             case GE_OP:
-              /* Only if the the right operand is literal and left operant is unsigned */
+              /* Only if the the right operand is literal and left operand is unsigned */
               if (isOperandLiteral (IC_RIGHT (ic)) && IS_UNSIGNED (operandType (IC_LEFT (ic))))
                 {
                   unsigned litVal = ulFromVal (OP_VALUE (IC_RIGHT (ic)));
@@ -1164,6 +1229,243 @@
 }
 
 /*-----------------------------------------------------------------*/
+/* separateAddressSpaces - enforce restrictions on bank switching  */
+/* Operands of a single iCode must be in at most one               */
+/* named address space. Use temporaries and additional assignments */
+/* to enforce the rule.                                            */
+/*-----------------------------------------------------------------*/
+static void
+separateAddressSpaces (eBBlock ** ebbs, int count)
+{
+  
+  int i;
+
+  /* for all blocks do */
+  for (i = 0; i < count; ++i)
+    {
+      iCode *ic;
+      symbol *source;
+
+      /* Skip this block if not reachable; other routines may have */
+      /* also skipped it, so these iCodes may be undercooked. */
+      if (ebbs[i]->noPath)
+        continue;
+
+      /* for all instructions in the block do */
+      for (ic = ebbs[i]->sch; ic; ic = ic->next)
+        {
+          iCode *iic = 0, *newic = 0;
+          operand *left, *right, *result;
+          const symbol *leftaddrspace = 0, *rightaddrspace = 0, *resultaddrspace = 0;
+
+          /* JUMPTABLE and IFX do not have left/right/result operands. */
+          /* However, they only have a single operand so they cannot   */
+          /* have more than one address space to worry about. */
+          if (ic->op == JUMPTABLE || ic->op == IFX)
+            continue;
+
+          left = IC_LEFT (ic);
+          right = IC_RIGHT (ic);
+          result = IC_RESULT (ic);
+          
+          /*printf ("Looking at ic %d, op %d\n", ic->key, (int)(ic->op));*/
+          
+          if (left && IS_SYMOP (left))
+            {
+              if (POINTER_GET (ic))
+                {
+                  assert (!(IS_DECL (OP_SYMBOL (left)->type) && DCL_PTR_ADDRSPACE (OP_SYMBOL (left)->type)));
+                  leftaddrspace = getAddrspace (OP_SYMBOL (left)->type->next);
+                }
+              else
+                leftaddrspace = getAddrspace (OP_SYMBOL (left)->type);
+            }
+          if (right && IS_SYMOP (right))
+            rightaddrspace = getAddrspace (OP_SYMBOL (right)->type);
+          if (result && IS_SYMOP (result))
+            { 
+              if (POINTER_SET (ic))
+                {
+                  assert (!(IS_DECL (OP_SYMBOL (result)->type) && DCL_PTR_ADDRSPACE (OP_SYMBOL (result)->type)));
+                  resultaddrspace = getAddrspace (OP_SYMBOL (result)->type->next);
+                }
+              else
+                resultaddrspace = getAddrspace (OP_SYMBOL (result)->type);
+            }
+            
+#if 0            
+          if (leftaddrspace)
+            printf("ic %d (dcl? %d) leftaddrspace %s\n", ic->key, (int)(IS_DECL  (OP_SYMBOL (left)->type)), leftaddrspace->name);
+          if (rightaddrspace)
+            printf("ic %d (dcl? %d) rightaddrspace %s\n", ic->key, (int)(IS_DECL  (OP_SYMBOL (right)->type)), rightaddrspace->name);
+          if (resultaddrspace)
+            printf("ic %d (dcl? %d) resultaddrspace %s\n", ic->key, (int)(IS_DECL  (OP_SYMBOL (result)->type)), resultaddrspace->name);
+#endif
+            
+          if (ic->op == IPUSH && leftaddrspace)
+            {
+              operand *newop;
+              
+              source = OP_SYMBOL (left); 
+              newic = newiCode ('=', 0, left);
+              IC_RESULT (newic) = newop = newiTempOperand (source->type, 0);          
+              IC_LEFT (ic) = newop;
+              leftaddrspace = 0;
+              for (iic = ic; iic->prev && iic->prev->op == IPUSH; iic = iic->prev);
+            }
+          else if (leftaddrspace && rightaddrspace && leftaddrspace != rightaddrspace)
+            {
+              operand *newop;
+              
+              if (rightaddrspace == resultaddrspace)
+                source = OP_SYMBOL (left);
+              else
+                source = OP_SYMBOL (right);
+              newic = newiCode ('=', 0, rightaddrspace == resultaddrspace ? left : right);
+              IC_RESULT (newic) = newop = newiTempOperand (source->type, 0);
+              if (rightaddrspace == resultaddrspace)
+                {
+                  IC_LEFT (ic) = newop;
+                  leftaddrspace = 0;
+                }
+              else
+                {
+                  IC_RIGHT (ic) = newop;
+                  rightaddrspace = 0;
+                }
+              iic = ic;
+            }
+            
+          if (newic)
+            {
+              newic->filename = ic->filename;
+              newic->lineno = ic->lineno;
+              addiCodeToeBBlock (ebbs[i], newic, iic);
+            } 
+            
+          assert (!leftaddrspace || !resultaddrspace || leftaddrspace == resultaddrspace);
+          assert (!rightaddrspace || !resultaddrspace || rightaddrspace == resultaddrspace);
+        }
+    }
+}
+
+const symbol *
+getAddrspaceiCode (const iCode *ic)
+{
+  operand *left, *right, *result;
+  const symbol *leftaddrspace = 0, *rightaddrspace = 0, *resultaddrspace = 0;
+  const symbol *addrspace;
+
+  /* Not safe to use IC_LEFT, IC_RIGHT, or IC_RESULT macros on */
+  /* IFX or JUMPTABLE iCodes. Handle these as a special case.  */
+  if (ic->op == IFX || ic->op == JUMPTABLE)
+    {
+      operand *cond;
+      if (ic->op == IFX)
+        cond = IC_COND (ic);
+      else
+        cond = IC_JTCOND (ic);
+      if (IS_SYMOP (cond))
+        return getAddrspace (OP_SYMBOL (cond)->type);
+      else
+        return NULL;
+    }
+
+  left = IC_LEFT (ic);
+  right = IC_RIGHT (ic);
+  result = IC_RESULT (ic);
+
+  /* Previous transformations in separateAddressSpaces() should
+     ensure that at most one addressspace occours in each iCode. */
+  if (left && IS_SYMOP (left))
+    { 
+      if (POINTER_GET (ic))
+        {
+          assert (!(IS_DECL (OP_SYMBOL (left)->type) && DCL_PTR_ADDRSPACE (OP_SYMBOL (left)->type)));
+          leftaddrspace = getAddrspace (OP_SYMBOL (left)->type->next);
+        }
+      else
+        leftaddrspace = getAddrspace (OP_SYMBOL (left)->type);
+    }
+  if (right && IS_SYMOP (right))
+    rightaddrspace = getAddrspace (OP_SYMBOL (right)->type);
+  if (result && IS_SYMOP (result))
+    { 
+      if (POINTER_SET (ic))
+        {
+          assert (!(IS_DECL (OP_SYMBOL (result)->type) && DCL_PTR_ADDRSPACE (OP_SYMBOL (result)->type)));
+          resultaddrspace = getAddrspace (OP_SYMBOL (result)->type->next);
+        }
+      else
+        resultaddrspace = getAddrspace (OP_SYMBOL (result)->type);
+    }
+           
+  addrspace = leftaddrspace;
+  if (rightaddrspace)
+    {
+      wassertl (!addrspace || addrspace == rightaddrspace, "Multiple named address spaces in icode.");
+      addrspace = rightaddrspace;
+    }
+  if (resultaddrspace)
+    {
+      wassertl (!addrspace || addrspace == resultaddrspace, "Multiple named address spaces in icode.");
+      addrspace = resultaddrspace;
+    }
+
+  return (addrspace);
+}
+
+/*-----------------------------------------------------------------*/
+/* switchAddressSpaceAt - insert a bank selection instruction      */
+/*-----------------------------------------------------------------*/
+void
+switchAddressSpaceAt (iCode *ic, const symbol *const addrspace)
+{
+  iCode *newic;
+  const symbol *const laddrspace = getAddrspaceiCode (ic);
+  wassertl(!laddrspace || laddrspace == addrspace, "Switching to invalid address space.");
+
+  newic = newiCode (CALL, operandFromSymbol (addrspace->addressmod[0]), 0);
+
+  IC_RESULT (newic) = newiTempOperand (newVoidLink (), 1);
+  newic->filename = ic->filename;
+  newic->lineno = ic->lineno;
+
+  newic->next = ic;
+  newic->prev = ic->prev;
+  if (ic->prev)
+    ic->prev->next = newic;
+  ic->prev = newic;
+}
+
+/*-----------------------------------------------------------------*/
+/* switchAddressSpaces - insert instructions for bank switching    */
+/* This is just a fallback, in case the optimal approach fails -   */
+/* improbable, but possible depending on sdcc options and code.    */
+/*-----------------------------------------------------------------*/
+static void
+switchAddressSpaces (iCode *ic)
+{
+  const symbol *oldaddrspace = 0;
+
+  for (; ic; ic = ic->next)
+    {
+      const symbol *const addrspace = getAddrspaceiCode (ic);
+ 
+      if (addrspace && addrspace != oldaddrspace)
+        { 
+          switchAddressSpaceAt (ic, addrspace);
+          
+          oldaddrspace = addrspace;
+        }
+        
+      /* Address space might not be preserved over these. */
+      if (ic->op == LABEL || ic->op == CALL || ic->op == PCALL)
+        oldaddrspace = 0;
+    }
+}
+
+/*-----------------------------------------------------------------*/
 /* isLocalWithoutDef - return 1 if sym might be used without a     */
 /*                     defining iCode                              */
 /*-----------------------------------------------------------------*/
@@ -1207,6 +1509,9 @@
   for (i = 0; i < count; i++)
     {
       iCode *ic;
+      
+      if (ebbs[i]->noPath)
+        continue;
 
       for (ic = ebbs[i]->sch; ic; ic = ic->next)
         {
@@ -1428,6 +1733,10 @@
               if (IC_RESULT (ic) && POINTER_SET (ic))
                 continue;
 
+              /* if the results address has been taken then skip */
+              if (IS_SYMOP (IC_RESULT (ic)) && OP_SYMBOL (IC_RESULT (ic))->addrtaken)
+                continue;
+
               if (POINTER_GET (ic) && IS_VOLATILE (operandType (IC_LEFT (ic))->next)
                   && !SPIL_LOC (IC_RESULT (ic)))
                 continue;
@@ -1639,6 +1948,7 @@
   sym_link * type2;
   sym_link * type3;
   symbol * sym;
+  int size1, size2, size3;
 
   for (i = 0; i < count; i++)
     {
@@ -1653,7 +1963,12 @@
               /* integer type that has no loss of bits */
               if (!IS_INTEGRAL (type1) || !IS_INTEGRAL (type2))
                 continue;
-              if (getSize (type2) < getSize (type1))
+              size1 = bitsForType (type1);
+              size2 = bitsForType (type2);
+              if (size2 < size1)
+                continue;
+              /* If they are the same size, they must have the same signedness */
+              if (size2 == size1 && SPEC_USIGN (type2) != SPEC_USIGN (type1))
                 continue;
 
               /* There must be only one use of this first result */
@@ -1671,8 +1986,12 @@
               type3 = operandType (IC_RESULT (uic));
               if (!IS_INTEGRAL (type3))
                  continue;
-              if (getSize (type3) < getSize (type2))
+              size3 = bitsForType (type3);
+              if (size3 < size2)
                  continue;
+              /* If they are the same size, they must have the same signedness */
+              if (size3 == size2 && SPEC_USIGN (type3) != SPEC_USIGN (type2))
+                continue;
 
               /* The signedness between the first and last types */
               /* must match */
@@ -1695,6 +2014,55 @@
     }
 }
 
+/* Fold pointer addition into offset of GET_VALUE_AT_ADDRESS.                  */
+/* The hc08-related ports do a similar thing in hc08/ralloc.c, packPointerOp() */
+static void
+offsetFold (eBBlock **ebbs, int count)
+{
+  int i;
+  iCode *ic;
+  iCode *uic;
+
+  if (!TARGET_IS_Z80 && !TARGET_IS_Z180 && !TARGET_IS_RABBIT)
+    return;
+
+  for (i = 0; i < count; i++)
+    {
+      for (ic = ebbs[i]->sch; ic; ic = ic->next)
+        {
+          if ((ic->op == '+' || ic->op == '-') && IC_RESULT (ic) && IS_ITEMP (IC_RESULT (ic)))
+            {
+              if (!IS_OP_LITERAL (IC_RIGHT (ic)))
+                continue;
+
+              /* There must be only one use of the result */
+              if (bitVectnBitsOn (OP_USES (IC_RESULT (ic))) != 1)
+                continue;
+
+              /* This use must be a GET_VALUE_ATA_DDRESS */
+              uic = hTabItemWithKey (iCodehTab,
+                        bitVectFirstBit (OP_USES (IC_RESULT (ic))));
+              if (!POINTER_GET (uic))
+                continue;
+
+              /* Historically GET_VALUE_AT_ADDRESS didn't have a right operand */
+              wassertl (IC_RIGHT (uic), "GET_VALUE_AT_ADDRESS without right operand");
+              wassertl (IS_OP_LITERAL (IC_RIGHT (uic)), "GET_VALUE_AT_ADDRESS with non-literal right operand");
+
+              if (ic->op == '+')
+                IC_RIGHT (uic) = operandFromLit (operandLitValue (IC_RIGHT (uic)) + operandLitValue (IC_RIGHT (ic)));
+              else
+                IC_RIGHT (uic) = operandFromLit (operandLitValue (IC_RIGHT (uic)) - operandLitValue (IC_RIGHT (ic)));
+
+              ic->op = '=';
+              IC_RIGHT (ic) = IC_LEFT (ic);
+              IC_LEFT (ic) = 0;
+              SET_ISADDR (IC_RESULT (ic), 0);
+            }
+        }
+    }
+}
+
 /*-----------------------------------------------------------------*/
 /* eBBlockFromiCode - creates extended basic blocks from iCode     */
 /*                    will return an array of eBBlock pointers     */
@@ -1721,7 +2089,6 @@
 
   /* break it down into basic blocks */
   ebbi = iCodeBreakDown (ic);
-
   /* hash the iCode keys so that we can quickly index */
   /* them in the rest of the optimization steps */
   setToNull ((void *) &iCodehTab);
@@ -1730,7 +2097,7 @@
 
   /* compute the control flow */
   computeControlFlow (ebbi);
-
+ 
   /* dumpraw if asked for */
   if (options.dump_raw)
     dumpEbbsToFileExt (DUMP_RAW0, ebbi);
@@ -1781,6 +2148,8 @@
       // compute the dataflow only
       assert(cseAllBlocks (ebbi, TRUE)==0);
     }
+
+
   /* kill dead code */
   kchange = killDeadCode (ebbi);
 
@@ -1816,9 +2185,29 @@
         dumpEbbsToFileExt (DUMP_LOOPD, ebbi);
     }
 
+  offsetFold (ebbi->bbOrder, ebbi->count);
+
   /* sort it back by block number */
   //qsort (ebbs, saveCount, sizeof (eBBlock *), bbNumCompare);
 
+  /* enforce restrictions on acesses to named address spaces */
+  separateAddressSpaces (ebbi->bbOrder, ebbi->count);
+
+  /* insert bank switching instructions. Do it here, before the
+     other support routines, since we can assume that there is no
+     bank switching happening in those other support routines
+     (but assume that it can happen in other functions) */
+  adjustIChain(ebbi->bbOrder, ebbi->count);
+  ic = iCodeLabelOptimize (iCodeFromeBBlock (ebbi->bbOrder, ebbi->count));
+  if(switchAddressSpacesOptimally (ic, ebbi))
+    switchAddressSpaces (ic); /* Fallback. Very unlikely to be triggered, unless --max-allocs-per-node is set to very small values or very weird control-flow graphs */
+
+  /* Break down again and redo some steps to not confuse live range analysis. */
+  ebbi = iCodeBreakDown (ic);
+  computeControlFlow (ebbi);
+  loops = createLoopRegions (ebbi);
+  computeDataFlow (ebbi);
+
   if (!options.lessPedantic)
     {
       // this is a good place to check missing return values
diff -Nru sdcc-3.1.0+dfsg/src/SDCCopt.h sdcc-3.2.0+dfsg/src/SDCCopt.h
--- sdcc-3.1.0+dfsg/src/SDCCopt.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCopt.h	2012-01-19 13:14:56.000000000 +0000
@@ -33,5 +33,8 @@
 void printEbbs (eBBlock **);
 iCode *iCodeLabelOptimize (iCode *);
 eBBlock *iCode2eBBlock (iCode * ic);
+int switchAddressSpacesOptimally (iCode *ic, ebbIndex *ebbi);
+const symbol *getAddrspaceiCode (const iCode *ic);
+void switchAddressSpaceAt (iCode *ic, const symbol *const addrspace);
 
 #endif
diff -Nru sdcc-3.1.0+dfsg/src/SDCCpeeph.c sdcc-3.2.0+dfsg/src/SDCCpeeph.c
--- sdcc-3.1.0+dfsg/src/SDCCpeeph.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCpeeph.c	2012-05-21 04:40:48.000000000 +0000
@@ -2,25 +2,21 @@
   SDCCpeeph.c - The peep hole optimizer: for interpreting the
                 peep hole rules
 
-             Written By -  Sandeep Dutta . sandeep.dutta@usa.net (1999)
+  Copyright (C) 1999, Sandeep Dutta . sandeep.dutta@usa.net
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   In other words, you are welcome to use, share and improve this program.
-   You are forbidden to forbid anyone else to use, share and improve
-   what you give them.   Help stamp out software-hoarding!
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 -------------------------------------------------------------------------*/
 
 #include "common.h"
@@ -312,7 +308,7 @@
     ;
 
   retInst = "ret";
-  if (TARGET_IS_HC08)
+  if (TARGET_HC08_LIKE)
     retInst = "rts";
   if (strcmp(p, retInst) == 0)
     return TRUE;
@@ -367,8 +363,11 @@
 
   if (TARGET_MCS51_LIKE)
     jpInst = "ljmp";
-  if (TARGET_IS_HC08)
-    jpInst = "jmp";
+  if (TARGET_HC08_LIKE)
+    {
+      jpInst = "jmp";
+      jpInst2 = "bra";
+    }
   if (TARGET_Z80_LIKE)
     {
       jpInst = "jp";
@@ -907,6 +906,19 @@
       if (op[0] == '@')
         return operandBaseName(op+1);
     }
+  if (TARGET_Z80_LIKE)
+    {
+      if (!strcmp (op, "d") || !strcmp (op, "e") || !strcmp (op, "(de)"))
+        return "de";
+      if (!strcmp (op, "b") || !strcmp (op, "c") || !strcmp (op, "(bc)"))
+        return "bc";
+      if (!strcmp (op, "h") || !strcmp (op, "l") || !strcmp (op, "(hl)") || !strcmp (op, "(hl+)")  || !strcmp (op, "(hl-)"))
+        return "hl";
+      if (!strcmp (op, "iyh") || !strcmp (op, "iyl") || strstr (op, "iy"))
+        return "iy";
+      if (!strcmp (op, "ixh") || !strcmp (op, "ixl") || strstr (op, "ix"))
+        return "ix";
+    }
 
   return op;
 }
@@ -917,6 +929,8 @@
 FBYNAME (notUsed)
 {
   const char *what;
+  bool ret;
+
   set *operands = setFromConditionArgs (cmdLine, vars);
 
   if (!operands || elementsInSet(operands) != 1)
@@ -929,11 +943,17 @@
 
   what = setFirstItem (operands);
 
-  if (port->peep.notUsed)
-    return port->peep.notUsed (what, endPl, head);
+  if (!port->peep.notUsed)
+    {
+      fprintf (stderr, "Function notUsed not initialized in port structure\n");
+      return FALSE;
+    }
 
-  fprintf (stderr, "Function notUsed not initialized in port structure\n");
-  return FALSE;
+  ret = port->peep.notUsed (what, endPl, head);
+
+  deleteSet(&operands);
+
+  return (ret);
 }
 
 /*-----------------------------------------------------------------*/
@@ -1103,7 +1123,7 @@
 
   for (op = setFirstItem (operands); op; op = setNextItem (operands))
     {
-      if (!isdigit(*op))
+      if (!isdigit( (unsigned char)(*op) ))
         {
           deleteSet (&operands);
           return FALSE;
@@ -1285,45 +1305,6 @@
 }
 
 /*-----------------------------------------------------------------*/
-/* printLine - prints a line chain into a given file               */
-/*-----------------------------------------------------------------*/
-void
-printLine (lineNode * head, struct dbuf_s * oBuf)
-{
-  iCode *last_ic = NULL;
-  bool debug_iCode_tracking = (getenv("DEBUG_ICODE_TRACKING")!=NULL);
-
-  while (head)
-    {
-      if (head->ic!=last_ic)
-        {
-          last_ic = head->ic;
-          if (debug_iCode_tracking)
-            {
-              if (head->ic)
-                dbuf_printf (oBuf, "; block = %d, seq = %d\n",
-                         head->ic->block, head->ic->seq);
-              else
-                dbuf_append_str (oBuf, "; iCode lost\n");
-            }
-        }
-
-      /* don't indent comments & labels */
-      if (head->line &&
-          (head->isComment || head->isLabel)) {
-        dbuf_printf (oBuf, "%s\n", head->line);
-      } else {
-        if (head->isInline && *head->line=='#') {
-          // comment out preprocessor directives in inline asm
-          dbuf_append_char (oBuf, ';');
-        }
-        dbuf_printf (oBuf, "\t%s\n", head->line);
-      }
-      head = head->next;
-    }
-}
-
-/*-----------------------------------------------------------------*/
 /* newPeepRule - creates a new peeprule and attach it to the root  */
 /*-----------------------------------------------------------------*/
 static peepRule *
@@ -1359,38 +1340,6 @@
   return pr;
 }
 
-/*-----------------------------------------------------------------*/
-/* newLineNode - creates a new peep line                           */
-/*-----------------------------------------------------------------*/
-lineNode *
-newLineNode (const char *line)
-{
-  lineNode *pl;
-
-  pl = Safe_alloc ( sizeof (lineNode));
-  pl->line = Safe_strdup (line);
-  pl->ic = NULL;
-  return pl;
-}
-
-/*-----------------------------------------------------------------*/
-/* connectLine - connects two lines                                */
-/*-----------------------------------------------------------------*/
-lineNode *
-connectLine (lineNode * pl1, lineNode * pl2)
-{
-  if (!pl1 || !pl2)
-    {
-      fprintf (stderr, "trying to connect null line\n");
-      return NULL;
-    }
-
-  pl2->prev = pl1;
-  pl1->next = pl2;
-
-  return pl2;
-}
-
 #define SKIP_SPACE(x,y) { while (*x && (ISCHARSPACE(*x) || *x == '\n')) x++; \
                          if (!*x) { fprintf(stderr,y); return ; } }
 
diff -Nru sdcc-3.1.0+dfsg/src/SDCCpeeph.h sdcc-3.2.0+dfsg/src/SDCCpeeph.h
--- sdcc-3.1.0+dfsg/src/SDCCpeeph.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCpeeph.h	2012-03-30 20:01:27.000000000 +0000
@@ -2,49 +2,29 @@
   SDCCpeeph.h - Header file for The peep hole optimizer: for interpreting 
                 the peep hole rules
 
-             Written By -  Sandeep Dutta . sandeep.dutta@usa.net (1999)
+  Copyright (C) 1999, Sandeep Dutta . sandeep.dutta@usa.net
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
    
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
    
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-   
-   In other words, you are welcome to use, share and improve this program.
-   You are forbidden to forbid anyone else to use, share and improve
-   what you give them.   Help stamp out software-hoarding!  
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 -------------------------------------------------------------------------*/
 
 #ifndef  SDCCPEEPH_H
 #define SDCCPEEPH_H 1
 
-#define MAX_PATTERN_LEN 256
-
-struct asmLineNode;	/* defined in each port */
-struct lineNode;
+#include "SDCCgen.h"
 
-typedef struct lineNode
-  {
-    char *line;
-    iCode *ic;
-    unsigned int isInline:1;
-    unsigned int isComment:1;
-    unsigned int isDebug:1;
-    unsigned int isLabel:1;
-    unsigned int visited:1;
-    struct asmLineNode *aln;
-    struct lineNode *prev;
-    struct lineNode *next;
-  }
-lineNode;
+#define MAX_PATTERN_LEN 256
 
 typedef struct peepRule
   {
@@ -74,9 +54,6 @@
 extern hTab *labelHash;
 labelHashEntry *getLabelRef (const char *label, lineNode *head);
 
-void printLine (lineNode *, struct dbuf_s *);
-lineNode *newLineNode (const char *);
-lineNode *connectLine (lineNode *, lineNode *);
 void initPeepHole (void);
 void peepHole (lineNode **);
 
diff -Nru sdcc-3.1.0+dfsg/src/SDCCralloc.hpp sdcc-3.2.0+dfsg/src/SDCCralloc.hpp
--- sdcc-3.1.0+dfsg/src/SDCCralloc.hpp	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCralloc.hpp	2012-06-22 11:17:10.000000000 +0000
@@ -1,6 +1,6 @@
 // Philipp Klaus Krause, philipp@informatik.uni-frankfurt.de, pkk@spth.de, 2010 - 2011
 //
-// (c) 2010-2011 Goethe-Universität Frankfurt
+// (c) 2010-2012 Goethe-Universität Frankfurt
 //
 // This program is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the
@@ -46,22 +46,9 @@
 #include <boost/graph/adjacency_matrix.hpp>
 #include <boost/graph/connected_components.hpp>
 
+#include "common.h"
 #include "SDCCtree_dec.hpp"
 
-extern "C"
-{
-#include "SDCCsymt.h"
-#include "SDCCicode.h"
-#include "SDCCBBlock.h"
-
-#include "z80.h"
-#include "ralloc.h"
-
-iCode *ifxForOp (operand *op, const iCode *ic); // Todo: Move this port-dependency somewhere else!
-
-bool assignment_optimal;
-}
-
 #ifdef HAVE_STX_BTREE_SET_H
 #include <stx/btree_set.h>
 #endif
@@ -72,8 +59,14 @@
 typedef short int var_t;
 typedef signed char reg_t;
 
-// Todo: Move this port-dependency somewehere else?
-#define NUM_REGS ((TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_RABBIT) ? (4 + (OPTRALLOC_A ? 1 : 0) + (OPTRALLOC_HL ? 2 : 0) + (OPTRALLOC_IY ? 2 : 0)) : (TARGET_IS_GBZ80 ? 3 : 0))
+#ifndef THIS_IS_THE_Z80_PORT_OR_WHATEVER
+// Todo: Move this port-dependency somewehere else? Don't forget to adjust A_IDX in z80/ralloc.c when changing this for a z80-related port!
+#define NUM_REGS ((TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_RABBIT) ? 9 : (TARGET_IS_GBZ80 ? 5 : ((TARGET_IS_HC08 || TARGET_IS_S08) ? 3 : 0)))
+#else
+bool iy_reserved(void);
+#define NUM_REGS ((TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_RABBIT) ? (iy_reserved() ? 7 : 9) : (TARGET_IS_GBZ80 ? 5 : ((TARGET_IS_HC08 || TARGET_IS_S08) ? 3 : 0)))
+#endif
+
 // Upper bound on NUM_REGS
 #define MAX_NUM_REGS 9
 
@@ -201,8 +194,21 @@
   operand_map_t operands;
   std::set<var_t> alive;
   std::set<var_t> dying;
+
+#ifdef DEBUG_SEGV
+  cfg_node(void);
+#endif
 };
 
+#ifdef DEBUG_SEGV
+// This only exists to track down #3506333 and #3475617.
+bool default_constructor_of_cfg_node_called;
+cfg_node::cfg_node(void)
+{
+  default_constructor_of_cfg_node_called = true;
+}
+#endif
+
 struct con_node
 {
   int v;
@@ -219,19 +225,26 @@
 
 // Cost function. Port-specific.
 template <class G_t, class I_t>
-float instruction_cost(const assignment &a, unsigned short int i, const G_t &G, const I_t &I);
+static float instruction_cost(const assignment &a, unsigned short int i, const G_t &G, const I_t &I);
 
 // For early removel of assignments that cannot be extended to valid assignments. Port-specific.
 template <class G_t, class I_t>
-bool assignment_hopeless(const assignment &a, unsigned short int i, const G_t &G, const I_t &I, const var_t lastvar);
+static bool assignment_hopeless(const assignment &a, unsigned short int i, const G_t &G, const I_t &I, const var_t lastvar);
 
 // Rough cost estimate. Port-specific.
 template <class G_t, class I_t>
-float rough_cost_estimate(const assignment &a, unsigned short int i, const G_t &G, const I_t &I);
+static float rough_cost_estimate(const assignment &a, unsigned short int i, const G_t &G, const I_t &I);
 
 // Avoid overwriting operands that are still needed by the result. Port-specific.
-template <class I_t> void
-add_operand_conflicts_in_node(const cfg_node &n, I_t &I);
+template <class I_t>
+static void add_operand_conflicts_in_node(const cfg_node &n, I_t &I);
+
+// Port-specific
+template <class T_t>
+static void get_best_local_assignment_biased(assignment &a, typename boost::graph_traits<T_t>::vertex_descriptor t, const T_t &T);
+
+// Code for anotehr ic is generated when generating this one. Mark the other as generated. Port-specific.
+static void extra_ic_generated(const iCode *ic);
 
 inline void
 add_operand_to_cfg_node(cfg_node &n, operand *o, std::map<std::pair<int, reg_t>, var_t> &sym_to_index)
@@ -261,9 +274,18 @@
   {
     int i;
     var_t j;
+    wassertl (!boost::num_vertices(cfg), "CFG non-empty before creation.");
     for (ic = start_ic, i = 0, j = 0; ic; ic = ic->next, i++)
       {
+#ifdef DEBUG_SEGV
+        default_constructor_of_cfg_node_called = false;
+#endif
         boost::add_vertex(cfg);
+
+#ifdef DEBUG_SEGV
+        wassertl (default_constructor_of_cfg_node_called, "add_vertex failed to call default constructor of cfg_node!");
+#endif
+        wassertl (cfg[i].alive.empty(), "Alive set non-empty upon creation.");
         key_to_index[ic->key] = i;
 
         if(ic->op == SEND && ic->builtinSEND) // Ensure that only the very first send iCode is active.
@@ -273,12 +295,7 @@
             getBuiltinParms(ic, &nbi_parms, bi_parms);
           }
 
-        if(ic->op == '>' || ic->op == '<' || ic->op == EQ_OP || ic->op == '^' || ic->op == '|' || ic->op == BITWISEAND)
-          {
-            iCode *ifx;
-            if (ifx = ifxForOp (IC_RESULT (ic), ic))
-              ifx->generated = 1;
-          }
+        extra_ic_generated(ic);
 
         cfg[i].ic = ic;
 
@@ -316,18 +333,35 @@
   // Get control flow graph from sdcc.
   for (ic = start_ic; ic; ic = ic->next)
     {
+      wassertl (key_to_index[ic->key] < boost::num_vertices(cfg), "Node not in CFG.");
+
       if (ic->op != GOTO && ic->op != RETURN && ic->op != JUMPTABLE && ic->next)
-        boost::add_edge(key_to_index[ic->key], key_to_index[ic->next->key], cfg);
+        {
+          wassertl (key_to_index[ic->next->key] < boost::num_vertices(cfg), "Next node not in CFG.");
+          boost::add_edge(key_to_index[ic->key], key_to_index[ic->next->key], cfg);
+        }
 
       if (ic->op == GOTO)
-        boost::add_edge(key_to_index[ic->key], key_to_index[eBBWithEntryLabel(ebbi, ic->label)->sch->key], cfg);
+        {
+          wassertl (key_to_index[eBBWithEntryLabel(ebbi, ic->label)->sch->key] < boost::num_vertices(cfg), "GOTO target not in CFG.");
+          boost::add_edge(key_to_index[ic->key], key_to_index[eBBWithEntryLabel(ebbi, ic->label)->sch->key], cfg);
+        }
       else if (ic->op == RETURN)
-        boost::add_edge(key_to_index[ic->key], key_to_index[eBBWithEntryLabel(ebbi, returnLabel)->sch->key], cfg);
+        {
+          wassertl (key_to_index[eBBWithEntryLabel(ebbi, returnLabel)->sch->key] < boost::num_vertices(cfg), "RETURN target not in CFG.");
+          boost::add_edge(key_to_index[ic->key], key_to_index[eBBWithEntryLabel(ebbi, returnLabel)->sch->key], cfg);
+        }
       else if (ic->op == IFX)
-        boost::add_edge(key_to_index[ic->key], key_to_index[eBBWithEntryLabel(ebbi, IC_TRUE(ic) ? IC_TRUE(ic) : IC_FALSE(ic))->sch->key], cfg);
+        {
+          wassertl (key_to_index[eBBWithEntryLabel(ebbi, IC_TRUE(ic) ? IC_TRUE(ic) : IC_FALSE(ic))->sch->key] < boost::num_vertices(cfg), "IFX target not in CFG.");
+          boost::add_edge(key_to_index[ic->key], key_to_index[eBBWithEntryLabel(ebbi, IC_TRUE(ic) ? IC_TRUE(ic) : IC_FALSE(ic))->sch->key], cfg);
+        }
       else if (ic->op == JUMPTABLE)
         for (symbol *lbl = (symbol *)(setFirstItem (IC_JTLABELS (ic))); lbl; lbl = (symbol *)(setNextItem (IC_JTLABELS (ic))))
-          boost::add_edge(key_to_index[ic->key], key_to_index[eBBWithEntryLabel(ebbi, lbl)->sch->key], cfg);
+          {
+            wassertl (key_to_index[eBBWithEntryLabel(ebbi, lbl)->sch->key] < boost::num_vertices(cfg), "GOTO target not in CFG.");
+            boost::add_edge(key_to_index[ic->key], key_to_index[eBBWithEntryLabel(ebbi, lbl)->sch->key], cfg);
+          }
 
       for (int i = 0; i <= operandKey; i++)
         {
@@ -338,14 +372,26 @@
             {
               symbol *isym = (symbol *)(hTabItemWithKey(liveRanges, i));
               for (reg_t k = 0; k < isym->nRegs; k++)
-                cfg[key_to_index[ic->key]].alive.insert(sym_to_index[std::pair<int, int>(i, k)]);
+                {
+                  wassert (key_to_index.find(ic->key) != key_to_index.end());
+                  wassert (sym_to_index.find(std::pair<int, int>(i, k)) != sym_to_index.end());
+                  wassertl (key_to_index[ic->key] < boost::num_vertices(cfg), "Node not in CFG.");
+                  cfg[key_to_index[ic->key]].alive.insert(sym_to_index[std::pair<int, int>(i, k)]);
+                }
             }
         }
 
-      add_operand_to_cfg_node(cfg[key_to_index[ic->key]], IC_RESULT(ic), sym_to_index);
-      add_operand_to_cfg_node(cfg[key_to_index[ic->key]], IC_LEFT(ic), sym_to_index);
-      add_operand_to_cfg_node(cfg[key_to_index[ic->key]], IC_RIGHT(ic), sym_to_index);
-      
+      if (ic->op == IFX)
+        add_operand_to_cfg_node(cfg[key_to_index[ic->key]], IC_COND(ic), sym_to_index);
+      else if (ic->op == JUMPTABLE)
+        add_operand_to_cfg_node(cfg[key_to_index[ic->key]], IC_JTCOND(ic), sym_to_index);
+      else
+        {
+          add_operand_to_cfg_node(cfg[key_to_index[ic->key]], IC_RESULT(ic), sym_to_index);
+          add_operand_to_cfg_node(cfg[key_to_index[ic->key]], IC_LEFT(ic), sym_to_index);
+          add_operand_to_cfg_node(cfg[key_to_index[ic->key]], IC_RIGHT(ic), sym_to_index);
+        }
+
       add_operand_conflicts_in_node(cfg[key_to_index[ic->key]], con);
     }
 
@@ -434,7 +480,7 @@
           // Conflict between operands are handled by add_operand_conflicts_in_node().
           if (cfg[i].dying.find (*v) != cfg[i].dying.end())
             continue;
-          if (IC_RESULT(ic) && IS_SYMOP(IC_RESULT(ic)))
+          if (ic->op != IFX && ic->op != JUMPTABLE && IC_RESULT(ic) && IS_SYMOP(IC_RESULT(ic)))
             {
               operand_map_t::const_iterator oi, oi_end; 
               for(boost::tie(oi, oi_end) = cfg[i].operands.equal_range(OP_SYMBOL_CONST(IC_RESULT(ic))->key); oi != oi_end; ++oi)
@@ -516,7 +562,7 @@
 }
 
 template <class G_t, class I_t>
-void assignments_introduce_variable(assignment_list_t &alist, unsigned short int i, short int v, const G_t &G, const I_t &I)
+static void assignments_introduce_variable(assignment_list_t &alist, unsigned short int i, short int v, const G_t &G, const I_t &I)
 {
   assignment_list_t::iterator ai;
   bool a_initialized;
@@ -592,7 +638,7 @@
 // Ensure that we never get more than options.max_allocs_per_node assignments at a single node of the tree decomposition.
 // Tries to drop the worst ones first (but never drop the empty assignment, as it's the only one guaranteed to be always valid).
 template <class G_t, class I_t>
-void drop_worst_assignments(assignment_list_t &alist, unsigned short int i, const G_t &G, const I_t &I, const assignment& ac)
+static void drop_worst_assignments(assignment_list_t &alist, unsigned short int i, const G_t &G, const I_t &I, const assignment& ac, bool *const assignment_optimal)
 {
   unsigned int n;
   size_t alist_size;
@@ -601,7 +647,7 @@
   if ((alist_size = alist.size()) * NUM_REGS <= static_cast<size_t>(options.max_allocs_per_node) || alist_size <= 1)
     return;
 
-  assignment_optimal = false;
+  *assignment_optimal = false;
 
 #ifdef DEBUG_RALLOC_DEC
   std::cout << "Too many assignments here (" << i << "):" << alist_size << " > " << options.max_allocs_per_node / NUM_REGS << ". Dropping some.\n"; std::cout.flush();
@@ -627,7 +673,7 @@
 
 // Handle Leaf nodes in the nice tree decomposition
 template <class T_t, class G_t, class I_t>
-void tree_dec_ralloc_leaf(T_t &T, typename boost::graph_traits<T_t>::vertex_descriptor t, const G_t &G, const I_t &I)
+static void tree_dec_ralloc_leaf(T_t &T, typename boost::graph_traits<T_t>::vertex_descriptor t, const G_t &G, const I_t &I)
 {
 #ifdef DEBUG_RALLOC_DEC
   std::cout << "Leaf (" << t << "):\n"; std::cout.flush();
@@ -652,7 +698,7 @@
 
 // Handle introduce nodes in the nice tree decomposition
 template <class T_t, class G_t, class I_t>
-void tree_dec_ralloc_introduce(T_t &T, typename boost::graph_traits<T_t>::vertex_descriptor t, const G_t &G, const I_t &I, const assignment& ac)
+static void tree_dec_ralloc_introduce(T_t &T, typename boost::graph_traits<T_t>::vertex_descriptor t, const G_t &G, const I_t &I, const assignment& ac, bool *const assignment_optimal)
 {
   typedef typename boost::graph_traits<T_t>::adjacency_iterator adjacency_iter_t;
   adjacency_iter_t c, c_end;
@@ -681,7 +727,7 @@
   std::set<var_t>::const_iterator v;
   for (v = new_vars.begin(); v != new_vars.end(); ++v)
     {
-      drop_worst_assignments(alist, i, G, I, ac);
+      drop_worst_assignments(alist, i, G, I, ac, assignment_optimal);
       assignments_introduce_variable(alist, i, *v, G, I);
     }
 
@@ -706,7 +752,7 @@
 #endif
 }
 
-bool assignments_locally_same(const assignment &a1, const assignment &a2)
+static bool assignments_locally_same(const assignment &a1, const assignment &a2)
 {
   if (a1.local != a2.local)
     return(false);
@@ -721,7 +767,7 @@
 
 // Handle forget nodes in the nice tree decomposition
 template <class T_t, class G_t, class I_t>
-void tree_dec_ralloc_forget(T_t &T, typename boost::graph_traits<T_t>::vertex_descriptor t, const G_t &G, const I_t &I)
+static void tree_dec_ralloc_forget(T_t &T, typename boost::graph_traits<T_t>::vertex_descriptor t, const G_t &G, const I_t &I)
 {
   typedef typename boost::graph_traits<T_t>::adjacency_iterator adjacency_iter_t;
   adjacency_iter_t c, c_end;
@@ -800,7 +846,7 @@
 
 // Handle join nodes in the nice tree decomposition
 template <class T_t, class G_t, class I_t>
-void tree_dec_ralloc_join(T_t &T, typename boost::graph_traits<T_t>::vertex_descriptor t, const G_t &G, const I_t &I)
+static void tree_dec_ralloc_join(T_t &T, typename boost::graph_traits<T_t>::vertex_descriptor t, const G_t &G, const I_t &I)
 {
   typedef typename boost::graph_traits<T_t>::adjacency_iterator adjacency_iter_t;
   adjacency_iter_t c, c_end, c2, c3;
@@ -879,18 +925,14 @@
   a = *ai_best;
 }
 
-template <class T_t>
-void get_best_local_assignment_biased(assignment &a, typename boost::graph_traits<T_t>::vertex_descriptor t, const T_t &T);
-
 // Handle nodes in the tree decomposition, by detecting their type and calling the appropriate function. Recurses.
 template <class T_t, class G_t, class I_t>
-void tree_dec_ralloc_nodes(T_t &T, typename boost::graph_traits<T_t>::vertex_descriptor t, const G_t &G, const I_t &I, const assignment& ac)
+static void tree_dec_ralloc_nodes(T_t &T, typename boost::graph_traits<T_t>::vertex_descriptor t, const G_t &G, const I_t &I, const assignment& ac, bool *const assignment_optimal)
 {
   typedef typename boost::graph_traits<T_t>::adjacency_iterator adjacency_iter_t;
 
   adjacency_iter_t c, c_end;
   typename boost::graph_traits<T_t>::vertex_descriptor c0, c1;
-  assignment ac2;
 
   boost::tie(c, c_end) = adjacent_vertices(t, T);
 
@@ -901,15 +943,19 @@
       break;
     case 1:
       c0 = *c;
-      tree_dec_ralloc_nodes(T, c0, G, I, ac);
-      T[c0].bag.size() < T[t].bag.size() ? tree_dec_ralloc_introduce(T, t, G, I, ac) : tree_dec_ralloc_forget(T, t, G, I);
+      tree_dec_ralloc_nodes(T, c0, G, I, ac, assignment_optimal);
+      T[c0].bag.size() < T[t].bag.size() ? tree_dec_ralloc_introduce(T, t, G, I, ac, assignment_optimal) : tree_dec_ralloc_forget(T, t, G, I);
       break;
     case 2:
       c0 = *c++;
       c1 = *c;
-      tree_dec_ralloc_nodes(T, c0, G, I, ac);
-      get_best_local_assignment_biased(ac2, c0, T);
-      tree_dec_ralloc_nodes(T, c1, G, I, ac2);
+      tree_dec_ralloc_nodes(T, c0, G, I, ac, assignment_optimal);
+      {
+        assignment *ac2 = new assignment;
+        get_best_local_assignment_biased(*ac2, c0, T);
+        tree_dec_ralloc_nodes(T, c1, G, I, *ac2, assignment_optimal);
+        delete ac2;
+      }
       tree_dec_ralloc_join(T, t, G, I);
       break;
     default:
@@ -920,7 +966,7 @@
 
 // Find the best root selecting from t_old and the leafs under t.
 template <class T_t>
-std::pair<typename boost::graph_traits<T_t>::vertex_descriptor, size_t> find_best_root(const T_t &T, typename boost::graph_traits<T_t>::vertex_descriptor t, size_t t_s, typename boost::graph_traits<T_t>::vertex_descriptor t_old, size_t t_old_s)
+static std::pair<typename boost::graph_traits<T_t>::vertex_descriptor, size_t> find_best_root(const T_t &T, typename boost::graph_traits<T_t>::vertex_descriptor t, size_t t_s, typename boost::graph_traits<T_t>::vertex_descriptor t_old, size_t t_old_s)
 {
   typedef typename boost::graph_traits<T_t>::adjacency_iterator adjacency_iter_t;
   adjacency_iter_t c, c_end;
@@ -951,7 +997,7 @@
 
 // Change the root to t.
 template <class T_t>
-void re_root(T_t &T, typename boost::graph_traits<T_t>::vertex_descriptor t)
+static void re_root(T_t &T, typename boost::graph_traits<T_t>::vertex_descriptor t)
 {
   typename boost::graph_traits<T_t>::vertex_descriptor s0, s1, s2;
   typename boost::graph_traits<T_t>::in_edge_iterator e, e_end;
@@ -977,7 +1023,7 @@
 
 // Change the root to improve the assignment removal heuristic.
 template <class T_t>
-void good_re_root(T_t &T)
+static void good_re_root(T_t &T)
 {
   typename boost::graph_traits<T_t>::vertex_descriptor t;
 
@@ -1002,7 +1048,7 @@
 }
 
 // Dump conflict graph, with numbered nodes, show live variables at each node.
-void dump_con(const con_t &con)
+static void dump_con(const con_t &con)
 {
   std::ofstream dump_file((std::string(dstFileName) + ".dumpcon" + currFunc->rname + ".dot").c_str());
 
@@ -1020,7 +1066,7 @@
 }
 
 // Dump cfg, with numbered nodes, show live variables at each node.
-void dump_cfg(const cfg_t &cfg)
+static void dump_cfg(const cfg_t &cfg)
 {
   std::ofstream dump_file((std::string(dstFileName) + ".dumpcfg" + currFunc->rname + ".dot").c_str());
 
@@ -1039,7 +1085,7 @@
 }
 
 // Dump tree decomposition, show bag and live variables at each node.
-void dump_tree_decomposition(const tree_dec_t &tree_dec)
+static void dump_tree_decomposition(const tree_dec_t &tree_dec)
 {
   std::ofstream dump_file((std::string(dstFileName) + ".dumpdec" + currFunc->rname + ".dot").c_str());
 
diff -Nru sdcc-3.1.0+dfsg/src/SDCCset.c sdcc-3.2.0+dfsg/src/SDCCset.c
--- sdcc-3.1.0+dfsg/src/SDCCset.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCset.c	2012-05-05 16:16:42.000000000 +0000
@@ -154,6 +154,9 @@
 {
   set *lp;
 
+  if (!list)
+    werror (E_INTERNAL_ERROR,__FILE__,__LINE__, "Invalid set.");
+
   /* item added to the tail of the list */
 
   /* if the list is empty */
diff -Nru sdcc-3.1.0+dfsg/src/SDCCsymt.c sdcc-3.2.0+dfsg/src/SDCCsymt.c
--- sdcc-3.1.0+dfsg/src/SDCCsymt.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCsymt.c	2012-06-10 12:32:06.000000000 +0000
@@ -89,6 +89,7 @@
 bucket *TypedefTab[256];        /* the typedef   table  */
 bucket *LabelTab[256];          /* the Label     table  */
 bucket *enumTab[256];           /* enumerated    table  */
+bucket *AddrspaceTab[256];      /* the named address space table  */
 
 /*------------------------------------------------------------------*/
 /* initSymt () - initialises symbol table related stuff             */
@@ -271,8 +272,9 @@
           /* if levels match then block numbers should also match */
           if (bp->level && bp->level == sym->level && bp->block == sym->block)
             return (bp->sym);
-          /* if levels don't match then we are okay */
-          if (bp->level && bp->level != sym->level && bp->block <= sym->block)
+          /* if levels don't match then we are okay if the symbol is in scope */
+          if (bp->level && bp->level != sym->level && bp->block <= sym->block
+              && ((symbol *) (bp->sym))->isinscope)
             return (bp->sym);
           /* if this is a global variable then we are ok too */
           if (bp->level == 0)
@@ -286,7 +288,7 @@
 }
 
 /*-----------------------------------------------------------------*/
-/* findSymWithBlock - finds a symbol with name in with a block     */
+/* findSymWithBlock - finds a symbol with name in a block          */
 /*-----------------------------------------------------------------*/
 void *
 findSymWithBlock (bucket ** stab, symbol * sym, int block)
@@ -320,6 +322,7 @@
   sym->lineDef = lexLineno;     /* set the line number */
   sym->fileDef = lexFilename;
   sym->for_newralloc = 0;
+  sym->isinscope = 1;
   return sym;
 }
 
@@ -692,7 +695,7 @@
   if ((SPEC_SHORT (src) || SPEC_LONG (src) || SPEC_LONGLONG (src)) &&
     (SPEC_SHORT (dest) || SPEC_LONG (dest) || SPEC_LONGLONG (dest)))
     {
-      if (!(options.std_c99 && SPEC_LONG (src) && SPEC_LONG (dest) && TARGET_Z80_LIKE)) /* C99 has long long */
+      if (!(options.std_c99 && SPEC_LONG (src) && SPEC_LONG (dest) && (TARGET_Z80_LIKE || TARGET_HC08_LIKE))) /* C99 has long long */
         werror (E_SHORTLONG, name);
     }
 
@@ -742,6 +745,7 @@
   SPEC_STAT (dest) |= SPEC_STAT (src);
   SPEC_EXTR (dest) |= SPEC_EXTR (src);
   SPEC_INLINE (dest) |= SPEC_INLINE (src);
+  SPEC_NORETURN (dest) |= SPEC_NORETURN(src);
   SPEC_CONST (dest) |= SPEC_CONST (src);
   SPEC_ABSA (dest) |= SPEC_ABSA (src);
   SPEC_VOLATILE (dest) |= SPEC_VOLATILE (src);
@@ -772,6 +776,12 @@
   FUNC_INTNO (dest) |= FUNC_INTNO (src);
   FUNC_REGBANK (dest) |= FUNC_REGBANK (src);
   FUNC_ISINLINE (dest) |= FUNC_ISINLINE (src);
+  FUNC_ISNORETURN (dest) |= FUNC_ISNORETURN (src);
+
+  if (SPEC_ADDRSPACE (src) && SPEC_ADDRSPACE (dest))
+    werror (E_TWO_OR_MORE_STORAGE_CLASSES, name);
+  if (SPEC_ADDRSPACE (src))
+    SPEC_ADDRSPACE (dest) = SPEC_ADDRSPACE (src);
 
   return dest;
 }
@@ -814,8 +824,14 @@
   DCL_PTR_CONST (decl) |= SPEC_CONST (spec);
   DCL_PTR_VOLATILE (decl) |= SPEC_VOLATILE (spec);
   DCL_PTR_RESTRICT (decl) |= SPEC_RESTRICT (spec);
+  if (DCL_PTR_ADDRSPACE (decl) && SPEC_ADDRSPACE (spec) &&
+    strcmp (DCL_PTR_ADDRSPACE (decl)->name, SPEC_ADDRSPACE (spec)->name))
+    werror (E_SYNTAX_ERROR, yytext);
+  if (SPEC_ADDRSPACE (spec))
+    DCL_PTR_ADDRSPACE (decl) = SPEC_ADDRSPACE (spec);
 
   SPEC_CONST (spec) = SPEC_VOLATILE (spec) = SPEC_RESTRICT (spec) = 0;
+  SPEC_ADDRSPACE (spec) = 0;
 
   lnk = decl;
   while (lnk && !IS_SPEC (lnk->next))
@@ -944,7 +960,24 @@
   sym_link *p;
 
   p = newLink (SPECIFIER);
-  SPEC_NOUN (p) = V_BIT;
+  if (bit)
+    SPEC_NOUN (p) = V_BIT;
+  else
+    SPEC_NOUN (p) = V_BOOL;
+
+  return p;
+}
+
+/*------------------------------------------------------------------*/
+/* newVoidLink() - creates an void type                             */
+/*------------------------------------------------------------------*/
+sym_link *
+newVoidLink ()
+{
+  sym_link *p;
+
+  p = newLink (SPECIFIER);
+  SPEC_NOUN (p) = V_VOID;
 
   return p;
 }
@@ -999,8 +1032,6 @@
         }
       else
         {
-          //    werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
-          //    "can not tell the size of an array[]");
           return 0;
         }
     case IPOINTER:
@@ -1079,7 +1110,6 @@
 
   if (IS_SPEC (p))
     {                           /* if this is the specifier then */
-
       switch (SPEC_NOUN (p))
         {                       /* depending on the specifier type */
         case V_INT:
@@ -1125,7 +1155,6 @@
       return (FPTRSIZE * 8);
     case GPOINTER:
       return (GPTRSIZE * 8);
-
     default:
       return 0;
     }
@@ -1238,6 +1267,12 @@
       changePointer (sym->type);
       checkTypeSanity (sym->etype, sym->name);
 
+      if (IS_NORETURN (sym->etype))
+        {
+          SPEC_NORETURN (sym->etype) = 0;
+          FUNC_ISNORETURN (sym->type) = 1;
+        }
+
       if (!sym->level && !(IS_SPEC (sym->etype) && IS_TYPEDEF (sym->etype)))
         elemsFromIval = checkDecl (sym, 0);
       else
@@ -1446,6 +1481,11 @@
   int bitOffset = 0;
   symbol *loop;
 
+  if (!sdef->fields)
+    {
+      werror (E_UNKNOWN_SIZE, sdef->tag);
+    }
+
   /* for the identifiers  */
   loop = sdef->fields;
   while (loop)
@@ -1683,6 +1723,7 @@
       werrorfl (sym->fileDef, sym->lineDef, E_BAD_RESTRICT);
       SPEC_RESTRICT (sym->etype) = 0;
     }
+
   t = sym->type;
   while (t)
     {
@@ -1732,7 +1773,7 @@
 
   /* global variables declared const put into code */
   /* if no other storage class specified */
-  if (sym->level == 0 && SPEC_SCLS (sym->etype) == S_FIXED && !IS_FUNC (sym->type))
+  if ((sym->level == 0 || SPEC_STAT(sym->etype)) && SPEC_SCLS (sym->etype) == S_FIXED && !IS_FUNC (sym->type))
     {
       /* find the first non-array link */
       t = sym->type;
@@ -1743,7 +1784,7 @@
     }
 
   /* global variable in code space is a constant */
-  if (sym->level == 0 && SPEC_SCLS (sym->etype) == S_CODE && port->mem.code_ro)
+  if ((sym->level == 0 || SPEC_STAT(sym->etype)) && SPEC_SCLS (sym->etype) == S_CODE && port->mem.code_ro)
     {
       /* find the first non-array link */
       t = sym->type;
@@ -1760,8 +1801,15 @@
   if (IS_BITVAR (sym->etype) &&
       (SPEC_SCLS (sym->etype) != S_FIXED && SPEC_SCLS (sym->etype) != S_SBIT && SPEC_SCLS (sym->etype) != S_BIT))
     {
-      werror (E_BITVAR_STORAGE, sym->name);
-      SPEC_SCLS (sym->etype) = S_FIXED;
+      /* find out if this is the return type of a function */
+      t = sym->type;
+      while (t && t->next != sym->etype)
+        t = t->next;
+      if (t->next != sym->etype || !IS_FUNC (t))
+        {
+          werror (E_BITVAR_STORAGE, sym->name);
+          SPEC_SCLS (sym->etype) = S_FIXED;
+        }
     }
 
   /* if this is an automatic symbol */
@@ -1794,14 +1842,31 @@
       SPEC_ABSA (sym->etype) = 0;
     }
 
+  if (sym->level && !IS_STATIC (sym->etype) && (IS_DECL (sym->type) ? DCL_PTR_ADDRSPACE (sym->type) : SPEC_ADDRSPACE (sym->type)) && (options.stackAuto || reentrant))
+    {
+      werror (E_AUTO_ADDRSPACE, sym->name);
+      if (IS_DECL (sym->type))
+        DCL_PTR_ADDRSPACE (sym->type) = 0;
+      else
+        SPEC_ADDRSPACE (sym->type) = 0;
+    }
+
   /* arrays & pointers cannot be defined for bits   */
   /* SBITS or SFRs or BIT                           */
   if ((IS_ARRAY (sym->type) || IS_PTR (sym->type)) &&
-      !IS_FUNCPTR (sym->type) &&
       (SPEC_NOUN (sym->etype) == V_BIT ||
        SPEC_NOUN (sym->etype) == V_SBIT || SPEC_NOUN (sym->etype) == V_BITFIELD || SPEC_NOUN (sym->etype) == V_BBITFIELD ||
        SPEC_SCLS (sym->etype) == S_SFR))
-    werror (E_BIT_ARRAY, sym->name);
+    {
+      /* find out if this is the return type of a function */
+      t = sym->type;
+      while (t && t->next != sym->etype)
+        t = t->next;
+      if (t->next != sym->etype || !IS_FUNC (t))
+        {
+          werror (E_BIT_ARRAY, sym->name);
+        }
+    }
 
   /* if this is a bit|sbit then set length & start  */
   if (SPEC_NOUN (sym->etype) == V_BIT || SPEC_NOUN (sym->etype) == V_SBIT)
@@ -1828,15 +1893,6 @@
         {
           SPEC_SCLS (sym->etype) = (options.useXstack ? S_XSTACK : S_STACK);
         }
-      else
-        {
-          /* hack-o-matic! I see no reason why the useXstack option should ever
-           * control this allocation, but the code was originally that way, and
-           * changing it for non-390 ports breaks the compiler badly.
-           */
-          bool useXdata = (TARGET_IS_DS390 || TARGET_IS_DS400) ? 1 : options.useXstack;
-          SPEC_SCLS (sym->etype) = (useXdata ? S_XDATA : S_FIXED);
-        }
     }
 }
 
@@ -1923,7 +1979,7 @@
 }
 
 /*------------------------------------------------------------------*/
-/* cleanUpLevel - cleansup the symbol table specified for all the   */
+/* cleanUpLevel - cleans up the symbol table specified for all the  */
 /*                symbols in the given level                        */
 /*------------------------------------------------------------------*/
 void
@@ -1945,6 +2001,14 @@
     }
 }
 
+symbol *
+getAddrspace (sym_link *type)
+{
+  if (IS_DECL (type))
+    return (DCL_PTR_ADDRSPACE (type));
+  return (SPEC_ADDRSPACE (type));
+}
+
 /*------------------------------------------------------------------*/
 /* computeTypeOr - computes the resultant type from two types       */
 /*------------------------------------------------------------------*/
@@ -2043,12 +2107,12 @@
 
       /* If NULL and another pointer, use the non-NULL pointer type. */
       /* Note that NULL can be defined as either 0 or (void *)0. */
-      if (IS_LITERAL (etype1) && 
+      if (IS_LITERAL (etype1) &&
           ((IS_PTR (type1) && IS_VOID (type1->next)) || IS_INTEGRAL (type1)) &&
           (floatFromVal (valFromType (etype1)) == 0) &&
           IS_PTR (type2))
         return copyLinkChain (type2);
-      else if (IS_LITERAL (etype2) && 
+      else if (IS_LITERAL (etype2) &&
                ((IS_PTR (type2) && IS_VOID (type2->next)) || IS_INTEGRAL (type2)) &&
                (floatFromVal (valFromType (etype2)) == 0) &&
                IS_PTR (type1))
@@ -2062,7 +2126,7 @@
 
       /* Otherwise fall through to the general case */
     }
-  
+
 
   /* if one of them is a pointer or array then that prevails */
   if (IS_PTR (type1) || IS_ARRAY (type1))
@@ -2115,12 +2179,15 @@
 
   /* if result is a literal then make not so */
   if (IS_LITERAL (reType))
-    SPEC_SCLS (reType) = S_REGISTER;
+    {
+      SPEC_SCLS (reType) = S_REGISTER;
+      SPEC_CONST (reType) = 0;
+    }
 
   switch (resultType)
     {
     case RESULT_TYPE_IFX:
-      if (TARGET_IS_HC08)
+      if (TARGET_HC08_LIKE)
         break;
       //fallthrough
     case RESULT_TYPE_BIT:
@@ -2167,25 +2234,11 @@
           /* promotion of some special cases */
           switch (op)
             {
-            case ':':
-              /* mcs51, xa51 and ds390 do not really support _Bool yet */
-              if (TARGET_IS_MCS51 || TARGET_IS_XA51 || TARGET_IS_DS390)
-                break;
-              /* Avoid unnecessary cast to _Bool if both operands are _Bool */
-              if ((IS_BOOL (etype1) || (IS_LITERAL (etype1) &&
-                                        (floatFromVal (valFromType (etype1)) == 1.0 ||
-                                         floatFromVal (valFromType (etype1)) == 0.0))) &&
-                  (IS_BOOL (etype2) || (IS_LITERAL (etype2) &&
-                                        (floatFromVal (valFromType (etype2)) == 1.0 ||
-                                         floatFromVal (valFromType (etype2)) == 0.0))))
-                {
-                  SPEC_NOUN (reType) = V_BOOL;
-                }
-              break;
             case '|':
             case '^':
               return computeTypeOr (etype1, etype2, reType);
             case '&':
+            case BITWISEAND:
               if (SPEC_USIGN (etype1) != SPEC_USIGN (etype2))
                 {
                   SPEC_USIGN (reType) = 1;
@@ -2356,6 +2409,9 @@
 {
   int res;
 
+  if (getAddrspace (src->next) != getAddrspace (dest->next))
+    bMustCast = 1;
+
   if (IS_VOID (src->next) && IS_VOID (dest->next))
     return bMustCast ? -1 : 1;
   if ((IS_VOID (src->next) && !IS_VOID (dest->next)) || (!IS_VOID (src->next) && IS_VOID (dest->next)))
@@ -2364,7 +2420,7 @@
   if (res == 1)
     return bMustCast ? -1 : 1;
   else if (res == -2)
-    return -2;
+    return bMustCast ? -1 : -2;
   else
     return 0;
 }
@@ -2465,13 +2521,13 @@
   if (SPEC_NOUN (dest) != SPEC_NOUN (src))
     {
       if ((SPEC_USIGN (dest) == SPEC_USIGN (src)) &&
-		  IS_INTEGRAL (dest) && IS_INTEGRAL (src) &&
+          IS_INTEGRAL (dest) && IS_INTEGRAL (src) &&
           /* I would prefer
              bitsForType (dest) == bitsForType (src))
              instead of the next two lines, but the regression tests fail with
              them; I guess it's a problem with replaceCheaperOp  */
           (getSize (dest) == getSize (src)) &&
-		  (IS_BOOLEAN (dest) == IS_BOOLEAN (src)))
+          (IS_BOOLEAN (dest) == IS_BOOLEAN (src)))
         return 1;
       else if (IS_ARITHMETIC (dest) && IS_ARITHMETIC (src))
         return -1;
@@ -2780,12 +2836,17 @@
       return 0;
     }
 
-  /* move inline specifier from return type to function attributes */
+  /* move function specifier from return type to function attributes */
   if (IS_INLINE (sym->etype))
     {
       SPEC_INLINE (sym->etype) = 0;
       FUNC_ISINLINE (sym->type) = 1;
     }
+  if (IS_NORETURN (sym->etype))
+    {
+      SPEC_NORETURN (sym->etype) = 0;
+      FUNC_ISNORETURN (sym->type) = 1;
+    }
 
   /* make sure the type is complete and sane */
   checkTypeSanity (sym->etype, sym->name);
@@ -2799,7 +2860,7 @@
     sym->type->next = sym->etype = newIntLink ();
 
   /* function cannot return aggregate */
-  if (IS_AGGREGATE (sym->type->next) || IS_LONGLONG (sym->type->next))
+  if (IS_AGGREGATE (sym->type->next) || IS_LONGLONG (sym->type->next) && !(TARGET_Z80_LIKE || TARGET_HC08_LIKE))
     {
       werror (E_FUNC_AGGR, sym->name);
       return 0;
@@ -3291,7 +3352,7 @@
             case ARRAY:
               if (DCL_ELEM (type))
                 {
-                  dbuf_printf (dbuf, "[%d]", DCL_ELEM (type));
+                  dbuf_printf (dbuf, "[%ud]", (unsigned int) DCL_ELEM (type));
                 }
               else
                 {
@@ -3499,6 +3560,10 @@
                 {
                   fprintf (of, "inline-");
                 }
+              if (IFFUNC_ISNORETURN (type))
+                {
+                  fprintf (of, "_Noreturn-");
+                }
               fprintf (of, "function %s %s",
                        (IFFUNC_ISBUILTIN (type) ? "__builtin__" : " "), (IFFUNC_ISJAVANATIVE (type) ? "_JavaNative" : " "));
               fprintf (of, "( ");
@@ -3537,7 +3602,7 @@
             case ARRAY:
               if (DCL_ELEM (type))
                 {
-                  fprintf (of, "[%d] ", DCL_ELEM (type));
+                  fprintf (of, "[%ud] ", (unsigned int) DCL_ELEM (type));
                 }
               else
                 {
@@ -3604,7 +3669,9 @@
           switch (SPEC_NOUN (type))
             {
             case V_INT:
-              if (IS_LONG (type))
+              if (IS_LONGLONG (type))
+                fprintf (of, "longlong-");
+              else if (IS_LONG (type))
                 fprintf (of, "long-");
               fprintf (of, "int");
               break;
@@ -3713,16 +3780,16 @@
 symbol *fps16x16_gt;
 symbol *fps16x16_gteq;
 
-/* Dims: mul/div/mod, BYTE/WORD/DWORD, SIGNED/UNSIGNED/BOTH */
-symbol *muldiv[3][3][4];
-/* Dims: BYTE/WORD/DWORD SIGNED/UNSIGNED */
-sym_link *multypes[3][2];
-/* Dims: to/from float, BYTE/WORD/DWORD, SIGNED/USIGNED */
-symbol *conv[2][3][2];
-/* Dims: to/from fixed16x16, BYTE/WORD/DWORD/FLOAT, SIGNED/USIGNED */
-symbol *fp16x16conv[2][4][2];
-/* Dims: shift left/shift right, BYTE/WORD/DWORD, SIGNED/UNSIGNED */
-symbol *rlrr[2][3][2];
+/* Dims: mul/div/mod, BYTE/WORD/DWORD/QWORD, SIGNED/UNSIGNED/BOTH */
+symbol *muldiv[3][4][4];
+/* Dims: BYTE/WORD/DWORD/QWORD SIGNED/UNSIGNED */
+sym_link *multypes[4][2];
+/* Dims: to/from float, BYTE/WORD/DWORD/QWORD, SIGNED/USIGNED */
+symbol *conv[2][4][2];
+/* Dims: to/from fixed16x16, BYTE/WORD/DWORD/QWORD/FLOAT, SIGNED/USIGNED */
+symbol *fp16x16conv[2][5][2];
+/* Dims: shift left/shift right, BYTE/WORD/DWORD/QWORD, SIGNED/UNSIGNED */
+symbol *rlrr[2][4][2];
 
 sym_link *charType;
 sym_link *floatType;
@@ -3748,6 +3815,7 @@
 /*                      's' - short                                */
 /*                      'i' - int                                  */
 /*                      'l' - long                                 */
+/*                      'L' - long long                            */
 /*                      'f' - float                                */
 /*                      'q' - fixed16x16                           */
 /*                      'v' - void                                 */
@@ -3796,6 +3864,11 @@
           SPEC_NOUN (r) = V_INT;
           SPEC_LONG (r) = 1;
           break;
+        case 'L':
+          r->xclass = SPECIFIER;
+          SPEC_NOUN (r) = V_INT;
+          SPEC_LONGLONG (r) = 1;
+          break;
         case 'f':
           r->xclass = SPECIFIER;
           SPEC_NOUN (r) = V_FLOAT;
@@ -3869,10 +3942,10 @@
     "mul", "div", "mod"
   };
   const char *sbwd[] = {
-    "char", "int", "long", "fixed16x16",
+    "char", "int", "long", "longlong", "fixed16x16",
   };
   const char *fp16x16sbwd[] = {
-    "char", "int", "long", "float",
+    "char", "int", "long", "longlong", "float",
   };
   const char *ssu[] = {
     "s", "su", "us", "u"
@@ -3880,6 +3953,11 @@
   const char *srlrr[] = {
     "rl", "rr"
   };
+  /* type as character codes for typeFromStr() */
+  const char *sbwdCodes[] = {
+    "c",  "i",  "l",  "L",
+    "uc", "ui", "ul", "uL"
+  };
 
   int bwd, su, muldivmod, tofrom, slsr;
 
@@ -3889,7 +3967,7 @@
       return;
     }
 
-  for (bwd = 0; bwd < 3; bwd++)
+  for (bwd = 0; bwd < 4; bwd++)
     {
       sym_link *l = NULL;
       switch (bwd)
@@ -3903,6 +3981,9 @@
         case 2:
           l = newLongLink ();
           break;
+        case 3:
+          l = newLongLongLink ();
+          break;
         default:
           assert (0);
         }
@@ -3939,7 +4020,7 @@
 
   for (tofrom = 0; tofrom < 2; tofrom++)
     {
-      for (bwd = 0; bwd < 3; bwd++)
+      for (bwd = 0; bwd < 4; bwd++)
         {
           for (su = 0; su < 2; su++)
             {
@@ -3963,7 +4044,7 @@
 
   for (tofrom = 0; tofrom < 2; tofrom++)
     {
-      for (bwd = 0; bwd < 4; bwd++)
+      for (bwd = 0; bwd < 5; bwd++)
         {
           for (su = 0; su < 2; su++)
             {
@@ -3973,7 +4054,7 @@
               if (tofrom)
                 {
                   dbuf_printf (&dbuf, "__fps16x162%s%s", ssu[su * 3], fp16x16sbwd[bwd]);
-                  if (bwd == 3)
+                  if (bwd == 4)
                     fp16x16conv[tofrom][bwd][su] =
                       funcOfType (dbuf_c_str (&dbuf), floatType, fixed16x16Type, 1, options.float_rent);
                   else
@@ -3983,7 +4064,7 @@
               else
                 {
                   dbuf_printf (&dbuf, "__%s%s2fps16x16", ssu[su * 3], fp16x16sbwd[bwd]);
-                  if (bwd == 3)
+                  if (bwd == 4)
                     fp16x16conv[tofrom][bwd][su] =
                       funcOfType (dbuf_c_str (&dbuf), fixed16x16Type, floatType, 1, options.float_rent);
                   else
@@ -3998,7 +4079,7 @@
 /*
   for (muldivmod = 0; muldivmod < 3; muldivmod++)
     {
-      for (bwd = 0; bwd < 3; bwd++)
+      for (bwd = 0; bwd < 4; bwd++)
         {
           for (su = 0; su < 2; su++)
             {
@@ -4040,7 +4121,7 @@
         }
     }
 
-  for (bwd = 1; bwd < 3; bwd++)
+  for (bwd = 1; bwd < 4; bwd++)
     {
       for (su = 0; su < 2; su++)
         {
@@ -4087,8 +4168,8 @@
   muldivmod = 0;
   /* signed only */
   su = 0;
-  /* word and doubleword */
-  for (bwd = 1; bwd < 3; bwd++)
+  /* word, doubleword, and quadword */
+  for (bwd = 1; bwd < 4; bwd++)
     {
       /* mul, int/long */
       struct dbuf_s dbuf;
@@ -4104,17 +4185,24 @@
 
   for (slsr = 0; slsr < 2; slsr++)
     {
-      for (bwd = 0; bwd < 3; bwd++)
+      for (bwd = 0; bwd < 4; bwd++)
         {
           for (su = 0; su < 2; su++)
             {
               struct dbuf_s dbuf;
+              symbol *sym;
+              const char *params[2];
+
+              params[0] = sbwdCodes[bwd + 4*su];
+              params[1] = sbwdCodes[0];
 
               dbuf_init (&dbuf, 128);
               dbuf_printf (&dbuf, "_%s%s%s", srlrr[slsr], ssu[su * 3], sbwd[bwd]);
-              rlrr[slsr][bwd][su] =
-                funcOfType (_mangleFunctionName (dbuf_c_str (&dbuf)), multypes[bwd][su], multypes[0][0], 2,
-                            options.intlong_rent);
+              rlrr[slsr][bwd][su] = sym =
+                funcOfTypeVarg (_mangleFunctionName (dbuf_c_str (&dbuf)), 
+                                sbwdCodes[bwd + 4*su], 2, &params[0]);
+              FUNC_ISREENT (sym->type) = options.intlong_rent ? 1 : 0;
+              FUNC_NONBANKED (sym->type) = 1;
               dbuf_destroy (&dbuf);
             }
         }
@@ -4136,7 +4224,7 @@
   for (i = 0; port->builtintable[i].name; i++)
     {
       sym = funcOfTypeVarg (port->builtintable[i].name, port->builtintable[i].rtype,
-                            port->builtintable[i].nParms, port->builtintable[i].parm_types);
+                            port->builtintable[i].nParms, (const char **)port->builtintable[i].parm_types);
       FUNC_ISBUILTIN (sym->type) = 1;
       FUNC_ISREENT (sym->type) = 0;     /* can never be reentrant */
     }
diff -Nru sdcc-3.1.0+dfsg/src/SDCCsymt.h sdcc-3.2.0+dfsg/src/SDCCsymt.h
--- sdcc-3.1.0+dfsg/src/SDCCsymt.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCsymt.h	2012-06-07 17:36:23.000000000 +0000
@@ -94,11 +94,13 @@
 {
   char tag[SDCC_NAME_MAX + 1];  /* tag part of structure      */
   unsigned char level;          /* Nesting level              */
+  int block;                    /* belongs to which block     */
   struct symbol *fields;        /* pointer to fields          */
   unsigned size;                /* sizeof the table in bytes  */
   int type;                     /* STRUCT or UNION            */
   bool b_flexArrayMember;       /* has got a flexible array member,
                                    only needed for syntax checks */
+  struct symbol *tagsym;        /* tag symbol (NULL if no tag) */
 }
 structdef;
 
@@ -148,6 +150,8 @@
 #define TYPE_TARGET_UCHAR TYPE_UBYTE
 #define TYPE_TARGET_UINT  TYPE_UWORD
 #define TYPE_TARGET_ULONG TYPE_UDWORD
+#define TYPE_TARGET_LONGLONG TYPE_QWORD
+#define TYPE_TARGET_ULONGLONG TYPE_UQWORD
 
 /* specifier is the last in the type-chain */
 typedef struct specifier
@@ -163,10 +167,12 @@
   unsigned b_static:1;              /* 1=static keyword found     */
   unsigned b_extern:1;              /* 1=extern found             */
   unsigned b_inline:1;              /* inline function requested  */
+  unsigned b_noreturn:1;            /* promised not to return     */
   unsigned b_absadr:1;              /* absolute address specfied  */
   unsigned b_volatile:1;            /* is marked as volatile      */
   unsigned b_const:1;               /* is a constant              */
   unsigned b_restrict:1;            /* is restricted              */
+  struct symbol *addrspace;         /* is in named address space  */
   unsigned b_typedef:1;             /* is typedefed               */
   unsigned b_isregparm:1;           /* is the first parameter     */
   unsigned b_isenum:1;              /* is an enumerated type      */
@@ -177,15 +183,17 @@
   unsigned _stack;                  /* stack offset for stacked v */
   int argreg;                       /* reg no for regparm         */
   union
-  {                                 /* Values if constant or enum */
-    TYPE_TARGET_INT v_int;          /* 2 bytes: int and char values           */
-    char *v_char;                   /*          character string              */
-    TYPE_TARGET_UINT v_uint;        /* 2 bytes: unsigned int const value      */
-    TYPE_TARGET_LONG v_long;        /* 4 bytes: long constant value           */
-    TYPE_TARGET_ULONG v_ulong;      /* 4 bytes: unsigned long constant value  */
-    double v_float;                 /*          floating point constant value */
-    TYPE_TARGET_ULONG v_fixed16x16; /* 4 bytes: fixed point constant value    */
-    struct symbol *v_enum;          /* ptr to enum_list if enum==1            */
+  {                                   /* Values if constant or enum */
+    TYPE_TARGET_INT v_int;            /* 2 bytes: int and char values            */
+    const char *v_char;               /*          character string               */
+    TYPE_TARGET_UINT v_uint;          /* 2 bytes: unsigned int const value       */
+    TYPE_TARGET_LONG v_long;          /* 4 bytes: long constant value            */
+    TYPE_TARGET_ULONG v_ulong;        /* 4 bytes: unsigned long constant value   */
+    TYPE_TARGET_LONGLONG v_longlong;  /* 8 bytes: long long constant value       */
+    TYPE_TARGET_ULONGLONG v_ulonglong;/* 8 bytes: unsigned long long const value */
+    double v_float;                   /*          floating point constant value  */
+    TYPE_TARGET_ULONG v_fixed16x16;   /* 4 bytes: fixed point constant value     */
+    struct symbol *v_enum;            /* ptr to enum_list if enum==1             */
   }
   const_val;
   struct structdef *v_struct;       /* structure pointer      */
@@ -211,11 +219,13 @@
 typedef struct declarator
 {
   DECLARATOR_TYPE dcl_type;         /* POINTER,ARRAY or FUNCTION  */
-  unsigned int num_elem;            /* # of elems if type==array, */
+  size_t num_elem;                  /* # of elems if type==array, */
   /* always 0 for flexible arrays */
   unsigned ptr_const:1;             /* pointer is constant        */
   unsigned ptr_volatile:1;          /* pointer is volatile        */
   unsigned ptr_restrict:1;          /* pointer is resticted       */
+  struct symbol *ptr_addrspace;     /* pointer is in named address space  */
+
   struct sym_link *tspec;           /* pointer type specifier     */
 }
 declarator;
@@ -229,9 +239,9 @@
 
 typedef struct sym_link
 {
-  SYM_LINK_CLASS xclass;            /* DECLARATOR or SPECIFIER    */
-  unsigned tdef:1;                  /* current link created by    */
-  /* typedef if this flag is set */
+  SYM_LINK_CLASS xclass;            /* DECLARATOR or SPECIFIER     */
+  unsigned tdef:1;                  /* current link created by     */
+                                    /* typedef if this flag is set */
   union
   {
     specifier s;                    /* if CLASS == SPECIFIER      */
@@ -257,6 +267,7 @@
     unsigned intrtn:1;              /* this is an interrupt routine         */
     unsigned rbank:1;               /* seperate register bank               */
     unsigned inlinereq:1;           /* inlining requested                   */
+    unsigned noreturn:1;            /* promised not to return               */
     unsigned smallc:1;              /* Parameters on stack are passed in reverse order */
     unsigned intno;                 /* 1=Interrupt service routine          */
     short regbank;                  /* register bank 2b used                */
@@ -298,6 +309,7 @@
   unsigned isreqv:1;                /* is the register equivalent of a symbol */
   unsigned udChked:1;               /* use def checking has been already done */
   unsigned generated:1;             /* code generated (function symbols only) */
+  unsigned isinscope:1;             /* is in scope */
 
   /* following flags are used by the backend
      for code generation and can be changed
@@ -334,7 +346,7 @@
   short nRegs;                      /* number of registers required */
   short regType;                    /* type of register required    */
 
-  struct reg_info *regs[4];         /* can have at the most 4 registers */
+  struct reg_info *regs[8];         /* can have at the most 8 registers */
   struct asmop *aop;                /* asmoperand for this symbol */
   struct iCode *fuse;               /* furthest use */
   struct iCode *rematiCode;         /* rematerialise with which instruction */
@@ -368,6 +380,7 @@
   int recvSize;                     /* size of first argument  */
   struct bitVect *clashes;          /* overlaps with what other symbols */
   struct ast *funcTree;             /* function body ast if inlined */
+  struct symbol *addressmod[2];     /* access functions for named address spaces */
 
   bool for_newralloc;
 }
@@ -384,6 +397,7 @@
 #define DCL_PTR_CONST(l) validateLink(l, "DCL_PTR_CONST", #l, DECLARATOR, __FILE__, __LINE__)->select.d.ptr_const
 #define DCL_PTR_VOLATILE(l) validateLink(l, "DCL_PTR_VOLATILE", #l, DECLARATOR, __FILE__, __LINE__)->select.d.ptr_volatile
 #define DCL_PTR_RESTRICT(l) validateLink(l, "DCL_PTR_RESTRICT", #l, DECLARATOR, __FILE__, __LINE__)->select.d.ptr_restrict
+#define DCL_PTR_ADDRSPACE(l) validateLink(l, "DCL_PTR_ADDRSPACE", #l, DECLARATOR, __FILE__, __LINE__)->select.d.ptr_addrspace
 #define DCL_TSPEC(l) validateLink(l, "DCL_TSPEC", #l, DECLARATOR, __FILE__, __LINE__)->select.d.tspec
 
 #define FUNC_DEBUG              //assert(IS_FUNC(x));
@@ -404,6 +418,8 @@
 #define FUNC_HASSTACKPARM(x) (x->funcAttrs.hasStackParms)
 #define FUNC_ISINLINE(x) (x->funcAttrs.inlinereq)
 #define IFFUNC_ISINLINE(x) (IS_FUNC(x) && FUNC_ISINLINE(x))
+#define FUNC_ISNORETURN(x) (x->funcAttrs.noreturn)
+#define IFFUNC_ISNORETURN(x) (IS_FUNC(x) && FUNC_ISNORETURN(x))
 
 #define FUNC_ISREENT(x) (x->funcAttrs.reent)
 #define IFFUNC_ISREENT(x) (IS_FUNC(x) && FUNC_ISREENT(x))
@@ -463,11 +479,13 @@
 #define SPEC_VOLATILE(x) validateLink(x, "SPEC_NOUN", #x, SPECIFIER, __FILE__, __LINE__)->select.s.b_volatile
 #define SPEC_CONST(x) validateLink(x, "SPEC_NOUN", #x, SPECIFIER, __FILE__, __LINE__)->select.s.b_const
 #define SPEC_RESTRICT(x) validateLink(x, "SPEC_NOUN", #x, SPECIFIER, __FILE__, __LINE__)->select.s.b_restrict
+#define SPEC_ADDRSPACE(x) validateLink(x, "SPEC_NOUN", #x, SPECIFIER, __FILE__, __LINE__)->select.s.addrspace
 #define SPEC_STRUCT(x) validateLink(x, "SPEC_NOUN", #x, SPECIFIER, __FILE__, __LINE__)->select.s.v_struct
 #define SPEC_TYPEDEF(x) validateLink(x, "SPEC_NOUN", #x, SPECIFIER, __FILE__, __LINE__)->select.s.b_typedef
 #define SPEC_REGPARM(x) validateLink(x, "SPEC_NOUN", #x, SPECIFIER, __FILE__, __LINE__)->select.s.b_isregparm
 #define SPEC_ARGREG(x) validateLink(x, "SPEC_NOUN", #x, SPECIFIER, __FILE__, __LINE__)->select.s.argreg
 #define SPEC_INLINE(x) validateLink(x, "SPEC_INLINE", #x, SPECIFIER, __FILE__, __LINE__)->select.s.b_inline
+#define SPEC_NORETURN(x) validateLink(x, "SPEC_NORETURN", #x, SPECIFIER, __FILE__, __LINE__)->select.s.b_noreturn
 
 /* type check macros */
 #define IS_DECL(x)       ( x && x->xclass == DECLARATOR )
@@ -505,18 +523,19 @@
 #define IS_RENT(x)       (IS_SPEC(x) && x->select.s._reent )
 #define IS_STATIC(x)     (IS_SPEC(x) && SPEC_STAT(x))
 #define IS_INLINE(x)     (IS_SPEC(x) && SPEC_INLINE(x))
+#define IS_NORETURN(x)   (IS_SPEC(x) && SPEC_NORETURN(x))
 #define IS_INT(x)        (IS_SPEC(x) && x->select.s.noun == V_INT)
 #define IS_VOID(x)       (IS_SPEC(x) && x->select.s.noun == V_VOID)
 #define IS_BOOL(x)       (IS_SPEC(x) && x->select.s.noun == V_BOOL)
 #define IS_CHAR(x)       (IS_SPEC(x) && x->select.s.noun == V_CHAR)
 #define IS_EXTERN(x)     (IS_SPEC(x) && x->select.s.b_extern)
 #define IS_VOLATILE(x)   (isVolatile (x))
-#define IS_INTEGRAL(x)   (IS_SPEC(x) && (x->select.s.noun == V_INT ||  \
-                                         x->select.s.noun == V_BOOL || \
-                                         x->select.s.noun == V_CHAR || \
-                                         x->select.s.noun == V_BITFIELD || \
+#define IS_INTEGRAL(x)   (IS_SPEC(x) && (x->select.s.noun == V_INT       || \
+                                         x->select.s.noun == V_BOOL      || \
+                                         x->select.s.noun == V_CHAR      || \
+                                         x->select.s.noun == V_BITFIELD  || \
                                          x->select.s.noun == V_BBITFIELD || \
-                                         x->select.s.noun == V_BIT ||  \
+                                         x->select.s.noun == V_BIT       || \
                                          x->select.s.noun == V_SBIT ))
 #define IS_BITFIELD(x)   (IS_SPEC(x) && (x->select.s.noun == V_BITFIELD || \
                                          x->select.s.noun == V_BBITFIELD ))
@@ -550,6 +569,7 @@
 extern bucket *TypedefTab[];
 extern bucket *LabelTab[];
 extern bucket *enumTab[];
+extern bucket *AddrspaceTab[];
 extern symbol *fsadd;
 extern symbol *fssub;
 extern symbol *fsmul;
@@ -572,16 +592,16 @@
 extern symbol *fps16x16_gt;
 extern symbol *fps16x16_gteq;
 
-/* Dims: mul/div/mod, BYTE/WORD/DWORD, SIGNED/UNSIGNED/BOTH */
-extern symbol *muldiv[3][3][4];
-/* Dims: BYTE/WORD/DWORD SIGNED/UNSIGNED */
-extern sym_link *multypes[3][2];
-/* Dims: to/from float, BYTE/WORD/DWORD, SIGNED/USIGNED */
-extern symbol *conv[2][3][2];
-/* Dims: to/from fixed16x16, BYTE/WORD/DWORD/FLOAT, SIGNED/USIGNED */
-extern symbol *fp16x16conv[2][4][2];
-/* Dims: shift left/shift right, BYTE/WORD/DWORD, SIGNED/UNSIGNED */
-extern symbol *rlrr[2][3][2];
+/* Dims: mul/div/mod, BYTE/WORD/DWORD/QWORD, SIGNED/UNSIGNED/BOTH */
+extern symbol *muldiv[3][4][4];
+/* Dims: BYTE/WORD/DWORD/QWORD SIGNED/UNSIGNED */
+extern sym_link *multypes[4][2];
+/* Dims: to/from float, BYTE/WORD/DWORD/QWORD, SIGNED/USIGNED */
+extern symbol *conv[2][4][2];
+/* Dims: to/from fixed16x16, BYTE/WORD/DWORD/QWORD/FLOAT, SIGNED/USIGNED */
+extern symbol *fp16x16conv[2][5][2];
+/* Dims: shift left/shift right, BYTE/WORD/DWORD/QWORD, SIGNED/UNSIGNED */
+extern symbol *rlrr[2][4][2];
 
 #define SCHARTYPE       multypes[0][0]
 #define UCHARTYPE       multypes[0][1]
@@ -589,6 +609,8 @@
 #define UINTTYPE        multypes[1][1]
 #define LONGTYPE        multypes[2][0]
 #define ULONGTYPE       multypes[2][1]
+#define LONGLONGTYPE    multypes[3][0]
+#define ULONGLONGTYPE   multypes[3][1]
 
 extern sym_link *floatType;
 extern sym_link *fixed16x16Type;
@@ -638,11 +660,13 @@
 sym_link *newCharLink ();
 sym_link *newLongLink ();
 sym_link *newBoolLink ();
+sym_link *newVoidLink ();
 int compareType (sym_link *, sym_link *);
 int compareTypeExact (sym_link *, sym_link *, int);
 int checkFunction (symbol *, symbol *);
 void cleanUpLevel (bucket **, int);
 void cleanUpBlock (bucket **, int);
+symbol *getAddrspace (sym_link *type);
 int funcInChain (sym_link *);
 void addSymChain (symbol **);
 sym_link *structElemType (sym_link *, value *);
@@ -675,6 +699,7 @@
 int isConstant (sym_link * type);
 int isVolatile (sym_link * type);
 int isRestrict (sym_link * type);
+value *aggregateToPointer (value *);
 
 
 extern char *nounName (sym_link *);     /* noun strings */
diff -Nru sdcc-3.1.0+dfsg/src/SDCCtree_dec.hpp sdcc-3.2.0+dfsg/src/SDCCtree_dec.hpp
--- sdcc-3.1.0+dfsg/src/SDCCtree_dec.hpp	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCtree_dec.hpp	2012-05-05 14:39:36.000000000 +0000
@@ -23,7 +23,7 @@
 //
 // struct tree_dec_node
 // {
-//	std::set<unsigned int> bag;
+//  std::set<unsigned int> bag;
 // };
 // typedef boost::adjacency_list<boost::vecS, boost::vecS, boost::bidirectionalS, tree_dec_node> tree_dec_t;
 //
@@ -138,8 +138,8 @@
     // Not in Thorup's paper, but without this the algorithm gives incorrect results.
     while(s.size() > 1)
     {
-    	M.insert(std::pair<unsigned int, unsigned int>(s.top().second, s.top().first));
-    	s.pop();
+        M.insert(std::pair<unsigned int, unsigned int>(s.top().second, s.top().first));
+        s.pop();
     }
 }
 
@@ -189,7 +189,7 @@
         t_found = t;
     }
 
-  if (t_found == t_end)	// Todo: Better error handling (throw exception?)
+  if (t_found == t_end) // Todo: Better error handling (throw exception?)
     {
       std::cerr << "find_bag() failed.\n";
       std::cerr.flush();
@@ -465,5 +465,3 @@
   nicify_diffs(T, t);
   nicify_diffs_more(T, t);
 }
-
-
diff -Nru sdcc-3.1.0+dfsg/src/SDCCutil.c sdcc-3.2.0+dfsg/src/SDCCutil.c
--- sdcc-3.1.0+dfsg/src/SDCCutil.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCutil.c	2012-03-20 14:01:24.000000000 +0000
@@ -847,51 +847,75 @@
 }
 
 /*!
-  /fn int copyStr (char *dest, char *src)
+  /fn const char *copyStr (const char *src, size_t *size)
 
-  Copies a source string to a dest buffer interpreting escape sequences
-  and special characters
+  Copies source string to a dynamically allocated buffer interpreting
+  escape sequences and special characters
 
-  /param dest Buffer to receive the resultant string
   /param src  Buffer containing the source string with escape sequecnes
-  /return Number of characters in output string
-
+  /param size Pointer to loction where the resulting buffer length is written
+  /return Dynamically allocated resulting buffer
 */
 
-int
-copyStr (char *dest, const char *src)
+const char *
+copyStr (const char *src, size_t *size)
 {
-  char *OriginalDest = dest;
+ const char *begin = NULL;
+ struct dbuf_s dbuf;
+
+  dbuf_init(&dbuf, 128);
 
   while (*src)
     {
       if (*src == '\"')
-        ++src;
+        {
+          if (begin)
+            {
+              /* copy what we have until now */
+              dbuf_append (&dbuf, begin, src - begin);
+              begin = NULL;
+            }
+          ++src;
+        }
       else if (*src == '\\')
         {
+          int c;
+
+          if (begin)
+            {
+              /* copy what we have until now */
+              dbuf_append (&dbuf, begin, src - begin);
+              begin = NULL;
+            }
           ++src;
           switch (*src)
             {
             case 'n':
-              *dest++ = '\n';
+              c = '\n';
               break;
+
             case 't':
-              *dest++ = '\t';
+              c = '\t';
               break;
+
             case 'v':
-              *dest++ = '\v';
+              c = '\v';
               break;
+
             case 'b':
-              *dest++ = '\b';
+              c = '\b';
               break;
+
             case 'r':
-              *dest++ = '\r';
+              c = '\r';
               break;
+
             case 'f':
-              *dest++ = '\f';
+              c = '\f';
               break;
+
             case 'a':
-              *dest++ = '\a';
+              c = '\a';
               break;
 
             case '0':
@@ -902,47 +926,57 @@
             case '5':
             case '6':
             case '7':
-              *dest++ = octalEscape (&src);
+              c = octalEscape (&src);
               --src;
               break;
 
             case 'x':
-              *dest++ = hexEscape (&src);
+              c = hexEscape (&src);
               --src;
               break;
 
             case 'u':
-              *dest++ = universalEscape (&src, 4);
+              c = universalEscape (&src, 4);
               --src;
               break;
 
             case 'U':
-              *dest++ = universalEscape (&src, 8);
+              c = universalEscape (&src, 8);
               --src;
               break;
 
             case '\\':
-              *dest++ = '\\';
-              break;
             case '\?':
-              *dest++ = '\?';
-              break;
             case '\'':
-              *dest++ = '\'';
-              break;
             case '\"':
-              *dest++ = '\"';
-              break;
             default:
-              *dest++ = *src;
+              c = *src;
+              break;
             }
+          dbuf_append_char (&dbuf, c);
           ++src;
         }
       else
-        *dest++ = *src++;
+        {
+          if (!begin)
+            begin = src;
+          ++src;
+        }
     }
 
-  *dest++ = '\0';
+  if (begin)
+    {
+      /* copy what we have until now */
+      dbuf_append (&dbuf, begin, src - begin);
+      begin = NULL;
+    }
+
+  if (size)
+    {
+      /* include null terminator character
+         appended by dbuf_detach_c_str() */
+      *size = dbuf_get_length (&dbuf) + 1;
+    }
 
-  return dest - OriginalDest;
+  return dbuf_detach_c_str (&dbuf);
 }
diff -Nru sdcc-3.1.0+dfsg/src/SDCCutil.h sdcc-3.2.0+dfsg/src/SDCCutil.h
--- sdcc-3.1.0+dfsg/src/SDCCutil.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCutil.h	2012-03-18 17:16:18.000000000 +0000
@@ -175,6 +175,6 @@
 unsigned char hexEscape (const char **src);
 unsigned char universalEscape (const char **src, unsigned int n);
 unsigned char octalEscape (const char **src);
-int copyStr (char *dest, const char *src);
+const char *copyStr (const char *src, size_t *size);
 
 #endif
diff -Nru sdcc-3.1.0+dfsg/src/SDCCval.c sdcc-3.2.0+dfsg/src/SDCCval.c
--- sdcc-3.1.0+dfsg/src/SDCCval.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCval.c	2012-06-17 12:12:00.000000000 +0000
@@ -210,8 +210,6 @@
   return head;
 }
 
-
-
 /*------------------------------------------------------------------*/
 /* copyIlist - copy initializer list                                */
 /*------------------------------------------------------------------*/
@@ -669,11 +667,36 @@
      reduce it the other way */
   if (SPEC_CVAL (val->type).v_int >= 0)
     {
+      /* 'bool' promotes to 'signed int' too */
+      if (SPEC_CVAL (val->type).v_int <= 1)
+        {
+          SPEC_NOUN (val->type) = (bit) ? V_BIT : V_BOOL;
+        }
+
       SPEC_USIGN (val->type) = 1;
     }
+
   return (val);
 }
 
+/*-----------------------------------------------------------------*/
+/* double2ul - double to unsigned long conversion                  */
+/*-----------------------------------------------------------------*/
+unsigned long
+double2ul (double val)
+{
+/*
+ * See ISO/IEC 9899, chapter 6.3.1.4 Real floating and integer:
+ * If the value of the integral part cannot be represented by the integer type, the behavior is undefined.
+ * This shows up on Mac OS X i386 platform which useus SSE unit instead of the x87 FPU for floating-point operations
+ */
+/*
+ * on Mac OS X ppc (long) 2147483648.0 equals to 2147483647, so we explicitely convert it to 0x80000000
+ * on other known platforms (long) 2147483648.0 equals to -2147483648
+ */
+  return ((val) < 0) ? (((val) < -2147483647.0) ? 0x80000000UL : (unsigned long) -((long) -(val))) : (unsigned long) (val);
+}
+
 /*--------------------------------------------------------------------*/
 /* checkConstantRange - check if constant fits in numeric range of    */
 /* var type in comparisons and assignments                            */
@@ -1067,6 +1090,7 @@
     {
       SPEC_NOUN (val->type) = V_INT;
       SPEC_LONGLONG (val->type) = 1;
+      werror (W_LONGLONG_LITERAL, p); 
       p2 += 2;
       if (strchr (p2, 'l') || strchr (p2, 'L'))
         werror (E_INTEGERSUFFIX, p); 
@@ -1078,7 +1102,10 @@
       SPEC_LONG (val->type) = 1;
       p2++;
       if (strchr (p2, 'l') || strchr (p2, 'L'))
-        werror (E_INTEGERSUFFIX, p);  
+        werror (E_INTEGERSUFFIX, p);
+      /* c89 allows unsigned long without explicit u suffix */
+      if (!options.std_c99 && dval > 0x7fffffff && dval <= 0xffffffff)
+         SPEC_USIGN (val->type) = 1;
     }
   else
     {
@@ -1088,10 +1115,13 @@
             {                   /* check if we have to promote to int */
               SPEC_NOUN (val->type) = V_INT;
             }
-          if (dval < -2147483648.0) /* check if we have to promote to long long int */
-            SPEC_LONGLONG (val->type) = 1;
-          else if (dval < -32768) /* check if we have to promote to long int */              
+          if (dval < -32768) /* check if we have to promote to long int */              
             SPEC_LONG (val->type) = 1;
+          if (dval < -2147483648.0) /* check if we have to promote to long long int */
+            {
+              SPEC_LONGLONG (val->type) = 1;
+              werror (W_LONGLONG_LITERAL, p); 
+            }
         }
       else
         {                       /* >=0 */
@@ -1121,26 +1151,24 @@
               else
                 {
                   SPEC_LONG (val->type) = 1;
-                  if (dval > 0x7fffffff)
-                    SPEC_USIGN (val->type) = 1;
                 }
             }
           if (dval > 0xffffffff && SPEC_USIGN (val->type) && !SPEC_LONGLONG (val->type))
             {
-              SPEC_LONG (val->type) = 0;
               SPEC_LONGLONG (val->type) = 1;
+              werror (W_LONGLONG_LITERAL, p); 
             }
           else if (dval > 0x7fffffff && !SPEC_USIGN (val->type))
             {
-              SPEC_LONGLONG (val->type) = 1;
-#if defined(_MSC_VER) && _MSC_VER <= 1600
-              /* Microsoft C compiler doesn't support
-               * hexadecimal floating-point literals */
-              if (dval > (double)0x7fffffffffffffffll)
-#else
-              if (dval > 0x7fffffffffffffffp0)
-#endif
+              /* integral constants can be unsigned long. */
+              /* c89 also allows unsigned long decimal constants without explicit suffix */
+              if (is_integral || (!options.std_c99 && dval <= 0xffffffff))
                 SPEC_USIGN (val->type) = 1;
+              else
+                {
+                  SPEC_LONGLONG (val->type) = 1;
+                  werror (W_LONGLONG_LITERAL, p); 
+                }
             }
         }
     }
@@ -1151,7 +1179,7 @@
       dval = -2147483648.0;
       werror (W_INVALID_INT_CONST, s, dval);
     }
-  if (dval > 2147483647.0 && !SPEC_USIGN (val->type))
+  if (dval > 2147483648.0 && !SPEC_USIGN (val->type))
     {
       dval = 2147483647.0;
       werror (W_INVALID_INT_CONST, s, dval);
@@ -1188,6 +1216,9 @@
   return val;
 }
 
+/*-----------------------------------------------------------------*/
+/* constCharVal - converts a CHAR constant to value                */
+/*-----------------------------------------------------------------*/
 value *
 constCharVal (unsigned char v)
 {
@@ -1212,6 +1243,25 @@
   return val;
 }
 
+/*-----------------------------------------------------------------*/
+/* constBoolVal - converts a BOOL constant to value                */
+/*-----------------------------------------------------------------*/
+value *
+constBoolVal (bool v)
+{
+  value *val = newValue ();     /* alloc space for value   */
+
+  val->type = val->etype = newLink (SPECIFIER); /* create the specifier */
+  SPEC_SCLS (val->type) = S_LITERAL;
+  SPEC_CONST (val->type) = 1;
+
+  SPEC_NOUN (val->type) = (bit) ? V_BIT : V_BOOL;
+
+  SPEC_CVAL (val->type).v_uint = (unsigned int) v;
+
+  return val;
+}
+
 /*------------------------------------------------------------------*/
 /* strVal - converts a string constant to a value                   */
 /*------------------------------------------------------------------*/
@@ -1230,8 +1280,7 @@
   SPEC_SCLS (val->etype) = S_LITERAL;
   SPEC_CONST (val->etype) = 1;
 
-  SPEC_CVAL (val->etype).v_char = Safe_alloc (strlen (s) + 1);
-  DCL_ELEM (val->type) = copyStr (SPEC_CVAL (val->etype).v_char, s);
+  SPEC_CVAL (val->etype).v_char = copyStr (s, &DCL_ELEM (val->type));
 
   return val;
 }
@@ -1525,6 +1574,87 @@
   return 0;
 }
 
+/*------------------------------------------------------------------*/
+/* byteOfVal - extract a byte of a value                            */
+/*             offset = 0 (LSB) ... n-1 (MSB)                       */
+/*             higher offsets of signed ints will be sign extended, */
+/*             other types will be extended with zero padding       */
+/*------------------------------------------------------------------*/
+unsigned char
+byteOfVal (value * val, int offset)
+{
+  unsigned char *p;
+  int shift = 8*offset;
+
+  if (!val)
+    return 0;
+
+  if (val->etype && SPEC_SCLS (val->etype) != S_LITERAL)
+    {
+      werror (E_CONST_EXPECTED, val->name);
+      return 0;
+    }
+ 
+  /* if it is not a specifier then we can assume that */
+  /* it will be an unsigned long                      */
+  /* 2012-Apr-30 EEP - Why is this true?              */
+  if (!IS_SPEC (val->type))
+    return offset < 4 ? (SPEC_CVAL (val->etype).v_ulong >> shift) & 0xff : 0;
+
+  if (SPEC_NOUN (val->etype) == V_FLOAT)
+    {
+      float f = (float)SPEC_CVAL (val->etype).v_float;
+
+      if (offset > 3)
+        return 0;
+      p = (unsigned char *)&f;
+#ifdef WORDS_BIGENDIAN
+      p += 3 - offset;
+#else
+      p += offset;
+#endif
+      return *p;      
+    }
+
+  if (SPEC_NOUN (val->etype) == V_FIXED16X16)
+    return offset < 4 ? (SPEC_CVAL (val->etype).v_fixed16x16 >> shift) & 0xff : 0;
+
+  if (SPEC_LONG (val->etype))
+    {
+      if (SPEC_USIGN (val->etype))
+        return offset < 4 ? (SPEC_CVAL (val->etype).v_ulong >> shift) & 0xff : 0;
+      else
+        return offset < 4 ? (SPEC_CVAL (val->etype).v_long >> shift) & 0xff : 
+               (SPEC_CVAL (val->etype).v_long < 0 ? 0xff : 0);
+    }
+
+  if (SPEC_NOUN (val->etype) == V_INT)
+    {
+      if (SPEC_USIGN (val->etype))
+        return offset < 2 ? (SPEC_CVAL (val->etype).v_uint >> shift) & 0xff : 0;
+      else
+        return offset < 2 ? (SPEC_CVAL (val->etype).v_int >> shift) & 0xff :
+               (SPEC_CVAL (val->etype).v_int < 0 ? 0xff : 0);
+    }
+
+  if (SPEC_NOUN (val->etype) == V_CHAR)
+    {
+      if (SPEC_USIGN (val->etype))
+        return offset < 1 ? SPEC_CVAL (val->etype).v_uint & 0xff : 0;
+      else
+        return offset < 1 ? SPEC_CVAL (val->etype).v_int & 0xff :
+               (SPEC_CVAL (val->etype).v_int < 0 ? 0xff : 0);
+    }
+
+  if (IS_BOOL (val->etype) || IS_BITVAR (val->etype))
+    return offset < 2 ? (SPEC_CVAL (val->etype).v_uint >> shift) & 0xff : 0;
+
+  /* we are lost ! */
+  werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "byteOfVal: unknown value");
+  return 0;
+}
+
+
 /*-----------------------------------------------------------------*/
 /* doubleFromFixed16x16 - convert a fixed16x16 to double           */
 /*-----------------------------------------------------------------*/
@@ -1592,30 +1722,27 @@
     SPEC_CVAL (val->etype).v_float = -1.0 * SPEC_CVAL (val->etype).v_float;
   else if (SPEC_NOUN (val->etype) == V_FIXED16X16)
     SPEC_CVAL (val->etype).v_fixed16x16 = (TYPE_TARGET_ULONG) - ((long) SPEC_CVAL (val->etype).v_fixed16x16);
+  else if (SPEC_LONG (val->etype))
+    {
+      if (SPEC_USIGN (val->etype))
+        SPEC_CVAL (val->etype).v_ulong = 0 - SPEC_CVAL (val->etype).v_ulong;
+      else
+        SPEC_CVAL (val->etype).v_long = -SPEC_CVAL (val->etype).v_long;
+    }
   else
     {
-      if (SPEC_LONG (val->etype))
-        {
-          if (SPEC_USIGN (val->etype))
-            SPEC_CVAL (val->etype).v_ulong = 0 - SPEC_CVAL (val->etype).v_ulong;
-          else
-            SPEC_CVAL (val->etype).v_long = -SPEC_CVAL (val->etype).v_long;
-        }
+      if (SPEC_USIGN (val->etype))
+        SPEC_CVAL (val->etype).v_uint = 0 - SPEC_CVAL (val->etype).v_uint;
       else
-        {
-          if (SPEC_USIGN (val->etype))
-            SPEC_CVAL (val->etype).v_uint = 0 - SPEC_CVAL (val->etype).v_uint;
-          else
-            SPEC_CVAL (val->etype).v_int = -SPEC_CVAL (val->etype).v_int;
+        SPEC_CVAL (val->etype).v_int = -SPEC_CVAL (val->etype).v_int;
 
-          if (SPEC_NOUN (val->etype) == V_CHAR)
-            {
-              /* promote to 'signed int', cheapestVal() might reduce it again */
-              SPEC_USIGN (val->etype) = 0;
-              SPEC_NOUN (val->etype) = V_INT;
-            }
-          return cheapestVal (val);
+      if (SPEC_NOUN (val->etype) == V_CHAR)
+        {
+          /* promote to 'signed int', cheapestVal() might reduce it again */
+          SPEC_USIGN (val->etype) = 0;
+          SPEC_NOUN (val->etype) = V_INT;
         }
+      return cheapestVal (val);
     }
   return val;
 }
@@ -1922,7 +2049,7 @@
 }
 
 /*------------------------------------------------------------------*/
-/* valCompare- Compares two literal                                 */
+/* valCompare - Compares two literal                                */
 /*------------------------------------------------------------------*/
 value *
 valCompare (value * lval, value * rval, int ctype)
@@ -2117,7 +2244,6 @@
       break;
     }
 
-
   return val;
 }
 
@@ -2241,9 +2367,10 @@
               // structure designator for array, boo.
               werrorfl (ilist->filename, ilist->lineno, E_BAD_DESIGNATOR);
             }
-          else {
-            i = ilist->designation->designator.elemno;
-          }
+          else
+            {
+              i = ilist->designation->designator.elemno;
+            }
         }
       if (size <= i)
         {
diff -Nru sdcc-3.1.0+dfsg/src/SDCCval.h sdcc-3.2.0+dfsg/src/SDCCval.h
--- sdcc-3.1.0+dfsg/src/SDCCval.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/SDCCval.h	2012-06-10 12:32:06.000000000 +0000
@@ -26,18 +26,6 @@
 #include "SDCCsymt.h"
 
 
-/* double to unsigned long conversion */
-/*
- * See ISO/IEC 9899, chapter 6.3.1.4 Real floating and integer:
- * If the value of the integral part cannot be represented by the integer type, the behavior is undefined.
- * This shows up on Mac OS X i386 platform which useus SSE unit instead of the x87 FPU for floating-point operations
- */
-/*
- * on Mac OS X ppc (long) 2147483648.0 equals to 2147483647, so we explicitely convert it to 0x80000000
- * on other known platforms (long) 2147483648.0 equals to -2147483648
- */
-#define double2ul(val)  (((val) < 0) ? (((val) < -2147483647.0) ? 0x80000000UL : (unsigned long) -((long) -(val))) : (unsigned long) (val))
-
 /* value wrapper */
 typedef struct value
 {
@@ -96,8 +84,8 @@
     char *filename;
     union
       {
-	struct symbol *tag;             /* tag part of structure          */
-	int elemno;                     /* array element (constant expr)  */
+        struct symbol *tag;             /* tag part of structure          */
+        int elemno;                     /* array element (constant expr)  */
       }
     designator;
 
@@ -121,6 +109,7 @@
 value *newValue (void);
 value *constVal (const char *);
 value *constCharVal (unsigned char);
+value *constBoolVal (bool v);
 value *reverseVal (value *);
 value *reverseValWithType (value *);
 value *copyValue (value *);
@@ -175,4 +164,6 @@
 value *valForCastArr (struct ast *, sym_link *);
 bool convertIListToConstList (initList * src, literalList ** lList, int size);
 literalList *copyLiteralList (literalList * src);
+unsigned long double2ul (double val);
+unsigned char byteOfVal (value *, int);
 #endif
diff -Nru sdcc-3.1.0+dfsg/src/avr/gen.c sdcc-3.2.0+dfsg/src/avr/gen.c
--- sdcc-3.1.0+dfsg/src/avr/gen.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/avr/gen.c	2012-03-30 20:01:27.000000000 +0000
@@ -1,7 +1,7 @@
 /*-------------------------------------------------------------------------
   gen.c - source file for code generation for ATMEL AVR
 
-  Written By -  Sandeep Dutta . sandeep.dutta@usa.net (2000)
+  Copyright (C) 2000, Sandeep Dutta . sandeep.dutta@usa.net
 
   This program is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by the
@@ -16,12 +16,6 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-  In other words, you are welcome to use, share and improve this program.
-  You are forbidden to forbid anyone else to use, share and improve
-  what you give them.   Help stamp out software-hoarding!
-
-
 -------------------------------------------------------------------------*/
 
 #include <stdio.h>
@@ -234,30 +228,22 @@
 emitcode (char *inst, char *fmt, ...)
 {
         va_list ap;
-        char lb[INITIAL_INLINEASM];
-        char *lbp = lb;
+        const char *lbp, *lb;
 
         va_start (ap, fmt);
 
-        if (inst && *inst) {
-                if (fmt && *fmt)
-                        sprintf (lb, "%s\t", inst);
-                else
-                        sprintf (lb, "%s", inst);
-                vsprintf (lb + (strlen (lb)), fmt, ap);
-        }
-        else
-                vsprintf (lb, fmt, ap);
+        lbp = lb = format_opcode (inst, va_list ap);
 
         while (isspace ((unsigned char)*lbp))
                 lbp++;
 
         if (lbp && *lbp)
-                lineCurr = (lineCurr ?
-                            connectLine (lineCurr, newLineNode (lb)) :
-                            (lineHead = newLineNode (lb)));
-        lineCurr->isInline = _G.inLine;
-        lineCurr->isDebug = _G.debugLine;
+          {
+            lineCurr = (lineCurr ? connectLine (lineCurr, newLineNode (lb)) : (lineHead = newLineNode (lb)));
+            lineCurr->isInline = _G.inLine;
+            lineCurr->isDebug = _G.debugLine;
+          }
+
         va_end (ap);
 }
 
@@ -2986,12 +2972,15 @@
           break;
         }
     }
-    if (bp1 != bp)
-      emitcode (bp1, "");
+  if (bp1 != bp)
+    emitcode (bp1, "");
+
+  Safe_free (buffer);
 
-    Safe_free (buffer);
+  /* consumed; we can free it here */
+  dbuf_free (IC_INLINE (ic));
 
-    _G.inLine -= (!options.asmpeep);
+  _G.inLine -= (!options.asmpeep);
 }
 
 /*-----------------------------------------------------------------*/
diff -Nru sdcc-3.1.0+dfsg/src/cdbFile.c sdcc-3.2.0+dfsg/src/cdbFile.c
--- sdcc-3.1.0+dfsg/src/cdbFile.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/cdbFile.c	2012-03-18 18:01:25.000000000 +0000
@@ -479,7 +479,7 @@
             case IPOINTER: fprintf (cdbFilePtr, "DI,"); break;
             case PPOINTER: fprintf (cdbFilePtr, "DP,"); break;
             case EEPPOINTER: fprintf (cdbFilePtr, "DA,"); break;
-            case ARRAY: fprintf (cdbFilePtr, "DA%d,", DCL_ELEM (type)); break;
+            case ARRAY: fprintf (cdbFilePtr, "DA%ud,", (unsigned int) DCL_ELEM (type)); break;
             default: break;
             }
         }
diff -Nru sdcc-3.1.0+dfsg/src/common.h sdcc-3.2.0+dfsg/src/common.h
--- sdcc-3.1.0+dfsg/src/common.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/common.h	2012-04-25 16:05:36.000000000 +0000
@@ -1,20 +1,22 @@
-/*
- *  common.h - include common header files
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
+/*-------------------------------------------------------------------------
+  common.h - include common header files
+
+  Copyright (C) 2000, KEvin Vigor
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-------------------------------------------------------------------------*/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,6 +32,12 @@
 #endif
 #endif
 
+/* C++ incompatible heared files */
+#ifdef __cplusplus
+/* TODO: the extern "C" should be moved to each header file */
+extern "C" {
+#endif
+
 #include "SDCCglobl.h"
 #include "SDCCmem.h"
 #include "SDCCast.h"
@@ -52,9 +60,17 @@
 #include "SDCCdebug.h"
 #include "SDCCutil.h"
 #include "SDCCasm.h"
+#include "SDCCsystem.h"
 
 #include "port.h"
 
 #include "newalloc.h"
 
+#ifdef __cplusplus
+}
+#endif
+
+/* C++ compatible heared files */
+#include "SDCCgen.h"
+
 #endif
diff -Nru sdcc-3.1.0+dfsg/src/ds390/ds390.vcxproj sdcc-3.2.0+dfsg/src/ds390/ds390.vcxproj
--- sdcc-3.1.0+dfsg/src/ds390/ds390.vcxproj	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/ds390/ds390.vcxproj	2012-03-18 13:40:40.000000000 +0000
@@ -137,10 +137,12 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="peeph.def">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f ../SDCCpeeph.awk %(FullPath) &gt;peeph.rul</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f ../SDCCpeeph.awk %(FullPath) &gt;peeph.rul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f ../SDCCpeeph.awk %(Identity) &gt;peeph.rul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f ../SDCCpeeph.awk %(Identity) &gt;peeph.rul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">peeph.rul;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">peeph.rul;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Peephole Rule: peeph.rul</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Peephole Rule: peeph.rul</Message>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff -Nru sdcc-3.1.0+dfsg/src/ds390/gen.c sdcc-3.2.0+dfsg/src/ds390/gen.c
--- sdcc-3.1.0+dfsg/src/ds390/gen.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/ds390/gen.c	2012-06-07 17:36:23.000000000 +0000
@@ -1,10 +1,11 @@
 /*-------------------------------------------------------------------------
   gen.c - source file for code generation for DS80C390
 
-  Written By -  Sandeep Dutta . sandeep.dutta@usa.net (1998)
-         and -  Jean-Louis VERN.jlvern@writeme.com (1999)
-  Bug Fixes  -  Wojciech Stryjewski  wstryj1@tiger.lsu.edu (1999 v2.1.9a)
-  DS390 adaptation by Kevin Vigor <kevin@vigor.nu>
+  Copyright (C) 1998, Sandeep Dutta . sandeep.dutta@usa.net
+  Copyright (C) 1999, Jean-Louis VERN.jlvern@writeme.com
+  Bug Fixes - Wojciech Stryjewski  wstryj1@tiger.lsu.edu (1999 v2.1.9a)
+  DS390 adaptation:
+  Copyright (C) 2000, Kevin Vigor <kevin@vigor.nu>
 
   This program is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by the
@@ -15,14 +16,6 @@
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-  In other words, you are welcome to use, share and improve this program.
-  You are forbidden to forbid anyone else to use, share and improve
-  what you give them.   Help stamp out software-hoarding!
 -------------------------------------------------------------------------*/
 
 //#define D(x)
@@ -32,8 +25,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include "SDCCglobl.h"
-#include "newalloc.h"
 
 #include "common.h"
 #include "main.h"
@@ -131,25 +122,23 @@
   {
     struct
     {
-      short r0InB:2;            //2 so we can see it overflow
-      short r1InB:2;            //2 so we can see it overflow
-      short OpInB:2;            //2 so we can see it overflow
+      short r0InB: 2;           //2 so we can see it overflow
+      short r1InB: 2;           //2 so we can see it overflow
+      short OpInB: 2;           //2 so we can see it overflow
     } bs;
     short BInUse;
   } bu;
   short accInUse;
-  short inLine;
-  short debugLine;
   short nRegsSaved;
   short dptrInUse;
   short dptr1InUse;
   set *sendSet;
-  iCode *current_iCode;
   symbol *currentFunc;
 }
 _G;
 
-static char *rb1regs[] = {
+static char *rb1regs[] =
+{
   "b1_0", "b1_1", "b1_2", "b1_3", "b1_4", "b1_5", "b1_6", "b1_7",
   "b0", "b1", "b2", "b3", "b4", "b5", "b6", "b7"
 };
@@ -170,16 +159,13 @@
  * result bytes from operands in far space via DPTR2. */
 #define DP2_RESULT_REG  "_ap"
 
-static lineNode *lineHead = NULL;
-static lineNode *lineCurr = NULL;
-
 static unsigned char SLMask[] = { 0xFF, 0xFE, 0xFC, 0xF8, 0xF0,
-  0xE0, 0xC0, 0x80, 0x00
-};
+                                  0xE0, 0xC0, 0x80, 0x00
+                                };
 
 static unsigned char SRMask[] = { 0xFF, 0x7F, 0x3F, 0x1F, 0x0F,
-  0x07, 0x03, 0x01, 0x00
-};
+                                  0x07, 0x03, 0x01, 0x00
+                                };
 
 #define LSB     0
 #define MSB16   1
@@ -190,7 +176,7 @@
                             {                                                   \
                               symbol *lbl = newiTempLabel (NULL);               \
                               emitcode ("setb", "F1");                          \
-                              emitcode ("jbc", "EA,!tlabel", lbl->key + 100);   \
+                              emitcode ("jbc", "EA,!tlabel", labelKey2num (lbl->key)); \
                               emitcode ("clr", "F1");                           \
                               emitLabel (lbl);                                  \
                             }                                                   \
@@ -207,74 +193,15 @@
 static int _lazyDPS = 0;        /* if non-zero, we are doing lazy evaluation of DPS changes. */
 
 /*-----------------------------------------------------------------*/
-/* emitcode - writes the code into a file : for now it is simple   */
-/*-----------------------------------------------------------------*/
-static void
-emitcode (const char *inst, const char *fmt, ...)
-{
-  va_list ap;
-  struct dbuf_s dbuf;
-  const char *lbp, *lb;
-
-  dbuf_init (&dbuf, INITIAL_INLINEASM);
-
-  va_start (ap, fmt);
-
-  if (inst && *inst)
-    {
-      dbuf_append_str (&dbuf, inst);
-
-      if (fmt && *fmt)
-        {
-          dbuf_append_char (&dbuf, '\t');
-          dbuf_tvprintf (&dbuf, fmt, ap);
-        }
-    }
-  else
-    {
-      dbuf_tvprintf (&dbuf, fmt, ap);
-    }
-
-  lbp = lb = dbuf_c_str (&dbuf);
-
-  while (isspace ((unsigned char) *lbp))
-    {
-      lbp++;
-    }
-
-  if (lbp)
-    {
-      lineCurr = (lineCurr ? connectLine (lineCurr, newLineNode (lb)) : (lineHead = newLineNode (lb)));
-
-      lineCurr->isInline = _G.inLine;
-      lineCurr->isDebug = _G.debugLine;
-      lineCurr->ic = _G.current_iCode;
-      lineCurr->aln = ds390newAsmLineNode (_currentDPS);
-      lineCurr->isComment = (*lbp == ';');
-    }
-
-  va_end (ap);
-
-  dbuf_destroy (&dbuf);
-}
-
-static void
-emitLabel (symbol * tlbl)
-{
-  emitcode ("", "!tlabeldef", tlbl->key + 100);
-  lineCurr->isLabel = 1;
-}
-
-/*-----------------------------------------------------------------*/
 /* ds390_emitDebuggerSymbol - associate the current code location  */
 /*   with a debugger symbol                                        */
 /*-----------------------------------------------------------------*/
 void
 ds390_emitDebuggerSymbol (const char *debugSym)
 {
-  _G.debugLine = 1;
+  genLine.lineElement.isDebug = 1;
   emitcode ("", "%s ==.", debugSym);
-  _G.debugLine = 0;
+  genLine.lineElement.isDebug = 0;
 }
 
 /*-----------------------------------------------------------------*/
@@ -314,7 +241,7 @@
 /* emitpush - push something on internal stack                     */
 /*-----------------------------------------------------------------*/
 static void
-emitpush (const char * arg)
+emitpush (const char *arg)
 {
   char buf[] = "ar?";
 
@@ -333,7 +260,7 @@
       arg = "acc";
     }
   else if (EQ (arg, "r0") || EQ (arg, "r1") || EQ (arg, "r2") || EQ (arg, "r3") ||
-           EQ (arg, "r4") || EQ (arg, "r5") || EQ (arg, "r6") || EQ (arg, "r7") )
+           EQ (arg, "r4") || EQ (arg, "r5") || EQ (arg, "r6") || EQ (arg, "r7"))
     {
       buf[2] = arg[1];
       arg = buf;
@@ -345,7 +272,7 @@
 /* emitpop - pop something from internal stack                     */
 /*-----------------------------------------------------------------*/
 static void
-emitpop (const char * arg)
+emitpop (const char *arg)
 {
   if (!arg)
     emitcode ("dec", "sp");
@@ -806,7 +733,8 @@
        * far data space.
        */
       if (stack_val < 0 && stack_val > -5)
-        {                       /* between -5 & -1 */
+        {
+          /* between -5 & -1 */
           if (options.model == MODEL_FLAT24)
             {
               emitcode ("mov", "%s,#!constbyte", dpx, (options.stack_loc >> 16) & 0xff);
@@ -1233,7 +1161,8 @@
         }
 
       if (sym->dptr)
-        {                       /* has been allocated to a DPTRn */
+        {
+          /* has been allocated to a DPTRn */
           sym->aop = op->aop = aop = newAsmop (AOP_DPTRn);
           aop->size = getSize (sym->type);
           aop->aopu.dptr = sym->dptr;
@@ -1333,53 +1262,53 @@
       break;
 
     case AOP_STK:
-      {
-        int sz = aop->size;
-        int stk = aop->aopu.aop_stk + aop->size;
-        bitVectUnSetBit (ic->rUsed, R0_IDX);
-        bitVectUnSetBit (ic->rUsed, R1_IDX);
+    {
+      int sz = aop->size;
+      int stk = aop->aopu.aop_stk + aop->size;
+      bitVectUnSetBit (ic->rUsed, R0_IDX);
+      bitVectUnSetBit (ic->rUsed, R1_IDX);
 
-        getFreePtr (ic, &aop, FALSE);
+      getFreePtr (ic, &aop, FALSE);
 
-        if (options.stack10bit)
-          {
-            /* I'm not sure what to do here yet... */
-            /* #STUB */
-            fprintf (stderr, "*** Warning: probably generating bad code for " "10 bit stack mode.\n");
-          }
+      if (options.stack10bit)
+        {
+          /* I'm not sure what to do here yet... */
+          /* #STUB */
+          fprintf (stderr, "*** Warning: probably generating bad code for " "10 bit stack mode.\n");
+        }
 
-        if (stk)
-          {
-            emitcode ("mov", "a,_bp");
-            emitcode ("add", "a,#!constbyte", ((char) stk) & 0xff);
-            emitcode ("mov", "%s,a", aop->aopu.aop_ptr->name);
-          }
-        else
-          {
-            emitcode ("mov", "%s,_bp", aop->aopu.aop_ptr->name);
-          }
+      if (stk)
+        {
+          emitcode ("mov", "a,_bp");
+          emitcode ("add", "a,#!constbyte", ((char) stk) & 0xff);
+          emitcode ("mov", "%s,a", aop->aopu.aop_ptr->name);
+        }
+      else
+        {
+          emitcode ("mov", "%s,_bp", aop->aopu.aop_ptr->name);
+        }
 
-        while (sz--)
-          {
-            emitpop ("acc");
-            emitcode ("mov", "@%s,a", aop->aopu.aop_ptr->name);
-            if (!sz)
-              break;
-            emitcode ("dec", "%s", aop->aopu.aop_ptr->name);
-          }
-        op->aop = aop;
-        freeAsmop (op, NULL, ic, TRUE);
-        if (_G.r1Pushed)
-          {
-            emitpop ("ar1");
-            _G.r1Pushed--;
-          }
-        if (_G.r0Pushed)
-          {
-            emitpop ("ar0");
-            _G.r0Pushed--;
-          }
-      }
+      while (sz--)
+        {
+          emitpop ("acc");
+          emitcode ("mov", "@%s,a", aop->aopu.aop_ptr->name);
+          if (!sz)
+            break;
+          emitcode ("dec", "%s", aop->aopu.aop_ptr->name);
+        }
+      op->aop = aop;
+      freeAsmop (op, NULL, ic, TRUE);
+      if (_G.r1Pushed)
+        {
+          emitpop ("ar1");
+          _G.r1Pushed--;
+        }
+      if (_G.r0Pushed)
+        {
+          emitpop ("ar0");
+          _G.r0Pushed--;
+        }
+    }
     case AOP_DPTR2:
       if (_G.dptr1InUse)
         {
@@ -1513,7 +1442,7 @@
   asmop *aop = AOP (oper);
   static struct dbuf_s dbuf = { 0 };
 
-  if (dbuf_is_initialized(&dbuf))
+  if (dbuf_is_initialized (&dbuf))
     {
       /* reuse the dynamically allocated buffer */
       dbuf_set_length (&dbuf, 0);
@@ -1671,9 +1600,9 @@
           break;
 
         case AOP_DIR:
-          if (SPEC_SCLS (getSpec (operandType (oper))) == S_SFR && offset)
+          if ((SPEC_SCLS (getSpec (operandType (oper))) == S_SFR) && (aop->size > 1))
             {
-              dbuf_printf (&dbuf, "(%s >> %d)", aop->aopu.aop_dir, offset * 8);
+              dbuf_printf (&dbuf, "((%s >> %d) & 0xFF)", aop->aopu.aop_dir, offset * 8);
             }
           else if (offset)
             {
@@ -1701,11 +1630,11 @@
           break;
 
         case AOP_LIT:
-            {
-              int size = 1 + (bit16 ? (options.model == MODEL_FLAT24 ? 2 : 1) : 0);
-              dbuf_append_str (&dbuf, aopLiteralLong (aop->aopu.aop_lit, offset, size));
-            }
-          break;
+        {
+          int size = 1 + (bit16 ? (options.model == MODEL_FLAT24 ? 2 : 1) : 0);
+          dbuf_append_str (&dbuf, aopLiteralLong (aop->aopu.aop_lit, offset, size));
+        }
+        break;
 
         case AOP_STR:
           aop->coff = offset;
@@ -1780,6 +1709,18 @@
   bool accuse = FALSE;
   asmop *aop = AOP (result);
   const char *d = NULL;
+  static struct dbuf_s dbuf = { 0 };
+
+  if (dbuf_is_initialized (&dbuf))
+    {
+      /* reuse the dynamically allocated buffer */
+      dbuf_set_length (&dbuf, 0);
+    }
+  else
+    {
+      /* first time: initialize the dynamically allocated buffer */
+      dbuf_init (&dbuf, 128);
+    }
 
   if (aop->size && offset > (aop->size - 1))
     {
@@ -1797,33 +1738,27 @@
       break;
 
     case AOP_DIR:
-      {
-        struct dbuf_s dbuf;
-
-        dbuf_init (&dbuf, 128);
-        if (SPEC_SCLS (getSpec (operandType (result))) == S_SFR && offset)
-          {
-            dbuf_printf (&dbuf, "(%s >> %d)", aop->aopu.aop_dir, offset * 8);
-          }
-        else if (offset)
-          {
-            dbuf_printf (&dbuf, "(%s + %d)", aop->aopu.aop_dir, offset);
-          }
-        else
-          {
-            dbuf_append_str (&dbuf, aop->aopu.aop_dir);
-          }
+      if ((SPEC_SCLS (getSpec (operandType (result))) == S_SFR) && (aop->size > 1))
+        {
+          dbuf_printf (&dbuf, "((%s >> %d) & 0xFF)", aop->aopu.aop_dir, offset * 8);
+        }
+      else if (offset)
+        {
+          dbuf_printf (&dbuf, "(%s + %d)", aop->aopu.aop_dir, offset);
+        }
+      else
+        {
+          dbuf_append_str (&dbuf, aop->aopu.aop_dir);
+        }
 
-        if (!EQ (dbuf_c_str (&dbuf), s) || bvolatile)
-          {
-            emitcode ("mov", "%s,%s", dbuf_c_str (&dbuf), s);
-          }
-        if (EQ (dbuf_c_str (&dbuf), "acc"))
-          {
-            accuse = TRUE;
-          }
-        dbuf_destroy (&dbuf);
-      }
+      if (!EQ (dbuf_c_str (&dbuf), s) || bvolatile)
+        {
+          emitcode ("mov", "%s,%s", dbuf_c_str (&dbuf), s);
+        }
+      if (EQ (dbuf_c_str (&dbuf), "acc"))
+        {
+          accuse = TRUE;
+        }
       break;
 
     case AOP_REG:
@@ -1831,7 +1766,7 @@
         {
           if (*s == '@' ||
               EQ (s, "r0") || EQ (s, "r1") || EQ (s, "r2") || EQ (s, "r3") ||
-              EQ (s, "r4") || EQ (s, "r5") || EQ (s, "r6") || EQ (s, "r7") )
+              EQ (s, "r4") || EQ (s, "r5") || EQ (s, "r6") || EQ (s, "r7"))
             {
               emitcode ("mov", "%s,%s", aop->aopu.aop_reg[offset]->dname, s);
             }
@@ -1911,14 +1846,10 @@
           emitcode ("mov", "@%s,a", aop->aopu.aop_ptr->name);
         }
       else if (EQ (s, "r0") || EQ (s, "r1") || EQ (s, "r2") || EQ (s, "r3") ||
-               EQ (s, "r4") || EQ (s, "r5") || EQ (s, "r6") || EQ (s, "r7") )
+               EQ (s, "r4") || EQ (s, "r5") || EQ (s, "r6") || EQ (s, "r7"))
         {
-          struct dbuf_s dbuf;
-
-          dbuf_init (&dbuf, 128);
           dbuf_printf (&dbuf, "a%s", s);
           emitcode ("mov", "@%s,%s", aop->aopu.aop_ptr->name, dbuf_c_str (&dbuf));
-          dbuf_destroy (&dbuf);
         }
       else
         {
@@ -2228,7 +2159,7 @@
         }
       MOVA (aopGet (oper, offset++, FALSE, FALSE, NULL));
       if (IS_FLOAT (type))
-        emitcode ("anl", "a,#0x7F");  //clear sign bit
+        emitcode ("anl", "a,#0x7F");    //clear sign bit
       emitcode ("orl", "a,b");
       popB (pushedB);
     }
@@ -2332,7 +2263,7 @@
 
   /* set C, if a == 0 */
   tlbl = newiTempLabel (NULL);
-  emitcode ("cjne", "a,#0x01,!tlabel", tlbl->key + 100);
+  emitcode ("cjne", "a,#0x01,!tlabel", labelKey2num (tlbl->key));
   emitLabel (tlbl);
   outBitC (IC_RESULT (ic));
 
@@ -2379,12 +2310,12 @@
       if ((AOP_TYPE (IC_LEFT (ic)) == AOP_ACC && offset == 0) ||
           AOP_TYPE (IC_LEFT (ic)) == AOP_REG || IS_AOP_PREG (IC_LEFT (ic)))
         {
-          emitcode ("cjne", "%s,#0xFF,!tlabel", l, tlbl->key + 100);
+          emitcode ("cjne", "%s,#0xFF,!tlabel", l, labelKey2num (tlbl->key));
         }
       else
         {
           MOVA (l);
-          emitcode ("cjne", "a,#0xFF,!tlabel", tlbl->key + 100);
+          emitcode ("cjne", "a,#0xFF,!tlabel", labelKey2num (tlbl->key));
         }
       emitLabel (tlbl);
       outBitC (IC_RESULT (ic));
@@ -3169,7 +3100,8 @@
           size = getSize (operandType (IC_LEFT (sic)));
           D (emitcode (";", "genSend argreg = %d, size = %d ", sic->argreg, size));
           if (sendCount == 0)
-            {                   /* first parameter */
+            {
+              /* first parameter */
               // we know that dpl(hxb) is the result, so
               rb1_count = 0;
               _startLazyDPSEvaluation ();
@@ -3195,7 +3127,8 @@
               rb1_count = 0;
             }
           else
-            {                   /* if more parameter in registers */
+            {
+              /* if more parameter in registers */
               aopOp (IC_LEFT (sic), sic, FALSE, TRUE);
               while (size--)
                 {
@@ -3287,7 +3220,8 @@
   if (_G.sendSet)
     {
       if (IFFUNC_ISREENT (dtype))
-        {                       /* need to reverse the send set */
+        {
+          /* need to reverse the send set */
           genSend (reverseSet (_G.sendSet));
         }
       else
@@ -3322,12 +3256,10 @@
     }
 
   /* if we need assign a result value */
-  if ((IS_ITEMP (IC_RESULT (ic))               &&
+  if ((IS_ITEMP (IC_RESULT (ic)) &&
        !IS_BIT (OP_SYM_ETYPE (IC_RESULT (ic))) &&
-       (OP_SYMBOL (IC_RESULT (ic))->nRegs   ||
-        OP_SYMBOL (IC_RESULT (ic))->accuse  ||
-        OP_SYMBOL (IC_RESULT (ic))->spildir   )  ) ||
-      IS_TRUE_SYMOP (IC_RESULT (ic)))
+       (OP_SYMBOL (IC_RESULT (ic))->nRegs ||
+        OP_SYMBOL (IC_RESULT (ic))->accuse || OP_SYMBOL (IC_RESULT (ic))->spildir)) || IS_TRUE_SYMOP (IC_RESULT (ic)))
     {
       if (isOperandInFarSpace (IC_RESULT (ic)) && getSize (operandType (IC_RESULT (ic))) <= 2)
         {
@@ -3467,7 +3399,6 @@
 genPcall (iCode * ic)
 {
   sym_link *dtype;
-  sym_link *etype;
   symbol *rlbl = newiTempLabel (NULL);
   bool restoreBank = FALSE;
   bool resultInF0 = FALSE;
@@ -3475,7 +3406,6 @@
   D (emitcode (";", "genPcall"));
 
   dtype = operandType (IC_LEFT (ic))->next;
-  etype = getSpec (dtype);
   /* if caller saves & we have not saved then */
   if (!ic->regsSaved)
     saveRegisters (ic);
@@ -3491,14 +3421,14 @@
     }
 
   /* push the return address on to the stack */
-  emitcode ("mov", "a,#!tlabel", (rlbl->key + 100));
+  emitcode ("mov", "a,#!tlabel", labelKey2num (rlbl->key));
   emitpush ("acc");
-  emitcode ("mov", "a,#!hil", (rlbl->key + 100));
+  emitcode ("mov", "a,#!hil", labelKey2num (rlbl->key));
   emitpush ("acc");
 
   if (options.model == MODEL_FLAT24)
     {
-      emitcode ("mov", "a,#!hihil", (rlbl->key + 100));
+      emitcode ("mov", "a,#!hihil", labelKey2num (rlbl->key));
       emitpush ("acc");
     }
 
@@ -3661,7 +3591,7 @@
   emitcode (";", "-----------------------------------------");
 
   emitcode ("", "%s:", sym->rname);
-  lineCurr->isLabel = 1;
+  genLine.lineCurr->isLabel = 1;
   ftype = operandType (IC_LEFT (ic));
   _G.currentFunc = sym;
 
@@ -3970,10 +3900,10 @@
     {
       symbol *tlbl = newiTempLabel (NULL);
       emitcode ("setb", "c");
-      emitcode ("jbc", "ea,!tlabel", tlbl->key + 100);  /* atomic test & clear */
+      emitcode ("jbc", "ea,!tlabel", labelKey2num (tlbl->key)); /* atomic test & clear */
       emitcode ("clr", "c");
       emitLabel (tlbl);
-      emitpush ("psw"); /* save old ea via c in psw */
+      emitpush ("psw");         /* save old ea via c in psw */
     }
 }
 
@@ -3984,7 +3914,7 @@
 genEndFunction (iCode * ic)
 {
   symbol *sym = OP_SYMBOL (IC_LEFT (ic));
-  lineNode *lnp = lineCurr;
+  lineNode *lnp = genLine.lineCurr;
   bitVect *regsUsed;
   bitVect *regsUsedPrologue;
   bitVect *regsUnneeded;
@@ -4006,13 +3936,13 @@
       if (IS_BIT (OP_SYM_ETYPE (IC_LEFT (ic))))
         {
           emitcode ("rlc", "a");        /* save c in a */
-          emitpop ("psw");              /* restore ea via c in psw */
+          emitpop ("psw");      /* restore ea via c in psw */
           emitcode ("mov", "ea,c");
           emitcode ("rrc", "a");        /* restore c from a */
         }
       else
         {
-          emitpop ("psw");              /* restore ea via c in psw */
+          emitpop ("psw");      /* restore ea via c in psw */
           emitcode ("mov", "ea,c");
         }
     }
@@ -4039,7 +3969,7 @@
   if (options.useXstack && sym->stack)
     {
       emitcode ("mov", "a,sp");
-      emitcode ("add", "a,#!constbyte", ((char) -sym->stack) & 0xff);
+      emitcode ("add", "a,#!constbyte", ((char) - sym->stack) & 0xff);
       emitcode ("mov", "sp,a");
     }
 
@@ -4414,7 +4344,7 @@
      if the next is not the return statement */
   if (!(ic->next && ic->next->op == LABEL && IC_LABEL (ic->next) == returnLabel))
     {
-      emitcode ("ljmp", "!tlabel", (returnLabel->key + 100));
+      emitcode ("ljmp", "!tlabel", labelKey2num (returnLabel->key));
     }
 }
 
@@ -4441,7 +4371,7 @@
 {
   D (emitcode (";", "genGoto"));
 
-  emitcode ("ljmp", "!tlabel", (IC_LABEL (ic)->key + 100));
+  emitcode ("ljmp", "!tlabel", labelKey2num (IC_LABEL (ic)->key));
 }
 
 /*-----------------------------------------------------------------*/
@@ -4536,12 +4466,12 @@
       emitcode ("inc", "%s", l);
       if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || IS_AOP_PREG (IC_RESULT (ic)))
         {
-          emitcode ("cjne", "%s,%s,!tlabel", l, zero, tlbl->key + 100);
+          emitcode ("cjne", "%s,%s,!tlabel", l, zero, labelKey2num (tlbl->key));
         }
       else
         {
           emitcode ("clr", "a");
-          emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100);
+          emitcode ("cjne", "a,%s,!tlabel", l, labelKey2num (tlbl->key));
         }
 
       l = aopGet (IC_RESULT (ic), MSB16, FALSE, FALSE, NULL);
@@ -4550,15 +4480,15 @@
         {
           if (EQ (l, "acc"))
             {
-              emitcode ("jnz", "!tlabel", tlbl->key + 100);
+              emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
             }
           else if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || IS_AOP_PREG (IC_RESULT (ic)))
             {
-              emitcode ("cjne", "%s,%s,!tlabel", l, zero, tlbl->key + 100);
+              emitcode ("cjne", "%s,%s,!tlabel", l, zero, labelKey2num (tlbl->key));
             }
           else
             {
-              emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100);
+              emitcode ("cjne", "a,%s,!tlabel", l, labelKey2num (tlbl->key));
             }
 
           l = aopGet (IC_RESULT (ic), MSB24, FALSE, FALSE, NULL);
@@ -4568,15 +4498,15 @@
         {
           if (EQ (l, "acc"))
             {
-              emitcode ("jnz", "!tlabel", tlbl->key + 100);
+              emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
             }
           else if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || IS_AOP_PREG (IC_RESULT (ic)))
             {
-              emitcode ("cjne", "%s,%s,!tlabel", l, zero, tlbl->key + 100);
+              emitcode ("cjne", "%s,%s,!tlabel", l, zero, labelKey2num (tlbl->key));
             }
           else
             {
-              emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100);
+              emitcode ("cjne", "a,%s,!tlabel", l, labelKey2num (tlbl->key));
             }
 
           emitcode ("inc", "%s", aopGet (IC_RESULT (ic), MSB32, FALSE, FALSE, NULL));
@@ -4592,7 +4522,7 @@
   if (AOP_TYPE (IC_RESULT (ic)) == AOP_STR && IS_ITEMP (IC_RESULT (ic)) &&
       !AOP_USESDPTR (IC_LEFT (ic)) && icount <= 5 && size <= 3 && options.model == MODEL_FLAT24)
     {
-      if (IC_RESULT (ic)->isGptr)
+      if (AOP_SIZE (IC_RESULT (ic)) == 4)
         {
           emitcode ("mov", "b,%s", aopGet (IC_LEFT (ic), 3, FALSE, FALSE, NULL));
         }
@@ -4668,7 +4598,7 @@
     }
   else
     {
-      emitcode ("jz", "!tlabel", tlbl->key + 100);
+      emitcode ("jz", "!tlabel", labelKey2num (tlbl->key));
       emitcode ("mov", "a,%s", one);
       emitLabel (tlbl);
       outAcc (result);
@@ -4687,7 +4617,7 @@
   if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY)
     {
       symbol *lbl = newiTempLabel (NULL);
-      emitcode ("jnb", "%s,!tlabel", AOP (IC_RIGHT (ic))->aopu.aop_dir, (lbl->key + 100));
+      emitcode ("jnb", "%s,!tlabel", AOP (IC_RIGHT (ic))->aopu.aop_dir, labelKey2num (lbl->key));
       emitcode ("cpl", "c");
       emitLabel (lbl);
       outBitC (IC_RESULT (ic));
@@ -5044,8 +4974,7 @@
                */
               assert (AOP_NEEDSACC (IC_RIGHT (ic)));
               TR_AP ("#3");
-              D (emitcode (";", "+ AOP_ACC special case.");
-                );
+              D (emitcode (";", "+ AOP_ACC special case."););
               emitcode ("xch", "a, %s", DP2_RESULT_REG);
             }
           MOVA (aopGet (IC_RIGHT (ic), offset, FALSE, FALSE, NULL));
@@ -5081,6 +5010,7 @@
   if (pushResult)
     {
       aopOp (IC_RESULT (ic), ic, TRUE, FALSE);
+      adjustArithmeticResult (ic);
 
       size = getDataSize (IC_LEFT (ic));
       rSize = getDataSize (IC_RESULT (ic));
@@ -5095,8 +5025,8 @@
         }
       _endLazyDPSEvaluation ();
     }
-
-  adjustArithmeticResult (ic);
+  else
+    adjustArithmeticResult (ic);
 
 release:
   freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
@@ -5166,12 +5096,12 @@
 
       if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || AOP_TYPE (IC_RESULT (ic)) == AOP_DPTR || IS_AOP_PREG (IC_RESULT (ic)))
         {
-          emitcode ("cjne", "%s,#!constbyte,!tlabel", l, 0xff, tlbl->key + 100);
+          emitcode ("cjne", "%s,#!constbyte,!tlabel", l, 0xff, labelKey2num (tlbl->key));
         }
       else
         {
           emitcode ("mov", "a,#!constbyte", 0xff);
-          emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100);
+          emitcode ("cjne", "a,%s,!tlabel", l, labelKey2num (tlbl->key));
         }
       l = aopGet (IC_RESULT (ic), MSB16, FALSE, FALSE, NULL);
       emitcode ("dec", "%s", l);
@@ -5179,17 +5109,16 @@
         {
           if (EQ (l, "acc"))
             {
-              emitcode ("jnz", "!tlabel", tlbl->key + 100);
+              emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
             }
           else if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG ||
-                   AOP_TYPE (IC_RESULT (ic)) == AOP_DPTR ||
-                   IS_AOP_PREG (IC_RESULT (ic)))
+                   AOP_TYPE (IC_RESULT (ic)) == AOP_DPTR || IS_AOP_PREG (IC_RESULT (ic)))
             {
-              emitcode ("cjne", "%s,#!constbyte,!tlabel", l, 0xff, tlbl->key + 100);
+              emitcode ("cjne", "%s,#!constbyte,!tlabel", l, 0xff, labelKey2num (tlbl->key));
             }
           else
             {
-              emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100);
+              emitcode ("cjne", "a,%s,!tlabel", l, labelKey2num (tlbl->key));
             }
           l = aopGet (IC_RESULT (ic), MSB24, FALSE, FALSE, NULL);
           emitcode ("dec", "%s", l);
@@ -5198,17 +5127,16 @@
         {
           if (EQ (l, "acc"))
             {
-              emitcode ("jnz", "!tlabel", tlbl->key + 100);
+              emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
             }
           else if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG ||
-                   AOP_TYPE (IC_RESULT (ic)) == AOP_DPTR ||
-                   IS_AOP_PREG (IC_RESULT (ic)))
+                   AOP_TYPE (IC_RESULT (ic)) == AOP_DPTR || IS_AOP_PREG (IC_RESULT (ic)))
             {
-              emitcode ("cjne", "%s,#!constbyte,!tlabel", l, 0xff, tlbl->key + 100);
+              emitcode ("cjne", "%s,#!constbyte,!tlabel", l, 0xff, labelKey2num (tlbl->key));
             }
           else
             {
-              emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100);
+              emitcode ("cjne", "a,%s,!tlabel", l, labelKey2num (tlbl->key));
             }
           emitcode ("dec", "%s", aopGet (IC_RESULT (ic), MSB32, FALSE, FALSE, NULL));
         }
@@ -5300,7 +5228,7 @@
   if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY)
     {
       emitcode ("mov", "c,%s", AOP (IC_LEFT (ic))->aopu.aop_dir);
-      emitcode ("jnb", "%s,!tlabel", AOP (IC_RIGHT (ic))->aopu.aop_dir, (lbl->key + 100));
+      emitcode ("jnb", "%s,!tlabel", AOP (IC_RIGHT (ic))->aopu.aop_dir, labelKey2num (lbl->key));
       emitcode ("cpl", "c");
       emitLabel (lbl);
       outBitC (IC_RESULT (ic));
@@ -5309,7 +5237,7 @@
     {
       emitcode ("mov", "c,%s", AOP (IC_RIGHT (ic))->aopu.aop_dir);
       emitcode ("subb", "a,acc");
-      emitcode ("jnb", "%s,!tlabel", AOP (IC_LEFT (ic))->aopu.aop_dir, (lbl->key + 100));
+      emitcode ("jnb", "%s,!tlabel", AOP (IC_LEFT (ic))->aopu.aop_dir, labelKey2num ((lbl->key)));
       emitcode ("inc", "a");
       emitLabel (lbl);
       aopPut (IC_RESULT (ic), "a", 0);
@@ -5416,6 +5344,7 @@
   if (pushResult)
     {
       aopOp (IC_RESULT (ic), ic, TRUE, FALSE);
+      adjustArithmeticResult (ic);
 
       size = getDataSize (IC_LEFT (ic));
       rSize = getDataSize (IC_RESULT (ic));
@@ -5430,8 +5359,8 @@
         }
       _endLazyDPSEvaluation ();
     }
-
-  adjustArithmeticResult (ic);
+  else
+    adjustArithmeticResult (ic);
 
 release:
   freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
@@ -5488,12 +5417,12 @@
   pushedB = pushB ();
 
   if ((lUnsigned && rUnsigned)
-/* sorry, I don't know how to get size
-   without calling aopOp (result,...);
-   see Feature Request  */
-                                /* || size == 1 */ )
-                                /* no, this is not a bug; with a 1 byte result there's
-                                   no need to take care about the signedness! */
+      /* sorry, I don't know how to get size
+         without calling aopOp (result,...);
+         see Feature Request  */
+      /* || size == 1 */ )
+    /* no, this is not a bug; with a 1 byte result there's
+       no need to take care about the signedness! */
     {
       /* just an unsigned 8 * 8 = 8 multiply
          or 8u * 8u = 16u */
@@ -5588,7 +5517,7 @@
         {
           MOVA (aopGet (right, 0, FALSE, FALSE, NULL));
           lbl = newiTempLabel (NULL);
-          emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100);
+          emitcode ("jnb", "acc.7,!tlabel", labelKey2num (lbl->key));
           emitcode ("cpl", "F0");       /* complement sign flag */
           emitcode ("cpl", "a");        /* 2's complement */
           emitcode ("inc", "a");
@@ -5613,7 +5542,7 @@
       if (!lUnsigned)           /* emitcode (";", "signed"); */
         {
           lbl = newiTempLabel (NULL);
-          emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100);
+          emitcode ("jnb", "acc.7,!tlabel", labelKey2num (lbl->key));
           emitcode ("cpl", "F0");       /* complement sign flag */
           emitcode ("cpl", "a");        /* 2's complement */
           emitcode ("inc", "a");
@@ -5638,7 +5567,7 @@
     {
       lbl = newiTempLabel (NULL);
       if (runtimeSign)
-        emitcode ("jnb", "F0,!tlabel", lbl->key + 100);
+        emitcode ("jnb", "F0,!tlabel", labelKey2num (lbl->key));
       emitcode ("cpl", "a");    /* lsb 2's complement */
       if (size != 2)
         emitcode ("inc", "a");  /* inc doesn't set carry flag */
@@ -5680,7 +5609,7 @@
   /* save EA bit in F1 */
   lbl = newiTempLabel (NULL);
   emitcode ("setb", "F1");
-  emitcode ("jbc", "EA,!tlabel", lbl->key + 100);
+  emitcode ("jbc", "EA,!tlabel", labelKey2num (lbl->key));
   emitcode ("clr", "F1");
   emitLabel (lbl);
 
@@ -5704,7 +5633,7 @@
           lbl = newiTempLabel (NULL);
           emitcode ("mov", "b,%s", aopGet (right, 0, FALSE, FALSE, NULL));
           emitcode ("mov", "a,%s", aopGet (right, 1, FALSE, FALSE, NULL));
-          emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100);
+          emitcode ("jnb", "acc.7,!tlabel", labelKey2num (lbl->key));
           emitcode ("xch", "a,b");
           emitcode ("cpl", "a");
           emitcode ("add", "a,#1");
@@ -5728,14 +5657,14 @@
       lbl = newiTempLabel (NULL);
       emitcode ("mov", "b,%s", aopGet (left, 0, FALSE, FALSE, NULL));
       emitcode ("mov", "a,%s", aopGet (left, 1, FALSE, FALSE, NULL));
-      emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100);
+      emitcode ("jnb", "acc.7,!tlabel", labelKey2num (lbl->key));
       emitcode ("xch", "a,b");
       emitcode ("cpl", "a");
       emitcode ("add", "a,#1");
       emitcode ("xch", "a,b");
       emitcode ("cpl", "a");    // msb
       emitcode ("addc", "a,#0");
-      emitcode ("jbc", "F0,!tlabel", lbl->key + 100);
+      emitcode ("jbc", "F0,!tlabel", labelKey2num (lbl->key));
       emitcode ("setb", "F0");
       emitLabel (lbl);
       emitcode ("mov", "ma,b");
@@ -5751,7 +5680,7 @@
   emitLabel (lbl);
   emitcode ("mov", "a,mcnt1");
   emitcode ("anl", "a,#!constbyte", 0x80);
-  emitcode ("jnz", "!tlabel", lbl->key + 100);
+  emitcode ("jnz", "!tlabel", labelKey2num (lbl->key));
 
   freeAsmop (left, NULL, ic, TRUE);
   freeAsmop (right, NULL, ic, TRUE);
@@ -5777,7 +5706,7 @@
       MOVA ("ma");
       /* negate result if needed */
       lbl = newiTempLabel (NULL);
-      emitcode ("jnb", "F0,!tlabel", lbl->key + 100);
+      emitcode ("jnb", "F0,!tlabel", labelKey2num (lbl->key));
       emitcode ("cpl", "a");
       emitcode ("add", "a,#1");
       emitLabel (lbl);
@@ -5796,7 +5725,7 @@
 
       emitcode ("pop", "acc");
       lbl = newiTempLabel (NULL);
-      emitcode ("jnb", "F0,!tlabel", lbl->key + 100);
+      emitcode ("jnb", "F0,!tlabel", labelKey2num (lbl->key));
       emitcode ("cpl", "a");
       emitcode ("addc", "a,#0");
       emitLabel (lbl);
@@ -5805,7 +5734,7 @@
       if (AOP_SIZE (result) >= 3)
         {
           lbl = newiTempLabel (NULL);
-          emitcode ("jnb", "F0,!tlabel", lbl->key + 100);
+          emitcode ("jnb", "F0,!tlabel", labelKey2num (lbl->key));
           emitcode ("cpl", "a");
           emitcode ("addc", "a,#0");
           emitLabel (lbl);
@@ -5815,7 +5744,7 @@
       if (AOP_SIZE (result) >= 4)
         {
           lbl = newiTempLabel (NULL);
-          emitcode ("jnb", "F0,!tlabel", lbl->key + 100);
+          emitcode ("jnb", "F0,!tlabel", labelKey2num (lbl->key));
           emitcode ("cpl", "a");
           emitcode ("addc", "a,#0");
           emitLabel (lbl);
@@ -5832,7 +5761,7 @@
 
   /* restore EA bit in F1 */
   lbl = newiTempLabel (NULL);
-  emitcode ("jnb", "F1,!tlabel", lbl->key + 100);
+  emitcode ("jnb", "F1,!tlabel", labelKey2num (lbl->key));
   emitcode ("setb", "EA");
   emitLabel (lbl);
   return;
@@ -6011,7 +5940,7 @@
         {
           MOVA (aopGet (right, 0, FALSE, FALSE, NULL));
           lbl = newiTempLabel (NULL);
-          emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100);
+          emitcode ("jnb", "acc.7,!tlabel", labelKey2num (lbl->key));
           emitcode ("cpl", "F0");       /* complement sign flag */
           emitcode ("cpl", "a");        /* 2's complement */
           emitcode ("inc", "a");
@@ -6036,7 +5965,7 @@
       if (!lUnsigned)
         {
           lbl = newiTempLabel (NULL);
-          emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100);
+          emitcode ("jnb", "acc.7,!tlabel", labelKey2num (lbl->key));
           emitcode ("cpl", "F0");       /* complement sign flag */
           emitcode ("cpl", "a");        /* 2's complement */
           emitcode ("inc", "a");
@@ -6052,7 +5981,7 @@
     {
       lbl = newiTempLabel (NULL);
       if (runtimeSign)
-        emitcode ("jnb", "F0,!tlabel", lbl->key + 100);
+        emitcode ("jnb", "F0,!tlabel", labelKey2num (lbl->key));
       emitcode ("cpl", "a");    /* lsb 2's complement */
       emitcode ("inc", "a");
       emitLabel (lbl);
@@ -6109,7 +6038,7 @@
   /* save EA bit in F1 */
   lbl = newiTempLabel (NULL);
   emitcode ("setb", "F1");
-  emitcode ("jbc", "EA,!tlabel", lbl->key + 100);
+  emitcode ("jbc", "EA,!tlabel", labelKey2num (lbl->key));
   emitcode ("clr", "F1");
   emitLabel (lbl);
 
@@ -6120,7 +6049,7 @@
       lbl = newiTempLabel (NULL);
       emitcode ("mov", "b,%s", aopGet (left, 0, FALSE, FALSE, NULL));
       emitcode ("mov", "a,%s", aopGet (left, 1, FALSE, FALSE, NULL));
-      emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100);
+      emitcode ("jnb", "acc.7,!tlabel", labelKey2num (lbl->key));
       emitcode ("xch", "a,b");
       emitcode ("cpl", "a");
       emitcode ("add", "a,#1");
@@ -6147,7 +6076,7 @@
           if (val < 0)
             {
               lbl = newiTempLabel (NULL);
-              emitcode ("jbc", "F0,!tlabel", lbl->key + 100);
+              emitcode ("jbc", "F0,!tlabel", labelKey2num (lbl->key));
               emitcode ("setb", "F0");
               emitLabel (lbl);
               val = -val;
@@ -6160,14 +6089,14 @@
           lbl = newiTempLabel (NULL);
           emitcode ("mov", "b,%s", aopGet (right, 0, FALSE, FALSE, NULL));
           emitcode ("mov", "a,%s", aopGet (right, 1, FALSE, FALSE, NULL));
-          emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100);
+          emitcode ("jnb", "acc.7,!tlabel", labelKey2num (lbl->key));
           emitcode ("xch", "a,b");
           emitcode ("cpl", "a");
           emitcode ("add", "a,#1");
           emitcode ("xch", "a,b");
           emitcode ("cpl", "a");        // msb
           emitcode ("addc", "a,#0");
-          emitcode ("jbc", "F0,!tlabel", lbl->key + 100);
+          emitcode ("jbc", "F0,!tlabel", labelKey2num (lbl->key));
           emitcode ("setb", "F0");
           emitLabel (lbl);
           emitcode ("mov", "mb,b");
@@ -6185,7 +6114,7 @@
   emitLabel (lbl);
   emitcode ("mov", "a,mcnt1");
   emitcode ("anl", "a,#!constbyte", 0x80);
-  emitcode ("jnz", "!tlabel", lbl->key + 100);
+  emitcode ("jnz", "!tlabel", labelKey2num (lbl->key));
 
   freeAsmop (left, NULL, ic, TRUE);
   freeAsmop (right, NULL, ic, TRUE);
@@ -6203,14 +6132,14 @@
       MOVA ("ma");
       /* negate result if needed */
       lbl = newiTempLabel (NULL);
-      emitcode ("jnb", "F0,!tlabel", lbl->key + 100);
+      emitcode ("jnb", "F0,!tlabel", labelKey2num (lbl->key));
       emitcode ("cpl", "a");
       emitcode ("add", "a,#1");
       emitLabel (lbl);
       aopPut (result, "a", 0);
       emitcode ("pop", "acc");
       lbl = newiTempLabel (NULL);
-      emitcode ("jnb", "F0,!tlabel", lbl->key + 100);
+      emitcode ("jnb", "F0,!tlabel", labelKey2num (lbl->key));
       emitcode ("cpl", "a");
       emitcode ("addc", "a,#0");
       emitLabel (lbl);
@@ -6219,7 +6148,7 @@
   freeAsmop (result, NULL, ic, TRUE);
   /* restore EA bit in F1 */
   lbl = newiTempLabel (NULL);
-  emitcode ("jnb", "F1,!tlabel", lbl->key + 100);
+  emitcode ("jnb", "F1,!tlabel", labelKey2num (lbl->key));
   emitcode ("setb", "EA");
   emitLabel (lbl);
   return;
@@ -6350,7 +6279,7 @@
         {
           MOVA (aopGet (right, 0, FALSE, FALSE, NULL));
           lbl = newiTempLabel (NULL);
-          emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100);
+          emitcode ("jnb", "acc.7,!tlabel", labelKey2num (lbl->key));
           emitcode ("cpl", "a");        /* 2's complement */
           emitcode ("inc", "a");
           emitLabel (lbl);
@@ -6387,7 +6316,7 @@
           emitcode ("clr", "F0");       /* clear sign flag */
 
           lbl = newiTempLabel (NULL);
-          emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100);
+          emitcode ("jnb", "acc.7,!tlabel", labelKey2num (lbl->key));
           emitcode ("setb", "F0");      /* set sign flag */
           emitcode ("cpl", "a");        /* 2's complement */
           emitcode ("inc", "a");
@@ -6404,7 +6333,7 @@
       emitcode ("mov", "a,b");
       lbl = newiTempLabel (NULL);
       if (runtimeSign)
-        emitcode ("jnb", "F0,!tlabel", lbl->key + 100);
+        emitcode ("jnb", "F0,!tlabel", labelKey2num (lbl->key));
       emitcode ("cpl", "a");    /* lsb 2's complement */
       emitcode ("inc", "a");
       emitLabel (lbl);
@@ -6462,7 +6391,7 @@
   /* save EA bit in F1 */
   lbl = newiTempLabel (NULL);
   emitcode ("setb", "F1");
-  emitcode ("jbc", "EA,!tlabel", lbl->key + 100);
+  emitcode ("jbc", "EA,!tlabel", labelKey2num (lbl->key));
   emitcode ("clr", "F1");
   emitLabel (lbl);
 
@@ -6471,7 +6400,7 @@
       lbl = newiTempLabel (NULL);
       emitcode ("mov", "b,%s", aopGet (left, 0, FALSE, FALSE, NULL));
       emitcode ("mov", "a,%s", aopGet (left, 1, FALSE, FALSE, NULL));
-      emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100);
+      emitcode ("jnb", "acc.7,!tlabel", labelKey2num (lbl->key));
       emitcode ("xch", "a,b");
       emitcode ("cpl", "a");
       emitcode ("add", "a,#1");
@@ -6506,7 +6435,7 @@
           lbl = newiTempLabel (NULL);
           emitcode ("mov", "b,%s", aopGet (right, 0, FALSE, FALSE, NULL));
           emitcode ("mov", "a,%s", aopGet (right, 1, FALSE, FALSE, NULL));
-          emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100);
+          emitcode ("jnb", "acc.7,!tlabel", labelKey2num (lbl->key));
           emitcode ("xch", "a,b");
           emitcode ("cpl", "a");
           emitcode ("add", "a,#1");
@@ -6529,7 +6458,7 @@
   emitLabel (lbl);
   emitcode ("mov", "a,mcnt1");
   emitcode ("anl", "a,#!constbyte", 0x80);
-  emitcode ("jnz", "!tlabel", lbl->key + 100);
+  emitcode ("jnz", "!tlabel", labelKey2num (lbl->key));
 
   freeAsmop (left, NULL, ic, TRUE);
   freeAsmop (right, NULL, ic, TRUE);
@@ -6541,7 +6470,7 @@
 
   /* restore EA bit in F1 */
   lbl = newiTempLabel (NULL);
-  emitcode ("jnb", "F1,!tlabel", lbl->key + 100);
+  emitcode ("jnb", "F1,!tlabel", labelKey2num (lbl->key));
   emitcode ("setb", "EA");
   emitLabel (lbl);
 }
@@ -6621,10 +6550,10 @@
       inst = ((EQ (jval, "a") ? "jnz" : (EQ (jval, "c") ? "jc" : "jb")));
     }
   if (EQ (inst, "jb") || EQ (inst, "jnb"))
-    emitcode (inst, "%s,!tlabel", jval, (tlbl->key + 100));
+    emitcode (inst, "%s,!tlabel", jval, labelKey2num ((tlbl->key)));
   else
-    emitcode (inst, "!tlabel", tlbl->key + 100);
-  emitcode ("ljmp", "!tlabel", jlbl->key + 100);
+    emitcode (inst, "!tlabel", labelKey2num (tlbl->key));
+  emitcode ("ljmp", "!tlabel", labelKey2num (jlbl->key));
   emitLabel (tlbl);
 
   /* mark the icode as generated */
@@ -6672,12 +6601,11 @@
       size = max (AOP_SIZE (left), AOP_SIZE (right));
 
       /* if unsigned char cmp with lit, do cjne left,#right,zz */
-      if (size == 1 && !sign && AOP_TYPE (right) == AOP_LIT &&
-          AOP_TYPE (left) != AOP_DIR && AOP_TYPE (left) != AOP_STR)
+      if (size == 1 && !sign && AOP_TYPE (right) == AOP_LIT && AOP_TYPE (left) != AOP_DIR && AOP_TYPE (left) != AOP_STR)
         {
           char *l = Safe_strdup (aopGet (left, offset, FALSE, FALSE, NULL));
           symbol *lbl = newiTempLabel (NULL);
-          emitcode ("cjne", "%s,%s,!tlabel", l, aopGet (right, offset, FALSE, FALSE, NULL), lbl->key + 100);
+          emitcode ("cjne", "%s,%s,!tlabel", l, aopGet (right, offset, FALSE, FALSE, NULL), labelKey2num (lbl->key));
           Safe_free (l);
           emitLabel (lbl);
         }
@@ -6759,7 +6687,7 @@
     }
 
 release:
-/* Don't need the left & right operands any more; do need the result. */
+  /* Don't need the left & right operands any more; do need the result. */
   freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
   freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
 
@@ -6859,10 +6787,8 @@
 
   /* if the left side is a literal or
      if the right is in a pointer register and left is not */
-  if ((AOP_TYPE (left) == AOP_LIT)  ||
-      (AOP_TYPE (left) == AOP_IMMD) ||
-      (AOP_TYPE (left) == AOP_DIR)  ||
-      (IS_AOP_PREG (right) && !IS_AOP_PREG (left)))
+  if ((AOP_TYPE (left) == AOP_LIT) ||
+      (AOP_TYPE (left) == AOP_IMMD) || (AOP_TYPE (left) == AOP_DIR) || (IS_AOP_PREG (right) && !IS_AOP_PREG (left)))
     {
       operand *t = right;
       right = left;
@@ -6884,7 +6810,7 @@
       emitcode ("lcall", "___gptr_cmp");
       for (offset = 0; offset < GPTRSIZE; offset++)
         emitpop (NULL);
-      emitcode ("jnz", "!tlabel", lbl->key + 100);
+      emitcode ("jnz", "!tlabel", labelKey2num (lbl->key));
     }
 
   /* if the right side is a literal then anything goes */
@@ -6895,7 +6821,7 @@
       while (size--)
         {
           char *l = Safe_strdup (aopGet (left, offset, FALSE, FALSE, NULL));
-          emitcode ("cjne", "%s,%s,!tlabel", l, aopGet (right, offset, FALSE, FALSE, NULL), lbl->key + 100);
+          emitcode ("cjne", "%s,%s,!tlabel", l, aopGet (right, offset, FALSE, FALSE, NULL), labelKey2num (lbl->key));
           Safe_free (l);
           offset++;
         }
@@ -6907,17 +6833,16 @@
            AOP_TYPE (right) == AOP_DIR ||
            AOP_TYPE (right) == AOP_LIT ||
            AOP_TYPE (right) == AOP_IMMD ||
-           (AOP_TYPE (left) == AOP_DIR && AOP_TYPE (right) == AOP_LIT) ||
-           (IS_AOP_PREG (left) && !IS_AOP_PREG (right)))
+           (AOP_TYPE (left) == AOP_DIR && AOP_TYPE (right) == AOP_LIT) || (IS_AOP_PREG (left) && !IS_AOP_PREG (right)))
     {
       while (size--)
         {
           MOVA (aopGet (left, offset, FALSE, FALSE, NULL));
           if ((AOP_TYPE (left) == AOP_DIR && AOP_TYPE (right) == AOP_LIT) &&
               ((unsigned int) ((lit >> (offset * 8)) & 0x0FFL) == 0))
-            emitcode ("jnz", "!tlabel", lbl->key + 100);
+            emitcode ("jnz", "!tlabel", labelKey2num (lbl->key));
           else
-            emitcode ("cjne", "a,%s,!tlabel", aopGet (right, offset, FALSE, TRUE, DP2_RESULT_REG), lbl->key + 100);
+            emitcode ("cjne", "a,%s,!tlabel", aopGet (right, offset, FALSE, TRUE, DP2_RESULT_REG), labelKey2num (lbl->key));
           offset++;
         }
     }
@@ -6928,7 +6853,7 @@
         {
           MOVB (aopGet (left, offset, FALSE, FALSE, NULL));
           MOVA (aopGet (right, offset, FALSE, FALSE, NULL));
-          emitcode ("cjne", "a,b,!tlabel", lbl->key + 100);
+          emitcode ("cjne", "a,b,!tlabel", labelKey2num (lbl->key));
           offset++;
         }
     }
@@ -6947,7 +6872,7 @@
   gencjneshort (left, right, lbl);
 
   MOVA (one);
-  emitcode ("sjmp", "!tlabel", tlbl->key + 100);
+  emitcode ("sjmp", "!tlabel", labelKey2num (tlbl->key));
   emitLabel (lbl);
   MOVA (zero);
   emitLabel (tlbl);
@@ -6959,7 +6884,6 @@
 static void
 genCmpEq (iCode * ic, iCode * ifx)
 {
-  bool swappedLR = FALSE;
   operand *left, *right, *result;
   iCode *popIc = ic->next;
 
@@ -6974,7 +6898,6 @@
   if ((AOP_TYPE (left) == AOP_LIT) || (IS_AOP_PREG (right) && !IS_AOP_PREG (left)))
     {
       swapOperands (&left, &right);
-      swappedLR = TRUE;
     }
 
   if (ifx &&                    /* !AOP_SIZE(result) */
@@ -7006,7 +6929,7 @@
             {
               symbol *lbl = newiTempLabel (NULL);
               emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir);
-              emitcode ("jb", "%s,!tlabel", AOP (right)->aopu.aop_dir, (lbl->key + 100));
+              emitcode ("jb", "%s,!tlabel", AOP (right)->aopu.aop_dir, labelKey2num (lbl->key));
               emitcode ("cpl", "c");
               emitLabel (lbl);
             }
@@ -7015,15 +6938,15 @@
           tlbl = newiTempLabel (NULL);
           if (IC_TRUE (ifx))
             {
-              emitcode ("jnc", "!tlabel", tlbl->key + 100);
+              emitcode ("jnc", "!tlabel", labelKey2num (tlbl->key));
               popForBranch (popIc, FALSE);
-              emitcode ("ljmp", "!tlabel", IC_TRUE (ifx)->key + 100);
+              emitcode ("ljmp", "!tlabel", labelKey2num (IC_TRUE (ifx)->key));
             }
           else
             {
-              emitcode ("jc", "!tlabel", tlbl->key + 100);
+              emitcode ("jc", "!tlabel", labelKey2num (tlbl->key));
               popForBranch (popIc, FALSE);
-              emitcode ("ljmp", "!tlabel", IC_FALSE (ifx)->key + 100);
+              emitcode ("ljmp", "!tlabel", labelKey2num (IC_FALSE (ifx)->key));
             }
           emitLabel (tlbl);
         }
@@ -7034,16 +6957,16 @@
           if (IC_TRUE (ifx))
             {
               popForBranch (popIc, FALSE);
-              emitcode ("ljmp", "!tlabel", IC_TRUE (ifx)->key + 100);
+              emitcode ("ljmp", "!tlabel", labelKey2num (IC_TRUE (ifx)->key));
               emitLabel (tlbl);
             }
           else
             {
               symbol *lbl = newiTempLabel (NULL);
-              emitcode ("sjmp", "!tlabel", lbl->key + 100);
+              emitcode ("sjmp", "!tlabel", labelKey2num (lbl->key));
               emitLabel (tlbl);
               popForBranch (popIc, FALSE);
-              emitcode ("ljmp", "!tlabel", IC_FALSE (ifx)->key + 100);
+              emitcode ("ljmp", "!tlabel", labelKey2num (IC_FALSE (ifx)->key));
               emitLabel (lbl);
             }
         }
@@ -7080,7 +7003,7 @@
         {
           symbol *lbl = newiTempLabel (NULL);
           emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir);
-          emitcode ("jb", "%s,!tlabel", AOP (right)->aopu.aop_dir, (lbl->key + 100));
+          emitcode ("jb", "%s,!tlabel", AOP (right)->aopu.aop_dir, labelKey2num (lbl->key));
           emitcode ("cpl", "c");
           emitLabel (lbl);
         }
@@ -7136,29 +7059,6 @@
 }
 
 /*-----------------------------------------------------------------*/
-/* ifxForOp - returns the icode containing the ifx for operand     */
-/*-----------------------------------------------------------------*/
-static iCode *
-ifxForOp (operand * op, iCode * ic)
-{
-  iCode *ifxIc;
-
-  /* if true symbol then needs to be assigned */
-  if (IS_TRUE_SYMOP (op))
-    return NULL;
-
-  /* if this has register type condition and
-     while skipping ipop's (see bug 1509084),
-     the next instruction is ifx with the same operand
-     and live to of the operand is upto the ifx only then */
-  for (ifxIc = ic->next; ifxIc && ifxIc->op == IPOP; ifxIc = ifxIc->next);
-  if (ifxIc && ifxIc->op == IFX && IC_COND (ifxIc)->key == op->key && OP_SYMBOL (op)->liveTo <= ifxIc->seq)
-    return ifxIc;
-
-  return NULL;
-}
-
-/*-----------------------------------------------------------------*/
 /* hasInc - operand is incremented before any other use            */
 /*-----------------------------------------------------------------*/
 static iCode *
@@ -7234,7 +7134,7 @@
     {
       tlbl = newiTempLabel (NULL);
       toBoolean (left);
-      emitcode ("jz", "!tlabel", tlbl->key + 100);
+      emitcode ("jz", "!tlabel", labelKey2num (tlbl->key));
       toBoolean (right);
       emitLabel (tlbl);
       freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
@@ -7281,7 +7181,7 @@
     {
       tlbl = newiTempLabel (NULL);
       toBoolean (left);
-      emitcode ("jnz", "!tlabel", tlbl->key + 100);
+      emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
       toBoolean (right);
       emitLabel (tlbl);
       freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
@@ -7302,13 +7202,13 @@
 isLiteralBit (unsigned long lit)
 {
   unsigned long pw[32] = { 1L, 2L, 4L, 8L, 16L, 32L, 64L, 128L,
-    0x100L, 0x200L, 0x400L, 0x800L,
-    0x1000L, 0x2000L, 0x4000L, 0x8000L,
-    0x10000L, 0x20000L, 0x40000L, 0x80000L,
-    0x100000L, 0x200000L, 0x400000L, 0x800000L,
-    0x1000000L, 0x2000000L, 0x4000000L, 0x8000000L,
-    0x10000000L, 0x20000000L, 0x40000000L, 0x80000000L
-  };
+                           0x100L, 0x200L, 0x400L, 0x800L,
+                           0x1000L, 0x2000L, 0x4000L, 0x8000L,
+                           0x10000L, 0x20000L, 0x40000L, 0x80000L,
+                           0x100000L, 0x200000L, 0x400000L, 0x800000L,
+                           0x1000000L, 0x2000000L, 0x4000000L, 0x8000000L,
+                           0x10000000L, 0x20000000L, 0x40000000L, 0x80000000L
+                         };
   int idx;
 
   for (idx = 0; idx < 32; idx++)
@@ -7325,7 +7225,7 @@
 {
   if (IC_TRUE (ic))
     {
-      emitcode ("ljmp", "!tlabel", IC_TRUE (ic)->key + 100);
+      emitcode ("ljmp", "!tlabel", labelKey2num (IC_TRUE (ic)->key));
     }
   ic->generated = 1;
 }
@@ -7338,7 +7238,7 @@
 {
   if (!IC_TRUE (ic))
     {
-      emitcode ("ljmp", "!tlabel", IC_FALSE (ic)->key + 100);
+      emitcode ("ljmp", "!tlabel", labelKey2num (IC_FALSE (ic)->key));
     }
   ic->generated = 1;
 }
@@ -7353,14 +7253,14 @@
   if (IC_TRUE (ic))
     {
       symbol *nlbl = newiTempLabel (NULL);
-      emitcode ("sjmp", "!tlabel", nlbl->key + 100);
+      emitcode ("sjmp", "!tlabel", labelKey2num (nlbl->key));
       emitLabel (tlbl);
-      emitcode ("ljmp", "!tlabel", IC_TRUE (ic)->key + 100);
+      emitcode ("ljmp", "!tlabel", labelKey2num (IC_TRUE (ic)->key));
       emitLabel (nlbl);
     }
   else
     {
-      emitcode ("ljmp", "!tlabel", IC_FALSE (ic)->key + 100);
+      emitcode ("ljmp", "!tlabel", labelKey2num (IC_FALSE (ic)->key));
       emitLabel (tlbl);
     }
   ic->generated = 1;
@@ -7378,8 +7278,7 @@
   int offset = 0;
 
   TR_AP ("#5");
-  D (emitcode (";", "%s special case for 3 far operands.", logicOp);
-    );
+  D (emitcode (";", "%s special case for 3 far operands.", logicOp););
   compSize = AOP_SIZE (IC_LEFT (ic)) < AOP_SIZE (IC_RIGHT (ic)) ? AOP_SIZE (IC_LEFT (ic)) : AOP_SIZE (IC_RIGHT (ic));
 
   _startLazyDPSEvaluation ();
@@ -7446,7 +7345,7 @@
 #ifdef LOGIC_OPS_BROKEN
       || AOP_NEEDSACC (left)
 #endif
-    )
+     )
     {
       operand *tmp = right;
       right = left;
@@ -7601,12 +7500,12 @@
                   MOVA (aopGet (left, offset, FALSE, FALSE, NULL));
                   // byte ==  2^n ?
                   if ((posbit = isLiteralBit (bytelit)) != 0)
-                    emitcode ("jb", "acc.%d,!tlabel", (posbit - 1) & 0x07, tlbl->key + 100);
+                    emitcode ("jb", "acc.%d,!tlabel", (posbit - 1) & 0x07, labelKey2num (tlbl->key));
                   else
                     {
                       if (bytelit != 0x0FFL)
                         emitcode ("anl", "a,%s", aopGet (right, offset, FALSE, TRUE, DP2_RESULT_REG));
-                      emitcode ("jnz", "!tlabel", tlbl->key + 100);
+                      emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
                     }
                 }
               offset++;
@@ -7727,7 +7626,8 @@
               else if (AOP_TYPE (left) == AOP_ACC)
                 {
                   if (!offset)
-                    {           //B contains high byte of left
+                    {
+                      //B contains high byte of left
                       emitpush ("b");
                       emitcode ("mov", "b,a");
                       MOVA (aopGet (right, offset, FALSE, FALSE, NULL));
@@ -7757,7 +7657,7 @@
                   emitcode ("anl", "a,%s", aopGet (left, offset, FALSE, FALSE, DP2_RESULT_REG));
                 }
 
-              emitcode ("jnz", "!tlabel", tlbl->key + 100);
+              emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
               offset++;
             }
           if (size)
@@ -7814,7 +7714,8 @@
               else if (AOP_TYPE (left) == AOP_ACC)
                 {
                   if (!offset)
-                    {           //B contains high byte of left
+                    {
+                      //B contains high byte of left
                       emitpush ("b");
                       emitcode ("mov", "b,a");
                       MOVA (aopGet (right, offset, FALSE, FALSE, NULL));
@@ -7888,7 +7789,7 @@
 #ifdef LOGIC_OPS_BROKEN
       || AOP_NEEDSACC (left)    // I think this is a net loss now.
 #endif
-    )
+     )
     {
       operand *tmp = right;
       right = left;
@@ -7970,9 +7871,9 @@
               symbol *tlbl = newiTempLabel (NULL);
               if (!((AOP_TYPE (result) == AOP_CRY) && ifx))
                 emitcode ("setb", "c");
-              emitcode ("jb", "%s,!tlabel", AOP (left)->aopu.aop_dir, tlbl->key + 100);
+              emitcode ("jb", "%s,!tlabel", AOP (left)->aopu.aop_dir, labelKey2num (tlbl->key));
               toBoolean (right);
-              emitcode ("jnz", "!tlabel", tlbl->key + 100);
+              emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
               if ((AOP_TYPE (result) == AOP_CRY) && ifx)
                 {
                   jmpTrueOrFalse (ifx, tlbl);
@@ -8017,12 +7918,13 @@
           if (size)
             {
               symbol *tlbl = newiTempLabel (NULL);
-              emitcode ("jnz", "!tlabel", tlbl->key + 100);
+              emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
               CLRC;
               emitLabel (tlbl);
             }
           else
-            {                   /* FIXME, thats pretty fishy, check for ifx!=0, testcase .. */
+            {
+              /* FIXME, thats pretty fishy, check for ifx!=0, testcase .. */
               assert (ifx);
               genIfxJump (ifx, "a", ic->next);
               goto release;
@@ -8128,7 +8030,8 @@
               else if (AOP_TYPE (left) == AOP_ACC)
                 {
                   if (!offset)
-                    {           //B contains high byte of left
+                    {
+                      //B contains high byte of left
                       emitpush ("b");
                       emitcode ("mov", "b,a");
                       MOVA (aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG));
@@ -8158,7 +8061,7 @@
                   emitcode ("orl", "a,%s", aopGet (left, offset, FALSE, FALSE, DP2_RESULT_REG));
                 }
 
-              emitcode ("jnz", "!tlabel", tlbl->key + 100);
+              emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
               offset++;
             }
           if (size)
@@ -8208,7 +8111,8 @@
               else if (AOP_TYPE (left) == AOP_ACC)
                 {
                   if (!offset)
-                    {           //B contains high byte of left
+                    {
+                      //B contains high byte of left
                       emitpush ("b");
                       emitcode ("mov", "b,a");
                       MOVA (aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG));
@@ -8283,7 +8187,7 @@
 #ifdef LOGIC_OPS_BROKEN
       || (AOP_NEEDSACC (left) && !AOP_NEEDSACC (right))
 #endif
-    )
+     )
     {
       operand *tmp = right;
       right = left;
@@ -8366,7 +8270,8 @@
             {
               // c = bit ^ bit;
               if (IS_OP_ACCUSE (left))
-                {               // left already is in the carry
+                {
+                  // left already is in the carry
                   operand *tmp = right;
                   right = left;
                   left = tmp;
@@ -8381,7 +8286,7 @@
               // c = bit ^ val
               toCarry (right);
             }
-          emitcode ("jnb", "%s,!tlabel", AOP (left)->aopu.aop_dir, (tlbl->key + 100));
+          emitcode ("jnb", "%s,!tlabel", AOP (left)->aopu.aop_dir, labelKey2num (tlbl->key));
           emitcode ("cpl", "c");
           emitLabel (tlbl);
         }
@@ -8492,7 +8397,8 @@
               else if (AOP_TYPE (left) == AOP_ACC)
                 {
                   if (!offset)
-                    {           //B contains high byte of left
+                    {
+                      //B contains high byte of left
                       emitpush ("b");
                       emitcode ("mov", "b,a");
                       MOVA (aopGet (right, offset, FALSE, FALSE, DP2_RESULT_REG));
@@ -8522,7 +8428,7 @@
                   emitcode ("xrl", "a,%s", aopGet (left, offset, FALSE, TRUE, DP2_RESULT_REG));
                 }
 
-              emitcode ("jnz", "!tlabel", tlbl->key + 100);
+              emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
               offset++;
             }
           if (size)
@@ -8589,62 +8495,6 @@
 }
 
 /*-----------------------------------------------------------------*/
-/* genInline - write the inline code out                           */
-/*-----------------------------------------------------------------*/
-static void
-genInline (iCode * ic)
-{
-  char *buf, *bp, *bp1;
-  bool inComment = FALSE;
-
-  D (emitcode (";", "genInline"));
-
-  _G.inLine += (!options.asmpeep);
-
-  buf = bp = bp1 = Safe_strdup (IC_INLINE (ic));
-
-  /* emit each line as a code */
-  while (*bp)
-    {
-      switch (*bp)
-        {
-        case ';':
-          inComment = TRUE;
-          ++bp;
-          break;
-
-        case '\x87':
-        case '\n':
-          inComment = FALSE;
-          *bp++ = '\0';
-          emitcode (bp1, "");
-          bp1 = bp;
-          break;
-
-        default:
-          /* Add \n for labels, not dirs such as c:\mydir */
-          if (!inComment && (*bp == ':') && (isspace ((unsigned char) bp[1])))
-            {
-              ++bp;
-              *bp = '\0';
-              ++bp;
-              emitcode (bp1, "");
-              bp1 = bp;
-            }
-          else
-            ++bp;
-          break;
-        }
-    }
-  if (bp1 != bp)
-    emitcode (bp1, "");
-
-  Safe_free (buf);
-
-  _G.inLine -= (!options.asmpeep);
-}
-
-/*-----------------------------------------------------------------*/
 /* genRRC - rotate right with carry                                */
 /*-----------------------------------------------------------------*/
 static void
@@ -8952,7 +8802,7 @@
           AccRol (8 - shCount);
           /* and kill the higher order bits */
           emitcode ("anl", "a,#!constbyte", SRMask[shCount]);
-          emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, tlbl->key + 100);
+          emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, labelKey2num (tlbl->key));
           emitcode ("orl", "a,#!constbyte", (unsigned char) ~SRMask[shCount]);
           emitLabel (tlbl);
         }
@@ -9078,40 +8928,40 @@
       break;
     case 3:
     case 4:
-    case 5:                                     // AAAAABBB:CCCCCDDD
+    case 5:                    // AAAAABBB:CCCCCDDD
       mask = SLMask[shCount];
-      AccRol (shCount);                         // BBBAAAAA:CCCCCDDD
+      AccRol (shCount);         // BBBAAAAA:CCCCCDDD
       emitcode ("anl", "a,#!constbyte", mask);  // BBB00000:CCCCCDDD
-      emitcode ("xch", "a,%s", x);              // CCCCCDDD:BBB00000
-      AccRol (shCount);                         // DDDCCCCC:BBB00000
-      emitcode ("xch", "a,%s", x);              // BBB00000:DDDCCCCC
-      emitcode ("xrl", "a,%s", x);              // (BBB^DDD)CCCCC:DDDCCCCC
-      emitcode ("xch", "a,%s", x);              // DDDCCCCC:(BBB^DDD)CCCCC
+      emitcode ("xch", "a,%s", x);      // CCCCCDDD:BBB00000
+      AccRol (shCount);         // DDDCCCCC:BBB00000
+      emitcode ("xch", "a,%s", x);      // BBB00000:DDDCCCCC
+      emitcode ("xrl", "a,%s", x);      // (BBB^DDD)CCCCC:DDDCCCCC
+      emitcode ("xch", "a,%s", x);      // DDDCCCCC:(BBB^DDD)CCCCC
       emitcode ("anl", "a,#!constbyte", mask);  // DDD00000:(BBB^DDD)CCCCC
-      emitcode ("xch", "a,%s", x);              // (BBB^DDD)CCCCC:DDD00000
-      emitcode ("xrl", "a,%s", x);              // BBBCCCCC:DDD00000
+      emitcode ("xch", "a,%s", x);      // (BBB^DDD)CCCCC:DDD00000
+      emitcode ("xrl", "a,%s", x);      // BBBCCCCC:DDD00000
       break;
-    case 6:                                     // AAAAAABB:CCCCCCDD
+    case 6:                    // AAAAAABB:CCCCCCDD
       mask = SRMask[shCount];
       emitcode ("anl", "a,#!constbyte", mask);  // 000000BB:CCCCCCDD
-      emitcode ("mov", "c,acc.0");              // c = B
-      emitcode ("xch", "a,%s", x);              // CCCCCCDD:000000BB
+      emitcode ("mov", "c,acc.0");      // c = B
+      emitcode ("xch", "a,%s", x);      // CCCCCCDD:000000BB
       emitcode ("rrc", "a");
       emitcode ("xch", "a,%s", x);
       emitcode ("rrc", "a");
-      emitcode ("mov", "c,acc.0");              //<< get correct bit
+      emitcode ("mov", "c,acc.0");      //<< get correct bit
       emitcode ("xch", "a,%s", x);
       emitcode ("rrc", "a");
       emitcode ("xch", "a,%s", x);
       emitcode ("rrc", "a");
       emitcode ("xch", "a,%s", x);
       break;
-    case 7:                                     // a:x <<= 7
+    case 7:                    // a:x <<= 7
       mask = SRMask[shCount];
       emitcode ("anl", "a,#!constbyte", mask);  // 0000000B:CCCCCCCD
-      emitcode ("mov", "c,acc.0");              // c = B
-      emitcode ("xch", "a,%s", x);              // CCCCCCCD:0000000B
-      AccAXRrl1 (x);                            // BCCCCCCC:D0000000
+      emitcode ("mov", "c,acc.0");      // c = B
+      emitcode ("xch", "a,%s", x);      // CCCCCCCD:0000000B
+      AccAXRrl1 (x);            // BCCCCCCC:D0000000
       break;
     default:
       break;
@@ -9132,40 +8982,40 @@
       break;
     case 1:
       CLRC;
-      AccAXRrl1 (x);                            // 0->a:x
+      AccAXRrl1 (x);            // 0->a:x
       break;
     case 2:
       CLRC;
-      AccAXRrl1 (x);                            // 0->a:x
+      AccAXRrl1 (x);            // 0->a:x
       CLRC;
-      AccAXRrl1 (x);                            // 0->a:x
+      AccAXRrl1 (x);            // 0->a:x
       break;
     case 3:
     case 4:
-    case 5:                                     // AAAAABBB:CCCCCDDD = a:x
-      AccRol (8 - shCount);                     // BBBAAAAA:DDDCCCCC
-      emitcode ("xch", "a,%s", x);              // CCCCCDDD:BBBAAAAA
-      AccRol (8 - shCount);                     // DDDCCCCC:BBBAAAAA
+    case 5:                    // AAAAABBB:CCCCCDDD = a:x
+      AccRol (8 - shCount);     // BBBAAAAA:DDDCCCCC
+      emitcode ("xch", "a,%s", x);      // CCCCCDDD:BBBAAAAA
+      AccRol (8 - shCount);     // DDDCCCCC:BBBAAAAA
       emitcode ("anl", "a,#!constbyte", mask);  // 000CCCCC:BBBAAAAA
-      emitcode ("xrl", "a,%s", x);              // BBB(CCCCC^AAAAA):BBBAAAAA
-      emitcode ("xch", "a,%s", x);              // BBBAAAAA:BBB(CCCCC^AAAAA)
+      emitcode ("xrl", "a,%s", x);      // BBB(CCCCC^AAAAA):BBBAAAAA
+      emitcode ("xch", "a,%s", x);      // BBBAAAAA:BBB(CCCCC^AAAAA)
       emitcode ("anl", "a,#!constbyte", mask);  // 000AAAAA:BBB(CCCCC^AAAAA)
-      emitcode ("xch", "a,%s", x);              // BBB(CCCCC^AAAAA):000AAAAA
-      emitcode ("xrl", "a,%s", x);              // BBBCCCCC:000AAAAA
-      emitcode ("xch", "a,%s", x);              // 000AAAAA:BBBCCCCC
+      emitcode ("xch", "a,%s", x);      // BBB(CCCCC^AAAAA):000AAAAA
+      emitcode ("xrl", "a,%s", x);      // BBBCCCCC:000AAAAA
+      emitcode ("xch", "a,%s", x);      // 000AAAAA:BBBCCCCC
       break;
-    case 6:                                     // AABBBBBB:CCDDDDDD
+    case 6:                    // AABBBBBB:CCDDDDDD
       emitcode ("mov", "c,acc.7");
-      AccAXLrl1 (x);                            // ABBBBBBC:CDDDDDDA
+      AccAXLrl1 (x);            // ABBBBBBC:CDDDDDDA
       emitcode ("mov", "c,acc.7");
-      AccAXLrl1 (x);                            // BBBBBBCC:DDDDDDAA
-      emitcode ("xch", "a,%s", x);              // DDDDDDAA:BBBBBBCC
+      AccAXLrl1 (x);            // BBBBBBCC:DDDDDDAA
+      emitcode ("xch", "a,%s", x);      // DDDDDDAA:BBBBBBCC
       emitcode ("anl", "a,#!constbyte", mask);  // 000000AA:BBBBBBCC
       break;
-    case 7:                                     // ABBBBBBB:CDDDDDDD
-      emitcode ("mov", "c,acc.7");              // c = A
-      AccAXLrl1 (x);                            // BBBBBBBC:DDDDDDDA
-      emitcode ("xch", "a,%s", x);              // DDDDDDDA:BBBBBBCC
+    case 7:                    // ABBBBBBB:CDDDDDDD
+      emitcode ("mov", "c,acc.7");      // c = A
+      AccAXLrl1 (x);            // BBBBBBBC:DDDDDDDA
+      emitcode ("xch", "a,%s", x);      // DDDDDDDA:BBBBBBCC
       emitcode ("anl", "a,#!constbyte", mask);  // 0000000A:BBBBBBBC
       break;
     default:
@@ -9188,53 +9038,53 @@
       break;
     case 1:
       emitcode ("mov", "c,acc.7");
-      AccAXRrl1 (x);                            // s->a:x
+      AccAXRrl1 (x);            // s->a:x
       break;
     case 2:
       emitcode ("mov", "c,acc.7");
-      AccAXRrl1 (x);                            // s->a:x
+      AccAXRrl1 (x);            // s->a:x
       emitcode ("mov", "c,acc.7");
-      AccAXRrl1 (x);                            // s->a:x
+      AccAXRrl1 (x);            // s->a:x
       break;
     case 3:
     case 4:
-    case 5:                                     // AAAAABBB:CCCCCDDD = a:x
+    case 5:                    // AAAAABBB:CCCCCDDD = a:x
       tlbl = newiTempLabel (NULL);
-      AccRol (8 - shCount);                     // BBBAAAAA:CCCCCDDD
-      emitcode ("xch", "a,%s", x);              // CCCCCDDD:BBBAAAAA
-      AccRol (8 - shCount);                     // DDDCCCCC:BBBAAAAA
+      AccRol (8 - shCount);     // BBBAAAAA:CCCCCDDD
+      emitcode ("xch", "a,%s", x);      // CCCCCDDD:BBBAAAAA
+      AccRol (8 - shCount);     // DDDCCCCC:BBBAAAAA
       emitcode ("anl", "a,#!constbyte", mask);  // 000CCCCC:BBBAAAAA
-      emitcode ("xrl", "a,%s", x);              // BBB(CCCCC^AAAAA):BBBAAAAA
-      emitcode ("xch", "a,%s", x);              // BBBAAAAA:BBB(CCCCC^AAAAA)
+      emitcode ("xrl", "a,%s", x);      // BBB(CCCCC^AAAAA):BBBAAAAA
+      emitcode ("xch", "a,%s", x);      // BBBAAAAA:BBB(CCCCC^AAAAA)
       emitcode ("anl", "a,#!constbyte", mask);  // 000AAAAA:BBB(CCCCC^AAAAA)
-      emitcode ("xch", "a,%s", x);              // BBB(CCCCC^AAAAA):000AAAAA
-      emitcode ("xrl", "a,%s", x);              // BBBCCCCC:000AAAAA
-      emitcode ("xch", "a,%s", x);              // 000SAAAA:BBBCCCCC
-      emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, tlbl->key + 100);
+      emitcode ("xch", "a,%s", x);      // BBB(CCCCC^AAAAA):000AAAAA
+      emitcode ("xrl", "a,%s", x);      // BBBCCCCC:000AAAAA
+      emitcode ("xch", "a,%s", x);      // 000SAAAA:BBBCCCCC
+      emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, labelKey2num (tlbl->key));
       mask = ~SRMask[shCount];
       emitcode ("orl", "a,#!constbyte", mask);  // 111AAAAA:BBBCCCCC
       emitLabel (tlbl);
-      break;                                    // SSSSAAAA:BBBCCCCC
-    case 6:                                     // AABBBBBB:CCDDDDDD
+      break;                    // SSSSAAAA:BBBCCCCC
+    case 6:                    // AABBBBBB:CCDDDDDD
       tlbl = newiTempLabel (NULL);
       emitcode ("mov", "c,acc.7");
-      AccAXLrl1 (x);                            // ABBBBBBC:CDDDDDDA
+      AccAXLrl1 (x);            // ABBBBBBC:CDDDDDDA
       emitcode ("mov", "c,acc.7");
-      AccAXLrl1 (x);                            // BBBBBBCC:DDDDDDAA
-      emitcode ("xch", "a,%s", x);              // DDDDDDAA:BBBBBBCC
+      AccAXLrl1 (x);            // BBBBBBCC:DDDDDDAA
+      emitcode ("xch", "a,%s", x);      // DDDDDDAA:BBBBBBCC
       emitcode ("anl", "a,#!constbyte", mask);  // 000000AA:BBBBBBCC
-      emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, tlbl->key + 100);
+      emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, labelKey2num (tlbl->key));
       mask = ~SRMask[shCount];
       emitcode ("orl", "a,#!constbyte", mask);  // 111111AA:BBBBBBCC
       emitLabel (tlbl);
       break;
-    case 7:                                     // ABBBBBBB:CDDDDDDD
+    case 7:                    // ABBBBBBB:CDDDDDDD
       tlbl = newiTempLabel (NULL);
-      emitcode ("mov", "c,acc.7");              // c = A
-      AccAXLrl1 (x);                            // BBBBBBBC:DDDDDDDA
-      emitcode ("xch", "a,%s", x);              // DDDDDDDA:BBBBBBCC
+      emitcode ("mov", "c,acc.7");      // c = A
+      AccAXLrl1 (x);            // BBBBBBBC:DDDDDDDA
+      emitcode ("xch", "a,%s", x);      // DDDDDDDA:BBBBBBCC
       emitcode ("anl", "a,#!constbyte", mask);  // 0000000A:BBBBBBBC
-      emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, tlbl->key + 100);
+      emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, labelKey2num (tlbl->key));
       mask = ~SRMask[shCount];
       emitcode ("orl", "a,#!constbyte", mask);  // 1111111A:BBBBBBBC
       emitLabel (tlbl);
@@ -9585,7 +9435,8 @@
             movLeft2Result (left, LSB, result, MSB16, 0);
         }
       else
-        {                       /* size = 4 */
+        {
+          /* size = 4 */
           if (shCount == 0)
             {
               movLeft2Result (left, MSB24, result, MSB32, 0);
@@ -9771,11 +9622,11 @@
       symbol *tlbl1 = newiTempLabel (NULL);
 
       MOVA (aopGet (left, 0, FALSE, FALSE, NULL));
-      emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
+      emitcode ("sjmp", "!tlabel", labelKey2num (tlbl1->key));
       emitLabel (tlbl);
       emitcode ("add", "a,acc");
       emitLabel (tlbl1);
-      emitcode ("djnz", "b,!tlabel", tlbl->key + 100);
+      emitcode ("djnz", "b,!tlabel", labelKey2num (tlbl->key));
       popB (pushedB);
       aopPut (result, "a", 0);
       goto release;
@@ -9783,7 +9634,7 @@
 
   reAdjustPreg (AOP (result));
 
-  emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
+  emitcode ("sjmp", "!tlabel", labelKey2num (tlbl1->key));
   emitLabel (tlbl);
   MOVA (aopGet (result, offset, FALSE, FALSE, NULL));
   emitcode ("add", "a,acc");
@@ -9799,7 +9650,7 @@
   reAdjustPreg (AOP (result));
 
   emitLabel (tlbl1);
-  emitcode ("djnz", "b,!tlabel", tlbl->key + 100);
+  emitcode ("djnz", "b,!tlabel", labelKey2num (tlbl->key));
   popB (pushedB);
 release:
   freeAsmop (result, NULL, ic, TRUE);
@@ -10178,19 +10029,19 @@
   if (size == 1)
     {
       MOVA (aopGet (left, 0, FALSE, FALSE, NULL));
-      emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
+      emitcode ("sjmp", "!tlabel", labelKey2num (tlbl1->key));
       emitLabel (tlbl);
       emitcode ("mov", "c,ov");
       emitcode ("rrc", "a");
       emitLabel (tlbl1);
-      emitcode ("djnz", "b,!tlabel", tlbl->key + 100);
+      emitcode ("djnz", "b,!tlabel", labelKey2num (tlbl->key));
       popB (pushedB);
       aopPut (result, "a", 0);
       goto release;
     }
 
   reAdjustPreg (AOP (result));
-  emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
+  emitcode ("sjmp", "!tlabel", labelKey2num (tlbl1->key));
   emitLabel (tlbl);
   emitcode ("mov", "c,ov");
   _startLazyDPSEvaluation ();
@@ -10203,7 +10054,7 @@
   _endLazyDPSEvaluation ();
   reAdjustPreg (AOP (result));
   emitLabel (tlbl1);
-  emitcode ("djnz", "b,!tlabel", tlbl->key + 100);
+  emitcode ("djnz", "b,!tlabel", labelKey2num (tlbl->key));
   popB (pushedB);
 
 release:
@@ -10312,19 +10163,19 @@
   if (size == 1)
     {
       MOVA (aopGet (left, 0, FALSE, FALSE, NULL));
-      emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
+      emitcode ("sjmp", "!tlabel", labelKey2num (tlbl1->key));
       emitLabel (tlbl);
       CLRC;
       emitcode ("rrc", "a");
       emitLabel (tlbl1);
-      emitcode ("djnz", "b,!tlabel", tlbl->key + 100);
+      emitcode ("djnz", "b,!tlabel", labelKey2num (tlbl->key));
       popB (pushedB);
       aopPut (result, "a", 0);
       goto release;
     }
 
   reAdjustPreg (AOP (result));
-  emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
+  emitcode ("sjmp", "!tlabel", labelKey2num (tlbl1->key));
   emitLabel (tlbl);
   CLRC;
   _startLazyDPSEvaluation ();
@@ -10338,7 +10189,7 @@
   reAdjustPreg (AOP (result));
 
   emitLabel (tlbl1);
-  emitcode ("djnz", "b,!tlabel", tlbl->key + 100);
+  emitcode ("djnz", "b,!tlabel", labelKey2num (tlbl->key));
   popB (pushedB);
 
 release:
@@ -10457,13 +10308,13 @@
     {
       emitPtrByteGet (rname, ptype, FALSE);
       AccRol (8 - bstr);
-      emitcode ("anl", "a,#!constbyte", ((unsigned char) -1) >> (8 - blen));
+      emitcode ("anl", "a,#!constbyte", ((unsigned char) - 1) >> (8 - blen));
       if (!SPEC_USIGN (etype))
         {
           /* signed bitfield */
           symbol *tlbl = newiTempLabel (NULL);
 
-          emitcode ("jnb", "acc.%d,!tlabel", blen - 1, tlbl->key + 100);
+          emitcode ("jnb", "acc.%d,!tlabel", blen - 1, labelKey2num (tlbl->key));
           emitcode ("orl", "a,#0x%02x", (unsigned char) (0xff << blen));
           emitLabel (tlbl);
         }
@@ -10485,13 +10336,13 @@
   if (rlen)
     {
       emitPtrByteGet (rname, ptype, FALSE);
-      emitcode ("anl", "a,#!constbyte", ((unsigned char) -1) >> (8 - rlen));
+      emitcode ("anl", "a,#!constbyte", ((unsigned char) - 1) >> (8 - rlen));
       if (!SPEC_USIGN (etype))
         {
           /* signed bitfield */
           symbol *tlbl = newiTempLabel (NULL);
 
-          emitcode ("jnb", "acc.%d,!tlabel", rlen - 1, tlbl->key + 100);
+          emitcode ("jnb", "acc.%d,!tlabel", rlen - 1, labelKey2num (tlbl->key));
           emitcode ("orl", "a,#0x%02x", (unsigned char) (0xff << rlen));
           emitLabel (tlbl);
         }
@@ -10534,7 +10385,7 @@
   aopOp (result, ic, TRUE, FALSE);
 
   /* get the string representation of the name */
-  l = aopGet (left, 0, FALSE, TRUE, NULL) + 1;        // remove #
+  l = aopGet (left, 0, FALSE, TRUE, NULL) + 1;  // remove #
   size = AOP_SIZE (result);
   _startLazyDPSEvaluation ();
   while (size--)
@@ -10641,7 +10492,8 @@
   if (aop)                      /* we had to allocate for this iCode */
     {
       if (pi)
-        {                       /* post increment present */
+        {
+          /* post increment present */
           aopPut (left, rname, 0);
         }
       freeAsmop (NULL, aop, ic, TRUE);
@@ -10971,19 +10823,20 @@
 static void
 genGenPointerGet (operand * left, operand * result, iCode * ic, iCode * pi)
 {
-  int size, offset;
+  int size, offset, dopi;
   bool pushedB;
   sym_link *retype = getSpec (operandType (result));
   sym_link *letype = getSpec (operandType (left));
 
   D (emitcode (";", "genGenPointerGet"));
 
-  aopOp (left, ic, FALSE, (IS_OP_RUONLY (left) ? FALSE : TRUE));
+  aopOp (left, ic, FALSE, FALSE);
+
   pushedB = pushB ();
-  loadDptrFromOperand (left, TRUE);
+  dopi = loadDptrFromOperand (left, TRUE);
 
   /* so dptr-b now contains the address */
-  aopOp (result, ic, FALSE, TRUE);
+  aopOp (result, ic, FALSE, (AOP_INDPTRn (left) ? FALSE : TRUE));
 
   /* if bit then unpack */
   if (IS_BITFIELD (retype) || IS_BITFIELD (letype))
@@ -11017,14 +10870,14 @@
               aopPut (result, "a", offset++);
             }
 
-          if (size || (pi && AOP_TYPE (left) != AOP_IMMD))
+          if (size || (dopi && pi && AOP_TYPE (left) != AOP_IMMD))
             {
               emitcode ("inc", "dptr");
             }
         }
     }
 
-  if (pi && AOP_TYPE (left) != AOP_IMMD)
+  if (dopi && pi && AOP_TYPE (left) != AOP_IMMD)
     {
       _startLazyDPSEvaluation ();
 
@@ -11042,9 +10895,8 @@
 
       pi->generated = 1;
     }
-  else if (OP_SYMBOL (left)->ruonly && AOP_SIZE (result) > 1 && (OP_SYMBOL (left)->liveTo > ic->seq || ic->depth))
+  else if (IS_OP_RUONLY (left) && AOP_SIZE (result) > 1 && (OP_SYMBOL (left)->liveTo > ic->seq || ic->depth))
     {
-
       size = AOP_SIZE (result) - 1;
       while (size--)
         emitcode ("lcall", "__decdptr");
@@ -11211,7 +11063,7 @@
   /* If there was a partial byte at the end */
   if (rlen)
     {
-      mask = (((unsigned char) -1 << rlen) & 0xff);
+      mask = (((unsigned char) - 1 << rlen) & 0xff);
 
       if (AOP_TYPE (right) == AOP_LIT)
         {
@@ -11586,20 +11438,19 @@
 static void
 genGenPointerSet (operand * right, operand * result, iCode * ic, iCode * pi)
 {
-  int size, offset;
+  int size, offset, dopi;
   bool pushedB;
   sym_link *retype = getSpec (operandType (right));
   sym_link *letype = getSpec (operandType (result));
 
   D (emitcode (";", "genGenPointerSet"));
 
-  aopOp (result, ic, FALSE, IS_OP_RUONLY (result) ? FALSE : TRUE);
-
+  aopOp (result, ic, FALSE, FALSE);
   pushedB = pushB ();
-  loadDptrFromOperand (result, TRUE);
+  dopi = loadDptrFromOperand (result, TRUE);
 
   /* so dptr-b now contains the address */
-  aopOp (right, ic, FALSE, TRUE);
+  aopOp (right, ic, FALSE, (AOP_INDPTRn (result) ? FALSE : TRUE));
 
   /* if bit then unpack */
   if (IS_BITFIELD (retype) || IS_BITFIELD (letype))
@@ -11640,7 +11491,7 @@
               emitcode ("lcall", "__gptrput");
             }
 
-          if (size || (pi && AOP_TYPE (result) != AOP_IMMD))
+          if (size || (dopi && pi && AOP_TYPE (result) != AOP_IMMD))
             {
               emitcode ("inc", "dptr");
             }
@@ -11648,7 +11499,7 @@
       _endLazyDPSEvaluation ();
     }
 
-  if (pi && AOP_TYPE (result) != AOP_IMMD)
+  if (dopi && pi && AOP_TYPE (result) != AOP_IMMD)
     {
       _startLazyDPSEvaluation ();
 
@@ -11667,7 +11518,7 @@
 
       pi->generated = 1;
     }
-  else if (IS_SYMOP (result) && OP_SYMBOL (result)->ruonly && AOP_SIZE (right) > 1 &&
+  else if (IS_SYMOP (result) && IS_OP_RUONLY (result) && AOP_SIZE (right) > 1 &&
            (OP_SYMBOL (result)->liveTo > ic->seq || ic->depth))
     {
       size = AOP_SIZE (right) - 1;
@@ -11818,14 +11669,14 @@
           dbuf_init (&dbuf, 128);
           dbuf_tprintf (&dbuf, "#!constbyte", (options.stack_loc >> 16) & 0xff);
           /* if it has an offset then we need to compute it */
-/*        emitcode ("subb", "a,#!constbyte", */
-/*                  -((sym->stack < 0) ? */
-/*                    ((short) (sym->stack - _G.nRegsSaved)) : */
-/*                    ((short) sym->stack)) & 0xff); */
-/*        emitcode ("mov","b,a"); */
-/*        emitcode ("mov","a,#!constbyte",(-((sym->stack < 0) ? */
-/*                                       ((short) (sym->stack - _G.nRegsSaved)) : */
-/*                                       ((short) sym->stack)) >> 8) & 0xff); */
+          /*        emitcode ("subb", "a,#!constbyte", */
+          /*                  -((sym->stack < 0) ? */
+          /*                    ((short) (sym->stack - _G.nRegsSaved)) : */
+          /*                    ((short) sym->stack)) & 0xff); */
+          /*        emitcode ("mov","b,a"); */
+          /*        emitcode ("mov","a,#!constbyte",(-((sym->stack < 0) ? */
+          /*                                       ((short) (sym->stack - _G.nRegsSaved)) : */
+          /*                                       ((short) sym->stack)) >> 8) & 0xff); */
           if (sym->stack)
             {
               emitcode ("mov", "a,_bpx");
@@ -11997,7 +11848,7 @@
       freeAsmop (right, NULL, ic, FALSE);
 #if 0
       some alternative code for processors without auto - toggle
-        no time to test now, so later well put in ... kpb D (emitcode (";", "genFarFarAssign (dual-dptr fun)"));
+      no time to test now, so later well put in ... kpb D (emitcode (";", "genFarFarAssign (dual-dptr fun)"));
       emitcode ("mov", "dps,#1");       /* Select DPTR2. */
       emitcode ("mov", "dptr,#%s", rSym->rname);
       /* DP2 = result, DP1 = right, DP1 is current. */
@@ -12054,7 +11905,11 @@
   if (operandsEqu (result, right) && !isOperandVolatile (result, FALSE) && !isOperandVolatile (right, FALSE))
     return;
 
-  aopOp (right, ic, FALSE, FALSE);
+  /* if both are ruonly */
+  if (IS_OP_RUONLY (right) && IS_OP_RUONLY (result))
+    return;
+
+  aopOp (right, ic, FALSE, IS_OP_RUONLY (result));
 
   emitcode (";", "genAssign: resultIsFar = %s", isOperandInFarSpace (result) ? "TRUE" : "FALSE");
 
@@ -12185,12 +12040,12 @@
   freeAsmop (IC_JTCOND (ic), NULL, ic, TRUE);
 
   jtab = newiTempLabel (NULL);
-  emitcode ("mov", "dptr,#!tlabel", jtab->key + 100);
+  emitcode ("mov", "dptr,#!tlabel", labelKey2num (jtab->key));
   emitcode ("jmp", "@a+dptr");
   emitLabel (jtab);
   /* now generate the jump labels */
   for (jtab = setFirstItem (IC_JTLABELS (ic)); jtab; jtab = setNextItem (IC_JTLABELS (ic)))
-    emitcode ("ljmp", "!tlabel", jtab->key + 100);
+    emitcode ("ljmp", "!tlabel", labelKey2num (jtab->key));
 }
 
 /*-----------------------------------------------------------------*/
@@ -12471,7 +12326,8 @@
               emitcode ("mov", "dptr,%s", aopGet (to, 0, TRUE, FALSE, NULL));
             }
           else
-            {                   /* we need to get it byte by byte */
+            {
+              /* we need to get it byte by byte */
               emitcode ("mov", "dpl,%s", aopGet (to, 0, FALSE, FALSE, NULL));
               emitcode ("mov", "dph,%s", aopGet (to, 1, FALSE, FALSE, NULL));
               if (options.model == MODEL_FLAT24)
@@ -12523,14 +12379,14 @@
       emitcode ("inc", "dptr");
       emitcode ("mov", "a,b");
       emitcode ("orl", "a,_ap");
-      emitcode ("jz", "!tlabel", lbl1->key + 100);
+      emitcode ("jz", "!tlabel", labelKey2num (lbl1->key));
       emitcode ("mov", "a,_ap");
       emitcode ("add", "a,#!constbyte", 0xFF);
       emitcode ("mov", "_ap,a");
       emitcode ("mov", "a,b");
       emitcode ("addc", "a,#!constbyte", 0xFF);
       emitcode ("mov", "b,a");
-      emitcode ("sjmp", "!tlabel", lbl->key + 100);
+      emitcode ("sjmp", "!tlabel", labelKey2num (lbl->key));
       emitLabel (lbl1);
     }
   emitcode ("mov", "dps,#0");
@@ -12603,7 +12459,8 @@
               emitcode ("mov", "dptr,%s", aopGet (to, 0, TRUE, FALSE, NULL));
             }
           else
-            {                   /* we need to get it byte by byte */
+            {
+              /* we need to get it byte by byte */
               emitcode ("mov", "dpl,%s", aopGet (to, 0, FALSE, FALSE, NULL));
               emitcode ("mov", "dph,%s", aopGet (to, 1, FALSE, FALSE, NULL));
               if (options.model == MODEL_FLAT24)
@@ -12655,19 +12512,19 @@
       emitcode ("movx", "a,@dptr");
       emitcode ("clr", "c");
       emitcode ("subb", "a,r0");
-      emitcode ("jnz", "!tlabel", lbl2->key + 100);
+      emitcode ("jnz", "!tlabel", labelKey2num (lbl2->key));
       emitcode ("inc", "dptr");
       emitcode ("inc", "dptr");
       emitcode ("mov", "a,b");
       emitcode ("orl", "a,_ap");
-      emitcode ("jz", "!tlabel", lbl1->key + 100);
+      emitcode ("jz", "!tlabel", labelKey2num (lbl1->key));
       emitcode ("mov", "a,_ap");
       emitcode ("add", "a,#!constbyte", 0xFF);
       emitcode ("mov", "_ap,a");
       emitcode ("mov", "a,b");
       emitcode ("addc", "a,#!constbyte", 0xFF);
       emitcode ("mov", "b,a");
-      emitcode ("sjmp", "!tlabel", lbl->key + 100);
+      emitcode ("sjmp", "!tlabel", labelKey2num (lbl->key));
       emitLabel (lbl1);
       emitcode ("clr", "a");
       emitLabel (lbl2);
@@ -12748,7 +12605,8 @@
               emitcode ("mov", "dptr,%s", aopGet (to, 0, TRUE, FALSE, NULL));
             }
           else
-            {                   /* we need to get it byte by byte */
+            {
+              /* we need to get it byte by byte */
               emitcode ("mov", "dpl,%s", aopGet (to, 0, FALSE, FALSE, NULL));
               emitcode ("mov", "dph,%s", aopGet (to, 1, FALSE, FALSE, NULL));
               if (options.model == MODEL_FLAT24)
@@ -12778,7 +12636,7 @@
       emitcode ("movx", "@dptr,a");     /* save into location */
       emitcode ("inc", "dptr"); /* point to next area */
       emitcode ("inc", "dps");  /* switch to DPTR2 */
-      emitcode ("djnz", "b,!tlabel", lbl->key + 100);
+      emitcode ("djnz", "b,!tlabel", labelKey2num (lbl->key));
     }
   else
     {
@@ -12795,18 +12653,18 @@
       emitcode ("movx", "@dptr,a");
       emitcode ("inc", "dptr");
       emitcode ("inc", "dps");  /* switch to DPTR2 */
-/*      emitcode ("djnz","b,!tlabel",lbl->key+100); */
-/*      emitcode ("djnz","_ap,!tlabel",lbl->key+100); */
+      /*      emitcode ("djnz","b,!tlabel",lbl->key+100); */
+      /*      emitcode ("djnz","_ap,!tlabel",lbl->key+100); */
       emitcode ("mov", "a,b");
       emitcode ("orl", "a,_ap");
-      emitcode ("jz", "!tlabel", lbl1->key + 100);
+      emitcode ("jz", "!tlabel", labelKey2num (lbl1->key));
       emitcode ("mov", "a,_ap");
       emitcode ("add", "a,#!constbyte", 0xFF);
       emitcode ("mov", "_ap,a");
       emitcode ("mov", "a,b");
       emitcode ("addc", "a,#!constbyte", 0xFF);
       emitcode ("mov", "b,a");
-      emitcode ("sjmp", "!tlabel", lbl->key + 100);
+      emitcode ("sjmp", "!tlabel", labelKey2num (lbl->key));
       emitLabel (lbl1);
     }
   emitcode ("mov", "dps,#0");
@@ -12881,7 +12739,8 @@
               emitcode ("mov", "dptr,%s", aopGet (to, 0, TRUE, FALSE, NULL));
             }
           else
-            {                   /* we need to get it byte by byte */
+            {
+              /* we need to get it byte by byte */
               emitcode ("mov", "dpl,%s", aopGet (to, 0, FALSE, FALSE, NULL));
               emitcode ("mov", "dph,%s", aopGet (to, 1, FALSE, FALSE, NULL));
               if (options.model == MODEL_FLAT24)
@@ -12910,7 +12769,7 @@
       emitcode ("movx", "@dptr,a");     /* save into location */
       emitcode ("inc", "dptr"); /* point to next area */
       emitcode ("dec", "dps");  /* switch to DPTR */
-      emitcode ("djnz", "b,!tlabel", lbl->key + 100);
+      emitcode ("djnz", "b,!tlabel", labelKey2num (lbl->key));
       freeAsmop (count, NULL, ic, FALSE);
     }
   else
@@ -12930,14 +12789,14 @@
       emitcode ("dec", "dps");  /* switch to DPTR */
       emitcode ("mov", "a,b");
       emitcode ("orl", "a,_ap");
-      emitcode ("jz", "!tlabel", lbl1->key + 100);
+      emitcode ("jz", "!tlabel", labelKey2num (lbl1->key));
       emitcode ("mov", "a,_ap");
       emitcode ("add", "a,#!constbyte", 0xFF);
       emitcode ("mov", "_ap,a");
       emitcode ("mov", "a,b");
       emitcode ("addc", "a,#!constbyte", 0xFF);
       emitcode ("mov", "b,a");
-      emitcode ("sjmp", "!tlabel", lbl->key + 100);
+      emitcode ("sjmp", "!tlabel", labelKey2num (lbl->key));
       emitLabel (lbl1);
     }
   emitcode ("mov", "dps,#0");
@@ -13027,7 +12886,8 @@
               emitcode ("mov", "dptr,%s", aopGet (to, 0, TRUE, FALSE, NULL));
             }
           else
-            {                   /* we need to get it byte by byte */
+            {
+              /* we need to get it byte by byte */
               emitcode ("mov", "dpl,%s", aopGet (to, 0, FALSE, FALSE, NULL));
               emitcode ("mov", "dph,%s", aopGet (to, 1, FALSE, FALSE, NULL));
               if (options.model == MODEL_FLAT24)
@@ -13053,7 +12913,7 @@
       emitLabel (lbl);
       emitcode ("movx", "@dptr,a");
       emitcode ("inc", "dptr");
-      emitcode ("djnz", "b,!tlabel", lbl->key + 100);
+      emitcode ("djnz", "b,!tlabel", labelKey2num (lbl->key));
     }
   else
     {
@@ -13067,14 +12927,14 @@
       emitcode ("inc", "dptr");
       emitcode ("mov", "a,b");
       emitcode ("orl", "a,_ap");
-      emitcode ("jz", "!tlabel", lbl1->key + 100);
+      emitcode ("jz", "!tlabel", labelKey2num (lbl1->key));
       emitcode ("mov", "a,_ap");
       emitcode ("add", "a,#!constbyte", 0xFF);
       emitcode ("mov", "_ap,a");
       emitcode ("mov", "a,b");
       emitcode ("addc", "a,#!constbyte", 0xFF);
       emitcode ("mov", "b,a");
-      emitcode ("sjmp", "!tlabel", lbl->key + 100);
+      emitcode ("sjmp", "!tlabel", labelKey2num (lbl->key));
       emitLabel (lbl1);
     }
   freeAsmop (count, NULL, ic, FALSE);
@@ -13254,7 +13114,7 @@
   emitcode ("mov", "dptr,#LibraryID");
   /* make the call */
   emitcode ("lcall", "NatLib_Remove%sStateBlock", name);
-  emitcode ("jnz", "!tlabel", lbl->key + 100);
+  emitcode ("jnz", "!tlabel", labelKey2num (lbl->key));
 
   /* put return value into place */
   aopOp (IC_RESULT (ic), ic, FALSE, FALSE);
@@ -13319,7 +13179,7 @@
 
   /* make the call */
   emitcode ("lcall", "MM_%s", name);
-  emitcode ("jz", "!tlabel", lbl->key + 100);
+  emitcode ("jz", "!tlabel", labelKey2num (lbl->key));
   emitcode ("mov", "r2,#!constbyte", 0xff);
   emitcode ("mov", "r3,#!constbyte", 0xff);
   emitLabel (lbl);
@@ -13486,7 +13346,8 @@
       emitcode ("mov", "dptr,%s", aopGet (pp, 0, TRUE, FALSE, NULL));
     }
   else if (AOP_TYPE (pp) != AOP_STR)
-    {                           /* not already in dptr */
+    {
+      /* not already in dptr */
       emitcode ("mov", "dpl,%s", aopGet (pp, 0, FALSE, FALSE, NULL));
       emitcode ("mov", "dph,%s", aopGet (pp, 1, FALSE, FALSE, NULL));
       emitcode ("mov", "dpx,%s", aopGet (pp, 2, FALSE, FALSE, NULL));
@@ -13690,7 +13551,8 @@
       emitcode ("mov", "dptr,%s", aopGet (fp, 0, TRUE, FALSE, DP2_RESULT_REG));
     }
   else if (AOP_TYPE (fp) != AOP_STR)
-    {                           /* not already in dptr */
+    {
+      /* not already in dptr */
       emitcode ("mov", "dpl,%s", aopGet (fp, 0, FALSE, FALSE, DP2_RESULT_REG));
       emitcode ("mov", "dph,%s", aopGet (fp, 1, FALSE, FALSE, DP2_RESULT_REG));
       emitcode ("mov", "dpx,%s", aopGet (fp, 2, FALSE, FALSE, DP2_RESULT_REG));
@@ -13790,7 +13652,7 @@
         }
       emitcode ("dec", "%s", rByte);
       aopPut (IC_RESULT (ic), rByte, 0);
-      emitcode ("jnz", "!tlabel", lbl->key + 100);
+      emitcode ("jnz", "!tlabel", labelKey2num (lbl->key));
     }
   else if (IS_AOP_PREG (IC_RESULT (ic)))
     {
@@ -13798,15 +13660,15 @@
       MOVA (aopGet (IC_RESULT (ic), 0, FALSE, FALSE, NULL));
       freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
       ifx->generated = 1;
-      emitcode ("jnz", "!tlabel", lbl->key + 100);
+      emitcode ("jnz", "!tlabel", labelKey2num (lbl->key));
     }
   else
     {
-      emitcode ("djnz", "%s,!tlabel", aopGet (IC_RESULT (ic), 0, FALSE, TRUE, NULL), lbl->key + 100);
+      emitcode ("djnz", "%s,!tlabel", aopGet (IC_RESULT (ic), 0, FALSE, TRUE, NULL), labelKey2num (lbl->key));
     }
-  emitcode ("sjmp", "!tlabel", lbl1->key + 100);
+  emitcode ("sjmp", "!tlabel", labelKey2num (lbl1->key));
   emitLabel (lbl);
-  emitcode ("ljmp", "!tlabel", IC_TRUE (ifx)->key + 100);
+  emitcode ("ljmp", "!tlabel", labelKey2num (IC_TRUE (ifx)->key));
   emitLabel (lbl1);
 
   if (!ifx->generated)
@@ -13840,7 +13702,7 @@
           bool useDp2;
 
           useDp2 = isOperandInFarSpace (IC_RESULT (ic)) &&
-            (OP_SYMBOL (IC_RESULT (ic))->isspilt || IS_TRUE_SYMOP (IC_RESULT (ic)));
+                   (OP_SYMBOL (IC_RESULT (ic))->isspilt || IS_TRUE_SYMOP (IC_RESULT (ic)));
 
           _G.accInUse++;
           aopOp (IC_RESULT (ic), ic, FALSE, useDp2);
@@ -13855,7 +13717,8 @@
         }
     }
   else if (ic->argreg > 12)
-    {                           /* bit parameters */
+    {
+      /* bit parameters */
       reg_info *reg = OP_SYMBOL (IC_RESULT (ic))->regs[0];
 
       if (!reg || reg->rIdx != ic->argreg - 5)
@@ -13955,7 +13818,7 @@
     {
       aopOp (IC_RESULT (ic), ic, TRUE, FALSE);
       aopPut (IC_RESULT (ic), one, 0);  /* save old ea in an operand */
-      emitcode ("jbc", "ea,!tlabel", tlbl->key + 100);  /* atomic test & clear */
+      emitcode ("jbc", "ea,!tlabel", labelKey2num (tlbl->key)); /* atomic test & clear */
       aopPut (IC_RESULT (ic), zero, 0);
       emitLabel (tlbl);
       freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
@@ -13963,10 +13826,10 @@
   else
     {
       emitcode ("setb", "c");
-      emitcode ("jbc", "ea,!tlabel", tlbl->key + 100);  /* atomic test & clear */
+      emitcode ("jbc", "ea,!tlabel", labelKey2num (tlbl->key)); /* atomic test & clear */
       emitcode ("clr", "c");
       emitLabel (tlbl);
-      emitpush ("psw"); /* save old ea via c in psw on top of stack */
+      emitpush ("psw");         /* save old ea via c in psw on top of stack */
     }
 }
 
@@ -13996,7 +13859,7 @@
     }
   else
     {
-      emitpop ("psw");  /* restore ea via c in psw on top of stack */
+      emitpop ("psw");          /* restore ea via c in psw on top of stack */
       emitcode ("mov", "ea,c");
     }
 }
@@ -14211,7 +14074,7 @@
   int cln = 0;
 
   _G.currentFunc = NULL;
-  lineHead = lineCurr = NULL;
+
   dptrn[1][0] = "dpl1";
   dptrn[1][1] = "dph1";
   dptrn[1][2] = "dpx1";
@@ -14243,7 +14106,9 @@
 
   for (ic = lic; ic; ic = ic->next)
     {
-      _G.current_iCode = ic;
+      initGenLineElement ();
+
+      genLine.lineElement.ic = ic;
 
       if (ic->lineno && cln != ic->lineno)
         {
@@ -14291,25 +14156,25 @@
           break;
 
         case IPOP:
-          {
-            iCode *ifxIc, *popIc;
-            bool CommonRegs = FALSE;
+        {
+          iCode *ifxIc, *popIc;
+          bool CommonRegs = FALSE;
 
-            /* IPOP happens only when trying to restore a
-               spilt live range, if there is an ifx statement
-               following this pop (or several) then the if statement might
-               be using some of the registers being popped which
-               would destroy the contents of the register so
-               we need to check for this condition and handle it */
-            for (ifxIc = ic->next; ifxIc && ifxIc->op == IPOP; ifxIc = ifxIc->next);
-            for (popIc = ic; popIc && popIc->op == IPOP; popIc = popIc->next)
-              CommonRegs |= (ifxIc && ifxIc->op == IFX && !ifxIc->generated && regsInCommon (IC_LEFT (popIc), IC_COND (ifxIc)));
-            if (CommonRegs)
-              genIfx (ifxIc, ic);
-            else
-              genIpop (ic);
-          }
-          break;
+          /* IPOP happens only when trying to restore a
+             spilt live range, if there is an ifx statement
+             following this pop (or several) then the if statement might
+             be using some of the registers being popped which
+             would destroy the contents of the register so
+             we need to check for this condition and handle it */
+          for (ifxIc = ic->next; ifxIc && ifxIc->op == IPOP; ifxIc = ifxIc->next);
+          for (popIc = ic; popIc && popIc->op == IPOP; popIc = popIc->next)
+            CommonRegs |= (ifxIc && ifxIc->op == IFX && !ifxIc->generated && regsInCommon (IC_LEFT (popIc), IC_COND (ifxIc)));
+          if (CommonRegs)
+            genIfx (ifxIc, ic);
+          else
+            genIpop (ic);
+        }
+        break;
 
         case CALL:
           genCall (ic);
@@ -14489,9 +14354,11 @@
   /* now we are ready to call the
      peep hole optimizer */
   if (!options.nopeep)
-    peepHole (&lineHead);
+    peepHole (&genLine.lineHead);
 
   /* now do the actual printing */
-  printLine (lineHead, codeOutBuf);
-  return;
+  printLine (genLine.lineHead, codeOutBuf);
+
+  /* destroy the line list */
+  destroy_line_list ();
 }
diff -Nru sdcc-3.1.0+dfsg/src/ds390/gen.h sdcc-3.2.0+dfsg/src/ds390/gen.h
--- sdcc-3.1.0+dfsg/src/ds390/gen.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/ds390/gen.h	2012-03-30 20:01:27.000000000 +0000
@@ -1,25 +1,21 @@
 /*-------------------------------------------------------------------------
   gen.h - header file for code generation for DS80C390
 
-             Written By -  Sandeep Dutta . sandeep.dutta@usa.net (1998)
+  Copyright (C) 1998, Sandeep Dutta . sandeep.dutta@usa.net
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   In other words, you are welcome to use, share and improve this program.
-   You are forbidden to forbid anyone else to use, share and improve
-   what you give them.   Help stamp out software-hoarding!
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 -------------------------------------------------------------------------*/
 
 #ifndef SDCCGEN390_H
diff -Nru sdcc-3.1.0+dfsg/src/ds390/main.c sdcc-3.2.0+dfsg/src/ds390/main.c
--- sdcc-3.1.0+dfsg/src/ds390/main.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/ds390/main.c	2012-04-25 16:05:36.000000000 +0000
@@ -1,17 +1,33 @@
-/** @file main.c
-    ds390 specific general functions.
+/*-------------------------------------------------------------------------
+  main.h - ds390 specific general functions
 
-    Note that mlh prepended _ds390_ on the static functions.  Makes
-    it easier to set a breakpoint using the debugger.
+  Copyright (C) 2000, Kevin Vigor
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-------------------------------------------------------------------------*/
+/*
+  Note that mlh prepended _ds390_ on the static functions.  Makes
+  it easier to set a breakpoint using the debugger.
 */
+
 #include "common.h"
 #include "main.h"
 #include "ralloc.h"
 #include "gen.h"
 #include "dbuf_string.h"
-#include "../SDCCutil.h"
-#include "../SDCCglobl.h"
-#include "../SDCCsystem.h"
+
 static char _defaultRules[] =
 {
 #include "peeph.rul"
@@ -854,12 +870,12 @@
 initializeAsmLineNode (lineNode *line)
 {
   if (!line->aln)
-    line->aln = asmLineNodeFromLineNode (line, 0);
-  else if (line->aln && !line->aln->initialized)
+    line->aln = (asmLineNodeBase *) asmLineNodeFromLineNode (line, 0);
+  else if (line->aln && !((asmLineNode *)line->aln)->initialized)
     {
-      int currentDPS = line->aln->currentDPS;
+      int currentDPS = ((asmLineNode *)line->aln)->currentDPS;
       free(line->aln);
-      line->aln = asmLineNodeFromLineNode (line, currentDPS);
+      line->aln = (asmLineNodeBase *) asmLineNodeFromLineNode (line, currentDPS);
     }
 }
 
@@ -946,8 +962,8 @@
   {
     _asmCmd,
     NULL,
-    "-plosgffwzc",              /* Options with debug */
-    "-plosgffwz",               /* Options without debug */
+    "-plosgffwc",               /* Options with debug */
+    "-plosgffw",                /* Options without debug */
     0,
     ".asm",
     NULL                        /* no do_assemble function */
@@ -1544,8 +1560,8 @@
   {
     _asmCmd,
     NULL,
-    "-plosgffwzc",              /* Options with debug */
-    "-plosgffwz",               /* Options without debug */
+    "-plosgffwc",               /* Options with debug */
+    "-plosgffw",                /* Options without debug */
     0,
     ".asm",
     NULL                        /* no do_assemble function */
diff -Nru sdcc-3.1.0+dfsg/src/ds390/main.h sdcc-3.2.0+dfsg/src/ds390/main.h
--- sdcc-3.1.0+dfsg/src/ds390/main.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/ds390/main.h	2012-03-30 20:01:27.000000000 +0000
@@ -1,13 +1,40 @@
+/*-------------------------------------------------------------------------
+  main.h - ds390 specific general header file
+
+  Copyright (C) 2000, Kevin Vigor
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-------------------------------------------------------------------------*/
+
 #ifndef MAIN_INCLUDE
 #define MAIN_INCLUDE
 
+#include "SDCCgen.h"
+
 typedef struct asmLineNode
   {
+#ifdef UNNAMED_STRUCT_TAG
+  struct asmLineNodeBase;
+#else
+    /* exactly the same members as of struct asmLineNodeBase from SDCCgen.h */
     int size;
-    int currentDPS;
-    unsigned initialized:1;
     bitVect *regsRead;
     bitVect *regsWritten;
+#endif
+    int currentDPS;
+    unsigned initialized:1;
   }
 asmLineNode;
 
diff -Nru sdcc-3.1.0+dfsg/src/ds390/ralloc.c sdcc-3.2.0+dfsg/src/ds390/ralloc.c
--- sdcc-3.1.0+dfsg/src/ds390/ralloc.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/ds390/ralloc.c	2012-06-05 09:03:12.000000000 +0000
@@ -2608,7 +2608,7 @@
   int i, key;
   symbol *sym;
   iCode *ic, *dic;
-  sym_link *type, *etype;
+  sym_link *type;
 
   if (!IS_SYMOP (op) || !IS_ITEMP (op))
     return NULL;
@@ -2652,7 +2652,7 @@
         {
           if (OP_SYMBOL (IC_RESULT (ic))->liveTo == OP_SYMBOL (IC_RESULT (ic))->liveFrom)
             continue;
-          etype = getSpec (type = operandType (IC_RESULT (ic)));
+          type = operandType (IC_RESULT (ic));
           if (getSize (type) == 0 || isOperandEqual (op, IC_RESULT (ic)))
             continue;
           return NULL;
@@ -2881,6 +2881,7 @@
   iCode *dic, *lic;
   bitVect *dbv;
   struct eBBlock *ebp = ebpp[blockno];
+  int disallowHiddenAssignment = 0;
 
   if ((ic->op != IPUSH && ic->op != SEND) || !IS_ITEMP (IC_LEFT (ic)))
     return;
@@ -2899,6 +2900,12 @@
   if (dic->eBBlockNum != ic->eBBlockNum)
     return;
 
+  if (IS_OP_VOLATILE (IC_RIGHT (dic)))
+    return;
+
+  if ((IS_SYMOP (IC_RIGHT (dic)) && OP_SYMBOL (IC_RIGHT (dic))->addrtaken) || isOperandGlobal (IC_RIGHT (dic)))
+    disallowHiddenAssignment = 1;
+
   /* make sure the right side does not have any definitions
      inbetween */
   dbv = OP_DEFS (IC_RIGHT (dic));
@@ -2906,6 +2913,8 @@
     {
       if (bitVectBitValue (dbv, lic->key))
         return;
+      if (disallowHiddenAssignment && (lic->op == CALL || lic->op == PCALL || POINTER_SET (lic)))
+        return;
     }
   /* make sure they have the same type */
   if (IS_SPEC (operandType (IC_LEFT (ic))))
@@ -2929,6 +2938,8 @@
       if (IS_ITEMP (IC_RIGHT (dic)))
         bitVectSetBit (lic->rlive, IC_RIGHT (dic)->key);
     }
+  if (IS_ITEMP (IC_RIGHT (dic)))
+    OP_USES (IC_RIGHT (dic)) = bitVectSetBit (OP_USES (IC_RIGHT (dic)), ic->key);
   /* we now we know that it has one & only one def & use
      and the that the definition is an assignment */
   IC_LEFT (ic) = IC_RIGHT (dic);
@@ -3242,7 +3253,6 @@
           packForPush (ic, ebpp, blockno);
         }
 
-
       /* pack registers for accumulator use, when the
          result of an arithmetic or bit wise operation
          has only one use, that use is immediately following
diff -Nru sdcc-3.1.0+dfsg/src/hc08/gen.c sdcc-3.2.0+dfsg/src/hc08/gen.c
--- sdcc-3.1.0+dfsg/src/hc08/gen.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/hc08/gen.c	2012-06-14 16:07:45.000000000 +0000
@@ -1,11 +1,11 @@
 /*-------------------------------------------------------------------------
   gen.c - source file for code generation for the 68HC08
 
-  Hacked for the 68HC08 by Erik Petrich (2003)
-  Adapted from the 8051 code generator by:
-    Written By -  Sandeep Dutta . sandeep.dutta@usa.net (1998)
-           and -  Jean-Louis VERN.jlvern@writeme.com (1999)
-    Bug Fixes  -  Wojciech Stryjewski  wstryj1@tiger.lsu.edu (1999 v2.1.9a)
+  Copyright (C) 1998, Sandeep Dutta . sandeep.dutta@usa.net
+  Copyright (C) 1999, Jean-Louis VERN.jlvern@writeme.com
+  Bug Fixes - Wojciech Stryjewski  wstryj1@tiger.lsu.edu (1999 v2.1.9a)
+  Hacked for the 68HC08:
+  Copyright (C) 2003, Erik Petrich
 
   This program is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by the
@@ -20,15 +20,10 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-  In other words, you are welcome to use, share and improve this program.
-  You are forbidden to forbid anyone else to use, share and improve
-  what you give them.   Help stamp out software-hoarding!
-
 -------------------------------------------------------------------------*/
 
 /* Use the D macro for basic (unobtrusive) debugging messages */
-#define D(x) do if (options.verboseAsm) {x;} while(0)
+#define D(x) do if (options.verboseAsm) { x; } while (0)
 /* Use the DD macro for detailed debugging messages */
 #define DD(x)
 //#define DD(x) x
@@ -37,58 +32,55 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include "SDCCglobl.h"
-#include "newalloc.h"
 
 #include "common.h"
-#include "SDCCpeeph.h"
+#include "hc08.h"
 #include "ralloc.h"
 #include "gen.h"
+#include "dbuf_string.h"
 
 char *aopLiteral (value * val, int offset);
 char *aopLiteralLong (value * val, int offset, int size);
 extern int allocInfo;
-static int pushReg (reg_info *reg, bool freereg);
-static void pullReg (reg_info *reg);
-static void transferAopAop (asmop *srcaop, int srcofs, asmop *dstaop, int dstofs);
+static int pushReg (reg_info * reg, bool freereg);
+static void pullReg (reg_info * reg);
+static void transferAopAop (asmop * srcaop, int srcofs, asmop * dstaop, int dstofs);
+static void adjustStack (int n);
 
 static char *zero = "#0x00";
 static char *one = "#0x01";
 static char *spname;
 
-char *fReturnhc08[] =
-{"a", "x", "_ret2", "_ret3"};
+char *fReturnhc08[] = { "a", "x", "_ret2", "_ret3" };
+
 unsigned fReturnSizeHC08 = 4;   /* shared with ralloc.c */
 char **fReturn2 = fReturnhc08;
 
 
 static struct
-  {
-    short hxPushed;
-    short iyPushed;
-    short accInUse;
-    short inLine;
-    short debugLine;
-    short nRegsSaved;
-    int stackOfs;
-    int stackPushes;
-    short regsinuse;
-    set *sendSet;
-    iCode *current_iCode;
-  }
+{
+  short hxPushed;
+  short accInUse;
+  short nRegsSaved;
+  int stackOfs;
+  int stackPushes;
+  short regsinuse;
+  set *sendSet;
+  int tsxStackPushes;
+}
 _G;
 
-static asmop *hc08_aop_pass[4];
+static asmop *hc08_aop_pass[8];
+static asmop tsxaop;
 
 extern int hc08_ptrRegReq;
 extern int hc08_nRegs;
 extern struct dbuf_s *codeOutBuf;
 //static void saveRBank (int, iCode *, bool);
 static bool operandsEqu (operand * op1, operand * op2);
-static void loadRegFromConst (reg_info *reg, char *c);
-static char *aopName (asmop *aop);
-static asmop * newAsmop (short type);
-static char * aopAdrStr (asmop * aop, int loffset, bool bit16);
+static void loadRegFromConst (reg_info * reg, char *c);
+static asmop *newAsmop (short type);
+static char *aopAdrStr (asmop * aop, int loffset, bool bit16);
 #define RESULTONSTACK(x) \
                          (IC_RESULT(x) && IC_RESULT(x)->aop && \
                          IC_RESULT(x)->aop->type == AOP_STK )
@@ -96,12 +88,20 @@
 #define IS_AOP_HX(x) \
         (((x)->type == AOP_REG) \
          && ((x)->aopu.aop_reg[0] == hc08_reg_x) \
-         && ((x)->aopu.aop_reg[1] == hc08_reg_h) )
+         && ((x)->aopu.aop_reg[1] == hc08_reg_h) \
+         && ((x)->size == 2) )
 
 #define IS_AOP_XA(x) \
         (((x)->type == AOP_REG) \
          && ((x)->aopu.aop_reg[0] == hc08_reg_a) \
-         && ((x)->aopu.aop_reg[1] == hc08_reg_x) )
+         && ((x)->aopu.aop_reg[1] == hc08_reg_x) \
+         && ((x)->size == 2) )
+
+#define IS_AOP_AX(x) \
+        (((x)->type == AOP_REG) \
+         && ((x)->aopu.aop_reg[0] == hc08_reg_x) \
+         && ((x)->aopu.aop_reg[1] == hc08_reg_a) \
+         && ((x)->size == 2) )
 
 #define IS_AOP_A(x) \
         (((x)->type == AOP_REG) \
@@ -118,18 +118,26 @@
          && ((x)->aopu.aop_reg[0] == hc08_reg_h) \
          && ((x)->size == 1) )
 
-#define CLRC    emitcode("clc","")
+#define IS_AOP_WITH_A(x) \
+        (((x)->type == AOP_REG) \
+         && (((x)->aopu.aop_reg[0] == hc08_reg_a) \
+            || ((x)->aopu.aop_reg[1] == hc08_reg_a)))
 
-static lineNode *lineHead = NULL;
-static lineNode *lineCurr = NULL;
+
+#define CLRC    emitcode("clc","")
 
 #if 0
 static unsigned char SLMask[] =
-{0xFF, 0xFE, 0xFC, 0xF8, 0xF0,
- 0xE0, 0xC0, 0x80, 0x00};
+{
+  0xFF, 0xFE, 0xFC, 0xF8, 0xF0,
+  0xE0, 0xC0, 0x80, 0x00
+};
+
 static unsigned char SRMask[] =
-{0xFF, 0x7F, 0x3F, 0x1F, 0x0F,
- 0x07, 0x03, 0x01, 0x00};
+{
+  0xFF, 0x7F, 0x3F, 0x1F, 0x0F,
+  0x07, 0x03, 0x01, 0x00
+};
 #endif
 
 #define LSB     0
@@ -142,57 +150,15 @@
 #define AOP_SIZE(op) AOP(op)->size
 #define AOP_OP(aop) aop->op
 
-
-/*-----------------------------------------------------------------*/
-/* emitcode - writes the code into a file : for now it is simple    */
-/*-----------------------------------------------------------------*/
-static void
-emitcode (char *inst, char *fmt,...)
-{
-  va_list ap;
-  char lb[INITIAL_INLINEASM];
-  char *lbp = lb;
-
-  va_start (ap, fmt);
-
-  if (inst && *inst)
-    {
-      if (fmt && *fmt)
-        sprintf (lb, "%s\t", inst);
-      else
-        sprintf (lb, "%s", inst);
-      vsprintf (lb + (strlen (lb)), fmt, ap);
-    }
-  else
-    vsprintf (lb, fmt, ap);
-
-  while (isspace ((unsigned char)*lbp))
-    lbp++;
-
-  if (lbp && *lbp)
-    lineCurr = (lineCurr ?
-                connectLine (lineCurr, newLineNode (lb)) :
-                (lineHead = newLineNode (lb)));
-  lineCurr->isInline = _G.inLine;
-  lineCurr->isDebug = _G.debugLine;
-  lineCurr->ic = _G.current_iCode;
-  lineCurr->isComment = (*lbp==';');
-
-  //printf("%s\n", lb);
-  va_end (ap);
-}
-
-static void
-emitBranch (char *branchop, symbol *tlbl)
-{
-  emitcode (branchop, "%05d$", (tlbl->key + 100));
-}
+static bool regalloc_dry_run;
+static unsigned char regalloc_dry_run_cost;
 
 static void
-emitLabel (symbol *tlbl)
+emitBranch (char *branchop, symbol * tlbl)
 {
-  emitcode ("", "%05d$:", (tlbl->key +100));
-  lineCurr->isLabel = 1;
+  if (!regalloc_dry_run)
+    emitcode (branchop, "%05d$", labelKey2num (tlbl->key));
+  regalloc_dry_run_cost += (!strcmp(branchop, "jmp") || !strcmp(branchop, "brclr") || !strcmp(branchop, "brset") ? 3 : 2);
 }
 
 /*-----------------------------------------------------------------*/
@@ -200,11 +166,11 @@
 /*   with a debugger symbol                                        */
 /*-----------------------------------------------------------------*/
 void
-hc08_emitDebuggerSymbol (const char * debugSym)
+hc08_emitDebuggerSymbol (const char *debugSym)
 {
-  _G.debugLine = 1;
+  genLine.lineElement.isDebug = 1;
   emitcode ("", "%s ==.", debugSym);
-  _G.debugLine = 0;
+  genLine.lineElement.isDebug = 0;
 }
 
 
@@ -227,105 +193,107 @@
   /* But it's definately an error if there's no source. */
   if (!sreg)
     {
-      werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
-              "NULL sreg in transferRegReg");
+      werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "NULL sreg in transferRegReg");
       return;
     }
 
-  DD(emitcode ("", "; transferRegReg(%s,%s)",
-            sreg->name, dreg->name));
+  DD (emitcode ("", "; transferRegReg(%s,%s)", sreg->name, dreg->name));
 
   srcidx = sreg->rIdx;
   dstidx = dreg->rIdx;
 
-  if (srcidx==dstidx)
+  if (srcidx == dstidx)
     {
-      hc08_useReg(dreg);
+      hc08_useReg (dreg);
       return;
     }
 
   switch (dstidx)
     {
-      case A_IDX:
-        switch (srcidx)
-          {
-            case H_IDX: /* H to A */
-              pushReg (hc08_reg_h, FALSE);
-              pullReg (hc08_reg_a);
-              break;
-            case X_IDX: /* X to A */
-              emitcode ("txa", "");
-              break;
-            default:
-              error=1;
-          }
-        break;
-      case H_IDX:
-        switch (srcidx)
-          {
-            case A_IDX: /* A to H */
-              pushReg (hc08_reg_a, FALSE);
-              pullReg (hc08_reg_h);
-              break;
-            case X_IDX: /* X to H */
-              pushReg (hc08_reg_x, FALSE);
-              pullReg (hc08_reg_h);
-              break;
-            default:
-              error=1;
-          }
-        break;
-      case X_IDX:
-        switch (srcidx)
-          {
-            case A_IDX: /* A to X */
-              emitcode ("tax", "");
-              break;
-            case H_IDX: /* H to X */
-              pushReg (hc08_reg_h, FALSE);
-              pullReg (hc08_reg_x);
-              break;
-            default:
-              error=1;
-          }
-        break;
-      case HX_IDX:
-        switch (srcidx)
-          {
-            case XA_IDX: /* XA to HX */
-              pushReg (hc08_reg_x, FALSE);
-              pullReg (hc08_reg_h);
-              emitcode ("tax", "");
-              break;
-            default:
-              error=1;
-          }
-        break;
-      case XA_IDX:
-        switch (srcidx)
-          {
-            case HX_IDX: /* HX to XA */
-              emitcode ("txa", "");
-              pushReg (hc08_reg_h, FALSE);
-              pullReg (hc08_reg_x);
-              break;
-            default:
-              error=1;
-          }
-        break;
-      default:
-        error=1;
+    case A_IDX:
+      switch (srcidx)
+        {
+        case H_IDX:            /* H to A */
+          pushReg (hc08_reg_h, FALSE);
+          pullReg (hc08_reg_a);
+          break;
+        case X_IDX:            /* X to A */
+          emitcode ("txa", "");
+          regalloc_dry_run_cost++;
+          break;
+        default:
+          error = 1;
+        }
+      break;
+    case H_IDX:
+      switch (srcidx)
+        {
+        case A_IDX:            /* A to H */
+          pushReg (hc08_reg_a, FALSE);
+          pullReg (hc08_reg_h);
+          break;
+        case X_IDX:            /* X to H */
+          pushReg (hc08_reg_x, FALSE);
+          pullReg (hc08_reg_h);
+          break;
+        default:
+          error = 1;
+        }
+      break;
+    case X_IDX:
+      switch (srcidx)
+        {
+        case A_IDX:            /* A to X */
+          emitcode ("tax", "");
+          regalloc_dry_run_cost++;
+          break;
+        case H_IDX:            /* H to X */
+          pushReg (hc08_reg_h, FALSE);
+          pullReg (hc08_reg_x);
+          break;
+        default:
+          error = 1;
+        }
+      break;
+    case HX_IDX:
+      switch (srcidx)
+        {
+        case XA_IDX:           /* XA to HX */
+          pushReg (hc08_reg_x, FALSE);
+          pullReg (hc08_reg_h);
+          emitcode ("tax", "");
+          regalloc_dry_run_cost++;
+          break;
+        default:
+          error = 1;
+        }
+      break;
+    case XA_IDX:
+      switch (srcidx)
+        {
+        case HX_IDX:           /* HX to XA */
+          emitcode ("txa", "");
+          regalloc_dry_run_cost++;
+          pushReg (hc08_reg_h, FALSE);
+          pullReg (hc08_reg_x);
+          break;
+        default:
+          error = 1;
+        }
+      break;
+    default:
+      error = 1;
     }
 
   wassertl (!error, "bad combo in transferRegReg");
 
   if (freesrc)
-    hc08_freeReg(sreg);
+    hc08_freeReg (sreg);
 
   dreg->aop = sreg->aop;
   dreg->aopofs = sreg->aopofs;
   dreg->isFree = FALSE;
-  hc08_useReg(dreg);
+  hc08_useReg (dreg);
 }
 
 /*--------------------------------------------------------------------------*/
@@ -333,14 +301,13 @@
 /*             connonical frame address relative to the stack pointer       */
 /*--------------------------------------------------------------------------*/
 static void
-updateCFA(void)
+updateCFA (void)
 {
   /* there is no frame unless there is a function */
   if (!currFunc)
     return;
 
-  debugFile->writeFrameAddress (NULL, hc08_reg_sp,
-                                1 + _G.stackOfs + _G.stackPushes);
+  debugFile->writeFrameAddress (NULL, hc08_reg_sp, 1 + _G.stackOfs + _G.stackPushes);
 }
 
 /*--------------------------------------------------------------------------*/
@@ -348,97 +315,111 @@
 /*           marked free and available for reuse.                           */
 /*--------------------------------------------------------------------------*/
 static int
-pushReg (reg_info *reg, bool freereg)
+pushReg (reg_info * reg, bool freereg)
 {
   int regidx = reg->rIdx;
 
   switch (regidx)
     {
-      case A_IDX:
-        emitcode ("psha", "");
-        _G.stackPushes++;
-        updateCFA();
-        break;
-      case X_IDX:
-        emitcode ("pshx", "");
-        _G.stackPushes++;
-        updateCFA();
-        break;
-      case H_IDX:
-        emitcode ("pshh", "");
-        _G.stackPushes++;
-        updateCFA();
-        break;
-      case HX_IDX:
-        emitcode ("pshx", "");
-        _G.stackPushes++;
-        updateCFA();
-        emitcode ("pshh", "");
-        _G.stackPushes++;
-        updateCFA();
-        break;
-      case XA_IDX:
-        emitcode ("psha", "");
-        updateCFA();
-        _G.stackPushes++;
-        emitcode ("pshx", "");
-        updateCFA();
-        _G.stackPushes++;
-        break;
-      default:
-        break;
-      }
-   if (freereg)
-     hc08_freeReg(reg);
-  return -_G.stackOfs-_G.stackPushes;
+    case A_IDX:
+      emitcode ("psha", "");
+      regalloc_dry_run_cost++;
+      _G.stackPushes++;
+      updateCFA ();
+      break;
+    case X_IDX:
+      emitcode ("pshx", "");
+      regalloc_dry_run_cost++;
+      _G.stackPushes++;
+      updateCFA ();
+      break;
+    case H_IDX:
+      emitcode ("pshh", "");
+      regalloc_dry_run_cost++;
+      _G.stackPushes++;
+      updateCFA ();
+      break;
+    case HX_IDX:
+      emitcode ("pshx", "");
+      regalloc_dry_run_cost++;
+      _G.stackPushes++;
+      updateCFA ();
+      emitcode ("pshh", "");
+      regalloc_dry_run_cost++;
+      _G.stackPushes++;
+      updateCFA ();
+      break;
+    case XA_IDX:
+      emitcode ("psha", "");
+      regalloc_dry_run_cost++;
+      updateCFA ();
+      _G.stackPushes++;
+      emitcode ("pshx", "");
+      regalloc_dry_run_cost++;
+      updateCFA ();
+      _G.stackPushes++;
+      break;
+    default:
+      break;
+    }
+  if (freereg)
+    hc08_freeReg (reg);
+  return -_G.stackOfs - _G.stackPushes;
 }
 
 /*--------------------------------------------------------------------------*/
 /* pullReg - Pull register reg off the stack.                               */
 /*--------------------------------------------------------------------------*/
 static void
-pullReg (reg_info *reg)
+pullReg (reg_info * reg)
 {
   int regidx = reg->rIdx;
 
   switch (regidx)
     {
-      case A_IDX:
-        emitcode ("pula", "");
-        _G.stackPushes--;
-        updateCFA();
-        break;
-      case X_IDX:
-        emitcode ("pulx", "");
-        _G.stackPushes--;
-        updateCFA();
-        break;
-      case H_IDX:
-        emitcode ("pulh", "");
-        _G.stackPushes--;
-        updateCFA();
-        break;
-      case HX_IDX:
-        emitcode ("pulh", "");
-        _G.stackPushes--;
-        updateCFA();
-        emitcode ("pulx", "");
-        _G.stackPushes--;
-        updateCFA();
-        break;
-      case XA_IDX:
-        emitcode ("pulx", "");
-        _G.stackPushes--;
-        updateCFA();
-        emitcode ("pula", "");
-        _G.stackPushes--;
-        updateCFA();
-        break;
-      default:
-        break;
+    case A_IDX:
+      emitcode ("pula", "");
+      regalloc_dry_run_cost++;
+      _G.stackPushes--;
+      updateCFA ();
+      break;
+    case X_IDX:
+      emitcode ("pulx", "");
+      regalloc_dry_run_cost++;
+      _G.stackPushes--;
+      updateCFA ();
+      break;
+    case H_IDX:
+      emitcode ("pulh", "");
+      regalloc_dry_run_cost++;
+      _G.stackPushes--;
+      updateCFA ();
+      break;
+    case HX_IDX:
+      emitcode ("pulh", "");
+      regalloc_dry_run_cost++;
+      _G.stackPushes--;
+      updateCFA ();
+      emitcode ("pulx", "");
+      regalloc_dry_run_cost++;
+      _G.stackPushes--;
+      updateCFA ();
+      break;
+    case XA_IDX:
+      emitcode ("pulx", "");
+      regalloc_dry_run_cost++;
+      _G.stackPushes--;
+      updateCFA ();
+      emitcode ("pula", "");
+      regalloc_dry_run_cost++;
+      _G.stackPushes--;
+      updateCFA ();
+      break;
+    default:
+      break;
     }
-  hc08_useReg(reg);
-  hc08_dirtyReg(reg, FALSE);
+  hc08_useReg (reg);
+  hc08_dirtyReg (reg, FALSE);
 }
 
 /*--------------------------------------------------------------------------*/
@@ -447,11 +428,45 @@
 static void
 pullNull (int n)
 {
-  if (n)
+  wassert (n >= 0);
+  adjustStack (n);
+}
+
+/*--------------------------------------------------------------------------*/
+/* pushConst - Push a constant byte value onto stack                        */
+/*--------------------------------------------------------------------------*/
+static void
+pushConst (char * c)
+{
+  if (hc08_reg_a->isFree)
+    {
+      loadRegFromConst (hc08_reg_a, c);
+      pushReg (hc08_reg_a, TRUE);
+    }
+  else if (hc08_reg_x->isFree)
+    {
+      loadRegFromConst (hc08_reg_x, c);
+      pushReg (hc08_reg_x, TRUE);
+    }
+  else if (hc08_reg_h->isFree && !strcmp (c, zero))
+    {
+      loadRegFromConst (hc08_reg_h, c);
+      pushReg (hc08_reg_h, TRUE);
+    }
+  else if (!strcmp (c,zero))
+    {
+      adjustStack (-1);
+      emitcode ("clr", "1,s");
+      regalloc_dry_run_cost += 3;
+    }
+  else
     {
-      emitcode("ais","#%d",n);
-      _G.stackPushes -= n;
-      updateCFA();
+      pushReg (hc08_reg_a, FALSE);
+      pushReg (hc08_reg_a, FALSE);
+      loadRegFromConst (hc08_reg_a, c);
+      emitcode ("sta", "2,s");
+      regalloc_dry_run_cost += 3;
+      pullReg (hc08_reg_a);
     }
 }
 
@@ -472,11 +487,27 @@
 }
 
 /*--------------------------------------------------------------------------*/
+/* pushRegIfSurv - Push register reg if marked surviving. Returns true if   */
+/*                 the push was performed, false otherwise.                 */
+/*--------------------------------------------------------------------------*/
+static bool
+pushRegIfSurv (reg_info *reg)
+{
+  if (!reg->isDead)
+    {
+      pushReg (reg, TRUE);
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+/*--------------------------------------------------------------------------*/
 /* pullOrFreeReg - If needpull is true, register reg is pulled from the     */
 /*                 stack. Otherwise register reg is marked as free.         */
 /*--------------------------------------------------------------------------*/
 static void
-pullOrFreeReg (reg_info *reg, bool needpull)
+pullOrFreeReg (reg_info * reg, bool needpull)
 {
   if (needpull)
     pullReg (reg);
@@ -492,36 +523,52 @@
 {
   while (n)
     {
-      if (n>127)
+      if (n > 127)
         {
-          emitcode ("ais","#127");
+          emitcode ("ais", "#127");
+          regalloc_dry_run_cost += 2;
           n -= 127;
           _G.stackPushes -= 127;
-          updateCFA();
+          updateCFA ();
         }
-      else if (n<-128)
+      else if (n < -128)
         {
-          emitcode ("ais","#-128");
+          emitcode ("ais", "#-128");
+          regalloc_dry_run_cost += 2;
           n += 128;
           _G.stackPushes += 128;
-          updateCFA();
+          updateCFA ();
         }
       else
         {
-          emitcode ("ais", "#%d", n);
+          if (n == -1)
+            {
+              emitcode ("pshh", "");      /* 1 byte,  2 cycles */
+              regalloc_dry_run_cost++;
+            }
+          else if (n == 1 && optimize.codeSize && hc08_reg_h->isFree)
+            {
+              emitcode ("pulh", "");      /* 1 byte,  3 cycles */
+              regalloc_dry_run_cost++;
+            }
+          else
+            {
+              emitcode ("ais", "#%d", n); /* 2 bytes, 2 cycles */
+              regalloc_dry_run_cost += 2;
+            }
           _G.stackPushes -= n;
           n = 0;
-          updateCFA();
+          updateCFA ();
         }
     }
 }
 
-
+#if DD(1) -1 == 0
 /*--------------------------------------------------------------------------*/
 /* aopName - Return a string with debugging information about an asmop.     */
 /*--------------------------------------------------------------------------*/
 static char *
-aopName (asmop *aop)
+aopName (asmop * aop)
 {
   static char buffer[256];
   char *buf = buffer;
@@ -531,46 +578,45 @@
 
   switch (aop->type)
     {
-      case AOP_IMMD:
-        sprintf (buf,"IMMD(%s)", aop->aopu.aop_immd.aop_immd1);
-        return buf;
-      case AOP_LIT:
-        sprintf (buf,"LIT(%s)", aopLiteral (aop->aopu.aop_lit, 0));
-        return buf;
-      case AOP_DIR:
-        sprintf (buf,"DIR(%s)", aop->aopu.aop_dir);
-        return buf;
-      case AOP_EXT:
-        sprintf (buf,"EXT(%s)", aop->aopu.aop_dir);
-        return buf;
-      case AOP_SOF:
-        sprintf (buf,"SOF(%s)", OP_SYMBOL (aop->op)->name);
-        return buf;
-      case AOP_REG:
-        sprintf (buf, "REG(%s,%s,%s,%s)",
-                 aop->aopu.aop_reg[3] ? aop->aopu.aop_reg[3]->name : "-",
-                 aop->aopu.aop_reg[2] ? aop->aopu.aop_reg[2]->name : "-",
-                 aop->aopu.aop_reg[1] ? aop->aopu.aop_reg[1]->name : "-",
-                 aop->aopu.aop_reg[0] ? aop->aopu.aop_reg[0]->name : "-");
-        return buf;
-      case AOP_STK:
-        return "STK";
-      case AOP_STR:
-        return "STR";
-      default:
-        sprintf (buf,"?%d", aop->type);
-        return buf;
+    case AOP_IMMD:
+      sprintf (buf, "IMMD(%s)", aop->aopu.aop_immd.aop_immd1);
+      return buf;
+    case AOP_LIT:
+      sprintf (buf, "LIT(%s)", aopLiteral (aop->aopu.aop_lit, 0));
+      return buf;
+    case AOP_DIR:
+      sprintf (buf, "DIR(%s)", aop->aopu.aop_dir);
+      return buf;
+    case AOP_EXT:
+      sprintf (buf, "EXT(%s)", aop->aopu.aop_dir);
+      return buf;
+    case AOP_SOF:
+      sprintf (buf, "SOF(%s)", OP_SYMBOL (aop->op)->name);
+      return buf;
+    case AOP_REG:
+      sprintf (buf, "REG(%s,%s,%s,%s)",
+               aop->aopu.aop_reg[3] ? aop->aopu.aop_reg[3]->name : "-",
+               aop->aopu.aop_reg[2] ? aop->aopu.aop_reg[2]->name : "-",
+               aop->aopu.aop_reg[1] ? aop->aopu.aop_reg[1]->name : "-",
+               aop->aopu.aop_reg[0] ? aop->aopu.aop_reg[0]->name : "-");
+      return buf;
+    case AOP_STK:
+      return "STK";
+    default:
+      sprintf (buf, "?%d", aop->type);
+      return buf;
     }
 
   return "?";
 }
-
+#endif
 
 /*--------------------------------------------------------------------------*/
 /* loadRegFromAop - Load register reg from logical offset loffset of aop.   */
+/*                  For multi-byte registers, loffset is of the lsb reg.    */
 /*--------------------------------------------------------------------------*/
 static void
-loadRegFromAop (reg_info *reg, asmop *aop, int loffset)
+loadRegFromAop (reg_info * reg, asmop * aop, int loffset)
 {
   int regidx = reg->rIdx;
 
@@ -581,33 +627,32 @@
     }
 
 #if 0
-  printf("loadRegFromAop called\n");
+  printf ("loadRegFromAop called\n");
   if (!reg)
     {
-      printf(" reg = NULL\n");
+      printf (" reg = NULL\n");
       return;
     }
-  printf(" reg = %s\n", reg->name);
+  printf (" reg = %s\n", reg->name);
   if (!aop)
     {
-      printf(" aop = NULL\n");
+      printf (" aop = NULL\n");
       return;
     }
-  printf(" aop->type = %d\n", aop->type);
-  printf(" loffset = %d\n", loffset);
+  printf (" aop->type = %d\n", aop->type);
+  printf (" loffset = %d\n", loffset);
 
   if (aop->op)
-    printf(" aop has operand link\n");
+    printf (" aop has operand link\n");
   else
-    printf(" aop missing operand link\n");
+    printf (" aop missing operand link\n");
   if (reg->aop)
-    printf(" reg has operand link\n");
+    printf (" reg has operand link\n");
   else
-    printf(" reg missing operand link\n");
+    printf (" reg missing operand link\n");
 #endif
 
-  DD(emitcode ("", ";     loadRegFromAop (%s, %s, %d)",
-            reg->name, aopName (aop), loffset));
+  DD (emitcode ("", ";     loadRegFromAop (%s, %s, %d)", reg->name, aopName (aop), loffset));
 
   /* If operand is volatile, we cannot optimize. */
   if (!aop->op || isOperandVolatile (aop->op, FALSE))
@@ -616,22 +661,19 @@
 
   /* If this register already has this offset of the operand
      then we need only mark it as in use. */
-  if (reg->aop && reg->aop->op && aop->op
-      && operandsEqu(reg->aop->op,aop->op)
-      && (reg->aopofs == loffset))
+  if (reg->aop && reg->aop->op && aop->op && operandsEqu (reg->aop->op, aop->op) && (reg->aopofs == loffset))
     {
-      hc08_useReg(reg);
-      DD(emitcode ("","; already had correct value for %s", reg->name));
+      hc08_useReg (reg);
+      DD (emitcode ("", "; already had correct value for %s", reg->name));
       return;
     }
 
   /* TODO: check to see if we can transfer from another register */
 
   if (hc08_reg_h->aop && hc08_reg_h->aop->op && aop->op
-      && operandsEqu(hc08_reg_h->aop->op,aop->op)
-      && (hc08_reg_h->aopofs == loffset))
+      && operandsEqu (hc08_reg_h->aop->op, aop->op) && (hc08_reg_h->aopofs == loffset))
     {
-      DD(emitcode ("","; found correct value for %s in h", reg->name));
+      DD (emitcode ("", "; found correct value for %s in h", reg->name));
       transferRegReg (hc08_reg_h, reg, FALSE);
       hc08_useReg (reg);
       return;
@@ -639,137 +681,190 @@
 
 
   if (hc08_reg_x->aop && hc08_reg_x->aop->op && aop->op
-      && operandsEqu(hc08_reg_x->aop->op,aop->op)
-      && (hc08_reg_x->aopofs == loffset))
+      && operandsEqu (hc08_reg_x->aop->op, aop->op) && (hc08_reg_x->aopofs == loffset))
     {
-      DD(emitcode ("","; found correct value for %s in x", reg->name));
+      DD (emitcode ("", "; found correct value for %s in x", reg->name));
       transferRegReg (hc08_reg_x, reg, FALSE);
       hc08_useReg (reg);
       return;
     }
 
   if (hc08_reg_a->aop && hc08_reg_a->aop->op && aop->op
-      && operandsEqu(hc08_reg_a->aop->op,aop->op)
-      && (hc08_reg_a->aopofs == loffset))
+      && operandsEqu (hc08_reg_a->aop->op, aop->op) && (hc08_reg_a->aopofs == loffset))
     {
-      DD(emitcode ("","; found correct value for %s in a", reg->name));
+      DD (emitcode ("", "; found correct value for %s in a", reg->name));
       transferRegReg (hc08_reg_a, reg, FALSE);
       hc08_useReg (reg);
       return;
     }
 
 forceload:
-
   switch (regidx)
     {
-      case A_IDX:
-        if (aop->type == AOP_REG)
-          {
-            if (loffset < aop->size)
-              transferRegReg(aop->aopu.aop_reg[loffset], reg, FALSE);
-            else
-              emitcode ("clra", ""); /* TODO: handle sign extension */
-          }
-        else
-          {
-            char * l = aopAdrStr (aop, loffset, FALSE);
-            if (!strcmp (l, zero))
+    case A_IDX:
+      if (aop->type == AOP_REG)
+        {
+          if (loffset < aop->size)
+            transferRegReg (aop->aopu.aop_reg[loffset], reg, FALSE);
+          else
+            {
+              emitcode ("clra", "");      /* TODO: handle sign extension */
+              regalloc_dry_run_cost++;
+            }
+        }
+      else
+        {
+          char *l = aopAdrStr (aop, loffset, FALSE);
+          if (!strcmp (l, zero))
+            {
               emitcode ("clra", "");
-            else
+              regalloc_dry_run_cost++;
+            }
+          else
+            {
               emitcode ("lda", "%s", l);
-          }
-        break;
-      case X_IDX:
-        if (aop->type == AOP_REG)
-          {
-            if (loffset < aop->size)
-              transferRegReg(aop->aopu.aop_reg[loffset], reg, FALSE);
-            else
-              emitcode ("clrx", ""); /* TODO: handle sign extension */
-          }
-        else
-          {
-            char * l = aopAdrStr (aop, loffset, FALSE);
-            if (!strcmp (l, zero))
+              regalloc_dry_run_cost += ((aop->type == AOP_DIR || aop->type == AOP_IMMD || aop->type == AOP_LIT) ? 2 : 3);
+            }
+        }
+      break;
+    case X_IDX:
+      if (aop->type == AOP_REG)
+        {
+          if (loffset < aop->size)
+            transferRegReg (aop->aopu.aop_reg[loffset], reg, FALSE);
+          else
+            {
+              emitcode ("clrx", "");      /* TODO: handle sign extension */
+              regalloc_dry_run_cost++;
+            }
+        }
+      else
+        {
+          char *l = aopAdrStr (aop, loffset, FALSE);
+          if (!strcmp (l, zero))
+            {
               emitcode ("clrx", "");
-            else
+              regalloc_dry_run_cost++;
+            }
+          else
+            {
               emitcode ("ldx", "%s", l);
+              regalloc_dry_run_cost += ((aop->type == AOP_DIR || aop->type == AOP_IMMD || aop->type == AOP_LIT) ? 2 : 3);
+            }
+        }
+      break;
+    case H_IDX:
+      {
+        char *l = aopAdrStr (aop, loffset, FALSE);
+        if (!strcmp (l, zero))
+         {
+            emitcode ("clrh", "");
+            regalloc_dry_run_cost++;
+            break;
           }
-        break;
-      case H_IDX:
+      }
+      if (aop->type == AOP_SOF && !(_G.stackOfs + _G.stackPushes + aop->aopu.aop_stk + aop->size - loffset - 1))
         {
-          char * l = aopAdrStr (aop, loffset, FALSE);
-          if (!strcmp (l, zero))
+          pullReg (hc08_reg_h);
+          pushReg (hc08_reg_h, FALSE);
+          break;
+        }
+      if (aop->type == AOP_REG && loffset < aop->size)
+        transferRegReg (aop->aopu.aop_reg[loffset], hc08_reg_h, TRUE);
+      else if (!(aop->op && isOperandVolatile (aop->op, FALSE)) &&  (loffset - 1 >= 0 || aop->type == AOP_LIT) && (aop->type == AOP_LIT || aop->type == AOP_IMMD || IS_S08 && aop->type == AOP_EXT)) /* TODO: Allow negative loffset - 1 */
+        {
+          bool pushedx = FALSE;
+          if (!hc08_reg_x->isFree)
             {
-              emitcode ("clrh", "");
-              break;
+              pushReg (hc08_reg_x, TRUE);
+              pushedx = TRUE;
             }
+          if (aop->type == AOP_LIT && loffset == 0) /* Workaround for other things not supporting negative offsets */
+            {
+              emitcode ("ldhx", "#0x%04x", ulFromVal (aop->aopu.aop_lit) << 8);
+              regalloc_dry_run_cost += 3;
+            }
+          else
+            loadRegFromAop (hc08_reg_hx, aop, loffset - 1);
+          pullOrFreeReg (hc08_reg_x, pushedx);
         }
-        if (hc08_reg_a->isFree)
-          {
-            loadRegFromAop (hc08_reg_a, aop, loffset);
-            transferRegReg (hc08_reg_a, hc08_reg_h, TRUE);
-          }
-        else if (hc08_reg_x->isFree)
-          {
-            loadRegFromAop (hc08_reg_x, aop, loffset);
-            transferRegReg (hc08_reg_x, hc08_reg_h, TRUE);
-          }
-        else
-          {
-            pushReg (hc08_reg_a, TRUE);
-            loadRegFromAop (hc08_reg_a, aop, loffset);
-            transferRegReg (hc08_reg_a, hc08_reg_h, TRUE);
-            pullReg (hc08_reg_a);
-          }
-        break;
-      case HX_IDX:
-        if (IS_AOP_HX(aop))
+      else if (hc08_reg_a->isFree)
+        {
+          loadRegFromAop (hc08_reg_a, aop, loffset);
+          transferRegReg (hc08_reg_a, hc08_reg_h, TRUE);
+        }
+      else if (hc08_reg_x->isFree)
+        {
+          loadRegFromAop (hc08_reg_x, aop, loffset);
+          transferRegReg (hc08_reg_x, hc08_reg_h, TRUE);
+        }
+      else
+        {
+          pushReg (hc08_reg_a, TRUE);
+          loadRegFromAop (hc08_reg_a, aop, loffset);
+          transferRegReg (hc08_reg_a, hc08_reg_h, TRUE);
+          pullReg (hc08_reg_a);
+        }
+      break;
+    case HX_IDX:
+      if (aop->type == AOP_SOF && !(_G.stackOfs + _G.stackPushes + aop->aopu.aop_stk + aop->size - loffset - 2))
+        {
+          pullReg (hc08_reg_h);
+          pullReg (hc08_reg_x);
+          pushReg (hc08_reg_x, FALSE);
+          pushReg (hc08_reg_h, FALSE);
           break;
-        else if (IS_AOP_XA(aop))
-            transferRegReg (hc08_reg_xa, hc08_reg_hx, FALSE);
-        else if ((aop->type == AOP_DIR))
-          {
-            if (aop->size>(loffset+1))
-              emitcode ("ldhx","%s", aopAdrStr (aop, loffset+1, TRUE));
-            else
-              {
-                loadRegFromAop (hc08_reg_x, aop, loffset);
-                loadRegFromConst (hc08_reg_h, zero);
-              }
-          }
-        else if ((aop->type == AOP_LIT) || (aop->type == AOP_IMMD))
-          {
-            emitcode ("ldhx","%s", aopAdrStr (aop, loffset, TRUE));
-          }
-        else
-          {
-            bool needpula;
-            needpula = pushRegIfUsed (hc08_reg_a);
-            loadRegFromAop (hc08_reg_a, aop, loffset+1);
-            loadRegFromAop (hc08_reg_x, aop, loffset);
-            transferRegReg (hc08_reg_a, hc08_reg_h, TRUE);
-            pullOrFreeReg (hc08_reg_a, needpula);
-          }
+        }
+      if (IS_AOP_HX (aop))
         break;
-      case XA_IDX:
-        if (IS_AOP_XA(aop))
-          break;
-        else if (IS_AOP_HX(aop))
-          transferRegReg (hc08_reg_hx, hc08_reg_xa, FALSE);
-        else
-          {
-            loadRegFromAop (hc08_reg_a, aop, loffset);
-            loadRegFromAop (hc08_reg_x, aop, loffset+1);
-          }
+      else if (IS_AOP_XA (aop))
+        transferRegReg (hc08_reg_xa, hc08_reg_hx, FALSE);
+      else if (aop->type == AOP_DIR || IS_S08 && aop->type == AOP_EXT)
+        {
+          if (aop->size >= (loffset + 2))
+            {
+              emitcode ("ldhx", "%s", aopAdrStr (aop, loffset, TRUE));
+              regalloc_dry_run_cost += (aop->type == AOP_DIR ? 2 : 3);
+            }
+          else 
+            {
+              loadRegFromConst (hc08_reg_h, zero);
+              loadRegFromAop (hc08_reg_x, aop, loffset);
+            }
+        }
+      else if ((aop->type == AOP_LIT) || (aop->type == AOP_IMMD))
+        {
+          emitcode ("ldhx", "%s", aopAdrStr (aop, loffset, TRUE));
+          regalloc_dry_run_cost += 3;
+        }
+      else
+        {
+          loadRegFromAop (hc08_reg_h, aop, loffset + 1);
+          loadRegFromAop (hc08_reg_x, aop, loffset);
+        }
+      break;
+    case XA_IDX:
+      if (IS_AOP_XA (aop))
         break;
+      else if (IS_AOP_HX (aop))
+        transferRegReg (hc08_reg_hx, hc08_reg_xa, FALSE);
+      else if (IS_AOP_AX (aop))
+        {
+          pushReg (hc08_reg_a, FALSE);
+          transferRegReg (hc08_reg_x, hc08_reg_a, FALSE);
+          pullReg (hc08_reg_x);
+        }
+      else
+        {
+          loadRegFromAop (hc08_reg_a, aop, loffset);
+          loadRegFromAop (hc08_reg_x, aop, loffset + 1);
+        }
+      break;
     }
 
 // ignore caching for now
-#if 0
-  reg->aop = aop;
-  reg->aopofs = loffset;
-#endif
+  hc08_dirtyReg (reg, FALSE);
+  hc08_useReg (reg);
 }
 
 
@@ -779,14 +874,14 @@
 /*                   be copied to the original aop location.                */
 /*--------------------------------------------------------------------------*/
 static asmop *
-forceStackedAop (asmop *aop, bool copyOrig)
+forceStackedAop (asmop * aop, bool copyOrig)
 {
   reg_info *reg;
   int loffset;
   asmop *newaop = newAsmop (aop->type);
-  memcpy (newaop, aop, sizeof(*newaop));
+  memcpy (newaop, aop, sizeof (*newaop));
 
-  DD(emitcode("", "; forcedStackAop %s", aopName(aop)));
+  DD (emitcode ("", "; forcedStackAop %s", aopName (aop)));
 
   if (copyOrig && hc08_reg_a->isFree)
     reg = hc08_reg_a;
@@ -795,7 +890,7 @@
   else
     reg = NULL;
 
-  for (loffset=0; loffset < newaop->size; loffset++)
+  for (loffset = 0; loffset < newaop->size; loffset++)
     {
       asmop *aopsof = newAsmop (AOP_SOF);
       aopsof->size = 1;
@@ -815,7 +910,7 @@
 
   if (!reg && copyOrig)
     {
-      for (loffset=0; loffset < newaop->size; loffset++)
+      for (loffset = 0; loffset < newaop->size; loffset++)
         {
           transferAopAop (aop, loffset, newaop, loffset);
         }
@@ -827,31 +922,30 @@
 
 /*--------------------------------------------------------------------------*/
 /* storeRegToAop - Store register reg to logical offset loffset of aop.     */
+/*                 For multi-byte registers, loffset is of the lsb reg.     */
 /*--------------------------------------------------------------------------*/
 static void
-storeRegToAop (reg_info *reg, asmop *aop, int loffset)
+storeRegToAop (reg_info *reg, asmop * aop, int loffset)
 {
   int regidx = reg->rIdx;
-  #if 0
+#if 0
   regs *otherreg;
   int otheridx;
-  #endif
+#endif
 
-  DD(emitcode ("", ";     storeRegToAop (%s, %s, %d), stacked=%d, isaddr=%d",
-            reg->name, aopName (aop), loffset, aop->stacked, aop->isaddr));
+  DD (emitcode ("", ";     storeRegToAop (%s, %s, %d), stacked=%d, isaddr=%d",
+                reg->name, aopName (aop), loffset, aop->stacked, aop->isaddr));
 
-  if ((reg->rIdx == HX_IDX) && aop->stacked
-      && (aop->stk_aop[loffset] || aop->stk_aop[loffset+1]))
+  if ((reg->rIdx == HX_IDX) && aop->stacked && (aop->stk_aop[loffset] || aop->stk_aop[loffset + 1]))
     {
-      storeRegToAop (hc08_reg_h, aop, loffset+1);
+      storeRegToAop (hc08_reg_h, aop, loffset + 1);
       storeRegToAop (hc08_reg_x, aop, loffset);
       return;
     }
 
-  if ((reg->rIdx == XA_IDX) && aop->stacked
-      && (aop->stk_aop[loffset] || aop->stk_aop[loffset+1]))
+  if ((reg->rIdx == XA_IDX) && aop->stacked && (aop->stk_aop[loffset] || aop->stk_aop[loffset + 1]))
     {
-      storeRegToAop (hc08_reg_x, aop, loffset+1);
+      storeRegToAop (hc08_reg_x, aop, loffset + 1);
       storeRegToAop (hc08_reg_a, aop, loffset);
       return;
     }
@@ -862,119 +956,125 @@
       return;
     }
 
-  if (aop->type == AOP_STR)
-    {
-      if (loffset==0)
-        transferRegReg (reg, hc08_reg_x, FALSE);
-      else if (loffset==1)
-        transferRegReg (reg, hc08_reg_h, FALSE);
-      return;
-    }
-
   if (aop->type == AOP_DUMMY)
     return;
 
-  if (aop->type == AOP_CRY) /* This can only happen if IFX was optimized */
-    return;                 /* away, so just toss the result */
+  if (aop->type == AOP_CRY)     /* This can only happen if IFX was optimized */
+    return;                     /* away, so just toss the result */
 
   switch (regidx)
     {
-      case A_IDX:
-        if ((aop->type == AOP_REG) && (loffset < aop->size))
-          transferRegReg(reg, aop->aopu.aop_reg[loffset], FALSE);
-        else
-          emitcode ("sta","%s", aopAdrStr (aop, loffset, FALSE));
-        break;
-      case X_IDX:
-        if ((aop->type == AOP_REG) && (loffset < aop->size))
-          transferRegReg(reg, aop->aopu.aop_reg[loffset], FALSE);
-        else
-          emitcode ("stx","%s", aopAdrStr (aop, loffset, FALSE));
-        break;
-      case H_IDX:
-        if (hc08_reg_a->isFree)
-          {
-            transferRegReg (hc08_reg_h, hc08_reg_a, FALSE);
-            storeRegToAop (hc08_reg_a, aop, loffset);
-            hc08_freeReg (hc08_reg_a);
-          }
-        else if (hc08_reg_x->isFree)
-          {
-            transferRegReg (hc08_reg_h, hc08_reg_x, FALSE);
-            storeRegToAop (hc08_reg_x, aop, loffset);
-            hc08_freeReg (hc08_reg_x);
-          }
-        else
-          {
-            pushReg (hc08_reg_a, TRUE);
-            transferRegReg (hc08_reg_h, hc08_reg_a, FALSE);
-            storeRegToAop (hc08_reg_a, aop, loffset);
-            pullReg (hc08_reg_a);
-          }
-        break;
-      case HX_IDX:
-        if ((aop->type == AOP_DIR) )
-          {
-            emitcode("sthx","%s", aopAdrStr (aop, loffset+1, TRUE));
-          }
-        else if (IS_AOP_XA(aop))
-          transferRegReg(reg, hc08_reg_xa, FALSE);
-        else if (IS_AOP_HX(aop))
-          break;
-        else
-          {
-            bool needpula;
-            needpula = pushRegIfUsed (hc08_reg_a);
-            transferRegReg (hc08_reg_h, hc08_reg_a, FALSE);
-            storeRegToAop (hc08_reg_a, aop, loffset+1);
-            storeRegToAop (hc08_reg_x, aop, loffset);
-            pullOrFreeReg (hc08_reg_a, needpula);
-          }
+    case A_IDX:
+      if ((aop->type == AOP_REG) && (loffset < aop->size))
+        transferRegReg (reg, aop->aopu.aop_reg[loffset], FALSE);
+      else
+        {
+          emitcode ("sta", "%s", aopAdrStr (aop, loffset, FALSE));
+          regalloc_dry_run_cost += ((aop->type == AOP_DIR || aop->type == AOP_IMMD) ? 2 :3);
+        }
+      break;
+    case X_IDX:
+      if ((aop->type == AOP_REG) && (loffset < aop->size))
+        transferRegReg (reg, aop->aopu.aop_reg[loffset], FALSE);
+      else
+        {
+          emitcode ("stx", "%s", aopAdrStr (aop, loffset, FALSE));
+          regalloc_dry_run_cost += ((aop->type == AOP_DIR || aop->type == AOP_IMMD) ? 2 :3);
+        }
+      break;
+    case H_IDX:
+      if ((aop->type == AOP_REG) && (loffset < aop->size))
+        transferRegReg (reg, aop->aopu.aop_reg[loffset], FALSE);
+      else if (hc08_reg_a->isFree)
+        {
+          transferRegReg (hc08_reg_h, hc08_reg_a, FALSE);
+          storeRegToAop (hc08_reg_a, aop, loffset);
+          hc08_freeReg (hc08_reg_a);
+        }
+      else if (hc08_reg_x->isFree)
+        {
+          transferRegReg (hc08_reg_h, hc08_reg_x, FALSE);
+          storeRegToAop (hc08_reg_x, aop, loffset);
+          hc08_freeReg (hc08_reg_x);
+        }
+      else
+        {
+          pushReg (hc08_reg_a, TRUE);
+          transferRegReg (hc08_reg_h, hc08_reg_a, FALSE);
+          storeRegToAop (hc08_reg_a, aop, loffset);
+          pullReg (hc08_reg_a);
+        }
+      break;
+    case HX_IDX:
+      if (aop->type == AOP_DIR || IS_S08 && aop->type == AOP_EXT)
+        {
+          emitcode ("sthx", "%s", aopAdrStr (aop, loffset, TRUE));
+          regalloc_dry_run_cost += (aop->type == AOP_DIR ? 2 : 3);;
+        }
+      else if (IS_AOP_XA (aop))
+        transferRegReg (reg, hc08_reg_xa, FALSE);
+      else if (IS_AOP_HX (aop))
         break;
-      case XA_IDX:
-        if (IS_AOP_HX(aop))
-          transferRegReg(reg, hc08_reg_hx, FALSE);
-        else if (IS_AOP_XA(aop))
-          break;
-        else
-          {
-            storeRegToAop (hc08_reg_a, aop, loffset);
-            storeRegToAop (hc08_reg_x, aop, loffset+1);
-          }
+      else
+        {
+          bool needpula;
+          needpula = pushRegIfUsed (hc08_reg_a);
+          transferRegReg (hc08_reg_h, hc08_reg_a, FALSE);
+          storeRegToAop (hc08_reg_a, aop, loffset + 1);
+          storeRegToAop (hc08_reg_x, aop, loffset);
+          pullOrFreeReg (hc08_reg_a, needpula);
+        }
+      break;
+    case XA_IDX:
+      if (IS_AOP_HX (aop))
+        transferRegReg (reg, hc08_reg_hx, FALSE);
+      else if (IS_AOP_XA (aop))
         break;
+      else if (IS_AOP_AX (aop))
+        {
+          pushReg (hc08_reg_a, FALSE);
+          transferRegReg (hc08_reg_x, hc08_reg_a, FALSE);
+          pullReg (hc08_reg_x);
+        }
+      else
+        {
+          storeRegToAop (hc08_reg_a, aop, loffset);
+          storeRegToAop (hc08_reg_x, aop, loffset + 1);
+        }
+      break;
+    default:
+      wassert (0);
     }
 
-/* Disable the register tracking for now */
+  /* Disable the register tracking for now */
 #if 0
   //if (!reg->aop || (reg->aop && (reg->aop != aop)))
-    {
-      //if (reg->aop!=aop)
-        for (otheridx=0;otheridx<hc08_nRegs;otheridx++)
+  {
+    //if (reg->aop!=aop)
+    for (otheridx = 0; otheridx < hc08_nRegs; otheridx++)
+      {
+        otherreg = hc08_regWithIdx (otheridx);
+        if (otherreg && otherreg->aop
+            && otherreg->aop->op && aop->op && operandsEqu (otherreg->aop->op, aop->op) && (otherreg->aopofs == loffset))
           {
-            otherreg=hc08_regWithIdx(otheridx);
-            if (otherreg && otherreg->aop
-                && otherreg->aop->op && aop->op
-                && operandsEqu(otherreg->aop->op,aop->op)
-                && (otherreg->aopofs == loffset))
-              {
-                DD(emitcode("","; marking %s stale", otherreg->name));
-                otherreg->aop=NULL;
-              }
+            DD (emitcode ("", "; marking %s stale", otherreg->name));
+            otherreg->aop = NULL;
           }
-      if ((!hc08_reg_x->aop || !hc08_reg_h->aop) && hc08_reg_hx->aop)
-        {
-          hc08_reg_hx->aop = NULL;
-          DD(emitcode("","; marking hx stale"));
-        }
-      if ((!hc08_reg_x->aop || !hc08_reg_a->aop) && hc08_reg_xa->aop)
-        {
-          hc08_reg_xa->aop = NULL;
-          DD(emitcode("","; marking xa stale"));
-        }
+      }
+    if ((!hc08_reg_x->aop || !hc08_reg_h->aop) && hc08_reg_hx->aop)
+      {
+        hc08_reg_hx->aop = NULL;
+        DD (emitcode ("", "; marking hx stale"));
+      }
+    if ((!hc08_reg_x->aop || !hc08_reg_a->aop) && hc08_reg_xa->aop)
+      {
+        hc08_reg_xa->aop = NULL;
+        DD (emitcode ("", "; marking xa stale"));
+      }
 
-      reg->aop = aop;
-      reg->aopofs = loffset;
-    }
+    reg->aop = aop;
+    reg->aopofs = loffset;
+  }
 #endif
 }
 
@@ -982,54 +1082,70 @@
 /* loadRegFromConst - Load register reg from constant c.                    */
 /*--------------------------------------------------------------------------*/
 static void
-loadRegFromConst (reg_info *reg, char *c)
+loadRegFromConst (reg_info * reg, char *c)
 {
   switch (reg->rIdx)
     {
-      case A_IDX:
-        if (!strcmp(c,zero))
+    case A_IDX:
+      if (!strcmp (c, zero))
+        {
           emitcode ("clra", "");
-        else
+          regalloc_dry_run_cost++;
+        }
+      else
+        {
           emitcode ("lda", "%s", c);
-        break;
-      case X_IDX:
-        if (!strcmp(c,zero))
+          regalloc_dry_run_cost += 2;
+        }
+      break;
+    case X_IDX:
+      if (!strcmp (c, zero))
+        {
           emitcode ("clrx", "");
-        else
+          regalloc_dry_run_cost++;
+        }
+      else
+        {
           emitcode ("ldx", "%s", c);
-        break;
-      case H_IDX:
-        if (!strcmp(c,zero))
+          regalloc_dry_run_cost += 2;
+        }
+      break;
+    case H_IDX:
+      if (!strcmp (c, zero))
+        {
           emitcode ("clrh", "");
-        else if (hc08_reg_a->isFree)
-          {
-            loadRegFromConst (hc08_reg_a, c);
-            transferRegReg (hc08_reg_a, hc08_reg_h, TRUE);
-          }
-        else if (hc08_reg_x->isFree)
-          {
-            loadRegFromConst (hc08_reg_x, c);
-            transferRegReg (hc08_reg_x, hc08_reg_h, TRUE);
-          }
-        else
-          {
-            pushReg (hc08_reg_a, TRUE);
-            loadRegFromConst (hc08_reg_a, c);
-            transferRegReg (hc08_reg_a, hc08_reg_h, TRUE);
-            pullReg (hc08_reg_a);
-          }
-        break;
-      case HX_IDX:
-        emitcode ("ldhx", "%s", c);
-        break;
-      case XA_IDX:
-        emitcode ("lda", "%s", c);
-        emitcode ("ldx", "%s >> 8", c);
-        break;
-      default:
-        werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
-                "Bad rIdx in loadRegFromConst");
-        return;
+          regalloc_dry_run_cost++;
+        }
+      else if (hc08_reg_a->isFree)
+        {
+          loadRegFromConst (hc08_reg_a, c);
+          transferRegReg (hc08_reg_a, hc08_reg_h, TRUE);
+        }
+      else if (hc08_reg_x->isFree)
+        {
+          loadRegFromConst (hc08_reg_x, c);
+          transferRegReg (hc08_reg_x, hc08_reg_h, TRUE);
+        }
+      else
+        {
+          pushReg (hc08_reg_a, TRUE);
+          loadRegFromConst (hc08_reg_a, c);
+          transferRegReg (hc08_reg_a, hc08_reg_h, TRUE);
+          pullReg (hc08_reg_a);
+        }
+      break;
+    case HX_IDX:
+      emitcode ("ldhx", "%s", c);
+      regalloc_dry_run_cost += 3;
+      break;
+    case XA_IDX:
+      emitcode ("lda", "%s", c);
+      emitcode ("ldx", "%s >> 8", c);
+      regalloc_dry_run_cost += 4;
+      break;
+    default:
+      werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "Bad rIdx in loadRegFromConst");
+      return;
     }
   hc08_useReg (reg);
 }
@@ -1039,7 +1155,7 @@
 /* storeConstToAop- Store constant c to logical offset loffset of asmop aop.*/
 /*--------------------------------------------------------------------------*/
 static void
-storeConstToAop (char *c, asmop *aop, int loffset)
+storeConstToAop (char *c, asmop * aop, int loffset)
 {
   if (aop->stacked && aop->stk_aop[loffset])
     {
@@ -1049,39 +1165,49 @@
 
   switch (aop->type)
     {
-      case AOP_DIR:
-        if (!strcmp(c,zero))
+    case AOP_DIR:
+      /* clr operates with read-modify-write cycles, so don't use if the */
+      /* destination is volatile to avoid the read side-effect. */
+      if (!strcmp (c, zero) && !(aop->op && isOperandVolatile (aop->op, FALSE)) && optimize.codeSize)
+        {
+          /* clr dst : 2 bytes, 5 cycles */
           emitcode ("clr", "%s", aopAdrStr (aop, loffset, FALSE));
-        else
+          regalloc_dry_run_cost += 2;
+        }
+      else
+        {
+          /* mov #0,dst : 3 bytes, 4 cycles */
           emitcode ("mov", "%s,%s", c, aopAdrStr (aop, loffset, FALSE));
+          regalloc_dry_run_cost += 3;
+        }
+      break;
+    case AOP_REG:
+      if (loffset > (aop->size - 1))
         break;
-      case AOP_REG:
-        if (loffset>(aop->size-1))
-          break;
-        loadRegFromConst (aop->aopu.aop_reg[loffset], c);
-        break;
-      case AOP_DUMMY:
-        break;
-      default:
-        if (hc08_reg_a->isFree)
-          {
-            loadRegFromConst (hc08_reg_a, c);
-            storeRegToAop( hc08_reg_a, aop, loffset);
-            hc08_freeReg (hc08_reg_a);
-          }
-        else if (hc08_reg_x->isFree)
-          {
-            loadRegFromConst (hc08_reg_x, c);
-            storeRegToAop( hc08_reg_x, aop, loffset);
-            hc08_freeReg (hc08_reg_x);
-          }
-        else
-          {
-            pushReg (hc08_reg_a, TRUE);
-            loadRegFromConst (hc08_reg_a, c);
-            storeRegToAop( hc08_reg_a, aop, loffset);
-            pullReg (hc08_reg_a);
-          }
+      loadRegFromConst (aop->aopu.aop_reg[loffset], c);
+      break;
+    case AOP_DUMMY:
+      break;
+    default:
+      if (hc08_reg_a->isFree)
+        {
+          loadRegFromConst (hc08_reg_a, c);
+          storeRegToAop (hc08_reg_a, aop, loffset);
+          hc08_freeReg (hc08_reg_a);
+        }
+      else if (hc08_reg_x->isFree)
+        {
+          loadRegFromConst (hc08_reg_x, c);
+          storeRegToAop (hc08_reg_x, aop, loffset);
+          hc08_freeReg (hc08_reg_x);
+        }
+      else
+        {
+          pushReg (hc08_reg_a, TRUE);
+          loadRegFromConst (hc08_reg_a, c);
+          storeRegToAop (hc08_reg_a, aop, loffset);
+          pullReg (hc08_reg_a);
+        }
     }
 }
 
@@ -1094,29 +1220,30 @@
 /*                          zeroed. reg must be an 8-bit register.          */
 /*--------------------------------------------------------------------------*/
 static void
-storeRegSignToUpperAop (reg_info *reg, asmop *aop, int loffset, bool isSigned)
+storeRegSignToUpperAop (reg_info * reg, asmop * aop, int loffset, bool isSigned)
 {
 //  int regidx = reg->rIdx;
   int size = aop->size;
 
-  if (size<=loffset)
+  if (size <= loffset)
     return;
 
   if (!isSigned)
     {
       /* Unsigned case */
-      while (loffset<size)
-        storeConstToAop(zero, aop, loffset++);
+      while (loffset < size)
+        storeConstToAop (zero, aop, loffset++);
     }
   else
     {
       /* Signed case */
       transferRegReg (reg, hc08_reg_a, FALSE);
-      emitcode ("rola","");
-      emitcode ("clra","");
+      emitcode ("rola", "");
+      emitcode ("clra", "");
       emitcode ("sbc", "#0");
+      regalloc_dry_run_cost += 4;
       hc08_useReg (hc08_reg_a);
-      while (loffset<size)
+      while (loffset < size)
         storeRegToAop (hc08_reg_a, aop, loffset++);
       hc08_freeReg (hc08_reg_a);
     }
@@ -1135,34 +1262,40 @@
 
   switch (regidx)
     {
-      case A_IDX:
-      case X_IDX:
-      case H_IDX:
-        storeRegToAop (reg, aop, 0);
-        storeRegSignToUpperAop (reg, aop, 1, isSigned);
-        break;
-      case HX_IDX:
-        if (size==1)
-          {
-            storeRegToAop (hc08_reg_x, aop, 0);
-          }
-        else
-          {
-            storeRegToAop (reg, aop, 0);
-            storeRegSignToUpperAop (hc08_reg_h, aop, 2, isSigned);
-          }
-        break;
-      case XA_IDX:
-        if (size==1)
-          {
-            storeRegToAop (hc08_reg_a, aop, 0);
-          }
-        else
-          {
-            storeRegToAop (reg, aop, 0);
-            storeRegSignToUpperAop (hc08_reg_x, aop, 2, isSigned);
-          }
-        break;
+    case A_IDX:
+    case X_IDX:
+    case H_IDX:
+      storeRegToAop (reg, aop, 0);
+      if (size > 1 && isSigned && aop->type == AOP_REG && aop->aopu.aop_reg[0]->rIdx == A_IDX)
+        pushReg (hc08_reg_a, TRUE);
+      storeRegSignToUpperAop (reg, aop, 1, isSigned);
+      if (size > 1 && isSigned && aop->type == AOP_REG && aop->aopu.aop_reg[0]->rIdx == A_IDX)
+        pullReg (hc08_reg_a);
+      break;
+    case HX_IDX:
+      if (size == 1)
+        {
+          storeRegToAop (hc08_reg_x, aop, 0);
+        }
+      else
+        {
+          storeRegToAop (reg, aop, 0);
+          storeRegSignToUpperAop (hc08_reg_h, aop, 2, isSigned);
+        }
+      break;
+    case XA_IDX:
+      if (size == 1)
+        {
+          storeRegToAop (hc08_reg_a, aop, 0);
+        }
+      else
+        {
+          storeRegToAop (reg, aop, 0);
+          storeRegSignToUpperAop (hc08_reg_x, aop, 2, isSigned);
+        }
+      break;
+    default:
+      wassert (0);
     }
 }
 
@@ -1175,14 +1308,15 @@
 {
   bool needpula = FALSE;
   reg_info *reg = NULL;
-  int regIdx;
   bool keepreg = FALSE;
+  bool afree;
+
+  wassert (srcaop && dstaop);
 
   /* ignore transfers at the same byte, unless its volatile */
   if (srcaop->op && !isOperandVolatile (srcaop->op, FALSE)
       && dstaop->op && !isOperandVolatile (dstaop->op, FALSE)
-      && operandsEqu(srcaop->op, dstaop->op) && srcofs == dstofs
-      && dstaop->type == srcaop->type)
+      && operandsEqu (srcaop->op, dstaop->op) && srcofs == dstofs && dstaop->type == srcaop->type)
     return;
 
   if (srcaop->stacked && srcaop->stk_aop[srcofs])
@@ -1205,49 +1339,39 @@
   if (dstofs >= dstaop->size)
     return;
 
-  if ((dstaop->type == AOP_DIR)
-      && ((srcaop->type == AOP_DIR) || (srcaop->type == AOP_LIT)) )
+  if ((dstaop->type == AOP_DIR) && ((srcaop->type == AOP_DIR) || (srcaop->type == AOP_LIT)))
     {
-      if (srcaop->type == AOP_LIT)
+      char *src = aopAdrStr (srcaop, srcofs, FALSE);
+      /* clr operates with read-modify-write cycles, so don't use if the */
+      /* destination is volatile to avoid the read side-effect. */
+      if (!strcmp (src, zero) && !(dstaop->op && isOperandVolatile (dstaop->op, FALSE)) && optimize.codeSize)
         {
-          unsigned long lit;
-          unsigned long bytemask;
-
-          lit = ulFromVal (srcaop->aopu.aop_lit);
-          bytemask = (lit >> (srcofs*8)) & 0xff;
-
-          if (bytemask == 0)
-            {
-              emitcode ("clr", "%s", aopAdrStr(dstaop, dstofs, FALSE));
-              return;
-            }
+          /* clr dst : 2 bytes, 5 cycles */
+          emitcode ("clr", "%s", aopAdrStr (dstaop, dstofs, FALSE));
+          regalloc_dry_run_cost += 2;
+        }
+      else
+        {
+          /* mov #0,dst : 3 bytes, 4 cycles */
+          emitcode ("mov", "%s,%s", src, aopAdrStr (dstaop, dstofs, FALSE));
+          regalloc_dry_run_cost += 3;
         }
-
-      emitcode("mov", "%s,%s", aopAdrStr(srcaop, srcofs, FALSE),
-               aopAdrStr(dstaop, dstofs, FALSE));
       return;
     }
 
   if (dstaop->type == AOP_REG)
     {
-      regIdx = dstaop->aopu.aop_reg[dstofs]->rIdx;
-      if ((regIdx == A_IDX) || (regIdx == X_IDX))
-        {
-          reg = dstaop->aopu.aop_reg[dstofs];
-          keepreg = TRUE;
-        }
+      reg = dstaop->aopu.aop_reg[dstofs];
+      keepreg = TRUE;
     }
-
-  if ((srcaop->type == AOP_REG) && (srcaop->aopu.aop_reg[srcofs]))
+  else if ((srcaop->type == AOP_REG) && (srcaop->aopu.aop_reg[srcofs]))
     {
-      regIdx = srcaop->aopu.aop_reg[srcofs]->rIdx;
-      if ((regIdx == A_IDX) || (regIdx == X_IDX))
-        {
-          reg = srcaop->aopu.aop_reg[srcofs];
-          keepreg = TRUE;
-        }
+      reg = srcaop->aopu.aop_reg[srcofs];
+      keepreg = TRUE;
     }
 
+  afree = hc08_reg_a->isFree;
+
   if (!reg)
     {
       if (hc08_reg_a->isFree)
@@ -1267,6 +1391,8 @@
 
   if (!keepreg)
     pullOrFreeReg (hc08_reg_a, needpula);
+
+  hc08_reg_a->isFree = afree;
 }
 
 
@@ -1278,7 +1404,9 @@
 accopWithMisc (char *accop, char *param)
 {
   emitcode (accop, "%s", param);
-  hc08_dirtyReg (hc08_reg_a, FALSE);
+  regalloc_dry_run_cost += ((!param[0] || !strcmp(param, ",x")) ? 1 : ((param[0]=='#' || param[0]=='*') ? 2 : 3));
+  if (strcmp (accop, "bit") && strcmp (accop, "cmp") && strcmp (accop, "cpx"))
+    hc08_dirtyReg (hc08_reg_a, FALSE);
 }
 
 /*--------------------------------------------------------------------------*/
@@ -1298,16 +1426,26 @@
   if (aop->type == AOP_DUMMY)
     return;
 
-  if (aop->type == AOP_REG)
+  if (loffset >= aop->size)
+    {
+      emitcode (accop, "#0");
+      regalloc_dry_run_cost += 2;
+    }
+  else if (aop->type == AOP_REG)
     {
       pushReg (aop->aopu.aop_reg[loffset], FALSE);
       emitcode (accop, "1,s");
+      regalloc_dry_run_cost += 3;
       pullNull (1);
     }
   else
-    emitcode (accop, "%s", aopAdrStr (aop, loffset, FALSE));
+    {
+      emitcode (accop, "%s", aopAdrStr (aop, loffset, FALSE));
+      regalloc_dry_run_cost += 3;
+    }
 
-  hc08_dirtyReg (hc08_reg_a, FALSE);
+  if (strcmp (accop, "bit") && strcmp (accop, "cmp") && strcmp (accop, "cpx"))
+    hc08_dirtyReg (hc08_reg_a, FALSE);
 }
 
 
@@ -1318,47 +1456,51 @@
 /*              Supports: com, dec, inc, lsl, lsr, neg, rol, ror            */
 /*--------------------------------------------------------------------------*/
 static void
-rmwWithReg (char *rmwop, reg_info *reg)
+rmwWithReg (char *rmwop, reg_info * reg)
 {
   char rmwbuf[10];
   char *rmwaop = rmwbuf;
 
   if (reg->rIdx == A_IDX)
     {
-      sprintf(rmwaop,"%sa", rmwop);
+      sprintf (rmwaop, "%sa", rmwop);
       emitcode (rmwaop, "");
+      regalloc_dry_run_cost++;
       hc08_dirtyReg (hc08_reg_a, FALSE);
     }
   else if (reg->rIdx == X_IDX)
     {
-      sprintf(rmwaop,"%sx", rmwop);
+      sprintf (rmwaop, "%sx", rmwop);
       emitcode (rmwaop, "");
-      hc08_dirtyReg (hc08_reg_a, FALSE);
+      regalloc_dry_run_cost++;
+      hc08_dirtyReg (hc08_reg_x, FALSE);
     }
   else if (hc08_reg_a->isFree)
     {
-      transferRegReg(reg, hc08_reg_a, FALSE);
-      sprintf(rmwaop,"%sa", rmwop);
+      transferRegReg (reg, hc08_reg_a, FALSE);
+      sprintf (rmwaop, "%sa", rmwop);
       emitcode (rmwaop, "");
+      regalloc_dry_run_cost++;
       hc08_dirtyReg (hc08_reg_a, FALSE);
-      transferRegReg(hc08_reg_a, reg, TRUE);
+      transferRegReg (hc08_reg_a, reg, TRUE);
     }
   else
     {
       pushReg (reg, FALSE);
       emitcode (rmwop, "1,s");
+      regalloc_dry_run_cost += 3;
       pullReg (reg);
       hc08_dirtyReg (reg, FALSE);
     }
 }
 
 /*--------------------------------------------------------------------------*/
-/* accopWithAop - Emit read/modify/write instruction rmwop with the byte at */
+/* rmwWithAop - Emit read/modify/write instruction rmwop with the byte at   */
 /*                logical offset loffset of asmop aop.                      */
 /*                Supports: com, dec, inc, lsl, lsr, neg, rol, ror, tst     */
 /*--------------------------------------------------------------------------*/
 static void
-rmwWithAop (char *rmwop, asmop *aop, int loffset)
+rmwWithAop (char *rmwop, asmop * aop, int loffset)
 {
   bool needpula = FALSE;
 
@@ -1370,23 +1512,249 @@
 
   switch (aop->type)
     {
-      case AOP_REG:
-        rmwWithReg (rmwop, aop->aopu.aop_reg[loffset]);
-        break;
-      case AOP_EXT:
-        needpula = pushRegIfUsed (hc08_reg_a);
-        loadRegFromAop (hc08_reg_a, aop, loffset);
-        rmwWithReg (rmwop, hc08_reg_a);
-        if (strcmp ("tst", rmwop))
-          storeRegToAop (hc08_reg_a, aop, loffset);
-        pullOrFreeReg (hc08_reg_a, needpula);
-        break;
-      case AOP_DUMMY:
-        break;
-      default:
-        emitcode (rmwop, "%s", aopAdrStr (aop, loffset, FALSE));
-   }
+    case AOP_REG:
+      rmwWithReg (rmwop, aop->aopu.aop_reg[loffset]);
+      break;
+    case AOP_EXT:
+      needpula = pushRegIfUsed (hc08_reg_a);
+      loadRegFromAop (hc08_reg_a, aop, loffset);
+      rmwWithReg (rmwop, hc08_reg_a);
+      if (strcmp ("tst", rmwop))
+        storeRegToAop (hc08_reg_a, aop, loffset);
+      pullOrFreeReg (hc08_reg_a, needpula);
+      break;
+    case AOP_DUMMY:
+      break;
+    case AOP_SOF:
+      {
+        int offset = aop->size - 1 - loffset;
+        offset += _G.stackOfs + _G.stackPushes + aop->aopu.aop_stk + 1;
+        if (offset > 0xff)
+          {
+            /* Unfortunately, the rmw class of instructions only support a */
+            /* single byte stack pointer offset and we need two. */
+            needpula = pushRegIfUsed (hc08_reg_a);
+            loadRegFromAop (hc08_reg_a, aop, loffset);
+            rmwWithReg (rmwop, hc08_reg_a);
+            if (strcmp ("tst", rmwop))
+              storeRegToAop (hc08_reg_a, aop, loffset);
+            pullOrFreeReg (hc08_reg_a, needpula);
+            break;
+          }
+        /* If the offset is small enough, fall through to default case */
+      }
+    default:
+      emitcode (rmwop, "%s", aopAdrStr (aop, loffset, FALSE));
+      regalloc_dry_run_cost += ((aop->type == AOP_DIR || aop->type == AOP_IMMD) ? 2 : 3);
+    }
+
+}
+
+/*--------------------------------------------------------------------------*/
+/* loadRegIndexed - Load a register using indexed addressing mode.          */
+/*                  NOTE: offset is physical (not logical)                  */
+/*--------------------------------------------------------------------------*/
+static void
+loadRegIndexed (reg_info * reg, int offset, char * rematOfs)
+{
+  bool needpula = FALSE;
+
+  /* The rematerialized offset may have a "#" prefix; skip over it */
+  if (rematOfs && rematOfs[0] == '#')
+    rematOfs++;
+  if (rematOfs && !rematOfs[0])
+    rematOfs = NULL;
+
+  /* force offset to signed 16-bit range */
+  offset &= 0xffff;
+  if (offset & 0x8000)
+    offset = 0x10000 - offset;
+
+  switch (reg->rIdx)
+    {
+    case A_IDX:
+      if (rematOfs)
+        {
+          if (!offset)
+            emitcode ("lda", "(%s),x", rematOfs);
+          else
+            emitcode ("lda", "(%s+%d),x", rematOfs, offset);
+          regalloc_dry_run_cost += 3;
+        }
+      else if (offset)
+        {
+          emitcode ("lda", "%d,x", offset);
+          if (offset > 1 && offset <= 0xff)
+            regalloc_dry_run_cost += 2;
+          else
+            regalloc_dry_run_cost += 3;
+        }
+      else
+        {
+          emitcode ("lda", ",x");
+          regalloc_dry_run_cost++;
+        }
+      hc08_dirtyReg (reg, FALSE);
+      break;
+    case X_IDX:
+      if (rematOfs)
+        {
+          if (!offset)
+            emitcode ("ldx", "(%s),x", rematOfs);
+          else
+            emitcode ("ldx", "(%s+%d),x", rematOfs, offset);
+          regalloc_dry_run_cost += 3;
+        }
+      else if (offset)
+        {
+          emitcode ("ldx", "%d,x", offset);
+          if (offset > 1 && offset <= 0xff)
+            regalloc_dry_run_cost += 2;
+          else
+            regalloc_dry_run_cost += 3;
+        }
+      else
+        {
+          emitcode ("ldx", ",x");
+          regalloc_dry_run_cost++;
+        }
+      hc08_dirtyReg (reg, FALSE);
+      break;
+    case H_IDX:
+      needpula = pushRegIfUsed (hc08_reg_a);
+      loadRegIndexed (hc08_reg_a, offset, rematOfs);
+      transferRegReg (hc08_reg_a, hc08_reg_h, TRUE);
+      pullOrFreeReg (hc08_reg_a, needpula);
+      break;
+    case HX_IDX:
+      if (!IS_S08)
+        {
+          needpula = pushRegIfUsed (hc08_reg_a);
+          loadRegIndexed (hc08_reg_a, offset, rematOfs);
+          pushReg (hc08_reg_a, TRUE);
+          loadRegIndexed (hc08_reg_x, offset+1, rematOfs);
+          pullReg (hc08_reg_h);
+          pullOrFreeReg (hc08_reg_a, needpula);
+          break;
+        }
+      else if (rematOfs)
+        {
+          if (!offset)
+            emitcode ("ldhx", "(%s),x", rematOfs);
+          else
+            emitcode ("ldhx", "(%s+%d),x", rematOfs, offset);
+          regalloc_dry_run_cost += 4;
+        }
+      else if (offset)
+        {
+          emitcode ("ldhx", "%d,x", offset);
+          if (offset > 1 && offset <= 0xff)
+            regalloc_dry_run_cost += 3;
+          else
+            regalloc_dry_run_cost += 4;
+        }
+      else
+        {
+          emitcode ("ldhx", ",x");
+          regalloc_dry_run_cost += 2;
+        }
+      hc08_dirtyReg (reg, FALSE);
+      break;
+    case XA_IDX:
+      loadRegIndexed (hc08_reg_a, offset+1, rematOfs);
+      loadRegIndexed (hc08_reg_x, offset, rematOfs);
+      break;
+    default:
+      wassert (0);
+    }
+}
+
+/*--------------------------------------------------------------------------*/
+/* storeRegIndexed - Store a register using indexed addressing mode.        */
+/*                   NOTE: offset is physical (not logical)                 */
+/*--------------------------------------------------------------------------*/
+static void
+storeRegIndexed (reg_info * reg, int offset, char * rematOfs)
+{
+  bool needpula = FALSE;
+
+  /* The rematerialized offset may have a "#" prefix; skip over it */
+  if (rematOfs && rematOfs[0] == '#')
+    rematOfs++;
+  if (rematOfs && !rematOfs[0])
+    rematOfs = NULL;
+
+  /* force offset to signed 16-bit range */
+  offset &= 0xffff;
+  if (offset & 0x8000)
+    offset = 0x10000 - offset;
 
+  switch (reg->rIdx)
+    {
+    case A_IDX:
+      if (rematOfs)
+        {
+          if (!offset)
+            emitcode ("sta", "(%s),x", rematOfs);
+          else
+            emitcode ("sta", "(%s+%d),x", rematOfs, offset);
+          regalloc_dry_run_cost += 3;
+        }
+      else if (offset)
+        {
+          emitcode ("sta", "%d,x", offset);
+          if (offset > 1 && offset <= 0xff)
+            regalloc_dry_run_cost += 2;
+          else
+            regalloc_dry_run_cost += 3;
+        }
+      else
+        {
+          emitcode ("sta", ",x");
+          regalloc_dry_run_cost++;
+        }
+      break;
+    case X_IDX:
+      if (rematOfs)
+        {
+          if (!offset)
+            emitcode ("stx", "(%s),x", rematOfs);
+          else
+            emitcode ("stx", "(%s+%d),x", rematOfs, offset);
+          regalloc_dry_run_cost += 3;
+        }
+      else if (offset)
+        {
+          emitcode ("stx", "%d,x", offset);
+          if (offset > 1 && offset <= 0xff)
+            regalloc_dry_run_cost += 2;
+          else
+            regalloc_dry_run_cost += 3;
+        }
+      else
+        {
+          emitcode ("stx", ",x");
+          regalloc_dry_run_cost++;
+        }
+      break;
+    case H_IDX:
+      needpula = pushRegIfUsed (hc08_reg_a);
+      transferRegReg (hc08_reg_h, hc08_reg_a, TRUE);
+      storeRegIndexed (hc08_reg_a, offset, rematOfs);
+      pullOrFreeReg (hc08_reg_a, needpula);
+      break;
+    case HX_IDX:
+      storeRegIndexed (hc08_reg_h, offset, rematOfs);
+      storeRegIndexed (hc08_reg_x, offset+1, rematOfs);
+      break;
+    case XA_IDX:
+      /* This case probably won't happen, but it's easy to implement */
+      storeRegIndexed (hc08_reg_x, offset, rematOfs);
+      storeRegIndexed (hc08_reg_a, offset+1, rematOfs);
+      break;
+    default:
+      wassert (0);
+    }
 }
 
 
@@ -1418,6 +1786,111 @@
 #endif
 
 /*-----------------------------------------------------------------*/
+/* operandConflictsWithHX - true if operand in h and/or x register */
+/*-----------------------------------------------------------------*/
+static bool
+operandConflictsWithHX (operand *op)
+{
+  symbol *sym;
+  int i;
+
+  if (IS_ITEMP (op))
+    {
+      sym = OP_SYMBOL (op);
+      if (!sym->isspilt)
+        {
+          for(i = 0; i < sym->nRegs; i++)
+            if (sym->regs[i] == hc08_reg_h || sym->regs[i] == hc08_reg_x)
+              return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+/*-----------------------------------------------------------------*/
+/* operandOnStack - returns True if operand is on the stack        */
+/*-----------------------------------------------------------------*/
+static bool
+operandOnStack(operand *op)
+{
+  symbol *sym;
+
+  if (!op || !IS_SYMOP (op))
+    return FALSE;
+  sym = OP_SYMBOL (op);
+  if (!sym->isspilt && sym->onStack)
+    return TRUE;
+  if (sym->isspilt)
+    {
+      sym = sym->usl.spillLoc;
+      if (sym && sym->onStack)
+        return TRUE;
+    }
+  return FALSE;
+}
+
+/*-----------------------------------------------------------------*/
+/* tsxUseful - returns True if tsx could help at least two         */
+/*             anticipated stack references                        */
+/*-----------------------------------------------------------------*/
+static bool
+tsxUseful(iCode *ic)
+{
+  int uses = 0;
+
+  if (ic->op == CALL)
+    {
+      if (IC_RESULT (ic) && operandSize (IC_RESULT (ic)) < 2 && operandOnStack (IC_RESULT (ic)))
+        {
+          uses++;
+          ic = ic->next;
+        }
+    }
+
+  while (ic && uses < 2)
+    {
+      if (ic->op == IFX)
+        {
+          if (operandOnStack (IC_COND (ic)))
+            uses += operandSize(IC_COND (ic));
+          break;
+        }
+      else if (ic->op == JUMPTABLE)
+        {
+          if (operandOnStack (IC_JTCOND (ic)))
+            uses++;
+          break;
+        }
+      else if (ic->op == ADDRESS_OF)
+        {
+          if (operandOnStack (IC_RIGHT (ic)))
+            break;
+        }
+      else if (ic->op == LABEL || ic->op == GOTO || ic->op == CALL || ic->op == PCALL)
+        break;
+      else if (POINTER_SET (ic) || POINTER_GET (ic))
+        break;
+      else
+        {
+          if (operandConflictsWithHX (IC_RESULT (ic)))
+            break;
+          if (operandOnStack (IC_LEFT (ic)))
+            uses += operandSize (IC_LEFT (ic));
+          if (operandOnStack (IC_RIGHT (ic)))
+            uses += operandSize (IC_RIGHT (ic));
+          if (operandOnStack (IC_RESULT (ic)))
+            uses += operandSize (IC_RESULT (ic));
+        }
+
+      ic = ic->next;
+    }
+
+  return uses>=2;
+}
+
+
+/*-----------------------------------------------------------------*/
 /* aopForSym - for a true symbol                                   */
 /*-----------------------------------------------------------------*/
 static asmop *
@@ -1456,6 +1929,37 @@
       aop->aopu.aop_dir = sym->rname;
       aop->size = getSize (sym->type);
       aop->aopu.aop_stk = sym->stack;
+
+      if (!regalloc_dry_run && hc08_reg_hx->isFree && hc08_reg_hx->aop != &tsxaop)
+        {
+          if (!hc08_reg_h->isDead || !hc08_reg_x->isDead)
+            return aop;
+          if (ic->op == IFX && operandConflictsWithHX (IC_COND (ic)))
+            return aop;
+          else if (ic->op == JUMPTABLE && operandConflictsWithHX (IC_JTCOND (ic)))
+            return aop;
+          else
+            {
+              /* If this is a pointer gen/set, then hx is definitely in use */
+              if (POINTER_SET (ic) || POINTER_GET (ic))
+                return aop;
+              if (ic->op == ADDRESS_OF)
+                return aop;
+              if (operandConflictsWithHX (IC_LEFT (ic)))
+                return aop;
+              if (operandConflictsWithHX (IC_RIGHT (ic)))
+                return aop;
+            }
+          /* It's safe to use tsx here. tsx costs 1 byte and 2 cycles but */
+          /* can save us 1 byte and 1 cycle for each time we can use x    */
+          /* instead of sp. For a single use, we break even on bytes, but */
+          /* lose a cycle. Make sure there are at least two uses.         */
+          if (!tsxUseful (ic))
+            return aop;
+          emitcode ("tsx", "");
+          hc08_reg_hx->aop = &tsxaop;
+          _G.tsxStackPushes = _G.stackPushes;
+        }
       return aop;
     }
 
@@ -1479,10 +1983,9 @@
 
 
 
-  werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
-          "aopForSym should never reach here");
+  werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "aopForSym should never reach here");
 
-  exit(1);
+  exit (1);
 
   /* if it is in code space */
   if (IN_CODESPACE (space))
@@ -1502,24 +2005,32 @@
   int ptr_type = 0;
   int val = 0;
 
+  if (!ic)
+    {
+      fprintf (stderr, "Symbol %s to be rematerialized, but has no rematiCode.\n", sym->name);
+      wassert (0);
+    }
+
   for (;;)
     {
       if (ic->op == '+')
         val += (int) operandLitValue (IC_RIGHT (ic));
       else if (ic->op == '-')
         val -= (int) operandLitValue (IC_RIGHT (ic));
-      else if (IS_CAST_ICODE(ic))
+      else if (IS_CAST_ICODE (ic))
         {
-          sym_link *from_type = operandType(IC_RIGHT(ic));
+          sym_link *from_type = operandType (IC_RIGHT (ic));
           ic = OP_SYMBOL (IC_RIGHT (ic))->rematiCode;
-          ptr_type = DCL_TYPE(from_type);
+          ptr_type = DCL_TYPE (from_type);
           if (ptr_type == IPOINTER)
-            {// bug #481053
+            {
+              // bug #481053
               ptr_type = POINTER;
             }
-          continue ;
+          continue;
         }
-      else break;
+      else
+        break;
 
       ic = OP_SYMBOL (IC_LEFT (ic))->rematiCode;
     }
@@ -1528,33 +2039,29 @@
     {
       if (val)
         {
-          SNPRINTF (buffer, sizeof(buffer),
-                    "(%s %c 0x%04x)",
-                    OP_SYMBOL (IC_LEFT (ic))->rname,
-                    val >= 0 ? '+' : '-',
-                    abs (val) & 0xffff);
+          SNPRINTF (buffer, sizeof (buffer),
+                    "(%s %c 0x%04x)", OP_SYMBOL (IC_LEFT (ic))->rname, val >= 0 ? '+' : '-', abs (val) & 0xffff);
         }
       else
         {
-          strncpyz (buffer, OP_SYMBOL (IC_LEFT (ic))->rname, sizeof(buffer));
+          strncpyz (buffer, OP_SYMBOL (IC_LEFT (ic))->rname, sizeof (buffer));
         }
 
       aop = newAsmop (AOP_IMMD);
-      aop->aopu.aop_immd.aop_immd1 = Safe_strdup(buffer);
+      aop->aopu.aop_immd.aop_immd1 = Safe_strdup (buffer);
       /* set immd2 field if required */
     }
   else if (ic->op == '=')
     {
       val += (int) operandLitValue (IC_RIGHT (ic));
       val &= 0xffff;
-      SNPRINTF (buffer, sizeof(buffer), "0x%04x", val);
+      SNPRINTF (buffer, sizeof (buffer), "0x%04x", val);
       aop = newAsmop (AOP_LIT);
       aop->aopu.aop_lit = constVal (buffer);
     }
   else
     {
-      werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
-              "unexpected rematerialization");
+      werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "unexpected rematerialization");
     }
 
   return aop;
@@ -1602,7 +2109,7 @@
 /* operandsEqu - equivalent                                        */
 /*-----------------------------------------------------------------*/
 static bool
-operandsEqu (operand * op1, operand * op2)
+operandsEqu (operand *op1, operand *op2)
 {
   symbol *sym1, *sym2;
 
@@ -1615,8 +2122,7 @@
 
   /* if both are itemps & one is spilt
      and the other is not then false */
-  if (IS_ITEMP (op1) && IS_ITEMP (op2) &&
-      sym1->isspilt != sym2->isspilt)
+  if (IS_ITEMP (op1) && IS_ITEMP (op2) && sym1->isspilt != sym2->isspilt)
     return FALSE;
 
   /* if they are the same */
@@ -1624,22 +2130,14 @@
     return TRUE;
 
   /* if they have the same rname */
-  if (sym1->rname[0] && sym2->rname[0]
-      && strcmp (sym1->rname, sym2->rname) == 0)
+  if (sym1->rname[0] && sym2->rname[0] && strcmp (sym1->rname, sym2->rname) == 0)
     return TRUE;
 
   /* if left is a tmp & right is not */
-  if (IS_ITEMP (op1) &&
-      !IS_ITEMP (op2) &&
-      sym1->isspilt &&
-      (sym1->usl.spillLoc == sym2))
+  if (IS_ITEMP (op1) && !IS_ITEMP (op2) && sym1->isspilt && (sym1->usl.spillLoc == sym2))
     return TRUE;
 
-  if (IS_ITEMP (op2) &&
-      !IS_ITEMP (op1) &&
-      sym2->isspilt &&
-      sym1->level > 0 &&
-      (sym2->usl.spillLoc == sym1))
+  if (IS_ITEMP (op2) && !IS_ITEMP (op1) && sym2->isspilt && sym1->level > 0 && (sym2->usl.spillLoc == sym1))
     return TRUE;
 
   return FALSE;
@@ -1663,17 +2161,18 @@
     {
       switch (aop1->type)
         {
-          case AOP_REG:
-            for (i = 0; i < aop1->size; i++)
-              if (aop1->aopu.aop_reg[i] !=
-                  aop2->aopu.aop_reg[i])
-                return FALSE;
-            return TRUE;
-          case AOP_SOF:
-            return (aop1->aopu.aop_stk == aop2->aopu.aop_stk);
-          case AOP_DIR:
-          case AOP_EXT:
-            return (!strcmp (aop1->aopu.aop_dir, aop2->aopu.aop_dir));
+        case AOP_REG:
+          for (i = 0; i < aop1->size; i++)
+            if (aop1->aopu.aop_reg[i] != aop2->aopu.aop_reg[i])
+              return FALSE;
+          return TRUE;
+        case AOP_SOF:
+          return (aop1->aopu.aop_stk == aop2->aopu.aop_stk);
+        case AOP_DIR:
+          if (regalloc_dry_run)
+            return FALSE;
+        case AOP_EXT:
+          return (!strcmp (aop1->aopu.aop_dir, aop2->aopu.aop_dir));
         }
     }
 
@@ -1684,7 +2183,7 @@
 /* aopOp - allocates an asmop for an operand  :                    */
 /*-----------------------------------------------------------------*/
 static void
-aopOp (operand * op, iCode * ic, bool result)
+aopOp (operand *op, iCode * ic, bool result)
 {
   asmop *aop = NULL;
   symbol *sym;
@@ -1695,7 +2194,7 @@
 
   // Is this a pointer set result?
   //
-  if ((op==IC_RESULT (ic)) && POINTER_SET (ic))
+  if ((op == IC_RESULT (ic)) && POINTER_SET (ic))
     {
     }
 
@@ -1724,20 +2223,20 @@
   /* if the underlying symbol has a aop */
   if (IS_SYMOP (op) && OP_SYMBOL (op)->aop)
     {
-      op->aop = aop = Safe_calloc(1, sizeof(*aop));
-      memcpy (aop, OP_SYMBOL (op)->aop, sizeof(*aop));
+      op->aop = aop = Safe_calloc (1, sizeof (*aop));
+      memcpy (aop, OP_SYMBOL (op)->aop, sizeof (*aop));
       //op->aop = aop = OP_SYMBOL (op)->aop;
-      aop->size = getSize( operandType (op));
+      aop->size = getSize (operandType (op));
       //printf ("reusing underlying symbol %s\n",OP_SYMBOL (op)->name);
       //printf (" with size = %d\n", aop->size);
 
       aop->op = op;
       aop->isaddr = op->isaddr;
       /* if (aop->isaddr & IS_ITEMP (op))
-        {
-          aop->psize=aop->size;
-          aop->size = getSize( operandType (op)->next);
-        } */
+         {
+         aop->psize=aop->size;
+         aop->size = getSize( operandType (op)->next);
+         } */
       return;
     }
 
@@ -1761,6 +2260,8 @@
      d) conditional
      e) can be a return use only */
 
+  if (!IS_SYMOP (op))
+    piCode (ic, NULL);
   sym = OP_SYMBOL (op);
 
 //  printf("checking conditional\n");
@@ -1789,56 +2290,35 @@
           aop->op = op;
           aop->isaddr = op->isaddr;
           /* if (aop->isaddr & IS_ITEMP (op))
-            {
-              aop->psize=aop->size;
-              aop->size = getSize( operandType (op)->next);
-            } */
+             {
+             aop->psize=aop->size;
+             aop->size = getSize( operandType (op)->next);
+             } */
           return;
         }
 
-//      printf("checking accuse\n");
-      if (sym->accuse)
+       wassertl (!sym->ruonly, "sym->ruonly not supported");
+
+       if (regalloc_dry_run)     // Todo: Handle dummy iTemp correctly
         {
-          sym->aop = op->aop = aop = newAsmop (AOP_REG);
-          aop->size = getSize (sym->type);
-          switch (sym->accuse)
+          if (options.stackAuto || (currFunc && IFFUNC_ISREENT (currFunc->type)))
             {
-            case ACCUSE_XA:
-              aop->aopu.aop_reg[0] = hc08_reg_a;
-              aop->aopu.aop_reg[1] = hc08_reg_x;
-              break;
-            case ACCUSE_HX:
-              aop->aopu.aop_reg[0] = hc08_reg_x;
-              aop->aopu.aop_reg[1] = hc08_reg_h;
-              break;
+              sym->aop = op->aop = aop = newAsmop (AOP_SOF);
+              aop->aopu.aop_stk = 8; /* bogus stack offset, high enough to prevent optimization */
             }
-          aop->op = op;
-          aop->isaddr = op->isaddr;
-          return;
-        }
-
-//      printf("checking ruonly\n");
-#if 1
-      if (sym->ruonly)
-        {
-          unsigned i;
-
-          sym->aop = op->aop = aop = newAsmop (AOP_STR);
+          else
+            sym->aop = op->aop = aop = newAsmop (AOP_DIR);
           aop->size = getSize (sym->type);
-          for (i = 0; i < fReturnSizeHC08; i++)
-            aop->aopu.aop_str[i] = fReturn2[i];
           aop->op = op;
-          aop->isaddr = op->isaddr;
           return;
         }
-#endif
+
       /* else spill location  */
-      if (sym->usl.spillLoc)
+      if (sym->usl.spillLoc || regalloc_dry_run)
         {
           asmop *oldAsmOp = NULL;
 
-          if (sym->usl.spillLoc->aop
-              && sym->usl.spillLoc->aop->size != getSize (sym->type))
+          if (sym->usl.spillLoc->aop && sym->usl.spillLoc->aop->size != getSize (sym->type))
             {
               /* force a new aop if sizes differ */
               oldAsmOp = sym->usl.spillLoc->aop;
@@ -1862,15 +2342,20 @@
       /* else must be a dummy iTemp */
       sym->aop = op->aop = aop = newAsmop (AOP_DUMMY);
       aop->size = getSize (sym->type);
+      aop->op = op;
       return;
     }
 
 //  printf("assuming register\n");
   /* must be in a register */
+  wassert (sym->nRegs);
   sym->aop = op->aop = aop = newAsmop (AOP_REG);
   aop->size = sym->nRegs;
   for (i = 0; i < sym->nRegs; i++)
-    aop->aopu.aop_reg[i] = sym->regs[i];
+    {
+       wassert (sym->regs[i] < regshc08 + 3);
+       aop->aopu.aop_reg[i] = sym->regs[i];
+    }
   aop->op = op;
   aop->isaddr = op->isaddr;
 }
@@ -1901,10 +2386,10 @@
       int stackAdjust;
       int loffset;
 
-      DD(emitcode ("","; freeAsmop restoring stacked %s", aopName(aop)));
+      DD (emitcode ("", "; freeAsmop restoring stacked %s", aopName (aop)));
       aop->stacked = 0;
       stackAdjust = 0;
-      for (loffset=0; loffset<aop->size; loffset++)
+      for (loffset = 0; loffset < aop->size; loffset++)
         if (aop->stk_aop[loffset])
           {
             transferAopAop (aop->stk_aop[loffset], 0, aop, loffset);
@@ -1934,16 +2419,15 @@
 /*               an asmop for the object it references             */
 /*-----------------------------------------------------------------*/
 asmop *
-aopDerefAop (asmop *aop)
+aopDerefAop (asmop * aop, int offset)
 {
   int adr;
-  char *s = buffer;
-  char *rs;
   asmop *newaop = NULL;
   sym_link *type, *etype;
   int p_type;
+  struct dbuf_s dbuf;
 
-  DD(emitcode ("", ";     aopDerefAop(%s)", aopName(aop)));
+  DD (emitcode ("", ";     aopDerefAop(%s)", aopName (aop)));
   if (aop->op)
     {
 
@@ -1968,30 +2452,36 @@
         newaop = newAsmop (AOP_DIR);
       else
         newaop = newAsmop (AOP_EXT);
-      newaop->aopu.aop_dir = aop->aopu.aop_immd.aop_immd1;
+      if (!offset)
+        newaop->aopu.aop_dir = aop->aopu.aop_immd.aop_immd1;
+      else
+        {
+          dbuf_init (&dbuf, 64);
+          dbuf_printf (&dbuf, "(%s+%d)", aop->aopu.aop_immd.aop_immd1, offset);
+          newaop->aopu.aop_dir = dbuf_detach_c_str (&dbuf);
+        }
       break;
     case AOP_LIT:
       adr = (int) ulFromVal (aop->aopu.aop_lit);
       if (p_type == POINTER)
         adr &= 0xff;
+      adr = (adr + offset) & 0xffff;
+      dbuf_init (&dbuf, 64);
 
-      if (adr<0x100)
+      if (adr < 0x100)
         {
           newaop = newAsmop (AOP_DIR);
-          sprintf (s, "0x%02x",adr);
+          dbuf_printf (&dbuf, "0x%02x", adr);
         }
       else
         {
           newaop = newAsmop (AOP_EXT);
-          sprintf (s, "0x%04x",adr);
+          dbuf_printf (&dbuf, "0x%04x", adr);
         }
-      rs = Safe_calloc (1, strlen (s) + 1);
-      strcpy (rs, s);
-      newaop->aopu.aop_dir = rs;
+      newaop->aopu.aop_dir = dbuf_detach_c_str (&dbuf);
       break;
     default:
-      werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
-              "unsupported asmop");
+      werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "unsupported asmop");
       return NULL;
     }
 
@@ -2004,18 +2494,19 @@
 /*-----------------------------------------------------------------*/
 /* aopAdrStr - for referencing the address of the aop              */
 /*-----------------------------------------------------------------*/
+/* loffset seems to have a weird meaning here. It seems to be nonzero in some places where one would expect an offset ot be zero */
 static char *
 aopAdrStr (asmop * aop, int loffset, bool bit16)
 {
   char *s = buffer;
   char *rs;
-  int offset = aop->size - 1 - loffset;
+  int offset = aop->size - 1 - loffset - (bit16 ? 1 : 0);
 
   /* offset is greater than
      size then zero */
   if (loffset > (aop->size - 1) && aop->type != AOP_LIT)
     return zero;
-
+  
   /* depending on type */
   switch (aop->type)
     {
@@ -2023,36 +2514,24 @@
       return zero;
 
     case AOP_IMMD:
-      if (aop->aopu.aop_immd.from_cast_remat && (loffset == (aop->size-1)))
-        {
-          sprintf(s,"%s",aop->aopu.aop_immd.aop_immd2);
-        }
-      else if (bit16)
+      if (loffset)
         {
-          sprintf (s, "#%s", aop->aopu.aop_immd.aop_immd1);
-        }
-      else if (loffset)
-        {
-          if (loffset!=1)
-            sprintf (s, "#(%s >> %d)",
-                     aop->aopu.aop_immd.aop_immd1,
-                     loffset * 8);
+          if (loffset > 1)
+            sprintf (s, "#(%s >> %d)", aop->aopu.aop_immd.aop_immd1, loffset * 8);
           else
-            sprintf (s, "#>%s",
-                     aop->aopu.aop_immd.aop_immd1);
+            sprintf (s, "#>%s", aop->aopu.aop_immd.aop_immd1);
         }
       else
-        sprintf (s, "#%s",
-                 aop->aopu.aop_immd.aop_immd1);
+        sprintf (s, "#%s", aop->aopu.aop_immd.aop_immd1);
       rs = Safe_calloc (1, strlen (s) + 1);
       strcpy (rs, s);
       return rs;
 
     case AOP_DIR:
+      if (regalloc_dry_run)
+        return "*dry";
       if (offset)
-        sprintf (s, "*(%s + %d)",
-                 aop->aopu.aop_dir,
-                 offset);
+        sprintf (s, "*(%s + %d)", aop->aopu.aop_dir, offset);
       else
         sprintf (s, "*%s", aop->aopu.aop_dir);
       rs = Safe_calloc (1, strlen (s) + 1);
@@ -2060,10 +2539,10 @@
       return rs;
 
     case AOP_EXT:
+      if (regalloc_dry_run)
+        return "dry";
       if (offset)
-        sprintf (s, "(%s + %d)",
-                 aop->aopu.aop_dir,
-                 offset);
+        sprintf (s, "(%s + %d)", aop->aopu.aop_dir, offset);
       else
         sprintf (s, "%s", aop->aopu.aop_dir);
       rs = Safe_calloc (1, strlen (s) + 1);
@@ -2075,24 +2554,27 @@
 
     case AOP_LIT:
       if (bit16)
-        return aopLiteralLong (aop->aopu.aop_lit, /*loffset*/ 0, 2);
+        return aopLiteralLong (aop->aopu.aop_lit, loffset, 2);
       else
         return aopLiteral (aop->aopu.aop_lit, loffset);
 
-    case AOP_STR:
-      aop->coff = offset;
-      return aop->aopu.aop_str[loffset];
-
     case AOP_SOF:
-      sprintf (s, "%d,s",
-               _G.stackOfs + _G.stackPushes + aop->aopu.aop_stk + offset + 1);
+      if (!regalloc_dry_run && hc08_reg_hx->aop == &tsxaop)
+        {
+          int xofs = _G.stackOfs + _G.tsxStackPushes + aop->aopu.aop_stk + offset;
+          if (xofs)
+            sprintf (s, "%d,x", xofs);
+          else
+            sprintf (s, ",x");
+        }
+      else
+        sprintf (s, "%d,s", _G.stackOfs + _G.stackPushes + aop->aopu.aop_stk + offset + 1);
       rs = Safe_calloc (1, strlen (s) + 1);
       strcpy (rs, s);
       return rs;
     }
 
-  werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
-          "aopAdrStr got unsupported aop->type");
+  werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "aopAdrStr got unsupported aop->type");
   exit (1);
 }
 
@@ -2122,7 +2604,7 @@
 /* getDataSize - get the operand data size                         */
 /*-----------------------------------------------------------------*/
 static int
-getDataSize (operand * op)
+getDataSize (operand *op)
 {
   int size;
   size = AOP_SIZE (op);
@@ -2138,66 +2620,95 @@
 static void
 asmopToBool (asmop *aop, bool resultInA)
 {
-  bool isFloat = IS_FLOAT (operandType (AOP_OP (aop)));
+  bool isFloat; 
   symbol *tlbl, *tlbl1;
   int size = aop->size;
   bool needpula = FALSE;
   bool flagsonly = TRUE;
   int offset = size - 1;
+  sym_link *type;
+
+  wassert (aop);
+  type = operandType (AOP_OP (aop));
+  isFloat = IS_FLOAT (type);
 
   if (resultInA)
-    hc08_freeReg(hc08_reg_a);
+    hc08_freeReg (hc08_reg_a);
+
+  if (IS_BOOL (type))
+    {
+      if (resultInA)
+        loadRegFromAop (hc08_reg_a, aop, 0);
+      else
+        rmwWithAop ("tst", aop, 0);
+      return;
+    }
+
+  if (resultInA && size == 1)
+    {
+      loadRegFromAop (hc08_reg_a, aop, 0);
+      rmwWithReg ("neg", hc08_reg_a);
+      loadRegFromConst (hc08_reg_a, zero);
+      rmwWithReg ("rol", hc08_reg_a);
+      return;
+    }
 
   switch (aop->type)
     {
     case AOP_REG:
-      if (IS_AOP_A(aop))
+      if (IS_AOP_A (aop))
         {
           emitcode ("tsta", "");
+          regalloc_dry_run_cost++;
           flagsonly = FALSE;
         }
-      else if (IS_AOP_X(aop))
+      else if (IS_AOP_X (aop))
         {
           emitcode ("tstx", "");
+          regalloc_dry_run_cost++;
         }
-      else if (IS_AOP_H(aop))
+      else if (IS_AOP_H (aop))
         {
           if (hc08_reg_a->isFree)
             {
               transferRegReg (hc08_reg_h, hc08_reg_a, FALSE);
               emitcode ("tsta", "");
+              regalloc_dry_run_cost++;
               flagsonly = FALSE;
-              hc08_freeReg(hc08_reg_a);
+              hc08_freeReg (hc08_reg_a);
             }
           else if (hc08_reg_x->isFree)
             {
               transferRegReg (hc08_reg_h, hc08_reg_x, FALSE);
               emitcode ("tstx", "");
-              hc08_freeReg(hc08_reg_x);
+              hc08_freeReg (hc08_reg_x);
             }
           else
             {
               emitcode ("pshh", "");
               emitcode ("tst", "1,s");
               emitcode ("ais", "#1");
+              regalloc_dry_run_cost += 6;
             }
         }
-      else if (IS_AOP_HX(aop))
+      else if (IS_AOP_HX (aop))
         {
           emitcode ("cphx", zero);
         }
-      else if (IS_AOP_XA(aop))
+      else if (IS_AOP_XA (aop) || IS_AOP_AX (aop))
         {
-          symbol *tlbl = newiTempLabel (NULL);
+          symbol *tlbl = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
           emitcode ("tsta", "");
-          emitcode ("bne", "%05d$", (tlbl->key + 100));
+          if (!regalloc_dry_run)
+            emitcode ("bne", "%05d$", labelKey2num (tlbl->key));
           emitcode ("tstx", "");
-          emitLabel (tlbl);
+          regalloc_dry_run_cost += 4;
+          if (!regalloc_dry_run)
+            emitLabel (tlbl);
         }
       else
         {
-          werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
-                  "Bad rIdx in asmToBool");
+          werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "Bad rIdx in asmopToBool");
           return;
         }
       break;
@@ -2208,7 +2719,10 @@
         needpula = pushRegIfUsed (hc08_reg_a);
       loadRegFromAop (hc08_reg_a, aop, offset--);
       if (isFloat)
-        emitcode ("and", "#0x7F"); //clear sign bit
+        {
+          emitcode ("and", "#0x7F");      //clear sign bit
+          regalloc_dry_run_cost += 2;
+        }
       while (--size)
         accopWithAop ("ora", aop, offset--);
       if (needpula)
@@ -2225,10 +2739,10 @@
         loadRegFromConst (hc08_reg_a, one);
       else
         loadRegFromConst (hc08_reg_a, zero);
-      hc08_freeReg(hc08_reg_a);
+      hc08_freeReg (hc08_reg_a);
       break;
     default:
-      if (size==1)
+      if (size == 1)
         {
           if (resultInA)
             {
@@ -2237,10 +2751,13 @@
               flagsonly = FALSE;
             }
           else
-            emitcode ("tst", "%s", aopAdrStr (aop, 0, FALSE));
+            {
+              emitcode ("tst", "%s", aopAdrStr (aop, 0, FALSE));
+              regalloc_dry_run_cost += ((aop->type == AOP_DIR || aop->type == AOP_IMMD) ? 2 : 3);
+            }
           break;
         }
-      else if (size==2)
+      else if (size == 2)
         {
           if (hc08_reg_a->isFree)
             {
@@ -2251,11 +2768,14 @@
             }
           else
             {
-              tlbl = newiTempLabel (NULL);
+              tlbl = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
               emitcode ("tst", "%s", aopAdrStr (aop, 0, FALSE));
-              emitcode ("bne", "%05d$", (tlbl->key + 100));
+              if (!regalloc_dry_run)
+                emitcode ("bne", "%05d$", labelKey2num (tlbl->key));
               emitcode ("tst", "%s", aopAdrStr (aop, 1, FALSE));
-              emitLabel (tlbl);
+              regalloc_dry_run_cost += 4;
+              if (!regalloc_dry_run)
+                emitLabel (tlbl);
               break;
             }
         }
@@ -2264,7 +2784,10 @@
           needpula = pushRegIfUsed (hc08_reg_a);
           loadRegFromAop (hc08_reg_a, aop, offset--);
           if (isFloat)
-            emitcode ("and", "#0x7F");
+            {
+              emitcode ("and", "#0x7F");
+              regalloc_dry_run_cost += 2;
+            }
           while (--size)
             accopWithAop ("ora", aop, offset--);
           if (needpula)
@@ -2279,15 +2802,16 @@
 
   if (resultInA)
     {
-      tlbl = newiTempLabel (NULL);
+      tlbl = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
 
       if (flagsonly)
         {
-          tlbl1 = newiTempLabel (NULL);
+          tlbl1 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
           emitBranch ("bne", tlbl1);
           loadRegFromConst (hc08_reg_a, zero);
           emitBranch ("bra", tlbl);
-          emitLabel (tlbl1);
+          if (!regalloc_dry_run)
+            emitLabel (tlbl1);
           loadRegFromConst (hc08_reg_a, one);
         }
       else
@@ -2295,28 +2819,106 @@
           emitBranch ("beq", tlbl);
           loadRegFromConst (hc08_reg_a, one);
         }
-      emitLabel (tlbl);
+      if (!regalloc_dry_run)
+        emitLabel (tlbl);
       hc08_useReg (hc08_reg_a);
     }
 }
 
-
-
 /*-----------------------------------------------------------------*/
-/* genNot - generate code for ! operation                          */
+/* genCopy - Copy the value from one operand to another            */
+/*           The caller is responsible for aopOp and freeAsmop     */
 /*-----------------------------------------------------------------*/
 static void
-genNot (iCode * ic)
+genCopy (operand * result, operand * source)
 {
-  D(emitcode (";     genNot",""));
-
+  int size;
+  int offset = 0;
+
+  /* if they are the same and not volatile */
+  if (operandsEqu (result, source) && !isOperandVolatile (result, FALSE) &&
+      !isOperandVolatile (source, FALSE))
+    return;
+
+  /* if they are the same registers */
+  if (sameRegs (AOP (source), AOP (result)))
+    return;
+
+  if (IS_AOP_HX (AOP (result)))
+    {
+      loadRegFromAop (hc08_reg_hx, AOP (source), 0);
+      return;
+    }
+
+  /* If the result and right are 2 bytes and both in registers, we have to be careful */
+  /* to make sure the registers are not overwritten prematurely. */
+  if (AOP_SIZE (result) == 2 && AOP (result)->type == AOP_REG && AOP (source)->type == AOP_REG)
+    {
+      if (AOP (result)->aopu.aop_reg[0] == AOP (source)->aopu.aop_reg[1] &&
+          AOP (result)->aopu.aop_reg[1] == AOP (source)->aopu.aop_reg[0])
+        {
+          pushReg (AOP (source)->aopu.aop_reg[1], TRUE);
+          transferAopAop (AOP (source), 0, AOP (result), 0);
+          pullReg (AOP (result)->aopu.aop_reg[1]);
+        }
+      else if (AOP (result)->aopu.aop_reg[0] == AOP (source)->aopu.aop_reg[1])
+        {
+          transferAopAop (AOP (source), 1, AOP (result), 1);
+          transferAopAop (AOP (source), 0, AOP (result), 0);
+        }
+      else
+        {
+          transferAopAop (AOP (source), 0, AOP (result), 0);
+          transferAopAop (AOP (source), 1, AOP (result), 1);
+        }
+      return;
+    }
+
+  /* general case */
+  /* Copy in msb tot lsb order, since some multi-byte hardware registers */
+  /* expect this order. */
+  size = AOP_SIZE (result);
+  offset = size - 1;
+  while (size)
+    {
+      if (size >= 2 && hc08_reg_h->isDead && hc08_reg_x->isDead  &&
+        (AOP_TYPE (source) == AOP_IMMD || AOP_TYPE (source) == AOP_LIT ||IS_S08 && AOP_TYPE (source) == AOP_EXT) &&
+        (AOP_TYPE (result) == AOP_DIR || IS_S08 && AOP_TYPE (result) == AOP_EXT))
+        {
+          loadRegFromAop (hc08_reg_hx, AOP (source), offset - 1);
+          storeRegToAop (hc08_reg_hx, AOP (result), offset - 1);
+          offset -= 2;
+          size -= 2;
+        }
+      else
+        {
+          transferAopAop (AOP (source), offset, AOP (result), offset);
+          offset--;
+          size--;
+        }
+    }
+}
+
+/*-----------------------------------------------------------------*/
+/* genNot - generate code for ! operation                          */
+/*-----------------------------------------------------------------*/
+static void
+genNot (iCode * ic)
+{
+  bool needpulla;
+
+  D (emitcode (";     genNot", ""));
+
   /* assign asmOps to operand & result */
   aopOp (IC_LEFT (ic), ic, FALSE);
   aopOp (IC_RESULT (ic), ic, TRUE);
+  needpulla = pushRegIfSurv (hc08_reg_a);
+  asmopToBool (AOP (IC_LEFT (ic)), TRUE);
 
-  asmopToBool ( AOP (IC_LEFT (ic)), TRUE);
   emitcode ("eor", one);
+  regalloc_dry_run_cost += 2;
   storeRegToFullAop (hc08_reg_a, AOP (IC_RESULT (ic)), FALSE);
+  pullOrFreeReg (hc08_reg_a, needpulla);
 
   freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
   freeAsmop (IC_LEFT (ic), NULL, ic, TRUE);
@@ -2331,26 +2933,71 @@
 {
   int offset = 0;
   int size;
-  reg_info* reg = hc08_reg_a;
+  reg_info *reg;
+  bool needpullreg;
 
-  D(emitcode (";     genCpl",""));
+  D (emitcode (";     genCpl", ""));
 
   /* assign asmOps to operand & result */
   aopOp (IC_LEFT (ic), ic, FALSE);
   aopOp (IC_RESULT (ic), ic, TRUE);
-
   size = AOP_SIZE (IC_RESULT (ic));
+
+  if(AOP_TYPE (IC_LEFT (ic)) == AOP_REG && AOP_TYPE (IC_RESULT (ic)) == AOP_REG &&
+    AOP (IC_RESULT (ic))->aopu.aop_reg[0] == AOP (IC_LEFT (ic))->aopu.aop_reg[0] &&
+    (size < 2 || AOP (IC_RESULT (ic))->aopu.aop_reg[1] == AOP (IC_LEFT (ic))->aopu.aop_reg[1]))
+    {
+      while (size--)
+        rmwWithReg ("com", AOP (IC_RESULT (ic))->aopu.aop_reg[offset++]);
+      goto release;
+    }
+
+  if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG && AOP_TYPE (IC_LEFT (ic)) == AOP_REG)
+    {
+      while (size--)
+        {
+          if ((reg = AOP (IC_RESULT (ic))->aopu.aop_reg[offset]) != hc08_reg_h)
+            {
+              transferAopAop (AOP (IC_LEFT (ic)), offset, AOP (IC_RESULT (ic)), offset);
+              rmwWithReg ("com", reg);
+            }
+          else
+            {
+              if ((reg = AOP (IC_LEFT (ic))->aopu.aop_reg[offset]) == hc08_reg_h)
+                reg = hc08_reg_a->isDead ? hc08_reg_a : hc08_reg_x;
+              needpullreg = pushRegIfSurv (reg);
+              loadRegFromAop (reg, AOP (IC_LEFT (ic)), offset);
+              rmwWithReg ("com", reg);
+              storeRegToAop (reg, AOP (IC_RESULT (ic)), offset);
+              if (needpullreg)
+                pullReg (reg);
+            }
+          offset++;
+        }
+      goto release;
+    }
+
+  reg = (hc08_reg_a->isDead && !(AOP_TYPE (IC_RESULT (ic)) == AOP_REG && AOP (IC_RESULT (ic))->aopu.aop_reg[0] == hc08_reg_a) ? hc08_reg_a : hc08_reg_x);
+
+  needpullreg = pushRegIfSurv (reg);
   while (size--)
     {
+      bool needpullreg2 = (!size && AOP_TYPE (IC_RESULT (ic)) == AOP_REG && AOP (IC_RESULT (ic))->aopu.aop_reg[0] == reg || size && AOP_TYPE (IC_RESULT (ic)) == AOP_REG && AOP (IC_RESULT (ic))->aopu.aop_reg[1] == reg);
+      if (needpullreg2)
+        pushReg (reg, TRUE);
       loadRegFromAop (reg, AOP (IC_LEFT (ic)), offset);
       rmwWithReg ("com", reg);
       hc08_useReg (reg);
       storeRegToAop (reg, AOP (IC_RESULT (ic)), offset);
       hc08_freeReg (reg);
+      if (needpullreg2)
+        pullReg (reg);
       offset++;
     }
+  pullOrFreeReg (reg, needpullreg);
 
   /* release the aops */
+release:
   freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
   freeAsmop (IC_LEFT (ic), NULL, ic, TRUE);
 }
@@ -2364,7 +3011,7 @@
   int size, offset = 0;
   bool needpula;
 
-  D(emitcode (";     genUminusFloat",""));
+  D (emitcode (";     genUminusFloat", ""));
 
   /* for this we just copy and then flip the bit */
 
@@ -2376,9 +3023,10 @@
       offset++;
     }
 
-  needpula = pushRegIfUsed (hc08_reg_a);
+  needpula = pushRegIfSurv (hc08_reg_a);
   loadRegFromAop (hc08_reg_a, AOP (op), offset);
   emitcode ("eor", "#0x80");
+  regalloc_dry_run_cost += 2;
   hc08_useReg (hc08_reg_a);
   storeRegToAop (hc08_reg_a, AOP (result), offset);
   pullOrFreeReg (hc08_reg_a, needpula);
@@ -2391,19 +3039,18 @@
 genUminus (iCode * ic)
 {
   int offset, size;
-  sym_link *optype, *rtype;
+  sym_link *optype;
   char *sub;
   bool needpula;
   asmop *result;
 
-  D(emitcode (";     genUminus",""));
+  D (emitcode (";     genUminus", ""));
 
   /* assign asmops */
   aopOp (IC_LEFT (ic), ic, FALSE);
   aopOp (IC_RESULT (ic), ic, TRUE);
 
   optype = operandType (IC_LEFT (ic));
-  rtype = operandType (IC_RESULT (ic));
 
   /* if float then do float stuff */
   if (IS_FLOAT (optype))
@@ -2418,42 +3065,81 @@
 
   if (size == 1)
     {
-      if (!IS_AOP_A (AOP (IC_LEFT (ic))))
-        needpula = pushRegIfUsed (hc08_reg_a);
-      else
-        needpula = FALSE;
-      loadRegFromAop (hc08_reg_a, AOP( IC_LEFT (ic)), 0);
-      emitcode ("nega", "");
+      needpula = pushRegIfSurv (hc08_reg_a);
+      loadRegFromAop (hc08_reg_a, AOP (IC_LEFT (ic)), 0);
+      rmwWithReg ("neg", hc08_reg_a);
       hc08_freeReg (hc08_reg_a);
-      storeRegToFullAop (hc08_reg_a, AOP( IC_RESULT (ic)),
-                         SPEC_USIGN (operandType (IC_LEFT (ic))));
+      storeRegToFullAop (hc08_reg_a, AOP (IC_RESULT (ic)), SPEC_USIGN (operandType (IC_LEFT (ic))));
       pullOrFreeReg (hc08_reg_a, needpula);
+      goto release;
     }
-  else
-    {
-      if (IS_AOP_XA (AOP (IC_RESULT (ic))))
-        result = forceStackedAop (AOP (IC_RESULT (ic)), FALSE);
-      else
-        result = AOP (IC_RESULT (ic));
 
-      needpula = pushRegIfUsed (hc08_reg_a);
-      sub="sub";
-      while (size--)
+  /* If either left or result are in registers, handle this carefully to     */
+  /* avoid prematurely overwriting register values. The 1 byte case was      */
+  /* handled above and there aren't enough registers to handle 4 byte values */
+  /* so this case only needs to deal with 2 byte values. */
+  if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || AOP_TYPE (IC_LEFT (ic)) == AOP_REG)
+    {
+      reg_info *result0 = NULL;
+      reg_info *left0 = NULL;
+      reg_info *left1 = NULL;
+      if (AOP_TYPE (IC_LEFT (ic)) == AOP_REG)
+        {
+          left0 = AOP (IC_LEFT (ic))->aopu.aop_reg[0];
+          left1 = AOP (IC_LEFT (ic))->aopu.aop_reg[1];
+        }
+      if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG)
+        {
+          result0 = AOP (IC_RESULT (ic))->aopu.aop_reg[0];
+        }
+      needpula = pushRegIfSurv (hc08_reg_a);
+      if (left1 == hc08_reg_a)
+        pushReg (left1, TRUE);
+
+      if (left0 == hc08_reg_a)
+        rmwWithReg ("neg", hc08_reg_a);
+      else
         {
           loadRegFromConst (hc08_reg_a, zero);
-          accopWithAop (sub, AOP( IC_LEFT (ic)), offset);
-          storeRegToAop (hc08_reg_a, result, offset++);
-          sub = "sbc";
+          accopWithAop ("sub", AOP (IC_LEFT (ic)), 0);
+        }
+      if (result0 == hc08_reg_a || (result0 && result0 == left1))
+        pushReg (hc08_reg_a, TRUE);
+      else
+        storeRegToAop (hc08_reg_a, AOP (IC_RESULT (ic)), 0);
+      loadRegFromConst (hc08_reg_a, zero);
+      if (left1 == hc08_reg_a)
+        {
+          emitcode ("sbc","%d,s", (result0 == hc08_reg_a || (result0 && result0 == left1)) ? 2 : 1);
+          regalloc_dry_run_cost += 3;
+          hc08_dirtyReg (hc08_reg_a, FALSE);
+        }
+      else
+        {
+          accopWithAop ("sbc", AOP (IC_LEFT (ic)), 1);
         }
-        storeRegSignToUpperAop (hc08_reg_a, result, offset,
-                                SPEC_USIGN (operandType (IC_LEFT (ic))));
+      storeRegToAop (hc08_reg_a, AOP (IC_RESULT (ic)), 1);
+      if (result0 == hc08_reg_a || (result0 && result0 == left1))
+        pullReg (result0);
+      if (left1 == hc08_reg_a)
+        pullNull (1);
       pullOrFreeReg (hc08_reg_a, needpula);
-
-      if (IS_AOP_XA (AOP (IC_RESULT (ic))))
-        freeAsmop (NULL, result, ic, TRUE);
+      goto release;
     }
 
+  result = AOP (IC_RESULT (ic));
 
+  needpula = pushRegIfSurv (hc08_reg_a);
+  sub = "sub";
+  while (size--)
+    {
+      loadRegFromConst (hc08_reg_a, zero);
+      accopWithAop (sub, AOP (IC_LEFT (ic)), offset);
+      storeRegToAop (hc08_reg_a, result, offset++);
+      sub = "sbc";
+    }
+  storeRegSignToUpperAop (hc08_reg_a, result, offset, SPEC_USIGN (operandType (IC_LEFT (ic))));
+  pullOrFreeReg (hc08_reg_a, needpula);
 
 release:
   /* release the aops */
@@ -2465,11 +3151,10 @@
 /* saveRegisters - will look for a call and save the registers     */
 /*-----------------------------------------------------------------*/
 static void
-saveRegisters (iCode * lic)
+saveRegisters (iCode *lic)
 {
   int i;
   iCode *ic;
-  bitVect *rsave;
 
   /* look for call */
   for (ic = lic; ic; ic = ic->next)
@@ -2486,21 +3171,16 @@
      do nothing */
   if (ic->regsSaved)
     return;
-  if (IS_SYMOP(IC_LEFT(ic)) &&
-      (IFFUNC_CALLEESAVES(OP_SYMBOL(IC_LEFT(ic))->type) ||
-       IFFUNC_ISNAKED(OP_SYM_TYPE(IC_LEFT (ic)))))
+  if (IS_SYMOP (IC_LEFT (ic)) &&
+      (IFFUNC_CALLEESAVES (OP_SYMBOL (IC_LEFT (ic))->type) || IFFUNC_ISNAKED (OP_SYM_TYPE (IC_LEFT (ic)))))
     return;
 
-  /* safe the registers in use at this time but skip the
-     ones for the result */
-  rsave = bitVectCplAnd (bitVectCopy (ic->rMask),
-                         hc08_rUmaskForOp (IC_RESULT(ic)));
-
-  ic->regsSaved = 1;
-  for (i = 0; i < hc08_nRegs; i++)
+  if (!regalloc_dry_run)
+    ic->regsSaved = 1;
+  for (i = A_IDX; i <= H_IDX; i++)
     {
-      if (bitVectBitValue (rsave, i))
-        pushReg ( hc08_regWithIdx (i), FALSE);
+      if (bitVectBitValue (ic->rSurv, i))
+        pushReg (hc08_regWithIdx (i), FALSE);
     }
 }
 
@@ -2508,20 +3188,14 @@
 /* unsaveRegisters - pop the pushed registers                      */
 /*-----------------------------------------------------------------*/
 static void
-unsaveRegisters (iCode * ic)
+unsaveRegisters (iCode *ic)
 {
   int i;
-  bitVect *rsave;
-
-  /* restore the registers in use at this time but skip the
-     ones for the result */
-  rsave = bitVectCplAnd (bitVectCopy (ic->rMask),
-                         hc08_rUmaskForOp (IC_RESULT(ic)));
 
-  for (i = hc08_nRegs; i >= 0; i--)
+  for (i = H_IDX; i >= A_IDX; i--)
     {
-      if (bitVectBitValue (rsave, i))
-        pullReg ( hc08_regWithIdx (i));
+      if (bitVectBitValue (ic->rSurv, i))
+        pullReg (hc08_regWithIdx (i));
     }
 
 }
@@ -2531,89 +3205,103 @@
 /* pushSide -                                                      */
 /*-----------------------------------------------------------------*/
 static void
-pushSide (operand * oper, int size, iCode * ic)
+pushSide (operand *oper, int size, iCode *ic)
 {
   int offset = 0;
+  bool xIsFree = hc08_reg_x->isFree;
 
+  hc08_useReg (hc08_reg_x);
   aopOp (oper, ic, FALSE);
 
   while (size--)
     {
-      loadRegFromAop (hc08_reg_a, AOP (oper), offset++);
-      pushReg ( hc08_reg_a, TRUE);
+      if (AOP_TYPE (oper) == AOP_REG)
+        pushReg (AOP (oper)->aopu.aop_reg[offset++], TRUE);
+      else
+        {
+          loadRegFromAop (hc08_reg_a, AOP (oper), offset++);
+          pushReg (hc08_reg_a, TRUE);
+        }
     }
 
   freeAsmop (oper, NULL, ic, TRUE);
+  if (xIsFree)
+    hc08_freeReg (hc08_reg_x);
 }
 
 /*-----------------------------------------------------------------*/
-/* assignResultValue -               */
+/* assignResultValue -                                             */
 /*-----------------------------------------------------------------*/
 static void
 assignResultValue (operand * oper)
 {
   int size = AOP_SIZE (oper);
   int offset = 0;
+  bool delayed_x = FALSE;
   while (size--)
     {
-      transferAopAop(hc08_aop_pass[offset], 0, AOP (oper), offset);
+      if (!offset && AOP_TYPE (oper) == AOP_REG && AOP_SIZE (oper) > 1 && AOP (oper)->aopu.aop_reg[0]->rIdx == X_IDX)
+        {
+          pushReg (hc08_reg_a, TRUE);
+          delayed_x = TRUE;
+        }
+      else
+        transferAopAop (hc08_aop_pass[offset], 0, AOP (oper), offset);
       if (hc08_aop_pass[offset]->type == AOP_REG)
         hc08_freeReg (hc08_aop_pass[offset]->aopu.aop_reg[0]);
       offset++;
     }
+  if (delayed_x)
+    pullReg (hc08_reg_x);
 }
 
 
 
 /*-----------------------------------------------------------------*/
-/* genIpush - genrate code for pushing this gets a little complex  */
+/* genIpush - generate code for pushing this gets a little complex */
 /*-----------------------------------------------------------------*/
 static void
 genIpush (iCode * ic)
 {
   int size, offset = 0;
 
-  D(emitcode (";     genIpush",""));
+  D (emitcode (";", "genIpush"));
 
   /* if this is not a parm push : ie. it is spill push
      and spill push is always done on the local stack */
   if (!ic->parmPush)
     {
-
       /* and the item is spilt then do nothing */
       if (OP_SYMBOL (IC_LEFT (ic))->isspilt)
         return;
 
       aopOp (IC_LEFT (ic), ic, FALSE);
       size = AOP_SIZE (IC_LEFT (ic));
-      offset = 0;
       /* push it on the stack */
       while (size--)
         {
           loadRegFromAop (hc08_reg_a, AOP (IC_LEFT (ic)), offset++);
-          pushReg ( hc08_reg_a, TRUE);
+          pushReg (hc08_reg_a, TRUE);
         }
-
       return;
     }
 
-  /* this is a paramter push: in this case we call
+  /* this is a parameter push: in this case we call
      the routine to find the call and save those
      registers that need to be saved */
-  saveRegisters (ic);
+  if (!regalloc_dry_run) /* Cost for saving registers is counted at CALL or PCALL */
+    saveRegisters (ic);
 
   /* then do the push */
   aopOp (IC_LEFT (ic), ic, FALSE);
 
-
   // pushSide(IC_LEFT(ic), AOP_SIZE(IC_LEFT(ic)));
   size = AOP_SIZE (IC_LEFT (ic));
-  offset = 0;
 
 //  l = aopGet (AOP (IC_LEFT (ic)), 0, FALSE, TRUE);
-  if (AOP_TYPE (IC_LEFT (ic)) == AOP_IMMD)
+  if (AOP_TYPE (IC_LEFT (ic)) == AOP_IMMD || AOP_TYPE (IC_LEFT (ic)) == AOP_LIT ||IS_AOP_HX (AOP (IC_LEFT (ic))))
     {
-      if ((size==2) && hc08_reg_hx->isFree)
+      if ((size == 2) && hc08_reg_hx->isDead || IS_AOP_HX (AOP (IC_LEFT (ic))))
         {
           loadRegFromAop (hc08_reg_hx, AOP (IC_LEFT (ic)), 0);
           pushReg (hc08_reg_hx, TRUE);
@@ -2621,6 +3309,13 @@
         }
     }
 
+  if (AOP_TYPE (IC_LEFT (ic)) == AOP_REG)
+    {
+      while (size--)
+        pushReg (AOP (IC_LEFT (ic))->aopu.aop_reg[offset++], TRUE);
+      goto release;
+    }
+
   while (size--)
     {
 //      printf("loading %d\n", offset);
@@ -2641,7 +3336,7 @@
 {
   int size, offset;
 
-  D(emitcode (";     genIpop",""));
+  D (emitcode (";", "genIpop"));
 
   /* if the temp was not pushed then */
   if (OP_SYMBOL (IC_LEFT (ic))->isspilt)
@@ -2655,32 +3350,87 @@
       pullReg (hc08_reg_a);
       storeRegToAop (hc08_reg_a, AOP (IC_LEFT (ic)), offset--);
     }
+
   freeAsmop (IC_LEFT (ic), NULL, ic, TRUE);
 }
 
-
 /*-----------------------------------------------------------------*/
 /* genSend - gen code for SEND                                     */
 /*-----------------------------------------------------------------*/
-static void genSend(set *sendSet)
+static void
+genSend (set *sendSet)
 {
-    iCode *sic;
+  iCode *send1;
+  iCode *send2;
 
-    for (sic = setFirstItem (sendSet); sic;
-         sic = setNextItem (sendSet)) {
-          int size, offset = 0;
-          aopOp (IC_LEFT (sic), sic, FALSE);
-          size = AOP_SIZE (IC_LEFT (sic));
-
-          if (sic->argreg) {
-              offset = size-1;
-              while (size--) {
-                  transferAopAop( AOP (IC_LEFT (sic)), offset,
-                                  hc08_aop_pass[offset+(sic->argreg-1)], 0);
-                  offset--;
-              }
-          }
-          freeAsmop (IC_LEFT (sic), NULL, sic, TRUE);
+  D (emitcode (";", "genSend"));
+
+  /* case 1: single parameter in A
+   * case 2: single parameter in XA
+   * case 3: first parameter in A, second parameter in X
+   */
+  send1 = setFirstItem (sendSet);
+  send2 = setNextItem (sendSet);
+
+  if (!send2)
+    {
+      int size;
+      /* case 1 or 2, this is fairly easy */
+      aopOp (IC_LEFT (send1), send1, FALSE);
+      size = AOP_SIZE (IC_LEFT (send1));
+      wassert (size <= 2);
+      if (size == 1)
+        {
+          loadRegFromAop (send1->argreg == 2 ? hc08_reg_x : hc08_reg_a, AOP (IC_LEFT (send1)), 0);
+        }
+      else if (AOP (IC_LEFT (send1))->type == AOP_REG)
+        loadRegFromAop (hc08_reg_xa, AOP (IC_LEFT (send1)), 0);
+      else if (isOperandVolatile (IC_LEFT (send1), FALSE))
+        {
+          /* use msb to lsb order for volatile operands */
+          loadRegFromAop (hc08_reg_x, AOP (IC_LEFT (send1)), 1);
+          loadRegFromAop (hc08_reg_a, AOP (IC_LEFT (send1)), 0);
+        }
+      else
+        {
+          /* otherwise perfer to load x last (lsb to msb order) */
+          loadRegFromAop (hc08_reg_a, AOP (IC_LEFT (send1)), 0);
+          loadRegFromAop (hc08_reg_x, AOP (IC_LEFT (send1)), 1);
+        }
+      freeAsmop (IC_LEFT (send1), NULL, send1, TRUE);
+    }
+  else
+    {
+      /* case 3 */
+      /* make sure send1 is the first argument and swap with send2 if not */
+      if (send1->argreg > send2->argreg)
+        {
+          iCode * sic = send1;
+          send1 = send2;
+          send2 = sic;
+        }
+      aopOp (IC_LEFT (send1), send1, FALSE);
+      aopOp (IC_LEFT (send2), send2, FALSE);
+      if (IS_AOP_X (AOP (IC_LEFT (send1))) && IS_AOP_A (AOP (IC_LEFT (send2))))
+        {
+          /* If the parameters' register assignment is eactly backwards */
+          /* from what is needed, then swap the registers. */
+          pushReg (hc08_reg_a, FALSE);
+          transferRegReg (hc08_reg_x, hc08_reg_a, FALSE);
+          pullReg (hc08_reg_x);
+        }
+      else if (IS_AOP_A (AOP (IC_LEFT (send2))))
+        {
+          loadRegFromAop (hc08_reg_x, AOP (IC_LEFT (send2)), 0);
+          loadRegFromAop (hc08_reg_a, AOP (IC_LEFT (send1)), 0);
+        }
+      else
+        {
+          loadRegFromAop (hc08_reg_a, AOP (IC_LEFT (send1)), 0);
+          loadRegFromAop (hc08_reg_x, AOP (IC_LEFT (send2)), 0);
+        }
+      freeAsmop (IC_LEFT (send2), NULL, send2, TRUE);
+      freeAsmop (IC_LEFT (send1), NULL, send1, TRUE);
     }
 }
 
@@ -2697,42 +3447,49 @@
 
   D (emitcode (";", "genCall"));
 
+  /* if caller saves & we have not saved then */
+  if (!ic->regsSaved)
+    saveRegisters (ic);
+
   dtype = operandType (IC_LEFT (ic));
-  etype = getSpec(dtype);
+  etype = getSpec (dtype);
   /* if send set is not empty then assign */
-  if (_G.sendSet)
+  if (_G.sendSet && !regalloc_dry_run)
     {
-        if (IFFUNC_ISREENT(dtype)) { /* need to reverse the send set */
-            genSend(reverseSet(_G.sendSet));
-        } else {
-            genSend(_G.sendSet);
+      if (IFFUNC_ISREENT (dtype))       /* need to reverse the send set */
+        {
+          genSend (reverseSet (_G.sendSet));
+        }
+      else
+        {
+          genSend (_G.sendSet);
         }
       _G.sendSet = NULL;
     }
 
-  /* if caller saves & we have not saved then */
-  if (!ic->regsSaved)
-      saveRegisters (ic);
-
   /* make the call */
   if (IS_LITERAL (etype))
     {
       emitcode ("jsr", "0x%04X", ulFromVal (OP_VALUE (IC_LEFT (ic))));
+      regalloc_dry_run_cost += 3;
     }
   else
     {
       emitcode ("jsr", "%s", (OP_SYMBOL (IC_LEFT (ic))->rname[0] ?
-                              OP_SYMBOL (IC_LEFT (ic))->rname :
-                              OP_SYMBOL (IC_LEFT (ic))->name));
+                              OP_SYMBOL (IC_LEFT (ic))->rname : OP_SYMBOL (IC_LEFT (ic))->name));
+      regalloc_dry_run_cost += 3;
     }
 
+  hc08_dirtyReg (hc08_reg_a, FALSE);
+  hc08_dirtyReg (hc08_reg_hx, FALSE);
+
   /* if we need assign a result value */
   if ((IS_ITEMP (IC_RESULT (ic)) &&
-       (OP_SYMBOL (IC_RESULT (ic))->nRegs ||
-        OP_SYMBOL (IC_RESULT (ic))->accuse ||
-        OP_SYMBOL (IC_RESULT (ic))->spildir)) ||
-      IS_TRUE_SYMOP (IC_RESULT (ic)))
+       (OP_SYMBOL (IC_RESULT (ic))->nRegs || OP_SYMBOL (IC_RESULT (ic))->spildir)) || IS_TRUE_SYMOP (IC_RESULT (ic)))
     {
+      hc08_useReg (hc08_reg_a);
+      if (operandSize (IC_RESULT (ic)) > 1)
+        hc08_useReg (hc08_reg_x);
       _G.accInUse++;
       aopOp (IC_RESULT (ic), ic, FALSE);
       _G.accInUse--;
@@ -2749,7 +3506,7 @@
     }
 
   /* if we had saved some registers then unsave them */
-  if (ic->regsSaved && !IFFUNC_CALLEESAVES(dtype))
+  if (ic->regsSaved && !IFFUNC_CALLEESAVES (dtype))
     unsaveRegisters (ic);
 }
 
@@ -2760,8 +3517,8 @@
 genPcall (iCode * ic)
 {
   sym_link *dtype;
-  symbol *rlbl = newiTempLabel (NULL);
-  symbol *tlbl = newiTempLabel (NULL);
+  symbol *rlbl = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
+  symbol *tlbl = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
 //  bool restoreBank=FALSE;
 //  bool swapBanks = FALSE;
 
@@ -2779,34 +3536,40 @@
   /* push the return address on to the stack */
   emitBranch ("bsr", tlbl);
   emitBranch ("bra", rlbl);
-  emitLabel (tlbl);
-  _G.stackPushes += 2; /* account for the bsr return address now on stack */
-  updateCFA();
+  if (!regalloc_dry_run)
+    emitLabel (tlbl);
+  _G.stackPushes += 2;          /* account for the bsr return address now on stack */
+  updateCFA ();
 
   /* now push the function address */
   pushSide (IC_LEFT (ic), FPTRSIZE, ic);
 
   /* if send set is not empty then assign */
-  if (_G.sendSet)
+  if (_G.sendSet && !regalloc_dry_run)
     {
-        genSend(reverseSet(_G.sendSet));
-        _G.sendSet = NULL;
+      genSend (reverseSet (_G.sendSet));
+      _G.sendSet = NULL;
     }
 
   /* make the call */
   emitcode ("rts", "");
+  regalloc_dry_run_cost++;
 
-  emitLabel (rlbl);
-  _G.stackPushes -= 4; /* account for rts here & in called function */
-  updateCFA();
+  if (!regalloc_dry_run)
+    emitLabel (rlbl);
+  _G.stackPushes -= 4;          /* account for rts here & in called function */
+  updateCFA ();
+
+  hc08_dirtyReg (hc08_reg_a, FALSE);
+  hc08_dirtyReg (hc08_reg_hx, FALSE);
 
   /* if we need assign a result value */
   if ((IS_ITEMP (IC_RESULT (ic)) &&
-       (OP_SYMBOL (IC_RESULT (ic))->nRegs ||
-        OP_SYMBOL (IC_RESULT (ic))->spildir)) ||
-      IS_TRUE_SYMOP (IC_RESULT (ic)))
+       (OP_SYMBOL (IC_RESULT (ic))->nRegs || OP_SYMBOL (IC_RESULT (ic))->spildir)) || IS_TRUE_SYMOP (IC_RESULT (ic)))
     {
-
+      hc08_useReg (hc08_reg_a);
+      if (operandSize (IC_RESULT (ic)) > 1)
+        hc08_useReg (hc08_reg_x);
       _G.accInUse++;
       aopOp (IC_RESULT (ic), ic, FALSE);
       _G.accInUse--;
@@ -2850,21 +3613,21 @@
 /* inExcludeList - return 1 if the string is in exclude Reg list   */
 /*-----------------------------------------------------------------*/
 static int
-regsCmp(void *p1, void *p2)
+regsCmp (void *p1, void *p2)
 {
-  return (STRCASECMP((char *)p1, (char *)(p2)) == 0);
+  return (STRCASECMP ((char *) p1, (char *) (p2)) == 0);
 }
 
 static bool
 inExcludeList (char *s)
 {
-  const char *p = setFirstItem(options.excludeRegsSet);
+  const char *p = setFirstItem (options.excludeRegsSet);
 
-  if (p == NULL || STRCASECMP(p, "none") == 0)
+  if (p == NULL || STRCASECMP (p, "none") == 0)
     return FALSE;
 
 
-  return isinSetWith(options.excludeRegsSet, s, regsCmp);
+  return isinSetWith (options.excludeRegsSet, s, regsCmp);
 }
 
 /*-----------------------------------------------------------------*/
@@ -2885,20 +3648,22 @@
   emitcode (";", "-----------------------------------------");
   emitcode (";", " function %s", sym->name);
   emitcode (";", "-----------------------------------------");
+  emitcode (";", hc08_assignment_optimal ? "Register assignment is optimal." : "Register assignment might be sub-optimal.");
+  emitcode (";", "Stack space usage: %d bytes.", sym->stack);
 
   emitcode ("", "%s:", sym->rname);
-  lineCurr->isLabel = 1;
+  genLine.lineCurr->isLabel = 1;
   ftype = operandType (IC_LEFT (ic));
 
   _G.stackOfs = 0;
   _G.stackPushes = 0;
   debugFile->writeFrameAddress (NULL, hc08_reg_sp, 0);
 
-  if (IFFUNC_ISNAKED(ftype))
-  {
-      emitcode(";", "naked function: no prologue.");
+  if (IFFUNC_ISNAKED (ftype))
+    {
+      emitcode (";", "naked function: no prologue.");
       return;
-  }
+    }
 
   /* if this is an interrupt service routine then
      save h  */
@@ -2915,14 +3680,14 @@
     ric = ric->next;
   while (ric && IC_RESULT (ric))
     {
-      symbol * rsym = OP_SYMBOL (IC_RESULT (ric));
-      int rsymSize = rsym ? getSize(rsym->type) : 0;
+      symbol *rsym = OP_SYMBOL (IC_RESULT (ric));
+      int rsymSize = rsym ? getSize (rsym->type) : 0;
 
       if (rsym->isitmp)
         {
           if (rsym && rsym->regType == REG_CND)
             rsym = NULL;
-          if (rsym && (rsym->accuse || rsym->ruonly))
+          if (rsym && (/*rsym->accuse ||*/ rsym->ruonly))
             rsym = NULL;
           if (rsym && (rsym->isspilt || rsym->nRegs == 0) && rsym->usl.spillLoc)
             rsym = rsym->usl.spillLoc;
@@ -2930,21 +3695,21 @@
 
       /* If the RECEIVE operand immediately spills to the first entry on the  */
       /* stack, we can push it directly rather than use an sp relative store. */
-      if (rsym && rsym->onStack && rsym->stack == -_G.stackPushes-rsymSize)
+      if (rsym && rsym->onStack && rsym->stack == -_G.stackPushes - rsymSize)
         {
           int ofs;
 
-          _G.current_iCode = ric;
-          D(emitcode (";     genReceive",""));
-          for (ofs=0; ofs < rsymSize; ofs++)
+          genLine.lineElement.ic = ric;
+          D (emitcode (";     genReceive", ""));
+          for (ofs = 0; ofs < rsymSize; ofs++)
             {
-              reg_info *reg = hc08_aop_pass[ofs+(ric->argreg-1)]->aopu.aop_reg[0];
+              reg_info *reg = hc08_aop_pass[ofs + (ric->argreg - 1)]->aopu.aop_reg[0];
               pushReg (reg, TRUE);
               if (reg->rIdx == A_IDX)
                 accIsFree = 1;
               stackAdjust--;
             }
-          _G.current_iCode = ic;
+          genLine.lineElement.ic = ic;
           ric->generated = 1;
         }
       ric = (ric->prev && ric->prev->op == RECEIVE) ? ric->prev : NULL;
@@ -2969,17 +3734,19 @@
           emitcode ("tpa", "");
           emitcode ("sta", "2,s");
           emitcode ("sei", "");
+          regalloc_dry_run_cost += 5;
           pullReg (hc08_reg_a);
         }
       else
         {
           /* No passed parameters, so A can be freely modified */
           emitcode ("tpa", "");
+          regalloc_dry_run_cost++;
           pushReg (hc08_reg_a, TRUE);
           emitcode ("sei", "");
+          regalloc_dry_run_cost++;
         }
     }
-
 }
 
 /*-----------------------------------------------------------------*/
@@ -2990,22 +3757,23 @@
 {
   symbol *sym = OP_SYMBOL (IC_LEFT (ic));
 
-  if (IFFUNC_ISNAKED(sym->type))
-  {
-      emitcode(";", "naked function: no epilogue.");
+  if (IFFUNC_ISNAKED (sym->type))
+    {
+      emitcode (";", "naked function: no epilogue.");
       if (options.debug && currFunc)
         debugFile->writeEndFunction (currFunc, ic, 0);
       return;
-  }
+    }
 
   if (IFFUNC_ISCRITICAL (sym->type))
     {
-      if (!IS_VOID(sym->type->next))
+      if (!IS_VOID (sym->type->next))
         {
           /* Function has return value, so make sure A is preserved */
           pushReg (hc08_reg_a, FALSE);
           emitcode ("lda", "2,s");
           emitcode ("tap", "");
+          regalloc_dry_run_cost += 4;
           pullReg (hc08_reg_a);
           pullNull (1);
         }
@@ -3014,6 +3782,7 @@
           /* Function returns void, so A can be freely modified */
           pullReg (hc08_reg_a);
           emitcode ("tap", "");
+          regalloc_dry_run_cost++;
         }
     }
 
@@ -3046,10 +3815,11 @@
         }
 
       emitcode ("rti", "");
+      regalloc_dry_run_cost++;
     }
   else
     {
-      if (IFFUNC_CALLEESAVES(sym->type))
+      if (IFFUNC_CALLEESAVES (sym->type))
         {
           int i;
 
@@ -3059,12 +3829,10 @@
               /* save the registers used */
               for (i = sym->regsUsed->size; i >= 0; i--)
                 {
-                  if (bitVectBitValue (sym->regsUsed, i) ||
-                      (hc08_ptrRegReq && (i == HX_IDX || i == HX_IDX)))
-                    emitcode ("pop", "%s", hc08_regWithIdx (i)->name);
+                  if (bitVectBitValue (sym->regsUsed, i) || (hc08_ptrRegReq && (i == HX_IDX || i == HX_IDX)))
+                    emitcode ("pop", "%s", hc08_regWithIdx (i)->name); /* Todo: Cost. Can't find this instruction in manual! */
                 }
             }
-
         }
 
       /* if debug then send end of function */
@@ -3074,8 +3842,8 @@
         }
 
       emitcode ("rts", "");
+      regalloc_dry_run_cost++;
     }
-
 }
 
 /*-----------------------------------------------------------------*/
@@ -3086,8 +3854,9 @@
 {
   int size, offset = 0;
 //  int pushed = 0;
+  bool delayed_x = FALSE;
 
-  D(emitcode (";     genRet",""));
+  D (emitcode (";     genRet", ""));
 
   /* if we have no return value then
      just generate the "ret" */
@@ -3099,49 +3868,34 @@
   aopOp (IC_LEFT (ic), ic, FALSE);
   size = AOP_SIZE (IC_LEFT (ic));
 
-#if 1
-   offset = size - 1;
-   while (size--)
-     {
-       transferAopAop (AOP (IC_LEFT (ic)), offset, hc08_aop_pass[offset], 0);
-       offset--;
-     }
-#else
-  switch (size)
-    {
-      case 4:
-        /* 4 byte return: store value in the global return variable */
-        offset = size-1;
-        while (size--)
-          {
-            loadRegFromAop (hc08_reg_a, AOP (IC_LEFT (ic)), offset);
-            STA (fReturn2[offset--], FALSE);
-            hc08_freeReg (hc08_reg_a);
-          }
-        break;
-      case 2:
-        /* 2 byte return: store value in x:a */
-        loadRegFromAop (hc08_reg_xa, AOP (IC_LEFT (ic)), 0);
-        hc08_freeReg (hc08_reg_xa);
-        break;
-      case 1:
-        /* 1 byte return: store value in a */
-        loadRegFromAop (hc08_reg_a, AOP (IC_LEFT (ic)), 0);
-        hc08_freeReg (hc08_reg_a);
-        break;
+  /* Take care when swapping a and x */
+  if (AOP_TYPE (IC_LEFT (ic)) == AOP_REG && size > 1 && AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == X_IDX)
+    {
+      delayed_x = TRUE;
+      pushReg (hc08_reg_x, TRUE);
     }
-#endif
+
+  offset = size - 1;
+  while (size--)
+    {
+      if (!(delayed_x && !offset))
+      transferAopAop (AOP (IC_LEFT (ic)), offset, hc08_aop_pass[offset], 0);
+      offset--;
+    }
+
+  if (delayed_x)
+    pullReg (hc08_reg_a);
 
   freeAsmop (IC_LEFT (ic), NULL, ic, TRUE);
 
 jumpret:
   /* generate a jump to the return label
      if the next is not the return statement */
-  if (!(ic->next && ic->next->op == LABEL &&
-        IC_LABEL (ic->next) == returnLabel))
-
-    emitcode ("jmp", "%05d$", (returnLabel->key + 100));
-
+  if (!(ic->next && ic->next->op == LABEL && IC_LABEL (ic->next) == returnLabel))
+    {
+      emitcode ("jmp", "%05d$", labelKey2num (returnLabel->key));
+      regalloc_dry_run_cost += 3;
+    }
 }
 
 /*-----------------------------------------------------------------*/
@@ -3155,9 +3909,9 @@
 
   /* For the high level labels we cannot depend on any */
   /* register's contents. Amnesia time.                */
-  for (i=A_IDX;i<=XA_IDX;i++)
+  for (i = A_IDX; i <= XA_IDX; i++)
     {
-      reg = hc08_regWithIdx(i);
+      reg = hc08_regWithIdx (i);
       if (reg)
         reg->aop = NULL;
     }
@@ -3166,7 +3920,7 @@
   if (IC_LABEL (ic) == entryLabel)
     return;
 
-  debugFile->writeLabel(IC_LABEL (ic), ic);
+  debugFile->writeLabel (IC_LABEL (ic), ic);
 
   emitLabel (IC_LABEL (ic));
 
@@ -3178,42 +3932,10 @@
 static void
 genGoto (iCode * ic)
 {
-  emitcode ("jmp", "%05d$", (IC_LABEL (ic)->key + 100));
+  emitcode ("jmp", "%05d$", labelKey2num (IC_LABEL (ic)->key));
+  regalloc_dry_run_cost += 3;
 }
 
-#if 0
-/*-----------------------------------------------------------------*/
-/* findLabelBackwards: walks back through the iCode chain looking  */
-/* for the given label. Returns number of iCode instructions     */
-/* between that label and given ic.          */
-/* Returns zero if label not found.          */
-/*-----------------------------------------------------------------*/
-static int
-findLabelBackwards (iCode * ic, int key)
-{
-  int count = 0;
-
-  while (ic->prev)
-    {
-      ic = ic->prev;
-      count++;
-
-      /* If we have any pushes or pops, we cannot predict the distance.
-         I don't like this at all, this should be dealt with in the
-         back-end */
-      if (ic->op == IPUSH || ic->op == IPOP) {
-        return 0;
-      }
-
-      if (ic->op == LABEL && IC_LABEL (ic)->key == key)
-        {
-          return count;
-        }
-    }
-
-  return 0;
-}
-#endif
 
 /*-----------------------------------------------------------------*/
 /* genPlusIncr :- does addition with increment if possible         */
@@ -3242,51 +3964,56 @@
 
   icount = (unsigned int) ulFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit);
 
-  DD(emitcode ("", "; IS_AOP_HX = %d", IS_AOP_HX (AOP (left))));
+  DD (emitcode ("", "; IS_AOP_HX = %d", IS_AOP_HX (AOP (left))));
 
-  if ((IS_AOP_HX (AOP (left)) ||
-       ( (AOP_TYPE (left) == AOP_DIR) && (AOP_TYPE (result) == AOP_DIR) )
-      )
-      && (icount>=-128) && (icount<=127) && (size==2))
+  if ((IS_AOP_HX (AOP (left)) || IS_AOP_HX (AOP (result)) ||
+    ((AOP_TYPE (left) == AOP_DIR || IS_S08 && AOP_TYPE (left) == AOP_EXT) && (AOP_TYPE (result) == AOP_DIR || IS_S08 && AOP_TYPE (result) == AOP_EXT))) &&
+    (icount >= -128) && (icount <= 127) && (size == 2))
     {
-      if (!IS_AOP_HX (AOP (left)))
-        {
-          needpulx = pushRegIfUsed (hc08_reg_x);
-          needpulh = pushRegIfUsed (hc08_reg_h);
-        }
-      else
-        {
-          needpulx = FALSE;
-          needpulh = FALSE;
-        }
-      loadRegFromAop (hc08_reg_hx, AOP(left), 0);
-      emitcode ("aix","#%d", icount);
+      needpulx = pushRegIfSurv (hc08_reg_x);
+      needpulh = pushRegIfSurv (hc08_reg_h);
+      loadRegFromAop (hc08_reg_hx, AOP (left), 0);
+      emitcode ("aix", "#%d", icount);
+      regalloc_dry_run_cost += 2;
       hc08_dirtyReg (hc08_reg_hx, FALSE);
-      storeRegToAop (hc08_reg_hx, AOP(result), 0);
+      storeRegToAop (hc08_reg_hx, AOP (result), 0);
       pullOrFreeReg (hc08_reg_h, needpulh);
       pullOrFreeReg (hc08_reg_x, needpulx);
       return TRUE;
     }
+  if (size == 1 && (IS_AOP_X (AOP (result)) && (!IS_AOP_A (AOP (left)) || hc08_reg_h->isDead) || IS_AOP_X (AOP (left)) && !IS_AOP_A (AOP (result)) && hc08_reg_x->isDead && hc08_reg_h->isDead))
+    {
+      while (icount < -128)
+        icount += 256;
+      while (icount > 127)
+        icount -= 256;
+      needpulh = pushRegIfSurv (hc08_reg_h);
+      loadRegFromAop (hc08_reg_x, AOP (left), 0);
+      emitcode ("aix", "#%d", icount);
+      regalloc_dry_run_cost += 2;
+      storeRegToAop (hc08_reg_x, AOP (result), 0);
+      pullOrFreeReg (hc08_reg_h, needpulh);
+      return TRUE;
+    }
 
-  DD(emitcode ("", "; icount = %d, sameRegs=%d", icount,
-            sameRegs (AOP (left), AOP (result))));
+  DD (emitcode ("", "; icount = %d, sameRegs=%d", icount, sameRegs (AOP (left), AOP (result))));
 
-  if ((icount > 255) || (icount<0))
+  if ((icount > 255) || (icount < 0))
     return FALSE;
 
   if (!sameRegs (AOP (left), AOP (result)))
     return FALSE;
 
-  D(emitcode (";     genPlusIncr",""));
+  D (emitcode (";     genPlusIncr", ""));
 
-  if (size>1)
-    tlbl = newiTempLabel (NULL);
+  if (size > 1)
+    tlbl = regalloc_dry_run ? 0 : newiTempLabel (NULL);
 
-  if (icount==1)
+  if (icount == 1)
     {
       needpula = FALSE;
       rmwWithAop ("inc", AOP (result), 0);
-      if (1<size)
+      if (1 < size)
         emitBranch ("bne", tlbl);
     }
   else
@@ -3300,17 +4027,17 @@
       hc08_useReg (hc08_reg_a);
       storeRegToAop (hc08_reg_a, AOP (result), 0);
       hc08_freeReg (hc08_reg_a);
-      if (1<size)
+      if (1 < size)
         emitBranch ("bcc", tlbl);
     }
-  for (offset=1; offset<size; offset++)
+  for (offset = 1; offset < size; offset++)
     {
       rmwWithAop ("inc", AOP (result), offset);
-      if ((offset+1)<size)
+      if ((offset + 1) < size)
         emitBranch ("bne", tlbl);
     }
 
-  if (size>1)
+  if (size > 1 && !regalloc_dry_run)
     emitLabel (tlbl);
 
   pullOrFreeReg (hc08_reg_a, needpula);
@@ -3329,18 +4056,22 @@
   int size, offset = 0;
   char *add;
   asmop *leftOp, *rightOp;
+  bool needpulla;
+  bool earlystore = FALSE;
+  bool delayedstore = FALSE;
+  bool mayskip = TRUE;
+  bool skip = FALSE;
 
   /* special cases :- */
 
-  D(emitcode (";     genPlus",""));
+  D (emitcode (";     genPlus", ""));
 
   aopOp (IC_LEFT (ic), ic, FALSE);
   aopOp (IC_RIGHT (ic), ic, FALSE);
   aopOp (IC_RESULT (ic), ic, TRUE);
 
   /* we want registers on the left and literals on the right */
-  if ((AOP_TYPE (IC_LEFT (ic)) == AOP_LIT) ||
-      (AOP_TYPE (IC_RIGHT (ic)) == AOP_REG))
+  if ((AOP_TYPE (IC_LEFT (ic)) == AOP_LIT) || (AOP_TYPE (IC_RIGHT (ic)) == AOP_REG && !IS_AOP_WITH_A (AOP (IC_LEFT (ic)))))
     {
       operand *t = IC_RIGHT (ic);
       IC_RIGHT (ic) = IC_LEFT (ic);
@@ -3348,32 +4079,62 @@
     }
 
 
+
   /* if I can do an increment instead
      of add then GOOD for ME */
   if (genPlusIncr (ic) == TRUE)
     goto release;
 
-  DD(emitcode("",";  left size = %d", getDataSize (IC_LEFT(ic))));
-  DD(emitcode("",";  right size = %d", getDataSize (IC_RIGHT(ic))));
-  DD(emitcode("",";  result size = %d", getDataSize (IC_RESULT(ic))));
+  DD (emitcode ("", ";  left size = %d", getDataSize (IC_LEFT (ic))));
+  DD (emitcode ("", ";  right size = %d", getDataSize (IC_RIGHT (ic))));
+  DD (emitcode ("", ";  result size = %d", getDataSize (IC_RESULT (ic))));
 
   size = getDataSize (IC_RESULT (ic));
 
-  leftOp = AOP(IC_LEFT(ic));
-  rightOp = AOP(IC_RIGHT(ic));
+  leftOp = AOP (IC_LEFT (ic));
+  rightOp = AOP (IC_RIGHT (ic));
   add = "add";
 
   offset = 0;
+  needpulla = pushRegIfSurv (hc08_reg_a);
+
+  if(size > 1 && IS_AOP_AX (AOP (IC_LEFT (ic))))
+    {
+      earlystore = TRUE;
+      pushReg (hc08_reg_a, TRUE);
+    }
+
   while (size--)
     {
-      loadRegFromAop (hc08_reg_a, leftOp, offset);
-      accopWithAop(add, rightOp, offset);
-      storeRegToAop (hc08_reg_a, AOP (IC_RESULT (ic)), offset++);
+      if (earlystore && offset == 1)
+        pullReg (hc08_reg_a);
+      else
+        loadRegFromAop (hc08_reg_a, leftOp, offset);
+      if (!mayskip || AOP_TYPE (IC_RIGHT (ic)) != AOP_LIT || (((ulFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit) >> (offset * 8)) & 0xff) != 0x00))
+        {
+          accopWithAop (add, rightOp, offset);
+          mayskip = FALSE;
+          skip = FALSE;
+        }
+      else
+        skip = TRUE;
+      if (size && AOP_TYPE (IC_RESULT (ic)) == AOP_REG && AOP (IC_RESULT (ic))->aopu.aop_reg[offset]->rIdx == A_IDX)
+        {
+          pushReg (hc08_reg_a, TRUE);
+          delayedstore = TRUE;
+        }
+      else
+        storeRegToAop (hc08_reg_a, AOP (IC_RESULT (ic)), offset);
+      offset++;
       hc08_freeReg (hc08_reg_a);
-      add = "adc";  /* further adds must propagate carry */
+      if (!skip)
+        add = "adc";              /* further adds must propagate carry */
     }
+ if (delayedstore)
+   pullReg (hc08_reg_a);
+ pullOrFreeReg (hc08_reg_a, needpulla);
 
-
+ wassert (!earlystore || !delayedstore);
 //  adjustArithmeticResult (ic);
 
 release:
@@ -3408,38 +4169,33 @@
 
   icount = (unsigned int) ulFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit);
 
-  if ((AOP_TYPE (left) == AOP_DIR) && (AOP_TYPE (result) == AOP_DIR)
-      && (icount>=-127) && (icount<=128) && (size==2))
+  if (((AOP_TYPE (left) == AOP_DIR) && (AOP_TYPE (result) == AOP_DIR) && (size == 2) ||
+    (IS_AOP_HX (AOP (left)) || IS_AOP_X (AOP (left))) && (IS_AOP_HX (AOP (result)) || IS_AOP_X (AOP (result)))) &&
+    (icount >= -127) && (icount <= 128))
     {
-      if (!IS_AOP_HX (AOP (left)))
-        {
-          needpulx = pushRegIfUsed (hc08_reg_x);
-          needpulh = pushRegIfUsed (hc08_reg_h);
-        }
-      else
-        {
-          needpulx = FALSE;
-          needpulh = FALSE;
-        }
-      loadRegFromAop (hc08_reg_hx, AOP(left), 0);
-      emitcode ("aix","#%d", -(int) icount);
+      needpulx = pushRegIfSurv (hc08_reg_x);
+      needpulh = pushRegIfSurv (hc08_reg_h);
+
+      loadRegFromAop (hc08_reg_hx, AOP (left), 0);
+      emitcode ("aix", "#%d", -(int) icount);
+      regalloc_dry_run_cost += 2;
       hc08_dirtyReg (hc08_reg_hx, FALSE);
-      storeRegToAop (hc08_reg_hx, AOP(result), 0);
+      storeRegToAop (hc08_reg_hx, AOP (result), 0);
       pullOrFreeReg (hc08_reg_h, needpulh);
       pullOrFreeReg (hc08_reg_x, needpulx);
       return TRUE;
     }
 
-  if ((icount > 1) || (icount<0))
+  if ((icount > 1) || (icount < 0))
     return FALSE;
 
   if (!sameRegs (AOP (left), AOP (result)))
     return FALSE;
 
-  if (size!=1)
+  if (size != 1)
     return FALSE;
 
-  D(emitcode (";     genMinusDec",""));
+  D (emitcode (";     genMinusDec", ""));
 
   rmwWithAop ("dec", AOP (result), 0);
 
@@ -3460,6 +4216,8 @@
           emitcode ("rola", "");
           emitcode ("clra", "");
           emitcode ("sbc", zero);
+          hc08_dirtyReg (hc08_reg_a, FALSE);
+          regalloc_dry_run_cost += 4;
           while (size--)
             storeRegToAop (hc08_reg_a, AOP (result), offset++);
         }
@@ -3478,10 +4236,13 @@
 {
   char *sub;
   int size, offset = 0;
+  bool needpulla;
+  bool earlystore = FALSE;
+  bool delayedstore = FALSE;
 
   asmop *leftOp, *rightOp;
 
-  D(emitcode (";     genMinus",""));
+  D (emitcode (";     genMinus", ""));
 
   aopOp (IC_LEFT (ic), ic, FALSE);
   aopOp (IC_RIGHT (ic), ic, FALSE);
@@ -3496,28 +4257,63 @@
   size = getDataSize (IC_RESULT (ic));
 
 
-  leftOp = AOP(IC_LEFT(ic));
-  rightOp = AOP(IC_RIGHT(ic));
+  leftOp = AOP (IC_LEFT (ic));
+  rightOp = AOP (IC_RIGHT (ic));
   sub = "sub";
   offset = 0;
 
+  needpulla = pushRegIfSurv (hc08_reg_a);
+
   if (IS_AOP_A (rightOp))
     {
-      loadRegFromAop ( hc08_reg_a, rightOp, offset);
+      loadRegFromAop (hc08_reg_a, rightOp, offset);
       accopWithAop (sub, leftOp, offset);
       accopWithMisc ("nega", "");
       storeRegToAop (hc08_reg_a, AOP (IC_RESULT (ic)), offset++);
+      pullOrFreeReg (hc08_reg_a, needpulla);
       goto release;
     }
 
-  while (size--)
+  if (size > 1 && (IS_AOP_AX (AOP (IC_LEFT (ic))) || IS_AOP_AX (AOP (IC_RIGHT (ic)))))
     {
-      loadRegFromAop ( hc08_reg_a, leftOp, offset);
-      accopWithAop (sub, rightOp, offset);
-      storeRegToAop (hc08_reg_a, AOP (IC_RESULT (ic)), offset++);
-      sub = "sbc";
+      earlystore = TRUE;
+      pushReg (hc08_reg_a, TRUE);
     }
 
+  while (size--)
+    {
+      if (earlystore &&
+        (AOP_TYPE (IC_LEFT (ic)) == AOP_REG && AOP (IC_LEFT (ic))->aopu.aop_reg[offset]->rIdx == A_IDX ||
+        AOP_TYPE (IC_RIGHT (ic)) == AOP_REG && AOP (IC_RIGHT (ic))->aopu.aop_reg[offset]->rIdx == A_IDX))
+        pullReg (hc08_reg_a);
+      if (AOP_TYPE (IC_RIGHT (ic)) == AOP_REG && AOP (IC_RIGHT (ic))->aopu.aop_reg[offset]->rIdx == A_IDX)
+        {
+          pushReg (hc08_reg_a, TRUE);
+          loadRegFromAop (hc08_reg_a, leftOp, offset);
+          emitcode (sub, "1, s");
+          regalloc_dry_run_cost += 3;
+          pullNull (1);
+        }
+      else
+        {
+          loadRegFromAop (hc08_reg_a, leftOp, offset);
+          accopWithAop (sub, rightOp, offset);
+        }
+      if (size && AOP_TYPE (IC_RESULT (ic)) == AOP_REG && AOP (IC_RESULT (ic))->aopu.aop_reg[offset]->rIdx == A_IDX)
+        {
+          pushReg (hc08_reg_a, TRUE);
+          delayedstore = TRUE;
+        }
+      else
+        storeRegToAop (hc08_reg_a, AOP (IC_RESULT (ic)), offset);
+      offset++;
+      sub = "sbc";
+    }
+  if(delayedstore)
+    pullReg (hc08_reg_a);
+  pullOrFreeReg (hc08_reg_a, needpulla);
+
+  wassert (!earlystore || !delayedstore);
 
 //  adjustArithmeticResult (ic);
 
@@ -3533,24 +4329,23 @@
 /* genMultOneByte : 8*8=8/16 bit multiplication                    */
 /*-----------------------------------------------------------------*/
 static void
-genMultOneByte (operand * left,
-                operand * right,
-                operand * result)
+genMultOneByte (operand * left, operand * right, operand * result)
 {
   /* sym_link *opetype = operandType (result); */
   symbol *tlbl1, *tlbl2, *tlbl3, *tlbl4;
-  int size=AOP_SIZE(result);
+  int size = AOP_SIZE (result);
   bool negLiteral = FALSE;
   bool lUnsigned, rUnsigned;
+  bool needpulla, needpullx;
 
-  D(emitcode (";     genMultOneByte",""));
+  D (emitcode (";     genMultOneByte", ""));
 
-  if (size<1 || size>2) {
-    // this should never happen
-      fprintf (stderr, "size!=1||2 (%d) in %s at line:%d \n",
-               AOP_SIZE(result), __FILE__, lineno);
+  if (size < 1 || size > 2)
+    {
+      // this should never happen
+      fprintf (stderr, "size!=1||2 (%d) in %s at line:%d \n", AOP_SIZE (result), __FILE__, lineno);
       exit (1);
-  }
+    }
 
   /* (if two literals: the value is computed before) */
   /* if one literal, literal on the right */
@@ -3568,6 +4363,9 @@
       left = t;
     }
 
+  needpulla = pushRegIfSurv (hc08_reg_a);
+  needpullx = pushRegIfSurv (hc08_reg_x);
+
   lUnsigned = SPEC_USIGN (getSpec (operandType (left)));
   rUnsigned = SPEC_USIGN (getSpec (operandType (right)));
 
@@ -3582,8 +4380,7 @@
   /* true       true       true        impossible      */
 
   /* case 1 */
-  if (size == 1
-      || (lUnsigned && rUnsigned))
+  if (size == 1 || (lUnsigned && rUnsigned))
     {
       // just an unsigned 8*8=8/16 multiply
       //DD(emitcode (";","unsigned"));
@@ -3591,9 +4388,12 @@
       loadRegFromAop (hc08_reg_a, AOP (left), 0);
       loadRegFromAop (hc08_reg_x, AOP (right), 0);
       emitcode ("mul", "");
+      regalloc_dry_run_cost++;
       hc08_dirtyReg (hc08_reg_xa, FALSE);
       storeRegToFullAop (hc08_reg_xa, AOP (result), TRUE);
       hc08_freeReg (hc08_reg_xa);
+      pullOrFreeReg (hc08_reg_x, needpullx);
+      pullOrFreeReg (hc08_reg_a, needpulla);
 
       return;
     }
@@ -3602,31 +4402,42 @@
 
   /* case 2 */
   /* left unsigned, right signed literal -- literal determines sign handling */
-  if (AOP_TYPE(right)==AOP_LIT && lUnsigned && !rUnsigned)
+  if (AOP_TYPE (right) == AOP_LIT && lUnsigned && !rUnsigned)
     {
-      signed char val=(signed char) ulFromVal (AOP (right)->aopu.aop_lit);
+      signed char val = (signed char) ulFromVal (AOP (right)->aopu.aop_lit);
 
       loadRegFromAop (hc08_reg_a, AOP (left), 0);
       if (val < 0)
-        emitcode ("ldx", "#0x%02x", -val);
+        {
+          emitcode ("ldx", "#0x%02x", -val);
+          regalloc_dry_run_cost += 2;
+        }
       else
-        emitcode ("ldx", "#0x%02x", val);
+        {
+          emitcode ("ldx", "#0x%02x", val);
+          regalloc_dry_run_cost += 2;
+        }
+      hc08_dirtyReg (hc08_reg_x, FALSE);
 
       emitcode ("mul", "");
+      regalloc_dry_run_cost++;
+      hc08_dirtyReg (hc08_reg_xa, FALSE);
 
       if (val < 0)
         {
           rmwWithReg ("neg", hc08_reg_a);
-          tlbl4 = newiTempLabel (NULL);
+          tlbl4 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
           emitBranch ("bcc", tlbl4);
           rmwWithReg ("inc", hc08_reg_x);
-          emitLabel (tlbl4);
+          if (!regalloc_dry_run)
+            emitLabel (tlbl4);
           rmwWithReg ("neg", hc08_reg_x);
         }
 
-      hc08_dirtyReg (hc08_reg_xa, FALSE);
       storeRegToFullAop (hc08_reg_xa, AOP (result), TRUE);
       hc08_freeReg (hc08_reg_xa);
+      pullOrFreeReg (hc08_reg_x, needpullx);
+      pullOrFreeReg (hc08_reg_a, needpulla);
       return;
     }
 
@@ -3634,28 +4445,39 @@
   /* case 3 */
   adjustStack (-1);
   emitcode ("clr", "1,s");
+  regalloc_dry_run_cost += 3;
 
   loadRegFromAop (hc08_reg_a, AOP (left), 0);
   if (!lUnsigned)
     {
-      tlbl1 = newiTempLabel (NULL);
-      emitcode ("tsta","");
+      tlbl1 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
+      emitcode ("tsta", "");
+      regalloc_dry_run_cost++;
       emitBranch ("bpl", tlbl1);
       emitcode ("inc", "1,s");
+      regalloc_dry_run_cost += 3;
       rmwWithReg ("neg", hc08_reg_a);
-      emitLabel (tlbl1);
+      regalloc_dry_run_cost++;
+      if (!regalloc_dry_run)
+        emitLabel (tlbl1);
     }
 
-  if (AOP_TYPE(right)==AOP_LIT && !rUnsigned)
+  if (AOP_TYPE (right) == AOP_LIT && !rUnsigned)
     {
-      signed char val=(signed char) ulFromVal (AOP (right)->aopu.aop_lit);
+      signed char val = (signed char) ulFromVal (AOP (right)->aopu.aop_lit);
       /* AND literal negative */
-      if (val < 0) {
-        emitcode ("ldx", "#0x%02x", -val);
-        negLiteral = TRUE;
-      } else {
-        emitcode ("ldx", "#0x%02x", val);
-      }
+      if (val < 0)
+        {
+          emitcode ("ldx", "#0x%02x", -val);
+          regalloc_dry_run_cost += 2;
+          negLiteral = TRUE;
+        }
+      else
+        {
+          emitcode ("ldx", "#0x%02x", val);
+          regalloc_dry_run_cost += 2;
+        }
+      hc08_dirtyReg (hc08_reg_x, FALSE);
       hc08_useReg (hc08_reg_x);
     }
   else
@@ -3663,37 +4485,46 @@
       loadRegFromAop (hc08_reg_x, AOP (right), 0);
       if (!rUnsigned)
         {
-          tlbl2 = newiTempLabel (NULL);
+          tlbl2 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
           emitcode ("tstx", "");
+          regalloc_dry_run_cost++;
           emitBranch ("bpl", tlbl2);
           emitcode ("inc", "1,s");
+          regalloc_dry_run_cost += 3;
           rmwWithReg ("neg", hc08_reg_x);
-          emitLabel (tlbl2);
+          regalloc_dry_run_cost++;
+          if (!regalloc_dry_run)
+            emitLabel (tlbl2);
         }
     }
 
   emitcode ("mul", "");
+  regalloc_dry_run_cost++;
   hc08_dirtyReg (hc08_reg_xa, FALSE);
 
-  tlbl3 = newiTempLabel (NULL);
+  tlbl3 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
   emitcode ("dec", "1,s");
+  regalloc_dry_run_cost += 3;
   if (!lUnsigned && !rUnsigned && negLiteral)
     emitBranch ("beq", tlbl3);
   else
     emitBranch ("bne", tlbl3);
 
   rmwWithReg ("neg", hc08_reg_a);
-  tlbl4 = newiTempLabel (NULL);
+  tlbl4 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
   emitBranch ("bcc", tlbl4);
   rmwWithReg ("inc", hc08_reg_x);
-  emitLabel (tlbl4);
+  if (!regalloc_dry_run)
+    emitLabel (tlbl4);
   rmwWithReg ("neg", hc08_reg_x);
 
-  emitLabel (tlbl3);
+  if (!regalloc_dry_run)
+    emitLabel (tlbl3);
   adjustStack (1);
   storeRegToFullAop (hc08_reg_xa, AOP (result), TRUE);
-  hc08_freeReg (hc08_reg_xa);
-
+  
+  pullOrFreeReg (hc08_reg_x, needpullx);
+  pullOrFreeReg (hc08_reg_a, needpulla);
 }
 
 /*-----------------------------------------------------------------*/
@@ -3706,7 +4537,7 @@
   operand *right = IC_RIGHT (ic);
   operand *result = IC_RESULT (ic);
 
-  D(emitcode (";     genMult",""));
+  D (emitcode (";     genMult", ""));
 
   /* assign the amsops */
   aopOp (left, ic, FALSE);
@@ -3717,18 +4548,15 @@
   /* if both are of size == 1 */
 //  if (getSize(operandType(left)) == 1 &&
 //      getSize(operandType(right)) == 1)
-  if (AOP_SIZE (left) == 1 &&
-      AOP_SIZE (right) == 1)
+  if (AOP_SIZE (left) == 1 && AOP_SIZE (right) == 1)
     {
       genMultOneByte (left, right, result);
       goto release;
     }
 
   /* should have been converted to function call */
-    fprintf (stderr, "left: %d right: %d\n", getSize(OP_SYMBOL(left)->type),
-             getSize(OP_SYMBOL(right)->type));
-    fprintf (stderr, "left: %d right: %d\n", AOP_SIZE (left),
-             AOP_SIZE (right));
+  fprintf (stderr, "left: %d right: %d\n", getSize (OP_SYMBOL (left)->type), getSize (OP_SYMBOL (right)->type));
+  fprintf (stderr, "left: %d right: %d\n", AOP_SIZE (left), AOP_SIZE (right));
   assert (0);
 
 release:
@@ -3741,36 +4569,62 @@
 /* genDivOneByte : 8 bit division                                  */
 /*-----------------------------------------------------------------*/
 static void
-genDivOneByte (operand * left,
-               operand * right,
-               operand * result)
+genDivOneByte (operand * left, operand * right, operand * result)
 {
   symbol *tlbl1, *tlbl2, *tlbl3;
   int size;
-  int offset = 0;
   bool lUnsigned, rUnsigned;
   bool runtimeSign, compiletimeSign;
+  bool needpulla, needpullh;
+  bool needpullx = FALSE;
+  bool preload_a = FALSE;
 
   lUnsigned = SPEC_USIGN (getSpec (operandType (left)));
   rUnsigned = SPEC_USIGN (getSpec (operandType (right)));
 
-  D(emitcode (";     genDivOneByte",""));
+  D (emitcode (";     genDivOneByte", ""));
+
+  needpulla = pushRegIfSurv (hc08_reg_a);
+  needpullh = pushRegIfSurv (hc08_reg_h);
+  needpullx = pushRegIfSurv (hc08_reg_x);
+
+  /* If both left and right are in registers and backwards from what we need, */
+  /* the swap the operands and the registers. */
+  if (IS_AOP_A (AOP (right)) && IS_AOP_X (AOP (left)))
+    {
+      operand * t;
+      t = left;
+      left = right;
+      right = t;
+      pushReg (hc08_reg_a, FALSE);
+      transferRegReg (hc08_reg_x, hc08_reg_a, FALSE);
+      pullReg (hc08_reg_x);
+    }
 
   size = AOP_SIZE (result);
   /* signed or unsigned */
   if (lUnsigned && rUnsigned)
     {
       /* unsigned is easy */
-      loadRegFromAop (hc08_reg_h, AOP (left), 1);
-      loadRegFromAop (hc08_reg_x, AOP (right), 0);
-      loadRegFromAop (hc08_reg_a, AOP (left), 0);
+      if (IS_AOP_A (AOP (right)))
+        {
+          loadRegFromAop (hc08_reg_x, AOP (right), 0);
+          loadRegFromAop (hc08_reg_a, AOP (left), 0);
+        }
+      else
+        {
+          loadRegFromAop (hc08_reg_a, AOP (left), 0);
+          loadRegFromAop (hc08_reg_x, AOP (right), 0);
+        }
+      loadRegFromConst (hc08_reg_h, zero);
       emitcode ("div", "");
+      regalloc_dry_run_cost++;
       hc08_dirtyReg (hc08_reg_a, FALSE);
       hc08_dirtyReg (hc08_reg_h, FALSE);
       storeRegToFullAop (hc08_reg_a, AOP (result), FALSE);
-      hc08_freeReg (hc08_reg_a);
-      hc08_freeReg (hc08_reg_x);
-      hc08_freeReg (hc08_reg_h);
+      pullOrFreeReg (hc08_reg_x, needpullx);
+      pullOrFreeReg (hc08_reg_h, needpullh);
+      pullOrFreeReg (hc08_reg_a, needpulla);
       return;
     }
 
@@ -3786,7 +4640,7 @@
 
   if (!lUnsigned)
     {
-      if (AOP_TYPE(left) == AOP_LIT)
+      if (AOP_TYPE (left) == AOP_LIT)
         {
           /* signed literal */
           signed char val = (char) ulFromVal (AOP (left)->aopu.aop_lit);
@@ -3800,7 +4654,7 @@
 
   if (!rUnsigned)
     {
-      if (AOP_TYPE(right) == AOP_LIT)
+      if (AOP_TYPE (right) == AOP_LIT)
         {
           /* signed literal */
           signed char val = (char) ulFromVal (AOP (right)->aopu.aop_lit);
@@ -3816,96 +4670,122 @@
   if (runtimeSign)
     {
       if (compiletimeSign)
-        loadRegFromConst (hc08_reg_x, "#1"); /* set sign flag */
+        pushConst (one);    /* set sign flag */
       else
-        loadRegFromConst (hc08_reg_x, zero); /* reset sign flag */
-      pushReg (hc08_reg_x, TRUE);
+        pushConst (zero);    /* reset sign flag */
+    }
+
+  if (IS_AOP_X (AOP (left)))
+    {
+      loadRegFromAop (hc08_reg_a, AOP (left), 0);
+      preload_a = TRUE;
     }
 
   /* save the signs of the operands */
-  if (AOP_TYPE(right) == AOP_LIT)
+  if (AOP_TYPE (right) == AOP_LIT)
     {
       signed char val = (char) ulFromVal (AOP (right)->aopu.aop_lit);
 
       if (!rUnsigned && val < 0)
-        emitcode ("ldx", "#0x%02x", -val);
+        {
+          emitcode ("ldx", "#0x%02x", -val);
+          regalloc_dry_run_cost += 2;
+        }
       else
-        emitcode ("ldx", "#0x%02x", (unsigned char) val);
+        {
+          emitcode ("ldx", "#0x%02x", (unsigned char) val);
+          regalloc_dry_run_cost += 2;
+        }
+      hc08_dirtyReg (hc08_reg_x, FALSE);
+      hc08_useReg (hc08_reg_x);
     }
-  else /* ! literal */
+  else                          /* ! literal */
     {
       loadRegFromAop (hc08_reg_x, AOP (right), 0);
       if (!rUnsigned)
         {
-          tlbl1 = newiTempLabel (NULL);
+          tlbl1 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
           emitcode ("tstx", "");
+          regalloc_dry_run_cost++;
           emitBranch ("bpl", tlbl1);
           emitcode ("inc", "1,s");
+          regalloc_dry_run_cost += 3;
           rmwWithReg ("neg", hc08_reg_x);
-          emitLabel (tlbl1);
+          if (!regalloc_dry_run)
+            emitLabel (tlbl1);
         }
     }
 
-  if (AOP_TYPE(left) == AOP_LIT)
+  if (AOP_TYPE (left) == AOP_LIT)
     {
       signed char val = (char) ulFromVal (AOP (left)->aopu.aop_lit);
 
       if (!lUnsigned && val < 0)
-        emitcode ("lda", "#0x%02x", -val);
+        {
+          emitcode ("lda", "#0x%02x", -val);
+          regalloc_dry_run_cost += 2;
+        }
       else
-        emitcode ("lda", "#0x%02x", (unsigned char) val);
+        {
+          emitcode ("lda", "#0x%02x", (unsigned char) val);
+          regalloc_dry_run_cost += 2;
+        }
+      hc08_dirtyReg (hc08_reg_a, FALSE);
+      hc08_useReg (hc08_reg_a);
     }
-  else /* ! literal */
+  else                          /* ! literal */
     {
-      loadRegFromAop (hc08_reg_a, AOP (left), 0);
+      if (!preload_a)
+        loadRegFromAop (hc08_reg_a, AOP (left), 0);
       if (!lUnsigned)
         {
-          tlbl2 = newiTempLabel (NULL);
+          tlbl2 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
           emitcode ("tsta", "");
+          regalloc_dry_run_cost++;
           emitBranch ("bpl", tlbl2);
           emitcode ("inc", "1,s");
+          regalloc_dry_run_cost += 3;
           rmwWithReg ("neg", hc08_reg_a);
-          emitLabel (tlbl2);
+          if (!regalloc_dry_run)
+            emitLabel (tlbl2);
         }
     }
 
   loadRegFromConst (hc08_reg_h, zero);
   emitcode ("div", "");
+  regalloc_dry_run_cost++;
   hc08_dirtyReg (hc08_reg_x, FALSE);
   hc08_dirtyReg (hc08_reg_a, FALSE);
   hc08_dirtyReg (hc08_reg_h, FALSE);
 
   if (runtimeSign || compiletimeSign)
     {
-      tlbl3 = newiTempLabel (NULL);
       if (runtimeSign)
         {
+          tlbl3 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
           pullReg (hc08_reg_x);
           rmwWithReg ("lsr", hc08_reg_x);
-          rmwWithReg ("ror", hc08_reg_x);
-          emitBranch ("bpl", tlbl3);
+          if (size > 1)
+            loadRegFromConst (hc08_reg_x, zero);
+          emitBranch ("bcc", tlbl3);
+          rmwWithReg ("neg", hc08_reg_a);
+          if (size > 1)
+            rmwWithReg ("dec", hc08_reg_x);
+          if (!regalloc_dry_run)
+            emitLabel (tlbl3);
+          /* signed result now in A or XA */
+          if (size == 1)
+            storeRegToAop (hc08_reg_a, AOP (result), 0);
+          else
+            storeRegToAop (hc08_reg_xa, AOP (result), 0);
         }
-
-      rmwWithReg ("neg", hc08_reg_a);
-      if (runtimeSign)
-        emitLabel (tlbl3);
-
-      storeRegToAop (hc08_reg_a, AOP (result), 0);
-
-      if (size > 1)
+      else /* must be compiletimeSign */
         {
-          /* msb is 0x00 or 0xff depending on the sign */
-          if (runtimeSign)
-            {
-              rmwWithReg ("lsl", hc08_reg_x);
-              emitcode ("clra", "");
-              emitcode ("sbc", "#0");
-              while (--size)
-                storeRegToAop (hc08_reg_a, AOP (result), ++offset);
-            }
-          else /* compiletimeSign */
-            while (--size)
-              storeConstToAop ("#0xff", AOP (result), ++offset);
+          hc08_freeReg (hc08_reg_x); /* in case we need a free reg for the 0xff */
+          rmwWithReg ("neg", hc08_reg_a);
+          storeRegToAop (hc08_reg_a, AOP (result), 0);
+          if (size > 1)
+            storeConstToAop ("#0xff", AOP (result), 1);
         }
     }
   else
@@ -3913,9 +4793,9 @@
       storeRegToFullAop (hc08_reg_a, AOP (result), FALSE);
     }
 
-  hc08_freeReg (hc08_reg_a);
-  hc08_freeReg (hc08_reg_x);
-  hc08_freeReg (hc08_reg_h);
+  pullOrFreeReg (hc08_reg_x, needpullx);
+  pullOrFreeReg (hc08_reg_h, needpullh);
+  pullOrFreeReg (hc08_reg_a, needpulla);
 }
 
 /*-----------------------------------------------------------------*/
@@ -3928,7 +4808,7 @@
   operand *right = IC_RIGHT (ic);
   operand *result = IC_RESULT (ic);
 
-  D(emitcode (";     genDiv",""));
+  D (emitcode (";     genDiv", ""));
 
   /* assign the amsops */
   aopOp (left, ic, FALSE);
@@ -3937,8 +4817,7 @@
 
   /* special cases first */
   /* if both are of size == 1 */
-  if (AOP_SIZE (left) <= 2 &&
-      AOP_SIZE (right) == 1)
+  if (AOP_SIZE (left) == 1 && AOP_SIZE (right) == 1 && AOP_SIZE (result) <= 2)
     {
       genDivOneByte (left, right, result);
       goto release;
@@ -3956,59 +4835,102 @@
 /* genModOneByte : 8 bit modulus                                   */
 /*-----------------------------------------------------------------*/
 static void
-genModOneByte (operand * left,
-               operand * right,
-               operand * result)
+genModOneByte (operand * left, operand * right, operand * result)
 {
   symbol *tlbl1, *tlbl2, *tlbl3;
   int size;
-  int offset = 0;
   bool lUnsigned, rUnsigned;
   bool runtimeSign, compiletimeSign;
+  bool needpulla, needpullh;
+  bool needpullx = FALSE;
+  bool preload_a = FALSE;
 
   lUnsigned = SPEC_USIGN (getSpec (operandType (left)));
   rUnsigned = SPEC_USIGN (getSpec (operandType (right)));
 
-  D(emitcode (";     genModOneByte",""));
+  D (emitcode (";     genModOneByte", ""));
 
   size = AOP_SIZE (result);
 
+  needpulla = pushRegIfSurv (hc08_reg_a);
+  needpullh = pushRegIfSurv (hc08_reg_h);
+  needpullx = pushRegIfSurv (hc08_reg_x);
+
+  /* If both left and right are in registers and backwards from what we need, */
+  /* the swap the operands and the registers. */
+  if (IS_AOP_A (AOP (right)) && IS_AOP_X (AOP (left)))
+    {
+      operand * t;
+      t = left;
+      left = right;
+      right = t;
+      pushReg (hc08_reg_a, FALSE);
+      transferRegReg (hc08_reg_x, hc08_reg_a, FALSE);
+      pullReg (hc08_reg_x);
+    }
+
   if (lUnsigned && rUnsigned)
     {
       /* unsigned is easy */
-      loadRegFromAop (hc08_reg_x, AOP (right), 0);
-      loadRegFromAop (hc08_reg_h, AOP (left), 1);
-      loadRegFromAop (hc08_reg_a, AOP (left), 0);
+      if (IS_AOP_A (AOP (right)))
+        {
+          loadRegFromAop (hc08_reg_x, AOP (right), 0);
+          loadRegFromAop (hc08_reg_a, AOP (left), 0);
+        }
+      else
+        {
+          loadRegFromAop (hc08_reg_a, AOP (left), 0);
+          loadRegFromAop (hc08_reg_x, AOP (right), 0);
+        }
+      loadRegFromConst (hc08_reg_h, zero);
       emitcode ("div", "");
-      hc08_freeReg (hc08_reg_a);
+      regalloc_dry_run_cost++;
       hc08_freeReg (hc08_reg_x);
+      hc08_dirtyReg (hc08_reg_a, TRUE);
       hc08_dirtyReg (hc08_reg_h, FALSE);
       storeRegToFullAop (hc08_reg_h, AOP (result), FALSE);
-      hc08_freeReg (hc08_reg_h);
+      pullOrFreeReg (hc08_reg_x, needpullx);
+      pullOrFreeReg (hc08_reg_h, needpullh);
+      pullOrFreeReg (hc08_reg_a, needpulla);
       return;
     }
 
   /* signed is a little bit more difficult */
+  if (IS_AOP_X (AOP (left)))
+    {
+      loadRegFromAop (hc08_reg_a, AOP (left), 0);
+      preload_a = TRUE;
+    }
 
-  if (AOP_TYPE(right) == AOP_LIT)
+  if (AOP_TYPE (right) == AOP_LIT)
     {
       signed char val = (char) ulFromVal (AOP (right)->aopu.aop_lit);
 
       if (!rUnsigned && val < 0)
-        emitcode ("ldx", "#0x%02x", -val);
+        {
+          emitcode ("ldx", "#0x%02x", -val);
+          regalloc_dry_run_cost += 2;
+        }
       else
-        emitcode ("ldx", "#0x%02x", (unsigned char) val);
+        {
+          emitcode ("ldx", "#0x%02x", (unsigned char) val);
+          regalloc_dry_run_cost += 2;
+        }
+      hc08_dirtyReg (hc08_reg_x, FALSE);
+      hc08_useReg (hc08_reg_x);
     }
-  else /* ! literal */
+  else                          /* ! literal */
     {
       loadRegFromAop (hc08_reg_x, AOP (right), 0);
       if (!rUnsigned)
         {
-          tlbl1 = newiTempLabel (NULL);
+          tlbl1 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
           emitcode ("tstx", "");
+          regalloc_dry_run_cost++;
           emitBranch ("bpl", tlbl1);
           rmwWithReg ("neg", hc08_reg_x);
-          emitLabel (tlbl1);
+          if (!regalloc_dry_run)
+            emitLabel (tlbl1);
         }
     }
 
@@ -4019,76 +4941,86 @@
   compiletimeSign = FALSE;
 
   /* sign adjust left side */
-  if (AOP_TYPE(left) == AOP_LIT)
+  if (AOP_TYPE (left) == AOP_LIT)
     {
       signed char val = (char) ulFromVal (AOP (left)->aopu.aop_lit);
 
       if (!lUnsigned && val < 0)
         {
-          compiletimeSign = TRUE; /* set sign flag */
+          compiletimeSign = TRUE;       /* set sign flag */
           emitcode ("lda", "#0x%02x", -val);
+          regalloc_dry_run_cost += 2;
         }
       else
-        emitcode ("lda", "#0x%02x", (unsigned char) val);
+        {
+          emitcode ("lda", "#0x%02x", (unsigned char) val);
+          regalloc_dry_run_cost += 2;
+        }
+      hc08_dirtyReg (hc08_reg_a, FALSE);
+      hc08_useReg (hc08_reg_a);
     }
-  else /* ! literal */
+  else                          /* ! literal */
     {
       if (lUnsigned)
-        loadRegFromAop (hc08_reg_a, AOP (left), 0);
+        {
+          if (!preload_a)
+            loadRegFromAop (hc08_reg_a, AOP (left), 0);
+        }
       else
         {
           runtimeSign = TRUE;
-          adjustStack (-1);
-          emitcode ("clr", "1,s");
+          pushConst (zero);
 
-          loadRegFromAop (hc08_reg_a, AOP (left), 0);
-          tlbl2 = newiTempLabel (NULL);
+          if (!preload_a)
+            loadRegFromAop (hc08_reg_a, AOP (left), 0);
+          tlbl2 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
           emitcode ("tsta", "");
+          regalloc_dry_run_cost++;
           emitBranch ("bpl", tlbl2);
           emitcode ("inc", "1,s");
+          regalloc_dry_run_cost += 3;
           rmwWithReg ("neg", hc08_reg_a);
-          emitLabel (tlbl2);
+          if (!regalloc_dry_run)
+            emitLabel (tlbl2);
         }
     }
 
   loadRegFromConst (hc08_reg_h, zero);
   emitcode ("div", "");
-  hc08_freeReg (hc08_reg_a);
+  regalloc_dry_run_cost++;
   hc08_freeReg (hc08_reg_x);
+  hc08_dirtyReg (hc08_reg_a, TRUE);
   hc08_dirtyReg (hc08_reg_h, FALSE);
 
   if (runtimeSign || compiletimeSign)
     {
       transferRegReg (hc08_reg_h, hc08_reg_a, TRUE);
-      tlbl3 = newiTempLabel (NULL);
       if (runtimeSign)
         {
+          tlbl3 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
           pullReg (hc08_reg_x);
           rmwWithReg ("lsr", hc08_reg_x);
-          rmwWithReg ("ror", hc08_reg_x);
-          emitBranch ("bpl", tlbl3);
+          if (size > 1)
+            loadRegFromConst (hc08_reg_x, zero);
+          emitBranch ("bcc", tlbl3);
+          rmwWithReg ("neg", hc08_reg_a);
+          if (size > 1)
+            rmwWithReg ("dec", hc08_reg_x);
+          if (!regalloc_dry_run)
+            emitLabel (tlbl3);
+          /* signed result now in A or XA */
+          if (size == 1)
+            storeRegToAop (hc08_reg_a, AOP (result), 0);
+          else
+            storeRegToAop (hc08_reg_xa, AOP (result), 0);
         }
-
-      rmwWithReg ("neg", hc08_reg_a);
-      if (runtimeSign)
-        emitLabel (tlbl3);
-
-      storeRegToAop (hc08_reg_a, AOP (result), 0);
-
-      if (size > 1)
+      else /* must be compiletimeSign */
         {
-          /* msb is 0x00 or 0xff depending on the sign */
-          if (runtimeSign)
-            {
-              rmwWithReg ("lsl", hc08_reg_x);
-              emitcode ("clra", "");
-              emitcode ("sbc", "#0");
-              while (--size)
-                storeRegToAop (hc08_reg_a, AOP (result), ++offset);
-            }
-          else /* compiletimeSign */
-            while (--size)
-              storeConstToAop ("#0xff", AOP (result), ++offset);
+          hc08_freeReg (hc08_reg_x); /* in case we need a free reg for the 0xff */
+          rmwWithReg ("neg", hc08_reg_a);
+          storeRegToAop (hc08_reg_a, AOP (result), 0);
+          if (size > 1)
+            storeConstToAop ("#0xff", AOP (result), 1);
         }
     }
   else
@@ -4096,9 +5028,9 @@
       storeRegToFullAop (hc08_reg_h, AOP (result), FALSE);
     }
 
-  hc08_freeReg (hc08_reg_a);
-  hc08_freeReg (hc08_reg_x);
-  hc08_freeReg (hc08_reg_h);
+  pullOrFreeReg (hc08_reg_x, needpullx);
+  pullOrFreeReg (hc08_reg_h, needpullh);
+  pullOrFreeReg (hc08_reg_a, needpulla);
 }
 
 /*-----------------------------------------------------------------*/
@@ -4111,7 +5043,7 @@
   operand *right = IC_RIGHT (ic);
   operand *result = IC_RESULT (ic);
 
-  D(emitcode (";     genMod",""));
+  D (emitcode (";     genMod", ""));
 
   /* assign the amsops */
   aopOp (left, ic, FALSE);
@@ -4120,8 +5052,7 @@
 
   /* special cases first */
   /* if both are of size == 1 */
-  if (AOP_SIZE (left) <= 2 &&
-      AOP_SIZE (right) == 1)
+  if (AOP_SIZE (left) == 1 && AOP_SIZE (right) == 1 && AOP_SIZE (result) <= 2)
     {
       genModOneByte (left, right, result);
       goto release;
@@ -4143,10 +5074,10 @@
 genIfxJump (iCode * ic, char *jval)
 {
   symbol *jlbl;
-  symbol *tlbl = newiTempLabel (NULL);
+  symbol *tlbl = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
   char *inst;
 
-  D(emitcode (";     genIfxJump",""));
+  D (emitcode (";     genIfxJump", ""));
 
   /* if true label then we jump if condition
      supplied is true */
@@ -4157,6 +5088,8 @@
         inst = "beq";
       else if (!strcmp (jval, "c"))
         inst = "bcc";
+      else if (!strcmp (jval, "n"))
+        inst = "bpl";
       else
         inst = "bge";
     }
@@ -4168,12 +5101,15 @@
         inst = "bne";
       else if (!strcmp (jval, "c"))
         inst = "bcs";
+      else if (!strcmp (jval, "n"))
+        inst = "bmi";
       else
         inst = "blt";
     }
   emitBranch (inst, tlbl);
   emitBranch ("jmp", jlbl);
-  emitLabel (tlbl);
+  if (!regalloc_dry_run)
+    emitLabel (tlbl);
 
   /* mark the icode as generated */
   ic->generated = 1;
@@ -4202,10 +5138,9 @@
     case EQ_OP:
       return EQ_OP;
     default:
-      werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
-                  "opcode not a comparison");
+      werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "opcode not a comparison");
     }
-  return EQ_OP; /* shouldn't happen, but need to return something */
+  return EQ_OP;                 /* shouldn't happen, but need to return something */
 }
 
 /*------------------------------------------------------------------*/
@@ -4230,10 +5165,9 @@
     case EQ_OP:
       return NE_OP;
     default:
-      werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
-                  "opcode not a comparison");
+      werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "opcode not a comparison");
     }
-  return EQ_OP; /* shouldn't happen, but need to return something */
+  return EQ_OP;                 /* shouldn't happen, but need to return something */
 }
 
 /*------------------------------------------------------------------*/
@@ -4274,7 +5208,7 @@
       if (sign)
         return "blt";
       else
-        return "bcs";   /* same as blo */
+        return "bcs";           /* same as blo */
     case '>':
       if (sign)
         return "bgt";
@@ -4289,14 +5223,13 @@
       if (sign)
         return "bge";
       else
-        return "bcc";   /* same as bhs */
+        return "bcc";           /* same as bhs */
     case NE_OP:
       return "bne";
     case EQ_OP:
       return "beq";
     default:
-      werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
-                  "opcode not a comparison");
+      werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "opcode not a comparison");
     }
   return "brn";
 }
@@ -4315,18 +5248,24 @@
   unsigned long lit = 0L;
   char *sub;
   symbol *jlbl = NULL;
+  bool needpulla = FALSE;
 
   opcode = ic->op;
 
-  D(emitcode (";     genCmp", "(%s)",nameCmp (opcode)));
+  D (emitcode (";     genCmp", "(%s)", nameCmp (opcode)));
 
   result = IC_RESULT (ic);
   left = IC_LEFT (ic);
   right = IC_RIGHT (ic);
 
-  letype = getSpec (operandType (left));
-  retype = getSpec (operandType (right));
-  sign = !(SPEC_USIGN (letype) | SPEC_USIGN (retype));
+  sign = 0;
+  if (IS_SPEC (operandType (left)) && IS_SPEC (operandType (right)))
+    {
+      letype = getSpec (operandType (left));
+      retype = getSpec (operandType (right));
+      sign = !(SPEC_USIGN (letype) | SPEC_USIGN (retype));
+    }
+
   /* assign the amsops */
   aopOp (left, ic, FALSE);
   aopOp (right, ic, FALSE);
@@ -4357,14 +5296,17 @@
 
   size = max (AOP_SIZE (left), AOP_SIZE (right));
 
-  if ((size == 2)
-      && ((AOP_TYPE (left) == AOP_DIR) && (AOP_SIZE (left) == 2))
-      && ((AOP_TYPE (right) == AOP_LIT) ||
-          ((AOP_TYPE (right) == AOP_DIR) && (AOP_SIZE (right) == 2)) )
-      && hc08_reg_hx->isFree)
+  if (size == 1 && IS_AOP_X (AOP (left)))
+    {
+      accopWithAop ("cpx", AOP (right), offset);
+    }
+  else if ((size == 2)
+      && ((AOP_TYPE (left) == AOP_DIR || IS_AOP_HX (AOP (left))) && (AOP_SIZE (left) == 2))
+      && ((AOP_TYPE (right) == AOP_LIT) || ((AOP_TYPE (right) == AOP_DIR || IS_S08 && AOP_TYPE (right) == AOP_EXT) && (AOP_SIZE (right) == 2))) && (hc08_reg_h->isDead && hc08_reg_x->isDead || IS_AOP_HX (AOP (left))))
     {
       loadRegFromAop (hc08_reg_hx, AOP (left), 0);
-      emitcode ("cphx","%s", aopAdrStr (AOP (right), 1, TRUE));
+      emitcode ("cphx", "%s", aopAdrStr (AOP (right), 0, TRUE));
+      regalloc_dry_run_cost += (AOP_TYPE (right) == AOP_DIR ? 2 : 3);
       hc08_freeReg (hc08_reg_hx);
     }
   else
@@ -4393,17 +5335,29 @@
           if ((AOP_TYPE (right) == AOP_LIT) && !isOperandVolatile (left, FALSE))
             {
               lit = ulFromVal (AOP (right)->aopu.aop_lit);
-              while ((size > 1) && (((lit >> (8*offset)) & 0xff) == 0))
+              while ((size > 1) && (((lit >> (8 * offset)) & 0xff) == 0))
                 {
                   offset++;
                   size--;
                 }
             }
         }
+      needpulla = pushRegIfSurv (hc08_reg_a);
       while (size--)
         {
-          loadRegFromAop (hc08_reg_a, AOP (left), offset);
-          accopWithAop (sub, AOP (right), offset);
+          if (AOP_TYPE (right) == AOP_REG && AOP(right)->aopu.aop_reg[offset]->rIdx == A_IDX)
+            {
+              pushReg (hc08_reg_a, TRUE);
+              loadRegFromAop (hc08_reg_a, AOP (left), offset);
+              emitcode (sub, "1, s");
+              regalloc_dry_run_cost += 3;
+              pullReg (hc08_reg_a);
+            }
+          else
+            {
+              loadRegFromAop (hc08_reg_a, AOP (left), offset);
+              accopWithAop (sub, AOP (right), offset);
+            }
           hc08_freeReg (hc08_reg_a);
           offset++;
           sub = "sbc";
@@ -4414,34 +5368,42 @@
 
   if (ifx)
     {
-      symbol *tlbl = newiTempLabel (NULL);
+      symbol *tlbl = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
       char *inst;
 
+      pullOrFreeReg (hc08_reg_a, needpulla);
+
       freeAsmop (result, NULL, ic, TRUE);
 
       inst = branchInstCmp (opcode, sign);
       emitBranch (inst, tlbl);
       emitBranch ("jmp", jlbl);
-      emitLabel (tlbl);
+      if (!regalloc_dry_run)
+        emitLabel (tlbl);
 
       /* mark the icode as generated */
       ifx->generated = 1;
     }
   else
     {
-      symbol *tlbl1 = newiTempLabel (NULL);
-      symbol *tlbl2 = newiTempLabel (NULL);
+      symbol *tlbl1 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
+      symbol *tlbl2 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
+
+      if (!needpulla)
+        needpulla = pushRegIfSurv (hc08_reg_a);
 
       emitBranch (branchInstCmp (opcode, sign), tlbl1);
       loadRegFromConst (hc08_reg_a, zero);
       emitBranch ("bra", tlbl2);
-      emitLabel (tlbl1);
+      if (!regalloc_dry_run)
+        emitLabel (tlbl1);
       loadRegFromConst (hc08_reg_a, one);
-      emitLabel (tlbl2);
-      storeRegToFullAop (hc08_reg_a, AOP(result), FALSE);
+      if (!regalloc_dry_run)
+        emitLabel (tlbl2);
+      storeRegToFullAop (hc08_reg_a, AOP (result), FALSE);
+      pullOrFreeReg (hc08_reg_a, needpulla);
       freeAsmop (result, NULL, ic, TRUE);
     }
-
 }
 
 /*-----------------------------------------------------------------*/
@@ -4451,25 +5413,21 @@
 genCmpEQorNE (iCode * ic, iCode * ifx)
 {
   operand *left, *right, *result;
-  sym_link *letype, *retype;
-  int sign, opcode;
+  int opcode;
   int size, offset = 0;
-  char *sub;
   symbol *jlbl = NULL;
   symbol *tlbl_NE = NULL;
   symbol *tlbl_EQ = NULL;
+  bool needpulla = FALSE;
 
   opcode = ic->op;
 
-  D(emitcode (";     genCmpEQorNE", "(%s)",nameCmp (opcode)));
+  D (emitcode (";     genCmpEQorNE", "(%s)", nameCmp (opcode)));
 
   result = IC_RESULT (ic);
   left = IC_LEFT (ic);
   right = IC_RIGHT (ic);
 
-  letype = getSpec (operandType (left));
-  retype = getSpec (operandType (right));
-  sign = !(SPEC_USIGN (letype) | SPEC_USIGN (retype));
   /* assign the amsops */
   aopOp (left, ic, FALSE);
   aopOp (right, ic, FALSE);
@@ -4501,32 +5459,45 @@
   size = max (AOP_SIZE (left), AOP_SIZE (right));
 
   if ((size == 2)
-      && ((AOP_TYPE (left) == AOP_DIR) && (AOP_SIZE (left) == 2))
-      && ((AOP_TYPE (right) == AOP_LIT) ||
-          ((AOP_TYPE (right) == AOP_DIR) && (AOP_SIZE (right) == 2)) )
-      && hc08_reg_hx->isFree)
+      && ((AOP_TYPE (left) == AOP_DIR || IS_AOP_HX (AOP (left))) && (AOP_SIZE (left) == 2))
+      && ((AOP_TYPE (right) == AOP_LIT) || ((AOP_TYPE (right) == AOP_DIR || IS_S08 && AOP_TYPE (right) == AOP_EXT) && (AOP_SIZE (right) == 2))) && hc08_reg_h->isDead && hc08_reg_x->isDead)
     {
       loadRegFromAop (hc08_reg_hx, AOP (left), 0);
-      emitcode ("cphx","%s", aopAdrStr (AOP (right), 1, TRUE));
+      emitcode ("cphx", "%s", aopAdrStr (AOP (right), 0, TRUE));
+      regalloc_dry_run_cost += (AOP_TYPE (right) == AOP_DIR ? 2 : 3);
       hc08_freeReg (hc08_reg_hx);
     }
   else
     {
       offset = 0;
-      sub = "cmp";
       while (size--)
         {
-          loadRegFromAop (hc08_reg_a, AOP (left), offset);
-          accopWithAop (sub, AOP (right), offset);
+          if (AOP_TYPE (left) == AOP_REG && AOP (left)->aopu.aop_reg[offset]->rIdx == X_IDX)
+            accopWithAop ("cpx", AOP (right), offset);
+          else
+            {
+              if (!(AOP_TYPE (left) == AOP_REG && AOP (left)->aopu.aop_reg[offset]->rIdx == A_IDX))
+                {
+                  needpulla = pushRegIfSurv (hc08_reg_a);
+                  loadRegFromAop (hc08_reg_a, AOP (left), offset);
+                }
+              accopWithAop ("cmp", AOP (right), offset);
+              if (!(AOP_TYPE (left) == AOP_REG && AOP (left)->aopu.aop_reg[offset]->rIdx == A_IDX))
+                pullOrFreeReg (hc08_reg_a, needpulla);
+              needpulla = FALSE;
+            }
           if (size)
             {
-              if (!tlbl_NE)
+              if (!needpulla && !ifx)
+                needpulla = pushRegIfSurv (hc08_reg_a);
+              if (!tlbl_NE && !regalloc_dry_run)
                 tlbl_NE = newiTempLabel (NULL);
               emitBranch ("bne", tlbl_NE);
+              pullOrFreeReg (hc08_reg_a, needpulla);
+              needpulla = FALSE;
             }
-          hc08_freeReg (hc08_reg_a);
           offset++;
-        }
+          }
     }
   freeAsmop (right, NULL, ic, FALSE);
   freeAsmop (left, NULL, ic, FALSE);
@@ -4537,21 +5508,23 @@
 
       if (opcode == EQ_OP)
         {
-          if (!tlbl_EQ)
+          if (!tlbl_EQ && !regalloc_dry_run)
             tlbl_EQ = newiTempLabel (NULL);
           emitBranch ("beq", tlbl_EQ);
           if (tlbl_NE)
             emitLabel (tlbl_NE);
           emitBranch ("jmp", jlbl);
-          emitLabel (tlbl_EQ);
+          if (!regalloc_dry_run)
+            emitLabel (tlbl_EQ);
         }
       else
         {
-          if (!tlbl_NE)
+          if (!tlbl_NE && !regalloc_dry_run)
             tlbl_NE = newiTempLabel (NULL);
           emitBranch ("bne", tlbl_NE);
           emitBranch ("jmp", jlbl);
-          emitLabel (tlbl_NE);
+          if (!regalloc_dry_run)
+            emitLabel (tlbl_NE);
         }
 
       /* mark the icode as generated */
@@ -4559,336 +5532,174 @@
     }
   else
     {
-      symbol *tlbl = newiTempLabel (NULL);
+      symbol *tlbl = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
 
+      if (!needpulla)
+        needpulla = pushRegIfSurv (hc08_reg_a);
       if (opcode == EQ_OP)
         {
-          if (!tlbl_EQ)
+          if (!tlbl_EQ && !regalloc_dry_run)
             tlbl_EQ = newiTempLabel (NULL);
           emitBranch ("beq", tlbl_EQ);
           if (tlbl_NE)
             emitLabel (tlbl_NE);
           loadRegFromConst (hc08_reg_a, zero);
           emitBranch ("bra", tlbl);
-          emitLabel (tlbl_EQ);
+          if (!regalloc_dry_run)
+            emitLabel (tlbl_EQ);
           loadRegFromConst (hc08_reg_a, one);
         }
       else
         {
-          if (!tlbl_NE)
+          if (!tlbl_NE && !regalloc_dry_run)
             tlbl_NE = newiTempLabel (NULL);
           emitBranch ("bne", tlbl_NE);
           loadRegFromConst (hc08_reg_a, zero);
           emitBranch ("bra", tlbl);
-          emitLabel (tlbl_NE);
+          if (!regalloc_dry_run)
+            emitLabel (tlbl_NE);
           loadRegFromConst (hc08_reg_a, one);
         }
 
-      emitLabel (tlbl);
-      storeRegToFullAop (hc08_reg_a, AOP(result), FALSE);
+      if (!regalloc_dry_run)
+        emitLabel (tlbl);
+      storeRegToFullAop (hc08_reg_a, AOP (result), FALSE);
+      pullOrFreeReg (hc08_reg_a, needpulla);
       freeAsmop (result, NULL, ic, TRUE);
     }
-
 }
 
-
 /*-----------------------------------------------------------------*/
-/* ifxForOp - returns the icode containing the ifx for operand     */
+/* hasInchc08 - operand is incremented before any other use        */
 /*-----------------------------------------------------------------*/
-static iCode *
-ifxForOp (operand * op, iCode * ic)
+iCode *
+hasInchc08 (operand *op, const iCode *ic, int osize)
 {
-  /* if true symbol then needs to be assigned */
-  if (IS_TRUE_SYMOP (op))
+  sym_link *type = operandType (op);
+  sym_link *retype = getSpec (type);
+  iCode *lic = ic->next;
+  int isize;
+
+  /* this could from a cast, e.g.: "(char xdata *) 0x7654;" */
+  if (!IS_SYMOP (op))
     return NULL;
 
-  /* if this has register type condition and
-     the next instruction is ifx with the same operand
-     and live to of the operand is upto the ifx only then */
-  if (ic->next &&
-      ic->next->op == IFX &&
-      IC_COND (ic->next)->key == op->key &&
-      OP_SYMBOL (op)->liveTo <= ic->next->seq)
-    return ic->next;
+  if (IS_BITVAR (retype) || !IS_PTR (type))
+    return NULL;
+  if (IS_AGGREGATE (type->next))
+    return NULL;
+  if (osize != (isize = getSize (type->next)))
+    return NULL;
 
+  while (lic)
+    {
+      /* if operand of the form op = op + <sizeof *op> */
+      if (lic->op == '+' && isOperandEqual (IC_LEFT (lic), op) &&
+          isOperandEqual (IC_RESULT (lic), op) &&
+          isOperandLiteral (IC_RIGHT (lic)) && operandLitValue (IC_RIGHT (lic)) == isize)
+        {
+          return lic;
+        }
+      /* if the operand used or deffed */
+      if (bitVectBitValue (OP_USES (op), lic->key) || lic->defKey == op->key)
+        {
+          return NULL;
+        }
+      /* if GOTO or IFX */
+      if (lic->op == IFX || lic->op == GOTO || lic->op == LABEL)
+        break;
+      lic = lic->next;
+    }
   return NULL;
 }
 
-static bool
-genPointerGetSetOfs (iCode *ic)
+/*-----------------------------------------------------------------*/
+/* genAndOp - for && operation                                     */
+/*-----------------------------------------------------------------*/
+static void
+genAndOp (iCode * ic)
 {
-  iCode *lic = ic->next;
-  bool pset, pget;
-  int size;
-  symbol *sym;
-  asmop *derefaop;
+  operand *left, *right, *result;
+  symbol *tlbl, *tlbl0;
+  bool needpulla;
 
-  /* Make sure we have a next iCode */
-  DD(emitcode("","; checking lic"));
-  if (!lic)
-    return FALSE;
+  D (emitcode (";     genAndOp", ""));
 
-  /* Make sure the result of the addition is an iCode */
-  DD(emitcode("","; checking IS_ITEMP"));
-  if (!IS_ITEMP (IC_RESULT (ic)))
-    return FALSE;
+  /* note here that && operations that are in an
+     if statement are taken away by backPatchLabels
+     only those used in arthmetic operations remain */
+  aopOp ((left = IC_LEFT (ic)), ic, FALSE);
+  aopOp ((right = IC_RIGHT (ic)), ic, FALSE);
+  aopOp ((result = IC_RESULT (ic)), ic, FALSE);
 
-  /* Make sure the next iCode is a pointer set or get */
-  pset = POINTER_SET(lic);
-  pget = POINTER_GET(lic);
-  DD(emitcode("","; pset=%d, pget=%d",pset,pget));
-  if (!pset && !pget)
-    return FALSE;
+  tlbl = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
+  tlbl0 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
 
-  /* Make sure this is the only use of the pointer */
-  if (bitVectnBitsOn (OP_USES (IC_RESULT (ic))) > 1)
-    return FALSE;
+  needpulla = pushRegIfSurv (hc08_reg_a);
+  asmopToBool (AOP (left), FALSE);
+  emitBranch ("beq", tlbl0);
+  asmopToBool (AOP (right), FALSE);
+  emitBranch ("beq", tlbl0);
+  loadRegFromConst (hc08_reg_a, one);
+  emitBranch ("bra", tlbl);
+  if (!regalloc_dry_run)
+    emitLabel (tlbl0);
+  loadRegFromConst (hc08_reg_a, zero);
+  if (!regalloc_dry_run)
+    emitLabel (tlbl);
 
-  DD(emitcode("", "; checking pset operandsEqu"));
-  if (pset & !operandsEqu (IC_RESULT (ic), IC_RESULT (lic)))
-    return FALSE;
+  hc08_useReg (hc08_reg_a);
+  hc08_freeReg (hc08_reg_a);
 
-  DD(emitcode("", "; checking pget operandsEqu"));
-  if (pget & !operandsEqu (IC_RESULT (ic), IC_LEFT (lic)))
-    return FALSE;
+  storeRegToFullAop (hc08_reg_a, AOP (result), FALSE);
+  pullOrFreeReg(hc08_reg_a, needpulla);
 
-  DD(emitcode("", "; checking IS_SYMOP"));
-  if (!IS_SYMOP (IC_LEFT (ic)))
-    return FALSE;
+  freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (result, NULL, ic, TRUE);
+}
 
-  DD(emitcode("", "; checking !IS_TRUE_SYMOP"));
-  if (IS_TRUE_SYMOP (IC_LEFT (ic)))
-    return FALSE;
 
-  sym = OP_SYMBOL (IC_LEFT (ic));
+/*-----------------------------------------------------------------*/
+/* genOrOp - for || operation                                      */
+/*-----------------------------------------------------------------*/
+static void
+genOrOp (iCode * ic)
+{
+  operand *left, *right, *result;
+  symbol *tlbl, *tlbl0;
+  bool needpulla;
 
-  DD(emitcode("", "; checking remat"));
-  if (!sym->remat)
-    return FALSE;
+  D (emitcode (";     genOrOp", ""));
 
+  /* note here that || operations that are in an
+     if statement are taken away by backPatchLabels
+     only those used in arthmetic operations remain */
+  aopOp ((left = IC_LEFT (ic)), ic, FALSE);
+  aopOp ((right = IC_RIGHT (ic)), ic, FALSE);
+  aopOp ((result = IC_RESULT (ic)), ic, FALSE);
 
-  if (pget)
-    {
-      D(emitcode (";     genPointerGetOfs",""));
-      aopOp (IC_LEFT(ic), ic, FALSE);
-      derefaop = aopDerefAop (AOP (IC_LEFT (ic)));
-      freeAsmop (IC_LEFT(ic), NULL, ic, TRUE);
+  tlbl = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
+  tlbl0 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
 
-      aopOp (IC_RIGHT(ic), ic, FALSE);
-      aopOp (IC_RESULT(lic), lic, FALSE);
-
-      if (AOP_SIZE (IC_RIGHT (ic)) == 1)
-        {
-          if (SPEC_USIGN (getSpec (operandType (IC_RIGHT (ic)))))
-            {
-              loadRegFromAop (hc08_reg_x, AOP (IC_RIGHT (ic)), 0);
-              loadRegFromConst (hc08_reg_h, zero);
-            }
-          else
-            {
-              loadRegFromAop (hc08_reg_a, AOP (IC_RIGHT (ic)), 0);
-              transferRegReg (hc08_reg_a, hc08_reg_x, FALSE);
-              emitcode ("rola","");
-              emitcode ("clra","");
-              emitcode ("sbc", "#0");
-              hc08_useReg (hc08_reg_a);
-              transferRegReg (hc08_reg_a, hc08_reg_h, FALSE);
-           }
-        }
-      else
-        loadRegFromAop (hc08_reg_hx, AOP (IC_RIGHT (ic)), 0);
-      size = AOP_SIZE (IC_RESULT(lic));
-      derefaop->size = size;
-
-      while (size--)
-        {
-          emitcode ("lda", "%s,x",
-                    aopAdrStr (derefaop, size, TRUE));
-          hc08_useReg (hc08_reg_a);
-          storeRegToAop (hc08_reg_a, AOP (IC_RESULT (lic)), size);
-          hc08_freeReg (hc08_reg_a);
-        }
-
-      lic->generated = 1;
-      hc08_freeReg (hc08_reg_hx);
-
-      freeAsmop (NULL, derefaop, ic, TRUE);
-      freeAsmop (IC_RIGHT(ic), NULL, ic, TRUE);
-      freeAsmop (IC_RESULT(lic), NULL, lic, TRUE);
-
-      return TRUE;
-    }
-
-  if (pset)
-    {
-      D(emitcode (";     genPointerSetOfs",""));
-      aopOp (IC_LEFT(ic), ic, FALSE);
-      derefaop = aopDerefAop (AOP (IC_LEFT (ic)));
-      freeAsmop (IC_LEFT(ic), NULL, ic, TRUE);
-
-      aopOp (IC_RIGHT(ic), ic, FALSE);
-      aopOp (IC_RIGHT(lic), lic, FALSE);
-
-      if (AOP_SIZE (IC_RIGHT (ic)) == 1)
-        {
-          if (SPEC_USIGN (getSpec (operandType (IC_RIGHT (ic)))))
-            {
-              loadRegFromAop (hc08_reg_x, AOP (IC_RIGHT (ic)), 0);
-              loadRegFromConst (hc08_reg_h, zero);
-            }
-          else
-            {
-              loadRegFromAop (hc08_reg_a, AOP (IC_RIGHT (ic)), 0);
-              transferRegReg (hc08_reg_a, hc08_reg_x, FALSE);
-              emitcode ("rola","");
-              emitcode ("clra","");
-              emitcode ("sbc", "#0");
-              hc08_useReg (hc08_reg_a);
-              transferRegReg (hc08_reg_a, hc08_reg_h, FALSE);
-           }
-        }
-      else
-        loadRegFromAop (hc08_reg_hx, AOP (IC_RIGHT (ic)), 0);
-      size = AOP_SIZE (IC_RIGHT(lic));
-      derefaop->size = size;
-
-      while (size--)
-        {
-          loadRegFromAop (hc08_reg_a, AOP (IC_RIGHT (lic)), size);
-          emitcode ("sta", "%s,x",
-                    aopAdrStr (derefaop, size, TRUE));
-          hc08_freeReg (hc08_reg_a);
-        }
-
-      lic->generated = 1;
-      hc08_freeReg (hc08_reg_hx);
-
-      freeAsmop (NULL, derefaop, ic, TRUE);
-      freeAsmop (IC_RIGHT(ic), NULL, ic, TRUE);
-      freeAsmop (IC_RIGHT(lic), NULL, lic, TRUE);
-
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-
-/*-----------------------------------------------------------------*/
-/* hasInc - operand is incremented before any other use            */
-/*-----------------------------------------------------------------*/
-static iCode *
-hasInc (operand *op, iCode *ic,int osize)
-{
-  sym_link *type = operandType(op);
-  sym_link *retype = getSpec (type);
-  iCode *lic = ic->next;
-  int isize ;
-
-  /* this could from a cast, e.g.: "(char xdata *) 0x7654;" */
-  if (!IS_SYMOP(op)) return NULL;
-
-  if (IS_BITVAR(retype)||!IS_PTR(type)) return NULL;
-  if (IS_AGGREGATE(type->next)) return NULL;
-  if (osize != (isize = getSize(type->next))) return NULL;
-
-  while (lic) {
-    /* if operand of the form op = op + <sizeof *op> */
-    if (lic->op == '+' && isOperandEqual(IC_LEFT(lic),op) &&
-        isOperandEqual(IC_RESULT(lic),op) &&
-        isOperandLiteral(IC_RIGHT(lic)) &&
-        operandLitValue(IC_RIGHT(lic)) == isize) {
-      return lic;
-    }
-    /* if the operand used or deffed */
-    if (bitVectBitValue(OP_USES(op),lic->key) || lic->defKey == op->key) {
-      return NULL;
-    }
-    /* if GOTO or IFX */
-    if (lic->op == IFX || lic->op == GOTO || lic->op == LABEL) break;
-    lic = lic->next;
-  }
-  return NULL;
-}
-
-/*-----------------------------------------------------------------*/
-/* genAndOp - for && operation                                     */
-/*-----------------------------------------------------------------*/
-static void
-genAndOp (iCode * ic)
-{
-  operand *left, *right, *result;
-  symbol *tlbl, *tlbl0;
-
-  D(emitcode (";     genAndOp",""));
-
-  /* note here that && operations that are in an
-     if statement are taken away by backPatchLabels
-     only those used in arthmetic operations remain */
-  aopOp ((left = IC_LEFT (ic)), ic, FALSE);
-  aopOp ((right = IC_RIGHT (ic)), ic, FALSE);
-  aopOp ((result = IC_RESULT (ic)), ic, FALSE);
-
-  tlbl = newiTempLabel (NULL);
-  tlbl0 = newiTempLabel (NULL);
-
-  asmopToBool (AOP (left), FALSE);
-  emitBranch ("beq", tlbl0);
-  asmopToBool (AOP (right), FALSE);
-  emitBranch ("beq", tlbl0);
-  loadRegFromConst (hc08_reg_a,one);
-  emitBranch ("bra", tlbl);
-  emitLabel (tlbl0);
-  loadRegFromConst (hc08_reg_a,zero);
-  emitLabel (tlbl);
-
-  hc08_useReg (hc08_reg_a);
-  hc08_freeReg (hc08_reg_a);
-
-  storeRegToFullAop (hc08_reg_a, AOP (result), FALSE);
-
-  freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
-  freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
-  freeAsmop (result, NULL, ic, TRUE);
-}
-
-
-/*-----------------------------------------------------------------*/
-/* genOrOp - for || operation                                      */
-/*-----------------------------------------------------------------*/
-static void
-genOrOp (iCode * ic)
-{
-  operand *left, *right, *result;
-  symbol *tlbl, *tlbl0;
-
-  D(emitcode (";     genOrOp",""));
-
-  /* note here that || operations that are in an
-     if statement are taken away by backPatchLabels
-     only those used in arthmetic operations remain */
-  aopOp ((left = IC_LEFT (ic)), ic, FALSE);
-  aopOp ((right = IC_RIGHT (ic)), ic, FALSE);
-  aopOp ((result = IC_RESULT (ic)), ic, FALSE);
-
-  tlbl = newiTempLabel (NULL);
-  tlbl0 = newiTempLabel (NULL);
-
-  asmopToBool (AOP (left), FALSE);
-  emitBranch ("bne", tlbl0);
-  asmopToBool (AOP (right), FALSE);
-  emitBranch ("bne", tlbl0);
-  loadRegFromConst (hc08_reg_a,zero);
-  emitBranch ("bra", tlbl);
-  emitLabel (tlbl0);
-  loadRegFromConst (hc08_reg_a,one);
-  emitLabel (tlbl);
+  needpulla = pushRegIfSurv (hc08_reg_a);
+  asmopToBool (AOP (left), FALSE);
+  emitBranch ("bne", tlbl0);
+  asmopToBool (AOP (right), FALSE);
+  emitBranch ("bne", tlbl0);
+  loadRegFromConst (hc08_reg_a, zero);
+  emitBranch ("bra", tlbl);
+  if (!regalloc_dry_run)
+    emitLabel (tlbl0);
+  loadRegFromConst (hc08_reg_a, one);
+  if (!regalloc_dry_run)
+    emitLabel (tlbl);
 
   hc08_useReg (hc08_reg_a);
   hc08_freeReg (hc08_reg_a);
 
   storeRegToFullAop (hc08_reg_a, AOP (result), FALSE);
-
+  pullOrFreeReg(hc08_reg_a, needpulla);
 
   freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
   freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
@@ -4902,13 +5713,15 @@
 isLiteralBit (unsigned long lit)
 {
   unsigned long pw[32] =
-  {1L, 2L, 4L, 8L, 16L, 32L, 64L, 128L,
-   0x100L, 0x200L, 0x400L, 0x800L,
-   0x1000L, 0x2000L, 0x4000L, 0x8000L,
-   0x10000L, 0x20000L, 0x40000L, 0x80000L,
-   0x100000L, 0x200000L, 0x400000L, 0x800000L,
-   0x1000000L, 0x2000000L, 0x4000000L, 0x8000000L,
-   0x10000000L, 0x20000000L, 0x40000000L, 0x80000000L};
+  {
+    1L, 2L, 4L, 8L, 16L, 32L, 64L, 128L,
+    0x100L, 0x200L, 0x400L, 0x800L,
+    0x1000L, 0x2000L, 0x4000L, 0x8000L,
+    0x10000L, 0x20000L, 0x40000L, 0x80000L,
+    0x100000L, 0x200000L, 0x400000L, 0x800000L,
+    0x1000000L, 0x2000000L, 0x4000000L, 0x8000000L,
+    0x10000000L, 0x20000000L, 0x40000000L, 0x80000000L
+  };
   int idx;
 
   for (idx = 0; idx < 32; idx++)
@@ -4917,52 +5730,6 @@
   return 0;
 }
 
-#if 0
-/*-----------------------------------------------------------------*/
-/* continueIfTrue -                                                */
-/*-----------------------------------------------------------------*/
-static void
-continueIfTrue (iCode * ic)
-{
-  if (IC_TRUE (ic))
-    emitBranch ("jmp", IC_TRUE (ic));
-  ic->generated = 1;
-}
-
-/*-----------------------------------------------------------------*/
-/* jmpIfTrue -                                                     */
-/*-----------------------------------------------------------------*/
-static void
-jumpIfTrue (iCode * ic)
-{
-  if (!IC_TRUE (ic))
-    emitBranch ("jmp", IC_FALSE (ic));
-  ic->generated = 1;
-}
-
-/*-----------------------------------------------------------------*/
-/* jmpTrueOrFalse -                                                */
-/*-----------------------------------------------------------------*/
-static void
-jmpTrueOrFalse (iCode * ic, symbol * tlbl)
-{
-  // ugly but optimized by peephole
-  if (IC_TRUE (ic))
-    {
-      symbol *nlbl = newiTempLabel (NULL);
-      emitBranch ("bra", nlbl);
-      emitLabel (tlbl);
-      emitBranch ("jmp", IC_TRUE (ic));
-      emitLabel (nlbl);
-    }
-  else
-    {
-      emitBranch ("jmp", IC_FALSE (ic));
-      emitLabel (tlbl);
-    }
-  ic->generated = 1;
-}
-#endif
 
 /*-----------------------------------------------------------------*/
 /* genAnd  - code for and                                          */
@@ -4974,25 +5741,23 @@
   int size, offset = 0;
   unsigned long lit = 0L;
   unsigned long litinv;
+  int bitpos = -1;
   unsigned char bytemask;
-
+  bool needpulla = FALSE;
+  bool earlystore = FALSE;
 
 //  int bytelit = 0;
 //  char buffer[10];
 
-  D(emitcode (";     genAnd",""));
+  D (emitcode (";     genAnd", ""));
 
   aopOp ((left = IC_LEFT (ic)), ic, FALSE);
   aopOp ((right = IC_RIGHT (ic)), ic, FALSE);
   aopOp ((result = IC_RESULT (ic)), ic, TRUE);
 
 #ifdef DEBUG_TYPE
-  DD(emitcode ("", "; Type res[%d] = l[%d]&r[%d]",
-            AOP_TYPE (result),
-            AOP_TYPE (left), AOP_TYPE (right)));
-  DD(emitcode ("", "; Size res[%d] = l[%d]&r[%d]",
-            AOP_SIZE (result),
-            AOP_SIZE (left), AOP_SIZE (right)));
+  DD (emitcode ("", "; Type res[%d] = l[%d]&r[%d]", AOP_TYPE (result), AOP_TYPE (left), AOP_TYPE (right)));
+  DD (emitcode ("", "; Size res[%d] = l[%d]&r[%d]", AOP_SIZE (result), AOP_SIZE (left), AOP_SIZE (right)));
 #endif
 
   /* if left is a literal & right is not then exchange them */
@@ -5004,22 +5769,60 @@
     }
 
   /* if right is accumulator & left is not then exchange them */
-  if (AOP_TYPE (right) == AOP_REG && AOP_TYPE (left) != AOP_REG)
+  if (AOP_TYPE (right) == AOP_REG && ! IS_AOP_WITH_A (AOP (left)))
     {
       operand *tmp = right;
       right = left;
       left = tmp;
     }
 
+  size = (AOP_SIZE (left) >= AOP_SIZE (right)) ? AOP_SIZE (left) : AOP_SIZE (right);
+
   if (AOP_TYPE (right) == AOP_LIT)
-    lit = ulFromVal (AOP (right)->aopu.aop_lit);
+    {
+      lit = ulFromVal (AOP (right)->aopu.aop_lit);
+      if (size == 1)
+        lit &= 0xff;
+      else if (size == 2)
+        lit &= 0xffff;
+      else if (size == 4)
+        lit &= 0xffffffff;
+      bitpos = isLiteralBit (lit) - 1;
+    }
 
-  size = (AOP_SIZE (left) >= AOP_SIZE (right)) ? AOP_SIZE (left) : AOP_SIZE (right);
+  if (ifx && AOP_TYPE (result) == AOP_CRY && AOP_TYPE (right) == AOP_LIT && AOP_TYPE (left) == AOP_DIR && bitpos >= 0)
+    {
+      symbol *tlbl = NULL;
+      if (!regalloc_dry_run)
+        tlbl = newiTempLabel (NULL);
+      if (IC_TRUE (ifx))
+        {
+          if (!regalloc_dry_run)
+            emitcode ("brclr", "#%d,%s,%05d$", bitpos & 7, aopAdrStr (AOP (left), bitpos >> 3, FALSE), labelKey2num ((tlbl->key)));
+          regalloc_dry_run_cost += 3;
+          emitBranch ("jmp", IC_TRUE (ifx));
+          if (!regalloc_dry_run)
+            emitLabel (tlbl);
+          if (IC_FALSE (ifx))
+            emitBranch ("jmp", IC_FALSE (ifx));
+        }
+      else
+        {
+          if (!regalloc_dry_run)
+            emitcode ("brset", "#%d,%s,%05d$", bitpos & 7, aopAdrStr (AOP (left), bitpos >> 3, FALSE), labelKey2num ((tlbl->key)));
+          regalloc_dry_run_cost += 3;
+          emitBranch ("jmp", IC_FALSE (ifx));
+          if (!regalloc_dry_run)
+            emitLabel (tlbl);
+        }
+      ifx->generated = TRUE;
+      goto release;
+    }
 
-  if (AOP_TYPE (result) == AOP_CRY
-      && size > 1
-      && (isOperandVolatile (left, FALSE) || isOperandVolatile (right, FALSE)))
+  if (AOP_TYPE (result) == AOP_CRY && size > 1 && (isOperandVolatile (left, FALSE) || isOperandVolatile (right, FALSE)))
     {
+      needpulla = pushRegIfSurv (hc08_reg_a);
+
       /* this generates ugly code, but meets volatility requirements */
       loadRegFromConst (hc08_reg_a, zero);
       pushReg (hc08_reg_a, TRUE);
@@ -5031,11 +5834,37 @@
           accopWithAop ("and", AOP (right), offset);
           emitcode ("ora", "1,s");
           emitcode ("sta", "1,s");
+          regalloc_dry_run_cost += 6;
           offset++;
         }
 
       pullReg (hc08_reg_a);
       emitcode ("tsta", "");
+      regalloc_dry_run_cost++;
+
+      pullOrFreeReg (hc08_reg_a, needpulla);
+
+      genIfxJump (ifx, "a");
+
+      goto release;
+    }
+
+  if (AOP_TYPE (result) == AOP_CRY && AOP_TYPE (right) == AOP_LIT)
+    {
+      if (bitpos >= 0 && (bitpos & 7) == 7)
+        {
+          rmwWithAop ("tst", AOP (left), bitpos >> 3);
+          genIfxJump (ifx, "n");
+          goto release;
+        }
+    }
+
+  if (AOP_TYPE (result) == AOP_CRY && size == 1 && (IS_AOP_A (AOP (left)) || IS_AOP_A (AOP (right))))
+    {
+      if (IS_AOP_A (AOP (left)))
+        accopWithAop ("bit", AOP (right), 0);
+      else
+        accopWithAop ("bit", AOP (left), 0);
       genIfxJump (ifx, "a");
       goto release;
     }
@@ -5044,10 +5873,12 @@
     {
       symbol *tlbl = NULL;
 
+      needpulla = pushRegIfSurv (hc08_reg_a);
+
       offset = 0;
       while (size--)
         {
-          bytemask = (lit >> (offset*8)) & 0xff;
+          bytemask = (lit >> (offset * 8)) & 0xff;
 
           if (AOP_TYPE (right) == AOP_LIT && bytemask == 0)
             {
@@ -5058,7 +5889,7 @@
               rmwWithAop ("tst", AOP (left), offset);
               if (size)
                 {
-                  if (!tlbl)
+                  if (!tlbl && !regalloc_dry_run)
                     tlbl = newiTempLabel (NULL);
                   emitBranch ("bne", tlbl);
                 }
@@ -5066,50 +5897,61 @@
           else
             {
               loadRegFromAop (hc08_reg_a, AOP (left), offset);
-              accopWithAop ("and", AOP (right), offset);
-              hc08_freeReg( hc08_reg_a);
+              accopWithAop ("bit", AOP (right), offset);
+              hc08_freeReg (hc08_reg_a);
               if (size)
                 {
-                  if (!tlbl)
+                  if (!tlbl && !regalloc_dry_run)
                     tlbl = newiTempLabel (NULL);
                   emitBranch ("bne", tlbl);
                 }
             }
           offset++;
         }
-        if (tlbl)
-          emitLabel (tlbl);
-        if(ifx)
-          genIfxJump (ifx, "a");
-        goto release;
+      if (tlbl)
+        emitLabel (tlbl);
+
+      pullOrFreeReg (hc08_reg_a, needpulla);
+
+      if (ifx)
+        genIfxJump (ifx, "a");
+      goto release;
     }
 
   size = AOP_SIZE (result);
 
   if (AOP_TYPE (right) == AOP_LIT)
     {
-      litinv = (~lit) & (((unsigned int)0xffffffff) >> (8*(4-size))) ;
-      if (sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic))) &&
-          (AOP_TYPE (left) == AOP_DIR) && isLiteralBit(litinv))
-        {
-          int bitpos = isLiteralBit(litinv)-1;
-          emitcode ("bclr","#%d,%s",bitpos & 7,
-                    aopAdrStr (AOP (left), bitpos >> 3, FALSE));
+      litinv = (~lit) & (((unsigned int) 0xffffffff) >> (8 * (4 - size)));
+      if (sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic))) && (AOP_TYPE (left) == AOP_DIR) && isLiteralBit (litinv))
+        {
+          bitpos = isLiteralBit (litinv) - 1;
+          emitcode ("bclr", "#%d,%s", bitpos & 7, aopAdrStr (AOP (left), bitpos >> 3, FALSE));
+          regalloc_dry_run_cost += 2;
           goto release;
         }
     }
 
+  needpulla = pushRegIfSurv (hc08_reg_a);
+
   offset = 0;
+  if (size >= 2 && IS_AOP_AX (AOP (left)))
+    {
+      pushReg (hc08_reg_a, TRUE);
+      earlystore = TRUE;
+    }
   while (size--)
     {
-      bytemask = (lit >> (offset*8)) & 0xff;
+      bytemask = (lit >> (offset * 8)) & 0xff;
 
+      if (earlystore && offset == 1)
+        pullReg (hc08_reg_a);
       if (AOP_TYPE (right) == AOP_LIT && bytemask == 0)
         {
           if (isOperandVolatile (left, FALSE))
             {
               loadRegFromAop (hc08_reg_a, AOP (left), offset);
-              hc08_freeReg( hc08_reg_a);
+              hc08_freeReg (hc08_reg_a);
             }
           storeConstToAop (zero, AOP (result), offset);
         }
@@ -5124,9 +5966,16 @@
           storeRegToAop (hc08_reg_a, AOP (result), offset);
           hc08_freeReg (hc08_reg_a);
         }
+      if (AOP_TYPE (result) == AOP_REG && size && AOP (result)->aopu.aop_reg[offset]->rIdx == A_IDX)
+        {
+          pushReg (hc08_reg_a, TRUE);
+          needpulla = TRUE;
+        }
       offset++;
     }
 
+  pullOrFreeReg (hc08_reg_a, needpulla);
+
 release:
   freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
   freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
@@ -5143,20 +5992,18 @@
   int size, offset = 0;
   unsigned long lit = 0L;
   unsigned char bytemask;
+  bool needpulla = FALSE;
+  bool earlystore = FALSE;
 
-  D(emitcode (";     genOr",""));
+  D (emitcode (";     genOr", ""));
 
   aopOp ((left = IC_LEFT (ic)), ic, FALSE);
   aopOp ((right = IC_RIGHT (ic)), ic, FALSE);
   aopOp ((result = IC_RESULT (ic)), ic, TRUE);
 
 #ifdef DEBUG_TYPE
-  DD(emitcode ("", "; Type res[%d] = l[%d]&r[%d]",
-            AOP_TYPE (result),
-            AOP_TYPE (left), AOP_TYPE (right)));
-  DD(emitcode ("", "; Size res[%d] = l[%d]&r[%d]",
-            AOP_SIZE (result),
-            AOP_SIZE (left), AOP_SIZE (right)));
+  DD (emitcode ("", "; Type res[%d] = l[%d]&r[%d]", AOP_TYPE (result), AOP_TYPE (left), AOP_TYPE (right)));
+  DD (emitcode ("", "; Size res[%d] = l[%d]&r[%d]", AOP_SIZE (result), AOP_SIZE (left), AOP_SIZE (right)));
 #endif
 
   /* if left is a literal & right is not then exchange them */
@@ -5168,7 +6015,7 @@
     }
 
   /* if left is accumulator & right is not then exchange them */
-  if (AOP_TYPE (right) == AOP_REG && AOP_TYPE (left) != AOP_REG)
+  if (AOP_TYPE (right) == AOP_REG && !IS_AOP_WITH_A (AOP (left)))
     {
       operand *tmp = right;
       right = left;
@@ -5180,10 +6027,10 @@
 
   size = (AOP_SIZE (left) >= AOP_SIZE (right)) ? AOP_SIZE (left) : AOP_SIZE (right);
 
-  if (AOP_TYPE (result) == AOP_CRY
-      && size > 1
-      && (isOperandVolatile (left, FALSE) || isOperandVolatile (right, FALSE)))
+  if (AOP_TYPE (result) == AOP_CRY && size > 1 && (isOperandVolatile (left, FALSE) || isOperandVolatile (right, FALSE)))
     {
+      needpulla = pushRegIfSurv (hc08_reg_a);
+
       /* this generates ugly code, but meets volatility requirements */
       loadRegFromConst (hc08_reg_a, zero);
       pushReg (hc08_reg_a, TRUE);
@@ -5195,12 +6042,18 @@
           accopWithAop ("ora", AOP (right), offset);
           emitcode ("ora", "1,s");
           emitcode ("sta", "1,s");
+          regalloc_dry_run_cost += 6;
           offset++;
         }
 
       pullReg (hc08_reg_a);
       emitcode ("tsta", "");
+      regalloc_dry_run_cost++;
+
+      pullOrFreeReg (hc08_reg_a, needpulla);
+
       genIfxJump (ifx, "a");
+
       goto release;
     }
 
@@ -5208,17 +6061,19 @@
     {
       symbol *tlbl = NULL;
 
+      needpulla = pushRegIfSurv (hc08_reg_a);
+
       offset = 0;
       while (size--)
         {
-          bytemask = (lit >> (offset*8)) & 0xff;
+          bytemask = (lit >> (offset * 8)) & 0xff;
 
           if (AOP_TYPE (right) == AOP_LIT && bytemask == 0x00)
             {
               rmwWithAop ("tst", AOP (left), offset);
               if (size)
                 {
-                  if (!tlbl)
+                  if (!tlbl && !regalloc_dry_run)
                     tlbl = newiTempLabel (NULL);
                   emitBranch ("bne", tlbl);
                 }
@@ -5227,20 +6082,25 @@
             {
               loadRegFromAop (hc08_reg_a, AOP (left), offset);
               accopWithAop ("ora", AOP (right), offset);
-              hc08_freeReg( hc08_reg_a);
+              hc08_freeReg (hc08_reg_a);
               if (size)
                 {
-                  if (!tlbl)
+                  if (!tlbl && !regalloc_dry_run)
                     tlbl = newiTempLabel (NULL);
                   emitBranch ("bne", tlbl);
                 }
             }
           offset++;
         }
-        if (tlbl)
-          emitLabel (tlbl);
-        if(ifx)
-          genIfxJump (ifx, "a");
+      if (tlbl)
+        emitLabel (tlbl);
+
+      pullOrFreeReg (hc08_reg_a, needpulla);
+
+      if (ifx)
+        genIfxJump (ifx, "a");
+
+      goto release;
     }
 
   if (AOP_TYPE (right) == AOP_LIT)
@@ -5249,26 +6109,34 @@
   size = AOP_SIZE (result);
 
   if (sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic))) &&
-      (AOP_TYPE (right) == AOP_LIT) && isLiteralBit(lit) &&
-      (AOP_TYPE (left) == AOP_DIR))
+      (AOP_TYPE (right) == AOP_LIT) && isLiteralBit (lit) && (AOP_TYPE (left) == AOP_DIR))
     {
-      int bitpos = isLiteralBit(lit)-1;
-      emitcode ("bset","#%d,%s",bitpos & 7,
-                aopAdrStr (AOP (left), bitpos >> 3, FALSE));
+      int bitpos = isLiteralBit (lit) - 1;
+      emitcode ("bset", "#%d,%s", bitpos & 7, aopAdrStr (AOP (left), bitpos >> 3, FALSE));
+      regalloc_dry_run_cost += 2;
       goto release;
     }
 
+  needpulla = pushRegIfSurv (hc08_reg_a);
+
   offset = 0;
+  if (size >= 2 && IS_AOP_AX (AOP (left)))
+    {
+      pushReg (hc08_reg_a, TRUE);
+      earlystore = TRUE;
+    }
   while (size--)
     {
-      bytemask = (lit >> (offset*8)) & 0xff;
+      bytemask = (lit >> (offset * 8)) & 0xff;
 
+      if (earlystore && offset == 1)
+        pullReg (hc08_reg_a);
       if (AOP_TYPE (right) == AOP_LIT && bytemask == 0xff)
         {
           if (isOperandVolatile (left, FALSE))
             {
               loadRegFromAop (hc08_reg_a, AOP (left), offset);
-              hc08_freeReg( hc08_reg_a);
+              hc08_freeReg (hc08_reg_a);
             }
           transferAopAop (AOP (right), offset, AOP (result), offset);
         }
@@ -5283,9 +6151,15 @@
           storeRegToAop (hc08_reg_a, AOP (result), offset);
           hc08_freeReg (hc08_reg_a);
         }
+      if (AOP_TYPE (result) == AOP_REG && size && AOP (result)->aopu.aop_reg[offset]->rIdx == A_IDX)
+        {
+          pushReg (hc08_reg_a, TRUE);
+          needpulla = TRUE;
+        }
       offset++;
     }
 
+  pullOrFreeReg (hc08_reg_a, needpulla);
 
 release:
   freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
@@ -5294,27 +6168,25 @@
 }
 
 /*-----------------------------------------------------------------*/
-/* genXor - code for xclusive or                                   */
+/* genXor - code for Exclusive or                                  */
 /*-----------------------------------------------------------------*/
 static void
 genXor (iCode * ic, iCode * ifx)
 {
   operand *left, *right, *result;
   int size, offset = 0;
+  bool needpulla = FALSE;
+  bool earlystore = FALSE;
 
-  D(emitcode (";     genXor",""));
+  D (emitcode (";     genXor", ""));
 
   aopOp ((left = IC_LEFT (ic)), ic, FALSE);
   aopOp ((right = IC_RIGHT (ic)), ic, FALSE);
   aopOp ((result = IC_RESULT (ic)), ic, TRUE);
 
 #ifdef DEBUG_TYPE
-  DD(emitcode ("", "; Type res[%d] = l[%d]&r[%d]",
-            AOP_TYPE (result),
-            AOP_TYPE (left), AOP_TYPE (right)));
-  DD(emitcode ("", "; Size res[%d] = l[%d]&r[%d]",
-            AOP_SIZE (result),
-            AOP_SIZE (left), AOP_SIZE (right)));
+  DD (emitcode ("", "; Type res[%d] = l[%d]&r[%d]", AOP_TYPE (result), AOP_TYPE (left), AOP_TYPE (right)));
+  DD (emitcode ("", "; Size res[%d] = l[%d]&r[%d]", AOP_SIZE (result), AOP_SIZE (left), AOP_SIZE (right)));
 #endif
 
   /* if left is a literal & right is not ||
@@ -5327,27 +6199,30 @@
     }
 
   /* if left is accumulator & right is not then exchange them */
-  if (AOP_TYPE (right) == AOP_REG && AOP_TYPE (left) != AOP_REG)
+  if (AOP_TYPE (right) == AOP_REG && !IS_AOP_WITH_A (AOP (left)))
     {
       operand *tmp = right;
       right = left;
       left = tmp;
     }
 
+  needpulla = pushRegIfSurv (hc08_reg_a);
+
   if (AOP_TYPE (result) == AOP_CRY)
     {
       symbol *tlbl;
-      // this can just happen, if ifx has been optimized away
-      // wassertl (ifx, "AOP_CPY result without ifx");
 
-      tlbl = newiTempLabel (NULL);
+      tlbl = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
       size = (AOP_SIZE (left) >= AOP_SIZE (right)) ? AOP_SIZE (left) : AOP_SIZE (right);
       offset = 0;
       while (size--)
         {
           loadRegFromAop (hc08_reg_a, AOP (left), offset);
           if (AOP_TYPE (right) == AOP_LIT && ((ulFromVal (AOP (right)->aopu.aop_lit) >> (offset * 8)) & 0xff) == 0)
-            emitcode ("tsta", "");
+            {
+              emitcode ("tsta", "");
+              regalloc_dry_run_cost++;
+            }
           else
             accopWithAop ("eor", AOP (right), offset);
 
@@ -5361,116 +6236,138 @@
                *   multiple calls to emitLabel() ?!
                * and we can't genIfxJump, if there is none
                */
-              emitLabel (tlbl);
-              if(ifx)
+              if (!regalloc_dry_run)
+                emitLabel (tlbl);
+              pullOrFreeReg (hc08_reg_a, needpulla);
+              if (ifx)
                 genIfxJump (ifx, "a");
             }
           offset++;
         }
+      goto release;
     }
 
   size = AOP_SIZE (result);
   offset = 0;
+  if (size >= 2 && IS_AOP_AX (AOP (left)))
+    {
+      pushReg (hc08_reg_a, TRUE);
+      earlystore = TRUE;
+    }
   while (size--)
     {
+      if (earlystore && offset == 1)
+        pullReg (hc08_reg_a);
       loadRegFromAop (hc08_reg_a, AOP (left), offset);
       accopWithAop ("eor", AOP (right), offset);
-      storeRegToAop (hc08_reg_a, AOP (result), offset++);
+      storeRegToAop (hc08_reg_a, AOP (result), offset);
+      if (AOP_TYPE (result) == AOP_REG && size && AOP (result)->aopu.aop_reg[offset]->rIdx == A_IDX)
+        {
+          pushReg (hc08_reg_a, TRUE);
+          needpulla = TRUE;
+        }
       hc08_freeReg (hc08_reg_a);
+      offset++;
     }
 
-//release:
+  pullOrFreeReg (hc08_reg_a, needpulla);
+
+release:
+
   freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
   freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
   freeAsmop (result, NULL, ic, TRUE);
 }
 
-static void
-emitinline (iCode * ic, char *inlin)
+static const char *
+expand_symbols (iCode * ic, const char *inlin)
 {
-  char buffer[512];
-  char *symname;
-  char c;
-  char *bp=buffer;
-  symbol *sym, *tempsym;
-  asmop *aop;
-  char *l;
+  const char *begin = NULL, *p = inlin;
+  bool inIdent = FALSE;
+  struct dbuf_s dbuf;
 
-  while (*inlin)
+  dbuf_init (&dbuf, 128);
+
+  while (*p)
     {
-      if (*inlin == '_')
+      if (inIdent)
         {
-          symname = ++inlin;
-          while (isalnum((unsigned char)*inlin) || (*inlin == '_'))
-            inlin++;
-          c = *inlin;
-          *inlin = '\0';
-          //printf("Found possible symbol '%s'\n",symname);
-          tempsym = newSymbol (symname, ic->level);
-          tempsym->block = ic->block;
-          sym = (symbol *) findSymWithLevel(SymbolTab,tempsym);
-          *inlin = c;
-          if (!sym)
-            {
-              *bp++ = '_';
-              inlin = symname;
-            }
+          if ('_' == *p || isalnum (*p))
+            /* in the middle of identifier */
+            ++p;
           else
             {
-              aop = aopForSym (ic, sym, FALSE);
-              l = aopAdrStr (aop, aop->size - 1, TRUE);
-              if (*l=='#')
-                l++;
-              sym->isref = 1;
-              if (sym->level && !sym->allocreq && !sym->ismyparm)
+              /* end of identifier */
+              symbol *sym, *tempsym;
+              char *symname = Safe_strndup (p + 1, p - begin - 1);
+
+              inIdent = 0;
+
+              tempsym = newSymbol (symname, ic->level);
+              tempsym->block = ic->block;
+              sym = (symbol *) findSymWithLevel (SymbolTab, tempsym);
+              if (!sym)
                 {
-                  werror (E_ID_UNDEF, sym->name);
-                  werror (W_CONTINUE,
-                          "  Add 'volatile' to the variable declaration so that it\n"
-                          "  can be referenced within inline assembly");
+                  dbuf_append (&dbuf, begin, p - begin);
                 }
-              //printf("Replacing with '%s'\n",l);
-              while (*l)
+              else
                 {
-                  *bp++ = *l++;
-                  if ((2+bp-buffer)>sizeof(buffer))
-                    goto endofline;
+                  asmop *aop = aopForSym (ic, sym, FALSE);
+                  char *l = aopAdrStr (aop, aop->size - 1, TRUE);
+
+                  if ('#' == *l)
+                    l++;
+                  sym->isref = 1;
+                  if (sym->level && !sym->allocreq && !sym->ismyparm)
+                    {
+                      werror (E_ID_UNDEF, sym->name);
+                      werror (W_CONTINUE,
+                              "  Add 'volatile' to the variable declaration so that it\n"
+                              "  can be referenced within inline assembly");
+                    }
+                  dbuf_append_str (&dbuf, l);
                 }
+              Safe_free (symname);
+              begin = p++;
             }
         }
+      else if ('_' == *p)
+        {
+          /* begin of identifier */
+          inIdent = TRUE;
+          if (begin)
+            dbuf_append (&dbuf, begin, p - begin);
+          begin = p++;
+        }
       else
         {
-          *bp++ = *inlin++;
+          if (!begin)
+            begin = p;
+          p++;
         }
-      if ((2+bp-buffer)>sizeof(buffer))
-        goto endofline;
     }
 
-endofline:
-  *bp = '\0';
-
-  if ((2+bp-buffer)>sizeof(buffer))
-    fprintf(stderr, "Inline assembly buffer overflow\n");
+  if (begin)
+    dbuf_append (&dbuf, begin, p - begin);
 
-  //printf("%s\n",buffer);
-  emitcode (buffer,"");
+  return dbuf_detach_c_str (&dbuf);
 }
 
-
 /*-----------------------------------------------------------------*/
 /* genInline - write the inline code out                           */
 /*-----------------------------------------------------------------*/
 static void
-genInline (iCode * ic)
+hc08_genInline (iCode * ic)
 {
-  char *buffer, *bp, *bp1;
+  char *buf, *bp, *begin;
+  const char *expanded;
   bool inComment = FALSE;
 
-  D(emitcode (";     genInline",""));
+  D (emitcode (";", "genInline"));
 
-  _G.inLine += (!options.asmpeep);
+  genLine.lineElement.isInline += (!options.asmpeep);
 
-  buffer = bp = bp1 = Safe_strdup (IC_INLINE(ic));
+  buf = bp = begin = Safe_strdup (IC_INLINE (ic));
 
   /* emit each line as a code */
   while (*bp)
@@ -5486,31 +6383,40 @@
         case '\n':
           inComment = FALSE;
           *bp++ = '\0';
-          emitinline (ic, bp1);
-          bp1 = bp;
+          expanded = expand_symbols (ic, begin);
+          emitcode (expanded, NULL);
+          dbuf_free (expanded);
+          begin = bp;
           break;
 
         default:
           /* Add \n for labels, not dirs such as c:\mydir */
-          if (!inComment && (*bp == ':') && (isspace((unsigned char)bp[1])))
+          if (!inComment && (*bp == ':') && (isspace ((unsigned char) bp[1])))
             {
               ++bp;
               *bp = '\0';
               ++bp;
-              emitcode (bp1, "");
-              bp1 = bp;
+              emitcode (begin, NULL);
+              begin = bp;
             }
           else
             ++bp;
           break;
         }
     }
-  if (bp1 != bp)
-    emitinline (ic, bp1);
+  if (begin != bp)
+    {
+      expanded = expand_symbols (ic, begin);
+      emitcode (expanded, NULL);
+      dbuf_free (expanded);
+    }
+
+  Safe_free (buf);
 
-  Safe_free (buffer);
+  /* consumed; we can free it here */
+  dbuf_free (IC_INLINE (ic));
 
-  _G.inLine -= (!options.asmpeep);
+  genLine.lineElement.isInline -= (!options.asmpeep);
 }
 
 /*-----------------------------------------------------------------*/
@@ -5525,7 +6431,7 @@
   bool resultInA = FALSE;
   char *shift;
 
-  D(emitcode (";     genRRC",""));
+  D (emitcode (";     genRRC", ""));
 
   /* rotate right with carry */
   left = IC_LEFT (ic);
@@ -5533,20 +6439,19 @@
   aopOp (left, ic, FALSE);
   aopOp (result, ic, FALSE);
 
-  if ((AOP_TYPE (result) == AOP_REG)
-      && (AOP (result)->aopu.aop_reg[0]->rIdx == A_IDX))
-   resultInA = TRUE;
+  if ((AOP_TYPE (result) == AOP_REG) && (AOP (result)->aopu.aop_reg[0]->rIdx == A_IDX))
+    resultInA = TRUE;
 
   size = AOP_SIZE (result);
-  offset = size-1;
+  offset = size - 1;
 
-  shift="lsr";
+  shift = "lsr";
   if (sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic))))
     {
       while (size--)
         {
           rmwWithAop (shift, AOP (result), offset--);
-          shift="ror";
+          shift = "ror";
         }
     }
   else
@@ -5557,7 +6462,7 @@
           rmwWithReg (shift, hc08_reg_a);
           storeRegToAop (hc08_reg_a, AOP (result), offset--);
           hc08_freeReg (hc08_reg_a);
-          shift="ror";
+          shift = "ror";
         }
     }
 
@@ -5570,13 +6475,15 @@
   /* now we need to put the carry into the
      highest order byte of the result */
   offset = AOP_SIZE (result) - 1;
-  emitcode ("clra","");
-  emitcode ("rora","");
+  emitcode ("clra", "");
+  emitcode ("rora", "");
+  regalloc_dry_run_cost += 2;
   hc08_dirtyReg (hc08_reg_a, FALSE);
   if (resultInA)
     {
       emitcode ("ora", "1,s");
-      emitcode ("ais", "#1");
+      pullNull (1);
+      regalloc_dry_run_cost += 3;
       hc08_dirtyReg (hc08_reg_a, FALSE);
       needpula = FALSE;
     }
@@ -5602,7 +6509,7 @@
   bool resultInA = FALSE;
   bool needpula = FALSE;
 
-  D(emitcode (";     genRLC",""));
+  D (emitcode (";     genRLC", ""));
 
   /* rotate right with carry */
   left = IC_LEFT (ic);
@@ -5610,20 +6517,19 @@
   aopOp (left, ic, FALSE);
   aopOp (result, ic, FALSE);
 
-  if ((AOP_TYPE (result) == AOP_REG)
-      && (AOP (result)->aopu.aop_reg[0]->rIdx == A_IDX))
-   resultInA = TRUE;
+  if ((AOP_TYPE (result) == AOP_REG) && (AOP (result)->aopu.aop_reg[0]->rIdx == A_IDX))
+    resultInA = TRUE;
 
   size = AOP_SIZE (result);
   offset = 0;
 
-  shift="lsl";
+  shift = "lsl";
   if (sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic))))
     {
       while (size--)
         {
-          rmwWithAop (shift, AOP (result), offset--);
-          shift="rol";
+          rmwWithAop (shift, AOP (result), offset++);
+          shift = "rol";
         }
     }
   else
@@ -5634,7 +6540,7 @@
           rmwWithReg (shift, hc08_reg_a);
           storeRegToAop (hc08_reg_a, AOP (result), offset++);
           hc08_freeReg (hc08_reg_a);
-          shift="rol";
+          shift = "rol";
         }
     }
 
@@ -5647,13 +6553,15 @@
   /* now we need to put the carry into the
      lowest order byte of the result */
   offset = 0;
-  emitcode ("clra","");
-  emitcode ("rola","");
+  emitcode ("clra", "");
+  emitcode ("rola", "");
+  regalloc_dry_run_cost += 2;
   hc08_dirtyReg (hc08_reg_a, FALSE);
   if (resultInA)
     {
       emitcode ("ora", "1,s");
-      emitcode ("ais", "#1");
+      pullNull (1);
+      regalloc_dry_run_cost += 3;
       hc08_dirtyReg (hc08_reg_a, FALSE);
       needpula = FALSE;
     }
@@ -5674,8 +6582,9 @@
 genGetHbit (iCode * ic)
 {
   operand *left, *result;
+  bool needpulla;
 
-  D(emitcode (";     genGetHbit",""));
+  D (emitcode (";     genGetHbit", ""));
 
   left = IC_LEFT (ic);
   result = IC_RESULT (ic);
@@ -5683,16 +6592,154 @@
   aopOp (result, ic, FALSE);
 
   /* get the highest order byte into a */
+  needpulla = pushRegIfSurv (hc08_reg_a);
   loadRegFromAop (hc08_reg_a, AOP (left), AOP_SIZE (left) - 1);
   emitcode ("rola", "");
   emitcode ("clra", "");
   emitcode ("rola", "");
+  regalloc_dry_run_cost += 3;
   hc08_dirtyReg (hc08_reg_a, FALSE);
   storeRegToFullAop (hc08_reg_a, AOP (result), FALSE);
-  hc08_freeReg (hc08_reg_a);
+  pullOrFreeReg (hc08_reg_a, needpulla);
+
+  freeAsmop (left, NULL, ic, TRUE);
+  freeAsmop (result, NULL, ic, TRUE);
+}
+
+
+/*-----------------------------------------------------------------*/
+/* genGetAbit - generates code get a single bit                    */
+/*-----------------------------------------------------------------*/
+static void
+genGetAbit (iCode * ic)
+{
+  operand *left, *right, *result;
+  int shCount;
+  bool needpulla;
+
+  D (emitcode (";     genGetAbit", ""));
+
+  left = IC_LEFT (ic);
+  right = IC_RIGHT (ic);
+  result = IC_RESULT (ic);
+  aopOp (left, ic, FALSE);
+  aopOp (right, ic, FALSE);
+  aopOp (result, ic, FALSE);
+
+  shCount = (int) ulFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit);
+
+  needpulla = pushRegIfSurv (hc08_reg_a);
+
+  /* get the needed byte into a */
+  loadRegFromAop (hc08_reg_a, AOP (left), shCount / 8);
+  shCount %= 8;
+  if (AOP_TYPE (result) == AOP_CRY)
+    {
+      emitcode ("and", "#0x%02x", 1 << shCount);
+      regalloc_dry_run_cost += 2;
+      hc08_dirtyReg (hc08_reg_a, FALSE);
+    }
+  else
+    {
+      switch (shCount)
+        {
+        case 3:
+          emitcode ("lsra", "");
+          regalloc_dry_run_cost++;
+          //fallthrough
+        case 2:
+          emitcode ("lsra", "");
+          regalloc_dry_run_cost++;
+          //fallthrough
+        case 1:
+          emitcode ("lsra", "");
+          regalloc_dry_run_cost++;
+          //fallthrough
+        case 0:
+          emitcode ("and", "#0x01");
+          regalloc_dry_run_cost += 2;
+          break;
+        case 4:
+          emitcode ("nsa", "");
+          emitcode ("and", "#0x01");
+          regalloc_dry_run_cost += 3;
+          break;
+        case 5:
+          emitcode ("rola", "");
+          regalloc_dry_run_cost++;
+          //fallthrough
+        case 6:
+          emitcode ("rola", "");
+          regalloc_dry_run_cost++;
+          //fallthrough
+        case 7:
+          emitcode ("rola", "");
+          emitcode ("clra", "");
+          emitcode ("rola", "");
+          regalloc_dry_run_cost += 3;
+          break;
+        }
+      hc08_dirtyReg (hc08_reg_a, FALSE);
+      storeRegToFullAop (hc08_reg_a, AOP (result), FALSE);
+    }
+  pullOrFreeReg (hc08_reg_a, needpulla);
+
+  freeAsmop (result, NULL, ic, TRUE);
+  freeAsmop (right, NULL, ic, TRUE);
+  freeAsmop (left, NULL, ic, TRUE);
+}
+
+/*-----------------------------------------------------------------*/
+/* genGetByte - generates code get a single byte                   */
+/*-----------------------------------------------------------------*/
+static void
+genGetByte (iCode * ic)
+{
+  operand *left, *right, *result;
+  int offset;
+
+  D (emitcode (";", "genGetByte"));
+
+  left = IC_LEFT (ic);
+  right = IC_RIGHT (ic);
+  result = IC_RESULT (ic);
+  aopOp (left, ic, FALSE);
+  aopOp (right, ic, FALSE);
+  aopOp (result, ic, FALSE);
+
+  offset = (int) ulFromVal (AOP (right)->aopu.aop_lit) / 8;
+  transferAopAop (AOP (left), offset, AOP (result), 0);
 
+  freeAsmop (result, NULL, ic, TRUE);
+  freeAsmop (right, NULL, ic, TRUE);
   freeAsmop (left, NULL, ic, TRUE);
+}
+
+/*-----------------------------------------------------------------*/
+/* genGetWord - generates code get two bytes                       */
+/*-----------------------------------------------------------------*/
+static void
+genGetWord (iCode * ic)
+{
+  operand *left, *right, *result;
+  int offset;
+
+  D (emitcode (";", "genGetWord"));
+
+  left = IC_LEFT (ic);
+  right = IC_RIGHT (ic);
+  result = IC_RESULT (ic);
+  aopOp (left, ic, FALSE);
+  aopOp (right, ic, FALSE);
+  aopOp (result, ic, FALSE);
+
+  offset = (int) ulFromVal (AOP (right)->aopu.aop_lit) / 8;
+  transferAopAop (AOP (left), offset + 1, AOP (result), 1);
+  transferAopAop (AOP (left), offset, AOP (result), 0);
+
   freeAsmop (result, NULL, ic, TRUE);
+  freeAsmop (right, NULL, ic, TRUE);
+  freeAsmop (left, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
@@ -5702,8 +6749,9 @@
 genSwap (iCode * ic)
 {
   operand *left, *result;
+  bool needpulla;
 
-  D(emitcode (";     genSwap",""));
+  D (emitcode (";     genSwap", ""));
 
   left = IC_LEFT (ic);
   result = IC_RESULT (ic);
@@ -5712,21 +6760,35 @@
 
   switch (AOP_SIZE (left))
     {
-    case 1: /* swap nibbles in byte */
+    case 1:                    /* swap nibbles in byte */
+      needpulla = pushRegIfSurv (hc08_reg_a);
       loadRegFromAop (hc08_reg_a, AOP (left), 0);
       emitcode ("nsa", "");
+      regalloc_dry_run_cost++;
       hc08_dirtyReg (hc08_reg_a, FALSE);
       storeRegToAop (hc08_reg_a, AOP (result), 0);
-      hc08_freeReg (hc08_reg_a);
+      pullOrFreeReg (hc08_reg_a, needpulla);
       break;
-    case 2: /* swap bytes in a word */
-      if (operandsEqu (left, result) || sameRegs (AOP (left), AOP (result)))
+    case 2:                    /* swap bytes in a word */
+      if (IS_AOP_XA (AOP (left)) && IS_AOP_AX (AOP (result)) ||
+        IS_AOP_AX (AOP (left)) && IS_AOP_XA (AOP (result)))
+        break;
+      if (AOP_TYPE (result) == AOP_REG && AOP_TYPE (left) == AOP_REG)
+        {
+          if (AOP (result)->aopu.aop_reg[1] != AOP (left)->aopu.aop_reg[0]);
+            pushReg (AOP (left)->aopu.aop_reg[0], TRUE);
+          storeRegToAop (AOP (left)->aopu.aop_reg[1], AOP (result), 0);
+          if (AOP (result)->aopu.aop_reg[1] != AOP (left)->aopu.aop_reg[0]);
+            pullReg (AOP (result)->aopu.aop_reg[1]);
+        }
+      else if (operandsEqu (left, result) || sameRegs (AOP (left), AOP (result)))
         {
+          needpulla = pushRegIfSurv (hc08_reg_a);
           loadRegFromAop (hc08_reg_a, AOP (left), 0);
           hc08_useReg (hc08_reg_a);
           transferAopAop (AOP (left), 1, AOP (result), 0);
           storeRegToAop (hc08_reg_a, AOP (result), 1);
-          hc08_freeReg (hc08_reg_a);
+          pullOrFreeReg (hc08_reg_a, needpulla);
         }
       else
         {
@@ -5735,7 +6797,7 @@
         }
       break;
     default:
-      wassertl(FALSE, "unsupported SWAP operand size");
+      wassertl (FALSE, "unsupported SWAP operand size");
     }
 
   freeAsmop (left, NULL, ic, TRUE);
@@ -5834,10 +6896,10 @@
       return;
     }
 
-    /* lsla is only 1 cycle and byte, so an unrolled loop is often  */
-    /* the fastest (shCount<6) and shortest (shCount<4).            */
-    for (i=0;i<shCount;i++)
-      accopWithMisc ("lsla", "");
+  /* lsla is only 1 cycle and byte, so an unrolled loop is often  */
+  /* the fastest (shCount<6) and shortest (shCount<4).            */
+  for (i = 0; i < shCount; i++)
+    accopWithMisc ("lsla", "");
 }
 
 
@@ -5860,8 +6922,8 @@
       return;
     }
 
-    for (i=0;i<shCount;i++)
-      accopWithMisc ("asra", "");
+  for (i = 0; i < shCount; i++)
+    accopWithMisc ("asra", "");
 }
 
 /*-----------------------------------------------------------------*/
@@ -5915,10 +6977,10 @@
       return;
     }
 
-    /* lsra is only 1 cycle and byte, so an unrolled loop is often  */
-    /* the fastest (shCount<6) and shortest (shCount<4).            */
-    for (i=0;i<shCount;i++)
-      accopWithMisc ("lsra", "");
+  /* lsra is only 1 cycle and byte, so an unrolled loop is often  */
+  /* the fastest (shCount<6) and shortest (shCount<4).            */
+  for (i = 0; i < shCount; i++)
+    accopWithMisc ("lsra", "");
 }
 
 
@@ -5932,9 +6994,9 @@
 
   shCount &= 0x000f;            // shCount : 0..15
 
-  if (shCount>=8)
+  if (shCount >= 8)
     {
-      AccLsh (shCount-8);
+      AccLsh (shCount - 8);
       transferRegReg (hc08_reg_a, hc08_reg_x, FALSE);
       loadRegFromConst (hc08_reg_a, zero);
       return;
@@ -5945,14 +7007,14 @@
     {
     case 7:
       /*          bytes  cycles     reg x      reg a   carry
-      **                          abcd efgh  ijkl mnop   ?
-      **   lsrx       1  1        0abc defg  ijkl mnop   h
-      **   rora       1  1        0abc defg  hijk lmno   p
-      **   tax        1  1        hijk lmno  hijk lmno   p
-      **   clra       1  1        hijk lmno  0000 0000   p
-      **   rora       1  1        hijk lmno  p000 0000   0
-      ** total: 5 cycles, 5 bytes (beats 14 cycles, 14 bytes)
-      */
+       **                          abcd efgh  ijkl mnop   ?
+       **   lsrx       1  1        0abc defg  ijkl mnop   h
+       **   rora       1  1        0abc defg  hijk lmno   p
+       **   tax        1  1        hijk lmno  hijk lmno   p
+       **   clra       1  1        hijk lmno  0000 0000   p
+       **   rora       1  1        hijk lmno  p000 0000   0
+       ** total: 5 cycles, 5 bytes (beats 14 cycles, 14 bytes)
+       */
       rmwWithReg ("lsr", hc08_reg_x);
       rmwWithReg ("ror", hc08_reg_a);
       transferRegReg (hc08_reg_a, hc08_reg_x, FALSE);
@@ -5966,7 +7028,7 @@
 
   /* lsla/rolx is only 2 cycles and bytes, so an unrolled loop is often  */
   /* the fastest and shortest.                                           */
-  for (i=0;i<shCount;i++)
+  for (i = 0; i < shCount; i++)
     {
       rmwWithReg ("lsl", hc08_reg_a);
       rmwWithReg ("rol", hc08_reg_x);
@@ -5988,14 +7050,14 @@
     {
     case 15:
       /*          bytes  cycles     reg x      reg a   carry
-      **                          abcd efgh  ijkl mnop   ?
-      **   lslx       1  1        bcde fgh0  ijkl mnop   a
-      **   clra       1  1        bcde fgh0  0000 0000   a
-      **   rola       1  1        bcde fgh0  0000 000a   0
-      **   nega       1  1        bcde fgh0  aaaa aaaa   a
-      **   tax        1  1        aaaa aaaa  aaaa aaaa   a
-      ** total: 5 cycles, 5 bytes
-      */
+       **                          abcd efgh  ijkl mnop   ?
+       **   lslx       1  1        bcde fgh0  ijkl mnop   a
+       **   clra       1  1        bcde fgh0  0000 0000   a
+       **   rola       1  1        bcde fgh0  0000 000a   0
+       **   nega       1  1        bcde fgh0  aaaa aaaa   a
+       **   tax        1  1        aaaa aaaa  aaaa aaaa   a
+       ** total: 5 cycles, 5 bytes
+       */
       rmwWithReg ("lsl", hc08_reg_x);
       loadRegFromConst (hc08_reg_a, zero);
       rmwWithReg ("rol", hc08_reg_a);
@@ -6011,18 +7073,18 @@
     case 9:
     case 8:
       /*          bytes  cycles     reg x      reg a   carry
-      **                          abcd efgh  ijkl mnop   ?
-      **   txa        1  1        abcd efgh  abcd efgh   ?
-      **   (AccSRsh) <8 <8        abcd efgh  LSBresult   ?
-      **   lsla       1  1        abcd efgh  ???? ????   a
-      **   clrx       1  1        0000 0000  ???? ????   a
-      **   rolx       1  1        0000 000a  ???? ????   0
-      **   negx       1  1        aaaa aaaa  ???? ????   a
-      **   rora       1  1        aaaa aaaa  LSBresult   0
-      ** total: n-2 cycles, n-2 bytes (beats 2n cycles, 2n bytes (for n>=8))
-      */
+       **                          abcd efgh  ijkl mnop   ?
+       **   txa        1  1        abcd efgh  abcd efgh   ?
+       **   (AccSRsh) <8 <8        abcd efgh  LSBresult   ?
+       **   lsla       1  1        abcd efgh  ???? ????   a
+       **   clrx       1  1        0000 0000  ???? ????   a
+       **   rolx       1  1        0000 000a  ???? ????   0
+       **   negx       1  1        aaaa aaaa  ???? ????   a
+       **   rora       1  1        aaaa aaaa  LSBresult   0
+       ** total: n-2 cycles, n-2 bytes (beats 2n cycles, 2n bytes (for n>=8))
+       */
       transferRegReg (hc08_reg_x, hc08_reg_a, FALSE);
-      AccSRsh (shCount-8);
+      AccSRsh (shCount - 8);
       rmwWithReg ("lsl", hc08_reg_a);
       loadRegFromConst (hc08_reg_x, zero);
       rmwWithReg ("rol", hc08_reg_x);
@@ -6036,7 +7098,7 @@
 
   /* asrx/rora is only 2 cycles and bytes, so an unrolled loop is often  */
   /* the fastest and shortest.                                           */
-  for (i=0;i<shCount;i++)
+  for (i = 0; i < shCount; i++)
     {
       rmwWithReg ("asr", hc08_reg_x);
       rmwWithReg ("ror", hc08_reg_a);
@@ -6064,13 +7126,13 @@
     {
     case 15:
       /*          bytes  cycles     reg x      reg a   carry
-      **                          abcd efgh  ijkl mnop   ?
-      **   clra       1  1        abcd efgh  0000 0000   a
-      **   lslx       1  1        bcde fgh0  0000 0000   a
-      **   rola       1  1        bcde fgh0  0000 000a   0
-      **   clrx       1  1        0000 0000  0000 000a   0
-      ** total: 4 cycles, 4 bytes
-      */
+       **                          abcd efgh  ijkl mnop   ?
+       **   clra       1  1        abcd efgh  0000 0000   a
+       **   lslx       1  1        bcde fgh0  0000 0000   a
+       **   rola       1  1        bcde fgh0  0000 000a   0
+       **   clrx       1  1        0000 0000  0000 000a   0
+       ** total: 4 cycles, 4 bytes
+       */
       loadRegFromConst (hc08_reg_x, zero);
       rmwWithReg ("lsl", hc08_reg_x);
       rmwWithReg ("rol", hc08_reg_a);
@@ -6079,15 +7141,15 @@
 
     case 14:
       /*          bytes  cycles     reg x      reg a   carry
-      **                          abcd efgh  ijkl mnop   ?
-      **   clra       1  1        abcd efgh  0000 0000   a
-      **   lslx       1  1        bcde fgh0  0000 0000   a
-      **   rola       1  1        bcde fgh0  0000 000a   0
-      **   lslx       1  1        cdef gh00  0000 000a   b
-      **   rola       1  1        cdef gh00  0000 00ab   0
-      **   clrx       1  1        0000 0000  0000 00ab   0
-      ** total: 6 cycles, 6 bytes
-      */
+       **                          abcd efgh  ijkl mnop   ?
+       **   clra       1  1        abcd efgh  0000 0000   a
+       **   lslx       1  1        bcde fgh0  0000 0000   a
+       **   rola       1  1        bcde fgh0  0000 000a   0
+       **   lslx       1  1        cdef gh00  0000 000a   b
+       **   rola       1  1        cdef gh00  0000 00ab   0
+       **   clrx       1  1        0000 0000  0000 00ab   0
+       ** total: 6 cycles, 6 bytes
+       */
       loadRegFromConst (hc08_reg_x, zero);
       rmwWithReg ("lsl", hc08_reg_x);
       rmwWithReg ("rol", hc08_reg_a);
@@ -6103,20 +7165,20 @@
     case 9:
     case 8:
       transferRegReg (hc08_reg_x, hc08_reg_a, FALSE);
-      AccRsh (shCount-8, FALSE);
+      AccRsh (shCount - 8, FALSE);
       loadRegFromConst (hc08_reg_x, zero);
       return;
 
     case 7:
       /*          bytes  cycles     reg x      reg a   carry
-      **                          abcd efgh  ijkl mnop   ?
-      **   lsla       1  1        abcd efgh  jklm nop0   i
-      **   txa        1  1        abcd efgh  abcd efgh   i
-      **   rola       1  1        abcd efgh  bcde fghi   a
-      **   clrx       1  1        0000 0000  bcde fghi   a
-      **   rolx       1  1        0000 000a  bcde fghi   0
-      ** total: 5 cycles, 5 bytes (beats 14 cycles, 14 bytes)
-      */
+       **                          abcd efgh  ijkl mnop   ?
+       **   lsla       1  1        abcd efgh  jklm nop0   i
+       **   txa        1  1        abcd efgh  abcd efgh   i
+       **   rola       1  1        abcd efgh  bcde fghi   a
+       **   clrx       1  1        0000 0000  bcde fghi   a
+       **   rolx       1  1        0000 000a  bcde fghi   0
+       ** total: 5 cycles, 5 bytes (beats 14 cycles, 14 bytes)
+       */
       rmwWithReg ("lsl", hc08_reg_a);
       transferRegReg (hc08_reg_x, hc08_reg_a, FALSE);
       rmwWithReg ("rol", hc08_reg_a);
@@ -6125,25 +7187,25 @@
       return;
     case 6:
       /*          bytes  cycles     reg x      reg a   carry
-      **                          abcd efgh  ijkl mnop   ?
-      **   lsla       1  1        abcd efgh  jklm nop0   i
-      **   rolx       1  1        bcde fghi  jklm nop0   a
-      **   rola       1  1        bcde fghi  klmn op0a   j
-      **   rolx       1  1        cdef ghij  klmn op0a   b
-      **   rola       1  1        cdef ghij  lmno p0ab   k
-      **   and #3     2  2        cdef ghij  0000 00ab   k
-      **   psha       1  2        cdef ghij  0000 00ab   k
-      **   txa        1  1        cdef ghij  cdef ghij   k
-      **   pula       1  2        0000 00ab  cdef ghij   k
-      ** total: 12 cycles, 10 bytes (beats 12 bytes)
-      */
+       **                          abcd efgh  ijkl mnop   ?
+       **   lsla       1  1        abcd efgh  jklm nop0   i
+       **   rolx       1  1        bcde fghi  jklm nop0   a
+       **   rola       1  1        bcde fghi  klmn op0a   j
+       **   rolx       1  1        cdef ghij  klmn op0a   b
+       **   rola       1  1        cdef ghij  lmno p0ab   k
+       **   and #3     2  2        cdef ghij  0000 00ab   k
+       **   psha       1  2        cdef ghij  0000 00ab   k
+       **   txa        1  1        cdef ghij  cdef ghij   k
+       **   pula       1  2        0000 00ab  cdef ghij   k
+       ** total: 12 cycles, 10 bytes (beats 12 bytes)
+       */
     default:
       ;
     }
 
   /* lsrx/rora is only 2 cycles and bytes, so an unrolled loop is often  */
   /* the fastest and shortest.                                           */
-  for (i=0;i<shCount;i++)
+  for (i = 0; i < shCount; i++)
     {
       rmwWithReg ("lsr", hc08_reg_x);
       rmwWithReg ("ror", hc08_reg_a);
@@ -6152,41 +7214,25 @@
 }
 
 
-#if 0
-/*-----------------------------------------------------------------*/
-/* shiftR1Left2Result - shift right one byte from left to result   */
-/*-----------------------------------------------------------------*/
-static void
-shiftR1Left2Result (operand * left, int offl,
-                    operand * result, int offr,
-                    int shCount, int sign)
-{
-  loadRegFromAop (hc08_reg_a, AOP (left), offl);
-  /* shift right accumulator */
-  AccRsh (shCount, sign);
-  storeRegToAop (hc08_reg_a, AOP (result), offr);
-}
-#endif
-
 /*-----------------------------------------------------------------*/
 /* shiftL1Left2Result - shift left one byte from left to result    */
 /*-----------------------------------------------------------------*/
 static void
-shiftL1Left2Result (operand * left, int offl,
-                    operand * result, int offr, int shCount)
+shiftL1Left2Result (operand * left, int offl, operand * result, int offr, int shCount)
 {
+  bool needpulla = pushRegIfSurv (hc08_reg_a);
   loadRegFromAop (hc08_reg_a, AOP (left), offl);
   /* shift left accumulator */
   AccLsh (shCount);
   storeRegToAop (hc08_reg_a, AOP (result), offr);
+  pullOrFreeReg (hc08_reg_a, needpulla);
 }
 
 /*-----------------------------------------------------------------*/
 /* movLeft2Result - move byte from left to result                  */
 /*-----------------------------------------------------------------*/
 static void
-movLeft2Result (operand * left, int offl,
-                operand * result, int offr, int sign)
+movLeft2Result (operand * left, int offl, operand * result, int offr, int sign)
 {
   if (!sameRegs (AOP (left), AOP (result)) || (offl != offr))
     {
@@ -6199,8 +7245,7 @@
 /* shiftL2Left2Result - shift left two bytes from left to result   */
 /*-----------------------------------------------------------------*/
 static void
-shiftL2Left2Result (operand * left, int offl,
-                    operand * result, int offr, int shCount)
+shiftL2Left2Result (operand * left, int offl, operand * result, int offr, int shCount)
 {
   int i;
   bool needpula = FALSE;
@@ -6219,19 +7264,19 @@
 
   switch (shCount)
     {
-      case 7:
-        rmwWithReg ("lsr", hc08_reg_x);
-        rmwWithReg ("ror", hc08_reg_a);
-        transferRegReg (hc08_reg_a, hc08_reg_x, FALSE);
-        rmwWithReg ("clr", hc08_reg_a);
-        rmwWithReg ("ror", hc08_reg_a);
-        break;
-      default:
-        for (i=0; i<shCount; i++)
-          {
-            rmwWithReg ("lsl", hc08_reg_a);
-            rmwWithReg ("rol", hc08_reg_x);
-          }
+    case 7:
+      rmwWithReg ("lsr", hc08_reg_x);
+      rmwWithReg ("ror", hc08_reg_a);
+      transferRegReg (hc08_reg_a, hc08_reg_x, FALSE);
+      rmwWithReg ("clr", hc08_reg_a);
+      rmwWithReg ("ror", hc08_reg_a);
+      break;
+    default:
+      for (i = 0; i < shCount; i++)
+        {
+          rmwWithReg ("lsl", hc08_reg_a);
+          rmwWithReg ("rol", hc08_reg_x);
+        }
     }
   storeRegToAop (hc08_reg_xa, AOP (result), offr);
 
@@ -6241,63 +7286,12 @@
 }
 
 
-#if 0
-/*-----------------------------------------------------------------*/
-/* shiftR2Left2Result - shift right two bytes from left to result  */
-/*-----------------------------------------------------------------*/
-static void
-shiftR2Left2Result (operand * left, int offl,
-                    operand * result, int offr,
-                    int shCount, int sign)
-{
-  int i;
-  bool needpula = FALSE;
-  bool needpulx = FALSE;
-
-  needpula = pushRegIfUsed (hc08_reg_a);
-  needpulx = pushRegIfUsed (hc08_reg_x);
-
-  loadRegFromAop (hc08_reg_xa, AOP (left), offl);
-  for (i=0; i<shCount; i++)
-    {
-      if (sign)
-        rmwWithReg ("asr", hc08_reg_x);
-      else
-        rmwWithReg ("lsr", hc08_reg_x);
-      rmwWithReg ("ror", hc08_reg_a);
-    }
-  storeRegToAop (hc08_reg_xa, AOP (result), offl);
-
-  pullOrFreeReg (hc08_reg_x, needpulx);
-  pullOrFreeReg (hc08_reg_a, needpula);
-}
-#endif
-
-#if 0
-/*-----------------------------------------------------------------*/
-/* shiftLLeftOrResult - shift left one byte from left, or to result */
-/*-----------------------------------------------------------------*/
-static void
-shiftLLeftOrResult (operand * left, int offl,
-                    operand * result, int offr, int shCount)
-{
-  loadRegFromAop (hc08_reg_a, AOP (left), offl);
-  /* shift left accumulator */
-  AccLsh (shCount);
-  /* or with result */
-  accopWithAop ("ora", AOP (result), offr);
-  /* back to result */
-  storeRegToAop (hc08_reg_a, AOP (result), offr);
-  hc08_freeReg (hc08_reg_a);
-}
-#endif
 
 /*-----------------------------------------------------------------*/
 /* shiftRLeftOrResult - shift right one byte from left,or to result */
 /*-----------------------------------------------------------------*/
 static void
-shiftRLeftOrResult (operand * left, int offl,
-                    operand * result, int offr, int shCount)
+shiftRLeftOrResult (operand * left, int offl, operand * result, int offr, int shCount)
 {
   loadRegFromAop (hc08_reg_a, AOP (left), offl);
   /* shift left accumulator */
@@ -6315,7 +7309,7 @@
 static void
 genlshOne (operand * result, operand * left, int shCount)
 {
-  D(emitcode (";     genlshOne",""));
+  D (emitcode (";     genlshOne", ""));
 
   shiftL1Left2Result (left, LSB, result, LSB, shCount);
 }
@@ -6327,8 +7321,9 @@
 genlshTwo (operand * result, operand * left, int shCount)
 {
   int size;
+  bool needpulla, needpullx;
 
-  D(emitcode (";     genlshTwo",""));
+  D (emitcode (";     genlshTwo", ""));
 
 
   size = getDataSize (result);
@@ -6338,21 +7333,27 @@
     {
       shCount -= 8;
 
+      needpulla = pushRegIfSurv (hc08_reg_a);
       if (size > 1)
         {
           loadRegFromAop (hc08_reg_a, AOP (left), 0);
           AccLsh (shCount);
           storeRegToAop (hc08_reg_a, AOP (result), 1);
         }
-      storeConstToAop(zero, AOP (result), LSB);
+      storeConstToAop (zero, AOP (result), LSB);
+      pullOrFreeReg (hc08_reg_a, needpulla);
     }
 
   /*  1 <= shCount <= 7 */
   else
     {
+      needpulla = pushRegIfSurv (hc08_reg_a);
+      needpullx = pushRegIfSurv (hc08_reg_x);
       loadRegFromAop (hc08_reg_xa, AOP (left), 0);
       XAccLsh (shCount);
       storeRegToFullAop (hc08_reg_xa, AOP (result), 0);
+      pullOrFreeReg (hc08_reg_x, needpullx);
+      pullOrFreeReg (hc08_reg_a, needpulla);
     }
 }
 
@@ -6376,21 +7377,21 @@
   rmwWithReg ("lsl", hc08_reg_a);
   rmwWithReg ("rol", hc08_reg_x);
 
-  if (offr==LSB)
+  if (offr == LSB)
     {
       storeRegToAop (hc08_reg_xa, AOP (result), offr);
       loadRegFromAop (hc08_reg_xa, AOP (left), MSB24);
       rmwWithReg ("rol", hc08_reg_a);
       rmwWithReg ("rol", hc08_reg_x);
-      storeRegToAop (hc08_reg_xa, AOP (result), offr+2);
+      storeRegToAop (hc08_reg_xa, AOP (result), offr + 2);
     }
-  else if (offr==MSB16)
+  else if (offr == MSB16)
     {
       storeRegToAop (hc08_reg_a, AOP (result), offr);
       loadRegFromAop (hc08_reg_a, AOP (left), MSB24);
-      storeRegToAop (hc08_reg_x, AOP (result), offr+1);
+      storeRegToAop (hc08_reg_x, AOP (result), offr + 1);
       rmwWithReg ("rol", hc08_reg_a);
-      storeRegToAop (hc08_reg_a, AOP (result), offr+2);
+      storeRegToAop (hc08_reg_a, AOP (result), offr + 2);
       storeConstToAop (zero, AOP (result), 0);
     }
 
@@ -6406,7 +7407,7 @@
 {
   int size;
 
-  D(emitcode (";     genlshFour",""));
+  D (emitcode (";     genlshFour", ""));
 
   size = AOP_SIZE (result);
 
@@ -6459,7 +7460,8 @@
             movLeft2Result (left, LSB, result, MSB16, 0);
         }
       else
-        {                       /* size = 4 */
+        {
+          /* size = 4 */
           if (shCount == 0)
             {
               movLeft2Result (left, MSB24, result, MSB32, 0);
@@ -6499,15 +7501,12 @@
 /* genLeftShiftLiteral - left shifting by known count              */
 /*-----------------------------------------------------------------*/
 static void
-genLeftShiftLiteral (operand * left,
-                     operand * right,
-                     operand * result,
-                     iCode * ic)
+genLeftShiftLiteral (operand * left, operand * right, operand * result, iCode * ic)
 {
   int shCount = (int) ulFromVal (AOP (right)->aopu.aop_lit);
   int size;
 
-  D(emitcode (";     genLeftShiftLiteral",""));
+  D (emitcode (";     genLeftShiftLiteral", ""));
 
   freeAsmop (right, NULL, ic, TRUE);
 
@@ -6518,14 +7517,12 @@
   size = AOP_SIZE (result);
 
 #if VIEW_SIZE
-  DD(emitcode ("; shift left ", "result %d, left %d", size,
-            AOP_SIZE (left)));
+  DD (emitcode ("; shift left ", "result %d, left %d", size, AOP_SIZE (left)));
 #endif
 
   if (shCount == 0)
     {
-      while (size--)
-        transferAopAop( AOP(left), size, AOP(result), size);
+      genCopy (result, left);
     }
   else if (shCount >= (size * 8))
     {
@@ -6548,8 +7545,7 @@
           genlshFour (result, left, shCount);
           break;
         default:
-          werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
-                  "*** ack! mystery literal shift!\n");
+          werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "*** ack! mystery literal shift!\n");
           break;
         }
     }
@@ -6568,8 +7564,10 @@
   symbol *tlbl, *tlbl1;
   char *shift;
   asmop *aopResult;
+  bool needpullcountreg;
+  reg_info *countreg = NULL;
 
-  D(emitcode (";     genLeftShift",""));
+  D (emitcode (";     genLeftShift", ""));
 
   right = IC_RIGHT (ic);
   left = IC_LEFT (ic);
@@ -6595,13 +7593,21 @@
   aopOp (left, ic, FALSE);
   aopResult = AOP (result);
 
-  if (sameRegs(AOP (right), AOP (result)) || IS_AOP_XA (AOP (result))
-      || isOperandVolatile (result, FALSE))
-    aopResult = forceStackedAop (AOP (result), sameRegs ( AOP (left), AOP (result)));
+  if (sameRegs (AOP (right), AOP (result)) || IS_AOP_XA (AOP (result)) || isOperandVolatile (result, FALSE))
+    aopResult = forceStackedAop (AOP (result), sameRegs (AOP (left), AOP (result)));
 
   /* now move the left to the result if they are not the
      same */
-  if (!sameRegs (AOP (left), aopResult))
+  if (IS_AOP_HX (AOP (result)))
+    loadRegFromAop (hc08_reg_hx, AOP (left), 0);
+  else if (IS_AOP_AX (AOP (result)) && IS_AOP_XA (AOP (left)) || IS_AOP_XA (AOP (result)) && IS_AOP_AX (AOP (left)))
+    {
+      pushReg (hc08_reg_x, TRUE);
+      emitcode("tax", "");
+      regalloc_dry_run_cost++;
+      pullReg (hc08_reg_a);
+    }
+  else if (!sameRegs (AOP (left), aopResult))
     {
       size = AOP_SIZE (result);
       offset = 0;
@@ -6614,26 +7620,58 @@
   freeAsmop (left, NULL, ic, TRUE);
   AOP (result) = aopResult;
 
-  tlbl = newiTempLabel (NULL);
+  tlbl = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
   size = AOP_SIZE (result);
   offset = 0;
-  tlbl1 = newiTempLabel (NULL);
+  tlbl1 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
+
+  if (hc08_reg_x->isDead && !IS_AOP_X (AOP (result)) && !IS_AOP_XA (AOP (result)) && !IS_AOP_AX (AOP (result)) && !IS_AOP_HX (AOP (result)))
+    countreg = hc08_reg_x;
+  else if (hc08_reg_a->isDead && !IS_AOP_A (AOP (result)) && !IS_AOP_XA (AOP (result)) && !IS_AOP_AX (AOP (result)))
+    countreg = hc08_reg_a;
+  else if (!IS_AOP_X (AOP (result)) && !IS_AOP_XA (AOP (result)) && !IS_AOP_AX (AOP (result)) && !IS_AOP_HX (AOP (result)))
+    countreg = hc08_reg_x;
+  else if(!IS_AOP_A (AOP (result)) && !IS_AOP_XA (AOP (result)) && !IS_AOP_AX (AOP (result)))
+    countreg = hc08_reg_a;
+  needpullcountreg = (countreg && pushRegIfSurv (countreg));
+  if(countreg)
+    {
+      countreg->isFree = FALSE;
+      loadRegFromAop (countreg, AOP (right), 0);
+    }
+  else
+    {
+      pushReg (hc08_reg_a, FALSE);
+      pushReg (hc08_reg_a, TRUE);
+      loadRegFromAop (hc08_reg_a, AOP (right), 0);
+      emitcode ("sta", "2, s");
+      regalloc_dry_run_cost += 3;
+      pullReg (hc08_reg_a);
+    }
+  emitcode (countreg == hc08_reg_a ? "tsta" : (countreg ? "tstx" : "tst 1, s"), "");
+  regalloc_dry_run_cost += (countreg ? 1 : 3);
 
-  loadRegFromAop (hc08_reg_x, AOP (right), 0);
-  emitcode ("tstx", "");
   emitBranch ("beq", tlbl1);
-  emitLabel (tlbl);
+  if (!regalloc_dry_run)
+    emitLabel (tlbl);
 
-  shift="lsl";
-  for (offset=0;offset<size;offset++)
+  shift = "lsl";
+  for (offset = 0; offset < size; offset++)
     {
       rmwWithAop (shift, AOP (result), offset);
-      shift="rol";
+      shift = "rol";
     }
-  rmwWithReg ("dec", hc08_reg_x);
-  emitBranch ("bne", tlbl);
-  emitLabel (tlbl1);
-  hc08_freeReg (hc08_reg_x);
+  if (!regalloc_dry_run)
+    emitcode (countreg == hc08_reg_a ? "dbnza" : (countreg ? "dbnzx" : "dbnz 1, s"), "%05d$", labelKey2num (tlbl->key));
+  regalloc_dry_run_cost += (countreg ? 2 : 4);
+
+  if (!regalloc_dry_run)
+    emitLabel (tlbl1);
+
+  if (!countreg)
+    pullNull (1);
+  else
+    pullOrFreeReg (countreg, needpullcountreg);
 
   freeAsmop (result, NULL, ic, TRUE);
   freeAsmop (right, NULL, ic, TRUE);
@@ -6643,33 +7681,36 @@
 /* genrshOne - right shift a one byte quantity by known count      */
 /*-----------------------------------------------------------------*/
 static void
-genrshOne (operand * result, operand * left,
-           int shCount, int sign)
+genrshOne (operand * result, operand * left, int shCount, int sign)
 {
-  D(emitcode (";     genrshOne",""));
-
+  bool needpulla;
+  D (emitcode (";     genrshOne", ""));
+  needpulla = pushRegIfSurv (hc08_reg_a);
   loadRegFromAop (hc08_reg_a, AOP (left), 0);
   AccRsh (shCount, sign);
   storeRegToFullAop (hc08_reg_a, AOP (result), sign);
+  pullOrFreeReg (hc08_reg_a, needpulla);
 }
 
 /*-----------------------------------------------------------------*/
 /* genrshTwo - right shift two bytes by known amount != 0          */
 /*-----------------------------------------------------------------*/
 static void
-genrshTwo (operand * result, operand * left,
-           int shCount, int sign)
+genrshTwo (operand * result, operand * left, int shCount, int sign)
 {
-  D(emitcode (";     genrshTwo",""));
+  bool needpulla, needpullx;
+  D (emitcode (";     genrshTwo", ""));
 
   /* if shCount >= 8 */
   if (shCount >= 8)
     {
-      if (shCount || sign)
+      if (shCount != 8 || sign)
         {
+          needpulla = pushRegIfSurv (hc08_reg_a);
           loadRegFromAop (hc08_reg_a, AOP (left), 1);
-          AccRsh (shCount-8, sign);
+          AccRsh (shCount - 8, sign);
           storeRegToFullAop (hc08_reg_a, AOP (result), sign);
+          pullOrFreeReg (hc08_reg_a, needpulla);
         }
       else
         {
@@ -6681,9 +7722,13 @@
   /*  1 <= shCount <= 7 */
   else
     {
+      needpulla = pushRegIfSurv (hc08_reg_a);
+      needpullx = pushRegIfSurv (hc08_reg_x);
       loadRegFromAop (hc08_reg_xa, AOP (left), 0);
       XAccRsh (shCount, sign);
       storeRegToAop (hc08_reg_xa, AOP (result), 0);
+      pullOrFreeReg (hc08_reg_x, needpullx);
+      pullOrFreeReg (hc08_reg_a, needpulla);
     }
 }
 
@@ -6692,19 +7737,12 @@
 /* offl = LSB or MSB16                                             */
 /*-----------------------------------------------------------------*/
 static void
-shiftRLong (operand * left, int offl,
-            operand * result, int sign)
+shiftRLong (operand * left, int offl, operand * result, int sign)
 {
-//  char *l;
- // int size = AOP_SIZE (result);
-
-  bool needpula = FALSE;
-  bool needpulx = FALSE;
-
-  needpula = pushRegIfUsed (hc08_reg_a);
-  needpulx = pushRegIfUsed (hc08_reg_x);
+  bool needpula = pushRegIfSurv (hc08_reg_a);
+  bool needpulx = pushRegIfSurv (hc08_reg_x);
 
-  if (offl==LSB)
+  if (offl == LSB)
     {
       loadRegFromAop (hc08_reg_xa, AOP (left), MSB24);
       if (sign)
@@ -6715,7 +7753,7 @@
       storeRegToAop (hc08_reg_xa, AOP (result), MSB24);
       loadRegFromAop (hc08_reg_xa, AOP (left), LSB);
     }
-  else if (offl==MSB16)
+  else if (offl == MSB16)
     {
       loadRegFromAop (hc08_reg_a, AOP (left), MSB32);
       if (sign)
@@ -6731,7 +7769,7 @@
   rmwWithReg ("ror", hc08_reg_a);
   storeRegToAop (hc08_reg_xa, AOP (result), LSB);
 
-  if (offl==MSB16)
+  if (offl == MSB16)
     {
       if (sign)
         {
@@ -6752,70 +7790,84 @@
 /* genrshFour - shift four byte by a known amount != 0             */
 /*-----------------------------------------------------------------*/
 static void
-genrshFour (operand * result, operand * left,
-            int shCount, int sign)
+genrshFour (operand * result, operand * left, int shCount, int sign)
 {
+  bool needpulla = FALSE;
+  bool needpullx = FALSE;
+
   /* TODO: handle cases where left == result */
 
-  D(emitcode (";     genrshFour",""));
+  D (emitcode (";     genrshFour", ""));
 
   /* if shifting more that 3 bytes */
   if (shCount >= 24)
     {
+      needpulla = pushRegIfSurv (hc08_reg_a);
       loadRegFromAop (hc08_reg_a, AOP (left), 3);
-      AccRsh (shCount-24, sign);
+      AccRsh (shCount - 24, sign);
       storeRegToFullAop (hc08_reg_a, AOP (result), sign);
-      return;
     }
   else if (shCount >= 16)
     {
+      needpulla = pushRegIfSurv (hc08_reg_a);
+      needpullx = pushRegIfSurv (hc08_reg_x);
       loadRegFromAop (hc08_reg_xa, AOP (left), 2);
-      XAccRsh (shCount-16, sign);
+      XAccRsh (shCount - 16, sign);
       storeRegToFullAop (hc08_reg_xa, AOP (result), sign);
-      return;
     }
   else if (shCount >= 8)
     {
       if (shCount == 1)
-        shiftRLong (left, MSB16, result, sign);
+        {
+          shiftRLong (left, MSB16, result, sign);
+          return;
+        }
       else if (shCount == 8)
         {
+          needpulla = pushRegIfSurv (hc08_reg_a);
           transferAopAop (AOP (left), 1, AOP (result), 0);
           transferAopAop (AOP (left), 2, AOP (result), 1);
           loadRegFromAop (hc08_reg_a, AOP (left), 3);
           storeRegToAop (hc08_reg_a, AOP (result), 2);
-          storeRegSignToUpperAop (hc08_reg_a, AOP(result), 3, sign);
+          storeRegSignToUpperAop (hc08_reg_a, AOP (result), 3, sign);
         }
       else if (shCount == 9)
         {
           shiftRLong (left, MSB16, result, sign);
+          return;
         }
       else
         {
+          needpulla = pushRegIfSurv (hc08_reg_a);
+          needpullx = pushRegIfSurv (hc08_reg_x);
           loadRegFromAop (hc08_reg_xa, AOP (left), 1);
-          XAccRsh (shCount-8, FALSE);
+          XAccRsh (shCount - 8, FALSE);
           storeRegToAop (hc08_reg_xa, AOP (result), 0);
           loadRegFromAop (hc08_reg_x, AOP (left), 3);
           loadRegFromConst (hc08_reg_a, zero);
-          XAccRsh (shCount-8, sign);
+          XAccRsh (shCount - 8, sign);
           accopWithAop ("ora", AOP (result), 1);
           storeRegToAop (hc08_reg_xa, AOP (result), 1);
-          storeRegSignToUpperAop (hc08_reg_x, AOP(result), 3, sign);
+          storeRegSignToUpperAop (hc08_reg_x, AOP (result), 3, sign);
         }
     }
   else
-    {                           /* 1 <= shCount <= 7 */
+    {
+      /* 1 <= shCount <= 7 */
       if (shCount == 1)
         {
           shiftRLong (left, LSB, result, sign);
+          return;
         }
       else
         {
+          needpulla = pushRegIfSurv (hc08_reg_a);
+          needpullx = pushRegIfSurv (hc08_reg_x);
           loadRegFromAop (hc08_reg_xa, AOP (left), 0);
           XAccRsh (shCount, FALSE);
           storeRegToAop (hc08_reg_xa, AOP (result), 0);
           loadRegFromAop (hc08_reg_a, AOP (left), 2);
-          AccLsh (8-shCount);
+          AccLsh (8 - shCount);
           accopWithAop ("ora", AOP (result), 1);
           storeRegToAop (hc08_reg_a, AOP (result), 1);
           loadRegFromAop (hc08_reg_xa, AOP (left), 2);
@@ -6823,22 +7875,20 @@
           storeRegToAop (hc08_reg_xa, AOP (result), 2);
         }
     }
+  pullOrFreeReg (hc08_reg_x, needpullx);
+  pullOrFreeReg (hc08_reg_a, needpulla);
 }
 
 /*-----------------------------------------------------------------*/
 /* genRightShiftLiteral - right shifting by known count            */
 /*-----------------------------------------------------------------*/
 static void
-genRightShiftLiteral (operand * left,
-                      operand * right,
-                      operand * result,
-                      iCode * ic,
-                      int sign)
+genRightShiftLiteral (operand * left, operand * right, operand * result, iCode * ic, int sign)
 {
   int shCount = (int) ulFromVal (AOP (right)->aopu.aop_lit);
   int size;
 
-  D(emitcode (";     genRightShiftLiteral",""));
+  D (emitcode (";     genRightShiftLiteral", ""));
 
   freeAsmop (right, NULL, ic, TRUE);
 
@@ -6846,8 +7896,7 @@
   aopOp (result, ic, FALSE);
 
 #if VIEW_SIZE
-  DD(emitcode ("; shift right ", "result %d, left %d", AOP_SIZE (result),
-            AOP_SIZE (left)));
+  DD (emitcode ("; shift right ", "result %d, left %d", AOP_SIZE (result), AOP_SIZE (left)));
 #endif
 
   size = getDataSize (left);
@@ -6856,17 +7905,19 @@
   /* I suppose that the left size >= result size */
   if (shCount == 0)
     {
-      size = getDataSize (result);
-      while (size--)
-        transferAopAop (AOP (left), size, AOP(result), size);
+      genCopy (result, left);
     }
   else if (shCount >= (size * 8))
     {
-      if (sign) {
-        /* get sign in acc.7 */
-        loadRegFromAop (hc08_reg_a, AOP (left), size -1);
-      }
+      bool needpulla = pushRegIfSurv (hc08_reg_a);
+      if (sign)
+        {
+          
+          /* get sign in acc.7 */
+          loadRegFromAop (hc08_reg_a, AOP (left), size - 1);
+        }
       addSign (result, LSB, sign);
+      pullOrFreeReg (hc08_reg_a, needpulla);
     }
   else
     {
@@ -6884,6 +7935,7 @@
           genrshFour (result, left, shCount, sign);
           break;
         default:
+          wassertl (0, "Invalid operand size in right shift.");
           break;
         }
     }
@@ -6905,8 +7957,10 @@
   char *shift;
   bool sign;
   asmop *aopResult;
+  bool needpullcountreg;
+  reg_info *countreg = NULL;
 
-  D(emitcode (";     genRightShift",""));
+  D (emitcode (";     genRightShift", ""));
 
   /* if signed then we do it the hard way preserve the
      sign bit moving it inwards */
@@ -6944,13 +7998,21 @@
   aopOp (left, ic, FALSE);
   aopResult = AOP (result);
 
-  if (sameRegs(AOP (right), AOP (result)) || IS_AOP_XA (AOP (result))
-      || isOperandVolatile (result, FALSE))
-    aopResult = forceStackedAop (AOP (result), sameRegs ( AOP (left), AOP (result)));
+  if (sameRegs (AOP (right), AOP (result)) || IS_AOP_XA (AOP (result)) || isOperandVolatile (result, FALSE))
+    aopResult = forceStackedAop (AOP (result), sameRegs (AOP (left), AOP (result)));
 
   /* now move the left to the result if they are not the
      same */
-  if (!sameRegs (AOP (left), aopResult))
+  if (IS_AOP_HX (AOP (result)))
+    loadRegFromAop (hc08_reg_hx, AOP (left), 0);
+  else if (IS_AOP_AX (AOP (result)) && IS_AOP_XA (AOP (left)) || IS_AOP_XA (AOP (result)) && IS_AOP_AX (AOP (left)))
+    {
+      pushReg (hc08_reg_x, TRUE);
+      emitcode("tax", "");
+      regalloc_dry_run_cost++;
+      pullReg (hc08_reg_a);
+    }
+  else if (!sameRegs (AOP (left), aopResult))
     {
       size = AOP_SIZE (result);
       offset = 0;
@@ -6963,61 +8025,130 @@
   freeAsmop (left, NULL, ic, TRUE);
   AOP (result) = aopResult;
 
-  tlbl = newiTempLabel (NULL);
+  tlbl = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
   size = AOP_SIZE (result);
   offset = 0;
-  tlbl1 = newiTempLabel (NULL);
+  tlbl1 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
+
+  if (hc08_reg_x->isDead && !IS_AOP_X (AOP (result)) && !IS_AOP_XA (AOP (result)) && !IS_AOP_AX (AOP (result)) && !IS_AOP_HX (AOP (result)))
+    countreg = hc08_reg_x;
+  else if (hc08_reg_a->isDead && !IS_AOP_A (AOP (result)) && !IS_AOP_XA (AOP (result)) && !IS_AOP_AX (AOP (result)))
+    countreg = hc08_reg_a;
+  else if (!IS_AOP_X (AOP (result)) && !IS_AOP_XA (AOP (result)) && !IS_AOP_AX (AOP (result)) && !IS_AOP_HX (AOP (result)))
+    countreg = hc08_reg_x;
+  else if(!IS_AOP_A (AOP (result)) && !IS_AOP_XA (AOP (result)) && !IS_AOP_AX (AOP (result)))
+    countreg = hc08_reg_a;
+  needpullcountreg = (countreg && pushRegIfSurv (countreg));
+  if(countreg)
+    {
+      countreg->isFree = FALSE;
+      loadRegFromAop (countreg, AOP (right), 0);
+    }
+  else
+    {
+      pushReg (hc08_reg_a, FALSE);
+      pushReg (hc08_reg_a, TRUE);
+      loadRegFromAop (hc08_reg_a, AOP (right), 0);
+      emitcode ("sta", "2, s");
+      regalloc_dry_run_cost += 3;
+      pullReg (hc08_reg_a);
+    }
+  emitcode (countreg == hc08_reg_a ? "tsta" : (countreg ? "tstx" : "tst 1, s"), "");
+  regalloc_dry_run_cost += (countreg ? 1 : 3);
 
-  loadRegFromAop (hc08_reg_x, AOP (right), 0);
-  emitcode ("tstx", "");
   emitBranch ("beq", tlbl1);
-  emitLabel (tlbl);
+  if (!regalloc_dry_run)
+    emitLabel (tlbl);
 
-  shift= sign ? "asr" : "lsr";
-  for (offset=size-1;offset>=0;offset--)
+  shift = sign ? "asr" : "lsr";
+  for (offset = size - 1; offset >= 0; offset--)
     {
       rmwWithAop (shift, AOP (result), offset);
-      shift="ror";
+      shift = "ror";
     }
-  rmwWithReg ("dec", hc08_reg_x);
-  emitBranch ("bne", tlbl);
-  emitLabel (tlbl1);
-  hc08_freeReg (hc08_reg_x);
+
+  if (!regalloc_dry_run)
+    emitcode (countreg == hc08_reg_a ? "dbnza" : (countreg ? "dbnzx" : "dbnz 1, s"), "%05d$", labelKey2num (tlbl->key));
+  regalloc_dry_run_cost += (countreg ? 2 : 4);
+
+  if (!regalloc_dry_run)
+    emitLabel (tlbl1);
+
+  if (!countreg)
+    pullNull (1);
+  else
+    pullOrFreeReg (countreg, needpullcountreg);
 
   freeAsmop (result, NULL, ic, TRUE);
   freeAsmop (right, NULL, ic, TRUE);
 }
 
+/*-----------------------------------------------------------------*/
+/* decodePointerOffset - decode a pointer offset operand into a    */
+/*                    literal offset and a rematerializable offset */
+/*-----------------------------------------------------------------*/
+static void
+decodePointerOffset (operand * opOffset, int * litOffset, char ** rematOffset)
+{
+  *litOffset = 0;
+  *rematOffset = NULL;
+
+  if (!opOffset)
+    return;
+
+  if (IS_OP_LITERAL (opOffset))
+    {
+      *litOffset = (int)operandLitValue (opOffset);
+    }
+  else if (IS_ITEMP (opOffset) && OP_SYMBOL (opOffset)->remat)
+    {
+      asmop * aop = aopForRemat (OP_SYMBOL (opOffset));
+
+      if (aop->type == AOP_LIT)
+        *litOffset = (int) floatFromVal (aop->aopu.aop_lit);
+      else if (aop->type == AOP_IMMD)
+        *rematOffset = aop->aopu.aop_immd.aop_immd1;
+    }
+  else
+    wassertl (0, "Pointer get/set with non-constant offset");
+}
+
 
 /*-----------------------------------------------------------------*/
 /* genUnpackBits - generates code for unpacking bits               */
 /*-----------------------------------------------------------------*/
 static void
-genUnpackBits (operand * result, iCode *ifx)
+genUnpackBits (operand * result, operand * right, iCode * ifx)
 {
-  int offset = 0;       /* result byte offset */
-  int rsize;            /* result size */
-  int rlen = 0;         /* remaining bitfield length */
-  sym_link *etype;      /* bitfield type information */
-  int blen;             /* bitfield length */
-  int bstr;             /* bitfield starting bit within byte */
+  int offset = 0;               /* result byte offset */
+  int rsize;                    /* result size */
+  int rlen = 0;                 /* remaining bitfield length */
+  sym_link *etype;              /* bitfield type information */
+  int blen;                     /* bitfield length */
+  int bstr;                     /* bitfield starting bit within byte */
+  bool needpulla = FALSE;
+  int litOffset = 0;
+  char * rematOffset = NULL;
 
-  D(emitcode (";     genUnpackBits",""));
+  D (emitcode (";     genUnpackBits", ""));
 
+  decodePointerOffset (right, &litOffset, &rematOffset);
   etype = getSpec (operandType (result));
   rsize = getSize (operandType (result));
   blen = SPEC_BLEN (etype);
   bstr = SPEC_BSTR (etype);
 
+  needpulla = pushRegIfSurv (hc08_reg_a);
+
   if (ifx && blen <= 8)
     {
-      emitcode ("lda", ",x");
-      hc08_dirtyReg (hc08_reg_a, FALSE);
+      loadRegIndexed (hc08_reg_a, litOffset, rematOffset);
       if (blen < 8)
         {
-          emitcode ("and", "#0x%02x",
-                    (((unsigned char) -1) >> (8 - blen)) << bstr);
+          emitcode ("and", "#0x%02x", (((unsigned char) - 1) >> (8 - blen)) << bstr);
+          regalloc_dry_run_cost += 2;
         }
+      pullOrFreeReg (hc08_reg_a, needpulla);
       genIfxJump (ifx, "a");
       return;
     }
@@ -7026,19 +8157,22 @@
   /* If the bitfield length is less than a byte */
   if (blen < 8)
     {
-      emitcode ("lda", ",x");
-      hc08_dirtyReg (hc08_reg_a, FALSE);
+      loadRegIndexed (hc08_reg_a, litOffset, rematOffset);
       AccRsh (bstr, FALSE);
-      emitcode ("and", "#0x%02x", ((unsigned char) -1) >> (8 - blen));
+      emitcode ("and", "#0x%02x", ((unsigned char) - 1) >> (8 - blen));
+      regalloc_dry_run_cost += 2;
       if (!SPEC_USIGN (etype))
         {
           /* signed bitfield */
-          symbol *tlbl = newiTempLabel (NULL);
+          symbol *tlbl = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
 
-          emitcode ("bit", "#0x%02x", 1<<(blen - 1));
-          emitcode ("beq", "%05d$", tlbl->key + 100);
+          emitcode ("bit", "#0x%02x", 1 << (blen - 1));
+          if (!regalloc_dry_run)
+            emitcode ("beq", "%05d$", labelKey2num (tlbl->key));
           emitcode ("ora", "#0x%02x", (unsigned char) (0xff << blen));
-          emitLabel (tlbl);
+          regalloc_dry_run_cost += 6;
+          if (!regalloc_dry_run)
+            emitLabel (tlbl);
         }
       storeRegToAop (hc08_reg_a, AOP (result), offset++);
       goto finish;
@@ -7046,33 +8180,45 @@
 
   /* Bit field did not fit in a byte. Copy all
      but the partial byte at the end.  */
-  for (rlen=blen;rlen>=8;rlen-=8)
+  for (rlen = blen; rlen >= 8; rlen -= 8)
     {
-      emitcode ("lda", ",x");
-      hc08_dirtyReg (hc08_reg_a, FALSE);
-      storeRegToAop (hc08_reg_a, AOP (result), offset);
+      loadRegIndexed (hc08_reg_a, litOffset, rematOffset);
+      if (rlen > 8 && AOP_TYPE (result) == AOP_REG)
+        pushReg (hc08_reg_a, TRUE);
+      else
+        storeRegToAop (hc08_reg_a, AOP (result), offset);
       offset++;
-      if (rlen>8)
-        emitcode ("aix", "#1");
+      if (rlen > 8)
+        {
+          litOffset++;
+        }
     }
 
   /* Handle the partial byte at the end */
   if (rlen)
     {
-      emitcode ("lda", ",x");
-      emitcode ("and", "#0x%02x", ((unsigned char) -1) >> (8-rlen));
+      loadRegIndexed (hc08_reg_a, litOffset, rematOffset);
+      emitcode ("and", "#0x%02x", ((unsigned char) - 1) >> (8 - rlen));
+      regalloc_dry_run_cost += 3;
       if (!SPEC_USIGN (etype))
         {
           /* signed bitfield */
-          symbol *tlbl = newiTempLabel (NULL);
+          symbol *tlbl = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
 
-          emitcode ("bit", "#0x%02x", 1<<(rlen - 1));
-          emitcode ("beq", "%05d$", tlbl->key + 100);
+          emitcode ("bit", "#0x%02x", 1 << (rlen - 1));
+          if (!regalloc_dry_run)
+            emitcode ("beq", "%05d$", labelKey2num (tlbl->key));
           emitcode ("ora", "#0x%02x", (unsigned char) (0xff << rlen));
-          emitLabel (tlbl);
+         regalloc_dry_run_cost += 6;
+         if (!regalloc_dry_run)
+            emitLabel (tlbl);
         }
       storeRegToAop (hc08_reg_a, AOP (result), offset++);
     }
+  if (blen > 8 && AOP_TYPE (result) == AOP_REG)
+    {
+      pullReg (AOP (result)->aopu.aop_reg[0]);
+    }
 
 finish:
   if (offset < rsize)
@@ -7089,11 +8235,13 @@
           emitcode ("rola", "");
           emitcode ("clra", "");
           emitcode ("sbc", zero);
+          regalloc_dry_run_cost += 4;
 
           while (rsize--)
             storeRegToAop (hc08_reg_a, AOP (result), offset++);
         }
     }
+  pullOrFreeReg (hc08_reg_a, needpulla);
 }
 
 
@@ -7101,26 +8249,31 @@
 /* genUnpackBitsImmed - generates code for unpacking bits          */
 /*-----------------------------------------------------------------*/
 static void
-genUnpackBitsImmed (operand * left,
-                    operand * result,
-                    iCode *ic,
-                    iCode *ifx)
+genUnpackBitsImmed (operand * left, operand *right, operand * result, iCode * ic, iCode * ifx)
 {
   int size;
-  int offset = 0;       /* result byte offset */
-  int rsize;            /* result size */
-  int rlen = 0;         /* remaining bitfield length */
-  sym_link *etype;      /* bitfield type information */
-  int blen;             /* bitfield length */
-  int bstr;             /* bitfield starting bit within byte */
+  int offset = 0;               /* result byte offset */
+  int litOffset = 0;
+  char * rematOffset = NULL;
+  int rsize;                    /* result size */
+  int rlen = 0;                 /* remaining bitfield length */
+  sym_link *etype;              /* bitfield type information */
+  int blen;                     /* bitfield length */
+  int bstr;                     /* bitfield starting bit within byte */
   asmop *derefaop;
+  bool delayed_a = FALSE;
+  bool assigned_a = FALSE;
+  bool needpulla = FALSE;
 
-  D(emitcode (";     genUnpackBitsImmed",""));
+  D (emitcode (";     genUnpackBitsImmed", ""));
+
+  decodePointerOffset (right, &litOffset, &rematOffset);
+  wassert (rematOffset==NULL);
 
   aopOp (result, ic, TRUE);
   size = AOP_SIZE (result);
 
-  derefaop = aopDerefAop (AOP (left));
+  derefaop = aopDerefAop (AOP (left), litOffset);
   freeAsmop (left, NULL, ic, TRUE);
   derefaop->size = size;
 
@@ -7129,32 +8282,37 @@
   blen = SPEC_BLEN (etype);
   bstr = SPEC_BSTR (etype);
 
+  needpulla = pushRegIfSurv (hc08_reg_a);
+
   /* if the bitfield is a single bit in the direct page */
   if (blen == 1 && derefaop->type == AOP_DIR)
     {
       if (!ifx && bstr)
         {
-          symbol *tlbl = newiTempLabel (NULL);
+          symbol *tlbl = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
 
           loadRegFromConst (hc08_reg_a, zero);
-          emitcode ("brclr", "#%d,%s,%05d$",
-                    bstr, aopAdrStr (derefaop, 0, FALSE),
-                    (tlbl->key + 100));
+          if (!regalloc_dry_run)
+            emitcode ("brclr", "#%d,%s,%05d$", bstr, aopAdrStr (derefaop, 0, FALSE), labelKey2num ((tlbl->key)));
+          regalloc_dry_run_cost += 3;
           if (SPEC_USIGN (etype))
             rmwWithReg ("inc", hc08_reg_a);
           else
             rmwWithReg ("dec", hc08_reg_a);
-          emitLabel (tlbl);
+          if (!regalloc_dry_run)
+            emitLabel (tlbl);
           storeRegToAop (hc08_reg_a, AOP (result), offset);
+          if (AOP_TYPE (result) == AOP_REG && AOP(result)->aopu.aop_reg[offset]->rIdx == A_IDX)
+            assigned_a = TRUE;
           hc08_freeReg (hc08_reg_a);
           offset++;
           goto finish;
         }
       else if (ifx)
         {
-          symbol *tlbl = newiTempLabel (NULL);
+          symbol *tlbl = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
           symbol *jlbl;
-          char * inst;
+          char *inst;
 
           if (IC_TRUE (ifx))
             {
@@ -7166,11 +8324,12 @@
               jlbl = IC_FALSE (ifx);
               inst = "brset";
             }
-          emitcode (inst, "#%d,%s,%05d$",
-                    bstr, aopAdrStr (derefaop, 0, FALSE),
-                    (tlbl->key + 100));
+          if (!regalloc_dry_run)
+            emitcode (inst, "#%d,%s,%05d$", bstr, aopAdrStr (derefaop, 0, FALSE), labelKey2num ((tlbl->key)));
+          regalloc_dry_run_cost += 3;
           emitBranch ("jmp", jlbl);
-          emitLabel (tlbl);
+          if (!regalloc_dry_run)
+            emitLabel (tlbl);
           ifx->generated = 1;
           offset++;
           goto finish;
@@ -7184,24 +8343,30 @@
       if (!ifx)
         {
           AccRsh (bstr, FALSE);
-          emitcode ("and", "#0x%02x", ((unsigned char) -1) >> (8 - blen));
+          emitcode ("and", "#0x%02x", ((unsigned char) - 1) >> (8 - blen));
+          regalloc_dry_run_cost += 2;
           hc08_dirtyReg (hc08_reg_a, FALSE);
           if (!SPEC_USIGN (etype))
             {
               /* signed bitfield */
-              symbol *tlbl = newiTempLabel (NULL);
+              symbol *tlbl = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
 
-              emitcode ("bit", "#0x%02x", 1<<(blen - 1));
-              emitcode ("beq", "%05d$", tlbl->key + 100);
+              emitcode ("bit", "#0x%02x", 1 << (blen - 1));
+              if (!regalloc_dry_run)
+                emitcode ("beq", "%05d$", labelKey2num (tlbl->key));
               emitcode ("ora", "#0x%02x", (unsigned char) (0xff << blen));
-              emitLabel (tlbl);
+              regalloc_dry_run_cost += 6;
+              if (!regalloc_dry_run)
+                emitLabel (tlbl);
             }
           storeRegToAop (hc08_reg_a, AOP (result), offset);
+          if (AOP_TYPE (result) == AOP_REG && AOP(result)->aopu.aop_reg[offset]->rIdx == A_IDX)
+            assigned_a = TRUE;
         }
       else
         {
-          emitcode ("and", "#0x%02x",
-                    (((unsigned char) -1) >> (8 - blen)) << bstr);
+          emitcode ("and", "#0x%02x", (((unsigned char) - 1) >> (8 - blen)) << bstr);
+          regalloc_dry_run_cost += 2;
           hc08_dirtyReg (hc08_reg_a, FALSE);
         }
       offset++;
@@ -7210,32 +8375,56 @@
 
   /* Bit field did not fit in a byte. Copy all
      but the partial byte at the end.  */
-  for (rlen=blen;rlen>=8;rlen-=8)
+  for (rlen = blen; rlen >= 8; rlen -= 8)
     {
-      loadRegFromAop (hc08_reg_a, derefaop, size-offset-1);
+      if (assigned_a && !delayed_a)
+        {
+          pushReg (hc08_reg_a, TRUE);
+          delayed_a = TRUE;
+        }
+      loadRegFromAop (hc08_reg_a, derefaop, size - offset - 1);
       if (!ifx)
-        storeRegToAop (hc08_reg_a, AOP (result), offset);
+        {
+          storeRegToAop (hc08_reg_a, AOP (result), offset);
+          if (AOP_TYPE (result) == AOP_REG && AOP(result)->aopu.aop_reg[offset]->rIdx == A_IDX)
+            assigned_a = TRUE;
+        }
       else
-        emitcode ("tsta", "");
+        {
+          emitcode ("tsta", "");
+          regalloc_dry_run_cost++;
+        }
       offset++;
     }
 
   /* Handle the partial byte at the end */
   if (rlen)
     {
-      loadRegFromAop (hc08_reg_a, derefaop, size-offset-1);
-      emitcode ("and", "#0x%02x", ((unsigned char) -1) >> (8-rlen));
+      if (assigned_a && !delayed_a)
+        {
+          pushReg (hc08_reg_a, TRUE);
+          delayed_a = TRUE;
+        }
+      loadRegFromAop (hc08_reg_a, derefaop, size - offset - 1);
+      emitcode ("and", "#0x%02x", ((unsigned char) - 1) >> (8 - rlen));
+      regalloc_dry_run_cost += 2;
       if (!SPEC_USIGN (etype))
         {
           /* signed bitfield */
-          symbol *tlbl = newiTempLabel (NULL);
+          symbol *tlbl = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
 
-          emitcode ("bit", "#0x%02x", 1<<(rlen - 1));
-          emitcode ("beq", "%05d$", tlbl->key + 100);
+          emitcode ("bit", "#0x%02x", 1 << (rlen - 1));
+          if (!regalloc_dry_run)
+            emitcode ("beq", "%05d$", labelKey2num (tlbl->key));
           emitcode ("ora", "#0x%02x", (unsigned char) (0xff << rlen));
-          emitLabel (tlbl);
+          regalloc_dry_run_cost += 6;
+          if (!regalloc_dry_run)
+            emitLabel (tlbl);
         }
-      storeRegToAop (hc08_reg_a, AOP (result), offset++);
+      storeRegToAop (hc08_reg_a, AOP (result), offset);
+      if (AOP_TYPE (result) == AOP_REG && AOP(result)->aopu.aop_reg[offset]->rIdx == A_IDX)
+        assigned_a = TRUE;
+      offset++;
     }
 
 finish:
@@ -7249,10 +8438,17 @@
         }
       else
         {
+          if (assigned_a && !delayed_a)
+            {
+              pushReg (hc08_reg_a, TRUE);
+              delayed_a = TRUE;
+            }
+
           /* signed bitfield: sign extension with 0x00 or 0xff */
           emitcode ("rola", "");
           emitcode ("clra", "");
           emitcode ("sbc", zero);
+          regalloc_dry_run_cost += 4;
 
           while (rsize--)
             storeRegToAop (hc08_reg_a, AOP (result), offset++);
@@ -7266,6 +8462,10 @@
     {
       genIfxJump (ifx, "a");
     }
+  if (delayed_a)
+    pullReg (hc08_reg_a);
+
+  pullOrFreeReg (hc08_reg_a, needpulla);
 }
 
 
@@ -7273,30 +8473,35 @@
 /* genDataPointerGet - generates code when ptr offset is known     */
 /*-----------------------------------------------------------------*/
 static void
-genDataPointerGet (operand * left,
-                   operand * result,
-                   iCode * ic,
-                   iCode * ifx)
+genDataPointerGet (operand * left, operand * right, operand * result, iCode * ic, iCode * ifx)
 {
   int size;
+  int litOffset = 0;
+  char * rematOffset = NULL;
   asmop *derefaop;
 
-  D(emitcode (";     genDataPointerGet",""));
+  D (emitcode (";     genDataPointerGet", ""));
+
+  decodePointerOffset (right, &litOffset, &rematOffset);
+  wassert (rematOffset==NULL);
 
   aopOp (result, ic, TRUE);
   size = AOP_SIZE (result);
 
-  derefaop = aopDerefAop (AOP (left));
+  derefaop = aopDerefAop (AOP (left), litOffset);
   freeAsmop (left, NULL, ic, TRUE);
   derefaop->size = size;
 
-  while (size--)
-    {
-      if (!ifx)
-        transferAopAop (derefaop, size, AOP (result), size);
-      else
-        loadRegFromAop (hc08_reg_a, derefaop, size);
-    }
+  if (IS_AOP_HX (AOP (result)))
+    loadRegFromAop (hc08_reg_hx, derefaop, 0);
+  else
+    while (size--)
+      {
+        if (!ifx)
+          transferAopAop (derefaop, size, AOP (result), size);
+        else
+          loadRegFromAop (hc08_reg_a, derefaop, size);
+      }
 
   freeAsmop (NULL, derefaop, ic, TRUE);
   freeAsmop (result, NULL, ic, TRUE);
@@ -7312,147 +8517,211 @@
 /* genPointerGet - generate code for pointer get                   */
 /*-----------------------------------------------------------------*/
 static void
-genPointerGet (iCode * ic, iCode *pi, iCode *ifx)
+genPointerGet (iCode * ic, iCode * pi, iCode * ifx)
 {
   operand *left = IC_LEFT (ic);
+  operand *right = IC_RIGHT (ic);
   operand *result = IC_RESULT (ic);
-  int size, offset;
+  int size, offset, xoffset;
+  int litOffset = 0;
+  char * rematOffset = NULL;
   sym_link *retype = getSpec (operandType (result));
+  bool postH = FALSE;
+  bool postX = FALSE;
+  bool postA = FALSE;
+  bool needpulla = FALSE;
 
-  D(emitcode (";     genPointerGet",""));
+  D (emitcode (";     genPointerGet", ""));
 
-  if (getSize (operandType (result))>1)
+  if ((size = getSize (operandType (result))) > 1)
     ifx = NULL;
 
   aopOp (left, ic, FALSE);
 
-  /* if left is rematerialisable and
-     result is not bit variable type */
+  /* if left is rematerialisable */
   if (AOP_TYPE (left) == AOP_IMMD || AOP_TYPE (left) == AOP_LIT)
     {
+      /* if result is not bit variable type */
       if (!IS_BITVAR (retype))
         {
-          genDataPointerGet (left, result, ic, ifx);
+          genDataPointerGet (left, right, result, ic, ifx);
           return;
         }
       else
         {
-          genUnpackBitsImmed (left, result, ic, ifx);
+          genUnpackBitsImmed (left, right, result, ic, ifx);
           return;
         }
     }
 
+  needpulla = pushRegIfSurv (hc08_reg_a);
+
   /* if the operand is already in hx
      then we do nothing else we move the value to hx */
-  if (AOP_TYPE (left) != AOP_STR)
-    {
-      /* if this is remateriazable */
-      loadRegFromAop (hc08_reg_hx, AOP (left), 0);
-    }
+  loadRegFromAop (hc08_reg_hx, AOP (left), 0);
 
   /* so hx now contains the address */
   aopOp (result, ic, FALSE);
 
+
+  if (AOP_TYPE (result) == AOP_REG && pi)
+    { 
+      int i;
+      for (i = 0; i < AOP_SIZE (result); i++)
+        AOP (result)->aopu.aop_reg[i]->isDead = TRUE;
+    }
+
   /* if bit then unpack */
   if (IS_BITVAR (retype))
-    genUnpackBits (result, ifx);
+    {
+      genUnpackBits (result, right, ifx);
+      goto release;
+    }
+
+  decodePointerOffset (right, &litOffset, &rematOffset);
+
+  if (!pi && !ifx && size == 2 && IS_S08 && (IS_AOP_HX (AOP (result)) || AOP_TYPE (result) == AOP_EXT)) /* Todo: Use this for bigger sizes, too */
+    {
+      loadRegIndexed (hc08_reg_hx, litOffset, rematOffset);
+      storeRegToAop (hc08_reg_hx, AOP (result), 0);
+    }
+  else if (!pi && !ifx && size == 1 && (IS_AOP_X (AOP (result)) || hc08_reg_x->isDead && !hc08_reg_a->isDead))
+    {
+      loadRegIndexed (hc08_reg_x, litOffset, rematOffset);
+      storeRegToAop (hc08_reg_x, AOP (result), 0);
+    }
   else
     {
-      size = AOP_SIZE (result);
-      offset = size-1;
+      offset = size - 1;
 
       while (size--)
         {
-          accopWithMisc ("lda", ",x");
-          if (size || pi)
+          xoffset = litOffset + (AOP_SIZE (result) - offset - 1);
+          if (!size && !pi && !ifx && AOP_TYPE (result) == AOP_REG && AOP (result)->aopu.aop_reg[offset] == hc08_reg_x)
+            {
+              loadRegIndexed (hc08_reg_x, xoffset, rematOffset);
+              continue;
+            }
+          loadRegIndexed (hc08_reg_a, xoffset, rematOffset);
+          if (!ifx && (pi || size) && AOP_TYPE (result) == AOP_REG && AOP (result)->aopu.aop_reg[offset] == hc08_reg_h)
+            {
+              pushReg(hc08_reg_a, FALSE);
+              postH = TRUE;
+            }
+          else if (!ifx && (pi || size) && AOP_TYPE (result) == AOP_REG && AOP (result)->aopu.aop_reg[offset] == hc08_reg_x)
             {
-              emitcode ("aix", "#1");
-              hc08_dirtyReg (hc08_reg_hx, FALSE);
+              pushReg(hc08_reg_a, FALSE);
+              postX = TRUE;
             }
-          if (!ifx)
+          else if (!ifx && (pi || size) && AOP_TYPE (result) == AOP_REG && AOP (result)->aopu.aop_reg[offset] == hc08_reg_a)
+            {
+              pushReg(hc08_reg_a, FALSE);
+              postA = TRUE;
+            }
+          else if (!ifx)
             storeRegToAop (hc08_reg_a, AOP (result), offset);
           offset--;
         }
     }
 
+release:
+  size = AOP_SIZE (result);
   freeAsmop (left, NULL, ic, TRUE);
   freeAsmop (result, NULL, ic, TRUE);
 
-  if (pi) {
-    aopOp (IC_RESULT (pi), pi, FALSE);
-    storeRegToAop (hc08_reg_hx, AOP (IC_RESULT (pi)), 0);
-    freeAsmop (IC_RESULT (pi), NULL, pi, TRUE);
-    pi->generated = 1;
-  }
+  if (pi)
+    {
+      emitcode ("aix", "#%d", size);
+      regalloc_dry_run_cost += 2;
+      hc08_dirtyReg (hc08_reg_hx, FALSE);
+      aopOp (IC_RESULT (pi), pi, FALSE);
+      storeRegToAop (hc08_reg_hx, AOP (IC_RESULT (pi)), 0);
+      freeAsmop (IC_RESULT (pi), NULL, pi, TRUE);
+      pi->generated = 1;
+    }
+
+  if (postA)
+    pullReg (hc08_reg_a);
+  if (postX)
+    pullReg (hc08_reg_x);
+  if (postH)
+    pullReg (hc08_reg_h);
+
+  pullOrFreeReg (hc08_reg_a, needpulla);
 
   if (ifx && !ifx->generated)
     {
       genIfxJump (ifx, "a");
     }
-
-  hc08_freeReg (hc08_reg_hx);
-
 }
 
 /*-----------------------------------------------------------------*/
 /* genPackBits - generates code for packed bit storage             */
 /*-----------------------------------------------------------------*/
 static void
-genPackBits (sym_link * etype,
-             operand * right)
+genPackBits (operand * left, sym_link * etype, operand * right)
 {
-  int offset = 0;       /* source byte offset */
-  int rlen = 0;         /* remaining bitfield length */
-  int blen;             /* bitfield length */
-  int bstr;             /* bitfield starting bit within byte */
-  int litval;           /* source literal value (if AOP_LIT) */
-  unsigned char mask;   /* bitmask within current byte */
-  int xoffset = 0;
+  int offset = 0;               /* source byte offset */
+  int rlen = 0;                 /* remaining bitfield length */
+  int blen;                     /* bitfield length */
+  int bstr;                     /* bitfield starting bit within byte */
+  int litval;                   /* source literal value (if AOP_LIT) */
+  unsigned char mask;           /* bitmask within current byte */
+  int litOffset = 0;
+  char *rematOffset = NULL;
 
-  D(emitcode (";     genPackBits",""));
+  D (emitcode (";     genPackBits", ""));
 
+  decodePointerOffset (left, &litOffset, &rematOffset);
   blen = SPEC_BLEN (etype);
   bstr = SPEC_BSTR (etype);
 
   /* If the bitfield length is less than a byte */
   if (blen < 8)
     {
-      mask = ((unsigned char) (0xFF << (blen + bstr)) |
-              (unsigned char) (0xFF >> (8 - bstr)));
+      mask = ((unsigned char) (0xFF << (blen + bstr)) | (unsigned char) (0xFF >> (8 - bstr)));
 
       if (AOP_TYPE (right) == AOP_LIT)
         {
           /* Case with a bitfield length <8 and literal source
-          */
+           */
           litval = (int) ulFromVal (AOP (right)->aopu.aop_lit);
           litval <<= bstr;
           litval &= (~mask) & 0xff;
 
-          emitcode ("lda", ",x");
-          if ((mask|litval)!=0xff)
-            emitcode ("and","#0x%02x", mask);
+          loadRegIndexed (hc08_reg_a, litOffset, rematOffset);
+          if ((mask | litval) != 0xff)
+            {
+              emitcode ("and", "#0x%02x", mask);
+              regalloc_dry_run_cost += 2;
+            }
           if (litval)
-            emitcode ("ora","#0x%02x", litval);
+            {
+              emitcode ("ora", "#0x%02x", litval);
+              regalloc_dry_run_cost += 2;
+            }
           hc08_dirtyReg (hc08_reg_a, FALSE);
-          emitcode ("sta", ",x");
+          storeRegIndexed (hc08_reg_a, litOffset, rematOffset);
 
           hc08_freeReg (hc08_reg_a);
           return;
         }
 
       /* Case with a bitfield length < 8 and arbitrary source
-      */
+       */
       loadRegFromAop (hc08_reg_a, AOP (right), 0);
       /* shift and mask source value */
       AccLsh (bstr);
       emitcode ("and", "#0x%02x", (~mask) & 0xff);
+      regalloc_dry_run_cost += 2;
       hc08_dirtyReg (hc08_reg_a, FALSE);
       pushReg (hc08_reg_a, TRUE);
 
-      emitcode ("lda", ",x");
+      loadRegIndexed (hc08_reg_a, litOffset, rematOffset);
       emitcode ("and", "#0x%02x", mask);
       emitcode ("ora", "1,s");
-      emitcode ("sta", ",x");
+      regalloc_dry_run_cost += 5;
+      storeRegIndexed (hc08_reg_a, litOffset, rematOffset);
       pullReg (hc08_reg_a);
 
       hc08_freeReg (hc08_reg_a);
@@ -7461,17 +8730,18 @@
 
   /* Bit length is greater than 7 bits. In this case, copy  */
   /* all except the partial byte at the end                 */
-  for (rlen=blen;rlen>=8;rlen-=8)
+  for (rlen = blen; rlen >= 8; rlen -= 8)
     {
-      if (AOP (right)->type == AOP_DIR)
+      if (!litOffset && !rematOffset && AOP (right)->type == AOP_DIR)
         {
-          emitcode ("mov", "%s,x+", aopAdrStr(AOP (right), offset, FALSE));
-          xoffset++;
+          emitcode ("mov", "%s,x+", aopAdrStr (AOP (right), offset, FALSE));
+          regalloc_dry_run_cost += 2;
+          litOffset--;
         }
       else
         {
           loadRegFromAop (hc08_reg_a, AOP (right), offset);
-          emitcode ("sta", "%d,x", offset);
+          storeRegIndexed (hc08_reg_a, litOffset+offset, rematOffset);
         }
       offset++;
     }
@@ -7479,38 +8749,45 @@
   /* If there was a partial byte at the end */
   if (rlen)
     {
-      mask = (((unsigned char) -1 << rlen) & 0xff);
+      mask = (((unsigned char) - 1 << rlen) & 0xff);
 
       if (AOP_TYPE (right) == AOP_LIT)
         {
           /* Case with partial byte and literal source
-          */
+           */
           litval = (int) ulFromVal (AOP (right)->aopu.aop_lit);
-          litval >>= (blen-rlen);
+          litval >>= (blen - rlen);
           litval &= (~mask) & 0xff;
-          emitcode ("lda", "%d,x", offset - xoffset);
-          hc08_dirtyReg (hc08_reg_a, FALSE);
-          if ((mask|litval)!=0xff)
-            emitcode ("and","#0x%02x", mask);
+          loadRegIndexed (hc08_reg_a, litOffset+offset, rematOffset);
+          if ((mask | litval) != 0xff)
+            {
+              emitcode ("and", "#0x%02x", mask);
+              regalloc_dry_run_cost += 2;
+            }
           if (litval)
-            emitcode ("ora","#0x%02x", litval);
-          emitcode ("sta", "%d,x", offset - xoffset);
+            {
+              emitcode ("ora", "#0x%02x", litval);
+              regalloc_dry_run_cost += 2;
+            }
           hc08_dirtyReg (hc08_reg_a, FALSE);
+          storeRegIndexed (hc08_reg_a, litOffset+offset, rematOffset);
           hc08_freeReg (hc08_reg_a);
           return;
         }
 
       /* Case with partial byte and arbitrary source
-      */
+       */
       loadRegFromAop (hc08_reg_a, AOP (right), offset);
       emitcode ("and", "#0x%02x", (~mask) & 0xff);
+      regalloc_dry_run_cost += 2;
       hc08_dirtyReg (hc08_reg_a, FALSE);
       pushReg (hc08_reg_a, TRUE);
 
-      emitcode ("lda", "%d,x", offset - xoffset);
+      loadRegIndexed(hc08_reg_a, litOffset+offset, rematOffset);
       emitcode ("and", "#0x%02x", mask);
       emitcode ("ora", "1,s");
-      emitcode ("sta", "%d,x", offset - xoffset);
+      regalloc_dry_run_cost += 5;
+      storeRegIndexed (hc08_reg_a, litOffset+offset, rematOffset);
       pullReg (hc08_reg_a);
     }
 
@@ -7521,26 +8798,31 @@
 /* genPackBitsImmed - generates code for packed bit storage        */
 /*-----------------------------------------------------------------*/
 static void
-genPackBitsImmed (operand *result, sym_link * etype, operand * right, iCode * ic)
+genPackBitsImmed (operand * result, operand * left, sym_link * etype, operand * right, iCode * ic)
 {
   asmop *derefaop;
   int size;
-  int offset = 0;       /* source byte offset */
-  int rlen = 0;         /* remaining bitfield length */
-  int blen;             /* bitfield length */
-  int bstr;             /* bitfield starting bit within byte */
-  int litval;           /* source literal value (if AOP_LIT) */
-  unsigned char mask;   /* bitmask within current byte */
+  int offset = 0;               /* source byte offset */
+  int rlen = 0;                 /* remaining bitfield length */
+  int blen;                     /* bitfield length */
+  int bstr;                     /* bitfield starting bit within byte */
+  int litval;                   /* source literal value (if AOP_LIT) */
+  unsigned char mask;           /* bitmask within current byte */
+  bool needpulla;
+  int litOffset = 0;
+  char *rematOffset = NULL;
 
-  D(emitcode (";     genPackBitsImmed",""));
+  D (emitcode (";     genPackBitsImmed", ""));
 
   blen = SPEC_BLEN (etype);
   bstr = SPEC_BSTR (etype);
 
   aopOp (right, ic, FALSE);
   size = AOP_SIZE (right);
+  decodePointerOffset (left, &litOffset, &rematOffset);
+  wassert (!rematOffset);
 
-  derefaop = aopDerefAop (AOP (result));
+  derefaop = aopDerefAop (AOP (result), litOffset);
   freeAsmop (result, NULL, ic, TRUE);
   derefaop->size = size;
 
@@ -7551,23 +8833,29 @@
         {
           litval = (int) ulFromVal (AOP (right)->aopu.aop_lit);
 
-          emitcode ((litval & 1) ? "bset" : "bclr",
-                    "#%d,%s", bstr, aopAdrStr (derefaop, 0, FALSE));
+          emitcode ((litval & 1) ? "bset" : "bclr", "#%d,%s", bstr, aopAdrStr (derefaop, 0, FALSE));
+          regalloc_dry_run_cost += 2;
         }
       else
         {
-          symbol *tlbl1 = newiTempLabel (NULL);
-          symbol *tlbl2 = newiTempLabel (NULL);
+          symbol *tlbl1 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
+          symbol *tlbl2 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
 
+          needpulla = pushRegIfSurv (hc08_reg_a);
           loadRegFromAop (hc08_reg_a, AOP (right), 0);
-          emitcode ("bit", "#1");
-          emitBranch ("bne", tlbl1);
+          emitcode ("lsra", "");
+          regalloc_dry_run_cost++;
+          emitBranch ("bcs", tlbl1);
           emitcode ("bclr", "#%d,%s", bstr, aopAdrStr (derefaop, 0, FALSE));
+          regalloc_dry_run_cost += 2;
           emitBranch ("bra", tlbl2);
-          emitLabel (tlbl1);
+          if (!regalloc_dry_run)
+            emitLabel (tlbl1);
           emitcode ("bset", "#%d,%s", bstr, aopAdrStr (derefaop, 0, FALSE));
-          emitLabel (tlbl2);
-          hc08_freeReg (hc08_reg_a);
+          regalloc_dry_run_cost += 2;
+          if (!regalloc_dry_run)
+            emitLabel (tlbl2);
+          pullOrFreeReg (hc08_reg_a, needpulla);
         }
       goto release;
     }
@@ -7575,92 +8863,112 @@
   /* If the bitfield length is less than a byte */
   if (blen < 8)
     {
-      mask = ((unsigned char) (0xFF << (blen + bstr)) |
-              (unsigned char) (0xFF >> (8 - bstr)));
+      mask = ((unsigned char) (0xFF << (blen + bstr)) | (unsigned char) (0xFF >> (8 - bstr)));
 
       if (AOP_TYPE (right) == AOP_LIT)
         {
           /* Case with a bitfield length <8 and literal source
-          */
+           */
           litval = (int) ulFromVal (AOP (right)->aopu.aop_lit);
           litval <<= bstr;
           litval &= (~mask) & 0xff;
 
+          needpulla = pushRegIfSurv (hc08_reg_a);
           loadRegFromAop (hc08_reg_a, derefaop, 0);
-          if ((mask|litval)!=0xff)
-            emitcode ("and","#0x%02x", mask);
+          if ((mask | litval) != 0xff)
+            {
+              emitcode ("and", "#0x%02x", mask);
+              regalloc_dry_run_cost += 2;
+            }
           if (litval)
-            emitcode ("ora","#0x%02x", litval);
+            {
+              emitcode ("ora", "#0x%02x", litval);
+              regalloc_dry_run_cost += 2;
+            }
           hc08_dirtyReg (hc08_reg_a, FALSE);
           storeRegToAop (hc08_reg_a, derefaop, 0);
 
-          hc08_freeReg (hc08_reg_a);
+          pullOrFreeReg (hc08_reg_a, needpulla);
           goto release;
         }
 
       /* Case with a bitfield length < 8 and arbitrary source
-      */
+       */
+      needpulla = pushRegIfSurv (hc08_reg_a);
       loadRegFromAop (hc08_reg_a, AOP (right), 0);
       /* shift and mask source value */
       AccLsh (bstr);
       emitcode ("and", "#0x%02x", (~mask) & 0xff);
+      regalloc_dry_run_cost += 2;
       hc08_dirtyReg (hc08_reg_a, FALSE);
       pushReg (hc08_reg_a, TRUE);
 
       loadRegFromAop (hc08_reg_a, derefaop, 0);
       emitcode ("and", "#0x%02x", mask);
       emitcode ("ora", "1,s");
+      regalloc_dry_run_cost += 5;
       storeRegToAop (hc08_reg_a, derefaop, 0);
       pullReg (hc08_reg_a);
 
-      hc08_freeReg (hc08_reg_a);
+      pullOrFreeReg (hc08_reg_a, needpulla);
       goto release;
     }
 
   /* Bit length is greater than 7 bits. In this case, copy  */
   /* all except the partial byte at the end                 */
-  for (rlen=blen;rlen>=8;rlen-=8)
+  for (rlen = blen; rlen >= 8; rlen -= 8)
     {
-      transferAopAop (AOP (right), offset, derefaop, size-offset-1);
+      transferAopAop (AOP (right), offset, derefaop, size - offset - 1);
       offset++;
     }
 
   /* If there was a partial byte at the end */
   if (rlen)
     {
-      mask = (((unsigned char) -1 << rlen) & 0xff);
+      mask = (((unsigned char) - 1 << rlen) & 0xff);
 
       if (AOP_TYPE (right) == AOP_LIT)
         {
           /* Case with partial byte and literal source
-          */
+           */
           litval = (int) ulFromVal (AOP (right)->aopu.aop_lit);
-          litval >>= (blen-rlen);
+          litval >>= (blen - rlen);
           litval &= (~mask) & 0xff;
-          loadRegFromAop (hc08_reg_a, derefaop, size-offset-1);
-          if ((mask|litval)!=0xff)
-            emitcode ("and","#0x%02x", mask);
+          needpulla = pushRegIfSurv (hc08_reg_a);
+          loadRegFromAop (hc08_reg_a, derefaop, size - offset - 1);
+          if ((mask | litval) != 0xff)
+            {
+              emitcode ("and", "#0x%02x", mask);
+              regalloc_dry_run_cost += 2;
+            }
           if (litval)
-            emitcode ("ora","#0x%02x", litval);
+            {
+              emitcode ("ora", "#0x%02x", litval);
+              regalloc_dry_run_cost += 2;
+            }
           hc08_dirtyReg (hc08_reg_a, FALSE);
-          storeRegToAop (hc08_reg_a, derefaop, size-offset-1);
+          storeRegToAop (hc08_reg_a, derefaop, size - offset - 1);
           hc08_dirtyReg (hc08_reg_a, FALSE);
-          hc08_freeReg (hc08_reg_a);
+          pullOrFreeReg (hc08_reg_a, needpulla);
           goto release;
         }
 
       /* Case with partial byte and arbitrary source
-      */
+       */
+      needpulla = pushRegIfSurv (hc08_reg_a);
       loadRegFromAop (hc08_reg_a, AOP (right), offset);
       emitcode ("and", "#0x%02x", (~mask) & 0xff);
+      regalloc_dry_run_cost += 2;
       hc08_dirtyReg (hc08_reg_a, FALSE);
       pushReg (hc08_reg_a, TRUE);
 
-      loadRegFromAop (hc08_reg_a, derefaop, size-offset-1);
+      loadRegFromAop (hc08_reg_a, derefaop, size - offset - 1);
       emitcode ("and", "#0x%02x", mask);
       emitcode ("ora", "1,s");
-      storeRegToAop (hc08_reg_a, derefaop, size-offset-1);
+      regalloc_dry_run_cost += 5;
+      storeRegToAop (hc08_reg_a, derefaop, size - offset - 1);
       pullReg (hc08_reg_a);
+      pullOrFreeReg (hc08_reg_a, needpulla);
     }
 
   hc08_freeReg (hc08_reg_a);
@@ -7674,19 +8982,21 @@
 /* genDataPointerSet - remat pointer to data space                 */
 /*-----------------------------------------------------------------*/
 static void
-genDataPointerSet (operand * right,
-                   operand * result,
-                   iCode * ic)
+genDataPointerSet (operand * left, operand * right, operand * result, iCode * ic)
 {
   int size;
   asmop *derefaop;
+  int litOffset = 0;
+  char *rematOffset = NULL;
 
-  D(emitcode (";     genDataPointerSet",""));
+  D (emitcode (";     genDataPointerSet", ""));
 
   aopOp (right, ic, FALSE);
   size = AOP_SIZE (right);
+  decodePointerOffset (left, &litOffset, &rematOffset);
+  wassert (!rematOffset);
 
-  derefaop = aopDerefAop (AOP (result));
+  derefaop = aopDerefAop (AOP (result), litOffset);
   freeAsmop (result, NULL, ic, TRUE);
   derefaop->size = size;
 
@@ -7704,19 +9014,20 @@
 /* genPointerSet - stores the value into a pointer location        */
 /*-----------------------------------------------------------------*/
 static void
-genPointerSet (iCode * ic, iCode *pi)
+genPointerSet (iCode * ic, iCode * pi)
 {
+  operand *left = IC_LEFT (ic);
   operand *right = IC_RIGHT (ic);
   operand *result = IC_RESULT (ic);
-  sym_link *type, *etype;
   int size, offset;
   sym_link *retype = getSpec (operandType (right));
   sym_link *letype = getSpec (operandType (result));
+  bool needpullx = FALSE;
+  bool needpullh = FALSE;
+  int litOffset = 0;
+  char *rematOffset = NULL;
 
-  D(emitcode (";     genPointerSet",""));
-
-  type = operandType (result);
-  etype = getSpec (type);
+  D (emitcode (";     genPointerSet", ""));
 
   aopOp (result, ic, FALSE);
 
@@ -7725,41 +9036,45 @@
     {
       if (!IS_BITVAR (retype) && !IS_BITVAR (letype))
         {
-          genDataPointerSet (right, result, ic);
+          genDataPointerSet (left, right, result, ic);
           return;
         }
       else
         {
-          genPackBitsImmed (result, (IS_BITVAR (retype) ? retype : letype), right, ic);
+          genPackBitsImmed (result, left, (IS_BITVAR (retype) ? retype : letype), right, ic);
           return;
         }
     }
 
+  if (AOP_TYPE (result) == AOP_REG && pi)
+    { 
+      int i;
+      for (i = 0; i < AOP_SIZE (result); i++)
+        AOP (result)->aopu.aop_reg[i]->isDead = TRUE;
+    }
+
+  needpullx = pushRegIfSurv (hc08_reg_x);
+  needpullh = pushRegIfSurv (hc08_reg_h);
+
   /* if the operand is already in hx
      then we do nothing else we move the value to hx */
-  if (AOP_TYPE (result) != AOP_STR)
-    {
-      loadRegFromAop (hc08_reg_hx, AOP (result), 0);
-    }
+  loadRegFromAop (hc08_reg_hx, AOP (result), 0);
   /* so hx now contains the address */
   aopOp (right, ic, FALSE);
+  size = AOP_SIZE (right);
 
   /* if bit then unpack */
   if (IS_BITVAR (retype) || IS_BITVAR (letype))
-    genPackBits ((IS_BITVAR (retype) ? retype : letype), right);
+    genPackBits (left, (IS_BITVAR (retype) ? retype : letype), right);
   else
     {
-      size = AOP_SIZE (right);
-      offset = size-1;
+      decodePointerOffset (left, &litOffset, &rematOffset);
+      offset = size;
 
-      while (size--)
+      while (offset--)
         {
-          loadRegFromAop (hc08_reg_a, AOP (right), offset--);
-          accopWithMisc ("sta", ",x");
-          if (size || pi)
-            {
-              emitcode ("aix", "#1");
-            }
+          loadRegFromAop (hc08_reg_a, AOP (right), offset);
+          storeRegIndexed (hc08_reg_a, litOffset + size - offset - 1, rematOffset);
           hc08_freeReg (hc08_reg_a);
         }
     }
@@ -7767,15 +9082,18 @@
   freeAsmop (result, NULL, ic, TRUE);
   freeAsmop (right, NULL, ic, TRUE);
 
-  if (pi) {
-    aopOp (IC_RESULT (pi), pi, FALSE);
-    storeRegToAop (hc08_reg_hx, AOP (IC_RESULT (pi)), 0);
-    freeAsmop (IC_RESULT (pi), NULL, pi, TRUE);
-    pi->generated=1;
-  }
-
-  hc08_freeReg (hc08_reg_hx);
+  if (pi)
+    {
+      aopOp (IC_RESULT (pi), pi, FALSE);
+      emitcode ("aix", "#%d", size);
+      hc08_dirtyReg (hc08_reg_hx, FALSE);
+      storeRegToAop (hc08_reg_hx, AOP (IC_RESULT (pi)), 0);
+      freeAsmop (IC_RESULT (pi), NULL, pi, TRUE);
+      pi->generated = 1;
+    }
 
+  pullOrFreeReg (hc08_reg_h, needpullh);
+  pullOrFreeReg (hc08_reg_x, needpullx);
 }
 
 /*-----------------------------------------------------------------*/
@@ -7787,7 +9105,7 @@
   operand *cond = IC_COND (ic);
   int isbit = 0;
 
-  D(emitcode (";     genIfx",""));
+  D (emitcode (";     genIfx", ""));
 
   aopOp (cond, ic, FALSE);
 
@@ -7828,8 +9146,7 @@
     genIpop (popIc);
 
   /* if the condition is  a bit variable */
-  if (isbit && IS_ITEMP (cond) &&
-      SPIL_LOC (cond))
+  if (isbit && IS_ITEMP (cond) && SPIL_LOC (cond))
     genIfxJump (ic, SPIL_LOC (cond)->rname);
   else if (isbit && !IS_ITEMP (cond))
     genIfxJump (ic, OP_SYMBOL (cond)->rname);
@@ -7847,8 +9164,9 @@
 {
   symbol *sym = OP_SYMBOL (IC_LEFT (ic));
   int size, offset;
+  bool needpullx, needpullh;
 
-  D(emitcode (";     genAddrOf",""));
+  D (emitcode (";     genAddrOf", ""));
 
   aopOp (IC_RESULT (ic), ic, FALSE);
 
@@ -7857,24 +9175,31 @@
      variable */
   if (sym->onStack)
     {
+      needpullx = pushRegIfSurv (hc08_reg_x);
+      needpullh = pushRegIfSurv (hc08_reg_h);
       /* if it has an offset then we need to compute it */
       offset = _G.stackOfs + _G.stackPushes + sym->stack;
       hc08_useReg (hc08_reg_hx);
       emitcode ("tsx", "");
+      hc08_dirtyReg (hc08_reg_hx, FALSE);
+      regalloc_dry_run_cost++;
       while (offset > 127)
         {
           emitcode ("aix", "#127");
+          regalloc_dry_run_cost += 2;
           offset -= 127;
         }
       while (offset < -128)
         {
           emitcode ("aix", "#-128");
+          regalloc_dry_run_cost += 2;
           offset += 128;
         }
       emitcode ("aix", "#%d", offset);
+      regalloc_dry_run_cost += 2;
       storeRegToFullAop (hc08_reg_hx, AOP (IC_RESULT (ic)), FALSE);
-      hc08_freeReg (hc08_reg_hx);
-
+      pullOrFreeReg (hc08_reg_h, needpullh);
+      pullOrFreeReg (hc08_reg_x, needpullx);
       goto release;
     }
 
@@ -7884,8 +9209,9 @@
 
   while (size--)
     {
-      char s[SDCC_NAME_MAX+10];
-      switch (offset) {
+      char s[SDCC_NAME_MAX + 10];
+      switch (offset)
+        {
         case 0:
           sprintf (s, "#%s", sym->rname);
           break;
@@ -7893,11 +9219,9 @@
           sprintf (s, "#>%s", sym->rname);
           break;
         default:
-          sprintf (s, "#(%s >> %d)",
-                   sym->rname,
-                   offset * 8);
-      }
-      storeConstToAop(s, AOP (IC_RESULT (ic)), offset++);
+          sprintf (s, "#(%s >> %d)", sym->rname, offset * 8);
+        }
+      storeConstToAop (s, AOP (IC_RESULT (ic)), offset++);
     }
 
 release:
@@ -7911,41 +9235,17 @@
 genAssign (iCode * ic)
 {
   operand *result, *right;
-  int size;
-//  unsigned long lit = 0L;
 
-  D(emitcode(";     genAssign",""));
+  D (emitcode (";     genAssign", ""));
 
   result = IC_RESULT (ic);
   right = IC_RIGHT (ic);
-
-  /* if they are the same */
-  if (operandsEqu (result, right)) {
-    return;
-  }
-
+  
   aopOp (right, ic, FALSE);
   aopOp (result, ic, TRUE);
 
-  /* if they are the same registers */
-  if (sameRegs (AOP (right), AOP (result)))
-    goto release;
-
-  if ((AOP_TYPE (right) == AOP_LIT)
-      && (IS_AOP_HX(AOP(result))))
-    {
-      loadRegFromAop(hc08_reg_hx, AOP (right), 0);
-      goto release;
-    }
+  genCopy (result, right);
 
-  /* general case */
-  size = AOP_SIZE (result);
-  while (size--)
-    {
-      transferAopAop (AOP (right), size, AOP (result), size);
-    }
-
-release:
   freeAsmop (right, NULL, ic, TRUE);
   freeAsmop (result, NULL, ic, TRUE);
 }
@@ -7957,58 +9257,73 @@
 genJumpTab (iCode * ic)
 {
   symbol *jtab;
-  symbol *jtablo = newiTempLabel (NULL);
-  symbol *jtabhi = newiTempLabel (NULL);
+  symbol *jtablo = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
+  symbol *jtabhi = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
 
-  D(emitcode (";     genJumpTab",""));
+  D (emitcode (";     genJumpTab", ""));
 
   aopOp (IC_JTCOND (ic), ic, FALSE);
 
-  if (hc08_reg_x->isFree && hc08_reg_x->isFree)
+  if (hc08_reg_x->isFree && hc08_reg_h->isFree)
     {
       /* get the condition into x */
       loadRegFromAop (hc08_reg_x, AOP (IC_JTCOND (ic)), 0);
       freeAsmop (IC_JTCOND (ic), NULL, ic, TRUE);
       loadRegFromConst (hc08_reg_h, zero);
 
-      emitcode ("lda", "%05d$,x", jtabhi->key + 100);
-      emitcode ("ldx", "%05d$,x", jtablo->key + 100);
+      if (!regalloc_dry_run)
+        {
+          emitcode ("lda", "%05d$,x", labelKey2num (jtabhi->key));
+          emitcode ("ldx", "%05d$,x", labelKey2num (jtablo->key));
+        }
+      regalloc_dry_run_cost += 6;
       transferRegReg (hc08_reg_a, hc08_reg_h, TRUE);
       emitcode ("jmp", ",x");
+      regalloc_dry_run_cost++;
 
       hc08_dirtyReg (hc08_reg_a, TRUE);
       hc08_dirtyReg (hc08_reg_hx, TRUE);
     }
   else
     {
-      adjustStack(-2);
-      pushReg(hc08_reg_hx, TRUE);
+      adjustStack (-2);
+      pushReg (hc08_reg_hx, TRUE);
 
       /* get the condition into x */
       loadRegFromAop (hc08_reg_x, AOP (IC_JTCOND (ic)), 0);
       freeAsmop (IC_JTCOND (ic), NULL, ic, TRUE);
       loadRegFromConst (hc08_reg_h, zero);
 
-      emitcode ("lda", "%05d$,x", jtabhi->key + 100);
+      if (!regalloc_dry_run)
+        emitcode ("lda", "%05d$,x", labelKey2num (jtabhi->key));
       emitcode ("sta", "3,s");
-      emitcode ("lda", "%05d$,x", jtablo->key + 100);
+      if (!regalloc_dry_run)
+        emitcode ("lda", "%05d$,x", labelKey2num (jtablo->key));
       emitcode ("sta", "4,s");
+      regalloc_dry_run_cost += 12;
 
-      pullReg(hc08_reg_hx);
+      pullReg (hc08_reg_hx);
       emitcode ("rts", "");
-      _G.stackPushes += 2;
-      updateCFA();
+      regalloc_dry_run_cost++;
+      _G.stackPushes -= 2;
+      updateCFA ();
     }
 
   /* now generate the jump labels */
-  emitLabel (jtablo);
-  for (jtab = setFirstItem (IC_JTLABELS (ic)); jtab;
-       jtab = setNextItem (IC_JTLABELS (ic)))
-    emitcode (".db", "%05d$", jtab->key + 100);
-  emitLabel (jtabhi);
-  for (jtab = setFirstItem (IC_JTLABELS (ic)); jtab;
-       jtab = setNextItem (IC_JTLABELS (ic)))
-    emitcode (".db", ">%05d$", jtab->key + 100);
+  if (!regalloc_dry_run)
+    emitLabel (jtablo);
+  for (jtab = setFirstItem (IC_JTLABELS (ic)); jtab; jtab = setNextItem (IC_JTLABELS (ic)))
+    {
+      emitcode (".db", "%05d$", labelKey2num (jtab->key));
+      regalloc_dry_run_cost++;
+    }
+  if (!regalloc_dry_run)
+    emitLabel (jtabhi);
+  for (jtab = setFirstItem (IC_JTLABELS (ic)); jtab; jtab = setNextItem (IC_JTLABELS (ic)))
+    {
+      emitcode (".db", ">%05d$", labelKey2num (jtab->key));
+      regalloc_dry_run_cost++;
+    }
 }
 
 /*-----------------------------------------------------------------*/
@@ -8018,12 +9333,13 @@
 genCast (iCode * ic)
 {
   operand *result = IC_RESULT (ic);
-  sym_link *ctype = operandType (IC_LEFT (ic));
   sym_link *rtype = operandType (IC_RIGHT (ic));
   operand *right = IC_RIGHT (ic);
   int size, offset;
+  bool signExtend;
+  bool save_a;
 
-  D(emitcode(";     genCast",""));
+  D (emitcode (";     genCast", ""));
 
   /* if they are equivalent then do nothing */
   if (operandsEqu (IC_RESULT (ic), IC_RIGHT (ic)))
@@ -8034,100 +9350,129 @@
 
   if (IS_BOOL (operandType (result)))
     {
+      bool needpulla = pushRegIfSurv (hc08_reg_a);
       asmopToBool (AOP (right), TRUE);
       storeRegToAop (hc08_reg_a, AOP (result), 0);
+      pullOrFreeReg (hc08_reg_a, needpulla);
       goto release;
     }
 
-  /* if they are the same size : or less */
-  if (AOP_SIZE (result) <= AOP_SIZE (right))
+  /* If the result is 1 byte, then just copy the one byte; there is */
+  /* nothing special required. */
+  if (AOP_SIZE (result) == 1)
     {
-      /* if they are in the same place */
-      #if 0
-      if (sameRegs (AOP (right), AOP (result)))
-        goto release;
-      #endif
-
-      /* if they in different places then copy */
-      size = AOP_SIZE (result);
-      offset = 0;
-      while (size--)
-        {
-          transferAopAop(AOP (right), offset, AOP (result), offset);
-          offset++;
-        }
+      transferAopAop (AOP (right), 0, AOP (result), 0);
       goto release;
     }
 
-  /* if the result is of type pointer */
-  if (IS_PTR (ctype))
+  signExtend = AOP_SIZE (result) > AOP_SIZE (right) && IS_SPEC (rtype) && !SPEC_USIGN (rtype);
+
+  /* If the result is 2 bytes and in registers, we have to be careful */
+  /* to make sure the registers are not overwritten prematurely. */
+  if (AOP_SIZE (result) == 2 && AOP (result)->type == AOP_REG)
     {
-      int p_type;
-      sym_link *type = operandType (right);
-      sym_link *etype = getSpec (type);
+      if (IS_AOP_HX (AOP (result)) && (AOP_SIZE (right) == 2))
+        {
+          loadRegFromAop (hc08_reg_hx, AOP (right), 0);
+          goto release;
+        }
 
-      /* pointer to generic pointer */
-      if (IS_GENPTR (ctype))
+      if (AOP_SIZE (right) == 1)
         {
-          if (IS_PTR (type))
-            p_type = DCL_TYPE (type);
+          transferAopAop (AOP (right), 0, AOP (result), 0);
+          if (!signExtend)
+            storeConstToAop (zero, AOP (result), 1);
           else
             {
-              if (SPEC_SCLS(etype)==S_REGISTER) {
-                // let's assume it is a generic pointer
-                p_type=GPOINTER;
-              } else {
-                /* we have to go by the storage class */
-                p_type = PTR_TYPE (SPEC_OCLS (etype));
-              }
+              save_a = (AOP (result)->aopu.aop_reg[0] == hc08_reg_a || !hc08_reg_a->isDead);
+
+              /* we need to extend the sign :{ */
+              if (save_a)
+                pushReg(hc08_reg_a, FALSE);
+              if (AOP (result)->aopu.aop_reg[0] != hc08_reg_a)
+                loadRegFromAop (hc08_reg_a, AOP (right), 0);
+              accopWithMisc ("rola", "");
+              accopWithMisc ("clra", "");
+              accopWithMisc ("sbc", zero);
+              storeRegToAop (hc08_reg_a, AOP (result), 1);
+              if (save_a)
+                pullReg(hc08_reg_a);
             }
+          goto release;
+        }
 
-          /* the first two bytes are known */
-          size = GPTRSIZE - 1;
-          offset = 0;
-          while (size--)
+      if (AOP (right)->type == AOP_REG)
+        {
+          wassert (AOP_SIZE (right) == 2);
+          /* Source and destination are the same size; no need for sign */
+          /* extension or zero padding. Just copy in the order that */
+          /* won't prematurely overwrite the source. */
+          if (AOP (result)->aopu.aop_reg[0] == AOP (right)->aopu.aop_reg[1])
             {
-              transferAopAop(AOP (right), offset, AOP (result), offset);
-              offset++;
+              transferAopAop (AOP (right), 1, AOP (result), 1);
+              transferAopAop (AOP (right), 0, AOP (result), 0);
+            }
+          else
+            {
+              transferAopAop (AOP (right), 0, AOP (result), 0);
+              transferAopAop (AOP (right), 1, AOP (result), 1);
             }
-          /* the last byte depending on type */
           goto release;
         }
-
-      /* just copy the pointers */
-      size = AOP_SIZE (result);
-      offset = 0;
-      while (size--)
+      else
         {
-          transferAopAop(AOP (right), offset, AOP (result), offset);
-          offset++;
+          /* Source is at least 2 bytes and not in registers; no need */
+          /* for sign extension or zero padding. Just copy. */
+          transferAopAop (AOP (right), 0, AOP (result), 0);
+          transferAopAop (AOP (right), 1, AOP (result), 1);
+          goto release;
         }
-      goto release;
     }
 
-  /* so we now know that the size of destination is greater
-     than the size of the source */
-  /* we move to result for the size of source */
-  size = AOP_SIZE (right);
+  wassert (AOP (result)->type != AOP_REG);
+  
+  save_a = !hc08_reg_a->isDead && signExtend;
+  if (save_a)
+    pushReg(hc08_reg_a, TRUE);
+
   offset = 0;
-  while (size--)
+  size = AOP_SIZE (right);
+  if (AOP_SIZE (result) < size)
+    size = AOP_SIZE (result);
+  while (size)
     {
-      transferAopAop(AOP (right), offset, AOP (result), offset);
-      offset++;
+      if (size == 1 && signExtend)
+        {
+          loadRegFromAop (hc08_reg_a, AOP (right), offset);
+          storeRegToAop (hc08_reg_a, AOP (result), offset);
+          offset++;
+          size--;
+        }
+      else if ((size > 2 || size >= 2 && !signExtend) && hc08_reg_h->isDead && hc08_reg_x->isDead && 
+        (AOP_TYPE (right) == AOP_IMMD || IS_S08 && AOP_TYPE (right) == AOP_EXT) &&
+        (AOP_TYPE (result) == AOP_DIR || IS_S08 && AOP_TYPE (result) == AOP_EXT))
+        {
+          loadRegFromAop (hc08_reg_hx, AOP (right), offset);
+          storeRegToAop (hc08_reg_hx, AOP (result), offset);
+          offset += 2;
+          size -= 2;
+        }
+      else
+        {
+          transferAopAop (AOP (right), offset, AOP (result), offset);
+          offset++;
+          size--;
+        }
     }
 
-  /* now depending on the sign of the source && destination */
-  size = AOP_SIZE (result) - AOP_SIZE (right);
-  /* if unsigned or not an integral type */
-  if (!IS_SPEC (rtype) || SPEC_USIGN (rtype) || AOP_TYPE(right)==AOP_CRY)
+  size = AOP_SIZE (result) - offset;
+  if (size && !signExtend)
     {
       while (size--)
         storeConstToAop (zero, AOP (result), offset++);
     }
-  else
+  else if (size)
     {
-      /* we need to extend the sign :{ */
-      loadRegFromAop (hc08_reg_a, AOP (right), AOP_SIZE (right) -1);
       accopWithMisc ("rola", "");
       accopWithMisc ("clra", "");
       accopWithMisc ("sbc", zero);
@@ -8135,6 +9480,9 @@
         storeRegToAop (hc08_reg_a, AOP (result), offset++);
     }
 
+  if (save_a)
+    pullReg(hc08_reg_a);
+
   /* we are done hurray !!!! */
 
 release:
@@ -8153,7 +9501,7 @@
   if (!ifx)
     return 0;
 
-  D(emitcode (";     genDjnz",""));
+  D (emitcode (";     genDjnz", ""));
 
   /* if the if condition has a false label
      then we cannot save */
@@ -8162,8 +9510,7 @@
 
   /* if the minus is not of the form
      a = a - 1 */
-  if (!isOperandEqual (IC_RESULT (ic), IC_LEFT (ic)) ||
-      !IS_OP_LITERAL (IC_RIGHT (ic)))
+  if (!isOperandEqual (IC_RESULT (ic), IC_LEFT (ic)) || !IS_OP_LITERAL (IC_RIGHT (ic)))
     return 0;
 
   if (operandLitValue (IC_RIGHT (ic)) != 1)
@@ -8178,24 +9525,41 @@
 //  if (getSize (operandType (IC_RESULT (ic))) > 1)
 //    return 0;
   aopOp (IC_RESULT (ic), ic, FALSE);
-  if (AOP_SIZE (IC_RESULT (ic))>1)
+  if (AOP_SIZE (IC_RESULT (ic)) > 1 || IS_AOP_H (AOP (IC_RESULT (ic))))
     {
       freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
       return 0;
     }
 
   /* otherwise we can save BIG */
-  lbl = newiTempLabel (NULL);
-  lbl1 = newiTempLabel (NULL);
-
+  lbl = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
+  lbl1 = (regalloc_dry_run ? 0 : newiTempLabel (NULL));
 
-  emitcode ("dbnz", "%s,%05d$", aopAdrStr (AOP (IC_RESULT (ic)), 0, FALSE),
-                lbl->key + 100);
+  if (IS_AOP_A (AOP (IC_RESULT (ic))))
+    {
+      if (!regalloc_dry_run)
+        emitcode ("dbnza", "%05d$", labelKey2num (lbl->key));
+      regalloc_dry_run_cost += 2;
+    }
+  else if (IS_AOP_X (AOP (IC_RESULT (ic))))
+    {
+      if (!regalloc_dry_run)
+        emitcode ("dbnzx", "%05d$", labelKey2num (lbl->key));
+      regalloc_dry_run_cost += 2;
+    }
+  else
+    {
+      if (!regalloc_dry_run)
+        emitcode ("dbnz", "%s,%05d$", aopAdrStr (AOP (IC_RESULT (ic)), 0, FALSE), labelKey2num (lbl->key));
+      regalloc_dry_run_cost += 3; // TODO: Stack aop cost.
+    }
 
   emitBranch ("bra", lbl1);
-  emitLabel (lbl);
+  if (!regalloc_dry_run)
+    emitLabel (lbl);
   emitBranch ("jmp", IC_TRUE (ifx));
-  emitLabel (lbl1);
+  if (!regalloc_dry_run)
+    emitLabel (lbl1);
 
   freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
   ifx->generated = 1;
@@ -8210,21 +9574,40 @@
 {
   int size;
   int offset;
-  D(emitcode (";     genReceive",""));
+  bool delayed_x = FALSE;
+
+  D (emitcode (";", "genReceive"));
 
   aopOp (IC_RESULT (ic), ic, FALSE);
   size = AOP_SIZE (IC_RESULT (ic));
   offset = 0;
 
-  if (ic->argreg) {
-      while (size--) {
-          transferAopAop( hc08_aop_pass[offset+(ic->argreg-1)], 0,
-                          AOP (IC_RESULT (ic)), offset);
+  if (ic->argreg && IS_AOP_HX (AOP (IC_RESULT (ic))) && (offset + (ic->argreg - 1)) == 0)
+    {
+      pushReg (hc08_reg_x, TRUE);
+      emitcode ("tax", "");
+      regalloc_dry_run_cost++;
+      pullReg (hc08_reg_h);
+    }
+  else if (ic->argreg)
+    {
+      while (size--)
+        {
+          if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG && !(offset + (ic->argreg - 1)) && AOP (IC_RESULT (ic))->aopu.aop_reg[0]->rIdx == X_IDX && size)
+            {
+              pushReg (hc08_reg_a, TRUE);
+              delayed_x = TRUE;
+            }
+          else
+            transferAopAop (hc08_aop_pass[offset + (ic->argreg - 1)], 0, AOP (IC_RESULT (ic)), offset);
           if (hc08_aop_pass[offset]->type == AOP_REG)
             hc08_freeReg (hc08_aop_pass[offset]->aopu.aop_reg[0]);
           offset++;
-      }
-  }
+        }
+    }
+
+  if (delayed_x)
+    pullReg (hc08_reg_x);
 
   freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
 }
@@ -8237,27 +9620,30 @@
 {
   operand *op;
   int size, offset;
+  bool needpulla;
 
-  D(emitcode(";     genDummyRead",""));
+  D (emitcode (";     genDummyRead", ""));
 
   op = IC_RIGHT (ic);
+
+  needpulla = pushRegIfSurv (hc08_reg_a);
   if (op && IS_SYMOP (op))
     {
 
       aopOp (op, ic, FALSE);
 
       size = AOP_SIZE (op);
-      offset = 0;
+      offset = size - 1;
 
       while (size--)
         {
           loadRegFromAop (hc08_reg_a, AOP (op), offset);
           hc08_freeReg (hc08_reg_a);
-          offset++;
+          offset--;
         }
 
       freeAsmop (op, NULL, ic, TRUE);
-   }
+    }
   op = IC_LEFT (ic);
   if (op && IS_SYMOP (op))
     {
@@ -8265,33 +9651,36 @@
       aopOp (op, ic, FALSE);
 
       size = AOP_SIZE (op);
-      offset = 0;
+      offset = size - 1;
 
       while (size--)
         {
           loadRegFromAop (hc08_reg_a, AOP (op), offset);
           hc08_freeReg (hc08_reg_a);
-          offset++;
+          offset--;
         }
 
       freeAsmop (op, NULL, ic, TRUE);
-   }
+    }
+  pullOrFreeReg (hc08_reg_a, needpulla);
 }
 
 /*-----------------------------------------------------------------*/
 /* genCritical - generate code for start of a critical sequence    */
 /*-----------------------------------------------------------------*/
 static void
-genCritical (iCode *ic)
+genCritical (iCode * ic)
 {
-  D(emitcode(";     genCritical",""));
+  D (emitcode (";     genCritical", ""));
 
   if (IC_RESULT (ic))
     aopOp (IC_RESULT (ic), ic, TRUE);
 
   emitcode ("tpa", "");
+  regalloc_dry_run_cost++;
   hc08_dirtyReg (hc08_reg_a, FALSE);
   emitcode ("sei", "");
+  regalloc_dry_run_cost++;
 
   if (IC_RESULT (ic))
     storeRegToAop (hc08_reg_a, AOP (IC_RESULT (ic)), 0);
@@ -8307,15 +9696,16 @@
 /* genEndCritical - generate code for end of a critical sequence   */
 /*-----------------------------------------------------------------*/
 static void
-genEndCritical (iCode *ic)
+genEndCritical (iCode * ic)
 {
-  D(emitcode(";     genEndCritical",""));
+  D (emitcode (";     genEndCritical", ""));
 
   if (IC_RIGHT (ic))
     {
       aopOp (IC_RIGHT (ic), ic, FALSE);
       loadRegFromAop (hc08_reg_a, AOP (IC_RIGHT (ic)), 0);
       emitcode ("tap", "");
+      regalloc_dry_run_cost++;
       hc08_freeReg (hc08_reg_a);
       freeAsmop (IC_RIGHT (ic), NULL, ic, TRUE);
     }
@@ -8323,380 +9713,479 @@
     {
       pullReg (hc08_reg_a);
       emitcode ("tap", "");
+      regalloc_dry_run_cost++;
     }
 }
 
-
-
-/*-----------------------------------------------------------------*/
-/* genhc08Code - generate code for HC08 based controllers          */
-/*-----------------------------------------------------------------*/
-void
-genhc08Code (iCode * lic)
+static void
+updateiTempRegisterUse (operand * op)
 {
-  iCode *ic;
-  int cln = 0;
-  int clevel = 0;
-  int cblock = 0;
-
-  lineHead = lineCurr = NULL;
+  symbol *sym;
 
-  /* print the allocation information */
-  if (allocInfo && currFunc)
-    printAllocInfo (currFunc, codeOutBuf);
-  /* if debug information required */
-  if (options.debug && currFunc)
+  if (IS_ITEMP (op))
     {
-      debugFile->writeFunction (currFunc, lic);
-      #if 0
-      _G.debugLine = 1;
-      if (IS_STATIC (currFunc->etype))
-        emitcode ("", "F%s$%s$0$0 ==.", moduleName, currFunc->name);
-      else
-        emitcode ("", "G$%s$0$0 ==.", currFunc->name);
-      _G.debugLine = 0;
-      #endif
+      sym = OP_SYMBOL (op);
+      if (!sym->isspilt)
+        {
+	  /* If only used by IFX, there might not be any register assigned */
+          int i;
+          for(i = 0; i < sym->nRegs; i++)
+            if (sym->regs[i])
+              hc08_useReg (sym->regs[i]);
+        }
     }
-  /* stack pointer name */
-  if (options.useXstack)
-    spname = "_spx";
-  else
-    spname = "sp";
-
-  debugFile->writeFrameAddress (NULL, NULL, 0);  /* have no idea where frame is now */
-
-  hc08_aop_pass[0] = newAsmop (AOP_REG);
-  hc08_aop_pass[0]->size=1;
-  hc08_aop_pass[0]->aopu.aop_reg[0] = hc08_reg_a;
-  hc08_aop_pass[1] = newAsmop (AOP_REG);
-  hc08_aop_pass[1]->size=1;
-  hc08_aop_pass[1]->aopu.aop_reg[0] = hc08_reg_x;
-  hc08_aop_pass[2] = newAsmop (AOP_DIR);
-  hc08_aop_pass[2]->size=1;
-  hc08_aop_pass[2]->aopu.aop_dir = "__ret2";
-  hc08_aop_pass[3] = newAsmop (AOP_DIR);
-  hc08_aop_pass[3]->size=1;
-  hc08_aop_pass[3]->aopu.aop_dir = "__ret3";
+}
 
-  for (ic = lic; ic; ic = ic->next)
-    {
+/*---------------------------------------------------------------------------------------*/
+/* genhc08iode - generate code for HC08 based controllers for a single iCode instruction */
+/*---------------------------------------------------------------------------------------*/
+static void
+genhc08iCode (iCode *ic)
+{
+  /* if the result is marked as
+     spilt and rematerializable or code for
+     this has already been generated then
+     do nothing */
+  if (resultRemat (ic) || ic->generated)
+    return;
 
-      _G.current_iCode = ic;
+  {
+    int i;
+    reg_info *reg;
 
-      if (ic->level != clevel || ic->block != cblock)
-        {
-          if (options.debug)
-            {
-              debugFile->writeScope(ic);
-            }
-          clevel = ic->level;
-          cblock = ic->block;
-        }
+    initGenLineElement ();
+    genLine.lineElement.ic = ic;
 
-      if (ic->lineno && cln != ic->lineno)
-        {
-          if (options.debug)
-            {
-              debugFile->writeCLine(ic);
-              #if 0
-              _G.debugLine = 1;
-              emitcode ("", "C$%s$%d$%d$%d ==.",
-                        FileBaseName (ic->filename), ic->lineno,
-                        ic->level, ic->block);
-              _G.debugLine = 0;
-              #endif
-            }
-          if (!options.noCcodeInAsm) {
-            emitcode ("", ";%s:%d: %s", ic->filename, ic->lineno,
-                      printCLine(ic->filename, ic->lineno));
-          }
-          cln = ic->lineno;
-        }
-      if (options.iCodeInAsm) {
-        char regsInUse[80];
-        int i;
-        const char *iLine;
-
-        for (i=0; i<6; i++) {
-          sprintf (&regsInUse[i],
-                   "%c", ic->riu & (1<<i) ? i+'0' : '-');
-        }
-        regsInUse[i]=0;
-        iLine = printILine(ic);
-        emitcode("", "; [%s] ic:%d: %s", regsInUse, ic->seq, printILine(ic));
-        dbuf_free(iLine);
+    for (i = A_IDX; i <= XA_IDX; i++)
+      {
+        reg = hc08_regWithIdx (i);
+        //if (reg->aop)
+        //  emitcode ("", "; %s = %s offset %d", reg->name, aopName (reg->aop), reg->aopofs);
+        reg->isFree = TRUE;
       }
-      /* if the result is marked as
-         spilt and rematerializable or code for
-         this has already been generated then
-         do nothing */
-      if (resultRemat (ic) || ic->generated)
-        continue;
 
+    if (ic->op == IFX)
+      updateiTempRegisterUse (IC_COND (ic));
+    else if (ic->op == JUMPTABLE)
+      updateiTempRegisterUse (IC_JTCOND (ic));
+    else if (ic->op == RECEIVE)
+      {
+        hc08_useReg (hc08_reg_a);
+        hc08_useReg (hc08_reg_x); // TODO: x really is free if function only receives 1 byte
+      }
+    else
       {
-        int i;
-        reg_info *reg;
-        symbol *sym;
+        if (POINTER_SET (ic))
+          updateiTempRegisterUse (IC_RESULT (ic));
+        updateiTempRegisterUse (IC_LEFT (ic));
+        updateiTempRegisterUse (IC_RIGHT (ic));
+      }
 
-        for (i=A_IDX;i<=XA_IDX;i++)
-          {
-            reg = hc08_regWithIdx(i);
-            if (reg->aop)
-              emitcode("","; %s = %s offset %d", reg->name,
-                       aopName(reg->aop), reg->aopofs);
-            reg->isFree = TRUE;
-          }
-        if (IC_LEFT (ic) && IS_ITEMP (IC_LEFT (ic)))
-          {
-            sym = OP_SYMBOL (IC_LEFT (ic));
-            if (sym->accuse == ACCUSE_HX)
-              {
-                hc08_reg_h->isFree = FALSE;
-                hc08_reg_x->isFree = FALSE;
-              }
-            else if (sym->accuse == ACCUSE_XA)
-              {
-                hc08_reg_a->isFree = FALSE;
-                if (sym->nRegs>1)
-                  hc08_reg_x->isFree = FALSE;
-              }
-          }
-        if (IC_RIGHT (ic) && IS_ITEMP (IC_RIGHT (ic)))
+    for (i = A_IDX; i <= H_IDX; i++)
+      {
+        if (bitVectBitValue (ic->rSurv, i))
           {
-            sym = OP_SYMBOL (IC_RIGHT (ic));
-            if (sym->accuse == ACCUSE_HX)
-              {
-                hc08_reg_h->isFree = FALSE;
-                hc08_reg_x->isFree = FALSE;
-              }
-            else if (sym->accuse == ACCUSE_XA)
-              {
-                hc08_reg_a->isFree = FALSE;
-                if (sym->nRegs>1)
-                  hc08_reg_x->isFree = FALSE;
-              }
+            hc08_regWithIdx (i)->isDead = FALSE;
+            hc08_regWithIdx (i)->isFree = FALSE;
           }
+        else
+          hc08_regWithIdx (i)->isDead = TRUE;
       }
+  }
 
-      /* depending on the operation */
-      switch (ic->op)
-        {
-        case '!':
-          genNot (ic);
-          break;
+  /* depending on the operation */
+  switch (ic->op)
+    {
+    case '!':
+      genNot (ic);
+      break;
 
-        case '~':
-          genCpl (ic);
-          break;
+    case '~':
+      genCpl (ic);
+      break;
 
-        case UNARYMINUS:
+    case UNARYMINUS:
           genUminus (ic);
           break;
 
-        case IPUSH:
+    case IPUSH:
           genIpush (ic);
           break;
 
-        case IPOP:
-          /* IPOP happens only when trying to restore a
-             spilt live range, if there is an ifx statement
-             following this pop then the if statement might
-             be using some of the registers being popped which
-             would destory the contents of the register so
-             we need to check for this condition and handle it */
-          if (ic->next &&
-              ic->next->op == IFX &&
-              regsInCommon (IC_LEFT (ic), IC_COND (ic->next)))
-            genIfx (ic->next, ic);
-          else
-            genIpop (ic);
-          break;
+    case IPOP:
+      /* IPOP happens only when trying to restore a
+         spilt live range, if there is an ifx statement
+         following this pop then the if statement might
+         be using some of the registers being popped which
+         would destory the contents of the register so
+         we need to check for this condition and handle it */
+      if (ic->next && ic->next->op == IFX && regsInCommon (IC_LEFT (ic), IC_COND (ic->next)))
+        genIfx (ic->next, ic);
+      else
+        genIpop (ic);
+      break;
 
-        case CALL:
-          genCall (ic);
-          break;
+    case CALL:
+      genCall (ic);
+      break;
 
-        case PCALL:
-          genPcall (ic);
-          break;
+    case PCALL:
+      genPcall (ic);
+      break;
 
-        case FUNCTION:
-          genFunction (ic);
-          break;
+    case FUNCTION:
+      genFunction (ic);
+      break;
 
-        case ENDFUNCTION:
-          genEndFunction (ic);
-          break;
+    case ENDFUNCTION:
+      genEndFunction (ic);
+      break;
 
-        case RETURN:
-          genRet (ic);
-          break;
+    case RETURN:
+      genRet (ic);
+      break;
 
-        case LABEL:
-          genLabel (ic);
-          break;
+    case LABEL:
+      genLabel (ic);
+      break;
 
-        case GOTO:
-          genGoto (ic);
-          break;
+    case GOTO:
+      genGoto (ic);
+      break;
 
-        case '+':
-          if (!genPointerGetSetOfs (ic))
-            genPlus (ic);
-          break;
+    case '+':
+      genPlus (ic);
+      break;
 
-        case '-':
-          if (!genDjnz (ic, ifxForOp (IC_RESULT (ic), ic)))
-            genMinus (ic);
-          break;
+    case '-':
+      if (!genDjnz (ic, ifxForOp (IC_RESULT (ic), ic)))
+        genMinus (ic);
+      break;
 
-        case '*':
-          genMult (ic);
-          break;
+    case '*':
+      genMult (ic);
+      break;
 
-        case '/':
-          genDiv (ic);
-          break;
+    case '/':
+      genDiv (ic);
+      break;
 
-        case '%':
-          genMod (ic);
-          break;
+    case '%':
+      genMod (ic);
+      break;
 
-        case '>':
-        case '<':
-        case LE_OP:
-        case GE_OP:
-          genCmp (ic, ifxForOp (IC_RESULT (ic), ic));
-          break;
+    case '>':
+    case '<':
+    case LE_OP:
+    case GE_OP:
+      genCmp (ic, ifxForOp (IC_RESULT (ic), ic));
+      break;
 
-        case NE_OP:
-        case EQ_OP:
-          genCmpEQorNE (ic, ifxForOp (IC_RESULT (ic), ic));
-          break;
+    case NE_OP:
+    case EQ_OP:
+      genCmpEQorNE (ic, ifxForOp (IC_RESULT (ic), ic));
+      break;
 
-        case AND_OP:
-          genAndOp (ic);
-          break;
+    case AND_OP:
+      genAndOp (ic);
+      break;
 
-        case OR_OP:
-          genOrOp (ic);
-          break;
+    case OR_OP:
+      genOrOp (ic);
+      break;
 
-        case '^':
-          genXor (ic, ifxForOp (IC_RESULT (ic), ic));
-          break;
+    case '^':
+      genXor (ic, ifxForOp (IC_RESULT (ic), ic));
+      break;
 
-        case '|':
-          genOr (ic, ifxForOp (IC_RESULT (ic), ic));
-          break;
+    case '|':
+      genOr (ic, ifxForOp (IC_RESULT (ic), ic));
+      break;
 
-        case BITWISEAND:
-          genAnd (ic, ifxForOp (IC_RESULT (ic), ic));
-          break;
+    case BITWISEAND:
+      genAnd (ic, ifxForOp (IC_RESULT (ic), ic));
+      break;
 
-        case INLINEASM:
-          genInline (ic);
-          break;
+    case INLINEASM:
+      hc08_genInline (ic);
+      break;
 
-        case RRC:
-          genRRC (ic);
-          break;
+    case RRC:
+      genRRC (ic);
+      break;
 
-        case RLC:
-          genRLC (ic);
-          break;
+    case RLC:
+      genRLC (ic);
+      break;
 
-        case GETHBIT:
-          genGetHbit (ic);
-          break;
+    case GETHBIT:
+      genGetHbit (ic);
+      break;
 
-        case LEFT_OP:
-          genLeftShift (ic);
-          break;
+    case GETABIT:
+      genGetAbit (ic);
+      break;
 
-        case RIGHT_OP:
-          genRightShift (ic);
-          break;
+    case GETBYTE:
+      genGetByte (ic);
+      break;
 
-        case GET_VALUE_AT_ADDRESS:
-          genPointerGet (ic,
-                         hasInc (IC_LEFT (ic), ic,
-                                 getSize (operandType (IC_RESULT (ic)))),
-                         ifxForOp (IC_RESULT (ic), ic) );
-          break;
+    case GETWORD:
+      genGetWord (ic);
+      break;
 
-        case '=':
-          if (POINTER_SET (ic))
-            genPointerSet (ic, hasInc (IC_RESULT(ic),ic,getSize(operandType(IC_RIGHT(ic)))));
-          else
-            genAssign (ic);
-          break;
+    case LEFT_OP:
+      genLeftShift (ic);
+      break;
 
-        case IFX:
-          genIfx (ic, NULL);
-          break;
+    case RIGHT_OP:
+      genRightShift (ic);
+      break;
 
-        case ADDRESS_OF:
-          genAddrOf (ic);
-          break;
+    case GET_VALUE_AT_ADDRESS:
+      genPointerGet (ic, hasInchc08 (IC_LEFT (ic), ic, getSize (operandType (IC_RESULT (ic)))), ifxForOp (IC_RESULT (ic), ic));
+      break;
 
-        case JUMPTABLE:
-          genJumpTab (ic);
-          break;
+    case '=':
+      if (POINTER_SET (ic))
+        genPointerSet (ic, hasInchc08 (IC_RESULT (ic), ic, getSize (operandType (IC_RIGHT (ic)))));
+      else
+        genAssign (ic);
+      break;
 
-        case CAST:
-          genCast (ic);
-          break;
+    case IFX:
+      genIfx (ic, NULL);
+      break;
 
-        case RECEIVE:
-          genReceive (ic);
-          break;
+    case ADDRESS_OF:
+      genAddrOf (ic);
+      break;
 
-        case SEND:
-          addSet (&_G.sendSet, ic);
-          break;
+    case JUMPTABLE:
+      genJumpTab (ic);
+      break;
 
-        case DUMMY_READ_VOLATILE:
-          genDummyRead (ic);
-          break;
+    case CAST:
+      genCast (ic);
+      break;
 
-        case CRITICAL:
-          genCritical (ic);
-          break;
+    case RECEIVE:
+      genReceive (ic);
+      break;
 
-        case ENDCRITICAL:
-          genEndCritical (ic);
-          break;
+    case SEND:
+      if (!regalloc_dry_run)
+        addSet (&_G.sendSet, ic);
+      else
+        {
+          set * sendSet = NULL;
+          addSet (&sendSet, ic);
+          genSend (sendSet);
+          deleteSet (&sendSet);
+        }
+      break;
 
-        case SWAP:
-          genSwap (ic);
-          break;
+    case DUMMY_READ_VOLATILE:
+      genDummyRead (ic);
+      break;
 
-        default:
-          ic = ic;
+    case CRITICAL:
+      genCritical (ic);
+      break;
+
+    case ENDCRITICAL:
+      genEndCritical (ic);
+      break;
+
+    case SWAP:
+      genSwap (ic);
+      break;
+
+    default:
+      wassertl (0, "Unknown iCode");
+    }
+}
+
+unsigned char
+dryhc08iCode (iCode *ic)
+{
+  regalloc_dry_run = TRUE;
+  regalloc_dry_run_cost = 0;
+
+  hc08_aop_pass[0] = newAsmop (AOP_REG);
+  hc08_aop_pass[0]->size = 1;
+  hc08_aop_pass[0]->aopu.aop_reg[0] = hc08_reg_a;
+  hc08_aop_pass[1] = newAsmop (AOP_REG);
+  hc08_aop_pass[1]->size = 1;
+  hc08_aop_pass[1]->aopu.aop_reg[0] = hc08_reg_x;
+  hc08_aop_pass[2] = newAsmop (AOP_DIR);
+  hc08_aop_pass[2]->size = 1;
+  hc08_aop_pass[2]->aopu.aop_dir = "___SDCC_hc08_ret2";
+  hc08_aop_pass[3] = newAsmop (AOP_DIR);
+  hc08_aop_pass[3]->size = 1;
+  hc08_aop_pass[3]->aopu.aop_dir = "___SDCC_hc08_ret3";
+  hc08_aop_pass[4] = newAsmop (AOP_DIR);
+  hc08_aop_pass[4]->size = 1;
+  hc08_aop_pass[4]->aopu.aop_dir = "___SDCC_hc08_ret4";
+  hc08_aop_pass[5] = newAsmop (AOP_DIR);
+  hc08_aop_pass[5]->size = 1;
+  hc08_aop_pass[5]->aopu.aop_dir = "___SDCC_hc08_ret5";
+  hc08_aop_pass[6] = newAsmop (AOP_DIR);
+  hc08_aop_pass[6]->size = 1;
+  hc08_aop_pass[6]->aopu.aop_dir = "___SDCC_hc08_ret6";
+  hc08_aop_pass[7] = newAsmop (AOP_DIR);
+  hc08_aop_pass[7]->size = 1;
+  hc08_aop_pass[7]->aopu.aop_dir = "___SDCC_hc08_ret7";
+
+  genhc08iCode (ic);
+
+  destroy_line_list ();
+  /*freeTrace (&_G.trace.aops);*/
+
+  return (regalloc_dry_run_cost);
+}
+
+/*-----------------------------------------------------------------*/
+/* genhc08Code - generate code for HC08 based controllers          */
+/*-----------------------------------------------------------------*/
+void
+genhc08Code (iCode *lic)
+{
+  iCode *ic;
+  int cln = 0;
+  int clevel = 0;
+  int cblock = 0;
+
+  regalloc_dry_run = FALSE;
+
+  /* print the allocation information */
+  if (allocInfo && currFunc)
+    printAllocInfo (currFunc, codeOutBuf);
+  /* if debug information required */
+  if (options.debug && currFunc)
+    {
+      debugFile->writeFunction (currFunc, lic);
+#if 0
+      genLine.lineElement.isDebug = 1;
+      if (IS_STATIC (currFunc->etype))
+        emitcode ("", "F%s$%s$0$0 ==.", moduleName, currFunc->name);
+      else
+        emitcode ("", "G$%s$0$0 ==.", currFunc->name);
+      genLine.lineElement.isDebug = 0;
+#endif
+    }
+  /* stack pointer name */
+  if (options.useXstack)
+    spname = "_spx";
+  else
+    spname = "sp";
+
+  debugFile->writeFrameAddress (NULL, NULL, 0); /* have no idea where frame is now */
+
+  hc08_aop_pass[0] = newAsmop (AOP_REG);
+  hc08_aop_pass[0]->size = 1;
+  hc08_aop_pass[0]->aopu.aop_reg[0] = hc08_reg_a;
+  hc08_aop_pass[1] = newAsmop (AOP_REG);
+  hc08_aop_pass[1]->size = 1;
+  hc08_aop_pass[1]->aopu.aop_reg[0] = hc08_reg_x;
+  hc08_aop_pass[2] = newAsmop (AOP_DIR);
+  hc08_aop_pass[2]->size = 1;
+  hc08_aop_pass[2]->aopu.aop_dir = "___SDCC_hc08_ret2";
+  hc08_aop_pass[3] = newAsmop (AOP_DIR);
+  hc08_aop_pass[3]->size = 1;
+  hc08_aop_pass[3]->aopu.aop_dir = "___SDCC_hc08_ret3";
+  hc08_aop_pass[4] = newAsmop (AOP_DIR);
+  hc08_aop_pass[4]->size = 1;
+  hc08_aop_pass[4]->aopu.aop_dir = "___SDCC_hc08_ret4";
+  hc08_aop_pass[5] = newAsmop (AOP_DIR);
+  hc08_aop_pass[5]->size = 1;
+  hc08_aop_pass[5]->aopu.aop_dir = "___SDCC_hc08_ret5";
+  hc08_aop_pass[6] = newAsmop (AOP_DIR);
+  hc08_aop_pass[6]->size = 1;
+  hc08_aop_pass[6]->aopu.aop_dir = "___SDCC_hc08_ret6";
+  hc08_aop_pass[7] = newAsmop (AOP_DIR);
+  hc08_aop_pass[7]->size = 1;
+  hc08_aop_pass[7]->aopu.aop_dir = "___SDCC_hc08_ret7";
+
+  for (ic = lic; ic; ic = ic->next)
+    ic->generated = FALSE;
+
+  for (ic = lic; ic; ic = ic->next)
+    {
+      initGenLineElement ();
+
+      genLine.lineElement.ic = ic;
+
+      if (ic->level != clevel || ic->block != cblock)
+        {
+          if (options.debug)
+            {
+              debugFile->writeScope (ic);
+            }
+          clevel = ic->level;
+          cblock = ic->block;
         }
 
+      if (ic->lineno && cln != ic->lineno)
+        {
+          if (options.debug)
+            {
+              debugFile->writeCLine (ic);
+#if 0
+              genLine.lineElement.isDebug = 1;
+              emitcode ("", "C$%s$%d$%d$%d ==.", FileBaseName (ic->filename), ic->lineno, ic->level, ic->block);
+              genLine.lineElement.isDebug = 0;
+#endif
+            }
+          if (!options.noCcodeInAsm)
+            {
+              emitcode ("", ";%s:%d: %s", ic->filename, ic->lineno, printCLine (ic->filename, ic->lineno));
+            }
+          cln = ic->lineno;
+        }
+      if (options.iCodeInAsm)
+        {
+          char regsSurv[4];
+          const char *iLine;
+
+          regsSurv[0] = (bitVectBitValue (ic->rSurv, A_IDX)) ? 'a' : '-';
+          regsSurv[1] = (bitVectBitValue (ic->rSurv, H_IDX)) ? 'h' : '-';
+          regsSurv[2] = (bitVectBitValue (ic->rSurv, X_IDX)) ? 'x' : '-';
+          regsSurv[3] = 0;
+          iLine = printILine (ic);
+          emitcode ("", "; [%s] ic:%d: %s", regsSurv, ic->seq, printILine (ic));
+          dbuf_free (iLine);
+        }
+
+      regalloc_dry_run_cost = 0;
+      genhc08iCode(ic);
+      if (options.verboseAsm)
+        emitcode (";", "iCode %d (key %d) total cost: %d\n", ic->seq, ic->key, (int) regalloc_dry_run_cost);
+
       if (!hc08_reg_a->isFree)
-        DD(emitcode("","; forgot to free a"));
+        DD (emitcode ("", "; forgot to free a"));
       if (!hc08_reg_x->isFree)
-        DD(emitcode("","; forgot to free x"));
+        DD (emitcode ("", "; forgot to free x"));
       if (!hc08_reg_h->isFree)
-        DD(emitcode("","; forgot to free h"));
+        DD (emitcode ("", "; forgot to free h"));
       if (!hc08_reg_hx->isFree)
-        DD(emitcode("","; forgot to free hx"));
+        DD (emitcode ("", "; forgot to free hx"));
       if (!hc08_reg_xa->isFree)
-        DD(emitcode("","; forgot to free xa"));
+        DD (emitcode ("", "; forgot to free xa"));
     }
 
-  debugFile->writeFrameAddress (NULL, NULL, 0);  /* have no idea where frame is now */
+  debugFile->writeFrameAddress (NULL, NULL, 0); /* have no idea where frame is now */
 
 
   /* now we are ready to call the
      peep hole optimizer */
   if (!options.nopeep)
-    peepHole (&lineHead);
+    peepHole (&genLine.lineHead);
 
   /* now do the actual printing */
-  printLine (lineHead, codeOutBuf);
-  return;
+  printLine (genLine.lineHead, codeOutBuf);
+
+  /* destroy the line list */
+  destroy_line_list ();
 }
+
diff -Nru sdcc-3.1.0+dfsg/src/hc08/gen.h sdcc-3.2.0+dfsg/src/hc08/gen.h
--- sdcc-3.1.0+dfsg/src/hc08/gen.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/hc08/gen.h	2012-05-10 19:46:35.000000000 +0000
@@ -94,4 +94,8 @@
 extern unsigned fReturnSizeHC08;
 //extern char **fReturn;
 
+iCode *hasInchc08 (operand *op, const iCode *ic, int osize);
+extern bool hc08_assignment_optimal;
+
 #endif
+
diff -Nru sdcc-3.1.0+dfsg/src/hc08/hc08.h sdcc-3.2.0+dfsg/src/hc08/hc08.h
--- sdcc-3.1.0+dfsg/src/hc08/hc08.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/hc08/hc08.h	2012-05-18 16:09:24.000000000 +0000
@@ -0,0 +1,18 @@
+typedef enum
+  {
+    SUB_HC08,
+    SUB_S08
+  }
+HC08_SUB_PORT;
+
+typedef struct
+  {
+    HC08_SUB_PORT sub;
+  }
+HC08_OPTS;
+
+extern HC08_OPTS hc08_opts;
+
+#define IS_HC08 (hc08_opts.sub == SUB_HC08)
+#define IS_S08 (hc08_opts.sub == SUB_S08)
+
diff -Nru sdcc-3.1.0+dfsg/src/hc08/hc08.vcxproj sdcc-3.2.0+dfsg/src/hc08/hc08.vcxproj
--- sdcc-3.1.0+dfsg/src/hc08/hc08.vcxproj	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/hc08/hc08.vcxproj	2012-05-10 19:46:35.000000000 +0000
@@ -48,7 +48,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;.;..\..;..\..\support\util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;.;..\..;..\..\support\util;C:\Program Files\boost\boost_1_47;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_LIB;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..;.;..\..;..\..\support\util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;.;..\..;..\..\support\util;C:\Program Files\boost\boost_1_47;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -123,6 +123,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
+    <ClCompile Include="ralloc2.cc" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="gen.h" />
@@ -132,10 +133,12 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="peeph.def">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f ../SDCCpeeph.awk %(FullPath) &gt;peeph.rul</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f ../SDCCpeeph.awk %(FullPath) &gt;peeph.rul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f ../SDCCpeeph.awk %(Identity) &gt;peeph.rul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f ../SDCCpeeph.awk %(Identity) &gt;peeph.rul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">peeph.rul;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">peeph.rul;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Peephole Rule: peeph.rul</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Peephole Rule: peeph.rul</Message>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff -Nru sdcc-3.1.0+dfsg/src/hc08/hc08.vcxproj.filters sdcc-3.2.0+dfsg/src/hc08/hc08.vcxproj.filters
--- sdcc-3.1.0+dfsg/src/hc08/hc08.vcxproj.filters	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/hc08/hc08.vcxproj.filters	2012-05-10 19:46:35.000000000 +0000
@@ -23,6 +23,9 @@
     <ClCompile Include="ralloc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="ralloc2.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="gen.h">
diff -Nru sdcc-3.1.0+dfsg/src/hc08/main.c sdcc-3.2.0+dfsg/src/hc08/main.c
--- sdcc-3.1.0+dfsg/src/hc08/main.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/hc08/main.c	2012-05-19 21:42:02.000000000 +0000
@@ -1,25 +1,49 @@
-/** @file main.c
-    hc08 specific general functions.
+/*-------------------------------------------------------------------------
+  main.h - hc08 specific general function
 
+  Copyright (C) 2003, Erik Petrich
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-------------------------------------------------------------------------*/
+/*
     Note that mlh prepended _hc08_ on the static functions.  Makes
     it easier to set a breakpoint using the debugger.
 */
 #include "common.h"
+#include "hc08.h"
 #include "main.h"
 #include "ralloc.h"
 #include "gen.h"
 #include "dbuf_string.h"
-#include "../SDCCutil.h"
 
 extern char * iComments2;
 extern DEBUGFILE dwarf2DebugFile;
 extern int dwarf2FinalizeFile(FILE *);
 
-static char _defaultRules[] =
+static char _hc08_defaultRules[] =
+{
+#include "peeph.rul"
+};
+
+static char _s08_defaultRules[] =
 {
 #include "peeph.rul"
 };
 
+HC08_OPTS hc08_opts;
+
 /* list of key words used by msc51 */
 static char *_hc08_keywords[] =
 {
@@ -58,6 +82,14 @@
 static void
 _hc08_init (void)
 {
+  hc08_opts.sub = SUB_HC08;
+  asm_addTree (&asm_asxxxx_mapping);
+}
+
+static void
+_s08_init (void)
+{
+  hc08_opts.sub = SUB_S08;
   asm_addTree (&asm_asxxxx_mapping);
 }
 
@@ -105,21 +137,27 @@
       return TRUE;
     }
 
+  if (!strcmp (argv[*i], "--oldralloc"))
+    {
+      options.oldralloc = TRUE;
+      return TRUE;
+    }
+
   return FALSE;
 }
 
 static OPTION _hc08_options[] =
   {
-    {  0,   "--out-fmt-elf", NULL, "Output executable in ELF format" },
-    {  0, NULL }
+    {0, "--out-fmt-elf", NULL, "Output executable in ELF format" },
+    {0, "--oldralloc", NULL, "Use old register allocator"},
+    {0, NULL }
   };
 
 static void
 _hc08_finaliseOptions (void)
 {
-  if (options.noXinitOpt) {
-    port->genXINIT=0;
-  }
+  if (options.noXinitOpt)
+    port->genXINIT = 0;
 
   if (options.model == MODEL_LARGE) {
       port->mem.default_local_map = xdata;
@@ -172,7 +210,6 @@
   fprintf (of, "\t.area %s\n",port->mem.const_name);
   fprintf (of, "\t.area %s\n",port->mem.data_name);
   fprintf (of, "\t.area %s\n",port->mem.overlay_name);
-  fprintf (of, "\t.area %s\n",port->mem.bit_name);
   fprintf (of, "\t.area %s\n",port->mem.xdata_name);
   fprintf (of, "\t.area %s\n",port->mem.xidata_name);
 
@@ -289,8 +326,6 @@
     operand *result = IC_RESULT(ic);
     sym_link *result_type = operandType(result);
 
-    return 0; /* disable CSE */
-
     /* if it is a pointer then return ok for now */
     if (IC_RESULT(ic) && IS_PTR(result_type)) return 1;
 
@@ -318,6 +353,9 @@
       || op == RLC
       || op == GETHBIT
       || (op == SWAP && size <= 2)
+      || op == GETABIT
+      || op == GETBYTE
+      || op == GETWORD
      )
     return TRUE;
   else
@@ -335,8 +373,8 @@
     return -2;
   if (IN_FARSPACE (oclass))     /* extended addressing mode is almost at fast */
     return -1;
-  if (oclass == istack) /* stack is the slowest, but still faster than */
-    return 0;           /* trying to copy to a temp location elsewhere */
+  if (oclass == istack)         /* stack is the slowest, but still faster than */
+    return 0;                   /* trying to copy to a temp location elsewhere */
 
   return 0; /* anything we missed */
 }
@@ -377,7 +415,8 @@
   "sdas6808", "$l", "$3", "\"$2\"", "\"$1.asm\"", NULL
 };
 
-static const char * const _libs[] = { "hc08", NULL, };
+static const char * const _libs_hc08[] = { "hc08", NULL, };
+static const char * const _libs_s08[] = { "s08", NULL, };
 
 /* Globals */
 PORT hc08_port =
@@ -396,8 +435,8 @@
   {
     _asmCmd,
     NULL,
-    "-plosgffwzc",              /* Options with debug */
-    "-plosgffwz",               /* Options without debug */
+    "-plosgffwc",               /* Options with debug */
+    "-plosgffw",                /* Options without debug */
     0,
     ".asm",
     NULL                        /* no do_assemble function */
@@ -409,10 +448,10 @@
     ".rel",
     1,
     NULL,                       /* crt */
-    _libs,                      /* libs */
+    _libs_hc08,                 /* libs */
   },
   {                             /* Peephole optimizer */
-    _defaultRules
+    _hc08_defaultRules
   },
   {
         /* Sizes: char, short, int, long, long long, ptr, fptr, gptr, bit, float, max */
@@ -420,23 +459,22 @@
   },
   /* tags for generic pointers */
   { 0x00, 0x40, 0x60, 0x80 },           /* far, near, xstack, code */
-
   {
     "XSEG",
     "STACK",
-    "CSEG (CODE)",
-    "DSEG",
+    "CSEG    (CODE)",
+    "DSEG    (PAG)",
     NULL, /* "ISEG" */
     NULL, /* "PSEG" */
     "XSEG",
-    "BSEG",
-    "RSEG (ABS)",
-    "GSINIT (CODE)",
-    "OSEG    (OVR)",
+    NULL, /* "BSEG" */
+    "RSEG    (ABS)",
+    "GSINIT  (CODE)",
+    "OSEG    (PAG, OVR)",
     "GSFINAL (CODE)",
-    "HOME (CODE)",
-    "XISEG", // initialized xdata
-    "XINIT", // a code copy of xiseg
+    "HOME    (CODE)",
+    "XISEG",              // initialized xdata
+    "XINIT",              // a code copy of xiseg
     "CONST   (CODE)",     // const_name - const data (code or not)
     "CABS    (ABS,CODE)", // cabs_name - const absolute data (code or not)
     "XABS    (ABS)",      // xabs_name - absolute xdata
@@ -457,7 +495,7 @@
   },
     /* hc08 has an 8 bit mul */
   {
-    1, -1
+    1, 5
   },
   {
     hc08_emitDebuggerSymbol,
@@ -518,3 +556,142 @@
   1,                            /* globals & local static allowed */
   PORT_MAGIC
 };
+
+PORT s08_port =
+{
+  TARGET_ID_S08,
+  "s08",
+  "S08",                        /* Target name */
+  NULL,                         /* Processor name */
+  {
+    glue,
+    FALSE,                      /* Emit glue around main */
+    MODEL_SMALL | MODEL_LARGE,
+    MODEL_LARGE,
+    NULL,                       /* model == target */
+  },
+  {
+    _asmCmd,
+    NULL,
+    "-plosgffwc",               /* Options with debug */
+    "-plosgffw",                /* Options without debug */
+    0,
+    ".asm",
+    NULL                        /* no do_assemble function */
+  },
+  {                             /* Linker */
+    _linkCmd,
+    NULL,
+    NULL,
+    ".rel",
+    1,
+    NULL,                       /* crt */
+    _libs_s08,                  /* libs */
+  },
+  {                             /* Peephole optimizer */
+    _s08_defaultRules
+  },
+  {
+        /* Sizes: char, short, int, long, long long, ptr, fptr, gptr, bit, float, max */
+    1, 2, 2, 4, 8, 2, 2, 2, 1, 4, 4
+  },
+  /* tags for generic pointers */
+  { 0x00, 0x40, 0x60, 0x80 },           /* far, near, xstack, code */
+  {
+    "XSEG",
+    "STACK",
+    "CSEG    (CODE)",
+    "DSEG    (PAG)",
+    NULL, /* "ISEG" */
+    NULL, /* "PSEG" */
+    "XSEG",
+    NULL, /* "BSEG" */
+    "RSEG    (ABS)",
+    "GSINIT  (CODE)",
+    "OSEG    (PAG, OVR)",
+    "GSFINAL (CODE)",
+    "HOME    (CODE)",
+    "XISEG",              // initialized xdata
+    "XINIT",              // a code copy of xiseg
+    "CONST   (CODE)",     // const_name - const data (code or not)
+    "CABS    (ABS,CODE)", // cabs_name - const absolute data (code or not)
+    "XABS    (ABS)",      // xabs_name - absolute xdata
+    "IABS    (ABS)",      // iabs_name - absolute data
+    NULL,
+    NULL,
+    1
+  },
+  { _hc08_genExtraAreas,
+    NULL },
+  {
+    -1,         /* direction (-1 = stack grows down) */
+    0,          /* bank_overhead (switch between register banks) */
+    4,          /* isr_overhead */
+    2,          /* call_overhead */
+    0,          /* reent_overhead */
+    0           /* banked_overhead (switch between code banks) */
+  },
+    /* hc08 has an 8 bit mul */
+  {
+    1, 5
+  },
+  {
+    hc08_emitDebuggerSymbol,
+    {
+      hc08_dwarfRegNum,
+      NULL,
+      NULL,
+      4,                        /* addressSize */
+      14,                       /* regNumRet */
+      15,                       /* regNumSP */
+      -1,                       /* regNumBP */
+      1,                        /* offsetSP */
+    },
+  },
+  {
+    256,        /* maxCount */
+    2,          /* sizeofElement */
+    {8,16,32},  /* sizeofMatchJump[] */
+    {8,16,32},  /* sizeofRangeCompare[] */
+    5,          /* sizeofSubtract */
+    10,         /* sizeofDispatch */
+  },
+  "_",
+  _s08_init,
+  _hc08_parseOptions,
+  _hc08_options,
+  NULL,
+  _hc08_finaliseOptions,
+  _hc08_setDefaultOptions,
+  hc08_assignRegisters,
+  _hc08_getRegName,
+  _hc08_keywords,
+  _hc08_genAssemblerPreamble,
+  _hc08_genAssemblerEnd,        /* no genAssemblerEnd */
+  _hc08_genIVT,
+  _hc08_genXINIT,
+  NULL,                         /* genInitStartup */
+  _hc08_reset_regparm,
+  _hc08_regparm,
+  NULL,                         /* process_pragma */
+  NULL,                         /* getMangledFunctionName */
+  NULL,                         /* hasNativeMulFor */
+  hasExtBitOp,                  /* hasExtBitOp */
+  oclsExpense,                  /* oclsExpense */
+  TRUE,                         /* use_dw_for_init */
+  FALSE,                        /* little_endian */
+  0,                            /* leave lt */
+  0,                            /* leave gt */
+  1,                            /* transform <= to ! > */
+  1,                            /* transform >= to ! < */
+  1,                            /* transform != to !(a == b) */
+  0,                            /* leave == */
+  FALSE,                        /* No array initializer support. */
+  cseCostEstimation,
+  NULL,                         /* no builtin functions */
+  GPOINTER,                     /* treat unqualified pointers as "generic" pointers */
+  1,                            /* reset labelKey to 1 */
+  1,                            /* globals & local static allowed */
+  PORT_MAGIC
+};
+
diff -Nru sdcc-3.1.0+dfsg/src/hc08/peeph.def sdcc-3.2.0+dfsg/src/hc08/peeph.def
--- sdcc-3.1.0+dfsg/src/hc08/peeph.def	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/hc08/peeph.def	2012-05-24 09:37:00.000000000 +0000
@@ -34,7 +34,7 @@
 	; Peephole 2a	- eliminated jmp
 	bcc	%5
 %1:
-} if labelInRange
+} if labelInRange(), labelRefCountChange(%1 -1)
 
 replace {
 	bcc	%1
@@ -44,7 +44,7 @@
 	; Peephole 2b	- eliminated jmp
 	bcs	%5
 %1:
-} if labelInRange
+} if labelInRange(), labelRefCountChange(%1 -1)
 
 replace {
 	beq	%1
@@ -54,7 +54,7 @@
 	; Peephole 2c	- eliminated jmp
 	bne	%5
 %1:
-} if labelInRange
+} if labelInRange(), labelRefCountChange(%1 -1)
 
 replace {
 	bne	%1
@@ -64,7 +64,7 @@
 	; Peephole 2d	- eliminated jmp
 	beq	%5
 %1:
-} if labelInRange
+} if labelInRange(), labelRefCountChange(%1 -1)
 
 replace {
 	brclr	%3,%2,%1
@@ -74,7 +74,7 @@
 	; Peephole 2e	- eliminated jmp
 	brset	%3,%2,%5
 %1:
-} if labelInRange
+} if labelInRange(), labelRefCountChange(%1 -1)
 
 replace {
 	brset	%3,%2,%1
@@ -84,69 +84,89 @@
 	; Peephole 2f	- eliminated jmp
 	brclr	%3,%2,%5
 %1:
-} if labelInRange
+} if labelInRange(), labelRefCountChange(%1 -1)
 
 replace {
 	bls	%1
 	jmp	%5
 %1:
 } by {
-	; Peephole 2g	- eliminated bra
+	; Peephole 2g	- eliminated jmp
 	bhi	%5
 %1:
-} if labelInRange
+} if labelInRange(), labelRefCountChange(%1 -1)
 
 replace {
 	bhi	%1
 	jmp	%5
 %1:
 } by {
-	; Peephole 2h	- eliminated bra
+	; Peephole 2h	- eliminated jmp
 	bls	%5
 %1:
-} if labelInRange
+} if labelInRange(), labelRefCountChange(%1 -1)
 
 replace {
 	ble	%1
 	jmp	%5
 %1:
 } by {
-	; Peephole 2i	- eliminated bra
+	; Peephole 2i	- eliminated jmp
 	bgt	%5
 %1:
+} if labelInRange(), labelRefCountChange(%1 -1)
 
-} if labelInRange
 replace {
 	bgt	%1
 	jmp	%5
 %1:
 } by {
-	; Peephole 2j	- eliminated bra
+	; Peephole 2j	- eliminated jmp
 	ble	%5
 %1:
-} if labelInRange
+} if labelInRange(), labelRefCountChange(%1 -1)
 
 replace {
 	bge	%1
 	jmp	%5
 %1:
 } by {
-	; Peephole 2k	- eliminated bra
+	; Peephole 2k	- eliminated jmp
 	blt	%5
 %1:
-} if labelInRange
+} if labelInRange(), labelRefCountChange(%1 -1)
 
 replace {
 	blt	%1
 	jmp	%5
 %1:
 } by {
-	; Peephole 2l	- eliminated bra
+	; Peephole 2l	- eliminated jmp
 	bge	%5
 %1:
-} if labelInRange
+} if labelInRange(), labelRefCountChange(%1 -1)
+
+replace {
+	bmi     %1
+	jmp     %5
+%1:
+} by {
+	; Peephole 2m   - eliminated jmp
+	bpl     %5
+%1:
+} if labelInRange(), labelRefCountChange(%1 -1)
 
 replace {
+	bpl     %1
+	jmp     %5
+%1:
+} by {
+	; Peephole 2n   - eliminated jmp
+	bmi     %5
+%1:
+} if labelInRange(), labelRefCountChange(%1 -1)
+
+replace restart {
 	jmp	%5
 } by {
 	; Peephole 3	- shortened jmp to bra
@@ -280,14 +300,14 @@
 } by {
 	; Peephole 6a  - replaced jmp to rts with rts
 	rts
-} if labelIsReturnOnly
+} if optimizeReturn(), labelIsReturnOnly(), labelRefCountChange(%5 -1)
 
 replace {
 	bra	%5
 } by {
 	; Peephole 6b  - replaced jmp to rts with rts
 	rts
-} if labelIsReturnOnly
+} if optimizeReturn(), labelIsReturnOnly(), labelRefCountChange(%5 -1)
 
 replace restart {
 	psha
@@ -317,3 +337,76 @@
 //	sta	%1
 //} if notVolatile %1
 
+replace {
+        bne     %1
+%1:
+} by {
+        ; Peephole 9a   - eliminated branch
+%1:
+} if labelRefCountChange(%1 -1)
+
+replace {
+        beq     %1
+%1:
+} by {
+        ; Peephole 9b   - eliminated branch
+%1:
+} if labelRefCountChange(%1 -1)
+
+replace restart {
+        bra     %1
+%1:
+} by {
+        ; Peephole 9c   - eliminated branch
+%1:
+} if labelRefCountChange(%1 -1)
+
+replace restart {
+	bra     %1
+%2:
+%1:
+} by {
+	; Peephole 9d   - eliminated branch
+%2:
+%1:
+} if labelRefCountChange(%1 -1)
+
+replace {
+	cmp	#%2
+	beq	%1
+} by {
+	; Peephole 10a   - combined cmp/beq
+	cbeqa	#%2,%1
+}
+
+replace {
+	cmp	*%2
+	beq	%1
+} by {
+	; Peephole 10b   - combined cmp/beq
+	cbeq	*%2,%1
+}
+
+replace {
+	cmp	%2,s
+	beq	%1
+} by {
+	; Peephole 10c   - combined cmp/beq
+	cbeq	%2,s,%1
+}
+
+// should be one of the last peepholes
+replace restart {
+%1:
+} by {
+	; Peephole 500    removed redundant label %1
+} if labelRefCount(%1 0)
+
+replace restart {
+	jsr	%1
+	rts
+} by {
+	; Peephole 501 did tail call optimization.
+	jmp	%1
+} if optimizeReturn()
+
diff -Nru sdcc-3.1.0+dfsg/src/hc08/ralloc.c sdcc-3.2.0+dfsg/src/hc08/ralloc.c
--- sdcc-3.1.0+dfsg/src/hc08/ralloc.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/hc08/ralloc.c	2012-06-28 14:09:28.000000000 +0000
@@ -26,6 +26,7 @@
 #include "common.h"
 #include "ralloc.h"
 #include "gen.h"
+#include "dbuf_string.h"
 
 /*-----------------------------------------------------------------*/
 /* At this point we start getting processor specific although      */
@@ -39,6 +40,9 @@
 extern void genhc08Code (iCode *);
 #define D(x)
 
+// Build the old allocator. It can be used by command-line options
+#define OLDRALLOC 1
+
 /* Global data */
 static struct
   {
@@ -57,7 +61,7 @@
 /* Shared with gen.c */
 int hc08_ptrRegReq;             /* one byte pointer register required */
 
-/* 8051 registers */
+/* 6808 registers */
 reg_info regshc08[] =
 {
 
@@ -530,10 +534,9 @@
 createStackSpil (symbol * sym)
 {
   symbol *sloc = NULL;
+  struct dbuf_s dbuf;
   int useXstack, model;
 
-  char slocBuffer[30];
-
   /* first go try and find a free one that is already
      existing on the stack */
   if (applyToSet (_G.stackSpil, isFree, &sloc, sym))
@@ -550,14 +553,10 @@
      we need to allocate this on the stack : this is really a
      hack!! but cannot think of anything better at this time */
 
-  if (sprintf (slocBuffer, "sloc%d", _G.slocNum++) >= sizeof (slocBuffer))
-    {
-      fprintf (stderr, "***Internal error: slocBuffer overflowed: %s:%d\n",
-               __FILE__, __LINE__);
-      exit (1);
-    }
-
-  sloc = newiTemp (slocBuffer);
+  dbuf_init (&dbuf, 128);
+  dbuf_printf (&dbuf, "sloc%d", _G.slocNum++);
+  sloc = newiTemp (dbuf_c_str (&dbuf));
+  dbuf_destroy (&dbuf);
 
   /* set the type to the spilling symbol */
   sloc->type = copyLinkChain (sym->type);
@@ -1201,8 +1200,10 @@
   if (!sym->nRegs) return;
   if (sym->regs[0]) return;
 
-  werrorfl (ic->filename, ic->lineno, W_LOCAL_NOINIT,
-            sym->prereqv ? sym->prereqv->name : sym->name);
+  /* Don't warn for new allocator, since this is not used by default (until Thoruop is implemented for spillocation compaction). */
+  /*if (z80_opts.oldralloc)
+    werrorfl (ic->filename, ic->lineno, W_LOCAL_NOINIT, sym->prereqv ? sym->prereqv->name : sym->name);*/
+
   spillThis (sym);
 }
 
@@ -1703,10 +1704,9 @@
 /* rematStr - returns the rematerialized string for a remat var    */
 /*-----------------------------------------------------------------*/
 static char *
-rematStr (symbol * sym)
+rematStr (symbol * sym, int offset)
 {
   iCode *ic = sym->rematiCode;
-  int offset = 0;
 
   while (1)
     {
@@ -1805,7 +1805,10 @@
             {
               if (ptrPseudoSymSafe (sym, ic))
                 {
-                  ptrPseudoSymConvert (sym, ic, rematStr (OP_SYMBOL (IC_LEFT (ic))));
+                  int rightval = 0;
+                  if (IC_RIGHT (ic))
+                    rightval = (int)operandLitValue (IC_RIGHT (ic));
+                  ptrPseudoSymConvert (sym, ic, rematStr (OP_SYMBOL (IC_LEFT (ic)), rightval));
                   continue;
                 }
 
@@ -1818,9 +1821,9 @@
                         getSize (sym->type = aggrToPtr (sym->type, FALSE)) :
                         getSize (sym->type));
 
-          if (sym->nRegs > 4)
+          if (sym->nRegs > 8)
             {
-              fprintf (stderr, "allocated more than 4 or 0 registers for type ");
+              fprintf (stderr, "allocated more than 8 registers for type ");
               printTypeChain (sym->type, stderr);
               fprintf (stderr, "\n");
             }
@@ -2102,24 +2105,6 @@
         }
     }
 
-  /* if the result is on stack or iaccess then it must be
-     the same atleast one of the operands */
-  if (OP_SYMBOL (IC_RESULT (ic))->onStack ||
-      OP_SYMBOL (IC_RESULT (ic))->iaccess)
-    {
-      /* the operation has only one symbol
-         operator then we can pack */
-      if ((IC_LEFT (dic) && !IS_SYMOP (IC_LEFT (dic))) ||
-          (IC_RIGHT (dic) && !IS_SYMOP (IC_RIGHT (dic))))
-        goto pack;
-
-      if (!((IC_LEFT (dic) &&
-             IC_RESULT (ic)->key == IC_LEFT (dic)->key) ||
-            (IC_RIGHT (dic) &&
-             IC_RESULT (ic)->key == IC_RIGHT (dic)->key)))
-        return 0;
-    }
-pack:
   /* found the definition */
   /* replace the result with the result of */
   /* this assignment and remove this assignment */
@@ -2165,10 +2150,8 @@
      and eliminate the use of iTempAA, freeing up its register for
      other uses.
   */
-
   for (dic = ic->prev; dic; dic = dic->prev)
     {
-      /* if definition by assignment */
       if (dic->op == '=' &&
           !POINTER_SET (dic) &&
           IC_RESULT (dic)->key == op->key
@@ -2189,7 +2172,6 @@
 
   if (!dic)
     return NULL;   /* didn't find any assignment to op */
-
   /* we are interested only if defined in far space */
   /* or in stack space in case of + & - */
 
@@ -2197,6 +2179,11 @@
   if (!IS_SYMOP (IC_RIGHT (dic)))
     return NULL;
 
+  /* if the symbol's address has been taken, there might be a */
+  /* non-obvious assignment to it, and so we should not */
+  if (OP_SYMBOL (IC_RIGHT (dic))->addrtaken)
+    return NULL;
+
   /* if the symbol is volatile then we should not */
   if (isOperandVolatile (IC_RIGHT (dic), TRUE))
     return NULL;
@@ -2624,7 +2611,6 @@
 canUseAccOperand (iCode * ic, operand * op)
 {
   int size;
-  operand * otherOp;
 
   if (ic->op == IFX)
     {
@@ -2645,11 +2631,7 @@
   if (POINTER_SET (ic) && isOperandEqual (op, IC_RESULT (ic)))
     return 1;
 
-  if (isOperandEqual (op, IC_LEFT (ic)))
-    otherOp = IC_RIGHT (ic);
-  else if (isOperandEqual (op, IC_RIGHT (ic)))
-    otherOp = IC_LEFT (ic);
-  else
+  if (!isOperandEqual (op, IC_LEFT (ic)) && !isOperandEqual (op, IC_RIGHT (ic)))
     return 0;
 
   /* Generation of SEND is deferred until CALL; not safe */
@@ -2732,8 +2714,9 @@
   iCode *dic, *lic;
   bitVect *dbv;
   struct eBBlock * ebp=ebpp[blockno];
+  int disallowHiddenAssignment = 0;
 
-  if (ic->op != IPUSH || !IS_ITEMP (IC_LEFT (ic)))
+  if ((ic->op != IPUSH && ic->op != SEND) || !IS_ITEMP (IC_LEFT (ic)))
     return;
 
   /* must have only definition & one usage */
@@ -2765,6 +2748,12 @@
 
   if (IS_SYMOP(IC_RIGHT(dic)))
     {
+      if (IC_RIGHT (dic)->isvolatile)
+        return;
+
+      if (OP_SYMBOL (IC_RIGHT (dic))->addrtaken || isOperandGlobal (IC_RIGHT (dic)))
+        disallowHiddenAssignment = 1;
+
       /* make sure the right side does not have any definitions
          inbetween */
       dbv = OP_DEFS(IC_RIGHT(dic));
@@ -2772,6 +2761,8 @@
         {
           if (bitVectBitValue(dbv,lic->key))
             return ;
+          if (disallowHiddenAssignment && (lic->op == CALL || lic->op == PCALL || POINTER_SET (lic)))
+            return;
         }
       /* make sure they have the same type */
       if (IS_SPEC(operandType(IC_LEFT(ic))))
@@ -2790,6 +2781,8 @@
         }
       bitVectUnSetBit(OP_SYMBOL(IC_RESULT(dic))->defs,dic->key);
     }
+  if (IS_ITEMP (IC_RIGHT (dic)))
+    OP_USES (IC_RIGHT (dic)) = bitVectSetBit (OP_USES (IC_RIGHT (dic)), ic->key);
 
   /* we now we know that it has one & only one def & use
      and the that the definition is an assignment */
@@ -2798,6 +2791,174 @@
   hTabDeleteItem (&iCodehTab, dic->key, dic, DELETE_ITEM, NULL);
 }
 
+/*------------------------------------------------------------------*/
+/* moveSendToCall - move SEND to immediately precede its CALL/PCALL */
+/*------------------------------------------------------------------*/
+static iCode *
+moveSendToCall (iCode *sic, eBBlock *ebp)
+{
+  iCode * prev = sic->prev;
+  iCode * sic2 = NULL;
+  iCode * cic;
+  
+  /* Go find the CALL/PCALL */
+  cic = sic;
+  while (cic && cic->op != CALL && cic->op != PCALL)
+    cic = cic->next;
+  if (!cic)
+    return sic;
+
+  /* Is there a second SEND? If so, we'll need to move it too. */
+  if (sic->next->op == SEND)
+    sic2 = sic->next;
+  
+  /* relocate the SEND(s) */
+  remiCodeFromeBBlock (ebp, sic);
+  addiCodeToeBBlock (ebp, sic, cic);
+  if (sic2)
+    {
+      remiCodeFromeBBlock (ebp, sic2);
+      addiCodeToeBBlock (ebp, sic2, cic);
+    }
+
+  /* Return the iCode to continue processing at. */
+  if (prev)
+    return prev->next;
+  else
+    return ebp->sch;
+}
+
+
+/*---------------------------------------------------------------------*/
+/* packPointerOp - see if we can move an offset from addition iCode    */
+/*                 to the pointer iCode to used indexed addr mode      */
+/* The z80-related ports do a similar thing in SDCCopt.c, offsetFold() */
+/*---------------------------------------------------------------------*/
+static void
+packPointerOp (iCode * ic, eBBlock ** ebpp)
+{
+  operand * pointer;
+  operand * offsetOp;
+  operand * nonOffsetOp;
+  iCode * dic;
+  iCode * uic;
+  int key;
+
+  if (POINTER_SET (ic))
+    {
+      pointer = IC_RESULT (ic);
+      offsetOp = IC_LEFT (ic);
+    }
+  else if (POINTER_GET (ic))
+    {
+      pointer = IC_LEFT (ic);
+      offsetOp = IC_RIGHT (ic);
+    }
+  else
+    return;
+
+  if (!IS_ITEMP (pointer))
+    return;
+
+  /* If the pointer is rematerializable, it's already fully optimized */
+  if (OP_SYMBOL (pointer)->remat)
+    return;
+
+  if (offsetOp && IS_OP_LITERAL (offsetOp) && operandLitValue (offsetOp) != 0)
+    return;
+  if (offsetOp && IS_SYMOP (offsetOp))
+    return;
+
+  /* There must be only one definition */
+  if (bitVectnBitsOn (OP_DEFS (pointer)) != 1)
+    return;
+  /* find the definition */
+  if (!(dic = hTabItemWithKey (iCodehTab, bitVectFirstBit (OP_DEFS (pointer)))))
+    return;
+
+  if (dic->op == '+' && (IS_OP_LITERAL (IC_RIGHT (dic)) ||
+                        (IS_ITEMP (IC_RIGHT (dic)) && OP_SYMBOL (IC_RIGHT (dic))->remat)))
+    {
+      nonOffsetOp = IC_LEFT (dic);
+      offsetOp = IC_RIGHT (dic);
+    }
+  else if (dic->op == '+' && IS_ITEMP (IC_LEFT (dic)) && OP_SYMBOL (IC_LEFT (dic))->remat)
+    {
+      nonOffsetOp = IC_RIGHT (dic);
+      offsetOp = IC_LEFT (dic);
+    }
+  else
+    return;
+
+
+  /* Now check all of the uses to make sure they are all get/set pointer */
+  /* and don't already have a non-zero offset operand */
+  for (key=0; key<OP_USES (pointer)->size; key++)
+    {
+      if (bitVectBitValue (OP_USES (pointer), key))
+        {
+          uic = hTabItemWithKey (iCodehTab, key);
+          if (POINTER_GET (uic))
+            {
+              if (IC_RIGHT (uic) && IS_OP_LITERAL (IC_RIGHT (uic)) && operandLitValue (IC_RIGHT (uic)) != 0)
+                return;
+              if (IC_RIGHT (uic) && IS_SYMOP (IC_RIGHT (uic)))
+                return;
+            }
+          else if (POINTER_SET (uic))
+            {
+              if (IC_LEFT (uic) && IS_OP_LITERAL (IC_LEFT (uic)) && operandLitValue (IC_LEFT (uic)) != 0)
+                return;
+              if (IC_LEFT (uic) && IS_SYMOP (IC_LEFT (uic)))
+                return;
+            }
+          else
+            return;
+        }
+    }
+
+  /* Everything checks out. Move the literal or rematerializable offset */
+  /* to the pointer get/set iCodes */
+  for (key=0; key<OP_USES (pointer)->size; key++)
+    {
+      if (bitVectBitValue (OP_USES (pointer), key))
+        {
+          uic = hTabItemWithKey (iCodehTab, key);
+          if (POINTER_GET (uic))
+            {
+              IC_RIGHT (uic) = offsetOp;
+              if (IS_SYMOP (offsetOp))
+                OP_USES (offsetOp) = bitVectSetBit (OP_USES (offsetOp), key);
+            }
+          else if (POINTER_SET (uic))
+            {
+              IC_LEFT (uic) = offsetOp;
+              if (IS_SYMOP (offsetOp))
+                OP_USES (offsetOp) = bitVectSetBit (OP_USES (offsetOp), key);
+            }
+          else
+            return;
+        }
+    }
+
+  /* Put the remaining operand on the right and convert to assignment     */
+  /* or cast (Sometimes the operands to the addition are different sizes, */
+  /* so there is an implicit cast. If so, need to make it explicit so     */
+  /* that all the bytes of the pointer are defined. */
+  if (IS_SYMOP (offsetOp))
+    bitVectUnSetBit (OP_USES (offsetOp), dic->key);
+  IC_RIGHT (dic) = nonOffsetOp;
+  IC_LEFT (dic) = NULL;
+  SET_ISADDR (IC_RESULT (dic), 0);
+  if (getSize (operandType (pointer)) == getSize (operandType (nonOffsetOp)))
+    dic->op = '=';
+  else
+    {
+      dic->op = CAST;
+      IC_LEFT (dic) = operandFromLink (operandType (pointer));
+    }
+}
+
 /*-----------------------------------------------------------------*/
 /* packRegisters - does some transformations to reduce register    */
 /*                   pressure                                      */
@@ -2829,7 +2990,14 @@
   for (ic = ebp->sch; ic; ic = ic->next)
     {
       //packRegsForLiteral (ic);
-
+      
+      /* move SEND to immediately precede its CALL/PCALL */
+      if (ic->op == SEND && ic->next &&
+          ic->next->op != CALL && ic->next->op != PCALL)
+        {
+          ic = moveSendToCall (ic, ebp);
+        }
+      
       /* if this is an itemp & result of an address of a true sym
          then mark this as rematerialisable   */
       if (ic->op == ADDRESS_OF &&
@@ -2842,18 +3010,7 @@
           OP_SYMBOL (IC_RESULT (ic))->rematiCode = ic;
           OP_SYMBOL (IC_RESULT (ic))->usl.spillLoc = NULL;
         }
-#if 1
-      if (ic->op == '=' &&
-          !POINTER_SET (ic) &&
-          IS_ITEMP (IC_RESULT (ic)) &&
-          IS_VALOP (IC_RIGHT (ic)) &&
-          bitVectnBitsOn (OP_DEFS (IC_RESULT (ic))) == 1)
-        {
-          OP_SYMBOL (IC_RESULT (ic))->remat = 1;
-          OP_SYMBOL (IC_RESULT (ic))->rematiCode = ic;
-          OP_SYMBOL (IC_RESULT (ic))->usl.spillLoc = NULL;
-        }
-#endif
+
       /* if straight assignment then carry remat flag if
          this is the only definition */
       if (ic->op == '=' &&
@@ -2898,7 +3055,6 @@
           OP_SYMBOL (IC_RESULT (ic))->rematiCode = ic;
           OP_SYMBOL (IC_RESULT (ic))->usl.spillLoc = NULL;
         }
-
       /* mark the pointer usages */
       if (POINTER_SET (ic) && IS_SYMOP (IC_RESULT (ic)))
         OP_SYMBOL (IC_RESULT (ic))->uptr = 1;
@@ -2906,31 +3062,9 @@
       if (POINTER_GET (ic) && IS_SYMOP (IC_LEFT (ic)))
         OP_SYMBOL (IC_LEFT (ic))->uptr = 1;
 
-      if (!SKIP_IC2 (ic))
-        {
-#if 0
-          /* if we are using a symbol on the stack
-             then we should say hc08_ptrRegReq */
-          if (ic->op == IFX && IS_SYMOP (IC_COND (ic)))
-            hc08_ptrRegReq += ((OP_SYMBOL (IC_COND (ic))->onStack ||
-                                 OP_SYMBOL (IC_COND (ic))->iaccess) ? 1 : 0);
-          else if (ic->op == JUMPTABLE && IS_SYMOP (IC_JTCOND (ic)))
-            hc08_ptrRegReq += ((OP_SYMBOL (IC_JTCOND (ic))->onStack ||
-                              OP_SYMBOL (IC_JTCOND (ic))->iaccess) ? 1 : 0);
-          else
-            {
-              if (IS_SYMOP (IC_LEFT (ic)))
-                hc08_ptrRegReq += ((OP_SYMBOL (IC_LEFT (ic))->onStack ||
-                                OP_SYMBOL (IC_LEFT (ic))->iaccess) ? 1 : 0);
-              if (IS_SYMOP (IC_RIGHT (ic)))
-                hc08_ptrRegReq += ((OP_SYMBOL (IC_RIGHT (ic))->onStack ||
-                               OP_SYMBOL (IC_RIGHT (ic))->iaccess) ? 1 : 0);
-              if (IS_SYMOP (IC_RESULT (ic)))
-                hc08_ptrRegReq += ((OP_SYMBOL (IC_RESULT (ic))->onStack ||
-                              OP_SYMBOL (IC_RESULT (ic))->iaccess) ? 1 : 0);
-            }
-#endif
-        }
+      /* reduce for support function calls */
+      if (ic->supportRtn || (ic->op != IFX && ic->op != JUMPTABLE))
+        packRegsForSupport (ic, ebp);
 
       /* if the condition of an if instruction
          is defined in the previous instruction and
@@ -2947,169 +3081,275 @@
           continue;
         }
 
-      #if 0
-      /* if the condition of an if instruction
-         is defined in the previous GET_POINTER instruction and
-         this is the only usage then
-         mark the itemp as accumulator use */
-      if ((POINTER_GET (ic) && getSize (operandType (IC_RESULT (ic))) <=1) &&
-          ic->next && ic->next->op == IFX &&
-          bitVectnBitsOn (OP_USES(IC_RESULT(ic)))==1 &&
-          isOperandEqual (IC_RESULT (ic), IC_COND (ic->next)) &&
-          OP_SYMBOL (IC_RESULT (ic))->liveTo <= ic->next->seq)
+      /* pack for PUSH
+         iTempNN := (some variable in farspace) V1
+         push iTempNN ;
+         -------------
+         push V1
+       */
+      if (ic->op == IPUSH || ic->op == SEND)
         {
-          OP_SYMBOL (IC_RESULT (ic))->accuse = 1;
-          continue;
+          packForPush (ic, ebpp, blockno);
         }
 
-      if (ic->op != IFX && ic->op !=JUMPTABLE && !POINTER_SET (ic)
-          && IC_RESULT (ic) && IS_ITEMP (IC_RESULT (ic))
-          && getSize (operandType (IC_RESULT (ic))) == 1
-          && bitVectnBitsOn (OP_USES (IC_RESULT (ic))) == 1
-          && ic->next
-          && OP_SYMBOL (IC_RESULT (ic))->liveTo <= ic->next->seq)
+      if (POINTER_SET (ic) || POINTER_GET (ic))
+        packPointerOp (ic, ebpp);
+
+      if (0) /* TODO: Old allocator! */
+        packRegsForAccUse (ic);
+    }
+}
+
+static void
+RegFix (eBBlock ** ebbs, int count)
+{
+  int i;
+
+  /* Check for and fix any problems with uninitialized operands */
+  for (i = 0; i < count; i++)
+    {
+      iCode *ic;
+
+      if (ebbs[i]->noPath && (ebbs[i]->entryLabel != entryLabel && ebbs[i]->entryLabel != returnLabel))
+        continue;
+
+      for (ic = ebbs[i]->sch; ic; ic = ic->next)
         {
-          int accuse = 0;
+          deassignLRs (ic, ebbs[i]);
 
-          if (ic->next->op == IFX)
-            {
-              if (isOperandEqual (IC_RESULT (ic), IC_COND (ic->next)))
-                accuse = 1;
-            }
-          else if (ic->next->op == JUMPTABLE)
-            {
-               if (isOperandEqual (IC_RESULT (ic), IC_JTCOND (ic->next)))
-                 accuse = 1;
-            }
-          else
+          if (SKIP_IC2 (ic))
+            continue;
+
+          if (ic->op == IFX)
             {
-               if (isOperandEqual (IC_RESULT (ic), IC_LEFT (ic->next)))
-                 accuse = 1;
-               if (isOperandEqual (IC_RESULT (ic), IC_RIGHT (ic->next)))
-                 accuse = 1;
+              verifyRegsAssigned (IC_COND (ic), ic);
+              continue;
             }
 
-          if (accuse)
+          if (ic->op == JUMPTABLE)
             {
-              OP_SYMBOL (IC_RESULT (ic))->accuse = 1;
+              verifyRegsAssigned (IC_JTCOND (ic), ic);
               continue;
             }
 
+          verifyRegsAssigned (IC_RESULT (ic), ic);
+          verifyRegsAssigned (IC_LEFT (ic), ic);
+          verifyRegsAssigned (IC_RIGHT (ic), ic);
         }
-      #endif
+    }
+}
 
-      /* reduce for support function calls */
-      if (ic->supportRtn || (ic->op != IFX && ic->op != JUMPTABLE))
-        packRegsForSupport (ic, ebp);
+#ifdef OLDRALLOC
+/*-----------------------------------------------------------------*/
+/* Old, obsolete register allocator                                */
+/*-----------------------------------------------------------------*/
+void
+hc08_oldralloc (ebbIndex * ebbi)
+{
+  eBBlock ** ebbs = ebbi->bbOrder;
+  int count = ebbi->count;
+  iCode *ic;
+  int i;
 
-      #if 0
-      /* some cases the redundant moves can
-         can be eliminated for return statements */
-      if ((ic->op == RETURN || (ic->op == SEND && ic->argreg == 1)) &&
-          /* !isOperandInFarSpace (IC_LEFT (ic)) && */
-          options.model == MODEL_SMALL)
-        {
-          packRegsForOneuse (ic, IC_LEFT (ic), ebp);
-        }
+  setToNull ((void *) &_G.funcrUsed);
+  setToNull ((void *) &_G.regAssigned);
+  setToNull ((void *) &_G.totRegAssigned);
+  hc08_ptrRegReq = _G.stackExtend = _G.dataExtend = 0;
+  hc08_nRegs = 7;
+  hc08_reg_a = hc08_regWithIdx(A_IDX);
+  hc08_reg_x = hc08_regWithIdx(X_IDX);
+  hc08_reg_h = hc08_regWithIdx(H_IDX);
+  hc08_reg_hx = hc08_regWithIdx(HX_IDX);
+  hc08_reg_xa = hc08_regWithIdx(XA_IDX);
+  hc08_reg_sp = hc08_regWithIdx(SP_IDX);
+  hc08_nRegs = 5;
 
-      /* if pointer set & left has a size more than
-         one and right is not in far space */
-      if (POINTER_SET (ic) &&
-          /* !isOperandInFarSpace (IC_RIGHT (ic)) && */
-          !OP_SYMBOL (IC_RESULT (ic))->remat &&
-          !IS_OP_RUONLY (IC_RIGHT (ic))
-          /* && getSize (aggrToPtr (operandType (IC_RESULT (ic)), FALSE)) > 1 */ )
-        {
-          packRegsForOneuse (ic, IC_RESULT (ic), ebp);
-        }
+  /* change assignments this will remove some
+     live ranges reducing some register pressure */
 
-      /* if pointer get */
-      if (POINTER_GET (ic) &&
-          IS_SYMOP (IC_LEFT (ic)) &&
-          /* !isOperandInFarSpace (IC_RESULT (ic)) && */
-          !OP_SYMBOL (IC_LEFT (ic))->remat &&
-          !IS_OP_RUONLY (IC_RESULT (ic))
-           /* && getSize (aggrToPtr (operandType (IC_LEFT (ic)), FALSE)) > 1 */)
-        {
-          packRegsForOneuse (ic, IC_LEFT (ic), ebp);
-        }
+  for (i = 0; i < count; i++)
+    packRegisters (ebbs, i);
+
+  /* liveranges probably changed by register packing
+     so we compute them again */
+  recomputeLiveRanges (ebbs, count);
 
-      /* if this is a cast for integral promotion then
-         check if it's the only use of the definition of the
-         operand being casted/ if yes then replace
-         the result of that arithmetic operation with
-         this result and get rid of the cast */
-      if (ic->op == CAST)
+  if (options.dump_pack)
+    dumpEbbsToFileExt (DUMP_PACK, ebbi);
+
+  /* first determine for each live range the number of
+     registers & the type of registers required for each */
+  regTypeNum (*ebbs);
+
+  /* and serially allocate registers */
+  serialRegAssign (ebbs, count);
+
+  freeAllRegs ();
+  //setToNull ((void *) &_G.regAssigned);
+  //setToNull ((void *) &_G.totRegAssigned);
+  fillGaps();
+
+  /* if stack was extended then tell the user */
+  if (_G.stackExtend)
+    {
+/*      werror(W_TOOMANY_SPILS,"stack", */
+/*             _G.stackExtend,currFunc->name,""); */
+      _G.stackExtend = 0;
+    }
+
+  if (_G.dataExtend)
+    {
+/*      werror(W_TOOMANY_SPILS,"data space", */
+/*             _G.dataExtend,currFunc->name,""); */
+      _G.dataExtend = 0;
+    }
+
+  /* after that create the register mask
+     for each of the instruction */
+  createRegMask (ebbs, count);
+
+  /* redo that offsets for stacked automatic variables */
+  if (currFunc)
+    {
+      redoStackOffsets ();
+    }
+
+  if (options.dump_rassgn)
+    {
+      dumpEbbsToFileExt (DUMP_RASSGN, ebbi);
+      dumpLiveRanges (DUMP_LRANGE, liveRanges);
+    }
+
+  /* do the overlaysegment stuff SDCCmem.c */
+  doOverlays (ebbs, count);
+
+  /* now get back the chain */
+  ic = iCodeLabelOptimize (iCodeFromeBBlock (ebbs, count));
+
+  genhc08Code (ic);
+
+  /* free up any _G.stackSpil locations allocated */
+  applyToSet (_G.stackSpil, deallocStackSpil);
+  _G.slocNum = 0;
+  setToNull ((void *) &_G.stackSpil);
+  setToNull ((void *) &_G.spiltSet);
+  /* mark all registers as free */
+  freeAllRegs ();
+
+  return;
+}
+#endif
+
+/** Serially allocate registers to the variables.
+    This was the main register allocation function.  It is called after
+    packing.
+    In the new register allocator it only serves to mark variables for the new register allocator.
+ */
+static void
+serialRegMark (eBBlock ** ebbs, int count)
+{
+  int i;
+  short int max_alloc_bytes = SHRT_MAX; // Byte limit. Set this to a low value to pass only few variables to the register allocator. This can be useful for debugging.
+
+  /* for all blocks */
+  for (i = 0; i < count; i++)
+    {
+      iCode *ic;
+
+      if (ebbs[i]->noPath &&
+          (ebbs[i]->entryLabel != entryLabel &&
+           ebbs[i]->entryLabel != returnLabel))
+        continue;
+
+      /* for all instructions do */
+      for (ic = ebbs[i]->sch; ic; ic = ic->next)
         {
-          sym_link *fromType = operandType (IC_RIGHT (ic));
-          sym_link *toType = operandType (IC_LEFT (ic));
+          updateRegUsage(ic);
 
-          if (IS_INTEGRAL (fromType) && IS_INTEGRAL (toType) &&
-              getSize (fromType) != getSize (toType) &&
-              SPEC_USIGN (fromType) == SPEC_USIGN (toType))
+          /* if this is an ipop that means some live
+             range will have to be assigned again */
+          if (ic->op == IPOP)
+              reassignLR (IC_LEFT (ic));
+
+          /* if result is present && is a true symbol */
+          if (IC_RESULT (ic) && ic->op != IFX &&
+              IS_TRUE_SYMOP (IC_RESULT (ic)))
             {
-              iCode *dic = packRegsForOneuse (ic, IC_RIGHT (ic), ebp);
-              if (dic)
-                {
-                  if (IS_ARITHMETIC_OP (dic))
-                    {
-                      bitVectUnSetBit(OP_SYMBOL(IC_RESULT(dic))->defs,dic->key);
-                      ReplaceOpWithCheaperOp(&IC_RESULT (dic), IC_RESULT (ic));
-                      remiCodeFromeBBlock (ebp, ic);
-                      bitVectUnSetBit(OP_SYMBOL(IC_RESULT(ic))->defs,ic->key);
-                      hTabDeleteItem (&iCodehTab, ic->key, ic, DELETE_ITEM, NULL);
-                      OP_DEFS(IC_RESULT (dic))=bitVectSetBit (OP_DEFS (IC_RESULT (dic)), dic->key);
-                      ic = ic->prev;
-                    }
-                  else
-                    {
-                      OP_SYMBOL (IC_RIGHT (ic))->ruonly = 0;
-                    }
-                }
+              OP_SYMBOL (IC_RESULT (ic))->allocreq++;
             }
-          else
+
+          /* take away registers from live
+             ranges that end at this instruction */
+          deassignLRs (ic, ebbs[i]);
+
+          /* some don't need registers */
+          if (SKIP_IC2 (ic) ||
+              ic->op == JUMPTABLE ||
+              ic->op == IFX ||
+              ic->op == IPUSH ||
+              ic->op == IPOP ||
+              (IC_RESULT (ic) && POINTER_SET (ic)))
+            {
+              continue;
+            }
+
+          /* now we need to allocate registers only for the result */
+          if (IC_RESULT (ic))
             {
-              /* if the type from and type to are the same
-                 then if this is the only use then pack it */
-              if (compareType (operandType (IC_RIGHT (ic)),
-                             operandType (IC_LEFT (ic))) == 1)
+              symbol *sym = OP_SYMBOL (IC_RESULT (ic));
+
+              /* Make sure any spill location is definitely allocated */
+              if (sym->isspilt && !sym->remat && sym->usl.spillLoc &&
+                  !sym->usl.spillLoc->allocreq)
                 {
-                  iCode *dic = packRegsForOneuse (ic, IC_RIGHT (ic), ebp);
-                  if (dic)
-                    {
-                      bitVectUnSetBit(OP_SYMBOL(IC_RESULT(dic))->defs,dic->key);
-                      ReplaceOpWithCheaperOp(&IC_RESULT (dic), IC_RESULT (ic));
-                      remiCodeFromeBBlock (ebp, ic);
-                      bitVectUnSetBit(OP_SYMBOL(IC_RESULT(ic))->defs,ic->key);
-                      hTabDeleteItem (&iCodehTab, ic->key, ic, DELETE_ITEM, NULL);
-                      OP_DEFS(IC_RESULT (dic))=bitVectSetBit (OP_DEFS (IC_RESULT (dic)), dic->key);
-                      ic = ic->prev;
-                    }
+                  sym->usl.spillLoc->allocreq++;
                 }
-            }
-        }
-      #endif
 
-      /* pack for PUSH
-         iTempNN := (some variable in farspace) V1
-         push iTempNN ;
-         -------------
-         push V1
-       */
-      if (ic->op == IPUSH)
-        {
-          packForPush (ic, ebpp, blockno);
-        }
+              /* if it does not need or is spilt
+                 or is already assigned to registers
+                 or will not live beyond this instructions */
+              if (!sym->nRegs ||
+                  sym->isspilt ||
+                  bitVectBitValue (_G.regAssigned, sym->key) ||
+                  sym->liveTo <= ic->seq)
+                {
+                  continue;
+                }
+
+              /* if some liverange has been spilt at the block level
+                 and this one live beyond this block then spil this
+                 to be safe */
+              if (_G.blockSpil && sym->liveTo > ebbs[i]->lSeq)
+                {
+                  spillThis (sym);
+                  continue;
+                }
+
+              if (sym->remat)
+                {
+                  spillThis (sym);
+                  continue;
+                }
 
-      packRegsForAccUse (ic);
+              if (max_alloc_bytes >= sym->nRegs)
+                {
+                  sym->for_newralloc = 1;
+                  max_alloc_bytes -= sym->nRegs;
+                }
+              else if (!sym->for_newralloc)
+                {
+                  spillThis (sym);
+                  printf ("Spilt %s due to byte limit.\n", sym->name);
+                }
+            }
+        }
     }
 }
-
 /*-----------------------------------------------------------------*/
-/* assignRegisters - assigns registers to each live range as need  */
+/* New register allocator                                          */
 /*-----------------------------------------------------------------*/
 void
-hc08_assignRegisters (ebbIndex * ebbi)
+hc08_ralloc (ebbIndex * ebbi)
 {
   eBBlock ** ebbs = ebbi->bbOrder;
   int count = ebbi->count;
@@ -3147,12 +3387,12 @@
   regTypeNum (*ebbs);
 
   /* and serially allocate registers */
-  serialRegAssign (ebbs, count);
+  serialRegMark (ebbs, count);
 
-  freeAllRegs ();
-  //setToNull ((void *) &_G.regAssigned);
-  //setToNull ((void *) &_G.totRegAssigned);
-  fillGaps();
+  /* The new register allocator invokes its magic */
+  ic = hc08_ralloc2_cc (ebbi);
+
+  RegFix (ebbs, count);
 
   /* if stack was extended then tell the user */
   if (_G.stackExtend)
@@ -3203,3 +3443,18 @@
 
   return;
 }
+
+/*-----------------------------------------------------------------*/
+/* assignRegisters - assigns registers to each live range as need  */
+/*-----------------------------------------------------------------*/
+void
+hc08_assignRegisters (ebbIndex * ebbi)
+{
+#ifdef OLDRALLOC
+  if (options.oldralloc)
+    hc08_oldralloc (ebbi);
+  else
+#endif
+    hc08_ralloc (ebbi);
+}
+
diff -Nru sdcc-3.1.0+dfsg/src/hc08/ralloc.h sdcc-3.2.0+dfsg/src/hc08/ralloc.h
--- sdcc-3.1.0+dfsg/src/hc08/ralloc.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/hc08/ralloc.h	2012-05-05 16:16:42.000000000 +0000
@@ -30,8 +30,8 @@
 enum
   {
     A_IDX,
-    H_IDX,
     X_IDX,
+    H_IDX,
     HX_IDX,
     XA_IDX,
     CND_IDX,
@@ -53,7 +53,8 @@
     short mask;			/* bitmask for pair allocation */
     struct asmop *aop;		/* last operand */
     int aopofs;			/* last operand offset */
-    unsigned isFree:1;		/* is currently unassigned  */
+    unsigned isFree:1;		/* is currently unassigned */
+    unsigned isDead:1;      /* does not need to survive current instruction */
   }
 reg_info;
 extern reg_info regshc08[];
@@ -70,4 +71,6 @@
 void hc08_dirtyReg (reg_info * reg, bool freereg);
 bitVect *hc08_rUmaskForOp (operand * op);
 
+iCode *hc08_ralloc2_cc(ebbIndex *ebbi);
+
 #endif
diff -Nru sdcc-3.1.0+dfsg/src/hc08/ralloc2.cc sdcc-3.2.0+dfsg/src/hc08/ralloc2.cc
--- sdcc-3.1.0+dfsg/src/hc08/ralloc2.cc	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/hc08/ralloc2.cc	2012-05-30 05:06:55.000000000 +0000
@@ -0,0 +1,667 @@
+// Philipp Klaus Krause, philipp@informatik.uni-frankfurt.de, pkk@spth.de, 2010 - 2011
+//
+// (c) 2012 Goethe-Universität Frankfurt
+//
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option) any
+// later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//#define DEBUG_RALLOC_DEC // Uncomment to get debug messages while doing register allocation on the tree decomposition.
+//#define DEBUG_RALLOC_DEC_ASS // Uncomment to get debug messages about assignments while doing register allocation on the tree decomposition (much more verbose than the one above).
+
+#define TD_SALLOC
+#define CH_SALLOC
+
+#include "SDCCralloc.hpp"
+
+extern "C"
+{
+  #include "ralloc.h"
+  #include "gen.h"
+  unsigned char dryhc08iCode (iCode *ic);
+  bool hc08_assignment_optimal;
+};
+
+#define REG_A 0
+#define REG_X 1
+#define REG_H 2
+
+template <class I_t>
+static void add_operand_conflicts_in_node(const cfg_node &n, I_t &I)
+{
+  const iCode *ic = n.ic;
+  
+  const operand *result = IC_RESULT(ic);
+  const operand *left = IC_LEFT(ic);
+  const operand *right = IC_RIGHT(ic);
+	
+  if(!result || !IS_SYMOP(result))
+    return;
+    
+  // Todo: Identify more operations that code generation can always handle and exclude them (as done for the z80-like ports).
+  if (ic->op == '=')
+    return;
+
+  operand_map_t::const_iterator oir, oir_end, oirs; 
+  boost::tie(oir, oir_end) = n.operands.equal_range(OP_SYMBOL_CONST(result)->key);
+  if(oir == oir_end)
+    return;
+    
+  operand_map_t::const_iterator oio, oio_end;
+  
+  if(left && IS_SYMOP(left))
+    for(boost::tie(oio, oio_end) = n.operands.equal_range(OP_SYMBOL_CONST(left)->key); oio != oio_end; ++oio)
+      for(oirs = oir; oirs != oir_end; ++oirs)
+        {
+          var_t rvar = oirs->second;
+          var_t ovar = oio->second;
+          if(I[rvar].byte < I[ovar].byte)
+            boost::add_edge(rvar, ovar, I);
+        }
+        
+  if(right && IS_SYMOP(right))
+    for(boost::tie(oio, oio_end) = n.operands.equal_range(OP_SYMBOL_CONST(right)->key); oio != oio_end; ++oio)
+      for(oirs = oir; oirs != oir_end; ++oirs)
+        {
+          var_t rvar = oirs->second;
+          var_t ovar = oio->second;
+          if(I[rvar].byte < I[ovar].byte)
+            boost::add_edge(rvar, ovar, I);
+        }
+}
+
+// Return true, iff the operand is placed (partially) in r.
+template <class G_t>
+static bool operand_in_reg(const operand *o, reg_t r, const i_assignment_t &ia, unsigned short int i, const G_t &G)
+{
+  if(!o || !IS_SYMOP(o))
+    return(false);
+
+  operand_map_t::const_iterator oi, oi_end;
+  for(boost::tie(oi, oi_end) = G[i].operands.equal_range(OP_SYMBOL_CONST(o)->key); oi != oi_end; ++oi)
+    if(oi->second == ia.registers[r][1] || oi->second == ia.registers[r][0])
+      return(true);
+
+  return(false);
+}
+
+// Check that the operand is either fully in registers or fully in memory.
+template <class G_t, class I_t>
+static bool operand_sane(const operand *o, const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+{
+  if(!o || !IS_SYMOP(o))
+    return(true);
+ 
+  operand_map_t::const_iterator oi, oi2, oi_end;
+  boost::tie(oi, oi_end) = G[i].operands.equal_range(OP_SYMBOL_CONST(o)->key);
+  
+  if(oi == oi_end)
+    return(true);
+
+  // Go to the second byte. If the operand is only a single byte, it cannot be
+  // an unsupported register combination or split between register and memory.
+  oi2 = oi;
+  oi2++;
+  if (oi2 == oi_end)
+    return(true);
+  
+  // Register combinations code generation cannot handle yet (AH, XH, HA).
+  if(a.local.find(oi->second) != a.local.end() && a.local.find(oi2->second) != a.local.end())
+    {
+      const reg_t l = a.global[oi->second];
+      const reg_t h = a.global[oi2->second];
+      if(l == REG_A && h == REG_H || l == REG_H)
+        return(false);
+    }
+  
+  // In registers.
+  if(a.local.find(oi->second) != a.local.end())
+    {
+      while(++oi != oi_end)
+        if(a.local.find(oi->second) == a.local.end())
+          return(false);
+    }
+  else
+    {
+       while(++oi != oi_end)
+        if(a.local.find(oi->second) != a.local.end())
+          return(false);
+    }
+ 
+  return(true);
+}
+
+template <class G_t, class I_t>
+static bool inst_sane(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+{
+  const iCode *ic = G[i].ic;
+
+  return(operand_sane(IC_RESULT(ic), a, i, G, I) && operand_sane(IC_LEFT(ic), a, i, G, I) && operand_sane(IC_RIGHT(ic), a, i, G, I));
+}
+
+template <class G_t, class I_t>
+static bool operand_is_ax(const operand *o, const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+{  
+  if(!o || !IS_SYMOP(o))
+    return(false);
+ 
+  operand_map_t::const_iterator oi, oi2, oi_end;
+  boost::tie(oi, oi_end) = G[i].operands.equal_range(OP_SYMBOL_CONST(o)->key);
+  
+  if(oi == oi_end)
+    return(false);
+
+  // Register combinations code generation cannot handle yet (AX, AH, XH, HA).
+  if(a.local.find(oi->second) != a.local.end() && a.local.find((oi2 = oi, ++oi2)->second) != a.local.end())
+    {
+      const reg_t l = a.global[oi->second];
+      const reg_t h = a.global[oi2->second];
+      if(l == REG_X && h == REG_A)
+        return(true);
+    }
+
+  return(false);
+}
+
+template <class G_t, class I_t>
+static bool XAinst_ok(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+{
+  const iCode *ic = G[i].ic;
+
+  // Instructions that can handle anything.
+  if(ic->op == '!' ||
+    ic->op == '~' ||
+    ic->op == UNARYMINUS ||
+    ic->op == CALL ||
+    ic->op == PCALL ||
+    ic->op == FUNCTION ||
+    ic->op == ENDFUNCTION ||
+    ic->op == RETURN ||
+    ic->op == LABEL ||
+    ic->op == GOTO ||
+    ic->op == '+' ||
+    ic->op == '-' ||
+    ic->op == '*' ||
+    ic->op == '/' ||
+    ic->op == '%' ||
+    ic->op == '<' || ic->op == '>' || ic->op == LE_OP || ic->op == GE_OP ||
+    ic->op == NE_OP || ic->op == EQ_OP ||
+    ic->op == AND_OP ||
+    ic->op == OR_OP ||
+    ic->op == '^' ||
+    ic->op == '|' ||
+    ic->op == BITWISEAND ||
+    ic->op == GETHBIT ||
+    ic->op == GETABIT ||
+    ic->op == GETBYTE ||
+    ic->op == GETWORD ||
+    ic->op == LEFT_OP ||
+    ic->op == RIGHT_OP ||
+    ic->op == '=' && !POINTER_SET(ic) ||
+    ic->op == ADDRESS_OF ||
+    ic->op == CAST ||
+    ic->op == DUMMY_READ_VOLATILE ||
+    ic->op == SWAP)
+    return(true);
+
+  if(ic->op == IFX && ic->generated)
+    return(true);
+
+  const i_assignment_t &ia = a.i_assignment;
+
+  bool unused_A = (ia.registers[REG_A][1] < 0);
+  bool unused_H = (ia.registers[REG_H][1] < 0);
+  bool unused_X = (ia.registers[REG_X][1] < 0);
+
+  if(unused_X && unused_A && unused_H)
+    return(true);
+
+#if 0
+  std::cout << "XAinst_ok: at (" << i << ", " << ic->key << ")\nX = (" << ia.registers[REG_X][0] << ", " << ia.registers[REG_X][1] << "), A = (" << ia.registers[REG_A][0] << ", " << ia.registers[REG_A][1] << ")inst " << i << ", " << ic->key << "\n";
+#endif
+
+  const operand *left = IC_LEFT(ic);
+  const operand *right = IC_RIGHT(ic);
+  const operand *result = IC_RESULT(ic);
+
+  bool result_in_A = operand_in_reg(result, REG_A, ia, i, G) && !(ic->op == '=' && POINTER_SET(ic));
+  bool result_in_H = operand_in_reg(result, REG_H, ia, i, G) && !(ic->op == '=' && POINTER_SET(ic));
+  bool result_in_X = operand_in_reg(result, REG_X, ia, i, G) && !(ic->op == '=' && POINTER_SET(ic));
+  bool left_in_A = operand_in_reg(result, REG_A, ia, i, G);
+  bool left_in_X = operand_in_reg(result, REG_X, ia, i, G);
+
+  const std::set<var_t> &dying = G[i].dying;
+
+  bool dying_A = result_in_A || dying.find(ia.registers[REG_A][1]) != dying.end() || dying.find(ia.registers[REG_A][0]) != dying.end();
+  bool dying_H = result_in_H || dying.find(ia.registers[REG_H][1]) != dying.end() || dying.find(ia.registers[REG_H][0]) != dying.end();
+  bool dying_X = result_in_X || dying.find(ia.registers[REG_X][1]) != dying.end() || dying.find(ia.registers[REG_X][0]) != dying.end();
+
+  bool result_only_XA = (result_in_X || unused_X || dying_X) && (result_in_A || unused_A || dying_A);
+
+  if((ic->op == IFX || ic->op == JUMPTABLE) && (unused_A || dying_A))
+    return(true);
+
+  if(ic->op == IPUSH && (unused_A || dying_A || left_in_A || operand_in_reg(left, REG_H, ia, i, G) || left_in_X))
+    return(true);
+
+  if(ic->op == GET_VALUE_AT_ADDRESS && (unused_X || dying_X) && (unused_H || dying_H))
+	return(true);
+
+  if(ic->op == '=' && POINTER_SET(ic) && (unused_A || dying_A) && !operand_in_reg(right, REG_H, ia, i, G) && !operand_in_reg(right, REG_X, ia, i, G))
+    return(true);
+
+  if(ic->op == RECEIVE && (!ic->next || !(ic->next->op == RECEIVE) || !result_in_X || getSize(operandType(result)) >= 2))
+    return(true);
+
+  if(ic->op == SEND && ic->next && ic->next->op == SEND && ic->next->next && ic->next->next->op == SEND)
+    return(true);
+
+  if(ic->op == SEND && ic->next && ic->next->op == SEND && (unused_X || dying_X))
+    return(true);
+
+  if(ic->op == SEND && (unused_X || dying_X) && (unused_A || dying_A))
+    return(true);
+
+  if(ic->op == SEND && ic->next && (ic->next->op == CALL || ic->next->op == PCALL)) // Might mess up A and X, but these would have been saved before if surviving, and will not be needed again before the call.
+    return(true);
+
+  if((ic->op == CRITICAL || ic->op == ENDCRITICAL) && (unused_A || dying_A))
+    return(true);
+
+  return(false);
+}
+
+template <class G_t, class I_t>
+static bool AXinst_ok(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+{
+  const iCode *ic = G[i].ic;
+
+  const i_assignment_t &ia = a.i_assignment;
+
+  if(ic->op == '!' ||
+    ic->op == '~' ||
+    ic->op == IPUSH ||
+    ic->op == CALL ||
+    ic->op == FUNCTION ||
+    ic->op == ENDFUNCTION ||
+    ic->op == RETURN ||
+    ic->op == LABEL ||
+    ic->op == GOTO ||
+    ic->op == '+' ||
+    ic->op == '-' ||
+    ic->op == NE_OP || ic->op == EQ_OP ||
+    ic->op == '^' ||
+    ic->op == '|' ||
+    ic->op == BITWISEAND ||
+    ic->op == GETHBIT ||
+    ic->op == GETABIT ||
+    ic->op == GETBYTE ||
+    ic->op == GETWORD ||
+    /*ic->op == LEFT_OP ||
+    ic->op == RIGHT_OP ||*/
+    ic->op == GET_VALUE_AT_ADDRESS ||
+    ic->op == '=' ||
+    ic->op == ADDRESS_OF ||
+    ic->op == RECEIVE ||
+    ic->op == SEND ||
+    ic->op == DUMMY_READ_VOLATILE ||
+    ic->op == CRITICAL ||
+    ic->op == ENDCRITICAL ||
+    ic->op == SWAP)
+    return(true);
+
+  bool unused_A = (ia.registers[REG_A][1] < 0);
+  bool unused_X = (ia.registers[REG_X][1] < 0);
+
+  if (unused_A || unused_X)
+    return(true);
+
+  const operand *left = IC_LEFT(ic);
+  const operand *right = IC_RIGHT(ic);
+  const operand *result = IC_RESULT(ic);
+
+  bool result_in_A = operand_in_reg(result, REG_A, ia, i, G) && !(ic->op == '=' && POINTER_SET(ic));
+  bool result_in_X = operand_in_reg(result, REG_X, ia, i, G) && !(ic->op == '=' && POINTER_SET(ic));
+  bool left_in_A = operand_in_reg(result, REG_A, ia, i, G);
+  bool left_in_X = operand_in_reg(result, REG_X, ia, i, G);
+  bool right_in_A = operand_in_reg(result, REG_A, ia, i, G);
+  bool right_in_X = operand_in_reg(result, REG_X, ia, i, G);
+
+  bool result_is_ax = operand_is_ax (result, a, i, G, I);
+  bool left_is_ax = operand_is_ax (left, a, i, G, I);
+  bool right_is_ax = operand_is_ax (right, a, i, G, I);
+
+  if (!result_is_ax && !left_is_ax && !right_is_ax)
+    return(true);
+
+  return(false);
+}
+
+template <class G_t, class I_t>
+static void set_surviving_regs(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+{
+  iCode *ic = G[i].ic;
+  
+  ic->rSurv = newBitVect(NUM_REGS);
+  
+  std::set<var_t>::const_iterator v, v_end;
+  for (v = G[i].alive.begin(), v_end = G[i].alive.end(); v != v_end; ++v)
+    if(a.global[*v] >= 0 && G[i].dying.find(*v) == G[i].dying.end())
+      if(!((IC_RESULT(ic) && !POINTER_SET(ic)) && IS_SYMOP(IC_RESULT(ic)) && OP_SYMBOL_CONST(IC_RESULT(ic))->key == I[*v].v))
+        ic->rSurv = bitVectSetBit(ic->rSurv, a.global[*v]);
+}
+
+template<class G_t>
+static void unset_surviving_regs(unsigned short int i, const G_t &G)
+{
+  iCode *ic = G[i].ic;
+  
+  freeBitVect(ic->rSurv);
+}
+
+template <class G_t, class I_t>
+void assign_operand_for_cost(operand *o, const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+{
+  if(!o || !IS_SYMOP(o))
+    return;
+  symbol *sym = OP_SYMBOL(o);
+  operand_map_t::const_iterator oi, oi_end;
+  for(boost::tie(oi, oi_end) = G[i].operands.equal_range(OP_SYMBOL_CONST(o)->key); oi != oi_end; ++oi)
+    {
+      var_t v = oi->second;
+      if(a.global[v] >= 0)
+        { 
+          sym->regs[I[v].byte] = regshc08 + a.global[v];   
+          sym->isspilt = false;
+          sym->nRegs = I[v].size;
+          sym->accuse = 0;
+        }
+      else
+        {
+          for(int i = 0; i < I[v].size; i++)
+            sym->regs[i] = 0;
+          sym->accuse = 0;
+          sym->nRegs = I[v].size;
+          sym->isspilt = true;
+        }
+    }
+}
+
+template <class G_t, class I_t>
+static void assign_operands_for_cost(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+{
+  const iCode *ic = G[i].ic;
+  
+  if(ic->op == IFX)
+    assign_operand_for_cost(IC_COND(ic), a, i, G, I);
+  else if(ic->op == JUMPTABLE)
+    assign_operand_for_cost(IC_JTCOND(ic), a, i, G, I);
+  else
+    {
+      assign_operand_for_cost(IC_LEFT(ic), a, i, G, I);
+      assign_operand_for_cost(IC_RIGHT(ic), a, i, G, I);
+      assign_operand_for_cost(IC_RESULT(ic), a, i, G, I);
+    }
+    
+  if(ic->op == SEND && ic->builtinSEND)
+    {
+      assign_operands_for_cost(a, *(adjacent_vertices(i, G).first), G, I);
+    }
+}
+
+// Cost function.
+template <class G_t, class I_t>
+static float instruction_cost(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+{
+  iCode *ic = G[i].ic;
+  float c;
+
+  wassert (TARGET_IS_HC08 || TARGET_IS_S08);
+
+  if(!inst_sane(a, i, G, I))
+    return(std::numeric_limits<float>::infinity());
+
+  if(!XAinst_ok(a, i, G, I))
+    return(std::numeric_limits<float>::infinity());
+
+  if(!AXinst_ok(a, i, G, I))
+    return(std::numeric_limits<float>::infinity());
+
+#if 0
+  std::cout << "Calculating at cost at ic " << ic->key << " for: ";
+  for(unsigned int i = 0; i < boost::num_vertices(I); i++)
+  {
+  	std::cout << "(" << i << ", " << int(a.global[i]) << ") ";
+  }
+  std::cout << "\n";
+  std::cout.flush();
+#endif
+
+  if(ic->generated)
+    return(0.0f);
+
+  switch(ic->op)
+    {
+    // Register assignment doesn't matter for these:
+    case FUNCTION:
+    case ENDFUNCTION:
+    case LABEL:
+    case GOTO:
+    case INLINEASM:
+      return(0.0f);
+    case '!':
+    case '~':
+    case UNARYMINUS:
+    case '+':
+    case '-':
+    case '^':
+    case '|':
+    case BITWISEAND:
+    case IPUSH:
+    //case IPOP:
+    case CALL:
+    case PCALL:
+    case RETURN:
+    case '*':
+    case '/':
+    case '%':
+    case '>':
+    case '<':
+    case LE_OP:
+    case GE_OP:
+    case EQ_OP:
+    case NE_OP:
+    case AND_OP:
+    case OR_OP:
+    case GETHBIT:
+    case GETABIT:
+    case GETBYTE:
+    case GETWORD:
+    case LEFT_OP:
+    case RIGHT_OP:
+    case GET_VALUE_AT_ADDRESS:
+    case '=':
+    case IFX:
+    case ADDRESS_OF:
+    case JUMPTABLE:
+    case CAST:
+    case RECEIVE:
+    case SEND:
+    case DUMMY_READ_VOLATILE:
+    case CRITICAL:
+    case ENDCRITICAL:
+    case SWAP:
+      assign_operands_for_cost(a, i, G, I);
+      set_surviving_regs(a, i, G, I);
+      c = dryhc08iCode(ic);
+      unset_surviving_regs(i, G);
+      return(c);
+    default:
+      return(0.0f);
+    }
+}
+
+// For early removal of assignments that cannot be extended to valid assignments. This is just a dummy for now, it probably isn't really needed for hc08 due to the low number of registers.
+template <class G_t, class I_t>
+static bool assignment_hopeless(const assignment &a, unsigned short int i, const G_t &G, const I_t &I, const var_t lastvar)
+{
+  return(false);
+}
+
+// Increase chance of finding good compatible assignments at join nodes. This is just a dummy for now, it probably isn't really needed for hc08 due to the low number of registers.
+template <class T_t>
+static void get_best_local_assignment_biased(assignment &a, typename boost::graph_traits<T_t>::vertex_descriptor t, const T_t &T)
+{
+  a = *T[t].assignments.begin();
+
+  std::set<var_t>::const_iterator vi, vi_end;
+  for(vi = T[t].alive.begin(), vi_end = T[t].alive.end(); vi != vi_end; ++vi)
+    a.local.insert(*vi);
+}
+
+// This is just a dummy for now, it probably isn't really needed for hc08 due to the low number of registers.
+template <class G_t, class I_t>
+static float rough_cost_estimate(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+{
+  return(0.0f);
+}
+
+// Code for another ic is generated when generating this one. Mark the other as generated.
+static void extra_ic_generated(const iCode *ic)
+{
+  if(ic->op == '>' || ic->op == '<' || ic->op == LE_OP || ic->op == GE_OP || ic->op == EQ_OP || ic->op == NE_OP || ic->op == '^' || ic->op == '|' || ic->op == BITWISEAND)
+    {
+      iCode *ifx;
+      if (ifx = ifxForOp (IC_RESULT (ic), ic))
+      ifx->generated = 1;
+    }
+  if(ic->op == '-' && IS_VALOP (IC_RIGHT (ic)) && operandLitValue (IC_RIGHT (ic)) == 1 && getSize(operandType(IC_RESULT (ic))) == 1 && !isOperandInFarSpace (IC_RESULT (ic)) && isOperandEqual (IC_RESULT (ic), IC_LEFT (ic)))
+    {
+      iCode *ifx;
+      if (ifx = ifxForOp (IC_RESULT (ic), ic))
+      ifx->generated = 1;
+    }
+  if(ic->op == GET_VALUE_AT_ADDRESS)
+    {
+      iCode *inc;
+      if (inc = hasInchc08 (IC_LEFT (ic), ic,  getSize (operandType (IC_RIGHT (ic)))))
+         inc->generated = 1;
+    }
+}
+
+template <class T_t, class G_t, class I_t>
+static bool tree_dec_ralloc(T_t &T, G_t &G, const I_t &I)
+{
+  bool assignment_optimal;
+
+  con2_t I2(boost::num_vertices(I));
+  for(unsigned int i = 0; i < boost::num_vertices(I); i++)
+    {
+      I2[i].v = I[i].v;
+      I2[i].byte = I[i].byte;
+      I2[i].size = I[i].size;
+      I2[i].name = I[i].name;
+    }
+  typename boost::graph_traits<I_t>::edge_iterator e, e_end;
+  for(boost::tie(e, e_end) = boost::edges(I); e != e_end; ++e)
+    add_edge(boost::source(*e, I), boost::target(*e, I), I2);
+
+  assignment ac;
+  assignment_optimal = true;
+  tree_dec_ralloc_nodes(T, find_root(T), G, I2, ac, &assignment_optimal);
+
+  const assignment &winner = *(T[find_root(T)].assignments.begin());
+#ifdef DEBUG_RALLOC_DEC
+  std::cout << "Winner: ";
+  for(unsigned int i = 0; i < boost::num_vertices(I); i++)
+  {
+  	std::cout << "(" << i << ", " << int(winner.global[i]) << ") ";
+  }
+  std::cout << "\n";
+  std::cout << "Cost: " << winner.s << "\n";
+  std::cout.flush();
+#endif
+  // Todo: Make this an assertion
+  if(winner.global.size() != boost::num_vertices(I))
+    {
+      std::cerr << "ERROR: No Assignments at root\n";
+      exit(-1);
+    }
+
+  for(unsigned int v = 0; v < boost::num_vertices(I); v++)
+    {
+      symbol *sym = (symbol *)(hTabItemWithKey(liveRanges, I[v].v));
+      if(winner.global[v] >= 0)
+        { 
+          sym->regs[I[v].byte] = regshc08 + winner.global[v];   
+          sym->isspilt = false;
+          sym->nRegs = I[v].size;
+          sym->accuse = 0;
+        }
+      else
+        {
+          for(int i = 0; i < I[v].size; i++)
+            sym->regs[i] = 0;
+          sym->accuse = 0;
+          sym->nRegs = I[v].size;
+          wassert (sym->nRegs);
+          //spillThis(sym); Leave it to regFix, which can do some spillocation compaction. Todo: Use Thorup instead.
+          sym->isspilt = false;
+        }
+    }
+
+  for(unsigned int i = 0; i < boost::num_vertices(G); i++)
+    set_surviving_regs(winner, i, G, I);	// Never freed. Memory leak?
+
+  return(!assignment_optimal);
+}
+
+iCode *hc08_ralloc2_cc(ebbIndex *ebbi)
+{
+  iCode *ic;
+
+#ifdef DEBUG_RALLOC_DEC
+  std::cout << "Processing " << currFunc->name << " from " << dstFileName << "\n"; std::cout.flush();
+#endif
+
+  cfg_t control_flow_graph;
+
+  con_t conflict_graph;
+
+  ic = create_cfg(control_flow_graph, conflict_graph, ebbi);
+
+  if(options.dump_graphs)
+    dump_cfg(control_flow_graph);
+
+  if(options.dump_graphs)
+    dump_con(conflict_graph);
+
+  tree_dec_t tree_decomposition;
+
+  thorup_tree_decomposition(tree_decomposition, control_flow_graph);
+
+  nicify(tree_decomposition);
+
+  alive_tree_dec(tree_decomposition, control_flow_graph);
+
+  good_re_root(tree_decomposition);
+  nicify(tree_decomposition);
+  alive_tree_dec(tree_decomposition, control_flow_graph);
+
+  if(options.dump_graphs)
+    dump_tree_decomposition(tree_decomposition);
+
+  hc08_assignment_optimal = !tree_dec_ralloc(tree_decomposition, control_flow_graph, conflict_graph);
+
+  return(ic);
+}
+
diff -Nru sdcc-3.1.0+dfsg/src/mcs51/gen.c sdcc-3.2.0+dfsg/src/mcs51/gen.c
--- sdcc-3.1.0+dfsg/src/mcs51/gen.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/mcs51/gen.c	2012-06-24 08:47:17.000000000 +0000
@@ -1,8 +1,8 @@
 /*-------------------------------------------------------------------------
   gen.c - source file for code generation for 8051
 
-  Written By -  Sandeep Dutta . sandeep.dutta@usa.net (1998)
-         and -  Jean-Louis VERN.jlvern@writeme.com (1999)
+  Copyright (C) 1998, Sandeep Dutta . sandeep.dutta@usa.net
+  Copyright (C) 1999, Jean-Louis VERN.jlvern@writeme.com
   Bug Fixes  -  Wojciech Stryjewski  wstryj1@tiger.lsu.edu (1999 v2.1.9a)
 
   This program is free software; you can redistribute it and/or modify it
@@ -18,15 +18,12 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-  In other words, you are welcome to use, share and improve this program.
-  You are forbidden to forbid anyone else to use, share and improve
-  what you give them.   Help stamp out software-hoarding!
-
+-------------------------------------------------------------------*/
+/*
   Notes:
   000123 mlh  Moved aopLiteral to SDCCglue.c to help the split
-      Made everything static
--------------------------------------------------------------------------*/
+              Made everything static
+*/
 
 #define D(x) do if (options.verboseAsm) {x;} while(0)
 
@@ -34,11 +31,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include "SDCCglobl.h"
-#include "newalloc.h"
 
 #include "common.h"
-#include "SDCCpeeph.h"
 #include "ralloc.h"
 #include "rtrack.h"
 #include "gen.h"
@@ -46,7 +40,7 @@
 
 char *aopLiteral (value * val, int offset);
 char *aopLiteralLong (value * val, int offset, int size);
-char *aopLiteralGptr (const char * name, value * val);
+char *aopLiteralGptr (const char *name, value * val);
 extern int allocInfo;
 
 /* this is the down and dirty file with all kinds of
@@ -101,16 +95,14 @@
   {
     struct
     {
-      short r0InB:2;            //2 so we can see it overflow
-      short r1InB:2;            //2 so we can see it overflow
-      short OpInB:2;            //2 so we can see it overflow
-      short bitsInB:2;          //2 so we can see it overflow
+      short r0InB: 2;           //2 so we can see it overflow
+      short r1InB: 2;           //2 so we can see it overflow
+      short OpInB: 2;           //2 so we can see it overflow
+      short bitsInB: 2;         //2 so we can see it overflow
     } bs;
     short BInUse;
   } bu;
   short accInUse;
-  short inLine;
-  short debugLine;
   struct
   {
     int pushed;
@@ -122,12 +114,12 @@
     int xoffset;
   } stack;
   set *sendSet;
-  iCode *current_iCode;
   symbol *currentFunc;
 }
 _G;
 
-static char *rb1regs[] = {
+static char *rb1regs[] =
+{
   "b1_0", "b1_1", "b1_2", "b1_3", "b1_4", "b1_5", "b1_6", "b1_7",
   "b0", "b1", "b2", "b3", "b4", "b5", "b6", "b7"
 };
@@ -144,16 +136,13 @@
 #define CLRC     emitcode ("clr","c")
 #define SETC     emitcode ("setb","c")
 
-static lineNode *lineHead = NULL;
-static lineNode *lineCurr = NULL;
-
 static unsigned char SLMask[] = { 0xFF, 0xFE, 0xFC, 0xF8, 0xF0,
-  0xE0, 0xC0, 0x80, 0x00
-};
+                                  0xE0, 0xC0, 0x80, 0x00
+                                };
 
 static unsigned char SRMask[] = { 0xFF, 0x7F, 0x3F, 0x1F, 0x0F,
-  0x07, 0x03, 0x01, 0x00
-};
+                                  0x07, 0x03, 0x01, 0x00
+                                };
 
 #define LSB     0
 #define MSB16   1
@@ -161,75 +150,15 @@
 #define MSB32   3
 
 /*-----------------------------------------------------------------*/
-/* emitcode - writes the code into a file : for now it is simple   */
-/*-----------------------------------------------------------------*/
-void
-emitcode (const char *inst, const char *fmt, ...)
-{
-  va_list ap;
-  struct dbuf_s dbuf;
-  const char *lbp, *lb;
-
-  dbuf_init (&dbuf, INITIAL_INLINEASM);
-
-  va_start (ap, fmt);
-
-  if (inst && *inst)
-    {
-      dbuf_append_str (&dbuf, inst);
-
-      if (fmt && *fmt)
-        {
-          dbuf_append_char (&dbuf, '\t');
-          dbuf_tvprintf (&dbuf, fmt, ap);
-        }
-    }
-  else
-    {
-      dbuf_tvprintf (&dbuf, fmt, ap);
-    }
-
-  lbp = lb = dbuf_c_str (&dbuf);
-
-  while (isspace ((unsigned char) *lbp))
-    {
-      lbp++;
-    }
-
-  if (lbp)
-    {
-      rtrackUpdate (lbp);
-
-      lineCurr = (lineCurr ? connectLine (lineCurr, newLineNode (lb)) : (lineHead = newLineNode (lb)));
-
-      lineCurr->isInline = _G.inLine;
-      lineCurr->isDebug = _G.debugLine;
-      lineCurr->ic = _G.current_iCode;
-      lineCurr->isComment = (*lbp == ';');
-    }
-
-  va_end (ap);
-
-  dbuf_destroy (&dbuf);
-}
-
-static void
-emitLabel (symbol * tlbl)
-{
-  emitcode ("", "!tlabeldef", tlbl->key + 100);
-  lineCurr->isLabel = 1;
-}
-
-/*-----------------------------------------------------------------*/
 /* mcs51_emitDebuggerSymbol - associate the current code location  */
 /*   with a debugger symbol                                        */
 /*-----------------------------------------------------------------*/
 void
 mcs51_emitDebuggerSymbol (const char *debugSym)
 {
-  _G.debugLine = 1;
+  genLine.lineElement.isDebug = 1;
   emitcode ("", "%s ==.", debugSym);
-  _G.debugLine = 0;
+  genLine.lineElement.isDebug = 0;
 }
 
 /*-----------------------------------------------------------------*/
@@ -280,7 +209,7 @@
 /* emitpush - push something on internal stack                     */
 /*-----------------------------------------------------------------*/
 static void
-emitpush (const char * arg)
+emitpush (const char *arg)
 {
   char buf[] = "ar?";
 
@@ -300,7 +229,7 @@
       arg = "acc";
     }
   else if (EQ (arg, "r0") || EQ (arg, "r1") || EQ (arg, "r2") || EQ (arg, "r3") ||
-           EQ (arg, "r4") || EQ (arg, "r5") || EQ (arg, "r6") || EQ (arg, "r7") )
+           EQ (arg, "r4") || EQ (arg, "r5") || EQ (arg, "r6") || EQ (arg, "r7"))
     {
       buf[2] = arg[1];
       arg = buf;
@@ -312,7 +241,7 @@
 /* emitpop - pop something from internal stack                     */
 /*-----------------------------------------------------------------*/
 static void
-emitpop (const char * arg)
+emitpop (const char *arg)
 {
   if (!arg)
     emitcode ("dec", "sp");
@@ -520,7 +449,7 @@
   int offset;
 
   if (!ic)
-    ic = _G.current_iCode;
+    ic = genLine.lineElement.ic;
   if (!ic)
     return 0;
   if (!_G.currentFunc)
@@ -686,7 +615,7 @@
     }
   base = dbuf_detach_c_str (&tmpBuf);
 
-  offset += stackoffset(sym);
+  offset += stackoffset (sym);
 
   if ((abs (offset) < 3) || (accuse && (abs (offset) < 4)))
     {
@@ -814,12 +743,12 @@
 static asmop *
 aopForRemat (symbol * sym)
 {
-  iCode * ic = sym->rematiCode;
-  asmop * aop = newAsmop (AOP_IMMD);
+  iCode *ic = sym->rematiCode;
+  asmop *aop = newAsmop (AOP_IMMD);
   int ptr_type = 0;
   int val = 0;
-  sym_link * from_type = NULL;
-  const char * from_name = NULL;
+  sym_link *from_type = NULL;
+  const char *from_name = NULL;
   struct dbuf_s dbuf;
 
   for (;;)
@@ -1191,41 +1120,41 @@
       break;
 
     case AOP_STK:
-      {
-        int sz = aop->size;
-        symbol *sym = aop->aopu.aop_sym;
-        bitVectUnSetBit (ic->rUsed, R0_IDX);
-        bitVectUnSetBit (ic->rUsed, R1_IDX);
+    {
+      int sz = aop->size;
+      symbol *sym = aop->aopu.aop_sym;
+      bitVectUnSetBit (ic->rUsed, R0_IDX);
+      bitVectUnSetBit (ic->rUsed, R1_IDX);
 
-        getFreePtr (ic, aop, FALSE);
+      getFreePtr (ic, aop, FALSE);
 
-        aopPtrForSym (sym, FALSE, aop->size - 1, aop);
+      aopPtrForSym (sym, FALSE, aop->size - 1, aop);
 
-        while (sz--)
-          {
-            emitpop ("acc");
-            if (aop->paged)
-              emitcode ("movx", "@%s,a", aop->aopu.aop_ptr->name);
-            else
-              emitcode ("mov", "@%s,a", aop->aopu.aop_ptr->name);
-            if (!sz)
-              break;
-            emitcode ("dec", "%s", aop->aopu.aop_ptr->name);
-          }
-        op->aop = aop;
-        freeAsmop (op, NULL, ic, TRUE);
-        if (_G.r1Pushed)
-          {
-            emitpop ("ar1");
-            _G.r1Pushed--;
-          }
-        if (_G.r0Pushed)
-          {
-            emitpop ("ar0");
-            _G.r0Pushed--;
-          }
-      }
-      break;
+      while (sz--)
+        {
+          emitpop ("acc");
+          if (aop->paged)
+            emitcode ("movx", "@%s,a", aop->aopu.aop_ptr->name);
+          else
+            emitcode ("mov", "@%s,a", aop->aopu.aop_ptr->name);
+          if (!sz)
+            break;
+          emitcode ("dec", "%s", aop->aopu.aop_ptr->name);
+        }
+      op->aop = aop;
+      freeAsmop (op, NULL, ic, TRUE);
+      if (_G.r1Pushed)
+        {
+          emitpop ("ar1");
+          _G.r1Pushed--;
+        }
+      if (_G.r0Pushed)
+        {
+          emitpop ("ar0");
+          _G.r0Pushed--;
+        }
+    }
+    break;
     }
 
 dealloc:
@@ -1272,7 +1201,7 @@
         }
       else if (_G.r0Pushed)
         {
-          emitcode ("pop", "ar0"); /* without pushed-- */
+          emitcode ("pop", "ar0");      /* without pushed-- */
         }
       break;
 
@@ -1283,30 +1212,30 @@
         }
       else if (_G.r1Pushed)
         {
-          emitcode ("pop", "ar1"); /* without pushed-- */
+          emitcode ("pop", "ar1");      /* without pushed-- */
         }
       break;
 
     case AOP_STK:
-      {
-        int sz = aop->size;
+    {
+      int sz = aop->size;
 
-        emitcode ("mov", "b,r0");
-        aopPtrForSym (aop->aopu.aop_sym, FALSE, 0, aop);
+      emitcode ("mov", "b,r0");
+      aopPtrForSym (aop->aopu.aop_sym, FALSE, 0, aop);
 
-        while (sz--)
-          {
-            emitcode ("pop", "acc"); /* without pushed-- */
-            if (aop->paged)
-              emitcode ("movx", "@r0,a");
-            else
-              emitcode ("mov", "@r0,a");
-            if (!sz)
-              break;
-            emitcode ("dec", "r0");
-          }
-        emitcode ("mov", "r0,b");
-      }
+      while (sz--)
+        {
+          emitcode ("pop", "acc");    /* without pushed-- */
+          if (aop->paged)
+            emitcode ("movx", "@r0,a");
+          else
+            emitcode ("mov", "@r0,a");
+          if (!sz)
+            break;
+          emitcode ("dec", "r0");
+        }
+      emitcode ("mov", "r0,b");
+    }
     }
 }
 
@@ -1416,7 +1345,7 @@
   asmop *aop = AOP (oper);
   static struct dbuf_s dbuf = { 0 };
 
-  if (dbuf_is_initialized(&dbuf))
+  if (dbuf_is_initialized (&dbuf))
     {
       /* reuse the dynamically allocated buffer */
       dbuf_set_length (&dbuf, 0);
@@ -1523,9 +1452,9 @@
           break;
 
         case AOP_DIR:
-          if (SPEC_SCLS (getSpec (operandType (oper))) == S_SFR && offset)
+          if ((SPEC_SCLS (getSpec (operandType (oper))) == S_SFR) && (aop->size > 1))
             {
-              dbuf_printf (&dbuf, "(%s >> %d)", aop->aopu.aop_dir, offset * 8);
+              dbuf_printf (&dbuf, "((%s >> %d) & 0xFF)", aop->aopu.aop_dir, offset * 8);
             }
           else if (offset)
             {
@@ -1554,7 +1483,7 @@
           break;
 
         case AOP_LIT:
-          if (opIsGptr(oper) && IS_FUNCPTR (operandType(oper)) && offset == GPTRSIZE-1)
+          if (opIsGptr (oper) && IS_FUNCPTR (operandType (oper)) && offset == GPTRSIZE - 1)
             {
               dbuf_append_str (&dbuf, aopLiteralGptr (NULL, aop->aopu.aop_lit));
             }
@@ -1637,7 +1566,7 @@
   const char *d = NULL;
   static struct dbuf_s dbuf = { 0 };
 
-  if (dbuf_is_initialized(&dbuf))
+  if (dbuf_is_initialized (&dbuf))
     {
       /* reuse the dynamically allocated buffer */
       dbuf_set_length (&dbuf, 0);
@@ -1664,29 +1593,27 @@
       break;
 
     case AOP_DIR:
-      {
-        if (SPEC_SCLS (getSpec (operandType (result))) == S_SFR && offset)
-          {
-            dbuf_printf (&dbuf, "(%s >> %d)", aop->aopu.aop_dir, offset * 8);
-          }
-        else if (offset)
-          {
-            dbuf_printf (&dbuf, "(%s + %d)", aop->aopu.aop_dir, offset);
-          }
-        else
-          {
-            dbuf_append_str (&dbuf, aop->aopu.aop_dir);
-          }
+      if ((SPEC_SCLS (getSpec (operandType (result))) == S_SFR) && (aop->size > 1))
+        {
+          dbuf_printf (&dbuf, "((%s >> %d) & 0xFF)", aop->aopu.aop_dir, offset * 8);
+        }
+      else if (offset)
+        {
+          dbuf_printf (&dbuf, "(%s + %d)", aop->aopu.aop_dir, offset);
+        }
+      else
+        {
+          dbuf_append_str (&dbuf, aop->aopu.aop_dir);
+        }
 
-        if (!EQ (dbuf_c_str (&dbuf), s) || bvolatile)
-          {
-            emitcode ("mov", "%s,%s", dbuf_c_str (&dbuf), s);
-          }
-        if (EQ (dbuf_c_str (&dbuf), "acc"))
-          {
-            accuse = TRUE;
-          }
-      }
+      if (!EQ (dbuf_c_str (&dbuf), s) || bvolatile)
+        {
+          emitcode ("mov", "%s,%s", dbuf_c_str (&dbuf), s);
+        }
+      if (EQ (dbuf_c_str (&dbuf), "acc"))
+        {
+          accuse = TRUE;
+        }
       break;
 
     case AOP_REG:
@@ -1694,7 +1621,7 @@
         {
           if (*s == '@' ||
               EQ (s, "r0") || EQ (s, "r1") || EQ (s, "r2") || EQ (s, "r3") ||
-              EQ (s, "r4") || EQ (s, "r5") || EQ (s, "r6") || EQ (s, "r7") )
+              EQ (s, "r4") || EQ (s, "r5") || EQ (s, "r6") || EQ (s, "r7"))
             {
               emitcode ("mov", "%s,%s", aop->aopu.aop_reg[offset]->dname, s);
             }
@@ -1757,7 +1684,7 @@
           emitcode ("mov", "@%s,a", aop->aopu.aop_ptr->name);
         }
       else if (EQ (s, "r0") || EQ (s, "r1") || EQ (s, "r2") || EQ (s, "r3") ||
-               EQ (s, "r4") || EQ (s, "r5") || EQ (s, "r6") || EQ (s, "r7") )
+               EQ (s, "r4") || EQ (s, "r5") || EQ (s, "r6") || EQ (s, "r7"))
         {
           dbuf_printf (&dbuf, "a%s", s);
           emitcode ("mov", "@%s,%s", aop->aopu.aop_ptr->name, dbuf_c_str (&dbuf));
@@ -2028,7 +1955,7 @@
         }
       MOVA (aopGet (oper, offset++, FALSE, FALSE));
       if (IS_FLOAT (type))
-        emitcode ("anl", "a,#0x7F");  //clear sign bit
+        emitcode ("anl", "a,#0x7F");    //clear sign bit
       emitcode ("orl", "a,b");
       popB (pushedB);
     }
@@ -2089,7 +2016,7 @@
   else
     {
       toCarry (right);
-      aopPut (result, "c", 0);
+      outBitC (result);
     }
 }
 
@@ -2153,7 +2080,7 @@
 
   /* set C, if a == 0 */
   tlbl = newiTempLabel (NULL);
-  emitcode ("cjne", "a,#0x01,!tlabel", tlbl->key + 100);
+  emitcode ("cjne", "a,#0x01,!tlabel", labelKey2num (tlbl->key));
   emitLabel (tlbl);
   outBitC (IC_RESULT (ic));
 
@@ -2200,12 +2127,12 @@
       if ((AOP_TYPE (IC_LEFT (ic)) == AOP_ACC && offset == 0) ||
           AOP_TYPE (IC_LEFT (ic)) == AOP_REG || IS_AOP_PREG (IC_LEFT (ic)))
         {
-          emitcode ("cjne", "%s,#0xFF,!tlabel", l, tlbl->key + 100);
+          emitcode ("cjne", "%s,#0xFF,!tlabel", l, labelKey2num (tlbl->key));
         }
       else
         {
           MOVA (l);
-          emitcode ("cjne", "a,#0xFF,!tlabel", tlbl->key + 100);
+          emitcode ("cjne", "a,#0xFF,!tlabel", labelKey2num (tlbl->key));
         }
       emitLabel (tlbl);
       outBitC (IC_RESULT (ic));
@@ -2451,7 +2378,7 @@
                 emitcode ("lcall", "___sdcc_xpush_regs_r0\t;(%s)", szRegs);
               else
                 emitcode ("lcall", "___sdcc_xpush_regs\t;(%s)", szRegs);
-              lineCurr->isInline = 1;
+              genLine.lineCurr->isInline = 1;
               if (BINUSE)
                 emitpop ("b");
               _G.stack.xpushed += count;
@@ -2563,7 +2490,7 @@
                 emitcode ("lcall", "___sdcc_xpop_regs_r0\t;(%s)", szRegs);
               else
                 emitcode ("lcall", "___sdcc_xpop_regs\t;(%s)", szRegs);
-              lineCurr->isInline = 1;
+              genLine.lineCurr->isInline = 1;
               _G.stack.xpushed -= count;
             }
           else
@@ -2827,7 +2754,7 @@
 
   aopOp (IC_LEFT (ic), ic, FALSE);
   size = AOP_SIZE (IC_LEFT (ic));
-  offset = (size - 1);
+  offset = size - 1;
   while (size--)
     {
       emitpop (aopGet (IC_LEFT (ic), offset--, FALSE, TRUE));
@@ -3127,7 +3054,8 @@
   if (_G.sendSet)
     {
       if (IFFUNC_ISREENT (dtype))
-        {                       /* need to reverse the send set */
+        {
+          /* need to reverse the send set */
           genSend (reverseSet (_G.sendSet));
         }
       else
@@ -3200,13 +3128,11 @@
     }
 
   /* if we need assign a result value */
-  if ((IS_ITEMP (IC_RESULT (ic))               &&
+  if ((IS_ITEMP (IC_RESULT (ic)) &&
        !IS_BIT (OP_SYM_ETYPE (IC_RESULT (ic))) &&
-       (OP_SYMBOL (IC_RESULT (ic))->nRegs   ||
-        OP_SYMBOL (IC_RESULT (ic))->accuse  ||
-        OP_SYMBOL (IC_RESULT (ic))->spildir ||
-        IS_BIT (etype)                        )   ) ||
-      IS_TRUE_SYMOP (IC_RESULT (ic)))
+       (OP_SYMBOL (IC_RESULT (ic))->nRegs ||
+        OP_SYMBOL (IC_RESULT (ic))->accuse ||
+        OP_SYMBOL (IC_RESULT (ic))->spildir || IS_BIT (etype))) || IS_TRUE_SYMOP (IC_RESULT (ic)))
     {
       _G.accInUse++;
       aopOp (IC_RESULT (ic), ic, FALSE);
@@ -3408,9 +3334,9 @@
       else if (_G.sendSet)
         {
           /* push the return address on to the stack */
-          emitcode ("mov", "a,#!tlabel", (rlbl->key + 100));
+          emitcode ("mov", "a,#!tlabel", labelKey2num (rlbl->key));
           emitpush ("acc");
-          emitcode ("mov", "a,#(!tlabel >> 8)", (rlbl->key + 100));
+          emitcode ("mov", "a,#(!tlabel >> 8)", labelKey2num (rlbl->key));
           emitpush ("acc");
 
           /* now push the function address */
@@ -3593,7 +3519,7 @@
   emitcode (";", "-----------------------------------------");
 
   emitcode ("", "%s:", sym->rname);
-  lineCurr->isLabel = 1;
+  genLine.lineCurr->isLabel = 1;
   ftype = operandType (IC_LEFT (ic));
   _G.currentFunc = sym;
 
@@ -3873,14 +3799,14 @@
         {
           int ofs;
 
-          _G.current_iCode = ric;
+          genLine.lineElement.ic = ric;
           D (emitcode (";", "genReceive"));
           for (ofs = 0; ofs < sym->recvSize; ofs++)
             {
               if (EQ (fReturn[ofs], "a"))
-                emitcode ("push", "acc"); /* without pushed++ */
+                emitcode ("push", "acc");       /* without pushed++ */
               else
-                emitcode ("push", fReturn[ofs]); /* without pushed++ */
+                emitcode ("push", fReturn[ofs]);        /* without pushed++ */
             }
           stackAdjust -= sym->recvSize;
           if (stackAdjust < 0)
@@ -3888,7 +3814,7 @@
               assert (stackAdjust >= 0);
               stackAdjust = 0;
             }
-          _G.current_iCode = ic;
+          genLine.lineElement.ic = ic;
           ric->generated = 1;
           accIsFree = 1;
         }
@@ -3898,13 +3824,13 @@
         {
           int ofs;
 
-          _G.current_iCode = ric;
+          genLine.lineElement.ic = ric;
           D (emitcode (";", "genReceive"));
           for (ofs = 0; ofs < sym->recvSize; ofs++)
             {
               emitcode ("mov", "%s,%s", rsym->regs[ofs]->name, fReturn[ofs]);
             }
-          _G.current_iCode = ic;
+          genLine.lineElement.ic = ic;
           ric->generated = 1;
           accIsFree = 1;
         }
@@ -4009,10 +3935,10 @@
     {
       symbol *tlbl = newiTempLabel (NULL);
       emitcode ("setb", "c");
-      emitcode ("jbc", "ea,!tlabel", tlbl->key + 100);  /* atomic test & clear */
+      emitcode ("jbc", "ea,!tlabel", labelKey2num (tlbl->key)); /* atomic test & clear */
       emitcode ("clr", "c");
       emitLabel (tlbl);
-      emitpush ("psw"); /* save old ea via c in psw */
+      emitpush ("psw");         /* save old ea via c in psw */
     }
 }
 
@@ -4024,7 +3950,7 @@
 {
   symbol *sym = OP_SYMBOL (IC_LEFT (ic));
   bool fReentrant = (IFFUNC_ISREENT (sym->type) || options.stackAuto);
-  lineNode *lineBodyEnd = lineCurr;
+  lineNode *lineBodyEnd = genLine.lineCurr;
   lineNode *linePrologueStart = NULL;
   lineNode *lnp;
   bitVect *regsUsed;
@@ -4045,13 +3971,13 @@
       if (IS_BIT (OP_SYM_ETYPE (IC_LEFT (ic))))
         {
           emitcode ("rlc", "a");        /* save c in a */
-          emitpop ("psw");              /* restore ea via c in psw */
+          emitpop ("psw");      /* restore ea via c in psw */
           emitcode ("mov", "ea,c");
           emitcode ("rrc", "a");        /* restore c from a */
         }
       else
         {
-          emitpop ("psw");              /* restore ea via c in psw */
+          emitpop ("psw");      /* restore ea via c in psw */
           emitcode ("mov", "ea,c");
         }
     }
@@ -4116,10 +4042,10 @@
             }
 
           if (acc_in_r0)
-            emitcode ("xch", "a,r0");           /* restore a from r0 */
+            emitcode ("xch", "a,r0");   /* restore a from r0 */
 
           if (cy_in_r0)
-            emitcode ("mov", "psw,r0");         /* restore c from r0 */
+            emitcode ("mov", "psw,r0"); /* restore c from r0 */
         }
       else
         {
@@ -4131,7 +4057,7 @@
                     emitcode ("dec", "sp");
                   else
                     emitcode ("mov", "sp,_bp");
-                  emitcode ("pop", "_bp"); /* without pushed-- */
+                  emitcode ("pop", "_bp");      /* without pushed-- */
                 }
               if (sym->xstack || FUNC_HASSTACKPARM (sym->type))
                 {
@@ -4140,7 +4066,7 @@
                   emitcode ("dec", "r0");
                   emitcode ("movx", "a,@r0");
                   emitcode ("xch", "a,_bpx");
-                  emitcode ("mov", "%s,r0", spname);        //read before freeing stack space (interrupts)
+                  emitcode ("mov", "%s,r0", spname);    //read before freeing stack space (interrupts)
                 }
             }
           else if (sym->stack || FUNC_HASSTACKPARM (sym->type))
@@ -4149,7 +4075,7 @@
                 emitcode ("dec", "sp");
               else if (sym->stack)
                 emitcode ("mov", "sp,_bp");
-              emitcode ("pop", "_bp"); /* without pushed-- */
+              emitcode ("pop", "_bp");  /* without pushed-- */
             }
         }
     }
@@ -4323,9 +4249,8 @@
     {
       /* Remove change of register bank if no registers used */
       if (lnp->ic && lnp->ic->op == FUNCTION &&
-          !strncmp(lnp->line, "mov", 3) &&
-          bitVectFirstBit (port->peep.getRegsWritten(lnp)) == CND_IDX &&
-          !bitVectBitsInCommon (mcs51_allBankregs (), regsUsed))
+          !strncmp (lnp->line, "mov", 3) &&
+          bitVectFirstBit (port->peep.getRegsWritten (lnp)) == CND_IDX && !bitVectBitsInCommon (mcs51_allBankregs (), regsUsed))
         {
           emitcode (";", "eliminated unneeded mov psw,# (no regs used in bank)");
           connectLine (lnp->prev, lnp->next);
@@ -4357,7 +4282,7 @@
 
   /* Remove the unneeded push/pops */
   regsUnneeded = newBitVect (mcs51_nRegs);
-  for (lnp = lineCurr; lnp != linePrologueStart; lnp = lnp->prev)
+  for (lnp = genLine.lineCurr; lnp != linePrologueStart; lnp = lnp->prev)
     {
       if (lnp->ic)
         {
@@ -4449,7 +4374,7 @@
      if the next is not the return statement */
   if (!(ic->next && ic->next->op == LABEL && IC_LABEL (ic->next) == returnLabel))
     {
-      emitcode ("ljmp", "!tlabel", (returnLabel->key + 100));
+      emitcode ("ljmp", "!tlabel", labelKey2num (returnLabel->key));
     }
 }
 
@@ -4472,7 +4397,7 @@
 static void
 genGoto (iCode * ic)
 {
-  emitcode ("ljmp", "!tlabel", (IC_LABEL (ic)->key + 100));
+  emitcode ("ljmp", "!tlabel", labelKey2num (IC_LABEL (ic)->key));
 }
 
 /*-----------------------------------------------------------------*/
@@ -4509,12 +4434,12 @@
       emitcode ("inc", "%s", l);
       if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || IS_AOP_PREG (IC_RESULT (ic)))
         {
-          emitcode ("cjne", "%s,%s,!tlabel", l, zero, tlbl->key + 100);
+          emitcode ("cjne", "%s,%s,!tlabel", l, zero, labelKey2num (tlbl->key));
         }
       else
         {
           emitcode ("clr", "a");
-          emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100);
+          emitcode ("cjne", "a,%s,!tlabel", l, labelKey2num (tlbl->key));
         }
 
       l = aopGet (IC_RESULT (ic), MSB16, FALSE, FALSE);
@@ -4523,15 +4448,15 @@
         {
           if (EQ (l, "acc"))
             {
-              emitcode ("jnz", "!tlabel", tlbl->key + 100);
+              emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
             }
           else if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || IS_AOP_PREG (IC_RESULT (ic)))
             {
-              emitcode ("cjne", "%s,%s,!tlabel", l, zero, tlbl->key + 100);
+              emitcode ("cjne", "%s,%s,!tlabel", l, zero, labelKey2num (tlbl->key));
             }
           else
             {
-              emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100);
+              emitcode ("cjne", "a,%s,!tlabel", l, labelKey2num (tlbl->key));
             }
 
           l = aopGet (IC_RESULT (ic), MSB24, FALSE, FALSE);
@@ -4541,15 +4466,15 @@
         {
           if (EQ (l, "acc"))
             {
-              emitcode ("jnz", "!tlabel", tlbl->key + 100);
+              emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
             }
           else if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || IS_AOP_PREG (IC_RESULT (ic)))
             {
-              emitcode ("cjne", "%s,%s,!tlabel", l, zero, tlbl->key + 100);
+              emitcode ("cjne", "%s,%s,!tlabel", l, zero, labelKey2num (tlbl->key));
             }
           else
             {
-              emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100);
+              emitcode ("cjne", "a,%s,!tlabel", l, labelKey2num (tlbl->key));
             }
 
           emitcode ("inc", "%s", aopGet (IC_RESULT (ic), MSB32, FALSE, FALSE));
@@ -4636,7 +4561,7 @@
     }
   else
     {
-      emitcode ("jz", "!tlabel", tlbl->key + 100);
+      emitcode ("jz", "!tlabel", labelKey2num (tlbl->key));
       emitcode ("mov", "a,%s", one);
       emitLabel (tlbl);
       outAcc (result);
@@ -4655,7 +4580,7 @@
   if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY)
     {
       symbol *lbl = newiTempLabel (NULL);
-      emitcode ("jnb", "%s,!tlabel", AOP (IC_RIGHT (ic))->aopu.aop_dir, (lbl->key + 100));
+      emitcode ("jnb", "%s,!tlabel", AOP (IC_RIGHT (ic))->aopu.aop_dir, labelKey2num (lbl->key));
       emitcode ("cpl", "c");
       emitLabel (lbl);
       outBitC (IC_RESULT (ic));
@@ -4908,12 +4833,12 @@
 
       if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || IS_AOP_PREG (IC_RESULT (ic)))
         {
-          emitcode ("cjne", "%s,#!constbyte,!tlabel", l, 0xff, tlbl->key + 100);
+          emitcode ("cjne", "%s,#!constbyte,!tlabel", l, 0xff, labelKey2num (tlbl->key));
         }
       else
         {
           emitcode ("mov", "a,#!constbyte", 0xff);
-          emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100);
+          emitcode ("cjne", "a,%s,!tlabel", l, labelKey2num (tlbl->key));
         }
       l = aopGet (IC_RESULT (ic), MSB16, FALSE, FALSE);
       emitcode ("dec", "%s", l);
@@ -4921,16 +4846,15 @@
         {
           if (EQ (l, "acc"))
             {
-              emitcode ("jnz", "!tlabel", tlbl->key + 100);
+              emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
             }
-          else if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG ||
-                   IS_AOP_PREG (IC_RESULT (ic)))
+          else if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || IS_AOP_PREG (IC_RESULT (ic)))
             {
-              emitcode ("cjne", "%s,#!constbyte,!tlabel", l, 0xff, tlbl->key + 100);
+              emitcode ("cjne", "%s,#!constbyte,!tlabel", l, 0xff, labelKey2num (tlbl->key));
             }
           else
             {
-              emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100);
+              emitcode ("cjne", "a,%s,!tlabel", l, labelKey2num (tlbl->key));
             }
           l = aopGet (IC_RESULT (ic), MSB24, FALSE, FALSE);
           emitcode ("dec", "%s", l);
@@ -4939,16 +4863,15 @@
         {
           if (EQ (l, "acc"))
             {
-              emitcode ("jnz", "!tlabel", tlbl->key + 100);
+              emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
             }
-          else if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG ||
-                   IS_AOP_PREG (IC_RESULT (ic)))
+          else if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG || IS_AOP_PREG (IC_RESULT (ic)))
             {
-              emitcode ("cjne", "%s,#!constbyte,!tlabel", l, 0xff, tlbl->key + 100);
+              emitcode ("cjne", "%s,#!constbyte,!tlabel", l, 0xff, labelKey2num (tlbl->key));
             }
           else
             {
-              emitcode ("cjne", "a,%s,!tlabel", l, tlbl->key + 100);
+              emitcode ("cjne", "a,%s,!tlabel", l, labelKey2num (tlbl->key));
             }
           emitcode ("dec", "%s", aopGet (IC_RESULT (ic), MSB32, FALSE, FALSE));
         }
@@ -5040,7 +4963,7 @@
   if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY)
     {
       emitcode ("mov", "c,%s", AOP (IC_LEFT (ic))->aopu.aop_dir);
-      emitcode ("jnb", "%s,!tlabel", AOP (IC_RIGHT (ic))->aopu.aop_dir, (lbl->key + 100));
+      emitcode ("jnb", "%s,!tlabel", AOP (IC_RIGHT (ic))->aopu.aop_dir, labelKey2num (lbl->key));
       emitcode ("cpl", "c");
       emitLabel (lbl);
       outBitC (IC_RESULT (ic));
@@ -5049,7 +4972,7 @@
     {
       emitcode ("mov", "c,%s", AOP (IC_RIGHT (ic))->aopu.aop_dir);
       emitcode ("subb", "a,acc");
-      emitcode ("jnb", "%s,!tlabel", AOP (IC_LEFT (ic))->aopu.aop_dir, (lbl->key + 100));
+      emitcode ("jnb", "%s,!tlabel", AOP (IC_LEFT (ic))->aopu.aop_dir, labelKey2num (lbl->key));
       emitcode ("inc", "a");
       emitLabel (lbl);
       aopPut (IC_RESULT (ic), "a", 0);
@@ -5100,7 +5023,7 @@
           if (useCarry || ((lit >> (offset * 8)) & 0x0FFL))
             {
               MOVA (aopGet (IC_LEFT (ic), offset, FALSE, FALSE));
-              if (!offset && !size && lit == (unsigned long) -1)
+              if (!offset && !size && lit == (unsigned long) - 1)
                 {
                   emitcode ("dec", "a");
                 }
@@ -5338,7 +5261,7 @@
         {
           MOVA (aopGet (right, 0, FALSE, FALSE));
           lbl = newiTempLabel (NULL);
-          emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100);
+          emitcode ("jnb", "acc.7,!tlabel", labelKey2num (lbl->key));
           emitcode ("cpl", "F0");       /* complement sign flag */
           emitcode ("cpl", "a");        /* 2's complement */
           emitcode ("inc", "a");
@@ -5363,7 +5286,7 @@
       if (!lUnsigned)
         {
           lbl = newiTempLabel (NULL);
-          emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100);
+          emitcode ("jnb", "acc.7,!tlabel", labelKey2num (lbl->key));
           emitcode ("cpl", "F0");       /* complement sign flag */
           emitcode ("cpl", "a");        /* 2's complement */
           emitcode ("inc", "a");
@@ -5377,7 +5300,7 @@
     {
       lbl = newiTempLabel (NULL);
       if (runtimeSign)
-        emitcode ("jnb", "F0,!tlabel", lbl->key + 100);
+        emitcode ("jnb", "F0,!tlabel", labelKey2num (lbl->key));
       emitcode ("cpl", "a");    /* lsb 2's complement */
       if (size != 2)
         emitcode ("inc", "a");  /* inc doesn't set carry flag */
@@ -5597,7 +5520,7 @@
         {
           MOVA (aopGet (right, 0, FALSE, FALSE));
           lbl = newiTempLabel (NULL);
-          emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100);
+          emitcode ("jnb", "acc.7,!tlabel", labelKey2num (lbl->key));
           emitcode ("cpl", "F0");       /* complement sign flag */
           emitcode ("cpl", "a");        /* 2's complement */
           emitcode ("inc", "a");
@@ -5622,7 +5545,7 @@
       if (!lUnsigned)
         {
           lbl = newiTempLabel (NULL);
-          emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100);
+          emitcode ("jnb", "acc.7,!tlabel", labelKey2num (lbl->key));
           emitcode ("cpl", "F0");       /* complement sign flag */
           emitcode ("cpl", "a");        /* 2's complement */
           emitcode ("inc", "a");
@@ -5637,7 +5560,7 @@
     {
       lbl = newiTempLabel (NULL);
       if (runtimeSign)
-        emitcode ("jnb", "F0,!tlabel", lbl->key + 100);
+        emitcode ("jnb", "F0,!tlabel", labelKey2num (lbl->key));
       emitcode ("cpl", "a");    /* lsb 2's complement */
       emitcode ("inc", "a");
       emitLabel (lbl);
@@ -5792,8 +5715,8 @@
           emitcode ("mov", "c,acc.7");
           emitcode ("anl", "a,#0x%02x", val - 1);
           lbl = newiTempLabel (NULL);
-          emitcode ("jz", "!tlabel", lbl->key + 100);
-          emitcode ("jnc", "!tlabel", lbl->key + 100);
+          emitcode ("jz", "!tlabel", labelKey2num (lbl->key));
+          emitcode ("jnc", "!tlabel", labelKey2num (lbl->key));
           emitcode ("orl", "a,#0x%02x", 0xff ^ (val - 1));
           if (size)
             {
@@ -5804,7 +5727,7 @@
               while (size2--)
                 aopPut (result, "#0xff", offs2++);
               lbl2 = newiTempLabel (NULL);
-              emitcode ("sjmp", "!tlabel", lbl2->key + 100);
+              emitcode ("sjmp", "!tlabel", labelKey2num (lbl2->key));
             }
           emitLabel (lbl);
           aopPut (result, "a", 0);
@@ -5860,7 +5783,7 @@
         {
           MOVA (aopGet (right, 0, FALSE, FALSE));
           lbl = newiTempLabel (NULL);
-          emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100);
+          emitcode ("jnb", "acc.7,!tlabel", labelKey2num (lbl->key));
           emitcode ("cpl", "a");        /* 2's complement */
           emitcode ("inc", "a");
           emitLabel (lbl);
@@ -5897,7 +5820,7 @@
           emitcode ("clr", "F0");       /* clear sign flag */
 
           lbl = newiTempLabel (NULL);
-          emitcode ("jnb", "acc.7,!tlabel", lbl->key + 100);
+          emitcode ("jnb", "acc.7,!tlabel", labelKey2num (lbl->key));
           emitcode ("setb", "F0");      /* set sign flag */
           emitcode ("cpl", "a");        /* 2's complement */
           emitcode ("inc", "a");
@@ -5913,7 +5836,7 @@
       emitcode ("mov", "a,b");
       lbl = newiTempLabel (NULL);
       if (runtimeSign)
-        emitcode ("jnb", "F0,!tlabel", lbl->key + 100);
+        emitcode ("jnb", "F0,!tlabel", labelKey2num (lbl->key));
       emitcode ("cpl", "a");    /* 2's complement */
       emitcode ("inc", "a");
       emitLabel (lbl);
@@ -6014,11 +5937,11 @@
       inst = ((EQ (jval, "a") ? "jnz" : (EQ (jval, "c") ? "jc" : "jb")));
     }
   if (EQ (inst, "jb") || EQ (inst, "jnb"))
-    emitcode (inst, "%s,!tlabel", jval, (tlbl->key + 100));
+    emitcode (inst, "%s,!tlabel", jval, labelKey2num (tlbl->key));
   else
-    emitcode (inst, "!tlabel", tlbl->key + 100);
+    emitcode (inst, "!tlabel", labelKey2num (tlbl->key));
   freeForBranchAsmops (result, right, left);
-  emitcode ("ljmp", "!tlabel", jlbl->key + 100);
+  emitcode ("ljmp", "!tlabel", labelKey2num (jlbl->key));
   emitLabel (tlbl);
 
   /* mark the icode as generated */
@@ -6064,12 +5987,11 @@
       size = max (AOP_SIZE (left), AOP_SIZE (right));
 
       /* if unsigned char cmp with lit, do cjne left,#right,zz */
-      if (size == 1 && !sign && AOP_TYPE (right) == AOP_LIT &&
-          AOP_TYPE (left) != AOP_DIR && AOP_TYPE (left) != AOP_STR)
+      if (size == 1 && !sign && AOP_TYPE (right) == AOP_LIT && AOP_TYPE (left) != AOP_DIR && AOP_TYPE (left) != AOP_STR)
         {
           char *l = Safe_strdup (aopGet (left, offset, FALSE, FALSE));
           symbol *lbl = newiTempLabel (NULL);
-          emitcode ("cjne", "%s,%s,!tlabel", l, aopGet (right, offset, FALSE, FALSE), lbl->key + 100);
+          emitcode ("cjne", "%s,%s,!tlabel", l, aopGet (right, offset, FALSE, FALSE), labelKey2num (lbl->key));
           Safe_free (l);
           emitLabel (lbl);
         }
@@ -6104,7 +6026,8 @@
                   goto release;
                 }
               else
-                {               //nonzero literal
+                {
+                  //nonzero literal
                   int bytelit = ((lit >> (offset * 8)) & 0x0FFL);
                   while (size && (bytelit == 0))
                     {
@@ -6265,25 +6188,19 @@
 {
   int size = max (AOP_SIZE (left), AOP_SIZE (right));
   int offset = 0;
-  unsigned long lit = 0L;
 
   D (emitcode (";", "gencjneshort"));
 
   /* if the left side is a literal or
      if the right is in a pointer register and left is not */
-  if ((AOP_TYPE (left) == AOP_LIT)  ||
-      (AOP_TYPE (left) == AOP_IMMD) ||
-      (AOP_TYPE (left) == AOP_DIR)  ||
-      (IS_AOP_PREG (right) && !IS_AOP_PREG (left)))
+  if ((AOP_TYPE (left) == AOP_LIT) ||
+      (AOP_TYPE (left) == AOP_IMMD) || (AOP_TYPE (left) == AOP_DIR) || (IS_AOP_PREG (right) && !IS_AOP_PREG (left)))
     {
       operand *t = right;
       right = left;
       left = t;
     }
 
-  if (AOP_TYPE (right) == AOP_LIT)
-    lit = ulFromVal (AOP (right)->aopu.aop_lit);
-
   /* generic pointers require special handling since all NULL pointers must compare equal */
   if (opIsGptr (left) || opIsGptr (right))
     {
@@ -6296,22 +6213,21 @@
       emitcode ("lcall", "___gptr_cmp");
       for (offset = 0; offset < GPTRSIZE; offset++)
         emitpop (NULL);
-      emitcode ("jnz", "!tlabel", lbl->key + 100);
+      emitcode ("jnz", "!tlabel", labelKey2num (lbl->key));
     }
 
   /* if the right side is a literal then anything goes */
   else if (AOP_TYPE (right) == AOP_LIT &&
-           AOP_TYPE (left) != AOP_DIR && AOP_TYPE (left) != AOP_IMMD &&
-           AOP_TYPE (left) != AOP_STR)
+           AOP_TYPE (left) != AOP_DIR && AOP_TYPE (left) != AOP_IMMD && AOP_TYPE (left) != AOP_STR)
     {
       while (size--)
         {
           char *l = Safe_strdup (aopGet (left, offset, FALSE, FALSE));
           const char *r = aopGet (right, offset, FALSE, FALSE);
-          if (EQ(l, "a") && EQ(r, zero))
-            emitcode ("jnz", "!tlabel", lbl->key + 100);
+          if (EQ (l, "a") && EQ (r, zero))
+            emitcode ("jnz", "!tlabel", labelKey2num (lbl->key));
           else
-            emitcode ("cjne", "%s,%s,!tlabel", l, r, lbl->key + 100);
+            emitcode ("cjne", "%s,%s,!tlabel", l, r, labelKey2num (lbl->key));
           Safe_free (l);
           offset++;
         }
@@ -6323,8 +6239,7 @@
            AOP_TYPE (right) == AOP_DIR ||
            AOP_TYPE (right) == AOP_LIT ||
            AOP_TYPE (right) == AOP_IMMD ||
-           (AOP_TYPE (left) == AOP_DIR && AOP_TYPE (right) == AOP_LIT) ||
-           (IS_AOP_PREG (left) && !IS_AOP_PREG (right)))
+           (AOP_TYPE (left) == AOP_DIR && AOP_TYPE (right) == AOP_LIT) || (IS_AOP_PREG (left) && !IS_AOP_PREG (right)))
     {
       while (size--)
         {
@@ -6332,9 +6247,9 @@
           MOVA (aopGet (left, offset, FALSE, FALSE));
           r = aopGet (right, offset, FALSE, TRUE);
           if (EQ (r, zero))
-            emitcode ("jnz", "!tlabel", lbl->key + 100);
+            emitcode ("jnz", "!tlabel", labelKey2num (lbl->key));
           else
-            emitcode ("cjne", "a,%s,!tlabel", r, lbl->key + 100);
+            emitcode ("cjne", "a,%s,!tlabel", r, labelKey2num (lbl->key));
           offset++;
         }
     }
@@ -6347,7 +6262,7 @@
           wassertl (!BINUSE, "B was in use");
           MOVB (aopGet (left, offset, FALSE, FALSE));
           MOVA (aopGet (right, offset, FALSE, FALSE));
-          emitcode ("cjne", "a,b,!tlabel", lbl->key + 100);
+          emitcode ("cjne", "a,b,!tlabel", labelKey2num (lbl->key));
           offset++;
         }
     }
@@ -6369,7 +6284,7 @@
     SETC;
   else
     MOVA (one);
-  emitcode ("sjmp", "!tlabel", tlbl->key + 100);
+  emitcode ("sjmp", "!tlabel", labelKey2num (tlbl->key));
   emitLabel (lbl);
   if (useCarry)
     CLRC;
@@ -6431,7 +6346,7 @@
             {
               symbol *lbl = newiTempLabel (NULL);
               emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir);
-              emitcode ("jb", "%s,!tlabel", AOP (right)->aopu.aop_dir, (lbl->key + 100));
+              emitcode ("jb", "%s,!tlabel", AOP (right)->aopu.aop_dir, labelKey2num ((lbl->key)));
               emitcode ("cpl", "c");
               emitLabel (lbl);
             }
@@ -6440,17 +6355,17 @@
           tlbl = newiTempLabel (NULL);
           if (IC_TRUE (ifx))
             {
-              emitcode ("jnc", "!tlabel", tlbl->key + 100);
+              emitcode ("jnc", "!tlabel", labelKey2num (tlbl->key));
               freeForBranchAsmops (result, right, left);
               popForBranch (popIc, FALSE);
-              emitcode ("ljmp", "!tlabel", IC_TRUE (ifx)->key + 100);
+              emitcode ("ljmp", "!tlabel", labelKey2num (IC_TRUE (ifx)->key));
             }
           else
             {
-              emitcode ("jc", "!tlabel", tlbl->key + 100);
+              emitcode ("jc", "!tlabel", labelKey2num (tlbl->key));
               freeForBranchAsmops (result, right, left);
               popForBranch (popIc, FALSE);
-              emitcode ("ljmp", "!tlabel", IC_FALSE (ifx)->key + 100);
+              emitcode ("ljmp", "!tlabel", labelKey2num (IC_FALSE (ifx)->key));
             }
           emitLabel (tlbl);
         }
@@ -6462,17 +6377,17 @@
             {
               freeForBranchAsmops (result, right, left);
               popForBranch (popIc, FALSE);
-              emitcode ("ljmp", "!tlabel", IC_TRUE (ifx)->key + 100);
+              emitcode ("ljmp", "!tlabel", labelKey2num (IC_TRUE (ifx)->key));
               emitLabel (tlbl);
             }
           else
             {
               symbol *lbl = newiTempLabel (NULL);
-              emitcode ("sjmp", "!tlabel", lbl->key + 100);
+              emitcode ("sjmp", "!tlabel", labelKey2num (lbl->key));
               emitLabel (tlbl);
               freeForBranchAsmops (result, right, left);
               popForBranch (popIc, FALSE);
-              emitcode ("ljmp", "!tlabel", IC_FALSE (ifx)->key + 100);
+              emitcode ("ljmp", "!tlabel", labelKey2num (IC_FALSE (ifx)->key));
               emitLabel (lbl);
             }
         }
@@ -6506,7 +6421,7 @@
         {
           symbol *lbl = newiTempLabel (NULL);
           emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir);
-          emitcode ("jb", "%s,!tlabel", AOP (right)->aopu.aop_dir, (lbl->key + 100));
+          emitcode ("jb", "%s,!tlabel", AOP (right)->aopu.aop_dir, labelKey2num (lbl->key));
           emitcode ("cpl", "c");
           emitLabel (lbl);
         }
@@ -6555,29 +6470,6 @@
 }
 
 /*-----------------------------------------------------------------*/
-/* ifxForOp - returns the icode containing the ifx for operand     */
-/*-----------------------------------------------------------------*/
-static iCode *
-ifxForOp (operand * op, iCode * ic)
-{
-  iCode *ifxIc;
-
-  /* if true symbol then needs to be assigned */
-  if (IS_TRUE_SYMOP (op))
-    return NULL;
-
-  /* if this has register type condition and
-     while skipping ipop's (see bug 1509084),
-     the next instruction is ifx with the same operand
-     and live to of the operand is upto the ifx only then */
-  for (ifxIc = ic->next; ifxIc && ifxIc->op == IPOP; ifxIc = ifxIc->next);
-  if (ifxIc && ifxIc->op == IFX && IC_COND (ifxIc)->key == op->key && OP_SYMBOL (op)->liveTo <= ifxIc->seq)
-    return ifxIc;
-
-  return NULL;
-}
-
-/*-----------------------------------------------------------------*/
 /* hasInc - operand is incremented before any other use            */
 /*-----------------------------------------------------------------*/
 static iCode *
@@ -6650,7 +6542,7 @@
     {
       tlbl = newiTempLabel (NULL);
       toBoolean (left);
-      emitcode ("jz", "!tlabel", tlbl->key + 100);
+      emitcode ("jz", "!tlabel", labelKey2num (tlbl->key));
       toBoolean (right);
       emitLabel (tlbl);
       outBitAcc (result);
@@ -6691,7 +6583,7 @@
     {
       tlbl = newiTempLabel (NULL);
       toBoolean (left);
-      emitcode ("jnz", "!tlabel", tlbl->key + 100);
+      emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
       toBoolean (right);
       emitLabel (tlbl);
       outBitAcc (result);
@@ -6709,13 +6601,13 @@
 isLiteralBit (unsigned long lit)
 {
   unsigned long pw[32] = { 1L, 2L, 4L, 8L, 16L, 32L, 64L, 128L,
-    0x100L, 0x200L, 0x400L, 0x800L,
-    0x1000L, 0x2000L, 0x4000L, 0x8000L,
-    0x10000L, 0x20000L, 0x40000L, 0x80000L,
-    0x100000L, 0x200000L, 0x400000L, 0x800000L,
-    0x1000000L, 0x2000000L, 0x4000000L, 0x8000000L,
-    0x10000000L, 0x20000000L, 0x40000000L, 0x80000000L
-  };
+                           0x100L, 0x200L, 0x400L, 0x800L,
+                           0x1000L, 0x2000L, 0x4000L, 0x8000L,
+                           0x10000L, 0x20000L, 0x40000L, 0x80000L,
+                           0x100000L, 0x200000L, 0x400000L, 0x800000L,
+                           0x1000000L, 0x2000000L, 0x4000000L, 0x8000000L,
+                           0x10000000L, 0x20000000L, 0x40000000L, 0x80000000L
+                         };
   int idx;
 
   for (idx = 0; idx < 32; idx++)
@@ -6733,7 +6625,7 @@
   if (IC_TRUE (ic))
     {
       popForBranch (popIc, TRUE);
-      emitcode ("ljmp", "!tlabel", IC_TRUE (ic)->key + 100);
+      emitcode ("ljmp", "!tlabel", labelKey2num (IC_TRUE (ic)->key));
     }
   ic->generated = 1;
 }
@@ -6747,7 +6639,7 @@
   if (!IC_TRUE (ic))
     {
       popForBranch (popIc, TRUE);
-      emitcode ("ljmp", "!tlabel", IC_FALSE (ic)->key + 100);
+      emitcode ("ljmp", "!tlabel", labelKey2num (IC_FALSE (ic)->key));
     }
   ic->generated = 1;
 }
@@ -6762,18 +6654,18 @@
   if (IC_TRUE (ic))
     {
       symbol *nlbl = newiTempLabel (NULL);
-      emitcode ("sjmp", "!tlabel", nlbl->key + 100);
+      emitcode ("sjmp", "!tlabel", labelKey2num (nlbl->key));
       emitLabel (tlbl);
       popForBranch (popIc, FALSE);
       freeForBranchAsmops (result, right, left);
-      emitcode ("ljmp", "!tlabel", IC_TRUE (ic)->key + 100);
+      emitcode ("ljmp", "!tlabel", labelKey2num (IC_TRUE (ic)->key));
       emitLabel (nlbl);
     }
   else
     {
       popForBranch (popIc, FALSE);
       freeForBranchAsmops (result, right, left);
-      emitcode ("ljmp", "!tlabel", IC_FALSE (ic)->key + 100);
+      emitcode ("ljmp", "!tlabel", labelKey2num (IC_FALSE (ic)->key));
       emitLabel (tlbl);
     }
   ic->generated = 1;
@@ -6957,12 +6849,12 @@
                   MOVA (aopGet (left, offset, FALSE, FALSE));
                   // byte ==  2^n ?
                   if ((posbit = isLiteralBit (bytelit)) != 0)
-                    emitcode ("jb", "acc.%d,!tlabel", (posbit - 1) & 0x07, tlbl->key + 100);
+                    emitcode ("jb", "acc.%d,!tlabel", (posbit - 1) & 0x07, labelKey2num (tlbl->key));
                   else
                     {
                       if (bytelit != 0x0FFL)
                         emitcode ("anl", "a,%s", aopGet (right, offset, FALSE, TRUE));
-                      emitcode ("jnz", "!tlabel", tlbl->key + 100);
+                      emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
                     }
                 }
               offset++;
@@ -7083,7 +6975,8 @@
               else if (AOP_TYPE (left) == AOP_ACC)
                 {
                   if (!offset)
-                    {           //B contains high byte of left
+                    {
+                      //B contains high byte of left
                       emitpush ("b");
                       emitcode ("mov", "b,a");
                       MOVA (aopGet (right, offset, FALSE, FALSE));
@@ -7113,7 +7006,7 @@
                   emitcode ("anl", "a,%s", aopGet (left, offset, FALSE, FALSE));
                 }
 
-              emitcode ("jnz", "!tlabel", tlbl->key + 100);
+              emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
               offset++;
             }
           if (size)
@@ -7170,7 +7063,8 @@
               else if (AOP_TYPE (left) == AOP_ACC)
                 {
                   if (!offset)
-                    {           //B contains high byte of left
+                    {
+                      //B contains high byte of left
                       emitpush ("b");
                       emitcode ("mov", "b,a");
                       MOVA (aopGet (right, offset, FALSE, FALSE));
@@ -7315,9 +7209,9 @@
               if ((AOP_TYPE (result) == AOP_CRY) && ifx)
                 {
                   symbol *tlbl = newiTempLabel (NULL);
-                  emitcode ("jb", "%s,!tlabel", AOP (left)->aopu.aop_dir, tlbl->key + 100);
+                  emitcode ("jb", "%s,!tlabel", AOP (left)->aopu.aop_dir, labelKey2num (tlbl->key));
                   toBoolean (right);
-                  emitcode ("jnz", "!tlabel", tlbl->key + 100);
+                  emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
                   jmpTrueOrFalse (ifx, tlbl, left, right, result, ic->next);
                   goto release;
                 }
@@ -7360,12 +7254,13 @@
           if (size)
             {
               symbol *tlbl = newiTempLabel (NULL);
-              emitcode ("jnz", "!tlabel", tlbl->key + 100);
+              emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
               CLRC;
               emitLabel (tlbl);
             }
           else
-            {                   /* FIXME, thats pretty fishy, check for ifx!=0, testcase .. */
+            {
+              /* FIXME, thats pretty fishy, check for ifx!=0, testcase .. */
               assert (ifx);
               genIfxJump (ifx, "a", left, right, result, ic->next);
               goto release;
@@ -7474,7 +7369,8 @@
               else if (AOP_TYPE (left) == AOP_ACC)
                 {
                   if (!offset)
-                    {           //B contains high byte of left
+                    {
+                      //B contains high byte of left
                       emitpush ("b");
                       emitcode ("mov", "b,a");
                       MOVA (aopGet (right, offset, FALSE, FALSE));
@@ -7504,7 +7400,7 @@
                   emitcode ("orl", "a,%s", aopGet (left, offset, FALSE, FALSE));
                 }
 
-              emitcode ("jnz", "!tlabel", tlbl->key + 100);
+              emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
               offset++;
             }
           if (size)
@@ -7541,7 +7437,8 @@
                       continue;
                     }
                   else if (AOP_TYPE (left) == AOP_ACC)
-                    {           // this should be the only use of left so A,B can be overwritten
+                    {
+                      // this should be the only use of left so A,B can be overwritten
                       char *l = Safe_strdup (aopGet (left, offset, FALSE, FALSE));
                       emitcode ("orl", "%s,%s", l, aopGet (right, offset, FALSE, FALSE));
                       aopPut (result, l, offset);
@@ -7561,7 +7458,8 @@
               else if (AOP_TYPE (left) == AOP_ACC)
                 {
                   if (!offset)
-                    {           //B contains high byte of left
+                    {
+                      //B contains high byte of left
                       emitpush ("b");
                       emitcode ("mov", "b,a");
                       MOVA (aopGet (right, offset, FALSE, FALSE));
@@ -7708,7 +7606,8 @@
             {
               // c = bit ^ bit;
               if (IS_OP_ACCUSE (left))
-                {               // left already is in the carry
+                {
+                  // left already is in the carry
                   operand *tmp = right;
                   right = left;
                   left = tmp;
@@ -7723,7 +7622,7 @@
               // c = bit ^ val
               toCarry (right);
             }
-          emitcode ("jnb", "%s,!tlabel", AOP (left)->aopu.aop_dir, (tlbl->key + 100));
+          emitcode ("jnb", "%s,!tlabel", AOP (left)->aopu.aop_dir, labelKey2num (tlbl->key));
           emitcode ("cpl", "c");
           emitLabel (tlbl);
         }
@@ -7834,7 +7733,8 @@
               else if (AOP_TYPE (left) == AOP_ACC)
                 {
                   if (!offset)
-                    {           //B contains high byte of left
+                    {
+                      //B contains high byte of left
                       emitpush ("b");
                       emitcode ("mov", "b,a");
                       MOVA (aopGet (right, offset, FALSE, FALSE));
@@ -7864,7 +7764,7 @@
                   emitcode ("xrl", "a,%s", aopGet (left, offset, FALSE, FALSE));
                 }
 
-              emitcode ("jnz", "!tlabel", tlbl->key + 100);
+              emitcode ("jnz", "!tlabel", labelKey2num (tlbl->key));
               offset++;
             }
           if (size)
@@ -7893,7 +7793,8 @@
                       continue;
                     }
                   else if (AOP_TYPE (left) == AOP_ACC)
-                    {           // this should be the only use of left so A,B can be overwritten
+                    {
+                      // this should be the only use of left so A,B can be overwritten
                       char *l = Safe_strdup (aopGet (left, offset, FALSE, FALSE));
                       emitcode ("xrl", "%s,%s", l, aopGet (right, offset, FALSE, FALSE));
                       aopPut (result, l, offset);
@@ -7913,7 +7814,8 @@
               else if (AOP_TYPE (left) == AOP_ACC)
                 {
                   if (!offset)
-                    {           //B contains high byte of left
+                    {
+                      //B contains high byte of left
                       emitpush ("b");
                       emitcode ("mov", "b,a");
                       MOVA (aopGet (right, offset, FALSE, FALSE));
@@ -7954,62 +7856,6 @@
 }
 
 /*-----------------------------------------------------------------*/
-/* genInline - write the inline code out                           */
-/*-----------------------------------------------------------------*/
-static void
-genInline (iCode * ic)
-{
-  char *buf, *bp, *bp1;
-  bool inComment = FALSE;
-
-  D (emitcode (";", "genInline"));
-
-  _G.inLine += (!options.asmpeep);
-
-  buf = bp = bp1 = Safe_strdup (IC_INLINE (ic));
-
-  /* emit each line as a code */
-  while (*bp)
-    {
-      switch (*bp)
-        {
-        case ';':
-          inComment = TRUE;
-          ++bp;
-          break;
-
-        case '\x87':
-        case '\n':
-          inComment = FALSE;
-          *bp++ = '\0';
-          emitcode (bp1, "");
-          bp1 = bp;
-          break;
-
-        default:
-          /* Add \n for labels, not dirs such as c:\mydir */
-          if (!inComment && (*bp == ':') && (isspace ((unsigned char) bp[1])))
-            {
-              ++bp;
-              *bp = '\0';
-              ++bp;
-              emitcode (bp1, "");
-              bp1 = bp;
-            }
-          else
-            ++bp;
-          break;
-        }
-    }
-  if (bp1 != bp)
-    emitcode (bp1, "");
-
-  Safe_free (buf);
-
-  _G.inLine -= (!options.asmpeep);
-}
-
-/*-----------------------------------------------------------------*/
 /* genRRC - rotate right with carry                                */
 /*-----------------------------------------------------------------*/
 static void
@@ -8030,7 +7876,8 @@
   size = AOP_SIZE (result);
   offset = size - 1;
   if (size == 1)
-    {                           /* special case for 1 byte */
+    {
+      /* special case for 1 byte */
       MOVA (aopGet (left, offset, FALSE, FALSE));
       emitcode ("rr", "a");
       goto release;
@@ -8080,7 +7927,8 @@
     {
       MOVA (aopGet (left, offset, FALSE, FALSE));
       if (size == 0)
-        {                       /* special case for 1 byte */
+        {
+          /* special case for 1 byte */
           emitcode ("rl", "a");
           goto release;
         }
@@ -8447,7 +8295,7 @@
           AccRol (8 - shCount);
           /* and kill the higher order bits */
           emitcode ("anl", "a,#!constbyte", SRMask[shCount]);
-          emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, tlbl->key + 100);
+          emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, labelKey2num (tlbl->key));
           emitcode ("orl", "a,#!constbyte", (unsigned char) ~SRMask[shCount]);
           emitLabel (tlbl);
         }
@@ -8573,40 +8421,40 @@
       break;
     case 3:
     case 4:
-    case 5:                                     // AAAAABBB:CCCCCDDD
+    case 5:                    // AAAAABBB:CCCCCDDD
       mask = SLMask[shCount];
-      AccRol (shCount);                         // BBBAAAAA:CCCCCDDD
+      AccRol (shCount);         // BBBAAAAA:CCCCCDDD
       emitcode ("anl", "a,#!constbyte", mask);  // BBB00000:CCCCCDDD
-      emitcode ("xch", "a,%s", x);              // CCCCCDDD:BBB00000
-      AccRol (shCount);                         // DDDCCCCC:BBB00000
-      emitcode ("xch", "a,%s", x);              // BBB00000:DDDCCCCC
-      emitcode ("xrl", "a,%s", x);              // (BBB^DDD)CCCCC:DDDCCCCC
-      emitcode ("xch", "a,%s", x);              // DDDCCCCC:(BBB^DDD)CCCCC
+      emitcode ("xch", "a,%s", x);      // CCCCCDDD:BBB00000
+      AccRol (shCount);         // DDDCCCCC:BBB00000
+      emitcode ("xch", "a,%s", x);      // BBB00000:DDDCCCCC
+      emitcode ("xrl", "a,%s", x);      // (BBB^DDD)CCCCC:DDDCCCCC
+      emitcode ("xch", "a,%s", x);      // DDDCCCCC:(BBB^DDD)CCCCC
       emitcode ("anl", "a,#!constbyte", mask);  // DDD00000:(BBB^DDD)CCCCC
-      emitcode ("xch", "a,%s", x);              // (BBB^DDD)CCCCC:DDD00000
-      emitcode ("xrl", "a,%s", x);              // BBBCCCCC:DDD00000
+      emitcode ("xch", "a,%s", x);      // (BBB^DDD)CCCCC:DDD00000
+      emitcode ("xrl", "a,%s", x);      // BBBCCCCC:DDD00000
       break;
-    case 6:                                     // AAAAAABB:CCCCCCDD
+    case 6:                    // AAAAAABB:CCCCCCDD
       mask = SRMask[shCount];
       emitcode ("anl", "a,#!constbyte", mask);  // 000000BB:CCCCCCDD
-      emitcode ("mov", "c,acc.0");              // c = B
-      emitcode ("xch", "a,%s", x);              // CCCCCCDD:000000BB
+      emitcode ("mov", "c,acc.0");      // c = B
+      emitcode ("xch", "a,%s", x);      // CCCCCCDD:000000BB
       emitcode ("rrc", "a");
       emitcode ("xch", "a,%s", x);
       emitcode ("rrc", "a");
-      emitcode ("mov", "c,acc.0");              //<< get correct bit
+      emitcode ("mov", "c,acc.0");      //<< get correct bit
       emitcode ("xch", "a,%s", x);
       emitcode ("rrc", "a");
       emitcode ("xch", "a,%s", x);
       emitcode ("rrc", "a");
       emitcode ("xch", "a,%s", x);
       break;
-    case 7:                                     // a:x <<= 7
+    case 7:                    // a:x <<= 7
       mask = SRMask[shCount];
       emitcode ("anl", "a,#!constbyte", mask);  // 0000000B:CCCCCCCD
-      emitcode ("mov", "c,acc.0");              // c = B
-      emitcode ("xch", "a,%s", x);              // CCCCCCCD:0000000B
-      AccAXRrl1 (x);                            // BCCCCCCC:D0000000
+      emitcode ("mov", "c,acc.0");      // c = B
+      emitcode ("xch", "a,%s", x);      // CCCCCCCD:0000000B
+      AccAXRrl1 (x);            // BCCCCCCC:D0000000
       break;
     default:
       break;
@@ -8627,40 +8475,40 @@
       break;
     case 1:
       CLRC;
-      AccAXRrl1 (x);                            // 0->a:x
+      AccAXRrl1 (x);            // 0->a:x
       break;
     case 2:
       CLRC;
-      AccAXRrl1 (x);                            // 0->a:x
+      AccAXRrl1 (x);            // 0->a:x
       CLRC;
-      AccAXRrl1 (x);                            // 0->a:x
+      AccAXRrl1 (x);            // 0->a:x
       break;
     case 3:
     case 4:
-    case 5:                                     // AAAAABBB:CCCCCDDD = a:x
-      AccRol (8 - shCount);                     // BBBAAAAA:DDDCCCCC
-      emitcode ("xch", "a,%s", x);              // CCCCCDDD:BBBAAAAA
-      AccRol (8 - shCount);                     // DDDCCCCC:BBBAAAAA
+    case 5:                    // AAAAABBB:CCCCCDDD = a:x
+      AccRol (8 - shCount);     // BBBAAAAA:DDDCCCCC
+      emitcode ("xch", "a,%s", x);      // CCCCCDDD:BBBAAAAA
+      AccRol (8 - shCount);     // DDDCCCCC:BBBAAAAA
       emitcode ("anl", "a,#!constbyte", mask);  // 000CCCCC:BBBAAAAA
-      emitcode ("xrl", "a,%s", x);              // BBB(CCCCC^AAAAA):BBBAAAAA
-      emitcode ("xch", "a,%s", x);              // BBBAAAAA:BBB(CCCCC^AAAAA)
+      emitcode ("xrl", "a,%s", x);      // BBB(CCCCC^AAAAA):BBBAAAAA
+      emitcode ("xch", "a,%s", x);      // BBBAAAAA:BBB(CCCCC^AAAAA)
       emitcode ("anl", "a,#!constbyte", mask);  // 000AAAAA:BBB(CCCCC^AAAAA)
-      emitcode ("xch", "a,%s", x);              // BBB(CCCCC^AAAAA):000AAAAA
-      emitcode ("xrl", "a,%s", x);              // BBBCCCCC:000AAAAA
-      emitcode ("xch", "a,%s", x);              // 000AAAAA:BBBCCCCC
+      emitcode ("xch", "a,%s", x);      // BBB(CCCCC^AAAAA):000AAAAA
+      emitcode ("xrl", "a,%s", x);      // BBBCCCCC:000AAAAA
+      emitcode ("xch", "a,%s", x);      // 000AAAAA:BBBCCCCC
       break;
-    case 6:                                     // AABBBBBB:CCDDDDDD
+    case 6:                    // AABBBBBB:CCDDDDDD
       emitcode ("mov", "c,acc.7");
-      AccAXLrl1 (x);                            // ABBBBBBC:CDDDDDDA
+      AccAXLrl1 (x);            // ABBBBBBC:CDDDDDDA
       emitcode ("mov", "c,acc.7");
-      AccAXLrl1 (x);                            // BBBBBBCC:DDDDDDAA
-      emitcode ("xch", "a,%s", x);              // DDDDDDAA:BBBBBBCC
+      AccAXLrl1 (x);            // BBBBBBCC:DDDDDDAA
+      emitcode ("xch", "a,%s", x);      // DDDDDDAA:BBBBBBCC
       emitcode ("anl", "a,#!constbyte", mask);  // 000000AA:BBBBBBCC
       break;
-    case 7:                                     // ABBBBBBB:CDDDDDDD
-      emitcode ("mov", "c,acc.7");              // c = A
-      AccAXLrl1 (x);                            // BBBBBBBC:DDDDDDDA
-      emitcode ("xch", "a,%s", x);              // DDDDDDDA:BBBBBBCC
+    case 7:                    // ABBBBBBB:CDDDDDDD
+      emitcode ("mov", "c,acc.7");      // c = A
+      AccAXLrl1 (x);            // BBBBBBBC:DDDDDDDA
+      emitcode ("xch", "a,%s", x);      // DDDDDDDA:BBBBBBCC
       emitcode ("anl", "a,#!constbyte", mask);  // 0000000A:BBBBBBBC
       break;
     default:
@@ -8683,53 +8531,53 @@
       break;
     case 1:
       emitcode ("mov", "c,acc.7");
-      AccAXRrl1 (x);                            // s->a:x
+      AccAXRrl1 (x);            // s->a:x
       break;
     case 2:
       emitcode ("mov", "c,acc.7");
-      AccAXRrl1 (x);                            // s->a:x
+      AccAXRrl1 (x);            // s->a:x
       emitcode ("mov", "c,acc.7");
-      AccAXRrl1 (x);                            // s->a:x
+      AccAXRrl1 (x);            // s->a:x
       break;
     case 3:
     case 4:
-    case 5:                                     // AAAAABBB:CCCCCDDD = a:x
+    case 5:                    // AAAAABBB:CCCCCDDD = a:x
       tlbl = newiTempLabel (NULL);
-      AccRol (8 - shCount);                     // BBBAAAAA:CCCCCDDD
-      emitcode ("xch", "a,%s", x);              // CCCCCDDD:BBBAAAAA
-      AccRol (8 - shCount);                     // DDDCCCCC:BBBAAAAA
+      AccRol (8 - shCount);     // BBBAAAAA:CCCCCDDD
+      emitcode ("xch", "a,%s", x);      // CCCCCDDD:BBBAAAAA
+      AccRol (8 - shCount);     // DDDCCCCC:BBBAAAAA
       emitcode ("anl", "a,#!constbyte", mask);  // 000CCCCC:BBBAAAAA
-      emitcode ("xrl", "a,%s", x);              // BBB(CCCCC^AAAAA):BBBAAAAA
-      emitcode ("xch", "a,%s", x);              // BBBAAAAA:BBB(CCCCC^AAAAA)
+      emitcode ("xrl", "a,%s", x);      // BBB(CCCCC^AAAAA):BBBAAAAA
+      emitcode ("xch", "a,%s", x);      // BBBAAAAA:BBB(CCCCC^AAAAA)
       emitcode ("anl", "a,#!constbyte", mask);  // 000AAAAA:BBB(CCCCC^AAAAA)
-      emitcode ("xch", "a,%s", x);              // BBB(CCCCC^AAAAA):000AAAAA
-      emitcode ("xrl", "a,%s", x);              // BBBCCCCC:000AAAAA
-      emitcode ("xch", "a,%s", x);              // 000SAAAA:BBBCCCCC
-      emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, tlbl->key + 100);
+      emitcode ("xch", "a,%s", x);      // BBB(CCCCC^AAAAA):000AAAAA
+      emitcode ("xrl", "a,%s", x);      // BBBCCCCC:000AAAAA
+      emitcode ("xch", "a,%s", x);      // 000SAAAA:BBBCCCCC
+      emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, labelKey2num (tlbl->key));
       mask = ~SRMask[shCount];
       emitcode ("orl", "a,#!constbyte", mask);  // 111AAAAA:BBBCCCCC
       emitLabel (tlbl);
-      break;                                    // SSSSAAAA:BBBCCCCC
-    case 6:                                     // AABBBBBB:CCDDDDDD
+      break;                    // SSSSAAAA:BBBCCCCC
+    case 6:                    // AABBBBBB:CCDDDDDD
       tlbl = newiTempLabel (NULL);
       emitcode ("mov", "c,acc.7");
-      AccAXLrl1 (x);                            // ABBBBBBC:CDDDDDDA
+      AccAXLrl1 (x);            // ABBBBBBC:CDDDDDDA
       emitcode ("mov", "c,acc.7");
-      AccAXLrl1 (x);                            // BBBBBBCC:DDDDDDAA
-      emitcode ("xch", "a,%s", x);              // DDDDDDAA:BBBBBBCC
+      AccAXLrl1 (x);            // BBBBBBCC:DDDDDDAA
+      emitcode ("xch", "a,%s", x);      // DDDDDDAA:BBBBBBCC
       emitcode ("anl", "a,#!constbyte", mask);  // 000000AA:BBBBBBCC
-      emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, tlbl->key + 100);
+      emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, labelKey2num (tlbl->key));
       mask = ~SRMask[shCount];
       emitcode ("orl", "a,#!constbyte", mask);  // 111111AA:BBBBBBCC
       emitLabel (tlbl);
       break;
-    case 7:                                     // ABBBBBBB:CDDDDDDD
+    case 7:                    // ABBBBBBB:CDDDDDDD
       tlbl = newiTempLabel (NULL);
-      emitcode ("mov", "c,acc.7");              // c = A
-      AccAXLrl1 (x);                            // BBBBBBBC:DDDDDDDA
-      emitcode ("xch", "a,%s", x);              // DDDDDDDA:BBBBBBCC
+      emitcode ("mov", "c,acc.7");      // c = A
+      AccAXLrl1 (x);            // BBBBBBBC:DDDDDDDA
+      emitcode ("xch", "a,%s", x);      // DDDDDDDA:BBBBBBCC
       emitcode ("anl", "a,#!constbyte", mask);  // 0000000A:BBBBBBBC
-      emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, tlbl->key + 100);
+      emitcode ("jnb", "acc.%d,!tlabel", 7 - shCount, labelKey2num (tlbl->key));
       mask = ~SRMask[shCount];
       emitcode ("orl", "a,#!constbyte", mask);  // 1111111A:BBBBBBBC
       emitLabel (tlbl);
@@ -9052,7 +8900,8 @@
             movLeft2Result (left, LSB, result, MSB16, 0);
         }
       else
-        {                       /* size = 4 */
+        {
+          /* size = 4 */
           if (shCount == 0)
             {
               movLeft2Result (left, MSB24, result, MSB32, 0);
@@ -9094,8 +8943,8 @@
 static void
 genLeftShiftLiteral (operand * left, operand * right, operand * result, iCode * ic)
 {
-  int shCount = (int) ulFromVal (AOP (right)->aopu.aop_lit);
-  int size;
+  unsigned int shCount = (unsigned int) ulFromVal (AOP (right)->aopu.aop_lit);
+  unsigned int size;
 
   size = getSize (operandType (result));
 
@@ -9111,6 +8960,8 @@
 #endif
 
   /* I suppose that the left size >= result size */
+//  wassert (getSize (operandType (left)) >= size);
+
   if (shCount == 0)
     {
       while (size--)
@@ -9232,11 +9083,11 @@
       symbol *tlbl1 = newiTempLabel (NULL);
 
       MOVA (aopGet (left, 0, FALSE, FALSE));
-      emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
+      emitcode ("sjmp", "!tlabel", labelKey2num (tlbl1->key));
       emitLabel (tlbl);
       emitcode ("add", "a,acc");
       emitLabel (tlbl1);
-      emitcode ("djnz", "b,!tlabel", tlbl->key + 100);
+      emitcode ("djnz", "b,!tlabel", labelKey2num (tlbl->key));
       popB (pushedB);
       aopPut (result, "a", 0);
       goto release;
@@ -9244,7 +9095,7 @@
 
   reAdjustPreg (AOP (result));
 
-  emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
+  emitcode ("sjmp", "!tlabel", labelKey2num (tlbl1->key));
   emitLabel (tlbl);
   MOVA (aopGet (result, offset, FALSE, FALSE));
   emitcode ("add", "a,acc");
@@ -9258,7 +9109,7 @@
   reAdjustPreg (AOP (result));
 
   emitLabel (tlbl1);
-  emitcode ("djnz", "b,!tlabel", tlbl->key + 100);
+  emitcode ("djnz", "b,!tlabel", labelKey2num (tlbl->key));
   popB (pushedB);
 release:
   freeAsmop (result, NULL, ic, TRUE);
@@ -9484,7 +9335,7 @@
   int shCount = (int) ulFromVal (AOP (right)->aopu.aop_lit);
   int size;
 
-  size = getSize (operandType (result)); //getDataSize (left);
+  size = getSize (operandType (result));        //getDataSize (left);
 
   D (emitcode (";", "genRightShiftLiteral (%d), size %d", shCount, size));
 
@@ -9625,19 +9476,19 @@
   if (size == 1)
     {
       MOVA (aopGet (left, 0, FALSE, FALSE));
-      emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
+      emitcode ("sjmp", "!tlabel", labelKey2num (tlbl1->key));
       emitLabel (tlbl);
       emitcode ("mov", "c,ov");
       emitcode ("rrc", "a");
       emitLabel (tlbl1);
-      emitcode ("djnz", "b,!tlabel", tlbl->key + 100);
+      emitcode ("djnz", "b,!tlabel", labelKey2num (tlbl->key));
       popB (pushedB);
       aopPut (result, "a", 0);
       goto release;
     }
 
   reAdjustPreg (AOP (result));
-  emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
+  emitcode ("sjmp", "!tlabel", labelKey2num (tlbl1->key));
   emitLabel (tlbl);
   emitcode ("mov", "c,ov");
   while (size--)
@@ -9648,7 +9499,7 @@
     }
   reAdjustPreg (AOP (result));
   emitLabel (tlbl1);
-  emitcode ("djnz", "b,!tlabel", tlbl->key + 100);
+  emitcode ("djnz", "b,!tlabel", labelKey2num (tlbl->key));
   popB (pushedB);
 
 release:
@@ -9755,19 +9606,19 @@
   if (size == 1)
     {
       MOVA (aopGet (left, 0, FALSE, FALSE));
-      emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
+      emitcode ("sjmp", "!tlabel", labelKey2num (tlbl1->key));
       emitLabel (tlbl);
       CLRC;
       emitcode ("rrc", "a");
       emitLabel (tlbl1);
-      emitcode ("djnz", "b,!tlabel", tlbl->key + 100);
+      emitcode ("djnz", "b,!tlabel", labelKey2num (tlbl->key));
       popB (pushedB);
       aopPut (result, "a", 0);
       goto release;
     }
 
   reAdjustPreg (AOP (result));
-  emitcode ("sjmp", "!tlabel", tlbl1->key + 100);
+  emitcode ("sjmp", "!tlabel", labelKey2num (tlbl1->key));
   emitLabel (tlbl);
   CLRC;
   while (size--)
@@ -9779,7 +9630,7 @@
   reAdjustPreg (AOP (result));
 
   emitLabel (tlbl1);
-  emitcode ("djnz", "b,!tlabel", tlbl->key + 100);
+  emitcode ("djnz", "b,!tlabel", labelKey2num (tlbl->key));
   popB (pushedB);
 
 release:
@@ -9886,8 +9737,8 @@
   int blen;                     /* bitfield length */
   int bstr;                     /* bitfield starting bit within byte */
   static char *const accBits[] = { "acc.0", "acc.1", "acc.2", "acc.3",
-    "acc.4", "acc.5", "acc.6", "acc.7"
-  };
+                                   "acc.4", "acc.5", "acc.6", "acc.7"
+                                 };
 
   D (emitcode (";", "genUnpackBits"));
 
@@ -9906,7 +9757,7 @@
       else
         {
           if (blen < 8)
-            emitcode ("anl", "a,#!constbyte", (((unsigned char) -1) >> (8 - blen)) << bstr);
+            emitcode ("anl", "a,#!constbyte", (((unsigned char) - 1) >> (8 - blen)) << bstr);
           return "a";
         }
     }
@@ -9917,13 +9768,13 @@
     {
       emitPtrByteGet (rname, ptype, FALSE);
       AccRol (8 - bstr);
-      emitcode ("anl", "a,#!constbyte", ((unsigned char) -1) >> (8 - blen));
+      emitcode ("anl", "a,#!constbyte", ((unsigned char) - 1) >> (8 - blen));
       if (!SPEC_USIGN (etype))
         {
           /* signed bitfield */
           symbol *tlbl = newiTempLabel (NULL);
 
-          emitcode ("jnb", "acc.%d,!tlabel", blen - 1, tlbl->key + 100);
+          emitcode ("jnb", "acc.%d,!tlabel", blen - 1, labelKey2num (tlbl->key));
           emitcode ("orl", "a,#0x%02x", (unsigned char) (0xff << blen));
           emitLabel (tlbl);
         }
@@ -9945,13 +9796,13 @@
   if (rlen)
     {
       emitPtrByteGet (rname, ptype, FALSE);
-      emitcode ("anl", "a,#!constbyte", ((unsigned char) -1) >> (8 - rlen));
+      emitcode ("anl", "a,#!constbyte", ((unsigned char) - 1) >> (8 - rlen));
       if (!SPEC_USIGN (etype))
         {
           /* signed bitfield */
           symbol *tlbl = newiTempLabel (NULL);
 
-          emitcode ("jnb", "acc.%d,!tlabel", rlen - 1, tlbl->key + 100);
+          emitcode ("jnb", "acc.%d,!tlabel", rlen - 1, labelKey2num (tlbl->key));
           emitcode ("orl", "a,#0x%02x", (unsigned char) (0xff << rlen));
           emitLabel (tlbl);
         }
@@ -10124,7 +9975,8 @@
   if (aop)                      /* we had to allocate for this iCode */
     {
       if (pi)
-        {                       /* post increment present */
+        {
+          /* post increment present */
           aopPut (left, rname, 0);
         }
       freeAsmop (NULL, aop, ic, RESULTONSTACK (ic) ? FALSE : TRUE);
@@ -10565,7 +10417,7 @@
   /* If there was a partial byte at the end */
   if (rlen)
     {
-      mask = (((unsigned char) -1 << rlen) & 0xff);
+      mask = (((unsigned char) - 1 << rlen) & 0xff);
 
       if (AOP_TYPE (right) == AOP_LIT)
         {
@@ -10656,16 +10508,16 @@
       /* clr a needs an extra byte. If two bytes are zero it starts to pay off
          to preload the accumulator */
       int clr_num_bytes_saved = -1 +    /* size of clr a */
-        (int) ((((lit >> 0) & 0xff) == 0) && (size >= 1)) +
-        (int) ((((lit >> 8) & 0xff) == 0) && (size >= 2)) +
-        (int) ((((lit >> 16) & 0xff) == 0) && (size >= 3)) + (int) ((((lit >> 24) & 0xff) == 0) && (size >= 4));
+                                (int) ((((lit >> 0) & 0xff) == 0) && (size >= 1)) +
+                                (int) ((((lit >> 8) & 0xff) == 0) && (size >= 2)) +
+                                (int) ((((lit >> 16) & 0xff) == 0) && (size >= 3)) + (int) ((((lit >> 24) & 0xff) == 0) && (size >= 4));
 
       /* mov a,#something needs two extra bytes. If three bytes are identical it starts to pay off */
       int mov_num_bytes_saved = -2 +    /* size of mov a,#something */
-        (int) ((lit & 0xff) == ((lit >> 0) & 0xff) && (size >= 1)) +    /* true */
-        (int) ((lit & 0xff) == ((lit >> 8) & 0xff) && (size >= 2)) +
-        (int) ((lit & 0xff) == ((lit >> 16) & 0xff) && (size >= 3)) +
-        (int) ((lit & 0xff) == ((lit >> 24) & 0xff) && (size >= 4));
+                                (int) ((lit & 0xff) == ((lit >> 0) & 0xff) && (size >= 1)) +    /* true */
+                                (int) ((lit & 0xff) == ((lit >> 8) & 0xff) && (size >= 2)) +
+                                (int) ((lit & 0xff) == ((lit >> 16) & 0xff) && (size >= 3)) +
+                                (int) ((lit & 0xff) == ((lit >> 24) & 0xff) && (size >= 4));
 
       int num_bytes_to_save_before_using_acc_takes_effect = 1;
 
@@ -11212,7 +11064,7 @@
      variable */
   if (sym->onStack)
     {
-      int stack_offset = stackoffset(sym);
+      int stack_offset = stackoffset (sym);
 
       /* if it has an offset then we need to compute it */
       if (stack_offset)
@@ -11333,9 +11185,7 @@
   aopOp (right, ic, FALSE);
 
   /* special case both in far space */
-  if (AOP_TYPE (right) == AOP_DPTR &&
-      IS_TRUE_SYMOP (result) &&
-      isOperandInFarSpace (result))
+  if (AOP_TYPE (right) == AOP_DPTR && IS_TRUE_SYMOP (result) && isOperandInFarSpace (result))
     {
       genFarFarAssign (result, right, ic);
       return;
@@ -11386,8 +11236,10 @@
 static void
 genJumpTab (iCode * ic)
 {
+  operand *cond = IC_JTCOND (ic);
   symbol *jtab, *jtablo, *jtabhi;
   unsigned int count;
+  const char *l;
 
   D (emitcode (";", "genJumpTab"));
 
@@ -11402,38 +11254,41 @@
       /* Peephole may not convert ljmp to sjmp or ret
          labelIsReturnOnly & labelInRange must check
          currPl->ic->op != JUMPTABLE */
-      aopOp (IC_JTCOND (ic), ic, FALSE);
+      aopOp (cond, ic, FALSE);
       /* get the condition into accumulator */
-      MOVA (aopGet (IC_JTCOND (ic), 0, FALSE, FALSE));
+      l = aopGet (cond, 0, FALSE, FALSE);
+      MOVA (l);
       /* multiply by three */
-      if (aopGetUsesAcc (IC_JTCOND (ic), 0))
+      if ((AOP_TYPE (cond) == AOP_REG) || (IS_AOP_PREG (cond) && !AOP (cond)->paged && !IS_VOLATILE (operandType (cond))))
         {
+          emitcode ("add", "a,%s", l);
           if (options.acall_ajmp == 0)
-            emitcode ("mov", "b,#0x03");
-          else
-            emitcode ("mov", "b,#0x02");
-          emitcode ("mul", "ab");
+            emitcode ("add", "a,%s", l);
         }
       else
         {
-          emitcode ("add", "a,acc");
           if (options.acall_ajmp == 0)
-            emitcode ("add", "a,%s", aopGet (IC_JTCOND (ic), 0, FALSE, FALSE));
+            {
+              emitcode ("mov", "b,#0x03");
+              emitcode ("mul", "ab");
+            }
+          else
+            {
+              emitcode ("add", "a,acc");
+            }
         }
-      freeAsmop (IC_JTCOND (ic), NULL, ic, TRUE);
+      freeAsmop (cond, NULL, ic, TRUE);
 
       jtab = newiTempLabel (NULL);
-      emitcode ("mov", "dptr,#!tlabel", jtab->key + 100);
+      emitcode ("mov", "dptr,#!tlabel", labelKey2num (jtab->key));
       emitcode ("jmp", "@a+dptr");
       emitLabel (jtab);
       /* now generate the jump labels */
       for (jtab = setFirstItem (IC_JTLABELS (ic)); jtab; jtab = setNextItem (IC_JTLABELS (ic)))
-        emitcode ("ljmp", "!tlabel", jtab->key + 100);
+        emitcode ("ljmp", "!tlabel", labelKey2num (jtab->key));
     }
   else
     {
-      const char *l;
-
       /* this algorithm needs 14 cycles and 13 + 2*n bytes
          if the switch argument is in a register.
          For n>6 this algorithm may be more compact */
@@ -11442,25 +11297,26 @@
 
       /* get the condition into accumulator.
          Using b as temporary storage, if register push/pop is needed */
-      aopOp (IC_JTCOND (ic), ic, FALSE);
-      l = aopGet (IC_JTCOND (ic), 0, FALSE, FALSE);
-      if ((AOP_TYPE (IC_JTCOND (ic)) == AOP_R0 && _G.r0Pushed) || (AOP_TYPE (IC_JTCOND (ic)) == AOP_R1 && _G.r1Pushed))
+      aopOp (cond, ic, FALSE);
+      l = aopGet (cond, 0, FALSE, FALSE);
+      if ((AOP_TYPE (cond) == AOP_R0 && _G.r0Pushed) ||
+          (AOP_TYPE (cond) == AOP_R1 && _G.r1Pushed) || EQ (l, "a") || EQ (l, "acc") || IS_VOLATILE (operandType (cond)))
         {
           // (MB) what if B is in use???
           wassertl (!BINUSE, "B was in use");
           emitcode ("mov", "b,%s", l);
           l = "b";
         }
-      freeAsmop (IC_JTCOND (ic), NULL, ic, TRUE);
+      freeAsmop (cond, NULL, ic, TRUE);
       MOVA (l);
       if (count <= 112)
         {
-          emitcode ("add", "a,#(!tlabel-3-.)", jtablo->key + 100);
+          emitcode ("add", "a,#(!tlabel-3-.)", labelKey2num (jtablo->key));
           emitcode ("movc", "a,@a+pc");
           emitpush ("acc");
 
           MOVA (l);
-          emitcode ("add", "a,#(!tlabel-3-.)", jtabhi->key + 100);
+          emitcode ("add", "a,#(!tlabel-3-.)", labelKey2num (jtabhi->key));
           emitcode ("movc", "a,@a+pc");
           emitpush ("acc");
         }
@@ -11468,12 +11324,12 @@
         {
           /* this scales up to n<=255, but needs two more bytes
              and changes dptr */
-          emitcode ("mov", "dptr,#!tlabel", jtablo->key + 100);
+          emitcode ("mov", "dptr,#!tlabel", labelKey2num (jtablo->key));
           emitcode ("movc", "a,@a+dptr");
           emitpush ("acc");
 
           MOVA (l);
-          emitcode ("mov", "dptr,#!tlabel", jtabhi->key + 100);
+          emitcode ("mov", "dptr,#!tlabel", labelKey2num (jtabhi->key));
           emitcode ("movc", "a,@a+dptr");
           emitpush ("acc");
         }
@@ -11484,12 +11340,12 @@
       /* now generate jump table, LSB */
       emitLabel (jtablo);
       for (jtab = setFirstItem (IC_JTLABELS (ic)); jtab; jtab = setNextItem (IC_JTLABELS (ic)))
-        emitcode (".db", "!tlabel", jtab->key + 100);
+        emitcode (".db", "!tlabel", labelKey2num (jtab->key));
 
       /* now generate jump table, MSB */
       emitLabel (jtabhi);
       for (jtab = setFirstItem (IC_JTLABELS (ic)); jtab; jtab = setNextItem (IC_JTLABELS (ic)))
-        emitcode (".db", "!tlabel>>8", jtab->key + 100);
+        emitcode (".db", "!tlabel>>8", labelKey2num (jtab->key));
     }
 }
 
@@ -11515,20 +11371,20 @@
   aopOp (result, ic, FALSE);
 
   /* if the result is a bit (and not a bitfield) */
-  if (IS_BIT (OP_SYMBOL (result)->type))
+  if (IS_BOOLEAN (OP_SYMBOL (result)->type))
     {
       assignBit (result, right);
       goto release;
     }
 
   /* if they are the same size : or less */
-  if (AOP_SIZE (result) <= AOP_SIZE (right))
+  if (AOP_SIZE (result) <= AOP_SIZE (right) && !IS_BOOLEAN (operandType (result)))
     {
       /* if they are in the same place */
       if (sameRegs (AOP (right), AOP (result)))
         goto release;
 
-      /* if they in different places then copy */
+      /* if they are in different places then copy */
       size = AOP_SIZE (result);
       offset = 0;
       while (size--)
@@ -11539,15 +11395,15 @@
       goto release;
     }
 
-  /* if the result is of type pointer */
-  if (IS_PTR (ctype))
+  /* if the either is of type pointer */
+  if (IS_PTR (ctype) || IS_PTR (rtype))
     {
       int p_type;
       sym_link *type = operandType (right);
       sym_link *etype = getSpec (type);
 
-      /* pointer to generic pointer */
-      if (IS_GENPTR (ctype))
+      /* pointer to generic pointer or long */
+      if (AOP_SIZE (result) >= GPTRSIZE)
         {
           if (IS_PTR (type))
             {
@@ -11575,9 +11431,16 @@
               aopPut (result, aopGet (right, offset, FALSE, FALSE), offset);
               offset++;
             }
-          /* the last byte depending on type */
+          /* the third byte depending on type */
           {
-            int gpVal = pointerTypeToGPByte (p_type, NULL, NULL);
+            int gpVal;
+
+            /* If there will be no loss of precision, handle generic */
+            /* pointer as special case to avoid generating warning */
+            if (p_type == GPOINTER && AOP_SIZE (result) >= GPTRSIZE)
+              gpVal = -1;
+            else
+              gpVal = pointerTypeToGPByte (p_type, NULL, NULL);
 
             if (gpVal == -1)
               {
@@ -11594,6 +11457,15 @@
                 dbuf_destroy (&dbuf);
               }
           }
+
+          /* 8051 uses unsigned address spaces, so no sign extension needed. */
+          /* Pad the remaining bytes of the result (if any) with 0. */
+          size = AOP_SIZE (result) - GPTRSIZE;
+          offset = GPTRSIZE;
+          while (size--)
+            {
+              aopPut (result, zero, offset++);
+            }
           goto release;
         }
 
@@ -11703,7 +11575,7 @@
         }
       emitcode ("dec", "%s", rByte);
       aopPut (IC_RESULT (ic), rByte, 0);
-      emitcode ("jnz", "!tlabel", lbl->key + 100);
+      emitcode ("jnz", "!tlabel", labelKey2num (lbl->key));
     }
   else if (IS_AOP_PREG (IC_RESULT (ic)))
     {
@@ -11711,15 +11583,15 @@
       MOVA (aopGet (IC_RESULT (ic), 0, FALSE, FALSE));
       freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
       ifx->generated = 1;
-      emitcode ("jnz", "!tlabel", lbl->key + 100);
+      emitcode ("jnz", "!tlabel", labelKey2num (lbl->key));
     }
   else
     {
-      emitcode ("djnz", "%s,!tlabel", aopGet (IC_RESULT (ic), 0, FALSE, FALSE), lbl->key + 100);
+      emitcode ("djnz", "%s,!tlabel", aopGet (IC_RESULT (ic), 0, FALSE, FALSE), labelKey2num (lbl->key));
     }
-  emitcode ("sjmp", "!tlabel", lbl1->key + 100);
+  emitcode ("sjmp", "!tlabel", labelKey2num (lbl1->key));
   emitLabel (lbl);
-  emitcode ("ljmp", "!tlabel", IC_TRUE (ifx)->key + 100);
+  emitcode ("ljmp", "!tlabel", labelKey2num (IC_TRUE (ifx)->key));
   emitLabel (lbl1);
 
   if (!ifx->generated)
@@ -11740,7 +11612,8 @@
   D (emitcode (";", "genReceive"));
 
   if (ic->argreg == 1)
-    {                           /* first parameter */
+    {
+      /* first parameter */
       if ((isOperandInFarSpace (IC_RESULT (ic)) ||
            isOperandInPagedSpace (IC_RESULT (ic))) && (OP_SYMBOL (IC_RESULT (ic))->isspilt || IS_TRUE_SYMOP (IC_RESULT (ic))))
         {
@@ -11784,8 +11657,7 @@
           offset = fReturnSizeMCS51 - size;
           while (size--)
             {
-              emitpush ( (!EQ (fReturn[fReturnSizeMCS51 - offset - 1], "a") ?
-                           fReturn[fReturnSizeMCS51 - offset - 1] : "acc"));
+              emitpush ((!EQ (fReturn[fReturnSizeMCS51 - offset - 1], "a") ? fReturn[fReturnSizeMCS51 - offset - 1] : "acc"));
               offset++;
             }
           aopOp (IC_RESULT (ic), ic, FALSE);
@@ -11806,7 +11678,8 @@
         }
     }
   else if (ic->argreg > 12)
-    {                           /* bit parameters */
+    {
+      /* bit parameters */
       reg_info *reg = OP_SYMBOL (IC_RESULT (ic))->regs[0];
 
       BitBankUsed = 1;
@@ -11818,7 +11691,8 @@
         }
     }
   else
-    {                           /* other parameters */
+    {
+      /* other parameters */
       int rb1off;
       aopOp (IC_RESULT (ic), ic, FALSE);
       rb1off = ic->argreg;
@@ -11906,7 +11780,7 @@
     {
       aopOp (IC_RESULT (ic), ic, TRUE);
       aopPut (IC_RESULT (ic), one, 0);  /* save old ea in an operand */
-      emitcode ("jbc", "ea,!tlabel", tlbl->key + 100);  /* atomic test & clear */
+      emitcode ("jbc", "ea,!tlabel", labelKey2num (tlbl->key)); /* atomic test & clear */
       aopPut (IC_RESULT (ic), zero, 0);
       emitLabel (tlbl);
       freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
@@ -11914,10 +11788,10 @@
   else
     {
       emitcode ("setb", "c");
-      emitcode ("jbc", "ea,!tlabel", tlbl->key + 100);  /* atomic test & clear */
+      emitcode ("jbc", "ea,!tlabel", labelKey2num (tlbl->key)); /* atomic test & clear */
       emitcode ("clr", "c");
       emitLabel (tlbl);
-      emitpush ("psw"); /* save old ea via c in psw on top of stack */
+      emitpush ("psw");         /* save old ea via c in psw on top of stack */
     }
 }
 
@@ -11948,7 +11822,7 @@
     }
   else
     {
-      emitpop ("psw");  /* restore ea via c in psw on top of stack */
+      emitpop ("psw");          /* restore ea via c in psw on top of stack */
       emitcode ("mov", "ea,c");
     }
 }
@@ -11966,7 +11840,6 @@
 #endif
 
   _G.currentFunc = NULL;
-  lineHead = lineCurr = NULL;
 
   /* print the allocation information */
   if (allocInfo && currFunc)
@@ -11984,7 +11857,9 @@
 
   for (ic = lic; ic; ic = ic->next)
     {
-      _G.current_iCode = ic;
+      initGenLineElement ();
+
+      genLine.lineElement.ic = ic;
 
       if (ic->lineno && cln != ic->lineno)
         {
@@ -12059,25 +11934,25 @@
           break;
 
         case IPOP:
-          {
-            iCode *ifxIc, *popIc;
-            bool CommonRegs = FALSE;
+        {
+          iCode *ifxIc, *popIc;
+          bool CommonRegs = FALSE;
 
-            /* IPOP happens only when trying to restore a
-               spilt live range, if there is an ifx statement
-               following this pop (or several) then the if statement might
-               be using some of the registers being popped which
-               would destroy the contents of the register so
-               we need to check for this condition and handle it */
-            for (ifxIc = ic->next; ifxIc && ifxIc->op == IPOP; ifxIc = ifxIc->next);
-            for (popIc = ic; popIc && popIc->op == IPOP; popIc = popIc->next)
-              CommonRegs |= (ifxIc && ifxIc->op == IFX && !ifxIc->generated && regsInCommon (IC_LEFT (popIc), IC_COND (ifxIc)));
-            if (CommonRegs)
-              genIfx (ifxIc, ic);
-            else
-              genIpop (ic);
-          }
-          break;
+          /* IPOP happens only when trying to restore a
+             spilt live range, if there is an ifx statement
+             following this pop (or several) then the if statement might
+             be using some of the registers being popped which
+             would destroy the contents of the register so
+             we need to check for this condition and handle it */
+          for (ifxIc = ic->next; ifxIc && ifxIc->op == IPOP; ifxIc = ifxIc->next);
+          for (popIc = ic; popIc && popIc->op == IPOP; popIc = popIc->next)
+            CommonRegs |= (ifxIc && ifxIc->op == IFX && !ifxIc->generated && regsInCommon (IC_LEFT (popIc), IC_COND (ifxIc)));
+          if (CommonRegs)
+            genIfx (ifxIc, ic);
+          else
+            genIpop (ic);
+        }
+        break;
 
         case CALL:
           genCall (ic);
@@ -12261,14 +12136,16 @@
         }
     }
 
-  _G.current_iCode = NULL;
+  genLine.lineElement.ic = NULL;
 
   /* now we are ready to call the
      peep hole optimizer */
   if (!options.nopeep)
-    peepHole (&lineHead);
+    peepHole (&genLine.lineHead);
 
   /* now do the actual printing */
-  printLine (lineHead, codeOutBuf);
-  return;
+  printLine (genLine.lineHead, codeOutBuf);
+
+  /* destroy the line list */
+  destroy_line_list ();
 }
diff -Nru sdcc-3.1.0+dfsg/src/mcs51/main.c sdcc-3.2.0+dfsg/src/mcs51/main.c
--- sdcc-3.1.0+dfsg/src/mcs51/main.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/mcs51/main.c	2012-03-30 20:01:27.000000000 +0000
@@ -1,6 +1,25 @@
-/** @file main.c
-    mcs51 specific general functions.
+/*-------------------------------------------------------------------------
+  main.c - mcs51 specific general functions
 
+  Copyright (C) 1998, Sandeep Dutta . sandeep.dutta@usa.net
+  Copyright (C) 1999, Jean-Louis VERN.jlvern@writeme.com
+  Copyright (C) 2000, Michael Hope
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-------------------------------------------------------------------*/
+/*
     Note that mlh prepended _mcs51_ on the static functions.  Makes
     it easier to set a breakpoint using the debugger.
 */
@@ -102,7 +121,7 @@
   else
     {
       int size = getSize(l);
-      int remain ;
+      int remain;
 
       /* first one goes the usual way to DPTR */
       if (regParmFlg == 0)
@@ -683,7 +702,7 @@
 getInstructionSize (lineNode *line)
 {
   if (!line->aln)
-    line->aln = asmLineNodeFromLineNode (line);
+    line->aln = (asmLineNodeBase *) asmLineNodeFromLineNode (line);
 
   return line->aln->size;
 }
@@ -692,7 +711,7 @@
 getRegsRead (lineNode *line)
 {
   if (!line->aln)
-    line->aln = asmLineNodeFromLineNode (line);
+    line->aln = (asmLineNodeBase *) asmLineNodeFromLineNode (line);
 
   return line->aln->regsRead;
 }
@@ -701,7 +720,7 @@
 getRegsWritten (lineNode *line)
 {
   if (!line->aln)
-    line->aln = asmLineNodeFromLineNode (line);
+    line->aln = (asmLineNodeBase *) asmLineNodeFromLineNode (line);
 
   return line->aln->regsWritten;
 }
@@ -780,8 +799,8 @@
   {                             /* Assembler */
     _asmCmd,
     NULL,
-    "-plosgffwzc",              /* Options with debug */
-    "-plosgffwz",               /* Options without debug */
+    "-plosgffwc",               /* Options with debug */
+    "-plosgffw",                /* Options without debug */
     0,
     ".asm",
     NULL                        /* no do_assemble function */
diff -Nru sdcc-3.1.0+dfsg/src/mcs51/main.h sdcc-3.2.0+dfsg/src/mcs51/main.h
--- sdcc-3.1.0+dfsg/src/mcs51/main.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/mcs51/main.h	2012-03-30 20:01:27.000000000 +0000
@@ -1,11 +1,40 @@
+/*-------------------------------------------------------------------------
+  main.c - mcs51 specific general header file
+
+  Copyright (C) 1998, Sandeep Dutta . sandeep.dutta@usa.net
+  Copyright (C) 1999, Jean-Louis VERN.jlvern@writeme.com
+  Copyright (C) 2000, Michael Hope
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-------------------------------------------------------------------*/
+
 #ifndef MAIN_INCLUDE
 #define MAIN_INCLUDE
 
+#include "SDCCgen.h"
+
 typedef struct asmLineNode
   {
+#ifdef UNNAMED_STRUCT_TAG
+    struct asmLineNodeBase;
+#else
+    /* exactly the same members as of struct asmLineNodeBase from SDCCgen.h */
     int size;
     bitVect *regsRead;
     bitVect *regsWritten;
+#endif
   }
 asmLineNode;
 
diff -Nru sdcc-3.1.0+dfsg/src/mcs51/mcs51.vcxproj sdcc-3.2.0+dfsg/src/mcs51/mcs51.vcxproj
--- sdcc-3.1.0+dfsg/src/mcs51/mcs51.vcxproj	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/mcs51/mcs51.vcxproj	2012-03-18 13:40:40.000000000 +0000
@@ -151,10 +151,12 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="peeph.def">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f ../SDCCpeeph.awk %(FullPath) &gt;peeph.rul</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f ../SDCCpeeph.awk %(FullPath) &gt;peeph.rul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f ../SDCCpeeph.awk %(Identity) &gt;peeph.rul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f ../SDCCpeeph.awk %(Identity) &gt;peeph.rul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">peeph.rul;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">peeph.rul;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Peephole Rule: peeph.rul</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Peephole Rule: peeph.rul</Message>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff -Nru sdcc-3.1.0+dfsg/src/mcs51/peeph.def sdcc-3.2.0+dfsg/src/mcs51/peeph.def
--- sdcc-3.1.0+dfsg/src/mcs51/peeph.def	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/mcs51/peeph.def	2012-02-22 09:24:36.000000000 +0000
@@ -4885,7 +4885,7 @@
 } by {
 	;	Peephole 400.a	replaced lcall/ret with ljmp
 	ljmp	%1
-} if optimizeReturn()
+} if optimizeReturn(), notSame(%1 '_longjmp')
 
 // applies to: void test( char c ) { if( c ) func1(); else func2(); }
 replace {
@@ -4896,7 +4896,7 @@
 	;	Peephole 400.b	replaced lcall/ret with ljmp
 	ljmp	%1
 	;
-} if optimizeReturn(), labelRefCount(%2 0)
+} if optimizeReturn(), notSame(%1 '_longjmp'), labelRefCount(%2 0)
 
 // applies to f.e. scott-bool1.c
 replace {
@@ -4908,7 +4908,7 @@
 	ljmp	%1
 %2:
 	ret
-} if optimizeReturn()
+} if optimizeReturn(), notSame(%1 '_longjmp')
 
 // for programs less than 2k
 replace {
diff -Nru sdcc-3.1.0+dfsg/src/mcs51/ralloc.c sdcc-3.2.0+dfsg/src/mcs51/ralloc.c
--- sdcc-3.1.0+dfsg/src/mcs51/ralloc.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/mcs51/ralloc.c	2012-06-05 09:03:12.000000000 +0000
@@ -1033,15 +1033,23 @@
           /* if the result of this one needs registers
              and does not have it then assign it right
              away */
-          if (IC_RESULT (ic) && !(SKIP_IC2 (ic) ||      /* not a special icode */
-                                  ic->op == JUMPTABLE || ic->op == IFX || ic->op == IPUSH || ic->op == IPOP || ic->op == RETURN || POINTER_SET (ic)) && (result = OP_SYMBOL (IC_RESULT (ic))) &&        /* has a result */
-              result->liveTo > ic->seq &&       /* and will live beyond this */
-              result->liveTo <= ebp->lSeq &&    /* does not go beyond this block */
-              result->liveFrom == ic->seq &&    /* does not start before here */
+          if (IC_RESULT (ic) &&
+              !( SKIP_IC2 (ic)       ||                 /* not a special icode */
+                 ic->op == JUMPTABLE ||
+                 ic->op == IFX       ||
+                 ic->op == IPUSH     ||
+                 ic->op == IPOP      ||
+                 ic->op == RETURN    ||
+                 POINTER_SET (ic)      ) &&
+              (result = OP_SYMBOL (IC_RESULT (ic))) &&  /* has a result */
+              result->liveTo > ic->seq &&               /* and will live beyond this */
+              result->liveTo <= ebp->lSeq &&            /* does not go beyond this block */
+              result->liveFrom == ic->seq &&            /* does not start before here */
               result->regType == sym->regType &&        /* same register types */
-              result->nRegs &&  /* which needs registers */
-              !result->isspilt &&       /* and does not already have them */
-              !result->remat && !bitVectBitValue (_G.regAssigned, result->key) &&
+              result->nRegs &&                          /* which needs registers */
+              !result->isspilt &&                       /* and does not already have them */
+              !result->remat &&
+              !bitVectBitValue (_G.regAssigned, result->key) &&
               /* the number of free regs + number of regs in this LR
                  can accomodate the what result Needs */
               ((nfreeRegsType (result->regType) + sym->nRegs) >= result->nRegs))
@@ -1054,7 +1062,6 @@
 
               _G.regAssigned = bitVectSetBit (_G.regAssigned, result->key);
               _G.totRegAssigned = bitVectSetBit (_G.totRegAssigned, result->key);
-
             }
 
           /* free the remaining */
@@ -1243,8 +1250,12 @@
           deassignLRs (ic, ebbs[i]);
 
           /* some don't need registers */
-          if (SKIP_IC2 (ic) ||
-              ic->op == JUMPTABLE || ic->op == IFX || ic->op == IPUSH || ic->op == IPOP || (IC_RESULT (ic) && POINTER_SET (ic)))
+          if (SKIP_IC2 (ic)       ||
+              ic->op == JUMPTABLE ||
+              ic->op == IFX       ||
+              ic->op == IPUSH     ||
+              ic->op == IPOP      ||
+              (IC_RESULT (ic) && POINTER_SET (ic)))
             {
               continue;
             }
@@ -2797,7 +2808,6 @@
 
 accuse:
   OP_SYMBOL (IC_RESULT (ic))->accuse = 1;
-
 }
 
 /*-----------------------------------------------------------------*/
@@ -2809,6 +2819,7 @@
   iCode *dic, *lic;
   bitVect *dbv;
   struct eBBlock *ebp = ebpp[blockno];
+  int disallowHiddenAssignment = 0;
 
   if (ic->op != IPUSH || !IS_ITEMP (IC_LEFT (ic)))
     return;
@@ -2817,6 +2828,22 @@
   if (bitVectnBitsOn (OP_DEFS (IC_LEFT (ic))) != 1 || bitVectnBitsOn (OP_USES (IC_LEFT (ic))) != 1)
     return;
 
+  /* The changes in SDCCopt.c #7741 should correct the use info, making */
+  /* this extra test redundant. */
+  if (ic->parmPush)
+    {// find Send or other Push for this func call
+      for (lic = ic->next; lic && lic->op != CALL; lic = lic->next)
+        {
+          if ((lic->op == IPUSH || lic->op == SEND) && IS_ITEMP (IC_LEFT (lic)))
+            {// and check parameter is not passed again
+              symbol * parm = OP_SYMBOL (IC_LEFT (ic));
+              symbol * other = OP_SYMBOL (IC_LEFT (lic));
+              if (other == parm)
+                return;
+            }
+        }
+    }
+
   /* find the definition */
   if (!(dic = hTabItemWithKey (iCodehTab, bitVectFirstBit (OP_DEFS (IC_LEFT (ic))))))
     return;
@@ -2840,6 +2867,12 @@
 
   if (IS_SYMOP (IC_RIGHT (dic)))
     {
+      if (IC_RIGHT (dic)->isvolatile)
+        return;
+
+      if (OP_SYMBOL (IC_RIGHT (dic))->addrtaken || isOperandGlobal (IC_RIGHT (dic)))
+        disallowHiddenAssignment = 1;
+
       /* make sure the right side does not have any definitions
          inbetween */
       dbv = OP_DEFS (IC_RIGHT (dic));
@@ -2847,6 +2880,8 @@
         {
           if (bitVectBitValue (dbv, lic->key))
             return;
+          if (disallowHiddenAssignment && (lic->op == CALL || lic->op == PCALL || POINTER_SET (lic)))
+            return;
         }
       /* make sure they have the same type */
       if (IS_SPEC (operandType (IC_LEFT (ic))))
@@ -2864,8 +2899,10 @@
         }
       bitVectUnSetBit (OP_SYMBOL (IC_RESULT (dic))->defs, dic->key);
     }
+  if (IS_ITEMP (IC_RIGHT (dic)))
+    OP_USES (IC_RIGHT (dic)) = bitVectSetBit (OP_USES (IC_RIGHT (dic)), ic->key);
 
-  /* we now we know that it has one & only one def & use
+  /* now we know that it has one & only one def & use
      and the that the definition is an assignment */
   ReplaceOpWithCheaperOp (&IC_LEFT (ic), IC_RIGHT (dic));
   remiCodeFromeBBlock (ebp, dic);
diff -Nru sdcc-3.1.0+dfsg/src/pic14/Makefile.in sdcc-3.2.0+dfsg/src/pic14/Makefile.in
--- sdcc-3.1.0+dfsg/src/pic14/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic14/Makefile.in	2012-03-30 10:48:18.000000000 +0000
@@ -1,9 +1,7 @@
-VPATH        = @srcdir@
-srcdir       = @srcdir@
-top_builddir = @top_builddir@
-top_srcdir   = @top_srcdir@
+VPATH         = @srcdir@
+srcdir        = @srcdir@
+top_builddir  = @top_builddir@
+top_srcdir    = @top_srcdir@
 
 # Make all in this directory
-PORT	= pic
-
 include $(srcdir)/../port.mk
diff -Nru sdcc-3.1.0+dfsg/src/pic14/gen.c sdcc-3.2.0+dfsg/src/pic14/gen.c
--- sdcc-3.1.0+dfsg/src/pic14/gen.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic14/gen.c	2012-06-28 14:09:28.000000000 +0000
@@ -1,11 +1,12 @@
 /*-------------------------------------------------------------------------
   gen.c - source file for code generation for pic
 
-  Written By -  Sandeep Dutta . sandeep.dutta@usa.net (1998)
-         and -  Jean-Louis VERN.jlvern@writeme.com (1999)
+  Copyright (C) 1998, Sandeep Dutta . sandeep.dutta@usa.net
+  Copyright (C) 1999, Jean-Louis VERN.jlvern@writeme.com
   Bug Fixes  -  Wojciech Stryjewski  wstryj1@tiger.lsu.edu (1999 v2.1.9a)
-  PIC port   -  Scott Dattalo scott@dattalo.com (2000)
-    cont'd   -  Raphael Neider <rneider AT web.de> (2005)
+  PIC port:
+  Copyright (C) 2000, Scott Dattalo scott@dattalo.com
+  Copyright (C) 2005, Raphael Neider <rneider AT web.de>
 
   This program is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by the
@@ -20,15 +21,12 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-  In other words, you are welcome to use, share and improve this program.
-  You are forbidden to forbid anyone else to use, share and improve
-  what you give them.   Help stamp out software-hoarding!
-
+-------------------------------------------------------------------------*/
+/*
   Notes:
   000123 mlh  Moved aopLiteral to SDCCglue.c to help the split
-      Made everything static
--------------------------------------------------------------------------*/
+              Made everything static
+*/
 
 /*
  * This is the down and dirty file with all kinds of
@@ -40,6 +38,7 @@
 #include "device.h"
 #include "gen.h"
 #include "glue.h"
+#include "dbuf_string.h"
 
 /*
  * Imports
@@ -48,9 +47,11 @@
 extern set *externs;
 
 
-static pCodeOp *popGetImmd(char *name, unsigned int offset, int index,int is_func);
-static pCodeOp *popRegFromString(char *str, int size, int offset);
-static int aop_isLitLike(asmop *aop);
+static pCodeOp *popGetImmd (char *name, unsigned int offset, int index, int is_func);
+static pCodeOp *popRegFromString (char *str, int size, int offset);
+static int aop_isLitLike (asmop * aop);
+static void genCritical (iCode * ic);
+static void genEndCritical (iCode * ic);
 
 /* The PIC port(s) need not differentiate between POINTER and FPOINTER. */
 #define PIC_IS_DATA_PTR(x)  (IS_DATA_PTR(x) || IS_FARPTR(x))
@@ -66,34 +67,33 @@
 static int pic14_inISR = 0;
 
 static char *zero = "0x00";
-static char *one  = "0x01";
+static char *one = "0x01";
 static char *spname = "sp";
 
-unsigned fReturnSizePic = 4; /* shared with ralloc.c */
-static char *fReturnpic14[] = {"temp1","temp2","temp3","temp4" };
+unsigned fReturnSizePic = 4;    /* shared with ralloc.c */
+static char *fReturnpic14[] = { "temp1", "temp2", "temp3", "temp4" };
+
 static char **fReturn = fReturnpic14;
 
-static struct {
-    short accInUse;
-    short inLine;
-    short debugLine;
-    short nRegsSaved;
-    set *sendSet;
+static struct
+{
+  short accInUse;
+  short nRegsSaved;
+  set *sendSet;
 } _G;
 
 /*
  * Resolved ifx structure. This structure stores information
  * about an iCode ifx that makes it easier to generate code.
  */
-typedef struct resolvedIfx {
-    symbol *lbl;     /* pointer to a label */
-    int condition;   /* true or false ifx */
-    int generated;   /* set true when the code associated with the ifx
-                      * is generated */
+typedef struct resolvedIfx
+{
+  symbol *lbl;                  /* pointer to a label */
+  int condition;                /* true or false ifx */
+  int generated;                /* set true when the code associated with the ifx
+                                 * is generated */
 } resolvedIfx;
 
-static lineNode *lineHead = NULL;
-static lineNode *lineCurr = NULL;
 static pBlock *pb;
 
 /*-----------------------------------------------------------------*/
@@ -105,186 +105,141 @@
 /*   return y;                                                     */
 /* return -1;                                                      */
 /*-----------------------------------------------------------------*/
-static int my_powof2 (unsigned long num)
+static int
+my_powof2 (unsigned long num)
 {
-    if(num) {
-        if( (num & (num-1)) == 0) {
-            int nshifts = -1;
-            while(num) {
-                num>>=1;
-                nshifts++;
+  if (num)
+    {
+      if ((num & (num - 1)) == 0)
+        {
+          int nshifts = -1;
+          while (num)
+            {
+              num >>= 1;
+              nshifts++;
             }
-            return nshifts;
+          return nshifts;
         }
     }
 
-    return -1;
+  return -1;
 }
 
-void DEBUGpic14_AopType(int line_no, operand *left, operand *right, operand *result)
+void
+DEBUGpic14_AopType (int line_no, operand * left, operand * right, operand * result)
 {
 
-    DEBUGpic14_emitcode ("; ","line = %d result %s=%s, size=%d, left %s=%s, size=%d, right %s=%s, size=%d",
-        line_no,
-        ((result) ? AopType(AOP_TYPE(result)) : "-"),
-        ((result) ? aopGet(AOP(result),0,TRUE,FALSE) : "-"),
-        ((result) ? AOP_SIZE(result) : 0),
-        ((left)   ? AopType(AOP_TYPE(left)) : "-"),
-        ((left)   ? aopGet(AOP(left),0,TRUE,FALSE) : "-"),
-        ((left)   ? AOP_SIZE(left) : 0),
-        ((right)  ? AopType(AOP_TYPE(right)) : "-"),
-        ((right)  ? aopGet(AOP(right),0,FALSE,FALSE) : "-"),
-        ((right)  ? AOP_SIZE(right) : 0));
+  DEBUGpic14_emitcode ("; ", "line = %d result %s=%s, size=%d, left %s=%s, size=%d, right %s=%s, size=%d",
+                       line_no,
+                       ((result) ? AopType (AOP_TYPE (result)) : "-"),
+                       ((result) ? aopGet (AOP (result), 0, TRUE, FALSE) : "-"),
+                       ((result) ? AOP_SIZE (result) : 0),
+                       ((left) ? AopType (AOP_TYPE (left)) : "-"),
+                       ((left) ? aopGet (AOP (left), 0, TRUE, FALSE) : "-"),
+                       ((left) ? AOP_SIZE (left) : 0),
+                       ((right) ? AopType (AOP_TYPE (right)) : "-"),
+                       ((right) ? aopGet (AOP (right), 0, FALSE, FALSE) : "-"), ((right) ? AOP_SIZE (right) : 0));
 
 }
 
-static void DEBUGpic14_AopTypeSign(int line_no, operand *left, operand *right, operand *result)
+static void
+DEBUGpic14_AopTypeSign (int line_no, operand * left, operand * right, operand * result)
 {
 
-    DEBUGpic14_emitcode ("; ","line = %d, signs: result %s=%c, left %s=%c, right %s=%c",
-        line_no,
-        ((result) ? AopType(AOP_TYPE(result)) : "-"),
-        ((result) ? (SPEC_USIGN(operandType(result)) ? 'u' : 's') : '-'),
-        ((left)   ? AopType(AOP_TYPE(left)) : "-"),
-        ((left)   ? (SPEC_USIGN(operandType(left))   ? 'u' : 's') : '-'),
-        ((right)  ? AopType(AOP_TYPE(right)) : "-"),
-        ((right)  ? (SPEC_USIGN(operandType(right))  ? 'u' : 's') : '-'));
+  DEBUGpic14_emitcode ("; ", "line = %d, signs: result %s=%c, left %s=%c, right %s=%c",
+                       line_no,
+                       ((result) ? AopType (AOP_TYPE (result)) : "-"),
+                       ((result) ? (SPEC_USIGN (operandType (result)) ? 'u' : 's') : '-'),
+                         ((left) ? AopType (AOP_TYPE (left)) : "-"),
+                         ((left) ? (SPEC_USIGN (operandType (left)) ? 'u' : 's') : '-'),
+                         ((right) ? AopType (AOP_TYPE (right)) : "-"),
+                         ((right) ? (SPEC_USIGN (operandType (right)) ? 'u' : 's') : '-'));
 
 }
 
-void DEBUGpic14_emitcode (char *inst,char *fmt, ...)
+void
+DEBUGpic14_emitcode (char *inst, char *fmt, ...)
 {
-    va_list ap;
-    char lb[INITIAL_INLINEASM];
-    unsigned char *lbp = (unsigned char *)lb;
-
-    if(!debug_verbose && !options.debug)
-        return;
-
-    va_start(ap,fmt);
+  va_list ap;
 
-    if (inst && *inst) {
-        if (fmt && *fmt)
-            sprintf(lb,"%s\t",inst);
-        else
-            sprintf(lb,"%s",inst);
-        vsprintf(lb+(strlen(lb)),fmt,ap);
-    }  else
-        vsprintf(lb,fmt,ap);
-
-    while (isspace(*lbp)) lbp++;
-
-    if (lbp && *lbp)
-        lineCurr = (lineCurr ?
-        connectLine(lineCurr,newLineNode(lb)) :
-    (lineHead = newLineNode(lb)));
-    lineCurr->isInline = _G.inLine;
-    lineCurr->isDebug  = _G.debugLine;
+  if (!debug_verbose && !options.debug)
+    return;
 
-    addpCode2pBlock(pb,newpCodeCharP(lb));
+  va_start (ap, fmt);
+  va_emitcode (inst, fmt, ap);
+  va_end (ap);
 
-    va_end(ap);
+  addpCode2pBlock (pb, newpCodeCharP (genLine.lineCurr->line));
 }
 
-static void Safe_vsnprintf (char *buf, size_t size, const char *fmt, va_list ap)
+void
+emitpComment (const char *fmt, ...)
 {
-#if defined (HAVE_VSNPRINTF)
-  vsnprintf (buf, size, fmt, ap);
-#elif defined (HAVE_VSPRINTF)
-  vsprintf (buf, size, fmt, ap);
-  if (strlen (buf) >= size)
-  {
-    fprintf (stderr, "Safe_vsnprintf: buffer (size %u) has overflown\n", size);
-  }
-#elif defined (HAVE_SNPRINTF)
-  snprintf (buf, size, "vs(n)printf required");
-#elif defined (HAVE_SRINTF)
-  sprintf (buf, "vs(n)printf required");
-  if (strlen (buf) >= size)
-  {
-    fprintf (stderr, "Safe_vsnprintf: buffer (size %u) has overflown\n", size);
-  }
-#else
-  assert ( !"neither vsnprintf nor vsprintf is present -- unable to proceed" );
-#endif
-}
+  va_list ap;
+  struct dbuf_s dbuf;
+  const char *line;
 
-void emitpComment (const char *fmt, ...)
-{
-  va_list va;
-  char buffer[4096];
+  dbuf_init (&dbuf, INITIAL_INLINEASM);
 
-  va_start (va, fmt);
-  if (pb) {
-    Safe_vsnprintf (buffer, 4096, fmt, va);
-    //fprintf (stderr, "%s\n" ,buffer);
-    addpCode2pBlock (pb, newpCodeCharP (buffer));
-  }
-  va_end (va);
+  dbuf_append_char (&dbuf, ';');
+  va_start (ap, fmt);
+  dbuf_vprintf (&dbuf, fmt, ap);
+  va_end (ap);
+
+  line = dbuf_detach_c_str (&dbuf);
+  emit_raw (line);
+  dbuf_free (line);
+
+  addpCode2pBlock (pb, newpCodeCharP (genLine.lineCurr->line));
 }
 
-void emitpLabel(int key)
+void
+emitpLabel (int key)
 {
-    addpCode2pBlock(pb,newpCodeLabel(NULL,key+100+labelOffset));
+  addpCode2pBlock (pb, newpCodeLabel (NULL, labelKey2num (key + labelOffset)));
 }
 
 /* gen.h defines a macro emitpcode that should be used to call emitpcode
  * as this allows for easy debugging (ever asked the question: where was
  * this instruction geenrated? Here is the answer... */
-void emitpcode_real(PIC_OPCODE poc, pCodeOp *pcop)
+void
+emitpcode_real (PIC_OPCODE poc, pCodeOp * pcop)
 {
-    if(pcop)
-        addpCode2pBlock(pb,newpCode(poc,pcop));
-    else {
-        static int has_warned = 0;
+  if (pcop)
+    addpCode2pBlock (pb, newpCode (poc, pcop));
+  else
+    {
+      static int has_warned = 0;
 
-        DEBUGpic14_emitcode(";","%s  ignoring NULL pcop",__FUNCTION__);
-        if (!has_warned) {
-            has_warned = 1;
-            fprintf( stderr, "WARNING: encountered NULL pcop--this is probably a compiler bug...\n" );
+      DEBUGpic14_emitcode (";", "%s  ignoring NULL pcop", __FUNCTION__);
+      if (!has_warned)
+        {
+          has_warned = 1;
+          fprintf (stderr, "WARNING: encountered NULL pcop--this is probably a compiler bug...\n");
         }
     }
 }
 
-static void emitpcodeNULLop(PIC_OPCODE poc)
+static void
+emitpcodeNULLop (PIC_OPCODE poc)
 {
-    addpCode2pBlock(pb,newpCode(poc,NULL));
+  addpCode2pBlock (pb, newpCode (poc, NULL));
 }
 
 /*-----------------------------------------------------------------*/
 /* pic14_emitcode - writes the code into a file : for now it is simple    */
 /*-----------------------------------------------------------------*/
-void pic14_emitcode (char *inst,char *fmt, ...)
+void
+pic14_emitcode (char *inst, char *fmt, ...)
 {
-    va_list ap;
-    char lb[INITIAL_INLINEASM];
-    char *lbp = lb;
-
-    va_start(ap,fmt);
+  va_list ap;
 
-    if (inst && *inst) {
-        if (fmt && *fmt)
-            sprintf(lb,"%s\t",inst);
-        else
-            sprintf(lb,"%s",inst);
-        vsprintf(lb+(strlen(lb)),fmt,ap);
-    }  else
-        vsprintf(lb,fmt,ap);
-
-    while (isspace(*lbp)) lbp++;
-
-    if (lbp && *lbp)
-        lineCurr = (lineCurr ?
-        connectLine(lineCurr,newLineNode(lb)) :
-    (lineHead = newLineNode(lb)));
-    lineCurr->isInline = _G.inLine;
-    lineCurr->isDebug  = _G.debugLine;
-    lineCurr->isLabel = (lbp[strlen (lbp) - 1] == ':');
-
-    if(debug_verbose)
-        addpCode2pBlock(pb,newpCodeCharP(lb));
+  va_start (ap, fmt);
+  va_emitcode (inst, fmt, ap);
+  va_end (ap);
 
-    va_end(ap);
+  if (debug_verbose)
+    addpCode2pBlock (pb, newpCodeCharP (genLine.lineCurr->line));
 }
 
 /*-----------------------------------------------------------------*/
@@ -292,465 +247,485 @@
 /*   with a debugger symbol                                        */
 /*-----------------------------------------------------------------*/
 void
-pic14_emitDebuggerSymbol (const char * debugSym)
+pic14_emitDebuggerSymbol (const char *debugSym)
 {
-    _G.debugLine = 1;
-    pic14_emitcode ("", ";%s ==.", debugSym);
-    _G.debugLine = 0;
+  genLine.lineElement.isDebug = 1;
+  pic14_emitcode ("", ";%s ==.", debugSym);
+  genLine.lineElement.isDebug = 0;
 }
 
 /*-----------------------------------------------------------------*/
 /* newAsmop - creates a new asmOp                                  */
 /*-----------------------------------------------------------------*/
-static asmop *newAsmop (short type)
+static asmop *
+newAsmop (short type)
 {
-    asmop *aop;
+  asmop *aop;
 
-    aop = Safe_calloc(1,sizeof(asmop));
-    aop->type = type;
-    return aop;
+  aop = Safe_calloc (1, sizeof (asmop));
+  aop->type = type;
+  return aop;
 }
 
 /*-----------------------------------------------------------------*/
 /* resolveIfx - converts an iCode ifx into a form more useful for  */
 /*              generating code                                    */
 /*-----------------------------------------------------------------*/
-static void resolveIfx(resolvedIfx *resIfx, iCode *ifx)
+static void
+resolveIfx (resolvedIfx * resIfx, iCode * ifx)
 {
-    if(!resIfx)
-        return;
+  if (!resIfx)
+    return;
 
-    //  DEBUGpic14_emitcode("; ***","%s %d",__FUNCTION__,__LINE__);
+  //  DEBUGpic14_emitcode("; ***","%s %d",__FUNCTION__,__LINE__);
 
-    resIfx->condition = 1;  /* assume that the ifx is true */
-    resIfx->generated = 0;  /* indicate that the ifx has not been used */
+  resIfx->condition = 1;        /* assume that the ifx is true */
+  resIfx->generated = 0;        /* indicate that the ifx has not been used */
 
-    if(!ifx) {
-        resIfx->lbl = NULL; /* this is wrong: newiTempLabel(NULL);  / * oops, there is no ifx. so create a label */
-    } else {
-        if(IC_TRUE(ifx)) {
-            resIfx->lbl = IC_TRUE(ifx);
-        } else {
-            resIfx->lbl = IC_FALSE(ifx);
-            resIfx->condition = 0;
+  if (!ifx)
+    {
+      resIfx->lbl = NULL;       /* this is wrong: newiTempLabel(NULL);  / * oops, there is no ifx. so create a label */
+    }
+  else
+    {
+      if (IC_TRUE (ifx))
+        {
+          resIfx->lbl = IC_TRUE (ifx);
+        }
+      else
+        {
+          resIfx->lbl = IC_FALSE (ifx);
+          resIfx->condition = 0;
         }
     }
 
-    //  DEBUGpic14_emitcode("; ***","%s lbl->key=%d, (lab offset=%d)",__FUNCTION__,resIfx->lbl->key,labelOffset);
+  //  DEBUGpic14_emitcode("; ***","%s lbl->key=%d, (lab offset=%d)",__FUNCTION__,resIfx->lbl->key,labelOffset);
 
 }
 
 /*-----------------------------------------------------------------*/
 /* aopForSym - for a true symbol                                   */
 /*-----------------------------------------------------------------*/
-static asmop *aopForSym (iCode *ic,symbol *sym,bool result)
+static asmop *
+aopForSym (iCode * ic, symbol * sym, bool result)
 {
-    asmop *aop;
-    memmap *space= SPEC_OCLS(sym->etype);
+  asmop *aop;
+  memmap *space = SPEC_OCLS (sym->etype);
 
-    DEBUGpic14_emitcode("; ***","%s %d",__FUNCTION__,__LINE__);
-    /* if already has one */
-    if (sym->aop)
-        return sym->aop;
+  DEBUGpic14_emitcode ("; ***", "%s %d", __FUNCTION__, __LINE__);
+  /* if already has one */
+  if (sym->aop)
+    return sym->aop;
 
-    //DEBUGpic14_emitcode(";","%d",__LINE__);
-    /* if it is in direct space */
-    if (IN_DIRSPACE(space)) {
-        sym->aop = aop = newAsmop (AOP_DIR);
-        aop->aopu.aop_dir = sym->rname ;
-        aop->size = getSize(sym->type);
-        DEBUGpic14_emitcode(";","%d sym->rname = %s, size = %d",__LINE__,sym->rname,aop->size);
-        return aop;
+  //DEBUGpic14_emitcode(";","%d",__LINE__);
+  /* if it is in direct space */
+  if (IN_DIRSPACE (space))
+    {
+      sym->aop = aop = newAsmop (AOP_DIR);
+      aop->aopu.aop_dir = sym->rname;
+      aop->size = getSize (sym->type);
+      DEBUGpic14_emitcode (";", "%d sym->rname = %s, size = %d", __LINE__, sym->rname, aop->size);
+      return aop;
     }
 
-    /* special case for a function */
-    if (IS_FUNC(sym->type)) {
+  /* special case for a function */
+  if (IS_FUNC (sym->type))
+    {
 
-        sym->aop = aop = newAsmop(AOP_PCODE);
-        aop->aopu.pcop = popGetImmd(sym->rname,0,0,1);
-        PCOI(aop->aopu.pcop)->_const = IN_CODESPACE(space);
-        PCOI(aop->aopu.pcop)->_function = 1;
-        PCOI(aop->aopu.pcop)->index = 0;
-        aop->size = FPTRSIZE;
-        DEBUGpic14_emitcode(";","%d size = %d, name =%s",__LINE__,aop->size,sym->rname);
-        return aop;
+      sym->aop = aop = newAsmop (AOP_PCODE);
+      aop->aopu.pcop = popGetImmd (sym->rname, 0, 0, 1);
+      PCOI (aop->aopu.pcop)->_const = IN_CODESPACE (space);
+      PCOI (aop->aopu.pcop)->_function = 1;
+      PCOI (aop->aopu.pcop)->index = 0;
+      aop->size = FPTRSIZE;
+      DEBUGpic14_emitcode (";", "%d size = %d, name =%s", __LINE__, aop->size, sym->rname);
+      return aop;
     }
 
-    if (IS_ARRAY(sym->type)) {
-        sym->aop = aop = newAsmop(AOP_PCODE);
-        aop->aopu.pcop = popGetImmd(sym->rname,0,0,1);
-        PCOI(aop->aopu.pcop)->_const = IN_CODESPACE(space);
-        PCOI(aop->aopu.pcop)->_function = 0;
-        PCOI(aop->aopu.pcop)->index = 0;
-        aop->size = getSize(sym->etype) * DCL_ELEM(sym->type);
+  if (IS_ARRAY (sym->type))
+    {
+      sym->aop = aop = newAsmop (AOP_PCODE);
+      aop->aopu.pcop = popGetImmd (sym->rname, 0, 0, 1);
+      PCOI (aop->aopu.pcop)->_const = IN_CODESPACE (space);
+      PCOI (aop->aopu.pcop)->_function = 0;
+      PCOI (aop->aopu.pcop)->index = 0;
+      aop->size = getSize (sym->etype) * DCL_ELEM (sym->type);
 
-        DEBUGpic14_emitcode(";","%d size = %d, name =%s",__LINE__,aop->size,sym->rname);
-        return aop;
+      DEBUGpic14_emitcode (";", "%d size = %d, name =%s", __LINE__, aop->size, sym->rname);
+      return aop;
     }
 
-    /* only remaining is far space */
-    /* in which case DPTR gets the address */
-    sym->aop = aop = newAsmop(AOP_PCODE);
+  /* only remaining is far space */
+  /* in which case DPTR gets the address */
+  sym->aop = aop = newAsmop (AOP_PCODE);
 
-    aop->aopu.pcop = popGetImmd(sym->rname,0,0,0);
-    PCOI(aop->aopu.pcop)->_const = IN_CODESPACE(space);
-    PCOI(aop->aopu.pcop)->index = 0;
+  aop->aopu.pcop = popGetImmd (sym->rname, 0, 0, 0);
+  PCOI (aop->aopu.pcop)->_const = IN_CODESPACE (space);
+  PCOI (aop->aopu.pcop)->index = 0;
 
-    DEBUGpic14_emitcode(";","%d: rname %s, val %d, const = %d",
-        __LINE__,sym->rname, 0, PCOI(aop->aopu.pcop)->_const);
+  DEBUGpic14_emitcode (";", "%d: rname %s, val %d, const = %d", __LINE__, sym->rname, 0, PCOI (aop->aopu.pcop)->_const);
 
-    allocDirReg (IC_LEFT(ic));
+  allocDirReg (IC_LEFT (ic));
 
-    aop->size = FPTRSIZE;
+  aop->size = FPTRSIZE;
 
-    /* if it is in code space */
-    if (IN_CODESPACE(space))
-        aop->code = 1;
+  /* if it is in code space */
+  if (IN_CODESPACE (space))
+    aop->code = 1;
 
-    return aop;
+  return aop;
 }
 
 /*-----------------------------------------------------------------*/
 /* aopForRemat - rematerialzes an object                           */
 /*-----------------------------------------------------------------*/
-static asmop *aopForRemat (operand *op) // x symbol *sym)
+static asmop *
+aopForRemat (operand * op)      // x symbol *sym)
 {
-    symbol *sym = OP_SYMBOL(op);
-    iCode *ic = NULL;
-    asmop *aop = newAsmop(AOP_PCODE);
-    int val = 0;
-    int offset = 0;
+  symbol *sym = OP_SYMBOL (op);
+  iCode *ic = NULL;
+  asmop *aop = newAsmop (AOP_PCODE);
+  int val = 0;
 
-    ic = sym->rematiCode;
+  ic = sym->rematiCode;
 
-    DEBUGpic14_emitcode(";","%s %d",__FUNCTION__,__LINE__);
-    if(IS_OP_POINTER(op)) {
-        DEBUGpic14_emitcode(";","%s %d IS_OP_POINTER",__FUNCTION__,__LINE__);
-    }
-    for (;;) {
-        if (ic->op == '+') {
-            val += (int) operandLitValue(IC_RIGHT(ic));
-        } else if (ic->op == '-') {
-            val -= (int) operandLitValue(IC_RIGHT(ic));
-        } else
-            break;
+  DEBUGpic14_emitcode (";", "%s %d", __FUNCTION__, __LINE__);
+  if (IS_OP_POINTER (op))
+    {
+      DEBUGpic14_emitcode (";", "%s %d IS_OP_POINTER", __FUNCTION__, __LINE__);
+    }
+  for (;;)
+    {
+      if (ic->op == '+')
+        {
+          val += (int) operandLitValue (IC_RIGHT (ic));
+        }
+      else if (ic->op == '-')
+        {
+          val -= (int) operandLitValue (IC_RIGHT (ic));
+        }
+      else
+        break;
 
-        ic = OP_SYMBOL(IC_LEFT(ic))->rematiCode;
+      ic = OP_SYMBOL (IC_LEFT (ic))->rematiCode;
     }
 
-    offset = OP_SYMBOL(IC_LEFT(ic))->offset;
-    aop->aopu.pcop = popGetImmd(OP_SYMBOL(IC_LEFT(ic))->rname,0,val,0);
-    PCOI(aop->aopu.pcop)->_const = IS_PTR_CONST(operandType(op));
-    PCOI(aop->aopu.pcop)->index = val;
+  aop->aopu.pcop = popGetImmd (OP_SYMBOL (IC_LEFT (ic))->rname, 0, val, 0);
+  PCOI (aop->aopu.pcop)->_const = IS_PTR_CONST (operandType (op));
+  PCOI (aop->aopu.pcop)->index = val;
 
-    DEBUGpic14_emitcode(";","%d: rname %s, val %d, const = %d",
-        __LINE__,OP_SYMBOL(IC_LEFT(ic))->rname,
-        val, IS_PTR_CONST(operandType(op)));
+  DEBUGpic14_emitcode (";", "%d: rname %s, val %d, const = %d",
+                       __LINE__, OP_SYMBOL (IC_LEFT (ic))->rname, val, IS_PTR_CONST (operandType (op)));
 
-    //  DEBUGpic14_emitcode(";","aop type  %s",AopType(AOP_TYPE(IC_LEFT(ic))));
+  //  DEBUGpic14_emitcode(";","aop type  %s",AopType(AOP_TYPE(IC_LEFT(ic))));
 
-    allocDirReg (IC_LEFT(ic));
+  allocDirReg (IC_LEFT (ic));
 
-    return aop;
+  return aop;
 }
 
-static int aopIdx (asmop *aop, int offset)
+static int
+aopIdx (asmop * aop, int offset)
 {
-    if(!aop)
-        return -1;
+  if (!aop)
+    return -1;
 
-    if(aop->type !=  AOP_REG)
-        return -2;
+  if (aop->type != AOP_REG)
+    return -2;
 
-    return aop->aopu.aop_reg[offset]->rIdx;
+  return aop->aopu.aop_reg[offset]->rIdx;
 
 }
 
 /*-----------------------------------------------------------------*/
 /* regsInCommon - two operands have some registers in common       */
 /*-----------------------------------------------------------------*/
-static bool regsInCommon (operand *op1, operand *op2)
+static bool
+regsInCommon (operand * op1, operand * op2)
 {
-    symbol *sym1, *sym2;
-    int i;
+  symbol *sym1, *sym2;
+  int i;
 
-    /* if they have registers in common */
-    if (!IS_SYMOP(op1) || !IS_SYMOP(op2))
-        return FALSE ;
+  /* if they have registers in common */
+  if (!IS_SYMOP (op1) || !IS_SYMOP (op2))
+    return FALSE;
 
-    sym1 = OP_SYMBOL(op1);
-    sym2 = OP_SYMBOL(op2);
+  sym1 = OP_SYMBOL (op1);
+  sym2 = OP_SYMBOL (op2);
 
-    if (sym1->nRegs == 0 || sym2->nRegs == 0)
-        return FALSE ;
+  if (sym1->nRegs == 0 || sym2->nRegs == 0)
+    return FALSE;
 
-    for (i = 0 ; i < sym1->nRegs ; i++) {
-        int j;
-        if (!sym1->regs[i])
-            continue ;
+  for (i = 0; i < sym1->nRegs; i++)
+    {
+      int j;
+      if (!sym1->regs[i])
+        continue;
 
-        for (j = 0 ; j < sym2->nRegs ;j++ ) {
-            if (!sym2->regs[j])
-                continue ;
+      for (j = 0; j < sym2->nRegs; j++)
+        {
+          if (!sym2->regs[j])
+            continue;
 
-            if (sym2->regs[j] == sym1->regs[i])
-                return TRUE ;
+          if (sym2->regs[j] == sym1->regs[i])
+            return TRUE;
         }
     }
 
-    return FALSE ;
+  return FALSE;
 }
 
 /*-----------------------------------------------------------------*/
 /* operandsEqu - equivalent                                        */
 /*-----------------------------------------------------------------*/
-static bool operandsEqu ( operand *op1, operand *op2)
+static bool
+operandsEqu (operand * op1, operand * op2)
 {
-    symbol *sym1, *sym2;
+  symbol *sym1, *sym2;
+
+  /* if they not symbols */
+  if (!IS_SYMOP (op1) || !IS_SYMOP (op2))
+    return FALSE;
+
+  sym1 = OP_SYMBOL (op1);
+  sym2 = OP_SYMBOL (op2);
+
+  /* if both are itemps & one is spilt
+     and the other is not then false */
+  if (IS_ITEMP (op1) && IS_ITEMP (op2) && sym1->isspilt != sym2->isspilt)
+    return FALSE;
+
+  /* if they are the same */
+  if (sym1 == sym2)
+    return TRUE;
 
-    /* if they not symbols */
-    if (!IS_SYMOP(op1) || !IS_SYMOP(op2))
-        return FALSE;
-
-    sym1 = OP_SYMBOL(op1);
-    sym2 = OP_SYMBOL(op2);
-
-    /* if both are itemps & one is spilt
-    and the other is not then false */
-    if (IS_ITEMP(op1) && IS_ITEMP(op2) &&
-        sym1->isspilt != sym2->isspilt )
-        return FALSE ;
-
-    /* if they are the same */
-    if (sym1 == sym2)
-        return TRUE ;
-
-    if (sym1->rname[0] && sym2->rname[0]
-        && strcmp (sym1->rname, sym2->rname) == 0)
-        return TRUE;
-
-
-    /* if left is a tmp & right is not */
-    if (IS_ITEMP(op1)  &&
-        !IS_ITEMP(op2) &&
-        sym1->isspilt  &&
-        (sym1->usl.spillLoc == sym2))
-        return TRUE;
-
-    if (IS_ITEMP(op2)  &&
-        !IS_ITEMP(op1) &&
-        sym2->isspilt  &&
-        sym1->level > 0 &&
-        (sym2->usl.spillLoc == sym1))
-        return TRUE ;
+  if (sym1->rname[0] && sym2->rname[0] && strcmp (sym1->rname, sym2->rname) == 0)
+    return TRUE;
 
-    return FALSE ;
+
+  /* if left is a tmp & right is not */
+  if (IS_ITEMP (op1) && !IS_ITEMP (op2) && sym1->isspilt && (sym1->usl.spillLoc == sym2))
+    return TRUE;
+
+  if (IS_ITEMP (op2) && !IS_ITEMP (op1) && sym2->isspilt && sym1->level > 0 && (sym2->usl.spillLoc == sym1))
+    return TRUE;
+
+  return FALSE;
 }
 
 /*-----------------------------------------------------------------*/
 /* pic14_sameRegs - two asmops have the same registers             */
 /*-----------------------------------------------------------------*/
-bool pic14_sameRegs (asmop *aop1, asmop *aop2 )
+bool
+pic14_sameRegs (asmop * aop1, asmop * aop2)
 {
-    int i;
+  int i;
 
-    if (aop1 == aop2)
-        return TRUE ;
+  if (aop1 == aop2)
+    return TRUE;
 
-    if (aop1->type != AOP_REG ||
-        aop2->type != AOP_REG )
-        return FALSE ;
-
-    if (aop1->size != aop2->size )
-        return FALSE ;
-
-    for (i = 0 ; i < aop1->size ; i++ )
-        if (aop1->aopu.aop_reg[i] !=
-            aop2->aopu.aop_reg[i] )
-            return FALSE ;
+  if (aop1->type != AOP_REG || aop2->type != AOP_REG)
+    return FALSE;
 
-        return TRUE ;
+  if (aop1->size != aop2->size)
+    return FALSE;
+
+  for (i = 0; i < aop1->size; i++)
+    if (aop1->aopu.aop_reg[i] != aop2->aopu.aop_reg[i])
+      return FALSE;
+
+  return TRUE;
 }
 
 /*-----------------------------------------------------------------*/
 /* aopOp - allocates an asmop for an operand  :                    */
 /*-----------------------------------------------------------------*/
-void aopOp (operand *op, iCode *ic, bool result)
+void
+aopOp (operand * op, iCode * ic, bool result)
 {
-    asmop *aop;
-    symbol *sym;
-    int i;
+  asmop *aop;
+  symbol *sym;
+  int i;
 
-    if (!op)
-        return ;
+  if (!op)
+    return;
 
-    /* if this a literal */
-    if (IS_OP_LITERAL(op)) {
-        op->aop = aop = newAsmop(AOP_LIT);
-        aop->aopu.aop_lit = OP_VALUE (op);
-        aop->size = getSize(operandType(op));
-        return;
+  /* if this a literal */
+  if (IS_OP_LITERAL (op))
+    {
+      op->aop = aop = newAsmop (AOP_LIT);
+      aop->aopu.aop_lit = OP_VALUE (op);
+      aop->size = getSize (operandType (op));
+      return;
     }
 
+  {
+    sym_link *type = operandType (op);
+    if (IS_PTR_CONST (type))
+      DEBUGpic14_emitcode (";", "%d aop type is const pointer", __LINE__);
+  }
+
+  /* if already has a asmop then continue */
+  if (op->aop)
+    return;
+
+  /* if the underlying symbol has a aop */
+  if (IS_SYMOP (op) && OP_SYMBOL (op)->aop)
     {
-        sym_link *type = operandType(op);
-        if(IS_PTR_CONST(type))
-            DEBUGpic14_emitcode(";","%d aop type is const pointer",__LINE__);
+      DEBUGpic14_emitcode (";", "%d", __LINE__);
+      op->aop = OP_SYMBOL (op)->aop;
+      return;
     }
 
-    /* if already has a asmop then continue */
-    if (op->aop)
-        return ;
-
-    /* if the underlying symbol has a aop */
-    if (IS_SYMOP(op) && OP_SYMBOL(op)->aop) {
-        DEBUGpic14_emitcode(";","%d",__LINE__);
-        op->aop = OP_SYMBOL(op)->aop;
-        return;
+  /* if this is a true symbol */
+  if (IS_TRUE_SYMOP (op))
+    {
+      //DEBUGpic14_emitcode(";","%d - true symop",__LINE__);
+      op->aop = aopForSym (ic, OP_SYMBOL (op), result);
+      return;
     }
 
-    /* if this is a true symbol */
-    if (IS_TRUE_SYMOP(op)) {
-        //DEBUGpic14_emitcode(";","%d - true symop",__LINE__);
-        op->aop = aopForSym(ic,OP_SYMBOL(op),result);
-        return ;
-    }
-
-    /* this is a temporary : this has
-    only four choices :
-    a) register
-    b) spillocation
-    c) rematerialize
-    d) conditional
-    e) can be a return use only */
-
-    sym = OP_SYMBOL(op);
-
-
-    /* if the type is a conditional */
-    if (sym->regType == REG_CND) {
-        aop = op->aop = sym->aop = newAsmop(AOP_CRY);
-        aop->size = 0;
-        return;
+  /* this is a temporary : this has
+     only four choices :
+     a) register
+     b) spillocation
+     c) rematerialize
+     d) conditional
+     e) can be a return use only */
+
+  sym = OP_SYMBOL (op);
+
+
+  /* if the type is a conditional */
+  if (sym->regType == REG_CND)
+    {
+      aop = op->aop = sym->aop = newAsmop (AOP_CRY);
+      aop->size = 0;
+      return;
     }
 
-    /* if it is spilt then two situations
-    a) is rematerialize
-    b) has a spill location */
-    if (sym->isspilt || sym->nRegs == 0) {
+  /* if it is spilt then two situations
+     a) is rematerialize
+     b) has a spill location */
+  if (sym->isspilt || sym->nRegs == 0)
+    {
 
-        DEBUGpic14_emitcode(";","%d",__LINE__);
-        /* rematerialize it NOW */
-        if (sym->remat) {
+      DEBUGpic14_emitcode (";", "%d", __LINE__);
+      /* rematerialize it NOW */
+      if (sym->remat)
+        {
 
-            sym->aop = op->aop = aop = aopForRemat (op);
-            aop->size = getSize(sym->type);
-            //DEBUGpic14_emitcode(";"," %d: size %d, %s\n",__LINE__,aop->size,aop->aopu.aop_immd);
-            return;
+          sym->aop = op->aop = aop = aopForRemat (op);
+          aop->size = getSize (sym->type);
+          //DEBUGpic14_emitcode(";"," %d: size %d, %s\n",__LINE__,aop->size,aop->aopu.aop_immd);
+          return;
         }
 
-        if (sym->ruonly ) {
-            if(sym->isptr) {    // && sym->uptr
-                aop = op->aop = sym->aop = newAsmop(AOP_PCODE);
-                aop->aopu.pcop = newpCodeOp(NULL,PO_GPR_POINTER); //popCopyReg(&pc_fsr);
-
-                //PCOI(aop->aopu.pcop)->_const = 0;
-                //PCOI(aop->aopu.pcop)->index = 0;
-                /*
-                DEBUGpic14_emitcode(";","%d: rname %s, val %d, const = %d",
-                __LINE__,sym->rname, 0, PCOI(aop->aopu.pcop)->_const);
-                */
-                //allocDirReg (IC_LEFT(ic));
+      if (sym->ruonly)
+        {
+          if (sym->isptr)       // && sym->uptr
+            {
+              aop = op->aop = sym->aop = newAsmop (AOP_PCODE);
+              aop->aopu.pcop = newpCodeOp (NULL, PO_GPR_POINTER);       //popCopyReg(&pc_fsr);
 
-                aop->size = getSize(sym->type);
-                DEBUGpic14_emitcode(";","%d",__LINE__);
-                return;
+              //PCOI(aop->aopu.pcop)->_const = 0;
+              //PCOI(aop->aopu.pcop)->index = 0;
+              /*
+                 DEBUGpic14_emitcode(";","%d: rname %s, val %d, const = %d",
+                 __LINE__,sym->rname, 0, PCOI(aop->aopu.pcop)->_const);
+               */
+              //allocDirReg (IC_LEFT(ic));
+
+              aop->size = getSize (sym->type);
+              DEBUGpic14_emitcode (";", "%d", __LINE__);
+              return;
 
-            } else {
+            }
+          else
+            {
 
-                unsigned i;
+              unsigned i;
 
-                aop = op->aop = sym->aop = newAsmop(AOP_STR);
-                aop->size = getSize(sym->type);
-                for ( i = 0 ; i < fReturnSizePic ; i++ )
-                    aop->aopu.aop_str[i] = fReturn[i];
+              aop = op->aop = sym->aop = newAsmop (AOP_STR);
+              aop->size = getSize (sym->type);
+              for (i = 0; i < fReturnSizePic; i++)
+                aop->aopu.aop_str[i] = fReturn[i];
 
-                DEBUGpic14_emitcode(";","%d",__LINE__);
-                return;
+              DEBUGpic14_emitcode (";", "%d", __LINE__);
+              return;
             }
         }
 
-        /* else spill location  */
-        if (sym->usl.spillLoc)
+      /* else spill location  */
+      if (sym->usl.spillLoc)
         {
-            asmop *oldAsmOp = NULL;
+          asmop *oldAsmOp = NULL;
 
-            if (getSize(sym->type) != getSize(sym->usl.spillLoc->type))
+          if (getSize (sym->type) != getSize (sym->usl.spillLoc->type))
             {
-                /* force a new aop if sizes differ */
-                oldAsmOp = sym->usl.spillLoc->aop;
-                sym->usl.spillLoc->aop = NULL;
+              /* force a new aop if sizes differ */
+              oldAsmOp = sym->usl.spillLoc->aop;
+              sym->usl.spillLoc->aop = NULL;
             }
-            DEBUGpic14_emitcode(";","%s %d %s sym->rname = %s, offset %d",
-                __FUNCTION__,__LINE__,
-                sym->usl.spillLoc->rname,
-                sym->rname, sym->usl.spillLoc->offset);
+          DEBUGpic14_emitcode (";", "%s %d %s sym->rname = %s, offset %d",
+                               __FUNCTION__, __LINE__, sym->usl.spillLoc->rname, sym->rname, sym->usl.spillLoc->offset);
 
-            sym->aop = op->aop = aop = newAsmop(AOP_PCODE);
-            if (getSize(sym->type) != getSize(sym->usl.spillLoc->type))
+          sym->aop = op->aop = aop = newAsmop (AOP_PCODE);
+          if (getSize (sym->type) != getSize (sym->usl.spillLoc->type))
             {
-                /* Don't reuse the new aop, go with the last one */
-                sym->usl.spillLoc->aop = oldAsmOp;
+              /* Don't reuse the new aop, go with the last one */
+              sym->usl.spillLoc->aop = oldAsmOp;
             }
-            //aop->aopu.pcop = popGetImmd(sym->usl.spillLoc->rname,0,sym->usl.spillLoc->offset);
-            aop->aopu.pcop = popRegFromString(sym->usl.spillLoc->rname,
-                getSize(sym->type),
-                sym->usl.spillLoc->offset);
-            aop->size = getSize(sym->type);
+          //aop->aopu.pcop = popGetImmd(sym->usl.spillLoc->rname,0,sym->usl.spillLoc->offset);
+          aop->aopu.pcop = popRegFromString (sym->usl.spillLoc->rname, getSize (sym->type), sym->usl.spillLoc->offset);
+          aop->size = getSize (sym->type);
 
-            return;
+          return;
         }
     }
 
-    {
-        sym_link *type = operandType(op);
-        if(IS_PTR_CONST(type))
-            DEBUGpic14_emitcode(";","%d aop type is const pointer",__LINE__);
-    }
+  {
+    sym_link *type = operandType (op);
+    if (IS_PTR_CONST (type))
+      DEBUGpic14_emitcode (";", "%d aop type is const pointer", __LINE__);
+  }
 
-    /* must be in a register */
-    DEBUGpic14_emitcode(";","%d register type nRegs=%d",__LINE__,sym->nRegs);
-    sym->aop = op->aop = aop = newAsmop(AOP_REG);
-    aop->size = sym->nRegs;
-    for ( i = 0 ; i < sym->nRegs ;i++)
-        aop->aopu.aop_reg[i] = sym->regs[i];
+  /* must be in a register */
+  DEBUGpic14_emitcode (";", "%d register type nRegs=%d", __LINE__, sym->nRegs);
+  sym->aop = op->aop = aop = newAsmop (AOP_REG);
+  aop->size = sym->nRegs;
+  for (i = 0; i < sym->nRegs; i++)
+    aop->aopu.aop_reg[i] = sym->regs[i];
 }
 
 /*-----------------------------------------------------------------*/
 /* freeAsmop - free up the asmop given to an operand               */
 /*----------------------------------------------------------------*/
-void freeAsmop (operand *op, asmop *aaop, iCode *ic, bool pop)
+void
+freeAsmop (operand * op, asmop * aaop, iCode * ic, bool pop)
 {
-    asmop *aop ;
+  asmop *aop;
 
-    if (!op)
-        aop = aaop;
-    else
-        aop = op->aop;
-
-    if (!aop)
-        return ;
-
-    aop->freed = 1;
-
-    /* all other cases just dealloc */
-    if (op) {
-        op->aop = NULL;
-        if (IS_SYMOP(op)) {
-            OP_SYMBOL(op)->aop = NULL;
-            /* if the symbol has a spill */
-            if (SPIL_LOC(op))
-                SPIL_LOC(op)->aop = NULL;
+  if (!op)
+    aop = aaop;
+  else
+    aop = op->aop;
+
+  if (!aop)
+    return;
+
+  aop->freed = 1;
+
+  /* all other cases just dealloc */
+  if (op)
+    {
+      op->aop = NULL;
+      if (IS_SYMOP (op))
+        {
+          OP_SYMBOL (op)->aop = NULL;
+          /* if the symbol has a spill */
+          if (SPIL_LOC (op))
+            SPIL_LOC (op)->aop = NULL;
         }
     }
 }
@@ -758,560 +733,601 @@
 /*-----------------------------------------------------------------*/
 /* pic14aopLiteral - string from a literal value                   */
 /*-----------------------------------------------------------------*/
-static unsigned int pic14aopLiteral (value *val, int offset)
+static unsigned int
+pic14aopLiteral (value * val, int offset)
 {
-        union {
-                float f;
-                unsigned char c[4];
-        } fl;
+  union
+  {
+    float f;
+    unsigned char c[4];
+  } fl;
 
-        /* if it is a float then it gets tricky */
-        /* otherwise it is fairly simple */
-        if (!IS_FLOAT(val->type)) {
-                unsigned long v = ulFromVal (val);
+  /* if it is a float then it gets tricky */
+  /* otherwise it is fairly simple */
+  if (!IS_FLOAT (val->type))
+    {
+      unsigned long v = ulFromVal (val);
 
-                return ( (v >> (offset * 8)) & 0xff);
-        }
+      return ((v >> (offset * 8)) & 0xff);
+    }
 
-        /* it is type float */
-        fl.f = (float) floatFromVal(val);
+  /* it is type float */
+  fl.f = (float) floatFromVal (val);
 #ifdef WORDS_BIGENDIAN
-        return fl.c[3-offset];
+  return fl.c[3 - offset];
 #else
-        return fl.c[offset];
+  return fl.c[offset];
 #endif
 }
 
 /*-----------------------------------------------------------------*/
 /* aopGet - for fetching value of the aop                          */
 /*-----------------------------------------------------------------*/
-char *aopGet (asmop *aop, int offset, bool bit16, bool dname)
+char *
+aopGet (asmop * aop, int offset, bool bit16, bool dname)
 {
-    char *s = buffer ;
-    char *rs;
+  char *s = buffer;
+  char *rs;
 
-    //DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* offset is greater than
-    size then zero */
-    assert(aop);
-    if (offset > (aop->size - 1) &&
-        aop->type != AOP_LIT)
-        return zero;
+  //DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  /* offset is greater than
+     size then zero */
+  assert (aop);
+  if (offset > (aop->size - 1) && aop->type != AOP_LIT)
+    return zero;
 
-    /* depending on type */
-    switch (aop->type) {
+  /* depending on type */
+  switch (aop->type)
+    {
 
     case AOP_IMMD:
-        if (bit16)
-            sprintf (s,"%s",aop->aopu.aop_immd);
-        else
-            if (offset)
-                sprintf(s,"(%s >> %d)",
-                aop->aopu.aop_immd,
-                offset*8);
-            else
-                sprintf(s,"%s",
-                aop->aopu.aop_immd);
-            DEBUGpic14_emitcode(";","%d immd %s",__LINE__,s);
-            rs = Safe_calloc(1,strlen(s)+1);
-            strcpy(rs,s);
-            return rs;
+      if (bit16)
+        sprintf (s, "%s", aop->aopu.aop_immd);
+      else if (offset)
+        sprintf (s, "(%s >> %d)", aop->aopu.aop_immd, offset * 8);
+      else
+        sprintf (s, "%s", aop->aopu.aop_immd);
+      DEBUGpic14_emitcode (";", "%d immd %s", __LINE__, s);
+      rs = Safe_calloc (1, strlen (s) + 1);
+      strcpy (rs, s);
+      return rs;
 
     case AOP_DIR:
-        if (offset) {
-            sprintf(s,"(%s + %d)",
-                aop->aopu.aop_dir,
-                offset);
-            DEBUGpic14_emitcode(";","oops AOP_DIR did this %s\n",s);
-        } else
-            sprintf(s,"%s",aop->aopu.aop_dir);
-        rs = Safe_calloc(1,strlen(s)+1);
-        strcpy(rs,s);
-        return rs;
+      if (offset)
+        {
+          sprintf (s, "(%s + %d)", aop->aopu.aop_dir, offset);
+          DEBUGpic14_emitcode (";", "oops AOP_DIR did this %s\n", s);
+        }
+      else
+        sprintf (s, "%s", aop->aopu.aop_dir);
+      rs = Safe_calloc (1, strlen (s) + 1);
+      strcpy (rs, s);
+      return rs;
 
     case AOP_REG:
-        //if (dname)
-        //    return aop->aopu.aop_reg[offset]->dname;
-        //else
-        return aop->aopu.aop_reg[offset]->name;
+      //if (dname)
+      //    return aop->aopu.aop_reg[offset]->dname;
+      //else
+      return aop->aopu.aop_reg[offset]->name;
 
     case AOP_CRY:
-        //pic14_emitcode(";","%d",__LINE__);
-        return aop->aopu.aop_dir;
+      //pic14_emitcode(";","%d",__LINE__);
+      return aop->aopu.aop_dir;
 
     case AOP_LIT:
-        sprintf(s, "0x%02x", pic14aopLiteral (aop->aopu.aop_lit, offset));
-        rs = Safe_strdup(s);
-        return rs;
+      sprintf (s, "0x%02x", pic14aopLiteral (aop->aopu.aop_lit, offset));
+      rs = Safe_strdup (s);
+      return rs;
 
     case AOP_STR:
-        aop->coff = offset ;
-        if (strcmp(aop->aopu.aop_str[offset],"a") == 0 &&
-            dname)
-            return "acc";
-        DEBUGpic14_emitcode(";","%d - %s",__LINE__, aop->aopu.aop_str[offset]);
+      aop->coff = offset;
+      if (strcmp (aop->aopu.aop_str[offset], "a") == 0 && dname)
+        return "acc";
+      DEBUGpic14_emitcode (";", "%d - %s", __LINE__, aop->aopu.aop_str[offset]);
 
-        return aop->aopu.aop_str[offset];
+      return aop->aopu.aop_str[offset];
 
     case AOP_PCODE:
+    {
+      pCodeOp *pcop = aop->aopu.pcop;
+      DEBUGpic14_emitcode (";", "%d: aopGet AOP_PCODE type %s", __LINE__, pCodeOpType (pcop));
+      if (pcop->name)
         {
-            pCodeOp *pcop = aop->aopu.pcop;
-            DEBUGpic14_emitcode(";","%d: aopGet AOP_PCODE type %s",__LINE__,pCodeOpType(pcop));
-            if(pcop->name) {
-                if (pcop->type == PO_IMMEDIATE) {
-                    offset += PCOI(pcop)->index;
-                }
-                if (offset) {
-                    DEBUGpic14_emitcode(";","%s offset %d",pcop->name,offset);
-                    sprintf(s,"(%s+%d)", pcop->name,offset);
-                } else {
-                    DEBUGpic14_emitcode(";","%s",pcop->name);
-                    sprintf(s,"%s", pcop->name);
-                }
-            } else
-                sprintf(s,"0x%02x", PCOI(aop->aopu.pcop)->offset);
-
+          if (pcop->type == PO_IMMEDIATE)
+            {
+              offset += PCOI (pcop)->index;
+            }
+          if (offset)
+            {
+              DEBUGpic14_emitcode (";", "%s offset %d", pcop->name, offset);
+              sprintf (s, "(%s+%d)", pcop->name, offset);
+            }
+          else
+            {
+              DEBUGpic14_emitcode (";", "%s", pcop->name);
+              sprintf (s, "%s", pcop->name);
+            }
         }
-        rs = Safe_calloc(1,strlen(s)+1);
-        strcpy(rs,s);
-        return rs;
+      else
+        sprintf (s, "0x%02x", PCOI (aop->aopu.pcop)->offset);
 
-  }
+    }
+    rs = Safe_calloc (1, strlen (s) + 1);
+    strcpy (rs, s);
+    return rs;
+
+    }
 
-  werror(E_INTERNAL_ERROR,__FILE__,__LINE__,
-      "aopget got unsupported aop->type");
-  exit(0);
+  werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "aopget got unsupported aop->type");
+  exit (0);
 }
 
 /*-----------------------------------------------------------------*/
 /* popGetTempReg - create a new temporary pCodeOp                  */
 /*-----------------------------------------------------------------*/
-static pCodeOp *popGetTempReg(void)
+static pCodeOp *
+popGetTempReg (void)
 {
 
-    pCodeOp *pcop;
+  pCodeOp *pcop;
 
-    pcop = newpCodeOp(NULL, PO_GPR_TEMP);
-    if(pcop && pcop->type == PO_GPR_TEMP && PCOR(pcop)->r) {
-        PCOR(pcop)->r->wasUsed=1;
-        PCOR(pcop)->r->isFree=0;
+  pcop = newpCodeOp (NULL, PO_GPR_TEMP);
+  if (pcop && pcop->type == PO_GPR_TEMP && PCOR (pcop)->r)
+    {
+      PCOR (pcop)->r->wasUsed = 1;
+      PCOR (pcop)->r->isFree = 0;
     }
 
-    return pcop;
+  return pcop;
 }
 
 /*-----------------------------------------------------------------*/
 /* popReleaseTempReg - create a new temporary pCodeOp                  */
 /*-----------------------------------------------------------------*/
-static void popReleaseTempReg(pCodeOp *pcop)
+static void
+popReleaseTempReg (pCodeOp * pcop)
 {
 
-    if(pcop && pcop->type == PO_GPR_TEMP && PCOR(pcop)->r)
-        PCOR(pcop)->r->isFree = 1;
+  if (pcop && pcop->type == PO_GPR_TEMP && PCOR (pcop)->r)
+    PCOR (pcop)->r->isFree = 1;
 
 }
 
 /*-----------------------------------------------------------------*/
 /* popGetLabel - create a new pCodeOp of type PO_LABEL             */
 /*-----------------------------------------------------------------*/
-pCodeOp *popGetLabel(unsigned int key)
+pCodeOp *
+popGetLabel (unsigned int key)
 {
 
-    DEBUGpic14_emitcode ("; ***","%s  key=%d, label offset %d",__FUNCTION__,key, labelOffset);
+  DEBUGpic14_emitcode ("; ***", "%s  key=%d, label offset %d", __FUNCTION__, key, labelOffset);
 
-    if(key>(unsigned int)max_key)
-        max_key = key;
+  if (key > (unsigned int) max_key)
+    max_key = key;
 
-    return newpCodeOpLabel(NULL,key+100+labelOffset);
+  return newpCodeOpLabel (NULL, labelKey2num (key + labelOffset));
 }
 
 /*-------------------------------------------------------------------*/
 /* popGetHighLabel - create a new pCodeOp of type PO_LABEL with offset=1 */
 /*-------------------------------------------------------------------*/
-static pCodeOp *popGetHighLabel(unsigned int key)
+static pCodeOp *
+popGetHighLabel (unsigned int key)
 {
-    pCodeOp *pcop;
-    pcop = popGetLabel(key);
-    PCOLAB(pcop)->offset = 1;
-    return pcop;
+  pCodeOp *pcop;
+  pcop = popGetLabel (key);
+  PCOLAB (pcop)->offset = 1;
+  return pcop;
 }
 
 /*-----------------------------------------------------------------*/
 /* popGetLit - asm operator to pcode operator conversion               */
 /*-----------------------------------------------------------------*/
-pCodeOp *popGetLit(unsigned int lit)
+pCodeOp *
+popGetLit (unsigned int lit)
 {
 
-    return newpCodeOpLit((unsigned char)lit);
+  return newpCodeOpLit ((unsigned char) lit);
 }
 
 /*-----------------------------------------------------------------*/
 /* popGetImmd - asm operator to pcode immediate conversion         */
 /*-----------------------------------------------------------------*/
-static pCodeOp *popGetImmd(char *name, unsigned int offset, int index,int is_func)
+static pCodeOp *
+popGetImmd (char *name, unsigned int offset, int index, int is_func)
 {
 
-    return newpCodeOpImmd(name, offset,index, 0, is_func);
+  return newpCodeOpImmd (name, offset, index, 0, is_func);
 }
 
 /*-----------------------------------------------------------------*/
 /* popGetWithString - asm operator to pcode operator conversion            */
 /*-----------------------------------------------------------------*/
-static pCodeOp *popGetWithString(char *str, int isExtern)
+static pCodeOp *
+popGetWithString (char *str, int isExtern)
 {
-    pCodeOp *pcop;
+  pCodeOp *pcop;
 
 
-    if(!str) {
-        fprintf(stderr,"NULL string %s %d\n",__FILE__,__LINE__);
-        exit (1);
+  if (!str)
+    {
+      fprintf (stderr, "NULL string %s %d\n", __FILE__, __LINE__);
+      exit (1);
     }
 
-    pcop = newpCodeOp(str,PO_STR);
-    PCOS(pcop)->isPublic = isExtern ? 1 : 0;
+  pcop = newpCodeOp (str, PO_STR);
+  PCOS (pcop)->isPublic = isExtern ? 1 : 0;
 
-    return pcop;
+  return pcop;
 }
 
-pCodeOp *popGetExternal (char *str, int isReg)
+pCodeOp *
+popGetExternal (char *str, int isReg)
 {
-    pCodeOp *pcop;
+  pCodeOp *pcop;
 
-    if (isReg) {
-        pcop = newpCodeOpRegFromStr(str);
-    } else {
-        pcop = popGetWithString (str, 1);
+  if (isReg)
+    {
+      pcop = newpCodeOpRegFromStr (str);
+    }
+  else
+    {
+      pcop = popGetWithString (str, 1);
     }
 
-    if (str) {
+  if (str)
+    {
       symbol *sym;
 
       for (sym = setFirstItem (externs); sym; sym = setNextItem (externs))
-      {
-        if (!strcmp (str, sym->rname)) break;
-      }
+        {
+          if (!strcmp (str, sym->rname))
+            break;
+        }
 
       if (!sym)
-      {
-        sym = newSymbol(str, 0);
-        strncpy(sym->rname, str, SDCC_NAME_MAX);
-        addSet (&externs, sym);
-      } // if
+        {
+          sym = newSymbol (str, 0);
+          strncpy (sym->rname, str, SDCC_NAME_MAX);
+          addSet (&externs, sym);
+        }                       // if
       sym->used++;
     }
-    return pcop;
+  return pcop;
 }
 
 /*-----------------------------------------------------------------*/
 /* popRegFromString -                                              */
 /*-----------------------------------------------------------------*/
-static pCodeOp *popRegFromString(char *str, int size, int offset)
+static pCodeOp *
+popRegFromString (char *str, int size, int offset)
 {
 
-    pCodeOp *pcop = Safe_calloc(1,sizeof(pCodeOpReg) );
-    pcop->type = PO_DIR;
+  pCodeOp *pcop = Safe_calloc (1, sizeof (pCodeOpReg));
+  pcop->type = PO_DIR;
 
-    DEBUGpic14_emitcode(";","%d",__LINE__);
+  DEBUGpic14_emitcode (";", "%d", __LINE__);
 
-    if(!str)
-        str = "BAD_STRING";
+  if (!str)
+    str = "BAD_STRING";
 
-    pcop->name = Safe_calloc(1,strlen(str)+1);
-    strcpy(pcop->name,str);
+  pcop->name = Safe_calloc (1, strlen (str) + 1);
+  strcpy (pcop->name, str);
 
-    //pcop->name = Safe_strdup( ( (str) ? str : "BAD STRING"));
+  //pcop->name = Safe_strdup( ( (str) ? str : "BAD STRING"));
 
-    PCOR(pcop)->r = dirregWithName(pcop->name);
-    if(PCOR(pcop)->r == NULL) {
-        //fprintf(stderr,"%d - couldn't find %s in allocated registers, size =%d\n",__LINE__,aop->aopu.aop_dir,aop->size);
-        PCOR(pcop)->r = allocRegByName (pcop->name,size);
-        DEBUGpic14_emitcode(";","%d  %s   offset=%d - had to alloc by reg name",__LINE__,pcop->name,offset);
-    } else {
-        DEBUGpic14_emitcode(";","%d  %s   offset=%d",__LINE__,pcop->name,offset);
+  PCOR (pcop)->r = dirregWithName (pcop->name);
+  if (PCOR (pcop)->r == NULL)
+    {
+      //fprintf(stderr,"%d - couldn't find %s in allocated registers, size =%d\n",__LINE__,aop->aopu.aop_dir,aop->size);
+      PCOR (pcop)->r = allocRegByName (pcop->name, size);
+      DEBUGpic14_emitcode (";", "%d  %s   offset=%d - had to alloc by reg name", __LINE__, pcop->name, offset);
+    }
+  else
+    {
+      DEBUGpic14_emitcode (";", "%d  %s   offset=%d", __LINE__, pcop->name, offset);
     }
-    PCOR(pcop)->instance = offset;
+  PCOR (pcop)->instance = offset;
 
-    return pcop;
+  return pcop;
 }
 
 /*-----------------------------------------------------------------*/
 /*-----------------------------------------------------------------*/
-static pCodeOp *popRegFromIdx(int rIdx)
+static pCodeOp *
+popRegFromIdx (int rIdx)
 {
-    pCodeOp *pcop;
+  pCodeOp *pcop;
 
-    DEBUGpic14_emitcode ("; ***","%s,%d  , rIdx=0x%x",
-        __FUNCTION__,__LINE__,rIdx);
+  DEBUGpic14_emitcode ("; ***", "%s,%d  , rIdx=0x%x", __FUNCTION__, __LINE__, rIdx);
 
-    pcop = Safe_calloc(1,sizeof(pCodeOpReg) );
+  pcop = Safe_calloc (1, sizeof (pCodeOpReg));
 
-    PCOR(pcop)->rIdx = rIdx;
-    PCOR(pcop)->r = typeRegWithIdx(rIdx,REG_STK,1);
-    PCOR(pcop)->r->isFree = 0;
-    PCOR(pcop)->r->wasUsed = 1;
+  PCOR (pcop)->rIdx = rIdx;
+  PCOR (pcop)->r = typeRegWithIdx (rIdx, REG_STK, 1);
+  PCOR (pcop)->r->isFree = 0;
+  PCOR (pcop)->r->wasUsed = 1;
 
-    pcop->type = PCOR(pcop)->r->pc_type;
+  pcop->type = PCOR (pcop)->r->pc_type;
 
 
-    return pcop;
+  return pcop;
 }
 
 /*-----------------------------------------------------------------*/
 /* popGet - asm operator to pcode operator conversion              */
 /*-----------------------------------------------------------------*/
-pCodeOp *popGet (asmop *aop, int offset) //, bool bit16, bool dname)
+pCodeOp *
+popGet (asmop * aop, int offset)        //, bool bit16, bool dname)
 {
-    //char *s = buffer ;
-    //char *rs;
+  //char *s = buffer ;
+  //char *rs;
 
-    pCodeOp *pcop;
+  pCodeOp *pcop;
 
-    //DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* offset is greater than
-    size then zero */
+  //DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  /* offset is greater than
+     size then zero */
 
-    assert (aop);
+  assert (aop);
 
 
-    /* XXX: still needed for BIT operands (AOP_CRY) */
-    if (offset > (aop->size - 1) &&
-        aop->type != AOP_LIT &&
-        aop->type != AOP_PCODE)
+  /* XXX: still needed for BIT operands (AOP_CRY) */
+  if (offset > (aop->size - 1) && aop->type != AOP_LIT && aop->type != AOP_PCODE)
     {
-        printf( "%s: (offset[%d] > AOP_SIZE(op)[%d]-1) && AOP_TYPE(op) != AOP_LIT)\n", __FUNCTION__, offset, aop->size);
-        return NULL;  //zero;
+      printf ("%s: (offset[%d] > AOP_SIZE(op)[%d]-1) && AOP_TYPE(op) != AOP_LIT)\n", __FUNCTION__, offset, aop->size);
+      return NULL;              //zero;
     }
 
-    /* depending on type */
-    switch (aop->type) {
+  /* depending on type */
+  switch (aop->type)
+    {
 
     case AOP_IMMD:
-        DEBUGpic14_emitcode(";","%d",__LINE__);
-        return popGetImmd(aop->aopu.aop_immd,offset,0,0);
+      DEBUGpic14_emitcode (";", "%d", __LINE__);
+      return popGetImmd (aop->aopu.aop_immd, offset, 0, 0);
 
     case AOP_DIR:
-        return popRegFromString(aop->aopu.aop_dir, aop->size, offset);
+      return popRegFromString (aop->aopu.aop_dir, aop->size, offset);
 
     case AOP_REG:
-        {
-            int rIdx;
-            assert (offset < aop->size);
-            rIdx = aop->aopu.aop_reg[offset]->rIdx;
-
-            pcop = Safe_calloc(1,sizeof(pCodeOpReg) );
-            PCOR(pcop)->rIdx = rIdx;
-            PCOR(pcop)->r = pic14_regWithIdx(rIdx);
-            PCOR(pcop)->r->wasUsed=1;
-            PCOR(pcop)->r->isFree=0;
-
-            PCOR(pcop)->instance = offset;
-            pcop->type = PCOR(pcop)->r->pc_type;
-            //rs = aop->aopu.aop_reg[offset]->name;
-            DEBUGpic14_emitcode(";","%d rIdx = r0x%X ",__LINE__,rIdx);
-            return pcop;
-        }
+    {
+      int rIdx;
+      assert (offset < aop->size);
+      rIdx = aop->aopu.aop_reg[offset]->rIdx;
+
+      pcop = Safe_calloc (1, sizeof (pCodeOpReg));
+      PCOR (pcop)->rIdx = rIdx;
+      PCOR (pcop)->r = pic14_regWithIdx (rIdx);
+      PCOR (pcop)->r->wasUsed = 1;
+      PCOR (pcop)->r->isFree = 0;
+
+      PCOR (pcop)->instance = offset;
+      pcop->type = PCOR (pcop)->r->pc_type;
+      //rs = aop->aopu.aop_reg[offset]->name;
+      DEBUGpic14_emitcode (";", "%d rIdx = r0x%X ", __LINE__, rIdx);
+      return pcop;
+    }
 
     case AOP_CRY:
-        pcop = newpCodeOpBit(aop->aopu.aop_dir,-1,1);
-        PCOR(pcop)->r = dirregWithName(aop->aopu.aop_dir);
-        //if(PCOR(pcop)->r == NULL)
-        //fprintf(stderr,"%d - couldn't find %s in allocated registers\n",__LINE__,aop->aopu.aop_dir);
-        return pcop;
+      pcop = newpCodeOpBit (aop->aopu.aop_dir, -1, 1);
+      PCOR (pcop)->r = dirregWithName (aop->aopu.aop_dir);
+      //if(PCOR(pcop)->r == NULL)
+      //fprintf(stderr,"%d - couldn't find %s in allocated registers\n",__LINE__,aop->aopu.aop_dir);
+      return pcop;
 
     case AOP_LIT:
-        return newpCodeOpLit(pic14aopLiteral (aop->aopu.aop_lit,offset));
+      return newpCodeOpLit (pic14aopLiteral (aop->aopu.aop_lit, offset));
 
     case AOP_STR:
-        DEBUGpic14_emitcode(";","%d  %s",__LINE__,aop->aopu.aop_str[offset]);
-        return newpCodeOpRegFromStr(aop->aopu.aop_str[offset]);
+      DEBUGpic14_emitcode (";", "%d  %s", __LINE__, aop->aopu.aop_str[offset]);
+      return newpCodeOpRegFromStr (aop->aopu.aop_str[offset]);
 
     case AOP_PCODE:
-        pcop = NULL;
-        DEBUGpic14_emitcode(";","popGet AOP_PCODE (%s + %i) %d %s",pCodeOpType(aop->aopu.pcop), offset,
-            __LINE__,
-            ((aop->aopu.pcop->name)? (aop->aopu.pcop->name) : "no name"));
-        //emitpComment ("popGet; name %s, offset: %i, pcop-type: %s\n", aop->aopu.pcop->name, offset, pCodeOpType (aop->aopu.pcop));
-        switch (aop->aopu.pcop->type)
+      pcop = NULL;
+      DEBUGpic14_emitcode (";", "popGet AOP_PCODE (%s + %i) %d %s", pCodeOpType (aop->aopu.pcop), offset,
+                           __LINE__, ((aop->aopu.pcop->name) ? (aop->aopu.pcop->name) : "no name"));
+      //emitpComment ("popGet; name %s, offset: %i, pcop-type: %s\n", aop->aopu.pcop->name, offset, pCodeOpType (aop->aopu.pcop));
+      switch (aop->aopu.pcop->type)
         {
         case PO_IMMEDIATE:
           pcop = pCodeOpCopy (aop->aopu.pcop);
           /* usually we want to access the memory at "<symbol> + offset" (using ->index),
            * but sometimes we want to access the high byte of the symbol's address (using ->offset) */
-          PCOI(pcop)->index += offset;
+          PCOI (pcop)->index += offset;
           //PCOI(pcop)->offset = 0;
           break;
         case PO_DIR:
           pcop = pCodeOpCopy (aop->aopu.pcop);
-          PCOR(pcop)->instance = offset;
+          PCOR (pcop)->instance = offset;
           break;
         default:
-          assert ( !"unhandled pCode type" );
+          assert (!"unhandled pCode type");
           break;
-        } // switch
-        return pcop;
+        }                       // switch
+      return pcop;
     }
 
-    werror(E_INTERNAL_ERROR,__FILE__,__LINE__,
-        "popGet got unsupported aop->type");
-    exit(0);
+  werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "popGet got unsupported aop->type");
+  exit (0);
 }
 
 /*-----------------------------------------------------------------*/
 /* popGetAddr - access the low/high word of a symbol (immediate)   */
 /*              (for non-PO_IMMEDIATEs this is the same as popGet) */
 /*-----------------------------------------------------------------*/
-pCodeOp *popGetAddr (asmop *aop, int offset, int index)
+pCodeOp *
+popGetAddr (asmop * aop, int offset, int index)
 {
   if (aop->type == AOP_PCODE && aop->aopu.pcop->type == PO_IMMEDIATE)
-  {
-    pCodeOp *pcop = aop->aopu.pcop;
-    assert (offset <= GPTRSIZE);
-
-    /* special case: index >= 2 should return GPOINTER-style values */
-    if (offset == 2)
     {
-      pcop = popGetLit (aop->code ? GPTRTAG_CODE : GPTRTAG_DATA);
+      pCodeOp *pcop = aop->aopu.pcop;
+      assert (offset <= GPTRSIZE);
+
+      /* special case: index >= 2 should return GPOINTER-style values */
+      if (offset == 2)
+        {
+          pcop = popGetLit (aop->code ? GPTRTAG_CODE : GPTRTAG_DATA);
+          return pcop;
+        }
+
+      pcop = pCodeOpCopy (pcop);
+      /* usually we want to access the memory at "<symbol> + offset" (using ->index),
+       * but sometimes we want to access the high byte of the symbol's address (using ->offset) */
+      PCOI (pcop)->offset += offset;
+      PCOI (pcop)->index += index;
+      //fprintf (stderr, "is PO_IMMEDIATE: %s+o%d+i%d (new o%d,i%d)\n", pcop->name,PCOI(pcop)->offset,PCOI(pcop)->index, offset, index);
       return pcop;
     }
-
-    pcop = pCodeOpCopy (pcop);
-    /* usually we want to access the memory at "<symbol> + offset" (using ->index),
-     * but sometimes we want to access the high byte of the symbol's address (using ->offset) */
-    PCOI(pcop)->offset += offset;
-    PCOI(pcop)->index += index;
-    //fprintf (stderr, "is PO_IMMEDIATE: %s+o%d+i%d (new o%d,i%d)\n", pcop->name,PCOI(pcop)->offset,PCOI(pcop)->index, offset, index);
-    return pcop;
-  } else {
-    return popGet (aop, offset + index);
-  }
+  else
+    {
+      return popGet (aop, offset + index);
+    }
 }
 
 /*-----------------------------------------------------------------*/
 /* aopPut - puts a string for a aop                                */
 /*-----------------------------------------------------------------*/
-void aopPut (asmop *aop, char *s, int offset)
+void
+aopPut (asmop * aop, char *s, int offset)
 {
-    char *d = buffer ;
-    symbol *lbl ;
+  char *d = buffer;
+  symbol *lbl;
 
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-    if (aop->size && offset > ( aop->size - 1)) {
-        werror(E_INTERNAL_ERROR,__FILE__,__LINE__,
-            "aopPut got offset > aop->size");
-        exit(0);
+  if (aop->size && offset > (aop->size - 1))
+    {
+      werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "aopPut got offset > aop->size");
+      exit (0);
     }
 
-    /* will assign value to value */
-    /* depending on where it is ofcourse */
-    switch (aop->type) {
+  /* will assign value to value */
+  /* depending on where it is ofcourse */
+  switch (aop->type)
+    {
     case AOP_DIR:
-        if (offset) {
-            sprintf(d,"(%s + %d)",
-                aop->aopu.aop_dir,offset);
-            fprintf(stderr,"oops aopPut:AOP_DIR did this %s\n",s);
-
-        } else
-            sprintf(d,"%s",aop->aopu.aop_dir);
-
-        if (strcmp(d,s)) {
-            DEBUGpic14_emitcode(";","%d",__LINE__);
-            if(strcmp(s,"W"))
-                pic14_emitcode("movf","%s,w",s);
-            pic14_emitcode("movwf","%s",d);
-
-            if(strcmp(s,"W")) {
-                pic14_emitcode(";BUG!? should have this:movf","%s,w   %d",s,__LINE__);
-                if(offset >= aop->size) {
-                    emitpcode(POC_CLRF,popGet(aop,offset));
-                    break;
-                } else {
-                    emitpcode(POC_MOVFW, popGetImmd(s,0,offset,0));
+      if (offset)
+        {
+          sprintf (d, "(%s + %d)", aop->aopu.aop_dir, offset);
+          fprintf (stderr, "oops aopPut:AOP_DIR did this %s\n", s);
+
+        }
+      else
+        sprintf (d, "%s", aop->aopu.aop_dir);
+
+      if (strcmp (d, s))
+        {
+          DEBUGpic14_emitcode (";", "%d", __LINE__);
+          if (strcmp (s, "W"))
+            pic14_emitcode ("movf", "%s,w", s);
+          pic14_emitcode ("movwf", "%s", d);
+
+          if (strcmp (s, "W"))
+            {
+              pic14_emitcode (";BUG!? should have this:movf", "%s,w   %d", s, __LINE__);
+              if (offset >= aop->size)
+                {
+                  emitpcode (POC_CLRF, popGet (aop, offset));
+                  break;
+                }
+              else
+                {
+                  emitpcode (POC_MOVFW, popGetImmd (s, 0, offset, 0));
                 }
             }
-            emitpcode(POC_MOVWF,popGet(aop,offset));
+          emitpcode (POC_MOVWF, popGet (aop, offset));
 
         }
-        break;
+      break;
 
     case AOP_REG:
-        if (strcmp(aop->aopu.aop_reg[offset]->name,s) != 0) {
-            if(strcmp(s,"W")==0 )
-                pic14_emitcode("movf","%s,w  ; %d",s,__LINE__);
-
-            pic14_emitcode("movwf","%s",
-                aop->aopu.aop_reg[offset]->name);
-
-            if(strcmp(s,zero)==0) {
-                emitpcode(POC_CLRF,popGet(aop,offset));
-
-            } else if(strcmp(s,"W")==0) {
-                pCodeOp *pcop = Safe_calloc(1,sizeof(pCodeOpReg) );
-                pcop->type = PO_GPR_REGISTER;
-
-                PCOR(pcop)->rIdx = -1;
-                PCOR(pcop)->r = NULL;
-
-                DEBUGpic14_emitcode(";","%d",__LINE__);
-                pcop->name = Safe_strdup(s);
-                emitpcode(POC_MOVFW,pcop);
-                emitpcode(POC_MOVWF,popGet(aop,offset));
-            } else if(strcmp(s,one)==0) {
-                emitpcode(POC_CLRF,popGet(aop,offset));
-                emitpcode(POC_INCF,popGet(aop,offset));
-            } else {
-                emitpcode(POC_MOVWF,popGet(aop,offset));
+      if (strcmp (aop->aopu.aop_reg[offset]->name, s) != 0)
+        {
+          if (strcmp (s, "W") == 0)
+            pic14_emitcode ("movf", "%s,w  ; %d", s, __LINE__);
+
+          pic14_emitcode ("movwf", "%s", aop->aopu.aop_reg[offset]->name);
+
+          if (strcmp (s, zero) == 0)
+            {
+              emitpcode (POC_CLRF, popGet (aop, offset));
+
+            }
+          else if (strcmp (s, "W") == 0)
+            {
+              pCodeOp *pcop = Safe_calloc (1, sizeof (pCodeOpReg));
+              pcop->type = PO_GPR_REGISTER;
+
+              PCOR (pcop)->rIdx = -1;
+              PCOR (pcop)->r = NULL;
+
+              DEBUGpic14_emitcode (";", "%d", __LINE__);
+              pcop->name = Safe_strdup (s);
+              emitpcode (POC_MOVFW, pcop);
+              emitpcode (POC_MOVWF, popGet (aop, offset));
+            }
+          else if (strcmp (s, one) == 0)
+            {
+              emitpcode (POC_CLRF, popGet (aop, offset));
+              emitpcode (POC_INCF, popGet (aop, offset));
+            }
+          else
+            {
+              emitpcode (POC_MOVWF, popGet (aop, offset));
             }
         }
-        break;
+      break;
 
     case AOP_STK:
-        if (strcmp(s,"a") == 0)
-            pic14_emitcode("push","acc");
-        else
-            pic14_emitcode("push","%s",s);
+      if (strcmp (s, "a") == 0)
+        pic14_emitcode ("push", "acc");
+      else
+        pic14_emitcode ("push", "%s", s);
 
-        break;
+      break;
 
     case AOP_CRY:
-        /* if bit variable */
-        if (!aop->aopu.aop_dir) {
-            pic14_emitcode("clr","a");
-            pic14_emitcode("rlc","a");
-        } else {
-            if (s == zero)
-                pic14_emitcode("clr","%s",aop->aopu.aop_dir);
-            else
-                if (s == one)
-                    pic14_emitcode("setb","%s",aop->aopu.aop_dir);
-                else
-                    if (!strcmp(s,"c"))
-                        pic14_emitcode("mov","%s,c",aop->aopu.aop_dir);
-                    else {
-                        lbl = newiTempLabel(NULL);
+      /* if bit variable */
+      if (!aop->aopu.aop_dir)
+        {
+          pic14_emitcode ("clr", "a");
+          pic14_emitcode ("rlc", "a");
+        }
+      else
+        {
+          if (s == zero)
+            pic14_emitcode ("clr", "%s", aop->aopu.aop_dir);
+          else if (s == one)
+            pic14_emitcode ("setb", "%s", aop->aopu.aop_dir);
+          else if (!strcmp (s, "c"))
+            pic14_emitcode ("mov", "%s,c", aop->aopu.aop_dir);
+          else
+            {
+              lbl = newiTempLabel (NULL);
 
-                        if (strcmp(s,"a")) {
-                            MOVA(s);
-                        }
-                        pic14_emitcode("clr","c");
-                        pic14_emitcode("jz","%05d_DS_",lbl->key+100);
-                        pic14_emitcode("cpl","c");
-                        pic14_emitcode("","%05d_DS_:",lbl->key+100);
-                        pic14_emitcode("mov","%s,c",aop->aopu.aop_dir);
-                    }
+              if (strcmp (s, "a"))
+                {
+                  MOVA (s);
+                }
+              pic14_emitcode ("clr", "c");
+              pic14_emitcode ("jz", "%05d_DS_", labelKey2num (lbl->key));
+              pic14_emitcode ("cpl", "c");
+              pic14_emitcode ("", "%05d_DS_:", labelKey2num (lbl->key));
+              pic14_emitcode ("mov", "%s,c", aop->aopu.aop_dir);
+            }
         }
-        break;
+      break;
 
     case AOP_STR:
-        aop->coff = offset;
-        if (strcmp(aop->aopu.aop_str[offset],s))
-            pic14_emitcode ("mov","%s,%s ; %d",aop->aopu.aop_str[offset],s,__LINE__);
-        break;
+      aop->coff = offset;
+      if (strcmp (aop->aopu.aop_str[offset], s))
+        pic14_emitcode ("mov", "%s,%s ; %d", aop->aopu.aop_str[offset], s, __LINE__);
+      break;
 
-    default :
-        werror(E_INTERNAL_ERROR,__FILE__,__LINE__,
-            "aopPut got unsupported aop->type");
-        exit(0);
+    default:
+      werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "aopPut got unsupported aop->type");
+      exit (0);
     }
 
 }
@@ -1319,28 +1335,34 @@
 /*-----------------------------------------------------------------*/
 /* mov2w_op - generate either a MOVLW or MOVFW based operand type  */
 /*-----------------------------------------------------------------*/
-static void mov2w_op (operand *op, int offset)
+static void
+mov2w_op (operand * op, int offset)
 {
-    assert (op);
-    FENTRY;
+  assert (op);
+  FENTRY;
 
-    /* for PO_IMMEDIATEs: use address or value? */
-    if (op_isLitLike (op))
+  /* for PO_IMMEDIATEs: use address or value? */
+  if (op_isLitLike (op))
     {
-        /* access address of op */
-        if (AOP_TYPE(op) != AOP_LIT) { assert (offset < 3); }
-        if (IS_SYMOP(op) && IS_GENPTR(OP_SYM_TYPE(op)) && AOP_SIZE(op) < offset)
+      /* access address of op */
+      if (AOP_TYPE (op) != AOP_LIT)
         {
-            if (offset == GPTRSIZE-1)
-                emitpcode (POC_MOVLW, popGetLit (GPTRTAG_DATA));
-            else
-                emitpcode (POC_MOVLW, popGetLit (0));
+          assert (offset < 3);
         }
-        else
-            emitpcode (POC_MOVLW, popGetAddr(AOP(op), offset, 0));
-    } else {
-        /* access value stored in op */
-        mov2w (AOP(op), offset);
+      if (IS_SYMOP (op) && IS_GENPTR (OP_SYM_TYPE (op)) && AOP_SIZE (op) < offset)
+        {
+          if (offset == GPTRSIZE - 1)
+            emitpcode (POC_MOVLW, popGetLit (GPTRTAG_DATA));
+          else
+            emitpcode (POC_MOVLW, popGetLit (0));
+        }
+      else
+        emitpcode (POC_MOVLW, popGetAddr (AOP (op), offset, 0));
+    }
+  else
+    {
+      /* access value stored in op */
+      mov2w (AOP (op), offset);
     }
 }
 
@@ -1348,104 +1370,115 @@
 /*-----------------------------------------------------------------*/
 /* mov2w - generate either a MOVLW or MOVFW based operand type     */
 /*-----------------------------------------------------------------*/
-void mov2w (asmop *aop, int offset)
+void
+mov2w (asmop * aop, int offset)
 {
 
-    if(!aop)
-        return;
+  if (!aop)
+    return;
 
-    DEBUGpic14_emitcode ("; ***","%s  %d  offset=%d",__FUNCTION__,__LINE__,offset);
+  DEBUGpic14_emitcode ("; ***", "%s  %d  offset=%d", __FUNCTION__, __LINE__, offset);
 
-    if ( aop_isLitLike (aop) )
-        emitpcode(POC_MOVLW,popGetAddr(aop,offset,0));
-    else
-        emitpcode(POC_MOVFW,popGet(aop,offset));
+  if (aop_isLitLike (aop))
+    emitpcode (POC_MOVLW, popGetAddr (aop, offset, 0));
+  else
+    emitpcode (POC_MOVFW, popGet (aop, offset));
 
 }
 
-static void movwf (asmop *op, int offset)
+static void
+movwf (asmop * op, int offset)
 {
-    emitpcode (POC_MOVWF, popGet(op, offset));
+  emitpcode (POC_MOVWF, popGet (op, offset));
 }
 
-static pCodeOp *get_argument_pcop (int idx)
+static pCodeOp *
+get_argument_pcop (int idx)
 {
-    assert (idx > 0 && "the 0th (first) argument is passed via WREG");
-    return popRegFromIdx (Gstack_base_addr - (idx - 1));
+  assert (idx > 0 && "the 0th (first) argument is passed via WREG");
+  return popRegFromIdx (Gstack_base_addr - (idx - 1));
 }
 
-static pCodeOp *get_return_val_pcop (int offset)
+static pCodeOp *
+get_return_val_pcop (int offset)
 {
-    assert (offset > 0 && "the most significant byte is returned via WREG");
-    return popRegFromIdx (Gstack_base_addr - (offset - 1));
+  assert (offset > 0 && "the most significant byte is returned via WREG");
+  return popRegFromIdx (Gstack_base_addr - (offset - 1));
 }
 
-static void pass_argument (operand *op, int offset, int idx)
+static void
+pass_argument (operand * op, int offset, int idx)
 {
-    if (op)
-        mov2w_op (op, offset);
-    if (idx != 0)
-        emitpcode(POC_MOVWF, get_argument_pcop (idx));
+  if (op)
+    mov2w_op (op, offset);
+  if (idx != 0)
+    emitpcode (POC_MOVWF, get_argument_pcop (idx));
 }
 
-static void get_returnvalue (operand *op, int offset, int idx)
+static void
+get_returnvalue (operand * op, int offset, int idx)
 {
-    if (idx != 0)
-        emitpcode(POC_MOVFW, get_return_val_pcop (idx));
-    movwf(AOP(op), offset);
+  if (idx != 0)
+    emitpcode (POC_MOVFW, get_return_val_pcop (idx));
+  movwf (AOP (op), offset);
 }
 
-static void call_libraryfunc (char *name)
+static void
+call_libraryfunc (char *name)
 {
-    symbol *sym;
+  symbol *sym;
 
-    /* library code might reside in different page... */
-    emitpcode (POC_PAGESEL, popGetWithString (name, 1));
-    /* call the library function */
-    emitpcode (POC_CALL, popGetExternal (name, 0));
-    /* might return from different page... */
-    emitpcode (POC_PAGESEL, popGetWithString ("$", 0));
-
-    /* create symbol, mark it as `extern' */
-    sym = findSym(SymbolTab, NULL, name);
-    if (!sym) {
-    sym = newSymbol(name, 0);
-    strncpy(sym->rname, name, SDCC_NAME_MAX);
-    addSym(SymbolTab, sym, sym->rname, 0, 0, 0);
-    addSet(&externs, sym);
-    } // if
-    sym->used++;
+  /* library code might reside in different page... */
+  emitpcode (POC_PAGESEL, popGetWithString (name, 1));
+  /* call the library function */
+  emitpcode (POC_CALL, popGetExternal (name, 0));
+  /* might return from different page... */
+  emitpcode (POC_PAGESEL, popGetWithString ("$", 0));
+
+  /* create symbol, mark it as `extern' */
+  sym = findSym (SymbolTab, NULL, name);
+  if (!sym)
+    {
+      sym = newSymbol (name, 0);
+      strncpy (sym->rname, name, SDCC_NAME_MAX);
+      addSym (SymbolTab, sym, sym->rname, 0, 0, 0);
+      addSet (&externs, sym);
+    }                           // if
+  sym->used++;
 }
 
 /*-----------------------------------------------------------------*/
 /* pic14_getDataSize - get the operand data size                   */
 /*-----------------------------------------------------------------*/
-int pic14_getDataSize(operand *op)
+int
+pic14_getDataSize (operand * op)
 {
-    int size;
+  int size;
 
-    size = AOP_SIZE(op);
-    return size;
+  size = AOP_SIZE (op);
+  return size;
 }
 
 /*-----------------------------------------------------------------*/
 /* pic14_outAcc - output Acc                                       */
 /*-----------------------------------------------------------------*/
-void pic14_outAcc(operand *result)
+void
+pic14_outAcc (operand * result)
 {
-    int size,offset;
-    DEBUGpic14_emitcode ("; ***","%s  %d - ",__FUNCTION__,__LINE__);
-    DEBUGpic14_AopType(__LINE__,NULL,NULL,result);
+  int size, offset;
+  DEBUGpic14_emitcode ("; ***", "%s  %d - ", __FUNCTION__, __LINE__);
+  DEBUGpic14_AopType (__LINE__, NULL, NULL, result);
 
 
-    size = pic14_getDataSize(result);
-    if(size){
-        emitpcode(POC_MOVWF,popGet(AOP(result),0));
-        size--;
-        offset = 1;
-        /* unsigned or positive */
-        while(size--)
-            emitpcode(POC_CLRF,popGet(AOP(result),offset++));
+  size = pic14_getDataSize (result);
+  if (size)
+    {
+      emitpcode (POC_MOVWF, popGet (AOP (result), 0));
+      size--;
+      offset = 1;
+      /* unsigned or positive */
+      while (size--)
+        emitpcode (POC_CLRF, popGet (AOP (result), offset++));
     }
 
 }
@@ -1453,358 +1486,387 @@
 /*-----------------------------------------------------------------*/
 /* pic14_outBitC - output a bit C                                  */
 /*-----------------------------------------------------------------*/
-static void pic14_outBitC(operand *result)
+static void
+pic14_outBitC (operand * result)
 {
 
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* if the result is bit */
-    if (AOP_TYPE(result) == AOP_CRY)
-        aopPut(AOP(result),"c",0);
-    else {
-        pic14_emitcode("clr","a  ; %d", __LINE__);
-        pic14_emitcode("rlc","a");
-        pic14_outAcc(result);
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  /* if the result is bit */
+  if (AOP_TYPE (result) == AOP_CRY)
+    aopPut (AOP (result), "c", 0);
+  else
+    {
+      pic14_emitcode ("clr", "a  ; %d", __LINE__);
+      pic14_emitcode ("rlc", "a");
+      pic14_outAcc (result);
     }
 }
 
 /*-----------------------------------------------------------------*/
 /* pic14_toBoolean - emit code for orl a,operator(sizeop)          */
 /*-----------------------------------------------------------------*/
-static void pic14_toBoolean(operand *oper)
+static void
+pic14_toBoolean (operand * oper)
 {
-    int size = AOP_SIZE(oper);
-    int offset = 0;
+  int size = AOP_SIZE (oper);
+  int offset = 0;
 
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-    assert (size > 0);
+  assert (size > 0);
 
-    if (size == 1) {
-        /* MOVFW does not load the flags... */
-        emitpcode(POC_MOVLW, popGetLit(0));
-        offset = 0;
-    } else {
-        emitpcode(POC_MOVFW,popGet(AOP(oper),0));
-        offset = 1;
+  if (size == 1)
+    {
+      /* MOVFW does not load the flags... */
+      emitpcode (POC_MOVLW, popGetLit (0));
+      offset = 0;
+    }
+  else
+    {
+      emitpcode (POC_MOVFW, popGet (AOP (oper), 0));
+      offset = 1;
     }
 
-    while (offset < size) {
-        emitpcode(POC_IORFW, popGet(AOP(oper),offset++));
+  while (offset < size)
+    {
+      emitpcode (POC_IORFW, popGet (AOP (oper), offset++));
     }
-    /* Z is set iff (oper == 0) */
+  /* Z is set iff (oper == 0) */
 }
 
 
 /*-----------------------------------------------------------------*/
 /* genNot - generate code for ! operation                          */
 /*-----------------------------------------------------------------*/
-static void genNot (iCode *ic)
+static void
+genNot (iCode * ic)
 {
-    //symbol *tlbl;
-    int size;
+  //symbol *tlbl;
+  int size;
 
-    FENTRY;
+  FENTRY;
 
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* assign asmOps to operand & result */
-    aopOp (IC_LEFT(ic),ic,FALSE);
-    aopOp (IC_RESULT(ic),ic,TRUE);
-
-    DEBUGpic14_AopType(__LINE__,IC_LEFT(ic),NULL,IC_RESULT(ic));
-    /* if in bit space then a special case */
-    if (AOP_TYPE(IC_LEFT(ic)) == AOP_CRY) {
-        if (AOP_TYPE(IC_RESULT(ic)) == AOP_CRY) {
-            emitpcode(POC_MOVLW,popGet(AOP(IC_LEFT(ic)),0));
-            emitpcode(POC_XORWF,popGet(AOP(IC_RESULT(ic)),0));
-        } else {
-            emitpcode(POC_CLRF,popGet(AOP(IC_RESULT(ic)),0));
-            emitpcode(POC_BTFSS,popGet(AOP(IC_LEFT(ic)),0));
-            emitpcode(POC_INCF,popGet(AOP(IC_RESULT(ic)),0));
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  /* assign asmOps to operand & result */
+  aopOp (IC_LEFT (ic), ic, FALSE);
+  aopOp (IC_RESULT (ic), ic, TRUE);
+
+  DEBUGpic14_AopType (__LINE__, IC_LEFT (ic), NULL, IC_RESULT (ic));
+  /* if in bit space then a special case */
+  if (AOP_TYPE (IC_LEFT (ic)) == AOP_CRY)
+    {
+      if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY)
+        {
+          emitpcode (POC_MOVLW, popGet (AOP (IC_LEFT (ic)), 0));
+          emitpcode (POC_XORWF, popGet (AOP (IC_RESULT (ic)), 0));
         }
-        goto release;
+      else
+        {
+          emitpcode (POC_CLRF, popGet (AOP (IC_RESULT (ic)), 0));
+          emitpcode (POC_BTFSS, popGet (AOP (IC_LEFT (ic)), 0));
+          emitpcode (POC_INCF, popGet (AOP (IC_RESULT (ic)), 0));
+        }
+      goto release;
     }
 
-    size = AOP_SIZE(IC_LEFT(ic));
-    mov2w (AOP(IC_LEFT(ic)),0);
-    while (--size > 0)
+  size = AOP_SIZE (IC_LEFT (ic));
+  mov2w (AOP (IC_LEFT (ic)), 0);
+  while (--size > 0)
     {
-      if (op_isLitLike (IC_LEFT(ic)))
-        emitpcode (POC_IORLW, popGetAddr (AOP(IC_LEFT(ic)), size, 0));
+      if (op_isLitLike (IC_LEFT (ic)))
+        emitpcode (POC_IORLW, popGetAddr (AOP (IC_LEFT (ic)), size, 0));
       else
-        emitpcode (POC_IORFW, popGet (AOP(IC_LEFT(ic)), size));
+        emitpcode (POC_IORFW, popGet (AOP (IC_LEFT (ic)), size));
     }
-    emitpcode(POC_MOVLW, popGetLit (0));
-    emitSKPNZ;
-    emitpcode(POC_MOVLW, popGetLit (1));
-    movwf(AOP(IC_RESULT(ic)), 0);
+  emitpcode (POC_MOVLW, popGetLit (0));
+  emitSKPNZ;
+  emitpcode (POC_MOVLW, popGetLit (1));
+  movwf (AOP (IC_RESULT (ic)), 0);
 
-    for (size = 1; size < AOP_SIZE(IC_RESULT(ic)); size++)
+  for (size = 1; size < AOP_SIZE (IC_RESULT (ic)); size++)
     {
-      emitpcode(POC_CLRF, popGet (AOP(IC_RESULT(ic)), size));
+      emitpcode (POC_CLRF, popGet (AOP (IC_RESULT (ic)), size));
     }
-    goto release;
+  goto release;
 
 release:
-    /* release the aops */
-    freeAsmop(IC_LEFT(ic),NULL,ic,(RESULTONSTACK(ic) ? 0 : 1));
-    freeAsmop(IC_RESULT(ic),NULL,ic,TRUE);
+  /* release the aops */
+  freeAsmop (IC_LEFT (ic), NULL, ic, (RESULTONSTACK (ic) ? 0 : 1));
+  freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
 }
 
 
 /*-----------------------------------------------------------------*/
 /* genCpl - generate code for complement                           */
 /*-----------------------------------------------------------------*/
-static void genCpl (iCode *ic)
+static void
+genCpl (iCode * ic)
 {
-    operand *left, *result;
-    int size, offset=0;
+  operand *left, *result;
+  int size, offset = 0;
 
-    FENTRY;
+  FENTRY;
 
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    aopOp((left = IC_LEFT(ic)),ic,FALSE);
-    aopOp((result=IC_RESULT(ic)),ic,TRUE);
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  aopOp ((left = IC_LEFT (ic)), ic, FALSE);
+  aopOp ((result = IC_RESULT (ic)), ic, TRUE);
 
-    /* if both are in bit space then
-    a special case */
-    if (AOP_TYPE(result) == AOP_CRY &&
-        AOP_TYPE(left) == AOP_CRY ) {
+  /* if both are in bit space then
+     a special case */
+  if (AOP_TYPE (result) == AOP_CRY && AOP_TYPE (left) == AOP_CRY)
+    {
 
-        pic14_emitcode("mov","c,%s",left->aop->aopu.aop_dir);
-        pic14_emitcode("cpl","c");
-        pic14_emitcode("mov","%s,c",result->aop->aopu.aop_dir);
-        goto release;
+      pic14_emitcode ("mov", "c,%s", left->aop->aopu.aop_dir);
+      pic14_emitcode ("cpl", "c");
+      pic14_emitcode ("mov", "%s,c", result->aop->aopu.aop_dir);
+      goto release;
     }
 
-    size = AOP_SIZE(result);
-    if (AOP_SIZE(left) < size) size = AOP_SIZE(left);
-    while (size--) {
-        emitpcode(POC_COMFW,popGet(AOP(left),offset));
-        emitpcode(POC_MOVWF,popGet(AOP(result),offset));
-        offset++;
+  size = AOP_SIZE (result);
+  if (AOP_SIZE (left) < size)
+    size = AOP_SIZE (left);
+  while (size--)
+    {
+      emitpcode (POC_COMFW, popGet (AOP (left), offset));
+      emitpcode (POC_MOVWF, popGet (AOP (result), offset));
+      offset++;
     }
-    addSign (result, AOP_SIZE(left), !SPEC_USIGN(operandType(result)));
+  addSign (result, AOP_SIZE (left), !SPEC_USIGN (operandType (result)));
 
 
 release:
-    /* release the aops */
-    freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? 0 : 1));
-    freeAsmop(result,NULL,ic,TRUE);
+  /* release the aops */
+  freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? 0 : 1));
+  freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genUminusFloat - unary minus for floating points                */
 /*-----------------------------------------------------------------*/
 static void
-genUminusFloat(operand *op, operand *result)
+genUminusFloat (operand * op, operand * result)
 {
   int size;
 
   FENTRY;
 
-  DEBUGpic14_emitcode("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
   /* for this we just need to flip the
      first it then copy the rest in place */
-  size = AOP_SIZE(op) - 1;
+  size = AOP_SIZE (op) - 1;
 
-  mov2w_op(op, size);
-  emitpcode(POC_XORLW, popGetLit(0x80));
-  movwf(AOP(result), size);
+  mov2w_op (op, size);
+  emitpcode (POC_XORLW, popGetLit (0x80));
+  movwf (AOP (result), size);
 
   while (size--)
     {
-      mov2w_op(op, size);
-      movwf(AOP(result), size);
-    } // while
+      mov2w_op (op, size);
+      movwf (AOP (result), size);
+    }                           // while
 }
 
 /*-----------------------------------------------------------------*/
 /* genUminus - unary minus code generation                         */
 /*-----------------------------------------------------------------*/
-static void genUminus (iCode *ic)
+static void
+genUminus (iCode * ic)
 {
-    int size, i;
-    sym_link *optype, *rtype;
+  int size, i;
+  sym_link *optype;
+
+  FENTRY;
 
-    FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  /* assign asmops */
+  aopOp (IC_LEFT (ic), ic, FALSE);
+  aopOp (IC_RESULT (ic), ic, TRUE);
+
+  /* if both in bit space then special
+     case */
+  if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY && AOP_TYPE (IC_LEFT (ic)) == AOP_CRY)
+    {
 
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* assign asmops */
-    aopOp(IC_LEFT(ic),ic,FALSE);
-    aopOp(IC_RESULT(ic),ic,TRUE);
-
-    /* if both in bit space then special
-    case */
-    if (AOP_TYPE(IC_RESULT(ic)) == AOP_CRY &&
-        AOP_TYPE(IC_LEFT(ic)) == AOP_CRY ) {
-
-        emitpcode(POC_BCF,   popGet(AOP(IC_RESULT(ic)),0));
-        emitpcode(POC_BTFSS, popGet(AOP(IC_LEFT(ic)),0));
-        emitpcode(POC_BSF,   popGet(AOP(IC_RESULT(ic)),0));
+      emitpcode (POC_BCF, popGet (AOP (IC_RESULT (ic)), 0));
+      emitpcode (POC_BTFSS, popGet (AOP (IC_LEFT (ic)), 0));
+      emitpcode (POC_BSF, popGet (AOP (IC_RESULT (ic)), 0));
 
-        goto release;
+      goto release;
     }
 
-    optype = operandType(IC_LEFT(ic));
-    rtype = operandType(IC_RESULT(ic));
+  optype = operandType (IC_LEFT (ic));
 
-    /* if float then do float stuff */
-    if (IS_FLOAT(optype)) {
-        genUminusFloat(IC_LEFT(ic),IC_RESULT(ic));
-        goto release;
+  /* if float then do float stuff */
+  if (IS_FLOAT (optype))
+    {
+      genUminusFloat (IC_LEFT (ic), IC_RESULT (ic));
+      goto release;
     }
 
-    /* otherwise subtract from zero by taking the 2's complement */
-    size = AOP_SIZE(IC_LEFT(ic));
+  /* otherwise subtract from zero by taking the 2's complement */
+  size = AOP_SIZE (IC_LEFT (ic));
 
-    for(i=0; i<size; i++) {
-        if (pic14_sameRegs(AOP(IC_LEFT(ic)), AOP(IC_RESULT(ic))) )
-            emitpcode(POC_COMF,  popGet(AOP(IC_LEFT(ic)),i));
-        else {
-            emitpcode(POC_COMFW, popGet(AOP(IC_LEFT(ic)),i));
-            emitpcode(POC_MOVWF, popGet(AOP(IC_RESULT(ic)),i));
+  for (i = 0; i < size; i++)
+    {
+      if (pic14_sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic))))
+        emitpcode (POC_COMF, popGet (AOP (IC_LEFT (ic)), i));
+      else
+        {
+          emitpcode (POC_COMFW, popGet (AOP (IC_LEFT (ic)), i));
+          emitpcode (POC_MOVWF, popGet (AOP (IC_RESULT (ic)), i));
         }
     }
 
-    emitpcode(POC_INCF,  popGet(AOP(IC_RESULT(ic)),0));
-    for(i=1; i<size; i++) {
-        emitSKPNZ;
-        emitpcode(POC_INCF,  popGet(AOP(IC_RESULT(ic)),i));
+  emitpcode (POC_INCF, popGet (AOP (IC_RESULT (ic)), 0));
+  for (i = 1; i < size; i++)
+    {
+      emitSKPNZ;
+      emitpcode (POC_INCF, popGet (AOP (IC_RESULT (ic)), i));
     }
 
 release:
-    /* release the aops */
-    freeAsmop(IC_LEFT(ic),NULL,ic,(RESULTONSTACK(ic) ? 0 : 1));
-    freeAsmop(IC_RESULT(ic),NULL,ic,TRUE);
+  /* release the aops */
+  freeAsmop (IC_LEFT (ic), NULL, ic, (RESULTONSTACK (ic) ? 0 : 1));
+  freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* saverbank - saves an entire register bank on the stack          */
 /*-----------------------------------------------------------------*/
-static void saverbank (int bank, iCode *ic, bool pushPsw)
+static void
+saverbank (int bank, iCode * ic, bool pushPsw)
 {
-    FENTRY;
+  FENTRY;
 
-    DEBUGpic14_emitcode ("; ***","%s  %d - WARNING no code generated",__FUNCTION__,__LINE__);
+  DEBUGpic14_emitcode ("; ***", "%s  %d - WARNING no code generated", __FUNCTION__, __LINE__);
 #if 0
-    int i;
-    asmop *aop ;
-    regs *r = NULL;
+  int i;
+  asmop *aop;
+  regs *r = NULL;
 
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    if (options.useXstack) {
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  if (options.useXstack)
+    {
 
-        aop = newAsmop(0);
-        r = getFreePtr(ic,&aop,FALSE);
-        pic14_emitcode("mov","%s,_spx",r->name);
+      aop = newAsmop (0);
+      r = getFreePtr (ic, &aop, FALSE);
+      pic14_emitcode ("mov", "%s,_spx", r->name);
 
     }
 
-    for (i = 0 ; i < pic14_nRegs ;i++) {
-        if (options.useXstack) {
-            pic14_emitcode("inc","%s",r->name);
-            //pic14_emitcode("mov","a,(%s+%d)",
-            //       regspic14[i].base,8*bank+regspic14[i].offset);
-            pic14_emitcode("movx","@%s,a",r->name);
-        } else
-            pic14_emitcode("push","");// "(%s+%d)",
-        //regspic14[i].base,8*bank+regspic14[i].offset);
+  for (i = 0; i < pic14_nRegs; i++)
+    {
+      if (options.useXstack)
+        {
+          pic14_emitcode ("inc", "%s", r->name);
+          //pic14_emitcode("mov","a,(%s+%d)",
+          //       regspic14[i].base,8*bank+regspic14[i].offset);
+          pic14_emitcode ("movx", "@%s,a", r->name);
+        }
+      else
+        pic14_emitcode ("push", "");    // "(%s+%d)",
+      //regspic14[i].base,8*bank+regspic14[i].offset);
     }
 
-    if (pushPsw) {
-        if (options.useXstack) {
-            pic14_emitcode("mov","a,psw");
-            pic14_emitcode("movx","@%s,a",r->name);
-            pic14_emitcode("inc","%s",r->name);
-            pic14_emitcode("mov","_spx,%s",r->name);
-            freeAsmop (NULL,aop,ic,TRUE);
+  if (pushPsw)
+    {
+      if (options.useXstack)
+        {
+          pic14_emitcode ("mov", "a,psw");
+          pic14_emitcode ("movx", "@%s,a", r->name);
+          pic14_emitcode ("inc", "%s", r->name);
+          pic14_emitcode ("mov", "_spx,%s", r->name);
+          freeAsmop (NULL, aop, ic, TRUE);
 
-        } else
-            pic14_emitcode("push","psw");
+        }
+      else
+        pic14_emitcode ("push", "psw");
 
-        pic14_emitcode("mov","psw,#0x%02x",(bank << 3)&0x00ff);
+      pic14_emitcode ("mov", "psw,#0x%02x", (bank << 3) & 0x00ff);
     }
-    ic->bankSaved = 1;
+  ic->bankSaved = 1;
 #endif
 }
 
 /*-----------------------------------------------------------------*/
 /* saveRegisters - will look for a call and save the registers     */
 /*-----------------------------------------------------------------*/
-static void saveRegisters(iCode *lic)
+static void
+saveRegisters (iCode * lic)
 {
-    iCode *ic;
-    bitVect *rsave;
-    sym_link *dtype;
-
-    FENTRY;
-
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* look for call */
-    for (ic = lic ; ic ; ic = ic->next)
-        if (ic->op == CALL || ic->op == PCALL)
-            break;
+  iCode *ic;
+  sym_link *dtype;
 
-        if (!ic) {
-            fprintf(stderr,"found parameter push with no function call\n");
-            return ;
-        }
+  FENTRY;
 
-        /* if the registers have been saved already then
-        do nothing */
-        if (ic->regsSaved || IFFUNC_CALLEESAVES(OP_SYMBOL(IC_LEFT(ic))->type))
-            return ;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+
+  /* look for call */
+  for (ic = lic; ic; ic = ic->next)
+    if (ic->op == CALL || ic->op == PCALL)
+      break;
 
-            /* find the registers in use at this time
-        and push them away to safety */
-        rsave = bitVectCplAnd(bitVectCopy(ic->rMask),
-            ic->rUsed);
+  if (!ic)
+    {
+      fprintf (stderr, "found parameter push with no function call\n");
+      return;
+    }
 
-        ic->regsSaved = 1;
+  /* if the registers have been saved already then do nothing */
+  if (ic->regsSaved || IFFUNC_CALLEESAVES (OP_SYMBOL (IC_LEFT (ic))->type))
+    return;
 
-        //fprintf(stderr, "ERROR: saveRegisters did not do anything to save registers, please report this as a bug.\n");
+  /* find the registers in use at this time
+     and push them away to safety */
+  bitVectCplAnd (bitVectCopy (ic->rMask), ic->rUsed);
 
-        dtype = operandType(IC_LEFT(ic));
-        if (currFunc && dtype &&
-            (FUNC_REGBANK(currFunc->type) != FUNC_REGBANK(dtype)) &&
-            IFFUNC_ISISR(currFunc->type) &&
-            !ic->bankSaved)
+  ic->regsSaved = 1;
 
-            saverbank(FUNC_REGBANK(dtype),ic,TRUE);
+  //fprintf(stderr, "ERROR: saveRegisters did not do anything to save registers, please report this as a bug.\n");
 
+  dtype = operandType (IC_LEFT (ic));
+  if (currFunc && dtype &&
+      (FUNC_REGBANK (currFunc->type) != FUNC_REGBANK (dtype)) && IFFUNC_ISISR (currFunc->type) && !ic->bankSaved)
+    {
+      saverbank (FUNC_REGBANK (dtype), ic, TRUE);
+    }
 }
+
 /*-----------------------------------------------------------------*/
 /* unsaveRegisters - pop the pushed registers                      */
 /*-----------------------------------------------------------------*/
-static void unsaveRegisters (iCode *ic)
+static void
+unsaveRegisters (iCode * ic)
 {
-    int i;
-    bitVect *rsave;
+  int i;
+  bitVect *rsave;
 
-    FENTRY;
+  FENTRY;
+
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  /* find the registers in use at this time
+     and push them away to safety */
+  rsave = bitVectCplAnd (bitVectCopy (ic->rMask), ic->rUsed);
 
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* find the registers in use at this time
-    and push them away to safety */
-    rsave = bitVectCplAnd(bitVectCopy(ic->rMask),
-        ic->rUsed);
-
-    if (options.useXstack) {
-        pic14_emitcode("mov","r0,%s",spname);
-        for (i =  pic14_nRegs ; i >= 0 ; i--) {
-            if (bitVectBitValue(rsave,i)) {
-                pic14_emitcode("dec","r0");
-                pic14_emitcode("movx","a,@r0");
-                pic14_emitcode("mov","%s,a",pic14_regWithIdx(i)->name);
+  if (options.useXstack)
+    {
+      pic14_emitcode ("mov", "r0,%s", spname);
+      for (i = pic14_nRegs; i >= 0; i--)
+        {
+          if (bitVectBitValue (rsave, i))
+            {
+              pic14_emitcode ("dec", "r0");
+              pic14_emitcode ("movx", "a,@r0");
+              pic14_emitcode ("mov", "%s,a", pic14_regWithIdx (i)->name);
             }
 
         }
-        pic14_emitcode("mov","%s,r0",spname);
-    } //else
-    //for (i =  pic14_nRegs ; i >= 0 ; i--) {
-    //  if (bitVectBitValue(rsave,i))
-    //  pic14_emitcode("pop","%s",pic14_regWithIdx(i)->dname);
-    //}
+      pic14_emitcode ("mov", "%s,r0", spname);
+    }                           //else
+  //for (i =  pic14_nRegs ; i >= 0 ; i--) {
+  //  if (bitVectBitValue(rsave,i))
+  //  pic14_emitcode("pop","%s",pic14_regWithIdx(i)->dname);
+  //}
 
 }
 
@@ -1812,20 +1874,22 @@
 /*-----------------------------------------------------------------*/
 /* pushSide -                */
 /*-----------------------------------------------------------------*/
-static void pushSide(operand * oper, int size)
+static void
+pushSide (operand * oper, int size)
 {
 #if 0
-    int offset = 0;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    while (size--) {
-        char *l = aopGet(AOP(oper),offset++,FALSE,TRUE);
-        if (AOP_TYPE(oper) != AOP_REG &&
-            AOP_TYPE(oper) != AOP_DIR &&
-            strcmp(l,"a") ) {
-            pic14_emitcode("mov","a,%s",l);
-            pic14_emitcode("push","acc");
-        } else
-            pic14_emitcode("push","%s",l);
+  int offset = 0;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  while (size--)
+    {
+      char *l = aopGet (AOP (oper), offset++, FALSE, TRUE);
+      if (AOP_TYPE (oper) != AOP_REG && AOP_TYPE (oper) != AOP_DIR && strcmp (l, "a"))
+        {
+          pic14_emitcode ("mov", "a,%s", l);
+          pic14_emitcode ("push", "acc");
+        }
+      else
+        pic14_emitcode ("push", "%s", l);
     }
 #endif
 }
@@ -1833,21 +1897,23 @@
 /*-----------------------------------------------------------------*/
 /* assignResultValue -               */
 /*-----------------------------------------------------------------*/
-static void assignResultValue(operand * oper)
+static void
+assignResultValue (operand * oper)
 {
-    int size = AOP_SIZE(oper);
-    int offset = 0;
+  int size = AOP_SIZE (oper);
+  int offset = 0;
 
-    FENTRY;
+  FENTRY;
 
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-    DEBUGpic14_AopType(__LINE__,oper,NULL,NULL);
+  DEBUGpic14_AopType (__LINE__, oper, NULL, NULL);
 
-    /* assign MSB first (passed via WREG) */
-    while (size--) {
-        get_returnvalue (oper, size, offset + GpsuedoStkPtr);
-        GpsuedoStkPtr++;
+  /* assign MSB first (passed via WREG) */
+  while (size--)
+    {
+      get_returnvalue (oper, size, offset + GpsuedoStkPtr);
+      GpsuedoStkPtr++;
     }
 }
 
@@ -1855,138 +1921,151 @@
 /*-----------------------------------------------------------------*/
 /* genIpush - genrate code for pushing this gets a little complex  */
 /*-----------------------------------------------------------------*/
-static void genIpush (iCode *ic)
+static void
+genIpush (iCode * ic)
 {
-    FENTRY;
+  FENTRY;
 
-    DEBUGpic14_emitcode ("; ***","%s  %d - WARNING no code generated",__FUNCTION__,__LINE__);
+  DEBUGpic14_emitcode ("; ***", "%s  %d - WARNING no code generated", __FUNCTION__, __LINE__);
 #if 0
-    int size, offset = 0 ;
-    char *l;
+  int size, offset = 0;
+  char *l;
 
 
-    /* if this is not a parm push : ie. it is spill push
-    and spill push is always done on the local stack */
-    if (!ic->parmPush) {
+  /* if this is not a parm push : ie. it is spill push
+     and spill push is always done on the local stack */
+  if (!ic->parmPush)
+    {
 
-        /* and the item is spilt then do nothing */
-        if (OP_SYMBOL(IC_LEFT(ic))->isspilt)
-            return ;
+      /* and the item is spilt then do nothing */
+      if (OP_SYMBOL (IC_LEFT (ic))->isspilt)
+        return;
 
-        aopOp(IC_LEFT(ic),ic,FALSE);
-        size = AOP_SIZE(IC_LEFT(ic));
-        /* push it on the stack */
-        while(size--) {
-            l = aopGet(AOP(IC_LEFT(ic)),offset++,FALSE,TRUE);
-            if (*l == '#') {
-                MOVA(l);
-                l = "acc";
+      aopOp (IC_LEFT (ic), ic, FALSE);
+      size = AOP_SIZE (IC_LEFT (ic));
+      /* push it on the stack */
+      while (size--)
+        {
+          l = aopGet (AOP (IC_LEFT (ic)), offset++, FALSE, TRUE);
+          if (*l == '#')
+            {
+              MOVA (l);
+              l = "acc";
             }
-            pic14_emitcode("push","%s",l);
+          pic14_emitcode ("push", "%s", l);
         }
-        return ;
+      return;
     }
 
-    /* this is a paramter push: in this case we call
-    the routine to find the call and save those
-    registers that need to be saved */
-    saveRegisters(ic);
+  /* this is a paramter push: in this case we call
+     the routine to find the call and save those
+     registers that need to be saved */
+  saveRegisters (ic);
 
-    /* then do the push */
-    aopOp(IC_LEFT(ic),ic,FALSE);
+  /* then do the push */
+  aopOp (IC_LEFT (ic), ic, FALSE);
 
 
-    // pushSide(IC_LEFT(ic), AOP_SIZE(IC_LEFT(ic)));
-    size = AOP_SIZE(IC_LEFT(ic));
+  // pushSide(IC_LEFT(ic), AOP_SIZE(IC_LEFT(ic)));
+  size = AOP_SIZE (IC_LEFT (ic));
 
-    while (size--) {
-        l = aopGet(AOP(IC_LEFT(ic)),offset++,FALSE,TRUE);
-        if (AOP_TYPE(IC_LEFT(ic)) != AOP_REG &&
-            AOP_TYPE(IC_LEFT(ic)) != AOP_DIR &&
-            strcmp(l,"a") ) {
-            pic14_emitcode("mov","a,%s",l);
-            pic14_emitcode("push","acc");
-        } else
-            pic14_emitcode("push","%s",l);
+  while (size--)
+    {
+      l = aopGet (AOP (IC_LEFT (ic)), offset++, FALSE, TRUE);
+      if (AOP_TYPE (IC_LEFT (ic)) != AOP_REG && AOP_TYPE (IC_LEFT (ic)) != AOP_DIR && strcmp (l, "a"))
+        {
+          pic14_emitcode ("mov", "a,%s", l);
+          pic14_emitcode ("push", "acc");
+        }
+      else
+        pic14_emitcode ("push", "%s", l);
     }
 
-    freeAsmop(IC_LEFT(ic),NULL,ic,TRUE);
+  freeAsmop (IC_LEFT (ic), NULL, ic, TRUE);
 #endif
 }
 
 /*-----------------------------------------------------------------*/
 /* genIpop - recover the registers: can happen only for spilling   */
 /*-----------------------------------------------------------------*/
-static void genIpop (iCode *ic)
+static void
+genIpop (iCode * ic)
 {
-    FENTRY;
+  FENTRY;
 
-    DEBUGpic14_emitcode ("; ***","%s  %d - WARNING no code generated",__FUNCTION__,__LINE__);
-    assert (!"genIpop -- unimplemented");
+  DEBUGpic14_emitcode ("; ***", "%s  %d - WARNING no code generated", __FUNCTION__, __LINE__);
+  assert (!"genIpop -- unimplemented");
 #if 0
-    int size,offset ;
+  int size, offset;
 
 
-    /* if the temp was not pushed then */
-    if (OP_SYMBOL(IC_LEFT(ic))->isspilt)
-        return ;
+  /* if the temp was not pushed then */
+  if (OP_SYMBOL (IC_LEFT (ic))->isspilt)
+    return;
 
-    aopOp(IC_LEFT(ic),ic,FALSE);
-    size = AOP_SIZE(IC_LEFT(ic));
-    offset = (size-1);
-    while (size--)
-        pic14_emitcode("pop","%s",aopGet(AOP(IC_LEFT(ic)),offset--,
-        FALSE,TRUE));
+  aopOp (IC_LEFT (ic), ic, FALSE);
+  size = AOP_SIZE (IC_LEFT (ic));
+  offset = (size - 1);
+  while (size--)
+    pic14_emitcode ("pop", "%s", aopGet (AOP (IC_LEFT (ic)), offset--, FALSE, TRUE));
 
-    freeAsmop(IC_LEFT(ic),NULL,ic,TRUE);
+  freeAsmop (IC_LEFT (ic), NULL, ic, TRUE);
 #endif
 }
 
 /*-----------------------------------------------------------------*/
 /* unsaverbank - restores the resgister bank from stack            */
 /*-----------------------------------------------------------------*/
-static void unsaverbank (int bank,iCode *ic,bool popPsw)
+static void
+unsaverbank (int bank, iCode * ic, bool popPsw)
 {
-    FENTRY;
+  FENTRY;
 
-    DEBUGpic14_emitcode ("; ***","%s  %d - WARNING no code generated",__FUNCTION__,__LINE__);
+  DEBUGpic14_emitcode ("; ***", "%s  %d - WARNING no code generated", __FUNCTION__, __LINE__);
 #if 0
-    int i;
-    asmop *aop ;
-    regs *r = NULL;
+  int i;
+  asmop *aop;
+  regs *r = NULL;
 
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    if (popPsw) {
-        if (options.useXstack) {
-            aop = newAsmop(0);
-            r = getFreePtr(ic,&aop,FALSE);
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  if (popPsw)
+    {
+      if (options.useXstack)
+        {
+          aop = newAsmop (0);
+          r = getFreePtr (ic, &aop, FALSE);
 
 
-            pic14_emitcode("mov","%s,_spx",r->name);
-            pic14_emitcode("movx","a,@%s",r->name);
-            pic14_emitcode("mov","psw,a");
-            pic14_emitcode("dec","%s",r->name);
+          pic14_emitcode ("mov", "%s,_spx", r->name);
+          pic14_emitcode ("movx", "a,@%s", r->name);
+          pic14_emitcode ("mov", "psw,a");
+          pic14_emitcode ("dec", "%s", r->name);
 
-        }else
-            pic14_emitcode ("pop","psw");
+        }
+      else
+        pic14_emitcode ("pop", "psw");
     }
 
-    for (i = (pic14_nRegs - 1) ; i >= 0 ;i--) {
-        if (options.useXstack) {
-            pic14_emitcode("movx","a,@%s",r->name);
-            //pic14_emitcode("mov","(%s+%d),a",
-            //     regspic14[i].base,8*bank+regspic14[i].offset);
-            pic14_emitcode("dec","%s",r->name);
+  for (i = (pic14_nRegs - 1); i >= 0; i--)
+    {
+      if (options.useXstack)
+        {
+          pic14_emitcode ("movx", "a,@%s", r->name);
+          //pic14_emitcode("mov","(%s+%d),a",
+          //     regspic14[i].base,8*bank+regspic14[i].offset);
+          pic14_emitcode ("dec", "%s", r->name);
 
-        } else
-            pic14_emitcode("pop",""); //"(%s+%d)",
-        //regspic14[i].base,8*bank); //+regspic14[i].offset);
+        }
+      else
+        pic14_emitcode ("pop", "");     //"(%s+%d)",
+      //regspic14[i].base,8*bank); //+regspic14[i].offset);
     }
 
-    if (options.useXstack) {
+  if (options.useXstack)
+    {
 
-        pic14_emitcode("mov","_spx,%s",r->name);
-        freeAsmop(NULL,aop,ic,TRUE);
+      pic14_emitcode ("mov", "_spx,%s", r->name);
+      freeAsmop (NULL, aop, ic, TRUE);
 
     }
 #endif
@@ -1995,134 +2074,135 @@
 /*-----------------------------------------------------------------*/
 /* genCall - generates a call statement                            */
 /*-----------------------------------------------------------------*/
-static void genCall (iCode *ic)
+static void
+genCall (iCode * ic)
 {
-    sym_link *dtype;
-    symbol *sym;
-    char *name;
-    int isExtern;
-
-    FENTRY;
-
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
-    /* if caller saves & we have not saved then */
-    if (!ic->regsSaved)
-        saveRegisters(ic);
-
-        /* if we are calling a function that is not using
-        the same register bank then we need to save the
-    destination registers on the stack */
-    dtype = operandType(IC_LEFT(ic));
-    if (currFunc && dtype &&
-        (FUNC_REGBANK(currFunc->type) != FUNC_REGBANK(dtype)) &&
-        IFFUNC_ISISR(currFunc->type) &&
-        !ic->bankSaved)
-
-        saverbank(FUNC_REGBANK(dtype),ic,TRUE);
-
-    /* if send set is not empty the assign */
-    if (_G.sendSet) {
-        iCode *sic;
-        /* For the Pic port, there is no data stack.
-        * So parameters passed to functions are stored
-        * in registers. (The pCode optimizer will get
-        * rid of most of these :).
-        */
-        int psuedoStkPtr=-1;
-        int firstTimeThruLoop = 1;
-
-        _G.sendSet = reverseSet(_G.sendSet);
-
-        /* First figure how many parameters are getting passed */
-        for (sic = setFirstItem(_G.sendSet) ; sic ;
-        sic = setNextItem(_G.sendSet)) {
-
-            aopOp(IC_LEFT(sic),sic,FALSE);
-            psuedoStkPtr += AOP_SIZE(IC_LEFT(sic));
-            freeAsmop (IC_LEFT(sic),NULL,sic,FALSE);
-        }
-
-        for (sic = setFirstItem(_G.sendSet) ; sic ;
-        sic = setNextItem(_G.sendSet)) {
-            int size, offset = 0;
-
-            aopOp(IC_LEFT(sic),sic,FALSE);
-            size = AOP_SIZE(IC_LEFT(sic));
-
-            while (size--) {
-                DEBUGpic14_emitcode ("; ","%d left %s",__LINE__,
-                    AopType(AOP_TYPE(IC_LEFT(sic))));
-
-                if(!firstTimeThruLoop) {
-                    /* If this is not the first time we've been through the loop
-                    * then we need to save the parameter in a temporary
-                    * register. The last byte of the last parameter is
-                    * passed in W. */
-                    emitpcode(POC_MOVWF,popRegFromIdx(Gstack_base_addr - --psuedoStkPtr));
+  sym_link *dtype;
+  symbol *sym;
+  char *name;
+  int isExtern;
+
+  FENTRY;
+
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+
+  /* if caller saves & we have not saved then */
+  if (!ic->regsSaved)
+    saveRegisters (ic);
+
+  /* if we are calling a function that is not using
+     the same register bank then we need to save the
+     destination registers on the stack */
+  dtype = operandType (IC_LEFT (ic));
+  if (currFunc && dtype &&
+      (FUNC_REGBANK (currFunc->type) != FUNC_REGBANK (dtype)) && IFFUNC_ISISR (currFunc->type) && !ic->bankSaved)
+
+    saverbank (FUNC_REGBANK (dtype), ic, TRUE);
+
+  /* if send set is not empty the assign */
+  if (_G.sendSet)
+    {
+      iCode *sic;
+      /* For the Pic port, there is no data stack.
+       * So parameters passed to functions are stored
+       * in registers. (The pCode optimizer will get
+       * rid of most of these :).
+       */
+      int psuedoStkPtr = -1;
+      int firstTimeThruLoop = 1;
+
+      _G.sendSet = reverseSet (_G.sendSet);
+
+      /* First figure how many parameters are getting passed */
+      for (sic = setFirstItem (_G.sendSet); sic; sic = setNextItem (_G.sendSet))
+        {
+
+          aopOp (IC_LEFT (sic), sic, FALSE);
+          psuedoStkPtr += AOP_SIZE (IC_LEFT (sic));
+          freeAsmop (IC_LEFT (sic), NULL, sic, FALSE);
+        }
+
+      for (sic = setFirstItem (_G.sendSet); sic; sic = setNextItem (_G.sendSet))
+        {
+          int size, offset = 0;
+
+          aopOp (IC_LEFT (sic), sic, FALSE);
+          size = AOP_SIZE (IC_LEFT (sic));
+
+          while (size--)
+            {
+              DEBUGpic14_emitcode ("; ", "%d left %s", __LINE__, AopType (AOP_TYPE (IC_LEFT (sic))));
+
+              if (!firstTimeThruLoop)
+                {
+                  /* If this is not the first time we've been through the loop
+                   * then we need to save the parameter in a temporary
+                   * register. The last byte of the last parameter is
+                   * passed in W. */
+                  emitpcode (POC_MOVWF, popRegFromIdx (Gstack_base_addr - --psuedoStkPtr));
 
                 }
-                firstTimeThruLoop=0;
+              firstTimeThruLoop = 0;
 
-                mov2w_op (IC_LEFT(sic),  offset);
-                offset++;
+              mov2w_op (IC_LEFT (sic), offset);
+              offset++;
             }
-            freeAsmop (IC_LEFT(sic),NULL,sic,TRUE);
+          freeAsmop (IC_LEFT (sic), NULL, sic, TRUE);
         }
-        _G.sendSet = NULL;
+      _G.sendSet = NULL;
+    }
+  /* make the call */
+  sym = OP_SYMBOL (IC_LEFT (ic));
+  name = sym->rname[0] ? sym->rname : sym->name;
+  /*
+   * As SDCC emits code as soon as it reaches the end of each
+   * function's definition, prototyped functions that are implemented
+   * after the current one are always considered EXTERN, which
+   * introduces many unneccessary PAGESEL instructions.
+   * XXX: Use a post pass to iterate over all `CALL _name' statements
+   * and insert `PAGESEL _name' and `PAGESEL $' around the CALL
+   * only iff there is no definition of the function in the whole
+   * file (might include this in the PAGESEL pass).
+   */
+  isExtern = IS_EXTERN (sym->etype) || pic14_inISR;
+  if (isExtern)
+    {
+      /* Extern functions and ISRs maybe on a different page;
+       * must call pagesel */
+      emitpcode (POC_PAGESEL, popGetWithString (name, 1));
+    }
+  emitpcode (POC_CALL, popGetWithString (name, isExtern));
+  if (isExtern)
+    {
+      /* May have returned from a different page;
+       * must use pagesel to restore PCLATH before next
+       * goto or call instruction */
+      emitpcode (POC_PAGESEL, popGetWithString ("$", 0));
+    }
+  GpsuedoStkPtr = 0;
+  /* if we need assign a result value */
+  if ((IS_ITEMP (IC_RESULT (ic)) &&
+       (OP_SYMBOL (IC_RESULT (ic))->nRegs || OP_SYMBOL (IC_RESULT (ic))->spildir)) || IS_TRUE_SYMOP (IC_RESULT (ic)))
+    {
+
+      _G.accInUse++;
+      aopOp (IC_RESULT (ic), ic, FALSE);
+      _G.accInUse--;
+
+      assignResultValue (IC_RESULT (ic));
+
+      DEBUGpic14_emitcode ("; ", "%d left %s", __LINE__, AopType (AOP_TYPE (IC_RESULT (ic))));
+
+      freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
     }
-    /* make the call */
-    sym = OP_SYMBOL(IC_LEFT(ic));
-    name = sym->rname[0] ? sym->rname : sym->name;
-    /*
-     * As SDCC emits code as soon as it reaches the end of each
-     * function's definition, prototyped functions that are implemented
-     * after the current one are always considered EXTERN, which
-     * introduces many unneccessary PAGESEL instructions.
-     * XXX: Use a post pass to iterate over all `CALL _name' statements
-     * and insert `PAGESEL _name' and `PAGESEL $' around the CALL
-     * only iff there is no definition of the function in the whole
-     * file (might include this in the PAGESEL pass).
-     */
-    isExtern = IS_EXTERN(sym->etype) || pic14_inISR;
-    if (isExtern) {
-        /* Extern functions and ISRs maybe on a different page;
-         * must call pagesel */
-        emitpcode(POC_PAGESEL,popGetWithString(name,1));
-    }
-    emitpcode(POC_CALL,popGetWithString(name,isExtern));
-    if (isExtern) {
-        /* May have returned from a different page;
-         * must use pagesel to restore PCLATH before next
-         * goto or call instruction */
-        emitpcode(POC_PAGESEL,popGetWithString("$",0));
-    }
-    GpsuedoStkPtr=0;
-    /* if we need assign a result value */
-    if ((IS_ITEMP(IC_RESULT(ic)) &&
-        (OP_SYMBOL(IC_RESULT(ic))->nRegs ||
-        OP_SYMBOL(IC_RESULT(ic))->spildir )) ||
-        IS_TRUE_SYMOP(IC_RESULT(ic)) ) {
-
-        _G.accInUse++;
-        aopOp(IC_RESULT(ic),ic,FALSE);
-        _G.accInUse--;
-
-        assignResultValue(IC_RESULT(ic));
-
-        DEBUGpic14_emitcode ("; ","%d left %s",__LINE__,
-            AopType(AOP_TYPE(IC_RESULT(ic))));
-
-        freeAsmop(IC_RESULT(ic),NULL, ic,TRUE);
-    }
-
-    /* if register bank was saved then pop them */
-    if (ic->bankSaved)
-        unsaverbank(FUNC_REGBANK(dtype),ic,TRUE);
-
-    /* if we hade saved some registers then unsave them */
-    if (ic->regsSaved && !IFFUNC_CALLEESAVES(dtype))
-        unsaveRegisters (ic);
+
+  /* if register bank was saved then pop them */
+  if (ic->bankSaved)
+    unsaverbank (FUNC_REGBANK (dtype), ic, TRUE);
+
+  /* if we hade saved some registers then unsave them */
+  if (ic->regsSaved && !IFFUNC_CALLEESAVES (dtype))
+    unsaveRegisters (ic);
 
 
 }
@@ -2130,280 +2210,303 @@
 /*-----------------------------------------------------------------*/
 /* genPcall - generates a call by pointer statement                */
 /*-----------------------------------------------------------------*/
-static void genPcall (iCode *ic)
+static void
+genPcall (iCode * ic)
 {
-    sym_link *dtype;
-    symbol *albl = newiTempLabel(NULL);
-    symbol *blbl = newiTempLabel(NULL);
-    PIC_OPCODE poc;
-    pCodeOp *pcop;
-    operand *left;
-
-    FENTRY;
-
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* if caller saves & we have not saved then */
-    if (!ic->regsSaved)
-        saveRegisters(ic);
-
-        /* if we are calling a function that is not using
-        the same register bank then we need to save the
-    destination registers on the stack */
-    dtype = operandType(IC_LEFT(ic));
-    if (currFunc && dtype &&
-        IFFUNC_ISISR(currFunc->type) &&
-        (FUNC_REGBANK(currFunc->type) != FUNC_REGBANK(dtype)))
-        saverbank(FUNC_REGBANK(dtype),ic,TRUE);
-
-    left = IC_LEFT(ic);
-    aopOp(left,ic,FALSE);
-    DEBUGpic14_AopType(__LINE__,left,NULL,NULL);
-
-    poc = ( op_isLitLike (IC_LEFT(ic)) ? POC_MOVLW : POC_MOVFW );
-
-    pushSide(IC_LEFT(ic), FPTRSIZE);
-
-    /* if send set is not empty, assign parameters */
-    if (_G.sendSet) {
-
-        DEBUGpic14_emitcode ("; ***","%s  %d - WARNING arg-passing to indirect call not supported",__FUNCTION__,__LINE__);
-        /* no way to pass args - W always gets used to make the call */
-    }
-    /* first idea - factor out a common helper function and call it.
-    But don't know how to get it generated only once in its own block
-
-    if(AOP_TYPE(IC_LEFT(ic)) == AOP_DIR) {
-        char *rname;
-        char *buffer;
-        rname = IC_LEFT(ic)->aop->aopu.aop_dir;
-        DEBUGpic14_emitcode ("; ***","%s  %d AOP_DIR %s",__FUNCTION__,__LINE__,rname);
-        buffer = Safe_calloc(1,strlen(rname)+16);
-        sprintf(buffer, "%s_goto_helper", rname);
-        addpCode2pBlock(pb,newpCode(POC_CALL,newpCodeOp(buffer,PO_STR)));
-        free(buffer);
-    }
-    */
-    emitpcode(POC_CALL,popGetLabel(albl->key));
-    pcop = popGetLabel(blbl->key);
-    emitpcode(POC_PAGESEL,pcop); /* Must restore PCLATH before goto, without destroying W */
-    emitpcode(POC_GOTO,pcop);
-    emitpLabel(albl->key);
-
-    emitpcode(poc,popGetAddr(AOP(left),1,0));
-    emitpcode(POC_MOVWF,popCopyReg(&pc_pclath));
-    emitpcode(poc,popGetAddr(AOP(left),0,0));
-    emitpcode(POC_MOVWF,popCopyReg(&pc_pcl));
-
-    emitpLabel(blbl->key);
-
-    freeAsmop(IC_LEFT(ic),NULL,ic,TRUE);
-
-    /* if we need to assign a result value */
-    if ((IS_ITEMP(IC_RESULT(ic)) &&
-        (OP_SYMBOL(IC_RESULT(ic))->nRegs ||
-        OP_SYMBOL(IC_RESULT(ic))->spildir)) ||
-        IS_TRUE_SYMOP(IC_RESULT(ic)) ) {
-
-        _G.accInUse++;
-        aopOp(IC_RESULT(ic),ic,FALSE);
-        _G.accInUse--;
-
-        GpsuedoStkPtr = 0;
-
-        assignResultValue(IC_RESULT(ic));
-
-        freeAsmop(IC_RESULT(ic),NULL,ic,TRUE);
-    }
-
-    /* if register bank was saved then unsave them */
-    if (currFunc && dtype &&
-        (FUNC_REGBANK(currFunc->type) != FUNC_REGBANK(dtype)))
-        unsaverbank(FUNC_REGBANK(dtype),ic,TRUE);
-
-        /* if we hade saved some registers then
-    unsave them */
-    if (ic->regsSaved)
-        unsaveRegisters (ic);
+  sym_link *dtype;
+  symbol *albl = newiTempLabel (NULL);
+  symbol *blbl = newiTempLabel (NULL);
+  PIC_OPCODE poc;
+  pCodeOp *pcop;
+  operand *left;
+
+  FENTRY;
+
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  /* if caller saves & we have not saved then */
+  if (!ic->regsSaved)
+    saveRegisters (ic);
+
+  /* if we are calling a function that is not using
+     the same register bank then we need to save the
+     destination registers on the stack */
+  dtype = operandType (IC_LEFT (ic));
+  if (currFunc && dtype && IFFUNC_ISISR (currFunc->type) && (FUNC_REGBANK (currFunc->type) != FUNC_REGBANK (dtype)))
+    saverbank (FUNC_REGBANK (dtype), ic, TRUE);
+
+  left = IC_LEFT (ic);
+  aopOp (left, ic, FALSE);
+  DEBUGpic14_AopType (__LINE__, left, NULL, NULL);
+
+  poc = (op_isLitLike (IC_LEFT (ic)) ? POC_MOVLW : POC_MOVFW);
+
+  pushSide (IC_LEFT (ic), FPTRSIZE);
+
+  /* if send set is not empty, assign parameters */
+  if (_G.sendSet)
+    {
+
+      DEBUGpic14_emitcode ("; ***", "%s  %d - WARNING arg-passing to indirect call not supported", __FUNCTION__, __LINE__);
+      /* no way to pass args - W always gets used to make the call */
+    }
+  /* first idea - factor out a common helper function and call it.
+     But don't know how to get it generated only once in its own block
+
+     if(AOP_TYPE(IC_LEFT(ic)) == AOP_DIR) {
+     char *rname;
+     char *buffer;
+     rname = IC_LEFT(ic)->aop->aopu.aop_dir;
+     DEBUGpic14_emitcode ("; ***","%s  %d AOP_DIR %s",__FUNCTION__,__LINE__,rname);
+     buffer = Safe_calloc(1,strlen(rname)+16);
+     sprintf(buffer, "%s_goto_helper", rname);
+     addpCode2pBlock(pb,newpCode(POC_CALL,newpCodeOp(buffer,PO_STR)));
+     free(buffer);
+     }
+   */
+  emitpcode (POC_CALL, popGetLabel (albl->key));
+  pcop = popGetLabel (blbl->key);
+  emitpcode (POC_PAGESEL, pcop);        /* Must restore PCLATH before goto, without destroying W */
+  emitpcode (POC_GOTO, pcop);
+  emitpLabel (albl->key);
+
+  emitpcode (poc, popGetAddr (AOP (left), 1, 0));
+  emitpcode (POC_MOVWF, popCopyReg (&pc_pclath));
+  emitpcode (poc, popGetAddr (AOP (left), 0, 0));
+  emitpcode (POC_MOVWF, popCopyReg (&pc_pcl));
+
+  emitpLabel (blbl->key);
+
+  freeAsmop (IC_LEFT (ic), NULL, ic, TRUE);
+
+  /* if we need to assign a result value */
+  if ((IS_ITEMP (IC_RESULT (ic)) &&
+       (OP_SYMBOL (IC_RESULT (ic))->nRegs || OP_SYMBOL (IC_RESULT (ic))->spildir)) || IS_TRUE_SYMOP (IC_RESULT (ic)))
+    {
+
+      _G.accInUse++;
+      aopOp (IC_RESULT (ic), ic, FALSE);
+      _G.accInUse--;
+
+      GpsuedoStkPtr = 0;
+
+      assignResultValue (IC_RESULT (ic));
+
+      freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
+    }
+
+  /* if register bank was saved then unsave them */
+  if (currFunc && dtype && (FUNC_REGBANK (currFunc->type) != FUNC_REGBANK (dtype)))
+    unsaverbank (FUNC_REGBANK (dtype), ic, TRUE);
+
+  /* if we hade saved some registers then
+     unsave them */
+  if (ic->regsSaved)
+    unsaveRegisters (ic);
 
 }
 
 /*-----------------------------------------------------------------*/
 /* resultRemat - result  is rematerializable                       */
 /*-----------------------------------------------------------------*/
-static int resultRemat (iCode *ic)
+static int
+resultRemat (iCode * ic)
 {
-    //  DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    FENTRY;
+  //  DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  FENTRY;
 
-    if (SKIP_IC(ic) || ic->op == IFX)
-        return 0;
+  if (SKIP_IC (ic) || ic->op == IFX)
+    return 0;
 
-    if (IC_RESULT(ic) && IS_ITEMP(IC_RESULT(ic))) {
-        symbol *sym = OP_SYMBOL(IC_RESULT(ic));
-        if (sym->remat && !POINTER_SET(ic))
-            return 1;
+  if (IC_RESULT (ic) && IS_ITEMP (IC_RESULT (ic)))
+    {
+      symbol *sym = OP_SYMBOL (IC_RESULT (ic));
+      if (sym->remat && !POINTER_SET (ic))
+        return 1;
     }
 
-    return 0;
+  return 0;
 }
 
 /*-----------------------------------------------------------------*/
 /* genFunction - generated code for function entry                 */
 /*-----------------------------------------------------------------*/
-static void genFunction (iCode *ic)
+static void
+genFunction (iCode * ic)
 {
-    symbol *sym;
-    sym_link *ftype;
-
-    FENTRY;
-
-    DEBUGpic14_emitcode ("; ***","%s  %d curr label offset=%dprevious max_key=%d ",__FUNCTION__,__LINE__,labelOffset,max_key);
+  symbol *sym;
+  sym_link *ftype;
 
-    labelOffset += (max_key+4);
-    max_key=0;
-    GpsuedoStkPtr=0;
-    _G.nRegsSaved = 0;
-    /* create the function header */
-    pic14_emitcode(";","-----------------------------------------");
-    pic14_emitcode(";"," function %s",(sym = OP_SYMBOL(IC_LEFT(ic)))->name);
-    pic14_emitcode(";","-----------------------------------------");
-
-    /* prevent this symbol from being emitted as 'extern' */
-    pic14_stringInSet(sym->rname, &pic14_localFunctions, 1);
-
-    pic14_emitcode("","%s:",sym->rname);
-    addpCode2pBlock(pb,newpCodeFunction(NULL,sym->rname,!IS_STATIC (sym->etype)));
+  FENTRY;
 
-    /* mark symbol as NOT extern (even if it was declared so previously) */
-    assert(IS_SPEC(sym->etype));
-    SPEC_EXTR(sym->etype) = 0;
-    sym->cdef = 0;
-    if (!SPEC_OCLS(sym->etype)) SPEC_OCLS(sym->etype) = code;
-    addSetIfnotP(&SPEC_OCLS(sym->etype)->syms, sym);
+  DEBUGpic14_emitcode ("; ***", "%s  %d curr label offset=%dprevious max_key=%d ", __FUNCTION__, __LINE__, labelOffset,
+                       max_key);
 
-    ftype = operandType(IC_LEFT(ic));
+  labelOffset += (max_key + 4);
+  max_key = 0;
+  GpsuedoStkPtr = 0;
+  _G.nRegsSaved = 0;
+  /* create the function header */
+  pic14_emitcode (";", "-----------------------------------------");
+  pic14_emitcode (";", " function %s", (sym = OP_SYMBOL (IC_LEFT (ic)))->name);
+  pic14_emitcode (";", "-----------------------------------------");
+
+  /* prevent this symbol from being emitted as 'extern' */
+  pic14_stringInSet (sym->rname, &pic14_localFunctions, 1);
+
+  pic14_emitcode ("", "%s:", sym->rname);
+  addpCode2pBlock (pb, newpCodeFunction (NULL, sym->rname, !IS_STATIC (sym->etype)));
+
+  /* mark symbol as NOT extern (even if it was declared so previously) */
+  assert (IS_SPEC (sym->etype));
+  SPEC_EXTR (sym->etype) = 0;
+  sym->cdef = 0;
+  if (!SPEC_OCLS (sym->etype))
+    SPEC_OCLS (sym->etype) = code;
+  addSetIfnotP (&SPEC_OCLS (sym->etype)->syms, sym);
 
-    /* if critical function then turn interrupts off */
-    if (IFFUNC_ISCRITICAL(ftype))
-        pic14_emitcode("clr","ea");
+  ftype = operandType (IC_LEFT (ic));
 
-        /* here we need to generate the equates for the
-    register bank if required */
+  /* here we need to generate the equates for the
+     register bank if required */
 #if 0
-    if (FUNC_REGBANK(ftype) != rbank) {
-        int i ;
+  if (FUNC_REGBANK (ftype) != rbank)
+    {
+      int i;
 
-        rbank = FUNC_REGBANK(ftype);
-        for ( i = 0 ; i < pic14_nRegs ; i++ ) {
-            if (strcmp(regspic14[i].base,"0") == 0)
-                pic14_emitcode("","%s = 0x%02x",
-                regspic14[i].dname,
-                8*rbank+regspic14[i].offset);
-            else
-                pic14_emitcode ("","%s = %s + 0x%02x",
-                regspic14[i].dname,
-                regspic14[i].base,
-                8*rbank+regspic14[i].offset);
+      rbank = FUNC_REGBANK (ftype);
+      for (i = 0; i < pic14_nRegs; i++)
+        {
+          if (strcmp (regspic14[i].base, "0") == 0)
+            pic14_emitcode ("", "%s = 0x%02x", regspic14[i].dname, 8 * rbank + regspic14[i].offset);
+          else
+            pic14_emitcode ("", "%s = %s + 0x%02x", regspic14[i].dname, regspic14[i].base, 8 * rbank + regspic14[i].offset);
         }
     }
 #endif
 
-    /* if this is an interrupt service routine */
-    pic14_inISR = 0;
-    if (IFFUNC_ISISR(sym->type)) {
-        pic14_inISR = 1;
-        if (pic14_getPIC()->isEnhancedCore) {
-            /* 
-             * Enhanced CPUs have automatic context saving for W,
-             * STATUS, BSR, FSRx, and PCLATH in shadow registers.
-             */
-            emitpcode(POC_CLRF,   popCopyReg(&pc_pclath));
-        } else {
-            emitpcode(POC_MOVWF,  popCopyReg(&pc_wsave));
-            emitpcode(POC_SWAPFW, popCopyReg(&pc_status));
-            /* XXX: Why? Does this assume that ssave and psave reside
-             * in a shared bank or bank0? We cannot guarantee the
-             * latter...
-             */
-            emitpcode(POC_CLRF,   popCopyReg(&pc_status));
-            emitpcode(POC_MOVWF,  popCopyReg(&pc_ssave));
-            //emitpcode(POC_MOVWF,  popGetExternal("___sdcc_saved_status",1 ));
-            emitpcode(POC_MOVFW,  popCopyReg(&pc_pclath));
-            /* during an interrupt PCLATH must be cleared before a goto or call statement */
-            emitpcode(POC_CLRF,   popCopyReg(&pc_pclath));
-            emitpcode(POC_MOVWF,  popCopyReg(&pc_psave));
-            //emitpcode(POC_MOVWF,  popGetExternal("___sdcc_saved_pclath", 1));
-            emitpcode(POC_MOVFW,  popCopyReg(&pc_fsr));
-            emitpcode(POC_MOVWF,  popGetExternal("___sdcc_saved_fsr", 1));
-        } // if
-
-        pBlockConvert2ISR(pb);
-        pic14_hasInterrupt = 1;
-    } else {
-    /* if callee-save to be used for this function
-        then save the registers being used in this function */
-        if (IFFUNC_CALLEESAVES(sym->type)) {
-            int i;
-
-            /* if any registers used */
-            if (sym->regsUsed) {
-                /* save the registers used */
-                for ( i = 0 ; i < sym->regsUsed->size ; i++) {
-                    if (bitVectBitValue(sym->regsUsed,i)) {
-                        //pic14_emitcode("push","%s",pic14_regWithIdx(i)->dname);
-                        _G.nRegsSaved++;
+  /* if this is an interrupt service routine */
+  pic14_inISR = 0;
+  if (IFFUNC_ISISR (sym->type))
+    {
+      pic14_inISR = 1;
+      if (pic14_getPIC ()->isEnhancedCore)
+        {
+          /*
+           * Enhanced CPUs have automatic context saving for W,
+           * STATUS, BSR, FSRx, and PCLATH in shadow registers.
+           */
+          emitpcode (POC_CLRF, popCopyReg (&pc_pclath));
+        }
+      else
+        {
+          emitpcode (POC_MOVWF, popCopyReg (&pc_wsave));
+          emitpcode (POC_SWAPFW, popCopyReg (&pc_status));
+          /* XXX: Why? Does this assume that ssave and psave reside
+           * in a shared bank or bank0? We cannot guarantee the
+           * latter...
+           */
+          emitpcode (POC_CLRF, popCopyReg (&pc_status));
+          emitpcode (POC_MOVWF, popCopyReg (&pc_ssave));
+          //emitpcode(POC_MOVWF,  popGetExternal("___sdcc_saved_status",1 ));
+          emitpcode (POC_MOVFW, popCopyReg (&pc_pclath));
+          /* during an interrupt PCLATH must be cleared before a goto or call statement */
+          emitpcode (POC_CLRF, popCopyReg (&pc_pclath));
+          emitpcode (POC_MOVWF, popCopyReg (&pc_psave));
+          //emitpcode(POC_MOVWF,  popGetExternal("___sdcc_saved_pclath", 1));
+          emitpcode (POC_MOVFW, popCopyReg (&pc_fsr));
+          emitpcode (POC_MOVWF, popGetExternal ("___sdcc_saved_fsr", 1));
+        }                       // if
+
+      pBlockConvert2ISR (pb);
+      pic14_hasInterrupt = 1;
+    }
+  else
+    {
+      /* if callee-save to be used for this function
+         then save the registers being used in this function */
+      if (IFFUNC_CALLEESAVES (sym->type))
+        {
+          int i;
+
+          /* if any registers used */
+          if (sym->regsUsed)
+            {
+              /* save the registers used */
+              for (i = 0; i < sym->regsUsed->size; i++)
+                {
+                  if (bitVectBitValue (sym->regsUsed, i))
+                    {
+                      //pic14_emitcode("push","%s",pic14_regWithIdx(i)->dname);
+                      _G.nRegsSaved++;
                     }
                 }
             }
         }
     }
 
-    /* set the register bank to the desired value */
-    if (FUNC_REGBANK(sym->type) || FUNC_ISISR(sym->type)) {
-        pic14_emitcode("push","psw");
-        pic14_emitcode("mov","psw,#0x%02x",(FUNC_REGBANK(sym->type) << 3)&0x00ff);
+  /* if critical function then turn interrupts off */
+  if (IFFUNC_ISCRITICAL (ftype))
+    {
+      genCritical (NULL);
+      if (IFFUNC_ARGS (sym->type))
+        {
+          fprintf (stderr, "PIC14: Functions with __critical (%s) must not have arguments for now.\n", sym->name);
+          exit (1);
+        }                       // if
+    }                           // if
+
+  /* set the register bank to the desired value */
+  if (FUNC_REGBANK (sym->type) || FUNC_ISISR (sym->type))
+    {
+      pic14_emitcode ("push", "psw");
+      pic14_emitcode ("mov", "psw,#0x%02x", (FUNC_REGBANK (sym->type) << 3) & 0x00ff);
     }
 
-    if (IFFUNC_ISREENT(sym->type) || options.stackAuto) {
-
-        if (options.useXstack) {
-            pic14_emitcode("mov","r0,%s",spname);
-            pic14_emitcode("mov","a,_bp");
-            pic14_emitcode("movx","@r0,a");
-            pic14_emitcode("inc","%s",spname);
+  if (IFFUNC_ISREENT (sym->type) || options.stackAuto)
+    {
+
+      if (options.useXstack)
+        {
+          pic14_emitcode ("mov", "r0,%s", spname);
+          pic14_emitcode ("mov", "a,_bp");
+          pic14_emitcode ("movx", "@r0,a");
+          pic14_emitcode ("inc", "%s", spname);
         }
-        else
+      else
         {
-            /* set up the stack */
-            pic14_emitcode ("push","_bp");   /* save the callers stack  */
+          /* set up the stack */
+          pic14_emitcode ("push", "_bp");       /* save the callers stack  */
         }
-        pic14_emitcode ("mov","_bp,%s",spname);
+      pic14_emitcode ("mov", "_bp,%s", spname);
     }
 
-    /* adjust the stack for the function */
-    if (sym->stack) {
+  /* adjust the stack for the function */
+  if (sym->stack)
+    {
 
-        int i = sym->stack;
-        if (i > 256 )
-            werror(W_STACK_OVERFLOW,sym->name);
+      int i = sym->stack;
+      if (i > 256)
+        werror (W_STACK_OVERFLOW, sym->name);
 
-        if (i > 3 && sym->recvSize < 4) {
+      if (i > 3 && sym->recvSize < 4)
+        {
 
-            pic14_emitcode ("mov","a,sp");
-            pic14_emitcode ("add","a,#0x%02x",((char)sym->stack & 0xff));
-            pic14_emitcode ("mov","sp,a");
+          pic14_emitcode ("mov", "a,sp");
+          pic14_emitcode ("add", "a,#0x%02x", ((char) sym->stack & 0xff));
+          pic14_emitcode ("mov", "sp,a");
 
         }
-        else
-            while(i--)
-                pic14_emitcode("inc","sp");
+      else
+        while (i--)
+          pic14_emitcode ("inc", "sp");
     }
 
-    if (sym->xstack) {
+  if (sym->xstack)
+    {
 
-        pic14_emitcode ("mov","a,_spx");
-        pic14_emitcode ("add","a,#0x%02x",((char)sym->xstack & 0xff));
-        pic14_emitcode ("mov","_spx,a");
+      pic14_emitcode ("mov", "a,_spx");
+      pic14_emitcode ("add", "a,#0x%02x", ((char) sym->xstack & 0xff));
+      pic14_emitcode ("mov", "_spx,a");
     }
 
 }
@@ -2411,129 +2514,157 @@
 /*-----------------------------------------------------------------*/
 /* genEndFunction - generates epilogue for functions               */
 /*-----------------------------------------------------------------*/
-static void genEndFunction (iCode *ic)
+static void
+genEndFunction (iCode * ic)
 {
-    symbol *sym = OP_SYMBOL(IC_LEFT(ic));
+  symbol *sym = OP_SYMBOL (IC_LEFT (ic));
 
-    FENTRY;
+  FENTRY;
 
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-    if (IFFUNC_ISREENT(sym->type) || options.stackAuto)
+  if (IFFUNC_ISREENT (sym->type) || options.stackAuto)
     {
-        pic14_emitcode ("mov","%s,_bp",spname);
+      pic14_emitcode ("mov", "%s,_bp", spname);
     }
 
-    /* if use external stack but some variables were
-    added to the local stack then decrement the
-    local stack */
-    if (options.useXstack && sym->stack) {
-        pic14_emitcode("mov","a,sp");
-        pic14_emitcode("add","a,#0x%02x",((char)-sym->stack) & 0xff);
-        pic14_emitcode("mov","sp,a");
+  /* if use external stack but some variables were
+     added to the local stack then decrement the
+     local stack */
+  if (options.useXstack && sym->stack)
+    {
+      pic14_emitcode ("mov", "a,sp");
+      pic14_emitcode ("add", "a,#0x%02x", ((char) - sym->stack) & 0xff);
+      pic14_emitcode ("mov", "sp,a");
     }
 
 
-    if ((IFFUNC_ISREENT(sym->type) || options.stackAuto)) {
-        if (options.useXstack) {
-            pic14_emitcode("mov","r0,%s",spname);
-            pic14_emitcode("movx","a,@r0");
-            pic14_emitcode("mov","_bp,a");
-            pic14_emitcode("dec","%s",spname);
+  if ((IFFUNC_ISREENT (sym->type) || options.stackAuto))
+    {
+      if (options.useXstack)
+        {
+          pic14_emitcode ("mov", "r0,%s", spname);
+          pic14_emitcode ("movx", "a,@r0");
+          pic14_emitcode ("mov", "_bp,a");
+          pic14_emitcode ("dec", "%s", spname);
         }
-        else
+      else
         {
-            pic14_emitcode ("pop","_bp");
+          pic14_emitcode ("pop", "_bp");
         }
     }
 
-    /* restore the register bank    */
-    if (FUNC_REGBANK(sym->type) || FUNC_ISISR(sym->type))
-        pic14_emitcode ("pop","psw");
-
-    if (IFFUNC_ISISR(sym->type)) {
-
-        /* now we need to restore the registers */
-        /* if this isr has no bank i.e. is going to
-        run with bank 0 , then we need to save more
-registers :-) */
-        if (!FUNC_REGBANK(sym->type)) {
-
-        /* if this function does not call any other
-        function then we can be economical and
-            save only those registers that are used */
-            if (! IFFUNC_HASFCALL(sym->type)) {
-                int i;
-
-                /* if any registers used */
-                if (sym->regsUsed) {
-                    /* save the registers used */
-                    for ( i = sym->regsUsed->size ; i >= 0 ; i--) {
-                        if (bitVectBitValue(sym->regsUsed,i)) {
-                            pic14_emitcode("pop","junk");//"%s",pic14_regWithIdx(i)->dname);
+  /* restore the register bank    */
+  if (FUNC_REGBANK (sym->type) || FUNC_ISISR (sym->type))
+    pic14_emitcode ("pop", "psw");
+
+  /* if critical function then turn interrupts off */
+  if (IFFUNC_ISCRITICAL (sym->type))
+    {
+      genEndCritical (NULL);
+    }                           // if
+
+  if (IFFUNC_ISISR (sym->type))
+    {
+
+      /* now we need to restore the registers */
+      /* if this isr has no bank i.e. is going to
+         run with bank 0 , then we need to save more
+         registers :-) */
+      if (!FUNC_REGBANK (sym->type))
+        {
+
+          /* if this function does not call any other
+             function then we can be economical and
+             save only those registers that are used */
+          if (!IFFUNC_HASFCALL (sym->type))
+            {
+              int i;
+
+              /* if any registers used */
+              if (sym->regsUsed)
+                {
+                  /* save the registers used */
+                  for (i = sym->regsUsed->size; i >= 0; i--)
+                    {
+                      if (bitVectBitValue (sym->regsUsed, i))
+                        {
+                          pic14_emitcode ("pop", "junk");       //"%s",pic14_regWithIdx(i)->dname);
                         }
                     }
                 }
 
-            } else {
-                /* this function has a function call; cannot
-                   determines register usage so we will have the
-                   entire bank */
-                unsaverbank(0,ic,FALSE);
             }
+          else
+            {
+              /* this function has a function call; cannot
+                 determines register usage so we will have the
+                 entire bank */
+              unsaverbank (0, ic, FALSE);
+            }
+        }
+
+      /* if debug then send end of function */
+      if (options.debug && debugFile && currFunc)
+        {
+          debugFile->writeEndFunction (currFunc, ic, 1);
+        }
+
+      if (pic14_getPIC ()->isEnhancedCore)
+        {
+          /* Nothing to do. */
         }
+      else
+        {
+          emitpcode (POC_MOVFW, popGetExternal ("___sdcc_saved_fsr", 1));
+          emitpcode (POC_MOVWF, popCopyReg (&pc_fsr));
+          //emitpcode(POC_MOVFW,  popGetExternal("___sdcc_saved_pclath", 1));
+          emitpcode (POC_MOVFW, popCopyReg (&pc_psave));
+          emitpcode (POC_MOVWF, popCopyReg (&pc_pclath));
+          emitpcode (POC_CLRF, popCopyReg (&pc_status));        // see genFunction
+          //emitpcode(POC_SWAPFW, popGetExternal("___sdcc_saved_status", 1));
+          emitpcode (POC_SWAPFW, popCopyReg (&pc_ssave));
+          emitpcode (POC_MOVWF, popCopyReg (&pc_status));
+          emitpcode (POC_SWAPF, popCopyReg (&pc_wsave));
+          emitpcode (POC_SWAPFW, popCopyReg (&pc_wsave));
+        }                       // if
+      addpCode2pBlock (pb, newpCodeLabel ("END_OF_INTERRUPT", -1));
+      emitpcodeNULLop (POC_RETFIE);
+    }
+  else
+    {
+      if (IFFUNC_ISCRITICAL (sym->type))
+        pic14_emitcode ("setb", "ea");
+
+      if (IFFUNC_CALLEESAVES (sym->type))
+        {
+          int i;
 
-        /* if debug then send end of function */
-        if (options.debug && debugFile && currFunc) {
-            debugFile->writeEndFunction (currFunc, ic, 1);
-        }
-
-        if (pic14_getPIC()->isEnhancedCore) {
-            /* Nothing to do. */
-        } else {
-            emitpcode(POC_MOVFW,  popGetExternal("___sdcc_saved_fsr", 1));
-            emitpcode(POC_MOVWF,  popCopyReg(&pc_fsr));
-            //emitpcode(POC_MOVFW,  popGetExternal("___sdcc_saved_pclath", 1));
-            emitpcode(POC_MOVFW,  popCopyReg(&pc_psave));
-            emitpcode(POC_MOVWF,  popCopyReg(&pc_pclath));
-            emitpcode(POC_CLRF,   popCopyReg(&pc_status)); // see genFunction
-            //emitpcode(POC_SWAPFW, popGetExternal("___sdcc_saved_status", 1));
-            emitpcode(POC_SWAPFW, popCopyReg(&pc_ssave));
-            emitpcode(POC_MOVWF,  popCopyReg(&pc_status));
-            emitpcode(POC_SWAPF,  popCopyReg(&pc_wsave));
-            emitpcode(POC_SWAPFW, popCopyReg(&pc_wsave));
-        } // if
-        addpCode2pBlock(pb,newpCodeLabel("END_OF_INTERRUPT",-1));
-        emitpcodeNULLop(POC_RETFIE);
-    }
-    else {
-        if (IFFUNC_ISCRITICAL(sym->type))
-            pic14_emitcode("setb","ea");
-
-        if (IFFUNC_CALLEESAVES(sym->type)) {
-            int i;
-
-            /* if any registers used */
-            if (sym->regsUsed) {
-                /* save the registers used */
-                for ( i = sym->regsUsed->size ; i >= 0 ; i--) {
-                    if (bitVectBitValue(sym->regsUsed,i)) {
-                        pic14_emitcode("pop","junk");//"%s",pic14_regWithIdx(i)->dname);
+          /* if any registers used */
+          if (sym->regsUsed)
+            {
+              /* save the registers used */
+              for (i = sym->regsUsed->size; i >= 0; i--)
+                {
+                  if (bitVectBitValue (sym->regsUsed, i))
+                    {
+                      pic14_emitcode ("pop", "junk");   //"%s",pic14_regWithIdx(i)->dname);
                     }
                 }
             }
         }
 
-        /* if debug then send end of function */
-        if (options.debug && debugFile && currFunc) {
-            debugFile->writeEndFunction (currFunc, ic, 1);
+      /* if debug then send end of function */
+      if (options.debug && debugFile && currFunc)
+        {
+          debugFile->writeEndFunction (currFunc, ic, 1);
         }
 
-        pic14_emitcode ("return","");
-        emitpcodeNULLop(POC_RETURN);
+      pic14_emitcode ("return", "");
+      emitpcodeNULLop (POC_RETURN);
 
-        /* Mark the end of a function */
-        addpCode2pBlock(pb,newpCodeFunction(NULL,NULL,0));
+      /* Mark the end of a function */
+      addpCode2pBlock (pb, newpCodeFunction (NULL, NULL, 0));
     }
 
 }
@@ -2541,86 +2672,128 @@
 /*-----------------------------------------------------------------*/
 /* genRet - generate code for return statement                     */
 /*-----------------------------------------------------------------*/
-static void genRet (iCode *ic)
+static void
+genRet (iCode * ic)
 {
-    int size,offset = 0;
+  int size, offset = 0;
 
-    FENTRY;
+  FENTRY;
 
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* if we have no return value then
-    just generate the "ret" */
-    if (!IC_LEFT(ic))
-        goto jumpret;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  /* if we have no return value then
+     just generate the "ret" */
+  if (!IC_LEFT (ic))
+    goto jumpret;
 
-        /* we have something to return then
-    move the return value into place */
-    aopOp(IC_LEFT(ic),ic,FALSE);
-    size = AOP_SIZE(IC_LEFT(ic));
+  /* we have something to return then
+     move the return value into place */
+  aopOp (IC_LEFT (ic), ic, FALSE);
+  size = AOP_SIZE (IC_LEFT (ic));
 
-    for (offset = 0; offset < size; offset++)
+  for (offset = 0; offset < size; offset++)
     {
-        pass_argument (IC_LEFT(ic), offset, size - 1 - offset);
+      pass_argument (IC_LEFT (ic), offset, size - 1 - offset);
     }
 
-    freeAsmop (IC_LEFT(ic),NULL,ic,TRUE);
+  freeAsmop (IC_LEFT (ic), NULL, ic, TRUE);
 
 jumpret:
-    /* generate a jump to the return label
-    if the next is not the return statement */
-    if (!(ic->next && ic->next->op == LABEL &&
-        IC_LABEL(ic->next) == returnLabel)) {
+  /* generate a jump to the return label
+     if the next is not the return statement */
+  if (!(ic->next && ic->next->op == LABEL && IC_LABEL (ic->next) == returnLabel))
+    {
 
-        emitpcode(POC_GOTO,popGetLabel(returnLabel->key));
+      emitpcode (POC_GOTO, popGetLabel (returnLabel->key));
     }
 
 }
 
+static set *critical_temps = NULL;
+
+static void
+genCritical (iCode * ic)
+{
+  pCodeOp *saved_intcon;
+
+  (void) ic;
+
+  if (!critical_temps)
+    critical_temps = newSet ();
+
+  saved_intcon = popGetTempReg ();
+  addSetHead (&critical_temps, saved_intcon);
+
+  /* This order saves one BANKSEL back to INTCON. */
+  emitpcode (POC_MOVFW, popCopyReg (&pc_intcon));
+  emitpcode (POC_BCF, popCopyGPR2Bit (popCopyReg (&pc_intcon), 7));
+  emitpcode (POC_MOVWF, pCodeOpCopy (saved_intcon));
+}
+
+static void
+genEndCritical (iCode * ic)
+{
+  pCodeOp *saved_intcon = NULL;
+
+  (void) ic;
+
+  saved_intcon = getSet (&critical_temps);
+  if (!saved_intcon)
+    {
+      fprintf (stderr, "Critical section left, but none entered -- ignoring for now.\n");
+      return;
+    }                           // if
+
+  emitpcode (POC_BTFSC, popCopyGPR2Bit (pCodeOpCopy (saved_intcon), 7));
+  emitpcode (POC_BSF, popCopyGPR2Bit (popCopyReg (&pc_intcon), 7));
+  popReleaseTempReg (saved_intcon);
+}
+
 /*-----------------------------------------------------------------*/
 /* genLabel - generates a label                                    */
 /*-----------------------------------------------------------------*/
-static void genLabel (iCode *ic)
+static void
+genLabel (iCode * ic)
 {
-    FENTRY;
+  FENTRY;
 
-    /* special case never generate */
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    if (IC_LABEL(ic) == entryLabel)
-        return ;
+  /* special case never generate */
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  if (IC_LABEL (ic) == entryLabel)
+    return;
 
-    emitpLabel(IC_LABEL(ic)->key);
-    pic14_emitcode("","_%05d_DS_:",(IC_LABEL(ic)->key+100 + labelOffset));
+  emitpLabel (IC_LABEL (ic)->key);
+  pic14_emitcode ("", "_%05d_DS_:", labelKey2num (IC_LABEL (ic)->key + labelOffset));
 }
 
 /*-----------------------------------------------------------------*/
 /* genGoto - generates a goto                                      */
 /*-----------------------------------------------------------------*/
 //tsd
-static void genGoto (iCode *ic)
+static void
+genGoto (iCode * ic)
 {
-    FENTRY;
+  FENTRY;
 
-    emitpcode(POC_GOTO,popGetLabel(IC_LABEL(ic)->key));
-    pic14_emitcode ("goto","_%05d_DS_",(IC_LABEL(ic)->key+100)+labelOffset);
+  emitpcode (POC_GOTO, popGetLabel (IC_LABEL (ic)->key));
+  pic14_emitcode ("goto", "_%05d_DS_", labelKey2num (IC_LABEL (ic)->key + labelOffset));
 }
 
 
 /*-----------------------------------------------------------------*/
 /* genMultbits :- multiplication of bits                           */
 /*-----------------------------------------------------------------*/
-static void genMultbits (operand *left,
-                         operand *right,
-                         operand *result)
-{
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
-    if(!pic14_sameRegs(AOP(result),AOP(right)))
-        emitpcode(POC_BSF,  popGet(AOP(result),0));
-
-    emitpcode(POC_BTFSC,popGet(AOP(right),0));
-    emitpcode(POC_BTFSS,popGet(AOP(left),0));
-    emitpcode(POC_BCF,  popGet(AOP(result),0));
+static void
+genMultbits (operand * left, operand * right, operand * result)
+{
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+
+  if (!pic14_sameRegs (AOP (result), AOP (right)))
+    emitpcode (POC_BSF, popGet (AOP (result), 0));
+
+  emitpcode (POC_BTFSC, popGet (AOP (right), 0));
+  emitpcode (POC_BTFSS, popGet (AOP (left), 0));
+  emitpcode (POC_BCF, popGet (AOP (result), 0));
 
 }
 
@@ -2628,379 +2801,374 @@
 /*-----------------------------------------------------------------*/
 /* genMultOneByte : 8 bit multiplication & division                */
 /*-----------------------------------------------------------------*/
-static void genMultOneByte (operand *left,
-                            operand *right,
-                            operand *result)
+static void
+genMultOneByte (operand * left, operand * right, operand * result)
 {
-    char *func[] = { NULL, "__mulchar", "__mulint", NULL, "__mullong" };
+  char *func[] = { NULL, "__mulchar", "__mulint", NULL, "__mullong" };
 
-    // symbol *lbl ;
-    int size,offset,i;
+  // symbol *lbl ;
+  int size, offset, i;
 
 
-    FENTRY;
+  FENTRY;
 
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    DEBUGpic14_AopType(__LINE__,left,right,result);
-    DEBUGpic14_AopTypeSign(__LINE__,left,right,result);
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  DEBUGpic14_AopType (__LINE__, left, right, result);
+  DEBUGpic14_AopTypeSign (__LINE__, left, right, result);
 
-    /* (if two literals, the value is computed before) */
-    /* if one literal, literal on the right */
-    if (AOP_TYPE(left) == AOP_LIT){
-        operand *t = right;
-        right = left;
-        left = t;
+  /* (if two literals, the value is computed before) */
+  /* if one literal, literal on the right */
+  if (AOP_TYPE (left) == AOP_LIT)
+    {
+      operand *t = right;
+      right = left;
+      left = t;
     }
 
-    assert (AOP_SIZE(left) == AOP_SIZE(right));
-
-    size = min(AOP_SIZE(result),AOP_SIZE(left));
-    offset = Gstack_base_addr - (2*size - 1);
+  assert (AOP_SIZE (left) == AOP_SIZE (right));
 
-    /* pass right operand as argument */
-    for (i=0; i < size; i++)
-    {
-        mov2w (AOP(right), i);
-        emitpcode(POC_MOVWF, popRegFromIdx (++offset));
-    } // for
+  size = min (AOP_SIZE (result), AOP_SIZE (left));
+  offset = Gstack_base_addr - (2 * size - 1);
 
-    /* pass left operand as argument */
-    for (i=0; i < size; i++)
+  /* pass right operand as argument */
+  for (i = 0; i < size; i++)
     {
-        mov2w (AOP(left), i);
-        if (i != size-1) emitpcode(POC_MOVWF, popRegFromIdx (++offset));
-    } // for
-    assert (offset == Gstack_base_addr);
-
-    /* call library routine */
-    assert (size > 0 && size <= 4);
-    call_libraryfunc (func[size]);
-
-    /* assign result */
-    movwf (AOP(result), size-1);
-    for (i=0; i < size - 1; i++)
-    {
-        emitpcode(POC_MOVFW, popRegFromIdx (Gstack_base_addr - i));
-        movwf (AOP(result), size - 2 - i);
-    } // for
+      mov2w (AOP (right), i);
+      emitpcode (POC_MOVWF, popRegFromIdx (++offset));
+    }                           // for
+
+  /* pass left operand as argument */
+  for (i = 0; i < size; i++)
+    {
+      mov2w (AOP (left), i);
+      if (i != size - 1)
+        emitpcode (POC_MOVWF, popRegFromIdx (++offset));
+    }                           // for
+  assert (offset == Gstack_base_addr);
+
+  /* call library routine */
+  assert (size > 0 && size <= 4);
+  call_libraryfunc (func[size]);
+
+  /* assign result */
+  movwf (AOP (result), size - 1);
+  for (i = 0; i < size - 1; i++)
+    {
+      emitpcode (POC_MOVFW, popRegFromIdx (Gstack_base_addr - i));
+      movwf (AOP (result), size - 2 - i);
+    }                           // for
 
-    /* now (zero-/sign) extend the result to its size */
-    addSign (result, AOP_SIZE(left), !SPEC_USIGN(operandType(result)));
+  /* now (zero-/sign) extend the result to its size */
+  addSign (result, AOP_SIZE (left), !SPEC_USIGN (operandType (result)));
 }
 
 /*-----------------------------------------------------------------*/
 /* genMult - generates code for multiplication                     */
 /*-----------------------------------------------------------------*/
-static void genMult (iCode *ic)
+static void
+genMult (iCode * ic)
 {
-    operand *left = IC_LEFT(ic);
-    operand *right = IC_RIGHT(ic);
-    operand *result= IC_RESULT(ic);
+  operand *left = IC_LEFT (ic);
+  operand *right = IC_RIGHT (ic);
+  operand *result = IC_RESULT (ic);
 
-    FENTRY;
+  FENTRY;
 
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* assign the amsops */
-    aopOp (left,ic,FALSE);
-    aopOp (right,ic,FALSE);
-    aopOp (result,ic,TRUE);
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  /* assign the amsops */
+  aopOp (left, ic, FALSE);
+  aopOp (right, ic, FALSE);
+  aopOp (result, ic, TRUE);
 
-    DEBUGpic14_AopType(__LINE__,left,right,result);
+  DEBUGpic14_AopType (__LINE__, left, right, result);
 
-    /* special cases first */
-    /* both are bits */
-    if (AOP_TYPE(left) == AOP_CRY &&
-        AOP_TYPE(right)== AOP_CRY) {
-        genMultbits(left,right,result);
-        goto release ;
+  /* special cases first */
+  /* both are bits */
+  if (AOP_TYPE (left) == AOP_CRY && AOP_TYPE (right) == AOP_CRY)
+    {
+      genMultbits (left, right, result);
+      goto release;
     }
 
-    /* if both are of size == 1 */
-    if (AOP_SIZE(left) == 1 &&
-        AOP_SIZE(right) == 1 ) {
-        genMultOneByte(left,right,result);
-        goto release ;
+  /* if both are of size == 1 */
+  if (AOP_SIZE (left) == 1 && AOP_SIZE (right) == 1)
+    {
+      genMultOneByte (left, right, result);
+      goto release;
     }
 
-    /* should have been converted to function call */
-    assert(0) ;
+  /* should have been converted to function call */
+  assert (0);
 
-release :
-    freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    freeAsmop(result,NULL,ic,TRUE);
+release:
+  freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genDivbits :- division of bits                                  */
 /*-----------------------------------------------------------------*/
-static void genDivbits (operand *left,
-                        operand *right,
-                        operand *result)
+static void
+genDivbits (operand * left, operand * right, operand * result)
 {
 
-    char *l;
+  char *l;
 
-    FENTRY;
-
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* the result must be bit */
-    pic14_emitcode("mov","b,%s",aopGet(AOP(right),0,FALSE,FALSE));
-    l = aopGet(AOP(left),0,FALSE,FALSE);
-
-    MOVA(l);
+  FENTRY;
 
-    pic14_emitcode("div","ab");
-    pic14_emitcode("rrc","a");
-    aopPut(AOP(result),"c",0);
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  /* the result must be bit */
+  pic14_emitcode ("mov", "b,%s", aopGet (AOP (right), 0, FALSE, FALSE));
+  l = aopGet (AOP (left), 0, FALSE, FALSE);
+
+  MOVA (l);
+
+  pic14_emitcode ("div", "ab");
+  pic14_emitcode ("rrc", "a");
+  aopPut (AOP (result), "c", 0);
 }
 
 /*-----------------------------------------------------------------*/
 /* genDivOneByte : 8 bit division                                  */
 /*-----------------------------------------------------------------*/
-static void genDivOneByte (operand *left,
-                           operand *right,
-                           operand *result)
-{
-    int size;
-    int sign;
-
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
-    assert (AOP_SIZE(right) == 1);
-    assert (AOP_SIZE(left) == 1);
-
-    size = min(AOP_SIZE(result),AOP_SIZE(left));
-    sign = !(SPEC_USIGN(operandType(left))
-        && SPEC_USIGN(operandType(right)));
-
-    if (AOP_TYPE(right) == AOP_LIT)
-    {
-        /* XXX: might add specialized code */
-    }
-
-    if (!sign)
-    {
-        /* unsigned division */
-    #if 1
-        mov2w(AOP(right),0);
-        emitpcode(POC_MOVWF, popRegFromIdx(Gstack_base_addr));
-        mov2w(AOP(left),0);
-        call_libraryfunc("__divuchar");
-        movwf(AOP(result),0);
-    #else
-        pCodeOp *temp;
-        symbol *lbl;
-
-        temp = popGetTempReg();
-        lbl = newiTempLabel(NULL);
-
-        /* XXX: improve this naive approach:
-           [result] = [a] / [b]
-            ::= [result] = 0; while ([a] > [b]) do [a] -= [b]; [result]++ done
-
-           In PIC assembler:
-           movf  left,W
-           movwf temp       // temp <-- left
-           movf  right,W    // W <-- right
-           clrf  result
-           label1:
-           incf  result
-           subwf temp,F     // temp <-- temp - W
-           skipNC       // subwf clears CARRY (i.e. sets BORROW) if temp < W
-           goto  label1
-           decf result      // we just subtract once too often
-         */
-
-        /* XXX: This loops endlessly on DIVIDE BY ZERO */
-        /* We need 1..128 iterations of the loop body (`4 / 5' .. `255 / 2'). */
-
-        mov2w(AOP(left),0);
-        emitpcode(POC_MOVWF, temp);
-        mov2w(AOP(right),0);
-        emitpcode(POC_CLRF, popGet(AOP(result),0));
-
-        emitpLabel(lbl->key);
-        emitpcode(POC_INCF, popGet(AOP(result),0));
-        emitpcode(POC_SUBWF, temp);
-        emitSKPNC;
-        emitpcode(POC_GOTO, popGetLabel(lbl->key));
-        emitpcode(POC_DECF, popGet(AOP(result),0));
-        popReleaseTempReg(temp);
-    #endif
-    }
-    else
-    {
-        /* signed division */
-        mov2w(AOP(right),0);
-        emitpcode(POC_MOVWF, popRegFromIdx(Gstack_base_addr));
-        mov2w(AOP(left),0);
-        call_libraryfunc("__divschar");
-        movwf(AOP(result),0);
+static void
+genDivOneByte (operand * left, operand * right, operand * result)
+{
+  int sign;
+
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+
+  assert (AOP_SIZE (right) == 1);
+  assert (AOP_SIZE (left) == 1);
+
+  sign = !(SPEC_USIGN (operandType (left)) && SPEC_USIGN (operandType (right)));
+
+  if (AOP_TYPE (right) == AOP_LIT)
+    {
+      /* XXX: might add specialized code */
+    }
+
+  if (!sign)
+    {
+      /* unsigned division */
+#if 1
+      mov2w (AOP (right), 0);
+      emitpcode (POC_MOVWF, popRegFromIdx (Gstack_base_addr));
+      mov2w (AOP (left), 0);
+      call_libraryfunc ("__divuchar");
+      movwf (AOP (result), 0);
+#else
+      pCodeOp *temp;
+      symbol *lbl;
+
+      temp = popGetTempReg ();
+      lbl = newiTempLabel (NULL);
+
+      /* XXX: improve this naive approach:
+         [result] = [a] / [b]
+         ::= [result] = 0; while ([a] > [b]) do [a] -= [b]; [result]++ done
+
+         In PIC assembler:
+         movf  left,W
+         movwf temp       // temp <-- left
+         movf  right,W    // W <-- right
+         clrf  result
+         label1:
+         incf  result
+         subwf temp,F     // temp <-- temp - W
+         skipNC       // subwf clears CARRY (i.e. sets BORROW) if temp < W
+         goto  label1
+         decf result      // we just subtract once too often
+       */
+
+      /* XXX: This loops endlessly on DIVIDE BY ZERO */
+      /* We need 1..128 iterations of the loop body (`4 / 5' .. `255 / 2'). */
+
+      mov2w (AOP (left), 0);
+      emitpcode (POC_MOVWF, temp);
+      mov2w (AOP (right), 0);
+      emitpcode (POC_CLRF, popGet (AOP (result), 0));
+
+      emitpLabel (lbl->key);
+      emitpcode (POC_INCF, popGet (AOP (result), 0));
+      emitpcode (POC_SUBWF, temp);
+      emitSKPNC;
+      emitpcode (POC_GOTO, popGetLabel (lbl->key));
+      emitpcode (POC_DECF, popGet (AOP (result), 0));
+      popReleaseTempReg (temp);
+#endif
+    }
+  else
+    {
+      /* signed division */
+      mov2w (AOP (right), 0);
+      emitpcode (POC_MOVWF, popRegFromIdx (Gstack_base_addr));
+      mov2w (AOP (left), 0);
+      call_libraryfunc ("__divschar");
+      movwf (AOP (result), 0);
     }
 
-    /* now performed the signed/unsigned division -- extend result */
-    addSign(result, 1, sign);
+  /* now performed the signed/unsigned division -- extend result */
+  addSign (result, 1, sign);
 }
 
 /*-----------------------------------------------------------------*/
 /* genDiv - generates code for division                */
 /*-----------------------------------------------------------------*/
-static void genDiv (iCode *ic)
+static void
+genDiv (iCode * ic)
 {
-    operand *left = IC_LEFT(ic);
-    operand *right = IC_RIGHT(ic);
-    operand *result= IC_RESULT(ic);
-
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* assign the amsops */
-    aopOp (left,ic,FALSE);
-    aopOp (right,ic,FALSE);
-    aopOp (result,ic,TRUE);
-
-    /* special cases first */
-    /* both are bits */
-    if (AOP_TYPE(left) == AOP_CRY &&
-        AOP_TYPE(right)== AOP_CRY) {
-        genDivbits(left,right,result);
-        goto release ;
-    }
-
-    /* if both are of size == 1 */
-    if (AOP_SIZE(left) == 1 &&
-        AOP_SIZE(right) == 1 ) {
-        genDivOneByte(left,right,result);
-        goto release ;
-    }
-
-    /* should have been converted to function call */
-    assert(0);
-release :
-    freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    freeAsmop(result,NULL,ic,TRUE);
+  operand *left = IC_LEFT (ic);
+  operand *right = IC_RIGHT (ic);
+  operand *result = IC_RESULT (ic);
+
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  /* assign the amsops */
+  aopOp (left, ic, FALSE);
+  aopOp (right, ic, FALSE);
+  aopOp (result, ic, TRUE);
+
+  /* special cases first */
+  /* both are bits */
+  if (AOP_TYPE (left) == AOP_CRY && AOP_TYPE (right) == AOP_CRY)
+    {
+      genDivbits (left, right, result);
+      goto release;
+    }
+
+  /* if both are of size == 1 */
+  if (AOP_SIZE (left) == 1 && AOP_SIZE (right) == 1)
+    {
+      genDivOneByte (left, right, result);
+      goto release;
+    }
+
+  /* should have been converted to function call */
+  assert (0);
+release:
+  freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genModOneByte : 8 bit modulus                                   */
 /*-----------------------------------------------------------------*/
-static void genModOneByte (operand *left,
-                           operand *right,
-                           operand *result)
+static void
+genModOneByte (operand * left, operand * right, operand * result)
 {
-    int size;
-    int sign;
+  int sign;
 
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-    assert (AOP_SIZE(right) == 1);
-    assert (AOP_SIZE(left) == 1);
+  assert (AOP_SIZE (right) == 1);
+  assert (AOP_SIZE (left) == 1);
 
-    size = min(AOP_SIZE(result),AOP_SIZE(left));
-    sign = !(SPEC_USIGN(operandType(left))
-        && SPEC_USIGN(operandType(right)));
+  sign = !(SPEC_USIGN (operandType (left)) && SPEC_USIGN (operandType (right)));
 
-    if (AOP_TYPE(right) == AOP_LIT)
+  if (AOP_TYPE (right) == AOP_LIT)
     {
-        /* XXX: might add specialized code */
+      /* XXX: might add specialized code */
     }
 
-    if (!sign)
+  if (!sign)
     {
-        /* unsigned division */
-    #if 1
-        mov2w(AOP(right),0);
-        emitpcode(POC_MOVWF, popRegFromIdx(Gstack_base_addr));
-        mov2w(AOP(left),0);
-        call_libraryfunc("__moduchar");
-        movwf(AOP(result),0);
-    #else
-        pCodeOp *temp;
-        symbol *lbl;
-
-        lbl = newiTempLabel(NULL);
+      /* unsigned division */
+#if 1
+      mov2w (AOP (right), 0);
+      emitpcode (POC_MOVWF, popRegFromIdx (Gstack_base_addr));
+      mov2w (AOP (left), 0);
+      call_libraryfunc ("__moduchar");
+      movwf (AOP (result), 0);
+#else
+      pCodeOp *temp;
+      symbol *lbl;
 
-        assert(!pic14_sameRegs(AOP(right),AOP(result)));
+      lbl = newiTempLabel (NULL);
 
-        /* XXX: improve this naive approach:
-           [result] = [a] % [b]
-            ::= [result] = [a]; while ([result] > [b]) do [result] -= [b]; done
+      assert (!pic14_sameRegs (AOP (right), AOP (result)));
 
-           In PIC assembler:
-           movf  left,W
-           movwf result     // result <-- left
-           movf  right,W    // W <-- right
-           label1:
-           subwf result,F   // result <-- result - W
-           skipNC       // subwf clears CARRY (i.e. sets BORROW) if result < W
-           goto  label1
-           addwf result, F  // we just subtract once too often
-         */
+      /* XXX: improve this naive approach:
+         [result] = [a] % [b]
+         ::= [result] = [a]; while ([result] > [b]) do [result] -= [b]; done
+
+         In PIC assembler:
+         movf  left,W
+         movwf result     // result <-- left
+         movf  right,W    // W <-- right
+         label1:
+         subwf result,F   // result <-- result - W
+         skipNC       // subwf clears CARRY (i.e. sets BORROW) if result < W
+         goto  label1
+         addwf result, F  // we just subtract once too often
+       */
 
-        /* XXX: This loops endlessly on DIVIDE BY ZERO */
-        /* We need 1..128 iterations of the loop body (`4 % 5' .. `255 % 2'). */
+      /* XXX: This loops endlessly on DIVIDE BY ZERO */
+      /* We need 1..128 iterations of the loop body (`4 % 5' .. `255 % 2'). */
 
-        if (!pic14_sameRegs(AOP(left), AOP(result)))
+      if (!pic14_sameRegs (AOP (left), AOP (result)))
         {
-            mov2w(AOP(left),0);
-            emitpcode(POC_MOVWF, popGet(AOP(result),0));
+          mov2w (AOP (left), 0);
+          emitpcode (POC_MOVWF, popGet (AOP (result), 0));
         }
-        mov2w(AOP(right),0);
+      mov2w (AOP (right), 0);
 
-        emitpLabel(lbl->key);
-        emitpcode(POC_SUBWF, popGet(AOP(result),0));
-        emitSKPNC;
-        emitpcode(POC_GOTO, popGetLabel(lbl->key));
-        emitpcode(POC_ADDWF, popGet(AOP(result),0));
-    #endif
-    }
-    else
-    {
-        /* signed division */
-        mov2w(AOP(right),0);
-        emitpcode(POC_MOVWF, popRegFromIdx(Gstack_base_addr));
-        mov2w(AOP(left),0);
-        call_libraryfunc("__modschar");
-        movwf(AOP(result),0);
+      emitpLabel (lbl->key);
+      emitpcode (POC_SUBWF, popGet (AOP (result), 0));
+      emitSKPNC;
+      emitpcode (POC_GOTO, popGetLabel (lbl->key));
+      emitpcode (POC_ADDWF, popGet (AOP (result), 0));
+#endif
+    }
+  else
+    {
+      /* signed division */
+      mov2w (AOP (right), 0);
+      emitpcode (POC_MOVWF, popRegFromIdx (Gstack_base_addr));
+      mov2w (AOP (left), 0);
+      call_libraryfunc ("__modschar");
+      movwf (AOP (result), 0);
     }
 
-    /* now we performed the signed/unsigned modulus -- extend result */
-    addSign(result, 1, sign);
+  /* now we performed the signed/unsigned modulus -- extend result */
+  addSign (result, 1, sign);
 }
 
 /*-----------------------------------------------------------------*/
 /* genMod - generates code for division                            */
 /*-----------------------------------------------------------------*/
-static void genMod (iCode *ic)
+static void
+genMod (iCode * ic)
 {
-    operand *left = IC_LEFT(ic);
-    operand *right = IC_RIGHT(ic);
-    operand *result= IC_RESULT(ic);
-
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* assign the amsops */
-    aopOp (left,ic,FALSE);
-    aopOp (right,ic,FALSE);
-    aopOp (result,ic,TRUE);
-
-    /* if both are of size == 1 */
-    if (AOP_SIZE(left) == 1 &&
-        AOP_SIZE(right) == 1 ) {
-        genModOneByte(left,right,result);
-        goto release ;
-    }
-
-    /* should have been converted to function call */
-    assert(0);
-
-release :
-    freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    freeAsmop(result,NULL,ic,TRUE);
+  operand *left = IC_LEFT (ic);
+  operand *right = IC_RIGHT (ic);
+  operand *result = IC_RESULT (ic);
+
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  /* assign the amsops */
+  aopOp (left, ic, FALSE);
+  aopOp (right, ic, FALSE);
+  aopOp (result, ic, TRUE);
+
+  /* if both are of size == 1 */
+  if (AOP_SIZE (left) == 1 && AOP_SIZE (right) == 1)
+    {
+      genModOneByte (left, right, result);
+      goto release;
+    }
+
+  /* should have been converted to function call */
+  assert (0);
+
+release:
+  freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
@@ -3009,66 +3177,72 @@
 /*
 note: May need to add parameter to indicate when a variable is in bit space.
 */
-static void genIfxJump (iCode *ic, char *jval)
+static void
+genIfxJump (iCode * ic, char *jval)
 {
 
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* if true label then we jump if condition
-    supplied is true */
-    if ( IC_TRUE(ic) ) {
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  /* if true label then we jump if condition
+     supplied is true */
+  if (IC_TRUE (ic))
+    {
 
-        if(strcmp(jval,"a") == 0)
-            emitSKPZ;
-        else if (strcmp(jval,"c") == 0)
-            emitSKPC;
-        else {
-            DEBUGpic14_emitcode ("; ***","%d - assuming %s is in bit space",__LINE__,jval);
-            emitpcode(POC_BTFSC,    newpCodeOpBit(jval,-1,1));
+      if (strcmp (jval, "a") == 0)
+        emitSKPZ;
+      else if (strcmp (jval, "c") == 0)
+        emitSKPC;
+      else
+        {
+          DEBUGpic14_emitcode ("; ***", "%d - assuming %s is in bit space", __LINE__, jval);
+          emitpcode (POC_BTFSC, newpCodeOpBit (jval, -1, 1));
         }
 
-        emitpcode(POC_GOTO,popGetLabel(IC_TRUE(ic)->key));
-        pic14_emitcode(" goto","_%05d_DS_",IC_TRUE(ic)->key+100 + labelOffset);
+      emitpcode (POC_GOTO, popGetLabel (IC_TRUE (ic)->key));
+      pic14_emitcode (" goto", "_%05d_DS_", labelKey2num (IC_TRUE (ic)->key + labelOffset));
 
     }
-    else {
-        /* false label is present */
-        if(strcmp(jval,"a") == 0)
-            emitSKPNZ;
-        else if (strcmp(jval,"c") == 0)
-            emitSKPNC;
-        else {
-            DEBUGpic14_emitcode ("; ***","%d - assuming %s is in bit space",__LINE__,jval);
-            emitpcode(POC_BTFSS,    newpCodeOpBit(jval,-1,1));
+  else
+    {
+      /* false label is present */
+      if (strcmp (jval, "a") == 0)
+        emitSKPNZ;
+      else if (strcmp (jval, "c") == 0)
+        emitSKPNC;
+      else
+        {
+          DEBUGpic14_emitcode ("; ***", "%d - assuming %s is in bit space", __LINE__, jval);
+          emitpcode (POC_BTFSS, newpCodeOpBit (jval, -1, 1));
         }
 
-        emitpcode(POC_GOTO,popGetLabel(IC_FALSE(ic)->key));
-        pic14_emitcode(" goto","_%05d_DS_",IC_FALSE(ic)->key+100 + labelOffset);
+      emitpcode (POC_GOTO, popGetLabel (IC_FALSE (ic)->key));
+      pic14_emitcode (" goto", "_%05d_DS_", labelKey2num (IC_FALSE (ic)->key + labelOffset));
 
     }
 
 
-    /* mark the icode as generated */
-    ic->generated = 1;
+  /* mark the icode as generated */
+  ic->generated = 1;
 }
 
 /*-----------------------------------------------------------------*/
 /* genSkipc                                                        */
 /*-----------------------------------------------------------------*/
-static void genSkipc(resolvedIfx *rifx)
+static void
+genSkipc (resolvedIfx * rifx)
 {
-    FENTRY;
-    if(!rifx)
-        return;
+  FENTRY;
+  if (!rifx)
+    return;
 
-    if(rifx->condition)
-        emitSKPNC;
-    else
-        emitSKPC;
+  if (rifx->condition)
+    emitSKPNC;
+  else
+    emitSKPC;
 
-    emitpcode(POC_GOTO,popGetLabel(rifx->lbl->key));
-    emitpComment ("%s:%u: created from rifx:%p", __FUNCTION__, __LINE__, rifx);
-    rifx->generated = 1;
+  emitpcode (POC_GOTO, popGetLabel (rifx->lbl->key));
+  emitpComment ("%s:%u: created from rifx:%p", __FUNCTION__, __LINE__, rifx);
+  rifx->generated = 1;
 }
 
 #define isAOP_REGlike(x)  (AOP_TYPE(x) == AOP_REG || AOP_TYPE(x) == AOP_DIR || AOP_TYPE(x) == AOP_PCODE)
@@ -3080,13 +3254,17 @@
 /*                  aop (if it's NOT a literal) or from lit (if    */
 /*                  aop is a literal)                              */
 /*-----------------------------------------------------------------*/
-static void pic14_mov2w_regOrLit (asmop *aop, unsigned long lit, int offset)
+static void
+pic14_mov2w_regOrLit (asmop * aop, unsigned long lit, int offset)
 {
-  if (aop->type == AOP_LIT) {
-    emitpcode (POC_MOVLW, popGetLit((lit >> (offset*8)) & 0x00FF));
-  } else {
-    emitpcode (POC_MOVFW, popGet (aop, offset));
-  }
+  if (aop->type == AOP_LIT)
+    {
+      emitpcode (POC_MOVLW, popGetLit ((lit >> (offset * 8)) & 0x00FF));
+    }
+  else
+    {
+      emitpcode (POC_MOVFW, popGet (aop, offset));
+    }
 }
 
 /* genCmp performs a left < right comparison, stores
@@ -3097,8 +3275,8 @@
  * "B[CS]F STATUS,0; BTFS[CS] STATUS,0"
  * which should be optmized by the peephole
  * optimizer - RN 2005-01-01 */
-static void genCmp (operand *left,operand *right,
-                    operand *result, iCode *ifx, int sign)
+static void
+genCmp (operand * left, operand * right, operand * result, iCode * ifx, int sign)
 {
   resolvedIfx rIfx;
   int size;
@@ -3141,10 +3319,10 @@
       pic16_emitpcode (POC_BTFSS, pic16_popGet (AOP (left), 0));
       // {0,1} < 0 is false --> clear C by NOT skipping the next instruction
       pic16_emitpcode (POC_BTFSS, pic16_popCopyGPR2Bit (pic16_popGet (AOP (right), 0), PCORB (pcright)->bit));
-      emitCLRC; // only skipped for left=0 && right=1
+      emitCLRC;                 // only skipped for left=0 && right=1
 
       goto correct_result_in_carry;
-    } // if
+    }                           // if
 #endif
 
   /*************************************************
@@ -3167,7 +3345,7 @@
           else
             emitSETC;
           goto correct_result_in_carry;
-        } // if
+        }                       // if
 
       // This fails for lit = 0xFF (unsigned) AND lit = 0x7F (signed),
       // that's why we handled it above.
@@ -3177,15 +3355,15 @@
       left = right;
       right = dummy;
 
-      performedLt ^= 1; // instead of "left < right" we check for "right >= left+1, i.e. "right < left+1"
+      performedLt ^= 1;         // instead of "left < right" we check for "right >= left+1, i.e. "right < left+1"
     }
   else if (isAOP_LIT (right))
     {
       lit = ulFromVal (AOP (right)->aopu.aop_lit);
-    } // if
+    }                           // if
 
-  assert (isAOP_REGlike (left)); // left must be register or the like
-  assert (isAOP_REGlike (right) || isAOP_LIT (right)); // right may be register-like or a literal
+  assert (isAOP_REGlike (left));        // left must be register or the like
+  assert (isAOP_REGlike (right) || isAOP_LIT (right));  // right may be register-like or a literal
 
   /*************************************************
    * special cases go here                         *
@@ -3196,7 +3374,7 @@
       if (!sign)
         {
           // unsigned comparison to a literal
-          DEBUGpc ("unsigned compare: left %s lit(0x%X=%lu), size=%d", performedLt ? "<" : ">=", lit, lit, size+1);
+          DEBUGpc ("unsigned compare: left %s lit(0x%X=%lu), size=%d", performedLt ? "<" : ">=", lit, lit, size + 1);
           if (lit == 0)
             {
               // unsigned left < 0? always false
@@ -3210,8 +3388,9 @@
       else
         {
           // signed comparison to a literal
-          DEBUGpc ("signed compare: left %s lit(0x%X=%ld), size=%d, mask=%x", performedLt ? "<" : ">=", lit, lit, size+1, mask);
-          if ((lit & mask) == ((0x80 << (size*8)) & mask))
+          DEBUGpc ("signed compare: left %s lit(0x%X=%ld), size=%d, mask=%x", performedLt ? "<" : ">=", lit, lit, size + 1,
+                   mask);
+          if ((lit & mask) == ((0x80 << (size * 8)) & mask))
             {
               // signed left < 0x80000000? always false
               if (performedLt)
@@ -3234,8 +3413,8 @@
                 emitSETC;
               goto correct_result_in_carry;
             }
-        } // if (!sign)
-    } // right is literal
+        }                       // if (!sign)
+    }                           // right is literal
 
   /*************************************************
    * perform a general case comparison             *
@@ -3256,13 +3435,13 @@
       if (isAOP_LIT (right))
         {
           // left >= LIT <-> LIT-left <= 0 <-> LIT-left == 0 OR !(LIT-left >= 0)
-          unsigned char litbyte = (lit >> (8*size)) & 0xFF;
+          unsigned char litbyte = (lit >> (8 * size)) & 0xFF;
 
           if (litbyte == 0x80)
             {
               // left >= 0x80 -- always true, but more bytes to come
               mov2w (AOP (left), size);
-              emitpcode (POC_XORLW, popGetLit (0x80)); // set ZERO flag
+              emitpcode (POC_XORLW, popGetLit (0x80));  // set ZERO flag
               emitSETC;
             }
           else
@@ -3271,7 +3450,7 @@
               mov2w (AOP (left), size);
               emitpcode (POC_ADDLW, popGetLit (0x80));
               emitpcode (POC_ADDLW, popGetLit ((0x100 - (litbyte + 0x80)) & 0x00FF));
-            } // if
+            }                   // if
         }
       else
         {
@@ -3284,7 +3463,7 @@
           emitpcode (POC_SUBFW, pctemp);
           popReleaseTempReg (pctemp);
         }
-    } // if (!sign)
+    }                           // if (!sign)
 
   // compare remaining bytes (treat as unsigned case from above)
   templbl = newiTempLabel (NULL);
@@ -3296,7 +3475,7 @@
       emitpcode (POC_GOTO, popGetLabel (templbl->key));
       pic14_mov2w_regOrLit (AOP (right), lit, offs);
       emitpcode (POC_SUBFW, popGet (AOP (left), offs));
-    } // while (offs)
+    }                           // while (offs)
   emitpLabel (templbl->key);
   goto result_in_carry;
 
@@ -3314,7 +3493,7 @@
       invert_result = 1;
       // value will be used in the following genSkipc ()
       rIfx.condition ^= 1;
-    } // if
+    }                           // if
 
 correct_result_in_carry:
 
@@ -3326,7 +3505,7 @@
       while (size--)
         {
           emitpcode (POC_CLRF, popGet (AOP (result), size));
-        } // while
+        }                       // while
       if (invert_result)
         {
           emitSKPC;
@@ -3339,9 +3518,9 @@
             {
               /* Result is expected to be in CARRY by genSkipc () below. */
               emitpcode (POC_RRFW, popGet (AOP (result), 0));
-            } // if
-        } // if
-    } // if (result)
+            }                   // if
+        }                       // if
+    }                           // if (result)
 
   // perform conditional jump
   if (ifx)
@@ -3349,275 +3528,249 @@
       //DEBUGpc ("generate control flow");
       genSkipc (&rIfx);
       ifx->generated = 1;
-    } // if
+    }                           // if
 }
 
 /*-----------------------------------------------------------------*/
 /* genCmpGt :- greater than comparison                             */
 /*-----------------------------------------------------------------*/
-static void genCmpGt (iCode *ic, iCode *ifx)
+static void
+genCmpGt (iCode * ic, iCode * ifx)
 {
-    operand *left, *right, *result;
-    sym_link *letype , *retype;
-    int sign ;
-
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    left = IC_LEFT(ic);
-    right= IC_RIGHT(ic);
-    result = IC_RESULT(ic);
-
-    letype = getSpec(operandType(left));
-    retype =getSpec(operandType(right));
-    sign =  !(SPEC_USIGN(letype) | SPEC_USIGN(retype));
-    /* assign the amsops */
-    aopOp (left,ic,FALSE);
-    aopOp (right,ic,FALSE);
-    aopOp (result,ic,TRUE);
-
-    genCmp(right, left, result, ifx, sign);
-
-    freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    freeAsmop(result,NULL,ic,TRUE);
+  operand *left, *right, *result;
+  sym_link *letype, *retype;
+  int sign;
+
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  left = IC_LEFT (ic);
+  right = IC_RIGHT (ic);
+  result = IC_RESULT (ic);
+
+  sign = 0;
+  if (IS_SPEC (operandType (left)) && IS_SPEC (operandType (right)))
+    {
+      letype = getSpec (operandType (left));
+      retype = getSpec (operandType (right));
+      sign = !(SPEC_USIGN (letype) | SPEC_USIGN (retype));
+    }
+
+  /* assign the amsops */
+  aopOp (left, ic, FALSE);
+  aopOp (right, ic, FALSE);
+  aopOp (result, ic, TRUE);
+
+  genCmp (right, left, result, ifx, sign);
+
+  freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genCmpLt - less than comparisons                                */
 /*-----------------------------------------------------------------*/
-static void genCmpLt (iCode *ic, iCode *ifx)
+static void
+genCmpLt (iCode * ic, iCode * ifx)
 {
-    operand *left, *right, *result;
-    sym_link *letype , *retype;
-    int sign ;
-
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    left = IC_LEFT(ic);
-    right= IC_RIGHT(ic);
-    result = IC_RESULT(ic);
-
-    letype = getSpec(operandType(left));
-    retype =getSpec(operandType(right));
-    sign =  !(SPEC_USIGN(letype) | SPEC_USIGN(retype));
-
-    /* assign the amsops */
-    aopOp (left,ic,FALSE);
-    aopOp (right,ic,FALSE);
-    aopOp (result,ic,TRUE);
-
-    genCmp(left, right, result, ifx, sign);
-
-    freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    freeAsmop(result,NULL,ic,TRUE);
+  operand *left, *right, *result;
+  sym_link *letype, *retype;
+  int sign;
+
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  left = IC_LEFT (ic);
+  right = IC_RIGHT (ic);
+  result = IC_RESULT (ic);
+
+  sign = 0;
+  if (IS_SPEC (operandType (left)) && IS_SPEC (operandType (right)))
+    {
+      letype = getSpec (operandType (left));
+      retype = getSpec (operandType (right));
+      sign = !(SPEC_USIGN (letype) | SPEC_USIGN (retype));
+    }
+
+  /* assign the amsops */
+  aopOp (left, ic, FALSE);
+  aopOp (right, ic, FALSE);
+  aopOp (result, ic, TRUE);
+
+  genCmp (left, right, result, ifx, sign);
+
+  freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genCmpEq - generates code for equal to                          */
 /*-----------------------------------------------------------------*/
-static void genCmpEq (iCode *ic, iCode *ifx)
+static void
+genCmpEq (iCode * ic, iCode * ifx)
 {
   operand *left, *right, *result;
   int size;
   symbol *false_label;
 
   FENTRY;
-  DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-  if(ifx)
-    DEBUGpic14_emitcode ("; ifx is non-null","");
+  if (ifx)
+    DEBUGpic14_emitcode ("; ifx is non-null", "");
   else
-    DEBUGpic14_emitcode ("; ifx is null","");
+    DEBUGpic14_emitcode ("; ifx is null", "");
 
-  aopOp((left=IC_LEFT(ic)),ic,FALSE);
-  aopOp((right=IC_RIGHT(ic)),ic,FALSE);
-  aopOp((result=IC_RESULT(ic)),ic,TRUE);
+  aopOp ((left = IC_LEFT (ic)), ic, FALSE);
+  aopOp ((right = IC_RIGHT (ic)), ic, FALSE);
+  aopOp ((result = IC_RESULT (ic)), ic, TRUE);
 
-  DEBUGpic14_AopType(__LINE__,left,right,result);
+  DEBUGpic14_AopType (__LINE__, left, right, result);
 
   /* if literal, move literal to right */
-  if (op_isLitLike (IC_LEFT(ic))) {
-    operand *tmp = right ;
-    right = left;
-    left = tmp;
-  }
+  if (op_isLitLike (IC_LEFT (ic)))
+    {
+      operand *tmp = right;
+      right = left;
+      left = tmp;
+    }
 
   false_label = NULL;
-  if (ifx && !IC_TRUE(ifx))
-  {
-    assert (IC_FALSE(ifx));
-    false_label = IC_FALSE(ifx);
-  }
+  if (ifx && !IC_TRUE (ifx))
+    {
+      assert (IC_FALSE (ifx));
+      false_label = IC_FALSE (ifx);
+    }
 
-  size = min(AOP_SIZE(left),AOP_SIZE(right));
-  assert(!pic14_sameRegs(AOP(result),AOP(left)));
-  assert(!pic14_sameRegs(AOP(result),AOP(right)));
+  size = min (AOP_SIZE (left), AOP_SIZE (right));
+  assert (!pic14_sameRegs (AOP (result), AOP (left)));
+  assert (!pic14_sameRegs (AOP (result), AOP (right)));
 
   /* assume left != right */
   {
     int i;
-    for (i=0; i < AOP_SIZE(result); i++)
-    {
-      emitpcode(POC_CLRF, popGet(AOP(result),i));
-    }
+    for (i = 0; i < AOP_SIZE (result); i++)
+      {
+        emitpcode (POC_CLRF, popGet (AOP (result), i));
+      }
   }
 
-  if (AOP_TYPE(right) == AOP_LIT)
-  {
-    unsigned long lit = ulFromVal (AOP(right)->aopu.aop_lit);
-    int i;
-    size = AOP_SIZE(left);
-    assert(!op_isLitLike(left));
-
-    switch (lit)
+  if (AOP_TYPE (right) == AOP_LIT)
     {
-      case 0:
-        mov2w(AOP(left), 0);
-    for (i=1; i < size; i++)
-      emitpcode(POC_IORFW,popGet(AOP(left),i));
-    /* now Z is set iff `left == right' */
-    emitSKPZ;
-    if (!false_label) false_label = newiTempLabel(NULL);
-    emitpcode(POC_GOTO, popGetLabel(false_label->key));
-    break;
-
-      default:
-    for (i=0; i < size; i++)
-    {
-      mov2w(AOP(left),i);
-      emitpcode(POC_XORLW, popGetLit(lit >> (8*i)));
-      /* now Z is cleared if `left != right' */
-      emitSKPZ;
-      if (!false_label) false_label = newiTempLabel(NULL);
-      emitpcode(POC_GOTO, popGetLabel(false_label->key));
-    } // for i
-    break;
-    } // switch (lit)
-  }
-  else
-  {
-    /* right is no literal */
-    int i;
+      unsigned long lit = ulFromVal (AOP (right)->aopu.aop_lit);
+      int i;
+      size = AOP_SIZE (left);
+      assert (!op_isLitLike (left));
 
-    for (i=0; i < size; i++)
+      switch (lit)
+        {
+        case 0:
+          mov2w (AOP (left), 0);
+          for (i = 1; i < size; i++)
+            emitpcode (POC_IORFW, popGet (AOP (left), i));
+          /* now Z is set iff `left == right' */
+          emitSKPZ;
+          if (!false_label)
+            false_label = newiTempLabel (NULL);
+          emitpcode (POC_GOTO, popGetLabel (false_label->key));
+          break;
+
+        default:
+          for (i = 0; i < size; i++)
+            {
+              mov2w (AOP (left), i);
+              emitpcode (POC_XORLW, popGetLit (lit >> (8 * i)));
+              /* now Z is cleared if `left != right' */
+              emitSKPZ;
+              if (!false_label)
+                false_label = newiTempLabel (NULL);
+              emitpcode (POC_GOTO, popGetLabel (false_label->key));
+            }                   // for i
+          break;
+        }                       // switch (lit)
+    }
+  else
     {
-      mov2w(AOP(right),i);
-      emitpcode(POC_XORFW,popGet(AOP(left),i));
-      /* now Z is cleared if `left != right' */
-      emitSKPZ;
-      if (!false_label) false_label = newiTempLabel(NULL);
-      emitpcode(POC_GOTO, popGetLabel(false_label->key));
-    } // for i
-  }
+      /* right is no literal */
+      int i;
+
+      for (i = 0; i < size; i++)
+        {
+          mov2w (AOP (right), i);
+          emitpcode (POC_XORFW, popGet (AOP (left), i));
+          /* now Z is cleared if `left != right' */
+          emitSKPZ;
+          if (!false_label)
+            false_label = newiTempLabel (NULL);
+          emitpcode (POC_GOTO, popGetLabel (false_label->key));
+        }                       // for i
+    }
 
   /* if we reach here, left == right */
 
-  if (AOP_SIZE(result) > 0)
-  {
-    emitpcode(POC_INCF, popGet(AOP(result),0));
-  }
-
-  if (ifx && IC_TRUE(ifx))
-  {
-    emitpcode(POC_GOTO,popGetLabel(IC_TRUE(ifx)->key));
-  }
-
-  if (false_label && (!ifx || IC_TRUE(ifx)))
-    emitpLabel(false_label->key);
-
-  if (ifx) ifx->generated = 1;
-
-  freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-  freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-  freeAsmop(result,NULL,ic,TRUE);
-}
-
-/*-----------------------------------------------------------------*/
-/* ifxForOp - returns the icode containing the ifx for operand     */
-/*-----------------------------------------------------------------*/
-static iCode *ifxForOp ( operand *op, iCode *ic )
-{
-    FENTRY;
-    /* if true symbol then needs to be assigned */
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    if (IS_TRUE_SYMOP(op))
-        return NULL ;
-
-    /* if this has register type condition and
-    the next instruction is ifx with the same operand
-    and live to of the operand is upto the ifx only then */
-    if (ic->next &&
-        ic->next->op == IFX &&
-        IC_COND(ic->next)->key == op->key &&
-        OP_SYMBOL(op)->liveTo <= ic->next->seq )
-        return ic->next;
-
-    if (ic->next &&
-        ic->next->op == IFX &&
-        IC_COND(ic->next)->key == op->key) {
-        DEBUGpic14_emitcode ("; WARNING ","%d IGNORING liveTo range in %s",__LINE__,__FUNCTION__);
-        return ic->next;
+  if (AOP_SIZE (result) > 0)
+    {
+      emitpcode (POC_INCF, popGet (AOP (result), 0));
     }
 
-    DEBUGpic14_emitcode ("; NULL :(","%d",__LINE__);
-    if (ic->next &&
-        ic->next->op == IFX)
-        DEBUGpic14_emitcode ("; ic-next"," is an IFX");
-
-    if (ic->next &&
-        ic->next->op == IFX &&
-        IC_COND(ic->next)->key == op->key) {
-        DEBUGpic14_emitcode ("; "," key is okay");
-        DEBUGpic14_emitcode ("; "," key liveTo %d, next->seq = %d",
-            OP_SYMBOL(op)->liveTo,
-            ic->next->seq);
+  if (ifx && IC_TRUE (ifx))
+    {
+      emitpcode (POC_GOTO, popGetLabel (IC_TRUE (ifx)->key));
     }
 
+  if (false_label && (!ifx || IC_TRUE (ifx)))
+    emitpLabel (false_label->key);
+
+  if (ifx)
+    ifx->generated = 1;
 
-    return NULL;
+  freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (result, NULL, ic, TRUE);
 }
+
 /*-----------------------------------------------------------------*/
 /* genAndOp - for && operation                                     */
 /*-----------------------------------------------------------------*/
-static void genAndOp (iCode *ic)
+static void
+genAndOp (iCode * ic)
 {
-    operand *left,*right, *result;
-    /*     symbol *tlbl; */
+  operand *left, *right, *result;
+  /*     symbol *tlbl; */
 
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* note here that && operations that are in an
-    if statement are taken away by backPatchLabels
-    only those used in arthmetic operations remain */
-    aopOp((left=IC_LEFT(ic)),ic,FALSE);
-    aopOp((right=IC_RIGHT(ic)),ic,FALSE);
-    aopOp((result=IC_RESULT(ic)),ic,FALSE);
-
-    DEBUGpic14_AopType(__LINE__,left,right,result);
-
-    emitpcode(POC_MOVFW,popGet(AOP(left),0));
-    emitpcode(POC_ANDFW,popGet(AOP(right),0));
-    emitpcode(POC_MOVWF,popGet(AOP(result),0));
-
-    /* if both are bit variables */
-    /*     if (AOP_TYPE(left) == AOP_CRY && */
-    /*         AOP_TYPE(right) == AOP_CRY ) { */
-    /*         pic14_emitcode("mov","c,%s",AOP(left)->aopu.aop_dir); */
-    /*         pic14_emitcode("anl","c,%s",AOP(right)->aopu.aop_dir); */
-    /*         pic14_outBitC(result); */
-    /*     } else { */
-    /*         tlbl = newiTempLabel(NULL); */
-    /*         pic14_toBoolean(left);     */
-    /*         pic14_emitcode("jz","%05d_DS_",tlbl->key+100); */
-    /*         pic14_toBoolean(right); */
-    /*         pic14_emitcode("","%05d_DS_:",tlbl->key+100); */
-    /*         pic14_outBitAcc(result); */
-    /*     } */
-
-    freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    freeAsmop(result,NULL,ic,TRUE);
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  /* note here that && operations that are in an
+     if statement are taken away by backPatchLabels
+     only those used in arthmetic operations remain */
+  aopOp ((left = IC_LEFT (ic)), ic, FALSE);
+  aopOp ((right = IC_RIGHT (ic)), ic, FALSE);
+  aopOp ((result = IC_RESULT (ic)), ic, FALSE);
+
+  DEBUGpic14_AopType (__LINE__, left, right, result);
+
+  emitpcode (POC_MOVFW, popGet (AOP (left), 0));
+  emitpcode (POC_ANDFW, popGet (AOP (right), 0));
+  emitpcode (POC_MOVWF, popGet (AOP (result), 0));
+
+  /* if both are bit variables */
+  /*     if (AOP_TYPE(left) == AOP_CRY && */
+  /*         AOP_TYPE(right) == AOP_CRY ) { */
+  /*         pic14_emitcode("mov","c,%s",AOP(left)->aopu.aop_dir); */
+  /*         pic14_emitcode("anl","c,%s",AOP(right)->aopu.aop_dir); */
+  /*         pic14_outBitC(result); */
+  /*     } else { */
+  /*         tlbl = newiTempLabel(NULL); */
+  /*         pic14_toBoolean(left);     */
+  /*         pic14_emitcode("jz","%05d_DS_",labelKey2num (tlbl->key)); */
+  /*         pic14_toBoolean(right); */
+  /*         pic14_emitcode("","%05d_DS_:",labelKey2num (tlbl->key)); */
+  /*         pic14_outBitAcc(result); */
+  /*     } */
+
+  freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (result, NULL, ic, TRUE);
 }
 
 
@@ -3629,840 +3782,966 @@
 modified this code, but it doesn't appear to ever get called
 */
 
-static void genOrOp (iCode *ic)
+static void
+genOrOp (iCode * ic)
 {
-    operand *left,*right, *result;
-    symbol *tlbl;
-    int i;
+  operand *left, *right, *result;
+  symbol *tlbl;
+  int i;
 
-    /* note here that || operations that are in an
-    if statement are taken away by backPatchLabels
-    only those used in arthmetic operations remain */
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    aopOp((left=IC_LEFT(ic)),ic,FALSE);
-    aopOp((right=IC_RIGHT(ic)),ic,FALSE);
-    aopOp((result=IC_RESULT(ic)),ic,FALSE);
-
-    DEBUGpic14_AopType(__LINE__,left,right,result);
-
-    for (i=0; i < AOP_SIZE(result); i++)
-    {
-        emitpcode(POC_CLRF, popGet(AOP(result), i));
-    } // for i
-
-    tlbl = newiTempLabel(NULL);
-    pic14_toBoolean(left);
-    emitSKPZ;
-    emitpcode(POC_GOTO, popGetLabel(tlbl->key));
-    pic14_toBoolean(right);
-    emitpLabel(tlbl->key);
-    /* here Z is clear IFF `left || right' */
-    emitSKPZ;
-    emitpcode(POC_INCF, popGet(AOP(result), 0));
-
-    freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    freeAsmop(result,NULL,ic,TRUE);
+  /* note here that || operations that are in an
+     if statement are taken away by backPatchLabels
+     only those used in arthmetic operations remain */
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  aopOp ((left = IC_LEFT (ic)), ic, FALSE);
+  aopOp ((right = IC_RIGHT (ic)), ic, FALSE);
+  aopOp ((result = IC_RESULT (ic)), ic, FALSE);
+
+  DEBUGpic14_AopType (__LINE__, left, right, result);
+
+  for (i = 0; i < AOP_SIZE (result); i++)
+    {
+      emitpcode (POC_CLRF, popGet (AOP (result), i));
+    }                           // for i
+
+  tlbl = newiTempLabel (NULL);
+  pic14_toBoolean (left);
+  emitSKPZ;
+  emitpcode (POC_GOTO, popGetLabel (tlbl->key));
+  pic14_toBoolean (right);
+  emitpLabel (tlbl->key);
+  /* here Z is clear IFF `left || right' */
+  emitSKPZ;
+  emitpcode (POC_INCF, popGet (AOP (result), 0));
+
+  freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* isLiteralBit - test if lit == 2^n                               */
 /*-----------------------------------------------------------------*/
-static int isLiteralBit(unsigned long lit)
+static int
+isLiteralBit (unsigned long lit)
 {
-    unsigned long pw[32] = {1L,2L,4L,8L,16L,32L,64L,128L,
-        0x100L,0x200L,0x400L,0x800L,
-        0x1000L,0x2000L,0x4000L,0x8000L,
-        0x10000L,0x20000L,0x40000L,0x80000L,
-        0x100000L,0x200000L,0x400000L,0x800000L,
-        0x1000000L,0x2000000L,0x4000000L,0x8000000L,
-        0x10000000L,0x20000000L,0x40000000L,0x80000000L};
-    int idx;
-
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    for(idx = 0; idx < 32; idx++)
-        if(lit == pw[idx])
-            return idx+1;
-        return 0;
+  unsigned long pw[32] = { 1L, 2L, 4L, 8L, 16L, 32L, 64L, 128L,
+                           0x100L, 0x200L, 0x400L, 0x800L,
+                           0x1000L, 0x2000L, 0x4000L, 0x8000L,
+                           0x10000L, 0x20000L, 0x40000L, 0x80000L,
+                           0x100000L, 0x200000L, 0x400000L, 0x800000L,
+                           0x1000000L, 0x2000000L, 0x4000000L, 0x8000000L,
+                           0x10000000L, 0x20000000L, 0x40000000L, 0x80000000L
+                         };
+  int idx;
+
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  for (idx = 0; idx < 32; idx++)
+    if (lit == pw[idx])
+      return idx + 1;
+  return 0;
 }
 
 /*-----------------------------------------------------------------*/
 /* continueIfTrue -                                                */
 /*-----------------------------------------------------------------*/
-static void continueIfTrue (iCode *ic)
+static void
+continueIfTrue (iCode * ic)
 {
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    if(IC_TRUE(ic))
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  if (IC_TRUE (ic))
     {
-        // Why +100?!?
-        emitpcode(POC_GOTO, popGetLabel(IC_TRUE(ic)->key+100));
-        pic14_emitcode("ljmp","%05d_DS_",IC_FALSE(ic)->key+100);
+      emitpcode (POC_GOTO, popGetLabel (labelKey2num (IC_TRUE (ic)->key)));
+      pic14_emitcode ("ljmp", "%05d_DS_", labelKey2num (IC_FALSE (ic)->key));
     }
-    ic->generated = 1;
+  ic->generated = 1;
 }
 
 /*-----------------------------------------------------------------*/
 /* jmpIfTrue -                                                     */
 /*-----------------------------------------------------------------*/
-static void jumpIfTrue (iCode *ic)
+static void
+jumpIfTrue (iCode * ic)
 {
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    if(!IC_TRUE(ic))
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  if (!IC_TRUE (ic))
     {
-        // Why +100?!?
-        emitpcode(POC_GOTO, popGetLabel(IC_TRUE(ic)->key+100));
-        pic14_emitcode("ljmp","%05d_DS_",IC_FALSE(ic)->key+100);
+      emitpcode (POC_GOTO, labelKey2num (popGetLabel (IC_TRUE (ic)->key)));
+      pic14_emitcode ("ljmp", "%05d_DS_", labelKey2num (IC_FALSE (ic)->key));
     }
-    ic->generated = 1;
+  ic->generated = 1;
 }
 
 /*-----------------------------------------------------------------*/
 /* jmpTrueOrFalse -                                                */
 /*-----------------------------------------------------------------*/
-static void jmpTrueOrFalse (iCode *ic, symbol *tlbl)
+static void
+jmpTrueOrFalse (iCode * ic, symbol * tlbl)
 {
-    FENTRY;
-    // ugly but optimized by peephole
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    if(IC_TRUE(ic)){
-        symbol *nlbl = newiTempLabel(NULL);
-        pic14_emitcode("sjmp","%05d_DS_",nlbl->key+100);
-        pic14_emitcode("","%05d_DS_:",tlbl->key+100);
-        pic14_emitcode("ljmp","%05d_DS_",IC_TRUE(ic)->key+100);
-        pic14_emitcode("","%05d_DS_:",nlbl->key+100);
-    }
-    else{
-        pic14_emitcode("ljmp","%05d_DS_",IC_FALSE(ic)->key+100);
-        pic14_emitcode("","%05d_DS_:",tlbl->key+100);
+  FENTRY;
+  // ugly but optimized by peephole
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  if (IC_TRUE (ic))
+    {
+      symbol *nlbl = newiTempLabel (NULL);
+      pic14_emitcode ("sjmp", "%05d_DS_", labelKey2num (nlbl->key));
+      pic14_emitcode ("", "%05d_DS_:", labelKey2num (tlbl->key));
+      pic14_emitcode ("ljmp", "%05d_DS_", labelKey2num (IC_TRUE (ic)->key));
+      pic14_emitcode ("", "%05d_DS_:", labelKey2num (nlbl->key));
     }
-    ic->generated = 1;
+  else
+    {
+      pic14_emitcode ("ljmp", "%05d_DS_", labelKey2num (IC_FALSE (ic)->key));
+      pic14_emitcode ("", "%05d_DS_:", labelKey2num (tlbl->key));
+    }
+  ic->generated = 1;
 }
 
 /*-----------------------------------------------------------------*/
 /* genAnd  - code for and                                          */
 /*-----------------------------------------------------------------*/
-static void genAnd (iCode *ic, iCode *ifx)
+static void
+genAnd (iCode * ic, iCode * ifx)
 {
-    operand *left, *right, *result;
-    int size, offset=0;
-    unsigned long lit = 0L;
-    int bytelit = 0;
-    resolvedIfx rIfx;
-
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    aopOp((left = IC_LEFT(ic)),ic,FALSE);
-    aopOp((right= IC_RIGHT(ic)),ic,FALSE);
-    aopOp((result=IC_RESULT(ic)),ic,TRUE);
-
-    resolveIfx(&rIfx,ifx);
-
-    /* if left is a literal & right is not then exchange them */
-    if ((AOP_TYPE(left) == AOP_LIT && AOP_TYPE(right) != AOP_LIT) ||
-        AOP_NEEDSACC(left)) {
-        operand *tmp = right ;
-        right = left;
-        left = tmp;
-    }
-
-    /* if result = right then exchange them */
-    if(pic14_sameRegs(AOP(result),AOP(right))){
-        operand *tmp = right ;
-        right = left;
-        left = tmp;
-    }
-
-    /* if right is bit then exchange them */
-    if (AOP_TYPE(right) == AOP_CRY &&
-        AOP_TYPE(left) != AOP_CRY){
-        operand *tmp = right ;
-        right = left;
-        left = tmp;
-    }
-    if(AOP_TYPE(right) == AOP_LIT)
-        lit = ulFromVal (AOP(right)->aopu.aop_lit);
-
-    size = AOP_SIZE(result);
-
-    DEBUGpic14_AopType(__LINE__,left,right,result);
-
-    // if(bit & yy)
-    // result = bit & yy;
-    if (AOP_TYPE(left) == AOP_CRY){
-        // c = bit & literal;
-        if(AOP_TYPE(right) == AOP_LIT){
-            if(lit & 1) {
-                if(size && pic14_sameRegs(AOP(result),AOP(left)))
-                    // no change
-                    goto release;
-                pic14_emitcode("mov","c,%s",AOP(left)->aopu.aop_dir);
-            } else {
-                // bit(result) = 0;
-                if(size && (AOP_TYPE(result) == AOP_CRY)){
-                    pic14_emitcode("clr","%s",AOP(result)->aopu.aop_dir);
-                    goto release;
+  operand *left, *right, *result;
+  int size, offset = 0;
+  unsigned long lit = 0L;
+  int bytelit = 0;
+  resolvedIfx rIfx;
+
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  aopOp ((left = IC_LEFT (ic)), ic, FALSE);
+  aopOp ((right = IC_RIGHT (ic)), ic, FALSE);
+  aopOp ((result = IC_RESULT (ic)), ic, TRUE);
+
+  resolveIfx (&rIfx, ifx);
+
+  /* if left is a literal & right is not then exchange them */
+  if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) || AOP_NEEDSACC (left))
+    {
+      operand *tmp = right;
+      right = left;
+      left = tmp;
+    }
+
+  /* if result = right then exchange them */
+  if (pic14_sameRegs (AOP (result), AOP (right)))
+    {
+      operand *tmp = right;
+      right = left;
+      left = tmp;
+    }
+
+  /* if right is bit then exchange them */
+  if (AOP_TYPE (right) == AOP_CRY && AOP_TYPE (left) != AOP_CRY)
+    {
+      operand *tmp = right;
+      right = left;
+      left = tmp;
+    }
+  if (AOP_TYPE (right) == AOP_LIT)
+    lit = ulFromVal (AOP (right)->aopu.aop_lit);
+
+  size = AOP_SIZE (result);
+
+  DEBUGpic14_AopType (__LINE__, left, right, result);
+
+  // if(bit & yy)
+  // result = bit & yy;
+  if (AOP_TYPE (left) == AOP_CRY)
+    {
+      // c = bit & literal;
+      if (AOP_TYPE (right) == AOP_LIT)
+        {
+          if (lit & 1)
+            {
+              if (size && pic14_sameRegs (AOP (result), AOP (left)))
+                // no change
+                goto release;
+              pic14_emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir);
+            }
+          else
+            {
+              // bit(result) = 0;
+              if (size && (AOP_TYPE (result) == AOP_CRY))
+                {
+                  pic14_emitcode ("clr", "%s", AOP (result)->aopu.aop_dir);
+                  goto release;
                 }
-                if((AOP_TYPE(result) == AOP_CRY) && ifx){
-                    jumpIfTrue(ifx);
-                    goto release;
+              if ((AOP_TYPE (result) == AOP_CRY) && ifx)
+                {
+                  jumpIfTrue (ifx);
+                  goto release;
                 }
-                pic14_emitcode("clr","c");
+              pic14_emitcode ("clr", "c");
+            }
+        }
+      else
+        {
+          if (AOP_TYPE (right) == AOP_CRY)
+            {
+              // c = bit & bit;
+              pic14_emitcode ("mov", "c,%s", AOP (right)->aopu.aop_dir);
+              pic14_emitcode ("anl", "c,%s", AOP (left)->aopu.aop_dir);
             }
-        } else {
-            if (AOP_TYPE(right) == AOP_CRY){
-                // c = bit & bit;
-                pic14_emitcode("mov","c,%s",AOP(right)->aopu.aop_dir);
-                pic14_emitcode("anl","c,%s",AOP(left)->aopu.aop_dir);
-            } else {
-                // c = bit & val;
-                MOVA(aopGet(AOP(right),0,FALSE,FALSE));
-                // c = lsb
-                pic14_emitcode("rrc","a");
-                pic14_emitcode("anl","c,%s",AOP(left)->aopu.aop_dir);
-            }
-        }
-        // bit = c
-        // val = c
-        if(size)
-            pic14_outBitC(result);
-        // if(bit & ...)
-        else if((AOP_TYPE(result) == AOP_CRY) && ifx)
-            genIfxJump(ifx, "c");
-        goto release ;
-    }
-
-    // if(val & 0xZZ)       - size = 0, ifx != FALSE  -
-    // bit = val & 0xZZ     - size = 1, ifx = FALSE -
-    if((AOP_TYPE(right) == AOP_LIT) &&
-        (AOP_TYPE(result) == AOP_CRY) &&
-        (AOP_TYPE(left) != AOP_CRY)){
-        int posbit = isLiteralBit(lit);
-        /* left &  2^n */
-        if(posbit){
-            posbit--;
-            //MOVA(aopGet(AOP(left),posbit>>3,FALSE,FALSE));
-            // bit = left & 2^n
-            if(size)
-                pic14_emitcode("mov","c,acc.%d",posbit&0x07);
-            // if(left &  2^n)
-            else{
-                if(ifx){
-                    int offset = 0;
-                    while (posbit > 7) {
-                        posbit -= 8;
-                        offset++;
+          else
+            {
+              // c = bit & val;
+              MOVA (aopGet (AOP (right), 0, FALSE, FALSE));
+              // c = lsb
+              pic14_emitcode ("rrc", "a");
+              pic14_emitcode ("anl", "c,%s", AOP (left)->aopu.aop_dir);
+            }
+        }
+      // bit = c
+      // val = c
+      if (size)
+        pic14_outBitC (result);
+      // if(bit & ...)
+      else if ((AOP_TYPE (result) == AOP_CRY) && ifx)
+        genIfxJump (ifx, "c");
+      goto release;
+    }
+
+  // if(val & 0xZZ)       - size = 0, ifx != FALSE  -
+  // bit = val & 0xZZ     - size = 1, ifx = FALSE -
+  if ((AOP_TYPE (right) == AOP_LIT) && (AOP_TYPE (result) == AOP_CRY) && (AOP_TYPE (left) != AOP_CRY))
+    {
+      int posbit = isLiteralBit (lit);
+      /* left &  2^n */
+      if (posbit)
+        {
+          posbit--;
+          //MOVA(aopGet(AOP(left),posbit>>3,FALSE,FALSE));
+          // bit = left & 2^n
+          if (size)
+            pic14_emitcode ("mov", "c,acc.%d", posbit & 0x07);
+          // if(left &  2^n)
+          else
+            {
+              if (ifx)
+                {
+                  int offset = 0;
+                  while (posbit > 7)
+                    {
+                      posbit -= 8;
+                      offset++;
                     }
-                    emitpcode(((rIfx.condition) ? POC_BTFSC : POC_BTFSS),
-                        newpCodeOpBit(aopGet(AOP(left),offset,FALSE,FALSE),posbit,0));
-                    emitpcode(POC_GOTO,popGetLabel(rIfx.lbl->key));
+                  emitpcode (((rIfx.condition) ? POC_BTFSC : POC_BTFSS),
+                             newpCodeOpBit (aopGet (AOP (left), offset, FALSE, FALSE), posbit, 0));
+                  emitpcode (POC_GOTO, popGetLabel (rIfx.lbl->key));
 
-                    ifx->generated = 1;
+                  ifx->generated = 1;
                 }
-                goto release;
+              goto release;
             }
-        } else {
-            symbol *tlbl = newiTempLabel(NULL);
-            int sizel = AOP_SIZE(left);
-            if(size)
-                pic14_emitcode("setb","c");
-            while(sizel--){
-                if((bytelit = ((lit >> (offset*8)) & 0x0FFL)) != 0x0L){
-                    mov2w( AOP(left), offset);
-                    // byte ==  2^n ?
-                    if((posbit = isLiteralBit(bytelit)) != 0) {
-                        emitpcode(rIfx.condition ? POC_BTFSC : POC_BTFSS, // XXX: or the other way round?
-                            newpCodeOpBit(aopGet(AOP(left),offset,FALSE,FALSE),posbit - 1, 0));
-                        pic14_emitcode("jb","acc.%d,%05d_DS_",(posbit-1)&0x07,tlbl->key+100);
+        }
+      else
+        {
+          symbol *tlbl = newiTempLabel (NULL);
+          int sizel = AOP_SIZE (left);
+          if (size)
+            pic14_emitcode ("setb", "c");
+          while (sizel--)
+            {
+              if ((bytelit = ((lit >> (offset * 8)) & 0x0FFL)) != 0x0L)
+                {
+                  mov2w (AOP (left), offset);
+                  // byte ==  2^n ?
+                  if ((posbit = isLiteralBit (bytelit)) != 0)
+                    {
+                      emitpcode (rIfx.condition ? POC_BTFSC : POC_BTFSS,        // XXX: or the other way round?
+                                 newpCodeOpBit (aopGet (AOP (left), offset, FALSE, FALSE), posbit - 1, 0));
+                      pic14_emitcode ("jb", "acc.%d,%05d_DS_", (posbit - 1) & 0x07, labelKey2num (tlbl->key));
                     }
-                    else{
-                        emitpcode(POC_ANDLW, newpCodeOpLit(bytelit & 0x0ff));
-                        if (rIfx.condition) emitSKPZ;
-                        else emitSKPNZ;
+                  else
+                    {
+                      emitpcode (POC_ANDLW, newpCodeOpLit (bytelit & 0x0ff));
+                      if (rIfx.condition)
+                        emitSKPZ;
+                      else
+                        emitSKPNZ;
 
-                        if(bytelit != 0x0FFL)
+                      if (bytelit != 0x0FFL)
                         {
-                            pic14_emitcode("anl","a,%s",
-                            aopGet(AOP(right),offset,FALSE,TRUE));
+                          pic14_emitcode ("anl", "a,%s", aopGet (AOP (right), offset, FALSE, TRUE));
                         }
-                        pic14_emitcode("jnz","%05d_DS_",tlbl->key+100);
+                      pic14_emitcode ("jnz", "%05d_DS_", labelKey2num (tlbl->key));
                     }
 
-                    emitpcode(POC_GOTO, popGetLabel(rIfx.lbl->key));
-                    ifx->generated = 1;
+                  emitpcode (POC_GOTO, popGetLabel (rIfx.lbl->key));
+                  ifx->generated = 1;
 
                 }
-                offset++;
+              offset++;
+            }
+          // bit = left & literal
+          if (size)
+            {
+              pic14_emitcode ("clr", "c");
+              pic14_emitcode ("", "%05d_DS_:", labelKey2num (tlbl->key));
+            }
+          // if(left & literal)
+          else
+            {
+              if (ifx)
+                jmpTrueOrFalse (ifx, tlbl);
+              goto release;
             }
-            // bit = left & literal
-            if(size){
-                pic14_emitcode("clr","c");
-                pic14_emitcode("","%05d_DS_:",tlbl->key+100);
-            }
-            // if(left & literal)
-            else{
-                if(ifx)
-                    jmpTrueOrFalse(ifx, tlbl);
-                goto release ;
-            }
-        }
-        pic14_outBitC(result);
-        goto release ;
-    }
-
-    /* if left is same as result */
-    if(pic14_sameRegs(AOP(result),AOP(left))){
-        int know_W = -1;
-        for(;size--; offset++,lit>>=8) {
-            if(AOP_TYPE(right) == AOP_LIT){
-                switch(lit & 0xff) {
+        }
+      pic14_outBitC (result);
+      goto release;
+    }
+
+  /* if left is same as result */
+  if (pic14_sameRegs (AOP (result), AOP (left)))
+    {
+      int know_W = -1;
+      for (; size--; offset++, lit >>= 8)
+        {
+          if (AOP_TYPE (right) == AOP_LIT)
+            {
+              switch (lit & 0xff)
+                {
                 case 0x00:
-                    /*  and'ing with 0 has clears the result */
-                    emitpcode(POC_CLRF,popGet(AOP(result),offset));
-                    break;
+                  /*  and'ing with 0 has clears the result */
+                  emitpcode (POC_CLRF, popGet (AOP (result), offset));
+                  break;
                 case 0xff:
-                    /* and'ing with 0xff is a nop when the result and left are the same */
-                    break;
+                  /* and'ing with 0xff is a nop when the result and left are the same */
+                  break;
 
                 default:
+                {
+                  int p = my_powof2 ((~lit) & 0xff);
+                  if (p >= 0)
                     {
-                        int p = my_powof2( (~lit) & 0xff );
-                        if(p>=0) {
-                            /* only one bit is set in the literal, so use a bcf instruction */
-                            emitpcode(POC_BCF,newpCodeOpBit(aopGet(AOP(left),offset,FALSE,FALSE),p,0));
-
-                        } else {
-                            if(know_W != (int)(lit&0xff))
-                                emitpcode(POC_MOVLW, popGetLit(lit & 0xff));
-                            know_W = lit &0xff;
-                            emitpcode(POC_ANDWF,popGet(AOP(left),offset));
-                        }
+                      /* only one bit is set in the literal, so use a bcf instruction */
+                      emitpcode (POC_BCF, newpCodeOpBit (aopGet (AOP (left), offset, FALSE, FALSE), p, 0));
+
+                    }
+                  else
+                    {
+                      if (know_W != (int) (lit & 0xff))
+                        emitpcode (POC_MOVLW, popGetLit (lit & 0xff));
+                      know_W = lit & 0xff;
+                      emitpcode (POC_ANDWF, popGet (AOP (left), offset));
                     }
                 }
-            } else {
-                emitpcode(POC_MOVFW,popGet(AOP(right),offset));
-                emitpcode(POC_ANDWF,popGet(AOP(left),offset));
+                }
+            }
+          else
+            {
+              emitpcode (POC_MOVFW, popGet (AOP (right), offset));
+              emitpcode (POC_ANDWF, popGet (AOP (left), offset));
             }
         }
 
-    } else {
-        // left & result in different registers
-        if(AOP_TYPE(result) == AOP_CRY){
-            // result = bit
-            // if(size), result in bit
-            // if(!size && ifx), conditional oper: if(left & right)
-            symbol *tlbl = newiTempLabel(NULL);
-            int sizer = min(AOP_SIZE(left),AOP_SIZE(right));
-            if(size)
-                pic14_emitcode("setb","c");
-            while(sizer--){
-                MOVA(aopGet(AOP(right),offset,FALSE,FALSE));
-                pic14_emitcode("anl","a,%s",
-                    aopGet(AOP(left),offset,FALSE,FALSE));
-                pic14_emitcode("jnz","%05d_DS_",tlbl->key+100);
-                offset++;
-            }
-            if(size){
-                CLRC;
-                pic14_emitcode("","%05d_DS_:",tlbl->key+100);
-                pic14_outBitC(result);
-            } else if(ifx)
-                jmpTrueOrFalse(ifx, tlbl);
-        } else {
-            for(;(size--);offset++) {
-                // normal case
-                // result = left & right
-                if(AOP_TYPE(right) == AOP_LIT){
-                    int t = (lit >> (offset*8)) & 0x0FFL;
-                    switch(t) {
+    }
+  else
+    {
+      // left & result in different registers
+      if (AOP_TYPE (result) == AOP_CRY)
+        {
+          // result = bit
+          // if(size), result in bit
+          // if(!size && ifx), conditional oper: if(left & right)
+          symbol *tlbl = newiTempLabel (NULL);
+          int sizer = min (AOP_SIZE (left), AOP_SIZE (right));
+          if (size)
+            pic14_emitcode ("setb", "c");
+          while (sizer--)
+            {
+              MOVA (aopGet (AOP (right), offset, FALSE, FALSE));
+              pic14_emitcode ("anl", "a,%s", aopGet (AOP (left), offset, FALSE, FALSE));
+              pic14_emitcode ("jnz", "%05d_DS_", labelKey2num (tlbl->key));
+              offset++;
+            }
+          if (size)
+            {
+              CLRC;
+              pic14_emitcode ("", "%05d_DS_:", labelKey2num (tlbl->key));
+              pic14_outBitC (result);
+            }
+          else if (ifx)
+            jmpTrueOrFalse (ifx, tlbl);
+        }
+      else
+        {
+          for (; (size--); offset++)
+            {
+              // normal case
+              // result = left & right
+              if (AOP_TYPE (right) == AOP_LIT)
+                {
+                  int t = (lit >> (offset * 8)) & 0x0FFL;
+                  switch (t)
+                    {
                     case 0x00:
-                        emitpcode(POC_CLRF,popGet(AOP(result),offset));
-                        break;
+                      emitpcode (POC_CLRF, popGet (AOP (result), offset));
+                      break;
                     case 0xff:
-                        emitpcode(POC_MOVFW,popGet(AOP(left),offset));
-                        emitpcode(POC_MOVWF,popGet(AOP(result),offset));
-                        break;
+                      emitpcode (POC_MOVFW, popGet (AOP (left), offset));
+                      emitpcode (POC_MOVWF, popGet (AOP (result), offset));
+                      break;
                     default:
-                        emitpcode(POC_MOVLW, popGetLit(t));
-                        emitpcode(POC_ANDFW,popGet(AOP(left),offset));
-                        emitpcode(POC_MOVWF,popGet(AOP(result),offset));
+                      emitpcode (POC_MOVLW, popGetLit (t));
+                      emitpcode (POC_ANDFW, popGet (AOP (left), offset));
+                      emitpcode (POC_MOVWF, popGet (AOP (result), offset));
                     }
-                    continue;
+                  continue;
                 }
 
-                emitpcode(POC_MOVFW,popGet(AOP(right),offset));
-                emitpcode(POC_ANDFW,popGet(AOP(left),offset));
-                emitpcode(POC_MOVWF,popGet(AOP(result),offset));
+              emitpcode (POC_MOVFW, popGet (AOP (right), offset));
+              emitpcode (POC_ANDFW, popGet (AOP (left), offset));
+              emitpcode (POC_MOVWF, popGet (AOP (result), offset));
             }
         }
     }
 
-release :
-    freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    freeAsmop(result,NULL,ic,TRUE);
+release:
+  freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genOr  - code for or                                            */
 /*-----------------------------------------------------------------*/
-static void genOr (iCode *ic, iCode *ifx)
+static void
+genOr (iCode * ic, iCode * ifx)
 {
-    operand *left, *right, *result;
-    int size, offset=0;
-    unsigned long lit = 0L;
-
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
-    aopOp((left = IC_LEFT(ic)),ic,FALSE);
-    aopOp((right= IC_RIGHT(ic)),ic,FALSE);
-    aopOp((result=IC_RESULT(ic)),ic,TRUE);
-
-    DEBUGpic14_AopType(__LINE__,left,right,result);
-
-    /* if left is a literal & right is not then exchange them */
-    if ((AOP_TYPE(left) == AOP_LIT && AOP_TYPE(right) != AOP_LIT) ||
-        AOP_NEEDSACC(left)) {
-        operand *tmp = right ;
-        right = left;
-        left = tmp;
-    }
-
-    /* if result = right then exchange them */
-    if(pic14_sameRegs(AOP(result),AOP(right))){
-        operand *tmp = right ;
-        right = left;
-        left = tmp;
-    }
-
-    /* if right is bit then exchange them */
-    if (AOP_TYPE(right) == AOP_CRY &&
-        AOP_TYPE(left) != AOP_CRY){
-        operand *tmp = right ;
-        right = left;
-        left = tmp;
-    }
-
-    DEBUGpic14_AopType(__LINE__,left,right,result);
-
-    if(AOP_TYPE(right) == AOP_LIT)
-        lit = ulFromVal (AOP(right)->aopu.aop_lit);
-
-    size = AOP_SIZE(result);
-
-    // if(bit | yy)
-    // xx = bit | yy;
-    if (AOP_TYPE(left) == AOP_CRY){
-        if(AOP_TYPE(right) == AOP_LIT){
-            // c = bit & literal;
-            if(lit){
-                // lit != 0 => result = 1
-                if(AOP_TYPE(result) == AOP_CRY){
-                    if(size)
-                        emitpcode(POC_BSF, popGet(AOP(result),0));
-                    //pic14_emitcode("bsf","(%s >> 3), (%s & 7)",
-                    //   AOP(result)->aopu.aop_dir,
-                    //   AOP(result)->aopu.aop_dir);
-                    else if(ifx)
-                        continueIfTrue(ifx);
-                    goto release;
+  operand *left, *right, *result;
+  int size, offset = 0;
+  unsigned long lit = 0L;
+
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+
+  aopOp ((left = IC_LEFT (ic)), ic, FALSE);
+  aopOp ((right = IC_RIGHT (ic)), ic, FALSE);
+  aopOp ((result = IC_RESULT (ic)), ic, TRUE);
+
+  DEBUGpic14_AopType (__LINE__, left, right, result);
+
+  /* if left is a literal & right is not then exchange them */
+  if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) || AOP_NEEDSACC (left))
+    {
+      operand *tmp = right;
+      right = left;
+      left = tmp;
+    }
+
+  /* if result = right then exchange them */
+  if (pic14_sameRegs (AOP (result), AOP (right)))
+    {
+      operand *tmp = right;
+      right = left;
+      left = tmp;
+    }
+
+  /* if right is bit then exchange them */
+  if (AOP_TYPE (right) == AOP_CRY && AOP_TYPE (left) != AOP_CRY)
+    {
+      operand *tmp = right;
+      right = left;
+      left = tmp;
+    }
+
+  DEBUGpic14_AopType (__LINE__, left, right, result);
+
+  if (AOP_TYPE (right) == AOP_LIT)
+    lit = ulFromVal (AOP (right)->aopu.aop_lit);
+
+  size = AOP_SIZE (result);
+
+  // if(bit | yy)
+  // xx = bit | yy;
+  if (AOP_TYPE (left) == AOP_CRY)
+    {
+      if (AOP_TYPE (right) == AOP_LIT)
+        {
+          // c = bit & literal;
+          if (lit)
+            {
+              // lit != 0 => result = 1
+              if (AOP_TYPE (result) == AOP_CRY)
+                {
+                  if (size)
+                    emitpcode (POC_BSF, popGet (AOP (result), 0));
+                  //pic14_emitcode("bsf","(%s >> 3), (%s & 7)",
+                  //   AOP(result)->aopu.aop_dir,
+                  //   AOP(result)->aopu.aop_dir);
+                  else if (ifx)
+                    continueIfTrue (ifx);
+                  goto release;
                 }
-            } else {
-                // lit == 0 => result = left
-                if(size && pic14_sameRegs(AOP(result),AOP(left)))
-                    goto release;
-                pic14_emitcode(";XXX mov","c,%s  %s,%d",AOP(left)->aopu.aop_dir,__FILE__,__LINE__);
             }
-        } else {
-            if (AOP_TYPE(right) == AOP_CRY){
-                if(pic14_sameRegs(AOP(result),AOP(left))){
-                    // c = bit | bit;
-                    emitpcode(POC_BCF,   popGet(AOP(result),0));
-                    emitpcode(POC_BTFSC, popGet(AOP(right),0));
-                    emitpcode(POC_BSF,   popGet(AOP(result),0));
-
-                    pic14_emitcode("bcf","(%s >> 3), (%s & 7)",
-                        AOP(result)->aopu.aop_dir,
-                        AOP(result)->aopu.aop_dir);
-                    pic14_emitcode("btfsc","(%s >> 3), (%s & 7)",
-                        AOP(right)->aopu.aop_dir,
-                        AOP(right)->aopu.aop_dir);
-                    pic14_emitcode("bsf","(%s >> 3), (%s & 7)",
-                        AOP(result)->aopu.aop_dir,
-                        AOP(result)->aopu.aop_dir);
-                } else {
-                        emitpcode(POC_BCF,   popGet(AOP(result),0));
-                        emitpcode(POC_BTFSS, popGet(AOP(right),0));
-                        emitpcode(POC_BTFSC, popGet(AOP(left),0));
-                        emitpcode(POC_BSF,   popGet(AOP(result),0));
+          else
+            {
+              // lit == 0 => result = left
+              if (size && pic14_sameRegs (AOP (result), AOP (left)))
+                goto release;
+              pic14_emitcode (";XXX mov", "c,%s  %s,%d", AOP (left)->aopu.aop_dir, __FILE__, __LINE__);
+            }
+        }
+      else
+        {
+          if (AOP_TYPE (right) == AOP_CRY)
+            {
+              if (pic14_sameRegs (AOP (result), AOP (left)))
+                {
+                  // c = bit | bit;
+                  emitpcode (POC_BCF, popGet (AOP (result), 0));
+                  emitpcode (POC_BTFSC, popGet (AOP (right), 0));
+                  emitpcode (POC_BSF, popGet (AOP (result), 0));
+
+                  pic14_emitcode ("bcf", "(%s >> 3), (%s & 7)", AOP (result)->aopu.aop_dir, AOP (result)->aopu.aop_dir);
+                  pic14_emitcode ("btfsc", "(%s >> 3), (%s & 7)", AOP (right)->aopu.aop_dir, AOP (right)->aopu.aop_dir);
+                  pic14_emitcode ("bsf", "(%s >> 3), (%s & 7)", AOP (result)->aopu.aop_dir, AOP (result)->aopu.aop_dir);
                 }
-            } else {
-                // c = bit | val;
-                symbol *tlbl = newiTempLabel(NULL);
-                pic14_emitcode(";XXX "," %s,%d",__FILE__,__LINE__);
-
-
-                emitpcode(POC_BCF,   popGet(AOP(result),0));
-
-                if(!((AOP_TYPE(result) == AOP_CRY) && ifx))
-                    pic14_emitcode(";XXX setb","c");
-                pic14_emitcode(";XXX jb","%s,%05d_DS_",
-                    AOP(left)->aopu.aop_dir,tlbl->key+100);
-                pic14_toBoolean(right);
-                pic14_emitcode(";XXX jnz","%05d_DS_",tlbl->key+100);
-                if((AOP_TYPE(result) == AOP_CRY) && ifx){
-                    jmpTrueOrFalse(ifx, tlbl);
-                    goto release;
-                } else {
-                    CLRC;
-                    pic14_emitcode("","%05d_DS_:",tlbl->key+100);
+              else
+                {
+                  emitpcode (POC_BCF, popGet (AOP (result), 0));
+                  emitpcode (POC_BTFSS, popGet (AOP (right), 0));
+                  emitpcode (POC_BTFSC, popGet (AOP (left), 0));
+                  emitpcode (POC_BSF, popGet (AOP (result), 0));
+                }
+            }
+          else
+            {
+              // c = bit | val;
+              symbol *tlbl = newiTempLabel (NULL);
+              pic14_emitcode (";XXX ", " %s,%d", __FILE__, __LINE__);
+
+
+              emitpcode (POC_BCF, popGet (AOP (result), 0));
+
+              if (!((AOP_TYPE (result) == AOP_CRY) && ifx))
+                pic14_emitcode (";XXX setb", "c");
+              pic14_emitcode (";XXX jb", "%s,%05d_DS_", AOP (left)->aopu.aop_dir, labelKey2num (tlbl->key));
+              pic14_toBoolean (right);
+              pic14_emitcode (";XXX jnz", "%05d_DS_", labelKey2num (tlbl->key));
+              if ((AOP_TYPE (result) == AOP_CRY) && ifx)
+                {
+                  jmpTrueOrFalse (ifx, tlbl);
+                  goto release;
+                }
+              else
+                {
+                  CLRC;
+                  pic14_emitcode ("", "%05d_DS_:", labelKey2num (tlbl->key));
                 }
             }
         }
-        // bit = c
-        // val = c
-        if(size)
-            pic14_outBitC(result);
-        // if(bit | ...)
-        else if((AOP_TYPE(result) == AOP_CRY) && ifx)
-            genIfxJump(ifx, "c");
-        goto release ;
-    }
-
-    // if(val | 0xZZ)       - size = 0, ifx != FALSE  -
-    // bit = val | 0xZZ     - size = 1, ifx = FALSE -
-    if((AOP_TYPE(right) == AOP_LIT) &&
-      (AOP_TYPE(result) == AOP_CRY) &&
-      (AOP_TYPE(left) != AOP_CRY)){
-        if(lit){
-            pic14_emitcode(";XXX "," %s,%d",__FILE__,__LINE__);
-            // result = 1
-            if(size)
-                pic14_emitcode(";XXX setb","%s",AOP(result)->aopu.aop_dir);
-            else
-                continueIfTrue(ifx);
-            goto release;
-        } else {
-            pic14_emitcode(";XXX "," %s,%d",__FILE__,__LINE__);
-            // lit = 0, result = boolean(left)
-            if(size)
-                pic14_emitcode(";XXX setb","c");
-            pic14_toBoolean(right);
-            if(size){
-                symbol *tlbl = newiTempLabel(NULL);
-                pic14_emitcode(";XXX jnz","%05d_DS_",tlbl->key+100);
-                CLRC;
-                pic14_emitcode("","%05d_DS_:",tlbl->key+100);
-            } else {
-                genIfxJump (ifx,"a");
-                goto release;
+      // bit = c
+      // val = c
+      if (size)
+        pic14_outBitC (result);
+      // if(bit | ...)
+      else if ((AOP_TYPE (result) == AOP_CRY) && ifx)
+        genIfxJump (ifx, "c");
+      goto release;
+    }
+
+  // if(val | 0xZZ)       - size = 0, ifx != FALSE  -
+  // bit = val | 0xZZ     - size = 1, ifx = FALSE -
+  if ((AOP_TYPE (right) == AOP_LIT) && (AOP_TYPE (result) == AOP_CRY) && (AOP_TYPE (left) != AOP_CRY))
+    {
+      if (lit)
+        {
+          pic14_emitcode (";XXX ", " %s,%d", __FILE__, __LINE__);
+          // result = 1
+          if (size)
+            pic14_emitcode (";XXX setb", "%s", AOP (result)->aopu.aop_dir);
+          else
+            continueIfTrue (ifx);
+          goto release;
+        }
+      else
+        {
+          pic14_emitcode (";XXX ", " %s,%d", __FILE__, __LINE__);
+          // lit = 0, result = boolean(left)
+          if (size)
+            pic14_emitcode (";XXX setb", "c");
+          pic14_toBoolean (right);
+          if (size)
+            {
+              symbol *tlbl = newiTempLabel (NULL);
+              pic14_emitcode (";XXX jnz", "%05d_DS_", labelKey2num (tlbl->key));
+              CLRC;
+              pic14_emitcode ("", "%05d_DS_:", labelKey2num (tlbl->key));
+            }
+          else
+            {
+              genIfxJump (ifx, "a");
+              goto release;
             }
         }
-        pic14_outBitC(result);
-        goto release ;
+      pic14_outBitC (result);
+      goto release;
     }
 
-    /* if left is same as result */
-    if(pic14_sameRegs(AOP(result),AOP(left))){
-        int know_W = -1;
-        for(;size--; offset++,lit>>=8) {
-            if(AOP_TYPE(right) == AOP_LIT){
-                if((lit & 0xff) == 0)
-                    /*  or'ing with 0 has no effect */
-                    continue;
-                else {
-                    int p = my_powof2(lit & 0xff);
-                    if(p>=0) {
-                        /* only one bit is set in the literal, so use a bsf instruction */
-                        emitpcode(POC_BSF,
-                            newpCodeOpBit(aopGet(AOP(left),offset,FALSE,FALSE),p,0));
-                    } else {
-                        if(know_W != (int)(lit & 0xff))
-                            emitpcode(POC_MOVLW, popGetLit(lit & 0xff));
-                        know_W = lit & 0xff;
-                        emitpcode(POC_IORWF, popGet(AOP(left),offset));
+  /* if left is same as result */
+  if (pic14_sameRegs (AOP (result), AOP (left)))
+    {
+      int know_W = -1;
+      for (; size--; offset++, lit >>= 8)
+        {
+          if (AOP_TYPE (right) == AOP_LIT)
+            {
+              if ((lit & 0xff) == 0)
+                /*  or'ing with 0 has no effect */
+                continue;
+              else
+                {
+                  int p = my_powof2 (lit & 0xff);
+                  if (p >= 0)
+                    {
+                      /* only one bit is set in the literal, so use a bsf instruction */
+                      emitpcode (POC_BSF, newpCodeOpBit (aopGet (AOP (left), offset, FALSE, FALSE), p, 0));
+                    }
+                  else
+                    {
+                      if (know_W != (int) (lit & 0xff))
+                        emitpcode (POC_MOVLW, popGetLit (lit & 0xff));
+                      know_W = lit & 0xff;
+                      emitpcode (POC_IORWF, popGet (AOP (left), offset));
                     }
 
                 }
-            } else {
-                emitpcode(POC_MOVFW,  popGet(AOP(right),offset));
-                emitpcode(POC_IORWF,  popGet(AOP(left),offset));
-            }
-        }
-    } else {
-        // left & result in different registers
-        if(AOP_TYPE(result) == AOP_CRY){
-            // result = bit
-            // if(size), result in bit
-            // if(!size && ifx), conditional oper: if(left | right)
-            symbol *tlbl = newiTempLabel(NULL);
-            int sizer = max(AOP_SIZE(left),AOP_SIZE(right));
-            pic14_emitcode(";XXX "," %s,%d",__FILE__,__LINE__);
-
-
-            if(size)
-                pic14_emitcode(";XXX setb","c");
-            while(sizer--){
-                MOVA(aopGet(AOP(right),offset,FALSE,FALSE));
-                pic14_emitcode(";XXX orl","a,%s",
-                    aopGet(AOP(left),offset,FALSE,FALSE));
-                pic14_emitcode(";XXX jnz","%05d_DS_",tlbl->key+100);
-                offset++;
-            }
-            if(size){
-                CLRC;
-                pic14_emitcode("","%05d_DS_:",tlbl->key+100);
-                pic14_outBitC(result);
-            } else if(ifx)
-                jmpTrueOrFalse(ifx, tlbl);
-        } else for(;(size--);offset++){
+            }
+          else
+            {
+              emitpcode (POC_MOVFW, popGet (AOP (right), offset));
+              emitpcode (POC_IORWF, popGet (AOP (left), offset));
+            }
+        }
+    }
+  else
+    {
+      // left & result in different registers
+      if (AOP_TYPE (result) == AOP_CRY)
+        {
+          // result = bit
+          // if(size), result in bit
+          // if(!size && ifx), conditional oper: if(left | right)
+          symbol *tlbl = newiTempLabel (NULL);
+          int sizer = max (AOP_SIZE (left), AOP_SIZE (right));
+          pic14_emitcode (";XXX ", " %s,%d", __FILE__, __LINE__);
+
+
+          if (size)
+            pic14_emitcode (";XXX setb", "c");
+          while (sizer--)
+            {
+              MOVA (aopGet (AOP (right), offset, FALSE, FALSE));
+              pic14_emitcode (";XXX orl", "a,%s", aopGet (AOP (left), offset, FALSE, FALSE));
+              pic14_emitcode (";XXX jnz", "%05d_DS_", labelKey2num (tlbl->key));
+              offset++;
+            }
+          if (size)
+            {
+              CLRC;
+              pic14_emitcode ("", "%05d_DS_:", labelKey2num (tlbl->key));
+              pic14_outBitC (result);
+            }
+          else if (ifx)
+            jmpTrueOrFalse (ifx, tlbl);
+        }
+      else
+        for (; (size--); offset++)
+          {
             // normal case
             // result = left | right
-            if(AOP_TYPE(right) == AOP_LIT){
-                int t = (lit >> (offset*8)) & 0x0FFL;
-                switch(t) {
-                case 0x00:
-                    emitpcode(POC_MOVFW,  popGet(AOP(left),offset));
-                    emitpcode(POC_MOVWF,  popGet(AOP(result),offset));
+            if (AOP_TYPE (right) == AOP_LIT)
+              {
+                int t = (lit >> (offset * 8)) & 0x0FFL;
+                switch (t)
+                  {
+                  case 0x00:
+                    emitpcode (POC_MOVFW, popGet (AOP (left), offset));
+                    emitpcode (POC_MOVWF, popGet (AOP (result), offset));
 
                     break;
-                default:
-                    emitpcode(POC_MOVLW,  popGetLit(t));
-                    emitpcode(POC_IORFW,  popGet(AOP(left),offset));
-                    emitpcode(POC_MOVWF,  popGet(AOP(result),offset));
-                }
+                  default:
+                    emitpcode (POC_MOVLW, popGetLit (t));
+                    emitpcode (POC_IORFW, popGet (AOP (left), offset));
+                    emitpcode (POC_MOVWF, popGet (AOP (result), offset));
+                  }
                 continue;
-            }
+              }
 
             // faster than result <- left, anl result,right
             // and better if result is SFR
-            emitpcode(POC_MOVFW,popGet(AOP(right),offset));
-            emitpcode(POC_IORFW,popGet(AOP(left),offset));
-            emitpcode(POC_MOVWF,  popGet(AOP(result),offset));
-        }
+            emitpcode (POC_MOVFW, popGet (AOP (right), offset));
+            emitpcode (POC_IORFW, popGet (AOP (left), offset));
+            emitpcode (POC_MOVWF, popGet (AOP (result), offset));
+          }
     }
 
-release :
-    freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    freeAsmop(result,NULL,ic,TRUE);
+release:
+  freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genXor - code for xclusive or                                   */
 /*-----------------------------------------------------------------*/
-static void genXor (iCode *ic, iCode *ifx)
+static void
+genXor (iCode * ic, iCode * ifx)
 {
-    operand *left, *right, *result;
-    int size, offset=0;
-    unsigned long lit = 0L;
-
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
-    aopOp((left = IC_LEFT(ic)),ic,FALSE);
-    aopOp((right= IC_RIGHT(ic)),ic,FALSE);
-    aopOp((result=IC_RESULT(ic)),ic,TRUE);
-
-    /* if left is a literal & right is not ||
-    if left needs acc & right does not */
-    if ((AOP_TYPE(left) == AOP_LIT && AOP_TYPE(right) != AOP_LIT) ||
-        (AOP_NEEDSACC(left) && !AOP_NEEDSACC(right))) {
-        operand *tmp = right ;
-        right = left;
-        left = tmp;
-    }
-
-    /* if result = right then exchange them */
-    if(pic14_sameRegs(AOP(result),AOP(right))){
-        operand *tmp = right ;
-        right = left;
-        left = tmp;
-    }
-
-    /* if right is bit then exchange them */
-    if (AOP_TYPE(right) == AOP_CRY &&
-        AOP_TYPE(left) != AOP_CRY){
-        operand *tmp = right ;
-        right = left;
-        left = tmp;
-    }
-    if(AOP_TYPE(right) == AOP_LIT)
-        lit = ulFromVal (AOP(right)->aopu.aop_lit);
-
-    size = AOP_SIZE(result);
-
-    // if(bit ^ yy)
-    // xx = bit ^ yy;
-    if (AOP_TYPE(left) == AOP_CRY){
-        if(AOP_TYPE(right) == AOP_LIT){
-            // c = bit & literal;
-            if(lit>>1){
-                // lit>>1  != 0 => result = 1
-                if(AOP_TYPE(result) == AOP_CRY){
-                    if(size)
-                    {emitpcode(POC_BSF,  popGet(AOP(result),offset));
-                    pic14_emitcode("setb","%s",AOP(result)->aopu.aop_dir);}
-                    else if(ifx)
-                        continueIfTrue(ifx);
+  operand *left, *right, *result;
+  int size, offset = 0;
+  unsigned long lit = 0L;
+
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+
+  aopOp ((left = IC_LEFT (ic)), ic, FALSE);
+  aopOp ((right = IC_RIGHT (ic)), ic, FALSE);
+  aopOp ((result = IC_RESULT (ic)), ic, TRUE);
+
+  /* if left is a literal & right is not ||
+     if left needs acc & right does not */
+  if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) || (AOP_NEEDSACC (left) && !AOP_NEEDSACC (right)))
+    {
+      operand *tmp = right;
+      right = left;
+      left = tmp;
+    }
+
+  /* if result = right then exchange them */
+  if (pic14_sameRegs (AOP (result), AOP (right)))
+    {
+      operand *tmp = right;
+      right = left;
+      left = tmp;
+    }
+
+  /* if right is bit then exchange them */
+  if (AOP_TYPE (right) == AOP_CRY && AOP_TYPE (left) != AOP_CRY)
+    {
+      operand *tmp = right;
+      right = left;
+      left = tmp;
+    }
+  if (AOP_TYPE (right) == AOP_LIT)
+    lit = ulFromVal (AOP (right)->aopu.aop_lit);
+
+  size = AOP_SIZE (result);
+
+  // if(bit ^ yy)
+  // xx = bit ^ yy;
+  if (AOP_TYPE (left) == AOP_CRY)
+    {
+      if (AOP_TYPE (right) == AOP_LIT)
+        {
+          // c = bit & literal;
+          if (lit >> 1)
+            {
+              // lit>>1  != 0 => result = 1
+              if (AOP_TYPE (result) == AOP_CRY)
+                {
+                  if (size)
+                    {
+                      emitpcode (POC_BSF, popGet (AOP (result), offset));
+                      pic14_emitcode ("setb", "%s", AOP (result)->aopu.aop_dir);
+                    }
+                  else if (ifx)
+                    continueIfTrue (ifx);
+                  goto release;
+                }
+              pic14_emitcode ("setb", "c");
+            }
+          else
+            {
+              // lit == (0 or 1)
+              if (lit == 0)
+                {
+                  // lit == 0, result = left
+                  if (size && pic14_sameRegs (AOP (result), AOP (left)))
                     goto release;
+                  pic14_emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir);
                 }
-                pic14_emitcode("setb","c");
-            } else{
-                // lit == (0 or 1)
-                if(lit == 0){
-                    // lit == 0, result = left
-                    if(size && pic14_sameRegs(AOP(result),AOP(left)))
-                        goto release;
-                    pic14_emitcode("mov","c,%s",AOP(left)->aopu.aop_dir);
-                } else{
-                    // lit == 1, result = not(left)
-                    if(size && pic14_sameRegs(AOP(result),AOP(left))){
-                        emitpcode(POC_MOVLW,  popGet(AOP(result),offset));
-                        emitpcode(POC_XORWF,  popGet(AOP(result),offset));
-                        pic14_emitcode("cpl","%s",AOP(result)->aopu.aop_dir);
-                        goto release;
-                    } else {
-                        assert ( !"incomplete genXor" );
-                        pic14_emitcode("mov","c,%s",AOP(left)->aopu.aop_dir);
-                        pic14_emitcode("cpl","c");
+              else
+                {
+                  // lit == 1, result = not(left)
+                  if (size && pic14_sameRegs (AOP (result), AOP (left)))
+                    {
+                      emitpcode (POC_MOVLW, popGet (AOP (result), offset));
+                      emitpcode (POC_XORWF, popGet (AOP (result), offset));
+                      pic14_emitcode ("cpl", "%s", AOP (result)->aopu.aop_dir);
+                      goto release;
+                    }
+                  else
+                    {
+                      assert (!"incomplete genXor");
+                      pic14_emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir);
+                      pic14_emitcode ("cpl", "c");
                     }
                 }
             }
 
-        } else {
-            // right != literal
-            symbol *tlbl = newiTempLabel(NULL);
-            if (AOP_TYPE(right) == AOP_CRY){
-                // c = bit ^ bit;
-                pic14_emitcode("mov","c,%s",AOP(right)->aopu.aop_dir);
-            }
-            else{
-                int sizer = AOP_SIZE(right);
-                // c = bit ^ val
-                // if val>>1 != 0, result = 1
-                pic14_emitcode("setb","c");
-                while(sizer){
-                    MOVA(aopGet(AOP(right),sizer-1,FALSE,FALSE));
-                    if(sizer == 1)
-                        // test the msb of the lsb
-                        pic14_emitcode("anl","a,#0xfe");
-                    pic14_emitcode("jnz","%05d_DS_",tlbl->key+100);
-                    sizer--;
+        }
+      else
+        {
+          // right != literal
+          symbol *tlbl = newiTempLabel (NULL);
+          if (AOP_TYPE (right) == AOP_CRY)
+            {
+              // c = bit ^ bit;
+              pic14_emitcode ("mov", "c,%s", AOP (right)->aopu.aop_dir);
+            }
+          else
+            {
+              int sizer = AOP_SIZE (right);
+              // c = bit ^ val
+              // if val>>1 != 0, result = 1
+              pic14_emitcode ("setb", "c");
+              while (sizer)
+                {
+                  MOVA (aopGet (AOP (right), sizer - 1, FALSE, FALSE));
+                  if (sizer == 1)
+                    // test the msb of the lsb
+                    pic14_emitcode ("anl", "a,#0xfe");
+                  pic14_emitcode ("jnz", "%05d_DS_", labelKey2num (tlbl->key));
+                  sizer--;
                 }
-                // val = (0,1)
-                pic14_emitcode("rrc","a");
+              // val = (0,1)
+              pic14_emitcode ("rrc", "a");
             }
-            pic14_emitcode("jnb","%s,%05d_DS_",AOP(left)->aopu.aop_dir,(tlbl->key+100));
-            pic14_emitcode("cpl","c");
-            pic14_emitcode("","%05d_DS_:",(tlbl->key+100));
-        }
-        // bit = c
-        // val = c
-        if(size)
-            pic14_outBitC(result);
-        // if(bit | ...)
-        else if((AOP_TYPE(result) == AOP_CRY) && ifx)
-            genIfxJump(ifx, "c");
-        goto release ;
-    }
-
-    if(pic14_sameRegs(AOP(result),AOP(left))){
-        /* if left is same as result */
-        for(;size--; offset++) {
-            if(AOP_TYPE(right) == AOP_LIT){
-                int t  = (lit >> (offset*8)) & 0x0FFL;
-                if(t == 0x00L)
-                    continue;
-                else {
-                        emitpcode(POC_MOVLW, popGetLit(t));
-                        emitpcode(POC_XORWF,popGet(AOP(left),offset));
+          pic14_emitcode ("jnb", "%s,%05d_DS_", AOP (left)->aopu.aop_dir, (labelKey2num (tlbl->key)));
+          pic14_emitcode ("cpl", "c");
+          pic14_emitcode ("", "%05d_DS_:", (labelKey2num (tlbl->key)));
+        }
+      // bit = c
+      // val = c
+      if (size)
+        pic14_outBitC (result);
+      // if(bit | ...)
+      else if ((AOP_TYPE (result) == AOP_CRY) && ifx)
+        genIfxJump (ifx, "c");
+      goto release;
+    }
+
+  if (pic14_sameRegs (AOP (result), AOP (left)))
+    {
+      /* if left is same as result */
+      for (; size--; offset++)
+        {
+          if (AOP_TYPE (right) == AOP_LIT)
+            {
+              int t = (lit >> (offset * 8)) & 0x0FFL;
+              if (t == 0x00L)
+                continue;
+              else
+                {
+                  emitpcode (POC_MOVLW, popGetLit (t));
+                  emitpcode (POC_XORWF, popGet (AOP (left), offset));
+                }
+            }
+          else
+            {
+              emitpcode (POC_MOVFW, popGet (AOP (right), offset));
+              emitpcode (POC_XORWF, popGet (AOP (left), offset));
+            }
+        }
+    }
+  else
+    {
+      // left & result in different registers
+      if (AOP_TYPE (result) == AOP_CRY)
+        {
+          // result = bit
+          // if(size), result in bit
+          // if(!size && ifx), conditional oper: if(left ^ right)
+          symbol *tlbl = newiTempLabel (NULL);
+          int sizer = max (AOP_SIZE (left), AOP_SIZE (right));
+          if (size)
+            pic14_emitcode ("setb", "c");
+          while (sizer--)
+            {
+              if ((AOP_TYPE (right) == AOP_LIT) && (((lit >> (offset * 8)) & 0x0FFL) == 0x00L))
+                {
+                  MOVA (aopGet (AOP (left), offset, FALSE, FALSE));
                 }
-            } else {
-                emitpcode(POC_MOVFW,popGet(AOP(right),offset));
-                emitpcode(POC_XORWF,popGet(AOP(left),offset));
-            }
-        }
-    } else {
-        // left & result in different registers
-        if(AOP_TYPE(result) == AOP_CRY){
-            // result = bit
-            // if(size), result in bit
-            // if(!size && ifx), conditional oper: if(left ^ right)
-            symbol *tlbl = newiTempLabel(NULL);
-            int sizer = max(AOP_SIZE(left),AOP_SIZE(right));
-            if(size)
-                pic14_emitcode("setb","c");
-            while(sizer--){
-                if((AOP_TYPE(right) == AOP_LIT) &&
-                    (((lit >> (offset*8)) & 0x0FFL) == 0x00L)){
-                    MOVA(aopGet(AOP(left),offset,FALSE,FALSE));
-                } else {
-                    MOVA(aopGet(AOP(right),offset,FALSE,FALSE));
-                    pic14_emitcode("xrl","a,%s",
-                        aopGet(AOP(left),offset,FALSE,FALSE));
+              else
+                {
+                  MOVA (aopGet (AOP (right), offset, FALSE, FALSE));
+                  pic14_emitcode ("xrl", "a,%s", aopGet (AOP (left), offset, FALSE, FALSE));
                 }
-                pic14_emitcode("jnz","%05d_DS_",tlbl->key+100);
-                offset++;
+              pic14_emitcode ("jnz", "%05d_DS_", labelKey2num (tlbl->key));
+              offset++;
+            }
+          if (size)
+            {
+              CLRC;
+              pic14_emitcode ("", "%05d_DS_:", labelKey2num (tlbl->key));
+              pic14_outBitC (result);
             }
-            if(size){
-                CLRC;
-                pic14_emitcode("","%05d_DS_:",tlbl->key+100);
-                pic14_outBitC(result);
-            } else if(ifx)
-                jmpTrueOrFalse(ifx, tlbl);
-        } else for(;(size--);offset++){
+          else if (ifx)
+            jmpTrueOrFalse (ifx, tlbl);
+        }
+      else
+        for (; (size--); offset++)
+          {
             // normal case
             // result = left & right
-            if(AOP_TYPE(right) == AOP_LIT){
-                int t = (lit >> (offset*8)) & 0x0FFL;
-                switch(t) {
-                case 0x00:
-                    emitpcode(POC_MOVFW,popGet(AOP(left),offset));
-                    emitpcode(POC_MOVWF,popGet(AOP(result),offset));
+            if (AOP_TYPE (right) == AOP_LIT)
+              {
+                int t = (lit >> (offset * 8)) & 0x0FFL;
+                switch (t)
+                  {
+                  case 0x00:
+                    emitpcode (POC_MOVFW, popGet (AOP (left), offset));
+                    emitpcode (POC_MOVWF, popGet (AOP (result), offset));
                     break;
-                case 0xff:
-                    emitpcode(POC_COMFW,popGet(AOP(left),offset));
-                    emitpcode(POC_MOVWF,popGet(AOP(result),offset));
+                  case 0xff:
+                    emitpcode (POC_COMFW, popGet (AOP (left), offset));
+                    emitpcode (POC_MOVWF, popGet (AOP (result), offset));
                     break;
-                default:
-                    emitpcode(POC_MOVLW, popGetLit(t));
-                    emitpcode(POC_XORFW,popGet(AOP(left),offset));
-                    emitpcode(POC_MOVWF,popGet(AOP(result),offset));
-                }
+                  default:
+                    emitpcode (POC_MOVLW, popGetLit (t));
+                    emitpcode (POC_XORFW, popGet (AOP (left), offset));
+                    emitpcode (POC_MOVWF, popGet (AOP (result), offset));
+                  }
                 continue;
-            }
+              }
 
             // faster than result <- left, anl result,right
             // and better if result is SFR
-            emitpcode(POC_MOVFW,popGet(AOP(right),offset));
-            emitpcode(POC_XORFW,popGet(AOP(left),offset));
-            emitpcode(POC_MOVWF,popGet(AOP(result),offset));
-        }
+            emitpcode (POC_MOVFW, popGet (AOP (right), offset));
+            emitpcode (POC_XORFW, popGet (AOP (left), offset));
+            emitpcode (POC_MOVWF, popGet (AOP (result), offset));
+          }
     }
 
-release :
-    freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    freeAsmop(result,NULL,ic,TRUE);
+release:
+  freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genInline - write the inline code out                           */
 /*-----------------------------------------------------------------*/
-static void genInline (iCode *ic)
+static void
+pic14_genInline (iCode * ic)
 {
   char *buffer, *bp, *bp1;
   bool inComment = FALSE;
 
   FENTRY;
-  DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-  _G.inLine += (!options.asmpeep);
+  genLine.lineElement.isInline += (!options.asmpeep);
 
   buffer = bp = bp1 = Safe_strdup (IC_INLINE (ic));
 
@@ -4480,20 +4759,20 @@
           inComment = FALSE;
           *bp++ = '\0';
           if (*bp1)
-            addpCode2pBlock(pb, newpCodeAsmDir(bp1, NULL)); // inline directly, no process
+            addpCode2pBlock (pb, newpCodeAsmDir (bp1, NULL));   // inline directly, no process
           bp1 = bp;
           break;
 
         default:
           /* Add \n for labels, not dirs such as c:\mydir */
-          if (!inComment && (*bp == ':') && (isspace((unsigned char)bp[1])))
+          if (!inComment && (*bp == ':') && (isspace ((unsigned char) bp[1])))
             {
               ++bp;
               *bp = '\0';
               ++bp;
               /* print label, use this special format with NULL directive
                * to denote that the argument should not be indented with tab */
-              addpCode2pBlock(pb, newpCodeAsmDir(NULL, bp1)); // inline directly, no process
+              addpCode2pBlock (pb, newpCodeAsmDir (NULL, bp1)); // inline directly, no process
               bp1 = bp;
             }
           else
@@ -4502,178 +4781,246 @@
         }
     }
   if ((bp1 != bp) && *bp1)
-    addpCode2pBlock(pb, newpCodeAsmDir(bp1, NULL)); // inline directly, no process
+    addpCode2pBlock (pb, newpCodeAsmDir (bp1, NULL));   // inline directly, no process
 
   Safe_free (buffer);
 
-  _G.inLine -= (!options.asmpeep);
+  /* consumed; we can free it here */
+  dbuf_free (IC_INLINE (ic));
+
+  genLine.lineElement.isInline -= (!options.asmpeep);
 }
 
 /*-----------------------------------------------------------------*/
 /* genRRC - rotate right with carry                                */
 /*-----------------------------------------------------------------*/
-static void genRRC (iCode *ic)
+static void
+genRRC (iCode * ic)
 {
-    operand *left , *result ;
-    int size, offset = 0, same;
+  operand *left, *result;
+  int size, offset = 0, same;
 
-    FENTRY;
-    /* rotate right with carry */
-    left = IC_LEFT(ic);
-    result=IC_RESULT(ic);
-    aopOp (left,ic,FALSE);
-    aopOp (result,ic,FALSE);
+  FENTRY;
+  /* rotate right with carry */
+  left = IC_LEFT (ic);
+  result = IC_RESULT (ic);
+  aopOp (left, ic, FALSE);
+  aopOp (result, ic, FALSE);
 
-    DEBUGpic14_AopType(__LINE__,left,NULL,result);
+  DEBUGpic14_AopType (__LINE__, left, NULL, result);
 
-    same = pic14_sameRegs(AOP(result),AOP(left));
+  same = pic14_sameRegs (AOP (result), AOP (left));
 
-    size = AOP_SIZE(result);
+  size = AOP_SIZE (result);
 
-    /* get the lsb and put it into the carry */
-    emitpcode(POC_RRFW, popGet(AOP(left),size-1));
+  /* get the lsb and put it into the carry */
+  emitpcode (POC_RRFW, popGet (AOP (left), size - 1));
 
-    offset = 0 ;
+  offset = 0;
 
-    while(size--) {
+  while (size--)
+    {
 
-        if(same) {
-            emitpcode(POC_RRF, popGet(AOP(left),offset));
-        } else {
-            emitpcode(POC_RRFW, popGet(AOP(left),offset));
-            emitpcode(POC_MOVWF, popGet(AOP(result),offset));
+      if (same)
+        {
+          emitpcode (POC_RRF, popGet (AOP (left), offset));
+        }
+      else
+        {
+          emitpcode (POC_RRFW, popGet (AOP (left), offset));
+          emitpcode (POC_MOVWF, popGet (AOP (result), offset));
         }
 
-        offset++;
+      offset++;
     }
 
-    freeAsmop(left,NULL,ic,TRUE);
-    freeAsmop(result,NULL,ic,TRUE);
+  freeAsmop (left, NULL, ic, TRUE);
+  freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genRLC - generate code for rotate left with carry               */
 /*-----------------------------------------------------------------*/
-static void genRLC (iCode *ic)
+static void
+genRLC (iCode * ic)
 {
-    operand *left , *result ;
-    int size, offset = 0;
-    int same;
+  operand *left, *result;
+  int size, offset = 0;
+  int same;
 
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* rotate right with carry */
-    left = IC_LEFT(ic);
-    result=IC_RESULT(ic);
-    aopOp (left,ic,FALSE);
-    aopOp (result,ic,FALSE);
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  /* rotate right with carry */
+  left = IC_LEFT (ic);
+  result = IC_RESULT (ic);
+  aopOp (left, ic, FALSE);
+  aopOp (result, ic, FALSE);
 
-    DEBUGpic14_AopType(__LINE__,left,NULL,result);
+  DEBUGpic14_AopType (__LINE__, left, NULL, result);
 
-    same = pic14_sameRegs(AOP(result),AOP(left));
+  same = pic14_sameRegs (AOP (result), AOP (left));
 
-    /* move it to the result */
-    size = AOP_SIZE(result);
+  /* move it to the result */
+  size = AOP_SIZE (result);
 
-    /* get the msb and put it into the carry */
-    emitpcode(POC_RLFW, popGet(AOP(left),size-1));
+  /* get the msb and put it into the carry */
+  emitpcode (POC_RLFW, popGet (AOP (left), size - 1));
 
-    offset = 0 ;
+  offset = 0;
 
-    while(size--) {
+  while (size--)
+    {
 
-        if(same) {
-            emitpcode(POC_RLF, popGet(AOP(left),offset));
-        } else {
-            emitpcode(POC_RLFW, popGet(AOP(left),offset));
-            emitpcode(POC_MOVWF, popGet(AOP(result),offset));
+      if (same)
+        {
+          emitpcode (POC_RLF, popGet (AOP (left), offset));
+        }
+      else
+        {
+          emitpcode (POC_RLFW, popGet (AOP (left), offset));
+          emitpcode (POC_MOVWF, popGet (AOP (result), offset));
         }
 
-        offset++;
+      offset++;
     }
 
 
-    freeAsmop(left,NULL,ic,TRUE);
-    freeAsmop(result,NULL,ic,TRUE);
+  freeAsmop (left, NULL, ic, TRUE);
+  freeAsmop (result, NULL, ic, TRUE);
+}
+
+static void
+genGetABit (iCode * ic)
+{
+  operand *left, *right, *result;
+  int shCount;
+  int offset;
+  int i;
+
+  left = IC_LEFT (ic);
+  right = IC_RIGHT (ic);
+  result = IC_RESULT (ic);
+
+  aopOp (left, ic, FALSE);
+  aopOp (right, ic, FALSE);
+  aopOp (result, ic, TRUE);
+
+  shCount = (int) ulFromVal (AOP (right)->aopu.aop_lit);
+  offset = shCount / 8;
+  shCount %= 8;
+
+  /* load and mask the source byte */
+  mov2w (AOP (left), offset);
+  emitpcode (POC_ANDLW, popGetLit (1 << shCount));
+
+  /* move selected bit to bit 0 */
+  switch (shCount)
+    {
+    case 0:
+      /* nothing more to do */
+      break;
+    default:
+      /* keep W==0, force W=0x01 otherwise */
+      emitSKPZ;
+      emitpcode (POC_MOVLW, popGetLit (1));
+      break;
+    }                           // switch
+
+  /* write result */
+  emitpcode (POC_MOVWF, popGet (AOP (result), 0));
+
+  for (i = 1; i < AOP_SIZE (result); ++i)
+    {
+      emitpcode (POC_CLRF, popGet (AOP (result), i));
+    }                           // for
+
+  freeAsmop (left, NULL, ic, TRUE);
+  freeAsmop (right, NULL, ic, TRUE);
+  freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genGetHbit - generates code get highest order bit               */
 /*-----------------------------------------------------------------*/
-static void genGetHbit (iCode *ic)
+static void
+genGetHbit (iCode * ic)
 {
-    operand *left, *result;
-    left = IC_LEFT(ic);
-    result=IC_RESULT(ic);
-    aopOp (left,ic,FALSE);
-    aopOp (result,ic,FALSE);
-
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* get the highest order byte into a */
-    MOVA(aopGet(AOP(left),AOP_SIZE(left) - 1,FALSE,FALSE));
-    if(AOP_TYPE(result) == AOP_CRY){
-        pic14_emitcode("rlc","a");
-        pic14_outBitC(result);
-    }
-    else{
-        pic14_emitcode("rl","a");
-        pic14_emitcode("anl","a,#0x01");
-        pic14_outAcc(result);
+  operand *left, *result;
+  left = IC_LEFT (ic);
+  result = IC_RESULT (ic);
+  aopOp (left, ic, FALSE);
+  aopOp (result, ic, FALSE);
+
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  /* get the highest order byte into a */
+  MOVA (aopGet (AOP (left), AOP_SIZE (left) - 1, FALSE, FALSE));
+  if (AOP_TYPE (result) == AOP_CRY)
+    {
+      pic14_emitcode ("rlc", "a");
+      pic14_outBitC (result);
+    }
+  else
+    {
+      pic14_emitcode ("rl", "a");
+      pic14_emitcode ("anl", "a,#0x01");
+      pic14_outAcc (result);
     }
 
 
-    freeAsmop(left,NULL,ic,TRUE);
-    freeAsmop(result,NULL,ic,TRUE);
+  freeAsmop (left, NULL, ic, TRUE);
+  freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* AccLsh - shift left accumulator by known count                  */
 /* MARK: pic14 always rotates through CARRY!                       */
 /*-----------------------------------------------------------------*/
-static void AccLsh (pCodeOp *pcop,int shCount)
+static void
+AccLsh (pCodeOp * pcop, int shCount)
 {
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    shCount &= 0x0007;              // shCount : 0..7
-    switch(shCount){
-    case 0 :
-        return;
-        break;
-    case 1 :
-        emitCLRC;
-        emitpcode(POC_RLF,pcop);
-        return;
-        break;
-    case 2 :
-        emitpcode(POC_RLF,pcop);
-        emitpcode(POC_RLF,pcop);
-        break;
-    case 3 :
-        emitpcode(POC_RLF,pcop);
-        emitpcode(POC_RLF,pcop);
-        emitpcode(POC_RLF,pcop);
-        break;
-    case 4 :
-        emitpcode(POC_SWAPF,pcop);
-        break;
-    case 5 :
-        emitpcode(POC_SWAPF,pcop);
-        emitpcode(POC_RLF,pcop);
-        break;
-    case 6 :
-        emitpcode(POC_SWAPF,pcop);
-        emitpcode(POC_RLF,pcop);
-        emitpcode(POC_RLF,pcop);
-        break;
-    case 7 :
-        emitpcode(POC_RRFW,pcop);
-        emitpcode(POC_RRF,pcop);
-        break;
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  shCount &= 0x0007;            // shCount : 0..7
+  switch (shCount)
+    {
+    case 0:
+      return;
+      break;
+    case 1:
+      emitCLRC;
+      emitpcode (POC_RLF, pcop);
+      return;
+      break;
+    case 2:
+      emitpcode (POC_RLF, pcop);
+      emitpcode (POC_RLF, pcop);
+      break;
+    case 3:
+      emitpcode (POC_RLF, pcop);
+      emitpcode (POC_RLF, pcop);
+      emitpcode (POC_RLF, pcop);
+      break;
+    case 4:
+      emitpcode (POC_SWAPF, pcop);
+      break;
+    case 5:
+      emitpcode (POC_SWAPF, pcop);
+      emitpcode (POC_RLF, pcop);
+      break;
+    case 6:
+      emitpcode (POC_SWAPF, pcop);
+      emitpcode (POC_RLF, pcop);
+      emitpcode (POC_RLF, pcop);
+      break;
+    case 7:
+      emitpcode (POC_RRFW, pcop);
+      emitpcode (POC_RRF, pcop);
+      break;
     }
-    /* clear invalid bits */
-    emitpcode(POC_MOVLW, popGetLit ((unsigned char)(~((1UL << shCount) - 1))));
-    emitpcode(POC_ANDWF, pcop);
+  /* clear invalid bits */
+  emitpcode (POC_MOVLW, popGetLit ((unsigned char) (~((1UL << shCount) - 1))));
+  emitpcode (POC_ANDWF, pcop);
 }
 
 /*-----------------------------------------------------------------*/
@@ -4683,102 +5030,117 @@
 /*            1: mask out invalid bits (zero-extend)               */
 /*            2: sign-extend result (pretty slow)                  */
 /*-----------------------------------------------------------------*/
-static void AccRsh (pCodeOp *pcop,int shCount, int mask_mode)
+static void
+AccRsh (pCodeOp * pcop, int shCount, int mask_mode)
 {
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    shCount &= 0x0007;              // shCount : 0..7
-    switch(shCount){
-    case 0 :
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  shCount &= 0x0007;            // shCount : 0..7
+  switch (shCount)
+    {
+    case 0:
+      return;
+      break;
+    case 1:
+      /* load sign if needed */
+      if (mask_mode == 2)
+        emitpcode (POC_RLFW, pcop);
+      else if (mask_mode == 1)
+        emitCLRC;
+      emitpcode (POC_RRF, pcop);
+      return;
+      break;
+    case 2:
+      /* load sign if needed */
+      if (mask_mode == 2)
+        emitpcode (POC_RLFW, pcop);
+      emitpcode (POC_RRF, pcop);
+      /* load sign if needed */
+      if (mask_mode == 2)
+        emitpcode (POC_RLFW, pcop);
+      emitpcode (POC_RRF, pcop);
+      if (mask_mode == 2)
         return;
-        break;
-    case 1 :
-        /* load sign if needed */
-        if (mask_mode == 2) emitpcode(POC_RLFW,pcop);
-        else if (mask_mode == 1) emitCLRC;
-        emitpcode(POC_RRF,pcop);
+      break;
+    case 3:
+      /* load sign if needed */
+      if (mask_mode == 2)
+        emitpcode (POC_RLFW, pcop);
+      emitpcode (POC_RRF, pcop);
+      /* load sign if needed */
+      if (mask_mode == 2)
+        emitpcode (POC_RLFW, pcop);
+      emitpcode (POC_RRF, pcop);
+      /* load sign if needed */
+      if (mask_mode == 2)
+        emitpcode (POC_RLFW, pcop);
+      emitpcode (POC_RRF, pcop);
+      if (mask_mode == 2)
         return;
-        break;
-    case 2 :
-        /* load sign if needed */
-        if (mask_mode == 2) emitpcode(POC_RLFW,pcop);
-        emitpcode(POC_RRF,pcop);
-        /* load sign if needed */
-        if (mask_mode == 2) emitpcode(POC_RLFW,pcop);
-        emitpcode(POC_RRF,pcop);
-        if (mask_mode == 2) return;
-        break;
-    case 3 :
-        /* load sign if needed */
-        if (mask_mode == 2) emitpcode(POC_RLFW,pcop);
-        emitpcode(POC_RRF,pcop);
-        /* load sign if needed */
-        if (mask_mode == 2) emitpcode(POC_RLFW,pcop);
-        emitpcode(POC_RRF,pcop);
-        /* load sign if needed */
-        if (mask_mode == 2) emitpcode(POC_RLFW,pcop);
-        emitpcode(POC_RRF,pcop);
-        if (mask_mode == 2) return;
-        break;
-    case 4 :
-        emitpcode(POC_SWAPF,pcop);
-        break;
-    case 5 :
-        emitpcode(POC_SWAPF,pcop);
-        emitpcode(POC_RRF,pcop);
-        break;
-    case 6 :
-        emitpcode(POC_SWAPF,pcop);
-        emitpcode(POC_RRF,pcop);
-        emitpcode(POC_RRF,pcop);
-        break;
-    case 7 :
-        if (mask_mode == 2)
+      break;
+    case 4:
+      emitpcode (POC_SWAPF, pcop);
+      break;
+    case 5:
+      emitpcode (POC_SWAPF, pcop);
+      emitpcode (POC_RRF, pcop);
+      break;
+    case 6:
+      emitpcode (POC_SWAPF, pcop);
+      emitpcode (POC_RRF, pcop);
+      emitpcode (POC_RRF, pcop);
+      break;
+    case 7:
+      if (mask_mode == 2)
         {
-            /* load sign */
-            emitpcode(POC_RLFW,pcop);
-            emitpcode(POC_CLRF,pcop);
-            emitSKPNC;
-            emitpcode(POC_COMF,pcop);
-            return;
-        } else {
-            emitpcode(POC_RLFW,pcop);
-            emitpcode(POC_RLF,pcop);
+          /* load sign */
+          emitpcode (POC_RLFW, pcop);
+          emitpcode (POC_CLRF, pcop);
+          emitSKPNC;
+          emitpcode (POC_COMF, pcop);
+          return;
         }
-        break;
+      else
+        {
+          emitpcode (POC_RLFW, pcop);
+          emitpcode (POC_RLF, pcop);
+        }
+      break;
     }
 
-    if (mask_mode == 0)
+  if (mask_mode == 0)
     {
-        /* leave invalid bits undefined */
-        return;
+      /* leave invalid bits undefined */
+      return;
     }
 
-    /* clear invalid bits -- zero-extend */
-    emitpcode(POC_MOVLW, popGetLit (0x00ff >> shCount));
-    emitpcode(POC_ANDWF, pcop);
+  /* clear invalid bits -- zero-extend */
+  emitpcode (POC_MOVLW, popGetLit (0x00ff >> shCount));
+  emitpcode (POC_ANDWF, pcop);
 
-    if (mask_mode == 2) {
+  if (mask_mode == 2)
+    {
       /* sign-extend */
-      emitpcode(POC_MOVLW, popGetLit (0x00ff << (8 - shCount)));
-      emitpcode(POC_BTFSC, newpCodeOpBit (get_op(pcop,NULL,0), 7 - shCount ,0));
-      emitpcode(POC_IORWF, pcop);
+      emitpcode (POC_MOVLW, popGetLit (0x00ff << (8 - shCount)));
+      emitpcode (POC_BTFSC, newpCodeOpBit (get_op (pcop, NULL, 0), 7 - shCount, 0));
+      emitpcode (POC_IORWF, pcop);
     }
 }
 
 /*-----------------------------------------------------------------*/
 /* movLeft2Result - move byte from left to result                  */
 /*-----------------------------------------------------------------*/
-static void movLeft2Result (operand *left, int offl,
-                            operand *result, int offr)
+static void
+movLeft2Result (operand * left, int offl, operand * result, int offr)
 {
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    if(!pic14_sameRegs(AOP(left),AOP(result)) || (offl != offr)){
-        aopGet(AOP(left),offl,FALSE,FALSE);
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  if (!pic14_sameRegs (AOP (left), AOP (result)) || (offl != offr))
+    {
+      aopGet (AOP (left), offl, FALSE, FALSE);
 
-        emitpcode(POC_MOVFW, popGet(AOP(left),offl));
-        emitpcode(POC_MOVWF, popGet(AOP(result),offr));
+      emitpcode (POC_MOVFW, popGet (AOP (left), offl));
+      emitpcode (POC_MOVWF, popGet (AOP (result), offr));
     }
 }
 
@@ -4786,187 +5148,214 @@
 /* shiftLeft_Left2ResultLit - shift left by known count            */
 /*-----------------------------------------------------------------*/
 
-static void shiftLeft_Left2ResultLit (operand *left, operand *result, int shCount)
+static void
+shiftLeft_Left2ResultLit (operand * left, operand * result, int shCount)
 {
-    int size, same, offr, i;
+  int size, same, offr, i;
 
-    size = AOP_SIZE(left);
-    if (AOP_SIZE(result) < size) size = AOP_SIZE(result);
+  size = AOP_SIZE (left);
+  if (AOP_SIZE (result) < size)
+    size = AOP_SIZE (result);
 
-    same = pic14_sameRegs (AOP(left), AOP(result));
+  same = pic14_sameRegs (AOP (left), AOP (result));
 
-    offr = shCount / 8;
-    shCount = shCount & 0x07;
+  offr = shCount / 8;
+  shCount = shCount & 0x07;
 
-    size -= offr;
+  size -= offr;
 
-    switch (shCount)
+  switch (shCount)
     {
-    case 0: /* takes 0 or 2N cycles (for offr==0) */
-        if (!same || offr) {
-            for (i=size-1; i >= 0; i--)
-                movLeft2Result (left, i, result, offr + i);
-        } // if
-        break;
+    case 0:                    /* takes 0 or 2N cycles (for offr==0) */
+      if (!same || offr)
+        {
+          for (i = size - 1; i >= 0; i--)
+            movLeft2Result (left, i, result, offr + i);
+        }                       // if
+      break;
 
-    case 1: /* takes 1N+1 or 2N+1 cycles (or offr==0) */
-        if (same && offr) {
-            shiftLeft_Left2ResultLit (left, result, 8 * offr);
-            shiftLeft_Left2ResultLit (result, result, shCount);
-            return; /* prevent clearing result again */
-        } else {
-            emitCLRC;
-            for (i=0; i < size; i++) {
-                if (same && !offr) {
-                    emitpcode (POC_RLF, popGet (AOP(left), i));
-                } else {
-                    emitpcode (POC_RLFW, popGet (AOP(left), i));
-                    emitpcode (POC_MOVWF, popGet (AOP(result), i + offr));
-                } // if
-            } // for
-        } // if (offr)
-        break;
+    case 1:                    /* takes 1N+1 or 2N+1 cycles (or offr==0) */
+      if (same && offr)
+        {
+          shiftLeft_Left2ResultLit (left, result, 8 * offr);
+          shiftLeft_Left2ResultLit (result, result, shCount);
+          return;               /* prevent clearing result again */
+        }
+      else
+        {
+          emitCLRC;
+          for (i = 0; i < size; i++)
+            {
+              if (same && !offr)
+                {
+                  emitpcode (POC_RLF, popGet (AOP (left), i));
+                }
+              else
+                {
+                  emitpcode (POC_RLFW, popGet (AOP (left), i));
+                  emitpcode (POC_MOVWF, popGet (AOP (result), i + offr));
+                }               // if
+            }                   // for
+        }                       // if (offr)
+      break;
 
-    case 4: /* takes 3+5(N-1) = 5N-2 cycles (for offr==0) */
-        /* works in-place/with offr as well */
-        emitpcode (POC_SWAPFW, popGet (AOP(left), size-1));
-        emitpcode (POC_ANDLW, popGetLit (0xF0));
-        emitpcode (POC_MOVWF, popGet(AOP(result), size-1+offr));
-
-        for (i = size - 2; i >= 0; i--)
-        {
-            emitpcode (POC_SWAPFW, popGet (AOP(left), i));
-            emitpcode (POC_MOVWF, popGet (AOP(result), i + offr));
-            emitpcode (POC_ANDLW, popGetLit (0x0F));
-            emitpcode (POC_IORWF, popGet (AOP(result), i + offr + 1));
-            emitpcode (POC_XORWF, popGet (AOP(result), i + offr));
-        } // for i
-        break;
+    case 4:                    /* takes 3+5(N-1) = 5N-2 cycles (for offr==0) */
+      /* works in-place/with offr as well */
+      emitpcode (POC_SWAPFW, popGet (AOP (left), size - 1));
+      emitpcode (POC_ANDLW, popGetLit (0xF0));
+      emitpcode (POC_MOVWF, popGet (AOP (result), size - 1 + offr));
 
-    case 7: /* takes 2(N-1)+3 = 2N+1 cycles */
-        /* works in-place/with offr as well */
-        emitpcode (POC_RRFW, popGet (AOP(left), size-1));
-        for (i = size-2; i >= 0; i--) {
-            emitpcode (POC_RRFW, popGet (AOP(left), i));
-            emitpcode (POC_MOVWF, popGet (AOP(result), offr + i + 1));
-        } // for i
-        emitpcode (POC_CLRF, popGet (AOP(result), offr));
-        emitpcode (POC_RRF, popGet (AOP(result), offr));
-        break;
+      for (i = size - 2; i >= 0; i--)
+        {
+          emitpcode (POC_SWAPFW, popGet (AOP (left), i));
+          emitpcode (POC_MOVWF, popGet (AOP (result), i + offr));
+          emitpcode (POC_ANDLW, popGetLit (0x0F));
+          emitpcode (POC_IORWF, popGet (AOP (result), i + offr + 1));
+          emitpcode (POC_XORWF, popGet (AOP (result), i + offr));
+        }                       // for i
+      break;
+
+    case 7:                    /* takes 2(N-1)+3 = 2N+1 cycles */
+      /* works in-place/with offr as well */
+      emitpcode (POC_RRFW, popGet (AOP (left), size - 1));
+      for (i = size - 2; i >= 0; i--)
+        {
+          emitpcode (POC_RRFW, popGet (AOP (left), i));
+          emitpcode (POC_MOVWF, popGet (AOP (result), offr + i + 1));
+        }                       // for i
+      emitpcode (POC_CLRF, popGet (AOP (result), offr));
+      emitpcode (POC_RRF, popGet (AOP (result), offr));
+      break;
 
     default:
-        shiftLeft_Left2ResultLit (left, result, offr * 8 + shCount-1);
-        shiftLeft_Left2ResultLit (result, result, 1);
-        return; /* prevent clearing result again */
-        break;
-    } // switch
+      shiftLeft_Left2ResultLit (left, result, offr * 8 + shCount - 1);
+      shiftLeft_Left2ResultLit (result, result, 1);
+      return;                   /* prevent clearing result again */
+      break;
+    }                           // switch
 
-    while (0 < offr--)
+  while (0 < offr--)
     {
-        emitpcode (POC_CLRF, popGet (AOP(result), offr));
-    } // while
+      emitpcode (POC_CLRF, popGet (AOP (result), offr));
+    }                           // while
 }
 
 /*-----------------------------------------------------------------*/
 /* shiftRight_Left2ResultLit - shift right by known count          */
 /*-----------------------------------------------------------------*/
 
-static void shiftRight_Left2ResultLit (operand *left, operand *result, int shCount, int sign)
+static void
+shiftRight_Left2ResultLit (operand * left, operand * result, int shCount, int sign)
 {
-    int size, same, offr, i;
+  int size, same, offr, i;
 
-    size = AOP_SIZE(left);
-    if (AOP_SIZE(result) < size) size = AOP_SIZE(result);
+  size = AOP_SIZE (left);
+  if (AOP_SIZE (result) < size)
+    size = AOP_SIZE (result);
 
-    same = pic14_sameRegs (AOP(left), AOP(result));
+  same = pic14_sameRegs (AOP (left), AOP (result));
 
-    offr = shCount / 8;
-    shCount = shCount & 0x07;
+  offr = shCount / 8;
+  shCount = shCount & 0x07;
 
-    size -= offr;
+  size -= offr;
 
-    if (size)
+  if (size)
     {
-        switch (shCount)
+      switch (shCount)
         {
-        case 0: /* takes 0 or 2N cycles (for offr==0) */
-            if (!same || offr) {
-                for (i=0; i < size; i++)
-                    movLeft2Result (left, i + offr, result, i);
-            } // if
-            break;
+        case 0:                /* takes 0 or 2N cycles (for offr==0) */
+          if (!same || offr)
+            {
+              for (i = 0; i < size; i++)
+                movLeft2Result (left, i + offr, result, i);
+            }                   // if
+          break;
 
-        case 1: /* takes 1N+1(3) or 2N+1(3) cycles (or offr==0) */
-            emitpComment ("%s:%d: shCount=%d, size=%d, sign=%d, same=%d, offr=%d", __FUNCTION__, __LINE__, shCount, size, sign, same, offr);
-            if (same && offr) {
-                shiftRight_Left2ResultLit (left, result, 8 * offr, sign);
-                shiftRight_Left2ResultLit (result, result, shCount, sign);
-                return; /* prevent sign-extending result again */
-            } else {
-                emitCLRC;
-                if (sign) {
-                    emitpcode (POC_BTFSC, newpCodeOpBit (aopGet (AOP(left), AOP_SIZE(left)-1, FALSE, FALSE), 7, 0));
-                    emitSETC;
+        case 1:                /* takes 1N+1(3) or 2N+1(3) cycles (or offr==0) */
+          emitpComment ("%s:%d: shCount=%d, size=%d, sign=%d, same=%d, offr=%d", __FUNCTION__, __LINE__, shCount, size, sign,
+                        same, offr);
+          if (same && offr)
+            {
+              shiftRight_Left2ResultLit (left, result, 8 * offr, sign);
+              shiftRight_Left2ResultLit (result, result, shCount, sign);
+              return;           /* prevent sign-extending result again */
+            }
+          else
+            {
+              emitCLRC;
+              if (sign)
+                {
+                  emitpcode (POC_BTFSC, newpCodeOpBit (aopGet (AOP (left), AOP_SIZE (left) - 1, FALSE, FALSE), 7, 0));
+                  emitSETC;
                 }
-                for (i = size-1; i >= 0; i--) {
-                    if (same && !offr) {
-                        emitpcode (POC_RRF, popGet (AOP(left), i));
-                    } else {
-                        emitpcode (POC_RRFW, popGet (AOP(left), i + offr));
-                        emitpcode (POC_MOVWF, popGet (AOP(result), i));
+              for (i = size - 1; i >= 0; i--)
+                {
+                  if (same && !offr)
+                    {
+                      emitpcode (POC_RRF, popGet (AOP (left), i));
                     }
-                } // for i
-            } // if (offr)
-            break;
+                  else
+                    {
+                      emitpcode (POC_RRFW, popGet (AOP (left), i + offr));
+                      emitpcode (POC_MOVWF, popGet (AOP (result), i));
+                    }
+                }               // for i
+            }                   // if (offr)
+          break;
 
-        case 4: /* takes 3(6)+5(N-1) = 5N-2(+1) cycles (for offr==0) */
-            /* works in-place/with offr as well */
-            emitpcode (POC_SWAPFW, popGet (AOP(left), offr));
-            emitpcode (POC_ANDLW, popGetLit (0x0F));
-            emitpcode (POC_MOVWF, popGet(AOP(result), 0));
-
-            for (i = 1; i < size; i++)
-            {
-                emitpcode (POC_SWAPFW, popGet (AOP(left), i + offr));
-                emitpcode (POC_MOVWF, popGet (AOP(result), i));
-                emitpcode (POC_ANDLW, popGetLit (0xF0));
-                emitpcode (POC_IORWF, popGet (AOP(result), i - 1));
-                emitpcode (POC_XORWF, popGet (AOP(result), i));
-            } // for i
-
-            if (sign)
-            {
-                emitpcode (POC_MOVLW, popGetLit (0xF0));
-                emitpcode (POC_BTFSC, newpCodeOpBit (aopGet (AOP(result), size-1, FALSE, FALSE), 3, 0));
-                emitpcode (POC_IORWF, popGet (AOP(result), size-1));
-            } // if
-            break;
+        case 4:                /* takes 3(6)+5(N-1) = 5N-2(+1) cycles (for offr==0) */
+          /* works in-place/with offr as well */
+          emitpcode (POC_SWAPFW, popGet (AOP (left), offr));
+          emitpcode (POC_ANDLW, popGetLit (0x0F));
+          emitpcode (POC_MOVWF, popGet (AOP (result), 0));
+
+          for (i = 1; i < size; i++)
+            {
+              emitpcode (POC_SWAPFW, popGet (AOP (left), i + offr));
+              emitpcode (POC_MOVWF, popGet (AOP (result), i));
+              emitpcode (POC_ANDLW, popGetLit (0xF0));
+              emitpcode (POC_IORWF, popGet (AOP (result), i - 1));
+              emitpcode (POC_XORWF, popGet (AOP (result), i));
+            }                   // for i
 
-        case 7: /* takes 2(N-1)+3(4) = 2N+1(2) cycles */
-            /* works in-place/with offr as well */
-            emitpcode (POC_RLFW, popGet (AOP(left), offr));
-            for (i = 0; i < size-1; i++) {
-                emitpcode (POC_RLFW, popGet (AOP(left), offr + i + 1));
-                emitpcode (POC_MOVWF, popGet (AOP(result), i));
-            } // for i
-            emitpcode (POC_CLRF, popGet (AOP(result), size-1));
-            if (!sign) {
-                emitpcode (POC_RLF, popGet (AOP(result), size-1));
-            } else {
-                emitSKPNC;
-                emitpcode (POC_DECF, popGet (AOP(result), size-1));
+          if (sign)
+            {
+              emitpcode (POC_MOVLW, popGetLit (0xF0));
+              emitpcode (POC_BTFSC, newpCodeOpBit (aopGet (AOP (result), size - 1, FALSE, FALSE), 3, 0));
+              emitpcode (POC_IORWF, popGet (AOP (result), size - 1));
+            }                   // if
+          break;
+
+        case 7:                /* takes 2(N-1)+3(4) = 2N+1(2) cycles */
+          /* works in-place/with offr as well */
+          emitpcode (POC_RLFW, popGet (AOP (left), offr));
+          for (i = 0; i < size - 1; i++)
+            {
+              emitpcode (POC_RLFW, popGet (AOP (left), offr + i + 1));
+              emitpcode (POC_MOVWF, popGet (AOP (result), i));
+            }                   // for i
+          emitpcode (POC_CLRF, popGet (AOP (result), size - 1));
+          if (!sign)
+            {
+              emitpcode (POC_RLF, popGet (AOP (result), size - 1));
             }
-            break;
+          else
+            {
+              emitSKPNC;
+              emitpcode (POC_DECF, popGet (AOP (result), size - 1));
+            }
+          break;
 
         default:
-            shiftRight_Left2ResultLit (left, result, offr * 8 + shCount-1, sign);
-            shiftRight_Left2ResultLit (result, result, 1, sign);
-            return; /* prevent sign extending result again */
-            break;
-        } // switch
-    } // if
+          shiftRight_Left2ResultLit (left, result, offr * 8 + shCount - 1, sign);
+          shiftRight_Left2ResultLit (result, result, 1, sign);
+          return;               /* prevent sign extending result again */
+          break;
+        }                       // switch
+    }                           // if
 
-    addSign (result, size, sign);
+  addSign (result, size, sign);
 }
 
 /*-----------------------------------------------------------------*
@@ -4974,27 +5363,32 @@
 * if endian == 1, then the high byte (i.e base address + size of
 * register) is used first else the low byte is used first;
 *-----------------------------------------------------------------*/
-static void genMultiAsm( PIC_OPCODE poc, operand *reg, int size, int endian)
+static void
+genMultiAsm (PIC_OPCODE poc, operand * reg, int size, int endian)
 {
 
-    int offset = 0;
+  int offset = 0;
 
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-    if(!reg)
-        return;
+  if (!reg)
+    return;
 
-    if(!endian) {
-        endian = 1;
-    } else {
-        endian = -1;
-        offset = size-1;
+  if (!endian)
+    {
+      endian = 1;
+    }
+  else
+    {
+      endian = -1;
+      offset = size - 1;
     }
 
-    while(size--) {
-        emitpcode(poc,    popGet(AOP(reg),offset));
-        offset += endian;
+  while (size--)
+    {
+      emitpcode (poc, popGet (AOP (reg), offset));
+      offset += endian;
     }
 
 }
@@ -5003,194 +5397,207 @@
 /* loadSignToC - load the operand's sign bit into CARRY            */
 /*-----------------------------------------------------------------*/
 
-static void loadSignToC (operand *op)
+static void
+loadSignToC (operand * op)
 {
-    FENTRY;
-    assert (op && AOP(op) && AOP_SIZE(op));
+  FENTRY;
+  assert (op && AOP (op) && AOP_SIZE (op));
 
-    emitCLRC;
-    emitpcode(POC_BTFSC, newpCodeOpBit(aopGet(AOP(op),AOP_SIZE(op)-1,FALSE,FALSE),7,0));
-    emitSETC;
+  emitCLRC;
+  emitpcode (POC_BTFSC, newpCodeOpBit (aopGet (AOP (op), AOP_SIZE (op) - 1, FALSE, FALSE), 7, 0));
+  emitSETC;
 }
 
 /*-----------------------------------------------------------------*/
 /* genRightShift - generate code for right shifting                */
 /*-----------------------------------------------------------------*/
-static void genGenericShift (iCode *ic, int shiftRight)
+static void
+genGenericShift (iCode * ic, int shiftRight)
 {
-    operand *right, *left, *result;
-    sym_link *retype ;
-    int size;
-    symbol *tlbl, *tlbl1, *inverselbl;
-
-    FENTRY;
-    /* if signed then we do it the hard way preserve the
-    sign bit moving it inwards */
-    retype = getSpec(operandType(IC_RESULT(ic)));
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
-    /* signed & unsigned types are treated the same : i.e. the
-    signed is NOT propagated inwards : quoting from the
-    ANSI - standard : "for E1 >> E2, is equivalent to division
-    by 2**E2 if unsigned or if it has a non-negative value,
-    otherwise the result is implementation defined ", MY definition
-    is that the sign does not get propagated */
-
-    right = IC_RIGHT(ic);
-    left  = IC_LEFT(ic);
-    result = IC_RESULT(ic);
-
-    aopOp(right,ic,FALSE);
-    aopOp(left,ic,FALSE);
-    aopOp(result,ic,FALSE);
-
-    /* if the shift count is known then do it
-    as efficiently as possible */
-    if (AOP_TYPE(right) == AOP_LIT) {
-        int lit = (int) ulFromVal (AOP(right)->aopu.aop_lit);
-        if (lit < 0)
-        {
-            lit = -lit;
-            shiftRight = !shiftRight;
-        }
+  operand *right, *left, *result;
+  int size;
+  symbol *tlbl, *tlbl1, *inverselbl;
 
-        if (shiftRight)
-            shiftRight_Left2ResultLit (left, result, lit, !SPEC_USIGN(operandType(left)));
-        else
-            shiftLeft_Left2ResultLit (left, result, lit);
-        //genRightShiftLiteral (left,right,result,ic, 0);
-        return ;
-    }
-
-    /* shift count is unknown then we have to form
-    a loop get the loop count in B : Note: we take
-    only the lower order byte since shifting
-    more that 32 bits make no sense anyway, ( the
-    largest size of an object can be only 32 bits ) */
-
-    /* we must not overwrite the shift counter */
-    assert (!pic14_sameRegs(AOP(right),AOP(result)));
-
-    /* now move the left to the result if they are not the
-    same */
-    if (!pic14_sameRegs(AOP(left),AOP(result)))
-    {
-        size = min(AOP_SIZE(result), AOP_SIZE(left));
-        while (size--) {
-            mov2w(AOP(left), size);
-            movwf(AOP(result), size);
-        }
-        addSign (result, AOP_SIZE(left), !SPEC_USIGN(operandType(left)));
-    }
-
-    tlbl = newiTempLabel(NULL);
-    tlbl1= newiTempLabel(NULL);
-    inverselbl = NULL;
-    size = AOP_SIZE(result);
-
-    mov2w(AOP(right),0);
-    if (!SPEC_USIGN(operandType(right)))
-    {
-        inverselbl = newiTempLabel(NULL);
-        /* signed shift count -- invert shift direction for c<0 */
-        emitpcode(POC_BTFSC, newpCodeOpBit(aopGet(AOP(right),0,FALSE,FALSE),7,0));
-        emitpcode(POC_GOTO, popGetLabel(inverselbl->key));
-    } // if
-    emitpcode(POC_SUBLW, popGetLit(0)); /* -count in WREG, 0-x > 0 --> BORROW = !CARRY --> CARRY is clear! */
-    /* check for `a = b >> c' with `-c == 0' */
-    emitSKPNZ;
-    emitpcode(POC_GOTO, popGetLabel(tlbl1->key));
-    emitpLabel(tlbl->key);
-    /* propagate the sign bit inwards for SIGNED result */
-    if (shiftRight && !SPEC_USIGN(operandType(result))) loadSignToC(result);
-    genMultiAsm(shiftRight ? POC_RRF : POC_RLF, result, size, shiftRight);
-    emitpcode(POC_ADDLW,  popGetLit(1));    /* clears CARRY (unless W==0 afterwards) */
-    emitSKPC;
-    emitpcode(POC_GOTO,popGetLabel(tlbl->key));
+  FENTRY;
+  /* if signed then we do it the hard way preserve the
+     sign bit moving it inwards */
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-    if (!SPEC_USIGN(operandType(right)))
+  /* signed & unsigned types are treated the same : i.e. the
+     signed is NOT propagated inwards : quoting from the
+     ANSI - standard : "for E1 >> E2, is equivalent to division
+     by 2**E2 if unsigned or if it has a non-negative value,
+     otherwise the result is implementation defined ", MY definition
+     is that the sign does not get propagated */
+
+  right = IC_RIGHT (ic);
+  left = IC_LEFT (ic);
+  result = IC_RESULT (ic);
+
+  aopOp (right, ic, FALSE);
+  aopOp (left, ic, FALSE);
+  aopOp (result, ic, FALSE);
+
+  /* if the shift count is known then do it
+     as efficiently as possible */
+  if (AOP_TYPE (right) == AOP_LIT)
     {
-        symbol *inv_loop = newiTempLabel(NULL);
+      int lit = (int) ulFromVal (AOP (right)->aopu.aop_lit);
+      if (lit < 0)
+        {
+          lit = -lit;
+          shiftRight = !shiftRight;
+        }
 
-        shiftRight = !shiftRight;   /* invert shift direction */
+      if (shiftRight)
+        shiftRight_Left2ResultLit (left, result, lit, !SPEC_USIGN (operandType (left)));
+      else
+        shiftLeft_Left2ResultLit (left, result, lit);
+      //genRightShiftLiteral (left,right,result,ic, 0);
+      return;
+    }
 
-        /* we came here from the code above -- we are done */
-        emitpcode(POC_GOTO, popGetLabel(tlbl1->key));
+  /* shift count is unknown then we have to form
+     a loop get the loop count in B : Note: we take
+     only the lower order byte since shifting
+     more that 32 bits make no sense anyway, ( the
+     largest size of an object can be only 32 bits ) */
+
+  /* we must not overwrite the shift counter */
+  assert (!pic14_sameRegs (AOP (right), AOP (result)));
+
+  /* now move the left to the result if they are not the
+     same */
+  if (!pic14_sameRegs (AOP (left), AOP (result)))
+    {
+      size = min (AOP_SIZE (result), AOP_SIZE (left));
+      while (size--)
+        {
+          mov2w (AOP (left), size);
+          movwf (AOP (result), size);
+        }
+      addSign (result, AOP_SIZE (left), !SPEC_USIGN (operandType (left)));
+    }
 
-        /* emit code for shifting N<0 steps, count is already in W */
-        emitpLabel(inverselbl->key);
-        if (!shiftRight || SPEC_USIGN(operandType(result))) emitCLRC;
-        emitpLabel(inv_loop->key);
-        /* propagate the sign bit inwards for SIGNED result */
-        if (shiftRight && !SPEC_USIGN(operandType(result))) loadSignToC(result);
-        genMultiAsm(shiftRight ? POC_RRF : POC_RLF, result, size, shiftRight);
-        emitpcode(POC_ADDLW, popGetLit(1));
-        emitSKPC;
-        emitpcode(POC_GOTO, popGetLabel(inv_loop->key));
-    } // if
+  tlbl = newiTempLabel (NULL);
+  tlbl1 = newiTempLabel (NULL);
+  inverselbl = NULL;
+  size = AOP_SIZE (result);
+
+  mov2w (AOP (right), 0);
+  if (!SPEC_USIGN (operandType (right)))
+    {
+      inverselbl = newiTempLabel (NULL);
+      /* signed shift count -- invert shift direction for c<0 */
+      emitpcode (POC_BTFSC, newpCodeOpBit (aopGet (AOP (right), 0, FALSE, FALSE), 7, 0));
+      emitpcode (POC_GOTO, popGetLabel (inverselbl->key));
+    }                           // if
+  emitpcode (POC_SUBLW, popGetLit (0)); /* -count in WREG, 0-x > 0 --> BORROW = !CARRY --> CARRY is clear! */
+  /* check for `a = b >> c' with `-c == 0' */
+  emitSKPNZ;
+  emitpcode (POC_GOTO, popGetLabel (tlbl1->key));
+  emitpLabel (tlbl->key);
+  /* propagate the sign bit inwards for SIGNED result */
+  if (shiftRight && !SPEC_USIGN (operandType (result)))
+    loadSignToC (result);
+  genMultiAsm (shiftRight ? POC_RRF : POC_RLF, result, size, shiftRight);
+  emitpcode (POC_ADDLW, popGetLit (1)); /* clears CARRY (unless W==0 afterwards) */
+  emitSKPC;
+  emitpcode (POC_GOTO, popGetLabel (tlbl->key));
+
+  if (!SPEC_USIGN (operandType (right)))
+    {
+      symbol *inv_loop = newiTempLabel (NULL);
+
+      shiftRight = !shiftRight; /* invert shift direction */
+
+      /* we came here from the code above -- we are done */
+      emitpcode (POC_GOTO, popGetLabel (tlbl1->key));
+
+      /* emit code for shifting N<0 steps, count is already in W */
+      emitpLabel (inverselbl->key);
+      if (!shiftRight || SPEC_USIGN (operandType (result)))
+        emitCLRC;
+      emitpLabel (inv_loop->key);
+      /* propagate the sign bit inwards for SIGNED result */
+      if (shiftRight && !SPEC_USIGN (operandType (result)))
+        loadSignToC (result);
+      genMultiAsm (shiftRight ? POC_RRF : POC_RLF, result, size, shiftRight);
+      emitpcode (POC_ADDLW, popGetLit (1));
+      emitSKPC;
+      emitpcode (POC_GOTO, popGetLabel (inv_loop->key));
+    }                           // if
 
-    emitpLabel(tlbl1->key);
+  emitpLabel (tlbl1->key);
 
-    freeAsmop(left,NULL,ic,TRUE);
-    freeAsmop (right,NULL,ic,TRUE);
-    freeAsmop(result,NULL,ic,TRUE);
+  freeAsmop (left, NULL, ic, TRUE);
+  freeAsmop (right, NULL, ic, TRUE);
+  freeAsmop (result, NULL, ic, TRUE);
 }
 
-static void genRightShift (iCode *ic)
+static void
+genRightShift (iCode * ic)
 {
-    genGenericShift(ic, 1);
+  genGenericShift (ic, 1);
 }
 
-static void genLeftShift (iCode *ic)
+static void
+genLeftShift (iCode * ic)
 {
-    genGenericShift(ic, 0);
+  genGenericShift (ic, 0);
 }
 
 /*-----------------------------------------------------------------*/
 /* SetIrp - Set IRP bit                                            */
 /*-----------------------------------------------------------------*/
-static void SetIrp(operand *result)
+static void
+SetIrp (operand * result)
 {
-    FENTRY;
-    if (AOP_TYPE(result) == AOP_LIT) {
-        unsigned lit = (unsigned) double2ul (operandLitValue(result));
-        if (lit&0x100)
+  FENTRY;
+  if (AOP_TYPE (result) == AOP_LIT)
+    {
+      unsigned lit = (unsigned) double2ul (operandLitValue (result));
+      if (lit & 0x100)
+        emitSETIRP;
+      else
+        emitCLRIRP;
+    }
+  else
+    {
+      if ((AOP_TYPE (result) == AOP_PCODE) && (AOP (result)->aopu.pcop->type == PO_LITERAL))
+        {
+          int addrs = PCOL (AOP (result)->aopu.pcop)->lit;
+          if (addrs & 0x100)
             emitSETIRP;
-        else
+          else
             emitCLRIRP;
-    } else {
-        if ((AOP_TYPE(result) == AOP_PCODE)
-            && (AOP(result)->aopu.pcop->type == PO_LITERAL))
-        {
-            int addrs = PCOL(AOP(result)->aopu.pcop)->lit;
-            if (addrs & 0x100)
-                emitSETIRP;
-            else
-                emitCLRIRP;
-        } else {
-            emitCLRIRP; /* always ensure this is clear as it may have previouly been set */
-            if(AOP_SIZE(result) > 1) {
-                emitpcode(POC_BTFSC,newpCodeOpBit(aopGet(AOP(result),1,FALSE,FALSE),0,0));
-                emitSETIRP;
+        }
+      else
+        {
+          emitCLRIRP;           /* always ensure this is clear as it may have previouly been set */
+          if (AOP_SIZE (result) > 1)
+            {
+              emitpcode (POC_BTFSC, newpCodeOpBit (aopGet (AOP (result), 1, FALSE, FALSE), 0, 0));
+              emitSETIRP;
             }
         }
     }
 }
 
 static void
-setup_fsr (operand *ptr)
+setup_fsr (operand * ptr)
 {
-  if (pic14_getPIC()->isEnhancedCore)
+  if (pic14_getPIC ()->isEnhancedCore)
     {
-      mov2w_op(ptr, 0);
-      emitpcode(POC_MOVWF, popCopyReg (&pc_fsr0l));
-      mov2w_op(ptr, 1);
-      emitpcode(POC_MOVWF, popCopyReg (&pc_fsr0h));
+      mov2w_op (ptr, 0);
+      emitpcode (POC_MOVWF, popCopyReg (&pc_fsr0l));
+      mov2w_op (ptr, 1);
+      emitpcode (POC_MOVWF, popCopyReg (&pc_fsr0h));
     }
   else
     {
-      mov2w_op(ptr, 0);
-      emitpcode(POC_MOVWF, popCopyReg (&pc_fsr));
+      mov2w_op (ptr, 0);
+      emitpcode (POC_MOVWF, popCopyReg (&pc_fsr));
 
       /* also setup-up IRP */
       SetIrp (ptr);
@@ -5200,44 +5607,45 @@
 static void
 inc_fsr (int delta)
 {
-  if (0 == delta) {
+  if (0 == delta)
+    {
       /* Nothing to do. */
       return;
-  } // if
+    }                           // if
 
-  if (pic14_getPIC()->isEnhancedCore)
+  if (pic14_getPIC ()->isEnhancedCore)
     {
-      assert(delta >= -32);
-      assert(delta < 32);
+      assert (delta >= -32);
+      assert (delta < 32);
       /* Hack: Turn this into a PCI (not that easy due to the argument structure). */
-      addpCode2pBlock(pb,newpCodeAsmDir("ADDFSR", "FSR0, %d", delta));
+      addpCode2pBlock (pb, newpCodeAsmDir ("ADDFSR", "FSR0, %d", delta));
     }
   else
     {
       switch (delta)
         {
-          case 1:
-                emitpcode(POC_INCF, popCopyReg(&pc_fsr));
-                break;
-          case -1:
-                emitpcode(POC_DECF, popCopyReg(&pc_fsr));
-                break;
-          case 0:
-                break;
-          default:
-              while (delta > 0)
-                {
-                  inc_fsr (1);
-                  --delta;
-                }
-              while (delta < 0)
-                {
-                  inc_fsr(-1);
-                  ++delta;
-                }
-              break;
-        } // switch
-    } // if
+        case 1:
+          emitpcode (POC_INCF, popCopyReg (&pc_fsr));
+          break;
+        case -1:
+          emitpcode (POC_DECF, popCopyReg (&pc_fsr));
+          break;
+        case 0:
+          break;
+        default:
+          while (delta > 0)
+            {
+              inc_fsr (1);
+              --delta;
+            }
+          while (delta < 0)
+            {
+              inc_fsr (-1);
+              ++delta;
+            }
+          break;
+        }                       // switch
+    }                           // if
 }
 
 /*-----------------------------------------------------------------*/
@@ -5245,39 +5653,40 @@
 /*                  arbitrary pointer (__code, __data, generic)    */
 /*-----------------------------------------------------------------*/
 static void
-emitPtrByteGet (operand *src, int p_type, bool alreadyAddressed)
+emitPtrByteGet (operand * src, int p_type, bool alreadyAddressed)
 {
-    FENTRY;
-    switch (p_type)
+  FENTRY;
+  switch (p_type)
     {
     case POINTER:
     case FPOINTER:
-      if (!alreadyAddressed) setup_fsr (src);
-      emitpcode(POC_MOVFW, popCopyReg (pc_indf));
+      if (!alreadyAddressed)
+        setup_fsr (src);
+      emitpcode (POC_MOVFW, popCopyReg (pc_indf));
       break;
 
     case CPOINTER:
-      assert( AOP_SIZE(src) == 2 );
-      mov2w_op(src, 0);
-      emitpcode(POC_MOVWF, popRegFromIdx (Gstack_base_addr-1));
-      mov2w_op(src, 1);
-      emitpcode(POC_MOVWF, popRegFromIdx (Gstack_base_addr));
-      emitpcode(POC_MOVLW, popGetLit (GPTRTAG_CODE));   /* GPOINTER tag for __code space */
+      assert (AOP_SIZE (src) == 2);
+      mov2w_op (src, 0);
+      emitpcode (POC_MOVWF, popRegFromIdx (Gstack_base_addr - 1));
+      mov2w_op (src, 1);
+      emitpcode (POC_MOVWF, popRegFromIdx (Gstack_base_addr));
+      emitpcode (POC_MOVLW, popGetLit (GPTRTAG_CODE));  /* GPOINTER tag for __code space */
       call_libraryfunc ("__gptrget1");
       break;
 
     case GPOINTER:
-      assert( AOP_SIZE(src) == 3 );
-      mov2w_op(src, 0);
-      emitpcode(POC_MOVWF, popRegFromIdx (Gstack_base_addr-1));
-      mov2w_op(src, 1);
-      emitpcode(POC_MOVWF, popRegFromIdx (Gstack_base_addr));
-      mov2w_op(src, 2);
+      assert (AOP_SIZE (src) == 3);
+      mov2w_op (src, 0);
+      emitpcode (POC_MOVWF, popRegFromIdx (Gstack_base_addr - 1));
+      mov2w_op (src, 1);
+      emitpcode (POC_MOVWF, popRegFromIdx (Gstack_base_addr));
+      mov2w_op (src, 2);
       call_libraryfunc ("__gptrget1");
       break;
 
     default:
-      assert( !"unhandled pointer type" );
+      assert (!"unhandled pointer type");
       break;
     }
 }
@@ -5287,33 +5696,34 @@
 /* pointer register INDF (legacy 8051 uses R0, R1, or DPTR).       */
 /*-----------------------------------------------------------------*/
 static void
-emitPtrByteSet (operand *dst, int p_type, bool alreadyAddressed)
+emitPtrByteSet (operand * dst, int p_type, bool alreadyAddressed)
 {
-    FENTRY;
-    switch (p_type)
+  FENTRY;
+  switch (p_type)
     {
     case POINTER:
     case FPOINTER:
-      if (!alreadyAddressed) setup_fsr (dst);
-      emitpcode(POC_MOVWF, popCopyReg (pc_indf));
+      if (!alreadyAddressed)
+        setup_fsr (dst);
+      emitpcode (POC_MOVWF, popCopyReg (pc_indf));
       break;
 
     case CPOINTER:
-      assert( !"trying to assign to __code pointer" );
+      assert (!"trying to assign to __code pointer");
       break;
 
     case GPOINTER:
-      emitpcode(POC_MOVWF, popRegFromIdx (Gstack_base_addr-2));
-      mov2w_op(dst, 0);
-      emitpcode(POC_MOVWF, popRegFromIdx (Gstack_base_addr-1));
-      mov2w_op(dst, 1);
-      emitpcode(POC_MOVWF, popRegFromIdx (Gstack_base_addr));
-      mov2w_op(dst, 2);
+      emitpcode (POC_MOVWF, popRegFromIdx (Gstack_base_addr - 2));
+      mov2w_op (dst, 0);
+      emitpcode (POC_MOVWF, popRegFromIdx (Gstack_base_addr - 1));
+      mov2w_op (dst, 1);
+      emitpcode (POC_MOVWF, popRegFromIdx (Gstack_base_addr));
+      mov2w_op (dst, 2);
       call_libraryfunc ("__gptrput1");
       break;
 
     default:
-      assert( !"unhandled pointer type" );
+      assert (!"unhandled pointer type");
       break;
     }
 }
@@ -5322,17 +5732,15 @@
 /* genUnpackBits - generates code for unpacking bits               */
 /*-----------------------------------------------------------------*/
 static void
-genUnpackBits (operand *result, operand *left, int ptype, iCode *ifx)
+genUnpackBits (operand * result, operand * left, int ptype, iCode * ifx)
 {
-  int rsize;            /* result size */
-  sym_link *etype;      /* bitfield type information */
-  int blen;             /* bitfield length */
-  int bstr;             /* bitfield starting bit within byte */
+  sym_link *etype;              /* bitfield type information */
+  int blen;                     /* bitfield length */
+  int bstr;                     /* bitfield starting bit within byte */
 
   FENTRY;
   DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
   etype = getSpec (operandType (result));
-  rsize = getSize (operandType (result));
   blen = SPEC_BLEN (etype);
   bstr = SPEC_BSTR (etype);
 
@@ -5346,7 +5754,7 @@
           resolvedIfx rIfx;
 
           resolveIfx (&rIfx, ifx);
-          if (ptype == -1) /* direct */
+          if (ptype == -1)      /* direct */
             pcop = newpCodeOpBit (aopGet (AOP (left), 0, FALSE, FALSE), bstr, 0);
           else
             {
@@ -5367,24 +5775,24 @@
 
           switch (ptype)
             {
-              case -1:
-                  emitpcode (POC_BTFSC, newpCodeOpBit (aopGet (AOP (left), 0, FALSE, FALSE), bstr, 0));
-                  /* adjust result below */
-                  break;
+            case -1:
+              emitpcode (POC_BTFSC, newpCodeOpBit (aopGet (AOP (left), 0, FALSE, FALSE), bstr, 0));
+              /* adjust result below */
+              break;
 
-              case POINTER:
-              case FPOINTER:
-              case GPOINTER:
-              case CPOINTER:
-                  emitPtrByteGet (left, ptype, FALSE);
-                  emitpcode (POC_ANDLW, popGetLit (1UL << bstr));
-                  emitSKPZ;
-                  /* adjust result below */
-                  break;
+            case POINTER:
+            case FPOINTER:
+            case GPOINTER:
+            case CPOINTER:
+              emitPtrByteGet (left, ptype, FALSE);
+              emitpcode (POC_ANDLW, popGetLit (1UL << bstr));
+              emitSKPZ;
+              /* adjust result below */
+              break;
 
-              default:
-                  assert (!"unhandled pointer type" );
-            } // switch
+            default:
+              assert (!"unhandled pointer type");
+            }                   // switch
 
           /* move sign-/zero extended bit to result */
           if (SPEC_USIGN (OP_SYM_ETYPE (left)))
@@ -5392,9 +5800,9 @@
           else
             emitpcode (POC_DECF, popGet (AOP (result), 0));
           addSign (result, 1, !SPEC_USIGN (OP_SYM_ETYPE (left)));
-      }
+        }
       return;
-  }
+    }
   else if (blen <= 8 && ((blen + bstr) <= 8))
     {
       /* blen > 1 */
@@ -5405,25 +5813,25 @@
 
       switch (ptype)
         {
-          case -1:
-              mov2w (AOP (left), 0);
-              break;
+        case -1:
+          mov2w (AOP (left), 0);
+          break;
 
-          case POINTER:
-          case FPOINTER:
-          case GPOINTER:
-          case CPOINTER:
-              emitPtrByteGet (left, ptype, FALSE);
-              break;
+        case POINTER:
+        case FPOINTER:
+        case GPOINTER:
+        case CPOINTER:
+          emitPtrByteGet (left, ptype, FALSE);
+          break;
 
-          default:
-              assert (!"unhandled pointer type" );
-        } // switch
+        default:
+          assert (!"unhandled pointer type");
+        }                       // switch
 
       if (blen < 8)
-        emitpcode (POC_ANDLW, popGetLit ((((1UL << blen)-1) << bstr) & 0x00ff));
+        emitpcode (POC_ANDLW, popGetLit ((((1UL << blen) - 1) << bstr) & 0x00ff));
       movwf (AOP (result), 0);
-      AccRsh (popGet (AOP (result), 0), bstr, 1); /* zero extend the bitfield */
+      AccRsh (popGet (AOP (result), 0), bstr, 1);       /* zero extend the bitfield */
 
       if (!SPEC_USIGN (OP_SYM_ETYPE (left)) && (bstr + blen != 8))
         {
@@ -5437,350 +5845,355 @@
       return;
     }
 
-  assert (!"bitfields larger than 8 bits or crossing byte boundaries are not yet supported" );
+  assert (!"bitfields larger than 8 bits or crossing byte boundaries are not yet supported");
 }
 
 #if 1
 /*-----------------------------------------------------------------*/
 /* genDataPointerGet - generates code when ptr offset is known     */
 /*-----------------------------------------------------------------*/
-static void genDataPointerGet (operand *left,
-    operand *result,
-    iCode *ic)
+static void
+genDataPointerGet (operand * left, operand * result, iCode * ic)
 {
-    int size , offset = 0;
+  unsigned int size;
+  int offset = 0;
 
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
 
-    /* optimization - most of the time, left and result are the same
-    * address, but different types. for the pic code, we could omit
-    * the following
-    */
-    aopOp(result,ic,TRUE);
+  /* optimization - most of the time, left and result are the same
+   * address, but different types. for the pic code, we could omit
+   * the following
+   */
+  aopOp (result, ic, TRUE);
 
-    if (pic14_sameRegs (AOP(left), AOP(result)))
-        return;
+  if (pic14_sameRegs (AOP (left), AOP (result)))
+    return;
 
-    DEBUGpic14_AopType(__LINE__,left,NULL,result);
+  DEBUGpic14_AopType (__LINE__, left, NULL, result);
 
-    //emitpcode(POC_MOVFW, popGet(AOP(left),0));
+  //emitpcode(POC_MOVFW, popGet(AOP(left),0));
 
-    size = AOP_SIZE(result);
-    if (size > getSize(OP_SYM_ETYPE(left))) size = getSize(OP_SYM_ETYPE(left));
+  size = AOP_SIZE (result);
+  if (size > getSize (OP_SYM_ETYPE (left)))
+    size = getSize (OP_SYM_ETYPE (left));
 
-    offset = 0;
-    while (size--) {
-        emitpcode(POC_MOVFW, popGet(AOP(left),offset));
-        emitpcode(POC_MOVWF, popGet(AOP(result),offset));
-        offset++;
+  offset = 0;
+  while (size--)
+    {
+      emitpcode (POC_MOVFW, popGet (AOP (left), offset));
+      emitpcode (POC_MOVWF, popGet (AOP (result), offset));
+      offset++;
     }
 
-    freeAsmop(left,NULL,ic,TRUE);
-    freeAsmop(result,NULL,ic,TRUE);
+  freeAsmop (left, NULL, ic, TRUE);
+  freeAsmop (result, NULL, ic, TRUE);
 }
 #endif
 
 /*-----------------------------------------------------------------*/
 /* genNearPointerGet - pic14_emitcode for near pointer fetch       */
 /*-----------------------------------------------------------------*/
-static void genNearPointerGet (operand *left,
-                               operand *result,
-                               iCode *ic)
+static void
+genNearPointerGet (operand * left, operand * result, iCode * ic)
 {
-    asmop *aop = NULL;
-    sym_link *ltype = operandType(left);
-    sym_link *rtype = operandType(result);
-    sym_link *retype= getSpec(rtype);      /* bitfield type information */
-    int direct = 0;
+  asmop *aop = NULL;
+  sym_link *ltype = operandType (left);
+  sym_link *rtype = operandType (result);
+  sym_link *retype = getSpec (rtype);   /* bitfield type information */
+  int direct = 0;
 
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
 
-    aopOp(left,ic,FALSE);
+  aopOp (left, ic, FALSE);
 
-    /* if left is rematerialisable and
-    result is not bit variable type and
-    the left is pointer to data space i.e
-    lower 128 bytes of space */
-    if (AOP_TYPE(left) == AOP_PCODE &&  //AOP_TYPE(left) == AOP_IMMD &&
-        !IS_BITVAR(retype)         &&
-        PIC_IS_DATA_PTR(ltype)) {
-        genDataPointerGet (left,result,ic);
-        return ;
+  /* if left is rematerialisable and
+     result is not bit variable type and
+     the left is pointer to data space i.e
+     lower 128 bytes of space */
+  if (AOP_TYPE (left) == AOP_PCODE &&   //AOP_TYPE(left) == AOP_IMMD &&
+      !IS_BITVAR (retype) && PIC_IS_DATA_PTR (ltype))
+    {
+      genDataPointerGet (left, result, ic);
+      return;
     }
 
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    aopOp (result,ic,FALSE);
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  aopOp (result, ic, FALSE);
 
-    /* Check if can access directly instead of via a pointer */
-    if ((AOP_TYPE(left) == AOP_PCODE)
-        && (AOP(left)->aopu.pcop->type == PO_IMMEDIATE)
-        && (AOP_SIZE(result) == 1))
+  /* Check if can access directly instead of via a pointer */
+  if ((AOP_TYPE (left) == AOP_PCODE) && (AOP (left)->aopu.pcop->type == PO_IMMEDIATE) && (AOP_SIZE (result) == 1))
     {
-        direct = 1;
+      direct = 1;
     }
 
-    if (IS_BITFIELD(getSpec(operandType(result))))
+  if (IS_BITFIELD (getSpec (operandType (result))))
     {
-        genUnpackBits (result,left,direct?-1:POINTER,ifxForOp(IC_RESULT(ic),ic));
-        goto release;
+      genUnpackBits (result, left, direct ? -1 : POINTER, ifxForOp (IC_RESULT (ic), ic));
+      goto release;
     }
 
-    /* If the pointer value is not in a the FSR then need to put it in */
-    /* Must set/reset IRP bit for use with FSR. */
-    if (!direct)
-      setup_fsr (left);
+  /* If the pointer value is not in a the FSR then need to put it in */
+  /* Must set/reset IRP bit for use with FSR. */
+  if (!direct)
+    setup_fsr (left);
 
 //  sym_link *etype;
-    /* if bitfield then unpack the bits */
-    {
-        /* we have can just get the values */
-        int size = AOP_SIZE(result);
-        int offset = 0 ;
+  /* if bitfield then unpack the bits */
+  {
+    /* we have can just get the values */
+    int size = AOP_SIZE (result);
+    int offset = 0;
 
-        DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+    DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-        while(size--) {
-            if (direct)
-                emitpcode(POC_MOVWF,popGet(AOP(left),0));
-            else
-                emitpcode(POC_MOVFW,popCopyReg(pc_indf));
-            if (AOP_TYPE(result) == AOP_LIT) {
-                emitpcode(POC_MOVLW,popGet(AOP(result),offset));
-            } else {
-                emitpcode(POC_MOVWF,popGet(AOP(result),offset));
-            }
-            if (size && !direct)
-              {
-                inc_fsr(1);
-              }
-            offset++;
-        }
-    }
+    while (size--)
+      {
+        if (direct)
+          emitpcode (POC_MOVWF, popGet (AOP (left), 0));
+        else
+          emitpcode (POC_MOVFW, popCopyReg (pc_indf));
+        if (AOP_TYPE (result) == AOP_LIT)
+          {
+            emitpcode (POC_MOVLW, popGet (AOP (result), offset));
+          }
+        else
+          {
+            emitpcode (POC_MOVWF, popGet (AOP (result), offset));
+          }
+        if (size && !direct)
+          {
+            inc_fsr (1);
+          }
+        offset++;
+      }
+  }
 
-    /* now some housekeeping stuff */
-    if (aop) {
-        /* we had to allocate for this iCode */
-        DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-        freeAsmop(NULL,aop,ic,TRUE);
-    } else if (!direct) {
-        /* nothing to do */
-    } else {
-        /* we did not allocate which means left
-        already in a pointer register, then
-        if size > 0 && this could be used again
-        we have to point it back to where it
-        belongs */
-        DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-        if (AOP_SIZE(result) > 1 &&
-            !OP_SYMBOL(left)->remat &&
-            ( OP_SYMBOL(left)->liveTo > ic->seq ||
-            ic->depth )) {
-            int size = AOP_SIZE(result) - 1;
-            inc_fsr(-size);
+  /* now some housekeeping stuff */
+  if (aop)
+    {
+      /* we had to allocate for this iCode */
+      DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+      freeAsmop (NULL, aop, ic, TRUE);
+    }
+  else if (!direct)
+    {
+      /* nothing to do */
+    }
+  else
+    {
+      /* we did not allocate which means left
+         already in a pointer register, then
+         if size > 0 && this could be used again
+         we have to point it back to where it
+         belongs */
+      DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+      if (AOP_SIZE (result) > 1 && !OP_SYMBOL (left)->remat && (OP_SYMBOL (left)->liveTo > ic->seq || ic->depth))
+        {
+          int size = AOP_SIZE (result) - 1;
+          inc_fsr (-size);
         }
     }
 
 release:
-    /* done */
-    freeAsmop(left,NULL,ic,TRUE);
-    freeAsmop(result,NULL,ic,TRUE);
+  /* done */
+  freeAsmop (left, NULL, ic, TRUE);
+  freeAsmop (result, NULL, ic, TRUE);
 
 }
 
 /*-----------------------------------------------------------------*/
 /* genGenPointerGet - gget value from generic pointer space        */
 /*-----------------------------------------------------------------*/
-static void genGenPointerGet (operand *left,
-                              operand *result, iCode *ic)
+static void
+genGenPointerGet (operand * left, operand * result, iCode * ic)
 {
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    aopOp(left,ic,FALSE);
-    aopOp(result,ic,FALSE);
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  aopOp (left, ic, FALSE);
+  aopOp (result, ic, FALSE);
 
 
-    DEBUGpic14_AopType(__LINE__,left,NULL,result);
+  DEBUGpic14_AopType (__LINE__, left, NULL, result);
 
-    if (IS_BITFIELD(getSpec(operandType(result))))
+  if (IS_BITFIELD (getSpec (operandType (result))))
     {
-      genUnpackBits (result, left, GPOINTER, ifxForOp (IC_RESULT(ic), ic));
+      genUnpackBits (result, left, GPOINTER, ifxForOp (IC_RESULT (ic), ic));
       return;
     }
 
-    {
-      /* emit call to __gptrget */
-      char *func[] = {NULL, "__gptrget1", "__gptrget2", "__gptrget3", "__gptrget4"};
-      int size = AOP_SIZE(result);
-      int idx = 0;
-
-      assert (size > 0 && size <= 4);
-
-      /* pass arguments */
-      assert (AOP_SIZE(left) == 3);
-      mov2w(AOP(left), 0);
-      emitpcode(POC_MOVWF, popRegFromIdx (Gstack_base_addr-1));
-      mov2w(AOP(left), 1);
-      emitpcode(POC_MOVWF, popRegFromIdx (Gstack_base_addr));
-      mov2w(AOP(left), 2);
-      call_libraryfunc (func[size]);
-
-      /* save result */
-      movwf (AOP(result), --size);
-      while (size--) {
-        emitpcode (POC_MOVFW,popRegFromIdx (Gstack_base_addr - idx++));
-        movwf (AOP(result), size);
-      } // while
-    }
+  {
+    /* emit call to __gptrget */
+    char *func[] = { NULL, "__gptrget1", "__gptrget2", "__gptrget3", "__gptrget4" };
+    int size = AOP_SIZE (result);
+    int idx = 0;
+
+    assert (size > 0 && size <= 4);
+
+    /* pass arguments */
+    assert (AOP_SIZE (left) == 3);
+    mov2w (AOP (left), 0);
+    emitpcode (POC_MOVWF, popRegFromIdx (Gstack_base_addr - 1));
+    mov2w (AOP (left), 1);
+    emitpcode (POC_MOVWF, popRegFromIdx (Gstack_base_addr));
+    mov2w (AOP (left), 2);
+    call_libraryfunc (func[size]);
+
+    /* save result */
+    movwf (AOP (result), --size);
+    while (size--)
+      {
+        emitpcode (POC_MOVFW, popRegFromIdx (Gstack_base_addr - idx++));
+        movwf (AOP (result), size);
+      }                         // while
+  }
 
-    freeAsmop(left,NULL,ic,TRUE);
-    freeAsmop(result,NULL,ic,TRUE);
+  freeAsmop (left, NULL, ic, TRUE);
+  freeAsmop (result, NULL, ic, TRUE);
 
 }
 
 /*-----------------------------------------------------------------*/
 /* genConstPointerGet - get value from const generic pointer space */
 /*-----------------------------------------------------------------*/
-static void genConstPointerGet (operand *left,
-                                operand *result, iCode *ic)
+static void
+genConstPointerGet (operand * left, operand * result, iCode * ic)
 {
-    //sym_link *retype = getSpec(operandType(result));
-    #if 0
-    symbol *albl, *blbl;//, *clbl;
-    pCodeOp *pcop;
-    #endif
-    PIC_OPCODE poc;
-    int i, size, lit;
-
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    aopOp(left,ic,FALSE);
-    aopOp(result,ic,FALSE);
+  //sym_link *retype = getSpec(operandType(result));
+#if 0
+  symbol *albl, *blbl;          //, *clbl;
+  pCodeOp *pcop;
+#endif
+  int i, lit;
 
-    size = AOP_SIZE(result);
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  aopOp (left, ic, FALSE);
+  aopOp (result, ic, FALSE);
 
-    DEBUGpic14_AopType(__LINE__,left,NULL,result);
+  DEBUGpic14_AopType (__LINE__, left, NULL, result);
 
-    DEBUGpic14_emitcode ("; "," %d getting const pointer",__LINE__);
+  DEBUGpic14_emitcode ("; ", " %d getting const pointer", __LINE__);
 
-    lit = op_isLitLike (left);
-    poc = lit ? POC_MOVLW : POC_MOVFW;
+  lit = op_isLitLike (left);
 
-    if (IS_BITFIELD(getSpec(operandType(result))))
+  if (IS_BITFIELD (getSpec (operandType (result))))
     {
-        genUnpackBits (result, left, lit ? -1 : CPOINTER, ifxForOp (IC_RESULT(ic), ic));
-        goto release;
+      genUnpackBits (result, left, lit ? -1 : CPOINTER, ifxForOp (IC_RESULT (ic), ic));
+      goto release;
     }
 
-    {
-        char *func[] = { NULL, "__gptrget1", "__gptrget2", "__gptrget3", "__gptrget4" };
-        int size = min(getSize(OP_SYM_ETYPE(left)), AOP_SIZE(result));
-        assert (size > 0 && size <= 4);
-
-        mov2w_op(left, 0);
-        emitpcode(POC_MOVWF, popRegFromIdx (Gstack_base_addr-1));
-        mov2w_op(left, 1);
-        emitpcode(POC_MOVWF, popRegFromIdx (Gstack_base_addr));
-        emitpcode(POC_MOVLW, popGetLit (GPTRTAG_CODE)); /* GPOINTER tag for __code space */
-        call_libraryfunc (func[size]);
-
-        movwf(AOP(result),size-1);
-        for (i = 1; i < size; i++)
-        {
-            emitpcode(POC_MOVFW, popRegFromIdx (Gstack_base_addr+1-i));
-            movwf(AOP(result),size - 1 - i);
-        } // for
-    }
+  {
+    char *func[] = { NULL, "__gptrget1", "__gptrget2", "__gptrget3", "__gptrget4" };
+    int size = min ((int)getSize (OP_SYM_ETYPE (left)), AOP_SIZE (result));
+    assert (size > 0 && size <= 4);
+
+    mov2w_op (left, 0);
+    emitpcode (POC_MOVWF, popRegFromIdx (Gstack_base_addr - 1));
+    mov2w_op (left, 1);
+    emitpcode (POC_MOVWF, popRegFromIdx (Gstack_base_addr));
+    emitpcode (POC_MOVLW, popGetLit (GPTRTAG_CODE));    /* GPOINTER tag for __code space */
+    call_libraryfunc (func[size]);
+
+    movwf (AOP (result), size - 1);
+    for (i = 1; i < size; i++)
+      {
+        emitpcode (POC_MOVFW, popRegFromIdx (Gstack_base_addr + 1 - i));
+        movwf (AOP (result), size - 1 - i);
+      }                         // for
+  }
 
 release:
-    freeAsmop(left,NULL,ic,TRUE);
-    freeAsmop(result,NULL,ic,TRUE);
+  freeAsmop (left, NULL, ic, TRUE);
+  freeAsmop (result, NULL, ic, TRUE);
 
 }
+
 /*-----------------------------------------------------------------*/
 /* genPointerGet - generate code for pointer get                   */
 /*-----------------------------------------------------------------*/
-static void genPointerGet (iCode *ic)
+static void
+genPointerGet (iCode * ic)
 {
-    operand *left, *result ;
-    sym_link *type, *etype;
-    int p_type = -1;
-
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
-    left = IC_LEFT(ic);
-    result = IC_RESULT(ic) ;
-
-    /* depending on the type of pointer we need to
-    move it to the correct pointer register */
-    type = operandType(left);
-    etype = getSpec(type);
-
-    if (IS_PTR_CONST(type))
-        DEBUGpic14_emitcode ("; ***","%d - const pointer",__LINE__);
-
-    /* if left is of type of pointer then it is simple */
-    if (IS_PTR(type) && !IS_FUNC(type->next))
-        p_type = DCL_TYPE(type);
-    else {
-        /* we have to go by the storage class */
-        p_type = PTR_TYPE(SPEC_OCLS(etype));
-
-        DEBUGpic14_emitcode ("; ***","%d - resolve pointer by storage class",__LINE__);
-
-        if (SPEC_OCLS(etype)->codesp ) {
-            DEBUGpic14_emitcode ("; ***","%d - cpointer",__LINE__);
-            //p_type = CPOINTER ;
+  operand *left, *result;
+  sym_link *type, *etype;
+  int p_type = -1;
+
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+
+  left = IC_LEFT (ic);
+  result = IC_RESULT (ic);
+
+  /* depending on the type of pointer we need to
+     move it to the correct pointer register */
+  type = operandType (left);
+  etype = getSpec (type);
+
+  if (IS_PTR_CONST (type))
+    DEBUGpic14_emitcode ("; ***", "%d - const pointer", __LINE__);
+
+  /* if left is of type of pointer then it is simple */
+  if (IS_PTR (type) && !IS_FUNC (type->next))
+    p_type = DCL_TYPE (type);
+  else
+    {
+      /* we have to go by the storage class */
+      p_type = PTR_TYPE (SPEC_OCLS (etype));
+
+      DEBUGpic14_emitcode ("; ***", "%d - resolve pointer by storage class", __LINE__);
+
+      if (SPEC_OCLS (etype)->codesp)
+        {
+          DEBUGpic14_emitcode ("; ***", "%d - cpointer", __LINE__);
+          //p_type = CPOINTER ;
         }
-        else
-            if (SPEC_OCLS(etype)->fmap && !SPEC_OCLS(etype)->paged)
-                DEBUGpic14_emitcode ("; ***","%d - fpointer",__LINE__);
-            /*p_type = FPOINTER ;*/
-            else
-                if (SPEC_OCLS(etype)->fmap && SPEC_OCLS(etype)->paged)
-                    DEBUGpic14_emitcode ("; ***","%d - ppointer",__LINE__);
-                /*        p_type = PPOINTER; */
-                else
-                    if (SPEC_OCLS(etype) == idata )
-                        DEBUGpic14_emitcode ("; ***","%d - ipointer",__LINE__);
-                    /*      p_type = IPOINTER; */
-                    else
-                        DEBUGpic14_emitcode ("; ***","%d - pointer",__LINE__);
-                    /*      p_type = POINTER ; */
+      else if (SPEC_OCLS (etype)->fmap && !SPEC_OCLS (etype)->paged)
+        DEBUGpic14_emitcode ("; ***", "%d - fpointer", __LINE__);
+      /*p_type = FPOINTER ; */
+      else if (SPEC_OCLS (etype)->fmap && SPEC_OCLS (etype)->paged)
+        DEBUGpic14_emitcode ("; ***", "%d - ppointer", __LINE__);
+      /*        p_type = PPOINTER; */
+      else if (SPEC_OCLS (etype) == idata)
+        DEBUGpic14_emitcode ("; ***", "%d - ipointer", __LINE__);
+      /*      p_type = IPOINTER; */
+      else
+        DEBUGpic14_emitcode ("; ***", "%d - pointer", __LINE__);
+      /*      p_type = POINTER ; */
     }
 
-    /* now that we have the pointer type we assign
-    the pointer values */
-    switch (p_type) {
+  /* now that we have the pointer type we assign
+     the pointer values */
+  switch (p_type)
+    {
 
     case POINTER:
     case FPOINTER:
-    //case IPOINTER:
-        genNearPointerGet (left,result,ic);
-        break;
-/*
-    case PPOINTER:
-        genPagedPointerGet(left,result,ic);
-        break;
-
-    case FPOINTER:
-        genFarPointerGet (left,result,ic);
-        break;
-*/
+      //case IPOINTER:
+      genNearPointerGet (left, result, ic);
+      break;
+      /*
+         case PPOINTER:
+         genPagedPointerGet(left,result,ic);
+         break;
+
+         case FPOINTER:
+         genFarPointerGet (left,result,ic);
+         break;
+       */
     case CPOINTER:
-        genConstPointerGet (left,result,ic);
-        break;
+      genConstPointerGet (left, result, ic);
+      break;
 
     case GPOINTER:
-        genGenPointerGet (left,result,ic);
-        break;
+      genGenPointerGet (left, result, ic);
+      break;
     default:
-        assert ( !"unhandled pointer type" );
-        break;
+      assert (!"unhandled pointer type");
+      break;
     }
 
 }
@@ -5788,832 +6201,886 @@
 /*-----------------------------------------------------------------*/
 /* genPackBits - generates code for packed bit storage             */
 /*-----------------------------------------------------------------*/
-static void genPackBits(sym_link *etype,operand *result,operand *right,int p_type)
+static void
+genPackBits (sym_link * etype, operand * result, operand * right, int p_type)
 {
-  int blen;             /* bitfield length */
-  int bstr;             /* bitfield starting bit within byte */
-  int litval;           /* source literal value (if AOP_LIT) */
-  unsigned char mask;   /* bitmask within current byte */
+  int blen;                     /* bitfield length */
+  int bstr;                     /* bitfield starting bit within byte */
+  int litval;                   /* source literal value (if AOP_LIT) */
+  unsigned char mask;           /* bitmask within current byte */
 
   FENTRY;
-  DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
   blen = SPEC_BLEN (etype);
   bstr = SPEC_BSTR (etype);
 
   /* If the bitfield length is less than a byte and does not cross byte boundaries */
   if ((blen <= 8) && ((bstr + blen) <= 8))
-  {
-    mask = ((unsigned char) (0xFF << (blen + bstr)) |
-        (unsigned char) (0xFF >> (8 - bstr)));
-
-    if (AOP_TYPE (right) == AOP_LIT)
     {
-      /* Case with a bitfield length <8 and literal source */
-      int lit = (int) ulFromVal (AOP (right)->aopu.aop_lit);
-      if (blen == 1) {
-        pCodeOp *pcop;
+      mask = ((unsigned char) (0xFF << (blen + bstr)) | (unsigned char) (0xFF >> (8 - bstr)));
 
-    switch (p_type)
-    {
-    case -1:
-      if (AOP(result)->type == AOP_PCODE)
-        pcop = newpCodeOpBit(aopGet(AOP(result),0,FALSE,FALSE),bstr,0);
-      else
-        pcop = popGet(AOP(result),0);
-      emitpcode(lit?POC_BSF:POC_BCF,pcop);
-      break;
+      if (AOP_TYPE (right) == AOP_LIT)
+        {
+          /* Case with a bitfield length <8 and literal source */
+          int lit = (int) ulFromVal (AOP (right)->aopu.aop_lit);
+          if (blen == 1)
+            {
+              pCodeOp *pcop;
 
-    case POINTER:
-    case FPOINTER:
-      setup_fsr (result);
-      emitpcode(lit?POC_BSF:POC_BCF,newpCodeOpBit(PCOP(pc_indf)->name,bstr,0));
-      break;
+              switch (p_type)
+                {
+                case -1:
+                  if (AOP (result)->type == AOP_PCODE)
+                    pcop = newpCodeOpBit (aopGet (AOP (result), 0, FALSE, FALSE), bstr, 0);
+                  else
+                    pcop = popGet (AOP (result), 0);
+                  emitpcode (lit ? POC_BSF : POC_BCF, pcop);
+                  break;
 
-    case CPOINTER:
-      assert( !"trying to assign to bitfield via pointer to __code space" );
-      break;
+                case POINTER:
+                case FPOINTER:
+                  setup_fsr (result);
+                  emitpcode (lit ? POC_BSF : POC_BCF, newpCodeOpBit (PCOP (pc_indf)->name, bstr, 0));
+                  break;
 
-    case GPOINTER:
-      emitPtrByteGet(result, p_type, FALSE);
-      if (lit) {
-        emitpcode(POC_IORLW, newpCodeOpLit (1UL << bstr));
-      } else {
-        emitpcode(POC_ANDLW, newpCodeOpLit ((~(1UL << bstr)) & 0x0ff));
-      }
-      emitPtrByteSet(result, p_type, TRUE);
-      break;
+                case CPOINTER:
+                  assert (!"trying to assign to bitfield via pointer to __code space");
+                  break;
 
-    default:
-      assert( !"unhandled pointer type" );
-      break;
-    } // switch (p_type)
-      } else {
-        /* blen > 1 */
-    litval = lit << bstr;
-    litval &= (~mask) & 0x00ff;
-
-    switch (p_type)
-    {
-    case -1:
-      mov2w (AOP(result), 0);
-      if ((litval|mask) != 0x00ff)
-        emitpcode(POC_ANDLW, popGetLit (mask));
-      if (litval != 0x00)
-        emitpcode(POC_IORLW, popGetLit (litval));
-      movwf (AOP(result), 0);
-      break;
+                case GPOINTER:
+                  emitPtrByteGet (result, p_type, FALSE);
+                  if (lit)
+                    {
+                      emitpcode (POC_IORLW, newpCodeOpLit (1UL << bstr));
+                    }
+                  else
+                    {
+                      emitpcode (POC_ANDLW, newpCodeOpLit ((~(1UL << bstr)) & 0x0ff));
+                    }
+                  emitPtrByteSet (result, p_type, TRUE);
+                  break;
 
-    case POINTER:
-    case FPOINTER:
-    case GPOINTER:
-      emitPtrByteGet(result, p_type, FALSE);
-      if ((litval|mask) != 0x00ff)
-        emitpcode(POC_ANDLW, popGetLit (mask));
-      if (litval != 0x00)
-        emitpcode(POC_IORLW, popGetLit (litval));
-      emitPtrByteSet(result, p_type, TRUE);
-      break;
+                default:
+                  assert (!"unhandled pointer type");
+                  break;
+                }               // switch (p_type)
+            }
+          else
+            {
+              /* blen > 1 */
+              litval = lit << bstr;
+              litval &= (~mask) & 0x00ff;
 
-    case CPOINTER:
-      assert( !"trying to assign to bitfield via pointer to __code space" );
-      break;
+              switch (p_type)
+                {
+                case -1:
+                  mov2w (AOP (result), 0);
+                  if ((litval | mask) != 0x00ff)
+                    emitpcode (POC_ANDLW, popGetLit (mask));
+                  if (litval != 0x00)
+                    emitpcode (POC_IORLW, popGetLit (litval));
+                  movwf (AOP (result), 0);
+                  break;
 
-    default:
-      assert( !"unhandled pointer type" );
-      break;
-    } // switch
-      } // if (blen > 1)
-    }
-    else
-    {
-      /* right is no literal */
-      if (blen==1) {
-        switch (p_type)
-    {
-    case -1:
-      /* Note more efficient code, of pre clearing bit then only setting it if required,
-       * can only be done if it is known that the result is not a SFR */
-      emitpcode(POC_RRFW,popGet(AOP(right),0));
-      emitSKPC;
-      emitpcode(POC_BCF,newpCodeOpBit (aopGet(AOP(result), 0, FALSE, FALSE), bstr, 0));
-      emitSKPNC;
-      emitpcode(POC_BSF,newpCodeOpBit (aopGet(AOP(result), 0, FALSE, FALSE), bstr, 0));
-      break;
+                case POINTER:
+                case FPOINTER:
+                case GPOINTER:
+                  emitPtrByteGet (result, p_type, FALSE);
+                  if ((litval | mask) != 0x00ff)
+                    emitpcode (POC_ANDLW, popGetLit (mask));
+                  if (litval != 0x00)
+                    emitpcode (POC_IORLW, popGetLit (litval));
+                  emitPtrByteSet (result, p_type, TRUE);
+                  break;
 
-    case POINTER:
-    case FPOINTER:
-    case GPOINTER:
-      emitPtrByteGet (result, p_type, FALSE);
-      emitpcode(POC_BTFSS, newpCodeOpBit (aopGet(AOP(right), 0, FALSE, FALSE), bstr, 0));
-      emitpcode(POC_ANDLW, newpCodeOpLit (~(1UL << bstr) & 0x0ff));
-      emitpcode(POC_BTFSC, newpCodeOpBit (aopGet(AOP(right), 0, FALSE, FALSE), bstr, 0));
-      emitpcode(POC_IORLW, newpCodeOpLit ((1UL << bstr) & 0x0ff));
-      emitPtrByteSet (result, p_type, TRUE);
-      break;
+                case CPOINTER:
+                  assert (!"trying to assign to bitfield via pointer to __code space");
+                  break;
 
-    case CPOINTER:
-      assert( !"trying to assign to bitfield via pointer to __code space" );
-      break;
+                default:
+                  assert (!"unhandled pointer type");
+                  break;
+                }               // switch
+            }                   // if (blen > 1)
+        }
+      else
+        {
+          /* right is no literal */
+          if (blen == 1)
+            {
+              switch (p_type)
+                {
+                case -1:
+                  /* Note more efficient code, of pre clearing bit then only setting it if required,
+                   * can only be done if it is known that the result is not a SFR */
+                  emitpcode (POC_RRFW, popGet (AOP (right), 0));
+                  emitSKPC;
+                  emitpcode (POC_BCF, newpCodeOpBit (aopGet (AOP (result), 0, FALSE, FALSE), bstr, 0));
+                  emitSKPNC;
+                  emitpcode (POC_BSF, newpCodeOpBit (aopGet (AOP (result), 0, FALSE, FALSE), bstr, 0));
+                  break;
 
-    default:
-      assert( !"unhandled pointer type" );
-      break;
-    } // switch
-    return;
-      } else {
-    /* Case with a bitfield 1 < length <= 8 and arbitrary source */
-    pCodeOp *temp = popGetTempReg ();
-
-    mov2w (AOP(right), 0);
-    if (blen < 8) {
-      emitpcode (POC_ANDLW, popGetLit ((1UL << blen)-1));
-    }
-    emitpcode(POC_MOVWF, temp);
-    if (bstr) {
-      AccLsh (temp, bstr);
-    }
-
-    switch (p_type)
-    {
-    case -1:
-      mov2w (AOP(result), 0);
-      emitpcode(POC_ANDLW, popGetLit (mask));
-      emitpcode(POC_IORFW, temp);
-      movwf (AOP(result), 0);
-      break;
+                case POINTER:
+                case FPOINTER:
+                case GPOINTER:
+                  emitPtrByteGet (result, p_type, FALSE);
+                  emitpcode (POC_BTFSS, newpCodeOpBit (aopGet (AOP (right), 0, FALSE, FALSE), bstr, 0));
+                  emitpcode (POC_ANDLW, newpCodeOpLit (~(1UL << bstr) & 0x0ff));
+                  emitpcode (POC_BTFSC, newpCodeOpBit (aopGet (AOP (right), 0, FALSE, FALSE), bstr, 0));
+                  emitpcode (POC_IORLW, newpCodeOpLit ((1UL << bstr) & 0x0ff));
+                  emitPtrByteSet (result, p_type, TRUE);
+                  break;
 
-    case POINTER:
-    case FPOINTER:
-    case GPOINTER:
-      emitPtrByteGet (result, p_type, FALSE);
-      emitpcode(POC_ANDLW, popGetLit (mask));
-      emitpcode(POC_IORFW, temp);
-      emitPtrByteSet (result, p_type, TRUE);
-      break;
+                case CPOINTER:
+                  assert (!"trying to assign to bitfield via pointer to __code space");
+                  break;
 
-    case CPOINTER:
-      assert( !"trying to assign to bitfield via pointer to __code space" );
-      break;
+                default:
+                  assert (!"unhandled pointer type");
+                  break;
+                }               // switch
+              return;
+            }
+          else
+            {
+              /* Case with a bitfield 1 < length <= 8 and arbitrary source */
+              pCodeOp *temp = popGetTempReg ();
 
-    default:
-      assert( !"unhandled pointer type" );
-      break;
-    } // switch
+              mov2w (AOP (right), 0);
+              if (blen < 8)
+                {
+                  emitpcode (POC_ANDLW, popGetLit ((1UL << blen) - 1));
+                }
+              emitpcode (POC_MOVWF, temp);
+              if (bstr)
+                {
+                  AccLsh (temp, bstr);
+                }
 
-    popReleaseTempReg (temp);
-      } // if (blen > 1)
-    } // if (AOP(right)->type != AOP_LIT)
-    return;
-  } // if (blen <= 8 && ((blen + bstr) <= 8))
+              switch (p_type)
+                {
+                case -1:
+                  mov2w (AOP (result), 0);
+                  emitpcode (POC_ANDLW, popGetLit (mask));
+                  emitpcode (POC_IORFW, temp);
+                  movwf (AOP (result), 0);
+                  break;
+
+                case POINTER:
+                case FPOINTER:
+                case GPOINTER:
+                  emitPtrByteGet (result, p_type, FALSE);
+                  emitpcode (POC_ANDLW, popGetLit (mask));
+                  emitpcode (POC_IORFW, temp);
+                  emitPtrByteSet (result, p_type, TRUE);
+                  break;
+
+                case CPOINTER:
+                  assert (!"trying to assign to bitfield via pointer to __code space");
+                  break;
 
-  assert( !"bitfields larger than 8 bits or crossing byte boundaries are not yet supported" );
+                default:
+                  assert (!"unhandled pointer type");
+                  break;
+                }               // switch
+
+              popReleaseTempReg (temp);
+            }                   // if (blen > 1)
+        }                       // if (AOP(right)->type != AOP_LIT)
+      return;
+    }                           // if (blen <= 8 && ((blen + bstr) <= 8))
+
+  assert (!"bitfields larger than 8 bits or crossing byte boundaries are not yet supported");
 }
 
 /*-----------------------------------------------------------------*/
 /* genDataPointerSet - remat pointer to data space                 */
 /*-----------------------------------------------------------------*/
-static void genDataPointerSet(operand *right,
-    operand *result,
-    iCode *ic)
+static void
+genDataPointerSet (operand * right, operand * result, iCode * ic)
 {
-    int size = 0;
-    int offset = 0;
-    int ressize;
+  int size = 0;
+  int offset = 0;
+  int ressize;
+
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  aopOp (right, ic, FALSE);
+  aopOp (result, ic, FALSE);
+
+  assert (IS_SYMOP (result));
+  assert (IS_PTR (OP_SYM_TYPE (result)));
+
+  /*
+   * Determine size from right operand (not result):
+   * The result might be a rematerialized pointer to (the first field in) a struct,
+   * which then assumes the type (and size) of the struct rather than the first field.
+   */
+  if (IS_SYMOP (right))
+    size = getSize (OP_SYM_ETYPE (right));
+  else if (IS_VALOP (right))
+    size = getSize (OP_VALUE (right)->type);
+  else
+    assert (!"Invalid operand.");
+
+  ressize = getSize (OP_SYM_ETYPE (result));
+
+  //assert( !"what's going on here?" );
+
+  /*
+     if ( AOP_TYPE(result) == AOP_PCODE) {
+     fprintf(stderr,"genDataPointerSet   %s, %d\n",
+     AOP(result)->aopu.pcop->name,
+     PCOI(AOP(result)->aopu.pcop)->offset);
+     }
+   */
 
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    aopOp(right,ic,FALSE);
-    aopOp(result,ic,FALSE);
-
-    assert (IS_SYMOP(result));
-    assert (IS_PTR(OP_SYM_TYPE(result)));
-
-    /*
-     * Determine size from right operand (not result):
-     * The result might be a rematerialized pointer to (the first field in) a struct,
-     * which then assumes the type (and size) of the struct rather than the first field.
-     */
-    if (IS_SYMOP (right))
-      size = getSize (OP_SYM_ETYPE (right));
-    else if (IS_VALOP (right))
-      size = getSize (OP_VALUE (right)->type);
-    else
-      assert (!"Invalid operand.");
-
-    ressize = getSize (OP_SYM_ETYPE (result));
-
-    //assert( !"what's going on here?" );
-
-    /*
-    if ( AOP_TYPE(result) == AOP_PCODE) {
-    fprintf(stderr,"genDataPointerSet   %s, %d\n",
-    AOP(result)->aopu.pcop->name,
-    PCOI(AOP(result)->aopu.pcop)->offset);
-    }
-    */
-
-    // tsd, was l+1 - the underline `_' prefix was being stripped
-    while (size--) {
-        emitpComment ("%s:%u: size=%d/%d, offset=%d, AOP_TYPE(res)=%d", __FILE__,__LINE__, size, ressize, offset, AOP_TYPE(result));
-
-        if (AOP_TYPE(right) == AOP_LIT) {
-            unsigned int lit = pic14aopLiteral(AOP(IC_RIGHT(ic))->aopu.aop_lit, offset);
-            //fprintf (stderr, "%s:%u: lit %d 0x%x\n", __FUNCTION__,__LINE__, lit, lit);
-            if(lit&0xff) {
-                emitpcode(POC_MOVLW, popGetLit(lit&0xff));
-                emitpcode(POC_MOVWF, popGet(AOP(result), offset));
-            } else {
-                emitpcode(POC_CLRF, popGet(AOP(result), offset));
-            }
-        } else {
-            //fprintf (stderr, "%s:%u: no lit\n", __FUNCTION__,__LINE__);
-            emitpcode(POC_MOVFW, popGet(AOP(right), offset));
-            emitpcode(POC_MOVWF, popGet(AOP(result), offset));
+  // tsd, was l+1 - the underline `_' prefix was being stripped
+  while (size--)
+    {
+      emitpComment ("%s:%u: size=%d/%d, offset=%d, AOP_TYPE(res)=%d", __FILE__, __LINE__, size, ressize, offset,
+                    AOP_TYPE (result));
+
+      if (AOP_TYPE (right) == AOP_LIT)
+        {
+          unsigned int lit = pic14aopLiteral (AOP (IC_RIGHT (ic))->aopu.aop_lit, offset);
+          //fprintf (stderr, "%s:%u: lit %d 0x%x\n", __FUNCTION__,__LINE__, lit, lit);
+          if (lit & 0xff)
+            {
+              emitpcode (POC_MOVLW, popGetLit (lit & 0xff));
+              emitpcode (POC_MOVWF, popGet (AOP (result), offset));
+            }
+          else
+            {
+              emitpcode (POC_CLRF, popGet (AOP (result), offset));
+            }
+        }
+      else
+        {
+          //fprintf (stderr, "%s:%u: no lit\n", __FUNCTION__,__LINE__);
+          emitpcode (POC_MOVFW, popGet (AOP (right), offset));
+          emitpcode (POC_MOVWF, popGet (AOP (result), offset));
         }
 
-        offset++;
+      offset++;
     }
 
-    freeAsmop(right,NULL,ic,TRUE);
-    freeAsmop(result,NULL,ic,TRUE);
+  freeAsmop (right, NULL, ic, TRUE);
+  freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genNearPointerSet - pic14_emitcode for near pointer put         */
 /*-----------------------------------------------------------------*/
-static void genNearPointerSet (operand *right,
-                               operand *result,
-                               iCode *ic)
-{
-    asmop *aop = NULL;
-    sym_link *ptype = operandType(result);
-    sym_link *retype = getSpec(operandType(right));
-    sym_link *letype = getSpec(ptype);
-    int direct = 0;
+static void
+genNearPointerSet (operand * right, operand * result, iCode * ic)
+{
+  asmop *aop = NULL;
+  sym_link *ptype = operandType (result);
+  sym_link *retype = getSpec (operandType (right));
+  sym_link *letype = getSpec (ptype);
+  int direct = 0;
 
 
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    aopOp(result,ic,FALSE);
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  aopOp (result, ic, FALSE);
 
 #if 1
-    /* if the result is rematerializable &
-    in data space & not a bit variable */
-    //if (AOP_TYPE(result) == AOP_IMMD &&
-    if (AOP_TYPE(result) == AOP_PCODE &&
-        PIC_IS_DATA_PTR(ptype) &&
-        !IS_BITVAR (retype) &&
-        !IS_BITVAR (letype)) {
-        genDataPointerSet (right,result,ic);
-        freeAsmop(result,NULL,ic,TRUE);
-        return;
+  /* if the result is rematerializable &
+     in data space & not a bit variable */
+  //if (AOP_TYPE(result) == AOP_IMMD &&
+  if (AOP_TYPE (result) == AOP_PCODE && PIC_IS_DATA_PTR (ptype) && !IS_BITVAR (retype) && !IS_BITVAR (letype))
+    {
+      genDataPointerSet (right, result, ic);
+      freeAsmop (result, NULL, ic, TRUE);
+      return;
     }
 #endif
 
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    aopOp(right,ic,FALSE);
-    DEBUGpic14_AopType(__LINE__,NULL,right,result);
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  aopOp (right, ic, FALSE);
+  DEBUGpic14_AopType (__LINE__, NULL, right, result);
 
-    /* Check if can access directly instead of via a pointer */
-    if ((AOP_TYPE(result) == AOP_PCODE)
-        && (AOP(result)->aopu.pcop->type == PO_IMMEDIATE)
-        && (AOP_SIZE(right) == 1))
+  /* Check if can access directly instead of via a pointer */
+  if ((AOP_TYPE (result) == AOP_PCODE) && (AOP (result)->aopu.pcop->type == PO_IMMEDIATE) && (AOP_SIZE (right) == 1))
     {
-        direct = 1;
+      direct = 1;
     }
 
-    if (IS_BITFIELD (letype))
+  if (IS_BITFIELD (letype))
     {
-      genPackBits (letype, result, right, direct?-1:POINTER);
+      genPackBits (letype, result, right, direct ? -1 : POINTER);
       return;
     }
 
-    /* If the pointer value is not in a the FSR then need to put it in */
-    /* Must set/reset IRP bit for use with FSR. */
-    /* Note only do this once - assuming that never need to cross a bank boundary at address 0x100. */
-    if (!direct)
-        setup_fsr (result);
-
-    {
-        /* we have can just get the values */
-        int size = AOP_SIZE(right);
-        int offset = 0 ;
-
-        DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-        while (size--) {
-            char *l = aopGet(AOP(right),offset,FALSE,TRUE);
-            if (*l == '@' ) {
-                emitpcode(POC_MOVFW,popCopyReg(pc_indf));
-            } else {
-                if (AOP_TYPE(right) == AOP_LIT) {
-                    emitpcode(POC_MOVLW,popGet(AOP(right),offset));
-                } else {
-                    emitpcode(POC_MOVFW,popGet(AOP(right),offset));
-                }
-                if (direct)
-                    emitpcode(POC_MOVWF,popGet(AOP(result),0));
-                else
-                    emitpcode(POC_MOVWF,popCopyReg(pc_indf));
-            }
-            if (size && !direct)
-              inc_fsr(1);
-            offset++;
-        }
-    }
+  /* If the pointer value is not in a the FSR then need to put it in */
+  /* Must set/reset IRP bit for use with FSR. */
+  /* Note only do this once - assuming that never need to cross a bank boundary at address 0x100. */
+  if (!direct)
+    setup_fsr (result);
+
+  {
+    /* we have can just get the values */
+    int size = AOP_SIZE (right);
+    int offset = 0;
+
+    DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+    while (size--)
+      {
+        char *l = aopGet (AOP (right), offset, FALSE, TRUE);
+        if (*l == '@')
+          {
+            emitpcode (POC_MOVFW, popCopyReg (pc_indf));
+          }
+        else
+          {
+            if (AOP_TYPE (right) == AOP_LIT)
+              {
+                emitpcode (POC_MOVLW, popGet (AOP (right), offset));
+              }
+            else
+              {
+                emitpcode (POC_MOVFW, popGet (AOP (right), offset));
+              }
+            if (direct)
+              emitpcode (POC_MOVWF, popGet (AOP (result), 0));
+            else
+              emitpcode (POC_MOVWF, popCopyReg (pc_indf));
+          }
+        if (size && !direct)
+          inc_fsr (1);
+        offset++;
+      }
+  }
 
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* now some housekeeping stuff */
-    if (aop) {
-        /* we had to allocate for this iCode */
-        freeAsmop(NULL,aop,ic,TRUE);
-    } else if (!direct) {
-        /* nothing to do */
-    } else {
-        /* we did not allocate which means left
-        already in a pointer register, then
-        if size > 0 && this could be used again
-        we have to point it back to where it
-        belongs */
-        DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-        if (AOP_SIZE(right) > 1 &&
-            !OP_SYMBOL(result)->remat &&
-            ( OP_SYMBOL(result)->liveTo > ic->seq ||
-            ic->depth )) {
-            int size = AOP_SIZE(right) - 1;
-            inc_fsr(-size);
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  /* now some housekeeping stuff */
+  if (aop)
+    {
+      /* we had to allocate for this iCode */
+      freeAsmop (NULL, aop, ic, TRUE);
+    }
+  else if (!direct)
+    {
+      /* nothing to do */
+    }
+  else
+    {
+      /* we did not allocate which means left
+         already in a pointer register, then
+         if size > 0 && this could be used again
+         we have to point it back to where it
+         belongs */
+      DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+      if (AOP_SIZE (right) > 1 && !OP_SYMBOL (result)->remat && (OP_SYMBOL (result)->liveTo > ic->seq || ic->depth))
+        {
+          int size = AOP_SIZE (right) - 1;
+          inc_fsr (-size);
         }
     }
 
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* done */
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  /* done */
 
-    freeAsmop(right,NULL,ic,TRUE);
-    freeAsmop(result,NULL,ic,TRUE);
+  freeAsmop (right, NULL, ic, TRUE);
+  freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genGenPointerSet - set value from generic pointer space         */
 /*-----------------------------------------------------------------*/
-static void genGenPointerSet (operand *right, operand *result, iCode *ic)
+static void
+genGenPointerSet (operand * right, operand * result, iCode * ic)
 {
-    sym_link *retype = getSpec(operandType(result));
+  sym_link *retype = getSpec (operandType (result));
 
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    aopOp(right,ic,FALSE);
-    aopOp(result,ic,FALSE);
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  aopOp (right, ic, FALSE);
+  aopOp (result, ic, FALSE);
 
 
-    DEBUGpic14_AopType(__LINE__,right,NULL,result);
+  DEBUGpic14_AopType (__LINE__, right, NULL, result);
 
-    if (IS_BITFIELD(retype))
+  if (IS_BITFIELD (retype))
     {
       genPackBits (retype, result, right, GPOINTER);
       return;
     }
 
-    {
-      /* emit call to __gptrput */
-      char *func[] = {NULL, "__gptrput1", "__gptrput2", "__gptrput3", "__gptrput4"};
-      int size = AOP_SIZE(right);
-      int idx = 0;
-
-      /* The following assertion fails for
-       *   struct foo { char a; char b; } bar;
-       *   void demo(struct foo *dst, char c) { dst->b = c; }
-       * as size will be 1 (sizeof(c)), whereas dst->b will be accessed
-       * using (((char *)dst)+1), whose OP_SYM_ETYPE still is struct foo
-       * of size 2.
-       * The frontend seems to guarantee that IC_LEFT has the correct size,
-       * it works fine both for larger and smaller types of `char c'.
-       * */
-      //assert (size == getSize(OP_SYM_ETYPE(result)));
-      assert (size > 0 && size <= 4);
+  {
+    /* emit call to __gptrput */
+    char *func[] = { NULL, "__gptrput1", "__gptrput2", "__gptrput3", "__gptrput4" };
+    int size = AOP_SIZE (right);
+    int idx = 0;
+
+    /* The following assertion fails for
+     *   struct foo { char a; char b; } bar;
+     *   void demo(struct foo *dst, char c) { dst->b = c; }
+     * as size will be 1 (sizeof(c)), whereas dst->b will be accessed
+     * using (((char *)dst)+1), whose OP_SYM_ETYPE still is struct foo
+     * of size 2.
+     * The frontend seems to guarantee that IC_LEFT has the correct size,
+     * it works fine both for larger and smaller types of `char c'.
+     * */
+    //assert (size == getSize(OP_SYM_ETYPE(result)));
+    assert (size > 0 && size <= 4);
 
-      /* pass arguments */
-      /* - value (MSB in Gstack_base_addr-2, growing downwards) */
-      {
-        int off = size;
-        idx = 2;
-        while (off--)
+    /* pass arguments */
+    /* - value (MSB in Gstack_base_addr-2, growing downwards) */
+    {
+      int off = size;
+      idx = 2;
+      while (off--)
         {
           mov2w_op (right, off);
           emitpcode (POC_MOVWF, popRegFromIdx (Gstack_base_addr - idx++));
         }
-        idx = 0;
-      }
-      /* - address */
-      assert (AOP_SIZE(result) == 3);
-      mov2w(AOP(result), 0);
-      emitpcode(POC_MOVWF, popRegFromIdx (Gstack_base_addr - 1));
-      mov2w(AOP(result), 1);
-      emitpcode(POC_MOVWF, popRegFromIdx (Gstack_base_addr));
-      mov2w(AOP(result), 2);
-      call_libraryfunc (func[size]);
+      idx = 0;
     }
+    /* - address */
+    assert (AOP_SIZE (result) == 3);
+    mov2w (AOP (result), 0);
+    emitpcode (POC_MOVWF, popRegFromIdx (Gstack_base_addr - 1));
+    mov2w (AOP (result), 1);
+    emitpcode (POC_MOVWF, popRegFromIdx (Gstack_base_addr));
+    mov2w (AOP (result), 2);
+    call_libraryfunc (func[size]);
+  }
 
-    freeAsmop(right,NULL,ic,TRUE);
-    freeAsmop(result,NULL,ic,TRUE);
+  freeAsmop (right, NULL, ic, TRUE);
+  freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genPointerSet - stores the value into a pointer location        */
 /*-----------------------------------------------------------------*/
-static void genPointerSet (iCode *ic)
+static void
+genPointerSet (iCode * ic)
 {
-    operand *right, *result ;
-    sym_link *type, *etype;
-    int p_type;
-
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
-    right = IC_RIGHT(ic);
-    result = IC_RESULT(ic) ;
-
-    /* depending on the type of pointer we need to
-    move it to the correct pointer register */
-    type = operandType(result);
-    etype = getSpec(type);
-    /* if left is of type of pointer then it is simple */
-    if (IS_PTR(type) && !IS_FUNC(type->next)) {
-        p_type = DCL_TYPE(type);
-    }
-    else {
-        /* we have to go by the storage class */
-        p_type = PTR_TYPE(SPEC_OCLS(etype));
-
-        /*  if (SPEC_OCLS(etype)->codesp ) { */
-        /*      p_type = CPOINTER ;  */
-        /*  } */
-        /*  else */
-        /*      if (SPEC_OCLS(etype)->fmap && !SPEC_OCLS(etype)->paged) */
-        /*    p_type = FPOINTER ; */
-        /*      else */
-        /*    if (SPEC_OCLS(etype)->fmap && SPEC_OCLS(etype)->paged) */
-        /*        p_type = PPOINTER ; */
-        /*    else */
-        /*        if (SPEC_OCLS(etype) == idata ) */
-        /*      p_type = IPOINTER ; */
-        /*        else */
-        /*      p_type = POINTER ; */
-    }
-
-    /* now that we have the pointer type we assign
-    the pointer values */
-    switch (p_type) {
+  operand *right, *result;
+  sym_link *type, *etype;
+  int p_type;
 
-    case POINTER:
-    case FPOINTER:
-    //case IPOINTER:
-        genNearPointerSet (right,result,ic);
-        break;
-/*
-    case PPOINTER:
-        genPagedPointerSet (right,result,ic);
-        break;
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+
+  right = IC_RIGHT (ic);
+  result = IC_RESULT (ic);
 
+  /* depending on the type of pointer we need to
+     move it to the correct pointer register */
+  type = operandType (result);
+  etype = getSpec (type);
+  /* if left is of type of pointer then it is simple */
+  if (IS_PTR (type) && !IS_FUNC (type->next))
+    {
+      p_type = DCL_TYPE (type);
+    }
+  else
+    {
+      /* we have to go by the storage class */
+      p_type = PTR_TYPE (SPEC_OCLS (etype));
+
+      /*  if (SPEC_OCLS(etype)->codesp ) { */
+      /*      p_type = CPOINTER ;  */
+      /*  } */
+      /*  else */
+      /*      if (SPEC_OCLS(etype)->fmap && !SPEC_OCLS(etype)->paged) */
+      /*    p_type = FPOINTER ; */
+      /*      else */
+      /*    if (SPEC_OCLS(etype)->fmap && SPEC_OCLS(etype)->paged) */
+      /*        p_type = PPOINTER ; */
+      /*    else */
+      /*        if (SPEC_OCLS(etype) == idata ) */
+      /*      p_type = IPOINTER ; */
+      /*        else */
+      /*      p_type = POINTER ; */
+    }
+
+  /* now that we have the pointer type we assign
+     the pointer values */
+  switch (p_type)
+    {
+
+    case POINTER:
     case FPOINTER:
-        genFarPointerSet (right,result,ic);
-        break;
-*/
+      //case IPOINTER:
+      genNearPointerSet (right, result, ic);
+      break;
+      /*
+         case PPOINTER:
+         genPagedPointerSet (right,result,ic);
+         break;
+
+         case FPOINTER:
+         genFarPointerSet (right,result,ic);
+         break;
+       */
     case GPOINTER:
-        genGenPointerSet (right,result,ic);
-        break;
+      genGenPointerSet (right, result, ic);
+      break;
 
     default:
-        werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
-            "genPointerSet: illegal pointer type");
+      werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "genPointerSet: illegal pointer type");
     }
 }
 
 /*-----------------------------------------------------------------*/
 /* genIfx - generate code for Ifx statement                        */
 /*-----------------------------------------------------------------*/
-static void genIfx (iCode *ic, iCode *popIc)
+static void
+genIfx (iCode * ic, iCode * popIc)
 {
-    operand *cond = IC_COND(ic);
-    int isbit =0;
+  operand *cond = IC_COND (ic);
+  int isbit = 0;
 
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-    aopOp(cond,ic,FALSE);
+  aopOp (cond, ic, FALSE);
 
-    /* get the value into acc */
-    if (AOP_TYPE(cond) != AOP_CRY)
-        pic14_toBoolean(cond);
-    else
-        isbit = 1;
+  /* get the value into acc */
+  if (AOP_TYPE (cond) != AOP_CRY)
+    pic14_toBoolean (cond);
+  else
+    isbit = 1;
 
-    /* if there was something to be popped then do it */
-    if (popIc)
-        genIpop(popIc);
+  /* if there was something to be popped then do it */
+  if (popIc)
+    genIpop (popIc);
 
-    if (isbit)
+  if (isbit)
     {
-        /* This assumes that CARRY is set iff cond is true */
-        if (IC_TRUE(ic))
+      /* This assumes that CARRY is set iff cond is true */
+      if (IC_TRUE (ic))
+        {
+          assert (!IC_FALSE (ic));
+          emitpcode (POC_BTFSC, popGet (AOP (cond), 0));
+          //emitSKPNC;
+          emitpcode (POC_GOTO, popGetLabel (IC_TRUE (ic)->key));
+        }
+      else
         {
-            assert (!IC_FALSE(ic));
-            emitpcode(POC_BTFSC, popGet(AOP(cond), 0));
-            //emitSKPNC;
-            emitpcode(POC_GOTO, popGetLabel(IC_TRUE(ic)->key));
-        } else {
-            assert (IC_FALSE(ic));
-            emitpcode(POC_BTFSS, popGet(AOP(cond), 0));
-            //emitSKPC;
-            emitpcode(POC_GOTO, popGetLabel(IC_FALSE(ic)->key));
+          assert (IC_FALSE (ic));
+          emitpcode (POC_BTFSS, popGet (AOP (cond), 0));
+          //emitSKPC;
+          emitpcode (POC_GOTO, popGetLabel (IC_FALSE (ic)->key));
         }
-        if (0)
+      if (0)
         {
-            static int hasWarned = 0;
-            if (!hasWarned)
+          static int hasWarned = 0;
+          if (!hasWarned)
             {
-                fprintf (stderr, "WARNING: using untested code for %s:%u -- please check the .asm output and report bugs.\n", ic->filename, ic->lineno);
-                hasWarned = 1;
+              fprintf (stderr, "WARNING: using untested code for %s:%u -- please check the .asm output and report bugs.\n",
+                       ic->filename, ic->lineno);
+              hasWarned = 1;
             }
         }
     }
-    else
+  else
     {
-        /* now Z is set iff !cond */
-        if (IC_TRUE(ic))
+      /* now Z is set iff !cond */
+      if (IC_TRUE (ic))
+        {
+          assert (!IC_FALSE (ic));
+          emitSKPZ;
+          emitpcode (POC_GOTO, popGetLabel (IC_TRUE (ic)->key));
+        }
+      else
         {
-            assert (!IC_FALSE(ic));
-            emitSKPZ;
-            emitpcode(POC_GOTO, popGetLabel(IC_TRUE(ic)->key));
-        } else {
-            emitSKPNZ;
-            emitpcode(POC_GOTO, popGetLabel(IC_FALSE(ic)->key));
+          emitSKPNZ;
+          emitpcode (POC_GOTO, popGetLabel (IC_FALSE (ic)->key));
         }
     }
 
-    ic->generated = 1;
+  ic->generated = 1;
 
-    /* the result is now in the accumulator */
-    freeAsmop(cond,NULL,ic,TRUE);
+  /* the result is now in the accumulator */
+  freeAsmop (cond, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genAddrOf - generates code for address of                       */
 /*-----------------------------------------------------------------*/
-static void genAddrOf (iCode *ic)
+static void
+genAddrOf (iCode * ic)
 {
-    operand *right, *result, *left;
-    int size, offset ;
+  operand *right, *result, *left;
+  int size, offset;
 
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
 
-    //aopOp(IC_RESULT(ic),ic,FALSE);
+  //aopOp(IC_RESULT(ic),ic,FALSE);
 
-    aopOp((left=IC_LEFT(ic)),ic,FALSE);
-    aopOp((right=IC_RIGHT(ic)),ic,FALSE);
-    aopOp((result=IC_RESULT(ic)),ic,TRUE);
+  aopOp ((left = IC_LEFT (ic)), ic, FALSE);
+  aopOp ((right = IC_RIGHT (ic)), ic, FALSE);
+  aopOp ((result = IC_RESULT (ic)), ic, TRUE);
 
-    DEBUGpic14_AopType(__LINE__,left,right,result);
-    assert (IS_SYMOP (left));
+  DEBUGpic14_AopType (__LINE__, left, right, result);
+  assert (IS_SYMOP (left));
 
-    /* sanity check: generic pointers to code space are not yet supported,
-     * pionters to codespace must not be assigned addresses of __data values. */
- #if 0
-    fprintf (stderr, "result: %s, left: %s\n", OP_SYMBOL(result)->name, OP_SYMBOL(left)->name);
-    fprintf (stderr, "result->type : "); printTypeChain (OP_SYM_TYPE(result), stderr); fprintf (stderr, ", codesp:%d, codeptr:%d, constptr:%d\n", IN_CODESPACE(SPEC_OCLS(getSpec (OP_SYM_TYPE(result)))), IS_CODEPTR(OP_SYM_TYPE(result)), IS_PTR_CONST(OP_SYM_TYPE(result)));
-    fprintf (stderr, "result->etype: "); printTypeChain (OP_SYM_ETYPE(result), stderr); fprintf (stderr, ", codesp:%d, codeptr:%d, constptr:%d\n", IN_CODESPACE(SPEC_OCLS(getSpec (OP_SYM_ETYPE(result)))), IS_CODEPTR(OP_SYM_ETYPE(result)), IS_PTR_CONST(OP_SYM_ETYPE(result)));
-    fprintf (stderr, "left->type   : "); printTypeChain (OP_SYM_TYPE(left), stderr); fprintf (stderr, ", codesp:%d, codeptr:%d, constptr:%d\n", IN_CODESPACE(SPEC_OCLS(getSpec (OP_SYM_TYPE(left)))), IS_CODEPTR(OP_SYM_TYPE(left)), IS_PTR_CONST(OP_SYM_TYPE(left)));
-    fprintf (stderr, "left->etype  : "); printTypeChain (OP_SYM_ETYPE(left), stderr); fprintf (stderr, ", codesp:%d, codeptr:%d, constptr:%d\n",IN_CODESPACE(SPEC_OCLS(getSpec (OP_SYM_ETYPE(left)))), IS_CODEPTR(OP_SYM_ETYPE(left)), IS_PTR_CONST(OP_SYM_ETYPE(left)));
+  /* sanity check: generic pointers to code space are not yet supported,
+   * pionters to codespace must not be assigned addresses of __data values. */
+#if 0
+  fprintf (stderr, "result: %s, left: %s\n", OP_SYMBOL (result)->name, OP_SYMBOL (left)->name);
+  fprintf (stderr, "result->type : ");
+  printTypeChain (OP_SYM_TYPE (result), stderr);
+  fprintf (stderr, ", codesp:%d, codeptr:%d, constptr:%d\n", IN_CODESPACE (SPEC_OCLS (getSpec (OP_SYM_TYPE (result)))),
+           IS_CODEPTR (OP_SYM_TYPE (result)), IS_PTR_CONST (OP_SYM_TYPE (result)));
+  fprintf (stderr, "result->etype: ");
+  printTypeChain (OP_SYM_ETYPE (result), stderr);
+  fprintf (stderr, ", codesp:%d, codeptr:%d, constptr:%d\n", IN_CODESPACE (SPEC_OCLS (getSpec (OP_SYM_ETYPE (result)))),
+           IS_CODEPTR (OP_SYM_ETYPE (result)), IS_PTR_CONST (OP_SYM_ETYPE (result)));
+  fprintf (stderr, "left->type   : ");
+  printTypeChain (OP_SYM_TYPE (left), stderr);
+  fprintf (stderr, ", codesp:%d, codeptr:%d, constptr:%d\n", IN_CODESPACE (SPEC_OCLS (getSpec (OP_SYM_TYPE (left)))),
+           IS_CODEPTR (OP_SYM_TYPE (left)), IS_PTR_CONST (OP_SYM_TYPE (left)));
+  fprintf (stderr, "left->etype  : ");
+  printTypeChain (OP_SYM_ETYPE (left), stderr);
+  fprintf (stderr, ", codesp:%d, codeptr:%d, constptr:%d\n", IN_CODESPACE (SPEC_OCLS (getSpec (OP_SYM_ETYPE (left)))),
+           IS_CODEPTR (OP_SYM_ETYPE (left)), IS_PTR_CONST (OP_SYM_ETYPE (left)));
 #endif
 
-    if (IS_SYMOP(result) && IS_CODEPTR(OP_SYM_TYPE(result)) && !IN_CODESPACE(SPEC_OCLS(getSpec (OP_SYM_TYPE(left))))) {
+  if (IS_SYMOP (result) && IS_CODEPTR (OP_SYM_TYPE (result)) && !IN_CODESPACE (SPEC_OCLS (getSpec (OP_SYM_TYPE (left)))))
+    {
       fprintf (stderr, "trying to assign __code pointer (%s) an address in __data space (&%s) -- expect trouble\n",
-        IS_SYMOP(result) ? OP_SYMBOL(result)->name : "unknown",
-        OP_SYMBOL(left)->name);
-    } else if (IS_SYMOP(result) && !IS_CODEPTR (OP_SYM_TYPE(result)) && IN_CODESPACE(SPEC_OCLS(getSpec(OP_SYM_TYPE(left))))) {
+               IS_SYMOP (result) ? OP_SYMBOL (result)->name : "unknown", OP_SYMBOL (left)->name);
+    }
+  else if (IS_SYMOP (result) && !IS_CODEPTR (OP_SYM_TYPE (result)) && IN_CODESPACE (SPEC_OCLS (getSpec (OP_SYM_TYPE (left)))))
+    {
       fprintf (stderr, "trying to assign __data pointer (%s) an address in __code space (&%s) -- expect trouble\n",
-        IS_SYMOP(result) ? OP_SYMBOL(result)->name : "unknown",
-        OP_SYMBOL(left)->name);
+               IS_SYMOP (result) ? OP_SYMBOL (result)->name : "unknown", OP_SYMBOL (left)->name);
     }
 
-    size = AOP_SIZE(IC_RESULT(ic));
-    if (IS_SYMOP(result) && IS_GENPTR(OP_SYM_TYPE(result))) {
-        /* strip tag */
-        if (size > GPTRSIZE-1) size = GPTRSIZE-1;
+  size = AOP_SIZE (IC_RESULT (ic));
+  if (IS_SYMOP (result) && IS_GENPTR (OP_SYM_TYPE (result)))
+    {
+      /* strip tag */
+      if (size > GPTRSIZE - 1)
+        size = GPTRSIZE - 1;
     }
-    offset = 0;
+  offset = 0;
 
-    while (size--) {
-        /* fixing bug #863624, reported from (errolv) */
-        emitpcode(POC_MOVLW, popGetImmd(OP_SYMBOL(left)->rname, offset, 0, IS_FUNC(OP_SYM_TYPE(left))));
-        emitpcode(POC_MOVWF, popGet(AOP(result), offset));
+  while (size--)
+    {
+      /* fixing bug #863624, reported from (errolv) */
+      emitpcode (POC_MOVLW, popGetImmd (OP_SYMBOL (left)->rname, offset, 0, IS_FUNC (OP_SYM_TYPE (left))));
+      emitpcode (POC_MOVWF, popGet (AOP (result), offset));
 
 #if 0
-        emitpcode(POC_MOVLW, popGet(AOP(left),offset));
-        emitpcode(POC_MOVWF, popGet(AOP(result),offset));
+      emitpcode (POC_MOVLW, popGet (AOP (left), offset));
+      emitpcode (POC_MOVWF, popGet (AOP (result), offset));
 #endif
-        offset++;
+      offset++;
+    }
+
+  if (IS_SYMOP (result) && IS_GENPTR (OP_SYM_TYPE (result)))
+    {
+      /* provide correct tag */
+      int isCode = IN_CODESPACE (SPEC_OCLS (getSpec (OP_SYM_TYPE (left))));
+      emitpcode (POC_MOVLW, popGetLit (isCode ? GPTRTAG_CODE : GPTRTAG_DATA));
+      movwf (AOP (result), 2);
+    }
+
+  freeAsmop (left, NULL, ic, FALSE);
+  freeAsmop (result, NULL, ic, TRUE);
+
+}
+
+/*-----------------------------------------------------------------*/
+/* genAssign - generate code for assignment                        */
+/*-----------------------------------------------------------------*/
+static void
+genAssign (iCode * ic)
+{
+  operand *result, *right;
+  int size, offset, know_W;
+  unsigned long lit = 0L;
+
+  result = IC_RESULT (ic);
+  right = IC_RIGHT (ic);
+
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+
+  /* if they are the same */
+  if (operandsEqu (IC_RESULT (ic), IC_RIGHT (ic)))
+    return;
+
+  aopOp (right, ic, FALSE);
+  aopOp (result, ic, TRUE);
+
+  DEBUGpic14_AopType (__LINE__, NULL, right, result);
+
+  /* if they are the same registers */
+  if (pic14_sameRegs (AOP (right), AOP (result)))
+    goto release;
+
+  /* special case: assign from __code */
+  if (!IS_ITEMP (right)         /* --> iTemps never reside in __code */
+      && IS_SYMOP (right)       /* --> must be an immediate (otherwise we would be in genConstPointerGet) */
+      && !IS_FUNC (OP_SYM_TYPE (right)) /* --> we would want its address instead of the first instruction */
+      && !IS_CODEPTR (OP_SYM_TYPE (right))      /* --> get symbols address instread */
+      && IN_CODESPACE (SPEC_OCLS (getSpec (OP_SYM_TYPE (right)))))
+    {
+      emitpComment ("genAssign from CODESPACE");
+      genConstPointerGet (right, result, ic);
+      goto release;
     }
 
-    if (IS_SYMOP(result) && IS_GENPTR(OP_SYM_TYPE(result)))
+  /* just for symmetry reasons... */
+  if (!IS_ITEMP (result) && IS_SYMOP (result) && IN_CODESPACE (SPEC_OCLS (getSpec (OP_SYM_TYPE (result)))))
     {
-        /* provide correct tag */
-        int isCode = IN_CODESPACE(SPEC_OCLS(getSpec(OP_SYM_TYPE(left))));
-        emitpcode (POC_MOVLW, popGetLit (isCode ? GPTRTAG_CODE : GPTRTAG_DATA));
-        movwf (AOP(result), 2);
+      assert (!"cannot write to CODESPACE");
     }
 
-    freeAsmop(left,NULL,ic,FALSE);
-    freeAsmop(result,NULL,ic,TRUE);
-
-}
-
-/*-----------------------------------------------------------------*/
-/* genAssign - generate code for assignment                        */
-/*-----------------------------------------------------------------*/
-static void genAssign (iCode *ic)
-{
-    operand *result, *right;
-    int size, offset,know_W;
-    unsigned long lit = 0L;
-
-    result = IC_RESULT(ic);
-    right  = IC_RIGHT(ic) ;
-
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  /* if the result is a bit */
+  if (AOP_TYPE (result) == AOP_CRY)
+    {
 
-    /* if they are the same */
-    if (operandsEqu (IC_RESULT(ic),IC_RIGHT(ic)))
-        return ;
+      /* if the right size is a literal then
+         we know what the value is */
+      if (AOP_TYPE (right) == AOP_LIT)
+        {
 
-    aopOp(right,ic,FALSE);
-    aopOp(result,ic,TRUE);
+          emitpcode ((((int) operandLitValue (right)) ? POC_BSF : POC_BCF), popGet (AOP (result), 0));
 
-    DEBUGpic14_AopType(__LINE__,NULL,right,result);
+          if (((int) operandLitValue (right)))
+            pic14_emitcode ("bsf", "(%s >> 3),(%s & 7)", AOP (result)->aopu.aop_dir, AOP (result)->aopu.aop_dir);
+          else
+            pic14_emitcode ("bcf", "(%s >> 3),(%s & 7)", AOP (result)->aopu.aop_dir, AOP (result)->aopu.aop_dir);
+          goto release;
+        }
 
-    /* if they are the same registers */
-    if (pic14_sameRegs(AOP(right),AOP(result)))
-        goto release;
+      /* the right is also a bit variable */
+      if (AOP_TYPE (right) == AOP_CRY)
+        {
+          emitpcode (POC_BCF, popGet (AOP (result), 0));
+          emitpcode (POC_BTFSC, popGet (AOP (right), 0));
+          emitpcode (POC_BSF, popGet (AOP (result), 0));
+
+          pic14_emitcode ("bcf", "(%s >> 3),(%s & 7)", AOP (result)->aopu.aop_dir, AOP (result)->aopu.aop_dir);
+          pic14_emitcode ("btfsc", "(%s >> 3),(%s & 7)", AOP (right)->aopu.aop_dir, AOP (right)->aopu.aop_dir);
+          pic14_emitcode ("bsf", "(%s >> 3),(%s & 7)", AOP (result)->aopu.aop_dir, AOP (result)->aopu.aop_dir);
+          goto release;
+        }
 
-    /* special case: assign from __code */
-    if (!IS_ITEMP(right)                /* --> iTemps never reside in __code */
-        && IS_SYMOP (right)         /* --> must be an immediate (otherwise we would be in genConstPointerGet) */
-        && !IS_FUNC(OP_SYM_TYPE(right))     /* --> we would want its address instead of the first instruction */
-        && !IS_CODEPTR(OP_SYM_TYPE(right))  /* --> get symbols address instread */
-        && IN_CODESPACE (SPEC_OCLS (getSpec (OP_SYM_TYPE(right)))))
-    {
-      emitpComment ("genAssign from CODESPACE");
-      genConstPointerGet (right, result, ic);
+      /* we need to or */
+      emitpcode (POC_BCF, popGet (AOP (result), 0));
+      pic14_toBoolean (right);
+      emitSKPZ;
+      emitpcode (POC_BSF, popGet (AOP (result), 0));
+      //aopPut(AOP(result),"a",0);
       goto release;
     }
 
-    /* just for symmetry reasons... */
-    if (!IS_ITEMP(result)
-        && IS_SYMOP (result)
-        && IN_CODESPACE (SPEC_OCLS (getSpec (OP_SYM_TYPE(result)))))
+  /* bit variables done */
+  /* general case */
+  size = AOP_SIZE (result);
+  offset = 0;
+  if (AOP_TYPE (right) == AOP_DIR && (AOP_TYPE (result) == AOP_REG) && size == 1)
     {
-      assert ( !"cannot write to CODESPACE" );
+      DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+      if (aopIdx (AOP (result), 0) == 4)
+        {
+          DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+          emitpcode (POC_MOVFW, popGet (AOP (right), offset));
+          emitpcode (POC_MOVWF, popGet (AOP (result), offset));
+          goto release;
+        }
+      else
+        DEBUGpic14_emitcode ("; WARNING", "%s  %d ignoring register storage", __FUNCTION__, __LINE__);
     }
 
-    /* if the result is a bit */
-    if (AOP_TYPE(result) == AOP_CRY) {
-
-    /* if the right size is a literal then
-        we know what the value is */
-        if (AOP_TYPE(right) == AOP_LIT) {
+  know_W = -1;
+  while (size--)
+    {
 
-            emitpcode(  ( ((int) operandLitValue(right)) ? POC_BSF : POC_BCF),
-                popGet(AOP(result),0));
+      DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+      if (AOP_TYPE (right) == AOP_LIT)
+        {
+          lit = (unsigned long) pic14aopLiteral (AOP (right)->aopu.aop_lit, offset) & 0x0ff;
+          if (lit & 0xff)
+            {
+              if (know_W != (int) (lit & 0xff))
+                emitpcode (POC_MOVLW, popGetLit (lit & 0xff));
+              know_W = lit & 0xff;
+              emitpcode (POC_MOVWF, popGet (AOP (result), offset));
+            }
+          else
+            emitpcode (POC_CLRF, popGet (AOP (result), offset));
 
-            if (((int) operandLitValue(right)))
-                pic14_emitcode("bsf","(%s >> 3),(%s & 7)",
-                AOP(result)->aopu.aop_dir,
-                AOP(result)->aopu.aop_dir);
-            else
-                pic14_emitcode("bcf","(%s >> 3),(%s & 7)",
-                AOP(result)->aopu.aop_dir,
-                AOP(result)->aopu.aop_dir);
-            goto release;
-        }
-
-        /* the right is also a bit variable */
-        if (AOP_TYPE(right) == AOP_CRY) {
-            emitpcode(POC_BCF,    popGet(AOP(result),0));
-            emitpcode(POC_BTFSC,  popGet(AOP(right),0));
-            emitpcode(POC_BSF,    popGet(AOP(result),0));
-
-            pic14_emitcode("bcf","(%s >> 3),(%s & 7)",
-                AOP(result)->aopu.aop_dir,
-                AOP(result)->aopu.aop_dir);
-            pic14_emitcode("btfsc","(%s >> 3),(%s & 7)",
-                AOP(right)->aopu.aop_dir,
-                AOP(right)->aopu.aop_dir);
-            pic14_emitcode("bsf","(%s >> 3),(%s & 7)",
-                AOP(result)->aopu.aop_dir,
-                AOP(result)->aopu.aop_dir);
-            goto release ;
-        }
-
-        /* we need to or */
-        emitpcode(POC_BCF,    popGet(AOP(result),0));
-        pic14_toBoolean(right);
-        emitSKPZ;
-        emitpcode(POC_BSF,    popGet(AOP(result),0));
-        //aopPut(AOP(result),"a",0);
-        goto release ;
-    }
-
-    /* bit variables done */
-    /* general case */
-    size = AOP_SIZE(result);
-    offset = 0 ;
-    if( AOP_TYPE(right) == AOP_DIR  && (AOP_TYPE(result) == AOP_REG) && size==1)  {
-        DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-        if(aopIdx(AOP(result),0) == 4) {
-            DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-            emitpcode(POC_MOVFW, popGet(AOP(right),offset));
-            emitpcode(POC_MOVWF, popGet(AOP(result),offset));
-            goto release;
-        } else
-            DEBUGpic14_emitcode ("; WARNING","%s  %d ignoring register storage",__FUNCTION__,__LINE__);
-    }
-
-    know_W=-1;
-    while (size--) {
-
-        DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-        if(AOP_TYPE(right) == AOP_LIT) {
-            lit = (unsigned long)pic14aopLiteral(AOP(right)->aopu.aop_lit, offset) & 0x0ff;
-            if(lit&0xff) {
-                if(know_W != (int)(lit&0xff))
-                    emitpcode(POC_MOVLW,popGetLit(lit&0xff));
-                know_W = lit&0xff;
-                emitpcode(POC_MOVWF, popGet(AOP(result),offset));
-            } else
-                emitpcode(POC_CLRF, popGet(AOP(result),offset));
-
-        } else if (AOP_TYPE(right) == AOP_CRY) {
-            emitpcode(POC_CLRF, popGet(AOP(result),offset));
-            if(offset == 0) {
-                emitpcode(POC_BTFSS, popGet(AOP(right),0));
-                emitpcode(POC_INCF, popGet(AOP(result),0));
-            }
-        } else {
-            mov2w_op (right, offset);
-            emitpcode(POC_MOVWF, popGet(AOP(result),offset));
+        }
+      else if (AOP_TYPE (right) == AOP_CRY)
+        {
+          emitpcode (POC_CLRF, popGet (AOP (result), offset));
+          if (offset == 0)
+            {
+              emitpcode (POC_BTFSS, popGet (AOP (right), 0));
+              emitpcode (POC_INCF, popGet (AOP (result), 0));
+            }
+        }
+      else
+        {
+          mov2w_op (right, offset);
+          emitpcode (POC_MOVWF, popGet (AOP (result), offset));
         }
 
-        offset++;
+      offset++;
     }
 
 
 release:
-    freeAsmop (right,NULL,ic,FALSE);
-    freeAsmop (result,NULL,ic,TRUE);
+  freeAsmop (right, NULL, ic, FALSE);
+  freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genJumpTab - genrates code for jump table                       */
 /*-----------------------------------------------------------------*/
-static void genJumpTab (iCode *ic)
+static void
+genJumpTab (iCode * ic)
 {
-    symbol *jtab;
-    char *l;
+  symbol *jtab;
+  char *l;
 
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-    aopOp(IC_JTCOND(ic),ic,FALSE);
-    /* get the condition into accumulator */
-    l = aopGet(AOP(IC_JTCOND(ic)),0,FALSE,FALSE);
-    MOVA(l);
-    /* multiply by three */
-    pic14_emitcode("add","a,acc");
-    pic14_emitcode("add","a,%s",aopGet(AOP(IC_JTCOND(ic)),0,FALSE,FALSE));
-
-    jtab = newiTempLabel(NULL);
-    pic14_emitcode("mov","dptr,#%05d_DS_",jtab->key+100);
-    pic14_emitcode("jmp","@a+dptr");
-    pic14_emitcode("","%05d_DS_:",jtab->key+100);
-
-    emitpcode(POC_MOVLW, popGetHighLabel(jtab->key));
-    emitpcode(POC_MOVWF, popCopyReg(&pc_pclath));
-    emitpcode(POC_MOVLW, popGetLabel(jtab->key));
-    emitpcode(POC_ADDFW, popGet(AOP(IC_JTCOND(ic)),0));
-    emitSKPNC;
-    emitpcode(POC_INCF, popCopyReg(&pc_pclath));
-    emitpcode(POC_MOVWF, popCopyReg(&pc_pcl));
-    emitpLabel(jtab->key);
-
-    freeAsmop(IC_JTCOND(ic),NULL,ic,TRUE);
-
-    /* now generate the jump labels */
-    for (jtab = setFirstItem(IC_JTLABELS(ic)) ; jtab;
-    jtab = setNextItem(IC_JTLABELS(ic))) {
-        pic14_emitcode("ljmp","%05d_DS_",jtab->key+100);
-        emitpcode(POC_GOTO,popGetLabel(jtab->key));
+  aopOp (IC_JTCOND (ic), ic, FALSE);
+  /* get the condition into accumulator */
+  l = aopGet (AOP (IC_JTCOND (ic)), 0, FALSE, FALSE);
+  MOVA (l);
+  /* multiply by three */
+  pic14_emitcode ("add", "a,acc");
+  pic14_emitcode ("add", "a,%s", aopGet (AOP (IC_JTCOND (ic)), 0, FALSE, FALSE));
+
+  jtab = newiTempLabel (NULL);
+  pic14_emitcode ("mov", "dptr,#%05d_DS_", labelKey2num (jtab->key));
+  pic14_emitcode ("jmp", "@a+dptr");
+  pic14_emitcode ("", "%05d_DS_:", labelKey2num (jtab->key));
+
+  emitpcode (POC_MOVLW, popGetHighLabel (jtab->key));
+  emitpcode (POC_MOVWF, popCopyReg (&pc_pclath));
+  emitpcode (POC_MOVLW, popGetLabel (jtab->key));
+  emitpcode (POC_ADDFW, popGet (AOP (IC_JTCOND (ic)), 0));
+  emitSKPNC;
+  emitpcode (POC_INCF, popCopyReg (&pc_pclath));
+  emitpcode (POC_MOVWF, popCopyReg (&pc_pcl));
+  emitpLabel (jtab->key);
+
+  freeAsmop (IC_JTCOND (ic), NULL, ic, TRUE);
+
+  /* now generate the jump labels */
+  for (jtab = setFirstItem (IC_JTLABELS (ic)); jtab; jtab = setNextItem (IC_JTLABELS (ic)))
+    {
+      pic14_emitcode ("ljmp", "%05d_DS_", labelKey2num (jtab->key));
+      emitpcode (POC_GOTO, popGetLabel (jtab->key));
 
     }
 
@@ -6622,272 +7089,287 @@
 /*-----------------------------------------------------------------*/
 /* genCast - gen code for casting                                  */
 /*-----------------------------------------------------------------*/
-static void genCast (iCode *ic)
+static void
+genCast (iCode * ic)
 {
-    operand *result = IC_RESULT(ic);
-    sym_link *restype = operandType(result);
-    sym_link *rtype = operandType(IC_RIGHT(ic));
-    operand *right = IC_RIGHT(ic);
-    int size, offset ;
+  operand *result = IC_RESULT (ic);
+  sym_link *restype = operandType (result);
+  sym_link *rtype = operandType (IC_RIGHT (ic));
+  operand *right = IC_RIGHT (ic);
+  int size, offset;
 
-    FENTRY;
-    DEBUGpic14_emitcode("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* if they are equivalent then do nothing */
-    if (operandsEqu(IC_RESULT(ic),IC_RIGHT(ic)))
-        return ;
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  /* if they are equivalent then do nothing */
+  if (operandsEqu (IC_RESULT (ic), IC_RIGHT (ic)))
+    return;
 
-    aopOp(right,ic,FALSE) ;
-    aopOp(result,ic,FALSE);
+  aopOp (right, ic, FALSE);
+  aopOp (result, ic, FALSE);
 
-    DEBUGpic14_AopType(__LINE__,NULL,right,result);
+  DEBUGpic14_AopType (__LINE__, NULL, right, result);
 
-    /* if the result is a bit */
-    if (AOP_TYPE(result) == AOP_CRY) {
-        assert(!"assigning to bit variables is not supported");
+  /* if the result is a bit */
+  if (AOP_TYPE (result) == AOP_CRY)
+    {
+      assert (!"assigning to bit variables is not supported");
     }
 
-    if ((AOP_TYPE(right) == AOP_CRY) && (AOP_TYPE(result) == AOP_REG)) {
-        int offset = 1;
-        size = AOP_SIZE(result);
+  if ((AOP_TYPE (right) == AOP_CRY) && (AOP_TYPE (result) == AOP_REG))
+    {
+      int offset = 1;
+      size = AOP_SIZE (result);
 
-        DEBUGpic14_emitcode("; ***","%s  %d",__FUNCTION__,__LINE__);
+      DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-        emitpcode(POC_CLRF,   popGet(AOP(result),0));
-        emitpcode(POC_BTFSC,  popGet(AOP(right),0));
-        emitpcode(POC_INCF,   popGet(AOP(result),0));
+      emitpcode (POC_CLRF, popGet (AOP (result), 0));
+      emitpcode (POC_BTFSC, popGet (AOP (right), 0));
+      emitpcode (POC_INCF, popGet (AOP (result), 0));
 
-        while (size--)
-            emitpcode(POC_CLRF,   popGet(AOP(result),offset++));
+      while (size--)
+        emitpcode (POC_CLRF, popGet (AOP (result), offset++));
 
-        goto release;
+      goto release;
+    }
+
+  if (IS_BOOL (operandType (result)))
+    {
+      pic14_toBoolean (right);
+      emitSKPNZ;
+      emitpcode (POC_MOVLW, popGetLit (1));
+      emitpcode (POC_MOVWF, popGet (AOP (result), 0));
+      goto release;
     }
-    
-    if (IS_BOOL(operandType(result)))
-        {
-          pic14_toBoolean (right);
-          emitSKPNZ;
-          emitpcode(POC_MOVLW, popGetLit(1));
-          emitpcode(POC_MOVWF, popGet(AOP(result),0));
-          goto release;
-        }
 
-    if (IS_PTR(restype))
+  if (IS_PTR (restype))
     {
-      operand *result = IC_RESULT(ic);
+      operand *result = IC_RESULT (ic);
       //operand *left = IC_LEFT(ic);
-      operand *right = IC_RIGHT(ic);
+      operand *right = IC_RIGHT (ic);
       int tag = 0xff;
 
       /* copy common part */
-      int max, size = AOP_SIZE(result);
-      if (size > AOP_SIZE(right)) size = AOP_SIZE(right);
-      DEBUGpic14_emitcode("; ***","%s  %d",__FUNCTION__,__LINE__);
+      int max, size = AOP_SIZE (result);
+      if (size > AOP_SIZE (right))
+        size = AOP_SIZE (right);
+      DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
       /* warn if we discard generic opinter tag */
-      if (!IS_GENPTR(restype) && IS_GENPTR(rtype) && (AOP_SIZE(result) < AOP_SIZE(right)))
-      {
-        //fprintf (stderr, "%s:%u: discarding generic pointer type tag\n", __FUNCTION__, __LINE__);
-      } // if
+      if (!IS_GENPTR (restype) && IS_GENPTR (rtype) && (AOP_SIZE (result) < AOP_SIZE (right)))
+        {
+          //fprintf (stderr, "%s:%u: discarding generic pointer type tag\n", __FUNCTION__, __LINE__);
+        }                       // if
 
       max = size;
       while (size--)
-      {
-        mov2w_op (right, size);
-        movwf (AOP(result), size);
-      } // while
+        {
+          mov2w_op (right, size);
+          movwf (AOP (result), size);
+        }                       // while
 
       /* upcast into generic pointer type? */
-      if (IS_GENPTR(restype)
-        && (size < AOP_SIZE(result))
-        && (!IS_GENPTR(rtype) || AOP_SIZE(right) < GPTRSIZE))
-      {
-        //fprintf (stderr, "%s:%u: must determine pointer type\n", __FUNCTION__, __LINE__);
-        if (IS_PTR(rtype))
+      if (IS_GENPTR (restype) && (size < AOP_SIZE (result)) && (!IS_GENPTR (rtype) || AOP_SIZE (right) < GPTRSIZE))
         {
-          switch (DCL_TYPE(rtype))
-          {
-          case POINTER: /* __data */
-          case FPOINTER:    /* __data */
-        assert (AOP_SIZE(right) == 2);
-        tag = GPTRTAG_DATA;
-        break;
+          //fprintf (stderr, "%s:%u: must determine pointer type\n", __FUNCTION__, __LINE__);
+          if (IS_PTR (rtype))
+            {
+              switch (DCL_TYPE (rtype))
+                {
+                case POINTER:  /* __data */
+                case FPOINTER: /* __data */
+                  assert (AOP_SIZE (right) == 2);
+                  tag = GPTRTAG_DATA;
+                  break;
 
-          case CPOINTER:    /* __code */
-        assert (AOP_SIZE(right) == 2);
-        tag = GPTRTAG_CODE;
-        break;
+                case CPOINTER: /* __code */
+                  assert (AOP_SIZE (right) == 2);
+                  tag = GPTRTAG_CODE;
+                  break;
 
-          case GPOINTER:    /* unknown destination, __data or __code */
-        /* assume __data space (address of immediate) */
-        assert (AOP_TYPE(right) == AOP_PCODE && AOP(right)->aopu.pcop->type == PO_IMMEDIATE);
-        if (AOP(right)->code)
-          tag = GPTRTAG_CODE;
-        else
-          tag = GPTRTAG_DATA;
-        break;
+                case GPOINTER: /* unknown destination, __data or __code */
+                  /* assume __data space (address of immediate) */
+                  assert (AOP_TYPE (right) == AOP_PCODE && AOP (right)->aopu.pcop->type == PO_IMMEDIATE);
+                  if (AOP (right)->code)
+                    tag = GPTRTAG_CODE;
+                  else
+                    tag = GPTRTAG_DATA;
+                  break;
+
+                default:
+                  assert (!"unhandled pointer type");
+                }               // switch
+            }
+          else
+            {
+              /* convert other values into pointers to __data space */
+              tag = GPTRTAG_DATA;
+            }
 
-          default:
-        assert (!"unhandled pointer type");
-          } // switch
-        } else {
-          /* convert other values into pointers to __data space */
-          tag = GPTRTAG_DATA;
-        }
-
-        assert (AOP_SIZE(result) == 3);
-        if (tag == 0) {
-          emitpcode(POC_CLRF, popGet(AOP(result), 2));
-        } else {
-          emitpcode(POC_MOVLW, popGetLit(tag));
-          movwf(AOP(result), 2);
-        }
-      } else {
-        addSign(result, max, 0);
-      } // if
+          assert (AOP_SIZE (result) == 3);
+          if (tag == 0)
+            {
+              emitpcode (POC_CLRF, popGet (AOP (result), 2));
+            }
+          else
+            {
+              emitpcode (POC_MOVLW, popGetLit (tag));
+              movwf (AOP (result), 2);
+            }
+        }
+      else
+        {
+          addSign (result, max, 0);
+        }                       // if
       goto release;
     }
 
-    /* if they are the same size : or less */
-    if (AOP_SIZE(result) <= AOP_SIZE(right)) {
+  /* if they are the same size : or less */
+  if (AOP_SIZE (result) <= AOP_SIZE (right))
+    {
+
+      /* if they are in the same place */
+      if (pic14_sameRegs (AOP (right), AOP (result)))
+        goto release;
+
+      DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+      if (IS_PTR_CONST (rtype))
+        DEBUGpic14_emitcode ("; ***", "%d - right is const pointer", __LINE__);
+      if (IS_PTR_CONST (operandType (IC_RESULT (ic))))
+        DEBUGpic14_emitcode ("; ***", "%d - result is const pointer", __LINE__);
+
+      if ((AOP_TYPE (right) == AOP_PCODE) && AOP (right)->aopu.pcop->type == PO_IMMEDIATE)
+        {
+          emitpcode (POC_MOVLW, popGetAddr (AOP (right), 0, 0));
+          emitpcode (POC_MOVWF, popGet (AOP (result), 0));
+          emitpcode (POC_MOVLW, popGetAddr (AOP (right), 1, 0));
+          emitpcode (POC_MOVWF, popGet (AOP (result), 1));
+          if (AOP_SIZE (result) < 2)
+            fprintf (stderr, "%d -- result is not big enough to hold a ptr\n", __LINE__);
+
+        }
+      else
+        {
+
+          /* if they in different places then copy */
+          size = AOP_SIZE (result);
+          offset = 0;
+          while (size--)
+            {
+              emitpcode (POC_MOVFW, popGet (AOP (right), offset));
+              emitpcode (POC_MOVWF, popGet (AOP (result), offset));
 
-        /* if they are in the same place */
-        if (pic14_sameRegs(AOP(right),AOP(result)))
-            goto release;
-
-        DEBUGpic14_emitcode("; ***","%s  %d",__FUNCTION__,__LINE__);
-        if (IS_PTR_CONST(rtype))
-            DEBUGpic14_emitcode ("; ***","%d - right is const pointer",__LINE__);
-        if (IS_PTR_CONST(operandType(IC_RESULT(ic))))
-            DEBUGpic14_emitcode ("; ***","%d - result is const pointer",__LINE__);
-
-        if ((AOP_TYPE(right) == AOP_PCODE) && AOP(right)->aopu.pcop->type == PO_IMMEDIATE) {
-            emitpcode(POC_MOVLW, popGetAddr(AOP(right),0,0));
-            emitpcode(POC_MOVWF, popGet(AOP(result),0));
-            emitpcode(POC_MOVLW, popGetAddr(AOP(right),1,0));
-            emitpcode(POC_MOVWF, popGet(AOP(result),1));
-            if(AOP_SIZE(result) <2)
-                fprintf(stderr,"%d -- result is not big enough to hold a ptr\n",__LINE__);
-
-        } else {
-
-            /* if they in different places then copy */
-            size = AOP_SIZE(result);
-            offset = 0 ;
-            while (size--) {
-                emitpcode(POC_MOVFW, popGet(AOP(right),offset));
-                emitpcode(POC_MOVWF, popGet(AOP(result),offset));
-
-                //aopPut(AOP(result),
-                // aopGet(AOP(right),offset,FALSE,FALSE),
-                // offset);
+              //aopPut(AOP(result),
+              // aopGet(AOP(right),offset,FALSE,FALSE),
+              // offset);
 
-                offset++;
+              offset++;
             }
         }
-        goto release;
+      goto release;
     }
 
-    /* so we now know that the size of destination is greater
-    than the size of the source. */
+  /* so we now know that the size of destination is greater
+     than the size of the source. */
 
-    /* we move to result for the size of source */
-    size = AOP_SIZE(right);
-    offset = 0 ;
-    while (size--) {
-        emitpcode(POC_MOVFW,   popGet(AOP(right),offset));
-        emitpcode(POC_MOVWF,   popGet(AOP(result),offset));
-        offset++;
+  /* we move to result for the size of source */
+  size = AOP_SIZE (right);
+  offset = 0;
+  while (size--)
+    {
+      emitpcode (POC_MOVFW, popGet (AOP (right), offset));
+      emitpcode (POC_MOVWF, popGet (AOP (result), offset));
+      offset++;
     }
 
-    addSign (result, AOP_SIZE(right), !SPEC_USIGN(rtype));
+  addSign (result, AOP_SIZE (right), !SPEC_USIGN (rtype));
 
 release:
-    freeAsmop(right,NULL,ic,TRUE);
-    freeAsmop(result,NULL,ic,TRUE);
+  freeAsmop (right, NULL, ic, TRUE);
+  freeAsmop (result, NULL, ic, TRUE);
 
 }
 
 /*-----------------------------------------------------------------*/
 /* genDjnz - generate decrement & jump if not zero instrucion      */
 /*-----------------------------------------------------------------*/
-static int genDjnz (iCode *ic, iCode *ifx)
+static int
+genDjnz (iCode * ic, iCode * ifx)
 {
-    symbol *lbl, *lbl1;
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
-    if (!ifx)
-        return 0;
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-        /* if the if condition has a false label
-    then we cannot save */
-    if (IC_FALSE(ifx))
-        return 0;
+  if (!ifx)
+    return 0;
 
-        /* if the minus is not of the form
-    a = a - 1 */
-    if (!isOperandEqual(IC_RESULT(ic),IC_LEFT(ic)) ||
-        !IS_OP_LITERAL(IC_RIGHT(ic)))
-        return 0;
+  /* if the if condition has a false label
+     then we cannot save */
+  if (IC_FALSE (ifx))
+    return 0;
 
-    if (operandLitValue(IC_RIGHT(ic)) != 1)
-        return 0;
+  /* if the minus is not of the form
+     a = a - 1 */
+  if (!isOperandEqual (IC_RESULT (ic), IC_LEFT (ic)) || !IS_OP_LITERAL (IC_RIGHT (ic)))
+    return 0;
 
-        /* if the size of this greater than one then no
-    saving */
-    if (getSize(operandType(IC_RESULT(ic))) > 1)
-        return 0;
+  if (operandLitValue (IC_RIGHT (ic)) != 1)
+    return 0;
 
-    /* otherwise we can save BIG */
-    lbl = newiTempLabel(NULL);
-    lbl1= newiTempLabel(NULL);
+  /* if the size of this greater than one then no
+     saving */
+  if (getSize (operandType (IC_RESULT (ic))) > 1)
+    return 0;
 
-    aopOp(IC_RESULT(ic),ic,FALSE);
+  /* otherwise we can save BIG */
+  aopOp (IC_RESULT (ic), ic, FALSE);
 
-    emitpcode(POC_DECFSZ,popGet(AOP(IC_RESULT(ic)),0));
-    emitpcode(POC_GOTO,popGetLabel(IC_TRUE(ifx)->key));
+  emitpcode (POC_DECFSZ, popGet (AOP (IC_RESULT (ic)), 0));
+  emitpcode (POC_GOTO, popGetLabel (IC_TRUE (ifx)->key));
 
-    freeAsmop(IC_RESULT(ic),NULL,ic,TRUE);
-    ifx->generated = 1;
-    return 1;
+  freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
+  ifx->generated = 1;
+  return 1;
 }
 
 /*-----------------------------------------------------------------*/
 /* genReceive - generate code for a receive iCode                  */
 /*-----------------------------------------------------------------*/
-static void genReceive (iCode *ic)
+static void
+genReceive (iCode * ic)
 {
-    FENTRY;
-    DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  FENTRY;
+  DEBUGpic14_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+
+  if (isOperandInFarSpace (IC_RESULT (ic)) && (OP_SYMBOL (IC_RESULT (ic))->isspilt || IS_TRUE_SYMOP (IC_RESULT (ic))))
+    {
+
+      int size = getSize (operandType (IC_RESULT (ic)));
+      int offset = fReturnSizePic - size;
+      while (size--)
+        {
+          pic14_emitcode ("push", "%s", (strcmp (fReturn[fReturnSizePic - offset - 1], "a") ?
+                                         fReturn[fReturnSizePic - offset - 1] : "acc"));
+          offset++;
+        }
+      aopOp (IC_RESULT (ic), ic, FALSE);
+      size = AOP_SIZE (IC_RESULT (ic));
+      offset = 0;
+      while (size--)
+        {
+          pic14_emitcode ("pop", "acc");
+          aopPut (AOP (IC_RESULT (ic)), "a", offset++);
+        }
 
-    if (isOperandInFarSpace(IC_RESULT(ic)) &&
-        ( OP_SYMBOL(IC_RESULT(ic))->isspilt ||
-        IS_TRUE_SYMOP(IC_RESULT(ic))) ) {
-
-        int size = getSize(operandType(IC_RESULT(ic)));
-        int offset =  fReturnSizePic - size;
-        while (size--) {
-            pic14_emitcode ("push","%s", (strcmp(fReturn[fReturnSizePic - offset - 1],"a") ?
-                fReturn[fReturnSizePic - offset - 1] : "acc"));
-            offset++;
-        }
-        aopOp(IC_RESULT(ic),ic,FALSE);
-        size = AOP_SIZE(IC_RESULT(ic));
-        offset = 0;
-        while (size--) {
-            pic14_emitcode ("pop","acc");
-            aopPut (AOP(IC_RESULT(ic)),"a",offset++);
-        }
-
-    } else {
-        _G.accInUse++;
-        aopOp(IC_RESULT(ic),ic,FALSE);
-        _G.accInUse--;
-        GpsuedoStkPtr = ic->parmBytes; // address used arg on stack
-        assignResultValue(IC_RESULT(ic));
+    }
+  else
+    {
+      _G.accInUse++;
+      aopOp (IC_RESULT (ic), ic, FALSE);
+      _G.accInUse--;
+      GpsuedoStkPtr = ic->parmBytes;    // address used arg on stack
+      assignResultValue (IC_RESULT (ic));
     }
 
-    freeAsmop(IC_RESULT(ic),NULL,ic,TRUE);
+  freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
@@ -6896,11 +7378,11 @@
 static void
 genDummyRead (iCode * ic)
 {
-    FENTRY;
-    pic14_emitcode ("; genDummyRead","");
-    pic14_emitcode ("; not implemented","");
+  FENTRY;
+  pic14_emitcode ("; genDummyRead", "");
+  pic14_emitcode ("; not implemented", "");
 
-    ic = ic;
+  ic = ic;
 }
 
 /*-----------------------------------------------------------------*/
@@ -6915,294 +7397,314 @@
 * peep hole optimizer and the pCode optimizer.
 *-----------------------------------------------------------------*/
 
-void genpic14Code (iCode *lic)
+void
+genpic14Code (iCode * lic)
 {
-    iCode *ic;
-    int cln = 0;
-    const char *cline;
+  iCode *ic;
+  int cln = 0;
+  const char *cline;
 
-    FENTRY;
-    lineHead = lineCurr = NULL;
+  FENTRY;
 
-    pb = newpCodeChain(GcurMemmap,0,newpCodeCharP("; Starting pCode block"));
-    addpBlock(pb);
+  pb = newpCodeChain (GcurMemmap, 0, newpCodeCharP ("; Starting pCode block"));
+  addpBlock (pb);
 
-    /* if debug information required */
-    if (options.debug && debugFile && currFunc) {
-        debugFile->writeFunction (currFunc, lic);
+  /* if debug information required */
+  if (options.debug && debugFile && currFunc)
+    {
+      debugFile->writeFunction (currFunc, lic);
     }
 
 
-    for (ic = lic ; ic ; ic = ic->next ) {
+  for (ic = lic; ic; ic = ic->next)
+    {
+      initGenLineElement ();
 
-        //DEBUGpic14_emitcode(";ic","");
-        //fprintf (stderr, "in ic loop\n");
-        //pic14_emitcode ("", ";\t%s:%d: %s", ic->filename,
-        //ic->lineno, printCLine(ic->filename, ic->lineno));
+      //DEBUGpic14_emitcode(";ic","");
+      //fprintf (stderr, "in ic loop\n");
+      //pic14_emitcode ("", ";\t%s:%d: %s", ic->filename,
+      //ic->lineno, printCLine(ic->filename, ic->lineno));
 
-        if (!options.noCcodeInAsm && (cln != ic->lineno)) {
+      if (!options.noCcodeInAsm && (cln != ic->lineno))
+        {
           cln = ic->lineno;
           //fprintf (stderr, "%s\n", printCLine (ic->filename, ic->lineno));
           cline = printCLine (ic->filename, ic->lineno);
-          if (!cline || strlen (cline) == 0) cline = printCLine (ic->filename, ic->lineno);
+          if (!cline || strlen (cline) == 0)
+            cline = printCLine (ic->filename, ic->lineno);
           addpCode2pBlock (pb, newpCodeCSource (ic->lineno, ic->filename, cline));
           //emitpComment ("[C-SRC] %s:%d: %s", ic->filename, cln, cline);
         }
 
-        if (options.iCodeInAsm) {
-          const char *iLine = printILine(ic);
+      if (options.iCodeInAsm)
+        {
+          const char *iLine = printILine (ic);
           emitpComment ("[ICODE] %s:%d: %s", ic->filename, ic->lineno, printILine (ic));
-                  dbuf_free(iLine);
+          dbuf_free (iLine);
         }
-        /* if the result is marked as
-        spilt and rematerializable or code for
-        this has already been generated then
-        do nothing */
-        if (resultRemat(ic) || ic->generated )
-            continue ;
-
-        /* depending on the operation */
-        switch (ic->op) {
-        case '!' :
-            genNot(ic);
-            break;
+      /* if the result is marked as
+         spilt and rematerializable or code for
+         this has already been generated then
+         do nothing */
+      if (resultRemat (ic) || ic->generated)
+        continue;
 
-        case '~' :
-            genCpl(ic);
-            break;
+      /* depending on the operation */
+      switch (ic->op)
+        {
+        case '!':
+          genNot (ic);
+          break;
+
+        case '~':
+          genCpl (ic);
+          break;
 
         case UNARYMINUS:
-            genUminus (ic);
-            break;
+          genUminus (ic);
+          break;
 
         case IPUSH:
-            genIpush (ic);
-            break;
+          genIpush (ic);
+          break;
 
         case IPOP:
-            /* IPOP happens only when trying to restore a
-            spilt live range, if there is an ifx statement
-            following this pop then the if statement might
-            be using some of the registers being popped which
-            would destory the contents of the register so
-            we need to check for this condition and handle it */
-            if (ic->next            &&
-                ic->next->op == IFX &&
-                regsInCommon(IC_LEFT(ic),IC_COND(ic->next)))
-                genIfx (ic->next,ic);
-            else
-                genIpop (ic);
-            break;
+          /* IPOP happens only when trying to restore a
+             spilt live range, if there is an ifx statement
+             following this pop then the if statement might
+             be using some of the registers being popped which
+             would destory the contents of the register so
+             we need to check for this condition and handle it */
+          if (ic->next && ic->next->op == IFX && regsInCommon (IC_LEFT (ic), IC_COND (ic->next)))
+            genIfx (ic->next, ic);
+          else
+            genIpop (ic);
+          break;
 
         case CALL:
-            genCall (ic);
-            break;
+          genCall (ic);
+          break;
 
         case PCALL:
-            genPcall (ic);
-            break;
+          genPcall (ic);
+          break;
 
         case FUNCTION:
-            genFunction (ic);
-            break;
+          genFunction (ic);
+          break;
 
         case ENDFUNCTION:
-            genEndFunction (ic);
-            break;
+          genEndFunction (ic);
+          break;
 
         case RETURN:
-            genRet (ic);
-            break;
+          genRet (ic);
+          break;
 
         case LABEL:
-            genLabel (ic);
-            break;
+          genLabel (ic);
+          break;
 
         case GOTO:
-            genGoto (ic);
-            break;
+          genGoto (ic);
+          break;
 
-        case '+' :
-            genPlus (ic) ;
-            break;
+        case '+':
+          genPlus (ic);
+          break;
 
-        case '-' :
-            if ( ! genDjnz (ic,ifxForOp(IC_RESULT(ic),ic)))
-                genMinus (ic);
-            break;
+        case '-':
+          if (!genDjnz (ic, ifxForOp (IC_RESULT (ic), ic)))
+            genMinus (ic);
+          break;
 
-        case '*' :
-            genMult (ic);
-            break;
+        case '*':
+          genMult (ic);
+          break;
 
-        case '/' :
-            genDiv (ic) ;
-            break;
+        case '/':
+          genDiv (ic);
+          break;
 
-        case '%' :
-            genMod (ic);
-            break;
+        case '%':
+          genMod (ic);
+          break;
 
-        case '>' :
-            genCmpGt (ic,ifxForOp(IC_RESULT(ic),ic));
-            break;
+        case '>':
+          genCmpGt (ic, ifxForOp (IC_RESULT (ic), ic));
+          break;
 
-        case '<' :
-            genCmpLt (ic,ifxForOp(IC_RESULT(ic),ic));
-            break;
+        case '<':
+          genCmpLt (ic, ifxForOp (IC_RESULT (ic), ic));
+          break;
 
         case LE_OP:
         case GE_OP:
         case NE_OP:
 
-            /* note these two are xlated by algebraic equivalence
-            during parsing SDCC.y */
-            werror(E_INTERNAL_ERROR,__FILE__,__LINE__,
-                "got '>=' or '<=' shouldn't have come here");
-            break;
+          /* note these two are xlated by algebraic equivalence
+             during parsing SDCC.y */
+          werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "got '>=' or '<=' shouldn't have come here");
+          break;
 
         case EQ_OP:
-            genCmpEq (ic,ifxForOp(IC_RESULT(ic),ic));
-            break;
+          genCmpEq (ic, ifxForOp (IC_RESULT (ic), ic));
+          break;
 
         case AND_OP:
-            genAndOp (ic);
-            break;
+          genAndOp (ic);
+          break;
 
         case OR_OP:
-            genOrOp (ic);
-            break;
+          genOrOp (ic);
+          break;
 
-        case '^' :
-            genXor (ic,ifxForOp(IC_RESULT(ic),ic));
-            break;
+        case '^':
+          genXor (ic, ifxForOp (IC_RESULT (ic), ic));
+          break;
 
-        case '|' :
-            genOr (ic,ifxForOp(IC_RESULT(ic),ic));
-            break;
+        case '|':
+          genOr (ic, ifxForOp (IC_RESULT (ic), ic));
+          break;
 
         case BITWISEAND:
-            genAnd (ic,ifxForOp(IC_RESULT(ic),ic));
-            break;
+          genAnd (ic, ifxForOp (IC_RESULT (ic), ic));
+          break;
 
         case INLINEASM:
-            genInline (ic);
-            break;
+          pic14_genInline (ic);
+          break;
 
         case RRC:
-            genRRC (ic);
-            break;
+          genRRC (ic);
+          break;
 
         case RLC:
-            genRLC (ic);
-            break;
+          genRLC (ic);
+          break;
+
+        case GETABIT:
+          genGetABit (ic);
+          break;
 
         case GETHBIT:
-            genGetHbit (ic);
-            break;
+          genGetHbit (ic);
+          break;
 
         case LEFT_OP:
-            genLeftShift (ic);
-            break;
+          genLeftShift (ic);
+          break;
 
         case RIGHT_OP:
-            genRightShift (ic);
-            break;
+          genRightShift (ic);
+          break;
 
         case GET_VALUE_AT_ADDRESS:
-            genPointerGet(ic);
-            break;
+          genPointerGet (ic);
+          break;
 
-        case '=' :
-            if (POINTER_SET(ic))
-                genPointerSet(ic);
-            else
-                genAssign(ic);
-            break;
+        case '=':
+          if (POINTER_SET (ic))
+            genPointerSet (ic);
+          else
+            genAssign (ic);
+          break;
 
         case IFX:
-            genIfx (ic,NULL);
-            break;
+          genIfx (ic, NULL);
+          break;
 
         case ADDRESS_OF:
-            genAddrOf (ic);
-            break;
+          genAddrOf (ic);
+          break;
 
         case JUMPTABLE:
-            genJumpTab (ic);
-            break;
+          genJumpTab (ic);
+          break;
 
         case CAST:
-            genCast (ic);
-            break;
+          genCast (ic);
+          break;
 
         case RECEIVE:
-            genReceive(ic);
-            break;
+          genReceive (ic);
+          break;
 
         case SEND:
-            addSet(&_G.sendSet,ic);
-            break;
+          addSet (&_G.sendSet, ic);
+          break;
 
         case DUMMY_READ_VOLATILE:
-            genDummyRead (ic);
-            break;
+          genDummyRead (ic);
+          break;
 
-        default :
-            fprintf(stderr, "UNHANDLED iCode: "); piCode(ic, stderr);
-            ic = ic;
-            break;
+        case CRITICAL:
+          genCritical (ic);
+          break;
+
+        case ENDCRITICAL:
+          genEndCritical (ic);
+          break;
+
+        default:
+          fprintf (stderr, "UNHANDLED iCode: ");
+          piCode (ic, stderr);
+          ic = ic;
+          break;
         }
     }
 
 
-    /* now we are ready to call the
-    peep hole optimizer */
-    if (!options.nopeep) {
-        peepHole (&lineHead);
+  /* now we are ready to call the
+     peep hole optimizer */
+  if (!options.nopeep)
+    {
+      peepHole (&genLine.lineHead);
     }
-    /* now do the actual printing */
-    printLine (lineHead,codeOutBuf);
+  /* now do the actual printing */
+  printLine (genLine.lineHead, codeOutBuf);
 
 #ifdef PCODE_DEBUG
-    DFPRINTF((stderr,"printing pBlock\n\n"));
-    printpBlock(stdout,pb);
+  DFPRINTF ((stderr, "printing pBlock\n\n"));
+  printpBlock (stdout, pb);
 #endif
 
-    return;
+  /* destroy the line list */
+  destroy_line_list ();
 }
 
 /* This is not safe, as a AOP_PCODE/PO_IMMEDIATE might be used both as literal
  * (meaning: representing its own address) or not (referencing its contents).
  * This can only be decided based on the operand's type. */
 static int
-aop_isLitLike (asmop *aop)
+aop_isLitLike (asmop * aop)
 {
   assert (aop);
-  if (aop->type == AOP_LIT) return 1;
-  if (aop->type == AOP_IMMD) return 1;
-  if ((aop->type == AOP_PCODE) &&
-        ((aop->aopu.pcop->type == PO_LITERAL)))
-  {
-    /* this should be treated like a literal/immediate (use MOVLW/ADDLW/SUBLW
-     * instead of MOVFW/ADDFW/SUBFW, use popGetAddr instead of popGet) */
+  if (aop->type == AOP_LIT)
     return 1;
-  }
+  if (aop->type == AOP_IMMD)
+    return 1;
+  if ((aop->type == AOP_PCODE) && ((aop->aopu.pcop->type == PO_LITERAL)))
+    {
+      /* this should be treated like a literal/immediate (use MOVLW/ADDLW/SUBLW
+       * instead of MOVFW/ADDFW/SUBFW, use popGetAddr instead of popGet) */
+      return 1;
+    }
   return 0;
 }
 
 int
-op_isLitLike (operand *op)
+op_isLitLike (operand * op)
 {
   assert (op);
-  if (aop_isLitLike (AOP(op))) return 1;
-  if (IS_SYMOP(op) && IS_FUNC(OP_SYM_TYPE(op))) return 1;
-  if (IS_SYMOP(op) && IS_PTR(OP_SYM_TYPE(op))
-        && (AOP_TYPE(op) == AOP_PCODE)
-        && (AOP(op)->aopu.pcop->type == PO_IMMEDIATE)) {
+  if (aop_isLitLike (AOP (op)))
     return 1;
-  }
+  if (IS_SYMOP (op) && IS_FUNC (OP_SYM_TYPE (op)))
+    return 1;
+  if (IS_SYMOP (op) && IS_PTR (OP_SYM_TYPE (op)) && (AOP_TYPE (op) == AOP_PCODE) && (AOP (op)->aopu.pcop->type == PO_IMMEDIATE))
+    {
+      return 1;
+    }
 
   return 0;
 }
-
diff -Nru sdcc-3.1.0+dfsg/src/pic14/genarith.c sdcc-3.2.0+dfsg/src/pic14/genarith.c
--- sdcc-3.1.0+dfsg/src/pic14/genarith.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic14/genarith.c	2012-06-28 14:09:28.000000000 +0000
@@ -260,24 +260,53 @@
 
 static void genAddLit (iCode *ic, int lit)
 {
-        
-        int size,same;
+        int size, same;
         int lo;
-        
+
         operand *result;
         operand *left;
-        
+
         FENTRY;
         DEBUGpic14_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-        
-        
+
         left = IC_LEFT(ic);
         result = IC_RESULT(ic);
         same = pic14_sameRegs(AOP(left), AOP(result));
         size = pic14_getDataSize(result);
         if (size > pic14_getDataSize(left))
                 size = pic14_getDataSize(left);
-        
+
+        /*
+         * Fix accessing libsdcc/<*>/idata.c:_cinit in __code space.
+         */
+        if (AOP_PCODE == AOP_TYPE(IC_LEFT(ic)))
+          {
+            int u;
+            if (debug_verbose)
+              {
+                printf("%s:%u: CHECK: using address of '%s' instead of contents\n",
+                       ic->filename, ic->lineno,
+                       popGetAddr(AOP(IC_LEFT(ic)), 0, lit & 0xff)->name);
+              } // if
+            for (u = 0; u < size; ++u)
+              {
+                emitpcode(POC_MOVLW, popGetAddr(AOP(IC_LEFT(ic)), u, lit));
+                emitpcode(POC_MOVWF, popGet(AOP(IC_RESULT(ic)), u));
+              } // for
+
+            if (size < pic14_getDataSize(result))
+              {
+                for (u = size; u < pic14_getDataSize(result); ++u)
+                  {
+                    /* XXX: Might fail for u >= size?!? */
+                    emitpcode(POC_MOVLW, popGetAddr(AOP(IC_LEFT(ic)), u, lit));
+                    emitpcode(POC_MOVWF, popGet(AOP(IC_RESULT(ic)), u));
+                  } // for
+              } // if
+
+            goto out;
+          } // if
+
         if(same) {
                 
                 /* Handle special cases first */
@@ -466,7 +495,6 @@
                         switch(lit & 0xff) {
                         case 0:
                                 emitpcode(POC_MOVFW, popGet(AOP(left),0));
-                                emitMOVWF(result, 0);
                                 emitMOVWF(result,0);
                                 break;
                         case 1:
@@ -530,6 +558,7 @@
                 }
         }
 
+out:
         size = pic14_getDataSize(result);
         if (size > pic14_getDataSize(left))
                 size = pic14_getDataSize(left);
diff -Nru sdcc-3.1.0+dfsg/src/pic14/glue.c sdcc-3.2.0+dfsg/src/pic14/glue.c
--- sdcc-3.1.0+dfsg/src/pic14/glue.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic14/glue.c	2012-06-28 14:09:28.000000000 +0000
@@ -70,7 +70,6 @@
 emitPseudoStack(struct dbuf_s *oBuf, struct dbuf_s *oBufExt)
 {
     int shared, low, high, size, i;
-    PIC_device *pic;
 
     /* also emit STK symbols
      * XXX: This is ugly and fails as soon as devices start to get
@@ -80,8 +79,6 @@
     shared = pic14_getSharedStack(&low, &high, &size);
     if (!pic14_options.isLibrarySource)
     {
-        pic = pic14_getPIC();
-
         dbuf_printf (oBuf, "\n");
         dbuf_printf (oBuf, "\tglobal PSAVE\n");
         dbuf_printf (oBuf, "\tglobal SSAVE\n");
@@ -145,7 +142,7 @@
   symbol *sym;
   set *aliases;
   int addr, min=-1, max=-1;
-  int size;
+  unsigned int size;
 
   for (i=0; maps[i] != NULL; i++)
   {
@@ -919,7 +916,7 @@
 emitInitVal(struct dbuf_s *oBuf, symbol *topsym, sym_link *my_type, initList *list)
 {
     symbol *sym;
-    int size, i;
+    int size;
     long lit;
     unsigned char *str;
 
@@ -966,7 +963,9 @@
     }
 
     if (IS_ARRAY(my_type)) {
-        DEBUGprintf ("(array, %d items, %d byte) below\n", DCL_ELEM(my_type), size);
+        size_t i;
+
+        DEBUGprintf ("(array, %d items, %ud byte) below\n", (unsigned int) DCL_ELEM(my_type), size);
         assert (!list || list->type == INIT_DEEP);
         if (list) list = list->init.deep;
         for (i = 0; i < DCL_ELEM(my_type); i++) {
diff -Nru sdcc-3.1.0+dfsg/src/pic14/main.c sdcc-3.2.0+dfsg/src/pic14/main.c
--- sdcc-3.1.0+dfsg/src/pic14/main.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic14/main.c	2012-06-03 17:48:05.000000000 +0000
@@ -5,7 +5,7 @@
     it easier to set a breakpoint using the debugger.
 */
 #include "common.h"
-#include "SDCCsystem.h"
+#include "dbuf_string.h"
 #include "SDCCmacro.h"
 
 #include "device.h"
@@ -113,7 +113,7 @@
   can pass only the first parameter in a register */
   //if (regParmFlg)
   //  return 0;
-  
+
   regParmFlg++;// = 1;
   return 1;
 }
@@ -130,10 +130,43 @@
 static void
 _pic14_finaliseOptions (void)
 {
+  struct dbuf_s dbuf;
+
   pCodeInitRegisters();
-  
+
   port->mem.default_local_map = data;
   port->mem.default_globl_map = data;
+
+  dbuf_init (&dbuf, 512);
+  dbuf_printf (&dbuf, "-D__SDCC_PROCESSOR=\"%s\"", port->processor);
+  addSet (&preArgvSet, Safe_strdup (dbuf_detach_c_str (&dbuf)));
+
+/*
+ * deprecated in sdcc 3.2.0
+ * TODO: should be obsoleted in sdcc 3.3.0 or later
+  if (options.std_sdcc)
+ */
+    {
+      dbuf_set_length (&dbuf, 0);
+      dbuf_printf (&dbuf, "-DSDCC_PROCESSOR=\"%s\"", port->processor);
+      addSet (&preArgvSet, dbuf_detach_c_str (&dbuf));
+    }
+
+    {
+      char *upperProc, *p1, *p2;
+      int len;
+
+      dbuf_set_length (&dbuf, 0);
+      len = strlen (port->processor);
+      upperProc = Safe_malloc (len);
+      for (p1 = port->processor, p2 = upperProc; *p1; ++p1, ++p2)
+        {
+          *p2 = toupper (*p1);
+        }
+      dbuf_append (&dbuf, "-D__SDCC_PIC", sizeof ("-D__SDCC_PIC") - 1);
+      dbuf_append (&dbuf, upperProc, len);
+      addSet (&preArgvSet, dbuf_detach_c_str (&dbuf));
+    }
 }
 
 static void
@@ -153,13 +186,13 @@
 _pic14_genAssemblerPreamble (FILE * of)
 {
   char * name = processor_base_name();
-  
+
   if(!name) {
-    
+
     name = "16f877";
     fprintf(stderr,"WARNING: No Pic has been selected, defaulting to %s\n",name);
   }
-  
+
   fprintf (of, "\tlist\tp=%s\n",name);
   fprintf (of, "\tradix dec\n");
   fprintf (of, "\tinclude \"p%s.inc\"\n",name);
@@ -180,11 +213,11 @@
   {
     return FALSE;
   }
-  
+
   /* multiply chars in-place */
   if (getSize(left) == 1 && getSize(right) == 1)
     return TRUE;
-  
+
   /* use library functions for more complex maths */
   return FALSE;
 }
@@ -195,6 +228,7 @@
 {
   if (op == RRC
     || op == RLC
+    || op == GETABIT
     /* || op == GETHBIT */ /* GETHBIT doesn't look complete for PIC */
     )
     return TRUE;
@@ -225,7 +259,7 @@
   set *tSet = NULL;
   int ret;
   char * procName;
-  
+
   /*
    * link command format:
    * {linker} {incdirs} {lflags} -o {outfile} {spec_ofiles} {ofiles} {libs}
@@ -243,7 +277,7 @@
 
   joinStrSet (appendStrSet (libDirsSet, "-I\"", "\""));
   shash_add (&linkValues, "sysincdirs", joinStrSet (appendStrSet (libDirsSet, "-I\"", "\"")));
-  
+
   shash_add (&linkValues, "lflags", joinStrSet (linkOptionsSet));
 
   shash_add (&linkValues, "outfile", fullDstFileName ? fullDstFileName : dstFileName);
@@ -302,8 +336,8 @@
   {
     _asmCmd,
     NULL,
-    "-g",	    /* options with --debug */
-    NULL,	    /* options without --debug */
+    "-g",           /* options with --debug */
+    NULL,           /* options without --debug */
     //"-plosgffc",  /* Options with debug */
     //"-plosgff",   /* Options without debug */
     0,
@@ -343,7 +377,7 @@
     "GSINIT  (CODE)",
     "udata_ovr",
     "GSFINAL (CODE)",
-    "HOME	 (CODE)",
+    "HOME        (CODE)",
     NULL, // xidata
     NULL, // xinit
     "CONST   (CODE)",   // const_name - const data (code or not)
diff -Nru sdcc-3.1.0+dfsg/src/pic14/pcode.c sdcc-3.2.0+dfsg/src/pic14/pcode.c
--- sdcc-3.1.0+dfsg/src/pic14/pcode.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic14/pcode.c	2012-02-12 19:33:02.000000000 +0000
@@ -2150,8 +2150,8 @@
 	PCORB(pcop)->bit = ibit;
 	PCORB(pcop)->inBitSpace = inBitSpace;
 	
-	if (name) r = regFindWithName(name);
-	if (!r) {
+        if (name) r = regFindWithName(name);
+	if (name && !r) {
 		// Register has not been allocated - check for symbol information
 		symbol *sym;
 		sym = symFindWithName(bit, name);
@@ -2170,11 +2170,13 @@
 		pcop->name = NULL;
 		PCOR(pcop)->r = r;
 		PCOR(pcop)->rIdx = r->rIdx;
-	} else {
+	} else if (name) {
 		pcop->name = Safe_strdup(name);   
 		PCOR(pcop)->r = NULL;
 		PCOR(pcop)->rIdx = 0;
-	}
+	} else {
+                //fprintf(stderr, "Unnamed register duplicated for bit-access?!? Hope for the best ...\n");
+        }
 	return pcop;
 }
 
@@ -2247,7 +2249,7 @@
 	switch(type) {
 	case PO_BIT:
 	case PO_GPR_BIT:
-		pcop = newpCodeOpBit(name, -1,0);
+		pcop = newpCodeOpBit(name, -1, 0);
 		break;
 		
 	case PO_LITERAL:
@@ -4500,9 +4502,9 @@
 pCodeOp *popCopyGPR2Bit(pCodeOp *pc, int bitval)
 {
 	pCodeOp *pcop;
-	
+
 	pcop = newpCodeOpBit(pc->name, bitval, 0);
-	
+
 	if( !( (pcop->type == PO_LABEL) ||
 		(pcop->type == PO_LITERAL) ||
 		(pcop->type == PO_STR) ))
diff -Nru sdcc-3.1.0+dfsg/src/pic14/pcodepeep.c sdcc-3.2.0+dfsg/src/pic14/pcodepeep.c
--- sdcc-3.1.0+dfsg/src/pic14/pcodepeep.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic14/pcodepeep.c	2012-01-26 17:33:28.000000000 +0000
@@ -598,13 +598,10 @@
 {
   parsedPattern *p = pp;
   int opcode;
-  int dest;  // or could be bit position in the register
 
   pCodeInstruction *pci=NULL;
   pCodeOp *pcosubtype=NULL;
 
-  dest = cvt_extract_destination(&p[3]);
-
   DFPRINTF((stderr,"altpat_mnem3 %s var %s bit (%d)\n",
     p->pct[0].tok.s,
     p[1].pct[0].tok.s,
@@ -918,10 +915,6 @@
     int j=0;
     int k=0;
 
-    char * cPmnem  = NULL;     // Pointer to non-wild mnemonic (if any)
-    char * cP1stop = NULL;
-    char * cP2ndop = NULL;
-
     //pCodeOp *pcl   = NULL;       // Storage for a label
     //pCodeOp *pco1  = NULL;       // 1st operand
     //pCodeOp *pco2  = NULL;       // 2nd operand
@@ -966,12 +959,10 @@
             case PS_START:
             case PS_HAVE_LABEL:
               DFPRINTF((stderr,"  mnem\n"));
-              cPmnem = tokArr[ltokIdx].tok.s;
               state = PS_HAVE_MNEM;
               break;
             case PS_HAVE_MNEM:
               DFPRINTF((stderr,"  1st operand\n"));
-              cP1stop = tokArr[ltokIdx].tok.s;
               //pco1 = newpCodeOp(NULL,PO_GPR_REGISTER);
               state = PS_HAVE_1OPERAND;
               break;
@@ -980,7 +971,6 @@
               break;
             case PS_HAVE_COMMA:
               DFPRINTF((stderr,"  2 operands\n"));
-              cP2ndop = tokArr[ltokIdx].tok.s;
               break;
             case PS_HAVE_2OPERANDS:
               break;
@@ -1273,21 +1263,22 @@
     //return; // debug ... don't want to go through all the rules yet
   }
 
-  {
-    pCodePeep *peepBlock;
-    DLList *peeprules;
-
-    peeprules = (DLList *)peepSnippets;
-    //fprintf(stderr,"target rules\n");
-    while(peeprules) {
-      //fprintf(stderr,"   rule:\n");
-      peepBlock = ((pCodePeepSnippets*)peeprules)->peep;
-      //printpBlock(stderr, peepBlock->target.pb);
-      peeprules = peeprules->next;
-    }
-    //fprintf(stderr," ... done\n");
-  }
+  if (0)
+    {
+      pCodePeep *peepBlock;
+      DLList *peeprules;
 
+      peeprules = (DLList *)peepSnippets;
+      fprintf(stderr,"target rules\n");
+      while (peeprules)
+        {
+          fprintf(stderr,"   rule:\n");
+          peepBlock = ((pCodePeepSnippets*)peeprules)->peep;
+          printpBlock(stderr, peepBlock->target.pb);
+          peeprules = peeprules->next;
+        } // while
+      fprintf(stderr," ... done\n");
+    } // if
 }
 
 /*-----------------------------------------------------------------*/
diff -Nru sdcc-3.1.0+dfsg/src/pic14/pic14.vcxproj sdcc-3.2.0+dfsg/src/pic14/pic14.vcxproj
--- sdcc-3.1.0+dfsg/src/pic14/pic14.vcxproj	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic14/pic14.vcxproj	2012-03-18 13:40:40.000000000 +0000
@@ -178,10 +178,12 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="peeph.def">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f ../SDCCpeeph.awk %(FullPath) &gt;peeph.rul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f ../SDCCpeeph.awk %(Identity) &gt;peeph.rul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">peeph.rul;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f ../SDCCpeeph.awk %(FullPath) &gt;peeph.rul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f ../SDCCpeeph.awk %(Identity) &gt;peeph.rul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">peeph.rul;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Peephole Rule: peeph.rul</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Peephole Rule: peeph.rul</Message>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff -Nru sdcc-3.1.0+dfsg/src/pic14/ralloc.c sdcc-3.2.0+dfsg/src/pic14/ralloc.c
--- sdcc-3.1.0+dfsg/src/pic14/ralloc.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic14/ralloc.c	2012-06-05 09:03:12.000000000 +0000
@@ -3374,7 +3374,9 @@
 static void
 packForPush (iCode * ic, eBBlock * ebp)
 {
-        iCode *dic;
+        iCode *dic, *lic;
+        bitVect *dbv;
+        int disallowHiddenAssignment = 0;
 
         debugLog ("%s\n", __FUNCTION__);
         if (ic->op != IPUSH || !IS_ITEMP (IC_LEFT (ic)))
@@ -3393,6 +3395,45 @@
         if (dic->op != '=' || POINTER_SET (dic))
                 return;
 
+        /* If the defining iCode is outside of this block, we need to recompute */
+        /* ebp (see the mcs51 version of packForPush), but we weren't passed    */
+        /* enough data to do that. Just bail out instead if that happens. */
+        if (dic->seq < ebp->fSeq)
+                return;
+
+        if (IS_SYMOP (IC_RIGHT (dic))) {
+                if (IC_RIGHT (dic)->isvolatile)
+                        return;
+
+                if (OP_SYMBOL (IC_RIGHT (dic))->addrtaken || isOperandGlobal (IC_RIGHT (dic)))
+                        disallowHiddenAssignment = 1;
+
+                /* make sure the right side does not have any definitions
+                   inbetween */
+                dbv = OP_DEFS (IC_RIGHT (dic));
+                for (lic = ic; lic && lic != dic; lic = lic->prev) {
+                        if (bitVectBitValue (dbv, lic->key))
+                                return;
+                        if (disallowHiddenAssignment && (lic->op == CALL || lic->op == PCALL || POINTER_SET (lic)))
+                                return;
+                }
+                /* make sure they have the same type */
+                if (IS_SPEC (operandType (IC_LEFT (ic)))) {
+                        sym_link *itype = operandType (IC_LEFT (ic));
+                        sym_link *ditype = operandType (IC_RIGHT (dic));
+
+                        if (SPEC_USIGN (itype) != SPEC_USIGN (ditype) || SPEC_LONG (itype) != SPEC_LONG (ditype))
+                                return;
+                }
+                /* extend the live range of replaced operand if needed */
+                if (OP_SYMBOL (IC_RIGHT (dic))->liveTo < ic->seq) {
+                        OP_SYMBOL (IC_RIGHT (dic))->liveTo = ic->seq;
+                }
+                bitVectUnSetBit (OP_SYMBOL (IC_RESULT (dic))->defs, dic->key);
+        }
+        if (IS_ITEMP (IC_RIGHT (dic)))
+                OP_USES (IC_RIGHT (dic)) = bitVectSetBit (OP_USES (IC_RIGHT (dic)), ic->key);
+
                 /* we now we know that it has one & only one def & use
         and the that the definition is an assignment */
         IC_LEFT (ic) = IC_RIGHT (dic);
diff -Nru sdcc-3.1.0+dfsg/src/pic16/device.c sdcc-3.2.0+dfsg/src/pic16/device.c
--- sdcc-3.1.0+dfsg/src/pic16/device.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic16/device.c	2012-04-07 17:15:16.000000000 +0000
@@ -1,23 +1,23 @@
 /*-------------------------------------------------------------------------
-
   device.c - Accomodates subtle variations in PIC16 devices
 
-   Written By -  Scott Dattalo scott@dattalo.com
-   Ported to PIC16 By -  Martin Dubuc m.dubuc@rogers.com
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  Copyright (C) 2000, Scott Dattalo scott@dattalo.com
+  PIC16 port:
+  Copyright (C) 2002, Martin Dubuc m.dubuc@rogers.com
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 -------------------------------------------------------------------------*/
 
 #include <stdio.h>
@@ -32,7 +32,7 @@
 #include "device.h"
 
 void pic16_printIval (symbol * sym, sym_link * type, initList * ilist, char ptype, void *p);
-extern void pic16_pCodeConstString (char *name, char *value, unsigned length);
+extern void pic16_pCodeConstString (char *name, const char *value, unsigned length);
 
 stats_t statistics = { 0, 0, 0, 0 };
 
@@ -77,13 +77,13 @@
   if (!r)
     return;
 
-  fprintf (of, "%s", iComments2);
+  fprintf (of, "\n%s", iComments2);
   fprintf (of, ";\tEquates to used internal registers\n");
   fprintf (of, "%s", iComments2);
 
   for (; r; r = setNextItem (equs))
     {
-      fprintf (of, "%s\tequ\t0x%02x\n", r->name, r->address);
+      fprintf (of, "%s\tequ\t0x%03x\n", r->name, r->address);
     } // for
 }
 
@@ -347,7 +347,6 @@
   else
     {
       unsigned int j = 0;
-      symbol *s1;
 
       sprev = NULL;
       init_addr = SPEC_ADDR (slist[j]->etype);
@@ -356,10 +355,6 @@
       for (j = 0; j < i; j++)
         {
           s = slist[j];
-          s1 = NULL;
-          if (j < i - 1)
-            s1 = slist[j + 1];
-
           init_addr = SPEC_ADDR (s->etype);
 
           if (sprev && (init_addr > (SPEC_ADDR (sprev->etype) + getSize (sprev->etype))))
diff -Nru sdcc-3.1.0+dfsg/src/pic16/device.h sdcc-3.2.0+dfsg/src/pic16/device.h
--- sdcc-3.1.0+dfsg/src/pic16/device.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic16/device.h	2012-06-28 14:09:28.000000000 +0000
@@ -63,8 +63,8 @@
 typedef struct PIC16_device {
   char *name[PROCESSOR_NAMES];  /* aliases for the processor name */
   /* RAMsize *must* be the first item to copy for 'using' */
-  int RAMsize;                  /* size of Data RAM - VR 031120 */
-  int acsSplitOfs;              /* access bank split offset */
+  unsigned int RAMsize;         /* size of Data RAM - VR 031120 */
+  unsigned int acsSplitOfs;     /* access bank split offset */
   configWordsInfo_t cwInfo;     /* configuration words info */
   idBytesInfo_t idInfo;         /* ID Locations info */
   /* next *must* be the first field NOT being copied via 'using' */
diff -Nru sdcc-3.1.0+dfsg/src/pic16/gen.c sdcc-3.2.0+dfsg/src/pic16/gen.c
--- sdcc-3.1.0+dfsg/src/pic16/gen.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic16/gen.c	2012-06-28 14:09:28.000000000 +0000
@@ -1,12 +1,14 @@
- /*-------------------------------------------------------------------------
- gen.c - source file for code generation for pic16
+/*-------------------------------------------------------------------------
+  gen.c - source file for code generation for pic16
 
-  Written By -  Sandeep Dutta . sandeep.dutta@usa.net (1998)
-         and -  Jean-Louis VERN.jlvern@writeme.com (1999)
+  Copyright (C) 1998, Sandeep Dutta . sandeep.dutta@usa.net
+  Copyright (C) 1999, Jean-Louis VERN.jlvern@writeme.com
   Bug Fixes  -  Wojciech Stryjewski  wstryj1@tiger.lsu.edu (1999 v2.1.9a)
-  PIC port   -  Scott Dattalo scott@dattalo.com (2000)
-  PIC16 port -  Martin Dubuc m.dubuc@rogers.com (2002)
-             -  Vangelis Rokas <vrokas AT users.sourceforge.net> (2003-2006)
+  PIC port:
+  Copyright (C) 2000, Scott Dattalo scott@dattalo.com
+  PIC16 port:
+  Copyright (C) 2002, Martin Dubuc m.dubuc@rogers.com
+  Copyright (C) 2003-2006,Vangelis Rokas <vrokas AT users.sourceforge.net>
   Bug Fixes  -  Raphael Neider <rneider AT web.de> (2004,2005)
   Bug Fixes  -  Borut Razem <borut.razem AT siol.net> (2007)
   Bug Fixes  -  Mauro Giachero <maurogiachero AT users.sourceforge.net> (2008)
@@ -24,25 +26,19 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-  In other words, you are welcome to use, share and improve this program.
-  You are forbidden to forbid anyone else to use, share and improve
-  what you give them.   Help stamp out software-hoarding!
-
+-------------------------------------------------------------------------*/
+/*
   Notes:
   000123 mlh    Moved aopLiteral to SDCCglue.c to help the split
                 Made everything static
--------------------------------------------------------------------------*/
+*/
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include "SDCCglobl.h"
-#include "newalloc.h"
 
 #include "common.h"
-#include "SDCCpeeph.h"
 #include "ralloc.h"
 #include "pcode.h"
 #include "gen.h"
@@ -50,6 +46,7 @@
 #include "device.h"
 #include "main.h"
 #include "glue.h"
+#include "dbuf_string.h"
 
 /* The PIC port(s) do not need to distinguish between POINTER and FPOINTER. */
 #define PIC_IS_DATA_PTR(x)      (IS_DATA_PTR(x) || IS_FARPTR(x))
@@ -60,15 +57,17 @@
 /* Wrapper to execute `code' at most once. */
 #define PERFORM_ONCE(id,code)   do { static char id = 0; if (!id) { id = 1; code } } while (0)
 
-void pic16_genMult8X8_n (operand *, operand *,operand *);
-extern void pic16_printpBlock(FILE *of, pBlock *pb);
+void pic16_genMult8X8_n (operand *, operand *, operand *);
+extern void pic16_printpBlock (FILE * of, pBlock * pb);
 static asmop *newAsmop (short type);
-static pCodeOp *pic16_popRegFromString(char *str, int size, int offset, operand *op);
-extern pCode *pic16_newpCodeAsmDir(char *asdir, char *argfmt, ...);
-static void mov2fp(pCodeOp *dst, asmop *src, int offset);
-static pCodeOp *pic16_popRegFromIdx(int rIdx);
+static pCodeOp *pic16_popRegFromString (char *str, int size, int offset, operand * op);
+extern pCode *pic16_newpCodeAsmDir (char *asdir, char *argfmt, ...);
+static void mov2fp (pCodeOp * dst, asmop * src, int offset);
+static pCodeOp *pic16_popRegFromIdx (int rIdx);
+static void genCritical (iCode * ic);
+static void genEndCritical (iCode * ic);
 
-int pic16_labelOffset=0;
+int pic16_labelOffset = 0;
 extern int pic16_debug_verbose;
 
 extern set *externs;
@@ -77,16 +76,15 @@
    a function. This is then used to adjust the label offset
    for the next function.
 */
-static int max_key=0;
-static int GpsuedoStkPtr=0;
+static int max_key = 0;
+static int GpsuedoStkPtr = 0;
 
-pCodeOp *pic16_popGetImmd(char *name, unsigned int offset, int index);
+pCodeOp *pic16_popGetImmd (char *name, unsigned int offset, int index);
 
-const char *pic16_AopType(short type);
-static iCode *ifxForOp ( operand *op, iCode *ic );
+const char *pic16_AopType (short type);
 
-void pic16_pushpCodeOp(pCodeOp *pcop);
-void pic16_poppCodeOp(pCodeOp *pcop);
+void pic16_pushpCodeOp (pCodeOp * pcop);
+void pic16_poppCodeOp (pCodeOp * pcop);
 
 
 #define BYTEofLONG(l,b) ( (l>> (b<<3)) & 0xff)
@@ -101,7 +99,7 @@
    CODE GENERATION for a specific MCU . some of the
    routines may be reusable, will have to see */
 static char *zero = "#0x00";
-static char *one  = "#0x01";
+static char *one = "#0x01";
 
 
 /*
@@ -114,38 +112,40 @@
  */
 char *fReturnpic16[] = { "WREG", "PRODL", "PRODH", "FSR0L" };
 int fReturnIdx[] = { IDX_WREG, IDX_PRODL, IDX_PRODH, IDX_FSR0L };
-unsigned pic16_fReturnSizePic = 4; /* shared with ralloc.c */
+
+unsigned pic16_fReturnSizePic = 4;      /* shared with ralloc.c */
 static char **fReturn = fReturnpic16;
 
-static char *accUse[] = {"WREG"};
+static char *accUse[] = { "WREG" };
 
-static struct {
-    short accInUse;
-    short inLine;
-    short debugLine;
-    short nRegsSaved;
-    set *sendSet;
-    set *stackRegSet;
-    int usefastretfie;
-    bitVect *fregsUsed;                 /* registers used in function */
-    bitVect *sregsAlloc;
-    set *sregsAllocSet;                 /* registers used to store stack variables */
-    int stack_lat;                      /* stack offset latency */
-    int resDirect;
-    int useWreg;                        /* flag when WREG is used to pass function parameter */
+static struct
+{
+  short accInUse;
+  short inLine;
+  short debugLine;
+  short nRegsSaved;
+  set *sendSet;
+  set *stackRegSet;
+  int usefastretfie;
+  bitVect *fregsUsed;           /* registers used in function */
+  bitVect *sregsAlloc;
+  set *sregsAllocSet;           /* registers used to store stack variables */
+  int stack_lat;                /* stack offset latency */
+  int resDirect;
+  int useWreg;                  /* flag when WREG is used to pass function parameter */
 } _G;
 
 extern struct dbuf_s *codeOutBuf;
 
-static lineNode *lineHead = NULL;
-static lineNode *lineCurr = NULL;
+static unsigned char SLMask[] = { 0xFF, 0xFE, 0xFC, 0xF8, 0xF0,
+                                  0xE0, 0xC0, 0x80, 0x00
+                                };
+
+static unsigned char SRMask[] = { 0xFF, 0x7F, 0x3F, 0x1F, 0x0F,
+                                  0x07, 0x03, 0x01, 0x00
+                                };
 
-static unsigned char   SLMask[] = {0xFF ,0xFE, 0xFC, 0xF8, 0xF0,
-0xE0, 0xC0, 0x80, 0x00};
-static unsigned char   SRMask[] = {0xFF, 0x7F, 0x3F, 0x1F, 0x0F,
-0x07, 0x03, 0x01, 0x00};
-
-static  pBlock *pb;
+static pBlock *pb;
 
 /*-----------------------------------------------------------------*/
 /*  my_powof2(n) - If `n' is an integaer power of 2, then the      */
@@ -156,152 +156,134 @@
 /*   return y;                                                     */
 /* return -1;                                                      */
 /*-----------------------------------------------------------------*/
-int pic16_my_powof2 (unsigned long num)
+int
+pic16_my_powof2 (unsigned long num)
 {
-  if(num) {
-    if( (num & (num-1)) == 0) {
-      int nshifts = -1;
-      while(num) {
-        num>>=1;
-        nshifts++;
-      }
-      return nshifts;
+  if (num)
+    {
+      if ((num & (num - 1)) == 0)
+        {
+          int nshifts = -1;
+          while (num)
+            {
+              num >>= 1;
+              nshifts++;
+            }
+          return nshifts;
+        }
     }
-  }
 
   return -1;
 }
 
-void DEBUGpic16_pic16_AopType(int line_no, operand *left, operand *right, operand *result)
+void
+DEBUGpic16_pic16_AopType (int line_no, operand * left, operand * right, operand * result)
 {
-  DEBUGpic16_emitcode ("; ","line = %d result %s=%s, left %s=%s, right %s=%s, size = %d",
+  DEBUGpic16_emitcode ("; ", "line = %d result %s=%s, left %s=%s, right %s=%s, size = %d",
                        line_no,
-                       ((result) ? pic16_AopType(AOP_TYPE(result)) : "-"),
-                       ((result) ? pic16_aopGet(AOP(result),0,TRUE,FALSE) : "-"),
-                       ((left)   ? pic16_AopType(AOP_TYPE(left)) : "-"),
-                       ((left)   ? pic16_aopGet(AOP(left),0,TRUE,FALSE) : "-"),
-                       ((right)  ? pic16_AopType(AOP_TYPE(right)) : "-"),
-                       ((right)  ? pic16_aopGet(AOP(right),0,FALSE,FALSE) : "-"),
-                       ((result) ? AOP_SIZE(result) : 0));
+                       ((result) ? pic16_AopType (AOP_TYPE (result)) : "-"),
+                       ((result) ? pic16_aopGet (AOP (result), 0, TRUE, FALSE) : "-"),
+                       ((left) ? pic16_AopType (AOP_TYPE (left)) : "-"),
+                       ((left) ? pic16_aopGet (AOP (left), 0, TRUE, FALSE) : "-"),
+                       ((right) ? pic16_AopType (AOP_TYPE (right)) : "-"),
+                       ((right) ? pic16_aopGet (AOP (right), 0, FALSE, FALSE) : "-"), ((result) ? AOP_SIZE (result) : 0));
 }
 
-void DEBUGpic16_pic16_AopTypeSign(int line_no, operand *left, operand *right, operand *result)
+void
+DEBUGpic16_pic16_AopTypeSign (int line_no, operand * left, operand * right, operand * result)
 {
 
-  DEBUGpic16_emitcode ("; ","line = %d, signs: result %s=%c, left %s=%c, right %s=%c",
+  DEBUGpic16_emitcode ("; ", "line = %d, signs: result %s=%c, left %s=%c, right %s=%c",
                        line_no,
-                       ((result) ? pic16_AopType(AOP_TYPE(result)) : "-"),
-                       ((result) ? (SPEC_USIGN(operandType(result)) ? 'u' : 's') : '-'),
-                       ((left)   ? pic16_AopType(AOP_TYPE(left)) : "-"),
-                       ((left)   ? (SPEC_USIGN(operandType(left))   ? 'u' : 's') : '-'),
-                       ((right)  ? pic16_AopType(AOP_TYPE(right)) : "-"),
-                       ((right)  ? (SPEC_USIGN(operandType(right))  ? 'u' : 's') : '-'));
+                       ((result) ? pic16_AopType (AOP_TYPE (result)) : "-"),
+                       ((result) ? (SPEC_USIGN (operandType (result)) ? 'u' : 's') : '-'),
+                         ((left) ? pic16_AopType (AOP_TYPE (left)) : "-"),
+                         ((left) ? (SPEC_USIGN (operandType (left)) ? 'u' : 's') : '-'),
+                         ((right) ? pic16_AopType (AOP_TYPE (right)) : "-"),
+                         ((right) ? (SPEC_USIGN (operandType (right)) ? 'u' : 's') : '-'));
 
 }
 
-void pic16_emitpcomment (char *fmt, ...)
+void
+pic16_emitpcomment (char *fmt, ...)
 {
-    va_list ap;
-    char lb[INITIAL_INLINEASM];
-    unsigned char *lbp = (unsigned char *)lb;
-
-    va_start(ap,fmt);
+  va_list ap;
+  struct dbuf_s dbuf;
+  const char *line;
 
-    lb[0] = ';';
-    vsprintf(lb+1,fmt,ap);
+  dbuf_init (&dbuf, INITIAL_INLINEASM);
 
-    while (isspace(*lbp)) lbp++;
+  dbuf_append_char (&dbuf, ';');
+  va_start (ap, fmt);
+  dbuf_vprintf (&dbuf, fmt, ap);
+  va_end (ap);
 
-    if (lbp && *lbp)
-        lineCurr = (lineCurr ?
-                    connectLine(lineCurr,newLineNode(lb)) :
-                    (lineHead = newLineNode(lb)));
-    lineCurr->isInline = _G.inLine;
-    lineCurr->isDebug  = _G.debugLine;
-    lineCurr->isComment = 1;
+  line = dbuf_detach_c_str (&dbuf);
+  emit_raw (line);
+  dbuf_free (line);
 
-    pic16_addpCode2pBlock(pb,pic16_newpCodeCharP(lb));
-    va_end(ap);
-
-//      fprintf(stderr, "%s\n", lb);
+  pic16_addpCode2pBlock (pb, pic16_newpCodeCharP (genLine.lineCurr->line));
 }
 
-void DEBUGpic16_emitcode (char *inst,char *fmt, ...)
+void
+DEBUGpic16_emitcode (char *inst, char *fmt, ...)
 {
-    va_list ap;
-    char lb[INITIAL_INLINEASM];
-    unsigned char *lbp = (unsigned char *)lb;
-
-    if(!pic16_debug_verbose)
-      return;
+  va_list ap;
 
-    va_start(ap,fmt);
-
-    if (inst && *inst) {
-        if (fmt && *fmt)
-            sprintf(lb,"%s\t",inst);
-        else
-            sprintf(lb,"%s",inst);
-        vsprintf(lb+(strlen(lb)),fmt,ap);
-    }  else
-        vsprintf(lb,fmt,ap);
-
-    while (isspace(*lbp)) lbp++;
-
-    if (lbp && *lbp)
-        lineCurr = (lineCurr ?
-                    connectLine(lineCurr,newLineNode(lb)) :
-                    (lineHead = newLineNode(lb)));
-    lineCurr->isInline = _G.inLine;
-    lineCurr->isDebug  = _G.debugLine;
+  if (!pic16_debug_verbose)
+    return;
 
-    pic16_addpCode2pBlock(pb,pic16_newpCodeCharP(lb));
-    va_end(ap);
+  va_start (ap, fmt);
+  va_emitcode (inst, fmt, ap);
+  va_end (ap);
 
-//      fprintf(stderr, "%s\n", lb);
+  pic16_addpCode2pBlock (pb, pic16_newpCodeCharP (genLine.lineCurr->line));
 }
 
-
-
-void pic16_emitpLabel(int key)
+void
+pic16_emitpLabel (int key)
 {
-  if(key>max_key)
+  if (key > max_key)
     max_key = key;
 
-  pic16_addpCode2pBlock(pb,pic16_newpCodeLabel(NULL,key+100+pic16_labelOffset));
+  pic16_addpCode2pBlock (pb, pic16_newpCodeLabel (NULL, labelKey2num (key + pic16_labelOffset)));
 }
 
-void pic16_emitpLabelFORCE(int key)
+void
+pic16_emitpLabelFORCE (int key)
 {
-  if(key>max_key)
+  if (key > max_key)
     max_key = key;
 
-  pic16_addpCode2pBlock(pb,pic16_newpCodeLabelFORCE(NULL,key+100+pic16_labelOffset));
+  pic16_addpCode2pBlock (pb, pic16_newpCodeLabelFORCE (NULL, labelKey2num (key + pic16_labelOffset)));
 }
 
 /* gen.h defines a macro pic16_emitpcode that allows for debug information to be inserted on demand
  * NEVER call pic16_emitpcode_real directly, please... */
-void pic16_emitpcode_real(PIC_OPCODE poc, pCodeOp *pcop)
+void
+pic16_emitpcode_real (PIC_OPCODE poc, pCodeOp * pcop)
 {
 
-  if(pcop)
-    pic16_addpCode2pBlock(pb,pic16_newpCode(poc,pcop));
+  if (pcop)
+    pic16_addpCode2pBlock (pb, pic16_newpCode (poc, pcop));
   else
-    DEBUGpic16_emitcode(";","%s  ignoring NULL pcop",__FUNCTION__);
+    DEBUGpic16_emitcode (";", "%s  ignoring NULL pcop", __FUNCTION__);
 }
 
-void pic16_emitpinfo(INFO_TYPE itype, pCodeOp *pcop)
+void
+pic16_emitpinfo (INFO_TYPE itype, pCodeOp * pcop)
 {
-  if(pcop)
-    pic16_addpCode2pBlock(pb, pic16_newpCodeInfo(itype, pcop));
+  if (pcop)
+    pic16_addpCode2pBlock (pb, pic16_newpCodeInfo (itype, pcop));
   else
-    DEBUGpic16_emitcode(";","%s  ignoring NULL pcop",__FUNCTION__);
+    DEBUGpic16_emitcode (";", "%s  ignoring NULL pcop", __FUNCTION__);
 }
 
-void pic16_emitpcodeNULLop(PIC_OPCODE poc)
+void
+pic16_emitpcodeNULLop (PIC_OPCODE poc)
 {
 
-  pic16_addpCode2pBlock(pb,pic16_newpCode(poc,NULL));
+  pic16_addpCode2pBlock (pb, pic16_newpCode (poc, NULL));
 
 }
 
@@ -312,40 +294,43 @@
 /*-----------------------------------------------------------------*/
 /* pic16_emitcode - writes the code into a file : for now it is simple    */
 /*-----------------------------------------------------------------*/
-void pic16_emitcode (char *inst,char *fmt, ...)
+void
+pic16_emitcode (char *inst, char *fmt, ...)
 {
-    va_list ap;
-    char lb[INITIAL_INLINEASM];
-    unsigned char *lbp = lb;
-
-    va_start(ap,fmt);
-
-    if (inst && *inst) {
-        if (fmt && *fmt)
-            sprintf(lb,"%s\t",inst);
-        else
-            sprintf(lb,"%s",inst);
-        vsprintf(lb+(strlen(lb)),fmt,ap);
-    }  else
-        vsprintf(lb,fmt,ap);
-
-    while (isspace(*lbp)) lbp++;
-
-    if (lbp && *lbp)
-        lineCurr = (lineCurr ?
-                    connectLine(lineCurr,newLineNode(lb)) :
-                    (lineHead = newLineNode(lb)));
-    lineCurr->isInline = _G.inLine;
-    lineCurr->isDebug  = _G.debugLine;
-    lineCurr->isLabel = (lbp[strlen (lbp) - 1] == ':');
-    lineCurr->isComment = (*lbp == ';');
+  va_list ap;
+  char lb[INITIAL_INLINEASM];
+  unsigned char *lbp = lb;
+
+  va_start (ap, fmt);
+
+  if (inst && *inst)
+    {
+      if (fmt && *fmt)
+        sprintf (lb, "%s\t", inst);
+      else
+        sprintf (lb, "%s", inst);
+      vsprintf (lb + (strlen (lb)), fmt, ap);
+    }
+  else
+    vsprintf (lb, fmt, ap);
+
+  while (isspace (*lbp))
+    lbp++;
+
+  if (lbp && *lbp)
+    genLine.lineCurr = (genLine.lineCurr ?
+                        connectLine (genLine.lineCurr, newLineNode (lb)) : (genLine.lineHead = newLineNode (lb)));
+  genLine.lineCurr->isInline = genLine.lineElement.isInline;
+  genLine.lineCurr->isDebug = genLine.lineElement.isDebug;
+  genLine.lineCurr->isLabel = (lbp[strlen (lbp) - 1] == ':');
+  genLine.lineCurr->isComment = (*lbp == ';');
 
 // VR    fprintf(stderr, "lb = <%s>\n", lbp);
 
 //    if(pic16_debug_verbose)
 //      pic16_addpCode2pBlock(pb,pic16_newpCodeCharP(lb));
 
-    va_end(ap);
+  va_end (ap);
 }
 #endif
 
@@ -355,81 +340,90 @@
 /*   with a debugger symbol                                        */
 /*-----------------------------------------------------------------*/
 void
-pic16_emitDebuggerSymbol (const char * debugSym)
+pic16_emitDebuggerSymbol (const char *debugSym)
 {
-  _G.debugLine = 1;
+  genLine.lineElement.isDebug = 1;
   pic16_emitcode (";", "%s ==.", debugSym);
-  _G.debugLine = 0;
+  genLine.lineElement.isDebug = 0;
 }
 
 /*-----------------------------------------------------------------*/
 /* newAsmop - creates a new asmOp                                  */
 /*-----------------------------------------------------------------*/
-static asmop *newAsmop (short type)
+static asmop *
+newAsmop (short type)
 {
-    asmop *aop;
+  asmop *aop;
 
-    aop = Safe_calloc(1,sizeof(asmop));
-    aop->type = type;
-    return aop;
+  aop = Safe_calloc (1, sizeof (asmop));
+  aop->type = type;
+  return aop;
 }
 
 /*-----------------------------------------------------------------*/
 /* resolveIfx - converts an iCode ifx into a form more useful for  */
 /*              generating code                                    */
 /*-----------------------------------------------------------------*/
-static void resolveIfx(resolvedIfx *resIfx, iCode *ifx)
+static void
+resolveIfx (resolvedIfx * resIfx, iCode * ifx)
 {
   FENTRY2;
 
 //  DEBUGpic16_emitcode("; ***","%s %d",__FUNCTION__,__LINE__);
 
-  if(!resIfx)
+  if (!resIfx)
     return;
 
 
-  resIfx->condition = 1;    /* assume that the ifx is true */
-  resIfx->generated = 0;    /* indicate that the ifx has not been used */
+  resIfx->condition = 1;        /* assume that the ifx is true */
+  resIfx->generated = 0;        /* indicate that the ifx has not been used */
 
-  if(!ifx) {
-    resIfx->lbl = newiTempLabel(NULL);  /* oops, there is no ifx. so create a label */
+  if (!ifx)
+    {
+      resIfx->lbl = newiTempLabel (NULL);       /* oops, there is no ifx. so create a label */
 
 #if 1
-    DEBUGpic16_emitcode("; ***","%s %d null ifx creating new label key =%d",
-                        __FUNCTION__,__LINE__,resIfx->lbl->key);
+      DEBUGpic16_emitcode ("; ***", "%s %d null ifx creating new label key =%d", __FUNCTION__, __LINE__, resIfx->lbl->key);
 #endif
 
-  } else {
-    if(IC_TRUE(ifx)) {
-      resIfx->lbl = IC_TRUE(ifx);
-    } else {
-      resIfx->lbl = IC_FALSE(ifx);
-      resIfx->condition = 0;
     }
+  else
+    {
+      if (IC_TRUE (ifx))
+        {
+          resIfx->lbl = IC_TRUE (ifx);
+        }
+      else
+        {
+          resIfx->lbl = IC_FALSE (ifx);
+          resIfx->condition = 0;
+        }
 
 #if 1
-    if(IC_TRUE(ifx))
-      DEBUGpic16_emitcode("; +++","ifx true is non-null");
-    else
-      DEBUGpic16_emitcode("; +++","ifx true is null");
-    if(IC_FALSE(ifx))
-      DEBUGpic16_emitcode("; +++","ifx false is non-null");
-    else
-      DEBUGpic16_emitcode("; +++","ifx false is null");
+      if (IC_TRUE (ifx))
+        DEBUGpic16_emitcode ("; +++", "ifx true is non-null");
+      else
+        DEBUGpic16_emitcode ("; +++", "ifx true is null");
+      if (IC_FALSE (ifx))
+        DEBUGpic16_emitcode ("; +++", "ifx false is non-null");
+      else
+        DEBUGpic16_emitcode ("; +++", "ifx false is null");
 #endif
-  }
+    }
 
-  DEBUGpic16_emitcode("; ***","%s lbl->key=%d, (lab offset=%d)",__FUNCTION__,resIfx->lbl->key,pic16_labelOffset);
+  DEBUGpic16_emitcode ("; ***", "%s lbl->key=%d, (lab offset=%d)", __FUNCTION__, resIfx->lbl->key, pic16_labelOffset);
 
 }
+
 #if 0
 /*-----------------------------------------------------------------*/
 /* pointerCode - returns the code for a pointer type               */
 /*-----------------------------------------------------------------*/
-static int pointerCode (sym_link *etype)
+static int
+pointerCode (sym_link * etype)
 {
 
-    return PTR_TYPE(SPEC_OCLS(etype));
+  return PTR_TYPE (SPEC_OCLS (etype));
 
 }
 #endif
@@ -437,103 +431,116 @@
 /*-----------------------------------------------------------------*/
 /* aopForSym - for a true symbol                                   */
 /*-----------------------------------------------------------------*/
-static asmop *aopForSym (iCode *ic, operand *op, bool result)
+static asmop *
+aopForSym (iCode * ic, operand * op, bool result)
 {
-    symbol *sym=OP_SYMBOL(op);
-    asmop *aop;
-    memmap *space= SPEC_OCLS(sym->etype);
+  symbol *sym = OP_SYMBOL (op);
+  asmop *aop;
+  memmap *space = SPEC_OCLS (sym->etype);
 
-    FENTRY2;
+  FENTRY2;
 
-    _G.resDirect = 0;   /* clear flag that instructs the result is loaded directly from aopForSym */
+  _G.resDirect = 0;             /* clear flag that instructs the result is loaded directly from aopForSym */
 
 //    sym = OP_SYMBOL(op);
 
-    /* if already has one */
-    if (sym->aop) {
-            DEBUGpic16_emitcode("; ***", "already has sym %s %d", __FUNCTION__, __LINE__);
-        return sym->aop;
+  /* if already has one */
+  if (sym->aop)
+    {
+      DEBUGpic16_emitcode ("; ***", "already has sym %s %d", __FUNCTION__, __LINE__);
+      return sym->aop;
     }
 
 #if 0
-    /* if symbol was initially placed onStack then we must re-place it
-     * to direct memory, since pic16 does not have a specific stack */
-    if(sym->onStack) {
-        fprintf(stderr, "%s:%d symbol %s on stack\n", __FILE__, __LINE__, OP_SYMBOL(op)->name);
+  /* if symbol was initially placed onStack then we must re-place it
+   * to direct memory, since pic16 does not have a specific stack */
+  if (sym->onStack)
+    {
+      fprintf (stderr, "%s:%d symbol %s on stack\n", __FILE__, __LINE__, OP_SYMBOL (op)->name);
     }
 #endif
 
 
 #if 0
-    if(sym->iaccess) {
-      if(space->paged) {
-        fprintf(stderr, "%s:%d symbol %s points to paged data\n", __FILE__, __LINE__, sym->name);
+  if (sym->iaccess)
+    {
+      if (space->paged)
+        {
+          fprintf (stderr, "%s:%d symbol %s points to paged data\n", __FILE__, __LINE__, sym->name);
 
-        sym->aop = aop = newAsmop (AOP_PAGED);
-        aop->aopu.aop_dir = sym->rname ;
-        aop->size = getSize(sym->type);
-        DEBUGpic16_emitcode(";","%d sym->rname = %s, size = %d",__LINE__,sym->rname,aop->size);
-        pic16_allocDirReg( IC_LEFT(ic) );
-        return aop;
-      }
-      assert( 0 );
+          sym->aop = aop = newAsmop (AOP_PAGED);
+          aop->aopu.aop_dir = sym->rname;
+          aop->size = getSize (sym->type);
+          DEBUGpic16_emitcode (";", "%d sym->rname = %s, size = %d", __LINE__, sym->rname, aop->size);
+          pic16_allocDirReg (IC_LEFT (ic));
+          return aop;
+        }
+      assert (0);
     }
 #endif
 
 #if 1
-    /* assign depending on the storage class */
-    /* if it is on the stack or indirectly addressable */
-    /* space we need to assign either r0 or r1 to it   */
-    if (sym->onStack)   // || sym->iaccess)
+  /* assign depending on the storage class */
+  /* if it is on the stack or indirectly addressable */
+  /* space we need to assign either r0 or r1 to it   */
+  if (sym->onStack)             // || sym->iaccess)
     {
       pCodeOp *pcop[4];
       int i;
 
-        DEBUGpic16_emitcode("; ***", "%s:%d sym->onStack:%d || sym->iaccess:%d",
-                __FUNCTION__, __LINE__, sym->onStack, sym->iaccess);
+      DEBUGpic16_emitcode ("; ***", "%s:%d sym->onStack:%d || sym->iaccess:%d",
+                           __FUNCTION__, __LINE__, sym->onStack, sym->iaccess);
 
-        /* acquire a temporary register -- it is saved in function */
+      /* acquire a temporary register -- it is saved in function */
 
-        sym->aop = aop = newAsmop(AOP_STA);
-        aop->aopu.stk.stk = sym->stack;
-        aop->size = getSize(sym->type);
+      sym->aop = aop = newAsmop (AOP_STA);
+      aop->aopu.stk.stk = sym->stack;
+      aop->size = getSize (sym->type);
 
 
-        DEBUGpic16_emitcode("; +++ ", "%s:%d\top = %s", __FILE__, __LINE__, pic16_decodeOp(ic->op));
-        if((ic->op == '=' /*|| ic->op == CAST*/) && IC_RESULT(ic) && AOP( IC_RESULT(ic) )
-          && (AOP_TYPE(IC_RESULT(ic)) == AOP_REG)) {
+      DEBUGpic16_emitcode ("; +++ ", "%s:%d\top = %s", __FILE__, __LINE__, pic16_decodeOp (ic->op));
+      if ((ic->op == '=' /*|| ic->op == CAST */ ) && IC_RESULT (ic) && AOP (IC_RESULT (ic))
+          && (AOP_TYPE (IC_RESULT (ic)) == AOP_REG))
+        {
 //          pic16_DumpAop("aopForSym", AOP( IC_RESULT(ic) ));
 
-          for(i=0;i<aop->size;i++)
-            aop->aopu.stk.pop[i] = pcop[i] = pic16_popRegFromIdx( AOP(IC_RESULT(ic))->aopu.aop_reg[i]->rIdx);
-            _G.resDirect = 1;   /* notify that result will be loaded directly from aopForSym */
-        } else
-        if(1 && ic->op == SEND) {
+          for (i = 0; i < aop->size; i++)
+            aop->aopu.stk.pop[i] = pcop[i] = pic16_popRegFromIdx (AOP (IC_RESULT (ic))->aopu.aop_reg[i]->rIdx);
+          _G.resDirect = 1;     /* notify that result will be loaded directly from aopForSym */
+        }
+      else if (1 && ic->op == SEND)
+        {
 
           /* if SEND do the send here */
           _G.resDirect = 1;
-        } else {
+        }
+      else
+        {
 //                debugf3("symbol `%s' level = %d / %d\n", sym->name, ic->level, ic->seq);
-          for(i=0;i<aop->size;i++) {
-            aop->aopu.stk.pop[i] = pcop[i] = pic16_popGetTempRegCond(_G.fregsUsed, _G.sregsAlloc, 0 );
-            _G.sregsAlloc = bitVectSetBit(_G.sregsAlloc, PCOR(pcop[i])->r->rIdx);
-          }
+          for (i = 0; i < aop->size; i++)
+            {
+              aop->aopu.stk.pop[i] = pcop[i] = pic16_popGetTempRegCond (_G.fregsUsed, _G.sregsAlloc, 0);
+              _G.sregsAlloc = bitVectSetBit (_G.sregsAlloc, PCOR (pcop[i])->r->rIdx);
+            }
         }
 
 
 //        fprintf(stderr, "%s:%d\t%s\tsym size %d\n", __FILE__, __LINE__, __FUNCTION__, aop->size);
 
 #if 1
-        DEBUGpic16_emitcode(";","%d sym->rname = %s, size = %d stack = %d",__LINE__,sym->rname,aop->size, sym->stack);
+      DEBUGpic16_emitcode (";", "%d sym->rname = %s, size = %d stack = %d", __LINE__, sym->rname, aop->size, sym->stack);
 
-        // we do not need to load the value if it is to be defined...
-        if (result) return aop;
+      // we do not need to load the value if it is to be defined...
+      if (result)
+        return aop;
 
-        if(_G.accInUse) {
-                pic16_pushpCodeOp( pic16_popCopyReg(&pic16_pc_wreg) );
+      if (_G.accInUse)
+        {
+          pic16_pushpCodeOp (pic16_popCopyReg (&pic16_pc_wreg));
         }
 
-        for(i=0;i<aop->size;i++) {
+      for (i = 0; i < aop->size; i++)
+        {
 
           /* initialise for stack access via frame pointer */
           // operands on stack are accessible via "{FRAME POINTER} + index" with index
@@ -541,258 +548,284 @@
           // local variables (index == 0 is not assigned so we add one here)
           {
             int soffs = sym->stack;
-            if (soffs <= 0) {
-              assert (soffs < 0);
-              soffs++;
-            } // if
+            if (soffs <= 0)
+              {
+                assert (soffs < 0);
+                soffs++;
+              }                 // if
 
-            if(1 && ic->op == SEND) {
-              pic16_emitpcode(POC_MOVLW, pic16_popGetLit(soffs + aop->size - i - 1 /*+ _G.stack_lat*/));
-              pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                    pic16_popCopyReg( pic16_frame_plusw ),
-                    pic16_popCopyReg(pic16_stack_postdec )));
-            } else {
-              pic16_emitpcode(POC_MOVLW, pic16_popGetLit(soffs + i /*+ _G.stack_lat*/));
-              pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                  pic16_popCopyReg( pic16_frame_plusw ), pcop[i]));
-            }
+            if (1 && ic->op == SEND)
+              {
+                pic16_emitpcode (POC_MOVLW, pic16_popGetLit (soffs + aop->size - i - 1 /*+ _G.stack_lat */ ));
+                pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popCopyReg (pic16_frame_plusw),
+                                 pic16_popCopyReg (pic16_stack_postdec)));
+              }
+            else
+              {
+                pic16_emitpcode (POC_MOVLW, pic16_popGetLit (soffs + i /*+ _G.stack_lat */ ));
+                pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popCopyReg (pic16_frame_plusw), pcop[i]));
+              }
           }
         }
 
-        if(_G.accInUse) {
-                pic16_poppCodeOp( pic16_popCopyReg(&pic16_pc_wreg) );
+      if (_G.accInUse)
+        {
+          pic16_poppCodeOp (pic16_popCopyReg (&pic16_pc_wreg));
         }
 
-        return (aop);
+      return (aop);
 #endif
 
 #if 0
-        /* now assign the address of the variable to
-        the pointer register */
-        if (aop->type != AOP_STK) {
-
-            if (sym->onStack) {
-                    if ( _G.accInUse )
-                        pic16_emitcode("push","acc");
-
-                    pic16_emitcode("mov","a,_bp");
-                    pic16_emitcode("add","a,#0x%02x",
-                             ((sym->stack < 0) ?
-                              ((char)(sym->stack - _G.nRegsSaved )) :
-                              ((char)sym->stack)) & 0xff);
-                    pic16_emitcode("mov","%s,a",
-                             aop->aopu.aop_ptr->name);
-
-                    if ( _G.accInUse )
-                        pic16_emitcode("pop","acc");
-            } else
-                pic16_emitcode("mov","%s,#%s",
-                         aop->aopu.aop_ptr->name,
-                         sym->rname);
-            aop->paged = space->paged;
-        } else
-            aop->aopu.aop_stk = sym->stack;
-        return aop;
+      /* now assign the address of the variable to
+         the pointer register */
+      if (aop->type != AOP_STK)
+        {
+
+          if (sym->onStack)
+            {
+              if (_G.accInUse)
+                pic16_emitcode ("push", "acc");
+
+              pic16_emitcode ("mov", "a,_bp");
+              pic16_emitcode ("add", "a,#0x%02x",
+                              ((sym->stack < 0) ? ((char) (sym->stack - _G.nRegsSaved)) : ((char) sym->stack)) & 0xff);
+              pic16_emitcode ("mov", "%s,a", aop->aopu.aop_ptr->name);
+
+              if (_G.accInUse)
+                pic16_emitcode ("pop", "acc");
+            }
+          else
+            pic16_emitcode ("mov", "%s,#%s", aop->aopu.aop_ptr->name, sym->rname);
+          aop->paged = space->paged;
+        }
+      else
+        aop->aopu.aop_stk = sym->stack;
+      return aop;
 #endif
 
     }
 #endif
 
 #if 1
-    /* special case for a function */
-    if (IS_FUNC(sym->type)) {
-        sym->aop = aop = newAsmop(AOP_PCODE);
-        aop->aopu.pcop = pic16_popGetImmd(sym->rname, 0, 0);
-        PCOI(aop->aopu.pcop)->_const = IN_CODESPACE(space);
-        PCOI(aop->aopu.pcop)->index = 0;
-        aop->size = FPTRSIZE;
-        DEBUGpic16_emitcode(";","%d size = %d, name =%s",__LINE__,aop->size,sym->rname);
-        return aop;
+  /* special case for a function */
+  if (IS_FUNC (sym->type))
+    {
+      sym->aop = aop = newAsmop (AOP_PCODE);
+      aop->aopu.pcop = pic16_popGetImmd (sym->rname, 0, 0);
+      PCOI (aop->aopu.pcop)->_const = IN_CODESPACE (space);
+      PCOI (aop->aopu.pcop)->index = 0;
+      aop->size = FPTRSIZE;
+      DEBUGpic16_emitcode (";", "%d size = %d, name =%s", __LINE__, aop->size, sym->rname);
+      return aop;
     }
 #endif
 
 
 
-    //DEBUGpic16_emitcode(";","%d",__LINE__);
-    /* if in bit space */
-    if (IN_BITSPACE(space)) {
-        sym->aop = aop = newAsmop (AOP_CRY);
-        aop->aopu.aop_dir = sym->rname ;
-        aop->size = getSize(sym->type);
-        DEBUGpic16_emitcode(";","%d sym->rname = %s, size = %d",__LINE__,sym->rname,aop->size);
-        return aop;
+  //DEBUGpic16_emitcode(";","%d",__LINE__);
+  /* if in bit space */
+  if (IN_BITSPACE (space))
+    {
+      sym->aop = aop = newAsmop (AOP_CRY);
+      aop->aopu.aop_dir = sym->rname;
+      aop->size = getSize (sym->type);
+      DEBUGpic16_emitcode (";", "%d sym->rname = %s, size = %d", __LINE__, sym->rname, aop->size);
+      return aop;
     }
-    /* if it is in direct space */
-    if (IN_DIRSPACE(space)) {
-                if(!strcmp(sym->rname, "_WREG")) {
-                        sym->aop = aop = newAsmop (AOP_ACC);
-                        aop->size = getSize(sym->type);         /* should always be 1 */
-                        assert(aop->size == 1);
-                        DEBUGpic16_emitcode(";","%d sym->rname (AOP_ACC) = %s, size = %d",__LINE__,sym->rname,aop->size);
-                        return (aop);
-                } else {
-                        sym->aop = aop = newAsmop (AOP_DIR);
-                aop->aopu.aop_dir = sym->rname ;
-            aop->size = getSize(sym->type);
-                DEBUGpic16_emitcode(";","%d sym->rname (AOP_DIR) = %s, size = %d",__LINE__,sym->rname,aop->size);
-                        pic16_allocDirReg( IC_LEFT(ic) );
-                        return (aop);
-                }
+  /* if it is in direct space */
+  if (IN_DIRSPACE (space))
+    {
+      if (!strcmp (sym->rname, "_WREG"))
+        {
+          sym->aop = aop = newAsmop (AOP_ACC);
+          aop->size = getSize (sym->type);      /* should always be 1 */
+          assert (aop->size == 1);
+          DEBUGpic16_emitcode (";", "%d sym->rname (AOP_ACC) = %s, size = %d", __LINE__, sym->rname, aop->size);
+          return (aop);
+        }
+      else
+        {
+          sym->aop = aop = newAsmop (AOP_DIR);
+          aop->aopu.aop_dir = sym->rname;
+          aop->size = getSize (sym->type);
+          DEBUGpic16_emitcode (";", "%d sym->rname (AOP_DIR) = %s, size = %d", __LINE__, sym->rname, aop->size);
+          pic16_allocDirReg (IC_LEFT (ic));
+          return (aop);
         }
+    }
 
-    if (IN_FARSPACE(space) && !IN_CODESPACE(space)) {
-        sym->aop = aop = newAsmop (AOP_DIR);
-        aop->aopu.aop_dir = sym->rname ;
-        aop->size = getSize(sym->type);
-        DEBUGpic16_emitcode(";","%d sym->rname = %s, size = %d",__LINE__,sym->rname,aop->size);
-        pic16_allocDirReg( IC_LEFT(ic) );
-        return aop;
+  if (IN_FARSPACE (space) && !IN_CODESPACE (space))
+    {
+      sym->aop = aop = newAsmop (AOP_DIR);
+      aop->aopu.aop_dir = sym->rname;
+      aop->size = getSize (sym->type);
+      DEBUGpic16_emitcode (";", "%d sym->rname = %s, size = %d", __LINE__, sym->rname, aop->size);
+      pic16_allocDirReg (IC_LEFT (ic));
+      return aop;
     }
 
 
-    /* only remaining is far space */
-    sym->aop = aop = newAsmop(AOP_PCODE);
+  /* only remaining is far space */
+  sym->aop = aop = newAsmop (AOP_PCODE);
 
-/* change the next if to 1 to revert to good old immediate code */
-        if(IN_CODESPACE(space)) {
-                aop->aopu.pcop = pic16_popGetImmd(sym->rname, 0, 0);
-                PCOI(aop->aopu.pcop)->_const = IN_CODESPACE(space);
-                PCOI(aop->aopu.pcop)->index = 0;
-        } else {
-                /* try to allocate via direct register */
-                aop->aopu.pcop = pic16_popRegFromString(sym->rname, getSize(sym->type), sym->offset, op); // Patch 8
+  /* change the next if to 1 to revert to good old immediate code */
+  if (IN_CODESPACE (space))
+    {
+      aop->aopu.pcop = pic16_popGetImmd (sym->rname, 0, 0);
+      PCOI (aop->aopu.pcop)->_const = IN_CODESPACE (space);
+      PCOI (aop->aopu.pcop)->index = 0;
+    }
+  else
+    {
+      /* try to allocate via direct register */
+      aop->aopu.pcop = pic16_popRegFromString (sym->rname, getSize (sym->type), sym->offset, op);       // Patch 8
 //              aop->size = getSize( sym->type );
-        }
+    }
 
-        DEBUGpic16_emitcode(";","%d: rname %s, val %d, const = %d",
-                __LINE__,sym->rname, 0, PCOI(aop->aopu.pcop)->_const);
+  DEBUGpic16_emitcode (";", "%d: rname %s, val %d, const = %d", __LINE__, sym->rname, 0, PCOI (aop->aopu.pcop)->_const);
 
 #if 0
-        if(!pic16_allocDirReg (IC_LEFT(ic)))
-                return NULL;
+  if (!pic16_allocDirReg (IC_LEFT (ic)))
+    return NULL;
 #endif
 
-        if(IN_DIRSPACE( space ))
-                aop->size = PTRSIZE;
-        else if(IN_CODESPACE( space ) || IN_FARSPACE( space ))
-                aop->size = FPTRSIZE;
-        else if(IC_LEFT(ic) && AOP(IC_LEFT(ic))) aop->size = AOP_SIZE( IC_LEFT(ic) );
-        else if(IC_RIGHT(ic) && AOP(IC_RIGHT(ic))) aop->size = AOP_SIZE( IC_RIGHT(ic) );
-        else if(sym->onStack) {
-                aop->size = PTRSIZE;
-        } else {
-          if(SPEC_SCLS(sym->etype) == S_PDATA) {
-            fprintf(stderr, "%s: %d symbol in PDATA space\n", __FILE__, __LINE__);
-            aop->size = FPTRSIZE;
-          } else
-                assert( 0 );
+  if (IN_DIRSPACE (space))
+    aop->size = PTRSIZE;
+  else if (IN_CODESPACE (space) || IN_FARSPACE (space))
+    aop->size = FPTRSIZE;
+  else if (IC_LEFT (ic) && AOP (IC_LEFT (ic)))
+    aop->size = AOP_SIZE (IC_LEFT (ic));
+  else if (IC_RIGHT (ic) && AOP (IC_RIGHT (ic)))
+    aop->size = AOP_SIZE (IC_RIGHT (ic));
+  else if (sym->onStack)
+    {
+      aop->size = PTRSIZE;
+    }
+  else
+    {
+      if (SPEC_SCLS (sym->etype) == S_PDATA)
+        {
+          fprintf (stderr, "%s: %d symbol in PDATA space\n", __FILE__, __LINE__);
+          aop->size = FPTRSIZE;
         }
+      else
+        assert (0);
+    }
 
-    DEBUGpic16_emitcode(";","%d size = %d",__LINE__,aop->size);
+  DEBUGpic16_emitcode (";", "%d size = %d", __LINE__, aop->size);
 
-    /* if it is in code space */
-    if (IN_CODESPACE(space))
-        aop->code = 1;
+  /* if it is in code space */
+  if (IN_CODESPACE (space))
+    aop->code = 1;
 
-    return aop;
+  return aop;
 }
 
 /*-----------------------------------------------------------------*/
 /* aopForRemat - rematerialzes an object                           */
 /*-----------------------------------------------------------------*/
-static asmop *aopForRemat (operand *op, bool result) // x symbol *sym)
+static asmop *
+aopForRemat (operand * op, bool result) // x symbol *sym)
 {
-  symbol *sym = OP_SYMBOL(op);
+  symbol *sym = OP_SYMBOL (op);
   operand *refop;
-  iCode *ic = NULL, *oldic;
-  asmop *aop = newAsmop(AOP_PCODE);
+  iCode *ic = NULL;
+  asmop *aop = newAsmop (AOP_PCODE);
   int val = 0;
-  int offset = 0;
-  int viaimmd=0;
+  int viaimmd = 0;
 
-    FENTRY2;
+  FENTRY2;
 
-        ic = sym->rematiCode;
+  ic = sym->rematiCode;
 
-        if(IS_OP_POINTER(op)) {
-                DEBUGpic16_emitcode(";","%s %d IS_OP_POINTER",__FUNCTION__,__LINE__);
-        }
+  if (IS_OP_POINTER (op))
+    {
+      DEBUGpic16_emitcode (";", "%s %d IS_OP_POINTER", __FUNCTION__, __LINE__);
+    }
 
 //    if(!result)               /* fixme-vr */
-        for (;;) {
-                oldic = ic;
-
+  for (;;)
+    {
 //              chat *iLine = printILine(ic);
 //              pic16_emitpcomment("ic: %s\n", iLine);
 //              dbuf_free(iLine);
 
-                if (ic->op == '+') {
-                        val += (int) operandLitValue(IC_RIGHT(ic));
-                } else if (ic->op == '-') {
-                        val -= (int) operandLitValue(IC_RIGHT(ic));
-                } else
-                        break;
-
-                ic = OP_SYMBOL(IC_LEFT(ic))->rematiCode;
+      if (ic->op == '+')
+        {
+          val += (int) operandLitValue (IC_RIGHT (ic));
         }
+      else if (ic->op == '-')
+        {
+          val -= (int) operandLitValue (IC_RIGHT (ic));
+        }
+      else
+        break;
 
-        offset = OP_SYMBOL(IC_LEFT(ic))->offset;
-        refop = IC_LEFT(ic);
+      ic = OP_SYMBOL (IC_LEFT (ic))->rematiCode;
+    }
+
+  refop = IC_LEFT (ic);
 
-        if(!op->isaddr)viaimmd++; else viaimmd=0;
+  if (!op->isaddr)
+    viaimmd++;
+  else
+    viaimmd = 0;
 
-/* set the following if to 1 to revert to good old immediate code */
-        if(IN_CODESPACE( SPEC_OCLS( OP_SYM_ETYPE(refop)))
-                || viaimmd) {
+  /* set the following if to 1 to revert to good old immediate code */
+  if (IN_CODESPACE (SPEC_OCLS (OP_SYM_ETYPE (refop))) || viaimmd)
+    {
 
-                DEBUGpic16_emitcode(";", "%s:%d immediate, size: %d", __FILE__, __LINE__, getSize( sym->type ));
+      DEBUGpic16_emitcode (";", "%s:%d immediate, size: %d", __FILE__, __LINE__, getSize (sym->type));
 
-                aop->aopu.pcop = pic16_popGetImmd(OP_SYMBOL(IC_LEFT(ic))->rname, 0, val);
+      aop->aopu.pcop = pic16_popGetImmd (OP_SYMBOL (IC_LEFT (ic))->rname, 0, val);
 
 #if 0
-                PCOI(aop->aopu.pcop)->_const = IS_PTR_CONST(operandType(op));
+      PCOI (aop->aopu.pcop)->_const = IS_PTR_CONST (operandType (op));
 #else
-                PCOI(aop->aopu.pcop)->_const = IS_CODEPTR(operandType(op));
+      PCOI (aop->aopu.pcop)->_const = IS_CODEPTR (operandType (op));
 #endif
 
-                PCOI(aop->aopu.pcop)->index = val;
+      PCOI (aop->aopu.pcop)->index = val;
 
-                aop->size = getSize( sym->type );
-        } else {
-                DEBUGpic16_emitcode(";", "%s:%d dir size: %d", __FILE__, __LINE__,  getSize( OP_SYMBOL( IC_LEFT(ic))->type));
+      aop->size = getSize (sym->type);
+    }
+  else
+    {
+      DEBUGpic16_emitcode (";", "%s:%d dir size: %d", __FILE__, __LINE__, getSize (OP_SYMBOL (IC_LEFT (ic))->type));
 
-                aop->aopu.pcop = pic16_popRegFromString(OP_SYMBOL(IC_LEFT(ic))->rname,
-                                getSize( OP_SYMBOL( IC_LEFT(ic))->type), val, op);
+      aop->aopu.pcop = pic16_popRegFromString (OP_SYMBOL (IC_LEFT (ic))->rname,
+                       getSize (OP_SYMBOL (IC_LEFT (ic))->type), val, op);
 
-                aop->size = getSize( OP_SYMBOL( IC_LEFT(ic))->type );
-        }
+      aop->size = getSize (OP_SYMBOL (IC_LEFT (ic))->type);
+    }
 
 
-        DEBUGpic16_emitcode(";","%d: rname %s, val %d, const = %d",
-                __LINE__,OP_SYMBOL(IC_LEFT(ic))->rname,
+  DEBUGpic16_emitcode (";", "%d: rname %s, val %d, const = %d", __LINE__, OP_SYMBOL (IC_LEFT (ic))->rname,
 #if 0
-                val, IS_PTR_CONST(operandType(op)));
+                       val, IS_PTR_CONST (operandType (op)));
 #else
-                val, IS_CODEPTR(operandType(op)));
+                       val, IS_CODEPTR (operandType (op)));
 #endif
 
 //      DEBUGpic16_emitcode(";","aop type  %s",pic16_AopType(AOP_TYPE(IC_LEFT(ic))));
 
-        pic16_allocDirReg (IC_LEFT(ic));
+  pic16_allocDirReg (IC_LEFT (ic));
 
-        if(IN_CODESPACE( SPEC_OCLS( OP_SYM_ETYPE(op)) ))
-                aop->code = 1;
+  if (IN_CODESPACE (SPEC_OCLS (OP_SYM_ETYPE (op))))
+    aop->code = 1;
 
   return aop;
 }
 
 #if 0
-static int aopIdx (asmop *aop, int offset)
+static int
+aopIdx (asmop * aop, int offset)
 {
-  if(!aop)
+  if (!aop)
     return -1;
 
-  if(aop->type !=  AOP_REG)
+  if (aop->type != AOP_REG)
     return -2;
 
   return aop->aopu.aop_reg[offset]->rIdx;
@@ -803,128 +836,129 @@
 /*-----------------------------------------------------------------*/
 /* regsInCommon - two operands have some registers in common       */
 /*-----------------------------------------------------------------*/
-static bool regsInCommon (operand *op1, operand *op2)
+static bool
+regsInCommon (operand * op1, operand * op2)
 {
-    symbol *sym1, *sym2;
-    int i;
+  symbol *sym1, *sym2;
+  int i;
 
-    /* if they have registers in common */
-    if (!IS_SYMOP(op1) || !IS_SYMOP(op2))
-        return FALSE ;
+  /* if they have registers in common */
+  if (!IS_SYMOP (op1) || !IS_SYMOP (op2))
+    return FALSE;
 
-    sym1 = OP_SYMBOL(op1);
-    sym2 = OP_SYMBOL(op2);
+  sym1 = OP_SYMBOL (op1);
+  sym2 = OP_SYMBOL (op2);
 
-    if (sym1->nRegs == 0 || sym2->nRegs == 0)
-        return FALSE ;
+  if (sym1->nRegs == 0 || sym2->nRegs == 0)
+    return FALSE;
 
-    for (i = 0 ; i < sym1->nRegs ; i++) {
-        int j;
-        if (!sym1->regs[i])
-            continue ;
+  for (i = 0; i < sym1->nRegs; i++)
+    {
+      int j;
+      if (!sym1->regs[i])
+        continue;
 
-        for (j = 0 ; j < sym2->nRegs ;j++ ) {
-            if (!sym2->regs[j])
-                continue ;
+      for (j = 0; j < sym2->nRegs; j++)
+        {
+          if (!sym2->regs[j])
+            continue;
 
-            if (sym2->regs[j] == sym1->regs[i])
-                return TRUE ;
+          if (sym2->regs[j] == sym1->regs[i])
+            return TRUE;
         }
     }
 
-    return FALSE ;
+  return FALSE;
 }
 
 /*-----------------------------------------------------------------*/
 /* operandsEqu - equivalent                                        */
 /*-----------------------------------------------------------------*/
-static bool operandsEqu ( operand *op1, operand *op2)
+static bool
+operandsEqu (operand * op1, operand * op2)
 {
-    symbol *sym1, *sym2;
+  symbol *sym1, *sym2;
 
-    /* if they not symbols */
-    if (!IS_SYMOP(op1) || !IS_SYMOP(op2))
-        return FALSE;
+  /* if they not symbols */
+  if (!IS_SYMOP (op1) || !IS_SYMOP (op2))
+    return FALSE;
 
-    sym1 = OP_SYMBOL(op1);
-    sym2 = OP_SYMBOL(op2);
+  sym1 = OP_SYMBOL (op1);
+  sym2 = OP_SYMBOL (op2);
 
-    /* if both are itemps & one is spilt
-       and the other is not then false */
-    if (IS_ITEMP(op1) && IS_ITEMP(op2) &&
-        sym1->isspilt != sym2->isspilt )
-        return FALSE ;
-
-    /* if they are the same */
-    if (sym1 == sym2)
-        return TRUE ;
+  /* if both are itemps & one is spilt
+     and the other is not then false */
+  if (IS_ITEMP (op1) && IS_ITEMP (op2) && sym1->isspilt != sym2->isspilt)
+    return FALSE;
 
-    if (sym1->rname[0] && sym2->rname[0]
-        && strcmp (sym1->rname, sym2->rname) == 0)
-        return TRUE;
+  /* if they are the same */
+  if (sym1 == sym2)
+    return TRUE;
 
+  if (sym1->rname[0] && sym2->rname[0] && strcmp (sym1->rname, sym2->rname) == 0)
+    return TRUE;
 
-    /* if left is a tmp & right is not */
-    if (IS_ITEMP(op1)  &&
-        !IS_ITEMP(op2) &&
-        sym1->isspilt  &&
-        (SYM_SPIL_LOC(sym1) == sym2))
-        return TRUE;
 
-    if (IS_ITEMP(op2)  &&
-        !IS_ITEMP(op1) &&
-        sym2->isspilt  &&
-        sym1->level > 0 &&
-        (SYM_SPIL_LOC(sym2) == sym1))
-        return TRUE ;
+  /* if left is a tmp & right is not */
+  if (IS_ITEMP (op1) && !IS_ITEMP (op2) && sym1->isspilt && (SYM_SPIL_LOC (sym1) == sym2))
+    return TRUE;
 
-    return FALSE ;
+  if (IS_ITEMP (op2) && !IS_ITEMP (op1) && sym2->isspilt && sym1->level > 0 && (SYM_SPIL_LOC (sym2) == sym1))
+    return TRUE;
+
+  return FALSE;
 }
 
 /*-----------------------------------------------------------------*/
 /* pic16_sameRegs - two asmops have the same registers                   */
 /*-----------------------------------------------------------------*/
-bool pic16_sameRegs (asmop *aop1, asmop *aop2 )
+bool
+pic16_sameRegs (asmop * aop1, asmop * aop2)
 {
-    int i;
+  int i;
 
-    if (aop1 == aop2)
-        return TRUE ;
+  if (aop1 == aop2)
+    return TRUE;
 
-    DEBUGpic16_emitcode(";***", "%s aop1->type = %s\taop2->type = %s\n", __FUNCTION__,
-                pic16_AopType(aop1->type), pic16_AopType(aop2->type));
+  DEBUGpic16_emitcode (";***", "%s aop1->type = %s\taop2->type = %s\n", __FUNCTION__,
+                       pic16_AopType (aop1->type), pic16_AopType (aop2->type));
 
-    if(aop1->type == AOP_ACC && aop2->type == AOP_ACC)return TRUE;
+  if (aop1->type == AOP_ACC && aop2->type == AOP_ACC)
+    return TRUE;
 
-    if (aop1->type != AOP_REG ||
-        aop2->type != AOP_REG )
-        return FALSE ;
+  if (aop1->type != AOP_REG || aop2->type != AOP_REG)
+    return FALSE;
 
-    /* This is a bit too restrictive if one is a subset of the other...
-    if (aop1->size != aop2->size )
-        return FALSE ;
-    */
+  /* This is a bit too restrictive if one is a subset of the other...
+     if (aop1->size != aop2->size )
+     return FALSE ;
+   */
 
-    for (i = 0 ; i < min(aop1->size, aop2->size) ; i++ ) {
+  for (i = 0; i < min (aop1->size, aop2->size); i++)
+    {
 //        if(aop1->aopu.aop_reg[i]->type != aop2->aopu.aop_reg[i]->type)return FALSE;
 
 //        if(aop1->aopu.aop_reg[i]->type == AOP_REG)
-        if (strcmp(aop1->aopu.aop_reg[i]->name, aop2->aopu.aop_reg[i]->name ))
-            return FALSE ;
+      if (strcmp (aop1->aopu.aop_reg[i]->name, aop2->aopu.aop_reg[i]->name))
+        return FALSE;
     }
 
-    return TRUE ;
+  return TRUE;
 }
 
-bool pic16_sameRegsOfs(asmop *aop1, asmop *aop2, int offset)
+bool
+pic16_sameRegsOfs (asmop * aop1, asmop * aop2, int offset)
 {
-    DEBUGpic16_emitcode(";***", "%s aop1->type = %s\taop2->type = %s (offset = %d)\n", __FUNCTION__,
-                pic16_AopType(aop1->type), pic16_AopType(aop2->type), offset);
+  DEBUGpic16_emitcode (";***", "%s aop1->type = %s\taop2->type = %s (offset = %d)\n", __FUNCTION__,
+                       pic16_AopType (aop1->type), pic16_AopType (aop2->type), offset);
 
-    if(aop1 == aop2)return TRUE;
-    if(aop1->type != AOP_REG || aop2->type != AOP_REG)return FALSE;
+  if (aop1 == aop2)
+    return TRUE;
+  if (aop1->type != AOP_REG || aop2->type != AOP_REG)
+    return FALSE;
 
-      if(strcmp(aop1->aopu.aop_reg[offset]->name, aop2->aopu.aop_reg[offset]->name))return FALSE;
+  if (strcmp (aop1->aopu.aop_reg[offset]->name, aop2->aopu.aop_reg[offset]->name))
+    return FALSE;
 
   return TRUE;
 }
@@ -933,308 +967,340 @@
 /*-----------------------------------------------------------------*/
 /* pic16_aopOp - allocates an asmop for an operand  :                    */
 /*-----------------------------------------------------------------*/
-void pic16_aopOp (operand *op, iCode *ic, bool result)
+void
+pic16_aopOp (operand * op, iCode * ic, bool result)
 {
-    asmop *aop;
-    symbol *sym;
-    int i;
+  asmop *aop;
+  symbol *sym;
+  int i;
 
-    if (!op)
-        return ;
+  if (!op)
+    return;
 
-    DEBUGpic16_emitcode(";","%s %d",__FUNCTION__, __LINE__);
+  DEBUGpic16_emitcode (";", "%s %d", __FUNCTION__, __LINE__);
 
-    /* if this a literal */
-    if (IS_OP_LITERAL(op)) {
-        op->aop = aop = newAsmop(AOP_LIT);
-        aop->aopu.aop_lit = OP_VALUE (op);
-        aop->size = getSize(operandType(op));
-        return;
+  /* if this a literal */
+  if (IS_OP_LITERAL (op))
+    {
+      op->aop = aop = newAsmop (AOP_LIT);
+      aop->aopu.aop_lit = OP_VALUE (op);
+      aop->size = getSize (operandType (op));
+      return;
     }
 
-    {
-      sym_link *type = operandType(op);
+  {
+    sym_link *type = operandType (op);
 #if 0
-      if(IS_PTR_CONST(type))
+    if (IS_PTR_CONST (type))
 #else
-      if(IS_CODEPTR(type))
+    if (IS_CODEPTR (type))
 #endif
-        DEBUGpic16_emitcode(";","%d aop type is const pointer",__LINE__);
-    }
+      DEBUGpic16_emitcode (";", "%d aop type is const pointer", __LINE__);
+  }
 
-    /* if already has a asmop then continue */
-    if (op->aop)
-        return ;
+  /* if already has a asmop then continue */
+  if (op->aop)
+    return;
 
-    /* if the underlying symbol has a aop */
-    if (IS_SYMOP(op) && OP_SYMBOL(op)->aop) {
-      DEBUGpic16_emitcode(";","%d has symbol",__LINE__);
-        op->aop = OP_SYMBOL(op)->aop;
-        return;
+  /* if the underlying symbol has a aop */
+  if (IS_SYMOP (op) && OP_SYMBOL (op)->aop)
+    {
+      DEBUGpic16_emitcode (";", "%d has symbol", __LINE__);
+      op->aop = OP_SYMBOL (op)->aop;
+      return;
     }
 
-    /* if this is a true symbol */
-    if (IS_TRUE_SYMOP(op)) {
-        DEBUGpic16_emitcode(";","%d - true symop",__LINE__);
-      op->aop = aopForSym(ic, op, result);
-      return ;
-    }
-
-    /* this is a temporary : this has
-    only four choices :
-    a) register
-    b) spillocation
-    c) rematerialize
-    d) conditional
-    e) can be a return use only */
-
-    sym = OP_SYMBOL(op);
-
-    DEBUGpic16_emitcode("; ***", "%d: symbol name = %s, regType = %d", __LINE__, sym->name, sym->regType);
-    /* if the type is a conditional */
-    if (sym->regType == REG_CND) {
-        aop = op->aop = sym->aop = newAsmop(AOP_CRY);
-        aop->size = 0;
-        return;
+  /* if this is a true symbol */
+  if (IS_TRUE_SYMOP (op))
+    {
+      DEBUGpic16_emitcode (";", "%d - true symop", __LINE__);
+      op->aop = aopForSym (ic, op, result);
+      return;
+    }
+
+  /* this is a temporary : this has
+     only four choices :
+     a) register
+     b) spillocation
+     c) rematerialize
+     d) conditional
+     e) can be a return use only */
+
+  sym = OP_SYMBOL (op);
+
+  DEBUGpic16_emitcode ("; ***", "%d: symbol name = %s, regType = %d", __LINE__, sym->name, sym->regType);
+  /* if the type is a conditional */
+  if (sym->regType == REG_CND)
+    {
+      aop = op->aop = sym->aop = newAsmop (AOP_CRY);
+      aop->size = 0;
+      return;
     }
 
-    /* if it is spilt then two situations
-    a) is rematerialize
-    b) has a spill location */
-    if (sym->isspilt || sym->nRegs == 0) {
+  /* if it is spilt then two situations
+     a) is rematerialize
+     b) has a spill location */
+  if (sym->isspilt || sym->nRegs == 0)
+    {
 
 //      debugf3("symbol %s\tisspilt: %d\tnRegs: %d\n", sym->rname, sym->isspilt, sym->nRegs);
-      DEBUGpic16_emitcode(";","%d",__LINE__);
-        /* rematerialize it NOW */
-        if (sym->remat) {
+      DEBUGpic16_emitcode (";", "%d", __LINE__);
+      /* rematerialize it NOW */
+      if (sym->remat)
+        {
 
-            sym->aop = op->aop = aop = aopForRemat (op, result);
-            return;
+          sym->aop = op->aop = aop = aopForRemat (op, result);
+          return;
         }
 
 #if 1
-        if (sym->accuse) {
-            int i;
-            aop = op->aop = sym->aop = newAsmop(AOP_ACC);
-            aop->size = getSize(sym->type);
-            for ( i = 0 ; i < 1 ; i++ ) {
-                aop->aopu.aop_str[i] = accUse[i];
+      if (sym->accuse)
+        {
+          int i;
+          aop = op->aop = sym->aop = newAsmop (AOP_ACC);
+          aop->size = getSize (sym->type);
+          for (i = 0; i < 1; i++)
+            {
+              aop->aopu.aop_str[i] = accUse[i];
 //                aop->aopu.pcop = pic16_popRegFromString("WREG", aop->size, SYM_SPIL_LOC(sym)->offset);
             }
-            fprintf(stderr, "%s:%d allocating AOP_ACC for sym= %s\n", __FILE__, __LINE__, sym->name);
-            DEBUGpic16_emitcode(";","%d size=%d",__LINE__,aop->size);
-            return;
+          fprintf (stderr, "%s:%d allocating AOP_ACC for sym= %s\n", __FILE__, __LINE__, sym->name);
+          DEBUGpic16_emitcode (";", "%d size=%d", __LINE__, aop->size);
+          return;
         }
 #endif
 
 #if 1
-        if (sym->ruonly) {
+      if (sym->ruonly)
+        {
           /*
-          sym->aop = op->aop = aop = newAsmop(AOP_PCODE);
-          aop->aopu.pcop = pic16_popGetImmd(SYM_SPIL_LOC(sym)->rname,0,SYM_SPIL_LOC(sym)->offset);
-          //pic16_allocDirReg (IC_LEFT(ic));
-          aop->size = getSize(sym->type);
-          */
+             sym->aop = op->aop = aop = newAsmop(AOP_PCODE);
+             aop->aopu.pcop = pic16_popGetImmd(SYM_SPIL_LOC(sym)->rname,0,SYM_SPIL_LOC(sym)->offset);
+             //pic16_allocDirReg (IC_LEFT(ic));
+             aop->size = getSize(sym->type);
+           */
 
           unsigned i;
 
-          aop = op->aop = sym->aop = newAsmop(AOP_REG);
-          aop->size = getSize(sym->type);
-          for ( i = 0 ; i < pic16_fReturnSizePic ; i++ )
-            aop->aopu.aop_reg[i] = PCOR(pic16_popRegFromIdx( fReturnIdx[i] ))->r;
+          aop = op->aop = sym->aop = newAsmop (AOP_REG);
+          aop->size = getSize (sym->type);
+          for (i = 0; i < pic16_fReturnSizePic; i++)
+            aop->aopu.aop_reg[i] = PCOR (pic16_popRegFromIdx (fReturnIdx[i]))->r;
 
-          DEBUGpic16_emitcode(";","%d",__LINE__);
+          DEBUGpic16_emitcode (";", "%d", __LINE__);
           return;
         }
 #endif
-        /* else spill location  */
-        if (SYM_SPIL_LOC(sym) && getSize(sym->type) != getSize(SYM_SPIL_LOC(sym)->type)) {
-            /* force a new aop if sizes differ */
-            SYM_SPIL_LOC(sym)->aop = NULL;
+      /* else spill location  */
+      if (SYM_SPIL_LOC (sym) && getSize (sym->type) != getSize (SYM_SPIL_LOC (sym)->type))
+        {
+          /* force a new aop if sizes differ */
+          SYM_SPIL_LOC (sym)->aop = NULL;
         }
 
 #if 0
-        DEBUGpic16_emitcode(";","%s %d %s sym->rname = %s, offset %d",
-                            __FUNCTION__,__LINE__,
-                            SYM_SPIL_LOC(sym)->rname,
-                            sym->rname, SYM_SPIL_LOC(sym)->offset);
-#endif
-
-        //aop->aopu.pcop = pic16_popGetImmd(SYM_SPIL_LOC(sym)->rname,0,SYM_SPIL_LOC(sym)->offset);
-        if (SYM_SPIL_LOC(sym) && SYM_SPIL_LOC(sym)->rname) {
-          sym->aop = op->aop = aop = newAsmop(AOP_PCODE);
-          aop->aopu.pcop = pic16_popRegFromString(SYM_SPIL_LOC(sym)->rname,
-                                                  getSize(sym->type),
-                                                  SYM_SPIL_LOC(sym)->offset, op);
-        } else if (getSize(sym->type) <= 1) {
+      DEBUGpic16_emitcode (";", "%s %d %s sym->rname = %s, offset %d",
+                           __FUNCTION__, __LINE__, SYM_SPIL_LOC (sym)->rname, sym->rname, SYM_SPIL_LOC (sym)->offset);
+#endif
+
+      //aop->aopu.pcop = pic16_popGetImmd(SYM_SPIL_LOC(sym)->rname,0,SYM_SPIL_LOC(sym)->offset);
+      if (SYM_SPIL_LOC (sym) && SYM_SPIL_LOC (sym)->rname)
+        {
+          sym->aop = op->aop = aop = newAsmop (AOP_PCODE);
+          aop->aopu.pcop = pic16_popRegFromString (SYM_SPIL_LOC (sym)->rname,
+                           getSize (sym->type), SYM_SPIL_LOC (sym)->offset, op);
+        }
+      else if (getSize (sym->type) <= 1)
+        {
           //fprintf (stderr, "%s:%d called for a spillLocation -- assigning WREG instead --- CHECK (size:%u)!\n", __FUNCTION__, __LINE__, getSize(sym->type));
-          pic16_emitpcomment (";!!! %s:%d called for a spillLocation -- assigning WREG instead --- CHECK", __FUNCTION__, __LINE__);
-          assert (getSize(sym->type) <= 1);
-          sym->aop = op->aop = aop = newAsmop(AOP_PCODE);
+          pic16_emitpcomment (";!!! %s:%d called for a spillLocation -- assigning WREG instead --- CHECK", __FUNCTION__,
+                              __LINE__);
+          assert (getSize (sym->type) <= 1);
+          sym->aop = op->aop = aop = newAsmop (AOP_PCODE);
           aop->aopu.pcop = pic16_popCopyReg (&pic16_pc_wreg);
-        } else {
+        }
+      else
+        {
           /* We need some kind of dummy area for getSize(sym->type) byte,
            * use WREG for all storage locations.
            * XXX: This only works if we are implementing a `dummy read',
            *      the stored value will not be retrievable...
            *      See #1503234 for a case requiring this. */
-          sym->aop = op->aop = aop = newAsmop(AOP_REG);
-          aop->size = getSize(sym->type);
-          for ( i = 0 ; i < aop->size ;i++)
+          sym->aop = op->aop = aop = newAsmop (AOP_REG);
+          aop->size = getSize (sym->type);
+          for (i = 0; i < aop->size; i++)
             aop->aopu.aop_reg[i] = pic16_pc_wreg.r;
         }
-        aop->size = getSize(sym->type);
+      aop->size = getSize (sym->type);
 
-        return;
+      return;
     }
 
-    {
-      sym_link *type = operandType(op);
+  {
+    sym_link *type = operandType (op);
 #if 0
-      if(IS_PTR_CONST(type))
+    if (IS_PTR_CONST (type))
 #else
-      if(IS_CODEPTR(type))
+    if (IS_CODEPTR (type))
 #endif
-        DEBUGpic16_emitcode(";","%d aop type is const pointer",__LINE__);
-    }
+      DEBUGpic16_emitcode (";", "%d aop type is const pointer", __LINE__);
+  }
 
-    /* must be in a register */
-    DEBUGpic16_emitcode(";","%d register type nRegs=%d",__LINE__,sym->nRegs);
-    sym->aop = op->aop = aop = newAsmop(AOP_REG);
-    aop->size = sym->nRegs;
-    for ( i = 0 ; i < sym->nRegs ;i++)
-        aop->aopu.aop_reg[i] = sym->regs[i];
+  /* must be in a register */
+  DEBUGpic16_emitcode (";", "%d register type nRegs=%d", __LINE__, sym->nRegs);
+  sym->aop = op->aop = aop = newAsmop (AOP_REG);
+  aop->size = sym->nRegs;
+  for (i = 0; i < sym->nRegs; i++)
+    aop->aopu.aop_reg[i] = sym->regs[i];
 }
 
 /*-----------------------------------------------------------------*/
 /* pic16_freeAsmop - free up the asmop given to an operand               */
 /*----------------------------------------------------------------*/
-void pic16_freeAsmop (operand *op, asmop *aaop, iCode *ic, bool pop)
+void
+pic16_freeAsmop (operand * op, asmop * aaop, iCode * ic, bool pop)
 {
-    asmop *aop ;
+  asmop *aop;
 
-    if (!op)
-        aop = aaop;
-    else
-        aop = op->aop;
+  if (!op)
+    aop = aaop;
+  else
+    aop = op->aop;
 
-    if (!aop)
-        return ;
+  if (!aop)
+    return;
 
-    if (aop->freed)
-        goto dealloc;
+  if (aop->freed)
+    goto dealloc;
 
-    aop->freed = 1;
+  aop->freed = 1;
 
 #if 1
-    switch (aop->type) {
-        case AOP_STA:
-          {
-            int i;
+  switch (aop->type)
+    {
+    case AOP_STA:
+    {
+      int i;
 
-              /* we must store the result on stack */
-              if((op == IC_RESULT(ic)) && RESULTONSTA(ic)) {
-                // operands on stack are accessible via "FSR2 + index" with index
-                // starting at 2 for arguments and growing from 0 downwards for
-                // local variables (index == 0 is not assigned so we add one here)
-                int soffs = OP_SYMBOL(IC_RESULT(ic))->stack;
-                if (soffs <= 0) {
-                  assert (soffs < 0);
-                  soffs++;
-                } // if
-                if(_G.accInUse)pic16_pushpCodeOp( pic16_popCopyReg(&pic16_pc_wreg) );
-                for(i=0;i<aop->size;i++) {
-                  /* initialise for stack access via frame pointer */
-                  pic16_emitpcode(POC_MOVLW, pic16_popGetLit(soffs + i /*+ _G.stack_lat*/));
-                  pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                        aop->aopu.stk.pop[i], pic16_popCopyReg(pic16_frame_plusw)));
-                }
+      /* we must store the result on stack */
+      if ((op == IC_RESULT (ic)) && RESULTONSTA (ic))
+        {
+          // operands on stack are accessible via "FSR2 + index" with index
+          // starting at 2 for arguments and growing from 0 downwards for
+          // local variables (index == 0 is not assigned so we add one here)
+          int soffs = OP_SYMBOL (IC_RESULT (ic))->stack;
+          if (soffs <= 0)
+            {
+              assert (soffs < 0);
+              soffs++;
+            }                 // if
+          if (_G.accInUse)
+            pic16_pushpCodeOp (pic16_popCopyReg (&pic16_pc_wreg));
+          for (i = 0; i < aop->size; i++)
+            {
+              /* initialise for stack access via frame pointer */
+              pic16_emitpcode (POC_MOVLW, pic16_popGetLit (soffs + i /*+ _G.stack_lat */ ));
+              pic16_emitpcode (POC_MOVFF, pic16_popGet2p (aop->aopu.stk.pop[i], pic16_popCopyReg (pic16_frame_plusw)));
+            }
 
-                if(_G.accInUse)pic16_poppCodeOp( pic16_popCopyReg(&pic16_pc_wreg) );
-              }
+          if (_G.accInUse)
+            pic16_poppCodeOp (pic16_popCopyReg (&pic16_pc_wreg));
+        }
 
-              if(!_G.resDirect) {
-                for(i=0;i<aop->size;i++) {
-                  PCOR(aop->aopu.stk.pop[i] )->r->isFree = 1;
+      if (!_G.resDirect)
+        {
+          for (i = 0; i < aop->size; i++)
+            {
+              PCOR (aop->aopu.stk.pop[i])->r->isFree = 1;
 
-                  if(bitVectBitValue(_G.sregsAlloc, PCOR(aop->aopu.stk.pop[i])->r->rIdx)) {
-                      bitVectUnSetBit(_G.sregsAlloc, PCOR(aop->aopu.stk.pop[i])->r->rIdx);
+              if (bitVectBitValue (_G.sregsAlloc, PCOR (aop->aopu.stk.pop[i])->r->rIdx))
+                {
+                  bitVectUnSetBit (_G.sregsAlloc, PCOR (aop->aopu.stk.pop[i])->r->rIdx);
 //                      pic16_popReleaseTempReg(aop->aopu.stk.pop[i], 0);
-                  }
-                }
-
-                if (_G.sregsAllocSet) {
-                  reg_info *sr;
-
-                    _G.sregsAllocSet = reverseSet( _G.sregsAllocSet );
-                    for(sr=setFirstItem(_G.sregsAllocSet) ; sr; sr=setFirstItem(_G.sregsAllocSet)) {
-                      pic16_poppCodeOp( pic16_popRegFromIdx( sr->rIdx ) );
-                      deleteSetItem( &_G.sregsAllocSet, sr );
-                    }
                 }
-              }
-              _G.resDirect = 0;
-          }
-          break;
-#if 0
-        case AOP_STK :
-        {
-            int sz = aop->size;
-            int stk = aop->aopu.aop_stk + aop->size;
-            bitVectUnSetBit(ic->rUsed,R0_IDX);
-            bitVectUnSetBit(ic->rUsed,R1_IDX);
-
-            getFreePtr(ic,&aop,FALSE);
+            }
 
-            if (options.stack10bit)
+          if (_G.sregsAllocSet)
             {
-                /* I'm not sure what to do here yet... */
-                /* #STUB */
-                fprintf(stderr,
-                        "*** Warning: probably generating bad code for "
-                        "10 bit stack mode.\n");
-            }
+              reg_info *sr;
 
-            if (stk) {
-                pic16_emitcode ("mov","a,_bp");
-                pic16_emitcode ("add","a,#0x%02x",((char)stk) & 0xff);
-                pic16_emitcode ("mov","%s,a",aop->aopu.aop_ptr->name);
-            } else {
-                pic16_emitcode ("mov","%s,_bp",aop->aopu.aop_ptr->name);
+              _G.sregsAllocSet = reverseSet (_G.sregsAllocSet);
+              for (sr = setFirstItem (_G.sregsAllocSet); sr; sr = setFirstItem (_G.sregsAllocSet))
+                {
+                  pic16_poppCodeOp (pic16_popRegFromIdx (sr->rIdx));
+                  deleteSetItem (&_G.sregsAllocSet, sr);
+                }
             }
+        }
+      _G.resDirect = 0;
+    }
+    break;
+#if 0
+    case AOP_STK:
+    {
+      int sz = aop->size;
+      int stk = aop->aopu.aop_stk + aop->size;
+      bitVectUnSetBit (ic->rUsed, R0_IDX);
+      bitVectUnSetBit (ic->rUsed, R1_IDX);
 
-            while (sz--) {
-                pic16_emitcode("pop","acc");
-                pic16_emitcode("mov","@%s,a",aop->aopu.aop_ptr->name);
-                if (!sz) break;
-                pic16_emitcode("dec","%s",aop->aopu.aop_ptr->name);
-            }
-            op->aop = aop;
-            pic16_freeAsmop(op,NULL,ic,TRUE);
-            if (_G.r0Pushed) {
-                pic16_emitcode("pop","ar0");
-                _G.r0Pushed--;
-            }
+      getFreePtr (ic, &aop, FALSE);
 
-            if (_G.r1Pushed) {
-                pic16_emitcode("pop","ar1");
-                _G.r1Pushed--;
-            }
+      if (options.stack10bit)
+        {
+          /* I'm not sure what to do here yet... */
+          /* #STUB */
+          fprintf (stderr, "*** Warning: probably generating bad code for " "10 bit stack mode.\n");
         }
-#endif
+
+      if (stk)
+        {
+          pic16_emitcode ("mov", "a,_bp");
+          pic16_emitcode ("add", "a,#0x%02x", ((char) stk) & 0xff);
+          pic16_emitcode ("mov", "%s,a", aop->aopu.aop_ptr->name);
+        }
+      else
+        {
+          pic16_emitcode ("mov", "%s,_bp", aop->aopu.aop_ptr->name);
+        }
+
+      while (sz--)
+        {
+          pic16_emitcode ("pop", "acc");
+          pic16_emitcode ("mov", "@%s,a", aop->aopu.aop_ptr->name);
+          if (!sz)
+            break;
+          pic16_emitcode ("dec", "%s", aop->aopu.aop_ptr->name);
+        }
+      op->aop = aop;
+      pic16_freeAsmop (op, NULL, ic, TRUE);
+      if (_G.r0Pushed)
+        {
+          pic16_emitcode ("pop", "ar0");
+          _G.r0Pushed--;
+        }
+
+      if (_G.r1Pushed)
+        {
+          pic16_emitcode ("pop", "ar1");
+          _G.r1Pushed--;
+        }
+    }
+#endif
 
     }
 #endif
 
 dealloc:
-    /* all other cases just dealloc */
-    if (op ) {
-        op->aop = NULL;
-        if (IS_SYMOP(op)) {
-            OP_SYMBOL(op)->aop = NULL;
-            /* if the symbol has a spill */
-            if (SPIL_LOC(op))
-                SPIL_LOC(op)->aop = NULL;
+  /* all other cases just dealloc */
+  if (op)
+    {
+      op->aop = NULL;
+      if (IS_SYMOP (op))
+        {
+          OP_SYMBOL (op)->aop = NULL;
+          /* if the symbol has a spill */
+          if (SPIL_LOC (op))
+            SPIL_LOC (op)->aop = NULL;
         }
     }
 }
@@ -1242,31 +1308,32 @@
 /*-----------------------------------------------------------------*/
 /* pic16_aopGet - for fetching value of the aop                          */
 /*-----------------------------------------------------------------*/
-char *pic16_aopGet (asmop *aop, int offset, bool bit16, bool dname)
+char *
+pic16_aopGet (asmop * aop, int offset, bool bit16, bool dname)
 {
-    char *s = buffer ;
-    char *rs;
+  char *s = buffer;
+  char *rs;
 
-    //DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  //DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
 
-    /* offset is greater than size then zero */
-    if (offset > (aop->size - 1) &&
-        aop->type != AOP_LIT)
-        return zero;
+  /* offset is greater than size then zero */
+  if (offset > (aop->size - 1) && aop->type != AOP_LIT)
+    return zero;
 
-    /* depending on type */
-    switch (aop->type) {
+  /* depending on type */
+  switch (aop->type)
+    {
     case AOP_DIR:
-      if (offset) {
-        sprintf(s,"(%s + %d)",
-                aop->aopu.aop_dir,
-                offset);
-        DEBUGpic16_emitcode(";","oops AOP_DIR did this %s\n",s);
-      } else
-            sprintf(s,"%s",aop->aopu.aop_dir);
-        rs = Safe_calloc(1,strlen(s)+1);
-        strcpy(rs,s);
-        return rs;
+      if (offset)
+        {
+          sprintf (s, "(%s + %d)", aop->aopu.aop_dir, offset);
+          DEBUGpic16_emitcode (";", "oops AOP_DIR did this %s\n", s);
+        }
+      else
+        sprintf (s, "%s", aop->aopu.aop_dir);
+      rs = Safe_calloc (1, strlen (s) + 1);
+      strcpy (rs, s);
+      return rs;
 
     case AOP_REG:
       return aop->aopu.aop_reg[offset]->name;
@@ -1275,82 +1342,87 @@
       return aop->aopu.aop_dir;
 
     case AOP_ACC:
-        DEBUGpic16_emitcode(";Warning -pic port ignoring get(AOP_ACC)","%d\toffset: %d",__LINE__, offset);
+      DEBUGpic16_emitcode (";Warning -pic port ignoring get(AOP_ACC)", "%d\toffset: %d", __LINE__, offset);
 //        fprintf(stderr, "%s:%d Warning -pic port ignoring get(AOP_ACC)\n",__FILE__, __LINE__);
 //        assert( 0 );
 //      return aop->aopu.aop_str[offset];       //->"AOP_accumulator_bug";
-        rs = Safe_strdup("WREG");
-        return (rs);
+      rs = Safe_strdup ("WREG");
+      return (rs);
 
     case AOP_LIT:
-        sprintf(s,"0x%02x", pic16aopLiteral (aop->aopu.aop_lit,offset));
-        rs = Safe_calloc(1,strlen(s)+1);
-        strcpy(rs,s);
-        return rs;
+      sprintf (s, "0x%02x", pic16aopLiteral (aop->aopu.aop_lit, offset));
+      rs = Safe_calloc (1, strlen (s) + 1);
+      strcpy (rs, s);
+      return rs;
 
     case AOP_STR:
-        aop->coff = offset ;
+      aop->coff = offset;
 
 //      if (strcmp(aop->aopu.aop_str[offset],"a") == 0 &&
 //          dname)
 //          return "acc";
-        if(!strcmp(aop->aopu.aop_str[offset], "WREG")) {
+      if (!strcmp (aop->aopu.aop_str[offset], "WREG"))
+        {
           aop->type = AOP_ACC;
-          return Safe_strdup("_WREG");
+          return Safe_strdup ("_WREG");
         }
-        DEBUGpic16_emitcode(";","%d - %s",__LINE__, aop->aopu.aop_str[offset]);
+      DEBUGpic16_emitcode (";", "%d - %s", __LINE__, aop->aopu.aop_str[offset]);
 
-        return aop->aopu.aop_str[offset];
+      return aop->aopu.aop_str[offset];
 
     case AOP_PCODE:
-      {
-        pCodeOp *pcop = aop->aopu.pcop;
-        DEBUGpic16_emitcode(";","%d: pic16_aopGet AOP_PCODE type %s",__LINE__,pic16_pCodeOpType(pcop));
-        if(pcop->name) {
-          DEBUGpic16_emitcode(";","%s offset %d",pcop->name,PCOI(pcop)->offset);
+    {
+      pCodeOp *pcop = aop->aopu.pcop;
+      DEBUGpic16_emitcode (";", "%d: pic16_aopGet AOP_PCODE type %s", __LINE__, pic16_pCodeOpType (pcop));
+      if (pcop->name)
+        {
+          DEBUGpic16_emitcode (";", "%s offset %d", pcop->name, PCOI (pcop)->offset);
           //sprintf(s,"(%s+0x%02x)", pcop->name,PCOI(aop->aopu.pcop)->offset);
-          if (offset) {
-            sprintf(s,"(%s + %d)", pic16_get_op (pcop, NULL, 0), offset);
-          } else {
-            sprintf(s,"%s", pic16_get_op (pcop, NULL, 0));
-          }
-        } else
-          sprintf(s,"0x%02x", PCOI(aop->aopu.pcop)->offset);
+          if (offset)
+            {
+              sprintf (s, "(%s + %d)", pic16_get_op (pcop, NULL, 0), offset);
+            }
+          else
+            {
+              sprintf (s, "%s", pic16_get_op (pcop, NULL, 0));
+            }
+        }
+      else
+        sprintf (s, "0x%02x", PCOI (aop->aopu.pcop)->offset);
 
-      }
-      rs = Safe_calloc(1,strlen(s)+1);
-      strcpy(rs,s);
-      return rs;
+    }
+    rs = Safe_calloc (1, strlen (s) + 1);
+    strcpy (rs, s);
+    return rs;
 
 #if 0
     case AOP_PAGED:
-      DEBUGpic16_emitcode(";","oops AOP_PAGED did this %s\n",s);
-      if (offset) {
-        sprintf(s,"(%s + %d)",
-                aop->aopu.aop_dir,
-                offset);
-      } else
-            sprintf(s,"%s",aop->aopu.aop_dir);
-      DEBUGpic16_emitcode(";","oops AOP_PAGED did this %s\n",s);
-      rs = Safe_calloc(1,strlen(s)+1);
-      strcpy(rs,s);
+      DEBUGpic16_emitcode (";", "oops AOP_PAGED did this %s\n", s);
+      if (offset)
+        {
+          sprintf (s, "(%s + %d)", aop->aopu.aop_dir, offset);
+        }
+      else
+        sprintf (s, "%s", aop->aopu.aop_dir);
+      DEBUGpic16_emitcode (";", "oops AOP_PAGED did this %s\n", s);
+      rs = Safe_calloc (1, strlen (s) + 1);
+      strcpy (rs, s);
       return rs;
 #endif
 
     case AOP_STA:
-        rs = Safe_strdup(PCOR(aop->aopu.stk.pop[offset])->r->name);
-        return (rs);
+      rs = Safe_strdup (PCOR (aop->aopu.stk.pop[offset])->r->name);
+      return (rs);
 
     case AOP_STK:
 //        pCodeOp *pcop = aop->aop
-        break;
+      break;
 
     }
 
-    fprintf(stderr, "%s:%d unsupported aop->type: %s\n", __FILE__, __LINE__, pic16_AopType(aop->type));
-    werror(E_INTERNAL_ERROR,__FILE__,__LINE__,
-           "aopget got unsupported aop->type");
-    exit(0);
+  fprintf (stderr, "%s:%d unsupported aop->type: %s\n", __FILE__, __LINE__, pic16_AopType (aop->type));
+  werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "aopget got unsupported aop->type");
+  exit (0);
 }
 
 
@@ -1371,31 +1443,34 @@
 /*-----------------------------------------------------------------*/
 /* pic16_popGetTempReg - create a new temporary pCodeOp                  */
 /*-----------------------------------------------------------------*/
-pCodeOp *pic16_popGetTempReg(int lock)
+pCodeOp *
+pic16_popGetTempReg (int lock)
 {
-  pCodeOp *pcop=NULL;
+  pCodeOp *pcop = NULL;
   symbol *cfunc;
 
 //    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    if(_TempReg_lock) {
+  if (_TempReg_lock)
+    {
 //      werror(W_POSSBUG2, __FILE__, __LINE__);
     }
 
-    _TempReg_lock += lock;
+  _TempReg_lock += lock;
 
-    cfunc = currFunc;
-    currFunc = NULL;
+  cfunc = currFunc;
+  currFunc = NULL;
 
-    pcop = pic16_newpCodeOp(NULL, PO_GPR_TEMP);
-    if(pcop && pcop->type == PO_GPR_TEMP && PCOR(pcop)->r) {
-      PCOR(pcop)->r->wasUsed=1;
-      PCOR(pcop)->r->isFree=0;
+  pcop = pic16_newpCodeOp (NULL, PO_GPR_TEMP);
+  if (pcop && pcop->type == PO_GPR_TEMP && PCOR (pcop)->r)
+    {
+      PCOR (pcop)->r->wasUsed = 1;
+      PCOR (pcop)->r->isFree = 0;
 
       /* push value on stack */
-      pic16_pushpCodeOp( pic16_pCodeOpCopy(pcop) );
+      pic16_pushpCodeOp (pic16_pCodeOpCopy (pcop));
     }
 
-    currFunc = cfunc;
+  currFunc = cfunc;
 
   return pcop;
 }
@@ -1405,78 +1480,87 @@
 /*                           is not part of f, but don't save if   */
 /*                           inside v                              */
 /*-----------------------------------------------------------------*/
-pCodeOp *pic16_popGetTempRegCond(bitVect *f, bitVect *v, int lock)
+pCodeOp *
+pic16_popGetTempRegCond (bitVect * f, bitVect * v, int lock)
 {
-  pCodeOp *pcop=NULL;
+  pCodeOp *pcop = NULL;
   symbol *cfunc;
   int i;
 
 //    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
 
-    if(_TempReg_lock) {
+  if (_TempReg_lock)
+    {
 //      werror(W_POSSBUG2, __FILE__, __LINE__);
     }
 
-    _TempReg_lock += lock;
+  _TempReg_lock += lock;
 
-    cfunc = currFunc;
-    currFunc = NULL;
+  cfunc = currFunc;
+  currFunc = NULL;
 
-    i = bitVectFirstBit(f);
-    while(i < 128) {
+  i = bitVectFirstBit (f);
+  while (i < 128)
+    {
 
       /* bypass registers that are used by function */
-      if(!bitVectBitValue(f, i)) {
+      if (!bitVectBitValue (f, i))
+        {
 
-        /* bypass registers that are already allocated for stack access */
-        if(!bitVectBitValue(v, i))  {
+          /* bypass registers that are already allocated for stack access */
+          if (!bitVectBitValue (v, i))
+            {
 
 //          debugf("getting register rIdx = %d\n", i);
-          /* ok, get the operand */
-          pcop = pic16_newpCodeOpReg( i );
+              /* ok, get the operand */
+              pcop = pic16_newpCodeOpReg (i);
 
-          /* should never by NULL */
-          assert( pcop != NULL );
+              /* should never by NULL */
+              assert (pcop != NULL);
 
 
-          /* sanity check */
-          if(pcop && pcop->type == PO_GPR_TEMP && PCOR(pcop)->r) {
-            int found=0;
+              /* sanity check */
+              if (pcop && pcop->type == PO_GPR_TEMP && PCOR (pcop)->r)
+                {
+                  int found = 0;
 
-              PCOR(pcop)->r->wasUsed=1;
-              PCOR(pcop)->r->isFree=0;
+                  PCOR (pcop)->r->wasUsed = 1;
+                  PCOR (pcop)->r->isFree = 0;
 
 
-              {
-                reg_info *sr;
+                  {
+                    reg_info *sr;
 
-                  for(sr=setFirstItem(_G.sregsAllocSet);sr;sr=setNextItem(_G.sregsAllocSet)) {
+                    for (sr = setFirstItem (_G.sregsAllocSet); sr; sr = setNextItem (_G.sregsAllocSet))
+                      {
 
-                    if(sr->rIdx == PCOR(pcop)->r->rIdx) {
-                      /* already used in previous steps, break */
-                      found=1;
-                      break;
-                    }
+                        if (sr->rIdx == PCOR (pcop)->r->rIdx)
+                          {
+                            /* already used in previous steps, break */
+                            found = 1;
+                            break;
+                          }
+                      }
                   }
-              }
 
-              /* caller takes care of the following */
+                  /* caller takes care of the following */
 //              bitVectSetBit(v, i);
 
-              if(!found) {
-                /* push value on stack */
-                pic16_pushpCodeOp( pic16_pCodeOpCopy(pcop) );
-                addSet(&_G.sregsAllocSet, PCOR(pcop)->r);
-              }
+                  if (!found)
+                    {
+                      /* push value on stack */
+                      pic16_pushpCodeOp (pic16_pCodeOpCopy (pcop));
+                      addSet (&_G.sregsAllocSet, PCOR (pcop)->r);
+                    }
 
-            break;
-          }
+                  break;
+                }
+            }
         }
-      }
       i++;
     }
 
-    currFunc = cfunc;
+  currFunc = cfunc;
 
   return pcop;
 }
@@ -1485,48 +1569,55 @@
 /*-----------------------------------------------------------------*/
 /* pic16_popReleaseTempReg - create a new temporary pCodeOp                  */
 /*-----------------------------------------------------------------*/
-void pic16_popReleaseTempReg(pCodeOp *pcop, int lock)
+void
+pic16_popReleaseTempReg (pCodeOp * pcop, int lock)
 {
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
   _TempReg_lock -= lock;
 
-  if(pcop && pcop->type == PO_GPR_TEMP && PCOR(pcop)->r) {
-    PCOR(pcop)->r->isFree = 1;
+  if (pcop && pcop->type == PO_GPR_TEMP && PCOR (pcop)->r)
+    {
+      PCOR (pcop)->r->isFree = 1;
 
-    pic16_poppCodeOp( pic16_pCodeOpCopy(pcop) );
-  }
+      pic16_poppCodeOp (pic16_pCodeOpCopy (pcop));
+    }
 }
+
 /*-----------------------------------------------------------------*/
 /* pic16_popGetLabel - create a new pCodeOp of type PO_LABEL             */
 /*-----------------------------------------------------------------*/
-pCodeOp *pic16_popGetLabel(int key)
+pCodeOp *
+pic16_popGetLabel (int key)
 {
 
-  DEBUGpic16_emitcode ("; ***","%s  key=%d, label offset %d",__FUNCTION__,key, pic16_labelOffset);
+  DEBUGpic16_emitcode ("; ***", "%s  key=%d, label offset %d", __FUNCTION__, key, pic16_labelOffset);
 
-  if(key>max_key)
+  if (key > max_key)
     max_key = key;
 
-  return pic16_newpCodeOpLabel(NULL,key+100+pic16_labelOffset);
+  return pic16_newpCodeOpLabel (NULL, labelKey2num (key + pic16_labelOffset));
 }
 
 /*-----------------------------------------------------------------*/
 /* pic16_popCopyReg - copy a pcode operator                              */
 /*-----------------------------------------------------------------*/
-pCodeOp *pic16_popCopyReg(pCodeOpReg *pc)
+pCodeOp *
+pic16_popCopyReg (pCodeOpReg * pc)
 {
   pCodeOpReg *pcor;
 
-  pcor = Safe_calloc(1,sizeof(pCodeOpReg) );
+  pcor = Safe_calloc (1, sizeof (pCodeOpReg));
   memcpy (pcor, pc, sizeof (pCodeOpReg));
   pcor->r->wasUsed = 1;
 
   //pcor->pcop.type = pc->pcop.type;
-  if(pc->pcop.name) {
-    if(!(pcor->pcop.name = Safe_strdup(pc->pcop.name)))
-      fprintf(stderr,"oops %s %d",__FILE__,__LINE__);
-  } else
+  if (pc->pcop.name)
+    {
+      if (!(pcor->pcop.name = Safe_strdup (pc->pcop.name)))
+        fprintf (stderr, "oops %s %d", __FILE__, __LINE__);
+    }
+  else
     pcor->pcop.name = NULL;
 
   //pcor->r = pc->r;
@@ -1536,55 +1627,61 @@
 
 //  DEBUGpic16_emitcode ("; ***","%s  , copying %s, rIdx=%d",__FUNCTION__,pc->pcop.name,pc->rIdx);
 
-  return PCOP(pcor);
+  return PCOP (pcor);
 }
 
 /*-----------------------------------------------------------------*/
 /* pic16_popGetLit - asm operator to pcode operator conversion     */
 /*-----------------------------------------------------------------*/
-pCodeOp *pic16_popGetLit(int lit)
+pCodeOp *
+pic16_popGetLit (int lit)
 {
-  return pic16_newpCodeOpLit(lit);
+  return pic16_newpCodeOpLit (lit);
 }
 
 /* Allow for 12 bit literals (LFSR x, <here!>). */
-pCodeOp *pic16_popGetLit12(int lit)
+pCodeOp *
+pic16_popGetLit12 (int lit)
 {
-  return pic16_newpCodeOpLit12(lit);
+  return pic16_newpCodeOpLit12 (lit);
 }
 
 /*-----------------------------------------------------------------*/
 /* pic16_popGetLit2 - asm operator to pcode operator conversion    */
 /*-----------------------------------------------------------------*/
-pCodeOp *pic16_popGetLit2(int lit, pCodeOp *arg2)
+pCodeOp *
+pic16_popGetLit2 (int lit, pCodeOp * arg2)
 {
-  return pic16_newpCodeOpLit2(lit, arg2);
+  return pic16_newpCodeOpLit2 (lit, arg2);
 }
 
 
 /*-----------------------------------------------------------------*/
 /* pic16_popGetImmd - asm operator to pcode immediate conversion   */
 /*-----------------------------------------------------------------*/
-pCodeOp *pic16_popGetImmd(char *name, unsigned int offset, int index)
+pCodeOp *
+pic16_popGetImmd (char *name, unsigned int offset, int index)
 {
-  return pic16_newpCodeOpImmd(name, offset,index, 0);
+  return pic16_newpCodeOpImmd (name, offset, index, 0);
 }
 
 
 /*-----------------------------------------------------------------*/
 /* pic16_popGet - asm operator to pcode operator conversion              */
 /*-----------------------------------------------------------------*/
-pCodeOp *pic16_popGetWithString(char *str)
+pCodeOp *
+pic16_popGetWithString (char *str)
 {
   pCodeOp *pcop;
 
 
-  if(!str) {
-    fprintf(stderr,"NULL string %s %d\n",__FILE__,__LINE__);
-    exit (1);
-  }
+  if (!str)
+    {
+      fprintf (stderr, "NULL string %s %d\n", __FILE__, __LINE__);
+      exit (1);
+    }
 
-  pcop = pic16_newpCodeOp(str,PO_STR);
+  pcop = pic16_newpCodeOp (str, PO_STR);
 
   return pcop;
 }
@@ -1592,61 +1689,62 @@
 /*-----------------------------------------------------------------*/
 /* pic16_popRegFromString -                                        */
 /*-----------------------------------------------------------------*/
-static pCodeOp *pic16_popRegFromString(char *str, int size, int offset, operand *op)
+static pCodeOp *
+pic16_popRegFromString (char *str, int size, int offset, operand * op)
 {
 
-  pCodeOp *pcop = Safe_calloc(1,sizeof(pCodeOpReg) );
+  pCodeOp *pcop = Safe_calloc (1, sizeof (pCodeOpReg));
   pcop->type = PO_DIR;
 
-  DEBUGpic16_emitcode(";","%d %s %s %d/%d",__LINE__, __FUNCTION__, str, size, offset); // patch 14
+  DEBUGpic16_emitcode (";", "%d %s %s %d/%d", __LINE__, __FUNCTION__, str, size, offset);       // patch 14
   // fprintf(stderr, "%s:%d: register name = %s pos = %d/%d\n", __FUNCTION__, __LINE__, str, offset, size);
 
-  if(!str)
+  if (!str)
     str = "BAD_STRING";
 
-  pcop->name = Safe_calloc(1,strlen(str)+1);
-  strcpy(pcop->name,str);
+  pcop->name = Safe_calloc (1, strlen (str) + 1);
+  strcpy (pcop->name, str);
 
   //pcop->name = Safe_strdup( ( (str) ? str : "BAD STRING"));
 
-  PCOR(pcop)->r = pic16_dirregWithName(pcop->name);
+  PCOR (pcop)->r = pic16_dirregWithName (pcop->name);
 //  PCOR(pcop)->r->wasUsed = 1;
 
   /* make sure that register doesn't exist,
    * and operand isn't NULL
    * and symbol isn't in codespace (codespace symbols are handled elsewhere) */
-  if((PCOR(pcop)->r == NULL)
-    && (op)
-    && !IN_CODESPACE(SPEC_OCLS(OP_SYM_ETYPE(op)))) {
+  if ((PCOR (pcop)->r == NULL) && (op) && !IN_CODESPACE (SPEC_OCLS (OP_SYM_ETYPE (op))))
+    {
 //      fprintf(stderr, "%s:%d - couldn't find %s in allocated regsters, size= %d ofs= %d\n",
 //              __FUNCTION__, __LINE__, str, size, offset);
 
-    PCOR(pcop)->r = pic16_allocRegByName (pcop->name,size, op);
-    //fprintf(stderr, "%s:%d: WARNING: need to allocate new register by name -> %s\n", __FILE__, __LINE__, str);
+      PCOR (pcop)->r = pic16_allocRegByName (pcop->name, size, op);
+      //fprintf(stderr, "%s:%d: WARNING: need to allocate new register by name -> %s\n", __FILE__, __LINE__, str);
 
-  }
-  PCOR(pcop)->instance = offset;
+    }
+  PCOR (pcop)->instance = offset;
 
   return pcop;
 }
 
-static pCodeOp *pic16_popRegFromIdx(int rIdx)
+static pCodeOp *
+pic16_popRegFromIdx (int rIdx)
 {
   pCodeOp *pcop;
 
 //      DEBUGpic16_emitcode ("; ***","%s,%d\trIdx=0x%x", __FUNCTION__,__LINE__,rIdx);
 //      fprintf(stderr, "%s:%d rIdx = 0x%0x\n", __FUNCTION__, __LINE__, rIdx);
 
-        pcop = Safe_calloc(1,sizeof(pCodeOpReg) );
-        PCOR(pcop)->rIdx = rIdx;
-        PCOR(pcop)->r = pic16_regWithIdx(rIdx);
-        if(!PCOR(pcop)->r)
-                PCOR(pcop)->r = pic16_allocWithIdx(rIdx);
+  pcop = Safe_calloc (1, sizeof (pCodeOpReg));
+  PCOR (pcop)->rIdx = rIdx;
+  PCOR (pcop)->r = pic16_regWithIdx (rIdx);
+  if (!PCOR (pcop)->r)
+    PCOR (pcop)->r = pic16_allocWithIdx (rIdx);
 
-        PCOR(pcop)->r->isFree = 0;
-        PCOR(pcop)->r->wasUsed = 1;
+  PCOR (pcop)->r->isFree = 0;
+  PCOR (pcop)->r->wasUsed = 1;
 
-        pcop->type = PCOR(pcop)->r->pc_type;
+  pcop->type = PCOR (pcop)->r->pc_type;
 
   return pcop;
 }
@@ -1655,11 +1753,11 @@
 /* pic16_popGet2 - a variant of pic16_popGet to handle two memory operand commands */
 /*                 VR 030601                                                       */
 /*---------------------------------------------------------------------------------*/
-pCodeOp *pic16_popGet2(asmop *aop_src, asmop *aop_dst, int offset)
+pCodeOp *
+pic16_popGet2 (asmop * aop_src, asmop * aop_dst, int offset)
 {
-  pCodeOp2 *pcop2 = (pCodeOp2 *)pic16_newpCodeOp2(
-        pic16_popGet(aop_src, offset), pic16_popGet(aop_dst, offset));
-  return PCOP(pcop2);
+  pCodeOp2 *pcop2 = (pCodeOp2 *) pic16_newpCodeOp2 (pic16_popGet (aop_src, offset), pic16_popGet (aop_dst, offset));
+  return PCOP (pcop2);
 }
 
 
@@ -1668,315 +1766,367 @@
 /* pic16_popGet2p - a variant of pic16_popGet to handle two memory operand commands */
 /*                  VR 030601 , adapted by Hans Dorn                                */
 /*--------------------------------------------------------------------------------.-*/
-pCodeOp *pic16_popGet2p(pCodeOp *src, pCodeOp *dst)
+pCodeOp *
+pic16_popGet2p (pCodeOp * src, pCodeOp * dst)
 {
   pCodeOp2 *pcop2;
-  pcop2 = (pCodeOp2 *)pic16_newpCodeOp2(src, dst);
-  return PCOP(pcop2);
+  pcop2 = (pCodeOp2 *) pic16_newpCodeOp2 (src, dst);
+  return PCOP (pcop2);
 }
 
 /*---------------------------------------------------------------------------------*/
 /* pic16_popCombine2 - combine two pCodeOpReg variables into one for use with      */
 /*                     movff instruction                                           */
 /*---------------------------------------------------------------------------------*/
-pCodeOp *pic16_popCombine2(pCodeOpReg *src, pCodeOpReg *dst, int noalloc)
+pCodeOp *
+pic16_popCombine2 (pCodeOpReg * src, pCodeOpReg * dst, int noalloc)
 {
-  pCodeOp2 *pcop2 = (pCodeOp2 *)pic16_newpCodeOp2(
-        pic16_popCopyReg(src), pic16_popCopyReg(dst) );
+  pCodeOp2 *pcop2 = (pCodeOp2 *) pic16_newpCodeOp2 (pic16_popCopyReg (src), pic16_popCopyReg (dst));
 
-  return PCOP(pcop2);
+  return PCOP (pcop2);
 }
 
 
 /*-----------------------------------------------------------------*/
 /* pic16_popGet - asm operator to pcode operator conversion              */
 /*-----------------------------------------------------------------*/
-pCodeOp *pic16_popGet (asmop *aop, int offset) //, bool bit16, bool dname)
+pCodeOp *
+pic16_popGet (asmop * aop, int offset)  //, bool bit16, bool dname)
 {
 //  char *s = buffer ;
 //  char *rs;
   pCodeOp *pcop;
 
-    FENTRY2;
+  FENTRY2;
 
-      /* offset is greater than size then zero */
+  /* offset is greater than size then zero */
 
 //    if (offset > (aop->size - 1) &&
 //        aop->type != AOP_LIT)
 //      return NULL;  //zero;
 
-    /* depending on type */
-    switch (aop->type) {
-                case AOP_STA:
-                        /* pCodeOp is already allocated from aopForSym */
-                        DEBUGpic16_emitcode(";---", "%d getting stack + offset %d\n", __LINE__, offset);
-                        pcop = pic16_pCodeOpCopy(aop->aopu.stk.pop[offset]);
-                        return (pcop);
+  /* depending on type */
+  switch (aop->type)
+    {
+    case AOP_STA:
+      /* pCodeOp is already allocated from aopForSym */
+      DEBUGpic16_emitcode (";---", "%d getting stack + offset %d\n", __LINE__, offset);
+      pcop = pic16_pCodeOpCopy (aop->aopu.stk.pop[offset]);
+      return (pcop);
 
-                case AOP_ACC:
-                        {
-                          int rIdx = IDX_WREG;          //aop->aopu.aop_reg[offset]->rIdx;
+    case AOP_ACC:
+    {
+      int rIdx = IDX_WREG;    //aop->aopu.aop_reg[offset]->rIdx;
 
-                                fprintf(stderr, "%s:%d returning register AOP_ACC %s\n", __FILE__, __LINE__, aop->aopu.aop_str[offset]);
+//      fprintf (stderr, "%s:%d returning register AOP_ACC %s\n", __FILE__, __LINE__, aop->aopu.aop_str[offset]);
 
-                                DEBUGpic16_emitcode(";","%d\tAOP_ACC", __LINE__);
+      DEBUGpic16_emitcode (";", "%d\tAOP_ACC", __LINE__);
 
-                                pcop = Safe_calloc(1,sizeof(pCodeOpReg) );
-                                PCOR(pcop)->rIdx = rIdx;
-                                PCOR(pcop)->r = pic16_typeRegWithIdx(rIdx, REG_SFR, 1); // pic16_regWithIdx(rIdx);
-                                PCOR(pcop)->r->wasUsed=1;
-                                PCOR(pcop)->r->isFree=0;
+      pcop = Safe_calloc (1, sizeof (pCodeOpReg));
+      PCOR (pcop)->rIdx = rIdx;
+      PCOR (pcop)->r = pic16_typeRegWithIdx (rIdx, REG_SFR, 1);       // pic16_regWithIdx(rIdx);
+      PCOR (pcop)->r->wasUsed = 1;
+      PCOR (pcop)->r->isFree = 0;
 
-                                PCOR(pcop)->instance = offset;
-                                pcop->type = PCOR(pcop)->r->pc_type;
+      PCOR (pcop)->instance = offset;
+      pcop->type = PCOR (pcop)->r->pc_type;
 //                              DEBUGpic16_emitcode(";","%d register idx = %d name =%s",__LINE__,rIdx,rs);
-                                return pcop;
+      return pcop;
 
 
 //      return pic16_popRegFromString(aop->aopu.aop_str[offset], aop->size, offset);
 //      return pic16_newpCodeOpRegFromStr(aop->aopu.aop_str[offset]);
 
 //      assert( 0 );
-                        }
+    }
 
     case AOP_DIR:
-      DEBUGpic16_emitcode(";","%d\tAOP_DIR (name = %s)", __LINE__, aop->aopu.aop_dir);
-      return pic16_popRegFromString(aop->aopu.aop_dir, aop->size, offset, NULL);
+      DEBUGpic16_emitcode (";", "%d\tAOP_DIR (name = %s)", __LINE__, aop->aopu.aop_dir);
+      return pic16_popRegFromString (aop->aopu.aop_dir, aop->size, offset, NULL);
 
 #if 0
     case AOP_PAGED:
-      DEBUGpic16_emitcode(";","%d\tAOP_DIR", __LINE__);
-      return pic16_popRegFromString(aop->aopu.aop_dir, aop->size, offset, NULL);
+      DEBUGpic16_emitcode (";", "%d\tAOP_DIR", __LINE__);
+      return pic16_popRegFromString (aop->aopu.aop_dir, aop->size, offset, NULL);
 #endif
 
     case AOP_REG:
-      {
-        int rIdx;
+    {
+      int rIdx;
 
 //      debugf2("aop = %p\toffset = %d\n", aop, offset);
 //      assert (aop && aop->aopu.aop_reg[offset] != NULL);
-        rIdx = aop->aopu.aop_reg[offset]->rIdx;
+      rIdx = aop->aopu.aop_reg[offset]->rIdx;
 
-        DEBUGpic16_emitcode(";","%d\tAOP_REG", __LINE__);
+      DEBUGpic16_emitcode (";", "%d\tAOP_REG", __LINE__);
 
-        pcop = Safe_calloc(1,sizeof(pCodeOpReg) );
+      pcop = Safe_calloc (1, sizeof (pCodeOpReg));
 //      pcop->type = PO_GPR_REGISTER;
-        PCOR(pcop)->rIdx = rIdx;
-        PCOR(pcop)->r = pic16_allocWithIdx( rIdx );     //pic16_regWithIdx(rIdx);
-        PCOR(pcop)->r->wasUsed=1;
-        PCOR(pcop)->r->isFree=0;
+      PCOR (pcop)->rIdx = rIdx;
+      PCOR (pcop)->r = pic16_allocWithIdx (rIdx);     //pic16_regWithIdx(rIdx);
+      PCOR (pcop)->r->wasUsed = 1;
+      PCOR (pcop)->r->isFree = 0;
 
-        PCOR(pcop)->instance = offset;
-        pcop->type = PCOR(pcop)->r->pc_type;
+      PCOR (pcop)->instance = offset;
+      pcop->type = PCOR (pcop)->r->pc_type;
 
-        DEBUGpic16_emitcode(";*+*", "%d\tAOP_REG type = %s", __LINE__, dumpPicOptype(pcop->type));
+      DEBUGpic16_emitcode (";*+*", "%d\tAOP_REG type = %s", __LINE__, dumpPicOptype (pcop->type));
 //      rs = aop->aopu.aop_reg[offset]->name;
 //      DEBUGpic16_emitcode(";","%d register idx = %d name = %s",__LINE__,rIdx,rs);
-        return pcop;
-      }
+      return pcop;
+    }
 
     case AOP_CRY:
-        DEBUGpic16_emitcode(";","%d\tAOP_CRY", __LINE__);
+      DEBUGpic16_emitcode (";", "%d\tAOP_CRY", __LINE__);
 
-      pcop = pic16_newpCodeOpBit(aop->aopu.aop_dir,-1,1, PO_GPR_REGISTER);
-      PCOR(pcop)->instance = offset;
-      PCOR(pcop)->r = pic16_dirregWithName(aop->aopu.aop_dir);
+      pcop = pic16_newpCodeOpBit (aop->aopu.aop_dir, -1, 1, PO_GPR_REGISTER);
+      PCOR (pcop)->instance = offset;
+      PCOR (pcop)->r = pic16_dirregWithName (aop->aopu.aop_dir);
       //if(PCOR(pcop)->r == NULL)
       //fprintf(stderr,"%d - couldn't find %s in allocated registers\n",__LINE__,aop->aopu.aop_dir);
       return pcop;
 
     case AOP_LIT:
-        DEBUGpic16_emitcode(";","%d\tAOP_LIT", __LINE__);
-      return pic16_newpCodeOpLit(pic16aopLiteral (aop->aopu.aop_lit,offset));
+      DEBUGpic16_emitcode (";", "%d\tAOP_LIT", __LINE__);
+      return pic16_newpCodeOpLit (pic16aopLiteral (aop->aopu.aop_lit, offset));
 
     case AOP_STR:
-      DEBUGpic16_emitcode(";","%d AOP_STR %s",__LINE__,aop->aopu.aop_str[offset]);
-      return pic16_newpCodeOpRegFromStr(aop->aopu.aop_str[offset]);
+      DEBUGpic16_emitcode (";", "%d AOP_STR %s", __LINE__, aop->aopu.aop_str[offset]);
+      return pic16_newpCodeOpRegFromStr (aop->aopu.aop_str[offset]);
 
       /*
-      pcop = Safe_calloc(1,sizeof(pCodeOpReg) );
-      PCOR(pcop)->r = pic16_allocRegByName(aop->aopu.aop_str[offset]);
-      PCOR(pcop)->rIdx = PCOR(pcop)->r->rIdx;
-      pcop->type = PCOR(pcop)->r->pc_type;
-      pcop->name = PCOR(pcop)->r->name;
+         pcop = Safe_calloc(1,sizeof(pCodeOpReg) );
+         PCOR(pcop)->r = pic16_allocRegByName(aop->aopu.aop_str[offset]);
+         PCOR(pcop)->rIdx = PCOR(pcop)->r->rIdx;
+         pcop->type = PCOR(pcop)->r->pc_type;
+         pcop->name = PCOR(pcop)->r->name;
 
-      return pcop;
-      */
+         return pcop;
+       */
 
     case AOP_PCODE:
-      DEBUGpic16_emitcode(";","pic16_popGet AOP_PCODE (%s) %d %s offset %d",pic16_pCodeOpType(aop->aopu.pcop),
-                          __LINE__,
-                          ((aop->aopu.pcop->name)? (aop->aopu.pcop->name) : "no name"), offset);
-      pcop = pic16_pCodeOpCopy(aop->aopu.pcop);
-      switch( aop->aopu.pcop->type ) {
-        case PO_DIR: PCOR(pcop)->instance += offset; break;
-        case PO_IMMEDIATE: PCOI(pcop)->offset = offset; break;
+      DEBUGpic16_emitcode (";", "pic16_popGet AOP_PCODE (%s) %d %s offset %d", pic16_pCodeOpType (aop->aopu.pcop),
+                           __LINE__, ((aop->aopu.pcop->name) ? (aop->aopu.pcop->name) : "no name"), offset);
+      pcop = pic16_pCodeOpCopy (aop->aopu.pcop);
+      switch (aop->aopu.pcop->type)
+        {
+        case PO_DIR:
+          PCOR (pcop)->instance += offset;
+          break;
+        case PO_IMMEDIATE:
+          PCOI (pcop)->offset = offset;
+          break;
         case PO_WREG:
-            assert (offset==0);
-            break;
+          assert (offset == 0);
+          break;
         default:
           fprintf (stderr, "%s: unhandled aop->aopu.pcop->type %d\n", __FUNCTION__, aop->aopu.pcop->type);
-          assert( 0 );  /* should never reach here */;
-      }
+          assert (0); /* should never reach here */ ;
+        }
       return pcop;
     }
 
-    werror(E_INTERNAL_ERROR,__FILE__,__LINE__,
-           "pic16_popGet got unsupported aop->type");
-    exit(0);
+  werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "pic16_popGet got unsupported aop->type");
+  exit (0);
+}
+
+/*-------------------------------------------------------------------------*/
+/* pic16_popGetImmed - immediate asm operator to pcode operator conversion */
+/*-------------------------------------------------------------------------*/
+static pCodeOp *
+pic16_popGetImmed(asmop *aop, int offset, int overload)
+{
+  pCodeOp *pcop;
+
+  FENTRY2;
+
+  if (aop->type == AOP_PCODE)
+    {
+      if (aop->aopu.pcop->type == PO_IMMEDIATE)
+        {
+          pcop = pic16_pCodeOpCopy(aop->aopu.pcop);
+          PCOI(pcop)->offset = offset;  // offset: "LOW", "HIGH", "UPPER"
+          PCOI(pcop)->index += overload;  // LOW(ptr + index + overload)
+          return pcop;
+        }
+
+      fprintf(stderr, "%s: Only handled PO_IMMEDIATE.\n", __FUNCTION__);
+      assert(0);
+    }
+
+  werror(E_INTERNAL_ERROR, __FILE__, __LINE__, "pic16_popGetImmed supported only AOP_PCODE.");
+  exit(0);
 }
+
 /*-----------------------------------------------------------------*/
 /* pic16_aopPut - puts a string for a aop                                */
 /*-----------------------------------------------------------------*/
-void pic16_aopPut (asmop *aop, char *s, int offset)
+void
+pic16_aopPut (asmop * aop, char *s, int offset)
 {
-    char *d = buffer ;
-    symbol *lbl ;
+  char *d = buffer;
+  symbol *lbl;
 
-    return;
+  return;
 
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-    if (aop->size && offset > ( aop->size - 1)) {
-        werror(E_INTERNAL_ERROR,__FILE__,__LINE__,
-               "pic16_aopPut got offset > aop->size");
-        exit(0);
+  if (aop->size && offset > (aop->size - 1))
+    {
+      werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "pic16_aopPut got offset > aop->size");
+      exit (0);
     }
 
-    /* will assign value to value */
-    /* depending on where it is ofcourse */
-    switch (aop->type) {
+  /* will assign value to value */
+  /* depending on where it is ofcourse */
+  switch (aop->type)
+    {
     case AOP_DIR:
-      if (offset) {
-        sprintf(d,"(%s + %d)",
-                aop->aopu.aop_dir,offset);
-        fprintf(stderr,"oops pic16_aopPut:AOP_DIR did this %s\n",s);
-
-      } else
-            sprintf(d,"%s",aop->aopu.aop_dir);
-
-        if (strcmp(d,s)) {
-          DEBUGpic16_emitcode(";","%d",__LINE__);
-          if(strcmp(s,"W"))
-            pic16_emitcode("movf","%s,w",s);
-          pic16_emitcode("movwf","%s",d);
-
-          if(strcmp(s,"W")) {
-            pic16_emitcode(";BUG!? should have this:movf","%s,w   %d",s,__LINE__);
-            if(offset >= aop->size) {
-              pic16_emitpcode(POC_CLRF,pic16_popGet(aop,offset));
-              break;
-            } else
-              pic16_emitpcode(POC_MOVLW,pic16_popGetImmd(s,offset,0));
-          }
+      if (offset)
+        {
+          sprintf (d, "(%s + %d)", aop->aopu.aop_dir, offset);
+          fprintf (stderr, "oops pic16_aopPut:AOP_DIR did this %s\n", s);
+
+        }
+      else
+        sprintf (d, "%s", aop->aopu.aop_dir);
+
+      if (strcmp (d, s))
+        {
+          DEBUGpic16_emitcode (";", "%d", __LINE__);
+          if (strcmp (s, "W"))
+            pic16_emitcode ("movf", "%s,w", s);
+          pic16_emitcode ("movwf", "%s", d);
+
+          if (strcmp (s, "W"))
+            {
+              pic16_emitcode (";BUG!? should have this:movf", "%s,w   %d", s, __LINE__);
+              if (offset >= aop->size)
+                {
+                  pic16_emitpcode (POC_CLRF, pic16_popGet (aop, offset));
+                  break;
+                }
+              else
+                pic16_emitpcode (POC_MOVLW, pic16_popGetImmd (s, offset, 0));
+            }
 
-          pic16_emitpcode(POC_MOVWF,pic16_popGet(aop,offset));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (aop, offset));
 
 
         }
-        break;
+      break;
 
     case AOP_REG:
-      if (strcmp(aop->aopu.aop_reg[offset]->name,s) != 0) { // &&
-        //strcmp(aop->aopu.aop_reg[offset]->dname,s)!= 0){
+      if (strcmp (aop->aopu.aop_reg[offset]->name, s) != 0)     // &&
+        {
+          //strcmp(aop->aopu.aop_reg[offset]->dname,s)!= 0){
           /*
-            if (*s == '@'           ||
-                strcmp(s,"r0") == 0 ||
-                strcmp(s,"r1") == 0 ||
-                strcmp(s,"r2") == 0 ||
-                strcmp(s,"r3") == 0 ||
-                strcmp(s,"r4") == 0 ||
-                strcmp(s,"r5") == 0 ||
-                strcmp(s,"r6") == 0 ||
-                strcmp(s,"r7") == 0 )
-                pic16_emitcode("mov","%s,%s  ; %d",
-                         aop->aopu.aop_reg[offset]->dname,s,__LINE__);
-            else
-          */
+             if (*s == '@'           ||
+             strcmp(s,"r0") == 0 ||
+             strcmp(s,"r1") == 0 ||
+             strcmp(s,"r2") == 0 ||
+             strcmp(s,"r3") == 0 ||
+             strcmp(s,"r4") == 0 ||
+             strcmp(s,"r5") == 0 ||
+             strcmp(s,"r6") == 0 ||
+             strcmp(s,"r7") == 0 )
+             pic16_emitcode("mov","%s,%s  ; %d",
+             aop->aopu.aop_reg[offset]->dname,s,__LINE__);
+             else
+           */
 
-          if(strcmp(s,"W")==0 )
-            pic16_emitcode("movf","%s,w  ; %d",s,__LINE__);
+          if (strcmp (s, "W") == 0)
+            pic16_emitcode ("movf", "%s,w  ; %d", s, __LINE__);
 
-          pic16_emitcode("movwf","%s",
-                   aop->aopu.aop_reg[offset]->name);
+          pic16_emitcode ("movwf", "%s", aop->aopu.aop_reg[offset]->name);
 
-          if(strcmp(s,zero)==0) {
-            pic16_emitpcode(POC_CLRF,pic16_popGet(aop,offset));
-
-          } else if(strcmp(s,"W")==0) {
-            pCodeOp *pcop = Safe_calloc(1,sizeof(pCodeOpReg) );
-            pcop->type = PO_GPR_REGISTER;
-
-            PCOR(pcop)->rIdx = -1;
-            PCOR(pcop)->r = NULL;
-
-            DEBUGpic16_emitcode(";","%d",__LINE__);
-            pcop->name = Safe_strdup(s);
-            pic16_emitpcode(POC_MOVFW,pcop);
-            pic16_emitpcode(POC_MOVWF,pic16_popGet(aop,offset));
-          } else if(strcmp(s,one)==0) {
-            pic16_emitpcode(POC_CLRF,pic16_popGet(aop,offset));
-            pic16_emitpcode(POC_INCF,pic16_popGet(aop,offset));
-          } else {
-            pic16_emitpcode(POC_MOVWF,pic16_popGet(aop,offset));
-          }
+          if (strcmp (s, zero) == 0)
+            {
+              pic16_emitpcode (POC_CLRF, pic16_popGet (aop, offset));
+
+            }
+          else if (strcmp (s, "W") == 0)
+            {
+              pCodeOp *pcop = Safe_calloc (1, sizeof (pCodeOpReg));
+              pcop->type = PO_GPR_REGISTER;
+
+              PCOR (pcop)->rIdx = -1;
+              PCOR (pcop)->r = NULL;
+
+              DEBUGpic16_emitcode (";", "%d", __LINE__);
+              pcop->name = Safe_strdup (s);
+              pic16_emitpcode (POC_MOVFW, pcop);
+              pic16_emitpcode (POC_MOVWF, pic16_popGet (aop, offset));
+            }
+          else if (strcmp (s, one) == 0)
+            {
+              pic16_emitpcode (POC_CLRF, pic16_popGet (aop, offset));
+              pic16_emitpcode (POC_INCF, pic16_popGet (aop, offset));
+            }
+          else
+            {
+              pic16_emitpcode (POC_MOVWF, pic16_popGet (aop, offset));
+            }
         }
-        break;
+      break;
 
     case AOP_STK:
-        if (strcmp(s,"a") == 0)
-            pic16_emitcode("push","acc");
-        else
-            pic16_emitcode("push","%s",s);
+      if (strcmp (s, "a") == 0)
+        pic16_emitcode ("push", "acc");
+      else
+        pic16_emitcode ("push", "%s", s);
 
-        break;
+      break;
 
     case AOP_CRY:
-        /* if bit variable */
-        if (!aop->aopu.aop_dir) {
-            pic16_emitcode("clr","a");
-            pic16_emitcode("rlc","a");
-        } else {
-            if (s == zero)
-                pic16_emitcode("clr","%s",aop->aopu.aop_dir);
-            else
-                if (s == one)
-                    pic16_emitcode("setb","%s",aop->aopu.aop_dir);
-                else
-                    if (!strcmp(s,"c"))
-                        pic16_emitcode("mov","%s,c",aop->aopu.aop_dir);
-                    else {
-                        lbl = newiTempLabel(NULL);
+      /* if bit variable */
+      if (!aop->aopu.aop_dir)
+        {
+          pic16_emitcode ("clr", "a");
+          pic16_emitcode ("rlc", "a");
+        }
+      else
+        {
+          if (s == zero)
+            pic16_emitcode ("clr", "%s", aop->aopu.aop_dir);
+          else if (s == one)
+            pic16_emitcode ("setb", "%s", aop->aopu.aop_dir);
+          else if (!strcmp (s, "c"))
+            pic16_emitcode ("mov", "%s,c", aop->aopu.aop_dir);
+          else
+            {
+              lbl = newiTempLabel (NULL);
 
-                        if (strcmp(s,"a")) {
-                            MOVA(s);
-                        }
-                        pic16_emitcode("clr","c");
-                        pic16_emitcode("jz","%05d_DS_",lbl->key+100);
-                        pic16_emitcode("cpl","c");
-                        pic16_emitcode("","%05d_DS_:",lbl->key+100);
-                        pic16_emitcode("mov","%s,c",aop->aopu.aop_dir);
-                    }
+              if (strcmp (s, "a"))
+                {
+                  MOVA (s);
+                }
+              pic16_emitcode ("clr", "c");
+              pic16_emitcode ("jz", "%05d_DS_", labelKey2num (lbl->key));
+              pic16_emitcode ("cpl", "c");
+              pic16_emitcode ("", "%05d_DS_:", labelKey2num (lbl->key));
+              pic16_emitcode ("mov", "%s,c", aop->aopu.aop_dir);
+            }
         }
-        break;
+      break;
 
     case AOP_STR:
-        aop->coff = offset;
-        if (strcmp(aop->aopu.aop_str[offset],s))
-            pic16_emitcode ("mov","%s,%s ; %d",aop->aopu.aop_str[offset],s,__LINE__);
-        break;
+      aop->coff = offset;
+      if (strcmp (aop->aopu.aop_str[offset], s))
+        pic16_emitcode ("mov", "%s,%s ; %d", aop->aopu.aop_str[offset], s, __LINE__);
+      break;
 
     case AOP_ACC:
-        aop->coff = offset;
-        if (!offset && (strcmp(s,"acc") == 0))
-            break;
-
-        if (strcmp(aop->aopu.aop_str[offset],s))
-            pic16_emitcode ("mov","%s,%s ; %d",aop->aopu.aop_str[offset],s, __LINE__);
+      aop->coff = offset;
+      if (!offset && (strcmp (s, "acc") == 0))
         break;
 
-    default :
-        fprintf(stderr, "%s:%d: unknown aop->type = 0x%x\n", __FILE__, __LINE__, aop->type);
+      if (strcmp (aop->aopu.aop_str[offset], s))
+        pic16_emitcode ("mov", "%s,%s ; %d", aop->aopu.aop_str[offset], s, __LINE__);
+      break;
+
+    default:
+      fprintf (stderr, "%s:%d: unknown aop->type = 0x%x\n", __FILE__, __LINE__, aop->type);
 //      werror(E_INTERNAL_ERROR,__FILE__,__LINE__,
 //             "pic16_aopPut got unsupported aop->type");
 //      exit(0);
@@ -1987,218 +2137,299 @@
 /*-----------------------------------------------------------------*/
 /* pic16_mov2w - generate either a MOVLW or MOVFW based operand type     */
 /*-----------------------------------------------------------------*/
-void pic16_mov2w (asmop *aop, int offset)
+void
+pic16_mov2w (asmop * aop, int offset)
 {
-  DEBUGpic16_emitcode ("; ***","%s  %d  offset=%d",__FUNCTION__,__LINE__,offset);
+  int isWREG = (aop->type != AOP_STA && ! strcmp (pic16_aopGet(aop, 0, TRUE, FALSE), "WREG"));
+
+  DEBUGpic16_emitcode ("; ***", "%s  %d  offset=%d", __FUNCTION__, __LINE__, offset);
 
-  if(pic16_isLitAop(aop))
-    pic16_emitpcode(POC_MOVLW,pic16_popGet(aop,offset));
+  if (pic16_isLitAop (aop))
+    pic16_emitpcode (POC_MOVLW, pic16_popGet (aop, offset));
+  else if (isWREG)
+    DEBUGpic16_emitcode ("; ***", "ignore MOVF\tWREG, W", __FUNCTION__, __LINE__);
   else
-    pic16_emitpcode(POC_MOVFW,pic16_popGet(aop,offset));
+    pic16_emitpcode (POC_MOVFW, pic16_popGet (aop, offset));
 }
 
-void pic16_mov2w_volatile (asmop *aop)
+void
+pic16_mov2w_volatile (asmop * aop)
 {
   int i;
 
-  if(!pic16_isLitAop(aop)) {
-    // may need to protect this from the peepholer -- this is not nice but works...
-    pic16_addpCode2pBlock(pb, pic16_newpCodeAsmDir(";", "VOLATILE READ - BEGIN"));
-    for (i = 0; i < aop->size; i++) {
-      if (i > 0) {
-        pic16_addpCode2pBlock(pb, pic16_newpCodeAsmDir(";", "VOLATILE READ - MORE"));
-      } // if
-      pic16_emitpcode(POC_MOVFW, pic16_popGet(aop, i));
-    } // for
-    pic16_addpCode2pBlock(pb, pic16_newpCodeAsmDir(";", "VOLATILE READ - END"));
-  }
+  if (!pic16_isLitAop (aop))
+    {
+      // may need to protect this from the peepholer -- this is not nice but works...
+      pic16_addpCode2pBlock (pb, pic16_newpCodeAsmDir (";", "VOLATILE READ - BEGIN"));
+      for (i = 0; i < aop->size; i++)
+        {
+          if (i > 0)
+            {
+              pic16_addpCode2pBlock (pb, pic16_newpCodeAsmDir (";", "VOLATILE READ - MORE"));
+            }                   // if
+          pic16_emitpcode (POC_MOVFW, pic16_popGet (aop, i));
+        }                       // for
+      pic16_addpCode2pBlock (pb, pic16_newpCodeAsmDir (";", "VOLATILE READ - END"));
+    }
 }
 
-void pic16_mov2f(asmop *dst, asmop *src, int offset)
+void
+pic16_mov2f (asmop * dst, asmop * src, int offset)
 {
-  if(pic16_isLitAop(src)) {
-    pic16_emitpcode(POC_MOVLW, pic16_popGet(src, offset));
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(dst, offset));
-  } else {
-    if(pic16_sameRegsOfs(src, dst, offset))return;
-    pic16_emitpcode(POC_MOVFF, pic16_popGet2p( pic16_popGet(src, offset),
-                      pic16_popGet(dst, offset)));
-  }
+  if (pic16_isLitAop (src))
+    {
+      int dstIsWREG = (dst->type != AOP_STA && ! strcmp(pic16_aopGet(dst, 0, TRUE, FALSE), "WREG"));
+
+      pic16_emitpcode (POC_MOVLW, pic16_popGet (src, offset));
+
+      if (! dstIsWREG)
+        {
+          pic16_emitpcode (POC_MOVWF, pic16_popGet(dst, offset));
+        }
+    }
+  else
+    {
+      int srcIsWREG;
+
+      if (pic16_sameRegsOfs (src, dst, offset))
+        return;
+
+      srcIsWREG = (src->type != AOP_STA && ! strcmp (pic16_aopGet (src, 0, TRUE, FALSE), "WREG"));
+
+      if (srcIsWREG)
+        {
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (dst, offset));
+        }
+      else
+        {
+          int dstIsINTCON = (src->type != AOP_STA && ! strcmp (pic16_aopGet(src, 0, TRUE, FALSE), "INTCON"));
+          int dstIsPCL = (src->type != AOP_STA && ! strcmp (pic16_aopGet(src, 0, TRUE, FALSE), "PCL"));
+
+          if (dstIsINTCON || dstIsPCL)
+            {
+              pic16_emitpcode (POC_MOVFW, pic16_popGet (src, offset));
+              pic16_emitpcode (POC_MOVWF, pic16_popGet (dst, offset));
+            }
+          else
+            {
+              pic16_emitpcode(POC_MOVFF, pic16_popGet2p (pic16_popGet (src, offset),
+                              pic16_popGet (dst, offset)));
+            }
+        }
+    }
 }
 
-static void pic16_movLit2f(pCodeOp *pc, int lit)
+static void
+pic16_movLit2f (pCodeOp * pc, int lit)
 {
   if (0 == (lit & 0x00ff))
-  {
-    pic16_emitpcode (POC_CLRF, pc);
-  } else if (0xff == (lit & 0x00ff))
-  {
-    pic16_emitpcode (POC_SETF, pc);
-  } else {
-    pic16_emitpcode (POC_MOVLW, pic16_popGetLit (lit & 0x00ff));
-    if (pc->type != PO_WREG) pic16_emitpcode (POC_MOVWF, pc);
-  }
+    {
+      pic16_emitpcode (POC_CLRF, pc);
+    }
+  else if (0xff == (lit & 0x00ff))
+    {
+      pic16_emitpcode (POC_SETF, pc);
+    }
+  else
+    {
+      pic16_emitpcode (POC_MOVLW, pic16_popGetLit (lit & 0x00ff));
+      if (pc->type != PO_WREG)
+        pic16_emitpcode (POC_MOVWF, pc);
+    }
 }
 
-static void mov2fp(pCodeOp *dst, asmop *src, int offset)
+static void
+mov2fp (pCodeOp * dst, asmop * src, int offset)
 {
-  if(pic16_isLitAop(src)) {
-    pic16_emitpcode(POC_MOVLW, pic16_popGet(src, offset));
-    pic16_emitpcode(POC_MOVWF, dst);
-  } else {
-    pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popGet(src, offset), dst));
-  }
+  if (pic16_isLitAop (src))
+    {
+      pic16_emitpcode (POC_MOVLW, pic16_popGet (src, offset));
+
+      if (dst->type != PO_WREG)
+        {
+          pic16_emitpcode (POC_MOVWF, dst);
+        }
+    }
+  else
+    {
+      if (dst->type == PO_INTCON || dst->type == PO_PCL)
+        {
+          pic16_emitpcode (POC_MOVFW, pic16_popGet (src, offset));
+          pic16_emitpcode (POC_MOVWF, dst);
+        }
+      else
+        {
+          pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popGet (src, offset), dst));
+        }
+    }
 }
 
-void pic16_testStackOverflow(void)
+void
+pic16_testStackOverflow (void)
 {
 #define GSTACK_TEST_NAME        "_gstack_test"
 
-  pic16_emitpcode(POC_CALL, pic16_popGetWithString( GSTACK_TEST_NAME ));
+  pic16_emitpcode (POC_CALL, pic16_popGetWithString (GSTACK_TEST_NAME));
 
   {
     symbol *sym;
 
-      sym = newSymbol( GSTACK_TEST_NAME , 0 );
-      sprintf(sym->rname, "%s", /*port->fun_prefix,*/ GSTACK_TEST_NAME);
+    sym = newSymbol (GSTACK_TEST_NAME, 0);
+    sprintf (sym->rname, "%s", /*port->fun_prefix, */ GSTACK_TEST_NAME);
 //      strcpy(sym->rname, GSTACK_TEST_NAME);
-      checkAddSym(&externs, sym);
+    checkAddSym (&externs, sym);
   }
 
 }
 
 /* push pcop into stack */
-void pic16_pushpCodeOp(pCodeOp *pcop)
+void
+pic16_pushpCodeOp (pCodeOp * pcop)
 {
 //      DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-  if (pcop->type == PO_LITERAL) {
-    pic16_emitpcode(POC_MOVLW, pcop);
-    pic16_emitpcode(POC_MOVWF, pic16_popCopyReg( pic16_stack_postdec ));
-  } else {
-    pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pcop, pic16_popCopyReg( pic16_stack_postdec )));
-  }
-  if(pic16_options.gstack)
-    pic16_testStackOverflow();
+  if (pcop->type == PO_LITERAL)
+    {
+      pic16_emitpcode (POC_MOVLW, pcop);
+      pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (pic16_stack_postdec));
+    }
+  else
+    {
+      pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pcop, pic16_popCopyReg (pic16_stack_postdec)));
+    }
+  if (pic16_options.gstack)
+    pic16_testStackOverflow ();
 
 }
 
 /* pop pcop from stack */
-void pic16_poppCodeOp(pCodeOp *pcop)
+void
+pic16_poppCodeOp (pCodeOp * pcop)
 {
-  pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popCopyReg( pic16_stack_preinc ), pcop));
-  if(pic16_options.gstack)
-    pic16_testStackOverflow();
+  pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popCopyReg (pic16_stack_preinc), pcop));
+  if (pic16_options.gstack)
+    pic16_testStackOverflow ();
 }
 
 
 /*-----------------------------------------------------------------*/
 /* pushw - pushes wreg to stack                                    */
 /*-----------------------------------------------------------------*/
-void pushw(void)
+void
+pushw (void)
 {
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-  pic16_emitpcode(POC_MOVWF, pic16_popCopyReg( pic16_stack_postdec ));
-  if(pic16_options.gstack)
-    pic16_testStackOverflow();
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (pic16_stack_postdec));
+  if (pic16_options.gstack)
+    pic16_testStackOverflow ();
 }
 
 
 /*-----------------------------------------------------------------*/
 /* pushaop - pushes aop to stack                                   */
 /*-----------------------------------------------------------------*/
-void pushaop(asmop *aop, int offset)
+void
+pushaop (asmop * aop, int offset)
 {
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
-  if(_G.resDirect)return;
-
-  if(pic16_isLitAop(aop)) {
-    pic16_emitpcode(POC_MOVLW, pic16_popGet(aop, offset));
-    pic16_emitpcode(POC_MOVWF, pic16_popCopyReg( pic16_stack_postdec ));
-  } else {
-    pic16_emitpcode(POC_MOVFF,
-      pic16_popGet2p(pic16_popGet(aop, offset), pic16_popCopyReg( pic16_stack_postdec )));
-  }
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-  if(pic16_options.gstack)
-    pic16_testStackOverflow();
-}
+  if (_G.resDirect)
+    return;
 
-/*-----------------------------------------------------------------*/
+  if (pic16_isLitAop (aop))
+    {
+      pic16_emitpcode (POC_MOVLW, pic16_popGet (aop, offset));
+      pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (pic16_stack_postdec));
+    }
+  else
+    {
+      pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popGet (aop, offset), pic16_popCopyReg (pic16_stack_postdec)));
+    }
+
+  if (pic16_options.gstack)
+    pic16_testStackOverflow ();
+}
+
+/*-----------------------------------------------------------------*/
 /* popaop - pops aop from stack                                    */
 /*-----------------------------------------------------------------*/
-void popaop(asmop *aop, int offset)
+void
+popaop (asmop * aop, int offset)
 {
-  DEBUGpic16_emitcode("; ***", "%s  %d", __FUNCTION__, __LINE__);
-  pic16_emitpcode(POC_MOVFF, pic16_popCombine2(pic16_stack_preinc, PCOR(pic16_popGet(aop, offset)), 0));
-  if(pic16_options.gstack)
-    pic16_testStackOverflow();
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  pic16_emitpcode (POC_MOVFF, pic16_popCombine2 (pic16_stack_preinc, PCOR (pic16_popGet (aop, offset)), 0));
+  if (pic16_options.gstack)
+    pic16_testStackOverflow ();
 }
 
-void popaopidx(asmop *aop, int offset, int index)
+void
+popaopidx (asmop * aop, int offset, int index)
 {
-  int ofs=1;
+  int ofs = 1;
 
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-    if(STACK_MODEL_LARGE)ofs++;
+  if (STACK_MODEL_LARGE)
+    ofs++;
 
-    pic16_emitpcode(POC_MOVLW, pic16_popGetLit(index + ofs));
-    pic16_emitpcode(POC_MOVFF, pic16_popCombine2(pic16_frame_plusw, PCOR(pic16_popGet(aop, offset)), 0));
-    if(pic16_options.gstack)
-      pic16_testStackOverflow();
+  pic16_emitpcode (POC_MOVLW, pic16_popGetLit (index + ofs));
+  pic16_emitpcode (POC_MOVFF, pic16_popCombine2 (pic16_frame_plusw, PCOR (pic16_popGet (aop, offset)), 0));
+  if (pic16_options.gstack)
+    pic16_testStackOverflow ();
 }
 
 /*-----------------------------------------------------------------*/
 /* pic16_getDataSize - get the operand data size                         */
 /*-----------------------------------------------------------------*/
-int pic16_getDataSize(operand *op)
+int
+pic16_getDataSize (operand * op)
 {
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
 
-    return AOP_SIZE(op);
+  return AOP_SIZE (op);
 
-    // tsd- in the pic port, the genptr size is 1, so this code here
-    // fails. ( in the 8051 port, the size was 4).
+  // tsd- in the pic port, the genptr size is 1, so this code here
+  // fails. ( in the 8051 port, the size was 4).
 #if 0
-    int size;
-    size = AOP_SIZE(op);
-    if (size == GPTRSIZE)
+  int size;
+  size = AOP_SIZE (op);
+  if (size == GPTRSIZE)
     {
-        sym_link *type = operandType(op);
-        if (IS_GENPTR(type))
+      sym_link *type = operandType (op);
+      if (IS_GENPTR (type))
         {
-            /* generic pointer; arithmetic operations
-             * should ignore the high byte (pointer type).
-             */
-            size--;
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+          /* generic pointer; arithmetic operations
+           * should ignore the high byte (pointer type).
+           */
+          size--;
+          DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
         }
     }
-    return size;
+  return size;
 #endif
 }
 
 /*-----------------------------------------------------------------*/
 /* pic16_outAcc - output Acc                                             */
 /*-----------------------------------------------------------------*/
-void pic16_outAcc(operand *result)
+void
+pic16_outAcc (operand * result)
 {
-  int size,offset;
-  DEBUGpic16_emitcode ("; ***","%s  %d - ",__FUNCTION__,__LINE__);
-  DEBUGpic16_pic16_AopType(__LINE__,NULL,NULL,result);
+  int size, offset;
+  DEBUGpic16_emitcode ("; ***", "%s  %d - ", __FUNCTION__, __LINE__);
+  DEBUGpic16_pic16_AopType (__LINE__, NULL, NULL, result);
 
 
-  size = pic16_getDataSize(result);
-  if(size){
-    pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),0));
-    size--;
-    offset = 1;
-    /* unsigned or positive */
-    while(size--)
-      pic16_emitpcode(POC_CLRF,pic16_popGet(AOP(result),offset++));
-  }
+  size = pic16_getDataSize (result);
+  if (size)
+    {
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 0));
+      size--;
+      offset = 1;
+      /* unsigned or positive */
+      while (size--)
+        pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), offset++));
+    }
 
 }
 
@@ -2206,23 +2437,28 @@
 /* pic16_outBitC - output a bit C                                  */
 /*                 Move to result the value of Carry flag -- VR    */
 /*-----------------------------------------------------------------*/
-void pic16_outBitC(operand *result)
+void
+pic16_outBitC (operand * result)
 {
   int i;
 
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+
+  /* if the result is bit */
+  if (AOP_TYPE (result) == AOP_CRY)
+    {
+      fprintf (stderr, "%s:%d: pic16 port warning: unsupported case\n", __FILE__, __LINE__);
+      pic16_aopPut (AOP (result), "c", 0);
+    }
+  else
+    {
 
-    /* if the result is bit */
-    if (AOP_TYPE(result) == AOP_CRY) {
-        fprintf(stderr, "%s:%d: pic16 port warning: unsupported case\n", __FILE__, __LINE__);
-        pic16_aopPut(AOP(result),"c",0);
-    } else {
-
-        i = AOP_SIZE(result);
-        while(i--) {
-                pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result), i));
+      i = AOP_SIZE (result);
+      while (i--)
+        {
+          pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), i));
         }
-        pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(result), 0));
+      pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (result), 0));
     }
 }
 
@@ -2230,274 +2466,363 @@
 /* pic16_outBitOp - output a bit from Op                           */
 /*                 Move to result the value of set/clr op -- VR    */
 /*-----------------------------------------------------------------*/
-void pic16_outBitOp(operand *result, pCodeOp *pcop)
+void
+pic16_outBitOp (operand * result, pCodeOp * pcop)
 {
   int i;
 
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+
+  /* if the result is bit */
+  if (AOP_TYPE (result) == AOP_CRY)
+    {
+      fprintf (stderr, "%s:%d: pic16 port warning: unsupported case\n", __FILE__, __LINE__);
+      pic16_aopPut (AOP (result), "c", 0);
+    }
+  else
+    {
 
-    /* if the result is bit */
-    if (AOP_TYPE(result) == AOP_CRY) {
-        fprintf(stderr, "%s:%d: pic16 port warning: unsupported case\n", __FILE__, __LINE__);
-        pic16_aopPut(AOP(result),"c",0);
-    } else {
-
-        i = AOP_SIZE(result);
-        while(i--) {
-                pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result), i));
+      i = AOP_SIZE (result);
+      while (i--)
+        {
+          pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), i));
         }
-        pic16_emitpcode(POC_RRCF, pcop);
-        pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(result), 0));
+      pic16_emitpcode (POC_RRCF, pcop);
+      pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (result), 0));
     }
 }
 
 /*-----------------------------------------------------------------*/
 /* pic16_toBoolean - emit code for orl a,operator(sizeop)                */
 /*-----------------------------------------------------------------*/
-void pic16_toBoolean(operand *oper)
+void
+pic16_toBoolean (operand * oper)
 {
-    int size = AOP_SIZE(oper) - 1;
-    int offset = 1;
+  int size = AOP_SIZE (oper) - 1;
+  int offset = 1;
 
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-    if ( AOP_TYPE(oper) != AOP_ACC) {
-      pic16_emitpcode(POC_MOVFW,pic16_popGet(AOP(oper),0));
+  if (AOP_TYPE (oper) != AOP_ACC)
+    {
+      pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (oper), 0));
     }
-    while (size--) {
-      pic16_emitpcode(POC_IORFW, pic16_popGet(AOP(oper),offset++));
+  while (size--)
+    {
+      pic16_emitpcode (POC_IORFW, pic16_popGet (AOP (oper), offset++));
     }
 }
 
 /*-----------------------------------------------------------------*/
 /* genUminusFloat - unary minus for floating points                */
 /*-----------------------------------------------------------------*/
-static void genUminusFloat(operand *op,operand *result)
+static void
+genUminusFloat (operand * op, operand * result)
 {
-  int size ,offset =0 ;
+  int size, offset = 0;
 
-    FENTRY;
-    /* for this we just need to flip the
-    first it then copy the rest in place */
-    size = AOP_SIZE(op);
-    assert( size == AOP_SIZE(result) );
+  FENTRY;
+  /* for this we just need to flip the
+     first it then copy the rest in place */
+  size = AOP_SIZE (op);
+  assert (size == AOP_SIZE (result));
 
-    while(size--) {
-      pic16_mov2f(AOP(result), AOP(op), offset);
+  while (size--)
+    {
+      pic16_mov2f (AOP (result), AOP (op), offset);
       offset++;
     }
 
-    /* toggle the MSB's highest bit */
-    pic16_emitpcode(POC_BTG, pic16_popCopyGPR2Bit(pic16_popGet(AOP(result), offset-1), 7));
+  /* toggle the MSB's highest bit */
+  pic16_emitpcode (POC_BTG, pic16_popCopyGPR2Bit (pic16_popGet (AOP (result), offset - 1), 7));
 }
 
 /*-----------------------------------------------------------------*/
 /* genUminus - unary minus code generation                         */
 /*-----------------------------------------------------------------*/
-static void genUminus (iCode *ic)
+static void
+genUminus (iCode * ic)
 {
   int lsize, rsize, i;
-  sym_link *optype, *rtype;
+  sym_link *optype;
   symbol *label;
-  int needLabel=0;
+  int needLabel = 0;
 
-    FENTRY;
+  FENTRY;
 
-    /* assign asmops */
-    pic16_aopOp(IC_LEFT(ic),ic,FALSE);
-    pic16_aopOp(IC_RESULT(ic),ic,TRUE);
+  /* assign asmops */
+  pic16_aopOp (IC_LEFT (ic), ic, FALSE);
+  pic16_aopOp (IC_RESULT (ic), ic, TRUE);
 
-    /* if both in bit space then special case */
-    if (AOP_TYPE(IC_RESULT(ic)) == AOP_CRY
-      && AOP_TYPE(IC_LEFT(ic)) == AOP_CRY ) {
+  /* if both in bit space then special case */
+  if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY && AOP_TYPE (IC_LEFT (ic)) == AOP_CRY)
+    {
 
-        pic16_emitpcode(POC_BCF,   pic16_popGet(AOP(IC_RESULT(ic)),0));
-        pic16_emitpcode(POC_BTFSS, pic16_popGet(AOP(IC_LEFT(ic)),0));
-        pic16_emitpcode(POC_BSF,   pic16_popGet(AOP(IC_RESULT(ic)),0));
-        goto release;
+      pic16_emitpcode (POC_BCF, pic16_popGet (AOP (IC_RESULT (ic)), 0));
+      pic16_emitpcode (POC_BTFSS, pic16_popGet (AOP (IC_LEFT (ic)), 0));
+      pic16_emitpcode (POC_BSF, pic16_popGet (AOP (IC_RESULT (ic)), 0));
+      goto release;
     }
 
-    optype = operandType(IC_LEFT(ic));
-    rtype = operandType(IC_RESULT(ic));
+  optype = operandType (IC_LEFT (ic));
 
+  /* if float then do float stuff */
+  if (IS_FLOAT (optype) || IS_FIXED (optype))
+    {
+      if (IS_FIXED (optype))
+        debugf ("implement fixed16x16 type\n", 0);
 
-    /* if float then do float stuff */
-    if (IS_FLOAT(optype) || IS_FIXED(optype)) {
-      if(IS_FIXED(optype))
-        debugf("implement fixed16x16 type\n", 0);
-
-        genUminusFloat(IC_LEFT(ic),IC_RESULT(ic));
-        goto release;
+      genUminusFloat (IC_LEFT (ic), IC_RESULT (ic));
+      goto release;
     }
 
-    /* otherwise subtract from zero by taking the 2's complement */
-    lsize = AOP_SIZE(IC_LEFT(ic));
-    rsize = AOP_SIZE(IC_RESULT(ic));
-    label = newiTempLabel ( NULL );
+  /* otherwise subtract from zero by taking the 2's complement */
+  lsize = AOP_SIZE (IC_LEFT (ic));
+  rsize = AOP_SIZE (IC_RESULT (ic));
+  label = newiTempLabel (NULL);
 
-    if (pic16_sameRegs (AOP(IC_LEFT(ic)), AOP(IC_RESULT(ic)))) {
+  if (pic16_sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic))))
+    {
       /* If the result is longer than the operand,
          store sign extension (0x00 or 0xff) in W */
-      if (rsize > lsize) {
-        pic16_emitpcode (POC_MOVLW, pic16_popGetLit(0x00));
-        pic16_emitpcode (POC_BTFSS, pic16_popCopyGPR2Bit(pic16_popGet(AOP(IC_LEFT(ic)), lsize-1), 7));
-        pic16_emitpcode (POC_MOVLW, pic16_popGetLit(0xFF));
-      }
-      for (i = rsize - 1; i > 0; --i) {
-        if (i > lsize - 1) {
-          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP(IC_RESULT(ic)), i));
-        } else {
-          pic16_emitpcode (POC_COMF, pic16_popGet (AOP(IC_RESULT(ic)), i));
-        } // if
-      } // for
-      pic16_emitpcode (POC_NEGF, pic16_popGet (AOP(IC_RESULT(ic)), 0));
-      for (i = 1; i < rsize; ++i) {
-        if (i == rsize - 1) {
-          emitSKPNZ;
-        } else {
-          pic16_emitpcode (POC_BNZ, pic16_popGetLabel (label->key)); needLabel++;
+      if (rsize > lsize)
+        {
+          pic16_emitpcode (POC_MOVLW, pic16_popGetLit (0x00));
+          pic16_emitpcode (POC_BTFSS, pic16_popCopyGPR2Bit (pic16_popGet (AOP (IC_LEFT (ic)), lsize - 1), 7));
+          pic16_emitpcode (POC_MOVLW, pic16_popGetLit (0xFF));
         }
-        pic16_emitpcode (POC_INCF, pic16_popGet (AOP(IC_RESULT(ic)), i));
-      } // for
-    } else {
-      for (i = min(rsize, lsize) - 1; i >= 0; i--) {
-        pic16_emitpcode (POC_COMFW, pic16_popGet (AOP(IC_LEFT(ic)), i));
-        pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP(IC_RESULT(ic)), i));
-      } // for
+      for (i = rsize - 1; i > 0; --i)
+        {
+          if (i > lsize - 1)
+            {
+              pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (IC_RESULT (ic)), i));
+            }
+          else
+            {
+              pic16_emitpcode (POC_COMF, pic16_popGet (AOP (IC_RESULT (ic)), i));
+            }                   // if
+        }                       // for
+      pic16_emitpcode (POC_NEGF, pic16_popGet (AOP (IC_RESULT (ic)), 0));
+      for (i = 1; i < rsize; ++i)
+        {
+          if (i == rsize - 1)
+            {
+              emitSKPNZ;
+            }
+          else
+            {
+              pic16_emitpcode (POC_BNZ, pic16_popGetLabel (label->key));
+              needLabel++;
+            }
+          pic16_emitpcode (POC_INCF, pic16_popGet (AOP (IC_RESULT (ic)), i));
+        }                       // for
+    }
+  else
+    {
+      for (i = min (rsize, lsize) - 1; i >= 0; i--)
+        {
+          pic16_emitpcode (POC_COMFW, pic16_popGet (AOP (IC_LEFT (ic)), i));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (IC_RESULT (ic)), i));
+        }                       // for
       /* Sign extend if the result is longer than the operand */
-      if (rsize > lsize) {
-        pic16_emitpcode (POC_MOVLW, pic16_popGetLit(0x00));
-        pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit(pic16_popGet(AOP(IC_RESULT(ic)), lsize - 1), 7));
-        pic16_emitpcode (POC_MOVLW, pic16_popGetLit(0xFF));
-        for (i = rsize - 1; i > lsize - 1; --i) {
-          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP(IC_RESULT(ic)), i));
-        } // for
-      } // if
-      if (rsize > 1) {
-        for (i = 0; i < rsize - 2; i++) {
-          pic16_emitpcode (POC_INCF, pic16_popGet (AOP(IC_RESULT(ic)),i));
-          pic16_emitpcode (POC_BNZ, pic16_popGetLabel (label->key));
-          needLabel++;
-        } // for
-        pic16_emitpcode (POC_INFSNZ, pic16_popGet (AOP(IC_RESULT(ic)), rsize - 2));
-      } // if
-      pic16_emitpcode (POC_INCF, pic16_popGet(AOP(IC_RESULT(ic)), rsize - 1));
+      if (rsize > lsize)
+        {
+          pic16_emitpcode (POC_MOVLW, pic16_popGetLit (0x00));
+          pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit (pic16_popGet (AOP (IC_RESULT (ic)), lsize - 1), 7));
+          pic16_emitpcode (POC_MOVLW, pic16_popGetLit (0xFF));
+          for (i = rsize - 1; i > lsize - 1; --i)
+            {
+              pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (IC_RESULT (ic)), i));
+            }                   // for
+        }                       // if
+      if (rsize > 1)
+        {
+          for (i = 0; i < rsize - 2; i++)
+            {
+              pic16_emitpcode (POC_INCF, pic16_popGet (AOP (IC_RESULT (ic)), i));
+              pic16_emitpcode (POC_BNZ, pic16_popGetLabel (label->key));
+              needLabel++;
+            }                   // for
+          pic16_emitpcode (POC_INFSNZ, pic16_popGet (AOP (IC_RESULT (ic)), rsize - 2));
+        }                       // if
+      pic16_emitpcode (POC_INCF, pic16_popGet (AOP (IC_RESULT (ic)), rsize - 1));
     }
-    if (needLabel)
-      pic16_emitpLabel (label->key);
+  if (needLabel)
+    pic16_emitpLabel (label->key);
 
 release:
-    /* release the aops */
-    pic16_freeAsmop(IC_LEFT(ic), NULL, ic, (RESULTONSTACK(ic) ? 0 : 1));
-    pic16_freeAsmop(IC_RESULT(ic), NULL, ic, TRUE);
+  /* release the aops */
+  pic16_freeAsmop (IC_LEFT (ic), NULL, ic, (RESULTONSTACK (ic) ? 0 : 1));
+  pic16_freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
 }
 
-void pic16_loadFromReturn(operand *op, int offset, pCodeOp *src)
-{
-  if((AOP(op)->type == AOP_PCODE) && (AOP(op)->aopu.pcop->type == PO_IMMEDIATE)) {
-    pic16_emitpcode(POC_MOVFW, src);
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(op), offset));
-  } else {
-    pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-        src, pic16_popGet(AOP(op), offset)));
-  }
+void
+pic16_loadFromReturn (operand * op, int offset, pCodeOp * src)
+{
+  if ((AOP (op)->type == AOP_PCODE) && (AOP (op)->aopu.pcop->type == PO_IMMEDIATE))
+    {
+      pic16_emitpcode (POC_MOVFW, src);
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (op), offset));
+    }
+  else
+    {
+      pic16_emitpcode (POC_MOVFF, pic16_popGet2p (src, pic16_popGet (AOP (op), offset)));
+    }
 }
 
+/*-----------------------------------------------------------------*/
+
+static void
+free_stack_parameters (int Parameter_count)
+{
+  if (Parameter_count < 1)
+    {
+      return;
+    }
+
+  if (Parameter_count == 1)
+    {
+      pic16_emitpcode (POC_MOVF, pic16_popCopyReg (pic16_stack_postinc));
+    }
+  else if (Parameter_count == 2)
+    {
+      pic16_emitpcode (POC_MOVF, pic16_popCopyReg (pic16_stack_postinc));
+      pic16_emitpcode (POC_MOVF, pic16_popCopyReg (pic16_stack_postinc));
+    }
+  else
+    {
+      pic16_emitpcode (POC_MOVLW, pic16_popGetLit (Parameter_count));
+      pic16_emitpcode (POC_ADDWF, pic16_popCopyReg (pic16_stackpnt_lo));  // &pic16_pc_fsr1l));
+
+      if (STACK_MODEL_LARGE)
+        {
+          emitSKPNC;
+          pic16_emitpcode (POC_INCF, pic16_popCopyReg (pic16_stackpnt_hi)); // &pic16_pc_fsr1h));
+        }
+    }
+}
 
 /*-----------------------------------------------------------------*/
 /* assignResultValue - assign results to oper, rescall==1 is       */
 /*                     called from genCall() or genPcall()         */
 /*-----------------------------------------------------------------*/
-static void assignResultValue(operand * oper, int res_size, int rescall)
+static void
+assignResultValue (operand * oper, int res_size, int rescall)
 {
-  int size = AOP_SIZE(oper);
-  int offset=0;
+  int size = AOP_SIZE (oper);
+  int offset = 0;
 
-    FENTRY2;
+  FENTRY2;
 //    DEBUGpic16_emitcode ("; ***","%s  %d rescall:%d size:%d",__FUNCTION__,__LINE__,rescall,size); // patch 14
-    DEBUGpic16_pic16_AopType(__LINE__,oper,NULL,NULL);
+  DEBUGpic16_pic16_AopType (__LINE__, oper, NULL, NULL);
 
-    if(rescall) {
+  if (rescall)
+    {
       /* assign result from a call/pcall function() */
 
       /* function results are stored in a special order,
        * see top of file with Function return policy, or manual */
 
-      if(size <= 4) {
-        /* 8-bits, result in WREG */
-        pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(oper), 0));
+      if (size <= 4)
+        {
+          /* 8-bits, result in WREG */
+          if (AOP_TYPE(oper) != AOP_ACC)
+            {
+              /* If destination NOT WREG. */
+              pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (oper), 0));
+            }
+          else
+            {
+              DEBUGpic16_emitcode ("; ***", "ignore MOVWF\tWREG", __FUNCTION__, __LINE__);
+            }
 
-        if(size > 1 && res_size > 1) {
-          /* 16-bits, result in PRODL:WREG */
-          pic16_loadFromReturn(oper, 1, pic16_popCopyReg(&pic16_pc_prodl));
-        }
+          if (size > 1 && res_size > 1)
+            {
+              /* 16-bits, result in PRODL:WREG */
+              pic16_loadFromReturn (oper, 1, pic16_popCopyReg (&pic16_pc_prodl));
+            }
 
-        if(size > 2 && res_size > 2) {
-          /* 24-bits, result in PRODH:PRODL:WREG */
-          pic16_loadFromReturn(oper, 2, pic16_popCopyReg(&pic16_pc_prodh)); // patch 14
-        }
+          if (size > 2 && res_size > 2)
+            {
+              /* 24-bits, result in PRODH:PRODL:WREG */
+              pic16_loadFromReturn (oper, 2, pic16_popCopyReg (&pic16_pc_prodh));       // patch 14
+            }
 
-        if(size > 3 && res_size > 3) {
-          /* 32-bits, result in FSR0L:PRODH:PRODL:WREG */
-          pic16_loadFromReturn(oper, 3, pic16_popCopyReg(&pic16_pc_fsr0l)); // patch14
-        }
+          if (size > 3 && res_size > 3)
+            {
+              /* 32-bits, result in FSR0L:PRODH:PRODL:WREG */
+              pic16_loadFromReturn (oper, 3, pic16_popCopyReg (&pic16_pc_fsr0l));       // patch14
+            }
 
-        pic16_addSign(oper, res_size, IS_UNSIGNED(operandType(oper)));
+          pic16_addSign (oper, res_size, IS_UNSIGNED (operandType (oper)));
 
-      } else {
-        /* >32-bits, result on stack, and FSR0 points to beginning.
-         * Fix stack when done */
-        /* FIXME FIXME */
+        }
+      else
+        {
+          /* >32-bits, result on stack, and FSR0 points to beginning.
+           * Fix stack when done */
+          /* FIXME FIXME */
 //      debugf("WARNING: Possible bug when returning more than 4-bytes\n");
-        while (size--) {
+          while (size--)
+            {
 //          DEBUGpic16_emitcode("; ", "POC_MOVLW %d", GpsuedoStkPtr);
 //          DEBUGpic16_emitcode("; ", "POC_MOVFW PLUSW2");
 
-          popaopidx(AOP(oper), size, GpsuedoStkPtr);
-          GpsuedoStkPtr++;
-        }
+              popaopidx (AOP (oper), size, GpsuedoStkPtr);
+              GpsuedoStkPtr++;
+            }
 
-        /* fix stack */
-        pic16_emitpcode(POC_MOVLW, pic16_popGetLit( AOP_SIZE(oper) ));
-        pic16_emitpcode(POC_ADDWF, pic16_popCopyReg( pic16_stackpnt_lo ));      //&pic16_pc_fsr1l ));
-        if(STACK_MODEL_LARGE) {
-          emitSKPNC;
-          pic16_emitpcode(POC_INCF, pic16_popCopyReg( pic16_stackpnt_hi ));     //&pic16_pc_fsr1h ));
+          /* fix stack */
+          free_stack_parameters (AOP_SIZE (oper));
         }
-      }
-    } else {
+    }
+  else
+    {
       int areg = 0;             /* matching argument register */
 
 //      debugf("_G.useWreg = %d\tGpsuedoStkPtr = %d\n", _G.useWreg, GpsuedoStkPtr);
-      areg = SPEC_ARGREG( OP_SYM_ETYPE( oper ) ) - 1;
+      areg = SPEC_ARGREG (OP_SYM_ETYPE (oper)) - 1;
 
 
       /* its called from genReceive (probably) -- VR */
       /* I hope this code will not be called from somewhere else in the future!
        * We manually set the pseudo stack pointer in genReceive. - dw
        */
-      if(!GpsuedoStkPtr && _G.useWreg) {
+      if (!GpsuedoStkPtr && _G.useWreg)
+        {
 //        DEBUGpic16_emitcode("; ", "pop %d", GpsuedoStkPtr);
 
-        /* The last byte in the assignment is in W */
-        if(areg <= GpsuedoStkPtr) {
-          size--;
-          pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(oper), offset /*size*/));
-          offset++;
+          /* The last byte in the assignment is in W */
+          if (areg <= GpsuedoStkPtr)
+            {
+              size--;
+
+              if (AOP_TYPE(oper) != AOP_ACC)
+                {
+                  /* If destination NOT WREG. */
+                  pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (oper), offset /*size*/));
+                }
+              else
+                {
+                  DEBUGpic16_emitcode ("; ***", "ignore MOVWF\tWREG", __FUNCTION__, __LINE__);
+                }
+
+              offset++;
 //          debugf("receive from WREG\n", 0);
+            }
+          GpsuedoStkPtr++;      /* otherwise the calculation below fails (-_G.useWreg) */
         }
-        GpsuedoStkPtr++; /* otherwise the calculation below fails (-_G.useWreg) */
-      }
 //      GpsuedoStkPtr++;
-      _G.stack_lat = AOP_SIZE(oper)-1;
+      _G.stack_lat = AOP_SIZE (oper) - 1;
 
-      while (size) {
-        size--;
-        GpsuedoStkPtr++;
-        popaopidx(AOP(oper), offset, GpsuedoStkPtr - _G.useWreg);
+      while (size)
+        {
+          size--;
+          GpsuedoStkPtr++;
+          popaopidx (AOP (oper), offset, GpsuedoStkPtr - _G.useWreg);
 //        debugf("receive from STACK\n", 0);
-        offset++;
-      }
+          offset++;
+        }
     }
 }
 
@@ -2505,261 +2830,267 @@
 /*-----------------------------------------------------------------*/
 /* genIpush - generate code for pushing this gets a little complex */
 /*-----------------------------------------------------------------*/
-static void genIpush (iCode *ic)
+static void
+genIpush (iCode * ic)
 {
 //  int size, offset=0;
 
   FENTRY;
-  DEBUGpic16_emitcode ("; ***","%s  %d - WARNING no code generated",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d - WARNING no code generated", __FUNCTION__, __LINE__);
 
-  if(ic->parmPush) {
-    pic16_aopOp(IC_LEFT(ic), ic, FALSE );
+  if (ic->parmPush)
+    {
+      pic16_aopOp (IC_LEFT (ic), ic, FALSE);
 
-    /* send to stack as normal */
-    addSet(&_G.sendSet,ic);
+      /* send to stack as normal */
+      addSet (&_G.sendSet, ic);
 //    addSetHead(&_G.sendSet,ic);
-    pic16_freeAsmop(IC_LEFT(ic),NULL,ic,TRUE);
-  }
+      pic16_freeAsmop (IC_LEFT (ic), NULL, ic, TRUE);
+    }
 
 
 #if 0
-    int size, offset = 0 ;
-    char *l;
+  int size, offset = 0;
+  char *l;
 
 
-    /* if this is not a parm push : ie. it is spill push
-    and spill push is always done on the local stack */
-    if (!ic->parmPush) {
+  /* if this is not a parm push : ie. it is spill push
+     and spill push is always done on the local stack */
+  if (!ic->parmPush)
+    {
 
-        /* and the item is spilt then do nothing */
-        if (OP_SYMBOL(IC_LEFT(ic))->isspilt)
-            return ;
+      /* and the item is spilt then do nothing */
+      if (OP_SYMBOL (IC_LEFT (ic))->isspilt)
+        return;
 
-        pic16_aopOp(IC_LEFT(ic),ic,FALSE);
-        size = AOP_SIZE(IC_LEFT(ic));
-        /* push it on the stack */
-        while(size--) {
-            l = pic16_aopGet(AOP(IC_LEFT(ic)),offset++,FALSE,TRUE);
-            if (*l == '#') {
-                MOVA(l);
-                l = "acc";
+      pic16_aopOp (IC_LEFT (ic), ic, FALSE);
+      size = AOP_SIZE (IC_LEFT (ic));
+      /* push it on the stack */
+      while (size--)
+        {
+          l = pic16_aopGet (AOP (IC_LEFT (ic)), offset++, FALSE, TRUE);
+          if (*l == '#')
+            {
+              MOVA (l);
+              l = "acc";
             }
-            pic16_emitcode("push","%s",l);
+          pic16_emitcode ("push", "%s", l);
         }
-        return ;
+      return;
     }
 
-    pic16_freeAsmop(IC_LEFT(ic),NULL,ic,TRUE);
+  pic16_freeAsmop (IC_LEFT (ic), NULL, ic, TRUE);
 #endif
 }
 
 /*-----------------------------------------------------------------*/
 /* genIpop - recover the registers: can happen only for spilling   */
 /*-----------------------------------------------------------------*/
-static void genIpop (iCode *ic)
+static void
+genIpop (iCode * ic)
 {
   FENTRY;
-  DEBUGpic16_emitcode ("; ***","%s  %d - WARNING no code generated",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d - WARNING no code generated", __FUNCTION__, __LINE__);
 #if 0
-    int size,offset ;
+  int size, offset;
 
 
-    /* if the temp was not pushed then */
-    if (OP_SYMBOL(IC_LEFT(ic))->isspilt)
-        return ;
+  /* if the temp was not pushed then */
+  if (OP_SYMBOL (IC_LEFT (ic))->isspilt)
+    return;
 
-    pic16_aopOp(IC_LEFT(ic),ic,FALSE);
-    size = AOP_SIZE(IC_LEFT(ic));
-    offset = (size-1);
-    while (size--)
-        pic16_emitcode("pop","%s",pic16_aopGet(AOP(IC_LEFT(ic)),offset--,
-                                   FALSE,TRUE));
+  pic16_aopOp (IC_LEFT (ic), ic, FALSE);
+  size = AOP_SIZE (IC_LEFT (ic));
+  offset = (size - 1);
+  while (size--)
+    pic16_emitcode ("pop", "%s", pic16_aopGet (AOP (IC_LEFT (ic)), offset--, FALSE, TRUE));
 
-    pic16_freeAsmop(IC_LEFT(ic),NULL,ic,TRUE);
+  pic16_freeAsmop (IC_LEFT (ic), NULL, ic, TRUE);
 #endif
 }
 
-static int wparamCmp(void *p1, void *p2)
+static int
+wparamCmp (void *p1, void *p2)
 {
-  return (!strcmp((char *)p1, (char *)p2));
+  return (!strcmp ((char *) p1, (char *) p2));
 }
 
-int inWparamList(char *s)
+int
+inWparamList (char *s)
 {
-  return isinSetWith(wparamList, s, wparamCmp);
+  return isinSetWith (wparamList, s, wparamCmp);
 }
 
 
 /*-----------------------------------------------------------------*/
 /* genCall - generates a call statement                            */
 /*-----------------------------------------------------------------*/
-static void genCall (iCode *ic)
+static void
+genCall (iCode * ic)
 {
   sym_link *ftype;
-  int stackParms=0;
-  int use_wreg=0;
-  int inwparam=0;
+  int stackParms = 0;
+  int use_wreg = 0;
+  int inwparam = 0;
   char *fname;
 
-    FENTRY;
+  FENTRY;
 
-    ftype = OP_SYM_TYPE(IC_LEFT(ic));
-    /* if caller saves & we have not saved then */
+  ftype = OP_SYM_TYPE (IC_LEFT (ic));
+  /* if caller saves & we have not saved then */
 //    if (!ic->regsSaved)
 //      saveRegisters(ic);
 
-        /* initialise stackParms for IPUSH pushes */
+  /* initialise stackParms for IPUSH pushes */
 //      stackParms = psuedoStkPtr;
 //      fprintf(stderr, "%s:%d ic parmBytes = %d\n", __FILE__, __LINE__, ic->parmBytes);
-    fname = OP_SYMBOL(IC_LEFT(ic))->rname[0]?OP_SYMBOL(IC_LEFT(ic))->rname:OP_SYMBOL(IC_LEFT(ic))->name;
-    inwparam = (inWparamList(OP_SYMBOL(IC_LEFT(ic))->name)) || (FUNC_ISWPARAM(OP_SYM_TYPE(IC_LEFT(ic))));
+  fname = OP_SYMBOL (IC_LEFT (ic))->rname[0] ? OP_SYMBOL (IC_LEFT (ic))->rname : OP_SYMBOL (IC_LEFT (ic))->name;
+  inwparam = (inWparamList (OP_SYMBOL (IC_LEFT (ic))->name)) || (FUNC_ISWPARAM (OP_SYM_TYPE (IC_LEFT (ic))));
 
 #if 0
-    gpsimDebug_StackDump(__FILE__, __LINE__, fname );
+  gpsimDebug_StackDump (__FILE__, __LINE__, fname);
 #endif
 
-    /* if send set is not empty the assign */
-    if (_G.sendSet) {
+  /* if send set is not empty the assign */
+  if (_G.sendSet)
+    {
       iCode *sic;
-      int psuedoStkPtr=-1;
+      int psuedoStkPtr = -1;
       int firstTimeThruLoop = 1;
 
 
-        /* reverse sendSet if function is not reentrant */
-        if(!IFFUNC_ISREENT(ftype))
-          _G.sendSet = reverseSet(_G.sendSet);
+      /* reverse sendSet if function is not reentrant */
+      if (!IFFUNC_ISREENT (ftype))
+        _G.sendSet = reverseSet (_G.sendSet);
 
-        /* First figure how many parameters are getting passed */
-        stackParms = 0;
-        use_wreg = 0;
+      /* First figure how many parameters are getting passed */
+      stackParms = 0;
+      use_wreg = 0;
 
-        for (sic = setFirstItem(_G.sendSet) ; sic ; sic = setNextItem(_G.sendSet)) {
+      for (sic = setFirstItem (_G.sendSet); sic; sic = setNextItem (_G.sendSet))
+        {
           int size;
 //          int offset = 0;
 
-            pic16_aopOp(IC_LEFT(sic),sic,FALSE);
-            size = AOP_SIZE(IC_LEFT(sic));
+          pic16_aopOp (IC_LEFT (sic), sic, FALSE);
+          size = AOP_SIZE (IC_LEFT (sic));
+
+          stackParms += size;
 
-            stackParms += size;
+          /* pass the last byte through WREG */
+          if (inwparam)
+            {
 
-            /* pass the last byte through WREG */
-            if(inwparam) {
+              while (size--)
+                {
+                  DEBUGpic16_emitcode ("; ", "%d left %s", __LINE__, pic16_AopType (AOP_TYPE (IC_LEFT (sic))));
+                  DEBUGpic16_emitcode ("; ", "push %d", psuedoStkPtr - 1);
 
-              while (size--) {
-                DEBUGpic16_emitcode ("; ","%d left %s",__LINE__,
-                      pic16_AopType(AOP_TYPE(IC_LEFT(sic))));
-                DEBUGpic16_emitcode("; ", "push %d", psuedoStkPtr-1);
-
-                if(!firstTimeThruLoop) {
-                  /* If this is not the first time we've been through the loop
-                   * then we need to save the parameter in a temporary
-                   * register. The last byte of the last parameter is
-                   * passed in W. */
+                  if (!firstTimeThruLoop)
+                    {
+                      /* If this is not the first time we've been through the loop
+                       * then we need to save the parameter in a temporary
+                       * register. The last byte of the last parameter is
+                       * passed in W. */
 
-                  pushw();
+                      pushw ();
 //                  --psuedoStkPtr;             // sanity check
-                  use_wreg = 1;
-                }
+                      use_wreg = 1;
+                    }
 
-                firstTimeThruLoop=0;
+                  firstTimeThruLoop = 0;
 
-                pic16_mov2w (AOP(IC_LEFT(sic)), size);
+                  pic16_mov2w (AOP (IC_LEFT (sic)), size);
 
 //                offset++;
-              }
-            } else {
+                }
+            }
+          else
+            {
               /* all arguments are passed via stack */
               use_wreg = 0;
 
-              while (size--) {
-                DEBUGpic16_emitcode ("; ","%d left %s",__LINE__,
-                      pic16_AopType(AOP_TYPE(IC_LEFT(sic))));
-                DEBUGpic16_emitcode("; ", "push %d", psuedoStkPtr-1);
+              while (size--)
+                {
+                  DEBUGpic16_emitcode ("; ", "%d left %s", __LINE__, pic16_AopType (AOP_TYPE (IC_LEFT (sic))));
+                  DEBUGpic16_emitcode ("; ", "push %d", psuedoStkPtr - 1);
 
 //                pushaop(AOP(IC_LEFT(sic)), size);
-                                pic16_mov2w( AOP(IC_LEFT(sic)), size );
+                  pic16_mov2w (AOP (IC_LEFT (sic)), size);
 
-                if(!_G.resDirect)
-                  pushw();
-              }
+                  if (!_G.resDirect)
+                    pushw ();
+                }
             }
 
-            pic16_freeAsmop (IC_LEFT(sic),NULL,sic,TRUE);
-          }
+          pic16_freeAsmop (IC_LEFT (sic), NULL, sic, TRUE);
+        }
 
-          if(inwparam) {
-            if(IFFUNC_HASVARARGS(ftype) || IFFUNC_ISREENT(ftype)) {
-              pushw();  /* save last parameter to stack if functions has varargs */
+      if (inwparam)
+        {
+          if (IFFUNC_HASVARARGS (ftype) || IFFUNC_ISREENT (ftype))
+            {
+              pushw ();         /* save last parameter to stack if functions has varargs */
               use_wreg = 0;
-            } else
-              use_wreg = 1;
-          } else use_wreg = 0;
+            }
+          else
+            use_wreg = 1;
+        }
+      else
+        use_wreg = 0;
 
-          _G.stackRegSet = _G.sendSet;
-          _G.sendSet = NULL;
+      _G.stackRegSet = _G.sendSet;
+      _G.sendSet = NULL;
     }
 
-    /* make the call */
-    pic16_emitpcode(POC_CALL,pic16_popGetWithString(fname));
+  /* make the call */
+  pic16_emitpcode (POC_CALL, pic16_popGetWithString (fname));
 
-    GpsuedoStkPtr=0;
+  GpsuedoStkPtr = 0;
 
-    /* if we need to assign a result value */
-    if ((IS_ITEMP(IC_RESULT(ic))
-          && (OP_SYMBOL(IC_RESULT(ic))->nRegs
-              || OP_SYMBOL(IC_RESULT(ic))->spildir ))
-        || IS_TRUE_SYMOP(IC_RESULT(ic)) ) {
+  /* if we need to assign a result value */
+  if ((IS_ITEMP (IC_RESULT (ic))
+       && (OP_SYMBOL (IC_RESULT (ic))->nRegs || OP_SYMBOL (IC_RESULT (ic))->spildir)) || IS_TRUE_SYMOP (IC_RESULT (ic)))
+    {
 
       _G.accInUse++;
-      pic16_aopOp(IC_RESULT(ic),ic,FALSE);
+      pic16_aopOp (IC_RESULT (ic), ic, FALSE);
       _G.accInUse--;
 
       /* Must not assign an 8-bit result to a 16-bit variable;
        * this would use (used...) the uninitialized PRODL! */
       /* FIXME: Need a proper way to obtain size of function result type,
        * OP_SYM_ETYPE does not work: it dereferences pointer types! */
-      assignResultValue(IC_RESULT(ic), getSize(OP_SYM_TYPE(IC_LEFT(ic))->next), 1);
+      assignResultValue (IC_RESULT (ic), getSize (OP_SYM_TYPE (IC_LEFT (ic))->next), 1);
 
-      DEBUGpic16_emitcode ("; ","%d left %s",__LINE__,
-                pic16_AopType(AOP_TYPE(IC_RESULT(ic))));
+      DEBUGpic16_emitcode ("; ", "%d left %s", __LINE__, pic16_AopType (AOP_TYPE (IC_RESULT (ic))));
 
-      pic16_freeAsmop(IC_RESULT(ic),NULL, ic,TRUE);
+      pic16_freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
     }
 
-    if(!stackParms && ic->parmBytes) {
+  if (!stackParms && ic->parmBytes)
+    {
       stackParms = ic->parmBytes;
     }
 
-    stackParms -= use_wreg;
-
-    if(stackParms>0) {
-      if(stackParms == 1) {
-        pic16_emitpcode(POC_INCF, pic16_popCopyReg(pic16_stackpnt_lo ));        //&pic16_pc_fsr1l));
-      } else {
-        pic16_emitpcode(POC_MOVLW, pic16_popGetLit(stackParms));
-        pic16_emitpcode(POC_ADDWF, pic16_popCopyReg( pic16_stackpnt_lo ));      //&pic16_pc_fsr1l ));
-      }
-      if(STACK_MODEL_LARGE) {
-        emitSKPNC;
-        pic16_emitpcode(POC_INCF, pic16_popCopyReg( pic16_stackpnt_hi ));       //&pic16_pc_fsr1h ));
-      }
-    }
+  stackParms -= use_wreg;
+  free_stack_parameters (stackParms);
 
 #if 0
-    gpsimDebug_StackDump(__FILE__, __LINE__, fname);
+  gpsimDebug_StackDump (__FILE__, __LINE__, fname);
 #endif
 
-    /* adjust the stack for parameters if required */
+  /* adjust the stack for parameters if required */
 //    fprintf(stderr, "%s:%d: %s ic->parmBytes= %d\n", __FILE__, __LINE__, OP_SYMBOL(IC_LEFT(ic))->name, ic->parmBytes);
 
 #if 0
-      /* if register bank was saved then pop them */
-      if (ic->bankSaved)
-        unsaverbank(FUNC_REGBANK(dtype),ic,TRUE);
-
-      /* if we hade saved some registers then unsave them */
-      if (ic->regsSaved && !IFFUNC_CALLEESAVES(dtype))
-        unsaveRegisters (ic);
+  /* if register bank was saved then pop them */
+  if (ic->bankSaved)
+    unsaverbank (FUNC_REGBANK (dtype), ic, TRUE);
+
+  /* if we hade saved some registers then unsave them */
+  if (ic->regsSaved && !IFFUNC_CALLEESAVES (dtype))
+    unsaveRegisters (ic);
 #endif
 }
 
@@ -2769,138 +3100,134 @@
 /* genPcall - generates a call by pointer statement                */
 /*            new version, created from genCall - HJD              */
 /*-----------------------------------------------------------------*/
-static void genPcall (iCode *ic)
+static void
+genPcall (iCode * ic)
 {
   sym_link *fntype;
-  int stackParms=0;
-  symbol *retlbl = newiTempLabel(NULL);
-  pCodeOp *pcop_lbl = pic16_popGetLabel(retlbl->key);
+  int stackParms = 0;
+  symbol *retlbl = newiTempLabel (NULL);
+  pCodeOp *pcop_lbl = pic16_popGetLabel (retlbl->key);
 
-    FENTRY;
+  FENTRY;
 
-    fntype = operandType( IC_LEFT(ic) )->next;
+  fntype = operandType (IC_LEFT (ic))->next;
 
-    /* if send set is not empty the assign */
-    if (_G.sendSet) {
+  /* if send set is not empty the assign */
+  if (_G.sendSet)
+    {
       iCode *sic;
-      int psuedoStkPtr=-1;
+      int psuedoStkPtr = -1;
 
       /* reverse sendSet if function is not reentrant */
-      if(!IFFUNC_ISREENT(fntype))
-        _G.sendSet = reverseSet(_G.sendSet);
+      if (!IFFUNC_ISREENT (fntype))
+        _G.sendSet = reverseSet (_G.sendSet);
 
       stackParms = 0;
 
-      for (sic = setFirstItem(_G.sendSet) ; sic ; sic = setNextItem(_G.sendSet)) {
-        int size;
+      for (sic = setFirstItem (_G.sendSet); sic; sic = setNextItem (_G.sendSet))
+        {
+          int size;
 
-          pic16_aopOp(IC_LEFT(sic),sic,FALSE);
-          size = AOP_SIZE(IC_LEFT(sic));
+          pic16_aopOp (IC_LEFT (sic), sic, FALSE);
+          size = AOP_SIZE (IC_LEFT (sic));
           stackParms += size;
 
           /* all parameters are passed via stack, since WREG is clobbered
            * by the calling sequence */
-          while (size--) {
-            DEBUGpic16_emitcode ("; ","%d left %s",__LINE__,
-            pic16_AopType(AOP_TYPE(IC_LEFT(sic))));
-            DEBUGpic16_emitcode("; ", "push %d", psuedoStkPtr-1);
+          while (size--)
+            {
+              DEBUGpic16_emitcode ("; ", "%d left %s", __LINE__, pic16_AopType (AOP_TYPE (IC_LEFT (sic))));
+              DEBUGpic16_emitcode ("; ", "push %d", psuedoStkPtr - 1);
 
-            pic16_mov2w (AOP(IC_LEFT(sic)), size);
-            pushw();
-          }
+              pic16_mov2w (AOP (IC_LEFT (sic)), size);
+              pushw ();
+            }
 
-          pic16_freeAsmop (IC_LEFT(sic),NULL,sic,TRUE);
-      }
+          pic16_freeAsmop (IC_LEFT (sic), NULL, sic, TRUE);
+        }
 
       _G.stackRegSet = _G.sendSet;
       _G.sendSet = NULL;
     }
 
-    pic16_aopOp(IC_LEFT(ic),ic,FALSE);
+  pic16_aopOp (IC_LEFT (ic), ic, FALSE);
+
+  // push return address
+  // push $ on return stack, then replace with retlbl
+
+  /* Thanks to Thorsten Klose for pointing out that the following
+   * snippet should be interrupt safe */
+  pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popCopyReg (&pic16_pc_intcon), pic16_popCopyReg (&pic16_pc_postdec1)));
+  pic16_emitpcode (POC_BCF, pic16_popCopyGPR2Bit (pic16_popCopyReg (&pic16_pc_intcon), 7));
+
+  pic16_emitpcodeNULLop (POC_PUSH);
+
+  pic16_emitpcode (POC_MOVLW, pic16_popGetImmd (pcop_lbl->name, 0, 0));
+  pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_tosl));
+  pic16_emitpcode (POC_MOVLW, pic16_popGetImmd (pcop_lbl->name, 1, 0));
+  pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_tosh));
+  pic16_emitpcode (POC_MOVLW, pic16_popGetImmd (pcop_lbl->name, 2, 0));
+  pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_tosu));
+
+  /* Conditionally re-enable interrupts, but keep interrupt flags in
+   * INTCON intact (thanks to J. van der Boon, #3420588). */
+  pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit (pic16_popCopyReg (&pic16_pc_preinc1), 7));
+  pic16_emitpcode (POC_BSF, pic16_popCopyGPR2Bit (pic16_popCopyReg (&pic16_pc_intcon), 7));
+
+  /* make the call by writing the pointer into pc */
+  mov2fp (pic16_popCopyReg (&pic16_pc_pclatu), AOP (IC_LEFT (ic)), 2);
+  mov2fp (pic16_popCopyReg (&pic16_pc_pclath), AOP (IC_LEFT (ic)), 1);
 
-    // push return address
-    // push $ on return stack, then replace with retlbl
+  // note: MOVFF to PCL not allowed
+  pic16_mov2w (AOP (IC_LEFT (ic)), 0);
+  pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_pcl));
 
-    /* Thanks to Thorsten Klose for pointing out that the following
-     * snippet should be interrupt safe */
-    pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popCopyReg(&pic16_pc_intcon), pic16_popCopyReg(&pic16_pc_postdec1)));
-    pic16_emitpcode(POC_BCF, pic16_popCopyGPR2Bit(pic16_popCopyReg(&pic16_pc_intcon), 7));
-
-    pic16_emitpcodeNULLop(POC_PUSH);
-
-    pic16_emitpcode(POC_MOVLW, pic16_popGetImmd(pcop_lbl->name, 0, 0));
-    pic16_emitpcode(POC_MOVWF, pic16_popCopyReg(&pic16_pc_tosl));
-    pic16_emitpcode(POC_MOVLW, pic16_popGetImmd(pcop_lbl->name, 1, 0));
-    pic16_emitpcode(POC_MOVWF, pic16_popCopyReg(&pic16_pc_tosh));
-    pic16_emitpcode(POC_MOVLW, pic16_popGetImmd(pcop_lbl->name, 2, 0));
-    pic16_emitpcode(POC_MOVWF, pic16_popCopyReg(&pic16_pc_tosu));
-
-    /* Conditionally re-enable interrupts, but keep interrupt flags in
-     * INTCON intact (thanks to J. van der Boon, #3420588). */
-    pic16_emitpcode(POC_BTFSC, pic16_popCopyGPR2Bit(pic16_popCopyReg(&pic16_pc_preinc1), 7));
-    pic16_emitpcode(POC_BSF, pic16_popCopyGPR2Bit(pic16_popCopyReg(&pic16_pc_intcon), 7));
-
-    /* make the call by writing the pointer into pc */
-    mov2fp(pic16_popCopyReg(&pic16_pc_pclatu), AOP(IC_LEFT(ic)), 2);
-    mov2fp(pic16_popCopyReg(&pic16_pc_pclath), AOP(IC_LEFT(ic)), 1);
-
-    // note: MOVFF to PCL not allowed
-    pic16_mov2w(AOP(IC_LEFT(ic)), 0);
-    pic16_emitpcode(POC_MOVWF, pic16_popCopyReg(&pic16_pc_pcl));
-
-
-    /* return address is here: (X) */
-    pic16_emitpLabelFORCE(retlbl->key);
-
-    pic16_freeAsmop (IC_LEFT(ic),NULL,ic,TRUE);
-
-    GpsuedoStkPtr=0;
-    /* if we need assign a result value */
-    if ((IS_ITEMP(IC_RESULT(ic))
-          && (OP_SYMBOL(IC_RESULT(ic))->nRegs
-              || OP_SYMBOL(IC_RESULT(ic))->spildir ))
-        || IS_TRUE_SYMOP(IC_RESULT(ic)) ) {
+
+  /* return address is here: (X) */
+  pic16_emitpLabelFORCE (retlbl->key);
+
+  pic16_freeAsmop (IC_LEFT (ic), NULL, ic, TRUE);
+
+  GpsuedoStkPtr = 0;
+  /* if we need assign a result value */
+  if ((IS_ITEMP (IC_RESULT (ic))
+       && (OP_SYMBOL (IC_RESULT (ic))->nRegs || OP_SYMBOL (IC_RESULT (ic))->spildir)) || IS_TRUE_SYMOP (IC_RESULT (ic)))
+    {
 
       _G.accInUse++;
-      pic16_aopOp(IC_RESULT(ic),ic,FALSE);
+      pic16_aopOp (IC_RESULT (ic), ic, FALSE);
       _G.accInUse--;
 
       /* FIXME: Need proper way to obtain the function result's type.
        * OP_SYM_TYPE(IC_LEFT(ic))->next does not work --> points to function pointer */
-      assignResultValue(IC_RESULT(ic), getSize(OP_SYM_TYPE(IC_LEFT(ic))->next->next), 1);
+      assignResultValue (IC_RESULT (ic), getSize (OP_SYM_TYPE (IC_LEFT (ic))->next->next), 1);
 
-      DEBUGpic16_emitcode ("; ","%d left %s",__LINE__,
-              pic16_AopType(AOP_TYPE(IC_RESULT(ic))));
+      DEBUGpic16_emitcode ("; ", "%d left %s", __LINE__, pic16_AopType (AOP_TYPE (IC_RESULT (ic))));
 
-      pic16_freeAsmop(IC_RESULT(ic),NULL, ic,TRUE);
+      pic16_freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
     }
 
 //    stackParms -= use_wreg;
 
-    if(stackParms>0) {
-      pic16_emitpcode(POC_MOVLW, pic16_popGetLit(stackParms));
-      pic16_emitpcode(POC_ADDWF, pic16_popCopyReg( pic16_stackpnt_lo ));
-      if(STACK_MODEL_LARGE) {
-        emitSKPNC;
-        pic16_emitpcode(POC_INCF, pic16_popCopyReg( pic16_stackpnt_hi ));
-      }
-    }
+  free_stack_parameters (stackParms);
 }
 
 /*-----------------------------------------------------------------*/
 /* resultRemat - result  is rematerializable                       */
 /*-----------------------------------------------------------------*/
-static int resultRemat (iCode *ic)
+static int
+resultRemat (iCode * ic)
 {
   //    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-  if (SKIP_IC(ic) || ic->op == IFX)
+  if (SKIP_IC (ic) || ic->op == IFX)
     return 0;
 
-  if (IC_RESULT(ic) && IS_ITEMP(IC_RESULT(ic))) {
-    symbol *sym = OP_SYMBOL(IC_RESULT(ic));
-    if (sym->remat && !POINTER_SET(ic))
-      return 1;
-  }
+  if (IC_RESULT (ic) && IS_ITEMP (IC_RESULT (ic)))
+    {
+      symbol *sym = OP_SYMBOL (IC_RESULT (ic));
+      if (sym->remat && !POINTER_SET (ic))
+        return 1;
+    }
 
   return 0;
 }
@@ -2909,559 +3236,639 @@
 /*-----------------------------------------------------------------*/
 /* inExcludeList - return 1 if the string is in exclude Reg list   */
 /*-----------------------------------------------------------------*/
-static bool inExcludeList(char *s)
+static bool
+inExcludeList (char *s)
 {
-  DEBUGpic16_emitcode ("; ***","%s  %d - WARNING no code generated",__FUNCTION__,__LINE__);
-    int i =0;
+  DEBUGpic16_emitcode ("; ***", "%s  %d - WARNING no code generated", __FUNCTION__, __LINE__);
+  int i = 0;
 
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    if (options.excludeRegs[i] &&
-    STRCASECMP(options.excludeRegs[i],"none") == 0)
-        return FALSE ;
-
-    for ( i = 0 ; options.excludeRegs[i]; i++) {
-        if (options.excludeRegs[i] &&
-        STRCASECMP(s,options.excludeRegs[i]) == 0)
-            return TRUE;
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  if (options.excludeRegs[i] && STRCASECMP (options.excludeRegs[i], "none") == 0)
+    return FALSE;
+
+  for (i = 0; options.excludeRegs[i]; i++)
+    {
+      if (options.excludeRegs[i] && STRCASECMP (s, options.excludeRegs[i]) == 0)
+        return TRUE;
     }
-    return FALSE ;
+  return FALSE;
 }
 #endif
 
 /*-----------------------------------------------------------------*/
 /* genFunction - generated code for function entry                 */
 /*-----------------------------------------------------------------*/
-static void genFunction (iCode *ic)
+static void
+genFunction (iCode * ic)
 {
   symbol *sym;
   sym_link *ftype;
 
-    FENTRY;
-    DEBUGpic16_emitcode ("; ***","%s  %d curr label offset=%dprevious max_key=%d ",__FUNCTION__,__LINE__,pic16_labelOffset,max_key);
+  FENTRY;
+  DEBUGpic16_emitcode ("; ***", "%s  %d curr label offset=%dprevious max_key=%d ", __FUNCTION__, __LINE__, pic16_labelOffset,
+                       max_key);
 
-    pic16_labelOffset += (max_key+4);
-    max_key=0;
-    GpsuedoStkPtr=0;
-    _G.nRegsSaved = 0;
+  pic16_labelOffset += (max_key + 4);
+  max_key = 0;
+  GpsuedoStkPtr = 0;
+  _G.nRegsSaved = 0;
 
-    ftype = operandType(IC_LEFT(ic));
-    sym = OP_SYMBOL(IC_LEFT(ic));
+  ftype = operandType (IC_LEFT (ic));
+  sym = OP_SYMBOL (IC_LEFT (ic));
 
-    if(IFFUNC_ISISR(sym->type /*ftype*/)) {
+  if (IFFUNC_ISISR (sym->type))
+    {
       /* create an absolute section at the interrupt vector:
        * that is 0x0008 for interrupt 1 (high), 0x0018 interrupt 2 (low) */
       symbol *asym;
       char asymname[128];
       pBlock *apb;
 
-//        debugf("interrupt number: %hhi\n", FUNC_INTNO(sym->type));
+      //debugf ("interrupt number: %hhi\n", FUNC_INTNO (sym->type));
 
-        if(FUNC_INTNO(sym->type) == INTNO_UNSPEC)
-          sprintf(asymname, "ivec_%s", sym->name);
-        else
-          sprintf(asymname, "ivec_0x%x_%s", FUNC_INTNO(sym->type), sym->name);
-
-        /* when an interrupt is declared as naked, do not emit the special
-         * wrapper segment at vector address. The user should take care for
-         * this instead. -- VR */
-
-        if(!IFFUNC_ISNAKED(ftype) && (FUNC_INTNO(sym->type) != INTNO_UNSPEC)) {
-          asym = newSymbol(asymname, 0);
-          apb = pic16_newpCodeChain(NULL, 'A', pic16_newpCodeCharP("; Starting pCode block for absolute section"));
-          pic16_addpBlock( apb );
-
-          pic16_addpCode2pBlock(apb, pic16_newpCodeCharP(";-----------------------------------------"));
-          pic16_addpCode2pBlock(apb, pic16_newpCodeFunction(moduleName, asym->name));
-          //pic16_addpCode2pBlock(apb, pic16_newpCode(POC_GOTO, pic16_popGetWithString( sym->rname )));
-          //pic16_addpCode2pBlock(apb, pic16_newpCode(POC_GOTO, pic16_newpCodeOpLabel (sym->rname, 0)));
-          pic16_addpCode2pBlock(apb, pic16_newpCodeAsmDir ("GOTO", "%s", sym->rname)); /* this suppresses a warning in LinkFlow */
+      if (FUNC_INTNO (sym->type) == INTNO_UNSPEC)
+        sprintf (asymname, "ivec_%s", sym->name);
+      else
+        sprintf (asymname, "ivec_0x%x_%s", FUNC_INTNO (sym->type), sym->name);
 
-          /* mark the end of this tiny function */
-          pic16_addpCode2pBlock(apb,pic16_newpCodeFunction(NULL,NULL));
-        } else {
-          sprintf(asymname, "%s", sym->rname);
-        }
+      /* when an interrupt is declared as naked, do not emit the special
+       * wrapper segment at vector address. The user should take care for
+       * this instead. -- VR */
 
+      if (!IFFUNC_ISNAKED (ftype) && (FUNC_INTNO (sym->type) != INTNO_UNSPEC))
         {
-          absSym *abSym;
-
-            abSym = Safe_calloc(1, sizeof(absSym));
-            strcpy(abSym->name, asymname);
-
-            switch( FUNC_INTNO(sym->type) ) {
-              case 0: abSym->address = 0x000000; break;
-              case 1: abSym->address = 0x000008; break;
-              case 2: abSym->address = 0x000018; break;
-
-              default:
-//                fprintf(stderr, "no interrupt number is given\n");
-                abSym->address = -1; break;
-            }
+          asym = newSymbol (asymname, 0);
+          apb = pic16_newpCodeChain (NULL, 'A', pic16_newpCodeCharP ("; Starting pCode block for absolute section"));
+          pic16_addpBlock (apb);
+
+          pic16_addpCode2pBlock (apb, pic16_newpCodeCharP (";-----------------------------------------"));
+          pic16_addpCode2pBlock (apb, pic16_newpCodeFunction (moduleName, asym->name));
+          //pic16_addpCode2pBlock (apb, pic16_newpCode (POC_GOTO, pic16_popGetWithString (sym->rname)));
+          //pic16_addpCode2pBlock (apb, pic16_newpCode (POC_GOTO, pic16_newpCodeOpLabel (sym->rname, 0)));
+          pic16_addpCode2pBlock (apb, pic16_newpCodeAsmDir ("GOTO", "%s", sym->rname)); /* this suppresses a warning in LinkFlow */
 
-            /* relocate interrupt vectors if needed */
-            if(abSym->address != -1)
-              abSym->address += pic16_options.ivt_loc;
-
-            addSet(&absSymSet, abSym);
+          /* mark the end of this tiny function */
+          pic16_addpCode2pBlock (apb, pic16_newpCodeFunction (NULL, NULL));
+        }
+      else
+        {
+          sprintf (asymname, "%s", sym->rname);
         }
-    }
-
-    /* create the function header */
-    pic16_emitcode(";","-----------------------------------------");
-    pic16_emitcode(";"," function %s",sym->name);
-    pic16_emitcode(";","-----------------------------------------");
 
-    /* prevent this symbol from being emitted as 'extern' */
-    pic16_stringInSet(sym->rname, &pic16_localFunctions, 1);
+      {
+        absSym *abSym;
 
-    pic16_emitcode("","%s:",sym->rname);
-    pic16_addpCode2pBlock(pb,pic16_newpCodeFunction(moduleName,sym->rname));
+        abSym = Safe_calloc (1, sizeof (absSym));
+        strcpy (abSym->name, asymname);
 
-    {
-      absSym *ab;
-
-        for(ab = setFirstItem(absSymSet); ab; ab = setNextItem(absSymSet)) {
-          if(!strcmp(ab->name, sym->rname)) {
-            pic16_pBlockConvert2Absolute(pb);
+        switch (FUNC_INTNO (sym->type))
+          {
+          case 0:
+            abSym->address = 0x000000;
+            break;
+          case 1:
+            abSym->address = 0x000008;
+            break;
+          case 2:
+            abSym->address = 0x000018;
+            break;
+          default:
+            //fprintf (stderr, "no interrupt number is given\n");
+            abSym->address = -1;
             break;
           }
-        }
-    }
 
-    if(IFFUNC_ISNAKED(ftype)) {
-      DEBUGpic16_emitcode("; ***", "__naked function, no prologue");
-      return;
-    }
+        /* relocate interrupt vectors if needed */
+        if (abSym->address != -1)
+          abSym->address += pic16_options.ivt_loc;
 
-    /* if critical function then turn interrupts off */
-    if (IFFUNC_ISCRITICAL(ftype)) {
-      //pic16_emitcode("clr","ea");
+        addSet (&absSymSet, abSym);
+      }
     }
 
-    currFunc = sym;             /* update the currFunc symbol */
-    _G.fregsUsed = sym->regsUsed;
-    _G.sregsAlloc = newBitVect(128);
+  /* create the function header */
+  pic16_emitcode (";", "-----------------------------------------");
+  pic16_emitcode (";", " function %s", sym->name);
+  pic16_emitcode (";", "-----------------------------------------");
+
+  /* prevent this symbol from being emitted as 'extern' */
+  pic16_stringInSet (sym->rname, &pic16_localFunctions, 1);
+
+  pic16_emitcode ("", "%s:", sym->rname);
+  pic16_addpCode2pBlock (pb, pic16_newpCodeFunction (moduleName, sym->rname));
+
+  {
+    absSym *ab;
+
+    for (ab = setFirstItem (absSymSet); ab; ab = setNextItem (absSymSet))
+      {
+        if (!strcmp (ab->name, sym->rname))
+          {
+            pic16_pBlockConvert2Absolute (pb);
+            break;
+          }
+      }
+  }
+
+  currFunc = sym;               /* update the currFunc symbol */
+  _G.fregsUsed = sym->regsUsed;
+  _G.sregsAlloc = newBitVect (128);
 
+  if (IFFUNC_ISNAKED (ftype))
+    {
+      DEBUGpic16_emitcode ("; ***", "__naked function, no prologue");
+      return;
+    }
 
-    /* if this is an interrupt service routine then
-     * save wreg, status, bsr, prodl, prodh, fsr0l, fsr0h */
-    if (IFFUNC_ISISR(sym->type)) {
-        _G.usefastretfie = 1;   /* use shadow registers by default */
+  /* if this is an interrupt service routine then
+   * save wreg, status, bsr, prodl, prodh, fsr0l, fsr0h */
+  if (IFFUNC_ISISR (sym->type))
+    {
+      _G.usefastretfie = 1;     /* use shadow registers by default */
 
-        /* an ISR should save: WREG, STATUS, BSR, PRODL, PRODH, FSR0L, FSR0H */
-        if(!FUNC_ISSHADOWREGS(sym->type)) {
-          /* do not save WREG,STATUS,BSR for high priority interrupts
+      /* an ISR should save: WREG, STATUS, BSR, PRODL, PRODH, FSR0L, FSR0H */
+      if (!FUNC_ISSHADOWREGS (sym->type))
+        {
+          /* do not save WREG, STATUS, BSR for high priority interrupts
            * because they are stored in the hardware shadow registers already */
           _G.usefastretfie = 0;
-          pic16_pushpCodeOp( pic16_popCopyReg( &pic16_pc_wreg ));
-          pic16_pushpCodeOp( pic16_popCopyReg( &pic16_pc_status ));
-          pic16_pushpCodeOp( pic16_popCopyReg( &pic16_pc_bsr ));
-        }
-
-        /* these should really be optimized somehow, because not all
-         * interrupt handlers modify them */
-        pic16_pushpCodeOp( pic16_popCopyReg( &pic16_pc_prodl ));
-        pic16_pushpCodeOp( pic16_popCopyReg( &pic16_pc_prodh ));
-        pic16_pushpCodeOp( pic16_popCopyReg( &pic16_pc_fsr0l ));
-        pic16_pushpCodeOp( pic16_popCopyReg( &pic16_pc_fsr0h ));
-        pic16_pushpCodeOp( pic16_popCopyReg( &pic16_pc_pclath ));
-        pic16_pushpCodeOp( pic16_popCopyReg( &pic16_pc_pclatu ));
-
-//        pic16_pBlockConvert2ISR(pb);
-    }
-
-    /* emit code to setup stack frame if user enabled,
-     * and function is not main() */
-
-//    debugf(stderr, "function name: %s ARGS=%p\n", sym->name, FUNC_ARGS(sym->type));
-    if(strcmp(sym->name, "main")) {
-      if(0
-        || !options.omitFramePtr
-//        || sym->regsUsed
-        || IFFUNC_ARGS(sym->type)
-        || FUNC_HASSTACKPARM(sym->etype)
-        ) {
-        /* setup the stack frame */
-        if(STACK_MODEL_LARGE)
-          pic16_pushpCodeOp(pic16_popCopyReg(pic16_framepnt_hi));
-        pic16_pushpCodeOp(pic16_popCopyReg(pic16_framepnt_lo));
-
-        if(STACK_MODEL_LARGE)
-          pic16_emitpcode(POC_MOVFF, pic16_popCombine2( pic16_stackpnt_hi, pic16_framepnt_hi, 0));
-        pic16_emitpcode(POC_MOVFF, pic16_popCombine2( pic16_stackpnt_lo, pic16_framepnt_lo, 0));
-      }
+          pic16_pushpCodeOp (pic16_popCopyReg (&pic16_pc_status));
+          pic16_pushpCodeOp (pic16_popCopyReg (&pic16_pc_bsr));
+          pushw ();
+        }
+
+      /* these should really be optimized somehow, because not all
+       * interrupt handlers modify them */
+      pic16_pushpCodeOp (pic16_popCopyReg (&pic16_pc_prodl));
+      pic16_pushpCodeOp (pic16_popCopyReg (&pic16_pc_prodh));
+      pic16_pushpCodeOp (pic16_popCopyReg (&pic16_pc_fsr0l));
+      pic16_pushpCodeOp (pic16_popCopyReg (&pic16_pc_fsr0h));
+      pic16_pushpCodeOp (pic16_popCopyReg (&pic16_pc_pclath));
+      pic16_pushpCodeOp (pic16_popCopyReg (&pic16_pc_pclatu));
+
+      //pic16_pBlockConvert2ISR (pb);
     }
 
-    if ((IFFUNC_ISREENT(sym->type) || options.stackAuto)
-          && sym->stack) {
+  /* emit code to setup stack frame if user enabled,
+   * and function is not main () */
+
+  //debugf (stderr, "function name: %s ARGS=%p\n", sym->name, FUNC_ARGS (sym->type));
+  if (strcmp (sym->name, "main"))
+    {
+      if (0 || !options.omitFramePtr
+          //|| sym->regsUsed
+          || IFFUNC_ARGS (sym->type) || FUNC_HASSTACKPARM (sym->etype))
+        {
+          /* setup the stack frame */
+          if (STACK_MODEL_LARGE)
+            pic16_pushpCodeOp (pic16_popCopyReg (pic16_framepnt_hi));
+          pic16_pushpCodeOp (pic16_popCopyReg (pic16_framepnt_lo));
+
+          if (STACK_MODEL_LARGE)
+            pic16_emitpcode (POC_MOVFF, pic16_popCombine2 (pic16_stackpnt_hi, pic16_framepnt_hi, 0));
+          pic16_emitpcode (POC_MOVFF, pic16_popCombine2 (pic16_stackpnt_lo, pic16_framepnt_lo, 0));
+        }
+    }
 
-      if (sym->stack > 127)werror(W_STACK_OVERFLOW, sym->name);
+  if ((IFFUNC_ISREENT (sym->type) || options.stackAuto) && sym->stack)
+    {
+      if (sym->stack > 127)
+        werror (W_STACK_OVERFLOW, sym->name);
 
-      pic16_emitpcode(POC_MOVLW, pic16_popGetLit(sym->stack));
-      pic16_emitpcode(POC_SUBWF, pic16_popCopyReg( pic16_stackpnt_lo ));        //&pic16_pc_fsr1l));
+      pic16_emitpcode (POC_MOVLW, pic16_popGetLit (sym->stack));
+      pic16_emitpcode (POC_SUBWF, pic16_popCopyReg (pic16_stackpnt_lo));        //&pic16_pc_fsr1l));
       emitSKPC;
-      pic16_emitpcode(POC_DECF, pic16_popCopyReg( pic16_stackpnt_hi ));         //&pic16_pc_fsr1h));
+      pic16_emitpcode (POC_DECF, pic16_popCopyReg (pic16_stackpnt_hi)); //&pic16_pc_fsr1h));
     }
 
-    if(inWparamList(sym->name) || FUNC_ISWPARAM(sym->type)) {
-      if(IFFUNC_HASVARARGS(sym->type) || IFFUNC_ISREENT(sym->type))
+  if (inWparamList (sym->name) || FUNC_ISWPARAM (sym->type))
+    {
+      if (IFFUNC_HASVARARGS (sym->type) || IFFUNC_ISREENT (sym->type))
         _G.useWreg = 0;
       else
         _G.useWreg = 1;
-    } else
-      _G.useWreg = 0;
+    }
+  else
+    _G.useWreg = 0;
 
-    /* if callee-save to be used for this function
-     * then save the registers being used in this function */
-//    if (IFFUNC_CALLEESAVES(sym->type))
-    if(strcmp(sym->name, "main")) {
+  /* if callee-save to be used for this function
+   * then save the registers being used in this function */
+  //if (IFFUNC_CALLEESAVES (sym->type))
+  if (strcmp (sym->name, "main"))
+    {
       int i;
 
-        /* if any registers used */
-        if (sym->regsUsed) {
-                  pic16_emitpinfo(INF_LOCALREGS, pic16_newpCodeOpLocalRegs(LR_ENTRY_BEGIN));
-
-          if(!pic16_options.xinst) {
-            /* save the registers used */
-            DEBUGpic16_emitcode("; **", "Saving used registers in stack");
-            for ( i = 0 ; i < sym->regsUsed->size ; i++) {
-              if (bitVectBitValue(sym->regsUsed,i)) {
-#if 0
-                fprintf(stderr, "%s:%d local register w/rIdx = %d is used in function\n", __FUNCTION__, __LINE__, i);
-#endif
-                pic16_pushpCodeOp( pic16_popRegFromIdx(i) );
-                _G.nRegsSaved++;
-
-                if(!pic16_regWithIdx(i)->wasUsed) {
-                  fprintf(stderr, "%s:%d register %s is used in function but was wasUsed = 0\n",
-                                __FILE__, __LINE__, pic16_regWithIdx(i)->name);
-                  pic16_regWithIdx(i)->wasUsed = 1;
+      /* if any registers used */
+      if (sym->regsUsed)
+        {
+          pic16_emitpinfo (INF_LOCALREGS, pic16_newpCodeOpLocalRegs (LR_ENTRY_BEGIN));
+
+          if (!pic16_options.xinst)
+            {
+              /* save the registers used */
+              DEBUGpic16_emitcode ("; **", "Saving used registers in stack");
+              for (i = 0; i < sym->regsUsed->size; i++)
+                {
+                  if (bitVectBitValue (sym->regsUsed, i))
+                    {
+#if 0
+                      fprintf (stderr, "%s:%d local register w/rIdx = %d is used in function\n", __FUNCTION__, __LINE__, i);
+#endif
+                      pic16_pushpCodeOp (pic16_popRegFromIdx (i));
+                      _G.nRegsSaved++;
+
+                      if (!pic16_regWithIdx (i)->wasUsed)
+                        {
+                          fprintf (stderr, "%s:%d register %s is used in function but was wasUsed = 0\n",
+                                   __FILE__, __LINE__, pic16_regWithIdx (i)->name);
+                          pic16_regWithIdx (i)->wasUsed = 1;
+                        }
+                    }
                 }
-              }
             }
-          } else {
+          else
+            {
+              /* xinst */
+              DEBUGpic16_emitcode ("; **", "Allocate a space in stack to be used as temporary registers");
+              for (i = 0; i < sym->regsUsed->size; i++)
+                {
+                  if (bitVectBitValue (sym->regsUsed, i))
+                    _G.nRegsSaved++;
+                }
 
-            /* xinst */
-            DEBUGpic16_emitcode("; **", "Allocate a space in stack to be used as temporary registers");
-            for(i=0;i<sym->regsUsed->size;i++) {
-              if(bitVectBitValue(sym->regsUsed, i)) {
-                _G.nRegsSaved++;
-              }
+              //pic16_emitpcode (POC_ADDFSR, pic16_popGetLit2 (2, pic16_popGetLit (_G.nRegsSaved)));
             }
 
-//            pic16_emitpcode(POC_ADDFSR, pic16_popGetLit2(2, pic16_popGetLit(_G.nRegsSaved)));
-          }
-
-          pic16_emitpinfo(INF_LOCALREGS, pic16_newpCodeOpLocalRegs(LR_ENTRY_END));
-
+          pic16_emitpinfo (INF_LOCALREGS, pic16_newpCodeOpLocalRegs (LR_ENTRY_END));
         }
     }
 
-    DEBUGpic16_emitcode("; ", "need to adjust stack = %d", sym->stack);
-//    fprintf(stderr, "Function '%s' uses %d bytes of stack\n", sym->name, sym->stack);
+  /* if critical function then turn interrupts off */
+  if (IFFUNC_ISCRITICAL (ftype))
+    {
+      genCritical (NULL);
+    }                           // if
+
+  DEBUGpic16_emitcode ("; ", "need to adjust stack = %d", sym->stack);
+  //fprintf (stderr, "Function '%s' uses %d bytes of stack\n", sym->name, sym->stack);
 }
 
 /*-----------------------------------------------------------------*/
 /* genEndFunction - generates epilogue for functions               */
 /*-----------------------------------------------------------------*/
-static void genEndFunction (iCode *ic)
+static void
+genEndFunction (iCode * ic)
 {
-  symbol *sym = OP_SYMBOL(IC_LEFT(ic));
+  symbol *sym = OP_SYMBOL (IC_LEFT (ic));
 
-    FENTRY;
+  FENTRY;
 
-    if(IFFUNC_ISNAKED(sym->type)) {
-      DEBUGpic16_emitcode("; ***", "__naked function, no epilogue");
+  if (IFFUNC_ISNAKED (sym->type))
+    {
+      DEBUGpic16_emitcode ("; ***", "__naked function, no epilogue");
       return;
     }
 
-    _G.stack_lat = 0;
-
-    /* add code for ISCRITICAL */
-    if(IFFUNC_ISCRITICAL(sym->type)) {
-      /* if critical function, turn on interrupts */
+  if (IFFUNC_ISCRITICAL (sym->type))
+    {
+      genEndCritical (NULL);
+    }                           // if
 
-      /* TODO: add code here -- VR */
-    }
+  _G.stack_lat = 0;
 
-//    sym->regsUsed = _G.fregsUsed;
+  //sym->regsUsed = _G.fregsUsed;
 
-    /* now we need to restore the registers */
-    /* if any registers used */
+  /* now we need to restore the registers */
+  /* if any registers used */
 
-    /* first restore registers that might be used for stack access */
-    if(_G.sregsAllocSet) {
-    reg_info *sr;
+  /* first restore registers that might be used for stack access */
+  if (_G.sregsAllocSet)
+    {
+      reg_info *sr;
 
-      _G.sregsAllocSet = reverseSet( _G.sregsAllocSet );
-      for(sr=setFirstItem(_G.sregsAllocSet) ; sr; sr=setNextItem(_G.sregsAllocSet)) {
-        pic16_poppCodeOp( pic16_popRegFromIdx( sr->rIdx ) );
-      }
+      _G.sregsAllocSet = reverseSet (_G.sregsAllocSet);
+      for (sr = setFirstItem (_G.sregsAllocSet); sr; sr = setNextItem (_G.sregsAllocSet))
+        {
+          pic16_poppCodeOp (pic16_popRegFromIdx (sr->rIdx));
+        }
     }
 
-    if (strcmp(sym->name, "main") && sym->regsUsed) {
+  if (strcmp (sym->name, "main") && sym->regsUsed)
+    {
       int i;
 
-        pic16_emitpinfo(INF_LOCALREGS, pic16_newpCodeOpLocalRegs(LR_EXIT_BEGIN));
-        /* restore registers used */
-        DEBUGpic16_emitcode("; **", "Restoring used registers from stack");
-        for ( i = sym->regsUsed->size; i >= 0; i--) {
-          if (bitVectBitValue(sym->regsUsed,i)) {
-            pic16_poppCodeOp( pic16_popRegFromIdx(i) );
-            _G.nRegsSaved--;
-          }
+      pic16_emitpinfo (INF_LOCALREGS, pic16_newpCodeOpLocalRegs (LR_EXIT_BEGIN));
+      /* restore registers used */
+      DEBUGpic16_emitcode ("; **", "Restoring used registers from stack");
+      for (i = sym->regsUsed->size; i >= 0; i--)
+        {
+          if (bitVectBitValue (sym->regsUsed, i))
+            {
+              pic16_poppCodeOp (pic16_popRegFromIdx (i));
+              _G.nRegsSaved--;
+            }
         }
-        pic16_emitpinfo(INF_LOCALREGS, pic16_newpCodeOpLocalRegs(LR_EXIT_END));
+      pic16_emitpinfo (INF_LOCALREGS, pic16_newpCodeOpLocalRegs (LR_EXIT_END));
     }
 
-
-
-    if ((IFFUNC_ISREENT(sym->type) || options.stackAuto)
-          && sym->stack) {
-      if (sym->stack == 1) {
-        pic16_emitpcode(POC_INFSNZ, pic16_popCopyReg( pic16_stackpnt_lo ));
-        pic16_emitpcode(POC_INCF, pic16_popCopyReg( pic16_stackpnt_hi ));
-      } else {
-        // we have to add more than one...
-        pic16_emitpcode(POC_MOVWF, pic16_popCopyReg( pic16_stack_postinc ));    // this holds a return value!
-        pic16_emitpcode(POC_MOVLW, pic16_popGetLit(sym->stack-1));
-        pic16_emitpcode(POC_ADDWF, pic16_popCopyReg( pic16_stackpnt_lo ));
-        emitSKPNC;
-        pic16_emitpcode(POC_INCF, pic16_popCopyReg( pic16_stackpnt_hi ));
-        pic16_emitpcode(POC_COMF,  pic16_popCopyReg(&pic16_pc_wreg)); // WREG = -(WREG+1)!
-        pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(pic16_stack_plusw)); // this holds a retrun value!
-      }
+  if ((IFFUNC_ISREENT (sym->type) || options.stackAuto) && sym->stack)
+    {
+      if (sym->stack == 1)
+        {
+          pic16_emitpcode (POC_INFSNZ, pic16_popCopyReg (pic16_stackpnt_lo));
+          pic16_emitpcode (POC_INCF, pic16_popCopyReg (pic16_stackpnt_hi));
+        }
+      else
+        {
+          // we have to add more than one...
+          pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (pic16_stack_postinc));  // this holds a return value!
+          pic16_emitpcode (POC_MOVLW, pic16_popGetLit (sym->stack - 1));
+          pic16_emitpcode (POC_ADDWF, pic16_popCopyReg (pic16_stackpnt_lo));
+          emitSKPNC;
+          pic16_emitpcode (POC_INCF, pic16_popCopyReg (pic16_stackpnt_hi));
+          pic16_emitpcode (POC_COMF, pic16_popCopyReg (&pic16_pc_wreg));        // WREG = - (WREG+1)!
+          pic16_emitpcode (POC_MOVFW, pic16_popCopyReg (pic16_stack_plusw));    // this holds a retrun value!
+        }
     }
 
-    if(strcmp(sym->name, "main")) {
-      if(0
-        || !options.omitFramePtr
-//        || sym->regsUsed
-        || IFFUNC_ARGS(sym->type)
-        || FUNC_HASSTACKPARM(sym->etype)
-        ) {
-        /* restore stack frame */
-        pic16_poppCodeOp( pic16_popCopyReg( pic16_framepnt_lo ));
-        if(STACK_MODEL_LARGE)
-          pic16_poppCodeOp( pic16_popCopyReg( pic16_framepnt_hi ));
-      }
+  if (strcmp (sym->name, "main"))
+    {
+      if (0 || !options.omitFramePtr
+          //|| sym->regsUsed
+          || IFFUNC_ARGS (sym->type) || FUNC_HASSTACKPARM (sym->etype))
+        {
+          /* restore stack frame */
+          pic16_poppCodeOp (pic16_popCopyReg (pic16_framepnt_lo));
+          if (STACK_MODEL_LARGE)
+            pic16_poppCodeOp (pic16_popCopyReg (pic16_framepnt_hi));
+        }
     }
 
-    _G.useWreg = 0;
+  _G.useWreg = 0;
 
-    if (IFFUNC_ISISR(sym->type)) {
-      pic16_poppCodeOp( pic16_popCopyReg( &pic16_pc_pclatu ));
-      pic16_poppCodeOp( pic16_popCopyReg( &pic16_pc_pclath ));
-      pic16_poppCodeOp( pic16_popCopyReg( &pic16_pc_fsr0h ));
-      pic16_poppCodeOp( pic16_popCopyReg( &pic16_pc_fsr0l));
-      pic16_poppCodeOp( pic16_popCopyReg( &pic16_pc_prodh ));
-      pic16_poppCodeOp( pic16_popCopyReg( &pic16_pc_prodl ));
-
-      if(!FUNC_ISSHADOWREGS(sym->type)) {
-        /* do not restore interrupt vector for WREG,STATUS,BSR
-         * for high priority interrupt, see genFunction */
-        pic16_poppCodeOp( pic16_popCopyReg( &pic16_pc_bsr ));
-        pic16_poppCodeOp( pic16_popCopyReg( &pic16_pc_status ));
-        pic16_poppCodeOp( pic16_popCopyReg( &pic16_pc_wreg ));
-      }
-//      _G.interruptvector = 0;         /* sanity check */
+  if (IFFUNC_ISISR (sym->type))
+    {
+      pic16_poppCodeOp (pic16_popCopyReg (&pic16_pc_pclatu));
+      pic16_poppCodeOp (pic16_popCopyReg (&pic16_pc_pclath));
+      pic16_poppCodeOp (pic16_popCopyReg (&pic16_pc_fsr0h));
+      pic16_poppCodeOp (pic16_popCopyReg (&pic16_pc_fsr0l));
+      pic16_poppCodeOp (pic16_popCopyReg (&pic16_pc_prodh));
+      pic16_poppCodeOp (pic16_popCopyReg (&pic16_pc_prodl));
 
+      if (!FUNC_ISSHADOWREGS (sym->type))
+        {
+          /* do not restore interrupt vector for WREG, STATUS, BSR
+           * for high priority interrupt, see genFunction */
+          pic16_emitpcode (POC_MOVFW, pic16_popCopyReg (pic16_stack_preinc));
+          pic16_poppCodeOp (pic16_popCopyReg (&pic16_pc_bsr));
+          pic16_poppCodeOp (pic16_popCopyReg (&pic16_pc_status));
+        }
+      //_G.interruptvector = 0;         /* sanity check */
 
       /* if debug then send end of function */
-/*      if (options.debug && currFunc)  */
-      if (currFunc) {
-        debugFile->writeEndFunction (currFunc, ic, 1);
-      }
+      /* if (options.debug && currFunc)  */
+      if (currFunc)
+        {
+          debugFile->writeEndFunction (currFunc, ic, 1);
+        }
 
-      if(_G.usefastretfie)
-        pic16_emitpcode(POC_RETFIE, pic16_newpCodeOpLit(1));
+      if (_G.usefastretfie)
+        pic16_emitpcode (POC_RETFIE, pic16_newpCodeOpLit (1));
       else
-        pic16_emitpcodeNULLop(POC_RETFIE);
+        pic16_emitpcodeNULLop (POC_RETFIE);
 
-      pic16_addpCode2pBlock(pb,pic16_newpCodeFunction(NULL,NULL));
+      pic16_addpCode2pBlock (pb, pic16_newpCodeFunction (NULL, NULL));
 
       _G.usefastretfie = 0;
       return;
     }
 
-    if (IFFUNC_ISCRITICAL(sym->type)) {
-      pic16_emitcode("setb","ea");
-    }
-
-    /* if debug then send end of function */
-    if (currFunc) {
+  /* if debug then send end of function */
+  if (currFunc)
+    {
       debugFile->writeEndFunction (currFunc, ic, 1);
     }
 
-    /* insert code to restore stack frame, if user enabled it
-     * and function is not main() */
+  /* insert code to restore stack frame, if user enabled it
+   * and function is not main () */
 
+  pic16_emitpcodeNULLop (POC_RETURN);
 
-    pic16_emitpcodeNULLop(POC_RETURN);
-
-    /* Mark the end of a function */
-    pic16_addpCode2pBlock(pb,pic16_newpCodeFunction(NULL,NULL));
+  /* Mark the end of a function */
+  pic16_addpCode2pBlock (pb, pic16_newpCodeFunction (NULL, NULL));
 }
 
 
-void pic16_storeForReturn(iCode *ic, /*operand *op,*/ int offset, pCodeOp *dest)
+void
+pic16_storeForReturn (iCode * ic, /*operand *op, */ int offset, pCodeOp * dest)
 {
-  unsigned long lit=1;
+  unsigned long lit = 1;
   operand *op;
 
-    op = IC_LEFT(ic);
+  op = IC_LEFT (ic);
 
-    // this fails for pic16_isLitOp(op) (if op is an AOP_PCODE)
-    if(AOP_TYPE(op) == AOP_LIT) {
-      if(!IS_FLOAT(operandType( op ))) {
-        lit = ulFromVal (AOP(op)->aopu.aop_lit);
-      } else {
-        union {
-          unsigned long lit_int;
-          float lit_float;
-        } info;
-
-        /* take care if literal is a float */
-        info.lit_float = floatFromVal(AOP(op)->aopu.aop_lit);
-        lit = info.lit_int;
-      }
+  // this fails for pic16_isLitOp(op) (if op is an AOP_PCODE)
+  if (AOP_TYPE (op) == AOP_LIT)
+    {
+      if (!IS_FLOAT (operandType (op)))
+        {
+          lit = ulFromVal (AOP (op)->aopu.aop_lit);
+        }
+      else
+        {
+          union
+          {
+            unsigned long lit_int;
+            float lit_float;
+          } info;
+
+          /* take care if literal is a float */
+          info.lit_float = (float)floatFromVal (AOP (op)->aopu.aop_lit);
+          lit = info.lit_int;
+        }
     }
 
-    if (AOP_TYPE(op) == AOP_LIT) {
+  if (AOP_TYPE (op) == AOP_LIT)
+    {
       /* FIXME: broken for
        *   char __at(0x456) foo;
        *   return &foo;
        * (upper byte is 0x00 (__code space) instead of 0x80 (__data) */
-      pic16_movLit2f(dest, (lit >> (8ul*offset)));
-    } else if (AOP_TYPE(op) == AOP_PCODE
-                && AOP(op)->aopu.pcop->type == PO_IMMEDIATE) {
+      pic16_movLit2f (dest, (lit >> (8ul * offset)));
+    }
+  else if (AOP_TYPE (op) == AOP_PCODE && AOP (op)->aopu.pcop->type == PO_IMMEDIATE)
+    {
       /* char *s= "aaa"; return s; */
       /* XXX: Using UPPER(__str_0) will yield 0b00XXXXXX, so
        *      that the generic pointer is interpreted correctly
        *      as referring to __code space, but this is fragile! */
-      pic16_emitpcode(POC_MOVLW, pic16_popGet( AOP(op), offset ));
+      pic16_emitpcode (POC_MOVLW, pic16_popGet (AOP (op), offset));
       /* XXX: should check that dest != WREG */
-      pic16_emitpcode(POC_MOVWF, dest);
-    } else {
-      if(dest->type == PO_WREG && (offset == 0)) {
-        pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(op), offset));
-        return;
-      }
-      pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popGet(AOP(op), offset), dest));
+      pic16_emitpcode (POC_MOVWF, dest);
+    }
+  else
+    {
+      if (dest->type == PO_WREG && (offset == 0))
+        {
+          pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (op), offset));
+          return;
+        }
+      pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popGet (AOP (op), offset), dest));
     }
 }
 
 /*-----------------------------------------------------------------*/
 /* genRet - generate code for return statement                     */
 /*-----------------------------------------------------------------*/
-static void genRet (iCode *ic)
+static void
+genRet (iCode * ic)
 {
   int size;
   operand *left;
 
-    FENTRY;
-        /* if we have no return value then
-         * just generate the "ret" */
+  FENTRY;
+  /* if we have no return value then
+   * just generate the "ret" */
 
-        if (!IC_LEFT(ic))
-                goto jumpret;
+  if (!IC_LEFT (ic))
+    goto jumpret;
 
-        /* we have something to return then
-         * move the return value into place */
-        pic16_aopOp((left=IC_LEFT(ic)),ic,FALSE);
-        size = AOP_SIZE(IC_LEFT(ic));
+  /* we have something to return then
+   * move the return value into place */
+  pic16_aopOp ((left = IC_LEFT (ic)), ic, FALSE);
+  size = AOP_SIZE (IC_LEFT (ic));
 
-        if(size <= 4) {
-          if(size>3)
-            pic16_storeForReturn(ic, /*IC_LEFT(ic),*/ 3, pic16_popCopyReg(&pic16_pc_fsr0l));
+  if (size <= 4)
+    {
+      if (size > 3)
+        pic16_storeForReturn (ic, /*IC_LEFT(ic), */ 3, pic16_popCopyReg (&pic16_pc_fsr0l));
 
-          if(size>2)
-            pic16_storeForReturn(ic, /*IC_LEFT(ic),*/ 2, pic16_popCopyReg(&pic16_pc_prodh));
+      if (size > 2)
+        pic16_storeForReturn (ic, /*IC_LEFT(ic), */ 2, pic16_popCopyReg (&pic16_pc_prodh));
 
-          if(size>1)
-            pic16_storeForReturn(ic, /*IC_LEFT(ic),*/ 1, pic16_popCopyReg(&pic16_pc_prodl));
+      if (size > 1)
+        pic16_storeForReturn (ic, /*IC_LEFT(ic), */ 1, pic16_popCopyReg (&pic16_pc_prodl));
 
-          pic16_storeForReturn(ic, /*IC_LEFT(ic),*/ 0, pic16_popCopyReg(&pic16_pc_wreg));
+      pic16_storeForReturn (ic, /*IC_LEFT(ic), */ 0, pic16_popCopyReg (&pic16_pc_wreg));
 
-        } else {
-                /* >32-bits, setup stack and FSR0 */
-                while (size--) {
+    }
+  else
+    {
+      /* >32-bits, setup stack and FSR0 */
+      while (size--)
+        {
 //                      DEBUGpic16_emitcode("; ", "POC_MOVLW %d", GpsuedoStkPtr);
 //                      DEBUGpic16_emitcode("; ", "POC_MOVFW PLUSW2");
 
-                        pic16_pushpCodeOp( pic16_popGet( AOP( IC_LEFT(ic) ), size) );
+          pic16_pushpCodeOp (pic16_popGet (AOP (IC_LEFT (ic)), size));
 
 //                      popaopidx(AOP(oper), size, GpseudoStkPtr);
-                        GpsuedoStkPtr++;
-                }
+          GpsuedoStkPtr++;
+        }
 
-                /* setup FSR0 */
-                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                        pic16_popCopyReg( pic16_stackpnt_lo ), pic16_popCopyReg(&pic16_pc_fsr0l)));
+      /* setup FSR0 */
+      pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popCopyReg (pic16_stackpnt_lo), pic16_popCopyReg (&pic16_pc_fsr0l)));
 
-                if(STACK_MODEL_LARGE) {
-                        pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                                pic16_popCopyReg( pic16_stackpnt_hi ), pic16_popCopyReg(&pic16_pc_fsr0h)));
-                } else {
-                        pic16_emitpcode(POC_CLRF, pic16_popCopyReg( pic16_stackpnt_hi ));
-                }
+      if (STACK_MODEL_LARGE)
+        {
+          pic16_emitpcode (POC_MOVFF,
+                           pic16_popGet2p (pic16_popCopyReg (pic16_stackpnt_hi), pic16_popCopyReg (&pic16_pc_fsr0h)));
         }
+      else
+        {
+          pic16_emitpcode (POC_CLRF, pic16_popCopyReg (pic16_stackpnt_hi));
+        }
+    }
 
-        pic16_freeAsmop (IC_LEFT(ic),NULL,ic,TRUE);
+  pic16_freeAsmop (IC_LEFT (ic), NULL, ic, TRUE);
 
 jumpret:
-        /* generate a jump to the return label
-         * if the next is not the return statement */
-        if (!(ic->next && ic->next->op == LABEL
-                && IC_LABEL(ic->next) == returnLabel)) {
+  /* generate a jump to the return label
+   * if the next is not the return statement */
+  if (!(ic->next && ic->next->op == LABEL && IC_LABEL (ic->next) == returnLabel))
+    {
 
-                pic16_emitpcode(POC_GOTO,pic16_popGetLabel(returnLabel->key));
-                pic16_emitcode("goto","_%05d_DS_",returnLabel->key+100 + pic16_labelOffset);
-        }
+      pic16_emitpcode (POC_GOTO, pic16_popGetLabel (returnLabel->key));
+      pic16_emitcode ("goto", "_%05d_DS_", labelKey2num (returnLabel->key + pic16_labelOffset));
+    }
+}
+
+static set *critical_temps = NULL;
+
+static void
+genCritical (iCode * ic)
+{
+  pCodeOp *saved_intcon;
+
+  if (!critical_temps)
+    critical_temps = newSet ();
+
+  saved_intcon = pic16_popGetTempReg (0);
+  pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popCopyReg (&pic16_pc_intcon), saved_intcon));
+  pic16_emitpcode (POC_BCF, pic16_popCopyGPR2Bit (pic16_popCopyReg (&pic16_pc_intcon), 7));
+  addSetHead (&critical_temps, saved_intcon);
+}
+
+static void
+genEndCritical (iCode * ic)
+{
+  pCodeOp *saved_intcon = NULL;
+
+  saved_intcon = getSet (&critical_temps);
+  if (!saved_intcon)
+    {
+      fprintf (stderr, "Critical section left, but none entered -- ignoring for now.\n");
+      return;
+    }                           // if
+
+  pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit (saved_intcon, 7));
+  pic16_emitpcode (POC_BSF, pic16_popCopyGPR2Bit (pic16_popCopyReg (&pic16_pc_intcon), 7));
+  pic16_popReleaseTempReg (saved_intcon, 0);
 }
 
 /*-----------------------------------------------------------------*/
 /* genLabel - generates a label                                    */
 /*-----------------------------------------------------------------*/
-static void genLabel (iCode *ic)
+static void
+genLabel (iCode * ic)
 {
   FENTRY;
 
   /* special case never generate */
-  if (IC_LABEL(ic) == entryLabel)
-    return ;
+  if (IC_LABEL (ic) == entryLabel)
+    return;
 
-  pic16_emitpLabel(IC_LABEL(ic)->key);
-//  pic16_emitcode("","_%05d_DS_:",(IC_LABEL(ic)->key+100 + pic16_labelOffset));
+  pic16_emitpLabel (IC_LABEL (ic)->key);
+//  pic16_emitcode("","_%05d_DS_:",labelKey2num (IC_LABEL(ic)->key + pic16_labelOffset));
 }
 
 /*-----------------------------------------------------------------*/
 /* genGoto - generates a goto                                      */
 /*-----------------------------------------------------------------*/
 //tsd
-static void genGoto (iCode *ic)
+static void
+genGoto (iCode * ic)
 {
   FENTRY;
-  pic16_emitpcode(POC_GOTO,pic16_popGetLabel(IC_LABEL(ic)->key));
-//  pic16_emitcode ("goto","_%05d_DS_",(IC_LABEL(ic)->key+100)+pic16_labelOffset);
+  pic16_emitpcode (POC_GOTO, pic16_popGetLabel (IC_LABEL (ic)->key));
+//  pic16_emitcode ("goto","_%05d_DS_",labelKey2num (IC_LABEL(ic)->key + pic16_labelOffset));
 }
 
 
 /*-----------------------------------------------------------------*/
 /* genMultbits :- multiplication of bits                           */
 /*-----------------------------------------------------------------*/
-static void genMultbits (operand *left,
-                         operand *right,
-                         operand *result)
+static void
+genMultbits (operand * left, operand * right, operand * result)
 {
   FENTRY;
 
-  if(!pic16_sameRegs(AOP(result),AOP(right)))
-    pic16_emitpcode(POC_BSF,  pic16_popGet(AOP(result),0));
+  if (!pic16_sameRegs (AOP (result), AOP (right)))
+    pic16_emitpcode (POC_BSF, pic16_popGet (AOP (result), 0));
 
-  pic16_emitpcode(POC_BTFSC,pic16_popGet(AOP(right),0));
-  pic16_emitpcode(POC_BTFSS,pic16_popGet(AOP(left),0));
-  pic16_emitpcode(POC_BCF,  pic16_popGet(AOP(result),0));
+  pic16_emitpcode (POC_BTFSC, pic16_popGet (AOP (right), 0));
+  pic16_emitpcode (POC_BTFSS, pic16_popGet (AOP (left), 0));
+  pic16_emitpcode (POC_BCF, pic16_popGet (AOP (result), 0));
 
 }
 
@@ -3469,77 +3876,79 @@
 /*-----------------------------------------------------------------*/
 /* genMultOneByte : 8 bit multiplication & division                */
 /*-----------------------------------------------------------------*/
-static void genMultOneByte (operand *left,
-                            operand *right,
-                            operand *result)
+static void
+genMultOneByte (operand * left, operand * right, operand * result)
 {
 
   FENTRY;
-  DEBUGpic16_pic16_AopType(__LINE__,left,right,result);
-  DEBUGpic16_pic16_AopTypeSign(__LINE__,left,right,result);
+  DEBUGpic16_pic16_AopType (__LINE__, left, right, result);
+  DEBUGpic16_pic16_AopTypeSign (__LINE__, left, right, result);
 
   /* (if two literals, the value is computed before) */
   /* if one literal, literal on the right */
-  if (AOP_TYPE(left) == AOP_LIT){
-    operand *t = right;
-    right = left;
-    left = t;
-  }
+  if (AOP_TYPE (left) == AOP_LIT)
+    {
+      operand *t = right;
+      right = left;
+      left = t;
+    }
 
-        /* size is already checked in genMult == 1 */
+  /* size is already checked in genMult == 1 */
 //      size = AOP_SIZE(result);
 
-        if (AOP_TYPE(right) == AOP_LIT){
-                pic16_emitpcomment("multiply lit val:%s by variable %s and store in %s",
-                                        pic16_aopGet(AOP(right),0,FALSE,FALSE),
-                                        pic16_aopGet(AOP(left),0,FALSE,FALSE),
-                                        pic16_aopGet(AOP(result),0,FALSE,FALSE));
-        } else {
-                pic16_emitpcomment("multiply variable :%s by variable %s and store in %s",
-                                        pic16_aopGet(AOP(right),0,FALSE,FALSE),
-                                        pic16_aopGet(AOP(left),0,FALSE,FALSE),
-                                        pic16_aopGet(AOP(result),0,FALSE,FALSE));
-        }
+  if (AOP_TYPE (right) == AOP_LIT)
+    {
+      pic16_emitpcomment ("multiply lit val:%s by variable %s and store in %s",
+                          pic16_aopGet (AOP (right), 0, FALSE, FALSE),
+                          pic16_aopGet (AOP (left), 0, FALSE, FALSE), pic16_aopGet (AOP (result), 0, FALSE, FALSE));
+    }
+  else
+    {
+      pic16_emitpcomment ("multiply variable :%s by variable %s and store in %s",
+                          pic16_aopGet (AOP (right), 0, FALSE, FALSE),
+                          pic16_aopGet (AOP (left), 0, FALSE, FALSE), pic16_aopGet (AOP (result), 0, FALSE, FALSE));
+    }
 
-        pic16_genMult8X8_n (left, right,result);
+  pic16_genMult8X8_n (left, right, result);
 }
 
 #if 0
 /*-----------------------------------------------------------------*/
 /* genMultOneWord : 16 bit multiplication                          */
 /*-----------------------------------------------------------------*/
-static void genMultOneWord (operand *left,
-                            operand *right,
-                            operand *result)
+static void
+genMultOneWord (operand * left, operand * right, operand * result)
 {
   FENTRY;
-  DEBUGpic16_pic16_AopType(__LINE__,left,right,result);
-  DEBUGpic16_pic16_AopTypeSign(__LINE__,left,right,result);
+  DEBUGpic16_pic16_AopType (__LINE__, left, right, result);
+  DEBUGpic16_pic16_AopTypeSign (__LINE__, left, right, result);
 
   /* (if two literals, the value is computed before)
    * if one literal, literal on the right */
-  if (AOP_TYPE(left) == AOP_LIT){
-    operand *t = right;
-    right = left;
-    left = t;
-  }
+  if (AOP_TYPE (left) == AOP_LIT)
+    {
+      operand *t = right;
+      right = left;
+      left = t;
+    }
 
   /* size is checked already == 2 */
 //  size = AOP_SIZE(result);
 
-  if (AOP_TYPE(right) == AOP_LIT) {
-    pic16_emitpcomment("multiply lit val:%s by variable %s and store in %s",
-      pic16_aopGet(AOP(right),0,FALSE,FALSE),
-      pic16_aopGet(AOP(left),0,FALSE,FALSE),
-      pic16_aopGet(AOP(result),0,FALSE,FALSE));
-  } else {
-    pic16_emitpcomment("multiply variable :%s by variable %s and store in %s",
-      pic16_aopGet(AOP(right),0,FALSE,FALSE),
-      pic16_aopGet(AOP(left),0,FALSE,FALSE),
-      pic16_aopGet(AOP(result),0,FALSE,FALSE));
-  }
+  if (AOP_TYPE (right) == AOP_LIT)
+    {
+      pic16_emitpcomment ("multiply lit val:%s by variable %s and store in %s",
+                          pic16_aopGet (AOP (right), 0, FALSE, FALSE),
+                          pic16_aopGet (AOP (left), 0, FALSE, FALSE), pic16_aopGet (AOP (result), 0, FALSE, FALSE));
+    }
+  else
+    {
+      pic16_emitpcomment ("multiply variable :%s by variable %s and store in %s",
+                          pic16_aopGet (AOP (right), 0, FALSE, FALSE),
+                          pic16_aopGet (AOP (left), 0, FALSE, FALSE), pic16_aopGet (AOP (result), 0, FALSE, FALSE));
+    }
 
-  pic16_genMult16X16_16(left, right,result);
+  pic16_genMult16X16_16 (left, right, result);
 }
 #endif
 
@@ -3547,38 +3956,39 @@
 /*-----------------------------------------------------------------*/
 /* genMultOneLong : 32 bit multiplication                          */
 /*-----------------------------------------------------------------*/
-static void genMultOneLong (operand *left,
-                            operand *right,
-                            operand *result)
+static void
+genMultOneLong (operand * left, operand * right, operand * result)
 {
   FENTRY;
-  DEBUGpic16_pic16_AopType(__LINE__,left,right,result);
-  DEBUGpic16_pic16_AopTypeSign(__LINE__,left,right,result);
+  DEBUGpic16_pic16_AopType (__LINE__, left, right, result);
+  DEBUGpic16_pic16_AopTypeSign (__LINE__, left, right, result);
 
   /* (if two literals, the value is computed before)
    * if one literal, literal on the right */
-  if (AOP_TYPE(left) == AOP_LIT){
-    operand *t = right;
-    right = left;
-    left = t;
-  }
+  if (AOP_TYPE (left) == AOP_LIT)
+    {
+      operand *t = right;
+      right = left;
+      left = t;
+    }
 
   /* size is checked already == 4 */
 //  size = AOP_SIZE(result);
 
-  if (AOP_TYPE(right) == AOP_LIT) {
-    pic16_emitpcomment("multiply lit val:%s by variable %s and store in %s",
-        pic16_aopGet(AOP(right),0,FALSE,FALSE),
-        pic16_aopGet(AOP(left),0,FALSE,FALSE),
-        pic16_aopGet(AOP(result),0,FALSE,FALSE));
-  } else {
-    pic16_emitpcomment("multiply variable :%s by variable %s and store in %s",
-        pic16_aopGet(AOP(right),0,FALSE,FALSE),
-        pic16_aopGet(AOP(left),0,FALSE,FALSE),
-        pic16_aopGet(AOP(result),0,FALSE,FALSE));
-  }
+  if (AOP_TYPE (right) == AOP_LIT)
+    {
+      pic16_emitpcomment ("multiply lit val:%s by variable %s and store in %s",
+                          pic16_aopGet (AOP (right), 0, FALSE, FALSE),
+                          pic16_aopGet (AOP (left), 0, FALSE, FALSE), pic16_aopGet (AOP (result), 0, FALSE, FALSE));
+    }
+  else
+    {
+      pic16_emitpcomment ("multiply variable :%s by variable %s and store in %s",
+                          pic16_aopGet (AOP (right), 0, FALSE, FALSE),
+                          pic16_aopGet (AOP (left), 0, FALSE, FALSE), pic16_aopGet (AOP (result), 0, FALSE, FALSE));
+    }
 
-  pic16_genMult32X32_32(left, right,result);
+  pic16_genMult32X32_32 (left, right, result);
 }
 #endif
 
@@ -3587,374 +3997,396 @@
 /*-----------------------------------------------------------------*/
 /* genMult - generates code for multiplication                     */
 /*-----------------------------------------------------------------*/
-static void genMult (iCode *ic)
+static void
+genMult (iCode * ic)
 {
-  operand *left = IC_LEFT(ic);
-  operand *right = IC_RIGHT(ic);
-  operand *result= IC_RESULT(ic);
+  operand *left = IC_LEFT (ic);
+  operand *right = IC_RIGHT (ic);
+  operand *result = IC_RESULT (ic);
 
-    FENTRY;
-        /* assign the amsops */
-        pic16_aopOp (left,ic,FALSE);
-        pic16_aopOp (right,ic,FALSE);
-        pic16_aopOp (result,ic,TRUE);
+  FENTRY;
+  /* assign the amsops */
+  pic16_aopOp (left, ic, FALSE);
+  pic16_aopOp (right, ic, FALSE);
+  pic16_aopOp (result, ic, TRUE);
 
-        DEBUGpic16_pic16_AopType(__LINE__,left,right,result);
+  DEBUGpic16_pic16_AopType (__LINE__, left, right, result);
 
-        /* special cases first *
-        * both are bits */
-        if (AOP_TYPE(left) == AOP_CRY
-                && AOP_TYPE(right)== AOP_CRY) {
-                genMultbits(left,right,result);
-          goto release ;
-        }
+  /* special cases first *
+   * both are bits */
+  if (AOP_TYPE (left) == AOP_CRY && AOP_TYPE (right) == AOP_CRY)
+    {
+      genMultbits (left, right, result);
+      goto release;
+    }
 
-        /* if both are of size == 1 */
-        if(AOP_SIZE(left) == 1
-                && AOP_SIZE(right) == 1) {
-                genMultOneByte(left,right,result);
-          goto release ;
-        }
+  /* if both are of size == 1 */
+  if (AOP_SIZE (left) == 1 && AOP_SIZE (right) == 1)
+    {
+      genMultOneByte (left, right, result);
+      goto release;
+    }
 
 #if 0
-        /* if both are of size == 2 */
-        if(AOP_SIZE(left) == 2
-                && AOP_SIZE(right) == 2) {
-                genMultOneWord(left, right, result);
-          goto release;
-        }
+  /* if both are of size == 2 */
+  if (AOP_SIZE (left) == 2 && AOP_SIZE (right) == 2)
+    {
+      genMultOneWord (left, right, result);
+      goto release;
+    }
 
-        /* if both are of size == 4 */
-        if(AOP_SIZE(left) == 4
-                && AOP_SIZE(right) == 4) {
-                genMultOneLong(left, right, result);
-          goto release;
-        }
+  /* if both are of size == 4 */
+  if (AOP_SIZE (left) == 4 && AOP_SIZE (right) == 4)
+    {
+      genMultOneLong (left, right, result);
+      goto release;
+    }
 #endif
 
-        fprintf( stderr, "%s: should have been transformed into function call\n",__FUNCTION__ );
-        assert( !"Multiplication should have been transformed into function call!" );
+  fprintf (stderr, "%s: should have been transformed into function call\n", __FUNCTION__);
+  assert (!"Multiplication should have been transformed into function call!");
 
-        pic16_emitcode("multiply ","sizes are greater than 4 ... need to insert proper algor.");
+  pic16_emitcode ("multiply ", "sizes are greater than 4 ... need to insert proper algor.");
 
 
-        fprintf(stderr, "operand sizes result: %d left: %d right: %d\n", AOP_SIZE(result), AOP_SIZE(left), AOP_SIZE(right));
-        /* should have been converted to function call */
-        assert(0) ;
+  fprintf (stderr, "operand sizes result: %d left: %d right: %d\n", AOP_SIZE (result), AOP_SIZE (left), AOP_SIZE (right));
+  /* should have been converted to function call */
+  assert (0);
 
-release :
-        pic16_freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-        pic16_freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-        pic16_freeAsmop(result,NULL,ic,TRUE);
+release:
+  pic16_freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 #if 0
 /*-----------------------------------------------------------------*/
 /* genDivbits :- division of bits                                  */
 /*-----------------------------------------------------------------*/
-static void genDivbits (operand *left,
-                        operand *right,
-                        operand *result)
+static void
+genDivbits (operand * left, operand * right, operand * result)
 {
   char *l;
 
-    FENTRY;
-    /* the result must be bit */
-    pic16_emitcode("mov","b,%s",pic16_aopGet(AOP(right),0,FALSE,FALSE));
-    l = pic16_aopGet(AOP(left),0,FALSE,FALSE);
-
-    MOVA(l);
-
-    pic16_emitcode("div","ab");
-    pic16_emitcode("rrc","a");
-    pic16_aopPut(AOP(result),"c",0);
+  FENTRY;
+  /* the result must be bit */
+  pic16_emitcode ("mov", "b,%s", pic16_aopGet (AOP (right), 0, FALSE, FALSE));
+  l = pic16_aopGet (AOP (left), 0, FALSE, FALSE);
+
+  MOVA (l);
+
+  pic16_emitcode ("div", "ab");
+  pic16_emitcode ("rrc", "a");
+  pic16_aopPut (AOP (result), "c", 0);
 }
 
 /*-----------------------------------------------------------------*/
 /* genDivOneByte : 8 bit division                                  */
 /*-----------------------------------------------------------------*/
-static void genDivOneByte (operand *left,
-                           operand *right,
-                           operand *result)
-{
-  sym_link *opetype = operandType(result);
-  char *l ;
-  symbol *lbl ;
-  int size,offset;
-
-        /* result = divident / divisor
-         * - divident may be a register or a literal,
-         * - divisor may be a register or a literal,
-         * so there are 3 cases (literal / literal is optimized
-         * by the front-end) to handle.
-         * In addition we must handle signed and unsigned, which
-         * result in 6 final different cases -- VR */
-
-    FENTRY;
-
-    size = AOP_SIZE(result) - 1;
-    offset = 1;
-    /* signed or unsigned */
-    if (SPEC_USIGN(opetype)) {
-      pCodeOp *pct1,    /* count */
-                *pct2,  /* reste */
-                *pct3;  /* temp */
-      symbol *label1, *label2, *label3;;
+static void
+genDivOneByte (operand * left, operand * right, operand * result)
+{
+  sym_link *opetype = operandType (result);
+  char *l;
+  symbol *lbl;
+  int size, offset;
 
+  /* result = divident / divisor
+   * - divident may be a register or a literal,
+   * - divisor may be a register or a literal,
+   * so there are 3 cases (literal / literal is optimized
+   * by the front-end) to handle.
+   * In addition we must handle signed and unsigned, which
+   * result in 6 final different cases -- VR */
 
-        /* unsigned is easy */
+  FENTRY;
 
-        pct1 = pic16_popGetTempReg(1);
-        pct2 = pic16_popGetTempReg(1);
-        pct3 = pic16_popGetTempReg(1);
+  size = AOP_SIZE (result) - 1;
+  offset = 1;
+  /* signed or unsigned */
+  if (SPEC_USIGN (opetype))
+    {
+      pCodeOp *pct1,            /* count */
+              *pct2,                   /* reste */
+              *pct3;                   /* temp */
+      symbol *label1, *label2, *label3;;
 
-        label1 = newiTempLabel(NULL);
-        label2 = newiTempLabel(NULL);
-        label3 = newiTempLabel(NULL);
 
-        /* the following algorithm is extracted from divuint.c */
+      /* unsigned is easy */
 
-        pic16_emitpcode(POC_MOVLW, pic16_popGetLit( 8 ));
-        pic16_emitpcode(POC_MOVWF, pic16_pCodeOpCopy( pct1 ));
+      pct1 = pic16_popGetTempReg (1);
+      pct2 = pic16_popGetTempReg (1);
+      pct3 = pic16_popGetTempReg (1);
 
-        pic16_emitpcode(POC_CLRF, pic16_pCodeOpCopy( pct2 ));
+      label1 = newiTempLabel (NULL);
+      label2 = newiTempLabel (NULL);
+      label3 = newiTempLabel (NULL);
 
-        pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left), 0));
+      /* the following algorithm is extracted from divuint.c */
 
-        pic16_emitpLabel(label1->key);
+      pic16_emitpcode (POC_MOVLW, pic16_popGetLit (8));
+      pic16_emitpcode (POC_MOVWF, pic16_pCodeOpCopy (pct1));
 
-        emitCLRC;
-        pic16_emitpcode(POC_RLCF, pic16_pCodeOpCopy( pct2 ));
+      pic16_emitpcode (POC_CLRF, pic16_pCodeOpCopy (pct2));
 
+      pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (left), 0));
 
-        emitCLRC;
-        pic16_emitpcode(POC_RLCF, pic16_popCopyReg( &pic16_pc_wreg ));
+      pic16_emitpLabel (label1->key);
 
+      emitCLRC;
+      pic16_emitpcode (POC_RLCF, pic16_pCodeOpCopy (pct2));
 
-        emitSKPNC;
-        pic16_emitpcode(POC_INCF, pic16_pCodeOpCopy( pct2 ));
 
-        pic16_emitpcode(POC_MOVWF, pic16_pCodeOpCopy( pct3 ));
-        pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(right), 0));
+      emitCLRC;
+      pic16_emitpcode (POC_RLCF, pic16_popCopyReg (&pic16_pc_wreg));
 
-        pic16_emitpcode(POC_CPFSLT, pic16_pCodeOpCopy(pct2));
-        pic16_emitpcode(POC_BRA, pic16_popGetLabel(label3->key));
-        pic16_emitpcode(POC_BRA, pic16_popGetLabel(label2->key));
-
-        pic16_emitpLabel( label3->key );
-        pic16_emitpcode(POC_SUBWF, pic16_pCodeOpCopy(pct2));
-        pic16_emitpcode(POC_INCF, pic16_pCodeOpCopy(pct3));
-
-
-
-        pic16_emitpLabel(label2->key);
-        pic16_emitpcode(POC_MOVFW, pic16_pCodeOpCopy(pct3));
-        pic16_emitpcode(POC_DECFSZ, pic16_pCodeOpCopy(pct1));
-        pic16_emitpcode(POC_BRA, pic16_popGetLabel( label1->key ));
-
-        /* result is in wreg */
-        if(AOP_TYPE(result) != AOP_ACC)
-                pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), 0));
-
-        pic16_popReleaseTempReg( pct3, 1);
-        pic16_popReleaseTempReg( pct2, 1);
-        pic16_popReleaseTempReg( pct1, 1);
-
-        return ;
-    }
-
-    /* signed is a little bit more difficult */
-
-    /* save the signs of the operands */
-    l = pic16_aopGet(AOP(left),0,FALSE,FALSE);
-    MOVA(l);
-    pic16_emitcode("xrl","a,%s",pic16_aopGet(AOP(right),0,FALSE,TRUE));
-    pic16_emitcode("push","acc"); /* save it on the stack */
-
-    /* now sign adjust for both left & right */
-    l =  pic16_aopGet(AOP(right),0,FALSE,FALSE);
-    MOVA(l);
-    lbl = newiTempLabel(NULL);
-    pic16_emitcode("jnb","acc.7,%05d_DS_",(lbl->key+100));
-    pic16_emitcode("cpl","a");
-    pic16_emitcode("inc","a");
-    pic16_emitcode("","%05d_DS_:",(lbl->key+100));
-    pic16_emitcode("mov","b,a");
-
-    /* sign adjust left side */
-    l =  pic16_aopGet(AOP(left),0,FALSE,FALSE);
-    MOVA(l);
-
-    lbl = newiTempLabel(NULL);
-    pic16_emitcode("jnb","acc.7,%05d_DS_",(lbl->key+100));
-    pic16_emitcode("cpl","a");
-    pic16_emitcode("inc","a");
-    pic16_emitcode("","%05d_DS_:",(lbl->key+100));
-
-    /* now the division */
-    pic16_emitcode("div","ab");
-    /* we are interested in the lower order
-    only */
-    pic16_emitcode("mov","b,a");
-    lbl = newiTempLabel(NULL);
-    pic16_emitcode("pop","acc");
-    /* if there was an over flow we don't
-    adjust the sign of the result */
-    pic16_emitcode("jb","ov,%05d_DS_",(lbl->key+100));
-    pic16_emitcode("jnb","acc.7,%05d_DS_",(lbl->key+100));
-    CLRC;
-    pic16_emitcode("clr","a");
-    pic16_emitcode("subb","a,b");
-    pic16_emitcode("mov","b,a");
-    pic16_emitcode("","%05d_DS_:",(lbl->key+100));
-
-    /* now we are done */
-    pic16_aopPut(AOP(result),"b",0);
-    if(size > 0){
-        pic16_emitcode("mov","c,b.7");
-        pic16_emitcode("subb","a,acc");
-    }
-    while (size--)
-        pic16_aopPut(AOP(result),"a",offset++);
 
-}
-#endif
+      emitSKPNC;
+      pic16_emitpcode (POC_INCF, pic16_pCodeOpCopy (pct2));
 
-/*-----------------------------------------------------------------*/
-/* genDiv - generates code for division                            */
-/*-----------------------------------------------------------------*/
-static void genDiv (iCode *ic)
-{
-    operand *left = IC_LEFT(ic);
-    operand *right = IC_RIGHT(ic);
-    operand *result= IC_RESULT(ic);
-    int negated = 0;
-    int leftVal = 0, rightVal = 0;
-    int signedLits = 0;
-    char *functions[2][2] = { { "__divschar", "__divuchar" }, { "__modschar", "__moduchar" } };
-    int op = 0;
-
-        /* Division is a very lengthy algorithm, so it is better
-         * to call support routines than inlining algorithm.
-         * Division functions written here just in case someone
-         * wants to inline and not use the support libraries -- VR */
-
-    FENTRY;
-
-    /* assign the amsops */
-    pic16_aopOp (left,ic,FALSE);
-    pic16_aopOp (right,ic,FALSE);
-    pic16_aopOp (result,ic,TRUE);
-
-    if (ic->op == '/')
-      op = 0;
-    else if (ic->op == '%')
-      op = 1;
-    else
-      assert( !"invalid operation requested in genDivMod" );
-
-    /* get literal values */
-    if (IS_VALOP(left)) {
-      leftVal = (int) ulFromVal ( OP_VALUE(left) );
-      assert( leftVal >= -128 && leftVal < 256 );
-      if (leftVal < 0) { signedLits++; }
-    }
-    if (IS_VALOP(right)) {
-      rightVal = (int) ulFromVal ( OP_VALUE(right) );
-      assert( rightVal >= -128 && rightVal < 256 );
-      if (rightVal < 0) { signedLits++; }
-    }
-
-    /* We should only come here to convert all
-     * / : {u8_t, s8_t} x {u8_t, s8_t} -> {u8_t, s8_t}
-     * with exactly one operand being s8_t into
-     * u8_t x u8_t -> u8_t. All other cases should have been
-     * turned into calls to support routines beforehand... */
-    if ((AOP_SIZE(left) == 1 || IS_VALOP(left))
-        && (AOP_SIZE(right) == 1 || IS_VALOP(right)))
-    {
-      if ((!IS_UNSIGNED(operandType(right)) || rightVal < 0)
-          && (!IS_UNSIGNED(operandType(left)) || leftVal < 0))
-      {
-        /* Both operands are signed or negative, use _divschar
-         * instead of _divuchar */
-        pushaop(AOP(right), 0);
-        pushaop(AOP(left), 0);
+      pic16_emitpcode (POC_MOVWF, pic16_pCodeOpCopy (pct3));
+      pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (right), 0));
 
-        /* call _divschar */
-        pic16_emitpcode(POC_CALL, pic16_popGetWithString(functions[op][0]));
+      pic16_emitpcode (POC_CPFSLT, pic16_pCodeOpCopy (pct2));
+      pic16_emitpcode (POC_BRA, pic16_popGetLabel (label3->key));
+      pic16_emitpcode (POC_BRA, pic16_popGetLabel (label2->key));
 
+      pic16_emitpLabel (label3->key);
+      pic16_emitpcode (POC_SUBWF, pic16_pCodeOpCopy (pct2));
+      pic16_emitpcode (POC_INCF, pic16_pCodeOpCopy (pct3));
+
+
+
+      pic16_emitpLabel (label2->key);
+      pic16_emitpcode (POC_MOVFW, pic16_pCodeOpCopy (pct3));
+      pic16_emitpcode (POC_DECFSZ, pic16_pCodeOpCopy (pct1));
+      pic16_emitpcode (POC_BRA, pic16_popGetLabel (label1->key));
+
+      /* result is in wreg */
+      if (AOP_TYPE (result) != AOP_ACC)
+        pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 0));
+
+      pic16_popReleaseTempReg (pct3, 1);
+      pic16_popReleaseTempReg (pct2, 1);
+      pic16_popReleaseTempReg (pct1, 1);
+
+      return;
+    }
+
+  /* signed is a little bit more difficult */
+
+  /* save the signs of the operands */
+  l = pic16_aopGet (AOP (left), 0, FALSE, FALSE);
+  MOVA (l);
+  pic16_emitcode ("xrl", "a,%s", pic16_aopGet (AOP (right), 0, FALSE, TRUE));
+  pic16_emitcode ("push", "acc");       /* save it on the stack */
+
+  /* now sign adjust for both left & right */
+  l = pic16_aopGet (AOP (right), 0, FALSE, FALSE);
+  MOVA (l);
+  lbl = newiTempLabel (NULL);
+  pic16_emitcode ("jnb", "acc.7,%05d_DS_", labelKey2num (lbl->key));
+  pic16_emitcode ("cpl", "a");
+  pic16_emitcode ("inc", "a");
+  pic16_emitcode ("", "%05d_DS_:", labelKey2num (lbl->key));
+  pic16_emitcode ("mov", "b,a");
+
+  /* sign adjust left side */
+  l = pic16_aopGet (AOP (left), 0, FALSE, FALSE);
+  MOVA (l);
+
+  lbl = newiTempLabel (NULL);
+  pic16_emitcode ("jnb", "acc.7,%05d_DS_", labelKey2num (lbl->key));
+  pic16_emitcode ("cpl", "a");
+  pic16_emitcode ("inc", "a");
+  pic16_emitcode ("", "%05d_DS_:", labelKey2num (lbl->key));
+
+  /* now the division */
+  pic16_emitcode ("div", "ab");
+  /* we are interested in the lower order
+     only */
+  pic16_emitcode ("mov", "b,a");
+  lbl = newiTempLabel (NULL);
+  pic16_emitcode ("pop", "acc");
+  /* if there was an over flow we don't
+     adjust the sign of the result */
+  pic16_emitcode ("jb", "ov,%05d_DS_", labelKey2num (lbl->key));
+  pic16_emitcode ("jnb", "acc.7,%05d_DS_", labelKey2num (lbl->key));
+  CLRC;
+  pic16_emitcode ("clr", "a");
+  pic16_emitcode ("subb", "a,b");
+  pic16_emitcode ("mov", "b,a");
+  pic16_emitcode ("", "%05d_DS_:", labelKey2num (lbl->key));
+
+  /* now we are done */
+  pic16_aopPut (AOP (result), "b", 0);
+  if (size > 0)
+    {
+      pic16_emitcode ("mov", "c,b.7");
+      pic16_emitcode ("subb", "a,acc");
+    }
+  while (size--)
+    pic16_aopPut (AOP (result), "a", offset++);
+
+}
+#endif
+
+/*-----------------------------------------------------------------*/
+/* genDiv - generates code for division                            */
+/*-----------------------------------------------------------------*/
+static void
+genDiv (iCode * ic)
+{
+  operand *left = IC_LEFT (ic);
+  operand *right = IC_RIGHT (ic);
+  operand *result = IC_RESULT (ic);
+  int negated = 0;
+  int leftVal = 0, rightVal = 0;
+  int signedLits = 0;
+  char *functions[2][2] = { {"__divschar", "__divuchar"}, {"__modschar", "__moduchar"} };
+  int op = 0;
+
+  /* Division is a very lengthy algorithm, so it is better
+   * to call support routines than inlining algorithm.
+   * Division functions written here just in case someone
+   * wants to inline and not use the support libraries -- VR */
+
+  FENTRY;
+
+  /* assign the amsops */
+  pic16_aopOp (left, ic, FALSE);
+  pic16_aopOp (right, ic, FALSE);
+  pic16_aopOp (result, ic, TRUE);
+
+  if (ic->op == '/')
+    op = 0;
+  else if (ic->op == '%')
+    op = 1;
+  else
+    assert (!"invalid operation requested in genDivMod");
+
+  /* get literal values */
+  if (IS_VALOP (left))
+    {
+      leftVal = (int) ulFromVal (OP_VALUE (left));
+      assert (leftVal >= -128 && leftVal < 256);
+      if (leftVal < 0)
         {
-          symbol *sym;
-          sym = newSymbol( functions[op][0], 0 );
-          sym->used++;
-          strcpy(sym->rname, functions[op][0]);
-          checkAddSym(&externs, sym);
+          signedLits++;
         }
-
-        /* assign result */
-        pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), 0));
-        if (AOP_SIZE(result) > 1)
+    }
+  if (IS_VALOP (right))
+    {
+      rightVal = (int) ulFromVal (OP_VALUE (right));
+      assert (rightVal >= -128 && rightVal < 256);
+      if (rightVal < 0)
         {
-          pic16_emitpcode(POC_MOVFF,
-              pic16_popGet2p(pic16_popCopyReg(&pic16_pc_prodl),
-                pic16_popGet(AOP(result), 1)));
-          /* sign extend */
-          pic16_addSign(result, 2, 1);
+          signedLits++;
         }
+    }
+
+  /* We should only come here to convert all
+   * / : {u8_t, s8_t} x {u8_t, s8_t} -> {u8_t, s8_t}
+   * with exactly one operand being s8_t into
+   * u8_t x u8_t -> u8_t. All other cases should have been
+   * turned into calls to support routines beforehand... */
+  if ((AOP_SIZE (left) == 1 || IS_VALOP (left)) && (AOP_SIZE (right) == 1 || IS_VALOP (right)))
+    {
+      if ((!IS_UNSIGNED (operandType (right)) || rightVal < 0) && (!IS_UNSIGNED (operandType (left)) || leftVal < 0))
+        {
+          /* Both operands are signed or negative, use _divschar
+           * instead of _divuchar */
+          pushaop (AOP (right), 0);
+          pushaop (AOP (left), 0);
 
-        /* clean up stack */
-        pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(pic16_stack_preinc));
-        pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(pic16_stack_preinc));
+          /* call _divschar */
+          pic16_emitpcode (POC_CALL, pic16_popGetWithString (functions[op][0]));
 
-        goto release;
-      }
+          {
+            symbol *sym;
+            sym = newSymbol (functions[op][0], 0);
+            sym->used++;
+            strcpy (sym->rname, functions[op][0]);
+            checkAddSym (&externs, sym);
+          }
+
+          /* assign result */
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 0));
+          if (AOP_SIZE (result) > 1)
+            {
+              pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popCopyReg (&pic16_pc_prodl), pic16_popGet (AOP (result), 1)));
+              /* sign extend */
+              pic16_addSign (result, 2, 1);
+            }
+
+          /* clean up stack */
+          pic16_emitpcode (POC_MOVFW, pic16_popCopyReg (pic16_stack_preinc));
+          pic16_emitpcode (POC_MOVFW, pic16_popCopyReg (pic16_stack_preinc));
+
+          goto release;
+        }
 
       /* push right operand */
-      if (IS_VALOP(right)) {
-        if (rightVal < 0) {
-          pic16_pushpCodeOp( pic16_popGetLit(-rightVal) );
+      if (IS_VALOP (right))
+        {
+          if (rightVal < 0)
+            {
+              pic16_pushpCodeOp (pic16_popGetLit (-rightVal));
+              negated++;
+            }
+          else
+            {
+              pushaop (AOP (right), 0);
+            }
+        }
+      else if (!IS_UNSIGNED (operandType (right)))
+        {
+          pic16_mov2w (AOP (right), 0);
+          pic16_emitpcode (POC_BTFSC, pic16_newpCodeOpBit_simple (AOP (right), 0, 7));
+          pic16_emitpcode (POC_NEGF, pic16_popCopyReg (&pic16_pc_wreg));
+          pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (pic16_stack_postdec));
           negated++;
-        } else {
-          pushaop(AOP(right), 0);
         }
-      } else if (!IS_UNSIGNED(operandType(right))) {
-        pic16_mov2w(AOP(right), 0);
-        pic16_emitpcode(POC_BTFSC, pic16_newpCodeOpBit_simple(AOP(right), 0, 7));
-        pic16_emitpcode(POC_NEGF, pic16_popCopyReg(&pic16_pc_wreg));
-        pic16_emitpcode(POC_MOVWF, pic16_popCopyReg(pic16_stack_postdec));
-        negated++;
-      } else {
-        pushaop(AOP(right), 0);
-      }
+      else
+        {
+          pushaop (AOP (right), 0);
+        }
 
       /* push left operand */
-      if (IS_VALOP(left)) {
-        if (leftVal < 0) {
-          pic16_pushpCodeOp(pic16_popGetLit(-leftVal));
+      if (IS_VALOP (left))
+        {
+          if (leftVal < 0)
+            {
+              pic16_pushpCodeOp (pic16_popGetLit (-leftVal));
+              negated++;
+            }
+          else
+            {
+              pushaop (AOP (left), 0);
+            }
+        }
+      else if (!IS_UNSIGNED (operandType (left)))
+        {
+          pic16_mov2w (AOP (left), 0);
+          pic16_emitpcode (POC_BTFSC, pic16_newpCodeOpBit_simple (AOP (left), 0, 7));
+          pic16_emitpcode (POC_NEGF, pic16_popCopyReg (&pic16_pc_wreg));
+          pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (pic16_stack_postdec));
           negated++;
-        } else {
-          pushaop(AOP(left), 0);
         }
-      } else if (!IS_UNSIGNED(operandType(left))) {
-        pic16_mov2w(AOP(left),0);
-        pic16_emitpcode(POC_BTFSC, pic16_newpCodeOpBit_simple(AOP(left), 0, 7));
-        pic16_emitpcode(POC_NEGF, pic16_popCopyReg(&pic16_pc_wreg));
-        pic16_emitpcode(POC_MOVWF, pic16_popCopyReg(pic16_stack_postdec));
-        negated++;
-      } else {
-        pushaop(AOP(left), 0);
-      }
+      else
+        {
+          pushaop (AOP (left), 0);
+        }
 
       /* call _divuchar */
-      pic16_emitpcode(POC_CALL, pic16_popGetWithString(functions[op][1]));
+      pic16_emitpcode (POC_CALL, pic16_popGetWithString (functions[op][1]));
 
       {
         symbol *sym;
-        sym = newSymbol( functions[op][1], 0 );
+        sym = newSymbol (functions[op][1], 0);
         sym->used++;
-        strcpy(sym->rname, functions[op][1]);
-        checkAddSym(&externs, sym);
+        strcpy (sym->rname, functions[op][1]);
+        checkAddSym (&externs, sym);
       }
 
       /* Revert negation(s) from above.
@@ -3973,202 +4405,219 @@
        *       a<0, b<0 --> a/b >= 0 and a%b < 0  (e.g. -128 / -5 = 25,  25*(-5) = -125 and -3 remaining)
        * Only invert the result if the left operand is negative (sigh).
        */
-      if (AOP_SIZE(result) <= 1 || !negated)
-      {
-        if (ic->op == '/')
+      if (AOP_SIZE (result) <= 1 || !negated)
         {
-          if (IS_VALOP(right)) {
-            if (rightVal < 0) {
-              /* we negated this operand above */
-              pic16_emitpcode(POC_NEGF, pic16_popCopyReg(&pic16_pc_wreg));
-            }
-          } else if (!IS_UNSIGNED(operandType(right))) {
-            pic16_emitpcode(POC_BTFSC, pic16_newpCodeOpBit_simple(AOP(right), 0, 7));
-            pic16_emitpcode(POC_NEGF, pic16_popCopyReg(&pic16_pc_wreg));
-          }
-        }
+          if (ic->op == '/')
+            {
+              if (IS_VALOP (right))
+                {
+                  if (rightVal < 0)
+                    {
+                      /* we negated this operand above */
+                      pic16_emitpcode (POC_NEGF, pic16_popCopyReg (&pic16_pc_wreg));
+                    }
+                }
+              else if (!IS_UNSIGNED (operandType (right)))
+                {
+                  pic16_emitpcode (POC_BTFSC, pic16_newpCodeOpBit_simple (AOP (right), 0, 7));
+                  pic16_emitpcode (POC_NEGF, pic16_popCopyReg (&pic16_pc_wreg));
+                }
+            }
 
-        if (IS_VALOP(left)) {
-          if (leftVal < 0) {
-            /* we negated this operand above */
-            pic16_emitpcode(POC_NEGF, pic16_popCopyReg(&pic16_pc_wreg));
-          }
-        } else if (!IS_UNSIGNED(operandType(left))) {
-          pic16_emitpcode(POC_BTFSC, pic16_newpCodeOpBit_simple(AOP(left), 0, 7));
-          pic16_emitpcode(POC_NEGF, pic16_popCopyReg(&pic16_pc_wreg));
-        }
-
-        /* Move result to destination. */
-        pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), 0));
-
-        /* Zero-extend:  no operand was signed (or result is just a byte). */
-        pic16_addSign(result, 1, 0);
-      } else {
-        assert( AOP_SIZE(result) > 1 );
-        pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result), 1));
-        if (ic->op == '/')
-        {
-          if (IS_VALOP(right)) {
-            if (rightVal < 0) {
-              /* we negated this operand above */
-              pic16_emitpcode(POC_COMF, pic16_popGet(AOP(result), 1));
-            }
-          } else if (!IS_UNSIGNED(operandType(right))) {
-            pic16_emitpcode(POC_BTFSC, pic16_newpCodeOpBit_simple(AOP(right), 0, 7));
-            pic16_emitpcode(POC_COMF, pic16_popGet(AOP(result), 1));
-          }
-        }
+          if (IS_VALOP (left))
+            {
+              if (leftVal < 0)
+                {
+                  /* we negated this operand above */
+                  pic16_emitpcode (POC_NEGF, pic16_popCopyReg (&pic16_pc_wreg));
+                }
+            }
+          else if (!IS_UNSIGNED (operandType (left)))
+            {
+              pic16_emitpcode (POC_BTFSC, pic16_newpCodeOpBit_simple (AOP (left), 0, 7));
+              pic16_emitpcode (POC_NEGF, pic16_popCopyReg (&pic16_pc_wreg));
+            }
 
-        if (IS_VALOP(left)) {
-          if (leftVal < 0) {
-            /* we negated this operand above */
-            pic16_emitpcode(POC_COMF, pic16_popGet(AOP(result), 1));
-          }
-        } else if (!IS_UNSIGNED(operandType(left))) {
-          pic16_emitpcode(POC_BTFSC, pic16_newpCodeOpBit_simple(AOP(left), 0, 7));
-          pic16_emitpcode(POC_COMF, pic16_popGet(AOP(result), 1));
+          /* Move result to destination. */
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 0));
+
+          /* Zero-extend:  no operand was signed (or result is just a byte). */
+          pic16_addSign (result, 1, 0);
         }
+      else
+        {
+          assert (AOP_SIZE (result) > 1);
+          pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), 1));
+          if (ic->op == '/')
+            {
+              if (IS_VALOP (right))
+                {
+                  if (rightVal < 0)
+                    {
+                      /* we negated this operand above */
+                      pic16_emitpcode (POC_COMF, pic16_popGet (AOP (result), 1));
+                    }
+                }
+              else if (!IS_UNSIGNED (operandType (right)))
+                {
+                  pic16_emitpcode (POC_BTFSC, pic16_newpCodeOpBit_simple (AOP (right), 0, 7));
+                  pic16_emitpcode (POC_COMF, pic16_popGet (AOP (result), 1));
+                }
+            }
+
+          if (IS_VALOP (left))
+            {
+              if (leftVal < 0)
+                {
+                  /* we negated this operand above */
+                  pic16_emitpcode (POC_COMF, pic16_popGet (AOP (result), 1));
+                }
+            }
+          else if (!IS_UNSIGNED (operandType (left)))
+            {
+              pic16_emitpcode (POC_BTFSC, pic16_newpCodeOpBit_simple (AOP (left), 0, 7));
+              pic16_emitpcode (POC_COMF, pic16_popGet (AOP (result), 1));
+            }
 
-        /* Move result to destination. */
-        pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), 0));
+          /* Move result to destination. */
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 0));
 
-        /* Negate result if required. */
-        pic16_emitpcode(POC_BTFSC, pic16_newpCodeOpBit_simple(AOP(result), 1, 7));
-        pic16_emitpcode(POC_NEGF, pic16_popGet(AOP(result), 0));
+          /* Negate result if required. */
+          pic16_emitpcode (POC_BTFSC, pic16_newpCodeOpBit_simple (AOP (result), 1, 7));
+          pic16_emitpcode (POC_NEGF, pic16_popGet (AOP (result), 0));
 
-        /* Sign-extend. */
-        pic16_addSign(result, 2, 1);
-      }
+          /* Sign-extend. */
+          pic16_addSign (result, 2, 1);
+        }
 
       /* clean up stack */
-      pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(pic16_stack_preinc));
-      pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(pic16_stack_preinc));
+      pic16_emitpcode (POC_MOVFW, pic16_popCopyReg (pic16_stack_preinc));
+      pic16_emitpcode (POC_MOVFW, pic16_popCopyReg (pic16_stack_preinc));
       goto release;
     }
 
 #if 0
-    /* special cases first */
-    /* both are bits */
-    if (AOP_TYPE(left) == AOP_CRY &&
-        AOP_TYPE(right)== AOP_CRY) {
-        genDivbits(left,right,result);
-        goto release ;
-    }
-
-    /* if both are of size == 1 */
-    if (AOP_SIZE(left) == 1 &&
-        AOP_SIZE(right) == 1 ) {
-        genDivOneByte(left,right,result);
-        goto release ;
+  /* special cases first */
+  /* both are bits */
+  if (AOP_TYPE (left) == AOP_CRY && AOP_TYPE (right) == AOP_CRY)
+    {
+      genDivbits (left, right, result);
+      goto release;
+    }
+
+  /* if both are of size == 1 */
+  if (AOP_SIZE (left) == 1 && AOP_SIZE (right) == 1)
+    {
+      genDivOneByte (left, right, result);
+      goto release;
     }
 #endif
 
-    /* should have been converted to function call */
-    assert(0);
-release :
-    pic16_freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    pic16_freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    pic16_freeAsmop(result,NULL,ic,TRUE);
+  /* should have been converted to function call */
+  assert (0);
+release:
+  pic16_freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 #if 0
 /*-----------------------------------------------------------------*/
 /* genModbits :- modulus of bits                                   */
 /*-----------------------------------------------------------------*/
-static void genModbits (operand *left,
-                        operand *right,
-                        operand *result)
+static void
+genModbits (operand * left, operand * right, operand * result)
 {
   char *l;
 
-    FENTRY;
+  FENTRY;
 
-    werror(W_POSSBUG2, __FILE__, __LINE__);
-    /* the result must be bit */
-    pic16_emitcode("mov","b,%s",pic16_aopGet(AOP(right),0,FALSE,FALSE));
-    l = pic16_aopGet(AOP(left),0,FALSE,FALSE);
-
-    MOVA(l);
-
-    pic16_emitcode("div","ab");
-    pic16_emitcode("mov","a,b");
-    pic16_emitcode("rrc","a");
-    pic16_aopPut(AOP(result),"c",0);
+  werror (W_POSSBUG2, __FILE__, __LINE__);
+  /* the result must be bit */
+  pic16_emitcode ("mov", "b,%s", pic16_aopGet (AOP (right), 0, FALSE, FALSE));
+  l = pic16_aopGet (AOP (left), 0, FALSE, FALSE);
+
+  MOVA (l);
+
+  pic16_emitcode ("div", "ab");
+  pic16_emitcode ("mov", "a,b");
+  pic16_emitcode ("rrc", "a");
+  pic16_aopPut (AOP (result), "c", 0);
 }
 
 /*-----------------------------------------------------------------*/
 /* genModOneByte : 8 bit modulus                                   */
 /*-----------------------------------------------------------------*/
-static void genModOneByte (operand *left,
-                           operand *right,
-                           operand *result)
-{
-  sym_link *opetype = operandType(result);
-  char *l ;
-  symbol *lbl ;
-
-    FENTRY;
-    werror(W_POSSBUG2, __FILE__, __LINE__);
-
-    /* signed or unsigned */
-    if (SPEC_USIGN(opetype)) {
-        /* unsigned is easy */
-        pic16_emitcode("mov","b,%s", pic16_aopGet(AOP(right),0,FALSE,FALSE));
-        l = pic16_aopGet(AOP(left),0,FALSE,FALSE);
-        MOVA(l);
-        pic16_emitcode("div","ab");
-        pic16_aopPut(AOP(result),"b",0);
-        return ;
-    }
-
-    /* signed is a little bit more difficult */
-
-    /* save the signs of the operands */
-    l = pic16_aopGet(AOP(left),0,FALSE,FALSE);
-    MOVA(l);
-
-    pic16_emitcode("xrl","a,%s",pic16_aopGet(AOP(right),0,FALSE,FALSE));
-    pic16_emitcode("push","acc"); /* save it on the stack */
-
-    /* now sign adjust for both left & right */
-    l =  pic16_aopGet(AOP(right),0,FALSE,FALSE);
-    MOVA(l);
-
-    lbl = newiTempLabel(NULL);
-    pic16_emitcode("jnb","acc.7,%05d_DS_",(lbl->key+100));
-    pic16_emitcode("cpl","a");
-    pic16_emitcode("inc","a");
-    pic16_emitcode("","%05d_DS_:",(lbl->key+100));
-    pic16_emitcode("mov","b,a");
-
-    /* sign adjust left side */
-    l =  pic16_aopGet(AOP(left),0,FALSE,FALSE);
-    MOVA(l);
-
-    lbl = newiTempLabel(NULL);
-    pic16_emitcode("jnb","acc.7,%05d_DS_",(lbl->key+100));
-    pic16_emitcode("cpl","a");
-    pic16_emitcode("inc","a");
-    pic16_emitcode("","%05d_DS_:",(lbl->key+100));
-
-    /* now the multiplication */
-    pic16_emitcode("div","ab");
-    /* we are interested in the lower order
-    only */
-    lbl = newiTempLabel(NULL);
-    pic16_emitcode("pop","acc");
-    /* if there was an over flow we don't
-    adjust the sign of the result */
-    pic16_emitcode("jb","ov,%05d_DS_",(lbl->key+100));
-    pic16_emitcode("jnb","acc.7,%05d_DS_",(lbl->key+100));
-    CLRC ;
-    pic16_emitcode("clr","a");
-    pic16_emitcode("subb","a,b");
-    pic16_emitcode("mov","b,a");
-    pic16_emitcode("","%05d_DS_:",(lbl->key+100));
+static void
+genModOneByte (operand * left, operand * right, operand * result)
+{
+  sym_link *opetype = operandType (result);
+  char *l;
+  symbol *lbl;
+
+  FENTRY;
+  werror (W_POSSBUG2, __FILE__, __LINE__);
+
+  /* signed or unsigned */
+  if (SPEC_USIGN (opetype))
+    {
+      /* unsigned is easy */
+      pic16_emitcode ("mov", "b,%s", pic16_aopGet (AOP (right), 0, FALSE, FALSE));
+      l = pic16_aopGet (AOP (left), 0, FALSE, FALSE);
+      MOVA (l);
+      pic16_emitcode ("div", "ab");
+      pic16_aopPut (AOP (result), "b", 0);
+      return;
+    }
 
-    /* now we are done */
-    pic16_aopPut(AOP(result),"b",0);
+  /* signed is a little bit more difficult */
+
+  /* save the signs of the operands */
+  l = pic16_aopGet (AOP (left), 0, FALSE, FALSE);
+  MOVA (l);
+
+  pic16_emitcode ("xrl", "a,%s", pic16_aopGet (AOP (right), 0, FALSE, FALSE));
+  pic16_emitcode ("push", "acc");       /* save it on the stack */
+
+  /* now sign adjust for both left & right */
+  l = pic16_aopGet (AOP (right), 0, FALSE, FALSE);
+  MOVA (l);
+
+  lbl = newiTempLabel (NULL);
+  pic16_emitcode ("jnb", "acc.7,%05d_DS_", labelKey2num (lbl->key));
+  pic16_emitcode ("cpl", "a");
+  pic16_emitcode ("inc", "a");
+  pic16_emitcode ("", "%05d_DS_:", labelKey2num (lbl->key));
+  pic16_emitcode ("mov", "b,a");
+
+  /* sign adjust left side */
+  l = pic16_aopGet (AOP (left), 0, FALSE, FALSE);
+  MOVA (l);
+
+  lbl = newiTempLabel (NULL);
+  pic16_emitcode ("jnb", "acc.7,%05d_DS_", labelKey2num (lbl->key));
+  pic16_emitcode ("cpl", "a");
+  pic16_emitcode ("inc", "a");
+  pic16_emitcode ("", "%05d_DS_:", labelKey2num (lbl->key));
+
+  /* now the multiplication */
+  pic16_emitcode ("div", "ab");
+  /* we are interested in the lower order
+     only */
+  lbl = newiTempLabel (NULL);
+  pic16_emitcode ("pop", "acc");
+  /* if there was an over flow we don't
+     adjust the sign of the result */
+  pic16_emitcode ("jb", "ov,%05d_DS_", labelKey2num (lbl->key));
+  pic16_emitcode ("jnb", "acc.7,%05d_DS_", labelKey2num (lbl->key));
+  CLRC;
+  pic16_emitcode ("clr", "a");
+  pic16_emitcode ("subb", "a,b");
+  pic16_emitcode ("mov", "b,a");
+  pic16_emitcode ("", "%05d_DS_:", labelKey2num (lbl->key));
+
+  /* now we are done */
+  pic16_aopPut (AOP (result), "b", 0);
 
 }
 #endif
@@ -4176,44 +4625,45 @@
 /*-----------------------------------------------------------------*/
 /* genMod - generates code for division                            */
 /*-----------------------------------------------------------------*/
-static void genMod (iCode *ic)
+static void
+genMod (iCode * ic)
 {
   /* Task deferred to genDiv */
-  genDiv(ic);
+  genDiv (ic);
 #if 0
-  operand *left = IC_LEFT(ic);
-  operand *right = IC_RIGHT(ic);
-  operand *result= IC_RESULT(ic);
-
-    FENTRY;
+  operand *left = IC_LEFT (ic);
+  operand *right = IC_RIGHT (ic);
+  operand *result = IC_RESULT (ic);
 
-    /* assign the amsops */
-    pic16_aopOp (left,ic,FALSE);
-    pic16_aopOp (right,ic,FALSE);
-    pic16_aopOp (result,ic,TRUE);
+  FENTRY;
 
-    /* special cases first */
-    /* both are bits */
-    if (AOP_TYPE(left) == AOP_CRY &&
-        AOP_TYPE(right)== AOP_CRY) {
-        genModbits(left,right,result);
-        goto release ;
+  /* assign the amsops */
+  pic16_aopOp (left, ic, FALSE);
+  pic16_aopOp (right, ic, FALSE);
+  pic16_aopOp (result, ic, TRUE);
+
+  /* special cases first */
+  /* both are bits */
+  if (AOP_TYPE (left) == AOP_CRY && AOP_TYPE (right) == AOP_CRY)
+    {
+      genModbits (left, right, result);
+      goto release;
     }
 
-    /* if both are of size == 1 */
-    if (AOP_SIZE(left) == 1 &&
-        AOP_SIZE(right) == 1 ) {
-        genModOneByte(left,right,result);
-        goto release ;
+  /* if both are of size == 1 */
+  if (AOP_SIZE (left) == 1 && AOP_SIZE (right) == 1)
+    {
+      genModOneByte (left, right, result);
+      goto release;
     }
 
-    /* should have been converted to function call */
-    assert(0);
+  /* should have been converted to function call */
+  assert (0);
 
-release :
-    pic16_freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    pic16_freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    pic16_freeAsmop(result,NULL,ic,TRUE);
+release:
+  pic16_freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 #endif
 }
 
@@ -4223,73 +4673,82 @@
 /*
   note: May need to add parameter to indicate when a variable is in bit space.
 */
-static void genIfxJump (iCode *ic, char *jval)
+static void
+genIfxJump (iCode * ic, char *jval)
 {
   FENTRY;
 
-    /* if true label then we jump if condition
-    supplied is true */
-    if ( IC_TRUE(ic) ) {
+  /* if true label then we jump if condition
+     supplied is true */
+  if (IC_TRUE (ic))
+    {
 
-        if(strcmp(jval,"a") == 0)
-          emitSKPZ;
-        else if (strcmp(jval,"c") == 0)
-          emitSKPNC;
-        else {
-          DEBUGpic16_emitcode ("; ***","%d - assuming %s is in bit space",__LINE__,jval);
-          pic16_emitpcode(POC_BTFSC,  pic16_newpCodeOpBit(jval,-1,1, PO_GPR_REGISTER));
+      if (strcmp (jval, "a") == 0)
+        emitSKPZ;
+      else if (strcmp (jval, "c") == 0)
+        emitSKPNC;
+      else
+        {
+          DEBUGpic16_emitcode ("; ***", "%d - assuming %s is in bit space", __LINE__, jval);
+          pic16_emitpcode (POC_BTFSC, pic16_newpCodeOpBit (jval, -1, 1, PO_GPR_REGISTER));
         }
 
-        pic16_emitpcode(POC_GOTO,pic16_popGetLabel(IC_TRUE(ic)->key));
-        pic16_emitcode(" goto","_%05d_DS_",IC_TRUE(ic)->key+100 + pic16_labelOffset);
+      pic16_emitpcode (POC_GOTO, pic16_popGetLabel (IC_TRUE (ic)->key));
+      pic16_emitcode (" goto", "_%05d_DS_", labelKey2num (IC_TRUE (ic)->key + pic16_labelOffset));
 
     }
-    else {
-        /* false label is present */
-        if(strcmp(jval,"a") == 0)
-          emitSKPNZ;
-        else if (strcmp(jval,"c") == 0)
-          emitSKPC;
-        else {
-          DEBUGpic16_emitcode ("; ***","%d - assuming %s is in bit space",__LINE__,jval);
-          pic16_emitpcode(POC_BTFSS,  pic16_newpCodeOpBit(jval,-1,1, PO_GPR_REGISTER));
+  else
+    {
+      /* false label is present */
+      if (strcmp (jval, "a") == 0)
+        emitSKPNZ;
+      else if (strcmp (jval, "c") == 0)
+        emitSKPC;
+      else
+        {
+          DEBUGpic16_emitcode ("; ***", "%d - assuming %s is in bit space", __LINE__, jval);
+          pic16_emitpcode (POC_BTFSS, pic16_newpCodeOpBit (jval, -1, 1, PO_GPR_REGISTER));
         }
 
-        pic16_emitpcode(POC_GOTO,pic16_popGetLabel(IC_FALSE(ic)->key));
-        pic16_emitcode(" goto","_%05d_DS_",IC_FALSE(ic)->key+100 + pic16_labelOffset);
+      pic16_emitpcode (POC_GOTO, pic16_popGetLabel (IC_FALSE (ic)->key));
+      pic16_emitcode (" goto", "_%05d_DS_", labelKey2num (IC_FALSE (ic)->key + pic16_labelOffset));
 
     }
 
 
-    /* mark the icode as generated */
-    ic->generated = 1;
+  /* mark the icode as generated */
+  ic->generated = 1;
 }
 
-static void genIfxpCOpJump (iCode *ic, pCodeOp *jop)
+static void
+genIfxpCOpJump (iCode * ic, pCodeOp * jop)
 {
   FENTRY;
 
-    /* if true label then we jump if condition
-    supplied is true */
-    if ( IC_TRUE(ic) ) {
-      DEBUGpic16_emitcode ("; ***","%d - assuming is in bit space",__LINE__);
-      pic16_emitpcode(POC_BTFSC, jop);
+  /* if true label then we jump if condition
+     supplied is true */
+  if (IC_TRUE (ic))
+    {
+      DEBUGpic16_emitcode ("; ***", "%d - assuming is in bit space", __LINE__);
+      pic16_emitpcode (POC_BTFSC, jop);
 
-      pic16_emitpcode(POC_GOTO,pic16_popGetLabel(IC_TRUE(ic)->key));
-      pic16_emitcode(" goto","_%05d_DS_",IC_TRUE(ic)->key+100 + pic16_labelOffset);
+      pic16_emitpcode (POC_GOTO, pic16_popGetLabel (IC_TRUE (ic)->key));
+      pic16_emitcode (" goto", "_%05d_DS_", labelKey2num (IC_TRUE (ic)->key + pic16_labelOffset));
 
-    } else {
+    }
+  else
+    {
       /* false label is present */
-      DEBUGpic16_emitcode ("; ***","%d - assuming is in bit space",__LINE__);
-      pic16_emitpcode(POC_BTFSS, jop);
+      DEBUGpic16_emitcode ("; ***", "%d - assuming is in bit space", __LINE__);
+      pic16_emitpcode (POC_BTFSS, jop);
 
-      pic16_emitpcode(POC_GOTO,pic16_popGetLabel(IC_FALSE(ic)->key));
-      pic16_emitcode(" goto","_%05d_DS_",IC_FALSE(ic)->key+100 + pic16_labelOffset);
+      pic16_emitpcode (POC_GOTO, pic16_popGetLabel (IC_FALSE (ic)->key));
+      pic16_emitcode (" goto", "_%05d_DS_", labelKey2num (IC_FALSE (ic)->key + pic16_labelOffset));
     }
 
 
-    /* mark the icode as generated */
-    ic->generated = 1;
+  /* mark the icode as generated */
+  ic->generated = 1;
 }
 
 #if 0
@@ -4298,51 +4757,57 @@
 /*-----------------------------------------------------------------*/
 /* genSkip                                                         */
 /*-----------------------------------------------------------------*/
-static void genSkip(iCode *ifx,int status_bit)
+static void
+genSkip (iCode * ifx, int status_bit)
 {
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-  if(!ifx)
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  if (!ifx)
     return;
 
-  if ( IC_TRUE(ifx) ) {
-    switch(status_bit) {
-    case 'z':
-      emitSKPNZ;
-      break;
+  if (IC_TRUE (ifx))
+    {
+      switch (status_bit)
+        {
+        case 'z':
+          emitSKPNZ;
+          break;
 
-    case 'c':
-      emitSKPNC;
-      break;
+        case 'c':
+          emitSKPNC;
+          break;
 
-    case 'd':
-      emitSKPDC;
-      break;
+        case 'd':
+          emitSKPDC;
+          break;
 
-    }
+        }
 
-    pic16_emitpcode(POC_GOTO,pic16_popGetLabel(IC_TRUE(ifx)->key));
-    // pic16_emitcode("goto","_%05d_DS_",IC_TRUE(ifx)->key+100+pic16_labelOffset);
+      pic16_emitpcode (POC_GOTO, pic16_popGetLabel (IC_TRUE (ifx)->key));
+      // pic16_emitcode("goto","_%05d_DS_",labelKey2num (IC_TRUE(ifx)->key + pic16_labelOffset));
 
-  } else {
+    }
+  else
+    {
 
-    switch(status_bit) {
+      switch (status_bit)
+        {
 
-    case 'z':
-      emitSKPZ;
-      break;
+        case 'z':
+          emitSKPZ;
+          break;
 
-    case 'c':
-      emitSKPC;
-      break;
+        case 'c':
+          emitSKPC;
+          break;
 
-    case 'd':
-      emitSKPDC;
-      break;
-    }
-    pic16_emitpcode(POC_GOTO,pic16_popGetLabel(IC_FALSE(ifx)->key));
-    // pic16_emitcode("goto","_%05d_DS_",IC_FALSE(ifx)->key+100+pic16_labelOffset);
+        case 'd':
+          emitSKPDC;
+          break;
+        }
+      pic16_emitpcode (POC_GOTO, pic16_popGetLabel (IC_FALSE (ifx)->key));
+      // pic16_emitcode("goto","_%05d_DS_",labelKey2num (IC_FALSE(ifx)->key + pic16_labelOffset));
 
-  }
+    }
 
 }
 #endif
@@ -4350,19 +4815,20 @@
 /*-----------------------------------------------------------------*/
 /* genSkipc                                                        */
 /*-----------------------------------------------------------------*/
-static void genSkipc(resolvedIfx *rifx)
+static void
+genSkipc (resolvedIfx * rifx)
 {
-  DEBUGpic16_emitcode ("; ***","%s  %d rifx= %p",__FUNCTION__,__LINE__, rifx);
+  DEBUGpic16_emitcode ("; ***", "%s  %d rifx= %p", __FUNCTION__, __LINE__, rifx);
 
-  if(!rifx)
+  if (!rifx)
     return;
 
-  if(rifx->condition)
+  if (rifx->condition)
     emitSKPNC;
   else
     emitSKPC;
 
-  pic16_emitpcode(POC_GOTO, pic16_popGetLabel(rifx->lbl->key));
+  pic16_emitpcode (POC_GOTO, pic16_popGetLabel (rifx->lbl->key));
   rifx->generated = 1;
 }
 
@@ -4371,12 +4837,17 @@
 /*                  aop (if it's NOT a literal) or from lit (if    */
 /*                  aop is a literal)                              */
 /*-----------------------------------------------------------------*/
-void mov2w_regOrLit (asmop *aop, unsigned long lit, int offset) {
-  if (aop->type == AOP_LIT) {
-    pic16_emitpcode (POC_MOVLW, pic16_popGetLit(lit >> (offset*8)));
-  } else {
-    pic16_emitpcode (POC_MOVFW, pic16_popGet (aop, offset));
-  }
+void
+mov2w_regOrLit (asmop * aop, unsigned long lit, int offset)
+{
+  if (aop->type == AOP_LIT)
+    {
+      pic16_emitpcode (POC_MOVLW, pic16_popGetLit (lit >> (offset * 8)));
+    }
+  else
+    {
+      pic16_emitpcode (POC_MOVFW, pic16_popGet (aop, offset));
+    }
 }
 
 /*-----------------------------------------------------------------*/
@@ -4391,8 +4862,8 @@
  * "B[CS]F STATUS,0; BTFS[CS] STATUS,0"
  * which should be optmized by the peephole
  * optimizer - RN 2005-01-01 */
-static void genCmp (operand *left,operand *right,
-                    operand *result, iCode *ifx, int sign)
+static void
+genCmp (operand * left, operand * right, operand * result, iCode * ifx, int sign)
 {
   resolvedIfx rIfx;
   int size;
@@ -4406,10 +4877,10 @@
   FENTRY;
 
   assert (left && right);
-  assert (AOP_SIZE(left) == AOP_SIZE(right));
+  assert (AOP_SIZE (left) == AOP_SIZE (right));
 
-  size = AOP_SIZE(right) - 1;
-  mask = (0x100UL << (size*8)) - 1;
+  size = AOP_SIZE (right) - 1;
+  mask = (0x100UL << (size * 8)) - 1;
   // in the end CARRY holds "left < right" (performedLt == 1) or "left >= right" (performedLt == 0)
   performedLt = 1;
   templbl = NULL;
@@ -4418,93 +4889,122 @@
   resolveIfx (&rIfx, ifx);
 
   /* handle for special cases */
-  if(pic16_genCmp_special(left, right, result, ifx, &rIfx, sign))
-      return;
+  if (pic16_genCmp_special (left, right, result, ifx, &rIfx, sign))
+    return;
 
   /**********************************************************************
    * handle bits - bit compares are promoted to int compares seemingly! *
    **********************************************************************/
 #if 0
   // THIS IS COMPLETELY UNTESTED!
-  if (AOP_TYPE(left) == AOP_CRY && AOP_TYPE(right) == AOP_CRY) {
-    pCodeOp *pcleft = pic16_popGet(AOP(left), 0);
-    pCodeOp *pcright = pic16_popGet(AOP(right), 0);
-    assert (pcleft->type == PO_GPR_BIT && pcright->type == PO_GPR_BIT);
-
-    emitSETC;
-    // 1 < {0,1} is false --> clear C by skipping the next instruction
-    //pic16_emitpcode (POC_BTFSS, pic16_popCopyGPR2Bit (AOP(left),0), PCORB(pcleft)->bit);
-    pic16_emitpcode (POC_BTFSS, pic16_popGet (AOP(left), 0));
-    // {0,1} < 0 is false --> clear C by NOT skipping the next instruction
-    pic16_emitpcode (POC_BTFSS, pic16_popCopyGPR2Bit (pic16_popGet(AOP(right),0), PCORB(pcright)->bit));
-    emitCLRC; // only skipped for left=0 && right=1
+  if (AOP_TYPE (left) == AOP_CRY && AOP_TYPE (right) == AOP_CRY)
+    {
+      pCodeOp *pcleft = pic16_popGet (AOP (left), 0);
+      pCodeOp *pcright = pic16_popGet (AOP (right), 0);
+      assert (pcleft->type == PO_GPR_BIT && pcright->type == PO_GPR_BIT);
+
+      emitSETC;
+      // 1 < {0,1} is false --> clear C by skipping the next instruction
+      //pic16_emitpcode (POC_BTFSS, pic16_popCopyGPR2Bit (AOP(left),0), PCORB(pcleft)->bit);
+      pic16_emitpcode (POC_BTFSS, pic16_popGet (AOP (left), 0));
+      // {0,1} < 0 is false --> clear C by NOT skipping the next instruction
+      pic16_emitpcode (POC_BTFSS, pic16_popCopyGPR2Bit (pic16_popGet (AOP (right), 0), PCORB (pcright)->bit));
+      emitCLRC;                 // only skipped for left=0 && right=1
 
-    goto correct_result_in_carry;
-  } // if
+      goto correct_result_in_carry;
+    }                           // if
 #endif
 
   /*************************************************
    * make sure that left is register (or the like) *
    *************************************************/
-  if (!isAOP_REGlike(left)) {
-    DEBUGpc ("swapping arguments (AOP_TYPEs %d/%d)", AOP_TYPE(left), AOP_TYPE(right));
-    assert (isAOP_LIT(left));
-    assert (isAOP_REGlike(right));
-    // swap left and right
-    // left < right <==> right > left <==> (right >= left + 1)
-    lit = ulFromVal (AOP(left)->aopu.aop_lit);
-
-    if ( (!sign && (lit & mask) == mask) || (sign && (lit & mask) == (mask >> 1)) ) {
-      // MAXVALUE < right? always false
-      if (performedLt) emitCLRC; else emitSETC;
-      goto correct_result_in_carry;
-    } // if
+  if (!isAOP_REGlike (left))
+    {
+      DEBUGpc ("swapping arguments (AOP_TYPEs %d/%d)", AOP_TYPE (left), AOP_TYPE (right));
+      assert (isAOP_LIT (left));
+      assert (isAOP_REGlike (right));
+      // swap left and right
+      // left < right <==> right > left <==> (right >= left + 1)
+      lit = ulFromVal (AOP (left)->aopu.aop_lit);
+
+      if ((!sign && (lit & mask) == mask) || (sign && (lit & mask) == (mask >> 1)))
+        {
+          // MAXVALUE < right? always false
+          if (performedLt)
+            emitCLRC;
+          else
+            emitSETC;
+          goto correct_result_in_carry;
+        }                       // if
+
+      // This fails for lit = 0xFF (unsigned) AND lit = 0x7F (signed),
+      // that's why we handled it above.
+      lit++;
 
-    // This fails for lit = 0xFF (unsigned) AND lit = 0x7F (signed),
-    // that's why we handled it above.
-    lit++;
-
-    dummy = left;
-    left = right;
-    right = dummy;
-
-    performedLt ^= 1; // instead of "left < right" we check for "right >= left+1, i.e. "right < left+1"
-  } else if (isAOP_LIT(right)) {
-    lit = ulFromVal (AOP(right)->aopu.aop_lit);
-  } // if
+      dummy = left;
+      left = right;
+      right = dummy;
 
-  assert (isAOP_REGlike(left)); // left must be register or the like
-  assert (isAOP_REGlike(right) || isAOP_LIT(right)); // right may be register-like or a literal
+      performedLt ^= 1;         // instead of "left < right" we check for "right >= left+1, i.e. "right < left+1"
+    }
+  else if (isAOP_LIT (right))
+    {
+      lit = ulFromVal (AOP (right)->aopu.aop_lit);
+    }                           // if
+
+  assert (isAOP_REGlike (left));        // left must be register or the like
+  assert (isAOP_REGlike (right) || isAOP_LIT (right));  // right may be register-like or a literal
 
   /*************************************************
    * special cases go here                         *
    *************************************************/
 
-  if (isAOP_LIT(right)) {
-    if (!sign) {
-      // unsigned comparison to a literal
-      DEBUGpc ("unsigned compare: left %s lit(0x%X=%lu), size=%d", performedLt ? "<" : ">=", lit, lit, size+1);
-      if (lit == 0) {
-        // unsigned left < 0? always false
-        if (performedLt) emitCLRC; else emitSETC;
-        goto correct_result_in_carry;
-      }
-    } else {
-      // signed comparison to a literal
-      DEBUGpc ("signed compare: left %s lit(0x%X=%ld), size=%d, mask=%x", performedLt ? "<" : ">=", lit, lit, size+1, mask);
-      if ((lit & mask) == ((0x80 << (size*8)) & mask)) {
-        // signed left < 0x80000000? always false
-        if (performedLt) emitCLRC; else emitSETC;
-        goto correct_result_in_carry;
-      } else if (lit == 0) {
-        // compare left < 0; set CARRY if SIGNBIT(left) is set
-        if (performedLt) emitSETC; else emitCLRC;
-        pic16_emitpcode (POC_BTFSS, pic16_popCopyGPR2Bit(pic16_popGet (AOP(left), size), 7));
-        if (performedLt) emitCLRC; else emitSETC;
-        goto correct_result_in_carry;
-      }
-    } // if (!sign)
-  } // right is literal
+  if (isAOP_LIT (right))
+    {
+      if (!sign)
+        {
+          // unsigned comparison to a literal
+          DEBUGpc ("unsigned compare: left %s lit(0x%X=%lu), size=%d", performedLt ? "<" : ">=", lit, lit, size + 1);
+          if (lit == 0)
+            {
+              // unsigned left < 0? always false
+              if (performedLt)
+                emitCLRC;
+              else
+                emitSETC;
+              goto correct_result_in_carry;
+            }
+        }
+      else
+        {
+          // signed comparison to a literal
+          DEBUGpc ("signed compare: left %s lit(0x%X=%ld), size=%d, mask=%x", performedLt ? "<" : ">=", lit, lit, size + 1,
+                   mask);
+          if ((lit & mask) == ((0x80 << (size * 8)) & mask))
+            {
+              // signed left < 0x80000000? always false
+              if (performedLt)
+                emitCLRC;
+              else
+                emitSETC;
+              goto correct_result_in_carry;
+            }
+          else if (lit == 0)
+            {
+              // compare left < 0; set CARRY if SIGNBIT(left) is set
+              if (performedLt)
+                emitSETC;
+              else
+                emitCLRC;
+              pic16_emitpcode (POC_BTFSS, pic16_popCopyGPR2Bit (pic16_popGet (AOP (left), size), 7));
+              if (performedLt)
+                emitCLRC;
+              else
+                emitSETC;
+              goto correct_result_in_carry;
+            }
+        }                       // if (!sign)
+    }                           // right is literal
 
   /*************************************************
    * perform a general case comparison             *
@@ -4512,52 +5012,95 @@
    *************************************************/
   // compare most significant bytes
   //DEBUGpc ("comparing bytes at offset %d", size);
-  if (!sign) {
-    // unsigned comparison
-    mov2w_regOrLit (AOP(right), lit, size);
-    pic16_emitpcode (POC_SUBFW, pic16_popGet (AOP(left), size));
-  } else {
-    // signed comparison
-    // (add 2^n to both operands then perform an unsigned comparison)
-    if (isAOP_LIT(right)) {
-      // left >= LIT <-> LIT-left <= 0 <-> LIT-left == 0 OR !(LIT-left >= 0)
-      unsigned char litbyte = (lit >> (8*size)) & 0xFF;
-
-      if (litbyte == 0x80) {
-        // left >= 0x80 -- always true, but more bytes to come
-        pic16_mov2w (AOP(left), size);
-        pic16_emitpcode (POC_XORLW, pic16_popGetLit (0x80)); // set ZERO flag
-        emitSETC;
-      } else {
-        // left >= LIT <-> left + (-LIT) >= 0 <-> left + (0x100-LIT) >= 0x100
-        pic16_mov2w (AOP(left), size);
-        pic16_emitpcode (POC_ADDLW, pic16_popGetLit (0x80));
-        pic16_emitpcode (POC_ADDLW, pic16_popGetLit ((0x100 - (litbyte + 0x80)) & 0x00FF));
-      } // if
-    } else {
-      /* using PRODL as a temporary register here */
-      pCodeOp *pctemp = pic16_popCopyReg(&pic16_pc_prodl);
-      //pCodeOp *pctemp = pic16_popGetTempReg(1);
-      pic16_mov2w (AOP(left), size);
-      pic16_emitpcode (POC_ADDLW, pic16_popGetLit (0x80));
-      pic16_emitpcode (POC_MOVWF, pctemp);
-      pic16_mov2w (AOP(right), size);
-      pic16_emitpcode (POC_ADDLW, pic16_popGetLit (0x80));
-      pic16_emitpcode (POC_SUBFW, pctemp);
-      //pic16_popReleaseTempReg(pctemp, 1);
+  if (!sign)
+    {
+      // unsigned comparison
+      if (AOP_TYPE (left) == AOP_PCODE && AOP (left)->aopu.pcop->type == PO_IMMEDIATE)
+        {
+          // right >= left(PO_IMMEDIATE)
+          pic16_emitpcode (POC_MOVLW, pic16_popGetImmed (AOP (left), size, 1)); // left+1
+          pic16_emitpcode (POC_SUBFW, pic16_popGet(AOP (right), size));
+          performedLt = 0;
+        }
+      else if (AOP_TYPE (right) == AOP_PCODE && AOP (right)->aopu.pcop->type == PO_IMMEDIATE)
+        {
+          // left < right(PO_IMMEDIATE)
+          pic16_emitpcode (POC_MOVLW, pic16_popGetImmed (AOP (right), size, 0));  // right+0
+          pic16_emitpcode (POC_SUBFW, pic16_popGet (AOP (left), size));
+        }
+      else
+        {
+          mov2w_regOrLit (AOP(right), lit, size);
+          pic16_emitpcode (POC_SUBFW, pic16_popGet (AOP (left), size));
+        }
     }
-  } // if (!sign)
+  else
+    {
+      // signed comparison
+      // (add 2^n to both operands then perform an unsigned comparison)
+      if (isAOP_LIT (right))
+        {
+          // left >= LIT <-> LIT-left <= 0 <-> LIT-left == 0 OR !(LIT-left >= 0)
+          unsigned char litbyte = (lit >> (8 * size)) & 0xFF;
 
-  // compare remaining bytes (treat as unsigned case from above)
-  templbl = newiTempLabel ( NULL );
-  offs = size;
-  while (offs--) {
-    //DEBUGpc ("comparing bytes at offset %d", offs);
-    pic16_emitpcode (POC_BNZ, pic16_popGetLabel (templbl->key));
-    mov2w_regOrLit (AOP(right), lit, offs);
-    pic16_emitpcode (POC_SUBFW, pic16_popGet (AOP(left), offs));
-  } // while (offs)
-  pic16_emitpLabel (templbl->key);
+          if (litbyte == 0x80)
+            {
+              // left >= 0x80 -- always true, but more bytes to come
+              pic16_mov2w (AOP (left), size);
+              pic16_emitpcode (POC_XORLW, pic16_popGetLit (0x80));      // set ZERO flag
+              emitSETC;
+            }
+          else
+            {
+              // left >= LIT <-> left + (-LIT) >= 0 <-> left + (0x100-LIT) >= 0x100
+              pic16_mov2w (AOP (left), size);
+              pic16_emitpcode (POC_ADDLW, pic16_popGetLit (0x80));
+              pic16_emitpcode (POC_ADDLW, pic16_popGetLit ((0x100 - (litbyte + 0x80)) & 0x00FF));
+            }                   // if
+        }
+      else
+        {
+          /* using PRODL as a temporary register here */
+          pCodeOp *pctemp = pic16_popCopyReg (&pic16_pc_prodl);
+          //pCodeOp *pctemp = pic16_popGetTempReg(1);
+          pic16_mov2w (AOP (left), size);
+          pic16_emitpcode (POC_ADDLW, pic16_popGetLit (0x80));
+          pic16_emitpcode (POC_MOVWF, pctemp);
+          pic16_mov2w (AOP (right), size);
+          pic16_emitpcode (POC_ADDLW, pic16_popGetLit (0x80));
+          pic16_emitpcode (POC_SUBFW, pctemp);
+          //pic16_popReleaseTempReg(pctemp, 1);
+        }
+    }                           // if (!sign)
+
+  // compare remaining bytes (treat as unsigned case from above)
+  templbl = newiTempLabel (NULL);
+  offs = size;
+  while (offs--)
+    {
+      //DEBUGpc ("comparing bytes at offset %d", offs);
+      pic16_emitpcode (POC_BNZ, pic16_popGetLabel (templbl->key));
+
+      if (AOP_TYPE (left) == AOP_PCODE && AOP (left)->aopu.pcop->type == PO_IMMEDIATE)
+        {
+          // right >= left(PO_IMMEDIATE)
+          pic16_emitpcode (POC_MOVLW, pic16_popGetImmed( AOP (left), offs, 1)); // left+1
+          pic16_emitpcode (POC_SUBFW, pic16_popGet (AOP (right), offs));
+          performedLt = 0;
+        }
+      else if (AOP_TYPE (right) == AOP_PCODE && AOP (right)->aopu.pcop->type == PO_IMMEDIATE)
+        {
+          // left < right(PO_IMMEDIATE)
+          pic16_emitpcode (POC_MOVLW, pic16_popGetImmed (AOP (right), offs, 0));  // right+0
+          pic16_emitpcode (POC_SUBFW, pic16_popGet (AOP (left), offs));
+        }
+      else
+        {
+          mov2w_regOrLit (AOP (right), lit, offs);
+          pic16_emitpcode (POC_SUBFW, pic16_popGet (AOP (left), offs));
+        }
+    }                           // while (offs)
+  pic16_emitpLabel (templbl->key);
   goto result_in_carry;
 
 result_in_carry:
@@ -4569,117 +5112,134 @@
    * (F=left, W=right)                                *
    ****************************************************/
 
-  if (performedLt) {
-    if (result && AOP_TYPE(result) != AOP_CRY) {
-      // value will be stored
-      emitTOGC;
-    } else {
-      // value wil only be used in the following genSkipc()
-      rIfx.condition ^= 1;
-    }
-  } // if
+  if (performedLt)
+    {
+      if (result && AOP_TYPE (result) != AOP_CRY)
+        {
+          // value will be stored
+          emitTOGC;
+        }
+      else
+        {
+          // value wil only be used in the following genSkipc()
+          rIfx.condition ^= 1;
+        }
+    }                           // if
 
 correct_result_in_carry:
 
   // assign result to variable (if neccessary)
-  if (result && AOP_TYPE(result) != AOP_CRY) {
-    //DEBUGpc ("assign result");
-    size = AOP_SIZE(result);
-    while (size--) {
-      pic16_emitpcode (POC_CLRF, pic16_popGet (AOP(result), size));
-    } // while
-    pic16_emitpcode (POC_RLCF, pic16_popGet (AOP(result), 0));
-  } // if (result)
+  if (result && AOP_TYPE (result) != AOP_CRY)
+    {
+      //DEBUGpc ("assign result");
+      size = AOP_SIZE (result);
+      while (size--)
+        {
+          pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), size));
+        }                       // while
+      pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (result), 0));
+    }                           // if (result)
 
   // perform conditional jump
-  if (ifx) {
-    //DEBUGpc ("generate control flow");
-    genSkipc (&rIfx);
-    ifx->generated = 1;
-  } // if
+  if (ifx)
+    {
+      //DEBUGpc ("generate control flow");
+      genSkipc (&rIfx);
+      ifx->generated = 1;
+    }                           // if
 }
 
 /*-----------------------------------------------------------------*/
 /* genCmpGt :- greater than comparison                             */
 /*-----------------------------------------------------------------*/
-static void genCmpGt (iCode *ic, iCode *ifx)
+static void
+genCmpGt (iCode * ic, iCode * ifx)
 {
   operand *left, *right, *result;
-  sym_link *letype , *retype;
-  int sign ;
+  sym_link *letype, *retype;
+  int sign;
+
+  FENTRY;
+
+  left = IC_LEFT (ic);
+  right = IC_RIGHT (ic);
+  result = IC_RESULT (ic);
+
+  sign = 0;
+  if (IS_SPEC (operandType (left)) && IS_SPEC (operandType (right)))
+    {
+      letype = getSpec (operandType (left));
+      retype = getSpec (operandType (right));
+      sign = !(SPEC_USIGN (letype) | SPEC_USIGN (retype));
+    }
 
-    FENTRY;
+  /* assign the amsops */
+  pic16_aopOp (left, ic, FALSE);
+  pic16_aopOp (right, ic, FALSE);
+  pic16_aopOp (result, ic, TRUE);
 
-    left = IC_LEFT(ic);
-    right= IC_RIGHT(ic);
-    result = IC_RESULT(ic);
-
-    letype = getSpec(operandType(left));
-    retype =getSpec(operandType(right));
-    sign =  !(SPEC_USIGN(letype) | SPEC_USIGN(retype));
-    /* assign the amsops */
-    pic16_aopOp (left,ic,FALSE);
-    pic16_aopOp (right,ic,FALSE);
-    pic16_aopOp (result,ic,TRUE);
-
-    genCmp(right, left, result, ifx, sign);
-
-    pic16_freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    pic16_freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    pic16_freeAsmop(result,NULL,ic,TRUE);
+  genCmp (right, left, result, ifx, sign);
+
+  pic16_freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genCmpLt - less than comparisons                                */
 /*-----------------------------------------------------------------*/
-static void genCmpLt (iCode *ic, iCode *ifx)
+static void
+genCmpLt (iCode * ic, iCode * ifx)
 {
   operand *left, *right, *result;
-  sym_link *letype , *retype;
-  int sign ;
+  sym_link *letype, *retype;
+  int sign;
 
-    FENTRY;
+  FENTRY;
 
-    left = IC_LEFT(ic);
-    right= IC_RIGHT(ic);
-    result = IC_RESULT(ic);
+  left = IC_LEFT (ic);
+  right = IC_RIGHT (ic);
+  result = IC_RESULT (ic);
 
-    letype = getSpec(operandType(left));
-    retype =getSpec(operandType(right));
-    sign =  !(SPEC_USIGN(letype) | SPEC_USIGN(retype));
+  sign = 0;
+  if (IS_SPEC (operandType (left)) && IS_SPEC (operandType (right)))
+    {
+      letype = getSpec (operandType (left));
+      retype = getSpec (operandType (right));
+      sign = !(SPEC_USIGN (letype) | SPEC_USIGN (retype));
+    }
 
-    /* assign the amsops */
-    pic16_aopOp (left,ic,FALSE);
-    pic16_aopOp (right,ic,FALSE);
-    pic16_aopOp (result,ic,TRUE);
+  /* assign the amsops */
+  pic16_aopOp (left, ic, FALSE);
+  pic16_aopOp (right, ic, FALSE);
+  pic16_aopOp (result, ic, TRUE);
 
-    genCmp(left, right, result, ifx, sign);
+  genCmp (left, right, result, ifx, sign);
 
-    pic16_freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    pic16_freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    pic16_freeAsmop(result,NULL,ic,TRUE);
+  pic16_freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* pic16_isLitOp - check if operand has to be treated as literal   */
 /*-----------------------------------------------------------------*/
-bool pic16_isLitOp(operand *op)
+bool
+pic16_isLitOp (operand * op)
 {
-  return ((AOP_TYPE(op) == AOP_LIT)
-      || ( (AOP_TYPE(op) == AOP_PCODE)
-          && ( (AOP(op)->aopu.pcop->type == PO_LITERAL)
-              || (AOP(op)->aopu.pcop->type == PO_IMMEDIATE) )));
+  return ((AOP_TYPE (op) == AOP_LIT)
+          || ((AOP_TYPE (op) == AOP_PCODE)
+              && ((AOP (op)->aopu.pcop->type == PO_LITERAL) || (AOP (op)->aopu.pcop->type == PO_IMMEDIATE))));
 }
 
 /*-----------------------------------------------------------------*/
 /* pic16_isLitAop - check if operand has to be treated as literal  */
 /*-----------------------------------------------------------------*/
-bool pic16_isLitAop(asmop *aop)
+bool
+pic16_isLitAop (asmop * aop)
 {
   return ((aop->type == AOP_LIT)
-      || ( (aop->type == AOP_PCODE)
-          && ( (aop->aopu.pcop->type == PO_LITERAL)
-              || (aop->aopu.pcop->type == PO_IMMEDIATE) )));
+          || ((aop->type == AOP_PCODE) && ((aop->aopu.pcop->type == PO_LITERAL) || (aop->aopu.pcop->type == PO_IMMEDIATE))));
 }
 
 
@@ -4687,118 +5247,123 @@
 /*-----------------------------------------------------------------*/
 /* genCmpEq - generates code for equal to                          */
 /*-----------------------------------------------------------------*/
-static void genCmpEq (iCode *ic, iCode *ifx)
+static void
+genCmpEq (iCode * ic, iCode * ifx)
 {
   operand *left, *right, *result;
-  symbol *falselbl = newiTempLabel(NULL);
-  symbol *donelbl = newiTempLabel(NULL);
+  symbol *falselbl = newiTempLabel (NULL);
+  symbol *donelbl = newiTempLabel (NULL);
 
   int preserve_result = 0;
   int generate_result = 0;
-  int i=0;
+  int i = 0;
   unsigned long lit = -1;
 
   FENTRY;
 
-  pic16_aopOp((left=IC_LEFT(ic)),ic,FALSE);
-  pic16_aopOp((right=IC_RIGHT(ic)),ic,FALSE);
-  pic16_aopOp((result=IC_RESULT(ic)),ic,TRUE);
+  pic16_aopOp ((left = IC_LEFT (ic)), ic, FALSE);
+  pic16_aopOp ((right = IC_RIGHT (ic)), ic, FALSE);
+  pic16_aopOp ((result = IC_RESULT (ic)), ic, TRUE);
 
-  DEBUGpic16_pic16_AopType(__LINE__,left,right,result);
+  DEBUGpic16_pic16_AopType (__LINE__, left, right, result);
 
-  if( (AOP_TYPE(right) == AOP_CRY) || (AOP_TYPE(left) == AOP_CRY) )
+  if ((AOP_TYPE (right) == AOP_CRY) || (AOP_TYPE (left) == AOP_CRY))
     {
-      werror(W_POSSBUG2, __FILE__, __LINE__);
-      DEBUGpic16_emitcode ("; ***","%s  %d -- ERROR",__FUNCTION__,__LINE__);
-      fprintf(stderr, "%s  %d error - left/right CRY operands not supported\n",__FUNCTION__,__LINE__);
+      werror (W_POSSBUG2, __FILE__, __LINE__);
+      DEBUGpic16_emitcode ("; ***", "%s  %d -- ERROR", __FUNCTION__, __LINE__);
+      fprintf (stderr, "%s  %d error - left/right CRY operands not supported\n", __FUNCTION__, __LINE__);
       goto release;
     }
 
-  if (pic16_isLitOp(left) || (AOP_TYPE(right) == AOP_ACC))
+  if (pic16_isLitOp (left) || (AOP_TYPE (right) == AOP_ACC))
     {
-      operand *tmp = right ;
+      operand *tmp = right;
       right = left;
       left = tmp;
     }
 
-  if (AOP_TYPE(right) == AOP_LIT) {
-    lit = ulFromVal (AOP(right)->aopu.aop_lit);
-  }
+  if (AOP_TYPE (right) == AOP_LIT)
+    {
+      lit = ulFromVal (AOP (right)->aopu.aop_lit);
+    }
 
-  if ( regsInCommon(left, result) || regsInCommon(right, result) )
+  if (regsInCommon (left, result) || regsInCommon (right, result))
     preserve_result = 1;
 
-  if(result && AOP_SIZE(result))
+  if (result && AOP_SIZE (result))
     generate_result = 1;
 
-  if(generate_result && !preserve_result)
+  if (generate_result && !preserve_result)
     {
-      for(i = 0; i < AOP_SIZE(result); i++)
-        pic16_emitpcode(POC_CLRF,pic16_popGet(AOP(result),i));
+      for (i = 0; i < AOP_SIZE (result); i++)
+        pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), i));
     }
 
-  assert( AOP_SIZE(left) == AOP_SIZE(right) );
-  for(i=0; i < AOP_SIZE(left); i++)
+  assert (AOP_SIZE (left) == AOP_SIZE (right));
+  for (i = 0; i < AOP_SIZE (left); i++)
     {
-      if(AOP_TYPE(left) != AOP_ACC)
+      if (AOP_TYPE (left) != AOP_ACC)
         {
-          if(pic16_isLitOp(left))
-            pic16_emitpcode(POC_MOVLW, pic16_popGet(AOP(left), i));
+          if (pic16_isLitOp (left))
+            pic16_emitpcode (POC_MOVLW, pic16_popGet (AOP (left), i));
           else
-            pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left), i));
+            pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (left), i));
         }
-      if(pic16_isLitOp(right)) {
-        if (pic16_isLitOp(left) || (0 != ((lit >> (8*i))&0x00FF))) {
-          pic16_emitpcode(POC_XORLW, pic16_popGet(AOP(right), i));
+      if (pic16_isLitOp (right))
+        {
+          if (pic16_isLitOp (left) || (0 != ((lit >> (8 * i)) & 0x00FF)))
+            {
+              pic16_emitpcode (POC_XORLW, pic16_popGet (AOP (right), i));
+            }
         }
-      } else
-        pic16_emitpcode(POC_XORFW, pic16_popGet(AOP(right), i));
+      else
+        pic16_emitpcode (POC_XORFW, pic16_popGet (AOP (right), i));
 
-      pic16_emitpcode(POC_BNZ,pic16_popGetLabel(falselbl->key));
+      pic16_emitpcode (POC_BNZ, pic16_popGetLabel (falselbl->key));
     }
 
   // result == true
 
-  if(generate_result && preserve_result)
+  if (generate_result && preserve_result)
     {
-      for(i = 0; i < AOP_SIZE(result); i++)
-        pic16_emitpcode(POC_CLRF,pic16_popGet(AOP(result),i));
+      for (i = 0; i < AOP_SIZE (result); i++)
+        pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), i));
     }
 
-  if(generate_result)
-    pic16_emitpcode(POC_INCF, pic16_popGet(AOP(result), 0)); // result = true
+  if (generate_result)
+    pic16_emitpcode (POC_INCF, pic16_popGet (AOP (result), 0)); // result = true
 
-  if(generate_result && preserve_result)
-    pic16_emitpcode(POC_GOTO,pic16_popGetLabel(donelbl->key));
+  if (generate_result && preserve_result)
+    pic16_emitpcode (POC_GOTO, pic16_popGetLabel (donelbl->key));
 
-  if(ifx && IC_TRUE(ifx))
-    pic16_emitpcode(POC_GOTO,pic16_popGetLabel(IC_TRUE(ifx)->key));
+  if (ifx && IC_TRUE (ifx))
+    pic16_emitpcode (POC_GOTO, pic16_popGetLabel (IC_TRUE (ifx)->key));
 
-  if(ifx && IC_FALSE(ifx))
-    pic16_emitpcode(POC_GOTO,pic16_popGetLabel(donelbl->key));
+  if (ifx && IC_FALSE (ifx))
+    pic16_emitpcode (POC_GOTO, pic16_popGetLabel (donelbl->key));
 
-  pic16_emitpLabel(falselbl->key);
+  pic16_emitpLabel (falselbl->key);
 
   // result == false
 
-  if(ifx && IC_FALSE(ifx))
-    pic16_emitpcode(POC_GOTO,pic16_popGetLabel(IC_FALSE(ifx)->key));
+  if (ifx && IC_FALSE (ifx))
+    pic16_emitpcode (POC_GOTO, pic16_popGetLabel (IC_FALSE (ifx)->key));
 
-  if(generate_result && preserve_result)
+  if (generate_result && preserve_result)
     {
-      for(i = 0; i < AOP_SIZE(result); i++)
-        pic16_emitpcode(POC_CLRF,pic16_popGet(AOP(result),i));
+      for (i = 0; i < AOP_SIZE (result); i++)
+        pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), i));
     }
 
-  pic16_emitpLabel(donelbl->key);
+  pic16_emitpLabel (donelbl->key);
 
-  if(ifx)
+  if (ifx)
     ifx->generated = 1;
 
 release:
-  pic16_freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-  pic16_freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-  pic16_freeAsmop(result,NULL,ic,TRUE);
+  pic16_freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 
 }
 
@@ -4809,440 +5374,420 @@
 /*-----------------------------------------------------------------*/
 /* genCmpEq - generates code for equal to                          */
 /*-----------------------------------------------------------------*/
-static void genCmpEq (iCode *ic, iCode *ifx)
+static void
+genCmpEq (iCode * ic, iCode * ifx)
 {
-    operand *left, *right, *result;
-    unsigned long lit = 0L;
-    int size,offset=0;
-    symbol *falselbl  = newiTempLabel(NULL);
+  operand *left, *right, *result;
+  unsigned long lit = 0L;
+  int size, offset = 0;
+  symbol *falselbl = newiTempLabel (NULL);
 
 
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-    if(ifx)
-      DEBUGpic16_emitcode ("; ifx is non-null","");
-    else
-      DEBUGpic16_emitcode ("; ifx is null","");
+  if (ifx)
+    DEBUGpic16_emitcode ("; ifx is non-null", "");
+  else
+    DEBUGpic16_emitcode ("; ifx is null", "");
 
-    pic16_aopOp((left=IC_LEFT(ic)),ic,FALSE);
-    pic16_aopOp((right=IC_RIGHT(ic)),ic,FALSE);
-    pic16_aopOp((result=IC_RESULT(ic)),ic,TRUE);
+  pic16_aopOp ((left = IC_LEFT (ic)), ic, FALSE);
+  pic16_aopOp ((right = IC_RIGHT (ic)), ic, FALSE);
+  pic16_aopOp ((result = IC_RESULT (ic)), ic, TRUE);
 
-    size = max(AOP_SIZE(left),AOP_SIZE(right));
+  size = max (AOP_SIZE (left), AOP_SIZE (right));
 
-    DEBUGpic16_pic16_AopType(__LINE__,left,right,result);
+  DEBUGpic16_pic16_AopType (__LINE__, left, right, result);
 
-    /* if literal, literal on the right or
-    if the right is in a pointer register and left
-    is not */
-    if ((AOP_TYPE(IC_LEFT(ic)) == AOP_LIT)) {
-      operand *tmp = right ;
+  /* if literal, literal on the right or
+     if the right is in a pointer register and left
+     is not */
+  if ((AOP_TYPE (IC_LEFT (ic)) == AOP_LIT))
+    {
+      operand *tmp = right;
       right = left;
       left = tmp;
     }
 
 
-    if(ifx && !AOP_SIZE(result)){
-        symbol *tlbl;
-        DEBUGpic16_emitcode ("; ***","%s  %d CASE 1",__FUNCTION__,__LINE__);
-        /* if they are both bit variables */
-        if (AOP_TYPE(left) == AOP_CRY &&
-            ((AOP_TYPE(right) == AOP_CRY) || (AOP_TYPE(right) == AOP_LIT))) {
-                DEBUGpic16_emitcode ("; ***","%s  %d CASE 11",__FUNCTION__,__LINE__);
-            if(AOP_TYPE(right) == AOP_LIT){
-                unsigned long lit = ulFromVal (AOP(right)->aopu.aop_lit);
-                if(lit == 0L){
-                    pic16_emitcode("mov","c,%s",AOP(left)->aopu.aop_dir);
-                    pic16_emitcode("cpl","c");
-                } else if(lit == 1L) {
-                    pic16_emitcode("mov","c,%s",AOP(left)->aopu.aop_dir);
-                } else {
-                    pic16_emitcode("clr","c");
-                }
-                /* AOP_TYPE(right) == AOP_CRY */
-            } else {
-                symbol *lbl = newiTempLabel(NULL);
-                pic16_emitcode("mov","c,%s",AOP(left)->aopu.aop_dir);
-                pic16_emitcode("jb","%s,%05d_DS_",AOP(right)->aopu.aop_dir,(lbl->key+100));
-                pic16_emitcode("cpl","c");
-                pic16_emitcode("","%05d_DS_:",(lbl->key+100));
-            }
-            /* if true label then we jump if condition
-            supplied is true */
-            tlbl = newiTempLabel(NULL);
-            if ( IC_TRUE(ifx) ) {
-                pic16_emitcode("jnc","%05d_DS_",tlbl->key+100);
-                pic16_emitcode("ljmp","%05d_DS_",IC_TRUE(ifx)->key+100);
-            } else {
-                pic16_emitcode("jc","%05d_DS_",tlbl->key+100);
-                pic16_emitcode("ljmp","%05d_DS_",IC_FALSE(ifx)->key+100);
-            }
-            pic16_emitcode("","%05d_DS_:",tlbl->key+100+pic16_labelOffset);
-
-                {
-                /* left and right are both bit variables, result is carry */
-                        resolvedIfx rIfx;
-
-                        resolveIfx(&rIfx,ifx);
-
-                        pic16_emitpcode(POC_MOVLW,pic16_popGet(AOP(left),0));
-                        pic16_emitpcode(POC_ANDFW,pic16_popGet(AOP(left),0));
-                        pic16_emitpcode(POC_BTFSC,pic16_popGet(AOP(right),0));
-                        pic16_emitpcode(POC_ANDLW,pic16_popGet(AOP(left),0));
-                        genSkipz2(&rIfx,0);
-                }
-        } else {
-
-                        DEBUGpic16_emitcode ("; ***","%s  %d CASE 12",__FUNCTION__,__LINE__);
-
-                        /* They're not both bit variables. Is the right a literal? */
-                        if(AOP_TYPE(right) == AOP_LIT) {
-                        lit = ulFromVal (AOP(right)->aopu.aop_lit);
-
-                        switch(size) {
-
-                                case 1:
-                                        switch(lit & 0xff) {
-                                                case 1:
-                                                                if ( IC_TRUE(ifx) ) {
-                                                                        pic16_emitpcode(POC_DECFW,pic16_popGet(AOP(left),offset));
-                                                                        emitSKPNZ;
-                                                                        pic16_emitpcode(POC_GOTO,pic16_popGetLabel(IC_TRUE(ifx)->key));
-                                                                } else {
-                                                                        pic16_emitpcode(POC_DECFSZW,pic16_popGet(AOP(left),offset));
-                                                                        pic16_emitpcode(POC_GOTO,pic16_popGetLabel(IC_FALSE(ifx)->key));
-                                                                }
-                                                                break;
-                                                case 0xff:
-                                                                if ( IC_TRUE(ifx) ) {
-                                                                        pic16_emitpcode(POC_INCFW,pic16_popGet(AOP(left),offset));
-                                                                        emitSKPNZ;
-                                                                        pic16_emitpcode(POC_GOTO,pic16_popGetLabel(IC_TRUE(ifx)->key));
-                                                                } else {
-                                                                        pic16_emitpcode(POC_INCFSZW,pic16_popGet(AOP(left),offset));
-                                                                        pic16_emitpcode(POC_GOTO,pic16_popGetLabel(IC_FALSE(ifx)->key));
-                                                                }
-                                                                break;
-                                                default:
-                                                                pic16_emitpcode(POC_MOVFW,pic16_popGet(AOP(left),offset));
-                                                                if(lit)
-                                                                        pic16_emitpcode(POC_XORLW,pic16_popGetLit(lit & 0xff));
-                                                                genSkip(ifx,'z');
-                                        } // switch lit
-
-
-                                        /* end of size == 1 */
-                                        break;
-
-                                case 2:
-                                        genc16bit2lit(left,lit,offset);
-                                        genSkip(ifx,'z');
-                                        break;
-                                        /* end of size == 2 */
-
-                                default:
-                                        /* size is 4 */
-                                        if(lit==0) {
-                                                pic16_emitpcode(POC_MOVFW,pic16_popGet(AOP(left),0));
-                                                pic16_emitpcode(POC_IORFW,pic16_popGet(AOP(left),1));
-                                                pic16_emitpcode(POC_IORFW,pic16_popGet(AOP(left),2));
-                                                pic16_emitpcode(POC_IORFW,pic16_popGet(AOP(left),3));
-                                                genSkip(ifx,'z');
-                                        } else {
-                                                /* search for patterns that can be optimized */
-
-                                                genc16bit2lit(left,lit,0);
-                                                lit >>= 16;
-                                                if(lit) {
-                                                                if(IC_TRUE(ifx))
-                                                                emitSKPZ; // if hi word unequal
-                                                                else
-                                                                emitSKPNZ; // if hi word equal
-                                                                // fail early
-                                                        pic16_emitpcode(POC_GOTO,pic16_popGetLabel(falselbl->key));
-                                                        genc16bit2lit(left,lit,2);
-                                                        genSkip(ifx,'z');
-                                                } else {
-                                                        pic16_emitpcode(POC_IORFW,pic16_popGet(AOP(left),2));
-                                                        pic16_emitpcode(POC_IORFW,pic16_popGet(AOP(left),3));
-                                                        genSkip(ifx,'z');
-                                                }
-                                        }
-                                                pic16_emitpLabel(falselbl->key);
-                                                break;
-
-                        } // switch size
-
-                        ifx->generated = 1;
-                        goto release ;
-
-
-          } else if(AOP_TYPE(right) == AOP_CRY ) {
-            /* we know the left is not a bit, but that the right is */
-            pic16_emitpcode(POC_MOVFW,pic16_popGet(AOP(left),offset));
-            pic16_emitpcode( ( (IC_TRUE(ifx)) ? POC_BTFSC : POC_BTFSS),
-                      pic16_popGet(AOP(right),offset));
-            pic16_emitpcode(POC_XORLW,pic16_popGetLit(1));
-
-            /* if the two are equal, then W will be 0 and the Z bit is set
-             * we could test Z now, or go ahead and check the high order bytes if
-             * the variable we're comparing is larger than a byte. */
+  if (ifx && !AOP_SIZE (result))
+    {
+      symbol *tlbl;
+      DEBUGpic16_emitcode ("; ***", "%s  %d CASE 1", __FUNCTION__, __LINE__);
+      /* if they are both bit variables */
+      if (AOP_TYPE (left) == AOP_CRY && ((AOP_TYPE (right) == AOP_CRY) || (AOP_TYPE (right) == AOP_LIT)))
+        {
+          DEBUGpic16_emitcode ("; ***", "%s  %d CASE 11", __FUNCTION__, __LINE__);
+          if (AOP_TYPE (right) == AOP_LIT)
+            {
+              unsigned long lit = ulFromVal (AOP (right)->aopu.aop_lit);
+              if (lit == 0L)
+                {
+                  pic16_emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir);
+                  pic16_emitcode ("cpl", "c");
+                }
+              else if (lit == 1L)
+                {
+                  pic16_emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir);
+                }
+              else
+                {
+                  pic16_emitcode ("clr", "c");
+                }
+              /* AOP_TYPE(right) == AOP_CRY */
+            }
+          else
+            {
+              symbol *lbl = newiTempLabel (NULL);
+              pic16_emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir);
+              pic16_emitcode ("jb", "%s,%05d_DS_", AOP (right)->aopu.aop_dir, labelKey2num (lbl->key));
+              pic16_emitcode ("cpl", "c");
+              pic16_emitcode ("", "%05d_DS_:", labelKey2num (lbl->key));
+            }
+          /* if true label then we jump if condition
+             supplied is true */
+          tlbl = newiTempLabel (NULL);
+          if (IC_TRUE (ifx))
+            {
+              pic16_emitcode ("jnc", "%05d_DS_", labelKey2num (tlbl->key));
+              pic16_emitcode ("ljmp", "%05d_DS_", labelKey2num (IC_TRUE (ifx)->key));
+            }
+          else
+            {
+              pic16_emitcode ("jc", "%05d_DS_", labelKey2num (tlbl->key));
+              pic16_emitcode ("ljmp", "%05d_DS_", labelKey2num (IC_FALSE (ifx)->key));
+            }
+          pic16_emitcode ("", "%05d_DS_:", labelKey2num (tlbl->key + pic16_labelOffset));
 
-            while(--size)
-              pic16_emitpcode(POC_IORFW,pic16_popGet(AOP(left),offset));
+          {
+            /* left and right are both bit variables, result is carry */
+            resolvedIfx rIfx;
 
-            if ( IC_TRUE(ifx) ) {
-              emitSKPNZ;
-              pic16_emitpcode(POC_GOTO,pic16_popGetLabel(IC_TRUE(ifx)->key));
-              // pic16_emitcode(" goto","_%05d_DS_",IC_TRUE(ifx)->key+100+pic16_labelOffset);
-            } else {
-              emitSKPZ;
-              pic16_emitpcode(POC_GOTO,pic16_popGetLabel(IC_FALSE(ifx)->key));
-              // pic16_emitcode(" goto","_%05d_DS_",IC_FALSE(ifx)->key+100+pic16_labelOffset);
-            }
-
-          } else {
-            /* They're both variables that are larger than bits */
-            int s = size;
-
-            tlbl = newiTempLabel(NULL);
-
-            while(size--) {
-              pic16_emitpcode(POC_MOVFW,pic16_popGet(AOP(left),offset));
-              pic16_emitpcode(POC_XORFW,pic16_popGet(AOP(right),offset));
+            resolveIfx (&rIfx, ifx);
 
-              if ( IC_TRUE(ifx) ) {
-                if(size) {
-                  emitSKPZ;
+            pic16_emitpcode (POC_MOVLW, pic16_popGet (AOP (left), 0));
+            pic16_emitpcode (POC_ANDFW, pic16_popGet (AOP (left), 0));
+            pic16_emitpcode (POC_BTFSC, pic16_popGet (AOP (right), 0));
+            pic16_emitpcode (POC_ANDLW, pic16_popGet (AOP (left), 0));
+            genSkipz2 (&rIfx, 0);
+          }
+        }
+      else
+        {
 
-                        DEBUGpic16_emitcode (";","\tIC_TRUE emitSKPZ");
+          DEBUGpic16_emitcode ("; ***", "%s  %d CASE 12", __FUNCTION__, __LINE__);
 
-                  pic16_emitpcode(POC_GOTO,pic16_popGetLabel(tlbl->key));
-                  pic16_emitcode(" goto","_%05d_DS_",tlbl->key+100+pic16_labelOffset);
-                } else {
-                  emitSKPNZ;
+          /* They're not both bit variables. Is the right a literal? */
+          if (AOP_TYPE (right) == AOP_LIT)
+            {
+              lit = ulFromVal (AOP (right)->aopu.aop_lit);
+
+              switch (size)
+                {
+
+                case 1:
+                  switch (lit & 0xff)
+                    {
+                    case 1:
+                      if (IC_TRUE (ifx))
+                        {
+                          pic16_emitpcode (POC_DECFW, pic16_popGet (AOP (left), offset));
+                          emitSKPNZ;
+                          pic16_emitpcode (POC_GOTO, pic16_popGetLabel (IC_TRUE (ifx)->key));
+                        }
+                      else
+                        {
+                          pic16_emitpcode (POC_DECFSZW, pic16_popGet (AOP (left), offset));
+                          pic16_emitpcode (POC_GOTO, pic16_popGetLabel (IC_FALSE (ifx)->key));
+                        }
+                      break;
+                    case 0xff:
+                      if (IC_TRUE (ifx))
+                        {
+                          pic16_emitpcode (POC_INCFW, pic16_popGet (AOP (left), offset));
+                          emitSKPNZ;
+                          pic16_emitpcode (POC_GOTO, pic16_popGetLabel (IC_TRUE (ifx)->key));
+                        }
+                      else
+                        {
+                          pic16_emitpcode (POC_INCFSZW, pic16_popGet (AOP (left), offset));
+                          pic16_emitpcode (POC_GOTO, pic16_popGetLabel (IC_FALSE (ifx)->key));
+                        }
+                      break;
+                    default:
+                      pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (left), offset));
+                      if (lit)
+                        pic16_emitpcode (POC_XORLW, pic16_popGetLit (lit & 0xff));
+                      genSkip (ifx, 'z');
+                    }           // switch lit
+
+
+                  /* end of size == 1 */
+                  break;
+
+                case 2:
+                  genc16bit2lit (left, lit, offset);
+                  genSkip (ifx, 'z');
+                  break;
+                  /* end of size == 2 */
+
+                default:
+                  /* size is 4 */
+                  if (lit == 0)
+                    {
+                      pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (left), 0));
+                      pic16_emitpcode (POC_IORFW, pic16_popGet (AOP (left), 1));
+                      pic16_emitpcode (POC_IORFW, pic16_popGet (AOP (left), 2));
+                      pic16_emitpcode (POC_IORFW, pic16_popGet (AOP (left), 3));
+                      genSkip (ifx, 'z');
+                    }
+                  else
+                    {
+                      /* search for patterns that can be optimized */
+
+                      genc16bit2lit (left, lit, 0);
+                      lit >>= 16;
+                      if (lit)
+                        {
+                          if (IC_TRUE (ifx))
+                            emitSKPZ;   // if hi word unequal
+                          else
+                            emitSKPNZ;  // if hi word equal
+                          // fail early
+                          pic16_emitpcode (POC_GOTO, pic16_popGetLabel (falselbl->key));
+                          genc16bit2lit (left, lit, 2);
+                          genSkip (ifx, 'z');
+                        }
+                      else
+                        {
+                          pic16_emitpcode (POC_IORFW, pic16_popGet (AOP (left), 2));
+                          pic16_emitpcode (POC_IORFW, pic16_popGet (AOP (left), 3));
+                          genSkip (ifx, 'z');
+                        }
+                    }
+                  pic16_emitpLabel (falselbl->key);
+                  break;
+
+                }               // switch size
+
+              ifx->generated = 1;
+              goto release;
+
+
+            }
+          else if (AOP_TYPE (right) == AOP_CRY)
+            {
+              /* we know the left is not a bit, but that the right is */
+              pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (left), offset));
+              pic16_emitpcode (((IC_TRUE (ifx)) ? POC_BTFSC : POC_BTFSS), pic16_popGet (AOP (right), offset));
+              pic16_emitpcode (POC_XORLW, pic16_popGetLit (1));
 
-                        DEBUGpic16_emitcode (";","\tIC_TRUE emitSKPNZ");
+              /* if the two are equal, then W will be 0 and the Z bit is set
+               * we could test Z now, or go ahead and check the high order bytes if
+               * the variable we're comparing is larger than a byte. */
 
+              while (--size)
+                pic16_emitpcode (POC_IORFW, pic16_popGet (AOP (left), offset));
 
-                  pic16_emitpcode(POC_GOTO,pic16_popGetLabel(IC_TRUE(ifx)->key));
-                  pic16_emitcode(" goto","_%05d_DS_",IC_TRUE(ifx)->key+100+pic16_labelOffset);
+              if (IC_TRUE (ifx))
+                {
+                  emitSKPNZ;
+                  pic16_emitpcode (POC_GOTO, pic16_popGetLabel (IC_TRUE (ifx)->key));
+                  // pic16_emitcode(" goto","_%05d_DS_",labelKey2num (IC_TRUE(ifx)->key + pic16_labelOffset));
                 }
-              } else {
-                emitSKPZ;
+              else
+                {
+                  emitSKPZ;
+                  pic16_emitpcode (POC_GOTO, pic16_popGetLabel (IC_FALSE (ifx)->key));
+                  // pic16_emitcode(" goto","_%05d_DS_",labelKey2num (IC_FALSE(ifx)->key + pic16_labelOffset));
+                }
+
+            }
+          else
+            {
+              /* They're both variables that are larger than bits */
+              int s = size;
 
-                        DEBUGpic16_emitcode (";","\tnot IC_TRUE emitSKPZ");
+              tlbl = newiTempLabel (NULL);
 
-                pic16_emitpcode(POC_GOTO,pic16_popGetLabel(IC_FALSE(ifx)->key));
-                pic16_emitcode(" goto","_%05d_DS_",IC_FALSE(ifx)->key+100+pic16_labelOffset);
-              }
-              offset++;
+              while (size--)
+                {
+                  pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (left), offset));
+                  pic16_emitpcode (POC_XORFW, pic16_popGet (AOP (right), offset));
+
+                  if (IC_TRUE (ifx))
+                    {
+                      if (size)
+                        {
+                          emitSKPZ;
+
+                          DEBUGpic16_emitcode (";", "\tIC_TRUE emitSKPZ");
+
+                          pic16_emitpcode (POC_GOTO, pic16_popGetLabel (tlbl->key));
+                          pic16_emitcode (" goto", "_%05d_DS_", labelKey2num (tlbl->key + pic16_labelOffset));
+                        }
+                      else
+                        {
+                          emitSKPNZ;
+
+                          DEBUGpic16_emitcode (";", "\tIC_TRUE emitSKPNZ");
+
+
+                          pic16_emitpcode (POC_GOTO, pic16_popGetLabel (IC_TRUE (ifx)->key));
+                          pic16_emitcode (" goto", "_%05d_DS_", labelKey2num (IC_TRUE (ifx)->key + pic16_labelOffset));
+                        }
+                    }
+                  else
+                    {
+                      emitSKPZ;
+
+                      DEBUGpic16_emitcode (";", "\tnot IC_TRUE emitSKPZ");
+
+                      pic16_emitpcode (POC_GOTO, pic16_popGetLabel (IC_FALSE (ifx)->key));
+                      pic16_emitcode (" goto", "_%05d_DS_", labelKey2num (IC_FALSE (ifx)->key + pic16_labelOffset));
+                    }
+                  offset++;
+                }
+              if (s > 1 && IC_TRUE (ifx))
+                {
+                  pic16_emitpLabel (tlbl->key);
+                  pic16_emitcode ("", "_%05d_DS_:", labelKey2num (tlbl->key + pic16_labelOffset));
+                }
+            }
+        }
+      /* mark the icode as generated */
+      ifx->generated = 1;
+      goto release;
+    }
+
+  /* if they are both bit variables */
+  if (AOP_TYPE (left) == AOP_CRY && ((AOP_TYPE (right) == AOP_CRY) || (AOP_TYPE (right) == AOP_LIT)))
+    {
+      DEBUGpic16_emitcode ("; ***", "%s  %d CASE 2", __FUNCTION__, __LINE__);
+      if (AOP_TYPE (right) == AOP_LIT)
+        {
+          unsigned long lit = ulFromVal (AOP (right)->aopu.aop_lit);
+          if (lit == 0L)
+            {
+              pic16_emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir);
+              pic16_emitcode ("cpl", "c");
             }
-            if(s>1 && IC_TRUE(ifx)) {
-              pic16_emitpLabel(tlbl->key);
-              pic16_emitcode("","_%05d_DS_:",tlbl->key+100+pic16_labelOffset);
+          else if (lit == 1L)
+            {
+              pic16_emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir);
             }
-          }
+          else
+            {
+              pic16_emitcode ("clr", "c");
+            }
+          /* AOP_TYPE(right) == AOP_CRY */
+        }
+      else
+        {
+          symbol *lbl = newiTempLabel (NULL);
+          pic16_emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir);
+          pic16_emitcode ("jb", "%s,%05d_DS_", AOP (right)->aopu.aop_dir, labelKey2num (lbl->key));
+          pic16_emitcode ("cpl", "c");
+          pic16_emitcode ("", "%05d_DS_:", labelKey2num (lbl->key));
+        }
+      /* c = 1 if egal */
+      if (AOP_TYPE (result) == AOP_CRY && AOP_SIZE (result))
+        {
+          pic16_outBitC (result);
+          goto release;
+        }
+      if (ifx)
+        {
+          genIfxJump (ifx, "c");
+          goto release;
         }
-        /* mark the icode as generated */
-        ifx->generated = 1;
-        goto release ;
-    }
-
-    /* if they are both bit variables */
-    if (AOP_TYPE(left) == AOP_CRY &&
-        ((AOP_TYPE(right) == AOP_CRY) || (AOP_TYPE(right) == AOP_LIT))) {
-        DEBUGpic16_emitcode ("; ***","%s  %d CASE 2",__FUNCTION__,__LINE__);
-        if(AOP_TYPE(right) == AOP_LIT){
-            unsigned long lit = ulFromVal (AOP(right)->aopu.aop_lit);
-            if(lit == 0L){
-                pic16_emitcode("mov","c,%s",AOP(left)->aopu.aop_dir);
-                pic16_emitcode("cpl","c");
-            } else if(lit == 1L) {
-                pic16_emitcode("mov","c,%s",AOP(left)->aopu.aop_dir);
-            } else {
-                pic16_emitcode("clr","c");
-            }
-            /* AOP_TYPE(right) == AOP_CRY */
-        } else {
-            symbol *lbl = newiTempLabel(NULL);
-            pic16_emitcode("mov","c,%s",AOP(left)->aopu.aop_dir);
-            pic16_emitcode("jb","%s,%05d_DS_",AOP(right)->aopu.aop_dir,(lbl->key+100));
-            pic16_emitcode("cpl","c");
-            pic16_emitcode("","%05d_DS_:",(lbl->key+100));
-        }
-        /* c = 1 if egal */
-        if (AOP_TYPE(result) == AOP_CRY && AOP_SIZE(result)){
-            pic16_outBitC(result);
-            goto release ;
-        }
-        if (ifx) {
-            genIfxJump (ifx,"c");
-            goto release ;
-        }
-        /* if the result is used in an arithmetic operation
-        then put the result in place */
-        pic16_outBitC(result);
-    } else {
+      /* if the result is used in an arithmetic operation
+         then put the result in place */
+      pic16_outBitC (result);
+    }
+  else
+    {
 
-      DEBUGpic16_emitcode ("; ***","%s  %d CASE 3",__FUNCTION__,__LINE__);
-      gencjne(left,right,result,ifx);
-/*
-      if(ifx)
-        gencjne(left,right,newiTempLabel(NULL));
-      else {
-        if(IC_TRUE(ifx)->key)
-          gencjne(left,right,IC_TRUE(ifx)->key);
-        else
-          gencjne(left,right,IC_FALSE(ifx)->key);
-        ifx->generated = 1;
-        goto release ;
-      }
-      if (AOP_TYPE(result) == AOP_CRY && AOP_SIZE(result)) {
-        pic16_aopPut(AOP(result),"a",0);
-        goto release ;
-      }
+      DEBUGpic16_emitcode ("; ***", "%s  %d CASE 3", __FUNCTION__, __LINE__);
+      gencjne (left, right, result, ifx);
+      /*
+         if(ifx)
+         gencjne(left,right,newiTempLabel(NULL));
+         else {
+         if(IC_TRUE(ifx)->key)
+         gencjne(left,right,IC_TRUE(ifx)->key);
+         else
+         gencjne(left,right,IC_FALSE(ifx)->key);
+         ifx->generated = 1;
+         goto release ;
+         }
+         if (AOP_TYPE(result) == AOP_CRY && AOP_SIZE(result)) {
+         pic16_aopPut(AOP(result),"a",0);
+         goto release ;
+         }
 
-      if (ifx) {
-        genIfxJump (ifx,"a");
-        goto release ;
-      }
-*/
+         if (ifx) {
+         genIfxJump (ifx,"a");
+         goto release ;
+         }
+       */
       /* if the result is used in an arithmetic operation
          then put the result in place */
-/*
-      if (AOP_TYPE(result) != AOP_CRY)
-        pic16_outAcc(result);
-*/
+      /*
+         if (AOP_TYPE(result) != AOP_CRY)
+         pic16_outAcc(result);
+       */
       /* leave the result in acc */
     }
 
 release:
-    pic16_freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    pic16_freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    pic16_freeAsmop(result,NULL,ic,TRUE);
+  pic16_freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 #endif
 
 /*-----------------------------------------------------------------*/
-/* ifxForOp - returns the icode containing the ifx for operand     */
+/* genAndOp - for && operation                                     */
 /*-----------------------------------------------------------------*/
-static iCode *ifxForOp ( operand *op, iCode *ic )
+static void
+genAndOp (iCode * ic)
 {
-  FENTRY2;
-
-    /* if true symbol then needs to be assigned */
-    if (IS_TRUE_SYMOP(op))
-        return NULL ;
-
-    /* if this has register type condition and
-    the next instruction is ifx with the same operand
-    and live to of the operand is upto the ifx only then */
-    if (ic->next
-        && ic->next->op == IFX
-        && IC_COND(ic->next)->key == op->key
-        && OP_SYMBOL(op)->liveTo <= ic->next->seq
-        ) {
-                DEBUGpic16_emitcode(";", "%d %s", __LINE__, __FUNCTION__);
-          return ic->next;
-    }
-
-    /*
-    if (ic->next &&
-        ic->next->op == IFX &&
-        IC_COND(ic->next)->key == op->key) {
-      DEBUGpic16_emitcode ("; WARNING ","%d IGNORING liveTo range in %s",__LINE__,__FUNCTION__);
-      return ic->next;
-    }
-    */
-
-    DEBUGpic16_emitcode ("; NULL :(","%d",__LINE__);
-    if (ic->next &&
-        ic->next->op == IFX)
-      DEBUGpic16_emitcode ("; ic-next"," is an IFX");
-
-    if (ic->next &&
-        ic->next->op == IFX &&
-        IC_COND(ic->next)->key == op->key) {
-      DEBUGpic16_emitcode ("; "," key is okay");
-      DEBUGpic16_emitcode ("; "," key liveTo %d, next->seq = %d",
-                           OP_SYMBOL(op)->liveTo,
-                           ic->next->seq);
-    }
-
-#if 0
-    /* the code below is completely untested
-     * it just allows ulong2fs.c compile -- VR */
-
-    ic = ic->next;
-    fprintf(stderr, "WARNING (%s:%s:%d) untested hack might produce wrong code\n",
-                                        __FILE__, __FUNCTION__, __LINE__);
-
-    /* if this has register type condition and
-    the next instruction is ifx with the same operand
-    and live to of the operand is upto the ifx only then */
-    if (ic->next &&
-        ic->next->op == IFX &&
-        IC_COND(ic->next)->key == op->key &&
-        OP_SYMBOL(op)->liveTo <= ic->next->seq )
-        return ic->next;
-
-    if (ic->next &&
-        ic->next->op == IFX &&
-        IC_COND(ic->next)->key == op->key) {
-      DEBUGpic16_emitcode ("; WARNING ","%d IGNORING liveTo range in %s",__LINE__,__FUNCTION__);
-      return ic->next;
-    }
-
-    fprintf(stderr, "WARNING (%s:%s:%d) untested hack might produce wrong code (returning NULL)\n",
-                                        __FILE__, __FUNCTION__, __LINE__);
+  operand *left, *right, *result;
+  /*     symbol *tlbl; */
 
-//  return ic->next->next;              /* this just might work */ /* FIXME FIXME */
-#endif
+  FENTRY;
 
-    return NULL;
-}
-/*-----------------------------------------------------------------*/
-/* genAndOp - for && operation                                     */
-/*-----------------------------------------------------------------*/
-static void genAndOp (iCode *ic)
-{
-  operand *left,*right, *result;
-/*     symbol *tlbl; */
+  /* note here that && operations that are in an
+     if statement are taken away by backPatchLabels
+     only those used in arthmetic operations remain */
+  pic16_aopOp ((left = IC_LEFT (ic)), ic, FALSE);
+  pic16_aopOp ((right = IC_RIGHT (ic)), ic, FALSE);
+  pic16_aopOp ((result = IC_RESULT (ic)), ic, TRUE);
 
-    FENTRY;
+  DEBUGpic16_pic16_AopType (__LINE__, left, right, result);
 
-    /* note here that && operations that are in an
-    if statement are taken away by backPatchLabels
-    only those used in arthmetic operations remain */
-    pic16_aopOp((left=IC_LEFT(ic)),ic,FALSE);
-    pic16_aopOp((right=IC_RIGHT(ic)),ic,FALSE);
-    pic16_aopOp((result=IC_RESULT(ic)),ic,TRUE);
-
-    DEBUGpic16_pic16_AopType(__LINE__,left,right,result);
-
-    pic16_emitpcode(POC_MOVFW,pic16_popGet(AOP(left),0));
-    pic16_emitpcode(POC_ANDFW,pic16_popGet(AOP(right),0));
-    pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),0));
-
-    /* if both are bit variables */
-/*     if (AOP_TYPE(left) == AOP_CRY && */
-/*         AOP_TYPE(right) == AOP_CRY ) { */
-/*         pic16_emitcode("mov","c,%s",AOP(left)->aopu.aop_dir); */
-/*         pic16_emitcode("anl","c,%s",AOP(right)->aopu.aop_dir); */
-/*         pic16_outBitC(result); */
-/*     } else { */
-/*         tlbl = newiTempLabel(NULL); */
-/*         pic16_toBoolean(left);     */
-/*         pic16_emitcode("jz","%05d_DS_",tlbl->key+100); */
-/*         pic16_toBoolean(right); */
-/*         pic16_emitcode("","%05d_DS_:",tlbl->key+100); */
-/*         pic16_outBitAcc(result); */
-/*     } */
-
-    pic16_freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    pic16_freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    pic16_freeAsmop(result,NULL,ic,TRUE);
+  pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (left), 0));
+  pic16_emitpcode (POC_ANDFW, pic16_popGet (AOP (right), 0));
+  pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 0));
+
+  /* if both are bit variables */
+  /*     if (AOP_TYPE(left) == AOP_CRY && */
+  /*         AOP_TYPE(right) == AOP_CRY ) { */
+  /*         pic16_emitcode("mov","c,%s",AOP(left)->aopu.aop_dir); */
+  /*         pic16_emitcode("anl","c,%s",AOP(right)->aopu.aop_dir); */
+  /*         pic16_outBitC(result); */
+  /*     } else { */
+  /*         tlbl = newiTempLabel(NULL); */
+  /*         pic16_toBoolean(left);     */
+  /*         pic16_emitcode("jz","%05d_DS_",labelKey2num (tlbl->key)); */
+  /*         pic16_toBoolean(right); */
+  /*         pic16_emitcode("","%05d_DS_:",labelKey2num (tlbl->key)); */
+  /*         pic16_outBitAcc(result); */
+  /*     } */
+
+  pic16_freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 
@@ -5254,117 +5799,125 @@
   modified this code, but it doesn't appear to ever get called
 */
 
-static void genOrOp (iCode *ic)
+static void
+genOrOp (iCode * ic)
 {
-  operand *left,*right, *result;
+  operand *left, *right, *result;
   symbol *tlbl;
 
-    FENTRY;
+  FENTRY;
 
   /* note here that || operations that are in an
-    if statement are taken away by backPatchLabels
-    only those used in arthmetic operations remain */
-    pic16_aopOp((left=IC_LEFT(ic)),ic,FALSE);
-    pic16_aopOp((right=IC_RIGHT(ic)),ic,FALSE);
-    pic16_aopOp((result=IC_RESULT(ic)),ic,TRUE);
-
-    DEBUGpic16_pic16_AopType(__LINE__,left,right,result);
-
-    /* if both are bit variables */
-    if (AOP_TYPE(left) == AOP_CRY &&
-        AOP_TYPE(right) == AOP_CRY ) {
-      pic16_emitcode("clrc","");
-      pic16_emitcode("btfss","(%s >> 3), (%s & 7)",
-               AOP(left)->aopu.aop_dir,
-               AOP(left)->aopu.aop_dir);
-      pic16_emitcode("btfsc","(%s >> 3), (%s & 7)",
-               AOP(right)->aopu.aop_dir,
-               AOP(right)->aopu.aop_dir);
-      pic16_emitcode("setc","");
-
-    } else {
-        tlbl = newiTempLabel(NULL);
-        pic16_toBoolean(left);
-        emitSKPZ;
-        pic16_emitcode("goto","%05d_DS_",tlbl->key+100+pic16_labelOffset);
-        pic16_toBoolean(right);
-        pic16_emitcode("","%05d_DS_:",tlbl->key+100+pic16_labelOffset);
+     if statement are taken away by backPatchLabels
+     only those used in arthmetic operations remain */
+  pic16_aopOp ((left = IC_LEFT (ic)), ic, FALSE);
+  pic16_aopOp ((right = IC_RIGHT (ic)), ic, FALSE);
+  pic16_aopOp ((result = IC_RESULT (ic)), ic, TRUE);
+
+  DEBUGpic16_pic16_AopType (__LINE__, left, right, result);
+
+  /* if both are bit variables */
+  if (AOP_TYPE (left) == AOP_CRY && AOP_TYPE (right) == AOP_CRY)
+    {
+      pic16_emitcode ("clrc", "");
+      pic16_emitcode ("btfss", "(%s >> 3), (%s & 7)", AOP (left)->aopu.aop_dir, AOP (left)->aopu.aop_dir);
+      pic16_emitcode ("btfsc", "(%s >> 3), (%s & 7)", AOP (right)->aopu.aop_dir, AOP (right)->aopu.aop_dir);
+      pic16_emitcode ("setc", "");
+
+    }
+  else
+    {
+      tlbl = newiTempLabel (NULL);
+      pic16_toBoolean (left);
+      emitSKPZ;
+      pic16_emitcode ("goto", "%05d_DS_", labelKey2num (tlbl->key + pic16_labelOffset));
+      pic16_toBoolean (right);
+      pic16_emitcode ("", "%05d_DS_:", labelKey2num (tlbl->key + pic16_labelOffset));
 
-        pic16_outBitAcc(result);
+      pic16_outBitAcc (result);
     }
 
-    pic16_freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    pic16_freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-    pic16_freeAsmop(result,NULL,ic,TRUE);
+  pic16_freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* isLiteralBit - test if lit == 2^n                               */
 /*-----------------------------------------------------------------*/
-static int isLiteralBit(unsigned long lit)
+static int
+isLiteralBit (unsigned long lit)
 {
-    unsigned long pw[32] = {1L,2L,4L,8L,16L,32L,64L,128L,
-    0x100L,0x200L,0x400L,0x800L,
-    0x1000L,0x2000L,0x4000L,0x8000L,
-    0x10000L,0x20000L,0x40000L,0x80000L,
-    0x100000L,0x200000L,0x400000L,0x800000L,
-    0x1000000L,0x2000000L,0x4000000L,0x8000000L,
-    0x10000000L,0x20000000L,0x40000000L,0x80000000L};
-    int idx;
-
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    for(idx = 0; idx < 32; idx++)
-        if(lit == pw[idx])
-            return idx+1;
-    return 0;
+  unsigned long pw[32] = { 1L, 2L, 4L, 8L, 16L, 32L, 64L, 128L,
+                           0x100L, 0x200L, 0x400L, 0x800L,
+                           0x1000L, 0x2000L, 0x4000L, 0x8000L,
+                           0x10000L, 0x20000L, 0x40000L, 0x80000L,
+                           0x100000L, 0x200000L, 0x400000L, 0x800000L,
+                           0x1000000L, 0x2000000L, 0x4000000L, 0x8000000L,
+                           0x10000000L, 0x20000000L, 0x40000000L, 0x80000000L
+                         };
+  int idx;
+
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  for (idx = 0; idx < 32; idx++)
+    if (lit == pw[idx])
+      return idx + 1;
+  return 0;
 }
 
 /*-----------------------------------------------------------------*/
 /* continueIfTrue -                                                */
 /*-----------------------------------------------------------------*/
-static void continueIfTrue (iCode *ic)
+static void
+continueIfTrue (iCode * ic)
 {
   FENTRY;
-  if(IC_TRUE(ic))
-    pic16_emitcode("ljmp","%05d_DS_",IC_TRUE(ic)->key+100);
+  if (IC_TRUE (ic))
+    pic16_emitcode ("ljmp", "%05d_DS_", labelKey2num (IC_TRUE (ic)->key));
   ic->generated = 1;
 }
 
 /*-----------------------------------------------------------------*/
 /* jmpIfTrue -                                                     */
 /*-----------------------------------------------------------------*/
-static void jumpIfTrue (iCode *ic)
+static void
+jumpIfTrue (iCode * ic)
 {
   FENTRY;
-  if(!IC_TRUE(ic))
-    pic16_emitcode("ljmp","%05d_DS_",IC_FALSE(ic)->key+100);
+  if (!IC_TRUE (ic))
+    pic16_emitcode ("ljmp", "%05d_DS_", labelKey2num (IC_FALSE (ic)->key));
   ic->generated = 1;
 }
 
 /*-----------------------------------------------------------------*/
 /* jmpTrueOrFalse -                                                */
 /*-----------------------------------------------------------------*/
-static void jmpTrueOrFalse (iCode *ic, symbol *tlbl)
+static void
+jmpTrueOrFalse (iCode * ic, symbol * tlbl)
 {
   // ugly but optimized by peephole
   FENTRY;
-  if(IC_TRUE(ic)){
-    symbol *nlbl = newiTempLabel(NULL);
-      pic16_emitcode("sjmp","%05d_DS_",nlbl->key+100);
-      pic16_emitcode("","%05d_DS_:",tlbl->key+100);
-      pic16_emitcode("ljmp","%05d_DS_",IC_TRUE(ic)->key+100);
-      pic16_emitcode("","%05d_DS_:",nlbl->key+100);
-  } else {
-    pic16_emitcode("ljmp","%05d_DS_",IC_FALSE(ic)->key+100);
-    pic16_emitcode("","%05d_DS_:",tlbl->key+100);
-  }
+  if (IC_TRUE (ic))
+    {
+      symbol *nlbl = newiTempLabel (NULL);
+      pic16_emitcode ("sjmp", "%05d_DS_", labelKey2num (nlbl->key));
+      pic16_emitcode ("", "%05d_DS_:", labelKey2num (tlbl->key));
+      pic16_emitcode ("ljmp", "%05d_DS_", labelKey2num (IC_TRUE (ic)->key));
+      pic16_emitcode ("", "%05d_DS_:", labelKey2num (nlbl->key));
+    }
+  else
+    {
+      pic16_emitcode ("ljmp", "%05d_DS_", labelKey2num (IC_FALSE (ic)->key));
+      pic16_emitcode ("", "%05d_DS_:", labelKey2num (tlbl->key));
+    }
   ic->generated = 1;
 }
 
 /*-----------------------------------------------------------------*/
 /* genAnd  - code for and                                          */
 /*-----------------------------------------------------------------*/
-static void genAnd (iCode *ic, iCode *ifx)
+static void
+genAnd (iCode * ic, iCode * ifx)
 {
   operand *left, *right, *result;
   int size, offset = 0;
@@ -5380,8 +5933,7 @@
   resolveIfx (&rIfx, ifx);
 
   /* if left is a literal & right is not then exchange them */
-  if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) ||
-      AOP_NEEDSACC (left))
+  if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) || AOP_NEEDSACC (left))
     {
       operand *tmp = right;
       right = left;
@@ -5397,8 +5949,7 @@
     }
 
   /* if right is bit then exchange them */
-  if (AOP_TYPE (right) == AOP_CRY &&
-      AOP_TYPE (left) != AOP_CRY)
+  if (AOP_TYPE (right) == AOP_CRY && AOP_TYPE (left) != AOP_CRY)
     {
       operand *tmp = right;
       right = left;
@@ -5414,54 +5965,64 @@
 
   // if(bit & yy)
   // result = bit & yy;
-  if (AOP_TYPE(left) == AOP_CRY){
-    // c = bit & literal;
-    if(AOP_TYPE(right) == AOP_LIT){
-      if(lit & 1) {
-        if(size && pic16_sameRegs(AOP(result),AOP(left)))
-          // no change
-          goto release;
-        pic16_emitcode("mov","c,%s",AOP(left)->aopu.aop_dir);
-      } else {
-        // bit(result) = 0;
-        if(size && (AOP_TYPE(result) == AOP_CRY)){
-          pic16_emitcode("clr","%s",AOP(result)->aopu.aop_dir);
-          goto release;
+  if (AOP_TYPE (left) == AOP_CRY)
+    {
+      // c = bit & literal;
+      if (AOP_TYPE (right) == AOP_LIT)
+        {
+          if (lit & 1)
+            {
+              if (size && pic16_sameRegs (AOP (result), AOP (left)))
+                // no change
+                goto release;
+              pic16_emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir);
+            }
+          else
+            {
+              // bit(result) = 0;
+              if (size && (AOP_TYPE (result) == AOP_CRY))
+                {
+                  pic16_emitcode ("clr", "%s", AOP (result)->aopu.aop_dir);
+                  goto release;
+                }
+              if ((AOP_TYPE (result) == AOP_CRY) && ifx)
+                {
+                  jumpIfTrue (ifx);
+                  goto release;
+                }
+              pic16_emitcode ("clr", "c");
+            }
         }
-        if((AOP_TYPE(result) == AOP_CRY) && ifx){
-          jumpIfTrue(ifx);
-          goto release;
+      else
+        {
+          if (AOP_TYPE (right) == AOP_CRY)
+            {
+              // c = bit & bit;
+              pic16_emitcode ("mov", "c,%s", AOP (right)->aopu.aop_dir);
+              pic16_emitcode ("anl", "c,%s", AOP (left)->aopu.aop_dir);
+            }
+          else
+            {
+              // c = bit & val;
+              MOVA (pic16_aopGet (AOP (right), 0, FALSE, FALSE));
+              // c = lsb
+              pic16_emitcode ("rrc", "a");
+              pic16_emitcode ("anl", "c,%s", AOP (left)->aopu.aop_dir);
+            }
         }
-        pic16_emitcode("clr","c");
-      }
-    } else {
-      if (AOP_TYPE(right) == AOP_CRY){
-        // c = bit & bit;
-        pic16_emitcode("mov","c,%s",AOP(right)->aopu.aop_dir);
-        pic16_emitcode("anl","c,%s",AOP(left)->aopu.aop_dir);
-      } else {
-        // c = bit & val;
-        MOVA(pic16_aopGet(AOP(right),0,FALSE,FALSE));
-        // c = lsb
-        pic16_emitcode("rrc","a");
-        pic16_emitcode("anl","c,%s",AOP(left)->aopu.aop_dir);
-      }
+      // bit = c
+      // val = c
+      if (size)
+        pic16_outBitC (result);
+      // if(bit & ...)
+      else if ((AOP_TYPE (result) == AOP_CRY) && ifx)
+        genIfxJump (ifx, "c");
+      goto release;
     }
-    // bit = c
-    // val = c
-    if(size)
-      pic16_outBitC(result);
-    // if(bit & ...)
-    else if((AOP_TYPE(result) == AOP_CRY) && ifx)
-      genIfxJump(ifx, "c");
-    goto release ;
-  }
 
   // if (val & 0xZZ)      - size = 0, ifx != FALSE -
   // bit = val & 0xZZ     - size = 1, ifx = FALSE -
-  if ((AOP_TYPE (right) == AOP_LIT) &&
-     (AOP_TYPE (result) == AOP_CRY) &&
-     (AOP_TYPE (left) != AOP_CRY))
+  if ((AOP_TYPE (right) == AOP_LIT) && (AOP_TYPE (result) == AOP_CRY) && (AOP_TYPE (left) != AOP_CRY))
     {
       symbol *tlbl = newiTempLabel (NULL);
       int sizel = AOP_SIZE (left);
@@ -5482,7 +6043,7 @@
 
       for (sizel = AOP_SIZE (left); sizel--; ++offset, lit >>= 8)
         {
-          unsigned char bytelit = lit;
+          unsigned char bytelit = lit & 0xFF;
 
           if (bytelit != 0)
             {
@@ -5495,12 +6056,16 @@
                 {
                   if (nonnull)
                     {
-                      pic16_emitpcode (POC_BTFSC, pic16_newpCodeOpBit(pic16_aopGet (AOP (left), offset, FALSE, FALSE), posbit - 1, 0, PO_GPR_REGISTER));
+                      pic16_emitpcode (POC_BTFSC,
+                                       pic16_newpCodeOpBit (pic16_aopGet (AOP (left), offset, FALSE, FALSE), posbit - 1, 0,
+                                                            PO_GPR_REGISTER));
                       pic16_emitpcode (POC_GOTO, pic16_popGetLabel (rIfx.condition ? rIfx.lbl->key : tlbl->key));
                     }
                   else
                     {
-                      pic16_emitpcode (rIfx.condition ? POC_BTFSC :POC_BTFSS, pic16_newpCodeOpBit(pic16_aopGet (AOP (left), offset, FALSE, FALSE), posbit - 1, 0, PO_GPR_REGISTER));
+                      pic16_emitpcode (rIfx.condition ? POC_BTFSC : POC_BTFSS,
+                                       pic16_newpCodeOpBit (pic16_aopGet (AOP (left), offset, FALSE, FALSE), posbit - 1, 0,
+                                                            PO_GPR_REGISTER));
                     }
                 }
               else
@@ -5521,11 +6086,11 @@
                       if (rIfx.condition)
                         {
                           emitSKPZ;
-                          pic16_emitpcode (POC_GOTO, pic16_popGetLabel (rIfx.lbl->key)); /* to false */
+                          pic16_emitpcode (POC_GOTO, pic16_popGetLabel (rIfx.lbl->key));        /* to false */
                         }
                       else
                         {
-                          pic16_emitpcode (POC_BNZ, pic16_popGetLabel (tlbl->key)); /* to true */
+                          pic16_emitpcode (POC_BNZ, pic16_popGetLabel (tlbl->key));     /* to true */
                         }
                     }
                   else
@@ -5564,132 +6129,185 @@
     }
 
   /* if left is same as result */
-  if(pic16_sameRegs(AOP(result),AOP(left))){
-    int know_W = -1;
-    for(;size--; offset++,lit>>=8) {
-      if(AOP_TYPE(right) == AOP_LIT){
-        switch(lit & 0xff) {
-        case 0x00:
-          /*  and'ing with 0 has clears the result */
+  if (pic16_sameRegs (AOP (result), AOP (left)))
+    {
+      int know_W = -1;
+      for (; size--; offset++, lit >>= 8)
+        {
+          if (AOP_TYPE (right) == AOP_LIT)
+            {
+              switch (lit & 0xff)
+                {
+                case 0x00:
+                  /*  and'ing with 0 has clears the result */
 //        pic16_emitcode("clrf","%s",pic16_aopGet(AOP(result),offset,FALSE,FALSE));
-          pic16_emitpcode(POC_CLRF,pic16_popGet(AOP(result),offset));
-          break;
-        case 0xff:
-          /* and'ing with 0xff is a nop when the result and left are the same */
-          break;
+                  pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), offset));
+                  break;
+                case 0xff:
+                  /* and'ing with 0xff is a nop when the result and left are the same */
+                  break;
 
-        default:
-          {
-            int p = pic16_my_powof2( (~lit) & 0xff );
-            if(p>=0) {
-              /* only one bit is set in the literal, so use a bcf instruction */
+                default:
+                {
+                  int p = pic16_my_powof2 ((~lit) & 0xff);
+                  if (p >= 0)
+                    {
+                      /* only one bit is clear in the literal, so use a bcf instruction */
 //            pic16_emitcode("bcf","%s,%d",pic16_aopGet(AOP(left),offset,FALSE,TRUE),p);
-              pic16_emitpcode(POC_BCF,pic16_newpCodeOpBit(pic16_aopGet(AOP(left),offset,FALSE,FALSE),p,0, PO_GPR_REGISTER));
+                      pic16_emitpcode (POC_BCF,
+                                       pic16_newpCodeOpBit (pic16_aopGet (AOP (left), offset, FALSE, FALSE), p, 0,
+                                                            PO_GPR_REGISTER));
 
-            } else {
-              pic16_emitcode("movlw","0x%x", (lit & 0xff));
-              pic16_emitcode("andwf","%s,f",pic16_aopGet(AOP(left),offset,FALSE,TRUE));
-              if(know_W != (lit&0xff))
-                pic16_emitpcode(POC_MOVLW, pic16_popGetLit(lit & 0xff));
-              know_W = lit &0xff;
-              pic16_emitpcode(POC_ANDWF,pic16_popGet(AOP(left),offset));
+                    }
+                  else
+                    {
+                      if (AOP_TYPE (left) == AOP_ACC)
+                        {
+                          pic16_emitcode ("andlw", "0x%x", lit & 0xff);
+                          pic16_emitpcode (POC_ANDLW, pic16_popGetLit (lit & 0xff));
+                          know_W = -1;
+                        }
+                      else
+                        {
+                          if (know_W != (lit & 0xff))
+                            {
+                              pic16_emitcode ("movlw", "0x%x", lit & 0xff);
+                              pic16_emitpcode (POC_MOVLW, pic16_popGetLit (lit & 0xff));
+                            }
+
+                          know_W = lit & 0xff;
+                          pic16_emitcode ("andwf", "%s,f", pic16_aopGet (AOP (left), offset, FALSE, TRUE));
+                          pic16_emitpcode (POC_ANDWF, pic16_popGet (AOP (left), offset));
+                        }
+                    }
+                }
+                }
             }
-          }
-        }
-      } else {
-        if (AOP_TYPE(left) == AOP_ACC) {
-          pic16_emitpcode(POC_ANDFW,pic16_popGet(AOP(right),offset));
-        } else {
-          pic16_emitpcode(POC_MOVFW,pic16_popGet(AOP(right),offset));
-          pic16_emitpcode(POC_ANDWF,pic16_popGet(AOP(left),offset));
+          else
+            {
+              if (AOP_TYPE (left) == AOP_ACC)
+                {
+                  pic16_emitpcode (POC_ANDFW, pic16_popGet (AOP (right), offset));
+                }
+              else
+                {
+                  pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (right), offset));
+                  pic16_emitpcode (POC_ANDWF, pic16_popGet (AOP (left), offset));
 
+                }
+            }
         }
-      }
-    }
 
-  } else {
-    // left & result in different registers
-    if(AOP_TYPE(result) == AOP_CRY){
-      // result = bit
-      // if(size), result in bit
-      // if(!size && ifx), conditional oper: if(left & right)
-      symbol *tlbl = newiTempLabel(NULL);
-      int sizer = min(AOP_SIZE(left),AOP_SIZE(right));
-      if(size)
-        pic16_emitcode("setb","c");
-      while(sizer--){
-        MOVA(pic16_aopGet(AOP(right),offset,FALSE,FALSE));
-        pic16_emitcode("anl","a,%s",
-                       pic16_aopGet(AOP(left),offset,FALSE,FALSE));
-        pic16_emitcode("jnz","%05d_DS_",tlbl->key+100);
-        offset++;
-      }
-      if(size){
-        CLRC;
-        pic16_emitcode("","%05d_DS_:",tlbl->key+100);
-        pic16_outBitC(result);
-      } else if(ifx)
-        jmpTrueOrFalse(ifx, tlbl);
-    } else {
-      for(;(size--);offset++) {
-        // normal case
-        // result = left & right
-        if(AOP_TYPE(right) == AOP_LIT){
-          int t = (lit >> (offset*8)) & 0x0FFL;
-          switch(t) {
-          case 0x00:
-            pic16_emitcode("clrf","%s",
-                           pic16_aopGet(AOP(result),offset,FALSE,FALSE));
-            pic16_emitpcode(POC_CLRF,pic16_popGet(AOP(result),offset));
-            break;
-          case 0xff:
-            pic16_emitcode("movf","%s,w",
-                           pic16_aopGet(AOP(left),offset,FALSE,FALSE));
-            pic16_emitcode("movwf","%s",
-                           pic16_aopGet(AOP(result),offset,FALSE,FALSE));
-            pic16_emitpcode(POC_MOVFW,pic16_popGet(AOP(left),offset));
-            pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),offset));
-            break;
-          default:
-            pic16_emitcode("movlw","0x%x",t);
-            pic16_emitcode("andwf","%s,w",
-                           pic16_aopGet(AOP(left),offset,FALSE,FALSE));
-            pic16_emitcode("movwf","%s",
-                           pic16_aopGet(AOP(result),offset,FALSE,FALSE));
-
-            pic16_emitpcode(POC_MOVLW, pic16_popGetLit(t));
-            pic16_emitpcode(POC_ANDFW,pic16_popGet(AOP(left),offset));
-            pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),offset));
-          }
-          continue;
+    }
+  else
+    {
+      // left & result in different registers
+      if (AOP_TYPE (result) == AOP_CRY)
+        {
+          // result = bit
+          // if(size), result in bit
+          // if(!size && ifx), conditional oper: if(left & right)
+          symbol *tlbl = newiTempLabel (NULL);
+          int sizer = min (AOP_SIZE (left), AOP_SIZE (right));
+          if (size)
+            pic16_emitcode ("setb", "c");
+          while (sizer--)
+            {
+              MOVA (pic16_aopGet (AOP (right), offset, FALSE, FALSE));
+              pic16_emitcode ("anl", "a,%s", pic16_aopGet (AOP (left), offset, FALSE, FALSE));
+              pic16_emitcode ("jnz", "%05d_DS_", labelKey2num (tlbl->key));
+              offset++;
+            }
+          if (size)
+            {
+              CLRC;
+              pic16_emitcode ("", "%05d_DS_:", labelKey2num (tlbl->key));
+              pic16_outBitC (result);
+            }
+          else if (ifx)
+            jmpTrueOrFalse (ifx, tlbl);
         }
+      else
+        {
+          for (; (size--); offset++)
+            {
+              // normal case
+              // result = left & right
+              if (AOP_TYPE (right) == AOP_LIT)
+                {
+                  int t = (lit >> (offset * 8)) & 0x0FFL;
+                  switch (t)
+                    {
+                    case 0x00:
+                      pic16_emitcode ("clrf", "%s", pic16_aopGet (AOP (result), offset, FALSE, FALSE));
+                      pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), offset));
+                      break;
+                    case 0xff:
+                      pic16_emitcode ("movf", "%s,w", pic16_aopGet (AOP (left), offset, FALSE, FALSE));
+                      pic16_emitcode ("movwf", "%s", pic16_aopGet (AOP (result), offset, FALSE, FALSE));
+                      pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (left), offset));
+                      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));
+                      break;
+                    default:
+                    {
+                      if (AOP_TYPE (left) == AOP_ACC)
+                        {
+                          pic16_emitcode ("andlw", "0x%02x", t);
+                          pic16_emitcode ("movwf", "%s", pic16_aopGet (AOP (result), offset, FALSE, FALSE));
+                          pic16_emitpcode (POC_ANDLW, pic16_popGetLit (t));
+                          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));
+                        }
+                      else
+                        {
+                          pic16_emitcode ("movlw", "0x%02x", t);
+                          pic16_emitcode ("andwf", "%s,w", pic16_aopGet (AOP (left), offset, FALSE, FALSE));
+                          pic16_emitpcode (POC_MOVLW, pic16_popGetLit (t));
+                          pic16_emitpcode (POC_ANDFW, pic16_popGet (AOP (left), offset));
+
+                          if (AOP_TYPE (result) != AOP_ACC)
+                            {
+                              pic16_emitcode ("movwf", "%s", pic16_aopGet (AOP (result), offset, FALSE, FALSE));
+                              pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));
+                            }
+                          else
+                            {
+                              DEBUGpic16_emitcode ("; ***", "ignore MOVWF\tWREG", __FUNCTION__, __LINE__);
+                            }
+                        }
+                    }
+                    }
+                  continue;
+                }
 
-        if (AOP_TYPE(left) == AOP_ACC) {
-          pic16_emitcode("andwf","%s,w",pic16_aopGet(AOP(right),offset,FALSE,FALSE));
-          pic16_emitpcode(POC_ANDFW,pic16_popGet(AOP(right),offset));
-        } else {
-          pic16_emitcode("movf","%s,w",pic16_aopGet(AOP(right),offset,FALSE,FALSE));
-          pic16_emitcode("andwf","%s,w",
-                         pic16_aopGet(AOP(left),offset,FALSE,FALSE));
-          pic16_emitpcode(POC_MOVFW,pic16_popGet(AOP(right),offset));
-          pic16_emitpcode(POC_ANDFW,pic16_popGet(AOP(left),offset));
+              if (AOP_TYPE (left) == AOP_ACC)
+                {
+                  pic16_emitcode ("andwf", "%s,w", pic16_aopGet (AOP (right), offset, FALSE, FALSE));
+                  pic16_emitpcode (POC_ANDFW, pic16_popGet (AOP (right), offset));
+                }
+              else
+                {
+                  pic16_emitcode ("movf", "%s,w", pic16_aopGet (AOP (right), offset, FALSE, FALSE));
+                  pic16_emitcode ("andwf", "%s,w", pic16_aopGet (AOP (left), offset, FALSE, FALSE));
+                  pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (right), offset));
+                  pic16_emitpcode (POC_ANDFW, pic16_popGet (AOP (left), offset));
+                }
+              pic16_emitcode ("movwf", "%s", pic16_aopGet (AOP (result), offset, FALSE, FALSE));
+              pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));
+            }
         }
-        pic16_emitcode("movwf","%s",pic16_aopGet(AOP(result),offset,FALSE,FALSE));
-        pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),offset));
-      }
     }
-  }
 
-release :
-  pic16_freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-  pic16_freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-  pic16_freeAsmop(result,NULL,ic,TRUE);
+release:
+  pic16_freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genOr  - code for or                                            */
 /*-----------------------------------------------------------------*/
-static void genOr (iCode *ic, iCode *ifx)
+static void
+genOr (iCode * ic, iCode * ifx)
 {
   operand *left, *right, *result;
   int size, offset = 0;
@@ -5699,14 +6317,13 @@
   FENTRY;
 
   pic16_aopOp ((left = IC_LEFT (ic)), ic, FALSE);
-  pic16_aopOp ((right= IC_RIGHT (ic)), ic, FALSE);
-  pic16_aopOp ((result=IC_RESULT (ic)), ic, TRUE);
+  pic16_aopOp ((right = IC_RIGHT (ic)), ic, FALSE);
+  pic16_aopOp ((result = IC_RESULT (ic)), ic, TRUE);
 
   resolveIfx (&rIfx, ifx);
 
   /* if left is a literal & right is not then exchange them */
-  if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) ||
-      AOP_NEEDSACC (left))
+  if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) || AOP_NEEDSACC (left))
     {
       operand *tmp = right;
       right = left;
@@ -5722,8 +6339,7 @@
     }
 
   /* if right is bit then exchange them */
-  if (AOP_TYPE (right) == AOP_CRY &&
-      AOP_TYPE (left) != AOP_CRY)
+  if (AOP_TYPE (right) == AOP_CRY && AOP_TYPE (left) != AOP_CRY)
     {
       operand *tmp = right;
       right = left;
@@ -5733,216 +6349,298 @@
   DEBUGpic16_pic16_AopType (__LINE__, left, right, result);
 
   if (AOP_TYPE (right) == AOP_LIT)
-      lit = ulFromVal (AOP (right)->aopu.aop_lit);
+    lit = ulFromVal (AOP (right)->aopu.aop_lit);
 
   size = AOP_SIZE (result);
 
   // if(bit | yy)
   // xx = bit | yy;
-  if (AOP_TYPE(left) == AOP_CRY){
-      if(AOP_TYPE(right) == AOP_LIT){
+  if (AOP_TYPE (left) == AOP_CRY)
+    {
+      if (AOP_TYPE (right) == AOP_LIT)
+        {
           // c = bit & literal;
-          if(lit){
+          if (lit)
+            {
               // lit != 0 => result = 1
-              if(AOP_TYPE(result) == AOP_CRY){
-                if(size)
-                  pic16_emitpcode(POC_BSF, pic16_popGet(AOP(result),0));
-                //pic16_emitcode("bsf","(%s >> 3), (%s & 7)",
-                //     AOP(result)->aopu.aop_dir,
-                //     AOP(result)->aopu.aop_dir);
-                  else if(ifx)
-                      continueIfTrue(ifx);
+              if (AOP_TYPE (result) == AOP_CRY)
+                {
+                  if (size)
+                    pic16_emitpcode (POC_BSF, pic16_popGet (AOP (result), 0));
+                  //pic16_emitcode("bsf","(%s >> 3), (%s & 7)",
+                  //     AOP(result)->aopu.aop_dir,
+                  //     AOP(result)->aopu.aop_dir);
+                  else if (ifx)
+                    continueIfTrue (ifx);
                   goto release;
-              }
-          } else {
+                }
+            }
+          else
+            {
               // lit == 0 => result = left
-              if(size && pic16_sameRegs(AOP(result),AOP(left)))
-                  goto release;
-              pic16_emitcode(";XXX mov","c,%s  %s,%d",AOP(left)->aopu.aop_dir,__FILE__,__LINE__);
-          }
-      } else {
-          if (AOP_TYPE(right) == AOP_CRY){
-            if(pic16_sameRegs(AOP(result),AOP(left))){
-              // c = bit | bit;
-              pic16_emitpcode(POC_BCF,   pic16_popGet(AOP(result),0));
-              pic16_emitpcode(POC_BTFSC, pic16_popGet(AOP(right),0));
-              pic16_emitpcode(POC_BSF,   pic16_popGet(AOP(result),0));
-
-            } else {
-              if( AOP_TYPE(result) == AOP_ACC) {
-                pic16_emitpcode(POC_MOVLW, pic16_popGetLit(0));
-                pic16_emitpcode(POC_BTFSS, pic16_popGet(AOP(right),0));
-                pic16_emitpcode(POC_BTFSC, pic16_popGet(AOP(left),0));
-                pic16_emitpcode(POC_MOVLW, pic16_popGetLit(1));
-
-              } else {
-
-                pic16_emitpcode(POC_BCF,   pic16_popGet(AOP(result),0));
-                pic16_emitpcode(POC_BTFSS, pic16_popGet(AOP(right),0));
-                pic16_emitpcode(POC_BTFSC, pic16_popGet(AOP(left),0));
-                pic16_emitpcode(POC_BSF,   pic16_popGet(AOP(result),0));
+              if (size && pic16_sameRegs (AOP (result), AOP (left)))
+                goto release;
+              pic16_emitcode (";XXX mov", "c,%s  %s,%d", AOP (left)->aopu.aop_dir, __FILE__, __LINE__);
+            }
+        }
+      else
+        {
+          if (AOP_TYPE (right) == AOP_CRY)
+            {
+              if (pic16_sameRegs (AOP (result), AOP (left)))
+                {
+                  // c = bit | bit;
+                  pic16_emitpcode (POC_BCF, pic16_popGet (AOP (result), 0));
+                  pic16_emitpcode (POC_BTFSC, pic16_popGet (AOP (right), 0));
+                  pic16_emitpcode (POC_BSF, pic16_popGet (AOP (result), 0));
 
-              }
+                }
+              else
+                {
+                  if (AOP_TYPE (result) == AOP_ACC)
+                    {
+                      pic16_emitpcode (POC_MOVLW, pic16_popGetLit (0));
+                      pic16_emitpcode (POC_BTFSS, pic16_popGet (AOP (right), 0));
+                      pic16_emitpcode (POC_BTFSC, pic16_popGet (AOP (left), 0));
+                      pic16_emitpcode (POC_MOVLW, pic16_popGetLit (1));
+
+                    }
+                  else
+                    {
+
+                      pic16_emitpcode (POC_BCF, pic16_popGet (AOP (result), 0));
+                      pic16_emitpcode (POC_BTFSS, pic16_popGet (AOP (right), 0));
+                      pic16_emitpcode (POC_BTFSC, pic16_popGet (AOP (left), 0));
+                      pic16_emitpcode (POC_BSF, pic16_popGet (AOP (result), 0));
+
+                    }
+                }
             }
-          } else {
+          else
+            {
               // c = bit | val;
-              symbol *tlbl = newiTempLabel(NULL);
-              pic16_emitcode(";XXX "," %s,%d",__FILE__,__LINE__);
+              symbol *tlbl = newiTempLabel (NULL);
+              pic16_emitcode (";XXX ", " %s,%d", __FILE__, __LINE__);
 
 
-              pic16_emitpcode(POC_BCF,   pic16_popGet(AOP(result),0));
-              if( AOP_TYPE(right) == AOP_ACC) {
-                pic16_emitpcode(POC_IORLW, pic16_popGetLit(0));
-                emitSKPNZ;
-                pic16_emitpcode(POC_BTFSC, pic16_popGet(AOP(left),0));
-                pic16_emitpcode(POC_BSF,   pic16_popGet(AOP(result),0));
-              }
+              pic16_emitpcode (POC_BCF, pic16_popGet (AOP (result), 0));
+              if (AOP_TYPE (right) == AOP_ACC)
+                {
+                  pic16_emitpcode (POC_IORLW, pic16_popGetLit (0));
+                  emitSKPNZ;
+                  pic16_emitpcode (POC_BTFSC, pic16_popGet (AOP (left), 0));
+                  pic16_emitpcode (POC_BSF, pic16_popGet (AOP (result), 0));
+                }
 
 
 
-              if(!((AOP_TYPE(result) == AOP_CRY) && ifx))
-                  pic16_emitcode(";XXX setb","c");
-              pic16_emitcode(";XXX jb","%s,%05d_DS_",
-                       AOP(left)->aopu.aop_dir,tlbl->key+100);
-              pic16_toBoolean(right);
-              pic16_emitcode(";XXX jnz","%05d_DS_",tlbl->key+100);
-              if((AOP_TYPE(result) == AOP_CRY) && ifx){
-                  jmpTrueOrFalse(ifx, tlbl);
+              if (!((AOP_TYPE (result) == AOP_CRY) && ifx))
+                pic16_emitcode (";XXX setb", "c");
+              pic16_emitcode (";XXX jb", "%s,%05d_DS_", AOP (left)->aopu.aop_dir, labelKey2num (tlbl->key));
+              pic16_toBoolean (right);
+              pic16_emitcode (";XXX jnz", "%05d_DS_", labelKey2num (tlbl->key));
+              if ((AOP_TYPE (result) == AOP_CRY) && ifx)
+                {
+                  jmpTrueOrFalse (ifx, tlbl);
                   goto release;
-              } else {
+                }
+              else
+                {
                   CLRC;
-                  pic16_emitcode("","%05d_DS_:",tlbl->key+100);
-              }
-          }
-      }
+                  pic16_emitcode ("", "%05d_DS_:", labelKey2num (tlbl->key));
+                }
+            }
+        }
       // bit = c
       // val = c
-      if(size)
-          pic16_outBitC(result);
+      if (size)
+        pic16_outBitC (result);
       // if(bit | ...)
-      else if((AOP_TYPE(result) == AOP_CRY) && ifx)
-          genIfxJump(ifx, "c");
-      goto release ;
-  }
+      else if ((AOP_TYPE (result) == AOP_CRY) && ifx)
+        genIfxJump (ifx, "c");
+      goto release;
+    }
 
   // if(val | 0xZZ)       - size = 0, ifx != FALSE  -
   // bit = val | 0xZZ     - size = 1, ifx = FALSE -
-  if ((AOP_TYPE (right) == AOP_LIT) &&
-     (AOP_TYPE (result) == AOP_CRY) &&
-     (AOP_TYPE (left) != AOP_CRY))
-    {
-      if (IS_OP_VOLATILE(left)) {
-          pic16_mov2w_volatile(AOP(left));
-      } // if
+  if ((AOP_TYPE (right) == AOP_LIT) && (AOP_TYPE (result) == AOP_CRY) && (AOP_TYPE (left) != AOP_CRY))
+    {
+      if (IS_OP_VOLATILE (left))
+        {
+          pic16_mov2w_volatile (AOP (left));
+        }                       // if
       if (lit)
         {
           if (rIfx.condition)
-            pic16_emitpcode (POC_GOTO, pic16_popGetLabel (rIfx.lbl->key)); /* to false */
+            pic16_emitpcode (POC_GOTO, pic16_popGetLabel (rIfx.lbl->key));      /* to false */
           ifx->generated = 1;
         }
       else
         wassert (0);
 
       goto release;
-  }
+    }
 
   /* if left is same as result */
-  if(pic16_sameRegs(AOP(result),AOP(left))){
-    int know_W = -1;
-    for(;size--; offset++,lit>>=8) {
-      if(AOP_TYPE(right) == AOP_LIT){
-        if(((lit & 0xff) == 0) && !IS_OP_VOLATILE(left)) {
-          /*  or'ing with 0 has no effect */
-          continue;
-        } else {
-          int p = pic16_my_powof2(lit & 0xff);
-          if(p>=0) {
-            /* only one bit is set in the literal, so use a bsf instruction */
-            pic16_emitpcode(POC_BSF,
-                      pic16_newpCodeOpBit(pic16_aopGet(AOP(left),offset,FALSE,FALSE),p,0, PO_GPR_REGISTER));
-          } else {
-            if(know_W != (lit & 0xff))
-              pic16_emitpcode(POC_MOVLW, pic16_popGetLit(lit & 0xff));
-            know_W = lit & 0xff;
-            pic16_emitpcode(POC_IORWF, pic16_popGet(AOP(left),offset));
-          }
+  if (pic16_sameRegs (AOP (result), AOP (left)))
+    {
+      int know_W = -1;
+      for (; size--; offset++, lit >>= 8)
+        {
+          if (AOP_TYPE (right) == AOP_LIT)
+            {
+              if (((lit & 0xff) == 0) && !IS_OP_VOLATILE (left))
+                {
+                  /*  or'ing with 0 has no effect */
+                  continue;
+                }
+              else
+                {
+                  int p = pic16_my_powof2 (lit & 0xff);
+                  if (p >= 0)
+                    {
+                      /* only one bit is set in the literal, so use a bsf instruction */
+                      pic16_emitpcode (POC_BSF,
+                                       pic16_newpCodeOpBit (pic16_aopGet (AOP (left), offset, FALSE, FALSE), p, 0,
+                                                            PO_GPR_REGISTER));
+                    }
+                  else
+                    {
+                      if (AOP_TYPE (left) == AOP_ACC)
+                        {
+                          pic16_emitpcode (POC_IORLW, pic16_popGetLit (lit & 0xff));
+                          know_W = -1;
+                        }
+                      else
+                        {
+                          if (know_W != (lit & 0xff))
+                            {
+                              pic16_emitpcode (POC_MOVLW, pic16_popGetLit (lit & 0xff));
+                            }
 
+                          know_W = lit & 0xff;
+                          pic16_emitpcode (POC_IORWF, pic16_popGet (AOP(left), offset));
+                        }
+                    }
+
+                }
+            }
+          else
+            {
+              if (AOP_TYPE (left) == AOP_ACC)
+                {
+                  pic16_emitpcode (POC_IORFW, pic16_popGet (AOP (right), offset));
+                }
+              else
+                {
+                  pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (right), offset));
+                  pic16_emitpcode (POC_IORWF, pic16_popGet (AOP (left), offset));
+                }
+            }
         }
-      } else {
-        if (AOP_TYPE(left) == AOP_ACC) {
-          pic16_emitpcode(POC_IORFW,  pic16_popGet(AOP(right),offset));
-        } else {
-          pic16_emitpcode(POC_MOVFW,  pic16_popGet(AOP(right),offset));
-          pic16_emitpcode(POC_IORWF,  pic16_popGet(AOP(left),offset));
-        }
-      }
     }
-  } else {
+  else
+    {
       // left & result in different registers
-      if(AOP_TYPE(result) == AOP_CRY){
+      if (AOP_TYPE (result) == AOP_CRY)
+        {
           // result = bit
           // if(size), result in bit
           // if(!size && ifx), conditional oper: if(left | right)
-          symbol *tlbl = newiTempLabel(NULL);
-          int sizer = max(AOP_SIZE(left),AOP_SIZE(right));
-          pic16_emitcode(";XXX "," %s,%d",__FILE__,__LINE__);
+          symbol *tlbl = newiTempLabel (NULL);
+          int sizer = max (AOP_SIZE (left), AOP_SIZE (right));
+          pic16_emitcode (";XXX ", " %s,%d", __FILE__, __LINE__);
 
 
-          if(size)
-              pic16_emitcode(";XXX setb","c");
-          while(sizer--){
-              MOVA(pic16_aopGet(AOP(right),offset,FALSE,FALSE));
-              pic16_emitcode(";XXX orl","a,%s",
-                       pic16_aopGet(AOP(left),offset,FALSE,FALSE));
-              pic16_emitcode(";XXX jnz","%05d_DS_",tlbl->key+100);
+          if (size)
+            pic16_emitcode (";XXX setb", "c");
+          while (sizer--)
+            {
+              MOVA (pic16_aopGet (AOP (right), offset, FALSE, FALSE));
+              pic16_emitcode (";XXX orl", "a,%s", pic16_aopGet (AOP (left), offset, FALSE, FALSE));
+              pic16_emitcode (";XXX jnz", "%05d_DS_", labelKey2num (tlbl->key));
               offset++;
-          }
-          if(size){
+            }
+          if (size)
+            {
               CLRC;
-              pic16_emitcode("","%05d_DS_:",tlbl->key+100);
-              pic16_outBitC(result);
-          } else if(ifx)
-              jmpTrueOrFalse(ifx, tlbl);
-      } else for(;(size--);offset++){
-        // normal case
-        // result = left & right
-        if(AOP_TYPE(right) == AOP_LIT){
-          int t = (lit >> (offset*8)) & 0x0FFL;
-          switch(t) {
-          case 0x00:
-            pic16_emitpcode(POC_MOVFW,  pic16_popGet(AOP(left),offset));
-            pic16_emitpcode(POC_MOVWF,  pic16_popGet(AOP(result),offset));
-            break;
-          default:
-            pic16_emitpcode(POC_MOVLW,  pic16_popGetLit(t));
-            pic16_emitpcode(POC_IORFW,  pic16_popGet(AOP(left),offset));
-            pic16_emitpcode(POC_MOVWF,  pic16_popGet(AOP(result),offset));
-          }
-          continue;
+              pic16_emitcode ("", "%05d_DS_:", labelKey2num (tlbl->key));
+              pic16_outBitC (result);
+            }
+          else if (ifx)
+            jmpTrueOrFalse (ifx, tlbl);
         }
+      else
+        for (; (size--); offset++)
+          {
+            // normal case
+            // result = left & right
+            if (AOP_TYPE (right) == AOP_LIT)
+              {
+                int t = (lit >> (offset * 8)) & 0x0FFL;
+                switch (t)
+                  {
+                  case 0x00:
+                    pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (left), offset));
+                    pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));
+                    break;
+                  default:
+                  {
+                    if (AOP_TYPE (left) == AOP_ACC)
+                      {
+                        pic16_emitcode ("iorlw", "0x%02x", t);
+                        pic16_emitcode ("movwf", "%s", pic16_aopGet (AOP (result), offset, FALSE, FALSE));
+                        pic16_emitpcode (POC_IORLW, pic16_popGetLit (t));
+                        pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));
+                      }
+                    else
+                      {
+                        pic16_emitcode("movlw", "0x%02x", t);
+                        pic16_emitcode("iorwf", "%s", pic16_aopGet (AOP (left), offset, FALSE, FALSE));
+                        pic16_emitpcode(POC_MOVLW, pic16_popGetLit (t));
+                        pic16_emitpcode(POC_IORFW, pic16_popGet (AOP (left), offset));
+
+                        if (AOP_TYPE (result) != AOP_ACC)
+                          {
+                            pic16_emitcode ("movwf", "%s", pic16_aopGet (AOP (result), offset, FALSE, FALSE));
+                            pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));
+                          }
+                        else
+                          {
+                            DEBUGpic16_emitcode ("; ***", "ignore MOVWF\tWREG", __FUNCTION__, __LINE__);
+                          }
+                      }
+                  }
+                  }
+                continue;
+              }
 
-        // faster than result <- left, anl result,right
-        // and better if result is SFR
-        if (AOP_TYPE(left) == AOP_ACC) {
-          pic16_emitpcode(POC_IORWF,  pic16_popGet(AOP(right),offset));
-        } else {
-          pic16_emitpcode(POC_MOVFW,  pic16_popGet(AOP(right),offset));
-          pic16_emitpcode(POC_IORFW,  pic16_popGet(AOP(left),offset));
-        }
-        pic16_emitpcode(POC_MOVWF,  pic16_popGet(AOP(result),offset));
-      }
-  }
+            // faster than result <- left, anl result,right
+            // and better if result is SFR
+            if (AOP_TYPE (left) == AOP_ACC)
+              {
+                pic16_emitpcode (POC_IORWF, pic16_popGet (AOP (right), offset));
+              }
+            else
+              {
+                pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (right), offset));
+                pic16_emitpcode (POC_IORFW, pic16_popGet (AOP (left), offset));
+              }
+            pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));
+          }
+    }
 
-release :
-  pic16_freeAsmop(left,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-  pic16_freeAsmop(right,NULL,ic,(RESULTONSTACK(ic) ? FALSE : TRUE));
-  pic16_freeAsmop(result,NULL,ic,TRUE);
+release:
+  pic16_freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genXor - code for xclusive or                                   */
 /*-----------------------------------------------------------------*/
-static void genXor (iCode *ic, iCode *ifx)
+static void
+genXor (iCode * ic, iCode * ifx)
 {
   operand *left, *right, *result;
   int size, offset = 0;
@@ -5955,12 +6653,11 @@
   pic16_aopOp ((right = IC_RIGHT (ic)), ic, FALSE);
   pic16_aopOp ((result = IC_RESULT (ic)), ic, TRUE);
 
-  resolveIfx (&rIfx,ifx);
+  resolveIfx (&rIfx, ifx);
 
   /* if left is a literal & right is not ||
      if left needs acc & right does not */
-  if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) ||
-      (AOP_NEEDSACC (left) && !AOP_NEEDSACC (right)))
+  if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) || (AOP_NEEDSACC (left) && !AOP_NEEDSACC (right)))
     {
       operand *tmp = right;
       right = left;
@@ -5970,16 +6667,15 @@
   /* if result = right then exchange them */
   if (pic16_sameRegs (AOP (result), AOP (right)))
     {
-      operand *tmp = right ;
+      operand *tmp = right;
       right = left;
       left = tmp;
     }
 
   /* if right is bit then exchange them */
-  if (AOP_TYPE (right) == AOP_CRY &&
-      AOP_TYPE (left) != AOP_CRY)
+  if (AOP_TYPE (right) == AOP_CRY && AOP_TYPE (left) != AOP_CRY)
     {
-      operand *tmp = right ;
+      operand *tmp = right;
       right = left;
       left = tmp;
     }
@@ -5991,25 +6687,25 @@
 
   // if(bit ^ yy)
   // xx = bit ^ yy;
-  if (AOP_TYPE(left) == AOP_CRY)
+  if (AOP_TYPE (left) == AOP_CRY)
     {
-      if (AOP_TYPE(right) == AOP_LIT)
+      if (AOP_TYPE (right) == AOP_LIT)
         {
           // c = bit & literal;
           if (lit >> 1)
             {
               // lit>>1  != 0 => result = 1
-              if (AOP_TYPE(result) == AOP_CRY)
+              if (AOP_TYPE (result) == AOP_CRY)
                 {
                   if (size)
                     {
-                      pic16_emitpcode(POC_BSF, pic16_popGet(AOP(result), offset));
+                      pic16_emitpcode (POC_BSF, pic16_popGet (AOP (result), offset));
                     }
                   else if (ifx)
-                    continueIfTrue(ifx);
+                    continueIfTrue (ifx);
                   goto release;
                 }
-              pic16_emitcode("setb", "c");
+              pic16_emitcode ("setb", "c");
             }
           else
             {
@@ -6017,24 +6713,24 @@
               if (lit == 0)
                 {
                   // lit == 0, result = left
-                  if (size && pic16_sameRegs(AOP(result), AOP(left)))
+                  if (size && pic16_sameRegs (AOP (result), AOP (left)))
                     goto release;
-                  pic16_emitcode("mov", "c,%s", AOP(left)->aopu.aop_dir);
+                  pic16_emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir);
                 }
               else
                 {
                   // lit == 1, result = not(left)
-                  if (size && pic16_sameRegs(AOP(result), AOP(left)))
+                  if (size && pic16_sameRegs (AOP (result), AOP (left)))
                     {
-                      pic16_emitpcode(POC_MOVLW, pic16_popGet(AOP(result), offset));
-                      pic16_emitpcode(POC_XORWF, pic16_popGet(AOP(result), offset));
-                      pic16_emitcode("cpl", "%s", AOP(result)->aopu.aop_dir);
+                      pic16_emitpcode (POC_MOVLW, pic16_popGet (AOP (result), offset));
+                      pic16_emitpcode (POC_XORWF, pic16_popGet (AOP (result), offset));
+                      pic16_emitcode ("cpl", "%s", AOP (result)->aopu.aop_dir);
                       goto release;
                     }
                   else
                     {
-                      pic16_emitcode("mov", "c,%s", AOP(left)->aopu.aop_dir);
-                      pic16_emitcode("cpl", "c");
+                      pic16_emitcode ("mov", "c,%s", AOP (left)->aopu.aop_dir);
+                      pic16_emitcode ("cpl", "c");
                     }
                 }
             }
@@ -6042,49 +6738,47 @@
       else
         {
           // right != literal
-          symbol *tlbl = newiTempLabel(NULL);
-          if (AOP_TYPE(right) == AOP_CRY)
+          symbol *tlbl = newiTempLabel (NULL);
+          if (AOP_TYPE (right) == AOP_CRY)
             {
               // c = bit ^ bit;
-              pic16_emitcode("mov", "c,%s", AOP(right)->aopu.aop_dir);
+              pic16_emitcode ("mov", "c,%s", AOP (right)->aopu.aop_dir);
             }
           else
             {
-              int sizer = AOP_SIZE(right);
+              int sizer = AOP_SIZE (right);
               // c = bit ^ val
               // if val>>1 != 0, result = 1
-              pic16_emitcode("setb", "c");
+              pic16_emitcode ("setb", "c");
               while (sizer)
                 {
-                  MOVA(pic16_aopGet(AOP(right), sizer - 1, FALSE, FALSE));
+                  MOVA (pic16_aopGet (AOP (right), sizer - 1, FALSE, FALSE));
                   if (sizer == 1)
                     // test the msb of the lsb
-                    pic16_emitcode("anl", "a,#0xfe");
-                  pic16_emitcode("jnz", "%05d_DS_", tlbl->key+100);
+                    pic16_emitcode ("anl", "a,#0xfe");
+                  pic16_emitcode ("jnz", "%05d_DS_", labelKey2num (tlbl->key));
                   sizer--;
                 }
               // val = (0,1)
-              pic16_emitcode("rrc", "a");
+              pic16_emitcode ("rrc", "a");
             }
-          pic16_emitcode("jnb", "%s,%05d_DS_", AOP(left)->aopu.aop_dir, (tlbl->key + 100));
-          pic16_emitcode("cpl", "c");
-          pic16_emitcode("", "%05d_DS_:", (tlbl->key + 100));
+          pic16_emitcode ("jnb", "%s,%05d_DS_", AOP (left)->aopu.aop_dir, labelKey2num (tlbl->key));
+          pic16_emitcode ("cpl", "c");
+          pic16_emitcode ("", "%05d_DS_:", labelKey2num (tlbl->key));
         }
       // bit = c
       // val = c
       if (size)
-        pic16_outBitC(result);
+        pic16_outBitC (result);
       // if(bit | ...)
-      else if ((AOP_TYPE(result) == AOP_CRY) && ifx)
-        genIfxJump(ifx, "c");
+      else if ((AOP_TYPE (result) == AOP_CRY) && ifx)
+        genIfxJump (ifx, "c");
       goto release;
     }
 
   // if(val ^ 0xZZ)       - size = 0, ifx != FALSE  -
   // bit = val ^ 0xZZ     - size = 1, ifx = FALSE -
-  if ((AOP_TYPE (right) == AOP_LIT) &&
-     (AOP_TYPE (result) == AOP_CRY) &&
-     (AOP_TYPE (left) != AOP_CRY))
+  if ((AOP_TYPE (right) == AOP_LIT) && (AOP_TYPE (result) == AOP_CRY) && (AOP_TYPE (left) != AOP_CRY))
     {
       symbol *tlbl = newiTempLabel (NULL);
       int sizel;
@@ -6092,9 +6786,9 @@
       if (size)
         emitSETC;
 
-      for (sizel = AOP_SIZE(left); sizel--; ++offset, lit >>= 8)
+      for (sizel = AOP_SIZE (left); sizel--; ++offset, lit >>= 8)
         {
-          unsigned char bytelit = lit;
+          unsigned char bytelit = lit & 0xFF;
 
           switch (bytelit)
             {
@@ -6117,11 +6811,11 @@
                 {
                   /* rIfx.lbl might be far away... */
                   emitSKPZ;
-                  pic16_emitpcode (POC_GOTO, pic16_popGetLabel (rIfx.lbl->key)); /* to false */
+                  pic16_emitpcode (POC_GOTO, pic16_popGetLabel (rIfx.lbl->key));        /* to false */
                 }
               else
                 {
-                  pic16_emitpcode (POC_BNZ, pic16_popGetLabel (tlbl->key)); /* to true */
+                  pic16_emitpcode (POC_BNZ, pic16_popGetLabel (tlbl->key));     /* to true */
                 }
             }
           else
@@ -6154,203 +6848,260 @@
 
       pic16_outBitC (result);
       goto release;
-  }
+    }
 
-  if (pic16_sameRegs(AOP(result), AOP(left)))
+  if (pic16_sameRegs (AOP (result), AOP (left)))
     {
       /* if left is same as result */
+      int know_W = -1;
+
       for (; size--; offset++)
         {
-          if (AOP_TYPE(right) == AOP_LIT)
+          if (AOP_TYPE (right) == AOP_LIT)
             {
-              int t  = (lit >> (offset * 8)) & 0x0FFL;
-              if  (t == 0x00L)
+              int t = (lit >> (offset * 8)) & 0x0FFL;
+              if (t == 0x00L)
                 continue;
               else
                 {
-                  pic16_emitpcode(POC_MOVLW, pic16_popGetLit(t));
-                  pic16_emitpcode(POC_XORWF, pic16_popGet(AOP(left), offset));
+                  int p = pic16_my_powof2 (t);
+
+                  if (p >= 0)
+                    {
+                      /* Only one bit is toggle in the literal, so use a btg instruction. */
+                      pic16_emitpcode (POC_BTG,
+                                       pic16_newpCodeOpBit (pic16_aopGet (AOP (left), offset, FALSE, FALSE), p, 0, PO_GPR_REGISTER));
+                    }
+                  else
+                    {
+                      if (AOP_TYPE (left) == AOP_ACC)
+                        {
+                          pic16_emitcode ("xorlw", "0x%02x", t);
+                          pic16_emitpcode (POC_XORLW, pic16_popGetLit (t));
+                          know_W = -1;
+                        }
+                      else
+                        {
+                          if (know_W != t)
+                            {
+                              pic16_emitcode ("movlw", "0x%02x", t);
+                              pic16_emitpcode (POC_MOVLW, pic16_popGetLit (t));
+                            }
+
+                          know_W = t;
+                        }
+
+                      pic16_emitcode ("xorwf", "%s", pic16_aopGet (AOP (left), offset, FALSE, FALSE));
+                      pic16_emitpcode (POC_XORWF, pic16_popGet (AOP (left), offset));
+                    }
                 }
             }
           else
             {
-              if (AOP_TYPE(left) == AOP_ACC)
-                pic16_emitcode("xrl", "a,%s", pic16_aopGet(AOP(right), offset, FALSE, FALSE));
+              if (AOP_TYPE (left) == AOP_ACC)
+                pic16_emitcode ("xrl", "a,%s", pic16_aopGet (AOP (right), offset, FALSE, FALSE));
               else
                 {
-                  pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(right), offset));
-                  pic16_emitpcode(POC_XORWF, pic16_popGet(AOP(left), offset));
+                  pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (right), offset));
+                  pic16_emitpcode (POC_XORWF, pic16_popGet (AOP (left), offset));
                 }
             }
         }
     }
   else
     {
-    // left ^ result in different registers
-    if (AOP_TYPE(result) == AOP_CRY)
-      {
-        // result = bit
-        // if(size), result in bit
-        // if(!size && ifx), conditional oper: if(left ^ right)
-        symbol *tlbl = newiTempLabel(NULL);
-        int sizer = max(AOP_SIZE(left), AOP_SIZE(right));
-        if (size)
-          pic16_emitcode("setb", "c");
-        while (sizer--)
-          {
-            if ((AOP_TYPE(right) == AOP_LIT) &&
-              (((lit >> (offset*8)) & 0x0FFL) == 0x00L))
-              {
-                MOVA(pic16_aopGet(AOP(left), offset, FALSE, FALSE));
-              }
-            else
-              {
-                MOVA(pic16_aopGet(AOP(right), offset, FALSE, FALSE));
-                pic16_emitcode("xrl", "a,%s",
-                               pic16_aopGet(AOP(left), offset, FALSE, FALSE));
-              }
-            pic16_emitcode("jnz", "%05d_DS_", tlbl->key + 100);
-            offset++;
-          }
-        if (size)
-          {
-            CLRC;
-            pic16_emitcode("", "%05d_DS_:", tlbl->key + 100);
-            pic16_outBitC(result);
-          }
-        else if (ifx)
-          jmpTrueOrFalse(ifx, tlbl);
-      }
-    else
-      {
-        for (; (size--); offset++)
-          {
-            // normal case
-            // result = left ^ right
-            if (AOP_TYPE(right) == AOP_LIT)
-              {
-                int t = (lit >> (offset * 8)) & 0x0FFL;
-                switch(t)
-                  {
-                  case 0x00:
-                    pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left), offset));
-                    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offset));
-                    break;
+      // left ^ result in different registers
+      if (AOP_TYPE (result) == AOP_CRY)
+        {
+          // result = bit
+          // if(size), result in bit
+          // if(!size && ifx), conditional oper: if(left ^ right)
+          symbol *tlbl = newiTempLabel (NULL);
+          int sizer = max (AOP_SIZE (left), AOP_SIZE (right));
+          if (size)
+            pic16_emitcode ("setb", "c");
+          while (sizer--)
+            {
+              if ((AOP_TYPE (right) == AOP_LIT) && (((lit >> (offset * 8)) & 0x0FFL) == 0x00L))
+                {
+                  MOVA (pic16_aopGet (AOP (left), offset, FALSE, FALSE));
+                }
+              else
+                {
+                  MOVA (pic16_aopGet (AOP (right), offset, FALSE, FALSE));
+                  pic16_emitcode ("xrl", "a,%s", pic16_aopGet (AOP (left), offset, FALSE, FALSE));
+                }
+              pic16_emitcode ("jnz", "%05d_DS_", labelKey2num (tlbl->key));
+              offset++;
+            }
+          if (size)
+            {
+              CLRC;
+              pic16_emitcode ("", "%05d_DS_:", labelKey2num (tlbl->key));
+              pic16_outBitC (result);
+            }
+          else if (ifx)
+            jmpTrueOrFalse (ifx, tlbl);
+        }
+      else
+        {
+          for (; (size--); offset++)
+            {
+              // normal case
+              // result = left ^ right
+              if (AOP_TYPE (right) == AOP_LIT)
+                {
+                  int t = (lit >> (offset * 8)) & 0x0FFL;
+                  switch (t)
+                    {
+                    case 0x00:
+                      pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (left), offset));
+                      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));
+                      break;
 
-                  case 0xff:
-                    pic16_emitpcode(POC_COMFW, pic16_popGet(AOP(left), offset));
-                    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offset));
-                    break;
+                    case 0xff:
+                      pic16_emitpcode (POC_COMFW, pic16_popGet (AOP (left), offset));
+                      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));
+                      break;
 
-                  default:
-                    pic16_emitpcode(POC_MOVLW, pic16_popGetLit(t));
-                    pic16_emitpcode(POC_XORFW, pic16_popGet(AOP(left), offset));
-                    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offset));
-                  }
-                continue;
-              }
+                    default:
+                    {
+                      if (AOP_TYPE (left) == AOP_ACC)
+                        {
+                          pic16_emitcode ("xorlw", "0x%02x", t);
+                          pic16_emitpcode (POC_XORLW, pic16_popGetLit (t));
+                        }
+                      else
+                        {
+                          pic16_emitcode ("movlw", "0x%02x", t);
+                          pic16_emitcode ("xorwf", "%s", pic16_aopGet (AOP (left), offset, FALSE, FALSE));
+                          pic16_emitpcode (POC_MOVLW, pic16_popGetLit (t));
+                          pic16_emitpcode (POC_XORFW, pic16_popGet (AOP (left), offset));
+                        }
 
-            // faster than result <- left, anl result,right
-            // and better if result is SFR
-            if (AOP_TYPE(left) == AOP_ACC)
-              {
-                pic16_emitpcode(POC_XORFW, pic16_popGet(AOP(right), offset));
-              }
-            else
-              {
-                pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(right), offset));
-                pic16_emitpcode(POC_XORFW, pic16_popGet(AOP(left), offset));
-              }
-            if ( AOP_TYPE(result) != AOP_ACC)
-              {
-                pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offset));
-              }
-          }
-      }
-  }
+                      pic16_emitcode ("movwf", "%s", pic16_aopGet (AOP (result), offset, FALSE, FALSE));
+                      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));
+                    }
+                    }
+                  continue;
+                }
 
-release :
-  pic16_freeAsmop(left, NULL, ic, (RESULTONSTACK(ic) ? FALSE : TRUE));
-  pic16_freeAsmop(right, NULL, ic, (RESULTONSTACK(ic) ? FALSE : TRUE));
-  pic16_freeAsmop(result, NULL, ic, TRUE);
+              // faster than result <- left, anl result,right
+              // and better if result is SFR
+              if (AOP_TYPE (left) == AOP_ACC)
+                {
+                  pic16_emitpcode (POC_XORFW, pic16_popGet (AOP (right), offset));
+                }
+              else
+                {
+                  pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (right), offset));
+                  pic16_emitpcode (POC_XORFW, pic16_popGet (AOP (left), offset));
+                }
+              if (AOP_TYPE (result) != AOP_ACC)
+                {
+                  pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));
+                }
+              else
+                {
+                  DEBUGpic16_emitcode ("; ***", "ignore MOVWF\tWREG", __FUNCTION__, __LINE__);
+                }
+            }
+        }
+    }
+
+release:
+  pic16_freeAsmop (left, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (right, NULL, ic, (RESULTONSTACK (ic) ? FALSE : TRUE));
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genInline - write the inline code out                           */
 /*-----------------------------------------------------------------*/
-static void genInline (iCode *ic)
+static void
+pic16_genInline (iCode * ic)
 {
   char *buffer, *bp, *bp1;
   bool inComment = FALSE;
 
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-  _G.inLine += (!options.asmpeep);
+  genLine.lineElement.isInline += (!options.asmpeep);
 
   buffer = bp = bp1 = Safe_strdup (IC_INLINE (ic));
 
-  while((bp1=strstr(bp, "\\n"))) {
-    *bp1++ = '\n';
-    *bp1++ = ' ';
-    bp = bp1;
-  }
+  while ((bp1 = strstr (bp, "\\n")))
+    {
+      *bp1++ = '\n';
+      *bp1++ = ' ';
+      bp = bp1;
+    }
   bp = bp1 = buffer;
 
 #if 0
   /* This is an experimental code for #pragma inline
      and is temporarily disabled for 2.5.0 release */
-  if(asmInlineMap)
-  {
-    symbol *sym;
-    char *s;
-    char *cbuf;
-    int cblen;
-
-      cbuf = Safe_strdup(buffer);
-      cblen = strlen(buffer)+1;
-      memset(cbuf, 0, cblen);
+  if (asmInlineMap)
+    {
+      symbol *sym;
+      char *s;
+      char *cbuf;
+      int cblen;
+
+      cbuf = Safe_strdup (buffer);
+      cblen = strlen (buffer) + 1;
+      memset (cbuf, 0, cblen);
 
       bp = buffer;
       bp1 = cbuf;
-      while(*bp) {
-        if(*bp != '%')*bp1++ = *bp++;
-        else {
-          int i;
+      while (*bp)
+        {
+          if (*bp != '%')
+            *bp1++ = *bp++;
+          else
+            {
+              int i;
 
-            bp++;
-            i = *bp - '0';
-            if(i>elementsInSet(asmInlineMap))break;
-
-            bp++;
-            s = indexSet(asmInlineMap, i);
-            DEBUGpc("searching symbol s = `%s'", s);
-            sym = findSym(SymbolTab, NULL, s);
-
-            if(sym->reqv) {
-              strcat(bp1, sym->reqv->operand.symOperand->regs[0]->name);
-            } else {
-              strcat(bp1, sym->rname);
-            }
-
-            while(*bp1)bp1++;
-        }
-
-        if(strlen(bp1) > cblen - 16) {
-          int i = strlen(cbuf);
-          cblen += 50;
-          cbuf = realloc(cbuf, cblen);
-          memset(cbuf+i, 0, 50);
-          bp1 = cbuf + i;
+              bp++;
+              i = *bp - '0';
+              if (i > elementsInSet (asmInlineMap))
+                break;
+
+              bp++;
+              s = indexSet (asmInlineMap, i);
+              DEBUGpc ("searching symbol s = `%s'", s);
+              sym = findSym (SymbolTab, NULL, s);
+
+              if (sym->reqv)
+                {
+                  strcat (bp1, sym->reqv->operand.symOperand->regs[0]->name);
+                }
+              else
+                {
+                  strcat (bp1, sym->rname);
+                }
+
+              while (*bp1)
+                bp1++;
+            }
+
+          if (strlen (bp1) > cblen - 16)
+            {
+              int i = strlen (cbuf);
+              cblen += 50;
+              cbuf = realloc (cbuf, cblen);
+              memset (cbuf + i, 0, 50);
+              bp1 = cbuf + i;
+            }
         }
-      }
 
-      free(buffer);
-      buffer = Safe_strdup( cbuf );
-      free(cbuf);
+      free (buffer);
+      buffer = Safe_strdup (cbuf);
+      free (cbuf);
 
       bp = bp1 = buffer;
-  }
-#endif  /* 0 */
+    }
+#endif /* 0 */
 
   /* emit each line as a code */
   while (*bp)
@@ -6367,20 +7118,20 @@
           inComment = FALSE;
           *bp++ = '\0';
           if (*bp1)
-            pic16_addpCode2pBlock(pb, pic16_newpCodeAsmDir(bp1, NULL)); // inline directly, no process
+            pic16_addpCode2pBlock (pb, pic16_newpCodeAsmDir (bp1, NULL));       // inline directly, no process
           bp1 = bp;
           break;
 
         default:
           /* Add \n for labels, not dirs such as c:\mydir */
-          if (!inComment && (*bp == ':') && (isspace((unsigned char)bp[1])))
+          if (!inComment && (*bp == ':') && (isspace ((unsigned char) bp[1])))
             {
               ++bp;
               *bp = '\0';
               ++bp;
               /* print label, use this special format with NULL directive
                * to denote that the argument should not be indented with tab */
-              pic16_addpCode2pBlock(pb, pic16_newpCodeAsmDir(NULL, bp1)); // inline directly, no process
+              pic16_addpCode2pBlock (pb, pic16_newpCodeAsmDir (NULL, bp1));     // inline directly, no process
               bp1 = bp;
             }
           else
@@ -6390,97 +7141,110 @@
     }
 
   if ((bp1 != bp) && *bp1)
-    pic16_addpCode2pBlock(pb, pic16_newpCodeAsmDir(bp1, NULL)); // inline directly, no process
+    pic16_addpCode2pBlock (pb, pic16_newpCodeAsmDir (bp1, NULL));       // inline directly, no process
 
   Safe_free (buffer);
 
-  _G.inLine -= (!options.asmpeep);
+  /* consumed; we can free it here */
+  dbuf_free (IC_INLINE (ic));
+
+  genLine.lineElement.isInline -= (!options.asmpeep);
 }
 
 /*-----------------------------------------------------------------*/
 /* genRRC - rotate right with carry                                */
 /*-----------------------------------------------------------------*/
-static void genRRC (iCode *ic)
+static void
+genRRC (iCode * ic)
 {
-  operand *left , *result ;
+  operand *left, *result;
   int size, same;
 
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
   /* rotate right with carry */
-  left = IC_LEFT(ic);
-  result=IC_RESULT(ic);
-  pic16_aopOp (left,ic,FALSE);
-  pic16_aopOp (result,ic,TRUE);
+  left = IC_LEFT (ic);
+  result = IC_RESULT (ic);
+  pic16_aopOp (left, ic, FALSE);
+  pic16_aopOp (result, ic, TRUE);
 
-  DEBUGpic16_pic16_AopType(__LINE__,left,NULL,result);
+  DEBUGpic16_pic16_AopType (__LINE__, left, NULL, result);
 
-  same = pic16_sameRegs(AOP(result),AOP(left));
+  same = pic16_sameRegs (AOP (result), AOP (left));
 
-  size = AOP_SIZE(result);
+  size = AOP_SIZE (result);
 
-  DEBUGpic16_emitcode ("; ***","%s  %d size:%d same:%d",__FUNCTION__,__LINE__,size,same);
+  DEBUGpic16_emitcode ("; ***", "%s  %d size:%d same:%d", __FUNCTION__, __LINE__, size, same);
 
   /* get the lsb and put it into the carry */
-  pic16_emitpcode(POC_RRCFW, pic16_popGet(AOP(left),0));
+  pic16_emitpcode (POC_RRCFW, pic16_popGet (AOP (left), 0));
 
-  while(size--) {
+  while (size--)
+    {
 
-    if(same) {
-      pic16_emitpcode(POC_RRCF, pic16_popGet(AOP(left),size));
-    } else {
-      pic16_emitpcode(POC_RRCFW, pic16_popGet(AOP(left),size));
-      pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),size));
+      if (same)
+        {
+          pic16_emitpcode (POC_RRCF, pic16_popGet (AOP (left), size));
+        }
+      else
+        {
+          pic16_emitpcode (POC_RRCFW, pic16_popGet (AOP (left), size));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), size));
+        }
     }
-  }
 
-  pic16_freeAsmop(left,NULL,ic,TRUE);
-  pic16_freeAsmop(result,NULL,ic,TRUE);
+  pic16_freeAsmop (left, NULL, ic, TRUE);
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genRLC - generate code for rotate left with carry               */
 /*-----------------------------------------------------------------*/
-static void genRLC (iCode *ic)
+static void
+genRLC (iCode * ic)
 {
-  operand *left , *result ;
+  operand *left, *result;
   int size, offset = 0;
   int same;
 
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
   /* rotate right with carry */
-  left = IC_LEFT(ic);
-  result=IC_RESULT(ic);
-  pic16_aopOp (left,ic,FALSE);
-  pic16_aopOp (result,ic,TRUE);
+  left = IC_LEFT (ic);
+  result = IC_RESULT (ic);
+  pic16_aopOp (left, ic, FALSE);
+  pic16_aopOp (result, ic, TRUE);
 
-  DEBUGpic16_pic16_AopType(__LINE__,left,NULL,result);
+  DEBUGpic16_pic16_AopType (__LINE__, left, NULL, result);
 
-  same = pic16_sameRegs(AOP(result),AOP(left));
+  same = pic16_sameRegs (AOP (result), AOP (left));
 
   /* move it to the result */
-  size = AOP_SIZE(result);
+  size = AOP_SIZE (result);
 
   /* get the msb and put it into the carry */
-  pic16_emitpcode(POC_RLCFW, pic16_popGet(AOP(left),size-1));
+  pic16_emitpcode (POC_RLCFW, pic16_popGet (AOP (left), size - 1));
 
-  offset = 0 ;
+  offset = 0;
 
-  while(size--) {
+  while (size--)
+    {
 
-    if(same) {
-      pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(left),offset));
-    } else {
-      pic16_emitpcode(POC_RLCFW, pic16_popGet(AOP(left),offset));
-      pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),offset));
-    }
+      if (same)
+        {
+          pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (left), offset));
+        }
+      else
+        {
+          pic16_emitpcode (POC_RLCFW, pic16_popGet (AOP (left), offset));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));
+        }
 
-    offset++;
-  }
+      offset++;
+    }
 
 
-  pic16_freeAsmop(left,NULL,ic,TRUE);
-  pic16_freeAsmop(result,NULL,ic,TRUE);
+  pic16_freeAsmop (left, NULL, ic, TRUE);
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 
@@ -6490,68 +7254,135 @@
 /*-----------------------------------------------------------------*/
 /* genGetHbit - generates code get highest order bit               */
 /*-----------------------------------------------------------------*/
-static void genGetHbit (iCode *ic)
+static void
+genGetHbit (iCode * ic)
 {
-    operand *left, *result;
-    left = IC_LEFT(ic);
-    result=IC_RESULT(ic);
-    pic16_aopOp (left,ic,FALSE);
-    pic16_aopOp (result,ic,FALSE);
-
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* get the highest order byte into a */
-    MOVA(pic16_aopGet(AOP(left),AOP_SIZE(left) - 1,FALSE,FALSE));
-    if(AOP_TYPE(result) == AOP_CRY){
-        pic16_emitcode("rlc","a");
-        pic16_outBitC(result);
-    }
-    else{
-        pic16_emitcode("rl","a");
-        pic16_emitcode("anl","a,#0x01");
-        pic16_outAcc(result);
+  operand *left, *result;
+  left = IC_LEFT (ic);
+  result = IC_RESULT (ic);
+  pic16_aopOp (left, ic, FALSE);
+  pic16_aopOp (result, ic, FALSE);
+
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  /* get the highest order byte into a */
+  MOVA (pic16_aopGet (AOP (left), AOP_SIZE (left) - 1, FALSE, FALSE));
+  if (AOP_TYPE (result) == AOP_CRY)
+    {
+      pic16_emitcode ("rlc", "a");
+      pic16_outBitC (result);
+    }
+  else
+    {
+      pic16_emitcode ("rl", "a");
+      pic16_emitcode ("anl", "a,#0x01");
+      pic16_outAcc (result);
     }
 
 
-    pic16_freeAsmop(left,NULL,ic,TRUE);
-    pic16_freeAsmop(result,NULL,ic,TRUE);
+  pic16_freeAsmop (left, NULL, ic, TRUE);
+  pic16_freeAsmop (result, NULL, ic, TRUE);
+}
+
+static void
+genGetABit (iCode * ic)
+{
+  operand *left, *right, *result;
+  int shCount;
+  int offset;
+  int i;
+
+  left = IC_LEFT (ic);
+  right = IC_RIGHT (ic);
+  result = IC_RESULT (ic);
+
+  pic16_aopOp (left, ic, FALSE);
+  pic16_aopOp (right, ic, FALSE);
+  pic16_aopOp (result, ic, TRUE);
+
+  shCount = (int) ulFromVal (AOP (right)->aopu.aop_lit);
+  offset = shCount / 8;
+  shCount %= 8;
+
+  /* load and mask the source byte */
+  pic16_mov2w (AOP (left), offset);
+  pic16_emitpcode (POC_ANDLW, pic16_popGetLit (1 << shCount));
+
+  /* move selected bit to bit 0 */
+  switch (shCount)
+    {
+    case 0:
+      /* nothing more to do */
+      break;
+    case 1:
+      /* shift bit 1 into bit 0 */
+      pic16_emitpcode (POC_RRNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      break;
+    case 4:
+      /* shift bit 4 into bit 0 */
+      pic16_emitpcode (POC_SWAPFW, pic16_popCopyReg (&pic16_pc_wreg));
+      break;
+    case 7:
+      /* shift bit 7 into bit 0 */
+      pic16_emitpcode (POC_RLNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      break;
+    default:
+      /* keep W==0, force W=0x01 otherwise */
+      emitSKPZ;
+      pic16_emitpcode (POC_MOVLW, pic16_popGetLit (1));
+      break;
+    }                           // switch
+
+  /* write result */
+  pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 0));
+
+  for (i = 1; i < AOP_SIZE (result); ++i)
+    {
+      pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), i));
+    }                           // for
+
+  pic16_freeAsmop (left, NULL, ic, TRUE);
+  pic16_freeAsmop (right, NULL, ic, TRUE);
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 #if 0
 /*-----------------------------------------------------------------*/
 /* AccRol - rotate left accumulator by known count                 */
 /*-----------------------------------------------------------------*/
-static void AccRol (int shCount)
+static void
+AccRol (int shCount)
 {
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    shCount &= 0x0007;              // shCount : 0..7
-    switch(shCount){
-        case 0 :
-            break;
-        case 1 :
-            pic16_emitcode("rl","a");
-            break;
-        case 2 :
-            pic16_emitcode("rl","a");
-            pic16_emitcode("rl","a");
-            break;
-        case 3 :
-            pic16_emitcode("swap","a");
-            pic16_emitcode("rr","a");
-            break;
-        case 4 :
-            pic16_emitcode("swap","a");
-            break;
-        case 5 :
-            pic16_emitcode("swap","a");
-            pic16_emitcode("rl","a");
-            break;
-        case 6 :
-            pic16_emitcode("rr","a");
-            pic16_emitcode("rr","a");
-            break;
-        case 7 :
-            pic16_emitcode("rr","a");
-            break;
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  shCount &= 0x0007;            // shCount : 0..7
+  switch (shCount)
+    {
+    case 0:
+      break;
+    case 1:
+      pic16_emitcode ("rl", "a");
+      break;
+    case 2:
+      pic16_emitcode ("rl", "a");
+      pic16_emitcode ("rl", "a");
+      break;
+    case 3:
+      pic16_emitcode ("swap", "a");
+      pic16_emitcode ("rr", "a");
+      break;
+    case 4:
+      pic16_emitcode ("swap", "a");
+      break;
+    case 5:
+      pic16_emitcode ("swap", "a");
+      pic16_emitcode ("rl", "a");
+      break;
+    case 6:
+      pic16_emitcode ("rr", "a");
+      pic16_emitcode ("rr", "a");
+      break;
+    case 7:
+      pic16_emitcode ("rr", "a");
+      break;
     }
 }
 #endif
@@ -6559,713 +7390,807 @@
 /*-----------------------------------------------------------------*/
 /* AccLsh - left shift accumulator by known count                  */
 /*-----------------------------------------------------------------*/
-static void AccLsh (int shCount, int doMask)
+static void
+AccLsh (int shCount, int doMask)
 {
-        DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-        switch(shCount){
-                case 0 :
-                        return;
-                        break;
-                case 1 :
-                        pic16_emitpcode(POC_RLNCFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        break;
-                case 2 :
-                        pic16_emitpcode(POC_RLNCFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        pic16_emitpcode(POC_RLNCFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        break;
-                case 3 :
-                        pic16_emitpcode(POC_SWAPFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        pic16_emitpcode(POC_RRNCFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        break;
-                case 4 :
-                        pic16_emitpcode(POC_SWAPFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        break;
-                case 5 :
-                        pic16_emitpcode(POC_SWAPFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        pic16_emitpcode(POC_RLNCFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        break;
-                case 6 :
-                        pic16_emitpcode(POC_RRNCFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        pic16_emitpcode(POC_RRNCFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        break;
-                case 7 :
-                        pic16_emitpcode(POC_RRNCFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        break;
-        }
-        if (doMask) {
-                /* no masking is required in genPackBits */
-                pic16_emitpcode(POC_ANDLW,pic16_popGetLit(SLMask[shCount]));
-        }
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  switch (shCount)
+    {
+    case 0:
+      return;
+      break;
+    case 1:
+      pic16_emitpcode (POC_RLNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      break;
+    case 2:
+      pic16_emitpcode (POC_RLNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      pic16_emitpcode (POC_RLNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      break;
+    case 3:
+      pic16_emitpcode (POC_SWAPFW, pic16_popCopyReg (&pic16_pc_wreg));
+      pic16_emitpcode (POC_RRNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      break;
+    case 4:
+      pic16_emitpcode (POC_SWAPFW, pic16_popCopyReg (&pic16_pc_wreg));
+      break;
+    case 5:
+      pic16_emitpcode (POC_SWAPFW, pic16_popCopyReg (&pic16_pc_wreg));
+      pic16_emitpcode (POC_RLNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      break;
+    case 6:
+      pic16_emitpcode (POC_RRNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      pic16_emitpcode (POC_RRNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      break;
+    case 7:
+      pic16_emitpcode (POC_RRNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      break;
+    }
+  if (doMask)
+    {
+      /* no masking is required in genPackBits */
+      pic16_emitpcode (POC_ANDLW, pic16_popGetLit (SLMask[shCount]));
+    }
 }
 
 /*-----------------------------------------------------------------*/
 /* AccRsh - right shift accumulator by known count                 */
 /*-----------------------------------------------------------------*/
-static void AccRsh (int shCount, int andmask)
+static void
+AccRsh (int shCount, int andmask)
 {
-        DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-        assert ((shCount >= 0) && (shCount <= 8));
-        switch (shCount) {
-                case 0 :
-                        return; break;
-                case 1 :
-                        pic16_emitpcode(POC_RRNCFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        break;
-                case 2 :
-                        pic16_emitpcode(POC_RRNCFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        pic16_emitpcode(POC_RRNCFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        break;
-                case 3 :
-                        pic16_emitpcode(POC_SWAPFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        pic16_emitpcode(POC_RLNCFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        break;
-                case 4 :
-                        pic16_emitpcode(POC_SWAPFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        break;
-                case 5 :
-                        pic16_emitpcode(POC_SWAPFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        pic16_emitpcode(POC_RRNCFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        break;
-                case 6 :
-                        pic16_emitpcode(POC_RLNCFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        pic16_emitpcode(POC_RLNCFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        break;
-                case 7 :
-                        pic16_emitpcode(POC_RLNCFW,pic16_popCopyReg(&pic16_pc_wreg));
-                        break;
-                default:
-                        // Rotating by 8 is a NOP.
-                        break;
-        }
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  assert ((shCount >= 0) && (shCount <= 8));
+  switch (shCount)
+    {
+    case 0:
+      return;
+      break;
+    case 1:
+      pic16_emitpcode (POC_RRNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      break;
+    case 2:
+      pic16_emitpcode (POC_RRNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      pic16_emitpcode (POC_RRNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      break;
+    case 3:
+      pic16_emitpcode (POC_SWAPFW, pic16_popCopyReg (&pic16_pc_wreg));
+      pic16_emitpcode (POC_RLNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      break;
+    case 4:
+      pic16_emitpcode (POC_SWAPFW, pic16_popCopyReg (&pic16_pc_wreg));
+      break;
+    case 5:
+      pic16_emitpcode (POC_SWAPFW, pic16_popCopyReg (&pic16_pc_wreg));
+      pic16_emitpcode (POC_RRNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      break;
+    case 6:
+      pic16_emitpcode (POC_RLNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      pic16_emitpcode (POC_RLNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      break;
+    case 7:
+      pic16_emitpcode (POC_RLNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      break;
+    default:
+      // Rotating by 8 is a NOP.
+      break;
+    }
 
-        if (andmask)
-                pic16_emitpcode(POC_ANDLW,pic16_popGetLit(SRMask[shCount]));
-        else
-                DEBUGpic16_emitcode("; ***", "%s omitting masking the result", __FUNCTION__);
+  if (andmask)
+    pic16_emitpcode (POC_ANDLW, pic16_popGetLit (SRMask[shCount]));
+  else
+    DEBUGpic16_emitcode ("; ***", "%s omitting masking the result", __FUNCTION__);
 }
 
 /*-----------------------------------------------------------------*/
 /* shiftR1Left2Result - shift right one byte from left to result   */
 /*-----------------------------------------------------------------*/
-static void shiftR1Left2ResultSigned (operand *left, int offl,
-                                operand *result, int offr,
-                                int shCount)
+static void
+shiftR1Left2ResultSigned (operand * left, int offl, operand * result, int offr, int shCount)
 {
   int same;
 
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
   assert ((shCount >= 0) && (shCount <= 8));
 
-  same = ((left == result) || (AOP(left) == AOP(result))) && (offl == offr);
+  same = ((left == result) || (AOP (left) == AOP (result))) && (offl == offr);
 
   /* Do NOT use result for intermediate results, it might be an SFR!. */
-  switch (shCount) {
-  case 0:
-    if (!same) {
-      pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left), offl));
-      pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    }
-    break;
+  switch (shCount)
+    {
+    case 0:
+      if (!same)
+        {
+          pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (left), offl));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+        }
+      break;
 
-  case 1:
-    pic16_emitpcode(POC_RLCFW, pic16_popGet(AOP(left), offl));
-    if (same)
-      pic16_emitpcode(POC_RRCF, pic16_popGet(AOP(result), offr));
-    else {
-      pic16_emitpcode(POC_RRCFW, pic16_popGet(AOP(left), offl));
-      pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    }
-    break;
+    case 1:
+      pic16_emitpcode (POC_RLCFW, pic16_popGet (AOP (left), offl));
+      if (same)
+        pic16_emitpcode (POC_RRCF, pic16_popGet (AOP (result), offr));
+      else
+        {
+          pic16_emitpcode (POC_RRCFW, pic16_popGet (AOP (left), offl));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+        }
+      break;
 
-  case 2:
-    pic16_emitpcode(POC_RRNCFW, pic16_popGet(AOP(left), offl));
-    pic16_emitpcode(POC_RRNCFW, pic16_popCopyReg(&pic16_pc_wreg));
-    pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0x3f)); // keep sign bit in W<5>
-    pic16_emitpcode(POC_BTFSC, pic16_popCopyGPR2Bit(PCOP(&pic16_pc_wreg), 5));
-    pic16_emitpcode(POC_IORLW, pic16_popGetLit(0xc0)); // sign-extend
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    break;
+    case 2:
+      pic16_emitpcode (POC_RRNCFW, pic16_popGet (AOP (left), offl));
+      pic16_emitpcode (POC_RRNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0x3f));      // keep sign bit in W<5>
+      pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit (PCOP (&pic16_pc_wreg), 5));
+      pic16_emitpcode (POC_IORLW, pic16_popGetLit (0xc0));      // sign-extend
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+      break;
 
-  case 3:
-    pic16_emitpcode(POC_SWAPFW, pic16_popGet(AOP(left), offl));
-    pic16_emitpcode(POC_RLNCFW, pic16_popCopyReg(&pic16_pc_wreg));
-    pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0x1f)); // keep sign in W<4>
-    pic16_emitpcode(POC_BTFSC, pic16_popCopyGPR2Bit(PCOP(&pic16_pc_wreg), 4));
-    pic16_emitpcode(POC_IORLW, pic16_popGetLit(0xe0)); // sign-extend
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    break;
+    case 3:
+      pic16_emitpcode (POC_SWAPFW, pic16_popGet (AOP (left), offl));
+      pic16_emitpcode (POC_RLNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0x1f));      // keep sign in W<4>
+      pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit (PCOP (&pic16_pc_wreg), 4));
+      pic16_emitpcode (POC_IORLW, pic16_popGetLit (0xe0));      // sign-extend
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+      break;
 
-  case 4:
-    pic16_emitpcode(POC_SWAPFW, pic16_popGet(AOP(left), offl));
-    pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0x0f)); // keep sign in W<3>
-    pic16_emitpcode(POC_BTFSC, pic16_popCopyGPR2Bit(PCOP(&pic16_pc_wreg), 3));
-    pic16_emitpcode(POC_IORLW, pic16_popGetLit(0xf0)); // sign-extend
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    break;
+    case 4:
+      pic16_emitpcode (POC_SWAPFW, pic16_popGet (AOP (left), offl));
+      pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0x0f));      // keep sign in W<3>
+      pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit (PCOP (&pic16_pc_wreg), 3));
+      pic16_emitpcode (POC_IORLW, pic16_popGetLit (0xf0));      // sign-extend
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+      break;
 
-  case 5:
-    pic16_emitpcode(POC_SWAPFW, pic16_popGet(AOP(left), offl));
-    pic16_emitpcode(POC_RRNCFW, pic16_popCopyReg(&pic16_pc_wreg));
-    pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0x07)); // keep sign in W<2>
-    pic16_emitpcode(POC_BTFSC, pic16_popCopyGPR2Bit(PCOP(&pic16_pc_wreg), 2));
-    pic16_emitpcode(POC_IORLW, pic16_popGetLit(0xf8)); // sign-extend
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    break;
+    case 5:
+      pic16_emitpcode (POC_SWAPFW, pic16_popGet (AOP (left), offl));
+      pic16_emitpcode (POC_RRNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0x07));      // keep sign in W<2>
+      pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit (PCOP (&pic16_pc_wreg), 2));
+      pic16_emitpcode (POC_IORLW, pic16_popGetLit (0xf8));      // sign-extend
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+      break;
 
-  case 6:
-    pic16_emitpcode(POC_RLNCFW, pic16_popGet(AOP(left), offl));
-    pic16_emitpcode(POC_RLNCFW, pic16_popCopyReg(&pic16_pc_wreg));
-    pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0x03)); // keep sign bit in W<1>
-    pic16_emitpcode(POC_BTFSC, pic16_popCopyGPR2Bit(PCOP(&pic16_pc_wreg), 1));
-    pic16_emitpcode(POC_IORLW, pic16_popGetLit(0xfc)); // sign-extend
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    break;
+    case 6:
+      pic16_emitpcode (POC_RLNCFW, pic16_popGet (AOP (left), offl));
+      pic16_emitpcode (POC_RLNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0x03));      // keep sign bit in W<1>
+      pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit (PCOP (&pic16_pc_wreg), 1));
+      pic16_emitpcode (POC_IORLW, pic16_popGetLit (0xfc));      // sign-extend
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+      break;
 
-  case 7:
-    pic16_emitpcode(POC_MOVLW, pic16_popGetLit(0x00));
-    pic16_emitpcode(POC_BTFSC, pic16_popCopyGPR2Bit(pic16_popGet(AOP(left), offl), 7));
-    pic16_emitpcode(POC_MOVLW, pic16_popGetLit(0xff));
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    break;
+    case 7:
+      pic16_emitpcode (POC_MOVLW, pic16_popGetLit (0x00));
+      pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit (pic16_popGet (AOP (left), offl), 7));
+      pic16_emitpcode (POC_MOVLW, pic16_popGetLit (0xff));
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+      break;
 
-  default:
-    pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result), offr));
-    break;
-  }
+    default:
+      pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), offr));
+      break;
+    }
 }
 
 /*-----------------------------------------------------------------*/
 /* shiftR1Left2Result - shift right one byte from left to result   */
 /*-----------------------------------------------------------------*/
-static void shiftR1Left2Result (operand *left, int offl,
-                                operand *result, int offr,
-                                int shCount, int sign)
+static void
+shiftR1Left2Result (operand * left, int offl, operand * result, int offr, int shCount, int sign)
 {
   int same;
 
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
   assert ((shCount >= 0) && (shCount <= 8));
 
-  same = ((left == result) || (AOP(left) == AOP(result))) && (offl == offr);
+  same = ((left == result) || (AOP (left) == AOP (result))) && (offl == offr);
 
   /* Copy the msb into the carry if signed. */
-  if (sign) {
-    shiftR1Left2ResultSigned(left, offl, result, offr, shCount);
-    return;
-  }
+  if (sign)
+    {
+      shiftR1Left2ResultSigned (left, offl, result, offr, shCount);
+      return;
+    }
 
   /* Do NOT use result for intermediate results, it might be an SFR!. */
-  switch (shCount) {
-  case 0:
-    if (!same) {
-      pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left), offl));
-      pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    }
-    break;
+  switch (shCount)
+    {
+    case 0:
+      if (!same)
+        {
+          pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (left), offl));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+        }
+      break;
 
-  case 1:
-    if (same) {
-      emitCLRC;
-      pic16_emitpcode(POC_RRCF, pic16_popGet(AOP(result), offr));
-    } else {
-      pic16_emitpcode(POC_RRNCFW, pic16_popGet(AOP(left), offl));
-      pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0x7f));
-      pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    }
-    break;
+    case 1:
+      if (same)
+        {
+          emitCLRC;
+          pic16_emitpcode (POC_RRCF, pic16_popGet (AOP (result), offr));
+        }
+      else
+        {
+          pic16_emitpcode (POC_RRNCFW, pic16_popGet (AOP (left), offl));
+          pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0x7f));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+        }
+      break;
 
-  case 2:
-    pic16_emitpcode(POC_RRNCFW, pic16_popGet(AOP(left), offl));
-    pic16_emitpcode(POC_RRNCFW, pic16_popCopyReg(&pic16_pc_wreg));
-    pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0x3f));
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    break;
+    case 2:
+      pic16_emitpcode (POC_RRNCFW, pic16_popGet (AOP (left), offl));
+      pic16_emitpcode (POC_RRNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0x3f));
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+      break;
 
-  case 3:
-    pic16_emitpcode(POC_SWAPFW, pic16_popGet(AOP(left), offl));
-    pic16_emitpcode(POC_RLNCFW, pic16_popCopyReg(&pic16_pc_wreg));
-    pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0x1f));
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    break;
+    case 3:
+      pic16_emitpcode (POC_SWAPFW, pic16_popGet (AOP (left), offl));
+      pic16_emitpcode (POC_RLNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0x1f));
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+      break;
 
-  case 4:
-    pic16_emitpcode(POC_SWAPFW, pic16_popGet(AOP(left), offl));
-    pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0x0f));
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    break;
+    case 4:
+      pic16_emitpcode (POC_SWAPFW, pic16_popGet (AOP (left), offl));
+      pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0x0f));
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+      break;
 
-  case 5:
-    pic16_emitpcode(POC_SWAPFW, pic16_popGet(AOP(left), offl));
-    pic16_emitpcode(POC_RRNCFW, pic16_popCopyReg(&pic16_pc_wreg));
-    pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0x07));
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    break;
+    case 5:
+      pic16_emitpcode (POC_SWAPFW, pic16_popGet (AOP (left), offl));
+      pic16_emitpcode (POC_RRNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0x07));
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+      break;
 
-  case 6:
-    pic16_emitpcode(POC_RLNCFW, pic16_popGet(AOP(left), offl));
-    pic16_emitpcode(POC_RLNCFW, pic16_popCopyReg(&pic16_pc_wreg));
-    pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0x03));
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    break;
+    case 6:
+      pic16_emitpcode (POC_RLNCFW, pic16_popGet (AOP (left), offl));
+      pic16_emitpcode (POC_RLNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0x03));
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+      break;
 
-  case 7:
-    pic16_emitpcode(POC_RLNCFW, pic16_popGet(AOP(left), offl));
-    pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0x01));
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    break;
+    case 7:
+      pic16_emitpcode (POC_RLNCFW, pic16_popGet (AOP (left), offl));
+      pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0x01));
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+      break;
 
-  default:
-    pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result), offr));
-    break;
-  }
+    default:
+      pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), offr));
+      break;
+    }
 }
 
 /*-----------------------------------------------------------------*/
 /* shiftL1Left2Result - shift left one byte from left to result    */
 /*-----------------------------------------------------------------*/
-static void shiftL1Left2Result (operand *left, int offl,
-                                operand *result, int offr, int shCount)
+static void
+shiftL1Left2Result (operand * left, int offl, operand * result, int offr, int shCount)
 {
   int same;
 
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
   assert ((shCount >= 0) && (shCount <= 8));
 
-  same = ((left == result) || (AOP(left) == AOP(result))) && (offl==offr);
+  same = ((left == result) || (AOP (left) == AOP (result))) && (offl == offr);
 
   /* Do NOT use result for intermediate results, it might be an SFR!. */
-  switch (shCount) {
-  case 0:
-    if (!same) {
-      pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left), offl));
-      pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    }
-    break;
+  switch (shCount)
+    {
+    case 0:
+      if (!same)
+        {
+          pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (left), offl));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+        }
+      break;
 
-  case 1:
-    if (same) {
-      emitCLRC;
-      pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(left), offl));
-    } else {
-      pic16_emitpcode(POC_RLNCFW, pic16_popGet(AOP(left), offl));
-      pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0xfe));
-      pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    }
-    break;
+    case 1:
+      if (same)
+        {
+          emitCLRC;
+          pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (left), offl));
+        }
+      else
+        {
+          pic16_emitpcode (POC_RLNCFW, pic16_popGet (AOP (left), offl));
+          pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0xfe));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+        }
+      break;
 
-  case 2:
-    pic16_emitpcode(POC_RLNCFW, pic16_popGet(AOP(left), offl));
-    pic16_emitpcode(POC_RLNCFW, pic16_popCopyReg(&pic16_pc_wreg));
-    pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0xfc));
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    break;
+    case 2:
+    {
+      if (same)
+        {
+          if (AOP_TYPE (left) == AOP_ACC)
+            {
+              /* Reduces the number of instructions. */
+              pic16_emitpcode(POC_ADDFW, pic16_popGet (AOP (left), offl));
+              pic16_emitpcode(POC_ADDFW, pic16_popGet (AOP (left), offl));
+            }
+          else
+            {
+              emitCLRC;
+              pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (left), offl));
+              emitCLRC;
+              pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (left), offl));
+            }
+        }
+      else
+        {
+          pic16_emitpcode (POC_RLNCFW, pic16_popGet (AOP (left), offl));
+          pic16_emitpcode (POC_RLNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+          pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0xfc));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+        }
 
-  case 3:
-    pic16_emitpcode(POC_SWAPFW, pic16_popGet(AOP(left), offl));
-    pic16_emitpcode(POC_RRNCFW, pic16_popCopyReg(&pic16_pc_wreg));
-    pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0xf8));
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    break;
+      break;
+    }
 
-  case 4:
-    pic16_emitpcode(POC_SWAPFW, pic16_popGet(AOP(left), offl));
-    pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0xf0));
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    break;
+    case 3:
+      if (same && AOP_TYPE(left) == AOP_ACC)
+        {
+          /* Reduces the number of instructions. */
+          pic16_emitpcode (POC_ADDFW, pic16_popGet (AOP (left), offl));
+          pic16_emitpcode (POC_ADDFW, pic16_popGet (AOP (left), offl));
+          pic16_emitpcode (POC_ADDFW, pic16_popGet (AOP (left), offl));
+        }
+      else
+        {
+          pic16_emitpcode (POC_SWAPFW, pic16_popGet (AOP (left), offl));
+          pic16_emitpcode (POC_RRNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+          pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0xf8));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+        }
+      break;
 
-  case 5:
-    pic16_emitpcode(POC_SWAPFW, pic16_popGet(AOP(left), offl));
-    pic16_emitpcode(POC_RLNCFW, pic16_popCopyReg(&pic16_pc_wreg));
-    pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0xe0));
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    break;
+    case 4:
+      pic16_emitpcode (POC_SWAPFW, pic16_popGet (AOP (left), offl));
+      pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0xf0));
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+      break;
 
-  case 6:
-    pic16_emitpcode(POC_RRNCFW, pic16_popGet(AOP(left), offl));
-    pic16_emitpcode(POC_RRNCFW, pic16_popCopyReg(&pic16_pc_wreg));
-    pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0xc0));
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    break;
+    case 5:
+      pic16_emitpcode (POC_SWAPFW, pic16_popGet (AOP (left), offl));
+      pic16_emitpcode (POC_RLNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0xe0));
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+      break;
 
-  case 7:
-    pic16_emitpcode(POC_RRNCFW, pic16_popGet(AOP(left), offl));
-    pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0x80));
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offr));
-    break;
+    case 6:
+      pic16_emitpcode (POC_RRNCFW, pic16_popGet (AOP (left), offl));
+      pic16_emitpcode (POC_RRNCFW, pic16_popCopyReg (&pic16_pc_wreg));
+      pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0xc0));
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+      break;
 
-  default:
-    pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result), offr));
-    break;
-  }
+    case 7:
+      pic16_emitpcode (POC_RRNCFW, pic16_popGet (AOP (left), offl));
+      pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0x80));
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+      break;
+
+    default:
+      pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), offr));
+      break;
+    }
 }
 
 /*-----------------------------------------------------------------*/
 /* movLeft2Result - move byte from left to result                  */
 /*-----------------------------------------------------------------*/
-static void movLeft2Result (operand *left, int offl,
-                            operand *result, int offr)
+static void
+movLeft2Result (operand * left, int offl, operand * result, int offr)
 {
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-  if (!pic16_sameRegs(AOP(left),AOP(result)) || (offl != offr)) {
-    pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left),offl));
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),offr));
-  }
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  if (!pic16_sameRegs (AOP (left), AOP (result)) || (offl != offr))
+    {
+      pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (left), offl));
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+    }
 }
 
 /*-----------------------------------------------------------------*/
 /* shiftL2Left2Result - shift left two bytes from left to result   */
 /*-----------------------------------------------------------------*/
-static void shiftL2Left2Result (operand *left, int offl,
-                                operand *result, int offr, int shCount)
+static void
+shiftL2Left2Result (operand * left, int offl, operand * result, int offr, int shCount)
 {
-  int same = pic16_sameRegs(AOP(result), AOP(left));
+  int same = pic16_sameRegs (AOP (result), AOP (left));
   int i;
 
-  DEBUGpic16_emitcode ("; ***","%s  %d shCount:%d same:%d offl:%d offr:%d",__FUNCTION__,__LINE__,shCount,same,offl,offr);
+  DEBUGpic16_emitcode ("; ***", "%s  %d shCount:%d same:%d offl:%d offr:%d", __FUNCTION__, __LINE__, shCount, same, offl, offr);
 
-  if (same && (offl != offr)) { // shift bytes
-    if (offr > offl) {
-       for(i=1;i>-1;i--) {
-         pic16_emitpcode(POC_MOVFW,pic16_popGet(AOP(result),offl+i));
-         pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),offr+i));
-       }
-    } else { // just treat as different later on
-                same = 0;
+  if (same && (offl != offr))   // shift bytes
+    {
+      if (offr > offl)
+        {
+          for (i = 1; i > -1; i--)
+            {
+              pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (result), offl + i));
+              pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr + i));
+            }
+        }
+      else                      // just treat as different later on
+        {
+          same = 0;
+        }
     }
-  }
 
-  if(same) {
-    switch(shCount) {
-    case 0:
-      break;
-    case 1:
-    case 2:
-    case 3:
+  if (same)
+    {
+      switch (shCount)
+        {
+        case 0:
+          break;
+        case 1:
+        case 2:
+        case 3:
 
-      pic16_emitpcode(POC_MOVFW,pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_ADDWF,pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_RLCF,  pic16_popGet(AOP(result),offr+MSB16));
+          pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_ADDWF, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (result), offr + MSB16));
 
-      while(--shCount) {
-                emitCLRC;
-                pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(result),offr));
-                pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(result),offr+MSB16));
-      }
+          while (--shCount)
+            {
+              emitCLRC;
+              pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (result), offr));
+              pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (result), offr + MSB16));
+            }
 
-      break;
-    case 4:
-    case 5:
-      pic16_emitpcode(POC_MOVLW, pic16_popGetLit(0x0f));
-      pic16_emitpcode(POC_ANDWF, pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_SWAPF, pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_SWAPF, pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_ANDFW, pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_XORWF, pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_ADDWF, pic16_popGet(AOP(result),offr+MSB16));
-      if(shCount >=5) {
-                pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(result),offr));
-                pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(result),offr+MSB16));
-      }
-      break;
-    case 6:
-      pic16_emitpcode(POC_RRCF,  pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_RRCF,  pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_RRCF,  pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_RRCF,  pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_RRCFW, pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_ANDLW,pic16_popGetLit(0xc0));
-      pic16_emitpcode(POC_XORFW,pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_XORWF,pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_XORFW,pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),offr+MSB16));
-      break;
-    case 7:
-      pic16_emitpcode(POC_RRCFW, pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_RRCFW, pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_RRCF,  pic16_popGet(AOP(result),offr));
-    }
+          break;
+        case 4:
+        case 5:
+          pic16_emitpcode (POC_MOVLW, pic16_popGetLit (0x0f));
+          pic16_emitpcode (POC_ANDWF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_SWAPF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_SWAPF, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_ANDFW, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_XORWF, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_ADDWF, pic16_popGet (AOP (result), offr + MSB16));
+          if (shCount >= 5)
+            {
+              pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (result), offr));
+              pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (result), offr + MSB16));
+            }
+          break;
+        case 6:
+          pic16_emitpcode (POC_RRCF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_RRCF, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_RRCF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_RRCF, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_RRCFW, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0xc0));
+          pic16_emitpcode (POC_XORFW, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_XORWF, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_XORFW, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr + MSB16));
+          break;
+        case 7:
+          pic16_emitpcode (POC_RRCFW, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_RRCFW, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_RRCF, pic16_popGet (AOP (result), offr));
+        }
 
-  } else {
-    switch(shCount) {
-    case 0:
-      break;
-    case 1:
-    case 2:
-    case 3:
-      /* note, use a mov/add for the shift since the mov has a
-         chance of getting optimized out */
-      pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left),offl));
-      pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_ADDWF, pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_RLCFW,  pic16_popGet(AOP(left),offl+MSB16));
-      pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),offr+MSB16));
+    }
+  else
+    {
+      switch (shCount)
+        {
+        case 0:
+          break;
+        case 1:
+        case 2:
+        case 3:
+          /* note, use a mov/add for the shift since the mov has a
+             chance of getting optimized out */
+          pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (left), offl));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_ADDWF, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_RLCFW, pic16_popGet (AOP (left), offl + MSB16));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr + MSB16));
 
-      while(--shCount) {
-                emitCLRC;
-                pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(result),offr));
-                pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(result),offr+MSB16));
-      }
-      break;
+          while (--shCount)
+            {
+              emitCLRC;
+              pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (result), offr));
+              pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (result), offr + MSB16));
+            }
+          break;
 
-    case 4:
-    case 5:
-      pic16_emitpcode(POC_SWAPFW,pic16_popGet(AOP(left),offl+MSB16));
-      pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0xF0));
-      pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_SWAPFW,pic16_popGet(AOP(left),offl));
-      pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0x0F));
-      pic16_emitpcode(POC_XORWF, pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_ADDWF, pic16_popGet(AOP(result),offr+MSB16));
+        case 4:
+        case 5:
+          pic16_emitpcode (POC_SWAPFW, pic16_popGet (AOP (left), offl + MSB16));
+          pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0xF0));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_SWAPFW, pic16_popGet (AOP (left), offl));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0x0F));
+          pic16_emitpcode (POC_XORWF, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_ADDWF, pic16_popGet (AOP (result), offr + MSB16));
 
 
-      if(shCount == 5) {
-                pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(result),offr));
-                pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(result),offr+MSB16));
-      }
-      break;
-    case 6:
-      pic16_emitpcode(POC_RRNCFW, pic16_popGet(AOP(left),offl));
-      pic16_emitpcode(POC_MOVWF,  pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_RRNCF,  pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_RRNCFW, pic16_popGet(AOP(left),offl+MSB16));
-      pic16_emitpcode(POC_MOVWF,  pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_RRNCF,  pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_MOVLW,  pic16_popGetLit(0xc0));
-      pic16_emitpcode(POC_ANDWF,  pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_ANDFW,  pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_XORFW,  pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_IORWF,  pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_XORWF,  pic16_popGet(AOP(result),offr));
-      break;
-    case 7:
-      pic16_emitpcode(POC_RRCFW, pic16_popGet(AOP(left),offl+MSB16));
-      pic16_emitpcode(POC_RRCFW, pic16_popGet(AOP(left),offl));
-      pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_RRCF,  pic16_popGet(AOP(result),offr));
+          if (shCount == 5)
+            {
+              pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (result), offr));
+              pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (result), offr + MSB16));
+            }
+          break;
+        case 6:
+          pic16_emitpcode (POC_RRNCFW, pic16_popGet (AOP (left), offl));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_RRNCF, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_RRNCFW, pic16_popGet (AOP (left), offl + MSB16));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_RRNCF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_MOVLW, pic16_popGetLit (0xc0));
+          pic16_emitpcode (POC_ANDWF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_ANDFW, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_XORFW, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_IORWF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_XORWF, pic16_popGet (AOP (result), offr));
+          break;
+        case 7:
+          pic16_emitpcode (POC_RRCFW, pic16_popGet (AOP (left), offl + MSB16));
+          pic16_emitpcode (POC_RRCFW, pic16_popGet (AOP (left), offl));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_RRCF, pic16_popGet (AOP (result), offr));
+        }
     }
-  }
 
 }
+
 /*-----------------------------------------------------------------*/
 /* shiftR2Left2Result - shift right two bytes from left to result  */
 /*-----------------------------------------------------------------*/
-static void shiftR2Left2Result (operand *left, int offl,
-                                operand *result, int offr,
-                                int shCount, int sign)
+static void
+shiftR2Left2Result (operand * left, int offl, operand * result, int offr, int shCount, int sign)
 {
-  int same = pic16_sameRegs(AOP(result), AOP(left));
+  int same = pic16_sameRegs (AOP (result), AOP (left));
   int i;
-  DEBUGpic16_emitcode ("; ***","%s  %d shCount:%d same:%d sign:%d",__FUNCTION__,__LINE__,shCount,same,sign);
+  DEBUGpic16_emitcode ("; ***", "%s  %d shCount:%d same:%d sign:%d", __FUNCTION__, __LINE__, shCount, same, sign);
 
-  if (same && (offl != offr)) { // shift right bytes
-    if (offr < offl) {
-       for(i=0;i<2;i++) {
-         pic16_emitpcode(POC_MOVFW,pic16_popGet(AOP(result),offl+i));
-         pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),offr+i));
-       }
-    } else { // just treat as different later on
-                same = 0;
+  if (same && (offl != offr))   // shift right bytes
+    {
+      if (offr < offl)
+        {
+          for (i = 0; i < 2; i++)
+            {
+              pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (result), offl + i));
+              pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr + i));
+            }
+        }
+      else                      // just treat as different later on
+        {
+          same = 0;
+        }
     }
-  }
 
-  switch(shCount) {
-  case 0:
-    break;
-  case 1:
-  case 2:
-  case 3:
-    /* obtain sign from left operand */
-    if(sign)
-      pic16_emitpcode(POC_RLCFW,pic16_popGet(AOP(left),offr+MSB16));
-    else
-      emitCLRC;
+  switch (shCount)
+    {
+    case 0:
+      break;
+    case 1:
+    case 2:
+    case 3:
+      /* obtain sign from left operand */
+      if (sign)
+        pic16_emitpcode (POC_RLCFW, pic16_popGet (AOP (left), offr + MSB16));
+      else
+        emitCLRC;
+
+      if (same)
+        {
+          pic16_emitpcode (POC_RRCF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_RRCF, pic16_popGet (AOP (result), offr));
+        }
+      else
+        {
+          pic16_emitpcode (POC_RRCFW, pic16_popGet (AOP (left), offl + MSB16));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_RRCFW, pic16_popGet (AOP (left), offl));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+        }
+
+      while (--shCount)
+        {
+          if (sign)
+            /* now get sign from already assigned result (avoid BANKSEL) */
+            pic16_emitpcode (POC_RLCFW, pic16_popGet (AOP (result), offr + MSB16));
+          else
+            emitCLRC;
+          pic16_emitpcode (POC_RRCF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_RRCF, pic16_popGet (AOP (result), offr));
+        }
+      break;
+    case 4:
+    case 5:
+      if (same)
+        {
+
+          pic16_emitpcode (POC_MOVLW, pic16_popGetLit (0xf0));
+          pic16_emitpcode (POC_ANDWF, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_SWAPF, pic16_popGet (AOP (result), offr));
+
+          pic16_emitpcode (POC_SWAPF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_ANDFW, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_XORWF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_ADDWF, pic16_popGet (AOP (result), offr));
+        }
+      else
+        {
+          pic16_emitpcode (POC_SWAPFW, pic16_popGet (AOP (left), offl));
+          pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0x0f));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+
+          pic16_emitpcode (POC_SWAPFW, pic16_popGet (AOP (left), offl + MSB16));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0xf0));
+          pic16_emitpcode (POC_XORWF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_ADDWF, pic16_popGet (AOP (result), offr));
+        }
+
+      if (shCount >= 5)
+        {
+          pic16_emitpcode (POC_RRCF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_RRCF, pic16_popGet (AOP (result), offr));
+        }
 
-    if(same) {
-      pic16_emitpcode(POC_RRCF,pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_RRCF,pic16_popGet(AOP(result),offr));
-    } else {
-      pic16_emitpcode(POC_RRCFW, pic16_popGet(AOP(left),offl+MSB16));
-      pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_RRCFW, pic16_popGet(AOP(left),offl));
-      pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),offr));
-    }
+      if (sign)
+        {
+          pic16_emitpcode (POC_MOVLW, pic16_popGetLit (0xf0 + (shCount - 4) * 8));
+          pic16_emitpcode (POC_BTFSC,
+                           pic16_newpCodeOpBit (pic16_aopGet (AOP (result), offr + MSB16, FALSE, FALSE), 7 - shCount, 0,
+                                                PO_GPR_REGISTER));
+          pic16_emitpcode (POC_ADDWF, pic16_popGet (AOP (result), offr + MSB16));
+        }
 
-    while(--shCount) {
-      if(sign)
-        /* now get sign from already assigned result (avoid BANKSEL) */
-        pic16_emitpcode(POC_RLCFW,pic16_popGet(AOP(result),offr+MSB16));
-      else
-        emitCLRC;
-      pic16_emitpcode(POC_RRCF,pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_RRCF,pic16_popGet(AOP(result),offr));
-    }
-    break;
-  case 4:
-  case 5:
-    if(same) {
-
-      pic16_emitpcode(POC_MOVLW, pic16_popGetLit(0xf0));
-      pic16_emitpcode(POC_ANDWF, pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_SWAPF, pic16_popGet(AOP(result),offr));
-
-      pic16_emitpcode(POC_SWAPF, pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_ANDFW, pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_XORWF, pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_ADDWF, pic16_popGet(AOP(result),offr));
-    } else {
-      pic16_emitpcode(POC_SWAPFW,pic16_popGet(AOP(left),offl));
-      pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0x0f));
-      pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),offr));
-
-      pic16_emitpcode(POC_SWAPFW,pic16_popGet(AOP(left),offl+MSB16));
-      pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_ANDLW, pic16_popGetLit(0xf0));
-      pic16_emitpcode(POC_XORWF, pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_ADDWF, pic16_popGet(AOP(result),offr));
-    }
-
-    if(shCount >=5) {
-      pic16_emitpcode(POC_RRCF, pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_RRCF, pic16_popGet(AOP(result),offr));
-    }
-
-    if(sign) {
-      pic16_emitpcode(POC_MOVLW, pic16_popGetLit(0xf0 + (shCount-4)*8 ));
-      pic16_emitpcode(POC_BTFSC,
-                pic16_newpCodeOpBit(pic16_aopGet(AOP(result),offr+MSB16,FALSE,FALSE),7-shCount,0, PO_GPR_REGISTER));
-      pic16_emitpcode(POC_ADDWF, pic16_popGet(AOP(result),offr+MSB16));
-    }
+      break;
 
-    break;
+    case 6:
+      if (same)
+        {
 
-  case 6:
-    if(same) {
+          pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (result), offr + MSB16));
 
-      pic16_emitpcode(POC_RLCF,  pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_RLCF,  pic16_popGet(AOP(result),offr+MSB16));
+          pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_RLCFW, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0x03));
+          if (sign)
+            {
+              pic16_emitpcode (POC_BTFSC,
+                               pic16_newpCodeOpBit (pic16_aopGet (AOP (result), offr, FALSE, FALSE), 0, 0, PO_GPR_REGISTER));
+              pic16_emitpcode (POC_IORLW, pic16_popGetLit (0xfc));
+            }
+          pic16_emitpcode (POC_XORFW, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_XORWF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_XORFW, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+        }
+      else
+        {
+          pic16_emitpcode (POC_RLCFW, pic16_popGet (AOP (left), offl));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_RLCFW, pic16_popGet (AOP (left), offl + MSB16));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (result), offr));
+          pic16_emitpcode (POC_RLCFW, pic16_popGet (AOP (result), offr + MSB16));
+          pic16_emitpcode (POC_ANDLW, pic16_popGetLit (0x03));
+          if (sign)
+            {
+              pic16_emitpcode (POC_BTFSC,
+                               pic16_newpCodeOpBit (pic16_aopGet (AOP (result), offr + MSB16, FALSE, FALSE), 0, 0,
+                                                    PO_GPR_REGISTER));
+              pic16_emitpcode (POC_IORLW, pic16_popGetLit (0xfc));
+            }
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr + MSB16));
+          //pic16_emitpcode(POC_RLCF,  pic16_popGet(AOP(result),offr));
 
-      pic16_emitpcode(POC_RLCF,  pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_RLCF,  pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_RLCFW, pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_ANDLW,pic16_popGetLit(0x03));
-      if(sign) {
-        pic16_emitpcode(POC_BTFSC,
-                  pic16_newpCodeOpBit(pic16_aopGet(AOP(result),offr,FALSE,FALSE),0,0, PO_GPR_REGISTER));
-        pic16_emitpcode(POC_IORLW,pic16_popGetLit(0xfc));
-      }
-      pic16_emitpcode(POC_XORFW,pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_XORWF,pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_XORFW,pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),offr));
-    } else {
-      pic16_emitpcode(POC_RLCFW, pic16_popGet(AOP(left),offl));
-      pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_RLCFW, pic16_popGet(AOP(left),offl+MSB16));
-      pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_RLCF,  pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_RLCF,  pic16_popGet(AOP(result),offr));
-      pic16_emitpcode(POC_RLCFW, pic16_popGet(AOP(result),offr+MSB16));
-      pic16_emitpcode(POC_ANDLW,pic16_popGetLit(0x03));
-      if(sign) {
-        pic16_emitpcode(POC_BTFSC,
-                  pic16_newpCodeOpBit(pic16_aopGet(AOP(result),offr+MSB16,FALSE,FALSE),0,0, PO_GPR_REGISTER));
-        pic16_emitpcode(POC_IORLW,pic16_popGetLit(0xfc));
-      }
-      pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),offr+MSB16));
-      //pic16_emitpcode(POC_RLCF,  pic16_popGet(AOP(result),offr));
 
+        }
 
+      break;
+    case 7:
+      pic16_emitpcode (POC_RLCFW, pic16_popGet (AOP (left), offl));
+      pic16_emitpcode (POC_RLCFW, pic16_popGet (AOP (left), offl + MSB16));
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offr));
+      pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), offr + MSB16));
+      if (sign)
+        {
+          emitSKPNC;
+          pic16_emitpcode (POC_DECF, pic16_popGet (AOP (result), offr + MSB16));
+        }
+      else
+        pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (result), offr + MSB16));
     }
-
-    break;
-  case 7:
-    pic16_emitpcode(POC_RLCFW, pic16_popGet(AOP(left),offl));
-    pic16_emitpcode(POC_RLCFW, pic16_popGet(AOP(left),offl+MSB16));
-    pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),offr));
-    pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result),offr+MSB16));
-    if(sign) {
-      emitSKPNC;
-      pic16_emitpcode(POC_DECF, pic16_popGet(AOP(result),offr+MSB16));
-    } else
-      pic16_emitpcode(POC_RLCF,  pic16_popGet(AOP(result),offr+MSB16));
-  }
 }
 
 
 /*-----------------------------------------------------------------*/
 /* shiftLLeftOrResult - shift left one byte from left, or to result*/
 /*-----------------------------------------------------------------*/
-static void shiftLLeftOrResult (operand *left, int offl,
-                                operand *result, int offr, int shCount)
+static void
+shiftLLeftOrResult (operand * left, int offl, operand * result, int offr, int shCount)
 {
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-    pic16_emitpcode(POC_MOVFW,pic16_popGet(AOP(left),offl));
-    /* shift left accumulator */
-    AccLsh(shCount, 1);
-    /* or with result */
-    /* back to result */
-    pic16_emitpcode(POC_IORWF,pic16_popGet(AOP(result),offr));
+  pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (left), offl));
+  /* shift left accumulator */
+  AccLsh (shCount, 1);
+  /* or with result */
+  /* back to result */
+  pic16_emitpcode (POC_IORWF, pic16_popGet (AOP (result), offr));
 }
 
 /*-----------------------------------------------------------------*/
 /* shiftRLeftOrResult - shift right one byte from left,or to result*/
 /*-----------------------------------------------------------------*/
-static void shiftRLeftOrResult (operand *left, int offl,
-                                operand *result, int offr, int shCount)
+static void
+shiftRLeftOrResult (operand * left, int offl, operand * result, int offr, int shCount)
 {
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-    pic16_emitpcode(POC_MOVFW,pic16_popGet(AOP(left),offl));
-    /* shift right accumulator */
-    AccRsh(shCount, 1);
-    /* or with result */
-    /* back to result */
-    pic16_emitpcode(POC_IORWF,pic16_popGet(AOP(result),offr));
+  pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (left), offl));
+  /* shift right accumulator */
+  AccRsh (shCount, 1);
+  /* or with result */
+  /* back to result */
+  pic16_emitpcode (POC_IORWF, pic16_popGet (AOP (result), offr));
 }
 
 /*-----------------------------------------------------------------*/
 /* genlshOne - left shift a one byte quantity by known count       */
 /*-----------------------------------------------------------------*/
-static void genlshOne (operand *result, operand *left, int shCount)
+static void
+genlshOne (operand * result, operand * left, int shCount)
 {
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    shiftL1Left2Result(left, LSB, result, LSB, shCount);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  shiftL1Left2Result (left, LSB, result, LSB, shCount);
 }
 
 /*-----------------------------------------------------------------*/
 /* genlshTwo - left shift two bytes by known amount != 0           */
 /*-----------------------------------------------------------------*/
-static void genlshTwo (operand *result,operand *left, int shCount)
+static void
+genlshTwo (operand * result, operand * left, int shCount)
 {
-    int size;
+  int size;
 
-    DEBUGpic16_emitcode ("; ***","%s  %d shCount:%d",__FUNCTION__,__LINE__,shCount);
-    size = pic16_getDataSize(result);
+  DEBUGpic16_emitcode ("; ***", "%s  %d shCount:%d", __FUNCTION__, __LINE__, shCount);
+  size = pic16_getDataSize (result);
 
-    /* if shCount >= 8 */
-    if (shCount >= 8) {
-        shCount -= 8 ;
+  /* if shCount >= 8 */
+  if (shCount >= 8)
+    {
+      shCount -= 8;
 
-        if (size > 1){
-            if (shCount)
-                shiftL1Left2Result(left, LSB, result, MSB16, shCount);
-            else
-                movLeft2Result(left, LSB, result, MSB16);
+      if (size > 1)
+        {
+          if (shCount)
+            shiftL1Left2Result (left, LSB, result, MSB16, shCount);
+          else
+            movLeft2Result (left, LSB, result, MSB16);
         }
-        pic16_emitpcode(POC_CLRF,pic16_popGet(AOP(result),LSB));
+      pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), LSB));
     }
 
-    /*  1 <= shCount <= 7 */
-    else {
-        if(size == 1)
-            shiftL1Left2Result(left, LSB, result, LSB, shCount);
-        else
-            shiftL2Left2Result(left, LSB, result, LSB, shCount);
+  /*  1 <= shCount <= 7 */
+  else
+    {
+      if (size == 1)
+        shiftL1Left2Result (left, LSB, result, LSB, shCount);
+      else
+        shiftL2Left2Result (left, LSB, result, LSB, shCount);
     }
 }
 
@@ -7273,202 +8198,234 @@
 /* shiftLLong - shift left one long from left to result            */
 /* offr = LSB or MSB16                                             */
 /*-----------------------------------------------------------------*/
-static void shiftLLong (operand *left, operand *result, int offr )
+static void
+shiftLLong (operand * left, operand * result, int offr)
 {
-    int size = AOP_SIZE(result);
-    int same = pic16_sameRegs(AOP(left),AOP(result));
-        int i;
+  int size = AOP_SIZE (result);
+  int same = pic16_sameRegs (AOP (left), AOP (result));
+  int i;
 
-    DEBUGpic16_emitcode ("; ***","%s  %d  offr:%d size:%d",__FUNCTION__,__LINE__,offr,size);
+  DEBUGpic16_emitcode ("; ***", "%s  %d  offr:%d size:%d", __FUNCTION__, __LINE__, offr, size);
 
-        if (same && (offr == MSB16)) { //shift one byte
-                for(i=size-1;i>=MSB16;i--) {
-                        pic16_emitpcode(POC_MOVFW,pic16_popGet(AOP(left),i-1));
-                        pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(left),i));
-                }
-        } else {
-                pic16_emitpcode(POC_MOVFW,pic16_popGet(AOP(left),LSB));
+  if (same && (offr == MSB16))  //shift one byte
+    {
+      for (i = size - 1; i >= MSB16; i--)
+        {
+          pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (left), i - 1));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (left), i));
         }
+    }
+  else
+    {
+      pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (left), LSB));
+    }
 
-    if (size > LSB+offr ){
-                if (same) {
-                        pic16_emitpcode(POC_ADDWF,pic16_popGet(AOP(left),LSB+offr));
-                } else {
-                        pic16_emitpcode(POC_ADDFW,pic16_popGet(AOP(left),LSB));
-                        pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),LSB+offr));
-                }
-         }
+  if (size > LSB + offr)
+    {
+      if (same)
+        {
+          pic16_emitpcode (POC_ADDWF, pic16_popGet (AOP (left), LSB + offr));
+        }
+      else
+        {
+          pic16_emitpcode (POC_ADDFW, pic16_popGet (AOP (left), LSB));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), LSB + offr));
+        }
+    }
 
-    if(size > MSB16+offr){
-                if (same) {
-                        pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(left),MSB16+offr));
-                } else {
-                        pic16_emitpcode(POC_RLCFW, pic16_popGet(AOP(left),MSB16));
-                        pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),MSB16+offr));
-                }
+  if (size > MSB16 + offr)
+    {
+      if (same)
+        {
+          pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (left), MSB16 + offr));
+        }
+      else
+        {
+          pic16_emitpcode (POC_RLCFW, pic16_popGet (AOP (left), MSB16));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), MSB16 + offr));
+        }
     }
 
-    if(size > MSB24+offr){
-                if (same) {
-                        pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(left),MSB24+offr));
-                } else {
-                        pic16_emitpcode(POC_RLCFW, pic16_popGet(AOP(left),MSB24));
-                        pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),MSB24+offr));
-                }
+  if (size > MSB24 + offr)
+    {
+      if (same)
+        {
+          pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (left), MSB24 + offr));
+        }
+      else
+        {
+          pic16_emitpcode (POC_RLCFW, pic16_popGet (AOP (left), MSB24));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), MSB24 + offr));
+        }
     }
 
-    if(size > MSB32+offr){
-                if (same) {
-                        pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(left),MSB32+offr));
-                } else {
-                        pic16_emitpcode(POC_RLCFW, pic16_popGet(AOP(left),MSB32));
-                        pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),MSB32+offr));
-                }
+  if (size > MSB32 + offr)
+    {
+      if (same)
+        {
+          pic16_emitpcode (POC_RLCF, pic16_popGet (AOP (left), MSB32 + offr));
+        }
+      else
+        {
+          pic16_emitpcode (POC_RLCFW, pic16_popGet (AOP (left), MSB32));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), MSB32 + offr));
+        }
     }
-    if(offr != LSB)
-                pic16_emitpcode(POC_CLRF,pic16_popGet(AOP(result),LSB));
+  if (offr != LSB)
+    pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), LSB));
 
 }
 
 /*-----------------------------------------------------------------*/
 /* genlshFour - shift four byte by a known amount != 0             */
 /*-----------------------------------------------------------------*/
-static void genlshFour (operand *result, operand *left, int shCount)
+static void
+genlshFour (operand * result, operand * left, int shCount)
 {
-    int size;
+  int size;
+
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  size = AOP_SIZE (result);
 
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    size = AOP_SIZE(result);
+  /* if shifting more that 3 bytes */
+  if (shCount >= 24)
+    {
+      shCount -= 24;
+      if (shCount)
+        /* lowest order of left goes to the highest
+           order of the destination */
+        shiftL1Left2Result (left, LSB, result, MSB32, shCount);
+      else
+        movLeft2Result (left, LSB, result, MSB32);
 
-    /* if shifting more that 3 bytes */
-    if (shCount >= 24 ) {
-        shCount -= 24;
-        if (shCount)
-            /* lowest order of left goes to the highest
-            order of the destination */
-            shiftL1Left2Result(left, LSB, result, MSB32, shCount);
-        else
-            movLeft2Result(left, LSB, result, MSB32);
-
-                pic16_emitpcode(POC_CLRF,pic16_popGet(AOP(result),LSB));
-                pic16_emitpcode(POC_CLRF,pic16_popGet(AOP(result),MSB16));
-                pic16_emitpcode(POC_CLRF,pic16_popGet(AOP(result),MSB24));
+      pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), LSB));
+      pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), MSB16));
+      pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), MSB24));
 
-        return;
+      return;
     }
 
-    /* more than two bytes */
-    else if ( shCount >= 16 ) {
-        /* lower order two bytes goes to higher order two bytes */
-        shCount -= 16;
-        /* if some more remaining */
-        if (shCount)
-            shiftL2Left2Result(left, LSB, result, MSB24, shCount);
-        else {
-            movLeft2Result(left, MSB16, result, MSB32);
-            movLeft2Result(left, LSB, result, MSB24);
+  /* more than two bytes */
+  else if (shCount >= 16)
+    {
+      /* lower order two bytes goes to higher order two bytes */
+      shCount -= 16;
+      /* if some more remaining */
+      if (shCount)
+        shiftL2Left2Result (left, LSB, result, MSB24, shCount);
+      else
+        {
+          movLeft2Result (left, MSB16, result, MSB32);
+          movLeft2Result (left, LSB, result, MSB24);
         }
-                pic16_emitpcode(POC_CLRF,pic16_popGet(AOP(result),LSB));
-                pic16_emitpcode(POC_CLRF,pic16_popGet(AOP(result),MSB16));
-        return;
+      pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), LSB));
+      pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), MSB16));
+      return;
     }
 
-    /* if more than 1 byte */
-    else if ( shCount >= 8 ) {
-        /* lower order three bytes goes to higher order  three bytes */
-        shCount -= 8;
-        if(size == 2){
-            if(shCount)
-                shiftL1Left2Result(left, LSB, result, MSB16, shCount);
-            else
-                movLeft2Result(left, LSB, result, MSB16);
+  /* if more than 1 byte */
+  else if (shCount >= 8)
+    {
+      /* lower order three bytes goes to higher order  three bytes */
+      shCount -= 8;
+      if (size == 2)
+        {
+          if (shCount)
+            shiftL1Left2Result (left, LSB, result, MSB16, shCount);
+          else
+            movLeft2Result (left, LSB, result, MSB16);
         }
-        else{   /* size = 4 */
-            if(shCount == 0){
-                movLeft2Result(left, MSB24, result, MSB32);
-                movLeft2Result(left, MSB16, result, MSB24);
-                movLeft2Result(left, LSB, result, MSB16);
-                                pic16_emitpcode(POC_CLRF,pic16_popGet(AOP(result),LSB));
-            }
-            else if(shCount == 1)
-                shiftLLong(left, result, MSB16);
-            else{
-                shiftL2Left2Result(left, MSB16, result, MSB24, shCount);
-                shiftL1Left2Result(left, LSB, result, MSB16, shCount);
-                shiftRLeftOrResult(left, LSB, result, MSB24, 8 - shCount);
-                                pic16_emitpcode(POC_CLRF,pic16_popGet(AOP(result),LSB));
+      else                      /* size = 4 */
+        {
+          if (shCount == 0)
+            {
+              movLeft2Result (left, MSB24, result, MSB32);
+              movLeft2Result (left, MSB16, result, MSB24);
+              movLeft2Result (left, LSB, result, MSB16);
+              pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), LSB));
+            }
+          else if (shCount == 1)
+            shiftLLong (left, result, MSB16);
+          else
+            {
+              shiftL2Left2Result (left, MSB16, result, MSB24, shCount);
+              shiftL1Left2Result (left, LSB, result, MSB16, shCount);
+              shiftRLeftOrResult (left, LSB, result, MSB24, 8 - shCount);
+              pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), LSB));
             }
         }
     }
 
-    /* 1 <= shCount <= 7 */
-    else if(shCount <= 3)
-    {
-        shiftLLong(left, result, LSB);
-        while(--shCount >= 1)
-            shiftLLong(result, result, LSB);
-    }
-    /* 3 <= shCount <= 7, optimize */
-    else{
-        shiftL2Left2Result(left, MSB24, result, MSB24, shCount);
-        shiftRLeftOrResult(left, MSB16, result, MSB24, 8 - shCount);
-        shiftL2Left2Result(left, LSB, result, LSB, shCount);
+  /* 1 <= shCount <= 7 */
+  else if (shCount <= 3)
+    {
+      shiftLLong (left, result, LSB);
+      while (--shCount >= 1)
+        shiftLLong (result, result, LSB);
+    }
+  /* 3 <= shCount <= 7, optimize */
+  else
+    {
+      shiftL2Left2Result (left, MSB24, result, MSB24, shCount);
+      shiftRLeftOrResult (left, MSB16, result, MSB24, 8 - shCount);
+      shiftL2Left2Result (left, LSB, result, LSB, shCount);
     }
 }
 
 /*-----------------------------------------------------------------*/
 /* genLeftShiftLiteral - left shifting by known count              */
 /*-----------------------------------------------------------------*/
-void pic16_genLeftShiftLiteral (operand *left,
-                                 operand *right,
-                                 operand *result,
-                                 iCode *ic)
-{
-    int shCount = abs((int) ulFromVal (AOP(right)->aopu.aop_lit));
-    int size;
-
-    FENTRY;
-    DEBUGpic16_emitcode ("; ***","shCount:%d", shCount);
-    pic16_freeAsmop(right,NULL,ic,TRUE);
+void
+pic16_genLeftShiftLiteral (operand * left, operand * right, operand * result, iCode * ic)
+{
+  int shCount = abs ((int) ulFromVal (AOP (right)->aopu.aop_lit));
+  int size;
+
+  FENTRY;
+  DEBUGpic16_emitcode ("; ***", "shCount:%d", shCount);
+  pic16_freeAsmop (right, NULL, ic, TRUE);
 
-    pic16_aopOp(left,ic,FALSE);
-    pic16_aopOp(result,ic,TRUE);
+  pic16_aopOp (left, ic, FALSE);
+  pic16_aopOp (result, ic, TRUE);
 
-    size = getSize(operandType(result));
+  size = getSize (operandType (result));
 
 #if VIEW_SIZE
-    pic16_emitcode("; shift left ","result %d, left %d",size,
-             AOP_SIZE(left));
+  pic16_emitcode ("; shift left ", "result %d, left %d", size, AOP_SIZE (left));
 #endif
 
-    /* I suppose that the left size >= result size */
-    if(shCount == 0){
-        while(size--){
-            movLeft2Result(left, size, result, size);
+  /* I suppose that the left size >= result size */
+  if (shCount == 0)
+    {
+      while (size--)
+        {
+          movLeft2Result (left, size, result, size);
         }
     }
 
-    else if(shCount >= (size * 8))
-        while(size--)
-            pic16_aopPut(AOP(result),zero,size);
-    else{
-        switch (size) {
-            case 1:
-                genlshOne (result,left,shCount);
-                break;
+  else if (shCount >= (size * 8))
+    while (size--)
+      pic16_aopPut (AOP (result), zero, size);
+  else
+    {
+      switch (size)
+        {
+        case 1:
+          genlshOne (result, left, shCount);
+          break;
 
-            case 2:
-            case 3:
-                genlshTwo (result,left,shCount);
-                break;
+        case 2:
+        case 3:
+          genlshTwo (result, left, shCount);
+          break;
 
-            case 4:
-                genlshFour (result,left,shCount);
-                break;
+        case 4:
+          genlshFour (result, left, shCount);
+          break;
         }
     }
-    pic16_freeAsmop(left,NULL,ic,TRUE);
-    pic16_freeAsmop(result,NULL,ic,TRUE);
+  pic16_freeAsmop (left, NULL, ic, TRUE);
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*
@@ -7476,266 +8433,306 @@
  * if endian == 1, then the high byte (i.e base address + size of
  * register) is used first else the low byte is used first;
  *-----------------------------------------------------------------*/
-static void genMultiAsm( PIC_OPCODE poc, operand *reg, int size, int endian)
+static void
+genMultiAsm (PIC_OPCODE poc, operand * reg, int size, int endian)
 {
 
   int offset = 0;
 
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-  if(!reg)
+  if (!reg)
     return;
 
-  if(!endian) {
-    endian = 1;
-  } else {
-    endian = -1;
-    offset = size-1;
-  }
+  if (!endian)
+    {
+      endian = 1;
+    }
+  else
+    {
+      endian = -1;
+      offset = size - 1;
+    }
 
-  while(size--) {
-    pic16_emitpcode(poc,    pic16_popGet(AOP(reg),offset));
-    offset += endian;
-  }
+  while (size--)
+    {
+      pic16_emitpcode (poc, pic16_popGet (AOP (reg), offset));
+      offset += endian;
+    }
 
 }
 
 /*-----------------------------------------------------------------*/
 /* genrshOne - right shift a one byte quantity by known count      */
 /*-----------------------------------------------------------------*/
-static void genrshOne (operand *result, operand *left,
-                       int shCount, int sign)
+static void
+genrshOne (operand * result, operand * left, int shCount, int sign)
 {
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    shiftR1Left2Result(left, LSB, result, LSB, shCount, sign);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  shiftR1Left2Result (left, LSB, result, LSB, shCount, sign);
 }
 
 /*-----------------------------------------------------------------*/
 /* genrshTwo - right shift two bytes by known amount != 0          */
 /*-----------------------------------------------------------------*/
-static void genrshTwo (operand *result,operand *left,
-                       int shCount, int sign)
+static void
+genrshTwo (operand * result, operand * left, int shCount, int sign)
 {
-  DEBUGpic16_emitcode ("; ***","%s  %d shCount:%d",__FUNCTION__,__LINE__,shCount);
+  DEBUGpic16_emitcode ("; ***", "%s  %d shCount:%d", __FUNCTION__, __LINE__, shCount);
   /* if shCount >= 8 */
-  if (shCount >= 8) {
-    shCount -= 8 ;
-    if (shCount)
-      shiftR1Left2Result(left, MSB16, result, LSB,
-                         shCount, sign);
-    else
-      movLeft2Result(left, MSB16, result, LSB);
+  if (shCount >= 8)
+    {
+      shCount -= 8;
+      if (shCount)
+        shiftR1Left2Result (left, MSB16, result, LSB, shCount, sign);
+      else
+        movLeft2Result (left, MSB16, result, LSB);
 
-    pic16_addSign (result, 1, sign);
-  }
+      pic16_addSign (result, 1, sign);
+    }
 
   /*  1 <= shCount <= 7 */
   else
-    shiftR2Left2Result(left, LSB, result, LSB, shCount, sign);
+    shiftR2Left2Result (left, LSB, result, LSB, shCount, sign);
 }
 
 /*-----------------------------------------------------------------*/
 /* shiftRLong - shift right one long from left to result           */
 /* offl = LSB or MSB16                                             */
 /*-----------------------------------------------------------------*/
-static void shiftRLong (operand *left, int offl,
-                        operand *result, int sign)
+static void
+shiftRLong (operand * left, int offl, operand * result, int sign)
 {
-    int size = AOP_SIZE(result);
-    int same = pic16_sameRegs(AOP(left),AOP(result));
-    int i;
-    DEBUGpic16_emitcode ("; ***","%s  %d  offl:%d size:%d",__FUNCTION__,__LINE__,offl,size);
+  int size = AOP_SIZE (result);
+  int same = pic16_sameRegs (AOP (left), AOP (result));
+  int i;
+  DEBUGpic16_emitcode ("; ***", "%s  %d  offl:%d size:%d", __FUNCTION__, __LINE__, offl, size);
 
-        if (same && (offl == MSB16)) { //shift one byte right
-                for(i=MSB16;i<size;i++) {
-                        pic16_emitpcode(POC_MOVFW,pic16_popGet(AOP(left),i));
-                        pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(left),i-1));
-                }
+  if (same && (offl == MSB16))  //shift one byte right
+    {
+      for (i = MSB16; i < size; i++)
+        {
+          pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (left), i));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (left), i - 1));
         }
+    }
 
-    if(sign)
-                pic16_emitpcode(POC_RLCFW,pic16_popGet(AOP(left),MSB32));
-        else
-                emitCLRC;
+  if (sign)
+    pic16_emitpcode (POC_RLCFW, pic16_popGet (AOP (left), MSB32));
+  else
+    emitCLRC;
 
-        if (same) {
-                if (offl == LSB)
-                pic16_emitpcode(POC_RRCF, pic16_popGet(AOP(left),MSB32));
-        } else {
-        pic16_emitpcode(POC_RRCFW, pic16_popGet(AOP(left),MSB32));
-        pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),MSB32-offl));
-        }
-
-    if(offl == MSB16) {
-        /* add sign of "a" */
-        pic16_addSign(result, MSB32, sign);
-        }
-
-        if (same) {
-        pic16_emitpcode(POC_RRCF, pic16_popGet(AOP(left),MSB24));
-        } else {
-        pic16_emitpcode(POC_RRCFW, pic16_popGet(AOP(left),MSB24));
-        pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),MSB24-offl));
-        }
-
-        if (same) {
-        pic16_emitpcode(POC_RRCF, pic16_popGet(AOP(left),MSB16));
-        } else {
-        pic16_emitpcode(POC_RRCFW, pic16_popGet(AOP(left),MSB16));
-        pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),MSB16-offl));
-        }
-
-        if (same) {
-        pic16_emitpcode(POC_RRCF, pic16_popGet(AOP(left),LSB));
-        } else {
-        if(offl == LSB){
-                pic16_emitpcode(POC_RRCFW, pic16_popGet(AOP(left),LSB));
-                pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),LSB));
-        }
+  if (same)
+    {
+      if (offl == LSB)
+        pic16_emitpcode (POC_RRCF, pic16_popGet (AOP (left), MSB32));
+    }
+  else
+    {
+      pic16_emitpcode (POC_RRCFW, pic16_popGet (AOP (left), MSB32));
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), MSB32 - offl));
+    }
+
+  if (offl == MSB16)
+    {
+      /* add sign of "a" */
+      pic16_addSign (result, MSB32, sign);
+    }
+
+  if (same)
+    {
+      pic16_emitpcode (POC_RRCF, pic16_popGet (AOP (left), MSB24));
+    }
+  else
+    {
+      pic16_emitpcode (POC_RRCFW, pic16_popGet (AOP (left), MSB24));
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), MSB24 - offl));
+    }
+
+  if (same)
+    {
+      pic16_emitpcode (POC_RRCF, pic16_popGet (AOP (left), MSB16));
+    }
+  else
+    {
+      pic16_emitpcode (POC_RRCFW, pic16_popGet (AOP (left), MSB16));
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), MSB16 - offl));
+    }
+
+  if (same)
+    {
+      pic16_emitpcode (POC_RRCF, pic16_popGet (AOP (left), LSB));
+    }
+  else
+    {
+      if (offl == LSB)
+        {
+          pic16_emitpcode (POC_RRCFW, pic16_popGet (AOP (left), LSB));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), LSB));
         }
+    }
 }
 
 /*-----------------------------------------------------------------*/
 /* genrshFour - shift four byte by a known amount != 0             */
 /*-----------------------------------------------------------------*/
-static void genrshFour (operand *result, operand *left,
-                        int shCount, int sign)
+static void
+genrshFour (operand * result, operand * left, int shCount, int sign)
 {
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
   /* if shifting more that 3 bytes */
-  if(shCount >= 24 ) {
-    shCount -= 24;
-    if(shCount)
-      shiftR1Left2Result(left, MSB32, result, LSB, shCount, sign);
-    else
-      movLeft2Result(left, MSB32, result, LSB);
+  if (shCount >= 24)
+    {
+      shCount -= 24;
+      if (shCount)
+        shiftR1Left2Result (left, MSB32, result, LSB, shCount, sign);
+      else
+        movLeft2Result (left, MSB32, result, LSB);
 
-    pic16_addSign(result, MSB16, sign);
-  }
-  else if(shCount >= 16){
-    shCount -= 16;
-    if(shCount)
-      shiftR2Left2Result(left, MSB24, result, LSB, shCount, sign);
-    else{
-      movLeft2Result(left, MSB24, result, LSB);
-      movLeft2Result(left, MSB32, result, MSB16);
+      pic16_addSign (result, MSB16, sign);
     }
-    pic16_addSign(result, MSB24, sign);
-  }
-  else if(shCount >= 8){
-    shCount -= 8;
-    if(shCount == 1)
-      shiftRLong(left, MSB16, result, sign);
-    else if(shCount == 0){
-      movLeft2Result(left, MSB16, result, LSB);
-      movLeft2Result(left, MSB24, result, MSB16);
-      movLeft2Result(left, MSB32, result, MSB24);
-      pic16_addSign(result, MSB32, sign);
-    }
-    else{ //shcount >= 2
-      shiftR2Left2Result(left, MSB16, result, LSB, shCount, 0);
-      shiftLLeftOrResult(left, MSB32, result, MSB16, 8 - shCount);
-      /* the last shift is signed */
-      shiftR1Left2Result(left, MSB32, result, MSB24, shCount, sign);
-      pic16_addSign(result, MSB32, sign);
+  else if (shCount >= 16)
+    {
+      shCount -= 16;
+      if (shCount)
+        shiftR2Left2Result (left, MSB24, result, LSB, shCount, sign);
+      else
+        {
+          movLeft2Result (left, MSB24, result, LSB);
+          movLeft2Result (left, MSB32, result, MSB16);
+        }
+      pic16_addSign (result, MSB24, sign);
     }
-  }
-  else{   /* 1 <= shCount <= 7 */
-    if(shCount <= 2){
-      shiftRLong(left, LSB, result, sign);
-      if(shCount == 2)
-        shiftRLong(result, LSB, result, sign);
-    }
-    else{
-      shiftR2Left2Result(left, LSB, result, LSB, shCount, 0);
-      shiftLLeftOrResult(left, MSB24, result, MSB16, 8 - shCount);
-      shiftR2Left2Result(left, MSB24, result, MSB24, shCount, sign);
+  else if (shCount >= 8)
+    {
+      shCount -= 8;
+      if (shCount == 1)
+        shiftRLong (left, MSB16, result, sign);
+      else if (shCount == 0)
+        {
+          movLeft2Result (left, MSB16, result, LSB);
+          movLeft2Result (left, MSB24, result, MSB16);
+          movLeft2Result (left, MSB32, result, MSB24);
+          pic16_addSign (result, MSB32, sign);
+        }
+      else                      //shcount >= 2
+        {
+          shiftR2Left2Result (left, MSB16, result, LSB, shCount, 0);
+          shiftLLeftOrResult (left, MSB32, result, MSB16, 8 - shCount);
+          /* the last shift is signed */
+          shiftR1Left2Result (left, MSB32, result, MSB24, shCount, sign);
+          pic16_addSign (result, MSB32, sign);
+        }
+    }
+  else                          /* 1 <= shCount <= 7 */
+    {
+      if (shCount <= 2)
+        {
+          shiftRLong (left, LSB, result, sign);
+          if (shCount == 2)
+            shiftRLong (result, LSB, result, sign);
+        }
+      else
+        {
+          shiftR2Left2Result (left, LSB, result, LSB, shCount, 0);
+          shiftLLeftOrResult (left, MSB24, result, MSB16, 8 - shCount);
+          shiftR2Left2Result (left, MSB24, result, MSB24, shCount, sign);
+        }
     }
-  }
 }
 
 /*-----------------------------------------------------------------*/
 /* genRightShiftLiteral - right shifting by known count            */
 /*-----------------------------------------------------------------*/
-static void genRightShiftLiteral (operand *left,
-                                  operand *right,
-                                  operand *result,
-                                  iCode *ic,
-                                  int sign)
+static void
+genRightShiftLiteral (operand * left, operand * right, operand * result, iCode * ic, int sign)
 {
-  int shCount = abs((int) ulFromVal (AOP(right)->aopu.aop_lit));
-  int lsize,res_size;
+  int shCount = abs ((int) ulFromVal (AOP (right)->aopu.aop_lit));
+  int lsize, res_size;
 
-  pic16_freeAsmop(right,NULL,ic,TRUE);
+  pic16_freeAsmop (right, NULL, ic, TRUE);
 
-  pic16_aopOp(left,ic,FALSE);
-  pic16_aopOp(result,ic,TRUE);
+  pic16_aopOp (left, ic, FALSE);
+  pic16_aopOp (result, ic, TRUE);
 
-  DEBUGpic16_emitcode ("; ***","%s  %d shCount:%d result:%d left:%d",__FUNCTION__,__LINE__,shCount,AOP_SIZE(result),AOP_SIZE(left));
+  DEBUGpic16_emitcode ("; ***", "%s  %d shCount:%d result:%d left:%d", __FUNCTION__, __LINE__, shCount, AOP_SIZE (result),
+                       AOP_SIZE (left));
 
 #if VIEW_SIZE
-  pic16_emitcode("; shift right ","result %d, left %d",AOP_SIZE(result),
-                 AOP_SIZE(left));
+  pic16_emitcode ("; shift right ", "result %d, left %d", AOP_SIZE (result), AOP_SIZE (left));
 #endif
 
-  lsize = pic16_getDataSize(left);
-  res_size = pic16_getDataSize(result);
+  lsize = pic16_getDataSize (left);
+  res_size = pic16_getDataSize (result);
   /* test the LEFT size !!! */
 
   /* I suppose that the left size >= result size */
-  if (shCount == 0) {
-    assert (res_size <= lsize);
-    while (res_size--) {
-      pic16_mov2f (AOP(result), AOP(left), res_size);
-    } // for
-  } else if (shCount >= (lsize * 8)) {
-    if (sign) {
-      /*
-       * Do NOT use
-       *    CLRF    result
-       *    BTFSC   left, 7
-       *    SETF    result
-       * even for 8-bit operands; result might be an SFR.
-       */
-      pic16_emitpcode(POC_MOVLW, pic16_popGetLit(0x00));
-      pic16_emitpcode(POC_BTFSC, pic16_popCopyGPR2Bit(pic16_popGet(AOP(left), lsize-1), 7));
-      pic16_emitpcode(POC_MOVLW, pic16_popGetLit(0xff));
-      while (res_size--) {
-        pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), res_size));
-      }
-    } else { // unsigned
-      while (res_size--) {
-        pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result), res_size));
-      }
+  if (shCount == 0)
+    {
+      assert (res_size <= lsize);
+      while (res_size--)
+        {
+          pic16_mov2f (AOP (result), AOP (left), res_size);
+        }                       // for
     }
-  } else { // 0 < shCount < 8*lsize
-    switch (res_size) {
-    case 1:
-      genrshOne (result,left,shCount,sign);
-      break;
+  else if (shCount >= (lsize * 8))
+    {
+      if (sign)
+        {
+          /*
+           * Do NOT use
+           *    CLRF    result
+           *    BTFSC   left, 7
+           *    SETF    result
+           * even for 8-bit operands; result might be an SFR.
+           */
+          pic16_emitpcode (POC_MOVLW, pic16_popGetLit (0x00));
+          pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit (pic16_popGet (AOP (left), lsize - 1), 7));
+          pic16_emitpcode (POC_MOVLW, pic16_popGetLit (0xff));
+          while (res_size--)
+            {
+              pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), res_size));
+            }
+        }
+      else                      // unsigned
+        {
+          while (res_size--)
+            {
+              pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), res_size));
+            }
+        }
+    }
+  else                          // 0 < shCount < 8*lsize
+    {
+      switch (res_size)
+        {
+        case 1:
+          genrshOne (result, left, shCount, sign);
+          break;
 
-    case 2:
-      genrshTwo (result,left,shCount,sign);
-      break;
+        case 2:
+          genrshTwo (result, left, shCount, sign);
+          break;
 
-    case 4:
-      genrshFour (result,left,shCount,sign);
-      break;
-    default :
-      break;
+        case 4:
+          genrshFour (result, left, shCount, sign);
+          break;
+        default:
+          break;
+        }
     }
-  }
 
-  pic16_freeAsmop(left,NULL,ic,TRUE);
-  pic16_freeAsmop(result,NULL,ic,TRUE);
+  pic16_freeAsmop (left, NULL, ic, TRUE);
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genGenericShift - generates code for left or right shifting     */
 /*-----------------------------------------------------------------*/
-static void genGenericShift (iCode *ic, int isShiftLeft)
+static void
+genGenericShift (iCode * ic, int isShiftLeft)
 {
-  operand *left,*right, *result;
+  operand *left, *right, *result;
   int offset;
   int sign, signedCount;
   symbol *label_complete, *label_loop_pos, *label_loop_neg, *label_negative;
@@ -7743,32 +8740,37 @@
 
   FENTRY;
 
-  right = IC_RIGHT(ic);
-  left  = IC_LEFT(ic);
-  result = IC_RESULT(ic);
-
-  pic16_aopOp(right,ic,FALSE);
-  pic16_aopOp(left,ic,FALSE);
-  pic16_aopOp(result,ic,TRUE);
+  right = IC_RIGHT (ic);
+  left = IC_LEFT (ic);
+  result = IC_RESULT (ic);
+
+  pic16_aopOp (right, ic, FALSE);
+  pic16_aopOp (left, ic, FALSE);
+  pic16_aopOp (result, ic, TRUE);
 
-  sign = !SPEC_USIGN(operandType (left));
-  signedCount = !SPEC_USIGN(operandType (right));
+  sign = !SPEC_USIGN (operandType (left));
+  signedCount = !SPEC_USIGN (operandType (right));
 
   /* if the shift count is known then do it
      as efficiently as possible */
-  if (AOP_TYPE(right) == AOP_LIT) {
-    long lit = (long) ulFromVal (AOP(right)->aopu.aop_lit);
-    if (signedCount && lit < 0) { lit = -lit; isShiftLeft = !isShiftLeft; }
-    // we should modify right->aopu.aop_lit here!
-    // Instead we use abs(shCount) in genXXXShiftLiteral()...
-    // lit > 8*size is handled in pic16_genXXXShiftLiteral()
-    if (isShiftLeft)
-      pic16_genLeftShiftLiteral (left,right,result,ic);
-    else
-      genRightShiftLiteral (left,right,result,ic, sign);
+  if (AOP_TYPE (right) == AOP_LIT)
+    {
+      long lit = (long) ulFromVal (AOP (right)->aopu.aop_lit);
+      if (signedCount && lit < 0)
+        {
+          lit = -lit;
+          isShiftLeft = !isShiftLeft;
+        }
+      // we should modify right->aopu.aop_lit here!
+      // Instead we use abs(shCount) in genXXXShiftLiteral()...
+      // lit > 8*size is handled in pic16_genXXXShiftLiteral()
+      if (isShiftLeft)
+        pic16_genLeftShiftLiteral (left, right, result, ic);
+      else
+        genRightShiftLiteral (left, right, result, ic, sign);
 
-    goto release;
-  } // if (right is literal)
+      goto release;
+    }                           // if (right is literal)
 
   /* shift count is unknown then we have to form a loop.
    * Note: we take only the lower order byte since shifting
@@ -7778,18 +8780,19 @@
    * signed and we do an (effective) right shift, i. e. we
    * shift in the sign bit from the left. */
 
-  label_complete = newiTempLabel ( NULL );
-  label_loop_pos = newiTempLabel ( NULL );
+  label_complete = newiTempLabel (NULL);
+  label_loop_pos = newiTempLabel (NULL);
   label_loop_neg = NULL;
   label_negative = NULL;
   pos_shift = isShiftLeft ? POC_RLCF : POC_RRCF;
   neg_shift = isShiftLeft ? POC_RRCF : POC_RLCF;
 
-  if (signedCount) {
-    // additional labels needed
-    label_loop_neg = newiTempLabel ( NULL );
-    label_negative = newiTempLabel ( NULL );
-  } // if
+  if (signedCount)
+    {
+      // additional labels needed
+      label_loop_neg = newiTempLabel (NULL);
+      label_negative = newiTempLabel (NULL);
+    }                           // if
 
   /*
    * The code below overwrites the shift count for `val = (1 << val)'
@@ -7797,46 +8800,58 @@
    * XXX: This problem should have been/is also addressed in ralloc.c,
    *      but the code there seems not to catch this case ...
    */
-  if (pic16_sameRegs (AOP(right), AOP(result))) {
-    // We abuse FSR0L as a temporary, pic16_popGetTempReg() is too costly.
-    pic16_mov2w (AOP(right), 0);
-    pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_fsr0l));
-  } // if
+  if (pic16_sameRegs (AOP (right), AOP (result)))
+    {
+      // We abuse FSR0L as a temporary, pic16_popGetTempReg() is too costly.
+      pic16_mov2w (AOP (right), 0);
+      pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_fsr0l));
+    }                           // if
 
   // copy source to result -- this will effectively truncate the left operand to the size of result!
   // (e.g. char c = 0x100 << -3 will become c = 0x00 >> 3 == 0x00 instad of 0x20)
   // This is fine, as it only occurs for left shifting with negative count which is not standardized!
-  for (offset=0; offset < min(AOP_SIZE(left), AOP_SIZE(result)); offset++) {
-    pic16_mov2f (AOP(result),AOP(left), offset);
-  } // for
+  for (offset = 0; offset < min (AOP_SIZE (left), AOP_SIZE (result)); offset++)
+    {
+      pic16_mov2f (AOP (result), AOP (left), offset);
+    }                           // for
 
   // if result is longer than left, fill with zeros (or sign)
-  if (AOP_SIZE(left) < AOP_SIZE(result)) {
-    if (sign && AOP_SIZE(left) > 0) {
-      // shift signed operand -- fill with sign
-      pic16_emitpcode (POC_CLRF, pic16_popCopyReg (&pic16_pc_wreg));
-      pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit(pic16_popGet(AOP(result), AOP_SIZE(left)-1), 7));
-      pic16_emitpcode (POC_MOVLW, pic16_popGetLit (0xFF));
-      for (offset=AOP_SIZE(left); offset < AOP_SIZE(result); offset++) {
-        pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP(result), offset));
-      } // for
-    } else {
-      // shift unsigned operand -- fill result with zeros
-      for (offset=AOP_SIZE(left); offset < AOP_SIZE(result); offset++) {
-        pic16_emitpcode (POC_CLRF, pic16_popGet (AOP(result), offset));
-      } // for
-    }
-  } // if (size mismatch)
+  if (AOP_SIZE (left) < AOP_SIZE (result))
+    {
+      if (sign && AOP_SIZE (left) > 0)
+        {
+          // shift signed operand -- fill with sign
+          pic16_emitpcode (POC_CLRF, pic16_popCopyReg (&pic16_pc_wreg));
+          pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit (pic16_popGet (AOP (result), AOP_SIZE (left) - 1), 7));
+          pic16_emitpcode (POC_MOVLW, pic16_popGetLit (0xFF));
+          for (offset = AOP_SIZE (left); offset < AOP_SIZE (result); offset++)
+            {
+              pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));
+            }                   // for
+        }
+      else
+        {
+          // shift unsigned operand -- fill result with zeros
+          for (offset = AOP_SIZE (left); offset < AOP_SIZE (result); offset++)
+            {
+              pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), offset));
+            }                   // for
+        }
+    }                           // if (size mismatch)
 
   /* load/restore shift count */
-  if (pic16_sameRegs (AOP(right), AOP(result))) {
-    pic16_emitpcode (POC_MOVFW, pic16_popCopyReg (&pic16_pc_fsr0l));
-  } else {
-    pic16_mov2w (AOP(right), 0);
-  } // if
+  if (pic16_sameRegs (AOP (right), AOP (result)))
+    {
+      pic16_emitpcode (POC_MOVFW, pic16_popCopyReg (&pic16_pc_fsr0l));
+    }
+  else
+    {
+      pic16_mov2w (AOP (right), 0);
+    }                           // if
 
   pic16_emitpcode (POC_BZ, pic16_popGetLabel (label_complete->key));
-  if (signedCount) pic16_emitpcode (POC_BN, pic16_popGetLabel (label_negative->key));
+  if (signedCount)
+    pic16_emitpcode (POC_BN, pic16_popGetLabel (label_negative->key));
 
 #if 0
   // perform a shift by one (shift count is positive)
@@ -7844,11 +8859,12 @@
   // 2n+[2,3]+({1,3}+n+3)c-2+[0,2]=({4,6}+n)c+2n+[0,3]          ({5,7}c+[2,5] / {6,8}c+[4, 7] / {8,10}c+[ 8,11])
   pic16_emitpLabel (label_loop_pos->key);
   emitCLRC;
-  if (sign && (pos_shift == POC_RRCF)) {
-    pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit(pic16_popGet(AOP(result), AOP_SIZE(result)-1), 7));
-    emitSETC;
-  } // if
-  genMultiAsm (pos_shift, result, AOP_SIZE(result), pos_shift == POC_RRCF);
+  if (sign && (pos_shift == POC_RRCF))
+    {
+      pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit (pic16_popGet (AOP (result), AOP_SIZE (result) - 1), 7));
+      emitSETC;
+    }                           // if
+  genMultiAsm (pos_shift, result, AOP_SIZE (result), pos_shift == POC_RRCF);
   pic16_emitpcode (POC_DECFSZ, pic16_popCopyReg (&pic16_pc_wreg));
   pic16_emitpcode (POC_BRA, pic16_popGetLabel (label_loop_pos->key));
 #else
@@ -7859,73 +8875,87 @@
   pic16_emitpcode (POC_NEGF, pic16_popCopyReg (&pic16_pc_wreg));
   emitCLRC;
   pic16_emitpLabel (label_loop_pos->key);
-  if (sign && (pos_shift == POC_RRCF)) {
-    pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit(pic16_popGet(AOP(result), AOP_SIZE(result)-1), 7));
-    emitSETC;
-  } // if
-  genMultiAsm (pos_shift, result, AOP_SIZE(result), pos_shift == POC_RRCF);
+  if (sign && (pos_shift == POC_RRCF))
+    {
+      pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit (pic16_popGet (AOP (result), AOP_SIZE (result) - 1), 7));
+      emitSETC;
+    }                           // if
+  genMultiAsm (pos_shift, result, AOP_SIZE (result), pos_shift == POC_RRCF);
   //pic16_emitpcode (POC_INCF, pic16_popCopyReg (&pic16_pc_wreg)); // gpsim does not like this...
   pic16_emitpcode (POC_ADDLW, pic16_popGetLit (0x01));
   pic16_emitpcode (POC_BNC, pic16_popGetLabel (label_loop_pos->key));
 #endif
 
-  if (signedCount) {
-    pic16_emitpcode (POC_BRA, pic16_popGetLabel (label_complete->key));
+  if (signedCount)
+    {
+      pic16_emitpcode (POC_BRA, pic16_popGetLabel (label_complete->key));
 
-    pic16_emitpLabel (label_negative->key);
-    // perform a shift by -1 (shift count is negative)
-    // 2n+4+1+({0,2}+n+3)*c-1=({3,5}+n)c+2n+4                   ({4,6}c+6 / {5,7}c+8 / {7,9}c+12)
-    emitCLRC;
-    pic16_emitpLabel (label_loop_neg->key);
-    if (sign && (neg_shift == POC_RRCF)) {
-      pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit(pic16_popGet(AOP(result), AOP_SIZE(result)-1), 7));
-      emitSETC;
-    } // if
-    genMultiAsm (neg_shift, result, AOP_SIZE(result), neg_shift == POC_RRCF);
-    //pic16_emitpcode (POC_INCF, pic16_popCopyReg (&pic16_pc_wreg)); // gpsim does not like this...
-    pic16_emitpcode (POC_ADDLW, pic16_popGetLit (0x01));
-    pic16_emitpcode (POC_BNC, pic16_popGetLabel (label_loop_neg->key));
-  } // if (signedCount)
+      pic16_emitpLabel (label_negative->key);
+      // perform a shift by -1 (shift count is negative)
+      // 2n+4+1+({0,2}+n+3)*c-1=({3,5}+n)c+2n+4                   ({4,6}c+6 / {5,7}c+8 / {7,9}c+12)
+      emitCLRC;
+      pic16_emitpLabel (label_loop_neg->key);
+      if (sign && (neg_shift == POC_RRCF))
+        {
+          pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit (pic16_popGet (AOP (result), AOP_SIZE (result) - 1), 7));
+          emitSETC;
+        }                       // if
+      genMultiAsm (neg_shift, result, AOP_SIZE (result), neg_shift == POC_RRCF);
+      //pic16_emitpcode (POC_INCF, pic16_popCopyReg (&pic16_pc_wreg)); // gpsim does not like this...
+      pic16_emitpcode (POC_ADDLW, pic16_popGetLit (0x01));
+      pic16_emitpcode (POC_BNC, pic16_popGetLabel (label_loop_neg->key));
+    }                           // if (signedCount)
 
   pic16_emitpLabel (label_complete->key);
 
 release:
-  pic16_freeAsmop (right,NULL,ic,TRUE);
-  pic16_freeAsmop(left,NULL,ic,TRUE);
-  pic16_freeAsmop(result,NULL,ic,TRUE);
+  pic16_freeAsmop (right, NULL, ic, TRUE);
+  pic16_freeAsmop (left, NULL, ic, TRUE);
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
-static void genLeftShift (iCode *ic) {
+static void
+genLeftShift (iCode * ic)
+{
   genGenericShift (ic, 1);
 }
 
-static void genRightShift (iCode *ic) {
+static void
+genRightShift (iCode * ic)
+{
   genGenericShift (ic, 0);
 }
 
 
 /* load FSR0 with address of/from op according to pic16_isLitOp() or if lit is 1 */
-void pic16_loadFSR0(operand *op, int lit)
+void
+pic16_loadFSR0 (operand * op, int lit)
 {
-  if((IS_SYMOP(op) && OP_SYMBOL(op)->remat) || pic16_isLitOp( op )) {
-    if (AOP_TYPE(op) == AOP_LIT) {
-      /* handle 12 bit integers correctly */
-      unsigned int val = (unsigned int) ulFromVal (AOP(op)->aopu.aop_lit);
-      if ((val & 0x0fff) != val) {
-        fprintf (stderr, "WARNING: Accessing memory at 0x%x truncated to 0x%x.\n",
-                val, (val & 0x0fff) );
-        val &= 0x0fff;
-      }
-      pic16_emitpcode(POC_LFSR, pic16_popGetLit2(0, pic16_popGetLit12(val)));
-    } else {
-      pic16_emitpcode(POC_LFSR, pic16_popGetLit2(0, pic16_popGet(AOP(op), 0)));
-    }
-  } else {
-    assert (!IS_SYMOP(op) || !OP_SYMBOL(op)->remat);
-    // set up FSR0 with address of result
-    pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popGet(AOP(op),0), pic16_popCopyReg(&pic16_pc_fsr0l)));
-    pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popGet(AOP(op),1), pic16_popCopyReg(&pic16_pc_fsr0h)));
-  }
+  if ((IS_SYMOP (op) && OP_SYMBOL (op)->remat) || pic16_isLitOp (op))
+    {
+      if (AOP_TYPE (op) == AOP_LIT)
+        {
+          /* handle 12 bit integers correctly */
+          unsigned int val = (unsigned int) ulFromVal (AOP (op)->aopu.aop_lit);
+          if ((val & 0x0fff) != val)
+            {
+              fprintf (stderr, "WARNING: Accessing memory at 0x%x truncated to 0x%x.\n", val, (val & 0x0fff));
+              val &= 0x0fff;
+            }
+          pic16_emitpcode (POC_LFSR, pic16_popGetLit2 (0, pic16_popGetLit12 (val)));
+        }
+      else
+        {
+          pic16_emitpcode (POC_LFSR, pic16_popGetLit2 (0, pic16_popGet (AOP (op), 0)));
+        }
+    }
+  else
+    {
+      assert (!IS_SYMOP (op) || !OP_SYMBOL (op)->remat);
+      // set up FSR0 with address of result
+      pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popGet (AOP (op), 0), pic16_popCopyReg (&pic16_pc_fsr0l)));
+      pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popGet (AOP (op), 1), pic16_popCopyReg (&pic16_pc_fsr0h)));
+    }
 }
 
 /*----------------------------------------------------------------*/
@@ -7933,75 +8963,86 @@
 /*                  to WREG (doWrite == 0) or one byte from WREG   */
 /*                  to the location ptr points to (doWrite != 0)   */
 /*----------------------------------------------------------------*/
-static void pic16_derefPtr (operand *ptr, int p_type, int doWrite, int *fsr0_setup)
+static void
+pic16_derefPtr (operand * ptr, int p_type, int doWrite, int *fsr0_setup)
 {
-  if (!IS_PTR(operandType(ptr)))
-  {
-    if (doWrite) pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP(ptr), 0));
-    else pic16_mov2w (AOP(ptr), 0);
-    return;
-  }
+  if (!IS_PTR (operandType (ptr)))
+    {
+      if (doWrite)
+        pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (ptr), 0));
+      else
+        pic16_mov2w (AOP (ptr), 0);
+      return;
+    }
 
   //assert (IS_DECL(operandType(ptr)) && (p_type == DCL_TYPE(operandType(ptr))));
   /* We might determine pointer type right here: */
-  p_type = DCL_TYPE(operandType(ptr));
+  p_type = DCL_TYPE (operandType (ptr));
 
-  switch (p_type) {
+  switch (p_type)
+    {
     case POINTER:
     case FPOINTER:
     case IPOINTER:
     case PPOINTER:
       if (!fsr0_setup || !*fsr0_setup)
-      {
-        pic16_loadFSR0( ptr, 0 );
-        if (fsr0_setup) *fsr0_setup = 1;
-      }
+        {
+          pic16_loadFSR0 (ptr, 0);
+          if (fsr0_setup)
+            *fsr0_setup = 1;
+        }
       if (doWrite)
-        pic16_emitpcode(POC_MOVWF, pic16_popCopyReg(&pic16_pc_indf0));
+        pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_indf0));
       else
-        pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(&pic16_pc_indf0));
+        pic16_emitpcode (POC_MOVFW, pic16_popCopyReg (&pic16_pc_indf0));
       break;
 
     case GPOINTER:
-      if (AOP(ptr)->aopu.aop_reg[2]) {
-        if (doWrite) pic16_emitpcode (POC_MOVWF, pic16_popCopyReg(pic16_stack_postdec));
-        // prepare call to __gptrget1, this is actually genGenPointerGet(result, WREG, ?ic?)
-        mov2fp(pic16_popCopyReg(&pic16_pc_fsr0l), AOP(ptr), 0);
-        mov2fp(pic16_popCopyReg(&pic16_pc_prodl), AOP(ptr), 1);
-        pic16_mov2w(AOP(ptr), 2);
-        pic16_callGenericPointerRW(doWrite, 1);
-      } else {
-        // data pointer (just 2 byte given)
-        if (!fsr0_setup || !*fsr0_setup)
-        {
-          pic16_loadFSR0( ptr, 0 );
-          if (fsr0_setup) *fsr0_setup = 1;
-        }
-        if (doWrite)
-          pic16_emitpcode(POC_MOVWF, pic16_popCopyReg(&pic16_pc_indf0));
-        else
-          pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(&pic16_pc_indf0));
-      }
+      if (AOP (ptr)->aopu.aop_reg[2])
+        {
+          if (doWrite)
+            pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (pic16_stack_postdec));
+          // prepare call to __gptrget1, this is actually genGenPointerGet(result, WREG, ?ic?)
+          mov2fp (pic16_popCopyReg (&pic16_pc_fsr0l), AOP (ptr), 0);
+          mov2fp (pic16_popCopyReg (&pic16_pc_prodl), AOP (ptr), 1);
+          pic16_mov2w (AOP (ptr), 2);
+          pic16_callGenericPointerRW (doWrite, 1);
+        }
+      else
+        {
+          // data pointer (just 2 byte given)
+          if (!fsr0_setup || !*fsr0_setup)
+            {
+              pic16_loadFSR0 (ptr, 0);
+              if (fsr0_setup)
+                *fsr0_setup = 1;
+            }
+          if (doWrite)
+            pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_indf0));
+          else
+            pic16_emitpcode (POC_MOVFW, pic16_popCopyReg (&pic16_pc_indf0));
+        }
       break;
 
     case CPOINTER:
       /* XXX: Writing to CPOINTERs not (yet) implemented. */
-      assert ( !doWrite && "Cannot write into __code space!" );
-      if( (AOP_TYPE(ptr) == AOP_PCODE)
-              && ((AOP(ptr)->aopu.pcop->type == PO_IMMEDIATE)
-                  || (AOP(ptr)->aopu.pcop->type == PO_DIR)))
-      {
-          pic16_emitpcode(POC_MOVLW, pic16_popGet     (AOP (ptr), 0));
-          pic16_emitpcode(POC_MOVWF, pic16_popCopyReg (&pic16_pc_tblptrl));
-          pic16_emitpcode(POC_MOVLW, pic16_popGet     (AOP (ptr), 1));
-          pic16_emitpcode(POC_MOVWF, pic16_popCopyReg (&pic16_pc_tblptrh));
-          pic16_emitpcode(POC_MOVLW, pic16_popGet     (AOP (ptr), 2));
-          pic16_emitpcode(POC_MOVWF, pic16_popCopyReg (&pic16_pc_tblptru));
-      } else {
-          mov2fp(pic16_popCopyReg(&pic16_pc_tblptrl), AOP(ptr), 0);
-          mov2fp(pic16_popCopyReg(&pic16_pc_tblptrh), AOP(ptr), 1);
-          mov2fp(pic16_popCopyReg(&pic16_pc_tblptru), AOP(ptr), 2);
-      } // if
+      assert (!doWrite && "Cannot write into __code space!");
+      if ((AOP_TYPE (ptr) == AOP_PCODE)
+          && ((AOP (ptr)->aopu.pcop->type == PO_IMMEDIATE) || (AOP (ptr)->aopu.pcop->type == PO_DIR)))
+        {
+          pic16_emitpcode (POC_MOVLW, pic16_popGet (AOP (ptr), 0));
+          pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_tblptrl));
+          pic16_emitpcode (POC_MOVLW, pic16_popGet (AOP (ptr), 1));
+          pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_tblptrh));
+          pic16_emitpcode (POC_MOVLW, pic16_popGet (AOP (ptr), 2));
+          pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_tblptru));
+        }
+      else
+        {
+          mov2fp (pic16_popCopyReg (&pic16_pc_tblptrl), AOP (ptr), 0);
+          mov2fp (pic16_popCopyReg (&pic16_pc_tblptrh), AOP (ptr), 1);
+          mov2fp (pic16_popCopyReg (&pic16_pc_tblptru), AOP (ptr), 2);
+        }                       // if
 
       pic16_emitpcodeNULLop (POC_TBLRD_POSTINC);
       pic16_emitpcode (POC_MOVFW, pic16_popCopyReg (&pic16_pc_tablat));
@@ -8010,165 +9051,173 @@
     default:
       assert (0 && "invalid pointer type specified");
       break;
-  }
+    }
 }
 
 /*-----------------------------------------------------------------*/
 /* genUnpackBits - generates code for unpacking bits               */
 /*-----------------------------------------------------------------*/
-static void genUnpackBits (operand *result, operand *left, char *rname, int ptype)
+static void
+genUnpackBits (operand * result, operand * left, char *rname, int ptype)
 {
-  int shCnt ;
-  sym_link *etype, *letype;
-  int blen=0, bstr=0;
-  int lbstr;
+  int shCnt;
+  sym_link *etype;
+  int blen = 0, bstr = 0;
   int same;
   pCodeOp *op;
 
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-  etype = getSpec(operandType(result));
-  letype = getSpec(operandType(left));
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  etype = getSpec (operandType (result));
 
   //    if(IS_BITFIELD(etype)) {
-  blen = SPEC_BLEN(etype);
-  bstr = SPEC_BSTR(etype);
+  blen = SPEC_BLEN (etype);
+  bstr = SPEC_BSTR (etype);
   //    }
 
-  lbstr = SPEC_BSTR( letype );
-
-  DEBUGpic16_emitcode ("; ***","%s  %d - reading %s bitfield int %s destination",__FUNCTION__,__LINE__,
-      SPEC_USIGN(OP_SYM_ETYPE(left)) ? "an unsigned" : "a signed", SPEC_USIGN(OP_SYM_TYPE(result)) ? "an unsigned" : "a signed");
+  DEBUGpic16_emitcode ("; ***", "%s  %d - reading %s bitfield int %s destination", __FUNCTION__, __LINE__,
+                       SPEC_USIGN (OP_SYM_ETYPE (left)) ? "an unsigned" : "a signed",
+                       SPEC_USIGN (OP_SYM_TYPE (result)) ? "an unsigned" : "a signed");
 
 #if 1
-  if((blen == 1) && (bstr < 8)
-      && (!IS_PTR(operandType(left)) || IS_DIRECT(left) || PIC_IS_DATA_PTR(operandType(left)))) {
-    /* it is a single bit, so use the appropriate bit instructions */
-    DEBUGpic16_emitcode (";","%s %d optimize bit read",__FUNCTION__,__LINE__);
-
-    same = pic16_sameRegs(AOP(left),AOP(result));
-    op = (same ? pic16_popCopyReg(&pic16_pc_wreg) : pic16_popGet (AOP(result),0));
-    pic16_emitpcode(POC_CLRF, op);
-
-    if(!IS_PTR(operandType(left)) || IS_DIRECT(left)) {
-      /* workaround to reduce the extra lfsr instruction */
-      pic16_emitpcode(POC_BTFSC,
-          pic16_popCopyGPR2Bit(pic16_popGet(AOP(left), 0), bstr));
-    } else {
-      assert (PIC_IS_DATA_PTR (operandType(left)));
-      pic16_loadFSR0 (left, 0);
-      pic16_emitpcode(POC_BTFSC,
-          pic16_popCopyGPR2Bit(pic16_popCopyReg(&pic16_pc_indf0), bstr));
-    }
+  if ((blen == 1) && (bstr < 8) && (!IS_PTR (operandType (left)) || IS_DIRECT (left) || PIC_IS_DATA_PTR (operandType (left))))
+    {
+      /* it is a single bit, so use the appropriate bit instructions */
+      DEBUGpic16_emitcode (";", "%s %d optimize bit read", __FUNCTION__, __LINE__);
 
-    if (SPEC_USIGN(OP_SYM_ETYPE(left))) {
-      /* unsigned bitfields result in either 0 or 1 */
-      pic16_emitpcode(POC_INCF, op);
-    } else {
-      /* signed bitfields result in either 0 or -1 */
-      pic16_emitpcode(POC_DECF, op);
-    }
-    if (same) {
-      pic16_emitpcode(POC_MOVWF, pic16_popGet( AOP(result), 0 ));
-    }
+      same = pic16_sameRegs (AOP (left), AOP (result));
+      op = (same ? pic16_popCopyReg (&pic16_pc_wreg) : pic16_popGet (AOP (result), 0));
+      pic16_emitpcode (POC_CLRF, op);
 
-    pic16_addSign (result, 1, !SPEC_USIGN(OP_SYM_TYPE(result)));
-    return;
-  }
+      if (!IS_PTR (operandType (left)) || IS_DIRECT (left))
+        {
+          /* workaround to reduce the extra lfsr instruction */
+          pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit (pic16_popGet (AOP (left), 0), bstr));
+        }
+      else
+        {
+          assert (PIC_IS_DATA_PTR (operandType (left)));
+          pic16_loadFSR0 (left, 0);
+          pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit (pic16_popCopyReg (&pic16_pc_indf0), bstr));
+        }
+
+      if (SPEC_USIGN (OP_SYM_ETYPE (left)))
+        {
+          /* unsigned bitfields result in either 0 or 1 */
+          pic16_emitpcode (POC_INCF, op);
+        }
+      else
+        {
+          /* signed bitfields result in either 0 or -1 */
+          pic16_emitpcode (POC_DECF, op);
+        }
+      if (same)
+        {
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 0));
+        }
+
+      pic16_addSign (result, 1, !SPEC_USIGN (OP_SYM_TYPE (result)));
+      return;
+    }
 
 #endif
 
-  if (!IS_PTR(operandType(left)) || IS_DIRECT(left)) {
-    // access symbol directly
-    pic16_mov2w (AOP(left), 0);
-  } else {
-    pic16_derefPtr (left, ptype, 0, NULL);
-  }
+  if (!IS_PTR (operandType (left)) || IS_DIRECT (left))
+    {
+      // access symbol directly
+      pic16_mov2w (AOP (left), 0);
+    }
+  else
+    {
+      pic16_derefPtr (left, ptype, 0, NULL);
+    }
 
   /* if we have bitdisplacement then it fits   */
   /* into this byte completely or if length is */
   /* less than a byte                          */
-  if ((shCnt = SPEC_BSTR(etype)) || (SPEC_BLEN(etype) <= 8))  {
-
-    /* shift right acc */
-    AccRsh(shCnt, 0);
+  if ((shCnt = SPEC_BSTR (etype)) || (SPEC_BLEN (etype) <= 8))
+    {
 
-    pic16_emitpcode(POC_ANDLW, pic16_popGetLit(
-          (((unsigned char) -1)>>(8 - SPEC_BLEN(etype))) & SRMask[ shCnt ]));
+      /* shift right acc */
+      AccRsh (shCnt, 0);
 
-    /* VR -- normally I would use the following, but since we use the hack,
-     * to avoid the masking from AccRsh, why not mask it right now? */
+      pic16_emitpcode (POC_ANDLW, pic16_popGetLit ((((unsigned char) - 1) >> (8 - SPEC_BLEN (etype))) & SRMask[shCnt]));
 
-    /*
-       pic16_emitpcode(POC_ANDLW, pic16_popGetLit(((unsigned char) -1)>>(8 - SPEC_BLEN(etype))));
-     */
+      /* VR -- normally I would use the following, but since we use the hack,
+       * to avoid the masking from AccRsh, why not mask it right now? */
 
-    /* extend signed bitfields to 8 bits */
-    if (!SPEC_USIGN(OP_SYM_ETYPE(left)) && (bstr + blen < 8))
-    {
-      assert (blen + bstr > 0);
-      pic16_emitpcode(POC_BTFSC, pic16_popCopyGPR2Bit(pic16_popCopyReg(&pic16_pc_wreg), bstr + blen - 1));
-      pic16_emitpcode(POC_IORLW, pic16_popGetLit(0xFF << (bstr + blen)));
-    }
+      /*
+         pic16_emitpcode(POC_ANDLW, pic16_popGetLit(((unsigned char) -1)>>(8 - SPEC_BLEN(etype))));
+       */
 
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), 0));
+      /* extend signed bitfields to 8 bits */
+      if (!SPEC_USIGN (OP_SYM_ETYPE (left)) && (bstr + blen < 8))
+        {
+          assert (blen + bstr > 0);
+          pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit (pic16_popCopyReg (&pic16_pc_wreg), bstr + blen - 1));
+          pic16_emitpcode (POC_IORLW, pic16_popGetLit (0xFF << (bstr + blen)));
+        }
 
-    pic16_addSign (result, 1, !SPEC_USIGN(OP_SYM_TYPE(result)));
-    return ;
-  }
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 0));
 
-  fprintf(stderr, "SDCC pic16 port error: the port currently does not support *reading*\n");
-  fprintf(stderr, "bitfields of size >=8. Instead of generating wrong code, bailing out...\n");
-  exit(EXIT_FAILURE);
+      pic16_addSign (result, 1, !SPEC_USIGN (OP_SYM_TYPE (result)));
+      return;
+    }
 
-  return ;
+  fprintf (stderr, "SDCC pic16 port error: the port currently does not support *reading*\n");
+  fprintf (stderr, "bitfields of size >=8. Instead of generating wrong code, bailing out...\n");
+  exit (EXIT_FAILURE);
 }
 
 
-static void genDataPointerGet(operand *left, operand *result, iCode *ic)
+static void
+genDataPointerGet (operand * left, operand * result, iCode * ic)
 {
-  int size, offset = 0, leoffset=0 ;
+  int size, offset = 0, leoffset = 0;
 
-        DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-        pic16_aopOp(result, ic, TRUE);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  pic16_aopOp (result, ic, TRUE);
 
-        FENTRY;
+  FENTRY;
 
-        size = AOP_SIZE(result);
+  size = AOP_SIZE (result);
 //      fprintf(stderr, "%s:%d size= %d\n", __FILE__, __LINE__, size);
 
 
 #if 1
-        if(!strcmp(pic16_aopGet(AOP(result), 0, TRUE, FALSE),
-                pic16_aopGet(AOP(left), 0, TRUE, FALSE))) {
-                DEBUGpic16_emitcode("; ***", "left and result names are same, skipping moving");
-                goto release;
-        }
+  if (!strcmp (pic16_aopGet (AOP (result), 0, TRUE, FALSE), pic16_aopGet (AOP (left), 0, TRUE, FALSE)))
+    {
+      DEBUGpic16_emitcode ("; ***", "left and result names are same, skipping moving");
+      goto release;
+    }
 #endif
 
-        if(AOP(left)->aopu.pcop->type == PO_DIR)
-                leoffset=PCOR(AOP(left)->aopu.pcop)->instance;
+  if (AOP (left)->aopu.pcop->type == PO_DIR)
+    leoffset = PCOR (AOP (left)->aopu.pcop)->instance;
 
-        DEBUGpic16_pic16_AopType(__LINE__,left,NULL,result);
+  DEBUGpic16_pic16_AopType (__LINE__, left, NULL, result);
 
-        while (size--) {
-                DEBUGpic16_emitcode("; ***", "%s loop offset=%d leoffset=%d", __FUNCTION__, offset, leoffset);
+  while (size--)
+    {
+      DEBUGpic16_emitcode ("; ***", "%s loop offset=%d leoffset=%d", __FUNCTION__, offset, leoffset);
 
 //              pic16_DumpOp("(result)",result);
-                if(pic16_isLitAop(AOP(result))) {
-                        pic16_mov2w(AOP(left), offset); // patch 8
-                        pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offset));
-                } else {
-                        pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                                pic16_popGet(AOP(left), offset), //patch 8
-                                pic16_popGet(AOP(result), offset)));
-                }
-
-                offset++;
-                leoffset++;
+      if (pic16_isLitAop (AOP (result)))
+        {
+          pic16_mov2w (AOP (left), offset);     // patch 8
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));
+        }
+      else
+        {
+          pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popGet (AOP (left), offset),        //patch 8
+                           pic16_popGet (AOP (result), offset)));
         }
 
+      offset++;
+      leoffset++;
+    }
+
 release:
-    pic16_freeAsmop(result,NULL,ic,TRUE);
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 
@@ -8176,127 +9225,127 @@
 /*-----------------------------------------------------------------*/
 /* genNearPointerGet - pic16_emitcode for near pointer fetch             */
 /*-----------------------------------------------------------------*/
-static void genNearPointerGet (operand *left,
-                               operand *result,
-                               iCode *ic)
+static void
+genNearPointerGet (operand * left, operand * result, iCode * ic)
 {
 //  asmop *aop = NULL;
   //regs *preg = NULL ;
   sym_link *rtype, *retype;
   sym_link *ltype, *letype;
 
-    FENTRY;
+  FENTRY;
 
-    rtype = operandType(result);
-    retype= getSpec(rtype);
-    ltype = operandType(left);
-    letype= getSpec(ltype);
+  rtype = operandType (result);
+  retype = getSpec (rtype);
+  ltype = operandType (left);
+  letype = getSpec (ltype);
 
-    pic16_aopOp(left,ic,FALSE);
+  pic16_aopOp (left, ic, FALSE);
 
 //    pic16_DumpOp("(left)",left);
 //    pic16_DumpOp("(result)",result);
 
-    /* if left is rematerialisable and
-     * result is not bit variable type and
-     * the left is pointer to data space i.e
-     * lower 128 bytes of space */
+  /* if left is rematerialisable and
+   * result is not bit variable type and
+   * the left is pointer to data space i.e
+   * lower 128 bytes of space */
 
-    if (AOP_TYPE(left) == AOP_PCODE
-      && !IS_BITFIELD(retype)
-      && DCL_TYPE(ltype) == POINTER) {
+  if (AOP_TYPE (left) == AOP_PCODE && !IS_BITFIELD (retype) && DCL_TYPE (ltype) == POINTER)
+    {
 
-        genDataPointerGet (left,result,ic);
-        pic16_freeAsmop(left, NULL, ic, TRUE);
-        return ;
+      genDataPointerGet (left, result, ic);
+      pic16_freeAsmop (left, NULL, ic, TRUE);
+      return;
     }
 
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    pic16_aopOp (result,ic,TRUE);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  pic16_aopOp (result, ic, TRUE);
 
-    DEBUGpic16_pic16_AopType(__LINE__, left, NULL, result);
+  DEBUGpic16_pic16_AopType (__LINE__, left, NULL, result);
 
 #if 1
-    if(IS_BITFIELD( retype )
-      && (SPEC_BLEN(retype)==1)
-    ) {
+  if (IS_BITFIELD (retype) && (SPEC_BLEN (retype) == 1))
+    {
       iCode *nextic;
       pCodeOp *jop;
-      int bitstrt, bytestrt;
+      int bitstrt;
 
-        /* if this is bitfield of size 1, see if we are checking the value
-         * of a single bit in an if-statement,
-         * if yes, then don't generate usual code, but execute the
-         * genIfx directly -- VR */
-
-        nextic = ic->next;
-
-        /* CHECK: if next iCode is IFX
-         * and current result operand is nextic's conditional operand
-         * and current result operand live ranges ends at nextic's key number
-         */
-        if((nextic->op == IFX)
-          && (result == IC_COND(nextic))
-          && (OP_LIVETO(result) == nextic->seq)
-          && (OP_SYMBOL(left)->remat)   // below fails for "if (p->bitfield)"
-          ) {
-            /* everything is ok then */
-            /* find a way to optimize the genIfx iCode */
+      /* if this is bitfield of size 1, see if we are checking the value
+       * of a single bit in an if-statement,
+       * if yes, then don't generate usual code, but execute the
+       * genIfx directly -- VR */
+
+      nextic = ic->next;
+
+      /* CHECK: if next iCode is IFX
+       * and current result operand is nextic's conditional operand
+       * and current result operand live ranges ends at nextic's key number
+       */
+      if ((nextic->op == IFX) && (result == IC_COND (nextic)) && (OP_LIVETO (result) == nextic->seq) && (OP_SYMBOL (left)->remat)       // below fails for "if (p->bitfield)"
+         )
+        {
+          /* everything is ok then */
+          /* find a way to optimize the genIfx iCode */
 
-            bytestrt = SPEC_BSTR(retype)/8;
-            bitstrt = SPEC_BSTR(retype)%8;
+          bitstrt = SPEC_BSTR (retype) % 8;
 
-            jop = pic16_popCopyGPR2Bit(pic16_popGet(AOP(left), 0), bitstrt);
+          jop = pic16_popCopyGPR2Bit (pic16_popGet (AOP (left), 0), bitstrt);
 
-            genIfxpCOpJump(nextic, jop);
+          genIfxpCOpJump (nextic, jop);
 
-            pic16_freeAsmop(left, NULL, ic, TRUE);
-            pic16_freeAsmop(result, NULL, ic, TRUE);
-            return;
+          pic16_freeAsmop (left, NULL, ic, TRUE);
+          pic16_freeAsmop (result, NULL, ic, TRUE);
+          return;
         }
     }
 #endif
 
-    /* if bitfield then unpack the bits */
-    if (IS_BITFIELD(letype))
-      genUnpackBits (result, left, NULL, POINTER);
-    else {
+  /* if bitfield then unpack the bits */
+  if (IS_BITFIELD (letype))
+    genUnpackBits (result, left, NULL, POINTER);
+  else
+    {
       /* we have can just get the values */
-      int size = AOP_SIZE(result);
+      int size = AOP_SIZE (result);
       int offset = 0;
 
-      DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+      DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-      pic16_loadFSR0( left, 0 );
+      pic16_loadFSR0 (left, 0);
 
-      while(size--) {
-        if(size) {
-          pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popCopyReg(&pic16_pc_postinc0),
-                pic16_popGet(AOP(result), offset++)));
-        } else {
-          pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popCopyReg(&pic16_pc_indf0),
-                pic16_popGet(AOP(result), offset++)));
+      while (size--)
+        {
+          if (size)
+            {
+              pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popCopyReg (&pic16_pc_postinc0),
+                               pic16_popGet (AOP (result), offset++)));
+            }
+          else
+            {
+              pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popCopyReg (&pic16_pc_indf0),
+                               pic16_popGet (AOP (result), offset++)));
+            }
         }
-      }
     }
 
 #if 0
-    /* now some housekeeping stuff */
-    if (aop) {
+  /* now some housekeeping stuff */
+  if (aop)
+    {
       /* we had to allocate for this iCode */
-      DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-      pic16_freeAsmop(NULL,aop,ic,TRUE);
-    } else {
+      DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+      pic16_freeAsmop (NULL, aop, ic, TRUE);
+    }
+  else
+    {
       /* we did not allocate which means left
        * already in a pointer register, then
        * if size > 0 && this could be used again
        * we have to point it back to where it
        * belongs */
-      DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-      if (AOP_SIZE(result) > 1
-        && !OP_SYMBOL(left)->remat
-        && ( OP_SYMBOL(left)->liveTo > ic->seq
-            || ic->depth )) {
+      DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+      if (AOP_SIZE (result) > 1 && !OP_SYMBOL (left)->remat && (OP_SYMBOL (left)->liveTo > ic->seq || ic->depth))
+        {
 //        int size = AOP_SIZE(result) - 1;
 //        while (size--)
 //          pic16_emitcode("dec","%s",rname);
@@ -8304,51 +9353,52 @@
     }
 #endif
 
-    /* done */
-    pic16_freeAsmop(left,NULL,ic,TRUE);
-    pic16_freeAsmop(result,NULL,ic,TRUE);
+  /* done */
+  pic16_freeAsmop (left, NULL, ic, TRUE);
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genGenPointerGet - gget value from generic pointer space        */
 /*-----------------------------------------------------------------*/
-static void genGenPointerGet (operand *left,
-                              operand *result, iCode *ic)
+static void
+genGenPointerGet (operand * left, operand * result, iCode * ic)
 {
   int size;
-  sym_link *letype = getSpec(operandType(left));
+  sym_link *letype = getSpec (operandType (left));
 
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-  pic16_aopOp(left,ic,FALSE);
-  pic16_aopOp(result,ic,TRUE);
-  size = AOP_SIZE(result);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  pic16_aopOp (left, ic, FALSE);
+  pic16_aopOp (result, ic, TRUE);
+  size = AOP_SIZE (result);
 
-  DEBUGpic16_pic16_AopType(__LINE__,left,NULL,result);
+  DEBUGpic16_pic16_AopType (__LINE__, left, NULL, result);
 
   /* if bit then unpack */
-  if (IS_BITFIELD(letype)) {
-    genUnpackBits(result,left,"BAD",GPOINTER);
-    goto release;
-  }
+  if (IS_BITFIELD (letype))
+    {
+      genUnpackBits (result, left, "BAD", GPOINTER);
+      goto release;
+    }
 
   /* set up WREG:PRODL:FSR0L with address from left */
-  mov2fp(pic16_popCopyReg(&pic16_pc_fsr0l), AOP(left), 0);
-  mov2fp(pic16_popCopyReg(&pic16_pc_prodl), AOP(left), 1);
-  pic16_mov2w(AOP(left), 2);
-  pic16_callGenericPointerRW(0, size);
+  mov2fp (pic16_popCopyReg (&pic16_pc_fsr0l), AOP (left), 0);
+  mov2fp (pic16_popCopyReg (&pic16_pc_prodl), AOP (left), 1);
+  pic16_mov2w (AOP (left), 2);
+  pic16_callGenericPointerRW (0, size);
 
-  assignResultValue(result, size, 1);
+  assignResultValue (result, size, 1);
 
 release:
-  pic16_freeAsmop(left,NULL,ic,TRUE);
-  pic16_freeAsmop(result,NULL,ic,TRUE);
+  pic16_freeAsmop (left, NULL, ic, TRUE);
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genConstPointerGet - get value from const generic pointer space */
 /*-----------------------------------------------------------------*/
-static void genConstPointerGet (operand *left,
-                                operand *result, iCode *ic)
+static void
+genConstPointerGet (operand * left, operand * result, iCode * ic)
 {
   //sym_link *retype = getSpec(operandType(result));
   // symbol *albl = newiTempLabel(NULL);        // patch 15
@@ -8357,133 +9407,144 @@
   int size;
   int offset = 0;
 
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-  pic16_aopOp(left,ic,FALSE);
-  pic16_aopOp(result,ic,TRUE);
-  size = AOP_SIZE(result);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  pic16_aopOp (left, ic, FALSE);
+  pic16_aopOp (result, ic, TRUE);
+  size = AOP_SIZE (result);
 
   /* if bit then unpack */
-  if (IS_BITFIELD(getSpec (operandType (left)))) {
-    genUnpackBits(result,left,"BAD",GPOINTER);
-    goto release;
-  } // if
+  if (IS_BITFIELD (getSpec (operandType (left))))
+    {
+      genUnpackBits (result, left, "BAD", GPOINTER);
+      goto release;
+    }                           // if
 
-  DEBUGpic16_pic16_AopType(__LINE__,left,NULL,result);
+  DEBUGpic16_pic16_AopType (__LINE__, left, NULL, result);
 
-  DEBUGpic16_emitcode ("; "," %d getting const pointer",__LINE__);
+  DEBUGpic16_emitcode ("; ", " %d getting const pointer", __LINE__);
 
   // set up table pointer
-  if( (AOP_TYPE(left) == AOP_PCODE)
-      && ((AOP(left)->aopu.pcop->type == PO_IMMEDIATE)
-          || (AOP(left)->aopu.pcop->type == PO_DIR)))
-    {
-      pic16_emitpcode(POC_MOVLW,pic16_popGet(AOP(left),0));
-      pic16_emitpcode(POC_MOVWF,pic16_popCopyReg(&pic16_pc_tblptrl));
-      pic16_emitpcode(POC_MOVLW,pic16_popGet(AOP(left),1));
-      pic16_emitpcode(POC_MOVWF,pic16_popCopyReg(&pic16_pc_tblptrh));
-      pic16_emitpcode(POC_MOVLW,pic16_popGet(AOP(left),2));
-      pic16_emitpcode(POC_MOVWF,pic16_popCopyReg(&pic16_pc_tblptru));
-  } else {
-    mov2fp(pic16_popCopyReg(&pic16_pc_tblptrl), AOP(left), 0);
-    mov2fp(pic16_popCopyReg(&pic16_pc_tblptrh), AOP(left), 1);
-    mov2fp(pic16_popCopyReg(&pic16_pc_tblptru), AOP(left), 2);
-  }
+  if ((AOP_TYPE (left) == AOP_PCODE)
+      && ((AOP (left)->aopu.pcop->type == PO_IMMEDIATE) || (AOP (left)->aopu.pcop->type == PO_DIR)))
+    {
+      pic16_emitpcode (POC_MOVLW, pic16_popGet (AOP (left), 0));
+      pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_tblptrl));
+      pic16_emitpcode (POC_MOVLW, pic16_popGet (AOP (left), 1));
+      pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_tblptrh));
+      pic16_emitpcode (POC_MOVLW, pic16_popGet (AOP (left), 2));
+      pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_tblptru));
+    }
+  else
+    {
+      mov2fp (pic16_popCopyReg (&pic16_pc_tblptrl), AOP (left), 0);
+      mov2fp (pic16_popCopyReg (&pic16_pc_tblptrh), AOP (left), 1);
+      mov2fp (pic16_popCopyReg (&pic16_pc_tblptru), AOP (left), 2);
+    }
 
-  while(size--) {
-    pic16_emitpcodeNULLop(POC_TBLRD_POSTINC);
-    pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popCopyReg(&pic16_pc_tablat), pic16_popGet(AOP(result),offset)));
-    offset++;
-  }
+  while (size--)
+    {
+      pic16_emitpcodeNULLop (POC_TBLRD_POSTINC);
+      pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popCopyReg (&pic16_pc_tablat), pic16_popGet (AOP (result), offset)));
+      offset++;
+    }
 
 release:
-  pic16_freeAsmop(left,NULL,ic,TRUE);
-  pic16_freeAsmop(result,NULL,ic,TRUE);
+  pic16_freeAsmop (left, NULL, ic, TRUE);
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 
 /*-----------------------------------------------------------------*/
 /* genPointerGet - generate code for pointer get                   */
 /*-----------------------------------------------------------------*/
-static void genPointerGet (iCode *ic)
+static void
+genPointerGet (iCode * ic)
 {
-  operand *left, *result ;
+  operand *left, *result;
   sym_link *type, *etype;
   int p_type;
 
-    FENTRY;
+  FENTRY;
 
-    left = IC_LEFT(ic);
-    result = IC_RESULT(ic) ;
+  left = IC_LEFT (ic);
+  result = IC_RESULT (ic);
 
-    /* depending on the type of pointer we need to
-    move it to the correct pointer register */
-    type = operandType(left);
-    etype = getSpec(type);
+  /* depending on the type of pointer we need to
+     move it to the correct pointer register */
+  type = operandType (left);
+  etype = getSpec (type);
 
 #if 0
-    if (IS_PTR_CONST(type))
+  if (IS_PTR_CONST (type))
 #else
-    if (IS_CODEPTR(type))
+  if (IS_CODEPTR (type))
 #endif
-      DEBUGpic16_emitcode ("; ***","%d - const pointer",__LINE__);
+    DEBUGpic16_emitcode ("; ***", "%d - const pointer", __LINE__);
 
-    /* if left is of type of pointer then it is simple */
-    if (IS_PTR(type) && !IS_FUNC(type->next))
-      p_type = DCL_TYPE(type);
-    else {
+  /* if left is of type of pointer then it is simple */
+  if (IS_PTR (type) && !IS_FUNC (type->next))
+    p_type = DCL_TYPE (type);
+  else
+    {
       /* we have to go by the storage class */
-      p_type = PTR_TYPE(SPEC_OCLS(etype));
+      p_type = PTR_TYPE (SPEC_OCLS (etype));
 
-      DEBUGpic16_emitcode ("; ***","%d - resolve pointer by storage class",__LINE__);
+      DEBUGpic16_emitcode ("; ***", "%d - resolve pointer by storage class", __LINE__);
 
-      if (SPEC_OCLS(etype)->codesp ) {
-        DEBUGpic16_emitcode ("; ***","%d - cpointer",__LINE__);
-        //p_type = CPOINTER ;
-      } else
-      if (SPEC_OCLS(etype)->fmap && !SPEC_OCLS(etype)->paged) {
-        DEBUGpic16_emitcode ("; ***","%d - fpointer",__LINE__);
-        /*p_type = FPOINTER ;*/
-      } else
-      if (SPEC_OCLS(etype)->fmap && SPEC_OCLS(etype)->paged) {
-        DEBUGpic16_emitcode ("; ***","%d - ppointer",__LINE__);
-        /* p_type = PPOINTER; */
-      } else
-      if (SPEC_OCLS(etype) == idata ) {
-        DEBUGpic16_emitcode ("; ***","%d - ipointer",__LINE__);
-        /* p_type = IPOINTER; */
-      } else {
-        DEBUGpic16_emitcode ("; ***","%d - pointer",__LINE__);
-        /* p_type = POINTER ; */
-      }
+      if (SPEC_OCLS (etype)->codesp)
+        {
+          DEBUGpic16_emitcode ("; ***", "%d - cpointer", __LINE__);
+          //p_type = CPOINTER ;
+        }
+      else if (SPEC_OCLS (etype)->fmap && !SPEC_OCLS (etype)->paged)
+        {
+          DEBUGpic16_emitcode ("; ***", "%d - fpointer", __LINE__);
+          /*p_type = FPOINTER ; */
+        }
+      else if (SPEC_OCLS (etype)->fmap && SPEC_OCLS (etype)->paged)
+        {
+          DEBUGpic16_emitcode ("; ***", "%d - ppointer", __LINE__);
+          /* p_type = PPOINTER; */
+        }
+      else if (SPEC_OCLS (etype) == idata)
+        {
+          DEBUGpic16_emitcode ("; ***", "%d - ipointer", __LINE__);
+          /* p_type = IPOINTER; */
+        }
+      else
+        {
+          DEBUGpic16_emitcode ("; ***", "%d - pointer", __LINE__);
+          /* p_type = POINTER ; */
+        }
     }
 
-    /* now that we have the pointer type we assign
-    the pointer values */
-    switch (p_type) {
-      case POINTER:
-      case FPOINTER:
-      case IPOINTER:
-      case PPOINTER:
-        genNearPointerGet (left,result,ic);
-        break;
+  /* now that we have the pointer type we assign
+     the pointer values */
+  switch (p_type)
+    {
+    case POINTER:
+    case FPOINTER:
+    case IPOINTER:
+    case PPOINTER:
+      genNearPointerGet (left, result, ic);
+      break;
 
-      case CPOINTER:
-        genConstPointerGet (left,result,ic);
-        //pic16_emitcodePointerGet (left,result,ic);
-        break;
+    case CPOINTER:
+      genConstPointerGet (left, result, ic);
+      //pic16_emitcodePointerGet (left,result,ic);
+      break;
 
-      case GPOINTER:
+    case GPOINTER:
 #if 0
-      if (IS_PTR_CONST(type))
-        genConstPointerGet (left,result,ic);
+      if (IS_PTR_CONST (type))
+        genConstPointerGet (left, result, ic);
       else
 #endif
-        genGenPointerGet (left,result,ic);
+        genGenPointerGet (left, result, ic);
       break;
 
     default:
-      werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
-              "genPointerGet: illegal pointer type");
+      werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "genPointerGet: illegal pointer type");
 
     }
 }
@@ -8491,238 +9552,265 @@
 /*-----------------------------------------------------------------*/
 /* genPackBits - generates code for packed bit storage             */
 /*-----------------------------------------------------------------*/
-static void genPackBits (sym_link    *etype , operand *result,
-                         operand *right ,
-                         char *rname, int p_type)
-{
-  int shCnt = 0 ;
-  int offset = 0  ;
-  int rLen = 0 ;
-  int blen, bstr ;
+static void
+genPackBits (sym_link * etype, operand * result, operand * right, char *rname, int p_type)
+{
+  int shCnt = 0;
+  int offset = 0;
+  int rLen = 0;
+  int blen, bstr;
   int shifted_and_masked = 0;
-  unsigned long lit = (unsigned long)-1;
+  unsigned long lit = (unsigned long) - 1;
   sym_link *retype;
 
-  DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-  blen = SPEC_BLEN(etype);
-  bstr = SPEC_BSTR(etype);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  blen = SPEC_BLEN (etype);
+  bstr = SPEC_BSTR (etype);
 
-  retype = getSpec(operandType(right));
+  retype = getSpec (operandType (right));
 
-  if(AOP_TYPE(right) == AOP_LIT) {
-    lit = ulFromVal (AOP(right)->aopu.aop_lit);
+  if (AOP_TYPE (right) == AOP_LIT)
+    {
+      lit = ulFromVal (AOP (right)->aopu.aop_lit);
 
-    if((blen == 1) && (bstr < 8)) {
-      /* it is a single bit, so use the appropriate bit instructions */
+      if ((blen == 1) && (bstr < 8))
+        {
+          /* it is a single bit, so use the appropriate bit instructions */
 
-      DEBUGpic16_emitcode (";","%s %d optimize bit assignment",__FUNCTION__,__LINE__);
+          DEBUGpic16_emitcode (";", "%s %d optimize bit assignment", __FUNCTION__, __LINE__);
 
-      if(!IS_PTR(operandType(result)) || IS_DIRECT(result)) {
-        /* workaround to reduce the extra lfsr instruction */
-        if(lit) {
-          pic16_emitpcode(POC_BSF,
-              pic16_popCopyGPR2Bit(pic16_popGet(AOP(result), 0), bstr));
-        } else {
-          pic16_emitpcode(POC_BCF,
-              pic16_popCopyGPR2Bit(pic16_popGet(AOP(result), 0), bstr));
-        }
-      } else {
-        if (PIC_IS_DATA_PTR(operandType(result))) {
-          pic16_loadFSR0(result, 0);
-          pic16_emitpcode(lit ? POC_BSF : POC_BCF,
-              pic16_popCopyGPR2Bit(pic16_popCopyReg(&pic16_pc_indf0), bstr));
-        } else {
-          /* get old value */
-          pic16_derefPtr (result, p_type, 0, NULL);
-          pic16_emitpcode(lit ? POC_BSF : POC_BCF,
-              pic16_popCopyGPR2Bit(pic16_popCopyReg(&pic16_pc_wreg), bstr));
-          /* write back new value */
-          pic16_derefPtr (result, p_type, 1, NULL);
-        }
-      }
+          if (!IS_PTR (operandType (result)) || IS_DIRECT (result))
+            {
+              /* workaround to reduce the extra lfsr instruction */
+              if (lit)
+                {
+                  pic16_emitpcode (POC_BSF, pic16_popCopyGPR2Bit (pic16_popGet (AOP (result), 0), bstr));
+                }
+              else
+                {
+                  pic16_emitpcode (POC_BCF, pic16_popCopyGPR2Bit (pic16_popGet (AOP (result), 0), bstr));
+                }
+            }
+          else
+            {
+              if (PIC_IS_DATA_PTR (operandType (result)))
+                {
+                  pic16_loadFSR0 (result, 0);
+                  pic16_emitpcode (lit ? POC_BSF : POC_BCF, pic16_popCopyGPR2Bit (pic16_popCopyReg (&pic16_pc_indf0), bstr));
+                }
+              else
+                {
+                  /* get old value */
+                  pic16_derefPtr (result, p_type, 0, NULL);
+                  pic16_emitpcode (lit ? POC_BSF : POC_BCF, pic16_popCopyGPR2Bit (pic16_popCopyReg (&pic16_pc_wreg), bstr));
+                  /* write back new value */
+                  pic16_derefPtr (result, p_type, 1, NULL);
+                }
+            }
 
-      return;
+          return;
+        }
+      /* IORLW below is more efficient */
+      //pic16_emitpcode(POC_MOVLW, pic16_popGetLit((lit & ((1UL << blen) - 1)) << bstr));
+      lit = (lit & ((1UL << blen) - 1)) << bstr;
+      shifted_and_masked = 1;
+      offset++;
     }
-    /* IORLW below is more efficient */
-    //pic16_emitpcode(POC_MOVLW, pic16_popGetLit((lit & ((1UL << blen) - 1)) << bstr));
-    lit = (lit & ((1UL << blen) - 1)) << bstr;
-    shifted_and_masked = 1;
-    offset++;
-  } else
-    if (IS_DIRECT(result) && !IS_PTR(operandType(result))
-        && IS_BITFIELD(retype)
-        && (AOP_TYPE(right) == AOP_REG || AOP_TYPE(right) == AOP_DIR)
-        && (blen == 1)) {
-      int rblen, rbstr;
-
-      rblen = SPEC_BLEN( retype );
-      rbstr = SPEC_BSTR( retype );
-
-      if(IS_BITFIELD(etype)) {
-        pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(result), 0));
-        pic16_emitpcode(POC_BCF, pic16_popCopyGPR2Bit(pic16_popCopyReg(&pic16_pc_wreg), bstr));
-      } else {
-        pic16_emitpcode(POC_CLRF, pic16_popCopyReg(&pic16_pc_wreg));
-      }
+  else if (IS_DIRECT (result) && !IS_PTR (operandType (result))
+           && IS_BITFIELD (retype) && (AOP_TYPE (right) == AOP_REG || AOP_TYPE (right) == AOP_DIR) && (blen == 1))
+    {
+      int rbstr;
 
-      pic16_emitpcode(POC_BTFSC, pic16_popCopyGPR2Bit(pic16_popGet(AOP(right), 0), rbstr));
+      rbstr = SPEC_BSTR (retype);
 
-      if(IS_BITFIELD(etype)) {
-        pic16_emitpcode(POC_BSF, pic16_popCopyGPR2Bit(pic16_popCopyReg(&pic16_pc_wreg), bstr));
-      } else {
-        pic16_emitpcode(POC_INCF, pic16_popCopyReg(&pic16_pc_wreg));
-      }
+      if (IS_BITFIELD (etype))
+        {
+          pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (result), 0));
+          pic16_emitpcode (POC_BCF, pic16_popCopyGPR2Bit (pic16_popCopyReg (&pic16_pc_wreg), bstr));
+        }
+      else
+        {
+          pic16_emitpcode (POC_CLRF, pic16_popCopyReg (&pic16_pc_wreg));
+        }
 
-      pic16_emitpcode(POC_MOVWF, pic16_popGet( AOP(result), 0));
+      pic16_emitpcode (POC_BTFSC, pic16_popCopyGPR2Bit (pic16_popGet (AOP (right), 0), rbstr));
+
+      if (IS_BITFIELD (etype))
+        {
+          pic16_emitpcode (POC_BSF, pic16_popCopyGPR2Bit (pic16_popCopyReg (&pic16_pc_wreg), bstr));
+        }
+      else
+        {
+          pic16_emitpcode (POC_INCF, pic16_popCopyReg (&pic16_pc_wreg));
+        }
+
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 0));
 
       return;
-    } else {
+    }
+  else
+    {
       /* move right to W */
-      pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(right), offset++));
+      pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (right), offset++));
     }
 
   /* if the bit length is less than or   */
   /* it exactly fits a byte then         */
-  if((shCnt=SPEC_BSTR(etype))
-      || SPEC_BLEN(etype) <= 8 )  {
-    int fsr0_setup = 0;
-
-    if (blen != 8 || (bstr % 8) != 0) {
-      // we need to combine the value with the old value
-      if(!shifted_and_masked)
-      {
-        pic16_emitpcode(POC_ANDLW, pic16_popGetLit((1U << blen)-1));
+  if ((shCnt = SPEC_BSTR (etype)) || SPEC_BLEN (etype) <= 8)
+    {
+      int fsr0_setup = 0;
 
-        DEBUGpic16_emitcode(";", "shCnt = %d SPEC_BSTR(etype) = %d:%d", shCnt,
-            SPEC_BSTR(etype), SPEC_BLEN(etype));
+      if (blen != 8 || (bstr % 8) != 0)
+        {
+          // we need to combine the value with the old value
+          if (!shifted_and_masked)
+            {
+              pic16_emitpcode (POC_ANDLW, pic16_popGetLit ((1U << blen) - 1));
 
-        /* shift left acc, do NOT mask the result again */
-        AccLsh(shCnt, 0);
+              DEBUGpic16_emitcode (";", "shCnt = %d SPEC_BSTR(etype) = %d:%d", shCnt, SPEC_BSTR (etype), SPEC_BLEN (etype));
 
-        /* using PRODH as a temporary register here */
-        pic16_emitpcode(POC_MOVWF, pic16_popCopyReg(&pic16_pc_prodh));
-      }
+              /* shift left acc, do NOT mask the result again */
+              AccLsh (shCnt, 0);
 
-      if ((IS_SYMOP(result) && !IS_PTR(operandType (result)))
-        || IS_DIRECT(result)) {
-        /* access symbol directly */
-        pic16_mov2w (AOP(result), 0);
-      } else {
-        /* get old value */
-        pic16_derefPtr (result, p_type, 0, &fsr0_setup);
-      }
+              /* using PRODH as a temporary register here */
+              pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_prodh));
+            }
+
+          if ((IS_SYMOP (result) && !IS_PTR (operandType (result))) || IS_DIRECT (result))
+            {
+              /* access symbol directly */
+              pic16_mov2w (AOP (result), 0);
+            }
+          else
+            {
+              /* get old value */
+              pic16_derefPtr (result, p_type, 0, &fsr0_setup);
+            }
 #if 1
-      pic16_emitpcode(POC_ANDLW, pic16_popGetLit(
-            (unsigned char)((unsigned char)(0xff << (blen+bstr)) |
-                            (unsigned char)(0xff >> (8-bstr))) ));
-      if (!shifted_and_masked) {
-        pic16_emitpcode(POC_IORFW, pic16_popCopyReg(&pic16_pc_prodh));
-      } else {
-        /* We have the shifted and masked (literal) right value in `lit' */
-        if (lit != 0)
-          pic16_emitpcode(POC_IORLW, pic16_popGetLit(lit));
-      }
-    } else { // if (blen == 8 && (bstr % 8) == 0)
-        if (shifted_and_masked) {
-            // move right (literal) to WREG (only case where right is not yet in WREG)
-            pic16_mov2w(AOP(right), (bstr / 8));
+          pic16_emitpcode (POC_ANDLW, pic16_popGetLit ((unsigned char) ((unsigned char) (0xff << (blen + bstr)) |
+                           (unsigned char) (0xff >> (8 - bstr)))));
+          if (!shifted_and_masked)
+            {
+              pic16_emitpcode (POC_IORFW, pic16_popCopyReg (&pic16_pc_prodh));
+            }
+          else
+            {
+              /* We have the shifted and masked (literal) right value in `lit' */
+              if (lit != 0)
+                pic16_emitpcode (POC_IORLW, pic16_popGetLit (lit));
+            }
+        }
+      else                      // if (blen == 8 && (bstr % 8) == 0)
+        {
+          if (shifted_and_masked)
+            {
+              // move right (literal) to WREG (only case where right is not yet in WREG)
+              pic16_mov2w (AOP (right), (bstr / 8));
+            }
         }
-    }
 
-    /* write new value back */
-    if ((IS_SYMOP(result) && !IS_PTR(operandType(result)))
-        || IS_DIRECT(result)) {
-      pic16_emitpcode (POC_MOVWF, pic16_popGet(AOP(result),0));
-    } else {
-      pic16_derefPtr (result, p_type, 1, &fsr0_setup);
-    }
+      /* write new value back */
+      if ((IS_SYMOP (result) && !IS_PTR (operandType (result))) || IS_DIRECT (result))
+        {
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 0));
+        }
+      else
+        {
+          pic16_derefPtr (result, p_type, 1, &fsr0_setup);
+        }
 #endif
 
-    return;
-  }
+      return;
+    }
 
 
 #if 0
-  fprintf(stderr, "SDCC pic16 port error: the port currently does not support\n");
-  fprintf(stderr, "bitfields of size >=8. Instead of generating wrong code, bailing out...\n");
-  exit(EXIT_FAILURE);
+  fprintf (stderr, "SDCC pic16 port error: the port currently does not support\n");
+  fprintf (stderr, "bitfields of size >=8. Instead of generating wrong code, bailing out...\n");
+  exit (EXIT_FAILURE);
 #endif
 
 
-  pic16_loadFSR0(result, 0);                    // load FSR0 with address of result
-  rLen = SPEC_BLEN(etype)-8;
+  pic16_loadFSR0 (result, 0);   // load FSR0 with address of result
+  rLen = SPEC_BLEN (etype) - 8;
 
   /* now generate for lengths greater than one byte */
-  while (1) {
-    rLen -= 8 ;
-    if (rLen <= 0 ) {
-      mov2fp(pic16_popCopyReg(&pic16_pc_prodh), AOP(right), offset);
-      break ;
-    }
+  while (1)
+    {
+      rLen -= 8;
+      if (rLen <= 0)
+        {
+          mov2fp (pic16_popCopyReg (&pic16_pc_prodh), AOP (right), offset);
+          break;
+        }
 
-    switch (p_type) {
-      case POINTER:
-        pic16_emitpcode(POC_MOVWF, pic16_popCopyReg(&pic16_pc_postinc0));
-        break;
+      switch (p_type)
+        {
+        case POINTER:
+          pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_postinc0));
+          break;
 
-        /*
-           case FPOINTER:
-           MOVA(l);
-           pic16_emitcode("movx","@dptr,a");
-           break;
-
-           case GPOINTER:
-           MOVA(l);
-           DEBUGpic16_emitcode(";lcall","__gptrput");
-           break;
-         */
-      default:
-        assert(0);
-    }
+          /*
+             case FPOINTER:
+             MOVA(l);
+             pic16_emitcode("movx","@dptr,a");
+             break;
+
+             case GPOINTER:
+             MOVA(l);
+             DEBUGpic16_emitcode(";lcall","__gptrput");
+             break;
+           */
+        default:
+          assert (0);
+        }
 
 
-    pic16_mov2w(AOP(right), offset++);
-  }
+      pic16_mov2w (AOP (right), offset++);
+    }
 
   /* last last was not complete */
-  if (rLen)   {
-    /* save the byte & read byte */
-    switch (p_type) {
-      case POINTER:
-        //                pic16_emitpcode(POC_MOVWF, pic16_popCopyReg(&pic16_pc_prodl));
-        pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(&pic16_pc_indf0));
-        break;
+  if (rLen)
+    {
+      /* save the byte & read byte */
+      switch (p_type)
+        {
+        case POINTER:
+          //                pic16_emitpcode(POC_MOVWF, pic16_popCopyReg(&pic16_pc_prodl));
+          pic16_emitpcode (POC_MOVFW, pic16_popCopyReg (&pic16_pc_indf0));
+          break;
 
-        /*
-           case FPOINTER:
-           pic16_emitcode ("mov","b,a");
-           pic16_emitcode("movx","a,@dptr");
-           break;
-
-           case GPOINTER:
-           pic16_emitcode ("push","b");
-           pic16_emitcode ("push","acc");
-           pic16_emitcode ("lcall","__gptrget");
-           pic16_emitcode ("pop","b");
-           break;
-         */
-      default:
-        assert(0);
-    }
-    DEBUGpic16_emitcode(";", "rLen = %i", rLen);
-    pic16_emitpcode(POC_ANDLW, pic16_popGetLit((unsigned char)-1 << -rLen));
-    pic16_emitpcode(POC_IORFW, pic16_popCopyReg(&pic16_pc_prodh));
-    //        pic16_emitcode ("anl","a,#0x%02x",((unsigned char)-1 << -rLen) );
-    //        pic16_emitcode ("orl","a,b");
-  }
+          /*
+             case FPOINTER:
+             pic16_emitcode ("mov","b,a");
+             pic16_emitcode("movx","a,@dptr");
+             break;
+
+             case GPOINTER:
+             pic16_emitcode ("push","b");
+             pic16_emitcode ("push","acc");
+             pic16_emitcode ("lcall","__gptrget");
+             pic16_emitcode ("pop","b");
+             break;
+           */
+        default:
+          assert (0);
+        }
+      DEBUGpic16_emitcode (";", "rLen = %i", rLen);
+      pic16_emitpcode (POC_ANDLW, pic16_popGetLit ((unsigned char) - 1 << -rLen));
+      pic16_emitpcode (POC_IORFW, pic16_popCopyReg (&pic16_pc_prodh));
+      //        pic16_emitcode ("anl","a,#0x%02x",((unsigned char)-1 << -rLen) );
+      //        pic16_emitcode ("orl","a,b");
+    }
 
   //    if (p_type == GPOINTER)
   //        pic16_emitcode("pop","b");
 
-  switch (p_type) {
+  switch (p_type)
+    {
 
     case POINTER:
-      pic16_emitpcode(POC_MOVWF, pic16_popCopyReg(&pic16_pc_indf0));
+      pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_indf0));
       //        pic16_emitcode("mov","@%s,a",rname);
       break;
       /*
@@ -8735,8 +9823,8 @@
          break;
        */
     default:
-      assert(0);
-  }
+      assert (0);
+    }
 
   //    pic16_freeAsmop(right, NULL, ic, TRUE);
 }
@@ -8744,45 +9832,48 @@
 /*-----------------------------------------------------------------*/
 /* genDataPointerSet - remat pointer to data space                 */
 /*-----------------------------------------------------------------*/
-static void genDataPointerSet(operand *right,
-                              operand *result,
-                              iCode *ic)
+static void
+genDataPointerSet (operand * right, operand * result, iCode * ic)
 {
-  int size, offset = 0, resoffset=0 ;
+  int size, offset = 0, resoffset = 0;
 
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    pic16_aopOp(right,ic,FALSE);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  pic16_aopOp (right, ic, FALSE);
 
-    size = AOP_SIZE(right);
+  size = AOP_SIZE (right);
 
 //      fprintf(stderr, "%s:%d size= %d\n", __FILE__, __LINE__, size);
 
 #if 0
-    if ( AOP_TYPE(result) == AOP_PCODE) {
-      fprintf(stderr,"genDataPointerSet   %s, %d\n",
-              AOP(result)->aopu.pcop->name,
-                (AOP(result)->aopu.pcop->type == PO_DIR)?
-              PCOR(AOP(result)->aopu.pcop)->instance:
-              PCOI(AOP(result)->aopu.pcop)->offset);
+  if (AOP_TYPE (result) == AOP_PCODE)
+    {
+      fprintf (stderr, "genDataPointerSet   %s, %d\n",
+               AOP (result)->aopu.pcop->name,
+               (AOP (result)->aopu.pcop->type == PO_DIR) ?
+               PCOR (AOP (result)->aopu.pcop)->instance : PCOI (AOP (result)->aopu.pcop)->offset);
     }
 #endif
 
-    if(AOP(result)->aopu.pcop->type == PO_DIR)
-      resoffset=PCOR(AOP(result)->aopu.pcop)->instance;
-
-    while (size--) {
-      if (AOP_TYPE(right) == AOP_LIT) {
-        unsigned int lit = pic16aopLiteral(AOP(IC_RIGHT(ic))->aopu.aop_lit, offset);
-        pic16_movLit2f(pic16_popGet(AOP(result), offset), lit);
-      } else {
-        pic16_mov2w(AOP(right), offset);
-        pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offset)); // patch 8
-      }
+  if (AOP (result)->aopu.pcop->type == PO_DIR)
+    resoffset = PCOR (AOP (result)->aopu.pcop)->instance;
+
+  while (size--)
+    {
+      if (AOP_TYPE (right) == AOP_LIT)
+        {
+          unsigned int lit = pic16aopLiteral (AOP (IC_RIGHT (ic))->aopu.aop_lit, offset);
+          pic16_movLit2f (pic16_popGet (AOP (result), offset), lit);
+        }
+      else
+        {
+          pic16_mov2w (AOP (right), offset);
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));     // patch 8
+        }
       offset++;
       resoffset++;
     }
 
-    pic16_freeAsmop(right,NULL,ic,TRUE);
+  pic16_freeAsmop (right, NULL, ic, TRUE);
 }
 
 
@@ -8790,305 +9881,325 @@
 /*-----------------------------------------------------------------*/
 /* genNearPointerSet - pic16_emitcode for near pointer put         */
 /*-----------------------------------------------------------------*/
-static void genNearPointerSet (operand *right,
-                               operand *result,
-                               iCode *ic)
+static void
+genNearPointerSet (operand * right, operand * result, iCode * ic)
 {
   asmop *aop = NULL;
   sym_link *retype;
-  sym_link *ptype = operandType(result);
+  sym_link *ptype = operandType (result);
   sym_link *resetype;
 
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    retype= getSpec(operandType(right));
-    resetype = getSpec(operandType(result));
-
-    pic16_aopOp(result,ic,FALSE);
-
-    /* if the result is rematerializable &
-     * in data space & not a bit variable */
-
-    /* and result is not a bit variable */
-    if (AOP_TYPE(result) == AOP_PCODE
-      && DCL_TYPE(ptype) == POINTER
-      && !IS_BITFIELD(retype)
-      && !IS_BITFIELD(resetype)) {
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  retype = getSpec (operandType (right));
+  resetype = getSpec (operandType (result));
+
+  pic16_aopOp (result, ic, FALSE);
+
+  /* if the result is rematerializable &
+   * in data space & not a bit variable */
 
-        genDataPointerSet (right,result,ic);
-        pic16_freeAsmop(result,NULL,ic,TRUE);
+  /* and result is not a bit variable */
+  if (AOP_TYPE (result) == AOP_PCODE && DCL_TYPE (ptype) == POINTER && !IS_BITFIELD (retype) && !IS_BITFIELD (resetype))
+    {
+
+      genDataPointerSet (right, result, ic);
+      pic16_freeAsmop (result, NULL, ic, TRUE);
       return;
     }
 
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    pic16_aopOp(right,ic,FALSE);
-    DEBUGpic16_pic16_AopType(__LINE__,NULL,right,result);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  pic16_aopOp (right, ic, FALSE);
+  DEBUGpic16_pic16_AopType (__LINE__, NULL, right, result);
 
-    /* if bitfield then unpack the bits */
-    if (IS_BITFIELD(resetype)) {
+  /* if bitfield then unpack the bits */
+  if (IS_BITFIELD (resetype))
+    {
       genPackBits (resetype, result, right, NULL, POINTER);
-    } else {
+    }
+  else
+    {
       /* we have can just get the values */
-      int size = AOP_SIZE(right);
-      int offset = 0 ;
+      int size = AOP_SIZE (right);
+      int offset = 0;
 
-        pic16_loadFSR0(result, 0);
+      pic16_loadFSR0 (result, 0);
 
-        DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-        while (size--) {
-          if (pic16_isLitOp(right)) {
-            pic16_emitpcode(POC_MOVLW, pic16_popGet(AOP(right),offset));
-            if (size) {
-              pic16_emitpcode(POC_MOVWF,pic16_popCopyReg(&pic16_pc_postinc0));
-            } else {
-              pic16_emitpcode(POC_MOVWF,pic16_popCopyReg(&pic16_pc_indf0));
-            }
-          } else { // no literal
-            if(size) {
-              pic16_emitpcode(POC_MOVFF,
-                  pic16_popGet2p(pic16_popGet(AOP(right),offset),
-                  pic16_popCopyReg(&pic16_pc_postinc0)));
-            } else {
-              pic16_emitpcode(POC_MOVFF,
-                  pic16_popGet2p(pic16_popGet(AOP(right),offset),
-                  pic16_popCopyReg(&pic16_pc_indf0)));
+      DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+      while (size--)
+        {
+          if (pic16_isLitOp (right))
+            {
+              pic16_emitpcode (POC_MOVLW, pic16_popGet (AOP (right), offset));
+              if (size)
+                {
+                  pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_postinc0));
+                }
+              else
+                {
+                  pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_indf0));
+                }
+            }
+          else                  // no literal
+            {
+              if (size)
+                {
+                  pic16_emitpcode (POC_MOVFF,
+                                   pic16_popGet2p (pic16_popGet (AOP (right), offset), pic16_popCopyReg (&pic16_pc_postinc0)));
+                }
+              else
+                {
+                  pic16_emitpcode (POC_MOVFF,
+                                   pic16_popGet2p (pic16_popGet (AOP (right), offset), pic16_popCopyReg (&pic16_pc_indf0)));
+                }
             }
-          }
 
           offset++;
         }
     }
 
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* now some housekeeping stuff */
-    if (aop) {
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  /* now some housekeeping stuff */
+  if (aop)
+    {
       /* we had to allocate for this iCode */
-      pic16_freeAsmop(NULL,aop,ic,TRUE);
-    } else {
+      pic16_freeAsmop (NULL, aop, ic, TRUE);
+    }
+  else
+    {
       /* we did not allocate which means left
        * already in a pointer register, then
        * if size > 0 && this could be used again
        * we have to point it back to where it
        * belongs */
-      DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-      if (AOP_SIZE(right) > 1
-        && !OP_SYMBOL(result)->remat
-        && ( OP_SYMBOL(result)->liveTo > ic->seq
-        || ic->depth )) {
-
-          int size = AOP_SIZE(right) - 1;
-
-            while (size--)
-              pic16_emitcode("decf","fsr0,f");
-              //pic16_emitcode("dec","%s",rname);
-      }
+      DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+      if (AOP_SIZE (right) > 1 && !OP_SYMBOL (result)->remat && (OP_SYMBOL (result)->liveTo > ic->seq || ic->depth))
+        {
+
+          int size = AOP_SIZE (right) - 1;
+
+          while (size--)
+            pic16_emitcode ("decf", "fsr0,f");
+          //pic16_emitcode("dec","%s",rname);
+        }
     }
 
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-    /* done */
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+  /* done */
 //release:
-    pic16_freeAsmop(right,NULL,ic,TRUE);
-    pic16_freeAsmop(result,NULL,ic,TRUE);
+  pic16_freeAsmop (right, NULL, ic, TRUE);
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genGenPointerSet - set value from generic pointer space         */
 /*-----------------------------------------------------------------*/
-static void genGenPointerSet (operand *right,
-                              operand *result, iCode *ic)
+static void
+genGenPointerSet (operand * right, operand * result, iCode * ic)
 {
   int size;
-  sym_link *retype = getSpec(operandType(result));
+  sym_link *retype = getSpec (operandType (result));
 
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-    pic16_aopOp(result,ic,FALSE);
-    pic16_aopOp(right,ic,FALSE);
-    size = AOP_SIZE(right);
+  pic16_aopOp (result, ic, FALSE);
+  pic16_aopOp (right, ic, FALSE);
+  size = AOP_SIZE (right);
 
-    DEBUGpic16_pic16_AopType(__LINE__,NULL,right,result);
+  DEBUGpic16_pic16_AopType (__LINE__, NULL, right, result);
 
 
-    /* if bit then unpack */
-    if (IS_BITFIELD(retype)) {
+  /* if bit then unpack */
+  if (IS_BITFIELD (retype))
+    {
 //      pic16_emitpcode(POC_LFSR,pic16_popGetLit2(0,pic16_popGetLit(lit)));
-      genPackBits(retype,result,right,"dptr",GPOINTER);
+      genPackBits (retype, result, right, "dptr", GPOINTER);
       goto release;
     }
 
-    size = AOP_SIZE(right);
+  size = AOP_SIZE (right);
 
-    DEBUGpic16_emitcode ("; ***","%s  %d size=%d",__FUNCTION__,__LINE__,size);
+  DEBUGpic16_emitcode ("; ***", "%s  %d size=%d", __FUNCTION__, __LINE__, size);
 
 
-    /* load value to write in TBLPTRH:TBLPTRL:PRODH:[stack] */
+  /* load value to write in TBLPTRH:TBLPTRL:PRODH:[stack] */
 
-    /* value of right+0 is placed on stack, which will be retrieved
-     * by the support function thus restoring the stack. The important
-     * thing is that there is no need to manually restore stack pointer
-     * here */
-    pushaop(AOP(right), 0);
+  /* value of right+0 is placed on stack, which will be retrieved
+   * by the support function thus restoring the stack. The important
+   * thing is that there is no need to manually restore stack pointer
+   * here */
+  pushaop (AOP (right), 0);
 //    mov2fp(pic16_popCopyReg(&pic16_pc_postdec1), AOP(right), 0);
-    if(size>1)mov2fp(pic16_popCopyReg(&pic16_pc_prodh), AOP(right), 1);
-    if(size>2)mov2fp(pic16_popCopyReg(&pic16_pc_tblptrl), AOP(right), 2);
-    if(size>3)mov2fp(pic16_popCopyReg(&pic16_pc_tblptrh), AOP(right), 3);
-
-    /* load address to write to in WREG:FSR0H:FSR0L */
-    pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popGet(AOP(result), 0),
-                                pic16_popCopyReg(&pic16_pc_fsr0l)));
-    pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popGet(AOP(result), 1),
-                                pic16_popCopyReg(&pic16_pc_prodl)));
-    pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(result), 2));
+  if (size > 1)
+    mov2fp (pic16_popCopyReg (&pic16_pc_prodh), AOP (right), 1);
+  if (size > 2)
+    mov2fp (pic16_popCopyReg (&pic16_pc_tblptrl), AOP (right), 2);
+  if (size > 3)
+    mov2fp (pic16_popCopyReg (&pic16_pc_tblptrh), AOP (right), 3);
+
+  /* load address to write to in WREG:FSR0H:FSR0L */
+  pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popGet (AOP (result), 0), pic16_popCopyReg (&pic16_pc_fsr0l)));
+  pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popGet (AOP (result), 1), pic16_popCopyReg (&pic16_pc_prodl)));
+  pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (result), 2));
 
-    pic16_callGenericPointerRW(1, size);
+  pic16_callGenericPointerRW (1, size);
 
 release:
-    pic16_freeAsmop(right,NULL,ic,TRUE);
-    pic16_freeAsmop(result,NULL,ic,TRUE);
+  pic16_freeAsmop (right, NULL, ic, TRUE);
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genPointerSet - stores the value into a pointer location        */
 /*-----------------------------------------------------------------*/
-static void genPointerSet (iCode *ic)
+static void
+genPointerSet (iCode * ic)
 {
-  operand *right, *result ;
+  operand *right, *result;
   sym_link *type, *etype;
   int p_type;
 
-    FENTRY;
+  FENTRY;
 
-    right = IC_RIGHT(ic);
-    result = IC_RESULT(ic) ;
+  right = IC_RIGHT (ic);
+  result = IC_RESULT (ic);
 
-    /* depending on the type of pointer we need to
-    move it to the correct pointer register */
-    type = operandType(result);
-    etype = getSpec(type);
-
-    /* if left is of type of pointer then it is simple */
-    if (IS_PTR(type) && !IS_FUNC(type->next)) {
-        p_type = DCL_TYPE(type);
-    }
-    else {
-        /* we have to go by the storage class */
-        p_type = PTR_TYPE(SPEC_OCLS(etype));
-
-/*      if (SPEC_OCLS(etype)->codesp ) { */
-/*          p_type = CPOINTER ;  */
-/*      } */
-/*      else */
-/*          if (SPEC_OCLS(etype)->fmap && !SPEC_OCLS(etype)->paged) */
-/*              p_type = FPOINTER ; */
-/*          else */
-/*              if (SPEC_OCLS(etype)->fmap && SPEC_OCLS(etype)->paged) */
-/*                  p_type = PPOINTER ; */
-/*              else */
-/*                  if (SPEC_OCLS(etype) == idata ) */
-/*                      p_type = IPOINTER ; */
-/*                  else */
-/*                      p_type = POINTER ; */
-    }
-
-    /* now that we have the pointer type we assign
-    the pointer values */
-    switch (p_type) {
-      case POINTER:
-      case FPOINTER:
-      case IPOINTER:
-      case PPOINTER:
-        genNearPointerSet (right,result,ic);
-        break;
+  /* depending on the type of pointer we need to
+     move it to the correct pointer register */
+  type = operandType (result);
+  etype = getSpec (type);
 
-      case GPOINTER:
-        genGenPointerSet (right,result,ic);
-        break;
+  /* if left is of type of pointer then it is simple */
+  if (IS_PTR (type) && !IS_FUNC (type->next))
+    {
+      p_type = DCL_TYPE (type);
+    }
+  else
+    {
+      /* we have to go by the storage class */
+      p_type = PTR_TYPE (SPEC_OCLS (etype));
+
+      /*      if (SPEC_OCLS(etype)->codesp ) { */
+      /*          p_type = CPOINTER ;  */
+      /*      } */
+      /*      else */
+      /*          if (SPEC_OCLS(etype)->fmap && !SPEC_OCLS(etype)->paged) */
+      /*              p_type = FPOINTER ; */
+      /*          else */
+      /*              if (SPEC_OCLS(etype)->fmap && SPEC_OCLS(etype)->paged) */
+      /*                  p_type = PPOINTER ; */
+      /*              else */
+      /*                  if (SPEC_OCLS(etype) == idata ) */
+      /*                      p_type = IPOINTER ; */
+      /*                  else */
+      /*                      p_type = POINTER ; */
+    }
+
+  /* now that we have the pointer type we assign
+     the pointer values */
+  switch (p_type)
+    {
+    case POINTER:
+    case FPOINTER:
+    case IPOINTER:
+    case PPOINTER:
+      genNearPointerSet (right, result, ic);
+      break;
 
-      default:
-        werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
-          "genPointerSet: illegal pointer type");
+    case GPOINTER:
+      genGenPointerSet (right, result, ic);
+      break;
+
+    default:
+      werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "genPointerSet: illegal pointer type");
     }
 }
 
 /*-----------------------------------------------------------------*/
 /* genIfx - generate code for Ifx statement                        */
 /*-----------------------------------------------------------------*/
-static void genIfx (iCode *ic, iCode *popIc)
+static void
+genIfx (iCode * ic, iCode * popIc)
 {
-  operand *cond = IC_COND(ic);
-  int isbit =0;
+  operand *cond = IC_COND (ic);
+  int isbit = 0;
+
+  FENTRY;
 
-    FENTRY;
+  pic16_aopOp (cond, ic, FALSE);
 
-    pic16_aopOp(cond,ic,FALSE);
+  /* get the value into acc */
+  if (AOP_TYPE (cond) != AOP_CRY)
+    pic16_toBoolean (cond);
+  else
+    isbit = 1;
+  /* the result is now in the accumulator */
+  pic16_freeAsmop (cond, NULL, ic, TRUE);
+
+  /* if there was something to be popped then do it */
+  if (popIc)
+    genIpop (popIc);
 
-    /* get the value into acc */
-    if (AOP_TYPE(cond) != AOP_CRY)
-      pic16_toBoolean(cond);
-    else
-      isbit = 1;
-    /* the result is now in the accumulator */
-    pic16_freeAsmop(cond,NULL,ic,TRUE);
-
-    /* if there was something to be popped then do it */
-    if (popIc)
-      genIpop(popIc);
-
-    /* if the condition is  a bit variable */
-    if (isbit && IS_ITEMP(cond) &&
-        SPIL_LOC(cond)) {
-      genIfxJump(ic,"c");
-      DEBUGpic16_emitcode ("; isbit  SPIL_LOC","%s",SPIL_LOC(cond)->rname);
-    } else {
-      if (isbit && !IS_ITEMP(cond))
-        genIfxJump(ic,OP_SYMBOL(cond)->rname);
-        else
-        genIfxJump(ic,"a");
+  /* if the condition is  a bit variable */
+  if (isbit && IS_ITEMP (cond) && SPIL_LOC (cond))
+    {
+      genIfxJump (ic, "c");
+      DEBUGpic16_emitcode ("; isbit  SPIL_LOC", "%s", SPIL_LOC (cond)->rname);
+    }
+  else
+    {
+      if (isbit && !IS_ITEMP (cond))
+        genIfxJump (ic, OP_SYMBOL (cond)->rname);
+      else
+        genIfxJump (ic, "a");
     }
-    ic->generated = 1;
+  ic->generated = 1;
 }
 
 /*-----------------------------------------------------------------*/
 /* genAddrOf - generates code for address of                       */
 /*-----------------------------------------------------------------*/
-static void genAddrOf (iCode *ic)
+static void
+genAddrOf (iCode * ic)
 {
   operand *result, *left;
   int size;
-  symbol *sym;  // = OP_SYMBOL(IC_LEFT(ic));
+  symbol *sym;                  // = OP_SYMBOL(IC_LEFT(ic));
   pCodeOp *pcop0, *pcop1, *pcop2;
 
-    FENTRY;
+  FENTRY;
 
-    pic16_aopOp((result=IC_RESULT(ic)),ic,TRUE);
+  pic16_aopOp ((result = IC_RESULT (ic)), ic, TRUE);
 
-    sym = OP_SYMBOL( IC_LEFT(ic) );
+  sym = OP_SYMBOL (IC_LEFT (ic));
 
-    if(sym->onStack) {
+  if (sym->onStack)
+    {
       /* get address of symbol on stack */
-      DEBUGpic16_emitcode(";    ", "%s symbol %s on stack", __FUNCTION__, sym->name);
+      DEBUGpic16_emitcode (";    ", "%s symbol %s on stack", __FUNCTION__, sym->name);
 #if 0
-      fprintf(stderr, "%s:%d symbol %s on stack offset %i\n", __FILE__, __LINE__,
-                  OP_SYMBOL(IC_LEFT(ic))->name, OP_SYMBOL(IC_LEFT(ic))->stack);
+      fprintf (stderr, "%s:%d symbol %s on stack offset %i\n", __FILE__, __LINE__,
+               OP_SYMBOL (IC_LEFT (ic))->name, OP_SYMBOL (IC_LEFT (ic))->stack);
 #endif
 
       // operands on stack are accessible via "FSR2 + index" with index
       // starting at 2 for arguments and growing from 0 downwards for
       // local variables (index == 0 is not assigned so we add one here)
       {
-        int soffs = OP_SYMBOL( IC_LEFT(ic))->stack;
+        int soffs = OP_SYMBOL (IC_LEFT (ic))->stack;
 
-          if (soffs <= 0) {
+        if (soffs <= 0)
+          {
             assert (soffs < 0);
             soffs++;
-          } // if
+          }                     // if
 
-          DEBUGpic16_emitcode("*!*", "accessing stack symbol at offset=%d", soffs);
-          pic16_emitpcode(POC_MOVLW , pic16_popGetLit( soffs & 0x00FF ));
-          pic16_emitpcode(POC_ADDFW , pic16_popCopyReg(pic16_framepnt_lo));
-          pic16_emitpcode(POC_MOVWF , pic16_popGet(AOP(result), 0));
-          pic16_emitpcode(POC_MOVLW , pic16_popGetLit( (soffs >> 8) & 0x00FF ));
-          pic16_emitpcode(POC_ADDFWC, pic16_popCopyReg(pic16_framepnt_hi));
-          pic16_emitpcode(POC_MOVWF , pic16_popGet(AOP(result), 1));
+        DEBUGpic16_emitcode ("*!*", "accessing stack symbol at offset=%d", soffs);
+        pic16_emitpcode (POC_MOVLW, pic16_popGetLit (soffs & 0x00FF));
+        pic16_emitpcode (POC_ADDFW, pic16_popCopyReg (pic16_framepnt_lo));
+        pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 0));
+        pic16_emitpcode (POC_MOVLW, pic16_popGetLit ((soffs >> 8) & 0x00FF));
+        pic16_emitpcode (POC_ADDFWC, pic16_popCopyReg (pic16_framepnt_hi));
+        pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 1));
       }
 
       goto release;
@@ -9099,383 +10210,418 @@
 //                      __FILE__, __LINE__, __FUNCTION__, sym->name, IN_CODESPACE( SPEC_OCLS(sym->etype)));
 //      }
 
-    pic16_aopOp((left=IC_LEFT(ic)), ic, FALSE);
-    size = AOP_SIZE(IC_RESULT(ic));
+  pic16_aopOp ((left = IC_LEFT (ic)), ic, FALSE);
+  size = AOP_SIZE (IC_RESULT (ic));
+
+  pcop0 = PCOP (pic16_newpCodeOpImmd (sym->rname, 0, 0, IN_CODESPACE (SPEC_OCLS (sym->etype))));
+  pcop1 = PCOP (pic16_newpCodeOpImmd (sym->rname, 1, 0, IN_CODESPACE (SPEC_OCLS (sym->etype))));
+  pcop2 = PCOP (pic16_newpCodeOpImmd (sym->rname, 2, 0, IN_CODESPACE (SPEC_OCLS (sym->etype))));
 
-    pcop0 = PCOP(pic16_newpCodeOpImmd(sym->rname, 0, 0, IN_CODESPACE( SPEC_OCLS(sym->etype))));
-    pcop1 = PCOP(pic16_newpCodeOpImmd(sym->rname, 1, 0, IN_CODESPACE( SPEC_OCLS(sym->etype))));
-    pcop2 = PCOP(pic16_newpCodeOpImmd(sym->rname, 2, 0, IN_CODESPACE( SPEC_OCLS(sym->etype))));
-
-    if (size == 3) {
-      pic16_emitpcode(POC_MOVLW, pcop0);
-      pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), 0));
-      pic16_emitpcode(POC_MOVLW, pcop1);
-      pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), 1));
-      pic16_emitpcode(POC_MOVLW, pcop2);
-      pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), 2));
-    } else
-    if (size == 2) {
-      pic16_emitpcode(POC_MOVLW, pcop0);
-      pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),0));
-      pic16_emitpcode(POC_MOVLW, pcop1);
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),1));
-    } else {
-      pic16_emitpcode(POC_MOVLW, pcop0);
-      pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),0));
+  if (size == 3)
+    {
+      pic16_emitpcode (POC_MOVLW, pcop0);
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 0));
+      pic16_emitpcode (POC_MOVLW, pcop1);
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 1));
+      pic16_emitpcode (POC_MOVLW, pcop2);
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 2));
+    }
+  else if (size == 2)
+    {
+      pic16_emitpcode (POC_MOVLW, pcop0);
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 0));
+      pic16_emitpcode (POC_MOVLW, pcop1);
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 1));
+    }
+  else
+    {
+      pic16_emitpcode (POC_MOVLW, pcop0);
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 0));
     }
 
-    pic16_freeAsmop(left, NULL, ic, FALSE);
+  pic16_freeAsmop (left, NULL, ic, FALSE);
 release:
-    pic16_freeAsmop(result,NULL,ic,TRUE);
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 }
 
 
 /*-----------------------------------------------------------------*/
 /* genAssign - generate code for assignment                        */
 /*-----------------------------------------------------------------*/
-static void genAssign (iCode *ic)
+static void
+genAssign (iCode * ic)
 {
   operand *result, *right;
   sym_link *restype, *rtype;
-  int size, offset,know_W;
+  int size, offset, know_W;
   unsigned long lit = 0L;
 
-    result = IC_RESULT(ic);
-    right  = IC_RIGHT(ic) ;
+  result = IC_RESULT (ic);
+  right = IC_RIGHT (ic);
 
-    FENTRY;
+  FENTRY;
 
-    /* if they are the same */
-    if (operandsEqu (IC_RESULT(ic),IC_RIGHT(ic)))
-      return ;
+  /* if they are the same */
+  if (operandsEqu (IC_RESULT (ic), IC_RIGHT (ic)))
+    return;
 
-    /* reversed order operands are aopOp'ed so that result operand
-     * is effective in case right is a stack symbol. This maneauver
-     * allows to use the _G.resDirect flag later */
-     pic16_aopOp(result,ic,TRUE);
-    pic16_aopOp(right,ic,FALSE);
+  /* reversed order operands are aopOp'ed so that result operand
+   * is effective in case right is a stack symbol. This maneauver
+   * allows to use the _G.resDirect flag later */
+  pic16_aopOp (result, ic, TRUE);
+  pic16_aopOp (right, ic, FALSE);
 
-    DEBUGpic16_pic16_AopType(__LINE__,NULL,right,result);
+  DEBUGpic16_pic16_AopType (__LINE__, NULL, right, result);
 
-    /* if they are the same registers */
-    if (pic16_sameRegs(AOP(right),AOP(result)))
-      goto release;
+  /* if they are the same registers */
+  if (pic16_sameRegs (AOP (right), AOP (result)))
+    goto release;
 
-    /* if the result is a bit */
-    if (AOP_TYPE(result) == AOP_CRY) {
+  /* if the result is a bit */
+  if (AOP_TYPE (result) == AOP_CRY)
+    {
       /* if the right size is a literal then
          we know what the value is */
-      if (AOP_TYPE(right) == AOP_LIT) {
+      if (AOP_TYPE (right) == AOP_LIT)
+        {
 
-        pic16_emitpcode(  ( ((int) operandLitValue(right)) ? POC_BSF : POC_BCF),
-            pic16_popGet(AOP(result),0));
+          pic16_emitpcode ((((int) operandLitValue (right)) ? POC_BSF : POC_BCF), pic16_popGet (AOP (result), 0));
 
-        if (((int) operandLitValue(right)))
-          pic16_emitcode("bsf","(%s >> 3),(%s & 7)",
-              AOP(result)->aopu.aop_dir,
-              AOP(result)->aopu.aop_dir);
-        else
-          pic16_emitcode("bcf","(%s >> 3),(%s & 7)",
-              AOP(result)->aopu.aop_dir,
-              AOP(result)->aopu.aop_dir);
+          if (((int) operandLitValue (right)))
+            pic16_emitcode ("bsf", "(%s >> 3),(%s & 7)", AOP (result)->aopu.aop_dir, AOP (result)->aopu.aop_dir);
+          else
+            pic16_emitcode ("bcf", "(%s >> 3),(%s & 7)", AOP (result)->aopu.aop_dir, AOP (result)->aopu.aop_dir);
 
-        goto release;
-      }
+          goto release;
+        }
 
       /* the right is also a bit variable */
-      if (AOP_TYPE(right) == AOP_CRY) {
-        pic16_emitpcode(POC_BCF,    pic16_popGet(AOP(result),0));
-        pic16_emitpcode(POC_BTFSC,  pic16_popGet(AOP(right),0));
-        pic16_emitpcode(POC_BSF,    pic16_popGet(AOP(result),0));
+      if (AOP_TYPE (right) == AOP_CRY)
+        {
+          pic16_emitpcode (POC_BCF, pic16_popGet (AOP (result), 0));
+          pic16_emitpcode (POC_BTFSC, pic16_popGet (AOP (right), 0));
+          pic16_emitpcode (POC_BSF, pic16_popGet (AOP (result), 0));
 
-        goto release ;
-      }
+          goto release;
+        }
 
       /* we need to or */
-      pic16_emitpcode(POC_BCF,    pic16_popGet(AOP(result),0));
-      pic16_toBoolean(right);
+      pic16_emitpcode (POC_BCF, pic16_popGet (AOP (result), 0));
+      pic16_toBoolean (right);
       emitSKPZ;
-      pic16_emitpcode(POC_BSF,    pic16_popGet(AOP(result),0));
+      pic16_emitpcode (POC_BSF, pic16_popGet (AOP (result), 0));
       //pic16_aopPut(AOP(result),"a",0);
-      goto release ;
+      goto release;
     }
 
-    /* bit variables done */
-    /* general case */
-    size = AOP_SIZE(result);
-    offset = 0 ;
+  /* bit variables done */
+  /* general case */
+  size = AOP_SIZE (result);
+  offset = 0;
 
   /* bit variables done */
   /* general case */
-  size = AOP_SIZE(result);
-  restype = operandType(result);
-  rtype = operandType(right);
-  offset = 0 ;
-
-  if(AOP_TYPE(right) == AOP_LIT) {
-    if(!(IS_FLOAT(operandType( right )) || IS_FIXED(operandType(right))))
-    {
-      lit = ulFromVal (AOP(right)->aopu.aop_lit);
-
-      /* patch tag for literals that are cast to pointers */
-      if (IS_CODEPTR(restype)) {
-        //fprintf (stderr, "%s:%u: INFO: `(__code*)literal'\n", ic->filename, ic->lineno);
-        lit = (lit & 0x00ffff) | (GPTR_TAG_CODE << 16);
-      } else {
-        if (IS_GENPTR(restype))
-        {
-          if (IS_CODEPTR(rtype)) {
-            //fprintf (stderr, "%s:%u: INFO: `(generic*)(literal __code*)'\n", ic->filename, ic->lineno);
-            lit = (lit & 0x00ffff) | (GPTR_TAG_CODE << 16);
-          } else if (PIC_IS_DATA_PTR(rtype)) {
-            //fprintf (stderr, "%s:%u: INFO: `(generic*)(literal __data*)'\n", ic->filename, ic->lineno);
-            lit = (lit & 0x00ffff) | (GPTR_TAG_DATA << 16);
-          } else if (!IS_PTR(rtype) || IS_GENPTR(rtype)) {
-            //fprintf (stderr, "%s:%u: INFO: `(generic*)literal' -- accepting specified tag %02x\n", ic->filename, ic->lineno, (unsigned char)(lit >> 16));
-          } else if (IS_PTR(rtype)) {
-            fprintf (stderr, "%s:%u: WARNING: `(generic*)literal' -- assuming __data space\n", ic->filename, ic->lineno);
-            lit = (lit & 0x00ffff) | (GPTR_TAG_DATA << 16);
-          }
+  size = AOP_SIZE (result);
+  restype = operandType (result);
+  rtype = operandType (right);
+  offset = 0;
+
+  if (AOP_TYPE (right) == AOP_LIT)
+    {
+      if (!(IS_FLOAT (operandType (right)) || IS_FIXED (operandType (right))))
+        {
+          lit = ulFromVal (AOP (right)->aopu.aop_lit);
+
+          /* patch tag for literals that are cast to pointers */
+          if (IS_CODEPTR (restype))
+            {
+              //fprintf (stderr, "%s:%u: INFO: `(__code*)literal'\n", ic->filename, ic->lineno);
+              lit = (lit & 0x00ffff) | (GPTR_TAG_CODE << 16);
+            }
+          else
+            {
+              if (IS_GENPTR (restype))
+                {
+                  if (IS_CODEPTR (rtype))
+                    {
+                      //fprintf (stderr, "%s:%u: INFO: `(generic*)(literal __code*)'\n", ic->filename, ic->lineno);
+                      lit = (lit & 0x00ffff) | (GPTR_TAG_CODE << 16);
+                    }
+                  else if (PIC_IS_DATA_PTR (rtype))
+                    {
+                      //fprintf (stderr, "%s:%u: INFO: `(generic*)(literal __data*)'\n", ic->filename, ic->lineno);
+                      lit = (lit & 0x00ffff) | (GPTR_TAG_DATA << 16);
+                    }
+                  else if (!IS_PTR (rtype) || IS_GENPTR (rtype))
+                    {
+                      //fprintf (stderr, "%s:%u: INFO: `(generic*)literal' -- accepting specified tag %02x\n", ic->filename, ic->lineno, (unsigned char)(lit >> 16));
+                    }
+                  else if (IS_PTR (rtype))
+                    {
+                      fprintf (stderr, "%s:%u: WARNING: `(generic*)literal' -- assuming __data space\n", ic->filename,
+                               ic->lineno);
+                      lit = (lit & 0x00ffff) | (GPTR_TAG_DATA << 16);
+                    }
+                }
+            }
         }
-      }
-    } else {
-      union {
-        unsigned long lit_int;
-        float lit_float;
-      } info;
+      else
+        {
+          union
+          {
+            unsigned long lit_int;
+            float lit_float;
+          } info;
 
 
-      if(IS_FIXED16X16(operandType(right))) {
-        lit = (unsigned long)fixed16x16FromDouble( floatFromVal( AOP(right)->aopu.aop_lit));
-      } else {
-        /* take care if literal is a float */
-        info.lit_float = floatFromVal(AOP(right)->aopu.aop_lit);
-        lit = info.lit_int;
-      }
+          if (IS_FIXED16X16 (operandType (right)))
+            {
+              lit = (unsigned long) fixed16x16FromDouble (floatFromVal (AOP (right)->aopu.aop_lit));
+            }
+          else
+            {
+              /* take care if literal is a float */
+              info.lit_float = (float)floatFromVal (AOP (right)->aopu.aop_lit);
+              lit = info.lit_int;
+            }
+        }
     }
-  }
 
 //  fprintf(stderr, "%s:%d: assigning value 0x%04lx (%d:%d)\n", __FUNCTION__, __LINE__, lit,
 //                      sizeof(unsigned long int), sizeof(float));
 
 
-    if (AOP_TYPE(right) == AOP_REG) {
-      DEBUGpic16_emitcode(";   ", "%s:%d assign from register\n", __FUNCTION__, __LINE__);
-      while (size--) {
-        pic16_emitpcode (POC_MOVFF, pic16_popGet2(AOP(right), AOP(result), offset++));
-      } // while
+  if (AOP_TYPE (right) == AOP_REG)
+    {
+      DEBUGpic16_emitcode (";   ", "%s:%d assign from register\n", __FUNCTION__, __LINE__);
+      while (size--)
+        {
+          pic16_emitpcode (POC_MOVFF, pic16_popGet2 (AOP (right), AOP (result), offset++));
+        }                       // while
       goto release;
     }
 
-    /* when do we have to read the program memory?
-     * - if right itself is a symbol in code space
-     *   (we don't care what it points to if it's a pointer)
-     * - AND right is not a function (we would want its address)
-     */
-    if(AOP_TYPE(right) != AOP_LIT
-      && IN_CODESPACE(SPEC_OCLS(OP_SYM_ETYPE(right)))
-      && !IS_FUNC(OP_SYM_TYPE(right))
-      && !IS_ITEMP(right)) {
+  /* when do we have to read the program memory?
+   * - if right itself is a symbol in code space
+   *   (we don't care what it points to if it's a pointer)
+   * - AND right is not a function (we would want its address)
+   */
+  if (AOP_TYPE (right) != AOP_LIT
+      && IN_CODESPACE (SPEC_OCLS (OP_SYM_ETYPE (right))) && !IS_FUNC (OP_SYM_TYPE (right)) && !IS_ITEMP (right))
+    {
 
-      DEBUGpic16_emitcode(";   ", "%s:%d symbol in code space, take special care\n", __FUNCTION__, __LINE__);
+      DEBUGpic16_emitcode (";   ", "%s:%d symbol in code space, take special care\n", __FUNCTION__, __LINE__);
       //fprintf(stderr, "%s:%d symbol %s = [ %s ] is in code space\n", __FILE__, __LINE__, OP_SYMBOL(result)->name, OP_SYMBOL(right)->name);
 
       // set up table pointer
-      if(pic16_isLitOp(right)) {
+      if (pic16_isLitOp (right))
+        {
 //      fprintf(stderr, "%s:%d inside block 1\n", __FILE__, __LINE__);
-        pic16_emitpcode(POC_MOVLW,pic16_popGet(AOP(right),0));
-        pic16_emitpcode(POC_MOVWF,pic16_popCopyReg(&pic16_pc_tblptrl));
-        pic16_emitpcode(POC_MOVLW,pic16_popGet(AOP(right),1));
-        pic16_emitpcode(POC_MOVWF,pic16_popCopyReg(&pic16_pc_tblptrh));
-        pic16_emitpcode(POC_MOVLW,pic16_popGet(AOP(right),2));
-        pic16_emitpcode(POC_MOVWF,pic16_popCopyReg(&pic16_pc_tblptru));
-      } else {
+          pic16_emitpcode (POC_MOVLW, pic16_popGet (AOP (right), 0));
+          pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_tblptrl));
+          pic16_emitpcode (POC_MOVLW, pic16_popGet (AOP (right), 1));
+          pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_tblptrh));
+          pic16_emitpcode (POC_MOVLW, pic16_popGet (AOP (right), 2));
+          pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_tblptru));
+        }
+      else
+        {
 //      fprintf(stderr, "%s:%d inside block 2\n", __FILE__, __LINE__);
-        pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popGet(AOP(right),0),
-            pic16_popCopyReg(&pic16_pc_tblptrl)));
-        pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popGet(AOP(right),1),
-            pic16_popCopyReg(&pic16_pc_tblptrh)));
-        pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popGet(AOP(right),2),
-            pic16_popCopyReg(&pic16_pc_tblptru)));
-      }
+          pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popGet (AOP (right), 0), pic16_popCopyReg (&pic16_pc_tblptrl)));
+          pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popGet (AOP (right), 1), pic16_popCopyReg (&pic16_pc_tblptrh)));
+          pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popGet (AOP (right), 2), pic16_popCopyReg (&pic16_pc_tblptru)));
+        }
 
       /* must fetch 3 bytes for pointers (was OP_SYM_ETYPE before) */
-      size = min(getSize(OP_SYM_TYPE(right)), AOP_SIZE(result));
-      while(size--) {
-        pic16_emitpcodeNULLop(POC_TBLRD_POSTINC);
-        pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popCopyReg(&pic16_pc_tablat),
-            pic16_popGet(AOP(result),offset)));
-        offset++;
-      }
+      size = min ((int)getSize (OP_SYM_TYPE (right)), AOP_SIZE (result));
+      while (size--)
+        {
+          pic16_emitpcodeNULLop (POC_TBLRD_POSTINC);
+          pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popCopyReg (&pic16_pc_tablat),
+                           pic16_popGet (AOP (result), offset)));
+          offset++;
+        }
 
       /* FIXME: for pointers we need to extend differently (according
        * to pointer type DATA/CODE/EEPROM/... :*/
-      size = getSize(OP_SYM_TYPE(right));
-      if(AOP_SIZE(result) > size) {
-        size = AOP_SIZE(result) - size;
-        while(size--) {
-          pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result), offset));
-          offset++;
+      size = getSize (OP_SYM_TYPE (right));
+      if (AOP_SIZE (result) > size)
+        {
+          size = AOP_SIZE (result) - size;
+          while (size--)
+            {
+              pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), offset));
+              offset++;
+            }
         }
-      }
       goto release;
     }
 
 #if 0
-    /* VR - What is this?! */
-    if( AOP_TYPE(right) == AOP_DIR  && (AOP_TYPE(result) == AOP_REG) && size==1)  {
-      DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
-      if(aopIdx(AOP(result),0) == 4) {
-        /* this is a workaround to save value of right into wreg too,
-         * value of wreg is going to be used later */
-        DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-        pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(right),offset));
-        pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),offset));
-        goto release;
-      } else
+  /* VR - What is this?! */
+  if (AOP_TYPE (right) == AOP_DIR && (AOP_TYPE (result) == AOP_REG) && size == 1)
+    {
+      DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+
+      if (aopIdx (AOP (result), 0) == 4)
+        {
+          /* this is a workaround to save value of right into wreg too,
+           * value of wreg is going to be used later */
+          DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+          pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (right), offset));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));
+          goto release;
+        }
+      else
 //      assert(0);
-      DEBUGpic16_emitcode ("; WARNING","%s  %d ignoring register storage",__FUNCTION__,__LINE__);
+        DEBUGpic16_emitcode ("; WARNING", "%s  %d ignoring register storage", __FUNCTION__, __LINE__);
     }
 #endif
 
-    size = AOP_SIZE(right);
-    if (size > AOP_SIZE(result)) size = AOP_SIZE(result);
-    know_W=-1;
-    while (size--) {
-      DEBUGpic16_emitcode ("; ***","%s  %d size %d",__FUNCTION__,__LINE__, size);
-      if(AOP_TYPE(right) == AOP_LIT) {
-        if(lit&0xff) {
-          if(know_W != (lit&0xff))
-            pic16_emitpcode(POC_MOVLW,pic16_popGetLit(lit&0xff));
-          know_W = lit&0xff;
-          pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),offset));
-        } else
-          pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result),offset));
-
-        lit >>= 8;
-
-      } else if (AOP_TYPE(right) == AOP_CRY) {
-        pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result),offset));
-        if(offset == 0) {
-          //debugf("%s: BTFSS offset == 0\n", __FUNCTION__);
-          pic16_emitpcode(POC_BTFSC, pic16_popGet(AOP(right),0));
-          pic16_emitpcode(POC_INCF, pic16_popGet(AOP(result),0));
-        }
-      } else if ( (AOP_TYPE(right) == AOP_PCODE) && (AOP(right)->aopu.pcop->type == PO_IMMEDIATE) ) {
-        pic16_emitpcode(POC_MOVLW, pic16_popGet(AOP(right),offset));
-        pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),offset));
-      } else {
-        DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
-        if(!_G.resDirect) {                                             /* use this aopForSym feature */
-          if(AOP_TYPE(result) == AOP_ACC) {
-            pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(right), offset));
-          } else
-            if(AOP_TYPE(right) == AOP_ACC) {
-              pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), offset));
-            } else {
-              pic16_emitpcode(POC_MOVFF, pic16_popGet2(AOP(right), AOP(result), offset));
+  size = AOP_SIZE (right);
+  if (size > AOP_SIZE (result))
+    size = AOP_SIZE (result);
+  know_W = -1;
+  while (size--)
+    {
+      DEBUGpic16_emitcode ("; ***", "%s  %d size %d", __FUNCTION__, __LINE__, size);
+      if (AOP_TYPE (right) == AOP_LIT)
+        {
+          if (lit & 0xff)
+            {
+              if (know_W != (lit & 0xff))
+                pic16_emitpcode (POC_MOVLW, pic16_popGetLit (lit & 0xff));
+              know_W = lit & 0xff;
+
+              if (AOP_TYPE (result) != AOP_ACC)
+                {
+                  pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));
+                }
+            }
+          else
+            pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), offset));
+
+          lit >>= 8;
+
+        }
+      else if (AOP_TYPE (right) == AOP_CRY)
+        {
+          pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), offset));
+          if (offset == 0)
+            {
+              //debugf("%s: BTFSS offset == 0\n", __FUNCTION__);
+              pic16_emitpcode (POC_BTFSC, pic16_popGet (AOP (right), 0));
+              pic16_emitpcode (POC_INCF, pic16_popGet (AOP (result), 0));
+            }
+        }
+      else if ((AOP_TYPE (right) == AOP_PCODE) && (AOP (right)->aopu.pcop->type == PO_IMMEDIATE))
+        {
+          pic16_emitpcode (POC_MOVLW, pic16_popGet (AOP (right), offset));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));
+        }
+      else
+        {
+          DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
+
+          if (!_G.resDirect)    /* use this aopForSym feature */
+            {
+              if (AOP_TYPE (result) == AOP_ACC)
+                {
+                  pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (right), offset));
+                }
+              else if (AOP_TYPE (right) == AOP_ACC)
+                {
+                  pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));
+                }
+              else
+                {
+                  pic16_emitpcode (POC_MOVFF, pic16_popGet2 (AOP (right), AOP (result), offset));
+                }
             }
         }
-      }
 
       offset++;
     }
-    pic16_addSign(result, AOP_SIZE(right), !IS_UNSIGNED(operandType(right)));
+  pic16_addSign (result, AOP_SIZE (right), !IS_UNSIGNED (operandType (right)));
 
 release:
-  pic16_freeAsmop (result,NULL,ic,TRUE);
-  pic16_freeAsmop (right,NULL,ic,FALSE);
+  pic16_freeAsmop (result, NULL, ic, TRUE);
+  pic16_freeAsmop (right, NULL, ic, FALSE);
 }
 
 /*-----------------------------------------------------------------*/
 /* genJumpTab - generates code for jump table                       */
 /*-----------------------------------------------------------------*/
-static void genJumpTab (iCode *ic)
+static void
+genJumpTab (iCode * ic)
 {
   symbol *jtab;
   char *l;
-  pCodeOp *jt_offs;
-  pCodeOp *jt_offs_hi;
   pCodeOp *jt_label;
 
-    FENTRY;
-
-    pic16_aopOp(IC_JTCOND(ic),ic,FALSE);
-    /* get the condition into accumulator */
-    l = pic16_aopGet(AOP(IC_JTCOND(ic)),0,FALSE,FALSE);
-    MOVA(l);
-    /* multiply by three */
-    pic16_emitcode("add","a,acc");
-    pic16_emitcode("add","a,%s",pic16_aopGet(AOP(IC_JTCOND(ic)),0,FALSE,FALSE));
-
-    jtab = newiTempLabel(NULL);
-    pic16_emitcode("mov","dptr,#%05d_DS_",jtab->key+100);
-    pic16_emitcode("jmp","@a+dptr");
-    pic16_emitcode("","%05d_DS_:",jtab->key+100);
+  FENTRY;
 
-#if 0
-    pic16_emitpcode(POC_MOVLW, pic16_popGetLabel(jtab->key));
-    pic16_emitpcode(POC_ADDFW, pic16_popGet(AOP(IC_JTCOND(ic)),0));
-    emitSKPNC;
-    pic16_emitpcode(POC_INCF, pic16_popCopyReg(&pic16_pc_pclath));
-    pic16_emitpcode(POC_MOVWF, pic16_popCopyReg(&pic16_pc_pcl));
-    pic16_emitpLabel(jtab->key);
+  pic16_aopOp (IC_JTCOND (ic), ic, FALSE);
+  /* get the condition into accumulator */
+  l = pic16_aopGet (AOP (IC_JTCOND (ic)), 0, FALSE, FALSE);
+  MOVA (l);
+  /* multiply by three */
+  pic16_emitcode ("add", "a,acc");
+  pic16_emitcode ("add", "a,%s", pic16_aopGet (AOP (IC_JTCOND (ic)), 0, FALSE, FALSE));
+
+  jtab = newiTempLabel (NULL);
+  pic16_emitcode ("mov", "dptr,#%05d_DS_", labelKey2num (jtab->key));
+  pic16_emitcode ("jmp", "@a+dptr");
+  pic16_emitcode ("", "%05d_DS_:", labelKey2num (jtab->key));
+
+#if 0
+  pic16_emitpcode (POC_MOVLW, pic16_popGetLabel (jtab->key));
+  pic16_emitpcode (POC_ADDFW, pic16_popGet (AOP (IC_JTCOND (ic)), 0));
+  emitSKPNC;
+  pic16_emitpcode (POC_INCF, pic16_popCopyReg (&pic16_pc_pclath));
+  pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_pcl));
+  pic16_emitpLabel (jtab->key);
 
 #else
 
-    jt_offs = pic16_popGetTempReg(0);
-    jt_offs_hi = pic16_popGetTempReg(1);
-    jt_label = pic16_popGetLabel (jtab->key);
-    //fprintf (stderr, "Creating jump table...\n");
-
-    // calculate offset into jump table (idx * sizeof (GOTO))
-    pic16_emitpcode(POC_CLRF  , jt_offs_hi);
-    pic16_emitpcode(POC_RLCFW , pic16_popGet(AOP(IC_JTCOND(ic)),0));
-    pic16_emitpcode(POC_RLCF  , jt_offs_hi);
-    pic16_emitpcode(POC_RLCFW , pic16_popCopyReg(&pic16_pc_wreg));
-    pic16_emitpcode(POC_RLCF  , jt_offs_hi);
-    pic16_emitpcode(POC_ANDLW , pic16_popGetLit (0xFC));
-    pic16_emitpcode(POC_MOVWF , jt_offs);
-
-    // prepare PCLATx (set to first entry in jump table)
-    pic16_emitpcode(POC_MOVLW , pic16_popGetImmd(jt_label->name, 2, 0));
-    pic16_emitpcode(POC_MOVWF , pic16_popCopyReg(&pic16_pc_pclatu));
-    pic16_emitpcode(POC_MOVLW , pic16_popGetImmd(jt_label->name, 1, 0));
-    pic16_emitpcode(POC_MOVWF , pic16_popCopyReg(&pic16_pc_pclath));
-    pic16_emitpcode(POC_MOVLW , pic16_popGetImmd(jt_label->name, 0, 0));
-
-    // set PCLATx to selected entry (new PCL is stored in jt_offs)
-    pic16_emitpcode(POC_ADDWF , jt_offs);
-    pic16_emitpcode(POC_MOVFW , jt_offs_hi);
-    pic16_emitpcode(POC_ADDWFC, pic16_popCopyReg(&pic16_pc_pclath));
-    emitSKPNC;
-    pic16_emitpcode(POC_INCF  , pic16_popCopyReg(&pic16_pc_pclatu));
-
-    // release temporaries and prepare jump into table (new PCL --> WREG)
-    pic16_emitpcode(POC_MOVFW , jt_offs);
-    pic16_popReleaseTempReg (jt_offs_hi, 1);
-    pic16_popReleaseTempReg (jt_offs, 0);
+  jt_label = pic16_popGetLabel (jtab->key);
+  //fprintf (stderr, "Creating jump table...\n");
 
-    // jump into the table
-    pic16_emitpcode(POC_MOVWF , pic16_popCopyReg(&pic16_pc_pcl));
+  // calculate offset into jump table (idx * sizeof(GOTO))
+  // This solution does not use temporary registers and the code is shorter.
+  pic16_emitpcode (POC_CLRF  , pic16_popCopyReg (&pic16_pc_pclath));
+  pic16_emitpcode (POC_CLRF  , pic16_popCopyReg (&pic16_pc_pclatu));
+  pic16_emitpcode (POC_RLCFW , pic16_popGet (AOP (IC_JTCOND (ic)), 0));
+  pic16_emitpcode (POC_RLCF  , pic16_popCopyReg (&pic16_pc_pclath));
+  pic16_emitpcode (POC_RLCFW , pic16_popCopyReg (&pic16_pc_wreg));
+  pic16_emitpcode (POC_RLCF  , pic16_popCopyReg (&pic16_pc_pclath));
+  pic16_emitpcode (POC_ANDLW , pic16_popGetLit (0xFC));
+  pic16_emitpcode (POC_ADDLW , pic16_popGetImmd (jt_label->name, 0, 0));
+  pic16_emitpcode (POC_MOVWF , pic16_popCopyReg (pic16_stack_postdec));
+  pic16_emitpcode (POC_MOVLW , pic16_popGetImmd (jt_label->name, 1, 0));
+  pic16_emitpcode (POC_ADDWFC, pic16_popCopyReg (&pic16_pc_pclath));
+  pic16_emitpcode (POC_MOVLW , pic16_popGetImmd (jt_label->name, 2, 0));
+  pic16_emitpcode (POC_ADDWFC, pic16_popCopyReg (&pic16_pc_pclatu));
+
+  // jump into the table
+  pic16_emitpcode (POC_MOVFW, pic16_popCopyReg (pic16_stack_preinc));
+  pic16_emitpcode (POC_MOVWF, pic16_popCopyReg (&pic16_pc_pcl));
 
-    pic16_emitpLabelFORCE(jtab->key);
+  pic16_emitpLabelFORCE (jtab->key);
 #endif
 
-    pic16_freeAsmop(IC_JTCOND(ic),NULL,ic,TRUE);
+  pic16_freeAsmop (IC_JTCOND (ic), NULL, ic, TRUE);
 //          pic16_emitpinfo(INF_LOCALREGS, pic16_newpCodeOpLocalRegs(LR_ENTRY_BEGIN));
 
-    pic16_emitpinfo (INF_OPTIMIZATION, pic16_newpCodeOpOpt (OPT_JUMPTABLE_BEGIN, ""));
-    /* now generate the jump labels */
-    for (jtab = setFirstItem(IC_JTLABELS(ic)) ; jtab;
-         jtab = setNextItem(IC_JTLABELS(ic))) {
-//        pic16_emitcode("ljmp","%05d_DS_",jtab->key+100);
-        pic16_emitpcode(POC_GOTO,pic16_popGetLabel(jtab->key));
+  pic16_emitpinfo (INF_OPTIMIZATION, pic16_newpCodeOpOpt (OPT_JUMPTABLE_BEGIN, ""));
+  /* now generate the jump labels */
+  for (jtab = setFirstItem (IC_JTLABELS (ic)); jtab; jtab = setNextItem (IC_JTLABELS (ic)))
+    {
+//        pic16_emitcode("ljmp","%05d_DS_",labelKey2num (jtab->key));
+      pic16_emitpcode (POC_GOTO, pic16_popGetLabel (jtab->key));
 
     }
-    pic16_emitpinfo (INF_OPTIMIZATION, pic16_newpCodeOpOpt (OPT_JUMPTABLE_END, ""));
+  pic16_emitpinfo (INF_OPTIMIZATION, pic16_newpCodeOpOpt (OPT_JUMPTABLE_END, ""));
 
 }
 
@@ -9490,119 +10636,137 @@
   used in other places. So until I know how to really parse the
   iCode tree, I'm going to not be using this routine :(.
 */
-static int genMixedOperation (iCode *ic)
+static int
+genMixedOperation (iCode * ic)
 {
 #if 0
-  operand *result = IC_RESULT(ic);
-  sym_link *ctype = operandType(IC_LEFT(ic));
-  operand *right = IC_RIGHT(ic);
+  operand *result = IC_RESULT (ic);
+  sym_link *ctype = operandType (IC_LEFT (ic));
+  operand *right = IC_RIGHT (ic);
   int ret = 0;
-  int big,small;
+  int big, small;
   int offset;
 
   iCode *nextic;
-  operand *nextright=NULL,*nextleft=NULL,*nextresult=NULL;
+  operand *nextright = NULL, *nextleft = NULL, *nextresult = NULL;
 
-  pic16_emitcode("; ***","%s  %d",__FUNCTION__,__LINE__);
+  pic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
   nextic = ic->next;
-  if(!nextic)
+  if (!nextic)
     return 0;
 
-  nextright = IC_RIGHT(nextic);
-  nextleft  = IC_LEFT(nextic);
-  nextresult = IC_RESULT(nextic);
+  nextright = IC_RIGHT (nextic);
+  nextleft = IC_LEFT (nextic);
+  nextresult = IC_RESULT (nextic);
+
+  pic16_aopOp (right, ic, FALSE);
+  pic16_aopOp (result, ic, FALSE);
+  pic16_aopOp (nextright, nextic, FALSE);
+  pic16_aopOp (nextleft, nextic, FALSE);
+  pic16_aopOp (nextresult, nextic, FALSE);
 
-  pic16_aopOp(right,ic,FALSE);
-  pic16_aopOp(result,ic,FALSE);
-  pic16_aopOp(nextright,  nextic, FALSE);
-  pic16_aopOp(nextleft,   nextic, FALSE);
-  pic16_aopOp(nextresult, nextic, FALSE);
-
-  if (pic16_sameRegs(AOP(IC_RESULT(ic)), AOP(IC_RIGHT(nextic)))) {
+  if (pic16_sameRegs (AOP (IC_RESULT (ic)), AOP (IC_RIGHT (nextic))))
+    {
 
-    operand *t = right;
-    right = nextright;
-    nextright = t;
+      operand *t = right;
+      right = nextright;
+      nextright = t;
 
-    pic16_emitcode(";remove right +","");
+      pic16_emitcode (";remove right +", "");
 
-  } else   if (pic16_sameRegs(AOP(IC_RESULT(ic)), AOP(IC_LEFT(nextic)))) {
-/*
-    operand *t = right;
-    right = nextleft;
-    nextleft = t;
-*/
-    pic16_emitcode(";remove left +","");
-  } else
+    }
+  else if (pic16_sameRegs (AOP (IC_RESULT (ic)), AOP (IC_LEFT (nextic))))
+    {
+      /*
+         operand *t = right;
+         right = nextleft;
+         nextleft = t;
+       */
+      pic16_emitcode (";remove left +", "");
+    }
+  else
     return 0;
 
-  big = AOP_SIZE(nextleft);
-  small = AOP_SIZE(nextright);
+  big = AOP_SIZE (nextleft);
+  small = AOP_SIZE (nextright);
+
+  switch (nextic->op)
+    {
+
+    case '+':
+      pic16_emitcode (";optimize a +", "");
+      /* if unsigned or not an integral type */
+      if (AOP_TYPE (IC_LEFT (nextic)) == AOP_CRY)
+        {
+          pic16_emitcode (";add a bit to something", "");
+        }
+      else
+        {
 
-  switch(nextic->op) {
+          pic16_emitcode ("movf", "%s,w", AOP (nextright)->aopu.aop_dir);
 
-  case '+':
-    pic16_emitcode(";optimize a +","");
-    /* if unsigned or not an integral type */
-    if (AOP_TYPE(IC_LEFT(nextic)) == AOP_CRY) {
-      pic16_emitcode(";add a bit to something","");
-    } else {
-
-      pic16_emitcode("movf","%s,w",AOP(nextright)->aopu.aop_dir);
-
-      if (!pic16_sameRegs(AOP(IC_LEFT(nextic)), AOP(IC_RESULT(nextic))) ) {
-        pic16_emitcode("addwf","%s,w",AOP(nextleft)->aopu.aop_dir);
-        pic16_emitcode("movwf","%s",pic16_aopGet(AOP(IC_RESULT(nextic)),0,FALSE,FALSE));
-      } else
-        pic16_emitcode("addwf","%s,f",AOP(nextleft)->aopu.aop_dir);
+          if (!pic16_sameRegs (AOP (IC_LEFT (nextic)), AOP (IC_RESULT (nextic))))
+            {
+              pic16_emitcode ("addwf", "%s,w", AOP (nextleft)->aopu.aop_dir);
+              pic16_emitcode ("movwf", "%s", pic16_aopGet (AOP (IC_RESULT (nextic)), 0, FALSE, FALSE));
+            }
+          else
+            pic16_emitcode ("addwf", "%s,f", AOP (nextleft)->aopu.aop_dir);
 
-      offset = 0;
-      while(--big) {
+          offset = 0;
+          while (--big)
+            {
 
-        offset++;
+              offset++;
 
-        if(--small) {
-          if (!pic16_sameRegs(AOP(IC_LEFT(nextic)), AOP(IC_RESULT(nextic))) ){
-            pic16_emitcode("movf","%s,w",pic16_aopGet(AOP(IC_LEFT(nextic)),offset,FALSE,FALSE));
-            pic16_emitcode("movwf","%s,f",pic16_aopGet(AOP(IC_RESULT(nextic)),offset,FALSE,FALSE) );
-          }
+              if (--small)
+                {
+                  if (!pic16_sameRegs (AOP (IC_LEFT (nextic)), AOP (IC_RESULT (nextic))))
+                    {
+                      pic16_emitcode ("movf", "%s,w", pic16_aopGet (AOP (IC_LEFT (nextic)), offset, FALSE, FALSE));
+                      pic16_emitcode ("movwf", "%s,f", pic16_aopGet (AOP (IC_RESULT (nextic)), offset, FALSE, FALSE));
+                    }
 
-          pic16_emitcode("movf","%s,w", pic16_aopGet(AOP(IC_LEFT(nextic)),offset,FALSE,FALSE));
-          emitSKPNC;
-          pic16_emitcode("btfsc","(%s >> 3), (%s & 7)",
-                   AOP(IC_RIGHT(nextic))->aopu.aop_dir,
-                   AOP(IC_RIGHT(nextic))->aopu.aop_dir);
-          pic16_emitcode(" incf","%s,w", pic16_aopGet(AOP(IC_LEFT(nextic)),offset,FALSE,FALSE));
-          pic16_emitcode("movwf","%s", pic16_aopGet(AOP(IC_RESULT(nextic)),offset,FALSE,FALSE));
+                  pic16_emitcode ("movf", "%s,w", pic16_aopGet (AOP (IC_LEFT (nextic)), offset, FALSE, FALSE));
+                  emitSKPNC;
+                  pic16_emitcode ("btfsc", "(%s >> 3), (%s & 7)",
+                                  AOP (IC_RIGHT (nextic))->aopu.aop_dir, AOP (IC_RIGHT (nextic))->aopu.aop_dir);
+                  pic16_emitcode (" incf", "%s,w", pic16_aopGet (AOP (IC_LEFT (nextic)), offset, FALSE, FALSE));
+                  pic16_emitcode ("movwf", "%s", pic16_aopGet (AOP (IC_RESULT (nextic)), offset, FALSE, FALSE));
 
-        } else {
-          pic16_emitcode("rlf","known_zero,w");
+                }
+              else
+                {
+                  pic16_emitcode ("rlf", "known_zero,w");
 
-          /*
-            if right is signed
-              btfsc  right,7
-               addlw ff
-          */
-          if (!pic16_sameRegs(AOP(IC_LEFT(nextic)), AOP(IC_RESULT(nextic))) ){
-            pic16_emitcode("addwf","%s,w",pic16_aopGet(AOP(IC_LEFT(nextic)),offset,FALSE,FALSE));
-            pic16_emitcode("movwf","%s,f",pic16_aopGet(AOP(IC_RESULT(nextic)),offset,FALSE,FALSE) );
-          } else {
-            pic16_emitcode("addwf","%s,f",pic16_aopGet(AOP(IC_RESULT(nextic)),offset,FALSE,FALSE) );
-          }
+                  /*
+                     if right is signed
+                     btfsc  right,7
+                     addlw ff
+                   */
+                  if (!pic16_sameRegs (AOP (IC_LEFT (nextic)), AOP (IC_RESULT (nextic))))
+                    {
+                      pic16_emitcode ("addwf", "%s,w", pic16_aopGet (AOP (IC_LEFT (nextic)), offset, FALSE, FALSE));
+                      pic16_emitcode ("movwf", "%s,f", pic16_aopGet (AOP (IC_RESULT (nextic)), offset, FALSE, FALSE));
+                    }
+                  else
+                    {
+                      pic16_emitcode ("addwf", "%s,f", pic16_aopGet (AOP (IC_RESULT (nextic)), offset, FALSE, FALSE));
+                    }
+                }
+            }
+          ret = 1;
         }
-      }
-      ret = 1;
     }
-  }
   ret = 1;
 
 release:
-  pic16_freeAsmop(right,NULL,ic,TRUE);
-  pic16_freeAsmop(result,NULL,ic,TRUE);
-  pic16_freeAsmop(nextright,NULL,ic,TRUE);
-  pic16_freeAsmop(nextleft,NULL,ic,TRUE);
-  if(ret)
+  pic16_freeAsmop (right, NULL, ic, TRUE);
+  pic16_freeAsmop (result, NULL, ic, TRUE);
+  pic16_freeAsmop (nextright, NULL, ic, TRUE);
+  pic16_freeAsmop (nextleft, NULL, ic, TRUE);
+  if (ret)
     nextic->generated = 1;
 
   return ret;
@@ -9610,477 +10774,514 @@
   return 0;
 #endif
 }
+
 /*-----------------------------------------------------------------*/
 /* genCast - gen code for casting                                  */
 /*-----------------------------------------------------------------*/
-static void genCast (iCode *ic)
+static void
+genCast (iCode * ic)
 {
-  operand *result = IC_RESULT(ic);
-  sym_link *ctype = operandType(IC_LEFT(ic));
-  sym_link *rtype = operandType(IC_RIGHT(ic));
-  sym_link *restype = operandType(IC_RESULT(ic));
-  operand *right = IC_RIGHT(ic);
-  int size, offset ;
+  operand *result = IC_RESULT (ic);
+  sym_link *ctype = operandType (IC_LEFT (ic));
+  sym_link *rtype = operandType (IC_RIGHT (ic));
+  sym_link *restype = operandType (IC_RESULT (ic));
+  operand *right = IC_RIGHT (ic);
+  int size, offset;
 
 
-    FENTRY;
+  FENTRY;
 
-        /* if they are equivalent then do nothing */
+  /* if they are equivalent then do nothing */
 //      if (operandsEqu(IC_RESULT(ic),IC_RIGHT(ic)))
 //              return ;
 
-        pic16_aopOp(result,ic,FALSE);
-        pic16_aopOp(right,ic,FALSE) ;
+  pic16_aopOp (result, ic, FALSE);
+  pic16_aopOp (right, ic, FALSE);
 
-        DEBUGpic16_pic16_AopType(__LINE__,NULL,right,result);
+  DEBUGpic16_pic16_AopType (__LINE__, NULL, right, result);
 
 
-        /* if the result is a bit */
-        if (AOP_TYPE(result) == AOP_CRY) {
+  /* if the result is a bit */
+  if (AOP_TYPE (result) == AOP_CRY)
+    {
 
-                /* if the right size is a literal then
-                 * we know what the value is */
-                DEBUGpic16_emitcode("; ***","%s  %d",__FUNCTION__,__LINE__);
+      /* if the right size is a literal then
+       * we know what the value is */
+      DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-                if (AOP_TYPE(right) == AOP_LIT) {
-                        pic16_emitpcode(  ( ((int) operandLitValue(right)) ? POC_BSF : POC_BCF),
-                                pic16_popGet(AOP(result),0));
+      if (AOP_TYPE (right) == AOP_LIT)
+        {
+          pic16_emitpcode ((((int) operandLitValue (right)) ? POC_BSF : POC_BCF), pic16_popGet (AOP (result), 0));
 
-                        if (((int) operandLitValue(right)))
-                                pic16_emitcode("bsf","(%s >> 3), (%s & 7)",
-                                        AOP(result)->aopu.aop_dir,
-                                        AOP(result)->aopu.aop_dir);
-                        else
-                                pic16_emitcode("bcf","(%s >> 3), (%s & 7)",
-                                        AOP(result)->aopu.aop_dir,
-                                        AOP(result)->aopu.aop_dir);
-                        goto release;
-                }
+          if (((int) operandLitValue (right)))
+            pic16_emitcode ("bsf", "(%s >> 3), (%s & 7)", AOP (result)->aopu.aop_dir, AOP (result)->aopu.aop_dir);
+          else
+            pic16_emitcode ("bcf", "(%s >> 3), (%s & 7)", AOP (result)->aopu.aop_dir, AOP (result)->aopu.aop_dir);
+          goto release;
+        }
 
-                /* the right is also a bit variable */
-                if (AOP_TYPE(right) == AOP_CRY) {
-                        emitCLRC;
-                        pic16_emitpcode(POC_BTFSC,  pic16_popGet(AOP(right),0));
+      /* the right is also a bit variable */
+      if (AOP_TYPE (right) == AOP_CRY)
+        {
+          emitCLRC;
+          pic16_emitpcode (POC_BTFSC, pic16_popGet (AOP (right), 0));
 
-                        pic16_emitcode("clrc","");
-                        pic16_emitcode("btfsc","(%s >> 3), (%s & 7)",
-                                AOP(right)->aopu.aop_dir,
-                                AOP(right)->aopu.aop_dir);
-                        pic16_aopPut(AOP(result),"c",0);
-                        goto release ;
-                }
+          pic16_emitcode ("clrc", "");
+          pic16_emitcode ("btfsc", "(%s >> 3), (%s & 7)", AOP (right)->aopu.aop_dir, AOP (right)->aopu.aop_dir);
+          pic16_aopPut (AOP (result), "c", 0);
+          goto release;
+        }
 
-                /* we need to or */
-                if (AOP_TYPE(right) == AOP_REG) {
-                        pic16_emitpcode(POC_BCF,    pic16_popGet(AOP(result),0));
-                        pic16_emitpcode(POC_BTFSC,  pic16_newpCodeOpBit(pic16_aopGet(AOP(right),0,FALSE,FALSE),0,0, PO_GPR_REGISTER));
-                        pic16_emitpcode(POC_BSF,    pic16_popGet(AOP(result),0));
-                }
-                pic16_toBoolean(right);
-                pic16_aopPut(AOP(result),"a",0);
-                goto release ;
+      /* we need to or */
+      if (AOP_TYPE (right) == AOP_REG)
+        {
+          pic16_emitpcode (POC_BCF, pic16_popGet (AOP (result), 0));
+          pic16_emitpcode (POC_BTFSC, pic16_newpCodeOpBit (pic16_aopGet (AOP (right), 0, FALSE, FALSE), 0, 0, PO_GPR_REGISTER));
+          pic16_emitpcode (POC_BSF, pic16_popGet (AOP (result), 0));
         }
+      pic16_toBoolean (right);
+      pic16_aopPut (AOP (result), "a", 0);
+      goto release;
+    }
 
-        if ((AOP_TYPE(right) == AOP_CRY) && (AOP_TYPE(result) == AOP_REG)) {
-          int offset = 1;
+  if ((AOP_TYPE (right) == AOP_CRY) && (AOP_TYPE (result) == AOP_REG))
+    {
+      int offset = 1;
 
-                size = AOP_SIZE(result);
+      size = AOP_SIZE (result);
 
-                DEBUGpic16_emitcode("; ***","%s  %d",__FUNCTION__,__LINE__);
+      DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-                pic16_emitpcode(POC_CLRF,   pic16_popGet(AOP(result),0));
-                pic16_emitpcode(POC_BTFSC,  pic16_popGet(AOP(right),0));
-                pic16_emitpcode(POC_INCF,   pic16_popGet(AOP(result),0));
+      pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), 0));
+      pic16_emitpcode (POC_BTFSC, pic16_popGet (AOP (right), 0));
+      pic16_emitpcode (POC_INCF, pic16_popGet (AOP (result), 0));
 
-                while (size--)
-                        pic16_emitpcode(POC_CLRF,   pic16_popGet(AOP(result),offset++));
+      while (size--)
+        pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), offset++));
 
-                goto release;
-        }
-        
-        if (IS_BOOL(operandType(result)))
-        {
-          pic16_toBoolean (right);
-          emitSKPNZ;
-          pic16_emitpcode(POC_MOVLW, pic16_popGetLit(1));
-          pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(result),0));
-          goto release;
-        }
+      goto release;
+    }
 
-        if(IS_BITFIELD(getSpec(restype))
-          && IS_BITFIELD(getSpec(rtype))) {
-          DEBUGpic16_emitcode("***", "%d casting a bit to another bit", __LINE__);
-        }
+  if (IS_BOOL (operandType (result)))
+    {
+      pic16_toBoolean (right);
+      emitSKPNZ;
+      pic16_emitpcode (POC_MOVLW, pic16_popGetLit (1));
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 0));
+      goto release;
+    }
 
-        /* port from pic14 to cope with generic pointers */
-        if (PIC_IS_TAGGED(restype))
-        {
-          operand *result = IC_RESULT(ic);
-          //operand *left = IC_LEFT(ic);
-          operand *right = IC_RIGHT(ic);
-          int tag = 0xff;
+  if (IS_BITFIELD (getSpec (restype)) && IS_BITFIELD (getSpec (rtype)))
+    {
+      DEBUGpic16_emitcode ("***", "%d casting a bit to another bit", __LINE__);
+    }
 
-          /* copy common part */
-          int max, size = AOP_SIZE(result);
-          if (size > AOP_SIZE(right)) size = AOP_SIZE(right);
-          DEBUGpic16_emitcode("; ***","%s  %d",__FUNCTION__,__LINE__);
+  /* port from pic14 to cope with generic pointers */
+  if (PIC_IS_TAGGED (restype))
+    {
+      operand *result = IC_RESULT (ic);
+      //operand *left = IC_LEFT(ic);
+      operand *right = IC_RIGHT (ic);
+      int tag = 0xff;
+
+      /* copy common part */
+      int max, size = AOP_SIZE (result);
+      if (size > AOP_SIZE (right))
+        size = AOP_SIZE (right);
+      DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-          max = size;
-          while (size--)
-          {
-            pic16_mov2w (AOP(right), size);
-            pic16_emitpcode(POC_MOVWF, pic16_popGet (AOP(result), size));
-          } // while
-
-          /* upcast into generic pointer type? */
-          if (IS_GENPTR(restype)
-              && !PIC_IS_TAGGED(rtype)
-              && (AOP_SIZE(result) > max))
-          {
-            /* determine appropriate tag for right */
-            if (PIC_IS_DATA_PTR(rtype))
-              tag = GPTR_TAG_DATA;
-            else if (IS_CODEPTR(rtype))
-              tag = GPTR_TAG_CODE;
-            else if (PIC_IS_DATA_PTR(ctype)) {
+      max = size;
+      while (size--)
+        {
+          pic16_mov2w (AOP (right), size);
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), size));
+        }                       // while
+
+      /* upcast into generic pointer type? */
+      if (IS_GENPTR (restype) && !PIC_IS_TAGGED (rtype) && (AOP_SIZE (result) > max))
+        {
+          /* determine appropriate tag for right */
+          if (PIC_IS_DATA_PTR (rtype))
+            tag = GPTR_TAG_DATA;
+          else if (IS_CODEPTR (rtype))
+            tag = GPTR_TAG_CODE;
+          else if (PIC_IS_DATA_PTR (ctype))
+            {
               //fprintf (stderr, "%s:%u: WARNING: casting `(generic*)(__data*)(non-pointer)'\n", ic->filename, ic->lineno);
               tag = GPTR_TAG_DATA;
-            } else if (IS_CODEPTR(ctype)) {
+            }
+          else if (IS_CODEPTR (ctype))
+            {
               //fprintf (stderr, "%s:%u: WARNING: casting `(generic*)(__code*)(non-pointer)'\n", ic->filename, ic->lineno);
               tag = GPTR_TAG_CODE;
-            } else if (IS_PTR(rtype)) {
-              PERFORM_ONCE(weirdcast,
-              fprintf (stderr, "%s:%u: WARNING: casting `(generic*)(unknown*)' -- assuming __data space\n", ic->filename, ic->lineno);
-              );
+            }
+          else if (IS_PTR (rtype))
+            {
+              PERFORM_ONCE (weirdcast,
+                            fprintf (stderr, "%s:%u: WARNING: casting `(generic*)(unknown*)' -- assuming __data space\n",
+                                     ic->filename, ic->lineno););
               tag = GPTR_TAG_DATA;
-            } else {
-              PERFORM_ONCE(weirdcast,
-              fprintf (stderr, "%s:%u: WARNING: casting `(generic*)(non-pointer)' -- assuming __data space\n", ic->filename, ic->lineno);
-              );
+            }
+          else
+            {
+              PERFORM_ONCE (weirdcast,
+                            fprintf (stderr, "%s:%u: WARNING: casting `(generic*)(non-pointer)' -- assuming __data space\n",
+                                     ic->filename, ic->lineno););
               tag = GPTR_TAG_DATA;
             }
 
-            assert (AOP_SIZE(result) == 3);
-            /* zero-extend address... */
-            for (size = max; size < AOP_SIZE(result)-1; size++)
-              pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result),size));
-            /* ...and add tag */
-            pic16_movLit2f(pic16_popGet(AOP(result), AOP_SIZE(result)-1), tag);
-          } else if (IS_CODEPTR(restype) && AOP_SIZE(result) > max) {
-            //fprintf (stderr, "%s:%u: INFO: code pointer\n", ic->filename, ic->lineno);
-            for (size = max; size < AOP_SIZE(result)-1; size++)
-              pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result), size));
-            /* add __code tag */
-            pic16_movLit2f (pic16_popGet(AOP(result), AOP_SIZE(result)-1), GPTR_TAG_CODE);
-          } else if (AOP_SIZE(result) > max) {
-            /* extend non-pointers */
-            //fprintf (stderr, "%s:%u: zero-extending value cast to pointer\n", ic->filename, ic->lineno);
-            pic16_addSign(result, max, 0);
-          } // if
-          goto release;
+          assert (AOP_SIZE (result) == 3);
+          /* zero-extend address... */
+          for (size = max; size < AOP_SIZE (result) - 1; size++)
+            pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), size));
+          /* ...and add tag */
+          pic16_movLit2f (pic16_popGet (AOP (result), AOP_SIZE (result) - 1), tag);
+        }
+      else if (IS_CODEPTR (restype) && AOP_SIZE (result) > max)
+        {
+          //fprintf (stderr, "%s:%u: INFO: code pointer\n", ic->filename, ic->lineno);
+          for (size = max; size < AOP_SIZE (result) - 1; size++)
+            pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), size));
+          /* add __code tag */
+          pic16_movLit2f (pic16_popGet (AOP (result), AOP_SIZE (result) - 1), GPTR_TAG_CODE);
         }
+      else if (AOP_SIZE (result) > max)
+        {
+          /* extend non-pointers */
+          //fprintf (stderr, "%s:%u: zero-extending value cast to pointer\n", ic->filename, ic->lineno);
+          pic16_addSign (result, max, 0);
+        }                       // if
+      goto release;
+    }
 
-        /* if they are the same size : or less */
-        if (AOP_SIZE(result) <= AOP_SIZE(right)) {
+  /* if they are the same size : or less */
+  if (AOP_SIZE (result) <= AOP_SIZE (right))
+    {
 
-                /* if they are in the same place */
-                if (pic16_sameRegs(AOP(right),AOP(result)))
-                        goto release;
+      /* if they are in the same place */
+      if (pic16_sameRegs (AOP (right), AOP (result)))
+        goto release;
 
-                DEBUGpic16_emitcode("; ***","%s  %d",__FUNCTION__,__LINE__);
+      DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 #if 0
-                if (IS_PTR_CONST(rtype))
+      if (IS_PTR_CONST (rtype))
 #else
-                if (IS_CODEPTR(rtype))
+      if (IS_CODEPTR (rtype))
 #endif
-                        DEBUGpic16_emitcode ("; ***","%d - right is const pointer",__LINE__);
+        DEBUGpic16_emitcode ("; ***", "%d - right is const pointer", __LINE__);
 
 #if 0
-                if (IS_PTR_CONST(operandType(IC_RESULT(ic))))
+      if (IS_PTR_CONST (operandType (IC_RESULT (ic))))
 #else
-                if (IS_CODEPTR(operandType(IC_RESULT(ic))))
+      if (IS_CODEPTR (operandType (IC_RESULT (ic))))
 #endif
-                        DEBUGpic16_emitcode ("; ***","%d - result is const pointer",__LINE__);
+        DEBUGpic16_emitcode ("; ***", "%d - result is const pointer", __LINE__);
 
-                if ((AOP_TYPE(right) == AOP_PCODE) && AOP(right)->aopu.pcop->type == PO_IMMEDIATE) {
-                        pic16_emitpcode(POC_MOVLW, pic16_popGet(AOP(right),0));
-                        pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),0));
-
-                        if(AOP_SIZE(result) < 2) {
-                          fprintf(stderr,"%d -- casting a ptr to a char\n",__LINE__);
-                        } else {
-                          pic16_emitpcode(POC_MOVLW, pic16_popGet(AOP(right),1));
-                          pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),1));
-                        }
-                } else {
-                        /* if they in different places then copy */
-                        size = AOP_SIZE(result);
-                        offset = 0 ;
-                        while (size--) {
-                                pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(right),offset));
-                                pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),offset));
-                                offset++;
-                        }
-                }
-                goto release;
+      if ((AOP_TYPE (right) == AOP_PCODE) && AOP (right)->aopu.pcop->type == PO_IMMEDIATE)
+        {
+          pic16_emitpcode (POC_MOVLW, pic16_popGet (AOP (right), 0));
+          pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 0));
+
+          if (AOP_SIZE (result) < 2)
+            {
+              fprintf (stderr, "%d -- casting a ptr to a char\n", __LINE__);
+            }
+          else
+            {
+              pic16_emitpcode (POC_MOVLW, pic16_popGet (AOP (right), 1));
+              pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 1));
+            }
+        }
+      else
+        {
+          /* if they in different places then copy */
+          size = AOP_SIZE (result);
+          offset = 0;
+          while (size--)
+            {
+              pic16_emitpcode (POC_MOVFW, pic16_popGet (AOP (right), offset));
+              pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset));
+              offset++;
+            }
         }
+      goto release;
+    }
 
-        /* if the result is of type pointer */
-        if (IS_PTR(ctype)) {
-          int p_type;
-          sym_link *type = operandType(right);
-          sym_link *etype = getSpec(type);
-
-                DEBUGpic16_emitcode("; ***","%s  %d - pointer cast",__FUNCTION__,__LINE__);
-
-                /* pointer to generic pointer */
-                if (IS_GENPTR(ctype)) {
-
-                        if (IS_PTR(type))
-                                p_type = DCL_TYPE(type);
-                        else {
-                /* we have to go by the storage class */
-                p_type = PTR_TYPE(SPEC_OCLS(etype));
-
-/*              if (SPEC_OCLS(etype)->codesp )  */
-/*                  p_type = CPOINTER ;  */
-/*              else */
-/*                  if (SPEC_OCLS(etype)->fmap && !SPEC_OCLS(etype)->paged) */
-/*                      p_type = FPOINTER ; */
-/*                  else */
-/*                      if (SPEC_OCLS(etype)->fmap && SPEC_OCLS(etype)->paged) */
-/*                          p_type = PPOINTER; */
-/*                      else */
-/*                          if (SPEC_OCLS(etype) == idata ) */
-/*                              p_type = IPOINTER ; */
-/*                          else */
-/*                              p_type = POINTER ; */
-            }
-
-            /* the first two bytes are known */
-      DEBUGpic16_emitcode("; ***","%s  %d - pointer cast2",__FUNCTION__,__LINE__);
-            size = GPTRSIZE - 1;
-            offset = 0 ;
-            while (size--) {
-              if(offset < AOP_SIZE(right)) {
-                DEBUGpic16_emitcode("; ***","%s  %d - pointer cast3 ptype = 0x%x",__FUNCTION__,__LINE__, p_type);
-                pic16_mov2f(AOP(result), AOP(right), offset);
-/*
-                if ((AOP_TYPE(right) == AOP_PCODE) &&
-                    AOP(right)->aopu.pcop->type == PO_IMMEDIATE) {
-                  pic16_emitpcode(POC_MOVLW, pic16_popGet(AOP(right),offset));
-                  pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),offset));
-                } else {
-
-                  pic16_aopPut(AOP(result),
-                         pic16_aopGet(AOP(right),offset,FALSE,FALSE),
-                         offset);
+  /* if the result is of type pointer */
+  if (IS_PTR (ctype))
+    {
+      int p_type;
+      sym_link *type = operandType (right);
+      sym_link *etype = getSpec (type);
+
+      DEBUGpic16_emitcode ("; ***", "%s  %d - pointer cast", __FUNCTION__, __LINE__);
+
+      /* pointer to generic pointer */
+      if (IS_GENPTR (ctype))
+        {
+
+          if (IS_PTR (type))
+            p_type = DCL_TYPE (type);
+          else
+            {
+              /* we have to go by the storage class */
+              p_type = PTR_TYPE (SPEC_OCLS (etype));
+
+              /*              if (SPEC_OCLS(etype)->codesp )  */
+              /*                  p_type = CPOINTER ;  */
+              /*              else */
+              /*                  if (SPEC_OCLS(etype)->fmap && !SPEC_OCLS(etype)->paged) */
+              /*                      p_type = FPOINTER ; */
+              /*                  else */
+              /*                      if (SPEC_OCLS(etype)->fmap && SPEC_OCLS(etype)->paged) */
+              /*                          p_type = PPOINTER; */
+              /*                      else */
+              /*                          if (SPEC_OCLS(etype) == idata ) */
+              /*                              p_type = IPOINTER ; */
+              /*                          else */
+              /*                              p_type = POINTER ; */
+            }
+
+          /* the first two bytes are known */
+          DEBUGpic16_emitcode ("; ***", "%s  %d - pointer cast2", __FUNCTION__, __LINE__);
+          size = GPTRSIZE - 1;
+          offset = 0;
+          while (size--)
+            {
+              if (offset < AOP_SIZE (right))
+                {
+                  DEBUGpic16_emitcode ("; ***", "%s  %d - pointer cast3 ptype = 0x%x", __FUNCTION__, __LINE__, p_type);
+                  pic16_mov2f (AOP (result), AOP (right), offset);
+                  /*
+                     if ((AOP_TYPE(right) == AOP_PCODE) &&
+                     AOP(right)->aopu.pcop->type == PO_IMMEDIATE) {
+                     pic16_emitpcode(POC_MOVLW, pic16_popGet(AOP(right),offset));
+                     pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),offset));
+                     } else {
+
+                     pic16_aopPut(AOP(result),
+                     pic16_aopGet(AOP(right),offset,FALSE,FALSE),
+                     offset);
+                     }
+                   */
                 }
-*/
-              } else
-                pic16_emitpcode(POC_CLRF,pic16_popGet(AOP(result),offset));
+              else
+                pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), offset));
               offset++;
             }
-            /* the last byte depending on type */
-            switch (p_type) {
+          /* the last byte depending on type */
+          switch (p_type)
+            {
             case POINTER:
             case FPOINTER:
             case IPOINTER:
             case PPOINTER:
-                pic16_movLit2f(pic16_popGet(AOP(result), GPTRSIZE-1), GPTR_TAG_DATA);
-                break;
+              pic16_movLit2f (pic16_popGet (AOP (result), GPTRSIZE - 1), GPTR_TAG_DATA);
+              break;
 
             case CPOINTER:
-                pic16_emitpcode(POC_MOVFF, pic16_popGet2(AOP(right), AOP(result), GPTRSIZE-1));
-                break;
+              pic16_emitpcode (POC_MOVFF, pic16_popGet2 (AOP (right), AOP (result), GPTRSIZE - 1));
+              break;
 
             case GPOINTER:
-                if (GPTRSIZE > AOP_SIZE(right)) {
+              if (GPTRSIZE > AOP_SIZE (right))
+                {
                   // assume __data pointer... THIS MIGHT BE WRONG!
-                  pic16_movLit2f(pic16_popGet(AOP(result), GPTRSIZE-1), GPTR_TAG_DATA);
-                } else {
-                  pic16_emitpcode(POC_MOVFF, pic16_popGet2(AOP(right), AOP(result), GPTRSIZE-1));
+                  pic16_movLit2f (pic16_popGet (AOP (result), GPTRSIZE - 1), GPTR_TAG_DATA);
+                }
+              else
+                {
+                  pic16_emitpcode (POC_MOVFF, pic16_popGet2 (AOP (right), AOP (result), GPTRSIZE - 1));
                 }
               break;
 
             default:
-                /* this should never happen */
-                werror(E_INTERNAL_ERROR,__FILE__,__LINE__,
-                       "got unknown pointer type");
-                exit(1);
+              /* this should never happen */
+              werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "got unknown pointer type");
+              exit (1);
             }
-            //pic16_aopPut(AOP(result),l, GPTRSIZE - 1);
-            goto release ;
+          //pic16_aopPut(AOP(result),l, GPTRSIZE - 1);
+          goto release;
         }
 
 
-        assert( 0 );
-        /* just copy the pointers */
-        size = AOP_SIZE(result);
-        offset = 0 ;
-        while (size--) {
-            pic16_aopPut(AOP(result),
-                   pic16_aopGet(AOP(right),offset,FALSE,FALSE),
-                   offset);
-            offset++;
+      assert (0);
+      /* just copy the pointers */
+      size = AOP_SIZE (result);
+      offset = 0;
+      while (size--)
+        {
+          pic16_aopPut (AOP (result), pic16_aopGet (AOP (right), offset, FALSE, FALSE), offset);
+          offset++;
         }
-        goto release ;
+      goto release;
     }
 
 
 
-    /* so we now know that the size of destination is greater
-    than the size of the source.
-    Now, if the next iCode is an operator then we might be
-    able to optimize the operation without performing a cast.
-    */
-    if(genMixedOperation(ic))
-      goto release;
+  /* so we now know that the size of destination is greater
+     than the size of the source.
+     Now, if the next iCode is an operator then we might be
+     able to optimize the operation without performing a cast.
+   */
+  if (genMixedOperation (ic))
+    goto release;
 
-    DEBUGpic16_emitcode("; ***","%s  %d",__FUNCTION__,__LINE__);
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-    /* we move to result for the size of source */
-    size = AOP_SIZE(right);
-    offset = 0 ;
-
-    while (size--) {
-      if(!_G.resDirect)
-        pic16_mov2f(AOP(result), AOP(right), offset);
+  /* we move to result for the size of source */
+  size = AOP_SIZE (right);
+  offset = 0;
+
+  while (size--)
+    {
+      if (!_G.resDirect)
+        pic16_mov2f (AOP (result), AOP (right), offset);
       offset++;
     }
 
-    /* now depending on the sign of the destination */
-    size = AOP_SIZE(result) - AOP_SIZE(right);
-    /* if unsigned or not an integral type */
-    if (SPEC_USIGN( getSpec(rtype) ) || !IS_SPEC(rtype)) {
+  /* now depending on the sign of the destination */
+  size = AOP_SIZE (result) - AOP_SIZE (right);
+  /* if unsigned or not an integral type */
+  if (SPEC_USIGN (getSpec (rtype)) || !IS_SPEC (rtype))
+    {
       while (size--)
-        pic16_emitpcode(POC_CLRF,   pic16_popGet(AOP(result),offset++));
-    } else {
+        pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), offset++));
+    }
+  else
+    {
       /* we need to extend the sign :( */
 
-      if(size == 1) {
-        /* Save one instruction of casting char to int */
-        pic16_emitpcode(POC_CLRF,   pic16_popGet(AOP(result),offset));
-        pic16_emitpcode(POC_BTFSC,  pic16_newpCodeOpBit(pic16_aopGet(AOP(right),offset-1,FALSE,FALSE),7,0, PO_GPR_REGISTER));
-        pic16_emitpcode(POC_SETF,   pic16_popGet(AOP(result),offset));
-      } else {
-        pic16_emitpcode(POC_CLRF,pic16_popCopyReg(&pic16_pc_wreg));
-
-        if(offset)
-          pic16_emitpcode(POC_BTFSC,   pic16_newpCodeOpBit(pic16_aopGet(AOP(right),offset-1,FALSE,FALSE),7,0, PO_GPR_REGISTER));
-        else
-          pic16_emitpcode(POC_BTFSC,   pic16_newpCodeOpBit(pic16_aopGet(AOP(right),offset,FALSE,FALSE),7,0, PO_GPR_REGISTER));
+      if (size == 1)
+        {
+          /* Save one instruction of casting char to int */
+          pic16_emitpcode (POC_CLRF, pic16_popGet (AOP (result), offset));
+          pic16_emitpcode (POC_BTFSC,
+                           pic16_newpCodeOpBit (pic16_aopGet (AOP (right), offset - 1, FALSE, FALSE), 7, 0, PO_GPR_REGISTER));
+          pic16_emitpcode (POC_SETF, pic16_popGet (AOP (result), offset));
+        }
+      else
+        {
+          pic16_emitpcode (POC_CLRF, pic16_popCopyReg (&pic16_pc_wreg));
 
-        pic16_emitpcode(POC_MOVLW,   pic16_popGetLit(0xff));
+          if (offset)
+            pic16_emitpcode (POC_BTFSC,
+                             pic16_newpCodeOpBit (pic16_aopGet (AOP (right), offset - 1, FALSE, FALSE), 7, 0, PO_GPR_REGISTER));
+          else
+            pic16_emitpcode (POC_BTFSC,
+                             pic16_newpCodeOpBit (pic16_aopGet (AOP (right), offset, FALSE, FALSE), 7, 0, PO_GPR_REGISTER));
 
-        while (size--)
-          pic16_emitpcode(POC_MOVWF,   pic16_popGet(AOP(result),offset++));
-      }
+          pic16_emitpcode (POC_MOVLW, pic16_popGetLit (0xff));
+
+          while (size--)
+            pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), offset++));
+        }
     }
 
 release:
-    pic16_freeAsmop(right,NULL,ic,TRUE);
-    pic16_freeAsmop(result,NULL,ic,TRUE);
+  pic16_freeAsmop (right, NULL, ic, TRUE);
+  pic16_freeAsmop (result, NULL, ic, TRUE);
 
 }
 
 /*-----------------------------------------------------------------*/
 /* genDjnz - generate decrement & jump if not zero instrucion      */
 /*-----------------------------------------------------------------*/
-static int genDjnz (iCode *ic, iCode *ifx)
+static int
+genDjnz (iCode * ic, iCode * ifx)
 {
-    symbol *lbl, *lbl1;
-    DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
-    if (!ifx)
-        return 0;
+  DEBUGpic16_emitcode ("; ***", "%s  %d", __FUNCTION__, __LINE__);
 
-    /* if the if condition has a false label
-       then we cannot save */
-    if (IC_FALSE(ifx))
-        return 0;
+  if (!ifx)
+    return 0;
 
-    /* if the minus is not of the form
-       a = a - 1 */
-    if (!isOperandEqual(IC_RESULT(ic),IC_LEFT(ic)) ||
-        !IS_OP_LITERAL(IC_RIGHT(ic)))
-        return 0;
+  /* if the if condition has a false label
+     then we cannot save */
+  if (IC_FALSE (ifx))
+    return 0;
 
-    if (operandLitValue(IC_RIGHT(ic)) != 1)
-        return 0;
+  /* if the minus is not of the form
+     a = a - 1 */
+  if (!isOperandEqual (IC_RESULT (ic), IC_LEFT (ic)) || !IS_OP_LITERAL (IC_RIGHT (ic)))
+    return 0;
 
-    /* if the size of this greater than one then no
-       saving */
-    if (getSize(operandType(IC_RESULT(ic))) > 1)
-        return 0;
+  if (operandLitValue (IC_RIGHT (ic)) != 1)
+    return 0;
 
-    /* otherwise we can save BIG */
-    lbl = newiTempLabel(NULL);
-    lbl1= newiTempLabel(NULL);
+  /* if the size of this greater than one then no
+     saving */
+  if (getSize (operandType (IC_RESULT (ic))) > 1)
+    return 0;
 
-    pic16_aopOp(IC_RESULT(ic),ic,FALSE);
+  /* otherwise we can save BIG */
+  pic16_aopOp (IC_RESULT (ic), ic, FALSE);
 
-    pic16_emitpcode(POC_DECFSZ,pic16_popGet(AOP(IC_RESULT(ic)),0));
-    pic16_emitpcode(POC_GOTO,pic16_popGetLabel(IC_TRUE(ifx)->key));
+  pic16_emitpcode (POC_DECFSZ, pic16_popGet (AOP (IC_RESULT (ic)), 0));
+  pic16_emitpcode (POC_GOTO, pic16_popGetLabel (IC_TRUE (ifx)->key));
 
-    pic16_freeAsmop(IC_RESULT(ic),NULL,ic,TRUE);
-    ifx->generated = 1;
-    return 1;
+  pic16_freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
+  ifx->generated = 1;
+  return 1;
 }
 
 /*-----------------------------------------------------------------*/
 /* genReceive - generate code for a receive iCode                  */
 /*-----------------------------------------------------------------*/
-static void genReceive (iCode *ic)
+static void
+genReceive (iCode * ic)
 {
 
   FENTRY;
 
 #if 0
-  fprintf(stderr, "%s:%d %s for symbol %s\tonStack: %d\n", __FILE__, __LINE__, __FUNCTION__,
-        OP_SYMBOL( IC_RESULT(ic) )->rname, OP_SYMBOL( IC_RESULT(ic) )->onStack);
+  fprintf (stderr, "%s:%d %s for symbol %s\tonStack: %d\n", __FILE__, __LINE__, __FUNCTION__,
+           OP_SYMBOL (IC_RESULT (ic))->rname, OP_SYMBOL (IC_RESULT (ic))->onStack);
 #endif
 //  pic16_DumpOp(__FUNCTION__, IC_RESULT(ic));
 
-  if (isOperandInFarSpace(IC_RESULT(ic))
-      && ( OP_SYMBOL(IC_RESULT(ic))->isspilt
-          || IS_TRUE_SYMOP(IC_RESULT(ic))) ) {
+  if (isOperandInFarSpace (IC_RESULT (ic)) && (OP_SYMBOL (IC_RESULT (ic))->isspilt || IS_TRUE_SYMOP (IC_RESULT (ic))))
+    {
 
-    int size = getSize(operandType(IC_RESULT(ic)));
-    int offset =  pic16_fReturnSizePic - size;
+      int size = getSize (operandType (IC_RESULT (ic)));
+      int offset = pic16_fReturnSizePic - size;
 
-      assert( 0 );
-      while (size--) {
-        pic16_emitcode ("push","%s", (strcmp(fReturn[pic16_fReturnSizePic - offset - 1],"a") ?
-                      fReturn[pic16_fReturnSizePic - offset - 1] : "acc"));
-                      offset++;
+      assert (0);
+      while (size--)
+        {
+          pic16_emitcode ("push", "%s", (strcmp (fReturn[pic16_fReturnSizePic - offset - 1], "a") ?
+                                         fReturn[pic16_fReturnSizePic - offset - 1] : "acc"));
+          offset++;
         }
 
-      DEBUGpic16_emitcode ("; ***","1 %s  %d",__FUNCTION__,__LINE__);
+      DEBUGpic16_emitcode ("; ***", "1 %s  %d", __FUNCTION__, __LINE__);
 
-      pic16_aopOp(IC_RESULT(ic),ic,FALSE);
-      size = AOP_SIZE(IC_RESULT(ic));
+      pic16_aopOp (IC_RESULT (ic), ic, FALSE);
+      size = AOP_SIZE (IC_RESULT (ic));
       offset = 0;
-      while (size--) {
-        pic16_emitcode ("pop","acc");
-        pic16_aopPut (AOP(IC_RESULT(ic)),"a",offset++);
-      }
-  } else {
-    DEBUGpic16_emitcode ("; ***","2 %s  %d argreg = %d",__FUNCTION__,__LINE__, SPEC_ARGREG(OP_SYM_ETYPE(IC_RESULT(ic)) ));
-    _G.accInUse++;
-    pic16_aopOp(IC_RESULT(ic),ic,FALSE);
-    _G.accInUse--;
-
-    /* set pseudo stack pointer to where it should be - dw*/
-    GpsuedoStkPtr = ic->parmBytes;
-
-    /* setting GpsuedoStkPtr has side effects here: */
-    /* FIXME: What's the correct size of the return(ed) value?
-     *        For now, assuming '4' as before... */
-    assignResultValue(IC_RESULT(ic), 4, 0);
-  }
+      while (size--)
+        {
+          pic16_emitcode ("pop", "acc");
+          pic16_aopPut (AOP (IC_RESULT (ic)), "a", offset++);
+        }
+    }
+  else
+    {
+      DEBUGpic16_emitcode ("; ***", "2 %s  %d argreg = %d", __FUNCTION__, __LINE__,
+                           SPEC_ARGREG (OP_SYM_ETYPE (IC_RESULT (ic))));
+      _G.accInUse++;
+      pic16_aopOp (IC_RESULT (ic), ic, FALSE);
+      _G.accInUse--;
+
+      /* set pseudo stack pointer to where it should be - dw */
+      GpsuedoStkPtr = ic->parmBytes;
+
+      /* setting GpsuedoStkPtr has side effects here: */
+      /* FIXME: What's the correct size of the return(ed) value?
+       *        For now, assuming '4' as before... */
+      assignResultValue (IC_RESULT (ic), 4, 0);
+    }
 
-  pic16_freeAsmop(IC_RESULT(ic),NULL,ic,TRUE);
+  pic16_freeAsmop (IC_RESULT (ic), NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
@@ -10091,18 +11292,22 @@
 {
   operand *op;
 
-  op = IC_RIGHT(ic);
-  if (op && IS_SYMOP(op)) {
-    if (IN_CODESPACE(SPEC_OCLS(OP_SYM_ETYPE(op)))) {
-      fprintf (stderr, "%s: volatile symbols in codespace?!? -- might go wrong...\n", __FUNCTION__);
-      return;
+  op = IC_RIGHT (ic);
+  if (op && IS_SYMOP (op))
+    {
+      if (IN_CODESPACE (SPEC_OCLS (OP_SYM_ETYPE (op))))
+        {
+          fprintf (stderr, "%s: volatile symbols in codespace?!? -- might go wrong...\n", __FUNCTION__);
+          return;
+        }
+      pic16_aopOp (op, ic, FALSE);
+      pic16_mov2w_volatile (AOP (op));
+      pic16_freeAsmop (op, NULL, ic, TRUE);
     }
-    pic16_aopOp (op, ic, FALSE);
-    pic16_mov2w_volatile(AOP(op));
-    pic16_freeAsmop (op, NULL, ic, TRUE);
-  } else if (op) {
-    fprintf (stderr, "%s: not implemented for non-symbols (volatile operand might not be read)\n", __FUNCTION__);
-  } // if
+  else if (op)
+    {
+      fprintf (stderr, "%s: not implemented for non-symbols (volatile operand might not be read)\n", __FUNCTION__);
+    }                           // if
 }
 
 /*-----------------------------------------------------------------*/
@@ -10117,65 +11322,73 @@
  * peep hole optimizer and the pCode optimizer.
  *-----------------------------------------------------------------*/
 
-void genpic16Code (iCode *lic)
+void
+genpic16Code (iCode * lic)
 {
   iCode *ic;
   int cln = 0;
 
-    lineHead = lineCurr = NULL;
-
-    pb = pic16_newpCodeChain(GcurMemmap,0,pic16_newpCodeCharP("; Starting pCode block"));
-    pic16_addpBlock(pb);
+  pb = pic16_newpCodeChain (GcurMemmap, 0, pic16_newpCodeCharP ("; Starting pCode block"));
+  pic16_addpBlock (pb);
 
 #if 0
-    /* if debug information required */
-    if (options.debug && currFunc) {
-      if (currFunc) {
-        cdbSymbol(currFunc,cdbFile,FALSE,TRUE);
-      }
+  /* if debug information required */
+  if (options.debug && currFunc)
+    {
+      if (currFunc)
+        {
+          cdbSymbol (currFunc, cdbFile, FALSE, TRUE);
+        }
     }
 #endif
 
-    for (ic = lic ; ic ; ic = ic->next ) {
+  for (ic = lic; ic; ic = ic->next)
+    {
+      initGenLineElement ();
 
-      DEBUGpic16_emitcode(";ic ", "\t%c 0x%x\t(%s)",ic->op, ic->op, pic16_decodeOp(ic->op));
-      if ( cln != ic->lineno ) {
-        if ( options.debug ) {
-          debugFile->writeCLine (ic);
-        }
+      DEBUGpic16_emitcode (";ic ", "\t%c 0x%x\t(%s)", ic->op, ic->op, pic16_decodeOp (ic->op));
+      if (cln != ic->lineno)
+        {
+          if (options.debug)
+            {
+              debugFile->writeCLine (ic);
+            }
 
-        if(!options.noCcodeInAsm) {
-          pic16_addpCode2pBlock(pb, pic16_newpCodeCSource(ic->lineno, ic->filename,
-              printCLine(ic->filename, ic->lineno)));
-        }
+          if (!options.noCcodeInAsm)
+            {
+              pic16_addpCode2pBlock (pb, pic16_newpCodeCSource (ic->lineno, ic->filename,
+                                     printCLine (ic->filename, ic->lineno)));
+            }
 
-        cln = ic->lineno ;
-      }
+          cln = ic->lineno;
+        }
 
-      if(options.iCodeInAsm) {
-        const char *iLine;
+      if (options.iCodeInAsm)
+        {
+          const char *iLine;
 
-        /* insert here code to print iCode as comment */
-        iLine = printILine(ic);
-        pic16_emitpcomment("ic:%d: %s", ic->seq, iLine);
-        dbuf_free(iLine);
-      }
+          /* insert here code to print iCode as comment */
+          iLine = printILine (ic);
+          pic16_emitpcomment ("ic:%d: %s", ic->seq, iLine);
+          dbuf_free (iLine);
+        }
 
       /* if the result is marked as
        * spilt and rematerializable or code for
        * this has already been generated then
        * do nothing */
-      if (resultRemat(ic) || ic->generated )
-        continue ;
+      if (resultRemat (ic) || ic->generated)
+        continue;
 
       /* depending on the operation */
-      switch (ic->op) {
-        case '!' :
-          pic16_genNot(ic);
+      switch (ic->op)
+        {
+        case '!':
+          pic16_genNot (ic);
           break;
 
-        case '~' :
-          pic16_genCpl(ic);
+        case '~':
+          pic16_genCpl (ic);
           break;
 
         case UNARYMINUS:
@@ -10193,10 +11406,8 @@
            * be using some of the registers being popped which
            * would destroy the contents of the register so
            * we need to check for this condition and handle it */
-           if (ic->next
-             && ic->next->op == IFX
-             && regsInCommon(IC_LEFT(ic),IC_COND(ic->next)))
-               genIfx (ic->next,ic);
+          if (ic->next && ic->next->op == IFX && regsInCommon (IC_LEFT (ic), IC_COND (ic->next)))
+            genIfx (ic->next, ic);
           else
             genIpop (ic);
           break;
@@ -10229,33 +11440,33 @@
           genGoto (ic);
           break;
 
-        case '+' :
-          pic16_genPlus (ic) ;
+        case '+':
+          pic16_genPlus (ic);
           break;
 
-        case '-' :
-          if ( ! genDjnz (ic,ifxForOp(IC_RESULT(ic),ic)))
+        case '-':
+          if (!genDjnz (ic, ifxForOp (IC_RESULT (ic), ic)))
             pic16_genMinus (ic);
           break;
 
-        case '*' :
+        case '*':
           genMult (ic);
           break;
 
-        case '/' :
-          genDiv (ic) ;
+        case '/':
+          genDiv (ic);
           break;
 
-        case '%' :
+        case '%':
           genMod (ic);
           break;
 
-        case '>' :
-          genCmpGt (ic,ifxForOp(IC_RESULT(ic),ic));
+        case '>':
+          genCmpGt (ic, ifxForOp (IC_RESULT (ic), ic));
           break;
 
-        case '<' :
-          genCmpLt (ic,ifxForOp(IC_RESULT(ic),ic));
+        case '<':
+          genCmpLt (ic, ifxForOp (IC_RESULT (ic), ic));
           break;
 
         case LE_OP:
@@ -10263,12 +11474,11 @@
         case NE_OP:
           /* note these two are xlated by algebraic equivalence
            * during parsing SDCC.y */
-          werror(E_INTERNAL_ERROR,__FILE__,__LINE__,
-            "got '>=' or '<=' shouldn't have come here");
+          werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "got '>=' or '<=' shouldn't have come here");
           break;
 
         case EQ_OP:
-          genCmpEq (ic,ifxForOp(IC_RESULT(ic),ic));
+          genCmpEq (ic, ifxForOp (IC_RESULT (ic), ic));
           break;
 
         case AND_OP:
@@ -10279,20 +11489,20 @@
           genOrOp (ic);
           break;
 
-        case '^' :
-          genXor (ic,ifxForOp(IC_RESULT(ic),ic));
+        case '^':
+          genXor (ic, ifxForOp (IC_RESULT (ic), ic));
           break;
 
-        case '|' :
-          genOr (ic,ifxForOp(IC_RESULT(ic),ic));
+        case '|':
+          genOr (ic, ifxForOp (IC_RESULT (ic), ic));
           break;
 
         case BITWISEAND:
-          genAnd (ic,ifxForOp(IC_RESULT(ic),ic));
+          genAnd (ic, ifxForOp (IC_RESULT (ic), ic));
           break;
 
         case INLINEASM:
-          genInline (ic);
+          pic16_genInline (ic);
           break;
 
         case RRC:
@@ -10303,6 +11513,10 @@
           genRLC (ic);
           break;
 
+        case GETABIT:
+          genGetABit (ic);
+          break;
+
         case GETHBIT:
           genGetHbit (ic);
           break;
@@ -10316,18 +11530,18 @@
           break;
 
         case GET_VALUE_AT_ADDRESS:
-          genPointerGet(ic);
+          genPointerGet (ic);
           break;
 
-        case '=' :
-          if (POINTER_SET(ic))
-            genPointerSet(ic);
+        case '=':
+          if (POINTER_SET (ic))
+            genPointerSet (ic);
           else
-            genAssign(ic);
+            genAssign (ic);
           break;
 
         case IFX:
-          genIfx (ic,NULL);
+          genIfx (ic, NULL);
           break;
 
         case ADDRESS_OF:
@@ -10343,35 +11557,46 @@
           break;
 
         case RECEIVE:
-          genReceive(ic);
+          genReceive (ic);
           break;
 
         case SEND:
-          addSet(&_G.sendSet,ic);
+          addSet (&_G.sendSet, ic);
           break;
 
         case DUMMY_READ_VOLATILE:
           genDummyRead (ic);
           break;
 
-        default :
+        case CRITICAL:
+          genCritical (ic);
+          break;
+
+        case ENDCRITICAL:
+          genEndCritical (ic);
+          break;
+
+        default:
+          fprintf (stderr, "UNHANDLED iCode: ");
+          piCode (ic, stderr);
           ic = ic;
-      }
+        }
     }
 
 
-    /* now we are ready to call the
-       peep hole optimizer */
-    if (!options.nopeep)
-      peepHole (&lineHead);
+  /* now we are ready to call the
+     peep hole optimizer */
+  if (!options.nopeep)
+    peepHole (&genLine.lineHead);
 
-    /* now do the actual printing */
-    printLine (lineHead, codeOutBuf);
+  /* now do the actual printing */
+  printLine (genLine.lineHead, codeOutBuf);
 
 #ifdef PCODE_DEBUG
-    DFPRINTF((stderr,"printing pBlock\n\n"));
-    pic16_printpBlock(stdout,pb);
+  DFPRINTF ((stderr, "printing pBlock\n\n"));
+  pic16_printpBlock (stdout, pb);
 #endif
 
-    return;
+  /* destroy the line list */
+  destroy_line_list ();
 }
diff -Nru sdcc-3.1.0+dfsg/src/pic16/genarith.c sdcc-3.2.0+dfsg/src/pic16/genarith.c
--- sdcc-3.1.0+dfsg/src/pic16/genarith.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic16/genarith.c	2012-04-14 17:44:08.000000000 +0000
@@ -1,12 +1,13 @@
 /*-------------------------------------------------------------------------
+  genarith.c - source file for code generation - arithmetic
 
- genarith.c - source file for code generation - arithmetic
-
-  Written By -  Sandeep Dutta . sandeep.dutta@usa.net (1998)
-         and -  Jean-Louis VERN.jlvern@writeme.com (1999)
+  Copyright (C) 1998, Sandeep Dutta . sandeep.dutta@usa.net
+  Copyright (C) 1999, Jean-Louis VERN.jlvern@writeme.com
   Bug Fixes  -  Wojciech Stryjewski  wstryj1@tiger.lsu.edu (1999 v2.1.9a)
-  PIC port   -  Scott Dattalo scott@dattalo.com (2000)
-  PIC16 port   -  Martin Dubuc m.dubuc@rogers.com (2002)
+  PIC port:
+  Copyright (C) 2000, Scott Dattalo scott@dattalo.com
+  PIC16 port:
+  Copyright (C) 2002, Martin Dubuc m.dubuc@rogers.com
 
   This program is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by the
@@ -21,15 +22,12 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-  In other words, you are welcome to use, share and improve this program.
-  You are forbidden to forbid anyone else to use, share and improve
-  what you give them.   Help stamp out software-hoarding!
-
+-------------------------------------------------------------------------*/
+/*
   Notes:
   000123 mlh    Moved aopLiteral to SDCCglue.c to help the split
                 Made everything static
--------------------------------------------------------------------------*/
+*/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -52,7 +50,10 @@
 #define pic16_emitcode  DEBUGpic16_emitcode
 #endif
 
+extern void pic16_emitpLabelFORCE(int key);
+
 #define BYTEofLONG(l,b) ( (l>> (b<<3)) & 0xff)
+
 void DEBUGpic16_pic16_AopType(int line_no, operand *left, operand *right, operand *result);
 void pic16_emitpcomment(char *, ...);
 pCodeOp *pic16_popGet2p(pCodeOp *src, pCodeOp *dst);
@@ -158,7 +159,7 @@
 /*-----------------------------------------------------------------*/
 bool pic16_genPlusIncr (iCode *ic)
 {
-  unsigned int icount ;
+  unsigned int icount;
   unsigned int size = pic16_getDataSize(IC_RESULT(ic));
 
     FENTRY;
@@ -172,28 +173,58 @@
     /* if the right side is not a literal
        we cannot */
     if (AOP_TYPE(IC_RIGHT(ic)) != AOP_LIT)
-        return FALSE ;
+      {
+        return FALSE;
+      }
 
     DEBUGpic16_emitcode ("; ","%s  %d",__FUNCTION__,__LINE__);
     /* if the literal value of the right hand side
        is greater than 2 then it is faster to add */
-    if ((icount = (unsigned int) ulFromVal (AOP(IC_RIGHT(ic))->aopu.aop_lit)) > 2)
-        return FALSE ;
+    if ((icount = (unsigned int)ulFromVal(AOP(IC_RIGHT(ic))->aopu.aop_lit)) > 2)
+      {
+        return FALSE;
+      }
 
     /* if increment 16 bits in register */
-    if (pic16_sameRegs(AOP(IC_LEFT(ic)), AOP(IC_RESULT(ic))) &&
-        (icount == 1)) {
+    if (pic16_sameRegs(AOP(IC_LEFT(ic)), AOP(IC_RESULT(ic))) && icount == 1)
+      {
+        int offset = LSB;
+
+        switch (size)
+          {
+          case 2:
+            pic16_emitpcode(POC_INFSNZ, pic16_popGet(AOP(IC_RESULT(ic)), offset++));
+          case 1:
+            pic16_emitpcode(POC_INCF, pic16_popGet(AOP(IC_RESULT(ic)), offset));
+            break;
 
-      int offset = MSB16;
+          default:
+            {
+              symbol *inclbl = newiTempLabel(NULL);
+              pCodeOp *pcop_lbl = pic16_popGetLabel(inclbl->key);
+              int label_use = 0;
 
-      pic16_emitpcode(POC_INCF, pic16_popGet(AOP(IC_RESULT(ic)),LSB));
-      //pic16_emitcode("incf","%s,f",pic16_aopGet(AOP(IC_RESULT(ic)),LSB,FALSE,FALSE));
+              size -= 2;
+              if (size)
+                {
+                  label_use = 1;
+                }
 
-      while(--size) {
-        emitSKPNC;
-        pic16_emitpcode(POC_INCF, pic16_popGet(AOP(IC_RESULT(ic)),offset++));
-        //pic16_emitcode(" incf","%s,f",pic16_aopGet(AOP(IC_RESULT(ic)),offset++,FALSE,FALSE));
-      }
+              while (size--)
+                {
+                  pic16_emitpcode(POC_INCF, pic16_popGet(AOP(IC_RESULT(ic)), offset++));
+                  pic16_emitpcode(POC_BNC, pcop_lbl);
+                }
+
+              pic16_emitpcode(POC_INFSNZ, pic16_popGet(AOP(IC_RESULT(ic)), offset++));
+              pic16_emitpcode(POC_INCF, pic16_popGet(AOP(IC_RESULT(ic)), offset));
+
+              if (label_use)
+                {
+                  pic16_emitpLabelFORCE(inclbl->key);
+                }
+            }
+        } // switch (size)
 
       return TRUE;
     }
@@ -386,20 +417,34 @@
 {
   FENTRY;
 
-  switch(lit & 0xff) {
-  case 0:
-    break;
-  case 1:
-    pic16_emitpcode(POC_INCF, pic16_popGet(AOP(result),offr));
-    break;
-  case 0xff:
-    pic16_emitpcode(POC_DECF, pic16_popGet(AOP(result),offr));
-    break;
-  default:
-    pic16_emitpcode(POC_MOVLW,pic16_popGetLit(lit&0xff));
-    pic16_emitpcode(POC_ADDWF,pic16_popGet(AOP(result),offr));
-  }
+  switch(lit & 0xff)
+    {
+    case 0:
+      break;
 
+    case 1:
+      pic16_emitpcode(POC_INCF, pic16_popGet(AOP(result),offr));
+      break;
+
+    case 0xff:
+      pic16_emitpcode(POC_DECF, pic16_popGet(AOP(result),offr));
+      break;
+
+    default:
+      {
+        int resultIsWREG = (AOP_TYPE(result) != AOP_STA && ! strcmp(pic16_aopGet(AOP(result), 0, TRUE, FALSE), "WREG"));
+
+        if (resultIsWREG)
+          {
+            pic16_emitpcode(POC_ADDLW, pic16_popGetLit(lit & 0xff));
+          }
+        else
+          {
+            pic16_emitpcode(POC_MOVLW,pic16_popGetLit(lit & 0xff));
+            pic16_emitpcode(POC_ADDWF,pic16_popGet(AOP(result),offr));
+          }
+      }
+    }
 }
 #endif
 
@@ -466,11 +511,12 @@
         switch(lo) {
         case 0:
           break;
+
         case 1:
-          pic16_emitpcode(POC_INCF, pic16_popGet(AOP(result),0));
-          emitSKPNZ;
+          pic16_emitpcode(POC_INFSNZ, pic16_popGet(AOP(result),0));
           pic16_emitpcode(POC_INCF, pic16_popGet(AOP(result),MSB16));
           break;
+
         case 0xff:
           pic16_emitpcode(POC_DECF, pic16_popGet(AOP(result),0));
           pic16_emitpcode(POC_INCFSZW, pic16_popGet(AOP(result),0));
@@ -482,8 +528,6 @@
           pic16_emitpcode(POC_ADDWF,pic16_popGet(AOP(result),0));
           emitSKPNC;
           pic16_emitpcode(POC_INCF, pic16_popGet(AOP(result),MSB16));
-
-
         }
         break;
 
@@ -526,12 +570,13 @@
           pic16_emitpcode(POC_INCFSZ, pic16_popGet(AOP(result),0));
           pic16_emitpcode(POC_DECF, pic16_popGet(AOP(result),MSB16));
           break;
-/*      case 0xff: * 0xffff *
-          pic16_emitpcode(POC_INCFSZW, pic16_popGet(AOP(result),0,FALSE,FALSE));
-          pic16_emitpcode(POC_INCF, pic16_popGet(AOP(result),MSB16,FALSE,FALSE));
-          pic16_emitpcode(POC_DECF, pic16_popGet(AOP(result),0,FALSE,FALSE));
+
+        case 0xff: /* 0xffff */
+          pic16_emitpcode(POC_MOVLW, pic16_popGetLit(lo));
+          pic16_emitpcode(POC_ADDWF, pic16_popGet(AOP(result),0));
+          pic16_emitpcode(POC_ADDWFC, pic16_popGet(AOP(result),MSB16));
           break;
-*/
+
         default:
           pic16_emitpcode(POC_MOVLW,pic16_popGetLit(lo));
           pic16_emitpcode(POC_ADDWF,pic16_popGet(AOP(result),0));
@@ -572,35 +617,55 @@
       }
     } else {
       int carry_info = 0;
-      int offset = 0;
+      int prev_W = -1;
       /* size > 2 */
       DEBUGpic16_emitcode (";  add lit to long","%s  %d",__FUNCTION__,__LINE__);
 
-      while(size--) {
+      offset = 0;
+      while (size--)
+        {
         lo = BYTEofLONG(lit,0);
 
-        if(carry_info) {
-          pic16_emitpcode(POC_MOVLW,pic16_popGetLit(lo));
-          pic16_emitpcode(POC_ADDWFC, pic16_popGet(AOP(result),offset));
-        }else {
+        if (carry_info)
+          {
+            if (prev_W != (lo & 0xFF))
+              {
+                pic16_emitpcode(POC_MOVLW, pic16_popGetLit(lo));
+                prev_W = lo & 0xFF;
+              }
+
+            pic16_emitpcode(POC_ADDWFC, pic16_popGet(AOP(result),offset));
+          }
+        else {
           /* no carry info from previous step */
           /* this means this is the first time to add */
-          switch(lo) {
-          case 0:
-            break;
-          case 1:
-            pic16_emitpcode(POC_INCF, pic16_popGet(AOP(result),offset));
-            carry_info=1;
-            break;
-          default:
-            pic16_emitpcode(POC_MOVLW,pic16_popGetLit(lo));
-            pic16_emitpcode(POC_ADDWF, pic16_popGet(AOP(result),offset));
-            if(lit <0x100)
-              carry_info = 3;  /* Were adding only one byte and propogating the carry */
-            else
-              carry_info = 2;
-            break;
-          }
+          switch (lo)
+            {
+            case 0:
+              break;
+
+            case 1:
+              pic16_emitpcode(POC_INCF, pic16_popGet(AOP(result),offset));
+              carry_info = 1;
+              break;
+
+            default:
+              {
+                if (prev_W != (lo & 0xFF))
+                  {
+                    pic16_emitpcode(POC_MOVLW, pic16_popGetLit(lo));
+                    prev_W = lo & 0xFF;
+                  }
+
+                pic16_emitpcode(POC_ADDWF, pic16_popGet(AOP(result),offset));
+
+                if (lit < 0x100)
+                  carry_info = 3;  /* Were adding only one byte and propogating the carry. */
+                else
+                  carry_info = 2;
+                break;
+              }
+            }
         }
         offset++;
         lit >>= 8;
@@ -720,7 +785,7 @@
 {
 
   int size,sizeL,same;
-  int i, llit;
+  int i, llit, prev_W;
 
   operand *result;
   operand *left;
@@ -772,12 +837,18 @@
     /* general case */
 
     /* add literal to result */
-    for (i=0; i < size; i++) {
-      pic16_emitpcode (POC_MOVLW, pic16_popGetLit (llit));
-      llit >>= 8; /* FIXME: arithmetic right shift for signed literals? */
-      pic16_emitpcode (i == 0 ? POC_ADDWF : POC_ADDWFC,
-        pic16_popGet (AOP(result), i));
-    }
+    prev_W = -1;
+    for (i = 0; i < size; i++)
+      {
+        if (prev_W != (llit & 0xFF))
+          {
+            pic16_emitpcode(POC_MOVLW, pic16_popGetLit(llit));
+            prev_W = llit & 0xFF;
+          }
+
+        llit >>= 8; /* FIXME: arithmetic right shift for signed literals? */
+        pic16_emitpcode(i == 0 ? POC_ADDWF : POC_ADDWFC, pic16_popGet(AOP(result), i));
+      }
   }
 
 #if 0
@@ -801,8 +872,7 @@
         case 0:
           break;
         case 1:
-          pic16_emitpcode(POC_INCF, pic16_popGet(AOP(result),0));
-          emitSKPNZ;
+          pic16_emitpcode(POC_INFSNZ, pic16_popGet(AOP(result),0));
           pic16_emitpcode(POC_INCF, pic16_popGet(AOP(result),MSB16));
           break;
         case 0xff:
@@ -1275,12 +1345,12 @@
                 } else {
                         // add regs
 
-			if (pic16_sameRegs(AOP(left), AOP(result))
-			    && (AOP_SIZE(left) < AOP_SIZE(result)))
-			{
-			    // extend left operand, sign-bit still intact
-			    pic16_addSign (result, AOP_SIZE(left), !SPEC_USIGN(getSpec(operandType(left))));
-			}
+                        if (pic16_sameRegs(AOP(left), AOP(result))
+                            && (AOP_SIZE(left) < AOP_SIZE(result)))
+                        {
+                            // extend left operand, sign-bit still intact
+                            pic16_addSign (result, AOP_SIZE(left), !SPEC_USIGN(getSpec(operandType(left))));
+                        }
 
                         // add first bytes
                         for(i=0; i<size; i++) {
@@ -1309,23 +1379,23 @@
                           // get right operand into WREG
                           if (i < AOP_SIZE(right)) {
                             pic16_mov2w (AOP(right), i);
-			  } else {
+                          } else {
                             // right is too short, not overwritten with result
                             pic16_emitpcode (POC_CLRF, pic16_popCopyReg (&pic16_pc_wreg));
                             if (!SPEC_USIGN(getSpec(operandType(right)))) {
                               // right operand is signed
-			      // Make sure that right's sign is not yet overwritten
-			      assert (!pic16_sameRegs (AOP(right), AOP(result)));
+                              // Make sure that right's sign is not yet overwritten
+                              assert (!pic16_sameRegs (AOP(right), AOP(result)));
                               pic16_emitpcode(POC_BTFSC, pic16_newpCodeOpBit(pic16_aopGet(AOP(right),AOP_SIZE(right)-1,FALSE,FALSE),7,0, PO_GPR_REGISTER));
                               pic16_emitpcode(POC_SETF, pic16_popCopyReg (&pic16_pc_wreg));
                             }
                           }
 
                           // get left+WREG+CARRY into result
-			  if (pic16_sameRegs (AOP(left), AOP(result))) {
-			    // left might have been extended in result above
-			    pic16_emitpcode (POC_ADDWFC, pic16_popGet (AOP(result), i));
-			  } else if (i < AOP_SIZE(left)) {
+                          if (pic16_sameRegs (AOP(left), AOP(result))) {
+                            // left might have been extended in result above
+                            pic16_emitpcode (POC_ADDWFC, pic16_popGet (AOP(result), i));
+                          } else if (i < AOP_SIZE(left)) {
                             pic16_emitpcode (POC_ADDFWC, pic16_popGet (AOP(left), i));
                             pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result),i));
                           } else {
@@ -1649,16 +1719,16 @@
                    pic16_AopType(AOP_TYPE(IC_RIGHT(ic))));
 
     if ((AOP_SIZE(IC_LEFT(ic)) < AOP_SIZE(IC_RESULT(ic)))
-	    && pic16_sameRegs (AOP(IC_LEFT(ic)), AOP(IC_RESULT(ic)))) {
-	// extend left in result
-	pic16_addSign (IC_RESULT(ic), AOP_SIZE(IC_LEFT(ic)), !SPEC_USIGN(getSpec(operandType(IC_LEFT(ic)))));
+            && pic16_sameRegs (AOP(IC_LEFT(ic)), AOP(IC_RESULT(ic)))) {
+        // extend left in result
+        pic16_addSign (IC_RESULT(ic), AOP_SIZE(IC_LEFT(ic)), !SPEC_USIGN(getSpec(operandType(IC_LEFT(ic)))));
     }
 
     if ((AOP_SIZE(IC_RIGHT(ic)) < AOP_SIZE(IC_RESULT(ic)))
-	    && pic16_sameRegs (AOP(IC_RIGHT(ic)), AOP(IC_RESULT(ic)))) {
-	// extend right in result---fails if left resides in result as well...
-	assert ((IC_LEFT(ic) == IC_RIGHT(ic)) || !pic16_sameRegs (AOP(IC_LEFT(ic)), AOP(IC_RESULT(ic))));
-	pic16_addSign (IC_RESULT(ic), AOP_SIZE(IC_RIGHT(ic)), !SPEC_USIGN(getSpec(operandType(IC_RIGHT(ic)))));
+            && pic16_sameRegs (AOP(IC_RIGHT(ic)), AOP(IC_RESULT(ic)))) {
+        // extend right in result---fails if left resides in result as well...
+        assert ((IC_LEFT(ic) == IC_RIGHT(ic)) || !pic16_sameRegs (AOP(IC_LEFT(ic)), AOP(IC_RESULT(ic))));
+        pic16_addSign (IC_RESULT(ic), AOP_SIZE(IC_RIGHT(ic)), !SPEC_USIGN(getSpec(operandType(IC_RIGHT(ic)))));
     }
 
     if(AOP_TYPE(IC_LEFT(ic)) == AOP_ACC) {
@@ -1711,7 +1781,7 @@
       } else if (offset < AOP_SIZE(IC_RIGHT(ic)))
         pic16_mov2w(AOP(IC_RIGHT(ic)),offset);
       else {
-	// right operand is too short, not overwritten with result
+        // right operand is too short, not overwritten with result
         pic16_emitpcode (POC_CLRF, pic16_popCopyReg (&pic16_pc_wreg));
         if (!SPEC_USIGN(operandType(IC_RIGHT(ic)))) {
           // signed -- sign extend the right operand
@@ -1752,770 +1822,218 @@
  *
  *
  *-----------------------------------------------------------------*/
-void pic16_genMult8XLit_n (operand *left,
-    operand *right,
-    operand *result)
+static void
+pic16_genMult8XLit_n (operand *left, operand *right, operand *result)
 {
   int lit;
-  int same;
-  int size = AOP_SIZE(result);
-  int i;
+  int size = AOP_SIZE (result);
 
   FENTRY;
-  DEBUGpic16_pic16_AopType(__LINE__,left,right,result);
-
-  if (AOP_TYPE(right) != AOP_LIT){
-    fprintf(stderr,"%s %d - right operand is not a literal\n",__FILE__,__LINE__);
-    exit(1);
-  }
+  DEBUGpic16_pic16_AopType (__LINE__, left, right, result);
 
-  lit = (int) ulFromVal (AOP(right)->aopu.aop_lit);
-  assert( (lit >= -128) && (lit < 256) );
-  pic16_emitpcomment("Unrolled 8 X 8 multiplication");
-  pic16_emitpcomment("FIXME: the function does not support result==WREG");
-
-  same = pic16_sameRegs(AOP(left), AOP(result));
-  if(same) {
-    switch(lit & 0x00ff) {
-      case 0:
-        while (size--) {
-          pic16_emitpcode(POC_CLRF,  pic16_popGet(AOP(result),size));
-        } // while
-        return;
-
-      case 2:
-        /* sign extend left in result */
-        pic16_addSign(result, 1, !IS_UNSIGNED(operandType(left)));
-        // its faster to left shift
-        emitCLRC;
-        pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(left),0));
-        if (size > 1)
-          pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(result),1));
-        return;
-
-      default:
-        if(AOP_TYPE(left) != AOP_ACC)
-          pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left), 0));
-        pic16_emitpcode(POC_MULLW, pic16_popGetLit(lit & 0x00ff));
-        pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popCopyReg(
-                &pic16_pc_prodl), pic16_popGet(AOP(result), 0)));
-        /* Adjust result's high bytes below! */
-    }
-  } else {
-    // operands different
-    switch(lit & 0x00ff) {
-      case 0:
-        while (size--) {
-          pic16_emitpcode(POC_CLRF,  pic16_popGet(AOP(result),size));
-        } // while
-        return;
-
-      case 2:
-        if (IS_UNSIGNED(operandType(result))) {
-          for (i=1; i < size; i++) {
-            pic16_emitpcode(POC_CLRF,  pic16_popGet(AOP(result),i));
-          } // for
-        } else {
-          /* sign extend left to result */
-          pic16_emitpcode(POC_MOVLW, pic16_popGetLit(0));
-          pic16_emitpcode(POC_BTFSC, pic16_newpCodeOpBit_simple(AOP(left), 0, 7));
-          pic16_emitpcode(POC_MOVLW, pic16_popGetLit(0xff));
-          for (i=1; i < size; i++) {
-            pic16_emitpcode(POC_MOVWF,  pic16_popGet(AOP(result),i));
-          } // for
-        }
-        emitCLRC;
-        pic16_emitpcode(POC_RLCFW, pic16_popGet(AOP(left), 0));
-        pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), 0));
-        if (size > 1)
-          pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(result),1));
-        return;
-
-      default:
-        if(AOP_TYPE(left) != AOP_ACC)
-          pic16_emitpcode(POC_MOVFW, pic16_popGet(AOP(left), 0));
-        pic16_emitpcode(POC_MULLW, pic16_popGetLit(lit));
-        pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popCopyReg(
-                &pic16_pc_prodl), pic16_popGet(AOP(result), 0)));
-        /* Adjust result's high bytes below! */
-    }
-  }
-
-  if (size > 1) {
-    /* We need to fix PRODH for
-     * (a) literals < 0 and
-     * (b) signed register operands < 0.
-     */
-    //printf( "%s: lit %d, left unsigned: %d\n", __FUNCTION__, lit, SPEC_USIGN(getSpec(operandType(left))));
-    if (lit < 0) {
-      /* literal negative (i.e. in [-128..-1]), high byte == -1 */
-      pic16_mov2w(AOP(left), 0);
-      pic16_emitpcode(POC_SUBWF, pic16_popCopyReg(&pic16_pc_prodh));
-    }
-
-    if (!SPEC_USIGN(getSpec(operandType(left)))) {
-      /* register operand signed, determine signedness of high byte */
-      pic16_emitpcode(POC_MOVLW, pic16_popGetLit(lit & 0x00ff));
-      pic16_emitpcode(POC_BTFSC, pic16_newpCodeOpBit_simple(AOP(left), 0, 7));
-      pic16_emitpcode(POC_SUBWF, pic16_popCopyReg(&pic16_pc_prodh));
+  if (AOP_TYPE (right) != AOP_LIT)
+    {
+      fprintf (stderr, "%s %d - right operand is not a literal\n", __FILE__, __LINE__);
+      exit (1);
     }
 
-    pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popCopyReg(
-            &pic16_pc_prodh), pic16_popGet(AOP(result), 1)));
-
-    /* Need to sign-extend here. */
-    pic16_addSign(result, 2, !IS_UNSIGNED(operandType(result)));
-  } // if
-}
-
-#if 0
-/*-----------------------------------------------------------------------*
- * pic_genUMult16XLit_16 - unsigned multiplication of two 16-bit numbers *
- *-----------------------------------------------------------------------*/
-void pic16_genUMult16XLit_16 (operand *left,
-                             operand *right,
-                             operand *result)
-{
-  pCodeOp *pct1, *pct2, *pct3, *pct4;
-  unsigned int lit;
-  int same;
+  lit = (int) ulFromVal (AOP (right)->aopu.aop_lit);
+  assert ((lit >= -128) && (lit < 256) );
 
+  /* We need to adjust the high byte of the result (in PRODH) if
+   * (a) literals < 0 or
+   * (b) signed register operands < 0.
+   *
+   * If lit >= 0 and val is unsigned, MULLW will do the trick.
+   *
+   * If val is signed and 8 bit:
+   * val = -2^7 * v_7 + SUM(2^i * v_i, i=0..6)
+   *     = -2^7 * v_7 + -2^7 * v_7 + SUM(2^i * v_i, i=0..7)
+   *     = -2^8 * v_7 + SUM(2^i * v_i, i=0..7)
+   *     = -2^8 * v_7 + UNSIGNED(val)
+   *
+   * For lit >= 0:
+   * lit * val = lit * UNSIGNED(val) - 2^8 * v_7 * lit
+   *
+   * For lit < 0, lit = l_7 .. l_0:
+   *
+   * lit * val = (-2^8 * l_7 + UNSIGNED(lit)) * (-2^8 * v_7 + UNSIGNED(val))
+   *           = 2^8 * l_7 * 2^8 * v_7
+   *             - 2^8 * l_7 * UNSIGNED(val)
+   *             - 2^8 * v_7 * UNSIGNED(lit)
+   *             + UNSIGNED(lit) * UNSIGNED(val)
+   *           = 2^16 * l_7 * v_7
+   *             - 2^8 * (l_7 * UNSIGNED(val) + v_7 * UNSIGNED(lit))
+   *             + UNSIGNED(lit) * UNSIGNED(val)
+   *
+   * '2^16 * X' is only of interest if the result is larger than 16 * bit
+   * ==> ignored.
+   * '-2^8 * X' requires subtracting the original values of 'val'
+   * respectively 'lit' from the high byte of the result.
+   * UNSIGNED(lit) * UNSIGNED(val) can be computed via a MUL instruction.
+   *
+   * So, we do:
+   * MOVF val, W
+   * MULLW lit
+   * # Now, PRODH:PRODL hold UNSIGNED(val) * UNSIGNED(lit)
+   * if result > 8 bit:
+   *     if lit < 0:
+   *         SUBWF PRODH, F         # -2^8 * l_7 * UNSIGNED(val)
+   *     MOVF PRODH, W
+   *     BTFSC val, 7
+   *     SUBLW lit                  # -2^8 * v_7 * UNSIGNED(lit)
+   *     MOVWF result[1]            # this might overwrite val!
+   * MOVFF PRODL, result[0]         # this might overwrite val!
+   */
 
-    FENTRY;
+  pic16_mov2w (AOP (left), 0);
+  pic16_emitpcode (POC_MULLW, pic16_popGetLit (lit & 0x00ff));
 
-        if (AOP_TYPE(right) != AOP_LIT){
-                fprintf(stderr,"%s %d - right operand is not a literal\n",__FILE__,__LINE__);
-                exit(1);
-        }
-
-        lit = (unsigned int) ulFromVal (AOP(right)->aopu.aop_lit);
-        lit &= 0xffff;
-
-        same = pic16_sameRegs(AOP(left), AOP(result));
-        if(same) {
-                switch(lit) {
-                        case 0:
-                                pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result),0));
-                                pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result),1));
-                                return;
-                        case 2:
-                                // its faster to left shift
-                                emitCLRC;
-                                pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(left),0));
-                                pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(left),1));
-                                return;
-
-                        default: {
-                                DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
-                                pct1 = pic16_popGetTempReg(1);
-                                pct2 = pic16_popGetTempReg(1);
-                                pct3 = pic16_popGetTempReg(1);
-                                pct4 = pic16_popGetTempReg(1);
-
-                                pic16_emitpcode(POC_MOVLW, pic16_popGetLit( lit & 0xff));
-                                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(left), 0));
-                                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                                        pic16_popCopyReg(&pic16_pc_prodl), pic16_pCodeOpCopy(pct1)));
-                                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                                        pic16_popCopyReg(&pic16_pc_prodh), pic16_pCodeOpCopy(pct2)));
-
-                                /* WREG still holds the low literal */
-                                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(left), 1));
-                                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                                        pic16_popCopyReg(&pic16_pc_prodl), pic16_pCodeOpCopy(pct3)));
-
-                                pic16_emitpcode(POC_MOVLW, pic16_popGetLit( lit>>8 ));
-                                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(left), 0));
-                                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                                        pic16_popCopyReg(&pic16_pc_prodl), pic16_pCodeOpCopy(pct4)));
-
-                                /* load result */
-                                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                                        pct1, pic16_popGet(AOP(result), 0)));
-                                pic16_emitpcode(POC_MOVFW, pic16_pCodeOpCopy(pct2));
-                                pic16_emitpcode(POC_ADDFW, pic16_pCodeOpCopy(pct3));
-                                pic16_emitpcode(POC_ADDFWC, pic16_pCodeOpCopy(pct4));
-                                pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), 1));
-
-                                pic16_popReleaseTempReg(pct4,1);
-                                pic16_popReleaseTempReg(pct3,1);
-                                pic16_popReleaseTempReg(pct2,1);
-                                pic16_popReleaseTempReg(pct1,1);
-                        }; return;
-                }
-        } else {
-                // operands different
-                switch(lit) {
-                        case 0:
-                                pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result), 0));
-                                pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result), 1));
-                                return;
-                        case 2:
-                                emitCLRC;
-                                pic16_emitpcode(POC_RLCFW, pic16_popGet(AOP(left), 0));
-                                pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), 0));
-                                pic16_emitpcode(POC_RLCFW, pic16_popGet(AOP(left), 1));
-                                pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), 1));
-                                return;
-                        default: {
-
-                                pic16_emitpcode(POC_MOVLW, pic16_popGetLit( lit & 0xff));
-                                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(left), 0));
-                                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                                        pic16_popCopyReg(&pic16_pc_prodl), pic16_popGet(AOP(result), 0)));
-                                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                                        pic16_popCopyReg(&pic16_pc_prodh), pic16_popGet(AOP(result), 1)));
-
-                                /* WREG still holds the low literal */
-                                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(left), 1));
-                                pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(&pic16_pc_prodl));
-                                pic16_emitpcode(POC_ADDWF, pic16_popGet(AOP(result), 1));
-
-                                pic16_emitpcode(POC_MOVLW, pic16_popGetLit( lit>>8 ));
-                                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(left), 0));
-                                pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(&pic16_pc_prodl));
-                                pic16_emitpcode(POC_ADDWFC, pic16_popGet(AOP(result), 1));
+  if (size > 1)
+    {
+      /* Adjust PRODH for signed operands. */
+      if (lit < 0)
+        {
+          /* left is still in WREG */
+          pic16_emitpcode (POC_SUBWF, pic16_popCopyReg (&pic16_pc_prodh));
+        } // if
+
+      pic16_emitpcode (POC_MOVFW, pic16_popCopyReg (&pic16_pc_prodh));
+      if (!SPEC_USIGN (operandType (left)))
+        {
+          pic16_emitpcode (POC_BTFSC,
+                           pic16_newpCodeOpBit (pic16_aopGet (AOP (left), 0, FALSE, FALSE),
+                                                7, 0, PO_GPR_REGISTER));
+          pic16_emitpcode (POC_SUBLW, pic16_popGetLit (lit & 0x00ff));
+        } // if
+
+      /* Assign result (high byte) -- this may overwrite val. */
+      pic16_emitpcode (POC_MOVWF, pic16_popGet (AOP (result), 1));
+    } // if
+
+  /* Assign result (low byte) -- this may overwrite val. */
+  pic16_emitpcode (POC_MOVFF,
+                   pic16_popGet2p (pic16_popCopyReg (&pic16_pc_prodl),
+                                   pic16_popGet (AOP (result), 0)));
 
-                        }; return;
-                }
-        }
+  /* Must sign/zero-extend here if size > 2. */
+  if (size > 2)
+    {
+      pic16_addSign (result, 2, !IS_UNSIGNED (operandType (left)));
+    } // if
 }
-#endif
-
 
 /*-----------------------------------------------------------------*
  * genMult8X8_n - multiplication of two 8-bit numbers.
  *
  *
  *-----------------------------------------------------------------*/
-void pic16_genMult8X8_n (operand *left, operand *right, operand *result)
-
+void
+pic16_genMult8X8_n (operand *left, operand *right, operand *result)
 {
   FENTRY;
 
-
-  if (AOP_TYPE(right) == AOP_LIT) {
-    pic16_genMult8XLit_n(left,right,result);
-    return;
-  }
+  /* Special case: multiply by literal. */
+  if (AOP_TYPE (right) == AOP_LIT)
+    {
+      pic16_genMult8XLit_n (left, right, result);
+      return;
+    }
+  else if (AOP_TYPE (left) == AOP_LIT)
+    {
+      pic16_genMult8XLit_n (right, left, result);
+      return;
+    } // if
 
   /* cases:
      A = A x B  B = A x B
      A = B x C
      W = A x B
      W = W x B  W = B x W
-     */
+   */
   /* if result == right then exchange left and right */
-  if(pic16_sameRegs(AOP(result), AOP(right))) {
-    operand *tmp;
-    tmp = left;
-    left = right;
-    right = tmp;
-  }
+  if (pic16_sameRegs (AOP (result), AOP (right)))
+    {
+      operand *tmp;
+      tmp = left;
+      left = right;
+      right = tmp;
+    } // if
 
-  if(AOP_TYPE(left) != AOP_ACC) {
-    // left is not WREG
-    if(AOP_TYPE(right) != AOP_ACC) {
-      pic16_mov2w(AOP(left), 0);
-      pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 0));
-    } else {
-      pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(left), 0));
+  if (AOP_TYPE (left) != AOP_ACC)
+    {
+      // left is not WREG
+      if (AOP_TYPE (right) != AOP_ACC)
+        {
+          pic16_mov2w (AOP (left), 0);
+          pic16_emitpcode (POC_MULWF, pic16_popGet (AOP (right), 0));
+        }
+      else
+        {
+          pic16_emitpcode (POC_MULWF, pic16_popGet (AOP (left), 0));
+        } // if
     }
-  } else {
-    // left is WREG, right cannot be WREG (or can?!)
-    pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(right), 0));
-  }
+  else
+    {
+      pic16_emitpcode (POC_MULWF, pic16_popGet (AOP (right), 0));
+    } // if
 
   /* result is in PRODL:PRODH */
-  if(AOP_TYPE(result) != AOP_ACC) {
-    pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popCopyReg(
-            &pic16_pc_prodl), pic16_popGet(AOP(result), 0)));
-
-
-    if(AOP_SIZE(result)>1) {
-
-      /* If s8 x s8 --> s16 multiplication was called for, fixup high byte.
-       * (left=a1a0, right=b1b0, X1: high byte, X0: low byte)
-       *
-       *    a1a0 * b1b0
-       * --------------
-       *      a1b0 a0b0
-       * a1b1 a0b1
-       * ---------------
-       *           a0b0  a1= 0, b1= 0 (both unsigned)
-       *       -b0 a0b0  a1=-1, b1= 0 (a signed and < 0, b unsigned or >= 0)
-       *       -a0 a0b0  a1= 0, b1=-1 (b signed and < 0, a unsigned or >= 0)
-       *  -(a0+b0) a0b0  a1=-1, b1=-1 (a and b signed and < 0)
-       *
-       *  Currently, PRODH:PRODL holds a0b0 as 16 bit value; we need to
-       *  subtract a0 and/or b0 from PRODH. */
-      if (!IS_UNSIGNED(operandType(right))) {
-        /* right operand (b1) signed and < 0, then subtract left op (a0) */
-        pic16_mov2w( AOP(left), 0 );
-        pic16_emitpcode(POC_BTFSC, pic16_newpCodeOpBit_simple(AOP(right), 0, 7));
-        pic16_emitpcode(POC_SUBWF, pic16_popCopyReg(&pic16_pc_prodh));
-      }
-
-      if (!IS_UNSIGNED(getSpec(operandType(left)))) {
-        /* left operand (a1) signed and < 0, then subtract right op (b0) */
-        pic16_mov2w( AOP(right), 0 );
-        pic16_emitpcode(POC_BTFSC, pic16_newpCodeOpBit_simple(AOP(left), 0, 7));
-        pic16_emitpcode(POC_SUBWF, pic16_popCopyReg(&pic16_pc_prodh));
-      }
-
-      pic16_emitpcode(POC_MOVFF, pic16_popGet2p(pic16_popCopyReg(
-              &pic16_pc_prodh), pic16_popGet(AOP(result), 1)));
+  if (AOP_TYPE (result) != AOP_ACC)
+    {
+      int isPRODL = (AOP (result)->type != AOP_STA && ! strcmp (pic16_aopGet (AOP (result), 0, TRUE, FALSE), "_PRODL"));
 
-      /* Must sign-extend here. */
-      pic16_addSign(result, 2, !IS_UNSIGNED(operandType(left)));
+      if (AOP_SIZE (result) > 1)
+        {
+          /* If s8 x s8 --> s16 multiplication was called for, fixup high byte.
+           * (left=a1a0, right=b1b0, X1: high byte, X0: low byte)
+           *
+           *    a1a0 * b1b0
+           * --------------
+           *      a1b0 a0b0
+           * a1b1 a0b1
+           * ---------------
+           *           a0b0  a1= 0, b1= 0 (both unsigned)
+           *       -b0 a0b0  a1=-1, b1= 0 (a signed and < 0, b unsigned or >= 0)
+           *       -a0 a0b0  a1= 0, b1=-1 (b signed and < 0, a unsigned or >= 0)
+           *  -(a0+b0) a0b0  a1=-1, b1=-1 (a and b signed and < 0)
+           *
+           *  Currently, PRODH:PRODL holds a0b0 as 16 bit value; we need to
+           *  subtract a0 and/or b0 from PRODH. */
+          if (!IS_UNSIGNED (operandType (right)))
+            {
+              /* right operand (b1) signed and < 0, then subtract left op (a0) */
+              pic16_mov2w (AOP (left), 0);
+              pic16_emitpcode (POC_BTFSC, pic16_newpCodeOpBit_simple (AOP (right), 0, 7));
+              pic16_emitpcode (POC_SUBWF, pic16_popCopyReg (&pic16_pc_prodh));
+            } // if
+
+          if (!IS_UNSIGNED (getSpec (operandType (left))))
+            {
+              /* left operand (a1) signed and < 0, then subtract right op (b0) */
+              pic16_mov2w (AOP (right), 0 );
+              pic16_emitpcode (POC_BTFSC, pic16_newpCodeOpBit_simple (AOP (left), 0, 7));
+              pic16_emitpcode (POC_SUBWF, pic16_popCopyReg (&pic16_pc_prodh));
+            } // if
+
+          /* Assing high byte of result -- this may overwrite one of the operands. */
+          pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popCopyReg(&pic16_pc_prodh), pic16_popGet (AOP (result), 1)));
+        } // if
+
+      /* Assign low byte of result -- this may overwrite one of the operands. */
+      if (!isPRODL)
+        {
+          pic16_emitpcode (POC_MOVFF, pic16_popGet2p (pic16_popCopyReg (&pic16_pc_prodl), pic16_popGet (AOP (result), 0)));
+        } // if
+
+      /* Must sign/zero-extend here if size > 2. */
+      if (AOP_SIZE (result) > 2)
+        {
+          pic16_addSign (result, 2, !IS_UNSIGNED (operandType (left)));
+        } // if
     }
-  } else {
-    pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(&pic16_pc_prodl));
-  }
-}
-
-#if 0
-/*------------------------------------------------------------------*
- * genUMult16X16_16 - unsigned multiplication of two 16-bit numbers *
- *------------------------------------------------------------------*/
-void pic16_genUMult16X16_16 (operand *left,
-                           operand *right,
-                           operand *result)
-
-{
-  pCodeOp *pct1, *pct2, *pct3, *pct4;
-
-    FENTRY;
-
-
-        if (AOP_TYPE(right) == AOP_LIT) {
-                pic16_genMult8XLit_n(left,right,result);
-          return;
-        }
-
-        /* cases:
-                A = A x B       B = A x B
-                A = B x C
-        */
-        /* if result == right then exchange left and right */
-        if(pic16_sameRegs(AOP(result), AOP(right))) {
-          operand *tmp;
-                tmp = left;
-                left = right;
-                right = tmp;
-        }
-
-
-        if(pic16_sameRegs(AOP(result), AOP(left))) {
-
-                pct1 = pic16_popGetTempReg(1);
-                pct2 = pic16_popGetTempReg(1);
-                pct3 = pic16_popGetTempReg(1);
-                pct4 = pic16_popGetTempReg(1);
-
-                pic16_mov2w(AOP(left), 0);
-                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 0));
-                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                        pic16_popCopyReg(&pic16_pc_prodl), pic16_pCodeOpCopy(pct1)));
-                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                        pic16_popCopyReg(&pic16_pc_prodh), pic16_pCodeOpCopy(pct2)));
-
-                /* WREG still holds the lower left */
-                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 1));
-                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                        pic16_popCopyReg(&pic16_pc_prodl), pic16_pCodeOpCopy(pct3)));
-
-                pic16_mov2w(AOP(left), 1);
-                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 0));
-                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                        pic16_popCopyReg(&pic16_pc_prodl), pic16_pCodeOpCopy(pct4)));
-
-                /* load result */
-                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                        pic16_pCodeOpCopy( pct1 ), pic16_popGet(AOP(result), 0)));
-                pic16_emitpcode(POC_MOVFW, pic16_pCodeOpCopy( pct2 ));
-                pic16_emitpcode(POC_ADDFW, pic16_pCodeOpCopy(pct3));
-                pic16_emitpcode(POC_ADDFWC, pic16_pCodeOpCopy(pct4));
-                pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), 1));
-
-                pic16_popReleaseTempReg( pct4, 1 );
-                pic16_popReleaseTempReg( pct3, 1 );
-                pic16_popReleaseTempReg( pct2, 1 );
-                pic16_popReleaseTempReg( pct1, 1 );
-
-        } else {
-
-                pic16_mov2w(AOP(left), 0);
-                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 0));
-                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                        pic16_popCopyReg(&pic16_pc_prodl), pic16_popGet(AOP(result), 0)));
-                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                        pic16_popCopyReg(&pic16_pc_prodh), pic16_popGet(AOP(result), 1)));
-
-                /* WREG still holds the lower left */
-                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 1));
-                pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(&pic16_pc_prodl));
-                pic16_emitpcode(POC_ADDWF, pic16_popGet(AOP(result), 1));
-
-                pic16_mov2w(AOP(left), 1);
-                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 0));
-                pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(&pic16_pc_prodl));
-                pic16_emitpcode(POC_ADDWFC, pic16_popGet(AOP(result), 1));
-        }
-}
-#endif
-
-#if 0
-void pic16_genSMult16X16_16(operand *left,
-                        operand *right,
-                        operand *result)
-{
-
-}
-#endif
-
-#if 0
-/*-----------------------------------------------------------------*
- * pic16_genSMult8X8_16 - signed multiplication of two 8-bit numbers
- *
- *  this routine will call the unsigned multiply routine and then
- * post-fix the sign bit.
- *-----------------------------------------------------------------*/
-void pic16_genSMult8X8_8 (operand *left,
-                           operand *right,
-                           operand *result,
-                           pCodeOpReg *result_hi)
-{
-        DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
-
-  if(!result_hi) {
-    result_hi = PCOR(pic16_popGet(AOP(result),1));
-  }
-
-
-  pic16_genUMult8X8_8(left,right,result);
-
-
-#if 0
-  pic16_emitpcode(POC_BTFSC, pic16_newpCodeOpBit(pic16_aopGet(AOP(left),0,FALSE,FALSE),7,0, PO_GPR_REGISTER));
-  pic16_emitpcode(POC_SUBWF, pic16_popCopyReg(result_hi));
-  pic16_mov2w(AOP(left),0);
-  pic16_emitpcode(POC_BTFSC, pic16_newpCodeOpBit(pic16_aopGet(AOP(right),0,FALSE,FALSE),7,0, PO_GPR_REGISTER));
-  pic16_emitpcode(POC_SUBWF, pic16_popGet(AOP(result),1));
-#endif
-}
-#endif
-
-/*-----------------------------------------------------------------*
- * pic16_genMult8X8_8 - multiplication of two 8-bit numbers        *
- *-----------------------------------------------------------------*/
-void pic16_genMult8X8_8 (operand *left,
-                         operand *right,
-                         operand *result)
-{
-  FENTRY;
-
-  if(AOP_TYPE(right) == AOP_LIT)
-    pic16_genMult8XLit_n(left,right,result);
-  else
-    pic16_genMult8X8_n(left,right,result);
-}
-
-
-#if 0
-/*-----------------------------------------------------------------*
- * pic16_genMult16X16_16 - multiplication of two 16-bit numbers    *
- *-----------------------------------------------------------------*/
-void pic16_genMult16X16_16 (operand *left,
-                         operand *right,
-                         operand *result)
-{
-  FENTRY;
-
-  if (AOP_TYPE(right) == AOP_LIT)
-    pic16_genUMult16XLit_16(left,right,result);
   else
-    pic16_genUMult16X16_16(left,right,result);
-}
-#endif
-
-
-#if 0
-/*-----------------------------------------------------------------------*
- * pic_genUMult32XLit_32 - unsigned multiplication of two 32-bit numbers *
- *-----------------------------------------------------------------------*/
-void pic16_genUMult32XLit_32 (operand *left,
-                             operand *right,
-                             operand *result)
-{
-  pCodeOp *pct1, *pct2, *pct3, *pct4;
-  unsigned int lit;
-  int same;
-
-
-    FENTRY;
-
-        if (AOP_TYPE(right) != AOP_LIT){
-                fprintf(stderr,"%s %d - right operand is not a literal\n",__FILE__,__LINE__);
-                exit(1);
-        }
-
-        lit = (unsigned int) ulFromVal (AOP(right)->aopu.aop_lit);
-        lit &= 0xffff;
-
-        same = pic16_sameRegs(AOP(left), AOP(result));
-        if(same) {
-                switch(lit) {
-                        case 0:
-                                pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result),0));
-                                pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result),1));
-                                return;
-                        case 2:
-                                // its faster to left shift
-                                emitCLRC;
-                                pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(left),0));
-                                pic16_emitpcode(POC_RLCF, pic16_popGet(AOP(left),1));
-                                return;
-
-                        default: {
-                                DEBUGpic16_emitcode ("; ***","%s  %d",__FUNCTION__,__LINE__);
-
-                                pct1 = pic16_popGetTempReg(1);
-                                pct2 = pic16_popGetTempReg(1);
-                                pct3 = pic16_popGetTempReg(1);
-                                pct4 = pic16_popGetTempReg(1);
-
-                                pic16_emitpcode(POC_MOVLW, pic16_popGetLit( lit & 0xff));
-                                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(left), 0));
-                                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                                        pic16_popCopyReg(&pic16_pc_prodl), pic16_pCodeOpCopy(pct1)));
-                                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                                        pic16_popCopyReg(&pic16_pc_prodh), pic16_pCodeOpCopy(pct2)));
-
-                                /* WREG still holds the low literal */
-                                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(left), 1));
-                                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                                        pic16_popCopyReg(&pic16_pc_prodl), pic16_pCodeOpCopy(pct3)));
-
-                                pic16_emitpcode(POC_MOVLW, pic16_popGetLit( lit>>8 ));
-                                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(left), 0));
-                                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                                        pic16_popCopyReg(&pic16_pc_prodl), pic16_pCodeOpCopy(pct4)));
-
-                                /* load result */
-                                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                                        pct1, pic16_popGet(AOP(result), 0)));
-                                pic16_emitpcode(POC_MOVFW, pic16_pCodeOpCopy(pct2));
-                                pic16_emitpcode(POC_ADDFW, pic16_pCodeOpCopy(pct3));
-                                pic16_emitpcode(POC_ADDFWC, pic16_pCodeOpCopy(pct4));
-                                pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), 1));
-
-                                pic16_popReleaseTempReg( pct4, 1 );
-                                pic16_popReleaseTempReg( pct3, 1 );
-                                pic16_popReleaseTempReg( pct2, 1 );
-                                pic16_popReleaseTempReg( pct1, 1 );
-                        }; return;
-                }
-        } else {
-                // operands different
-                switch(lit) {
-                        case 0:
-                                pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result), 0));
-                                pic16_emitpcode(POC_CLRF, pic16_popGet(AOP(result), 1));
-                                return;
-                        case 2:
-                                emitCLRC;
-                                pic16_emitpcode(POC_RLCFW, pic16_popGet(AOP(left), 0));
-                                pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), 0));
-                                pic16_emitpcode(POC_RLCFW, pic16_popGet(AOP(left), 1));
-                                pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), 1));
-                                return;
-                        default: {
-
-                                pic16_emitpcode(POC_MOVLW, pic16_popGetLit( lit & 0xff));
-                                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(left), 0));
-                                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                                        pic16_popCopyReg(&pic16_pc_prodl), pic16_popGet(AOP(result), 0)));
-                                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                                        pic16_popCopyReg(&pic16_pc_prodh), pic16_popGet(AOP(result), 1)));
-
-                                /* WREG still holds the low literal */
-                                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(left), 1));
-                                pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(&pic16_pc_prodl));
-                                pic16_emitpcode(POC_ADDWF, pic16_popGet(AOP(result), 1));
-
-                                pic16_emitpcode(POC_MOVLW, pic16_popGetLit( lit>>8 ));
-                                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(left), 0));
-                                pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(&pic16_pc_prodl));
-                                pic16_emitpcode(POC_ADDWFC, pic16_popGet(AOP(result), 1));
-
-                        }; return;
-                }
-        }
-}
-#endif
-
-#if 0
-/*------------------------------------------------------------------*
- * genUMult32X32_32 - unsigned multiplication of two 32-bit numbers *
- *------------------------------------------------------------------*/
-void pic16_genUMult32X32_32 (operand *left,
-                           operand *right,
-                           operand *result)
-
-{
-  pCodeOp *pct1, *pct2, *pct3, *pct4;
-
-    FENTRY;
-
-        if (AOP_TYPE(right) == AOP_LIT) {
-                pic16_genMult8XLit_n(left,right,result);
-          return;
-        }
-
-        /* cases:
-                A = A x B       B = A x B
-                A = B x C
-        */
-        /* if result == right then exchange left and right */
-        if(pic16_sameRegs(AOP(result), AOP(right))) {
-          operand *tmp;
-                tmp = left;
-                left = right;
-                right = tmp;
-        }
-
-
-        if(pic16_sameRegs(AOP(result), AOP(left))) {
-
-                pct1 = pic16_popGetTempReg(1);
-                pct2 = pic16_popGetTempReg(1);
-                pct3 = pic16_popGetTempReg(1);
-                pct4 = pic16_popGetTempReg(1);
-
-                pic16_mov2w(AOP(left), 0);
-                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 0));
-                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                        pic16_popCopyReg(&pic16_pc_prodl), pic16_pCodeOpCopy(pct1)));
-                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                        pic16_popCopyReg(&pic16_pc_prodh), pic16_pCodeOpCopy(pct2)));
-
-                /* WREG still holds the lower left */
-                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 1));
-                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                        pic16_popCopyReg(&pic16_pc_prodl), pic16_pCodeOpCopy(pct3)));
-
-                pic16_mov2w(AOP(left), 1);
-                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 0));
-                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                        pic16_popCopyReg(&pic16_pc_prodl), pic16_pCodeOpCopy(pct4)));
-
-                /* load result */
-                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                        pic16_pCodeOpCopy( pct1 ), pic16_popGet(AOP(result), 0)));
-                pic16_emitpcode(POC_MOVFW, pic16_pCodeOpCopy( pct2 ));
-                pic16_emitpcode(POC_ADDFW, pic16_pCodeOpCopy(pct3));
-                pic16_emitpcode(POC_ADDFWC, pic16_pCodeOpCopy(pct4));
-                pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(result), 1));
-
-                pic16_popReleaseTempReg( pct4, 1 );
-                pic16_popReleaseTempReg( pct3, 1 );
-                pic16_popReleaseTempReg( pct2, 1 );
-                pic16_popReleaseTempReg( pct1, 1 );
-
-        } else {
-
-                pic16_mov2w(AOP(left), 0);
-                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 0));
-                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                        pic16_popCopyReg(&pic16_pc_prodl), pic16_popGet(AOP(result), 0)));
-                pic16_emitpcode(POC_MOVFF, pic16_popGet2p(
-                        pic16_popCopyReg(&pic16_pc_prodh), pic16_popGet(AOP(result), 1)));
-
-                /* WREG still holds the lower left */
-                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 1));
-                pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(&pic16_pc_prodl));
-                pic16_emitpcode(POC_ADDWF, pic16_popGet(AOP(result), 1));
-
-                pic16_mov2w(AOP(left), 1);
-                pic16_emitpcode(POC_MULWF, pic16_popGet(AOP(right), 0));
-                pic16_emitpcode(POC_MOVFW, pic16_popCopyReg(&pic16_pc_prodl));
-                pic16_emitpcode(POC_ADDWFC, pic16_popGet(AOP(result), 1));
-        }
-}
-#endif
-
-
-#if 0
-/*-----------------------------------------------------------------*
- * pic16_genMult32X32_32 - multiplication of two 32-bit numbers    *
- *-----------------------------------------------------------------*/
-void pic16_genMult32X32_32 (operand *left,
-                         operand *right,
-                         operand *result)
-{
-  FENTRY;
-
-  if (AOP_TYPE(right) == AOP_LIT)
-    pic16_genUMult32XLit_32(left,right,result);
-  else
-    pic16_genUMult32X32_32(left,right,result);
-}
-#endif
-
-
-
-
-
-
-
-#if 0
-/*-----------------------------------------------------------------*/
-/* constMult - generates code for multiplication by a constant     */
-/*-----------------------------------------------------------------*/
-void genMultConst(unsigned C)
-{
-
-  unsigned lit;
-  unsigned sr3; // Shift right 3
-  unsigned mask;
-
-  int size = 1;
-
-  /*
-    Convert a string of 3 binary 1's in the lit into
-    0111 = 1000 - 1;
-  */
-
-  mask = 7 << ( (size*8) - 3);
-  lit = C;
-  sr3 = 0;
-
-  while(mask < (1<<size*8)) {
-
-    if( (mask & lit) == lit) {
-      unsigned lsb;
-
-      /* We found 3 (or more) consecutive 1's */
-
-      lsb = mask & ~(mask & (mask-1));  // lsb of mask.
-
-      consecutive_bits = ((lit + lsb) & lit) ^ lit;
-
-      lit ^= consecutive_bits;
-
-      mask <<= 3;
-
-      sr3 |= (consecutive + lsb);
-
+    {
+      pic16_emitpcode (POC_MOVFW, pic16_popCopyReg (&pic16_pc_prodl));
     }
-
-    mask >>= 1;
-
-  }
-
 }
-
-#endif
diff -Nru sdcc-3.1.0+dfsg/src/pic16/genutils.c sdcc-3.2.0+dfsg/src/pic16/genutils.c
--- sdcc-3.1.0+dfsg/src/pic16/genutils.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic16/genutils.c	2012-01-26 17:33:28.000000000 +0000
@@ -69,9 +69,6 @@
 /*-----------------------------------------------------------------*/
 void pic16_genNot (iCode *ic)
 {
-  int size;
-//  symbol *tlbl;
-
 /*
  * result[AOP_CRY,AOP_REG]  = ! left[AOP_CRY, AOP_REG]
  */
@@ -96,9 +93,8 @@
       goto release;
     }
 
-    size = AOP_SIZE(IC_LEFT(ic));
 #if 0
-    if(size == 1) {
+    if(AOP_SIZE(IC_LEFT(ic)) == 1) {
       pic16_emitpcode(POC_COMFW,pic16_popGet(AOP(IC_LEFT(ic)),0));
       pic16_emitpcode(POC_ANDLW,pic16_popGetLit(1));
       pic16_emitpcode(POC_MOVWF,pic16_popGet(AOP(IC_RESULT(ic)),0));
diff -Nru sdcc-3.1.0+dfsg/src/pic16/glue.c sdcc-3.2.0+dfsg/src/pic16/glue.c
--- sdcc-3.1.0+dfsg/src/pic16/glue.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic16/glue.c	2012-06-28 14:09:28.000000000 +0000
@@ -1,25 +1,21 @@
 /*-------------------------------------------------------------------------
-
   glue.c - glues everything we have done together into one file.
-                Written By -  Sandeep Dutta . sandeep.dutta@usa.net (1998)
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   In other words, you are welcome to use, share and improve this program.
-   You are forbidden to forbid anyone else to use, share and improve
-   what you give them.   Help stamp out software-hoarding!
+  Copyright (C) 1998, Sandeep Dutta . sandeep.dutta@usa.net
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 -------------------------------------------------------------------------*/
 
 #include "../common.h"
@@ -65,7 +61,7 @@
 
 void  pic16_pCodeInitRegisters (void);
 pCodeOp *pic16_popCopyReg (pCodeOpReg *pc);
-extern void pic16_pCodeConstString (char *name, char *value, unsigned length);
+extern void pic16_pCodeConstString (char *name, const char *value, unsigned length);
 
 
 /*-----------------------------------------------------------------*/
@@ -166,6 +162,10 @@
                         !IS_STATIC (sym->etype) && !IS_FUNC(sym->type)) {
 
                         checkAddSym(&publics, sym);
+                } else if (IS_AGGREGATE(sym->type) && sym->level == 0 && ! IS_STATIC(sym->etype)) {
+                        /* If a global variable is not static and will be included in the published list. */
+
+                        checkAddSym(&publics, sym);
                 } else
                         /* new version */
                         if(IS_STATIC(sym->etype)
@@ -613,7 +613,7 @@
     val = valCastLiteral(type, floatFromVal(val));
   }
 
-  for (i = 0; i < getSize (type); i++) {
+  for (i = 0; i < (int)getSize (type); i++) {
     pic16_emitDB(pic16aopLiteral(val, i), ptype, p);
   } // for
 }
@@ -622,10 +622,11 @@
 /* pic16_printIvalChar - generates initital value for character array */
 /*--------------------------------------------------------------------*/
 static int
-pic16_printIvalChar (symbol *sym, sym_link * type, initList * ilist, char *s, char ptype, void *p)
+pic16_printIvalChar (symbol *sym, sym_link * type, initList * ilist, const char *s, char ptype, void *p)
 {
   value *val;
-  int remain, len, ilen;
+  int len;
+  size_t remain, ilen;
 
   if(!p)
     return 0;
@@ -781,7 +782,7 @@
   unsigned long ival = 0;
   int size = 0;
   int bit_start = 0;
-  unsigned long i;
+  int i;
 
 
 #if DEBUG_PRINTIVAL
@@ -886,7 +887,7 @@
 {
   //symbol *sflds;
   initList *iloop = NULL;
-  int size;
+  unsigned int size;
   symbol *sflds = NULL;
 
 #if DEBUG_PRINTIVAL
@@ -1438,7 +1439,7 @@
 
         for(i=0;i<=(pic16->cwInfo.confAddrEnd-pic16->cwInfo.confAddrStart);i++)
                 if(pic16->cwInfo.crInfo[i].emit)        //mask != -1)
-                        fprintf (of, "\t__config 0x%x, 0x%02x\n",
+                        fprintf (of, "\t__config 0x%06x, 0x%02x\n",
                                 pic16->cwInfo.confAddrStart+i,
                                 (unsigned char) pic16->cwInfo.crInfo[i].value);
 }
@@ -1575,7 +1576,7 @@
         for(sym = setFirstItem (publics); sym; sym = setNextItem (publics))
           /* sanity check */
           if(!IS_STATIC(sym->etype))
-                pic16_emitSymbolIfNew(afile, "\tglobal %s\n", sym->rname, 0);
+                pic16_emitSymbolIfNew(afile, "\tglobal\t%s\n", sym->rname, 0);
 }
 
 /*-----------------------------------------------------------------*/
@@ -1595,10 +1596,10 @@
         fprintf(afile, "%s", iComments2);
 
         for(sym = setFirstItem(externs); sym; sym = setNextItem(externs))
-                pic16_emitSymbolIfNew(afile, "\textern %s\n", sym->rname, 1);
+                pic16_emitSymbolIfNew(afile, "\textern\t%s\n", sym->rname, 1);
 
         for(sym = setFirstItem(pic16_builtin_functions); sym; sym = setNextItem(pic16_builtin_functions))
-                pic16_emitSymbolIfNew(afile, "\textern _%s\n", sym->name, 1);
+                pic16_emitSymbolIfNew(afile, "\textern\t_%s\n", sym->name, 1);
 }
 
 /*-----------------------------------------------------------------*/
@@ -1692,8 +1693,8 @@
 {
   unsigned long isize, udsize, ramsize;
   statistics.isize = pic16_countInstructions();
-  isize = (statistics.isize >= 0) ? statistics.isize : 0;
-  udsize = (statistics.udsize >= 0) ? statistics.udsize : 0;
+  isize = (((long)statistics.isize) >= 0) ? statistics.isize : 0;
+  udsize = (((long)statistics.udsize) >= 0) ? statistics.udsize : 0;
   ramsize = pic16 ? pic16->RAMsize : 0x200;
   ramsize -= 256; /* ignore access bank and SFRs */
   if (ramsize == 0) ramsize = 64; /* prevent division by zero (below) */
@@ -1860,7 +1861,7 @@
     /* if external stack then reserve space of it */
     if(mainf && IFFUNC_HASBODY(mainf->type) && options.useXstack ) {
       fprintf (asmFile, "%s", iComments2);
-      fprintf (asmFile, "; external stack \n");
+      fprintf (asmFile, "; external stack\n");
       fprintf (asmFile, "%s", iComments2);
       fprintf (asmFile,";\t.area XSEG (XDATA)\n"); /* MOF */
       fprintf (asmFile,";\t.ds 256\n");
@@ -1887,7 +1888,7 @@
     /* copy the interrupt vector table */
     if(mainf && IFFUNC_HASBODY(mainf->type)) {
       fprintf (asmFile, "\n%s", iComments2);
-      fprintf (asmFile, "; interrupt vector \n");
+      fprintf (asmFile, "; interrupt vector\n");
       fprintf (asmFile, "%s", iComments2);
       dbuf_write_and_destroy (&vBuf, asmFile);
     }
diff -Nru sdcc-3.1.0+dfsg/src/pic16/main.c sdcc-3.2.0+dfsg/src/pic16/main.c
--- sdcc-3.1.0+dfsg/src/pic16/main.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic16/main.c	2012-07-06 08:41:29.000000000 +0000
@@ -25,11 +25,11 @@
 -------------------------------------------------------------------------*/
 
 #include "common.h"
-#include "SDCCsystem.h"
+#include "dbuf_string.h"
+
 #include "main.h"
 #include "ralloc.h"
 #include "device.h"
-#include "SDCCutil.h"
 #include "glue.h"
 #include "pcode.h"
 #include "SDCCargs.h"
@@ -163,7 +163,8 @@
   P_STACK = 1,
   P_CODE,
   P_UDATA,
-  P_LIBRARY
+  P_LIBRARY,
+  P_CONFIG
 };
 
 static int
@@ -184,7 +185,7 @@
         reg_info *reg;
         symbol *sym;
 
-        cp = get_pragma_token(cp, &token);
+        cp = get_pragma_token (cp, &token);
         if (TOKEN_INT != token.type)
           {
             err = 1;
@@ -192,7 +193,7 @@
           }
         stackPos = token.val.int_val;
 
-        cp = get_pragma_token(cp, &token);
+        cp = get_pragma_token (cp, &token);
         if (TOKEN_INT != token.type)
           {
             err = 1;
@@ -200,7 +201,7 @@
           }
         stackLen = token.val.int_val;
 
-        cp = get_pragma_token(cp, &token);
+        cp = get_pragma_token (cp, &token);
         if (TOKEN_EOL != token.type)
           {
             err = 1;
@@ -209,7 +210,7 @@
 
         if (stackLen < 1) {
           stackLen = 64;
-          fprintf(stderr, "%s:%d: warning: setting stack to default size %d (0x%04x)\n",
+          fprintf (stderr, "%s:%d: warning: setting stack to default size %d (0x%04x)\n",
                   filename, lineno, stackLen, stackLen);
         }
 
@@ -238,19 +239,19 @@
           }
         }
 
-        reg = newReg(REG_SFR, PO_SFR_REGISTER, stackPos, "_stack", stackLen-1, 0, NULL);
-        addSet(&pic16_fix_udata, reg);
+        reg = newReg (REG_SFR, PO_SFR_REGISTER, stackPos, "_stack", stackLen-1, 0, NULL);
+        addSet (&pic16_fix_udata, reg);
 
-        reg = newReg(REG_SFR, PO_SFR_REGISTER, stackPos + stackLen-1, "_stack_end", 1, 0, NULL);
-        addSet(&pic16_fix_udata, reg);
+        reg = newReg (REG_SFR, PO_SFR_REGISTER, stackPos + stackLen-1, "_stack_end", 1, 0, NULL);
+        addSet (&pic16_fix_udata, reg);
 
-        sym = newSymbol("stack", 0);
-        sprintf(sym->rname, "_%s", sym->name);
-        addSet(&publics, sym);
-
-        sym = newSymbol("stack_end", 0);
-        sprintf(sym->rname, "_%s", sym->name);
-        addSet(&publics, sym);
+        sym = newSymbol ("stack", 0);
+        sprintf (sym->rname, "_%s", sym->name);
+        addSet (&publics, sym);
+
+        sym = newSymbol ("stack_end", 0);
+        sprintf (sym->rname, "_%s", sym->name);
+        addSet (&publics, sym);
 
         initsfpnt = 1;    // force glue() to initialize stack/frame pointers */
       }
@@ -261,14 +262,14 @@
       {
         absSym *absS;
 
-        cp = get_pragma_token(cp, &token);
+        cp = get_pragma_token (cp, &token);
         if (TOKEN_STR != token.type)
           goto code_err;
 
-        absS = Safe_calloc(1, sizeof(absSym));
-        sprintf(absS->name, "_%s", get_pragma_string(&token));
+        absS = Safe_calloc (1, sizeof (absSym));
+        sprintf (absS->name, "_%s", get_pragma_string (&token));
 
-        cp = get_pragma_token(cp, &token);
+        cp = get_pragma_token (cp, &token);
         if (TOKEN_INT != token.type)
           {
           code_err:
@@ -278,7 +279,7 @@
           }
         absS->address = token.val.int_val;
 
-        cp = get_pragma_token(cp, &token);
+        cp = get_pragma_token (cp, &token);
         if (TOKEN_EOL != token.type)
           {
             err = 1;
@@ -287,11 +288,11 @@
 
         if ((absS->address % 2) != 0) {
           absS->address--;
-          fprintf(stderr, "%s:%d: warning: code memory locations should be word aligned, will locate to 0x%06x instead\n",
-                  filename, lineno, absS->address);
+          fprintf (stderr, "%s:%d: warning: code memory locations should be word aligned, will locate to 0x%06x instead\n",
+                   filename, lineno, absS->address);
         }
 
-        addSet(&absSymSet, absS);
+        addSet (&absSymSet, absS);
 //      fprintf(stderr, "%s:%d symbol %s will be placed in location 0x%06x in code memory\n",
 //        __FILE__, __LINE__, symname, absS->address);
       }
@@ -307,18 +308,18 @@
         sectName *snam;
         int found = 0;
 
-        cp = get_pragma_token(cp, &token);
+        cp = get_pragma_token (cp, &token);
         if (TOKEN_STR == token.type)
-          sectname = Safe_strdup(get_pragma_string(&token));
+          sectname = Safe_strdup (get_pragma_string (&token));
         else
           {
             err = 1;
             break;
           }
 
-        cp = get_pragma_token(cp, &token);
+        cp = get_pragma_token (cp, &token);
         if (TOKEN_STR == token.type)
-          symname = get_pragma_string(&token);
+          symname = get_pragma_string (&token);
         else
           {
             //fprintf (stderr, "%s:%d: #pragma udata [section-name] [symbol] -- section-name or symbol missing!\n", filename, lineno);
@@ -328,24 +329,24 @@
 
         while (symname)
           {
-            ssym = Safe_calloc(1, sizeof(sectSym));
-            ssym->name = Safe_calloc(1, strlen(symname) + 2);
-            sprintf(ssym->name, "%s%s", port->fun_prefix, symname);
+            ssym = Safe_calloc (1, sizeof (sectSym));
+            ssym->name = Safe_calloc (1, strlen (symname) + 2);
+            sprintf (ssym->name, "%s%s", port->fun_prefix, symname);
             ssym->reg = NULL;
 
-            addSet(&sectSyms, ssym);
+            addSet (&sectSyms, ssym);
 
-            nsym = newSymbol((char *)symname, 0);
+            nsym = newSymbol ((char *)symname, 0);
             strcpy(nsym->rname, ssym->name);
 
 #if 0
-            checkAddSym(&publics, nsym);
+            checkAddSym (&publics, nsym);
 #endif
 
             found = 0;
-            for (snam = setFirstItem(sectNames);snam;snam=setNextItem(sectNames))
+            for (snam = setFirstItem (sectNames); snam; snam = setNextItem (sectNames))
               {
-                if (!strcmp(sectname, snam->name))
+                if (!strcmp (sectname, snam->name))
                   {
                     found=1;
                     break;
@@ -354,23 +355,23 @@
 
             if(!found)
               {
-                snam = Safe_calloc(1, sizeof(sectName));
-                snam->name = Safe_strdup(sectname);
+                snam = Safe_calloc (1, sizeof (sectName));
+                snam->name = Safe_strdup (sectname);
                 snam->regsSet = NULL;
 
-                addSet(&sectNames, snam);
+                addSet (&sectNames, snam);
               }
 
             ssym->section = snam;
 
 #if 0
-            fprintf(stderr, "%s:%d placing symbol %s at section %s (%p)\n", __FILE__, __LINE__,
-               ssym->name, snam->name, snam);
+            fprintf (stderr, "%s:%d placing symbol %s at section %s (%p)\n", __FILE__, __LINE__,
+                     ssym->name, snam->name, snam);
 #endif
 
-            cp = get_pragma_token(cp, &token);
+            cp = get_pragma_token (cp, &token);
             if (TOKEN_STR == token.type)
-              symname = get_pragma_string(&token);
+              symname = get_pragma_string (&token);
             else if (TOKEN_EOL == token.type)
               symname = NULL;
             else
@@ -380,7 +381,7 @@
               }
           }
 
-          Safe_free(sectname);
+          Safe_free (sectname);
       }
       break;
 
@@ -389,10 +390,10 @@
       {
         const char *lmodule;
 
-        cp = get_pragma_token(cp, &token);
+        cp = get_pragma_token (cp, &token);
         if (TOKEN_EOL != token.type)
           {
-            lmodule = get_pragma_string(&token);
+            lmodule = get_pragma_string (&token);
 
             /* lmodule can be:
              * c    link the C library
@@ -401,22 +402,22 @@
              * debug    link the debug libary
              * anything else, will link as-is */
 
-            if(!strcmp(lmodule, "c"))
+            if(!strcmp (lmodule, "c"))
               libflags.want_libc = 1;
-            else if(!strcmp(lmodule, "math"))
+            else if(!strcmp (lmodule, "math"))
               libflags.want_libm = 1;
-            else if(!strcmp(lmodule, "io"))
+            else if(!strcmp (lmodule, "io"))
               libflags.want_libio = 1;
-            else if(!strcmp(lmodule, "debug"))
+            else if(!strcmp (lmodule, "debug"))
               libflags.want_libdebug = 1;
-            else if(!strcmp(lmodule, "ignore"))
+            else if(!strcmp (lmodule, "ignore"))
               libflags.ignore = 1;
             else
               {
                 if(!libflags.ignore)
                   {
-                    fprintf(stderr, "link library %s\n", lmodule);
-                    addSetHead(&libFilesSet, (char *)lmodule);
+                    fprintf (stderr, "link library %s\n", lmodule);
+                    addSetHead (&libFilesSet, (char *)lmodule);
                   }
               }
           }
@@ -426,7 +427,7 @@
             break;
           }
 
-        cp = get_pragma_token(cp, &token);
+        cp = get_pragma_token (cp, &token);
         if (TOKEN_EOL != token.type)
           {
             err = 1;
@@ -435,25 +436,102 @@
       }
       break;
 
+    case P_CONFIG:
+      {
+        const char *begin;
+        struct dbuf_s dbuf;
+        bool first = TRUE;
+
+        token.type = TOKEN_EOL; /* just to make the final error test happy */
+
+        dbuf_init (&dbuf, 128);
+        dbuf_append_str (&dbuf, "CONFIG\t");
+
+        do
+          {
+            if (first)
+              first = FALSE;
+            else
+              {
+                if (',' == *cp)
+                  ++cp;
+                else
+                  goto error;
+
+                dbuf_append_char (&dbuf, ',');
+              }
+
+
+            while (isspace (*cp))
+              ++cp;
+
+            if (*cp == '_' || isalpha (*cp))
+              {
+                begin = cp++;
+                while (*cp == '_' || isalnum (*cp))
+                  ++cp;
+                dbuf_append (&dbuf, begin, cp - begin);
+              }
+            else
+              goto error;
+
+            while (isspace (*cp))
+              ++cp;
+
+            if ('=' == *cp)
+              dbuf_append_char (&dbuf, *cp++);
+            else
+              goto error;
+
+            while (isspace (*cp))
+              ++cp;
+
+            if (*cp == '_' || isalnum (*cp))
+              {
+                begin = cp++;
+                while (*cp == '_' || isalnum (*cp))
+                  ++cp;
+                dbuf_append (&dbuf, begin, cp - begin);
+              }
+            else
+              goto error;
+
+            while (isspace (*cp))
+              ++cp;
+          }
+        while ('\0' != *cp);
+
+        dbuf_append_str (&dbuf, "\n\tcode");
+        createConfigure(NULL, dbuf_detach_c_str (&dbuf));
+        break;
+
+      error:
+        dbuf_destroy(&dbuf);
+        err = 1;
+      }
+      break;
+
 #if 0
   /* This is an experimental code for #pragma inline
      and is temporarily disabled for 2.5.0 release */
     case P_INLINE:
       {
-        char *tmp = strtok((char *)NULL, WHITECOMMA);
+        char *tmp = strtok ((char *)NULL, WHITECOMMA);
 
-        while(tmp) {
-          addSet(&asmInlineMap, Safe_strdup( tmp ));
-          tmp = strtok((char *)NULL, WHITECOMMA);
-        }
+        while (tmp)
+          {
+            addSet (&asmInlineMap, Safe_strdup ( tmp ));
+            tmp = strtok ((char *)NULL, WHITECOMMA);
+          }
 
-        {
-          char *s;
+          {
+            char *s;
 
-          for(s = setFirstItem(asmInlineMap); s ; s = setNextItem(asmInlineMap)) {
-            debugf("inline asm: `%s'\n", s);
+            for (s = setFirstItem (asmInlineMap); s ; s = setNextItem (asmInlineMap))
+              {
+                debugf ("inline asm: `%s'\n", s);
+              }
           }
-        }
       }
       break;
 #endif  /* 0 */
@@ -463,12 +541,12 @@
       break;
   }
 
-  get_pragma_token(cp, &token);
+  get_pragma_token (cp, &token);
 
-  if (1 == err)
-    werror(W_BAD_PRAGMA_ARGUMENTS, name);
+  if (1 == err || token.type != TOKEN_EOL)
+    werror (W_BAD_PRAGMA_ARGUMENTS, name);
 
-  free_pragma_token(&token);
+  free_pragma_token (&token);
   return processed;
 }
 
@@ -477,6 +555,7 @@
   { "code",    P_CODE,    0, do_pragma },
   { "udata",   P_UDATA,   0, do_pragma },
   { "library", P_LIBRARY, 0, do_pragma },
+  { "config",  P_CONFIG,  0, do_pragma },
 /*{ "inline",  P_INLINE,  0, do_pragma }, */
   { NULL,      0,         0, NULL },
   };
@@ -715,6 +794,8 @@
 static void
 _pic16_finaliseOptions (void)
 {
+  struct dbuf_s dbuf;
+
   port->mem.default_local_map = data;
   port->mem.default_globl_map = data;
 
@@ -732,22 +813,48 @@
   options.intlong_rent = 1;
 #endif
 
-  setMainValue("mcu", pic16->name[2] );
-  addSet(&preArgvSet, Safe_strdup("-D{mcu}"));
+  dbuf_init (&dbuf, 128);
 
-  setMainValue("mcu1", pic16->name[1] );
-  addSet(&preArgvSet, Safe_strdup("-D__{mcu1}"));
+/*
+ * deprecated in sdcc 3.2.0
+ * TODO: should be obsoleted in sdcc 3.3.0 or later
+  if (options.std_sdcc)
+ */
+    {
+      dbuf_append (&dbuf, "-D", sizeof ("-D") - 1);
+      dbuf_append_str (&dbuf, pic16->name[2]);
+      addSet (&preArgvSet, Safe_strdup (dbuf_c_str (&dbuf)));
+    }
+
+  dbuf_set_length (&dbuf, 0);
+  dbuf_append (&dbuf, "-D__", sizeof ("-D__") - 1);
+  dbuf_append_str (&dbuf, pic16->name[1]);
+  addSet (&preArgvSet, Safe_strdup (dbuf_c_str (&dbuf)));
 
-  if (!pic16_options.nodefaultlibs)
     {
-      char devlib[512];
+      char *upperProc, *p1, *p2;
+      int len;
 
+      dbuf_set_length (&dbuf, 0);
+      len = strlen (port->processor);
+      upperProc = Safe_malloc (len);
+      for (p1 = port->processor, p2 = upperProc; *p1; ++p1, ++p2)
+        {
+          *p2 = toupper (*p1);
+        }
+      dbuf_append (&dbuf, "-D__SDCC_PIC", sizeof ("-D__SDCC_PIC") - 1);
+      dbuf_append (&dbuf, upperProc, len);
+      addSet (&preArgvSet, dbuf_detach_c_str (&dbuf));
+    }
+  if (!pic16_options.nodefaultlibs)
+    {
       /* now add the library for the device */
-      sprintf(devlib, "libdev%s.lib", pic16->name[1]);   /* e.g., libdev18f452.lib */
-      addSet(&libFilesSet, Safe_strdup(devlib));
+      dbuf_set_length (&dbuf, 0);
+      dbuf_printf (&dbuf, "libdev%s.lib", pic16->name[1]);   /* e.g., libdev18f452.lib */
+      addSet (&libFilesSet, Safe_strdup (dbuf_c_str (&dbuf)));
 
       /* add the internal SDCC library */
-      addSet(&libFilesSet, Safe_strdup( "libsdcc.lib" ));
+      addSet (&libFilesSet, Safe_strdup ("libsdcc.lib" ));
     }
 
   if (alt_asm && alt_asm[0] != '\0')
@@ -768,29 +875,54 @@
 
   if (options.model == MODEL_SMALL)
     {
-      addSet(&asmOptionsSet, Safe_strdup("-DSDCC_MODEL_SMALL"));
+      addSet (&asmOptionsSet, Safe_strdup ("-DSDCC_MODEL_SMALL"));
     }
   else if (options.model == MODEL_LARGE)
     {
-      char buf[128];
+      char *s, *p;
 
-      addSet(&asmOptionsSet, Safe_strdup("-DSDCC_MODEL_LARGE"));
+      addSet (&asmOptionsSet, Safe_strdup ("-DSDCC_MODEL_LARGE"));
 
-      sprintf(buf, "-D%s -D__%s", pic16->name[2], pic16->name[1]);
-      *(strrchr(buf, 'f')) = 'F';
-      addSet(&asmOptionsSet, Safe_strdup(buf));
+      dbuf_printf (&dbuf, "-D%s -D__%s", pic16->name[2], pic16->name[1]);
+      s = Safe_strdup (dbuf_c_str (&dbuf));
+      /* TODO: borut - why only the first 'f' is converted to upper case?
+       * What if there is an other letter instead 'f'?
+       */
+      if (NULL != (p = strrchr (s, 'f')))
+        *p = 'F';
+      addSet (&asmOptionsSet, s);
     }
 
   if (STACK_MODEL_LARGE)
     {
-      addSet(&preArgvSet, Safe_strdup("-DSTACK_MODEL_LARGE"));
-      addSet(&asmOptionsSet, Safe_strdup("-DSTACK_MODEL_LARGE"));
+/*
+ * deprecated in sdcc 3.2.0
+ * TODO: should be obsoleted in sdcc 3.3.0 or later
+      if (options.std_sdcc)
+ */
+        {
+          addSet (&preArgvSet, Safe_strdup ("-DSTACK_MODEL_LARGE"));
+          addSet (&asmOptionsSet, Safe_strdup ("-DSTACK_MODEL_LARGE"));
+        }
+        addSet (&preArgvSet, Safe_strdup ("-D__STACK_MODEL_LARGE"));
+        addSet (&asmOptionsSet, Safe_strdup ("-D__STACK_MODEL_LARGE"));
     }
   else
     {
-      addSet(&preArgvSet, Safe_strdup("-DSTACK_MODEL_SMALL"));
-      addSet(&asmOptionsSet, Safe_strdup("-DSTACK_MODEL_SMALL"));
+/*
+ * deprecated in sdcc 3.2.0
+ * TODO: should be obsoleted in sdcc 3.3.0 or later
+      if (options.std_sdcc)
+ */
+        {
+          addSet (&preArgvSet, Safe_strdup ("-DSTACK_MODEL_SMALL"));
+          addSet (&asmOptionsSet, Safe_strdup ("-DSTACK_MODEL_SMALL"));
+        }
+      addSet (&preArgvSet, Safe_strdup ("-D__STACK_MODEL_SMALL"));
+      addSet (&asmOptionsSet, Safe_strdup ("-D__STACK_MODEL_SMALL"));
     }
+
+  dbuf_destroy (&dbuf);
 }
 
 
@@ -1065,6 +1197,7 @@
 {
   if (op == RRC
       || op == RLC
+      || op == GETABIT
       /* || op == GETHBIT */ /* GETHBIT doesn't look complete for PIC */
      )
     return TRUE;
@@ -1113,7 +1246,7 @@
   TARGET_ID_PIC16,
   "pic16",
   "MCU PIC16",      /* Target name */
-  "p18f452",        /* Processor */
+  "18f452",        /* Processor */
   {
     pic16glue,
     TRUE,           /* Emit glue around main */
diff -Nru sdcc-3.1.0+dfsg/src/pic16/pcode.c sdcc-3.2.0+dfsg/src/pic16/pcode.c
--- sdcc-3.1.0+dfsg/src/pic16/pcode.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic16/pcode.c	2012-04-07 17:15:16.000000000 +0000
@@ -1,23 +1,23 @@
 /*-------------------------------------------------------------------------
-
   pcode.c - post code generation
 
-   Written By -  Scott Dattalo scott@dattalo.com
-   Ported to PIC16 By -  Martin Dubuc m.dubuc@rogers.com
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  Copyright (C) 2000, Scott Dattalo scott@dattalo.com
+  PIC16 port:
+  Copyright (C) 2002, Martin Dubuc m.dubuc@rogers.com
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 -------------------------------------------------------------------------*/
 
 #include <stdio.h>
@@ -193,6 +193,7 @@
 pCodeOp *pic16_popGetLit2(int, pCodeOp *);
 pCodeOp *pic16_popGetLit(int);
 pCodeOp *pic16_popGetWithString(char *);
+int isBanksel(pCode *pc);
 extern int inWparamList(char *s);
 
 /** data flow optimization helpers **/
@@ -431,7 +432,8 @@
   0,    // second literal operand
   POC_NOP,
   (PCC_W | PCC_REGISTER),   // inCond
-  (PCC_W | PCC_Z | PCC_N) // outCond
+  (PCC_W | PCC_Z | PCC_N), // outCond
+  PCI_MAGIC
 };
 
 pCodeInstruction pic16_pciBC = { // mdubuc - New
@@ -4444,7 +4446,7 @@
 
 /*-----------------------------------------------------------------*/
 /*-----------------------------------------------------------------*/
-void pic16_pCodeConstString(char *name, char *value, unsigned length)
+void pic16_pCodeConstString(char *name, const char *value, unsigned length)
 {
   pBlock *pb;
   char *item;
@@ -6058,14 +6060,12 @@
 static int isBankInstruction(pCode *pc)
 {
   reg_info *reg;
-  int bank = -1;
 
   if(!isPCI(pc))
     return 0;
 
   if( PCI(pc)->op == POC_MOVLB ||
       (( (reg = pic16_getRegFromInstruction(pc)) != NULL) && isBSR_REG(reg))) {
-    bank = PCOL(pc)->lit;
   }
 
   return 1;
@@ -6078,7 +6078,6 @@
 {
 
   pCode *pc;
-  int cur_bank;
 
   if(!isPCFL(pcflow))
     return;
@@ -6092,8 +6091,6 @@
     return;
   }
 
-  cur_bank = -1;
-
   do {
     isBankInstruction(pc);
     pc = pc->next;
@@ -6374,7 +6371,7 @@
                           symbol *tlbl;
                           pCode *pcnext, *pcprev, *npci, *ppc;
                           PIC_OPCODE ipci;
-                          int ofs1=0, ofs2=0, len=0;
+                          int ofs1=0, ofs2=0;
 
                         /* just like 0, but previous was a skip instruction,
                          * so some care should be taken */
@@ -6391,7 +6388,6 @@
 
                                 /* copy info from old pCode */
                                 ofs1 = ofs2 = sizeof( pCode ) + sizeof(PIC_OPCODE);
-                                len = sizeof(pCodeInstruction) - ofs1 - sizeof( char const * const *);
                                 ofs1 += strlen( PCI(pcprev)->mnemonic) + 1;
                                 ofs2 += strlen( PCI(npci)->mnemonic) + 1;
                                 memcpy(&PCI(npci)->from, &PCI(pcprev)->from, (char *)(&(PCI(npci)->pci_magic)) - (char *)(&(PCI(npci)->from)));
@@ -10076,7 +10072,7 @@
   dynstack_t *todo;     /** stack of state_t */
   dynstack_t *done;     /** stack of state_t */
 
-  int firstState, n_defs;
+  int n_defs;
 
   assert (pc && isPCI(pc) && PCI(pc)->pcflow);
   assert (chain);
@@ -10126,7 +10122,7 @@
   /* no definition found in pc's flow preceeding pc */
   todo = newStack ();
   done = newStack ();
-  n_defs = 0; firstState = 1;
+  n_defs = 0;
   stackPush (todo, newState (PCI(pic16_findNextInstruction(pc->pb->pcHead))->pcflow, res));
 
   while (!stackIsEmpty (todo)) {
@@ -10171,54 +10167,58 @@
 
 #else // !FORWARD_FLOW_ANALYSIS
 
-  /* no definition found in pc's flow preceeding pc */
-  todo = newStack ();
-  done = newStack ();
-  n_defs = 0; firstState = 1;
-  stackPush (todo, newState (PCI(pc)->pcflow, res));
-
-  while (!stackIsEmpty (todo)) {
-    state = (state_t *) stackPop (todo);
-    curr = state->flow;
+    {
+      int firstState = 1;
 
-    if (firstState) {
-      firstState = 0;
-      /* only check predecessor flows */
-    } else {
-      /* get (last) definition of sym in this flow */
-      res = defmapFindDef (curr->defmap, sym, NULL);
-    }
+      /* no definition found in pc's flow preceeding pc */
+      todo = newStack ();
+      done = newStack ();
+      n_defs = 0;
+      stackPush (todo, newState (PCI(pc)->pcflow, res));
+
+      while (!stackIsEmpty (todo)) {
+          state = (state_t *) stackPop (todo);
+          curr = state->flow;
+
+          if (firstState) {
+              firstState = 0;
+              /* only check predecessor flows */
+          } else {
+              /* get (last) definition of sym in this flow */
+              res = defmapFindDef (curr->defmap, sym, NULL);
+          }
 
-    if (res) {
-      /* definition found */
-      //fprintf (stderr, "reaching definition for %s @ %p found @ %p (val: %x)\n", strFromSym(sym), pc, res->pc, res->val);
-      if (defmapAddCopyIfNew (chain, res)) n_defs++;
-    } else {
-      /* no definition found -- check predecessor flows */
-      state = newState (NULL, NULL);
-      succ = (pCodeFlowLink *) setFirstItem (curr->from);
-
-      /* if no flow predecessor available -- sym might be uninitialized */
-      if (!succ) {
-        //fprintf (stder, "sym %s might be used uninitialized at %p\n", strFromSym (sym), pc);
-        res = newDefmap (sym, 0xff, 0, 1, NULL, 0, *chain);
-        if (defmapAddCopyIfNew (chain, res)) n_defs++;
-        deleteDefmap (res); res = NULL;
-      }
+          if (res) {
+              /* definition found */
+              //fprintf (stderr, "reaching definition for %s @ %p found @ %p (val: %x)\n", strFromSym(sym), pc, res->pc, res->val);
+              if (defmapAddCopyIfNew (chain, res)) n_defs++;
+          } else {
+              /* no definition found -- check predecessor flows */
+              state = newState (NULL, NULL);
+              succ = (pCodeFlowLink *) setFirstItem (curr->from);
+
+              /* if no flow predecessor available -- sym might be uninitialized */
+              if (!succ) {
+                  //fprintf (stder, "sym %s might be used uninitialized at %p\n", strFromSym (sym), pc);
+                  res = newDefmap (sym, 0xff, 0, 1, NULL, 0, *chain);
+                  if (defmapAddCopyIfNew (chain, res)) n_defs++;
+                  deleteDefmap (res); res = NULL;
+              }
 
-      while (succ) {
-        //fprintf (stderr, "  %p --> %p with %x\n", curr, succ->pcflow, res ? res->val : 0);
-        state->flow = succ->pcflow;
-        state->lastdef = res;
-        if (stateIsNew (state, todo, done)) {
-          stackPush (todo, state);
-          state = newState (NULL, NULL);
-        } // if
-        succ = (pCodeFlowLink *) setNextItem (curr->from);
+              while (succ) {
+                  //fprintf (stderr, "  %p --> %p with %x\n", curr, succ->pcflow, res ? res->val : 0);
+                  state->flow = succ->pcflow;
+                  state->lastdef = res;
+                  if (stateIsNew (state, todo, done)) {
+                      stackPush (todo, state);
+                      state = newState (NULL, NULL);
+                  } // if
+                  succ = (pCodeFlowLink *) setNextItem (curr->from);
+              } // while
+              deleteState (state);
+          }
       } // while
-      deleteState (state);
     }
-  } // while
 
 #endif
 
@@ -10428,7 +10428,6 @@
 /* Check whether a symbol is alive (AFTER pc). */
 static int pic16_isAlive (symbol_t sym, pCode *pc) {
   int mask, visit;
-  defmap_t *map;
   dynstack_t *todo, *done;
   state_t *state;
   pCodeFlow *pcfl;
@@ -10438,7 +10437,6 @@
 
   assert (isPCI(pc));
   pcfl = PCI(pc)->pcflow;
-  map = pcfl->defmap;
 
   todo = newStack ();
   done = newStack ();
@@ -10552,7 +10550,7 @@
  * Returns 0 if no symbol is used later on, 1 otherwise. */
 static int pic16_pCodeIsAlive (pCode *pc) {
   pCodeInstruction *pci;
-  defmap_t *map, *lastpc;
+  defmap_t *map;
   reg_info *checkreg;
 
   /* we can only handle PCIs */
@@ -10638,9 +10636,6 @@
     return 1;
   }
 
-  /* remember first item assigned to pc for later use */
-  lastpc = map;
-
   /* check all symbols being modified by pc */
   while (map && map->pc == pc) {
     if (map->sym == 0) { map = map->next; continue; }
@@ -10830,7 +10825,6 @@
   pCodeInstruction *pci;
   int cond, inCond, outCond;
   int mask = 0xff, smask;
-  int isSpecial, isSpecial2;
   symbol_t sym, sym2;
   char *name;
 
@@ -11002,19 +10996,18 @@
     //fprintf (stderr, "pc %p: def STATUS & %02x\n", pc, smask);
   } // if
 
-  isSpecial = isSpecial2 = 0;
   sym = sym2 = 0;
   if (cond & PCC_REGISTER) {
     name = pic16_get_op (pci->pcop, NULL, 0);
     sym = symFromStr (name);
-    isSpecial = fixupSpecialOperands (sym, mask, mask, pc, newValnum(), &list, inCond & PCC_REGISTER, outCond & PCC_REGISTER);
+    fixupSpecialOperands (sym, mask, mask, pc, newValnum(), &list, inCond & PCC_REGISTER, outCond & PCC_REGISTER);
     //fprintf (stderr, "pc %p: def REG %s(%x) & %02x\n", pc, name, sym, mask);
   }
 
   if (cond & PCC_REGISTER2) {
     name = pic16_get_op2 (pci->pcop, NULL, 0);
     sym2 = symFromStr (name);
-    isSpecial2 = fixupSpecialOperands (sym2, mask, mask, pc, newValnum(), &list, inCond & PCC_REGISTER2, outCond & PCC_REGISTER2);
+    fixupSpecialOperands (sym2, mask, mask, pc, newValnum(), &list, inCond & PCC_REGISTER2, outCond & PCC_REGISTER2);
     //fprintf (stderr, "pc %p: def REG2 %s(%x) & %02x\n", pc, name, sym2, mask);
   }
 
@@ -11332,9 +11325,8 @@
 /* safepCodeUnlink and remove pc from defmap. */
 static int pic16_safepCodeRemove (pCode *pc, char *comment) {
   defmap_t *map, *next, **head;
-  int res, ispci;
+  int res;
 
-  ispci = isPCI(pc);
   map = isPCI(pc) ? PCI(pc)->pcflow->defmap : NULL;
   head = isPCI(pc) ? &PCI(pc)->pcflow->defmap : NULL;
   res = pic16_safepCodeUnlink (pc, comment);
diff -Nru sdcc-3.1.0+dfsg/src/pic16/pcodepeep.c sdcc-3.2.0+dfsg/src/pic16/pcodepeep.c
--- sdcc-3.1.0+dfsg/src/pic16/pcodepeep.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic16/pcodepeep.c	2012-01-26 17:33:28.000000000 +0000
@@ -780,13 +780,10 @@
 {
   parsedPattern *p = pp;
   int opcode;
-  int dest;  // or could be bit position in the register
 
   pCodeInstruction *pci=NULL;
   pCodeOp *pcosubtype=NULL;
 
-  dest = cvt_extract_destination(&p[3]);
-
   DFPRINTF((stderr,"altpat_mnem3 %s var %s bit (%d)\n",
           p->pct[0].tok.s,
           p[1].pct[0].tok.s,
@@ -838,13 +835,10 @@
 {
   parsedPattern *p = pp;
   int opcode;
-  int dest;  // or could be bit position in the register
 
   pCodeInstruction *pci=NULL;
   pCodeOp *pcosubtype=NULL;
 
-  dest = cvt_extract_destination(&p[3]);
-
   DFPRINTF((stderr,"altpat_mnem4 %s fsr %d source %s\n",
           p->pct[0].tok.s,
           p[1].pct[0].tok.n,
@@ -890,13 +884,10 @@
 {
   parsedPattern *p = pp;
   int opcode;
-  int dest;  // or could be bit position in the register
 
   pCodeInstruction *pci=NULL;
   pCodeOp *pcosubtype=NULL;
 
-  dest = cvt_extract_destination(&p[3]);
-
   DFPRINTF((stderr,"altpat_mnem4a %s fsr %d value 0x%02x\n",
           p->pct[0].tok.s,
           p[1].pct[0].tok.n,
@@ -1199,21 +1190,12 @@
 #endif
 
   {
-    int lparsedPatIdx=0;
+    int lparsedPatIdx = 0;
     int lpcpIdx;
-    int ltokIdx =0;
+    int ltokIdx = 0;
     int matching = 0;
-    int j=0;
-    int k=0;
-
-    char * cPmnem  = NULL;     // Pointer to non-wild mnemonic (if any)
-    char * cP1stop = NULL;
-    char * cP2ndop = NULL;
-
-    //pCodeOp *pcl   = NULL;       // Storage for a label
-    //pCodeOp *pco1  = NULL;       // 1st operand
-    //pCodeOp *pco2  = NULL;       // 2nd operand
-    //pCode   *pc    = NULL;       // Mnemonic
+    int j = 0;
+    int k = 0;
 
     typedef enum {
       PS_START,
@@ -1254,12 +1236,10 @@
             case PS_START:
             case PS_HAVE_LABEL:
               DFPRINTF((stderr,"  mnem\n"));
-              cPmnem = tokArr[ltokIdx].tok.s;
               state = PS_HAVE_MNEM;
               break;
             case PS_HAVE_MNEM:
               DFPRINTF((stderr,"  1st operand\n"));
-              cP1stop = tokArr[ltokIdx].tok.s;
               //pco1 = pic16_newpCodeOp(NULL,PO_GPR_REGISTER);
               state = PS_HAVE_1OPERAND;
               break;
@@ -1268,7 +1248,6 @@
               break;
             case PS_HAVE_COMMA:
               DFPRINTF((stderr,"  2 operands\n"));
-              cP2ndop = tokArr[ltokIdx].tok.s;
               break;
             case PS_HAVE_2OPERANDS:
               break;
@@ -1607,21 +1586,22 @@
     //return; // debug ... don't want to go through all the rules yet
   }
 
-  {
-    pCodePeep *peepBlock;
-    DLList *peeprules;
-
-    peeprules = (DLList *)peepSnippets;
-    //fprintf(stderr,"target rules\n");
-    while(peeprules) {
-      //fprintf(stderr,"   rule:\n");
-      peepBlock = ((pCodePeepSnippets*)peeprules)->peep;
-      //pic16_printpBlock(stderr, peepBlock->target.pb);
-      peeprules = peeprules->next;
-    }
-    //fprintf(stderr," ... done\n");
-  }
+  if (0)
+    {
+      pCodePeep *peepBlock;
+      DLList *peeprules;
 
+      peeprules = (DLList *)peepSnippets;
+      fprintf(stderr,"target rules\n");
+      while (peeprules)
+        {
+          fprintf(stderr,"   rule:\n");
+          peepBlock = ((pCodePeepSnippets*)peeprules)->peep;
+          pic16_printpBlock(stderr, peepBlock->target.pb);
+          peeprules = peeprules->next;
+        } // while
+      fprintf(stderr," ... done\n");
+    } // if
 }
 #if 0
 static void printpCodeString(FILE *of, pCode *pc, int max)
diff -Nru sdcc-3.1.0+dfsg/src/pic16/pcoderegs.c sdcc-3.2.0+dfsg/src/pic16/pcoderegs.c
--- sdcc-3.1.0+dfsg/src/pic16/pcoderegs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic16/pcoderegs.c	2012-01-26 17:33:28.000000000 +0000
@@ -156,9 +156,7 @@
  *-----------------------------------------------------------------*/
 static void pCodeRegMapLiveRangesInFlow(pCodeFlow *pcfl)
 {
-
   pCode *pc=NULL;
-  pCode *pcprev=NULL;
 
   reg_info *reg;
 
@@ -168,65 +166,60 @@
 
   pc = pic16_findNextInstruction(pcfl->pc.next);
 
-  while(pic16_isPCinFlow(pc,PCODE(pcfl))) {
-
-
-    reg = pic16_getRegFromInstruction(pc);
-
-    if(reg && (reg->type != REG_TMP)) {
+  while (pic16_isPCinFlow(pc,PCODE(pcfl)))
+    {
+      reg = pic16_getRegFromInstruction(pc);
 
+      if (reg && (reg->type != REG_TMP))
+        {
 #if 0
-      fprintf(stderr, "reg= %p\n", reg);
-      fprintf(stderr, "flow seq %d, inst seq %d  %s  ",PCODE(pcfl)->seq,pc->seq,reg->name);
-      fprintf(stderr, "addr = 0x%03x, type = %d  rIdx=0x%03x ",
-      	      reg->address,reg->type,reg->rIdx);
-      fprintf(stderr, "command = %s\n", PCI(pc)->mnemonic);
-      	      
+          fprintf(stderr, "reg= %p\n", reg);
+          fprintf(stderr, "flow seq %d, inst seq %d  %s  ",PCODE(pcfl)->seq,pc->seq,reg->name);
+          fprintf(stderr, "addr = 0x%03x, type = %d  rIdx=0x%03x ",
+                  reg->address,reg->type,reg->rIdx);
+          fprintf(stderr, "command = %s\n", PCI(pc)->mnemonic);
 #endif
 
-//      fprintf(stderr, "%s:%d: trying to get first operand from pCode reg= %s\n", __FILE__, __LINE__, reg->name);
-      addSetIfnotP(& (PCFL(pcfl)->registers), reg);
+          //fprintf(stderr, "%s:%d: trying to get first operand from pCode reg= %s\n", __FILE__, __LINE__, reg->name);
+          addSetIfnotP(& (PCFL(pcfl)->registers), reg);
 
-      if((PCC_REGISTER | PCC_LITERAL) & PCI(pc)->inCond)
-	addSetIfnotP(& (reg->reglives.usedpFlows), pcfl);
+          if ((PCC_REGISTER | PCC_LITERAL) & PCI(pc)->inCond)
+            addSetIfnotP(& (reg->reglives.usedpFlows), pcfl);
 
-      if(PCC_REGISTER & PCI(pc)->outCond)
-	addSetIfnotP(& (reg->reglives.assignedpFlows), pcfl);
+          if (PCC_REGISTER & PCI(pc)->outCond)
+            addSetIfnotP(& (reg->reglives.assignedpFlows), pcfl);
 
-	addSetIfnotP(& (reg->reglives.usedpCodes), pc);
+          addSetIfnotP(& (reg->reglives.usedpCodes), pc);
 
-//    reg->wasUsed=1;
+          //reg->wasUsed=1;
 
 #if 1
-	/* check to see if this pCode has 2 memory operands,
-	   and set up the second operand too */
-	if(PCI(pc)->is2MemOp) {
-			reg = pic16_getRegFromInstruction2(pc);
-			if(reg) {
-//				fprintf(stderr, "%s:%d: trying to get second operand from pCode reg= %s\n", __FILE__, __LINE__, reg->name);
-				addSetIfnotP(& (PCFL(pcfl)->registers), reg);
-
-				if((PCC_REGISTER | PCC_LITERAL) & PCI(pc)->inCond)
-					addSetIfnotP(& (reg->reglives.usedpFlows), pcfl);
-					
-				if((PCC_REGISTER | PCC_REGISTER2) & PCI(pc)->outCond)
-					addSetIfnotP(& (reg->reglives.assignedpFlows), pcfl);
-			
-				addSetIfnotP(& (reg->reglives.usedpCodes), pc);
-				
-//				reg->wasUsed=1;
-			}
-	}
+          /* check to see if this pCode has 2 memory operands,
+             and set up the second operand too */
+          if (PCI(pc)->is2MemOp)
+            {
+              reg = pic16_getRegFromInstruction2(pc);
+              if (reg)
+                {
+                  //fprintf(stderr, "%s:%d: trying to get second operand from pCode reg= %s\n", __FILE__, __LINE__, reg->name);
+                  addSetIfnotP(& (PCFL(pcfl)->registers), reg);
+
+                  if ((PCC_REGISTER | PCC_LITERAL) & PCI(pc)->inCond)
+                    addSetIfnotP(& (reg->reglives.usedpFlows), pcfl);
+
+                  if ((PCC_REGISTER | PCC_REGISTER2) & PCI(pc)->outCond)
+                    addSetIfnotP(& (reg->reglives.assignedpFlows), pcfl);
+
+                  addSetIfnotP(& (reg->reglives.usedpCodes), pc);
+
+                  //reg->wasUsed=1;
+                } // if
+            } // if
 #endif
+        } // if
 
-    }
-
-
-    pcprev = pc;
-    pc = pic16_findNextInstruction(pc->next);
-
-  }
-
+      pc = pic16_findNextInstruction(pc->next);
+    } // while
 }
 
 /*-----------------------------------------------------------------*
diff -Nru sdcc-3.1.0+dfsg/src/pic16/pic16.vcxproj sdcc-3.2.0+dfsg/src/pic16/pic16.vcxproj
--- sdcc-3.1.0+dfsg/src/pic16/pic16.vcxproj	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic16/pic16.vcxproj	2012-03-18 13:40:40.000000000 +0000
@@ -190,10 +190,12 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="peeph.def">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f ../SDCCpeeph.awk %(FullPath) &gt;peeph.rul</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f ../SDCCpeeph.awk %(FullPath) &gt;peeph.rul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f ../SDCCpeeph.awk %(Identity) &gt;peeph.rul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f ../SDCCpeeph.awk %(Identity) &gt;peeph.rul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">peeph.rul;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">peeph.rul;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Peephole Rule: peeph.rul</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Peephole Rule: peeph.rul</Message>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff -Nru sdcc-3.1.0+dfsg/src/pic16/ralloc.c sdcc-3.2.0+dfsg/src/pic16/ralloc.c
--- sdcc-3.1.0+dfsg/src/pic16/ralloc.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/pic16/ralloc.c	2012-06-05 09:03:12.000000000 +0000
@@ -311,7 +311,7 @@
                 case SEND:              return "SEND";
                 case DUMMY_READ_VOLATILE:       return "DUMMY_READ_VOLATILE";
         }
-        sprintf (buffer, "unkown op %d %c", op, op & 0xff);
+        sprintf (buffer, "unknown op %d %c", op, op & 0xff);
 
   return buffer;
 }
@@ -844,14 +844,15 @@
         reg = pic16_dirregWithName(name);
 
         if(!reg) {
-          int address = 0;
           int regtype = REG_GPR;
 
                 /* if this is at an absolute address, then get the address. */
-                if (SPEC_ABSA ( OP_SYM_ETYPE(op)) ) {
-                        address = SPEC_ADDR ( OP_SYM_ETYPE(op));
-//                      fprintf(stderr,"reg %s is at an absolute address: 0x%03x\n",name,address);
-                }
+                if (0 && SPEC_ABSA ( OP_SYM_ETYPE(op)) )
+                  {
+                    int address = 0;
+                    address = SPEC_ADDR ( OP_SYM_ETYPE(op));
+                    fprintf(stderr,"reg %s is at an absolute address: 0x%03x\n",name,address);
+                  }
 
                 /* Register wasn't found in hash, so let's create
                  * a new one and put it in the hash table AND in the
@@ -3755,8 +3756,10 @@
 static void
 packForPush (iCode * ic, eBBlock * ebp)
 {
-  iCode *dic;
+  iCode *dic, *lic;
   const char *iLine;
+  bitVect *dbv;
+  int disallowHiddenAssignment = 0;
 
   debugLog ("%s\n", __FUNCTION__);
   if (ic->op != IPUSH || !IS_ITEMP (IC_LEFT (ic)))
@@ -3797,7 +3800,41 @@
   if((OP_LIVEFROM(IC_RIGHT(dic))==0) || (OP_LIVETO(IC_RIGHT(dic))==0))
     return;
 //  debugf2("IC_RIGHT(dic): from %d to %d\n", OP_LIVEFROM(IC_RIGHT(dic)), OP_LIVETO(IC_RIGHT(dic)));
+    
+  /* If the defining iCode is outside of this block, we need to recompute */
+  /* ebp (see the mcs51 version of packForPush), but we weren't passed    */
+  /* enough data to do that. Just bail out instead if that happens. */
+  if (dic->seq < ebp->fSeq)
+    return;
+
+  if (IS_SYMOP (IC_RIGHT (dic)))
+    {
+      if (IC_RIGHT (dic)->isvolatile)
+        return;
+
+      if (OP_SYMBOL (IC_RIGHT (dic))->addrtaken || isOperandGlobal (IC_RIGHT (dic)))
+        disallowHiddenAssignment = 1;
 
+      /* make sure the right side does not have any definitions
+         inbetween */
+      dbv = OP_DEFS (IC_RIGHT (dic));
+      for (lic = ic; lic && lic != dic; lic = lic->prev)
+        {
+          if (bitVectBitValue (dbv, lic->key))
+            return;
+          if (disallowHiddenAssignment && (lic->op == CALL || lic->op == PCALL || POINTER_SET (lic)))
+            return;
+        }
+      /* make sure they have the same type */
+      if (IS_SPEC (operandType (IC_LEFT (ic))))
+        {
+          sym_link *itype = operandType (IC_LEFT (ic));
+          sym_link *ditype = operandType (IC_RIGHT (dic));
+
+          if (SPEC_USIGN (itype) != SPEC_USIGN (ditype) || SPEC_LONG (itype) != SPEC_LONG (ditype))
+            return;
+        }
+    }
 
 
   /*
@@ -3809,6 +3846,16 @@
     {
       /* we now we know that it has one & only one def & use
          and the that the definition is an assignment */
+
+      /* extend the live range of replaced operand if needed */
+      if (IS_SYMOP (IC_RIGHT (dic)) && OP_SYMBOL (IC_RIGHT (dic))->liveTo < ic->seq)
+        {
+          OP_SYMBOL (IC_RIGHT (dic))->liveTo = ic->seq;
+        }
+      bitVectUnSetBit (OP_SYMBOL (IC_RESULT (dic))->defs, dic->key);
+      if (IS_ITEMP (IC_RIGHT (dic)))
+        OP_USES (IC_RIGHT (dic)) = bitVectSetBit (OP_USES (IC_RIGHT (dic)), ic->key);
+
       IC_LEFT (ic) = IC_RIGHT (dic);
 
       iLine = printILine(dic);
@@ -4401,22 +4448,20 @@
     pic16_packRegisters (ebbs[i]);
 
 
-  {
-    reg_info *reg;
-    int hkey;
+  if (0)
+    {
+      reg_info *reg;
+      int hkey;
 
-    debugLog("dir registers allocated so far:\n");
-    reg = hTabFirstItem(dynDirectRegNames, &hkey);
+      debugLog("dir registers allocated so far:\n");
+      reg = hTabFirstItem(dynDirectRegNames, &hkey);
 
-#if 0
-    while(reg) {
-      debugLog("  -- #%d reg = %s  key %d, rIdx = %d, size %d\n",i++,reg->name,hkey, reg->rIdx,reg->size);
-//      fprintf(stderr, "  -- #%d reg = %s  key %d, rIdx = %d, size %d\n",i++,reg->name,hkey, reg->rIdx,reg->size);
-      reg = hTabNextItem(dynDirectRegNames, &hkey);
+      while(reg) {
+          debugLog("  -- #%d reg = %s  key %d, rIdx = %d, size %d\n",i++,reg->name,hkey, reg->rIdx,reg->size);
+          //      fprintf(stderr, "  -- #%d reg = %s  key %d, rIdx = %d, size %d\n",i++,reg->name,hkey, reg->rIdx,reg->size);
+          reg = hTabNextItem(dynDirectRegNames, &hkey);
+      }
     }
-#endif
-
-  }
 
   /* liveranges probably changed by register packing
      so we compute them again */
diff -Nru sdcc-3.1.0+dfsg/src/port.h sdcc-3.2.0+dfsg/src/port.h
--- sdcc-3.1.0+dfsg/src/port.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/port.h	2012-06-02 17:22:53.000000000 +0000
@@ -22,28 +22,31 @@
 #define TARGET_ID_HC08     11
 #define TARGET_ID_Z180     12
 #define TARGET_ID_R2K      13
+#define TARGET_ID_R3KA     14
+#define TARGET_ID_S08      15
 
 /* Macro to test the target we are compiling for.
    Can only be used after SDCCmain has defined the port
  */
 #define TARGET_IS_MCS51    (port->id == TARGET_ID_MCS51)
-#define TARGET_IS_Z80      (port->id == TARGET_ID_Z80)
-#define TARGET_IS_Z180     (port->id == TARGET_ID_Z180)
-#define TARGET_IS_GBZ80    (port->id == TARGET_ID_GBZ80)
 #define TARGET_IS_AVR      (port->id == TARGET_ID_AVR)
 #define TARGET_IS_DS390    (port->id == TARGET_ID_DS390)
 #define TARGET_IS_DS400    (port->id == TARGET_ID_DS400)
 #define TARGET_IS_PIC14    (port->id == TARGET_ID_PIC14)
 #define TARGET_IS_PIC16    (port->id == TARGET_ID_PIC16)
 #define TARGET_IS_XA51     (port->id == TARGET_ID_XA51)
-#define TARGET_IS_HC08     (port->id == TARGET_ID_HC08)
+#define TARGET_IS_Z80      (port->id == TARGET_ID_Z80)
+#define TARGET_IS_Z180     (port->id == TARGET_ID_Z180)
 #define TARGET_IS_R2K      (port->id == TARGET_ID_R2K)
+#define TARGET_IS_R3KA     (port->id == TARGET_ID_R3KA)
+#define TARGET_IS_GBZ80    (port->id == TARGET_ID_GBZ80)
+#define TARGET_IS_HC08     (port->id == TARGET_ID_HC08)
+#define TARGET_IS_S08      (port->id == TARGET_ID_S08)
 
 #define TARGET_MCS51_LIKE  (TARGET_IS_MCS51 || TARGET_IS_DS390 || TARGET_IS_DS400)
-#define TARGET_Z80_LIKE    (TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_GBZ80 || TARGET_IS_R2K)
-#define TARGET_IS_RABBIT   (TARGET_IS_R2K)
-
-#define TARGET_HC08_LIKE   (TARGET_IS_HC08)
+#define TARGET_Z80_LIKE    (TARGET_IS_Z80 || TARGET_IS_Z180 || TARGET_IS_GBZ80 || TARGET_IS_R2K || TARGET_IS_R3KA)
+#define TARGET_IS_RABBIT   (TARGET_IS_R2K || TARGET_IS_R3KA)
+#define TARGET_HC08_LIKE   (TARGET_IS_HC08 || TARGET_IS_S08)
 #define TARGET_PIC_LIKE    (TARGET_IS_PIC14 || TARGET_IS_PIC16)
 /* is using sdas / sdld assembler / linker */
 #define IS_SDASLD          (TARGET_Z80_LIKE || TARGET_MCS51_LIKE || TARGET_HC08_LIKE)
@@ -398,7 +401,10 @@
 extern PORT z180_port;
 #endif
 #if !OPT_DISABLE_R2K
-extern PORT r2k_port;  /* rabbit 2000/3000 */
+extern PORT r2k_port;  /* Rabbit 2000/3000 */
+#endif
+#if !OPT_DISABLE_R3KA
+extern PORT r3ka_port; /* Rabbit 3000A */
 #endif
 #if !OPT_DISABLE_GBZ80
 extern PORT gbz80_port;
@@ -427,5 +433,8 @@
 #if !OPT_DISABLE_HC08
 extern PORT hc08_port;
 #endif
+#if !OPT_DISABLE_S08
+extern PORT s08_port;
+#endif
 
 #endif /* PORT_INCLUDE */
diff -Nru sdcc-3.1.0+dfsg/src/regression/Makefile sdcc-3.2.0+dfsg/src/regression/Makefile
--- sdcc-3.1.0+dfsg/src/regression/Makefile	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/regression/Makefile	2012-06-25 07:07:00.000000000 +0000
@@ -68,7 +68,7 @@
 CFLAGS += -Wl,-q
 CFLAGS += -Wl,--map
 CFLAGS += -I $(SDCC_SRC)/device/include/$(DIR) -I $(SDCC_SRC)/device/non-free/include/$(DIR)
-CFLAGS += -L $(SDCC_BIN)/device/lib/$(DIR)/bin -L $(SDCC_BIN)/device/non-free/lib/$(DIR)/bin
+CFLAGS += -L $(SDCC_BIN)/device/lib/build/$(DIR) -L $(SDCC_BIN)/device/non-free/lib/build/$(DIR)
 #CFLAGS += --no-pcode-opt
 #CFLAGS += -V
 
diff -Nru sdcc-3.1.0+dfsg/src/sdcc.vcxproj sdcc-3.2.0+dfsg/src/sdcc.vcxproj
--- sdcc-3.1.0+dfsg/src/sdcc.vcxproj	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/sdcc.vcxproj	2012-06-28 14:09:28.000000000 +0000
@@ -0,0 +1,525 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{F9485499-151B-4886-935C-7D687C4A0549}</ProjectGuid>
+    <ProjectName>sdcc</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin_vc\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin_vc\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">sdcc</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">sdcc</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Debug/src.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;..;..\support\util;C:\Program Files\boost\boost_1_47;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\Debug/src.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+      <ObjectFileName>.\Debug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>..\bin_vc\$(TargetFileName)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/sdcc.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>C:\Program Files\boost\boost_1_44\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <StackReserveSize>0x2000000</StackReserveSize>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/src.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/src.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>.;..;..\support\util;C:\Program Files\boost\boost_1_47;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/src.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>..\bin_vc\$(TargetFileName)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>C:\Program Files\boost\boost_1_44\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <StackReserveSize>0x2000000</StackReserveSize>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/src.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="cdbFile.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\support\util\dbuf.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\support\util\dbuf_string.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\support\util\NewAlloc.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCasm.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCast.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCBBlock.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCbitv.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCcflow.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCcse.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCdebug.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCdflow.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCdwarf2.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCerr.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCgen.c" />
+    <ClCompile Include="SDCCglue.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCChasht.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCicode.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCClabel.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCClex.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCloop.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCClrange.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCmacro.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCmain.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCmem.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCnaddr.cc" />
+    <ClCompile Include="SDCCopt.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCpeeph.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCptropt.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCset.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCsymt.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCsystem.c" />
+    <ClCompile Include="SDCCutil.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCval.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="SDCCy.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="regression\add.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="regression\arrays.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="regression\b.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="regression\bool1.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="regression\call1.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="regression\compare.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="regression\compare2.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="regression\for.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="regression\pointer1.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="regression\struct1.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="regression\sub.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="regression\while.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\support\scripts\resource.rc">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="SDCC.lex">
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">flex -8 -f -oSDCClex.c SDCC.lex</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">SDCCy.h;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">SDCClex.c;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">flex -8 -f -oSDCClex.c SDCC.lex</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">SDCCy.h;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">SDCClex.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Lexer: SDCClex.c</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Lexer: SDCClex.c</Message>
+    </CustomBuild>
+    <None Include="..\support\scripts\sdcc.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="common.h" />
+    <ClInclude Include="..\support\util\dbuf.h" />
+    <ClInclude Include="..\support\util\dbuf_string.h" />
+    <ClInclude Include="..\support\util\newalloc.h" />
+    <ClInclude Include="port.h" />
+    <ClInclude Include="..\sdcc_vc.h" />
+    <ClInclude Include="SDCCargs.h" />
+    <ClInclude Include="SDCCasm.h" />
+    <ClInclude Include="SDCCast.h" />
+    <ClInclude Include="SDCCBBlock.h" />
+    <ClInclude Include="SDCCbitv.h" />
+    <ClInclude Include="SDCCcflow.h" />
+    <ClInclude Include="SDCCcse.h" />
+    <ClInclude Include="SDCCdebug.h" />
+    <ClInclude Include="SDCCdflow.h" />
+    <ClInclude Include="SDCCdwarf2.h" />
+    <ClInclude Include="SDCCerr.h" />
+    <ClInclude Include="SDCCgen.h" />
+    <ClInclude Include="SDCCglobl.h" />
+    <ClInclude Include="SDCCglue.h" />
+    <ClInclude Include="SDCChasht.h" />
+    <ClInclude Include="SDCCicode.h" />
+    <ClInclude Include="SDCClabel.h" />
+    <ClInclude Include="SDCCloop.h" />
+    <ClInclude Include="SDCClrange.h" />
+    <ClInclude Include="SDCCmacro.h" />
+    <ClInclude Include="SDCCmem.h" />
+    <ClInclude Include="SDCCnaddr.hpp" />
+    <ClInclude Include="SDCCopt.h" />
+    <ClInclude Include="SDCCpeeph.h" />
+    <ClInclude Include="SDCCptropt.h" />
+    <ClInclude Include="SDCCralloc.hpp" />
+    <ClInclude Include="SDCCset.h" />
+    <ClInclude Include="SDCCsymt.h" />
+    <ClInclude Include="SDCCsystem.h" />
+    <ClInclude Include="SDCCtree_dec.hpp" />
+    <ClInclude Include="SDCCutil.h" />
+    <ClInclude Include="SDCCval.h" />
+    <ClInclude Include="sdccy.h" />
+    <ClInclude Include="spawn.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\config.vcxproj">
+      <Project>{2f87ba6f-8ee1-48d0-9817-6ba30bddb3c1}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="ds390\ds390.vcxproj">
+      <Project>{14a8a991-bad6-49eb-84fb-6f6cf12b436d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="hc08\hc08.vcxproj">
+      <Project>{6fa87476-0fab-4518-9845-12efebbce03f}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="mcs51\mcs51.vcxproj">
+      <Project>{9facdb81-be66-42d0-95f5-ea2fa3b09065}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="pic14\pic14.vcxproj">
+      <Project>{b96e942e-39f5-4c7c-97fd-a095de6847c6}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="pic16\pic16.vcxproj">
+      <Project>{7e09a25e-1c9d-438d-85db-8535f134890d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="z80\z80.vcxproj">
+      <Project>{7444a72f-c7c6-4f90-9a62-2d46240b52db}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff -Nru sdcc-3.1.0+dfsg/src/sdcc.vcxproj.filters sdcc-3.2.0+dfsg/src/sdcc.vcxproj.filters
--- sdcc-3.1.0+dfsg/src/sdcc.vcxproj.filters	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/sdcc.vcxproj.filters	2012-03-30 20:25:20.000000000 +0000
@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{d62eee26-dbd0-4367-9726-8be6e7a7de74}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{542d6692-b312-430e-b08c-25d50a679c72}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+    <Filter Include="Regression Test">
+      <UniqueIdentifier>{294f3d1a-92d6-4c47-884a-62ffa390e878}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Custom Build">
+      <UniqueIdentifier>{ffdab0d0-444f-4892-8854-39c4adee434b}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="cdbFile.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\support\util\dbuf.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\support\util\dbuf_string.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\support\util\NewAlloc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCasm.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCast.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCBBlock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCbitv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCcflow.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCcse.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCdebug.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCdflow.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCdwarf2.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCerr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCglue.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCChasht.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCicode.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCClabel.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCloop.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCClrange.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCmacro.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCmain.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCmem.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCopt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCpeeph.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCptropt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCset.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCsymt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCsystem.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCutil.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCval.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="regression\add.c">
+      <Filter>Regression Test</Filter>
+    </ClCompile>
+    <ClCompile Include="regression\arrays.c">
+      <Filter>Regression Test</Filter>
+    </ClCompile>
+    <ClCompile Include="regression\b.c">
+      <Filter>Regression Test</Filter>
+    </ClCompile>
+    <ClCompile Include="regression\bool1.c">
+      <Filter>Regression Test</Filter>
+    </ClCompile>
+    <ClCompile Include="regression\call1.c">
+      <Filter>Regression Test</Filter>
+    </ClCompile>
+    <ClCompile Include="regression\compare.c">
+      <Filter>Regression Test</Filter>
+    </ClCompile>
+    <ClCompile Include="regression\compare2.c">
+      <Filter>Regression Test</Filter>
+    </ClCompile>
+    <ClCompile Include="regression\for.c">
+      <Filter>Regression Test</Filter>
+    </ClCompile>
+    <ClCompile Include="regression\pointer1.c">
+      <Filter>Regression Test</Filter>
+    </ClCompile>
+    <ClCompile Include="regression\struct1.c">
+      <Filter>Regression Test</Filter>
+    </ClCompile>
+    <ClCompile Include="regression\sub.c">
+      <Filter>Regression Test</Filter>
+    </ClCompile>
+    <ClCompile Include="regression\while.c">
+      <Filter>Regression Test</Filter>
+    </ClCompile>
+    <ClCompile Include="sdcclex.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCnaddr.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SDCCgen.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\support\scripts\resource.rc">
+      <Filter>Source Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\support\scripts\sdcc.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\support\util\dbuf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\support\util\dbuf_string.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\support\util\newalloc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="port.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\sdcc_vc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCasm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCast.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCBBlock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCbitv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCcflow.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCcse.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCdflow.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCdwarf2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCerr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCglobl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCglue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCChasht.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCicode.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCClabel.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCloop.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCClrange.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCmem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCopt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCpeeph.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCptropt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCset.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCsymt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCsystem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCval.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="sdccy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="spawn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCnaddr.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCralloc.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCtree_dec.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCargs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCmacro.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCdebug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SDCCgen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="SDCC.lex">
+      <Filter>Custom Build</Filter>
+    </CustomBuild>
+    <CustomBuild Include="SDCC.y">
+      <Filter>Custom Build</Filter>
+    </CustomBuild>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff -Nru sdcc-3.1.0+dfsg/src/src.vcxproj sdcc-3.2.0+dfsg/src/src.vcxproj
--- sdcc-3.1.0+dfsg/src/src.vcxproj	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/src.vcxproj	1970-01-01 00:00:00.000000000 +0000
@@ -1,518 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F9485499-151B-4886-935C-7D687C4A0549}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin_vc\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin_vc\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">sdcc</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">sdcc</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <TypeLibraryName>.\Debug/src.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\support\util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\Debug/src.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
-      <ObjectFileName>.\Debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>..\bin_vc\$(TargetFileName)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\Debug/sdcc.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalLibraryDirectories>C:\Program Files\boost\boost_1_44\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug/src.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <TypeLibraryName>.\Release/src.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;..;..\support\util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\Release/src.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
-      <ObjectFileName>.\Release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>..\bin_vc\$(TargetFileName)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalLibraryDirectories>C:\Program Files\boost\boost_1_44\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release/src.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="cdbFile.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\support\util\dbuf.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\support\util\dbuf_string.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\support\util\NewAlloc.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCasm.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCast.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCBBlock.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCbitv.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCcflow.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCcse.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCdebug.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCdflow.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCdwarf2.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCerr.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCglue.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCChasht.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCicode.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCClabel.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCClex.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCloop.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCClrange.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCmacro.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCmain.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCmem.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCopt.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCpeeph.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCptropt.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCset.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCsymt.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCsystem.c" />
-    <ClCompile Include="SDCCutil.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="SDCCval.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="sdccy.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="regression\add.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="regression\arrays.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="regression\b.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="regression\bool1.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="regression\call1.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="regression\compare.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="regression\compare2.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="regression\for.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="regression\pointer1.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="regression\struct1.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="regression\sub.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="regression\while.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\support\scripts\resource.rc">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="SDCC.lex">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">flex  -osdcclex.c sdcc.lex</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">sdccy.h;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">SDCClex.c;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">flex  -osdcclex.c sdcc.lex</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">sdccy.h;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">SDCClex.c;%(Outputs)</Outputs>
-    </CustomBuild>
-    <None Include="..\support\scripts\sdcc.ico" />
-    <CustomBuild Include="SDCC.y">
-      <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bison  -d -v -o sdccy.c sdcc.y</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bison  -d -v -o sdccy.c sdcc.y</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">sdccy.c;sdccy.h</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">sdccy.c;sdccy.h</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="common.h" />
-    <ClInclude Include="..\support\util\dbuf.h" />
-    <ClInclude Include="..\support\util\dbuf_string.h" />
-    <ClInclude Include="..\support\util\newalloc.h" />
-    <ClInclude Include="port.h" />
-    <ClInclude Include="..\sdcc_vc.h" />
-    <ClInclude Include="SDCCasm.h" />
-    <ClInclude Include="SDCCast.h" />
-    <ClInclude Include="SDCCBBlock.h" />
-    <ClInclude Include="SDCCbitv.h" />
-    <ClInclude Include="SDCCcflow.h" />
-    <ClInclude Include="SDCCcse.h" />
-    <ClInclude Include="SDCCdflow.h" />
-    <ClInclude Include="SDCCdwarf2.h" />
-    <ClInclude Include="SDCCerr.h" />
-    <ClInclude Include="SDCCglobl.h" />
-    <ClInclude Include="SDCCglue.h" />
-    <ClInclude Include="SDCChasht.h" />
-    <ClInclude Include="SDCCicode.h" />
-    <ClInclude Include="SDCClabel.h" />
-    <ClInclude Include="SDCCloop.h" />
-    <ClInclude Include="SDCClrange.h" />
-    <ClInclude Include="SDCCmem.h" />
-    <ClInclude Include="SDCCopt.h" />
-    <ClInclude Include="SDCCpeeph.h" />
-    <ClInclude Include="SDCCptropt.h" />
-    <ClInclude Include="SDCCset.h" />
-    <ClInclude Include="SDCCsymt.h" />
-    <ClInclude Include="SDCCsystem.h" />
-    <ClInclude Include="SDCCutil.h" />
-    <ClInclude Include="SDCCval.h" />
-    <ClInclude Include="sdccy.h" />
-    <ClInclude Include="spawn.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\config.vcxproj">
-      <Project>{2f87ba6f-8ee1-48d0-9817-6ba30bddb3c1}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="ds390\ds390.vcxproj">
-      <Project>{14a8a991-bad6-49eb-84fb-6f6cf12b436d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="hc08\hc08.vcxproj">
-      <Project>{6fa87476-0fab-4518-9845-12efebbce03f}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="mcs51\mcs51.vcxproj">
-      <Project>{9facdb81-be66-42d0-95f5-ea2fa3b09065}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="pic14\pic14.vcxproj">
-      <Project>{b96e942e-39f5-4c7c-97fd-a095de6847c6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="pic16\pic16.vcxproj">
-      <Project>{7e09a25e-1c9d-438d-85db-8535f134890d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="z80\z80.vcxproj">
-      <Project>{7444a72f-c7c6-4f90-9a62-2d46240b52db}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff -Nru sdcc-3.1.0+dfsg/src/src.vcxproj.filters sdcc-3.2.0+dfsg/src/src.vcxproj.filters
--- sdcc-3.1.0+dfsg/src/src.vcxproj.filters	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/src.vcxproj.filters	1970-01-01 00:00:00.000000000 +0000
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{d62eee26-dbd0-4367-9726-8be6e7a7de74}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{542d6692-b312-430e-b08c-25d50a679c72}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
-    </Filter>
-    <Filter Include="Regression Test">
-      <UniqueIdentifier>{294f3d1a-92d6-4c47-884a-62ffa390e878}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Custom Build">
-      <UniqueIdentifier>{ffdab0d0-444f-4892-8854-39c4adee434b}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="cdbFile.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\support\util\dbuf.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\support\util\dbuf_string.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\support\util\NewAlloc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCasm.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCast.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCBBlock.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCbitv.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCcflow.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCcse.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCdebug.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCdflow.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCdwarf2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCerr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCglue.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCChasht.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCicode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCClabel.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCloop.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCClrange.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCmacro.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCmain.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCmem.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCopt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCpeeph.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCptropt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCset.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCsymt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCsystem.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCutil.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SDCCval.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sdccy.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="regression\add.c">
-      <Filter>Regression Test</Filter>
-    </ClCompile>
-    <ClCompile Include="regression\arrays.c">
-      <Filter>Regression Test</Filter>
-    </ClCompile>
-    <ClCompile Include="regression\b.c">
-      <Filter>Regression Test</Filter>
-    </ClCompile>
-    <ClCompile Include="regression\bool1.c">
-      <Filter>Regression Test</Filter>
-    </ClCompile>
-    <ClCompile Include="regression\call1.c">
-      <Filter>Regression Test</Filter>
-    </ClCompile>
-    <ClCompile Include="regression\compare.c">
-      <Filter>Regression Test</Filter>
-    </ClCompile>
-    <ClCompile Include="regression\compare2.c">
-      <Filter>Regression Test</Filter>
-    </ClCompile>
-    <ClCompile Include="regression\for.c">
-      <Filter>Regression Test</Filter>
-    </ClCompile>
-    <ClCompile Include="regression\pointer1.c">
-      <Filter>Regression Test</Filter>
-    </ClCompile>
-    <ClCompile Include="regression\struct1.c">
-      <Filter>Regression Test</Filter>
-    </ClCompile>
-    <ClCompile Include="regression\sub.c">
-      <Filter>Regression Test</Filter>
-    </ClCompile>
-    <ClCompile Include="regression\while.c">
-      <Filter>Regression Test</Filter>
-    </ClCompile>
-    <ClCompile Include="sdcclex.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\support\scripts\resource.rc">
-      <Filter>Source Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\support\scripts\sdcc.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\support\util\dbuf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\support\util\dbuf_string.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\support\util\newalloc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="port.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\sdcc_vc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCasm.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCast.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCBBlock.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCbitv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCcflow.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCcse.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCdflow.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCdwarf2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCerr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCglobl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCglue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCChasht.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCicode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCClabel.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCloop.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCClrange.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCmem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCopt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCpeeph.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCptropt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCset.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCsymt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCsystem.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCutil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SDCCval.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="sdccy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="spawn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="SDCC.lex">
-      <Filter>Custom Build</Filter>
-    </CustomBuild>
-    <CustomBuild Include="SDCC.y">
-      <Filter>Custom Build</Filter>
-    </CustomBuild>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff -Nru sdcc-3.1.0+dfsg/src/yacc.vcxproj sdcc-3.2.0+dfsg/src/yacc.vcxproj
--- sdcc-3.1.0+dfsg/src/yacc.vcxproj	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/yacc.vcxproj	2012-06-28 14:09:28.000000000 +0000
@@ -65,10 +65,12 @@
   <ItemGroup>
     <CustomBuild Include="SDCC.y">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bison  -d -v -o sdccy.c sdcc.y</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">sdccy.c;sdccy.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bison  -d -v -o sdccy.c sdcc.y</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">sdccy.c;sdccy.h;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bison  -d -v -o SDCCy.c SDCC.y</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bison  -d -v -o SDCCy.c SDCC.y</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">SDCCy.c;SDCCy.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">SDCCy.c;SDCCy.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Parser: SDCCy.c</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Parser: SDCCy.c</Message>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff -Nru sdcc-3.1.0+dfsg/src/z80/gen.c sdcc-3.2.0+dfsg/src/z80/gen.c
--- sdcc-3.1.0+dfsg/src/z80/gen.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/z80/gen.c	2012-06-21 14:48:56.000000000 +0000
@@ -1,11 +1,10 @@
 /*-------------------------------------------------------------------------
   gen.c - code generator for Z80 / Z180 / GBZ80.
 
-  Philipp Klaus Krause pkk@spth.de, philipp@informatik.uni-frankfurt.de (2011)
-  Michael Hope <michaelh@juju.net.nz> 2000
-  Based on the mcs51 generator -
-      Sandeep Dutta . sandeep.dutta@usa.net (1998)
-   and -  Jean-Louis VERN.jlvern@writeme.com (1999)
+  Copyright (C) 1998, Sandeep Dutta . sandeep.dutta@usa.net
+  Copyright (C) 1999, Jean-Louis VERN.jlvern@writeme.com
+  Copyright (C) 2000, Michael Hope <michaelh@juju.net.nz>
+  Copyright (C) 2011, Philipp Klaus Krause pkk@spth.de, philipp@informatik.uni-frankfurt.de)
 
   This program is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by the
@@ -17,15 +16,9 @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
 
-
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-  In other words, you are welcome to use, share and improve this program.
-  You are forbidden to forbid anyone else to use, share and improve
-  what you give them.   Help stamp out software-hoarding!
-
 -------------------------------------------------------------------------*/
 
 /*
@@ -89,11 +82,7 @@
 #include <ctype.h>
 
 #include "z80.h"
-#include "SDCCglobl.h"
-#include "SDCCpeeph.h"
 #include "gen.h"
-#include "SDCCglue.h"
-#include "newalloc.h"
 #include "dbuf_string.h"
 
 /* This is the down and dirty file with all kinds of kludgy & hacky
@@ -125,12 +114,9 @@
 
 //#define DEBUG_DRY_COST
 
-static char *_z80_return[] =
-  {"l", "h", "e", "d"};
-static char *_gbz80_return[] =
-  {"e", "d", "l", "h"};
-static char *_fReceive[] =
-  { "c", "b", "e", "d" };
+static char *_z80_return[] = { "l", "h", "e", "d" };
+static char *_gbz80_return[] = { "e", "d", "l", "h" };
+static char *_fReceive[] = { "c", "b", "e", "d" };
 
 static char **_fReturn;
 static char **_fTmp;
@@ -138,102 +124,117 @@
 extern struct dbuf_s *codeOutBuf;
 
 enum
-  {
-    INT8MIN = -128,
-    INT8MAX = 127
-  };
+{
+  INT8MIN = -128,
+  INT8MAX = 127
+};
 
 /** Enum covering all the possible register pairs.
  */
 typedef enum
-  {
-    PAIR_INVALID,
-    PAIR_AF,
-    PAIR_BC,
-    PAIR_DE,
-    PAIR_HL,
-    PAIR_IY,
-    PAIR_IX,
-    NUM_PAIRS
-  } PAIR_ID;
+{
+  PAIR_INVALID,
+  PAIR_AF,
+  PAIR_BC,
+  PAIR_DE,
+  PAIR_HL,
+  PAIR_IY,
+  PAIR_IX,
+  NUM_PAIRS
+} PAIR_ID;
 
 static struct
 {
   const char *name;
   const char *l;
   const char *h;
-} _pairs[NUM_PAIRS] = {
-  {    "??1", "?2", "?3" },
-  {    "af", "f", "a" },
-  {    "bc", "c", "b" },
-  {    "de", "e", "d" },
-  {    "hl", "l", "h" },
-  {    "iy", "iyl", "iyh" },
-  {    "ix", "ixl", "ixh" }
+} _pairs[NUM_PAIRS] =
+{
+  {
+    "??1", "?2", "?3"
+  },
+  {
+    "af", "f", "a"
+  },
+  {
+    "bc", "c", "b"
+  },
+  {
+    "de", "e", "d"
+  },
+  {
+    "hl", "l", "h"
+  },
+  {
+    "iy", "iyl", "iyh"
+  },
+  {
+    "ix", "ixl", "ixh"
+  }
 };
 
 // PENDING
 #define ACC_NAME        _pairs[PAIR_AF].h
 
 enum
-  {
-    LSB,
-    MSB16,
-    MSB24,
-    MSB32
-  };
-    
+{
+  LSB,
+  MSB16,
+  MSB24,
+  MSB32
+};
+
 enum asminst
-  {
-    A_ADD,
-    A_ADC,
-    A_AND,
-    A_CP,
-    A_CPL,
-    A_DEC,
-    A_INC,
-    A_LD,
-    A_OR,
-    A_RL,
-    A_RLA,
-    A_RLC,
-    A_RLCA,
-    A_RR,
-    A_RRC,
-    A_RRCA,
-    A_SBC,
-    A_SLA,
-    A_SRA,
-    A_SRL,
-    A_SUB,
-    A_XOR
-  };
-  
+{
+  A_ADD,
+  A_ADC,
+  A_AND,
+  A_CP,
+  A_CPL,
+  A_DEC,
+  A_INC,
+  A_LD,
+  A_OR,
+  A_RL,
+  A_RLA,
+  A_RLC,
+  A_RLCA,
+  A_RR,
+  A_RRC,
+  A_RRCA,
+  A_SBC,
+  A_SLA,
+  A_SRA,
+  A_SRL,
+  A_SUB,
+  A_XOR
+};
+
 const char *asminstnames[] =
-  {
-    "add",
-    "adc",
-    "and",
-    "cp",
-    "cpl",
-    "dec",
-    "inc",
-    "ld",
-    "or",
-    "rl",
-    "rla",
-    "rlc",
-    "rlca",
-    "rr",
-    "rrc",
-    "rrca",
-    "sbc",
-    "sla",
-    "sra",
-    "srl",
-    "sub",
-    "xor"
-  };
+{
+  "add",
+  "adc",
+  "and",
+  "cp",
+  "cpl",
+  "dec",
+  "inc",
+  "ld",
+  "or",
+  "rl",
+  "rla",
+  "rlc",
+  "rlca",
+  "rr",
+  "rrc",
+  "rrca",
+  "sbc",
+  "sla",
+  "sra",
+  "srl",
+  "sub",
+  "xor"
+};
 
 /** Code generator persistent data.
  */
@@ -254,6 +255,7 @@
     int pushed;
     int param_offset;
     int offset;
+    int pushedHL;
     int pushedBC;
     int pushedDE;
     int pushedIY;
@@ -284,10 +286,6 @@
 
   struct
   {
-    lineNode *head;
-    lineNode *current;
-    int isInline;
-    int isDebug;
     allocTrace trace;
   } lines;
 
@@ -297,7 +295,7 @@
   } trace;
 } _G;
 
-static const char *aopGet (asmop *aop, int offset, bool bit16);
+static const char *aopGet (asmop * aop, int offset, bool bit16);
 
 struct asmop asmop_a, asmop_b, asmop_c, asmop_d, asmop_e, asmop_h, asmop_l, asmop_iyh, asmop_iyl, asmop_zero, asmop_one;
 struct asmop *const ASMOP_A = &asmop_a;
@@ -312,23 +310,20 @@
 struct asmop *const ASMOP_ZERO = &asmop_zero;
 struct asmop *const ASMOP_ONE = &asmop_one;
 
-static asmop *_z80_return3[] =
-  {&asmop_l, &asmop_h, &asmop_e, &asmop_d};
-static asmop *_gbz80_return3[] =
-  {&asmop_e, &asmop_d, &asmop_l, &asmop_h};
-  
-static asmop *asmopregs[] = 
-  {&asmop_c, &asmop_b, &asmop_e, &asmop_d, &asmop_l, &asmop_h, &asmop_iyl, &asmop_iyh};
+static asmop *_z80_return3[] = { &asmop_l, &asmop_h, &asmop_e, &asmop_d };
+static asmop *_gbz80_return3[] = { &asmop_e, &asmop_d, &asmop_l, &asmop_h };
+
+static asmop *asmopregs[] = { &asmop_c, &asmop_b, &asmop_e, &asmop_d, &asmop_l, &asmop_h, &asmop_iyl, &asmop_iyh };
 
 static asmop **_fReturn3;
 
 void
-z80_init_asmops(void)
+z80_init_asmops (void)
 {
   asmop_a.type = AOP_ACC;
   asmop_a.size = 1;
   asmop_a.aopu.aop_str[0] = "a";
-  
+
   asmop_b.type = AOP_REG;
   asmop_b.size = 1;
   asmop_b.aopu.aop_reg[0] = regsZ80 + B_IDX;
@@ -353,11 +348,11 @@
   asmop_iyl.type = AOP_REG;
   asmop_iyl.size = 1;
   asmop_iyl.aopu.aop_reg[0] = regsZ80 + IYL_IDX;
-  
+
   asmop_zero.type = AOP_SIMPLELIT;
   asmop_zero.aopu.aop_simplelit = 0;
   asmop_zero.size = 1;
-  
+
   asmop_one.type = AOP_SIMPLELIT;
   asmop_one.aopu.aop_simplelit = 1;
   asmop_one.size = 1;
@@ -365,15 +360,15 @@
   _fReturn3 = IS_GB ? _gbz80_return3 : _z80_return3;
 }
 
-extern bool regalloc_dry_run;
-unsigned char regalloc_dry_run_cost; 
+static bool regalloc_dry_run;
+static unsigned char regalloc_dry_run_cost;
 
 /* WARNING: This function is dangerous to use. It works literally:
    It will return true if ic the the last use of op, even if ic might
    be executed again, e.g. due to a loop. Most of the time you will want
    to use isPairDead(), or ic->rSurv instead of this function. */
 static bool
-isLastUse (const iCode *ic, operand *op)
+isLastUse (const iCode * ic, operand * op)
 {
   bitVect *uses = bitVectCopy (OP_USES (op));
 
@@ -397,7 +392,7 @@
 }
 
 static PAIR_ID
-_getTempPairId(void)
+_getTempPairId (void)
 {
   if (IS_GB)
     {
@@ -410,21 +405,21 @@
 }
 
 static const char *
-_getTempPairName(void)
+_getTempPairName (void)
 {
-  return _pairs[_getTempPairId()].name;
+  return _pairs[_getTempPairId ()].name;
 }
 
 static bool
-isPairInUse (PAIR_ID id, const iCode *ic)
+isPairInUse (PAIR_ID id, const iCode * ic)
 {
   if (id == PAIR_DE)
     {
-      return bitVectBitValue (ic->rMask, D_IDX) || bitVectBitValue(ic->rMask, E_IDX);
+      return bitVectBitValue (ic->rMask, D_IDX) || bitVectBitValue (ic->rMask, E_IDX);
     }
   else if (id == PAIR_BC)
     {
-      return bitVectBitValue (ic->rMask, B_IDX) || bitVectBitValue(ic->rMask, C_IDX);
+      return bitVectBitValue (ic->rMask, B_IDX) || bitVectBitValue (ic->rMask, C_IDX);
     }
   else
     {
@@ -434,26 +429,20 @@
 }
 
 static bool
-isPairDead(PAIR_ID id, const iCode *ic)
+isPairDead (PAIR_ID id, const iCode * ic)
 {
-  const bitVect *r = (z80_opts.oldralloc ? bitVectCplAnd (bitVectCopy (ic->rMask), z80_rUmaskForOp (IC_RESULT (ic))) : ic->rSurv);
+  const bitVect *r = (!options.oldralloc ? ic->rSurv :
+                      (POINTER_SET (ic) ? ic->rMask :
+                       (bitVectCplAnd (bitVectCopy (ic->rMask), z80_rUmaskForOp (IC_RESULT (ic))))));
 
   if (id == PAIR_DE)
-    {
-      return !(bitVectBitValue (r, D_IDX) || bitVectBitValue(r, E_IDX));
-    }
+    return !(bitVectBitValue (r, D_IDX) || bitVectBitValue (r, E_IDX));
   else if (id == PAIR_BC)
-    {
-      return !(bitVectBitValue (r, B_IDX) || bitVectBitValue(r, C_IDX));
-    }
+    return !(bitVectBitValue (r, B_IDX) || bitVectBitValue (r, C_IDX));
   else if (id == PAIR_HL)
-    {
-      return !(bitVectBitValue (r, H_IDX) || bitVectBitValue(r, L_IDX));
-    }
+    return !(bitVectBitValue (r, H_IDX) || bitVectBitValue (r, L_IDX));
   else if (id == PAIR_IY)
-    {
-      return !(bitVectBitValue (r, IYH_IDX) || bitVectBitValue(r, IYL_IDX));
-    }
+    return !(bitVectBitValue (r, IYH_IDX) || bitVectBitValue (r, IYL_IDX));
   else
     {
       wassertl (0, "Only implemented for DE, BC, HL and IY");
@@ -462,7 +451,7 @@
 }
 
 static PAIR_ID
-getDeadPairId (const iCode *ic)
+getDeadPairId (const iCode * ic)
 {
   if (isPairDead (PAIR_BC, ic))
     {
@@ -479,7 +468,7 @@
 }
 
 static PAIR_ID
-getFreePairId (const iCode *ic)	// Todo: Cost
+getFreePairId (const iCode * ic)        // Todo: Cost
 {
   if (!isPairInUse (PAIR_BC, ic))
     {
@@ -499,49 +488,24 @@
 _tidyUp (char *buf)
 {
   /* Clean up the line so that it is 'prettier' */
-  if (strchr (buf, ':'))
-    {
-      /* Is a label - cant do anything */
-      return;
-    }
-  /* Change the first (and probably only) ' ' to a tab so
-     everything lines up.
-  */
-  while (*buf)
+  /* If it is a label - can't do anything */
+  if (!strchr (buf, ':'))
     {
-      if (*buf == ' ')
+      /* Change the first (and probably only) ' ' to a tab so
+         everything lines up.
+       */
+      while (*buf)
         {
-          *buf = '\t';
-          break;
+          if (*buf == ' ')
+            {
+              *buf = '\t';
+              break;
+            }
+          buf++;
         }
-      buf++;
     }
 }
 
-static lineNode *
-_newLineNode (const char *line)
-{
-  lineNode *pl;
-
-  pl = traceAlloc(&_G.lines.trace, Safe_alloc ( sizeof (lineNode)));
-  pl->line = traceAlloc(&_G.lines.trace, Safe_strdup (line));
-
-  return pl;
-}
-
-static void
-_add_line (const char *buffer)
-{
-  _G.lines.current = (_G.lines.current ?
-              connectLine (_G.lines.current, _newLineNode (buffer)) :
-              (_G.lines.head = _newLineNode (buffer)));
-
-  _G.lines.current->isInline = _G.lines.isInline;
-  _G.lines.current->isDebug = _G.lines.isDebug;
-  _G.lines.current->ic = _G.current_iCode;
-  _G.lines.current->isComment = (*buffer == ';');
-}
-
 static void
 _vemit2 (const char *szFormat, va_list ap)
 {
@@ -560,43 +524,50 @@
   while ((nextp = strchr (p, '\n')))
     {
       *nextp = '\0';
-      _add_line (p);
+      emit_raw (p);
       p = nextp + 1;
     }
 
-  _add_line (p);
+  emit_raw (p);
 
-  Safe_free (buffer);
+  dbuf_free (buffer);
 }
 
 static void
-emitDebug (const char *szFormat,...)
+emitDebug (const char *szFormat, ...)
 {
-  if(regalloc_dry_run)
-    return;
-  if (!options.verboseAsm)
-    return;
-  if (!DISABLE_DEBUG)
+  if (!DISABLE_DEBUG && !regalloc_dry_run && options.verboseAsm)
     {
       va_list ap;
 
       va_start (ap, szFormat);
-
       _vemit2 (szFormat, ap);
+      va_end (ap);
+    }
+}
+
+static void
+emit2 (const char *szFormat, ...)
+{
+  if (!regalloc_dry_run)
+    {
+      va_list ap;
 
+      va_start (ap, szFormat);
+      _vemit2 (szFormat, ap);
       va_end (ap);
     }
 }
 
 static PAIR_ID
-getPairId (const asmop *aop)
+getPairId (const asmop * aop)
 {
   if (aop->size == 2)
     {
       if (aop->type == AOP_REG)
         {
           wassert (aop->aopu.aop_reg[0] && aop->aopu.aop_reg[1]);
-          
+
           if ((aop->aopu.aop_reg[0]->rIdx == C_IDX) && (aop->aopu.aop_reg[1]->rIdx == B_IDX))
             {
               return PAIR_BC;
@@ -623,43 +594,28 @@
   return PAIR_INVALID;
 }
 
-static void
-emit2 (const char *szFormat,...)
-{
-  va_list ap;
-
-  if(regalloc_dry_run)
-    return;
-
-  va_start (ap, szFormat);
-
-  _vemit2 (szFormat, ap);
-
-  va_end (ap);
-}
-
 /*-----------------------------------------------------------------*/
 /* z80_emitDebuggerSymbol - associate the current code location    */
 /*   with a debugger symbol                                        */
 /*-----------------------------------------------------------------*/
 void
-z80_emitDebuggerSymbol (const char * debugSym)
+z80_emitDebuggerSymbol (const char *debugSym)
 {
-  _G.lines.isDebug = 1;
+  genLine.lineElement.isDebug = 1;
   emit2 ("%s !equ .", debugSym);
   emit2 ("!global", debugSym);
-  _G.lines.isDebug = 0;
+  genLine.lineElement.isDebug = 0;
 }
 
 // Todo: Handle IY (when used as AOP_HLREG or AOP_REG) correctly.
 static unsigned char
-ld_cost(asmop *op1, asmop *op2)
+ld_cost (asmop * op1, asmop * op2)
 {
   AOP_TYPE op1type = op1->type;
   AOP_TYPE op2type = op2->type;
-  
+
   /* Costs are symmetric */
-  if(op2type == AOP_ACC || op2type == AOP_REG || op2type == AOP_HLREG || op2type == AOP_DUMMY)
+  if (op2type == AOP_ACC || op2type == AOP_REG || op2type == AOP_HLREG || op2type == AOP_DUMMY)
     {
       asmop *tmp = op1;
       op1 = op2;
@@ -667,131 +623,136 @@
       op1type = op1->type;
       op2type = op2->type;
     }
-  
-  switch(op1type)
+
+  switch (op1type)
     {
     case AOP_ACC:
     case AOP_REG:
     case AOP_HLREG:
     case AOP_DUMMY:
-      switch(op2type)
+      switch (op2type)
         {
         case AOP_ACC:
         case AOP_REG:
         case AOP_HLREG:
         case AOP_DUMMY:
-          return(1);
+          return (1);
         case AOP_IMMD:
         case AOP_LIT:
         case AOP_SIMPLELIT:
-          return(2);
-        case AOP_SFR:   /* 2 from in a, (...) */
-          return((op1type == AOP_ACC || op1type == AOP_DUMMY) ? 2 : 3);
+          return (2);
+        case AOP_SFR:          /* 2 from in a, (...) */
+          return ((op1type == AOP_ACC || op1type == AOP_DUMMY) ? 2 : 3);
         case AOP_STK:
-          return(3);
-        case AOP_HL:    /* 3 from ld hl, #... */
-          return(4);
-        case AOP_IY:    /* 4 from ld iy, #... */
-        case AOP_EXSTK: /* 4 from ld iy, #... */
-          return(7);
+          return (3);
+        case AOP_HL:           /* 3 from ld hl, #... */
+          return (4);
+        case AOP_IY:           /* 4 from ld iy, #... */
+        case AOP_EXSTK:        /* 4 from ld iy, #... */
+          return (7);
         case AOP_PAIRPTR:
-          if(op2->aopu.aop_pairId == PAIR_HL)
-            return(1);
-          if(op2->aopu.aop_pairId == PAIR_IY || op2->aopu.aop_pairId == PAIR_IX)
-            return(3);
-          if(op2->aopu.aop_pairId == PAIR_BC || op2->aopu.aop_pairId == PAIR_DE)
-            return((op1type == AOP_ACC || op1type == AOP_DUMMY) ? 1 : 2);
-        default:printf("ld_cost op1: AOP_REG, op2: %d", (int)(op2type));
-          wassert(0);
+          if (op2->aopu.aop_pairId == PAIR_HL)
+            return (1);
+          if (op2->aopu.aop_pairId == PAIR_IY || op2->aopu.aop_pairId == PAIR_IX)
+            return (3);
+          if (op2->aopu.aop_pairId == PAIR_BC || op2->aopu.aop_pairId == PAIR_DE)
+            return ((op1type == AOP_ACC || op1type == AOP_DUMMY) ? 1 : 2);
+        default:
+          printf ("ld_cost op1: AOP_REG, op2: %d", (int) (op2type));
+          wassert (0);
         }
-    case AOP_SFR:   /* 2 from out (...), a */
-        switch(op2type)
+    case AOP_SFR:              /* 2 from out (...), a */
+      switch (op2type)
         {
         case AOP_ACC:
         case AOP_REG:
         case AOP_HLREG:
         case AOP_DUMMY:
-          return(2);
+          return (2);
         case AOP_IMMD:
         case AOP_LIT:
         case AOP_SIMPLELIT:
-          return(4);
+          return (4);
         case AOP_STK:
-          return(5);
-        case AOP_HL:    /* 3 from ld hl, #... */
-          return(6);
+          return (5);
+        case AOP_HL:           /* 3 from ld hl, #... */
+          return (6);
         case AOP_SFR:
-          return(4);
-        case AOP_IY:    /* 4 from ld iy, #... */
-        case AOP_EXSTK: /* 4 from ld iy, #... */
-          return(9);
-        default:printf("ld_cost op1: AOP_SFR, op2: %d", (int)(op2type));
-          wassert(0);
-        }
-    case AOP_IY:		/* 4 from ld iy, #... */
-    case AOP_EXSTK:     /* 4 from ld iy, #... */
-      switch(op2type)
+          return (4);
+        case AOP_IY:           /* 4 from ld iy, #... */
+        case AOP_EXSTK:        /* 4 from ld iy, #... */
+          return (9);
+        default:
+          printf ("ld_cost op1: AOP_SFR, op2: %d", (int) (op2type));
+          wassert (0);
+        }
+    case AOP_IY:               /* 4 from ld iy, #... */
+    case AOP_EXSTK:            /* 4 from ld iy, #... */
+      switch (op2type)
         {
         case AOP_IMMD:
         case AOP_LIT:
         case AOP_SIMPLELIT:
-          return(8);
-        case AOP_SFR:   /* 2 from in a, (...) */
-          return(9);
+          return (8);
+        case AOP_SFR:          /* 2 from in a, (...) */
+          return (9);
         case AOP_STK:
-        case AOP_HL:    /* 3 from ld hl, #... */
-          return(10);
+        case AOP_HL:           /* 3 from ld hl, #... */
+          return (10);
         case AOP_IY:
         case AOP_EXSTK:
-          return(16);
-        default:printf("ld_cost op1: AOP_IY, op2: %d", (int)(op2type));
-          wassert(0);
+          return (16);
+        default:
+          printf ("ld_cost op1: AOP_IY, op2: %d", (int) (op2type));
+          wassert (0);
         }
     case AOP_STK:
-      switch(op2type)
+      switch (op2type)
         {
         case AOP_IMMD:
         case AOP_LIT:
         case AOP_SIMPLELIT:
-          return(4);
-        case AOP_SFR:   /* 2 from in a, (...) */
-          return(5);
+          return (4);
+        case AOP_SFR:          /* 2 from in a, (...) */
+          return (5);
         case AOP_STK:
-          return(6);
+          return (6);
         case AOP_HL:
-          return(7);
-        case AOP_IY:    /* 4 from ld iy, #... */
+          return (7);
+        case AOP_IY:           /* 4 from ld iy, #... */
         case AOP_EXSTK:
-          return(10);
+          return (10);
         case AOP_PAIRPTR:
-          if(op2->aopu.aop_pairId == PAIR_HL || op2->aopu.aop_pairId == PAIR_BC ||  op2->aopu.aop_pairId == PAIR_DE)
-            return(4);
-          if(op2->aopu.aop_pairId == PAIR_IY || op2->aopu.aop_pairId == PAIR_IX)
-            return(6);
-        default:printf("ld_cost op1: AOP_STK, op2: %d", (int)(op2type));
-          wassert(0);
+          if (op2->aopu.aop_pairId == PAIR_HL || op2->aopu.aop_pairId == PAIR_BC || op2->aopu.aop_pairId == PAIR_DE)
+            return (4);
+          if (op2->aopu.aop_pairId == PAIR_IY || op2->aopu.aop_pairId == PAIR_IX)
+            return (6);
+        default:
+          printf ("ld_cost op1: AOP_STK, op2: %d", (int) (op2type));
+          wassert (0);
         }
-    case AOP_HL:    /* 3 from ld hl, #... */
-      switch(op2type)
+    case AOP_HL:               /* 3 from ld hl, #... */
+      switch (op2type)
         {
         case AOP_ACC:
         case AOP_REG:
         case AOP_HLREG:
         case AOP_DUMMY:
-          return(4);
+          return (4);
         case AOP_IMMD:
         case AOP_LIT:
         case AOP_SIMPLELIT:
-          return(5);
+          return (5);
         case AOP_STK:
-          return(7);
+          return (7);
         case AOP_HL:
-          return(6);
-        case AOP_IY:    /* 4 from ld iy, #... */
+          return (6);
+        case AOP_IY:           /* 4 from ld iy, #... */
         case AOP_EXSTK:
-          return(11);
-        default:printf("ld_cost op1: AOP_HL, op2: %d", (int)(op2type));
-          wassert(0);
+          return (11);
+        default:
+          printf ("ld_cost op1: AOP_HL, op2: %d", (int) (op2type));
+          wassert (0);
         }
     case AOP_LIT:
     case AOP_SIMPLELIT:
@@ -799,84 +760,84 @@
       wassertl (0, "Trying to assign a value to a literal");
       break;
     default:
-      printf("ld_cost op1: %d", (int)(op1type));
-      wassert(0);
+      printf ("ld_cost op1: %d", (int) (op1type));
+      wassert (0);
     }
-  return(8); // Fallback
+  return (8);                   // Fallback
 }
 
 static unsigned char
-op8_cost(asmop *op2)
+op8_cost (asmop * op2)
 {
-  switch(op2->type)
+  switch (op2->type)
     {
     case AOP_ACC:
     case AOP_REG:
     case AOP_HLREG:
     case AOP_DUMMY:
-      return(1);
+      return (1);
     case AOP_IMMD:
     case AOP_LIT:
     case AOP_SIMPLELIT:
-      return(2);
+      return (2);
     case AOP_STK:
-      return(3);
+      return (3);
     case AOP_HL:
-      return(4);
-    case AOP_IY:    /* 4 from ld iy, #... */
-    case AOP_EXSTK: /* 4 from ld iy, #... */
-      return(7);
+      return (4);
+    case AOP_IY:               /* 4 from ld iy, #... */
+    case AOP_EXSTK:            /* 4 from ld iy, #... */
+      return (7);
     case AOP_PAIRPTR:
-      if(op2->aopu.aop_pairId == PAIR_HL)
-        return(1);
-      if(op2->aopu.aop_pairId == PAIR_IY || op2->aopu.aop_pairId == PAIR_IX)
-        return(3);     
+      if (op2->aopu.aop_pairId == PAIR_HL)
+        return (1);
+      if (op2->aopu.aop_pairId == PAIR_IY || op2->aopu.aop_pairId == PAIR_IX)
+        return (3);
     default:
-      printf("op8_cost op2: %d", (int)(op2->type));
-      wassert(0);
+      printf ("op8_cost op2: %d", (int) (op2->type));
+      wassert (0);
     }
-  return(8); // Fallback
+  return (8);                   // Fallback
 }
 
 static unsigned char
-bit8_cost(asmop *op1)
+bit8_cost (asmop * op1)
 {
-  switch(op1->type)
+  switch (op1->type)
     {
     case AOP_ACC:
     case AOP_REG:
     case AOP_HLREG:
     case AOP_DUMMY:
-      return(2);
+      return (2);
     case AOP_STK:
-      return(4);
+      return (4);
     case AOP_HL:
-      return(5);
-    case AOP_IY:    /* 4 from ld iy, #... */
-    case AOP_EXSTK: /* 4 from ld iy, #... */
-      return(8);
+      return (5);
+    case AOP_IY:               /* 4 from ld iy, #... */
+    case AOP_EXSTK:            /* 4 from ld iy, #... */
+      return (8);
     default:
-      printf("bit8_cost op1: %d", (int)(op1->type));
-      wassert(0);
+      printf ("bit8_cost op1: %d", (int) (op1->type));
+      wassert (0);
     }
-  return(8); //Fallback
+  return (8);                   //Fallback
 }
 
 static unsigned char
-emit3Cost(enum asminst inst, asmop *op1, int offset1, asmop *op2, int offset2)
+emit3Cost (enum asminst inst, asmop * op1, int offset1, asmop * op2, int offset2)
 {
   if (op2 && offset2 >= op2->size)
     op2 = ASMOP_ZERO;
 
-  switch(inst)
+  switch (inst)
     {
     case A_CPL:
     case A_RLA:
     case A_RLCA:
     case A_RRCA:
-      return(1);
+      return (1);
     case A_LD:
-      return(ld_cost(op1, op2));
+      return (ld_cost (op1, op2));
       break;
     case A_ADD:
     case A_ADC:
@@ -886,10 +847,10 @@
     case A_SBC:
     case A_SUB:
     case A_XOR:
-      return(op8_cost(op2));
+      return (op8_cost (op2));
     case A_DEC:
     case A_INC:
-      return(op8_cost(op1));
+      return (op8_cost (op1));
     case A_RL:
     case A_RLC:
     case A_RR:
@@ -897,27 +858,27 @@
     case A_SLA:
     case A_SRA:
     case A_SRL:
-      return(bit8_cost(op1));
+      return (bit8_cost (op1));
     default:
-      wassertl(0, "Tried get cost for unknown instruction");
+      wassertl (0, "Tried get cost for unknown instruction");
     }
-  return(0);
+  return (0);
 }
 
 static void
-emit3_o (enum asminst inst, asmop *op1, int offset1, asmop *op2, int offset2)
+emit3_o (enum asminst inst, asmop * op1, int offset1, asmop * op2, int offset2)
 {
   unsigned char cost;
 
-  regalloc_dry_run_cost += emit3Cost(inst, op1, offset1, op2, offset2);
-  if(regalloc_dry_run)
+  regalloc_dry_run_cost += emit3Cost (inst, op1, offset1, op2, offset2);
+  if (regalloc_dry_run)
     return;
 
   cost = regalloc_dry_run_cost;
-  if(!op1)
-    emit2("%s", asminstnames[inst]);
-  else if(!op2)
-    emit2("%s %s", asminstnames[inst], aopGet(op1, offset1, FALSE));
+  if (!op1)
+    emit2 ("%s", asminstnames[inst]);
+  else if (!op2)
+    emit2 ("%s %s", asminstnames[inst], aopGet (op1, offset1, FALSE));
   else
     {
       char *l = Safe_strdup (aopGet (op1, offset1, FALSE));
@@ -931,17 +892,17 @@
 }
 
 static void
-emit3 (enum asminst inst, asmop *op1, asmop *op2)
+emit3 (enum asminst inst, asmop * op1, asmop * op2)
 {
-  emit3_o(inst, op1, 0, op2, 0);
+  emit3_o (inst, op1, 0, op2, 0);
 }
 
 static void
-_emitMove(const char *to, const char *from)
+_emitMove (const char *to, const char *from)
 {
-  if (STRCASECMP(to, from) != 0)
+  if (STRCASECMP (to, from) != 0)
     {
-      emit2("ld %s,%s", to, from);
+      emit2 ("ld %s,%s", to, from);
     }
   else
     {
@@ -951,10 +912,10 @@
 }
 
 static void
-_emitMove3(asmop *to, int to_offset, asmop *from, int from_offset)
+_emitMove3 (asmop * to, int to_offset, asmop * from, int from_offset)
 {
   /* Todo: Longer list of moves that can be optimized out. */
-  if(to_offset == from_offset)
+  if (to_offset == from_offset)
     {
       if (to->type == AOP_ACC && from->type == AOP_ACC)
         return;
@@ -962,11 +923,12 @@
         return;
     }
 
-  emit3_o(A_LD, to, to_offset, from, from_offset);
+  emit3_o (A_LD, to, to_offset, from, from_offset);
 }
 
 #if 0
-static const char *aopNames[] = {
+static const char *aopNames[] =
+{
   "AOP_INVALID",
   "AOP_LIT",
   "AOP_REG",
@@ -987,27 +949,27 @@
 };
 
 static void
-aopDump(const char *plabel, asmop *aop)
+aopDump (const char *plabel, asmop * aop)
 {
   int i;
   char regbuf[9];
   char *rbp = regbuf;
 
-  emitDebug("; Dump of %s: type %s size %u", plabel, aopNames[aop->type], aop->size);
+  emitDebug ("; Dump of %s: type %s size %u", plabel, aopNames[aop->type], aop->size);
   switch (aop->type)
     {
     case AOP_EXSTK:
     case AOP_STK:
-      emitDebug(";  aop_stk %d", aop->aopu.aop_stk);
+      emitDebug (";  aop_stk %d", aop->aopu.aop_stk);
       break;
     case AOP_REG:
-      for (i=aop->size-1;i>=0;i--)
+      for (i = aop->size - 1; i >= 0; i--)
         *rbp++ = *(aop->aopu.aop_reg[i]->name);
       *rbp = '\0';
-      emitDebug(";  reg = %s", regbuf);
+      emitDebug (";  reg = %s", regbuf);
       break;
     case AOP_PAIRPTR:
-      emitDebug(";  pairptr = (%s)", _pairs[aop->aopu.aop_pairId].name);
+      emitDebug (";  pairptr = (%s)", _pairs[aop->aopu.aop_pairId].name);
 
     default:
       /* No information. */
@@ -1017,20 +979,20 @@
 #endif
 
 static void
-_moveA(const char *moveFrom)
+_moveA (const char *moveFrom)
 {
-    _emitMove(ACC_NAME, moveFrom);
+  _emitMove (ACC_NAME, moveFrom);
 }
 
 /* Load aop into A */
 static void
-_moveA3(asmop *from, int offset)
+_moveA3 (asmop * from, int offset)
 {
-    _emitMove3(ASMOP_A, 0, from, offset);
+  _emitMove3 (ASMOP_A, 0, from, offset);
 }
 
 static void
-_clearCarry(void)
+_clearCarry (void)
 {
   emit3 (A_XOR, ASMOP_A, ASMOP_A);
 }
@@ -1058,7 +1020,7 @@
       int i;
       for (i = 0; i < NUM_PAIRS; i++)
         {
-          if (strcmp(aop->aopu.aop_str[0], _pairs[i].l) == 0)
+          if (strcmp (aop->aopu.aop_str[0], _pairs[i].l) == 0)
             return _pairs[i].name;
         }
     }
@@ -1068,7 +1030,7 @@
 
 /** Returns TRUE if the registers used in aop form a pair (BC, DE, HL) */
 static bool
-isPair (const asmop *aop)
+isPair (const asmop * aop)
 {
   return (getPairId (aop) != PAIR_INVALID);
 }
@@ -1076,7 +1038,7 @@
 /** Returns TRUE if the registers used in aop cannot be split into high
     and low halves */
 static bool
-isUnsplitable (const asmop *aop)
+isUnsplitable (const asmop * aop)
 {
   switch (getPairId (aop))
     {
@@ -1090,7 +1052,7 @@
 }
 
 static bool
-isPtrPair (const asmop *aop)
+isPtrPair (const asmop * aop)
 {
   PAIR_ID pairId = getPairId (aop);
   switch (pairId)
@@ -1115,21 +1077,21 @@
 static void
 spillPairReg (const char *regname)
 {
-  if (strlen(regname)==1)
+  if (strlen (regname) == 1)
     {
       switch (*regname)
         {
         case 'h':
         case 'l':
-          spillPair(PAIR_HL);
+          spillPair (PAIR_HL);
           break;
         case 'd':
         case 'e':
-          spillPair(PAIR_DE);
+          spillPair (PAIR_DE);
           break;
         case 'b':
         case 'c':
-          spillPair(PAIR_BC);
+          spillPair (PAIR_BC);
           break;
         }
     }
@@ -1139,7 +1101,7 @@
 _push (PAIR_ID pairId)
 {
   emit2 ("push %s", _pairs[pairId].name);
-  regalloc_dry_run_cost += (pairId == PAIR_IX || pairId == PAIR_IY? 2 : 1);
+  regalloc_dry_run_cost += (pairId == PAIR_IX || pairId == PAIR_IY ? 2 : 1);
   _G.stack.pushed += 2;
 }
 
@@ -1149,7 +1111,7 @@
   if (pairId != PAIR_INVALID)
     {
       emit2 ("pop %s", _pairs[pairId].name);
-      regalloc_dry_run_cost += (pairId == PAIR_IX || pairId == PAIR_IY? 2 : 1);
+      regalloc_dry_run_cost += (pairId == PAIR_IX || pairId == PAIR_IY ? 2 : 1);
       _G.stack.pushed -= 2;
       spillPair (pairId);
     }
@@ -1163,25 +1125,25 @@
     case PAIR_IX:
     case PAIR_IY:
     case PAIR_AF:
-      _push(srcPair);
-      _pop(dstPair);
+      _push (srcPair);
+      _pop (dstPair);
       break;
     case PAIR_BC:
     case PAIR_DE:
     case PAIR_HL:
       if (srcPair == PAIR_IX || srcPair == PAIR_IY)
         {
-          _push(srcPair);
-          _pop(dstPair);
+          _push (srcPair);
+          _pop (dstPair);
         }
       else
         {
-          emit2("ld %s,%s",_pairs[dstPair].l,_pairs[srcPair].l);
-          emit2("ld %s,%s",_pairs[dstPair].h,_pairs[srcPair].h);
+          emit2 ("ld %s,%s", _pairs[dstPair].l, _pairs[srcPair].l);
+          emit2 ("ld %s,%s", _pairs[dstPair].h, _pairs[srcPair].h);
           regalloc_dry_run_cost += 2;
         }
-     default:
-       wassertl (0, "Tried to move a nonphysical pair");
+    default:
+      wassertl (0, "Tried to move a nonphysical pair");
     }
   _G.pairs[dstPair].last_type = _G.pairs[srcPair].last_type;
   _G.pairs[dstPair].base = _G.pairs[srcPair].base;
@@ -1197,7 +1159,7 @@
 {
   asmop *aop;
 
-  aop = traceAlloc(&_G.trace.aops, Safe_alloc (sizeof (asmop)));
+  aop = traceAlloc (&_G.trace.aops, Safe_alloc (sizeof (asmop)));
   aop->type = type;
   return aop;
 }
@@ -1229,10 +1191,11 @@
       /* The pointer that is used depends on how big the offset is.
          Normally everything is AOP_STK, but for offsets of < -128 or
          > 127 on the Z80 an extended stack pointer is used.
-      */
-      if (!IS_GB && (_G.omitFramePtr || sym->stack < INT8MIN || sym->stack > (int)(INT8MAX-getSize (sym->type))))
+       */
+      if (!IS_GB && (_G.omitFramePtr || sym->stack < INT8MIN || sym->stack > (int) (INT8MAX - getSize (sym->type))))
         {
-          emitDebug ("; AOP_EXSTK for %s, _G.omitFramePtr %d, sym->stack %d, size %d", sym->rname, (int)(_G.omitFramePtr), sym->stack, getSize (sym->type));
+          emitDebug ("; AOP_EXSTK for %s, _G.omitFramePtr %d, sym->stack %d, size %d", sym->rname, (int) (_G.omitFramePtr),
+                     sym->stack, getSize (sym->type));
           sym->aop = aop = newAsmop (AOP_EXSTK);
         }
       else
@@ -1250,38 +1213,40 @@
   if (IS_FUNC (sym->type))
     {
       sym->aop = aop = newAsmop (AOP_IMMD);
-      aop->aopu.aop_immd = traceAlloc(&_G.trace.aops, Safe_strdup (sym->rname));
+      aop->aopu.aop_immd = traceAlloc (&_G.trace.aops, Safe_strdup (sym->rname));
       aop->size = 2;
       return aop;
     }
 
-  if( IN_REGSP( space ))
-  { /*.p.t.20030716 minor restructure to add SFR support to the Z80 */
-    if (IS_GB)
+  if (IN_REGSP (space))
     {
-      /* if it is in direct space */
-      if( !requires_a )
-      {
-        sym->aop = aop = newAsmop (AOP_SFR);
-        aop->aopu.aop_dir = sym->rname;
-        aop->size = getSize (sym->type);
-          emitDebug ("; AOP_SFR for %s", sym->rname);
-        return aop;
-      }
-    }
-    else
-    { /*.p.t.20030716 adding SFR support to the Z80 port */
-      aop = newAsmop (AOP_SFR);
-      sym->aop          = aop;
-      aop->aopu.aop_dir = sym->rname;
-      aop->size         = getSize( sym->type );
-      aop->paged        = FUNC_REGBANK(sym->type);
-      aop->bcInUse      = isPairInUse( PAIR_BC, ic );
-      emitDebug( ";Z80 AOP_SFR for %s banked:%d bc:%d", sym->rname, FUNC_REGBANK(sym->type), aop->bcInUse );
+      /*.p.t.20030716 minor restructure to add SFR support to the Z80 */
+      if (IS_GB)
+        {
+          /* if it is in direct space */
+          if (!requires_a)
+            {
+              sym->aop = aop = newAsmop (AOP_SFR);
+              aop->aopu.aop_dir = sym->rname;
+              aop->size = getSize (sym->type);
+              emitDebug ("; AOP_SFR for %s", sym->rname);
+              return aop;
+            }
+        }
+      else
+        {
+          /*.p.t.20030716 adding SFR support to the Z80 port */
+          aop = newAsmop (AOP_SFR);
+          sym->aop = aop;
+          aop->aopu.aop_dir = sym->rname;
+          aop->size = getSize (sym->type);
+          aop->paged = FUNC_REGBANK (sym->type);
+          aop->bcInUse = isPairInUse (PAIR_BC, ic);
+          emitDebug (";Z80 AOP_SFR for %s banked:%d bc:%d", sym->rname, FUNC_REGBANK (sym->type), aop->bcInUse);
 
-      return( aop );
+          return (aop);
+        }
     }
-  }
 
   /* only remaining is far space */
   /* in which case DPTR gets the address */
@@ -1291,7 +1256,7 @@
       sym->aop = aop = newAsmop (AOP_HL);
     }
   else
-      sym->aop = aop = newAsmop (AOP_IY);
+    sym->aop = aop = newAsmop (AOP_IY);
 
   aop->size = getSize (sym->type);
   aop->aopu.aop_dir = sym->rname;
@@ -1314,20 +1279,22 @@
   int val = 0;
   struct dbuf_s dbuf;
 
+  wassert(ic);
+
   for (;;)
     {
       if (ic->op == '+')
         {
-          if(isOperandLiteral (IC_RIGHT (ic)))
+          if (isOperandLiteral (IC_RIGHT (ic)))
             {
               val += (int) operandLitValue (IC_RIGHT (ic));
               ic = OP_SYMBOL (IC_LEFT (ic))->rematiCode;
             }
           else
-           {
-             val += (int) operandLitValue (IC_LEFT (ic));
+            {
+              val += (int) operandLitValue (IC_LEFT (ic));
               ic = OP_SYMBOL (IC_RIGHT (ic))->rematiCode;
-           }
+            }
         }
       else if (ic->op == '-')
         {
@@ -1411,30 +1378,21 @@
 
   /* if both are itemps & one is spilt
      and the other is not then false */
-  if (IS_ITEMP (op1) && IS_ITEMP (op2) &&
-      sym1->isspilt != sym2->isspilt)
+  if (IS_ITEMP (op1) && IS_ITEMP (op2) && sym1->isspilt != sym2->isspilt)
     return FALSE;
 
   /* if they are the same */
   if (sym1 == sym2)
     return 1;
 
-  if (sym1->rname[0] && sym2->rname[0]
-      && strcmp (sym1->rname, sym2->rname) == 0)
+  if (sym1->rname[0] && sym2->rname[0] && strcmp (sym1->rname, sym2->rname) == 0)
     return 2;
 
   /* if left is a tmp & right is not */
-  if (IS_ITEMP (op1) &&
-      !IS_ITEMP (op2) &&
-      sym1->isspilt &&
-      (sym1->usl.spillLoc == sym2))
+  if (IS_ITEMP (op1) && !IS_ITEMP (op2) && sym1->isspilt && (sym1->usl.spillLoc == sym2))
     return 3;
 
-  if (IS_ITEMP (op2) &&
-      !IS_ITEMP (op1) &&
-      sym2->isspilt &&
-      sym1->level > 0 &&
-      (sym2->usl.spillLoc == sym1))
+  if (IS_ITEMP (op2) && !IS_ITEMP (op1) && sym2->isspilt && sym1->level > 0 && (sym2->usl.spillLoc == sym1))
     return 4;
 
   return FALSE;
@@ -1448,23 +1406,20 @@
 {
   int i;
 
-  if (aop1->type == AOP_SFR ||
-      aop2->type == AOP_SFR)
+  if (aop1->type == AOP_SFR || aop2->type == AOP_SFR)
     return FALSE;
 
   if (aop1 == aop2)
     return TRUE;
 
-  if (aop1->type != AOP_REG ||
-      aop2->type != AOP_REG)
+  if (aop1->type != AOP_REG || aop2->type != AOP_REG)
     return FALSE;
 
   if (aop1->size != aop2->size)
     return FALSE;
 
   for (i = 0; i < aop1->size; i++)
-    if (aop1->aopu.aop_reg[i] !=
-        aop2->aopu.aop_reg[i])
+    if (aop1->aopu.aop_reg[i] != aop2->aopu.aop_reg[i])
       return FALSE;
 
   return TRUE;
@@ -1474,7 +1429,7 @@
 /* aopOp - allocates an asmop for an operand  :                    */
 /*-----------------------------------------------------------------*/
 static void
-aopOp (operand *op, const iCode *ic, bool result, bool requires_a)
+aopOp (operand * op, const iCode * ic, bool result, bool requires_a)
 {
   asmop *aop;
   symbol *sym;
@@ -1497,7 +1452,7 @@
     {
       if (op->aop->type == AOP_SFR)
         {
-          op->aop->bcInUse = isPairInUse( PAIR_BC, ic );
+          op->aop->bcInUse = isPairInUse (PAIR_BC, ic);
         }
       return;
     }
@@ -1508,7 +1463,7 @@
       op->aop = OP_SYMBOL (op)->aop;
       if (op->aop->type == AOP_SFR)
         {
-          op->aop->bcInUse = isPairInUse( PAIR_BC, ic );
+          op->aop->bcInUse = isPairInUse (PAIR_BC, ic);
         }
       return;
     }
@@ -1559,62 +1514,62 @@
             {
               aop = op->aop = sym->aop = newAsmop (AOP_ACC);
               aop->size = getSize (sym->type);
-              wassertl(aop->size == 1, "Internal error: Caching in A, but too big to fit in A");
+              wassertl (aop->size == 1, "Internal error: Caching in A, but too big to fit in A");
 
               aop->aopu.aop_str[0] = _pairs[PAIR_AF].h;
             }
+#if 0                           // HL is not handled as any other register pair.
           else if (sym->accuse == ACCUSE_SCRATCH)
             {
               aop = op->aop = sym->aop = newAsmop (AOP_HLREG);
               aop->size = getSize (sym->type);
-              wassertl(aop->size <= 2, "Internal error: Caching in HL, but too big to fit in HL");
+              wassertl (aop->size <= 2, "Internal error: Caching in HL, but too big to fit in HL");
               aop->aopu.aop_str[0] = _pairs[PAIR_HL].l;
               aop->aopu.aop_str[1] = _pairs[PAIR_HL].h;
             }
+#endif
           else if (sym->accuse == ACCUSE_IY)
             {
               aop = op->aop = sym->aop = newAsmop (AOP_HLREG);
               aop->size = getSize (sym->type);
-              wassertl(aop->size <= 2, "Internal error: Caching in IY, but too big to fit in IY");
+              wassertl (aop->size <= 2, "Internal error: Caching in IY, but too big to fit in IY");
               aop->aopu.aop_str[0] = _pairs[PAIR_IY].l;
               aop->aopu.aop_str[1] = _pairs[PAIR_IY].h;
             }
           else
             {
-              wassertl (0, "Marked as being allocated into A or HL but is actually in neither");
+              wassertl (0, "Marked as being allocated into A or IY but is actually in neither");
             }
           return;
         }
-        
+
       /* rematerialize it NOW */
       if (sym->remat)
         {
-          sym->aop = op->aop = aop =
-            aopForRemat (sym);
+          sym->aop = op->aop = aop = aopForRemat (sym);
           aop->size = getSize (sym->type);
           return;
         }
 
-      if (regalloc_dry_run)	// Todo: Handle dummy iTemp correctly
+      if (regalloc_dry_run)     // Todo: Handle dummy iTemp correctly
         {
           sym->aop = op->aop = aop = newAsmop (AOP_STK);
           aop->size = getSize (sym->type);
           return;
         }
-        
+
       if (sym->usl.spillLoc)
         {
           asmop *oldAsmOp = NULL;
 
-          if (getSize(sym->type) != getSize(sym->usl.spillLoc->type))
+          if (getSize (sym->type) != getSize (sym->usl.spillLoc->type))
             {
               /* force a new aop if sizes differ */
               oldAsmOp = sym->usl.spillLoc->aop;
               sym->usl.spillLoc->aop = NULL;
             }
-          sym->aop = op->aop = aop =
-                     aopForSym (ic, sym->usl.spillLoc, result, requires_a);
-          if (getSize(sym->type) != getSize(sym->usl.spillLoc->type))
+          sym->aop = op->aop = aop = aopForSym (ic, sym->usl.spillLoc, result, requires_a);
+          if (getSize (sym->type) != getSize (sym->usl.spillLoc->type))
             {
               /* Don't reuse the new aop, go with the last one */
               sym->usl.spillLoc->aop = oldAsmOp;
@@ -1643,7 +1598,7 @@
 /* freeAsmop - free up the asmop given to an operand               */
 /*----------------------------------------------------------------*/
 static void
-freeAsmop (operand *op, asmop *aaop, const iCode *ic)
+freeAsmop (operand * op, asmop * aaop, const iCode * ic)
 {
   asmop *aop;
 
@@ -1687,7 +1642,7 @@
 }
 
 static bool
-isLitWord (const asmop *aop)
+isLitWord (const asmop * aop)
 {
   /*    if (aop->size != 2)
      return FALSE; */
@@ -1702,7 +1657,7 @@
 }
 
 static const char *
-aopGetLitWordLong (const asmop *aop, int offset, bool with_hash)
+aopGetLitWordLong (const asmop * aop, int offset, bool with_hash)
 {
   static struct dbuf_s dbuf = { 0 };
 
@@ -1737,50 +1692,51 @@
       break;
 
     case AOP_LIT:
-      {
-        value *val = aop->aopu.aop_lit;
-        /* if it is a float then it gets tricky */
-        /* otherwise it is fairly simple */
-        if (!IS_FLOAT (val->type))
-          {
-            unsigned long v = ulFromVal (val);
+    {
+      value *val = aop->aopu.aop_lit;
+      /* if it is a float then it gets tricky */
+      /* otherwise it is fairly simple */
+      if (!IS_FLOAT (val->type))
+        {
+          unsigned long v = ulFromVal (val);
 
-            if (offset == 2)
-              {
-                v >>= 16;
-              }
-            else if (offset == 0)
-              {
-                // OK
-              }
-            else
-              {
-                wassertl(0, "Encountered an invalid offset while fetching a literal");
-              }
+          if (offset == 2)
+            {
+              v >>= 16;
+            }
+          else if (offset == 0)
+            {
+              // OK
+            }
+          else
+            {
+              wassertl (0, "Encountered an invalid offset while fetching a literal");
+            }
 
-            dbuf_tprintf (&dbuf, with_hash ? "!immedword" : "!constword", v);
-          }
-        else
+          dbuf_tprintf (&dbuf, with_hash ? "!immedword" : "!constword", v & 0xfffful);
+        }
+      else
+        {
+          union
           {
-            union {
-              float f;
-              unsigned char c[4];
-            }
-            fl;
-            unsigned int i;
+            float f;
+            unsigned char c[4];
+          }
+          fl;
+          unsigned int i;
 
-            /* it is type float */
-            fl.f = (float) floatFromVal (val);
+          /* it is type float */
+          fl.f = (float) floatFromVal (val);
 
 #ifdef WORDS_BIGENDIAN
-            i = fl.c[3-offset] | (fl.c[3-offset-1]<<8);
+          i = fl.c[3 - offset] | (fl.c[3 - offset - 1] << 8);
 #else
-            i = fl.c[offset] | (fl.c[offset+1]<<8);
+          i = fl.c[offset] | (fl.c[offset + 1] << 8);
 #endif
-            dbuf_tprintf (&dbuf, with_hash ? "!immedword" : "!constword", i);
-          }
-      }
-      break;
+          dbuf_tprintf (&dbuf, with_hash ? "!immedword" : "!constword", i);
+        }
+    }
+    break;
 
     case AOP_HLREG:
     case AOP_REG:
@@ -1841,34 +1797,36 @@
 }
 
 static bool
-requiresHL (const asmop *aop)
+requiresHL (const asmop * aop)
 {
   switch (aop->type)
     {
     case AOP_IY:
     case AOP_HL:
-    case AOP_STK:
     case AOP_EXSTK:
     case AOP_HLREG:
-
       return TRUE;
+    case AOP_STK:
+      return (IS_GB || _G.omitFramePtr);
     case AOP_REG:
-      {
-        int i;
-        for (i = 0; i < aop->size; i++)
-          {
-            wassert (aop->aopu.aop_reg[i]);
-            if (aop->aopu.aop_reg[i]->rIdx == L_IDX || aop->aopu.aop_reg[i]->rIdx == H_IDX)
-              return TRUE;
-          }
-      }
+    {
+      int i;
+      for (i = 0; i < aop->size; i++)
+        {
+          wassert (aop->aopu.aop_reg[i]);
+          if (aop->aopu.aop_reg[i]->rIdx == L_IDX || aop->aopu.aop_reg[i]->rIdx == H_IDX)
+            return TRUE;
+        }
+    }
+    case AOP_PAIRPTR:
+      return (aop->aopu.aop_pairId == PAIR_HL);
     default:
       return FALSE;
     }
 }
 
 static void
-fetchLitPair (PAIR_ID pairId, asmop *left, int offset)
+fetchLitPair (PAIR_ID pairId, asmop * left, int offset)
 {
   const char *pair = _pairs[pairId].name;
   char *l = Safe_strdup (aopGetLitWordLong (left, offset, FALSE));
@@ -1877,27 +1835,27 @@
 
   wassert (pair);
 
-  emitDebug(";fetchLitPair");
+  emitDebug (";fetchLitPair");
 
   if (isPtr (pair))
     {
       if (pairId == PAIR_HL || pairId == PAIR_IY)
         {
-          if (pairId == PAIR_HL && base[0] == '0') // Ugly workaround
+          if (pairId == PAIR_HL && base[0] == '0')      // Ugly workaround
             {
-               unsigned int tmpoffset;
-               const char *tmpbase;
-               if(sscanf(base, "%xd", &tmpoffset) && (tmpbase = strchr(base , '+')))
-                 {
-                   offset = tmpoffset;
-                   base = tmpbase++;
-                 }
+              unsigned int tmpoffset;
+              const char *tmpbase;
+              if (sscanf (base, "%xd", &tmpoffset) && (tmpbase = strchr (base, '+')))
+                {
+                  offset = tmpoffset;
+                  base = tmpbase++;
+                }
             }
           if ((_G.pairs[pairId].last_type == AOP_IMMD && left->type == AOP_IMMD) ||
-            (_G.pairs[pairId].last_type == AOP_IY && left->type == AOP_IY) ||
-            (_G.pairs[pairId].last_type == AOP_HL && left->type == AOP_HL))
+              (_G.pairs[pairId].last_type == AOP_IY && left->type == AOP_IY) ||
+              (_G.pairs[pairId].last_type == AOP_HL && left->type == AOP_HL))
             {
-              if (!regalloc_dry_run && _G.pairs[pairId].base && !strcmp (_G.pairs[pairId].base, base)) // Todo: Exact cost.
+              if (!regalloc_dry_run && _G.pairs[pairId].base && !strcmp (_G.pairs[pairId].base, base))  // Todo: Exact cost.
                 {
                   if (pairId == PAIR_HL && abs (_G.pairs[pairId].offset - offset) < 3)
                     {
@@ -1913,7 +1871,7 @@
         }
 
       if (pairId == PAIR_HL && left->type == AOP_LIT && _G.pairs[pairId].last_type == AOP_LIT &&
-        !IS_FLOAT (left->aopu.aop_lit->type) && offset == 0 && _G.pairs[pairId].offset == 0)
+          !IS_FLOAT (left->aopu.aop_lit->type) && offset == 0 && _G.pairs[pairId].offset == 0)
         {
           unsigned new_low, new_high, old_low, old_high;
           unsigned long v_new = ulFromVal (left->aopu.aop_lit);
@@ -1924,13 +1882,13 @@
           old_high = (v_old >> 8) & 0xff;
 
           /* Change lower byte only. */
-          if(new_high == old_high)
+          if (new_high == old_high)
             {
               emit3_o (A_LD, ASMOP_L, 0, left, 0);
               goto adjusted;
             }
           /* Change upper byte only. */
-          else if(new_low == old_low)
+          else if (new_low == old_low)
             {
               emit3_o (A_LD, ASMOP_H, 0, left, 1);
               goto adjusted;
@@ -1939,7 +1897,7 @@
 
 
       _G.pairs[pairId].last_type = left->type;
-      _G.pairs[pairId].base = traceAlloc(&_G.trace.aops, Safe_strdup (base));
+      _G.pairs[pairId].base = traceAlloc (&_G.trace.aops, Safe_strdup (base));
       _G.pairs[pairId].offset = offset;
     }
   /* Both a lit on the right and a true symbol on the left */
@@ -1951,24 +1909,24 @@
 
 adjusted:
   _G.pairs[pairId].last_type = left->type;
-  _G.pairs[pairId].base = traceAlloc(&_G.trace.aops, Safe_strdup (base));
+  _G.pairs[pairId].base = traceAlloc (&_G.trace.aops, Safe_strdup (base));
   _G.pairs[pairId].offset = offset;
   Safe_free (base_str);
   Safe_free (l);
 }
 
 static PAIR_ID
-makeFreePairId (const iCode *ic, bool *pisUsed)
+makeFreePairId (const iCode * ic, bool * pisUsed)
 {
   *pisUsed = FALSE;
 
   if (ic != NULL)
     {
-      if (!bitVectBitValue (ic->rMask, B_IDX) && !bitVectBitValue(ic->rMask, C_IDX))
+      if (!bitVectBitValue (ic->rMask, B_IDX) && !bitVectBitValue (ic->rMask, C_IDX))
         {
           return PAIR_BC;
         }
-      else if (!IS_GB && !bitVectBitValue (ic->rMask, D_IDX) && !bitVectBitValue(ic->rMask, E_IDX))
+      else if (!IS_GB && !bitVectBitValue (ic->rMask, D_IDX) && !bitVectBitValue (ic->rMask, E_IDX))
         {
           return PAIR_DE;
         }
@@ -1985,37 +1943,61 @@
     }
 }
 
+/* If ic != 0, we can safely use isPairDead(). */
 static void
-fetchPairLong (PAIR_ID pairId, asmop *aop, const iCode *ic, int offset)
+fetchPairLong (PAIR_ID pairId, asmop * aop, const iCode * ic, int offset)
 {
-    emitDebug(";fetchPairLong");
+  emitDebug (";fetchPairLong");
 
-    /* if this is rematerializable */
-    if (isLitWord (aop))
-      fetchLitPair (pairId, aop, offset);
-    else
-      {
-        if (getPairId (aop) == pairId)
-          {
-            /* Do nothing */
-          }
-        /* we need to get it byte by byte */
-        else if (pairId == PAIR_HL && (IS_GB || (IY_RESERVED && aop->type == AOP_HL)) && requiresHL (aop))
-          {
-            if (!regalloc_dry_run) // TODO: Fix this to get correct cost!
-              aopGet (aop, offset, FALSE);
-            switch (aop->size - offset) {
+  /* if this is rematerializable */
+  if (isLitWord (aop))
+    fetchLitPair (pairId, aop, offset);
+  else
+    {
+      if (getPairId (aop) == pairId)
+        {
+          /* Do nothing */
+        }
+      /* Getting the parameter by a pop / push sequence is cheaper when we have a free pair (except for the Rabbit, which has an even cheaper sp-relative load).
+         Stack allocation can change after register allocation, so assume this optimization is not possible for the allcoator's cost function. */
+      else if (!regalloc_dry_run && !IS_RAB && aop->size - offset >= 2 &&
+               (aop->type == AOP_STK || aop->type == AOP_EXSTK)
+               && (aop->aopu.aop_stk + offset + _G.stack.offset + (aop->aopu.aop_stk > 0 ? _G.stack.param_offset : 0) +
+                   _G.stack.pushed) == 2 && ic && (pairId != PAIR_BC && isPairDead (PAIR_BC, ic) || pairId != PAIR_DE
+                       && isPairDead (PAIR_DE, ic)))
+        {
+          PAIR_ID extrapair = (pairId != PAIR_BC && isPairDead (PAIR_BC, ic)) ? PAIR_BC : PAIR_DE;
+          _pop (extrapair);
+          _pop (pairId);
+          _push (pairId);
+          _push (extrapair);
+        }
+      /* Todo: Use even cheaper ex hl, (sp) and ex iy, (sp) when possible. */
+      else if (!regalloc_dry_run && (!IS_RAB || pairId == PAIR_BC || pairId == PAIR_DE) && aop->size - offset >= 2 &&
+               (aop->type == AOP_STK || aop->type == AOP_EXSTK)
+               && (aop->aopu.aop_stk + offset + _G.stack.offset + (aop->aopu.aop_stk > 0 ? _G.stack.param_offset : 0) +
+                   _G.stack.pushed) == 0)
+        {
+          _pop (pairId);
+          _push (pairId);
+        }
+      /* we need to get it byte by byte */
+      else if (pairId == PAIR_HL && (IS_GB || (IY_RESERVED && aop->type == AOP_HL)) && requiresHL (aop))
+        {
+          if (!regalloc_dry_run)        // TODO: Fix this to get correct cost!
+            aopGet (aop, offset, FALSE);
+          switch (aop->size - offset)
+            {
             case 1:
               emit2 ("ld l,!*hl");
               emit2 ("ld h,!immedbyte", 0);
               regalloc_dry_run_cost += 3;
               break;
-            case 2:
-              // PENDING: Requires that you are only fetching two bytes.
-            case 4:
-              if (IS_R2K)
+            default:
+              wassertl (aop->size - offset > 1, "Attempted to fetch no data into HL");
+              if (IS_RAB)
                 {
-                  emit2 ("ld hl, (hl)");
+                  emit2 ("ld hl, 0 (hl)");
                   regalloc_dry_run_cost += 3;
                 }
               else
@@ -2027,115 +2009,127 @@
                   regalloc_dry_run_cost += 4;
                 }
               break;
-            default:
-              wassertl (0, "Attempted to fetch too much data into HL");
-              break;
             }
-          }
-        else if (!IS_GB && aop->type == AOP_IY && !(pairId == PAIR_IY && aop->size < 2)) {
+        }
+      else if (!IS_GB && aop->type == AOP_IY && !(pairId == PAIR_IY && aop->size < 2))
+        {
           /* Instead of fetching relative to IY, just grab directly
              from the address IY refers to */
           emit2 ("ld %s,(%s)", _pairs[pairId].name, aopGetLitWordLong (aop, offset, FALSE));
           regalloc_dry_run_cost += (pairId == PAIR_IY ? 4 : 3);
 
-          if (aop->size < 2) {
-            emit2("ld %s,!zero", _pairs[pairId].h);
-            regalloc_dry_run_cost += 2;
-          }
+          if (aop->size < 2)
+            {
+              emit2 ("ld %s,!zero", _pairs[pairId].h);
+              regalloc_dry_run_cost += 2;
+            }
         }
-        else if (pairId == PAIR_IY)
-          {
-#ifdef ALL_RABBIT
-            if (isPair (aop) && IS_R2K && getPairId (aop) == PAIR_HL)
-              {
-                emit2 ("ld iy, hl");
-                regalloc_dry_run_cost += 2;
-              }
-#endif
-            if (isPair (aop))
-              {
-                emit2 ("push %s", _pairs[getPairId(aop)].name);
-                emit2 ("pop iy");
-                regalloc_dry_run_cost += 3;
-              }
-            else
-              {
-                bool isUsed;
-                PAIR_ID id = makeFreePairId (ic, &isUsed);
-                if (isUsed)
-                  _push (id);
-                /* Can't load into parts, so load into HL then exchange. */
-                if (!regalloc_dry_run)
-                  {
-                    emit2 ("ld %s,%s", _pairs[id].l, aopGet (aop, offset, FALSE));
-                    emit2 ("ld %s,%s", _pairs[id].h, aopGet (aop, offset + 1, FALSE));
-                    
-                  }
-                regalloc_dry_run_cost += ld_cost(ASMOP_L, aop) + ld_cost(ASMOP_H, aop);
-#ifdef ALL_RABBIT
-                if (IS_R2K && id == PAIR_HL) ld iy, hl is not yet supported by the assembler
-                  {
-                    emit2 ("ld iy, hl");
-                    regalloc_dry_run_cost += 2;
-                  }
-                else
-#endif
-                  {
-                    emit2 ("push %s", _pairs[id].name);
-                    emit2 ("pop iy");
-                    regalloc_dry_run_cost += 3;
-                  }
-                if (isUsed)
-                  _pop (id);
-              }
-          }
-        else if (isUnsplitable(aop))
-          {
-            emit2("push %s", _pairs[getPairId(aop)].name);
-            emit2("pop %s", _pairs[pairId].name);
-            regalloc_dry_run_cost += (pairId == PAIR_IY ? 2 : 1) + (getPairId(aop) == PAIR_IY ? 2 : 1);
-          }
-        else
-          {
-            /* The Rabbit has the ld hl, n (sp) and ld hl, n (ix) instructions. */
-            int fp_offset = aop->aopu.aop_stk + offset + _G.stack.offset + (aop->aopu.aop_stk > 0 ? _G.stack.param_offset : 0);
-            int sp_offset = fp_offset + _G.stack.pushed;
-            if (IS_GB && aop->size - offset >= 2 && aop->type == AOP_STK && pairId == PAIR_HL && abs (sp_offset) <= 127)
-              {
-                emit2 ("ld hl, %d (sp)", sp_offset); /* Fetch relative to stack pointer. */
-              }
-            else if (IS_R2K && aop->size - offset >= 2 && aop->type == AOP_STK && (pairId == PAIR_HL || pairId == PAIR_IY) &&
-              (abs (fp_offset) <= 127 && pairId == PAIR_HL || abs (sp_offset) <= 127))
-              {
-                if (abs (sp_offset) <= 127)
-                  emit2 ("ld %s, %d (sp)", pairId == PAIR_IY ? "iy" : "hl", sp_offset); /* Fetch relative to stack pointer. */
-                else
-                  emit2 ("ld hl, %d (ix)", fp_offset); /* Fetch relative to frame pointer. */
-                regalloc_dry_run_cost += (pairId == PAIR_HL ? 2 : 3);
-              }
+      else if (pairId == PAIR_IY)
+        {
+          if (isPair (aop) && IS_RAB && getPairId (aop) == PAIR_HL)
+            {
+              emit2 ("ld iy, hl");
+              regalloc_dry_run_cost += 2;
+            }
+          else if (isPair (aop))
+            {
+              emit2 ("push %s", _pairs[getPairId (aop)].name);
+              emit2 ("pop iy");
+              regalloc_dry_run_cost += 3;
+            }
+          else
+            {
+              bool isUsed;
+              PAIR_ID id = makeFreePairId (ic, &isUsed);
+              if (isUsed)
+                _push (id);
+              /* Can't load into parts, so load into HL then exchange. */
+              if (!regalloc_dry_run)
+                {
+                  emit2 ("ld %s,%s", _pairs[id].l, aopGet (aop, offset, FALSE));
+                  emit2 ("ld %s,%s", _pairs[id].h, aopGet (aop, offset + 1, FALSE));
+                }
+              regalloc_dry_run_cost += ld_cost (ASMOP_L, aop) + ld_cost (ASMOP_H, aop);
 
-            /* Operand resides (partially) in the pair */
-            else if (!regalloc_dry_run && !strcmp(aopGet (aop, offset + 1, FALSE), _pairs[pairId].l))	// Todo: Exact cost
-              {
-                _moveA3 (aop, offset + 1);
-                if(!regalloc_dry_run)
+              if (IS_RAB && id == PAIR_HL)
+                {
+                  emit2 ("ld iy, hl");
+                  regalloc_dry_run_cost += 2;
+                }
+              else
+                {
+                  emit2 ("push %s", _pairs[id].name);
+                  emit2 ("pop iy");
+                  regalloc_dry_run_cost += 3;
+                }
+              if (isUsed)
+                _pop (id);
+            }
+        }
+      else if (isUnsplitable (aop))
+        {
+          emit2 ("push %s", _pairs[getPairId (aop)].name);
+          emit2 ("pop %s", _pairs[pairId].name);
+          regalloc_dry_run_cost += (pairId == PAIR_IY ? 2 : 1) + (getPairId (aop) == PAIR_IY ? 2 : 1);
+        }
+      else
+        {
+          /* The Rabbit has the ld hl, n (sp) and ld hl, n (ix) instructions. */
+          int fp_offset = aop->aopu.aop_stk + offset + _G.stack.offset + (aop->aopu.aop_stk > 0 ? _G.stack.param_offset : 0);
+          int sp_offset = fp_offset + _G.stack.pushed;
+          if (IS_RAB && aop->size - offset >= 2 && (aop->type == AOP_STK || aop->type == AOP_EXSTK)
+              && (pairId == PAIR_HL || pairId == PAIR_IY || pairId == PAIR_DE) && (abs (fp_offset) <= 127 && pairId == PAIR_HL
+                  && aop->type == AOP_STK
+                  || abs (sp_offset) <= 127))
+            {
+              if (pairId == PAIR_DE)
+                {
+                  emit2 ("ex de, hl");
+                  regalloc_dry_run_cost += 1;
+                }
+              if (abs (sp_offset) <= 127)
+                emit2 ("ld %s, %d (sp)", pairId == PAIR_IY ? "iy" : "hl", sp_offset);   /* Fetch relative to stack pointer. */
+              else
+                emit2 ("ld hl, %d (ix)", fp_offset);    /* Fetch relative to frame pointer. */
+              regalloc_dry_run_cost += (pairId == PAIR_IY ? 3 : 2);
+              if (pairId == PAIR_DE)
+                {
+                  emit2 ("ex de, hl");
+                  regalloc_dry_run_cost += 1;
+                }
+            }
+
+          /* Operand resides (partially) in the pair */
+          else if (!regalloc_dry_run && !strcmp (aopGet (aop, offset + 1, FALSE), _pairs[pairId].l))    // aopGet (aop, offset + 1, FALSE) is problematic: It prevents calcualtion of exact cost, and results in redundatn code being generated. Todo: Exact cost
+            {
+              _moveA3 (aop, offset + 1);
+              if (!regalloc_dry_run)
+                emit2 ("ld %s,%s", _pairs[pairId].l, aopGet (aop, offset, FALSE));
+              regalloc_dry_run_cost += ld_cost (ASMOP_A, aop);
+              emit2 ("ld %s,a", _pairs[pairId].h);
+              regalloc_dry_run_cost += 1;
+            }
+          /* The Rabbit's cast to bool is a cheap way of zeroing h (similar to xor a, a for a for the Z80). */
+          else if (pairId == PAIR_HL && IS_RAB && aop->size - offset == 1 && !(aop->type == AOP_REG && (aop->aopu.aop_reg[offset]->rIdx == L_IDX || aop->aopu.aop_reg[offset]->rIdx == H_IDX)))
+            {
+              emit2 ("bool hl");
+              regalloc_dry_run_cost++;
+              if (!regalloc_dry_run)
+                emit2 ("ld %s,%s", _pairs[pairId].l, aopGet (aop, offset, FALSE));
+              regalloc_dry_run_cost += ld_cost (ASMOP_L, aop);
+            }
+          else
+            {
+              if (!regalloc_dry_run)
+                {
                   emit2 ("ld %s,%s", _pairs[pairId].l, aopGet (aop, offset, FALSE));
-                regalloc_dry_run_cost += ld_cost(ASMOP_A, aop);
-                emit2 ("ld %s,a", _pairs[pairId].h);
-                regalloc_dry_run_cost += 1;
-              }
-            else
-              {
-                if(!regalloc_dry_run)
-                  {
-                    emit2 ("ld %s,%s", _pairs[pairId].l, aopGet (aop, offset, FALSE));
-                    emit2 ("ld %s,%s", _pairs[pairId].h, aopGet (aop, offset + 1, FALSE));
-                  }
-                regalloc_dry_run_cost += ld_cost(ASMOP_L, aop) * 2;           
-              }
-          }
-        /* PENDING: check? */
-        spillPair (pairId);
+                  emit2 ("ld %s,%s", _pairs[pairId].h, aopGet (aop, offset + 1, FALSE));
+                }
+              regalloc_dry_run_cost += ld_cost (ASMOP_L, aop) * 2;
+            }
+        }
+      /* PENDING: check? */
+      spillPair (pairId);
     }
 }
 
@@ -2146,12 +2140,6 @@
 }
 
 static void
-fetchHL (asmop * aop)
-{
-  fetchPair (PAIR_HL, aop);
-}
-
-static void
 setupPairFromSP (PAIR_ID id, int offset)
 {
   wassertl (id == PAIR_HL, "Setup relative to SP only implemented for HL");
@@ -2171,7 +2159,7 @@
   else
     {
       emit2 ("!ldahlsp", offset);
-      regalloc_dry_run_cost += 4;	// Todo: More exact cost.
+      regalloc_dry_run_cost += 3;
     }
 
   if (_G.preserveCarry)
@@ -2182,7 +2170,7 @@
 }
 
 static void
-setupPair (PAIR_ID pairId, asmop *aop, int offset)
+setupPair (PAIR_ID pairId, asmop * aop, int offset)
 {
   switch (aop->type)
     {
@@ -2233,27 +2221,27 @@
       break;
 
     case AOP_STK:
-      {
-        /* Doesnt include _G.stack.pushed */
-        int abso = aop->aopu.aop_stk + offset + _G.stack.offset + (aop->aopu.aop_stk > 0 ? _G.stack.param_offset : 0);
+    {
+      /* Doesnt include _G.stack.pushed */
+      int abso = aop->aopu.aop_stk + offset + _G.stack.offset + (aop->aopu.aop_stk > 0 ? _G.stack.param_offset : 0);
 
-        assert (pairId == PAIR_HL);
-        /* In some cases we can still inc or dec hl */
-        if (_G.pairs[pairId].last_type == AOP_STK && abs (_G.pairs[pairId].offset - abso) < 3)
-          {
-            adjustPair (_pairs[pairId].name, &_G.pairs[pairId].offset, abso);
-          }
-        else
-          {
-            setupPairFromSP (PAIR_HL, abso + _G.stack.pushed);
-          }
-        _G.pairs[pairId].offset = abso;
-        break;
-      }
+      assert (pairId == PAIR_HL);
+      /* In some cases we can still inc or dec hl */
+      if (_G.pairs[pairId].last_type == AOP_STK && abs (_G.pairs[pairId].offset - abso) < 3)
+        {
+          adjustPair (_pairs[pairId].name, &_G.pairs[pairId].offset, abso);
+        }
+      else
+        {
+          setupPairFromSP (PAIR_HL, abso + _G.stack.pushed);
+        }
+      _G.pairs[pairId].offset = abso;
+      break;
+    }
 
     case AOP_PAIRPTR:
       if (pairId != aop->aopu.aop_pairId)
-        genMovePairPair(aop->aopu.aop_pairId, pairId);
+        genMovePairPair (aop->aopu.aop_pairId, pairId);
       adjustPair (_pairs[pairId].name, &_G.pairs[pairId].offset, offset);
       break;
 
@@ -2263,19 +2251,10 @@
   _G.pairs[pairId].last_type = aop->type;
 }
 
-/* Can be used for local labels where Code generation takes care of spilling */
-static void
-emitLabelNoSpill (int key)
-{
-  emit2 ("!tlabeldef", key);
-  _G.lines.current->isLabel = 1;
-}
-
 static void
-emitLabel (int key)
+emitLabelSpill (symbol * tlbl)
 {
-  emit2 ("!tlabeldef", key);
-  _G.lines.current->isLabel = 1;
+  emitLabel (tlbl);
   spillCached ();
 }
 
@@ -2344,6 +2323,7 @@
         case AOP_DIR:
           wassert (IS_GB);
           emit2 ("ld a,(%s+%d)", aop->aopu.aop_dir, offset);
+          regalloc_dry_run_cost += 3;
           dbuf_append_char (&dbuf, 'a');
           break;
 
@@ -2351,29 +2331,34 @@
           if (IS_GB)
             {
               emit2 ("ldh a,(%s+%d)", aop->aopu.aop_dir, offset);
+              regalloc_dry_run_cost += 2;
               dbuf_append_char (&dbuf, 'a');
             }
-          else if (IS_R2K)
+          else if (IS_RAB)
             {
               emit2 ("ioi");
               emit2 ("ld a,(%s)", aop->aopu.aop_dir);
-              emit2 ("nop");	/* Workaround for Rabbit 2000 hardware bug. see TN302 for details. */
+              emit2 ("nop");    /* Workaround for Rabbit 2000 hardware bug. see TN302 for details. */
               dbuf_append_char (&dbuf, 'a');
             }
           else
-            {                   /*.p.t.20030716 handling for i/o port read access for Z80 */
+            {
+              /*.p.t.20030716 handling for i/o port read access for Z80 */
               if (aop->paged)
-                {               /* banked mode */
+                {
+                  /* banked mode */
                   /* reg A goes to address bits 15-8 during "in a,(x)" instruction */
                   emit2 ("ld a,!msbimmeds", aop->aopu.aop_dir);
                   emit2 ("in a,(!lsbimmeds)", aop->aopu.aop_dir);
                 }
               else if (z80_opts.port_mode == 180)
-                {               /* z180 in0/out0 mode */
+                {
+                  /* z180 in0/out0 mode */
                   emit2 ("in0 a,(%s)", aop->aopu.aop_dir);
                 }
               else
-                {               /* 8 bit mode */
+                {
+                  /* 8 bit mode */
                   emit2 ("in a,(%s)", aop->aopu.aop_dir);
                 }
 
@@ -2447,13 +2432,16 @@
           break;
 
         case AOP_SIMPLELIT:
-          {
-            unsigned long v = aop->aopu.aop_simplelit;
+        {
+          unsigned long v = aop->aopu.aop_simplelit;
 
+          if (offset >= sizeof(v))
+            v = 0;
+          else
             v >>= (offset * 8);
-            dbuf_tprintf (&dbuf, "!immedbyte", (unsigned int) v & 0xff);
-          }
-          break;
+          dbuf_tprintf (&dbuf, "!immedbyte", (unsigned int) v & 0xff);
+        }
+        break;
 
         case AOP_STR:
           aop->coff = offset;
@@ -2483,12 +2471,7 @@
 isRegString (const char *s)
 {
   if (!strcmp (s, "b") ||
-      !strcmp (s, "c") ||
-      !strcmp (s, "d") ||
-      !strcmp (s, "e") ||
-      !strcmp (s, "a") ||
-      !strcmp (s, "h") ||
-      !strcmp (s, "l"))
+      !strcmp (s, "c") || !strcmp (s, "d") || !strcmp (s, "e") || !strcmp (s, "a") || !strcmp (s, "h") || !strcmp (s, "l"))
     return TRUE;
   return FALSE;
 }
@@ -2500,6 +2483,12 @@
   return (*s == '#' || *s == '$');
 }
 
+#define AOP(op) op->aop
+#define AOP_TYPE(op) AOP(op)->type
+#define AOP_SIZE(op) AOP(op)->size
+#define AOP_NEEDSACC(x) (AOP(x) && ((AOP_TYPE(x) == AOP_CRY) || (AOP_TYPE(x) == AOP_SFR)))
+#define AOP_IS_PAIRPTR(x, p) (AOP_TYPE (x) == AOP_PAIRPTR && AOP (x)->aopu.aop_pairId == p)
+
 static bool
 canAssignToPtr (const char *s)
 {
@@ -2511,20 +2500,20 @@
 }
 
 static bool
-canAssignToPtr3 (const asmop *aop)
+canAssignToPtr3 (const asmop * aop)
 {
-  if(aop->type == AOP_ACC || aop->type == AOP_REG || aop->type == AOP_HLREG)
-    return(TRUE);
-  if(aop->type == AOP_IMMD || aop->type == AOP_LIT || aop->type == AOP_SIMPLELIT)
-    return(TRUE);
-  return(FALSE);
+  if (aop->type == AOP_ACC || aop->type == AOP_REG || aop->type == AOP_HLREG)
+    return (TRUE);
+  if (aop->type == AOP_IMMD || aop->type == AOP_LIT || aop->type == AOP_SIMPLELIT)
+    return (TRUE);
+  return (FALSE);
 }
 
 /*-----------------------------------------------------------------*/
 /* aopPut - puts a string for a aop                                */
 /*-----------------------------------------------------------------*/
 static void
-aopPut (asmop *aop, const char *s, int offset)
+aopPut (asmop * aop, const char *s, int offset)
 {
   struct dbuf_s dbuf;
 
@@ -2532,8 +2521,7 @@
 
   if (aop->size && offset > (aop->size - 1))
     {
-      werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
-              "aopPut got offset > aop->size");
+      werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "aopPut got offset > aop->size");
       exit (0);
     }
 
@@ -2547,7 +2535,7 @@
   switch (aop->type)
     {
     case AOP_DUMMY:
-      _moveA (s);  /* in case s is volatile */
+      _moveA (s);               /* in case s is volatile */
       break;
 
     case AOP_DIR:
@@ -2566,50 +2554,52 @@
             emit2 ("ld a,%s", s);
           emit2 ("ldh (%s+%d),a", aop->aopu.aop_dir, offset);
         }
-      else if (IS_R2K)
+      else if (IS_RAB)
         {
           if (strcmp (s, "a"))
             emit2 ("ld a,%s", s);
-	  
+
           /* LM 20110928: Need to fix to emit either "ioi" or "ioe"
            * (for internal vs. external I/O space
            */
           emit2 ("ioi");
           emit2 ("ld (%s),a", aop->aopu.aop_dir);
-          emit2 ("nop"); /* Workaround for Rabbit 2000 hardware bug. see TN302 for details. */
+          emit2 ("nop");        /* Workaround for Rabbit 2000 hardware bug. see TN302 for details. */
         }
       else
-        { /*.p.t.20030716 handling for i/o port read access for Z80 */
+        {
+          /*.p.t.20030716 handling for i/o port read access for Z80 */
           if (aop->paged)
-            { /* banked mode */
+            {
+              /* banked mode */
               if (aop->bcInUse)
-                emit2( "push bc" );
+                emit2 ("push bc");
 
-              if (strlen(s) != 1
-                  || (s[0] != 'a' && s[0] != 'd' && s[0] != 'e'
-                      && s[0] != 'h' && s[0] != 'l'))
+              if (strlen (s) != 1 || (s[0] != 'a' && s[0] != 'd' && s[0] != 'e' && s[0] != 'h' && s[0] != 'l'))
                 {
-                  emit2( "ld a,%s", s );
+                  emit2 ("ld a,%s", s);
                   s = "a";
                 }
 
-              emit2( "ld bc,#%s", aop->aopu.aop_dir );
-              emit2( "out (c),%s", s );
+              emit2 ("ld bc,#%s", aop->aopu.aop_dir);
+              emit2 ("out (c),%s", s);
 
-              if( aop->bcInUse )
-                emit2( "pop bc"    );
+              if (aop->bcInUse)
+                emit2 ("pop bc");
               else
                 spillPair (PAIR_BC);
             }
-          else if( z80_opts.port_mode == 180 )
-            { /* z180 in0/out0 mode */
-              emit2( "ld a,%s", s );
-              emit2( "out0 (%s),a", aop->aopu.aop_dir );
+          else if (z80_opts.port_mode == 180)
+            {
+              /* z180 in0/out0 mode */
+              emit2 ("ld a,%s", s);
+              emit2 ("out0 (%s),a", aop->aopu.aop_dir);
             }
           else
-            { /* 8 bit mode */
-              emit2( "ld a,%s", s );
-              emit2( "out (%s),a", aop->aopu.aop_dir );
+            {
+              /* 8 bit mode */
+              emit2 ("ld a,%s", s);
+              emit2 ("out (%s),a", aop->aopu.aop_dir);
             }
         }
       break;
@@ -2618,9 +2608,8 @@
       if (!strcmp (s, "!*hl"))
         emit2 ("ld %s,!*hl", aop->aopu.aop_reg[offset]->name);
       else
-        emit2 ("ld %s,%s",
-               aop->aopu.aop_reg[offset]->name, s);
-      spillPairReg(aop->aopu.aop_reg[offset]->name);
+        emit2 ("ld %s,%s", aop->aopu.aop_reg[offset]->name, s);
+      spillPairReg (aop->aopu.aop_reg[offset]->name);
       break;
 
     case AOP_IY:
@@ -2646,6 +2635,11 @@
           emit2 ("ld a,!*hl");
           s = "a";
         }
+      else if (strstr (s, "(ix)") || strstr (s, "(iy)"))
+        {
+          emit2 ("ld a, %s", s);
+          s = "a";
+        }
       setupPair (PAIR_HL, aop, offset);
 
       emit2 ("ld !*hl,%s", s);
@@ -2720,7 +2714,7 @@
         {
           emit2 ("ld %s,%s", aop->aopu.aop_str[offset], s);
         }
-      spillPairReg(aop->aopu.aop_str[offset]);
+      spillPairReg (aop->aopu.aop_str[offset]);
       break;
 
     case AOP_ACC:
@@ -2738,7 +2732,7 @@
           if (strcmp (aop->aopu.aop_str[offset], s))
             {
               emit2 ("ld %s,%s", aop->aopu.aop_str[offset], s);
-              spillPairReg(aop->aopu.aop_str[offset]);
+              spillPairReg (aop->aopu.aop_str[offset]);
             }
         }
       break;
@@ -2746,14 +2740,14 @@
     case AOP_HLREG:
       wassert (offset < 2);
       emit2 ("ld %s,%s", aop->aopu.aop_str[offset], s);
-      spillPairReg(aop->aopu.aop_str[offset]);
+      spillPairReg (aop->aopu.aop_str[offset]);
       break;
 
     case AOP_PAIRPTR:
       setupPair (aop->aopu.aop_pairId, aop, offset);
-      if (aop->aopu.aop_pairId==PAIR_IX)
+      if (aop->aopu.aop_pairId == PAIR_IX)
         emit2 ("ld !*ixx,%s", 0, s);
-      else if (aop->aopu.aop_pairId==PAIR_IY)
+      else if (aop->aopu.aop_pairId == PAIR_IY)
         emit2 ("ld !*iyx,%s", 0, s);
       else
         emit2 ("ld (%s),%s", _pairs[aop->aopu.aop_pairId].name, s);
@@ -2768,68 +2762,104 @@
 }
 
 static void
-aopPut3 (asmop *op1, int offset1, asmop *op2, int offset2)
+aopPut3 (asmop * op1, int offset1, asmop * op2, int offset2)
 {
   unsigned char cost = regalloc_dry_run_cost;
+  int fp_offset=0;
+  int sp_offset=0;
+
+  if (!regalloc_dry_run)
+    {
+      if ((op1->type == AOP_STK || op1->type == AOP_EXSTK))
+        {
+          fp_offset = op1->aopu.aop_stk + _G.stack.offset + offset1 + (op1->aopu.aop_stk > 0 ? _G.stack.param_offset : 0);
+          sp_offset = fp_offset + _G.stack.pushed;
+        }
+
+      if ((op1->type == AOP_STK || op1->type == AOP_EXSTK) && !sp_offset && _G.omitFramePtr && op1->size == 1 &&
+        (op2->type == AOP_REG && (op2->aopu.aop_reg[offset2]->rIdx == B_IDX || op2->aopu.aop_reg[offset2]->rIdx == D_IDX || op2->aopu.aop_reg[offset2]->rIdx == H_IDX) ||
+        op2->type == AOP_ACC && op2->size == 1) && !offset2)
+        {
+          emit2 ("inc sp");
+          emit2 ("push %s", op2->type == AOP_ACC ? "af" : (op2->aopu.aop_reg[offset2]->rIdx == B_IDX ? "bc" : (op2->aopu.aop_reg[offset2]->rIdx == D_IDX ? "de" : "hl")));
+          emit2 ("inc sp");
+          regalloc_dry_run_cost += 4;
+        }
+      else
+        aopPut (op1, aopGet (op2, offset2, FALSE), offset1);
+    }
 
-  if(!regalloc_dry_run)
-    aopPut (op1, aopGet(op2, offset2, FALSE), offset1);
-  regalloc_dry_run_cost = cost + ld_cost(op1, offset2 < op2->size ? op2 : ASMOP_ZERO);
+  regalloc_dry_run_cost = cost + ld_cost (op1, offset2 < op2->size ? op2 : ASMOP_ZERO);
 }
 
 // Move, but try not to.
 static void
-cheapMove (asmop *to, int to_offset, asmop *from, int from_offset)
+cheapMove (asmop * to, int to_offset, asmop * from, int from_offset)
 {
   /* Todo: Longer list of moves that can be optimized out. */
   if (to->type == AOP_ACC && from->type == AOP_ACC && to_offset == from_offset)
     return;
   if (to->type == AOP_REG && from->type == AOP_REG && to->aopu.aop_reg[to_offset] == from->aopu.aop_reg[from_offset])
     return;
-  if (to->type == AOP_HLREG && from->type == AOP_HLREG && !strcmp(to->aopu.aop_str[to_offset], from->aopu.aop_str[from_offset]))
+  if (to->type == AOP_HLREG && from->type == AOP_HLREG
+      && !strcmp (to->aopu.aop_str[to_offset], from->aopu.aop_str[from_offset]))
     return;
   aopPut3 (to, to_offset, from, from_offset);
 }
 
-#define AOP(op) op->aop
-#define AOP_TYPE(op) AOP(op)->type
-#define AOP_SIZE(op) AOP(op)->size
-#define AOP_NEEDSACC(x) (AOP(x) && ((AOP_TYPE(x) == AOP_CRY) || (AOP_TYPE(x) == AOP_SFR)))
-#define AOP_IS_PAIRPTR(x, p) (AOP_TYPE (x) == AOP_PAIRPTR && AOP (x)->aopu.aop_pairId == p)
-
 static void
-commitPair (asmop * aop, PAIR_ID id)
+commitPair (asmop *aop, PAIR_ID id, const iCode *ic, bool dont_destroy)
 {
   int fp_offset = aop->aopu.aop_stk + _G.stack.offset + (aop->aopu.aop_stk > 0 ? _G.stack.param_offset : 0);
   int sp_offset = fp_offset + _G.stack.pushed;
-  if (IS_R2K && aop->type == AOP_STK && (id == PAIR_HL || id == PAIR_IY) &&
-    (id == PAIR_HL && abs (fp_offset) <= 127 || abs (sp_offset) <= 127))
+
+  /* Stack positions will change, so do not assume this is possible in the cost function. */
+  if (!regalloc_dry_run && !IS_GB && (aop->type == AOP_STK || aop->type == AOP_EXSTK) && !sp_offset
+      && ((!IS_RAB && id == PAIR_HL) || id == PAIR_IY) && !dont_destroy)
+    {
+      emit2 ("ex (sp), %s", _pairs[id].name);
+      regalloc_dry_run_cost += ((id == PAIR_IY || IS_RAB) ? 2 : 1);
+      spillPair (id);
+    }
+  else if (IS_RAB && (aop->type == AOP_STK || aop->type == AOP_EXSTK) && (id == PAIR_HL || id == PAIR_IY) &&
+           (id == PAIR_HL && abs (fp_offset) <= 127 && aop->type == AOP_STK || abs (sp_offset) <= 127))
     {
       if (abs (sp_offset) <= 127)
-        emit2 ("ld %d (sp), %s", sp_offset, id == PAIR_IY ? "iy" : "hl"); /* Relative to stack pointer. */
+        emit2 ("ld %d (sp), %s", sp_offset, id == PAIR_IY ? "iy" : "hl");       /* Relative to stack pointer. */
       else
-        emit2 ("ld %d (ix), hl", fp_offset); /* Relative to frame pointer. */
+        emit2 ("ld %d (ix), hl", fp_offset);    /* Relative to frame pointer. */
       regalloc_dry_run_cost += (id == PAIR_HL ? 2 : 3);
     }
+  else if (!regalloc_dry_run && (aop->type == AOP_STK || aop->type == AOP_EXSTK) && !sp_offset)
+    {
+      emit2 ("inc sp");
+      emit2 ("inc sp");
+      emit2 ("push %s", _pairs[id].name);
+      regalloc_dry_run_cost += (id == PAIR_IY ? 5 : 4);
+    }
 
   /* PENDING: Verify this. */
   else if (id == PAIR_HL && requiresHL (aop) && (IS_GB || IY_RESERVED))
     {
-      if(!regalloc_dry_run)
+      if (bitVectBitValue (ic->rSurv, D_IDX))
+        _push (PAIR_DE);
+      if (!regalloc_dry_run)
         {
           emit2 ("ld a,l");
           emit2 ("ld d,h");
           aopPut (aop, "a", 0);
           aopPut (aop, "d", 1);
         }
-      regalloc_dry_run_cost += (2 + ld_cost(aop, ASMOP_A) + ld_cost(aop, ASMOP_D));
+      regalloc_dry_run_cost += (2 + ld_cost (aop, ASMOP_A) + ld_cost (aop, ASMOP_D));
+      if (bitVectBitValue (ic->rSurv, D_IDX))
+        _pop (PAIR_DE);
     }
   else
     {
       /* Special cases */
       if (id == PAIR_HL && aop->type == AOP_IY && aop->size == 2)
         {
-          if(!regalloc_dry_run)
+          if (!regalloc_dry_run)
             {
               emit2 ("ld (%s),%s", aopGetLitWordLong (aop, 0, FALSE), _pairs[id].name);
             }
@@ -2848,13 +2878,13 @@
               cheapMove (aop, 1, ASMOP_D, 0);
               break;
             case PAIR_HL:
-              if (aop->type == AOP_REG && aop->aopu.aop_reg[0]->rIdx == H_IDX && aop->aopu.aop_reg[1]->rIdx ==  L_IDX)
+              if (aop->type == AOP_REG && aop->aopu.aop_reg[0]->rIdx == H_IDX && aop->aopu.aop_reg[1]->rIdx == L_IDX)
                 {
                   cheapMove (ASMOP_A, 0, ASMOP_L, 0);
                   cheapMove (aop, 1, ASMOP_H, 0);
                   cheapMove (aop, 0, ASMOP_A, 0);
                 }
-              else if (aop->type == AOP_REG && aop->aopu.aop_reg[0]->rIdx ==  H_IDX) // Do not overwrite upper byte.
+              else if (aop->type == AOP_REG && aop->aopu.aop_reg[0]->rIdx == H_IDX)     // Do not overwrite upper byte.
                 {
                   cheapMove (aop, 1, ASMOP_H, 0);
                   cheapMove (aop, 0, ASMOP_L, 0);
@@ -2892,8 +2922,7 @@
 /* movLeft2Result - move byte from left to result                  */
 /*-----------------------------------------------------------------*/
 static void
-movLeft2Result (operand * left, int offl,
-                operand * result, int offr, int sign)
+movLeft2Result (operand * left, int offl, operand * result, int offr, int sign)
 {
   if (!sameRegs (AOP (left), AOP (result)) || (offl != offr))
     {
@@ -2911,9 +2940,7 @@
 }
 
 static void
-movLeft2ResultLong (operand * left, int offl,
-                operand * result, int offr, int sign,
-                int size)
+movLeft2ResultLong (operand * left, int offl, operand * result, int offr, int sign, int size)
 {
   if (size == 1)
     movLeft2Result (left, offl, result, offr, sign);
@@ -2922,20 +2949,20 @@
       wassertl (offl == 0 && offr == 0, "Only implemented for zero offset");
       wassertl (size == 2, "Only implemented for two bytes or one");
 
-      if ( IS_GB && requiresHL ( AOP (left)) && getPairId ( AOP (result)) == PAIR_HL)
+      if (IS_GB && requiresHL (AOP (left)) && getPairId (AOP (result)) == PAIR_HL)
         {
-          emit2 ("ld a,%s", aopGet (AOP (left), LSB, FALSE));
-          emit2 ("ld h,%s", aopGet (AOP (left), MSB16, FALSE));
-          emit2 ("ld l,a");
+          cheapMove (ASMOP_A, 0, AOP (left), LSB);
+          cheapMove (ASMOP_H, 0, AOP (left), MSB16);
+          cheapMove (ASMOP_L, 0, ASMOP_A, 0);
           spillPair (PAIR_HL);
         }
-      else if ( getPairId ( AOP (result)) == PAIR_IY)
+      else if (getPairId (AOP (result)) == PAIR_IY)
         {
           PAIR_ID id = getPairId (AOP (left));
           if (id != PAIR_INVALID)
             {
-              emit2("push %s", _pairs[id].name);
-              emit2("pop iy");
+              emit2 ("push %s", _pairs[id].name);
+              emit2 ("pop iy");
               regalloc_dry_run_cost += 3;
             }
           else
@@ -2946,7 +2973,7 @@
       else
         {
           movLeft2Result (left, offl, result, offr, sign);
-          movLeft2Result (left, offl+1, result, offr+1, sign);
+          movLeft2Result (left, offl + 1, result, offr + 1, sign);
         }
     }
 }
@@ -2978,7 +3005,7 @@
   if (AOP_TYPE (result) == AOP_CRY)
     {
       if (!IS_OP_RUONLY (result) && !regalloc_dry_run)
-        aopPut (AOP (result), "c", 0); // Todo: Cost.
+        aopPut (AOP (result), "c", 0);  // Todo: Cost.
     }
   else
     {
@@ -2993,7 +3020,7 @@
 /* toBoolean - emit code for or a,operator(sizeop)                 */
 /*-----------------------------------------------------------------*/
 static void
-_toBoolean (const operand *oper, bool needflag)
+_toBoolean (const operand * oper, bool needflag)
 {
   int size = AOP_SIZE (oper);
   sym_link *type = operandType (oper);
@@ -3004,7 +3031,7 @@
     {
       if (IS_FLOAT (type))
         {
-          emit2 ("res 7, a"); //clear sign bit
+          emit2 ("res 7, a");   //clear sign bit
           regalloc_dry_run_cost += 2;
           while (--size)
             emit3_o (A_OR, ASMOP_A, 0, AOP (oper), offset--);
@@ -3025,12 +3052,12 @@
 /* castBoolean - emit code for casting operand to boolean in a     */
 /*-----------------------------------------------------------------*/
 static void
-_castBoolean (const operand *right)
+_castBoolean (const operand * right)
 {
   emitDebug ("; Casting to bool");
 
   /* Can do without OR-ing for small arguments */
-  if (AOP_SIZE (right)== 1 && AOP_TYPE (right) != AOP_ACC)
+  if (AOP_SIZE (right) == 1 && AOP_TYPE (right) != AOP_ACC)
     {
       emit3 (A_XOR, ASMOP_A, ASMOP_A);
       emit3 (A_CP, ASMOP_A, AOP (right));
@@ -3047,47 +3074,50 @@
 }
 
 /* Shuffle src reg array into dst reg array. */
-static void regMove(short *dst, short *src, size_t n)
+static void
+regMove (const short *dst, const short *src, size_t n)
 {
-  bool assigned[8] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE};
+  bool assigned[8] = { FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE };
   int cached_byte = -1;
   size_t size = n;
-  
+
   wassert (n < 6);
 
   // We need to be able to handle any assignment here, ensuring not to overwrite any parts of the source that we still need.
-  while (size--)
+  while (size)
     {
       size_t i;
-              
+
       // Find lowest byte that can be assigned and needs to be assigned.
       for (i = 0; i < n; i++)
         {
           size_t j;
-                  
+
           if (assigned[i])
             continue;
-                    
+
           for (j = 0; j < n; j++)
             {
               if (!assigned[j] && i != j && dst[i] == src[j])
                 goto skip_byte; // We can't write this one without overwriting the source.
             }
-                  
-          break; // Found byte that can be written safely.
-                  
-          skip_byte:;
+
+          break;                // Found byte that can be written safely.
+
+skip_byte:
+          ;
         }
 
       if (i < n)
         {
-          cheapMove (asmopregs[dst[i]], 0, asmopregs[src[i]], 0); // We can safely assign a byte.
+          cheapMove (asmopregs[dst[i]], 0, asmopregs[src[i]], 0);       // We can safely assign a byte.
+          size--;
           assigned[i] = TRUE;
           continue;
         }
-              
+
       // No byte can be assigned safely (i.e. the assignment is a permutation). Cache one in the accumulator.
- 
+
       if (cached_byte != -1)
         {
           // Already one cached. Can happen when the assignment is a permutation consisting of multiple cycles.
@@ -3095,16 +3125,18 @@
           cached_byte = -1;
           continue;
         }
-              
+
       for (i = 0; i < n; i++)
         if (!assigned[i])
           break;
-      wassertl (i != n, "regMove error: Trying to cache non-existant byte in accumulator."); 
+
+      wassertl (i != n, "regMove error: Trying to cache non-existant byte in accumulator.");
       cheapMove (ASMOP_A, 0, asmopregs[src[i]], 0);
+      size--;
       assigned[i] = TRUE;
       cached_byte = i;
     }
-           
+
   if (cached_byte != -1)
     cheapMove (asmopregs[dst[cached_byte]], 0, ASMOP_A, 0);
 }
@@ -3115,8 +3147,8 @@
 static void
 genNot (const iCode * ic)
 {
-  operand *left = IC_LEFT(ic);
-  operand *result = IC_RESULT(ic);
+  operand *left = IC_LEFT (ic);
+  operand *result = IC_RESULT (ic);
 
   /* assign asmOps to operand & result */
   aopOp (left, ic, FALSE, TRUE);
@@ -3130,7 +3162,7 @@
   else if (IS_BOOL (operandType (left)))
     {
       cheapMove (ASMOP_A, 0, AOP (left), 0);
-      emit2 ("xor a,#0x01");
+      emit2 ("xor a, !immedbyte", 0x01);
       regalloc_dry_run_cost += 2;
       cheapMove (AOP (result), 0, ASMOP_A, 0);
       goto release;
@@ -3149,14 +3181,14 @@
 release:
   /* release the aops */
   freeAsmop (left, NULL, ic);
-  freeAsmop (result, NULL, ic); 
+  freeAsmop (result, NULL, ic);
 }
 
 /*-----------------------------------------------------------------*/
 /* genCpl - generate code for complement                           */
 /*-----------------------------------------------------------------*/
 static void
-genCpl (const iCode *ic)
+genCpl (const iCode * ic)
 {
   int offset = 0;
   int size;
@@ -3168,8 +3200,7 @@
 
   /* if both are in bit space then
      a special case */
-  if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY &&
-      AOP_TYPE (IC_LEFT (ic)) == AOP_CRY)
+  if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY && AOP_TYPE (IC_LEFT (ic)) == AOP_CRY)
     {
       wassertl (0, "Left and the result are in bit space");
     }
@@ -3188,58 +3219,62 @@
 }
 
 static void
-_gbz80_emitAddSubLongLong (const iCode *ic, asmop *left, asmop *right, bool isAdd)
+_gbz80_emitAddSubLongLong (const iCode * ic, asmop * left, asmop * right, bool isAdd)
 {
-  const char *first = isAdd ? "add" : "sub";
-  const char *later = isAdd ? "adc" : "sbc";
-
+  enum asminst first = isAdd ? A_ADD : A_SUB;
+  enum asminst later = isAdd ? A_ADC : A_SBC;
 
-  wassert (!regalloc_dry_run);
 
   /* Logic:
-       ld de,right.lw
-       setup hl to left
-       de = hl - de
-       push flags
-       store de into result
-       pop flags
-       ld de,right.hw
-       setup hl
-       de = hl -de
-       store de into result
-  */
+     ld de,right.lw
+     setup hl to left
+     de = hl - de
+     push flags
+     store de into result
+     pop flags
+     ld de,right.hw
+     setup hl
+     de = hl -de
+     store de into result
+   */
 
   wassertl (IS_GB, "Code is only relevant to the gbz80");
-  wassertl (AOP( IC_RESULT (ic))->size == 4, "Only works for four bytes");
+  wassertl (AOP (IC_RESULT (ic))->size == 4, "Only works for four bytes");
 
   fetchPair (PAIR_DE, left);
 
   emit2 ("ld a,e");
-  emit2 ("%s a,%s", first, aopGet( right, LSB, FALSE));
+  regalloc_dry_run_cost += 1;
+  emit3_o (first, ASMOP_A, 0, right, LSB);
   emit2 ("ld e,a");
   emit2 ("ld a,d");
-  emit2 ("%s a,%s", later, aopGet( right, MSB16, FALSE));
+  regalloc_dry_run_cost += 2;
+  emit3_o (later, ASMOP_A, 0, right, MSB16);
 
   _push (PAIR_AF);
-  aopPut ( AOP (IC_RESULT (ic)), "a", MSB16);
-  aopPut ( AOP (IC_RESULT (ic)), "e", LSB);
+
+  cheapMove (AOP (IC_RESULT (ic)), MSB16, ASMOP_A, 0);
+  cheapMove (AOP (IC_RESULT (ic)), LSB, ASMOP_E, 0);
 
   fetchPairLong (PAIR_DE, left, NULL, MSB24);
-  aopGet (right, MSB24, FALSE);
+
+  if (!regalloc_dry_run)
+    aopGet (right, MSB24, FALSE);
 
   _pop (PAIR_AF);
   emit2 ("ld a,e");
-  emit2 ("%s a,%s", later, aopGet( right, MSB24, FALSE));
+  emit3_o (later, ASMOP_A, 0, right, MSB24);
   emit2 ("ld e,a");
   emit2 ("ld a,d");
-  emit2 ("%s a,%s", later, aopGet( right, MSB32, FALSE));
+  regalloc_dry_run_cost += 2;
+  emit3_o (later, ASMOP_A, 0, right, MSB32);
 
-  aopPut ( AOP (IC_RESULT (ic)), "a", MSB32);
-  aopPut ( AOP (IC_RESULT (ic)), "e", MSB24);
+  cheapMove (AOP (IC_RESULT (ic)), MSB32, ASMOP_A, 0);
+  cheapMove (AOP (IC_RESULT (ic)), MSB24, ASMOP_E, 0);
 }
 
 static void
-_gbz80_emitAddSubLong (const iCode *ic, bool isAdd)
+_gbz80_emitAddSubLong (const iCode * ic, bool isAdd)
 {
   _gbz80_emitAddSubLongLong (ic, AOP (IC_LEFT (ic)), AOP (IC_RIGHT (ic)), isAdd);
 }
@@ -3252,7 +3287,7 @@
 {
   int size, offset = 0;
 
-  emitDebug("; genUminusFloat");
+  emitDebug ("; genUminusFloat");
 
   /* for this we just need to flip the
      first bit then copy the rest in place */
@@ -3269,7 +3304,7 @@
 
   while (size--)
     {
-      cheapMove (AOP (result), offset,AOP (op), offset);
+      cheapMove (AOP (result), offset, AOP (op), offset);
       offset++;
     }
 }
@@ -3278,7 +3313,7 @@
 /* genUminus - unary minus code generation                         */
 /*-----------------------------------------------------------------*/
 static void
-genUminus (const iCode *ic)
+genUminus (const iCode * ic)
 {
   int offset, size;
   sym_link *optype;
@@ -3289,8 +3324,7 @@
 
   /* if both in bit space then special
      case */
-  if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY &&
-      AOP_TYPE (IC_LEFT (ic)) == AOP_CRY)
+  if (AOP_TYPE (IC_RESULT (ic)) == AOP_CRY && AOP_TYPE (IC_LEFT (ic)) == AOP_CRY)
     {
       wassertl (0, "Left and right are in bit space");
       goto release;
@@ -3320,14 +3354,32 @@
 
   offset = 0;
 
-  _clearCarry();
-  while (size--)
+  if (size == 2 && IS_GB && requiresHL (AOP (IC_RESULT (ic))))
     {
+      cheapMove (ASMOP_E, 0, AOP (IC_LEFT (ic)), 0);
+      cheapMove (ASMOP_D, 0, AOP (IC_LEFT (ic)), 1);
+      emit3 (A_XOR, ASMOP_A, ASMOP_A);
+      emit3 (A_SUB, ASMOP_A, ASMOP_E);
+      emit3 (A_LD, ASMOP_E, ASMOP_A);
       emit3 (A_LD, ASMOP_A, ASMOP_ZERO);
-      emit3_o (A_SBC, ASMOP_A, 0, AOP (IC_LEFT (ic)), offset);
-      cheapMove (AOP (IC_RESULT (ic)), offset++, ASMOP_A, 0);
+      emit3 (A_SBC, ASMOP_A, ASMOP_D);
+      cheapMove (AOP (IC_RESULT (ic)), 1, ASMOP_A, 0);
+      cheapMove (AOP (IC_RESULT (ic)), 0, ASMOP_E, 0);
+      offset = 2;
+      goto remaining;
     }
 
+  emit3 (A_XOR, ASMOP_A, ASMOP_A); /* Clear accumulator - for first byte. */
+  while (size--)
+    {
+      emit3_o (offset ? A_SBC : A_SUB, ASMOP_A, 0, AOP (IC_LEFT (ic)), offset);
+      _G.preserveCarry = (size ? 1 : 0);
+      cheapMove (AOP (IC_RESULT (ic)), offset++, ASMOP_A, 0); /* Uses add iy, sp for AOP_EXSTK when omitting frame pointer, potentially destroying carry flag. */
+      if (size)
+        emit3 (A_LD, ASMOP_A, ASMOP_ZERO); /* Clear accumulator, but not carry - for subsequent bytes. */
+    }
+
+remaining:
   /* if any remaining bytes in the result */
   /* we just need to propagate the sign   */
   if ((size = (AOP_SIZE (IC_RESULT (ic)) - AOP_SIZE (IC_LEFT (ic)))))
@@ -3358,11 +3410,11 @@
     {
       /* We do it the hard way here. */
       _push (PAIR_HL);
-      aopPut (AOP (oper), _fReturn[0], 0);
-      aopPut (AOP (oper), _fReturn[1], 1);
+      cheapMove (AOP (oper), 0, _fReturn3[0], 0);
+      cheapMove (AOP (oper), 1, _fReturn3[1], 0);
       _pop (PAIR_DE);
-      aopPut (AOP (oper), _fReturn[0], 2);
-      aopPut (AOP (oper), _fReturn[1], 3);
+      cheapMove (AOP (oper), 2, _fReturn3[0], 0);
+      cheapMove (AOP (oper), 3, _fReturn3[1], 0);
     }
   else
     {
@@ -3370,14 +3422,14 @@
         {
           int i;
           short retarray[4], oparray[4];
-          
-          for(i = 0; i < size; i++)
-          {
-             retarray[i] = _fReturn3[i]->aopu.aop_reg[0]->rIdx;
-             oparray[i] = AOP (oper)->aopu.aop_reg[i]->rIdx;
-          }
-          
-          regMove(oparray, retarray, size);
+
+          for (i = 0; i < size; i++)
+            {
+              retarray[i] = _fReturn3[i]->aopu.aop_reg[0]->rIdx;
+              oparray[i] = AOP (oper)->aopu.aop_reg[i]->rIdx;
+            }
+
+          regMove (oparray, retarray, size);
         }
       else
         while (size--)
@@ -3389,100 +3441,119 @@
     return.
 */
 static void
-_restoreRegsAfterCall(void)
+_restoreRegsAfterCall (void)
 {
+  if (_G.stack.pushedIY)
+    {
+      _pop (PAIR_IY);
+      _G.stack.pushedIY = FALSE;
+    }
   if (_G.stack.pushedDE)
     {
-      _pop ( PAIR_DE);
+      _pop (PAIR_DE);
       _G.stack.pushedDE = FALSE;
     }
   if (_G.stack.pushedBC)
     {
-      _pop ( PAIR_BC);
+      _pop (PAIR_BC);
       _G.stack.pushedBC = FALSE;
     }
-  if (_G.stack.pushedIY)
+  if (_G.stack.pushedHL)
     {
-      _pop ( PAIR_IY);
-      _G.stack.pushedIY = FALSE;
+      _pop (PAIR_HL);
+      _G.stack.pushedHL = FALSE;
     }
+
   _G.saves.saved = FALSE;
 }
 
 static void
-_saveRegsForCall(const iCode *ic, int sendSetSize, bool dontsaveIY)
+_saveRegsForCall (const iCode * ic, int sendSetSize, bool dontsaveIY)
 {
   /* Rules:
-      o Stack parameters are pushed before this function enters
-      o DE and BC may be used in this function.
-      o HL and DE may be used to return the result.
-      o HL and DE may be used to send variables.
-      o DE and BC may be used to store the result value.
-      o HL may be used in computing the sent value of DE
-      o The iPushes for other parameters occur before any addSets
+     o Stack parameters are pushed before this function enters
+     o DE and BC may be used in this function.
+     o HL and DE may be used to return the result.
+     o HL and DE may be used to send variables.
+     o DE and BC may be used to store the result value.
+     o HL may be used in computing the sent value of DE
+     o The iPushes for other parameters occur before any addSets
 
      Logic: (to be run inside the first iPush or if none, before sending)
-      o Compute if DE and/or BC are in use over the call
-      o Compute if DE is used in the send set
-      o Compute if DE and/or BC are used to hold the result value
-      o If (DE is used, or in the send set) and is not used in the result, push.
-      o If BC is used and is not in the result, push
-      o
-      o If DE is used in the send set, fetch
-      o If HL is used in the send set, fetch
-      o Call
-      o ...
-  */
-  
-  if (_G.saves.saved == FALSE) {
-    bool push_bc, push_de, push_iy;
-    
-    if(z80_opts.oldralloc)
-      {
-        bool deInUse, bcInUse;
-        bool deSending;
-        bool bcInRet = FALSE, deInRet = FALSE;
-        bitVect *rInUse;
+     o Compute if DE, BC, HL, IY are in use over the call
+     o Compute if DE is used in the send set
+     o Compute if DE and/or BC are used to hold the result value
+     o If (DE is used, or in the send set) and is not used in the result, push.
+     o If BC is used and is not in the result, push
+     o
+     o If DE is used in the send set, fetch
+     o If HL is used in the send set, fetch
+     o Call
+     o ...
+   */
 
-        rInUse = bitVectCplAnd (bitVectCopy (ic->rMask), z80_rUmaskForOp (IC_RESULT(ic)));
+  if (_G.saves.saved == FALSE)
+    {
+      bool push_bc, push_de, push_hl, push_iy;
 
-        deInUse = bitVectBitValue (rInUse, D_IDX) || bitVectBitValue(rInUse, E_IDX);
-        bcInUse = bitVectBitValue (rInUse, B_IDX) || bitVectBitValue(rInUse, C_IDX);
+      if (options.oldralloc)
+        {
+          bool deInUse, bcInUse;
+          bool deSending;
+          bool bcInRet = FALSE, deInRet = FALSE;
+          bitVect *rInUse;
 
-        deSending = (sendSetSize > 1);
+          rInUse = bitVectCplAnd (bitVectCopy (ic->rMask), z80_rUmaskForOp (IC_RESULT (ic)));
 
-        emitDebug ("; _saveRegsForCall: sendSetSize: %u deInUse: %u bcInUse: %u deSending: %u", sendSetSize, deInUse, bcInUse, deSending);
+          deInUse = bitVectBitValue (rInUse, D_IDX) || bitVectBitValue (rInUse, E_IDX);
+          bcInUse = bitVectBitValue (rInUse, B_IDX) || bitVectBitValue (rInUse, C_IDX);
 
-        push_bc = bcInUse && !bcInRet;
-        push_de = deInUse && !deInRet;
-        push_iy = FALSE;
-      }
-    else
-      {
-        push_bc = bitVectBitValue (ic->rSurv, B_IDX) || bitVectBitValue (ic->rSurv, C_IDX);
-        push_de = bitVectBitValue (ic->rSurv, D_IDX) || bitVectBitValue (ic->rSurv, E_IDX);
-        push_iy = !dontsaveIY && (bitVectBitValue (ic->rSurv, IYH_IDX) || bitVectBitValue (ic->rSurv, IYL_IDX));
-      }
+          deSending = (sendSetSize > 1);
 
-    if (push_bc) {
-      _push(PAIR_BC);
-      _G.stack.pushedBC = TRUE;
-    }
-    if (push_de) {
-      _push(PAIR_DE);
-      _G.stack.pushedDE = TRUE;
+          emitDebug ("; _saveRegsForCall: sendSetSize: %u deInUse: %u bcInUse: %u deSending: %u", sendSetSize, deInUse, bcInUse,
+                     deSending);
+
+          push_bc = bcInUse && !bcInRet;
+          push_de = deInUse && !deInRet;
+          push_hl = FALSE;
+          push_iy = FALSE;
+        }
+      else
+        {
+          push_bc = bitVectBitValue (ic->rSurv, B_IDX) || bitVectBitValue (ic->rSurv, C_IDX);
+          push_de = bitVectBitValue (ic->rSurv, D_IDX) || bitVectBitValue (ic->rSurv, E_IDX);
+          push_hl = bitVectBitValue (ic->rSurv, H_IDX) || bitVectBitValue (ic->rSurv, L_IDX);
+          push_iy = !dontsaveIY && (bitVectBitValue (ic->rSurv, IYH_IDX) || bitVectBitValue (ic->rSurv, IYL_IDX));
+        }
+
+      if (push_hl)
+        {
+          _push (PAIR_HL);
+          _G.stack.pushedHL = TRUE;
+        }
+      if (push_bc)
+        {
+          _push (PAIR_BC);
+          _G.stack.pushedBC = TRUE;
+        }
+      if (push_de)
+        {
+          _push (PAIR_DE);
+          _G.stack.pushedDE = TRUE;
+        }
+      if (push_iy)
+        {
+          _push (PAIR_IY);
+          _G.stack.pushedIY = TRUE;
+        }
+
+      if (!regalloc_dry_run)
+        _G.saves.saved = TRUE;
     }
-    if (push_iy) {
-      _push(PAIR_IY);
-      _G.stack.pushedIY = TRUE;
+  else
+    {
+      /* Already saved. */
     }
-
-    if(!regalloc_dry_run)
-      _G.saves.saved = TRUE;
-  }
-  else {
-    /* Already saved. */
-  }
 }
 
 /*-----------------------------------------------------------------*/
@@ -3497,34 +3568,39 @@
      and spill push is always done on the local stack */
   if (!ic->parmPush)
     {
-      wassertl(0, "Encountered an unsupported spill push.");
+      wassertl (0, "Encountered an unsupported spill push.");
       return;
     }
 
-  if (_G.saves.saved == FALSE && !regalloc_dry_run /* Cost is counted at CALL or PCALL instead */) {
-    /* Caller saves, and this is the first iPush. */
-    /* Scan ahead until we find the function that we are pushing parameters to.
-       Count the number of addSets on the way to figure out what registers
-       are used in the send set.
-    */
-    int nAddSets = 0;
-    iCode *walk = ic->next;
-
-    while (walk) {
-      if (walk->op == SEND) {
-        nAddSets++;
-      }
-      else if (walk->op == CALL || walk->op == PCALL) {
-        /* Found it. */
-        break;
-      }
-      else {
-        /* Keep looking. */
-      }
-      walk = walk->next;
+  if (_G.saves.saved == FALSE && !regalloc_dry_run /* Cost is counted at CALL or PCALL instead */ )
+    {
+      /* Caller saves, and this is the first iPush. */
+      /* Scan ahead until we find the function that we are pushing parameters to.
+         Count the number of addSets on the way to figure out what registers
+         are used in the send set.
+       */
+      int nAddSets = 0;
+      iCode *walk = ic->next;
+
+      while (walk)
+        {
+          if (walk->op == SEND)
+            {
+              nAddSets++;
+            }
+          else if (walk->op == CALL || walk->op == PCALL)
+            {
+              /* Found it. */
+              break;
+            }
+          else
+            {
+              /* Keep looking. */
+            }
+          walk = walk->next;
+        }
+      _saveRegsForCall (walk, nAddSets, FALSE);
     }
-    _saveRegsForCall(walk, nAddSets, FALSE);
-  }
 
   /* then do the push */
   aopOp (IC_LEFT (ic), ic, FALSE, FALSE);
@@ -3533,10 +3609,10 @@
 
   if (isPair (AOP (IC_LEFT (ic))) && size == 2)
     {
-      if(!regalloc_dry_run)
+      if (!regalloc_dry_run)
         {
-           _G.stack.pushed += 2;
-           emit2 ("push %s", getPairName (AOP (IC_LEFT (ic))));
+          _G.stack.pushed += 2;
+          emit2 ("push %s", getPairName (AOP (IC_LEFT (ic))));
         }
       regalloc_dry_run_cost += (getPairId (AOP (IC_LEFT (ic))) == PAIR_IY ? 2 : 1);
     }
@@ -3544,10 +3620,14 @@
     {
       if (size == 2)
         {
-          fetchHL (AOP (IC_LEFT (ic)));
-          if(!regalloc_dry_run)
+          PAIR_ID pair = getDeadPairId (ic);
+          if (pair == PAIR_INVALID || isPairDead (PAIR_HL, ic))
+            pair = PAIR_HL;     /* hl sometimes is cheaper to load than other pairs. */
+
+          fetchPairLong (pair, AOP (IC_LEFT (ic)), ic, 0);
+          if (!regalloc_dry_run)
             {
-              emit2 ("push hl");
+              emit2 ("push %s", _pairs[pair].name);
               _G.stack.pushed += 2;
             }
           regalloc_dry_run_cost += 1;
@@ -3555,44 +3635,48 @@
         }
       if (size == 4)
         {
-          if (AOP_TYPE (IC_LEFT (ic)) == AOP_REG && AOP (IC_LEFT (ic))->aopu.aop_reg[2]->rIdx == C_IDX && AOP (IC_LEFT (ic))->aopu.aop_reg[3]->rIdx == B_IDX)
+          if (AOP_TYPE (IC_LEFT (ic)) == AOP_REG && AOP (IC_LEFT (ic))->aopu.aop_reg[2]->rIdx == C_IDX
+              && AOP (IC_LEFT (ic))->aopu.aop_reg[3]->rIdx == B_IDX)
             {
               emit2 ("push bc");
               regalloc_dry_run_cost += 1;
             }
-          else if (AOP_TYPE (IC_LEFT (ic)) == AOP_REG && AOP (IC_LEFT (ic))->aopu.aop_reg[2]->rIdx == E_IDX && AOP (IC_LEFT (ic))->aopu.aop_reg[3]->rIdx == D_IDX)
+          else if (AOP_TYPE (IC_LEFT (ic)) == AOP_REG && AOP (IC_LEFT (ic))->aopu.aop_reg[2]->rIdx == E_IDX
+                   && AOP (IC_LEFT (ic))->aopu.aop_reg[3]->rIdx == D_IDX)
             {
               emit2 ("push de");
               regalloc_dry_run_cost += 1;
             }
           else
             {
-              fetchPairLong (PAIR_HL, AOP (IC_LEFT (ic)), ic, 2);
+              fetchPairLong (PAIR_HL, AOP (IC_LEFT (ic)), 0, 2);
               emit2 ("push hl");
               regalloc_dry_run_cost += 1;
             }
           if (!regalloc_dry_run)
             _G.stack.pushed += 2;
-          
-          if (AOP_TYPE (IC_LEFT (ic)) == AOP_REG && AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == C_IDX && AOP (IC_LEFT (ic))->aopu.aop_reg[1]->rIdx == B_IDX)
+
+          if (AOP_TYPE (IC_LEFT (ic)) == AOP_REG && AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == C_IDX
+              && AOP (IC_LEFT (ic))->aopu.aop_reg[1]->rIdx == B_IDX)
             {
               emit2 ("push bc");
               regalloc_dry_run_cost += 1;
             }
-          else if (AOP_TYPE (IC_LEFT (ic)) == AOP_REG && AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == E_IDX && AOP (IC_LEFT (ic))->aopu.aop_reg[1]->rIdx == D_IDX)
+          else if (AOP_TYPE (IC_LEFT (ic)) == AOP_REG && AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == E_IDX
+                   && AOP (IC_LEFT (ic))->aopu.aop_reg[1]->rIdx == D_IDX)
             {
               emit2 ("push de");
               regalloc_dry_run_cost += 1;
             }
           else
             {
-              fetchPairLong (PAIR_HL, AOP (IC_LEFT (ic)), ic, 0);
+              fetchPairLong (PAIR_HL, AOP (IC_LEFT (ic)), 0, 0);
               emit2 ("push hl");
               regalloc_dry_run_cost += 1;
             }
           if (!regalloc_dry_run)
             _G.stack.pushed += 2;
-            
+
           goto release;
         }
       offset = size;
@@ -3619,14 +3703,14 @@
                 }
               else
                 {
-                  if (!regalloc_dry_run && !strcmp(aopGet (AOP (IC_LEFT (ic)), offset, FALSE), "h")) // todo: More exact cost!
+                  if (!regalloc_dry_run && !strcmp (aopGet (AOP (IC_LEFT (ic)), offset, FALSE), "h"))   // todo: More exact cost!
                     emit2 ("push hl");
                   else
                     {
                       cheapMove (ASMOP_A, 0, AOP (IC_LEFT (ic)), offset);
                       emit2 ("push af");
                     }
-                  regalloc_dry_run_cost += (ld_cost(ASMOP_A, AOP (IC_LEFT (ic))) + 1);
+                  regalloc_dry_run_cost += (ld_cost (ASMOP_A, AOP (IC_LEFT (ic))) + 1);
                 }
             }
           if (!regalloc_dry_run)
@@ -3681,7 +3765,7 @@
 setArea (int inHome)
 {
   /*
-    static int lastArea = 0;
+     static int lastArea = 0;
 
      if (_G.in_home != inHome) {
      if (inHome) {
@@ -3750,11 +3834,12 @@
 /** Emit the code for a call statement
  */
 static void
-emitCall (const iCode *ic, bool ispcall)
+emitCall (const iCode * ic, bool ispcall)
 {
-  bool bInRet, cInRet, dInRet, eInRet;
+  bool bInRet, cInRet, dInRet, eInRet, hInRet, lInRet, SomethingReturned, bigreturn;
   sym_link *dtype = operandType (IC_LEFT (ic));
-  sym_link *etype = getSpec(dtype);
+  sym_link *etype = getSpec (dtype);
+  sym_link *ftype = IS_FUNCPTR (dtype) ? dtype->next : dtype;
 
   /* if caller saves & we have not saved then */
   if (!ic->regsSaved)
@@ -3762,41 +3847,43 @@
       /* PENDING */
     }
 
-  _saveRegsForCall(ic, _G.sendSet ? elementsInSet(_G.sendSet) : 0, FALSE);
+  _saveRegsForCall (ic, _G.sendSet ? elementsInSet (_G.sendSet) : 0, FALSE);
 
   /* if send set is not empty then assign */
   if (_G.sendSet)
     {
       iCode *sic;
       int send = 0;
-      int nSend = elementsInSet(_G.sendSet);
+      int nSend = elementsInSet (_G.sendSet);
       bool swapped = FALSE;
 
-      int _z80_sendOrder[] = {
+      int _z80_sendOrder[] =
+      {
         PAIR_BC, PAIR_DE
       };
 
-      if (nSend > 1) {
-        /* Check if the parameters are swapped.  If so route through hl instead. */
-        wassertl (nSend == 2, "Pedantic check.  Code only checks for the two send items case.");
-
-        sic = setFirstItem(_G.sendSet);
-        sic = setNextItem(_G.sendSet);
-
-        if (_opUsesPair (IC_LEFT(sic), sic, _z80_sendOrder[0])) {
-          /* The second send value is loaded from one the one that holds the first
-             send, i.e. it is overwritten. */
-          /* Cache the first in HL, and load the second from HL instead. */
-          emit2 ("ld h,%s", _pairs[_z80_sendOrder[0]].h);
-          emit2 ("ld l,%s", _pairs[_z80_sendOrder[0]].l);
-          regalloc_dry_run_cost += 2;
+      if (nSend > 1)
+        {
+          /* Check if the parameters are swapped.  If so route through hl instead. */
+          wassertl (nSend == 2, "Pedantic check.  Code only checks for the two send items case.");
+
+          sic = setFirstItem (_G.sendSet);
+          sic = setNextItem (_G.sendSet);
 
-          swapped = TRUE;
+          if (_opUsesPair (IC_LEFT (sic), sic, _z80_sendOrder[0]))
+            {
+              /* The second send value is loaded from one the one that holds the first
+                 send, i.e. it is overwritten. */
+              /* Cache the first in HL, and load the second from HL instead. */
+              emit2 ("ld h,%s", _pairs[_z80_sendOrder[0]].h);
+              emit2 ("ld l,%s", _pairs[_z80_sendOrder[0]].l);
+              regalloc_dry_run_cost += 2;
+
+              swapped = TRUE;
+            }
         }
-      }
 
-      for (sic = setFirstItem (_G.sendSet); sic;
-           sic = setNextItem (_G.sendSet))
+      for (sic = setFirstItem (_G.sendSet); sic; sic = setNextItem (_G.sendSet))
         {
           int size;
           aopOp (IC_LEFT (sic), sic, FALSE, FALSE);
@@ -3806,21 +3893,25 @@
           wassertl (_z80_sendOrder[send] != PAIR_INVALID, "Tried to send more parameters than we have registers for");
 
           // PENDING: Mild hack
-          if (swapped == TRUE && send == 1) {
-            if (size > 1) {
-              emit2 ("ld %s,h", _pairs[_z80_sendOrder[send]].h);
+          if (swapped == TRUE && send == 1)
+            {
+              if (size > 1)
+                {
+                  emit2 ("ld %s,h", _pairs[_z80_sendOrder[send]].h);
+                  regalloc_dry_run_cost += 1;
+                }
+              else
+                {
+                  emit2 ("ld %s,!zero", _pairs[_z80_sendOrder[send]].h);
+                  regalloc_dry_run_cost += 2;
+                }
+              emit2 ("ld %s,l", _pairs[_z80_sendOrder[send]].l);
               regalloc_dry_run_cost += 1;
             }
-            else {
-              emit2 ("ld %s,!zero", _pairs[_z80_sendOrder[send]].h);
-              regalloc_dry_run_cost += 2;
+          else
+            {
+              fetchPair (_z80_sendOrder[send], AOP (IC_LEFT (sic)));
             }
-            emit2 ("ld %s,l", _pairs[_z80_sendOrder[send]].l);
-            regalloc_dry_run_cost += 1;
-          }
-          else {
-            fetchPair(_z80_sendOrder[send], AOP (IC_LEFT (sic)));
-          }
 
           send++;
           freeAsmop (IC_LEFT (sic), NULL, sic);
@@ -3828,6 +3919,41 @@
       _G.sendSet = NULL;
     }
 
+  /* Return value of big type or returning struct or union. */
+  bigreturn = (getSize (ftype->next) > 4);
+  if (bigreturn)
+    {
+      PAIR_ID pair;
+      int fp_offset, sp_offset;
+
+      if (ispcall && IS_GB)
+        _push (PAIR_HL);
+      aopOp (IC_RESULT (ic), ic, FALSE, FALSE);
+      wassertl (IC_RESULT (ic), "Unused return value in call to function returning large type.");
+      wassert (AOP_TYPE (IC_RESULT (ic)) == AOP_STK || AOP_TYPE (IC_RESULT (ic)) == AOP_EXSTK);
+      fp_offset =
+        AOP (IC_RESULT (ic))->aopu.aop_stk + _G.stack.offset + (AOP (IC_RESULT (ic))->aopu.aop_stk >
+            0 ? _G.stack.param_offset : 0);
+      sp_offset = fp_offset + _G.stack.pushed;
+      pair = (ispcall && !IS_GB) ? PAIR_IY : PAIR_HL;
+      emit2 ("ld %s,!immedword", _pairs[pair].name, sp_offset);
+      emit2 ("add %s, sp", _pairs[pair].name);
+      regalloc_dry_run_cost += (pair == PAIR_IY ? 6 : 4);
+      if (ispcall && IS_GB)
+        {
+          emit2 ("ld e, l");
+          emit2 ("ld d, h");
+          regalloc_dry_run_cost += 2;
+          _pop (PAIR_HL);
+          pair = PAIR_DE;
+        }
+      emit2 ("push %s", _pairs[pair].name);
+      regalloc_dry_run_cost += (pair == PAIR_IY ? 2 : 1);
+      if (!regalloc_dry_run)
+        _G.stack.pushed += 2;
+      freeAsmop (IC_RESULT (ic), NULL, ic);
+    }
+
   if (ispcall)
     {
       if (IFFUNC_ISBANKEDCALL (dtype))
@@ -3844,7 +3970,7 @@
       else
         {
           spillPair (PAIR_HL);
-          fetchHL (AOP (IC_LEFT (ic)));
+          fetchPairLong (PAIR_HL, AOP (IC_LEFT (ic)), ic, 0);
           emit2 ("call __sdcc_call_hl");
         }
       freeAsmop (IC_LEFT (ic), NULL, ic);
@@ -3854,9 +3980,7 @@
       /* make the call */
       if (IFFUNC_ISBANKEDCALL (dtype))
         {
-          char *name = OP_SYMBOL (IC_LEFT (ic))->rname[0] ?
-                       OP_SYMBOL (IC_LEFT (ic))->rname :
-                       OP_SYMBOL (IC_LEFT (ic))->name;
+          char *name = OP_SYMBOL (IC_LEFT (ic))->rname[0] ? OP_SYMBOL (IC_LEFT (ic))->rname : OP_SYMBOL (IC_LEFT (ic))->name;
           emit2 ("call banked_call");
           emit2 ("!dws", name);
           emit2 ("!dw !bankimmeds", name);
@@ -3872,32 +3996,74 @@
           else
             {
               emit2 ("call %s", (OP_SYMBOL (IC_LEFT (ic))->rname[0] ?
-                                 OP_SYMBOL (IC_LEFT (ic))->rname :
-                                 OP_SYMBOL (IC_LEFT (ic))->name));
+                                 OP_SYMBOL (IC_LEFT (ic))->rname : OP_SYMBOL (IC_LEFT (ic))->name));
               regalloc_dry_run_cost += 3;
             }
         }
     }
-  spillCached ();
-
-  /* Mark the registers as restored. */
-  _G.saves.saved = FALSE;
+  spillCached ();
+
+  /* Mark the registers as restored. */
+  _G.saves.saved = FALSE;
+
+  SomethingReturned = (IS_ITEMP (IC_RESULT (ic)) &&
+                       (OP_SYMBOL (IC_RESULT (ic))->nRegs ||
+                        OP_SYMBOL (IC_RESULT (ic))->spildir ||
+                        OP_SYMBOL (IC_RESULT (ic))->accuse == ACCUSE_A)) || IS_TRUE_SYMOP (IC_RESULT (ic));
+
+  if (SomethingReturned)
+    {
+      bitVect *result = z80_rUmaskForOp (IC_RESULT (ic));
+      bInRet = bitVectBitValue (result, B_IDX);
+      cInRet = bitVectBitValue (result, C_IDX);
+      dInRet = bitVectBitValue (result, D_IDX);
+      eInRet = bitVectBitValue (result, E_IDX);
+      hInRet = bitVectBitValue (result, H_IDX);
+      lInRet = bitVectBitValue (result, L_IDX);
+      freeBitVect (result);
+    }
+  else
+    {
+      bInRet = FALSE;
+      cInRet = FALSE;
+      dInRet = FALSE;
+      eInRet = FALSE;
+      hInRet = FALSE;
+      lInRet = FALSE;
+    }
 
   /* adjust the stack for parameters if required */
-  if (ic->parmBytes)
+  if ((ic->parmBytes || bigreturn) && IFFUNC_ISNORETURN (OP_SYMBOL (IC_LEFT (ic))->type))
+    {
+      /* This is just a workaround to not confuse the peephole optimizer too much. */
+      /* Todo: Check fo _Noreturn in the peephole optimizer and do not emit the inc sp here. */
+      emit2 ("inc sp");
+      regalloc_dry_run_cost += 1;
+      if (!regalloc_dry_run)
+        _G.stack.pushed -= (ic->parmBytes + bigreturn * 2);
+    }
+  else if (ic->parmBytes || bigreturn)
     {
-      int i = ic->parmBytes;
+      int i = ic->parmBytes + bigreturn * 2;
 
       if (!regalloc_dry_run)
         _G.stack.pushed -= i;
-      if (IS_GB)
+      if (IS_GB && i > 2)
         {
-          emit2 ("!ldaspsp", i);
+          emit2 ("add sp, #%d", i);
+          regalloc_dry_run_cost += 3;
         }
       else
         {
           spillCached ();
-          if (IS_R2K ? i > 127 * 4 - 1 : i > 8)
+          if ((IS_RAB ? i > 127 * 4 - 1 : i > (optimize.codeSize ? 8 : 5)) && !SomethingReturned)
+            {
+              emit2 ("ld hl,!immedword", i);
+              emit2 ("add hl,sp");
+              emit2 ("ld sp,hl");
+              regalloc_dry_run_cost += 5;
+            }
+          else if (IS_RAB ? i > 127 * 4 - 1 : i > 8)
             {
               emit2 ("ld iy,!immedword", i);
               emit2 ("add iy,sp");
@@ -3909,7 +4075,7 @@
 
               while (i > 1)
                 {
-                  if (IS_R2K && (!optimize.codeSize || i > 2))
+                  if (IS_RAB && (!optimize.codeSize || i > 2))
                     {
                       int d = (i < 127 ? i : 127);
                       emit2 ("add sp, #%d", d);
@@ -3933,11 +4099,7 @@
     }
 
   /* if we need assign a result value */
-  if ((IS_ITEMP (IC_RESULT (ic)) &&
-       (OP_SYMBOL (IC_RESULT (ic))->nRegs ||
-        OP_SYMBOL (IC_RESULT (ic))->spildir ||
-        OP_SYMBOL (IC_RESULT (ic))->accuse == ACCUSE_A)) ||
-      IS_TRUE_SYMOP (IC_RESULT (ic)))
+  if (SomethingReturned && !bigreturn)
     {
       aopOp (IC_RESULT (ic), ic, FALSE, FALSE);
 
@@ -3947,22 +4109,6 @@
     }
 
   spillCached ();
-  
-  if (IC_RESULT (ic))
-    {
-      bitVect *result = z80_rUmaskForOp (IC_RESULT (ic));
-      bInRet = bitVectBitValue(result, B_IDX);
-      cInRet = bitVectBitValue(result, C_IDX);
-      dInRet = bitVectBitValue(result, D_IDX);
-      eInRet = bitVectBitValue(result, E_IDX);
-    }
-  else
-    {
-      bInRet = FALSE;
-      cInRet = FALSE;
-      dInRet = FALSE;
-      eInRet = FALSE;
-    }
 
   if (_G.stack.pushedIY)
     {
@@ -4027,13 +4173,42 @@
         }
       _G.stack.pushedBC = FALSE;
     }
+
+  if (_G.stack.pushedHL)
+    {
+      if (hInRet && lInRet)
+        {
+          wassertl (0, "Shouldn't push HL if it's wiped out by the return");
+        }
+      else if (hInRet)
+        {
+          /* Only restore E */
+          emit2 ("ld a,h");
+          regalloc_dry_run_cost += 1;
+          _pop (PAIR_HL);
+          emit2 ("ld h,a");
+          regalloc_dry_run_cost += 1;
+        }
+      else if (lInRet)
+        {
+          /* Only restore D */
+          _pop (PAIR_AF);
+          emit2 ("ld h,a");
+          regalloc_dry_run_cost += 1;
+        }
+      else
+        {
+          _pop (PAIR_HL);
+        }
+      _G.stack.pushedHL = FALSE;
+    }
 }
 
 /*-----------------------------------------------------------------*/
 /* genCall - generates a call statement                            */
 /*-----------------------------------------------------------------*/
 static void
-genCall (const iCode *ic)
+genCall (const iCode * ic)
 {
   emitCall (ic, FALSE);
 }
@@ -4042,7 +4217,7 @@
 /* genPcall - generates a call by pointer statement                */
 /*-----------------------------------------------------------------*/
 static void
-genPcall (const iCode *ic)
+genPcall (const iCode * ic)
 {
   emitCall (ic, TRUE);
 }
@@ -4051,7 +4226,7 @@
 /* resultRemat - result  is rematerializable                       */
 /*-----------------------------------------------------------------*/
 static int
-resultRemat (const iCode *ic)
+resultRemat (const iCode * ic)
 {
   if (SKIP_IC (ic) || ic->op == IFX)
     return 0;
@@ -4079,12 +4254,14 @@
 
   bool bcInUse = FALSE;
   bool deInUse = FALSE;
+  bool bigreturn;
 
   setArea (IFFUNC_NONBANKED (sym->type));
+  wassert (!_G.stack.pushed);
 
   /* PENDING: Reset the receive offset as it
      doesn't seem to get reset anywhere else.
-  */
+   */
   _G.receiveOffset = 0;
 
   /* Record the last function name for debugging. */
@@ -4093,10 +4270,10 @@
   /* Create the function header */
   emit2 ("!functionheader", sym->name);
 
-  emitDebug(assignment_optimal ? "; Register assignment is optimal." : "; Register assignment might be sub-optimal.");
-  emitDebug("; Stack space usage: %d bytes.", sym->stack);
+  emitDebug (z80_assignment_optimal ? "; Register assignment is optimal." : "; Register assignment might be sub-optimal.");
+  emitDebug ("; Stack space usage: %d bytes.", sym->stack);
 
-  if (!IS_STATIC(sym->etype))
+  if (!IS_STATIC (sym->etype))
     {
       struct dbuf_s dbuf;
 
@@ -4104,18 +4281,18 @@
       dbuf_printf (&dbuf, "%s_start", sym->rname);
       emit2 ("!labeldef", dbuf_c_str (&dbuf));
       dbuf_detach (&dbuf);
-      if(!regalloc_dry_run)
-       _G.lines.current->isLabel = 1;
+      if (!regalloc_dry_run)
+        genLine.lineCurr->isLabel = 1;
     }
   emit2 ("!functionlabeldef", sym->rname);
-  if(!regalloc_dry_run)
-    _G.lines.current->isLabel = 1;
+  if (!regalloc_dry_run)
+    genLine.lineCurr->isLabel = 1;
 
   ftype = operandType (IC_LEFT (ic));
 
-  if (IFFUNC_ISNAKED(ftype))
+  if (IFFUNC_ISNAKED (ftype))
     {
-      emitDebug("; naked function: no prologue.");
+      emitDebug ("; naked function: no prologue.");
       return;
     }
 
@@ -4123,12 +4300,12 @@
      then save all potentially used registers. */
   if (IFFUNC_ISISR (sym->type))
     {
-      if (IS_R2K)
+      if (IS_RAB)
         emit2 ("push ip");
-      
+
       /* If critical function then turn interrupts off */
       /* except when no interrupt number is given then it implies the NMI handler */
-      if (IFFUNC_ISCRITICAL (sym->type) && (FUNC_INTNO(sym->type) != INTNO_UNSPEC))
+      if (IFFUNC_ISCRITICAL (sym->type) && (FUNC_INTNO (sym->type) != INTNO_UNSPEC))
         {
           emit2 ("!di");
         }
@@ -4141,7 +4318,7 @@
          If critical function then turn interrupts off */
       if (IFFUNC_ISCRITICAL (sym->type))
         {
-          if (IS_GB || IS_R2K)
+          if (IS_GB || IS_RAB)
             {
               emit2 ("!di");
             }
@@ -4171,7 +4348,7 @@
     }
 
   /* Detect which registers are used. */
-  if (IFFUNC_CALLEESAVES(sym->type) && sym->regsUsed)
+  if (IFFUNC_CALLEESAVES (sym->type) && sym->regsUsed)
     {
       int i;
       for (i = 0; i < sym->regsUsed->size; i++)
@@ -4186,12 +4363,14 @@
                   break;
                 case D_IDX:
                 case E_IDX:
-                  if (!IS_GB) {
-                    deInUse = TRUE;
-                  }
-                  else {
-                    /* Other systems use DE as a temporary. */
-                  }
+                  if (!IS_GB)
+                    {
+                      deInUse = TRUE;
+                    }
+                  else
+                    {
+                      /* Other systems use DE as a temporary. */
+                    }
                   break;
                 }
             }
@@ -4217,9 +4396,11 @@
   /* adjust the stack for the function */
 //  _G.stack.last = sym->stack;
 
+  bigreturn = (getSize (ftype->next) > 4);
+  _G.stack.param_offset += bigreturn * 2;
+
   stackParm = FALSE;
-  for (sym = setFirstItem (istack->syms); sym;
-       sym = setNextItem (istack->syms))
+  for (sym = setFirstItem (istack->syms); sym; sym = setNextItem (istack->syms))
     {
       if (sym->_isparm && !IS_REGPARM (sym->etype))
         {
@@ -4229,7 +4410,7 @@
     }
   sym = OP_SYMBOL (IC_LEFT (ic));
 
-  _G.omitFramePtr = (!IS_GB && options.omitFramePtr);
+  _G.omitFramePtr = options.oldralloc ? (!IS_GB && options.omitFramePtr) : should_omit_frame_ptr;
 
   if (!IS_GB && !IY_RESERVED && !stackParm && !sym->stack)
     {
@@ -4237,7 +4418,7 @@
       /* the above !sym->stack condition can be removed. -- EEP       */
       if (sym->stack)
         emit2 ("!ldaspsp", -sym->stack);
-      if(!regalloc_dry_run)
+      if (!regalloc_dry_run)
         _G.omitFramePtr = TRUE;
     }
   else if (sym->stack && IS_GB && sym->stack > -INT8MIN)
@@ -4246,14 +4427,14 @@
     emit2 ("!enterx", sym->stack);
   else if (sym->stack)
     {
-      if ((optimize.codeSize && sym->stack <= 8) || sym->stack <= 4 || IS_R2K && sym->stack <= 254)
+      if ((optimize.codeSize && sym->stack <= 8) || sym->stack <= 4 || IS_RAB && sym->stack <= 254)
         {
           int stack = sym->stack;
           if (!_G.omitFramePtr)
             emit2 ("!enter");
           while (stack > 1)
             {
-              if (IS_R2K && (!optimize.codeSize || stack > 2))
+              if (IS_RAB && (!optimize.codeSize || stack > 2))
                 {
                   int d = (stack < 127 ? -stack : -127);
                   emit2 ("add sp, #%d", d);
@@ -4265,7 +4446,7 @@
                   stack -= 2;
                 }
             }
-          if(stack > 0)
+          if (stack > 0)
             emit2 ("dec sp");
         }
       else
@@ -4276,7 +4457,7 @@
             emit2 ("!enterx", sym->stack);
         }
     }
-  else if(!_G.omitFramePtr)
+  else if (!_G.omitFramePtr)
     {
       if (!_G.omitFramePtr)
         emit2 ("!enter");
@@ -4294,11 +4475,12 @@
   symbol *sym = OP_SYMBOL (IC_LEFT (ic));
 
   wassert (!regalloc_dry_run);
+  wassert (!_G.stack.pushed);
 
-  if (IFFUNC_ISNAKED(sym->type))
+  if (IFFUNC_ISNAKED (sym->type) || IFFUNC_ISNORETURN (sym->type))
     {
-      emitDebug("; naked function: no epilogue.");
-      if (!IS_STATIC(sym->etype))
+      emitDebug (IFFUNC_ISNAKED (sym->type) ? "; naked function: No epilogue." : "; _Noreturn function: No epilogue.");
+      if (!IS_STATIC (sym->etype))
         {
           struct dbuf_s dbuf;
 
@@ -4306,7 +4488,7 @@
           dbuf_printf (&dbuf, "%s_end", sym->rname);
           emit2 ("!labeldef", dbuf_c_str (&dbuf));
           dbuf_destroy (&dbuf);
-          _G.lines.current->isLabel = 1;
+          genLine.lineCurr->isLabel = 1;
         }
       return;
     }
@@ -4355,7 +4537,7 @@
 
       /* If critical function then turn interrupts back on */
       /* except when no interrupt number is given then it implies the NMI handler */
-      if (IFFUNC_ISCRITICAL (sym->type) && (FUNC_INTNO(sym->type) != INTNO_UNSPEC))
+      if (IFFUNC_ISCRITICAL (sym->type) && (FUNC_INTNO (sym->type) != INTNO_UNSPEC))
         {
           emit2 ("!ei");
         }
@@ -4367,9 +4549,9 @@
       if (IFFUNC_ISCRITICAL (sym->type))
         {
           if (IS_GB)
-              emit2 ("!ei");
-          else if (IS_R2K)
-            emit2( "ipres" );
+            emit2 ("!ei");
+          else if (IS_RAB)
+            emit2 ("ipres");
           else
             {
               symbol *tlbl = newiTempLabel (NULL);
@@ -4377,10 +4559,10 @@
               emit2 ("pop af");
               //parity odd <==> P/O=0 <==> interrupt enable flag IFF2 was 0 <==>
               //don't enable interrupts as they were off before
-              emit2 ("jp PO,!tlabel", tlbl->key + 100);
+              emit2 ("jp PO,!tlabel", labelKey2num (tlbl->key));
               emit2 ("!ei");
-              emit2 ("!tlabeldef", (tlbl->key + 100));
-              _G.lines.current->isLabel = 1;
+              emit2 ("!tlabeldef", labelKey2num (tlbl->key));
+              genLine.lineCurr->isLabel = 1;
             }
         }
     }
@@ -4393,9 +4575,9 @@
   if (IFFUNC_ISISR (sym->type))
     {
       /* "critical interrupt" is used to imply NMI handler */
-      if (!IS_GB && IFFUNC_ISCRITICAL (sym->type) && FUNC_INTNO(sym->type) == INTNO_UNSPEC)
+      if (!IS_GB && IFFUNC_ISCRITICAL (sym->type) && FUNC_INTNO (sym->type) == INTNO_UNSPEC)
         emit2 ("retn");
-      else if (IS_R2K && IFFUNC_ISCRITICAL (sym->type) && FUNC_INTNO(sym->type) == INTNO_UNSPEC)
+      else if (IS_RAB && IFFUNC_ISCRITICAL (sym->type) && FUNC_INTNO (sym->type) == INTNO_UNSPEC)
         {
           // ISR exit sequence that works on the rabbit 4000
           emit2 ("pop ip");
@@ -4411,7 +4593,7 @@
       emit2 ("ret");
     }
 
-  if (!IS_STATIC(sym->etype))
+  if (!IS_STATIC (sym->etype))
     {
       struct dbuf_s dbuf;
 
@@ -4419,7 +4601,7 @@
       dbuf_printf (&dbuf, "%s_end", sym->rname);
       emit2 ("!labeldef", dbuf_c_str (&dbuf));
       dbuf_destroy (&dbuf);
-      _G.lines.current->isLabel = 1;
+      genLine.lineCurr->isLabel = 1;
     }
 
   _G.flushStatics = 1;
@@ -4431,7 +4613,7 @@
 /* genRet - generate code for return statement                     */
 /*-----------------------------------------------------------------*/
 static void
-genRet (const iCode *ic)
+genRet (const iCode * ic)
 {
   /* Errk.  This is a hack until I can figure out how
      to cause dehl to spill on a call */
@@ -4447,29 +4629,29 @@
   aopOp (IC_LEFT (ic), ic, FALSE, FALSE);
   size = AOP_SIZE (IC_LEFT (ic));
 
-  if (size==2)
+  if (size == 2)
     {
-      fetchPair(IS_GB ? PAIR_DE : PAIR_HL, AOP (IC_LEFT (ic)));
+      fetchPairLong (IS_GB ? PAIR_DE : PAIR_HL, AOP (IC_LEFT (ic)), ic, 0);
     }
-  else
+  else if (size <= 4)
     {
       if (IS_GB && size == 4 && requiresHL (AOP (IC_LEFT (ic))))
         {
-          fetchPair (PAIR_DE, AOP (IC_LEFT (ic)));
-          fetchPairLong (PAIR_HL, AOP (IC_LEFT (ic)), ic, 2);
+          fetchPairLong (PAIR_DE, AOP (IC_LEFT (ic)), 0, 0);
+          fetchPairLong (PAIR_HL, AOP (IC_LEFT (ic)), 0, 2);
         }
       else if (AOP_TYPE (IC_LEFT (ic)) == AOP_REG)
         {
           int i;
           short retarray[4], oparray[4];
-          
-          for(i = 0; i < AOP_SIZE (IC_LEFT (ic)); i++)
-          {
-             retarray[i] = _fReturn3[i]->aopu.aop_reg[0]->rIdx;
-             oparray[i] = AOP (IC_LEFT (ic))->aopu.aop_reg[i]->rIdx;
-          }
-             
-          regMove(retarray, oparray, AOP_SIZE (IC_LEFT (ic)));
+
+          for (i = 0; i < AOP_SIZE (IC_LEFT (ic)); i++)
+            {
+              retarray[i] = _fReturn3[i]->aopu.aop_reg[0]->rIdx;
+              oparray[i] = AOP (IC_LEFT (ic))->aopu.aop_reg[i]->rIdx;
+            }
+
+          regMove (retarray, oparray, AOP_SIZE (IC_LEFT (ic)));
         }
       else
         {
@@ -4480,16 +4662,89 @@
             }
         }
     }
+  else if (AOP_TYPE (IC_LEFT (ic)) == AOP_LIT)
+    {
+      unsigned long lit = ulFromVal (AOP (IC_LEFT (ic))->aopu.aop_lit);
+      emit2 ("ld hl, #%d", _G.stack.offset + _G.stack.param_offset + _G.stack.pushed + (_G.omitFramePtr || IS_GB ? 0 : 2));
+      emit2 ("add hl, sp");
+      emit2 ("ld a, (hl)");
+      emit2 ("inc hl");
+      emit2 ("ld h, (hl)");
+      emit2 ("ld l, a");
+      regalloc_dry_run_cost += 8;
+      do
+        {
+          emit2 ("ld (hl), !immedbyte", lit & 0xff);
+          regalloc_dry_run_cost += 2;
+          lit >>= 8;
+          if (size > 1)
+            {
+              emit2 ("inc hl");
+              regalloc_dry_run_cost++;
+            }
+        }
+      while (--size);
+    }
+  else if (!IS_GB && AOP_TYPE (IC_LEFT (ic)) == AOP_STK || AOP_TYPE (IC_LEFT (ic)) == AOP_EXSTK
+           || AOP_TYPE (IC_LEFT (ic)) == AOP_DIR || AOP_TYPE (IC_LEFT (ic)) == AOP_IY)
+    {
+      emit2 ("ld hl, #%d", _G.stack.offset + _G.stack.param_offset + _G.stack.pushed + (_G.omitFramePtr || IS_GB ? 0 : 2));
+      emit2 ("add hl, sp");
+      emit2 ("ld e, (hl)");
+      emit2 ("inc hl");
+      emit2 ("ld d, (hl)");
+      regalloc_dry_run_cost += 7;
+      if (AOP_TYPE (IC_LEFT (ic)) == AOP_STK || AOP_TYPE (IC_LEFT (ic)) == AOP_EXSTK)
+        {
+          int sp_offset, fp_offset;
+          fp_offset =
+            AOP (IC_LEFT (ic))->aopu.aop_stk + _G.stack.offset + (AOP (IC_LEFT (ic))->aopu.aop_stk >
+                0 ? _G.stack.param_offset : 0);
+          sp_offset = fp_offset + _G.stack.pushed;
+          emit2 ("ld hl, #%d", sp_offset);
+          emit2 ("add hl, sp");
+          regalloc_dry_run_cost += 4;
+        }
+      else
+        {
+          emit2 ("ld hl, #%s", AOP (IC_LEFT (ic))->aopu.aop_dir);
+          regalloc_dry_run_cost += 3;
+        }
+      emit2 ("ld bc, #%d", size);
+      emit2 ("ldir");
+      regalloc_dry_run_cost += 5;
+    }
+  else
+    {
+      emit2 ("ld hl, #%d", _G.stack.offset + _G.stack.param_offset + _G.stack.pushed + (_G.omitFramePtr || IS_GB ? 0 : 2));
+      emit2 ("add hl, sp");
+      emit2 ("ld c, (hl)");
+      emit2 ("inc hl");
+      emit2 ("ld b, (hl)");
+      regalloc_dry_run_cost += 7;
+      spillPair (PAIR_HL);
+      do
+        {
+          cheapMove (ASMOP_A, 0, AOP (IC_LEFT (ic)), offset++);
+          emit2 ("ld (bc), a");
+          regalloc_dry_run_cost++;
+          if (size > 1)
+            {
+              emit2 ("inc bc");
+              regalloc_dry_run_cost++;
+            }
+        }
+      while (--size);
+    }
   freeAsmop (IC_LEFT (ic), NULL, ic);
 
 jumpret:
   /* generate a jump to the return label
      if the next is not the return statement */
-  if (!(ic->next && ic->next->op == LABEL &&
-        IC_LABEL (ic->next) == returnLabel))
+  if (!(ic->next && ic->next->op == LABEL && IC_LABEL (ic->next) == returnLabel))
     {
-      if(!regalloc_dry_run)
-        emit2 ("jp !tlabel", returnLabel->key + 100);
+      if (!regalloc_dry_run)
+        emit2 ("jp !tlabel", labelKey2num (returnLabel->key));
       regalloc_dry_run_cost += 3;
     }
 }
@@ -4498,29 +4753,29 @@
 /* genLabel - generates a label                                    */
 /*-----------------------------------------------------------------*/
 static void
-genLabel (const iCode *ic)
+genLabel (const iCode * ic)
 {
   /* special case never generate */
   if (IC_LABEL (ic) == entryLabel)
     return;
 
-  emitLabel (IC_LABEL (ic)->key + 100);
+  emitLabelSpill (IC_LABEL (ic));
 }
 
 /*-----------------------------------------------------------------*/
 /* genGoto - generates a ljmp                                      */
 /*-----------------------------------------------------------------*/
 static void
-genGoto (const iCode *ic)
+genGoto (const iCode * ic)
 {
-  emit2 ("jp !tlabel", IC_LABEL (ic)->key + 100);
+  emit2 ("jp !tlabel", labelKey2num (IC_LABEL (ic)->key));
 }
 
 /*-----------------------------------------------------------------*/
 /* genPlusIncr :- does addition with increment if possible         */
 /*-----------------------------------------------------------------*/
 static bool
-genPlusIncr (const iCode *ic)
+genPlusIncr (const iCode * ic)
 {
   unsigned int icount;
   unsigned int size = getDataSize (IC_RESULT (ic));
@@ -4532,13 +4787,12 @@
   if (AOP_TYPE (IC_RIGHT (ic)) != AOP_LIT)
     return FALSE;
 
-  emitDebug ("; genPlusIncr");
-
   icount = (unsigned int) ulFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit);
 
   /* If result is a pair */
   if (resultId != PAIR_INVALID)
     {
+      bool delayed_move;
       if (isLitWord (AOP (IC_LEFT (ic))))
         {
           fetchLitPair (getPairId (AOP (IC_RESULT (ic))), AOP (IC_LEFT (ic)), icount);
@@ -4568,24 +4822,30 @@
       if (icount > 5)
         return FALSE;
       /* Inc a pair */
+      delayed_move = (getPairId (AOP (IC_RESULT (ic))) == PAIR_IY && getPairId (AOP (IC_LEFT (ic))) != PAIR_INVALID
+                      && isPairDead (getPairId (AOP (IC_LEFT (ic))), ic));
       if (!sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic))))
         {
           if (icount > 3)
             return FALSE;
-          movLeft2ResultLong (IC_LEFT (ic), 0, IC_RESULT (ic), 0, 0, 2);
+          if (!delayed_move)
+            fetchPair (getPairId (AOP (IC_RESULT (ic))), AOP (IC_LEFT (ic)));
         }
       while (icount--)
         {
-          emit2 ("inc %s", getPairName (AOP (IC_RESULT (ic))));
-          regalloc_dry_run_cost += (getPairId (AOP (IC_RESULT (ic))) == PAIR_IY ? 2 : 1);
+          PAIR_ID pair = delayed_move ? getPairId (AOP (IC_LEFT (ic))) : getPairId (AOP (IC_RESULT (ic)));
+          emit2 ("inc %s", _pairs[pair].name);
+          regalloc_dry_run_cost += (pair == PAIR_IY ? 2 : 1);
         }
+      if (delayed_move)
+        fetchPair (getPairId (AOP (IC_RESULT (ic))), AOP (IC_LEFT (ic)));
       return TRUE;
     }
 
-  if (!IS_GB && isLitWord (AOP (IC_LEFT (ic))) && size == 2)
+  if (!IS_GB && isLitWord (AOP (IC_LEFT (ic))) && size == 2 && isPairDead (PAIR_HL, ic))
     {
       fetchLitPair (PAIR_HL, AOP (IC_LEFT (ic)), icount);
-      commitPair (AOP (IC_RESULT (ic)), PAIR_HL);
+      commitPair (AOP (IC_RESULT (ic)), PAIR_HL, ic, FALSE);
       return TRUE;
     }
 
@@ -4595,10 +4855,7 @@
     return FALSE;
 
   /* if increment 16 bits in register */
-  if (sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic))) &&
-      size > 1 &&
-      icount == 1
-    )
+  if (sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic))) && size > 1 && icount == 1)
     {
       int offset = 0;
       symbol *tlbl = regalloc_dry_run ? 0 : newiTempLabel (0);
@@ -4607,21 +4864,21 @@
           emit3_o (A_INC, AOP (IC_RESULT (ic)), offset++, 0, 0);
           if (size)
             {
-              if(!regalloc_dry_run)
-                emit2 ("jp NZ,!tlabel", tlbl->key + 100);
+              if (!regalloc_dry_run)
+                emit2 ("jp NZ,!tlabel", labelKey2num (tlbl->key));
               regalloc_dry_run_cost += 3;
             }
         }
       if (!regalloc_dry_run)
-        AOP_TYPE (IC_LEFT (ic)) == AOP_HL ? emitLabel (tlbl->key + 100) : emitLabelNoSpill (tlbl->key + 100);
+        (AOP_TYPE (IC_LEFT (ic)) == AOP_HL || IS_GB
+         && AOP_TYPE (IC_LEFT (ic)) == AOP_STK) ? emitLabelSpill (tlbl) : emitLabel (tlbl);
       else if (AOP_TYPE (IC_LEFT (ic)) == AOP_HL)
         spillCached ();
       return TRUE;
     }
 
   /* if the sizes are greater than 1 then we cannot */
-  if (AOP_SIZE (IC_RESULT (ic)) > 1 ||
-      AOP_SIZE (IC_LEFT (ic)) > 1)
+  if (AOP_SIZE (IC_RESULT (ic)) > 1 || AOP_SIZE (IC_LEFT (ic)) > 1)
     return FALSE;
 
   /* If the result is in a register then we can load then increment.
@@ -4630,7 +4887,7 @@
     {
       cheapMove (AOP (IC_RESULT (ic)), LSB, AOP (IC_LEFT (ic)), LSB);
       while (icount--)
-          emit3_o (A_INC, AOP (IC_RESULT (ic)), LSB, 0, 0);
+        emit3_o (A_INC, AOP (IC_RESULT (ic)), LSB, 0, 0);
       return TRUE;
     }
 
@@ -4661,11 +4918,11 @@
     }
   else
     {
-      if(!regalloc_dry_run)
+      if (!regalloc_dry_run)
         {
-          emit2 ("jp Z,!tlabel", tlbl->key + 100);
+          emit2 ("jp Z,!tlabel", labelKey2num (tlbl->key));
           emit2 ("ld a,!one");
-          emitLabelNoSpill (tlbl->key + 100);
+          emitLabel (tlbl);
         }
       regalloc_dry_run_cost += 5;
       outAcc (result);
@@ -4673,7 +4930,7 @@
 }
 
 static bool
-couldDestroyCarry (asmop *aop)
+couldDestroyCarry (asmop * aop)
 {
   if (aop)
     {
@@ -4686,12 +4943,11 @@
 }
 
 static void
-shiftIntoPair (int idx, asmop *aop)
+shiftIntoPair (int idx, asmop * aop)
 {
   PAIR_ID id = PAIR_INVALID;
 
   wassertl (!IS_GB, "Not implemented for the GBZ80");
-  //  wassertl (aop->type == AOP_EXSTK, "Only implemented for EXSTK");
 
   emitDebug ("; Shift into pair idx %u", idx);
 
@@ -4723,10 +4979,10 @@
 }
 
 static void
-setupToPreserveCarry (const iCode *ic)
+setupToPreserveCarry (const iCode * ic)
 {
-  asmop *left   = AOP (IC_LEFT (ic));
-  asmop *right  = AOP (IC_RIGHT (ic));
+  asmop *left = AOP (IC_LEFT (ic));
+  asmop *right = AOP (IC_RIGHT (ic));
   asmop *result = AOP (IC_RESULT (ic));
 
   wassert (left && right);
@@ -4739,7 +4995,7 @@
           /* check result again, in case right == result */
           if (couldDestroyCarry (result))
             {
-              if (!isPairInUse (PAIR_DE, ic))
+              if (couldDestroyCarry (left))
                 shiftIntoPair (1, result);
               else
                 shiftIntoPair (2, result);
@@ -4770,6 +5026,7 @@
 genPlus (iCode * ic)
 {
   int size, offset = 0;
+  signed char cached[2];
   bool premoved;
 
   /* special cases :- */
@@ -4783,9 +5040,7 @@
      if literal, literal on the right or
      if left requires ACC or right is already
      in ACC */
-  if ((AOP_TYPE (IC_LEFT (ic)) == AOP_LIT) ||
-      (AOP_NEEDSACC (IC_RIGHT (ic))) ||
-      AOP_TYPE (IC_RIGHT (ic)) == AOP_ACC)
+  if ((AOP_TYPE (IC_LEFT (ic)) == AOP_LIT) || (AOP_NEEDSACC (IC_RIGHT (ic))) || AOP_TYPE (IC_RIGHT (ic)) == AOP_ACC)
     {
       operand *t = IC_RIGHT (ic);
       IC_RIGHT (ic) = IC_LEFT (ic);
@@ -4794,16 +5049,14 @@
 
   /* if both left & right are in bit
      space */
-  if (AOP_TYPE (IC_LEFT (ic)) == AOP_CRY &&
-      AOP_TYPE (IC_RIGHT (ic)) == AOP_CRY)
+  if (AOP_TYPE (IC_LEFT (ic)) == AOP_CRY && AOP_TYPE (IC_RIGHT (ic)) == AOP_CRY)
     {
       /* Cant happen */
       wassertl (0, "Tried to add two bits");
     }
 
   /* if left in bit space & right literal */
-  if (AOP_TYPE (IC_LEFT (ic)) == AOP_CRY &&
-      AOP_TYPE (IC_RIGHT (ic)) == AOP_LIT)
+  if (AOP_TYPE (IC_LEFT (ic)) == AOP_CRY && AOP_TYPE (IC_RIGHT (ic)) == AOP_LIT)
     {
       /* Can happen I guess */
       wassertl (0, "Tried to add a bit to a literal");
@@ -4822,8 +5075,7 @@
       char *left = Safe_strdup (aopGetLitWordLong (AOP (IC_LEFT (ic)), 0, FALSE));
       const char *right = aopGetLitWordLong (AOP (IC_RIGHT (ic)), 0, FALSE);
 
-      if (AOP_TYPE(IC_LEFT(ic)) == AOP_LIT && AOP_TYPE(IC_RIGHT(ic)) == AOP_LIT &&
-          left && right)
+      if (AOP_TYPE (IC_LEFT (ic)) == AOP_LIT && AOP_TYPE (IC_RIGHT (ic)) == AOP_LIT && left && right)
         {
           struct dbuf_s dbuf;
 
@@ -4874,19 +5126,72 @@
           regalloc_dry_run_cost += 1;
           goto release;
         }
+      else if (left == PAIR_HL && (isPairDead (PAIR_DE, ic) || isPairDead (PAIR_BC, ic)))
+        {
+          PAIR_ID pair = (isPairDead (PAIR_DE, ic) ? PAIR_DE : PAIR_BC);
+          fetchPair (pair, AOP (IC_RIGHT (ic)));
+          emit2 ("add hl,%s", _pairs[pair].name);
+          regalloc_dry_run_cost += 1;
+          goto release;
+        }
+      else if (right == PAIR_HL && (isPairDead (PAIR_DE, ic) || isPairDead (PAIR_BC, ic)))
+        {
+          PAIR_ID pair = (isPairDead (PAIR_DE, ic) ? PAIR_DE : PAIR_BC);
+          fetchPair (pair, AOP (IC_LEFT (ic)));
+          emit2 ("add hl,%s", _pairs[pair].name);
+          regalloc_dry_run_cost += 1;
+          goto release;
+        }
       else
         {
           /* Can't do it */
         }
     }
 
+  /* Addition of interleaved pairs */
+  if (getPairId (AOP (IC_RESULT (ic))) == PAIR_HL && AOP_TYPE (IC_LEFT (ic)) == AOP_REG && AOP_SIZE (IC_LEFT (ic)) >= 2 && AOP_TYPE (IC_RIGHT (ic)) == AOP_REG && AOP_SIZE (IC_RIGHT (ic)) >= 2)
+    {
+      if (AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == L_IDX && AOP (IC_RIGHT (ic))->aopu.aop_reg[1]->rIdx == H_IDX)
+        {
+          if (AOP (IC_LEFT (ic))->aopu.aop_reg[1]->rIdx == D_IDX && AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == E_IDX)
+            {
+              emit2 ("add hl, de");
+              regalloc_dry_run_cost += 1;
+              goto release;
+            }
+          else if (AOP (IC_LEFT (ic))->aopu.aop_reg[1]->rIdx == B_IDX && AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == C_IDX)
+            {
+              emit2 ("add hl, bc");
+              regalloc_dry_run_cost += 1;
+              goto release;
+            }
+        }
+      else if (AOP (IC_LEFT (ic))->aopu.aop_reg[1]->rIdx == H_IDX && AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == L_IDX)
+        {
+           if (AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == E_IDX && AOP (IC_RIGHT (ic))->aopu.aop_reg[1]->rIdx == D_IDX)
+            {
+              emit2 ("add hl, de");
+              regalloc_dry_run_cost += 1;
+              goto release;
+            }
+          else if (AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == C_IDX && AOP (IC_RIGHT (ic))->aopu.aop_reg[1]->rIdx == B_IDX)
+            {
+              emit2 ("add hl, bc");
+              regalloc_dry_run_cost += 1;
+              goto release;
+            }
+        }
+    }
+
   if (getPairId (AOP (IC_RESULT (ic))) == PAIR_IY)
     {
       bool save_pair = FALSE;
       PAIR_ID pair;
 
-      if (getPairId (AOP (IC_RIGHT (ic))) == PAIR_IY || getPairId (AOP (IC_LEFT (ic))) == PAIR_BC || getPairId (AOP (IC_LEFT (ic))) == PAIR_DE ||
-        getPairId (AOP (IC_LEFT (ic))) != PAIR_IY && (AOP_TYPE (IC_RIGHT (ic)) == AOP_IMMD || AOP_TYPE (IC_RIGHT (ic)) == AOP_LIT || AOP_TYPE (IC_RIGHT (ic)) == AOP_SIMPLELIT))
+      if (getPairId (AOP (IC_RIGHT (ic))) == PAIR_IY || getPairId (AOP (IC_LEFT (ic))) == PAIR_BC
+          || getPairId (AOP (IC_LEFT (ic))) == PAIR_DE || getPairId (AOP (IC_LEFT (ic))) != PAIR_IY
+          && (AOP_TYPE (IC_RIGHT (ic)) == AOP_IMMD || AOP_TYPE (IC_RIGHT (ic)) == AOP_LIT
+              || AOP_TYPE (IC_RIGHT (ic)) == AOP_SIMPLELIT))
         {
           operand *t = IC_RIGHT (ic);
           IC_RIGHT (ic) = IC_LEFT (ic);
@@ -4895,7 +5200,14 @@
       pair = getPairId (AOP (IC_RIGHT (ic)));
       if (pair != PAIR_BC && pair != PAIR_DE)
         {
-          pair = isPairDead (PAIR_DE, ic) ? PAIR_DE : PAIR_BC;
+          if (AOP_TYPE (IC_RIGHT (ic)) == AOP_REG && AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == C_IDX
+              && (!bitVectBitValue (ic->rSurv, B_IDX) || !isPairDead (PAIR_DE, ic)))
+            pair = PAIR_BC;
+          else if (AOP_TYPE (IC_RIGHT (ic)) == AOP_REG && AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == E_IDX
+                   && (!bitVectBitValue (ic->rSurv, D_IDX) || !isPairDead (PAIR_BC, ic)))
+            pair = PAIR_DE;
+          else
+            pair = isPairDead (PAIR_DE, ic) ? PAIR_DE : PAIR_BC;
           if (!isPairDead (pair, ic))
             save_pair = TRUE;
         }
@@ -4910,48 +5222,53 @@
       goto release;
     }
 
-  if (isPair (AOP (IC_RIGHT (ic))) && AOP_TYPE (IC_LEFT (ic)) == AOP_IMMD && getPairId (AOP (IC_RIGHT (ic))) != PAIR_HL)
+  if (isPair (AOP (IC_RIGHT (ic))) && AOP_TYPE (IC_LEFT (ic)) == AOP_IMMD && getPairId (AOP (IC_RIGHT (ic))) != PAIR_HL
+      && isPairDead (PAIR_HL, ic))
     {
       fetchPair (PAIR_HL, AOP (IC_LEFT (ic)));
       emit2 ("add hl,%s", getPairName (AOP (IC_RIGHT (ic))));
       regalloc_dry_run_cost += 1;
       spillPair (PAIR_HL);
-      commitPair (AOP (IC_RESULT (ic)), PAIR_HL);
+      commitPair (AOP (IC_RESULT (ic)), PAIR_HL, ic, FALSE);
       goto release;
     }
 
-  if (isPair (AOP (IC_LEFT (ic))) && AOP_TYPE (IC_RIGHT (ic)) == AOP_LIT && getPairId (AOP (IC_LEFT (ic))) != PAIR_HL)
+  if (isPair (AOP (IC_LEFT (ic))) && AOP_TYPE (IC_RIGHT (ic)) == AOP_LIT && getPairId (AOP (IC_LEFT (ic))) != PAIR_HL
+      && isPairDead (PAIR_HL, ic))
     {
       fetchPair (PAIR_HL, AOP (IC_RIGHT (ic)));
       emit2 ("add hl,%s", getPairName (AOP (IC_LEFT (ic))));
       regalloc_dry_run_cost += 1;
       spillPair (PAIR_HL);
-      commitPair (AOP (IC_RESULT (ic)), PAIR_HL);
+      commitPair (AOP (IC_RESULT (ic)), PAIR_HL, ic, FALSE);
       goto release;
     }
 
-  if (isPair (AOP (IC_LEFT (ic))) && isPair (AOP (IC_RIGHT (ic))) && getPairId (AOP (IC_LEFT (ic))) == PAIR_HL)
+  if (isPair (AOP (IC_LEFT (ic))) && isPair (AOP (IC_RIGHT (ic))) && getPairId (AOP (IC_LEFT (ic))) == PAIR_HL
+      && isPairDead (PAIR_HL, ic))
     {
       emit2 ("add hl,%s", getPairName (AOP (IC_RIGHT (ic))));
       regalloc_dry_run_cost += 1;
       spillPair (PAIR_HL);
-      commitPair (AOP (IC_RESULT (ic)), PAIR_HL);
+      commitPair (AOP (IC_RESULT (ic)), PAIR_HL, ic, FALSE);
       goto release;
     }
 
-  if (isPair (AOP (IC_LEFT (ic))) && isPair (AOP (IC_RIGHT (ic))) && getPairId (AOP (IC_RIGHT (ic))) == PAIR_HL)
+  if (isPair (AOP (IC_LEFT (ic))) && isPair (AOP (IC_RIGHT (ic))) && getPairId (AOP (IC_RIGHT (ic))) == PAIR_HL
+      && isPairDead (PAIR_HL, ic))
     {
       emit2 ("add hl,%s", getPairName (AOP (IC_LEFT (ic))));
       regalloc_dry_run_cost += 1;
       spillPair (PAIR_HL);
-      commitPair (AOP (IC_RESULT (ic)), PAIR_HL);
+      commitPair (AOP (IC_RESULT (ic)), PAIR_HL, ic, FALSE);
       goto release;
     }
 
   if (getPairId (AOP (IC_RESULT (ic))) == PAIR_HL && AOP_TYPE (IC_RIGHT (ic)) == AOP_REG &&
-    AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == C_IDX && !bitVectBitValue(ic->rSurv, B_IDX))
+      AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == C_IDX && !bitVectBitValue (ic->rSurv, B_IDX))
     {
-      if (AOP (IC_RIGHT (ic))->aopu.aop_reg[1] && (AOP (IC_RIGHT (ic))->aopu.aop_reg[1]->rIdx == H_IDX || AOP (IC_RIGHT (ic))->aopu.aop_reg[1]->rIdx == L_IDX))
+      if (AOP (IC_RIGHT (ic))->aopu.aop_reg[1]
+          && (AOP (IC_RIGHT (ic))->aopu.aop_reg[1]->rIdx == H_IDX || AOP (IC_RIGHT (ic))->aopu.aop_reg[1]->rIdx == L_IDX))
         {
           cheapMove (ASMOP_B, 0, AOP (IC_RIGHT (ic)), 1);
           fetchPair (PAIR_HL, AOP (IC_LEFT (ic)));
@@ -4965,10 +5282,11 @@
       regalloc_dry_run_cost += 1;
       goto release;
     }
-  if (!z80_opts.oldralloc && getPairId (AOP (IC_RESULT (ic))) == PAIR_HL && AOP_TYPE (IC_LEFT (ic)) == AOP_REG &&
-    AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == C_IDX && !bitVectBitValue(ic->rSurv, B_IDX))
+  if (!options.oldralloc && getPairId (AOP (IC_RESULT (ic))) == PAIR_HL && AOP_TYPE (IC_LEFT (ic)) == AOP_REG &&
+      AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == C_IDX && !bitVectBitValue (ic->rSurv, B_IDX))
     {
-      if (AOP (IC_LEFT (ic))->aopu.aop_reg[1] && (AOP (IC_LEFT (ic))->aopu.aop_reg[1]->rIdx == H_IDX || AOP (IC_LEFT (ic))->aopu.aop_reg[1]->rIdx == L_IDX))
+      if (AOP (IC_LEFT (ic))->aopu.aop_reg[1]
+          && (AOP (IC_LEFT (ic))->aopu.aop_reg[1]->rIdx == H_IDX || AOP (IC_LEFT (ic))->aopu.aop_reg[1]->rIdx == L_IDX))
         {
           cheapMove (ASMOP_B, 0, AOP (IC_LEFT (ic)), 1);
           fetchPair (PAIR_HL, AOP (IC_RIGHT (ic)));
@@ -4983,10 +5301,11 @@
       goto release;
     }
 
-  if (!z80_opts.oldralloc && getPairId (AOP (IC_RESULT (ic))) == PAIR_HL && AOP_TYPE (IC_RIGHT (ic)) == AOP_REG &&
-    AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == E_IDX && !bitVectBitValue(ic->rSurv, D_IDX))
+  if (!options.oldralloc && getPairId (AOP (IC_RESULT (ic))) == PAIR_HL && AOP_TYPE (IC_RIGHT (ic)) == AOP_REG &&
+      AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == E_IDX && !bitVectBitValue (ic->rSurv, D_IDX))
     {
-      if (AOP (IC_RIGHT (ic))->aopu.aop_reg[1] && (AOP (IC_RIGHT (ic))->aopu.aop_reg[1]->rIdx == H_IDX || AOP (IC_RIGHT (ic))->aopu.aop_reg[1]->rIdx == L_IDX))
+      if (AOP (IC_RIGHT (ic))->aopu.aop_reg[1]
+          && (AOP (IC_RIGHT (ic))->aopu.aop_reg[1]->rIdx == H_IDX || AOP (IC_RIGHT (ic))->aopu.aop_reg[1]->rIdx == L_IDX))
         {
           cheapMove (ASMOP_D, 0, AOP (IC_RIGHT (ic)), 1);
           fetchPair (PAIR_HL, AOP (IC_LEFT (ic)));
@@ -5000,10 +5319,11 @@
       regalloc_dry_run_cost += 1;
       goto release;
     }
-  if (!z80_opts.oldralloc && getPairId (AOP (IC_RESULT (ic))) == PAIR_HL && AOP_TYPE (IC_LEFT (ic)) == AOP_REG &&
-    AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == E_IDX && !bitVectBitValue(ic->rSurv, D_IDX))
+  if (!options.oldralloc && getPairId (AOP (IC_RESULT (ic))) == PAIR_HL && AOP_TYPE (IC_LEFT (ic)) == AOP_REG &&
+      AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == E_IDX && !bitVectBitValue (ic->rSurv, D_IDX))
     {
-      if (AOP (IC_LEFT (ic))->aopu.aop_reg[1] && (AOP (IC_LEFT (ic))->aopu.aop_reg[1]->rIdx == H_IDX || AOP (IC_LEFT (ic))->aopu.aop_reg[1]->rIdx == L_IDX))
+      if (AOP (IC_LEFT (ic))->aopu.aop_reg[1]
+          && (AOP (IC_LEFT (ic))->aopu.aop_reg[1]->rIdx == H_IDX || AOP (IC_LEFT (ic))->aopu.aop_reg[1]->rIdx == L_IDX))
         {
           cheapMove (ASMOP_D, 0, AOP (IC_LEFT (ic)), 1);
           fetchPair (PAIR_HL, AOP (IC_RIGHT (ic)));
@@ -5017,7 +5337,51 @@
       regalloc_dry_run_cost += 1;
       goto release;
     }
-    
+
+  if (getPairId (AOP (IC_RESULT (ic))) == PAIR_HL && getPairId (AOP (IC_LEFT (ic))) == PAIR_HL
+      && AOP_TYPE (IC_RIGHT (ic)) == AOP_LIT)
+    {
+      PAIR_ID pair = getFreePairId (ic);
+      bool pair_alive;
+      if (pair == PAIR_INVALID)
+        pair = PAIR_DE;
+      if (pair_alive = !isPairDead (pair, ic))
+        _push (pair);
+      fetchPair (pair, AOP (IC_RIGHT (ic)));
+      emit2 ("add hl, %s", _pairs[pair].name);
+      regalloc_dry_run_cost += 1;
+      if (pair_alive)
+        _pop (pair);
+      goto release;
+    }
+
+  /* Using the 16 bit addition results in smaller and faster code than using the 8-bit addition. */
+  if (size == 1 && isPairDead (PAIR_HL, ic) && AOP_TYPE (IC_RESULT (ic)) == AOP_REG && AOP_TYPE (IC_LEFT (ic)) == AOP_REG
+      && AOP_TYPE (IC_RIGHT (ic)) == AOP_REG && AOP (IC_RESULT (ic))->aopu.aop_reg[0]->rIdx == L_IDX
+      && (AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == L_IDX || AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == L_IDX)
+      && (AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == C_IDX || AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == C_IDX
+          || AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == E_IDX || AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == E_IDX))
+    {
+      PAIR_ID pair = (AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == C_IDX
+                      || AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == C_IDX) ? PAIR_BC : PAIR_DE;
+      emit2 ("add hl, %s", _pairs[pair].name);
+      regalloc_dry_run_cost += 1;
+      goto release;
+    }
+
+  /* When adding a literal, the 16 bit addition results in smaller, slower code. */
+  if (optimize.codeSize && size == 1 && isPairDead (PAIR_HL, ic) && AOP_TYPE (IC_RESULT (ic)) == AOP_REG
+      && AOP_TYPE (IC_LEFT (ic)) == AOP_REG && AOP_TYPE (IC_RIGHT (ic)) == AOP_LIT
+      && AOP (IC_RESULT (ic))->aopu.aop_reg[0]->rIdx == L_IDX && AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == L_IDX
+      && (!bitVectBitValue (ic->rSurv, C_IDX) || !bitVectBitValue (ic->rSurv, E_IDX)))
+    {
+      PAIR_ID pair = bitVectBitValue (ic->rSurv, C_IDX) ? PAIR_DE : PAIR_BC;
+      emit2 ("ld %s, !immedbyte", _pairs[pair].l, ((unsigned int) ulFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit)) & 0xff);
+      emit2 ("add hl, %s", _pairs[pair].name);
+      regalloc_dry_run_cost += 3;
+      goto release;
+    }
+
   /* Special case:
      ld hl,sp+n trashes C so we can't afford to do it during an
      add with stack based variables.  Worst case is:
@@ -5048,16 +5412,12 @@
    */
   if (IS_GB)
     {
-      if (AOP_TYPE (IC_LEFT (ic)) == AOP_STK ||
-          AOP_TYPE (IC_RIGHT (ic)) == AOP_STK ||
-          AOP_TYPE (IC_RESULT (ic)) == AOP_STK)
+      if (AOP_TYPE (IC_LEFT (ic)) == AOP_STK || AOP_TYPE (IC_RIGHT (ic)) == AOP_STK || AOP_TYPE (IC_RESULT (ic)) == AOP_STK)
         {
           if ((AOP_SIZE (IC_LEFT (ic)) == 2 ||
-               AOP_SIZE (IC_RIGHT (ic)) == 2) &&
-              (AOP_SIZE (IC_LEFT (ic)) <= 2 &&
-               AOP_SIZE (IC_RIGHT (ic)) <= 2))
+               AOP_SIZE (IC_RIGHT (ic)) == 2) && (AOP_SIZE (IC_LEFT (ic)) <= 2 && AOP_SIZE (IC_RIGHT (ic)) <= 2 || size == 2))
             {
-              if (getPairId (AOP (IC_RIGHT (ic))) == PAIR_BC)
+              if (getPairId (AOP (IC_RIGHT (ic))) == PAIR_BC || getPairId (AOP (IC_RIGHT (ic))) == PAIR_DE)
                 {
                   /* Swap left and right */
                   operand *t = IC_RIGHT (ic);
@@ -5072,12 +5432,46 @@
                 }
               else
                 {
-                  fetchPair (PAIR_DE, AOP (IC_LEFT (ic)));
-                  fetchPair (PAIR_HL, AOP (IC_RIGHT (ic)));
+                  if (AOP_TYPE (IC_RIGHT (ic)) == AOP_REG && AOP_TYPE (IC_LEFT (ic)) == AOP_REG)
+                    {
+                      const short dst[4] = { E_IDX, L_IDX, D_IDX, H_IDX };
+                      short src[4];
+                      if (AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == E_IDX
+                          || AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == L_IDX)
+                        {
+                          src[0] = AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx;
+                          src[1] = AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx;
+                          src[2] = AOP (IC_RIGHT (ic))->aopu.aop_reg[1]->rIdx;
+                          src[3] = AOP (IC_LEFT (ic))->aopu.aop_reg[1]->rIdx;
+                        }
+                      else
+                        {
+                          src[1] = AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx;
+                          src[0] = AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx;
+                          src[3] = AOP (IC_RIGHT (ic))->aopu.aop_reg[1]->rIdx;
+                          src[2] = AOP (IC_LEFT (ic))->aopu.aop_reg[1]->rIdx;
+                        }
+                      regMove (dst, src, size);
+                    }
+                  else if (AOP_TYPE (IC_RIGHT (ic)) == AOP_REG &&
+                           (AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == E_IDX
+                            || AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == D_IDX || AOP_SIZE (IC_RIGHT (ic)) == 2
+                            && (AOP (IC_RIGHT (ic))->aopu.aop_reg[1]->rIdx == E_IDX
+                                || AOP (IC_RIGHT (ic))->aopu.aop_reg[1]->rIdx == D_IDX)))
+                    {
+                      fetchPair (PAIR_DE, AOP (IC_RIGHT (ic)));
+                      fetchPair (PAIR_HL, AOP (IC_LEFT (ic)));
+                    }
+                  else
+                    {
+                      fetchPair (PAIR_DE, AOP (IC_LEFT (ic)));
+                      fetchPair (PAIR_HL, AOP (IC_RIGHT (ic)));
+                    }
                   emit2 ("add hl,de");
                   regalloc_dry_run_cost += 1;
                 }
-              commitPair (AOP (IC_RESULT (ic)), PAIR_HL);
+              spillPair (PAIR_HL);
+              commitPair (AOP (IC_RESULT (ic)), PAIR_HL, ic, FALSE);
               goto release;
             }
         }
@@ -5085,40 +5479,59 @@
         {
           /* Be paranoid on the GB with 4 byte variables due to how C
              can be trashed by lda hl,n(sp).
-          */
+           */
           _gbz80_emitAddSubLong (ic, TRUE);
           goto release;
         }
     }
-  
+
   // Avoid overwriting operand in h or l when setupToPreserveCarry () loads hl.
-  if(!couldDestroyCarry (AOP (IC_LEFT (ic))))
+  if (!couldDestroyCarry (AOP (IC_LEFT (ic))))
     {
       cheapMove (ASMOP_A, 0, AOP (IC_LEFT (ic)), offset);
       premoved = TRUE;
     }
   else
     premoved = FALSE;
-    
+
   setupToPreserveCarry (ic);
 
+  cached[0] = -1;
+  cached[1] = -1;
   while (size--)
     {
-      if(!premoved)
+      if (!premoved)
         cheapMove (ASMOP_A, 0, AOP (IC_LEFT (ic)), offset);
       else
         premoved = FALSE;
       if (offset == 0)
-      {
-        if(size == 0 && AOP_TYPE (IC_RIGHT (ic)) == AOP_LIT && ulFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit) == 1)
-          emit3 (A_INC, ASMOP_A, 0);
-        else
-          emit3_o (A_ADD, ASMOP_A, 0, AOP (IC_RIGHT (ic)), offset);
-      }
+        {
+          if (size == 0 && AOP_TYPE (IC_RIGHT (ic)) == AOP_LIT && ulFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit) == 1)
+            emit3 (A_INC, ASMOP_A, 0);
+          else
+            emit3_o (A_ADD, ASMOP_A, 0, AOP (IC_RIGHT (ic)), offset);
+        }
       else
         emit3_o (A_ADC, ASMOP_A, 0, AOP (IC_RIGHT (ic)), offset);
-      cheapMove (AOP (IC_RESULT (ic)), offset++, ASMOP_A, 0);
+      if (size &&
+          (requiresHL (AOP (IC_RIGHT (ic))) && AOP_TYPE (IC_RIGHT (ic)) != AOP_REG || requiresHL (AOP (IC_LEFT (ic)))
+           && AOP_TYPE (IC_LEFT (ic)) != AOP_REG) && AOP_TYPE (IC_RESULT (ic)) == AOP_REG
+          && (AOP (IC_RESULT (ic))->aopu.aop_reg[offset]->rIdx == L_IDX
+              || AOP (IC_RESULT (ic))->aopu.aop_reg[offset]->rIdx == H_IDX))
+        {
+          wassert (cached[0] == -1 || cached[1] == -1);
+          cached[cached[0] == -1 ? 0 : 1] = offset++;
+          _push (PAIR_AF);
+        }
+      else
+        cheapMove (AOP (IC_RESULT (ic)), offset++, ASMOP_A, 0);
     }
+  for (size = 0; size < 2; size++)
+    if (cached[size] != -1)
+      {
+        _pop (PAIR_AF);
+        cheapMove (AOP (IC_RESULT (ic)), cached[size], ASMOP_A, 0);
+      }
 release:
   _G.preserveCarry = FALSE;
   freeAsmop (IC_LEFT (ic), NULL, ic);
@@ -5148,8 +5561,7 @@
   size = getDataSize (IC_RESULT (ic));
 
   /* if decrement 16 bits in register */
-  if (sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic))) &&
-      (size > 1) && isPair (AOP (IC_RESULT (ic))))
+  if (sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic))) && (size > 1) && isPair (AOP (IC_RESULT (ic))))
     {
       while (icount--)
         emit2 ("dec %s", getPairName (AOP (IC_RESULT (ic))));
@@ -5163,31 +5575,28 @@
       while (icount--)
         if (!regalloc_dry_run)
           emit2 ("dec %s", getPairName (AOP (IC_RESULT (ic))));
-        regalloc_dry_run_cost += 1;
+      regalloc_dry_run_cost += 1;
       return TRUE;
     }
 
-  /* if increment 16 bits in register */
-  if (sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic))) &&
-      (size == 2)
-      )
+  /* if decrement 16 bits in register */
+  if (sameRegs (AOP (IC_LEFT (ic)), AOP (IC_RESULT (ic))) && size == 2 && isPairDead (_getTempPairId (), ic))
     {
-      fetchPair (_getTempPairId(), AOP (IC_RESULT (ic)));
+      fetchPair (_getTempPairId (), AOP (IC_RESULT (ic)));
 
       while (icount--)
         if (!regalloc_dry_run)
-          emit2 ("dec %s", _getTempPairName());
-        regalloc_dry_run_cost += 1;
+          emit2 ("dec %s", _getTempPairName ());
+      regalloc_dry_run_cost += 1;
 
-      commitPair (AOP (IC_RESULT (ic)), _getTempPairId());
+      commitPair (AOP (IC_RESULT (ic)), _getTempPairId (), ic, FALSE);
 
       return TRUE;
     }
 
 
   /* if the sizes are greater than 1 then we cannot */
-  if (AOP_SIZE (IC_RESULT (ic)) > 1 ||
-      AOP_SIZE (IC_LEFT (ic)) > 1)
+  if (AOP_SIZE (IC_RESULT (ic)) > 1 || AOP_SIZE (IC_LEFT (ic)) > 1)
     return FALSE;
 
   /* we can if the aops of the left & result match or if they are in
@@ -5199,6 +5608,14 @@
       return TRUE;
     }
 
+  if (AOP_TYPE (IC_RESULT (ic)) == AOP_REG)
+    {
+      cheapMove (AOP (IC_RESULT (ic)), 0, AOP (IC_LEFT (ic)), 0);
+      while (icount--)
+        emit3 (A_DEC, AOP (IC_RESULT (ic)), 0);
+      return TRUE;
+    }
+
   return FALSE;
 }
 
@@ -5217,8 +5634,7 @@
 
   /* special cases :- */
   /* if both left & right are in bit space */
-  if (AOP_TYPE (IC_LEFT (ic)) == AOP_CRY &&
-      AOP_TYPE (IC_RIGHT (ic)) == AOP_CRY)
+  if (AOP_TYPE (IC_LEFT (ic)) == AOP_CRY && AOP_TYPE (IC_RIGHT (ic)) == AOP_CRY)
     {
       wassertl (0, "Tried to subtract two bits");
       goto release;
@@ -5242,14 +5658,10 @@
   /* Same logic as genPlus */
   if (IS_GB)
     {
-      if (AOP_TYPE (IC_LEFT (ic)) == AOP_STK ||
-          AOP_TYPE (IC_RIGHT (ic)) == AOP_STK ||
-          AOP_TYPE (IC_RESULT (ic)) == AOP_STK)
+      if (AOP_TYPE (IC_LEFT (ic)) == AOP_STK || AOP_TYPE (IC_RIGHT (ic)) == AOP_STK || AOP_TYPE (IC_RESULT (ic)) == AOP_STK)
         {
           if ((AOP_SIZE (IC_LEFT (ic)) == 2 ||
-               AOP_SIZE (IC_RIGHT (ic)) == 2) &&
-              (AOP_SIZE (IC_LEFT (ic)) <= 2 &&
-               AOP_SIZE (IC_RIGHT (ic)) <= 2))
+               AOP_SIZE (IC_RIGHT (ic)) == 2) && (AOP_SIZE (IC_LEFT (ic)) <= 2 && AOP_SIZE (IC_RIGHT (ic)) <= 2))
             {
               PAIR_ID left = getPairId (AOP (IC_LEFT (ic)));
               PAIR_ID right = getPairId (AOP (IC_RIGHT (ic)));
@@ -5268,7 +5680,7 @@
               /* Order is important.  Right may be HL */
               fetchPair (right, AOP (IC_RIGHT (ic)));
 
-              if(!regalloc_dry_run)
+              if (!regalloc_dry_run)
                 {
                   emit2 ("ld a,%s", _pairs[left].l);
                   emit2 ("sub a,%s", _pairs[right].l);
@@ -5278,9 +5690,9 @@
                 }
               regalloc_dry_run_cost += 5;
 
-              if ( AOP_SIZE (IC_RESULT (ic)) > 1)
+              if (AOP_SIZE (IC_RESULT (ic)) > 1)
                 cheapMove (AOP (IC_RESULT (ic)), 1, ASMOP_A, 0);
-              aopPut (AOP (IC_RESULT (ic)), "e", 0);
+              cheapMove (AOP (IC_RESULT (ic)), 0, ASMOP_E, 0);
               goto release;
             }
         }
@@ -5288,7 +5700,7 @@
         {
           /* Be paranoid on the GB with 4 byte variables due to how C
              can be trashed by lda hl,n(sp).
-          */
+           */
           _gbz80_emitAddSubLong (ic, FALSE);
           goto release;
         }
@@ -5316,7 +5728,7 @@
                 emit3 (A_DEC, ASMOP_A, 0);
               else
                 {
-                  if(!regalloc_dry_run)
+                  if (!regalloc_dry_run)
                     emit2 ("add a,!immedbyte", (unsigned int) (lit & 0x0FFL));
                   regalloc_dry_run_cost += 2;
                 }
@@ -5327,9 +5739,7 @@
       cheapMove (AOP (IC_RESULT (ic)), offset++, ASMOP_A, 0);
     }
 
-  if (AOP_SIZE (IC_RESULT (ic)) == 3 &&
-      AOP_SIZE (IC_LEFT (ic)) == 3 &&
-      !sameRegs (AOP (IC_RESULT (ic)), AOP (IC_LEFT (ic))))
+  if (AOP_SIZE (IC_RESULT (ic)) == 3 && AOP_SIZE (IC_LEFT (ic)) == 3 && !sameRegs (AOP (IC_RESULT (ic)), AOP (IC_LEFT (ic))))
     {
       wassertl (0, "Tried to subtract on a long pointer");
     }
@@ -5353,57 +5763,55 @@
   asmop *result = AOP (IC_RESULT (ic));
   int resultsize = AOP_SIZE (IC_RESULT (ic));
 
-  if(IS_GB)
+  if (IS_GB)
     {
       wassertl (0, "Multiplication is handled through support function calls on gbz80");
       return;
     }
 
-  if (IS_Z180 &&
-    /*AOP_TYPE (IC_LEFT (ic)) == AOP_REG && AOP_TYPE (IC_RIGHT (ic)) == AOP_REG &&*/ AOP_TYPE (IC_RESULT (ic)) == AOP_REG)
+  if (IS_Z180 && AOP_TYPE (IC_RESULT (ic)) == AOP_REG)
     {
-      if (/*(AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == B_IDX && AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == C_IDX ||
-        AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == C_IDX && AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == B_IDX) &&*/
-        (resultsize > 1 ? result->aopu.aop_reg[1]->rIdx == B_IDX : !bitVectBitValue (ic->rSurv, B_IDX)) && result->aopu.aop_reg[0]->rIdx == C_IDX)
+      if ((resultsize > 1 ? result->aopu.aop_reg[1]->rIdx == B_IDX : !bitVectBitValue (ic->rSurv, B_IDX))
+          && result->aopu.aop_reg[0]->rIdx == C_IDX)
         {
-          if(AOP_TYPE (IC_LEFT (ic)) == AOP_REG && AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == C_IDX ||
-            AOP_TYPE (IC_RIGHT (ic)) == AOP_REG && AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == B_IDX)
+          if (AOP_TYPE (IC_LEFT (ic)) == AOP_REG && AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == C_IDX ||
+              AOP_TYPE (IC_RIGHT (ic)) == AOP_REG && AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == B_IDX)
             {
-              cheapMove(ASMOP_C, 0, AOP (IC_LEFT (ic)), LSB);
-              cheapMove(ASMOP_B, 0, AOP (IC_RIGHT (ic)), LSB);
+              cheapMove (ASMOP_C, 0, AOP (IC_LEFT (ic)), LSB);
+              cheapMove (ASMOP_B, 0, AOP (IC_RIGHT (ic)), LSB);
             }
           else
             {
-              cheapMove(ASMOP_B, 0, AOP (IC_LEFT (ic)), LSB);
-              cheapMove(ASMOP_C, 0, AOP (IC_RIGHT (ic)), LSB);
+              cheapMove (ASMOP_B, 0, AOP (IC_LEFT (ic)), LSB);
+              cheapMove (ASMOP_C, 0, AOP (IC_RIGHT (ic)), LSB);
             }
           emit2 ("mlt bc");
           regalloc_dry_run_cost += 2;
           return;
         }
-      if (/*(AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == D_IDX && AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == E_IDX ||
-        AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == E_IDX && AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == D_IDX) &&*/
-        (resultsize > 1 ? result->aopu.aop_reg[1]->rIdx == D_IDX : !bitVectBitValue (ic->rSurv, D_IDX)) && result->aopu.aop_reg[0]->rIdx == E_IDX)
+      if ((resultsize > 1 ? result->aopu.aop_reg[1]->rIdx == D_IDX : !bitVectBitValue (ic->rSurv, D_IDX))
+          && result->aopu.aop_reg[0]->rIdx == E_IDX)
         {
-          if(AOP_TYPE (IC_LEFT (ic)) == AOP_REG && AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == E_IDX ||
-            AOP_TYPE (IC_RIGHT (ic)) == AOP_REG && AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == D_IDX)
+          if (AOP_TYPE (IC_LEFT (ic)) == AOP_REG && AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == E_IDX ||
+              AOP_TYPE (IC_RIGHT (ic)) == AOP_REG && AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == D_IDX)
             {
-              cheapMove(ASMOP_E, 0, AOP (IC_LEFT (ic)), LSB);
-              cheapMove(ASMOP_D, 0, AOP (IC_RIGHT (ic)), LSB);
+              cheapMove (ASMOP_E, 0, AOP (IC_LEFT (ic)), LSB);
+              cheapMove (ASMOP_D, 0, AOP (IC_RIGHT (ic)), LSB);
             }
           else
             {
-              cheapMove(ASMOP_D, 0, AOP (IC_LEFT (ic)), LSB);
-              cheapMove(ASMOP_E, 0, AOP (IC_RIGHT (ic)), LSB);
+              cheapMove (ASMOP_D, 0, AOP (IC_LEFT (ic)), LSB);
+              cheapMove (ASMOP_E, 0, AOP (IC_RIGHT (ic)), LSB);
             }
           emit2 ("mlt de");
           regalloc_dry_run_cost += 2;
           return;
         }
       if (AOP_TYPE (IC_LEFT (ic)) == AOP_REG && AOP_TYPE (IC_RIGHT (ic)) == AOP_REG &&
-        ((AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == H_IDX && AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == L_IDX ||
-        AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == L_IDX && AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == H_IDX) &&
-        (resultsize > 1 ? result->aopu.aop_reg[1]->rIdx == H_IDX : !bitVectBitValue (ic->rSurv, H_IDX)) && result->aopu.aop_reg[0]->rIdx == L_IDX))
+          ((AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == H_IDX && AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == L_IDX ||
+            AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == L_IDX && AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == H_IDX) &&
+           (resultsize > 1 ? result->aopu.aop_reg[1]->rIdx == H_IDX : !bitVectBitValue (ic->rSurv, H_IDX))
+           && result->aopu.aop_reg[0]->rIdx == L_IDX))
         {
           emit2 ("mlt hl");
           regalloc_dry_run_cost += 2;
@@ -5416,9 +5824,9 @@
       _push (PAIR_DE);
       _G.stack.pushedDE = TRUE;
     }
-  if (IS_R2K && !isPairDead (PAIR_BC, ic) ||
-    !IS_Z180 && (!z80_opts.oldralloc && bitVectBitValue (ic->rSurv, B_IDX) ||
-    z80_opts.oldralloc && bitVectBitValue (ic->rMask, B_IDX) && !(getPairId (AOP (IC_RESULT (ic))) == PAIR_BC)))
+  if (IS_RAB && !isPairDead (PAIR_BC, ic) ||
+      !IS_Z180 && (!options.oldralloc && bitVectBitValue (ic->rSurv, B_IDX) ||
+                   options.oldralloc && bitVectBitValue (ic->rMask, B_IDX) && !(getPairId (AOP (IC_RESULT (ic))) == PAIR_BC)))
     {
       _push (PAIR_BC);
       savedB = TRUE;
@@ -5426,7 +5834,8 @@
 
   // genMult() already swapped operands if necessary.
   if (AOP_TYPE (IC_LEFT (ic)) == AOP_REG && AOP (IC_LEFT (ic))->aopu.aop_reg[0]->rIdx == E_IDX ||
-    AOP_TYPE (IC_RIGHT (ic)) == AOP_REG && AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == H_IDX && !requiresHL (AOP (IC_LEFT (ic))))
+      AOP_TYPE (IC_RIGHT (ic)) == AOP_REG && AOP (IC_RIGHT (ic))->aopu.aop_reg[0]->rIdx == H_IDX
+      && !requiresHL (AOP (IC_LEFT (ic))))
     {
       cheapMove (ASMOP_E, 0, AOP (IC_LEFT (ic)), LSB);
       cheapMove (ASMOP_H, 0, AOP (IC_RIGHT (ic)), LSB);
@@ -5443,10 +5852,10 @@
       emit2 ("mlt hl");
       regalloc_dry_run_cost += 3;
     }
-  else if(IS_R2K)
+  else if (IS_RAB)
     {
       emit2 ("ld c, h");
-      emit2 ("ld d, #0x00");
+      emit2 ("ld d, !immedbyte", 0x00);
       emit2 ("ld b, d");
       emit2 ("mul");
       emit2 ("ld l, c");
@@ -5457,22 +5866,22 @@
     {
       tlbl1 = newiTempLabel (NULL);
       tlbl2 = newiTempLabel (NULL);
-      emit2 ("ld l,#0x00");
-      emit2 ("ld d,l");
-      emit2 ("ld b,#0x08");
-      emitLabelNoSpill (tlbl1->key + 100);
+      emit2 ("ld l, !immedbyte", 0x00);
+      emit2 ("ld d, l");
+      emit2 ("ld b, !immedbyte", 0x08);
+      emitLabel (tlbl1);
       emit2 ("add hl,hl");
-      emit2 ("jp NC,!tlabel", tlbl2->key + 100);
+      emit2 ("jp NC,!tlabel", labelKey2num (tlbl2->key));
       emit2 ("add hl,de");
-      emitLabelNoSpill (tlbl2->key + 100);
-      emit2 ("djnz !tlabel", tlbl1->key + 100);
+      emitLabel (tlbl2);
+      emit2 ("djnz !tlabel", labelKey2num (tlbl1->key));
       regalloc_dry_run_cost += 12;
     }
   else
     regalloc_dry_run_cost += 12;
 
 
-  spillPair(PAIR_HL);
+  spillPair (PAIR_HL);
 
   if (savedB)
     {
@@ -5484,38 +5893,38 @@
       _G.stack.pushedDE = FALSE;
     }
 
-  if(result->type != AOP_HL)
+  if (result->type != AOP_HL)
     {
-    if (resultsize == 1)
-      cheapMove (result, 0, ASMOP_L, 0);
-    else
-      commitPair (result, PAIR_HL);
+      if (resultsize == 1)
+        cheapMove (result, 0, ASMOP_L, 0);
+      else
+        commitPair (result, PAIR_HL, ic, FALSE);
     }
   else
     {
-    if (resultsize == 1)
-      {
-        emit2("ld a, l");
-        regalloc_dry_run_cost += 1;
-        cheapMove (result, 0, ASMOP_A, 0);
-      }
-    else
-      {
-        if(!isPairDead (PAIR_DE, ic))
-          {
-            _push (PAIR_DE);
-            _G.stack.pushedDE = TRUE;
-          }
-        emit2("ld e, l");
-        emit2("ld d, h");
-        regalloc_dry_run_cost += 2;
-        commitPair (result, PAIR_DE);
-        if(!isPairDead (PAIR_DE, ic))
-          {
-            _pop (PAIR_DE);
-            _G.stack.pushedDE = FALSE;
-          }
-      }
+      if (resultsize == 1)
+        {
+          emit2 ("ld a, l");
+          regalloc_dry_run_cost += 1;
+          cheapMove (result, 0, ASMOP_A, 0);
+        }
+      else
+        {
+          if (!isPairDead (PAIR_DE, ic))
+            {
+              _push (PAIR_DE);
+              _G.stack.pushedDE = TRUE;
+            }
+          emit2 ("ld e, l");
+          emit2 ("ld d, h");
+          regalloc_dry_run_cost += 2;
+          commitPair (result, PAIR_DE, ic, FALSE);
+          if (!isPairDead (PAIR_DE, ic))
+            {
+              _pop (PAIR_DE);
+              _G.stack.pushedDE = FALSE;
+            }
+        }
     }
 }
 
@@ -5523,7 +5932,7 @@
 /* genMult - generates code for multiplication                     */
 /*-----------------------------------------------------------------*/
 static void
-genMult (iCode *ic)
+genMult (iCode * ic)
 {
   int val;
   int count, i;
@@ -5536,11 +5945,9 @@
   aopOp (IC_RIGHT (ic), ic, FALSE, FALSE);
   aopOp (IC_RESULT (ic), ic, TRUE, FALSE);
 
-  byteResult =  (AOP_SIZE (IC_RESULT (ic)) == 1);
+  byteResult = (AOP_SIZE (IC_RESULT (ic)) == 1);
 
-  if (AOP_SIZE (IC_LEFT (ic)) > 2 ||
-      AOP_SIZE (IC_RIGHT (ic)) > 2 ||
-      AOP_SIZE (IC_RESULT (ic)) > 2)
+  if (AOP_SIZE (IC_LEFT (ic)) > 2 || AOP_SIZE (IC_RIGHT (ic)) > 2 || AOP_SIZE (IC_RESULT (ic)) > 2)
     {
       wassertl (0, "Multiplication is handled through support function calls.");
     }
@@ -5561,18 +5968,19 @@
 
   wassertl (AOP_TYPE (IC_RIGHT (ic)) == AOP_LIT, "Right must be a literal.");
 
-  val = (int) ulFromVal ( AOP (IC_RIGHT (ic))->aopu.aop_lit);
+  val = (int) ulFromVal (AOP (IC_RIGHT (ic))->aopu.aop_lit);
   //  wassertl (val > 0, "Multiply must be positive");
   wassertl (val != 1, "Can't multiply by 1");
 
-  if (!IS_GB && (byteResult ? bitVectBitValue (ic->rSurv, E_IDX) : !isPairDead (PAIR_DE, ic))) {
-    _push (PAIR_DE);
-    _G.stack.pushedDE = TRUE;
-  }
+  if (!IS_GB && (byteResult ? bitVectBitValue (ic->rSurv, E_IDX) : !isPairDead (PAIR_DE, ic)))
+    {
+      _push (PAIR_DE);
+      _G.stack.pushedDE = TRUE;
+    }
 
   if (byteResult)
     cheapMove (ASMOP_A, 0, AOP (IC_LEFT (ic)), LSB);
-  else if ( AOP_SIZE (IC_LEFT (ic)) == 1 && !SPEC_USIGN (getSpec (operandType ( IC_LEFT (ic)))))
+  else if (AOP_SIZE (IC_LEFT (ic)) == 1 && !SPEC_USIGN (getSpec (operandType (IC_LEFT (ic)))))
     {
       cheapMove (ASMOP_E, 0, AOP (IC_LEFT (ic)), LSB);
       if (!byteResult)
@@ -5625,7 +6033,7 @@
       i <<= 1;
     }
 
-  spillPair(PAIR_HL);
+  spillPair (PAIR_HL);
 
   if (!IS_GB && _G.stack.pushedDE)
     {
@@ -5636,7 +6044,7 @@
   if (byteResult)
     cheapMove (AOP (IC_RESULT (ic)), 0, ASMOP_A, 0);
   else
-    commitPair ( AOP (IC_RESULT (ic)), PAIR_HL);
+    commitPair (AOP (IC_RESULT (ic)), PAIR_HL, ic, FALSE);
 
 release:
   freeAsmop (IC_LEFT (ic), NULL, ic);
@@ -5648,7 +6056,7 @@
 /* genDiv - generates code for division                            */
 /*-----------------------------------------------------------------*/
 static void
-genDiv (const iCode *ic)
+genDiv (const iCode * ic)
 {
   /* Shouldn't occur - all done through function calls */
   wassertl (0, "Division is handled through support function calls");
@@ -5658,7 +6066,7 @@
 /* genMod - generates code for division                            */
 /*-----------------------------------------------------------------*/
 static void
-genMod (const iCode *ic)
+genMod (const iCode * ic)
 {
   /* Shouldn't occur - all done through function calls */
   wassert (0);
@@ -5668,7 +6076,7 @@
 /* genIfxJump :- will create a jump depending on the ifx           */
 /*-----------------------------------------------------------------*/
 static void
-genIfxJump (iCode *ic, char *jval)
+genIfxJump (iCode * ic, char *jval)
 {
   symbol *jlbl;
   const char *inst;
@@ -5683,6 +6091,14 @@
           emit3 (A_OR, ASMOP_A, ASMOP_A);
           inst = "NZ";
         }
+      else if (!strcmp (jval, "z"))
+        {
+          inst = "Z";
+        }
+      else if (!strcmp (jval, "nz"))
+        {
+          inst = "NZ";
+        }
       else if (!strcmp (jval, "c"))
         {
           inst = "C";
@@ -5724,6 +6140,14 @@
           emit3 (A_OR, ASMOP_A, ASMOP_A);
           inst = "Z";
         }
+      else if (!strcmp (jval, "z"))
+        {
+          inst = "NZ";
+        }
+      else if (!strcmp (jval, "nz"))
+        {
+          inst = "Z";
+        }
       else if (!strcmp (jval, "c"))
         {
           inst = "NC";
@@ -5757,12 +6181,12 @@
         }
     }
   /* Z80 can do a conditional long jump */
-  if(!regalloc_dry_run)
-    emit2 ("jp %s,!tlabel", inst, jlbl->key + 100);
+  if (!regalloc_dry_run)
+    emit2 ("jp %s,!tlabel", inst, labelKey2num (jlbl->key));
   regalloc_dry_run_cost += 3;
 
   /* mark the icode as generated */
-  if(!regalloc_dry_run)
+  if (!regalloc_dry_run)
     ic->generated = 1;
 }
 
@@ -5777,16 +6201,14 @@
 /** Generic compare for > or <
  */
 static void
-genCmp (operand * left, operand * right,
-        operand * result, iCode * ifx, int sign)
+genCmp (operand * left, operand * right, operand * result, iCode * ifx, int sign, const iCode * ic)
 {
   int size, offset = 0;
   unsigned long lit = 0L;
   bool result_in_carry = FALSE;
 
   /* if left & right are bit variables */
-  if (AOP_TYPE (left) == AOP_CRY &&
-      AOP_TYPE (right) == AOP_CRY)
+  if (AOP_TYPE (left) == AOP_CRY && AOP_TYPE (right) == AOP_CRY)
     {
       /* Can't happen on the Z80 */
       wassertl (0, "Tried to compare two bits");
@@ -5796,110 +6218,167 @@
       /* Do a long subtract of right from left. */
       size = max (AOP_SIZE (left), AOP_SIZE (right));
 
+      if (AOP_TYPE (right) == AOP_SFR)  /* Avoid overwriting A */
+        {
+          bool save_a, save_b, save_bc;
+          wassertl (size == 1, "Right side sfr in comparison with more than 8 bits.");
+
+          save_b = bitVectBitValue (ic->rSurv, B_IDX);
+          save_bc = (save_b && bitVectBitValue (ic->rSurv, C_IDX));
+          save_a = ((AOP_TYPE (left) == AOP_ACC) ||
+                    AOP_TYPE (left) == AOP_REG && AOP (left)->aopu.aop_reg[0]->rIdx == B_IDX && save_b ||
+                    AOP_TYPE (left) == AOP_REG && AOP (left)->aopu.aop_reg[0]->rIdx == C_IDX && !save_b && save_bc);
+
+          if (save_bc)
+            _push (PAIR_BC);
+          if (save_a)
+            {
+              cheapMove (ASMOP_A, 0, AOP (right), 0);
+              _push (PAIR_AF);
+            }
+          else
+            cheapMove (ASMOP_A, 0, AOP (right), 0);
+          cheapMove (save_b ? ASMOP_C : ASMOP_B, 0, ASMOP_A, 0);
+          if (save_a)
+            _pop (PAIR_AF);
+          else
+            cheapMove (ASMOP_A, 0, AOP (left), 0);
+          emit3_o (A_SUB, ASMOP_A, 0, save_b ? ASMOP_C : ASMOP_B, offset);
+          if (save_bc)
+            _pop (PAIR_BC);
+          result_in_carry = TRUE;
+          goto fix;
+        }
+
       // On the Gameboy we can't afford to adjust HL as it may trash the carry.
-      if (size > 1 && IS_GB && (requiresHL(AOP(right)) && requiresHL(AOP(left))))
+      if (size > 1 && IS_GB && (requiresHL (AOP (right)) && requiresHL (AOP (left))))
         {
           // Pull left into DE and right into HL
-          aopGet (AOP(left), LSB, FALSE);
-          emit2 ("ld d, h");
-          emit2 ("ld e, l");
-          aopGet (AOP(right), LSB, FALSE);
+          if (!regalloc_dry_run)
+            {
+              aopGet (AOP (left), LSB, FALSE);
+              emit2 ("ld d, h");
+              emit2 ("ld e, l");
+              aopGet (AOP (right), LSB, FALSE);
+            }
 
           while (size--)
             {
               emit2 ("ld a, (de)");
               emit2 ("%s a, (hl)", offset == 0 ? "sub" : "sbc");
+              regalloc_dry_run_cost += 2;
 
               if (size != 0)
                 {
                   emit2 ("inc hl");
                   emit2 ("inc de");
+                  regalloc_dry_run_cost += 2;
                 }
               offset++;
             }
-          if(sign)
+          if (sign)
             {
-              emit2("ld a, (de)");
-              emit2("ld d, a");
-              emit2("ld e, (hl)");
+              emit2 ("ld a, (de)");
+              emit2 ("ld d, a");
+              emit2 ("ld e, (hl)");
+              regalloc_dry_run_cost += 3;
             }
           spillPair (PAIR_HL);
           result_in_carry = TRUE;
           goto fix;
         }
-      else if (size > 1 && IS_GB && (requiresHL(AOP(right)) && !requiresHL(AOP(left))))
+      else if (size > 1 && IS_GB && (requiresHL (AOP (right)) && !requiresHL (AOP (left))))
         {
-          aopGet (AOP(right), LSB, FALSE);
+          if (!regalloc_dry_run)
+            aopGet (AOP (right), LSB, FALSE);
 
           while (size--)
             {
-              emit2 ("ld a, %s", aopGet (AOP (left), offset, FALSE));
+              cheapMove (ASMOP_A, 0, AOP (left), offset);
               emit2 ("%s a, (hl)", offset == 0 ? "sub" : "sbc");
+              regalloc_dry_run_cost += 1;
 
               if (size != 0)
                 {
                   emit2 ("inc hl");
+                  regalloc_dry_run_cost += 1;
                 }
               offset++;
             }
-          if(sign)
+          if (sign)
             {
-              emit2("ld a, %s", aopGet (AOP (left), offset, FALSE));
-              emit2("ld d, a");
-              emit2("ld e, (hl)");
+              cheapMove (ASMOP_A, 0, AOP (left), offset - 1);
+              emit2 ("ld d, a");
+              emit2 ("ld e, (hl)");
+              regalloc_dry_run_cost += 2;
             }
           spillPair (PAIR_HL);
           result_in_carry = TRUE;
           goto fix;
         }
-      else if (size > 1 && IS_GB && (!requiresHL(AOP(right)) && requiresHL(AOP(left))))
+      else if (size > 1 && IS_GB && (!requiresHL (AOP (right)) && requiresHL (AOP (left))))
         {
-          aopGet (AOP(left), LSB, FALSE);
+          if (!regalloc_dry_run)
+            aopGet (AOP (left), LSB, FALSE);
 
           while (size--)
             {
               emit2 ("ld a, (hl)");
-              emit2 ("%s a, %s", offset == 0 ? "sub" : "sbc", aopGet (AOP (right), offset, FALSE));
+              regalloc_dry_run_cost += 1;
+              emit3_o (offset == 0 ? A_SUB : A_SBC, ASMOP_A, 0, AOP (right), offset);
 
               if (size != 0)
                 {
                   emit2 ("inc hl");
+                  regalloc_dry_run_cost += 1;
                 }
               offset++;
             }
-          if(sign)
-            {  
-              emit2("ld d, (hl)");
-              emit2("ld a, %s", aopGet (AOP (right), offset, FALSE));
-              emit2("ld e, a");
+          if (sign)
+            {
+              emit2 ("ld d, (hl)");
+              regalloc_dry_run_cost += 1;
+              cheapMove (ASMOP_A, 0, AOP (right), offset - 1);
+              emit2 ("ld e, a");
+              regalloc_dry_run_cost += 1;
             }
           spillPair (PAIR_HL);
           result_in_carry = TRUE;
           goto fix;
         }
 
-      if(IS_GB && sign)
+      if (IS_GB && sign)
         {
-          emit2 ("ld a, %s", aopGet (AOP (right), size - 1, FALSE));
-          emit2 ("ld e, a");
-          emit2 ("ld a, %s", aopGet (AOP (left), size - 1, FALSE));
-          emit2 ("ld d, a");
+          cheapMove (ASMOP_A, 0, AOP (right), size - 1);
+          cheapMove (ASMOP_E, 0, ASMOP_A, 0);
+          cheapMove (ASMOP_A, 0, AOP (left), size - 1);
+          cheapMove (ASMOP_D, 0, ASMOP_A, 0);
         }
 
       if (AOP_TYPE (right) == AOP_LIT)
         {
           lit = ulFromVal (AOP (right)->aopu.aop_lit);
+
           /* optimize if(x < 0) or if(x >= 0) */
           if (lit == 0)
             {
               if (!sign)
                 {
                   /* No sign so it's always false */
-                  _clearCarry();
+                  _clearCarry ();
                   result_in_carry = TRUE;
                 }
               else
                 {
+                  if (!(AOP_TYPE (result) == AOP_CRY && AOP_SIZE (result)) && ifx &&
+                    (AOP_TYPE (left) == AOP_REG || AOP_TYPE (left) == AOP_STK && !IS_GB))
+                    {
+                      if (!regalloc_dry_run)
+                        emit2 ("bit 7, %s", aopGet (AOP (left), AOP_SIZE (left) - 1, FALSE));
+                      regalloc_dry_run_cost += ((AOP_TYPE (left) == AOP_REG) ? 2 : 4);
+                      genIfxJump (ifx, "nz");
+                      return;
+                    }
                   /* Just load in the top most bit */
                   cheapMove (ASMOP_A, 0, AOP (left), AOP_SIZE (left) - 1);
                   if (!(AOP_TYPE (result) == AOP_CRY && AOP_SIZE (result)) && ifx)
@@ -5919,12 +6398,69 @@
                 }
               goto release;
             }
-          else
-            while (!((lit >> (offset * 8)) & 0xff))
-              {
-                size--;
-                offset++;
-              }
+
+          while (!((lit >> (offset * 8)) & 0xff))
+            {
+              size--;
+              offset++;
+            }
+
+          if (sign)             /* Map signed operands to unsigned ones. This pre-subtraction workaroud to lack of signed comparison is cheaper than the post-subtraction one at fix. */
+            {
+              if (size == 2 && !(IS_GB || !ifx && requiresHL(AOP(result)) && AOP_TYPE (result) != AOP_REG) && isPairDead (PAIR_HL, ic) && (isPairDead (PAIR_DE, ic) || isPairDead (PAIR_BC, ic)) && (getPairId (AOP (left)) == PAIR_HL || IS_RAB && (AOP_TYPE (left) == AOP_STK || AOP_TYPE (left) == AOP_EXSTK)))
+                {
+                  PAIR_ID litpair = (isPairDead (PAIR_DE, ic) ? PAIR_DE : PAIR_BC);
+                  fetchPair (PAIR_HL, AOP (left));
+                  emit2 ("ld %s, !immedbyte", _pairs[litpair].name, (lit ^ 0x8000u) & 0xffffu);
+                  regalloc_dry_run_cost += 3;
+                  emit2 ("add hl, hl");
+                  emit2 ("ccf");
+                  regalloc_dry_run_cost += 2;
+                  if (IS_RAB)
+                    {
+                      emit2 ("rr hl");
+                      regalloc_dry_run_cost += 1;
+                    }
+                  else
+                    {
+                      emit2 ("rr h");
+                      emit2 ("rr l");
+                      regalloc_dry_run_cost += 2;
+                    }
+                  emit2 ("sbc hl, %s", _pairs[litpair].name);
+                  regalloc_dry_run_cost += 2;
+                  result_in_carry = TRUE;
+                  goto release;
+                }
+
+              cheapMove (ASMOP_A, 0, AOP (left), offset);
+              if (size == 1)
+                {
+                  emit2 ("xor a, !immedbyte", 0x80);
+                  regalloc_dry_run_cost += 2;
+                }
+              emit2 ("sub a, !immedbyte", ((lit >> (offset * 8)) & 0xff) ^ (size == 1 ? 0x80 : 0x00));
+              regalloc_dry_run_cost += 2;
+              size--;
+              offset++;
+
+              while (size--)
+                {
+                  cheapMove (ASMOP_A, 0, AOP (left), offset);
+                  if (!size)
+                    {
+                      emit2 ("rla");
+                      emit2 ("ccf");
+                      emit2 ("rra");
+                      regalloc_dry_run_cost += 3;
+                    }
+                  /* Subtract through, propagating the carry */
+                  emit2 ("sbc a, !immedbyte", ((lit >> (offset++ * 8)) & 0xff) ^ (size ? 0x00 : 0x80));
+                  regalloc_dry_run_cost += 2;
+                }
+              result_in_carry = TRUE;
+              goto release;
+            }
         }
 
       cheapMove (ASMOP_A, 0, AOP (left), offset);
@@ -5943,39 +6479,41 @@
       /* There is no good signed compare in the Z80, so we need workarounds */
       if (sign)
         {
-          if (!IS_GB) /* Directly check for overflow, can't be done on GBZ80 */
+          if (!IS_GB)           /* Directly check for overflow, can't be done on GBZ80 */
             {
-              symbol *tlbl;
               if (!regalloc_dry_run)
                 {
-                  tlbl = newiTempLabel (NULL);
-                  emit2 ("jp PO, !tlabel", tlbl->key + 100);
+                  symbol *tlbl = newiTempLabel (NULL);
+                  emit2 ("jp PO, !tlabel", labelKey2num (tlbl->key));
                   emit2 ("xor a, !immedbyte", 0x80);
+                  emitLabelSpill (tlbl);
                 }
               regalloc_dry_run_cost += 5;
-              if (!regalloc_dry_run)
-                emitLabel (tlbl->key + 100);
               result_in_carry = FALSE;
             }
-          else /* Do it the hard way */
+          else                  /* Do it the hard way */
             {
               /* Test if one operand is negative, while the other is not. If this is the
                  case we can easily decide which one is greater, and we set/reset the carry
                  flag. If not, then the unsigned compare gave the correct result and we
                  don't change the carry flag. */
-              symbol *tlbl1 = newiTempLabel (NULL);
-              symbol *tlbl2 = newiTempLabel (NULL);
-              emit2 ("bit 7, e");
-              emit2 ("jp Z, !tlabel", tlbl1->key + 100);
-              emit2 ("bit 7, d");
-              emit2 ("jp NZ, !tlabel", tlbl2->key + 100);
-              emit2 ("cp a, a");
-              emit2 ("jp !tlabel", tlbl2->key + 100);
-              emitLabel (tlbl1->key + 100);
-              emit2 ("bit 7, d");
-              emit2 ("jp Z, !tlabel", tlbl2->key + 100);
-              emit2 ("scf");
-              emitLabel (tlbl2->key + 100);
+              if (!regalloc_dry_run)
+                {
+                  symbol *tlbl1 = newiTempLabel (NULL);
+                  symbol *tlbl2 = newiTempLabel (NULL);
+                  emit2 ("bit 7, e");
+                  emit2 ("jp Z, !tlabel", labelKey2num (tlbl1->key));
+                  emit2 ("bit 7, d");
+                  emit2 ("jp NZ, !tlabel", labelKey2num (tlbl2->key));
+                  emit2 ("cp a, a");
+                  emit2 ("jp !tlabel", labelKey2num (tlbl2->key));
+                  emitLabelSpill (tlbl1);
+                  emit2 ("bit 7, d");
+                  emit2 ("jp Z, !tlabel", labelKey2num (tlbl2->key));
+                  emit2 ("scf");
+                  emitLabelSpill (tlbl2);
+                }
+              regalloc_dry_run_cost += 20;
               result_in_carry = TRUE;
             }
         }
@@ -6003,11 +6541,11 @@
         {
           if (!result_in_carry)
             {
-              if(!IS_GB)
+              if (!IS_GB)
                 genIfxJump (ifx, "m");
               else
                 {
-                  emit2("rlca");
+                  emit2 ("rlca");
                   regalloc_dry_run_cost += 1;
                   genIfxJump (ifx, "c");
                 }
@@ -6033,7 +6571,7 @@
 /* genCmpGt :- greater than comparison                             */
 /*-----------------------------------------------------------------*/
 static void
-genCmpGt (iCode *ic, iCode *ifx)
+genCmpGt (iCode * ic, iCode * ifx)
 {
   operand *left, *right, *result;
   sym_link *letype, *retype;
@@ -6043,9 +6581,14 @@
   right = IC_RIGHT (ic);
   result = IC_RESULT (ic);
 
-  letype = getSpec (operandType (left));
-  retype = getSpec (operandType (right));
-  sign = !(SPEC_USIGN (letype) | SPEC_USIGN (retype));
+  sign = 0;
+  if (IS_SPEC (operandType (left)) && IS_SPEC (operandType (right)))
+    {
+      letype = getSpec (operandType (left));
+      retype = getSpec (operandType (right));
+      sign = !(SPEC_USIGN (letype) | SPEC_USIGN (retype));
+    }
+
   /* assign the asmops */
   aopOp (left, ic, FALSE, FALSE);
   aopOp (right, ic, FALSE, FALSE);
@@ -6053,7 +6596,7 @@
 
   setupToPreserveCarry (ic);
 
-  genCmp (right, left, result, ifx, sign);
+  genCmp (right, left, result, ifx, sign, ic);
 
   _G.preserveCarry = FALSE;
   freeAsmop (left, NULL, ic);
@@ -6065,7 +6608,7 @@
 /* genCmpLt - less than comparisons                                */
 /*-----------------------------------------------------------------*/
 static void
-genCmpLt (iCode *ic, iCode *ifx)
+genCmpLt (iCode * ic, iCode * ifx)
 {
   operand *left, *right, *result;
   sym_link *letype, *retype;
@@ -6075,9 +6618,13 @@
   right = IC_RIGHT (ic);
   result = IC_RESULT (ic);
 
-  letype = getSpec (operandType (left));
-  retype = getSpec (operandType (right));
-  sign = !(SPEC_USIGN (letype) | SPEC_USIGN (retype));
+  sign = 0;
+  if (IS_SPEC (operandType (left)) && IS_SPEC (operandType (right)))
+    {
+      letype = getSpec (operandType (left));
+      retype = getSpec (operandType (right));
+      sign = !(SPEC_USIGN (letype) | SPEC_USIGN (retype));
+    }
 
   /* assign the asmops */
   aopOp (left, ic, FALSE, FALSE);
@@ -6086,7 +6633,7 @@
 
   setupToPreserveCarry (ic);
 
-  genCmp (left, right, result, ifx, sign);
+  genCmp (left, right, result, ifx, sign, ic);
 
   _G.preserveCarry = FALSE;
   freeAsmop (left, NULL, ic);
@@ -6127,8 +6674,8 @@
             }
           else
             emit3 (A_OR, ASMOP_A, ASMOP_A);
-          if(!regalloc_dry_run)
-            emit2 ("jp NZ,!tlabel", lbl->key + 100);
+          if (!regalloc_dry_run)
+            emit2 ("jp NZ,!tlabel", labelKey2num (lbl->key));
           regalloc_dry_run_cost += 3;
         }
       else
@@ -6136,12 +6683,12 @@
           while (size--)
             {
               cheapMove (ASMOP_A, 0, AOP (left), offset);
-              if ((unsigned int) ((lit >> (offset * 8)) & 0x0FFL) == 0)
+              if (byteOfVal (AOP (right)->aopu.aop_lit, offset) == 0)
                 emit3 (A_OR, ASMOP_A, ASMOP_A);
               else
                 emit3_o (A_SUB, ASMOP_A, 0, AOP (right), offset);
               if (!regalloc_dry_run)
-                emit2 ("jp NZ,!tlabel", lbl->key + 100);
+                emit2 ("jp NZ,!tlabel", labelKey2num (lbl->key));
               regalloc_dry_run_cost += 3;
               offset++;
             }
@@ -6150,29 +6697,28 @@
   /* if the right side is in a register or
      pointed to by HL, IX or IY */
   else if (AOP_TYPE (right) == AOP_REG ||
-           AOP_TYPE (right) == AOP_HL  ||
-           AOP_TYPE (right) == AOP_IY  ||
+           AOP_TYPE (right) == AOP_HL ||
+           AOP_TYPE (right) == AOP_IY ||
            AOP_TYPE (right) == AOP_STK ||
-           AOP_IS_PAIRPTR (right, PAIR_HL) ||
-           AOP_IS_PAIRPTR (right, PAIR_IX) ||
-           AOP_IS_PAIRPTR (right, PAIR_IY))
+           AOP_TYPE (right) == AOP_EXSTK ||
+           AOP_TYPE (right) == AOP_IMMD ||
+           AOP_IS_PAIRPTR (right, PAIR_HL) || AOP_IS_PAIRPTR (right, PAIR_IX) || AOP_IS_PAIRPTR (right, PAIR_IY))
     {
       while (size--)
         {
           cheapMove (ASMOP_A, 0, AOP (left), offset);
-          if (AOP_TYPE (right) == AOP_LIT &&
-              ((unsigned int) ((lit >> (offset * 8)) & 0x0FFL) == 0))
+          if (AOP_TYPE (right) == AOP_LIT && byteOfVal (AOP (right)->aopu.aop_lit, offset) == 0)
             {
               emit3 (A_OR, ASMOP_A, ASMOP_A);
               if (!regalloc_dry_run)
-                emit2 ("jp NZ,!tlabel", lbl->key + 100);
+                emit2 ("jp NZ,!tlabel", labelKey2num (lbl->key));
               regalloc_dry_run_cost += 3;
             }
           else
             {
               emit3_o (A_SUB, ASMOP_A, 0, AOP (right), offset);
               if (!regalloc_dry_run)
-                emit2 ("jp NZ,!tlabel", lbl->key + 100);
+                emit2 ("jp NZ,!tlabel", labelKey2num (lbl->key));
               regalloc_dry_run_cost += 3;
             }
           offset++;
@@ -6184,7 +6730,7 @@
       PAIR_ID pair;
       for (pair = PAIR_BC; pair <= PAIR_HL; pair++)
         {
-          if (((AOP_TYPE (left)  != AOP_PAIRPTR) || (AOP (left)->aopu.aop_pairId  != pair)) &&
+          if (((AOP_TYPE (left) != AOP_PAIRPTR) || (AOP (left)->aopu.aop_pairId != pair)) &&
               ((AOP_TYPE (right) != AOP_PAIRPTR) || (AOP (right)->aopu.aop_pairId != pair)))
             {
               break;
@@ -6193,16 +6739,15 @@
       _push (pair);
       while (size--)
         {
-          emit2 ("; direct compare");
-          if(!regalloc_dry_run)
+          if (!regalloc_dry_run)
             _emitMove (_pairs[pair].l, aopGet (AOP (left), offset, FALSE));
           else
-            regalloc_dry_run_cost += ld_cost(ASMOP_E, AOP (left));
+            regalloc_dry_run_cost += ld_cost (ASMOP_E, AOP (left));
           cheapMove (ASMOP_A, 0, AOP (right), offset);
           emit2 ("sub a,%s", _pairs[pair].l);
           regalloc_dry_run_cost += 1;
-          if(!regalloc_dry_run)
-            emit2 ("jp NZ,!tlabel", lbl->key + 100);
+          if (!regalloc_dry_run)
+            emit2 ("jp NZ,!tlabel", labelKey2num (lbl->key));
           regalloc_dry_run_cost += 3;
           offset++;
         }
@@ -6226,10 +6771,10 @@
   if (!regalloc_dry_run)
     {
       emit2 ("ld a,!one");
-      emit2 ("jp !tlabel", tlbl->key + 100);
-      emitLabel (lbl->key + 100);
+      emit2 ("jp !tlabel", labelKey2num (tlbl->key));
+      emitLabelSpill (lbl);
       emit2 ("xor a,a");
-      emitLabelNoSpill (tlbl->key + 100);
+      emitLabel (tlbl);
     }
   regalloc_dry_run_cost += 6;
   _pop (pop);
@@ -6248,14 +6793,17 @@
   aopOp ((right = IC_RIGHT (ic)), ic, FALSE, FALSE);
   aopOp ((result = IC_RESULT (ic)), ic, TRUE, FALSE);
 
-  hl_touched = (AOP_TYPE (IC_LEFT (ic)) == AOP_HL || AOP_TYPE (IC_RIGHT (ic)) == AOP_HL);
+  hl_touched = (AOP_TYPE (IC_LEFT (ic)) == AOP_HL || AOP_TYPE (IC_RIGHT (ic)) == AOP_HL || IS_GB
+                && AOP_TYPE (IC_LEFT (ic)) == AOP_STK || IS_GB && AOP_TYPE (IC_RIGHT (ic)) == AOP_STK);
 
-  emitDebug ("; genCmpEq: left %u, right %u, result %u", AOP_SIZE(IC_LEFT(ic)), AOP_SIZE(IC_RIGHT(ic)), AOP_SIZE(IC_RESULT(ic)));
+  emitDebug ("; genCmpEq: left %u, right %u, result %u", AOP_SIZE (IC_LEFT (ic)), AOP_SIZE (IC_RIGHT (ic)),
+             AOP_SIZE (IC_RESULT (ic)));
 
   /* Swap operands if it makes the operation easier. ie if:
      1.  Left is a literal.
    */
-  if (AOP_TYPE (IC_LEFT (ic)) == AOP_LIT)
+  if (AOP_TYPE (IC_LEFT (ic)) == AOP_LIT || AOP_TYPE (IC_RIGHT (ic)) != AOP_LIT && AOP_TYPE (IC_RIGHT (ic)) != AOP_REG
+      && AOP_TYPE (IC_LEFT (ic)) == AOP_REG)
     {
       operand *t = IC_RIGHT (ic);
       IC_RIGHT (ic) = IC_LEFT (ic);
@@ -6265,8 +6813,7 @@
   if (ifx && !AOP_SIZE (result))
     {
       /* if they are both bit variables */
-      if (AOP_TYPE (left) == AOP_CRY &&
-          ((AOP_TYPE (right) == AOP_CRY) || (AOP_TYPE (right) == AOP_LIT)))
+      if (AOP_TYPE (left) == AOP_CRY && ((AOP_TYPE (right) == AOP_CRY) || (AOP_TYPE (right) == AOP_LIT)))
         {
           wassertl (0, "Tried to compare two bits");
         }
@@ -6277,41 +6824,41 @@
           pop = gencjneshort (left, right, tlbl);
           if (IC_TRUE (ifx))
             {
-              if(pop != PAIR_INVALID)
+              if (pop != PAIR_INVALID)
                 {
                   emit2 ("pop %s", _pairs[pop].name);
                   regalloc_dry_run_cost += 1;
                 }
-              if(!regalloc_dry_run)
-                emit2 ("jp !tlabel", IC_TRUE (ifx)->key + 100);
+              if (!regalloc_dry_run)
+                emit2 ("jp !tlabel", labelKey2num (IC_TRUE (ifx)->key));
               regalloc_dry_run_cost += 3;
-              if(!regalloc_dry_run)
-                hl_touched ? emitLabel (tlbl->key + 100) : emitLabelNoSpill (tlbl->key + 100);
-              else if(hl_touched)
-                spillCached();
+              if (!regalloc_dry_run)
+                hl_touched ? emitLabelSpill (tlbl) : emitLabel (tlbl);
+              else if (hl_touched)
+                spillCached ();
               _pop (pop);
             }
           else
             {
               /* PENDING: do this better */
               symbol *lbl = regalloc_dry_run ? 0 : newiTempLabel (0);
-              if(pop != PAIR_INVALID)
+              if (pop != PAIR_INVALID)
                 {
                   emit2 ("pop %s", _pairs[pop].name);
                   regalloc_dry_run_cost += 1;
                 }
-              if(!regalloc_dry_run)
-                emit2 ("jp !tlabel", lbl->key + 100);
+              if (!regalloc_dry_run)
+                emit2 ("jp !tlabel", labelKey2num (lbl->key));
               regalloc_dry_run_cost += 3;
               if (!regalloc_dry_run)
-                hl_touched ? emitLabel (tlbl->key + 100) : emitLabelNoSpill (tlbl->key + 100);
+                hl_touched ? emitLabelSpill (tlbl) : emitLabel (tlbl);
               else if (hl_touched)
-                spillCached();
+                spillCached ();
               _pop (pop);
-              if(!regalloc_dry_run)
+              if (!regalloc_dry_run)
                 {
-                  emit2 ("jp !tlabel", IC_FALSE (ifx)->key + 100);
-                  emitLabelNoSpill (lbl->key + 100);
+                  emit2 ("jp !tlabel", labelKey2num (IC_FALSE (ifx)->key));
+                  emitLabel (lbl);
                 }
               regalloc_dry_run_cost += 3;
             }
@@ -6322,8 +6869,7 @@
     }
 
   /* if they are both bit variables */
-  if (AOP_TYPE (left) == AOP_CRY &&
-      ((AOP_TYPE (right) == AOP_CRY) || (AOP_TYPE (right) == AOP_LIT)))
+  if (AOP_TYPE (left) == AOP_CRY && ((AOP_TYPE (right) == AOP_CRY) || (AOP_TYPE (right) == AOP_LIT)))
     {
       wassertl (0, "Tried to compare a bit to either a literal or another bit");
     }
@@ -6342,7 +6888,7 @@
       /* if the result is used in an arithmetic operation
          then put the result in place */
       if (AOP_TYPE (result) != AOP_CRY)
-          outAcc (result);
+        outAcc (result);
       /* leave the result in acc */
     }
 
@@ -6353,32 +6899,10 @@
 }
 
 /*-----------------------------------------------------------------*/
-/* ifxForOp - returns the icode containing the ifx for operand     */
-/*-----------------------------------------------------------------*/
-iCode *
-ifxForOp (operand *op, const iCode *ic)
-{
-  /* if true symbol then needs to be assigned */
-  if (IS_TRUE_SYMOP (op))
-    return NULL;
-
-  /* if this has register type condition and
-     the next instruction is ifx with the same operand
-     and live to of the operand is upto the ifx only then */
-  if (ic->next &&
-      ic->next->op == IFX &&
-      IC_COND (ic->next)->key == op->key &&
-      OP_SYMBOL (op)->liveTo <= ic->next->seq)
-    return ic->next;
-
-  return NULL;
-}
-
-/*-----------------------------------------------------------------*/
 /* genAndOp - for && operation                                     */
 /*-----------------------------------------------------------------*/
 static void
-genAndOp (const iCode *ic)
+genAndOp (const iCode * ic)
 {
   operand *left, *right, *result;
 
@@ -6390,8 +6914,7 @@
   aopOp ((result = IC_RESULT (ic)), ic, FALSE, FALSE);
 
   /* if both are bit variables */
-  if (AOP_TYPE (left) == AOP_CRY &&
-      AOP_TYPE (right) == AOP_CRY)
+  if (AOP_TYPE (left) == AOP_CRY && AOP_TYPE (right) == AOP_CRY)
     {
       wassertl (0, "Tried to and two bits");
     }
@@ -6400,11 +6923,11 @@
       symbol *tlbl = regalloc_dry_run ? 0 : newiTempLabel (0);
       _toBoolean (left, TRUE);
       if (!regalloc_dry_run)
-        emit2 ("jp Z,!tlabel", tlbl->key + 100);
+        emit2 ("jp Z,!tlabel", labelKey2num (tlbl->key));
       regalloc_dry_run_cost += 3;
       _toBoolean (right, FALSE);
       if (!regalloc_dry_run)
-        emitLabelNoSpill (tlbl->key + 100);
+        emitLabel (tlbl);
       outBitAcc (result);
     }
 
@@ -6417,7 +6940,7 @@
 /* genOrOp - for || operation                                      */
 /*-----------------------------------------------------------------*/
 static void
-genOrOp (const iCode *ic)
+genOrOp (const iCode * ic)
 {
   operand *left, *right, *result;
 
@@ -6429,8 +6952,7 @@
   aopOp ((result = IC_RESULT (ic)), ic, FALSE, FALSE);
 
   /* if both are bit variables */
-  if (AOP_TYPE (left) == AOP_CRY &&
-      AOP_TYPE (right) == AOP_CRY)
+  if (AOP_TYPE (left) == AOP_CRY && AOP_TYPE (right) == AOP_CRY)
     {
       wassertl (0, "Tried to OR two bits");
     }
@@ -6439,11 +6961,11 @@
       symbol *tlbl = regalloc_dry_run ? 0 : newiTempLabel (0);
       _toBoolean (left, TRUE);
       if (!regalloc_dry_run)
-        emit2 ("jp NZ,!tlabel", tlbl->key + 100);
+        emit2 ("jp NZ,!tlabel", labelKey2num (tlbl->key));
       regalloc_dry_run_cost += 3;
       _toBoolean (right, FALSE);
       if (!regalloc_dry_run)
-        emitLabelNoSpill (tlbl->key + 100);
+        emitLabel (tlbl);
       outBitAcc (result);
     }
 
@@ -6459,13 +6981,15 @@
 isLiteralBit (unsigned long lit)
 {
   unsigned long pw[32] =
-  {1L, 2L, 4L, 8L, 16L, 32L, 64L, 128L,
-   0x100L, 0x200L, 0x400L, 0x800L,
-   0x1000L, 0x2000L, 0x4000L, 0x8000L,
-   0x10000L, 0x20000L, 0x40000L, 0x80000L,
-   0x100000L, 0x200000L, 0x400000L, 0x800000L,
-   0x1000000L, 0x2000000L, 0x4000000L, 0x8000000L,
-   0x10000000L, 0x20000000L, 0x40000000L, 0x80000000L};
+  {
+    1L, 2L, 4L, 8L, 16L, 32L, 64L, 128L,
+    0x100L, 0x200L, 0x400L, 0x800L,
+    0x1000L, 0x2000L, 0x4000L, 0x8000L,
+    0x10000L, 0x20000L, 0x40000L, 0x80000L,
+    0x100000L, 0x200000L, 0x400000L, 0x800000L,
+    0x1000000L, 0x2000000L, 0x4000000L, 0x8000000L,
+    0x10000000L, 0x20000000L, 0x40000000L, 0x80000000L
+  };
   int idx;
 
   for (idx = 0; idx < 32; idx++)
@@ -6481,32 +7005,32 @@
 jmpTrueOrFalse (iCode * ic, symbol * tlbl)
 {
   // ugly but optimized by peephole
-  // Using emitLabel instead of emitLabelNoSpill (esp. on gbz80)
+  // Using emitLabelSpill instead of emitLabel (esp. on gbz80)
   // We could jump there from locations with different values in hl.
   // This should be changed to a more efficient solution that spills
   // only what and when necessary.
   if (IC_TRUE (ic))
-    { 
-      if(!regalloc_dry_run)
+    {
+      if (!regalloc_dry_run)
         {
           symbol *nlbl = newiTempLabel (NULL);
-          emit2 ("jp !tlabel", nlbl->key + 100);
-          emitLabel (tlbl->key + 100);
-          emit2 ("jp !tlabel", IC_TRUE (ic)->key + 100);
-          emitLabel (nlbl->key + 100);
+          emit2 ("jp !tlabel", labelKey2num (nlbl->key));
+          emitLabelSpill (tlbl);
+          emit2 ("jp !tlabel", labelKey2num (IC_TRUE (ic)->key));
+          emitLabelSpill (nlbl);
         }
       regalloc_dry_run_cost += 6;
     }
   else
     {
-      if(!regalloc_dry_run)
+      if (!regalloc_dry_run)
         {
-          emit2 ("jp !tlabel", IC_FALSE (ic)->key + 100);
-          emitLabel (tlbl->key + 100);
+          emit2 ("jp !tlabel", labelKey2num (IC_FALSE (ic)->key));
+          emitLabelSpill (tlbl);
         }
       regalloc_dry_run_cost += 3;
     }
-  if(!regalloc_dry_run)
+  if (!regalloc_dry_run)
     ic->generated = 1;
 }
 
@@ -6514,7 +7038,7 @@
 /* genAnd  - code for and                                          */
 /*-----------------------------------------------------------------*/
 static void
-genAnd (const iCode *ic, iCode * ifx)
+genAnd (const iCode * ic, iCode * ifx)
 {
   operand *left, *right, *result;
   int size, offset = 0;
@@ -6526,8 +7050,7 @@
   aopOp ((result = IC_RESULT (ic)), ic, TRUE, FALSE);
 
   /* if left is a literal & right is not then exchange them */
-  if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) ||
-      (AOP_NEEDSACC (right) && !AOP_NEEDSACC (left)))
+  if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) || (AOP_NEEDSACC (right) && !AOP_NEEDSACC (left)))
     {
       operand *tmp = right;
       right = left;
@@ -6543,8 +7066,7 @@
     }
 
   /* if right is bit then exchange them */
-  if (AOP_TYPE (right) == AOP_CRY &&
-      AOP_TYPE (left) != AOP_CRY)
+  if (AOP_TYPE (right) == AOP_CRY && AOP_TYPE (left) != AOP_CRY)
     {
       operand *tmp = right;
       right = left;
@@ -6563,7 +7085,7 @@
 
   /* Make sure A is on the left to not overwrite it. */
   if (AOP_TYPE (right) == AOP_ACC ||
-    isPair (AOP (right)) && (getPairId (AOP (right)) == PAIR_HL || getPairId (AOP (right)) == PAIR_IY))
+      isPair (AOP (right)) && (getPairId (AOP (right)) == PAIR_HL || getPairId (AOP (right)) == PAIR_IY))
     {
       operand *tmp = right;
       right = left;
@@ -6572,9 +7094,7 @@
 
   // if(val & 0xZZ)       - size = 0, ifx != FALSE  -
   // bit = val & 0xZZ     - size = 1, ifx = FALSE -
-  if ((AOP_TYPE (right) == AOP_LIT) &&
-      (AOP_TYPE (result) == AOP_CRY) &&
-      (AOP_TYPE (left) != AOP_CRY))
+  if ((AOP_TYPE (right) == AOP_LIT) && (AOP_TYPE (result) == AOP_CRY) && (AOP_TYPE (left) != AOP_CRY))
     {
       symbol *tlbl = regalloc_dry_run ? 0 : newiTempLabel (0);
       int sizel;
@@ -6586,35 +7106,47 @@
           emit2 ("scf");
           regalloc_dry_run_cost += 1;
         }
+      /*else if(AOP_TYPE (left) == AOP_IY && !IS_GB && isLiteralBit (lit & 0xff) >= 0)
+        {
+          emit2 ("bit %d, %s", isLiteralBit (bytelit), aopGet (AOP (left), offset, FALSE));
+        }*/
       while (sizel--)
         {
           if ((bytelit = ((lit >> (offset * 8)) & 0x0FFL)) != 0x0L)
             {
-              cheapMove (ASMOP_A, 0, AOP (left), offset);
-              if (bytelit != 0x0FFL)
-                emit3_o (A_AND, ASMOP_A, 0, AOP (right), offset);
+              if (isLiteralBit (bytelit) >= 0 && ifx
+                  && (AOP_TYPE (left) == AOP_STK || AOP_TYPE (left) == AOP_ACC || AOP_TYPE (left) == AOP_IY || AOP_TYPE (left) == AOP_REG
+                      && AOP (left)->aopu.aop_reg[0]->rIdx != IYL_IDX))
+                {
+                  if (!regalloc_dry_run)
+                    emit2 ("bit %d, %s", isLiteralBit (bytelit), aopGet (AOP (left), offset, FALSE));
+                  regalloc_dry_run_cost += AOP_TYPE (left) == AOP_STK ? 4 : 2;
+                }
               else
                 {
-                  /* For the flags */
-                  emit3 (A_OR, ASMOP_A, ASMOP_A);
+                  cheapMove (ASMOP_A, 0, AOP (left), offset);
+                  if (bytelit != 0x0FFL)
+                    emit3_o (A_AND, ASMOP_A, 0, AOP (right), offset);
+                  else
+                    emit3 (A_OR, ASMOP_A, ASMOP_A);     /* For the flags */
                 }
               if (size || ifx)  /* emit jmp only, if it is actually used */
                 {
                   if (!regalloc_dry_run)
-                    emit2 ("jp NZ,!tlabel", tlbl->key + 100);
+                    emit2 ("jp NZ,!tlabel", labelKey2num (tlbl->key));
                   regalloc_dry_run_cost += 3;
                 }
             }
-            offset++;
+          offset++;
         }
       // bit = left & literal
       if (size)
         {
           emit2 ("clr c");
           if (!regalloc_dry_run)
-            emit2 ("!tlabeldef", tlbl->key + 100);
+            emit2 ("!tlabeldef", labelKey2num (tlbl->key));
           regalloc_dry_run_cost += 3;
-          _G.lines.current->isLabel = 1;
+          genLine.lineCurr->isLabel = 1;
         }
       // if(left & literal)
       else
@@ -6629,14 +7161,15 @@
       goto release;
     }
 
-  if (IS_R2K && isPair (AOP (result)) && 
-     (getPairId (AOP (result)) == PAIR_HL && isPair (AOP (right)) && getPairId (AOP (right)) == PAIR_DE ||
-     getPairId (AOP (result)) == PAIR_HL && isPair (AOP (left)) && getPairId (AOP (left)) == PAIR_DE ||
-     isPair (AOP (left)) && getPairId (AOP (left)) == PAIR_IY && getPairId (AOP (result)) == PAIR_IY && isPair (AOP (right)) && getPairId (AOP (right)) == PAIR_DE))
+  if (IS_RAB && isPair (AOP (result)) &&
+      (getPairId (AOP (result)) == PAIR_HL && isPair (AOP (right)) && getPairId (AOP (right)) == PAIR_DE ||
+       getPairId (AOP (result)) == PAIR_HL && isPair (AOP (left)) && getPairId (AOP (left)) == PAIR_DE ||
+       isPair (AOP (left)) && getPairId (AOP (left)) == PAIR_IY && getPairId (AOP (result)) == PAIR_IY && isPair (AOP (right))
+       && getPairId (AOP (right)) == PAIR_DE))
     {
       if (isPair (AOP (left)) && getPairId (AOP (left)) == PAIR_DE)
         fetchPair (PAIR_HL, AOP (right));
-      else /* right operand in DE */
+      else                      /* right operand in DE */
         fetchPair (getPairId (AOP (result)), AOP (left));
       emit2 ("and hl, de");
       regalloc_dry_run_cost += (getPairId (AOP (result)) == PAIR_HL ? 1 : 2);
@@ -6726,7 +7259,7 @@
 /* genOr  - code for or                                            */
 /*-----------------------------------------------------------------*/
 static void
-genOr (const iCode *ic, iCode * ifx)
+genOr (const iCode * ic, iCode * ifx)
 {
   operand *left, *right, *result;
   int size, offset = 0;
@@ -6738,8 +7271,7 @@
   aopOp ((result = IC_RESULT (ic)), ic, TRUE, FALSE);
 
   /* if left is a literal & right is not then exchange them */
-  if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) ||
-      (AOP_NEEDSACC (right) && !AOP_NEEDSACC (left)))
+  if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) || (AOP_NEEDSACC (right) && !AOP_NEEDSACC (left)))
     {
       operand *tmp = right;
       right = left;
@@ -6755,8 +7287,7 @@
     }
 
   /* if right is bit then exchange them */
-  if (AOP_TYPE (right) == AOP_CRY &&
-      AOP_TYPE (left) != AOP_CRY)
+  if (AOP_TYPE (right) == AOP_CRY && AOP_TYPE (left) != AOP_CRY)
     {
       operand *tmp = right;
       right = left;
@@ -6783,9 +7314,7 @@
 
   // if(val | 0xZZ)       - size = 0, ifx != FALSE  -
   // bit = val | 0xZZ     - size = 1, ifx = FALSE -
-  if ((AOP_TYPE (right) == AOP_LIT) &&
-      (AOP_TYPE (result) == AOP_CRY) &&
-      (AOP_TYPE (left) != AOP_CRY))
+  if ((AOP_TYPE (right) == AOP_LIT) && (AOP_TYPE (result) == AOP_CRY) && (AOP_TYPE (left) != AOP_CRY))
     {
       symbol *tlbl = regalloc_dry_run ? 0 : newiTempLabel (0);
       int sizel;
@@ -6811,10 +7340,10 @@
               emit3 (A_OR, ASMOP_A, ASMOP_A);
             }
 
-          if (ifx)  /* emit jmp only, if it is actually used */
+          if (ifx)              /* emit jmp only, if it is actually used */
             {
-              if(!regalloc_dry_run)
-                emit2 ("jp NZ,!tlabel", tlbl->key + 100);
+              if (!regalloc_dry_run)
+                emit2 ("jp NZ,!tlabel", labelKey2num (tlbl->key));
               regalloc_dry_run_cost += 3;
             }
 
@@ -6840,10 +7369,10 @@
               else
                 {
                   cheapMove (ASMOP_A, 0, AOP (left), offset);
-                  if (isLiteralBit(bytelit) >= 0)
-                    emit2 ("set %d, a", isLiteralBit(bytelit));
+                  if (isLiteralBit (bytelit) >= 0)
+                    emit2 ("set %d, a", isLiteralBit (bytelit));
                   else
-                    emit3_o(A_OR, ASMOP_A, 0, AOP (right), offset);
+                    emit3_o (A_OR, ASMOP_A, 0, AOP (right), offset);
                   cheapMove (AOP (result), offset, ASMOP_A, 0);
                 }
             }
@@ -6876,10 +7405,10 @@
                   }
               }
             // This is a bit broken, there will be problems for y_0 = x_0 | z_0, x_0 = y_0 | z_1 as either order of the two byte ors will result in the result destroying the second part of the operand. Currently, we use a workaround in the register allocator to avoid this. See also the comment on the 2-byte addition workaround above.
-            if(AOP_TYPE (left) != AOP_ACC)
+            if (AOP_TYPE (left) != AOP_ACC)
               cheapMove (ASMOP_A, 0, AOP (left), offset);
-            if(AOP_TYPE (right) == AOP_LIT && isLiteralBit(((lit >> (offset * 8)) & 0x0FFL)) >= 0)
-              emit2 ("set %d, a", isLiteralBit(((lit >> (offset * 8)) & 0x0FFL)));
+            if (AOP_TYPE (right) == AOP_LIT && isLiteralBit (((lit >> (offset * 8)) & 0x0FFL)) >= 0)
+              emit2 ("set %d, a", isLiteralBit (((lit >> (offset * 8)) & 0x0FFL)));
             else
               emit3_o (A_OR, ASMOP_A, 0, AOP (right), offset);
             cheapMove (AOP (result), offset, ASMOP_A, 0);
@@ -6899,7 +7428,7 @@
 /* genXor - code for xclusive or                                   */
 /*-----------------------------------------------------------------*/
 static void
-genXor (const iCode *ic, iCode * ifx)
+genXor (const iCode * ic, iCode * ifx)
 {
   operand *left, *right, *result;
   int size, offset = 0;
@@ -6910,8 +7439,7 @@
   aopOp ((result = IC_RESULT (ic)), ic, TRUE, FALSE);
 
   /* if left is a literal & right is not then exchange them */
-  if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) ||
-      (AOP_NEEDSACC (right) && !AOP_NEEDSACC (left)))
+  if ((AOP_TYPE (left) == AOP_LIT && AOP_TYPE (right) != AOP_LIT) || (AOP_NEEDSACC (right) && !AOP_NEEDSACC (left)))
     {
       operand *tmp = right;
       right = left;
@@ -6927,8 +7455,7 @@
     }
 
   /* if right is bit then exchange them */
-  if (AOP_TYPE (right) == AOP_CRY &&
-      AOP_TYPE (left) != AOP_CRY)
+  if (AOP_TYPE (right) == AOP_CRY && AOP_TYPE (left) != AOP_CRY)
     {
       operand *tmp = right;
       right = left;
@@ -6952,12 +7479,10 @@
       right = left;
       left = tmp;
     }
- 
+
   // if(val & 0xZZ)       - size = 0, ifx != FALSE  -
   // bit = val & 0xZZ     - size = 1, ifx = FALSE -
-  if ((AOP_TYPE (right) == AOP_LIT) &&
-      (AOP_TYPE (result) == AOP_CRY) &&
-      (AOP_TYPE (left) != AOP_CRY))
+  if ((AOP_TYPE (right) == AOP_LIT) && (AOP_TYPE (result) == AOP_CRY) && (AOP_TYPE (left) != AOP_CRY))
     {
       symbol *tlbl = regalloc_dry_run ? 0 : newiTempLabel (0);
       int sizel;
@@ -6973,17 +7498,17 @@
         {
           cheapMove (ASMOP_A, 0, AOP (left), offset);
           emit3_o (A_XOR, ASMOP_A, 0, AOP (right), offset);
-          if (ifx)      /* emit jmp only, if it is actually used * */
-            if(!regalloc_dry_run)
-              emit2 ("jp NZ,!tlabel", tlbl->key + 100);
-            regalloc_dry_run_cost += 3;
+          if (ifx)              /* emit jmp only, if it is actually used * */
+            if (!regalloc_dry_run)
+              emit2 ("jp NZ,!tlabel", labelKey2num (tlbl->key));
+          regalloc_dry_run_cost += 3;
           offset++;
         }
       if (ifx)
         {
           jmpTrueOrFalse (ifx, tlbl);
         }
-      else if(size)
+      else if (size)
         {
           wassertl (0, "Result of XOR was destined for a bit");
         }
@@ -7059,74 +7584,10 @@
 }
 
 /*-----------------------------------------------------------------*/
-/* genInline - write the inline code out                           */
-/*-----------------------------------------------------------------*/
-static void
-genInline (const iCode *ic)
-{
-  char *buffer, *bp, *bp1;
-  bool inComment = FALSE;
-
-  _G.lines.isInline += (!options.asmpeep);
-
-  buffer = bp = bp1 = Safe_strdup (IC_INLINE (ic));
-
-  /* emit each line as a code */
-  while (*bp)
-    {
-      switch (*bp)
-        {
-        case ';':
-          inComment = TRUE;
-          ++bp;
-          break;
-
-        case '\x87':
-        case '\n':
-          inComment = FALSE;
-          *bp++ = '\0';
-          /* Don't emit whitespace */
-          while(isspace(*bp1))
-            bp1++;
-          if(*bp1)
-            emit2 (bp1);
-          bp1 = bp;
-          break;
-
-        default:
-          /* Add \n for labels, not dirs such as c:\mydir */
-          if (!inComment && (*bp == ':') && (isspace((unsigned char)bp[1])))
-            {
-              ++bp;
-              *bp = '\0';
-              ++bp;
-              emit2 (bp1);
-              bp1 = bp;
-            }
-          else
-            ++bp;
-          break;
-        }
-    }
-  if (bp1 != bp)
-    {
-      while(isspace(*bp1))
-        bp1++;
-      if(*bp1)
-        emit2 (bp1);
-    }
-
-  Safe_free (buffer);
-
-  _G.lines.isInline -= (!options.asmpeep);
-
-}
-
-/*-----------------------------------------------------------------*/
 /* genRRC - rotate right with carry                                */
 /*-----------------------------------------------------------------*/
 static void
-genRRC (const iCode *ic)
+genRRC (const iCode * ic)
 {
   wassert (0);
 }
@@ -7135,7 +7596,7 @@
 /* genRLC - generate code for rotate left with carry               */
 /*-----------------------------------------------------------------*/
 static void
-genRLC (const iCode *ic)
+genRLC (const iCode * ic)
 {
   wassert (0);
 }
@@ -7144,7 +7605,7 @@
 /* genGetHbit - generates code get highest order bit               */
 /*-----------------------------------------------------------------*/
 static void
-genGetHbit (const iCode *ic)
+genGetHbit (const iCode * ic)
 {
   operand *left, *result;
   left = IC_LEFT (ic);
@@ -7178,13 +7639,13 @@
 /* genGetAbit - generates code get a single bit                    */
 /*-----------------------------------------------------------------*/
 static void
-genGetAbit (const iCode *ic)
+genGetAbit (const iCode * ic)
 {
   wassert (0);
 }
 
 static void
-emitRsh2 (asmop *aop, int size, int is_signed)
+emitRsh2 (asmop * aop, int size, int is_signed)
 {
   int offset = 0;
 
@@ -7202,19 +7663,18 @@
 /* shiftR2Left2Result - shift right two bytes from left to result  */
 /*-----------------------------------------------------------------*/
 static void
-shiftR2Left2Result (const iCode *ic, operand * left, int offl,
-                    operand * result, int offr,
-                    int shCount, int is_signed)
+shiftR2Left2Result (const iCode *ic, operand *left, int offl, operand *result, int offr, int shCount, int is_signed)
 {
   int size = 2;
   symbol *tlbl;
-  
-  if (IS_R2K && !is_signed && shCount >= 2 && isPairDead (PAIR_HL, ic) &&
-    ((isPair (AOP (left)) && getPairId (AOP (left)) == PAIR_HL || isPair (AOP (result)) && getPairId (AOP (result)) == PAIR_HL) && isPairDead (PAIR_DE, ic) ||
-    isPair (AOP (left)) && getPairId (AOP (left)) == PAIR_DE))
+
+  if (IS_RAB && !is_signed && shCount >= 2 && isPairDead (PAIR_HL, ic) &&
+      ((isPair (AOP (left)) && getPairId (AOP (left)) == PAIR_HL || isPair (AOP (result))
+        && getPairId (AOP (result)) == PAIR_HL) && isPairDead (PAIR_DE, ic) || isPair (AOP (left))
+       && getPairId (AOP (left)) == PAIR_DE))
     {
       bool op_de = (getPairId (AOP (left)) == PAIR_DE);
-      if(op_de)
+      if (op_de)
         emit2 ("ld hl, !immedword", 0xffff >> shCount);
       else
         {
@@ -7222,9 +7682,9 @@
           emit2 ("ld de, !immedword", 0xffff >> shCount);
         }
       regalloc_dry_run_cost += 3;
-      while(shCount--)
+      while (shCount--)
         {
-          if(op_de)
+          if (op_de)
             emit2 ("rr de");
           else
             emit2 ("rr hl");
@@ -7232,20 +7692,23 @@
         }
       emit2 ("and hl, de");
       regalloc_dry_run_cost += 1;
-      commitPair (AOP (IC_RESULT (ic)), PAIR_HL);
+      commitPair (AOP (IC_RESULT (ic)), PAIR_HL, ic, TRUE);
       return;
     }
 
-  movLeft2Result (left, offl, result, offr, 0);
-  movLeft2Result (left, offl + 1, result, offr + 1, 0);
+  if (isPair (AOP (result)) && !offr)
+    fetchPairLong (getPairId (AOP (result)), AOP(left), ic, offl);
+  else
+    {
+      movLeft2Result (left, offl, result, offr, 0);
+      movLeft2Result (left, offl + 1, result, offr + 1, 0);
+    }
 
   if (shCount == 0)
     return;
 
   /*  if (AOP(result)->type == AOP_REG) { */
 
-  tlbl = regalloc_dry_run ? 0 : newiTempLabel (NULL);
-
   /* Left is already in result - so now do the shift */
   /* Optimizing for speed by default. */
   if (!optimize.codeSize || shCount <= 2)
@@ -7257,21 +7720,32 @@
     }
   else
     {
-      if(!regalloc_dry_run)
+      bool use_b = (!IS_GB && !bitVectBitValue (ic->rSurv, B_IDX)
+                    && !(AOP_TYPE (result) == AOP_REG
+                         && (AOP (result)->aopu.aop_reg[0]->rIdx == B_IDX || AOP (result)->aopu.aop_reg[1]->rIdx == B_IDX)));
+
+      tlbl = regalloc_dry_run ? 0 : newiTempLabel (NULL);
+
+      if (!regalloc_dry_run)
         {
-          emit2 ("ld a,!immedbyte", shCount);
-          emitLabelNoSpill (tlbl->key + 100);
+          emit2 ("ld %s,!immedbyte", use_b ? "b" : "a", shCount);
+          emitLabel (tlbl);
         }
       regalloc_dry_run_cost += 2;
 
       emitRsh2 (AOP (result), size, is_signed);
 
-      if(!regalloc_dry_run)
+      if (!regalloc_dry_run)
         {
-          emit2 ("dec a");
-          emit2 ("jp NZ,!tlabel", tlbl->key + 100);
+          if (use_b)
+            emit2 ("djnz !tlabel", labelKey2num (tlbl->key));
+          else
+            {
+              emit2 ("dec a");
+              emit2 ("jp NZ,!tlabel", labelKey2num (tlbl->key));
+            }
         }
-      regalloc_dry_run_cost += 4;
+      regalloc_dry_run_cost += use_b ? 2 : 4;
     }
 }
 
@@ -7279,14 +7753,14 @@
 /* shiftL2Left2Result - shift left two bytes from left to result   */
 /*-----------------------------------------------------------------*/
 static void
-shiftL2Left2Result (operand * left, int offl,
-                    operand * result, int offr, int shCount)
+shiftL2Left2Result (operand *left, int offl, operand *result, int offr, int shCount, const iCode *ic)
 {
-  if (sameRegs (AOP (result), AOP (left)) &&
-      ((offl + MSB16) == offr))
+  if (sameRegs (AOP (result), AOP (left)) && ((offl + MSB16) == offr))
     {
       wassert (0);
     }
+  else if (isPair (AOP (result)) && !offr)
+    fetchPairLong (getPairId (AOP (result)), AOP(left), ic, offl);
   else
     {
       /* Copy left into result */
@@ -7315,51 +7789,51 @@
     }
   else
     {
-    int size = 2;
-    int offset = 0;
-    symbol *tlbl = regalloc_dry_run ? 0 : newiTempLabel (0);
-    symbol *tlbl1 = regalloc_dry_run ? 0 : newiTempLabel (0);
+      int size = 2;
+      int offset = 0;
+      symbol *tlbl = regalloc_dry_run ? 0 : newiTempLabel (0);
+      symbol *tlbl1 = regalloc_dry_run ? 0 : newiTempLabel (0);
 
-    if (AOP (result)->type == AOP_REG)
-      {
-        while (shCount--)
-          {
-            for (offset = 0; offset < size; offset++)
-              emit3_o (offset ? A_RL : A_SLA, AOP (result), offset, 0, 0);
-          }
-      }
-    else
-      {
-        /* Left is already in result - so now do the shift */
-        if (shCount > 1)
-          {
-            if (!regalloc_dry_run)
-              {
-                emit2 ("ld a,!immedbyte+1", shCount);
-                emit2 ("jp !tlabel", tlbl1->key + 100);
-                emitLabelNoSpill (tlbl->key + 100);
-              }
-            regalloc_dry_run_cost += 4;
-          }
+      if (AOP (result)->type == AOP_REG)
+        {
+          while (shCount--)
+            {
+              for (offset = 0; offset < size; offset++)
+                emit3_o (offset ? A_RL : A_SLA, AOP (result), offset, 0, 0);
+            }
+        }
+      else
+        {
+          /* Left is already in result - so now do the shift */
+          if (shCount > 1)
+            {
+              if (!regalloc_dry_run)
+                {
+                  emit2 ("ld a,!immedbyte+1", shCount);
+                  emit2 ("jp !tlabel", labelKey2num (tlbl1->key));
+                  emitLabel (tlbl);
+                }
+              regalloc_dry_run_cost += 4;
+            }
 
-        while (size--)
-          {
-            emit3_o (offset ? A_RL : A_SLA, AOP (result), offset, 0, 0);
+          while (size--)
+            {
+              emit3_o (offset ? A_RL : A_SLA, AOP (result), offset, 0, 0);
 
-            offset++;
-          }
-        if (shCount > 1)
-          {
-            if (!regalloc_dry_run)
-              {
-                emitLabelNoSpill (tlbl1->key + 100);
-                emit2 ("dec a");
-                emit2 ("jp NZ,!tlabel", tlbl->key + 100);
-              }
-            regalloc_dry_run_cost += 4;
-          }
-      }
-  }
+              offset++;
+            }
+          if (shCount > 1)
+            {
+              if (!regalloc_dry_run)
+                {
+                  emitLabel (tlbl1);
+                  emit2 ("dec a");
+                  emit2 ("jp NZ,!tlabel", labelKey2num (tlbl->key));
+                }
+              regalloc_dry_run_cost += 4;
+            }
+        }
+    }
 }
 
 /*-----------------------------------------------------------------*/
@@ -7373,6 +7847,12 @@
   switch (shCount)
     {
     case 4:
+      if (IS_GB)
+        {
+          emit2 ("swap a");
+          regalloc_dry_run_cost += 2;
+          break;
+        }
       emit3 (A_RLCA, 0, 0);
     case 3:
       emit3 (A_RLCA, 0, 0);
@@ -7383,11 +7863,11 @@
     case 0:
       break;
     case 5:
-      emit3 (A_RRCA, 0 ,0);
+      emit3 (A_RRCA, 0, 0);
     case 6:
-      emit3 (A_RRCA, 0 ,0);
+      emit3 (A_RRCA, 0, 0);
     case 7:
-      emit3 (A_RRCA, 0 ,0);
+      emit3 (A_RRCA, 0, 0);
       break;
     }
 }
@@ -7399,9 +7879,9 @@
 AccLsh (int shCount)
 {
   static const unsigned char SLMask[] =
-    {
-      0xFF, 0xFE, 0xFC, 0xF8, 0xF0, 0xE0, 0xC0, 0x80, 0x00
-    };
+  {
+    0xFF, 0xFE, 0xFC, 0xF8, 0xF0, 0xE0, 0xC0, 0x80, 0x00
+  };
 
   if (shCount != 0)
     {
@@ -7429,8 +7909,7 @@
 /* shiftL1Left2Result - shift left one byte from left to result    */
 /*-----------------------------------------------------------------*/
 static void
-shiftL1Left2Result (operand * left, int offl,
-                    operand * result, int offr, int shCount)
+shiftL1Left2Result (operand * left, int offl, operand * result, int offr, int shCount)
 {
   /* If operand and result are the same we can shift in place.
      However shifting in acc using add is cheaper than shifting
@@ -7454,7 +7933,7 @@
 /* genlshTwo - left shift two bytes by known amount                */
 /*-----------------------------------------------------------------*/
 static void
-genlshTwo (operand * result, operand * left, int shCount)
+genlshTwo (operand *result, operand *left, int shCount, const iCode *ic)
 {
   int size = AOP_SIZE (result);
 
@@ -7490,7 +7969,7 @@
         }
       else
         {
-          shiftL2Left2Result (left, LSB, result, LSB, shCount);
+          shiftL2Left2Result (left, LSB, result, LSB, shCount, ic);
         }
     }
 }
@@ -7508,10 +7987,7 @@
 /* genLeftShiftLiteral - left shifting by known count              */
 /*-----------------------------------------------------------------*/
 static void
-genLeftShiftLiteral (operand *left,
-                     operand *right,
-                     operand *result,
-                     const iCode *ic)
+genLeftShiftLiteral (operand * left, operand * right, operand * result, const iCode *ic)
 {
   int shCount = (int) ulFromVal (AOP (right)->aopu.aop_lit);
   int size;
@@ -7538,7 +8014,7 @@
           genlshOne (result, left, shCount);
           break;
         case 2:
-          genlshTwo (result, left, shCount);
+          genlshTwo (result, left, shCount, ic);
           break;
         case 4:
           wassertl (0, "Shifting of longs is currently unsupported");
@@ -7555,7 +8031,7 @@
 /* genLeftShift - generates code for left shifting                 */
 /*-----------------------------------------------------------------*/
 static void
-genLeftShift (const iCode *ic)
+genLeftShift (const iCode * ic)
 {
   int size, offset;
   symbol *tlbl = 0, *tlbl1 = 0;
@@ -7605,7 +8081,7 @@
         }
     }
 
-  if(!regalloc_dry_run)
+  if (!regalloc_dry_run)
     {
       tlbl = newiTempLabel (NULL);
       tlbl1 = newiTempLabel (NULL);
@@ -7614,12 +8090,12 @@
   offset = 0;
 
   if (AOP_TYPE (left) != AOP_REG || AOP_TYPE (result) != AOP_REG)
-     _pop (PAIR_AF);
+    _pop (PAIR_AF);
 
-  if(!regalloc_dry_run)
+  if (!regalloc_dry_run)
     {
-      emit2 ("jp !tlabel", tlbl1->key + 100);
-      emitLabelNoSpill (tlbl->key + 100);
+      emit2 ("jp !tlabel", labelKey2num (tlbl1->key));
+      emitLabel (tlbl);
     }
   regalloc_dry_run_cost += 3;
 
@@ -7629,11 +8105,11 @@
       offset++;
     }
 
-  if(!regalloc_dry_run)
+  if (!regalloc_dry_run)
     {
-      emitLabelNoSpill (tlbl1->key + 100);
+      emitLabel (tlbl1);
       emit2 ("dec a");
-      emit2 ("jp NZ,!tlabel", tlbl->key + 100);
+      emit2 ("jp NZ,!tlabel", labelKey2num (tlbl->key));
     }
   regalloc_dry_run_cost += 4;
 
@@ -7675,16 +8151,16 @@
 AccRsh (int shCount)
 {
   static const unsigned char SRMask[] =
-    {
-      0xFF, 0x7F, 0x3F, 0x1F, 0x0F, 0x07, 0x03, 0x01, 0x00
-    };
+  {
+    0xFF, 0x7F, 0x3F, 0x1F, 0x0F, 0x07, 0x03, 0x01, 0x00
+  };
 
   if (shCount != 0)
     {
       /* rotate right accumulator */
       AccRol (8 - shCount);
       /* and kill the higher order bits */
-      if(!regalloc_dry_run)
+      if (!regalloc_dry_run)
         emit2 ("and a,!immedbyte", SRMask[shCount]);
       regalloc_dry_run_cost += 2;
     }
@@ -7694,9 +8170,7 @@
 /* shiftR1Left2Result - shift right one byte from left to result   */
 /*-----------------------------------------------------------------*/
 static void
-shiftR1Left2Result (operand * left, int offl,
-                    operand * result, int offr,
-                    int shCount, int sign)
+shiftR1Left2Result (operand * left, int offl, operand * result, int offr, int shCount, int sign)
 {
   cheapMove (ASMOP_A, 0, AOP (left), offl);
   if (sign)
@@ -7713,8 +8187,7 @@
 /* genrshTwo - right shift two bytes by known amount               */
 /*-----------------------------------------------------------------*/
 static void
-genrshTwo (const iCode *ic, operand * result, operand * left,
-           int shCount, int sign)
+genrshTwo (const iCode * ic, operand * result, operand * left, int shCount, int sign)
 {
   /* if shCount >= 8 */
   if (shCount >= 8)
@@ -7722,8 +8195,7 @@
       shCount -= 8;
       if (shCount)
         {
-          shiftR1Left2Result (left, MSB16, result, LSB,
-                              shCount, sign);
+          shiftR1Left2Result (left, MSB16, result, LSB, shCount, sign);
         }
       else
         {
@@ -7749,14 +8221,10 @@
 /* genRightShiftLiteral - right shifting by known count              */
 /*-----------------------------------------------------------------*/
 static void
-genRightShiftLiteral (operand *left,
-                      operand *right,
-                      operand *result,
-                      const iCode *ic,
-                      int sign)
+genRightShiftLiteral (operand * left, operand * right, operand * result, const iCode * ic, int sign)
 {
-  int shCount = (int) ulFromVal (AOP (right)->aopu.aop_lit);
-  int size;
+  unsigned int shCount = (unsigned int) ulFromVal (AOP (right)->aopu.aop_lit);
+  unsigned int size;
 
   freeAsmop (right, NULL, ic);
 
@@ -7766,20 +8234,25 @@
   size = getSize (operandType (result));
 
   /* I suppose that the left size >= result size */
+  wassert (getSize (operandType (left)) >= size);
 
-  if (shCount >= (size * 8)) {
-    asmop *s;
-    if (!SPEC_USIGN(getSpec(operandType(left)))) {
-      cheapMove (ASMOP_A, 0, AOP (left), 0);
-      emit3 (A_RLC, ASMOP_A, 0);
-      emit3 (A_SBC, ASMOP_A, ASMOP_A);
-      s=ASMOP_A;
-    } else {
-      s=ASMOP_ZERO;
+  if (shCount >= (size * 8))
+    {
+      asmop *s;
+      if (!SPEC_USIGN (getSpec (operandType (left))))
+        {
+          cheapMove (ASMOP_A, 0, AOP (left), 0);
+          emit3 (A_RLC, ASMOP_A, 0);
+          emit3 (A_SBC, ASMOP_A, ASMOP_A);
+          s = ASMOP_A;
+        }
+      else
+        {
+          s = ASMOP_ZERO;
+        }
+      while (size--)
+        cheapMove (AOP (result), size, s, 0);
     }
-    while (size--)
-      cheapMove (AOP (result), size, s, 0);
-  }
   else
     {
       switch (size)
@@ -7805,7 +8278,7 @@
 /* genRightShift - generate code for right shifting                */
 /*-----------------------------------------------------------------*/
 static void
-genRightShift (const iCode *ic)
+genRightShift (const iCode * ic)
 {
   operand *right, *left, *result;
   sym_link *retype;
@@ -7844,7 +8317,7 @@
   aopOp (result, ic, FALSE, FALSE);
 
   if (AOP_TYPE (left) != AOP_REG || AOP_TYPE (result) != AOP_REG)
-     _push (PAIR_AF);
+    _push (PAIR_AF);
 
   /* now move the left to the result if they are not the
      same */
@@ -7869,15 +8342,15 @@
   offset = size - 1;
 
   if (AOP_TYPE (left) != AOP_REG || AOP_TYPE (result) != AOP_REG)
-     _pop (PAIR_AF);
+    _pop (PAIR_AF);
 
-  if(!regalloc_dry_run)
+  if (!regalloc_dry_run)
     {
-      emit2 ("jp !tlabel", tlbl1->key + 100);
-      emitLabelNoSpill (tlbl->key + 100);
+      emit2 ("jp !tlabel", labelKey2num (tlbl1->key));
+      IS_GB ? emitLabelSpill (tlbl) : emitLabel (tlbl);
     }
   regalloc_dry_run_cost += 3;
-  
+
   while (size--)
     {
       if (first)
@@ -7891,11 +8364,11 @@
         }
       offset--;
     }
-  if(!regalloc_dry_run)
+  if (!regalloc_dry_run)
     {
-      emitLabelNoSpill (tlbl1->key + 100);
+      IS_GB ? emitLabelSpill (tlbl1) : emitLabel (tlbl1);
       emit2 ("dec a");
-      emit2 ("jp NZ,!tlabel", tlbl->key + 100);
+      emit2 ("jp NZ,!tlabel", labelKey2num (tlbl->key));
     }
   regalloc_dry_run_cost += 4;
 
@@ -7910,12 +8383,12 @@
 static void
 genUnpackBits (operand * result, int pair)
 {
-  int offset = 0;       /* result byte offset */
-  int rsize;            /* result size */
-  int rlen = 0;         /* remaining bit-field length */
-  sym_link *etype;      /* bit-field type information */
-  int blen;             /* bit-field length */
-  int bstr;             /* bit-field starting bit within byte */
+  int offset = 0;               /* result byte offset */
+  int rsize;                    /* result size */
+  int rlen = 0;                 /* remaining bit-field length */
+  sym_link *etype;              /* bit-field type information */
+  int blen;                     /* bit-field length */
+  int bstr;                     /* bit-field starting bit within byte */
 
   emitDebug ("; genUnpackBits");
 
@@ -7930,18 +8403,18 @@
       emit2 ("ld a,!*pair", _pairs[pair].name);
       regalloc_dry_run_cost += (pair == PAIR_IX || pair == PAIR_IY) ? 3 : 1;
       AccRol (8 - bstr);
-      emit2 ("and a,!immedbyte", ((unsigned char) -1) >> (8 - blen));
+      emit2 ("and a,!immedbyte", ((unsigned char) - 1) >> (8 - blen));
       regalloc_dry_run_cost += 2;
       if (!SPEC_USIGN (etype))
         {
           /* signed bit-field */
-          if(!regalloc_dry_run)
+          if (!regalloc_dry_run)
             {
               symbol *tlbl = newiTempLabel (NULL);
               emit2 ("bit %d,a", blen - 1);
-              emit2 ("jp Z,!tlabel", tlbl->key + 100);
+              emit2 ("jp Z,!tlabel", labelKey2num (tlbl->key));
               emit2 ("or a,!immedbyte", (unsigned char) (0xff << blen));
-              emitLabelNoSpill (tlbl->key + 100);
+              emitLabel (tlbl);
             }
           regalloc_dry_run_cost += 7;
         }
@@ -7951,12 +8424,13 @@
 
   /* TODO: what if pair == PAIR_DE ? */
   if (getPairId (AOP (result)) == PAIR_HL ||
-    AOP_TYPE (result) == AOP_REG && rsize >= 2 && (AOP (result)->aopu.aop_reg[0]->rIdx == L_IDX || AOP (result)->aopu.aop_reg[0]->rIdx == H_IDX))
+      AOP_TYPE (result) == AOP_REG && rsize >= 2 && (AOP (result)->aopu.aop_reg[0]->rIdx == L_IDX
+          || AOP (result)->aopu.aop_reg[0]->rIdx == H_IDX))
     {
       wassertl (rsize == 2, "HL must be of size 2");
       emit2 ("ld a,!*hl");
       emit2 ("inc hl");
-      if(AOP_TYPE (result) != AOP_REG || AOP (result)->aopu.aop_reg[0]->rIdx != H_IDX)
+      if (AOP_TYPE (result) != AOP_REG || AOP (result)->aopu.aop_reg[0]->rIdx != H_IDX)
         {
           emit2 ("ld h,!*hl");
           cheapMove (AOP (result), offset++, ASMOP_A, 0);
@@ -7968,18 +8442,18 @@
           cheapMove (AOP (result), offset++, ASMOP_A, 0);
           emit2 ("ld a,l");
         }
-      emit2 ("and a,!immedbyte", ((unsigned char) -1) >> (16 - blen));
+      emit2 ("and a,!immedbyte", ((unsigned char) - 1) >> (16 - blen));
       regalloc_dry_run_cost += 7;
       if (!SPEC_USIGN (etype))
         {
           /* signed bit-field */
-          if(!regalloc_dry_run)
+          if (!regalloc_dry_run)
             {
               symbol *tlbl = newiTempLabel (NULL);
               emit2 ("bit %d,a", blen - 1 - 8);
-              emit2 ("jp Z,!tlabel", tlbl->key + 100);
+              emit2 ("jp Z,!tlabel", labelKey2num (tlbl->key));
               emit2 ("or a,!immedbyte", (unsigned char) (0xff << (blen - 8)));
-              emitLabelNoSpill (tlbl->key + 100);
+              emitLabel (tlbl);
             }
           regalloc_dry_run_cost += 7;
         }
@@ -7991,12 +8465,12 @@
 
   /* Bit field did not fit in a byte. Copy all
      but the partial byte at the end.  */
-  for (rlen=blen;rlen>=8;rlen-=8)
+  for (rlen = blen; rlen >= 8; rlen -= 8)
     {
       emit2 ("ld a,!*pair", _pairs[pair].name);
       regalloc_dry_run_cost += 1;
       cheapMove (AOP (result), offset++, ASMOP_A, 0);
-      if (rlen>8)
+      if (rlen > 8)
         {
           emit2 ("inc %s", _pairs[pair].name);
           regalloc_dry_run_cost += 1;
@@ -8008,18 +8482,18 @@
   if (rlen)
     {
       emit2 ("ld a,!*pair", _pairs[pair].name);
-      emit2 ("and a,!immedbyte", ((unsigned char) -1) >> (8 - rlen));
+      emit2 ("and a,!immedbyte", ((unsigned char) - 1) >> (8 - rlen));
       regalloc_dry_run_cost += 3;
       if (!SPEC_USIGN (etype))
         {
           /* signed bit-field */
-          if(!regalloc_dry_run)
+          if (!regalloc_dry_run)
             {
               symbol *tlbl = newiTempLabel (NULL);
               emit2 ("bit %d,a", rlen - 1);
-              emit2 ("jp Z,!tlabel", tlbl->key + 100);
+              emit2 ("jp Z,!tlabel", labelKey2num (tlbl->key));
               emit2 ("or a,!immedbyte", (unsigned char) (0xff << rlen));
-              emitLabelNoSpill (tlbl->key + 100);
+              emitLabel (tlbl);
             }
           regalloc_dry_run_cost += 7;
         }
@@ -8047,19 +8521,45 @@
 }
 
 static void
-_moveFrom_tpair_(asmop *aop, int offset, PAIR_ID pair)
+_moveFrom_tpair_ (asmop * aop, int offset, PAIR_ID pair)
 {
   if (!IS_GB && aop->type == AOP_REG)
     {
-      if(!regalloc_dry_run)
+      if (!regalloc_dry_run)
         aopPut (aop, "!*hl", offset);
       regalloc_dry_run_cost += ld_cost (aop, ASMOP_A);
     }
   else
     {
-      emit2 ("ld a,!*pair", _pairs[pair].name);
-      regalloc_dry_run_cost += 1;
-      cheapMove (aop, offset, ASMOP_A, 0);
+      emit2 ("ld a,!*pair", _pairs[pair].name);
+      regalloc_dry_run_cost += 1;
+      cheapMove (aop, offset, ASMOP_A, 0);
+    }
+}
+
+static void offsetPair (PAIR_ID pair, PAIR_ID extrapair, bool save_extrapair, int val)
+{
+  if (abs (val) < (save_extrapair ? 6 : 4) || pair != PAIR_HL && pair != PAIR_IY && pair != PAIR_IX)
+    {
+      while (val)
+        {
+          emit2 (val > 0 ? "inc %s" : "dec %s", _pairs[pair].name);
+          if (val > 0)
+            val--;
+          else
+            val++;
+          regalloc_dry_run_cost++;
+        }
+    }
+  else
+    {
+      if (save_extrapair)
+        _push (extrapair);
+      emit2 ("ld %s, !immedword", _pairs[extrapair].name, val);
+      emit2 ("add %s, %s", _pairs[pair].name, _pairs[extrapair].name);
+      regalloc_dry_run_cost += (pair == PAIR_HL ? 4 : 5);
+      if (save_extrapair)
+        _pop (extrapair);
     }
 }
 
@@ -8069,29 +8569,48 @@
 static void
 genPointerGet (const iCode *ic)
 {
-  operand *left, *result;
-  int size, offset;
-  int pair = PAIR_HL;
+  operand *left, *right, *result;
+  int size, offset, rightval;
+  int pair = PAIR_HL, extrapair;
   sym_link *retype;
+  bool pushed_pair = FALSE;
+  bool pushed_a = FALSE;
+  bool surviving_a = !options.oldralloc && bitVectBitValue (ic->rSurv, A_IDX);
+  bool rightval_in_range;
 
   left = IC_LEFT (ic);
+  right = IC_RIGHT (ic);
   result = IC_RESULT (ic);
   retype = getSpec (operandType (result));
 
-  if (IS_GB)
-    pair = PAIR_DE;
-
   aopOp (left, ic, FALSE, FALSE);
   aopOp (result, ic, FALSE, FALSE);
-
   size = AOP_SIZE (result);
 
-  if (isPair (AOP (left)) && size == 1 && !IS_BITVAR (retype))
+  /* Historically GET_VALUE_AT_ADDRESS didn't have a right operand */
+  wassertl (right, "GET_VALUE_AT_ADDRESS without right operand");
+  wassertl (IS_OP_LITERAL (IC_RIGHT (ic)), "GET_VALUE_AT_ADDRESS with non-literal right operand");
+  rightval = (int)operandLitValue (right);
+  rightval_in_range = (rightval >= -128 && rightval + size - 1 < 127);
+  if (IS_GB)
+    wassert (!rightval);
+
+  if (IS_GB || IY_RESERVED && requiresHL (AOP (result)) && size > 1 && AOP_TYPE (result) != AOP_REG)
+    pair = PAIR_DE;
+
+  if (AOP_TYPE (left) == AOP_IMMD && size == 1 && AOP_TYPE (result) == AOP_ACC && !IS_BITVAR (retype))
+    {
+      emit2 ("ld a, (%s)", aopGetLitWordLong (AOP (left), rightval, TRUE));
+      regalloc_dry_run_cost += 3;
+      goto release;
+    }
+
+  if (isPair (AOP (left)) && size == 1 && !IS_BITVAR (retype) && !rightval)
     {
       /* Just do it */
       if (isPtrPair (AOP (left)))
         {
-          if(!regalloc_dry_run) // Todo: More exact cost.
+          if (!regalloc_dry_run)        // Todo: More exact cost.
             {
               struct dbuf_s dbuf;
 
@@ -8104,6 +8623,8 @@
         }
       else
         {
+          if (surviving_a && !pushed_a)
+            _push (PAIR_AF), pushed_a = TRUE;
           emit2 ("ld a,!*pair", getPairName (AOP (left)));
           regalloc_dry_run_cost += (getPairId (AOP (left)) == PAIR_IY ? 3 : 1);
           cheapMove (AOP (result), 0, ASMOP_A, 0);
@@ -8112,11 +8633,11 @@
       goto release;
     }
 
-  if (getPairId (AOP (left)) == PAIR_IY && !IS_BITVAR (retype))
+  if (getPairId (AOP (left)) == PAIR_IY && !IS_BITVAR (retype) && rightval_in_range)
     {
-      if (IS_R2K && getPairId (AOP (result)) == PAIR_HL)
+      if (IS_RAB && getPairId (AOP (result)) == PAIR_HL)
         {
-          emit2 ("ld hl, (iy)");
+          emit2 ("ld hl, %d (iy)", rightval);
           regalloc_dry_run_cost += 3;
           goto release;
         }
@@ -8130,54 +8651,88 @@
               struct dbuf_s dbuf;
 
               dbuf_init (&dbuf, 128);
-              dbuf_tprintf (&dbuf, "!*iyx", offset);
+              dbuf_tprintf (&dbuf, "!*iyx", rightval + offset);
               aopPut (AOP (result), dbuf_c_str (&dbuf), offset);
               dbuf_destroy (&dbuf);
             }
-          regalloc_dry_run_cost += ld_cost (AOP (result), ASMOP_A) + 2;	// Todo: More exact cost.
+          regalloc_dry_run_cost += ld_cost (AOP (result), ASMOP_A) + 2; // Todo: More exact cost.
           offset++;
         }
 
       goto release;
     }
 
+  extrapair = isPairDead (PAIR_DE, ic) ? PAIR_DE : PAIR_BC;
+
   /* For now we always load into temp pair */
   /* if this is rematerializable */
-  if(!IS_GB && (getPairId (AOP (left)) == PAIR_BC || getPairId (AOP (left)) == PAIR_DE) && AOP_TYPE (result) == AOP_STK || getPairId (AOP (left)) == PAIR_IY && SPEC_BLEN (getSpec (operandType (result))) < 8)
+  if (!IS_GB && (getPairId (AOP (left)) == PAIR_BC || getPairId (AOP (left)) == PAIR_DE) && AOP_TYPE (result) == AOP_STK && !rightval
+      || getPairId (AOP (left)) == PAIR_IY && SPEC_BLEN (getSpec (operandType (result))) < 8 && rightval_in_range)
     pair = getPairId (AOP (left));
   else
-    fetchPair (pair, AOP (left));
+    {
+      if (!isPairDead (pair, ic) && size > 1)
+        _push (pair), pushed_pair = TRUE;
+      if (AOP_TYPE(left) == AOP_IMMD)
+        {
+          emit2 ("ld %s, %s", _pairs[pair].name, aopGetLitWordLong (AOP (left), rightval, TRUE));
+          regalloc_dry_run_cost += 3;
+          rightval = 0;
+        }
+      else
+        fetchPair (pair, AOP (left));
+    }
 
   /* if bit then unpack */
   if (IS_BITVAR (retype))
     {
+      offsetPair (pair, extrapair, !isPairDead (extrapair, ic), rightval);
       genUnpackBits (result, pair);
+      if (rightval)
+        spillPair (pair);
+
       goto release;
     }
-  else if (getPairId (AOP (result)) == PAIR_HL || size == 2 && AOP_TYPE (result) == AOP_REG && (AOP (result)->aopu.aop_reg[0] == regsZ80 + L_IDX || AOP (result)->aopu.aop_reg[0] == regsZ80 + H_IDX))
+
+
+ if (getPairId (AOP (result)) == PAIR_HL || size == 2 && AOP_TYPE (result) == AOP_REG
+           && (AOP (result)->aopu.aop_reg[0] == regsZ80 + L_IDX || AOP (result)->aopu.aop_reg[0] == regsZ80 + H_IDX))
     {
-       wassertl (size == 2, "HL must be of size 2");
-      if (IS_R2K && getPairId (AOP (result)) == PAIR_HL)
+      wassertl (size == 2, "HL must be of size 2");
+      if (IS_RAB && getPairId (AOP (result)) == PAIR_HL && rightval_in_range)
         {
-          emit2 ("ld hl, (hl)");
+          emit2 ("ld hl, %d (hl)", rightval);
           regalloc_dry_run_cost += 3;
         }
       else
         {
+          if (surviving_a && !pushed_a)
+            _push (PAIR_AF), pushed_a = TRUE;
+          offsetPair (pair, extrapair, !isPairDead (extrapair, ic), rightval);
           emit2 ("ld a,!*hl");
           emit2 ("inc hl");
-          if(!regalloc_dry_run)
+          if (!regalloc_dry_run)
             aopPut (AOP (result), "!*hl", 1);
           regalloc_dry_run_cost += 3;
           cheapMove (AOP (result), 0, ASMOP_A, 0);
         }
       spillPair (PAIR_HL);
+      goto release;
     }
-  else if (pair == PAIR_HL || (!IS_GB && (getPairId (AOP (left)) == PAIR_BC || getPairId (AOP (left)) == PAIR_DE) && AOP_TYPE (result) == AOP_STK))
+
+  offsetPair (pair, extrapair, !isPairDead (extrapair, ic), rightval);
+
+  if (pair == PAIR_HL
+           || (!IS_GB && (getPairId (AOP (left)) == PAIR_BC || getPairId (AOP (left)) == PAIR_DE)
+               && AOP_TYPE (result) == AOP_STK))
     {
       size = AOP_SIZE (result);
       offset = 0;
 
+      /* might use ld a,(hl) followed by ld d (iy),a */
+      if ((AOP_TYPE (result) == AOP_EXSTK || AOP_TYPE (result) == AOP_STK) && surviving_a && !pushed_a)
+        _push (PAIR_AF), pushed_a = TRUE;
+
       if (size >= 2 && pair == PAIR_HL && AOP_TYPE (result) == AOP_REG)
         {
           int i, l = -10, h = -10, r;
@@ -8189,7 +8744,7 @@
                 h = i;
             }
 
-          if (l == -10 && h >= 0 && h < size - 1 || h == -10 && l >= 0 && l < size - 1)	// One byte of result somewehere in hl. Just assign it last.
+          if (l == -10 && h >= 0 && h < size - 1 || h == -10 && l >= 0 && l < size - 1) // One byte of result somewehere in hl. Just assign it last.
             {
               r = (l == -10 ? h : l);
 
@@ -8199,12 +8754,12 @@
                     _moveFrom_tpair_ (AOP (result), offset, pair);
 
                   if (size)
-                   {
-                     offset++;
-                     emit2 ("inc %s", _pairs[pair].name);
-                     regalloc_dry_run_cost += 1;
-                     _G.pairs[pair].offset++;
-                   }
+                    {
+                      offset++;
+                      emit2 ("inc %s", _pairs[pair].name);
+                      regalloc_dry_run_cost += 1;
+                      _G.pairs[pair].offset++;
+                    }
                 }
 
               for (size = offset; size != r; size--)
@@ -8216,10 +8771,10 @@
               _moveFrom_tpair_ (AOP (result), r, pair);
 
               // No fixup since result uses HL.
-
+              spillPair (pair);
               goto release;
             }
-          else if (l >= 0 && h >= 0 ) // Two bytes of result somewehere in hl. Assign it last and use a for caching.
+          else if (l >= 0 && h >= 0)    // Two bytes of result somewehere in hl. Assign it last and use a for caching.
             {
               while (size--)
                 {
@@ -8227,12 +8782,12 @@
                     _moveFrom_tpair_ (AOP (result), offset, pair);
 
                   if (size)
-                   {
-                     offset++;
-                     emit2 ("inc %s", _pairs[pair].name);
-                     regalloc_dry_run_cost += 1;
-                     _G.pairs[pair].offset++;
-                   }
+                    {
+                      offset++;
+                      emit2 ("inc %s", _pairs[pair].name);
+                      regalloc_dry_run_cost += 1;
+                      _G.pairs[pair].offset++;
+                    }
                 }
 
               r = (l > h ? l : h);
@@ -8241,6 +8796,8 @@
                   emit2 ("dec %s", _pairs[pair].name);
                   regalloc_dry_run_cost += 1;
                 }
+              if (surviving_a && !pushed_a)
+                _push (PAIR_AF), pushed_a = TRUE;
               _moveFrom_tpair_ (ASMOP_A, 0, pair);
 
               r = (l < h ? l : h);
@@ -8255,7 +8812,7 @@
               cheapMove (AOP (result), r, ASMOP_A, 0);
 
               // No fixup since result uses HL.
-
+              spillPair (pair);
               goto release;
             }
         }
@@ -8273,12 +8830,14 @@
         }
       /* Fixup HL back down */
       if (getPairId (AOP (left)) == pair && !isPairDead (pair, ic))
-        for (size = AOP_SIZE (result)-1; size; size--)
+        for (size = AOP_SIZE (result) - 1; size; size--)
           {
             emit2 ("dec %s", _pairs[pair].name);
             regalloc_dry_run_cost += 1;
             _G.pairs[pair].offset--;
           }
+       else if (rightval || AOP_SIZE (result))
+         spillPair (pair);
     }
   else
     {
@@ -8287,11 +8846,13 @@
 
       while (size--)
         {
+          if (surviving_a && !pushed_a)
+            _push (PAIR_AF), pushed_a = TRUE;
+
           /* PENDING: make this better */
-          if (!IS_GB &&
-              (AOP_TYPE (result) == AOP_REG || AOP_TYPE (result) == AOP_HLREG))
+          if (!IS_GB && (AOP_TYPE (result) == AOP_REG || AOP_TYPE (result) == AOP_HLREG))
             {
-              if(!regalloc_dry_run)
+              if (!regalloc_dry_run)
                 aopPut (AOP (result), "!*hl", offset++);
               regalloc_dry_run_cost += ld_cost (AOP (result), ASMOP_A);
             }
@@ -8308,9 +8869,16 @@
               _G.pairs[pair].offset++;
             }
         }
+      if (rightval || AOP_SIZE (result))
+         spillPair (pair);
     }
 
 release:
+  if (pushed_a)
+    _pop (PAIR_AF);
+  if (pushed_pair)
+    _pop (pair);
+
   freeAsmop (left, NULL, ic);
   freeAsmop (result, NULL, ic);
 }
@@ -8328,22 +8896,20 @@
 /* genPackBits - generates code for packed bit storage             */
 /*-----------------------------------------------------------------*/
 static void
-genPackBits (sym_link * etype,
-             operand * right,
-             int pair,
-             const iCode *ic)
+genPackBits (sym_link * etype, operand * right, int pair, const iCode * ic)
 {
-  int offset = 0;       /* source byte offset */
+  int offset = 0;               /* source byte offset */
   int pair_offset = 0;
-  int rlen = 0;         /* remaining bit-field length */
-  int blen;             /* bit-field length */
-  int bstr;             /* bit-field starting bit within byte */
-  int litval;           /* source literal value (if AOP_LIT) */
-  unsigned char mask;   /* bitmask within current byte */
-  int extraPair;        /* a tempory register */
-  bool needPopExtra=0;  /* need to restore original value of temp reg */
+  int rlen = 0;                 /* remaining bit-field length */
+  int blen;                     /* bit-field length */
+  int bstr;                     /* bit-field starting bit within byte */
+  int litval;                   /* source literal value (if AOP_LIT) */
+  unsigned char mask;           /* bitmask within current byte */
+  int extraPair;                /* a tempory register */
+  bool needPopExtra = 0;        /* need to restore original value of temp reg */
+  unsigned int pairincrement = 0;
 
-  emitDebug ("; genPackBits","");
+  emitDebug ("; genPackBits", "");
 
   blen = SPEC_BLEN (etype);
   bstr = SPEC_BSTR (etype);
@@ -8351,8 +8917,7 @@
   /* If the bit-field length is less than a byte */
   if (blen < 8)
     {
-      mask = ((unsigned char) (0xFF << (blen + bstr)) |
-              (unsigned char) (0xFF >> (8 - bstr)));
+      mask = ((unsigned char) (0xFF << (blen + bstr)) | (unsigned char) (0xFF >> (8 - bstr)));
 
       if (AOP_TYPE (right) == AOP_LIT)
         {
@@ -8362,7 +8927,7 @@
           litval &= (~mask) & 0xff;
           emit2 ("ld a,!*pair", _pairs[pair].name);
           regalloc_dry_run_cost += (pair == PAIR_IX || pair == PAIR_IY) ? 3 : 1;
-          if ((mask|litval)!=0xff)
+          if ((mask | litval) != 0xff)
             {
               emit2 ("and a,!immedbyte", mask);
               regalloc_dry_run_cost += 2;
@@ -8385,7 +8950,7 @@
           emit2 ("and a,!immedbyte", (~mask) & 0xff);
           regalloc_dry_run_cost += 2;
 
-          extraPair = getFreePairId(ic);
+          extraPair = getFreePairId (ic);
           if (extraPair == PAIR_INVALID)
             {
               if (pair != PAIR_HL)
@@ -8401,6 +8966,7 @@
                 }
             }
           emit2 ("ld %s,a", _pairs[extraPair].l);
+          spillPair (extraPair);
           regalloc_dry_run_cost += 1;
           emit2 ("ld a,!*pair", _pairs[pair].name);
           regalloc_dry_run_cost += (pair == PAIR_IX || pair == PAIR_IY) ? 3 : 1;
@@ -8419,7 +8985,7 @@
 
   /* Bit length is greater than 7 bits. In this case, copy  */
   /* all except the partial byte at the end                 */
-  for (rlen=blen;rlen>=8;rlen-=8)
+  for (rlen = blen; rlen >= 8; rlen -= 8)
     {
       cheapMove (ASMOP_A, 0, AOP (right), offset++);
       if (pair == PAIR_IX || pair == PAIR_IY)
@@ -8436,6 +9002,7 @@
         {
           emit2 ("inc %s", _pairs[pair].name);
           regalloc_dry_run_cost += 1;
+          pairincrement++;
           _G.pairs[pair].offset++;
         }
       else
@@ -8445,15 +9012,15 @@
   /* If there was a partial byte at the end */
   if (rlen)
     {
-      mask = (((unsigned char) -1 << rlen) & 0xff);
+      mask = (((unsigned char) - 1 << rlen) & 0xff);
 
       if (AOP_TYPE (right) == AOP_LIT)
         {
           /* Case with partial byte and literal source */
           litval = (int) ulFromVal (AOP (right)->aopu.aop_lit);
-          litval >>= (blen-rlen);
+          litval >>= (blen - rlen);
           litval &= (~mask) & 0xff;
-          
+
           if (pair == PAIR_IX || pair == PAIR_IY)
             {
               emit2 ("ld a, %d !*pair", pair_offset, _pairs[pair].name);
@@ -8465,7 +9032,7 @@
               regalloc_dry_run_cost += 1;
             }
 
-          if ((mask|litval)!=0xff)
+          if ((mask | litval) != 0xff)
             emit2 ("and a,!immedbyte", mask);
           if (litval)
             emit2 ("or a,!immedbyte", litval);
@@ -8477,7 +9044,7 @@
           emit2 ("and a,!immedbyte", (~mask) & 0xff);
           regalloc_dry_run_cost += 2;
 
-          extraPair = getFreePairId(ic);
+          extraPair = getFreePairId (ic);
           if (extraPair == PAIR_INVALID)
             {
               if (pair != PAIR_HL)
@@ -8492,10 +9059,11 @@
                     }
                 }
             }
-            
+
           emit2 ("ld %s,a", _pairs[extraPair].l);
+          spillPair (extraPair);
           regalloc_dry_run_cost += 1;
-          
+
           if (pair == PAIR_IX || pair == PAIR_IY)
             {
               emit2 ("ld a, %d !*pair", pair_offset, _pairs[pair].name);
@@ -8526,6 +9094,14 @@
           regalloc_dry_run_cost += 1;
         }
     }
+  if (!isPairDead(pair, ic))
+    while (pairincrement)
+      {
+        emit2 ("dec %s", _pairs[pair].name);
+        regalloc_dry_run_cost += 1;
+        pairincrement--;
+        _G.pairs[pair].offset--;
+      }
 }
 
 /*-----------------------------------------------------------------*/
@@ -8534,13 +9110,15 @@
 static void
 genPointerSet (iCode * ic)
 {
-  int size, offset;
+  int size, offset = 0;
   operand *right, *result;
   PAIR_ID pairId = PAIR_HL;
   bool isBitvar;
-  sym_link *retype; 
+  sym_link *retype;
   sym_link *letype;
-  
+  bool pushed_a = FALSE;
+  bool surviving_a = !options.oldralloc && bitVectBitValue (ic->rSurv, A_IDX);
+
   right = IC_RIGHT (ic);
   result = IC_RESULT (ic);
   retype = getSpec (operandType (right));
@@ -8550,26 +9128,30 @@
   aopOp (right, ic, FALSE, FALSE);
 
   if (IS_GB)
-    pairId = PAIR_DE;
+    pairId = isRegOrLit (AOP (right)) ? PAIR_HL : PAIR_DE;
+  if (isPair (AOP (result)) && isPairDead (getPairId (AOP (result)), ic))
+    pairId = getPairId (AOP (result));
 
   size = AOP_SIZE (right);
 
-  isBitvar = IS_BITVAR(retype) || IS_BITVAR(letype);
-  emitDebug("; isBitvar = %d", isBitvar);
+  isBitvar = IS_BITVAR (retype) || IS_BITVAR (letype);
+  emitDebug ("; isBitvar = %d", isBitvar);
 
   /* Handle the exceptions first */
   if (isPair (AOP (result)) && size == 1 && !isBitvar)
     {
       /* Just do it */
       const char *pair = getPairName (AOP (result));
-      if (canAssignToPtr3 (AOP (right)) && isPtr (pair))	// Todo: correct cost for pair iy.
+      if (canAssignToPtr3 (AOP (right)) && isPtr (pair))        // Todo: correct cost for pair iy.
         {
-          if(!regalloc_dry_run)
+          if (!regalloc_dry_run)
             emit2 ("ld !*pair,%s", pair, aopGet (AOP (right), 0, FALSE));
-          regalloc_dry_run_cost += ld_cost(ASMOP_A, AOP (right)) + (getPairId (AOP (result)) != PAIR_IY ? 0 : 2);
+          regalloc_dry_run_cost += ld_cost (ASMOP_A, AOP (right)) + (getPairId (AOP (result)) != PAIR_IY ? 0 : 2);
         }
       else
         {
+          if (surviving_a && !pushed_a && AOP_TYPE (right) != AOP_ACC)
+            _push (PAIR_AF), pushed_a = TRUE;
           cheapMove (ASMOP_A, 0, AOP (right), 0);
           emit2 ("ld !*pair,a", pair);
           regalloc_dry_run_cost += (getPairId (AOP (result)) != PAIR_IY ? 1 : 3);
@@ -8577,17 +9159,16 @@
       goto release;
     }
 
-  if ( getPairId( AOP (result)) == PAIR_IY && !isBitvar)
+  if (getPairId (AOP (result)) == PAIR_IY && !isBitvar)
     {
       /* Just do it */
-      offset = 0;
       while (size--)
         {
           if (canAssignToPtr3 (AOP (right)))
             {
-              if(!regalloc_dry_run)
-                emit2 ("ld !*iyx,%s", offset, aopGet( AOP(right), offset, FALSE));
-              regalloc_dry_run_cost += 3; // Todo: More exact cost here!
+              if (!regalloc_dry_run)
+                emit2 ("ld !*iyx,%s", offset, aopGet (AOP (right), offset, FALSE));
+              regalloc_dry_run_cost += 3;       // Todo: More exact cost here!
             }
           else
             {
@@ -8599,21 +9180,20 @@
         }
       goto release;
     }
-  else if (getPairId (AOP (result)) == PAIR_HL && !isLastUse (ic, result)
-           && !isBitvar)
+  else if (getPairId (AOP (result)) == PAIR_HL && !isPairDead (PAIR_HL, ic) && !isBitvar)
     {
-      offset = 0;
-
       while (size--)
         {
           if (isRegOrLit (AOP (right)) && !IS_GB)
             {
-              if(!regalloc_dry_run)
+              if (!regalloc_dry_run)
                 emit2 ("ld !*pair,%s", _pairs[PAIR_HL].name, aopGet (AOP (right), offset, FALSE));
-              regalloc_dry_run_cost += ld_cost(ASMOP_A, AOP (right));
+              regalloc_dry_run_cost += ld_cost (ASMOP_A, AOP (right));
             }
           else
             {
+              if (surviving_a && !pushed_a && (AOP_TYPE (right) != AOP_ACC || offset))
+                _push (PAIR_AF), pushed_a = TRUE;
               cheapMove (ASMOP_A, 0, AOP (right), offset);
               emit2 ("ld !*pair,a", _pairs[PAIR_HL].name);
               regalloc_dry_run_cost += 1;
@@ -8628,7 +9208,7 @@
         }
 
       /* Fixup HL back down */
-      for (size = AOP_SIZE (right)-1; size; size--)
+      for (size = AOP_SIZE (right) - 1; size; size--)
         {
           emit2 ("dec %s", _pairs[PAIR_HL].name);
           regalloc_dry_run_cost += 1;
@@ -8636,18 +9216,34 @@
       goto release;
     }
 
+  if (!IS_GB && !isBitvar && isLitWord (AOP (result)) && size == 2 &&
+      (AOP_TYPE (right) == AOP_REG && getPairId (AOP (right)) != PAIR_INVALID || isLitWord (AOP (right))))
+    {
+      if (isLitWord (AOP (right)))
+        {
+          pairId = PAIR_HL;
+          fetchPair (pairId, AOP (right));
+        }
+      else
+        pairId = getPairId (AOP (right));
+
+      fetchPair (pairId, AOP (right));
+      emit2 ("ld (%s), %s", aopGetLitWordLong (AOP (result), offset, FALSE), _pairs[pairId].name);
+      regalloc_dry_run_cost += (pairId == PAIR_HL) ? 3 : 4;
+      goto release;
+    }
+
   /* if the operand is already in dptr
      then we do nothing else we move the value to dptr */
   if (AOP_TYPE (result) != AOP_STR)
     {
-      if (isBitvar && getPairId( AOP (result)) != PAIR_INVALID &&
-        (getPairId( AOP (result)) != PAIR_IY || SPEC_BLEN (IS_BITVAR (retype) ? retype : letype) < 8 || isLastUse (ic, result))) /* Avoid destroying result by increments */
-        pairId = getPairId( AOP (result));
+      if (isBitvar && getPairId (AOP (result)) != PAIR_INVALID && (getPairId (AOP (result)) != PAIR_IY || SPEC_BLEN (IS_BITVAR (retype) ? retype : letype) < 8 || isPairDead (getPairId (AOP (result)), ic)))   /* Avoid destroying result by increments */
+        pairId = getPairId (AOP (result));
       else
         fetchPair (pairId, AOP (result));
     }
   /* so hl now contains the address */
-  freeAsmop (result, NULL, ic);
+  /*freeAsmop (result, NULL, ic);*/
 
   /* if bit then unpack */
   if (isBitvar)
@@ -8661,14 +9257,16 @@
 
       while (size--)
         {
-          if (isRegOrLit (AOP (right)) && !IS_GB)
+          if (isRegOrLit (AOP (right)) && pairId == PAIR_HL)
             {
-              if(!regalloc_dry_run)
+              if (!regalloc_dry_run)
                 emit2 ("ld !*pair,%s", _pairs[pairId].name, aopGet (AOP (right), offset, FALSE));
-              regalloc_dry_run_cost += ld_cost(ASMOP_A, AOP (right));
+              regalloc_dry_run_cost += ld_cost (ASMOP_A, AOP (right));
             }
           else
             {
+              if (surviving_a && !pushed_a && (AOP_TYPE (right) != AOP_ACC || offset))
+                _push (PAIR_AF), pushed_a = TRUE;
               cheapMove (ASMOP_A, 0, AOP (right), offset);
               emit2 ("ld !*pair,a", _pairs[pairId].name);
               regalloc_dry_run_cost += 1;
@@ -8681,8 +9279,22 @@
             }
           offset++;
         }
+      /* Restore operand partially in HL. */
+      if (!isPairDead (pairId, ic))
+        {
+          while(offset-- > 1)
+            {
+              emit2 ("dec %s", _pairs[pairId].name);
+              regalloc_dry_run_cost += 1;
+              _G.pairs[pairId].offset--;
+            }
+          commitPair (AOP (result), pairId, ic, FALSE);
+        }
     }
 release:
+  if (pushed_a)
+    _pop (PAIR_AF);
+
   freeAsmop (right, NULL, ic);
   freeAsmop (result, NULL, ic);
 }
@@ -8699,20 +9311,18 @@
   aopOp (cond, ic, FALSE, TRUE);
 
   /* get the value into acc */
-  if(AOP_TYPE (cond) != AOP_CRY &&
-    !IS_BOOL (operandType(cond)))
+  if (AOP_TYPE (cond) != AOP_CRY && !IS_BOOL (operandType (cond)))
     _toBoolean (cond, FALSE);
   /* Special case: Condition is bool */
-  else if(IS_BOOL (operandType(cond)))
+  else if (IS_BOOL (operandType (cond)))
     {
-      if(!regalloc_dry_run)
+      if (!regalloc_dry_run)
         {
           emit2 ("bit 0,%s", aopGet (AOP (cond), 0, FALSE));
-          emit2 ("jp %s,!tlabel", IC_TRUE (ic) ? "NZ" : "Z",
-            (IC_TRUE (ic) ? IC_TRUE (ic) : IC_FALSE (ic))->key + 100);
+          emit2 ("jp %s,!tlabel", IC_TRUE (ic) ? "NZ" : "Z", labelKey2num ((IC_TRUE (ic) ? IC_TRUE (ic) : IC_FALSE (ic))->key));
         }
-      regalloc_dry_run_cost += (bit8_cost(AOP (cond)) + 3);
-      
+      regalloc_dry_run_cost += (bit8_cost (AOP (cond)) + 3);
+
       freeAsmop (cond, NULL, ic);
       if (!regalloc_dry_run)
         ic->generated = 1;
@@ -8728,8 +9338,7 @@
     genIpop (popIc);
 
   /* if the condition is  a bit variable */
-  if (isbit && IS_ITEMP (cond) &&
-      SPIL_LOC (cond))
+  if (isbit && IS_ITEMP (cond) && SPIL_LOC (cond))
     genIfxJump (ic, SPIL_LOC (cond)->rname);
   else if (isbit && !IS_ITEMP (cond))
     genIfxJump (ic, OP_SYMBOL (cond)->rname);
@@ -8744,7 +9353,7 @@
 /* genAddrOf - generates code for address of                       */
 /*-----------------------------------------------------------------*/
 static void
-genAddrOf (const iCode *ic)
+genAddrOf (const iCode * ic)
 {
   symbol *sym = OP_SYMBOL (IC_LEFT (ic));
 
@@ -8766,35 +9375,51 @@
             {
               setupPairFromSP (PAIR_HL, sym->stack + _G.stack.pushed + _G.stack.offset + _G.stack.param_offset);
             }
-          commitPair (AOP (IC_RESULT (ic)), PAIR_HL);
+          commitPair (AOP (IC_RESULT (ic)), PAIR_HL, ic, FALSE);
         }
       else
         {
           emit2 ("ld de,!hashedstr", sym->rname);
           regalloc_dry_run_cost += 3;
-          commitPair (AOP (IC_RESULT (ic)), PAIR_DE);
+          commitPair (AOP (IC_RESULT (ic)), PAIR_DE, ic, FALSE);
         }
     }
   else
     {
-      spillPair (PAIR_HL);
+      PAIR_ID pair;
+
       if (sym->onStack)
         {
+          if (getPairId (AOP (IC_RESULT (ic))) == PAIR_IY)
+            pair = PAIR_IY;
+          else
+            {
+              pair = PAIR_HL;
+              spillPair (PAIR_HL);
+            }
+
           /* if it has an offset  then we need to compute it */
           if (sym->stack > 0)
-            emit2 ("ld hl,!immedword", sym->stack + _G.stack.pushed + _G.stack.offset + _G.stack.param_offset);
+            emit2 ("ld %s,!immedword", _pairs[pair].name,
+                   sym->stack + _G.stack.pushed + _G.stack.offset + _G.stack.param_offset);
           else
-            emit2 ("ld hl,!immedword", sym->stack + _G.stack.pushed + _G.stack.offset);
-          regalloc_dry_run_cost += 3;
-          emit2 ("add hl,sp");
-          regalloc_dry_run_cost += 1;
+            emit2 ("ld %s,!immedword", _pairs[pair].name, sym->stack + _G.stack.pushed + _G.stack.offset);
+          regalloc_dry_run_cost += (pair == PAIR_IY ? 4 : 3);
+          emit2 ("add %s,sp", _pairs[pair].name);
+          regalloc_dry_run_cost += (pair == PAIR_IY ? 2 : 1);
         }
       else
         {
-          emit2 ("ld hl,!hashedstr", sym->rname);
-          regalloc_dry_run_cost += 3;
+          pair = getPairId (AOP (IC_RESULT (ic)));
+          if (pair == PAIR_INVALID)
+            {
+              pair = PAIR_HL;
+              spillPair (PAIR_HL);
+            }
+          emit2 ("ld %s,!hashedstr", _pairs[pair].name, sym->rname);
+          regalloc_dry_run_cost += (pair == PAIR_IY ? 4 : 3);
         }
-      commitPair (AOP (IC_RESULT (ic)), PAIR_HL);
+      commitPair (AOP (IC_RESULT (ic)), pair, ic, FALSE);
     }
   freeAsmop (IC_RESULT (ic), NULL, ic);
 }
@@ -8803,7 +9428,7 @@
 /* genAssign - generate code for assignment                        */
 /*-----------------------------------------------------------------*/
 static void
-genAssign (const iCode *ic)
+genAssign (const iCode * ic)
 {
   operand *result, *right;
   int size, offset;
@@ -8845,35 +9470,73 @@
     {
       fetchPairLong (getPairId (AOP (result)), AOP (right), ic, LSB);
     }
+  else if (isPair (AOP (right)) && AOP_TYPE (result) == AOP_IY && size == 2)
+    {
+      /* Assigning directly is cheaper than using IY. */
+      emit2 ("ld (%s), %s", AOP (result)->aopu.aop_dir, getPairName (AOP (right)));
+      regalloc_dry_run_cost += (getPairId (AOP (right)) == PAIR_HL) ? 3 : 4;
+    }
+  else if (size == 2 && isPairDead (PAIR_HL, ic) &&
+    (!IS_GB && AOP_TYPE (right) == AOP_STK && AOP_TYPE (result) == AOP_IY ||
+    IS_RAB && (AOP_TYPE(result) == AOP_STK || AOP_TYPE(result) == AOP_EXSTK) && (AOP_TYPE(right) == AOP_LIT || AOP_TYPE (right) == AOP_IMMD)))
+    {
+      fetchPair (PAIR_HL, AOP (right));
+      commitPair (AOP (result), PAIR_HL, ic, FALSE);
+    }
+  else if (size == 2 && getPairId (AOP (right)) != PAIR_INVALID && getPairId (AOP (right)) != PAIR_IY && AOP_TYPE (result) != AOP_REG)
+    {
+      commitPair (AOP (result), getPairId (AOP (right)), ic, TRUE);
+    }
   else if (getPairId (AOP (right)) == PAIR_IY)
     {
       while (size--)
         {
-          if(size == 0)
+          if (size == 0)
             {
               emit2 ("push iy");
               emit2 ("dec sp");
               emit2 ("pop af");
               emit2 ("inc sp");
               regalloc_dry_run_cost += 5;
-              cheapMove (AOP (result), size, ASMOP_A , 0);
+              if (AOP_TYPE (result) == AOP_IY)  /* Take care not to overwrite iy */
+                {
+                  emit2 ("ld (%s+%d), a", AOP (result)->aopu.aop_dir, size);
+                  regalloc_dry_run_cost += 3;
+                }
+              else
+                cheapMove (AOP (result), size, ASMOP_A, 0);
             }
-          else if(size == 1)
+          else if (size == 1)
             {
-              emit2 ("push iy");
-              emit2 ("pop af");
-              regalloc_dry_run_cost += 3;
-              cheapMove (AOP (result), size, ASMOP_A , 0);
+              if (AOP_TYPE (result) == AOP_IY)  /* Take care not to overwrite iy */
+                {
+                  emit2 ("ld (%s), iy", AOP (result)->aopu.aop_dir);
+                  regalloc_dry_run_cost += 4;
+                  size--;
+                }
+              else
+                {
+                  emit2 ("push iy");
+                  emit2 ("pop af");
+                  regalloc_dry_run_cost += 3;
+                  cheapMove (AOP (result), size, ASMOP_A, 0);
+                }
             }
           else
-            cheapMove (AOP (result), size, ASMOP_ZERO, 0);
+            {
+              if (AOP_TYPE (result) == AOP_IY)  /* Take care not to overwrite iy */
+                {
+                  cheapMove (ASMOP_A, 0, ASMOP_ZERO, 0);
+                  emit2 ("ld (%s+%d), a", AOP (result)->aopu.aop_dir, size);
+                  regalloc_dry_run_cost += 3;
+                }
+              else
+                cheapMove (AOP (result), size, ASMOP_ZERO, 0);
+            }
         }
     }
   else if ((size > 1) &&
-           (AOP_TYPE (result) != AOP_REG) &&
-           (AOP_TYPE (right) == AOP_LIT) &&
-           !IS_FLOAT (operandType (right)) &&
-           (lit < 256L))
+           (AOP_TYPE (result) != AOP_REG) && (AOP_TYPE (right) == AOP_LIT) && !IS_FLOAT (operandType (right)) && (lit < 256L))
     {
       bool fXored = FALSE;
       offset = 0;
@@ -8896,7 +9559,7 @@
           offset++;
         }
     }
-  else if (size == 2 && requiresHL (AOP (right)) && requiresHL (AOP (result)) && (IS_GB /*|| IY_RESERVED*/))
+  else if (size == 2 && requiresHL (AOP (right)) && requiresHL (AOP (result)) && isPairDead (PAIR_DE, ic) && (IS_GB /*|| IY_RESERVED */ ))
     {
       /* Special case.  Load into a and d, then load out. */
       cheapMove (ASMOP_A, 0, AOP (right), 0);
@@ -8904,7 +9567,7 @@
       cheapMove (AOP (result), 0, ASMOP_A, 0);
       cheapMove (AOP (result), 1, ASMOP_E, 0);
     }
-  else if (size == 4 && requiresHL (AOP (right)) && requiresHL (AOP (result)) && (IS_GB /*|| IY_RESERVED*/))
+  else if (size == 4 && requiresHL (AOP (right)) && requiresHL (AOP (result)) && isPairDead (PAIR_DE, ic) && (IS_GB /*|| IY_RESERVED */ ))
     {
       /* Special case - simple memcpy */
       if (!regalloc_dry_run)
@@ -8914,7 +9577,7 @@
           emit2 ("ld e,l");
           aopGet (AOP (result), LSB, FALSE);
         }
-      regalloc_dry_run_cost += 8;	// Todo: More exact cost here!
+      regalloc_dry_run_cost += 8;       // Todo: More exact cost here!
 
       while (size--)
         {
@@ -8933,45 +9596,142 @@
     }
   else
     {
+      if (!IS_GB &&             /* gbz80 doesn't have ldir */
+          (AOP_TYPE (result) == AOP_STK || AOP_TYPE (result) == AOP_EXSTK || AOP_TYPE (result) == AOP_DIR
+           || AOP_TYPE (result) == AOP_IY) && (AOP_TYPE (right) == AOP_STK || AOP_TYPE (right) == AOP_EXSTK
+               || AOP_TYPE (right) == AOP_DIR || AOP_TYPE (right) == AOP_IY) && size >= 2)
+        {
+          /* This estimation is only accurate, if neither operand is AOP_EXSTK, and we are optimizing for code size or targeting the z80 or z180. */
+          int sizecost_n, sizecost_l, cyclecost_n, cyclecost_l;
+          const bool hl_alive = !isPairDead (PAIR_HL, ic);
+          const bool de_alive = !isPairDead (PAIR_DE, ic);
+          const bool bc_alive = !isPairDead (PAIR_BC, ic);
+          bool l_better;
+          sizecost_n = 6 * size;
+          sizecost_l = 13 + hl_alive * 2 + de_alive * 2 + bc_alive * 2 - (AOP_TYPE (right) == AOP_DIR
+                       || AOP_TYPE (right) == AOP_IY) - (AOP_TYPE (result) ==
+                           AOP_DIR
+                           || AOP_TYPE (result)
+                           == AOP_IY) * 2;
+          if (IS_Z180)
+            cyclecost_n = 30 * size;
+          else                  /* Z80 */
+            cyclecost_n = 38 * size;
+          if (IS_Z180)
+            cyclecost_l = 14 * size + 42 + hl_alive * 22 + de_alive * 22 + bc_alive * 22 - (AOP_TYPE (right) == AOP_DIR
+                          || AOP_TYPE (right) ==
+                          AOP_IY) * 7 - (AOP_TYPE (result) ==
+                                         AOP_DIR
+                                         || AOP_TYPE (result)
+                                         == AOP_IY) * 10;
+          else                  /* Z80 */
+            cyclecost_l = 21 * size + 51 + hl_alive * 20 + de_alive * 20 + bc_alive * 20 - (AOP_TYPE (right) == AOP_DIR
+                          || AOP_TYPE (right) ==
+                          AOP_IY) * 11 - (AOP_TYPE (result) ==
+                                          AOP_DIR
+                                          || AOP_TYPE (result)
+                                          == AOP_IY) * 15;
+
+          if (optimize.codeSize)
+            l_better = (sizecost_l < sizecost_n || sizecost_l == sizecost_n && cyclecost_l < cyclecost_n);
+          else
+            l_better = (cyclecost_l < cyclecost_n || cyclecost_l == cyclecost_n && sizecost_l < sizecost_n);
+          if (l_better)
+            {
+              if (hl_alive)
+                _push (PAIR_HL);
+              if (de_alive)
+                _push (PAIR_DE);
+              if (bc_alive)
+                _push (PAIR_BC);
+
+              if (AOP_TYPE (result) == AOP_STK || AOP_TYPE (result) == AOP_EXSTK)
+                {
+                  int fp_offset =
+                    AOP (result)->aopu.aop_stk + offset + _G.stack.offset + (AOP (result)->aopu.aop_stk >
+                        0 ? _G.stack.param_offset : 0);
+                  int sp_offset = fp_offset + _G.stack.pushed;
+                  emit2 ("ld hl, #%d", sp_offset);
+                  emit2 ("add hl, sp");
+                  emit2 ("ex de, hl");
+                  regalloc_dry_run_cost += 5;
+                }
+              else
+                {
+                  emit2 ("ld de, #%s", AOP (IC_RESULT (ic))->aopu.aop_dir);
+                  regalloc_dry_run_cost += 3;
+                }
+
+              if (AOP_TYPE (right) == AOP_STK || AOP_TYPE (right) == AOP_EXSTK)
+                {
+                  int fp_offset =
+                    AOP (right)->aopu.aop_stk + offset + _G.stack.offset + (AOP (right)->aopu.aop_stk >
+                        0 ? _G.stack.param_offset : 0);
+                  int sp_offset = fp_offset + _G.stack.pushed;
+                  emit2 ("ld hl, #%d", sp_offset);
+                  emit2 ("add hl, sp");
+                  regalloc_dry_run_cost += 4;
+                }
+              else
+                {
+                  emit2 ("ld hl, #%s", AOP (IC_RIGHT (ic))->aopu.aop_dir);
+                  regalloc_dry_run_cost += 3;
+                }
+
+              emit2 ("ld bc, #%d", size);
+              emit2 ("ldir");
+              regalloc_dry_run_cost += 5;
+
+              if (bc_alive)
+                _pop (PAIR_BC);
+              if (de_alive)
+                _pop (PAIR_DE);
+              if (hl_alive)
+                _pop (PAIR_HL);
+
+              goto release;
+            }
+        }
       if (AOP_TYPE (result) == AOP_REG && AOP_TYPE (right) == AOP_REG)
         {
           // We need to be able to handle any assignment here, ensuring not to overwrite any parts of the source that we still need.
-        
-          bool assigned[8] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE};	// This has to be made bigger when sdcc supports variables larger than 8 bytes in registers.
+
+          bool assigned[8] = { FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE };        // This has to be made bigger when sdcc supports variables larger than 8 bytes in registers.
           int cached_byte = -1;
 
           while (size--)
             {
               int i;
-              
+
               // Find lowest byte that can be assigned and needs to be assigned.
               for (i = 0; i < AOP_SIZE (result); i++)
                 {
                   int j;
-                  
+
                   if (assigned[i])
                     continue;
-                    
+
                   for (j = 0; j < (AOP_SIZE (result) < AOP_SIZE (right) ? AOP_SIZE (result) : AOP_SIZE (right)); j++)
                     {
                       if (!assigned[j] && i != j && AOP (result)->aopu.aop_reg[i]->rIdx == AOP (right)->aopu.aop_reg[j]->rIdx)
                         goto skip_byte; // We can't write this one without overwriting the source.
                     }
-                  
-                  break; // Found byte that can be written safely.
-                  
-                  skip_byte:;
+
+                  break;        // Found byte that can be written safely.
+
+skip_byte:
+                  ;
                 }
 
               if (i < AOP_SIZE (result))
                 {
-                  cheapMove (AOP (result), i, AOP(right), i); // We can safely assign a byte.
+                  cheapMove (AOP (result), i, AOP (right), i);  // We can safely assign a byte.
                   assigned[i] = TRUE;
                   continue;
                 }
-              
+
               // No byte can be assigned safely (i.e. the assignment is a permutation). Cache one in the accumulator.
- 
+
               if (cached_byte != -1)
                 {
                   // Already one cached. Can happen when the assignment is a permutation consisting of multiple cycles.
@@ -8979,16 +9739,16 @@
                   cached_byte = -1;
                   continue;
                 }
-              
+
               for (i = 0; i < AOP_SIZE (result); i++)
                 if (!assigned[i])
                   break;
-              wassertl (i != AOP_SIZE (result), "genAssign error: Trying to cache non-existant byte in accumulator."); 
+              wassertl (i != AOP_SIZE (result), "genAssign error: Trying to cache non-existant byte in accumulator.");
               cheapMove (ASMOP_A, 0, AOP (right), i);
               assigned[i] = TRUE;
               cached_byte = i;
             }
-           
+
           if (cached_byte != -1)
             cheapMove (AOP (result), cached_byte, ASMOP_A, 0);
         }
@@ -9019,57 +9779,58 @@
 /* genJumpTab - genrates code for jump table                       */
 /*-----------------------------------------------------------------*/
 static void
-genJumpTab (const iCode *ic)
+genJumpTab (const iCode * ic)
 {
   symbol *jtab = NULL;
 
   aopOp (IC_JTCOND (ic), ic, FALSE, FALSE);
   /* get the condition into accumulator */
-  if (!IS_GB && !isPairDead(PAIR_DE, ic))
+  if (!IS_GB && !isPairDead (PAIR_DE, ic))
     _push (PAIR_DE);
   cheapMove (ASMOP_E, 0, AOP (IC_JTCOND (ic)), 0);
-  if(!regalloc_dry_run)
+  if (!regalloc_dry_run)
     {
       emit2 ("ld d,!zero");
       jtab = newiTempLabel (NULL);
     }
   regalloc_dry_run_cost += 2;
   spillPair (PAIR_HL);
-  if(!regalloc_dry_run)
+  if (!regalloc_dry_run)
     {
-      emit2 ("ld hl,!immed!tlabel", jtab->key + 100);
+      emit2 ("ld hl,!immed!tlabel", labelKey2num (jtab->key));
       emit2 ("add hl,de");
       emit2 ("add hl,de");
       emit2 ("add hl,de");
     }
   regalloc_dry_run_cost += 5;
   freeAsmop (IC_JTCOND (ic), NULL, ic);
-  if (!IS_GB && !isPairDead(PAIR_DE, ic))
+  if (!IS_GB && !isPairDead (PAIR_DE, ic))
     _pop (PAIR_DE);
-  if(!regalloc_dry_run)
+  if (!regalloc_dry_run)
     {
       emit2 ("jp !*hl");
-      emitLabel (jtab->key + 100);
+      emitLabelSpill (jtab);
     }
   regalloc_dry_run_cost += 1;
   /* now generate the jump labels */
-  for (jtab = setFirstItem (IC_JTLABELS (ic)); jtab;
-       jtab = setNextItem (IC_JTLABELS (ic)))
-    if(!regalloc_dry_run)
-      emit2 ("jp !tlabel", jtab->key + 100);
-    /*regalloc_dry_run_cost += 3 doesn't matter and might overflow cost*/
+  for (jtab = setFirstItem (IC_JTLABELS (ic)); jtab; jtab = setNextItem (IC_JTLABELS (ic)))
+    if (!regalloc_dry_run)
+      emit2 ("jp !tlabel", labelKey2num (jtab->key));
+  /*regalloc_dry_run_cost += 3 doesn't matter and might overflow cost */
 }
 
 /*-----------------------------------------------------------------*/
 /* genCast - gen code for casting                                  */
 /*-----------------------------------------------------------------*/
 static void
-genCast (const iCode *ic)
+genCast (const iCode * ic)
 {
   operand *result = IC_RESULT (ic);
   sym_link *rtype = operandType (IC_RIGHT (ic));
   operand *right = IC_RIGHT (ic);
   int size, offset;
+  bool surviving_a = !options.oldralloc && bitVectBitValue (ic->rSurv, A_IDX);
+  bool pushed_a = FALSE;
 
   /* if they are equivalent then do nothing */
   if (operandsEqu (IC_RESULT (ic), IC_RIGHT (ic)))
@@ -9085,7 +9846,7 @@
     }
 
   /* casting to bool */
-  if (IS_BOOL(operandType(result)))
+  if (IS_BOOL (operandType (result)))
     {
       _castBoolean (right);
       outAcc (result);
@@ -9113,13 +9874,15 @@
   /* now depending on the sign of the destination */
   size = AOP_SIZE (result) - AOP_SIZE (right);
   /* Unsigned or not an integral type - right fill with zeros */
-  if (!IS_SPEC (rtype) || SPEC_USIGN (rtype) || AOP_TYPE(right)==AOP_CRY)
+  if (!IS_SPEC (rtype) || SPEC_USIGN (rtype) || AOP_TYPE (right) == AOP_CRY)
     {
       while (size--)
         aopPut3 (AOP (result), offset++, ASMOP_ZERO, 0);
     }
   else
     {
+      if (surviving_a && !pushed_a)
+        _push (PAIR_AF), pushed_a = TRUE;
       /* we need to extend the sign :{ */
       cheapMove (ASMOP_A, 0, AOP (right), AOP_SIZE (right) - 1);
       emit3 (A_RLA, 0, 0);
@@ -9129,6 +9892,8 @@
     }
 
 release:
+  if (pushed_a)
+    _pop (PAIR_AF);
   freeAsmop (right, NULL, ic);
   freeAsmop (result, NULL, ic);
 }
@@ -9137,27 +9902,26 @@
 /* genReceive - generate code for a receive iCode                  */
 /*-----------------------------------------------------------------*/
 static void
-genReceive (const iCode *ic)
+genReceive (const iCode * ic)
 {
-  wassert(!regalloc_dry_run);
+  wassert (!regalloc_dry_run);
 
-  if (isOperandInFarSpace (IC_RESULT (ic)) &&
-      (OP_SYMBOL (IC_RESULT (ic))->isspilt ||
-       IS_TRUE_SYMOP (IC_RESULT (ic))))
+  if (isOperandInFarSpace (IC_RESULT (ic)) && (OP_SYMBOL (IC_RESULT (ic))->isspilt || IS_TRUE_SYMOP (IC_RESULT (ic))))
     {
       wassert (0);
     }
   else
     {
-        // PENDING: HACK
-        int size;
-        int i;
+      // PENDING: HACK
+      int size;
+      int i;
 
-        aopOp (IC_RESULT (ic), ic, FALSE, FALSE);
-        size = AOP_SIZE(IC_RESULT(ic));
+      aopOp (IC_RESULT (ic), ic, FALSE, FALSE);
+      size = AOP_SIZE (IC_RESULT (ic));
 
-        for (i = 0; i < size; i++) {
-            aopPut(AOP(IC_RESULT(ic)), _fReceive[_G.receiveOffset++], i);
+      for (i = 0; i < size; i++)
+        {
+          aopPut (AOP (IC_RESULT (ic)), _fReceive[_G.receiveOffset++], i);
         }
     }
 
@@ -9168,7 +9932,7 @@
 /* genDummyRead - generate code for dummy read of volatiles        */
 /*-----------------------------------------------------------------*/
 static void
-genDummyRead (const iCode *ic)
+genDummyRead (const iCode * ic)
 {
   operand *op;
   int size, offset;
@@ -9214,11 +9978,11 @@
 /* genCritical - generate code for start of a critical sequence    */
 /*-----------------------------------------------------------------*/
 static void
-genCritical (const iCode *ic)
+genCritical (const iCode * ic)
 {
   symbol *tlbl = regalloc_dry_run ? 0 : newiTempLabel (0);
 
-  if (IS_GB || IS_R2K)
+  if (IS_GB || IS_RAB)
     {
       emit2 ("!di");
       regalloc_dry_run_cost += 1;
@@ -9227,22 +9991,22 @@
     {
       aopOp (IC_RESULT (ic), ic, TRUE, FALSE);
       aopPut3 (AOP (IC_RESULT (ic)), 0, ASMOP_ZERO, 0);
-      if(!regalloc_dry_run)
+      if (!regalloc_dry_run)
         {
           //get interrupt enable flag IFF2 into P/O
           emit2 ("ld a,i");
-	  
+
           //disable interrupt
           emit2 ("!di");
           //parity odd <==> P/O=0 <==> interrupt enable flag IFF2=0
-          emit2 ("jp PO,!tlabel", tlbl->key + 100);
+          emit2 ("jp PO,!tlabel", labelKey2num (tlbl->key));
         }
       regalloc_dry_run_cost += 5;
       aopPut3 (AOP (IC_RESULT (ic)), 0, ASMOP_ONE, 0);
-      if(!regalloc_dry_run_cost)
+      if (!regalloc_dry_run)
         {
-          emit2 ("!tlabeldef", (tlbl->key + 100));
-          _G.lines.current->isLabel = 1;
+          emit2 ("!tlabeldef", labelKey2num ((tlbl->key)));
+          genLine.lineCurr->isLabel = 1;
         }
       freeAsmop (IC_RESULT (ic), NULL, ic);
     }
@@ -9250,12 +10014,15 @@
     {
       //get interrupt enable flag IFF2 into P/O
       emit2 ("ld a,i");
-      
+
       //disable interrupt
       emit2 ("!di");
       regalloc_dry_run_cost += 2;
       //save P/O flag
-      _push (PAIR_AF);
+      if (!regalloc_dry_run)    // _push unbalances _G.stack.pushed.
+        _push (PAIR_AF);
+      else
+        regalloc_dry_run_cost++;
     }
 }
 
@@ -9263,7 +10030,7 @@
 /* genEndCritical - generate code for end of a critical sequence   */
 /*-----------------------------------------------------------------*/
 static void
-genEndCritical (const iCode *ic)
+genEndCritical (const iCode * ic)
 {
   symbol *tlbl = regalloc_dry_run ? 0 : newiTempLabel (0);
 
@@ -9272,7 +10039,7 @@
       emit2 ("!ei");
       regalloc_dry_run_cost += 1;
     }
-  else if (IS_R2K)
+  else if (IS_RAB)
     {
       emit2 ("ipres");
       regalloc_dry_run_cost += 1;
@@ -9281,13 +10048,13 @@
     {
       aopOp (IC_RIGHT (ic), ic, FALSE, TRUE);
       _toBoolean (IC_RIGHT (ic), TRUE);
-      
-      if(!regalloc_dry_run)
+
+      if (!regalloc_dry_run)
         {
           //don't enable interrupts if they were off before
-          emit2 ("jp Z,!tlabel", tlbl->key + 100);
+          emit2 ("jp Z,!tlabel", labelKey2num (tlbl->key));
           emit2 ("!ei");
-          emitLabel (tlbl->key + 100);
+          emitLabelSpill (tlbl);
         }
       regalloc_dry_run_cost += 4;
       freeAsmop (IC_RIGHT (ic), NULL, ic);
@@ -9295,26 +10062,29 @@
   else
     {
       //restore P/O flag
-      _pop (PAIR_AF);
+      if (!regalloc_dry_run)    // _pop unbalances _G.stack.pushed.
+        _pop (PAIR_AF);
+      else
+        regalloc_dry_run_cost++;
       //parity odd <==> P/O=0 <==> interrupt enable flag IFF2 was 0 <==>
       //don't enable interrupts as they were off before
-      if(!regalloc_dry_run)
+      if (!regalloc_dry_run)
         {
-          emit2 ("jp PO,!tlabel", tlbl->key + 100);
+          emit2 ("jp PO,!tlabel", labelKey2num (tlbl->key));
           emit2 ("!ei");
-          emit2 ("!tlabeldef", (tlbl->key + 100));
-          _G.lines.current->isLabel = 1;
+          emit2 ("!tlabeldef", labelKey2num ((tlbl->key)));
+          genLine.lineCurr->isLabel = 1;
         }
       regalloc_dry_run_cost += 4;
     }
 }
 
-#if 0 //Disabled since it doesn't work for arrays of float.
+#if 0                           //Disabled since it doesn't work for arrays of float.
 enum
-  {
-    /** Maximum number of bytes to emit per line. */
-    DBEMIT_MAX_RUN = 8
-  };
+{
+  /** Maximum number of bytes to emit per line. */
+  DBEMIT_MAX_RUN = 8
+};
 
 /** Context for the byte output chunker. */
 typedef struct
@@ -9328,20 +10098,20 @@
     reseting.
 */
 static void
-_dbFlush(DBEMITCTX *self)
+_dbFlush (DBEMITCTX * self)
 {
   char line[256];
 
   if (self->pos > 0)
     {
       int i;
-      sprintf(line, ".db 0x%02X", self->buffer[0]);
+      sprintf (line, ".db 0x%02X", self->buffer[0]);
 
       for (i = 1; i < self->pos; i++)
         {
-          sprintf(line + strlen(line), ", 0x%02X", self->buffer[i]);
+          sprintf (line + strlen (line), ", 0x%02X", self->buffer[i]);
         }
-      emit2(line);
+      emit2 (line);
     }
   self->pos = 0;
 }
@@ -9350,11 +10120,11 @@
     generated.
 */
 static void
-_dbEmit(DBEMITCTX *self, int c)
+_dbEmit (DBEMITCTX * self, int c)
 {
   if (self->pos == DBEMIT_MAX_RUN)
     {
-      _dbFlush(self);
+      _dbFlush (self);
     }
   self->buffer[self->pos++] = c;
 }
@@ -9370,30 +10140,30 @@
 } RLECTX;
 
 enum
-  {
-    RLE_CHANGE_COST = 4,
-    RLE_MAX_BLOCK = 127
-  };
+{
+  RLE_CHANGE_COST = 4,
+  RLE_MAX_BLOCK = 127
+};
 
 /** Flush the buffer of a run length encoder by writing out the run or
     data that it currently contains.
 */
 static void
-_rleCommit(RLECTX *self)
+_rleCommit (RLECTX * self)
 {
   int i;
   if (self->pos != 0)
     {
       DBEMITCTX db;
-      memset(&db, 0, sizeof(db));
+      memset (&db, 0, sizeof (db));
 
-      emit2(".db %u", self->pos);
+      emit2 (".db %u", self->pos);
 
       for (i = 0; i < self->pos; i++)
         {
-          _dbEmit(&db, self->buffer[i]);
+          _dbEmit (&db, self->buffer[i]);
         }
-      _dbFlush(&db);
+      _dbFlush (&db);
     }
   /* Reset */
   self->pos = 0;
@@ -9420,7 +10190,7 @@
     chunks.
 */
 static void
-_rleAppend(RLECTX *self, unsigned c)
+_rleAppend (RLECTX * self, unsigned c)
 {
   int i;
 
@@ -9429,13 +10199,13 @@
       /* The run has stopped.  See if it is worthwhile writing it out
          as a run.  Note that the random data comes in as runs of
          length one.
-      */
+       */
       if (self->runLen > RLE_CHANGE_COST)
         {
           /* Yes, worthwhile. */
           /* Commit whatever was in the buffer. */
-          _rleCommit(self);
-          emit2("!db !immed-%u,!immedbyte", self->runLen, self->last);
+          _rleCommit (self);
+          emit2 ("!db !immed-%u,!immedbyte", self->runLen, self->last);
         }
       else
         {
@@ -9445,7 +10215,7 @@
               if (self->pos >= RLE_MAX_BLOCK)
                 {
                   /* Commit. */
-                  _rleCommit(self);
+                  _rleCommit (self);
                 }
               self->buffer[self->pos++] = self->last;
             }
@@ -9458,7 +10228,7 @@
       if (self->runLen >= RLE_MAX_BLOCK)
         {
           /* Commit whatever was in the buffer. */
-          _rleCommit(self);
+          _rleCommit (self);
 
           emit2 ("!db !immed-%u,!immedbyte", self->runLen, self->last);
           self->runLen = 0;
@@ -9468,10 +10238,10 @@
 }
 
 static void
-_rleFlush(RLECTX *self)
+_rleFlush (RLECTX * self)
 {
-  _rleAppend(self, -1);
-  _rleCommit(self);
+  _rleAppend (self, -1);
+  _rleCommit (self);
   self->pos = 0;
   self->last = 0;
   self->runLen = 0;
@@ -9485,32 +10255,32 @@
 genArrayInit (iCode * ic)
 {
   literalList *iLoop;
-  int         ix;
-  int         elementSize = 0, eIndex, i;
-  unsigned    val, lastVal;
-  sym_link    *type;
-  RLECTX      rle;
+  int ix;
+  int elementSize = 0, eIndex, i;
+  unsigned val, lastVal;
+  sym_link *type;
+  RLECTX rle;
 
-  memset(&rle, 0, sizeof(rle));
+  memset (&rle, 0, sizeof (rle));
 
-  aopOp (IC_LEFT(ic), ic, FALSE, FALSE);
+  aopOp (IC_LEFT (ic), ic, FALSE, FALSE);
 
-  _saveRegsForCall(ic, 0);
+  _saveRegsForCall (ic, 0);
 
   fetchPair (PAIR_HL, AOP (IC_LEFT (ic)));
   emit2 ("call __initrleblock");
 
-  type = operandType(IC_LEFT(ic));
+  type = operandType (IC_LEFT (ic));
 
   if (type && type->next)
     {
-      if (IS_SPEC(type->next) || IS_PTR(type->next))
+      if (IS_SPEC (type->next) || IS_PTR (type->next))
         {
-          elementSize = getSize(type->next);
+          elementSize = getSize (type->next);
         }
-      else if (IS_ARRAY(type->next) && type->next->next)
+      else if (IS_ARRAY (type->next) && type->next->next)
         {
-          elementSize = getSize(type->next->next);
+          elementSize = getSize (type->next->next);
         }
       else
         {
@@ -9525,14 +10295,14 @@
 
   wassertl ((elementSize > 0) && (elementSize <= 4), "Illegal element size in genArrayInit.");
 
-  iLoop = IC_ARRAYILIST(ic);
-  lastVal = (unsigned)-1;
+  iLoop = IC_ARRAYILIST (ic);
+  lastVal = (unsigned) - 1;
 
   /* Feed all the bytes into the run length encoder which will handle
      the actual output.
      This works well for mixed char data, and for random int and long
      data.
-  */
+   */
   while (iLoop)
     {
       ix = iLoop->count;
@@ -9541,23 +10311,23 @@
         {
           for (eIndex = 0; eIndex < elementSize; eIndex++)
             {
-              val = (((int)iLoop->literalValue) >> (eIndex * 8)) & 0xff;
-              _rleAppend(&rle, val);
+              val = (((int) iLoop->literalValue) >> (eIndex * 8)) & 0xff;
+              _rleAppend (&rle, val);
             }
         }
 
       iLoop = iLoop->next;
     }
 
-  _rleFlush(&rle);
+  _rleFlush (&rle);
   /* Mark the end of the run. */
-  emit2(".db 0");
+  emit2 (".db 0");
 
-  _restoreRegsAfterCall();
+  _restoreRegsAfterCall ();
 
   spillCached ();
 
-  freeAsmop (IC_LEFT(ic), NULL, ic);
+  freeAsmop (IC_LEFT (ic), NULL, ic);
 }
 #endif
 
@@ -9582,10 +10352,11 @@
 #endif
 
 static int
-setupForMemcpy (const iCode *ic, int nparams, operand **pparams)
+setupForMemcpy (const iCode * ic, int nparams, operand ** pparams)
 {
   PAIR_ID ids[NUM_PAIRS][NUM_PAIRS];
-  PAIR_ID dest[3] = {
+  PAIR_ID dest[3] =
+  {
     PAIR_DE, PAIR_HL, PAIR_BC
   };
 
@@ -9594,7 +10365,7 @@
   int nunity = 0;
 #endif
 
-  bool skip[3] = {FALSE, FALSE, FALSE};
+  bool skip[3] = { FALSE, FALSE, FALSE };
   short dstregs[4];
   short srcregs[4];
   size_t regparamsize = 0;
@@ -9606,7 +10377,7 @@
 
   for (i = 0; i < nparams; i++)
     {
-      aopOp (pparams[i], ic, FALSE, FALSE);	// Todo: Free these.
+      aopOp (pparams[i], ic, FALSE, FALSE);     // Todo: Free these.
       ids[dest[i]][getPairId (AOP (pparams[i]))] = TRUE;
     }
 
@@ -9617,24 +10388,24 @@
     return (0);
 
 #ifndef UNITY
-  if(AOP_TYPE (pparams[0]) == AOP_REG)
-  {
-    srcregs[regparamsize] = AOP (pparams[0])->aopu.aop_reg[0]->rIdx;
-    dstregs[regparamsize++] = E_IDX;
-    srcregs[regparamsize] = AOP (pparams[0])->aopu.aop_reg[1]->rIdx;
-    dstregs[regparamsize++] = D_IDX;
-    skip[0] = TRUE;
-  }
-  if(AOP_TYPE (pparams[1]) == AOP_REG)
-  {
-    srcregs[regparamsize] = AOP (pparams[1])->aopu.aop_reg[0]->rIdx;
-    dstregs[regparamsize++] = L_IDX;
-    srcregs[regparamsize] = AOP (pparams[1])->aopu.aop_reg[1]->rIdx;
-    dstregs[regparamsize++] = H_IDX;
-    skip[1] = TRUE;
-  }
+  if (AOP_TYPE (pparams[0]) == AOP_REG)
+    {
+      srcregs[regparamsize] = AOP (pparams[0])->aopu.aop_reg[0]->rIdx;
+      dstregs[regparamsize++] = E_IDX;
+      srcregs[regparamsize] = AOP (pparams[0])->aopu.aop_reg[1]->rIdx;
+      dstregs[regparamsize++] = D_IDX;
+      skip[0] = TRUE;
+    }
+  if (AOP_TYPE (pparams[1]) == AOP_REG)
+    {
+      srcregs[regparamsize] = AOP (pparams[1])->aopu.aop_reg[0]->rIdx;
+      dstregs[regparamsize++] = L_IDX;
+      srcregs[regparamsize] = AOP (pparams[1])->aopu.aop_reg[1]->rIdx;
+      dstregs[regparamsize++] = H_IDX;
+      skip[1] = TRUE;
+    }
 
-  if(regparamsize)
+  if (regparamsize)
     regMove (dstregs, srcregs, regparamsize);
 
   for (i = 0; i < 3; i++)
@@ -9644,7 +10415,7 @@
     }
 
   return (1);
-#else 
+#else
   /* Count the number of unity or iTemp assigns. */
   for (i = 0; i < 3; i++)
     {
@@ -9677,7 +10448,7 @@
                     }
                   else
                     {
-                      fetchPair(dest[i], AOP (pparams[i]));
+                      fetchPair (dest[i], AOP (pparams[i]));
                       goto done;
                     }
                 }
@@ -9704,11 +10475,11 @@
                   else
                     {
                       /* Found one. */
-                      if(ids[j][dest[i]] == TRUE)
+                      if (ids[j][dest[i]] == TRUE)
                         {
                           /* Just swap. */
-                           _swap (j, dest[i]);
-                           goto done;
+                          _swap (j, dest[i]);
+                          goto done;
                         }
                       else
                         {
@@ -9723,19 +10494,19 @@
                 }
             }
         }
-        if(dest_pairs[0] != src_pairs[1])
-          {
-            fetchPair (dest_pairs[0], AOP (pparams[i_pairs[0]]));
-            fetchPair (dest_pairs[1], AOP (pparams[i_pairs[1]]));
-          }
-        else
-          {
-            fetchPair (dest_pairs[1], AOP (pparams[i_pairs[1]]));
-            fetchPair (dest_pairs[0], AOP (pparams[i_pairs[0]]));
-          }
+      if (dest_pairs[0] != src_pairs[1])
+        {
+          fetchPair (dest_pairs[0], AOP (pparams[i_pairs[0]]));
+          fetchPair (dest_pairs[1], AOP (pparams[i_pairs[1]]));
+        }
+      else
+        {
+          fetchPair (dest_pairs[1], AOP (pparams[i_pairs[1]]));
+          fetchPair (dest_pairs[0], AOP (pparams[i_pairs[0]]));
+        }
     }
 
- done:
+done:
   /* Finally pull out all of the iTemps */
   for (i = 0; i < 3; i++)
     {
@@ -9750,7 +10521,7 @@
 }
 
 static void
-genBuiltInMemcpy (const iCode *ic, int nParams, operand **pparams)
+genBuiltInMemcpy (const iCode * ic, int nParams, operand ** pparams)
 {
   operand *from, *to, *count;
 
@@ -9779,10 +10550,12 @@
 }
 
 static void
-genBuiltInMemset (const iCode *ic, int nParams, operand **pparams)
+genBuiltInMemset (const iCode * ic, int nParams, operand ** pparams)
 {
   operand *dst, *c, *n;
   bool direct_c;
+  bool indirect_c;
+  bool preinc = FALSE;
 
   wassertl (nParams == 3, "Built-in memset() must have three parameters");
 
@@ -9800,23 +10573,39 @@
   if (!(ulFromVal (AOP (n)->aopu.aop_lit)))
     goto done;
 
-  direct_c = (AOP_TYPE (c) == AOP_LIT || AOP_TYPE (c) == AOP_REG && AOP (c)->aopu.aop_reg[1]->rIdx != H_IDX && AOP (c)->aopu.aop_reg[1]->rIdx != L_IDX);
+  direct_c = (AOP_TYPE (c) == AOP_LIT || AOP_TYPE (c) == AOP_REG && AOP (c)->aopu.aop_reg[1]->rIdx != H_IDX
+              && AOP (c)->aopu.aop_reg[1]->rIdx != L_IDX);
+  indirect_c = IS_R3KA && ulFromVal (AOP (n)->aopu.aop_lit) > 1 && AOP_TYPE (c) == AOP_IY;
 
-  if (!direct_c)
-    cheapMove(ASMOP_A, 0, AOP (c), 0);
-  fetchPair (PAIR_HL, AOP (dst));
-  if (!regalloc_dry_run)
-    emit2 ( "ld (hl), %s", aopGet(direct_c ? AOP (c) : ASMOP_A, 0, FALSE));
-  regalloc_dry_run_cost += (direct_c && AOP_TYPE (c) == AOP_LIT) ? 2 : 1;
-  if (ulFromVal (AOP (n)->aopu.aop_lit) <= 1)
-    goto done;
+  if (indirect_c)
+    {
+      fetchPair (PAIR_DE, AOP (dst));
+      emit2 ("ld hl, #%s", AOP (c)->aopu.aop_dir);
+      regalloc_dry_run_cost += 3;
+    }
+  else
+    {
+      if (!direct_c)
+        cheapMove (ASMOP_A, 0, AOP (c), 0);
+      fetchPair (PAIR_HL, AOP (dst));
+      if (!regalloc_dry_run)
+        emit2 ("ld (hl), %s", aopGet (direct_c ? AOP (c) : ASMOP_A, 0, FALSE));
+      regalloc_dry_run_cost += (direct_c && AOP_TYPE (c) == AOP_LIT) ? 2 : 1;
+      if (ulFromVal (AOP (n)->aopu.aop_lit) <= 1)
+        goto done;
 
-  emit2 ("ld e, l");
-  emit2 ("ld d, h");
-  emit2 ("inc de");
-  regalloc_dry_run_cost += 3;
-  emit2 ("ld bc, #%d", ulFromVal (AOP (n)->aopu.aop_lit) - 1);
-  emit2 ("ldir");
+      emit2 ("ld e, l");
+      emit2 ("ld d, h");
+      regalloc_dry_run_cost += 2;
+      if (!IS_R3KA || !optimize.codeSize)
+        {
+          emit2 ("inc de");
+          regalloc_dry_run_cost++;
+          preinc = TRUE;
+        }
+    }
+  emit2 ("ld bc, !immedword", ulFromVal (AOP (n)->aopu.aop_lit) - preinc);
+  emit2 (IS_R3KA ? "lsidr" : "ldir");
   regalloc_dry_run_cost += 5;
 
 done:
@@ -9828,7 +10617,7 @@
 
   _restoreRegsAfterCall ();
 
-  /* No need to assign result - would have used ordinary memcpy() call instead. */
+  /* No need to assign result - would have used ordinary memset() call instead. */
 }
 
 /*-----------------------------------------------------------------*/
@@ -9836,40 +10625,40 @@
 /* for a built in function                                         */
 /*-----------------------------------------------------------------*/
 static void
-genBuiltIn (iCode *ic)
+genBuiltIn (iCode * ic)
 {
-    operand *bi_parms[MAX_BUILTIN_ARGS];
-    int nbi_parms;
-    iCode *bi_iCode;
-    symbol *bif;
+  operand *bi_parms[MAX_BUILTIN_ARGS];
+  int nbi_parms;
+  iCode *bi_iCode;
+  symbol *bif;
 
-    /* get all the arguments for a built in function */
-    bi_iCode = getBuiltinParms(ic, &nbi_parms, bi_parms);
+  /* get all the arguments for a built in function */
+  bi_iCode = getBuiltinParms (ic, &nbi_parms, bi_parms);
 
-    /* which function is it */
-    bif = OP_SYMBOL(IC_LEFT(bi_iCode));
+  /* which function is it */
+  bif = OP_SYMBOL (IC_LEFT (bi_iCode));
 
-    if (!strcmp(bif->name, "__builtin_memcpy"))
-      {
-        genBuiltInMemcpy(bi_iCode, nbi_parms, bi_parms);
-      }
-    else if (!strcmp(bif->name, "__builtin_memset"))
-      {
-        genBuiltInMemset(bi_iCode, nbi_parms, bi_parms);
-      }
-    else
-      {
-        wassertl (0, "Unknown builtin function encountered");
-      }
+  if (!strcmp (bif->name, "__builtin_memcpy"))
+    {
+      genBuiltInMemcpy (bi_iCode, nbi_parms, bi_parms);
+    }
+  else if (!strcmp (bif->name, "__builtin_memset"))
+    {
+      genBuiltInMemset (bi_iCode, nbi_parms, bi_parms);
+    }
+  else
+    {
+      wassertl (0, "Unknown builtin function encountered");
+    }
 }
 
 /*-------------------------------------------------------------------------------------*/
 /* genZ80Code - generate code for Z80 based controllers for a single iCode instruction */
 /*-------------------------------------------------------------------------------------*/
 static void
-genZ80iCode (iCode *ic)
+genZ80iCode (iCode * ic)
 {
-  _G.current_iCode = ic;
+  genLine.lineElement.ic = ic;
 
   /* if the result is marked as
      spilt and rematerializable or code for
@@ -9908,9 +10697,7 @@
          be using some of the registers being popped which
          would destroy the contents of the register so
          we need to check for this condition and handle it */
-      if (ic->next &&
-          ic->next->op == IFX &&
-          regsInCommon (IC_LEFT (ic), IC_COND (ic->next)))
+      if (ic->next && ic->next->op == IFX && regsInCommon (IC_LEFT (ic), IC_COND (ic->next)))
         {
           emitDebug ("; genIfx");
           genIfx (ic->next, ic);
@@ -9998,8 +10785,7 @@
 
       /* note these two are xlated by algebraic equivalence
          during parsing SDCC.y */
-      werror (E_INTERNAL_ERROR, __FILE__, __LINE__,
-              "got '>=' or '<=' shouldn't have come here");
+      werror (E_INTERNAL_ERROR, __FILE__, __LINE__, "got '>=' or '<=' shouldn't have come here");
       break;
 
     case EQ_OP:
@@ -10115,9 +10901,9 @@
       if (ic->builtinSEND)
         {
           emitDebug ("; genBuiltIn");
-          genBuiltIn(ic);
+          genBuiltIn (ic);
         }
-      else if(!regalloc_dry_run)
+      else if (!regalloc_dry_run)
         {
           emitDebug ("; addSet");
           addSet (&_G.sendSet, ic);
@@ -10127,7 +10913,7 @@
 #if 0
     case ARRAYINIT:
       emitDebug ("; genArrayInit");
-      genArrayInit(ic);
+      genArrayInit (ic);
       break;
 #endif
 
@@ -10152,7 +10938,7 @@
 }
 
 unsigned char
-dryZ80iCode (iCode *ic)
+dryZ80iCode (iCode * ic)
 {
   regalloc_dry_run = TRUE;
   regalloc_dry_run_cost = 0;
@@ -10168,21 +10954,22 @@
       _fReturn = _z80_return;
       _fTmp = _z80_return;
     }
-    
-  _G.lines.head = _G.lines.current = NULL;
-  
-  genZ80iCode(ic);
-  
-  freeTrace(&_G.lines.trace);
-  freeTrace(&_G.trace.aops);
+
+  initGenLineElement ();
+  _G.omitFramePtr = should_omit_frame_ptr;
+
+  genZ80iCode (ic);
+
+  destroy_line_list ();
+  freeTrace (&_G.trace.aops);
 
   {
     int pairId;
-    for(pairId = 0; pairId < NUM_PAIRS; pairId++)
+    for (pairId = 0; pairId < NUM_PAIRS; pairId++)
       spillPair (pairId);
   }
 
-  return(regalloc_dry_run_cost);
+  return (regalloc_dry_run_cost);
 }
 
 #ifdef DEBUG_DRY_COST
@@ -10192,8 +10979,8 @@
   iCode *ic;
 
   for (ic = lic; ic; ic = ic->next)
-    if(ic->op != FUNCTION && ic->op != ENDFUNCTION && ic->op != LABEL && ic->op != GOTO && ic->op != INLINEASM)
-      printf("; iCode %d total cost: %d\n", ic->key, (int)(dryZ80iCode (ic)));
+    if (ic->op != FUNCTION && ic->op != ENDFUNCTION && ic->op != LABEL && ic->op != GOTO && ic->op != INLINEASM)
+      printf ("; iCode %d total cost: %d\n", ic->key, (int) (dryZ80iCode (ic)));
 }
 #endif
 
@@ -10201,10 +10988,10 @@
 /* genZ80Code - generate code for Z80 based controllers for a block of intructions     */
 /*-------------------------------------------------------------------------------------*/
 void
-genZ80Code (iCode *lic)
+genZ80Code (iCode * lic)
 {
 #ifdef DEBUG_DRY_COST
-  dryZ80Code(lic);
+  dryZ80Code (lic);
 #endif
 
   iCode *ic;
@@ -10223,7 +11010,7 @@
       _fTmp = _z80_return;
     }
 
-  _G.lines.head = _G.lines.current = NULL;
+  initGenLineElement ();
 
   /* if debug information required */
   if (options.debug && currFunc)
@@ -10240,27 +11027,27 @@
       if (ic->lineno && cln != ic->lineno)
         {
           if (options.debug)
-           debugFile->writeCLine (ic);
+            debugFile->writeCLine (ic);
           if (!options.noCcodeInAsm)
-            emit2 (";%s:%d: %s", ic->filename, ic->lineno, printCLine(ic->filename, ic->lineno));
+            emit2 (";%s:%d: %s", ic->filename, ic->lineno, printCLine (ic->filename, ic->lineno));
           cln = ic->lineno;
         }
       if (options.iCodeInAsm)
         {
-          const char *iLine = printILine(ic);
+          const char *iLine = printILine (ic);
           emit2 (";ic:%d: %s", ic->key, iLine);
-          dbuf_free(iLine);
+          dbuf_free (iLine);
         }
       regalloc_dry_run_cost = 0;
       genZ80iCode (ic);
-      //emitDebug("; iCode %d total cost: %d", ic->key, (int)(regalloc_dry_run_cost));
+      /*emitDebug("; iCode %d total cost: %d", ic->key, (int)(regalloc_dry_run_cost)); */
     }
 
 
   /* now we are ready to call the
      peep hole optimizer */
   if (!options.nopeep)
-    peepHole (&_G.lines.head);
+    peepHole (&genLine.lineHead);
 
   /* This is unfortunate */
   /* now do the actual printing */
@@ -10268,7 +11055,7 @@
     struct dbuf_s *buf = codeOutBuf;
     if (isInHome () && codeOutBuf == &code->oBuf)
       codeOutBuf = &home->oBuf;
-    printLine (_G.lines.head, codeOutBuf);
+    printLine (genLine.lineHead, codeOutBuf);
     if (_G.flushStatics)
       {
         flushStatics ();
@@ -10279,32 +11066,10 @@
 
   {
     int pairId;
-    for(pairId = 0; pairId < NUM_PAIRS; pairId++)
+    for (pairId = 0; pairId < NUM_PAIRS; pairId++)
       spillPair (pairId);
   }
 
-  freeTrace(&_G.lines.trace);
-  freeTrace(&_G.trace.aops);
+  destroy_line_list ();
+  freeTrace (&_G.trace.aops);
 }
-
-/*
-  Attic
-static int
-_isPairUsed (iCode * ic, PAIR_ID pairId)
-{
-  int ret = 0;
-  switch (pairId)
-    {
-    case PAIR_DE:
-      if (bitVectBitValue (ic->rMask, D_IDX))
-        ret++;
-      if (bitVectBitValue (ic->rMask, E_IDX))
-        ret++;
-      break;
-    default:
-      wassert (0);
-    }
-  return ret;
-}
-*/
-
diff -Nru sdcc-3.1.0+dfsg/src/z80/gen.h sdcc-3.2.0+dfsg/src/z80/gen.h
--- sdcc-3.1.0+dfsg/src/z80/gen.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/z80/gen.h	2012-04-05 14:43:44.000000000 +0000
@@ -16,10 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-   
-   In other words, you are welcome to use, share and improve this program.
-   You are forbidden to forbid anyone else to use, share and improve
-   what you give them.   Help stamp out software-hoarding!  
 -------------------------------------------------------------------------*/
 
 #ifndef Z80GEN_H
@@ -93,6 +89,8 @@
 void genZ80Code (iCode *);
 void z80_emitDebuggerSymbol (const char *);
 
-extern bool assignment_optimal;
+extern bool z80_assignment_optimal;
+extern bool should_omit_frame_ptr;
 
 #endif
+
diff -Nru sdcc-3.1.0+dfsg/src/z80/main.c sdcc-3.2.0+dfsg/src/z80/main.c
--- sdcc-3.1.0+dfsg/src/z80/main.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/z80/main.c	2012-06-08 12:57:12.000000000 +0000
@@ -38,8 +38,6 @@
 #define OPTION_ASM             "--asm="
 #define OPTION_NO_STD_CRT0     "--no-std-crt0"
 #define OPTION_RESERVE_IY      "--reserve-regs-iy"
-#define OPTION_DUMP_GRAPHS     "--dump-graphs"
-#define OPTION_MAX_ALLOCS_NODE "--max-allocs-per-node"
 #define OPTION_OLDRALLOC       "--oldralloc"
 
 static char _z80_defaultRules[] = {
@@ -67,9 +65,7 @@
   {0, OPTION_CONST_SEG,       &options.const_seg, "<name> use this name for the const segment", CLAT_STRING},
   {0, OPTION_NO_STD_CRT0,     &options.no_std_crt0, "For the z80/gbz80 do not link default crt0.rel"},
   {0, OPTION_RESERVE_IY,      &z80_opts.reserveIY, "Do not use IY (incompatible with --fomit-frame-pointer)"},
-  {0, OPTION_MAX_ALLOCS_NODE, &options.max_allocs_per_node, "Maximum number of register assignments considered at each node of the tree decomposition", CLAT_INTEGER},
-  {0, OPTION_DUMP_GRAPHS,     &z80_opts.dump_graphs, "Dump control flow graph, conflict graph and tree decomposition in register allocator"},
-  {0, OPTION_OLDRALLOC,       &z80_opts.oldralloc, "Use old register allocator"},
+  {0, OPTION_OLDRALLOC,       &options.oldralloc, "Use old register allocator"},
   {0, NULL}
 };
 
@@ -80,8 +76,6 @@
   {0, OPTION_CODE_SEG,        &options.code_seg, "<name> use this name for the code segment", CLAT_STRING},
   {0, OPTION_CONST_SEG,       &options.const_seg, "<name> use this name for the const segment", CLAT_STRING},
   {0, OPTION_NO_STD_CRT0,     &options.no_std_crt0, "For the z80/gbz80 do not link default crt0.rel"},
-  {0, OPTION_MAX_ALLOCS_NODE, &options.max_allocs_per_node, "Maximum number of register assignments considered at each node of the tree decomposition", CLAT_INTEGER},
-  {0, OPTION_DUMP_GRAPHS, &z80_opts.dump_graphs, "Dump control flow graph, conflict graph and tree decomposition in register allocator"},
   {0, NULL}
 };
 
@@ -148,6 +142,13 @@
 }
 
 static void
+_r3ka_init (void)
+{
+  z80_opts.sub = SUB_R3KA;
+  asm_addTree (&_asxxxx_r2k);
+}
+
+static void
 _gbz80_init (void)
 {
   z80_opts.sub = SUB_GBZ80;
@@ -596,8 +597,9 @@
   setMainValue ("z80bases", dbuf_c_str (&dbuf));
   dbuf_destroy (&dbuf);
 
-  if ((IS_Z80 || IS_Z180) && options.omitFramePtr)
-    z80_port.stack.call_overhead = 2;
+  /* For the old register allocator (with the new one we decide to omit the frame pointer for each function individually) */
+  if (!IS_GB && options.omitFramePtr)
+    port->stack.call_overhead = 2;
 }
 
 static void
@@ -626,14 +628,6 @@
 
   options.data_loc = IS_GB ? 0xC000 : 0x8000;
   options.out_fmt = 'i';        /* Default output format is ihx */
-  optimize.global_cse = 1;
-  optimize.label1 = 1;
-  optimize.label2 = 1;
-  optimize.label3 = 1;
-  optimize.label4 = 1;
-  optimize.loopInvariant = 1;
-  optimize.loopInduction = 1;
-  z80_opts.dump_graphs = 0;
 }
 
 /* Mangling format:
@@ -661,6 +655,9 @@
 {
   struct dbuf_s dbuf;
 
+  if (strstr (original, "longlong"))
+    return (original);
+
   dbuf_init (&dbuf, 128);
   dbuf_printf (&dbuf, "%s_rr%s_%s", original, options.profile ? "f" : "x", options.noRegParams ? "s" : "bds"    /* MB: but the library only has hds variants ??? */
     );
@@ -683,7 +680,6 @@
 _hasNativeMulFor (iCode * ic, sym_link * left, sym_link * right)
 {
   sym_link *test = NULL;
-  value *val;
   int result_size = IS_SYMOP(IC_RESULT(ic)) ? getSize(OP_SYM_TYPE(IC_RESULT(ic))) : 4;
 
   if (ic->op != '*')
@@ -692,15 +688,9 @@
     }
 
   if (IS_LITERAL (left))
-    {
-      test = left;
-      val = OP_VALUE (IC_LEFT (ic));
-    }
+    test = left;
   else if (IS_LITERAL (right))
-    {
-      test = right;
-      val = OP_VALUE (IC_RIGHT (ic));
-    }
+    test = right;
   /* 8x8 unsigned multiplication code is shorter than
      call overhead for the multiplication routine. */
   else if (IS_CHAR (right) && IS_UNSIGNED (right) && IS_CHAR (left) && IS_UNSIGNED (left) && !IS_GB)
@@ -783,6 +773,7 @@
 static const char *const _libs_z80[] = { "z80", NULL, };
 static const char *const _libs_z180[] = { "z180", NULL, };
 static const char *const _libs_r2k[] = { "r2k", NULL, };
+static const char *const _libs_r3ka[] = { "r3ka", NULL, };
 static const char *const _libs_gb[] = { "gbz80", NULL, };
 
 /* Globals */
@@ -801,8 +792,8 @@
   {                             /* Assembler */
    _z80AsmCmd,
    NULL,
-   "-plosgffwzc",               /* Options with debug */
-   "-plosgffwz",                /* Options without debug */
+   "-plosgffwc",                /* Options with debug */
+   "-plosgffw",                 /* Options without debug */
    0,
    ".asm"},
   {                             /* Linker */
@@ -834,20 +825,20 @@
    "STACK",
    "CODE",
    "DATA",
-   "ISEG",
+   NULL,                        /* idata */
    NULL,                        /* pdata */
-   "XSEG",
-   "BSEG",
+   NULL,                        /* xdata */
+   NULL,                        /* bit */
    "RSEG (ABS)",
    "GSINIT",
-   "OVERLAY",
+   NULL,                        /* overlay */
    "GSFINAL",
    "HOME",
    NULL,                        /* xidata */
    NULL,                        /* xinit */
    NULL,                        /* const_name */
-   "CABS",                      /* cabs_name */
-   NULL,                        /* xabs_name */
+   "CABS (ABS)",                /* cabs_name */
+   "DABS (ABS)",                /* xabs_name */
    NULL,                        /* iabs_name */
    NULL,
    NULL,
@@ -925,8 +916,8 @@
   {                             /* Assembler */
    _z80AsmCmd,
    NULL,
-   "-plosgffwzc",               /* Options with debug */
-   "-plosgffwz",                /* Options without debug */
+   "-plosgffwc",                /* Options with debug */
+   "-plosgffw",                 /* Options without debug */
    0,
    ".asm"},
   {                             /* Linker */
@@ -958,20 +949,20 @@
    "STACK",
    "CODE",
    "DATA",
-   "ISEG",
+   NULL,                        /* idata */
    NULL,                        /* pdata */
-   "XSEG",
-   "BSEG",
+   NULL,                        /* xdata */
+   NULL,                        /* bit */
    "RSEG (ABS)",
    "GSINIT",
-   "OVERLAY",
+   NULL,                        /* overlay */
    "GSFINAL",
    "HOME",
    NULL,                        /* xidata */
    NULL,                        /* xinit */
    NULL,                        /* const_name */
-   "CABS",                      /* cabs_name */
-   NULL,                        /* xabs_name */
+   "CABS (ABS)",                /* cabs_name */
+   "DABS (ABS)",                /* xabs_name */
    NULL,                        /* iabs_name */
    NULL,
    NULL,
@@ -1034,12 +1025,11 @@
   PORT_MAGIC
 };
 
-/* Globals */
-PORT gbz80_port = {
-  TARGET_ID_GBZ80,
-  "gbz80",
-  "Gameboy Z80-like",           /* Target name */
-  NULL,
+PORT r2k_port = {
+  TARGET_ID_R2K,
+  "r2k",
+  "Rabbit 2000",                  /* Target name */
+  NULL,                         /* Processor name */
   {
    glue,
    FALSE,
@@ -1048,31 +1038,30 @@
    NULL,                        /* model == target */
    },
   {                             /* Assembler */
-   _gbAsmCmd,
+   _r2kAsmCmd,
    NULL,
-   "-plosgffwzc",               /* Options with debug */
-   "-plosgffwz",                /* Options without debug */
+   "-plosgffwc",                /* Options with debug */
+   "-plosgffw",                 /* Options without debug */
    0,
-   ".asm",
-   NULL                         /* no do_assemble function */
-   },
+   ".asm"},
   {                             /* Linker */
-   _gbLinkCmd,                  //NULL,
+   _z80LinkCmd,                 //NULL,
    NULL,                        //LINKCMD,
    NULL,
    ".rel",
    1,
    _crt,                        /* crt */
-   _libs_gb,                    /* libs */
+   _libs_r2k,                   /* libs */
    },
   {                             /* Peephole optimizer */
-   _gbz80_defaultRules,
-   0,
-   0,
-   0,
+   _r2k_defaultRules,
+   z80instructionSize,
    0,
    0,
    0,
+   z80notUsed,
+   z80canAssign,
+   z80notUsedFrom,
    },
   {
    /* Sizes: char, short, int, long, long long, ptr, fptr, gptr, bit, float, max */
@@ -1084,29 +1073,29 @@
    "STACK",
    "CODE",
    "DATA",
-   "ISEG",
+   NULL,                        /* idata */
    NULL,                        /* pdata */
-   "XSEG",
-   "BSEG",
-   "RSEG",
+   NULL,                        /* xdata */
+   NULL,                        /* bit */
+   "RSEG (ABS)",
    "GSINIT",
-   "OVERLAY",
+   NULL,                        /* overlay */
    "GSFINAL",
    "HOME",
    NULL,                        /* xidata */
    NULL,                        /* xinit */
    NULL,                        /* const_name */
-   "CABS",                      /* cabs_name */
-   NULL,                        /* xabs_name */
+   "CABS (ABS)",                /* cabs_name */
+   "DABS (ABS)",                /* xabs_name */
    NULL,                        /* iabs_name */
    NULL,
    NULL,
-   1                            /* CODE is read-only */
+   1                            /* CODE  is read-only */
    },
   {NULL, NULL},
   {
-   -1, 0, 0, 2, 0, 4},
-  /* gbZ80 has no native mul/div commands */
+   -1, 0, 0, 4, 0, 2},
+  /* Z80 has no native mul/div commands */
   {
    0, 2},
   {
@@ -1122,9 +1111,9 @@
    3,                           /* sizeofDispatch */
    },
   "_",
-  _gbz80_init,
+  _r2k_init,
   _parseOptions,
-  _gbz80_options,
+  _z80_options,
   NULL,
   _finaliseOptions,
   _setDefaultOptions,
@@ -1153,19 +1142,17 @@
   0,                            /* leave == */
   FALSE,                        /* Array initializer support. */
   0,                            /* no CSE cost estimation yet */
-  NULL,                         /* no builtin functions */
+  _z80_builtins,                /* builtin functions */
   GPOINTER,                     /* treat unqualified pointers as "generic" pointers */
   1,                            /* reset labelKey to 1 */
   1,                            /* globals & local static allowed */
   PORT_MAGIC
 };
 
-
-
-PORT r2k_port = {
-  TARGET_ID_R2K,
-  "r2k",
-  "Rabbit 2000",                  /* Target name */
+PORT r3ka_port = {
+  TARGET_ID_R3KA,
+  "r3ka",
+  "Rabbit 3000A",               /* Target name */
   NULL,                         /* Processor name */
   {
    glue,
@@ -1177,8 +1164,8 @@
   {                             /* Assembler */
    _r2kAsmCmd,
    NULL,
-   "-plosgffwzc",               /* Options with debug */
-   "-plosgffwz",                /* Options without debug */
+   "-plosgffwc",                /* Options with debug */
+   "-plosgffw",                 /* Options without debug */
    0,
    ".asm"},
   {                             /* Linker */
@@ -1188,7 +1175,7 @@
    ".rel",
    1,
    _crt,                        /* crt */
-   _libs_r2k,                   /* libs */
+   _libs_r3ka,                  /* libs */
    },
   {                             /* Peephole optimizer */
    _r2k_defaultRules,
@@ -1210,20 +1197,20 @@
    "STACK",
    "CODE",
    "DATA",
-   "ISEG",
+   NULL,                        /* idata */
    NULL,                        /* pdata */
-   "XSEG",
-   "BSEG",
+   NULL,                        /* xdata */
+   NULL,                        /* bit */
    "RSEG (ABS)",
    "GSINIT",
-   "OVERLAY",
+   NULL,                        /* overlay */
    "GSFINAL",
    "HOME",
    NULL,                        /* xidata */
    NULL,                        /* xinit */
    NULL,                        /* const_name */
-   "CABS",                      /* cabs_name */
-   NULL,                        /* xabs_name */
+   "CABS (ABS)",                /* cabs_name */
+   "DABS (ABS)",                /* xabs_name */
    NULL,                        /* iabs_name */
    NULL,
    NULL,
@@ -1248,7 +1235,7 @@
    3,                           /* sizeofDispatch */
    },
   "_",
-  _r2k_init,
+  _r3ka_init,
   _parseOptions,
   _z80_options,
   NULL,
@@ -1285,3 +1272,130 @@
   1,                            /* globals & local static allowed */
   PORT_MAGIC
 };
+
+/* Globals */
+PORT gbz80_port = {
+  TARGET_ID_GBZ80,
+  "gbz80",
+  "Gameboy Z80-like",           /* Target name */
+  NULL,
+  {
+   glue,
+   FALSE,
+   NO_MODEL,
+   NO_MODEL,
+   NULL,                        /* model == target */
+   },
+  {                             /* Assembler */
+   _gbAsmCmd,
+   NULL,
+   "-plosgffwc",                /* Options with debug */
+   "-plosgffw",                 /* Options without debug */
+   0,
+   ".asm",
+   NULL                         /* no do_assemble function */
+   },
+  {                             /* Linker */
+   _gbLinkCmd,                  //NULL,
+   NULL,                        //LINKCMD,
+   NULL,
+   ".rel",
+   1,
+   _crt,                        /* crt */
+   _libs_gb,                    /* libs */
+   },
+  {                             /* Peephole optimizer */
+   _gbz80_defaultRules,
+   0,
+   0,
+   0,
+   0,
+   0,
+   0,
+   },
+  {
+   /* Sizes: char, short, int, long, long long, ptr, fptr, gptr, bit, float, max */
+   1, 2, 2, 4, 8, 2, 2, 2, 1, 4, 4},
+  /* tags for generic pointers */
+  {0x00, 0x40, 0x60, 0x80},     /* far, near, xstack, code */
+  {
+   "XSEG",
+   "STACK",
+   "CODE",
+   "DATA",
+   NULL,                        /* idata */
+   NULL,                        /* pdata */
+   NULL,                        /* xdata */
+   NULL,                        /* bit */
+   "RSEG",
+   "GSINIT",
+   NULL,                        /* overlay */
+   "GSFINAL",
+   "HOME",
+   NULL,                        /* xidata */
+   NULL,                        /* xinit */
+   NULL,                        /* const_name */
+   "CABS (ABS)",                /* cabs_name */
+   "DABS (ABS)",                /* xabs_name */
+   NULL,                        /* iabs_name */
+   NULL,
+   NULL,
+   1                            /* CODE is read-only */
+   },
+  {NULL, NULL},
+  {
+   -1, 0, 0, 2, 0, 4},
+  /* gbZ80 has no native mul/div commands */
+  {
+   0, 2},
+  {
+   z80_emitDebuggerSymbol},
+  {
+   255,                         /* maxCount */
+   3,                           /* sizeofElement */
+   /* The rest of these costs are bogus. They approximate */
+   /* the behavior of src/SDCCicode.c 1.207 and earlier.  */
+   {4, 4, 4},                   /* sizeofMatchJump[] */
+   {0, 0, 0},                   /* sizeofRangeCompare[] */
+   0,                           /* sizeofSubtract */
+   3,                           /* sizeofDispatch */
+   },
+  "_",
+  _gbz80_init,
+  _parseOptions,
+  _gbz80_options,
+  NULL,
+  _finaliseOptions,
+  _setDefaultOptions,
+  z80_assignRegisters,
+  _getRegName,
+  _keywords,
+  0,                            /* no assembler preamble */
+  NULL,                         /* no genAssemblerEnd */
+  0,                            /* no local IVT generation code */
+  0,                            /* no genXINIT code */
+  NULL,                         /* genInitStartup */
+  _reset_regparm,
+  _reg_parm,
+  _process_pragma,
+  _mangleSupportFunctionName,
+  _hasNativeMulFor,
+  hasExtBitOp,                  /* hasExtBitOp */
+  oclsExpense,                  /* oclsExpense */
+  TRUE,
+  TRUE,                         /* little endian */
+  0,                            /* leave lt */
+  0,                            /* leave gt */
+  1,                            /* transform <= to ! > */
+  1,                            /* transform >= to ! < */
+  1,                            /* transform != to !(a == b) */
+  0,                            /* leave == */
+  FALSE,                        /* Array initializer support. */
+  0,                            /* no CSE cost estimation yet */
+  NULL,                         /* no builtin functions */
+  GPOINTER,                     /* treat unqualified pointers as "generic" pointers */
+  1,                            /* reset labelKey to 1 */
+  1,                            /* globals & local static allowed */
+  PORT_MAGIC
+};
+
diff -Nru sdcc-3.1.0+dfsg/src/z80/mappings.i sdcc-3.2.0+dfsg/src/z80/mappings.i
--- sdcc-3.1.0+dfsg/src/z80/mappings.i	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/z80/mappings.i	2012-02-19 14:22:39.000000000 +0000
@@ -11,11 +11,11 @@
     /*{ "ldahli", "ldi\ta,(hl)" }, use when assembler update is complete*/
     {"ldahli", "ld\ta,(hl)\ninc\thl"},
     { "ldahlsp", "ldhl\tsp,#%d" },
-    { "ldaspsp", "lda sp,%d(sp)" },
+    { "ldaspsp", "add sp, #%d" },
     { "*pair", "(%s)" },
     { "enter", "" },
     { "enterx", 
-      "lda sp,-%d(sp)" },
+      "add sp, #-%d" },
     { "enterxl",
                 "ld hl,#-%d\n"
                 "add\thl,sp\n"
@@ -23,7 +23,7 @@
     },
     { "leave", ""
     },
-    { "leavex", "lda sp,%d(sp)"
+    { "leavex", "add\tsp,#%d"
     },
     { "leavexl",
                 "ld hl,#%d\n"
diff -Nru sdcc-3.1.0+dfsg/src/z80/peep.c sdcc-3.2.0+dfsg/src/z80/peep.c
--- sdcc-3.1.0+dfsg/src/z80/peep.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/z80/peep.c	2012-06-29 07:51:14.000000000 +0000
@@ -243,11 +243,7 @@
     ISINST(pl->line, "sub\t") ||
     ISINST(pl->line, "xor\t"))
     {
-      if(argCont(pl->line + 4, what))
-        return TRUE;
-      if(strstr(pl->line + 4, "hl") == 0 && strcmp("a", what) == 0)
-        return TRUE;
-      return FALSE;
+      return(argCont(pl->line + 4, what));
     }
 
   if(ISINST(pl->line, "or\t") || ISINST(pl->line, "cp\t") )
@@ -691,18 +687,33 @@
 {
   const char *op1start, *op2start;
 
-  op1start = strchr(pl->line, '\t');
-  if(op1start)
+  /* move to the first operand:
+   * leading spaces are already removed, skip the mnenonic */
+  for (op1start = pl->line; *op1start && !isspace (*op1start); ++op1start);
+
+  /* skip the spaces between mnemonic and the operand */
+  while (isspace (*op1start))
+    ++op1start;
+  if ('\0' == *op1start)
+    op1start = NULL;
+
+  if (op1start)
     {
-      op1start++;
+      /* move to the second operand:
+       * find the comma and skip the following spaces */
       op2start = strchr(op1start, ',');
-      if(op2start)
-        do
-          op2start++;
-      while(op2start && (*op2start == ' ' || *op2start == '\t'));
+      if (op2start)
+        {
+          do
+            ++op2start;
+          while (isspace (*op2start));
+
+          if ('\0' == *op2start)
+            op2start = NULL;
+        }
     }
   else
-    op2start = 0;
+    op2start = NULL;
 
   /* All ld instructions */
   if(ISINST(pl->line, "ld\t"))
@@ -717,9 +728,9 @@
          strncmp(op2start, "hl", 2) && strncmp(op2start, "a", 2))
         return(4);
 
-      if(IS_R2K && !strncmp(op1start, "hl", 2) && (argCont(op2start, "(hl)") || argCont(op2start, "(iy)")))
+      if(IS_RAB && !strncmp(op1start, "hl", 2) && (argCont(op2start, "(hl)") || argCont(op2start, "(iy)")))
         return(4);
-      if(IS_R2K && !strncmp(op1start, "hl", 2) && (argCont(op2start, "(sp)") || argCont(op2start, "(ix)")))
+      if(IS_RAB && !strncmp(op1start, "hl", 2) && (argCont(op2start, "(sp)") || argCont(op2start, "(ix)")))
         return(3);
 
       /* These 4 are the only remaining cases of 3 byte long ld instructions. */
@@ -730,7 +741,7 @@
       if((op1start[0] == '(' && strncmp(op1start, "(bc)", 4) && strncmp(op1start, "(de)", 4) && strncmp(op1start, "(hl)", 4)) ||
          (op2start[0] == '(' && strncmp(op1start, "(bc)", 4) && strncmp(op1start, "(de)", 4) && strncmp(op1start, "(hl)", 4)))
         return(3);
-      if((op1start[1] == 'c' || op1start[1] == 'd' || op1start[1] == 'l' || op1start[1] == 'p') && op2start[0] == '#')
+      if((op1start[1] == 'c' || op1start[1] == 'e' || op1start[1] == 'l' || op1start[1] == 'p') && op2start[0] == '#')
         return(3);
 
       /* These 3 are the only remaining cases of 2 byte long ld instructions. */
@@ -755,7 +766,7 @@
           fprintf(stderr, "Warning: z80instructionSize() failed to parse line node %s\n", pl->line);
           return(4);
         }
-      if(argCont(op1start, "(sp)") && (IS_R2K || !strncmp(op2start, "ix", 2) || !strncmp(op2start, "iy", 2)))
+      if(argCont(op1start, "(sp)") && (IS_RAB || !strncmp(op2start, "ix", 2) || !strncmp(op2start, "iy", 2)))
         return(2);
       return(1);
     }
@@ -769,7 +780,7 @@
     }
 
   /* 16 bit add / subtract / and */
-  if((ISINST(pl->line, "add") || ISINST(pl->line, "adc") || ISINST(pl->line, "sbc") || IS_R2K && ISINST(pl->line, "and")) && !strncmp(op1start, "hl", 2))
+  if((ISINST(pl->line, "add") || ISINST(pl->line, "adc") || ISINST(pl->line, "sbc") || IS_RAB && ISINST(pl->line, "and")) && !strncmp(op1start, "hl", 2))
     {
       if(ISINST(pl->line, "add") || ISINST(pl->line, "and"))
         return(1);
@@ -778,9 +789,10 @@
   if(ISINST(pl->line, "add") && (!strncmp(op1start, "ix", 2) || !strncmp(op1start, "iy", 2)))
     return(2);
 
-  if(IS_R2K && ISINST(pl->line, "add") && !strncmp(op1start, "sp", 2))
+  /* signed 8 bit adjustment to stack pointer */
+  if( (IS_RAB) && ISINST(pl->line, "add") && !strncmp(op1start, "sp", 2))
     return(2);
-
+  
   /* 8 bit arithmetic, two operands */
   if(op2start &&  op1start[0] == 'a' && (ISINST(pl->line, "add") || ISINST(pl->line, "adc") || ISINST(pl->line, "sub") || ISINST(pl->line, "sbc") || ISINST(pl->line, "cp") || ISINST(pl->line, "and") || ISINST(pl->line, "or") || ISINST(pl->line, "xor")))
     {
@@ -834,7 +846,7 @@
       return(3);
     }
 
-  if (TARGET_IS_R2K &&
+  if (IS_RAB &&
       (ISINST(pl->line, "ipset3") || ISINST(pl->line, "ipset2") ||
        ISINST(pl->line, "ipset1") || ISINST(pl->line, "ipset0") ||
        ISINST(pl->line, "ipres")))
@@ -869,10 +881,24 @@
 
   if(IS_Z180 && ISINST(pl->line, "mlt"))
     return(2);
-
-  if(IS_R2K && ISINST(pl->line, "mul"))
+  
+  if(IS_RAB && ISINST(pl->line, "mul"))
     return(1);
 
+  if(ISINST(pl->line, "lddr") || ISINST(pl->line, "ldir"))
+    return(2);
+
+  if(IS_R3KA &&
+    (ISINST(pl->line, "lddsr") || ISINST(pl->line, "ldisr") ||
+    ISINST(pl->line, "lsdr") || ISINST(pl->line, "lsir") || ISINST(pl->line, "lsddr") || ISINST(pl->line, "lsidr")))
+    return(2);
+  
+  if(IS_R3KA && (ISINST(pl->line, "uma") || ISINST(pl->line, "ums")))
+    return(2);
+
+  if(IS_RAB && ISINST(pl->line, "bool"))
+    return(!strncmp(op1start, "hl", 2) ? 1 : 2);
+  
   if(ISINST(pl->line, ".db"))
     {
       int i, j;
@@ -884,4 +910,3 @@
 
   return(4);
 }
-
diff -Nru sdcc-3.1.0+dfsg/src/z80/peeph-gbz80.def sdcc-3.2.0+dfsg/src/z80/peeph-gbz80.def
--- sdcc-3.1.0+dfsg/src/z80/peeph-gbz80.def	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/z80/peeph-gbz80.def	2012-05-24 14:44:37.000000000 +0000
@@ -33,7 +33,7 @@
 %1:
 } by {
 	jp	C,%2
-	; peephole 3 removed jp by using inverse jump logic
+	; peephole 60 removed jp by using inverse jump logic
 %1:
 } if labelRefCountChange(%1 -1)
 
@@ -43,7 +43,7 @@
 %1:
 } by {
 	jp	NC,%2
-	; peephole 4 removed jp by using inverse jump logic
+	; peephole 61 removed jp by using inverse jump logic
 %1:
 } if labelRefCountChange(%1 -1)
 
@@ -53,7 +53,7 @@
 %1:
 } by {
 	jp	Z,%2
-	; peephole 5 removed jp by using inverse jump logic
+	; peephole 62 removed jp by using inverse jump logic
 %1:
 } if labelRefCountChange(%1 -1)
 
@@ -63,7 +63,7 @@
 %1:
 } by {
 	jp	NZ,%2
-	; peephole 6 removed jp by using inverse jump logic
+	; peephole 63 removed jp by using inverse jump logic
 %1:
 } if labelRefCountChange(%1 -1)
 
@@ -71,28 +71,69 @@
 	jp	%5
 } by {
 	jp	%6
-	; peephole 7 redirected jump-to-jump at %5 by jump to %6
+	; peephole 64 jumped to %6 directly instead of via %5.
 } if labelIsUncondJump(), notSame(%5 %6), labelRefCountChange(%5 -1), labelRefCountChange(%6 +1)
 
 replace restart {
 	jp	%1,%5
 } by {
 	jp	%1,%6
-	; peephole 8 redirected jump-to-jump at %5 by jump to %6
+	; peephole 65 jumped to %6 directly instead of via %5.
 } if labelIsUncondJump(), notSame(%5 %6), labelRefCountChange(%5 -1), labelRefCountChange(%6 +1)
 
+// A peephole that makes the code longer. Let's hope it's worth it in speed gain and furhter optimization potential.
 replace restart {
-	ld	%2,%3
+	ld	a,#0x00
+%1:
+	bit	%2,a
+	jp	Z,%3
+} by {
+	ld	a,#0x00
+	jp	%3
+	; peephole 65a jumped directly to %3 instead of testing a first.
+%1:
+	bit	%2,a
+	jp	Z,%3
+} if labelRefCountChange(%3 +1)
+
+replace restart {
+	jp	%1
+%2:
+%1:
+} by {
+   ; peephole 65a' eliminated jump.
+%2:
+%1:
+} if labelRefCountChange(%1 -1)
+
+replace restart {
+	ld	%1, %2
+	jp	%3
 	jp	%4
-%5:
-	ld	%2,%3
-%4:
 } by {
-	; peephole 9 removed jump and redundant load.
-%5:
-	ld	%2,%3
-%4:
-} if labelRefCountChange(%4 -1)
+	ld	%1, %2
+	jp	%3
+	; peephole 65b removed unreachable jump to %3.
+}
+
+replace restart {
+	ld	%1, %2
+	jp	%3
+%3:
+} by {
+	ld	%1, %2
+%3:
+	; peephole 65c removed redundant jump to %3.
+} if labelRefCountChange(%3 -1)
+
+replace restart {
+	ld	%1, #0x01
+	bit	0, %1
+	jp	Z, %2
+} by {
+	ld	%1, #0x01
+	; peephole 65d removed impossible jump to %2.
+} if labelRefCountChange(%2 -1)
 
 replace restart {
 	xor	a,a
@@ -132,9 +173,7 @@
 } by {
 	ld	%1,a
 	; peephole 14 removed redundant load from %1 into a.
-} if notVolatile(%1)
-// This gives many false negatives and without the test no problems are encountered in the regression tests
-// Maybe we can try this after 2.7.0 release
+} if notVolatile(%1), notSame(%1 '(hl+)'), notSame(%1 '(hl-)')
 
 replace restart {
 	ld	a,%1
@@ -142,9 +181,7 @@
 } by {
 	ld	a,%1
 	; peephole 15 removed redundant load from a into %1.
-} if notVolatile(%1)
-// This gives many false negatives and without the test no problems are encountered in the regression tests
-// Maybe we can try this after 2.7.0 release
+} if notVolatile(%1), notSame(%1 '(hl+)'), notSame(%1 '(hl-)')
 
 replace restart {
 	ld	%2,%3
@@ -535,18 +572,6 @@
 }
 
 replace restart {
-	or	a,%1
-	jp	NZ,%2
-	ld	a,%3
-	or	a,a
-} by {
-	or	a,%1
-	jp	NZ,%2
-	or	a,%3
-	; peephole 49 shortened or using a (which has just been tested to be #0x00).
-}
-
-replace restart {
 	and	a,%1
 	jp	NZ,%2
 	ld	a,%3
@@ -733,27 +758,46 @@
 	; peephole 66 replaced call at end of function by jump moving call beyond pop ix.
 }
 
+replace {
+	ld	a,(hl)
+	inc	hl
+} by {
+	ld	a,(hl+)
+	; peephole GB1 used ldi to increment hl after load
+}
+
+replace {
+	ld	a,(hl)
+	dec	hl
+} by {
+	ld	a,(hl-)
+	; peephole GB2 used ldd to decrement hl after load
+}
+
+replace {
+	ld	(hl),a
+	inc	hl
+} by {
+	ld	(hl+),a
+	; peephole GB3 used ldi to increment hl after load
+}
+
+replace {
+	ld	(hl),a
+	dec	hl
+} by {
+	ld	(hl-),a
+	; peephole GB4 used ldd to decrement hl after load
+}
+
+replace {
+	inc hl
+	dec hl
+} by {
+	; peephole GB5 removed inc hl / dec hl pair
+}
+
 // Old gbz80 rules from here onward
-// Commented out until des assembler update is complete.
-//replace {
-//	ld	(hl),a
-//	dec	hl
-//} by {
-//	ldd	(hl),a
-//}
-//replace {
-//	ld	(hl),a
-//	inc	hl
-//} by {
-//	ldi	(hl),a
-//}
-//replace {
-//	ld	a,(hl)
-//	inc	hl
-//} by {
-//	ldi	a,(hl)
-//}
-//
 //}
 //replace {
 //	ldi	(hl),a
@@ -776,24 +820,290 @@
 //	ld	(hl),a
 //	ld	%1,a
 //}
-//replace {
-//	ld	(hl),a
-//	inc	de
-//	ld	a,(de)
-//	inc	hl
-//} by {
-//	ldi	(hl),a
-//	inc	de
-//	ld	a,(de)
-//}
+
+replace {
+	ld	(hl),a
+	inc	de
+	ld	a,(de)
+	inc	hl
+} by {
+	ld	(hl+),a
+	; peephole E used ldi to increment hl
+	inc	de
+	ld	a,(de)
+}
+
+barrier
+
+// Should be one of the last ones. Opens the code to further peephole optimization.
+replace restart {
+%1:
+} by {
+	; peephole 149 removed unused label %1.
+} if labelRefCount(%1 0)
 
 // Ensure that all rules above see only jp, not jr.
 barrier
 
 replace {
+	add	hl,de
+	pop	de
+	jp	(hl)
+%1:
 	jp	%5
+	jp	%6
+	jp	%7
+%2:
 } by {
+	; peephole 150-3 removed addition using short jumps in jump-table.
+	pop	de
+	jp	(hl)
+%1:
 	jr	%5
-	; peephole z14 changed absolute to relative unconditional jump.
+	jr	%6
+	jr	%7
+%2:
+} if labelJTInRange
+
+replace {
+	add	hl,de
+	jp	(hl)
+%1:
+	jp	%5
+	jp	%6
+	jp	%7
+%2:
+} by {
+	; peephole 150-3' removed addition using short jumps in jump-table.
+	jp	(hl)
+%1:
+	jr	%5
+	jr	%6
+	jr	%7
+%2:
+} if labelJTInRange
+
+replace {
+	add	hl,de
+	pop	de
+	jp	(hl)
+%1:
+	jp	%5
+	jp	%6
+	jp	%7
+	jp	%8
+%2:
+} by {
+	; peephole 150-4 removed addition using short jumps in jump-table.
+	pop	de
+	jp	(hl)
+%1:
+	jr	%5
+	jr	%6
+	jr	%7
+	jr	%8
+%2:
+} if labelJTInRange
+
+replace {
+	add	hl,de
+	jp	(hl)
+%1:
+	jp	%5
+	jp	%6
+	jp	%7
+	jp	%8
+%2:
+} by {
+	; peephole 150-4' removed addition using short jumps in jump-table.
+	jp	(hl)
+%1:
+	jr	%5
+	jr	%6
+	jr	%7
+	jr	%8
+%2:
+} if labelJTInRange
+
+replace {
+	add	hl,de
+	pop	de
+	jp	(hl)
+%1:
+	jp	%5
+	jp	%6
+	jp	%7
+	jp	%8
+	jp	%9
+%2:
+} by {
+	; peephole 150-5 removed addition using short jumps in jump-table.
+	pop	de
+	jp	(hl)
+%1:
+	jr	%5
+	jr	%6
+	jr	%7
+	jr	%8
+	jr	%9
+%2:
+} if labelJTInRange
+
+replace {
+	add	hl,de
+	jp	(hl)
+%1:
+	jp	%5
+	jp	%6
+	jp	%7
+	jp	%8
+	jp	%9
+%2:
+} by {
+	; peephole 150-5' removed addition using short jumps in jump-table.
+	jp	(hl)
+%1:
+	jr	%5
+	jr	%6
+	jr	%7
+	jr	%8
+	jr	%9
+%2:
+} if labelJTInRange
+
+replace {
+	add	hl,de
+	pop	de
+	jp	(hl)
+%1:
+	jp	%5
+	jp	%6
+	jp	%7
+	jp	%8
+	jp	%9
+	jp	%10
+%2:
+} by {
+	; peephole 150-6 removed addition using short jumps in jump-table.
+	pop	de
+	jp	(hl)
+%1:
+	jr	%5
+	jr	%6
+	jr	%7
+	jr	%8
+	jr	%9
+	jr	%10
+%2:
+} if labelJTInRange
+
+replace {
+	add	hl,de
+	jp	(hl)
+%1:
+	jp	%5
+	jp	%6
+	jp	%7
+	jp	%8
+	jp	%9
+	jp	%10
+%2:
+} by {
+	; peephole 150-6' removed addition using short jumps in jump-table.
+	jp	(hl)
+%1:
+	jr	%5
+	jr	%6
+	jr	%7
+	jr	%8
+	jr	%9
+	jr	%10
+%2:
+} if labelJTInRange
+
+replace {
+	add	hl,de
+	pop	de
+	jp	(hl)
+%1:
+	jp	%5
+	jp	%6
+	jp	%7
+	jp	%8
+	jp	%9
+	jp	%10
+	jp	%11
+%2:
+} by {
+	; peephole 150-7 removed addition using short jumps in jump-table.
+	pop	de
+	jp	(hl)
+%1:
+	jr	%5
+	jr	%6
+	jr	%7
+	jr	%8
+	jr	%9
+	jr	%10
+	jr	%11
+%2:
+} if labelJTInRange
+
+replace {
+	add	hl,de
+	jp	(hl)
+%1:
+	jp	%5
+	jp	%6
+	jp	%7
+	jp	%8
+	jp	%9
+	jp	%10
+	jp	%11
+%2:
+} by {
+	; peephole 150-7' removed addition using short jumps in jump-table.
+	jp	(hl)
+%1:
+	jr	%5
+	jr	%6
+	jr	%7
+	jr	%8
+	jr	%9
+	jr	%10
+	jr	%11
+%2:
+} if labelJTInRange
+
+barrier
+
+// Do all jump optimizations before replacing by ret.
+
+replace restart {
+	jp	%5
+} by {
+	ret
+	; peephole 151 replaced jump by return.
+} if labelIsReturnOnly(), labelRefCountChange(%5 -1)
+
+replace restart {
+	jp	%1,%5
+} by {
+	ret	%1
+	; peephole 152 replaced jump by return.
+} if labelIsReturnOnly(), labelRefCountChange(%5 -1)
+
+replace {
+	jp	%5
+} by {
+	jr	%5
+	; peephole 153 changed absolute to relative unconditional jump.
+} if labelInRange()
+
+replace {
+	jp	%1,%5
+} by {
+	jr	%1,%5
+	; peephole 154 changed absolute to relative conditional jump.
 } if labelInRange()
 
diff -Nru sdcc-3.1.0+dfsg/src/z80/peeph-r2k.def sdcc-3.2.0+dfsg/src/z80/peeph-r2k.def
--- sdcc-3.1.0+dfsg/src/z80/peeph-r2k.def	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/z80/peeph-r2k.def	2012-06-19 16:14:17.000000000 +0000
@@ -148,7 +148,7 @@
 	ld	%7, %2 (%3)
 	; peephole 15 loaded %2 (%3) into %7 directly instead of going through %1.
 	ld	%4, %5
-} if canAssign(%7 %2 %3), notVolatile(%1), notUsed(%1), notSame(%1 %5), notSame(%7 %4), notSame(%4 '(hl)' '(de)' '(bc)'), notSame(%5 '(hl)' '(de)' '(bc)' '(iy)')
+} if canAssign(%7 %2 %3), notVolatile(%1), notUsed(%1), notSame(%1 %5), notSame(%7 %4), notSame(%7 %5), notSame(%4 '(hl)' '(de)' '(bc)'), notSame(%5 '(hl)' '(de)' '(bc)' '(iy)')
 
 replace restart {
 	ld	%1,#%2
@@ -213,6 +213,19 @@
 } if notUsed('a')
 
 replace restart {
+	ld	iy, #%1
+	ld	%2, %3 (iy)
+	srl	%2
+	bit %4, %3 (iy)
+} by {
+	ld	hl, #%1 + %3
+	; peephole 21c used hl instead of iy.
+	ld	%2, (hl)
+	srl %2
+	bit %4, (hl)
+} if notUsed('iy'), notUsed('hl')
+
+replace restart {
 	ld	%1,(hl)
 	ld	a,%2 (%3)
 	sub	a,%1
@@ -518,7 +531,7 @@
 	ld	%2, (hl)
 	inc	hl
 	ld	%3, (hl)
-} if notUsed('iy'), notUsed('hl'), operandsNotRelated(%2 'h'), operandsNotRelated(%2 'l')
+} if notUsed('iy'), notUsed('hl'), operandsNotRelated(%2 'hl')
 
 replace restart {
 	ld	iy,#%1
@@ -538,7 +551,7 @@
 	; peephole 49 used hl instead of iy.
 	ld	hl,#%1 + %2
 	ld	(hl), %4
-} if notUsed('iy'), notUsed('hl'), operandsNotRelated(%4 'h'), operandsNotRelated(%4 'l')
+} if notUsed('iy'), notUsed('hl'), operandsNotRelated(%4 'hl')
 
 replace restart {
 	ld	iy,#%1
@@ -550,12 +563,66 @@
 } if notUsed('iy'), notUsed('hl')
 
 replace restart {
+	ld	iy, #%1
+	add	iy, sp
+	ld	%2, %3 (iy)
+} by {
+	; peephole 49b used hl instead of iy.
+	ld	hl, #%1+%3
+	add	hl, sp
+	ld	%2, (hl)
+} if notUsed('iy'), notUsed('hl')
+
+replace restart {
+	ld	iy, #%1
+	add	iy, sp
+	ld	%2, 0 (iy)
+	ld	%3, 1 (iy)
+} by {
+	; peephole 49c used hl instead of iy.
+	ld	hl, #%1
+	add	hl, sp
+	ld	%2, (hl)
+	inc	hl
+	ld	%3, (hl)
+} if notUsed('iy'), notUsed('hl')
+
+replace restart {
+	ld	iy, #%1
+	add	iy, sp
+	ld	l, 0 (iy)
+	ld	h, 1 (iy)
+} by {
+	; peephole 49d used hl instead of iy.
+	ld	hl, #%1
+	add	hl, sp
+	ld	a, (hl)
+	inc	hl
+	ld	h, (hl)
+	ld	l, a
+} if notUsed('iy'), notUsed('a')
+
+replace restart {
+	ld	iy, #%1
+	add	iy, sp
+	ld	0 (iy), #%2
+	ld	1 (iy), #%3
+} by {
+	; peephole 49e used hl instead of iy.
+	ld	hl, #%1
+	add	hl, sp
+	ld	(hl), #%2
+	inc	hl
+	ld	(hl), #%3
+} if notUsed('iy'), notUsed('hl')
+
+replace restart {
 	ld	%1,(hl)
 	or	a,%1
 } by {
 	or	a,(hl)
 	; peephole 50 used (hl) directly instead of going through %1.
-} if notUsed(%1), operandsNotRelated(%1 'a')
+} if notUsed(%1), notSame(%1 'a')
 
 replace restart {
 	ld	c,l
@@ -702,7 +769,17 @@
 	; peephole 65 jumped to %6 directly instead of via %5.
 } if labelIsUncondJump(), notSame(%5 %6), labelRefCountChange(%5 -1), labelRefCountChange(%6 +1)
 
-// A peephole that makes the code longer. Let's hope it's worth it in speed gain and furhter optimization potential.
+replace restart {
+	jp	%1
+%2:
+%1:
+} by {
+   ; peephole 65a eliminated jump.
+%2:
+%1:
+} if labelRefCountChange(%1 -1)
+
+// A peephole that makes the code longer. Let's hope it's worth it in speed gain and further optimization potential.
 replace restart {
 	ld	a,#0x00
 %1:
@@ -1048,7 +1125,7 @@
 	inc	%2 (%3)
 	ld	%1, %2 (%3)
 	; peephole 93a incremented in %2 (%3) instead of going through %1.
-}
+} if notSame(%3 'sp')
 
 replace restart {
 	ld	%1,a
@@ -1058,7 +1135,7 @@
 	ld	%1, a
 	; peephole 94 removed load by exploiting commutativity of addition.
 	add	a,%2
-} if operandsNotRelated(%2 '(bc)' '(de)'), canAssign('b' %2)
+} if notSame(%2 '(bc)' '(de)'), canAssign('b' %2)
 // canAssign('b' %2) is true, iff add a,%2 is possible.
 
 replace restart {
@@ -1622,7 +1699,7 @@
 	; peephole 138 used #%2 directly instead of going through %1 using indirect addressing.
 	pop	af
 	ld	%1,#%5
-} if operandsNotRelated(%3 'a')
+} if notSame(%3 'a')
 
 replace restart {
 	ld	%1,a
diff -Nru sdcc-3.1.0+dfsg/src/z80/peeph-z80.def sdcc-3.2.0+dfsg/src/z80/peeph-z80.def
--- sdcc-3.1.0+dfsg/src/z80/peeph-z80.def	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/z80/peeph-z80.def	2012-06-19 16:14:17.000000000 +0000
@@ -22,7 +22,7 @@
 replace restart {
 	ld	%1, %1
 } by {
-	; peephole 0 removed redundant load.
+	; peephole 0 removed redundant load from %1 into %1.
 } if notVolatile(%1)
 
 replace restart {
@@ -139,7 +139,6 @@
 	ld	%2 (%3), %7
 } if canAssign(%2 %3 %7), notVolatile(%1), notUsed(%1), notSame(%1 %4)
 
-// Broken= What if %1 == h and %5 == (hl)? Real bug on r2k, thus removed there.
 replace restart {
 	ld	%1, %2 (%3)
 	ld	%4, %5
@@ -148,7 +147,7 @@
 	ld	%7, %2 (%3)
 	; peephole 15 loaded %2 (%3) into %7 directly instead of going through %1.
 	ld	%4, %5
-} if canAssign(%7 %2 %3), notVolatile(%1), notUsed(%1), notSame(%1 %5), notSame(%7 %4), notSame(%4 '(hl)' '(de)' '(bc)'), notSame(%5 '(hl)' '(de)' '(bc)')
+} if canAssign(%7 %2 %3), notVolatile(%1), notUsed(%1), notSame(%1 %5), notSame(%7 %4), notSame(%7 %5), notSame(%4 '(hl)' '(de)' '(bc)'), notSame(%5 '(hl)' '(de)' '(bc)' '(iy)')
 
 replace restart {
 	ld	%1,#%2
@@ -209,8 +208,32 @@
 	ld	e, l
 	ld	d, h
 	srl	(hl)
+	ld	a, (hl)
 	; peephole 21a shifted in (hl) instead of a.
-} if notUsed('a')
+}
+
+replace restart {
+	ld	a, %1 (%2)
+	srl	a
+	ld	%1 (%2), a
+} by {
+	srl	%1 (%2)
+	ld	a, %1 (%2)
+	; peephole 21b shifted in (hl) instead of a.
+}
+
+replace restart {
+	ld	iy, #%1
+	ld	%2, %3 (iy)
+	srl	%2
+	bit %4, %3 (iy)
+} by {
+	ld	hl, #%1 + %3
+	; peephole 21c used hl instead of iy.
+	ld	%2, (hl)
+	srl %2
+	bit %4, (hl)
+} if notUsed('iy'), notUsed('hl')
 
 replace restart {
 	ld	%1,(hl)
@@ -443,16 +466,16 @@
 } if notUsed(%1)
 
 replace restart {
-	ld	a,%1 (ix)
+	ld	a,%1 (%3)
 	push	af
 	inc	sp
-	ld	a,%2 (ix)
+	ld	a,%2 (%3)
 	push	af
 	inc	sp
 } by {
-	; peephole 42 pushed %1 (ix), %2(ix) through hl instead of af.
-	ld	h,%1 (ix)
-	ld	l,%2 (ix)
+	; peephole 42 pushed %1 (%3), %2(%3) through hl instead of af.
+	ld	h,%1 (%3)
+	ld	l,%2 (%3)
 	push	hl
 } if notUsed('a'), notUsed('hl')
 
@@ -466,6 +489,20 @@
 } if notUsed('bc')
 
 replace restart {
+	ld	a, (hl)
+	inc	hl
+	ld	h, (hl)
+	ld	l, a
+	push	hl
+} by {
+	; peephole 43a pushed bc instead of hl.
+	ld	c, (hl)
+	inc	hl
+	ld	b, (hl)
+	push	bc
+} if notUsed('bc'), notUsed('hl')
+
+replace restart {
 	pop	%1
 	push	%1
 } by {
@@ -473,6 +510,24 @@
 } if notUsed(%1)
 
 replace restart {
+	push	hl
+	pop	bc
+} by {
+	ld	c, l
+	ld	b, h
+	; peephole 44a replaced push/pop pair by loads.
+} if notUsed('hl')
+
+replace restart {
+	push	hl
+	pop	de
+} by {
+	ld	e, l
+	ld	d, h
+	; peephole 44b replaced push/pop pair by loads.
+} if notUsed('hl')
+
+replace restart {
 	ld	iy,#%1
 	or	a,%2 (iy)
 } by {
@@ -518,7 +573,7 @@
 	ld	%2, (hl)
 	inc	hl
 	ld	%3, (hl)
-} if notUsed('iy'), notUsed('hl'), operandsNotRelated(%2 'h'), operandsNotRelated(%2 'l')
+} if notUsed('iy'), notUsed('hl'), operandsNotRelated(%2 'hl')
 
 replace restart {
 	ld	iy,#%1
@@ -538,7 +593,7 @@
 	; peephole 49 used hl instead of iy.
 	ld	hl,#%1 + %2
 	ld	(hl), %4
-} if notUsed('iy'), notUsed('hl'), operandsNotRelated(%4 'h'), operandsNotRelated(%4 'l')
+} if notUsed('iy'), notUsed('hl'), operandsNotRelated(%4 'hl')
 
 replace restart {
 	ld	iy,#%1
@@ -550,12 +605,66 @@
 } if notUsed('iy'), notUsed('hl')
 
 replace restart {
+	ld	iy, #%1
+	add	iy, sp
+	ld	%2, %3 (iy)
+} by {
+	; peephole 49b used hl instead of iy.
+	ld	hl, #%1+%3
+	add	hl, sp
+	ld	%2, (hl)
+} if notUsed('iy'), notUsed('hl')
+
+replace restart {
+	ld	iy, #%1
+	add	iy, sp
+	ld	%2, 0 (iy)
+	ld	%3, 1 (iy)
+} by {
+	; peephole 49c used hl instead of iy.
+	ld	hl, #%1
+	add	hl, sp
+	ld	%2, (hl)
+	inc	hl
+	ld	%3, (hl)
+} if notUsed('iy'), notUsed('hl')
+
+replace restart {
+	ld	iy, #%1
+	add	iy, sp
+	ld	l, 0 (iy)
+	ld	h, 1 (iy)
+} by {
+	; peephole 49d used hl instead of iy.
+	ld	hl, #%1
+	add	hl, sp
+	ld	a, (hl)
+	inc	hl
+	ld	h, (hl)
+	ld	l, a
+} if notUsed('iy'), notUsed('a')
+
+replace restart {
+	ld	iy, #%1
+	add	iy, sp
+	ld	0 (iy), #%2
+	ld	1 (iy), #%3
+} by {
+	; peephole 49e used hl instead of iy.
+	ld	hl, #%1
+	add	hl, sp
+	ld	(hl), #%2
+	inc	hl
+	ld	(hl), #%3
+} if notUsed('iy'), notUsed('hl')
+
+replace restart {
 	ld	%1,(hl)
 	or	a,%1
 } by {
 	or	a,(hl)
 	; peephole 50 used (hl) directly instead of going through %1.
-} if notUsed(%1), operandsNotRelated(%1 'a')
+} if notUsed(%1), notSame(%1 'a')
 
 replace restart {
 	ld	c,l
@@ -569,6 +678,71 @@
 } if notUsed('hl')
 
 replace restart {
+	ld	iy, #%1
+	inc	%2 (iy)
+} by {
+	; peephole 51a incremented in (hl) instead of %2 (iy).
+	ld	hl, #%1+%2
+	inc	(hl)
+} if notUsed('hl'), notUsed('iy')
+
+replace restart {
+	ld	iy, #%1
+	dec	%2 (iy)
+} by {
+	; peephole 51a' decremented in (hl) instead of %2 (iy).
+	ld	hl, #%1+%2
+	dec	(hl)
+} if notUsed('hl'), notUsed('iy')
+
+replace restart {
+	add	hl, hl
+	ld	e, l
+	ld	d, h
+	inc	de
+	inc	de
+} by {
+	inc	hl
+	; peephole 51b incremented once in hl instead of incrementing in de twice.
+	add	hl, hl
+	ld	e, l
+	ld	d, h
+} if notUsed('hl')
+
+replace restart {
+	add	hl, hl
+	inc	hl
+	inc	hl
+} by {
+	inc	hl
+	; peephole 51c incremented once in hl instead of incrementing in hl twice.
+	add	hl, hl
+}
+
+replace restart {
+	add	a, a
+	add	a, a
+	add	a, #0x04
+} by {
+	inc	a
+	; peephole 51d incremented a once instead of adding #0x04 to a.
+	add	a, a
+	add	a, a
+}
+
+replace restart {
+	add	hl, hl
+	pop	de
+	inc	hl
+	inc	hl
+} by {
+	inc	hl
+	; peephole 51e incremented once in hl instead of incrementing in hl twice.
+	add	hl, hl
+	pop	de
+}
+
+replace restart {
 	ld	a,%1 (%2)
 	bit	%3,a
 } by {
@@ -702,7 +876,17 @@
 	; peephole 65 jumped to %6 directly instead of via %5.
 } if labelIsUncondJump(), notSame(%5 %6), labelRefCountChange(%5 -1), labelRefCountChange(%6 +1)
 
-// A peephole that makes the code longer. Let's hope it's worth it in speed gain and furhter optimization potential.
+replace restart {
+	jp	%1
+%2:
+%1:
+} by {
+   ; peephole 65a eliminated jump.
+%2:
+%1:
+} if labelRefCountChange(%1 -1)
+
+// A peephole that makes the code longer. Let's hope it's worth it in speed gain and further optimization potential.
 replace restart {
 	ld	a,#0x00
 %1:
@@ -763,6 +947,14 @@
 }
 
 replace {
+	ld	d,#0x%1
+	ld	e,#0x%2
+} by {
+	ld	de,#0x%1%2
+	; peephole 67a combined constant loads into register pair.
+}
+
+replace {
 	ld	l,#0x%1
 	ld	h,#0x%2
 } by {
@@ -771,6 +963,14 @@
 }
 
 replace {
+	ld	h,#0x%1
+	ld	l,#0x%2
+} by {
+	ld	hl,#0x%1%2
+	; peephole 68a combined constant loads into register pair.
+}
+
+replace {
 	ld	c,#0x%1
 	ld	b,#0x%2
 } by {
@@ -778,6 +978,14 @@
 	; peephole 69 combined constant loads into register pair.
 }
 
+replace {
+	ld	b,#0x%1
+	ld	c,#0x%2
+} by {
+	ld	bc,#0x%1%2
+	; peephole 69a combined constant loads into register pair.
+}
+
 replace restart {
 	ld	%1,a
 	ld	a,%1
@@ -1041,6 +1249,16 @@
 } if notUsed('a')
 
 replace restart {
+	ld	a,(hl)
+	inc	a
+	ld	(hl),a
+} by {
+	inc	(hl)
+	; peephole 93' incremented in (hl) instead of going through a.
+} if notUsed('a')
+
+// TODO: Check for volatile?
+replace restart {
 	ld	%1, %2 (%3)
 	inc	%1
 	ld	%2 (%3), %1
@@ -1050,6 +1268,17 @@
 	; peephole 93a incremented in %2 (%3) instead of going through %1.
 }
 
+// TODO: Check for volatile?
+replace restart {
+	ld	%1, %2 (%3)
+	dec	%1
+	ld	%2 (%3), %1
+} by {
+	dec	%2 (%3)
+	ld	%1, %2 (%3)
+	; peephole 93b decremented in %2 (%3) instead of going through %1.
+}
+
 replace restart {
 	ld	%1,a
 	ld	a,%2
@@ -1058,7 +1287,7 @@
 	ld	%1, a
 	; peephole 94 removed load by exploiting commutativity of addition.
 	add	a,%2
-} if operandsNotRelated(%2 '(bc)' '(de)'), canAssign('b' %2)
+} if notSame(%2 '(bc)' '(de)'), canAssign('b' %2)
 // canAssign('b' %2) is true, iff add a,%2 is possible.
 
 replace restart {
@@ -1263,6 +1492,28 @@
 } if notUsed('hl')
 
 replace restart {
+	push	bc
+	pop	iy
+	inc	iy
+} by {
+	inc	bc
+	push	bc
+	pop	iy
+	; peephole 111b incremented in bc instead of iy.
+} if notUsed('bc')
+
+replace restart {
+	push	de
+	pop	iy
+	inc	iy
+} by {
+	inc	de
+	push	de
+	pop	iy
+	; peephole 111c incremented in de instead of iy.
+} if notUsed('de')
+
+replace restart {
 	ld	hl,%1
 	add	hl,%2
 	push	hl
@@ -1595,7 +1846,7 @@
 	; peephole 138 used #%2 directly instead of going through %1 using indirect addressing.
 	pop	af
 	ld	%1,#%5
-} if operandsNotRelated(%3 'a')
+} if notSame(%3 'a')
 
 replace restart {
 	ld	%1,a
diff -Nru sdcc-3.1.0+dfsg/src/z80/ralloc.c sdcc-3.2.0+dfsg/src/z80/ralloc.c
--- sdcc-3.1.0+dfsg/src/z80/ralloc.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/z80/ralloc.c	2012-05-05 16:16:42.000000000 +0000
@@ -481,10 +481,13 @@
 
   sloc->isref = 1;              /* to prevent compiler warning */
 
+  wassertl (currFunc, "Local variable used outside of function.");
+
   /* if it is on the stack then update the stack */
   if (IN_STACK (sloc->etype))
     {
-      currFunc->stack += getSize (sloc->type);
+      if (currFunc)
+        currFunc->stack += getSize (sloc->type);
       _G.stackExtend += getSize (sloc->type);
     }
   else
@@ -859,7 +862,7 @@
           /* if the result of this one needs registers
              and does not have it then assign it right
              away */
-          if (z80_opts.oldralloc && IC_RESULT (ic) &&
+          if (options.oldralloc && IC_RESULT (ic) &&
               !(SKIP_IC2 (ic) || ic->op == JUMPTABLE || ic->op == IFX || ic->op == IPUSH || ic->op == IPOP || ic->op == RETURN) &&
               IS_SYMOP (IC_RESULT (ic)) && (result = OP_SYMBOL (IC_RESULT (ic))) &&    /* has a result */
               result->liveTo > ic->seq &&       /* and will live beyond this */
@@ -961,7 +964,7 @@
   int i, j = 0, shared = 0;
   int change = 0;
 
-  D (D_ALLOC, ("positionRegs: on result %p opsum %p line %u\n", result, opsym, lineno));
+  D (D_ALLOC, ("positionRegs: on result %p opsym %p line %u\n", result, opsym, lineno));
 
   /* if the result has been spilt then cannot share */
   if (opsym->isspilt)
@@ -969,6 +972,7 @@
 again:
   shared = 0;
   /* first make sure that they actually share */
+
   for (i = 0; i < count; i++)
     {
       for (j = 0; j < count; j++)
@@ -1048,8 +1052,8 @@
   if (sym->regs[0])
     return;
 
-  // Don't warn for new allocator , since this is not used by default (until Thoruop is implemented for spillocation compaction).
-  if (z80_opts.oldralloc)
+  // Don't warn for new allocator, since this is not used by default (until Thoruop is implemented for spillocation compaction).
+  if (options.oldralloc)
     werrorfl (ic->filename, ic->lineno, W_LOCAL_NOINIT, sym->prereqv ? sym->prereqv->name : sym->name);
   spillThis (sym);
 }
@@ -1288,6 +1292,16 @@
       int i;
       int pdone = 0;
 
+      if (sym->accuse == ACCUSE_SCRATCH)
+        {
+          sym->nRegs = getSize (sym->type);
+          sym->regs[0] = regsZ80 + L_IDX;
+          sym->regs[1] = regsZ80 + H_IDX;
+          sym->accuse = 0;
+          sym->isspilt = FALSE;
+          continue;
+        }
+
       if (!sym->spillA || !sym->clashes || sym->remat)
         continue;
 
@@ -1360,7 +1374,7 @@
                 continue;
               if (SKIP_IC (ic))
                 continue;
-              if (!IS_ASSIGN_ICODE (ic))
+              if (IS_ASSIGN_ICODE (ic))
                 continue;
 
               /* if result is assigned to registers */
@@ -1416,7 +1430,7 @@
   if (sym->isspilt || !sym->nRegs)
     return NULL;
 
-  rumask = newBitVect (_G.nRegs);
+  rumask = newBitVect (_G.nRegs + (IS_GB ? 0 : 2));
 
   for (j = 0; j < sym->nRegs; j++)
     {
@@ -1442,7 +1456,7 @@
 bitVect *
 regsUsedIniCode (iCode * ic)
 {
-  bitVect *rmask = newBitVect (_G.nRegs);
+  bitVect *rmask = newBitVect (_G.nRegs + (IS_GB ? 0 : 2));
 
   /* do the special cases first */
   if (ic->op == IFX)
@@ -1506,7 +1520,7 @@
           /* now create the register mask for those
              registers that are in use : this is a
              super set of ic->rUsed */
-          ic->rMask = newBitVect (_G.nRegs + 1);
+          ic->rMask = newBitVect (_G.nRegs + 1 + (IS_GB ? 0 : 2));
 
           /* for all live Ranges alive at this point */
           for (j = 1; j < ic->rlive->size; j++)
@@ -1688,9 +1702,11 @@
   D (D_ALLOC, ("packRegsForAssign: running on ic %p\n", ic));
 
   if (!IS_ITEMP (IC_RIGHT (ic)) || OP_SYMBOL (IC_RIGHT (ic))->isind || OP_LIVETO (IC_RIGHT (ic)) > ic->seq)
-    {
-      return 0;
-    }
+    return 0;
+  
+  /* Avoid having multiple named address spaces in one iCode. */
+  if (IS_SYMOP (IC_RESULT (ic)) && SPEC_ADDRSPACE (OP_SYMBOL (IC_RESULT (ic))->etype))
+    return 0;
 
   /* find the definition of iTempNN scanning backwards if we find a
      a use of the true symbol in before we find the definition then
@@ -1751,7 +1767,6 @@
               dic = NULL;
               break;
             }
-
         }
     }
 
@@ -2091,7 +2106,6 @@
   return FALSE;
 }
 
-// HL handled by new register allocator
 static iCode *
 packRegsForHLUse3 (iCode * lic, operand * op, eBBlock * ebp)
 {
@@ -2099,6 +2113,7 @@
   symbol *sym;
   iCode *ic, *dic;
   bool isFirst = TRUE;
+  bool exstk = (currFunc && currFunc->stack > 127);
 
   D (D_PACK_HLUSE3,
      ("Checking HL on %p lic key %u first def %u line %u:\n", OP_SYMBOL (op), lic->key, bitVectFirstBit (OP_DEFS (op)),
@@ -2120,7 +2135,7 @@
   if (bitVectnBitsOn (OP_DEFS (op)) > 1)
     return NULL;
 
-  if ((!z80_opts.oldralloc && OPTRALLOC_A) ? getSize (operandType (op)) != 2 : getSize (operandType (op)) > 2)
+  if (!options.oldralloc ? getSize (operandType (op)) != 2 : getSize (operandType (op)) > 2)
     return NULL;
 
   /* And this is the definition */
@@ -2167,7 +2182,7 @@
             continue;
         }
 
-      if (IC_RESULT (ic) && IS_SYMOP (IC_RESULT (ic)) && isOperandInDirSpace (IC_RESULT (ic)))
+      if (IC_RESULT (ic) && IS_SYMOP (IC_RESULT (ic)) && (isOperandInDirSpace (IC_RESULT (ic)) || exstk))
         return NULL;
 
       if (IC_LEFT (ic) && IS_SYMOP (IC_LEFT (ic)) && isOperandInDirSpace (IC_LEFT (ic)))
@@ -2207,20 +2222,13 @@
           ic->op == UNARYMINUS ||
           ic->op == RETURN ||
           ic->op == RIGHT_OP ||
-          ic->op == '-' ||
+          (ic->op == '-'  && getSize (operandType (IC_RESULT (ic))) == 1) ||
           ic->op == BITWISEAND ||
           ic->op == '|' ||
           ic->op == '>' || ic->op == '<' || ic->op == EQ_OP || (ic->op == '+' && getSize (operandType (IC_RESULT (ic))) == 1))
         /* 16 bit addition uses add hl, rr */
         continue;
 
-      /* Strangely this leads to a code size increase for some functions. */
-      if(!z80_opts.oldralloc)
-        {
-          if (ic->op == '+' && getSize (operandType (IC_RESULT (ic))) == 2 && isOperandEqual (op, IC_RESULT (ic)))
-            continue;
-        }
-
       if (ic->op == '*' && isOperandEqual (op, IC_LEFT (ic)))
         continue;
 
@@ -2774,14 +2782,14 @@
          result of that operation is not on stack then we can leave the
          result of this operation in acc:b combination */
 
-      if ((z80_opts.oldralloc || !OPTRALLOC_HL) && !DISABLE_PACK_HL && IS_ITEMP (IC_RESULT (ic)))
+      if ((options.oldralloc || !OPTRALLOC_HL) && !DISABLE_PACK_HL && IS_ITEMP (IC_RESULT (ic)))
         if (!IS_GB && !IY_RESERVED)
           packRegsForHLUse3 (ic, IC_RESULT (ic), ebp);
 
-      if ((z80_opts.oldralloc || !OPTRALLOC_IY) && !DISABLE_PACK_IY && !IY_RESERVED && IS_ITEMP (IC_RESULT (ic)) && !IS_GB)
+      if ((options.oldralloc || !OPTRALLOC_IY) && !DISABLE_PACK_IY && !IY_RESERVED && IS_ITEMP (IC_RESULT (ic)) && !IS_GB)
         packRegsForIYUse (ic, IC_RESULT (ic), ebp);
 
-      if ((z80_opts.oldralloc || !OPTRALLOC_A) && !DISABLE_PACK_ACC && IS_ITEMP (IC_RESULT (ic)) &&
+      if (options.oldralloc && !DISABLE_PACK_ACC && IS_ITEMP (IC_RESULT (ic)) &&
           getSize (operandType (IC_RESULT (ic))) == 1)
         packRegsForAccUse2 (ic);
     }
@@ -2950,7 +2958,7 @@
     }
 }
 
-void
+static void
 RegFix (eBBlock ** ebbs, int count)
 {
   int i;
@@ -3147,10 +3155,6 @@
 
   RegFix (ebbs, count);
 
-  /* When --max-allocs-per-node is too low, there can be gaps. */
-  //freeAllRegs ();
-  //fillGaps();
-
   /* New register allcoator here. */
 
   /* if stack was extended then tell the user */
@@ -3203,7 +3207,7 @@
 z80_assignRegisters (ebbIndex * ebbi)
 {
 #ifdef OLDRALLOC
-  if (z80_opts.oldralloc)
+  if (options.oldralloc)
     z80_oldralloc (ebbi);
   else
 #endif
diff -Nru sdcc-3.1.0+dfsg/src/z80/ralloc.h sdcc-3.2.0+dfsg/src/z80/ralloc.h
--- sdcc-3.1.0+dfsg/src/z80/ralloc.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/z80/ralloc.h	2012-06-22 11:17:10.000000000 +0000
@@ -52,6 +52,8 @@
   CND_IDX
 };
 
+#define A_IDX (IS_GB ? 4 : (IY_RESERVED ? 6 : 8))
+
 enum
 {
   REG_PTR = 1,
diff -Nru sdcc-3.1.0+dfsg/src/z80/ralloc2.cc sdcc-3.2.0+dfsg/src/z80/ralloc2.cc
--- sdcc-3.1.0+dfsg/src/z80/ralloc2.cc	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/z80/ralloc2.cc	2012-06-28 14:09:28.000000000 +0000
@@ -21,14 +21,24 @@
 //#define DEBUG_RALLOC_DEC // Uncomment to get debug messages while doing register allocation on the tree decomposition.
 //#define DEBUG_RALLOC_DEC_ASS // Uncomment to get debug messages about assignments while doing register allocation on the tree decomposition (much more verbose than the one above).
 
-#include "SDCCralloc.hpp"
+#define THIS_IS_THE_Z80_PORT_OR_WHATEVER
 
+#include "SDCCralloc.hpp"
 
 extern "C"
 {
+  #include "z80.h"
   unsigned char dryZ80iCode (iCode * ic);
+  bool z80_assignment_optimal;
+  bool should_omit_frame_ptr;
 };
 
+bool
+iy_reserved(void)
+{
+  return(bool)(IY_RESERVED);
+}
+
 #define REG_C 0
 #define REG_B 1
 #define REG_E 2
@@ -79,12 +89,12 @@
                 c += 2.0f;
 
               // Code generator cannot handle variables only partially in A.
-              if(OPTRALLOC_A && size > 1)
+              if(size > 1)
                 for(unsigned short int i = 0; i < size; i++)
                   if(byteregs[i] == REG_A)
                     c += std::numeric_limits<float>::infinity();
 
-              if(OPTRALLOC_A && byteregs[0] == REG_A)
+              if(byteregs[0] == REG_A)
                 c -= 0.4f;
               else if(OPTRALLOC_HL && byteregs[0] == REG_L)
                 c -= 0.1f;
@@ -109,7 +119,7 @@
 
 // Check that the operand is either fully in registers or fully in memory.
 template <class G_t, class I_t>
-bool operand_sane(const operand *o, const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+static bool operand_sane(const operand *o, const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
 {
   if(!o || !IS_SYMOP(o))
     return(true);
@@ -137,8 +147,8 @@
   return(true);
 }
 
-template <class G_t, class I_t> static float
-default_instruction_cost(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+template <class G_t, class I_t>
+static float default_instruction_cost(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
 {
   float c = 0.0f;
 
@@ -151,8 +161,8 @@
   return(c);
 }
 
-template <class G_t, class I_t> bool
-inst_sane(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+template <class G_t, class I_t>
+static bool inst_sane(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
 {
   const iCode *ic = G[i].ic;
 
@@ -200,12 +210,12 @@
         }
 
       // Code generator cannot handle variables only partially in A.
-      if(OPTRALLOC_A && size1 > 1)
+      if(size1 > 1)
         for(unsigned short int i = 0; i < size1; i++)
           if(byteregs[i] == REG_A)
             c += std::numeric_limits<float>::infinity();
 
-      if(OPTRALLOC_A && byteregs[0] == REG_A)
+      if(byteregs[0] == REG_A)
         c -= 0.4f;
       else if(OPTRALLOC_IY && byteregs[0] == REG_IYL || byteregs[0] == REG_IYH)
         c += 0.1f;
@@ -236,7 +246,7 @@
           size2++;
         }
 
-      if(OPTRALLOC_A && byteregs[0] == REG_A)
+      if(byteregs[0] == REG_A)
         c -= 0.4f;
       else if(OPTRALLOC_IY && byteregs[0] == REG_IYL || byteregs[0] == REG_IYH)
         c += 0.1f;
@@ -286,7 +296,7 @@
           size++;
         }
 
-      if(OPTRALLOC_A && byteregs[0] == REG_A)
+      if(byteregs[0] == REG_A)
         c -= 0.4f;
         
       if(byteregs[0] == REG_L)
@@ -341,12 +351,12 @@
         }
 
       // Code generator cannot handle variables only partially in A.
-      if(OPTRALLOC_A && size > 1)
+      if(size > 1)
         for(unsigned short int i = 0; i < size; i++)
           if(byteregs[i] == REG_A)
             c += std::numeric_limits<float>::infinity();
 
-      if(OPTRALLOC_A && byteregs[0] == REG_A)
+      if(byteregs[0] == REG_A)
         c -= 0.4f;
         
       if(byteregs[0] == REG_L)
@@ -378,8 +388,8 @@
   return(default_operand_cost(IC_JTCOND(ic), a, i, G, I));
 }
 
-template <class I_t> void
-add_operand_conflicts_in_node(const cfg_node &n, I_t &I)
+template <class I_t>
+static void add_operand_conflicts_in_node(const cfg_node &n, I_t &I)
 {
   const iCode *ic = n.ic;
   
@@ -391,7 +401,7 @@
     return;
     
   if(!(ic->op == '~' || ic->op == UNARYMINUS || ic->op == '+' || ic->op == '-' || ic->op == '^' || ic->op == '|' || ic->op == BITWISEAND)) 
-    return; // Code generation can always handle all other operations. Todo: Handle ^, |, BITWISEAND there as well.
+    return; // Code generation can always handle all other operations. Todo: Handle ^, |, BITWISEAND and float UNARYMINUS there as well.
    
   operand_map_t::const_iterator oir, oir_end, oirs; 
   boost::tie(oir, oir_end) = n.operands.equal_range(OP_SYMBOL_CONST(result)->key);
@@ -423,7 +433,7 @@
 
 // Return true, iff the operand is placed (partially) in r.
 template <class G_t>
-bool operand_in_reg(const operand *o, reg_t r, const i_assignment_t &ia, unsigned short int i, const G_t &G)
+static bool operand_in_reg(const operand *o, reg_t r, const i_assignment_t &ia, unsigned short int i, const G_t &G)
 {
   if(!o || !IS_SYMOP(o))
     return(false);
@@ -436,8 +446,29 @@
   return(false);
 }
 
+// Return true, iff the operand is placed on the stack.
+template <class G_t>
+bool operand_on_stack(const operand *o, const assignment &a, unsigned short int i, const G_t &G)
+{
+  if(!o || !IS_SYMOP(o))
+    return(false);
+
+  if(OP_SYMBOL_CONST(o)->remat)
+    return(false);
+
+  if(OP_SYMBOL_CONST(o)->_isparm && !IS_REGPARM (OP_SYMBOL_CONST(o)->etype))
+    return(true);
+
+  operand_map_t::const_iterator oi, oi_end;
+  for(boost::tie(oi, oi_end) = G[i].operands.equal_range(OP_SYMBOL_CONST(o)->key); oi != oi_end; ++oi)
+    if(a.global[oi->second] < 0)
+      return(true);
+
+  return(false);
+}
+
 template <class G_t>
-bool operand_is_pair(const operand *o, const assignment &a, unsigned short int i, const G_t &G)
+static bool operand_is_pair(const operand *o, const assignment &a, unsigned short int i, const G_t &G)
 {
   if(!o || !IS_SYMOP(o))
     return(false);
@@ -464,15 +495,20 @@
 }
 
 template <class G_t, class I_t>
-bool Ainst_ok(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+static bool Ainst_ok(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
 {
   const iCode *ic = G[i].ic;
+
   const i_assignment_t &ia = a.i_assignment;
 
+  const operand *const left = IC_LEFT(ic);
+  const operand *const right = IC_RIGHT(ic);
+  const operand *const result = IC_RESULT(ic);
+
   if(ia.registers[REG_A][1] < 0)
     return(true);	// Register A not in use.
 
-  //if(i == 15) std::cout << "Ainst_ok: A = (" << ia.registers[REG_A][0] << ", " << ia.registers[REG_A][1] << "), inst " << i << ", " << ic->key << "\n";
+  //std::cout << "Ainst_ok: A = (" << ia.registers[REG_A][0] << ", " << ia.registers[REG_A][1] << "), inst " << i << ", " << ic->key << "\n";
 
   // Code generator cannot handle variables that are only partially in A.
   if(I[ia.registers[REG_A][1]].size > 1 || ia.registers[REG_A][0] >= 0 && I[ia.registers[REG_A][0]].size > 1)
@@ -492,41 +528,75 @@
       input_in_A = operand_in_reg(IC_JTCOND(ic), REG_A, ia, i, G);
       break;
     default:
-      input_in_A = operand_in_reg(IC_LEFT(ic), REG_A, ia, i, G) || operand_in_reg(IC_RIGHT(ic), REG_A, ia, i, G);
+      input_in_A = operand_in_reg(left, REG_A, ia, i, G) || operand_in_reg(right, REG_A, ia, i, G);
       break;
     }
 
-  if(!result_in_A && !input_in_A)
+  // bit instructions do not disturb a.
+  if(!IS_GB && ic->op == BITWISEAND && ifxForOp (IC_RESULT(ic), ic) && (IS_OP_LITERAL(left) && IS_TRUE_SYMOP (IC_RIGHT(ic)) || IS_OP_LITERAL(right) && IS_TRUE_SYMOP (left)))
+    {
+      operand *const litop = IS_OP_LITERAL(left) ? IC_LEFT(ic) : IC_RIGHT(ic);
+      for(unsigned int i = 0; i < getSize(operandType(result)); i++)
+        {
+          unsigned char byte = (ulFromVal (OP_VALUE (litop)) >> (i * 8) & 0xff);
+          if (byte != 0x00 && byte != 0x01 && byte != 0x02 && byte != 0x04 && byte != 0x08 && byte != 0x10 && byte != 0x20 && byte != 0x40 && byte != 0x80)
+            goto nobit;
+        }
+      //std::cout << "Bit: Accepting at " << i << ", " << ic->key << "(" << int(ic->op) << ")\n";
+      return(true);
+    }
+  nobit:
+
+  const std::set<var_t> &dying = G[i].dying;
+
+  if(ic->op == GET_VALUE_AT_ADDRESS)
+    return(result_in_A || !IS_BITVAR(getSpec(operandType (result))));
+  if(ic->op == '=' && POINTER_SET (ic))
+    return(dying.find(ia.registers[REG_A][1]) != dying.end() || dying.find(ia.registers[REG_A][0]) != dying.end() || !(IS_BITVAR(getSpec(operandType (result))) || IS_BITVAR(getSpec(operandType (right)))));
+
+  if(1)
     {
       // Variable in A is not used by this instruction
-      if(ic->op == '+' && IS_ITEMP (IC_LEFT (ic)) && IS_ITEMP (IC_RESULT (ic)) && IS_OP_LITERAL (IC_RIGHT (ic)) &&
-          ulFromVal (OP_VALUE (IC_RIGHT (ic))) == 1 &&
-          OP_KEY (IC_RESULT (ic)) == OP_KEY (IC_LEFT (ic)))
+      if(ic->op == '+' && IS_ITEMP (IC_LEFT(ic)) && IS_ITEMP (IC_RESULT(ic)) && IS_OP_LITERAL (right) &&
+          ulFromVal (OP_VALUE (IC_RIGHT(ic))) == 1 &&
+          OP_KEY (IC_RESULT(ic)) == OP_KEY (IC_LEFT(ic)))
         return(true);
 
-      if((ic->op == '=' || ic->op == CAST) && !POINTER_SET (ic) && isOperandEqual(IC_RESULT(ic), IC_RIGHT(ic)))
+      if((ic->op == '=' || ic->op == CAST) && !POINTER_SET (ic) && isOperandEqual (result, right))
+        return(true);
+
+      if((ic->op == '=' || ic->op == CAST) && !POINTER_SET (ic) && !(ic->op == CAST && IS_BOOL (operandType (result))) &&
+        (operand_in_reg(right, REG_A, ia, i, G) || operand_in_reg(right, REG_B, ia, i, G) || operand_in_reg(right, REG_C, ia, i, G) || operand_in_reg(right, REG_D, ia, i, G) || operand_in_reg(right, REG_E, ia, i, G) || operand_in_reg(right, REG_H, ia, i, G) || operand_in_reg(right, REG_L, ia, i, G)) &&
+        (operand_in_reg(right, REG_A, ia, i, G) || operand_in_reg(result, REG_B, ia, i, G) || operand_in_reg(result, REG_C, ia, i, G) || operand_in_reg(result, REG_D, ia, i, G) || operand_in_reg(result, REG_E, ia, i, G) || operand_in_reg(right, REG_H, ia, i, G) || operand_in_reg(right, REG_L, ia, i, G)))
         return(true);
 
       if(ic->op == GOTO || ic->op == LABEL)
         return(true);
 
-      //if(i == 15) std::cout << "Not Used: Dropping at " << i << ", " << ic->key << "(" << int(ic->op) << "\n";
-      return(false);
+      if(ic->op == IPUSH && getSize(operandType(IC_LEFT(ic))) <= 2 &&
+        (operand_in_reg(left, REG_A, ia, i, G) ||
+        operand_in_reg(left, REG_C, ia, i, G) && I[ia.registers[REG_C][1]].byte == 0 && (getSize(operandType(left)) < 2 || operand_in_reg(left, REG_B, ia, i, G)) ||
+        operand_in_reg(left, REG_E, ia, i, G) && I[ia.registers[REG_E][1]].byte == 0 && (getSize(operandType(left)) < 2 || operand_in_reg(left, REG_D, ia, i, G)) ||
+        operand_in_reg(left, REG_L, ia, i, G) && I[ia.registers[REG_L][1]].byte == 0 && (getSize(operandType(left)) < 2 || operand_in_reg(left, REG_H, ia, i, G)) ||
+        operand_in_reg(left, REG_IYL, ia, i, G) && I[ia.registers[REG_IYL][1]].byte == 0 && (getSize(operandType(left)) < 2 || operand_in_reg(left, REG_IYH, ia, i, G))))
+        return(true);
+      if(!result_in_A && !input_in_A)
+        return(false);
     }
 
   // Last use of operand in A.
-  const std::set<var_t> &dying = G[i].dying;
   if(input_in_A && (result_in_A || dying.find(ia.registers[REG_A][1]) != dying.end() || dying.find(ia.registers[REG_A][0]) != dying.end()))
     {
       if(ic->op != IFX &&
-        !((ic->op == RIGHT_OP || ic->op == LEFT_OP) && (IS_OP_LITERAL(IC_RIGHT(ic)) || operand_in_reg(IC_RIGHT(ic), REG_A, ia, i, G))) &&
+        ic->op != RETURN &&
+        !((ic->op == RIGHT_OP || ic->op == LEFT_OP) && (IS_OP_LITERAL(right) || operand_in_reg(right, REG_A, ia, i, G))) &&
         !((ic->op == '=' || ic->op == CAST) && !(IY_RESERVED && POINTER_SET(ic))) &&
         !IS_BITWISE_OP (ic) &&
         !(ic->op == '~') &&
-        !(ic->op == '*' && IS_ITEMP(IC_LEFT(ic)) && IS_ITEMP(IC_RIGHT(ic))) &&
+        !(ic->op == '*' && (IS_ITEMP(IC_LEFT(ic)) || IS_OP_LITERAL(IC_LEFT(ic))) && (IS_ITEMP(IC_RIGHT(ic)) || IS_OP_LITERAL(IC_RIGHT(ic)))) &&
         !((ic->op == '-' || ic->op == '+' || ic->op == EQ_OP) && IS_OP_LITERAL(IC_RIGHT(ic))))
         {
-          //if(i == 15) std::cout << "Last use: Dropping at " << i << ", " << ic->key << "(" << int(ic->op) << ")\n";
+          //std::cout << "Last use: Dropping at " << i << ", " << ic->key << "(" << int(ic->op) << ")\n";
           return(false);
         }
     }
@@ -544,7 +614,9 @@
       !POINTER_GET(ic) &&
       ic->op != '+' &&
       ic->op != '-' &&
+      (ic->op != '*' || !IS_OP_LITERAL(IC_LEFT(ic)) && !IS_OP_LITERAL(right)) &&
       !IS_BITWISE_OP(ic) &&
+      ic->op != GET_VALUE_AT_ADDRESS &&
       ic->op != '=' &&
       ic->op != EQ_OP &&
       ic->op != '<' &&
@@ -553,19 +625,19 @@
       ic->op != CALL &&
       ic->op != PCALL &&
       ic->op != GETHBIT &&
-      !((ic->op == LEFT_OP || ic->op == RIGHT_OP) && IS_OP_LITERAL(IC_RIGHT(ic))))
+      !((ic->op == LEFT_OP || ic->op == RIGHT_OP) && IS_OP_LITERAL(right)))
     {
-      //if(i == 15) std::cout << "First use: Dropping at " << i << ", " << ic->key << "(" << int(ic->op) << "\n";
+      //std::cout << "First use: Dropping at " << i << ", " << ic->key << "(" << int(ic->op) << "\n";
       return(false);
     }
 
-  //if(i == 15) std::cout << "Default OK\n";
+  //std::cout << "Default OK\n";
 
   return(true);
 }
 
 template <class G_t, class I_t>
-bool HLinst_ok(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+static bool HLinst_ok(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
 {
   const iCode *ic = G[i].ic;
 
@@ -573,6 +645,8 @@
   if(TARGET_IS_GBZ80)
     return(true);
 
+  bool exstk = (should_omit_frame_ptr || (currFunc && currFunc->stack > 127) || IS_GB);
+
   const i_assignment_t &ia = a.i_assignment;
 
   bool unused_L = (ia.registers[REG_L][1] < 0);
@@ -582,7 +656,8 @@
     return(true);	// Register HL not in use.
 
 #if 0
-  std::cout << "HLinst_ok: at (" << i << ", " << ic->key << ")\nL = (" << ia.registers[REG_L][0] << ", " << ia.registers[REG_L][1] << "), H = (" << ia.registers[REG_H][0] << ", " << ia.registers[REG_H][1] << ")inst " << i << ", " << ic->key << "\n";
+  if (ic->key == 40)
+    std::cout << "HLinst_ok: at (" << i << ", " << ic->key << ")\nL = (" << ia.registers[REG_L][0] << ", " << ia.registers[REG_L][1] << "), H = (" << ia.registers[REG_H][0] << ", " << ia.registers[REG_H][1] << ")inst " << i << ", " << ic->key << "\n";
 #endif
 
   const operand *left = IC_LEFT(ic);
@@ -631,19 +706,24 @@
   if((IS_GB || IY_RESERVED) && (IS_TRUE_SYMOP(left) || IS_TRUE_SYMOP(right)))
     return(false);
 
-  if(options.omitFramePtr)	// Todo: Make this more accurate to get better code when using --fomit-frame-pointer
-	return(false);
+  if((IS_GB || IY_RESERVED) && IS_TRUE_SYMOP(result) && getSize(operandType(IC_RESULT(ic))) > 2)
+    return(false);
 
   if(result_only_HL && ic->op == PCALL)
     return(true);
 
-  if(ic->op == '+' && getSize(operandType(IC_RESULT(ic))) >= 2 &&
-    (IS_TRUE_SYMOP (result) || IS_TRUE_SYMOP (left) || IS_TRUE_SYMOP (right))) // Might use (hl).
+  if(exstk && (operand_on_stack(result, a, i, G) + operand_on_stack(left, a, i, G) + operand_on_stack(right, a, i, G) >= 2) && (result && IS_SYMOP(result) && getSize(operandType(result)) >= 2 || !result_only_HL))	// Todo: Make this more accurate to get better code when using --fomit-frame-pointer
+    return(false);
+  if(exstk && (operand_on_stack(left, a, i, G) || operand_on_stack(right, a, i, G)) && ic->op == '>' || ic->op == '<')
     return(false);
 
-  if(ic->op == '+' && input_in_HL && IS_TRUE_SYMOP (result)) // Might use (hl) for result.
+  if(ic->op == '+' && getSize(operandType(result)) >= 2 &&
+    (IS_TRUE_SYMOP (result) || IS_TRUE_SYMOP (left) || exstk && operand_on_stack(left, a, i, G) || IS_TRUE_SYMOP (right) || exstk && operand_on_stack(right, a, i, G))) // Might use (hl).
     return(false);
-    
+
+  if(ic->op == '+' && input_in_HL && (IS_TRUE_SYMOP (result) || operand_on_stack(result, a, i, G) && exstk)) // Might use (hl) for result.
+    return(false);
+
   // HL overwritten by result.
   if(result_only_HL && !POINTER_SET(ic) &&
       (ic->op == ADDRESS_OF ||
@@ -654,7 +734,7 @@
        ic->op == CAST))
     return(true);
 
-  if(IC_RESULT(ic) && IS_SYMOP(result) && isOperandInDirSpace(IC_RESULT(ic)))
+  if(result && IS_SYMOP(result) && isOperandInDirSpace(IC_RESULT(ic)))
     return(false);
 
   if((input_in_HL || !result_only_HL) && left && IS_SYMOP(left) && isOperandInDirSpace(IC_LEFT(ic)))
@@ -668,13 +748,32 @@
     return(true);
   if(SKIP_IC2(ic))
     return(true);
-  if(ic->op == IPUSH && input_in_H && (getSize(operandType(IC_LEFT(ic))) <= 2 || I[ia.registers[REG_L][1]].byte == 2 && I[ia.registers[REG_H][1]].byte == 3))
+  if(ic->op == IPUSH && input_in_H && (getSize(operandType(IC_LEFT(ic))) <= 2 || ia.registers[REG_L][1] > 0 && I[ia.registers[REG_L][1]].byte == 2 && ia.registers[REG_H][1] > 0 && I[ia.registers[REG_H][1]].byte == 3))
+    return(true);
+  if(ic->op == IPUSH && ic->next && ic->next->op == CALL)
+    return(true);
+  if(ic->op == IPUSH && getSize(operandType(left)) == 2 &&
+    (ia.registers[REG_C][1] < 0 && ia.registers[REG_B][1] < 0 || ia.registers[REG_E][1] < 0 && ia.registers[REG_D][1] < 0)) // Can use pair other than HL.
+    return(true);
+  if(ic->op == IPUSH && getSize(operandType(left)) <= 2 &&
+    (operand_in_reg(left, REG_C, ia, i, G) && I[ia.registers[REG_C][1]].byte == 0 && (getSize(operandType(left)) < 2 || operand_in_reg(left, REG_B, ia, i, G))||
+    operand_in_reg(left, REG_E, ia, i, G) && I[ia.registers[REG_E][1]].byte == 0 && (getSize(operandType(left)) < 2 || operand_in_reg(left, REG_D, ia, i, G)) ||
+    operand_in_reg(left, REG_IYL, ia, i, G) && I[ia.registers[REG_IYL][1]].byte == 0 && (getSize(operandType(left)) < 2 || operand_in_reg(left, REG_IYH, ia, i, G))))
     return(true);
   if(POINTER_GET(ic) && input_in_L && input_in_H && (getSize(operandType(IC_RESULT(ic))) == 1 || !result_in_HL))
     return(true);
+  if(!IS_GB && ic->op == ADDRESS_OF &&
+    (operand_in_reg(result, REG_IYL, ia, i, G) && ia.registers[REG_IYL][1] > 0 && I[ia.registers[REG_IYL][1]].byte == 0 && operand_in_reg(result, REG_IYH, ia, i, G) ||
+    !OP_SYMBOL_CONST (left)->onStack && operand_in_reg(result, REG_C, ia, i, G) && ia.registers[REG_C][1] > 0 && I[ia.registers[REG_C][1]].byte == 0 && operand_in_reg(result, REG_B, ia, i, G) ||
+    !OP_SYMBOL_CONST (left)->onStack && operand_in_reg(result, REG_E, ia, i, G) && ia.registers[REG_E][1] > 0 && I[ia.registers[REG_E][1]].byte == 0 && operand_in_reg(result, REG_D, ia, i, G)))
+    return(true);
+
   if(ic->op == LEFT_OP && isOperandLiteral(IC_RIGHT(ic)))
     return(true);
 
+  if(exstk && !result_only_HL && (operand_on_stack(left, a, i, G) || operand_on_stack(right, a, i, G) || operand_on_stack(result, a, i, G)) && ic->op == '+')
+    return(false);
+
   if((!POINTER_SET(ic) && !POINTER_GET(ic) && (
         (ic->op == '=' ||
          ic->op == CAST ||
@@ -686,17 +785,29 @@
          ic->op == '<' ||
          ic->op == EQ_OP ||*/
          (ic->op == '+' && getSize(operandType(IC_RESULT(ic))) == 1) ||
-         (ic->op == '+' && getSize(operandType(IC_RESULT(ic))) <= 2 && result_only_HL) ))))	// 16 bit addition might use add hl, rr
+         (ic->op == '+' && getSize(operandType(IC_RESULT(ic))) <= 2 && (result_only_HL || !IS_GB)) ))))	// 16 bit addition on gbz80 might need to use add hl, rr.
     return(true);
 
   if((ic->op == '<' || ic->op == '>') && (IS_ITEMP(left) || IS_OP_LITERAL(left) || IS_ITEMP(right) || IS_OP_LITERAL(right)))	// Todo: Fix for large stack.
     return(true);
     
-  if(IS_VALOP(right) && ic->op == EQ_OP)
+  if(ic->op == EQ_OP && IS_VALOP(right))
+    return(true);
+
+  if(ic->op == CALL)
     return(true);
 
   // HL overwritten by result.
-  if(result_only_HL && (ic->op == CALL || ic->op == PCALL))
+  if(result_only_HL && ic->op == PCALL)
+    return(true);
+
+  if(POINTER_GET(ic) && getSize(operandType(IC_RESULT(ic))) == 1 && !IS_BITVAR(getSpec(operandType(result))) &&
+    (operand_in_reg(right, REG_C, ia, i, G) && I[ia.registers[REG_C][1]].byte == 0 && operand_in_reg(right, REG_B, ia, i, G) || // Uses ld a, (bc)
+    operand_in_reg(right, REG_E, ia, i, G) && I[ia.registers[REG_E][1]].byte == 0 && operand_in_reg(right, REG_D, ia, i, G) || // Uses ld a, (de)
+    operand_in_reg(right, REG_IYL, ia, i, G) && I[ia.registers[REG_IYL][1]].byte == 0 && operand_in_reg(right, REG_IYH, ia, i, G))) // Uses ld r, 0 (iy)
+    return(true);
+
+  if((ic->op == '=') && POINTER_SET(ic) && operand_in_reg(result, REG_IYL, ia, i, G) && I[ia.registers[REG_IYL][1]].byte == 0 && operand_in_reg(result, REG_IYH, ia, i, G))	// Uses ld 0 (iy), l etc
     return(true);
 
   if((ic->op == '=' || ic->op == CAST) && POINTER_SET(ic) && !result_only_HL)	// loads result pointer into (hl) first.
@@ -715,7 +826,7 @@
 }
 
 template <class G_t, class I_t>
-bool IYinst_ok(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+static bool IYinst_ok(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
 {
   const iCode *ic = G[i].ic;
 
@@ -725,8 +836,10 @@
 
   const i_assignment_t &ia = a.i_assignment;
 
-  //if(ic->key == 118)
-//		std::cout << "1IYinst_ok: at (" << i << ", " << ic->key << ")\nIYL = (" << ia.registers[REG_IYL][0] << ", " << ia.registers[REG_IYL][1] << "), IYH = (" << ia.registers[REG_IYH][0] << ", " << ia.registers[REG_IYH][1] << ")inst " << i << ", " << ic->key << "\n";
+  /*if(ic->key == 40)
+		std::cout << "1IYinst_ok: at (" << i << ", " << ic->key << ")\nIYL = (" << ia.registers[REG_IYL][0] << ", " << ia.registers[REG_IYL][1] << "), IYH = (" << ia.registers[REG_IYH][0] << ", " << ia.registers[REG_IYH][1] << ")inst " << i << ", " << ic->key << "\n";*/
+
+  bool exstk = (should_omit_frame_ptr || (currFunc && currFunc->stack > 127));
 
   bool unused_IYL = (ia.registers[REG_IYL][1] < 0);
   bool unused_IYH = (ia.registers[REG_IYH][1] < 0);
@@ -766,9 +879,9 @@
 
   if(unused_IYL && unused_IYH)
     return(true);	// Register IY not in use.
-    
-  if(options.omitFramePtr)	// Todo: Make this more accurate to get better code when using --fomit-frame-pointer
-	return(false);
+
+  if(exstk && (operand_on_stack(result, a, i, G) || operand_on_stack(left, a, i, G) || operand_on_stack(right, a, i, G)))	// Todo: Make this more accurate to get better code when using --fomit-frame-pointer
+    return(false);
 
   // Code generator cannot handle variables that are only partially in IY.
   if(unused_IYL ^ unused_IYH)
@@ -848,7 +961,54 @@
 }
 
 template <class G_t, class I_t>
-void set_surviving_regs(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+bool DEinst_ok(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+{
+  if(!IS_GB) // Only gbz80 might need de for code generation.
+    return(true);
+
+  const i_assignment_t &ia = a.i_assignment;
+
+  bool unused_E = (ia.registers[REG_E][1] < 0);
+  bool unused_D = (ia.registers[REG_D][1] < 0);
+
+  if(unused_E && unused_D)
+    return(true);	// Register DE not in use.
+
+  const iCode *ic = G[i].ic;
+  const operand *left = IC_LEFT(ic);
+  const operand *right = IC_RIGHT(ic);
+  const operand *result = IC_RESULT(ic);
+
+  //const std::set<var_t> &dying = G[i].dying;
+
+  if(ic->op == PCALL)
+    return(false);
+
+  if(ic->op == GET_VALUE_AT_ADDRESS && (getSize(operandType(result)) >= 2 || !operand_is_pair(left, a, i, G)))
+    return(false);
+
+  if (ic->op == '=' && POINTER_SET(ic) && !operand_is_pair(result, a, i, G))
+    return(false);
+
+  if((ic->op == '=' || ic->op == CAST) && getSize(operandType(result)) >= 2 &&
+     (operand_on_stack(right, a, i, G) || operand_in_reg(right, REG_L, ia, i, G) || operand_in_reg(right, REG_H, ia, i, G)) &&
+     (operand_on_stack(result, a, i, G) || operand_in_reg(result, REG_L, ia, i, G) || operand_in_reg(result, REG_H, ia, i, G)))
+    return(false);
+
+  if(ic->op == '+' && getSize(operandType(result)) >= 2)
+    return(false);
+
+  if(ic->op == UNARYMINUS || ic->op == '-' || ic->op == '*')
+    return(false);
+
+  if(ic->op == '>' || ic->op == '<')
+    return(false);
+
+  return(true);
+}
+
+template <class G_t, class I_t>
+static void set_surviving_regs(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
 {
   iCode *ic = G[i].ic;
   
@@ -856,13 +1016,13 @@
   
   std::set<var_t>::const_iterator v, v_end;
   for (v = G[i].alive.begin(), v_end = G[i].alive.end(); v != v_end; ++v)
-    if(G[i].dying.find(*v) == G[i].dying.end())
-      if(!(IC_RESULT(ic) && IS_SYMOP(IC_RESULT(ic)) && OP_SYMBOL_CONST(IC_RESULT(ic))->key == I[*v].v))
+    if(a.global[*v] >= 0 && G[i].dying.find(*v) == G[i].dying.end())
+      if(!((IC_RESULT(ic) && !POINTER_SET(ic)) && IS_SYMOP(IC_RESULT(ic)) && OP_SYMBOL_CONST(IC_RESULT(ic))->key == I[*v].v))
         ic->rSurv = bitVectSetBit(ic->rSurv, a.global[*v]);
 }
 
 template<class G_t>
-void unset_surviving_regs(unsigned short int i, const G_t &G)
+static void unset_surviving_regs(unsigned short int i, const G_t &G)
 {
   iCode *ic = G[i].ic;
   
@@ -870,7 +1030,7 @@
 }
 
 template <class G_t, class I_t>
-void assign_operand_for_cost(operand *o, const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+static void assign_operand_for_cost(operand *o, const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
 {
   if(!o || !IS_SYMOP(o))
     return;
@@ -881,7 +1041,7 @@
       var_t v = oi->second;
       if(a.global[v] >= 0)
         { 
-          if((a.global[v] != REG_A || !OPTRALLOC_A) && (a.global[v] != REG_IYL && a.global[v] != REG_IYH || !OPTRALLOC_IY))
+          if(a.global[v] != REG_A && (a.global[v] != REG_IYL && a.global[v] != REG_IYH || !OPTRALLOC_IY))
             {
               sym->regs[I[v].byte] = regsZ80 + a.global[v];
               sym->accuse = 0;
@@ -914,7 +1074,7 @@
 }
 
 template <class G_t, class I_t>
-void assign_operands_for_cost(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+static void assign_operands_for_cost(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
 {
   const iCode *ic = G[i].ic;
   
@@ -937,20 +1097,28 @@
 
 // Cost function.
 template <class G_t, class I_t>
-float instruction_cost(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+static float instruction_cost(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
 {
   iCode *ic = G[i].ic;
   float c;
 
+  wassert (TARGET_Z80_LIKE);
+
   if(!inst_sane(a, i, G, I))
     return(std::numeric_limits<float>::infinity());
 
-  if(OPTRALLOC_A && !Ainst_ok(a, i, G, I))
+  if(ic->generated)
+    return(0.0f);
+
+  if(!Ainst_ok(a, i, G, I))
     return(std::numeric_limits<float>::infinity());
 
   if(OPTRALLOC_HL && !HLinst_ok(a, i, G, I))
     return(std::numeric_limits<float>::infinity());
 
+  if(!DEinst_ok(a, i, G, I))
+    return(std::numeric_limits<float>::infinity());
+
   if(OPTRALLOC_IY && !IYinst_ok(a, i, G, I))
     return(std::numeric_limits<float>::infinity());
 
@@ -1082,12 +1250,12 @@
   return(false);
 }
 
-// For early removel of assignments that cannot be extended to valid assignments.
+// For early removal of assignments that cannot be extended to valid assignments.
 template <class G_t, class I_t>
-bool assignment_hopeless(const assignment &a, unsigned short int i, const G_t &G, const I_t &I, const var_t lastvar)
+static bool assignment_hopeless(const assignment &a, unsigned short int i, const G_t &G, const I_t &I, const var_t lastvar)
 {
   // Can check for Ainst_ok() since A only contains 1-byte variables.
-  if(OPTRALLOC_A && !Ainst_ok(a, i, G, I))
+  if(!G[i].ic->generated && !Ainst_ok(a, i, G, I))
     return(true);
 
   if(local_assignment_insane(a, I, lastvar))
@@ -1120,8 +1288,9 @@
   return(false);
 }
 
+// Increase chance of finding good compatible assignments at join nodes.
 template <class T_t>
-void get_best_local_assignment_biased(assignment &a, typename boost::graph_traits<T_t>::vertex_descriptor t, const T_t &T)
+static void get_best_local_assignment_biased(assignment &a, typename boost::graph_traits<T_t>::vertex_descriptor t, const T_t &T)
 {
   const assignment_list_t &alist = T[t].assignments;
 
@@ -1132,7 +1301,7 @@
         {
           varset_t::const_iterator vi, vi_end;
           for(vi = ai->local.begin(), vi_end = ai->local.end(); vi != vi_end; ++vi)
-            if(OPTRALLOC_A && ai->global[*vi] == REG_A || OPTRALLOC_HL && (ai->global[*vi] == REG_H || ai->global[*vi] == REG_L) || OPTRALLOC_IY && (ai->global[*vi] == REG_IYH || ai->global[*vi] == REG_IYL))
+            if(ai->global[*vi] == REG_A || OPTRALLOC_HL && (ai->global[*vi] == REG_H || ai->global[*vi] == REG_L) || OPTRALLOC_IY && (ai->global[*vi] == REG_IYH || ai->global[*vi] == REG_IYL))
               goto too_risky;
           ai_best = ai;
         }
@@ -1148,7 +1317,7 @@
 }
 
 template <class G_t, class I_t>
-float rough_cost_estimate(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
+static float rough_cost_estimate(const assignment &a, unsigned short int i, const G_t &G, const I_t &I)
 {
   const i_assignment_t &ia = a.i_assignment;
     
@@ -1162,7 +1331,7 @@
     !HLinst_ok(a, i, G, I))
     c += 8.0f;
 
-  if(OPTRALLOC_A && ia.registers[REG_A][1] < 0)
+  if(ia.registers[REG_A][1] < 0)
     c += 0.03f;
 
   if(OPTRALLOC_HL && ia.registers[REG_L][1] < 0)
@@ -1200,9 +1369,22 @@
   return(c);
 }
 
+// Code for another ic is generated when generating this one. Mark the other as generated.
+static void extra_ic_generated(const iCode *ic)
+{
+  if(ic->op == '>' || ic->op == '<' || ic->op == LE_OP || ic->op == GE_OP || ic->op == EQ_OP || ic->op == NE_OP || ic->op == '^' || ic->op == '|' || ic->op == BITWISEAND)
+    {
+      iCode *ifx;
+      if (ifx = ifxForOp (IC_RESULT (ic), ic))
+      ifx->generated = 1;
+    }
+}
+
 template <class T_t, class G_t, class I_t>
-void tree_dec_ralloc(T_t &T, const G_t &G, const I_t &I)
+static bool tree_dec_ralloc(T_t &T, const G_t &G, const I_t &I)
 {
+  bool assignment_optimal;
+
   con2_t I2(boost::num_vertices(I));
   for(unsigned int i = 0; i < boost::num_vertices(I); i++)
     {
@@ -1217,7 +1399,7 @@
 
   assignment ac;
   assignment_optimal = true;
-  tree_dec_ralloc_nodes(T, find_root(T), G, I2, ac);
+  tree_dec_ralloc_nodes(T, find_root(T), G, I2, ac, &assignment_optimal);
 
   const assignment &winner = *(T[find_root(T)].assignments.begin());
 
@@ -1244,7 +1426,7 @@
       symbol *sym = (symbol *)(hTabItemWithKey(liveRanges, I[v].v));
       if(winner.global[v] >= 0)
         {
-          if((winner.global[v] != REG_A || !OPTRALLOC_A) && (winner.global[v] != REG_IYL && winner.global[v] != REG_IYH || !OPTRALLOC_IY))
+          if(winner.global[v] != REG_A && (winner.global[v] != REG_IYL && winner.global[v] != REG_IYH || !OPTRALLOC_IY))
             {
               sym->regs[I[v].byte] = regsZ80 + winner.global[v];
               sym->accuse = 0;
@@ -1276,9 +1458,61 @@
           sym->isspilt = false;
         }
     }
-    
+
   for(unsigned int i = 0; i < boost::num_vertices(G); i++)
     set_surviving_regs(winner, i, G, I);	// Never freed. Memory leak?
+
+  return(!assignment_optimal);
+}
+
+// Omit the frame pointer for functions with low register pressure and few parameter accesses.
+template <class G_t>
+static bool omit_frame_ptr(const G_t &G)
+{
+  if(IS_GB)
+    return(false);
+
+  if(options.omitFramePtr)
+    return(true);
+    
+  signed char omitcost = -16;
+  for(unsigned int i = 0; i < boost::num_vertices(G); i++)
+    {
+      if((int)G[i].alive.size() > NUM_REGS - 4)
+        return(false);
+
+      const iCode *const ic = G[i].ic;
+      const operand *o;
+      o = IC_RESULT(ic);
+      if(o && IS_SYMOP(o) && OP_SYMBOL_CONST(o)->_isparm && !IS_REGPARM (OP_SYMBOL_CONST(o)->etype))
+        omitcost += 6;
+      o = IC_LEFT(ic);
+      if(o && IS_SYMOP(o) && OP_SYMBOL_CONST(o)->_isparm && !IS_REGPARM (OP_SYMBOL_CONST(o)->etype))
+        omitcost += 6;
+      o = IC_RIGHT(ic);
+      if(o && IS_SYMOP(o) && OP_SYMBOL_CONST(o)->_isparm && !IS_REGPARM (OP_SYMBOL_CONST(o)->etype))
+        omitcost += 6;
+
+      if(omitcost > 14) // Chosen greater than zero, since the peephole optimizer often can optimize the use of iy into use of hl, reducing the cost.
+        return(false);
+    }
+
+  return(true);
+}
+
+// Adjust stack location when deciding to omit frame pointer.
+void move_parms(void)
+{
+  if(!currFunc || IS_GB || options.omitFramePtr || !should_omit_frame_ptr)
+    return;
+
+  for(value *val = FUNC_ARGS (currFunc->type); val; val = val->next)
+    {
+      if(IS_REGPARM(val->sym->etype) || !val->sym->onStack)
+        continue;
+
+      val->sym->stack -= 2;
+    }
 }
 
 iCode *z80_ralloc2_cc(ebbIndex *ebbi)
@@ -1295,10 +1529,13 @@
 
   ic = create_cfg(control_flow_graph, conflict_graph, ebbi);
 
-  if(z80_opts.dump_graphs)
+  should_omit_frame_ptr = omit_frame_ptr(control_flow_graph);
+  move_parms();
+
+  if(options.dump_graphs)
     dump_cfg(control_flow_graph);
 
-  if(z80_opts.dump_graphs)
+  if(options.dump_graphs)
     dump_con(conflict_graph);
 
   tree_dec_t tree_decomposition;
@@ -1313,10 +1550,10 @@
   nicify(tree_decomposition);
   alive_tree_dec(tree_decomposition, control_flow_graph);
 
-  if(z80_opts.dump_graphs)
+  if(options.dump_graphs)
     dump_tree_decomposition(tree_decomposition);
 
-  tree_dec_ralloc(tree_decomposition, control_flow_graph, conflict_graph);
+  z80_assignment_optimal = !tree_dec_ralloc(tree_decomposition, control_flow_graph, conflict_graph);
 
   return(ic);
 }
diff -Nru sdcc-3.1.0+dfsg/src/z80/z80.h sdcc-3.2.0+dfsg/src/z80/z80.h
--- sdcc-3.1.0+dfsg/src/z80/z80.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/z80/z80.h	2012-05-18 10:47:44.000000000 +0000
@@ -12,6 +12,7 @@
     SUB_Z80,
     SUB_Z180,
     SUB_R2K,
+    SUB_R3KA,
     SUB_GBZ80
   }
 Z80_SUB_PORT;
@@ -23,8 +24,6 @@
     int port_mode;
     int port_back;
     int reserveIY;
-    int dump_graphs;
-    int oldralloc;
   }
 Z80_OPTS;
 
@@ -32,16 +31,17 @@
 
 #define IS_Z80 (z80_opts.sub == SUB_Z80)
 #define IS_Z180 (z80_opts.sub == SUB_Z180)
-#define IS_GB  (z80_opts.sub == SUB_GBZ80)
-#define IS_R2K  (z80_opts.sub == SUB_R2K)
+#define IS_GB (z80_opts.sub == SUB_GBZ80)
+#define IS_R2K (z80_opts.sub == SUB_R2K)
+#define IS_R3KA (z80_opts.sub == SUB_R3KA)
+#define IS_RAB (IS_R2K || IS_R3KA)
 
 #define IY_RESERVED (z80_opts.reserveIY)
 
-#define OPTRALLOC_REMAT (IS_Z80 || IS_Z180 || IS_R2K) /* Enable rematerialization in the new allocator for the ports with exact cost function */
-#define OPTRALLOC_EXACT_COST (!IS_GB) // Todo: Implement exact cost for gbz80.
+#define OPTRALLOC_EXACT_COST 1
+#define OPTRALLOC_REMAT (OPTRALLOC_EXACT_COST && !IS_GB)
 #define OPTRALLOC_HL (!IS_GB)
-#define OPTRALLOC_A 1
-#define OPTRALLOC_IY !IY_RESERVED
+#define OPTRALLOC_IY !(IY_RESERVED || IS_GB)
 
 enum
   {
diff -Nru sdcc-3.1.0+dfsg/src/z80/z80.vcxproj sdcc-3.2.0+dfsg/src/z80/z80.vcxproj
--- sdcc-3.1.0+dfsg/src/z80/z80.vcxproj	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/src/z80/z80.vcxproj	2012-03-18 13:40:40.000000000 +0000
@@ -48,7 +48,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;.;..\..;..\..\support\util;C:\Program Files\boost\boost_1_44;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;.;..\..;..\..\support\util;C:\Program Files\boost\boost_1_47;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_LIB;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -80,7 +80,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..;.;..\..;..\..\support\util;C:\Program Files\boost\boost_1_44;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;.;..\..;..\..\support\util;C:\Program Files\boost\boost_1_47;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -164,30 +164,38 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="peeph-gbz80.def">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f ../SDCCpeeph.awk %(FullPath) &gt;peeph-gbz80.rul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f ../SDCCpeeph.awk %(Identity) &gt;peeph-gbz80.rul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">peeph-gbz80.rul;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f ../SDCCpeeph.awk %(FullPath) &gt;peeph-gbz80.rul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f ../SDCCpeeph.awk %(Identity) &gt;peeph-gbz80.rul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">peeph-gbz80.rul;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Peephole Rule: peeph-gbz80.rul</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Peephole Rule: peeph-gbz80.rul</Message>
     </CustomBuild>
     <CustomBuild Include="peeph-z80.def">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f ../SDCCpeeph.awk %(FullPath) &gt;peeph-z80.rul</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f ../SDCCpeeph.awk %(FullPath) &gt;peeph-z80.rul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f ../SDCCpeeph.awk %(Identity) &gt;peeph-z80.rul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f ../SDCCpeeph.awk %(Identity) &gt;peeph-z80.rul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">peeph-z80.rul;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">peeph-z80.rul;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Peephole Rule: peeph-z80.rul</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Peephole Rule: peeph-z80.rul</Message>
     </CustomBuild>
     <CustomBuild Include="peeph.def">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f ../SDCCpeeph.awk %(FullPath) &gt;peeph.rul</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f ../SDCCpeeph.awk %(FullPath) &gt;peeph.rul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f ../SDCCpeeph.awk %(Identity) &gt;peeph.rul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f ../SDCCpeeph.awk %(Identity) &gt;peeph.rul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">peeph.rul;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">peeph.rul;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Peephole Rule: peeph.ru</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Peephole Rule: peeph.ru</Message>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="peeph-r2k.def">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f ../SDCCpeeph.awk %(FullPath) &gt;peeph-r2k.rul</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f ../SDCCpeeph.awk %(FullPath) &gt;peeph-r2k.rul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f ../SDCCpeeph.awk %(Identity) &gt;peeph-r2k.rul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f ../SDCCpeeph.awk %(Identity) &gt;peeph-r2k.rul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">peeph-r2k.rul;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">peeph-r2k.rul;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Peephole Rule: peeph-r2k.rul</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Peephole Rule: peeph-r2k.rul</Message>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff -Nru sdcc-3.1.0+dfsg/support/cpp/config.in sdcc-3.2.0+dfsg/support/cpp/config.in
--- sdcc-3.1.0+dfsg/support/cpp/config.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/cpp/config.in	2012-03-28 12:38:08.000000000 +0000
@@ -31,6 +31,9 @@
 #undef PREFIX_INCLUDE_DIR
 
 
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
 /* Define as the number of bits in a byte, if \`limits.h' doesn't. */
 #undef CHAR_BIT
 
@@ -163,10 +166,6 @@
 /* Define if the host execution character set is EBCDIC. */
 #undef HOST_EBCDIC
 
-/* Define if the host machine stores words of multi-word integers in
-   big-endian order. */
-#undef HOST_WORDS_BIG_ENDIAN
-
 /* Define if host mkdir takes a single argument. */
 #undef MKDIR_TAKES_ONE_ARG
 
@@ -219,6 +218,18 @@
 /* Define to the version of the distribution. */
 #undef VERSION
 
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
+
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
diff -Nru sdcc-3.1.0+dfsg/support/cpp/configure sdcc-3.2.0+dfsg/support/cpp/configure
--- sdcc-3.1.0+dfsg/support/cpp/configure	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/cpp/configure	2012-05-18 10:47:44.000000000 +0000
@@ -1,11 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68.
+# Generated by GNU Autoconf 2.69.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -134,6 +132,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -167,7 +190,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -212,21 +236,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -328,6 +356,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -449,6 +485,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -483,16 +523,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -504,28 +544,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -1179,8 +1199,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1431,9 +1449,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1706,7 +1724,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1850,7 +1868,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2294,16 +2312,16 @@
 # Check whether --with-local-prefix was given.
 if test "${with_local_prefix+set}" = set; then :
   withval=$with_local_prefix; case "${withval}" in
-yes)	as_fn_error $? "bad value ${withval} given for local include directory prefix" "$LINENO" 5 ;;
-no)	;;
-*)	local_prefix=$with_local_prefix ;;
+yes)    as_fn_error $? "bad value ${withval} given for local include directory prefix" "$LINENO" 5 ;;
+no)     ;;
+*)      local_prefix=$with_local_prefix ;;
 esac
 fi
 
 
 # Default local prefix if it is empty
 if test x$local_prefix = x; then
-	local_prefix=/usr/local
+        local_prefix=/usr/local
 fi
 
 test "$program_prefix" != NONE &&
@@ -2351,7 +2369,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2391,7 +2409,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2444,7 +2462,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2485,7 +2503,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -2543,7 +2561,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2587,7 +2605,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3033,8 +3051,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3592,7 +3609,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -3658,7 +3675,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -3798,10 +3815,10 @@
 $as_echo_n "checking whether a default assembler was specified... " >&6; }
 if test x"${DEFAULT_ASSEMBLER+set}" = x"set"; then
     if test x"$gas_flag" = x"no"; then
-    	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($DEFAULT_ASSEMBLER)" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($DEFAULT_ASSEMBLER)" >&5
 $as_echo "yes ($DEFAULT_ASSEMBLER)" >&6; }
     else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($DEFAULT_ASSEMBLER - GNU as)" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($DEFAULT_ASSEMBLER - GNU as)" >&5
 $as_echo "yes ($DEFAULT_ASSEMBLER - GNU as)" >&6; }
     fi
 else
@@ -3813,10 +3830,10 @@
 $as_echo_n "checking whether a default linker was specified... " >&6; }
 if test x"${DEFAULT_LINKER+set}" = x"set"; then
     if test x"$gnu_ld_flag" = x"no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($DEFAULT_LINKER)" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($DEFAULT_LINKER)" >&5
 $as_echo "yes ($DEFAULT_LINKER)" >&6; }
     else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($DEFAULT_LINKER - GNU ld)" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($DEFAULT_LINKER - GNU ld)" >&5
 $as_echo "yes ($DEFAULT_LINKER - GNU ld)" >&6; }
     fi
 else
@@ -3843,7 +3860,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3960,7 +3977,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4000,7 +4017,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4395,9 +4412,9 @@
 
 
 for ac_header in limits.h stddef.h string.h strings.h stdlib.h time.h \
-		 fcntl.h unistd.h sys/file.h sys/time.h \
-		 sys/param.h sys/stat.h \
-		 direct.h malloc.h
+                 fcntl.h unistd.h sys/file.h sys/time.h \
+                 sys/param.h sys/stat.h \
+                 direct.h malloc.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -4484,79 +4501,229 @@
 
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking byte ordering" >&5
-$as_echo_n "checking byte ordering... " >&6; }
-if ${ac_cv_c_compile_endian+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if ${ac_cv_c_bigendian+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_cv_c_compile_endian=unknown
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
 
-cat > conftest.$ac_ext <<EOF
-#line 4501 "configure"
-#include "confdefs.h"
+	# Check for potential -arch flags.  It is not universal unless
+	# there are at least two -arch flags with different values.
+	ac_arch=
+	ac_prev=
+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+	 if test -n "$ac_prev"; then
+	   case $ac_word in
+	     i?86 | x86_64 | ppc | ppc64)
+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+		 ac_arch=$ac_word
+	       else
+		 ac_cv_c_bigendian=universal
+		 break
+	       fi
+	       ;;
+	   esac
+	   ac_prev=
+	 elif test "x$ac_word" = "x-arch"; then
+	   ac_prev=arch
+	 fi
+       done
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+	     #include <sys/param.h>
 
-#ifdef HAVE_LIMITS_H
-# include <limits.h>
-#endif
-/* This structure must have no internal padding.  */
-  struct {
-    char prefix[sizeof "\nendian:" - 1];
-    short word;
-    char postfix[2];
- } tester = {
-    "\nendian:",
-#if SIZEOF_SHORT == 4
-    ('A' << (CHAR_BIT * 3)) | ('B' << (CHAR_BIT * 2)) |
-#endif
-    ('A' << CHAR_BIT) | 'B',
-    'X', '\n'
-};
-EOF
-if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  od -c conftest.o |
-    sed 's/^[0-7]*[ 	]*/ /
-	  s/\*/./g
-	  s/ \\n/*/g
-	  s/ [0-9][0-9][0-9]/./g
-	  s/  \\[^ ]/./g' |
-    tr -d '
- ' | tr -s '*' '
-' | fold | sed '$a\
-' > conftest.dmp
-  if   grep 'endian:AB' conftest.dmp >/dev/null 2>&1; then
-    ac_cv_c_compile_endian=big-endian
-  elif grep 'endian:BA' conftest.dmp >/dev/null 2>&1; then
-    ac_cv_c_compile_endian=little-endian
-  fi
+int
+main ()
+{
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+		#include <sys/param.h>
+
+int
+main ()
+{
+#if BYTE_ORDER != BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
 fi
-rm -rf conftest*
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
 
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then :
+  # Try to guess by grepping values from an object file.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
 
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compile_endian" >&5
-$as_echo "$ac_cv_c_compile_endian" >&6; }
-if test $ac_cv_c_compile_endian = unknown; then
-  as_fn_error $? "*** unable to determine endianness" "$LINENO" 5
-elif test $ac_cv_c_compile_endian = big-endian; then
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
 
-$as_echo "#define HOST_WORDS_BIG_ENDIAN 1" >>confdefs.h
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_c_bigendian=no
+else
+  ac_cv_c_bigendian=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
 
+    fi
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+;; #(
+   no)
+      ;; #(
+   universal)
+
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
+     ;; #(
+   *)
+     as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
 
 
 # See if we have the mktemp command.
@@ -4576,7 +4743,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_have_mktemp_command="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4615,7 +4782,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5105,9 +5272,9 @@
 
 # We will need to find libiberty.h and ansidecl.h
 saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I${srcdir} -I${srcdir}/../include"
+CFLAGS="$CFLAGS -I${srcdir} -I${srcdir}/libiberty -I${srcdir}/libcpp/include"
 for ac_func in getenv abort strsignal errno \
-	malloc realloc calloc free clock
+        malloc realloc calloc free clock
 do
   ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ac_func is declared" >&5
@@ -5246,7 +5413,7 @@
 # then we decode the target machine and forget everything else
 # that came from the host machine.
 #for machine in $build $host $target; do
-#	. ${srcdir}/config.gcc
+#       . ${srcdir}/config.gcc
 #done
 
 extra_objs="${host_extra_objs} ${extra_objs}"
@@ -5285,29 +5452,29 @@
 # work to find out the build config parameters.
 if test x$host = x$build
 then
-	build_auto=auto-host.h
+        build_auto=auto-host.h
 else
-	# We create a subdir, then run autoconf in the subdir.
-	# To prevent recursion we set host and build for the new
-	# invocation of configure to the build for this invocation
-	# of configure.
-	tempdir=build.$$
-	rm -rf $tempdir
-	mkdir $tempdir
-	cd $tempdir
-	case ${srcdir} in
-	/* | A-Za-z:\\/* ) realsrcdir=${srcdir};;
-	*) realsrcdir=../${srcdir};;
-	esac
-	CC=${CC_FOR_BUILD} ${realsrcdir}/configure \
-		--target=$target --host=$build --build=$build
-
-	# We just finished tests for the build machine, so rename
-	# the file auto-build.h in the gcc directory.
-	mv auto-host.h ../auto-build.h
-	cd ..
-	rm -rf $tempdir
-	build_auto=auto-build.h
+        # We create a subdir, then run autoconf in the subdir.
+        # To prevent recursion we set host and build for the new
+        # invocation of configure to the build for this invocation
+        # of configure.
+        tempdir=build.$$
+        rm -rf $tempdir
+        mkdir $tempdir
+        cd $tempdir
+        case ${srcdir} in
+        /* | A-Za-z:\\/* ) realsrcdir=${srcdir};;
+        *) realsrcdir=../${srcdir};;
+        esac
+        CC=${CC_FOR_BUILD} ${realsrcdir}/configure \
+                --target=$target --host=$build --build=$build
+
+        # We just finished tests for the build machine, so rename
+        # the file auto-build.h in the gcc directory.
+        mv auto-host.h ../auto-build.h
+        cd ..
+        rm -rf $tempdir
+        build_auto=auto-build.h
 fi
 
 tm_file="${tm_file} defaults.h"
@@ -5317,14 +5484,14 @@
 
 # Truncate the target if necessary
 if test x$host_truncate_target != x; then
-	target=`echo $target | sed -e 's/\(..............\).*/\1/'`
+        target=`echo $target | sed -e 's/\(..............\).*/\1/'`
 fi
 
 # Get the version trigger filename from the toplevel
 if test "${with_gcc_version_trigger+set}" = set; then
-	gcc_version_trigger=$with_gcc_version_trigger
+        gcc_version_trigger=$with_gcc_version_trigger
 else
-	gcc_version_trigger=${srcdir}/version.c
+        gcc_version_trigger=${srcdir}/version.c
 fi
 gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*"\([^"]*\)".*/\1/'`
 gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
@@ -5364,76 +5531,76 @@
 gcc_cv_gas_minor_version=
 gcc_cv_as_gas_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/gas
 if test -x "$DEFAULT_ASSEMBLER"; then
-	gcc_cv_as="$DEFAULT_ASSEMBLER"
+        gcc_cv_as="$DEFAULT_ASSEMBLER"
 elif test -x "$AS"; then
-	gcc_cv_as="$AS"
+        gcc_cv_as="$AS"
 elif test -x as$host_exeext; then
-	# Build using assembler in the current directory.
-	gcc_cv_as=./as$host_exeext
+        # Build using assembler in the current directory.
+        gcc_cv_as=./as$host_exeext
 elif test -f $gcc_cv_as_gas_srcdir/configure.in -a -f ../gas/Makefile; then
-	# Single tree build which includes gas.
-	for f in $gcc_cv_as_gas_srcdir/configure $gcc_cv_as_gas_srcdir/configure.in $gcc_cv_as_gas_srcdir/Makefile.in
-	do
-		gcc_cv_gas_version=`grep '^VERSION=[0-9]*\.[0-9]*' $f`
-		if test x$gcc_cv_gas_version != x; then
-			break
-		fi
-	done
-	gcc_cv_gas_major_version=`expr "$gcc_cv_gas_version" : "VERSION=\([0-9]*\)"`
-	gcc_cv_gas_minor_version=`expr "$gcc_cv_gas_version" : "VERSION=[0-9]*\.\([0-9]*\)"`
+        # Single tree build which includes gas.
+        for f in $gcc_cv_as_gas_srcdir/configure $gcc_cv_as_gas_srcdir/configure.in $gcc_cv_as_gas_srcdir/Makefile.in
+        do
+                gcc_cv_gas_version=`grep '^VERSION=[0-9]*\.[0-9]*' $f`
+                if test x$gcc_cv_gas_version != x; then
+                        break
+                fi
+        done
+        gcc_cv_gas_major_version=`expr "$gcc_cv_gas_version" : "VERSION=\([0-9]*\)"`
+        gcc_cv_gas_minor_version=`expr "$gcc_cv_gas_version" : "VERSION=[0-9]*\.\([0-9]*\)"`
 fi
 
 if test "x$gcc_cv_as" = x -a x$host = x$target; then
-	# Native build.
-	# Search the same directories that the installed compiler will
-	# search.  Else we may find the wrong assembler and lose.  If we
-	# do not find a suitable assembler binary, then try the user's
-	# path.
-	#
-	# Also note we have to check MD_EXEC_PREFIX before checking the
-	# user's path.  Unfortunately, there is no good way to get at the
-	# value of MD_EXEC_PREFIX here.  So we do a brute force search
-	# through all the known MD_EXEC_PREFIX values.  Ugh.  This needs
-	# to be fixed as part of the make/configure rewrite too.
-
-	if test "x$exec_prefix" = xNONE; then
-		if test "x$prefix" = xNONE; then
-			test_prefix=/usr/local
-		else
-			test_prefix=$prefix
-		fi
-	else
-		test_prefix=$exec_prefix
-	fi
-
-	# If the loop below does not find an assembler, then use whatever
-	# one we can find in the users's path.
-	# user's path.
-	gcc_cv_as=as$host_exeext
-
-	test_dirs="$test_prefix/lib/gcc-lib/$target/$gcc_version \
-		   $test_prefix/lib/gcc-lib/$target \
-		   /usr/lib/gcc/$target/$gcc_version \
-		   /usr/lib/gcc/$target \
-		   $test_prefix/$target/bin/$target/$gcc_version \
-		   $test_prefix/$target/bin \
-		   /usr/libexec \
-		   /usr/ccs/gcc \
-		   /usr/ccs/bin \
-		   /udk/usr/ccs/bin \
-		   /bsd43/usr/lib/cmplrs/cc \
-		   /usr/cross64/usr/bin \
-		   /usr/lib/cmplrs/cc \
-		   /sysv/usr/lib/cmplrs/cc \
-		   /svr4/usr/lib/cmplrs/cc \
-		   /usr/bin"
-
-	for dir in $test_dirs; do
-		if test -f $dir/as$host_exeext; then
-			gcc_cv_as=$dir/as$host_exeext
-			break;
-		fi
-	done
+        # Native build.
+        # Search the same directories that the installed compiler will
+        # search.  Else we may find the wrong assembler and lose.  If we
+        # do not find a suitable assembler binary, then try the user's
+        # path.
+        #
+        # Also note we have to check MD_EXEC_PREFIX before checking the
+        # user's path.  Unfortunately, there is no good way to get at the
+        # value of MD_EXEC_PREFIX here.  So we do a brute force search
+        # through all the known MD_EXEC_PREFIX values.  Ugh.  This needs
+        # to be fixed as part of the make/configure rewrite too.
+
+        if test "x$exec_prefix" = xNONE; then
+                if test "x$prefix" = xNONE; then
+                        test_prefix=/usr/local
+                else
+                        test_prefix=$prefix
+                fi
+        else
+                test_prefix=$exec_prefix
+        fi
+
+        # If the loop below does not find an assembler, then use whatever
+        # one we can find in the users's path.
+        # user's path.
+        gcc_cv_as=as$host_exeext
+
+        test_dirs="$test_prefix/lib/gcc-lib/$target/$gcc_version \
+                   $test_prefix/lib/gcc-lib/$target \
+                   /usr/lib/gcc/$target/$gcc_version \
+                   /usr/lib/gcc/$target \
+                   $test_prefix/$target/bin/$target/$gcc_version \
+                   $test_prefix/$target/bin \
+                   /usr/libexec \
+                   /usr/ccs/gcc \
+                   /usr/ccs/bin \
+                   /udk/usr/ccs/bin \
+                   /bsd43/usr/lib/cmplrs/cc \
+                   /usr/cross64/usr/bin \
+                   /usr/lib/cmplrs/cc \
+                   /sysv/usr/lib/cmplrs/cc \
+                   /svr4/usr/lib/cmplrs/cc \
+                   /usr/bin"
+
+        for dir in $test_dirs; do
+                if test -f $dir/as$host_exeext; then
+                        gcc_cv_as=$dir/as$host_exeext
+                        break;
+                fi
+        done
 fi
 if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"newly built gas\"" >&5
@@ -5447,10 +5614,10 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking what nm to use" >&5
 $as_echo_n "checking what nm to use... " >&6; }
 if test -x nm$host_exeext; then
-	gcc_cv_nm=./nm$host_exeext
+        gcc_cv_nm=./nm$host_exeext
 elif test x$host = x$target; then
-	# Native build.
-	gcc_cv_nm=nm$host_exeext
+        # Native build.
+        gcc_cv_nm=nm$host_exeext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_nm" >&5
 $as_echo "$gcc_cv_nm" >&6; }
@@ -5668,6 +5835,7 @@
 
 
 
+
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
@@ -5965,16 +6133,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -6034,28 +6202,16 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -6077,7 +6233,7 @@
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -6143,10 +6299,10 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -6235,7 +6391,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
diff -Nru sdcc-3.1.0+dfsg/support/cpp/configure.in sdcc-3.2.0+dfsg/support/cpp/configure.in
--- sdcc-3.1.0+dfsg/support/cpp/configure.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/cpp/configure.in	2012-04-06 15:59:24.000000000 +0000
@@ -49,7 +49,7 @@
     gnu_ld_flag=yes
   fi
   AC_DEFINE_UNQUOTED(DEFAULT_LINKER,"$DEFAULT_LINKER",
-	[Define to enable the use of a default linker.])
+        [Define to enable the use of a default linker.])
 fi
 
 # With GNU as
@@ -68,7 +68,7 @@
     gas_flag=yes
   fi
   AC_DEFINE_UNQUOTED(DEFAULT_ASSEMBLER,"$DEFAULT_ASSEMBLER",
-	[Define to enable the use of a default assembler.])
+        [Define to enable the use of a default assembler.])
 fi
 
 # With stabs
@@ -88,14 +88,14 @@
 AC_ARG_WITH(local-prefix,
 [  --with-local-prefix=DIR specifies directory to put local include],
 [case "${withval}" in
-yes)	AC_MSG_ERROR(bad value ${withval} given for local include directory prefix) ;;
-no)	;;
-*)	local_prefix=$with_local_prefix ;;
+yes)    AC_MSG_ERROR(bad value ${withval} given for local include directory prefix) ;;
+no)     ;;
+*)      local_prefix=$with_local_prefix ;;
 esac])
 
 # Default local prefix if it is empty
 if test x$local_prefix = x; then
-	local_prefix=/usr/local
+        local_prefix=/usr/local
 fi
 
 AC_ARG_PROGRAM
@@ -147,9 +147,9 @@
 AC_MSG_CHECKING([whether a default assembler was specified])
 if test x"${DEFAULT_ASSEMBLER+set}" = x"set"; then
     if test x"$gas_flag" = x"no"; then
-    	AC_MSG_RESULT([yes ($DEFAULT_ASSEMBLER)])
+        AC_MSG_RESULT([yes ($DEFAULT_ASSEMBLER)])
     else
-	AC_MSG_RESULT([yes ($DEFAULT_ASSEMBLER - GNU as)])
+        AC_MSG_RESULT([yes ($DEFAULT_ASSEMBLER - GNU as)])
     fi
 else
     AC_MSG_RESULT(no)
@@ -158,9 +158,9 @@
 AC_MSG_CHECKING([whether a default linker was specified])
 if test x"${DEFAULT_LINKER+set}" = x"set"; then
     if test x"$gnu_ld_flag" = x"no"; then
-	AC_MSG_RESULT([yes ($DEFAULT_LINKER)])
+        AC_MSG_RESULT([yes ($DEFAULT_LINKER)])
     else
-	AC_MSG_RESULT([yes ($DEFAULT_LINKER - GNU ld)])
+        AC_MSG_RESULT([yes ($DEFAULT_LINKER - GNU ld)])
     fi
 else
     AC_MSG_RESULT(no)
@@ -185,15 +185,15 @@
 gcc_AC_HEADER_STRING
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(limits.h stddef.h string.h strings.h stdlib.h time.h \
-		 fcntl.h unistd.h sys/file.h sys/time.h \
-		 sys/param.h sys/stat.h \
-		 direct.h malloc.h)
+                 fcntl.h unistd.h sys/file.h sys/time.h \
+                 sys/param.h sys/stat.h \
+                 direct.h malloc.h)
 
 # Check for thread headers.
 
 # These tests can't be done till we know if we have limits.h.
 gcc_AC_C_CHAR_BIT
-gcc_AC_C_COMPILE_ENDIAN
+AC_C_BIGENDIAN
 
 # See if we have the mktemp command.
 AC_CHECK_PROG(have_mktemp_command, mktemp, yes, no)
@@ -216,9 +216,9 @@
 
 # We will need to find libiberty.h and ansidecl.h
 saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I${srcdir} -I${srcdir}/../include"
+CFLAGS="$CFLAGS -I${srcdir} -I${srcdir}/libiberty -I${srcdir}/libcpp/include"
 gcc_AC_CHECK_DECLS(getenv abort strsignal errno \
-	malloc realloc calloc free clock, , ,[
+        malloc realloc calloc free clock, , ,[
 #include "ansidecl.h"
 #include "system.h"])
 
@@ -249,7 +249,7 @@
 # then we decode the target machine and forget everything else
 # that came from the host machine.
 #for machine in $build $host $target; do
-#	. ${srcdir}/config.gcc
+#       . ${srcdir}/config.gcc
 #done
 
 extra_objs="${host_extra_objs} ${extra_objs}"
@@ -288,29 +288,29 @@
 # work to find out the build config parameters.
 if test x$host = x$build
 then
-	build_auto=auto-host.h
+        build_auto=auto-host.h
 else
-	# We create a subdir, then run autoconf in the subdir.
-	# To prevent recursion we set host and build for the new
-	# invocation of configure to the build for this invocation
-	# of configure.
-	tempdir=build.$$
-	rm -rf $tempdir
-	mkdir $tempdir
-	cd $tempdir
-	case ${srcdir} in
-	/* | [A-Za-z]:[\\/]* ) realsrcdir=${srcdir};;
-	*) realsrcdir=../${srcdir};;
-	esac
-	CC=${CC_FOR_BUILD} ${realsrcdir}/configure \
-		--target=$target --host=$build --build=$build
-
-	# We just finished tests for the build machine, so rename
-	# the file auto-build.h in the gcc directory.
-	mv auto-host.h ../auto-build.h
-	cd ..
-	rm -rf $tempdir
-	build_auto=auto-build.h
+        # We create a subdir, then run autoconf in the subdir.
+        # To prevent recursion we set host and build for the new
+        # invocation of configure to the build for this invocation
+        # of configure.
+        tempdir=build.$$
+        rm -rf $tempdir
+        mkdir $tempdir
+        cd $tempdir
+        case ${srcdir} in
+        /* | [A-Za-z]:[\\/]* ) realsrcdir=${srcdir};;
+        *) realsrcdir=../${srcdir};;
+        esac
+        CC=${CC_FOR_BUILD} ${realsrcdir}/configure \
+                --target=$target --host=$build --build=$build
+
+        # We just finished tests for the build machine, so rename
+        # the file auto-build.h in the gcc directory.
+        mv auto-host.h ../auto-build.h
+        cd ..
+        rm -rf $tempdir
+        build_auto=auto-build.h
 fi
 
 tm_file="${tm_file} defaults.h"
@@ -320,14 +320,14 @@
 
 # Truncate the target if necessary
 if test x$host_truncate_target != x; then
-	target=`echo $target | sed -e 's/\(..............\).*/\1/'`
+        target=`echo $target | sed -e 's/\(..............\).*/\1/'`
 fi
 
 # Get the version trigger filename from the toplevel
 if test "${with_gcc_version_trigger+set}" = set; then
-	gcc_version_trigger=$with_gcc_version_trigger
+        gcc_version_trigger=$with_gcc_version_trigger
 else
-	gcc_version_trigger=${srcdir}/version.c
+        gcc_version_trigger=${srcdir}/version.c
 fi
 changequote(,)dnl
 gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*"\([^"]*\)".*/\1/'`
@@ -339,9 +339,9 @@
 PACKAGE=sdcc
 VERSION="$gcc_version"
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE",
-	[Define to the name of the distribution.])
+        [Define to the name of the distribution.])
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION",
-	[Define to the version of the distribution.])
+        [Define to the version of the distribution.])
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 
@@ -362,80 +362,80 @@
 gcc_cv_gas_minor_version=
 gcc_cv_as_gas_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/gas
 if test -x "$DEFAULT_ASSEMBLER"; then
-	gcc_cv_as="$DEFAULT_ASSEMBLER"
+        gcc_cv_as="$DEFAULT_ASSEMBLER"
 elif test -x "$AS"; then
-	gcc_cv_as="$AS"
+        gcc_cv_as="$AS"
 elif test -x as$host_exeext; then
-	# Build using assembler in the current directory.
-	gcc_cv_as=./as$host_exeext
+        # Build using assembler in the current directory.
+        gcc_cv_as=./as$host_exeext
 elif test -f $gcc_cv_as_gas_srcdir/configure.in -a -f ../gas/Makefile; then
-	# Single tree build which includes gas.
-	for f in $gcc_cv_as_gas_srcdir/configure $gcc_cv_as_gas_srcdir/configure.in $gcc_cv_as_gas_srcdir/Makefile.in
-	do
+        # Single tree build which includes gas.
+        for f in $gcc_cv_as_gas_srcdir/configure $gcc_cv_as_gas_srcdir/configure.in $gcc_cv_as_gas_srcdir/Makefile.in
+        do
 changequote(,)dnl
-		gcc_cv_gas_version=`grep '^VERSION=[0-9]*\.[0-9]*' $f`
+                gcc_cv_gas_version=`grep '^VERSION=[0-9]*\.[0-9]*' $f`
 changequote([,])dnl
-		if test x$gcc_cv_gas_version != x; then
-			break
-		fi
-	done
+                if test x$gcc_cv_gas_version != x; then
+                        break
+                fi
+        done
 changequote(,)dnl
-	gcc_cv_gas_major_version=`expr "$gcc_cv_gas_version" : "VERSION=\([0-9]*\)"`
-	gcc_cv_gas_minor_version=`expr "$gcc_cv_gas_version" : "VERSION=[0-9]*\.\([0-9]*\)"`
+        gcc_cv_gas_major_version=`expr "$gcc_cv_gas_version" : "VERSION=\([0-9]*\)"`
+        gcc_cv_gas_minor_version=`expr "$gcc_cv_gas_version" : "VERSION=[0-9]*\.\([0-9]*\)"`
 changequote([,])dnl
 fi
 
 if test "x$gcc_cv_as" = x -a x$host = x$target; then
-	# Native build.
-	# Search the same directories that the installed compiler will
-	# search.  Else we may find the wrong assembler and lose.  If we
-	# do not find a suitable assembler binary, then try the user's
-	# path.
-	#
-	# Also note we have to check MD_EXEC_PREFIX before checking the
-	# user's path.  Unfortunately, there is no good way to get at the
-	# value of MD_EXEC_PREFIX here.  So we do a brute force search
-	# through all the known MD_EXEC_PREFIX values.  Ugh.  This needs
-	# to be fixed as part of the make/configure rewrite too.
-
-	if test "x$exec_prefix" = xNONE; then
-		if test "x$prefix" = xNONE; then
-			test_prefix=/usr/local
-		else
-			test_prefix=$prefix
-		fi
-	else
-		test_prefix=$exec_prefix
-	fi
-
-	# If the loop below does not find an assembler, then use whatever
-	# one we can find in the users's path.
-	# user's path.
-	gcc_cv_as=as$host_exeext
-
-	test_dirs="$test_prefix/lib/gcc-lib/$target/$gcc_version \
-		   $test_prefix/lib/gcc-lib/$target \
-		   /usr/lib/gcc/$target/$gcc_version \
-		   /usr/lib/gcc/$target \
-		   $test_prefix/$target/bin/$target/$gcc_version \
-		   $test_prefix/$target/bin \
-		   /usr/libexec \
-		   /usr/ccs/gcc \
-		   /usr/ccs/bin \
-		   /udk/usr/ccs/bin \
-		   /bsd43/usr/lib/cmplrs/cc \
-		   /usr/cross64/usr/bin \
-		   /usr/lib/cmplrs/cc \
-		   /sysv/usr/lib/cmplrs/cc \
-		   /svr4/usr/lib/cmplrs/cc \
-		   /usr/bin"
-
-	for dir in $test_dirs; do
-		if test -f $dir/as$host_exeext; then
-			gcc_cv_as=$dir/as$host_exeext
-			break;
-		fi
-	done
+        # Native build.
+        # Search the same directories that the installed compiler will
+        # search.  Else we may find the wrong assembler and lose.  If we
+        # do not find a suitable assembler binary, then try the user's
+        # path.
+        #
+        # Also note we have to check MD_EXEC_PREFIX before checking the
+        # user's path.  Unfortunately, there is no good way to get at the
+        # value of MD_EXEC_PREFIX here.  So we do a brute force search
+        # through all the known MD_EXEC_PREFIX values.  Ugh.  This needs
+        # to be fixed as part of the make/configure rewrite too.
+
+        if test "x$exec_prefix" = xNONE; then
+                if test "x$prefix" = xNONE; then
+                        test_prefix=/usr/local
+                else
+                        test_prefix=$prefix
+                fi
+        else
+                test_prefix=$exec_prefix
+        fi
+
+        # If the loop below does not find an assembler, then use whatever
+        # one we can find in the users's path.
+        # user's path.
+        gcc_cv_as=as$host_exeext
+
+        test_dirs="$test_prefix/lib/gcc-lib/$target/$gcc_version \
+                   $test_prefix/lib/gcc-lib/$target \
+                   /usr/lib/gcc/$target/$gcc_version \
+                   /usr/lib/gcc/$target \
+                   $test_prefix/$target/bin/$target/$gcc_version \
+                   $test_prefix/$target/bin \
+                   /usr/libexec \
+                   /usr/ccs/gcc \
+                   /usr/ccs/bin \
+                   /udk/usr/ccs/bin \
+                   /bsd43/usr/lib/cmplrs/cc \
+                   /usr/cross64/usr/bin \
+                   /usr/lib/cmplrs/cc \
+                   /sysv/usr/lib/cmplrs/cc \
+                   /svr4/usr/lib/cmplrs/cc \
+                   /usr/bin"
+
+        for dir in $test_dirs; do
+                if test -f $dir/as$host_exeext; then
+                        gcc_cv_as=$dir/as$host_exeext
+                        break;
+                fi
+        done
 fi
 if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
   AC_MSG_RESULT("newly built gas")
@@ -446,10 +446,10 @@
 # Figure out what nm we will be using.
 AC_MSG_CHECKING(what nm to use)
 if test -x nm$host_exeext; then
-	gcc_cv_nm=./nm$host_exeext
+        gcc_cv_nm=./nm$host_exeext
 elif test x$host = x$target; then
-	# Native build.
-	gcc_cv_nm=nm$host_exeext
+        # Native build.
+        gcc_cv_nm=nm$host_exeext
 fi
 AC_MSG_RESULT($gcc_cv_nm)
 
diff -Nru sdcc-3.1.0+dfsg/support/cpp/libcpp/internal.h sdcc-3.2.0+dfsg/support/cpp/libcpp/internal.h
--- sdcc-3.1.0+dfsg/support/cpp/libcpp/internal.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/cpp/libcpp/internal.h	2012-01-26 11:38:07.000000000 +0000
@@ -231,9 +231,7 @@
   cpp_hashnode *n_false;                /* C++ keyword false */
   cpp_hashnode *n__VA_ARGS__;           /* C99 vararg macros */
   /* SDCC _asm specific */
-  cpp_hashnode *n__asm1;                /* _asm ... _endasm ; */
   cpp_hashnode *n__asm;                 /* __asm ... __endasm ; */
-  cpp_hashnode *n__endasm1;             /* _asm ... _endasm ; */
   cpp_hashnode *n__endasm;              /* __asm ... __endasm ; */
 };
 
diff -Nru sdcc-3.1.0+dfsg/support/cpp/libcpp/lex.c sdcc-3.2.0+dfsg/support/cpp/libcpp/lex.c
--- sdcc-3.1.0+dfsg/support/cpp/libcpp/lex.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/cpp/libcpp/lex.c	2012-01-26 11:38:07.000000000 +0000
@@ -98,6 +98,176 @@
   buffer->notes_used++;
 }
 
+
+/* Fast path to find line special characters using optimized character
+   scanning algorithms.  Anything complicated falls back to the slow
+   path below.  Since this loop is very hot it's worth doing these kinds
+   of optimizations.
+
+   One of the paths through the ifdefs should provide
+
+     const uchar *search_line_fast (const uchar *s, const uchar *end);
+
+   Between S and END, search for \n, \r, \\, ?.  Return a pointer to
+   the found character.
+
+   Note that the last character of the buffer is *always* a newline,
+   as forced by _cpp_convert_input.  This fact can be used to avoid
+   explicitly looking for the end of the buffer.  */
+
+/* Configure gives us an ifdef test.  */
+#ifndef WORDS_BIGENDIAN
+#define WORDS_BIGENDIAN 0
+#endif
+
+/* We'd like the largest integer that fits into a register.  There's nothing
+   in <stdint.h> that gives us that.  For most hosts this is unsigned long,
+   but MS decided on an LLP64 model.  Thankfully when building with GCC we
+   can get the "real" word size.  */
+#ifdef __GNUC__
+typedef unsigned int word_type __attribute__((__mode__(__word__)));
+#else
+typedef unsigned long word_type;
+#endif
+
+/* The code below is only expecting sizes 4 or 8.
+   Die at compile-time if this expectation is violated.  */
+typedef char check_word_type_size
+  [(sizeof(word_type) == 8 || sizeof(word_type) == 4) * 2 - 1];
+
+/* Return X with the first N bytes forced to values that won't match one
+   of the interesting characters.  Note that NUL is not interesting.  */
+
+static inline word_type
+acc_char_mask_misalign (word_type val, unsigned int n)
+{
+  word_type mask = -1;
+  if (WORDS_BIGENDIAN)
+    mask >>= n * 8;
+  else
+    mask <<= n * 8;
+  return val & mask;
+}
+
+/* Return X replicated to all byte positions within WORD_TYPE.  */
+
+static inline word_type
+acc_char_replicate (uchar x)
+{
+  word_type ret;
+
+  ret = (x << 24) | (x << 16) | (x << 8) | x;
+  if (sizeof(word_type) == 8)
+    ret = (ret << 16 << 16) | ret;
+  return ret;
+}
+
+/* Return non-zero if some byte of VAL is (probably) C.  */
+
+static inline word_type
+acc_char_cmp (word_type val, word_type c)
+{
+#if defined(__GNUC__) && defined(__alpha__)
+  /* We can get exact results using a compare-bytes instruction.
+     Get (val == c) via (0 >= (val ^ c)).  */
+  return __builtin_alpha_cmpbge (0, val ^ c);
+#else
+  word_type magic = 0x7efefefeU;
+  if (sizeof(word_type) == 8)
+    magic = (magic << 16 << 16) | 0xfefefefeU;
+  magic |= 1;
+
+  val ^= c;
+  return ((val + magic) ^ ~val) & ~magic;
+#endif
+}
+
+/* Given the result of acc_char_cmp is non-zero, return the index of
+   the found character.  If this was a false positive, return -1.  */
+
+static inline int
+acc_char_index (word_type cmp ATTRIBUTE_UNUSED,
+                word_type val ATTRIBUTE_UNUSED)
+{
+#if defined(__GNUC__) && defined(__alpha__) && !WORDS_BIGENDIAN
+  /* The cmpbge instruction sets *bits* of the result corresponding to
+     matches in the bytes with no false positives.  */
+  return __builtin_ctzl (cmp);
+#else
+  unsigned int i;
+
+  /* ??? It would be nice to force unrolling here,
+     and have all of these constants folded.  */
+  for (i = 0; i < sizeof(word_type); ++i)
+    {
+      uchar c;
+      if (WORDS_BIGENDIAN)
+        c = (val >> (sizeof(word_type) - i - 1) * 8) & 0xff;
+      else
+        c = (val >> i * 8) & 0xff;
+
+      if (c == '\n' || c == '\r' || c == '\\' || c == '?')
+        return i;
+    }
+
+  return -1;
+#endif
+}
+
+/* A version of the fast scanner using bit fiddling techniques.
+
+   For 32-bit words, one would normally perform 16 comparisons and
+   16 branches.  With this algorithm one performs 24 arithmetic
+   operations and one branch.  Whether this is faster with a 32-bit
+   word size is going to be somewhat system dependent.
+
+   For 64-bit words, we eliminate twice the number of comparisons
+   and branches without increasing the number of arithmetic operations.
+   It's almost certainly going to be a win with 64-bit word size.  */
+
+static const uchar * search_line_acc_char (const uchar *, const uchar *)
+  ATTRIBUTE_UNUSED;
+
+static const uchar *
+search_line_acc_char (const uchar *s, const uchar *end ATTRIBUTE_UNUSED)
+{
+  const word_type repl_nl = acc_char_replicate ('\n');
+  const word_type repl_cr = acc_char_replicate ('\r');
+  const word_type repl_bs = acc_char_replicate ('\\');
+  const word_type repl_qm = acc_char_replicate ('?');
+
+  unsigned int misalign;
+  const word_type *p;
+  word_type val, t;
+
+  /* Align the buffer.  Mask out any bytes from before the beginning.  */
+  p = (word_type *)((uintptr_t)s & -sizeof(word_type));
+  val = *p;
+  misalign = (uintptr_t)s & (sizeof(word_type) - 1);
+  if (misalign)
+    val = acc_char_mask_misalign (val, misalign);
+
+  /* Main loop.  */
+  while (1)
+    {
+      t  = acc_char_cmp (val, repl_nl);
+      t |= acc_char_cmp (val, repl_cr);
+      t |= acc_char_cmp (val, repl_bs);
+      t |= acc_char_cmp (val, repl_qm);
+
+      if (__builtin_expect (t != 0, 0))
+        {
+          int i = acc_char_index (t, val);
+          if (i >= 0)
+            return (const uchar *)p + i;
+        }
+
+      val = *++p;
+    }
+}
+
+#define search_line_fast  search_line_acc_char
+
 /* Returns with a logical line that contains no escaped newlines or
    trigraphs.  This is a time-critical inner loop.  */
 void
@@ -111,82 +281,91 @@
   buffer->cur_note = buffer->notes_used = 0;
   buffer->cur = buffer->line_base = buffer->next_line;
   buffer->need_line = false;
-  s = buffer->next_line - 1;
+  s = buffer->next_line;
 
   if (!buffer->from_stage3)
     {
       const uchar *pbackslash = NULL;
 
-      /* Short circuit for the common case of an un-escaped line with
+      /* Fast path.  This is the common case of an un-escaped line with
          no trigraphs.  The primary win here is by not writing any
          data back to memory until we have to.  */
-      for (;;)
+      while (1)
         {
-          c = *++s;
-          if (__builtin_expect (c == '\n', false)
-              || __builtin_expect (c == '\r', false))
-            {
-              d = (uchar *) s;
-
-              if (__builtin_expect (s == buffer->rlimit, false))
-                goto done;
-
-              /* DOS line ending? */
-              if (__builtin_expect (c == '\r', false)
-                  && s[1] == '\n')
-                {
-                  s++;
-                  if (s == buffer->rlimit)
-                    goto done;
-                }
-
-              if (__builtin_expect (pbackslash == NULL, true))
-                goto done;
+          /* Perform an optimized search for \n, \r, \\, ?.  */
+          s = search_line_fast (s, buffer->rlimit);
 
-              /* Check for escaped newline.  */
-              p = d;
-              while (is_nvspace (p[-1]))
-                p--;
-              if (p - 1 != pbackslash)
-                goto done;
-
-              /* Have an escaped newline; process it and proceed to
-                 the slow path.  */
-              add_line_note (buffer, p - 1, p != d ? ' ' : '\\');
-              d = p - 2;
-              buffer->next_line = p - 1;
-              break;
+          c = *s;
+          if (c == '\\')
+            {
+              /* Record the location of the backslash and continue.  */
+              pbackslash = s++;
             }
-          if (__builtin_expect (c == '\\', false))
-            pbackslash = s;
-          else if (__builtin_expect (c == '?', false)
-                   && __builtin_expect (s[1] == '?', false)
-                   && _cpp_trigraph_map[s[2]])
+          else if (__builtin_expect (c == '?', 0))
             {
-              /* Have a trigraph.  We may or may not have to convert
-                 it.  Add a line note regardless, for -Wtrigraphs.  */
-              add_line_note (buffer, s, s[2]);
-              if (CPP_OPTION (pfile, trigraphs))
+              if (__builtin_expect (s[1] == '?', false)
+                   && _cpp_trigraph_map[s[2]])
                 {
-                  /* We do, and that means we have to switch to the
-                     slow path.  */
-                  d = (uchar *) s;
-                  *d = _cpp_trigraph_map[s[2]];
-                  s += 2;
-                  break;
+                  /* Have a trigraph.  We may or may not have to convert
+                     it.  Add a line note regardless, for -Wtrigraphs.  */
+                  add_line_note (buffer, s, s[2]);
+                  if (CPP_OPTION (pfile, trigraphs))
+                    {
+                      /* We do, and that means we have to switch to the
+                         slow path.  */
+                      d = (uchar *) s;
+                      *d = _cpp_trigraph_map[s[2]];
+                      s += 2;
+                      goto slow_path;
+                    }
                 }
+              /* Not a trigraph.  Continue on fast-path.  */
+              s++;
             }
+          else
+            break;
         }
 
+      /* This must be \r or \n.  We're either done, or we'll be forced
+         to write back to the buffer and continue on the slow path.  */
+      d = (uchar *) s;
+
+      if (__builtin_expect (s == buffer->rlimit, false))
+        goto done;
+
+      /* DOS line ending? */
+      if (__builtin_expect (c == '\r', false) && s[1] == '\n')
+        {
+          s++;
+          if (s == buffer->rlimit)
+            goto done;
+        }
+
+      if (__builtin_expect (pbackslash == NULL, true))
+        goto done;
+
+      /* Check for escaped newline.  */
+      p = d;
+      while (is_nvspace (p[-1]))
+        p--;
+      if (p - 1 != pbackslash)
+        goto done;
+
+      /* Have an escaped newline; process it and proceed to
+         the slow path.  */
+      add_line_note (buffer, p - 1, p != d ? ' ' : '\\');
+      d = p - 2;
+      buffer->next_line = p - 1;
 
-      for (;;)
+    slow_path:
+      while (1)
         {
           c = *++s;
           *++d = c;
 
           if (c == '\n' || c == '\r')
             {
-                  /* Handle DOS line endings.  */
+              /* Handle DOS line endings.  */
               if (c == '\r' && s != buffer->rlimit && s[1] == '\n')
                 s++;
               if (s == buffer->rlimit)
@@ -217,9 +396,8 @@
     }
   else
     {
-      do
+      while (*s != '\n' && *s != '\r')
         s++;
-      while (*s != '\n' && *s != '\r');
       d = (uchar *) s;
 
       /* Handle DOS line endings.  */
@@ -313,8 +491,8 @@
                                      (int) _cpp_trigraph_map[note->type]);
               else
                 {
-		  cpp_warning_with_line 
-		    (pfile, CPP_W_TRIGRAPHS,
+                  cpp_warning_with_line
+                    (pfile, CPP_W_TRIGRAPHS,
                      pfile->line_table->highest_line, col,
                      "trigraph ??%c ignored, use -trigraphs to enable",
                      note->type);
@@ -329,15 +507,15 @@
   return ret;
 }
 
-/* SDCC _asm specific */
-/* Skip an _asm ... _endasm block.  We find the end of the comment by
-   seeing _endasm.  Returns non-zero if _asm terminated by EOF, zero
+/* SDCC __asm specific */
+/* Skip an __asm ... __endasm block.  We find the end of the comment by
+   seeing __endasm.  Returns non-zero if _asm terminated by EOF, zero
    otherwise.  */
 static int
 _sdcpp_skip_asm_block (cpp_reader *pfile)
 {
-#define _ENDASM_STR "endasm"
-#define _ENDASM_LEN ((sizeof _ENDASM_STR) - 1)
+#define ENDASM_STR "endasm"
+#define ENDASM_LEN ((sizeof ENDASM_STR) - 1)
 
   cpp_buffer *buffer = pfile->buffer;
   uchar c = EOF;
@@ -348,15 +526,14 @@
       prev_space = is_space(c);
       c = *buffer->cur++;
 
-      if (prev_space && c == '_')
+      if (prev_space && c == '_' && *buffer->cur == '_')
         {
-          /* check if it is _endasm or __endasm */
-          if (*buffer->cur == '_')
-            ++buffer->cur;
-          if (buffer->cur + _ENDASM_LEN <= buffer->rlimit &&
-            strncmp((const char *)buffer->cur, _ENDASM_STR, _ENDASM_LEN) == 0)
+          /* check if it is __endasm */
+          ++buffer->cur;
+          if (buffer->cur + ENDASM_LEN <= buffer->rlimit &&
+            strncmp((const char *)buffer->cur, ENDASM_STR, ENDASM_LEN) == 0)
             {
-              buffer->cur += _ENDASM_LEN;
+              buffer->cur += ENDASM_LEN;
               break;
             }
         }
@@ -503,7 +680,7 @@
 /* After parsing an identifier or other sequence, produce a warning about
    sequences not in NFC/NFKC.  */
 static void
-warn_about_normalization (cpp_reader *pfile, 
+warn_about_normalization (cpp_reader *pfile,
                           const cpp_token *token,
                           const struct normalize_state *s)
 {
@@ -1200,8 +1377,8 @@
                                        raw_prefix_len) == 0
                            && cur[raw_prefix_len+1] == '"')
                     {
-		      BUF_APPEND (")", 1);
-		      base++;
+                      BUF_APPEND (")", 1);
+                      base++;
                       cur += raw_prefix_len + 2;
                       goto break_outer_loop;
                     }
@@ -1449,14 +1626,14 @@
 }
 
 /* Append a comment to the end of the comment table. */
-static void 
-store_comment (cpp_reader *pfile, cpp_token *token) 
+static void
+store_comment (cpp_reader *pfile, cpp_token *token)
 {
   int len;
 
   if (pfile->comments.allocated == 0)
     {
-      pfile->comments.allocated = 256; 
+      pfile->comments.allocated = 256;
       pfile->comments.entries = (cpp_comment *) xmalloc
         (pfile->comments.allocated * sizeof (cpp_comment));
     }
@@ -1472,7 +1649,7 @@
   len = token->val.str.len;
 
   /* Copy comment. Note, token may not be NULL terminated. */
-  pfile->comments.entries[pfile->comments.count].comment = 
+  pfile->comments.entries[pfile->comments.count].comment =
     (char *) xmalloc (sizeof (char) * (len + 1));
   memcpy (pfile->comments.entries[pfile->comments.count].comment,
           token->val.str.text, len);
@@ -1507,7 +1684,7 @@
      Note that the only time we encounter a directive here is
      when we are saving comments in a "#define".  */
   clen = ((pfile->state.in_directive || pfile->state.parsing_args)
-	  && type == '/') ? len + 2 : len;
+          && type == '/') ? len + 2 : len;
 
   buffer = _cpp_unaligned_alloc (pfile, clen);
 
@@ -1905,21 +2082,21 @@
         warn_about_normalization (pfile, result, &nst);
       }
 
-      /* SDCC _asm specific */
-      /* handle _asm ... _endasm ;  */
-      if (result->val.node.node == pfile->spec_nodes.n__asm || result->val.node.node == pfile->spec_nodes.n__asm1)
+      /* SDCC __asm specific */
+      /* handle __asm ... __endasm ;  */
+      if (result->val.node.node == pfile->spec_nodes.n__asm)
         {
           if (CPP_OPTION (pfile, preproc_asm) == 0)
             {
               comment_start = buffer->cur;
               result->type = CPP_ASM;
               _sdcpp_skip_asm_block (pfile);
-              /* Save the _asm block as a token in its own right.  */
+              /* Save the __asm block as a token in its own right.  */
               _sdcpp_save_asm (pfile, result, comment_start, result->val.node.node == pfile->spec_nodes.n__asm);
             }
           result->flags |= ENTER_ASM;
         }
-      else if (result->val.node.node == pfile->spec_nodes.n__endasm || result->val.node.node == pfile->spec_nodes.n__endasm1)
+      else if (result->val.node.node == pfile->spec_nodes.n__endasm)
         {
           result->flags |= EXIT_ASM;
         }
@@ -1940,7 +2117,7 @@
       /* A potential block or line comment.  */
       comment_start = buffer->cur;
       c = *buffer->cur;
-      
+
       if (c == '*')
         {
           if (_cpp_skip_block_comment (pfile))
@@ -1962,7 +2139,7 @@
             }
 
           if (skip_line_comment (pfile) && CPP_OPTION (pfile, warn_comments))
-	    cpp_warning (pfile, CPP_W_COMMENTS, "multi-line comment");
+            cpp_warning (pfile, CPP_W_COMMENTS, "multi-line comment");
         }
       else if (c == '=')
         {
@@ -2196,21 +2373,21 @@
   int ucn_len_c;
   unsigned t;
   unsigned long utf32;
-  
+
   /* Compute the length of the UTF-8 sequence.  */
   for (t = *name; t & 0x80; t <<= 1)
     ucn_len++;
-  
+
   utf32 = *name & (0x7F >> ucn_len);
   for (ucn_len_c = 1; ucn_len_c < ucn_len; ucn_len_c++)
     {
       utf32 = (utf32 << 6) | (*++name & 0x3F);
-      
+
       /* Ill-formed UTF-8.  */
       if ((*name & ~0x3F) != 0x80)
         abort ();
     }
-  
+
   *buffer++ = '\\';
   *buffer++ = 'U';
   for (j = 7; j >= 0; j--)
@@ -2267,7 +2444,7 @@
         {
           size_t i;
           const unsigned char * name = NODE_NAME (token->val.node.node);
-          
+
           for (i = 0; i < NODE_LEN (token->val.node.node); i++)
             if (name[i] & ~0x7F)
               {
@@ -2297,7 +2474,7 @@
    freed when the reader is destroyed.  Useful for diagnostics.  */
 unsigned char *
 cpp_token_as_text (cpp_reader *pfile, const cpp_token *token)
-{ 
+{
   unsigned int len = cpp_token_len (token) + 1;
   unsigned char *start = _cpp_unaligned_alloc (pfile, len), *end;
 
@@ -2358,7 +2535,7 @@
       {
         size_t i;
         const unsigned char * name = NODE_NAME (token->val.node.node);
-        
+
         for (i = 0; i < NODE_LEN (token->val.node.node); i++)
           if (name[i] & ~0x7F)
             {
diff -Nru sdcc-3.1.0+dfsg/support/cpp/libiberty/filenames.h sdcc-3.2.0+dfsg/support/cpp/libiberty/filenames.h
--- sdcc-3.1.0+dfsg/support/cpp/libiberty/filenames.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/cpp/libiberty/filenames.h	2012-04-04 16:17:23.000000000 +0000
@@ -34,10 +34,18 @@
 #  ifndef HAVE_DOS_BASED_FILE_SYSTEM
 #    define HAVE_DOS_BASED_FILE_SYSTEM 1
 #  endif
+#  ifndef HAVE_CASE_INSENSITIVE_FILE_SYSTEM
+#    define HAVE_CASE_INSENSITIVE_FILE_SYSTEM 1
+#  endif
 #  define HAS_DRIVE_SPEC(f) HAS_DOS_DRIVE_SPEC (f)
 #  define IS_DIR_SEPARATOR(c) IS_DOS_DIR_SEPARATOR (c)
 #  define IS_ABSOLUTE_PATH(f) IS_DOS_ABSOLUTE_PATH (f)
 #else /* not DOSish */
+#  if defined(__APPLE__)
+#    ifndef HAVE_CASE_INSENSITIVE_FILE_SYSTEM
+#      define HAVE_CASE_INSENSITIVE_FILE_SYSTEM 1
+#    endif
+#  endif /* __APPLE__ */
 #  define HAS_DRIVE_SPEC(f) (0)
 #  define IS_DIR_SEPARATOR(c) IS_UNIX_DIR_SEPARATOR (c)
 #  define IS_ABSOLUTE_PATH(f) IS_UNIX_ABSOLUTE_PATH (f)
diff -Nru sdcc-3.1.0+dfsg/support/cpp/libiberty/md5.c sdcc-3.2.0+dfsg/support/cpp/libiberty/md5.c
--- sdcc-3.1.0+dfsg/support/cpp/libiberty/md5.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/cpp/libiberty/md5.c	2012-04-04 16:17:23.000000000 +0000
@@ -1,6 +1,6 @@
 /* md5.c - Functions to compute MD5 message digest of files or memory blocks
    according to the definition of MD5 in RFC 1321 from April 1992.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 2011 Free Software Foundation, Inc.
 
    NOTE: This source is derived from an old version taken from the GNU C
    Library (glibc).
@@ -76,15 +76,19 @@
 /* Put result from CTX in first 16 bytes following RESBUF.  The result
    must be in little endian byte order.
 
-   IMPORTANT: On some systems it is required that RESBUF is correctly
-   aligned for a 32 bits value.  */
+   IMPORTANT: RESBUF may not be aligned as strongly as MD5_UNIT32 so we
+   put things in a local (aligned) buffer first, then memcpy into RESBUF.  */
 void *
 md5_read_ctx (const struct md5_ctx *ctx, void *resbuf)
 {
-  ((md5_uint32 *) resbuf)[0] = SWAP (ctx->A);
-  ((md5_uint32 *) resbuf)[1] = SWAP (ctx->B);
-  ((md5_uint32 *) resbuf)[2] = SWAP (ctx->C);
-  ((md5_uint32 *) resbuf)[3] = SWAP (ctx->D);
+  md5_uint32 buffer[4];
+
+  buffer[0] = SWAP (ctx->A);
+  buffer[1] = SWAP (ctx->B);
+  buffer[2] = SWAP (ctx->C);
+  buffer[3] = SWAP (ctx->D);
+
+  memcpy (resbuf, buffer, 16);
 
   return resbuf;
 }
@@ -241,9 +245,11 @@
           }
       else
 #endif
-      md5_process_block (buffer, len & ~63, ctx);
-      buffer = (const void *) ((const char *) buffer + (len & ~63));
-      len &= 63;
+	{
+	  md5_process_block (buffer, len & ~63, ctx);
+	  buffer = (const void *) ((const char *) buffer + (len & ~63));
+	  len &= 63;
+	}
     }
 
   /* Move remaining bytes in internal buffer.  */
diff -Nru sdcc-3.1.0+dfsg/support/cpp/libiberty/obstack.h sdcc-3.2.0+dfsg/support/cpp/libiberty/obstack.h
--- sdcc-3.1.0+dfsg/support/cpp/libiberty/obstack.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/cpp/libiberty/obstack.h	2012-04-04 16:17:23.000000000 +0000
@@ -532,9 +532,9 @@
 # define obstack_free(h,obj)						\
 ( (h)->temp = (char *) (obj) - (char *) (h)->chunk,			\
   (((h)->temp > 0 && (h)->temp < (h)->chunk_limit - (char *) (h)->chunk)\
-   ? (int) ((h)->next_free = (h)->object_base				\
-	    = (h)->temp + (char *) (h)->chunk)				\
-   : (((obstack_free) ((h), (h)->temp + (char *) (h)->chunk), 0), 0)))
+   ? (((h)->next_free = (h)->object_base				\
+	    = (h)->temp + (char *) (h)->chunk), 0)			\
+   : ((obstack_free) ((h), (h)->temp + (char *) (h)->chunk), 0)))
 
 #endif /* not __GNUC__ or not __STDC__ */
 
diff -Nru sdcc-3.1.0+dfsg/support/cpp/opts.c sdcc-3.2.0+dfsg/support/cpp/opts.c
--- sdcc-3.1.0+dfsg/support/cpp/opts.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/cpp/opts.c	2012-03-04 17:39:37.000000000 +0000
@@ -25,6 +25,7 @@
 #include "intl.h"
 #include "opts.h"
 #include "options.h"
+#include "version.h"
 
 /* True if we should exit after parsing options.  */
 bool exit_after_options;
@@ -403,6 +404,9 @@
 	      lang_names[i]);
       print_filtered_help (1U << i);
     }
+
+  printf (_("\nFor bug reporting instructions, please see:\n"));
+  printf ("%s.\n", bug_report_url);
 }
 
 /* Print help for a specific front-end, etc.  */
diff -Nru sdcc-3.1.0+dfsg/support/cpp/sdcpp.c sdcc-3.2.0+dfsg/support/cpp/sdcpp.c
--- sdcc-3.1.0+dfsg/support/cpp/sdcpp.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/cpp/sdcpp.c	2012-03-04 17:39:37.000000000 +0000
@@ -234,9 +234,7 @@
   cpp_register_pragma(parse_in, 0, "pedantic_parse_number", do_pragma_pedantic_parse_number, false);
 
   /* SDCC _asm specific */
-  parse_in->spec_nodes.n__asm1 = cpp_lookup (parse_in, DSC("_asm"));
   parse_in->spec_nodes.n__asm = cpp_lookup (parse_in, DSC("__asm"));
-  parse_in->spec_nodes.n__endasm1 = cpp_lookup (parse_in, DSC("_endasm"));
   parse_in->spec_nodes.n__endasm = cpp_lookup (parse_in, DSC("__endasm"));
 
   return ret;
@@ -245,11 +243,12 @@
 void
 print_version (FILE *file, const char *indent)
 {
-  fprintf (file, _("GNU CPP version %s (cpplib)"), version_string);
-#ifdef TARGET_VERSION
-  TARGET_VERSION;
-#endif
-  fputc ('\n', file);
+  printf (_("%s %s%s\n"), progname, pkgversion_string, version_string);
+  printf ("Copyright %s 2011 Free Software Foundation, Inc.\n",
+    _("(C)"));
+  fputs (_("This is free software; see the source for copying conditions.  There is NO\n"
+    "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"),
+    stdout);
 }
 
 /* Initialization of the front end environment, before command line
diff -Nru sdcc-3.1.0+dfsg/support/cpp/sdcpp.vcxproj sdcc-3.2.0+dfsg/support/cpp/sdcpp.vcxproj
--- sdcc-3.1.0+dfsg/support/cpp/sdcpp.vcxproj	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/cpp/sdcpp.vcxproj	2012-04-04 16:17:23.000000000 +0000
@@ -386,10 +386,12 @@
     <ClInclude Include="ansidecl.h" />
     <ClInclude Include="auto-host.h" />
     <CustomBuild Include="auto-host_vc_in.h">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy auto-host_vc_in.h auto-host.h &gt; nul</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy auto-host_vc_in.h auto-host.h &gt; nul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(Identity) auto-host.h &gt; nul</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(Identity) auto-host.h &gt; nul</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">auto-host.h;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">auto-host.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating: auto-host.h</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating: auto-host.h</Message>
     </CustomBuild>
     <ClInclude Include="c-incpath.h" />
     <ClInclude Include="config.h" />
@@ -424,16 +426,18 @@
   <ItemGroup>
     <CustomBuild Include="sdcpp.opt">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f opt-gather.awk sdcpp.opt &gt; $(TMP)\genopts.tmp
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gawk -f opt-gather.awk %(Identity) &gt; $(TMP)\genopts.tmp
 gawk -f opt-functions.awk -f optc-gen.awk -v header_name="config.h system.h options.h" $(TMP)\genopts.tmp &gt; options.c
 gawk -f opt-functions.awk -f opth-gen.awk $(TMP)\genopts.tmp &gt; options.h
 del $(TMP)\genopts.tmp</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f opt-gather.awk sdcpp.opt &gt; $(TMP)\genopts.tmp
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gawk -f opt-gather.awk %(Identity) &gt; $(TMP)\genopts.tmp
 gawk -f opt-functions.awk -f optc-gen.awk -v header_name="config.h system.h options.h" $(TMP)\genopts.tmp &gt; options.c
 gawk -f opt-functions.awk -f opth-gen.awk $(TMP)\genopts.tmp &gt; options.h
 del $(TMP)\genopts.tmp</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">options.c;options.h;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">options.c;options.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating: options.c and options.h</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating: options.c and options.h</Message>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff -Nru sdcc-3.1.0+dfsg/support/cpp/system.h sdcc-3.2.0+dfsg/support/cpp/system.h
--- sdcc-3.1.0+dfsg/support/cpp/system.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/cpp/system.h	2012-04-06 15:59:24.000000000 +0000
@@ -1,6 +1,7 @@
 /* Get common system includes and various definitions and declarations based
    on autoconf macros.
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
+   2009, 2010, 2011
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -46,6 +47,14 @@
 #endif
 
 /* Use the unlocked open routines from libiberty.  */
+
+/* Some of these are #define on some systems, e.g. on AIX to redirect
+   the names to 64bit capable functions for LARGE_FILES support. These
+   redefs are pointless here so we can override them.  */
+
+#undef fopen 
+#undef freopen 
+
 #define fopen(PATH,MODE) fopen_unlocked(PATH,MODE)
 #define fdopen(FILDES,MODE) fdopen_unlocked(FILDES,MODE)
 #define freopen(PATH,MODE,STREAM) freopen_unlocked(PATH,MODE,STREAM)
@@ -86,6 +95,10 @@
 #  define fputc(C, Stream) fputc_unlocked (C, Stream)
 # endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 # ifdef HAVE_CLEARERR_UNLOCKED
 #  undef clearerr
 #  define clearerr(Stream) clearerr_unlocked (Stream)
@@ -166,6 +179,10 @@
 #  endif
 # endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 /* ??? Glibc's fwrite/fread_unlocked macros cause
@@ -176,11 +193,7 @@
 /* There are an extraordinary number of issues with <ctype.h>.
    The last straw is that it varies with the locale.  Use libiberty's
    replacement instead.  */
-#if defined(__APPLE__) && defined(__MACH__)
-#include <libiberty/safe-ctype.h>
-#else
-#include <safe-ctype.h>
-#endif
+#include "safe-ctype.h"
 
 #include <sys/types.h>
 
@@ -190,6 +203,10 @@
 extern int errno;
 #endif
 
+#ifdef __cplusplus
+# include <cstring>
+#endif
+
 /* Some of glibc's string inlines cause warnings.  Plus we'd rather
    rely on (and therefore test) GCC's string builtins.  */
 #define __NO_STRING_INLINES
@@ -314,6 +331,9 @@
 #ifndef O_WRONLY
 # define O_WRONLY 1
 #endif
+#ifndef O_BINARY
+# define O_BINARY 0
+#endif
 
 /* Some systems define these in, e.g., param.h.  We undefine these names
    here to avoid the warnings.  We prefer to use our definitions since we
@@ -353,11 +373,40 @@
 #define WCOREFLG 0200
 #endif
 
+#include <signal.h>
+#if !defined (SIGCHLD) && defined (SIGCLD)
+# define SIGCHLD SIGCLD
+#endif
+
+#ifdef HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+#endif
+
+#ifndef MAP_FAILED
+# define MAP_FAILED ((void *)-1)
+#endif
+
+#if !defined (MAP_ANONYMOUS) && defined (MAP_ANON)
+# define MAP_ANONYMOUS MAP_ANON
+#endif
+
+#ifdef HAVE_SYS_RESOURCE_H
+# include <sys/resource.h>
+#endif
+
+#ifdef HAVE_SYS_TIMES_H
+# include <sys/times.h>
+#endif
+
 /* The HAVE_DECL_* macros are three-state, undefined, 0 or 1.  If they
    are defined to 0 then we must provide the relevant declaration
    here.  These checks will be in the undefined state while configure
    is running so be careful to test "defined (HAVE_DECL_*)".  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if defined (HAVE_DECL_ATOF) && !HAVE_DECL_ATOF
 extern double atof (const char *);
 #endif
@@ -398,10 +447,22 @@
 extern char *strstr (const char *, const char *);
 #endif
 
+#if defined (HAVE_DECL_STPCPY) && !HAVE_DECL_STPCPY
+extern char *stpcpy (char *, const char *);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if defined (HAVE_DECL_MALLOC) && !HAVE_DECL_MALLOC
 extern void *malloc (size_t);
 #endif
@@ -414,16 +475,30 @@
 extern void *realloc (void *, size_t);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* If the system doesn't provide strsignal, we get it defined in
    libiberty but no declaration is supplied.  */
-/* Disabled since it causes errors on solaris
 #if !defined (HAVE_STRSIGNAL) \
     || (defined (HAVE_DECL_STRSIGNAL) && !HAVE_DECL_STRSIGNAL)
 # ifndef strsignal
 extern const char *strsignal (int);
 # endif
 #endif
-*/
 
 #ifdef HAVE_GETRLIMIT
 # if defined (HAVE_DECL_GETRLIMIT) && !HAVE_DECL_GETRLIMIT
@@ -455,14 +530,21 @@
 extern int vsnprintf(char *, size_t, const char *, va_list);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 /* 1 if we have C99 designated initializers.  */
 #if !defined(HAVE_DESIGNATED_INITIALIZERS)
-#  if defined(__APPLE__) && (__MACH__)
-#define HAVE_DESIGNATED_INITIALIZERS 0
-#  else
 #define HAVE_DESIGNATED_INITIALIZERS \
-  ((GCC_VERSION >= 2007) || (__STDC_VERSION__ >= 199901L))
-#  endif
+  (((GCC_VERSION >= 2007) || (__STDC_VERSION__ >= 199901L)) \
+   && !defined(__cplusplus))
+#endif
+
+#if !defined(HAVE_DESIGNATED_UNION_INITIALIZERS)
+#define HAVE_DESIGNATED_UNION_INITIALIZERS \
+  (((GCC_VERSION >= 2007) || (__STDC_VERSION__ >= 199901L)) \
+   && (!defined(__cplusplus) || (GCC_VERSION >= 4007)))
 #endif
 
 #if HAVE_SYS_STAT_H
@@ -523,6 +605,15 @@
 # define mkdir(a,b) mkdir(a)
 #endif
 
+#ifndef HAVE_KILL
+# define kill(p,s) raise(s)
+#endif
+
+/* Provide a way to print an address via printf.  */
+#ifndef HOST_PTR_PRINTF
+#define HOST_PTR_PRINTF "%p"
+#endif /* ! HOST_PTR_PRINTF */
+
 /* By default, colon separates directories in a path.  */
 #ifndef PATH_SEPARATOR
 #define PATH_SEPARATOR ':'
@@ -539,6 +630,11 @@
 # endif
 #endif
 
+#if defined (ENABLE_PLUGIN) && defined (HAVE_DLFCN_H)
+/* If plugin support is enabled, we could use libdl.  */
+#include <dlfcn.h>
+#endif
+
 /* Get libiberty declarations.  */
 #include "libiberty.h"
 
@@ -559,7 +655,7 @@
 #endif
 
 #ifndef offsetof
-#define offsetof(TYPE, MEMBER)  ((size_t) &((TYPE *) 0)->MEMBER)
+#define offsetof(TYPE, MEMBER)        ((size_t) &((TYPE *) 0)->MEMBER)
 #endif
 
 /* Various error reporting routines want to use __FUNCTION__.  */
@@ -583,16 +679,29 @@
 
 /* Use gcc_assert(EXPR) to test invariants.  */
 #if ENABLE_ASSERT_CHECKING
-#define gcc_assert(EXPR)                                                \
+#define gcc_assert(EXPR)                                                 \
    ((void)(!(EXPR) ? fancy_abort (__FILE__, __LINE__, __FUNCTION__), 0 : 0))
+#elif (GCC_VERSION >= 4005)
+#define gcc_assert(EXPR)                                                 \
+  ((void)(__builtin_expect(!(EXPR), 0) ? __builtin_unreachable(), 0 : 0))
 #else
 /* Include EXPR, so that unused variable warnings do not occur.  */
 #define gcc_assert(EXPR) ((void)(0 && (EXPR)))
 #endif
 
+#ifdef ENABLE_CHECKING
+#define gcc_checking_assert(EXPR) gcc_assert (EXPR)
+#else
+#define gcc_checking_assert(EXPR) ((void)(0 && (EXPR)))
+#endif
+
 /* Use gcc_unreachable() to mark unreachable locations (like an
    unreachable default case of a switch.  Do not use gcc_assert(0).  */
+#if (GCC_VERSION >= 4005) && !ENABLE_ASSERT_CHECKING
+#define gcc_unreachable() __builtin_unreachable()
+#else
 #define gcc_unreachable() (fancy_abort (__FILE__, __LINE__, __FUNCTION__))
+#endif
 
 /* Provide a fake boolean type.  We make no attempt to use the
    C99 _Bool, as it may not be available in the bootstrap compiler,
@@ -663,101 +772,146 @@
  #pragma GCC poison malloc realloc
 #endif
 
+/* The %m format should be used when GCC's main diagnostic functions
+   supporting %m are available, and xstrerror from libiberty
+   otherwise.  */
+#undef strerror
+ #pragma GCC poison strerror
+
 /* Old target macros that have moved to the target hooks structure.  */
- #pragma GCC poison ASM_OPEN_PAREN ASM_CLOSE_PAREN                      \
-        FUNCTION_PROLOGUE FUNCTION_EPILOGUE                             \
-        FUNCTION_END_PROLOGUE FUNCTION_BEGIN_EPILOGUE                   \
-        DECL_MACHINE_ATTRIBUTES COMP_TYPE_ATTRIBUTES INSERT_ATTRIBUTES  \
-        VALID_MACHINE_DECL_ATTRIBUTE VALID_MACHINE_TYPE_ATTRIBUTE       \
-        SET_DEFAULT_TYPE_ATTRIBUTES SET_DEFAULT_DECL_ATTRIBUTES         \
-        MERGE_MACHINE_TYPE_ATTRIBUTES MERGE_MACHINE_DECL_ATTRIBUTES     \
-        MD_INIT_BUILTINS MD_EXPAND_BUILTIN ASM_OUTPUT_CONSTRUCTOR       \
-        ASM_OUTPUT_DESTRUCTOR SIGNED_CHAR_SPEC MAX_CHAR_TYPE_SIZE       \
-        WCHAR_UNSIGNED UNIQUE_SECTION SELECT_SECTION SELECT_RTX_SECTION \
-        ENCODE_SECTION_INFO STRIP_NAME_ENCODING ASM_GLOBALIZE_LABEL     \
-        ASM_OUTPUT_MI_THUNK CONST_COSTS RTX_COSTS DEFAULT_RTX_COSTS     \
+ #pragma GCC poison ASM_OPEN_PAREN ASM_CLOSE_PAREN                        \
+        FUNCTION_PROLOGUE FUNCTION_EPILOGUE                                \
+        FUNCTION_END_PROLOGUE FUNCTION_BEGIN_EPILOGUE                        \
+        DECL_MACHINE_ATTRIBUTES COMP_TYPE_ATTRIBUTES INSERT_ATTRIBUTES        \
+        VALID_MACHINE_DECL_ATTRIBUTE VALID_MACHINE_TYPE_ATTRIBUTE        \
+        SET_DEFAULT_TYPE_ATTRIBUTES SET_DEFAULT_DECL_ATTRIBUTES                \
+        MERGE_MACHINE_TYPE_ATTRIBUTES MERGE_MACHINE_DECL_ATTRIBUTES        \
+        MD_INIT_BUILTINS MD_EXPAND_BUILTIN ASM_OUTPUT_CONSTRUCTOR        \
+        ASM_OUTPUT_DESTRUCTOR SIGNED_CHAR_SPEC MAX_CHAR_TYPE_SIZE        \
+        WCHAR_UNSIGNED UNIQUE_SECTION SELECT_SECTION SELECT_RTX_SECTION        \
+        ENCODE_SECTION_INFO STRIP_NAME_ENCODING ASM_GLOBALIZE_LABEL        \
+        ASM_OUTPUT_MI_THUNK CONST_COSTS RTX_COSTS DEFAULT_RTX_COSTS        \
         ADDRESS_COST MACHINE_DEPENDENT_REORG ASM_FILE_START ASM_FILE_END \
         ASM_SIMPLIFY_DWARF_ADDR INIT_TARGET_OPTABS INIT_SUBTARGET_OPTABS \
         INIT_GOFAST_OPTABS MULSI3_LIBCALL MULDI3_LIBCALL DIVSI3_LIBCALL \
-        DIVDI3_LIBCALL UDIVSI3_LIBCALL UDIVDI3_LIBCALL MODSI3_LIBCALL   \
+        DIVDI3_LIBCALL UDIVSI3_LIBCALL UDIVDI3_LIBCALL MODSI3_LIBCALL        \
         MODDI3_LIBCALL UMODSI3_LIBCALL UMODDI3_LIBCALL BUILD_VA_LIST_TYPE \
-        PRETEND_OUTGOING_VARARGS_NAMED STRUCT_VALUE_INCOMING_REGNUM     \
-        ASM_OUTPUT_SECTION_NAME PROMOTE_FUNCTION_ARGS                   \
-        STRUCT_VALUE_INCOMING STRICT_ARGUMENT_NAMING                    \
-        PROMOTE_FUNCTION_RETURN PROMOTE_PROTOTYPES STRUCT_VALUE_REGNUM  \
-        SETUP_INCOMING_VARARGS EXPAND_BUILTIN_SAVEREGS                  \
-        DEFAULT_SHORT_ENUMS SPLIT_COMPLEX_ARGS MD_ASM_CLOBBERS          \
-        HANDLE_PRAGMA_REDEFINE_EXTNAME HANDLE_PRAGMA_EXTERN_PREFIX      \
+        PRETEND_OUTGOING_VARARGS_NAMED STRUCT_VALUE_INCOMING_REGNUM        \
+        ASM_OUTPUT_SECTION_NAME PROMOTE_FUNCTION_ARGS PROMOTE_FUNCTION_MODE \
+        STRUCT_VALUE_INCOMING STRICT_ARGUMENT_NAMING                        \
+        PROMOTE_FUNCTION_RETURN PROMOTE_PROTOTYPES STRUCT_VALUE_REGNUM        \
+        SETUP_INCOMING_VARARGS EXPAND_BUILTIN_SAVEREGS                        \
+        DEFAULT_SHORT_ENUMS SPLIT_COMPLEX_ARGS MD_ASM_CLOBBERS                \
+        HANDLE_PRAGMA_REDEFINE_EXTNAME HANDLE_PRAGMA_EXTERN_PREFIX        \
         MUST_PASS_IN_STACK FUNCTION_ARG_PASS_BY_REFERENCE               \
-        VECTOR_MODE_SUPPORTED_P TARGET_SUPPORTS_HIDDEN                  \
-        FUNCTION_ARG_PARTIAL_NREGS ASM_OUTPUT_DWARF_DTPREL              \
-        ALLOCATE_INITIAL_VALUE
+        VECTOR_MODE_SUPPORTED_P TARGET_SUPPORTS_HIDDEN                         \
+        FUNCTION_ARG_PARTIAL_NREGS ASM_OUTPUT_DWARF_DTPREL                \
+        ALLOCATE_INITIAL_VALUE LEGITIMIZE_ADDRESS FRAME_POINTER_REQUIRED \
+        CAN_ELIMINATE TRAMPOLINE_TEMPLATE INITIALIZE_TRAMPOLINE                \
+        TRAMPOLINE_ADJUST_ADDRESS STATIC_CHAIN STATIC_CHAIN_INCOMING        \
+        RETURN_POPS_ARGS UNITS_PER_SIMD_WORD OVERRIDE_OPTIONS                \
+        OPTIMIZATION_OPTIONS CLASS_LIKELY_SPILLED_P                        \
+        USING_SJLJ_EXCEPTIONS TARGET_UNWIND_INFO                        \
+        LABEL_ALIGN_MAX_SKIP LOOP_ALIGN_MAX_SKIP                        \
+        LABEL_ALIGN_AFTER_BARRIER_MAX_SKIP JUMP_ALIGN_MAX_SKIP                 \
+        CAN_DEBUG_WITHOUT_FP UNLIKELY_EXECUTED_TEXT_SECTION_NAME        \
+        HOT_TEXT_SECTION_NAME LEGITIMATE_CONSTANT_P ALWAYS_STRIP_DOTDOT        \
+        OUTPUT_ADDR_CONST_EXTRA SMALL_REGISTER_CLASSES
+
+/* Target macros only used for code built for the target, that have
+   moved to libgcc-tm.h or have never been present elsewhere.  */
+ #pragma GCC poison DECLARE_LIBRARY_RENAMES LIBGCC2_GNU_PREFIX                \
+        MD_UNWIND_SUPPORT MD_FROB_UPDATE_CONTEXT ENABLE_EXECUTE_STACK        \
+        REG_VALUE_IN_UNWIND_CONTEXT ASSUME_EXTENDED_UNWIND_CONTEXT
 
 /* Other obsolete target macros, or macros that used to be in target
    headers and were not used, and may be obsolete or may never have
    been used.  */
- #pragma GCC poison INT_ASM_OP ASM_OUTPUT_EH_REGION_BEG CPP_PREDEFINES     \
+ #pragma GCC poison INT_ASM_OP ASM_OUTPUT_EH_REGION_BEG CPP_PREDEFINES           \
         ASM_OUTPUT_EH_REGION_END ASM_OUTPUT_LABELREF_AS_INT SMALL_STACK    \
         DOESNT_NEED_UNWINDER EH_TABLE_LOOKUP OBJC_SELECTORS_WITHOUT_LABELS \
-        OMIT_EH_TABLE EASY_DIV_EXPR IMPLICIT_FIX_EXPR                      \
-        LONGJMP_RESTORE_FROM_STACK MAX_INT_TYPE_SIZE ASM_IDENTIFY_GCC      \
-        STDC_VALUE TRAMPOLINE_ALIGN ASM_IDENTIFY_GCC_AFTER_SOURCE          \
+        OMIT_EH_TABLE EASY_DIV_EXPR IMPLICIT_FIX_EXPR                           \
+        LONGJMP_RESTORE_FROM_STACK MAX_INT_TYPE_SIZE ASM_IDENTIFY_GCC           \
+        STDC_VALUE TRAMPOLINE_ALIGN ASM_IDENTIFY_GCC_AFTER_SOURCE           \
         SLOW_ZERO_EXTEND SUBREG_REGNO_OFFSET DWARF_LINE_MIN_INSTR_LENGTH   \
-        TRADITIONAL_RETURN_FLOAT NO_BUILTIN_SIZE_TYPE                      \
+        TRADITIONAL_RETURN_FLOAT NO_BUILTIN_SIZE_TYPE                           \
         NO_BUILTIN_PTRDIFF_TYPE NO_BUILTIN_WCHAR_TYPE NO_BUILTIN_WINT_TYPE \
-        BLOCK_PROFILER BLOCK_PROFILER_CODE FUNCTION_BLOCK_PROFILER         \
-        FUNCTION_BLOCK_PROFILER_EXIT MACHINE_STATE_SAVE                    \
-        MACHINE_STATE_RESTORE SCCS_DIRECTIVE SECTION_ASM_OP BYTEORDER      \
-        ASM_OUTPUT_DEFINE_LABEL_DIFFERENCE_SYMBOL HOST_WORDS_BIG_ENDIAN    \
-        OBJC_PROLOGUE ALLOCATE_TRAMPOLINE HANDLE_PRAGMA ROUND_TYPE_SIZE    \
-        ROUND_TYPE_SIZE_UNIT CONST_SECTION_ASM_OP CRT_GET_RFIB_TEXT        \
-        DBX_LBRAC_FIRST DBX_OUTPUT_ENUM DBX_OUTPUT_SOURCE_FILENAME         \
-        DBX_WORKING_DIRECTORY INSN_CACHE_DEPTH INSN_CACHE_SIZE             \
-        INSN_CACHE_LINE_WIDTH INIT_SECTION_PREAMBLE NEED_ATEXIT ON_EXIT    \
-        EXIT_BODY OBJECT_FORMAT_ROSE MULTIBYTE_CHARS MAP_CHARACTER         \
-        LIBGCC_NEEDS_DOUBLE FINAL_PRESCAN_LABEL DEFAULT_CALLER_SAVES       \
-        LOAD_ARGS_REVERSED MAX_INTEGER_COMPUTATION_MODE                    \
-        CONVERT_HARD_REGISTER_TO_SSA_P ASM_OUTPUT_MAIN_SOURCE_FILENAME     \
-        FIRST_INSN_ADDRESS TEXT_SECTION SHARED_BSS_SECTION_ASM_OP          \
-        PROMOTED_MODE EXPAND_BUILTIN_VA_END                                \
-        LINKER_DOES_NOT_WORK_WITH_DWARF2 FUNCTION_ARG_KEEP_AS_REFERENCE    \
-        GIV_SORT_CRITERION MAX_LONG_TYPE_SIZE MAX_LONG_DOUBLE_TYPE_SIZE    \
+        BLOCK_PROFILER BLOCK_PROFILER_CODE FUNCTION_BLOCK_PROFILER           \
+        FUNCTION_BLOCK_PROFILER_EXIT MACHINE_STATE_SAVE                           \
+        MACHINE_STATE_RESTORE SCCS_DIRECTIVE SECTION_ASM_OP BYTEORDER           \
+        ASM_OUTPUT_DEFINE_LABEL_DIFFERENCE_SYMBOL HOST_WORDS_BIG_ENDIAN           \
+        OBJC_PROLOGUE ALLOCATE_TRAMPOLINE HANDLE_PRAGMA ROUND_TYPE_SIZE           \
+        ROUND_TYPE_SIZE_UNIT CONST_SECTION_ASM_OP CRT_GET_RFIB_TEXT           \
+        DBX_LBRAC_FIRST DBX_OUTPUT_ENUM DBX_OUTPUT_SOURCE_FILENAME           \
+        DBX_WORKING_DIRECTORY INSN_CACHE_DEPTH INSN_CACHE_SIZE                   \
+        INSN_CACHE_LINE_WIDTH INIT_SECTION_PREAMBLE NEED_ATEXIT ON_EXIT           \
+        EXIT_BODY OBJECT_FORMAT_ROSE MULTIBYTE_CHARS MAP_CHARACTER           \
+        LIBGCC_NEEDS_DOUBLE FINAL_PRESCAN_LABEL DEFAULT_CALLER_SAVES           \
+        LOAD_ARGS_REVERSED MAX_INTEGER_COMPUTATION_MODE                           \
+        CONVERT_HARD_REGISTER_TO_SSA_P ASM_OUTPUT_MAIN_SOURCE_FILENAME           \
+        FIRST_INSN_ADDRESS TEXT_SECTION SHARED_BSS_SECTION_ASM_OP           \
+        PROMOTED_MODE EXPAND_BUILTIN_VA_END                                   \
+        LINKER_DOES_NOT_WORK_WITH_DWARF2 FUNCTION_ARG_KEEP_AS_REFERENCE           \
+        GIV_SORT_CRITERION MAX_LONG_TYPE_SIZE MAX_LONG_DOUBLE_TYPE_SIZE           \
         MAX_WCHAR_TYPE_SIZE SHARED_SECTION_ASM_OP INTEGRATE_THRESHOLD      \
-        FINAL_REG_PARM_STACK_SPACE MAYBE_REG_PARM_STACK_SPACE              \
-        TRADITIONAL_PIPELINE_INTERFACE DFA_PIPELINE_INTERFACE              \
-        DBX_OUTPUT_STANDARD_TYPES BUILTIN_SETJMP_FRAME_VALUE               \
-        SUNOS4_SHARED_LIBRARIES PROMOTE_FOR_CALL_ONLY                      \
-        SPACE_AFTER_L_OPTION NO_RECURSIVE_FUNCTION_CSE                     \
-        DEFAULT_MAIN_RETURN TARGET_MEM_FUNCTIONS EXPAND_BUILTIN_VA_ARG     \
+        FINAL_REG_PARM_STACK_SPACE MAYBE_REG_PARM_STACK_SPACE                   \
+        TRADITIONAL_PIPELINE_INTERFACE DFA_PIPELINE_INTERFACE                   \
+        DBX_OUTPUT_STANDARD_TYPES BUILTIN_SETJMP_FRAME_VALUE                   \
+        SUNOS4_SHARED_LIBRARIES PROMOTE_FOR_CALL_ONLY                           \
+        SPACE_AFTER_L_OPTION NO_RECURSIVE_FUNCTION_CSE                           \
+        DEFAULT_MAIN_RETURN TARGET_MEM_FUNCTIONS EXPAND_BUILTIN_VA_ARG           \
         COLLECT_PARSE_FLAG DWARF2_GENERATE_TEXT_SECTION_LABEL WINNING_GDB  \
-        ASM_OUTPUT_FILENAME ASM_OUTPUT_SOURCE_LINE FILE_NAME_JOINER        \
-        GDB_INV_REF_REGPARM_STABS_LETTER DBX_MEMPARM_STABS_LETTER          \
-        PUT_SDB_SRC_FILE STABS_GCC_MARKER DBX_OUTPUT_FUNCTION_END          \
-        DBX_OUTPUT_GCC_MARKER DBX_FINISH_SYMBOL SDB_GENERATE_FAKE          \
-        NON_SAVING_SETJMP TARGET_LATE_RTL_PROLOGUE_EPILOGUE                \
+        ASM_OUTPUT_FILENAME ASM_OUTPUT_SOURCE_LINE FILE_NAME_JOINER           \
+        GDB_INV_REF_REGPARM_STABS_LETTER DBX_MEMPARM_STABS_LETTER           \
+        PUT_SDB_SRC_FILE STABS_GCC_MARKER DBX_OUTPUT_FUNCTION_END           \
+        DBX_OUTPUT_GCC_MARKER DBX_FINISH_SYMBOL SDB_GENERATE_FAKE           \
+        NON_SAVING_SETJMP TARGET_LATE_RTL_PROLOGUE_EPILOGUE                   \
         CASE_DROPS_THROUGH TARGET_BELL TARGET_BS TARGET_CR TARGET_DIGIT0   \
         TARGET_ESC TARGET_FF TARGET_NEWLINE TARGET_TAB TARGET_VT           \
-        LINK_LIBGCC_SPECIAL DONT_ACCESS_GBLS_AFTER_EPILOGUE                \
-        TARGET_OPTIONS TARGET_SWITCHES EXTRA_CC_MODES FINALIZE_PIC         \
-        PREDICATE_CODES SPECIAL_MODE_PREDICATES HOST_PTR_PRINTF            \
-        EXTRA_SECTIONS EXTRA_SECTION_FUNCTIONS READONLY_DATA_SECTION       \
+        LINK_LIBGCC_SPECIAL DONT_ACCESS_GBLS_AFTER_EPILOGUE                   \
+        TARGET_OPTIONS TARGET_SWITCHES EXTRA_CC_MODES FINALIZE_PIC           \
+        PREDICATE_CODES SPECIAL_MODE_PREDICATES        UNALIGNED_WORD_ASM_OP           \
+        EXTRA_SECTIONS EXTRA_SECTION_FUNCTIONS READONLY_DATA_SECTION           \
         TARGET_ASM_EXCEPTION_SECTION TARGET_ASM_EH_FRAME_SECTION           \
-        SMALL_ARG_MAX ASM_OUTPUT_SHARED_BSS ASM_OUTPUT_SHARED_COMMON       \
-        ASM_OUTPUT_SHARED_LOCAL UNALIGNED_WORD_ASM_OP                      \
-        ASM_MAKE_LABEL_LINKONCE
+        SMALL_ARG_MAX ASM_OUTPUT_SHARED_BSS ASM_OUTPUT_SHARED_COMMON           \
+        ASM_OUTPUT_SHARED_LOCAL ASM_MAKE_LABEL_LINKONCE                           \
+        STACK_CHECK_PROBE_INTERVAL STACK_CHECK_PROBE_LOAD                   \
+        ORDER_REGS_FOR_LOCAL_ALLOC FUNCTION_OUTGOING_VALUE                   \
+        ASM_DECLARE_CONSTANT_NAME MODIFY_TARGET_NAME SWITCHES_NEED_SPACES  \
+        SWITCH_CURTAILS_COMPILATION SWITCH_TAKES_ARG WORD_SWITCH_TAKES_ARG \
+        TARGET_OPTION_TRANSLATE_TABLE HANDLE_PRAGMA_PACK_PUSH_POP           \
+        HANDLE_SYSV_PRAGMA HANDLE_PRAGMA_WEAK CONDITIONAL_REGISTER_USAGE   \
+        FUNCTION_ARG_BOUNDARY MUST_USE_SJLJ_EXCEPTIONS US_SOFTWARE_GOFAST  \
+        USING_SVR4_H SVR4_ASM_SPEC FUNCTION_ARG FUNCTION_ARG_ADVANCE           \
+        FUNCTION_INCOMING_ARG IRA_COVER_CLASSES TARGET_VERSION                   \
+        MACHINE_TYPE TARGET_HAS_TARGETCM ASM_OUTPUT_BSS                           \
+        SETJMP_VIA_SAVE_AREA FORBIDDEN_INC_DEC_CLASSES                           \
+        PREFERRED_OUTPUT_RELOAD_CLASS SYSTEM_INCLUDE_DIR                   \
+        STANDARD_INCLUDE_DIR STANDARD_INCLUDE_COMPONENT
 
 /* Hooks that are no longer used.  */
- #pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE   \
+ #pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE        \
         LANG_HOOKS_MARK_TREE LANG_HOOKS_INSERT_DEFAULT_ATTRIBUTES \
         LANG_HOOKS_TREE_INLINING_ESTIMATE_NUM_INSNS \
         LANG_HOOKS_PUSHLEVEL LANG_HOOKS_SET_BLOCK \
         LANG_HOOKS_MAYBE_BUILD_CLEANUP LANG_HOOKS_UPDATE_DECL_AFTER_SAVING \
-        LANG_HOOKS_POPLEVEL LANG_HOOKS_TRUTHVALUE_CONVERSION
+        LANG_HOOKS_POPLEVEL LANG_HOOKS_TRUTHVALUE_CONVERSION \
+        TARGET_PROMOTE_FUNCTION_ARGS TARGET_PROMOTE_FUNCTION_RETURN \
+        LANG_HOOKS_MISSING_ARGUMENT LANG_HOOKS_HASH_TYPES \
+        TARGET_HANDLE_OFAST TARGET_OPTION_OPTIMIZATION \
+        TARGET_IRA_COVER_CLASSES TARGET_HELP
+
+/* Arrays that were deleted in favor of a functional interface.  */
+ #pragma GCC poison built_in_decls implicit_built_in_decls
+
+/* Hooks into libgcc2.  */
+ #pragma GCC poison LIBGCC2_DOUBLE_TYPE_SIZE LIBGCC2_WORDS_BIG_ENDIAN \
+   LIBGCC2_FLOAT_WORDS_BIG_ENDIAN
 
 /* Miscellaneous macros that are no longer used.  */
- #pragma GCC poison USE_MAPPED_LOCATION
+ #pragma GCC poison USE_MAPPED_LOCATION GET_ENVIRONMENT
 
- /* Libiberty macros that are no longer used in GCC.  */
+/* Libiberty macros that are no longer used in GCC.  */
 #undef ANSI_PROTOTYPES
 #undef PTR_CONST
 #undef LONG_DOUBLE
@@ -770,6 +924,12 @@
   VA_FIXEDARG VA_CLOSE VA_START
 #endif /* IN_GCC */
 
+/* Front ends should never have to include middle-end headers.  Enforce
+   this by poisoning the header double-include protection defines.  */
+#ifdef IN_GCC_FRONTEND
+#pragma GCC poison GCC_RTL_H GCC_EXCEPT_H GCC_EXPR_H
+#endif
+
 /* Note: not all uses of the `index' token (e.g. variable names and
    structure members) have been eliminated.  */
 #undef bcopy
@@ -796,13 +956,31 @@
    change after the fact).  Beyond these uses, most other cases of
    using this macro should be viewed with extreme caution.  */
 
+#ifdef __cplusplus
+#define CONST_CAST2(TOTYPE,FROMTYPE,X) (const_cast<TOTYPE> (X))
+#else
 #if defined(__GNUC__) && GCC_VERSION > 4000
 /* GCC 4.0.x has a bug where it may ICE on this expression,
    so does GCC 3.4.x (PR17436).  */
 #define CONST_CAST2(TOTYPE,FROMTYPE,X) ((__extension__(union {FROMTYPE _q; TOTYPE _nq;})(X))._nq)
+#elif defined(__GNUC__)
+static inline char *
+helper_const_non_const_cast (const char *p)
+{
+  union {
+    const char *const_c;
+    char *c;
+  } val;
+  val.const_c = p;
+  return val.c;
+}
+
+#define CONST_CAST2(TOTYPE,FROMTYPE,X) \
+        ((TOTYPE) helper_const_non_const_cast ((const char *) (FROMTYPE) (X)))
 #else
 #define CONST_CAST2(TOTYPE,FROMTYPE,X) ((TOTYPE)(FROMTYPE)(X))
 #endif
+#endif
 #define CONST_CAST(TYPE,X) CONST_CAST2(TYPE, const TYPE, (X))
 #define CONST_CAST_TREE(X) CONST_CAST(union tree_node *, (X))
 #define CONST_CAST_RTX(X) CONST_CAST(struct rtx_def *, (X))
@@ -844,6 +1022,16 @@
 #define VALGRIND_FREELIKE_BLOCK(x,y)
 #endif
 
+/* In LTO -fwhole-program build we still want to keep the debug functions available
+   for debugger.  Mark them as used to prevent removal.  */
+#if (GCC_VERSION > 4000)
+#define DEBUG_FUNCTION __attribute__ ((__used__))
+#define DEBUG_VARIABLE __attribute__ ((__used__))
+#else
+#define DEBUG_FUNCTION
+#define DEBUG_VARIABLE
+#endif
+
 /* SDCC specific */
 #include "sdcpp.h"
 
diff -Nru sdcc-3.1.0+dfsg/support/cpp/version.c sdcc-3.2.0+dfsg/support/cpp/version.c
--- sdcc-3.1.0+dfsg/support/cpp/version.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/cpp/version.c	2012-03-04 17:39:37.000000000 +0000
@@ -1,3 +1,22 @@
+/* Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2007 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
+
+GCC 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 GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
 #include "version.h"
 
 /* This is the trailing component of the string reported as the
@@ -8,21 +27,24 @@
    in parentheses.  You may also wish to include a number indicating
    the revision of your modified compiler.  */
 
-#define BASEVER "4.6.1"
+#define BASEVER "4.6.3"
 #define DATESTAMP
 #define DEVPHASE
-#define VERSUFFIX " + SDCC"
+#define VERSUFFIX " (GNU cpp adapted for SDCC)"
+#define PKGVERSION "(SDCC) "
 
 /* This is the location of the online document giving instructions for
    reporting bugs.  If you distribute a modified version of GCC,
-   please change this to refer to a document giving instructions for
-   reporting bugs to you, not us.  (You are of course welcome to
-   forward us bugs reported to you, if you determine that they are
-   not bugs in your modifications.)  */
+   please configure with --with-bugurl pointing to a document giving
+   instructions for reporting bugs to you, not us.  (You are of course
+   welcome to forward us bugs reported to you, if you determine that
+   they are not bugs in your modifications.)  */
 
-const char bug_report_url[] = "<URL:http://sdcc.sourceforge.net>";
+const char bug_report_url[] = "<URL:http://sourceforge.net/tracker/?atid=100599&group_id=599&func=browse>";
 
 /* The complete version string, assembled from several pieces.
-   BASEVER, DATESTAMP, and DEVPHASE are defined by the Makefile.  */
+   BASEVER, DATESTAMP, DEVPHASE, and REVISION are defined by the
+   Makefile.  */
 
 const char version_string[] = BASEVER DATESTAMP DEVPHASE VERSUFFIX;
+const char pkgversion_string[] = PKGVERSION;
\ No newline at end of file
diff -Nru sdcc-3.1.0+dfsg/support/cpp/version.h sdcc-3.2.0+dfsg/support/cpp/version.h
--- sdcc-3.1.0+dfsg/support/cpp/version.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/cpp/version.h	2012-03-04 17:39:37.000000000 +0000
@@ -1,5 +1,6 @@
 #ifndef GCC_VERSION_H
 #define GCC_VERSION_H
 extern const char version_string[];
+extern const char pkgversion_string[];
 extern const char bug_report_url[];
 #endif /* ! GCC_VERSION_H */
diff -Nru sdcc-3.1.0+dfsg/support/librarian/sdcclib.c sdcc-3.2.0+dfsg/support/librarian/sdcclib.c
--- sdcc-3.1.0+dfsg/support/librarian/sdcclib.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/librarian/sdcclib.c	2012-04-26 14:14:27.000000000 +0000
@@ -24,12 +24,11 @@
 #include <unistd.h>
 #endif
 
-char ProgName[PATH_MAX];
-char LibName[PATH_MAX];
-char LibNameTmp[PATH_MAX];
-char IndexName[PATH_MAX];
-char AdbName[PATH_MAX];
-char ListName[PATH_MAX];
+char ProgName[FILENAME_MAX];
+char LibName[FILENAME_MAX];
+char LibNameTmp[FILENAME_MAX];
+char IndexName[FILENAME_MAX];
+char ListName[FILENAME_MAX];
 
 char **RelName;
 int NumRelFiles=0;
@@ -183,6 +182,11 @@
                     else
                     {
                         cont_par++;
+                        if(strlen(LibName) > FILENAME_MAX - 1)
+                        {
+                            printf("ERROR: Library name too long.\n");
+                            exit(2);
+                        }
                         strcpy(LibName, argv[j]);
                     }
                 break;
@@ -200,13 +204,12 @@
                             printf("ERROR: Insufficient memory.\n");
                             exit(2);
                         }
-                        RelName[0]=(char *)malloc(PATH_MAX);
+                        RelName[0]=strdup(argv[j]);
                         if(RelName[0]==NULL)
                         {
                             printf("ERROR: Insufficient memory.\n");
                             exit(2);
                         }
-                        strcpy(RelName[0], argv[j]);
                     }
                 break;
 
@@ -219,13 +222,12 @@
                         printf("ERROR: Insufficient memory.\n");
                         exit(2);
                     }
-                    RelName[NumRelFiles-1]=(char *)malloc(PATH_MAX);
+                    RelName[NumRelFiles-1]=strdup(argv[j]);
                     if(RelName[NumRelFiles-1]==NULL)
                     {
                         printf("ERROR: Insufficient memory.\n");
                         exit(2);
                     }
-                    strcpy(RelName[NumRelFiles-1], argv[j]);
                 break;
             }
         }
@@ -251,6 +253,7 @@
     char symname[MAXLINE+1];
     char c;
     int IsDOSStyle=0;
+    char *AdbName = 0;
 
     strcpy(LibNameTmp, LibName);
     ChangeExtension(LibNameTmp, "__L");
@@ -258,7 +261,7 @@
     strcpy(IndexName, LibName);
     ChangeExtension(IndexName, "__I");
 
-    strcpy(AdbName, RelName);
+    AdbName = strdup (RelName);
     ChangeExtension(AdbName, "adb");
 
     lib=fopen(LibName, "r");
@@ -270,6 +273,7 @@
         {
             printf("ERROR: Couldn't open file '%s'\n", RelName);
             if(lib!=NULL) fclose(lib);
+            free(AdbName);
             return;
         }
     }
@@ -281,6 +285,7 @@
         printf("ERROR: Couldn't create temporary file '%s'\n", LibNameTmp);
         if(lib!=NULL) fclose(lib);
         fclose(rel);
+        free(AdbName);
         return;
     }
     fprintf(newlib, "<FILES>\n\n");
@@ -292,6 +297,7 @@
         if(lib!=NULL) fclose(lib);
         fclose(newlib);
         fclose(rel);
+        free(AdbName);
         return;
     }
 
@@ -437,19 +443,23 @@
 
     remove(LibNameTmp);
     remove(IndexName);
+
+    free(AdbName);
 }
 
 void ExtractRel(char * RelName)
 {
     int state=0;
+    char *AdbName = 0;
 
-    strcpy(AdbName, RelName);
+    AdbName = strdup(RelName);
     ChangeExtension(AdbName, "adb");
 
     lib=fopen(LibName, "r");
     if(lib==NULL)
     {
         printf("ERROR: Couldn't open file '%s'\n", LibName);
+        free(AdbName);
         return;
     }
 
@@ -458,6 +468,7 @@
     {
         printf("ERROR: Couldn't create file '%s'\n", RelName);
         fclose(lib);
+        free(AdbName);
         return;
     }
     GetNameFromPath(RelName, ModName);
@@ -468,6 +479,7 @@
         printf("ERROR: Couldn't create file '%s'\n", AdbName);
         fclose(lib);
         fclose(rel);
+        free(AdbName);
         return;
     }
 
@@ -515,6 +527,8 @@
     fclose(rel);
     fclose(lib);
     fclose(adb);
+
+    free(AdbName);
 }
 
 void DumpSymbols(void)
@@ -604,8 +618,8 @@
     char *cc;
     char *as;
     char CmdLine[1024];
-    char SrcName[PATH_MAX];
-    char RelName[PATH_MAX];
+    char SrcName[FILENAME_MAX];
+    char RelName[FILENAME_MAX];
 
     list=fopen(ListName, "r");
     if(list==NULL)
@@ -621,7 +635,7 @@
     while(!feof(list))
     {
         RelName[0]=0;
-        if (fgets(RelName, PATH_MAX, list) == NULL)
+        if (fgets(RelName, FILENAME_MAX, list) == NULL)
           break;
         CleanLine(RelName);
         if(strlen(RelName)>0) //Skip empty lines
@@ -707,3 +721,4 @@
     }
     return 0; //Success!!!
 }
+
diff -Nru sdcc-3.1.0+dfsg/support/makebin/makebin.c sdcc-3.2.0+dfsg/support/makebin/makebin.c
--- sdcc-3.1.0+dfsg/support/makebin/makebin.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/makebin/makebin.c	2012-03-24 22:04:34.000000000 +0000
@@ -3,6 +3,7 @@
 
   Copyright (c) 2000 Michael Hope
   Copyright (c) 2010 Borut Razem
+  Copyright (c) 2012 Noel Lemouel
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -112,6 +113,21 @@
 gb_postproc (BYTE * rom, int size, int *real_size, struct gb_opt_s *o)
 {
   int i, chk;
+  static const BYTE gb_logo[] =
+    {
+      0xce, 0xed, 0x66, 0x66, 0xcc, 0x0d, 0x00, 0x0b,
+      0x03, 0x73, 0x00, 0x83, 0x00, 0x0c, 0x00, 0x0d,
+      0x00, 0x08, 0x11, 0x1f, 0x88, 0x89, 0x00, 0x0e,
+      0xdc, 0xcc, 0x6e, 0xe6, 0xdd, 0xdd, 0xd9, 0x99,
+      0xbb, 0xbb, 0x67, 0x63, 0x6e, 0x0e, 0xec, 0xcc,
+      0xdd, 0xdc, 0x99, 0x9f, 0xbb, 0xb9, 0x33, 0x3e
+    };
+
+  /* $0104-$0133: Nintendo logo
+   * If missing, an actual Game Boy won't run the ROM.
+   */
+
+  memcpy (&rom[0x104], gb_logo, sizeof (gb_logo));
 
   /*
    * 0134-0142: Title of the game in UPPER CASE ASCII. If it
diff -Nru sdcc-3.1.0+dfsg/support/packihx/configure sdcc-3.2.0+dfsg/support/packihx/configure
--- sdcc-3.1.0+dfsg/support/packihx/configure	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/packihx/configure	2012-05-18 10:47:44.000000000 +0000
@@ -1,11 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68.
+# Generated by GNU Autoconf 2.69.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -134,6 +132,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -167,7 +190,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -212,21 +236,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -328,6 +356,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -449,6 +485,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -483,16 +523,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -504,28 +544,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -1117,8 +1137,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1344,9 +1362,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1454,7 +1472,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -1470,7 +1489,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -1496,7 +1516,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -1512,7 +1533,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -1546,7 +1568,8 @@
 main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
@@ -1687,7 +1710,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2060,7 +2083,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2100,7 +2123,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2153,7 +2176,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2194,7 +2217,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -2252,7 +2275,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2296,7 +2319,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2742,8 +2765,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -2984,7 +3006,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -3050,7 +3072,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -3860,16 +3882,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -3929,28 +3951,16 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -3972,7 +3982,7 @@
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -4034,10 +4044,10 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -4125,7 +4135,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
diff -Nru sdcc-3.1.0+dfsg/support/regression/Makefile.in sdcc-3.2.0+dfsg/support/regression/Makefile.in
--- sdcc-3.1.0+dfsg/support/regression/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/Makefile.in	2012-05-21 12:06:27.000000000 +0000
@@ -20,7 +20,7 @@
 #       o Provides the emulators
 #   * The gbdk-lib package from gbdk.
 #       o cvs -d cvs.gbdk.sourceforge.net:/cvsroot/gbdk co gbdk-lib
-#       o Proviles mul, div, and include files for the z80 tests.
+#       o Provides mul, div, and include files for the z80 tests.
 #   * python 1.5 or above
 #   * uCsim for the mcs51 port
 #
@@ -68,7 +68,7 @@
 # Each directory under ports/ is used as a port name.  Each port is tested.
 # Each port must have a spec.mk which describes how to build the object
 # files and how to run the emulator.
-ALL_PORTS = $(filter-out .svn xa51 z80 gbz80 pic16 pic14 mcs51-common,$(notdir $(wildcard $(PORTS_DIR)/*)))
+ALL_PORTS = $(filter-out .svn xa51 rrz80 rrgbz80 pic16 pic14 mcs51-common,$(notdir $(wildcard $(PORTS_DIR)/*)))
 
 # These  ports will be cleaned with 'make clean'
 CLEAN_PORTS = $(filter-out .svn mcs51-common,$(notdir $(wildcard $(PORTS_DIR)/*)))
@@ -82,74 +82,111 @@
 
 # Test all of the ports
 test-ports:
+	$(MAKE) test-common
 	for i in $(ALL_PORTS); do $(MAKE) make_library test-port PORT=$$i; done
 
-# Helper rule for testing the z80 port only
-test-z80:
-	$(MAKE) test-port PORT=z80
-
-# Helper rule for testing the z80 port only
-test-gbz80:
-	$(MAKE) test-port PORT=gbz80
+# Helper rule for testing the z80 port only (use rrz80 simulator)
+test-rrz80:
+	$(MAKE) test-common
+	$(MAKE) test-port PORT=rrz80
+
+# Helper rule for testing the z80 port only (use rrgb simulator)
+test-rrgbz80:
+	$(MAKE) test-common
+	$(MAKE) test-port PORT=rrgbz80
 
 # Helper rule for testing the mcs51 port only
 test-mcs51: test-mcs51-small test-mcs51-medium test-mcs51-large test-mcs51-huge test-mcs51-stack-auto test-mcs51-xstack-auto
 
 test-mcs51-small:
+	$(MAKE) test-common
 	$(MAKE) test-port PORT=mcs51-small
 
 test-mcs51-medium:
+	$(MAKE) test-common
 	$(MAKE) test-port PORT=mcs51-medium
 
 test-mcs51-large:
+	$(MAKE) test-common
 	$(MAKE) test-port PORT=mcs51-large
 
 test-mcs51-huge:
+	$(MAKE) test-common
 	$(MAKE) make_library test-port PORT=mcs51-huge
 
 test-mcs51-stack-auto:
+	$(MAKE) test-common
 	$(MAKE) test-port PORT=mcs51-stack-auto
 
 test-mcs51-xstack-auto:
+	$(MAKE) test-common
 	$(MAKE) make_library test-port PORT=mcs51-xstack-auto
 
 # Helper rule for testing the ds390 port only
 test-ds390:
+	$(MAKE) test-common
 	$(MAKE) test-port PORT=ds390
 
+# Helper rule for testing the z80 related ports only
+test-z80: test-ucz80 test-ucz180 test-ucgbz80 test-ucr2k test-ucr3ka
+
 # Helper rule for testing the z80 port only(use ucSim simulator)
 test-ucz80:
+	$(MAKE) test-common
 	$(MAKE) test-port PORT=ucz80
 
 # Helper rule for testing the z180 port only(use ucSim simulator)
 test-ucz180:
+	$(MAKE) test-common
 	$(MAKE) test-port PORT=ucz180
 
+# Helper rule for testing the gb/lr35902 port only(use ucSim simulator)
+test-ucgbz80:
+	$(MAKE) test-common
+	$(MAKE) test-port PORT=ucgbz80
+
 # Helper rule for testing the r2k port only(use ucSim simulator)
 test-ucr2k:
+	$(MAKE) test-common
 	$(MAKE) test-port PORT=ucr2k
 
+# Helper rule for testing the r3k port only(use ucSim simulator)
+test-ucr3ka:
+	$(MAKE) test-common
+	$(MAKE) test-port PORT=ucr3ka
+
 # Helper rule for testing the hc08 port only(use ucSim simulator)
 test-hc08:
+	$(MAKE) test-common
 	$(MAKE) test-port PORT=hc08
 
+# Helper rule for testing the s08 port only(use ucSim simulator)
+test-s08:
+	$(MAKE) test-common
+	$(MAKE) test-port PORT=s08
+
 # Helper rule for testing the xa51 port only(use ucSim simulator)
 test-xa51:
+	$(MAKE) test-common
 	$(MAKE) test-port PORT=xa51
 
 # Helper rule for testing the pic16 port only(use gpsim simulator)
 test-pic16:
+	$(MAKE) test-common
 	$(MAKE) test-port PORT=pic16
 
 # Helper rule for testing the pic14 port only(use gpsim simulator)
 test-pic14:
+	$(MAKE) test-common
 	$(MAKE) test-port PORT=pic14
 
 ### Helper rule for testing the host cc only
 test-host:
+	$(MAKE) test-common
 	$(MAKE) test-port PORT=host
 
 test-host2:
+	$(MAKE) test-common
 	$(MAKE) test-port PORT=host
 
 # Begin per-port rules
@@ -184,6 +221,8 @@
 # Currently unused.  Extension to append to intermediate directories.
 DIREXT =
 
+CC_FOR_BUILD = $(CC)
+
 # Only include if we're in a per-port call.
 ifdef PORT
   # include ./$(PORT)/spec.mk if exists, else include $(PORTS_DIR)/$(PORT)/spec.mk
@@ -205,11 +244,17 @@
 # disk space is free.
 .PRECIOUS: $(PORT_CASES_DIR)/% %$(OBJEXT) %$(EXEEXT) %$(BINEXT)
 
-$(CASES_DIR):
-	mkdir -p $@
+# $(CASES_DIR)/stamp is really a proxy for $(CASES_DIR). We shouldn't use
+# $(CASES_DIR) as a dependency directly, because as a directory its time
+# stamp updates every time something in the directory is updated (which
+# can then cause spurious rebuilds of other targets that can conflict
+# with parallel make jobs)
+$(CASES_DIR)/stamp:
+	mkdir -p $(CASES_DIR)
+	touch $@
 
 # Rule to generate .c files from .m4 files
-$(CASES_DIR)/%.c: $(TESTS_DIR)/%.m4
+$(CASES_DIR)/%.c: $(TESTS_DIR)/%.m4 $(CASES_DIR)/stamp
 	m4 -I $(srcdir)/m4include rtmacros.m4 $< > $@
 
 # Rule to generate the iterations of a test suite off the source suite.
@@ -227,16 +272,23 @@
 
 # Rule to summarise the results for one port after all of the tests
 # have been run.
-port-results: port-dirs $(PORT_RESULTS)
-	echo Summary for \'$(PORT)\': `cat $(PORT_RESULTS) | python $(srcdir)/collate-results.py`
-	echo
+port-results: $(PORT_RESULTS)
+	cat $(PORT_RESULTS) | python $(srcdir)/collate-results.py $(PORT)
+
+port-fwklib: $(EXTRAS) $(FWKLIB)
 
 port-dirs:
 	mkdir -p $(PORT_CASES_DIR) $(PORT_RESULTS_DIR)
 	echo Running $(PORT) regression tests
 
-test-port: $(CASES_DIR) $(M_CASES)
+# Files shared between all ports need to be built by the test-common target,
+# which should always be built before the port specific targets.
+test-common: $(CASES_DIR)/stamp $(M_CASES) $(CASES_DIR)/timeout
+
+test-port:
 	# recurse: force vpath to re-read the $(CASES_DIR)
+	$(MAKE) port-dirs PORT=$(PORT)
+	$(MAKE) port-fwklib PORT=$(PORT)
 	$(MAKE) port-results PORT=$(PORT)
 
 # Begin rules that process each iteration generated from the source
@@ -255,6 +307,9 @@
 $(RESULTS): $(SUB_RESULTS)
 	cat $(SUB_RESULTS) > $@
 
+$(CASES_DIR)/timeout: $(srcdir)/fwk/lib/timeout.c $(CASES_DIR)/stamp
+	$(CC_FOR_BUILD) $(CFLAGS) $< -o $@
+
 # The remainder of the rules are in $PORT/spec.mk.  The port needs to
 # be able to turn an iterated test suite into a sub result, normally
 # by:
diff -Nru sdcc-3.1.0+dfsg/support/regression/collate-results.py sdcc-3.2.0+dfsg/support/regression/collate-results.py
--- sdcc-3.1.0+dfsg/support/regression/collate-results.py	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/collate-results.py	2012-04-09 22:14:34.000000000 +0000
@@ -15,6 +15,7 @@
 bytes = 0
 ticks = 0
 invalid = 0
+messagelog = []
 
 # hack for valdiag
 name = ""
@@ -39,7 +40,7 @@
         tests = tests + string.atof(ntests)
         cases = cases + string.atof(ncases)
         if (string.atof(nfailures)):
-            print "Failure: %s" % name
+            messagelog.append("Failure: %s" % name)
 
     # '--- Simulator: b/t: ...', where b = # bytes, t = # ticks
     if (re.search(r'^--- Simulator:', line)):
@@ -50,9 +51,14 @@
 
     # Stop at 0x000228: (106) Invalid instruction 0x00fd
     if (re.search(r'Invalid instruction', line)):
-        invalid += 1;
-        print "Invalid instruction: %s" % name
+        invalid += 1
+        messagelog.append("Invalid instruction: %s" % name)
 
+if (len(sys.argv) > 1):
+    print "Summary for '%s':" % sys.argv[1],
 if (invalid > 0):
     print "%d invalid instructions," % invalid,
 print "%.0f failures, %.0f tests, %.0f test cases, %.0f bytes, %.0f ticks" % (failures, tests, cases, bytes, ticks)
+for msg in messagelog:
+  print "  ",msg
+print
diff -Nru sdcc-3.1.0+dfsg/support/regression/compact-results.py sdcc-3.2.0+dfsg/support/regression/compact-results.py
--- sdcc-3.1.0+dfsg/support/regression/compact-results.py	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/compact-results.py	2012-05-13 10:47:19.000000000 +0000
@@ -26,10 +26,10 @@
     if (m):
         name = m.group(1)
 
-    # in case the test program crashes before the "--- Running" message
-    m = re.match(r'^[0-9]+ words read from (.*)\.ihx$',line)
-    if (m):
-        name = m.group(1)
+    # in case the test program crashes before the "--- Running" message
+    m = re.match(r'^[0-9]+ words read from (.*)\.ihx$',line)
+    if (m):
+        name = m.group(1)
 
     base = name
     m = re.match(r'([^/]*)/([^/]*)/([^/]*)/(.*)$', name)
@@ -59,8 +59,8 @@
         invalid += 1;
         print "Invalid instruction: %s" % name
 
-print "%-20.20s" % base,
+print "%-35.35s" % base,
 
 if (invalid > 0):
     print "%d invalid instructions," % invalid,
-print "(f: %.0f, t: %.0f, c: %.0f, b: %.0f, t: %.0f)" % (failures, tests, cases, bytes, ticks)
+print "(f: %2.0f, t: %3.0f, c: %2.0f, b: %6.0f, t: %8.0f)" % (failures, tests, cases, bytes, ticks)
diff -Nru sdcc-3.1.0+dfsg/support/regression/fwk/include/testfwk.h sdcc-3.2.0+dfsg/support/regression/fwk/include/testfwk.h
--- sdcc-3.1.0+dfsg/support/regression/fwk/include/testfwk.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/fwk/include/testfwk.h	2012-05-21 02:54:59.000000000 +0000
@@ -11,14 +11,14 @@
 #define LOG(_a)     /* hollow log */
 #endif
 
-#ifdef SDCC
+#ifdef __SDCC
  #include <sdcc-lib.h>
 #else
  #define _AUTOMEM
  #define _STATMEM
 #endif
 
-#if defined(PORT_HOST) || defined(SDCC_z80) || defined(SDCC_z180) || defined(SDCC_r2k)|| defined(SDCC_gbz80)
+#if defined(PORT_HOST) || defined(__SDCC_z80) || defined(__SDCC_z180) || defined(__SDCC_r2k) || defined(__SDCC_r3ka) || defined(__SDCC_gbz80)
 # define __data
 # define __idata
 # define __pdata
@@ -26,16 +26,19 @@
 # define __code
 # define __near
 # define __far
-# define __at(x)
 # define __reentrant
 #endif
 
-#if defined(SDCC_hc08)
+#if defined(PORT_HOST)
+# define __at(x)
+#endif
+
+#if defined(__SDCC_hc08) || defined(__SDCC_s08)
 # define __idata __data
 # define __pdata __data
 #endif
 
-#if defined(SDCC_pic16)
+#if defined(__SDCC_pic16)
 # define __idata __data
 # define __xdata __data
 # define __pdata __data
diff -Nru sdcc-3.1.0+dfsg/support/regression/fwk/lib/extern1.c sdcc-3.2.0+dfsg/support/regression/fwk/lib/extern1.c
--- sdcc-3.1.0+dfsg/support/regression/fwk/lib/extern1.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/fwk/lib/extern1.c	2012-02-22 14:45:17.000000000 +0000
@@ -1,6 +1,6 @@
 /* needed by tests/inline.c */
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_sdcc99
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/support/regression/fwk/lib/extern2.c sdcc-3.2.0+dfsg/support/regression/fwk/lib/extern2.c
--- sdcc-3.1.0+dfsg/support/regression/fwk/lib/extern2.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/fwk/lib/extern2.c	2012-02-22 14:45:17.000000000 +0000
@@ -1,6 +1,6 @@
 /* needed by tests/inline.c */
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_sdcc99
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/support/regression/fwk/lib/testfwk.c sdcc-3.2.0+dfsg/support/regression/fwk/lib/testfwk.c
--- sdcc-3.1.0+dfsg/support/regression/fwk/lib/testfwk.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/fwk/lib/testfwk.c	2012-02-22 14:45:17.000000000 +0000
@@ -5,11 +5,11 @@
 #include <stdarg.h>
 #endif
 
-#ifdef SDCC_ds390
+#ifdef __SDCC_ds390
 #include <tinibios.h> /* main() must see the ISR declarations */
 #endif
 
-#ifdef SDCC_mcs51
+#ifdef __SDCC_mcs51
 /* until changed, isr's must have a prototype in the module containing main */
 void T2_isr (void) __interrupt 5;
 #define MEMSPACE_BUF __idata
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/ds390/spec.mk sdcc-3.2.0+dfsg/support/regression/ports/ds390/spec.mk
--- sdcc-3.1.0+dfsg/support/regression/ports/ds390/spec.mk	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/ds390/spec.mk	2012-05-07 17:21:45.000000000 +0000
@@ -4,6 +4,9 @@
 
 CC_FOR_BUILD = $(CC)
 
+# simulation timeout in seconds
+SIM_TIMEOUT = 60
+
 # path to uCsim
 ifdef SDCC_BIN_PATH
   S51 = $(SDCC_BIN_PATH)/s51$(EXEEXT)
@@ -56,15 +59,13 @@
 $(PORT_CASES_DIR)/fwk.lib: $(srcdir)/fwk/lib/fwk.lib
 	cat < $(srcdir)/fwk/lib/fwk.lib > $@
 
-# run simulator with 25 seconds timeout
+# run simulator with SIM_TIMEOUT seconds timeout
 %.out: %$(BINEXT) $(CASES_DIR)/timeout
 	mkdir -p $(dir $@)
-	-$(CASES_DIR)/timeout 25 $(EMU) -tds390 -S in=$(DEV_NULL),out=$@ $< < $(PORTS_DIR)/$(PORT)/uCsim.cmd > $(@:.out=.sim) \
+	-$(CASES_DIR)/timeout $(SIM_TIMEOUT) $(EMU) -tds390 -S in=$(DEV_NULL),out=$@ $< < $(PORTS_DIR)/$(PORT)/uCsim.cmd > $(@:.out=.sim) \
 	  || echo -e --- FAIL: \"timeout, simulation killed\" in $(<:$(BINEXT)=.c)"\n"--- Summary: 1/1/1: timeout >> $@
 	python $(srcdir)/get_ticks.py < $(@:.out=.sim) >> $@
 	-grep -n FAIL $@ /dev/null || true
 
-$(CASES_DIR)/timeout: $(srcdir)/fwk/lib/timeout.c
-	$(CC_FOR_BUILD) $(CFLAGS) $< -o $@
 
 _clean:
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/gbz80/spec.mk sdcc-3.2.0+dfsg/support/regression/ports/gbz80/spec.mk
--- sdcc-3.1.0+dfsg/support/regression/ports/gbz80/spec.mk	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/gbz80/spec.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-# Regression test specification for the gbz80 target.
-
-EMU = $(SDCC_EXTRA_DIR)/emu/rrgb/rrgb$(EXEEXT)
-MAKEBIN = $(top_builddir)/bin/makebin$(EXEEXT)
-
-SDCCFLAGS += --nostdinc -I$(top_srcdir)
-LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/gbz80
-
-SDCCFLAGS += -mgbz80 --less-pedantic -DREENTRANT=
-LINKFLAGS += --out-fmt-ihx gbz80.lib
-
-OBJEXT = .rel
-BINEXT = .gb
-
-# otherwise `make` deletes testfwk.rel and `make -j` will fail
-.PRECIOUS: $(PORT_CASES_DIR)/%$(OBJEXT)
-
-# Needs parts of gbdk-lib, namely the internal mul/div/mod functions.
-EXTRAS = $(PORT_CASES_DIR)/testfwk$(OBJEXT) $(PORT_CASES_DIR)/support$(OBJEXT)
-include $(srcdir)/fwk/lib/spec.mk
-
-# Rule to convert .ihx to .gb
-%$(BINEXT): %.ihx
-	$(MAKEBIN) -Z -yn ABS $< $@
-
-# Rule to link into .ihx
-%.ihx: %$(OBJEXT) $(EXTRAS) $(FWKLIB) $(PORT_CASES_DIR)/fwk.lib
-	$(SDCC) $(SDCCFLAGS) $(LINKFLAGS) $(EXTRAS) $(PORT_CASES_DIR)/fwk.lib $< -o $@
-
-$(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/$(PORT)/%.asm
-	@# TODO: sdas should place it\'s output in the current dir
-	cp $< $(PORT_CASES_DIR)
-	$(top_builddir)/bin/sdasgb -plosgff $(PORT_CASES_DIR)/$(notdir $<)
-	rm $(PORT_CASES_DIR)/$(notdir $<)
-
-%$(OBJEXT): %.c
-	$(SDCC) $(SDCCFLAGS) -c $< -o $@
-
-$(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/$(PORT)/%.c
-	$(SDCC) $(SDCCFLAGS) -c $< -o $@
-
-$(PORT_CASES_DIR)/%$(OBJEXT): $(srcdir)/fwk/lib/%.c
-	$(SDCC) $(SDCCFLAGS) -c $< -o $@
-
-$(PORT_CASES_DIR)/fwk.lib: $(srcdir)/fwk/lib/fwk.lib
-	cat < $(srcdir)/fwk/lib/fwk.lib > $@
-
-# PENDING: Path to sdcc-extra
-%.out: %$(BINEXT)
-	mkdir -p $(dir $@)
-	$(EMU) -k $< > $@
-	-grep -n FAIL $@ /dev/null || true
-
-_clean:
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/gbz80/support.asm sdcc-3.2.0+dfsg/support/regression/ports/gbz80/support.asm
--- sdcc-3.1.0+dfsg/support/regression/ports/gbz80/support.asm	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/gbz80/support.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-        .area   _CODE
-        .globl  _putchar
-        .globl  _exit
-
-__putchar::
-        jp      _putchar
-
-__initEmu::
-        ret
-
-__exitEmu::
-        jp      _exit
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/hc08/spec.mk sdcc-3.2.0+dfsg/support/regression/ports/hc08/spec.mk
--- sdcc-3.1.0+dfsg/support/regression/ports/hc08/spec.mk	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/hc08/spec.mk	2012-05-05 07:20:39.000000000 +0000
@@ -1,6 +1,7 @@
 # Regression test specification for the hc08 target running with uCsim
 
-CC_FOR_BUILD = $(CC)
+# simulation timeout in seconds
+SIM_TIMEOUT = 30
 
 # path to uCsim
 ifdef SDCC_BIN_PATH
@@ -57,15 +58,12 @@
 $(PORT_CASES_DIR)/fwk.lib: $(srcdir)/fwk/lib/fwk.lib
 	cat < $(srcdir)/fwk/lib/fwk.lib > $@
 
-# run simulator with 10 seconds timeout
+# run simulator with SIM_TIMEOUT seconds timeout
 %.out: %$(BINEXT) $(CASES_DIR)/timeout
 	mkdir -p $(dir $@)
-	-$(CASES_DIR)/timeout 10 $(EMU) $< < $(PORTS_DIR)/$(PORT)/uCsim.cmd > $@ \
+	-$(CASES_DIR)/timeout $(SIM_TIMEOUT) $(EMU) $< < $(PORTS_DIR)/$(PORT)/uCsim.cmd > $@ \
 	  || echo -e --- FAIL: \"timeout, simulation killed\" in $(<:$(BINEXT)=.c)"\n"--- Summary: 1/1/1: timeout >> $@
 	python $(srcdir)/get_ticks.py < $@ >> $@
 	-grep -n FAIL $@ /dev/null || true
 
-$(CASES_DIR)/timeout: $(srcdir)/fwk/lib/timeout.c
-	$(CC_FOR_BUILD) $(CFLAGS) $< -o $@
-
 _clean:
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/mcs51-common/spec.mk sdcc-3.2.0+dfsg/support/regression/ports/mcs51-common/spec.mk
--- sdcc-3.1.0+dfsg/support/regression/ports/mcs51-common/spec.mk	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/mcs51-common/spec.mk	2012-05-05 14:39:36.000000000 +0000
@@ -1,6 +1,7 @@
 # Common regression test specification for the mcs51 targets running with uCsim
 
-CC_FOR_BUILD = $(CC)
+# simulation timeout in seconds
+SIM_TIMEOUT = 30
 
 # path to uCsim
 ifdef SDCC_BIN_PATH
@@ -55,15 +56,12 @@
 	cat < $(srcdir)/fwk/lib/fwk.lib > $@
 	cat < $(PORTS_DIR)/mcs51-common/fwk.lib >> $@
 
-# run simulator with 30 seconds timeout
+# run simulator with SIM_TIMEOUT seconds timeout
 %.out: %$(BINEXT) $(CASES_DIR)/timeout
 	mkdir -p $(dir $@)
-	-$(CASES_DIR)/timeout 30 $(EMU) -t32 -S in=$(DEV_NULL),out=$@ $< < $(PORTS_DIR)/mcs51-common/uCsim.cmd > $(@:.out=.sim) \
+	-$(CASES_DIR)/timeout $(SIM_TIMEOUT) $(EMU) -t32 -S in=$(DEV_NULL),out=$@ $< < $(PORTS_DIR)/mcs51-common/uCsim.cmd > $(@:.out=.sim) \
 	  || echo -e --- FAIL: \"timeout, simulation killed\" in $(<:$(BINEXT)=.c)"\n"--- Summary: 1/1/1: timeout >> $@
 	python $(srcdir)/get_ticks.py < $(@:.out=.sim) >> $@
 	-grep -n FAIL $@ /dev/null || true
 
-$(CASES_DIR)/timeout: $(srcdir)/fwk/lib/timeout.c
-	$(CC_FOR_BUILD) $(CFLAGS) $< -o $@
-
 _clean:
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/pic14/spec.mk sdcc-3.2.0+dfsg/support/regression/ports/pic14/spec.mk
--- sdcc-3.1.0+dfsg/support/regression/ports/pic14/spec.mk	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/pic14/spec.mk	2012-06-09 20:45:46.000000000 +0000
@@ -1,6 +1,7 @@
 # Regression test specification for the pic14 target running with gpsim
 
-CC_FOR_BUILD = $(CC)
+# simulation timeout in seconds
+SIM_TIMEOUT = 25
 
 # path to gpsim
 ifdef GPSIM_PATH
@@ -11,13 +12,13 @@
 
 ifndef SDCC_BIN_PATH
   ifndef CROSSCOMPILING
-    SDCCFLAGS += --nostdinc -I$(top_srcdir)/device/include/pic14 -I$(top_srcdir)/device/non-free/include/pic -I$(top_srcdir)
-    LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/pic14 -L$(top_builddir)/device/non-free/lib/build/pic
+    SDCCFLAGS += --nostdinc -I$(top_srcdir)/device/include/pic14 -I$(top_srcdir)/device/non-free/include/pic14 -I$(top_srcdir)
+    LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/pic14 -L$(top_builddir)/device/non-free/lib/build/pic14
   else
-    SDCCFLAGS += --non-free
+    SDCCFLAGS += --use-non-free
   endif
 else
-  SDCCFLAGS += --non-free
+  SDCCFLAGS += --use-non-free
 endif
 
 ifdef CROSSCOMPILING
@@ -47,15 +48,12 @@
 $(PORT_CASES_DIR)/%$(OBJEXT): fwk/lib/%.c
 	$(SDCC) $(SDCCFLAGS) -c $< -o $@
 
-# run simulator with 25 seconds timeout
+# run simulator with SIM_TIMEOUT seconds timeout
 %.out: %$(BINEXT) $(CASES_DIR)/timeout
 	mkdir -p $(dir $@)
-	-$(CASES_DIR)/timeout 25 $(GPSIM) -i -s $< -c $(PORTS_DIR)/pic14/gpsim.cmd > $@ || \
+	-$(CASES_DIR)/timeout $(SIM_TIMEOUT) $(GPSIM) -i -s $< -c $(PORTS_DIR)/pic14/gpsim.cmd > $@ || \
 	  echo -e --- FAIL: \"timeout, simulation killed\" in $(<:$(BINEXT)=.c)"\n"--- Summary: 1/1/1: timeout >> $@
 	python $(srcdir)/get_ticks.py < $@ >> $@
 	-grep -n FAIL $@ /dev/null || true
 
-$(CASES_DIR)/timeout: fwk/lib/timeout.c
-	$(CC_FOR_BUILD) $(CFLAGS) $< -o $@
-
 _clean:
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/pic14/support.c sdcc-3.2.0+dfsg/support/regression/ports/pic14/support.c
--- sdcc-3.1.0+dfsg/support/regression/ports/pic14/support.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/pic14/support.c	2012-06-15 15:27:39.000000000 +0000
@@ -40,7 +40,7 @@
 _initEmu(void)
 {
   /* load and configure the libgpsim_modules module */
-  _asm
+  __asm
     ;; Set frequency to 20MHz
     .direct "e", ".frequency=20e6"
     
@@ -59,7 +59,7 @@
 
     ;; Display the received character on terminal
     .direct "e", "U1.console = true"
-  _endasm;
+  __endasm;
 
   /* USART initialization */
   PORTC |= 0x40;     // Set TX pin to 1
@@ -101,3 +101,4 @@
    .direct "a", "\"\""
   __endasm;
 }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/pic16/spec.mk sdcc-3.2.0+dfsg/support/regression/ports/pic16/spec.mk
--- sdcc-3.1.0+dfsg/support/regression/ports/pic16/spec.mk	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/pic16/spec.mk	2012-06-09 20:45:46.000000000 +0000
@@ -1,6 +1,7 @@
 # Regression test specification for the pic16 target running with gpsim
 
-CC_FOR_BUILD = $(CC)
+# simulation timeout in seconds
+SIM_TIMEOUT = 25
 
 # path to gpsim
 ifdef GPSIM_PATH
@@ -14,10 +15,10 @@
     SDCCFLAGS += --nostdinc -I$(top_srcdir)/device/include/pic16 -I$(top_srcdir)/device/non-free/include/pic16 -I$(top_srcdir)
     LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/pic16 -L$(top_builddir)/device/non-free/lib/build/pic16
   else
-    SDCCFLAGS += --non-free
+    SDCCFLAGS += --use-non-free
   endif
 else
-  SDCCFLAGS += --non-free
+  SDCCFLAGS += --use-non-free
 endif
 
 ifdef CROSSCOMPILING
@@ -48,15 +49,12 @@
 $(PORT_CASES_DIR)/%$(OBJEXT): fwk/lib/%.c
 	$(SDCC) $(SDCCFLAGS) -c $< -o $@
 
-# run simulator with 25 seconds timeout
+# run simulator with SIM_TIMEOUT seconds timeout
 %.out: %$(BINEXT) $(CASES_DIR)/timeout
 	mkdir -p $(dir $@)
-	-$(CASES_DIR)/timeout 25 $(GPSIM) -i -s $< -c $(PORTS_DIR)/pic16/gpsim.cmd > $@ || \
+	-$(CASES_DIR)/timeout $(SIM_TIMEOUT) $(GPSIM) -i -s $< -c $(PORTS_DIR)/pic16/gpsim.cmd > $@ || \
 	  echo -e --- FAIL: \"timeout, simulation killed\" in $(<:$(BINEXT)=.c)"\n"--- Summary: 1/1/1: timeout >> $@
 	python $(srcdir)/get_ticks.py < $@ >> $@
 	-grep -n FAIL $@ /dev/null || true
 
-$(CASES_DIR)/timeout: fwk/lib/timeout.c
-	$(CC_FOR_BUILD) $(CFLAGS) $< -o $@
-
 _clean:
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/rrgbz80/spec.mk sdcc-3.2.0+dfsg/support/regression/ports/rrgbz80/spec.mk
--- sdcc-3.1.0+dfsg/support/regression/ports/rrgbz80/spec.mk	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/rrgbz80/spec.mk	2011-05-11 15:18:49.000000000 +0000
@@ -0,0 +1,54 @@
+# Regression test specification for the gbz80 target.
+
+EMU = $(SDCC_EXTRA_DIR)/emu/rrgb/rrgb$(EXEEXT)
+MAKEBIN = $(top_builddir)/bin/makebin$(EXEEXT)
+
+SDCCFLAGS += --nostdinc -I$(top_srcdir)
+LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/gbz80
+
+SDCCFLAGS += -mgbz80 --less-pedantic -DREENTRANT=
+LINKFLAGS += --out-fmt-ihx gbz80.lib
+
+OBJEXT = .rel
+BINEXT = .gb
+
+# otherwise `make` deletes testfwk.rel and `make -j` will fail
+.PRECIOUS: $(PORT_CASES_DIR)/%$(OBJEXT)
+
+# Needs parts of gbdk-lib, namely the internal mul/div/mod functions.
+EXTRAS = $(PORT_CASES_DIR)/testfwk$(OBJEXT) $(PORT_CASES_DIR)/support$(OBJEXT)
+include $(srcdir)/fwk/lib/spec.mk
+
+# Rule to convert .ihx to .gb
+%$(BINEXT): %.ihx
+	$(MAKEBIN) -Z -yn ABS $< $@
+
+# Rule to link into .ihx
+%.ihx: %$(OBJEXT) $(EXTRAS) $(FWKLIB) $(PORT_CASES_DIR)/fwk.lib
+	$(SDCC) $(SDCCFLAGS) $(LINKFLAGS) $(EXTRAS) $(PORT_CASES_DIR)/fwk.lib $< -o $@
+
+$(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/$(PORT)/%.asm
+	@# TODO: sdas should place it\'s output in the current dir
+	cp $< $(PORT_CASES_DIR)
+	$(top_builddir)/bin/sdasgb -plosgff $(PORT_CASES_DIR)/$(notdir $<)
+	rm $(PORT_CASES_DIR)/$(notdir $<)
+
+%$(OBJEXT): %.c
+	$(SDCC) $(SDCCFLAGS) -c $< -o $@
+
+$(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/$(PORT)/%.c
+	$(SDCC) $(SDCCFLAGS) -c $< -o $@
+
+$(PORT_CASES_DIR)/%$(OBJEXT): $(srcdir)/fwk/lib/%.c
+	$(SDCC) $(SDCCFLAGS) -c $< -o $@
+
+$(PORT_CASES_DIR)/fwk.lib: $(srcdir)/fwk/lib/fwk.lib
+	cat < $(srcdir)/fwk/lib/fwk.lib > $@
+
+# PENDING: Path to sdcc-extra
+%.out: %$(BINEXT)
+	mkdir -p $(dir $@)
+	$(EMU) -k $< > $@
+	-grep -n FAIL $@ /dev/null || true
+
+_clean:
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/rrgbz80/support.asm sdcc-3.2.0+dfsg/support/regression/ports/rrgbz80/support.asm
--- sdcc-3.1.0+dfsg/support/regression/ports/rrgbz80/support.asm	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/rrgbz80/support.asm	2006-03-03 19:32:46.000000000 +0000
@@ -0,0 +1,12 @@
+        .area   _CODE
+        .globl  _putchar
+        .globl  _exit
+
+__putchar::
+        jp      _putchar
+
+__initEmu::
+        ret
+
+__exitEmu::
+        jp      _exit
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/rrz80/spec.mk sdcc-3.2.0+dfsg/support/regression/ports/rrz80/spec.mk
--- sdcc-3.1.0+dfsg/support/regression/ports/rrz80/spec.mk	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/rrz80/spec.mk	2011-05-11 15:18:49.000000000 +0000
@@ -0,0 +1,55 @@
+# Regression test specification for the z80 target running on top of the Java based
+# 'ConsoleZ80' emulator.
+
+EMU = $(SDCC_EXTRA_DIR)/emu/rrz80/rrz80$(EXEEXT)
+MAKEBIN = $(top_builddir)/bin/makebin$(EXEEXT)
+
+SDCCFLAGS += --nostdinc -I$(top_srcdir)
+LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/z80
+
+SDCCFLAGS += -mz80 --less-pedantic --profile -DREENTRANT=
+LINKFLAGS += --out-fmt-ihx z80.lib
+
+OBJEXT = .rel
+BINEXT = .bin
+
+# otherwise `make` deletes testfwk.rel and `make -j` will fail
+.PRECIOUS: $(PORT_CASES_DIR)/%$(OBJEXT)
+
+# Needs parts of gbdk-lib, namely the internal mul/div/mod functions.
+EXTRAS = $(PORT_CASES_DIR)/testfwk$(OBJEXT) $(PORT_CASES_DIR)/support$(OBJEXT)
+include $(srcdir)/fwk/lib/spec.mk
+
+# Rule to generate a Emulator .bin file from the .ihx linker output.
+%$(BINEXT): %.ihx
+	$(MAKEBIN) -s 32768 < $< > $@
+
+# Rule to link into .ihx
+%.ihx: %$(OBJEXT) $(EXTRAS) $(FWKLIB) $(PORT_CASES_DIR)/fwk.lib
+	$(SDCC) $(SDCCFLAGS) $(LINKFLAGS) $(EXTRAS) $(PORT_CASES_DIR)/fwk.lib $< -o $@
+
+$(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/$(PORT)/%.asm
+	@# TODO: sdas should place it\'s output in the current dir
+	cp $< $(PORT_CASES_DIR)
+	$(top_builddir)/bin/sdasz80 -plosgff $(PORT_CASES_DIR)/$(notdir $<)
+	rm $(PORT_CASES_DIR)/$(notdir $<)
+
+%$(OBJEXT): %.s
+	$(top_builddir)/bin/sdasz80 -plosgff $<
+
+%$(OBJEXT): %.c
+	$(SDCC) $(SDCCFLAGS) -c $< -o $@
+
+$(PORT_CASES_DIR)/%$(OBJEXT): $(srcdir)/fwk/lib/%.c
+	$(SDCC) $(SDCCFLAGS) -c $< -o $@
+
+$(PORT_CASES_DIR)/fwk.lib: $(srcdir)/fwk/lib/fwk.lib
+	cat < $(srcdir)/fwk/lib/fwk.lib > $@
+
+# PENDING: Path to sdcc-extra
+%.out: %$(BINEXT)
+	mkdir -p $(dir $@)
+	$(EMU) --maxruntime=3 --mapfile=$(<:.bin=.sym) $< > $@
+	-grep -n FAIL $@ /dev/null || true
+
+_clean:
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/rrz80/support.asm sdcc-3.2.0+dfsg/support/regression/ports/rrz80/support.asm
--- sdcc-3.1.0+dfsg/support/regression/ports/rrz80/support.asm	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/rrz80/support.asm	2006-03-03 19:32:46.000000000 +0000
@@ -0,0 +1,12 @@
+        .area   _CODE
+        .globl  _putchar
+        .globl  _exit
+
+__putchar::
+        jp      _putchar
+
+__initEmu::
+        ret
+
+__exitEmu::
+        jp      _exit
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/s08/spec.mk sdcc-3.2.0+dfsg/support/regression/ports/s08/spec.mk
--- sdcc-3.1.0+dfsg/support/regression/ports/s08/spec.mk	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/s08/spec.mk	2012-05-18 18:01:17.000000000 +0000
@@ -0,0 +1,71 @@
+# Regression test specification for the s08 target running with uCsim
+
+# simulation timeout in seconds
+SIM_TIMEOUT = 30
+
+EMU_PORT_FLAG=-thcs08
+
+# path to uCsim
+ifdef SDCC_BIN_PATH
+  UCHC08C = $(SDCC_BIN_PATH)/shc08$(EXEEXT)
+
+  AS_HC08C = $(SDCC_BIN_PATH)/sdas6808$(EXEEXT)
+else
+  UCHC08A = $(top_builddir)/sim/ucsim/hc08.src/shc08$(EXEEXT)
+  UCHC08B = $(top_builddir)/bin/shc08$(EXEEXT)
+
+  EMU = $(WINE) $(shell if [ -f $(UCHC08A) ]; then echo $(UCHC08A); else echo $(UCHC08B); fi)
+
+  AS = $(WINE) $(top_builddir)/bin/sdas6808$(EXEEXT)
+
+ifndef CROSSCOMPILING
+  SDCCFLAGS += --nostdinc -I$(top_srcdir)
+  LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/s08
+endif
+endif
+
+ifdef CROSSCOMPILING
+  SDCCFLAGS += -I$(top_srcdir)
+endif
+
+SDCCFLAGS += -ms08 --less-pedantic --out-fmt-ihx -DREENTRANT=__reentrant
+LINKFLAGS += s08.lib
+
+OBJEXT = .rel
+BINEXT = .ihx
+
+# otherwise `make` deletes testfwk.rel and `make -j` will fail
+.PRECIOUS: $(PORT_CASES_DIR)/%$(OBJEXT)
+
+# Required extras
+EXTRAS = $(PORT_CASES_DIR)/testfwk$(OBJEXT) $(PORT_CASES_DIR)/support$(OBJEXT)
+include $(srcdir)/fwk/lib/spec.mk
+
+# Rule to link into .ihx
+%$(BINEXT): %$(OBJEXT) $(EXTRAS) $(FWKLIB) $(PORT_CASES_DIR)/fwk.lib
+	$(SDCC) $(SDCCFLAGS) $(LINKFLAGS) $(EXTRAS) $(PORT_CASES_DIR)/fwk.lib $< -o $@
+
+%$(OBJEXT): %.asm
+	$(AS) -plosgff $<
+
+%$(OBJEXT): %.c
+	$(SDCC) $(SDCCFLAGS) -c $< -o $@
+
+$(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/$(PORT)/%.c
+	$(SDCC) $(SDCCFLAGS) -c $< -o $@
+
+$(PORT_CASES_DIR)/%$(OBJEXT): $(srcdir)/fwk/lib/%.c
+	$(SDCC) $(SDCCFLAGS) -c $< -o $@
+
+$(PORT_CASES_DIR)/fwk.lib: $(srcdir)/fwk/lib/fwk.lib
+	cat < $(srcdir)/fwk/lib/fwk.lib > $@
+
+# run simulator with SIM_TIMEOUT seconds timeout
+%.out: %$(BINEXT) $(CASES_DIR)/timeout
+	mkdir -p $(dir $@)
+	-$(CASES_DIR)/timeout $(SIM_TIMEOUT) $(EMU) $(EMU_PORT_FLAG) $< < $(PORTS_DIR)/$(PORT)/uCsim.cmd > $@ \
+	  || echo -e --- FAIL: \"timeout, simulation killed\" in $(<:$(BINEXT)=.c)"\n"--- Summary: 1/1/1: timeout >> $@
+	python $(srcdir)/get_ticks.py < $@ >> $@
+	-grep -n FAIL $@ /dev/null || true
+
+_clean:
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/s08/support.c sdcc-3.2.0+dfsg/support/regression/ports/s08/support.c
--- sdcc-3.1.0+dfsg/support/regression/ports/s08/support.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/s08/support.c	2010-01-15 13:26:59.000000000 +0000
@@ -0,0 +1,22 @@
+
+void
+_putchar(unsigned char c)
+{
+  c;
+  __asm
+    .db 0x9e, 0xed
+  __endasm;
+}
+
+void
+_initEmu(void)
+{
+}
+
+void
+_exitEmu(void)
+{
+  __asm
+    .db 0x9e, 0xec
+  __endasm;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/s08/uCsim.cmd sdcc-3.2.0+dfsg/support/regression/ports/s08/uCsim.cmd
--- sdcc-3.1.0+dfsg/support/regression/ports/s08/uCsim.cmd	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/s08/uCsim.cmd	2005-12-07 12:49:32.000000000 +0000
@@ -0,0 +1,7 @@
+set error non-classified off
+set error unknown_code off
+set error memory off
+set error stack off
+run
+state
+quit
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/ucgbz80/spec.mk sdcc-3.2.0+dfsg/support/regression/ports/ucgbz80/spec.mk
--- sdcc-3.1.0+dfsg/support/regression/ports/ucgbz80/spec.mk	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/ucgbz80/spec.mk	2012-05-05 07:20:39.000000000 +0000
@@ -0,0 +1,74 @@
+# Regression test specification for the gbz80 target running with uCsim
+
+# simulation timeout in seconds
+SIM_TIMEOUT = 30
+
+EMU_PORT_FLAG=-tlr35902
+
+# path to uCsim
+ifdef SDCC_BIN_PATH
+  UCZ80C = $(SDCC_BIN_PATH)/sz80$(EXEEXT)
+
+  AS_Z80C = $(SDCC_BIN_PATH)/sdasgb$(EXEEXT)
+else
+  SZ80A = $(top_builddir)/sim/ucsim/z80.src/sz80$(EXEEXT)
+  SZ80B = $(top_builddir)/bin/sz80$(EXEEXT)
+
+  EMU = $(WINE) $(shell if [ -f $(SZ80A) ]; then echo $(SZ80A); else echo $(SZ80B); fi)
+
+  AS = $(WINE) $(top_builddir)/bin/sdasgb$(EXEEXT)
+
+ifndef CROSSCOMPILING
+  SDCCFLAGS += --nostdinc -I$(top_srcdir)
+  LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/gbz80
+endif
+endif
+
+ifdef CROSSCOMPILING
+  SDCCFLAGS += -I$(top_srcdir)
+endif
+
+SDCCFLAGS += -mgbz80 --less-pedantic --profile -DREENTRANT=
+LINKFLAGS += gbz80.lib
+
+OBJEXT = .rel
+BINEXT = .ihx
+
+# otherwise `make` deletes testfwk.rel and `make -j` will fail
+.PRECIOUS: $(PORT_CASES_DIR)/%$(OBJEXT)
+
+# Required extras
+EXTRAS = $(PORT_CASES_DIR)/testfwk$(OBJEXT) $(PORT_CASES_DIR)/support$(OBJEXT)
+include $(srcdir)/fwk/lib/spec.mk
+
+# Rule to link into .ihx
+%.ihx: %$(OBJEXT) $(EXTRAS) $(FWKLIB) $(PORT_CASES_DIR)/fwk.lib
+	$(SDCC) $(SDCCFLAGS) $(LINKFLAGS) $(EXTRAS) $(PORT_CASES_DIR)/fwk.lib $< -o $@
+
+$(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/$(PORT)/%.asm
+	@# TODO: sdas should place it\'s output in the current dir
+	cp $< $(PORT_CASES_DIR)
+	$(AS) -plosgff $(PORT_CASES_DIR)/$(notdir $<)
+	rm $(PORT_CASES_DIR)/$(notdir $<)
+
+%$(OBJEXT): %.c
+	$(SDCC) $(SDCCFLAGS) -c $< -o $@
+
+$(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/$(PORT)/%.c
+	$(SDCC) $(SDCCFLAGS) -c $< -o $@
+
+$(PORT_CASES_DIR)/%$(OBJEXT): $(srcdir)/fwk/lib/%.c
+	$(SDCC) $(SDCCFLAGS) -c $< -o $@
+
+$(PORT_CASES_DIR)/fwk.lib: $(srcdir)/fwk/lib/fwk.lib
+	cat < $(srcdir)/fwk/lib/fwk.lib > $@
+
+# run simulator with SIM_TIMEOUT seconds timeout
+%.out: %$(BINEXT) $(CASES_DIR)/timeout
+	mkdir -p $(dir $@)
+	-$(CASES_DIR)/timeout $(SIM_TIMEOUT) $(EMU) $(EMU_PORT_FLAG) $< < $(PORTS_DIR)/$(PORT)/uCsim.cmd > $@ \
+	  || echo -e --- FAIL: \"timeout, simulation killed\" in $(<:$(BINEXT)=.c)"\n"--- Summary: 1/1/1: timeout >> $@
+	python $(srcdir)/get_ticks.py < $@ >> $@
+	-grep -n FAIL $@ /dev/null || true
+
+_clean:
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/ucgbz80/support.asm sdcc-3.2.0+dfsg/support/regression/ports/ucgbz80/support.asm
--- sdcc-3.1.0+dfsg/support/regression/ports/ucgbz80/support.asm	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/ucgbz80/support.asm	2011-12-28 00:10:47.000000000 +0000
@@ -0,0 +1,12 @@
+        .area   _CODE
+        .globl  _putchar
+        .globl  _exit
+
+__putchar::
+        jp      _putchar
+
+__initEmu::
+        ret
+
+__exitEmu::
+        jp      _exit
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/ucgbz80/uCsim.cmd sdcc-3.2.0+dfsg/support/regression/ports/ucgbz80/uCsim.cmd
--- sdcc-3.1.0+dfsg/support/regression/ports/ucgbz80/uCsim.cmd	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/ucgbz80/uCsim.cmd	2011-12-28 00:10:47.000000000 +0000
@@ -0,0 +1,7 @@
+set error non-classified off
+set error unknown_code off
+set error memory off
+set error stack off
+run
+state
+quit
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/ucr2k/spec.mk sdcc-3.2.0+dfsg/support/regression/ports/ucr2k/spec.mk
--- sdcc-3.1.0+dfsg/support/regression/ports/ucr2k/spec.mk	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/ucr2k/spec.mk	2012-06-12 07:56:30.000000000 +0000
@@ -1,6 +1,7 @@
 # Regression test specification for the z80 target running with uCsim
 
-CC_FOR_BUILD = $(CC)
+# simulation timeout in seconds
+SIM_TIMEOUT = 10
 
 EMU_PORT_FLAG=-tr2k
 
@@ -62,15 +63,12 @@
 $(PORT_CASES_DIR)/fwk.lib: $(srcdir)/fwk/lib/fwk.lib
 	cat < $(srcdir)/fwk/lib/fwk.lib > $@
 
-# run simulator with 10 seconds timeout
+# run simulator with SIM_TIMEOUT seconds timeout
 %.out: %$(BINEXT) $(CASES_DIR)/timeout
 	mkdir -p $(dir $@)
-	-$(CASES_DIR)/timeout 10 $(EMU) $(EMU_PORT_FLAG) $< < $(PORTS_DIR)/$(PORT)/uCsim.cmd > $@ \
+	-$(CASES_DIR)/timeout $(SIM_TIMEOUT) $(EMU) $(EMU_PORT_FLAG) $< < $(PORTS_DIR)/$(PORT)/uCsim.cmd > $@ \
 	  || echo -e --- FAIL: \"timeout, simulation killed\" in $(<:$(BINEXT)=.c)"\n"--- Summary: 1/1/1: timeout >> $@
 	python $(srcdir)/get_ticks.py < $@ >> $@
 	-grep -n FAIL $@ /dev/null || true
 
-$(CASES_DIR)/timeout: $(srcdir)/fwk/lib/timeout.c
-	$(CC_FOR_BUILD) $(CFLAGS) $< -o $@
-
 _clean:
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/ucr3ka/spec.mk sdcc-3.2.0+dfsg/support/regression/ports/ucr3ka/spec.mk
--- sdcc-3.1.0+dfsg/support/regression/ports/ucr3ka/spec.mk	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/ucr3ka/spec.mk	2012-05-21 02:54:59.000000000 +0000
@@ -0,0 +1,77 @@
+# Regression test specification for the z80 target running with uCsim
+
+# simulation timeout in seconds
+SIM_TIMEOUT = 10
+
+EMU_PORT_FLAG=-tr3ka
+
+# path to uCsim
+ifdef SDCC_BIN_PATH
+  UCZ80C = $(SDCC_BIN_PATH)/sz80$(EXEEXT)
+
+  AS_Z80C = $(SDCC_BIN_PATH)/sdasrab$(EXEEXT)
+else
+  SZ80A = $(top_builddir)/sim/ucsim/z80.src/sz80$(EXEEXT)
+  SZ80B = $(top_builddir)/bin/sz80$(EXEEXT)
+
+  EMU = $(WINE) $(shell if [ -f $(SZ80A) ]; then echo $(SZ80A); else echo $(SZ80B); fi)
+
+  AS = $(WINE) $(top_builddir)/bin/sdasrab$(EXEEXT)
+
+ifndef CROSSCOMPILING
+  SDCCFLAGS += --nostdinc -I$(top_srcdir)
+  LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/r3ka
+endif
+endif
+
+ifdef CROSSCOMPILING
+  SDCCFLAGS += -I$(top_srcdir)
+endif
+
+SDCCFLAGS += -mr3ka --less-pedantic --profile -DREENTRANT=
+LINKFLAGS += r3ka.lib
+
+OBJEXT = .rel
+BINEXT = .ihx
+
+# otherwise `make` deletes testfwk.rel and `make -j` will fail
+.PRECIOUS: $(PORT_CASES_DIR)/%$(OBJEXT)
+
+# Required extras
+EXTRAS = $(PORT_CASES_DIR)/testfwk$(OBJEXT) $(PORT_CASES_DIR)/support$(OBJEXT)
+include $(srcdir)/fwk/lib/spec.mk
+
+# Rule to link into .ihx
+%.ihx: %$(OBJEXT) $(EXTRAS) $(FWKLIB) $(PORT_CASES_DIR)/fwk.lib
+	$(SDCC) $(SDCCFLAGS) $(LINKFLAGS) $(EXTRAS) $(PORT_CASES_DIR)/fwk.lib $< -o $@
+
+$(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/$(PORT)/%.asm
+	@# TODO: sdas should place it\'s output in the current dir
+	cp $< $(PORT_CASES_DIR)
+	$(AS) -plosgff $(PORT_CASES_DIR)/$(notdir $<)
+	rm $(PORT_CASES_DIR)/$(notdir $<)
+
+%$(OBJEXT): %.c
+	$(SDCC) $(SDCCFLAGS) -c $< -o $@
+
+$(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/$(PORT)/%.c
+	$(SDCC) $(SDCCFLAGS) -c $< -o $@
+
+$(PORT_CASES_DIR)/%$(OBJEXT): $(srcdir)/fwk/lib/%.c
+	$(SDCC) $(SDCCFLAGS) -c $< -o $@
+
+$(PORT_CASES_DIR)/fwk.lib: $(srcdir)/fwk/lib/fwk.lib
+	cat < $(srcdir)/fwk/lib/fwk.lib > $@
+
+# run simulator with SIM_TIMEOUT seconds timeout
+%.out: %$(BINEXT) $(CASES_DIR)/timeout
+	mkdir -p $(dir $@)
+	-$(CASES_DIR)/timeout $(SIM_TIMEOUT) $(EMU) $(EMU_PORT_FLAG) $< < $(PORTS_DIR)/$(PORT)/uCsim.cmd > $@ \
+	  || echo -e --- FAIL: \"timeout, simulation killed\" in $(<:$(BINEXT)=.c)"\n"--- Summary: 1/1/1: timeout >> $@
+	python $(srcdir)/get_ticks.py < $@ >> $@
+	-grep -n FAIL $@ /dev/null || true
+
+
+#	echo Running $(CASES_DIR)/timeout $(SIM_TIMEOUT) $(EMU) $(EMU_PORT_FLAG) $< < $(PORTS_DIR)/$(PORT)/uCsim.cmd
+
+_clean:
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/ucr3ka/support.asm sdcc-3.2.0+dfsg/support/regression/ports/ucr3ka/support.asm
--- sdcc-3.1.0+dfsg/support/regression/ports/ucr3ka/support.asm	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/ucr3ka/support.asm	2012-05-21 02:54:59.000000000 +0000
@@ -0,0 +1,16 @@
+        .area   _CODE
+        .globl  _putchar
+        .globl  _exit
+
+SADR=0xC0
+        
+__putchar::
+        ioi
+        ld      (SADR),a
+        ret
+
+__initEmu::
+        ret
+
+__exitEmu::
+        jp      _exit
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/ucr3ka/uCsim.cmd sdcc-3.2.0+dfsg/support/regression/ports/ucr3ka/uCsim.cmd
--- sdcc-3.1.0+dfsg/support/regression/ports/ucr3ka/uCsim.cmd	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/ucr3ka/uCsim.cmd	2012-05-21 02:54:59.000000000 +0000
@@ -0,0 +1,7 @@
+set error non-classified off
+set error unknown_code off
+set error memory off
+set error stack off
+run
+state
+quit
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/ucz180/spec.mk sdcc-3.2.0+dfsg/support/regression/ports/ucz180/spec.mk
--- sdcc-3.1.0+dfsg/support/regression/ports/ucz180/spec.mk	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/ucz180/spec.mk	2012-05-05 07:20:39.000000000 +0000
@@ -1,6 +1,7 @@
 # Regression test specification for the z80 target running with uCsim
 
-CC_FOR_BUILD = $(CC)
+# simulation timeout in seconds
+SIM_TIMEOUT = 20
 
 # path to uCsim
 ifdef SDCC_BIN_PATH
@@ -60,15 +61,12 @@
 $(PORT_CASES_DIR)/fwk.lib: $(srcdir)/fwk/lib/fwk.lib
 	cat < $(srcdir)/fwk/lib/fwk.lib > $@
 
-# run simulator with 10 seconds timeout
+# run simulator with SIM_TIMEOUT seconds timeout
 %.out: %$(BINEXT) $(CASES_DIR)/timeout
 	mkdir -p $(dir $@)
-	-$(CASES_DIR)/timeout 10 $(EMU) -tz180 $< < $(PORTS_DIR)/$(PORT)/uCsim.cmd > $@ \
+	-$(CASES_DIR)/timeout $(SIM_TIMEOUT) $(EMU) -tz180 $< < $(PORTS_DIR)/$(PORT)/uCsim.cmd > $@ \
 	  || echo -e --- FAIL: \"timeout, simulation killed\" in $(<:$(BINEXT)=.c)"\n"--- Summary: 1/1/1: timeout >> $@
 	python $(srcdir)/get_ticks.py < $@ >> $@
 	-grep -n FAIL $@ /dev/null || true
 
-$(CASES_DIR)/timeout: $(srcdir)/fwk/lib/timeout.c
-	$(CC_FOR_BUILD) $(CFLAGS) $< -o $@
-
 _clean:
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/ucz80/spec.mk sdcc-3.2.0+dfsg/support/regression/ports/ucz80/spec.mk
--- sdcc-3.1.0+dfsg/support/regression/ports/ucz80/spec.mk	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/ucz80/spec.mk	2012-06-22 12:36:51.000000000 +0000
@@ -1,6 +1,7 @@
 # Regression test specification for the z80 target running with uCsim
 
-CC_FOR_BUILD = $(CC)
+# simulation timeout in seconds
+SIM_TIMEOUT = 40
 
 # path to uCsim
 ifdef SDCC_BIN_PATH
@@ -60,15 +61,12 @@
 $(PORT_CASES_DIR)/fwk.lib: $(srcdir)/fwk/lib/fwk.lib
 	cat < $(srcdir)/fwk/lib/fwk.lib > $@
 
-# run simulator with 10 seconds timeout
+# run simulator with SIM_TIMEOUT seconds timeout
 %.out: %$(BINEXT) $(CASES_DIR)/timeout
 	mkdir -p $(dir $@)
-	-$(CASES_DIR)/timeout 10 $(EMU) $< < $(PORTS_DIR)/$(PORT)/uCsim.cmd > $@ \
+	-$(CASES_DIR)/timeout $(SIM_TIMEOUT) $(EMU) $< < $(PORTS_DIR)/$(PORT)/uCsim.cmd > $@ \
 	  || echo -e --- FAIL: \"timeout, simulation killed\" in $(<:$(BINEXT)=.c)"\n"--- Summary: 1/1/1: timeout >> $@
 	python $(srcdir)/get_ticks.py < $@ >> $@
 	-grep -n FAIL $@ /dev/null || true
 
-$(CASES_DIR)/timeout: $(srcdir)/fwk/lib/timeout.c
-	$(CC_FOR_BUILD) $(CFLAGS) $< -o $@
-
 _clean:
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/xa51/spec.mk sdcc-3.2.0+dfsg/support/regression/ports/xa51/spec.mk
--- sdcc-3.1.0+dfsg/support/regression/ports/xa51/spec.mk	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/xa51/spec.mk	2012-03-24 09:51:32.000000000 +0000
@@ -37,7 +37,4 @@
           echo -e --- FAIL: \"timeout, simulation killed\" in $(<:.ihx=.c)"\n"--- Summary: 1/1/1: timeout >> $@
 	-grep -n FAIL $@ /dev/null || true
 
-$(CASES_DIR)/timeout$(EXEEXT): fwk/lib/timeout.c
-	$(CC) $(CFLAGS) $< -o $@
-
 _clean:
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/z80/spec.mk sdcc-3.2.0+dfsg/support/regression/ports/z80/spec.mk
--- sdcc-3.1.0+dfsg/support/regression/ports/z80/spec.mk	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/z80/spec.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-# Regression test specification for the z80 target running on top of the Java based
-# 'ConsoleZ80' emulator.
-
-EMU = $(SDCC_EXTRA_DIR)/emu/rrz80/rrz80$(EXEEXT)
-MAKEBIN = $(top_builddir)/bin/makebin$(EXEEXT)
-
-SDCCFLAGS += --nostdinc -I$(top_srcdir)
-LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/z80
-
-SDCCFLAGS += -mz80 --less-pedantic --profile -DREENTRANT=
-LINKFLAGS += --out-fmt-ihx z80.lib
-
-OBJEXT = .rel
-BINEXT = .bin
-
-# otherwise `make` deletes testfwk.rel and `make -j` will fail
-.PRECIOUS: $(PORT_CASES_DIR)/%$(OBJEXT)
-
-# Needs parts of gbdk-lib, namely the internal mul/div/mod functions.
-EXTRAS = $(PORT_CASES_DIR)/testfwk$(OBJEXT) $(PORT_CASES_DIR)/support$(OBJEXT)
-include $(srcdir)/fwk/lib/spec.mk
-
-# Rule to generate a Emulator .bin file from the .ihx linker output.
-%$(BINEXT): %.ihx
-	$(MAKEBIN) -s 32768 < $< > $@
-
-# Rule to link into .ihx
-%.ihx: %$(OBJEXT) $(EXTRAS) $(FWKLIB) $(PORT_CASES_DIR)/fwk.lib
-	$(SDCC) $(SDCCFLAGS) $(LINKFLAGS) $(EXTRAS) $(PORT_CASES_DIR)/fwk.lib $< -o $@
-
-$(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/$(PORT)/%.asm
-	@# TODO: sdas should place it\'s output in the current dir
-	cp $< $(PORT_CASES_DIR)
-	$(top_builddir)/bin/sdasz80 -plosgff $(PORT_CASES_DIR)/$(notdir $<)
-	rm $(PORT_CASES_DIR)/$(notdir $<)
-
-%$(OBJEXT): %.s
-	$(top_builddir)/bin/sdasz80 -plosgff $<
-
-%$(OBJEXT): %.c
-	$(SDCC) $(SDCCFLAGS) -c $< -o $@
-
-$(PORT_CASES_DIR)/%$(OBJEXT): $(srcdir)/fwk/lib/%.c
-	$(SDCC) $(SDCCFLAGS) -c $< -o $@
-
-$(PORT_CASES_DIR)/fwk.lib: $(srcdir)/fwk/lib/fwk.lib
-	cat < $(srcdir)/fwk/lib/fwk.lib > $@
-
-# PENDING: Path to sdcc-extra
-%.out: %$(BINEXT)
-	mkdir -p $(dir $@)
-	$(EMU) --maxruntime=3 --mapfile=$(<:.bin=.sym) $< > $@
-	-grep -n FAIL $@ /dev/null || true
-
-_clean:
diff -Nru sdcc-3.1.0+dfsg/support/regression/ports/z80/support.asm sdcc-3.2.0+dfsg/support/regression/ports/z80/support.asm
--- sdcc-3.1.0+dfsg/support/regression/ports/z80/support.asm	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/ports/z80/support.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-        .area   _CODE
-        .globl  _putchar
-        .globl  _exit
-
-__putchar::
-        jp      _putchar
-
-__initEmu::
-        ret
-
-__exitEmu::
-        jp      _exit
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/abs.c sdcc-3.2.0+dfsg/support/regression/tests/abs.c
--- sdcc-3.1.0+dfsg/support/regression/tests/abs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/abs.c	2012-02-22 14:45:17.000000000 +0000
@@ -14,3 +14,4 @@
   ASSERT( labs(-1000000L)    == 1000000L );
   ASSERT( labs(-2147483647L) == 2147483647L );
 }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/absolute.c sdcc-3.2.0+dfsg/support/regression/tests/absolute.c
--- sdcc-3.1.0+dfsg/support/regression/tests/absolute.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/absolute.c	2012-02-22 14:45:17.000000000 +0000
@@ -5,7 +5,7 @@
 #include <testfwk.h>
 #include <stddef.h>
 
-#ifdef SDCC_pic16
+#ifdef __SDCC_pic16
 # define ADDRESS(x) (0x02 ## x)
 #else
 # define ADDRESS(x) (0xCA ## x)
@@ -38,7 +38,7 @@
 void
 testAbsolute(void)
 {
-#if defined(SDCC_mcs51) || defined(SDCC_ds390) || defined(SDCC_hc08)
+#if !defined(PORT_HOST)
   static {mem} __at(ADDRESS(B6)) char s = 's';
   char {mem} *pC = (char {mem} *)(ADDRESS(B0));
   int  {mem} *pI = (int  {mem} *)(ADDRESS(B0));
@@ -59,7 +59,7 @@
 #endif
 }
 
-#if defined(SDCC_mcs51) || defined(SDCC_ds390)
+#if defined(__SDCC_mcs51) || defined(__SDCC_ds390)
 volatile __data __at(0x20) unsigned char Byte0 = 0x00;
 volatile __data __at(0x22) unsigned char Byte1 = 0x00;
 volatile __bit Bit0, Bit1, Bit2, Bit3, Bit4, Bit5, Bit6, Bit7, Bit8;
@@ -68,7 +68,7 @@
 void
 testAbsBdata(void)
 {
-#if defined(SDCC_mcs51) || defined(SDCC_ds390)
+#if defined(__SDCC_mcs51) || defined(__SDCC_ds390)
   Bit0 = 1;
   ASSERT(Byte0 == 0x00);
   Byte0 = 0xFF;
@@ -76,3 +76,4 @@
   ASSERT(Byte0 == 0xFF);
 #endif
 }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/and_survive.c sdcc-3.2.0+dfsg/support/regression/tests/and_survive.c
--- sdcc-3.1.0+dfsg/support/regression/tests/and_survive.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/and_survive.c	2012-06-15 09:41:13.000000000 +0000
@@ -0,0 +1,127 @@
+/*
+  This test is meant to test the backend's generation of
+  non-destructive and available on some architectures.
+  Also serves as a regression test for bug #3534833.
+*/
+
+#include <testfwk.h>
+
+/* Some architectures have non-destructive and when one operand is a literal with exactly one bit set (e.g. all Z80-related ) */
+int litbitchar (unsigned char a)
+{
+  register unsigned char b = a + 1; /* Suggest allocating b to accumulator */
+
+  if (b & 0x01)
+    return(0);
+  else if (b & 0x04)
+    return(1);
+  else if (b & 0x20)
+    return(2);
+  else
+    return(3);
+}
+
+/* Some architectures have non-destructive and when one operand is a literal with exactly one bit set, and the other operand can be in any register or even spilt (e.g. S08) */
+int litbitchar2 (unsigned char a, unsigned char c, unsigned char e)
+{
+  unsigned char b = a + 1;
+  unsigned char d = c + 1;
+
+  if (b & 0x01)
+    {
+      if (d & 0x01)
+        return(8);
+      else if (d & 0x04)
+        return(9);
+      else
+        return(10);
+    }
+  else if (b & 0x04)
+    return(1);
+  else if (b & 0x20)
+    {
+      if (e & 0x01)
+        return(4);
+      else if (e & 0x04)
+        return(5);
+      else
+        return(6);
+    }
+  else
+    return(3);
+}
+
+/* Some architectures have non-destructive and when one operand is a literal with at most one bit per byte set (e.g. Z80) */
+int litbitint (unsigned int a)
+{
+  register unsigned int b = a + 1; /* Suggest allocating b to accumulator */
+
+  if (b & 0x0001)
+    return(0);
+  else if (b & 0x0004)
+    return(1);
+  else if (b & 0x2010)
+    return(2);
+  else
+    return(3);
+}
+
+/* Some architectures have non-destructive and when one operand is a one-byte literal (e.g. Z180) */
+int litchar (unsigned char a)
+{
+  register unsigned char b = a + 1; /* Suggest allocating b to accumulator */
+
+  if (b & 0x33)
+    return(0);
+  else if (b & 0x44)
+    return(1);
+  else if (b & 0x1f)
+    return(2);
+  else
+    return(3);
+}
+
+/* Some architectures have non-destructive and when one operand is in a register (e.g. Z180) */
+int regchar (unsigned char a, unsigned char c)
+{
+  register unsigned char b = a + 1; /* Suggest allocating b to accumulator */
+  register unsigned char d = c + 1;
+
+  if (b & 0x11)
+    return(0);
+  else if (b & d)
+    return(1);
+  else if (b & 0x33)
+    return(2);
+  else
+    return(3);
+}
+
+void testAndSurvive (void)
+{
+  ASSERT (litbitchar (0x77u - 1) == 0);
+  ASSERT (litbitchar (0x74u - 1) == 1);
+  ASSERT (litbitchar (0x70u - 1) == 2);
+  ASSERT (litbitchar (0x80u - 1) == 3);
+
+  ASSERT (litbitchar2 (0x01u - 1, 0x01u - 1, 0x01u) == 8);
+  ASSERT (litbitchar2 (0x01u - 1, 0x80u - 1, 0x01u) == 10);
+  ASSERT (litbitchar2 (0x74u - 1, 0x01u - 1, 0x01u) == 1);
+  ASSERT (litbitchar2 (0x80u - 1, 0x01u - 1, 0x01u) == 3);
+  ASSERT (litbitchar2 (0x20u - 1, 0x01u - 1, 0x04u) == 5);
+
+  ASSERT (litbitint (0x0001u - 1) == 0);
+  ASSERT (litbitint (0x8fe8u - 1) == 3);
+  ASSERT (litbitint (0x3030u - 1) == 2);
+
+  ASSERT (litchar (0x77u - 1) == 0);
+  ASSERT (litchar (0x88u - 1) == 2);
+  ASSERT (litchar (0x48u - 1) == 1);
+  ASSERT (litchar (0x80u - 1) == 3);
+
+  ASSERT (regchar (0x77u - 1, 0x00u - 1) == 0);
+  ASSERT (regchar (0x88u - 1, 0x08u - 1) == 1);
+  ASSERT (regchar (0x80u - 1, 0x88u - 1) == 1);
+  ASSERT (regchar (0x80u - 1, 0x08u - 1) == 3);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bitfields.c sdcc-3.2.0+dfsg/support/regression/tests/bitfields.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bitfields.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bitfields.c	2012-06-15 15:43:51.000000000 +0000
@@ -10,7 +10,7 @@
   char c3_5 : 5;
 } c_bf;
 
-#if !defined(SDCC_pic16)
+#if !defined(__SDCC_pic16)
 struct {
   int i0_7 : 7;
   int i7_9 : 9;
@@ -34,7 +34,7 @@
   unsigned int b8 : 1;
   unsigned int b9 : 1;
 } sb_bf;
-#endif  /* !SDCC_pic16 */
+#endif  /* !__SDCC_pic16 */
 
 struct {
   unsigned int b0 : 1;
@@ -59,7 +59,7 @@
   unsigned int b1 : 1;
 } size2a_bf;
 
-#if !defined(SDCC_pic16)
+#if !defined(__SDCC_pic16)
 struct {
   unsigned int b0 : 1;
   unsigned int b1 : 1;
@@ -94,7 +94,7 @@
   signed int s7_1  : 1;
   signed int s8_9  : 9;
 } s_bf;
-#endif  /* !SDCC_pic16 */
+#endif  /* !__SDCC_pic16 */
 
 void
 testBitfieldSizeof(void)
@@ -106,13 +106,13 @@
   ASSERT( sizeof(size1a_bf) >= 1);
   ASSERT( sizeof(size1b_bf) >= 1);
   ASSERT( sizeof(size1c_bf) >= 1);
-#if !defined(SDCC_pic16)
+#if !defined(__SDCC_pic16)
   ASSERT( sizeof(size2b_bf) >= 2);
   ASSERT( sizeof(size2c_bf) >= 2);
   ASSERT( sizeof(size2d_bf) >= 2);
   ASSERT( sizeof(size3a_bf) >= 2);
   ASSERT( sizeof(size1a_bf) <= sizeof(size1b_bf));
-#endif  /* !SDCC_pic16 */
+#endif  /* !__SDCC_pic16 */
   /* Some SDCC specific assertions. SDCC uses 8 bit storage units.
      Bitfields that are less than 8 bits, but would (due to earlier
      bitfield declarations) span a storage unit boundary are
@@ -120,17 +120,17 @@
      8 or greater bits are always aligned to start on a storage
      unit boundary.
   */
-#ifdef SDCC
+#ifdef __SDCC
   ASSERT( sizeof(size1a_bf) == 1);
   ASSERT( sizeof(size1b_bf) == 1);
   ASSERT( sizeof(size1c_bf) == 1);
   ASSERT( sizeof(size2a_bf) == 2);
-#if !defined(SDCC_pic16)
+#if !defined(__SDCC_pic16)
   ASSERT( sizeof(size2b_bf) == 2);
   ASSERT( sizeof(size2c_bf) == 2);
   ASSERT( sizeof(size2d_bf) == 2);
   ASSERT( sizeof(size3a_bf) == 3);
-#endif  /* !SDCC_pic16 */
+#endif  /* !__SDCC_pic16 */
 #endif
 }
 
@@ -138,7 +138,7 @@
 void
 testBitfieldsSingleBitLiteral(void)
 {
-#if !defined(SDCC_pic16)
+#if !defined(__SDCC_pic16)
   size2b_bf.b0 = 0;
   size2b_bf.b1 = 0;
   size2b_bf.b2 = 0;
@@ -186,13 +186,13 @@
   ASSERT(size2b_bf.b7==0);
   ASSERT(size2b_bf.b8==0);
   ASSERT(size2b_bf.b9==1);
-#endif  /* !SDCC_pic16 */
+#endif  /* !__SDCC_pic16 */
 }
 
 void
 testBitfieldsSingleBit(void)
 {
-#if !defined(SDCC_pic16)
+#if !defined(__SDCC_pic16)
   volatile unsigned char c;
 
   c = 0;
@@ -245,13 +245,13 @@
   ASSERT(size2b_bf.b7==0);
   ASSERT(size2b_bf.b8==0);
   ASSERT(size2b_bf.b9==1);
-#endif  /* !SDCC_pic16 */
+#endif  /* !__SDCC_pic16 */
 }
 
 void
 testBitfieldsMultibitLiteral(void)
 {
-#if !defined(SDCC_pic16)
+#if !defined(__SDCC_pic16)
   size2c_bf.b0 = 0xff;   /* should truncate to 0x0f */
   size2c_bf.b1 = 0;
   ASSERT(size2c_bf.b0==0x0f);
@@ -291,13 +291,13 @@
   size2d_bf.b1 = 5;
   ASSERT(size2d_bf.b0==0x0a46);
   ASSERT(size2d_bf.b1==5);
-#endif  /* !SDCC_pic16 */
+#endif  /* !__SDCC_pic16 */
 }
 
 void
 testBitfieldsMultibit(void)
 {
-#if !defined(SDCC_pic16)
+#if !defined(__SDCC_pic16)
   volatile int allones = 0xffff;
   volatile int zero = 0;
   volatile int x;
@@ -335,7 +335,7 @@
   size2d_bf.b1 = x;
   ASSERT(size2d_bf.b0==0x0a46);
   ASSERT(size2d_bf.b1==5);
-#endif  /* !SDCC_pic16 */
+#endif  /* !__SDCC_pic16 */
 }
 
 void
@@ -365,7 +365,7 @@
 void
 testSignedBitfields(void)
 {
-#if !defined(SDCC_pic16)
+#if !defined(__SDCC_pic16)
   s_bf.s0_7 =   0xf0;
   s_bf.s7_1 =      1;
   s_bf.s8_9 = 0xfff8;
@@ -384,7 +384,7 @@
   ASSERT(s_bf.s8_9 == 0xff);
   ASSERT(s_bf.s0_7 > 0);
   ASSERT(s_bf.s8_9 > 0);
-#endif  /* !SDCC_pic16 */
+#endif  /* !__SDCC_pic16 */
 }
 
 /* test case for enhancement request #2291335 : Unnamed bit-field initialization */
@@ -431,6 +431,7 @@
 
 /* test case for const struct with bitfields */
 
+#ifndef __SDCC_pic16 // TODO: enable when the pic16 ports supports bitfields of size greater than 8 bits!
 const struct
 {
   unsigned int a : 4;
@@ -442,6 +443,7 @@
   unsigned int f : 2;
   unsigned int g;
 } cs = { 1, 2, 345, 6, 2, 1, 54321};
+#endif
 
 #if defined(PORT_HOST) && (defined(__x86_64__) || defined(__i386__)) && defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ == 6)
 /* Workaround to fix the (cs.f == 1) test failure, which appeared in svn build 6665, when -O2 gcc option was included.
@@ -454,6 +456,7 @@
 void
 testCS(void)
 {
+#ifndef __SDCC_pic16 // TODO: enable when the pic16 ports supports bitfields of size greater than 8 bits!
   ASSERT(cs.a == 1);
   ASSERT(cs.b == 2);
   ASSERT(cs.c == 345);
@@ -461,7 +464,9 @@
   ASSERT(cs.e == 2);
   ASSERT(cs.f == 1);
   ASSERT(cs.g == 54321U);
+#endif
 }
 #if defined(PORT_HOST) && defined(__sun) && defined(__i386__) && defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ == 6)
 #pragma GCC pop_options
 #endif
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bitopcse.c sdcc-3.2.0+dfsg/support/regression/tests/bitopcse.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bitopcse.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bitopcse.c	2012-02-22 14:45:17.000000000 +0000
@@ -4,7 +4,7 @@
  */
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_sdcc99
 #endif
 
@@ -154,3 +154,4 @@
    ASSERT( v   == ({type}) MASK);
    ASSERT(uv   == MASK);
 }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bitvars.c sdcc-3.2.0+dfsg/support/regression/tests/bitvars.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bitvars.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bitvars.c	2012-02-22 14:45:17.000000000 +0000
@@ -5,7 +5,7 @@
 
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_sdcc99
 #endif
 
@@ -46,7 +46,7 @@
 #if !(defined(__SUNPRO_C) && defined(__i386))
 /* this test fails on Solaris i386 SunPro C compiler with -xO2 option;
    it pass without -xO2 option !? */
-#if defined TYPE_char && !defined SDCC_CHAR_UNSIGNED
+#if defined TYPE_char && !defined __SDCC_CHAR_UNSIGNED
   ASSERT (complement (~_ff, 0));
 #else
   ASSERT (complement (~_ff, 1));
@@ -55,7 +55,7 @@
 
 #if defined TYPE_bool
   ASSERT (complement (~_ffff, 1));
-#elif defined TYPE_char && !defined SDCC_CHAR_UNSIGNED
+#elif defined TYPE_char && !defined __SDCC_CHAR_UNSIGNED
   ASSERT (complement (~_ffff, 0));
 #else
   if (sizeof({type}) < sizeof(int))
@@ -66,3 +66,4 @@
 
 #endif //__bool_true_false_are_defined
 }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bool.c sdcc-3.2.0+dfsg/support/regression/tests/bool.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bool.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bool.c	2012-02-22 14:45:17.000000000 +0000
@@ -3,7 +3,7 @@
 
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_c99
 #endif
 
@@ -26,9 +26,9 @@
 
   volatile bool E;
 
-#if (__SDCC_WEIRD_BOOL == 0)
   bool (* const pa[])(void) = {&ret_true, &ret_false};
 
+#if (__SDCC_WEIRD_BOOL == 0)
   struct s
   {
     bool b;
@@ -45,13 +45,13 @@
 {
 	volatile unsigned char z = 2;
 
-#if (__SDCC_WEIRD_BOOL == 0)
 	const char *BOOL = "George Boole";
 
 	ASSERT(true);
 	ASSERT((*(pa[0]))() == true);
 	ASSERT((*(pa[1]))() == false);
 
+#if (__SDCC_WEIRD_BOOL == 0)
 	s2.b = (z & 2);
 	ASSERT(s2.b);
 	s2.b = (bool)(z & 2);
@@ -81,3 +81,4 @@
 	E = true;
 	E--;     ASSERT(!E); // sets E to 1-E
 }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bp.c sdcc-3.2.0+dfsg/support/regression/tests/bp.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bp.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bp.c	2012-02-22 14:45:17.000000000 +0000
@@ -20,7 +20,7 @@
   return a;
 }
 
-#if defined(SDCC_mcs51) || defined(SDCC_pic16)
+#if defined(__SDCC_mcs51) || defined(__SDCC_pic16)
 
 // test devices with much less memory
 #define ABOVE_MEM_SIZE       30
@@ -57,3 +57,4 @@
   ASSERT(verifyBlock(below, BELOW_MEM_TEST_SIZE, sizeof(below)));
 
 }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug-221100.c sdcc-3.2.0+dfsg/support/regression/tests/bug-221100.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug-221100.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug-221100.c	2012-02-22 14:45:17.000000000 +0000
@@ -7,7 +7,7 @@
 
 #define ARRAY_SIZE  130
 
-#ifdef SDCC_pic16
+#ifdef __SDCC_pic16
 /* not enough pic16 data space, so put the array into the code memory */
 __code static unsigned int
 testArray[ARRAY_SIZE] = {
@@ -43,7 +43,7 @@
 static void
 testUnsignedCharIndex (void)
 {
-#ifndef SDCC_pic16
+#ifndef __SDCC_pic16
   int i;
   for (i = 0; i < 130; i++) {
     testArray[i] = i;
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug-3495411.c sdcc-3.2.0+dfsg/support/regression/tests/bug-3495411.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug-3495411.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug-3495411.c	2012-05-05 14:39:36.000000000 +0000
@@ -0,0 +1,186 @@
+/*
+   bug-3495411.c
+*/
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#pragma disable_warning 88
+#endif
+
+// Type defines
+#define UCHAR	unsigned char
+#define USHORT	unsigned short
+#define ULONG	unsigned long
+//#define BOOLEAN	unsigned char
+#define BOOLEAN	_Bool
+
+#define PCHAR	unsigned char *
+#define PSHORT	unsigned short *
+#define PLONG	unsigned long *
+
+#ifndef NULL
+#define NULL	(void *)0
+#endif
+
+#define TRUE	1
+#define FALSE	0
+
+#define IP_ALEN					4
+#define RTP_SSRC_LEN	4
+#define MAX_USER_NAME_LEN		32
+#define MAX_USER_NUMBER_LEN		32
+#define MAX_TAG_LEN			16
+
+typedef struct _CALL_TIME
+{
+	UCHAR iSec;
+	UCHAR iMin;
+	UCHAR iHour;
+} CALL_TIME;
+
+struct ucb
+{
+	UCHAR iState;
+	USHORT sSrcPort;
+	UCHAR iBankOffset;				/* Bank offset of call back function	*/
+	USHORT sCallBack;				/* Address of call back function		*/
+	USHORT sDstPort;
+	UCHAR pDstIP[IP_ALEN];
+	USHORT sLen;
+};
+
+typedef struct ucb * UDP_SOCKET;
+
+typedef struct sip_lcb * SIP_LCB_HANDLE;
+typedef struct sip_tcb * SIP_TCB_HANDLE;
+
+struct sip_tcb
+{
+	UCHAR iState;
+	UCHAR iMethod;
+	UCHAR pDstIP[IP_ALEN];
+	USHORT sDstPort;
+	UCHAR iTimer0;
+	UCHAR iTimer1;
+	UCHAR iTimer2;
+	BOOLEAN b100rel;
+	PCHAR pBranch;
+	PCHAR pData;
+	SIP_LCB_HANDLE pLcb;
+};
+
+struct sip_lcb
+{
+	UCHAR iState;			// State of this line
+	BOOLEAN bCallee;		// Caller or callee
+	UCHAR iTimer;			// No anser timer
+	UCHAR iRemoteRb;		// ringback tone type
+	BOOLEAN bHolding;
+	BOOLEAN bEarlyDlg;		// already received a 1xx response
+ 
+	UCHAR iVoiceCoder;		// voice coder used by this line
+	BOOLEAN bVad;
+	UCHAR iRemoteMode;		// remote voice transmission mode
+	UCHAR pRtpDstIP[IP_ALEN];	// RTP dst IP
+	USHORT sRtpDstPort;		// RTP dst port
+	UCHAR iCoderPayload;	// Peer's coder payload
+	UCHAR iDtmfPayload;		// Peer's DTMF payload
+
+	UCHAR iLocalMode;		// local voice transmission mode
+	UCHAR iSdpType;
+	UCHAR pSdpSessionId[9];
+	ULONG lSdpVersion;
+	UDP_SOCKET pRtpSocket;
+	USHORT sRtpPort;		// local RTP port
+	USHORT sRtpSeq;			// RTP sequence
+	UCHAR pRtpSSRC[RTP_SSRC_LEN];
+	UCHAR pRtpDstSSRC[RTP_SSRC_LEN];
+	ULONG lRtpTimeStamp;	// RTP timestamp
+	ULONG lRtpOffset;
+	BOOLEAN bVoiceStart;	
+	BOOLEAN bSendingKey;	// RFC2833 send key 
+	UCHAR iSendKey;			// Key being sent
+	USHORT sSendKeyLen;		// Duration in timestamp
+	BOOLEAN bKeyRecved;
+	UCHAR pKeyTimeStamp[4];
+
+	UCHAR pDstIP[IP_ALEN];	// Dst IP of this call
+	USHORT sDstPort;		// Dst port of this call
+	ULONG lRseq;			// RSEQ for PRACK
+	ULONG lCurSeq;			// Current sequence of this call
+	ULONG lInvSeq;			// Sequence of INVITE request
+	PCHAR pInvUri;			// Original request Uri of this call
+	PCHAR pReqUri;			// Request URI of this call
+	PCHAR pBranch;			// Invite branch
+	PCHAR pCallId;			// Call-ID header of this call
+	PCHAR pFrom;			// From header of this call
+	PCHAR pTo;				// To header
+	PCHAR pFromTag;			// Local tag	
+	PCHAR pToTag;			// Remote tag
+	PCHAR pProxyAuth;		// Proxy-Authenticate information
+	PCHAR pWWWAuth;			// WWW-Authenticate information
+	PCHAR pRoute;			// Route header to be included in request
+	PCHAR pInvHeader;		// Invite header to be included in response
+	SIP_TCB_HANDLE pInvTcb;	// Transaction control block of INVITE request
+
+	UCHAR pRespDstIP[IP_ALEN];
+	USHORT sRespDstPort;
+	PCHAR pReferredBy;
+	PCHAR pReplaces;
+	UCHAR iXferPart;		// which role do we play? transferor, transferee or transfer-to?
+
+	UCHAR iRefresher;
+	ULONG lSessionExpires;
+	ULONG lSessionTimer;
+	ULONG lMinSE;
+
+	UCHAR pPeerName[MAX_USER_NAME_LEN];
+	UCHAR pPeerNumber[MAX_USER_NUMBER_LEN];
+	CALL_TIME ct;
+	UCHAR pKeyOut[MAX_USER_NUMBER_LEN];
+	UCHAR iKeyIndex;
+	BOOLEAN bMemCall;
+};
+
+__xdata struct sip_lcb l;
+extern SIP_LCB_HANDLE Sip_pCurLcb = &l;
+
+void line_start(PCHAR pDst) {}
+void sip_add_local_uri(BOOLEAN bIP, BOOLEAN bPort) {}
+void sip_new_token(PCHAR pDst, UCHAR iLen) {}
+void sip_add_token(PCHAR pToken, PCHAR pValue) {}
+void dummy_free(void *p) {}
+PCHAR heap_save_str(PCHAR pStr) { return ((PCHAR) 42);}
+BOOLEAN Sys_bRegister;
+const UCHAR _cTokenTag[] = "";
+
+void sip_new_from()
+{
+#ifdef __SDCC_mcs51
+	UCHAR pBuf[64];
+#else
+	UCHAR pBuf[128];
+#endif
+	UCHAR pTag[MAX_TAG_LEN+1];
+
+	line_start(pBuf);
+	sip_add_local_uri(!Sys_bRegister, FALSE);
+	sip_new_token(pTag, MAX_TAG_LEN);
+	sip_add_token(_cTokenTag, pTag);
+	dummy_free(Sip_pCurLcb->pFrom);
+	Sip_pCurLcb->pFrom = heap_save_str(pBuf);
+	dummy_free(Sip_pCurLcb->pFromTag);
+	Sip_pCurLcb->pFromTag = heap_save_str(pTag);
+}
+
+void
+testBug (void)
+{
+	l.pFrom = (PCHAR) 23;
+	sip_new_from();
+	ASSERT (l.pFrom == (PCHAR) 42);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug-460010.c sdcc-3.2.0+dfsg/support/regression/tests/bug-460010.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug-460010.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug-460010.c	2012-02-22 14:45:17.000000000 +0000
@@ -2,8 +2,8 @@
  */
 #include <testfwk.h>
 
-#ifdef SDCC
-#ifdef SDCC_pic16
+#ifdef __SDCC
+#ifdef __SDCC_pic16
 #define ADDRESS 0x0070
 #else
 #define ADDRESS 0xa000
@@ -19,7 +19,7 @@
 void
 testBadPromotion (void)
 {
-#ifdef SDCC
+#ifdef __SDCC
   unsigned char c = *((unsigned __xdata char*)(ADDRESS));
 #else
   unsigned char loc_c;
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug-524697.c sdcc-3.2.0+dfsg/support/regression/tests/bug-524697.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug-524697.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug-524697.c	2012-02-22 14:45:17.000000000 +0000
@@ -2,7 +2,7 @@
  */
 #include <testfwk.h>
 
-#if defined(SDCC_mcs51)
+#if defined(__SDCC_mcs51)
 #define SZ_SIZE 89
 #else
 #define SZ_SIZE 90
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug-716242.c sdcc-3.2.0+dfsg/support/regression/tests/bug-716242.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug-716242.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug-716242.c	2012-02-22 14:45:17.000000000 +0000
@@ -22,7 +22,7 @@
 void
 f1 ()
 {
-#if defined(SDCC_ds390)
+#if defined(__SDCC_ds390)
   p = (void __code *) mul2;
 #else
   p = (void *) mul2;
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug-908454.c sdcc-3.2.0+dfsg/support/regression/tests/bug-908454.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug-908454.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug-908454.c	2012-02-22 14:45:17.000000000 +0000
@@ -2,7 +2,7 @@
 
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_sdcc99
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug1057979.c sdcc-3.2.0+dfsg/support/regression/tests/bug1057979.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug1057979.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug1057979.c	2012-02-22 14:45:17.000000000 +0000
@@ -37,7 +37,7 @@
   sprintf (s, "%-3.3s", "ab");
   ASSERT (0 == strcmp (s, "ab "));
 
-#if defined(SDCC_ds390) || defined(PORT_HOST)
+#if defined(__SDCC_ds390) || defined(PORT_HOST)
   //and from bug 1358192
   sprintf (s, "%f", 10.1);
   LOG ((s));
@@ -54,3 +54,4 @@
 
   ASSERT (s[12] == 0x12);
 }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug1115321.c sdcc-3.2.0+dfsg/support/regression/tests/bug1115321.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug1115321.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug1115321.c	2012-02-22 14:45:17.000000000 +0000
@@ -49,10 +49,14 @@
 
 #define SUPPORT_CHAR_C
 
-#ifndef SDCC
-#   define VA_ARG(args,type) (type)va_arg((args),int)
+/* Normally a char is promoted to int when passed as varargs parameter */
+/* but SDCC leaves it as char. */
+#ifndef __SDCC
+#   define VA_ARG_CHAR int
+#   define VA_ARG(args,type) va_arg((args),type)
 #   define SDCC_SNPRINTF    sdcc_snprintf
 #else
+#   define VA_ARG_CHAR char
 #   define VA_ARG(args,type) va_arg((args),type)
 #   define SDCC_SNPRINTF    snprintf
 #endif
@@ -113,7 +117,7 @@
             switch( *format ) {
 #ifdef SUPPORT_CHAR_C
                 case 'c':
-                    *buffer = VA_ARG( args, char );
+                    *buffer = VA_ARG( args, VA_ARG_CHAR );
                     buffer++;
                     break;
 #endif /* SUPPORT_CHAR_C */
@@ -246,7 +250,7 @@
     ASSERT (ret == 10);
 }
 
-#if defined SDCC && !defined SDCC_z80 && !defined SDCC_z180 && !defined SDCC_r2k
+#if defined SDCC && !defined __SDCC_z80 && !defined __SDCC_z180 && !defined __SDCC_r2k && !defined __SDCC_gbz80
 extern void _putchar(char c);
 
 void putchar(char c)
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug1198642.c sdcc-3.2.0+dfsg/support/regression/tests/bug1198642.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug1198642.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug1198642.c	2012-02-22 14:45:17.000000000 +0000
@@ -7,7 +7,7 @@
 void
 test_cse_generic_ptr (void)
 {
-#if defined(SDCC_mcs51)
+#if defined(__SDCC_mcs51)
   volatile void *p1;
   volatile void *p2;
 
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug1337835.c sdcc-3.2.0+dfsg/support/regression/tests/bug1337835.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug1337835.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug1337835.c	2012-02-22 14:45:17.000000000 +0000
@@ -4,19 +4,15 @@
 
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_sdcc99
 #endif
 
 #include <stdbool.h>
 
-#ifndef BOOL
-#define BOOL bool
-#endif
-
 char e;
 
-void foo (unsigned long ul, BOOL b, char c) REENTRANT
+void foo (unsigned long ul, bool b, char c) REENTRANT
 {
 	if (b && (long) ul < 0)
 		e = 0;
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug1505956.c sdcc-3.2.0+dfsg/support/regression/tests/bug1505956.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug1505956.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug1505956.c	2012-02-22 14:45:17.000000000 +0000
@@ -6,7 +6,7 @@
 
 #include <testfwk.h>
 
-#if defined SDCC_mcs51 || defined SDCC_ds390
+#if defined __SDCC_mcs51 || defined __SDCC_ds390
 
 #define TEST_MACRO_20() { \
 	/*this macro has 20 instructions in it*/ \
@@ -145,3 +145,4 @@
 {
 	ASSERT(bug3407279(0) == 0);
 }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug1509084.c sdcc-3.2.0+dfsg/support/regression/tests/bug1509084.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug1509084.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug1509084.c	2012-02-22 14:45:17.000000000 +0000
@@ -4,7 +4,7 @@
 
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_sdcc99
 #endif
 
@@ -43,3 +43,4 @@
 	leds_name_repaint();
 	ASSERT(aa == 17);
 }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug1535242.c sdcc-3.2.0+dfsg/support/regression/tests/bug1535242.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug1535242.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug1535242.c	2012-02-22 14:45:17.000000000 +0000
@@ -2,7 +2,7 @@
  */
 #include <testfwk.h>
 
-#if defined(SDCC_mcs51)
+#if defined(__SDCC_mcs51)
 #include <8052.h>
 #include <stdbool.h>
 
@@ -22,7 +22,7 @@
 void
 testSaveBits (void)
 {
-#if defined(SDCC_mcs51)
+#if defined(__SDCC_mcs51)
   //enable the interrupt and set it
   ET2 = 1;
   EA = 1;
@@ -44,7 +44,7 @@
 #endif
 }
 
-#if defined(SDCC_mcs51)
+#if defined(__SDCC_mcs51)
 void
 T2_isr (void) __interrupt 5 __using 2
 {
@@ -54,3 +54,4 @@
   manipulate_bits (true);
 }
 #endif
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug1546986.c sdcc-3.2.0+dfsg/support/regression/tests/bug1546986.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug1546986.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug1546986.c	2012-02-22 14:45:17.000000000 +0000
@@ -4,7 +4,7 @@
 
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_sdcc99
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug1565152.c sdcc-3.2.0+dfsg/support/regression/tests/bug1565152.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug1565152.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug1565152.c	2012-02-22 14:45:17.000000000 +0000
@@ -7,7 +7,7 @@
 // no need to call this, it generates compiler error for xstack-auto
 //   error 9: FATAL Compiler Internal Error
 
-#if defined(SDCC_mcs51)
+#if defined(__SDCC_mcs51)
 #include <8051.h>
 
 unsigned int foo(void)
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug1678803.c sdcc-3.2.0+dfsg/support/regression/tests/bug1678803.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug1678803.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug1678803.c	2012-02-22 14:45:17.000000000 +0000
@@ -11,14 +11,14 @@
 {
 }
 
-#ifdef SDCC_mcs51
+#ifdef __SDCC_mcs51
 func GetFunc(void) __naked
 {
   __asm
 
     ; some assembler code
     mov dptr,#_foo
-#ifdef SDCC_MODEL_HUGE
+#ifdef __SDCC_MODEL_HUGE
     mov B,#_foo>>16
     ljmp __sdcc_banked_ret
 #else
@@ -30,7 +30,7 @@
 
 void testCaller(void)
 {
-#ifdef SDCC_mcs51
+#ifdef __SDCC_mcs51
   GetFunc()();
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug1712928.c sdcc-3.2.0+dfsg/support/regression/tests/bug1712928.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug1712928.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug1712928.c	2012-02-22 14:45:17.000000000 +0000
@@ -4,12 +4,12 @@
 
 #include <testfwk.h>
 
-#if defined (SDCC_mcs51)
+#if defined (__SDCC_mcs51)
 unsigned char NakedFunc(void) __naked
 {
 	__asm
 	mov	dpl,#0x01
-#if defined (SDCC_MODEL_HUGE)
+#if defined (__SDCC_MODEL_HUGE)
 	ljmp	__sdcc_banked_ret
 #else
 	ret
@@ -21,7 +21,7 @@
 void
 testBug(void)
 {
-#if defined (SDCC_mcs51)
+#if defined (__SDCC_mcs51)
 	unsigned char hsum, sum;
 
 	hsum = NakedFunc();
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug1723128.c sdcc-3.2.0+dfsg/support/regression/tests/bug1723128.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug1723128.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug1723128.c	2012-05-18 17:15:09.000000000 +0000
@@ -4,7 +4,7 @@
 
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_sdcc99
 #endif
 
@@ -29,7 +29,7 @@
   unsigned char CRC;                         // 10
 } AUTOCAL_CFG;
 
-#ifndef SDCC_hc08
+#if !defined(__SDCC_hc08) && !defined(__SDCC_s08)
 __code __at (0x8000) AUTOCAL_CFG AutoCal_CFG = {0};
 #else
 /* The "__at (0x8000)" is suppressed on the hc08 to avoid */
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug1734654.c sdcc-3.2.0+dfsg/support/regression/tests/bug1734654.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug1734654.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug1734654.c	2012-02-22 14:45:17.000000000 +0000
@@ -2,7 +2,7 @@
  */
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_sdcc99
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug1738367.c sdcc-3.2.0+dfsg/support/regression/tests/bug1738367.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug1738367.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug1738367.c	2012-02-22 14:45:17.000000000 +0000
@@ -4,7 +4,7 @@
 
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_sdcc99
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug1745717.c sdcc-3.2.0+dfsg/support/regression/tests/bug1745717.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug1745717.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug1745717.c	2012-02-22 14:45:17.000000000 +0000
@@ -4,7 +4,7 @@
 
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_sdcc99
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug1788177.c sdcc-3.2.0+dfsg/support/regression/tests/bug1788177.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug1788177.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug1788177.c	2012-02-22 14:45:17.000000000 +0000
@@ -4,7 +4,7 @@
 
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_sdcc99
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug1810965.c sdcc-3.2.0+dfsg/support/regression/tests/bug1810965.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug1810965.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug1810965.c	2011-12-27 19:41:39.000000000 +0000
@@ -0,0 +1,50 @@
+/*
+   bug1810965.c
+*/
+
+#include <testfwk.h>
+
+/* bug 1810965 */
+typedef union data_packet
+{
+	struct
+	{
+		enum
+		{
+			READ_VERSION = 0x00,
+			RESET = 0xFF
+		}cmd;
+	}t;
+} data_packet;
+
+data_packet dataPacket;
+
+void bug1810965(void)
+{
+	switch(dataPacket.t.cmd)
+	{
+	case READ_VERSION:		//error 20: Undefined identifier 'READ_VERSION'
+					//error 62: 'case' expression not constant. Statement ignored
+		break;
+	}
+}
+
+/* bug 2698805 */
+static void foo(void)
+{
+	enum foo_tag { e_foo };
+	volatile unsigned char a = e_foo;
+}
+
+static void bar(void)
+{
+	enum foo_tag { e_foo };		//error 163: duplicate enum member 'e_foo'
+					//error 0: Duplicate symbol 'e_foo', symbol IGNORED
+					//error 51: typedef/enum 'foo_tag' duplicate. Previous definiton Ignored
+	volatile unsigned char a = e_foo;
+}
+
+void testBug(void)
+{
+	ASSERT(1);
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug1921073.c sdcc-3.2.0+dfsg/support/regression/tests/bug1921073.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug1921073.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug1921073.c	2012-02-22 14:45:17.000000000 +0000
@@ -10,7 +10,7 @@
   unsigned long v = (unsigned long)p;
   c;
   v;
-#if defined(SDCC_mcs51)
+#if defined(__SDCC_mcs51)
   ASSERT ((unsigned char)(v >> 16) == 0x80);
 #endif
 }
@@ -20,7 +20,7 @@
 {
   unsigned long v = (unsigned long)p;
   v;
-#if defined(SDCC_mcs51)
+#if defined(__SDCC_mcs51)
   ASSERT ((unsigned char)(v>>16)==0x80);
 #endif
 }
@@ -31,3 +31,4 @@
   f1(5, (__code void *)0x1234);
   f2((__code void *)0x1234);
 }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug1938300.c sdcc-3.2.0+dfsg/support/regression/tests/bug1938300.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug1938300.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug1938300.c	2012-02-22 14:45:17.000000000 +0000
@@ -4,7 +4,7 @@
 
 #include <testfwk.h>
 
-#if (defined PORT_HOST) || defined (SDCC_STACK_AUTO)
+#if (defined PORT_HOST) || defined (__SDCC_STACK_AUTO)
 
 /*****************************************************************************
 * Product; Jongle Reconfigurable USB hardware
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug2077267.c sdcc-3.2.0+dfsg/support/regression/tests/bug2077267.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug2077267.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug2077267.c	2012-02-22 14:45:17.000000000 +0000
@@ -4,7 +4,7 @@
 
 #include <testfwk.h>
 
-#ifndef SDCC
+#ifndef __SDCC
 #define __critical
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug2094505.c sdcc-3.2.0+dfsg/support/regression/tests/bug2094505.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug2094505.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug2094505.c	2012-02-22 14:45:17.000000000 +0000
@@ -7,7 +7,7 @@
 void
 testBug(void)
 {
-#if !defined(SDCC) || !defined(SDCC_mcs51) || defined(SDCC_MODEL_LARGE)
+#if !defined(__SDCC) || !defined(__SDCC_mcs51) || defined(__SDCC_MODEL_LARGE)
     // varA has to be declared for the bug to manifest itself
     volatile char varA[256] = {0};
     volatile unsigned int varB = 0x1;
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug2655200.c sdcc-3.2.0+dfsg/support/regression/tests/bug2655200.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug2655200.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug2655200.c	2012-02-22 14:45:17.000000000 +0000
@@ -13,7 +13,7 @@
 #include <stdint.h>
 
 char thing;
-#if defined (SDCC_mcs51) || defined (SDCC_ds390)
+#if defined (__SDCC_mcs51) || defined (__SDCC_ds390)
 __code char thing_code = 0;
 __data char thing_data;
 __idata char thing_idata;
@@ -25,7 +25,7 @@
 
 const char * __code test_array[] = {
  &thing
-#if defined (SDCC_mcs51) || defined (SDCC_ds390)
+#if defined (__SDCC_mcs51) || defined (__SDCC_ds390)
  , &thing_code
  , &thing_data, &thing_idata, &thing_xdata, &thing_pdata
  , thing_apdata, (char *)thing_apdata
@@ -34,7 +34,7 @@
 
 
 const char *gime_thing() { return &thing; }
-#if defined (SDCC_mcs51) || defined (SDCC_ds390)
+#if defined (__SDCC_mcs51) || defined (__SDCC_ds390)
 const char *gime_thing_code() { return &thing_code; }
 const char *gime_thing_data() { return &thing_data; }
 const char *gime_thing_idata() { return &thing_idata; }
@@ -49,7 +49,7 @@
 {
  ASSERT(test_array[0] == gime_thing());
 
-#if defined (SDCC_mcs51) || defined (SDCC_ds390)
+#if defined (__SDCC_mcs51) || defined (__SDCC_ds390)
  ASSERT(test_array[1] == gime_thing_code());
  ASSERT(test_array[2] == gime_thing_data());
  ASSERT(test_array[3] == gime_thing_idata());
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug2686159.c sdcc-3.2.0+dfsg/support/regression/tests/bug2686159.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug2686159.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug2686159.c	2012-02-22 14:45:17.000000000 +0000
@@ -4,7 +4,7 @@
 
 #include <testfwk.h>
 
-#ifdef SDCC_pic16
+#ifdef __SDCC_pic16
 # define ADDRESS(x) (0x02 ## x)
 #else
 # define ADDRESS(x) (0xCA ## x)
@@ -30,7 +30,7 @@
 
 void testBug(void)
 {
-#ifdef SDCC
+#ifdef __SDCC
 	REG_1 = 0x40;
 	incorrect();
 	ASSERT (REG_1 == 0x43);
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug2719592.c sdcc-3.2.0+dfsg/support/regression/tests/bug2719592.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug2719592.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug2719592.c	2012-02-22 14:45:17.000000000 +0000
@@ -4,17 +4,13 @@
 
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_sdcc99
 #endif
 
 #include <stdbool.h>
 
-#ifndef BOOL
-#define BOOL bool
-#endif
-
-BOOL foo(char i, BOOL bv)
+bool foo(char i, bool bv)
 {
 	bv &= (i == 1);
 	return bv;
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug2729218.c sdcc-3.2.0+dfsg/support/regression/tests/bug2729218.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug2729218.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug2729218.c	2012-02-22 14:45:17.000000000 +0000
@@ -29,7 +29,11 @@
   unsigned char input_cnt;
 };
 
+#ifndef __SDCC_gbz80
 #define ig (*(__idata struct iglobals *) 0xf0)
+#else
+struct iglobals ig;
+#endif
 
 unsigned char count;
 
@@ -47,7 +51,7 @@
 
 void testBug(void)
 {
-#ifdef SDCC
+#ifdef __SDCC
 	ig.rx_byte = 0;
 	ig.input_cnt = 1;
 
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug2761883.c sdcc-3.2.0+dfsg/support/regression/tests/bug2761883.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug2761883.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug2761883.c	2012-02-22 14:45:17.000000000 +0000
@@ -4,7 +4,7 @@
 
 #include <testfwk.h>
 
-#ifdef SDCC_STACK_AUTO
+#ifdef __SDCC_STACK_AUTO
 #define __xdata
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug2805333.c sdcc-3.2.0+dfsg/support/regression/tests/bug2805333.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug2805333.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug2805333.c	2012-02-22 14:45:17.000000000 +0000
@@ -4,22 +4,18 @@
 
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_sdcc99
 #endif
 
 #include <stdbool.h>
 
-#ifndef BOOL
-#define BOOL bool
-#endif
-
 void g(char c)
 {
   c;
 }
 
-BOOL b;
+bool b;
 
 void test_bug(void)
 {
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug2862308.c sdcc-3.2.0+dfsg/support/regression/tests/bug2862308.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug2862308.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug2862308.c	2012-01-04 08:48:57.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+   bug2862308.c
+*/
+
+#include <testfwk.h>
+
+char case1(void)
+{
+  char j = 0;
+  char *z = &j;
+
+  j = 1;
+
+  if (j)
+    return 1;
+  else
+    return 0; /* We incorrectly end up here when using '*z' instead of '*(char *) &j'. */
+}
+
+char case2(void)
+{
+  char j = 0;
+  char *z = &j;
+
+  j = 1;
+
+  if (*(char *) &j) /* Does *not* work with:
+                     * sdcc -mmcs51 --model-large sample.c */
+    return 1;
+  else
+    return 0; /* We incorrectly end up here when using '*z' instead of '*(char *) &j'. */
+}
+
+char case3(void)
+{
+  char j = 0;
+  char *z = &j;
+
+  j = 1;
+
+  if (*z) /* Does *not* work with:
+           * sdcc -mmcs51 --model-large sample.c
+           * sdcc -mmcs51 sample.c */
+    return 1;
+  else
+    return 0; /* We incorrectly end up here when using '*z' instead of '*(char *) &j'. */
+}
+
+void testBug(void)
+{
+  ASSERT(case1());
+  ASSERT(case2());
+  ASSERT(case3());
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug2935162.c sdcc-3.2.0+dfsg/support/regression/tests/bug2935162.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug2935162.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug2935162.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,59 @@
+/*
+   bug2935162.c
+*/
+
+#pragma disable_warning 184
+
+#include <testfwk.h>
+#include <limits.h>
+
+#if defined(__STDC_VERSION__)
+# if (__STDC_VERSION__ >= 199901L)
+#  define IS_C99
+# endif
+#endif
+
+const float a[] =
+{
+    LONG_MAX,       /* .byte #0x00,#0x00,#0x00,#0x4F ; +2.147484e+09   */
+    LONG_MIN,       /* .byte #0x00,#0x00,#0x00,#0x4F ; +2.147484e+09 ? */
+
+    12345678901,    /* .byte #0x00,#0x00,#0x80,#0x4F ; +4.294967e+09   */
+    -12345678901,   /* .byte #0x00,#0x00,#0x80,#0x3F ; +1.000000e+00 ? */
+
+    12345678901L,   /* .byte #0x00,#0x00,#0x00,#0x4F ; +2.147484e+09   */
+    -12345678901L,  /* .byte #0x00,#0x00,#0x00,#0xCF ; -2.147484e+09   */
+
+    2147483647L,    /* .byte #0x00,#0x00,#0x00,#0x4F ; +2.147484e+09   */
+#ifdef IS_C99
+    -2147483648L,   /* .byte #0x00,#0x00,#0x00,#0xCF ; -2.147484e+09   */
+#else
+    -2147483647L-1, /* .byte #0x00,#0x00,#0x00,#0xCF ; -2.147484e+09   */
+#endif
+    ULONG_MAX,      /* .byte #0x00,#0x00,#0x80,#0x4F ; +4.294967e+09   */
+    1.0,            /* .byte #0x00,#0x00,#0x80,#0x3F ; +1.000000e+00   */
+
+    0.0,            /* .byte #0x00,#0x00,#0x00,#0x00 ; +0.000000e+00   */
+    -0.0            /* .byte #0x00,#0x00,#0x00,#0x80 ; -0.000000e+00   */
+};
+
+void testBug (void)
+{
+    volatile int right;
+
+    right = -120;
+
+/* These first two tests assume LONG_MAX and LONG_MIN are 32-bit. This */
+/* is not true for some 64-bit host compilers. Check SDCC only. */
+#ifdef __SDCC
+    ASSERT(a[0] > +2.1e9 && a[0] < +2.2e9);
+    ASSERT(a[1] < -2.1e9 && a[1] > -2.2e9);
+#endif
+    ASSERT(a[2] > +2.1e9);
+    ASSERT(a[3] < -2.1e9);
+    ASSERT(a[4] > +2.1e9);
+    ASSERT(a[5] < -2.1e9);
+    ASSERT(a[6] > +2.1e9);
+    ASSERT(a[7] < -2.1e9);
+    ASSERT(a[8] > +4.2e9);
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug2942343.c sdcc-3.2.0+dfsg/support/regression/tests/bug2942343.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug2942343.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug2942343.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+   bug2942343.c
+ */
+#pragma std_sdcc99
+
+#include <testfwk.h>
+
+const unsigned char x[3] = {255, 256, 257}; //gives a warning about out-of-range values.
+      unsigned char y[3] = {255, 256, 257}; //does not.
+
+const _Bool foo[4] = {1, 2, 3, 4};          //creates an array of 4 _Bools which all have the value true.
+      _Bool bar[4] = {1, 2, 3, 4};          //creates an array with true in foo[0], but 2,3,4 in the rest.
+
+void testBug(void)
+{
+/* Test fails on big endian hosts that use a _Bool larger than char */
+/* (for example, Mac PPC), so just skip this test for non-SDCC */
+#ifdef __SDCC
+  ASSERT(1 == *(char*)(&foo[1]));
+  ASSERT(1 == *(char*)(&bar[2]));
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3004918.c sdcc-3.2.0+dfsg/support/regression/tests/bug3004918.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3004918.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3004918.c	2012-02-22 14:45:17.000000000 +0000
@@ -5,7 +5,7 @@
 #include <testfwk.h>
 #include <stdint.h>
 
-#ifdef SDCC_STACK_AUTO
+#ifdef __SDCC_STACK_AUTO
  #define XDATA
 #else
  #define XDATA __xdata
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3027957.c sdcc-3.2.0+dfsg/support/regression/tests/bug3027957.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3027957.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3027957.c	2012-02-22 14:45:17.000000000 +0000
@@ -17,7 +17,7 @@
 
 void testBug(void)
 {
-#ifdef SDCC
+#ifdef __SDCC
   foo();
   ASSERT (*(unsigned char __xdata *)(0xF064) == 0x12);
 #endif
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3037889.c sdcc-3.2.0+dfsg/support/regression/tests/bug3037889.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3037889.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3037889.c	2012-02-22 14:45:17.000000000 +0000
@@ -4,7 +4,7 @@
 
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma disable_warning 88 //no warning about casting LITERAL value to 'generic' pointer
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3223041.c sdcc-3.2.0+dfsg/support/regression/tests/bug3223041.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3223041.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3223041.c	2012-05-19 07:51:05.000000000 +0000
@@ -4,33 +4,29 @@
 
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_sdcc99
 #endif
 
 #include <stdbool.h>
 
-#ifndef BOOL
-#define BOOL bool
-#endif
-
-#ifdef SDCC_hc08
+#if 0
 #define CAST(x)	(x ? true : false)
 #else
 #define CAST(x)	(x)
 #endif
 
-BOOL and(BOOL a, BOOL b, BOOL c, BOOL d)
+bool and(bool a, bool b, bool c, bool d)
 {
 	return a & b & c & d;
 }
 
-BOOL or(BOOL a, BOOL b, BOOL c, BOOL d)
+bool or(bool a, bool b, bool c, bool d)
 {
 	return a | b | c | d;
 }
 
-BOOL xor(BOOL a, BOOL b, BOOL c, BOOL d)
+bool xor(bool a, bool b, bool c, bool d)
 {
 	return a ^ b ^ c ^ d;
 }
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3290691.c sdcc-3.2.0+dfsg/support/regression/tests/bug3290691.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3290691.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3290691.c	2012-02-22 14:45:17.000000000 +0000
@@ -4,17 +4,13 @@
 
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_sdcc99
 #endif
 
 #include <stdbool.h>
 
-#ifndef BOOL
-#define BOOL bool
-#endif
-
-BOOL foo_b(BOOL b)
+bool foo_b(bool b)
 {
 	return !b;
 }
@@ -29,7 +25,7 @@
 	return !c;
 }
 
-BOOL bar_b(BOOL c)
+bool bar_b(bool c)
 {
 	return foo_c(c);
 }
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3379723.c sdcc-3.2.0+dfsg/support/regression/tests/bug3379723.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3379723.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3379723.c	2012-05-18 16:39:12.000000000 +0000
@@ -4,7 +4,7 @@
 
 #include <testfwk.h>
 
-#if !defined(PORT_HOST) && !defined(SDCC_hc08)
+#if !defined(PORT_HOST) && !defined(__SDCC_hc08) && !defined(__SDCC_s08) && !defined(__SDCC_gbz80)
 
 #define UCHAR	unsigned char
 
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3381400.c sdcc-3.2.0+dfsg/support/regression/tests/bug3381400.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3381400.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3381400.c	2012-02-22 14:45:17.000000000 +0000
@@ -10,7 +10,7 @@
 #define USHORT	unsigned short
 #define PCHAR	unsigned char *
 
-#ifdef SDCC_z80
+#ifdef __SDCC_z80
 __sfr __at 0x05 rSRAM_Page;
 #endif
 
@@ -51,7 +51,7 @@
 	for (i = 0; i < BUF_PAGE_NUM+2; i ++)
 	{
 	}
-#ifdef SDCC_z80
+#ifdef __SDCC_z80
 	rSRAM_Page = DEFAULT_MEMORY_PAGE;
 #endif
 }
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3389647.c sdcc-3.2.0+dfsg/support/regression/tests/bug3389647.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3389647.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3389647.c	2012-02-22 14:45:17.000000000 +0000
@@ -5,7 +5,7 @@
 
 #include <testfwk.h>
 
-#if defined (SDCC)
+#if defined (__SDCC)
   #pragma disable_warning 196 //no warning about pointer const qualifier (W_TARGET_LOST_QUALIFIER)
   #include <sdcc-lib.h> /* just to get _STATMEM */
 #endif
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3403429.c sdcc-3.2.0+dfsg/support/regression/tests/bug3403429.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3403429.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3403429.c	2012-02-19 07:01:11.000000000 +0000
@@ -58,11 +58,9 @@
 
   Sub_9000();
 
-#ifdef PORT_HOST
   for(i = 1; i <= 4; i++)
     {
       ASSERT(C[i][1] == 0);
       ASSERT(C[i][2] == 0);
     }
-#endif
 }
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3404101.c sdcc-3.2.0+dfsg/support/regression/tests/bug3404101.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3404101.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3404101.c	2012-02-22 14:45:17.000000000 +0000
@@ -4,7 +4,7 @@
 
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_c99
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3410620.c sdcc-3.2.0+dfsg/support/regression/tests/bug3410620.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3410620.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3410620.c	2012-02-22 14:45:17.000000000 +0000
@@ -7,7 +7,7 @@
 
 #define INTREGBANK {bank}
 
-#if defined(SDCC_mcs51) || defined (SDCC_ds390)
+#if defined(__SDCC_mcs51) || defined (__SDCC_ds390)
 
 void handler1(void) __using(INTREGBANK)
 {
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3440327.c sdcc-3.2.0+dfsg/support/regression/tests/bug3440327.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3440327.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3440327.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,69 @@
+/*
+   bug3440327.c
+ */
+
+#include <testfwk.h>
+#include <setjmp.h>
+
+#if defined(__SDCC_mcs51) || defined(__SDCC_z80) || defined(__PORT_HOST)
+
+jmp_buf b;
+
+#define DIM 2
+typedef struct
+{
+	char id;
+	int (*f)(char c);
+} fstruct;
+
+int j;
+
+int fnct(char c)
+{
+	static int i;
+	i = i + c + 1;
+	if (i == 4)
+	{
+		j = 42;
+		longjmp (b, 0);
+	}
+	return 0;
+}
+
+fstruct tab[DIM]={{2, fnct}, {3, 0}};
+
+int bug(void)
+{
+	register fstruct *dt = tab;
+	char val;
+
+	while (dt < tab+DIM)
+	{
+		val = 0;
+		while (val < dt->id)
+		{
+			(dt->f)(val); /* Wrong pointer used here */
+		}
+		++dt;
+	}
+
+	return 0;
+}
+
+#endif
+
+void testBug (void)
+{
+#if defined(__SDCC_mcs51) || defined(__SDCC_z80) || defined(__PORT_HOST)
+	if (setjmp (b))
+	{
+		ASSERT (j == 42);
+	}
+	else
+	{
+		bug ();
+		ASSERT (0);
+	}
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3444293.c sdcc-3.2.0+dfsg/support/regression/tests/bug3444293.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3444293.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3444293.c	2011-12-03 14:39:33.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+   bug3444293.c
+*/
+
+#include <testfwk.h>
+
+void __code* s[3];
+
+void f(void)
+{
+	s[0] = 0;
+	s[1] = 0; // Access to s is off by one byte here.
+}
+
+void testBug(void)
+{
+	s[0] = (void __code*)(0xffff);
+	s[1] = (void __code*)(0xffff);
+	f();
+	ASSERT(!s[0]);
+	ASSERT(!s[1]);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3474855.c sdcc-3.2.0+dfsg/support/regression/tests/bug3474855.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3474855.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3474855.c	2012-01-18 08:21:04.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+   bug3474855.c
+*/
+
+#include <testfwk.h>
+
+float mult(float x)
+{
+  return 0.8 * x;
+}
+
+void
+testBug (void)
+{
+  unsigned char i = 64;
+  float result = 1e-38;
+
+  do
+    {
+      ASSERT (result < 1.5e-38);
+      result = mult(result);    //make denormalized float
+    }
+  while (--i);
+  ASSERT (result < 1e-44);
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3475630.c sdcc-3.2.0+dfsg/support/regression/tests/bug3475630.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3475630.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3475630.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,137 @@
+/*
+  bug3475630.c
+
+  Register allocator allocated variable to iy, which is needed for stack access when accessing local variables unreachable by the frame pointer.
+*/
+
+#include <testfwk.h>
+
+#include <stdio.h>
+
+/*
+ * Raw directory item (32 bytes).
+ *
+*/
+typedef struct {
+    unsigned char   ftype;
+    unsigned char   fname[16];
+    unsigned char   str_terminator; // 0x0d
+    unsigned char   unused1[2];
+    unsigned int    fsize;
+    unsigned int    fstrt;
+    unsigned int    fexec;
+    unsigned char   unused2[4];
+    unsigned int    block;
+} FS_MZ_DITEM;
+
+
+/*
+ * Raw directory sektor.
+ *
+ * Has 8 directory items (256 bytes).
+*/
+typedef struct {
+    FS_MZ_DITEM     ditem[8];
+} FS_MZ_BLDIR;
+
+
+/*
+ * Elementary file descriptor
+ *
+*/
+typedef struct {
+    unsigned char   ftype;
+    unsigned char   fname[17];
+    unsigned int    fsize;
+    unsigned int    fstrt;
+    unsigned int    fexec;
+    unsigned int    block;    
+} FS_MZ_FHEADER;
+
+
+/*
+ * Directory handler with cache for 8 file descriptors.
+ *
+*/
+typedef struct {
+    unsigned char   position;
+    FS_MZ_FHEADER   fheader[8];
+} FS_MZDIR;
+
+
+#pragma disable_warning 85 // Unreferenced function arguments in fd_read_sector(), my_strncpy().
+extern char fd_read_sector ( unsigned int block, void* dma )
+{
+    unsigned char i;
+    FS_MZ_BLDIR *bl_dir = dma;
+
+    for(i = 0; i < 8; i++)
+    {
+        bl_dir->ditem[i].ftype = i + 0;
+        bl_dir->ditem[i].fsize = i + 1;
+        bl_dir->ditem[i].fstrt = i + 2;
+        bl_dir->ditem[i].fexec = i + 3;
+        bl_dir->ditem[i].block = i + 4;
+    }
+
+    return(0);
+}
+
+char* my_strncpy ( char *dst, const char *src, size_t n, char terminator )
+{
+    return(0);
+}
+
+/*
+ * Read raw directory data and transform into FS_MZDIR *dir.
+ *
+ */
+char fs_read_directory_block ( FS_MZDIR *dir, unsigned int block )
+{
+    char            res;
+#if defined(__SDCC_mcs51)
+    static __xdata FS_MZ_BLDIR     bl_dir;
+#else
+    FS_MZ_BLDIR     bl_dir;
+#endif
+    FS_MZ_DITEM     *dir_item;
+    FS_MZ_FHEADER   *fil_header;
+    unsigned char   i;
+
+    res = fd_read_sector ( block, &bl_dir );
+    if ( res ) return ( res );
+
+    for ( i = 0; i < 8; i++ ) {
+
+        dir_item = &bl_dir.ditem[i];
+        fil_header = &dir->fheader[i];
+
+        fil_header->ftype = dir_item->ftype;
+        fil_header->fsize = dir_item->fsize;
+        fil_header->fstrt = dir_item->fstrt;
+        fil_header->fexec = dir_item->fexec;
+        fil_header->block = dir_item->block;
+        
+        my_strncpy ( fil_header->fname, dir_item->fname, sizeof ( fil_header->fname ), 0x0d );
+    };
+
+    return ( 0 );
+}
+
+__xdata FS_MZDIR dir;
+
+void testBug(void)
+{
+    unsigned char i;
+
+    fs_read_directory_block(&dir, 0);
+    
+    for(i = 0; i < 8; i++)
+    {
+        ASSERT(dir.fheader[i].ftype == i + 0);
+        ASSERT(dir.fheader[i].fsize == i + 1);
+        ASSERT(dir.fheader[i].fstrt == i + 2);
+        ASSERT(dir.fheader[i].fexec == i + 3);
+        ASSERT(dir.fheader[i].block == i + 4);
+    }
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3475656.c sdcc-3.2.0+dfsg/support/regression/tests/bug3475656.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3475656.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3475656.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,73 @@
+/*
+  bug3475656.c
+
+  Digits in output were reversed (e.g. 192 was written as "291").
+*/
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma disable_warning 85
+#endif
+
+#define UCHAR   unsigned char
+#define USHORT  unsigned short
+#define PCHAR   unsigned char *
+
+UCHAR mod_16x8(USHORT s16, UCHAR i8)
+{
+    return(s16 % i8);
+}
+
+USHORT div_16x8(USHORT s16, UCHAR i8)
+{
+    return(s16 / i8);
+}
+
+#if 0
+void itoa(USHORT sVal, PCHAR pBuf, UCHAR iRadix)
+{
+    PCHAR p;            // pointer to traverse string
+    PCHAR pFirstDigit;  // pointer to first digit
+    UCHAR iTmp;         // temp UCHAR
+
+    p = pBuf;
+    pFirstDigit = p;    // save pointer to first digit
+
+    do 
+    {
+        iTmp = mod_16x8(sVal, iRadix);
+        sVal = div_16x8(sVal, iRadix);
+
+        // convert to ascii and store
+        *p++ = (iTmp > 9) ? iTmp - 10 + 'A' : iTmp + '0';  // a letter or a digit
+    } while (sVal > 0);
+
+    // We now have the digit of the number in the buffer, but in reverse order.  Thus we reverse them now.
+
+    *p-- = '\0';               // terminate string; p points to last digit
+
+    do
+    {
+        iTmp = *p;
+        *p = *pFirstDigit;
+        *pFirstDigit = iTmp;   // swap *p and *pFirstDigit
+        --p;
+        ++pFirstDigit;         // advance to next two digits
+    } while (pFirstDigit < p); // repeat until halfway
+}
+#endif
+
+void testBug(void)
+{
+    unsigned char c[8];
+    unsigned short i;
+
+    i = 192;
+#if 0
+    itoa(i, c, 10);
+    ASSERT(c[0] == '1');
+    ASSERT(c[1] == '9');
+    ASSERT(c[2] == '2');
+#endif
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3475990.c sdcc-3.2.0+dfsg/support/regression/tests/bug3475990.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3475990.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3475990.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,42 @@
+/* Due to the specific structure of the control-flow graph there was a segmentation fault in iCode generatuion. */
+
+#include <testfwk.h>
+
+void set_b(void)
+{
+}
+
+#if defined(__SDCC)
+__addressmod set_b b;
+#else
+#define b
+#endif
+
+int a0, a1, a2;
+b int b0;
+int b2, b1;
+int x0, x1;
+
+int f(void)
+{
+	switch(x0)
+	{
+	case 0:
+		if(a0 && b0)
+		{
+		}
+		else
+		{
+			x0++;
+		}
+		return(b2);
+	default:
+		return(x1);
+	}
+	return(a2);
+}
+
+void testBug(void)
+{
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3480545.c sdcc-3.2.0+dfsg/support/regression/tests/bug3480545.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3480545.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3480545.c	2012-01-28 13:26:16.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   bug3480545.c
+*/
+
+#include <testfwk.h>
+
+unsigned char var = 1;
+
+char do_switch(void)
+{
+    switch( var )
+    {
+        case 0  : return 0;
+        case 1  : return 1;
+        case 2  : return 2;
+        case 3  : return 3;
+        case 4  : return 3;
+        case 5  : return 3;
+        case 6  : return 3;
+        case 7  : return 3;
+        case 8  : return 0;
+        case 9  : return 1;
+        case 10 : return 2;
+        case 11 : return 3;
+        case 12 : return 3;
+        case 13 : return 3;
+        case 14 : return 3;
+        case 15 : return 3;
+        case 16 : return 3;
+        case 17 : return 3;
+    }
+
+    return 0;
+}
+
+void
+testBug (void)
+{
+  ASSERT (do_switch() == 1);
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3482146.c sdcc-3.2.0+dfsg/support/regression/tests/bug3482146.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3482146.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3482146.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,26 @@
+/* 
+  Bug #3482146.
+*/
+
+#include <testfwk.h>
+
+void
+testBug(void)
+{
+#if !defined(__SDCC_mcs51)
+  unsigned char buff[176];
+  unsigned char i;
+  for(i = 0; i < 22*8; ++i)
+    buff[i] = 0xff;
+  buff[0] = buff[1] = 0x42;
+  i = buff[0] - buff[1]; // The bug doesn't occur if you just use "i=0;"
+
+  buff[88 + i] = buff[16 + i];
+
+  buff[8 + i] = buff[i] >> 1;
+  buff[16 + i] = buff[8+i] >> 1;	// This operation will not write into the right memory address
+
+  ASSERT(buff[16] == 0x10);
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3482217.c sdcc-3.2.0+dfsg/support/regression/tests/bug3482217.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3482217.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3482217.c	2012-02-05 23:57:16.000000000 +0000
@@ -0,0 +1,21 @@
+/*
+   bug3482217.c
+*/
+
+#include <testfwk.h>
+
+unsigned char *p;
+
+void f()
+{
+  *p++ = 0;
+}
+
+void testBug(void)
+{
+	unsigned char a[2];
+	p = a;
+	f();
+	ASSERT(p == a + 1);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3482753.c sdcc-3.2.0+dfsg/support/regression/tests/bug3482753.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3482753.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3482753.c	2012-02-21 06:56:07.000000000 +0000
@@ -0,0 +1,24 @@
+/*
+   bug3482753.c
+*/
+
+#include <testfwk.h>
+
+struct {char a;} x;
+volatile char d = 7;
+
+int f(void)
+{
+  char t = d;
+  
+  x.a = t;
+  t = x.a + 2;
+  d = t;
+  t = x.a + 3;  /* bug: x.a was optimized to t, dispite redefinition of t */
+  return t;
+}
+
+void testBug(void)
+{
+  ASSERT(f() == 10);
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3501942.c sdcc-3.2.0+dfsg/support/regression/tests/bug3501942.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3501942.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3501942.c	2012-03-11 18:56:50.000000000 +0000
@@ -0,0 +1,26 @@
+/* bug3501942, an issue with operandsNotrelated() in peepholes for z80-related ports.
+ */
+
+#include <testfwk.h>
+#include <math.h>
+
+int value;
+
+int f(void)
+{
+	return 1;
+}
+
+void g(void) 
+{
+	if (value = f()) /* Bug was triggered here. */
+		return;
+}
+
+void testBug(void)
+{
+	value = 0;
+	g();
+	ASSERT (value == 1);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3502965.c sdcc-3.2.0+dfsg/support/regression/tests/bug3502965.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3502965.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3502965.c	2012-03-14 14:38:57.000000000 +0000
@@ -0,0 +1,73 @@
+/*
+   bug3502965.c
+*/
+
+#include <testfwk.h>
+
+#ifndef __SDCC_mcs51
+#pragma disable_warning 85
+
+#define UCHAR	unsigned char
+#define USHORT	unsigned short
+#define PCHAR	unsigned char *
+#define HW_ALEN					6
+#define IP_ALEN					4
+
+typedef struct _PACKET_LIST PACKET_LIST;
+struct _PACKET_LIST
+{
+	PACKET_LIST *	next;
+	USHORT			sLen;
+	USHORT			sAddr;
+	UCHAR			pRecvIP[IP_ALEN];
+};
+
+void memcpy4(PCHAR dst) {}
+
+#define EP_TYPE (HW_ALEN + HW_ALEN)
+#define EP_DATA (EP_TYPE + 2)    
+#define IP_DATA     20
+#define ETHERNET_MAX_SIZE				1514
+#define IP_DATA_MAX_SIZE			(ETHERNET_MAX_SIZE - EP_DATA - IP_DATA)
+UCHAR Adapter_pPacketBuf[ETHERNET_MAX_SIZE + 1 + IP_DATA_MAX_SIZE + 1];
+#define Adapter_pReceivePacket	(PCHAR)(Adapter_pPacketBuf + ETHERNET_MAX_SIZE + 1)
+
+#define TCP_OFFSET	12	
+PCHAR _pReceive;
+UCHAR _pReceiveIP[IP_ALEN];
+USHORT _sReceiveDataLen;
+
+void TcpRun(PACKET_LIST * p)
+{
+	UCHAR iHeadLen;
+	USHORT sLen;
+	PCHAR pRecvIP;
+
+	sLen = p->sLen;
+
+	_pReceive = Adapter_pReceivePacket;
+	
+	memcpy4(_pReceiveIP);
+
+	// check if packet length is valid
+	iHeadLen = (_pReceive[TCP_OFFSET] & 0xf0) >> 2;
+	if (sLen < iHeadLen)
+	{
+		return;
+	}
+	_sReceiveDataLen = sLen - iHeadLen;
+}
+#endif
+
+void testBug(void)
+{
+#ifndef __SDCC_mcs51
+  PACKET_LIST pl;
+  pl.sLen = 0xff;
+  (Adapter_pReceivePacket)[TCP_OFFSET] = 0x00;
+  _sReceiveDataLen = 0xaa55;
+  TcpRun(&pl);
+  ASSERT(_sReceiveDataLen == 0xff);
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3521024.c sdcc-3.2.0+dfsg/support/regression/tests/bug3521024.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3521024.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3521024.c	2012-05-17 09:57:34.000000000 +0000
@@ -0,0 +1,408 @@
+#include <testfwk.h>
+
+struct cvu_huffman_node
+{
+	unsigned char left;   /* Position of left node in tree or character. */
+	unsigned char right;  /* Position of right node in tree or character. */
+};
+
+struct cvu_huffman_state
+{
+	unsigned char (*input)(void);
+	const struct cvu_huffman_node *nodes;	/* Array of nodes */
+	unsigned char root;	/* Position of root node among nodes */
+	unsigned char ls, bs, rs;
+	unsigned char bit;	/* Position of currently processed bit */
+	unsigned char buffer;	/* Currently processed input byte */
+	unsigned char current;	/* Currently processed node */
+};
+
+const unsigned char HUFFMAN_ROOT = 124;
+const unsigned char HUFFMAN_LS = 125, HUFFMAN_BS = 127, HUFFMAN_RS = 253;
+const struct cvu_huffman_node huffman_tree[255] = {
+
+/* Node 0 */ {128, 129},
+/* Node 1 */ {130, 131},
+/* Node 2 */ {132, 133},
+/* Node 3 */ {134, 135},
+/* Node 4 */ {136, 137},
+/* Node 5 */ {138, 139},
+/* Node 6 */ {140, 141},
+/* Node 7 */ {142, 143},
+/* Node 8 */ {144, 145},
+/* Node 9 */ {146, 147},
+/* Node 10 */ {148, 149},
+/* Node 11 */ {150, 151},
+/* Node 12 */ {152, 153},
+/* Node 13 */ {154, 155},
+/* Node 14 */ {156, 157},
+/* Node 15 */ {158, 159},
+/* Node 16 */ {160, 161},
+/* Node 17 */ {162, 163},
+/* Node 18 */ {164, 165},
+/* Node 19 */ {166, 167},
+/* Node 20 */ {168, 169},
+/* Node 21 */ {170, 171},
+/* Node 22 */ {172, 173},
+/* Node 23 */ {174, 175},
+/* Node 24 */ {176, 177},
+/* Node 25 */ {178, 179},
+/* Node 26 */ {180, 181},
+/* Node 27 */ {182, 183},
+/* Node 28 */ {184, 185},
+/* Node 29 */ {186, 187},
+/* Node 30 */ {188, 189},
+/* Node 31 */ {190, 191},
+/* Node 32 */ {192, 193},
+/* Node 33 */ {194, 195},
+/* Node 34 */ {196, 197},
+/* Node 35 */ {198, 199},
+/* Node 36 */ {200, 201},
+/* Node 37 */ {202, 203},
+/* Node 38 */ {204, 205},
+/* Node 39 */ {206, 207},
+/* Node 40 */ {208, 209},
+/* Node 41 */ {210, 211},
+/* Node 42 */ {212, 213},
+/* Node 43 */ {214, 215},
+/* Node 44 */ {216, 217},
+/* Node 45 */ {218, 219},
+/* Node 46 */ {220, 221},
+/* Node 47 */ {222, 223},
+/* Node 48 */ {224, 225},
+/* Node 49 */ {226, 227},
+/* Node 50 */ {228, 229},
+/* Node 51 */ {230, 231},
+/* Node 52 */ {232, 233},
+/* Node 53 */ {234, 235},
+/* Node 54 */ {236, 237},
+/* Node 55 */ {238, 239},
+/* Node 56 */ {240, 241},
+/* Node 57 */ {242, 243},
+/* Node 58 */ {244, 245},
+/* Node 59 */ {246, 247},
+/* Node 60 */ {248, 249},
+/* Node 61 */ {125, 0},
+/* Node 62 */ {1, 2},
+/* Node 63 */ {3, 4},
+/* Node 64 */ {5, 6},
+/* Node 65 */ {7, 8},
+/* Node 66 */ {9, 10},
+/* Node 67 */ {11, 12},
+/* Node 68 */ {13, 14},
+/* Node 69 */ {15, 16},
+/* Node 70 */ {17, 18},
+/* Node 71 */ {19, 20},
+/* Node 72 */ {21, 22},
+/* Node 73 */ {23, 24},
+/* Node 74 */ {25, 26},
+/* Node 75 */ {27, 28},
+/* Node 76 */ {29, 30},
+/* Node 77 */ {31, 32},
+/* Node 78 */ {33, 34},
+/* Node 79 */ {35, 36},
+/* Node 80 */ {37, 38},
+/* Node 81 */ {39, 40},
+/* Node 82 */ {41, 42},
+/* Node 83 */ {43, 44},
+/* Node 84 */ {45, 46},
+/* Node 85 */ {47, 48},
+/* Node 86 */ {49, 50},
+/* Node 87 */ {51, 52},
+/* Node 88 */ {53, 54},
+/* Node 89 */ {55, 56},
+/* Node 90 */ {57, 58},
+/* Node 91 */ {59, 60},
+/* Node 92 */ {61, 62},
+/* Node 93 */ {63, 64},
+/* Node 94 */ {65, 66},
+/* Node 95 */ {67, 68},
+/* Node 96 */ {69, 70},
+/* Node 97 */ {71, 72},
+/* Node 98 */ {73, 74},
+/* Node 99 */ {75, 76},
+/* Node 100 */ {77, 78},
+/* Node 101 */ {79, 80},
+/* Node 102 */ {81, 82},
+/* Node 103 */ {83, 84},
+/* Node 104 */ {85, 86},
+/* Node 105 */ {87, 88},
+/* Node 106 */ {89, 90},
+/* Node 107 */ {91, 92},
+/* Node 108 */ {93, 94},
+/* Node 109 */ {95, 96},
+/* Node 110 */ {97, 98},
+/* Node 111 */ {99, 100},
+/* Node 112 */ {101, 102},
+/* Node 113 */ {103, 104},
+/* Node 114 */ {105, 106},
+/* Node 115 */ {107, 108},
+/* Node 116 */ {109, 110},
+/* Node 117 */ {111, 112},
+/* Node 118 */ {113, 114},
+/* Node 119 */ {115, 116},
+/* Node 120 */ {117, 118},
+/* Node 121 */ {119, 120},
+/* Node 122 */ {253, 250},
+/* Node 123 */ {251, 252},
+/* Node 124 */ {254, 126},
+/* Node 125 */ {255, 127},
+/* Node 126 */ {170, 123},
+/* Node 127 */ {0, 5},
+/* Node 128 */ {6, 7},
+/* Node 129 */ {8, 9},
+/* Node 130 */ {10, 11},
+/* Node 131 */ {12, 16},
+/* Node 132 */ {17, 18},
+/* Node 133 */ {19, 20},
+/* Node 134 */ {21, 22},
+/* Node 135 */ {23, 24},
+/* Node 136 */ {25, 26},
+/* Node 137 */ {27, 28},
+/* Node 138 */ {29, 30},
+/* Node 139 */ {31, 32},
+/* Node 140 */ {33, 34},
+/* Node 141 */ {35, 36},
+/* Node 142 */ {37, 38},
+/* Node 143 */ {39, 40},
+/* Node 144 */ {41, 42},
+/* Node 145 */ {43, 44},
+/* Node 146 */ {45, 46},
+/* Node 147 */ {47, 48},
+/* Node 148 */ {49, 50},
+/* Node 149 */ {51, 52},
+/* Node 150 */ {53, 54},
+/* Node 151 */ {55, 56},
+/* Node 152 */ {57, 58},
+/* Node 153 */ {59, 60},
+/* Node 154 */ {61, 62},
+/* Node 155 */ {63, 64},
+/* Node 156 */ {65, 66},
+/* Node 157 */ {67, 68},
+/* Node 158 */ {69, 70},
+/* Node 159 */ {71, 72},
+/* Node 160 */ {73, 74},
+/* Node 161 */ {75, 76},
+/* Node 162 */ {77, 78},
+/* Node 163 */ {79, 80},
+/* Node 164 */ {81, 82},
+/* Node 165 */ {83, 84},
+/* Node 166 */ {86, 87},
+/* Node 167 */ {88, 89},
+/* Node 168 */ {90, 91},
+/* Node 169 */ {92, 93},
+/* Node 170 */ {94, 95},
+/* Node 171 */ {96, 97},
+/* Node 172 */ {98, 99},
+/* Node 173 */ {100, 101},
+/* Node 174 */ {102, 103},
+/* Node 175 */ {104, 105},
+/* Node 176 */ {106, 107},
+/* Node 177 */ {108, 109},
+/* Node 178 */ {110, 111},
+/* Node 179 */ {112, 113},
+/* Node 180 */ {114, 115},
+/* Node 181 */ {116, 117},
+/* Node 182 */ {118, 119},
+/* Node 183 */ {120, 121},
+/* Node 184 */ {122, 123},
+/* Node 185 */ {124, 125},
+/* Node 186 */ {126, 127},
+/* Node 187 */ {128, 129},
+/* Node 188 */ {130, 131},
+/* Node 189 */ {132, 133},
+/* Node 190 */ {134, 135},
+/* Node 191 */ {136, 137},
+/* Node 192 */ {138, 139},
+/* Node 193 */ {140, 141},
+/* Node 194 */ {142, 143},
+/* Node 195 */ {144, 145},
+/* Node 196 */ {146, 147},
+/* Node 197 */ {148, 149},
+/* Node 198 */ {150, 151},
+/* Node 199 */ {152, 153},
+/* Node 200 */ {154, 155},
+/* Node 201 */ {156, 157},
+/* Node 202 */ {158, 159},
+/* Node 203 */ {160, 161},
+/* Node 204 */ {162, 163},
+/* Node 205 */ {164, 165},
+/* Node 206 */ {166, 167},
+/* Node 207 */ {168, 169},
+/* Node 208 */ {171, 172},
+/* Node 209 */ {173, 174},
+/* Node 210 */ {175, 176},
+/* Node 211 */ {177, 178},
+/* Node 212 */ {179, 180},
+/* Node 213 */ {181, 182},
+/* Node 214 */ {183, 184},
+/* Node 215 */ {185, 186},
+/* Node 216 */ {187, 188},
+/* Node 217 */ {189, 190},
+/* Node 218 */ {191, 192},
+/* Node 219 */ {193, 194},
+/* Node 220 */ {195, 196},
+/* Node 221 */ {197, 198},
+/* Node 222 */ {199, 200},
+/* Node 223 */ {201, 202},
+/* Node 224 */ {203, 204},
+/* Node 225 */ {205, 206},
+/* Node 226 */ {207, 208},
+/* Node 227 */ {209, 210},
+/* Node 228 */ {211, 212},
+/* Node 229 */ {213, 214},
+/* Node 230 */ {215, 216},
+/* Node 231 */ {217, 218},
+/* Node 232 */ {219, 220},
+/* Node 233 */ {221, 222},
+/* Node 234 */ {223, 224},
+/* Node 235 */ {225, 226},
+/* Node 236 */ {227, 228},
+/* Node 237 */ {229, 230},
+/* Node 238 */ {231, 232},
+/* Node 239 */ {233, 234},
+/* Node 240 */ {235, 236},
+/* Node 241 */ {237, 238},
+/* Node 242 */ {239, 240},
+/* Node 243 */ {241, 242},
+/* Node 244 */ {243, 244},
+/* Node 245 */ {245, 246},
+/* Node 246 */ {247, 248},
+/* Node 247 */ {249, 250},
+/* Node 248 */ {251, 252},
+/* Node 249 */ {253, 254},
+/* Node 250 */ {2, 3},
+/* Node 251 */ {4, 13},
+/* Node 252 */ {14, 15},
+/* Node 253 */ {121, 1},
+/* Node 254 */ {122, 85}};
+
+const unsigned char data[] = {72, 60, 102, 102, 123, 15};
+const unsigned char udata[] = {0x01, 0x02, 0x03, 0x04, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x0d, 0x0e, 0x0f};
+
+unsigned char get_data(void)
+{
+  static int i;
+  return(data[i++]);
+}
+
+unsigned char get_data2(void)
+{
+  static int i;
+  return(data[i++]);
+}
+
+unsigned char huffman_recursive(struct cvu_huffman_state *state)
+{
+	unsigned char direction;
+	unsigned char ret;
+
+	state->buffer >>= 1;
+	if(state->bit == 8)
+	{
+		state->buffer = (state->input)();
+		state->bit = 0;
+	}
+	direction = state->buffer & 0x01;
+	state->bit++;
+
+	if(!direction)	/* Left */
+	{
+		if(state->current >= state->ls && state->current < state->rs)
+		{
+			ret = state->nodes[state->current].left;
+			state->current = state->root;
+		}
+		else
+		{
+			state->current = state->nodes[state->current].left;
+			ret = huffman_recursive(state);
+		}
+	}
+	else	/* Right */
+	{
+		if(state->current >= state->bs)
+		{
+			ret = state->nodes[state->current].right;
+			state->current = state->root;
+		}
+		else
+		{
+			state->current = state->nodes[state->current].right;
+			ret = huffman_recursive(state);
+		}
+	}
+
+	return(ret);
+}
+
+unsigned char huffman_iterative(struct cvu_huffman_state *state)
+{
+	unsigned char current;
+	unsigned char ret;
+
+	current = state->root;
+
+	for(;;)
+	{
+		state->buffer >>= 1;
+		if(state->bit == 8)
+		{
+			state->buffer = (state->input)();
+			state->bit = 0;
+		}
+		state->bit++;
+
+		if(!(state->buffer & 0x01))	/* Left */
+		{
+			if(current >= state->ls && current < state->rs)
+			{
+				ret = state->nodes[current].left;
+				break;
+			}
+
+			current = state->nodes[current].left;
+		}
+		else	/* Right */
+		{
+			if(current >= state->bs)
+			{
+				ret = state->nodes[current].right;
+				break;
+			}
+
+			current = state->nodes[current].right;
+		}
+	}
+	
+	return(ret);
+}
+
+void init_huffman(struct cvu_huffman_state *state, unsigned char (*input)(void), const struct cvu_huffman_node *tree, unsigned char root, unsigned char ls, unsigned char bs, unsigned char rs)
+{
+	state->input = input;
+	state->nodes = tree;
+	state->root = root;
+	state->ls = ls;
+	state->bs = bs;
+	state->rs = rs;
+	state->bit = 8;
+	state->current = state->root;
+}
+
+void testBug(void)
+{
+  unsigned char i;
+  struct cvu_huffman_state state;
+
+  init_huffman(&state, &get_data, huffman_tree, HUFFMAN_ROOT, HUFFMAN_LS, HUFFMAN_BS, HUFFMAN_RS);
+
+  for(i = 0; i < 15; i++)
+    ASSERT(huffman_recursive(&state) == udata[i]);
+
+  init_huffman(&state, &get_data2, huffman_tree, HUFFMAN_ROOT, HUFFMAN_LS, HUFFMAN_BS, HUFFMAN_RS);
+
+  for(i = 0; i < 15; i++)
+    ASSERT(huffman_iterative(&state) == udata[i]);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug3531687.c sdcc-3.2.0+dfsg/support/regression/tests/bug3531687.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug3531687.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug3531687.c	2012-06-10 12:32:06.000000000 +0000
@@ -0,0 +1,20 @@
+/*
+  bug3531687.c
+
+  The bug resulted in wrong comparisons of char to bool, casting the char operand to bool.
+*/
+
+#include <testfwk.h>
+
+int f(char a, char flag)
+{
+  if (a == (flag ? 1 : 0))
+    return 0;
+  return 1;
+}
+
+void
+testBug(void)
+{
+  ASSERT(f(2, 1));
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug608752.c sdcc-3.2.0+dfsg/support/regression/tests/bug608752.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug608752.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug608752.c	2012-02-22 14:45:17.000000000 +0000
@@ -2,7 +2,7 @@
  */
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #include <sdcc-lib.h>
 #else
 #define _STATMEM
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/bug663539.c sdcc-3.2.0+dfsg/support/regression/tests/bug663539.c
--- sdcc-3.1.0+dfsg/support/regression/tests/bug663539.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/bug663539.c	2012-02-22 14:45:17.000000000 +0000
@@ -4,7 +4,7 @@
 
 #include <testfwk.h>
 
-#if defined (SDCC_ds390) || defined (SDCC_mcs51)
+#if defined (__SDCC_ds390) || defined (__SDCC_mcs51)
   volatile __xdata __at 0x7654 char x;
 #endif
 
@@ -13,9 +13,10 @@
 {
   ASSERT (1);
 
-#if defined (SDCC_ds390) || defined (SDCC_mcs51)
+#if defined (__SDCC_ds390) || defined (__SDCC_mcs51)
   x;         //this should end the simulation
 
   while (1); //let the "watchdog" bite
 #endif
 }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/constantRange.c sdcc-3.2.0+dfsg/support/regression/tests/constantRange.c
--- sdcc-3.1.0+dfsg/support/regression/tests/constantRange.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/constantRange.c	2012-02-22 14:45:17.000000000 +0000
@@ -4,7 +4,7 @@
 
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_sdcc99
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/critical.c sdcc-3.2.0+dfsg/support/regression/tests/critical.c
--- sdcc-3.1.0+dfsg/support/regression/tests/critical.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/critical.c	2012-02-22 14:45:17.000000000 +0000
@@ -2,7 +2,7 @@
  */
 #include <testfwk.h>
 
-#if defined(SDCC_mcs51)
+#if defined(__SDCC_mcs51)
 #include <8052.h>
 
 typedef union
@@ -29,7 +29,7 @@
 void
 testCritical (void)
 {
-#if defined(SDCC_mcs51)
+#if defined(__SDCC_mcs51)
   big x;
   unsigned char i;
 
@@ -63,7 +63,7 @@
 #endif
 }
 
-#if defined(SDCC_mcs51)
+#if defined(__SDCC_mcs51)
 void
 T2_isr (void) __interrupt 5 __using 2
 {
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/cse.c sdcc-3.2.0+dfsg/support/regression/tests/cse.c
--- sdcc-3.1.0+dfsg/support/regression/tests/cse.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/cse.c	2012-05-18 17:36:32.000000000 +0000
@@ -0,0 +1,403 @@
+/* Test CSE - make sure CSE does not use stale data
+
+ */
+
+#include <testfwk.h>
+
+/* Need to locate a variable at an absolute address, but without */
+/* the linker's help. Pick an address and address space that is  */
+/* likely free based on cpu and compile model. If ABSADDR is     */
+/* left undefined, the tests that needs it will be skipped.      */
+#if defined(SDCC) || defined(__SDCC)
+#  if  defined(SDCC_mcs51) || defined(__SDCC_mcs51)
+#    if defined(SDCC_MODEL_LARGE) || defined(__SDCC_MODEL_LARGE)
+#      define ABSADDRSPACE __xdata
+#      define ABSADDR 0x8000
+#    else
+#      define ABSADDRSPACE __data
+#      define ABSADDR 0x70
+#    endif
+#  endif
+#  if defined(SDCC_ds390) || defined(__SDCC_ds390)
+#    define ABSADDRSPACE __xdata
+#    define ABSADDR 0x8000
+#  endif
+#  if defined(SDCC_hc08) || defined(__SDCC_s08)
+#    define ABSADDRSPACE __xdata
+#    define ABSADDR 0x7f00
+#  endif
+#  if defined(SDCC_z80) || defined(__SDCC_z80)
+#    define ABSADDRSPACE __xdata
+#    define ABSADDR 0x7f00
+#  endif
+#endif
+
+
+typedef struct {
+  unsigned char x1;
+  unsigned char x2;
+  unsigned char *p;
+} packet_t;
+
+unsigned char gx;
+unsigned char *px;
+
+packet_t gpacket;
+#ifdef ABSADDR
+# define apacket1 (*((ABSADDRSPACE packet_t *)ABSADDR))
+ABSADDRSPACE packet_t __at ABSADDR apacket2;
+#endif
+
+unsigned char a1,a2,a3,a4,a5;
+
+void
+setgx(unsigned char x)
+{
+  gx = x;
+}
+
+unsigned char 
+passthrough(unsigned char i)
+{
+  return i;
+}
+
+void
+zeroAndKeepAddress(unsigned char *p)
+{
+  px = p;
+  *p = 0;
+}
+
+void
+keepAddressFromPacket(packet_t *pp)
+{
+  px = pp->p;
+}
+
+void
+incIndirect(void)
+{
+  (*px)++;
+}
+
+packet_t *
+getaddrgpacket(void)
+{
+  return &gpacket;
+}
+
+void
+incx1(packet_t *pp)
+{
+  pp->x1++;
+}
+
+void
+incx2(packet_t *pp)
+{
+  pp->x2++;
+}
+
+void
+incgpx1(void)
+{
+  gpacket.x1++;
+}
+
+/* Be sneaky and define this later so that the addrtaken flag of gx is not  */
+/* set until after the test functions are compiled. Not important now, but  */
+/* this should remove the temptation to misuse reliance on addrtaken later. */
+unsigned char * getaddrgx(void);
+
+
+/* The ASSERT macro, since it branches based on a condition, will break up a */
+/* extended basic block. So to test for CSE problems within a single EBBlock */
+/* we will save intermediate results in global variables a1..a5 and do all   */
+/* of the ASSERTs at the end of the function. For some tests it may make     */
+/* more sense to use local variables, but I'm intentionally trying to keep   */
+/* register pressure low. */
+
+void
+test_FuncCall1(void)
+{
+  unsigned char lx;
+  
+  gx = 1;
+  setgx(2);
+  /* Cannot CSE global variable assignment across function call */
+  a1 = gx; /* ASSERT(gx == 2) */
+
+  lx = gx;
+  setgx(3);
+  /* Cannot CSE global variable read across function call */
+  a2 = gx; /* ASSERT(gx == 3) */
+  a3 = lx; /* ASSERT(lx == 2) */ 
+ 
+  lx = gx<<1;
+  a4 = lx; /* ASSERT(lx == 6) */
+  setgx(1);
+  lx = gx<<1;
+  /* Cannot CSE expression based on global variable across function call */
+  a5 = lx; /* ASSERT(lx == 2) */
+
+  ASSERT(a1 == 2);
+  ASSERT(a2 == 3);
+  ASSERT(a3 == 2);
+  ASSERT(a4 == 6);
+  ASSERT(a5 == 2);
+}
+
+void
+test_FuncCall2(void)
+{
+  unsigned char lx,ly;
+
+  lx = passthrough(2);
+  ly = lx<<1;
+  zeroAndKeepAddress(&lx);
+  
+  /* Cannot CSE local variable if a pointer to it was passed as parameter */
+  a1 = lx; /* ASSERT(lx == 0) */
+  
+  incIndirect();
+  /* Cannot CSE local variable across function call even if its address */
+  /* was not a parameter if its address was taken at all */ 
+  a2 = lx; /* ASSERT(lx == 1) */
+
+
+  a3 = ly; /* ASSERT(ly == 4) */
+  ly = lx<<1;
+  /* Cannot CSE expression based on local variable whose address was */
+  /* taken across function call */
+  a4 = ly; /* ASSERT(ly == 2) */
+
+  ASSERT(a1 == 0);
+  ASSERT(a2 == 1);
+  ASSERT(a3 == 4);
+  ASSERT(a4 == 2);
+}
+
+void
+test_FuncCall3(void)
+{
+  unsigned char lx,ly;
+
+  lx = passthrough(2);
+  ly = lx<<1;
+  px = &lx;
+  incIndirect();
+  /* Cannot CSE local variable across function call if address was taken at all */ 
+  a1 = lx; /* ASSERT(lx == 3) */
+
+  a2 = ly; /* ASSERT(ly == 4) */
+  ly = lx<<1;
+  /* Cannot CSE expression based on local variable whose address was */
+  /* taken across function call */
+  a3 = ly; /* ASSERT(ly == 6) */
+
+  ASSERT(a1 == 3);
+  ASSERT(a2 == 4);
+  ASSERT(a3 == 6);
+}
+
+void
+test_FuncCall4(void)
+{
+  packet_t packet1,packet2;
+  
+  packet1.p = &packet2.x1;
+  keepAddressFromPacket(&packet1);
+  packet2.x1 = 1;
+  packet2.x2 = 3;
+  incIndirect();
+  /* Cannot CSE members of local variables whose address was taken */
+  /* across function call */
+  a1 = packet2.x1; /* ASSERT(packet2.x1 == 2) */
+  a2 = packet2.x2; /* ASSERT(packet2.x2 == 3) */
+  
+  ASSERT(a1 == 2);
+  ASSERT(a2 == 3);
+}
+
+void
+test_FuncCall5(void)
+{
+  packet_t *pp;
+  unsigned char i;
+
+  gpacket.x1 = 1;
+  gpacket.x2 = 10;
+  pp = getaddrgpacket();
+  
+  i = pp->x1;
+  a1 = i; /* ASSERT(i == 1) */
+  incx1(pp);
+  i = pp->x1;
+  a2 = i; /* ASSERT(i == 2) */
+  i = pp->x2;
+  a3 = i; /* ASSERT(i == 10) */
+  incx2(pp);
+  i = pp->x2;
+  a4 = i; /* ASSERT(i == 11) */
+
+  ASSERT(a1 == 1);
+  ASSERT(a2 == 2);
+  ASSERT(a3 == 10);
+  ASSERT(a4 == 11);
+}
+
+void
+test_FuncCall6(void)
+{
+  unsigned char lx;
+
+  lx = passthrough(1);
+  gpacket.x1 = lx;
+  incgpx1();
+  lx = gpacket.x1;
+  ASSERT(lx == 2);
+}
+
+/* test_Struct1 through test_Struct4 are checking for cases in which */
+/* operand keys are erroneously equal or unassigned, causing CSE to  */
+/* use the wrong substitution. */
+void
+test_Struct1(void)
+{
+  packet_t packet;
+  unsigned char one;
+  unsigned char ten;
+  
+  one = passthrough(1);
+  ten = passthrough(10);
+  
+  gx = 100;
+  packet.x1 = one;
+  packet.x2 = ten;
+  setgx(packet.x2);
+  /* CSE of "apacket.x2" allowed above , but make sure it was x2 not x1*/
+  ASSERT(gx == 10);
+}
+
+void
+test_Struct2(void)
+{
+  unsigned char one;
+  unsigned char ten;
+  
+  one = passthrough(1);
+  ten = passthrough(10);
+  
+  gx = 100;
+  gpacket.x1 = one;
+  gpacket.x2 = ten;
+  setgx(gpacket.x2);
+  /* CSE of "apacket.x2" allowed above , but make sure it was x2 not x1*/
+  ASSERT(gx == 10);
+}
+
+void
+test_Struct3(void)
+{
+#ifdef ABSADDR
+  unsigned char one;
+  unsigned char ten;
+  
+  one = passthrough(1);
+  ten = passthrough(10);
+  apacket1.x2 = ten;
+  
+  setgx(100);
+  apacket1.x1 = one;
+  setgx(apacket1.x2);
+  /* CSE must not substitute x1 in place of x2 */
+  ASSERT(gx == 10);
+#endif
+}
+
+void
+test_Struct4(void)
+{
+#ifdef ABSADDR
+  unsigned char one;
+  unsigned char ten;
+  
+  one = passthrough(1);
+  ten = passthrough(10);
+  apacket2.x2 = ten;
+  
+  setgx(100);
+  apacket2.x1 = one;
+  setgx(apacket2.x2);
+  /* CSE must not substitute x1 in place of x2 */
+  ASSERT(gx == 10);
+#endif
+}
+
+void
+test_Struct5(void)
+{
+/* ASSERT(a2 == 2) currently fails in this test (2012-02-29) */
+#if 0
+  packet_t  *pp1;
+  packet_t  *pp2;
+  unsigned char lx;
+  
+  pp1 = getaddrgpacket();
+  pp2 = getaddrgpacket();
+
+  /* Since the declarations of pp1 and pp2 did not use the restrict */
+  /* qualifier, the compiler must assume they might point to the    */
+  /* same object and so should not CSE pointer dereferences across  */
+  /* other pointer dereferenced assingments of the same type. */
+  gpacket.x1 = 0;
+  pp1->x1 = 1;
+  lx = pp2->x1;
+  a1 = lx;
+  
+  pp1->x1 = 2;
+  lx = pp2->x1;
+  a2 = lx;
+  
+  pp2->x1 = 3;
+  lx = pp1->x1;
+  a3 = lx;
+
+  ASSERT(a1 == 1);
+  ASSERT(a2 == 2);
+  ASSERT(a3 == 3);
+#endif
+}
+
+void
+test_Global1(void)
+{
+/* ASSERT(a2 == 2) currently fails in this test (2012-02-29) */
+#if 0
+  unsigned char lx;
+  unsigned char *px;
+
+  /* Since the declaration of px did not use the restrict */
+  /* qualifier, the compiler must assume it might point   */
+  /* to a global variable and so should not CSE any       */
+  /* read of or expression using a global variable.       */
+  gx = 0;
+  px = getaddrgx();
+  lx = gx<<1;
+  a1 = lx;
+  *px = 1;
+  lx = gx<<1;
+  a2 = lx;
+  
+  ASSERT(a1 == 0);
+  ASSERT(a2 == 2);
+#endif
+}
+
+/* Hide taking the address of gx by defining this function last */
+unsigned char
+*getaddrgx(void)
+{
+  return &gx;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/float.c sdcc-3.2.0+dfsg/support/regression/tests/float.c
--- sdcc-3.1.0+dfsg/support/regression/tests/float.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/float.c	2012-02-22 14:45:17.000000000 +0000
@@ -21,10 +21,10 @@
   #define REVDIV 1
 #endif
 
-#ifdef SDCC_mcs51
+#ifdef __SDCC_mcs51
 #  define STORAGE __xdata
 #  define XDATA __xdata
-#elif SDCC_pic16
+#elif __SDCC_pic16
 #  define STORAGE __code
 #  define XDATA
 #else
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/float_single.c sdcc-3.2.0+dfsg/support/regression/tests/float_single.c
--- sdcc-3.1.0+dfsg/support/regression/tests/float_single.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/float_single.c	2012-05-18 16:46:53.000000000 +0000
@@ -25,9 +25,8 @@
 #define TOLERANCE (1e-5)
 
 /* now exceptions for targets/functions which would not pass */
-#if defined(SDCC_hc08)
+#if defined(__SDCC_hc08) || defined(__SDCC_s08)
 #   define EXPF_DISABLED  (1)
-#   define TANF_DISABLED  (1)
 #endif
 
 static float
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/float_trans.c sdcc-3.2.0+dfsg/support/regression/tests/float_trans.c
--- sdcc-3.1.0+dfsg/support/regression/tests/float_trans.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/float_trans.c	2012-02-22 14:45:17.000000000 +0000
@@ -6,7 +6,7 @@
 #include <testfwk.h>
 #include <math.h>
 
-#if defined (__STDC_IEC_559__) || defined (SDCC)
+#if defined (__STDC_IEC_559__) || defined (__SDCC)
 #define {func} 1
 #endif
 
@@ -22,7 +22,7 @@
 #endif
 #ifdef POWF
   /*  too big for small model */
-# ifndef SDCC_MODEL_SMALL
+# ifndef __SDCC_MODEL_SMALL
     ASSERT(fabsf (powf (1.5, 2.0) -   2.24999976) < 0.00001);
 # endif
 #endif
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/funptrs.c sdcc-3.2.0+dfsg/support/regression/tests/funptrs.c
--- sdcc-3.1.0+dfsg/support/regression/tests/funptrs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/funptrs.c	2012-02-22 14:45:17.000000000 +0000
@@ -1,19 +1,15 @@
 /** Function pointer tests.
 
-    type: BOOL, char, int, long
+    type: bool, char, int, long
  */
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_sdcc99
 #endif
 
 #include <stdbool.h>
 
-#ifndef BOOL
-#define BOOL	bool
-#endif
-
 #define TYPE_{type}
 
 /* Must use a typedef as there is no way of adding the code modifier
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/funsigned-char.c sdcc-3.2.0+dfsg/support/regression/tests/funsigned-char.c
--- sdcc-3.1.0+dfsg/support/regression/tests/funsigned-char.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/funsigned-char.c	2012-02-22 14:45:17.000000000 +0000
@@ -26,7 +26,7 @@
 void
 testBug(void)
 {
-#ifdef SDCC_CHAR_UNSIGNED
+#ifdef __SDCC_CHAR_UNSIGNED
   ASSERT(CHAR_MAX ==  255);
   ASSERT(CHAR_MIN ==    0);
 #else
@@ -40,7 +40,7 @@
   ASSERT(tst_schar_to_int() ==  127);
   ASSERT(glb_schar_to_int   ==  127);
 
-#ifdef SDCC_CHAR_UNSIGNED
+#ifdef __SDCC_CHAR_UNSIGNED
   ASSERT(tst_char_to_int() == -129);
   ASSERT(glb_char_to_int   == -129);
 #else
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000113-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000113-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000113-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000113-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   20000113-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct x { 
+  unsigned x1:1;
+  unsigned x2:2;
+  unsigned x3:3;
+};
+   
+void foobar (int x, int y, int z)
+{
+  struct x a = {x, y, z};
+  struct x b = {x, y, z};
+  struct x *c = &b;
+
+  c->x3 += (a.x2 - a.x1) * c->x2;
+  if (a.x1 != 1 || c->x3 != 5)
+    ASSERT (0);
+  return;
+}
+
+void
+testTortureExecute (void)
+{
+  foobar (1, 2, 3);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000121-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000121-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000121-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000121-1.c	2012-04-02 09:59:13.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   20000121-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+// Some ports do not support long long yet
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+void big(long long u) { }
+
+void doit(unsigned int a,unsigned int b,char *id)
+{
+  big(*id);
+  big(a);
+  big(b);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+  doit(1,1,"\n");
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000205-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000205-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000205-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000205-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+   20000205-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+static int f (int a)
+{
+  if (a == 0)
+    return 0;
+  do
+    if (a & 128)
+      return 1;
+  while (f (0));
+  return 0;
+}
+
+void
+testTortureExecute (void)
+{
+  if (f (~128))
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000217-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000217-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000217-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000217-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   20000217-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+unsigned short int showbug(unsigned short int *a, unsigned short int *b)
+{
+        *a += *b -8;
+        return (*a >= 8);
+}
+
+void
+testTortureExecute (void)
+{
+        unsigned short int x = 0;
+        unsigned short int y = 10;
+
+        if (showbug(&x, &y) != 0)
+	  ASSERT (0);
+
+	return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000224-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000224-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000224-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000224-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+   20000224-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int loop_1 = 100;
+int loop_2 = 7;
+int flag = 0;
+
+int test (void)
+{
+    int i;
+    int counter  = 0;
+
+    while (loop_1 > counter) {
+        if (flag & 1) {
+            for (i = 0; i < loop_2; i++) {
+                counter++;
+            }
+        }
+        flag++;
+    }
+    return 1;
+}
+
+void
+testTortureExecute (void)
+{
+    if (test () != 1)
+      ASSERT (0);
+    
+    return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000225-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000225-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000225-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000225-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,31 @@
+/*
+   20000225-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+    int nResult;
+    int b=0;
+    int i = -1;
+
+    do
+    {
+     if (b!=0) {
+       ASSERT (0);
+       nResult=1;
+     } else {
+      nResult=0;
+     }
+     i++;
+     b=(i+2)*4;
+    } while (i < 0);
+    return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000227-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000227-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000227-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000227-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,27 @@
+/*
+   20000227-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+static const unsigned char f[] = "\0\377";
+static const unsigned char g[] = "\0�";
+
+void
+testTortureExecute (void)
+{
+  if (sizeof f != 3 || sizeof g != 3)
+    ASSERT (0);
+  if (f[0] != g[0])
+    ASSERT (0);
+  if (f[1] != g[1])
+    ASSERT (0);
+  if (f[2] != g[2])
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000313-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000313-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000313-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000313-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   20000227-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+unsigned int buggy (unsigned int *param)
+{
+  unsigned int accu, zero = 0, borrow;
+  accu    = - *param;
+  borrow  = - (accu > zero);
+  *param += accu;
+  return borrow;
+}
+
+void
+testTortureExecute (void)
+{
+  unsigned int param  = 1;
+  unsigned int borrow = buggy (&param);
+
+  if (param != 0)
+    ASSERT (0);
+  if (borrow + 1 != 0)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000314-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000314-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000314-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000314-1.c	2012-02-28 10:25:29.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   20000313-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 127
+#endif
+
+void
+testTortureExecute (void)
+{
+  long winds = 0;
+
+  while (winds != 0)
+    {
+      if (*(char *) winds)
+	break;
+    }
+
+  if (winds == 0 || winds != 0 || *(char *) winds)
+    return;
+
+  ASSERT (0);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000314-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000314-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000314-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000314-2.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+   20000314-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// sdcc cannot return long long yet.
+#if 0
+
+typedef unsigned long long uint64;
+const uint64 bigconst = 1ULL << 34;
+
+int a = 1;
+
+static
+uint64 getmask(void)
+{
+    if (a)
+      return bigconst;
+    else
+      return 0;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+    uint64 f = getmask();
+    if (sizeof (long long) == 8
+	&& f != bigconst) ASSERT (0);
+    return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000314-3.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000314-3.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000314-3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000314-3.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,49 @@
+/*
+   20000314-3.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+static char arg0[] = "arg0";
+static char arg1[] = "arg1";
+
+static void attr_rtx		(char *, char *);
+static char *attr_string        (char *);
+static void attr_eq		(char *, char *);
+
+static void 
+attr_rtx (char *varg0, char *varg1)
+{
+  if (varg0 != arg0)
+    ASSERT (0);
+
+  if (varg1 != arg1)
+    ASSERT (0);
+
+  return;
+}
+
+static void 
+attr_eq (char *name, char *value)
+{
+  return attr_rtx (attr_string (name),
+		   attr_string (value));
+}
+
+static char *
+attr_string (char *str)
+{
+  return str;
+}
+
+void
+testTortureExecute (void)
+{
+  attr_eq (arg0, arg1);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000402-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000402-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000402-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000402-1.c	2012-03-30 09:18:32.000000000 +0000
@@ -0,0 +1,47 @@
+/*
+   20000402-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <limits.h>
+
+// TODO: Enable when sdcc supports long long constants!
+/*#if ULONG_LONG_MAX != 18446744073709551615ull && ULONG_MAX != 18446744073709551615ull
+void
+testTortureExecute (void) { return; }
+#else
+#if ULONG_MAX != 18446744073709551615ull
+typedef unsigned long long ull;
+#else
+typedef unsigned long ull;
+#endif
+
+#include <stdio.h>
+
+void checkit(int);*/
+
+void
+testTortureExecute (void) {
+    /*const ull a = 0x1400000000ULL;
+    const ull b = 0x80000000ULL;
+    const ull c = a/b;
+    const ull d = 0x1400000000ULL / 0x80000000ULL;
+
+    checkit ((int) c);
+    checkit ((int) d);
+
+    return;*/
+}
+
+/*void checkit (int a)
+{
+  if (a != 40)
+    ASSERT (0);
+}
+#endif*/
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000403-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000403-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000403-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000403-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+   20000403-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+extern unsigned long aa[], bb[];
+
+int seqgt (unsigned long a, unsigned short win, unsigned long b);
+
+int seqgt2 (unsigned long a, unsigned short win, unsigned long b);
+
+void
+testTortureExecute (void)
+{
+  if (! seqgt (*aa, 0x1000, *bb) || ! seqgt2 (*aa, 0x1000, *bb))
+    ASSERT (0);
+
+  return;
+}
+
+int
+seqgt (unsigned long a, unsigned short win, unsigned long b)
+{
+  return (long) ((a + win) - b) > 0;
+}
+
+int
+seqgt2 (unsigned long a, unsigned short win, unsigned long b)
+{
+  long l = ((a + win) - b);
+  return l > 0;
+}
+
+unsigned long aa[] = { (1UL << (sizeof (long) * 8 - 1)) - 0xfff };
+unsigned long bb[] = { (1UL << (sizeof (long) * 8 - 1)) - 0xfff };
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   20000412-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#if 0
+short int i = -1;
+const char * const wordlist[207];
+
+const char * const *
+foo(void)
+{
+  register const char * const *wordptr = &wordlist[207u + i];
+  return wordptr;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  if (foo() != &wordlist[206])
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-2.c	2012-05-18 16:46:53.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   20000412-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#if !(defined (__SDCC_mcs51) || defined (__SDCC_hc08) || defined (__SDCC_s08) || defined (__SDCC_ds390))
+int f(int a,int *y)
+{
+  int x = a;
+
+  if (a==0)
+    return *y;
+
+  return f(a-1,&x);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__SDCC_mcs51) || defined (__SDCC_hc08) || defined (__SDCC_s08) || defined (__SDCC_ds390))
+  if (f (10, (int *) 0) != 1)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-3.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-3.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-3.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,52 @@
+/*
+   20000412-3.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when struct passing is supported.
+#if 0
+typedef struct {
+  char y;
+  char x[32];
+} X;
+
+int f(X x, X y);
+
+int z (void)
+{
+  X xxx;
+  xxx.x[0] =
+  xxx.x[31] = '0';
+  xxx.y = 0xf;
+  return f (xxx, xxx);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  int val;
+
+  val = z ();
+  if (val != 0x60)
+    ASSERT (0);
+  return;
+#endif
+}
+
+#if 0
+int f(X x, X y)
+{
+  if (x.y != y.y)
+    return 'F';
+
+  return x.x[0] + y.x[0];
+}
+#endif
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-4.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-4.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-4.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-4.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+   20000412-4.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+  void f(int i, int j, int radius, int width, int N)
+  {
+    const int diff   = i-radius;
+    const int lowk   = (diff>0 ? diff : 0 );
+    int k;
+  
+    for(k=lowk; k<= 2; k++){
+      int idx = ((k-i+radius)*width-j+radius);
+      if (idx < 0)
+	ASSERT (0);
+    }
+  
+    for(k=lowk; k<= 2; k++);
+  }
+  
+  
+  void
+  testTortureExecute (void)
+  {
+    int exc_rad=2;
+    int N=8;
+    int i;
+    for(i=1; i<4; i++)
+      f(i,1,exc_rad,2*exc_rad + 1, N);
+    return;
+  } 
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-5.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-5.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-5.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-5.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,22 @@
+/*
+   20000412-5.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void) {
+    struct {
+	int node;
+	int type;
+    } lastglob[1] = { { 0   , 1  } };
+
+    if (lastglob[0].node != 0 || lastglob[0].type != 1)
+      ASSERT (0);
+    return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-6.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-6.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-6.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000412-6.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   20000412-6.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+unsigned bug (unsigned short value, unsigned short *buffer,
+              unsigned short *bufend);
+
+unsigned short buf[] = {1, 4, 16, 64, 256};
+
+void
+testTortureExecute (void)
+{
+  if (bug (512, buf, buf + 3) != 491)
+    ASSERT (0);
+
+  return;
+}
+
+unsigned
+bug (unsigned short value, unsigned short *buffer, unsigned short *bufend)
+{
+  unsigned short *tmp;
+
+  for (tmp = buffer; tmp < bufend; tmp++)
+    value -= *tmp;
+
+  return value;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000419-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000419-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000419-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000419-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+   20000419-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports passing of structs!
+#if 0
+struct foo { int a, b, c; };
+
+void
+brother (int a, int b, int c)
+{
+  if (a)
+    ASSERT (0);
+}
+
+void
+sister (struct foo f, int b, int c)
+{
+  brother ((f.b == b), b, c);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct foo f = { 7, 8, 9 };
+  sister (f, 1, 2);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000422-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000422-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000422-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000422-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,50 @@
+/*
+   20000422-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int ops[13] =
+{
+  11, 12, 46, 3, 2, 2, 3, 2, 1, 3, 2, 1, 2
+};
+
+int correct[13] = 
+{
+  46, 12, 11, 3, 3, 3, 2, 2, 2, 2, 2, 1, 1
+};
+
+int num = 13;
+
+void
+testTortureExecute (void)
+{
+  int i;
+
+  for (i = 0; i < num; i++)
+    {
+      int j;
+
+      for (j = num - 1; j > i; j--)
+        {
+          if (ops[j-1] < ops[j])
+            {
+              int op = ops[j];
+              ops[j] = ops[j-1];
+              ops[j-1] = op;
+            }
+        }
+    }
+
+
+  for (i = 0; i < num; i++)
+    if (ops[i] != correct[i])
+      ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000503-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000503-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000503-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000503-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+   20000503-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+unsigned long
+sub (int a)
+{
+  return ((0 > a - 2) ? 0 : a - 2) * sizeof (long);
+}
+
+void
+testTortureExecute (void)
+{
+  if (sub (0) != 0)
+    ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000511-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000511-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000511-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000511-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+   20000511-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void f (int value, int expect)
+{
+  if (value != expect)
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  int a = 7, b = 6, c = 4, d = 7, e = 2;
+	
+  f (a||b%c,   1);
+  f (a?b%c:0,  2);
+  f (a=b%c,    2);
+  f (a*=b%c,   4);
+  f (a/=b%c,   2);
+  f (a%=b%c,   0);
+  f (a+=b%c,   2);
+  f (d||c&&e,  1);
+  f (d?c&&e:0, 1);
+  f (d=c&&e,   1);
+  f (d*=c&&e,  1);
+  f (d%=c&&e,  0);
+  f (d+=c&&e,  1);
+  f (d-=c&&e,  0);
+  f (d||c||e,  1);
+  f (d?c||e:0, 0);
+  f (d=c||e,   1);
+  f (d*=c||e,  1);
+  f (d%=c||e,  0);
+  f (d+=c||e,  1);
+  f (d-=c||e,  0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000519-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000519-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000519-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000519-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+   20000519-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <stdarg.h>
+
+int
+bar (int a, va_list ap)
+{
+  int b;
+
+  do
+    b = va_arg (ap, int);
+  while (b > 10);
+
+  return a + b;
+}
+
+int
+foo (int a, ...)
+{
+  va_list ap;
+
+  va_start (ap, a);
+  return bar (a, ap);
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo (1, 2, 3) != 3)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000519-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000519-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000519-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000519-2.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+   20000519-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+long x = -1L;
+
+void
+testTortureExecute (void)
+{
+  long b = (x != -1L);
+
+  if (b)
+    ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000523-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000523-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000523-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000523-1.c	2012-04-01 11:33:10.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+   20000523-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+// Todo: Enable when sdcc supports long long constants!
+#if 0
+  long long   x;
+  int         n;
+
+  if (sizeof (long long) < 8)
+    return;
+  
+  n = 9;
+  x = (((long long) n) << 55) / 0xff; 
+
+  if (x == 0)
+    ASSERT (0);
+
+  x = (((long long) 9) << 55) / 0xff;
+
+  if (x == 0)
+    ASSERT (0);
+
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000528-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000528-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000528-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000528-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+   20000528-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Copyright (C) 2000  Free Software Foundation  */
+/* Contributed by Alexandre Oliva <aoliva@cygnus.com> */
+
+unsigned long l = (unsigned long)-2;
+unsigned short s;
+
+void
+testTortureExecute (void) {
+  long t = l;
+  s = t;
+  if (s != (unsigned short)-2)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000603-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000603-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000603-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000603-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   20000603-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#endif
+
+/* It is not clear whether this test is conforming.  See DR#236
+   http://www.open-std.org/jtc1/sc22/wg14/www/docs/dr_236.htm.  However,
+   there seems to be consensus that the presence of a union to aggregate
+   struct s1 and struct s2 should make it conforming.  */
+struct s1 { double d; };
+struct s2 { double d; };
+union u { struct s1 x; struct s2 y; };
+
+double f(struct s1 *a, struct s2 *b)
+{
+  a->d = 1.0;
+  return b->d + 1.0;
+}
+
+void
+testTortureExecute (void)
+{
+  union u a;
+  a.x.d = 0.0;
+  if (f (&a.x, &a.y) != 2.0)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000605-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000605-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000605-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000605-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,60 @@
+/*
+   20000605-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+typedef struct _RenderInfo RenderInfo;
+struct _RenderInfo
+{
+    int y;
+    float scaley;
+    int src_y;
+};
+
+static void bar(void) { }
+
+static int
+render_image_rgb_a (RenderInfo * info)
+{
+  int y, ye;
+  float error;
+  float step;
+
+  y = info->y;
+  ye = 256;
+
+  step = 1.0 / info->scaley;
+
+  error = y * step;
+  error -= ((int) error) - step;
+
+  for (; y < ye; y++) {
+      if (error >= 1.0) {
+	  info->src_y += (int) error;
+	  error -= (int) error;
+	  bar();
+      }
+      error += step;
+  }
+  return info->src_y;
+}
+
+void
+testTortureExecute (void)
+{
+    RenderInfo info;
+
+    info.y = 0;
+    info.src_y = 0;
+    info.scaley = 1.0;
+
+    if (render_image_rgb_a(&info) != 256)
+       ASSERT (0);
+    return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000605-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000605-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000605-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000605-2.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   20000605-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct F { int i; };
+
+void f1(struct F *x, struct F *y)
+{
+  int timeout = 0;
+  for (; ((const struct F*)x)->i < y->i ; x->i++)
+    if (++timeout > 5)
+      ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  struct F x, y;
+  x.i = 0;
+  y.i = 1;
+  f1 (&x, &y);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000605-3.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000605-3.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000605-3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000605-3.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   20000605-3.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct F { int x; int y; };
+
+void
+testTortureExecute (void)
+{
+  int timeout = 0;
+  int x = 0;
+  while (1)
+    {
+      const struct F i = { x++, };
+      if (i.x > 0)
+	break;
+      if (++timeout > 5)
+	goto die;
+    }
+  return;
+ die:
+  ASSERT (0);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000622-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000622-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000622-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000622-1.c	2012-05-05 14:39:36.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   20000622-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#pragma disable_warning 88
+#endif
+
+long foo(long a, long b, long c)
+{
+  if (a != 12 || b != 1 || c != 11)
+    ASSERT (0);
+  return 0;
+}
+long bar (long a, long b)
+{
+  return b;
+}
+void baz (long a, long b, void *c)
+{
+  long d;
+  d = (long)c;
+  foo(d, bar (a, 1), b);
+}
+void
+testTortureExecute (void)
+{
+  baz (10, 11, (void *)12);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000703-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000703-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000703-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000703-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,51 @@
+/*
+   20000703-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <string.h>
+
+struct baz 
+{
+  char a[17];
+  char b[3];
+  unsigned int c;
+  unsigned int d;
+};
+
+void foo(struct baz *p, unsigned int c, unsigned int d)
+{
+  memcpy (p->b, "abc", 3);
+  p->c = c;
+  p->d = d;
+}
+
+void bar(struct baz *p, unsigned int c, unsigned int d)
+{
+  { void *s = (p);
+     memset (s, '\0', sizeof (struct baz));
+     s; };
+  memcpy (p->a, "01234567890123456", 17);
+  memcpy (p->b, "abc", 3);
+  p->c = c;
+  p->d = d;
+}
+
+void
+testTortureExecute (void)
+{
+  struct baz p;
+  foo(&p, 71, 18);
+  if (p.c != 71 || p.d != 18)
+    ASSERT (0);
+  bar(&p, 59, 26);
+  if (p.c != 59 || p.d != 26)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000706-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000706-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000706-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000706-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+   20000706-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable once sdcc supports passing of struct as parameter!
+#if 0
+struct baz {
+  int a, b, c, d, e;
+};
+
+void bar(struct baz *x, int f, int g, int h, int i, int j)
+{
+  if (x->a != 1 || x->b != 2 || x->c != 3 || x->d != 4 || x->e != 5 ||
+      f != 6 || g != 7 || h != 8 || i != 9 || j != 10)
+    ASSERT (0);
+}
+
+void foo(struct baz x, char **y)
+{
+  bar(&x,6,7,8,9,10);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct baz x;
+
+  x.a = 1;
+  x.b = 2;
+  x.c = 3;
+  x.d = 4;
+  x.e = 5;
+  foo(x,(char **)0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000706-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000706-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000706-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000706-2.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+   20000706-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#if 0
+struct baz {
+  int a, b, c, d, e;
+};
+
+void bar(struct baz *x, int f, int g, int h, int i, int j)
+{
+  if (x->a != 1 || x->b != 2 || x->c != 3 || x->d != 4 || x->e != 5 ||
+      f != 6 || g != 7 || h != 8 || i != 9 || j != 10)
+    ASSERT(0);
+}
+
+void foo(char *z, struct baz x, char *y)
+{
+  bar(&x,6,7,8,9,10);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct baz x;
+
+  x.a = 1;
+  x.b = 2;
+  x.c = 3;
+  x.d = 4;
+  x.e = 5;
+  foo((char *)0,x,(char *)0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000706-3.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000706-3.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000706-3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000706-3.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+   20000706-3.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int c;
+
+void baz(int *p)
+{
+  c = *p;
+}
+
+void bar(int b)
+{
+  if (c != 1 || b != 2)
+    ASSERT(0);
+}
+
+void foo(int a, int b)
+{
+  baz(&a);
+  bar(b);
+}
+
+void
+testTortureExecute (void)
+{
+  foo(1, 2);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000706-4.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000706-4.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000706-4.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000706-4.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,31 @@
+/*
+   20000706-4.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int *c;
+
+void bar(int b)
+{
+  if (*c != 1 || b != 2)
+    ASSERT(0);
+}
+
+void foo(int a, int b)
+{
+  c = &a;
+  bar(b);
+}
+
+void
+testTortureExecute (void)
+{
+  foo(1, 2);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000706-5.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000706-5.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000706-5.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000706-5.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+   20000706-5.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports.
+#if 0
+struct baz { int a, b, c; };
+
+struct baz *c;
+
+void bar(int b)
+{
+  if (c->a != 1 || c->b != 2 || c->c != 3 || b != 4)
+    ASSERT(0);
+}
+
+void foo(struct baz a, int b)
+{
+  c = &a;
+  bar(b);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct baz a;
+  a.a = 1;
+  a.b = 2;
+  a.c = 3;
+  foo(a, 4);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000707-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000707-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000707-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000707-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   20000707-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo: Enable when sdcc supports struct
+#if 0
+struct baz {
+  int a, b, c;
+};
+
+void
+foo (int a, int b, int c)
+{
+  if (a != 4)
+    ASSERT (0);
+}
+
+void
+bar (struct baz x, int b, int c)
+{
+  foo (x.b, b, c);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct baz x = { 3, 4, 5 };
+  bar (x, 1, 2);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000715-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000715-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000715-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000715-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,126 @@
+/*
+   20000715-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+test1(void)
+{
+  int x = 3, y = 2;
+
+  if ((x < y ? x++ : y++) != 2)
+    ASSERT (0);
+
+  if (x != 3)
+    ASSERT (0);
+
+  if (y != 3)
+    ASSERT (0);
+}
+
+void
+test2(void)
+{
+  int x = 3, y = 2, z;
+
+  z = (x < y) ? x++ : y++;
+  if (z != 2)
+    ASSERT (0);
+
+  if (x != 3)
+    ASSERT (0);
+
+  if (y != 3)
+    ASSERT (0);
+}
+
+void
+test3(void)
+{
+  int x = 3, y = 2;
+  int xx = 3, yy = 2;
+
+  if ((xx < yy ? x++ : y++) != 2)
+    ASSERT (0);
+
+  if (x != 3)
+    ASSERT (0);
+
+  if (y != 3)
+    ASSERT (0);
+}
+
+int x, y;
+
+static void
+init_xy(void)
+{
+  x = 3;
+  y = 2;
+}
+
+void
+test4(void)
+{
+  init_xy();
+  if ((x < y ? x++ : y++) != 2)
+    ASSERT (0);
+
+  if (x != 3)
+    ASSERT (0);
+
+  if (y != 3)
+    ASSERT (0);
+}
+
+void
+test5(void)
+{
+  int z;
+
+  init_xy();
+  z = (x < y) ? x++ : y++;
+  if (z != 2)
+    ASSERT (0);
+
+  if (x != 3)
+    ASSERT (0);
+
+  if (y != 3)
+    ASSERT (0);
+}
+
+void
+test6(void)
+{
+  int xx = 3, yy = 2;
+  int z;
+
+  init_xy();
+  z = (xx < y) ? x++ : y++;
+  if (z != 2)
+    ASSERT (0);
+
+  if (x != 3)
+    ASSERT (0);
+
+  if (y != 3)
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void){
+  test1 ();
+  test2 ();
+  test3 ();
+  test4 ();
+  test5 ();
+  test6 ();
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000715-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000715-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000715-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000715-2.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+   20000715-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+unsigned int foo(unsigned int a)
+{
+  return ((unsigned char)(a + 1)) * 4;
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo((unsigned char)~0))
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000717-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000717-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000717-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000717-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+   20000717-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo: Enable when sdcc supports struct
+#if 0
+typedef struct trio { int a, b, c; } trio;
+
+int
+bar (int i, trio t)
+{
+  if (t.a == t.b || t.a == t.c)
+    ASSERT (0);
+}
+
+int
+foo (trio t, int i)
+{
+  return bar (i, t);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  trio t = { 1, 2, 3 };
+
+  foo (t, 4);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000717-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000717-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000717-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000717-2.c	2012-03-30 09:18:32.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+   20000717-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports long long constants!
+#if 0
+static void
+compare (long long foo)
+{
+  if (foo < 4294967297LL)
+    ASSERT (0);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  compare (8589934591LL);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000717-3.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000717-3.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000717-3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000717-3.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+   20000717-3.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int c = -1;
+
+foo (int *p)
+{
+  int x;
+  int a;
+
+  a = p[0];
+  x = a + 5;
+  a = c;
+  p[0] = x - 15;
+  return a;
+}
+
+void
+testTortureExecute (void)
+{
+   int b = 1;
+   int a = foo(&b);
+
+   if (a != -1 || b != (1 + 5 - 15))
+     ASSERT (0);
+
+   return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000717-4.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000717-4.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000717-4.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000717-4.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,37 @@
+/*
+   20000717-4.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Extracted from gas.  Incorrectly generated non-pic code at -O0 for
+   IA-64, which produces linker errors on some operating systems.  */
+
+struct
+{
+  int offset;
+  struct slot
+  {
+    int field[6];
+  }
+  slot[4];
+} s;
+
+int
+x ()
+{
+  int toggle = 0;
+  int r = s.slot[0].field[!toggle];
+  return r;
+}
+
+void
+testTortureExecute (void)
+{
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000717-5.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000717-5.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000717-5.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000717-5.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   20000717-5.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports struct!
+#if 0
+typedef struct trio { int a, b, c; } trio;
+
+int
+bar (int i, int j, int k, trio t)
+{
+  if (t.a != 1 || t.b != 2 || t.c != 3 ||
+      i != 4 || j != 5 || k != 6)
+    ASSERT (0);
+}
+
+int
+foo (trio t, int i, int j, int k)
+{
+  return bar (i, j, k, t);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  trio t = { 1, 2, 3 };
+
+  foo (t, 4, 5, 6);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000722-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000722-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000722-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000722-1.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+   20000722-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable whens dcc supports this!
+#if 0
+struct s { char *p; int t; };
+
+extern void bar (void);
+extern void foo (struct s *);
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  bar ();
+  bar ();
+  return;
+#endif
+}
+
+#if 0
+void 
+bar (void)
+{
+  foo (& (struct s) { "hi", 1 });
+}
+#endif
+
+#if 0
+void foo (struct s *p)
+{
+  if (p->t != 1)
+    ASSERT (0);
+  p->t = 2;
+}
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000726-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000726-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000726-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000726-1.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+   20000726-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void adjust_xy (short *, short *);
+
+struct adjust_template
+{
+  short kx_x;
+  short kx_y;
+  short kx;
+  short kz;
+};
+
+static struct adjust_template adjust = {0, 0, 1, 1};
+
+void
+testTortureExecute (void)
+{
+  short x = 1, y = 1;
+
+  adjust_xy (&x, &y);
+
+  if (x != 1)
+    ASSERT (0);
+
+  return;
+}
+
+void
+adjust_xy (short *x, short *y)
+{
+  *x = adjust.kx_x * *x + adjust.kx_y * *y + adjust.kx;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000731-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000731-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000731-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000731-1.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   20000731-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#endif
+
+double
+foo (void)
+{
+  return 0.0;
+}
+
+void
+do_sibcall (void)
+{
+  (void) foo ();
+}
+
+void
+testTortureExecute (void)
+{
+   double x;
+
+   for (x = 0; x < 20; x++)
+      do_sibcall ();
+   if (!(x >= 10))
+      ASSERT (0);
+   return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000731-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000731-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000731-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000731-2.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,27 @@
+/*
+   20000731-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+    int i = 1;
+    int j = 0;
+
+    while (i != 1024 || j <= 0) {
+        i *= 2;
+        ++ j;
+    }
+
+    if (j != 10)
+      ASSERT (0);
+
+    return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000801-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000801-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000801-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000801-1.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,48 @@
+/*
+   20000801-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+foo (char *bp, unsigned n)
+{
+  register char c;
+  register char *ep = bp + n;
+  register char *sp;
+
+  while (bp < ep)
+    {
+      sp = bp + 3;
+      c = *sp;
+      *sp = *bp;
+      *bp++ = c;
+      sp = bp + 1;
+      c = *sp;
+      *sp = *bp;
+      *bp++ = c;
+      bp += 2;
+    }
+}
+
+void
+testTortureExecute (void)
+{
+  int one = 1;
+
+  if (sizeof(int) != 4 * sizeof(char))
+    return;
+
+  foo ((char *)&one, sizeof(one));
+  foo ((char *)&one, sizeof(one));
+
+  if (one != 1)
+    ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000801-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000801-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000801-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000801-2.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,50 @@
+/*
+   20000801-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int bar(void);
+int baz(void);
+
+struct foo {
+  struct foo *next;
+};
+
+struct foo *test(struct foo *node)
+{
+  while (node) {
+    if (bar() && !baz())
+      break;
+    node = node->next;
+  }
+  return node;
+}
+
+int bar (void)
+{
+  return 0;
+}
+
+int baz (void)
+{
+  return 0;
+}
+
+void
+testTortureExecute (void)
+{
+  struct foo a, b, *c;
+
+  a.next = &b;
+  b.next = (struct foo *)0;
+  c = test (&a);
+  if (c)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000801-4.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000801-4.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000801-4.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000801-4.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+   20000801-4.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Origin: PR c/128 from Martin Sebor <sebor@roguewave.com>, adapted
+   as a testcase by Joseph Myers <jsm28@cam.ac.uk>.
+*/
+/* Character arrays initialized by a string literal must have
+   uninitialized elements zeroed.  This isn't clear in the 1990
+   standard, but was fixed in TC2 and C99; see DRs #060, #092.
+*/
+
+int
+foo (void)
+{
+  char s[2] = "";
+  return 0 == s[1];
+}
+
+char *t;
+
+void
+testTortureExecute (void)
+{
+#if 0
+  {
+    char s[] = "x";
+    t = s;
+  }
+  if (foo ())
+    return;
+  else
+    ASSERT (0);
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000815-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000815-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000815-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000815-1.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,87 @@
+/*
+   20000815-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+#ifndef __SDCC_mcs51
+#include <string.h>
+
+struct table_elt
+{
+  void *exp;
+  struct table_elt *next_same_hash;
+  struct table_elt *prev_same_hash;
+  struct table_elt *next_same_value;
+  struct table_elt *prev_same_value;
+  struct table_elt *first_same_value;
+  struct table_elt *related_value;
+  int cost;
+  int mode;
+  char in_memory;
+  char in_struct;
+  char is_const;
+  char flag;
+};
+
+struct write_data
+{
+  int sp : 1;			 
+  int var : 1;			 
+  int nonscalar : 1;		 
+  int all : 1;			 
+};
+
+int cse_rtx_addr_varies_p(void *);
+void remove_from_table(struct table_elt *, int);
+static struct table_elt *table[32];
+
+void
+invalidate_memory (struct write_data *writes)
+{
+  register int i;
+  register struct table_elt *p, *next;
+  int all = writes->all;
+  int nonscalar = writes->nonscalar;
+
+  for (i = 0; i < 31; i++)
+    for (p = table[i]; p; p = next)
+      {
+	next = p->next_same_hash;
+	if (p->in_memory
+	    && (all
+		|| (nonscalar && p->in_struct)
+		|| cse_rtx_addr_varies_p (p->exp)))
+	  remove_from_table (p, i);
+      }
+}
+
+int cse_rtx_addr_varies_p(void *x) { return 0; }
+void remove_from_table(struct table_elt *x, int y) { ASSERT (0); }
+#endif
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_mcs51
+  struct write_data writes;
+  struct table_elt elt;
+
+  memset(&elt, 0, sizeof(elt));
+  elt.in_memory = 1;
+  table[0] = &elt;
+
+  memset(&writes, 0, sizeof(writes));
+  writes.var = 1;
+  writes.nonscalar = 1;
+
+  invalidate_memory(&writes);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000818-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000818-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000818-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000818-1.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,72 @@
+/*
+   20000818-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+/* Copyright (C) 2000  Free Software Foundation.
+
+   by Manfred Hollstein <manfredh@redhat.com>  */
+
+void *temporary_obstack;
+
+static int input (void);
+static int ISALNUM (int ch);
+static void obstack_1grow (void **ptr, int ch);
+
+int yylex (void);
+
+void
+testTortureExecute (void)
+{
+  int ch = yylex ();
+
+  return;
+}
+
+int yylex (void)
+{
+  int ch;
+
+#ifndef WORK_AROUND
+  for (;;)
+    {
+      ch = input ();
+      if (ISALNUM (ch))
+        obstack_1grow (&temporary_obstack, ch);
+      else if (ch != '_')
+        break;
+    }
+#else
+  do
+    {
+      ch = input ();
+      if (ISALNUM (ch))
+        obstack_1grow (&temporary_obstack, ch);
+    } while (ch == '_');
+#endif
+
+  return ch;
+}
+
+static int input (void)
+{
+  return 0;
+}
+
+static int ISALNUM (int ch)
+{
+  return ((ch >= 'A' && ch <= 'Z')
+	  || (ch >= 'a' && ch <= 'z')
+	  || (ch >= '0' && ch <= '0'));
+}
+
+static void obstack_1grow (void **ptr, int ch)
+{
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000910-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000910-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20000910-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20000910-2.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   20000010-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Copyright (C) 2000  Free Software Foundation  */
+/* by Alexandre Oliva <aoliva@redhat.com> */
+
+#include <stdlib.h>
+#include <string.h>
+
+const char *list[] = { "*", "e" };
+
+static int bar (const char *fmt) {
+  return (strchr (fmt, '*') != 0);
+}
+
+static void foo () {
+  int i;
+  for (i = 0; i < sizeof (list) / sizeof (*list); i++) {
+    const char *fmt = list[i];
+    if (bar (fmt))
+      continue;
+    if (i == 0)
+      ASSERT (0);
+    else
+      return;
+  }
+}
+
+void
+testTortureExecute (void) {
+  foo ();
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001009-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001009-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001009-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001009-1.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+   20001009-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int a,b;
+
+void
+testTortureExecute (void)
+{
+  int c=-2;
+  int d=0xfe;
+  int e=a&1;
+  int f=b&2;
+  if ((char)(c|(e&f)) == (char)d)
+    return;
+  else
+    ASSERT (0);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001011-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001011-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001011-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001011-1.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,27 @@
+/*
+   20001011-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <string.h>
+
+int foo(const char *a)
+{
+    return strcmp(a, "testTortureExecute");
+}
+
+void
+testTortureExecute (void)
+{
+#if 0
+    if(foo(__func__))
+        ASSERT (0);
+    return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001013-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001013-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001013-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001013-1.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+   20001013-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct x {
+	int a, b;
+} z = { -4028, 4096 };
+
+int foo(struct x *p, int y)
+{
+  if ((y & 0xff) != y || -p->b >= p->a)
+    return 1;
+  return 0;
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo (&z, 10))
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001017-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001017-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001017-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001017-1.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+   20001017-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#pragma disable_warning 85
+#endif
+ 
+void bug (double *Cref, char transb, int m, int n, int k,
+	  double a, double *A, int fdA, double *B, int fdB,
+	  double b, double *C, int fdC)
+{
+  if (C != Cref) ASSERT (0);
+}
+ 
+void
+testTortureExecute (void)
+{
+  double A[1], B[1], C[1];
+   
+  bug (C, 'B', 1, 2, 3, 4.0, A, 5, B, 6, 7.0, C, 8);
+   
+  return;
+}
+                                                                                                                              
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001017-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001017-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001017-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001017-2.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+   20001017-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+void
+fn_4parms (unsigned char a, long *b, long *c, unsigned int *d)
+{
+  if (*b != 1 || *c != 2 || *d != 3)
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  unsigned char a = 0;
+  unsigned long b = 1, c = 2;
+  unsigned int d = 3;
+
+  fn_4parms (a, &b, &c, &d);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001024-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001024-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001024-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001024-1.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,51 @@
+/*
+   20001024-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+#include <string.h>
+
+struct a;
+
+extern int baz (struct a *restrict x);
+
+struct a {
+  long v;
+  long w;
+};
+
+struct b {
+  struct a c;
+  struct a d;
+};
+
+int bar (int x, const struct b *restrict y, struct b *restrict z)
+{
+  if (y->c.v || y->c.w != 250000 || y->d.v || y->d.w != 250000)
+    ASSERT (0);
+}
+
+void foo(void)
+{
+  struct b x;
+  x.c.v = 0;
+  x.c.w = 250000;
+// Not supported by sdcc yet!
+//  x.d = x.c;
+  memcpy(&x.d, &x.c, sizeof(struct a));
+  bar(0, &x, ((void *)0));
+}
+
+void
+testTortureExecute (void)
+{
+  foo();
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001026-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001026-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001026-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001026-1.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,61 @@
+/*
+   20001026-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <string.h>
+
+// TODO: Enable when sdcc supports struct!
+#if 0
+typedef struct {
+  long r[(19 + sizeof (long))/(sizeof (long))];
+} realvaluetype;
+
+typedef void *tree;
+
+static realvaluetype
+real_value_from_int_cst (tree x, tree y)
+{
+  realvaluetype r;
+  int i;
+  for (i = 0; i < sizeof(r.r)/sizeof(long); ++i)
+    r.r[i] = -1;
+  return r;
+}
+
+struct brfic_args
+{
+  tree type;
+  tree i;
+  realvaluetype d;
+};
+
+static void
+build_real_from_int_cst_1 (data)
+     void * data;
+{
+  struct brfic_args *args = (struct brfic_args *) data;
+  args->d = real_value_from_int_cst (args->type, args->i);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct brfic_args args;
+
+  memset (&args, 0, sizeof(args));
+  build_real_from_int_cst_1 (&args);
+
+  if (args.d.r[0] == 0)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001027-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001027-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001027-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001027-1.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+   20001027-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int x,*p=&x;
+
+void
+testTortureExecute (void)
+{
+#if 0
+  int i=0;
+  x=1;
+  *p=2;
+  if (x != 2)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001031-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001031-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001031-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001031-1.c	2012-03-30 09:18:32.000000000 +0000
@@ -0,0 +1,51 @@
+/*
+   20001031-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports long long constants!
+#if 0
+void t1 (int x)
+{
+  if (x != 4100)
+    abort ();
+}
+
+int t2 (void)
+{
+  int i;
+  t1 ((i = 4096) + 4);
+  return i;
+}
+
+void t3 (long long x)
+{
+  if (x != 0x80000fffULL)
+    abort ();
+}
+
+long long t4 (void)
+{
+  long long i;
+  t3 ((i = 4096) + 0x7fffffffULL);
+  return i;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  if (t2 () != 4096)
+    ASSERT (0);
+  if (t4 () != 4096)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001101.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001101.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001101.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001101.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,46 @@
+/*
+   20001101-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 88
+#endif
+			 
+typedef struct
+{
+  unsigned int unchanging : 1;
+} struc, *rtx;
+
+rtx dummy ( int *a, rtx *b)
+{
+  *a = 1;
+  *b = (rtx)7;
+  return (rtx)1;
+}
+
+void bogus (rtx insn, rtx thread, rtx delay_list)
+{
+  rtx new_thread;
+  int must_annul;
+
+  delay_list = dummy ( &must_annul, &new_thread);
+  if (delay_list == 0 &&  new_thread )
+    {
+      thread = new_thread;
+    }
+  if (delay_list && must_annul)
+    insn->unchanging = 1;
+  if (new_thread != thread )
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  struc baz;
+  bogus (&baz, (rtx)7, 0);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001108-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001108-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001108-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001108-1.c	2012-05-18 17:36:32.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+   20001108-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+long long
+signed_poly (long long sum, long x)
+{
+  sum += (long long) (long) sum * (long long) x;
+  return sum;
+}
+
+unsigned long long
+unsigned_poly (unsigned long long sum, unsigned long x)
+{
+  sum += (unsigned long long) (unsigned long) sum * (unsigned long long) x;
+  return sum;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+// Test fails on 32-bit systems
+#if 0
+//#if !defined(__SDCC_mcs51) && !defined(__SDCC_hc08) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+// TODO: Enable when sdcc supports long long constants!
+#if 0
+  if (signed_poly (2LL, -3) != -4LL)
+    ASSERT (0);
+#endif
+  
+  if (unsigned_poly (2ULL, 3) != 8ULL)
+    ASSERT (0);
+
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001112-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001112-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001112-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001112-1.c	2012-04-02 09:59:13.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+   20001112-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+// Some ports do not support long long yet.
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+  long long i = 1;
+
+  i = i * 2 + 1;
+  
+  if (i != 3)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001121-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001121-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001121-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001121-1.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   20001121-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#endif
+
+double d;
+
+inline double foo (void)
+{
+  return d;
+}
+
+inline int bar (void)
+{
+  foo();
+  return 0;
+}
+
+void
+testTortureExecute (void)
+{
+  if (bar ())
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001130-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001130-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001130-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001130-1.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+   20001130-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+static inline int bar(void) { return 1; }
+static int mem[3];
+
+static int foo(int x)
+{
+  if (x != 0)
+    return x;
+
+  mem[x++] = foo(bar());
+
+  if (x != 1)
+    ASSERT(0);
+
+  return 0;
+}
+
+void
+testTortureExecute (void)
+{
+  foo(0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001130-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001130-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001130-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001130-2.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+   20001130-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+static int which_alternative = 3;
+
+static const char *i960_output_ldconst (void);
+
+static const char *
+output_25 (void)
+{
+  switch (which_alternative)
+    {
+    case 0:
+      return "mov	%1,%0";
+    case 1:
+      return i960_output_ldconst ();
+    case 2:
+      return "ld	%1,%0";
+    case 3:
+      return "st	%1,%0";      
+    }
+}
+
+static const char *i960_output_ldconst (void)
+{
+  return "foo";
+}
+
+void
+testTortureExecute (void)
+{
+  const char *s = output_25 () ;
+  if (s[0] != 's')
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001203-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001203-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001203-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001203-1.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+   20001203-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Origin: PR c/410 from Jan Echternach
+   <jan.echternach@informatik.uni-rostock.de>,
+   adapted to a testcase by Joseph Myers <jsm28@cam.ac.uk>.
+*/
+
+static void
+foo (void)
+{
+  struct {
+    long a;
+    char b[1];
+  } x = { 2, { 0 } };
+}
+
+void
+testTortureExecute (void)
+{
+  int tmp;
+  foo ();
+  tmp = 1;
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001221-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001221-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001221-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001221-1.c	2012-05-18 17:15:09.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+   20001221-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 184
+#endif
+
+void
+testTortureExecute (void)
+{
+// TODO: Enable when more ports support long long!
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+  unsigned long long a;
+  if (! (a = 0xfedcba9876543210ULL))
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001228-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001228-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20001228-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20001228-1.c	2012-02-28 14:50:19.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   20001228-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int foo1(void)
+{
+  union {
+    char a[sizeof (unsigned)];
+    unsigned b;
+  } u;
+  
+  u.b = 0x01;
+  return u.a[0];
+}
+
+int foo2(void)
+{
+  volatile union {
+    char a[sizeof (unsigned)];
+    unsigned b;
+  } u;
+  
+  u.b = 0x01;
+  return u.a[0];
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo1() != foo2())
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010106-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010106-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010106-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010106-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+   20010106-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Copyright 2001 Free Software Foundation
+   Contributed by Alexandre Oliva <aoliva@redhat.com> */
+
+int f(int i) {
+  switch (i)
+  {
+    case -2:
+      return 33;
+    case -1:
+      return 0;
+    case 0:
+      return 7;
+    case 1:
+      return 4;
+    case 2:
+      return 3;
+    case 3:
+      return 15;
+    case 4:
+     return 9;
+    default:
+      ASSERT(0);
+  }
+}
+
+void
+testTortureExecute (void) {
+  if (f(-1))
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010114-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010114-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010114-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010114-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,24 @@
+/*
+   20010114-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Origin: PR c/1540 from Mattias Lampe <lampe@tu-harburg.de>,
+   adapted to a testcase by Joseph Myers <jsm28@cam.ac.uk>.
+   GCC 2.95.2 fails, CVS GCC of 2001-01-13 passes.  */
+
+void
+testTortureExecute (void)
+{
+  int array1[1] = { 1 };
+  int array2[2][1]= { { 1 }, { 0 } };
+  if (array1[0] != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010118-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010118-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010118-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010118-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,53 @@
+/*
+   20010118-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#pragma disable_warning 93
+#endif
+
+typedef struct {
+  int a, b, c, d, e, f;
+} A;
+
+void foo (A *v, int w, int x, int *y, int *z)
+{
+}
+
+void
+bar (A *v, int x, int y, int w, int h)
+{
+  if (v->a != x || v->b != y) {
+    int oldw = w;
+    int oldh = h;
+    int e = v->e;
+    int f = v->f;
+    int dx, dy;
+    foo(v, 0, 0, &w, &h);
+    dx = (oldw - w) * (double) e/2.0;
+    dy = (oldh - h) * (double) f/2.0;
+    x += dx;
+    y += dy;
+    v->a = x;
+    v->b = y;
+    v->c = w;
+    v->d = h;
+  }
+}
+
+void
+testTortureExecute (void)
+{
+#ifndef SDCC_ds390
+  A w = { 100, 110, 20, 30, -1, -1 };
+  bar (&w,400,420,50,70);
+  if (w.d != 70)
+    ASSERT(0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010123-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010123-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010123-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010123-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+   20010123-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when supported by sdcc!
+
+struct s
+{
+    int value;
+    char *string;
+};
+
+void
+testTortureExecute (void)
+{
+#if 0
+  int i;
+  for (i = 0; i < 4; i++)
+    {
+      struct s *t = & (struct s) { 3, "hey there" };
+      if (t->value != 3)
+	ASSERT (0);
+      t->value = 4;
+      if (t->value != 4)
+	ASSERT (0);
+    }
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010129-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010129-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010129-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010129-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,81 @@
+/*
+   20010129-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+long baz1 (void *a)
+{
+  static long l;
+  return l++;
+}
+
+int baz2 (const char *a)
+{
+  return 0;
+}
+
+int baz3 (int i)
+{
+  if (!i)
+    ASSERT (0);
+  return 1;
+}
+
+void **bar;
+
+#ifndef __SDCC_mcs51
+int foo (void *a, long b, int c)
+{
+  int d = 0, e, f = 0, i;
+  char g[256];
+  void **h;
+
+  g[0] = '\n';
+  g[1] = 0;
+
+  while (baz1 (a) < b) {
+    if (g[0] != ' ' && g[0] != '\t') {
+      f = 1;
+      e = 0;
+      if (!d && baz2 (g) == 0) {
+	if ((c & 0x10) == 0)
+	  continue;
+	e = d = 1;
+      }
+      if (!((c & 0x10) && (c & 0x4000) && e) && (c & 2))
+	continue;
+      if ((c & 0x2000) && baz2 (g) == 0)
+	continue;
+      if ((c & 0x1408) && baz2 (g) == 0)
+	continue;
+      if ((c & 0x200) && baz2 (g) == 0)
+	continue;
+      if (c & 0x80) {
+	for (h = bar, i = 0; h; h = (void **)*h, i++)
+	  if (baz3 (i))
+	    break;
+      }
+      f = 0;
+    }
+  }
+  return 0;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_mcs51
+  void *n = 0;
+  bar = &n;
+  foo (&n, 1, 0xc811);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010209-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010209-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010209-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010209-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+   20010209-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports VLA!
+
+#if 0
+int b;
+int foo (void)
+{
+  int x[b];
+  int bar (int t[b])
+  {
+    int i;
+    for (i = 0; i < b; i++)
+      t[i] = i + (i > 0 ? t[i-1] : 0);
+    return t[b-1];
+  }
+  return bar (x);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  b = 6;
+  if (foo () != 15)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010221-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010221-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010221-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010221-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   20010221-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int n = 2;
+
+void
+testTortureExecute (void)
+{
+  int i, x = 45;
+
+  for (i = 0; i < n; i++)
+    {
+      if (i != 0)
+	x = ( i > 0 ) ? i : 0;
+    }
+
+  if (x != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010222-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010222-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010222-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010222-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,21 @@
+/*
+   20010222-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int a[2] = { 18, 6 };
+
+void
+testTortureExecute (void)
+{
+  int b = (-3 * a[0] -3 * a[1]) / 12;
+  if (b != -6)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010224-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010224-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010224-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010224-1.c	2012-05-21 12:05:21.000000000 +0000
@@ -0,0 +1,55 @@
+/*
+   20010224-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+#include <stdint.h>
+
+int16_t logadd (int16_t *a, int16_t *b);
+void ba_compute_psd (int16_t start);
+
+int16_t masktab[6] = { 1, 2, 3, 4, 5};
+int16_t psd[6] = { 50, 40, 30, 20, 10};
+int16_t bndpsd[6] = { 1, 2, 3, 4, 5};
+
+void ba_compute_psd (int16_t start)
+{
+  int i,j,k;
+  int16_t lastbin = 4;
+
+  j = start; 
+  k = masktab[start]; 
+
+  bndpsd[k] = psd[j]; 
+  j++; 
+
+  for (i = j; i < lastbin; i++) { 
+    bndpsd[k] = logadd(&bndpsd[k], &psd[j]);
+    j++; 
+  } 
+}
+
+int16_t logadd (int16_t *a, int16_t *b)
+{
+  return *a + *b;
+}
+
+void
+testTortureExecute (void)
+{
+#if !defined (__SDCC_z80) && !defined (__SDCC_z180) && !defined (__SDCC_r2k) && !defined (__SDCC_r3ka) && !defined (__SDCC_gbz80)
+  int i;
+
+  ba_compute_psd (0);
+
+  if (bndpsd[1] != 140) ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010403-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010403-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010403-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010403-1.c	2012-03-26 06:35:09.000000000 +0000
@@ -0,0 +1,49 @@
+/*
+   20010403-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+void b (int *);
+void c (int, int);
+void d (int);
+
+int e;
+
+void a (int x, int y)
+{
+  int f = x ? e : 0;
+  int z = y;
+
+  b (&y);
+  c (z, y);
+  d (f);
+}
+
+void b (int *y)
+{
+  (*y)++;
+}
+
+void c (int x, int y)
+{
+  if (x == y)
+    ASSERT (0);
+}
+
+void d (int x)
+{
+}
+
+void
+testTortureExecute (void)
+{
+  a (0, 0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010409-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010409-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010409-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010409-1.c	2012-03-13 11:03:51.000000000 +0000
@@ -0,0 +1,57 @@
+/*
+   20010409-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+#include <string.h>
+
+typedef struct A {
+  int a, b;
+} A;
+
+typedef struct B {
+  struct A **a;
+  int b;
+} B;
+
+A *a;
+int b = 1, c;
+B d[1];
+
+void foo (A *x, const char *y, int z)
+{
+  c = y[4] + z * 25;
+}
+
+A *bar (const char *v, int w, int x, const char *y, int z)
+{
+  if (w)
+    ASSERT (0);
+  return 0;
+}
+
+void test (const char *x, int *y)
+{
+  foo (d->a[d->b], "test", 200);
+  d->a[d->b] = bar (x, b ? 0 : 65536, strlen (x), "test", 201);
+  d->a[d->b]->a++;
+  if (y)
+    d->a[d->b]->b = *y;
+}
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5))
+  d->b = 0;
+  d->a = &a;
+  test ("", 0);
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010422-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010422-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010422-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010422-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,27 @@
+/*
+   20010422-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+unsigned int foo(unsigned int x)
+{
+  if (x < 5)
+    x = 4;
+  else
+    x = 8;
+  return x;
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo (8) != 8)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010518-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010518-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010518-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010518-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+   20010518-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Leaf functions with many arguments.  */
+
+int
+add (int a,
+    int b,
+    int c,
+    int d,
+    int e,
+    int f,
+    int g,
+    int h,
+    int i,
+    int j,
+    int k,
+    int l,
+    int m)
+{
+  return a+b+c+d+e+f+g+h+i+j+k+l+m;
+}
+
+void
+testTortureExecute (void)
+{
+  if (add (1,2,3,4,5,6,7,8,9,10,11,12,13) != 91)
+    ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010520-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010520-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010520-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010520-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+   20010520-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+static unsigned int expr_hash_table_size = 1;
+
+void
+testTortureExecute (void)
+{
+  int del = 1;
+  unsigned int i = 0;
+
+  if (i < expr_hash_table_size && del)
+    return;
+  ASSERT (0);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010604-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010604-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010604-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010604-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   20010604-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <stdbool.h>
+
+int func (int a, int b, int c, _Bool d, _Bool e, _Bool f, char g)
+{
+  if (g != 1 || d != true || e != true || f != true) ASSERT (0);
+  return a + b + c;
+}
+
+void
+testTortureExecute (void)
+{
+  if (func (1, 2, -3, true, true, true, '\001'))
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010711-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010711-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010711-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010711-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   20010711-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+void foo (int *a) {}
+
+void
+testTortureExecute (void)
+{
+  int a;
+  if (&a == 0)
+    ASSERT (0);
+  else
+    {
+      foo (&a);
+      return;
+    }
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010717-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010717-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010717-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010717-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,31 @@
+/*
+   20010717-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+  int i, j;
+  unsigned long u, r1, r2;
+
+  i = -16;
+  j = 1;
+  u = i + j;
+
+  /* no sign extension upon shift */
+  r1 = u >> 1;
+  /* sign extension upon shift, but there shouldn't be */
+  r2 = ((unsigned long) (i + j)) >> 1;
+
+  if (r1 != r2)
+    ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010723-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010723-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010723-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010723-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,27 @@
+/*
+   200107231.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int
+f ()
+{
+  int biv,giv;
+  for (biv = 0, giv = 0; giv != 8; biv++)
+      giv = biv*8;
+  return giv;
+}
+
+void
+testTortureExecute (void)
+{
+  if (f () != 8)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010910-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010910-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010910-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010910-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,71 @@
+/*
+   20010910-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Test case contributed by Ingo Rohloff <rohloff@in.tum.de>.
+   Code distilled from Linux kernel.  */
+
+/* Compile this program with a gcc-2.95.2 using
+   "gcc -O2" and run it. The result will be that
+   rx_ring[1].next == 0   (it should be == 14)
+   and
+   ep.skbuff[4] == 5      (it should be 0)
+*/
+
+extern void abort(void);
+
+struct epic_rx_desc 
+{
+  unsigned int next;
+};
+
+struct epic_private 
+{
+  struct epic_rx_desc *rx_ring;
+  unsigned int rx_skbuff[5];
+};
+
+static void epic_init_ring(struct epic_private *ep)
+{
+  int i;
+
+  for (i = 0; i < 5; i++) 
+  {
+    ep->rx_ring[i].next = 10 + (i+1)*2;
+    ep->rx_skbuff[i] = 0;
+  }
+  ep->rx_ring[i-1].next = 10;
+}
+
+static int check_rx_ring[5] = { 12,14,16,18,10 };
+
+void
+testTortureExecute (void)
+{
+  struct epic_private ep;
+  struct epic_rx_desc rx_ring[5];
+  int i;
+
+  for (i=0;i<5;i++)
+  {
+    rx_ring[i].next=0;
+    ep.rx_skbuff[i]=5;
+  }
+  
+  ep.rx_ring=rx_ring;
+  epic_init_ring(&ep);
+  
+  for (i=0;i<5;i++)
+  {
+    if ( rx_ring[i].next != check_rx_ring[i] ) ASSERT(0);
+    if ( ep.rx_skbuff[i] != 0 ) ASSERT(0);
+  }
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010915-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010915-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010915-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010915-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,86 @@
+/*
+   20010915-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+#include <string.h>
+
+/* Bug in reorg.c, deleting the "++" in the last loop in main.
+   Origin: <hp@axis.com>.  */
+
+extern void f (void);
+extern int x (int, const char **);
+extern int r (const char *);
+extern char *s (const char *, const char **);
+extern char *m (const char *);
+char *u;
+char *h;
+int check = 0;
+int o = 0;
+
+void
+testTortureExecute (void)
+{
+  const char *args[] = {"a", "b", "c", "d", "e"};
+  if (x (5, args) != 0 || check != 2 || o != 5)
+    ASSERT (0);
+  return;
+}
+
+int x (int argc, const char **argv)
+{
+  int opt = 0;
+  char *g = 0;
+  const char *p = 0;
+
+  if (argc > o && argc > 2 && argv[o])
+    {
+      g = s (argv[o], &p);
+      if (g)
+	{
+	  *g++ = '\0';
+	  h = s (g, &p);
+	  if (g == p)
+	    h = m (g);
+	}
+      u = s (argv[o], &p);
+      if (argv[o] == p)
+	u = m (argv[o]);
+    }
+  else
+    ASSERT (0);
+
+  while (++o < argc)
+    if (r (argv[o]) == 0)
+      return 1;
+
+  return 0;
+}
+
+char *m (const char *x) { ASSERT (0); return 0;}
+char *s (const char *v, const char **pp)
+{
+  if (strcmp (v, "a") != 0 || check++ > 1)
+    ASSERT (0);
+  *pp = v+1;
+  return 0;
+}
+
+int r (const char *f)
+{
+  static char c[2] = "b";
+  static int cnt = 0;
+
+  if (*f != *c || f[1] != c[1] || cnt > 3)
+    ASSERT (0);
+  c[0]++;
+  cnt++;
+  return 1;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010924-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010924-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010924-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010924-1.c	2012-05-05 14:39:36.000000000 +0000
@@ -0,0 +1,85 @@
+/*
+   20010924-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 147
+#pragma disable_warning 196
+#endif
+
+/* Verify that flexible arrays can be initialized from STRING_CST
+   constructors. */
+
+/* Baselines.  */
+struct {
+  char a1c;
+  char *a1p;
+} a1 = {
+  '4',
+  "62"
+};
+
+struct {
+  char a2c;
+  char a2p[2];
+} a2 = {
+  'v',
+  "cq"
+};
+
+/* The tests.  */
+struct {
+  char a3c;
+  char a3p[];
+} a3 = {
+  'o',
+  "wx"
+};
+
+struct {
+  char a4c;
+  char a4p[];
+} a4 = {
+  '9',
+  { 'e', 'b' }
+};
+
+void
+testTortureExecute (void)
+{
+  if (a1.a1c != '4')
+    ASSERT(0);
+  if (a1.a1p[0] != '6')
+    ASSERT(0);
+  if (a1.a1p[1] != '2')
+    ASSERT(0);
+  if (a1.a1p[2] != '\0')
+    ASSERT(0);
+
+  if (a2.a2c != 'v')
+    ASSERT(0);
+  if (a2.a2p[0] != 'c')
+    ASSERT(0);
+  if (a2.a2p[1] != 'q')
+    ASSERT(0);
+
+  if (a3.a3c != 'o')
+    ASSERT(0);
+  if (a3.a3p[0] != 'w')
+    ASSERT(0);
+  if (a3.a3p[1] != 'x')
+    ASSERT(0);
+
+  if (a4.a4c != '9')
+    ASSERT(0);
+  if (a4.a4p[0] != 'e')
+    ASSERT(0);
+  if (a4.a4p[1] != 'b')
+    ASSERT(0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010925-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010925-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20010925-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20010925-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   20010925-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <string.h>
+
+int foo (void *, void *, unsigned int c);
+
+int src[10];
+int dst[10];
+
+void
+testTortureExecute (void)
+{
+   if (foo (dst, src, 10) != 0)
+     ASSERT (0);
+   return;
+}
+
+int foo (void *a, void *b, unsigned int c)
+{
+  if (c == 0)
+    return 1;
+
+  memcpy (a, b, c);
+  return 0;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011008-3.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011008-3.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011008-3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011008-3.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,118 @@
+/*
+   20011008-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+// Hmm, this test uses identifiers tarting in __, which are reserved for the implementation. We probably should rename them. Philipp
+
+// TODO: Enable when sdcc supports struct assignment.
+#if 0
+#include <stdint.h>
+
+typedef uint32_t u_int32_t;
+typedef uint8_t u_int8_t;
+
+typedef enum {
+        TXNLIST_DELETE,
+        TXNLIST_LSN,
+        TXNLIST_TXNID,
+        TXNLIST_PGNO
+} db_txnlist_type;
+
+struct __db_lsn; typedef struct __db_lsn DB_LSN;
+struct __db_lsn {
+        u_int32_t file;
+        u_int32_t offset;
+};
+struct __db_txnlist; typedef struct __db_txnlist DB_TXNLIST;
+
+struct __db_txnlist {
+        db_txnlist_type type;
+        struct { struct __db_txnlist *le_next; struct __db_txnlist **le_prev; } links;
+        union {
+                struct {
+                        u_int32_t txnid;
+                        int32_t generation;
+                        int32_t aborted;
+                } t;
+                struct {
+
+
+                        u_int32_t flags;
+                        int32_t fileid;
+                        u_int32_t count;
+                        char *fname;
+                } d;
+                struct {
+                        int32_t ntxns;
+                        int32_t maxn;
+                        DB_LSN *lsn_array;
+                } l;
+                struct {
+                        int32_t nentries;
+                        int32_t maxentry;
+                        char *fname;
+                        int32_t fileid;
+                        void *pgno_array;
+                        u_int8_t uid[20];
+                } p;
+        } u;
+};
+
+int log_compare (const DB_LSN *a, const DB_LSN *b)
+{
+  return 1;
+}
+
+int
+__db_txnlist_lsnadd(int val, DB_TXNLIST *elp, DB_LSN *lsnp, u_int32_t flags)
+{
+   int i;
+ 
+   for (i = 0; i < (!(flags & (0x1)) ? 1 : elp->u.l.ntxns); i++)
+     {
+	int __j;
+	DB_LSN __tmp;
+	val++; 
+	for (__j = 0; __j < elp->u.l.ntxns - 1; __j++)
+	  if (log_compare(&elp->u.l.lsn_array[__j], &elp->u.l.lsn_array[__j + 1]) < 0)
+	  {
+	     __tmp = elp->u.l.lsn_array[__j];
+	     elp->u.l.lsn_array[__j] = elp->u.l.lsn_array[__j + 1];
+	     elp->u.l.lsn_array[__j + 1] = __tmp;
+	  }
+     }
+
+   *lsnp = elp->u.l.lsn_array[0];
+   return val;
+}
+
+#define	VLEN	1235
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  DB_TXNLIST el;
+  DB_LSN lsn, lsn_a[VLEN];
+  
+  el.u.l.ntxns = VLEN-1;
+  el.u.l.lsn_array = lsn_a;
+  
+  if (__db_txnlist_lsnadd (0, &el, &lsn, 0) != 1)
+    ASSERT (0);
+  
+  if (__db_txnlist_lsnadd (0, &el, &lsn, 1) != VLEN-1)
+    ASSERT (0);
+  
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011019-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011019-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011019-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011019-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,27 @@
+/*
+   20011019-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct { int a; int b[5]; } x;
+int *y;
+
+int foo (void)
+{
+  return y - x.b;
+}
+
+void
+testTortureExecute (void)
+{
+  y = x.b;
+  if (foo ())
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011024-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011024-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011024-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011024-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,31 @@
+/*
+   20011024-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Test whether store motion recognizes pure functions as potentially reading
+   any memory.  */
+
+#include <string.h>
+
+char buf[50];
+
+static void foo (void)
+{
+  if (memcpy (buf, "abc", 4) != buf) ASSERT (0);
+  if (strcmp (buf, "abc")) ASSERT (0);
+  memcpy (buf, "abcdefgh", strlen ("abcdefgh") + 1);
+}
+
+void
+testTortureExecute (void)
+{
+  foo ();
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011109-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011109-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011109-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011109-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,70 @@
+/*
+   20011109-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void fail1(void)
+{
+  ASSERT (0);
+}
+void fail2(void)
+{
+  ASSERT (0);
+}
+void fail3(void)
+{
+  ASSERT (0);
+}
+void fail4(void)
+{
+  ASSERT (0);
+}
+
+
+void foo(long x)
+{
+  switch (x)
+    {
+    case -6: 
+      fail1 (); break;
+    case 0: 
+      fail2 (); break;
+    case 1: case 2: 
+      break;
+    case 3: case 4: case 5: 
+      fail3 ();
+      break;
+    default:
+      fail4 ();
+      break;
+    }
+  switch (x)
+    {
+      
+    case -3: 
+      fail1 (); break;
+    case 0: case 4: 
+      fail2 (); break;
+    case 1: case 3: 
+      break;
+    case 2: case 8: 
+      ASSERT (0);
+      break;
+    default:
+      fail4 ();
+      break;
+    }
+}
+
+void
+testTortureExecute (void)
+{
+  foo (1);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011109-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011109-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011109-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011109-2.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,22 @@
+/*
+   20011109-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+  const char *c1 = "foo";
+  const char *c2 = "foo";
+  int i;
+  for (i = 0; i < 3; i++)
+    if (c1[i] != c2[i])
+      ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011113-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011113-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011113-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011113-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,69 @@
+/*
+   20011113-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports struct assignment!
+#if 0
+#include <string.h>
+
+typedef struct t
+{
+  unsigned a : 16;
+  unsigned b : 8;
+  unsigned c : 8;
+  long d[4];
+} *T;
+
+typedef struct {
+  long r[3];
+} U;
+
+T bar (U, unsigned int);
+
+T foo (T x)
+{
+  U d, u;
+
+  memcpy (&u, &x->d[1], sizeof u);
+  d = u;
+  return bar (d, x->b);
+}
+
+T baz (T x)
+{
+  U d, u;
+
+  d.r[0] = 0x123456789;
+  d.r[1] = 0xfedcba987;
+  d.r[2] = 0xabcdef123;
+  memcpy (&u, &x->d[1], sizeof u);
+  d = u;
+  return bar (d, x->b);
+}
+
+T bar (U d, unsigned int m)
+{
+  if (d.r[0] != 21 || d.r[1] != 22 || d.r[2] != 23)
+    ASSERT (0);
+  return 0;
+}
+
+struct t t = { 26, 0, 0, { 0, 21, 22, 23 }};
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  baz (&t);
+  foo (&t);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011114-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011114-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011114-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011114-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+   20011114-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+char foo(char bar[])
+{
+  return bar[1];
+}
+extern char foo(char *);
+void
+testTortureExecute (void)
+{
+  if (foo("xy") != 'y')
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011126-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011126-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011126-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011126-1.c	2012-03-30 11:52:34.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   20011126-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Produced a overflow in ifcvt.c, causing S to contain 0xffffffff7fffffff.  */
+
+int a = 1;
+
+void
+testTortureExecute (void)
+{
+// TODO: Enable when sdcc supports long long constants!
+#if 0
+  long long s;
+
+  s = a;
+  if (s < 0)
+    s = -2147483648LL;
+  else
+    s = 2147483647LL;
+
+  if (s < 0)
+    ASSERT (0);
+
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011126-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011126-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011126-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011126-2.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,55 @@
+/*
+   20011126-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Problem originally visible on ia64.
+
+   There is a partial redundancy of "in + 1" that makes GCSE want to
+   transform the final while loop to 
+
+     p = in + 1;
+     tmp = p;
+     ...
+     goto start;
+   top:
+     tmp = tmp + 1;
+   start:
+     in = tmp;
+     if (in < p) goto top;
+
+   We miscalculate the number of loop iterations as (p - tmp) = 0
+   instead of (p - in) = 1, which results in overflow in the doloop
+   optimization.  */
+
+static const char *
+test (const char *in, char *out)
+{
+  while (1)
+    {
+      if (*in == 'a')
+	{
+	  const char *p = in + 1;
+	  while (*p == 'x')
+	    ++p;
+	  if (*p == 'b')
+	    return p;
+	  while (in < p)
+	    *out++ = *in++;
+	}
+    }
+}
+
+void
+testTortureExecute (void)
+{
+  char out[4];
+  test ("aab", out);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011128-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011128-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011128-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011128-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,17 @@
+/*
+   20011128-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+  char blah[33] = "01234567890123456789";
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011217-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011217-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011217-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011217-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,22 @@
+/*
+   20011217-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#endif
+
+void
+testTortureExecute (void)
+{
+  double x = 1.0;
+  double y = 2.0;
+
+  if ((y > x--) != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011219-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011219-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011219-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011219-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,59 @@
+/*
+   20011219-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#pragma disable_warning 84
+#endif
+
+/* This testcase failed on IA-32 at -O and above, because combine attached
+   a REG_LABEL note to jump instruction already using JUMP_LABEL.  */
+
+enum X { A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q };
+
+void
+bar (const char *x, int y, const char *z)
+{
+}
+
+long
+foo (enum X x, const void *y)
+{
+  long a;
+
+  switch (x)
+    {
+    case K:
+      a = *(long *)y;
+      break;
+    case L:
+      a = *(long *)y;
+      break;
+    case M:
+      a = *(long *)y;
+      break;
+    case N:
+      a = *(long *)y;
+      break;
+    case O:
+      a = *(long *)y;
+      break;
+    default:
+      bar ("foo", 1, "bar");
+    }
+  return a;
+}
+
+void
+testTortureExecute (void)
+{
+  long i = 24;
+  if (foo (N, &i) != 24)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011223-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011223-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20011223-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20011223-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   20011223-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Origin: Joseph Myers <jsm28@cam.ac.uk>.  */
+/* Case labels in a switch statement are converted to the promoted
+   type of the controlling expression, not an unpromoted version.
+   Reported as PR c/2454 by
+   Andreas Krakowczyk <Andreas.Krakowczyk@fujitsu-siemens.com>.  */
+
+static int i;
+
+void
+testTortureExecute (void)
+{
+  i = -1;
+  switch ((signed char) i) {
+  case 255:
+    ASSERT (0);
+  default:
+    return;
+  }
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030105-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030105-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030105-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030105-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   20030105-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int
+foo ()
+{
+  const int a[8] = { 0, 1, 2, 3, 4, 5, 6, 7 };
+  int i, sum;
+
+  sum = 0;
+  for (i = 0; i < sizeof (a) / sizeof (*a); i++)
+    sum += a[i];
+
+  return sum;
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo () != 28)
+    ASSERT (0);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030117-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030117-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030117-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030117-1.c	2012-03-25 20:53:53.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   20030117-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int foo (int, int, int);
+int bar (int, int, int);
+
+void
+testTortureExecute (void)
+{
+  if (foo (5, 10, 21) != 12)
+    ASSERT (0);
+
+  if (bar (9, 12, 15) != 150)
+    ASSERT (0);
+
+  return;
+}
+
+int foo (int x, int y, int z)
+{
+  return (x + y + z) / 3;
+}
+
+int bar (int x, int y, int z)
+{
+  return foo (x * x, y * y, z * z);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030120-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030120-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030120-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030120-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,61 @@
+/*
+   20030120-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* On H8/300 port, NOTICE_UPDATE_CC had a bug that causes the final
+   pass to remove test insns that should be kept.  */
+
+unsigned short
+t1 (unsigned short w)
+{
+  if ((w & 0xff00) == 0)
+    {
+      if (w == 0)
+	w = 2;
+    }
+  return w;
+}
+
+unsigned long
+t2 (unsigned long w)
+{
+  if ((w & 0xffff0000) == 0)
+    {
+      if (w == 0)
+	w = 2;
+    }
+  return w;
+}
+
+int
+t3 (unsigned short a)
+{
+  if (a & 1)
+    return 1;
+  else if (a)
+    return 1;
+  else
+    return 0;
+}
+
+void
+testTortureExecute (void)
+{
+  if (t1 (1) != 1)
+    ASSERT (0);
+
+  if (t2 (1) != 1)
+    ASSERT (0);
+
+  if (t3 (2) != 1)
+    ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030120-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030120-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030120-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030120-2.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+   20030120-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR 8848 */
+
+int foo(int status)
+{
+  int s = 0;
+  if (status == 1) s=1;
+  if (status == 3) s=3;
+  if (status == 4) s=4;
+  return s;
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo (3) != 3)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030125-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030125-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030125-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030125-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,47 @@
+/*
+   20030125-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports double!
+#if 0
+/* Verify whether math functions are simplified.  */
+#include <math.h>
+
+float 
+t(float a)
+{
+	return sin(a);
+}
+float 
+q(float a)
+{
+	return floor(a);
+}
+double
+q1(float a)
+{
+	return floor(a);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+	if (t(0)!=0)
+		ASSERT (0);
+	if (q(0)!=0)
+		ASSERT (0);
+	if (q1(0)!=0)
+		ASSERT (0);
+	return;
+#endif
+}
+
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030128-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030128-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030128-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030128-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,22 @@
+/*
+   20030128-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+unsigned char x = 50;
+volatile short y = -5;
+
+void
+testTortureExecute (void)
+{
+  x /= y;
+  if (x != (unsigned char) -10)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030203-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030203-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030203-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030203-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   20030203-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+void f(int);
+int do_layer3(int single)
+{
+  int stereo1;
+
+  if(single >= 0) /* stream is stereo, but force to mono */
+    stereo1 = 1;
+  else
+    stereo1 = 2;
+  f(single);
+
+  return stereo1;
+}
+
+void
+testTortureExecute (void)
+{
+  if (do_layer3(-1) != 2)
+    ASSERT (0);
+  return;
+}
+
+void f(int i) {}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030209-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030209-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030209-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030209-1.c	2012-05-18 17:15:09.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   20030209-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#endif
+
+#ifndef __SDCC_mcs51
+#ifndef __SDCC_gbz80
+#ifndef __SDCC_hc08
+#ifndef __SDCC_s08
+double x[100][100]; /* Too big for mcs51 and gbz80. */
+#endif
+#endif
+#endif
+#endif
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_mcs51
+#ifndef __SDCC_gbz80
+#ifndef __SDCC_hc08
+#ifndef __SDCC_s08
+  int i;
+
+  i = 99;
+  x[i][0] = 42;
+  if (x[99][0] != 42)
+    ASSERT (0);
+  return;
+#endif
+#endif
+#endif
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030218-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030218-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030218-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030218-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+   20030218-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/*  On H8, the predicate general_operand_src(op,mode) used to ignore
+    mode when op is a (mem (post_inc ...)).  As a result, the pattern
+    for extendhisi2 was recognized as extendqisi2.  */
+
+short *q;
+
+long
+foo (short *p)
+{
+  long b = *p;
+  q = p + 1;
+  return b;
+}
+
+void
+testTortureExecute (void)
+{
+  short a = 0xff00;
+  if (foo (&a) != (long) (short) 0xff00)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030221-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030221-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030221-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030221-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+   20030221-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <string.h>
+
+/* PR optimization/8613 */
+/* Contributed by Glen Nakamura */
+ 
+void
+testTortureExecute (void)
+{
+  char buf[16] = "1234567890";
+  char *p = buf;
+
+  *p++ = (char) strlen (buf);
+
+  if ((buf[0] != 10) || (p - buf != 1))
+    ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030307-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030307-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030307-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030307-1.c	2012-05-18 17:15:09.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+   20030307-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+// TODO: Enable when all ports support long long!
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+
+/* PR optimization/8726 */
+/* Originator: Paul Eggert <eggert@twinsun.com> */
+
+/* Verify that GCC doesn't miscompile tail calls on Sparc. */
+
+int fcntl_lock(int fd, int op, long long offset, long long count, int type);
+
+int vfswrap_lock(char *fsp, int fd, int op, long long offset, long long count, int type)
+{
+  return fcntl_lock(fd, op, offset, count, type);
+}
+
+int fcntl_lock(int fd, int op, long long offset, long long count, int type)
+{
+  return type;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+  if (vfswrap_lock (0, 1, 2, 3, 4, 5) != 5)
+    ASSERT (0);
+
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030313-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030313-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030313-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030313-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,81 @@
+/*
+   20030313-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct A
+{
+  unsigned long p, q, r, s;
+} x = { 13, 14, 15, 16 };
+
+extern void abort (void);
+extern void exit (int);
+
+static inline struct A *
+bar (void)
+{
+  struct A *r;
+
+  switch (8)
+    {
+    case 2:
+      ASSERT (0);
+      break;
+    case 8:
+      r = &x;
+      break;
+    default:
+      ASSERT (0);
+      break;
+    }
+  return r;
+}
+
+void
+foo (unsigned long *x, int y)
+{
+  if (y != 12)
+    ASSERT (0);
+  if (x[0] != 1 || x[1] != 11)
+    ASSERT (0);
+  if (x[2] != 2 || x[3] != 12)
+    ASSERT (0);
+  if (x[4] != 3 || x[5] != 13)
+    ASSERT (0);
+  if (x[6] != 4 || x[7] != 14)
+    ASSERT (0);
+  if (x[8] != 5 || x[9] != 15)
+    ASSERT (0);
+  if (x[10] != 6 || x[11] != 16)
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_mcs51
+  unsigned long a[40];
+  int b = 0;
+
+  a[b++] = 1;
+  a[b++] = 11;
+  a[b++] = 2;
+  a[b++] = 12;
+  a[b++] = 3;
+  a[b++] = bar()->p;
+  a[b++] = 4;
+  a[b++] = bar()->q;
+  a[b++] = 5;
+  a[b++] = bar()->r;
+  a[b++] = 6;
+  a[b++] = bar()->s;
+  foo (a, b);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030316-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030316-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030316-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030316-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+   20030316-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR target/9164 */
+/* The comparison operand was sign extended erraneously.  */
+
+void
+testTortureExecute (void)
+{
+    long j = 0x40000000;
+    if ((unsigned int) (0x40000000 + j) < 0L)
+ 	ASSERT (0);
+
+    return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030401-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030401-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030401-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030401-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+   20030401-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Testcase for PR fortran/9974.  This was a miscompilation of the g77
+   front-end caused by the jump bypassing optimizations not handling
+   instructions inserted on CFG edges.  */
+
+int bar ()
+{
+  return 1;
+}
+
+void foo (int x)
+{
+  unsigned char error = 0;
+
+  if (! (error = ((x == 0) || bar ())))
+    bar ();
+  if (! error)
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  foo (1);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030403-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030403-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030403-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030403-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   20030403-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* The non-destructive folder was always emitting >= when folding
+   comparisons to signed_max+1.  */
+
+#include <limits.h>
+
+void
+testTortureExecute (void)
+{
+  unsigned long count = 8;
+
+  if (count > INT_MAX)
+    ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030408-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030408-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030408-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030408-1.c	2012-05-21 12:05:21.000000000 +0000
@@ -0,0 +1,69 @@
+/*
+   20030408-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <string.h>
+
+/* PR optimization/8634 */
+/* Contributed by Glen Nakamura <glen at imodulo dot com> */
+
+struct foo {
+  char a, b, c, d, e, f, g, h, i, j;
+};
+
+int test1 ()
+{
+  const char X[8] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H' };
+  char buffer[8];
+  memcpy (buffer, X, 8);
+  if (buffer[0] != 'A' || buffer[1] != 'B'
+      || buffer[2] != 'C' || buffer[3] != 'D'
+      || buffer[4] != 'E' || buffer[5] != 'F'
+      || buffer[6] != 'G' || buffer[7] != 'H')
+    ASSERT (0);
+  return 0;
+}
+
+int test2 ()
+{
+  const char X[10] = { 'A', 'B', 'C', 'D', 'E' };
+  char buffer[10];
+  memcpy (buffer, X, 10);
+  if (buffer[0] != 'A' || buffer[1] != 'B'
+      || buffer[2] != 'C' || buffer[3] != 'D'
+      || buffer[4] != 'E' || buffer[5] != '\0'
+      || buffer[6] != '\0' || buffer[7] != '\0'
+      || buffer[8] != '\0' || buffer[9] != '\0')
+    ASSERT (0);
+  return 0;
+}
+
+int test4 ()
+{
+  const struct foo X = { .b = 'B', .d = 'D', .f = 'F', .h = 'H' , .j = 'J' };
+  char buffer[10];
+  memcpy (buffer, &X, 10);
+  if (buffer[0] != '\0' || buffer[1] != 'B'
+      || buffer[2] != '\0' || buffer[3] != 'D'
+      || buffer[4] != '\0' || buffer[5] != 'F'
+      || buffer[6] != '\0' || buffer[7] != 'H'
+      || buffer[8] != '\0' || buffer[9] != 'J')
+    ASSERT (0);
+  return 0;
+}
+
+void
+testTortureExecute (void)
+{
+#if !defined (__SDCC_z80) && !defined (__SDCC_z180) && !defined (__SDCC_r2k) && !defined (__SDCC_r3ka) && !defined (__SDCC_gbz80) && !defined (__SDCC_mcs51)
+  test1 (); test2 (); test4 ();
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030606-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030606-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030606-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030606-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   20030606-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <string.h>
+
+int * foo (int *x, int b)
+{
+
+  *(x++) = 55;
+  if (b)
+    *(x++) = b;
+
+  return x;
+}
+
+void
+testTortureExecute (void)
+{
+  int a[5];
+
+  memset (a, 1, sizeof (a));
+
+  if (foo (a, 0) - a != 1 || a[0] != 55 || a[1] != a[4])
+    ASSERT (0);
+
+  memset (a, 1, sizeof (a));
+
+  if (foo (a, 2) - a != 2 || a[0] != 55 || a[1] != 2)
+    ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030613-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030613-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030613-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030613-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,76 @@
+/*
+   20030613-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports struct assignment!
+#if 0
+/* PR optimization/10955 */
+/* Originator: <heinrich.brand@fujitsu-siemens.com> */
+
+/* This used to fail on SPARC32 at -O3 because the loop unroller
+   wrongly thought it could eliminate a pseudo in a loop, while
+   the pseudo was used outside the loop.  */
+
+#define COMPLEX struct CS
+
+COMPLEX {
+  long x;
+  long y;
+};
+
+
+static COMPLEX CCID (COMPLEX x)
+{
+  COMPLEX a;
+
+  a.x = x.x;
+  a.y = x.y;
+
+  return a;
+}
+
+
+static COMPLEX CPOW (COMPLEX x, int y)
+{
+  COMPLEX a;
+  a = x;
+
+  while (--y > 0)
+    a=CCID(a);
+
+  return a;
+}
+
+
+static int c5p (COMPLEX x)
+{
+  COMPLEX a,b;
+  a = CPOW (x, 2);
+  b = CCID( CPOW(a,2) );
+    
+  return (b.x == b.y); 
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  COMPLEX  x;  
+
+  x.x = -7;
+  x.y = -7;
+
+  if (!c5p(x))
+    ASSERT(0);
+
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030626-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030626-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030626-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030626-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+   20030626-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <stdio.h>
+
+char buf[10];
+
+void
+testTortureExecute (void)
+{
+  int l = sprintf (buf, "foo\0bar");
+  if (l != 3)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030626-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030626-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030626-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030626-2.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,24 @@
+/*
+   20030626-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <stdio.h>
+
+char buf[40];
+
+void
+testTortureExecute (void)
+{
+  int i = 0;
+  int l = sprintf (buf, "%s", i++ ? "string" : "other string");
+  if (l != sizeof ("other string") - 1 || i != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030714-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030714-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030714-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030714-1.c	2012-03-13 11:03:51.000000000 +0000
@@ -0,0 +1,205 @@
+/*
+   20030714-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5))
+/* derived from PR optimization/11440  */
+
+typedef _Bool bool;
+const bool false = 0;
+const bool true = 1;
+
+enum EPosition 
+{
+  STATIC, RELATIVE, ABSOLUTE, FIXED
+};
+typedef enum EPosition EPosition;
+
+enum EFloat 
+{
+  FNONE = 0, FLEFT, FRIGHT
+};
+typedef enum EFloat EFloat;
+
+struct RenderBox
+{
+  int unused[6];
+  short m_verticalPosition;
+  
+  bool m_layouted : 1;
+  bool m_unused : 1;
+  bool m_minMaxKnown : 1;
+  bool m_floating : 1;
+  
+  bool m_positioned : 1;
+  bool m_overhangingContents : 1;
+  bool m_relPositioned : 1;
+  bool m_paintSpecial : 1;
+  
+  bool m_isAnonymous : 1;
+  bool m_recalcMinMax : 1;
+  bool m_isText : 1;
+  bool m_inline : 1;
+  
+  bool m_replaced : 1;
+  bool m_mouseInside : 1;
+  bool m_hasFirstLine : 1;
+  bool m_isSelectionBorder : 1;
+  
+  bool (*isTableCell) (struct RenderBox *this);
+};
+
+typedef struct RenderBox RenderBox;
+
+struct RenderStyle
+{
+  struct NonInheritedFlags 
+    {
+      union 
+	{
+	  struct 
+	    {
+	      unsigned int _display : 4;
+	      unsigned int _bg_repeat : 2;
+	      bool _bg_attachment : 1;
+	      unsigned int _overflow : 4 ;
+	      unsigned int _vertical_align : 4;
+	      unsigned int _clear : 2;
+	      EPosition _position : 2;
+	      EFloat _floating : 2;
+	      unsigned int _table_layout : 1;
+	      bool _flowAroundFloats :1;
+
+	      unsigned int _styleType : 3;
+	      bool _hasHover : 1;
+	      bool _hasActive : 1;
+	      bool _clipSpecified : 1;
+	      unsigned int _unicodeBidi : 2;
+	      int _unused : 1;
+	    } f;
+	  int _niflags;
+	};
+    } noninherited_flags;
+};
+
+typedef struct RenderStyle RenderStyle;
+
+extern void RenderObject_setStyle(RenderBox *this, RenderStyle *_style);
+extern void removeFromSpecialObjects(RenderBox *this);
+
+
+
+void RenderBox_setStyle(RenderBox *thisin, RenderStyle *_style)
+{
+  RenderBox *this = thisin;
+  bool oldpos, tmp;
+  EPosition tmppo;
+  
+  tmp = this->m_positioned;
+
+  oldpos = tmp;
+
+  RenderObject_setStyle(this, _style);
+  
+  tmppo = _style->noninherited_flags.f._position;
+
+  switch(tmppo)
+    {
+    case ABSOLUTE:
+    case FIXED:
+	{
+	  bool ltrue = true;
+	  this->m_positioned = ltrue;
+	  break;
+	}
+
+    default:
+	{
+	  EFloat tmpf;
+	  EPosition tmpp;
+	  if (oldpos)
+	    {
+	      bool ltrue = true;
+	      this->m_positioned = ltrue;
+	      removeFromSpecialObjects(this);
+	    }
+	    {
+	      bool lfalse = false;
+	      this->m_positioned = lfalse;
+	    }
+
+	  tmpf = _style->noninherited_flags.f._floating;
+
+	  if(!this->isTableCell (this) && !(tmpf == FNONE)) 
+	    {
+	      bool ltrue = true;
+	      this->m_floating = ltrue;
+	    }
+	  else 
+	    {
+	      tmpp = _style->noninherited_flags.f._position;
+	      if (tmpp == RELATIVE)
+		{
+		  bool ltrue = true;
+		  this->m_relPositioned = ltrue;
+		}
+	    }
+	}
+    }
+}
+
+
+
+
+RenderBox g_this;
+RenderStyle g__style;
+
+void RenderObject_setStyle(RenderBox *this, RenderStyle *_style)
+{
+  (void) this;
+  (void) _style;
+}
+
+void removeFromSpecialObjects(RenderBox *this)
+{
+  (void) this;
+}
+
+bool RenderBox_isTableCell (RenderBox *this)
+{
+  (void) this;
+  return false;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5))
+  g_this.m_relPositioned = false;
+  g_this.m_positioned = false;
+  g_this.m_floating = false;
+  g_this.isTableCell = RenderBox_isTableCell;
+
+  g__style.noninherited_flags.f._position = FIXED;
+  g__style.noninherited_flags.f._floating = FNONE;
+
+  RenderBox_setStyle (&g_this, &g__style);
+  
+  if (g_this.m_positioned != true)
+    ASSERT (0);
+  if (g_this.m_relPositioned != false)
+    ASSERT (0);
+  if (g_this.m_floating != false)
+    ASSERT (0);
+
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030715-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030715-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030715-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030715-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,49 @@
+/*
+   20030715-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+#include <string.h>
+
+/* PR optimization/11320 */
+/* Origin: Andreas Schwab <schwab@suse.de> */
+
+/* Verify that the scheduler correctly computes the dependencies
+   in the presence of conditional instructions.  */
+
+int ap_standalone;
+
+const char *ap_check_cmd_context (void *a, int b)
+{
+  return 0;
+}
+
+const char *server_type (void *a, void *b, char *arg)
+{
+  const char *err = ap_check_cmd_context (a, 0x01|0x02|0x04|0x08|0x10);
+  if (err)
+    return err;
+
+  if (!strcmp (arg, "inetd"))
+    ap_standalone = 0;
+  else if (!strcmp (arg, "standalone"))
+      ap_standalone = 1;
+  else
+    return "ServerType must be either 'inetd' or 'standalone'";
+
+  return 0;
+}
+
+void
+testTortureExecute (void)
+{
+  server_type (0, 0, "standalone");
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030717-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030717-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030717-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030717-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,82 @@
+/*
+   20030717-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <string.h>
+
+/* PR target/11087
+   This testcase was miscompiled on ppc64, because basic_induction_var called
+   convert_modes, yet did not expect it to emit any new instructions.
+   Those were emitted at the end of the function and destroyed during life
+   analysis, while the program used uninitialized pseudos created by
+   convert_modes.  */
+
+struct A
+{
+  unsigned short a1;
+  unsigned long a2;
+};
+
+struct B
+{
+  int b1, b2, b3, b4, b5;
+};
+
+struct C
+{
+  struct B c1[1];
+  int c2, c3;
+};
+
+static
+int foo (int x)
+{
+  return  x < 0 ? -x : x;
+}
+
+int bar (struct C *x, struct A *y)
+{
+  int a = x->c3;
+  const int b = y->a1 >> 9;
+  const unsigned long c = y->a2;
+  int d = a;
+  unsigned long e, f;
+
+  f = foo (c - x->c1[d].b4);
+  do
+    {
+      if (d <= 0)
+	d = x->c2;
+      d--;
+
+      e = foo (c-x->c1[d].b4);
+      if (e < f)
+	a = d;
+    }
+  while (d != x->c3);
+  x->c1[a].b4 = c + b;
+  return a;
+}
+
+void
+testTortureExecute (void)
+{
+  struct A a;
+  struct C b;
+  int c;
+
+  a.a1 = 512;
+  a.a2 = 4242;
+  memset (&b, 0, sizeof (b));
+  b.c1[0].b3 = 424242;
+  b.c2 = 1;
+  c = bar (&b, &a);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030718-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030718-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030718-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030718-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+   20030718-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR c/10320
+   The function temp was not being emitted in a prerelease of 3.4 20030406. 
+   Contributed by pinskia@physics.uc.edu */
+
+static inline void temp();
+void
+testTortureExecute (void)
+{
+        temp();
+        return;
+}
+static void temp(){}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030828-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030828-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030828-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030828-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   20030828-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+const int *p;
+
+int bar (void)
+{
+  return *p + 1;
+}
+
+void
+testTortureExecute (void)
+{
+  /* Variable 'i' is never used but it's aliased to a global pointer.  The
+     alias analyzer was not considering that 'i' may be used in the call to
+     bar().  */
+  const int i = 5;
+  p = &i;
+  if (bar() != 6)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030828-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030828-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030828-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030828-2.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   20030828-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct rtx_def
+{
+  int code;
+};
+
+void
+testTortureExecute (void)
+{
+  int tmp[2];
+  struct rtx_def *r, s;
+  int *p, *q;
+
+  /* The alias analyzer was creating the same memory tag for r, p and q
+     because 'struct rtx_def *' is type-compatible with 'int *'.  However,
+     the alias set of 'int[2]' is not the same as 'int *', so variable
+     'tmp' was deemed not aliased with anything.  */
+  r = &s;
+  r->code = 39;
+
+  /* If 'r' wasn't declared, then q and tmp would have had the same memory
+     tag.  */
+  p = tmp;
+  q = p + 1;
+  *q = 0;
+  tmp[1] = 39;
+  if (*q != 39)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030903-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030903-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030903-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030903-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   20030903-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+/* Test that we don't let stmt.c think that the enumeration's values are
+   the entire set of possibilities.  Such an assumption is false for C,
+   but true for other languages.  */
+
+enum X { X1 = 1, X2, X3, X4 };
+static volatile enum X test = 0;
+static void y(int);
+
+void
+testTortureExecute (void)
+{
+  switch (test)
+    {
+    case X1: y(1); break;
+    case X2: y(2); break;
+    case X3: y(3); break;
+    case X4: y(4); break;
+    }
+  return;
+}
+
+static void y(int x) { ASSERT (0); }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030909-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030909-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030909-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030909-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+   20030909-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void test(int x, int y)
+{
+  if (x == y)
+    ASSERT (0);
+}
+
+void foo(int x, int y)
+{
+  if (x == y)
+    goto a;
+  else
+    {
+a:;
+      if (x == y)
+	goto b;
+      else
+	{
+b:;
+	  if (x != y)
+	    test (x, y);
+	}
+    }
+}
+
+void
+testTortureExecute (void)
+{
+  foo (0, 0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030913-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030913-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030913-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030913-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+   20030913-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Assignments via pointers pointing to global variables were being killed
+   by SSA-DCE.  Test contributed by Paul Brook <paul@nowt.org>  */
+
+int glob; 
+ 
+void 
+fn2(int ** q) 
+{ 
+  *q = &glob; 
+} 
+ 
+void test() 
+{ 
+  int *p; 
+ 
+  fn2(&p); 
+ 
+  *p=42; 
+} 
+ 
+void
+testTortureExecute (void)
+{ 
+  test(); 
+  if (glob != 42) ASSERT(0); 
+  return; 
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030914-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030914-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030914-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030914-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+   20030914-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports long double!
+#if 0
+/* On IRIX 6, PB is passed partially in registers and partially on the
+   stack, with an odd number of words in the register part.  Check that
+   the long double stack argument (PC) is still accessed properly.  */
+
+struct s { int val[16]; };
+
+long double f (int pa, struct s pb, long double pc)
+{
+  int i;
+
+  for (i = 0; i < 16; i++)
+    pc += pb.val[i];
+  return pc;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct s x;
+  int i;
+
+  for (i = 0; i < 16; i++)
+    x.val[i] = i + 1;
+  if (f (1, x, 10000.0L) != 10136.0L)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030914-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030914-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030914-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030914-2.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+   20030914-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports struct assignment!
+#if 0
+/* On IRIX 6, PA is passed partially in registers and partially on the
+   stack.  We therefore have two potential uses of pretend_args_size:
+   one for the partial argument and one for the varargs save area.
+   Make sure that these uses don't conflict.  */
+
+struct s { int i[18]; };
+
+int f (struct s pa, int pb, ...)
+{
+  return pb;
+}
+
+struct s gs;
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  if (f (gs, 0x1234) != 0x1234)
+    ASSERT (0);
+
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030916-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030916-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20030916-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20030916-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,50 @@
+/*
+   20030916-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* "i" overflows in f().  Check that x[i] is not treated as a giv.  */
+#include <limits.h>
+
+#if CHAR_BIT == 8
+
+void f (unsigned int *x)
+{
+  unsigned char i;
+  int j;
+
+  i = 0x10;
+  for (j = 0; j < 0x10; j++)
+    {
+      i += 0xe8;
+      x[i] = 0;
+      i -= 0xe7;
+    }
+}
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_mcs51
+  unsigned int x[256];
+  int i;
+
+  for (i = 0; i < 256; i++)
+    x[i] = 1;
+  f (x);
+  for (i = 0; i < 256; i++)
+    if (x[i] != (i >= 0x08 && i < 0xf8))
+      ASSERT (0);
+  return;
+#endif
+}
+#else
+void
+testTortureExecute (void) { return; }
+#endif
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20031010-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20031010-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20031010-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20031010-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,47 @@
+/*
+   20031010-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+
+/* A reminder to process ops in generate_expr_as_of_bb exactly once.  */
+
+long
+foo (long ct, long cf, _Bool p1, _Bool p2, _Bool p3)
+{
+  long diff;
+
+  diff = ct - cf;
+
+  if (p1)
+    {
+      if (p2)
+	{
+	  if (p3)
+	    {
+	      long tmp = ct;
+	      ct = cf;
+	      cf = tmp;
+	    }
+	  diff = ct - cf;
+	}
+
+      return diff;
+    }
+
+  ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo(2, 3, 1, 1, 1) == 0)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20031011-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20031011-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20031011-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20031011-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   20031011-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Check that MAX_EXPR and MIN_EXPR are working properly.  */
+
+#define MAX(X,Y) ((X) > (Y) ? (X) : (Y))
+#define MIN(X,Y) ((X) < (Y) ? (X) : (Y))
+
+void
+testTortureExecute (void)
+{
+  int ll_bitsize, ll_bitpos;
+  int rl_bitsize, rl_bitpos;
+  int end_bit;
+
+  ll_bitpos = 32;  ll_bitsize = 32;
+  rl_bitpos = 0;   rl_bitsize = 32;
+
+  end_bit = MAX (ll_bitpos + ll_bitsize, rl_bitpos + rl_bitsize);
+  if (end_bit != 64)
+    ASSERT (0);
+  end_bit = MAX (rl_bitpos + rl_bitsize, ll_bitpos + ll_bitsize);
+  if (end_bit != 64)
+    ASSERT (0);
+  end_bit = MIN (ll_bitpos + ll_bitsize, rl_bitpos + rl_bitsize);
+  if (end_bit != 32)
+    ASSERT (0);
+  end_bit = MIN (rl_bitpos + rl_bitsize, ll_bitpos + ll_bitsize);
+  if (end_bit != 32)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20031012-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20031012-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20031012-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20031012-1.c	2012-03-14 14:38:57.000000000 +0000
@@ -0,0 +1,51 @@
+/*
+   20031012-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR optimization/8750
+   Used to fail under Cygwin with 
+   -O2 -fomit-frame-pointer        
+   Testcase by David B. Trout     */
+
+#if defined(STACK_SIZE) && STACK_SIZE < 16000
+#define ARRAY_SIZE (STACK_SIZE / 2)
+#define STRLEN	   (ARRAY_SIZE - 9)
+#else
+#define ARRAY_SIZE 15000
+#define STRLEN     13371
+#endif
+
+#include <string.h>
+
+static void foo ()
+{
+#ifndef __SDCC_gbz80
+#ifndef __SDCC_mcs51
+    char a[ARRAY_SIZE]; /* Too big for mcs51 and gbz80. */
+
+    a[0]=0;
+    memset( &a[0], 0xCD, STRLEN );
+    a[STRLEN]=0;
+    if (strlen(a) != STRLEN)
+      ASSERT (0);
+#endif
+#endif
+}
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_gbz80
+#ifndef __SDCC_mcs51
+    foo();
+    return;
+#endif
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20031020-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20031020-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20031020-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20031020-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   20031020-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR target/12654
+   The Alpha backend tried to do a >= 1024 as (a - 1024) >= 0, which fails
+   for very large negative values.  */
+/* Origin: tg@swox.com  */
+
+#include <limits.h>
+
+void
+foo (long x)
+{
+  if (x >= 1024)
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  foo (LONG_MIN);
+  foo (LONG_MIN + 10000);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20031204-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20031204-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20031204-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20031204-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,62 @@
+/*
+   20031204-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+/* PR optimization/13260 */
+
+#include <string.h>
+#include <stdint.h>
+
+typedef uint32_t u32;
+
+u32 in_aton(const char* x)
+{
+  return 0x0a0b0c0d;
+}
+
+u32 root_nfs_parse_addr(char *name)
+{
+ u32 addr;
+ int octets = 0;
+ char *cp, *cq;
+
+ cp = cq = name;
+ while (octets < 4) {
+  while (*cp >= '0' && *cp <= '9')
+   cp++;
+  if (cp == cq || cp - cq > 3)
+   break;
+  if (*cp == '.' || octets == 3)
+   octets++;
+  if (octets < 4)
+   cp++;
+  cq = cp;
+ }
+
+ if (octets == 4 && (*cp == ':' || *cp == '\0')) {
+  if (*cp == ':')
+   *cp++ = '\0';
+  addr = in_aton(name);
+  strcpy(name, cp);
+ } else
+  addr = (-1);
+
+ return addr;
+}
+
+void
+testTortureExecute (void)
+{
+  static char addr[] = "10.11.12.13:/hello";
+  u32 result = root_nfs_parse_addr(addr);
+  if (result != 0x0a0b0c0d) { ASSERT(0); }
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20031211-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20031211-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20031211-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20031211-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   20031211-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+
+struct a { unsigned int bitfield : 1; };
+
+unsigned int x;
+
+void
+testTortureExecute (void)
+{
+  struct a a = {0};
+  x = 0xbeef;
+  a.bitfield |= x;
+  if (a.bitfield != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20031211-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20031211-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20031211-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20031211-2.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+   20031211-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct a
+{
+  unsigned int bitfield : 3;
+};
+
+void foo(unsigned int z);
+
+void
+testTortureExecute (void)
+{
+  struct a a;
+
+  a.bitfield = 131;
+  foo (a.bitfield);
+  return;
+}
+
+void foo(unsigned int z)
+{
+  if (z != 3)
+    ASSERT (0);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20031214-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20031214-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20031214-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20031214-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+   20031214-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#pragma disable_warning 93
+#endif
+
+/* PR optimization/10312 */
+/* Originator: Peter van Hoof <p dot van-hoof at qub dot ac dot uk> */
+
+/* Verify that the strength reduction pass doesn't find
+   illegitimate givs.  */
+
+struct
+{
+  double a;
+  int n[2];
+} g = { 0., { 1, 2}};
+
+int k = 0;
+
+void
+b (int *j)
+{
+}
+
+void
+testTortureExecute (void)
+{
+  int j;
+
+  for (j = 0; j < 2; j++)
+    k = (k > g.n[j]) ? k : g.n[j];
+
+  k++;
+  b (&j);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20031215-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20031215-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20031215-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20031215-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,49 @@
+/*
+   20031215-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR middle-end/13400 */
+/* The following test used to fail at run-time with a write to read-only
+   memory, caused by if-conversion converting a conditional write into an
+   unconditional write.  */
+
+typedef struct {int c, l; char ch[3];} pstr;
+const pstr ao = {2, 2, "OK"};
+const pstr * const a = &ao;
+
+void test1(void)
+{
+    if (a->ch[a->l]) {
+        ((char *)a->ch)[a->l] = 0;
+    }
+}
+
+void test2(void)
+{
+    if (a->ch[a->l]) {
+        ((char *)a->ch)[a->l] = -1;
+    }
+}
+
+void test3(void)
+{
+    if (a->ch[a->l]) {
+        ((char *)a->ch)[a->l] = 1;
+    }
+}
+
+void
+testTortureExecute (void)
+{
+    test1();
+    test2();
+    test3();
+    return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20031216-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20031216-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20031216-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20031216-1.c	2012-03-12 13:38:11.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+   20031216-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR optimization/13313 */
+/* Origin: Mike Lerwill <mike@ml-solutions.co.uk> */
+
+void DisplayNumber (unsigned long v)
+{
+  if (v != 0x9aL)
+    ASSERT (0);
+}
+
+unsigned long ReadNumber (void)
+{
+  return 0x009a0000L;
+}
+
+void
+testTortureExecute (void)
+{
+  unsigned long tmp;
+  tmp = (ReadNumber() & 0x00ff0000L) >> 16;
+  DisplayNumber (tmp);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20080117-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20080117-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20080117-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20080117-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,37 @@
+/*
+   20080117-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <string.h>
+
+typedef struct gs_imager_state_s {
+  struct {
+    int half_width;
+    int cap;
+    float miter_limit;
+  } line_params;
+} gs_imager_state;
+static const gs_imager_state gstate_initial = { { 1 } };
+void gstate_path_memory(gs_imager_state *pgs) {
+  /**pgs = gstate_initial; not yet supported by sdcc */
+  memcpy (pgs, &gstate_initial, sizeof (gstate_initial));
+}
+int gs_state_update_overprint(void)
+{
+  return gstate_initial.line_params.half_width;
+}
+
+void
+testTortureExecute (void)
+{
+  if (gs_state_update_overprint() != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20080408-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20080408-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20080408-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20080408-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,21 @@
+/*
+   20080408-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+  short ssi = 126;
+  unsigned short usi = 65280;
+  int fail = !(ssi < usi);
+  if (fail)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20080424-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20080424-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20080424-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20080424-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+   20080424-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR tree-optimization/36008 */
+
+#ifndef __SDCC_mcs51
+int g[48][3][3];
+
+void
+bar (int x[3][3], int y[3][3])
+{
+  static int i;
+  if (x != g[i + 8] || y != g[i++])
+    ASSERT (0);
+}
+
+static inline void
+foo (int x[][3][3])
+{
+  int i;
+  for (i = 0; i < 8; i++)
+    {
+      int k = i + 8;
+      bar (x[k], x[k - 8]);
+    }
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_mcs51
+  foo (g);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20080506-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20080506-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20080506-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20080506-1.c	2012-03-01 19:24:53.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+   20080506-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR middle-end/36137 */
+
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && (__GNUC__ < 5))
+  unsigned int u;
+  int i = -1;
+
+  u = MAX ((unsigned int) MAX (i, 0), 1);
+  if (u != 1)
+    ASSERT (0);
+
+  u = MIN ((unsigned int) MAX (i, 0), (unsigned int) i);
+  if (u != 0)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20080506-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20080506-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20080506-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20080506-2.c	2012-03-01 19:24:53.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   20080506-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR middle-end/36013 */
+
+void
+foo (int **restrict p, int **restrict q)
+{
+  *p[0] = 1;
+  *q[0] = 2;
+  if (*p[0] != 2)
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && (__GNUC__ < 5))
+  int a;
+  int *p1 = &a, *p2 = &a;
+  foo (&p1, &p2);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20080519-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20080519-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20080519-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20080519-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,68 @@
+/*
+   20080506-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+typedef unsigned long HARD_REG_SET[2];
+HARD_REG_SET reg_class_contents[2];
+
+struct du_chain
+{
+  struct du_chain *next_use;
+  int cl;
+};
+
+void
+merge_overlapping_regs (HARD_REG_SET *p)
+{
+  if ((*p)[0] != -1 || (*p)[1] != -1)
+    ASSERT (0);
+}
+
+void
+regrename_optimize (struct du_chain *this)
+{
+  HARD_REG_SET this_unavailable;
+  unsigned long *scan_fp_;
+  int n_uses;
+  struct du_chain *last;
+
+  this_unavailable[0] = 0;
+  this_unavailable[1] = 0;
+
+  n_uses = 0;
+  for (last = this; last->next_use; last = last->next_use)
+    {
+      scan_fp_ = reg_class_contents[last->cl];
+      n_uses++;
+      this_unavailable[0] |= ~ scan_fp_[0];
+      this_unavailable[1] |= ~ scan_fp_[1];
+    }
+  if (n_uses < 1)
+    return;
+
+  scan_fp_ = reg_class_contents[last->cl];
+  this_unavailable[0] |= ~ scan_fp_[0];
+  this_unavailable[1] |= ~ scan_fp_[1];
+
+  merge_overlapping_regs (&this_unavailable);
+}
+
+void
+testTortureExecute (void)
+{
+  struct du_chain du1 = { 0, 0 };
+  struct du_chain du0 = { &du1, 1 };
+  reg_class_contents[0][0] = -1;
+  reg_class_contents[0][1] = -1;
+  reg_class_contents[1][0] = 0;
+  reg_class_contents[1][1] = 0;
+  regrename_optimize (&du0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20080522-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20080522-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20080522-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20080522-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,53 @@
+/*
+   20080522-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* This testcase is to make sure we have i in referenced vars and that we
+   properly compute aliasing for the loads and stores.  */
+
+static int i;
+static int *p = &i;
+
+int
+foo(int *q)
+{
+  *p = 1;
+  *q = 2;
+  return *p;
+}
+
+int
+bar(int *q)
+{
+  *q = 2;
+  *p = 1;
+  return *q;
+}
+
+void
+testTortureExecute (void)
+{
+  int j = 0;
+
+  if (foo(&i) != 2)
+    ASSERT (0);
+  if (bar(&i) != 1)
+    ASSERT (0);
+  if (foo(&j) != 1)
+    ASSERT (0);
+  if (j != 2)
+    ASSERT (0);
+  if (bar(&j) != 2)
+    ASSERT (0);
+  if (j != 2)
+    ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20080529-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20080529-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20080529-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20080529-1.c	2012-05-18 16:46:53.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+   20080529-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR target/36362 */
+#if !(defined (__GNUC__) && __GNUC__ < 5)
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+int
+test (float c)
+{
+  return !!c * 7LL == 0;
+}
+#endif
+#endif
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && __GNUC__ < 5)
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_hc08) && !defined(__SDCC_s08) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+  if (test (1.0f) != 0)
+    ASSERT (0);
+#endif
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20080604-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20080604-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20080604-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20080604-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+   20080604-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct barstruct { char const* some_string; } x;
+
+void
+foo(void)
+{
+  if (!x.some_string)
+    ASSERT (0);
+}
+void baz(int b)
+{
+  struct barstruct bar;
+  struct barstruct* barptr;
+  if (b)
+    barptr = &bar;
+  else
+    {
+      barptr = &x + 1;
+      barptr = barptr - 1;
+    }
+  barptr->some_string = "Everything OK";
+  foo();
+  barptr->some_string = "Everything OK";
+}
+
+void
+testTortureExecute (void)
+{
+  x.some_string = (void *)0;
+  baz(0);
+  if (!x.some_string)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20080719-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20080719-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20080719-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20080719-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,79 @@
+/*
+   20080117-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <stdint.h>
+
+typedef uint32_t u32;
+
+static const u32 deadfish = 0xdeadf155;
+
+static const u32 cfb_tab8_be[] = {
+    0x00000000,0x000000ff,0x0000ff00,0x0000ffff,
+    0x00ff0000,0x00ff00ff,0x00ffff00,0x00ffffff,
+    0xff000000,0xff0000ff,0xff00ff00,0xff00ffff,
+    0xffff0000,0xffff00ff,0xffffff00,0xffffffff
+};
+
+static const u32 cfb_tab8_le[] = {
+    0x00000000,0xff000000,0x00ff0000,0xffff0000,
+    0x0000ff00,0xff00ff00,0x00ffff00,0xffffff00,
+    0x000000ff,0xff0000ff,0x00ff00ff,0xffff00ff,
+    0x0000ffff,0xff00ffff,0x00ffffff,0xffffffff
+};
+
+static const u32 cfb_tab16_be[] = {
+    0x00000000, 0x0000ffff, 0xffff0000, 0xffffffff
+};
+
+static const u32 cfb_tab16_le[] = {
+    0x00000000, 0xffff0000, 0x0000ffff, 0xffffffff
+};
+
+static const u32 cfb_tab32[] = {
+ 0x00000000, 0xffffffff
+};
+
+
+
+
+
+
+const u32 *xxx(int bpp)
+{
+ const u32 *tab;
+
+if (0) return &deadfish;
+
+ switch (bpp) {
+ case 8:
+  tab = cfb_tab8_be;
+  break;
+ case 16:
+  tab = cfb_tab16_be;
+  break;
+ case 32:
+ default:
+  tab = cfb_tab32;
+  break;
+ }
+
+ return tab;
+}
+
+void
+testTortureExecute (void)
+{
+  const u32 *a = xxx(8);
+  int32_t b = a[0];
+  if (b != cfb_tab8_be[0])
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20081103-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20081103-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20081103-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20081103-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+   20081103-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <string.h>
+
+// TODO: Enable when sdcc can pass structures as paramters.
+
+struct S { char c; char arr[4]; float f; };
+
+char A[4] = { '1', '2', '3', '4' };
+#if 0
+void foo (struct S s)
+{
+  if (memcmp (s.arr, A, 4))
+    ASSERT (0);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct S s;
+  memcpy (s.arr, A, 4);
+  foo (s);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20081112-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20081112-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20081112-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20081112-1.c	2012-02-27 19:06:03.000000000 +0000
@@ -0,0 +1,27 @@
+/*
+   20081112-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <limits.h>
+
+static void foo (int a)
+{
+  int b = (a - 1) + INT_MIN;
+
+  if (b != INT_MIN)
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  foo (1);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20090113-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20090113-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20090113-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20090113-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,77 @@
+/*
+   20090113-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#ifndef __SDCC_mcs51
+typedef struct descriptor_dimension
+{
+  int stride;
+  int lbound;
+  int ubound;
+} descriptor_dimension;
+typedef struct {
+    int *data;
+    int dtype;
+    descriptor_dimension dim[7];
+} gfc_array_i4;
+
+void
+msum_i4 (gfc_array_i4 * const retarray,
+	 gfc_array_i4 * const array,
+	 const int * const pdim)
+{
+  int count[7];
+  int extent[7];
+  int * dest;
+  const int * base;
+  int dim;
+  int n;
+  int len;
+
+  dim = (*pdim) - 1;
+  len = array->dim[dim].ubound + 1 - array->dim[dim].lbound;
+
+  for (n = 0; n < dim; n++)
+    {
+      extent[n] = array->dim[n].ubound + 1 - array->dim[n].lbound;
+      count[n] = 0;
+    }
+
+  dest = retarray->data;
+  base = array->data;
+
+  do
+    {
+      int result = 0;
+
+      for (n = 0; n < len; n++, base++)
+        result += *base;
+      *dest = result;
+
+      count[0]++;
+      dest += 1;
+    }
+  while (count[0] != extent[0]);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_mcs51
+  int rdata[3];
+  int adata[9];
+  gfc_array_i4 retarray = { rdata, 265, { { 1, 1, 3 } } };
+  gfc_array_i4 array = { adata, 266, { { 1, 1, 3 }, { 3, 1, 3 } } };
+  int dim = 2;
+  msum_i4 (&retarray, &array, &dim);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20090207-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20090207-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20090207-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20090207-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   20090207-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int foo(int i)
+{
+  int a[32];
+  a[1] = 3;
+  a[0] = 1;
+  a[i] = 2;
+  return a[0];
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo (0) != 2
+      || foo (1) != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20090527-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20090527-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20090527-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20090527-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,50 @@
+/*
+   20090527-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+typedef enum { POSITION_ASIS, POSITION_UNSPECIFIED } unit_position;
+
+typedef enum { STATUS_UNKNOWN, STATUS_UNSPECIFIED } unit_status;
+
+typedef struct
+{
+  unit_position position;
+  unit_status status;
+} unit_flags;
+
+extern void abort (void);
+
+void
+new_unit (unit_flags * flags)
+{
+  if (flags->status == STATUS_UNSPECIFIED)
+    flags->status = STATUS_UNKNOWN;
+
+  if (flags->position == POSITION_UNSPECIFIED)
+    flags->position = POSITION_ASIS;
+
+  switch (flags->status)
+    {
+    case STATUS_UNKNOWN:
+      break;
+
+    default:
+      ASSERT (0);
+    }
+}
+
+void
+testTortureExecute (void)
+{
+  unit_flags f;
+  f.status = STATUS_UNSPECIFIED;
+  new_unit (&f);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20090623-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20090623-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20090623-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20090623-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   20090623-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int *restrict x;
+
+int foo (int y)
+{
+  *x = y;
+  return *x;
+}
+
+void
+testTortureExecute (void)
+{
+  int i = 0;
+  x = &i;
+  if (foo(1) != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20090814-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20090814-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20090814-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20090814-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   20090814-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int
+bar (int *a)
+{
+  return *a;
+}
+int i;
+int
+foo (int (*a)[2])
+{
+  return bar (&(*a)[i]);
+}
+
+int a[2];
+void
+testTortureExecute (void)
+{
+  a[0] = -1;
+  a[1] = 42;
+  i = 1;
+  if (foo (&a) != 42)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20100316-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20100316-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20100316-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20100316-1.c	2012-06-15 15:43:51.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+   20100316-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#ifndef __SDCC_pic16 // TODO: enable when the pic16 ports supports bitfields of size greater than 8 bits!
+struct Foo {
+  int i;
+  unsigned precision : 10;
+  unsigned blah : 3;
+} f;
+
+int
+foo (struct Foo *p)
+{
+  struct Foo *q = p;
+  return (*q).precision;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_pic16
+  f.i = -1;
+  f.precision = 0;
+  f.blah = -1;
+  if (foo (&f) != 0)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20100805-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20100805-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20100805-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20100805-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,27 @@
+/*
+   20100805.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+unsigned int foo (unsigned int a, unsigned int b)
+{
+  unsigned i;
+  a = a & 1;
+  for (i = 0; i < b; ++i)
+    a = a << 1 | a >> (sizeof (unsigned int) * 8 - 1);
+  return a;
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo (1, sizeof (unsigned int) * 8 + 1) != 2)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20100827-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20100827-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20100827-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20100827-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   20100827-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int
+foo (char *p)
+{
+  int h = 0;
+  do
+    {
+      if (*p == '\0')
+	break;
+      ++h;
+      if (p == 0)
+	ASSERT (0);
+      ++p;
+    }
+  while (1);
+  return h;
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo("a") != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20101013-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20101013-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20101013-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20101013-1.c	2012-05-02 14:14:57.000000000 +0000
@@ -0,0 +1,52 @@
+/*
+   20101013-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Some ports do not yet support long long
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+
+/* PR rtl-optimization/45912 */
+
+static void*
+get_addr_base_and_unit_offset (void *base, long long *i)
+{
+  *i = 0;
+  return base;
+}
+
+static void*
+build_int_cst (void *base, long long offset)
+{
+  if (offset != 4)
+    ASSERT (0);
+
+  return base;
+}
+
+static void*
+build_ref_for_offset (void *base, long long offset)
+{
+  long long base_offset;
+  base = get_addr_base_and_unit_offset (base, &base_offset);
+  return build_int_cst (base, base_offset + offset / 8);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0 // TODO: Renebale when long long integer constants (the 32 below) work!
+//#if !defined(__SDCC_mcs51) && !defined(__SDCC_hc08) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+  void *ret = build_ref_for_offset ((void *)0, 32);
+  if (ret != (void *)0)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20101025-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20101025-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-20101025-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-20101025-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+   20101025-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+static int g_7;
+static int *volatile g_6 = &g_7;
+int g_3;
+
+static int f1 (int *p_58)
+{
+    return *p_58;
+}
+
+void f2 (int i);
+void f2 (int i)
+{
+  g_3 = i;
+}
+
+int f3 (void);
+int f3 (void)
+{
+    *g_6 = 1;
+    f2 (f1 (&g_7));
+    return 0;
+}
+
+void
+testTortureExecute (void)
+{
+  f3 ();
+  if (g_3 != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920202-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920202-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920202-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920202-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   920202-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+static int rule_text_needs_stack_pop = 0;
+static int input_stack_pos = 1;
+
+f (void)
+{
+  rule_text_needs_stack_pop = 1;
+
+  if (input_stack_pos <= 0)
+    return 1;
+  else
+    return 0;
+}
+
+void
+testTortureExecute (void)
+{
+  f ();
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920409-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920409-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920409-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920409-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,16 @@
+/*
+   920409-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int
+x(void){signed char c=-1;return c<0;}
+
+void
+testTortureExecute (void){if(x()!=1)ASSERT(0);return;}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920411-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920411-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920411-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920411-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   920411-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+long f (char *w)
+{
+  long k, i, c = 0, x;
+  char *p = (char*) &x;
+  for (i = 0; i < 1; i++)
+    {
+      for (k = 0; k < sizeof (long); k++)
+	p[k] = w[k];
+      c += x;
+    }
+  return c;
+}
+
+void
+testTortureExecute (void)
+{
+  int i;
+  char a[sizeof (long)];
+
+  for (i = sizeof (long); --i >= 0;) a[i] = ' ';
+  if (f (a) != ~0UL / (unsigned char) ~0 * ' ')
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920428-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920428-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920428-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920428-1.c	2012-04-12 17:22:46.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   920428-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+x (const char*s)
+{
+  char a[1];
+  const char *ss = s;
+  a[*s++] |= 1;
+  return (int)ss + 1 == (int)s;
+}
+
+void
+testTortureExecute (void)
+{
+  if (x("") != 1)
+    ASSERT(0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920429-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920429-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920429-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920429-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,16 @@
+/*
+   920429-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+typedef unsigned char t;int i,j;
+t*f(const t*p){t c;c=*p++;i=((c&2)?1:0);j=(c&7)+1;return p;}
+
+void
+testTortureExecute (void){const t*p0="ab",*p1;p1=f(p0);if(p0+1!=p1)ASSERT(0);return;}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920501-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920501-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920501-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920501-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   920501-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+int s[2];
+
+int
+x(int parm)
+{
+  if(!s[0])
+    {
+      s[1+s[1]]=s[1];
+      return 1;
+    }
+}
+
+void
+testTortureExecute (void){s[0]=s[1]=0;if(x(0)!=1)ASSERT(0);return;}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920501-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920501-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920501-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920501-2.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,131 @@
+/*
+   920501-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo: Enable when sdcc supports long long
+#if 0
+unsigned long
+gcd_ll (unsigned long long x, unsigned long long y)
+{
+  for (;;)
+    {
+      if (y == 0)
+	return (unsigned long) x;
+      x = x % y;
+      if (x == 0)
+	return (unsigned long) y;
+      y = y % x;
+    }
+}
+
+unsigned long long
+powmod_ll (unsigned long long b, unsigned e, unsigned long long m)
+{
+  unsigned t;
+  unsigned long long pow;
+  int i;
+
+  if (e == 0)
+    return 1;
+
+  /* Find the most significant bit in E.  */
+  t = e;
+  for (i = 0; t != 0; i++)
+    t >>= 1;
+
+  /* The most sign bit in E is handled outside of the loop, by beginning
+     with B in POW, and decrementing I.  */
+  pow = b;
+  i -= 2;
+
+  for (; i >= 0; i--)
+    {
+      pow = pow * pow % m;
+      if ((1 << i) & e)
+	pow = pow * b % m;
+    }
+
+  return pow;
+}
+
+unsigned long factab[10];
+
+void
+facts (t, a_int, x0, p)
+     unsigned long long t;
+     int a_int;
+     int x0;
+     unsigned p;
+{
+  unsigned long *xp = factab;
+  unsigned long long x, y;
+  unsigned long q = 1;
+  unsigned long long a = a_int;
+  int i;
+  unsigned long d;
+  int j = 1;
+  unsigned long tmp;
+  int jj = 0;
+
+  x = x0;
+  y = x0;
+
+  for (i = 1; i < 10000; i++)
+    {
+      x = powmod_ll (x, p, t) + a;
+      y = powmod_ll (y, p, t) + a;
+      y = powmod_ll (y, p, t) + a;
+
+      if (x > y)
+	tmp = x - y;
+      else
+	tmp = y - x;
+      q = (unsigned long long) q * tmp % t;
+
+      if (i == j)
+	{
+	  jj += 1;
+	  j += jj;
+	  d = gcd_ll (q, t);
+	  if (d != 1)
+	    {
+	      *xp++ = d;
+	      t /= d;
+	      if (t == 1)
+		{
+		  return;
+		  *xp = 0;
+		}
+	    }
+	}
+    }
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  unsigned long long t;
+  unsigned x0, a;
+  unsigned p;
+
+  p = 27;
+  t = (1ULL << p) - 1;
+
+  a = -1;
+  x0 = 3;
+
+  facts (t, a, x0, p);
+  if (factab[0] != 7 || factab[1] != 73 || factab[2] != 262657)
+    ASSERT(0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920501-6.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920501-6.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920501-6.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920501-6.c	2012-03-30 09:18:32.000000000 +0000
@@ -0,0 +1,106 @@
+/*
+   920501-6.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports long long constants!
+#if 0
+#include <stdio.h>
+
+/* Convert a decimal string to a long long unsigned.  No error check is
+   performed.  */
+
+long long unsigned
+str2llu (str)
+     char *str;
+{
+  long long unsigned acc;
+  int d;
+  acc =  *str++ - '0';
+  for (;;)
+    {
+      d = *str++;
+      if (d == '\0')
+	break;
+      d -= '0';
+      acc = acc * 10 + d;
+    }
+
+  return acc;
+}
+
+/* isqrt(t) - computes the square root of t. (tege 86-10-27) */
+
+long unsigned
+sqrtllu (long long unsigned t)
+{
+  long long unsigned s;
+  long long unsigned b;
+
+  for (b = 0, s = t;  b++, (s >>= 1) != 0; )
+    ;
+
+  s = 1LL << (b >> 1);
+
+  if (b & 1)
+    s += s >> 1;
+
+  do
+    {
+      b = t / s;
+      s = (s + b) >> 1;
+    }
+  while (b < s);
+
+  return s;
+}
+
+
+int plist (p0, p1, tab)
+     long long unsigned p0, p1;
+     long long unsigned *tab;
+{
+  long long unsigned p;
+  long unsigned d;
+  long unsigned s;
+  long long unsigned *xp = tab;
+
+  for (p = p0;  p <= p1;  p += 2)
+    {
+      s = sqrtllu (p);
+
+      for (d = 3;  d <= s;  d += 2)
+	{
+	  long long unsigned q = p % d;
+	  if (q == 0)
+	    goto not_prime;
+	}
+
+      *xp++ = p;
+    not_prime:;
+    }
+  *xp = 0;
+  return xp - tab;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  long long tab[10];
+  int nprimes;
+  nprimes = plist (str2llu ("1234111111"), str2llu ("1234111127"), tab);
+
+  if(tab[0]!=1234111117LL||tab[1]!=1234111121LL||tab[2]!=1234111127LL||tab[3]!=0)
+    ASSERT(0);
+
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920501-8.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920501-8.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920501-8.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920501-8.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,57 @@
+/*
+   920501-8.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when double is fully supported!
+#if 0
+#include <string.h>
+
+#include <stdio.h>
+#include <stdarg.h>
+
+char buf[50];
+int
+va (int a, double b, int c, ...)
+{
+  va_list ap;
+  int d, e, f, g, h, i, j, k, l, m, n, o, p;
+  va_start (ap, c);
+
+  d = va_arg (ap, int);
+  e = va_arg (ap, int);
+  f = va_arg (ap, int);
+  g = va_arg (ap, int);
+  h = va_arg (ap, int);
+  i = va_arg (ap, int);
+  j = va_arg (ap, int);
+  k = va_arg (ap, int);
+  l = va_arg (ap, int);
+  m = va_arg (ap, int);
+  n = va_arg (ap, int);
+  o = va_arg (ap, int);
+  p = va_arg (ap, int);
+
+  sprintf (buf,
+	   "%d,%f,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d",
+	   a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p);
+  va_end (ap);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  va (1, 1.0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
+  if (strcmp ("1,1.000000,2,3,4,5,6,7,8,9,10,11,12,13,14,15", buf))
+    ASSERT(0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920501-9.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920501-9.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920501-9.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920501-9.c	2012-03-30 09:18:32.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+   920501-9.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <stdio.h>
+
+// Todo: Enable when sdcc supports long long constants!
+#if 0
+long long proc1(){return 1LL;}
+long long proc2(){return 0x12345678LL;}
+long long proc3(){return 0xaabbccdd12345678LL;}
+long long proc4(){return -1LL;}
+long long proc5(){return 0xaabbccddLL;}
+
+print_longlong(x,buf)
+     long long x;
+     char *buf;
+{
+  unsigned long l;
+  l= (x >> 32) & 0xffffffff;
+  if (l != 0)
+    sprintf(buf,"%lx%08.lx",l,((unsigned long)x & 0xffffffff));
+  else
+    sprintf(buf,"%lx",((unsigned long)x & 0xffffffff));
+}
+#endif
+
+void
+testTortureExecute (void){
+#if 0
+char buf[100];
+print_longlong(proc1(),buf);if(strcmp("1",buf))abort();
+print_longlong(proc2(),buf);if(strcmp("12345678",buf))abort();
+print_longlong(proc3(),buf);if(strcmp("aabbccdd12345678",buf))abort();
+print_longlong(proc4(),buf);if(strcmp("ffffffffffffffff",buf))abort();
+print_longlong(proc5(),buf);if(strcmp("aabbccdd",buf))abort();
+#endif
+return;}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920506-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920506-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920506-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920506-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,14 @@
+/*
+   920506-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int l[]={0,1};
+
+void
+testTortureExecute (void){int*p=l;switch(*p++){case 0:return;case 1:break;case 2:break;case 3:case 4:break;}ASSERT(0);}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920520-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920520-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920520-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920520-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,48 @@
+/*
+   920520-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+foo(int *bar)
+{
+  *bar = 8;
+}
+
+bugger()
+{
+  int oldDepth, newDepth;
+
+  foo(&oldDepth);
+
+  switch (oldDepth)
+    {
+    case 8:
+    case 500:
+      newDepth = 8;
+      break;
+
+    case 5000:
+      newDepth = 500;
+      break;
+
+    default:
+      newDepth = 17;
+      break;
+    }
+
+  return newDepth - oldDepth;
+}
+
+void
+testTortureExecute (void)
+{
+  if (bugger() != 0)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920603-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920603-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920603-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920603-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,20 @@
+/*
+   920603-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+f(int got)
+{
+  if (got!=0xffff)
+    ASSERT(0);
+}
+
+void
+testTortureExecute (void){signed char c=-1;unsigned u=(unsigned short)c;f(u);return;}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920604-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920604-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920604-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920604-1.c	2012-03-30 09:18:32.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+   920604-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports long long mod!
+#if 0
+long long
+mod (a, b)
+     long long a, b;
+{
+  return a % b;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  mod (1LL, 2LL);
+  exit (0);
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920612-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920612-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920612-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920612-1.c	2012-04-01 11:33:10.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   920612-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int
+f(int j)
+{
+  return ++j > 0;
+}
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && (__GNUC__ < 5))
+  if(f ((~0U) >> 1))
+    ASSERT(0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920618-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920618-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920618-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920618-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,13 @@
+/*
+   920618-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void){if(1.17549435e-38F<=1.1)return;ASSERT(0);}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920625-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920625-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920625-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920625-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,55 @@
+/*
+   920625-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <stdarg.h>
+
+// Todo. Enable when sdcc supports struct assignment!
+#if 0
+typedef struct{double x,y;}point;
+point pts[]={{1.0,2.0},{3.0,4.0},{5.0,6.0},{7.0,8.0}};
+static int va1(int nargs,...)
+{
+  va_list args;
+  int i;
+  point pi;
+  va_start(args,nargs);
+  for(i=0;i<nargs;i++){
+    pi=va_arg(args,point);
+    if(pts[i].x!=pi.x||pts[i].y!=pi.y)ASSERT(0);
+  }
+  va_end(args);
+}
+
+typedef struct{int x,y;}ipoint;
+ipoint ipts[]={{1,2},{3,4},{5,6},{7,8}};
+static int va2(int nargs,...)
+{
+  va_list args;
+  int i;
+  ipoint pi;
+  va_start(args,nargs);
+  for(i=0;i<nargs;i++){
+    pi=va_arg(args,ipoint);
+    if(ipts[i].x!=pi.x||ipts[i].y!=pi.y)ASSERT(0);
+  }
+  va_end(args);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+va1(4,pts[0],pts[1],pts[2],pts[3]);
+va2(4,ipts[0],ipts[1],ipts[2],ipts[3]);
+return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920710-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920710-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920710-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920710-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   920710-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+// Enable when sdcc supports double and unsigned long long.
+#if 0
+  if ((double) 18446744073709551615ULL < 1.84467440737095e+19 ||
+      (double) 18446744073709551615ULL > 1.84467440737096e+19)
+    ASSERT(0);
+
+  if (16777217L != (float)16777217e0)
+    ASSERT(0);
+
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920711-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920711-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920711-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920711-1.c	2012-04-01 11:33:10.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+   920711-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+f(long a)
+{
+  return (--a > 0);
+}
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && (__GNUC__ < 5))
+  if(f (0x80000000L) == 0)
+    ASSERT(0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920721-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920721-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920721-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920721-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,13 @@
+/*
+   920721-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+long f(short a,short b){return (long)a/b;}
+void
+testTortureExecute (void){if(f(-32768,-1)!=32768L)ASSERT(0);else return;}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920721-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920721-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920721-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920721-2.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   920721-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo. Enable when sdcc supports VLA!
+#if 0
+void f(void){}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  int n=2;
+  double x[n];
+  f();
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920721-3.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920721-3.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920721-3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920721-3.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+   920721-3.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+static inline fu (unsigned short data)
+{
+  return data;
+}
+
+void ru(int i)
+{
+   if(fu(i++)!=5)ASSERT(0);
+   if(fu(++i)!=7)ASSERT(0);
+}
+
+static inline fs (signed short data)
+{
+  return data;
+}
+
+void rs(int i)
+{
+   if(fs(i++)!=5)ASSERT(0);
+   if(fs(++i)!=7)ASSERT(0);
+}
+
+
+void
+testTortureExecute (void)
+{
+  ru(5);
+  rs(5);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920726-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920726-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920726-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920726-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,82 @@
+/*
+   920726-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <string.h>
+
+// Todo: Enable when sdcc supports returning struct!
+#if 0
+#include <stdio.h>
+#include <stdarg.h>
+
+struct spurious
+{
+    int anumber;
+};
+
+int first(char *buf, char *fmt, ...)
+{
+  int pos, number;
+  va_list args;
+  int dummy;
+  char *bp = buf;
+
+  va_start(args, fmt);
+  for (pos = 0; fmt[pos]; pos++)
+    if (fmt[pos] == 'i')
+      {
+	number = va_arg(args, int);
+	sprintf(bp, "%d", number);
+	bp += strlen(bp);
+      }
+    else
+      *bp++ = fmt[pos];
+
+  va_end(args);
+  *bp = 0;
+  return dummy;
+}
+
+struct spurious second(char *buf,char *fmt, ...)
+{
+  int pos, number;
+  va_list args;
+  struct spurious dummy;
+  char *bp = buf;
+
+  va_start(args, fmt);
+  for (pos = 0; fmt[pos]; pos++)
+    if (fmt[pos] == 'i')
+      {
+	number = va_arg(args, int);
+	sprintf(bp, "%d", number);
+	bp += strlen(bp);
+      }
+    else
+      *bp++ = fmt[pos];
+
+  va_end(args);
+  *bp = 0;
+  return dummy;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  char buf1[100], buf2[100];
+  first(buf1, "i i ", 5, 20);
+  second(buf2, "i i ", 5, 20);
+  if (strcmp ("5 20 ", buf1) || strcmp ("5 20 ", buf2))
+    ASSERT(0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920730-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920730-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920730-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920730-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+   920730-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* 920730-1.c */
+#include <limits.h>
+int f1()
+{
+	int b=INT_MIN;
+	return b>=INT_MIN;
+}
+
+int f2()
+{
+	int b=INT_MIN+1;
+	return b>= (unsigned)(INT_MAX+2);
+}
+
+int f3()
+{
+	int b=INT_MAX;
+	return b>=INT_MAX;
+}
+
+int f4()
+{
+	int b=-1;
+	return b>=UINT_MAX;
+}
+
+void
+testTortureExecute (void)
+{
+	if((f1()&f2()&f3()&f4())!=1)
+		ASSERT(0);
+		return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920731-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920731-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920731-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920731-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,14 @@
+/*
+   920731-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int f(int x){int i;for(i=0;i<8&&(x&1)==0;x>>=1,i++);return i;}
+void
+testTortureExecute (void){if(f(4)!=2)ASSERT(0);return;}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920810-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920810-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920810-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920810-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   920810-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+typedef struct{void*super;int name;int size;}t;
+t*f(t*clas,int size)
+{
+  t*child=(t*)malloc(size);
+  memcpy(child,clas,clas->size);
+  child->super=clas;
+  child->name=0;
+  child->size=size;
+  return child;
+}
+void
+testTortureExecute (void)
+{
+  t foo,*bar;
+  memset(&foo,37,sizeof(t));
+  foo.size=sizeof(t);
+  bar=f(&foo,sizeof(t));
+  if(bar->super!=&foo||bar->name!=0||bar->size!=sizeof(t))ASSERT(0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920812-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920812-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920812-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920812-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,15 @@
+/*
+   920812-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+typedef int t;
+f(t y){switch(y){case 1:return 1;}return 0;}
+void
+testTortureExecute (void){if(f((t)1)!=1)ASSERT(0);return;}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920829-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920829-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920829-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920829-1.c	2012-03-30 09:18:32.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+   920829-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo: Enable when sdcc supports long long constants!
+#if 0
+long long c=2863311530LL,c3=2863311530LL*3;
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  if(c*3!=c3)
+    ASSERT(0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920908-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920908-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920908-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920908-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+   920908-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports returning struct!
+#if 0
+/* REPRODUCED:RUN:SIGNAL MACHINE:mips OPTIONS: */
+
+#include <stdarg.h>
+
+typedef struct{int A;}T;
+
+T f(int x,...)
+{
+va_list ap;
+T X;
+va_start(ap,x);
+X=va_arg(ap,T);
+if(X.A!=10)abort();
+X=va_arg(ap,T);
+if(X.A!=20)abort();
+va_end(ap);
+return X;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+T X,Y;
+int i;
+X.A=10;
+Y.A=20;
+f(2,X,Y);
+return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920909-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920909-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920909-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920909-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,14 @@
+/*
+   920909-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int f(int a){switch(a){case 0x402:return a+1;case 0x403:return a+2;case 0x404:return a+3;case 0x405:return a+4;case 0x406:return 1;case 0x407:return 4;}return 0;}
+void
+testTortureExecute (void){if(f(1))ASSERT(0);return;}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920922-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920922-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920922-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920922-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   920922-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+unsigned long*
+f(unsigned long *p)
+{
+  unsigned long a = (*p++) >> 24;
+  return p + a;
+}
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_mcs51
+  unsigned long x = 0x80000000UL;
+  if (f(&x) != &x + 0x81)
+    ASSERT(0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920929-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920929-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-920929-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-920929-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,31 @@
+/*
+   920929-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo: Enable when sdcc supports VLA!
+#if 0
+/* REPRODUCED:RUN:SIGNAL MACHINE:sparc OPTIONS: */
+f(int n)
+{
+int i;
+double v[n];
+for(i=0;i<n;i++)
+v[i]=0;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+f(100);
+return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921006-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921006-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921006-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921006-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,20 @@
+/*
+   921006-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <string.h>
+
+/* REPRODUCED:RUN:SIGNAL MACHINE:i386 OPTIONS:-O */
+void
+testTortureExecute (void)
+{
+if(strcmp("X","")<0)ASSERT(0);
+return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921013-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921013-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921013-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921013-1.c	2012-05-16 16:46:57.000000000 +0000
@@ -0,0 +1,31 @@
+/*
+   921013-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void f(int *d, float *x, float *y,int n)
+{
+  while(n--){*d++=*x++==*y++;}
+}
+
+void
+testTortureExecute (void)
+{
+  int r[4]={2,2,2,2};
+  float a[]={5,1,3,5};
+  float b[]={2,4,3,0};
+
+  f(r,a,b,4);
+#ifndef __SDCC_USE_XSTACK
+  ASSERT ((a[0]==b[0]) == r[0]);
+  ASSERT ((a[1]==b[1]) == r[1]);
+  ASSERT ((a[2]==b[2]) == r[2]);
+  ASSERT ((a[3]==b[3]) == r[3]);
+#endif
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921016-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921016-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921016-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921016-1.c	2012-06-15 15:43:51.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+   921016-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_pic16 // TODO: enable when the pic16 ports supports bitfields of size greater than 8 bits!
+  int j=1081;
+  struct
+    {
+      signed int m:11;
+   } l;
+  if((l.m = j) == j)
+    ASSERT(0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921019-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921019-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921019-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921019-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,20 @@
+/*
+   921019-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void *foo[]={(void *)&("X"[0])};
+
+void
+testTortureExecute (void)
+{
+  if (((char*)foo[0])[0] != 'X')
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921019-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921019-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921019-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921019-2.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,21 @@
+/*
+   921019-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#endif
+
+void
+testTortureExecute (void)
+{
+  double x,y=0.5;
+  x=y/0.2;
+  if(x!=x)
+    ASSERT(0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921029-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921029-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921029-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921029-1.c	2012-03-30 09:18:32.000000000 +0000
@@ -0,0 +1,59 @@
+/*
+   921029-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports unsigned long long constants!
+#if 0
+typedef unsigned long long ULL;
+ULL back;
+ULL hpart, lpart;
+ULL
+build(long h, long l)
+{
+  hpart = h;
+  hpart <<= 32;
+  lpart = l;
+  lpart &= 0xFFFFFFFFLL;
+  back = hpart | lpart;
+  return back;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  if (build(0, 1) != 0x0000000000000001LL)
+    ASSERT(0);
+  if (build(0, 0) != 0x0000000000000000LL)
+    ASSERT(0);
+  if (build(0, 0xFFFFFFFF) != 0x00000000FFFFFFFFLL)
+    ASSERT(0);
+  if (build(0, 0xFFFFFFFE) != 0x00000000FFFFFFFELL)
+    ASSERT(0);
+  if (build(1, 1) != 0x0000000100000001LL)
+    ASSERT(0);
+  if (build(1, 0) != 0x0000000100000000LL)
+    ASSERT(0);
+  if (build(1, 0xFFFFFFFF) != 0x00000001FFFFFFFFLL)
+    ASSERT(0);
+  if (build(1, 0xFFFFFFFE) != 0x00000001FFFFFFFELL)
+    ASSERT(0);
+  if (build(0xFFFFFFFF, 1) != 0xFFFFFFFF00000001LL)
+    ASSERT(0);
+  if (build(0xFFFFFFFF, 0) != 0xFFFFFFFF00000000LL)
+    ASSERT(0);
+  if (build(0xFFFFFFFF, 0xFFFFFFFF) != 0xFFFFFFFFFFFFFFFFLL)
+    ASSERT(0);
+  if (build(0xFFFFFFFF, 0xFFFFFFFE) != 0xFFFFFFFFFFFFFFFELL)
+    ASSERT(0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921104-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921104-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921104-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921104-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,19 @@
+/*
+   921104-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+  unsigned long val = 1;
+
+  if (val > (unsigned long) ~0)
+    ASSERT(0);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921112-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921112-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921112-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921112-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+   921112-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#endif
+
+// TODO: Enable when sdcc supports struct!
+#if 0
+union u {
+  struct { int i1, i2; } t;
+  double d;
+} x[2], v;
+
+void f (union u *x, union u *v)
+{
+  *++x = v;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  x[1].t.i1 = x[1].t.i2 = 0;
+  v.t.i1 = 1;
+  v.t.i2 = 2;
+  f (x, v);
+  if (x[1].t.i1 != 1 || x[1].t.i2 != 2)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921117-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921117-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921117-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921117-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+   921117-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports struct!
+#if 0
+struct s {
+  char text[11];
+  int flag;
+} cell;
+
+int
+check (struct s p)
+{
+  if (p.flag != 99)
+    return 1;
+  return strcmp (p.text, "0123456789");
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  cell.flag = 99;
+  strcpy (cell.text, "0123456789");
+
+  if (check (cell))
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921123-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921123-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921123-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921123-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+   921123-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+f(short *p)
+{
+  short x = *p;
+  return (--x < 0);
+}
+
+void
+testTortureExecute (void)
+{
+  short x = -10;
+  if (!f(&x))
+    ASSERT(0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921123-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921123-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921123-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921123-2.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+   921123-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports struct!
+#if 0
+typedef struct
+{
+  unsigned short b0, b1, b2, b3;
+} four_quarters;
+
+four_quarters x;
+int a, b;
+
+void f (four_quarters j)
+{
+  b = j.b2;
+  a = j.b3;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  four_quarters x;
+  x.b0 = x.b1 = x.b2 = 0;
+  x.b3 = 38;
+  f(x);
+  if (a != 38)
+    ASSERT(0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921124-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921124-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921124-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921124-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   921124-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#pragma disable_warning 85
+#endif
+
+int f(int x, double d1, double d2, double d3)
+{
+   return x;
+}
+
+void g(char *b, char *s, double x, double y, int i, int j)
+{
+  if (x != 1.0 || y != 2.0 || i != 3 || j != 4)
+    ASSERT(0);
+}
+
+void
+testTortureExecute (void)
+{
+  g("","", 1.0, 2.0, f(3, 0.0, 0.0, 0.0), f(4, 0.0, 0.0, 0.0));
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921202-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921202-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921202-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921202-2.c	2012-03-30 09:18:32.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+   921202-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports long long constants!
+#if 0
+int
+f(long long x)
+{
+  x >>= 8;
+  return x & 0xff;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  if (f(0x0123456789ABCDEFLL) != 0xCD)
+    ASSERT(0);
+  return;
+#endif
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921207-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921207-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921207-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921207-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,27 @@
+/*
+   921207-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int f(void)
+{
+  unsigned b = 0;
+
+  if (b > ~0U)
+    b = ~0U;
+
+  return b;
+}
+void
+testTortureExecute (void)
+{
+  if (f()!=0)
+    ASSERT(0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921208-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921208-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921208-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921208-1.c	2012-05-18 16:39:12.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   921208-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#endif
+
+#if !defined(__SDCC_hc08) && !defined(__SDCC_s08)
+double
+f(double x)
+{
+  return x*x;
+}
+
+double
+Int(double (*f)(double), double a)
+{
+  return (*f)(a);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if !defined(__SDCC_hc08) && !defined(__SDCC_s08)
+  if (Int(&f,2.0) != 4.0)
+    ASSERT(0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921218-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921218-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921218-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921218-1.c	2012-03-25 06:43:22.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+   921218-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int f()
+{
+  return (unsigned char)("\377"[0]);
+}
+
+void
+testTortureExecute (void)
+{
+  if (f() != (unsigned char)(0377))
+    ASSERT(0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921218-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921218-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-921218-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-921218-2.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+   921218-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int f()
+{
+  long l2;
+  unsigned short us;
+  unsigned long ul;
+  short s2;
+
+  ul = us = l2 = s2 = -1;
+  return ul;
+}
+
+void
+testTortureExecute (void)
+{
+  if (f()!=(unsigned short)-1)
+    ASSERT(0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930106-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930106-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930106-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930106-1.c	2012-03-28 07:58:33.000000000 +0000
@@ -0,0 +1,37 @@
+/*
+   930106-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#pragma disable_warning 85
+#endif
+
+#define DUMMY_SIZE 9
+
+double g()
+{
+  return 1.0;
+}
+
+f()
+{
+  char dummy[DUMMY_SIZE];
+  double f1, f2, f3;
+  f1 = g();
+  f2 = g();
+  f3 = g();
+  return f1 + f2 + f3;
+}
+
+void
+testTortureExecute (void)
+{
+  if (f() != 3.0)
+    ASSERT(0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930111-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930111-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930111-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930111-1.c	2012-04-02 09:59:13.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+   930111-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Some ports do not support long long yet.
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+int
+wwrite(long long i);
+#endif
+
+void
+testTortureExecute (void)
+{
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+  if (wwrite((long long) 0) != 123)
+    ASSERT(0);
+  return;
+#endif
+}
+
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+int
+wwrite(long long i)
+{
+  switch(i)
+    {
+    case 3:
+    case 10:
+    case 23:
+    case 28:
+    case 47:
+      return 0;
+    default:
+      return 123;
+    }
+}
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930123-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930123-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930123-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930123-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   930123-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+f(int *x)
+{
+  *x = 0;
+}
+
+void
+testTortureExecute (void)
+{
+  int s, c, x;
+  char a[] = "c";
+
+  f(&s);
+  a[c = 0] = s == 0 ? (x=1, 'a') : (x=2, 'b');
+  if (a[c] != 'a')
+    ASSERT(0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930126-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930126-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930126-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930126-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,37 @@
+/*
+   930126-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo: Enable when sdcc supports bitfields alrger than int
+#if 0
+struct s {
+  unsigned long long a:8, b:32;
+};
+
+struct s
+f(struct s x)
+{
+  x.b = 0xcdef1234;
+  return x;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  static struct s i;
+  i.a = 12;
+  i = f(i);
+  if (i.a != 12 || i.b != 0xcdef1234)
+    ASSERT(0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930208-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930208-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930208-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930208-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   930208-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports union!
+#if 0
+typedef union {
+  long l;
+  struct { char b3, b2, b1, b0; } c;
+} T;
+
+f (T u)
+{
+  ++u.c.b0;
+  ++u.c.b3;
+  return (u.c.b1 != 2 || u.c.b2 != 2);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  T u;
+  u.c.b1 = 2;
+  u.c.b2 = 2;
+  u.c.b0 = ~0;
+  u.c.b3 = ~0;
+  if (f (u))
+    ASSERT(0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930406-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930406-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930406-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930406-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   930406-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+void f()
+{
+  int x = 1;
+#ifndef __SDCC_mcs51
+  char big[2048];
+#else
+  char big[2];
+#endif
+
+  {
+  mylabel:
+    x++;
+    if (x != 3)
+      goto mylabel;
+  }
+  return;
+}
+
+void
+testTortureExecute (void)
+{
+  f();
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930408-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930408-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930408-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930408-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+   930408-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+typedef enum foo E;
+enum foo { e0, e1 };
+
+struct {
+  E eval;
+} s;
+
+void p()
+{
+  ASSERT(0);
+}
+
+void f()
+{
+  switch (s.eval)
+    {
+    case e0:
+      p();
+    }
+}
+
+void
+testTortureExecute (void)
+{
+  s.eval = e1;
+  f();
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930429-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930429-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930429-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930429-1.c	2012-03-25 06:43:22.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   930429-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+const char *
+f (const char *p)
+{
+  short x = *p++ << 16;
+  return p;
+}
+
+void
+testTortureExecute (void)
+{
+  const char *p = "";
+  if (f (p) != p + 1)
+    ASSERT(0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930429-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930429-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930429-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930429-2.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   930429-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int
+f (int b)
+{
+  return (b >> 1) > 0;
+}
+
+void
+testTortureExecute (void)
+{
+  if (!f (9))
+    ASSERT (0);
+  if (f (-9))
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930513-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930513-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930513-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930513-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+   930513-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <stdio.h>
+char buf[2];
+
+void f (int (*fp)(char *, const char *, ...))
+{
+  (*fp)(buf, "%.0f", 5.0);
+}
+
+void
+testTortureExecute (void)
+{
+#if 0
+  f (&sprintf);
+  if (buf[0] != '5' || buf[1] != 0)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930513-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930513-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930513-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930513-2.c	2012-03-25 06:43:22.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+   930513-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+void sub3 (const int *i)
+{
+}
+
+void eq (int a, int b)
+{
+  static int i = 0;
+  if (a != i)
+    ASSERT (0);
+  i++;
+}
+
+void
+testTortureExecute (void)
+{
+  int i;
+
+  for (i = 0; i < 4; i++)
+    {
+      const int j = i;
+      int k;
+      sub3 (&j);
+      k = j;
+      eq (k, k);
+    }
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930518-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930518-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930518-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930518-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   930518-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int bar = 0;
+
+f (int *p)
+{
+  int foo = 2;
+
+  while (foo > bar)
+    {
+      foo -=  bar;
+      *p++ = foo;
+      bar = 1;
+    }
+}
+
+void
+testTortureExecute (void)
+{
+  int tab[2];
+  tab[0] = tab[1] = 0;
+  f (tab);
+  if (tab[0] != 2 || tab[1] != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930526-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930526-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930526-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930526-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   930526-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#if 0
+inline
+void f (int x)
+{
+  int *(p[25]);
+  int m[25*7];
+  int i;
+
+  for (i = 0; i < 25; i++)
+    p[i] = m + x*i;
+
+  p[1][0] = 0;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  f (7);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930527-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930527-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930527-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930527-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+   930527-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int f (unsigned char x)
+{
+  return (0x50 | (x >> 4)) ^ 0xff;
+}
+
+void
+testTortureExecute (void)
+{
+  if (f (0) != 0xaf)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930529-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930529-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930529-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930529-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,57 @@
+/*
+   930529-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int dd (int x, int d) { return x / d; }
+
+void
+testTortureExecute (void)
+{
+  int i;
+  for (i = -3; i <= 3; i++)
+    {
+      if (dd (i, 1) != i / 1)
+	ASSERT (0);
+      if (dd (i, 2) != i / 2)
+	ASSERT (0);
+      if (dd (i, 3) != i / 3)
+	ASSERT (0);
+      if (dd (i, 4) != i / 4)
+	ASSERT (0);
+      if (dd (i, 5) != i / 5)
+	ASSERT (0);
+      if (dd (i, 6) != i / 6)
+	ASSERT (0);
+      if (dd (i, 7) != i / 7)
+	ASSERT (0);
+      if (dd (i, 8) != i / 8)
+	ASSERT (0);
+    }
+  for (i = ((unsigned) ~0 >> 1) - 3; i <= ((unsigned) ~0 >> 1) + 3; i++)
+    {
+      if (dd (i, 1) != i / 1)
+	ASSERT (0);
+      if (dd (i, 2) != i / 2)
+	ASSERT (0);
+      if (dd (i, 3) != i / 3)
+	ASSERT (0);
+      if (dd (i, 4) != i / 4)
+	ASSERT (0);
+      if (dd (i, 5) != i / 5)
+	ASSERT (0);
+      if (dd (i, 6) != i / 6)
+	ASSERT (0);
+      if (dd (i, 7) != i / 7)
+	ASSERT (0);
+      if (dd (i, 8) != i / 8)
+	ASSERT (0);
+    }
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930603-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930603-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930603-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930603-1.c	2012-03-22 04:52:47.000000000 +0000
@@ -0,0 +1,37 @@
+/*
+   930603-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+float fx (float x)
+{
+  return 1.0 + 3.0 / (2.302585093 * x);
+}
+
+float inita ();
+float initc ();
+void f ();
+
+void
+testTortureExecute (void)
+{
+  float a, b, c;
+  a = inita ();
+  c = initc ();
+  f ();
+  b = fx (c) + a;
+  f ();
+  if (a != 3.0 || b < 4.3257 || b > 4.3258 || c != 4.0)
+    ASSERT (0);
+  return;
+}
+
+float inita () { return 3.0; }
+float initc () { return 4.0; }
+void f () {}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930603-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930603-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930603-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930603-2.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,31 @@
+/*
+   930603-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int w[2][2];
+
+f ()
+{
+  int i, j;
+
+  for (i = 0; i < 2; i++)
+    for (j = 0; j < 2; j++)
+      if (i == j)
+	w[i][j] = 1;
+}
+
+void
+testTortureExecute (void)
+{
+  f ();
+  if (w[0][0] != 1 || w[1][1] != 1 || w[1][0] != 0 || w[0][1] != 0)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930603-3.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930603-3.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930603-3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930603-3.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   930603-3.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int f (unsigned char *b, int c)
+{
+  unsigned long v = 0;
+  switch (c)
+    {
+    case 'd':
+      v = ((unsigned long)b[0] << 8) + b[1];
+      v >>= 9;
+      break;
+
+    case 'k':
+      v = b[3] >> 4;
+      break;
+
+    default:
+      ASSERT (0);
+    }
+
+  return v;
+}
+void
+testTortureExecute (void)
+{
+  char buf[4];
+  buf[0] = 170; buf[1] = 5;
+  if (f (buf, 'd') != 85)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930614-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930614-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930614-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930614-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+   930614-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#pragma disable_warning 85
+#endif
+
+void f (double *ty)
+{
+  *ty = -1.0;
+}
+
+void
+testTortureExecute (void)
+{
+  double foo[6];
+  double tx = 0.0, ty, d;
+
+  f (&ty);
+
+  if (ty < 0)
+    ty = -ty;
+  d = (tx > ty) ? tx : ty;
+  if (ty != d)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930614-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930614-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930614-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930614-2.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   930614-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_mcs51
+  int i, j, k, l;
+  float x[8][2][8][2];
+
+  for (i = 0; i < 8; i++)
+    for (j = i; j < 8; j++)
+      for (k = 0; k < 2; k++)
+	for (l = 0; l < 2; l++)
+	  {
+	    if ((i == j) && (k == l))
+	      x[i][k][j][l] = 0.8;
+	    else
+	      x[i][k][j][l] = 0.8;
+	    if (x[i][k][j][l] < 0.0)
+	      ASSERT (0);
+	  }
+
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930622-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930622-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930622-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930622-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   930622-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+int a = 1, b;
+
+int g () { return 0; }
+void h (int x) {}
+
+int f ()
+{
+  if (g () == -1)
+    return 0;
+  a = g ();
+  if (b >= 1)
+    h (a);
+  return 0;
+}
+
+void
+testTortureExecute (void)
+{
+  f ();
+  if (a != 0)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930622-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930622-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930622-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930622-2.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+   930622-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo: Enable when sdcc supports long double and long long!
+#if 0
+long double
+ll_to_ld (long long n)
+{
+  return n;
+}
+
+long long
+ld_to_ll (long double n)
+{
+  return n;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  long long n;
+
+  if (ll_to_ld (10LL) != 10.0)
+    ASSERT (0);
+
+  if (ld_to_ll (10.0) != 10)
+    ASSERT (0);
+
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930628-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930628-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930628-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930628-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+   930628-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#endif
+
+void f (double x[2], double y[2])
+{
+  if (x == y)
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_mcs51
+  struct { int f[3]; double x[1][2]; } tp[4][2];
+  int i, j, ki, kj, mi, mj;
+  float bdm[4][2][4][2];
+
+  for (i = 0; i < 4; i++)
+    for (j = i; j < 4; j++)
+      for (ki = 0; ki < 2; ki++)
+	for (kj = 0; kj < 2; kj++)
+	  if ((j == i) && (ki == kj))
+	    bdm[i][ki][j][kj] = 1000.0;
+	  else
+	    {
+	      for (mi = 0; mi < 1; mi++)
+		for (mj = 0; mj < 1; mj++)
+		  f (tp[i][ki].x[mi], tp[j][kj].x[mj]);
+	      bdm[i][ki][j][kj] = 1000.0;
+	    }
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930702-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930702-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930702-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930702-1.c	2012-05-18 16:39:12.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   930702-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#endif
+
+#if !defined(__SDCC_hc08) && !defined(__SDCC_s08) && !defined(__SDCC_ds390) && !defined(__SDCC_mcs51)
+int fp (double a, int b)
+{
+  if (a != 33 || b != 11)
+    ASSERT (0);
+  return (0);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if !defined(__SDCC_hc08) && !defined(__SDCC_s08) && !defined(__SDCC_ds390) && !defined(__SDCC_mcs51)
+  int (*f) (double, int) = fp;
+
+  fp (33, 11);
+  f (33, 11);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930713-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930713-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930713-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930713-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   930713-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo: Enable when sdcc supports returning struct!
+#if 0
+typedef struct
+{
+  char x;
+} T;
+
+T
+f (s1)
+     T s1;
+{
+  T s1a;
+  s1a.x = 17;
+  return s1a;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  T s1a, s1b;
+  s1a.x = 13;
+  s1b = f (s1a);
+  if (s1a.x != 13 || s1b.x != 17)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930718-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930718-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930718-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930718-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+   930718-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+typedef struct rtx_def
+{
+  int f1 :1;
+  int f2 :1;
+} *rtx;
+
+static rtx
+f (register rtx orig)
+{
+  if (orig->f1 || orig->f2)
+    return orig;
+  orig->f2 = 1;
+  return orig;
+}
+
+void
+f2 ()
+{
+  ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  struct rtx_def foo;
+  rtx bar;
+
+  foo.f1 = 1;
+  foo.f2 = 0;
+  bar = f (&foo);
+  if (bar != &foo || bar->f2 != 0)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930719-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930719-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930719-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930719-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   930719-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int
+f (int foo, int bar, int com)
+{
+  unsigned align = 0;
+  if (foo)
+    return 0;
+  while (1)
+    {
+      switch (bar)
+	{
+	case 1:
+	  if (com != 0)
+ 	    return align;
+	  *(char *) 0 = 0;
+	}
+    }
+}
+
+void
+testTortureExecute (void)
+{
+  f (0, 1, 1);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930725-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930725-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930725-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930725-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   930725-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <string.h>
+
+int v;
+
+const char *
+g ()
+{
+  return "";
+}
+
+const char *
+f ()
+{
+  return (v == 0 ? g () : "abc");
+}
+
+void
+testTortureExecute (void)
+{
+  v = 1;
+  if (!strcmp (f (), "abc"))
+    return;
+  ASSERT (0);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930818-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930818-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930818-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930818-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   930818-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#endif
+
+static double one = 1.0;
+
+int f()
+{
+  int colinear;
+  colinear = (one == 0.0);
+  if (colinear)
+    ASSERT (0);
+  return colinear;
+}
+void
+testTortureExecute (void)
+{
+  if (f()) ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930916-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930916-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930916-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930916-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,24 @@
+/*
+   930916-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void f (unsigned n)
+{
+  if ((int) n >= 0)
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  unsigned x = ~0;
+  f (x);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930929-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930929-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-930929-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-930929-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+   930929-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int sub1 (int i)
+{
+  return i - (5 - i);
+}
+
+int sub2 (int i)
+{
+  return i + (5 + i);
+}
+
+int sub3 (int i)
+{
+  return i - (5 + i);
+}
+
+int sub4 (int i)
+{
+  return i + (5 - i);
+}
+
+void
+testTortureExecute (void)
+{
+  if (sub1 (20) != 35)
+    ASSERT (0);
+  if (sub2 (20) != 45)
+    ASSERT (0);
+  if (sub3 (20) != -5)
+    ASSERT (0);
+  if (sub4 (20) != 5)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,46 @@
+/*
+   931004-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports struct!
+#if 0
+struct tiny
+{
+  int c;
+};
+
+f (int n, struct tiny x, struct tiny y, struct tiny z, long l)
+{
+  if (x.c != 10)
+    ASSERT (0);
+
+  if (y.c != 11)
+    ASSERT (0);
+
+  if (z.c != 12)
+    ASSERT (0);
+
+  if (l != 123)
+    ASSERT (0);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct tiny x[3];
+  x[0].c = 10;
+  x[1].c = 11;
+  x[2].c = 12;
+  f (3, x[0], x[1], x[2], (long) 123);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-10.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-10.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-10.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-10.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,60 @@
+/*
+   931004-10.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo: Enable when sdcc supports struct!
+#if 0
+#include <stdarg.h>
+
+struct tiny
+{
+  char c;
+  char d;
+};
+
+void f (int n, ...)
+{
+  struct tiny x;
+  int i;
+
+  va_list ap;
+  va_start (ap,n);
+  for (i = 0; i < n; i++)
+    {
+      x = va_arg (ap,struct tiny);
+      if (x.c != i + 10)
+	ASSERT (0);
+      if (x.d != i + 20)
+	ASSERT (0);
+    }
+  {
+    long x = va_arg (ap, long);
+    if (x != 123)
+      ASSERT (0);
+  }
+  va_end (ap);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct tiny x[3];
+  x[0].c = 10;
+  x[1].c = 11;
+  x[2].c = 12;
+  x[0].d = 20;
+  x[1].d = 21;
+  x[2].d = 22;
+  f (3, x[0], x[1], x[2], (long) 123);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-11.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-11.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-11.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-11.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,66 @@
+/*
+   931004-11.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports struct!
+#if 0
+struct tiny
+{
+  char c;
+  char d;
+  char e;
+};
+
+void f (int n, struct tiny x, struct tiny y, struct tiny z, long l)
+{
+  if (x.c != 10)
+    ASSERT (0);
+  if (x.d != 20)
+    ASSERT (0);
+  if (x.e != 30)
+    ASSERT (0);
+
+  if (y.c != 11)
+    ASSERT (0);
+  if (y.d != 21)
+    ASSERT (0);
+  if (y.e != 31)
+    ASSERT (0);
+
+  if (z.c != 12)
+    ASSERT (0);
+  if (z.d != 22)
+    ASSERT (0);
+  if (z.e != 32)
+    ASSERT (0);
+
+  if (l != 123)
+    ASSERT (0);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct tiny x[3];
+  x[0].c = 10;
+  x[1].c = 11;
+  x[2].c = 12;
+  x[0].d = 20;
+  x[1].d = 21;
+  x[2].d = 22;
+  x[0].e = 30;
+  x[1].e = 31;
+  x[2].e = 32;
+  f (3, x[0], x[1], x[2], (long) 123);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-13.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-13.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-13.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-13.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,76 @@
+/*
+   931004-13.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo: Enable when sdcc supports struct!
+#if 0
+struct tiny
+{
+  char c;
+  char d;
+  char e;
+  char f;
+};
+
+f (int n, struct tiny x, struct tiny y, struct tiny z, long l)
+{
+  if (x.c != 10)
+    ASSERT (0);
+  if (x.d != 20)
+    ASSERT (0);
+  if (x.e != 30)
+    ASSERT (0);
+  if (x.f != 40)
+    ASSERT (0);
+
+  if (y.c != 11)
+    ASSERT (0);
+  if (y.d != 21)
+    ASSERT (0);
+  if (y.e != 31)
+    ASSERT (0);
+  if (y.f != 41)
+    ASSERT (0);
+
+  if (z.c != 12)
+    ASSERT (0);
+  if (z.d != 22)
+    ASSERT (0);
+  if (z.e != 32)
+    ASSERT (0);
+  if (z.f != 42)
+    ASSERT (0);
+
+  if (l != 123)
+    ASSERT (0);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct tiny x[3];
+  x[0].c = 10;
+  x[1].c = 11;
+  x[2].c = 12;
+  x[0].d = 20;
+  x[1].d = 21;
+  x[2].d = 22;
+  x[0].e = 30;
+  x[1].e = 31;
+  x[2].e = 32;
+  x[0].f = 40;
+  x[1].f = 41;
+  x[2].f = 42;
+  f (3, x[0], x[1], x[2], (long) 123);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-14.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-14.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-14.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-14.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,72 @@
+/*
+   931004-14.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo: Enable when sdcc supports struct!
+#if 0
+#include <stdarg.h>
+
+struct tiny
+{
+  char c;
+  char d;
+  char e;
+  char f;
+};
+
+f (int n, ...)
+{
+  struct tiny x;
+  int i;
+
+  va_list ap;
+  va_start (ap,n);
+  for (i = 0; i < n; i++)
+    {
+      x = va_arg (ap,struct tiny);
+      if (x.c != i + 10)
+	ASSERT (0);
+      if (x.d != i + 20)
+	ASSERT (0);
+      if (x.e != i + 30)
+	ASSERT (0);
+      if (x.f != i + 40)
+	ASSERT (0);
+    }
+  {
+    long x = va_arg (ap, long);
+    if (x != 123)
+      ASSERT (0);
+  }
+  va_end (ap);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct tiny x[3];
+  x[0].c = 10;
+  x[1].c = 11;
+  x[2].c = 12;
+  x[0].d = 20;
+  x[1].d = 21;
+  x[2].d = 22;
+  x[0].e = 30;
+  x[1].e = 31;
+  x[2].e = 32;
+  x[0].f = 40;
+  x[1].f = 41;
+  x[2].f = 42;
+  f (3, x[0], x[1], x[2], (long) 123);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-2.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+   931004-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo: Enable when sdcc supports struct!
+#if 0
+#include <stdarg.h>
+
+struct tiny
+{
+  int c;
+};
+
+f (int n, ...)
+{
+  struct tiny x;
+  int i;
+
+  va_list ap;
+  va_start (ap,n);
+  for (i = 0; i < n; i++)
+    {
+      x = va_arg (ap,struct tiny);
+      if (x.c != i + 10)
+	ASSERT (0);
+    }
+  {
+    long x = va_arg (ap, long);
+    if (x != 123)
+      ASSERT (0);
+  }
+  va_end (ap);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct tiny x[3];
+  x[0].c = 10;
+  x[1].c = 11;
+  x[2].c = 12;
+  f (3, x[0], x[1], x[2], (long) 123);
+  exit(0);
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-3.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-3.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-3.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,46 @@
+/*
+   931004-3.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo: enable when sdcc supports struct!
+#if 0
+struct tiny
+{
+  short c;
+};
+
+f (int n, struct tiny x, struct tiny y, struct tiny z, long l)
+{
+  if (x.c != 10)
+    ASSERT (0);
+
+  if (y.c != 11)
+    ASSERT (0);
+
+  if (z.c != 12)
+    ASSERT (0);
+
+  if (l != 123)
+    ASSERT (0);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct tiny x[3];
+  x[0].c = 10;
+  x[1].c = 11;
+  x[2].c = 12;
+  f (3, x[0], x[1], x[2], (long) 123);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-4.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-4.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-4.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-4.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+   931004-4.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo: Enable when sdcc supports struct!
+#if 0
+#include <stdarg.h>
+
+struct tiny
+{
+  short c;
+};
+
+f (int n, ...)
+{
+  struct tiny x;
+  int i;
+
+  va_list ap;
+  va_start (ap,n);
+  for (i = 0; i < n; i++)
+    {
+      x = va_arg (ap,struct tiny);
+      if (x.c != i + 10)
+	ASSERT (0);
+    }
+  {
+    long x = va_arg (ap, long);
+    if (x != 123)
+      ASSERT (0);
+  }
+  va_end (ap);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct tiny x[3];
+  x[0].c = 10;
+  x[1].c = 11;
+  x[2].c = 12;
+  f (3, x[0], x[1], x[2], (long) 123);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-5.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-5.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-5.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-5.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,56 @@
+/*
+   931004-5.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo: Enable shen sdcc supports struct!
+#if 0
+struct tiny
+{
+  short c;
+  short d;
+};
+
+f (int n, struct tiny x, struct tiny y, struct tiny z, long l)
+{
+  if (x.c != 10)
+    ASSERT (0);
+  if (x.d != 20)
+    ASSERT (0);
+
+  if (y.c != 11)
+    ASSERT (0);
+  if (y.d != 21)
+    ASSERT (0);
+
+  if (z.c != 12)
+    ASSERT (0);
+  if (z.d != 22)
+    ASSERT (0);
+
+  if (l != 123)
+    ASSERT (0);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct tiny x[3];
+  x[0].c = 10;
+  x[1].c = 11;
+  x[2].c = 12;
+  x[0].d = 20;
+  x[1].d = 21;
+  x[2].d = 22;
+  f (3, x[0], x[1], x[2], (long) 123);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-6.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-6.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-6.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-6.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,60 @@
+/*
+   931004-6.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo: Enable when sdcc supports struct!
+#if 0
+#include <stdarg.h>
+
+struct tiny
+{
+  short c;
+  short d;
+};
+
+f (int n, ...)
+{
+  struct tiny x;
+  int i;
+
+  va_list ap;
+  va_start (ap,n);
+  for (i = 0; i < n; i++)
+    {
+      x = va_arg (ap,struct tiny);
+      if (x.c != i + 10)
+	ASSERT (0);
+      if (x.d != i + 20)
+	ASSERT (0);
+    }
+  {
+    long x = va_arg (ap, long);
+    if (x != 123)
+      ASSERT (0);
+  }
+  va_end (ap);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct tiny x[3];
+  x[0].c = 10;
+  x[1].c = 11;
+  x[2].c = 12;
+  x[0].d = 20;
+  x[1].d = 21;
+  x[2].d = 22;
+  f (3, x[0], x[1], x[2], (long) 123);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-7.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-7.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-7.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-7.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,46 @@
+/*
+   931004-7.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo: Enable when sdcc supports struct!
+#if 0
+struct tiny
+{
+  char c;
+};
+
+f (int n, struct tiny x, struct tiny y, struct tiny z, long l)
+{
+  if (x.c != 10)
+    ASSERT (0);
+
+  if (y.c != 11)
+    ASSERT (0);
+
+  if (z.c != 12)
+    ASSERT (0);
+
+  if (l != 123)
+    ASSERT (0);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct tiny x[3];
+  x[0].c = 10;
+  x[1].c = 11;
+  x[2].c = 12;
+  f (3, x[0], x[1], x[2], (long) 123);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-8.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-8.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-8.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-8.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+   931004-8.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo: Enable when sdcc supports struct!
+#if 0
+#include <stdarg.h>
+
+struct tiny
+{
+  char c;
+};
+
+f (int n, ...)
+{
+  struct tiny x;
+  int i;
+
+  va_list ap;
+  va_start (ap,n);
+  for (i = 0; i < n; i++)
+    {
+      x = va_arg (ap,struct tiny);
+      if (x.c != i + 10)
+	abort();
+    }
+  {
+    long x = va_arg (ap, long);
+    if (x != 123)
+      abort();
+  }
+  va_end (ap);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct tiny x[3];
+  x[0].c = 10;
+  x[1].c = 11;
+  x[2].c = 12;
+  f (3, x[0], x[1], x[2], (long) 123);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-9.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-9.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931004-9.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931004-9.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,56 @@
+/*
+   931004-9.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo: Enable when sdcc supports struct!
+#if 0
+struct tiny
+{
+  char c;
+  char d;
+};
+
+f (int n, struct tiny x, struct tiny y, struct tiny z, long l)
+{
+  if (x.c != 10)
+    ASSERT (0);
+  if (x.d != 20)
+    ASSERT (0);
+
+  if (y.c != 11)
+    ASSERT (0);
+  if (y.d != 21)
+    ASSERT (0);
+
+  if (z.c != 12)
+    ASSERT (0);
+  if (z.d != 22)
+    ASSERT (0);
+
+  if (l != 123)
+    ASSERT (0);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct tiny x[3];
+  x[0].c = 10;
+  x[1].c = 11;
+  x[2].c = 12;
+  x[0].d = 20;
+  x[1].d = 21;
+  x[2].d = 22;
+  f (3, x[0], x[1], x[2], (long) 123);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931005-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931005-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931005-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931005-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   931005-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports struct!
+#if 0
+typedef struct
+{
+  char x;
+} T;
+
+T
+f (s1)
+     T s1;
+{
+  T s1a;
+  s1a.x = s1.x;
+  return s1a;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  T s1a, s1b;
+  s1a.x = 100;
+  s1b = f (s1a);
+  if (s1b.x != 100)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931009-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931009-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931009-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931009-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+   931009-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void f ();
+
+void
+testTortureExecute (void)
+{
+  f ();
+  return;
+}
+
+static void
+g (int *out, int size, int lo, int hi)
+{
+  int j;
+
+  for (j = 0; j < size; j++)
+    out[j] = j * (hi - lo);
+}
+
+
+void f ()
+{
+  int a[2];
+
+  g (a, 2, 0, 1);
+
+  if (a[0] != 0 || a[1] != 1)
+    ASSERT (0);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931012-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931012-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931012-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931012-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+   931012-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int f (int b, int c)
+{
+  if (b != 0 && b != 1 && c != 0)
+    b = 0;
+  return b;
+}
+
+void
+testTortureExecute (void)
+{
+  if (!f (1, 2))
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931017-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931017-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931017-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931017-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,66 @@
+/*
+   931017-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int v;
+
+void f ();
+
+void
+testTortureExecute (void)
+{
+  f ();
+  return;
+}
+
+h1 ()
+{
+  return 0;
+}
+
+int h2 (int *e)
+{
+  if (e != &v)
+    ASSERT (0);
+  return 0;
+}
+
+int g (char *c)
+{
+  int i;
+  int b;
+
+  do
+    {
+      i = h1 ();
+      if (i == -1)
+	return 0;
+      else if (i == 1)
+	h1 ();
+    }
+  while (i == 1);
+
+  do
+    b = h2 (&v);
+  while (i == 5);
+
+  if (i != 2)
+    return b;
+  *c = 'a';
+
+  return 0;
+}
+
+
+void f ()
+{
+  char c;
+  g (&c);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931018-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931018-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931018-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931018-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,31 @@
+/*
+   931018-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c89
+#endif
+
+unsigned int a[/*0x1000*/20];
+extern const unsigned long v;
+
+void f (unsigned long a);
+
+void
+testTortureExecute (void)
+{
+  f (v);
+  f (v);
+  return;
+}
+
+void f (unsigned long a)
+{
+  if (a != 0xdeadbeefL)
+    ASSERT (0);
+}
+
+const unsigned long v = 0xdeadbeefL;
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931102-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931102-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931102-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931102-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   931102-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+typedef union
+{
+  struct
+    {
+      char h, l;
+    } b;
+} T;
+
+int f (int x)
+{
+  int num = 0;
+  T reg;
+
+  reg.b.l = x;
+  while ((reg.b.l & 1) == 0)
+    {
+      num++;
+      reg.b.l >>= 1;
+    }
+  return num;
+}
+
+void
+testTortureExecute (void)
+{
+  if (f (2) != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931102-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931102-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931102-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931102-2.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+   931102-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+typedef union
+{
+  long align;
+  struct
+    {
+      short h, l;
+    } b;
+} T;
+
+int f (int x)
+{
+  int num = 0;
+  T reg;
+
+  reg.b.l = x;
+  while ((reg.b.l & 1) == 0)
+    {
+      num++;
+      reg.b.l >>= 1;
+    }
+  return num;
+}
+
+void
+testTortureExecute (void)
+{
+  if (f (2) != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931110-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931110-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931110-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931110-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   931110-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+typedef struct
+{
+  short f:3, g:3, h:10;
+} small;
+
+struct
+{
+  int i;
+  small s[10];
+} x;
+
+void
+testTortureExecute (void)
+{
+  int i;
+  for (i = 0; i < 10; i++)
+    x.s[i].f = 0;
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931110-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931110-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931110-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931110-2.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,24 @@
+/*
+   931110-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+  static int a[] = {3, 4};
+  register int *b;
+  int c;
+
+  b = a;
+  c = *b++ % 8;
+  if (c != 3)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931208-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931208-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-931208-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-931208-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   931208-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int f ()
+{
+  unsigned long x, y = 1;
+
+  x = ((y * 8192) - 216) / 16;
+  return x;
+}
+
+void
+testTortureExecute (void)
+{
+  if (f () != 498)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-940122-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-940122-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-940122-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-940122-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   940122-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+char *a = 0;
+char *b = 0;
+
+void g (int x)
+{
+  if ((!!a) != (!!b))
+    ASSERT (0);
+}
+
+void f (int x)
+{
+  g (x * x);
+}
+
+void
+testTortureExecute (void)
+{
+  f (100);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-941014-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-941014-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-941014-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-941014-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   941014-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+int f (int a, int b) { }
+
+void
+testTortureExecute (void)
+{
+  unsigned long addr1;
+  unsigned long addr2;
+
+  addr1 = (unsigned long) &f;
+  addr1 += 5;
+  addr2 = 5 + (unsigned long) &f;
+
+  if (addr1 != addr2)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-941015-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-941015-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-941015-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-941015-1.c	2012-03-30 11:52:34.000000000 +0000
@@ -0,0 +1,50 @@
+/*
+   941015-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports long long constants!
+#if 0
+int
+foo1 (long long value)
+{
+  register const long long constant = 0xc000000080000000LL;
+
+  if (value < constant)
+    return 1;
+  else
+    return 2;
+}
+
+int
+foo2 (unsigned long long value)
+{
+  register const unsigned long long constant = 0xc000000080000000LL;
+
+  if (value < constant)
+    return 1;
+  else
+    return 2;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  unsigned long long value = 0xc000000000000001LL;
+  int x, y;
+
+  x = foo1 (value);
+  y = foo2 (value);
+  if (x != y || x != 1)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-941021-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-941021-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-941021-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-941021-1.c	2012-03-22 21:42:57.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+   941021-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#endif
+
+double glob_dbl;
+
+void f (double *pdbl, double value)
+{
+  if (pdbl == 0)
+    pdbl = &glob_dbl;
+
+  *pdbl = value;
+}
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5))
+  f ((void *) 0, 55.1);
+
+  if (glob_dbl != 55.1)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-941025-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-941025-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-941025-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-941025-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+   941025-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+long f (long x, long y)
+{
+  return (x > 1) ? y : (y & 1);
+}
+
+void
+testTortureExecute (void)
+{
+  if (f (2L, 0xdecadeL) != 0xdecadeL)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-941031-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-941031-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-941031-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-941031-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+   941031-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+typedef long mpt;
+
+int
+f (mpt us, mpt vs)
+{
+  long aus;
+  long avs;
+
+  aus = us >= 0 ? us : -us;
+  avs = vs >= 0 ? vs : -vs;
+
+  if (aus < avs)
+    {
+      long t = aus;
+      aus = avs;
+      avs = aus;
+    }
+
+  return avs;
+}
+
+void
+testTortureExecute (void)
+{
+  if (f ((mpt) 3, (mpt) 17) != 17)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-941101-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-941101-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-941101-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-941101-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,27 @@
+/*
+   941101-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int f ()
+{
+  int var = 7;
+
+  if ((var/7) == 1)
+    return var/7;
+  return 0;
+}
+
+void
+testTortureExecute (void)
+{
+  if (f () != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-941110-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-941110-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-941110-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-941110-1.c	2012-03-21 13:11:20.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   941110-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int f (const int x)
+{
+  int y = 0;
+  y = x ? y : -y;
+  {
+    const int *p = &x;
+  }
+  return y;
+}
+
+void
+testTortureExecute (void)
+{
+  if (f (0))
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950322-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950322-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950322-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950322-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+   950322-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+f (unsigned char *a)
+{
+  int i, j;
+  int x, y;
+
+  j = a[1];
+  i = a[0] - j;
+  if (i < 0)
+    {
+      x = 1;
+      y = -i;
+    }
+  else
+    {
+      x = 0;
+      y =  i;
+    }
+  return x + y;
+}
+
+
+void
+testTortureExecute (void)
+{
+  unsigned char a[2];
+  a[0] = 8;
+  a[1] = 9;
+  if (f (a) != 2)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950426-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950426-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950426-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950426-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,52 @@
+/*
+   950426-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+#include <string.h>
+
+struct tag {
+  int m1;
+  char *m2[5];
+} s1, *p1;
+
+int i;
+
+int func1(int *p);
+
+void foo (char *s);
+
+void
+testTortureExecute (void)
+{
+#if 0
+  s1.m1 = -1;
+  p1 = &s1;
+
+  if ( func1( &p1->m1 ) == -1 )
+    foo ("ok");
+  else
+    ASSERT (0);
+
+  i = 3;
+  s1.m2[3]= "123";
+
+  if ( strlen( (p1->m2[i])++ ) == 3 )
+    foo ("ok");
+  else
+    ASSERT (0);
+
+  return;
+#endif
+}
+
+int func1(int *p) { return(*p); }
+
+void foo (char *s) {}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950503-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950503-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950503-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950503-1.c	2012-04-21 13:19:52.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   950503-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+  int tmp;
+  unsigned long long utmp1, utmp2;
+
+  tmp = 16;
+
+  utmp1 = (~((unsigned long long) 0)) >> tmp;
+  utmp2 = (~((unsigned long long) 0)) >> 16;
+
+  if (utmp1 != utmp2)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950511-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950511-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950511-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950511-1.c	2012-03-30 11:52:34.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   950511-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+// TODO: Enable when sdcc supports long long constants!
+#if 0
+  unsigned long long xx;
+  unsigned long long *x = (unsigned long long *) &xx;
+
+  *x = -3;
+  *x = *x * *x;
+  if (*x != 9)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950512-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950512-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950512-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950512-1.c	2012-04-01 11:33:10.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+   950512-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports long long constants!
+#if 0
+
+unsigned
+f1 (int x)
+{
+  return ((unsigned) (x != 0) - 3) / 2;
+}
+
+unsigned long long
+f2 (int x)
+{
+  return ((unsigned long long) (x != 0) - 3) / 2;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  if (f1 (1) != (~(unsigned) 0) >> 1)
+    ASSERT (0);
+  if (f1 (0) != ((~(unsigned) 0) >> 1) - 1)
+    ASSERT (0);
+  if (f2 (1) != (~(unsigned long long) 0) >> 1)
+    ASSERT (0);
+  if (f2 (0) != ((~(unsigned long long) 0) >> 1) - 1)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950605-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950605-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950605-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950605-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+   950605-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void f (unsigned char c)
+{
+  if (c != 0xFF)
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  f (-1);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950607-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950607-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950607-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950607-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,21 @@
+/*
+   950607-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+  struct { long status; } h;
+
+  h.status = 0;
+  if (((h.status & 128) == 1) && ((h.status & 32) == 0))
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950607-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950607-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950607-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950607-2.c	2012-03-30 11:52:34.000000000 +0000
@@ -0,0 +1,58 @@
+/*
+   950607-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports struct parameters!
+#if 0
+typedef struct {
+  long int p_x, p_y;
+} Point;
+
+int
+f (Point basePt, Point pt1, Point pt2)
+{
+  long long vector;
+
+  vector =
+    (long long) (pt1.p_x - basePt.p_x) * (long long) (pt2.p_y - basePt.p_y) -
+      (long long) (pt1.p_y - basePt.p_y) * (long long) (pt2.p_x - basePt.p_x);
+
+  if (vector > (long long) 0)
+    return 0;
+  else if (vector < (long long) 0)
+    return 1;
+  else
+    return 2;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  Point b, p1, p2;
+  int answer;
+
+  b.p_x = -23250;
+  b.p_y = 23250;
+
+  p1.p_x = 23250;
+  p1.p_y = -23250;
+
+  p2.p_x = -23250;
+  p2.p_y = -23250;
+
+  answer = f (b, p1, p2);
+
+  if (answer != 1)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950612-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950612-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950612-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950612-1.c	2012-05-18 17:36:32.000000000 +0000
@@ -0,0 +1,64 @@
+/*
+   950612-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+unsigned int
+f1 (int diff)
+{
+  return ((unsigned int) (diff < 0 ? -diff : diff));
+}
+
+unsigned int
+f2 (unsigned int diff)
+{
+  return ((unsigned int) ((signed int) diff < 0 ? -diff : diff));
+}
+
+unsigned long long
+f3 (long long diff)
+{
+  return ((unsigned long long) (diff < 0 ? -diff : diff));
+}
+
+unsigned long long
+f4 (unsigned long long diff)
+{
+  return ((unsigned long long) ((signed long long) diff < 0 ? -diff : diff));
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16) && !defined(__SDCC_gbz80)
+  int i;
+  for (i = 0; i <= 10; i++)
+    {
+      if (f1 (i) != i)
+	ASSERT (0);
+      if (f1 (-i) != i)
+	ASSERT (0);
+      if (f2 (i) != i)
+	ASSERT (0);
+      if (f2 (-i) != i)
+	ASSERT (0);
+      if (f3 ((long long) i) != i)
+	ASSERT (0);
+      if (f3 ((long long) -i) != i)
+	ASSERT (0);
+      if (f4 ((long long) i) != i)
+	ASSERT (0);
+      if (f4 ((long long) -i) != i)
+	ASSERT (0);
+    }
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950621-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950621-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950621-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950621-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   950621-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct s
+{
+  int a;
+  int b;
+  struct s *dummy;
+};
+
+f (struct s *sp)
+{
+  return sp && sp->a == -1 && sp->b == -1;
+}
+
+void
+testTortureExecute (void)
+{
+  struct s x;
+  x.a = x.b = -1;
+  if (f (&x) == 0)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950628-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950628-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950628-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950628-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,48 @@
+/*
+   950628-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports struct!
+#if 0
+typedef struct
+{
+  char hours, day, month;
+  short year;
+} T;
+
+T g (void)
+{
+  T now;
+
+  now.hours = 1;
+  now.day = 2;
+  now.month = 3;
+  now.year = 4;
+  return now;
+}
+
+T f (void)
+{
+  T virk;
+
+  virk = g ();
+  return virk;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  if (f ().hours != 1 || f ().day != 2 || f ().month != 3 || f ().year != 4)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950704-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950704-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950704-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950704-1.c	2012-03-30 09:18:32.000000000 +0000
@@ -0,0 +1,77 @@
+/*
+   950704-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports long long constants!
+#if 0
+int errflag;
+
+long long
+f (long long x, long long y)
+{
+  long long r;
+
+  errflag = 0;
+  r = x + y;
+  if (x >= 0)
+    {
+      if ((y < 0) || (r >= 0))
+	return r;
+    }
+  else
+    {
+      if ((y > 0) || (r < 0))
+	return r;
+    }
+  errflag = 1;
+  return 0;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+// TODO: Enable when sdcc supports long long!
+#if 0
+  f (0, 0);
+  if (errflag)
+    ASSERT (0);
+
+  f (1, -1);
+  if (errflag)
+    ASSERT (0);
+
+  f (-1, 1);
+  if (errflag)
+    ASSERT (0);
+
+  f (0x8000000000000000LL, 0x8000000000000000LL);
+  if (!errflag)
+    ASSERT (0);
+
+  f (0x8000000000000000LL, -1LL);
+  if (!errflag)
+    ASSERT (0);
+
+  f (0x7fffffffffffffffLL, 0x7fffffffffffffffLL);
+  if (!errflag)
+    ASSERT (0);
+
+  f (0x7fffffffffffffffLL, 1LL);
+  if (!errflag)
+    ASSERT (0);
+
+  f (0x7fffffffffffffffLL, 0x8000000000000000LL);
+  if (errflag)
+    ASSERT (0);
+
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950706-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950706-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950706-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950706-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   950706-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int
+f (int n)
+{
+  return (n > 0) - (n < 0);
+}
+
+void
+testTortureExecute (void)
+{
+  if (f (-1) != -1)
+    ASSERT (0);
+  if (f (1) != 1)
+    ASSERT (0);
+  if (f (0) != 0)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950710-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950710-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950710-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950710-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,71 @@
+/*
+   950710-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports struct!
+#if 0
+struct twelve
+{
+  int a;
+  int b;
+  int c;
+};
+
+struct pair
+{
+  int first;
+  int second;
+};
+
+struct pair
+g ()
+{
+  struct pair p;
+  return p;
+}
+
+static void
+f ()
+{
+  int i;
+  for (i = 0; i < 1; i++)
+    {
+      int j;
+      for (j = 0; j < 1; j++)
+	{
+	  if (0)
+	    {
+	      int k;
+	      for (k = 0; k < 1; k++)
+		{
+		  struct pair e = g ();
+		}
+	    }
+	  else
+	    {
+	      struct twelve a, b;
+	      if ((((char *) &b - (char *) &a) < 0
+		   ? (-((char *) &b - (char *) &a))
+		   : ((char *) &b - (char *) &a))  < sizeof (a))
+		ASSERT (0);
+	    }
+	}
+    }
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  f ();
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950714-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950714-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950714-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950714-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   950714-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+int array[10] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
+
+void
+testTortureExecute (void)
+{
+  int i, j;
+  int *p;
+
+  for (i = 0; i < 10; i++)
+    for (p = &array[0]; p != &array[9]; p++)
+      if (*p == i)
+	goto label;
+
+ label:
+  if (i != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950809-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950809-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950809-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950809-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+   950809-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct S
+{
+  int *sp, fc, *sc, a[2];
+};
+
+f (struct S *x)
+{
+  int *t = x->sc;
+  int t1 = t[0];
+  int t2 = t[1];
+  int t3 = t[2];
+  int a0 = x->a[0];
+  int a1 = x->a[1];
+  t[2] = t1;
+  t[0] = a1;
+  x->a[1] = a0;
+  x->a[0] = t3;
+  x->fc = t2;
+  x->sp = t;
+}
+
+void
+testTortureExecute (void)
+{
+  struct S s;
+  static int sc[3] = {2, 3, 4};
+  s.sc = sc;
+  s.a[0] = 10;
+  s.a[1] = 11;
+  f (&s);
+  if (s.sp[2] != 2)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950915-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950915-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950915-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950915-1.c	2012-05-18 17:15:09.000000000 +0000
@@ -0,0 +1,31 @@
+/*
+   950915-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+long int a = 100000;
+long int b = 21475;
+
+long
+f ()
+{
+  return ((long long) a * (long long) b) >> 16;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+  if (f () < 0)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950929-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950929-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-950929-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-950929-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   950929-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+int f (char *p) { }
+
+void
+testTortureExecute (void)
+{
+  char c;
+  char c2;
+  int i = 0;
+  char *pc = &c;
+  char *pc2 = &c2;
+  int *pi = &i;
+
+  *pc2 = 1;
+  *pi = 1;
+  *pc2 &= *pi;
+  f (pc2);
+  *pc2 = 1;
+  *pc2 &= *pi;
+  if (*pc2 != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-951003-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-951003-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-951003-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-951003-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   951003-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+int f (int i) { return 12; }
+int g () { return 0; }
+
+void
+testTortureExecute (void)
+{
+  int i, s;
+
+  for (i = 0; i < 32; i++)
+    {
+      s = f (i);
+
+      if (i == g ())
+	s = 42;
+      if (i == 0 || s == 12)
+	;
+      else
+	ASSERT (0);
+    }
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-951115-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-951115-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-951115-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-951115-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+   951115-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int var = 0;
+
+void g ()
+{
+  var = 1;
+}
+
+void f ()
+{
+  int f2 = 0;
+
+  if (f2 == 0)
+    ;
+
+  g ();
+}
+
+void
+testTortureExecute (void)
+{
+  f ();
+  if (var != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-951204-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-951204-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-951204-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-951204-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   951204-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void f (char *x)
+{
+  *x = 'x';
+}
+
+void
+testTortureExecute (void)
+{
+  int i;
+  char x = '\0';
+
+  for (i = 0; i < 100; ++i)
+    {
+      f (&x);
+      if (*(const char *) &x != 'x')
+	ASSERT (0);
+    }
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960116-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960116-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960116-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960116-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+   960116-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#if 0
+static inline int
+p (int *p)
+{
+  return !((long) p & 1);
+}
+
+int
+f (int *q)
+{
+  if (p (q) && *q)
+    return 1;
+  return 0;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  if (f ((int*) 0xffffffff) != 0)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960215-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960215-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960215-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960215-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+   960215-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports long double!
+#if 0
+long double C = 2;
+long double U = 1;
+long double Y2 = 3;
+long double Y1 = 1;
+long double X, Y, Z, T, R, S;
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  X = (C + U) * Y2;
+  Y = C - U - U;
+  Z = C + U + U;
+  T = (C - U) * Y1;
+  X = X - (Z + U);
+  R = Y * Y1;
+  S = Z * Y2;
+  T = T - Y;
+  Y = (U - Y) + R;
+  Z = S - (Z + U + U);
+  R = (Y2 + U) * Y1;
+  Y1 = Y2 * Y1;
+  R = R - Y2;
+  Y1 = Y1 - 0.5L;
+  if (Z != 6)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960218-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960218-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960218-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960218-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   960218-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int glob;
+
+int g (int x)
+{
+  glob = x;
+  return 0;
+}
+
+void f (int x)
+{
+  int a = ~x;
+  while (a)
+    a = g (a);
+}
+
+void
+testTortureExecute (void)
+{
+  f (3);
+  if (glob != -4)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960219-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960219-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960219-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960219-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+   960219-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+f (int i)
+{
+  if (((1 << i) & 1) == 0)
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  f (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960301-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960301-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960301-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960301-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   960301-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct foo {
+  unsigned : 12;
+  unsigned field : 4;
+} foo;
+unsigned oldfoo;
+
+int
+bar (unsigned k)
+{
+  oldfoo = foo.field;
+  foo.field = k;
+  if (k)
+    return 1;
+  return 2;
+}
+
+void
+testTortureExecute (void)
+{
+  if (bar (1U) != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960302-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960302-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960302-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960302-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+   960302-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+long a = 1;
+
+foo ()
+{
+  switch (a % 2 % 2 % 2 % 2 % 2 % 2 % 2 % 2)
+    {
+    case 0:
+      return 0;
+    case 1:
+      return 1;
+    default:
+      return -1;
+    }
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo () != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960311-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960311-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960311-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960311-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,74 @@
+/*
+   960311-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <stdio.h>
+
+int count;
+
+void a1() { ++count; }
+
+void
+b (unsigned char data)
+{
+  if (data & 0x80) a1();
+  data <<= 1;
+
+  if (data & 0x80) a1();
+  data <<= 1;
+
+  if (data & 0x80) a1();
+}
+
+void
+testTortureExecute (void)
+{
+  count = 0;
+  b (0);
+  if (count != 0)
+    ASSERT (0);
+
+  count = 0;
+  b (0x80);
+  if (count != 1)
+    ASSERT (0);
+
+  count = 0;
+  b (0x40);
+  if (count != 1)
+    ASSERT (0);
+
+  count = 0;
+  b (0x20);
+  if (count != 1)
+    ASSERT (0);
+
+  count = 0;
+  b (0xc0);
+  if (count != 2)
+    ASSERT (0);
+
+  count = 0;
+  b (0xa0);
+  if (count != 2)
+    ASSERT (0);
+
+  count = 0;
+  b (0x60);
+  if (count != 2)
+    ASSERT (0);
+
+  count = 0;
+  b (0xe0);
+  if (count != 3)
+    ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960311-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960311-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960311-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960311-2.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,74 @@
+/*
+   960311-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <stdio.h>
+
+int count;
+
+void a1() { ++count; }
+
+void
+b (unsigned short data)
+{
+  if (data & 0x8000) a1();
+  data <<= 1;
+
+  if (data & 0x8000) a1();
+  data <<= 1;
+
+  if (data & 0x8000) a1();
+}
+
+void
+testTortureExecute (void)
+{
+  count = 0;
+  b (0);
+  if (count != 0)
+    ASSERT (0);
+
+  count = 0;
+  b (0x8000);
+  if (count != 1)
+    ASSERT (0);
+
+  count = 0;
+  b (0x4000);
+  if (count != 1)
+    ASSERT (0);
+
+  count = 0;
+  b (0x2000);
+  if (count != 1)
+    ASSERT (0);
+
+  count = 0;
+  b (0xc000);
+  if (count != 2)
+    ASSERT (0);
+
+  count = 0;
+  b (0xa000);
+  if (count != 2)
+    ASSERT (0);
+
+  count = 0;
+  b (0x6000);
+  if (count != 2)
+    ASSERT (0);
+
+  count = 0;
+  b (0xe000);
+  if (count != 3)
+    ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960311-3.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960311-3.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960311-3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960311-3.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,74 @@
+/*
+   960311-3.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <stdio.h>
+
+int count;
+
+void a1() { ++count; }
+
+void
+b (unsigned long data)
+{
+  if (data & 0x80000000) a1();
+  data <<= 1;
+
+  if (data & 0x80000000) a1();
+  data <<= 1;
+
+  if (data & 0x80000000) a1();
+}
+
+void
+testTortureExecute (void)
+{
+  count = 0;
+  b (0);
+  if (count != 0)
+    ASSERT (0);
+
+  count = 0;
+  b (0x80000000);
+  if (count != 1)
+    ASSERT (0);
+
+  count = 0;
+  b (0x40000000);
+  if (count != 1)
+    ASSERT (0);
+
+  count = 0;
+  b (0x20000000);
+  if (count != 1)
+    ASSERT (0);
+
+  count = 0;
+  b (0xc0000000);
+  if (count != 2)
+    ASSERT (0);
+
+  count = 0;
+  b (0xa0000000);
+  if (count != 2)
+    ASSERT (0);
+
+  count = 0;
+  b (0x60000000);
+  if (count != 2)
+    ASSERT (0);
+
+  count = 0;
+  b (0xe0000000);
+  if (count != 3)
+    ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960317-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960317-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960317-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960317-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   960317-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int
+f (unsigned bitcount, int mant)
+{
+  int mask = -1 << bitcount;
+  {
+    if (! (mant & -mask))
+      goto ab;
+    if (mant & ~mask)
+      goto auf;
+  }
+ab:
+  return 0;
+auf:
+  return 1;
+}
+
+void
+testTortureExecute (void)
+{
+  if (f (0, -1))
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960321-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960321-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960321-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960321-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   960321-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+char a[10] = "deadbeef";
+
+char
+acc_a (long i)
+{
+  return a[i-2000000000L];
+}
+
+void
+testTortureExecute (void)
+{
+  if (acc_a (2000000000L) != 'd')
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960326-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960326-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960326-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960326-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   960326-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct s
+{
+  int a;
+  int b;
+  short c;
+  int d[3];
+};
+
+struct s s = { .b = 3, .d = {2,0,0} };
+
+void
+testTortureExecute (void)
+{
+  if (s.b != 3)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960327-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960327-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960327-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960327-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+   960327-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <stdio.h>
+g ()
+{
+  return '\n';
+}
+
+void f ()
+{
+  char s[] = "abcedfg012345";
+  char *sp = s + 12;
+
+  switch (g ())
+    {
+      case '\n':
+        break;
+    }
+
+  while (*--sp == '0')
+    ;
+  sprintf (sp + 1, "X");
+
+  if (s[12] != 'X')
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  f ();
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960402-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960402-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960402-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960402-1.c	2012-03-30 11:52:34.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   960402-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports long long constants!
+#if 0
+f (signed long long int x)
+{
+  return x > 0xFFFFFFFFLL || x < -0x80000000LL;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  if (f (0) != 0)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960416-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960416-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960416-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960416-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,80 @@
+/*
+   960416-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc can pass struct!
+#if 0
+typedef unsigned long int st;
+typedef unsigned long long dt;
+typedef union
+{
+  dt d;
+  struct
+  {
+    st h, l;
+  }
+  s;
+} t_be;
+
+typedef union
+{
+  dt d;
+  struct
+  {
+    st l, h;
+  }
+  s;
+} t_le;
+
+#define df(f, t) \
+int \
+f (t afh, t bfh) \
+{ \
+  t hh; \
+  t hp, lp, dp, m; \
+  st ad, bd; \
+  int s; \
+  s = 0; \
+  ad = afh.s.h - afh.s.l; \
+  bd = bfh.s.l - bfh.s.h; \
+  if (bd > bfh.s.l) \
+    { \
+      bd = -bd; \
+      s = ~s; \
+    } \
+  lp.d = (dt) afh.s.l * bfh.s.l; \
+  hp.d = (dt) afh.s.h * bfh.s.h; \
+  dp.d = (dt) ad *bd; \
+  dp.d ^= s; \
+  hh.d = hp.d + hp.s.h + lp.s.h + dp.s.h; \
+  m.d = (dt) lp.s.h + hp.s.l + lp.s.l + dp.s.l; \
+  return hh.s.l + m.s.l; \
+}
+
+df(f_le, t_le)
+df(f_be, t_be)
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  t_be x;
+  x.s.h = 0x10000000U;
+  x.s.l = 0xe0000000U;
+  if (x.d == 0x10000000e0000000ULL
+      && f_be ((t_be) 0x100000000ULL, (t_be) 0x100000000ULL) != -1)
+    ASSERT (0);
+  if (x.d == 0xe000000010000000ULL
+      && f_le ((t_le) 0x100000000ULL, (t_le) 0x100000000ULL) != -1)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960419-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960419-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960419-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960419-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   960419-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+static int i;
+
+void
+check(int x)
+{
+  if (!x)
+    ASSERT(0);
+}
+
+void
+testTortureExecute (void)
+{
+  int *p = &i;
+
+  check(p != (void *)0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960419-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960419-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960419-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960419-2.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+   960419-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#define SIZE 8
+
+void
+testTortureExecute (void)
+{
+  int a[SIZE] = {1};
+  int i;
+
+  for (i = 1; i < SIZE; i++)
+    if (a[i] != 0)
+      ASSERT(0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960513-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960513-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960513-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960513-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+   960513-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports long double!
+#if 0
+long double
+f (d, i)
+     long double d;
+     int i;
+{
+  long double e;
+
+  d = -d;
+  e = d;
+  if (i == 1)
+    d *= 2;
+  d -= e * d;
+  d -= e * d;
+  d -= e * d;
+  d -= e * d;
+  d -= e * d;
+  return d;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  if (! (int) (f (2.0L, 1)))
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960608-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960608-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960608-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960608-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+   960608-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+typedef struct
+{
+  unsigned char a  : 2;
+  unsigned char b  : 3;
+  unsigned char c  : 1;
+  unsigned char d  : 1;
+  unsigned char e  : 1;
+} a_struct;
+
+int foo (a_struct *flags)
+{
+  return (flags->c != 0
+	  || flags->d != 1
+	  || flags->e != 1
+	  || flags->a != 2
+	  || flags->b != 3);
+}
+
+void
+testTortureExecute (void)
+{
+  a_struct flags;
+
+  flags.c  = 0;
+  flags.d  = 1;
+  flags.e  = 1;
+  flags.a  = 2;
+  flags.b  = 3;
+
+  if (foo (&flags) != 0)
+    ASSERT (0);
+  else
+    return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960801-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960801-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960801-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960801-1.c	2012-04-02 09:59:13.000000000 +0000
@@ -0,0 +1,51 @@
+/*
+   960801-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Some ports do not yet support long long.
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16) && !defined(__SDCC_gbz80)
+unsigned
+f ()
+{
+  long long l2;
+  unsigned short us;
+  unsigned long long ul;
+  short s2;
+
+  ul = us = l2 = s2 = -1;
+  return ul;
+}
+
+unsigned long long
+g ()
+{
+  long long l2;
+  unsigned short us;
+  unsigned long long ul;
+  short s2;
+
+  ul = us = l2 = s2 = -1;
+  return ul;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+// Test fails on 32-bit systems
+#if 0
+//#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16) && !defined(__SDCC_gbz80)
+  if (f () != (unsigned short) -1)
+    ASSERT (0);
+  if (g () != (unsigned short) -1)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960909-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960909-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-960909-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-960909-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+   960909-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int
+ffs (int x)
+{
+  int bit, mask;
+
+  if (x == 0)
+    return 0;
+
+  for (bit = 1, mask = 1; !(x & mask); bit++, mask <<= 1)
+    ;
+
+  return bit;
+}
+
+void f (int x)
+{
+  int y;
+  y = ffs (x) - 1;
+  if (y < 0) 
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  f (1);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961004-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961004-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961004-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961004-1.c	2012-05-05 14:39:36.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   961004-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 84
+#endif
+
+int k = 0;
+
+void
+testTortureExecute (void)
+{
+  int i;
+  int j;
+
+  for (i = 0; i < 2; i++)
+    {
+      if (k)
+        {
+          if (j != 2)
+            ASSERT (0);
+        }
+      else
+        {
+          j = 2;
+          k++;
+        }
+    }
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961017-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961017-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961017-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961017-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,20 @@
+/*
+   961017-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+  unsigned char z = 0;
+
+  do ;
+  while (--z > 0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961017-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961017-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961017-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961017-2.c	2012-05-15 18:03:38.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+   961017-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+  int i = 0;
+
+
+  if (sizeof (unsigned long int) == 4)
+    {
+      unsigned long int z = 0;
+
+      do {
+	z -= 0x000040000;
+	i++;
+	if (i > 0x0004000)
+	  ASSERT (0);
+      } while (z > 0);
+      return;
+    }
+  else if (sizeof (unsigned int) == 4)
+    {
+      unsigned int z = 0;
+
+      do {
+	z -= 0x000040000;
+	i++;
+	if (i > 0x0004000)
+	  ASSERT (0);
+      } while (z > 0);
+      return;
+    }
+  else
+    return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961026-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961026-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961026-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961026-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   961026-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int
+test (int arg)
+{
+  if (arg > 0 || arg == 0)
+    return 0;
+  return -1;
+}
+
+void
+testTortureExecute (void)
+{
+  if (test (0) != 0)
+    ASSERT (0);
+  if (test (-1) != -1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961112-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961112-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961112-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961112-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+   961112-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int f (int x)
+{
+  if (x != 0 || x == 0)
+    return 0;
+  return 1;
+}
+
+void
+testTortureExecute (void)
+{
+  if (f (3))
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961122-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961122-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961122-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961122-1.c	2012-03-30 11:52:34.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   961122-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports long long constants!
+#if 0
+long long acc;
+
+addhi (short a)
+{
+  acc += (long long) a << 32;
+}
+
+subhi (short a)
+{
+  acc -= (long long) a << 32;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  acc = 0xffff00000000ll;
+  addhi (1);
+  if (acc != 0x1000000000000ll)
+    ASSERT (0);
+  subhi (1);
+  if (acc != 0xffff00000000ll)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961122-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961122-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961122-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961122-2.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,24 @@
+/*
+   961122-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int
+f (int a)
+{
+  return ((a >= 0 && a <= 10) && ! (a >= 0));
+}
+
+void
+testTortureExecute (void)
+{
+  if (f (0))
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961125-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961125-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961125-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961125-1.c	2012-05-05 14:39:36.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+   961125-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 196
+#endif
+
+static char *
+begfield (int tab, char *ptr, char *lim, int sword, int schar)
+{
+  if (tab)
+    {
+      while (ptr < lim && sword--)
+        {
+          while (ptr < lim && *ptr != tab)
+            ++ptr;
+          if (ptr < lim)
+            ++ptr;
+        }
+    }
+  else
+    {
+      while (1)
+        ;
+    }
+
+  if (ptr + schar <= lim)
+    ptr += schar;
+
+  return ptr;
+}
+
+void
+testTortureExecute (void)
+{
+  char *s = ":ab";
+  char *lim = s + 3;
+  if (begfield (':', s, lim, 1, 1) != s + 2)
+    ASSERT (0);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961206-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961206-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961206-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961206-1.c	2012-03-30 11:52:34.000000000 +0000
@@ -0,0 +1,69 @@
+/*
+   961206-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports long long constants!
+#if 0
+int
+sub1 (unsigned long long i)
+{
+  if (i < 0x80000000)
+    return 1;
+  else
+    return 0;
+}
+
+int
+sub2 (unsigned long long i)
+{
+  if (i <= 0x7FFFFFFF)
+    return 1;
+  else
+    return 0;
+}
+
+int
+sub3 (unsigned long long i)
+{
+  if (i >= 0x80000000)
+    return 0;
+  else
+    return 1;
+}
+
+int
+sub4 (unsigned long long i)
+{
+  if (i > 0x7FFFFFFF)
+    return 0;
+  else
+    return 1;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  if (sub1 (0x80000000ULL))
+    ASSERT (0);
+
+  if (sub2 (0x80000000ULL))
+    ASSERT (0);
+
+  if (sub3 (0x80000000ULL))
+    ASSERT (0);
+
+  if (sub4 (0x80000000ULL))
+    ASSERT (0);
+
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961213-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961213-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961213-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961213-1.c	2012-04-02 11:45:09.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+   961213-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when long long constants are supported!
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+int
+g (unsigned long long int *v, int n, unsigned int a[], int b)
+{
+  int cnt;
+  *v = 0;
+  for (cnt = 0; cnt < n; ++cnt)
+    *v = *v * b + a[cnt];
+  return n;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  int res;
+  unsigned int ar[] = { 10, 11, 12, 13, 14 };
+  unsigned long long int v;
+
+  res = g (&v, sizeof(ar)/sizeof(ar[0]), ar, 16);
+  if (v != 0xabcdeUL)
+    ASSERT (0);
+
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961223-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961223-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-961223-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-961223-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+   961223-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports struct!
+#if 0
+struct s {
+  double d;
+};
+
+inline struct s
+sub (struct s s)
+{
+  s.d += 1.0;
+  return s;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct s t = { 2.0 };
+  t = sub (t);
+  if (t.d != 3.0)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980205.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980205.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980205.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980205.c	2012-06-09 08:45:58.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   980205.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#endif
+
+#include <stdarg.h>
+
+//#ifndef __SDCC_ds390
+void fdouble (double one, ...)
+{
+  double value;
+  va_list ap;
+
+  va_start (ap, one);
+  value = va_arg (ap, double);
+  va_end (ap);
+
+  if (one != 1.0 || value != 2.0)
+    ASSERT (0);
+}
+//#endif
+
+void
+testTortureExecute (void)
+{
+  fdouble (1.0, 2.0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980223.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980223.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980223.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980223.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,48 @@
+/*
+   980223.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports struct!
+#if 0
+typedef struct { char *addr; long type; } object;
+
+object bar (object blah)
+{
+  ASSERT(0);
+}
+
+object foo (object x, object y)
+{
+  object z = *(object*)(x.addr);
+  if (z.type & 64)
+    {
+      y = *(object*)(z.addr+sizeof(object));
+      z = *(object*)(z.addr);
+      if (z.type & 64)
+        y = bar(y);
+    }
+  return y;
+}
+
+int nil;
+object cons1[2] = { {(char *) &nil, 0}, {(char *) &nil, 0} };
+object cons2[2] = { {(char *) &cons1, 64}, {(char *) &nil, 0} };
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  object x = {(char *) &cons2, 64};
+  object y = {(char *) &nil, 0};
+  object three = foo(x,y);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980424-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980424-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980424-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980424-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,37 @@
+/*
+   980424-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#ifndef __SDCC_mcs51
+int i, a[99];
+
+void f (int one)
+{
+  if (one != 1)
+    ASSERT (0);
+}
+
+void
+g ()
+{
+  f (a[i & 0x3f]);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_mcs51
+  a[0] = 1;
+  i = 0x40;
+  g ();
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980505-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980505-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980505-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980505-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,24 @@
+/*
+   980505-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+static int f(int);
+
+void
+testTortureExecute (void)
+{
+   int f1, f2, x;
+   x = 1; f1 = f(x);
+   x = 2; f2 = f(x);
+   if (f1 != 1 || f2 != 2)
+     ASSERT (0);
+   return;
+}
+static int f(int x) { return x; }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980505-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980505-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980505-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980505-2.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+   980505-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+typedef unsigned short Uint16;
+typedef unsigned int Uint;
+
+Uint f ()
+{
+        Uint16 token;
+        Uint count;
+        static Uint16 values[1] = {0x9300};
+
+        token = values[0];
+        count = token >> 8;
+
+        return count;
+}
+
+void
+testTortureExecute (void)
+{
+  if (f () != 0x93)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980506-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980506-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980506-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980506-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,37 @@
+/*
+   980506-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct decision
+{
+  char enforce_mode;             
+  struct decision *next;         
+};
+
+
+static void
+clear_modes (register struct decision *p)
+{
+  goto blah;
+
+foo:
+  p->enforce_mode = 0;
+blah:
+  if (p)
+    goto foo;
+}
+
+void
+testTortureExecute (void)
+{
+  struct decision *p = 0;
+  clear_modes (p);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980506-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980506-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980506-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980506-2.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   980506-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+static void *self(void *p){ return p; }
+
+int
+f()
+{
+  struct { int i; } s, *sp;
+  int *ip = &s.i;
+
+  s.i = 1;
+  sp = self(&s);
+  
+  *ip = 0;
+  return sp->i+1;
+}
+
+void
+testTortureExecute (void)
+{
+  if (f () != 1)
+    ASSERT (0);
+  else
+    return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980506-3.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980506-3.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980506-3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980506-3.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+   980506-3.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#ifndef __SDCC_mcs51
+#include <string.h>
+
+unsigned char lookup_table [257];
+
+static int 
+build_lookup (unsigned char * pattern)
+{
+  int m;
+
+  m = strlen (pattern) - 1;
+  
+  memset (lookup_table, ++m, 257);
+  return m;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_mcs51
+  if (build_lookup ("bind") != 4)
+    ASSERT (0);
+  else
+    return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980526-3.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980526-3.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980526-3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980526-3.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   980526-3.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int compare(unsigned int x, unsigned int y)
+{
+   if (x==y)
+     return 0;
+   else
+     return 1;
+}
+ 
+void
+testTortureExecute (void)
+{
+ unsigned int i, j, k, l;
+ i = 5; j = 2; k=0; l=2;
+ if (compare(5%(~(unsigned) 2), i%~j) 
+     || compare(0, k%~l))
+    ASSERT(0);
+ else
+    return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980602-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980602-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980602-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980602-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,21 @@
+/*
+   980602-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+  int i;
+  for (i = 1; i < 100; i++)
+    ;
+  if (i == 100) 
+    return;
+  ASSERT (0);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980604-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980604-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980604-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980604-1.c	2012-06-09 08:45:58.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   980604-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#endif
+
+int a = 1;
+int b = -1;
+
+int c = 1;
+int d = 0;
+
+void
+testTortureExecute (void)
+{
+  double e;
+  double f;
+  double g;
+
+  f = c;
+  g = d;
+  e = (a < b) ? f : g;
+  if (e)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980612-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980612-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980612-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980612-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+   980612-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct fd
+{
+	unsigned char a;
+	unsigned char b;
+} f = { 5 };
+
+struct fd *g() { return &f; }
+int h() { return -1; }
+
+void
+testTortureExecute (void)
+{
+	struct fd *f = g();
+	f->b = h();
+	if (((f->a & 0x7f) & ~0x10) <= 2)
+		ASSERT (0);
+	return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980617-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980617-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980617-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980617-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   980617-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void foo (unsigned int * p)
+{
+  if ((signed char)(*p & 0xFF) == 17 || (signed char)(*p & 0xFF) == 18)
+    return;
+  else
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  int i = 0x30011;
+  foo(&i);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980618-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980618-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980618-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980618-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   980618-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void func(int, int);
+
+void
+testTortureExecute (void)
+{
+        int x = 7;
+        func(!x, !7);
+	return;
+}
+
+void func(int x, int y)
+{
+        if (x == y)
+                return;
+        else
+                ASSERT (0);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980701-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980701-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980701-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980701-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   980701-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+ns_name_skip (unsigned char **x, unsigned char *y)
+{
+  *x = 0;
+  return 0;
+}
+
+unsigned char a[2];
+
+int dn_skipname(unsigned char *ptr, unsigned char *eom) {
+    unsigned char *saveptr = ptr;
+
+    if (ns_name_skip(&ptr, eom) == -1)
+	        return (-1);
+    return (ptr - saveptr);
+}
+
+void
+testTortureExecute (void)
+{
+  if (dn_skipname (&a[0], &a[1]) == 0)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980707-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980707-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980707-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980707-1.c	2012-06-15 12:17:22.000000000 +0000
@@ -0,0 +1,65 @@
+/*
+   980707-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+char **
+buildargv (char *input)
+{
+#ifndef __SDCC_mcs51
+  static char *arglist[256];
+#else
+  static char *arglist[8];
+#endif
+  int numargs = 0;
+
+  while (1)
+    {
+      while (*input == ' ')
+	    input++;
+      if (*input == 0)
+	    break;
+      arglist [numargs++] = input;
+      while (*input != ' ' && *input != 0)
+	    input++;
+      if (*input == 0)
+	    break;
+      *(input++) = 0;
+    }
+  arglist [numargs] = NULL;
+  return arglist;
+}
+
+void
+testTortureExecute (void)
+{
+  char **args;
+#ifndef __SDCC_mcs51
+  char input[256];
+#else
+  char input[8];
+#endif
+  int i;
+
+  strcpy(input, " a b");
+  args = buildargv(input);
+
+  if (strcmp (args[0], "a"))
+    ASSERT (0);
+  if (strcmp (args[1], "b"))
+    ASSERT (0);
+  if (args[2] != NULL)
+    ASSERT (0);
+  
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980716-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980716-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980716-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980716-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+   980716-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <stdarg.h>
+
+void
+stub(int num, ...)
+{
+    va_list ap;
+    char *end;
+    int i;
+
+    for (i = 0; i < 2; i++) {
+        va_start(ap, num);
+        while ( 1 ) {
+            end = va_arg(ap, char *);
+            if (!end) break;
+        }
+        va_end(ap);
+    }
+}
+
+void
+testTortureExecute (void)
+{
+    stub(1, "ab", "bc", "cx", 0);
+    return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980929-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980929-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-980929-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-980929-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   980929-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void f(int i)
+{
+  if (i != 1000)
+    ASSERT (0);
+}
+
+
+void
+testTortureExecute (void)
+{
+  int n=1000;
+  int i;
+
+  f(n);
+  for(i=0; i<1; ++i) {
+    f(n);
+    n=666;
+    &n;
+  }
+
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-981001-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-981001-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-981001-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-981001-1.c	2012-03-28 10:10:23.000000000 +0000
@@ -0,0 +1,50 @@
+/*
+   981001-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#define NG   0x100L
+
+unsigned long flg = 0;
+
+long sub (int n) __reentrant
+{
+  int a, b ;
+
+  if (n >= 2)
+    {
+      if (n % 2 == 0)
+	{
+	  a = sub (n / 2);
+	  
+	  return (a + 2 * sub (n / 2 - 1)) * a;
+	}
+      else
+	{
+	  a = sub (n / 2 + 1);
+	  b = sub (n / 2);
+	  
+	  return a * a + b * b;
+	}
+    }
+  else 
+    return (long) n;
+}
+
+void
+testTortureExecute (void)
+{
+  if (sub (30) != 832040L)
+    flg |= NG;
+
+  if (flg)
+    ASSERT (0);
+  
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-981019-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-981019-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-981019-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-981019-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,56 @@
+/*
+   981019-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+extern int f2(void);
+extern int f3(void);
+extern void f1(void);
+
+void
+ff(int fname, int part, int nparts)
+{
+  if (fname)  /* bb 0 */
+    {
+      if (nparts)  /* bb 1 */
+	f1();  /* bb 2 */
+    }
+  else
+    fname = 2; /* bb 3  */
+
+  /* bb 4 is the branch to bb 10
+     (bb 10 is physically at the end of the loop) */
+  while (f3() /* bb 10 */)
+    {
+      if (nparts /* bb 5 */ && f2() /* bb 6 */)
+	{
+	  f1();  /* bb 7 ... */
+	  nparts = part;
+	  if (f3())  /* ... bb 7 */
+	    f1();  /* bb 8 */
+	  f1(); /* bb 9 */
+	  break;
+	}
+    }
+
+  if (nparts)  /* bb 11 */
+    f1(); /* bb 12 */
+  return; /* bb 13 */
+}
+
+void
+testTortureExecute (void)
+{
+  ff(0, 1, 0);
+  return;
+}
+
+int f3(void) { static int x = 0; x = !x; return x; }
+void f1(void) { ASSERT(0); }
+int f2(void) { ASSERT(0); }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-981130-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-981130-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-981130-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-981130-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+   981130-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports struct!
+#if 0
+struct s { int a; int b;};
+struct s s1;
+struct s s2 = { 1, 2, };
+
+void
+check (int a, int b)
+{
+  if (a == b)
+    return;
+  else
+    ASSERT (0);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  int * p;
+  int x;
+  
+  s1.a = 9;
+  p    = & s1.a;
+  s1   = s2;
+  x    = * p;
+  
+  check (x, 1);
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-981206-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-981206-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-981206-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-981206-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+   981206-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Verify unaligned address aliasing on Alpha EV[45].  */
+
+static unsigned short x, y;
+
+void foo()
+{
+  x = 0x345;
+  y = 0x567;
+}
+
+void
+testTortureExecute (void)
+{
+  foo ();
+  if (x != 0x345 || y != 0x567)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990106-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990106-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990106-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990106-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,27 @@
+/*
+   990106-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+foo(char *bufp)
+{
+    int x = 80;
+    return (*bufp++ = x ? 'a' : 'b');
+}
+
+void
+testTortureExecute (void)
+{
+  char x;
+
+  if (foo (&x) != 'a')
+    ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990106-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990106-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990106-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990106-2.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   990106-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+unsigned calc_mp(unsigned mod)
+{
+      unsigned a,b,c;
+      c=-1;
+      a=c/mod;
+      b=0-a*mod;
+      if (b > mod) { a += 1; b-=mod; }
+      return b;
+}
+
+void
+testTortureExecute (void)
+{
+      unsigned x = 1234;
+      unsigned y = calc_mp(x);
+
+      if ((sizeof (y) == 4 && y != 680)
+	  || (sizeof (y) == 2 && y != 134))
+	ASSERT (0);
+      return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990117-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990117-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990117-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990117-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   990117-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#endif
+
+int
+foo (int x, int y, int i, int j)
+{
+  double tmp1 = ((double) x / y);
+  double tmp2 = ((double) i / j);
+
+  return tmp1 < tmp2;
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo (2, 24, 3, 4) == 0)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990127-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990127-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990127-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990127-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+   990127-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+void
+testTortureExecute (void)
+{
+    int a,b,c;
+    int *pa, *pb, *pc;
+    int **ppa, **ppb, **ppc;
+    int i,j,k,x,y,z;
+
+    a = 10;
+    b = 20;
+    c = 30;
+    pa = &a; pb = &b; pc = &c;
+    ppa = &pa; ppb = &pb; ppc = &pc;
+    x = 0; y = 0; z = 0;
+
+    for(i=0;i<10;i++){
+        if( pa == &a ) pa = &b;
+        else pa = &a;
+        while( (*pa)-- ){
+            x++;
+            if( (*pa) < 3 ) break;
+            else pa = &b;
+        }
+        x++;
+        pa = &b;
+    }
+
+    if ((*pa) != -5 || (*pb) != -5 || x != 43)
+      ASSERT (0);
+
+    return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990128-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990128-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990128-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990128-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,62 @@
+/*
+   990128-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+extern int printf (const char *,...);
+
+struct s { struct s *n; } *p;
+struct s ss;
+#define MAX     10
+struct s sss[MAX];
+int count = 0;
+
+void sub( struct s *p, struct s **pp );
+int look( struct s *p, struct s **pp );
+
+void
+testTortureExecute (void)
+{
+    struct s *pp;
+    struct s *next;
+    int i;
+
+    p = &ss;
+    next = p;
+    for ( i = 0; i < MAX; i++ ) {
+        next->n = &sss[i];
+        next = next->n;
+    }
+    next->n = 0;
+
+    sub( p, &pp );
+    if (count != MAX+2)
+      ASSERT ( 0 );
+
+    return;
+}
+
+void sub( struct s *p, struct s **pp )
+{
+   for ( ; look( p, pp ); ) {
+        if ( p )
+            p = p->n;
+        else
+            break;
+   }
+}
+
+int look( struct s *p, struct s **pp )
+{
+    for ( ; p; p = p->n )
+        ;
+    *pp = p;
+    count++;
+    return( 1 );
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990211-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990211-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990211-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990211-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,71 @@
+/*
+   990211-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Copyright (C) 1999 Free Software Foundation, Inc.
+  Contributed by Nathan Sidwell 20 Jan 1999 <nathan@acm.org> */
+
+/* check range combining boolean operations work */
+
+#define N 77
+
+void func(int i)
+{
+  /* fold-const does some clever things with range tests. Make sure
+     we get (some of) them right */
+  
+  /* these must fail, regardless of the value of i */
+  if ((i < 0) && (i >= 0))
+    ASSERT(0);
+  if ((i > 0) && (i <= 0))
+    ASSERT(0);
+  if ((i >= 0) && (i < 0))
+    ASSERT(0);
+  if ((i <= 0) && (i > 0))
+    ASSERT(0);
+
+  if ((i < N) && (i >= N))
+    ASSERT(0);
+  if ((i > N) && (i <= N))
+    ASSERT(0);
+  if ((i >= N) && (i < N))
+    ASSERT(0);
+  if ((i <= N) && (i > N))
+    ASSERT(0);
+    
+  /* these must pass, regardless of the value of i */
+  if (! ((i < 0) || (i >= 0)))
+    ASSERT(0);
+  if (! ((i > 0) || (i <= 0)))
+    ASSERT(0);
+  if (! ((i >= 0) || (i < 0)))
+    ASSERT(0);
+  if (! ((i <= 0) || (i > 0)))
+    ASSERT(0);
+
+  if (! ((i < N) || (i >= N)))
+    ASSERT(0);
+  if (! ((i > N) || (i <= N)))
+    ASSERT(0);
+  if (! ((i >= N) || (i < N)))
+    ASSERT(0);
+  if (! ((i <= N) || (i > N)))
+    ASSERT(0);
+  
+  return;
+}
+
+void
+testTortureExecute (void)
+{
+  func(0);
+  func(1);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990222-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990222-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990222-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990222-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+   990222-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+char line[4] = { '1', '9', '9', '\0' };
+
+void
+testTortureExecute (void)
+{
+  char *ptr = line + 3;
+
+  while ((*--ptr += 1) > '9') *ptr = '0';
+  if (line[0] != '2' || line[1] != '0' || line[2] != '0')
+    ASSERT(0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990404-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990404-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990404-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990404-1.c	2012-05-05 14:39:36.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+   990404-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 84
+#pragma disable_warning 85
+#endif
+
+
+int x[10] = { 0,1,2,3,4,5,6,7,8,9};
+
+void
+testTortureExecute (void)
+{
+  int niterations = 0, i;
+
+  for (;;) {
+    int i, mi, max;
+    max = 0;
+    for (i = 0; i < 10 ; i++) {
+      if (x[i] > max) {
+        max = x[i];
+        mi = i;
+      }
+    }
+    if (max == 0)
+      break;
+    x[mi] = 0;
+    niterations++;
+    if (niterations > 10)
+      ASSERT (0);
+  }
+
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990513-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990513-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990513-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990513-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+   990513-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#ifndef __SDCC_mcs51
+#include <string.h>
+
+void foo (int *BM_tab, int j)
+{
+  int *BM_tab_base;
+
+  BM_tab_base = BM_tab;
+  BM_tab += 0400;
+  while (BM_tab_base != BM_tab)
+    {
+      *--BM_tab = j;
+      *--BM_tab = j;
+      *--BM_tab = j;
+      *--BM_tab = j;
+    }
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_mcs51
+  int BM_tab[0400];
+  memset (BM_tab, 0, sizeof (BM_tab));
+  foo (BM_tab, 6);
+  if (BM_tab[0] != 6)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990524-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990524-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990524-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990524-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+   990524-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+char a[] = "12345";
+char b[] = "12345";
+
+void loop (char * pz, char * pzDta)
+{
+    for (;;) {
+        switch (*(pz++) = *(pzDta++)) {
+        case 0:
+  	    goto loopDone2;
+
+	case '"':
+	case '\\':
+	    pz[-1]  = '\\';
+            *(pz++) = pzDta[-1];
+	}
+    } loopDone2:;
+
+  if (a - pz != b - pzDta)
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  loop (a, b);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990525-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990525-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990525-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990525-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   990525-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc supports struct!
+#if 0
+struct blah {
+    int m1, m2;
+};
+
+void die(struct blah arg)
+{
+    int i ;
+    struct blah buf[1];
+
+    for (i = 0; i < 1 ; buf[i++] = arg)
+        ;
+    if (buf[0].m1 != 1) {
+        ASSERT (0);
+    }
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+    struct blah s = { 1, 2 };
+
+    die(s);
+    return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990525-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990525-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990525-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990525-2.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,53 @@
+/*
+   990525-2.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// TODO: Enable when sdcc can return struct!
+#if 0
+typedef struct {
+    int v[4];
+} Test1;
+
+Test1 func2();
+
+int func1()
+{
+    Test1 test;
+    test = func2();
+
+    if (test.v[0] != 10)
+      ASSERT (0);
+    if (test.v[1] != 20)
+      ASSERT (0);
+    if (test.v[2] != 30)
+      ASSERT (0);
+    if (test.v[3] != 40)
+      ASSERT (0);
+}
+
+Test1 func2()
+{
+    Test1 tmp;
+    tmp.v[0] = 10;
+    tmp.v[1] = 20;
+    tmp.v[2] = 30;
+    tmp.v[3] = 40;
+    return tmp;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+    func1();
+    return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990527-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990527-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990527-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990527-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   990527-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int sum;
+
+void
+g (int i)
+{
+  sum += i;
+}
+
+void
+f(int j)
+{
+  int i;
+
+  for (i = 0; i < 9; i++)
+    {
+      j++;
+      g (j);
+      j = 9;
+    }
+}
+
+void
+testTortureExecute (void)
+{
+  f (0);
+  if (sum != 81)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990531-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990531-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990531-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990531-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   990531-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+   unsigned long bad(int reg, unsigned long inWord)
+   {
+       union {
+           unsigned long word;
+           unsigned char byte[4];
+       } data;
+
+       data.word = inWord;
+       data.byte[reg] = 0;
+
+       return data.word;
+   }
+
+void
+testTortureExecute (void)
+{
+  /* XXX This test could be generalized.  */
+  if (sizeof (long) != 4)
+    return;
+
+  if (bad (0, 0xdeadbeef) == 0xdeadbeef)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990604-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990604-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990604-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990604-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   990604-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int b;
+void f ()
+{
+  int i = 0;
+  if (b == 0)
+    do {
+      b = i;
+      i++;
+    } while (i < 10);
+}
+
+void
+testTortureExecute (void)
+{
+  f ();
+  if (b != 9)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990804-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990804-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990804-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990804-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+   990804-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int gfbyte ( void ) 
+{
+ return 0;
+} 
+
+void
+testTortureExecute (void)
+{
+ int i,j,k ;
+
+ i = gfbyte();
+
+ i = i + 1 ;
+
+ if ( i == 0 ) 
+     k = -0 ;
+ else
+     k = i + 0 ;
+
+ if (i != 1)
+   ASSERT (0);
+
+ k = 1 ;
+ if ( k <= i)
+     do 
+	 j = gfbyte () ;
+     while ( k++ < i ) ;
+
+ return;
+} 
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990811-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990811-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990811-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990811-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+   990811-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct s {long a; int b;};
+
+int foo(int x, void *y)
+{
+  switch(x) {
+    case 0: return ((struct s*)y)->a;
+    case 1: return *(signed char*)y;
+    case 2: return *(short*)y;
+  }
+  ASSERT(0);
+}
+
+void
+testTortureExecute (void)
+{
+  struct s s;
+  short sh[10];
+  signed char c[10];
+  int i;
+
+  s.a = 1;
+  s.b = 2;
+  for (i = 0; i < 10; i++) {
+    sh[i] = i;
+    c[i] = i;
+  }
+
+  if (foo(0, &s) != 1) ASSERT(0);
+  if (foo(1, c+3) != 3) ASSERT(0);
+  if (foo(2, sh+3) != 3) ASSERT(0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990827-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990827-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990827-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990827-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+   990827-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+unsigned test(unsigned one , unsigned  bit)
+{
+    unsigned val=  bit & 1;
+    unsigned zero= one >> 1;
+
+    val++;
+    return zero + ( val>> 1 );
+}
+
+void
+testTortureExecute (void)
+{
+  if (test (1,0) != 0)
+    ASSERT (0);
+  if (test (1,1) != 1)
+    ASSERT (0);
+  if (test (1,65535) != 1)
+    ASSERT (0);
+  return;
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990829-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990829-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-990829-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-990829-1.c	2012-03-26 17:32:32.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   990829-1.c from the execute part of the gcc torture suite.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#endif
+
+double test (const double le, const double ri)
+{
+	double val = ( ri - le ) / ( ri * ( le + 1.0 ) );
+	return val;
+}
+
+void
+testTortureExecute (void)
+{
+        double retval;
+
+	retval = test(1.0,2.0);
+        if (retval < 0.24 || retval > 0.26)
+	  ASSERT (0);
+	return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-991016-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-991016-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-991016-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-991016-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,71 @@
+/*
+   991016-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Two of these types will, on current gcc targets, have the same
+   mode but have different alias sets.  DOIT tries to get gcse to
+   invalidly hoist one of the values out of the loop.  */
+
+#if 0
+//long long is not supported for some targets, and on the targets that support long long, this test crashes sdcc.
+typedef int T0;
+typedef long T1;
+typedef long long T2;
+
+int
+doit(int sel, int n, void *p)
+{
+  T0 * const p0 = p;
+  T1 * const p1 = p;
+  T2 * const p2 = p;
+
+  switch (sel)
+    {
+    case 0:
+      do 
+	*p0 += *p0;
+      while (--n);
+      return *p0 == 0;
+
+    case 1:
+      do 
+	*p1 += *p1;
+      while (--n);
+      return *p1 == 0;
+
+    case 2:
+      do 
+	*p2 += *p2;
+      while (--n);
+      return *p2 == 0;
+
+    default:
+      ASSERT (0);
+    }
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  T0 v0; T1 v1; T2 v2;
+
+  v0 = 1; doit(0, 5, &v0);
+  v1 = 1; doit(1, 5, &v1);
+  v2 = 1; doit(2, 5, &v2);
+
+  if (v0 != 32) ASSERT (0);
+  if (v1 != 32) ASSERT (0);
+  if (v2 != 32) ASSERT (0);
+
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-991023-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-991023-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-991023-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-991023-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   991023-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int blah;
+foo()
+{
+  int i;
+
+  for (i=0 ; i< 7 ; i++)
+    {
+      if (i == 7 - 1)
+	blah = 0xfcc;
+      else
+	blah = 0xfee;
+    }
+  return blah;
+}
+
+
+void
+testTortureExecute (void)
+{
+  if (foo () != 0xfcc)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-991112-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-991112-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-991112-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-991112-1.c	2012-05-18 16:39:12.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+   991112-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+#include <ctype.h>
+
+/* This code was miscompiled at -O3 on x86.
+   Reported by Jim Meyering; distilled from bash.  */
+
+int rl_show_char (int c) { return 0; }
+
+int rl_character_len (int c, int pos)
+{
+  return isprint (c) ? 1 : 2;
+}
+
+void
+testTortureExecute (void)
+{
+#if !defined (__SDCC_hc08) && !defined (__SDCC_s08) && !defined (__SDCC_ds390) && !defined (__SDCC_mcs51)
+  int (*x)(int, int) = rl_character_len;
+  if (x('a', 1) != 1)
+    ASSERT (0);
+  if (x('\002', 1) != 2)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-991202-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-991202-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-991202-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-991202-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   991202-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int x, y;
+
+void
+testTortureExecute (void)
+{
+  x = 2;
+  y = x;
+  do
+    {
+      x = y;
+      y = 2 * y;
+    }
+  while ( ! ((y - x) >= 20));
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-991202-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-991202-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-991202-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-991202-2.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,27 @@
+/*
+   991202-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int
+f1 ()
+{
+  unsigned long x, y = 1;
+
+  x = ((y * 8192) - 216) % 16;
+  return x;
+}
+
+void
+testTortureExecute (void)
+{
+  if (f1 () != 8)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-991216-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-991216-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-991216-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-991216-1.c	2012-04-02 09:59:13.000000000 +0000
@@ -0,0 +1,134 @@
+/*
+   991216-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 184
+#endif
+
+// Some ports do not support long long yet.
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+
+#define VALUE 0x123456789abcdefLL
+#define AFTER 0x55
+
+void
+test1 (int a, long long value, int after)
+{
+  if (a != 1
+      || value != VALUE
+      || after != AFTER)
+    ASSERT (0);
+}
+
+void
+test2 (int a, int b, long long value, int after)
+{
+  if (a != 1
+      || b != 2
+      || value != VALUE
+      || after != AFTER)
+    ASSERT (0);
+}
+
+void
+test3 (int a, int b, int c, long long value, int after)
+{
+  if (a != 1
+      || b != 2
+      || c != 3
+      || value != VALUE
+      || after != AFTER)
+    ASSERT (0);
+}
+
+void
+test4 (int a, int b, int c, int d, long long value, int after)
+{
+  if (a != 1
+      || b != 2
+      || c != 3
+      || d != 4
+      || value != VALUE
+      || after != AFTER)
+    ASSERT (0);
+}
+
+void
+test5 (int a, int b, int c, int d, int e, long long value, int after)
+{
+  if (a != 1
+      || b != 2
+      || c != 3
+      || d != 4
+      || e != 5
+      || value != VALUE
+      || after != AFTER)
+    ASSERT (0);
+}
+
+void
+test6 (int a, int b, int c, int d, int e, int f, long long value, int after)
+{
+  if (a != 1
+      || b != 2
+      || c != 3
+      || d != 4
+      || e != 5
+      || f != 6
+      || value != VALUE
+      || after != AFTER)
+    ASSERT (0);
+}
+
+void
+test7 (int a, int b, int c, int d, int e, int f, int g, long long value, int after)
+{
+  if (a != 1
+      || b != 2
+      || c != 3
+      || d != 4
+      || e != 5
+      || f != 6
+      || g != 7
+      || value != VALUE
+      || after != AFTER)
+    ASSERT (0);
+}
+
+void
+test8 (int a, int b, int c, int d, int e, int f, int g, int h, long long value, int after)
+{
+  if (a != 1
+      || b != 2
+      || c != 3
+      || d != 4
+      || e != 5
+      || f != 6
+      || g != 7
+      || h != 8
+      || value != VALUE
+      || after != AFTER)
+    ASSERT (0);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+  test1 (1, VALUE, AFTER);
+  test2 (1, 2, VALUE, AFTER);
+  test3 (1, 2, 3, VALUE, AFTER);
+  test4 (1, 2, 3, 4, VALUE, AFTER);
+  test5 (1, 2, 3, 4, 5, VALUE, AFTER);
+  test6 (1, 2, 3, 4, 5, 6, VALUE, AFTER);
+  test7 (1, 2, 3, 4, 5, 6, 7, VALUE, AFTER);
+  test8 (1, 2, 3, 4, 5, 6, 7, 8, VALUE, AFTER);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-991216-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-991216-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-991216-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-991216-2.c	2012-04-02 09:59:13.000000000 +0000
@@ -0,0 +1,58 @@
+/*
+   991216-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 184
+#endif
+
+// Some ports do not support long long yet.
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+
+#include <stdarg.h>
+
+#define VALUE 0x123456789abcdefLL
+#define AFTER 0x55
+
+void
+test (int n, ...)
+{
+  va_list ap;
+  int i;
+
+  va_start (ap, n);
+  for (i = 2; i <= n; i++)
+    {
+      if (va_arg (ap, int) != i)
+	ASSERT (0);
+    }
+
+  if (va_arg (ap, long long) != VALUE)
+    ASSERT (0);
+
+  if (va_arg (ap, int) != AFTER)
+    ASSERT (0);
+
+  va_end (ap);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+  test (1, VALUE, AFTER);
+  test (2, 2, VALUE, AFTER);
+  test (3, 2, 3, VALUE, AFTER);
+  test (4, 2, 3, 4, VALUE, AFTER);
+  test (5, 2, 3, 4, 5, VALUE, AFTER);
+  test (6, 2, 3, 4, 5, 6, VALUE, AFTER);
+  test (7, 2, 3, 4, 5, 6, 7, VALUE, AFTER);
+  test (8, 2, 3, 4, 5, 6, 7, 8, VALUE, AFTER);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-991216-4.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-991216-4.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-991216-4.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-991216-4.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   991216-4.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Test against a problem with loop reversal.  */
+static void bug(int size, int tries)
+{
+    int i;
+    int num = 0;
+    while (num < size)
+    {
+        for (i = 1; i < tries; i++) num++;
+    }
+}
+
+void
+testTortureExecute (void)
+{
+    bug(5, 10);
+    return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-991227-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-991227-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-991227-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-991227-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,24 @@
+/*
+   991227-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+char* doit(int flag)
+{
+  return 1 + (flag ? "\0wrong\n" : "\0right\n");
+}
+
+void
+testTortureExecute (void)
+{
+  char *result = doit(0);
+  if (*result == 'r' && result[1] == 'i')
+    return;
+  ASSERT (0);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-anon-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-anon-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-anon-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-anon-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+   anon-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c11
+
+/* Copyright (C) 2001 Free Software Foundation, Inc.  */
+
+/* Source: Neil Booth, 4 Nov 2001, derived from PR 2820 - field lookup in
+   nested anonymous entities was broken.  */
+
+struct
+{
+  int x;
+  struct
+  {
+    int a;
+    union
+    {
+      int b;
+    };
+  };
+} foo;
+#endif
+
+void
+testTortureExecute (void)
+{
+#ifdef __SDCC
+  foo.b = 6;
+  foo.a = 5;
+
+  if (foo.b != 6)
+    ASSERT (0);
+
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-arith-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-arith-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-arith-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-arith-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   arith-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c89
+#endif
+
+unsigned
+sat_add (unsigned i)
+{
+  unsigned ret = i + 1;
+  if (ret < i)
+    ret = i;
+  return ret;
+}
+
+void
+testTortureExecute (void)
+{
+  if (sat_add (~0U) != ~0U)
+    ASSERT (0);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-bitfld-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-bitfld-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-bitfld-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-bitfld-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,64 @@
+/*
+   bitfld-1-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c89
+#endif
+
+/* Copyright 2002 Free Software Foundation, Inc.
+
+   Tests correct signedness of operations on bitfields; in particular
+   that integer promotions are done correctly, including the case when
+   casts are present.
+
+   The C front end was eliding the cast of an unsigned bitfield to
+   unsigned as a no-op, when in fact it forces a conversion to a
+   full-width unsigned int. (At the time of writing, the C++ front end
+   has a different bug; it erroneously promotes the uncast unsigned
+   bitfield to an unsigned int).
+
+   Source: Neil Booth, 25 Jan 2002, based on PR 3325 (and 3326, which
+   is a different manifestation of the same bug).
+*/
+
+extern void abort ();
+
+void
+testTortureExecute (void)
+{
+  struct x { signed int i : 7; unsigned int u : 7; } bit;
+
+  unsigned int u;
+  int i;
+  unsigned int unsigned_result = -13U % 61;
+  int signed_result = -13 % 61;
+
+  bit.u = 61, u = 61; 
+  bit.i = -13, i = -13;
+
+  if (i % u != unsigned_result)
+    ASSERT (0);
+  if (i % (unsigned int) u != unsigned_result)
+    ASSERT (0);
+
+  /* Somewhat counter-intuitively, bit.u is promoted to an int, making
+     the operands and result an int.  */
+  if (i % bit.u != signed_result)
+    ASSERT (0);;
+
+  if (bit.i % bit.u != signed_result)
+    ASSERT (0);
+
+  /* But with a cast to unsigned int, the unsigned int is promoted to
+     itself as a no-op, and the operands and result are unsigned.  */
+  if (i % (unsigned int) bit.u != unsigned_result)
+    ASSERT (0);
+
+  if (bit.i % (unsigned int) bit.u != unsigned_result)
+    ASSERT (0);
+
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-cmpsf-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-cmpsf-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-cmpsf-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-cmpsf-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,178 @@
+/*
+   cmpsf-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <limits.h>
+#include <float.h>
+
+#define F 140
+#define T 13
+
+feq (float x, float y)
+{
+  if (x == y)
+    return T;
+  else
+    return F;
+}
+
+fne (float x, float y)
+{
+  if (x != y)
+    return T;
+  else
+    return F;
+}
+
+flt (float x, float y)
+{
+  if (x < y)
+    return T;
+  else
+    return F;
+}
+
+fge (float x, float y)
+{
+  if (x >= y)
+    return T;
+  else
+    return F;
+}
+
+fgt (float x, float y)
+{
+  if (x > y)
+    return T;
+  else
+    return F;
+}
+
+fle (float x, float y)
+{
+  if (x <= y)
+    return T;
+  else
+    return F;
+}
+
+float args[] =
+{
+  0.0F,
+  1.0F,
+  -1.0F, 
+  FLT_MAX,
+  FLT_MIN,
+  0.0000000000001F,
+  123456789.0F,
+  -987654321.0F
+};
+
+#ifndef __SDCC_mcs51
+
+int correct_results[] =
+{
+ T, F, F, T, F, T,                                             
+ F, T, T, F, F, T,                                             
+ F, T, F, T, T, F,                                             
+ F, T, T, F, F, T,                                             
+ F, T, T, F, F, T,                                             
+ F, T, T, F, F, T,                                             
+ F, T, T, F, F, T,                                             
+ F, T, F, T, T, F,                                             
+ F, T, F, T, T, F,                                             
+ T, F, F, T, F, T,                                             
+ F, T, F, T, T, F,                                             
+ F, T, T, F, F, T,                                             
+ F, T, F, T, T, F,                                             
+ F, T, F, T, T, F,                                             
+ F, T, T, F, F, T,                                             
+ F, T, F, T, T, F,                                             
+ F, T, T, F, F, T,                                             
+ F, T, T, F, F, T,                                             
+ T, F, F, T, F, T,                                             
+ F, T, T, F, F, T,                                             
+ F, T, T, F, F, T,                                             
+ F, T, T, F, F, T,                                             
+ F, T, T, F, F, T,                                             
+ F, T, F, T, T, F,                                             
+ F, T, F, T, T, F,                                             
+ F, T, F, T, T, F,
+ F, T, F, T, T, F,
+ T, F, F, T, F, T,
+ F, T, F, T, T, F,
+ F, T, F, T, T, F,
+ F, T, F, T, T, F,
+ F, T, F, T, T, F,
+ F, T, F, T, T, F,
+ F, T, T, F, F, T,
+ F, T, F, T, T, F,
+ F, T, T, F, F, T,
+ T, F, F, T, F, T,
+ F, T, T, F, F, T,
+ F, T, T, F, F, T,
+ F, T, F, T, T, F,
+ F, T, F, T, T, F,
+ F, T, T, F, F, T,
+ F, T, F, T, T, F,
+ F, T, T, F, F, T,
+ F, T, F, T, T, F,
+ T, F, F, T, F, T,
+ F, T, T, F, F, T,
+ F, T, F, T, T, F,
+ F, T, F, T, T, F,
+ F, T, F, T, T, F,
+ F, T, F, T, T, F,
+ F, T, T, F, F, T,
+ F, T, F, T, T, F,
+ F, T, F, T, T, F,
+ T, F, F, T, F, T,
+ F, T, F, T, T, F,
+ F, T, T, F, F, T,
+ F, T, T, F, F, T,
+ F, T, T, F, F, T,
+ F, T, T, F, F, T,
+ F, T, T, F, F, T,
+ F, T, T, F, F, T,
+ F, T, T, F, F, T,
+ T, F, F, T, F, T,
+};
+#endif
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_mcs51
+  int i, j, *res = correct_results;
+
+  for (i = 0; i < 8; i++)
+    {
+      float arg0 = args[i];
+      for (j = 0; j < 8; j++)
+	{
+	  float arg1 = args[j];
+
+	  if (feq (arg0, arg1) != *res++)
+	    ASSERT (0);
+	  if (fne (arg0, arg1) != *res++)
+	    ASSERT (0);
+	  if (flt (arg0, arg1) != *res++)
+	    ASSERT (0);
+	  if (fge (arg0, arg1) != *res++)
+	    ASSERT (0);
+	  if (fgt (arg0, arg1) != *res++)
+	    ASSERT (0);
+	  if (fle (arg0, arg1) != *res++)
+	    ASSERT (0);
+	}
+    }
+#endif
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-compare-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-compare-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-compare-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-compare-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,127 @@
+/*
+   compare-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Copyright (C) 2002 Free Software Foundation.
+
+   Test for correctness of composite comparisons.
+
+   Written by Roger Sayle, 3rd June 2002.  */
+
+int ieq (int x, int y, int ok)
+{
+  if ((x<=y) && (x>=y))
+    {
+      if (!ok) ASSERT (0);
+    }
+  else
+    if (ok) ASSERT (0);
+
+  if ((x<=y) && (x==y))
+    {
+      if (!ok) ASSERT (0);
+    }
+  else
+    if (ok) ASSERT (0);
+
+  if ((x<=y) && (y<=x))
+    {
+      if (!ok) ASSERT (0);
+    }
+  else
+    if (ok) ASSERT (0);
+
+  if ((y==x) && (x<=y))
+    {
+      if (!ok) ASSERT (0);
+    }
+  else
+    if (ok) ASSERT (0);
+}
+
+int ine (int x, int y, int ok)
+{
+  if ((x<y) || (x>y))
+    {
+      if (!ok) ASSERT (0);
+    }
+  else
+    if (ok) ASSERT (0);
+}
+
+int ilt (int x, int y, int ok)
+{
+  if ((x<y) && (x!=y))
+    {
+      if (!ok) ASSERT (0);
+    }
+  else
+    if (ok) ASSERT (0);
+}
+
+int ile (int x, int y, int ok)
+{
+  if ((x<y) || (x==y))
+    {
+      if (!ok) ASSERT (0);
+    }
+  else
+    if (ok) ASSERT (0);
+}
+
+int igt (int x, int y, int ok)
+{
+  if ((x>y) && (x!=y))
+    {
+      if (!ok) ASSERT (0);
+    }
+  else
+    if (ok) ASSERT (0);
+}
+
+int ige (int x, int y, int ok)
+{
+  if ((x>y) || (x==y))
+    {
+      if (!ok) ASSERT (0);
+    }
+  else
+    if (ok) ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  ieq (1, 4, 0);
+  ieq (3, 3, 1);
+  ieq (5, 2, 0);
+
+  ine (1, 4, 1);
+  ine (3, 3, 0);
+  ine (5, 2, 1);
+
+  ilt (1, 4, 1);
+  ilt (3, 3, 0);
+  ilt (5, 2, 0);
+
+  ile (1, 4, 1);
+  ile (3, 3, 1);
+  ile (5, 2, 0);
+
+  igt (1, 4, 0);
+  igt (3, 3, 0);
+  igt (5, 2, 1);
+
+  ige (1, 4, 0);
+  ige (3, 3, 1);
+  ige (5, 2, 1);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-compare-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-compare-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-compare-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-compare-2.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   compare-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Copyright (C) 2002 Free Software Foundation.
+
+   Ensure that the composite comparison optimization doesn't misfire
+   and attempt to combine a signed comparison with an unsigned one.
+
+   Written by Roger Sayle, 3rd June 2002.  */
+
+extern void abort (void);
+
+int
+foo (int x, int y)
+{
+  /* If miscompiled the following may become "x == y".  */
+  return (x<=y) && ((unsigned int)x >= (unsigned int)y);
+}
+
+void
+testTortureExecute (void)
+{
+  if (! foo (-1,0))
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-compare-3.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-compare-3.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-compare-3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-compare-3.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,95 @@
+/*
+   compare-3.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Copyright (C) 2002 Free Software Foundation.
+
+   Test for composite comparison always true/false optimization.
+
+   Written by Roger Sayle, 7th June 2002.  */
+
+extern void link_error0 ();
+extern void link_error1 ();
+
+void
+test1 (int x, int y)
+{
+  if ((x==y) && (x!=y))
+    link_error0();
+}
+
+void
+test2 (int x, int y)
+{
+  if ((x<y) && (x>y))
+    link_error0();
+}
+
+void
+test3 (int x, int y)
+{
+  if ((x<y) && (y<x))
+    link_error0();
+}
+
+void 
+test4 (int x, int y)
+{
+  if ((x==y) || (x!=y))
+    {
+    }
+  else
+    link_error1 ();
+}
+
+void
+test5 (int x, int y)
+{
+  if ((x>=y) || (x<y))
+    {
+    }
+  else
+    link_error1 ();
+}
+
+void
+test6 (int x, int y)
+{
+  if ((x<=y) || (y<x))
+    {
+    }
+  else
+    link_error1 ();
+}
+
+void
+all_tests (int x, int y)
+{
+  test1 (x, y);
+  test2 (x, y);
+  test3 (x, y);
+  test4 (x, y);
+  test5 (x, y);
+  test6 (x, y);
+}
+
+void
+testTortureExecute (void)
+{
+  all_tests (0, 0);
+  all_tests (1, 2);
+  all_tests (4, 3);
+
+  return;
+}
+
+void link_error0() {ASSERT (0);}
+void link_error1() {ASSERT (0);}
+
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-const-addr-expr-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-const-addr-expr-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-const-addr-expr-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-const-addr-expr-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,46 @@
+/*
+   const-addr-expr-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include        <stdio.h>
+#include        <stdlib.h>
+
+#if 0
+typedef struct foo
+{
+        int     uaattrid;
+        const char    *name;
+} FOO;
+
+FOO     Upgrade_items[] =
+{
+        {1, "1"},
+        {2, "2"},
+        {0, NULL}
+};
+
+int     *Upgd_minor_ID = 
+        (int *) &((Upgrade_items + 1)->uaattrid);
+
+int     *Upgd_minor_ID1 = 
+        (int *) &((Upgrade_items)->uaattrid);
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+	if (*Upgd_minor_ID != 2)
+	  ASSERT (0);
+
+	if (*Upgd_minor_ID1 != 1)
+	  ASSERT (0);
+	return;
+#endif
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-divcmp-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-divcmp-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-divcmp-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-divcmp-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,367 @@
+/*
+   divcmp-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+extern void abort(void);
+
+int test1(int x)
+{
+  return x/10 == 2;
+}
+
+int test1u(unsigned int x)
+{
+  return x/10U == 2;
+}
+
+int test2(int x)
+{
+  return x/10 == 0;
+}
+
+int test2u(unsigned int x)
+{
+  return x/10U == 0;
+}
+
+int test3(int x)
+{
+  return x/10 != 2;
+}
+
+int test3u(unsigned int x)
+{
+  return x/10U != 2;
+}
+
+int test4(int x)
+{
+  return x/10 != 0;
+}
+
+int test4u(unsigned int x)
+{
+  return x/10U != 0;
+}
+
+int test5(int x)
+{
+  return x/10 < 2;
+}
+
+int test5u(unsigned int x)
+{
+  return x/10U < 2;
+}
+
+int test6(int x)
+{
+  return x/10 < 0;
+}
+
+int test7(int x)
+{
+  return x/10  <= 2;
+}
+
+int test7u(unsigned int x)
+{
+  return x/10U <= 2;
+}
+
+int test8(int x)
+{
+  return x/10 <= 0;
+}
+
+int test8u(unsigned int x)
+{
+  return x/10U <= 0;
+}
+
+int test9(int x)
+{
+  return x/10 > 2;
+}
+
+int test9u(unsigned int x)
+{
+  return x/10U > 2;
+}
+
+int test10(int x)
+{
+  return x/10 > 0;
+}
+
+int test10u(unsigned int x)
+{
+  return x/10U > 0;
+}
+
+int test11(int x)
+{
+  return x/10 >= 2;
+}
+
+int test11u(unsigned int x)
+{
+  return x/10U >= 2;
+}
+
+int test12(int x)
+{
+  return x/10 >= 0;
+}
+
+
+void
+testTortureExecute (void)
+{
+  if (test1(19) != 0)
+    ASSERT (0);
+  if (test1(20) != 1)
+    ASSERT (0);
+  if (test1(29) != 1)
+    ASSERT (0);
+  if (test1(30) != 0)
+    ASSERT (0);
+
+  if (test1u(19) != 0)
+    ASSERT (0);
+  if (test1u(20) != 1)
+    ASSERT (0);
+  if (test1u(29) != 1)
+    ASSERT (0);
+  if (test1u(30) != 0)
+    ASSERT (0);
+
+  if (test2(0) != 1)
+    ASSERT (0);
+  if (test2(9) != 1)
+    ASSERT (0);
+  if (test2(10) != 0)
+    ASSERT (0);
+  if (test2(-1) != 1)
+    ASSERT (0);
+  if (test2(-9) != 1)
+    ASSERT (0);
+  if (test2(-10) != 0)
+    ASSERT (0);
+
+  if (test2u(0) != 1)
+    ASSERT (0);
+  if (test2u(9) != 1)
+    ASSERT (0);
+  if (test2u(10) != 0)
+    ASSERT (0);
+  if (test2u(-1) != 0)
+    ASSERT (0);
+  if (test2u(-9) != 0)
+    ASSERT (0);
+  if (test2u(-10) != 0)
+    ASSERT (0);
+
+  if (test3(19) != 1)
+    ASSERT (0);
+  if (test3(20) != 0)
+    ASSERT (0);
+  if (test3(29) != 0)
+    ASSERT (0);
+  if (test3(30) != 1)
+    ASSERT (0);
+
+  if (test3u(19) != 1)
+    ASSERT (0);
+  if (test3u(20) != 0)
+    ASSERT (0);
+  if (test3u(29) != 0)
+    ASSERT (0);
+  if (test3u(30) != 1)
+    ASSERT (0);
+
+  if (test4(0) != 0)
+    ASSERT (0);
+  if (test4(9) != 0)
+    ASSERT (0);
+  if (test4(10) != 1)
+    ASSERT (0);
+  if (test4(-1) != 0)
+    ASSERT (0);
+  if (test4(-9) != 0)
+    ASSERT (0);
+  if (test4(-10) != 1)
+    ASSERT (0);
+
+  if (test4u(0) != 0)
+    ASSERT (0);
+  if (test4u(9) != 0)
+    ASSERT (0);
+  if (test4u(10) != 1)
+    ASSERT (0);
+  if (test4u(-1) != 1)
+    ASSERT (0);
+  if (test4u(-9) != 1)
+    ASSERT (0);
+  if (test4u(-10) != 1)
+    ASSERT (0);
+
+  if (test5(19) != 1)
+    ASSERT (0);
+  if (test5(20) != 0)
+    ASSERT (0);
+  if (test5(29) != 0)
+    ASSERT (0);
+  if (test5(30) != 0)
+    ASSERT (0);
+
+  if (test5u(19) != 1)
+    ASSERT (0);
+  if (test5u(20) != 0)
+    ASSERT (0);
+  if (test5u(29) != 0)
+    ASSERT (0);
+  if (test5u(30) != 0)
+    ASSERT (0);
+
+  if (test6(0) != 0)
+    ASSERT (0);
+  if (test6(9) != 0)
+    ASSERT (0);
+  if (test6(10) != 0)
+    ASSERT (0);
+  if (test6(-1) != 0)
+    ASSERT (0);
+  if (test6(-9) != 0)
+    ASSERT (0);
+  if (test6(-10) != 1)
+    ASSERT (0);
+
+  if (test7(19) != 1)
+    ASSERT (0);
+  if (test7(20) != 1)
+    ASSERT (0);
+  if (test7(29) != 1)
+    ASSERT (0);
+  if (test7(30) != 0)
+    ASSERT (0);
+
+  if (test7u(19) != 1)
+    ASSERT (0);
+  if (test7u(20) != 1)
+    ASSERT (0);
+  if (test7u(29) != 1)
+    ASSERT (0);
+  if (test7u(30) != 0)
+    ASSERT (0);
+
+  if (test8(0) != 1)
+    ASSERT (0);
+  if (test8(9) != 1)
+    ASSERT (0);
+  if (test8(10) != 0)
+    ASSERT (0);
+  if (test8(-1) != 1)
+    ASSERT (0);
+  if (test8(-9) != 1)
+    ASSERT (0);
+  if (test8(-10) != 1)
+    ASSERT (0);
+
+  if (test8u(0) != 1)
+    ASSERT (0);
+  if (test8u(9) != 1)
+    ASSERT (0);
+  if (test8u(10) != 0)
+    ASSERT (0);
+  if (test8u(-1) != 0)
+    ASSERT (0);
+  if (test8u(-9) != 0)
+    ASSERT (0);
+  if (test8u(-10) != 0)
+    ASSERT (0);
+
+  if (test9(19) != 0)
+    ASSERT (0);
+  if (test9(20) != 0)
+    ASSERT (0);
+  if (test9(29) != 0)
+    ASSERT (0);
+  if (test9(30) != 1)
+    ASSERT (0);
+
+  if (test9u(19) != 0)
+    ASSERT (0);
+  if (test9u(20) != 0)
+    ASSERT (0);
+  if (test9u(29) != 0)
+    ASSERT (0);
+  if (test9u(30) != 1)
+    ASSERT (0);
+
+  if (test10(0) != 0)
+    ASSERT (0);
+  if (test10(9) != 0)
+    ASSERT (0);
+  if (test10(10) != 1)
+    ASSERT (0);
+  if (test10(-1) != 0)
+    ASSERT (0);
+  if (test10(-9) != 0)
+    ASSERT (0);
+  if (test10(-10) != 0)
+    ASSERT (0);
+
+  if (test10u(0) != 0)
+    ASSERT (0);
+  if (test10u(9) != 0)
+    ASSERT (0);
+  if (test10u(10) != 1)
+    ASSERT (0);
+  if (test10u(-1) != 1)
+    ASSERT (0);
+  if (test10u(-9) != 1)
+    ASSERT (0);
+  if (test10u(-10) != 1)
+    ASSERT (0);
+
+  if (test11(19) != 0)
+    ASSERT (0);
+  if (test11(20) != 1)
+    ASSERT (0);
+  if (test11(29) != 1)
+    ASSERT (0);
+  if (test11(30) != 1)
+    ASSERT (0);
+
+  if (test11u(19) != 0)
+    ASSERT (0);
+  if (test11u(20) != 1)
+    ASSERT (0);
+  if (test11u(29) != 1)
+    ASSERT (0);
+  if (test11u(30) != 1)
+    ASSERT (0);
+
+  if (test12(0) != 1)
+    ASSERT (0);
+  if (test12(9) != 1)
+    ASSERT (0);
+  if (test12(10) != 1)
+    ASSERT (0);
+  if (test12(-1) != 1)
+    ASSERT (0);
+  if (test12(-9) != 1)
+    ASSERT (0);
+  if (test12(-10) != 0)
+    ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-divcmp-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-divcmp-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-divcmp-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-divcmp-2.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,100 @@
+/*
+   divcmp-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int test1(int x)
+{
+  return x/10 == 2;
+}
+
+int test2(int x)
+{
+  return x/10 == 0;
+}
+
+int test3(int x)
+{
+  return x/10 == -2;
+}
+
+int test4(int x)
+{
+  return x/-10 == 2;
+}
+
+int test5(int x)
+{
+  return x/-10 == 0;
+}
+
+int test6(int x)
+{
+  return x/-10 == -2;
+}
+
+void
+testTortureExecute (void)
+{
+  if (test1(19) != 0)
+    ASSERT (0);
+  if (test1(20) != 1)
+    ASSERT (0);
+  if (test1(29) != 1)
+    ASSERT (0);
+  if (test1(30) != 0)
+    ASSERT (0);
+
+  if (test2(-10) != 0)
+    ASSERT (0);
+  if (test2(-9) != 1)
+    ASSERT (0);
+  if (test2(9) != 1)
+    ASSERT (0);
+  if (test2(10) != 0)
+    ASSERT (0);
+
+  if (test3(-30) != 0)
+    ASSERT (0);
+  if (test3(-29) != 1)
+    ASSERT (0);
+  if (test3(-20) != 1)
+    ASSERT (0);
+  if (test3(-19) != 0)
+    ASSERT (0);
+
+  if (test4(-30) != 0)
+    ASSERT (0);
+  if (test4(-29) != 1)
+    ASSERT (0);
+  if (test4(-20) != 1)
+    ASSERT (0);
+  if (test4(-19) != 0)
+    ASSERT (0);
+
+  if (test5(-10) != 0)
+    ASSERT (0);
+  if (test5(-9) != 1)
+    ASSERT (0);
+  if (test5(9) != 1)
+    ASSERT (0);
+  if (test5(10) != 0)
+    ASSERT (0);
+
+  if (test6(19) != 0)
+    ASSERT (0);
+  if (test6(20) != 1)
+    ASSERT (0);
+  if (test6(29) != 1)
+    ASSERT (0);
+  if (test6(30) != 0)
+    ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-divcmp-3.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-divcmp-3.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-divcmp-3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-divcmp-3.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,105 @@
+/*
+   divcmp-3.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int test1(char x)
+{
+  return x/100 == 3;
+}
+
+int test1u(unsigned char x)
+{
+  return x/100 == 3;
+}
+
+int test2(char x)
+{
+  return x/100 != 3;
+}
+
+int test2u(unsigned char x)
+{
+  return x/100 != 3;
+}
+
+int test3(char x)
+{
+  return x/100 < 3;
+}
+
+int test3u(unsigned char x)
+{
+  return x/100 < 3;
+}
+
+int test4(char x)
+{
+  return x/100 <= 3;
+}
+
+int test4u(unsigned char x)
+{
+  return x/100 <= 3;
+}
+
+int test5(char x)
+{
+  return x/100 > 3;
+}
+
+int test5u(unsigned char x)
+{
+  return x/100 > 3;
+}
+
+int test6(char x)
+{
+  return x/100 >= 3;
+}
+
+int test6u(unsigned char x)
+{
+  return x/100 >= 3;
+}
+
+void
+testTortureExecute (void)
+{
+  int c;
+
+  for (c=-128; c<256; c++)
+  {
+    if (test1(c) != 0)
+      ASSERT (0);
+    if (test1u(c) != 0)
+      ASSERT (0);
+    if (test2(c) != 1)
+      ASSERT (0);
+    if (test2u(c) != 1)
+      ASSERT (0);
+    if (test3(c) != 1)
+      ASSERT (0);
+    if (test3u(c) != 1)
+      ASSERT (0);
+    if (test4(c) != 1)
+      ASSERT (0);
+    if (test4u(c) != 1)
+      ASSERT (0);
+    if (test5(c) != 0)
+      ASSERT (0);
+    if (test5u(c) != 0)
+      ASSERT (0);
+    if (test6(c) != 0)
+      ASSERT (0);
+    if (test6u(c) != 0)
+      ASSERT (0);
+  }
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-divcmp-4.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-divcmp-4.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-divcmp-4.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-divcmp-4.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,210 @@
+/*
+   divcmp-4.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR middle-end/17894 */
+
+int test1(int x)
+{
+  return x/-10 == 2;
+}
+
+int test2(int x)
+{
+  return x/-10 == 0;
+}
+
+int test3(int x)
+{
+  return x/-10 != 2;
+}
+
+int test4(int x)
+{
+  return x/-10 != 0;
+}
+
+int test5(int x)
+{
+  return x/-10 < 2;
+}
+
+int test6(int x)
+{
+  return x/-10 < 0;
+}
+
+int test7(int x)
+{
+  return x/-10  <= 2;
+}
+
+int test8(int x)
+{
+  return x/-10 <= 0;
+}
+
+int test9(int x)
+{
+  return x/-10 > 2;
+}
+
+int test10(int x)
+{
+  return x/-10 > 0;
+}
+
+int test11(int x)
+{
+  return x/-10 >= 2;
+}
+
+int test12(int x)
+{
+  return x/-10 >= 0;
+}
+
+void
+testTortureExecute (void)
+{
+  if (test1(-30) != 0)
+    ASSERT (0);
+  if (test1(-29) != 1)
+    ASSERT (0);
+  if (test1(-20) != 1)
+    ASSERT (0);
+  if (test1(-19) != 0)
+    ASSERT (0);
+
+  if (test2(0) != 1)
+    ASSERT (0);
+  if (test2(9) != 1)
+    ASSERT (0);
+  if (test2(10) != 0)
+    ASSERT (0);
+  if (test2(-1) != 1)
+    ASSERT (0);
+  if (test2(-9) != 1)
+    ASSERT (0);
+  if (test2(-10) != 0)
+    ASSERT (0);
+
+  if (test3(-30) != 1)
+    ASSERT (0);
+  if (test3(-29) != 0)
+    ASSERT (0);
+  if (test3(-20) != 0)
+    ASSERT (0);
+  if (test3(-19) != 1)
+    ASSERT (0);
+
+  if (test4(0) != 0)
+    ASSERT (0);
+  if (test4(9) != 0)
+    ASSERT (0);
+  if (test4(10) != 1)
+    ASSERT (0);
+  if (test4(-1) != 0)
+    ASSERT (0);
+  if (test4(-9) != 0)
+    ASSERT (0);
+  if (test4(-10) != 1)
+    ASSERT (0);
+
+  if (test5(-30) != 0)
+    ASSERT (0);
+  if (test5(-29) != 0)
+    ASSERT (0);
+  if (test5(-20) != 0)
+    ASSERT (0);
+  if (test5(-19) != 1)
+    ASSERT (0);
+
+  if (test6(0) != 0)
+    ASSERT (0);
+  if (test6(9) != 0)
+    ASSERT (0);
+  if (test6(10) != 1)
+    ASSERT (0);
+  if (test6(-1) != 0)
+    ASSERT (0);
+  if (test6(-9) != 0)
+    ASSERT (0);
+  if (test6(-10) != 0)
+    ASSERT (0);
+
+  if (test7(-30) != 0)
+    ASSERT (0);
+  if (test7(-29) != 1)
+    ASSERT (0);
+  if (test7(-20) != 1)
+    ASSERT (0);
+  if (test7(-19) != 1)
+    ASSERT (0);
+
+  if (test8(0) != 1)
+    ASSERT (0);
+  if (test8(9) != 1)
+    ASSERT (0);
+  if (test8(10) != 1)
+    ASSERT (0);
+  if (test8(-1) != 1)
+    ASSERT (0);
+  if (test8(-9) != 1)
+    ASSERT (0);
+  if (test8(-10) != 0)
+    ASSERT (0);
+
+  if (test9(-30) != 1)
+    ASSERT (0);
+  if (test9(-29) != 0)
+    ASSERT (0);
+  if (test9(-20) != 0)
+    ASSERT (0);
+  if (test9(-19) != 0)
+    ASSERT (0);
+
+  if (test10(0) != 0)
+    ASSERT (0);
+  if (test10(9) != 0)
+    ASSERT (0);
+  if (test10(10) != 0)
+    ASSERT (0);
+  if (test10(-1) != 0)
+    ASSERT (0);
+  if (test10(-9) != 0)
+    ASSERT (0);
+  if (test10(-10) != 1)
+    ASSERT (0);
+
+  if (test11(-30) != 1)
+    ASSERT (0);
+  if (test11(-29) != 1)
+    ASSERT (0);
+  if (test11(-20) != 1)
+    ASSERT (0);
+  if (test11(-19) != 0)
+    ASSERT (0);
+
+  if (test12(0) != 1)
+    ASSERT (0);
+  if (test12(9) != 1)
+    ASSERT (0);
+  if (test12(10) != 0)
+    ASSERT (0);
+  if (test12(-1) != 1)
+    ASSERT (0);
+  if (test12(-9) != 1)
+    ASSERT (0);
+  if (test12(-10) != 1)
+    ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-divconst-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-divconst-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-divconst-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-divconst-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   divconst-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+typedef struct
+{
+  unsigned a, b, c, d;
+} t1;
+
+f (t1 *ps)
+{
+    ps->a = 10000;
+    ps->b = ps->a / 3;
+    ps->c = 10000;
+    ps->d = ps->c / 3;
+}
+
+void
+testTortureExecute (void)
+{
+  t1 s;
+  f (&s);
+  if (s.a != 10000 || s.b != 3333 || s.c != 10000 || s.d != 3333)
+    ASSERT (0);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-divconst-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-divconst-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-divconst-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-divconst-2.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,52 @@
+/*
+   divconst-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#pragma disable_warning 85
+
+long
+f (long x)
+{
+  return x / (-0x7fffffffL - 1L);
+}
+
+long
+r (long x)
+{
+  return x % (-0x7fffffffL - 1L);
+}
+
+/* Since we have a negative divisor, this equation must hold for the
+   results of / and %; no specific results are guaranteed.  */
+long
+std_eqn (long num, long denom, long quot, long rem)
+{
+  /* For completeness, a check for "ABS (rem) < ABS (denom)" belongs here,
+     but causes trouble on 32-bit machines and isn't worthwhile.  */
+  return quot * (-0x7fffffffL - 1L) + rem == num;
+}
+
+long nums[] =
+{
+  -1L, 0x7fffffffL, -0x7fffffffL - 1L
+};
+
+void
+testTortureExecute (void)
+{
+  int i;
+
+  for (i = 0;
+       i < sizeof (nums) / sizeof (nums[0]);
+       i++)
+    if (std_eqn (nums[i], -0x7fffffffL - 1L, f (nums[i]), r (nums[i])) == 0)
+      ASSERT (0);
+
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-divmod-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-divmod-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-divmod-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-divmod-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,88 @@
+/*
+   divmod-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+div1 (signed char x)
+{
+  return x / -1;
+}
+
+div2 (signed short x)
+{
+  return x / -1;
+}
+
+div3 (signed char x, signed char y)
+{
+  return x / y;
+}
+
+div4 (signed short x, signed short y)
+{
+  return x / y;
+}
+
+mod1 (signed char x)
+{
+  return x % -1;
+}
+
+mod2 (signed short x)
+{
+  return x % -1;
+}
+
+mod3 (signed char x, signed char y)
+{
+  return x % y;
+}
+
+mod4 (signed short x, signed short y)
+{
+  return x % y;
+}
+
+signed long
+mod5 (signed long x, signed long y)
+{
+  return x % y;
+}
+     
+unsigned long
+mod6 (unsigned long x, unsigned long y)
+{
+  return x % y;
+}
+     
+void
+testTortureExecute (void)
+{
+  if (div1 (-(1 << 7)) != 1 << 7)
+    ASSERT (0);
+  if (div2 (-(1 << 15)) != 1 << 15)
+    ASSERT (0);
+  if (div3 (-(1 << 7), -1) != 1 << 7)
+    ASSERT (0);
+  if (div4 (-(1 << 15), -1) != 1 << 15)
+    ASSERT (0);
+  if (mod1 (-(1 << 7)) != 0)
+    ASSERT (0);
+  if (mod2 (-(1 << 15)) != 0)
+    ASSERT (0);
+  if (mod3 (-(1 << 7), -1) != 0)
+    ASSERT (0);
+  if (mod4 (-(1 << 15), -1) != 0)
+    ASSERT (0);
+  if (mod5 (0x50000000, 2) != 0)
+    ASSERT (0);
+  if (mod6 (0x50000000, 2) != 0)
+    ASSERT (0);
+  
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-doloop-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-doloop-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-doloop-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-doloop-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+   doloop-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <limits.h>
+
+volatile unsigned int i;
+
+void
+testTortureExecute (void)
+{
+  unsigned char z = 0;
+
+  do ++i;
+  while (--z > 0);
+  if (i != UCHAR_MAX + 1U)
+    ASSERT (0);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-doloop-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-doloop-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-doloop-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-doloop-2.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   doloop-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <limits.h>
+
+volatile unsigned int i;
+
+void
+testTortureExecute (void)
+{
+  unsigned short z = 0;
+
+  do ++i;
+  while (--z > 0);
+  if (i != USHRT_MAX + 1U)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-enum-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-enum-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-enum-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-enum-2.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   enum-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Copyright (C) 2000 Free Software Foundation */
+/* by Alexandre Oliva  <aoliva@redhat.com> */
+
+enum foo { FOO, BAR };
+
+/* Even though the underlying type of an enum is unspecified, the type
+   of enumeration constants is explicitly defined as int (6.4.4.3/2 in
+   the C99 Standard).  Therefore, `i' must not be promoted to
+   `unsigned' in the comparison below; we must exit the loop when it
+   becomes negative. */
+
+void
+testTortureExecute (void)
+{
+  int i;
+  for (i = BAR; i >= FOO; --i)
+    if (i == -1)
+      ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-enum-3.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-enum-3.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-enum-3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-enum-3.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+   enum-3.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* The composite type of int and an enum compatible with int might be
+   either of the two types, but it isn't an unsigned type.  */
+/* Origin: Joseph Myers <jsm@polyomino.org.uk> */
+
+#include <limits.h>
+
+#include <stdio.h>
+
+enum e { a = INT_MIN };
+
+int *p;
+enum e *q;
+
+void
+testTortureExecute (void)
+{
+  enum e x = a;
+  q = &x;
+  if (*(1 ? q : p) > 0)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-func-ptr-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-func-ptr-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-func-ptr-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-func-ptr-1.c	2012-05-18 16:39:12.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   func-ptr-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93 // Using float for double.
+#endif
+
+static double f (float a);
+static double (*fp) (float a);
+
+void
+testTortureExecute (void)
+{
+#if !defined(__SDCC_hc08) && !defined(__SDCC_s08)
+  fp = f;
+  if (fp ((float) 1) != 1.0)
+    ASSERT (0);
+  return;
+#endif
+}
+
+static double
+f (float a)
+{
+  return a;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-ifcvt-onecmpl-abs-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-ifcvt-onecmpl-abs-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-ifcvt-onecmpl-abs-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-ifcvt-onecmpl-abs-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,27 @@
+/*
+   ifcvt-onecmpl-abs-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int foo(int n)
+{
+  if (n < 0)
+    n = ~n;
+
+  return n;
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo (-1) != 0)
+    ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-int-compare.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-int-compare.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-int-compare.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-int-compare.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,120 @@
+/*
+   int-compare.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c89
+#endif
+
+#include <limits.h>
+
+int gt (int a, int b)
+{
+  return a > b;
+}
+
+int ge (int a, int b)
+{
+  return a >= b;
+}
+
+int lt (int a, int b)
+{
+  return a < b;
+}
+
+int le (int a, int b)
+{
+  return a <= b;
+}
+
+void
+true (int c)
+{
+  if (!c)
+    ASSERT (0);
+}
+
+void
+false (int c)
+{
+  if (c)
+    ASSERT (0);
+}
+
+void f (void)
+{
+  true (gt (2, 1));
+  false (gt (1, 2));
+
+  true (gt (INT_MAX, 0));
+  false (gt (0, INT_MAX));
+  true (gt (INT_MAX, 1));
+  false (gt (1, INT_MAX));
+
+  false (gt (INT_MIN, 0));
+  true (gt (0, INT_MIN));
+  false (gt (INT_MIN, 1));
+  true (gt (1, INT_MIN));
+
+  true (gt (INT_MAX, INT_MIN));
+  false (gt (INT_MIN, INT_MAX));
+
+  true (ge (2, 1));
+  false (ge (1, 2));
+
+  true (ge (INT_MAX, 0));
+  false (ge (0, INT_MAX));
+  true (ge (INT_MAX, 1));
+  false (ge (1, INT_MAX));
+
+  false (ge (INT_MIN, 0));
+  true (ge (0, INT_MIN));
+  false (ge (INT_MIN, 1));
+  true (ge (1, INT_MIN));
+
+  true (ge (INT_MAX, INT_MIN));
+  false (ge (INT_MIN, INT_MAX));
+
+  false (lt (2, 1));
+  true (lt (1, 2));
+
+  false (lt (INT_MAX, 0));
+  true (lt (0, INT_MAX));
+  false (lt (INT_MAX, 1));
+  true (lt (1, INT_MAX));
+
+  true (lt (INT_MIN, 0));
+  false (lt (0, INT_MIN));
+  true (lt (INT_MIN, 1));
+  false (lt (1, INT_MIN));
+
+  false (lt (INT_MAX, INT_MIN));
+  true (lt (INT_MIN, INT_MAX));
+
+  false (le (2, 1));
+  true (le (1, 2));
+
+  false (le (INT_MAX, 0));
+  true (le (0, INT_MAX));
+  false (le (INT_MAX, 1));
+  true (le (1, INT_MAX));
+
+  true (le (INT_MIN, 0));
+  false (le (0, INT_MIN));
+  true (le (INT_MIN, 1));
+  false (le (1, INT_MIN));
+
+  false (le (INT_MAX, INT_MIN));
+  true (le (INT_MIN, INT_MAX));
+}
+
+void
+testTortureExecute (void)
+{
+  f ();
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+   loop-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+  int i, j, k[3];
+
+  j = 0;
+  for (i=0; i < 3; i++)
+    {
+      k[i] = j++;
+    }
+
+  for (i=2; i >= 0; i--)
+    {
+      if (k[i] != i)
+	ASSERT (0);
+    }
+
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-10.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-10.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-10.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-10.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+   loop-10.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Reduced from PR optimization/5076, PR optimization/2847 */
+
+static int count = 0;
+
+static void
+inc (void)
+{
+  count++;
+}
+
+void
+testTortureExecute (void)
+{
+  int iNbr = 1;
+  int test = 0;
+  while (test == 0)
+    {
+      inc ();
+      if (iNbr == 0)
+        break;
+      else
+        {
+          inc ();
+          iNbr--;
+        }
+      test = 1;
+    }
+  if (count != 2)
+    ASSERT (0);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-11.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-11.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-11.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-11.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   loop-11.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#ifndef __SDCC_mcs51
+static int a[199];
+
+static void
+foo ()
+{
+  int i;
+  for (i = 198; i >= 0; i--)
+    a[i] = i;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_mcs51
+  int i;
+  foo ();
+  for (i = 0; i < 199; i++)
+    if (a[i] != i)
+      ASSERT (0);
+#endif
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-12.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-12.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-12.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-12.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,37 @@
+/*
+   loop-12.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+
+/* Checks that pure functions are not treated as const.  */
+
+const char *p;
+
+static int
+is_end_of_statement (void)
+{
+  return *p == '\n' || *p == ';' || *p == '!';
+}
+
+void foo (void)
+{
+  /* The is_end_of_statement call was moved out of the loop at one stage,
+     resulting in an endless loop.  */
+  while (!is_end_of_statement ())
+    p++;
+}
+
+void
+testTortureExecute (void)
+{
+  p = "abc\n";
+  foo ();
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-13.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-13.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-13.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-13.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,46 @@
+/*
+   loop-13.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR opt/7130 */
+#define TYPE long
+
+void
+scale (TYPE *alpha, TYPE *x, int n)
+{
+  int i, ix;
+
+  if (*alpha != 1)
+    for (i = 0, ix = 0; i < n; i++, ix += 2)
+      {
+	TYPE tmpr, tmpi;
+	tmpr = *alpha * x[ix];
+	tmpi = *alpha * x[ix + 1];
+	x[ix] = tmpr;
+	x[ix + 1] = tmpi;
+      }
+}
+
+void
+testTortureExecute (void)
+{
+  int i;
+  TYPE x[10];
+  TYPE alpha = 2;
+
+  for (i = 0; i < 10; i++)
+    x[i] = i;
+
+  scale (&alpha, x, 5);
+
+  if (x[9] != 18)
+    ASSERT (0);
+
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-14.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-14.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-14.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-14.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   loop-14.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int a3[3];
+
+void f(int *a)
+{
+  int i;
+
+  for (i=3; --i;)
+    a[i] = 42 / i;
+}
+
+void
+testTortureExecute (void)
+{
+  f(a3);
+
+  if (a3[1] != 42 || a3[2] != 21)
+    ASSERT (0);
+
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-15.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-15.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-15.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-15.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,50 @@
+/*
+   loop-15.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Bombed with a segfault on powerpc-linux.  doloop.c generated wrong
+   loop count.  */
+void
+foo (unsigned long *start, unsigned long *end)
+{
+  unsigned long *temp = end - 1;
+
+  while (end > start)
+    *end-- = *temp--;
+}
+
+void
+testTortureExecute (void)
+{
+  unsigned long a[5];
+  int start, end, k;
+
+  for (start = 0; start < 5; start++)
+    for (end = 0; end < 5; end++)
+      {
+	for (k = 0; k < 5; k++)
+	  a[k] = k;
+
+	foo (a + start, a + end);
+
+	for (k = 0; k <= start; k++)
+	  if (a[k] != k)
+	    ASSERT (0);
+
+	for (k = start + 1; k <= end; k++)
+	  if (a[k] != k - 1)
+	    ASSERT (0);
+
+	for (k = end + 1; k < 5; k++)
+	  if (a[k] != k)
+	    ASSERT (0);
+      }
+
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-2.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   loop-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int a[2];
+
+void f (int b)
+{
+  unsigned int i;
+  for (i = 0; i < b; i++)
+    a[i] = i - 2;
+}
+
+void
+testTortureExecute (void)
+{
+  a[0] = a[1] = 0;
+  f (2);
+  if (a[0] != -2 || a[1] != -1)
+    ASSERT (0);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-2c.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-2c.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-2c.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-2c.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   loop-2c.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int a[2];
+
+inline void f (int b, int o)
+{
+  unsigned int i;
+  int *p;
+  for (p = &a[b], i = b; --i < ~0; )
+    *--p = i * 3 + o;
+}
+
+void g(int b)
+{
+  f (b, (int)a);
+}
+
+void
+testTortureExecute (void)
+{
+  a[0] = a[1] = 0;
+  g (2);
+  if (a[0] != (int)a || a[1] != (int)a + 3)
+    ASSERT (0);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-2d.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-2d.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-2d.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-2d.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+   loop-2d.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int a[2];
+
+void f (int b)
+{
+  unsigned int i;
+  int *p;
+  for (p = &a[b], i = b; --i < ~0; )
+    *--p = i * 3 + (int)a;
+}
+
+void
+testTortureExecute (void)
+{
+  a[0] = a[1] = 0;
+  f (2);
+  if (a[0] != (int)a || a[1] != (int)a + 3)
+    ASSERT (0);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-3.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-3.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-3.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   loop-3.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+#include <limits.h>
+
+int n = 0;
+
+void g (int i)
+{
+  n++;
+}
+
+void f (int m)
+{
+  int i;
+  i = m;
+  do
+    {
+      g (i * INT_MAX / 2);
+    }
+  while (--i > 0);
+}
+
+void
+testTortureExecute (void)
+{
+  f (4);
+  if (n != 4)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-3b.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-3b.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-3b.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-3b.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   loop-3b.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+#include <limits.h>
+
+int n = 0;
+
+void g (int i)
+{
+  n++;
+}
+
+void f (int m)
+{
+  int i;
+  i = m;
+  do
+    {
+      g (i * 4);
+      i -= INT_MAX / 8;
+    }
+  while (i > 0);
+}
+
+void
+testTortureExecute (void)
+{
+  f (INT_MAX/8*4);
+  if (n != 4)
+    ASSERT (0);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-3c.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-3c.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-3c.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-3c.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,47 @@
+/*
+   loop-4c.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <limits.h>
+
+#ifndef __SDCC_mcs51
+void * a[255];
+
+void f (int m)
+{
+  int i;
+  int sh = 0x100;
+  i = m;
+  do
+    {
+      a[sh >>= 1] = ((unsigned)i << 3)  + (char*)a;
+      i += 4;
+    }
+  while (i < INT_MAX/2 + 1 + 4 * 4);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_mcs51
+  a[0x10] = 0;
+  a[0x08] = 0;
+  f (INT_MAX/2 + INT_MAX/4 + 2);
+  if (a[0x10] || a[0x08])
+    ASSERT (0);
+  a[0x10] = 0;
+  a[0x08] = 0;
+  f (INT_MAX/2 + 1);
+  if (! a[0x10] || a[0x08])
+    ASSERT (0);
+#endif
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-5.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-5.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-5.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-5.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,52 @@
+/*
+   loop-5.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#if !defined(__SDCC_ds390)
+static int ap(int i);
+static void testit(void){
+  int ir[4] = {0,1,2,3};
+  int ix,n,m;
+  n=1; m=3;
+  for (ix=1;ix<=4;ix++) {
+    if (n == 1) m = 4;
+    else        m = n-1;
+    ap(ir[n-1]);
+    n = m;
+  }
+}
+
+static int t = 0;
+static int a[4];
+
+static int ap(int i){
+  if (t > 3)
+    ASSERT (0);
+  a[t++] = i;
+  return 1;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if !defined(__SDCC_ds390)
+  testit();
+  if (a[0] != 0)
+    ASSERT (0);
+  if (a[1] != 3)
+    ASSERT (0);
+  if (a[2] != 2)
+    ASSERT (0);
+  if (a[3] != 1)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-6.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-6.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-6.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-6.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   loop-6.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void
+testTortureExecute (void)
+{
+  char c;
+  char d;
+  int nbits;
+  c = -1;
+  for (nbits = 1 ; nbits < 100; nbits++) {
+    d = (1 << nbits) - 1;
+    if (d == c)
+      break;
+  }
+  if (nbits == 100)
+    ASSERT (0);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-7.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-7.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-7.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-7.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   loop-7.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void foo (unsigned int n)
+{
+  int i, j = -1;
+
+  for (i = 0; i < 10 && j < 0; i++)
+    {
+      if ((1UL << i) == n)
+	j = i;
+    }
+
+  if (j < 0)
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  foo (64);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-8.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-8.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-8.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-8.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+   loop-8.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#pragma disable_warning 93 // Using float for double.
+
+double a[3] = { 0.0, 1.0, 2.0 };
+
+void bar (int x, double *y)
+{
+  if (x || *y != 1.0)
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  double c;
+  int d;
+  for (d = 0; d < 3; d++)
+  {
+    c = a[d];
+    if (c > 0.0) goto e;
+  }
+  bar(1, &c);
+  return;
+e:
+  bar(0, &c);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-9.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-9.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-loop-9.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-loop-9.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   loop-9.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c89
+#endif
+
+/* Source: Neil Booth, from PR # 115.  */
+
+int false()
+{
+  return 0;
+}
+
+void
+testTortureExecute (void)
+{
+  int count = 0;
+
+  while (false() || count < -123)
+    ++count;
+
+  if (count)
+    ASSERT (0);
+
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-mod-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-mod-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-mod-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-mod-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+   mod-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c89
+#endif
+
+int f (int x, int y)
+{
+  if (x % y != 0)
+    ASSERT(0);
+}
+
+void
+testTortureExecute (void)
+{
+  f (-5, 5);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pending-4.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pending-4.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pending-4.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pending-4.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   pending-4.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c89
+#endif
+
+#pragma disable_warning 85
+
+void dummy (int *x, int y)
+{}
+
+void
+testTortureExecute (void)
+{
+  int number_columns=9;
+  int cnt0 = 0;
+  int cnt1 = 0;
+  int i,A1;
+
+  for (i = number_columns-1; i != 0; i--)
+    {         
+      if (i == 1)
+	{
+	  dummy(&A1, i);
+	  cnt0++;
+	}
+      else
+	{
+          dummy(&A1, i-1);
+          cnt1++;
+	}
+    }
+  if (cnt0 != 1 || cnt1 != 7)
+    ASSERT(0);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-postmod-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-postmod-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-postmod-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-postmod-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,77 @@
+/*
+   postmod-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c89
+#endif
+
+#ifndef __SDCC_mcs51
+
+#define DECLARE_ARRAY(A) array##A[0x10]
+#define DECLARE_COUNTER(A) counter##A = 0
+#define DECLARE_POINTER(A) *pointer##A = array##A + x
+/* Create a loop that allows post-modification of pointerA, followed by
+   a use of the post-modified address.  */
+#define BEFORE(A) counter##A += *pointer##A, pointer##A += 3
+#define AFTER(A) counter##A += pointer##A[x]
+
+/* Set up the arrays so that one iteration of the loop sets the counter
+   to 3.0f.  */
+#define INIT_ARRAY(A) array##A[1] = 1.0f, array##A[5] = 2.0f
+
+/* Check that the loop worked correctly for all values.  */
+#define CHECK_ARRAY(A) exit_code |= (counter##A != 3.0f)
+
+/* Having 6 copies triggered the bug for ARM and Thumb.  */
+#define MANY(A) A (0), A (1), A (2), A (3), A (4), A (5)
+
+/* Each addendA should be allocated a register.  */
+#define INIT_VOLATILE(A) addend##A = vol
+#define ADD_VOLATILE(A) vol += addend##A
+
+/* Having 5 copies triggered the bug for ARM and Thumb.  */
+#define MANY2(A) A (0), A (1), A (2), A (3), A (4)
+
+float MANY (DECLARE_ARRAY);
+float MANY (DECLARE_COUNTER);
+
+volatile int stop = 1;
+volatile int vol;
+
+foo (int x)
+{
+  float MANY (DECLARE_POINTER);
+  int i;
+
+  do
+    {
+      MANY (BEFORE);
+      MANY (AFTER);
+      /* Create an inner loop that should ensure the code above
+	 has registers free for reload inheritance.  */
+      {
+	int MANY2 (INIT_VOLATILE);
+	for (i = 0; i < 10; i++)
+	  MANY2 (ADD_VOLATILE);
+      }
+    }
+  while (!stop);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+  int exit_code = 0;
+#ifndef __SDCC_mcs51
+  MANY (INIT_ARRAY);
+  foo (1);
+  MANY (CHECK_ARRAY);
+#endif
+  ASSERT (!exit_code);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr15262-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr15262-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr15262-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr15262-2.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,53 @@
+/*
+   pr15262-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* TODO: Enable this once we can pass structures as function arguments! */
+#if 0
+/* PR 15262.  Similar to pr15262-1.c but with no obvious addresses
+   being taken in function foo().  Without IPA, by only looking inside
+   foo() we cannot tell for certain whether 'q' and 'b' alias each
+   other.  */
+struct A
+{
+  int t;
+  int i;
+};
+
+struct B
+{
+  int *p;
+  float b;
+};
+
+float X;
+
+foo (struct B b, struct A *q, float *h)
+{
+  X += *h;
+  *(b.p) = 3;
+  q->t = 2;
+  return *(b.p);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  struct A a;
+  struct B b;
+
+  b.p = &a.t;
+  if (foo (b, &a, &X) == 3)
+    ASSERT (0);
+
+  return;
+#endif
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr15262.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr15262.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr15262.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr15262.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,59 @@
+/*
+   pr15262.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* We used to mis-compile this testcase as we did not know that
+   &a+offsetof(b,a) was the same as &a.b */
+struct A
+{
+  int t;
+  int i;
+};
+
+void
+bar (float *p)
+{
+  *p = 5.2;
+}
+
+int
+foo(struct A *locp, int i, int str)
+{
+  float f, g, *p;
+  int T355;
+  int *T356;
+  /* Currently, the alias analyzer has limited support for handling
+     aliases of structure fields when no other variables are aliased.
+     Introduce additional aliases to confuse it.  */
+  p =  i ? &g : &f;
+  bar (p);
+  if (*p > 0.0)
+    str = 1;
+
+  T355 = locp->i;
+  T356 = &locp->i;
+  *T356 = str;
+  T355 = locp->i;
+
+  return T355;
+}
+
+void
+testTortureExecute (void)
+{
+  struct A loc;
+  int str;
+
+  loc.i = 2;
+  str = foo (&loc, 10, 3);
+  if (str!=1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr15296.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr15296.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr15296.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr15296.c	2012-03-09 20:31:16.000000000 +0000
@@ -0,0 +1,90 @@
+/*
+   pr15296.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+#include <stdint.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+/* PR optimization/15296.  The delayed-branch scheduler caused code that
+   SEGV:d for CRIS; a register was set to -1 in a delay-slot for the
+   fall-through code, while that register held a pointer used in code at
+   the branch target.  */
+
+/* Assume that if stdint.h defined INTPTR_MAX, it has also defined intptr_t */
+/* oƒ otherwise, define it ourselves */
+#ifndef INTPTR_MAX
+typedef int intptr_t;
+#endif
+
+typedef intptr_t W;
+union u0
+{
+  union u0 *r;
+  W i;
+};
+struct s1
+{
+  union u0 **m0;
+  union u0 m1[4];
+};
+
+void f (void *, struct s1 *, const union u0 *, W, W, W);
+void g (void *, char *);
+
+void
+f (void *a, struct s1 *b, const union u0 *h, W v0, W v1, W v4)
+{
+  union u0 *e = 0;
+  union u0 *k = 0;
+  union u0 **v5 = b->m0;
+  union u0 *c = b->m1;
+  union u0 **d = &v5[0];
+l0:;
+  if (v0 < v1)
+    goto l0;
+  if (v0 == 0)
+    goto l3;
+  v0 = v4;
+  if (v0 != 0)
+    goto l3;
+  c[0].r = *d;
+  v1 = -1;
+  e = c[0].r;
+  if (e != 0)
+    g (a, "");
+  k = e + 3;
+  k->i = v1;
+  goto l4;
+l3:;
+  c[0].i = v0;
+  e = c[1].r;
+  if (e != 0)
+    g (a, "");
+  e = c[0].r;
+  if (e == 0)
+    g (a, "");
+  k = e + 2;
+  k->r = c[1].r;
+l4:;
+}
+
+void g (void *a, char *b) { ASSERT(0); }
+
+void
+testTortureExecute (void)
+{
+  union u0 uv[] = {{ .i = 111 }, { .i = 222 }, { .i = 333 }, { .i = 444 }};
+  struct s1 s = { 0, {{ .i = 555 }, { .i = 0 }, { .i = 999 }, { .i = 777 }}};
+  f (0, &s, 0, 20000, 10000, (W) uv);
+  if (s.m1[0].i != (W) uv || s.m1[1].i != 0 || s.m1[2].i != 999
+      || s.m1[3].i != 777 || uv[0].i != 111 || uv[1].i != 222
+      || uv[2].i != 0 || uv[3].i != 444)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr16790-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr16790-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr16790-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr16790-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,52 @@
+/*
+   pr16790-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR middle-end/16790.  */
+
+extern void abort ();
+
+static void test1(unsigned int u1)
+{
+  unsigned int y_final_1;
+  signed short y_middle;
+  unsigned int y_final_2;
+
+  y_final_1 = (unsigned int)( (signed short)(u1 * 2) * 3 );
+  y_middle  =                 (signed short)(u1 * 2);
+  y_final_2 = (unsigned int)( y_middle * 3 );
+
+  if (y_final_1 != y_final_2)
+    ASSERT (0);
+}
+
+
+static void test2(unsigned int u1)
+{
+  unsigned int y_final_1;
+  signed short y_middle;
+  unsigned int y_final_2;
+
+  y_final_1 = (unsigned int)( (signed short)(u1 << 1) * 3 );
+  y_middle  =                 (signed short)(u1 << 1);
+  y_final_2 = (unsigned int)( y_middle * 3 );
+
+  if (y_final_1 != y_final_2)
+    ASSERT (0);
+}
+
+
+void
+testTortureExecute (void)
+{
+  test1(0x4000U);
+  test2(0x4000U);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr17078-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr17078-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr17078-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr17078-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   pr17078-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void test(int *ptr)
+{
+  int i = 1;
+  goto useless;
+  if (0)
+    {
+      useless:
+      i = 0;
+    }
+  else
+    i = 1;
+  *ptr = i;
+}
+
+void
+testTortureExecute (void)
+{
+  int i = 1;
+  test(&i);
+  if (i)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr19005.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr19005.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr19005.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr19005.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,47 @@
+/*
+   pr19005.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR target/19005 */
+
+int v, s;
+
+void
+bar (int a, int b)
+{
+  unsigned char x = v;
+
+  if (!s)
+    {
+      if (a != x || b != (unsigned char) (x + 1))
+        ASSERT (0);
+    }
+  else if (a != (unsigned char) (x + 1) || b != x)
+    ASSERT (0);
+  s ^= 1;
+}
+
+int
+foo (int x)
+{
+  unsigned char a = x, b = x + 1;
+
+  bar (a, b);
+  a ^= b; b ^= a; a ^= b;
+  bar (a, b);
+  return 0;
+}
+
+void
+testTortureExecute (void)
+{
+  for (v = -10; v < 266; v++)
+    foo (v);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr19606.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr19606.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr19606.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr19606.c	2012-04-01 11:33:10.000000000 +0000
@@ -0,0 +1,49 @@
+/*
+   pr19606.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Todo: Enable when sdcc supports long long modulo!
+#if 0
+
+/* PR c/19606
+   The C front end used to shorten the type of a division to a type
+   that does not preserve the semantics of the original computation.
+   Make sure that won't happen.  */
+
+signed char a = -4;
+
+int
+foo (void)
+{
+  return ((unsigned int) (signed int) a) / 2LL;
+}
+
+int
+bar (void)
+{
+  return ((unsigned int) (signed int) a) % 5LL;
+}
+#endif
+void
+testTortureExecute (void)
+{
+#if 0
+  int r;
+
+  r = foo ();
+  if (r != ((unsigned int) (signed int) (signed char) -4) / 2LL)
+    ASSERT (0);
+
+  r = bar ();
+  if (r != ((unsigned int) (signed int) (signed char) -4) % 5LL)
+    ASSERT (0);
+
+  return;
+#endif
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr20100-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr20100-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr20100-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr20100-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,86 @@
+/*
+   pr20100-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR tree-optimization/20100
+   Pure function being treated as const.
+   Author: Hans-Peter Nilsson.  */
+
+static unsigned short g = 0;
+static unsigned short p = 0;
+unsigned char e;
+
+static unsigned short
+next_g (void)
+{
+  return g == e - 1 ? 0 : g + 1;
+}
+
+static unsigned short
+curr_p (void)
+{
+  return p;
+}
+
+static unsigned short
+inc_g (void)
+{
+  return g = next_g ();
+}
+
+static unsigned short
+curr_g (void)
+{
+  return g;
+}
+
+static char
+ring_empty (void)
+{
+  if (curr_p () == curr_g ())
+    return 1;
+  else
+    return 0;
+}
+
+char
+frob (unsigned short a, unsigned short b)
+{
+  g = a;
+  p = b;
+  inc_g ();
+  return ring_empty ();
+}
+
+unsigned short
+get_n (void)
+{
+  unsigned short n = 0;
+  unsigned short org_g;
+  org_g = curr_g ();
+  while (!ring_empty () && n < 5)
+    {
+      inc_g ();
+      n++;
+    }
+
+  return n;
+}
+
+void
+testTortureExecute (void)
+{
+  e = 3;
+  if (frob (0, 2) != 0 || g != 1 || p != 2 || e != 3
+      || get_n () != 1
+      || g != 2 || p != 2)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr20187-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr20187-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr20187-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr20187-1.c	2012-04-02 09:59:13.000000000 +0000
@@ -0,0 +1,31 @@
+/*
+   pr207187-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// Some ports do not support long long yet.
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+int a = 0x101;
+int b = 0x100;
+
+int
+foo (void)
+{
+  return (((unsigned char) (unsigned long long) ((a ? a : 1) & (a * b)))
+	  ? 0 : 1);
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+  ASSERT (!(1 - foo ()));
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr20466-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr20466-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr20466-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr20466-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+   pr20466-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int f (int **, int *, int *, int **, int **);
+int
+f (int **ipp, int *i1p, int *i2p, int **i3, int **i4)
+{
+  **ipp = *i1p;
+  *ipp = i2p;
+  *i3 = *i4;
+  **ipp = 99;
+  return 3;
+}
+
+void
+testTortureExecute (void)
+{
+  int i = 42, i1 = 66, i2 = 1, i3 = -1, i4 = 55;
+  int *ip = &i;
+  int *i3p = &i3;
+  int *i4p = &i4;
+#if 0
+  f (&ip, &i1, &i2, &i3p, &i4p);
+  if (i != 66 || ip != &i2 || i2 != 99 || i3 != -1 || i3p != i4p || i4 != 55)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr20527-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr20527-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr20527-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr20527-1.c	2012-02-26 09:13:46.000000000 +0000
@@ -0,0 +1,93 @@
+/*
+   pr20527-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR rtl-optimization/20527
+   Mishandled postincrement.  This test-case is derived from the
+   function BZ2_hbCreateDecodeTables in the file huffman.c from
+   bzip2-1.0.2, hence requiring the following disclaimer copied here:  */
+
+/*--
+  This file is a part of bzip2 and/or libbzip2, a program and
+  library for lossless, block-sorting data compression.
+
+  Copyright (C) 1996-2002 Julian R Seward.  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+  2. The origin of this software must not be misrepresented; you must 
+     not claim that you wrote the original software.  If you use this 
+     software in a product, an acknowledgment in the product 
+     documentation would be appreciated but is not required.
+
+  3. Altered source versions must be plainly marked as such, and must
+     not be misrepresented as being the original software.
+
+  4. The name of the author may not be used to endorse or promote 
+     products derived from this software without specific prior written 
+     permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  Julian Seward, Cambridge, UK.
+  jseward@acm.org
+  bzip2/libbzip2 version 1.0 of 21 March 2000
+
+  This program is based on (at least) the work of:
+     Mike Burrows
+     David Wheeler
+     Peter Fenwick
+     Alistair Moffat
+     Radford Neal
+     Ian H. Witten
+     Robert Sedgewick
+     Jon L. Bentley
+
+  For more information on these sources, see the manual.
+--*/
+
+void f (long *limit, long *base, long minLen, long maxLen);
+void f (long *limit, long *base, long minLen, long maxLen)
+{
+  long i;
+  long vec;
+  vec = 0;
+  for (i = minLen; i <= maxLen; i++) {
+    vec += (base[i+1] - base[i]);
+    limit[i] = vec-1;
+  }
+}
+
+long b[] = {1, 5, 11, 23};
+
+void
+testTortureExecute (void)
+{
+  long l[3];
+  f (l, b, 0, 2);
+  if (l[0] != 3 || l[1] != 9 || l[2] != 21)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr20601-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr20601-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr20601-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr20601-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,138 @@
+/*
+   pr15262.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c11
+#pragma disable_warning 85
+#endif
+
+/* PR tree-optimization/20601 */
+/*extern void abort (void);
+extern void exit (int);*/
+
+struct T
+{
+  const char *t1;
+  char t2[4096];
+  char **t3;
+};
+
+#if defined (__SDCC) && !defined (__SDCC_mcs51)
+int a[5];
+int b;
+const char **c;
+int d;
+const char **e;
+struct T t;
+char *f[16];
+const char *g[] = { "a", "-u", "b", "c" };
+
+_Noreturn void
+foo (void)
+{
+  while (1);
+}
+
+char *
+bar (char *x, unsigned int y)
+{
+  return 0;
+}
+
+static inline char *
+baz (char *x, unsigned int y)
+{
+  if (sizeof (t.t2) != (unsigned int) -1 && y > sizeof (t.t2))
+    foo ();
+  return bar (x, y);
+}
+
+static inline int
+setup1 (int x)
+{
+  char *p;
+  int rval;
+
+  if (!baz (t.t2, sizeof (t.t2)))
+    baz (t.t2, sizeof (t.t2));
+
+  if (x & 0x200)
+    {
+      char **h, **i = e;
+
+      ++d;
+      e = f;
+      if (t.t1 && *t.t1)
+        e[0] = t.t1;
+      else
+        ASSERT (0);
+
+      for (h = e + 1; (*h = *i); ++i, ++h)
+        ;
+    }
+  return 1;
+}
+
+static inline int
+setup2 (void)
+{
+  int j = 1;
+
+  e = c + 1;
+  d = b - 1;
+  while (d > 0 && e[0][0] == '-')
+    {
+      if (e[0][1] != '\0' && e[0][2] != '\0')
+        ASSERT (0);
+
+      switch (e[0][1])
+        {
+        case 'u':
+          if (!e[1])
+            ASSERT (0);
+
+          t.t3 = &e[1];
+          d--;
+          e++;
+          break;
+        case 'P':
+          j |= 0x1000;
+          break;
+        case '-':
+          d--;
+          e++;
+          if (j == 1)
+            j |= 0x600;
+          return j;
+        }
+      d--;
+      e++;
+    }
+
+  if (d > 0 && !(j & 1))
+    ASSERT (0);
+
+  return j;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if defined (__SDCC) && !defined (__SDCC_mcs51)
+  int x;
+  c = g;
+  b = 4;
+  x = setup2 ();
+  t.t1 = "/bin/sh";
+  setup1 (x);
+  /* PRE shouldn't transform x into the constant 0x601 here, it's not legal.  */
+  if ((x & 0x400) && !a[4])
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr21331.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr21331.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr21331.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr21331.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,27 @@
+/*
+   pr21331.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int bar (void) {  return -1;  }
+
+unsigned long
+foo ()
+{ unsigned long retval;
+  retval = bar ();
+  if (retval == -1)  return 0;
+  return 3;  }
+
+void
+testTortureExecute (void)
+{
+  if (foo () != 0)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr22348.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr22348.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr22348.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr22348.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   pr15262.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+void f(int i)
+{
+  if (i>4 + 3 * 16)
+    ASSERT(0);
+}
+
+void
+testTortureExecute (void)
+{
+  unsigned int buflen, i;
+  buflen = 4 + 3 * 16;
+  for (i = 4; i < buflen; i+= 3)
+    f(i);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr22630.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr22630.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr22630.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr22630.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+   pr15262.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int j;
+
+void bla (int *r)
+{
+  int *p, *q;
+
+  p = q = r;
+  if (!p)
+    p = &j;
+  
+  if (p != q)
+    j = 1;
+}
+
+void
+testTortureExecute (void)
+{
+  bla (0);
+  if (!j)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr23604.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr23604.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr23604.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr23604.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   pr23604.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int g(int i, int j)
+{
+  if (i>-1)
+    if (i<2)
+     {
+        if (i != j)
+          {
+            if (j != 0)
+                return 0;
+          }
+     }
+  return 1;
+}
+
+void
+testTortureExecute (void)
+{
+  if (!g(1, 0))
+   ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr23941.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr23941.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr23941.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr23941.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+   pr15262.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#endif
+
+#include <float.h>
+
+extern void abort (void);
+double d = FLT_MIN / 2.0;
+
+void
+testTortureExecute (void)
+{
+  double x = FLT_MIN / 2.0;
+  if (x != d)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr24141.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr24141.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr24141.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr24141.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+   pr24141.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+// reduced testcase, compile with -O2. Also, with --disable-checking
+// gcc produces wrong code.
+
+int i;
+
+void g (void)
+{
+  i = 1;
+}
+
+void f (int a, int b)
+{
+  int c = 0;
+  if (a == 0)
+    c = 1;
+  if (c)
+    return;
+  if (c == 1)
+    c = 0;
+  if (b == 0)
+    c = 1;
+  if (c)
+    g ();
+}
+
+void
+testTortureExecute (void)
+{
+  f (1, 0);
+  if (i != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr24142.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr24142.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr24142.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr24142.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+   pr24142.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int f (int a, int b)
+{
+  if (a == 1)
+    a = 0;
+  if (b == 0)
+    a = 1;
+  if (a != 0)
+    return 0;
+  return 1;
+}
+
+void
+testTortureExecute (void)
+{
+  if (f (1, 1) != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr24716.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr24716.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr24716.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr24716.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,68 @@
+/*
+   pr24716.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR24716, scalar evolution returning the wrong result
+   for pdest.  */
+
+int Link[] = { -1 };
+int W[] = { 2 };
+
+int f (int k, int p)
+{
+  int pdest, j, D1361;
+  j = 0;
+  pdest = 0;
+  for (;;) {
+    if (pdest > 2)
+      do
+        j--, pdest++;
+      while (j > 2);
+
+    if (j == 1)
+      break;
+
+    while (pdest > p)
+      if (j == p)
+        pdest++;
+
+    do
+      {
+        D1361 = W[k];
+        do
+          if (D1361 != 0)
+            pdest = 1, W[k] = D1361 = 0;
+        while (p < 1);
+    } while (k > 0);
+
+    do
+      {
+        p = 0;
+        k = Link[k];
+        while (p < j)
+          if (k != -1)
+            pdest++, p++;
+      }
+    while (k != -1);
+    j = 1;
+  }
+
+  /* The correct return value should be pdest (1 in the call from main).
+     DOM3 is mistaken and propagates a 0 here.  */
+  return pdest;
+}
+
+void
+testTortureExecute (void)
+{
+  if (!f (0, 2))
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr25737.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr25737.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr25737.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr25737.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   pr25737.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct delay_block {
+  struct delay_block *succ;
+};
+
+static struct delay_block Timer_Queue;
+
+struct delay_block* time_enqueue (struct delay_block *d)
+{
+  struct delay_block *q = Timer_Queue.succ; 
+  d->succ =  (void *)0;
+  return Timer_Queue.succ;
+}
+
+void
+testTortureExecute (void)
+{
+  Timer_Queue.succ = &Timer_Queue;
+  if (time_enqueue (&Timer_Queue) != (void*)0)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr27073.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr27073.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr27073.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr27073.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+   pr27073.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+void
+foo (int *p, int d1, int d2, int d3,
+     short count, int s1, int s2, int s3, int s4, int s5)
+{
+  int n = count;
+  while (n--)
+    {
+      *p++ = s1;
+      *p++ = s2;
+      *p++ = s3;
+      *p++ = s4;
+      *p++ = s5;
+    }
+}
+
+void
+testTortureExecute (void)
+{
+  int x[10], i;
+
+  foo (x, 0, 0, 0, 2, 100, 200, 300, 400, 500);
+  for (i = 0; i < 10; i++)
+    if (x[i] != (i % 5 + 1) * 100)
+      ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr27260.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr27260.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr27260.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr27260.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+   pr15262.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR middle-end/27260 */
+
+#include <string.h>
+
+char buf[65];
+
+void
+foo (int x)
+{
+  memset (buf, x != 2 ? 1 : 0, 64);
+}
+
+void
+testTortureExecute (void)
+{
+  int i;
+  buf[64] = 2;
+  for (i = 0; i < 64; i++)
+    if (buf[i] != 0)
+      ASSERT (0);
+  foo (0);
+  for (i = 0; i < 64; i++)
+    if (buf[i] != 1)
+      ASSERT (0);
+  foo (2);
+  for (i = 0; i < 64; i++)
+    if (buf[i] != 0)
+      ASSERT (0);
+  if (buf[64] != 2)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr27285.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr27285.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr27285.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr27285.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,57 @@
+/*
+   pr27285.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR tree-optimization/27285 */
+
+extern void abort (void);
+
+struct S { unsigned char a, b, c, d[16]; };
+
+void
+foo (struct S *x, struct S *y)
+{
+  int a, b;
+  unsigned char c, *d, *e;
+
+  b = x->b;
+  d = x->d;
+  e = y->d;
+  a = 0;
+  while (b)
+    {
+      if (b >= 8)
+	{
+	  c = 0xff;
+	  b -= 8;
+	}
+      else
+	{
+	  c = 0xff << (8 - b);
+	  b = 0;
+	}
+
+      e[a] = d[a] & c;
+      a++;
+    }
+}
+
+void
+testTortureExecute (void)
+{
+  struct S x = { 0, 25, 0, { 0xaa, 0xbb, 0xcc, 0xdd }};
+  struct S y = { 0, 0, 0, { 0 }};
+
+  foo (&x, &y);
+  if (x.d[0] != y.d[0] || x.d[1] != y.d[1]
+      || x.d[2] != y.d[2] || (x.d[3] & 0x80) != y.d[3])
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr27671-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr27671-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr27671-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr27671-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   pr27671.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR rtl-optimization/27671.
+   The combiner used to simplify "a ^ b == a" to "a" via
+   simplify_relational_operation_1 in simplify-rtx.c.  */
+
+/*extern void abort (void) __attribute__ ((noreturn));
+extern void exit (int) __attribute__ ((noreturn));*/
+
+static int
+foo (int a, int b)
+{
+  int c = a ^ b;
+  if (c == a)
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  foo (0, 1);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr28651.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr28651.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr28651.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr28651.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   pr28651.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <limits.h>
+
+int
+foo (unsigned int u)
+{
+  return (int)(u + 4) < (int)u;
+}
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5 && __GNUC_MINOR__ < 1))
+  unsigned int u = INT_MAX;
+
+  if (foo (u) == 0)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr28982a.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr28982a.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr28982a.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr28982a.c	2012-05-21 12:05:21.000000000 +0000
@@ -0,0 +1,80 @@
+/*
+   pr28982.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR rtl-optimization/28982.  Function foo() does the equivalent of:
+
+     float tmp_results[NVARS];
+     for (int i = 0; i < NVARS; i++)
+       {
+	 int inc = incs[i];
+	 float *ptr = ptrs[i], result = 0;
+	 for (int j = 0; j < n; j++)
+	   result += *ptr, ptr += inc;
+	 tmp_results[i] = result;
+       }
+     memcpy (results, tmp_results, sizeof (results));
+
+   but without the outermost loop.  The idea is to create high register
+   pressure and ensure that some INC and PTR variables are spilled.
+
+   On ARM targets, sequences like "result += *ptr, ptr += inc" can
+   usually be implemented using (mem (post_modify ...)), and we do
+   indeed create such MEMs before reload for this testcase.  However,
+   (post_modify ...) is not a valid address for coprocessor loads, so
+   for -mfloat-abi=softfp, reload reloads the POST_MODIFY into a base
+   register.  GCC did not deal correctly with cases where the base and
+   index of the POST_MODIFY are themselves reloaded.  */
+#define NITER 4
+#define NVARS 20
+#define MULTI(X) \
+  X( 0), X( 1), X( 2), X( 3), X( 4), X( 5), X( 6), X( 7), X( 8), X( 9), \
+  X(10), X(11), X(12), X(13), X(14), X(15), X(16), X(17), X(18), X(19)
+
+#define DECLAREI(INDEX) inc##INDEX = incs[INDEX]
+#define DECLAREF(INDEX) *ptr##INDEX = ptrs[INDEX], result##INDEX = 0
+#define LOOP(INDEX) result##INDEX += *ptr##INDEX, ptr##INDEX += inc##INDEX
+#define COPYOUT(INDEX) results[INDEX] = result##INDEX
+
+#ifndef __SDCC_mcs51
+float *ptrs[NVARS];
+float results[NVARS];
+int incs[NVARS];
+
+void
+foo (int n)
+{
+  int MULTI (DECLAREI);
+  float MULTI (DECLAREF);
+  while (n--)
+    MULTI (LOOP);
+  MULTI (COPYOUT);
+}
+
+float input[NITER * NVARS];
+#endif
+
+void
+testTortureExecute (void)
+{
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_r2k) && !defined(__SDCC_r3ka)
+  int i;
+
+  for (i = 0; i < NVARS; i++)
+    ptrs[i] = input + i, incs[i] = i;
+  for (i = 0; i < NITER * NVARS; i++)
+    input[i] = i;
+  foo (NITER);
+  for (i = 0; i < NVARS; i++)
+    if (results[i] != i * NITER * (NITER + 1) / 2)
+      ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr29156.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr29156.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr29156.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr29156.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+   pr29156.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct test1
+{
+  int a;
+  int b;
+};
+struct test2
+{
+  float d;
+  struct test1 sub;
+};
+
+int global;
+
+int bla(struct test1 *xa, struct test2 *xb)
+{
+  global = 1;
+  xb->sub.a = 1;
+  xa->a = 8;
+  return xb->sub.a;
+}
+
+void
+testTortureExecute (void)
+{
+  struct test2 pom;
+
+  if (bla (&pom.sub, &pom) != 8)
+    ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr31136.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr31136.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr31136.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr31136.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   pr15262.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct S {
+  unsigned b4:4;
+  unsigned b6:6;
+} s;
+
+void
+testTortureExecute (void)
+{
+  s.b6 = 31;
+  s.b4 = s.b6;
+  s.b6 = s.b4;
+  if (s.b6 != 15)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr31169.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr31169.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr31169.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr31169.c	2012-06-15 15:43:51.000000000 +0000
@@ -0,0 +1,65 @@
+/*
+   pr31169.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#define HOST_WIDE_INT long
+#define HOST_BITS_PER_WIDE_INT (sizeof(long)*8)
+
+#ifndef __SDCC_pic16 // TODO: enable when the pic16 ports supports bitfields of size greater than 8 bits!
+struct tree_type
+{
+  unsigned int precision : 9;
+};
+
+int
+sign_bit_p (struct tree_type *t, HOST_WIDE_INT val_hi, unsigned HOST_WIDE_INT val_lo)
+{
+  unsigned HOST_WIDE_INT mask_lo, lo;
+  HOST_WIDE_INT mask_hi, hi;
+  int width = t->precision;
+
+  if (width > HOST_BITS_PER_WIDE_INT)
+    {
+      hi = (unsigned HOST_WIDE_INT) 1 << (width - HOST_BITS_PER_WIDE_INT - 1);
+      lo = 0;
+
+      mask_hi = ((unsigned HOST_WIDE_INT) -1
+                 >> (2 * HOST_BITS_PER_WIDE_INT - width));
+      mask_lo = -1;
+    }
+  else
+    {
+      hi = 0;
+      lo = (unsigned HOST_WIDE_INT) 1 << (width - 1);
+    
+      mask_hi = 0;
+      mask_lo = ((unsigned HOST_WIDE_INT) -1
+                 >> (HOST_BITS_PER_WIDE_INT - width));
+    }
+
+  if ((val_hi & mask_hi) == hi
+      && (val_lo & mask_lo) == lo)
+    return 1;
+
+  return 0;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_pic16 // TODO: enable when the pic16 ports supports bitfields of size greater than 8 bits!
+  struct tree_type t;
+  t.precision = 1;
+  if (!sign_bit_p (&t, 0, -1))
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr33142.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr33142.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr33142.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr33142.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   pr33142.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <stdlib.h>
+
+int lisp_atan2(long dy, long dx) {
+    if (dx <= 0)
+        if (dy > 0)
+            return abs(dx) <= abs(dy);
+    return 0;
+}
+
+void
+testTortureExecute (void)
+{   
+    volatile long dy = 63, dx = -77;
+    if (lisp_atan2(dy, dx))
+        ASSERT(0);
+    return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr33382.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr33382.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr33382.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr33382.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,31 @@
+/*
+   pr33382.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct Foo {
+  int i;
+  int j[];
+};
+
+struct Foo x = { 1, { 2, 0, 2, 3 } };
+
+int foo(void)
+{
+  x.j[0] = 1;
+  return x.j[1];
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo() != 0)
+    ASSERT(0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr33779-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr33779-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr33779-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr33779-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,27 @@
+/*
+   pr33779-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <stdint.h>
+
+int foo(int32_t i)
+{
+  if (((uint32_t)(i + 1)) * 4 == 0)
+    return 1;
+  return 0;
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo(0x3fffffff) == 0)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr33779-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr33779-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr33779-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr33779-2.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+   pr33779-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int foo(long int i)
+{
+  return ((int)((unsigned long)(i + 1) * 4)) / 4;
+}
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5 && __GNUC_MINOR__ < 4))
+  if (foo(0x3fffffff) != 0)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr33870-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr33870-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr33870-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr33870-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,110 @@
+/*
+   pr33870-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <string.h>
+
+#ifndef __SDCC_mcs51
+typedef struct PgHdr PgHdr;
+typedef unsigned char u8;
+struct PgHdr {
+int y;
+struct {
+ unsigned int pgno;
+ PgHdr *pNextHash, *pPrevHash;
+ PgHdr *pNextFree, *pPrevFree;
+ PgHdr *pNextAll;
+ u8 inJournal;
+ short int nRef;
+ PgHdr *pDirty, *pPrevDirty;
+ unsigned int notUsed;
+} x;
+};
+PgHdr **xx;
+volatile int vx;
+static inline PgHdr *merge_pagelist(PgHdr *pA, PgHdr *pB)
+{
+ PgHdr result;
+ PgHdr *pTail;
+ xx = &result.x.pDirty;
+ pTail = &result;
+ while( pA && pB ){
+   if( pA->x.pgno<pB->x.pgno ){
+     pTail->x.pDirty = pA;
+     pTail = pA;
+     pA = pA->x.pDirty;
+   }else{
+     pTail->x.pDirty = pB;
+     pTail = pB;
+     pB = pB->x.pDirty;
+   }
+   vx = (*xx)->y;
+ }
+ if( pA ){
+   pTail->x.pDirty = pA;
+ }else if( pB ){
+   pTail->x.pDirty = pB;
+ }else{
+   pTail->x.pDirty = 0;
+ }
+ return result.x.pDirty;
+}
+
+PgHdr *sort_pagelist(PgHdr *pIn)
+{
+ PgHdr *a[25], *p;
+ int i;
+ memset (a, 0, sizeof (a));
+ while( pIn ){
+   p = pIn;
+   pIn = p->x.pDirty;
+   p->x.pDirty = 0;
+   for(i=0; i<25 -1; i++){
+     if( a[i]==0 ){
+       a[i] = p;
+       break;
+     }else{
+       p = merge_pagelist(a[i], p);
+       a[i] = 0;
+       a[i] = 0;
+     }
+   }
+   if( i==25 -1 ){
+     a[i] = merge_pagelist(a[i], p);
+   }
+ }
+ p = a[0];
+ for(i=1; i<25; i++){
+   p = merge_pagelist (p, a[i]);
+ }
+ return p;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_mcs51
+ PgHdr a[5];
+ PgHdr *p;
+ a[0].x.pgno = 5;
+ a[0].x.pDirty = &a[1];
+ a[1].x.pgno = 4;
+ a[1].x.pDirty = &a[2];
+ a[2].x.pgno = 1;
+ a[2].x.pDirty = &a[3];
+ a[3].x.pgno = 3;
+ a[3].x.pDirty = 0;
+ p = sort_pagelist (&a[0]);
+ if (p->x.pDirty == p)
+   ASSERT (0);
+ return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr33870.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr33870.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr33870.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr33870.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,104 @@
+/*
+   pr33870.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#ifndef __SDCC_mcs51
+
+#include <string.h>
+
+typedef struct PgHdr PgHdr;
+typedef unsigned char u8;
+struct PgHdr {
+  unsigned int pgno;
+  PgHdr *pNextHash, *pPrevHash;
+  PgHdr *pNextFree, *pPrevFree;
+  PgHdr *pNextAll;
+  u8 inJournal;
+  short int nRef;
+  PgHdr *pDirty, *pPrevDirty;
+  unsigned int notUsed;
+};
+
+static inline PgHdr *merge_pagelist(PgHdr *pA, PgHdr *pB)
+{
+  PgHdr result;
+  PgHdr *pTail;
+  pTail = &result;
+  while( pA && pB ){
+    if( pA->pgno<pB->pgno ){
+      pTail->pDirty = pA;
+      pTail = pA;
+      pA = pA->pDirty;
+    }else{
+      pTail->pDirty = pB;
+      pTail = pB;
+      pB = pB->pDirty;
+    }
+  }
+  if( pA ){
+    pTail->pDirty = pA;
+  }else if( pB ){
+    pTail->pDirty = pB;
+  }else{
+    pTail->pDirty = 0;
+  }
+  return result.pDirty;
+}
+
+PgHdr *sort_pagelist(PgHdr *pIn)
+{
+  PgHdr *a[25], *p;
+  int i;
+  memset (a, 0, sizeof (a));
+  while( pIn ){
+    p = pIn;
+    pIn = p->pDirty;
+    p->pDirty = 0;
+    for(i=0; i<25 -1; i++){
+      if( a[i]==0 ){
+        a[i] = p;
+        break;
+      }else{
+        p = merge_pagelist(a[i], p);
+        a[i] = 0;
+      }
+    }
+    if( i==25 -1 ){
+      a[i] = merge_pagelist(a[i], p);
+    }
+  }
+  p = a[0];
+  for(i=1; i<25; i++){
+    p = merge_pagelist (p, a[i]);
+  }
+  return p;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_mcs51
+  PgHdr a[5];
+  PgHdr *p;
+  a[0].pgno = 5;
+  a[0].pDirty = &a[1];
+  a[1].pgno = 4;
+  a[1].pDirty = &a[2];
+  a[2].pgno = 1;
+  a[2].pDirty = &a[3];
+  a[3].pgno = 3;
+  a[3].pDirty = 0;
+  p = sort_pagelist (&a[0]);
+  if (p->pDirty == p)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr34070-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr34070-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr34070-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr34070-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+   pr34070-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int f(unsigned int x)
+{
+    return ((int)x) % 4;
+}
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5 && __GNUC_MINOR__ < 3))
+  if (f(-1) != -1)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr34070-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr34070-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr34070-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr34070-2.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+   pr34070-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int f(unsigned int x, int n)
+{
+    return ((int)x) / (1 << n);
+}
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5 && __GNUC_MINOR__ < 3))
+  if (f(-1, 1) != 0)
+    ASSERT (0);
+  return;
+#endif 
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr34176.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr34176.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr34176.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr34176.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,80 @@
+/*
+   pr34176.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+#include <string.h>
+
+typedef unsigned int index_ty;
+typedef index_ty *index_list_ty;
+
+struct mult_index
+{
+  index_ty index;
+  unsigned int count;
+};
+
+struct mult_index_list
+{
+  struct mult_index *item;
+  size_t nitems;
+  size_t nitems_max;
+
+  struct mult_index *item2;
+  size_t nitems2_max;
+};
+
+int
+hash_find_entry (size_t *result)
+{
+    *result = 2;
+    return 0;
+}
+
+extern void abort (void);
+struct mult_index *
+foo (size_t n)
+{
+  static count = 0;
+  if (count++ > 0)
+    ASSERT (0);
+  return 0;
+}
+
+void
+testTortureExecute (void)
+{
+    size_t nitems = 0;
+
+    for (;;)
+    {
+        size_t list;
+
+        hash_find_entry (&list);
+        {
+            size_t len2 = list;
+            struct mult_index *destptr;
+            struct mult_index *dest;
+            size_t new_max  = nitems + len2;
+
+            if (new_max != len2)
+                break;
+            dest = foo (new_max);
+
+            destptr = dest;
+            while (len2--)
+                destptr++;
+
+            nitems = destptr - dest;
+        }
+    }
+
+    return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr34415.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr34415.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr34415.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr34415.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+   pr34415.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 84
+#endif
+
+const char *
+foo (const char *p)
+{
+  const char *end;
+  int len = 1;
+  for (;;)
+    {
+      int c = *p;
+      c = (c >= 'a' && c <= 'z' ? c - 'a' + 'A' : c);
+      if (c == 'B')
+	end = p;
+      else if (c == 'A')
+	{
+	  end = p;
+	  do
+	    p++;
+	  while (*p == '+');
+	}
+      else
+	break;
+      p++;
+      len++;
+    }
+  if (len > 2 && *p == ':')
+    p = end;
+  return p;
+}
+
+void
+testTortureExecute (void)
+{
+  const char *input = "Bbb:";
+  ASSERT (!(foo (input) != input + 2));
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr34456.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr34456.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr34456.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr34456.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+   pr34456.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <stdlib.h>
+
+int debug (void) { return 1; }
+int errors;
+
+struct s { int elt; int (*compare) (int); };
+
+static int
+compare (const void *x, const void *y)
+{
+  const struct s *s1 = x, *s2 = y;
+  int (*compare1) (int);
+  int elt2;
+
+  compare1 = s1->compare;
+  elt2 = s2->elt;
+  if (elt2 != 0 && debug () && compare1 (s1->elt) != 0)
+    errors++;
+  return compare1 (elt2);
+}
+
+int bad_compare (int x) { return -x; }
+struct s array[2] = { { 1, bad_compare }, { -1, bad_compare } };
+
+void
+testTortureExecute (void)
+{
+#if 0
+TODO: Enable when sdcc supports qsort.
+  qsort (array, 2, sizeof (struct s), compare);
+  ASSERT (!(errors == 0));
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr35231.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr35231.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr35231.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr35231.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+   pr35231.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int
+foo(int bits_per_pixel, int depth)
+{
+  if ((bits_per_pixel | depth) == 1)
+    ASSERT (0);
+  return bits_per_pixel;
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo(2, 0) != 2)
+    ASSERT (0);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr35390.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr35390.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr35390.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr35390.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,22 @@
+/*
+   pr35390.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+unsigned int foo (int n)
+{
+  return ~((unsigned int)~n);
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo(0) != 0)
+    ASSERT (0);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr35800.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr35800.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr35800.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr35800.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,113 @@
+/*
+   pr35800.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 84
+#endif
+
+int stab_xcoff_builtin_type (int typenum)
+{
+  const char *name;
+  if (typenum >= 0 || typenum < -34)
+    {
+      return 0;
+    }
+  switch (-typenum)
+    {
+    case 1:
+      name = "int";
+      break;
+    case 2:
+      name = "char";
+    case 3:
+      name = "short";
+      break;
+    case 4:
+      name = "long";
+    case 5:
+      name = "unsigned char";
+    case 6:
+      name = "signed char";
+    case 7:
+      name = "unsigned short";
+    case 8:
+      name = "unsigned int";
+    case 9:
+      name = "unsigned";
+    case 10:
+      name = "unsigned long";
+    case 11:
+      name = "void";
+    case 12:
+      name = "float";
+    case 13:
+      name = "double";
+    case 14:
+      name = "long double";
+    case 15:
+      name = "integer";
+    case 16:
+      name = "boolean";
+    case 17:
+      name = "short real";
+    case 18:
+      name = "real";
+    case 19:
+      name = "stringptr";
+    case 20:
+      name = "character";
+    case 21:
+      name = "logical*1";
+    case 22:
+      name = "logical*2";
+    case 23:
+      name = "logical*4";
+    case 24:
+      name = "logical";
+    case 25:
+      name = "complex";
+    case 26:
+      name = "double complex";
+    case 27:
+      name = "integer*1";
+    case 28:
+      name = "integer*2";
+    case 29:
+      name = "integer*4";
+    case 30:
+      name = "wchar";
+    case 31:
+      name = "long long";
+    case 32:
+      name = "unsigned long long";
+    case 33:
+      name = "logical*8";
+    case 34:
+      name = "integer*8";
+    }
+  return name[0];
+}
+
+void
+testTortureExecute (void)
+{
+  int i;
+  if (stab_xcoff_builtin_type(0) != 0)
+    ASSERT (0);
+  if (stab_xcoff_builtin_type(-1) != 'i')
+    ASSERT (0);
+  if (stab_xcoff_builtin_type(-2) != 's')
+    ASSERT (0);
+  if (stab_xcoff_builtin_type(-3) != 's')
+    ASSERT (0);
+  for (i = -4; i >= -34; --i)
+    if (stab_xcoff_builtin_type(i) != 'i')
+      ASSERT (0);
+  if (stab_xcoff_builtin_type(-35) != 0)
+    ASSERT (0);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr36691.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr36691.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr36691.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr36691.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+   pr36691.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+unsigned char g_5;
+
+void func_1 (void)
+{
+  for (g_5 = 9; g_5 >= 4; g_5 -= 5)
+    ;
+}
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5 && __GNUC_MINOR__ < 4))
+  func_1 ();
+  if (g_5 != 0)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr37102.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr37102.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr37102.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr37102.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   pr37102.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+unsigned int a, b = 1, c;
+
+void
+foo (int x)
+{
+  if (x != 5)
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  unsigned int d, e;
+  for (d = 1; d < 5; d++)
+    if (c)
+      a = b;
+  a = b;
+  e = a << 1;
+  if (e)
+    e = (e << 1) ^ 1;
+  foo (e);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr37125.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr37125.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr37125.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr37125.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   pr37125.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+static inline unsigned int
+mod_rhs(int rhs)
+{
+  if (rhs == 0) return 1;
+  return rhs;
+}
+
+void func_44 (unsigned int p_45);
+void func_44 (unsigned int p_45)
+{
+  if (!((p_45 * -9) % mod_rhs (-9))) {
+      ASSERT (0);
+  }
+}
+
+void
+testTortureExecute (void)
+{
+  func_44 (2);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr37882.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr37882.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr37882.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr37882.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   pr37882.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR middle-end/37882 */
+
+struct S
+{
+  unsigned char b : 3;
+} s;
+
+void
+testTortureExecute (void)
+{
+  s.b = 4;
+  if (s.b > 0 && s.b < 4)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr37924.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr37924.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr37924.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr37924.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,64 @@
+/*
+   pr37924.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR c/37924 */
+
+
+signed char a;
+unsigned char b;
+
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5 && __GNUC_MINOR__ < 4))
+int
+ftest1 (void)
+{
+  int c = -1;
+  return ((unsigned int) (a ^ c)) >> 9;
+}
+
+int
+ftest2 (void)
+{
+  int c = -1;
+  return ((unsigned int) (b ^ c)) >> 9;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5 && __GNUC_MINOR__ < 4))
+  a = 0;
+  if (ftest1 () != (-1U >> 9))
+    ASSERT (0);
+  a = 0x40;
+  if (ftest1 () != (-1U >> 9))
+    ASSERT (0);
+  a = 0x80;
+  if (ftest1 () != (a < 0) ? 0 : (-1U >> 9))
+    ASSERT (0);
+  a = 0xff;
+  if (ftest1 () != (a < 0) ? 0 : (-1U >> 9))
+    ASSERT (0);
+  b = 0;
+  if (ftest2 () != (-1U >> 9))
+    ASSERT (0);
+  b = 0x40;
+  if (ftest2 () != (-1U >> 9))
+    ASSERT (0);
+  b = 0x80;
+  if (ftest2 () != (-1U >> 9))
+    ASSERT (0);
+  b = 0xff;
+  if (ftest2 () != (-1U >> 9))
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr37931.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr37931.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr37931.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr37931.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   pr37931.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR middle-end/37931 */
+
+
+int
+foo (int a, unsigned int b)
+{
+  return (a | 1) & (b | 1);
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo (6, 0xc6) != 7)
+    ASSERT (0);
+  if (foo (0x80, 0xc1) != 0x81)
+    ASSERT (0);
+  if (foo (4, 4) != 5)
+    ASSERT (0);
+  if (foo (5, 4) != 5)
+    ASSERT (0);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr38048-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr38048-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr38048-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr38048-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,31 @@
+/*
+   pr38048-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int foo ()
+{
+  int mat[2][1];
+  int (*a)[1] = mat;
+  int det = 0;
+  int i;
+  mat[0][0] = 1;
+  mat[1][0] = 2;
+  for (i = 0; i < 2; ++i)
+    det += a[i][0];
+  return det;
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo () != 3)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr38212.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr38212.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr38212.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr38212.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   pr38212.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int
+foo (int *restrict p, int i)
+{
+  int *restrict q;
+  int *restrict r;
+  int v, w;
+  q = p + 1;
+  r = q - i;
+  v = *r;
+  *p = 1;
+  w = *r;
+  return v + w;
+}
+
+void
+testTortureExecute (void)
+{
+#if 0
+  int i = 0;
+  if (foo (&i, 1) != 1)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr38236.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr38236.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr38236.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr38236.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   pr15262.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct X { int i; };
+
+int
+foo (struct X *p, int *q, int a, int b)
+{
+  struct X x, y;
+  if (a)
+    p = &x;
+  if (b)
+    q = &x.i;
+  else
+    q = &y.i;
+  *q = 1;
+  return p->i; 
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo((void *)0, (void *)0, 1, 1) != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr38422.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr38422.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr38422.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr38422.c	2012-06-15 15:43:51.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+   pr38411.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#ifndef __SDCC_pic16 // TODO: enable when the pic16 ports supports bitfields of size greater than 8 bits!
+#include <limits.h>
+
+/* PR middle-end/38422 */
+
+struct S
+{
+  int s : (sizeof (int) * CHAR_BIT - 2);
+} s;
+
+void
+foo (void)
+{
+  s.s *= 2;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_pic16
+  s.s = 24;
+  foo ();
+  if (s.s != 48)
+    ASSERT (0);
+  return;
+#endif
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr39100.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr39100.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr39100.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr39100.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,76 @@
+/*
+   pr39100.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+/* Bad PTA results (incorrect store handling) was causing us to delete
+   *na = 0 store.  */
+
+typedef struct E
+{
+  int p;
+  struct E *n;
+} *EP;   
+
+typedef struct C
+{
+  EP x;
+  short cn, cp; 
+} *CP;
+
+CP
+foo (CP h, EP x)
+{
+  EP pl = 0, *pa = &pl;
+  EP nl = 0, *na = &nl;
+  EP n;
+
+  while (x)
+    {
+      n = x->n;   
+      if ((x->p & 1) == 1) 
+        {
+          h->cp++;
+          *pa = x;
+          pa = &((*pa)->n);
+        }
+      else
+        {
+          h->cn++;
+          *na = x;
+          na = &((*na)->n);
+        }    
+      x = n;
+    }
+  *pa = nl;
+  *na = 0;
+  h->x = pl;
+  return h;
+}
+
+void
+testTortureExecute (void)
+{  
+  struct C c = { 0, 0, 0 };
+  struct E e[2] = { { 0, &e[1] }, { 1, 0 } };
+  EP p;
+
+  foo (&c, &e[0]);
+  if (c.cn != 1 || c.cp != 1)
+    ASSERT (0);
+  if (c.x != &e[1])
+    ASSERT (0);
+  if (e[1].n != &e[0])
+    ASSERT (0);
+  if (e[0].n)
+    ASSERT (0);
+  return;  
+}
+
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr39120.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr39120.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr39120.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr39120.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+   pr39120.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#if 0
+SDCC urrently cannot return aggregates TODO: Enable later.
+struct X { int *p; } x;
+
+struct X
+foo(int *p) { struct X x; x.p = p; return x; }
+
+void
+bar() { *x.p = 1; }
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  int i = 0;
+  x = foo(&i);
+  bar();
+  if (i != 1)
+    ASSERT (0);
+  return;
+#endif
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr39233.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr39233.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr39233.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr39233.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   pr39233.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 127
+#endif
+
+void
+foo (void *p)
+{
+  long l = (long) p;
+  if (l < 0 || l > 6)
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+  short i;
+  for (i = 6; i >= 0; i--)
+    foo ((void *) (long) i);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr39240.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr39240.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr39240.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr39240.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,102 @@
+/*
+   pr39240.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR target/39240 */
+
+static int foo1 (int x)
+{
+  return x;
+}
+
+unsigned int bar1 (int x)
+{
+  return foo1 (x + 6);
+}
+
+volatile unsigned long l1 = (unsigned int) -4;
+
+static short int foo2 (int x)
+{
+  return x;
+}
+
+unsigned short int bar2 (int x)
+{
+  return foo2 (x + 6);
+}
+
+volatile unsigned long l2 = (unsigned short int) -4;
+
+static signed char foo3 (int x)
+{
+  return x;
+}
+
+unsigned char bar3 (int x)
+{
+  return foo3 (x + 6);
+}
+
+volatile unsigned long l3 = (unsigned char) -4;
+
+static unsigned int foo4 (int x)
+{
+  return x;
+}
+
+int bar4 (int x)
+{
+  return foo4 (x + 6);
+}
+
+volatile unsigned long l4 = (int) -4;
+
+static unsigned short int foo5 (int x)
+{
+  return x;
+}
+
+short int bar5 (int x)
+{
+  return foo5 (x + 6);
+}
+
+volatile unsigned long l5 = (short int) -4;
+
+static unsigned char foo6 (int x)
+{
+  return x;
+}
+
+signed char bar6 (int x)
+{
+  return foo6 (x + 6);
+}
+
+volatile unsigned long l6 = (signed char) -4;
+
+void
+testTortureExecute (void)
+{
+  if (bar1 (-10) != l1)
+    ASSERT (0);
+  if (bar2 (-10) != l2)
+    ASSERT (0);
+  if (bar3 (-10) != l3)
+    ASSERT (0);
+  if (bar4 (-10) != l4)
+    ASSERT (0);
+  if (bar5 (-10) != l5)
+    ASSERT (0);
+  if (bar6 (-10) != l6)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr39339.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr39339.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr39339.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr39339.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,97 @@
+/*
+   pr39339.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <string.h>
+
+struct C
+{
+  unsigned int c;
+  struct D
+  {
+    unsigned int columns : 4;
+    unsigned int fore : 12;
+    unsigned int back : 6;
+    unsigned int fragment : 1;
+    unsigned int standout : 1;
+    unsigned int underline : 1;
+    unsigned int strikethrough : 1;
+    unsigned int reverse : 1;
+    unsigned int blink : 1;
+    unsigned int half : 1;
+    unsigned int bold : 1;
+    unsigned int invisible : 1;
+    unsigned int pad : 1;
+  } attr;
+};
+
+struct A
+{
+  struct C *data;
+  unsigned int len;
+};
+
+struct B
+{
+  struct A *cells;
+  unsigned char soft_wrapped : 1;
+};
+
+struct E
+{
+  long row, col;
+  struct C defaults;
+};
+
+void foo (struct E *screen, unsigned int c, int columns, struct B *row)
+{
+  struct D attr;
+  long col;
+  int i;
+  col = screen->col;
+  /*attr = screen->defaults.attr; struct assignment not yet supported by sdcc */
+  memcpy (&attr, &(screen->defaults.attr), sizeof (struct D));
+  attr.columns = columns;
+  row->cells->data[col].c = c;
+  /*row->cells->data[col].attr = attr; struct assignment not yet supported by sdcc */
+  memcpy (&(row->cells->data[col].attr), &attr, sizeof (struct D));
+  col++;
+  attr.fragment = 1;
+  for (i = 1; i < columns; i++)
+    {
+      row->cells->data[col].c = c;
+      /*row->cells->data[col].attr = attr; struct assignment not yet supported by sdcc */
+      memcpy (&(row->cells->data[col].attr), &attr, sizeof (struct D));
+      col++;
+    }
+}
+
+void
+testTortureExecute (void)
+{
+  struct E e = {.row = 5,.col = 0,.defaults =
+      {6, {-1, -1, -1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0}} };
+  struct C c[4];
+  struct A a = { c, 4 };
+  struct B b = { &a, 1 };
+  struct D d;
+  memset (&c, 0, sizeof c);
+  foo (&e, 65, 2, &b);
+  /*d = e.defaults.attr; struct assignment not yet supported by sdcc */
+  memcpy (&d, &(e.defaults.attr), sizeof (struct D));
+  d.columns = 2;
+  if (memcmp (&d, &c[0].attr, sizeof d))
+    ASSERT (0);
+  d.fragment = 1;
+  if (memcmp (&d, &c[1].attr, sizeof d))
+    ASSERT (0);
+  return;
+}
+
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr39501.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr39501.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr39501.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr39501.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,96 @@
+/*
+   pr39501.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#endif
+
+/* { dg-options "-ffast-math" } */
+#define min1(a,b) ((a) < (b) ? (a) : (b))
+#define max1(a,b) ((a) > (b) ? (a) : (b))
+
+#define min2(a,b) ((a) <= (b) ? (a) : (b))
+#define max2(a,b) ((a) >= (b) ? (a) : (b))
+
+#define F(type,n)						\
+  type type##_##n(type a, type b)				\
+  {								\
+    return n(a, b);						\
+  }
+
+F(float,min1)
+F(float,min2)
+F(float,max1)
+F(float,max2)
+
+F(double,min1)
+F(double,min2)
+F(double,max1)
+F(double,max2)
+
+void
+testTortureExecute (void)
+{
+  if (float_min1(0.f, -1.f) != -1.f) ASSERT (0);
+  if (float_min1(-1.f, 0.f) != -1.f) ASSERT (0);
+  if (float_min1(0.f, 1.f)  != 0.f)  ASSERT (0);
+  if (float_min1(1.f, 0.f)  != 0.f)  ASSERT (0);
+  if (float_min1(-1.f, 1.f) != -1.f) ASSERT (0);
+  if (float_min1(1.f, -1.f) != -1.f) ASSERT (0);
+  
+  if (float_max1(0.f, -1.f) != 0.f)  ASSERT (0);
+  if (float_max1(-1.f, 0.f) != 0.f)  ASSERT (0);
+  if (float_max1(0.f, 1.f)  != 1.f)  ASSERT (0);
+  if (float_max1(1.f, 0.f)  != 1.f)  ASSERT (0);
+  if (float_max1(-1.f, 1.f) != 1.f)  ASSERT (0);
+  if (float_max1(1.f, -1.f) != 1.f)  ASSERT (0);
+  
+  if (float_min2(0.f, -1.f) != -1.f) ASSERT (0);
+  if (float_min2(-1.f, 0.f) != -1.f) ASSERT (0);
+  if (float_min2(0.f, 1.f)  != 0.f)  ASSERT (0);
+  if (float_min2(1.f, 0.f)  != 0.f)  ASSERT (0);
+  if (float_min2(-1.f, 1.f) != -1.f) ASSERT (0);
+  if (float_min2(1.f, -1.f) != -1.f) ASSERT (0);
+  
+  if (float_max2(0.f, -1.f) != 0.f)  ASSERT (0);
+  if (float_max2(-1.f, 0.f) != 0.f)  ASSERT (0);
+  if (float_max2(0.f, 1.f)  != 1.f)  ASSERT (0);
+  if (float_max2(1.f, 0.f)  != 1.f)  ASSERT (0);
+  if (float_max2(-1.f, 1.f) != 1.f)  ASSERT (0);
+  if (float_max2(1.f, -1.f) != 1.f)  ASSERT (0);
+  
+  if (double_min1(0., -1.) != -1.) ASSERT (0);
+  if (double_min1(-1., 0.) != -1.) ASSERT (0);
+  if (double_min1(0., 1.)  != 0.)  ASSERT (0);
+  if (double_min1(1., 0.)  != 0.)  ASSERT (0);
+  if (double_min1(-1., 1.) != -1.) ASSERT (0);
+  if (double_min1(1., -1.) != -1.) ASSERT (0);
+  
+  if (double_max1(0., -1.) != 0.)  ASSERT (0);
+  if (double_max1(-1., 0.) != 0.)  ASSERT (0);
+  if (double_max1(0., 1.)  != 1.)  ASSERT (0);
+  if (double_max1(1., 0.)  != 1.)  ASSERT (0);
+  if (double_max1(-1., 1.) != 1.)  ASSERT (0);
+  if (double_max1(1., -1.) != 1.)  ASSERT (0);
+  
+  if (double_min2(0., -1.) != -1.) ASSERT (0);
+  if (double_min2(-1., 0.) != -1.) ASSERT (0);
+  if (double_min2(0., 1.)  != 0.)  ASSERT (0);
+  if (double_min2(1., 0.)  != 0.)  ASSERT (0);
+  if (double_min2(-1., 1.) != -1.) ASSERT (0);
+  if (double_min2(1., -1.) != -1.) ASSERT (0);
+  
+  if (double_max2(0., -1.) != 0.)  ASSERT (0);
+  if (double_max2(-1., 0.) != 0.)  ASSERT (0);
+  if (double_max2(0., 1.)  != 1.)  ASSERT (0);
+  if (double_max2(1., 0.)  != 1.)  ASSERT (0);
+  if (double_max2(-1., 1.) != 1.)  ASSERT (0);
+  if (double_max2(1., -1.) != 1.)  ASSERT (0);
+  
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr40057.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr40057.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr40057.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr40057.c	2012-03-30 11:52:34.000000000 +0000
@@ -0,0 +1,51 @@
+/*
+   pr40057.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#if 0
+TODO: Enable when long long support for constants is there!
+/* PR middle-end/40057 */
+
+int
+foo (unsigned long long x)
+{
+  unsigned long long y = (x >> 31ULL) & 1ULL;
+  if (y == 0ULL)
+    return 0;
+  return -1;
+}
+
+int
+bar (long long x)
+{
+  long long y = (x >> 31LL) & 1LL;
+  if (y == 0LL)
+    return 0;
+  return -1;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  if (sizeof (long long) != 8)
+    return 0;
+  if (foo (0x1682a9aaaULL))
+    ASSERT (0);
+  if (!foo (0x1882a9aaaULL))
+    ASSERT (0);
+  if (bar (0x1682a9aaaLL))
+    ASSERT (0);
+  if (!bar (0x1882a9aaaLL))
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr40747.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr40747.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr40747.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr40747.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,31 @@
+/*
+   pr40747.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR middle-end/40747 */
+
+int
+foo (int i)
+{
+  return (i < 4 && i >= 0) ? i : 4;
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo (-1) != 4) ASSERT (0);
+  if (foo (0) != 0) ASSERT (0);
+  if (foo (1) != 1) ASSERT (0);
+  if (foo (2) != 2) ASSERT (0);
+  if (foo (3) != 3) ASSERT (0);
+  if (foo (4) != 4) ASSERT (0);
+  if (foo (5) != 4) ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr41317.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr41317.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr41317.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr41317.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,37 @@
+/*
+   pr41317.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct A
+{
+  int i;
+};
+struct B
+{
+  struct A a;
+  int j;
+};
+
+static void
+foo (struct B *p)
+{
+  ((struct A *)p)->i = 1;
+}
+
+void
+testTortureExecute (void)
+{
+  struct A a;
+  a.i = 0;
+  foo ((struct B *)&a);
+  if (a.i != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr41750.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr41750.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr41750.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr41750.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,78 @@
+/*
+   pr41750.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR 41750 - IPA-SRA used to pass hash->sgot by value rather than by
+   reference.  */
+
+struct bfd_link_hash_table
+{
+  int hash;
+};
+
+struct foo_link_hash_table
+{
+  struct bfd_link_hash_table root;
+  int *dynobj;
+  int *sgot;
+};
+
+struct foo_link_info
+{
+  struct foo_link_hash_table *hash;
+};
+
+extern void abort (void);
+
+int
+foo_create_got_section (int *abfd, struct foo_link_info *info)
+{
+  info->hash->sgot = abfd;
+  return 1;
+}
+
+static int *
+get_got (int *abfd, struct foo_link_info *info,
+	 struct foo_link_hash_table *hash)
+{
+  int *got;
+  int *dynobj;
+
+  got = hash->sgot;
+  if (!got)
+    {
+      dynobj = hash->dynobj;
+      if (!dynobj)
+	hash->dynobj = dynobj = abfd;
+      if (!foo_create_got_section (dynobj, info))
+	return 0;
+      got = hash->sgot;
+    }
+  return got;
+}
+
+int *
+elf64_ia64_check_relocs (int *abfd, struct foo_link_info *info)
+{
+  return get_got (abfd, info, info->hash);
+}
+
+struct foo_link_info link_info;
+struct foo_link_hash_table hash;
+int abfd;
+
+void
+testTortureExecute (void)
+{
+  link_info.hash = &hash;
+  if (elf64_ia64_check_relocs (&abfd, &link_info) != &abfd)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr42006.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr42006.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr42006.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr42006.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+   pr42006.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+static unsigned int
+my_add(unsigned int si1, unsigned int si2)
+{
+  return (si1 > (50-si2)) ? si1 : (si1 + si2);
+}
+
+static unsigned int
+my_shift(unsigned int left, unsigned int right)
+{
+  return  (right > 100) ? left : (left >> right);
+}
+
+static int func_4(unsigned int p_6)
+{
+  int count = 0;
+  for (p_6 = 1; p_6 < 3; p_6 = my_add(p_6, 1))
+    {
+      if (count++ > 1)
+	ASSERT (0);
+
+      if (my_shift(p_6, p_6))
+	return 0;
+    }
+  return 0;
+}
+
+void
+testTortureExecute (void)
+{
+  func_4(0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr42142.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr42142.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr42142.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr42142.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,37 @@
+/*
+   pr42142.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int
+sort(int L)
+{
+  int end[2] = { 10, 10, }, i=0, R;
+  while (i<2)
+    {
+      R = end[i];
+      if (L<R)
+        {
+          end[i+1] = 1;
+          end[i] = 10;
+          ++i;
+        }
+      else
+        break;
+    }
+  return i;
+}
+
+void
+testTortureExecute (void)
+{
+  if (sort (5) != 1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr42269-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr42269-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr42269-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr42269-2.c	2012-04-21 13:19:52.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+   pr42269-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+/* Make sure that language + abi extensions in passing S interoperate.  */
+
+static long long
+foo (unsigned short s)
+{
+  return (short) s;
+}
+#endif
+unsigned short s = 0xFFFF;
+
+void
+testTortureExecute (void)
+{
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+  ASSERT (!(foo (s) + 1 != 0));
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr42512.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr42512.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr42512.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr42512.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+   pr42512.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+short g_3;
+
+void
+testTortureExecute (void)
+{
+    int l_2;
+    for (l_2 = -1; l_2 != 0; l_2 = (unsigned char)(l_2 - 1))
+      g_3 |= l_2;
+    if (g_3 != -1)
+      ASSERT (0);
+    return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr42544.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr42544.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr42544.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr42544.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+   pr42544.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR c/42544 */
+
+extern void abort (void);
+
+void
+testTortureExecute (void)
+{
+#if 0
+TODO: Enable once sdcc really support long long literals.
+  signed short s = -1;
+  if (sizeof (long long) == sizeof (unsigned int))
+    return;
+  if ((unsigned int) s >= 0x100000000ULL)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr42833.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr42833.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr42833.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr42833.c	2012-02-24 12:57:34.000000000 +0000
@@ -0,0 +1,198 @@
+/*
+   pr42833.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <stdint.h>
+#include <string.h>
+#include <limits.h>
+
+/* If SSIZE_MAX is defined in limits.h, then we are running in a POSIX    */
+/* environment that already has a ssize_t definition (which may have been */
+/* included indirectly via string.h). In this case, use the guaranteed    */
+/* definition in sys/types.h, otherwise assume int compatible and hope    */
+/* for the best. */
+#ifdef SSIZE_MAX
+#include <sys/types.h>
+#else
+typedef int ssize_t;
+#endif
+
+typedef struct { int8_t v1; int8_t v2; int8_t v3; int8_t v4; } neon_s8;
+
+uint32_t helper_neon_rshl_s8 (uint32_t arg1, uint32_t arg2);
+
+uint32_t
+helper_neon_rshl_s8 (uint32_t arg1, uint32_t arg2)
+{
+  uint32_t res;
+  neon_s8 vsrc1;
+  neon_s8 vsrc2;
+  neon_s8 vdest;
+  do
+    {
+      union
+      {
+	neon_s8 v;
+	uint32_t i;
+      } conv_u;
+      conv_u.i = (arg1);
+      /*vsrc1 = conv_u.v; not in sdcc */
+      memcpy (&vsrc1, &(conv_u.v), sizeof (neon_s8));
+    }
+  while (0);
+  do
+    {
+      union
+      {
+	neon_s8 v;
+	uint32_t i;
+      } conv_u;
+      conv_u.i = (arg2);
+      /*vsrc2 = conv_u.v; not in sdcc*/
+      memcpy (&vsrc2, &(conv_u.v), sizeof (neon_s8));
+    }
+  while (0);
+  do
+    {
+      int8_t tmp;
+      tmp = (int8_t) vsrc2.v1;
+      if (tmp >= (ssize_t) sizeof (vsrc1.v1) * 8)
+	{
+	  vdest.v1 = 0;
+	}
+      else if (tmp < -(ssize_t) sizeof (vsrc1.v1) * 8)
+	{
+	  vdest.v1 = vsrc1.v1 >> (sizeof (vsrc1.v1) * 8 - 1);
+	}
+      else if (tmp == -(ssize_t) sizeof (vsrc1.v1) * 8)
+	{
+	  vdest.v1 = vsrc1.v1 >> (tmp - 1);
+	  vdest.v1++;
+	  vdest.v1 >>= 1;
+	}
+      else if (tmp < 0)
+	{
+	  vdest.v1 = (vsrc1.v1 + (1 << (-1 - tmp))) >> -tmp;
+	}
+      else
+	{
+	  vdest.v1 = vsrc1.v1 << tmp;
+	}
+    }
+  while (0);
+  do
+    {
+      int8_t tmp;
+      tmp = (int8_t) vsrc2.v2;
+      if (tmp >= (ssize_t) sizeof (vsrc1.v2) * 8)
+	{
+	  vdest.v2 = 0;
+	}
+      else if (tmp < -(ssize_t) sizeof (vsrc1.v2) * 8)
+	{
+	  vdest.v2 = vsrc1.v2 >> (sizeof (vsrc1.v2) * 8 - 1);
+	}
+      else if (tmp == -(ssize_t) sizeof (vsrc1.v2) * 8)
+	{
+	  vdest.v2 = vsrc1.v2 >> (tmp - 1);
+	  vdest.v2++;
+	  vdest.v2 >>= 1;
+	}
+      else if (tmp < 0)
+	{
+	  vdest.v2 = (vsrc1.v2 + (1 << (-1 - tmp))) >> -tmp;
+	}
+      else
+	{
+	  vdest.v2 = vsrc1.v2 << tmp;
+	}
+    }
+  while (0);
+  do
+    {
+      int8_t tmp;
+      tmp = (int8_t) vsrc2.v3;
+      if (tmp >= (ssize_t) sizeof (vsrc1.v3) * 8)
+	{
+	  vdest.v3 = 0;
+	}
+      else if (tmp < -(ssize_t) sizeof (vsrc1.v3) * 8)
+	{
+	  vdest.v3 = vsrc1.v3 >> (sizeof (vsrc1.v3) * 8 - 1);
+	}
+      else if (tmp == -(ssize_t) sizeof (vsrc1.v3) * 8)
+	{
+	  vdest.v3 = vsrc1.v3 >> (tmp - 1);
+	  vdest.v3++;
+	  vdest.v3 >>= 1;
+	}
+      else if (tmp < 0)
+	{
+	  vdest.v3 = (vsrc1.v3 + (1 << (-1 - tmp))) >> -tmp;
+	}
+      else
+	{
+	  vdest.v3 = vsrc1.v3 << tmp;
+	}
+    }
+  while (0);
+  do
+    {
+      int8_t tmp;
+      tmp = (int8_t) vsrc2.v4;
+      if (tmp >= (ssize_t) sizeof (vsrc1.v4) * 8)
+	{
+	  vdest.v4 = 0;
+	}
+      else if (tmp < -(ssize_t) sizeof (vsrc1.v4) * 8)
+	{
+	  vdest.v4 = vsrc1.v4 >> (sizeof (vsrc1.v4) * 8 - 1);
+	}
+      else if (tmp == -(ssize_t) sizeof (vsrc1.v4) * 8)
+	{
+	  vdest.v4 = vsrc1.v4 >> (tmp - 1);
+	  vdest.v4++;
+	  vdest.v4 >>= 1;
+	}
+      else if (tmp < 0)
+	{
+	  vdest.v4 = (vsrc1.v4 + (1 << (-1 - tmp))) >> -tmp;
+	}
+      else
+	{
+	  vdest.v4 = vsrc1.v4 << tmp;
+	}
+    }
+  while (0);;
+  do
+    {
+      union
+      {
+	neon_s8 v;
+	uint32_t i;
+      } conv_u;
+      /*conv_u.v = (vdest) not in sdcc */;
+      memcpy (&conv_u.v, &(vdest), sizeof (neon_s8));
+      res = conv_u.i;
+    }
+  while (0);
+  return res;
+}
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && __GNUC__ < 5)
+  uint32_t r = helper_neon_rshl_s8 (0x05050505, 0x01010101);
+  if (r != 0x0a0a0a0a)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr43236.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr43236.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr43236.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr43236.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+   pr43236.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <string.h>
+
+void
+testTortureExecute (void)
+{
+  char A[30], B[30], C[30];
+  int i;
+
+  /* prepare arrays */
+  memset(A, 1, 30);
+  memset(B, 1, 30);
+
+  for (i = 20; i-- > 10;) {
+    A[i] = 0;
+    B[i] = 0;
+  }
+
+  /* expected result */
+  memset(C, 1, 30);
+  memset(C + 10, 0, 10);
+
+  /* show result */
+/*  for (i = 0; i < 30; i++)
+    printf("%d %d %d\n", A[i], B[i], C[i]); */
+
+  /* compare results */
+  if (memcmp(A, C, 30) || memcmp(B, C, 30)) ASSERT(0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr43269.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr43269.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr43269.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr43269.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   pr43269.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int g_21;
+int g_211;
+int g_261;
+
+static void
+func_32 (int b)
+{
+  if (b) {
+lbl_370:
+      g_21 = 1;
+  }
+
+  for (g_261 = -1; g_261 > -2; g_261--) {
+      if (g_211 + 1) {
+	  return;
+      } else {
+	  g_21 = 1;
+	  goto lbl_370;
+      }
+  }
+}
+
+void
+testTortureExecute (void)
+{
+  func_32(0);
+  if (g_261 != -1)
+    ASSERT (0);
+  return;
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr43438.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr43438.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr43438.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr43438.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   pr43438.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+static unsigned char g_2 = 1;
+static int g_9;
+static int *l_8 = &g_9;
+
+static void func_12(int p_13)
+{
+  int * l_17 = &g_9;
+  *l_17 &= 0 < p_13;
+}
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5 && __GNUC_MINOR__ < 4))
+  unsigned char l_11 = 254;
+  *l_8 |= g_2;
+  l_11 |= *l_8;
+  func_12(l_11);
+  if (g_9 != 1)
+    ASSERT (0);
+  return;
+#endif
+} 
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr44202-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr44202-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr44202-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr44202-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+   pr44202-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int
+add512(int a, int *b)
+{
+  int c = a + 512;
+  if (c != 0)
+    *b = a;
+  return c;
+}
+
+int
+add513(int a, int *b)
+{
+  int c = a + 513;
+  if (c == 0)
+    *b = a;
+  return c;
+}
+
+void
+testTortureExecute (void)
+{
+  int b0 = -1;
+  int b1 = -1;
+  if (add512(-512, &b0) != 0 || b0 != -1 || add513(-513, &b1) != 0 || b1 != -513)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr44468.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr44468.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr44468.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr44468.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,73 @@
+/*
+   pr44468.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <stddef.h>
+
+struct S {
+  int i;
+  int j;
+};
+struct R {
+  int k;
+  struct S a;
+};
+struct Q {
+  float k;
+  struct S a;
+};
+struct Q s;
+int
+test1 (void *q)
+{
+  struct S *b = (struct S *)((char *)q + sizeof (int));
+  s.a.i = 0;
+  b->i = 3;
+  return s.a.i;
+}
+int
+test2 (void *q)
+{
+  struct S *b = &((struct R *)q)->a;
+  s.a.i = 0;
+  b->i = 3;
+  return s.a.i;
+}
+int
+test3 (void *q)
+{
+  s.a.i = 0;
+  ((struct S *)((char *)q + sizeof (int)))->i = 3;
+  return s.a.i;
+}
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5 && __GNUC_MINOR__ < 5))
+  if (sizeof (float) != sizeof (int)
+      || offsetof (struct R, a) != sizeof (int)
+      || offsetof (struct Q, a) != sizeof (int))
+    return;
+  s.a.i = 1;
+  s.a.j = 2;
+  if (test1 ((void *)&s) != 3)
+    ASSERT (0);
+  s.a.i = 1;
+  s.a.j = 2;
+  if (test2 ((void *)&s) != 3)
+    ASSERT (0);
+  s.a.i = 1;
+  s.a.j = 2;
+  if (test3 ((void *)&s) != 3)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr44555.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr44555.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr44555.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr44555.c	2012-05-05 21:01:21.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   pr44555.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct a {
+    char b[100];
+};
+int foo(struct a *a)
+{
+  if (&a->b)
+    return 1;
+  return 0;
+}
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 6))
+  if (foo((struct a *)0) != 0)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr44575.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr44575.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr44575.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr44575.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+   pr44575.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR target/44575 */
+
+#include <stdarg.h>
+
+int fails = 0;
+struct S { float a[3]; };
+struct S a[5];
+#if 0
+TODO: Enable once structures can be passed as parameters!
+void
+check (int z, ...)
+{
+  struct S arg, *p;
+  va_list ap;
+  int j = 0, k = 0;
+  int i;
+  va_start (ap, z);
+  for (i = 2; i < 4; ++i)
+    {
+      p = 0;
+      j++;
+      k += 2;
+      switch ((z << 4) | i)
+	{
+	case 0x12:
+	case 0x13:
+	  p = &a[2];
+	  arg = va_arg (ap, struct S);
+	  break;
+	default:
+	  ++fails;
+	  break;
+	}
+      if (p && p->a[2] != arg.a[2])
+	++fails;
+      if (fails)
+	break;
+    }
+  va_end (ap);
+}
+#endif
+void
+testTortureExecute (void)
+{
+#if 0
+  a[2].a[2] = -49026;
+  check (1, a[2], a[2]);
+  if (fails)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr45034.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr45034.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr45034.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr45034.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,58 @@
+/*
+   pr45034.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+static void fixnum_neg(signed char x, signed char *py, int *pv)
+{
+  unsigned char ux, uy;
+
+  ux = (unsigned char)x;
+  uy = -ux;
+  *py = (uy <= 127) ? (signed char)uy : (-(signed char)(255 - uy) - 1);
+  *pv = (x == -128) ? 1 : 0;
+}
+
+void foo(int x, int y, int v)
+{
+  if (y < -128 || y > 127)
+    ASSERT(0);
+}
+
+int ftest_neg(void)
+{
+  signed char x, y;
+  int v, err;
+
+  err = 0;
+  x = -128;
+  for (;;) {
+      fixnum_neg(x, &y, &v);
+      foo((int)x, (int)y, v);
+      if ((v && x != -128) || (!v && x == -128))
+	++err;
+      if (x == 127)
+	break;
+      ++x;
+  }
+  return err;
+}
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5 && __GNUC_MINOR__ < 6))
+  if (sizeof (char) != 1)
+    return;
+  if (ftest_neg() != 0)
+    ASSERT(0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr46909-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr46909-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr46909-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr46909-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   pr46909.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR tree-optimization/46909 */
+
+int
+foo (unsigned int x)
+{
+  if (! (x == 4 || x == 6) || (x == 2 || x == 6))
+    return 1;
+  return -1;
+}
+
+void
+testTortureExecute (void)
+{
+  int i;
+  for (i = -10; i < 10; i++)
+    if (foo (i) != 1 - 2 * (i == 4))
+      ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr46909-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr46909-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr46909-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr46909-2.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   pr46909-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR tree-optimization/46909 */
+
+int
+foo (int x)
+{
+  if ((x != 0 && x != 13) || x == 5 || x == 20)
+    return 1;
+  return -1;
+}
+
+void
+testTortureExecute (void)
+{
+  int i;
+  for (i = -10; i < 30; i++)
+    if (foo (i) != 1 - 2 * (i == 0) - 2 * (i == 13))
+      ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr47148.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr47148.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr47148.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr47148.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,48 @@
+/*
+   pr47148.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#if 0
+//TODO: Enable once sdcc supports C99's mixture of declarations and statements.
+/* PR tree-optimization/47148 */
+
+static inline unsigned
+bar (unsigned x, unsigned y)
+{
+  if (y >= 32)
+    return x;
+  else
+    return x >> y;
+}
+
+static unsigned a = 1, b = 1;
+
+static inline void
+foo (unsigned char x, unsigned y)
+{
+  if (!y)
+    return;
+  unsigned c = (0x7000U / (x - 2)) ^ a;
+  unsigned d = bar (a, a);
+  b &= ((a - d) && (a - 1)) + c;
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  foo (1, 1);
+  foo (-1, 1);
+  if (b && ((unsigned char) -1) == 255)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr47155.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr47155.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr47155.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr47155.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+   pr47155.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR tree-optimization/47155 */
+
+unsigned int a;
+static signed char b = -127;
+int c = 1;
+
+void
+testTortureExecute (void)
+{
+  a = b <= (unsigned char) (-6 * c);
+  if (!a)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr47299.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr47299.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr47299.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr47299.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   pr47299.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR rtl-optimization/47299 */
+
+unsigned short
+foo (unsigned char x)
+{
+  return x * 255;
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo (0x40) != 0x3fc0)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr47337.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr47337.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr47337.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr47337.c	2012-04-02 11:26:01.000000000 +0000
@@ -0,0 +1,105 @@
+/*
+   pr47337.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#include <string.h>
+
+// Some ports do not yet support long long
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+
+/* PR rtl-optimization/47337 */
+
+static unsigned int a[256], b = 0;
+static char c = 0;
+static int d = 0, *f = &d;
+static long long e = 0;
+
+static short
+foo (long long x, long long y)
+{
+  return x / y;
+}
+
+static char
+bar (char x, char y)
+{
+  return x - y;
+}
+
+static int
+baz (int x, int y)
+{
+  *f = (y != (short) (y * 3));
+  for (c = 0; c < 2; c++)
+    {
+    lab:
+      if (d)
+	{
+	  if (e)
+	    e = 1;
+	  else
+	    return x;
+	}
+      else
+	{
+	  d = 1;
+	  goto lab;
+	}
+      f = &d;
+    }
+  return x;
+}
+
+static void
+fnx (unsigned long long x, int y)
+{
+  if (!y)
+    {
+      b = a[b & 1];
+      b = a[b & 1];
+      b = a[(b ^ (x & 1)) & 1];
+      b = a[(b ^ (x & 1)) & 1];
+    }
+}
+
+const char *volatile w = "2";
+#endif
+
+void
+testTortureExecute (void)
+{
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+  int h = 0;
+  unsigned int k = 0;
+  int l[8];
+  int i, j;
+
+  if (strcmp (w, "1") == 0)
+    h = 1;
+
+  for (i = 0; i < 256; i++)
+    {
+      for (j = 8; j > 0; j--)
+	k = 1;
+      a[i] = k;
+    }
+  for (i = 0; i < 8; i++)
+    l[i] = 0;
+
+  d = bar (c, c);
+  d = baz (c, 1 | foo (l[0], 10));
+  fnx (d, h);
+  fnx (e, h);
+
+  if (d != 0)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr47538.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr47538.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr47538.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr47538.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,91 @@
+/*
+   pr47538.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 93
+#endif
+
+#ifndef SDCC_mcs51
+#include <string.h>
+
+/* PR tree-optimization/47538 */
+
+struct S
+{
+  double a, b, *c;
+  unsigned long d;
+};
+
+void
+foo (struct S *x, const struct S *y)
+{
+  const unsigned long n = y->d + 1;
+  const double m = 0.25 * (y->b - y->a);
+  x->a = y->a;
+  x->b = y->b;
+  if (n == 1)
+    {
+      x->c[0] = 0.;
+    }
+  else if (n == 2)
+    {
+      x->c[1] = m * y->c[0];
+      x->c[0] = 2.0 * x->c[1];
+    }
+  else
+    {
+      double o = 0.0, p = 1.0;
+      unsigned long i;
+
+      for (i = 1; i <= n - 2; i++)
+	{
+	  x->c[i] = m * (y->c[i - 1] - y->c[i + 1]) / (double) i;
+	  o += p * x->c[i];
+	  p = -p;
+	}
+      x->c[n - 1] = m * y->c[n - 2] / (n - 1.0);
+      o += p * x->c[n - 1];
+      x->c[0] = 2.0 * o;
+    }
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_mcs51
+  struct S x, y;
+  double c[4] = { 10, 20, 30, 40 }, d[4], e[4] = { 118, 118, 118, 118 };
+
+  y.a = 10;
+  y.b = 6;
+  y.c = c;
+  x.c = d;
+  y.d = 3;
+  memcpy (d, e, sizeof d);
+  foo (&x, &y);
+  if (d[0] != 0 || d[1] != 20 || d[2] != 10 || d[3] != -10)
+    ASSERT (0);
+  y.d = 2;
+  memcpy (d, e, sizeof d);
+  foo (&x, &y);
+  if (d[0] != 60 || d[1] != 20 || d[2] != -10 || d[3] != 118)
+    ASSERT (0);
+  y.d = 1;
+  memcpy (d, e, sizeof d);
+  foo (&x, &y);
+  if (d[0] != -20 || d[1] != -10 || d[2] != 118 || d[3] != 118)
+    ASSERT (0);
+  y.d = 0;
+  memcpy (d, e, sizeof d);
+  foo (&x, &y);
+  if (d[0] != 0 || d[1] != 118 || d[2] != 118 || d[3] != 118)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr48717.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr48717.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr48717.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr48717.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   pr48717.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR tree-optimization/48717 */
+
+int v = 1, w;
+
+unsigned short
+foo (unsigned short x, unsigned short y)
+{
+  return x + y;
+}
+
+void
+bar (void)
+{
+  v = foo (~w, w);
+}
+
+void
+testTortureExecute (void)
+{
+  bar ();
+  if (v != (unsigned short) -1)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr48809.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr48809.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr48809.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr48809.c	2012-02-26 15:16:21.000000000 +0000
@@ -0,0 +1,71 @@
+/*
+   pr48809.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR tree-optimization/48809 */
+
+int
+foo (signed char x)
+{
+  int y = 0;
+  switch (x)
+    {
+    case 0: y = 1; break;
+    case 1: y = 7; break;
+    case 2: y = 2; break;
+    case 3: y = 19; break;
+    case 4: y = 5; break;
+    case 5: y = 17; break;
+    case 6: y = 31; break;
+    case 7: y = 8; break;
+    case 8: y = 28; break;
+    case 9: y = 16; break;
+    case 10: y = 31; break;
+    case 11: y = 12; break;
+    case 12: y = 15; break;
+    case 13: y = 111; break;
+    case 14: y = 17; break;
+    case 15: y = 10; break;
+    case 16: y = 31; break;
+    case 17: y = 7; break;
+    case 18: y = 2; break;
+    case 19: y = 19; break;
+    case 20: y = 5; break;
+    case 21: y = 107; break;
+    case 22: y = 31; break;
+    case 23: y = 8; break;
+    case 24: y = 28; break;
+    case 25: y = 106; break;
+    case 26: y = 31; break;
+    case 27: y = 102; break;
+    case 28: y = 105; break;
+    case 29: y = 111; break;
+    case 30: y = 17; break;
+    case 31: y = 10; break;
+    case 32: y = 31; break;
+    case 98: y = 18; break;
+    case -62: y = 19; break;
+    }
+  return y;
+}
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5))
+  if (foo (98) != 18 || foo (97) != 0 || foo (99) != 0)
+    ASSERT (0);
+  if (foo (-62) != 19 || foo (-63) != 0 || foo (-61) != 0)
+    ASSERT (0);
+  if (foo (28) != 105 || foo (27) != 102 || foo (29) != 111)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr48973-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr48973-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr48973-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr48973-1.c	2012-02-26 15:16:21.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+   pr48973-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR middle-end/48973 */
+
+struct S { signed int f : 1; } s;
+int v = -1;
+
+void
+foo (unsigned int x)
+{
+  if (x != -1U)
+    ASSERT (0);
+}
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5))
+  s.f = (v & 1) > 0;
+  foo (s.f);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr48973-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr48973-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr48973-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr48973-2.c	2012-02-26 15:16:21.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   pr48973-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR middle-end/48973 */
+
+struct S { signed int f : 1; } s;
+int v = -1;
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5))
+  s.f = v < 0;
+  if ((unsigned int) s.f != -1U)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr49039.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr49039.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr49039.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr49039.c	2012-02-26 15:16:21.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+   pr49039.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR tree-optimization/49039 */
+int cnt;
+
+void
+foo (unsigned int x, unsigned int y)
+{
+  unsigned int minv, maxv;
+  if (x == 1 || y == -2U)
+    return;
+  minv = x < y ? x : y;
+  maxv = x > y ? x : y;
+  if (minv == 1)
+    ++cnt;
+  if (maxv == -2U)
+    ++cnt;
+}
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5))
+  foo (-2U, 1);
+  if (cnt != 2)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr49073.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr49073.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr49073.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr49073.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+   pr49073.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR tree-optimization/49073 */
+
+int a[] = { 1, 2, 3, 4, 5, 6, 7 }, c;
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5 && __GNUC_MINOR__ < 7))
+  int d = 1, i = 1;
+  _Bool f = 0;
+  do
+    {
+      d = a[i];
+      if (f && d == 4)
+	{
+	  ++c;
+	  break;
+	}
+      i++;
+      f = (d == 3);
+    }
+  while (d < 7);
+  if (c != 1)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr49123.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr49123.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr49123.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr49123.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   pr49123.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR lto/49123 */
+
+static struct S { signed int f : 1; } s;
+static int v = -1;
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5 && __GNUC_MINOR__ < 7))
+  s.f = v < 0;
+  if ((unsigned int) s.f != -1U)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr49161.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr49161.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr49161.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr49161.c	2012-02-26 15:16:21.000000000 +0000
@@ -0,0 +1,57 @@
+/*
+   pr49161.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR tree-optimization/49161 */
+
+int c;
+
+void
+bar (int x)
+{
+  if (x != c++)
+    ASSERT (0);
+}
+
+void
+foo (int x)
+{
+  switch (x)
+    {
+    case 3: goto l1;
+    case 4: goto l2;
+    case 6: goto l3;
+    default: return;
+    }
+l1:
+  goto l4;
+l2:
+  goto l4;
+l3:
+  bar (-1);
+l4:
+  bar (0);
+  if (x != 4)
+    bar (1);
+  if (x != 3)
+    bar (-1);
+  bar (2);
+}
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5))
+  foo (3);
+  if (c != 3)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr49281.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr49281.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr49281.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr49281.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+   pr49281.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR target/49281 */
+
+extern void abort (void);
+
+int
+foo (int x)
+{
+  return (x << 2) | 4;
+}
+
+int
+bar (int x)
+{
+  return (x << 2) | 3;
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo (43) != 172 || foo (1) != 4 || foo (2) != 12)
+    ASSERT (0);
+  if (bar (43) != 175 || bar (1) != 7 || bar (2) != 11)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr49419.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr49419.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr49419.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr49419.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,48 @@
+/*
+   pr49419.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#pragma disable_warning 85
+#endif
+
+/* PR tree-optimization/49419 */
+
+struct S { int w, x, y; } *t;
+
+int
+foo (int n, int f, int *s, int m)
+{
+  int x, i, a;
+  if (n == -1)
+    return 0;
+  for (x = n, i = 0; t[x].w == f && i < m; i++)
+    x = t[x].x;
+  if (i == m)
+    ASSERT (0);
+  a = i + 1;
+  for (x = n; i > 0; i--)
+    {
+      s[i] = t[x].y;
+      x = t[x].x;
+    }
+  s[0] = x;
+  return a;
+}
+
+void
+testTortureExecute (void)
+{
+  int s[3], i;
+  struct S buf[3] = { { 1, 1, 2 }, { 0, 0, 0 }, { 0, 0, 0 } };
+  t = buf;
+  if (foo (0, 1, s, 3) != 2)
+    ASSERT (0);
+  if (s[0] != 1 || s[1] != 2)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr49768.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr49768.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr49768.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr49768.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+   pr49768.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR tree-optimization/49768 */
+
+void
+testTortureExecute (void)
+{
+#if !(defined (__GNUC__) && defined (__GNUC_MINOR__) && (__GNUC__ < 5 && __GNUC_MINOR__ < 7))
+  static struct { unsigned int : 1; unsigned int s : 1; } s = { .s = 1 };
+  if (s.s != 1)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr51466.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr51466.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pr51466.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pr51466.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,52 @@
+/*
+   pr51466.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* PR tree-optimization/51466 */
+
+int
+foo (int i)
+{
+  volatile int v[4];
+  int *p;
+  v[i] = 6;
+  p = (int *) &v[i];
+  return *p;
+}
+
+int
+bar (int i)
+{
+  volatile int v[4];
+  int *p;
+  v[i] = 6;
+  p = (int *) &v[i];
+  *p = 8;
+  return v[i];
+}
+
+int
+baz (int i)
+{
+  volatile int v[4];
+  int *p;
+  v[i] = 6;
+  p = (int *) &v[0];
+  *p = 8;
+  return v[i];
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo (3) != 6 || bar (2) != 8 || baz (0) != 8 || baz (1) != 6)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pta-field-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pta-field-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pta-field-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pta-field-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   pta-field-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct Foo {
+  int *p;
+  int *q;
+};
+
+void
+bar (int **x)
+{
+  struct Foo *f = (struct Foo *)x;
+  *(f->q) = 0;
+}
+
+int foo(void)
+{
+  struct Foo f;
+  int i = 1, j = 2;
+  f.p = &i;
+  f.q = &j;
+  bar(&f.p);
+  return j;
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo () != 0)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pta-field-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pta-field-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pta-field-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pta-field-2.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   pta-field-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct Foo {
+  int *p;
+  int *q;
+};
+
+void
+bar (int **x)
+{
+  struct Foo *f = (struct Foo *)(x - 1);
+  *(f->p) = 0;
+}
+
+int foo(void)
+{
+  struct Foo f;
+  int i = 1, j = 2;
+  f.p = &i;
+  f.q = &j;
+  bar(&f.q);
+  return i;
+}
+
+void
+testTortureExecute (void)
+{
+  if (foo () != 0)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-ptr-arith-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-ptr-arith-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-ptr-arith-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-ptr-arith-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+   ptr-arith-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+const char *
+f (const char *s, unsigned int i)
+{
+  return &s[i + 3 - 1];
+}
+
+void
+testTortureExecute (void)
+{
+  const char *str = "abcdefghijkl";
+  const char *x2 = f (str, 12);
+  if (str + 14 != x2)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pure-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pure-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-pure-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-pure-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,79 @@
+/*
+   restrict-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Origin: Kaveh Ghazi <ghazi@caip.rutgers.edu> 2002-05-27.  */
+
+extern int i;
+
+extern int func0 (int);
+extern int func1 (int);
+
+/* GCC should automatically detect attributes for these functions.
+   At -O3 They'll be inlined, but that's ok.  */
+static int func2 (int a) { return i + a; } /* pure */
+static int func3 (int a) { return a * 3; } /* const */
+static int func4 (int a) { return func0(a) + a; } /* pure */
+static int func5 (int a) { return a + func1(a); } /* const */
+static int func6 (int a) { return func2(a) + a; } /* pure */
+static int func7 (int a) { return a + func3(a); } /* const */
+
+void
+testTortureExecute (void)
+{
+  int i[10], r;
+
+  i[0] = 0;
+  r = func0(0);
+  if (i[0])
+    ASSERT (0);
+
+  i[1] = 0;
+  r = func1(0);
+  if (i[1])
+    ASSERT (0);
+
+  i[2] = 0;
+  r = func2(0);
+  if (i[2])
+    ASSERT (0);
+
+  i[3] = 0;
+  r = func3(0);
+  if (i[3])
+    ASSERT (0);
+
+  i[4] = 0;
+  r = func4(0);
+  if (i[4])
+    ASSERT (0);
+
+  i[5] = 0;
+  r = func5(0);
+  if (i[5])
+    ASSERT (0);
+
+  i[6] = 0;
+  r = func6(0);
+  if (i[6])
+    ASSERT (0);
+
+  i[7] = 0;
+  r = func7(0);
+  if (i[7])
+    ASSERT (0);
+
+  return;
+}
+
+int func0 (int a) { return a - i; } /* pure */
+int func1 (int a) { return a - a; } /* const */
+
+int i = 2;
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-scope-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-scope-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-scope-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-scope-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+   scope-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+int v = 3;
+
+void f (void)
+{
+  int v = 4;
+  {
+    extern int v;
+    if (v != 3)
+      ASSERT (0);
+  }
+}
+
+void
+testTortureExecute (void)
+{
+  f ();
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-shiftopt-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-shiftopt-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-shiftopt-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-shiftopt-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,74 @@
+/*
+   shiftopt-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Copyright (C) 2002  Free Software Foundation
+
+   Check that constant folding of shift operations is working.
+
+   Roger Sayle, 10th October 2002.  */
+
+extern void link_error (void);
+
+void
+utest (unsigned int x)
+{
+  if (x >> 0 != x)
+    link_error ();
+
+  if (x << 0 != x)
+    link_error ();
+
+  if (0 << x != 0)
+    link_error ();
+
+  if (0 >> x != 0)
+    link_error ();
+
+  if (-1 >> x != -1)
+    link_error ();
+
+  if (~0 >> x != ~0)
+    link_error ();
+}
+
+void
+stest (int x)
+{
+  if (x >> 0 != x)
+    link_error ();
+
+  if (x << 0 != x)
+    link_error ();
+
+  if (0 << x != 0)
+    link_error ();
+
+  if (0 >> x != 0)
+    link_error ();
+}
+
+void
+testTortureExecute (void)
+{
+  utest(9);
+  utest(0);
+
+  stest(9);
+  stest(0);
+
+  return;
+}
+
+void
+link_error ()
+{
+  ASSERT (0);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-stdarg-3.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-stdarg-3.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-stdarg-3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-stdarg-3.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,183 @@
+/*
+   stdarg-3.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#pragma disable_warning 93 // Using float for double.
+
+#include <stdarg.h>
+
+int foo_arg, bar_arg;
+long x;
+double d;
+va_list gap;
+struct S1 { int i; double d; int j; double e; } s1;
+struct S2 { double d; long i; } s2;
+int y;
+
+void
+bar (int v)
+{
+  bar_arg = v;
+}
+
+void
+f1 (int i, ...)
+{
+  va_list ap;
+  va_start (ap, i);
+  while (i-- > 0)
+    x = va_arg (ap, long);
+  va_end (ap);
+}
+
+void
+f2 (int i, ...)
+{
+  va_list ap;
+  va_start (ap, i);
+  while (i-- > 0)
+    d = va_arg (ap, double);
+  va_end (ap);
+}
+
+void
+f3 (int i, ...)
+{
+  va_list ap;
+  int j = i;
+  while (j-- > 0)
+    {
+      va_start (ap, i);
+      x = va_arg (ap, long);
+      va_end (ap);
+      bar (x);
+    }
+}
+
+void
+f4 (int i, ...)
+{
+  va_list ap;
+  int j = i;
+  while (j-- > 0)
+    {
+      va_start (ap, i);
+      d = va_arg (ap, double);
+      va_end (ap);
+      bar (d + 4.0);
+    }
+}
+
+#if 0
+SDCC cannot assign aggregates yet.
+void
+f5 (int i, ...)
+{
+  va_list ap;
+  va_start (ap, i);
+  while (i-- > 0)
+    s1 = va_arg (ap, struct S1);
+  va_end (ap);
+}
+
+void
+f6 (int i, ...)
+{
+  va_list ap;
+  va_start (ap, i);
+  while (i-- > 0)
+    s2 = va_arg (ap, struct S2);
+  va_end (ap);
+}
+
+void
+f7 (int i, ...)
+{
+  va_list ap;
+  int j = i;
+  while (j-- > 0)
+    {
+      va_start (ap, i);
+      s1 = va_arg (ap, struct S1);
+      va_end (ap);
+      bar (s1.i);
+    }
+}
+
+void
+f8 (int i, ...)
+{
+  va_list ap;
+  int j = i;
+  while (j-- > 0)
+    {
+      va_start (ap, i);
+      s2 = va_arg (ap, struct S2);
+      y = va_arg (ap, int);
+      va_end (ap);
+      bar (s2.i);
+    }
+}
+#endif
+
+void
+testTortureExecute (void)
+{
+//  struct S1 a1, a3;
+//  struct S2 a2, a4;
+
+  f1 (7, 1L, 2L, 3L, 5L, 7L, 9L, 11L, 13L);
+  if (x != 11L)
+    ASSERT (0);
+  f2 (6, 1.0, 2.0, 4.0, 8.0, 16.0, 32.0, 64.0);
+  if (d != 32.0)
+    ASSERT (0);
+  f3 (2, 1L, 3L);
+  if (bar_arg != 1L || x != 1L)
+    ASSERT (0);
+  f4 (2, 17.0, 19.0);
+  if (bar_arg != 21 || d != 17.0)
+    ASSERT (0);
+#if 0
+// SDCC cannot pass structures or assign aggregates yet.
+  a1.i = 131;
+  a1.j = 251;
+  a1.d = 15.0;
+  a1.e = 191.0;
+  a3 = a1;
+  a3.j = 254;
+  a3.e = 178.0;
+  f5 (2, a1, a3, a1);
+  if (s1.i != 131 || s1.j != 254 || s1.d != 15.0 || s1.e != 178.0)
+    ASSERT (0);
+  f5 (3, a1, a3, a1);
+  if (s1.i != 131 || s1.j != 251 || s1.d != 15.0 || s1.e != 191.0)
+    ASSERT (0);
+  a2.i = 138;
+  a2.d = 16.0;
+  a4.i = 257;
+  a4.d = 176.0;
+  f6 (2, a2, a4, a2);
+  if (s2.i != 257 || s2.d != 176.0)
+    ASSERT (0);
+  f6 (3, a2, a4, a2);
+  if (s2.i != 138 || s2.d != 16.0)
+    ASSERT (0);
+  f7 (2, a3, a1, a1);
+  if (s1.i != 131 || s1.j != 254 || s1.d != 15.0 || s1.e != 178.0)
+    ASSERT (0);
+  if (bar_arg != 131)
+    ASSERT (0);
+  f8 (3, a4, a2, a2);
+  if (s2.i != 257 || s2.d != 176.0)
+    ASSERT (0);
+#endif
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-stdarg-4.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-stdarg-4.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-stdarg-4.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-stdarg-4.c	2012-02-26 02:01:20.000000000 +0000
@@ -0,0 +1,154 @@
+/*
+   stdarg-4.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#pragma disable_warning 93 // Using float for double.
+
+#include <stdarg.h>
+
+long x, y;
+
+inline void
+f1i (va_list ap)
+{
+  x = va_arg (ap, double);
+  x += va_arg (ap, long);
+  x += va_arg (ap, double);
+}
+
+void
+f1 (int i, ...)
+{
+  va_list ap;
+  va_start (ap, i);
+  f1i (ap);
+  va_end (ap);
+}
+
+inline void
+f2i (va_list ap)
+{
+  y = va_arg (ap, int);
+  y += va_arg (ap, long);
+  y += va_arg (ap, double);
+  f1i (ap);
+}
+
+void
+f2 (int i, ...)
+{
+  va_list ap;
+  va_start (ap, i);
+  f2i (ap);
+  va_end (ap);
+}
+
+long
+f3h (int i, long arg0, long arg1, long arg2, long arg3)
+{
+  return i + arg0 + arg1 + arg2 + arg3;
+}
+
+long
+f3 (int i, ...)
+{
+  long t, arg0, arg1, arg2, arg3;
+  va_list ap;
+
+  va_start (ap, i);
+  switch (i)
+    {
+    case 0:
+      t = f3h (i, 0, 0, 0, 0);
+      break;
+    case 1:
+      arg0 = va_arg (ap, long);
+      t = f3h (i, arg0, 0, 0, 0);
+      break;
+    case 2:
+      arg0 = va_arg (ap, long);
+      arg1 = va_arg (ap, long);
+      t = f3h (i, arg0, arg1, 0, 0);
+      break;
+    case 3:
+      arg0 = va_arg (ap, long);
+      arg1 = va_arg (ap, long);
+      arg2 = va_arg (ap, long);
+      t = f3h (i, arg0, arg1, arg2, 0);
+      break;
+    case 4:
+      arg0 = va_arg (ap, long);
+      arg1 = va_arg (ap, long);
+      arg2 = va_arg (ap, long);
+      arg3 = va_arg (ap, long);
+      t = f3h (i, arg0, arg1, arg2, arg3);
+      break;
+    default:
+      t = 0;
+      ASSERT (0);
+    }
+  va_end (ap);
+
+  return t;
+}
+
+void
+f4 (int i, ...)
+{
+  va_list ap;
+
+  va_start (ap, i);
+  switch (i)
+    {
+    case 4:
+      y = va_arg (ap, double);
+      break;
+    case 5:
+      y = va_arg (ap, double);
+      y += va_arg (ap, double);
+      break;
+    default:
+      ASSERT (0);
+    }
+  f1i (ap);
+  va_end (ap);
+}
+
+
+void
+testTortureExecute (void)
+{
+  f1 (3, 16.0, 128L, 32.0);
+  if (x != 176L)
+    ASSERT (0);
+  f2 (6, 5, 7L, 18.0, 19.0, 17L, 64.0);
+  if (x != 100L || y != 30L)
+    ASSERT (0);
+  if (f3 (0) != 0)
+    ASSERT (0);
+  if (f3 (1, 18L) != 19L)
+    ASSERT (0);
+  if (f3 (2, 18L, 100L) != 120L)
+    ASSERT (0);
+  if (f3 (3, 18L, 100L, 300L) != 421L)
+    ASSERT (0);
+  if (f3 (4, 18L, 71L, 64L, 86L) != 243L)
+    ASSERT (0);
+  f4 (4, 6.0, 9.0, 16L, 18.0);
+  if (x != 43L || y != 6L)
+    ASSERT (0);
+  f4 (5, 7.0, 21.0, 1.0, 17L, 126.0);
+
+// Fails on z80 and related
+  if (x != 144L || y != 28L)
+    ASSERT (0);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-string-opt-17.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-string-opt-17.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-string-opt-17.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-string-opt-17.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,52 @@
+/*
+   string-opt-17.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Copyright (C) 2003  Free Software Foundation.
+
+   Test strcpy optimizations don't evaluate side-effects twice.
+      
+   Written by Jakub Jelinek, June 23, 2003.  */
+
+#include <string.h>
+
+size_t
+test1 (char *s, size_t i)
+{
+  strcpy (s, "foobarbaz" + i++);
+  return i;
+}
+
+size_t
+check2 (void)
+{
+  static size_t r = 5;
+  if (r != 5)
+    ASSERT (0);
+  return ++r;
+}
+
+void
+test2 (char *s)
+{
+  strcpy (s, "foobarbaz" + check2 ());
+}
+
+void
+testTortureExecute (void)
+{
+  char buf[10];
+  if (test1 (buf, 7) != 8 || memcmp (buf, "az", 3))
+    ASSERT (0);
+  test2 (buf);
+  if (memcmp (buf, "baz", 4))
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-string-opt-18.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-string-opt-18.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-string-opt-18.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-string-opt-18.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,83 @@
+/*
+   string-opt-18.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Copyright (C) 2003  Free Software Foundation.
+
+   Test equal pointer optimizations don't break anything.
+
+   Written by Roger Sayle, July 14, 2003.  */
+
+#include <string.h>
+
+
+void test1 (void *ptr)
+{
+  if (memcpy(ptr,ptr,8) != ptr)
+    ASSERT (0);
+}
+
+#if 0
+// GNU-specific function
+void test2 (char *ptr)
+{
+  if (mempcpy(ptr,ptr,8) != ptr+8)
+    ASSERT (0);
+}
+#endif
+
+void test3 (void *ptr)
+{
+  if (memmove(ptr,ptr,8) != ptr)
+    ASSERT (0);
+}
+
+void test4 (char *ptr)
+{
+  if (strcpy(ptr,ptr) != ptr)
+    ASSERT (0);
+}
+
+void test5 (void *ptr)
+{
+  if (memcmp(ptr,ptr,8) != 0)
+    ASSERT (0);
+}
+
+void test6 (const char *ptr)
+{
+  if (strcmp(ptr,ptr) != 0)
+    ASSERT (0);
+}
+
+void test7 (const char *ptr)
+{
+  if (strncmp(ptr,ptr,8) != 0)
+    ASSERT (0);
+}
+
+
+void
+testTortureExecute (void)
+{
+  char buf[10];
+
+  test1 (buf);
+#if 0
+  test2 (buf);
+#endif
+  test3 (buf);
+  test4 (buf);
+  test5 (buf);
+  test6 (buf);
+  test7 (buf);
+
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-string-opt-5.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-string-opt-5.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-string-opt-5.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-string-opt-5.c	2012-02-26 06:14:30.000000000 +0000
@@ -0,0 +1,118 @@
+/*
+   string-opt-5.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Copyright (C) 2000  Free Software Foundation.
+
+   Ensure builtin strlen, strcmp, strchr, strrchr and strncpy
+   perform correctly.
+
+   Written by Jakub Jelinek, 11/7/2000.  */
+
+#include <string.h>
+
+#ifndef __SDCC_mcs51
+// mcs51 small model does not have enough RAM to hold buf.
+int x = 6;
+int y = 1;
+const char *bar = "hi world";
+char buf [64];
+#endif
+
+void
+testTortureExecute (void)
+{
+#ifndef __SDCC_mcs51
+  const char *const foo = "hello world";
+  char dst [64];
+
+  if (strlen (bar) != 8)
+    ASSERT (0);
+  if (strlen (bar + (++x & 2)) != 6)
+    ASSERT (0);
+  if (x != 7)
+    ASSERT (0);;
+  if (strlen (foo + (x++, 6)) != 5)
+    ASSERT (0);
+  if (x != 8)
+    ASSERT (0);
+  if (strlen (foo + (++x & 1)) != 10)
+    ASSERT (0);
+  if (x != 9)
+    ASSERT (0);
+  if (strcmp (foo + (x -= 6), "lo world"))
+    ASSERT (0);
+  if (x != 3)
+    ASSERT (0);
+  if (strcmp (foo, bar) >= 0)
+    ASSERT (0);
+  if (strcmp (foo, bar + (x++ & 1)) >= 0)
+    ASSERT (0);
+  if (x != 4)
+    ASSERT (0);
+  if (strchr (foo + (x++ & 7), 'l') != foo + 9)
+    ASSERT (0);
+  if (x != 5)
+    ASSERT (0);
+  if (strchr (bar, 'o') != bar + 4)
+    ASSERT (0);
+  if (strchr (bar, '\0')  != bar + 8)
+    ASSERT (0);
+  if (strrchr (bar, 'x'))
+    ASSERT (0);
+  if (strrchr (bar, 'o') != bar + 4)
+    ASSERT (0);
+  if (strcmp (foo + (x++ & 1), "ello world" + (--y & 1)))
+    ASSERT (0);
+  if (x != 6 || y != 0)
+    ASSERT (0);
+  dst[5] = ' ';
+  dst[6] = '\0';
+  x = 5;
+  y = 1;
+  if (strncpy (dst + 1, foo + (x++ & 3), 4) != dst + 1
+      || x != 6
+      || strcmp (dst + 1, "ello "))
+    ASSERT (0);
+  memset (dst, ' ', sizeof dst);
+  if (strncpy (dst + (++x & 1), (y++ & 3) + "foo", 10) != dst + 1
+      || x != 7
+      || y != 2
+      || memcmp (dst, " oo\0\0\0\0\0\0\0\0 ", 12))
+    ASSERT (0);
+  memset (dst, ' ', sizeof dst);
+  if (strncpy (dst, "hello", 8) != dst || memcmp (dst, "hello\0\0\0 ", 9))
+    ASSERT (0);
+  x = '!';
+  memset (buf, ' ', sizeof buf);
+  if (memset (buf, x++, ++y) != buf
+      || x != '!' + 1
+      || y != 3
+      || memcmp (buf, "!!!", 3))
+    ASSERT (0);
+  if (memset (buf + y++, '-', 8) != buf + 3
+      || y != 4
+      || memcmp (buf, "!!!--------", 11))
+    ASSERT (0);
+  x = 10;
+  if (memset (buf + ++x, 0, y++) != buf + 11
+      || x != 11
+      || y != 5
+      || memcmp (buf + 8, "---\0\0\0", 7))
+    ASSERT (0);
+
+  if (memset (buf + (x += 4), 0, 6) != buf + 15
+      || x != 15
+      || memcmp (buf + 10, "-\0\0\0\0\0\0\0\0\0", 11))
+    ASSERT (0);
+
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-struct-ini-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-struct-ini-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-struct-ini-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-struct-ini-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   struct-ini-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+#if 0
+struct S
+{
+  char f1;
+  int f2[2];
+};
+
+struct S object = {'X', 8, 9};
+#endif
+
+void
+testTortureExecute (void)
+{
+#if 0
+  if (object.f1 != 'X' || object.f2[0] != 8 || object.f2[1] != 9)
+    ASSERT (0);
+  return;
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-struct-ini-2.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-struct-ini-2.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-struct-ini-2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-struct-ini-2.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+   struct-ini-2.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct {
+  int a:4;
+  int :4;
+  int b:4;
+  int c:4;
+} x = { 2,3,4 };
+
+void
+testTortureExecute (void)
+{
+  if (x.a != 2)
+    ASSERT(0);
+  if (x.b != 3)
+    ASSERT(0);
+  if (x.c != 4)
+    ASSERT(0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-struct-ini-3.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-struct-ini-3.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-struct-ini-3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-struct-ini-3.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+   struct-ini-3.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct
+{
+  unsigned int f1:1, f2:1, f3:3, f4:3, f5:2, f6:1, f7:1;
+} result = {1, 1, 7, 7, 3, 1, 1};
+
+void
+testTortureExecute (void)
+{
+  if ((result.f3 & ~7) != 0 || (result.f4 & ~7) != 0)
+    ASSERT (0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-struct-ini-4.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-struct-ini-4.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-struct-ini-4.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-struct-ini-4.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,27 @@
+/*
+   struct-ini-4.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+struct s {
+  int a[3];
+  int c[3];
+};
+
+struct s s = {
+  .c = {1, 2, 3}
+};
+
+void
+testTortureExecute (void)
+{
+  if (s.c[0] != 1)
+    ASSERT(0);
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-switch-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-switch-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-switch-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-switch-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,65 @@
+/*
+   switch-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+/* Copyright (C) 2003  Free Software Foundation.
+
+   Test that switch statements suitable using case bit tests are
+   implemented correctly.
+
+   Written by Roger Sayle, 01/25/2001.  */
+
+int
+foo (int x)
+{
+  switch (x)
+    {
+    case 4:
+    case 6:
+    case 9:
+    case 11:
+      return 30;
+    }
+  return 31;
+}
+
+void
+testTortureExecute (void)
+{
+  int i, r;
+
+  for (i=-1; i<66; i++)
+    {
+      r = foo (i);
+      if (i == 4)
+        {
+          if (r != 30)
+            ASSERT (0);
+        }
+      else if (i == 6)
+        {
+          if (r != 30)
+            ASSERT (0);
+        }
+      else if (i == 9)
+        {
+          if (r != 30)
+            ASSERT (0);
+        }
+      else if (i == 11)
+        {
+          if (r != 30)
+            ASSERT (0);
+        }
+      else if (r != 31)
+        ASSERT (0);
+    }
+  return;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-unroll-1.c sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-unroll-1.c
--- sdcc-3.1.0+dfsg/support/regression/tests/gcc-torture-execute-unroll-1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/gcc-torture-execute-unroll-1.c	2012-02-22 14:45:17.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   unroll-1.c from the execute part of the gcc torture tests.
+ */
+
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_c99
+#endif
+
+inline int
+f (int x)
+{
+  return (x + 1);
+}
+ 
+void
+testTortureExecute (void)
+{
+  int a = 0 ;
+ 
+  while ( (f(f(f(f(f(f(f(f(f(f(1))))))))))) + a < 12 )
+    {
+      a++;
+      return;
+    }
+  if (a != 1)
+    ASSERT (0);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/genptrs.c sdcc-3.2.0+dfsg/support/regression/tests/genptrs.c
--- sdcc-3.1.0+dfsg/support/regression/tests/genptrs.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/genptrs.c	2012-02-22 14:45:17.000000000 +0000
@@ -34,7 +34,7 @@
 char __code  * cp1 = (char __code *)0x0001;
 void (* fp0)(void) = NULL;
 void (* fp1)(void) = (void (*)(void))0x0001;
-#if defined (SDCC_MODEL_HUGE)
+#if defined (__SDCC_MODEL_HUGE)
 void (* fpE)(void) = (void (*)(void))0x7E8000;	//SDCC assumes banked pointers have physical address != 0
 void (* fpF)(void) = (void (*)(void))0x7F8000;	//choose the banks to be mapped to 0x8000 for the test
 #endif
@@ -43,7 +43,7 @@
 
 void testPtrs(void)
 {
-#if defined (SDCC_MODEL_HUGE)
+#if defined (__SDCC_MODEL_HUGE)
 	char __code  * cp2 = (char __code *)0x0002;
 	void (* fp2)(void) = (void (*)(void))0x0002;
 
@@ -71,7 +71,7 @@
 	ASSERT (eq(xp0, fp0));
 	ASSERT (eq(xp0, gp0));
 
-#if defined(SDCC_mcs51) || defined(SDCC_ds390)
+#if defined(__SDCC_mcs51) || defined(__SDCC_ds390)
 	ASSERT (neq(xp1, ip1));
 	ASSERT (neq(xp1, pp1));
 	ASSERT (neq(xp1, cp1));
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/getbyte.c sdcc-3.2.0+dfsg/support/regression/tests/getbyte.c
--- sdcc-3.1.0+dfsg/support/regression/tests/getbyte.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/getbyte.c	2012-06-10 14:41:08.000000000 +0000
@@ -0,0 +1,29 @@
+/* getbyte/getword
+    sign: unsigned, signed
+*/
+
+#include <testfwk.h>
+#include <stdint.h>
+
+{sign} long global = ({sign} long)0x12345678;
+
+void testGet(void)
+{
+    ASSERT (((global >>  0) & 0xFF) == 0x78);               // getByte 0
+    ASSERT (((global >>  8) & 0xFF) == 0x56);               // getByte 1
+    ASSERT (((global >> 16) & 0xFF) == 0x34);               // getByte 2
+    ASSERT (((global >> 24) & 0xFF) == 0x12);               // getByte 3
+
+    ASSERT (((global >>  0) & 0xFFFF) == 0x5678);           // getWord 0
+    ASSERT (((global >>  8) & 0xFFFF) == 0x3456);           // getWord 1
+    ASSERT (((global >> 16) & 0xFFFF) == 0x1234);           // getWord 2
+
+    ASSERT ((uint8_t)(global >>  0) == (uint8_t)0x78);      // getByte 0
+    ASSERT ((uint8_t)(global >>  8) == (uint8_t)0x56);      // getByte 1
+    ASSERT ((uint8_t)(global >> 16) == (uint8_t)0x34);      // getByte 2
+    ASSERT ((uint8_t)(global >> 24) == (uint8_t)0x12);      // getByte 3
+
+    ASSERT ((uint16_t)(global >>  0) == (uint16_t)0x5678);  // getWord 0
+    ASSERT ((uint16_t)(global >>  8) == (uint16_t)0x3456);  // getWord 1
+    ASSERT ((uint16_t)(global >> 16) == (uint16_t)0x1234);  // getWord 2
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/inline.c sdcc-3.2.0+dfsg/support/regression/tests/inline.c
--- sdcc-3.1.0+dfsg/support/regression/tests/inline.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/inline.c	2012-02-22 14:45:17.000000000 +0000
@@ -3,7 +3,7 @@
 
 #include <testfwk.h>
 
-#ifdef SDCC
+#ifdef __SDCC
 #pragma std_sdcc99
 #endif
 
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/interrupt.c sdcc-3.2.0+dfsg/support/regression/tests/interrupt.c
--- sdcc-3.1.0+dfsg/support/regression/tests/interrupt.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/interrupt.c	2012-02-22 14:45:17.000000000 +0000
@@ -3,7 +3,7 @@
  */
 #include <testfwk.h>
 
-#if defined(SDCC_mcs51)
+#if defined(__SDCC_mcs51)
 
 #include <8052.h>
 
@@ -16,7 +16,7 @@
 void
 testInterrupt (void)
 {
-#if defined(SDCC_mcs51)
+#if defined(__SDCC_mcs51)
   register long x = lC;
 
   //enable the interrupt and set it
@@ -32,7 +32,7 @@
 #endif
 }
 
-#if defined(SDCC_mcs51)
+#if defined(__SDCC_mcs51)
 // Timer2 interrupt service routine
 // with register and (stack)spil usage
 void
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/key.c sdcc-3.2.0+dfsg/support/regression/tests/key.c
--- sdcc-3.1.0+dfsg/support/regression/tests/key.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/key.c	2012-01-29 10:53:55.000000000 +0000
@@ -0,0 +1,15 @@
+/* key.c - a ward to alert us in case obsolete sdcc-specific keywords rise from the dead.
+ */
+
+#include <testfwk.h>
+
+int _asm;
+int _endasm, at, bit, code, critical, data, far,
+eeprom, fixed16x16, flash, idata, interrupt, nonbanked, banked, near,
+pdata, reentrant, shadowregs, wparam, sfr, sfr16, sfr32, sbit, sram,
+using, _naked, xdata, _overlay;
+
+void testBug(void)
+{
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/literalop.c sdcc-3.2.0+dfsg/support/regression/tests/literalop.c
--- sdcc-3.1.0+dfsg/support/regression/tests/literalop.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/literalop.c	2012-02-22 14:45:17.000000000 +0000
@@ -61,7 +61,7 @@
   ASSERT (ss == 0x7e02);
   ss = vuc * vuc;
   ASSERT (ss == (short) 0xfc04);
-#ifdef SDCC
+#ifdef __SDCC
   /* after promotion the result of the multiplication is 'signed int', which overflows! */
   ASSERT(vuc * vuc < 1);
 #endif
@@ -221,3 +221,4 @@
   ASSERT (150  + 150  == 300);
   ASSERT (160u + 160u == 320);
 }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/longlong.c sdcc-3.2.0+dfsg/support/regression/tests/longlong.c
--- sdcc-3.1.0+dfsg/support/regression/tests/longlong.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/longlong.c	2012-04-21 13:19:52.000000000 +0000
@@ -0,0 +1,93 @@
+/** Simple long long tests.
+
+ */
+#include <testfwk.h>
+
+#ifdef __SDCC
+#pragma std_sdcc99
+#pragma disable_warning 85
+#endif
+
+#if !defined(__SDCC_mcs51) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+long long x;
+unsigned long long y;
+int i;
+
+long long g(void)
+{
+  int y = i + 1;
+  return (y);
+}
+
+long long h(void)
+{
+  return (x);
+}
+
+long long c(void)
+{
+  return (12ll);
+}
+
+long long d(int i)
+{
+  return (i);
+}
+
+long long (*gp)(void) = &g;
+#endif
+
+void
+testLongLong (void)
+{
+  volatile unsigned long tmp;
+// Test fils on 32-bit systems.
+//#if !defined(__SDCC_mcs51) && !defined(__SDCC_hc08) && !defined(__SDCC_ds390) && !defined(__SDCC_pic14) && !defined(__SDCC_pic16)
+#if 0
+  i = 42;
+  ASSERT (g() == 43);
+  i = 23;
+  ASSERT ((*gp)() == 24);
+  ASSERT (c() == 12);
+  x = 42;
+  ASSERT (h() == x);
+  ASSERT (d(12) == 12ll);
+  ASSERT ((x >> 1) == 21);
+  ASSERT ((x << 1) == 84);
+  ASSERT (!(x >> 17));
+//  ASSERT ((x << 17) == (42l << 17)); sdcc has broken long long constants!
+  y = x;
+  ASSERT (y == 42ull);
+  ASSERT ((y >> 1) == 21);
+  ASSERT ((y << 1) == 84);
+  ASSERT ((y >> 17) == 0);
+//  ASSERT ((y << 17) == (42ul << 17));
+//  ASSERT ((y << 16) == (42ul << 16));
+
+  tmp = 0xaaffaafful;
+  y = tmp;
+  ASSERT (c() == 12);
+  ASSERT ((unsigned char)y == (unsigned char)tmp);
+  ASSERT ((unsigned int)y == (unsigned int)tmp);
+  ASSERT ((unsigned long)y == (unsigned long)tmp);
+  ASSERT (y == tmp);
+  ASSERT ((y >> 8) == (tmp >>= 8));
+  ASSERT ((y >> 12) == (tmp >>= 4));
+  ASSERT ((y >> 16) == (tmp >>= 4));
+  ASSERT ((y >> 24) == (tmp >>= 8));
+  ASSERT ((y >> 32) == 0x0ul);
+
+  tmp = 1;
+  y = tmp;
+  ASSERT (c() == 12);
+  ASSERT ((y << 1) == 2);
+  ASSERT ((y << 16) == (tmp << 16));
+  ASSERT ((y << 23) == (tmp << 23));
+  y += 2;
+  y <<= 31;
+  ASSERT (c() == 12);
+  y >>= 31;
+  ASSERT (y == 3);
+#endif
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/malloc.c sdcc-3.2.0+dfsg/support/regression/tests/malloc.c
--- sdcc-3.1.0+dfsg/support/regression/tests/malloc.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/malloc.c	2012-02-22 14:45:17.000000000 +0000
@@ -1,12 +1,12 @@
 /* Simple malloc tests.
  */
 #include <stdlib.h>
-#if defined(SDCC_pic16)
+#if defined(__SDCC_pic16)
 #include <malloc.h>
 #endif
 #include <testfwk.h>
 
-#if defined(SDCC_pic16)
+#if defined(__SDCC_pic16)
 __xdata char heap[100];
 #endif
 
@@ -17,8 +17,8 @@
   char *p;
   unsigned char i;
 
-#if !defined(PORT_HOST) && !defined(SDCC_gbz80) && !defined(SDCC_z80)
-#if defined(SDCC_pic16)
+#if !defined(PORT_HOST) && !defined(__SDCC_gbz80) && !defined(__SDCC_z80)
+#if defined(__SDCC_pic16)
   _initHeap (heap, sizeof heap);
 #endif
 
@@ -86,3 +86,4 @@
   LOG (("p3, after freeing p2: %u\n", (unsigned) p3));
 #endif
 }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/memory.c sdcc-3.2.0+dfsg/support/regression/tests/memory.c
--- sdcc-3.1.0+dfsg/support/regression/tests/memory.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/memory.c	2012-05-21 21:40:35.000000000 +0000
@@ -6,13 +6,21 @@
 
 unsigned char destination[4];
 const unsigned char source[4] = {0, 1, 2, 3};
+int c;
 
 void testmemory(void)
 {
   volatile size_t zero = 0;
   volatile size_t one = 1;
 
+  ASSERT(source[0] == 0);
+
   /* Test memset() */
+  c = 8;
+  memset(destination, c, one);
+  ASSERT(destination[0] == 8);
+  memset(destination, c, 3);
+  ASSERT(destination[2] == 8);
   destination[3] = 23;
   memset(destination, 42, 3);
   ASSERT(destination[0] == 42);
@@ -52,9 +60,8 @@
   ASSERT(destination[3] == source[2]);
 
   /* Test memchr() */
-  /* memchr() is not yet supported by sdcc.
   ASSERT(NULL == memchr(destination, 5, 4));
-  ASSERT(destination == memchr(destination, 0, 4));
+  /*ASSERT(destination == memchr(destination, 0, 4));
   ASSERT(destination + 3 == memchr(destination, 3, 4));*/
 
   ASSERT(strlen("test") == 4);
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/preproc.c sdcc-3.2.0+dfsg/support/regression/tests/preproc.c
--- sdcc-3.1.0+dfsg/support/regression/tests/preproc.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/preproc.c	2012-02-22 14:45:17.000000000 +0000
@@ -10,7 +10,7 @@
  * the following tests are applicable only for SDCC,
  * since they are using SDCC specific pragmas
  */
-#ifdef SDCC
+#ifdef __SDCC
 /*
  * test for bug 135170
  */
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/setjmp.c sdcc-3.2.0+dfsg/support/regression/tests/setjmp.c
--- sdcc-3.1.0+dfsg/support/regression/tests/setjmp.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/setjmp.c	2012-05-21 12:05:21.000000000 +0000
@@ -6,7 +6,7 @@
 unsigned int global_int = 0;
 unsigned int *gpInt;
 
-#if defined(SDCC_mcs51)
+#if defined(__SDCC_mcs51)
 #include <8052.h>
 
 void
@@ -17,7 +17,7 @@
 }
 #endif
 
-#if defined(SDCC_mcs51) || defined(SDCC_z80) || defined(PORT_HOST)
+#if defined(__SDCC_mcs51) || defined(__SDCC_z80) || defined(__SDCC_z180) || defined(__SDCC_r2k) || defined(__SDCC_r3ka) || defined(PORT_HOST)
 
 void
 try_fun (jmp_buf catch, int except)
@@ -50,11 +50,11 @@
 void
 testJmp (void)
 {
-#if defined(SDCC_mcs51) || defined(SDCC_z80) || defined(PORT_HOST)
+#if defined(__SDCC_mcs51) || defined(__SDCC_z80) || defined(__SDCC_z180) || defined(__SDCC_r2k) || defined(__SDCC_r3ka) || defined(PORT_HOST)
   jmp_buf catch;
   int exception;
 
-#if defined(SDCC_mcs51)
+#if defined(__SDCC_mcs51)
   gpInt = &global_int;
   //enable the interrupt and set it's flag to generate some heavy stack usage
   ET2 = 1;
@@ -77,7 +77,7 @@
 //  ASSERT(0);
 //#endif
 
-#if defined(SDCC_mcs51) || defined(SDCC_z80) || defined(PORT_HOST)
+#if defined(__SDCC_mcs51) || defined(__SDCC_z80) || defined(__SDCC_z180) || defined(__SDCC_r2k) || defined(__SDCC_r3ka) || defined(PORT_HOST)
   f1();
 #endif
 }
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/sfr16.c sdcc-3.2.0+dfsg/support/regression/tests/sfr16.c
--- sdcc-3.1.0+dfsg/support/regression/tests/sfr16.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/sfr16.c	2012-03-18 10:34:03.000000000 +0000
@@ -4,22 +4,22 @@
 
 #include <testfwk.h>
 
-#if defined (SDCC_mcs51)
+#if defined (__SDCC_mcs51)
   __sfr __at 0x8A SFR_LSB;        //timer 0 low byte
   __sfr __at 0x8C SFR_MSB;        //timer 0 high byte
   __sfr16 __at 0x8C8A SFR_16;     //timer 0
   __sfr32 __at 0x8C8ACDCC SFR_32; //timer 0 & 2
-#elif defined (SDCC_ds390)
+#elif defined (__SDCC_ds390)
   __sfr __at 0x8B SFR_LSB;        //timer 1 low byte
   __sfr __at 0x8D SFR_MSB;        //timer 1 high byte
   __sfr16 __at 0x8D8B SFR_16;     //timer 1
-  __sfr32 __at 0x8D8BCDCC SFR_32; //timer 1 & 2
+  __sfr32 __at 0x8D8B8090 SFR_32; //timer 1 & P4 & P1
 #endif
 
 void
 test_sfr (void)
 {
-#if defined (SFR_16)
+#if defined (__SDCC_mcs51) || defined (__SDCC_ds390)
   SFR_16 = 0x00FE;
   ASSERT (SFR_MSB == 0x00);
   ASSERT (SFR_LSB == 0xFE);
@@ -40,3 +40,4 @@
   ASSERT (SFR_32 == 0x10305070);
 #endif
 }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/shifts.c sdcc-3.2.0+dfsg/support/regression/tests/shifts.c
--- sdcc-3.1.0+dfsg/support/regression/tests/shifts.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/shifts.c	2012-03-29 14:41:25.000000000 +0000
@@ -110,3 +110,4 @@
     ASSERT(ShiftLeftByParam(2)  == ({type})({vals} << 2));
     ASSERT(ShiftRightByParam(2) == ({type})({vals} >> 2));
 }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/simplefloat.c sdcc-3.2.0+dfsg/support/regression/tests/simplefloat.c
--- sdcc-3.1.0+dfsg/support/regression/tests/simplefloat.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/simplefloat.c	2012-02-22 14:45:17.000000000 +0000
@@ -30,7 +30,7 @@
 void
 testDiv (void)
 {
-#if defined (__mcs51) && !defined (SDCC_STACK_AUTO)
+#if defined (__SDCC_mcs51) && !defined (__SDCC_STACK_AUTO)
   __idata __at 0xd0
 #endif
   volatile float left;
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/snprintf.c sdcc-3.2.0+dfsg/support/regression/tests/snprintf.c
--- sdcc-3.1.0+dfsg/support/regression/tests/snprintf.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/snprintf.c	2012-02-22 14:45:17.000000000 +0000
@@ -37,10 +37,10 @@
   {01234, "%o(oct)", "1234(oct)"},
 
   // do we want to check these:
-#if defined(SDCC) && !defined(SDCC_z80) && CHECK_B
+#if defined(__SDCC) && !defined(__SDCC_z80) && CHECK_B
   {0x4142, "%bc %bx", "\x41 42"},       /* non-std: print as bytes! */
   {0xfffe, "0x%02bX%02bx", "0xFFfe"},   /* non-std: print as bytes! */
-#elif defined(SDCC) && defined(SDCC_z80) && CHECK_B
+#elif defined(__SDCC) && defined(__SDCC_z80) && CHECK_B
   {0x4142, "%bc %bx", "\x42 41"},       /* non-std: print as bytes! */
   {0xfffe, "0x%02bX%02bx", "0xFEff"},   /* non-std: print as bytes! */
 #endif
@@ -102,7 +102,7 @@
 } static const cases[] = {
   // arg, fmt,    result
   // ... there should be more ...
-#if defined(SDCC) && !defined(SDCC_ds390) && !(defined(SDCC_mcs51) && (defined(SDCC_USE_XSTACK) || defined(SDCC_MODEL_HUGE)))
+#if defined(__SDCC) && !defined(__SDCC_ds390) && !(defined(__SDCC_mcs51) && (defined(__SDCC_USE_XSTACK) || defined(__SDCC_MODEL_HUGE)))
   {1.0, "%f", "<NO FLOAT>"},
 #else
   {1.0, "%f", "1.000000"},
@@ -135,3 +135,4 @@
 
   ASSERT (buf[sizeof buf - 10] == 0xfe);        /* check for cookie */
 }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/stacks.c sdcc-3.2.0+dfsg/support/regression/tests/stacks.c
--- sdcc-3.1.0+dfsg/support/regression/tests/stacks.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/stacks.c	2012-02-22 14:45:17.000000000 +0000
@@ -20,7 +20,7 @@
 {
   volatile char above;
   volatile char above2;
-#ifndef __mcs51
+#ifndef __SDCC_mcs51
   volatile char ac[{size}];
 #else
   volatile char ac[{size} - 100];
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/staticinit.c sdcc-3.2.0+dfsg/support/regression/tests/staticinit.c
--- sdcc-3.1.0+dfsg/support/regression/tests/staticinit.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/staticinit.c	2012-02-22 14:45:17.000000000 +0000
@@ -28,7 +28,7 @@
   ASSERT (smallDense[5] == 6);
 }
 
-#ifdef SDCC_mcs51
+#ifdef __SDCC_mcs51
 __idata  __at 0xa0	/* leave space for the stack */
 #endif
 static {type} smallSparse[] = {
@@ -49,7 +49,7 @@
   ASSERT (smallSparse[8] == 1);
 }
 
-#ifdef SDCC_mcs51
+#ifdef __SDCC_mcs51
 __idata __at 0xd0
 #endif
 static {type} smallSparseZero[] = {
@@ -76,9 +76,9 @@
   ASSERT (smallSparseZeroTail[0] == 1);
 }
 
-#ifdef SDCC_mcs51
+#ifdef __SDCC_mcs51
 __xdata
-#elif SDCC_pic16
+#elif __SDCC_pic16
 __code
 #endif
 static {type} largeMixed[] = {
@@ -133,3 +133,4 @@
   ASSERT (largeMixed[143+8+1] == 4);
   ASSERT (largeMixed[143+16+1] == 4);
 }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/strcmp.c sdcc-3.2.0+dfsg/support/regression/tests/strcmp.c
--- sdcc-3.1.0+dfsg/support/regression/tests/strcmp.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/strcmp.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-/** tests for strcmp
-*/
-#include <testfwk.h>
-#include <string.h>
-
-static void 
-teststrcmp(void)
-{
-  int result = strcmp("", "");
-  ASSERT( result == 0);
-  
-  result = strcmp("", "a");
-  ASSERT( result < 0);
-
-  result = strcmp("a", "");
-  ASSERT( result > 0);
-
-  result = strcmp("ab", "ab");
-  ASSERT( result == 0);
-
-  result = strcmp("aa", "ab");
-  ASSERT( result < 0);
-}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/strcpy.c sdcc-3.2.0+dfsg/support/regression/tests/strcpy.c
--- sdcc-3.1.0+dfsg/support/regression/tests/strcpy.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/strcpy.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-/** tests for strcpy
-*/
-#include <testfwk.h>
-#include <string.h>
-
-static void 
-teststrcpy(void)
-{
-  static char empty[] = "";
-  static char string[] = "\1\2\0\3";
-  char buf[40] = "abcdefghijklmnopqrstuvwxyz";
-
-  char * result = strcpy(buf, empty);
-  ASSERT( strlen(buf) == 0);
-  ASSERT( result == buf);
-
-  result = strcpy(buf, string);
-  ASSERT( result == buf);
-  ASSERT( strlen(buf) == 2);
-  ASSERT( buf[0] == '\1');
-  ASSERT( buf[1] == '\2');
-  ASSERT( buf[3] == 'd');
-}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/string.c sdcc-3.2.0+dfsg/support/regression/tests/string.c
--- sdcc-3.1.0+dfsg/support/regression/tests/string.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/string.c	2012-04-11 08:16:36.000000000 +0000
@@ -0,0 +1,172 @@
+/** tests for strXXX
+*/
+#include <testfwk.h>
+#include <string.h>
+
+/** tests for strcmp
+*/
+static void 
+do_teststrcmp (void)
+{
+  int result = strcmp ("", "");
+  ASSERT (result == 0);
+  
+  result = strcmp ("", "a");
+  ASSERT (result < 0);
+
+  result = strcmp ("a", "");
+  ASSERT (result > 0);
+
+  result = strcmp ("ab", "ab");
+  ASSERT (result == 0);
+
+  result = strcmp ("aa", "ab");
+  ASSERT (result < 0);
+}
+
+/** tests for strcpy
+*/
+static void 
+do_teststrcpy (void)
+{
+  static char empty[] = "";
+  static char string[] = "\1\2\0\3";
+  char buf[40] = "abcdefghijklmnopqrstuvwxyz";
+
+  char * result = strcpy (buf, empty);
+  ASSERT (strlen (buf) == 0);
+  ASSERT (result == buf);
+
+  result = strcpy (buf, string);
+  ASSERT (result == buf);
+  ASSERT (strlen (buf) == 2);
+  ASSERT (buf[0] == '\1');
+  ASSERT (buf[1] == '\2');
+  ASSERT (buf[3] == 'd');
+}
+
+/** tests for strncmp
+*/
+static void 
+do_teststrncmp (void)
+{
+  ASSERT (strncmp ("", "", 0) == 0);
+  ASSERT (strncmp ("ab", "ab", 0) == 0);
+  ASSERT (strncmp ("a", "a", 2) == 0);
+  ASSERT (strncmp ("aa", "ab", 1) == 0);
+  ASSERT (strncmp ("aa", "ab", 2) < 0);
+  ASSERT (strncmp ("abc", "abd", 2) == 0);
+  ASSERT (strncmp ("abc", "abc", 3) == 0);
+}
+
+/** tests for strpbrk
+ * related to bug #2908537
+*/
+static void
+do_teststrpbrk (void)
+{
+  const char *a = "test";
+
+  ASSERT (strpbrk (a, "e")  == &a[1] );
+  ASSERT (strpbrk (a, "z")  == NULL );
+  ASSERT (strpbrk (a, "et") == &a[0] );
+  ASSERT (strpbrk (a, "ze") == &a[1] );
+  ASSERT (strpbrk (a, "")   == NULL );
+  ASSERT (strpbrk ("", "e") == NULL );
+  ASSERT (*strpbrk ("test2", "s") == 's' );
+}
+
+/** tests for strrchr
+*/
+static void
+do_teststrrchr (void)
+{
+  const char *test = "test";
+
+  ASSERT (strrchr (test, 0) == test + 4);
+  ASSERT (strrchr (test, 't') == test + 3);
+  ASSERT (strrchr (test, 'e') == test + 1);
+}
+
+/** tests for strstr
+*/
+static void 
+do_teststrstr (void)
+{
+  const char *a = "aabbcd";
+  ASSERT (strstr (a, "\0\1") == a);
+  ASSERT (strstr (a, "") == a);
+  ASSERT (strstr (a, "ab") == &a[1]);
+  ASSERT (strstr (a, "abc") == NULL);
+  ASSERT (strstr (a, "abbc") == &a[1]);
+  ASSERT (strstr ("", "abbc") == NULL);
+/* ASSERT (strstr ("", "") == a); should work, but it doesn't */
+  ASSERT (strstr (a, "cd") == &a[4]);
+}
+
+/** tests for strspn
+*/
+static void 
+do_teststrspn (void)
+{
+  ASSERT (strspn("aabbcd", "ab") == 4);
+  ASSERT (strspn("abbacd", "") == 0);
+  ASSERT (strspn("abbacd", "ac") == 1);
+  ASSERT (strspn("abbacd", "x") == 0);
+  ASSERT (strspn("abbacd", "c") == 0);
+  ASSERT (strspn("abbacd", "cba") == 5);
+  ASSERT (strspn("abbacd", "cdba") == 6);
+}
+
+/** tests for strtok
+*/
+static void
+do_teststrtok (void)
+{
+  static char str[] = "?a???b,,,#c";
+  char str2[] = "axaaba";
+  char *token = strtok (str, "?"); // 'token' points to the token "a"
+  ASSERT (token == &str[1] && 0 == strcmp (token,"a"));
+  token = strtok (NULL, ","); // 'token' points to the token "??b"
+  ASSERT (token == &str[3] && 0 == strcmp (token,"??b"));
+  token = strtok (NULL, "#,"); // 'token' points to the token "c"
+  ASSERT (token == &str[10] && 0 == strcmp (token,"c"));
+  token = strtok (NULL, "?"); // 'token' is a null pointer
+  ASSERT (token == NULL);
+
+  token = strtok (str2, "ab");
+  ASSERT (token && 0 == strcmp (token, "x"));
+  token = strtok (NULL, "ab");
+  ASSERT (token == NULL);
+#if !defined (__SUNPRO_C) && !defined (__sun__)
+  /* SunPro C compiler and GCC on Solaris have problem with strtok-ing after NULL */
+  token = strtok (NULL, "a");
+  ASSERT (token == NULL);
+#endif
+}
+
+/** tests for multibyte character sets
+ * related to bug #3506236
+*/
+static void
+do_multibyte (void)
+{
+  const char *str = "��";
+
+  ASSERT (str[0] == '\xd4');
+  ASSERT (str[1] == '\xc2');
+}
+
+static void
+teststr (void)
+{
+  do_teststrcmp ();
+  do_teststrcpy ();
+  do_teststrncmp ();
+  do_teststrpbrk ();
+  do_teststrrchr ();
+  do_teststrstr ();
+  do_teststrspn ();
+  do_teststrtok ();
+  do_multibyte ();
+}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/strncmp.c sdcc-3.2.0+dfsg/support/regression/tests/strncmp.c
--- sdcc-3.1.0+dfsg/support/regression/tests/strncmp.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/strncmp.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-/** tests for strncmp
-*/
-#include <testfwk.h>
-#include <string.h>
-
-static void 
-teststrncmp(void)
-{
-  ASSERT( strncmp("", "", 0) == 0);
-  ASSERT( strncmp("ab", "ab", 0) == 0);
-  ASSERT( strncmp("a", "a", 2) == 0);
-  ASSERT( strncmp("aa", "ab", 1) == 0);
-  ASSERT( strncmp("aa", "ab", 2) < 0);
-  ASSERT( strncmp("abc", "abd", 2) == 0);
-  ASSERT( strncmp("abc", "abc", 3) == 0);
-}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/strpbrk.c sdcc-3.2.0+dfsg/support/regression/tests/strpbrk.c
--- sdcc-3.1.0+dfsg/support/regression/tests/strpbrk.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/strpbrk.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-/** tests for strpbrk
- * related to bug #2908537
-*/
-#include <testfwk.h>
-#include <string.h>
-
-static void
-teststrpbrk(void)
-{
-  const char *a = "test";
-
-  ASSERT( strpbrk(a, "e")  == &a[1] );
-  ASSERT( strpbrk(a, "z")  == NULL );
-  ASSERT( strpbrk(a, "et") == &a[0] );
-  ASSERT( strpbrk(a, "ze") == &a[1] );
-  ASSERT( strpbrk(a, "")   == NULL );
-  ASSERT( strpbrk("", "e") == NULL );
-  ASSERT( *strpbrk("test2", "s") == 's' );
-}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/strspn.c sdcc-3.2.0+dfsg/support/regression/tests/strspn.c
--- sdcc-3.1.0+dfsg/support/regression/tests/strspn.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/strspn.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-/** tests for strspn
-*/
-#include <testfwk.h>
-#include <string.h>
-
-static void 
-teststrspn(void)
-{
-  ASSERT( strspn("aabbcd", "ab") == 4);
-  ASSERT( strspn("abbacd", "") == 0);
-  ASSERT( strspn("abbacd", "ac") == 1);
-  ASSERT( strspn("abbacd", "x") == 0);
-  ASSERT( strspn("abbacd", "c") == 0);
-  ASSERT( strspn("abbacd", "cba") == 5);
-  ASSERT( strspn("abbacd", "cdba") == 6);
-}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/strstr.c sdcc-3.2.0+dfsg/support/regression/tests/strstr.c
--- sdcc-3.1.0+dfsg/support/regression/tests/strstr.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/strstr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-/** tests for strstr
-*/
-#include <testfwk.h>
-#include <string.h>
-
-static void 
-teststrstr(void)
-{
-  const char *a = "aabbcd";
-  ASSERT( strstr(a, "\0\1") == a);
-  ASSERT( strstr(a, "") == a);
-  ASSERT( strstr(a, "ab") == &a[1]);
-  ASSERT( strstr(a, "abc") == NULL);
-  ASSERT( strstr(a, "abbc") == &a[1]);
-  ASSERT( strstr("", "abbc") == NULL);
-/* ASSERT( strstr("", "") == a); should work, but it doesn't */
-  ASSERT( strstr(a, "cd") == &a[4]);
-}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/strtok.c sdcc-3.2.0+dfsg/support/regression/tests/strtok.c
--- sdcc-3.1.0+dfsg/support/regression/tests/strtok.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/strtok.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-/** tests for strtok
-*/
-#include <testfwk.h>
-#include <string.h>
-
-static void
-teststrtok(void)
-{
-  static char str[] = "?a???b,,,#c";
-  char str2[] = "axaaba";
-  char *token = strtok(str, "?"); // 'token' points to the token "a"
-  ASSERT( token == &str[1] && 0 == strcmp(token,"a"));
-  token = strtok(NULL, ","); // 'token' points to the token "??b"
-  ASSERT( token == &str[3]&& 0 == strcmp(token,"??b"));
-  token = strtok(NULL, "#,"); // 'token' points to the token "c"
-  ASSERT( token == &str[10] && 0 == strcmp(token,"c"));
-  token = strtok(NULL, "?"); // 'token' is a null pointer
-  ASSERT( token == NULL);
-
-  token = strtok (str2, "ab");
-  ASSERT( token && 0 == strcmp (token, "x"));
-  token = strtok(NULL, "ab");
-  ASSERT( token == NULL);
-#if !defined (__SUNPRO_C) && !defined (__sun__)
-  /* SunPro C compiler and GCC on Solaris have problem with strtok-ing after NULL */
-  token = strtok(NULL, "a");
-  ASSERT( token == NULL);
-#endif
-}
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/structscope.c sdcc-3.2.0+dfsg/support/regression/tests/structscope.c
--- sdcc-3.1.0+dfsg/support/regression/tests/structscope.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/structscope.c	2012-03-04 10:14:57.000000000 +0000
@@ -0,0 +1,72 @@
+/* Test struct scoping rules
+
+ */
+
+#include <testfwk.h>
+
+/* declare an incomplete struct type */
+struct tag2;
+
+struct tag1 {
+  struct tag1 *mykind;
+  unsigned char x;
+  unsigned char y;
+  struct tag2 *other;
+} s1;
+
+/* complete the previously incomplete type */
+struct tag2 {
+  unsigned char z;
+  struct tag1 *other;
+} s2;
+
+void
+test_global(void)
+{
+  s1.mykind = &s1;
+  s1.other = &s2;
+  s2.other = &s1;
+  s1.x = 1;
+  s1.y = 2;
+  s2.z = 3;
+  ASSERT(s2.other->x == 1);
+  ASSERT(s1.other->z == 3);
+  ASSERT(s1.other->other->y == 2);
+  ASSERT(s1.mykind->y == 2);
+}
+
+void
+test_nested(void)
+{
+  {
+    struct tag1 {
+      unsigned char a;
+    } ls1;
+    ls1.a=1;
+  }
+  {
+    struct tag1 ls2; /* should bind to global level tag1 */
+    ls2.x=2;
+  }
+  {
+    struct tag1 {
+      unsigned char b;
+      struct tag2 *globals2; /* should bind to global level tag2 */
+    } ls3;
+    ls3.b = 3;
+    ls3.globals2 = &s2;
+  }
+  {
+    struct tag2; /* incomplete local tag */
+    struct tag1 {
+      struct tag2 *locals2; /* should bind to local level s2 tag */
+    } ls4;
+    struct tag2 {
+      unsigned char c;
+    } ls5;
+
+    ls4.locals2 = &ls5;
+    ls4.locals2->c = 9;
+  }
+  s1.x = 0;
+} 
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/swap.c sdcc-3.2.0+dfsg/support/regression/tests/swap.c
--- sdcc-3.1.0+dfsg/support/regression/tests/swap.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/swap.c	2012-02-22 14:45:17.000000000 +0000
@@ -8,7 +8,7 @@
 
 #define SWAP_4(x) ((unsigned char)((x)<<4)|(unsigned char)((x)>>4))
     
-#ifdef SDCC
+#ifdef __SDCC
 typedef unsigned int uint16;
 typedef unsigned long uint32;
 #else
@@ -47,7 +47,7 @@
     x.i = SWAP_8(x.i);
     ASSERT( x.i == SWAP_8(TEST_VECT_16));
 
-#if defined (SDCC_mcs51)
+#if defined (__SDCC_mcs51)
     /* this was filed as bug #1638622 (rejected) */
     x.i = t;
     x.i = x.c[1] + 256*x.c[0];
@@ -104,9 +104,9 @@
 /* now for something ugly */
 static void testSwap_16_ptr(void)
 {
-#if defined (SDCC)
+#if defined (__SDCC)
 #include <sdcc-lib.h> /* just to get _AUTOMEM or _STATMEM */
-#if defined (SDCC_STACK_AUTO)
+#if defined (__SDCC_STACK_AUTO)
 #define MY_STATIC static
 #else
 #define MY_STATIC
@@ -139,3 +139,4 @@
    testSwap_16();
    testSwap_16_ptr();
 }
+
diff -Nru sdcc-3.1.0+dfsg/support/regression/tests/using.c sdcc-3.2.0+dfsg/support/regression/tests/using.c
--- sdcc-3.1.0+dfsg/support/regression/tests/using.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/regression/tests/using.c	2012-02-22 14:45:17.000000000 +0000
@@ -5,7 +5,7 @@
 
 #define _{using}
 
-#if defined (SDCC_mcs51) && defined (SDCC_MODEL_SMALL)
+#if defined (__SDCC_mcs51) && defined (__SDCC_MODEL_SMALL)
 
   #ifndef _no_proto
     #if defined (_both)
@@ -28,7 +28,7 @@
 void
 testUsing (void)
 {
-#if defined (SDCC_mcs51) && defined (SDCC_MODEL_SMALL)
+#if defined (__SDCC_mcs51) && defined (__SDCC_MODEL_SMALL)
   ASSERT ((unsigned char)(&array[0]) >= 0x10);
   ASSERT ((unsigned char)&__numTests >= 0x10);
 #endif
diff -Nru sdcc-3.1.0+dfsg/support/scripts/gen_known_bugs.pl sdcc-3.2.0+dfsg/support/scripts/gen_known_bugs.pl
--- sdcc-3.1.0+dfsg/support/scripts/gen_known_bugs.pl	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/scripts/gen_known_bugs.pl	2011-11-28 18:34:35.000000000 +0000
@@ -1,6 +1,6 @@
 # gen_known_bugs.pl - generate knownbugs.html
 #
-# Copyright (c) 2007 - 2008 Borut Razem
+# Copyright (c) 2007-2011 Borut Razem
 #
 # This file is part of sdcc.
 #
@@ -30,26 +30,41 @@
 use HTML::TreeBuilder;
 
 
-my @headerList = ('Request ID', 'Summary', 'Open Date', 'Priority', 'Status', 'Assigned To', 'Submitted By');
+# trim function to remove whitespace from the start and end of the string
+sub trim($)
+{
+  my $string = shift;
+  $string =~ s/^\s+//;
+  $string =~ s/\s+$//;
+  return $string;
+}
 
 
+my @headerList = ('ID', 'Summary', 'Status', 'Opened', 'Assignee', 'Submitter', 'Resolution', 'Priority');
+
 # check if the line is a correct header
 sub is_header($)
 {
   my ($line) = @_;
   
   if (ref($line)) {
-    my $i = 0;
-    foreach ($line->look_down('_tag', 'td')) {
-      if ($_->as_text() ne $headerList[$i++]) {
+    my @headers = $line->look_down('_tag', 'th');
+    foreach my $header (@headerList) {
+      my $found = 0;
+      foreach (@headers) {
+        my $content = trim($_->as_text());
+        if ($content eq $header) {
+          $found = 1;
+          last;
+        }
+      }
+      if (!$found) {
         return 0;
       }
     }
     return 1;
   }
-  else {
-    return 0;
-  }
+  return 0;
 }
 
 
@@ -70,31 +85,31 @@
 
   my $i = 0;
   foreach ($line->look_down('_tag', 'td')) {
-    if ($i == 0) {
-      # remove nowrap attribute from 'Request ID' field
-      $_->attr('nowrap', undef);
-    }
-    elsif ($i == 1) {
+    #if ($headerList[$i] == 'ID') {
+    #  # remove nowrap attribute from 'Request ID' field
+    #  $_->attr('nowrap', undef);
+    #}
+    if ($headerList[$i] eq 'Summary') {
       # convert relative to absolute href in the 'Summary' field
       foreach ($_->look_down('_tag', 'a')) {
         my $attr = $_->attr('href');
-        if (defined($attr) && $attr =~ m!^/tracker/index.php?!) {
+        if (defined($attr) && $attr =~ m!^/tracker/?!) {
           $_->attr('href', 'http://sourceforge.net' . $attr);
         }
       }
     }
-    elsif ($i == 2) {
-      # remove text formatting from 'Open Date' field
-      my $text = $_->as_text();
-      $text =~ s/^\W*\**\W//;
-      $_->delete_content();
-      $_->push_content($text);
-    }
-    elsif ($i == 4) {
-      # remove the 'Status' field
+    #elsif ($headerList[$i] == 'Opened') {
+    #  # remove text formatting from 'Open Date' field
+    #  my $text = $_->as_text();
+    #  $text =~ s/^\W*\**\W//;
+    #  $_->delete_content();
+    #  $_->push_content($text);
+    #}
+    elsif ($headerList[$i] eq 'Status' || $headerList[$i] eq 'Resolution') {
+      # don't print Status and Resolution columns
       $_->delete();
     }
-    elsif ($i == 5 || $i == 6) {
+    elsif ($headerList[$i] eq 'Assignee' || $headerList[$i] eq 'Submitter') {
       # remove hrefs in 'Assigned To' and 'Submitted By' fields
       foreach ($_->look_down('_tag', 'a')) {
        $_->replace_with($_->as_text());
@@ -118,11 +133,12 @@
   # find table with the required header
   my $lines = 0;
   foreach my $table ($tree->look_down('_tag', 'table')) {
-    my @lines = $table->content_list();
-    if (is_header($lines[0])) {
-      shift(@lines);  #remove the header
+    my $thead = $table->look_down('_tag', 'thead');
+    if (is_header($thead)) {
+      my $tbody = $table->look_down('_tag', 'tbody');
+      my @lines = $tbody->content_list();
 
-      # process the following lines in table
+      # process the lines in table
       # if they have required number of fields
       foreach my $line (@lines) {
         if (ref($line) && has_all_fields($line)) {
@@ -157,6 +173,17 @@
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <title>SourceForge.net: Known Bugs</title>
+    <style type="text/css">
+      .p1 {background-color: #9ff;}
+      .p2 {background-color: #cff;}
+      .p3 {background-color: #9fc;}
+      .p4 {background-color: #cfc;}
+      .p5 {background-color: #cf9;}
+      .p6 {background-color: #ffc;}
+      .p7 {background-color: #ff9;}
+      .p8 {background-color: #fc9;}
+      .p9 {background-color: #fcc; color: #300;}
+    </style>
   </head>
   <body>
     <h2>Small Device C Compiler - Release $version Known Bug List</h2>
@@ -166,14 +193,15 @@
     </ul>
     <table width="100%" border="0" cellspacing="2" cellpadding="3">
       <tr bgcolor="#ffffff">
-        <td align="center"><font color="#000000"><b>Request ID</b></font></td>
-        <td align="center"><font color="#000000"><b>Summary</b></font></td>
-        <td align="center"><font color="#000000"><b>Open Date</b></font></td>
-        <td align="center"><font color="#000000"><b>Priority</b></font></td>
-        <td align="center"><font color="#000000"><b>Assigned To</b></font></td>
-        <td align="center"><font color="#000000"><b>Submitted By</b></font></td>
-      </tr>
 EOF
+
+  foreach my $header (@headerList) {
+    # don't print Status and Resolution columns
+    if ($header ne 'Status' && $header ne 'Resolution') {
+      print('        <td align="center"><font color="#000000"><b>' . $header . "</b></font></td>\n");
+    }
+  }
+  print("      </tr>\n");
 }
 
 
@@ -187,15 +215,15 @@
     <p><b>Priority Colors:</b></p>
     <table border="0">
       <tr>
-        <td bgcolor="#dadada">1</td>
-        <td bgcolor="#dad0d0">2</td>
-        <td bgcolor="#dacaca">3</td>
-        <td bgcolor="#dac0c0">4</td>
-        <td bgcolor="#dababa">5</td>
-        <td bgcolor="#dab0b0">6</td>
-        <td bgcolor="#daaaaa">7</td>
-        <td bgcolor="#da9090">8</td>
-        <td bgcolor="#da8a8a">9</td>
+        <td class="p1">1</td>
+        <td class="p2">2</td>
+        <td class="p3">3</td>
+        <td class="p4">4</td>
+        <td class="p5">5</td>
+        <td class="p6">6</td>
+        <td class="p7">7</td>
+        <td class="p8">8</td>
+        <td class="p9">9</td>
       </tr>
     </table>
   </body>
@@ -207,26 +235,27 @@
 
 # main procedure
 {
-  my $url = "http://sourceforge.net/tracker/index.php?func=browse&group_id=599&atid=100599&set=custom&_assigned_to=0&_status=1&_category=100&_group=100&order=artifact_id&sort=DESC&offset=";
+  my $firstUrl = "http://sourceforge.net/tracker/?func=&group_id=599&atid=100599&assignee=&status=Open&category=&artgroup=&keyword=&submitter=&artifact_id=&assignee=&status=1&category=&artgroup=&submitter=&keyword=&artifact_id=&submit=Filter&limit=%d";
+  my $nextUrl = "http://sourceforge.net/tracker/?words=tracker_browse&group_id=599&atid=100599&assignee=&status=1&category=&artgroup=&keyword=&submitter=&artifact_id=&offset=%d";
 
   if ($#ARGV != 0) {
     printf("Usage: gen_known_bugs.pl <version>\n");
     exit(1);
   }
 
+  my $limit = 100;
+
   # get the SDCC version number from command line
   my $version = $ARGV[0];
 
-  my $lines = 0;  # number of lines
-
   # print HTML header
   print_header($version);
 
   # get pages from SF bug tracker
-  for (my $i = 0; my $html = get($url . $i); $i += 50) {
-    # and process them
-    last if (!(my $myLines = process_page($html)));
-    $lines += $myLines;
+  # and process them
+  my $lines = 0;
+  while (my $linesRead = process_page(get(($lines == 0) ? sprintf($firstUrl, $limit) : sprintf($nextUrl, $lines)))) {
+    $lines += $linesRead;
   }
 
   # print HTML footer
diff -Nru sdcc-3.1.0+dfsg/support/scripts/inc2h-pic16.pl sdcc-3.2.0+dfsg/support/scripts/inc2h-pic16.pl
--- sdcc-3.1.0+dfsg/support/scripts/inc2h-pic16.pl	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/scripts/inc2h-pic16.pl	2012-03-10 16:04:30.000000000 +0000
@@ -85,6 +85,21 @@
  *
  * It has been automatically generated by $SCRIPT,
  * (c) 2007 by Raphael Neider <rneider AT web.de>
+ *
+ * SDCC is licensed under the GNU Public license (GPL) v2. Note that
+ * this license covers the code to the compiler and other executables,
+ * tbut explicitly does not cover any code or objects generated by sdcc.
+ *
+ * For pic device libraries and header files which are derived from
+ * Microchip header (.inc) and linker script (.lkr) files Microchip
+ * requires that "The header files should state that they are only to be
+ * used with authentic Microchip devices" which makes them incompatible
+ * with the GPL. Pic device libraries and header files are located at
+ * non-free/lib and non-free/include directories respectively.
+ * Sdcc should be run with the --use-non-free command line option in
+ * order to include non-free header files and libraries.
+ *
+ * See http://sdcc.sourceforge.net/ for the latest information on sdcc.
  */
 
 #ifndef __PIC${proc}_H__
@@ -102,6 +117,21 @@
  *
  * It has been automatically generated by $SCRIPT,
  * (c) 2007 by Raphael Neider <rneider AT web.de>
+ *
+ * SDCC is licensed under the GNU Public license (GPL) v2. Note that
+ * this license covers the code to the compiler and other executables,
+ * tbut explicitly does not cover any code or objects generated by sdcc.
+ *
+ * For pic device libraries and header files which are derived from
+ * Microchip header (.inc) and linker script (.lkr) files Microchip
+ * requires that "The header files should state that they are only to be
+ * used with authentic Microchip devices" which makes them incompatible
+ * with the GPL. Pic device libraries and header files are located at
+ * non-free/lib and non-free/include directories respectively.
+ * Sdcc should be run with the --use-non-free command line option in
+ * order to include non-free header files and libraries.
+ *
+ * See http://sdcc.sourceforge.net/ for the latest information on sdcc.
  */
 
 #include <$header>
diff -Nru sdcc-3.1.0+dfsg/support/scripts/inc2h.pl sdcc-3.2.0+dfsg/support/scripts/inc2h.pl
--- sdcc-3.1.0+dfsg/support/scripts/inc2h.pl	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/scripts/inc2h.pl	2012-06-23 11:41:55.000000000 +0000
@@ -7,13 +7,18 @@
 
 # License:
 #
-# SDCC is licensed under the GNU Public license (GPL) v2.  Note that
+# SDCC is licensed under the GNU Public license (GPL) v2. Note that
 # this license covers the code to the compiler and other executables,
 # but explicitly does not cover any code or objects generated by sdcc.
-# We have not yet decided on a license for the run time libraries, but
-# it will not put any requirements on code linked against it. See:
 #
-# http://www.gnu.org/copyleft/gpl.html
+# For pic device libraries and header files which are derived from
+# Microchip header (.inc) and linker script (.lkr) files Microchip
+# requires that "The header files should state that they are only to be
+# used with authentic Microchip devices" which makes them incompatible
+# with the GPL. Pic device libraries and header files are located at
+# non-free/lib and non-free/include directories respectively.
+# Sdcc should be run with the --use-non-free command line option in
+# order to include non-free header files and libraries.
 #
 # See http://sdcc.sourceforge.net/ for the latest information on sdcc.
 
@@ -56,16 +61,17 @@
 # Some testing beforehand would be appreciated, though.
 #####################################################################
 
-my $rcsid = q~$Id: inc2h.pl 7033 2011-11-11 22:34:21Z tecodev $~;
+my $rcsid = q~$Id: inc2h.pl 7959 2012-06-23 11:41:55Z borutr $~;
 my ($junk, $file, $version, $date, $time, $programmer, $status)
     = split(/\s+/, $rcsid);
 my ($programName) = ($file =~ /(\S+)/);
 
-if ($#ARGV < 0 || $#ARGV > 1 ) {
+if ($#ARGV < 0 || $#ARGV > 2) {
     Usage();
 }
 my $processor = uc(shift);
 my $path = shift;
+my $emit_legacy_names = shift;
 my %sfrs = ();
 my %alias = ();
 my %bits = ();
@@ -85,8 +91,8 @@
     $name =~ s/OPTION(_REG)?/OPTION_REG/ig;
     # often declared as LCDDATn, but bits defined for LCDDATAn, 0 <= n <= 10
     $name =~ s/LCDDAT([^A])/LCDDATA$1/ig;
-    # LCDSE2 is missing in some headers, but LCDSE3 is declared...
-    $name =~ s/LCDSE3/LCDSE2/ig;
+#    # LCDSE2 is missing in some headers, but LCDSE3 is declared...
+#    $name =~ s/LCDSE3/LCDSE2/ig;
     # XXX: should this be named LININTF or LINPRT?
     $name =~ s/LININTF/LINPRT/ig;
     # FIXME: duplicate declarations for n in {0,1,2}
@@ -98,19 +104,19 @@
 sub checkname {
     my $name = shift;
     if (not exists $sfrs{$name}) {
-	print "SFR $name not defined (yet).\n";
-	# Find similar ones.
-	if (exists $sfrs{$name."0"}) {
-	    print "  but ".$name."0 exists---using that instead.\n";
-	    return $name."0";
-	}
-	my $try = $name;
-	$try =~ s/[0-9]$//;
-	if (exists $sfrs{$try}) {
-	    print "  but $try exists---using that instead.\n";
-	    return $try;
-	}
-	die "Not found a similar SFR---aborting.\n";
+        print "SFR $name not defined (yet).\n";
+        # Find similar ones.
+        if (exists $sfrs{$name."0"}) {
+            print "  but ".$name."0 exists---using that instead.\n";
+            return $name."0";
+        }
+        my $try = $name;
+        $try =~ s/[0-9]$//;
+        if (exists $sfrs{$try}) {
+            print "  but $try exists---using that instead.\n";
+            return $try;
+        }
+        die "Not found a similar SFR---aborting.\n";
     }
     return $name;
 }
@@ -121,40 +127,56 @@
     my $arr = shift;
 
     foreach my $item (@$arr) {
-	return 1 if ($name eq $item); 
+        return 1 if ($name eq $item); 
     }
     return 0;
 }
 
+# trim right and expand tabs
+sub trim_and_expand ($)
+{
+    my $line = shift;
+
+    # remove trailing spaces
+    $line =~ s/[ \t]+$//;
+    # expand tabs to spaces
+    while ($line =~ s/\t+/' ' x (length($&) * 8 - length($`) % 8)/e) {
+      # spin in empty loop until substitution finally fails
+    }
+    return $line;
+}
+
 
 $path = "" if (!defined $path);
 if ($^O eq 'MSWin32') {
     if ($path eq '') {
-	if (defined($path = $ENV{'GPUTILS_HEADER_PATH'}) || defined($path = $ENV{'GPUTILS_LKR_PATH'})) {
-	    $path .= '\\..';
-	}
-	else {
-	    die "Could not find gpasm includes.\n";
-	}
+        if (defined($path = $ENV{'GPUTILS_HEADER_PATH'}) || defined($path = $ENV{'GPUTILS_LKR_PATH'})) {
+            $path .= '\\..';
+        }
+        else {
+            die "Could not find gpasm includes.\n";
+        }
     }
     $path_delim = '\\';
 }
 else {
     # Nathan Hurst <njh@mail.csse.monash.edu.au>: find gputils on Debian
     if ($path eq '') {
-	if ( -x "/usr/share/gputils") {
-	    $path = "/usr/share/gputils";
-	} elsif ( -x "/usr/share/gpasm") {
-	    $path = "/usr/share/gpasm";
-	} elsif ( -x "/usr/local/share/gputils") {
-	    $path = "/usr/local/share/gputils";
-	} else {
-	    die "Could not find gpasm includes.\n";
-	}
+        if ( -x "/usr/share/gputils") {
+            $path = "/usr/share/gputils";
+        } elsif ( -x "/usr/share/gpasm") {
+            $path = "/usr/share/gpasm";
+        } elsif ( -x "/usr/local/share/gputils") {
+            $path = "/usr/local/share/gputils";
+        } else {
+            die "Could not find gpasm includes.\n";
+        }
     }
     $path_delim = '/';
 }
 
+$emit_legacy_names = 0 if (!defined $emit_legacy_names);
+
 #
 # Read the symbols at the end of this file.
 #
@@ -162,51 +184,51 @@
     next if /^\s*#/;
 
     if (/^\s*alias\s+(\S+)\s+(\S+)/) {
-	#
-	# Set an alias for a special function register.
-	# Some MPASM include files are not entirely consistent
-	# with sfr names.
-	#
-	$alias{fixname($2)} = fixname($1);
+        #
+        # Set an alias for a special function register.
+        # Some MPASM include files are not entirely consistent
+        # with sfr names.
+        #
+        $alias{fixname($2)} = fixname($1);
     } elsif (/^\s*address\s+(\S+)\s+(\S+)/) {
-	#
-	# Set a default address for a special function register.
-	# Some MPASM include files don't specify the address
-	# of all registers.
-	# 
-	# $addr{"$1"} = $2;
-	foreach my $device (split(/[,\s]+/, $devices)) {
-	    $addr{"p$device", "$1"} = $2;
-	}
+        #
+        # Set a default address for a special function register.
+        # Some MPASM include files don't specify the address
+        # of all registers.
+        # 
+        # $addr{"$1"} = $2;
+        foreach my $device (split(/[,\s]+/, $devices)) {
+            $addr{"p$device", "$1"} = $2;
+        }
     } elsif (/^\s*bitmask\s+(\S+)\s+/) {
-	#
-	# Set the bitmask that will be used in the 'memmap' pragma.
-	#
-	my $bitmask = "$1";
-	foreach my $register (split(/\s+/, $')) {
-	    $bitmasks{"$register"} = $bitmask;
-	}
+        #
+        # Set the bitmask that will be used in the 'memmap' pragma.
+        #
+        my $bitmask = "$1";
+        foreach my $register (split(/\s+/, $')) {
+            $bitmasks{"$register"} = $bitmask;
+        }
     } elsif (/^\s*ram\s+(\S+)\s+(\S+)\s+(\S+)/) {
-	# This info is now provided in "include/pic/pic14devices.txt".
-	#$lo = $1;
-	#$hi = $2;
-	#my $bitmask = $3;
-	#foreach $device (split(/[,\s]+/, $devices)) {
-	#    $ram{"p$device"} .= "#pragma memmap $lo $hi RAM $bitmask$'";
-	#}
+        # This info is now provided in "include/pic/pic14devices.txt".
+        #$lo = $1;
+        #$hi = $2;
+        #my $bitmask = $3;
+        #foreach $device (split(/[,\s]+/, $devices)) {
+        #    $ram{"p$device"} .= "#pragma memmap $lo $hi RAM $bitmask$'";
+        #}
     } elsif (/^\s*processor\s+/) {
-	$devices = $';
-	$type = '';
+        $devices = $';
+        $type = '';
     } elsif (/^\s*(\S+)/) {
-	$type = $1;
-	$_ = $';
-	foreach my $key (split) {
-	    eval "\$types{'$key'} = $type;";
-	}
+        $type = $1;
+        $_ = $';
+        foreach my $key (split) {
+            eval "\$types{'$key'} = $type;";
+        }
     } else {
-	foreach my $key (split) {
-	    eval "\$types{'$key'} = $type;";
-	}
+        foreach my $key (split) {
+            eval "\$types{'$key'} = $type;";
+        }
     }
 }
 
@@ -218,17 +240,17 @@
 #      || die "$programName: Error: Cannot open linker file $linkFile ($!)\n";
 #  while (<LINK>) {
 #      if (/^(\S+)\s+NAME=(\S+)\s+START=(\S+)\s+END=(\S+)\s+(PROTECTED)?/) {
-#  	$type = $1;
-#  	$name = $2;
-#  	$start = $3;
-#  	$end = $4;
-#  	$protected = 1 if ($5 =~ /protected/i);
-
-#  	if ($type =~ /(SHAREBANK)|(DATABANK)/i) {
-#  	    $ram{"p$processor"} .=
-#  		sprintf("#pragma memmap %7s %7s RAM 0x000\t// $name\n",
-#  			$start, $end);
-#  	}
+#       $type = $1;
+#       $name = $2;
+#       $start = $3;
+#       $end = $4;
+#       $protected = 1 if ($5 =~ /protected/i);
+
+#       if ($type =~ /(SHAREBANK)|(DATABANK)/i) {
+#           $ram{"p$processor"} .=
+#               trim_and_expand(sprintf("#pragma memmap %7s %7s RAM 0x000\t// $name\n",
+#                       $start, $end));
+#       }
 #      } elsif (/^SECTION\s+NAME=(\S+)\s+ROM=(\S+)\s+/) {
 #      }
 #  }
@@ -238,8 +260,24 @@
 my $c_head = <<EOT;
 /* Register definitions for $lcproc.
  * This file was automatically generated by:
- *   $programName V$version
+ *   $programName
  *   Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved
+ *
+ * SDCC is licensed under the GNU Public license (GPL) v2. Note that
+ * this license covers the code to the compiler and other executables,
+ * tbut explicitly does not cover any code or objects generated by sdcc.
+ *
+ *
+ * For pic device libraries and header files which are derived from
+ * Microchip header (.inc) and linker script (.lkr) files Microchip
+ * requires that \"The header files should state that they are only to be
+ * used with authentic Microchip devices\" which makes them incompatible
+ * with the GPL. Pic device libraries and header files are located at
+ * non-free/lib and non-free/include directories respectively.
+ * Sdcc should be run with the --use-non-free command line option in
+ * order to include non-free header files and libraries.
+ *
+ * See http://sdcc.sourceforge.net/ for the latest information on sdcc.
  */
 #include <${lcproc}.h>
 
@@ -262,167 +300,169 @@
     || die "$programName: Error: Cannot open include file $includeFile ($!)\n";
 
 while (<HEADER>) {
-    
+    my $line = '';
+
     if (/^;-+ Register Files/i) {
-	$defaultType = 'sfr';
-	s/;/\/\//;
-	$body .= "$_";
+        $defaultType = 'sfr';
+        s/;/\/\//;
+        $line .= "$_";
     } elsif (/^;-+\s*(\S+)\s+Bits/i || /^;-+\s*(\S+)\s+-+/i) {
-	# The second case is usually bits, but the word Bits is missing
+        # The second case is usually bits, but the word Bits is missing
         # also accept "UIE/UIR Bits"
-	foreach my $name (split(/\//, $1)) {
-	    $name = fixname($name);
-	    $name = checkname($name);
-
-	    if (defined($alias{$name})) {
-		$defaultType = "bits $alias{$name}";
-	    } else {
-		$defaultType = "bits $name";
-	    }
-	}
-	s/;/\/\//;
-	$body .= "$_";
+        foreach my $name (split(/\//, $1)) {
+            $name = fixname($name);
+            $name = checkname($name);
+
+            if (defined($alias{$name})) {
+                $defaultType = "bits $alias{$name}";
+            } else {
+                $defaultType = "bits $name";
+            }
+        }
+        s/;/\/\//;
+        $line .= "$_";
     } elsif (/^;=+/i) {
-	$defaultType = '';
-	s/;/\/\//;
-	$body .= "$_";
+        $defaultType = '';
+        s/;/\/\//;
+        $line .= "$_";
     } elsif (/^\s*;/) {
-	#
-	# Convert ASM comments to C style.
-	#
-	$body .= "//$'";
+        #
+        # Convert ASM comments to C style.
+        #
+        $line .= "//$'";
     } elsif (/^\s*IFNDEF\s+__(\S+)/) {
-	#
-	# Processor type.
-	#
-	$processor = $1;
-	$body .= "//$_";
+        #
+        # Processor type.
+        #
+        $processor = $1;
+        $line .= "//$_";
     } elsif (/^\s*(\S+)\s+EQU\s+H'(.+)'/) {
-	#
-	# Useful bit of information.
-	#
-	my $name = $1;
-	my $value = $2;
-	my $rest = $';
-	my $bitmask = "0x0000";
-
-	$rest =~ s/;/\/\//;
-	chomp($rest);
-
-	if (defined($types{"p$processor", "$name"})) {
-	    $type = $types{"p$processor", "$name"};
-	} elsif (defined($types{"$name"})) {
-	    $type = $types{"$name"};
-	} else {
-	    $type = $defaultType;
-	}
-	#print "$name --> $type\n"; ## DEBUG
-
-	if (defined($bitmasks{"p$processor", "$name"})) {
-	    $bitmask = $bitmasks{"p$processor", "$name"};
-#	} elsif (defined($bitmasks{"$name"})) {
-#	    $bitmask = $bitmasks{"$name"};
-	}
-
-	if ($type eq 'sfr') {
-	    #
-	    # A special function register.
-	    #
-#	    $pragmas .= sprintf("#pragma memmap %s_ADDR %s_ADDR "
-#				. "SFR %s\t// %s\n",
-#				$name, $name, $bitmask, $name);
-	    $name = fixname($name);
-	    if (defined $addr{"p$processor", "$name"}) {
-		$addresses .= sprintf("#define %s_ADDR\t0x%s\n", $name, $addr{"p$processor", "$name"});
-	    } else {
-		$addresses .= sprintf("#define %s_ADDR\t0x%s\n", $name, $value);
-	    }
-	    $body .= sprintf("extern __sfr  __at %-30s $name;$rest\n", "(${name}_ADDR)" );
-	    $c_head .= sprintf("__sfr  __at %-30s $name;\n", "(${name}_ADDR)");
-	    $addr{"p$processor", "$name"} = "0x$value";
-	    $sfrs{$name}=1;
-	} elsif ($type eq 'volatile') {
-	    #
-	    # A location that can change without 
-	    # direct program manipulation.
-	    #
-	    $name = fixname($name);
-#	    $pragmas .= sprintf("#pragma memmap %s_ADDR %s_ADDR "
-#				. "SFR %s\t// %s\n",
-#				$name, $name, $bitmask, $name);
-	    $body .= sprintf("extern __data __at %-30s $name;$rest\n", "(${name}_ADDR) volatile char");
-	    $c_head .= sprintf("__data __at %-30s $name;\n", "(${name}_ADDR) volatile char");
-	    if (defined $addr{"p$processor", "$name"}) {
-		$addresses .= sprintf("#define %s_ADDR\t0x%s\n", $name, $addr{"p$processor", "$name"});
-	    } else {
-		$addresses .= sprintf("#define %s_ADDR\t0x%s\n", $name, $value);
-	    }
-	} elsif ($type =~ /^bits/) {
-	    my ($junk, $register) = split(/\s/, $type);
-	    my $bit = hex($value);
-	    my $addr = $addr{"$register"};
-
-	    # prepare struct declaration
-	    if (0) { # DEBUG
-		foreach my $key (keys %bits) {
-		    print "   $key\n";
-		}
-		print "$register // $bit // ".$bits{"$register"}."\n";
-	    }
-	    if (!defined $bits{"$register"}) {
-		$bits{"$register"} = {}; # reference to empty hash
-	    }
-	    if (!defined $bits{"$register"}->{oct($bit)}) {
-		$bits{"$register"}->{oct($bit)} = []; # reference to empty array
-	    }
-	    for (my $k=0; $k < scalar @{$bits{"$register"}->{oct($bit)}}; $k++) {
-	      $name = "" if ($bits{"$register"}->{oct($bit)} eq $name)
-	    }
-	    if (($name ne "")
-		and (1 != contained($name, \@{$bits{"$register"}->{oct($bit)}}))
-	    ) {
-	      push @{$bits{"$register"}->{oct($bit)}}, $name;
-	    }
-	} else {
-	    #
-	    # Other registers, bits and/or configurations.
-	    #
-	    $name = fixname($name);
-	    if ($type eq 'other') {
-		#
-		# A known symbol.
-		#
-		$body .= sprintf("#define %-20s 0x%s$rest\n", $name, $value);
-	    } else {
-		#
-		# A symbol that isn't defined in the data
-		# section at the end of the file.  Let's 
-		# add a comment so that we can add it later.
-		#
-		$body .= sprintf("#define %-20s 0x%s$rest\n",
-				 $name, $value);
-	    }
-	}
+        #
+        # Useful bit of information.
+        #
+        my $name = $1;
+        my $value = $2;
+        my $rest = $';
+        my $bitmask = "0x0000";
+
+        $rest =~ s/;/\/\//;
+        chomp($rest);
+
+        if (defined($types{"p$processor", "$name"})) {
+            $type = $types{"p$processor", "$name"};
+        } elsif (defined($types{"$name"})) {
+            $type = $types{"$name"};
+        } else {
+            $type = $defaultType;
+        }
+        #print "$name --> $type\n"; ## DEBUG
+
+        if (defined($bitmasks{"p$processor", "$name"})) {
+            $bitmask = $bitmasks{"p$processor", "$name"};
+#       } elsif (defined($bitmasks{"$name"})) {
+#           $bitmask = $bitmasks{"$name"};
+        }
+
+        if ($type eq 'sfr') {
+            #
+            # A special function register.
+            #
+#           $pragmas .= trim_and_expand(sprintf("#pragma memmap %s_ADDR %s_ADDR "
+#                               . "SFR %s\t// %s\n",
+#                               $name, $name, $bitmask, $name));
+            $name = fixname($name);
+            if (defined $addr{"p$processor", "$name"}) {
+                $addresses .= trim_and_expand(sprintf("#define %s_ADDR\t0x%s\n", $name, $addr{"p$processor", "$name"}));
+            } else {
+                $addresses .= trim_and_expand(sprintf("#define %s_ADDR\t0x%s\n", $name, $value));
+            }
+            $line .= sprintf("extern __sfr  __at %-30s $name;$rest\n", "(${name}_ADDR)" );
+            $c_head .= sprintf("__sfr  __at %-30s $name;\n", "(${name}_ADDR)");
+            $addr{"p$processor", "$name"} = $value;
+            $sfrs{$name}=1;
+        } elsif ($type eq 'volatile') {
+            #
+            # A location that can change without 
+            # direct program manipulation.
+            #
+            $name = fixname($name);
+#           $pragmas .= trim_and_expand(sprintf("#pragma memmap %s_ADDR %s_ADDR "
+#                               . "SFR %s\t// %s\n",
+#                               $name, $name, $bitmask, $name));
+            $line .= sprintf("extern __data __at %-30s $name;$rest\n", "(${name}_ADDR) volatile char");
+            $c_head .= sprintf("__data __at %-30s $name;\n", "(${name}_ADDR) volatile char");
+            if (defined $addr{"p$processor", "$name"}) {
+                $addresses .= trim_and_expand(sprintf("#define %s_ADDR\t0x%s\n", $name, $addr{"p$processor", "$name"}));
+            } else {
+                $addresses .= trim_and_expand(sprintf("#define %s_ADDR\t0x%s\n", $name, $value));
+            }
+        } elsif ($type =~ /^bits/) {
+            my ($junk, $register) = split(/\s/, $type);
+            my $bit = hex($value);
+            my $addr = $addr{"$register"};
+
+            # prepare struct declaration
+            if (0) { # DEBUG
+                foreach my $key (keys %bits) {
+                    print "   $key\n";
+                }
+                print "$register // $bit // ".$bits{"$register"}."\n";
+            }
+            if (!defined $bits{"$register"}) {
+                $bits{"$register"} = {}; # reference to empty hash
+            }
+            if (!defined $bits{"$register"}->{oct($bit)}) {
+                $bits{"$register"}->{oct($bit)} = []; # reference to empty array
+            }
+            for (my $k=0; $k < scalar @{$bits{"$register"}->{oct($bit)}}; $k++) {
+              $name = "" if ($bits{"$register"}->{oct($bit)} eq $name)
+            }
+            if (($name ne "")
+                and (1 != contained($name, \@{$bits{"$register"}->{oct($bit)}}))
+            ) {
+              push @{$bits{"$register"}->{oct($bit)}}, $name;
+            }
+        } else {
+            #
+            # Other registers, bits and/or configurations.
+            #
+            $name = fixname($name);
+            if ($type eq 'other') {
+                #
+                # A known symbol.
+                #
+                $line .= sprintf("#define %-20s 0x%s$rest\n", $name, $value);
+            } else {
+                #
+                # A symbol that isn't defined in the data
+                # section at the end of the file.  Let's 
+                # add a comment so that we can add it later.
+                #
+                $line .= sprintf("#define %-20s 0x%s$rest\n",
+                                 $name, $value);
+            }
+        }
     } elsif (/^\s*$/) {
-	#
-	# Blank line.
-	#
-	$body .= "\n";
+        #
+        # Blank line.
+        #
+        $line .= "\n";
     } elsif (/__MAXRAM\s+H'([0-9a-fA-F]+)'/) {
-	my $maxram .= "//\n// Memory organization.\n//\n";
-	if (!defined $ram{"p$processor"}) {
-	    $ram{"p$processor"} = "";
-	}
-	$pragmas = $maxram
-	    . $ram{"p$processor"} . "\n"
-		. $pragmas;
-	$body .= "// $_";
+        my $maxram .= "//\n// Memory organization.\n//\n";
+        if (!defined $ram{"p$processor"}) {
+            $ram{"p$processor"} = "";
+        }
+        $pragmas = $maxram
+            . $ram{"p$processor"} . "\n"
+                . $pragmas;
+        $line .= "// $_";
     } else {
-	#
-	# Anything else we'll just comment out.
-	#
-	$body .= "// $_";
+        #
+        # Anything else we'll just comment out.
+        #
+        $line .= "// $_";
     }
+    $body .= trim_and_expand($line);
 }
 $header .= <<EOT;
 //
@@ -431,19 +471,24 @@
 //
 // This header file was automatically generated by:
 //
-//\t$programName V$version
+// $programName
 //
-//\tCopyright (c) 2002, Kevin L. Pauba, All Rights Reserved
+// Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved
 //
-//\tSDCC is licensed under the GNU Public license (GPL) v2.  Note that
-//\tthis license covers the code to the compiler and other executables,
-//\tbut explicitly does not cover any code or objects generated by sdcc.
-//\tWe have not yet decided on a license for the run time libraries, but
-//\tit will not put any requirements on code linked against it. See:
-// 
-//\thttp://www.gnu.org/copyleft/gpl/html
+// SDCC is licensed under the GNU Public license (GPL) v2. Note that
+// this license covers the code to the compiler and other executables,
+// but explicitly does not cover any code or objects generated by sdcc.
+//
+// For pic device libraries and header files which are derived from
+// Microchip header (.inc) and linker script (.lkr) files Microchip
+// requires that "The header files should state that they are only to be
+// used with authentic Microchip devices" which makes them incompatible
+// with the GPL. Pic device libraries and header files are located at
+// non-free/lib and non-free/include directories respectively.
+// Sdcc should be run with the --use-non-free command line option in
+// order to include non-free header files and libraries.
 //
-//\tSee http://sdcc.sourceforge.net/ for the latest information on sdcc.
+// See http://sdcc.sourceforge.net/ for the latest information on sdcc.
 //
 // 
 #ifndef P${processor}_H
@@ -456,9 +501,9 @@
 
 $c_head .= <<EOT;
 
-// 
+//
 // bitfield definitions
-// 
+//
 EOT
 
 # Add PORT* and TRIS* bit entries
@@ -470,20 +515,20 @@
   my $defpinfo = undef;
   open(P14PORTS, "< pic14ports.txt") && do {
     while(<P14PORTS>) {
-	s/\r//g; chomp;
-	if(/^\s*(\*|\w*)\s*([ABCDE0-7,-]+)\s*$/) {
-	    if(lc($1) eq lc($processor)) {
-		die if defined $pinfo;
-		$pinfo = $2;
-	    } elsif($1 eq "*") {
-		die if defined $defpinfo;
-		$defpinfo = $2;
-	    }
-	} elsif(/^\s*#/ || /^\s*$/) {
-	    # ignore blanks, comments
-	} else {
-	    die "bad line in pic14ports '$_'";
-	}
+        s/\r//g; chomp;
+        if(/^\s*(\*|\w*)\s*([ABCDE0-7,-]+)\s*$/) {
+            if(lc($1) eq lc($processor)) {
+                die if defined $pinfo;
+                $pinfo = $2;
+            } elsif($1 eq "*") {
+                die if defined $defpinfo;
+                $defpinfo = $2;
+            }
+        } elsif(/^\s*#/ || /^\s*$/) {
+            # ignore blanks, comments
+        } else {
+            die "bad line in pic14ports '$_'";
+        }
     }
     close P14PORTS;
   };
@@ -492,18 +537,18 @@
 
   if(defined $pinfo) {
     foreach  (split /,/, $pinfo) {
-	if(/^([ABCDE])([0-7])-([0-7])$/) {
-	    my($prt, $low, $high) = ($1, $2, $3);
-	    next unless defined $sfrs{"PORT$prt"} && defined $sfrs{"TRIS$prt"};
-	    next if     defined $bits{"PORT$prt"};
-	    for(my $i = $low; $i <= $high; $i++) {
-		push @{$bits{"PORT$prt"}->{oct($i)}}, "R$prt".$i;
-	    }
-	    next if     defined $bits{"TRIS$prt"};
-	    for(my $i = $low; $i <= $high; $i++) {
-		push @{$bits{"TRIS$prt"}->{oct($i)}}, "TRIS$prt".$i;
-	    }
-	} else { die }
+        if(/^([ABCDE])([0-7])-([0-7])$/) {
+            my($prt, $low, $high) = ($1, $2, $3);
+            next unless defined $sfrs{"PORT$prt"} && defined $sfrs{"TRIS$prt"};
+            next if     defined $bits{"PORT$prt"};
+            for(my $i = $low; $i <= $high; $i++) {
+                push @{$bits{"PORT$prt"}->{oct($i)}}, "R$prt".$i;
+            }
+            next if     defined $bits{"TRIS$prt"};
+            for(my $i = $low; $i <= $high; $i++) {
+                push @{$bits{"TRIS$prt"}->{oct($i)}}, "TRIS$prt".$i;
+            }
+        } else { die }
     }
   }
 }
@@ -523,24 +568,24 @@
     for (my $i=0; $i < 8; $i++)
     {
       if (!defined $bits{$reg}) {
-	  #print "bits{$reg} undefined\n";
+          #print "bits{$reg} undefined\n";
       }
       if (!defined $bits{$reg}->{oct($i)}) {
-	  #print "bits{$reg}->{".oct($i)."} undefined\n";
-	  $bits{$reg}->{oct($i)} = []; # empty array reference
+          #print "bits{$reg}->{".oct($i)."} undefined\n";
+          $bits{$reg}->{oct($i)} = []; # empty array reference
       }
       my @names = @{$bits{$reg}->{oct($i)}};
       if ($max < scalar @names) { $max = scalar @names; }
       if ($idx >= scalar @names) {
-	$structs .= "    unsigned char :1;\n";
+        $structs .= "    unsigned char :1;\n";
       } else { # (1 == scalar @names) {
-	$structs .= "    unsigned char " . $names[$idx] . ":1;\n";
+        $structs .= "    unsigned char " . $names[$idx] . ":1;\n";
 #      } else {
-#	$structs .= "  union {\n";
-#	foreach $name (@names) {
-#	  $structs .= "    unsigned char " . $name . ":1;\n";
-#	} # foreach
-#	$structs .= "  };\n";
+#       $structs .= "  union {\n";
+#       foreach $name (@names) {
+#         $structs .= "    unsigned char " . $name . ":1;\n";
+#       } # foreach
+#       $structs .= "  };\n";
       }
     } # for
       $structs .= "  };\n";
@@ -603,7 +648,7 @@
     . $body . "\n"
     . $structs . "\n"
     . $defs
-    . $legacy
+    . ($emit_legacy_names ? $legacy : "")
     . "#endif\n";
 close(HEAD);
 
@@ -612,31 +657,34 @@
 close DEFS;
 
 sub Usage {
-	print STDERR <<EOT;
+        print STDERR <<EOT;
 
 inc2h.pl - A utility to convert MPASM include files to header files
            suitable for the SDCC compiler.
 
 License: Copyright (c) 2002 Kevin L. Pauba
 
-	 SDCC is licensed under the GNU Public license (GPL) v2; see
-	 http://www.gnu.org/copyleft/gpl.html See http://sdcc.sourceforge.net/
-	 for the latest information on sdcc.
+         SDCC is licensed under the GNU Public license (GPL) v2; see
+         http://www.gnu.org/copyleft/gpl.html See http://sdcc.sourceforge.net/
+         for the latest information on sdcc.
 
-Usage:   $programName processor [path]
+Usage:   $programName processor [path] [emit_legacy_names]
 
-	 where:
+         where:
 
-         processor	The name of the processor (16f84, 16f877, etc.)
+         processor      The name of the processor (16f84, 16f877, etc.)
 
          path           The path to the parent of the "header" and "lkr"
                         directories.  The default is "/usr/share/gpasm".
 
-	 The header file will be written to the standard output.
+         emit_legacy_names
+                        0 to suppress the HAVE_LEGACY_NAMES block (default),
+                        1 to enable it.
+
+         The header file will be written to the standard output.
 
-	 $#ARGV
 EOT
-	exit;
+        exit;
 }
 
 __END__
diff -Nru sdcc-3.1.0+dfsg/support/scripts/pic16fam-h-gen.pl sdcc-3.2.0+dfsg/support/scripts/pic16fam-h-gen.pl
--- sdcc-3.1.0+dfsg/support/scripts/pic16fam-h-gen.pl	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/scripts/pic16fam-h-gen.pl	2012-06-17 16:29:47.000000000 +0000
@@ -0,0 +1,367 @@
+#!/usr/bin/perl -w
+
+#
+# This script generates a C header file that maps the target device (as
+# indicated via the sdcc generated -Dpic16cxxx or -Dpic12fxxx or -Dpic16fxxx
+# macro) to its device family and the device families to their respective
+# style of ADC, USART and SSP programming for use in the SDCC PIC14 I/O library.
+#
+# Copyright 2010 Raphael Neider <rneider AT web.de>
+# Modified to the pic14 series: Molnár Károly, 2012 <proton7@freemail.hu>
+#
+# This file is part of SDCC.
+# 
+# SDCC is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 2 of the License, or (at your
+# option) any later version.
+#
+# SDCC 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 SDCC.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+#
+# Usage: perl pic16fam-h-gen.pl
+#
+# This will create pic16fam.h.gen in your current directory.
+# Check sanity of the file and move it to .../include/pic14/pic16fam.h.
+# If you assigned new I/O styles, implement them in
+# .../include/pic14/{adc,i2c,usart}.h and
+# .../lib/pic14/libio/*/*.c
+#
+
+use strict;
+
+my $head = '__SDCC_PIC';
+
+my %families = ();
+my @enhanced = ();
+my %adc = ();
+my %usart = ();
+my %ssp = ();
+my $update = 'Please update your pic14/pic16fam.h manually and/or inform the maintainer.';
+
+my $ref;
+
+#-------------------------------------------------------------------------------
+
+sub find_list($$)
+  {
+  my ($list, $name) = @_;
+
+  foreach my $n (@{$list})
+    {
+    return 1 if ($n eq $name);
+    }
+
+  return 0;
+  }
+
+#-------------------------------------------------------------------------------
+
+sub find_pic($$)
+  {
+  my ($hash, $name) = @_;
+
+  for my $k (sort keys %{$hash})
+    {
+    if ($k != 0)
+      {
+      return 1 if (find_list(\@{${$hash}{$k}}, $name));
+      }
+    }
+
+  return 0;
+  }
+
+#-------------------------------------------------------------------------------
+
+sub array_filter($)
+  {
+  my $hash = $_[0];
+  my $null = \@{${$hash}{0}};
+  my @array = ();
+
+  foreach my $n (@{$null})
+    {
+    if (! find_pic($hash, $n) && ! find_list(\@array, $n))
+      {
+      push(@array, $n);
+      }
+    }
+
+  @{${$hash}{0}} = @array;
+  }
+
+#-------------------------------------------------------------------------------
+
+while (<DATA>) {
+    chomp;
+    s/\s*#.*$//;                # remove comments
+    s/\s*//g;                   # strip whitespace
+    next if (/^\s*$/);          # ignore empty lines
+
+    my $line = $_;
+
+    my @fields = split(/:/, $line);
+
+    die "Invalid record >$line<" if (scalar @fields != 6);
+
+    my ($id, $memberlist, $enh, $adcstyle, $usartstyle, $sspstyle) = @fields;
+
+    # extract numeric family id
+    $id = 0+$id;
+
+    # extract family members
+    my @arr = split(/,/, $memberlist);
+    @arr = sort(map { uc($_); } @arr);
+    $families{$id} = \@arr;
+
+    # enhanced class
+    $enh = 0+$enh;
+    if ($enh) {
+        push @enhanced, @arr;
+    }
+
+    # ADC style per device family
+    $adcstyle = 0+$adcstyle;
+    push @{$adc{$adcstyle}}, @arr;
+
+    # (E)USART style per device family
+    $usartstyle = 0+$usartstyle;
+    push @{$usart{$usartstyle}}, @arr;
+
+    # SSP style per device family
+    $sspstyle = 0+$sspstyle;
+    push @{$ssp{$sspstyle}}, @arr;
+}
+
+array_filter(\%adc);
+array_filter(\%usart);
+array_filter(\%ssp);
+
+my $fname = 'pic16fam.h.gen';
+open(FH, '>', $fname) or die "Could not open >$fname<";
+
+print FH <<EOT
+/*
+ * pic16fam.h - PIC14 families
+ *
+ * This file is has been generated using $0 .
+ */
+#ifndef __SDCC_PIC16FAM_H__
+#define __SDCC_PIC16FAM_H__ 1
+
+/*
+ * Define device class.
+ */
+#undef  __SDCC_PIC14_ENHANCED
+
+EOT
+;
+
+my $memb = "defined($head" . join(") || \\\n      defined($head", sort @enhanced) . ')';
+print FH <<EOT
+#if   ${memb}
+#define __SDCC_PIC14_ENHANCED 1
+
+#endif
+
+/*
+ * Define ADC style per device family.
+ */
+#undef  __SDCC_ADC_STYLE
+
+EOT
+;
+
+my $pp = '#if   ';
+for my $s (sort keys %adc) {
+    my $fams = "defined($head" . join(") || \\\n      defined($head", sort @{$adc{$s}}) . ')';
+    print FH <<EOT
+${pp}${fams}
+#define __SDCC_ADC_STYLE      ${s}
+
+EOT
+;
+$pp = '#elif ';
+} # for
+print FH <<EOT
+#else
+#warning No ADC style associated with the target device. ${update}
+#endif
+
+/*
+ * Define (E)USART style per device family.
+ */
+#undef  __SDCC_USART_STYLE
+
+EOT
+;
+
+$pp = '#if   ';
+for my $s (sort keys %usart) {
+    my $fams = "defined($head" . join(") || \\\n      defined($head", sort @{$usart{$s}}) . ')';
+    print FH <<EOT
+${pp}${fams}
+#define __SDCC_USART_STYLE    ${s}
+
+EOT
+;
+$pp = '#elif ';
+} # for
+print FH <<EOT
+#else
+#warning No (E)USART style associated with the target device. ${update}
+#endif
+
+/*
+ * Define SSP style per device family.
+ */
+#undef  __SDCC_SSP_STYLE
+
+EOT
+;
+
+$pp = '#if   ';
+for my $s (sort keys %ssp) {
+    my $fams = "defined($head" . join(") || \\\n      defined($head", sort @{$ssp{$s}}) . ')';
+    print FH <<EOT
+${pp}${fams}
+#define __SDCC_SSP_STYLE      ${s}
+
+EOT
+;
+$pp = '#elif ';
+} # for
+print FH <<EOT
+#else
+#warning No SSP style associated with the target device. ${update}
+#endif
+
+#endif /* !__SDCC_PIC16FAM_H__ */
+EOT
+;
+__END__
+#
+# <id>:<head>{,<member>}:<class>:<adc>:<usart>:<ssp>
+#
+# Each line provides a colon separated list of
+#  * a numeric family name, derived from the first family member as follows:
+#    enhanced MCU: 1<num1>(F|LF)<num2>?      -> printf("1%u%04u0", <num1>, <num2>)
+#    ADC         : 1<num1>(C|F|HV|LF)<num2>? -> printf("1%u%04u1", <num1>, <num2>)
+#    USART       : 1<num1>(C|F|HV|LF)<num2>? -> printf("1%u%04u2", <num1>, <num2>)
+#    SSP         : 1<num1>(C|F|HV|LF)<num2>? -> printf("1%u%04u3", <num1>, <num2>)
+#  * a comma-separated list of members of a device family,
+#    where a family comprises all devices that share a single data sheet,
+#  * the enhanced MCU (numeric family name or 0, if not applicable)
+#  * the ADC style (numeric family name or 0, if not applicable)
+#  * the USART style (numeric family name or 0, if not applicable)
+#  * the SSP style (numeric family name or 0, if not applicable)
+#
+# This data has been gathered manually from data sheets published by
+# Microchip Technology Inc.
+#
+
+# enhanced MCU
+1218220:12f1822,12f1840:1218220:0:0:0
+1615030:16f1503,16f1507,16f1508,16f1509,16f1516,16f1517,16f1518,16f1519,16f1526,16f1527:1615030:0:0:0
+1617820:16f1782,16f1783:1617820:0:0:0
+1618230:16f1823,16f1824,16f1825,16f1826,16f1827,16f1828,16f1829,16f1847:1618230:0:0:0
+1619330:16f1933,16f1934,16f1936,16f1937,16f1938,16f1939,16f1946,16f1947:1619330:0:0:0
+1619020:16lf1902,16lf1903,16lf1904,16lf1906,16lf1907:1619020:0:0:0
+
+# ADC
+1206751:12f675,12f683:0:1206751:0:0
+1218221:12f1822,12f1840:0:1218221:0:0
+1600711:16c71,16c710,16c711:0:1600711:0:0
+1600721:16c72,16f72,16c73b,16f73,16f76:0:1600721:0:0
+1600741:16c74b,16f74,16f77:0:1600741:0:0
+1604331:16c433:0:1604331:0:0
+1607151:16c715:0:1607151:0:0
+1607171:16c717,16c770,16c771:0:1607171:0:0
+1607451:16c745:0:1607451:0:0
+1607651:16c765:0:1607651:0:0
+1607731:16c773:0:1607731:0:0
+1607741:16c774:0:1607741:0:0
+1607811:16c781,16c782:0:1607811:0:0
+1609251:16c925,16c926,16f870,16f872,16f873,16f873a,16f876,16f876a:0:1609251:0:0
+1600881:16f88:0:1600881:0:0
+1606161:16f616,16hv616:0:1606161:0:0
+1606761:16f676,16f684,16f688:0:1606761:0:0
+1606851:16f685,16f687,16f689,16f690:0:1606851:0:0
+1607161:16f716:0:1607161:0:0
+1607201:16f720,16f721:0:1607201:0:0
+1607371:16f737,16f767:0:1607371:0:0
+1607471:16f747,16f777:0:1607471:0:0
+1607851:16f785:0:1607851:0:0
+1608181:16f818,16f819:0:1608181:0:0
+1608711:16f871,16f874,16f874a,16f877,16f877a:0:1608711:0:0
+1608821:16f882,16f883,16f886:0:1608821:0:0
+1608841:16f884,16f887:0:1608841:0:0
+1609131:16f913,16f916:0:1609131:0:0
+1609141:16f914,16f917,16f946:0:1609141:0:0
+1615031:16f1503:0:1615031:0:0
+1615071:16f1507,16f1508,16f1509:0:1615071:0:0
+1615161:16f1516,16f1518:0:1615161:0:0
+1615171:16f1517,16f1519:0:1615171:0:0
+1615261:16f1526,16f1527:0:1615261:0:0
+1617821:16f1782,16f1783:0:1617821:0:0
+1618231:16f1823:0:1618231:0:0
+1618241:16f1824,16f1825:0:1618241:0:0
+1618261:16f1826,16f1827,16f1847:0:1618261:0:0
+1618281:16f1828,16f1829:0:1618281:0:0
+1619331:16f1933,16f1936,16f1938:0:1619331:0:0
+1619341:16f1934,16f1937,16f1939:0:1619341:0:0
+1619461:16f1946,16f1947:0:1619461:0:0
+1619021:16lf1902,16lf1903,16lf1906:0:1619021:0:0
+1619041:16lf1904,16lf1907:0:1619041:0:0
+
+# (E)USART
+1218222:12f1822,12f1840:0:0:1218222:0
+1600632:16c63a,16c65b,16c73b,16c74b,16c745,16c765,16f73,16f74,16f76,16f77:0:0:1600632:0
+1600872:16f87,16f88:0:0:1600872:0
+1606272:16f627,16f627a,16f628,16f628a,16f648a:0:0:1606272:0
+1606872:16f687,16f689,16f690:0:0:1606872:0
+1606882:16f688:0:0:1606882:0
+1607202:16f720,16f721:0:0:1607202:0
+1607732:16c773,16c774,16f737,16f747,16f767,16f777,16f870,16f871,16f873,16f873a,16f874,16f874a,16f876,16f876a,16f877,16f877a,16f913,16f914,16f916,16f917,16f946:0:0:1607732:0
+1608822:16f882,16f883,16f884,16f886,16f887:0:0:1608822:0
+1615082:16f1508,16f1509:0:0:1615082:0
+1615162:16f1516,16f1517,16f1518,16f1519,16f1933,16f1934,16f1936,16f1937,16f1938,16f1939,16lf1904,16lf1906,16lf1907:0:0:1615162:0
+1615262:16f1526,16f1527:0:0:1615262:0
+1617822:16f1782,16f1783:0:0:1617822:0
+1618232:16f1823,16f1824,16f1825:0:0:1618232:0
+1618262:16f1826,16f1827,16f1847:0:0:1618262:0
+1618282:16f1828,16f1829:0:0:1618282:0
+1619462:16f1946,16f1947:0:0:1619462:0
+
+# SSP
+1218223:12f1822,12f1840:0:0:0:1218223
+1600623:16c62,16c72:0:0:0:1600623
+1600633:16c63a,16c65b,16c73b,16c74b:0:0:0:1600633
+1607173:16c717,16c770,16c771:0:0:0:1607173
+1607733:16c773,16c774:0:0:0:1607733
+1609253:16c925,16c926:0:0:0:1609253
+1600723:16f72,16f73,16f74,16f76,16f77:0:0:0:1600723
+1600873:16f87,16f88,16f818,16f819:0:0:0:1600873
+1606873:16f687,16f689,16f690,16f720,16f721:0:0:0:1606873
+1607373:16f737,16f747,16f767,16f777,16f872,16f873,16f873a,16f874,16f874a,16f876,16f876a,16f877,16f877a,16f882,16f883,16f884,16f886,16f887:0:0:0:1607373
+1609133:16f913,16f914,16f916,16f917,16f946:0:0:0:1609133
+1615033:16f1503:0:0:0:1615033
+1615083:16f1508,16f1509:0:0:0:1615083
+1615173:16f1516,16f1517,16f1518,16f1519:0:0:0:1615173
+1615263:16f1526,16f1527:0:0:0:1615263
+1617823:16f1782,16f1783:0:0:0:1617823
+1618233:16f1823,16f1824,16f1825:0:0:0:1618233
+1618263:16f1826:0:0:0:1618263
+1618273:16f1827,16f1847:0:0:0:1618273
+1618283:16f1828:0:0:0:1618283
+1618293:16f1829:0:0:0:1618293
+1619333:16f1933,16f1934,16f1936,16f1937,16f1938,16f1939:0:0:0:1619333
+1619463:16f1946,16f1947:0:0:0:1619463
diff -Nru sdcc-3.1.0+dfsg/support/scripts/pic18fam-h-gen.pl sdcc-3.2.0+dfsg/support/scripts/pic18fam-h-gen.pl
--- sdcc-3.1.0+dfsg/support/scripts/pic18fam-h-gen.pl	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/scripts/pic18fam-h-gen.pl	2012-06-02 13:19:46.000000000 +0000
@@ -36,6 +36,8 @@
 
 use strict;
 
+my $head = '__SDCC_PIC';
+
 my %families = ();
 my %adc = ();
 my %usart = ();
@@ -45,7 +47,7 @@
     chomp;
     s/\s*#.*$//;                # remove comments
     s/\s*//g;                   # strip whitespace
-    next if (/^\s*$/);          # ignore empty lines
+    next if (/^\s*$/);         # ignore empty lines
 
     my $line = $_;
 
@@ -60,8 +62,7 @@
 
     # extract family members
     my @arr = split(/,/, $memberlist);
-    @arr = map { lc($_); } @arr;
-    @arr = sort @arr;
+    @arr = sort(map { uc($_); } @arr);
     $families{$id} = \@arr;
 
     # ADC style per device family
@@ -101,7 +102,7 @@
 my $pp = "#if   ";
 for my $id (sort keys %families) {
     my $list = $families{$id};
-    my $memb = "defined(pic" . join(") \\\n    || defined(pic", @$list) . ")";
+    my $memb = "defined($head" . join(") \\\n    || defined($head", @$list) . ")";
     print FH <<EOT
 ${pp} ${memb}
 #define __SDCC_PIC16_FAMILY ${id}
@@ -186,6 +187,7 @@
 # Microchip Technology Inc.
 #
 1812200:18f1220,18f1320:1812200:1812200
+1812300:18f1230,18f1330:1812300:1812300
 1813502:18f13k50,18f14k50:1813502:1813502
 1822200:18f2220,18f2320,18f4220,18f4320:1822200:1822200
 1822210:18f2221,18f2321,18f4221,18f4321:1822200:1822210
diff -Nru sdcc-3.1.0+dfsg/support/scripts/repack_release.sh sdcc-3.2.0+dfsg/support/scripts/repack_release.sh
--- sdcc-3.1.0+dfsg/support/scripts/repack_release.sh	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/scripts/repack_release.sh	2012-06-24 19:25:32.000000000 +0000
@@ -1,14 +1,13 @@
+#! /bin/bash
+
 #
 # repack_release.sh
 #
-# This script repacks sdcc Linux and Mac OS X snapshot build binary and doc packages
-# into a sdcc release package.
-#
-# Repacking Linux package example:
-# ./repack_release.sh sdcc-snapshot-i386-unknown-linux2.5-20090314-5413.tar.bz2 sdcc-doc-20090314-5413.tar.bz2 2.9.0
+# This script repacks sdcc Linux and Mac OS X snapshot build binary and doc
+# packages into a sdcc release package.
 #
-# Repacking MacOS X package example:
-# ./repack_release.sh sdcc-snapshot-universal-apple-macosx-20090314-5413.tar.bz2 sdcc-doc-20090314-5413.tar.bz2 2.9.0
+# Example:
+# ./repack_release.sh 20090314 5413 2.9.0-rc1
 #
 
 
@@ -21,23 +20,47 @@
 
 function usage()
 {
-  echo "Usage: repack_release.sh <bin_package> <doc_package> <version>" 1>&2
+  echo "Usage: repack_release.sh <date> <revision> <version>" 1>&2
   exit 1;
 }
 
 
+function download()
 {
-  if [ $# != 3 ]
+  local date=$1 revision=$2
+
+  mkdir -p dl
+
+  if ! pushd dl
   then
-    usage
+    fatal_error "Can't cd to dl!"
+  else
+    wget http://sourceforge.net/projects/sdcc/files/snapshot_builds/sdcc-src/sdcc-src-${date}-${revision}.tar.bz2
+
+    wget http://sourceforge.net/projects/sdcc/files/snapshot_builds/docs/sdcc-doc-${date}-${revision}.tar.bz2
+
+    wget http://sourceforge.net/projects/sdcc/files/snapshot_builds/docs/sdcc-doc-${date}-${revision}.zip
+
+    wget http://sourceforge.net/projects/sdcc/files/snapshot_builds/i386-unknown-linux2.5/sdcc-snapshot-i386-unknown-linux2.5-${date}-${revision}.tar.bz2
+
+    wget http://sourceforge.net/projects/sdcc/files/snapshot_builds/i586-mingw32msvc/sdcc-snapshot-i586-mingw32msvc-${date}-${revision}.zip
+
+    wget http://sourceforge.net/projects/sdcc/files/snapshot_builds/i586-mingw32msvc-setup/sdcc-${date}-${revision}-setup.exe
+
+    wget http://sourceforge.net/projects/sdcc/files/snapshot_builds/i386_universal-apple-macosx/sdcc-snapshot-i386_universal-apple-macosx-${date}-${revision}.tar.bz2
+
+    mv sdcc-snapshot-i386_universal-apple-macosx-${date}-${revision}.tar.bz2 sdcc-snapshot-universal-apple-macosx-${date}-${revision}.tar.bz2
+
+    popd
   fi
+}
 
-  bin_pkg=$1
-  doc_pkg=$2
-  ver=$3
 
-  arch=$(expr $(basename $bin_pkg) : 'sdcc-snapshot-\([^-]*-[^-]*-[^-]*\)-.*\.tar\.bz2')
-  if [ -z "$arch" ]
+function unpack()
+{
+  local bin_pkg=$1 doc_pkg=$2
+
+  if [ -z "$(expr $(basename $bin_pkg) : 'sdcc-snapshot-\([^-]*-[^-]*-[^-]*\)-.*\.tar\.bz2')" ]
   then
     fatal_error "$bin_pkg is not a sdcc binary package!"
   fi
@@ -49,13 +72,137 @@
 
   tar -xjvf $bin_pkg || fatal_error "Can't unpack $bin_pkg!"
   
+  # remove unneeded directories produced by sdbinutils
+  rm -rf ./sdcc/include
+  rm -rf ./sdcc/lib
+
   rm -rf ./sdcc/share/doc
   rm -rf ./sdcc/share/sdcc/doc
+
   tar -xjvf $doc_pkg -C ./sdcc/share/sdcc || fatal_error "Can't unpack $doc_pkg!"
+}
+
+
+function pack()
+{
+  local arch=$1 ver=$2
+
   cp ./sdcc/share/sdcc/doc/INSTALL.txt ./sdcc
   cp ./sdcc/share/sdcc/doc/README.txt ./sdcc
-  tar -cjvf sdcc-$ver-$arch.tar.bz2 sdcc || fatal_error "Can't pack sdcc-$ver-$arch.tar.bz2!"
-  mv sdcc $arch
+
+  mkdir -p ul
+
+  tar -cjvf ul/sdcc-${ver}-${arch}.tar.bz2 sdcc || fatal_error "Can't pack ul/sdcc-${ver}-${arch}.tar.bz2!"
+  mv sdcc ${arch}
+}
+
+
+function repack_win()
+{
+  local date=$1 revision=$2 ver=$3
+
+  snapshot=~/svn_snapshots/sdcc/sdcc
+  ver_maj=$(expr $ver : '\([0-9]*\)\.')
+  ver_min=$(expr $ver : '[0-9]*\.\([0-9]*\)\.')
+  ver_rev=$(expr $ver : '[0-9]*\.[0-9]*\.\([0-9]*\)')
+
+  # - unpack WIN32 mingw daily snapshot sdcc-snapshot-i586-mingw32msvc-yyyymmdd-rrrr.zip
+  #   to a clean directory (the option to create directories should be enabled).
+  #   A sub directory sdcc is created (referenced as PKGDIR in continuation).
+  unzip dl/sdcc-snapshot-i586-mingw32msvc-${date}-${revision}.zip
+
+  if ! pushd sdcc
+  then
+    fatal_error "Can't cd to sdcc!"
+  else
+    # - remove the PKGDIR/doc/ directory
+    rm -rf doc/
+
+    # - unpack sdcc-doc-yyyymmdd-rrrr.zip to the PKGDIR/doc directory
+    unzip ../dl/sdcc-doc-${date}-${revision}.zip
+
+    # - copy files sdcc/support/scripts/sdcc.ico and sdcc/support/scripts/sdcc.nsi
+    #   (this file) from the sdcc Subversion snapshot to the PKGDIR directory
+    cp ${snapshot}/support/scripts/sdcc.nsi ${snapshot}/support/scripts/sdcc.ico .
+
+    # - copy file COPYING and COPYING3 from the sdcc Subversion snapshot to the PKGDIR directory,
+    #   rename it to COPYING.txt and COPYING3.txt and convert it to DOS format:
+    cp ${snapshot}/COPYING COPYING.txt
+    todos COPYING.txt
+    cp ${snapshot}/sdas/COPYING3 COPYING3.txt
+    todos COPYING3.txt
+    cp ${snapshot}/ChangeLog doc/ChangeLog.txt
+    todos doc/ChangeLog.txt
+    cp ${snapshot}/README doc/README.txt
+    todos doc/README.txt
+
+    # - run NSIS installer from PKGDIR directory:
+    #   Define -DWIN64 if createing a 64bit package.
+    makensis -DFULL_DOC -DVER_MAJOR=${ver_maj} -DVER_MINOR=${ver_min} -DVER_REVISION=${ver_rev} -DVER_BUILD=${revision} sdcc.nsi
+
+    # - A setup file setup.exe is created in PKGDIR directory.
+    #   Rename it to sdcc-x.x.x-setup.exe and upload it
+    #   to sdcc download repository at sourceforge.net
+    cp setup.exe ../ul/sdcc-${ver}-setup.exe
+
+    popd
+  fi
+}
+
+
+function upload()
+{
+  local ver=$1
+
+  raw_ver=$(expr $ver : '\([0-9]*\.[0-9]*\.[0-9]*\)')
+
+  echo uploading ul/sdcc-src-${ver}.tar.bz2  sdcc-builder@web.sourceforge.net:/home/pfs/project/sdcc/sdcc/${raw_ver}
+  rsync -e ssh ul/sdcc-src-${ver}.tar.bz2  sdcc-builder@web.sourceforge.net:/home/pfs/project/sdcc/sdcc/${raw_ver}
+
+  echo uploading ul/sdcc-doc-${ver}.tar.bz2  sdcc-builder@web.sourceforge.net:/home/pfs/project/sdcc/sdcc-doc/${raw_ver}
+  rsync -e ssh ul/sdcc-doc-${ver}.tar.bz2  sdcc-builder@web.sourceforge.net:/home/pfs/project/sdcc/sdcc-doc/${raw_ver}
+
+  echo uploading ul/sdcc-doc-${ver}.zip  sdcc-builder@web.sourceforge.net:/home/pfs/project/sdcc/sdcc-doc/${raw_ver}
+  rsync -e ssh ul/sdcc-doc-${ver}.zip  sdcc-builder@web.sourceforge.net:/home/pfs/project/sdcc/sdcc-doc/${raw_ver}
+
+  echo uploading ul/sdcc-${ver}-setup.exe sdcc-builder@web.sourceforge.net:/home/pfs/project/sdcc/sdcc-win32/${raw_ver}
+  rsync -e ssh ul/sdcc-${ver}-setup.exe sdcc-builder@web.sourceforge.net:/home/pfs/project/sdcc/sdcc-win32/${raw_ver}
+
+  echo uploading ul/sdcc-${ver}-i386-unknown-linux2.5.tar.bz2 sdcc-builder@web.sourceforge.net:/home/pfs/project/sdcc/sdcc-linux-x86/${raw_ver}
+  rsync -e ssh ul/sdcc-${ver}-i386-unknown-linux2.5.tar.bz2 sdcc-builder@web.sourceforge.net:/home/pfs/project/sdcc/sdcc-linux-x86/${raw_ver}
+
+  echo uploading ul/sdcc-${ver}-universal-apple-macosx.tar.bz2 sdcc-builder@web.sourceforge.net:/home/pfs/project/sdcc/sdcc-macosx/${raw_ver}
+  rsync -e ssh ul/sdcc-${ver}-universal-apple-macosx.tar.bz2 sdcc-builder@web.sourceforge.net:/home/pfs/project/sdcc/sdcc-macosx/${raw_ver}
+}
+
+
+{
+  if [ $# != 3 ]
+  then
+    usage
+  fi
+
+  date=$1
+  revision=$2
+  ver=$3
+
+  mkdir -p ul
+
+  download $date $revision
+
+  cp dl/sdcc-src-${date}-${revision}.tar.bz2 ul/sdcc-src-${ver}.tar.bz2
+  cp dl/sdcc-doc-${date}-${revision}.tar.bz2 ul/sdcc-doc-${ver}.tar.bz2
+  cp dl/sdcc-doc-${date}-${revision}.zip ul/sdcc-doc-${ver}.zip
+
+  for arch in i386-unknown-linux2.5 universal-apple-macosx
+  do
+    unpack dl/sdcc-snapshot-${arch}-${date}-${revision}.tar.bz2 dl/sdcc-doc-${date}-${revision}.tar.bz2
+    pack $arch $ver
+  done
+
+  repack_win $date $revision $ver
+
+  upload $ver
 
   exit 0
 }
diff -Nru sdcc-3.1.0+dfsg/support/scripts/sdcc.nsi sdcc-3.2.0+dfsg/support/scripts/sdcc.nsi
--- sdcc-3.1.0+dfsg/support/scripts/sdcc.nsi	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/scripts/sdcc.nsi	2012-06-30 20:48:20.000000000 +0000
@@ -291,8 +291,13 @@
   ${DebugMsg} "Pre INSTDIR = $INSTDIR"
 
   ${If} ${RunningX64}
+  !ifdef WIN64
     StrCpy $INSTDIR "$PROGRAMFILES64\${PRODUCT_NAME}"
     SetRegView 64
+  !else
+    StrCpy $INSTDIR "$PROGRAMFILES\${PRODUCT_NAME}"
+    SetRegView 32
+  !endif
   ${Else}
   !ifdef WIN64
     MessageBox MB_OK|MB_ICONSTOP \
@@ -341,7 +346,11 @@
   ${DebugMsg} "Pre INSTDIR = $INSTDIR"
 
   ${If} ${RunningX64}
+  !ifdef WIN64
     SetRegView 64
+  !else
+    SetRegView 32
+  !endif
   ${Endif}
 
   Push $R0
@@ -374,7 +383,9 @@
   File "${SDCC_ROOT}\bin\sdldgb.exe"
   File "${SDCC_ROOT}\bin\sdld6808.exe"
   File "${SDCC_ROOT}\bin\sdldz80.exe"
+  File "${SDCC_ROOT}\bin\sdar.exe"
   File "${SDCC_ROOT}\bin\sdranlib.exe"
+  File "${SDCC_ROOT}\bin\sdnm.exe"
   File "${SDCC_ROOT}\bin\makebin.exe"
   File "${SDCC_ROOT}\bin\packihx.exe"
   File "${SDCC_ROOT}\bin\sdcc.exe"
@@ -435,6 +446,8 @@
   File "${DEV_ROOT}\include\asm\z180\features.h"
   SetOutPath "$INSTDIR\include\asm\r2k"
   File "${DEV_ROOT}\include\asm\r2k\features.h"
+  SetOutPath "$INSTDIR\include\asm\r3ka"
+  File "${DEV_ROOT}\include\asm\r3ka\features.h"
 
   SetOutPath "$INSTDIR\include\ds390"
   File "${DEV_ROOT}\include\ds390\*.h"
@@ -493,43 +506,55 @@
   File "${DEV_ROOT}\lib\r2k\*.*"
 ${SectionEnd}
 
-${Section} "SDCC Z80 library" SEC11
+${Section} "SDCC Rabbit 3000A library" SEC11
+  SectionIn 1 2
+  SetOutPath "$INSTDIR\lib\r3ka"
+  File "${DEV_ROOT}\lib\r3ka\*.*"
+${SectionEnd}
+
+${Section} "SDCC Z80 library" SEC12
   SectionIn 1 2
   SetOutPath "$INSTDIR\lib\z80"
   File "${DEV_ROOT}\lib\z80\*.*"
 ${SectionEnd}
 
-${Section} "SDCC small model library" SEC12
+${Section} "SDCC small model library" SEC13
   SectionIn 1 2
   SetOutPath "$INSTDIR\lib\small"
   File "${DEV_ROOT}\lib\small\*.*"
 ${SectionEnd}
 
-${Section} "SDCC medium model library" SEC13
+${Section} "SDCC medium model library" SEC14
   SectionIn 1 2
   SetOutPath "$INSTDIR\lib\medium"
   File "${DEV_ROOT}\lib\medium\*.*"
 ${SectionEnd}
 
-${Section} "SDCC large model library" SEC14
+${Section} "SDCC large model library" SEC15
   SectionIn 1 2
   SetOutPath "$INSTDIR\lib\large"
   File "${DEV_ROOT}\lib\large\*.*"
 ${SectionEnd}
 
-${Section} "SDCC small-stack-auto model library" SEC15
+${Section} "SDCC small-stack-auto model library" SEC16
   SectionIn 1 2
   SetOutPath "$INSTDIR\lib\small-stack-auto"
   File "${DEV_ROOT}\lib\small-stack-auto\*.*"
 ${SectionEnd}
 
-${Section} "SDCC HC08 library" SEC16
+${Section} "SDCC HC08 library" SEC17
   SectionIn 1 2
   SetOutPath "$INSTDIR\lib\hc08"
   File "${DEV_ROOT}\lib\hc08\*.*"
 ${SectionEnd}
 
-${Section} "SDCC PIC16 library" SEC17
+${Section} "SDCC S08 library" SEC18
+  SectionIn 1 2
+  SetOutPath "$INSTDIR\lib\s08"
+  File "${DEV_ROOT}\lib\s08\*.*"
+${SectionEnd}
+
+${Section} "SDCC PIC16 library" SEC19
   SectionIn 1 2
   SetOutPath "$INSTDIR\lib\pic16"
   File "${DEV_ROOT}\lib\pic16\*.o"
@@ -539,7 +564,7 @@
   File "${DEV_ROOT}\non-free\lib\pic16\*.lib"
 ${SectionEnd}
 
-${Section} "SDCC PIC14 library" SEC18
+${Section} "SDCC PIC14 library" SEC20
   SectionIn 1 2
   SetOutPath "$INSTDIR\lib\pic14"
   File "${DEV_ROOT}\lib\pic14\*.lib"
@@ -548,7 +573,7 @@
   File "${DEV_ROOT}\non-free\lib\pic14\*.lib"
 ${SectionEnd}
 
-${Section} "SDCC library sources" SEC19
+${Section} "SDCC library sources" SEC21
   SectionIn 1
   SetOutPath "$INSTDIR\lib\src\ds390\examples"
   File "${DEV_ROOT}\lib\src\ds390\examples\MOVED"
@@ -577,10 +602,18 @@
   File "${DEV_ROOT}\lib\src\r2k\*.s"
 #  File "${DEV_ROOT}\lib\src\z180\Makefile"
 
+  SetOutPath "$INSTDIR\lib\src\r3ka"
+  File "${DEV_ROOT}\lib\src\r3ka\*.s"
+#  File "${DEV_ROOT}\lib\src\r3ka\Makefile"
+
   SetOutPath "$INSTDIR\lib\src\hc08"
   File "${DEV_ROOT}\lib\src\hc08\*.c"
 #  File "${DEV_ROOT}\lib\src\hc08\Makefile"
 
+  SetOutPath "$INSTDIR\lib\src\s08"
+  File "${DEV_ROOT}\lib\src\s08\*.c"
+#  File "${DEV_ROOT}\lib\src\s08\Makefile"
+
   SetOutPath "$INSTDIR\lib\src\mcs51"
   File "${DEV_ROOT}\lib\src\mcs51\*.asm"
 #  File "${DEV_ROOT}\lib\src\mcs51\Makefile"
@@ -757,15 +790,17 @@
 LangString DESC_SEC08 ${LANG_ENGLISH} "SDCC GBZ80 library"
 LangString DESC_SEC09 ${LANG_ENGLISH} "SDCC Z180 library"
 LangString DESC_SEC10 ${LANG_ENGLISH} "SDCC Rabbit 2000 library"
-LangString DESC_SEC11 ${LANG_ENGLISH} "SDCC Z80 library"
-LangString DESC_SEC12 ${LANG_ENGLISH} "SDCC small model library"
-LangString DESC_SEC13 ${LANG_ENGLISH} "SDCC medium model library"
-LangString DESC_SEC14 ${LANG_ENGLISH} "SDCC large model library"
-LangString DESC_SEC15 ${LANG_ENGLISH} "SDCC small-stack-auto model library"
-LangString DESC_SEC16 ${LANG_ENGLISH} "SDCC HC08 library"
-LangString DESC_SEC17 ${LANG_ENGLISH} "SDCC PIC16 library"
-LangString DESC_SEC18 ${LANG_ENGLISH} "SDCC PIC14 library"
-LangString DESC_SEC19 ${LANG_ENGLISH} "SDCC library sources"
+LangString DESC_SEC11 ${LANG_ENGLISH} "SDCC Rabbit 3000A library"
+LangString DESC_SEC12 ${LANG_ENGLISH} "SDCC Z80 library"
+LangString DESC_SEC13 ${LANG_ENGLISH} "SDCC small model library"
+LangString DESC_SEC14 ${LANG_ENGLISH} "SDCC medium model library"
+LangString DESC_SEC15 ${LANG_ENGLISH} "SDCC large model library"
+LangString DESC_SEC16 ${LANG_ENGLISH} "SDCC small-stack-auto model library"
+LangString DESC_SEC17 ${LANG_ENGLISH} "SDCC HC08 library"
+LangString DESC_SEC18 ${LANG_ENGLISH} "SDCC S08 library"
+LangString DESC_SEC19 ${LANG_ENGLISH} "SDCC PIC16 library"
+LangString DESC_SEC20 ${LANG_ENGLISH} "SDCC PIC14 library"
+LangString DESC_SEC21 ${LANG_ENGLISH} "SDCC library sources"
 
 ;Assign language strings to sections
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
@@ -787,7 +822,9 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC16} $(DESC_SEC16)
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC17} $(DESC_SEC17)
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC18} $(DESC_SEC18)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SEC18} $(DESC_SEC19)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC19} $(DESC_SEC19)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC20} $(DESC_SEC20)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC21} $(DESC_SEC21)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 ;--------------------------------
 
@@ -879,6 +916,10 @@
   Delete "$INSTDIR\lib\src\hc08\hc08.lib"
   Delete "$INSTDIR\lib\src\hc08\Makefile"
 
+  Delete "$INSTDIR\lib\src\s08\*.c"
+  Delete "$INSTDIR\lib\src\s08\s08.lib"
+  Delete "$INSTDIR\lib\src\s08\Makefile"
+
   Delete "$INSTDIR\lib\src\z80\*.s"
   Delete "$INSTDIR\lib\src\z80\z80.lib"
   Delete "$INSTDIR\lib\src\z80\README"
@@ -896,6 +937,8 @@
 
   Delete "$INSTDIR\lib\src\r2k\*.s"
 
+  Delete "$INSTDIR\lib\src\r3ka\*.s"
+
   Delete "$INSTDIR\lib\src\ds390\*.c"
   Delete "$INSTDIR\lib\src\ds390\libds390.lib"
   Delete "$INSTDIR\lib\src\ds390\Makefile.dep"
@@ -920,6 +963,8 @@
 
   Delete "$INSTDIR\lib\hc08\*.lib"
 
+  Delete "$INSTDIR\lib\s08\*.lib"
+
   Delete "$INSTDIR\lib\z80\*.rel"
   Delete "$INSTDIR\lib\z80\*.lib"
 
@@ -929,6 +974,9 @@
   Delete "$INSTDIR\lib\r2k\*.rel"
   Delete "$INSTDIR\lib\r2k\*.lib"
 
+  Delete "$INSTDIR\lib\r3ka\*.rel"
+  Delete "$INSTDIR\lib\r3ka\*.lib"
+
   Delete "$INSTDIR\lib\small\*.lib"
 
   Delete "$INSTDIR\lib\medium\*.lib"
@@ -947,6 +995,7 @@
   Delete "$INSTDIR\include\asm\z80\*.h"
   Delete "$INSTDIR\include\asm\z180\*.h"
   Delete "$INSTDIR\include\asm\r2k\*.h"
+  Delete "$INSTDIR\include\asm\r3ka\*.h"
   Delete "$INSTDIR\include\asm\pic16\*.h"
   Delete "$INSTDIR\include\asm\pic14\*.h"
   Delete "$INSTDIR\include\asm\mcs51\*.h"
@@ -981,7 +1030,9 @@
   Delete "$INSTDIR\bin\sdldgb.exe"
   Delete "$INSTDIR\bin\sdld6808.exe"
   Delete "$INSTDIR\bin\sdldz80.exe"
+  Delete "$INSTDIR\bin\sdar.exe"
   Delete "$INSTDIR\bin\sdranlib.exe"
+  Delete "$INSTDIR\bin\sdnm.exe"
   Delete "$INSTDIR\bin\makebin.exe"
   Delete "$INSTDIR\bin\packihx.exe"
   Delete "$INSTDIR\bin\sdcc.exe"
@@ -1021,10 +1072,12 @@
   RMDir "$INSTDIR\lib\src\z180"
   RMDir "$INSTDIR\lib\src\gbz80"
   RMDir "$INSTDIR\lib\src\r2k"
+  RMDir "$INSTDIR\lib\src\r3ka"
   RMDir "$INSTDIR\lib\src\ds390\examples"
   RMDir "$INSTDIR\lib\src\ds390"
   RMDir "$INSTDIR\lib\src\ds400"
   RMDir "$INSTDIR\lib\src\hc08"
+  RMDir "$INSTDIR\lib\src\s08"
   RMDir "$INSTDIR\lib\src"
   RMDir "$INSTDIR\non-free\lib\src"
 
@@ -1035,6 +1088,7 @@
   RMDir "$INSTDIR\lib\z80"
   RMDir "$INSTDIR\lib\z180"
   RMDir "$INSTDIR\lib\r2k"
+  RMDir "$INSTDIR\lib\r3ka"
   RMDir "$INSTDIR\lib\small"
   RMDir "$INSTDIR\lib\medium"
   RMDir "$INSTDIR\lib\large"
@@ -1043,12 +1097,14 @@
   RMDir "$INSTDIR\lib\ds390"
   RMDir "$INSTDIR\lib\ds400"
   RMDir "$INSTDIR\lib\hc08"
+  RMDir "$INSTDIR\lib\s08"
   RMDir "$INSTDIR\lib"
   RMDir "$INSTDIR\non-free\lib"
 
   RMDir "$INSTDIR\include\asm\z80"
   RMDir "$INSTDIR\include\asm\z180"
   RMDir "$INSTDIR\include\asm\r2k"
+  RMDir "$INSTDIR\include\asm\r3ka"
   RMDir "$INSTDIR\include\asm\pic16"
   RMDir "$INSTDIR\non-free\include\asm\pic16"
   RMDir "$INSTDIR\include\asm\pic14"
diff -Nru sdcc-3.1.0+dfsg/support/scripts/sdcc_mingw32 sdcc-3.2.0+dfsg/support/scripts/sdcc_mingw32
--- sdcc-3.1.0+dfsg/support/scripts/sdcc_mingw32	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/scripts/sdcc_mingw32	2012-03-05 10:49:19.000000000 +0000
@@ -1,9 +1,16 @@
 #!/bin/sh
 # Script to crosscompile with mingw32
-TOOLSPREFIX=/usr/local/cross-tools/bin/i586-mingw32msvc-
+if [ $(expr $(hostname) : '.*\.') != '0' ]
+then
+  HOSTNAME=$(expr $(hostname) : '\([^.]*\).')
+else
+  HOSTNAME=$(hostname)
+fi
+TOOLSPREFIX=${HOME}/local-${HOSTNAME}/cross-tools/bin/i586-mingw32msvc-
 
 export CC=${TOOLSPREFIX}gcc
 export CXX=${TOOLSPREFIX}g++
+export AR=${TOOLSPREFIX}ar
 export RANLIB=${TOOLSPREFIX}ranlib
 export STRIP=${TOOLSPREFIX}strip
 
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/COPYING sdcc-3.2.0+dfsg/support/sdbinutils/COPYING
--- sdcc-3.1.0+dfsg/support/sdbinutils/COPYING	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/COPYING	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/COPYING.LIB sdcc-3.2.0+dfsg/support/sdbinutils/COPYING.LIB
--- sdcc-3.1.0+dfsg/support/sdbinutils/COPYING.LIB	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/COPYING.LIB	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,482 @@
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    c) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    d) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+     Appendix: How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library 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
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+    MA 02110-1301, USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/COPYING3 sdcc-3.2.0+dfsg/support/sdbinutils/COPYING3
--- sdcc-3.1.0+dfsg/support/sdbinutils/COPYING3	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/COPYING3	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/COPYING3.LIB sdcc-3.2.0+dfsg/support/sdbinutils/COPYING3.LIB
--- sdcc-3.1.0+dfsg/support/sdbinutils/COPYING3.LIB	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/COPYING3.LIB	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,165 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/ChangeLog sdcc-3.2.0+dfsg/support/sdbinutils/ChangeLog
--- sdcc-3.1.0+dfsg/support/sdbinutils/ChangeLog	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/ChangeLog	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,14459 @@
+2011-08-19  Joel Brobecker  <brobecker@adacore.com>
+
+	* src-release (GDB_SUPPORT_DIRS): Add 'cpu'.
+
+2011-08-14  Yao Qi  <yao@codesourcery.com>
+
+	Merge from gcc:
+
+	2011-08-14  Yao Qi  <yao@codesourcery.com>
+	* configure.ac (tic6x-*-*): Remove gdb from noconfigdirs.
+	* configure: Regenerate.
+
+2011-07-26  Ian Lance Taylor  <iant@google.com>
+
+	Merge from gcc:
+
+	2011-07-26  Ian Lance Taylor  <iant@google.com>
+	* configure.ac: Set have_compiler based on whether gcc directory
+	exists, rather than on whether gcc is in configdirs.
+	* configure: Rebuild.
+
+	2011-07-20  David Edelsohn  <dje.gcc@gmail.com>
+	* Makefile.tpl (POSTSTAGE1_CONFIGURE_FLAGS): Add libsupc++ to
+	link directories.
+	* Makefile.in: Rebuild.
+
+	2011-07-20  Ian Lance Taylor  <iant@google.com>
+	PR bootstrap/49787
+	* configure.ac: Move --enable-bootstrap handling earlier in file.
+	If --enable-bootstrap and either --enable-build-with-cxx or
+	--enable-build-poststage1-with-cxx, enable C++ automatically.
+	* configure: Rebuild.
+
+	2011-07-19  Ian Lance Taylor  <iant@google.com>
+	* configure.ac: Add --enable-build-poststage1-with-cxx.  If set,
+	make C++ a boot_language.  Set and substitute
+	POSTSTAGE1_CONFIGURE_FLAGS.
+	* Makefile.tpl (POSTSTAGE1_CONFIGURE_FLAGS): New variable.
+	(STAGE[+id+]_CONFIGURE_FLAGS): Add $(POSTSTAGE1_CONFIGURE_FLAGS).
+	* configure, Makefile.in: Rebuild.
+
+	2011-07-16  Jason Merrill  <jason@redhat.com>
+	* Makefile.def (language=c++): Add check-c++0x and
+	check-target-libmudflap-c++.
+	* Makefile.tpl (check-target-libmudflap-c++): New.
+	* Makefile.in: Regenerate.
+
+	2011-07-16  Matthias Klose  <doko@ubuntu.com>
+	* Makefile.tpl (EXTRA_CONFIGARGS_LIBJAVA): Define.
+	* Makefile.def (target_modules/libjava): Pass
+	$(EXTRA_CONFIGARGS_LIBJAVA).
+	* configure.ac: Pass --disable-static in EXTRA_CONFIGARGS_LIBJAVA,
+	if not configured with --enable-static-libjava.
+	* Makefile.in: Regenerate.
+	* configure: Likewise.
+
+	2011-06-22  Hans-Peter Nilsson  <hp@axis.com>
+	PR regression/47836
+	PR bootstrap/23656
+	PR other/47733
+	PR bootstrap/49247
+	PR c/48825
+	* configure.ac (target_libraries): Remove target-libiberty.
+	Remove case-statement setting skipdirs=target-libiberty for
+	multiple targets.  Remove checking target_configdirs and
+	removing target-libiberty but keeping target-libgcc if
+	otherwise empty.
+	* Makefile.def (target_modules): Don't add libiberty.
+	(dependencies): Remove all traces of target-libiberty.
+	* configure, Makefile.in: Regenerate.
+
+2011-07-22  Jason Merrill  <jason@redhat.com>
+
+	* Makefile.def (language=c++): Add check-c++0x and
+	check-target-libmudflap-c++.
+	* Makefile.tpl (check-target-libmudflap-c++): New.
+	* Makefile.in: Regenerate.
+
+2011-07-18  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* configure: Regenerate.
+
+2011-07-07  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	PR target/39150
+	* configure.ac (i[3456789]86-*-solaris2*): Also accept
+	x86_64-*-solaris2.1[0-9]*.
+	* configure: Regenerate.
+
+2011-06-13  Walter Lee <walt@tilera.com>
+
+	* configure.ac (tilepro-*-*) New case.
+	(tilegx-*-*): Likewise.
+	* configure: Regenerate.
+
+2011-06-06  Nick Clifton  <nickc@redhat.com>
+
+	* config.sub: Sync from upstream.
+
+2011-05-08  Doug Kwan  <dougkwan@google.com>
+
+	Merge from gcc:
+
+	2011-05-08  Doug Kwan  <dougkwan@google.com>
+
+		* configure.ac: Propagate LDFLAGS_FOR_TARGET.
+		* configure: Regenerated.
+		* Makefile.tpl (LDFLAGS_FOR_TARGET): Use LDFLAGS_FOR_TARGET
+		value from configure.
+		* Makefile.in: Regenerated.
+
+2011-05-05  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac (alpha*-dec-osf*, i[[3456789]]86-*-rdos*,
+	sh*-*-pe|mips*-*-pe|arm-wince-pe, sparc-*-sunos4*, *-*-aix*,
+	*-*-beos*, *-*-chorusos, *-*-dragonfly*, *-*-freebsd*, *-*-linux*
+	| *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu, *-*-lynxos*,
+	*-*-mingw*, *-*-netbsd*, *-*-netware*, *-*-tpf*, *-*-uclinux*,
+	*-*-vxworks*): Disable newlib and libgloss in separate case
+	statement.
+	(i[[3456789]]86-*-linux*): Move logic allowing newlib to be built
+	to separate case statement.
+	(*-*-chorusos, *-*-dragonfly*, *-*-freebsd*, *-*-netbsd*,
+	*-*-netware*, *-*-tpf*, *-*-uclinux*, *-*-vxworks*,
+	alpha*-dec-osf*, alpha*-*-linux*, am33_2.0-*-linux*, sh-*-linux*,
+	sh*-*-pe|mips*-*-pe|*arm-wince-pe, arm-*-coff, arm-*-elf* |
+	arm*-*-eabi*, arm*-*-linux-gnueabi, arm*-*-symbianelf*, avr-*-*,
+	bfin-*-*, cris-*-* | crisv32-*-*, frv-*-*, i[[3456789]]86-*-coff |
+	i[[3456789]]86-*-elf, i[[3456789]]86-w64-mingw*,
+	i[[3456789]]86-*-mingw*, x86_64-*-mingw*,
+	i[[3456789]]86-*-interix*, i[[3456789]]86-*-beos*,
+	i[[3456789]]86-*-rdos*, m32r-*-*,
+	m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*, m68k-*-elf*, m68*-*-*
+	| fido-*-*, powerpc-*-aix*, powerpc-*-beos*, powerpc-*-eabi,
+	powerpc-*-eabi* | powerpcle-*-eabi* | powerpc-*-rtems*,
+	rs6000-*-lynxos*, rs6000-*-aix*, mips*-*-linux*, sparclet-*-aout*
+	| sparc86x-*-*, sparc-*-elf*, sparc64-*-elf*, sparclite-*-*,
+	sparc-*-sunos4*, sparc-*-solaris* | sparc64-*-solaris* |
+	sparcv9-*-solaris*, *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu |
+	*-*-kopensolaris*-gnu, *-*-lynxos*, *-*-*): Don't disable newlib
+	and libgloss in main case over targets.  Remove most empty cases
+	in main case over targets.
+	* configure: Regenerate.
+
+2011-05-04  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac: Remove code setting special library locations for
+	hppa*64*-*-hpux11*.  Remove code setting compiler for
+	sparc-sun-solaris2*.
+	* configure: Regenerate.
+
+2011-05-04  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac: Separate libgloss_dir settings from general case
+	over targets.
+	* configure: Regenerate.
+
+2011-04-28  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac (*-*-dragonfly*, *-*-freebsd*, *-*-netbsd*,
+	alpha*-dec-osf*, alpha*-*-linux*, alpha*-*-*, sh-*-linux*,
+	arm-*-elf* | arm*-*-eabi*, arm*-*-linux-gnueabi, frv-*-*): Remove
+	cases in libgcj-disabling case statement.
+	(hppa*64*-*-linux*): Set unsupported_languages instead of
+	disabling target-zlib.
+	(hppa*64*-*-*): Restrict case in libgcj-disabling case statement
+	to hppa*64*-*-hpux*.
+	(hppa*-*-*): Restrict case in libgcj-disabling case statement to
+	hppa*-*-hpux*.
+	(ia64*-*-elf*, ia64*-**-hpux*, i[[3456789]]86-*-elf,
+	i[[3456789]]86-*-linux*, *-*-cygwin*, i[[3456789]]86-*-interix*,
+	i[[3456789]]86-*-solaris2*, m32r-*-*, m68k-*-elf*, m68*-*-* |
+	fido-*-*, powerpc-*-eabi, powerpc-*-eabi* | powerpcle-*-eabi* |
+	powerpc-*-rtems*, mips*-*-linux*, mips*-*-*, sh-*-* | sh64-*-*,
+	sparc-*-elf*, sparc64-*-elf*, sparc-*-solaris* |
+	sparc64-*-solaris* | sparcv9-*-solaris*, *-*-linux* | *-*-gnu* |
+	*-*-k*bsd*-gnu | *-*-kopensolaris*-gnu, *-*-*): Remove cases in
+	libgcj-disabling case statement.
+	* configure: Regenerate.
+
+2011-04-28  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac: Disable Java for targets not supporting libffi.
+	(*-*-chorusos, *-*-kaos*, am33_2.0-*-linux*, sh*-*-pe|mips*-*-pe):
+	Remove cases in Java-disabling statement.
+	(*arm-wince-pe): Change to arm-wince-pe.
+	(arc-*-*, arm-*-coff, arm-*-pe*, arm-*-riscix*, avr-*-*): Remove
+	cases in Java-disabling statement.
+	(bfin-*-*): Don't disable Java again.
+	(c4x-*-* | tic4x-*-*, tic54x-*-*, cr16-*-*, d10v-*-*, d30v-*-*,
+	fr30-*-elf*, moxie-*-*, h8300*-*-*, h8500-*-*, hppa1.1-*-osf* |
+	hppa1.1-*-bsd*, hppa*-*-*elf* | hppa*-*-lites* | hppa*-*-openbsd*,
+	hppa*-*-pro*, i960-*-*, i[[3456789]]86-*-coff,
+	i[[3456789]]86-*-pe, i[[3456789]]86-*-sco3.2v5*,
+	i[[3456789]]86-*-sco*, i[[3456789]]86-*-sysv4*,
+	i[[3456789]]86-*-beos*, i[[3456789]]86-*-rdos*,
+	m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*): Remove cases in
+	Java-disabling statement.
+	(mmix-*-*): Don't disable Java again.
+	(mt-*-*, powerpc*-*-winnt* | powerpc*-*-pe*, powerpcle-*-solaris*,
+	powerpc-*-beos*, rs6000-*-lynxos*, rs6000-*-*, m68k-apollo-*,
+	microblaze*, mips*-sde-elf*, mips*-*-irix5*, mips*-*-bsd*,
+	sparclet-*-aout* | sparc86x-*-*, sparclite-*-*, sparc-*-sunos4*,
+	tic6x-*-*, v810-*-*, vax-*-*): Remove cases in Java-disabling
+	statement.
+	* configure: Regenerate.
+
+2011-04-28  Joseph Myers  <joseph@codesourcery.com>
+
+	Merge from GCC:
+
+	2011-04-18  Jack Howarth  <howarth@bromo.med.uc.edu>
+
+	PR lto/48086
+	* configure.ac: Re-enable LTO on *-apple-darwin9*.
+	* configure: Regenerate.
+
+2011-04-28  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac: Separate cases disabling Java and Java libraries
+	from general case over targets.
+	* configure: Regenerate.
+
+2011-04-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac (build_tools): Remove build-byacc.
+	(host_libs): Remove mmalloc.
+	(host_tools): Remove byacc make patch prms send-pr ash bash bzip2
+	autoconf automake libtool diff rcs fileutils shellutils time
+	textutils wdiff find uudecode hello tar gzip indent recode release
+	sed perl gawk findutils gettext zip.
+	(libgcj): Remove target-qthreads.
+	(target_tools): Remove target-examples target-gperf.
+	(YACC): Don't handle building byacc.
+	* configure: Regenerate.
+	* Makefile.def (ash, autoconf, automake, bash, byacc, bzip2, diff,
+	dosutils, examples, fileutils, find, findutils, gawk, gettext,
+	gnuserv, gperf, gzip, hello, indent, libtool, make, mmalloc,
+	patch, perl, prms, qthreads, rcs, recode, release, sed, send-pr,
+	shellutils, tar, textutils, time, uudecode, wdiff, zip): Don't
+	handle building components.
+	* Makefile.in: Regenerate.
+
+2011-04-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* config.sub: Sync from upstream.
+
+2011-04-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac (avr-*-*): Add comment about why libssp is disabled.
+	(microblaze*): Don't disable libssp.
+	* configure: Regenerate.
+
+2011-04-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac: Remove code setting CONFIG_SHELL, config_shell and
+	moveifchange.
+	* configure: Regenerate.
+	* Makefile.tpl: Use @SHELL@ not @config_shell@.
+	* Makefile.in: Regenerate.
+
+2011-04-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac (*-*-sysv4*): Don't enable libgomp.
+	(alpha*-*-*vms*, i[[34567]]86-*-sco3.2v5*, mn10300-*-*,
+	powerpc-*-chorusos*, powerpc*-*-eabi*, powerpc*-*-sysv*,
+	powerpc*-*-kaos*, s390x-ibm-tpf*, sparc64-*-elf*, v850*-*-*,
+	xtensa*-*-elf*, *-*-beos*, *-*-elf*, *-*-netware*, *-*-rtems*,
+	*-*-sysv[[45]]*, *-*-vxworks*, *-wrs-windiss): Remove
+	md_exec_prefix cases.
+	* configure: Regenerate.
+
+2011-04-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac: Separate cases disabling target-libssp,
+	target-libiberty, target-libstdc++-v3 and Fortran from general
+	case over targets.
+	* configure: Regenerate.
+
+2011-04-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac (*-*-chorusos): Don't disable libgcj.
+	(*-*-freebsd[[12]] | *-*-freebsd[[12]].* | *-*-freebsd*aout*):
+	Remove case.
+	(*-*-kaos*): Don't disable GCC libraries, zlib or fastjar.
+	(arm-*-coff): Don't disable libgcj.
+	(arm*-*-linux-gnueabi): Remove useless assignment.
+	(arm-*-riscix*): Don't disable libgcj.
+	(bfin-*-*): Don't enable target-bsp and target-cygmon depending on
+	configuration.
+	(c4x-*-* | tic4x-*-*): Don't disable GCC libraries.
+	(c54x*-*-*): Remove case.
+	(tic54x-*-*): Don't disable GCC or GCC libraries.
+	(cris-*-* | crisv32-*-*): Don't handle *-*-aout.  Change *-*-elf
+	to *.
+	(d10v-*-*): Don't disable GCC libraries.
+	(d30v-*-*): Don't disable libgcj.
+	(h8500-*-*): Don't disable GCC libraries.
+	(i960-*-*): Don't disable libgcj.
+	(i[[3456789]]86-*-linux*): Don't handle *-*-*libc1*.
+	(i[[3456789]]86-*-sco3.2v5*, i[[3456789]]86-*-sco*,
+	i[[3456789]]86-*-sysv4*, i[[3456789]]86-*-beos*): Don't disable
+	libgcj.
+	(m68k-*-coff*): Remove case.
+	(mmix-*-*): Don't disable libgloss on host.
+	(mn10200-*-*, mn10300-*-*): Remove cases.
+	(powerpc*-*-winnt* | powerpc*-*-pe*, powerpcle-*-solaris*,
+	powerpc-*-beos*, m68k-apollo-*, mips*-*-irix5*, mips*-*-bsd*):
+	Don't disable libgcj.
+	(romp-*-*): Remove case.
+	(sparclite-*-*, sparc-*-sunos4*): Don't disable libgcj.
+	(sparc-*-solaris2.[[0-6]] | sparc-*-solaris2.[[0-6]].*): Remove
+	case.
+	(v810-*-*): Don't disable GCC libraries.
+	(v850*-*-*, vax-*-vms, xtensa*-*-*): Remove cases.
+	(ip2k-*-*): Don't disable GCC libraries.
+	* configure: Regenerate.
+
+2011-03-28  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac (i[[3456789]]86-*-msdosdjgpp*): Don't disable
+	libffi on host.
+	(x86_64-*-mingw*, i[[3456789]]86-*-mingw32*): Don't disable newlib
+	on host.
+	(c54x*-*-* | tic54x-*-*): Don't disable newlib on host.
+	* configure: Regenerate.
+
+2011-03-26  John Marino  <binutils@marino.st>
+
+	* configure.ac: Add support for *-*-dragonfly*
+	* configure: Regenerate.
+
+2011-03-25  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac (native_only): Remove.
+	(i[[3456789]]86-*-msdosdjgpp*): Don't disable expect dejagnu
+	send-pr uudecode guile gnuserv on host.
+	(x86_64-*-mingw*): Don't disable expect dejagnu autoconf automake
+	send-pr rcs guile perl texinfo libtool on host.
+	(i[[3456789]]86-*-mingw32*): Don't disable expect dejagnu autoconf
+	automake send-pr rcs guile perl texinfo libtool on host.
+	(*-*-cygwin*, *-*-netbsd*): Remove host cases.
+	(*-*-kaos*): Don't disable target-examples target-gperf on target.
+	(alpha*-dec-osf*): Don't disable fileutils on target.
+	(sh*-*-pe|mips*-*-pe|*arm-wince-pe): Don't disable target-examples
+	texinfo send-pr expect dejagnu on target.
+	(arm-*-elf* | arm*-*-eabi*, arm*-*-linux-gnueabi): Don't disable
+	target-qthreads on target.
+	(hppa*-hp-hpux11*, hppa*-*-*): Don't disable shellutils on target.
+	(ia64*-*-elf*, ia64*-*-*vms*): Don't disable mmalloc on target.
+	(i[[3456789]]86-w64-mingw*, i[[3456789]]86-*-mingw*,
+	x86_64-*-mingw*): Don't disable expect on target.
+	(*-*-cygwin*): Don't disable target-gperf on target.
+	(powerpc*-*-winnt* | powerpc*-*-pe*): Don't disable make expect
+	gnuserv on target.
+	(powerpcle-*-solaris*): Don't disable make expect gnuserv on
+	target.
+	* configure: Regenerate.
+
+2011-03-25  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac (target_tools): Remove target-groff.
+	(native_only): Remove target-groff.
+	(hppa*64*-*-*): Don't disable byacc.
+	(i[[3456789]]86-*-mingw32*): Remove commented-out noconfigdirs
+	setting.
+	(*-*-kaos*): Don't skip target-librx and target-groff.
+	(*-*-netware*): Don't skip target-libmudflap.
+	(*-*-tpf*): Don't skip target-libmudflap.
+	(sh*-*-pe|mips*-*-pe|*arm-wince-pe): Don't condition configured
+	directories on the host.
+	(ia64*-*-*vms*): Don't skip tix.
+	(sh-*-* | sh64-*-*): Don't condition skipped directories on the
+	host.
+	* configure: Regenerate.
+
+2011-03-24  Paolo Bonzini  <pbonzini@redhat.com>
+
+	* configure.ac: Remove references to mt-mep, mt-netware,
+	mt-wince.
+	* Makefile.def: Add all-utils soft dependencies.
+	* Makefile.tpl: Remove GDB_NLM_DEPS.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
+2011-03-24  Paolo Bonzini  <bonzini@gnu.org>
+
+	Sync from GCC:
+
+	2011-03-24  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.ac: Do not include mh-x86omitfp.
+	* configure: Regenerate.
+
+	2011-03-24  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.ac: Remove empty cases.
+	* configure: Regenerate.
+
+	2011-03-24  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def: Add dependency from termcap to gdb.
+	* Makefile.in: Regenerate.
+
+	2011-03-24  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.ac: Remove all mentions of mh-sysv4 and mh-solaris.
+	* configure: Regenerate.
+	* Makefile.def: Remove all mentions of X11_FLAGS_TO_PASS.
+	* Makefile.tpl: Likewise.
+	* Makefile.in: Regenerate.
+
+	2011-03-24  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.ac: Remove all mentions of tentative_cc.
+	* configure: Regenerate.
+
+	2011-03-16  Jack Howarth  <howarth@bromo.med.uc.edu>
+
+	PR lto/48086
+	* configure.ac: Re-enable LTO on *-apple-darwin9.
+	* configure: Regenerate.
+
+2011-03-24  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac (i[[3456789]]86-*-vsta, i[[3456789]]86-*-go32*,
+	i[[3456789]]86-*-beos*, powerpc-*-beos*, m68k-hp-hpux*,
+	m68k-apollo-sysv*, m68k-apollo-bsd*, m88k-dg-dgux*,
+	m88k-harris-cxux*, m88k-motorola-sysv*, mips*-dec-ultrix*,
+	mips*-nec-sysv4*, mips*-sgi-irix4*, mips*-*-sysv4*, mips*-*-sysv*,
+	i370-ibm-opened*, i[[3456789]]86-*-sysv5*, i[[3456789]]86-*-dgux*,
+	i[[3456789]]86-ncr-sysv4.3*, i[[3456789]]86-ncr-sysv4*,
+	i[[3456789]]86-*-sco3.2v5*, i[[3456789]]86-*-sco*,
+	i[[3456789]]86-*-udk*, vax-*-ultrix2*, m68k-sun-sunos*,
+	hppa*-*-hiux*, *-*-hiux*, rs6000-*-lynxos*, *-*-sysv4*,
+	*-*-rhapsody*): Remove host cases.
+	* configure: Regenerate.
+
+2011-03-24  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac (ppc*-*-pe): Remove host case.
+	(strongarm-*-coff | xscale-*-coff, strongarm-*-elf* |
+	xscale-*-elf*, thumb-*-coff, thumb-*-elf, thumb-*-pe, ep9312-*-elf
+	| ep9312-*-coff, parisc*64*-*-linux*, ppc*-*-pe): Remove target
+	cases.
+	* configure: Regenerate.
+
+2011-03-24  Joseph Myers  <joseph@codesourcery.com>
+
+	* config.sub: Update to version 2011-03-23.
+
+2011-03-22  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac (arm-semi-aof, crx-*-*, parisc*-*-linux*,
+	i370-*-opened*, i[[3456789]]86-moss-msdos | i[[3456789]]86-*-moss*
+	| i[[3456789]]86-*-uwin*, mcore-*-pe*): Remove empty cases.
+	* configure: Regenerate.
+
+2011-03-22  Joseph Myers  <joseph@codesourcery.com>
+
+	* config-ml.in: Don't handle arc-*-elf*.
+	* configure.ac (arc-*-*, crx-*-*, i[[3456789]]86-*-pe,
+	m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*, mcore-*-pe*): Don't
+	handle GCC libraries.
+	* configure: Regenerate.
+
+2011-03-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	PR bootstrap/48120:
+	* configure.ac (pwllib): Use LIBS instead of LDFLAGS.
+	Add -lstdc++ -lm to LIBS.
+	* configure: Regenerate.
+
+2011-03-18  David Edelsohn  <dje.gcc@gmail.com>
+
+	* config.guess: Update to version 2011-02-02
+	* config.sub: Update to version 2011-02-24
+	
+2011-03-03  Sebastian Pop  <sebastian.pop@amd.com>
+
+        * configure.ac: Adjust test of with_ppl.
+        * configure: Regenerated.
+
+2011-03-02  Sebastian Pop  <sebastian.pop@amd.com>
+
+	* configure.ac: Add -lpwl to ppllibs.
+	* config/cloog.m4: Add -lisl to clooglibs.
+	* configure: Regenerated.
+
+2011-02-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Import from Libtool and gnulib:
+
+	2011-01-27  Gerald Pfeifer  <gerald@pfeifer.com>
+
+	Prepare for supporting FreeBSD 10.
+	* config.rpath: Remove handling of freebsd1* which soon would
+	match FreeBSD 10.0.
+
+	2011-01-20  Gerald Pfeifer  <gerald@pfeifer.com>  (tiny change)
+
+	Remove support for FreeBSD 1.x.
+	* libtool.m4 (_LT_LINKER_SHLIBS)
+	(_LT_SYS_DYNAMIC_LINKER): Remove handling of freebsd1* which
+	soon would incorrectly match FreeBSD 10.0.
+
+2011-02-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	PR binutils/12283
+	* MAINTAINERS (mkinstalldirs): Comes from Automake.
+	(move-if-change): Comes from gnulib.
+	* move-if-change: Import version from gnulib.
+
+2011-02-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Sync from GCC:
+
+	2011-02-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR lto/47225
+	* Makefile.def (lto-plugin): Double dash for enable-shared.
+	(configure-gcc): Depend on all-lto-plugin.
+	* Makefile.in: Rebuilt.
+
+	2011-02-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure.ac: Remove extra bracket.
+	* configure: Regenerate.
+
+	2011-02-06  Kai Tietz  <kai.tietz@onevision.com>
+
+	PR lto/47225
+	* Makefile.def: Add dependency for install-gcc
+	on install-lto-plugin.
+	* Makfile.in: Regenerated
+
+	2011-01-25  Jakub Jelinek  <jakub@redhat.com>
+
+	* configure.ac: If with_ppl is no, move setting with_cloog=no
+	after CLOOG_REQUESTED check.
+	* configure: Regenerated.
+
+	2011-01-25  Sebastian Pop  <sebastian.pop@amd.com>
+
+	* configure.ac: Call AC_MSG_ERROR when PPL 0.11 is not present and
+	CLooG has been requested.
+	* configure: Regenerated.
+
+	2011-01-25  Sebastian Pop  <sebastian.pop@amd.com>
+
+	* configure: Regenerated.
+	* configure.ac: Check for version 0.11 (or later revision) of PPL.
+
+	2011-01-25  Tobias Grosser  <grosser@fim.uni-passau.de>
+
+	* configure: Regenerated.
+	* configure.ac: Use CLOOG_CHECK_VERSION(0,16,1).
+
+	2011-01-07  Jan Hubicka  <jh@suse.cz>
+
+	PR lto/47225
+	* Makefile.in: Regenerate.
+	* Makefile.def (lto-plugin): Always pass enable-shared to the plugin
+	configure.
+
+2011-01-31  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR libgcj/44341
+	* configure.ac: Discard --with-* flags for host when configuring
+	target libraries for cross build.
+	* configure: Rebuilt.
+
+2011-01-21  Andreas Schwab  <schwab@redhat.com>
+
+	Sync from GCC:
+
+	2011-01-21  Andreas Schwab  <schwab@redhat.com>
+
+	* configure.ac: Use AS_HELP_STRING throughout.
+	* configure: Regenerate.
+
+	2011-01-18  Jie Zhang  <jie.zhang@analog.com>
+
+	* configure.ac (bfin-*-*): Remove gdb from noconfigdirs.
+	* configure: Regenerate.
+
+2010-12-10  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* ltmain.sh (relink): Use absolute path when hardcoding with -L.
+
+2011-01-13  Joel Brobecker  <brobecker@adacore.com>
+
+	* configure.ac: Remove readline, mmalloc, and gdb from noconfigdirs
+	for ia64-hpux.
+	* configure: Regenerate.
+
+2011-01-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Sync from GCC:
+	2010-12-22  Hariharan Sandanagobalane  <hariharan@picochip.com>
+
+	* configure.ac: (picochip): Disable libiberty.
+	* configure: Regenerate.
+
+2010-12-18  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.LIBGLOSS: Remove the GPL for fr30 target.
+
+2010-12-10  Ian Lance Taylor  <iant@google.com>
+
+	PR bootstrap/46819
+	* configure.ac: For --disable-libgcj clear libgcj_saved.
+	* configure: Rebuild.
+
+2010-12-10  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/46540
+	* configure.ac: Add --disable-libquadmath and
+	--disable-libquadmath-support.
+	* configure: Regenerate.
+
+2010-12-10  Tristan Gingold  <gingold@adacore.com>
+
+	* src-release (ETC_SUPPORT): add gnu-oids.texi
+
+2010-12-03  Hans-Peter Nilsson  <hp@axis.com>
+
+	PR libffi/46792
+	* configure.ac (cris-*-elf, crisv32-*-elf): Disable target-libffi.
+	* configure: Regenerate.
+
+2010-12-02  Ian Lance Taylor  <iant@google.com>
+
+	* configure.ac: Always set default for poststage1_ldflags to
+	-static-libstdc++ -static-libgcc.
+
+2010-12-02  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.NEWLIB: Add National Semiconductor notice.
+
+2010-11-29  Andreas Schwab  <schwab@redhat.com>
+
+	* configure.ac: Move comment to remove extra space in last argument
+	of GCC_TARGET_TOOL.
+
+2010-11-26  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR other/46026
+	* configure.ac (CXX_FOR_TARGET): Add -funconfigured-libstdc++-v3.
+	* Makefile.def (CXX_FOR_TARGET): Removed from flags_to_pass.
+	* Makefile.tpl (CXX_FOR_TARGET_FLAG_TO_PASS): New.
+	(BASE_FLAGS_TO_PASS): Use it.
+	* configure: Rebuilt.
+	* Makefile.in: Rebuilt.
+
+2010-11-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/12258
+	* configure.ac: Correct comments for --enable-gold/--enable-ld.
+	Properly check default linker.
+	* configure: Regnerated.
+
+2010-11-23  Matthias Klose  <doko@ubuntu.com>
+
+	* configure.ac: For --enable-gold, handle value `default' instead of
+	`both*'.   New configure option --{en,dis}able-ld.
+	* configure: Regenerate.
+
+2010-11-20  Ian Lance Taylor  <iant@google.com>
+
+	* configure.ac: Only disable a language library if no language needs
+	it.  Don't let --disable-libgcj uncondtionally disable libffi.
+	* configure: Rebuild.
+
+2010-11-20  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure: Regenerate.
+
+2010-11-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	PR other/46202
+	* configure.ac: Fix just-built in-tree STRIP name to be
+	binutils/strip-new.
+	* configure: Regenerate.
+	* Makefile.def (install-strip-gcc, install-strip-binutils)
+	(install-strip-opcodes, install-strip-ld, install-strip-itcl)
+	(install-strip-sid): Mirror dependencies on non-strip variants
+	of these targets on the respective -strip prerequisites.
+	* Makefile.tpl (install-strip, install-strip-host)
+	(install-strip-target): New targets.
+	(install-strip-[+module+], install-strip-target-[+module+]):
+	New targets.
+	* Makefile.in: Regenerate.
+
+2010-11-19  Ian Lance Taylor  <iant@google.com>
+	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure.ac: Add target-libgo to target_libraries.  Set
+	and substitute GOC_FOR_BUILD and GOC_FOR_TARGET.
+	* Makefile.tpl (BUILD_EXPORTS): Add GOC and GOCFLAGS.
+	(HOST_EXPORTS): Add GOC.
+	(BASE_TARGET_EXPORTS): Add GOC.
+	(GOC_FOR_BUILD, GOCFLAGS, GOC_FOR_TARGET): New variables.
+	(GOCFLAGS_FOR_TARGET): New variable.
+	(EXTRA_HOST_FLAGS): Add GOC.
+	(EXTRA_TARGET_FLAGS): Add GOC and GOCFLAGS.
+	* Makefile.def (target_modules): Add libgo.
+	(flags_to_pass): Add GOC_FOR_TARGET and GOCFLAGS_FOR_TARGET.
+	(dependencies): Add dependency from configure-target-libgo to
+	configure-target-libffi and all-target-libstdc++-v3.  Add
+	dependencies from all-target-libgo to all-target-libffi.
+	(languages): Add go.
+	* configure: Rebuild.
+	* Makefile.in: Rebuild.
+
+2010-11-19  Ian Lance Taylor  <iant@google.com>
+
+	* config-ml.in: Add Go support: treat GOC and GOCFLAGS like other
+	compiler/flag environment variables.
+
+2010-11-18  Ian Lance Taylor  <iant@google.com>
+
+	* configure.ac: Check for lang_requires_boot_languages in
+	config-lang.in files.
+	* configure: Rebuild.
+
+2010-11-17  Mike Frysinger  <vapier@gentoo.org>
+
+	* .gitignore: New file.
+
+2010-11-16  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+	    Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/32049
+	* Makefile.def: Add libquadmath; build it with language=fortran.
+	* configure.ac: Add libquadmath.
+	* Makefile.tpl: Handle multiple libs in check-[+language+].
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2010-11-15  Andreas Schwab  <schwab@redhat.com>
+
+	* configure.ac: Fix spelling in option names.
+	* configure: Regenerated.
+
+2010-11-13  Georg-Johann Lay  <georgjohann@web.de>
+
+	PR bootstrap/39622
+	* configure.ac (FLAGS_FOR_TARGET): Add include-fixed path.
+	* configure: Regenerated.
+
+2010-11-12  Tobias Grosser  <grosser@fim.uni-passau.de>
+
+	* config/cloog.m4: Add -enable-cloog-backend=(isl|ppl|ppl-legacy) to
+	define the cloog backend to use. Furthermore, only pass the ppllibs to
+	the configure checks, if necessary.
+	* configure: Regenerate.
+
+2010-11-12  Tobias Grosser  <grosser@fim.uni-passau.de>
+
+	* config/cloog.m4: Use CLooG predefined macro to check for CLooG PPL.
+	* configure: regenerate
+
+2010-11-12  Tobias Grosser  <grosser@fim.uni-passau.de>
+
+	* config/cloog.m4: Fix typo.  verison -> version.
+	* configure: Regenerate.
+
+2010-11-12  Tobias Grosser  <grosser@fim.uni-passau.de>
+
+	* config/cloog.m4: Pass ppl libraries to the CLooG version check.
+	* configure: Regenerate.
+
+2010-11-11  Andreas Simbuerger  <simbuerg@fim.uni-passau.de>
+
+	* configure.ac: Support official CLooG.org versions.
+	* configure: Regenerate.
+	* config/cloog.m4: New.
+
+2010-11-05  Michael Eager  <eager@eagercon.com>
+
+	* COPYING.LIBGLOSS: Correct typo in microblaze.
+	* COPYING.NEWLIB: Same.
+
+2010-11-04  Iain Sandoe  <iains@gcc.gnu.org>
+
+	* configure.ac (*-*-darwin*): Use mh-darwin for all Darwin variants.
+	* configure: Regenerate.
+
+2010-11-03  Ian Lance Taylor  <iant@google.com>
+	    Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	PR lto/46273
+	* configure.ac: Remove libelf tests.  Build lto-plugin on ELF always
+	and on other supported platforms whenever LTO is enabled.
+	* configure: Rebuild.
+
+2010-11-02  Alan Modra  <amodra@gmail.com>
+
+	PR binutils/12110
+	* configure.ac: Error when source path contains spaces.
+	* configure: Regenerate.
+
+2010-10-20  Ian Lance Taylor  <iant@google.com>
+
+	* Makefile.def (target_modules): Set lib_path to src/.libs for
+	libstdc++-v3 module.
+	* Makefile.tpl: Fix typo in TARGET_LIB_PATH comment.
+	* Makefile.in: Rebuild.
+
+2010-10-08  Bernd Schmidt  <bernds@codesourcery.com>
+	    Joseph Myers  <joseph@codesourcery.com>
+
+	* COPYING.LIBGLOSS: Add National Semiconductor and CodeSourcery
+	notices.
+	* COPYING.NEWLIB: Add Texas Instruments notice.
+
+2010-10-07  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* configure.ac (build_lto_plugin): New shell variable.
+	(--enable-lto): Turn on by default for all non-ELF platforms that
+	have had LTO support added so far.  Set build_lto_plugin appropriately
+	for both ELF and non-ELF.
+	(configdirs): Add lto-plugin or not based on build_lto_plugin.
+	* configure: Regenerate.
+
+2010-10-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	PR bootstrap/45326
+	PR bootstrap/45174
+	* configure.ac: Honor initial values of $build_configargs,
+	$host_configargs, $target_configargs.  Mark the precious, so
+	environment settings get recorded.
+	* configure: Regenerate.
+
+2010-10-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Sync from GCC:
+
+	2010-09-30  Michael Eager  <eager@eagercon.com>
+
+	* configure.ac (microblaze): Add target-libssp to noconfigdirs.
+	* configure: Regenerate.
+
+	2010-09-21  Iain Sandoe  <iains@gcc.gnu.org>
+
+	* configure.ac (enable-lto): Add Darwin to the list of supported lto
+	targets and amend comment.
+	* configure: Regenerate.
+
+	2010-09-03  Jack Howarth <howarth@bromo.med.uc.edu>
+
+	* configure.ac: Enable LTO by default on Darwin.
+	* configure: Regenerate.
+
+	2010-07-23  Marc Glisse <marc.glisse@normalesup.org>
+
+	PR bootstrap/44455
+	* configure.ac (extra_mpfr_configure_flags): Copy from
+	extra_mpc_gmp_configure_flags.
+	* configure: Re-generated.
+
+2010-09-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Sync from GCC:
+
+	PR bootstrap/45796
+	* Makefile.def (info-gcc, dvi-gcc, pdf-gcc, html-gcc):
+	Depend on all-build-libiberty.
+	* Makefile.in: Regenerate.
+
+2010-09-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Sync from GCC:
+
+	PR bootstrap/44621
+	* configure.ac: Fix unportable shell quoting.
+	* configure: Regenerate.
+
+2010-07-26  Naveen.H.S  <naveen.S@kpitcummins.com>
+
+	* configure.ac: Support all v850 targets.
+	* configure: Regenerate.
+
+2010-07-17  Jack Howarth  <howarth@bromo.med.uc.edu>
+
+	PR target/44862
+	* Makefile.tpl (POSTSTAGE1_CXX_EXPORT):
+	Provide -B option to allow for link spec %s substitutions for
+	libstdc++.a on darwin.
+	* Makefile.in: Regenerate.
+
+2010-06-10  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.def (configure-gcc): Depend on all-libelf.
+	* Makefile.in: Rebuild.
+
+2010-06-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* config.sub, config.guess: Update from upstream sources.
+
+2010-06-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Sync from GCC:
+
+	2010-05-05  Sebastian Pop  <sebastian.pop@amd.com>
+	* configure.ac: Allow all the versions greater than 0.10 of PPL.
+	* configure: Regenerated.
+
+	2010-04-20  Eric Botcazou  <ebotcazou@adacore.com>
+	* configure.ac (BUILD_CONFIG): Redirect output to /dev/null.
+	* configure: Regenerate.
+
+	2010-04-17  Ralf Cors<E9>pius  <ralf.corsepius@rtems.org>
+	* configure.ac (*-*-rtems*): Add target-libiberty to $skipdirs.
+	* configure: Regenerate.
+
+	2010-04-16  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+	* configure.ac: Check for elf_getshdrstrndx or elf_getshstrndx
+	separately.
+	* configure: Regenerate.
+
+	2010-04-13  Steve Ellcey  <sje@cup.hp.com>
+	* configure: Regenerate after change to elf.m4.
+
+	2010-04-02  Sebastian Pop  <sebastian.pop@amd.com>
+	* configure.ac: Add brackets around AC_TRY_COMPILE alternative.
+	* configure: Regenerated.
+
+	2010-04-02  Sebastian Pop  <sebastian.pop@amd.com>
+	* configure.ac: Print "buggy but acceptable" when CLooG
+	revision is less than 9.
+	* configure: Regenerated.
+
+2010-05-26  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	Merge from gcc:
+
+	2010-05-18  Steven Bosscher  <steven@gcc.gnu.org>
+	* configure.ac (--enable-lto): All *-apple-darwin* now support LTO.
+	* configure: Regenerate.
+
+	2010-05-07  Steven Bosscher  <steven@gcc.gnu.org>
+	* configure.ac (--enable-lto): Add x86_64-apple-darwin* as
+	a platform that supports LTO.
+	* configure: Regenerate.
+
+	2010-04-27  Dave Korn  <dave.korn.cygwin@gmail.com>
+	PR lto/42776
+	* configure.ac (--enable-lto): Refactor handling so libelf tests
+	are only performed inside then-clause of ACX_ELF_TARGET_IFELSE,
+	and allow LTO to be explicitly enabled on non-ELF platforms that
+	are known to support it inside else-clause.
+	* configure: Regenerate.
+
+2010-04-27  Roland McGrath  <roland@redhat.com>
+	    H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.ac (--enable-gold): Support both, both/gold and
+	both/bfd to add gold to configdirs without removing ld.
+	* configure: Regenerated.
+
+	* Makefile.def: Add install-gold dependency to install-ld.
+	* Makefile.in: Regenerated.
+
+2010-04-14  Tristan Gingold  <gingold@adacore.com>
+
+	* configure.ac (alpha*-*-*vms*): Remove ld from noconfigdirs.
+	* configure: Regenerate.
+
+2010-04-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Merge from gcc:
+	PR bootstrap/43615
+	PR bootstrap/43328
+	Revert:
+	2010-03-31  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+	* configure.ac: Do not pass --enable-multilib nor
+	--disable-multilib in baseargs.  Accept explicitly passed
+	--enable_multilib.
+	* configure: Regenerate.
+
+2010-03-31  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	PR bootstrap/43328
+	* configure.ac: Do not pass --enable-multilib nor
+	--disable-multilib in baseargs.  Accept explicitly passed
+	--enable_multilib.
+	* configure: Regenerate.
+
+2010-03-23  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac (tic6x-*-*): New case.
+	* configure: Regenerate.
+
+2010-03-23  Joseph Myers  <joseph@codesourcery.com>
+
+	Merge from gcc:
+	2010-03-19  Jack Howarth <howarth@bromo.med.uc.edu>
+	PR ada/42554
+	* configure.ac: Only pass -c to ranlib for darwin9 and earlier.
+	* configure: Regenerate.
+
+2010-03-23  Joseph Myers  <joseph@codesourcery.com>
+
+	* config.sub: Update to version 2010-03-22.
+	* config.guess: Update to version 2009-12-30.
+
+2010-03-14  Joseph Myers  <joseph@codesourcery.com>
+
+	Merge from gcc:
+	2010-01-11  Richard Guenther  <rguenther@suse.de>
+	PR lto/41569
+	* Makefile.def (all-lto-plugin): Depend on all-gcc.
+	* Makefile.in: Regenerated.
+
+2010-03-01  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	PR libstdc++/32499
+	* configure.ac (RANLIB): Default to true.
+	(STRIP): Likewise.
+	(RANLIB_FOR_TARGET): Remove superfluous : argument.
+	* configure: Regenerate.
+
+2010-02-17  Nick Clifton  <nickc@redhat.com>
+
+	PR 11238
+	* Makefile.tpl (local-distclean): Also remove config.cache files in
+	sub-directories as there may not be Makefiles present in the
+	sub-directories.
+	* Makefile.tpl: Use "-exec rm {}" rather than "-delete" to delete
+	the config.cache files found by the find command.
+
+	* Makefile.in: Regenerate.
+	* configure.ac: Revert previous delta.
+	* configure: Regenerate.
+
+2010-02-15  Nick Clifton  <nickc@redhat.com>
+
+	PR 11238
+	* configure.ac: Delete config.cache files in sub-directories when
+	deleting Makefiles.
+	* configure: Regenerate.
+
+2010-02-15  Nick Clifton  <nickc@redhat.com>
+
+	* configure.ac: Sync from gcc.
+	* configure: Regenerate.
+
+2010-01-31  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	Sync from gcc:
+	* configure.ac: Add "recommended" version checks for GMP/MPC.
+	Update recommended GMP/MPFR/MPC versions.
+	* configure: Regenerate.
+
+2010-01-25  Joern Rennecke  <amylaar@spamcop.net>
+
+	gcc PR libstdc++/36101, gcc PR libstdc++/42813
+	* configure.ac (bootstrap_target_libs): Make inclusion of
+	target-libgomp conditional on libgomb being in target_configdirs.
+	* configure: Regenerate.
+
+2010-01-23  Joern Rennecke  <amylaar@spamcop.net>
+
+	gcc PR libstdc++/36101, gcc PR libstdc++/42813
+	* configure.ac (bootstrap_target_libs): Include target-libgomp.
+	* configure: Regenerate.
+
+2010-01-22  Joern Rennecke  <amylaar@spamcop.net>
+
+	gcc PR libstdc++/36101, gcc PR libstdc++/42813
+	* configure.ac (target_configdirs): Substitute.
+	* Makefile.def: Bootstrap target module libgomp.
+	Add dependency of all-target-libstdc++-v3 on configure-target-libgomp.
+	* Makefile.tpl (TARGET_CONFIGDIRS): New makefile variable.
+	(BASE_TARGET_EXPORTS): Export TARGET_CONFIGDIRS.
+	* configure, Makefile.in: Regenerate.
+
+2009-12-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* libtool.m4: Sync from git Libtool.
+	* ltmain.sh: Likewise.
+	* ltoptions.m4: Likewise.
+	* ltversion.m4: Likewise.
+	* lt~obsolete.m4: Likewise.
+
+2010-01-07  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+            Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
+	PR bootstrap/42424
+	* configure.ac: Include libtool m4 files.
+        (_LT_CHECK_OBJDIR): Call it.
+	(extra_mpc_mpfr_configure_flags, extra_mpc_gmp_configure_flags,
+	gmplibs, ppllibs, clooglibs): Use $lt_cv_objdir.
+
+	* configure: Regenerate.
+
+2010-01-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	PR bootstrap/41818
+	* Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
+	to $(RPATH_ENVVAR) if bootstrapping.  Fix typo in comment.
+	* Makefile.in: Regenerate.
+
+2009-12-18  Ben Elliston  <bje@au.ibm.com>
+
+	* config.sub, config.guess: Update from upstream sources.
+
+2009-12-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.NEWLIB: Update copyright date.
+	* COPYING.LIBGLOSS: Ditto.
+
+2009-12-07  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	PR middle-end/30447
+	PR middle-end/30789
+	PR other/40302
+
+	* configure.ac: Require MPC.
+	* configure: Regenerate.
+
+	* configure.ac: Update minimum MPC version to 0.8.
+	* configure: Regenerate.
+
+2009-11-20  Paolo Bonzini  <bonzini@gnu.org>
+
+	* config.guess: Sync with upstream and gcc.
+	* config.sub: Sync with upstream and gcc.
+
+2009-11-16  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.def: Restore host and target settings for gmp.
+	* Makefile.in: Rebuild.
+
+2009-11-16  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.ac: Add libelf to host_libs.  Enable in-tree configury
+	of ppl and cloog.  Fix in-tree configury of libelf, skip tests.
+	Fix portability of test of C++ as bootstrap language.  Add
+	ppl/src/ppl-config.o to the bootstrap compare exclusion list.
+	* configure: Rebuild.
+	* Makefile.def: Drop host and target settings from gmp, mpfr, ppl,
+	and cloog.  Fix in-tree ppl configuration.  Introduce libelf
+	in-tree building.
+	* Makefile.tpl (POSTSTAGE1_CXX_EXPORT): New.
+	(POSTSTAGE1_HOST_EXPORTS): Use it.
+	(STAGE[+id+]_CXXFLAGS): New.
+	(BASE_FLAGS_TO_PASS): Pass it down.
+	(configure-stage[+id+]-[+prefix+][+module+]): Use it.  Add
+	extra_exports.
+	(all-stage[+id+]-[+prefix+][+module+]): Likewise.
+	(configure-[+prefix+][+module+], all-[+prefix+][+module+]): Add
+	extra_exports.
+	* Makefile.in: Rebuild.
+
+2009-11-06  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* configure.ac (FLAGS_FOR_TARGET):  Add -L and -isystem
+	paths for *-w64-mingw* and x86_64-*mingw*.
+	* configure: Regenerated.
+
+2009-10-30  Kai Tietz  <kai.tietz@onevision.com>
+
+	* configure.ac: Disable target-winsup & co for
+	x86_64-*-mingw* and *-w64-mingw* targets.
+	* configure: Regenerated.
+
+2009-10-23  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* configure.ac (CLooG test): Use = with test.
+	* configure: Regenerate.
+
+2009-10-22  Richard Guenther  <rguenther@suse.de>
+
+	* configure.ac: Do not set LIBS for ppl/cloog checks.  Disable
+	cloog if the ppl version check failed.  Move flags saving
+	before setting in libelf check.
+	* configure: Regenerate.
+
+2009-10-21  Richard Guenther  <rguenther@suse.de>
+
+	* configure.ac: Adjust the ppl and cloog configure to work as
+	documented.  Disable cloog if ppl was disabled.  Omit the version
+	checks if they were disabled.
+	* configure: Re-generate.
+
+2009-10-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure.ac: Add 'lto' to enable_languages, not
+	new_enable_languages, and only if not already present.
+	* configure: Regenerate.
+
+2009-10-06  Ian Lance Taylor  <iant@google.com>
+
+	* Makefile.def: check-gold depends upon all-gas.
+	* Makefile.in: Rebuild.
+
+2009-10-03  2009-02-05  Rafael Avila de Espindola  <espindola@google.com>
+
+	* Makefile.def: all-lto-plugin depends on all-libiberty.
+	set bootstrap=true for lto-plugin.
+	Add lto-plugin.
+	* Makefile.in: Regenerate.
+	* configure.ac (host_libs): Add lto-plugin.
+	* configure: Regenerate.
+
+2009-10-03  Diego Novillo  <dnovillo@google.com>
+
+	* Makefile.tpl (HOST_EXPORTS): Add LIBELFLIBS and LIBELFINC.
+	(HOST_LIBELFLIBS): Define.
+	(HOST_LIBELFINC): Define.
+	* Makefile.in: Regenerate.
+	* configure.ac: Add --enable-lto.
+	Add --with-libelf, --with-libelf-include and --with-libelf-lib.
+	If --enable-lto is used, add 'lto' to new_enable_languages.
+	If --enable-lto is used and gold is enabled, add
+	lto-plugin to configdirs.
+	* configure: Regenerate.
+
+2009-10-03  Simon Baldwin  <simonb@google.com>
+
+	* configure.ac: If --with-system-zlib, suppress local zlib and
+	pass --with-system-zlib to subdir configure scripts.
+	* configure: Regenerate.
+
+2009-10-01  Loren J. Rittle <ljrittle@acm.org>
+	    Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (POSTSTAGE1_HOST_EXPORTS): Use $$s rather than
+	$(srcdir).
+	* Makefile.in: Rebuilt.
+
+2009-09-29  Paolo Bonzini  <bonzini@gnu.org>
+
+	Sync from gcc:
+	2009-09-26  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.ac: Update minimum MPC version to 0.7.
+	* configure: Regenerate.
+
+2009-09-25  Nick Clifton  <nickc@redhat.com>
+
+	* configure.ac: Pass any --cache-file=/dev/null option on to
+	subconfigures.
+	* configure: Regenerate.
+
+2009-09-23  Nick Clifton  <nickc@redhat.com>
+
+	* config.sub, config.guess: Update from upstream sources.
+
+2009-09-22  Loren J. Rittle <ljrittle@acm.org>
+
+	* Makefile.tpl (POSTSTAGE1_HOST_EXPORTS): Remove stray $$r/.
+	* Makefile.in: Rebuilt.
+
+2009-09-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	PR bootstrap/32272
+	* configure.ac: Error out if $srcdir isn't '.' but contains
+	host-${host_noncanonical}.
+	* configure: Regenerate.
+
+2009-09-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure.ac: If bootstrapping a combined tree with
+	--enable-gold, require c++ in stage1_languages.
+	* configure: Regenerate.
+
+	* configure.ac: Also add target_libs of stage1_languages to
+	bootstrap_target_libs.
+	* configure: Regenerate.
+
+	* configure.ac: Diagnose --enable-build-with-cxx bootstrap
+	with --enable-languages not containing c++.
+	* configure: Regenerate.
+
+2009-09-16  Jie Zhang  <jie.zhang@analog.com>
+
+	* configure.ac: Disable java and boehm-gc for bfin-*-*.
+	* configure: Regenerate.
+
+2009-09-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure.ac: Do not use $extrasub for replacing @if/@endif
+	parts in Makefile; instead, use additional arguments to
+	AC_CONFIG_COMMANDS to do the replacement manually, with several
+	sed invocations, to avoid HP-UX sed command limits.
+	* configure: Regenerate.
+
+2009-09-04  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.ac (with-build-config): Document.  Handle without.
+	Handle missing argument.
+	* configure: Rebuilt.
+
+2009-09-03  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.ac (--with-build-config): New.  Set BUILD_CONFIG.
+	Default to bootstrap-debug only if compare-debug works.
+	* configure: Rebuilt.
+	* Makefile.tpl: Make BUILD_CONFIG configure-configurable.
+	* Makefile.in: Rebuilt.
+
+2009-09-01  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.tpl (BUILD_CONFIG): Default to bootstrap-debug.
+	* Makefile.in: Rebuilt.
+
+2009-09-02  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (AWK): Fix typo.
+	* Makefile.in: Regenerate.
+
+2009-09-02  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.ac: Detect awk and sed.
+	* Makefile.def (flags_to_pass): Add AWK and SED.
+	* Makefile.tpl (AWK, SED): New.
+	(BASE_FLAGS_TO_PASS): Add AWK and SED.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
+2009-09-01  Tristan Gingold  <gingold@adacore.com>
+
+	* setup.com: Ported to Itanium VMS.  Can also build using DCL scripts.
+	Remove logical names.
+
+2009-08-31  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* ltmain.sh (func_normal_abspath): New function.
+	(func_relative_path): Likewise.
+	(func_mode_help): Document new -bindir option for link mode.
+	(func_mode_link): Add new -bindir option, and use it to place
+	output DLL if specified.
+
+2009-08-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure.ac (AC_PREREQ): Bump to 2.64.
+
+2009-08-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* README-maintainer-mode: Point directly to upstream locations
+	for autoconf, automake, libtool, gettext, instead of copies on
+	sources.redhat.com.  Document required versions.
+	* configure.ac: Do not substitute datarootdir, htmldir,
+	pdfdir, docdir.  Do not process --with-datarootdir,
+	--with-htmldir, --with-pdfdir, --with-docdir.
+	* configure: Regenerate.
+
+	* configure: Regenerate.
+
+	* compile: Sync from Automake 1.11.
+	* depcomp: Likewise.
+	* install-sh: Likewise.
+	* missing: Likewise.
+	* mkinstalldirs: Likewise.
+	* ylwrap: Likewise.
+
+2009-08-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure.ac: Call AC_DISABLE_OPTION_CHECKING.
+	(baseargs): Add --disable-option-checking.
+	* configure: Regenerate.
+
+	* Makefile.def (configure-target-libiberty): Depend on
+	all-binutils and all-ld.
+	(configure-target-newlib): Likewise.
+	* Makefile.in: Regenerate.
+
+2009-08-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Sync with GCC, merge:
+
+	2009-07-31  Christian Bruel  <christian.bruel@st.com>
+
+	* configure.ac (sh*-*-elf): Don't add target-libgloss to noconfigdirs.
+	* configure: Regenerate.
+
+	2009-07-06  Ian Lance Taylor  <iant@google.com>
+
+	* configure.ac: Add missing comma in AC_ARG_WITH(boot-libs).
+	* configure: Rebuild.
+
+	2009-06-26  Steve Ellcey  <sje@cup.hp.com>
+
+	PR bootstrap/40338
+	* configure.ac (comparestring): Create new variable.
+	* Makefile.tpl (comparestring): Use to skip some comparisions.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
+	2009-06-23  Ian Lance Taylor  <iant@google.com>
+
+	* configure.ac: Add --enable-build-with-cxx.  When set, add c++ to
+	boot_languages.  Only bootstrap target libraries listed in
+	target_libs for some boot language.  Add --with-stage1-ldflags,
+	--with-stage1-libs, --with-boot-ldflags, --with-boot-libs.  Remove
+	with_host_libstdcxx from ppllibs.  Only add -fkeep-inline-functions
+	if not building with C++.
+	* Makefile.def: For target_module libstdc++-v3, set bootstrap=true.
+	* Makefile.tpl (STAGE1_LDFLAGS, STAGE1_LIBS): New variables.
+	(POSTSTAGE1_LDFLAGS, POSTSTAGE1_LIBS): New variables.
+	(HOST_EXPORTS): Add STAGE1_LDFLAGS to LDFLAGS.  Export HOST_LIBS.
+	(POSTSTAGE1_HOST_EXPORTS): Set CXX and CXX_FOR_BUILD.  Add
+	POSTSTAGE1_LDFLAGS to LDFLAGS.  Export HOST_LIBS.
+	(POSTSTAGE1_FLAGS_TO_PASS): Likewise.
+	* configure, Makefile.in: Rebuild.
+
+	2009-06-08  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.ac: Detect MPC in default directory.
+	* configure: Regenerate.
+
+	2009-06-02  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* configure.ac (powerpc-*-aix*, rs6000-*-aix*): Add target-newlib
+	to noconfdirs.
+	* configure: Regenerate.
+
+	2009-05-29  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* Makefile.def: Add MPC support and dependencies.
+	* configure.ac: Likewise.  Reorganize GMP/MPFR checks.
+
+	* Makefile.in, configure: Regenerate.
+
+	2009-05-24  Nicolas Roche  <roche@adacore.com>
+
+	* Makefile.tpl (compare-target): Skip ./ada/*tools directories.
+	* Makefile.in: Regenerate.
+
+	2009-05-21  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* configure.ac (cygwin noconfigdirs):  Remove libgcj.
+	* configure:  Regenerate.
+
+	2009-05-07  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* configure.ac ($with_ppl):  Default to no if not supplied.
+	($with_cloog):  Likewise.
+	configure:  Regenerate.
+
+	2009-04-24  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	PR bootstrap/39739
+	* configure.ac (extra_mpfr_configure_flags): Set and AC_SUBST.
+	* Makefile.def (module=mpfr): Use extra_mpfr_configure_flags.
+
+	* configure, Makefile.in: Regenerate.
+
+	2009-04-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* configure.ac: Change copyright header to refer to version
+	3 of the GNU General Public License and to point readers at the
+	COPYING3 file and the FSF's license web page.
+	* Makefile.def: Likewise.
+	* Makefile.tpl: Likewise.
+	* Makefile.in: Regenerate.
+
+	2009-04-09  Jack Howarth  <howarth@bromo.med.uc.edu>
+
+	* configure.ac: Restore match for darwin9 or later. Use double
+	brackets since regeneration eats one pair.
+	* configure: Regenerate.
+
+2009-08-18  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* MAINTAINERS: Perform some obvious fixups.
+
+2009-08-17  Ben Elliston  <bje@au.ibm.com>
+
+	* config.sub, config.guess: Update from upstream sources.
+
+2009-08-06  Michael Eager <eager@eagercon.com>
+
+	* configure.ac: Add Microblaze target.
+	* configure: Regenerate.
+
+2009-07-02  Tristan Gingold  <gingold@adacore.com>
+
+	* configure.ac: Do not exclude gas for i386-*-darwin.
+	Add a case for x86_64-*-darwin.
+	* configure: Regenerate.
+
+2009-06-26  Doug Evans  <dje@sebabeach.org>
+
+	* Makefile.def (host_modules): Add cgen.
+	* Makefile.in: Regenerate.
+	* configure.ac (host_tools): Add cgen.
+	* configure: Regenerate.
+
+2009-06-17  Michael Eager <eager@eagercon.com>
+
+	* COPYING.LIBGLOSS: Add Xilinx license.
+
+2009-06-15  Ryan Mansfield  <rmansfield@qnx.com>
+
+	* configure.ac: Define is_elf for QNX Neutrino targets.
+	* configure: Regenerate.
+
+2009-06-03  Jerome Guitton  <guitton@adacore.com>
+	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+        * Makefile.tpl (all): Avoid a trailing backslash.
+        * Makefile.in: Regenerate.
+
+2009-06-03  Ben Elliston  <bje@au.ibm.com>
+
+	* config.sub, config.guess: Update from upstream sources.
+
+2009-06-02  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.tpl ([+compare-target+]): Compare all stage
+	directories, rather than just gcc.
+	* Makefile.in: Rebuilt.
+
+2009-05-28  Doug Kwan  <dougkwan@google.com>
+
+	* configure.ac: Support gold for target arm*-*-*.
+	* configure: Regenerate.
+
+2009-05-27  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.tpl (all): Avoid harmless warning in make all when
+	gcc-bootstrap is enabled but stage_last does not exist.
+	* Makefile.in: Rebuilt.
+
+2009-05-25  Tristan Gingold  <gingold@adacore.com>
+
+	* setup.com: Complete the file with configuration and build.
+
+2009-05-18  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR other/40159
+	* Makefile.tpl (all): Don't assume gcc-bootstrap and
+	gcc-no-bootstrap are mutually exclusive.
+	* Makefile.in: Rebuilt.
+
+2009-05-18  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR other/40159
+	* Makefile.tpl (all): Don't end with unconditional success.
+	* Makefile.in: Rebuilt.
+
+2009-05-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR target/37137
+	* Makefile.def (flags_to_pass): Remove redundant and incomplete
+	STAGE1_CFLAGS, STAGE2_CFLAGS, STAGE3_CFLAGS, and STAGE4_CFLAGS.
+	Add FLAGS_FOR_TARGET and BUILD_CONFIG.
+	(bootstrap_stage): Remove bootstrap-debug custom stages.  Turn
+	stage_configureflags, stage_cflags and stage_libcflags into
+	explicit Makefile macros.
+	* Makefile.tpl (HOST_EXPORTS, EXTRA_HOST_FLAGS): Pass GCJ and
+	GFORTRAN.
+	(POSTSTAGE1_HOST_EXPORTS): Add XGCC_FLAGS_FOR_TARGET and TFLAGS to
+	CC.  Set CC_FOR_BUILD from CC.
+	(BASE_TARGET_EXPORTS, RAW_CXX_TARGET_EXPORTS,
+	NORMAL_TARGET_EXPORTS): Move SYSROOT_CFLAGS_FOR_TARGET and
+	DEBUG_PREFIX_CFLAGS_FOR_TARGET from CFLAGS and CXXFLAGS to
+	XGCC_FLAGS_FOR_TARGET.  Add it along with TFLAGS to CC, CXX, GCJ,
+	and GFORTRAN.
+	(TFLAGS, STAGE_CFLAGS, STAGE_TFLAGS, STAGE_CONFIGURE_FLAGS): New.
+	(_LIBCFLAGS): Renamed to _TFLAGS.
+	(do-compare-debug, do-compare3-debug): Drop.
+	(CC, GCC_FOR_TARGET, CXX_FOR_TARGET, RAW_CXX_FOR_TARGET,
+	GCJ_FOR_TARGET, GFORTRAN_FOR_TARGET): Remove FLAGS_FOR_TARGET.
+	(FLAGS_FOR_TARGET, SYSROOT_CFLAGS_FOR_TARGET,
+	DEBUG_PREFIX_CFLAGS_FOR_TARGET): Move down.
+	(XGCC_FLAGS_FOR_TARGET): New.
+	(BASE_FLAGS_TO_PASS): Pass STAGEid_CFLAGS, STAGEid_TFLAGS and TFLAGS.
+	(EXTRA_HOST_FLAGS): Pass GCJ and GFORTRAN.
+	(POSTSTAGE1_FLAGS_TO_PASS): Move SYSROOT_CFLAGS_FOR_TARGET and
+	DEBUG_PREFIX_CFLAGS_FOR_TARGET from CFLAGS, CXXFLAGS, LIBCFLAGS,
+	LIBCXXFLAGS to XGCC_FLAGS_FOR_TARGET.    Add it along with TFLAGS
+	to CC, CXX, GCJ, and GFORTRAN.  Pass XGCC_FLAGS_FOR_TARGET and
+	TFLAGS.
+	(BUILD_CONFIG): Include if requested.
+	(all): Set TFLAGS on bootstrap.
+	(configure-stageid-prefixmodule): Pass TFLAGS, adjust FLAGS.
+	(all-stageid-prefixmodule): Likewise.
+	(do-clean, distclean-stageid): Set TFLAGS.
+	(restrap): Fix whitespace.
+	* Makefile.in: Rebuilt.
+
+2009-04-25  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* Makefile.tpl (POSTSTAGE1_HOST_EXPORTS): Add GNATBIND.
+	(POSTSTAGE1_FLAGS_TO_PASS): Pick up exported value for GNATBIND.
+	* Makefile.in: Regenerate.
+
+2009-04-24  Eli Zaretskii  <eliz@gnu.org>
+
+	* config.guess (pc:*:*:*): Return i586-pc-msdosdjgpp, for
+	consistency with config.sub.  (Update from upstream sources.)
+
+2009-04-21  Joseph Myers  <joseph@codesourcery.com>
+
+	* texinfo/texinfo.tex: Update to version 2009-03-28.05.
+
+2009-04-17  Ben Elliston  <bje@au.ibm.com>
+
+	* config.sub, config.guess: Update from upstream sources.
+
+2009-04-15  Anthony Green  <green@moxielogic.com>
+
+	* configure.ac: Add moxie support.
+	* configure: Rebuilt.
+
+2009-04-09  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.ac: Bump minimum GMP/MPFR versions to 4.2 and 2.3.1.
+	* configure: Regenerate.
+
+2009-04-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gas/10039
+	* configure.ac: Require texinfo 4.7.
+	* configure: Regenerated.
+
+2009-04-09  Steve Ellcey  <sje@cup.hp.com>
+
+	* Makefil.def (languages): New entries.
+	* Makefile.tpl (check-gcc-*): New generic target.
+	* Makefile.in: Regenerate.
+
+2009-03-27  Eli Zaretskii  <eliz@gnu.org>
+
+	* djunpack.bat: Use ".." quoting in Sed command, for the sake of
+	Windows builds of Sed.
+
+2009-03-18  Tom Tromey  <tromey@redhat.com>
+
+	* configure: Rebuild.
+	* configure.ac (host_libs): Add libiconv.
+	* Makefile.in: Rebuild.
+	* Makefile.def (host_modules): Add libiconv.
+	(configure-gdb, all-gdb): Depend on libiconv.
+
+2009-03-16  Tristan Gingold  <gingold@adacore.com>
+
+	* configure.ac: Treat gdb as supported on x86_64-darwin.
+	* configure: Regenerate.
+
+2009-03-16  Joseph Myers  <joseph@codesourcery.com>
+
+	Merge from GCC:
+
+	2009-03-16  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac (--with-host-libstdcxx): New option.
+	* configure: Regenerate.
+
+	2009-01-29  Robert Millan  <rmh@aybabtu.com>
+
+	* configure.ac: Recognize GNU/kOpenSolaris (*-*-kopensolaris*-gnu).
+	* configure: Regenerate.
+
+	2009-01-12  Sebastian Pop <sebastian.pop@amd.com>
+
+	PR tree-optimization/38515
+	* configure.ac (cloog-polylib): Removed.
+	(with_ppl, with_cloog): Test for "no".
+	* configure: Regenerated.
+
+2009-03-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Backport from git Libtool:
+
+	2009-01-19  Robert Millan  <rmh@aybabtu.com>
+	Support GNU/kOpenSolaris.
+	* libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER)
+	(_LT_CHECK_MAGIC_METHOD, _LT_COMPILER_PIC, _LT_LINKER_SHLIBS)
+	(_LT_LANG_CXX_CONFIG) [kopensolaris*-gnu]: Recognize
+	GNU/kOpenSolaris.
+
+2009-02-05  Andreas Schwab  <schwab@suse.de>
+
+	* Makefile.tpl (stage_last): Define $r and $s before using
+	$(RECURSE_FLAGS_TO_PASS).
+	* Makefile.in: Regenerate
+
+2009-01-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.NEWLIB: Add ARM license.
+
+2009-01-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.def (configure-opcodes): Depend on configure-libiberty.
+	(all-opcodes): Depend on all-libiberty.
+	* Makefile.in: Regenerate.
+
+2009-01-15  Douglas B Rupp  <rupp@gnat.com>
+
+	* configure.ac (ia64*-*-*vms*): Add case with no gdb or ld support.
+	* configure: Regenerate.
+
+2008-12-18  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Backport link test fix from upstream Libtool:
+
+	* libltdl.m4 (_LT_SYS_DYNAMIC_LINKER, _LT_LINKER_SHLIBS):
+	Add cache variables to tests that require the linker to work.
+	For shlibpath_overrides_runpath, this also changes the semantics
+	to let the result from the C compiler take precedence.
+	compiler take precedence.
+
+2008-12-02  Ben Elliston  <bje@au.ibm.com>
+
+	* config.sub, config.guess: Update from upstream sources.
+
+2008-12-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.NEWLIB: Updated.
+	* COPYING.LIBGLOSS: Ditto.
+
+2008-12-16  Paolo Bonzini  <bonzini@gnu.org>
+
+	Sync with GCC:
+
+	2008-12-12  Sebastian Pop  <sebastian.pop@amd.com>
+
+	* configure.ac (ppllibs): Add by default the lib flags.
+	* configure: Regenerate.
+
+	2008-12-04  Jack Howarth  <howarth@bromo.med.uc.edu>
+
+	* configure.ac: Add double brackets on darwin[912].
+	* configure: Regenerate.
+
+	2008-12-02  Jack Howarth  <howarth@bromo.med.uc.edu>
+
+	* configure.ac: Expand to darwin10 and later.
+	* configure: Regenerate.
+
+2008-12-02  Andreas Schwab  <schwab@suse.de>
+
+	* Makefile.def: configure-target-boehm-gc depends on
+	all-target-libstdc++-v3.
+	* Makefile.in: Regenerate.
+
+2008-12-02  Ben Elliston  <bje@au.ibm.com>
+
+	* config.sub, config.guess: Update from upstream sources.
+
+2008-11-27  Joseph Myers  <joseph@codesourcery.com>
+
+	Merge from GCC:
+
+	2007-12-02  Matthias Klose  <doko@ubuntu.com>
+
+	* config-ml.in: Remove 64bit configure tests.
+
+	2008-05-14  Rafael Espindola  <espindola@google.com>
+
+	* config-ml.in: don't handle --enable-shared and --enable-static.
+
+	2008-09-02  Sebastian Pop  <sebastian.pop@amd.com>
+	    Tobias Grosser  <grosser@fim.uni-passau.de>
+	    Jan Sjodin  <jan.sjodin@amd.com>
+	    Harsha Jagasia  <harsha.jagasia@amd.com>
+	    Dwarakanath Rajagopal  <dwarak.rajagopal@amd.com>
+	    Konrad Trifunovic  <konrad.trifunovic@inria.fr>
+	    Adrien Eliche  <aeliche@isty.uvsq.fr>
+
+	Merge from graphite branch.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+	* configure.ac (host_libs): Add ppl and cloog.
+	Add checks for PPL and CLooG.
+	* Makefile.def (ppl, cloog): Added modules and dependences.
+	* Makefile.tpl (PPLLIBS, PPLINC, CLOOGLIBS, CLOOGINC): New.
+	(HOST_PPLLIBS, HOST_PPLINC, HOST_CLOOGLIBS, HOST_CLOOGINC): New.
+
+	2008-09-03  Richard Guenther  <rguenther@suse.de>
+
+	* configure.ac: Always pass -DCLOOG_PPL_BACKEND to the
+	cloog test.
+	* configure: Re-generate.
+
+	2008-09-03  Sebastian Pop  <sebastian.pop@amd.com>
+
+	* configure.ac (--with-cloog-polylib): New.
+	(--disable-cloog-version-check): New.
+	(--disable-ppl-version-check): New.
+	* configure: Re-generate.
+
+	2008-09-05  Richard Guenther  <rguenther@suse.de>
+
+	* configure.ac: Initialize clooglibs to -lcloog.
+	* configure: Re-generate.
+
+	2008-10-13  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.ac (MPFR check): Bump minimum version to 2.3.0 and
+	recommended version to 2.3.2.
+
+	* configure: Regenerate.
+
+	2008-10-31  Ben Elliston  <bje@au.ibm.com>
+
+	* configure.ac (spu-*-*): Remove special case.
+	* configure: Regenerate.
+
+	Complete comment text from GCC version of:
+
+	2008-08-31  Aaron W. LaFramboise  <aaronavay62@aaronwl.com>
+
+	* configure.ac (RPATH_ENVVAR): Use PATH on Windows.
+	(GCC_SHLIB_SUBDIR): New.
+	* Makefile.tpl (HOST_LIB_PATH_gcc): Use GCC_SHLIB_SUBDIR.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
+2008-11-27  Tristan Gingold  <gingold@adacore.com>
+
+	* configure.ac: Build gdb for i?86-*-darwin*
+	* configure: Regenerated.
+
+2008-11-14  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	PR bootstrap/38014
+	PR bootstrap/37923
+
+	Revert:
+
+	2008-10-24  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.tpl (HOST_EXPORTS): Correct CPPFLAGS typo.
+	* Makefile.in: Regenerated.
+
+	2008-10-22  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	PR gdb/921
+	PR gdb/1646
+	PR gdb/2175
+	PR gdb/2176
+
+	* Makefile.def (flags_to_pass): Add CPPFLAGS_FOR_BUILD and CPPFLAGS.
+	* Makefile.tpl (BUILD_EXPORTS): Set CPPFLAGS.
+	(EXTRA_BUILD_FLAGS): Correct typo.  Pass CPPFLAGS.
+	(HOST_EXPORTS): Pass CPPFLAGS.
+	(CPPFLAGS_FOR_BUILD, CPPFLAGS, CPPFLAGS_FOR_TARGET): Define.
+	(LDFLAGS_FOR_TARGET): Initialize from configure script.
+	(EXTRA_TARGET_FLAGS): Set CPPFLAGS.
+	* Makefile.in, configure: Regenerated.
+	* configure.ac: Set CPPFLAGS_FOR_TARGET, LDFLAGS_FOR_TARGET,
+	and CPPFLAGS_FOR_BUILD.
+
+2008-10-29  Stefan Schulze Frielinghaus  <xxschulz@de.ibm.com>
+
+	* configure.ac [spu-*-*]: Do not set skipdirs.
+	* configure: Re-generate.
+
+2008-10-24  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.tpl (HOST_EXPORTS): Correct CPPFLAGS typo.
+	* Makefile.in: Regenerated.
+
+2008-10-22  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	PR gdb/921
+	PR gdb/1646
+	PR gdb/2175
+	PR gdb/2176
+
+	* Makefile.def (flags_to_pass): Add CPPFLAGS_FOR_BUILD and CPPFLAGS.
+	* Makefile.tpl (BUILD_EXPORTS): Set CPPFLAGS.
+	(EXTRA_BUILD_FLAGS): Correct typo.  Pass CPPFLAGS.
+	(HOST_EXPORTS): Pass CPPFLAGS.
+	(CPPFLAGS_FOR_BUILD, CPPFLAGS, CPPFLAGS_FOR_TARGET): Define.
+	(LDFLAGS_FOR_TARGET): Initialize from configure script.
+	(EXTRA_TARGET_FLAGS): Set CPPFLAGS.
+	* Makefile.in, configure: Regenerated.
+	* configure.ac: Set CPPFLAGS_FOR_TARGET, LDFLAGS_FOR_TARGET,
+	and CPPFLAGS_FOR_BUILD.
+
+2008-09-29  Peter O'Gorman  <pogma@thewrittenword.com>
+
+	* libtool.m4: Update to libtool 2.2.6.
+	* lt~obsolete.m4: Update to libtool 2.2.6.
+	* ltmain.sh: Update to libtool 2.2.6.
+	* ltsugar.m4: Update to libtool 2.2.6.
+	* ltversion.m4: Update to libtool 2.2.6.
+	* ltoptions.m4: Update to libtool 2.2.6.
+	* ltgcc.m4: Update to match changes from libtool 2.2.6.
+
+2008-08-31  Aaron W. LaFramboise  <aaronavay62@aaronwl.com>
+
+	* configure.ac (RPATH_ENVVAR): Use PATH on Windows.
+	(GCC_SHLIB_SUBDIR): New.
+	* Makefile.tpl (HOST_LIB_PATH_gcc): Use GCC_SHLIB_SUBDIR.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
+2008-08-28  Tristan Gingold  <gingold@adacore.com>
+
+	* configure.ac (powerpc-*-darwin*, i?86-*-darwin*,x86_64-*-darwin9):
+	Enable bfd, binutils and opcodes.
+	* configure: Regenerate.
+
+2008-08-16  Nicolas Roche  <roche@adacore.com>
+
+	* Makefile.tpl: Add BOOT_ADAFLAGS.
+	* Makefile.in: Regenerate.
+
+2008-08-16  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* configure.ac (mips*-*-*linux*, mips*-*-gnu*): Use mt-mips-gnu.
+	* configure: Regenerate.
+
+2008-07-30 Paolo Bonzini  <bonzini@gnu.org>
+
+	Sync with gcc:
+	2008-07-30 Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.ac: Add makefile fragments for hpux.
+	* Makefile.def (flags_to_pass): Add ADA_CFLAGS.
+	* Makefile.tpl (HOST_EXPORTS): Pass ADA_CFLAGS.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
+	2008-06-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.tpl ($(srcdir)/configure): Update dependencies.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2008-06-18  Ian Lance Taylor  <iant@google.com>
+
+	* src-release (BINUTILS_SUPPORT_DIRS): Remove mkdep and depcomp.
+
+	* src-release (BINUTILS_SUPPORT_DIRS): Add depcomp.
+
+2008-06-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure: Regenerate.
+
+2008-06-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure.ac: Set TOPLEVEL_CONFIGURE_ARGUMENTS early, when
+	"$@" is still intact with both Autoconf 2.59 and 2.62.
+	* configure: Regenerate.
+
+2008-06-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.tpl: Fix comment errors.
+	* Makefile.in: Regenerate.
+
+2008-06-13  Julian Brown  <julian@codesourcery.com>
+
+	* configure.ac (arm*-*-linux-gnueabi): Don't disable building
+	of libobjc for ARM EABI Linux.
+	* configure: Regenerate.
+
+2008-06-12  David S. Miller  <davem@davemloft.net>
+	    David Edelsohn  <edelsohn@gnu.org>
+
+	* configure.ac: Add powerpc*-*-* to gold supported targets.
+	* configure: Regenerate.
+
+2008-06-08  Joseph Myers  <joseph@codesourcery.com>
+
+	PR tree-optimization/36218
+	* Makefile.def (flags_to_pass): Add LDFLAGS_FOR_BUILD.
+	* Makefile.tpl (EXTRA_BUILD_FLAGS): Define.
+	(all prefix="build-"): Pass them to build-system sub-makes.
+	* Makefile.in: Regenerate.
+
+2008-05-16  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* src-release (DEVO_SUPPORT): Add ChangeLog, MAINTAINERS,
+	README-maintainer-mode, lt~obsolete.m4, ltgcc.m4, depcomp,
+	mkdep, and compile.  Update comments.
+	(ETC_SUPPORT): Add ChangeLog and update comments.
+
+2008-05-11  Ian Lance Taylor  <iant@google.com>
+
+	* src-release (BINUTILS_SUPPORT_DIRS): Add elfcpp and gold.
+
+2008-04-18  Paolo Bonzini  <bonzini@gnu.org>
+
+	Sync with gcc:
+	2008-04-18  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/35457
+	* configure.ac: Include override.m4.
+	* configure: Regenerate.
+
+	2008-04-18  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (restrap): Call `make all' using double-colon rules.
+	* Makefile.in: Regenerate.
+
+	2008-04-11  Eric B. Weddington  <eweddington@cso.atmel.com>
+
+	* configure.ac: Do not build libssp for the AVR.
+	* configure: Regenerate.
+
+2008-04-18  Nick Clifton  <nickc@redhat.com>
+
+	* MAINTAINERS: Replace reference to configure.in with reference to
+	configure.ac.
+
+2008-04-18  M R Swami Reddy <MR.Swami.Reddy@nsc.com>
+
+	* configure.ac (cr16-*-*): Add case for cr16 target and include gdb
+	as nonconfigurable directories list.
+	* configure: Regenerate.
+
+2008-04-14  David S. Miller  <davem@davemloft.net>
+
+	* configure.ac: Add sparc*-*-* to gold supported targets.
+	* configure: Regenerate.
+
+2008-04-14  Ben Elliston  <bje@au.ibm.com>
+
+	* config.sub, config.guess: Update from upstream sources.
+
+2008-04-12  Hans-Peter Nilsson  <hp@axis.com>
+
+	* Makefile.tpl <gcc>: Error early unless at least GNU make 3.80.
+	* Makefile.in: Regenerate.
+
+2008-04-07  Ian Lance Taylor  <iant@google.com>
+
+	* Makefile.def: check-gold depends upon all-binutils.
+	* Makefile.in: Regenerate.
+
+2008-04-04  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/4334
+	* configure.ac: Run ACX_CHECK_CYGWIN_CAT_WORKS for cygwin hosted
+	builds.
+	* configure: Regenerate.
+
+2008-04-04  NightStrike  <NightStrike@gmail.com>
+
+	PR other/35151
+	* configure.ac: Combine rules for mingw32 and mingw64.
+	* configure: Regenerate.
+
+2008-03-27  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (PICFLAG, PICFLAG_FOR_TARGET): Remove.
+	* Makefile.in: Regenerate.
+
+2008-03-20  Ian Lance Taylor  <iant@google.com>
+
+	* configure.ac: Add support for --enable-gold.
+	* Makefile.def: Add gold as a directory like ld.
+	* configure, Makefile.in: Regenerate.
+
+2008-03-19  Andreas Krebbel  <krebbel1@de.ibm.com>
+
+	* opcodes/s390-mkopc.c (s390_opcode_cpu_val): S390_OPCODE_Z10 added.
+	(s390_cond_extensions): Reduced extensions to the compare related.
+	(main): z10 cpu type option added.
+	(expandConditionalJump): Renamed to ...
+	(insertExpandedMnemonic): ... this.
+
+	* opcodes/s390-opc.c: Re-group the operand format makros.
+	(INSTR_RIE_RRPU, INSTR_RIE_RRP0, INSTR_RIE_RUPI,
+	INSTR_RIE_R0PI, INSTR_RIE_RUPU, INSTR_RIE_R0PU, INSTR_RIE_R0IU,
+	INSTR_RIE_R0I0, INSTR_RIE_R0UU, INSTR_RIE_R0U0,
+	INSTR_RIE_RRUUU, INSTR_RIS_RURDI, INSTR_RIS_R0RDI, INSTR_RIS_RURDU,
+	INSTR_RIS_R0RDU, INSTR_RRF_U0RR, INSTR_RRF_00RR, INSTR_RRS_RRRDU,
+	INSTR_RRS_RRRD0, INSTR_RXY_URRD, INSTR_SIY_IRD, INSTR_SIL_RDI,
+	INSTR_SIL_RDU): New instruction formats added.
+	(MASK_RIE_RRPU, MASK_RIE_RRP0, MASK_RIE_RUPI, MASK_RIE_R0PI,
+	MASK_RIE_RUPU, MASK_RIE_R0PU, MASK_RIE_R0IU, MASK_RIE_R0I0,
+	MASK_RIE_R0UU, MASK_RIE_R0U0, MASK_RIE_RRUUU, MASK_RIS_RURDI,
+	MASK_RIS_R0RDI, MASK_RIS_RURDU, MASK_RIS_R0RDU, MASK_RRF_U0RR,
+	MASK_RRF_00RR, MASK_RRS_RRRDU, MASK_RRS_RRRD0, MASK_RXY_URRD,
+	MASK_SIY_IRD, MASK_SIL_RDI, MASK_SIL_RDU): New instruction format
+	masks added.
+	(s390_opformats): New formats added "ris", "rrs", "sil".
+	* opcodes/s390-opc.txt: Add the conditional jumps with the
+	extensions removed from automatic expansion in s390-mkopc.c manually.
+	(asi - trtre): Add new System z10 EC instructions.
+	* include/opcode/s390.h (s390_opcode_cpu_val): S390_OPCODE_Z10 added.
+
+2008-03-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure.ac: m4_include config/proginstall.m4.
+	* configure: Regenerate.
+
+2008-03-16  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+	Backport from upstream Libtool:
+
+	2007-10-12  Eric Blake  <ebb9@byu.net>
+
+	Deal with Autoconf 2.62's semantic change in m4_append.
+	* ltsugar.m4 (lt_append): Replace broken versions of
+	m4_append.
+	(lt_if_append_uniq): Don't require separator to be overquoted,
+	and avoid broken m4_append.
+	(lt_dict_add): Fix typo.
+	* libtool.m4 (_LT_DECL): Don't overquote separator.
+
+2008-03-13  David Edelsohn  <edelsohn@gnu.org>
+
+	* config.rpath: Add AIX 6 support.
+
+2008-03-13  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def (stageprofile).  Remove -fprofile-generate
+	from stage_libcflags.
+	* Makefile.in: Regenerate.
+
+2008-03-13  Ben Elliston  <bje@au.ibm.com>
+
+	* config.sub, config.guess: Update from upstream sources.
+
+2008-03-06  Florian Krohm  <fkrohm@us.ibm.com>
+
+	* s390-opc.c (INSTR_RSL_R0RD): Fix operands.
+	* s390-opc.txt (cmpsc): Duplicate entry removed.
+	(dxr, sqdr, sqer, cxfbr, cdfbr, cefbr, lzer, lzdr, lzxr,
+	cegbr, cdgbr, cxgbr, cegr, cdgr, cxgr, cxfr, cdfr, cefr, fixr, fidr,
+	fier, cu42, cu41): Fix operand format.
+
+2008-02-20  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/32009
+	PR bootstrap/32161
+
+	* configure.ac (CFLAGS_FOR_TARGET, CXXFLAGS_FOR_TARGET): Compute here.
+	* configure: Regenerate.
+
+	* Makefile.def: Define stage_libcflags for all bootstrap stages.
+	* Makefile.tpl (BOOT_LIBCFLAGS, STAGE2_LIBCFLAGS, STAGE3_LIBCFLAGS,
+	STAGE4_LIBCFLAGS): New.
+	(CFLAGS_FOR_TARGET, CXXFLAGS_FOR_TARGET): Subst from autoconf, without
+	$(SYSROOT_CFLAGS_FOR_TARGET) and $(DEBUG_PREFIX_CFLAGS_FOR_TARGET).
+	(BASE_TARGET_EXPORTS): Append them here to C{,XX}FLAGS.
+	(EXTRA_TARGET_FLAGS): Append them here to {LIB,}C{,XX}FLAGS.
+	(configure-stage[+id+]-[+prefix+][+module+]): Pass stage_libcflags
+	for target modules.  Don't export LIBCFLAGS.
+	(all-stage[+id+]-[+prefix+][+module+]): Pass stage_libcflags; pass
+	$(BASE_FLAGS_TO_PASS) where [+args+] was passed, and [+args+] after
+	the overridden CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
+	(invocations of `all'): Replace $(TARGET_FLAGS_TO_PASS) with
+	$(EXTRA_TARGET_FLAGS), $(FLAGS_TO_PASS) with $(EXTRA_HOST_FLAGS).
+	* Makefile.in: Regenerate.
+
+2008-02-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	PR libgcj/33085
+	* libtool.m4 (_LT_COMPILER_PIC) [ mingw, cygwin ] <GCJ>:
+	Do not use -DDLL_EXPORT.  Backport from upstream.
+
+2008-02-14  Nick Clifton  <nickc@redhat.com>
+
+	Import this patch from gcc:
+	2008-01-24  David Edelsohn  <edelsohn@gnu.org>
+
+	* libtool.m4: Backport AIX 6 support from ToT Libtool.
+
+2008-02-02  Hans-Peter Nilsson  <hp@axis.com>
+
+	* configure.ac: Enable fortran for cris-*-elf and crisv32-*-elf.
+	* configure: Regenerate.
+
+2008-01-31  Marc Gauthier  <marc@tensilica.com>
+
+	* configure.ac (xtensa*-*-*): Recognize processor variants.
+	* configure: Regenerate.
+
+2008-01-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	PR bootstrap/34922
+	* configure.ac (PARSE_ARGS): Push suitable setting of
+	ac_subdirs_all, for `./configure --help=recursive'.
+	Handle `+' in generic toplevel directory disabling.
+	* configure: Regenerate.
+
+2008-01-23  Ben Elliston  <bje@au.ibm.com>
+
+	* config.sub, config.guess: Update from upstream sources.
+
+2008-01-08  Ben Elliston  <bje@au.ibm.com>
+
+	* config.sub, config.guess: Update from upstream sources.
+
+2007-12-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.LIBGLOSS: Update default copyright.
+
+2007-12-19  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.NEWLIB: Update default copyright.
+
+2007-12-17  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.ac: Change required MPFR from 2.2.0 -> 2.2.1.
+	Change recommended MPFR from 2.2.1 > 2.3.0.
+	* configure: Regenerate.
+
+2007-12-13  Richard Sandiford  <rsandifo@nildram.co.uk>
+
+	* Makefile.tpl (CFLAGS_FOR_TARGET): Add -g.
+	(CXXFLAGS_FOR_TARGET): Add -O2 -g.
+	* Makefile.in: Regenerate.
+
+2007-12-10  Andreas Tobler  <a.tobler@schweiz.org>
+
+	* configure.ac: Enable libjava for x86_64-*-darwin9.
+	* configure: Regenerate.
+
+2007-12-05  Ben Elliston  <bje@au.ibm.com>
+
+	* config.sub, config.guess: Update from upstream sources.
+
+2007-11-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* config-ml.in: Robustify against white space in absolute file
+	names.
+
+	* config-ml.in (multi-clean): Substitute ${Makefile}.
+	Remove superfluous ${Makefile} in list.
+
+2007-10-23  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.def (dependencies): Make configure-gdb depend on
+	all-intl.
+	* Makefile.in: Regenerated.
+
+2007-10-15  Patrick Mansfield <patmans@us.ibm.com>
+
+	* Makefile.def: To avoid problems running with parallel makes,
+	build newlib before libgloss so that target specific header
+	files are availble.
+	* Makefile.in: Regenerate.
+
+2007-10-11  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.def (dependencies): Add all-gdb -> all-libdecnumber.
+	* Makefile.in: Regenerate.
+
+2007-10-11  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* src-release (GDB_SUPPORT_DIRS): Add libdecnumber.
+	* libdecnumber: New directory, imported from GCC.
+
+2007-10-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (CFLAGS_FOR_BUILD, CXXFLAGS_FOR_BUILD,
+	LDFLAGS_FOR_BUILD): Default them to host flags only for $host = $build.
+	Set default CXXFLAGS_FOR_BUILD to CXXFLAGS, not CFLAGS.  Set default
+	LDFLAGS_FOR_BUILD to LDFLAGS, not CFLAGS.
+	* configure: Regenerate.
+
+2007-10-01  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (AR_FOR_BUILD, AS_FOR_BUILD, CXX_FOR_BUILD,
+	DLLTOOL_FOR_BUILD, GCJ_FOR_BUILD, GFORTRAN_FOR_BUILD,
+	LDFLAGS_FOR_BUILD, LD_FOR_BUILD, NM_FOR_BUILD, RANLIB_FOR_BUILD,
+	WINDMC_FOR_BUILD, WINDRES_FOR_BUILD): Use autoconf substitutions.
+	* configure.ac: Default them to host tools for $host = $build.
+	Subst them.
+
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
+2007-09-20  Richard Sandiford  <rsandifo@nildram.co.uk>
+
+	* configure.ac (mipsisa*-*-elfoabi*): New stanza.
+	* configure: Regenerate.
+
+2007-09-19  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* configure.ac (TOPLEVEL_CONFIGURE_ARGUMENTS): Move libgomp before
+	libstdc++.
+	* Makefile.def: Add libgomp config as a maybe dependency for libstdc++.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
+2007-09-17  Andreas Schwab  <schwab@suse.de>
+
+	* configure.ac: Raise minimum makeinfo version to 4.6.
+	* configure: Regenerate.
+
+2007-09-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* configure.ac: Correct makeinfo version check.
+	* configure: Regenerate.
+
+2007-09-14  Richard Sandiford  <richard@codesourcery.com>
+
+	* configure.ac (mips*-sde-elf*): New stanza.  Add target-libiberty
+	to $skipdirs and only disable gprof for newlib.  Use the normal
+	mips*-elf* handling in other respects.
+	* configure: Regnerate.
+
+2007-09-12  David Daney  <ddaney@avtrex.com>
+
+	* configure.ac: Remove mips64*-*-linux* noconfigdirs section, thus
+	enabling libgcj.
+	* configure: Regenerate.
+
+2007-09-12  Richard Guenther  <rguenther@suse.de>
+
+	* configure.ac (--enable-stage1-checking): If neither --enable-checking
+	nor --disable-checking is provided also turn on yes and types
+	checking for stage1.
+	* configure: Re-generate.
+
+2007-09-11  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
+	PR target/33281
+	* configure.ac: Use config/mh-mingw on mingw.
+	* configure: Regenerate.
+
+2007-09-10  Rask Ingemann Lambertsen  <rask@sygehus.dk>
+
+	PR other/32154
+	* configure.ac: For libgloss targets, point the linker to the linker
+	script, startup code and simulator library.
+	* configure: Regenerate.
+
+2007-09-09  Andrew Haley  <aph@redhat.com>
+
+	* configure.ac (noconfigdirs): Remove target-libffi and
+	target-libjava.
+
+2007-08-29  Nick Clifton  <nickc@redhat.com>
+
+	* config.sub, config.guess: Update from upstream sources.
+
+2007-08-21  Richard Guenther  <rguenther@suse.de>
+
+	* configure.ac: Add types checking to stage1 checking flags.
+	* configure: Regenerate.
+
+2007-08-18  Paul Brook  <paul@codesourcery.com>
+	    Joseph Myers  <joseph@codesourcery.com>
+
+	* Makefile.tpl (DEBUG_PREFIX_CFLAGS_FOR_TARGET): New.
+	(CFLAGS_FOR_TARGET, CXXFLAGS_FOR_TARGET): Include it.
+	* Makefile.in: Regenerate.
+	* configure.ac (--with-debug-prefix-map): New.
+	* configure: Regenerate.
+
+2007-08-17  Richard Sandiford  <richard@codesourcery.com>
+	    Nigel Stephens  <nigel@mips.com>
+
+	* configure.ac (mips*-sde-elf*): New stanza.  Use config/mt-sde
+	as target_makefile_frag.
+	* configure: Regenerate.
+
+2007-08-16  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.def (STAGE2_CFLAGS, STAGE3_CFLAGS, STAGE4_CFLAGS):
+	Add to flags_to_pass.  Adjust uses of BOOT_CFLAGS.
+	(bootstrap2-debug, bootstrap-debug): New bootstrap stages.
+	* Makefile.tpl (STAGE2_CFLAGS, STAGE3_CFLAGS, STAGE4_CFLAGS): New.
+	(do-compare, do-compare3, do-compare-debug): New.
+	([+compare-target+]): Use them.
+
+2007-08-16  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.def (STAGE2_CFLAGS, STAGE3_CFLAGS, STAGE4_CFLAGS):
+	Add to flags_to_pass.  Adjust uses of BOOT_CFLAGS.
+	(bootstrap2-debug, bootstrap-debug): New bootstrap stages.
+	* Makefile.tpl (STAGE2_CFLAGS, STAGE3_CFLAGS, STAGE4_CFLAGS): New.
+	(do-compare, do-compare3, do-compare-debug): New.
+	([+compare-target+]): Use them.
+
+2007-08-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+	    Ben Elliston  <bje@au.ibm.com>
+
+	* configure.ac (TOPLEVEL_CONFIGURE_ARGUMENTS, baseargs): Pass
+	--silent if $silent.
+	* configure: Regenerate.
+
+2007-08-12  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* src-release (DEVO_SUPPORT): Add COPYING3 and COPYING3.LIB.
+
+2007-07-17  Nick Clifton  <nickc@redhat.com>
+
+	* COPYING3: New file.  Contains version 3 of the GNU General
+	Public License.
+	* COPYING3.LIB: New file.  Contains version 3 of the GNU
+	Lesser General Public License.
+
+2007-07-11  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	* configure.ac: Fix my previous change to really match GCC.
+	* configure: Regenerate.
+
+2007-07-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure.ac: Rewrite 'configure --help' strings to look nicer.
+	* configure: Regenerate.
+
+2007-07-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure.ac: Add some missing m4 quotation.
+	* configure: Regenerate.
+
+2007-07-09  Kai Tietz   <kai.tietz@onevision.com>
+
+	* Makefile.def: Add windmc tool to build.
+	* Makefile.tpl: Likewise.
+	* configure.ac: Likewise.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2007-07-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* lt~obsolete.m4: New. Import from 20070318 libtool.
+
+2007-06-29  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	* configure.ac: Don't add target-libmudflap to noconfigdirs for
+	uclinux and linux-uclibc targets.
+	* configure: Regenerate.
+
+2007-06-28  DJ Delorie  <dj@redhat.com>
+
+	* configure.ac (arm*-*-linux-gnueabi): Don't build libgloss if we're
+	not building newlib.
+	* configure: Regenerated.
+
+2007-06-22  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* src-release (DEVO_SUPPORT): Correct typos.
+
+2007-06-18  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.def: Add dependency from configure-gdb to all-bfd.
+	* Makefile.in: Regenerated.
+
+2007-06-14  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (cleanstrap): Don't delete the toplevel Makefile.
+	(distclean-stage[+id+]): Possibly delete stage_last.
+	* Makefile.in: Regenerate.
+
+2007-06-07  Ben Elliston  <bje@au.ibm.com>
+
+	* config.sub, config.guess: Update from upstream sources.
+
+2007-06-07  Ben Elliston  <bje@au.ibm.com>
+
+	* Makefile.tpl: Fix spelling error.
+	* Makefile.in: Regenerate.
+
+2007-06-04  Paolo Bonzini  <bonzini@gnu.org>
+
+	Sync with gcc:
+	2007-05-30  Jakub Jelinek  <jakub@redhat.com>
+
+	PR bootstrap/29382
+	* configure.ac: Don't use -fkeep-inline-functions for GCC < 3.3.1.
+	* configure: Rebuilt.
+
+2007-06-01  Steve Ellcey  <sje@cup.hp.com>
+
+	* libtool.m4 (LT_CMD_MAX_LEN): Try using getconf to set
+	lt_cv_sys_max_cmd_len.
+
+2007-05-31  Paolo Bonzini  <bonzini@gnu.org>
+
+	* ltgcc.m4: Update from GCC.
+
+2007-05-25  Andreas Tobler  <a.tobler@schweiz.org>
+
+	* ltmain.sh: Fix Darwin verstring, remove ${wl}.
+
+2007-05-24  Steve Ellcey  <sje@cup.hp.com>
+
+	* ltmain.sh: Update from GCC.
+	* libtool.m4: Update from GCC.
+	* ltsugar.m4: New. Update from GCC.
+	* ltversion.m4: New. Update from GCC.
+	* ltoptions.m4: New. Update from GCC.
+	* ltconfig: Remove.
+	* ltcf-c.sh: Remove.
+	* ltcf-cxx.sh: Remove.
+	* ltcf-gcj.sh: Remove.
+	* src-release: Update with new libtool file list.
+
+2007-05-16  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def (bootstrap_stage): Replace stage_make_flags with
+	stage_cflags.
+	* Makefile.tpl (POSTSTAGE1_HOST_EXPORTS, POSTSTAGE1_FLAGS_TO_PASS):
+	Remove CFLAGS/LIBCFLAGS.
+	(configure-stage[+id+]-[+prefix+][+module+],
+	all-stage[+id+]-[+prefix+][+module+]): Pass it from [+stage_cflags+].
+	* Makefile.in: Regenerate.
+
+2007-04-14  Steve Ellcey  <sje@cup.hp.com>
+
+	* config-ml.in: Update from GCC.
+
+2007-04-09  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* src-release (do-proto-toplev): Process the support directories before
+	the tool directory.
+
+2007-03-21  Richard Sandiford  <richard@codesourcery.com>
+
+	* configure.ac (TOPLEVEL_CONFIGURE_ARGUMENTS): Fix m4 quoting
+	of glob.  Quote arguments with single quotes too.
+	* configure: Regenerate.
+
+2007-03-12  Brooks Moses  <brooks.moses@codesourcery.com>
+
+	* Makefile.def (fixincludes): Remove unneeded "missing" lines.
+	* Makefile.in: Regenerate
+
+2007-03-07  Andreas Schwab  <schwab@suse.de>
+
+	* configure: Regenerate.
+
+2007-03-01  Brooks Moses  <brooks.moses@codesourcery.com>
+
+	* configure.ac: Add "--with-pdfdir" configure option,
+	which defines pdfdir variable.
+	* Makefile.def (target=fixincludes): Add install-pdf to
+	missing targets.
+	(recursive_targets): Add install-pdf target.
+	(flags_to_pass): Add pdfdir.
+	* Makefile.tpl: Add pdfdir handling, add do-install-pdf
+	target.
+	* configure: Regenerate
+	* Makefile.in: Regenerate
+
+2007-02-28  Eric Christopher  <echristo@apple.com>
+
+	Revert:
+	2006-12-07  Mike Stump  <mrs@apple.com>
+
+	* Makefile.def (dependencies): Add dependency for
+	install-target-libssp and install-target-libgomp on
+	install-gcc.
+	* Makefile.in: Regenerate.
+
+2007-02-27  Matt Kraai  <kraai@ftbfs.org>
+
+	* configure: Regenerate.
+	* configure.ac: Move statements after variable declarations.
+
+2007-02-19  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac: Adjust for loop syntax.
+	* configure: Regenerate.
+
+2007-02-18  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure: Rebuilt.
+
+2007-02-18  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.ac: Drop multiple occurrences of --enable-languages,
+	and fix its quoting.
+	* configure: Rebuilt.
+
+2007-02-17  Mark Mitchell  <mark@codesourcery.com>
+	    Nathan Sidwell  <nathan@codesourcery.com>
+	    Vladimir Prus  <vladimir@codesourcery.com
+	    Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac (TOPLEVEL_CONFIGURE_ARGUMENTS): Fix quoting.
+	* configure: Regenerate.
+
+2007-02-13  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* configure.ac (target_libraries): Move libgcc before libiberty.
+	* configure: Regenerated.
+
+2007-02-13  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure: Regenerate again?
+
+2007-02-13  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure: Reapply PR30748 fix which was lost in the previous commit.
+
+2007-02-13  Daniel Jacobowitz  <dan@codesourcery.com>
+	    Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/30753
+	* configure.ac: Remove obsolete build / host tests.  Use AC_PROG_CC
+	unconditionally.  Use AC_PROG_CXX.  Use ACX_TOOL_DIRS to find $prefix.
+	* configure: Regenerated.
+
+2007-02-10  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure: Regenerate.
+
+2007-02-09  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	PR bootstrap/30748
+	* configure.ac: Correct syntax for Solaris ksh.
+	* configure: Regenerated.
+
+2007-02-09  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def: Sync with GCC.
+	* Makefile.tpl: Sync with GCC.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2007-02-09  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.tpl (build_alias, host_alias, target_alias): Use
+	noncanonical equivalents.
+	* configure.in: Rename to...
+	* configure.ac: ...this.  Update AC_PREREQ.  Prevent error for
+	AS_FOR_TARGET.  Set build_noncanonical, host_noncanonical, and
+	target_noncanonical.  Use them.  Rewrite removal of configure
+	arguments for autoconf 2.59.  Discard variable settings.  Force
+	program_transform_name for native tools.
+
+	* Makefile.in: Regenerated.
+	* configure: Regenerated with autoconf 2.59.
+
+	* src-release (DEVO_SUPPORT, do-proto-toplev): Expect configure.ac.
+
+2007-02-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.LIBGLOSS: Reformat default Red Hat
+	license to fit within 80 columns.
+	* COPYING.NEWLIB: Ditto.
+
+2007-02-05  Dave Brolley  <brolley@redhat.com>
+
+	* Contribute the following changes:
+	2006-11-28  DJ Delorie  <dj@redhat.com>
+
+	* configure.in: Fix typo for mep's target_makefile_frag.
+	* configure: Regenerated.
+
+	2005-04-22  Richard Sandiford  <rsandifo@redhat.com>
+
+	* configure.in (mep*): Add -mlibrary to FLAGS_FOR_TARGET.
+	* configure: Regenerate.
+
+	2001-09-19  DJ Delorie  <dj@redhat.com>
+
+	* configure.in (target_makefile_frag): use mt-mep
+
+	2001-06-12  Don Howard  <dhoward@redhat.com>
+
+	* configure.in: Remove gdb from MeP skip list.
+
+	2001-04-05  DJ Delorie  <dj@redhat.com>
+
+	* configure.in (noconfigdirs): Remove gcc from MeP skip list.
+
+	2001-03-20  Ben Elliston  <bje@redhat.com>
+
+	* configure.in (noconfigdirs): Add gcc and gdb for MeP.
+
+	2001-03-19  Ben Elliston  <bje@redhat.com>
+
+	* config.sub (mep, mep-*): Add.
+
+2007-01-31  Andreas Schwab  <schwab@suse.de>
+
+	* Makefile.tpl (LDFLAGS): Substitute it.
+	* Makefile.in: Regenerate.
+
+2007-01-11  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.in: Change == to = in test command.
+	* configure: Regenerate.
+
+2007-01-11  Paolo Bonzini  <bonzini@gnu.org>
+	    Nick Clifton  <nickc@redhat.com>
+	    Kaveh R. Ghazi  <ghazi@caip.rutgets.edu>
+
+	* configure.in (build_configargs, host_configargs, target_configargs):
+	Remove build/host/target parameters.
+	(host_libs): Add gmp and mpfr.
+	(GMP tests): Reorganize to allow in-tree GMP/MPFR.
+	* Makefile.def (gmp, mpfr): New.
+	(gcc): Remove target.
+	* Makefile.tpl (build_os, build_vendor, host_os, host_vendor,
+	target_os, target_vendor): New.
+	(configure): Add host_alias/target_alias arguments.  Adjust invocations.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
+2007-01-11  Matt Fago  <fago@earthlink.net>
+
+	* configure.in: Try to link to functions only in mpfr 2.2.x
+	to improve robustness of configure tests.
+	* configure: Regenerate.
+
+2007-01-08  Kai Tietz	<kai.tietz@onevision.com>
+
+	* configure.in: Add support for an x86_64-mingw* target.
+	* configure: Regenerate.
+
+2007-01-05  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.tpl (all-target): Correct @if conditional for target
+	modules.
+	* configure.in: Omit libiberty if building only target libgcc.
+	* configure, Makefile.in: Regenerated.
+
+2007-01-04  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.in: Use DEV-PHASE to detect the default for --enable-werror.
+	* configure: Regenerate.
+
+2007-01-03  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.def (target_modules): Add libgcc.
+	(lang_env_dependencies): Remove default items.  Use no_c and no_gcc.
+	* Makefile.tpl (clean-target-libgcc): Delete.
+	(configure-target-[+module+]): Emit --disable-bootstrap dependencies
+	on gcc even for bootstrapped modules.  Rewrite handling of
+	lang_env_dependencies to loop over target_modules.
+	* configure.in (target_libraries): Add target-libgcc.
+	* Makefile.in, configure: Regenerated.
+
+2006-12-29  Paolo Bonzini  <bonzini@gnu.org>
+
+	Sync with gcc:
+	2006-12-29  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.in: Reorganize recognition of languages.  Add
+	--enable-stage1-languages.  Show supported languages for the chosen
+	target rather than all recognized languages.
+	* configure: Regenerate.
+
+	2006-12-29  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (GCC_STRAP_TARGETS, all-prebootstrap): Remove.
+	* Makefile.in: Regenerate.
+
+	2006-12-29  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.in: Warn that MPFR 2.2.0 is buggy.
+	* configure: Regenerate.
+
+2006-12-27  Ian Lance Taylor  <iant@google.com>
+
+	* configure.in: When removing Makefiles to force a reconfigure, also
+	remove prev-DIR*/Makefile.
+	* configure: Regenerate.
+
+2006-12-23  Kazu Hirata  <kazu@codesourcery.com>
+
+	* config.bfd: Recognize fido.
+
+2006-12-19  Paolo Bonzini  <bonzini@gnu.org>
+
+	Sync with gcc:
+
+	2006-12-19  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.in: Remove "$build" case for powerpc-*-darwin* since
+	it only affects bootstrap and could be tested on "$host" as well.
+	* configure: Regenerate.
+	* config/mh-ppc-darwin: Add to the stage1 cflags here.
+
+	2006-12-19  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/29544
+	* Makefile.def (flags_to_pass): Add STAGE1_CHECKING.
+	(bootstrap_stage): Add STAGE1_CHECKING to stage1 configure flags,
+	move here comment from Makefile.tpl.
+	* Makefile.tpl: Move some definitions higher in the file.
+	(STAGE1_CHECKING): New.
+	* configure.in: Add --enable-stage1-checking.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
+	2006-12-03  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.in: Update error message for missing GMP/MPFR.
+
+	* configure: Regenerate.
+
+	2006-12-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.in: Update MPFR version in error message.
+
+	* configure: Regenerate.
+
+	2006-11-26  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.in (--with-mpfr-dir, --with-gmp-dir): Remove flags.
+	(--with-mpfr-include, --with-mpfr-lib, --with-gmp-include,
+	--with-gmp-lib): New flags.
+
+	* configure: Regenerate.
+
+2006-12-12  Andreas Tobler  <a.tobler@schweiz.org>
+
+	PR bootstrap/30134
+	* configure.in: Correct x86 darwin support for libjava to powerpc
+	and i?86 only.
+	* configure: Regenerate.
+
+2006-12-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* configure.in:  Handle spu makefile frag.
+	* Makefile.tpl (MAINT): Define
+	(MAINTAINER_MODE_FALSE, MAINTAINER_MODE_TRUE): Define.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
+2006-12-11  Ben Elliston  <bje@au.ibm.com>
+
+	* config.sub, config.guess: Update from upstream sources.
+
+2006-12-11  Ben Elliston  <bje@au.ibm.com>
+
+	* configure.in: Sync with GCC (spu-*-*).
+	* configure: Sync with GCC.
+
+2006-12-07  Mike Stump  <mrs@apple.com>
+
+	* Makefile.def (dependencies): Add dependency for
+	install-target-libssp and install-target-libgomp on
+	install-gcc.
+	* Makefile.in: Regenerate.
+
+2006-11-16  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (clean-target-libgcc): Test for gcc Makefile presence.
+	(unstage): Test for stage_last presence.
+
+	PR bootstrap/29802
+	* Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Add HOST_SUBDIR in STAGE_PREFIX.
+	* Makefile.in: Regenerate.
+
+2006-11-14  DJ Delorie  <dj@redhat.com>
+
+	* Makefile.tpl (clean-stage*): Sync with GCC (clean).
+	* Makefile.in: Sync with GCC.
+	* configure.in: Sync with GCC (mpfr, gmp).
+	* configure: Sync with GCC.
+
+2006-11-08  Jie Zhang  <jie.zhang@analog.com>
+
+	* configure.in: Remove target-libgloss from noconfigdirs for
+	bfin-*-*.
+	* configure: Regenerated.
+
+2006-10-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.NEWLIB: Add spu license.
+	* COPYING.LIBGLOSS: Ditto.
+
+2006-10-17  Brooks Moses  <bmoses@stanford.edu>
+
+	* Makefile.def: Added pdf target handling.
+	* Makefile.tpl: Added pdf target handling.
+	* Makefile.in: Regenerated.
+
+2006-10-11  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.NEWLIB: Updated.
+	* COPYING.LIBGLOSS: Ditto.
+
+2006-09-27  Dave Brolley  <brolley@redhat.com>
+
+	* configure.in (RUNTEST): Look for 'runtest' in the source tree by using
+	$s instead of $r.
+	* configure: Regenerated.
+
+2006-09-26  Ben Elliston  <bje@au.ibm.com>
+
+	* config.sub, config.guess: Update from upstream sources.
+
+2006-09-20  Thiemo Seufer  <ths@mips.com>
+
+	* configure.in: Remove redundant handling of mips*-dec-bsd*. Likewise
+	for mipstx39-*-*. Disable libgloss for mips64*-*-linux*.
+	* configure: Regenerate.
+
+2006-08-30  Corinna Vinschen  <corinna@vinschen.de>
+
+	* configure.in: Never build newlib for a Mingw host.
+	Never build newlib as Mingw target library.
+	Test the existence of winsup/cygwin for building a Cygwin newlib,
+	rather than just winsup.
+	Add winsup/mingw and winsup/w32api paths to FLAGS_FOR_TARGET if
+	building a Mingw target.
+	* configure: Regenerate.
+
+2006-08-15  Thiemo Seufer  <ths@mips.com>
+	    Nigel Stephens  <nigel@mips.com>
+	    David Ung  <davidu@mips.com>
+
+	* config.sub: Add support for sde as alias of mipsisa32-sde-elf.
+
+2006-07-25  Paolo Bonzini  <bonzini@gnu.org>
+
+	Sync from GCC:
+	2006-07-04  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	PR bootstrap/18058
+	* configure.in: Add -fkeep-inline-functions to CFLAGS for stage 1
+	if the bootstrap compiler is a GCC version that supports it.
+	* configure: Regenerate.
+
+2006-07-22  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* configure.in: Allow mingw32 and cygwin targets to build cross-gdb.
+	* configure: Regenerated.
+
+2006-07-18  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (configure-stageN-MODULE): Pass --with-build-libsubdir
+	for stages after the first.
+
+2006-07-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* Makefile.def: Add dependencies for configure-opcodes
+	on configure-intl and all-opcodes on all-intl.
+	* Makefile.in: Regenerated.
+
+2006-07-04  Peter O'Gorman  <peter@pogma.com>
+
+	* ltconfig: chmod 644 before ranlib during install.
+
+2006-07-03  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.in: Fix thinkos in previous check-in.
+	* configure: Regenerate.
+
+2006-07-03  Paolo Bonzini  <bonzini@gnu.org>
+
+	Sync from gcc:
+
+	2007-07-03  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR other/27063
+	* configure.in: Test subdir_requires and give an appropriate
+	error message.
+	* configure: Regenerate.
+
+	2006-06-16  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	PR target/27540
+	* configure.in: Only enable libgomp on IRIX 6.
+	* configure: Regenerate.
+
+2006-06-20  David Ayers  <d.ayers@inode.at>
+
+	PR bootstrap/28072
+	* configure.in: Add target-boehm-gc to noconfigdirs depending on
+	whether target-libjava is being configured instead of whether the
+	java front end is enabled.
+	* configure: Regenerate.
+
+2006-06-15  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* include/elf/arm.h: Correct names of R_ARM_LDC_G{0,1,2}
+	to R_ARM_LDC_SB_G{0,1,2} respectively.
+
+2006-06-15  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (POSTSTAGE1_HOST_EXPORTS): Export CFLAGS and LDFLAGS
+	too.
+	* Makefile.in: Regenerate.
+
+2006-06-13  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	Sync from gcc:
+
+	2006-06-12  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+	* configure.in: Don't enable libgomp on hpux10.
+	* configure: Rebuilt.
+
+2006-06-13  David Ayers  <d.ayers@inode.at>
+
+	Sync from gcc:
+
+	2006-06-12  David Ayers  <d.ayers@inode.at>
+
+	PR bootstrap/27963
+	PR target/19970
+	* configure.in:	Remove target-boehm-gc from noconfigdirs where
+	${libgcj} is specified.
+	* configure: Regenerate.
+
+2006-06-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+	Sync from gcc:
+
+	2005-01-12  David Edelsohn  <edelsohn@gnu.org>
+		    Andreas Schwab  <schwab@suse.de>
+
+	PR bootstrap/18033
+	* config-ml.in: Eval option if surrounded by single quotes.
+
+2006-06-07  Carlos O'Donell  <carlos@codesourcery.com>
+
+	Sync from gcc:
+
+	2006-06-06  David Ayers  <d.ayers@inode.at>
+
+	PR libobjc/13946
+	* Makefile.def: Add dependencies for libobjc which boehm-gc.
+	* Makefile.in: Regenerate.
+	* configure.in: Add --enable-objc-gc at toplevel and have it
+	enable boehm-gc for Objective-C.
+	Remove target-boehm-gc from libgcj.
+	Add target-boehm-gc to target_libraries.
+	Add target-boehm-gc to noconfigdirs where ${libgcj}
+	is specified.
+	Assert that boehm-gc is supported when requested for Objective-C.
+	Only build boehm-gc if needed either for Java or Objective-C.
+	* configure: Regenerate.
+
+	2006-06-05  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR 27674
+	* Makefile.tpl (configure-[+prefix+][+module+],
+	all-[+prefix+][+module+]): Depend on stage_current if bootstrapping.
+	Remove rule to unstage bootstrapped modules.
+	(stage_current): New.
+	* Makefile.in: Regenerate.
+
+	2006-05-20  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+	Andreas Tobler  <a.tobler@schweiz.ch>
+
+	* configure.in:  Enable libgcj for hppa*-hp-hpux11*.
+	* configure: Rebuilt.
+
+	Revert
+	2006-01-31  Richard Guenther  <rguenther@suse.de>
+	Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def (target_modules): Add libgcc-math target module.
+	* configure.in (target_libraries): Add libgcc-math target library.
+	(--enable-libgcc-math): New configure switch.
+	* Makefile.in: Re-generate.
+	* configure: Re-generate.
+
+2006-06-05  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* config-ml.in: Alter CCASFLAGS to include special
+	multilib options the same as is done for CFLAGS.
+
+2006-05-31  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.def: Added dependencies from sim and gdb on intl, and
+	added configure dependencies to everything with an all dependency
+	on intl.
+	* gettext.m4: Removed.
+	* src-release (DEVO_SUPPORT): Don't mention gettext.m4.
+	(GDB_SUPPORT_DIRS): Add intl.
+	* Makefile.in: Regenerated.
+
+2006-05-25  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* src-release (DEVO_SUPPORT): Add config.rpath.
+
+2006-05-25  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def (bfd, opcodes): Fix lib_path.
+	* Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Replace ADAC with ADAFLAGS.
+	(restrap): Move under "@if gcc-bootstrap".  Fix typo.
+	* Makefile.in: Regenerate.
+
+2006-05-24  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* configure.in: Enable gprof for cross builds.
+	* configure: Regenerate.
+
+2006-05-17  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* src-release (MAKEINFOFLAGS): Define.
+	(do-proto-toplev): Pass MAKEINFOFLAGS to submakes.
+
+2006-05-14  Ben Elliston  <bje@au.ibm.com>
+
+	* config.sub, config.guess: Update from upstream sources.
+
+2006-05-12  Ben Elliston  <bje@au.ibm.com>
+
+	* config.sub, config.guess: Update from upstream sources.
+
+2006-05-04  Steve Ellcey  <sje@cup.hp.com>
+
+	* blt, iwidgets, mmalloc: Remove directories.
+
+2006-05-01  DJ Delorie  <dj@redhat.com>
+
+	* configure.in: Restore CFLAGS if GMP isn't present.
+	* configure: Regenerate.
+
+2006-04-18  DJ Delorie  <dj@redhat.com>
+
+	* configure.in (m32c): Build libstdc++-v3.  Pass flags to
+	reference libgloss so that libssp can be built in a combined
+	tree.
+	* configure: Regenerate.
+
+2006-04-10  Ben Elliston  <bje@au.ibm.com>
+
+	* contrib: Remove directory.
+
+2006-04-06  Carlos O'Donell <carlos@codesourcery.com>
+
+	* Makefile.tpl: Add install-html target.
+	* Makefile.def: Add install-html target.
+	* Makefile.in: Regenerate.
+	* configure.in: Add --with-datarootdir, --with-docdir,
+	and --with-htmldir options.
+	* configure: Regenerate.
+
+2006-03-31  Ben Elliston  <bje@au.ibm.com>
+
+	PR binutils/1860
+	* configure.in: Require makeinfo 4.4 or higher.
+	* configure: Regenerate.
+
+2006-03-14  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.in: Regenerate.
+
+2006-03-14  Paolo Bonzini  <bonzini@gnu.org>
+
+	Sync with gcc:
+	2006-03-10  Aldy Hernandez  <aldyh@redhat.com>
+
+	* configure.in: Handle --disable-<component> generically.
+	* configure: Regenerate.
+
+	2006-02-21 Rafael Avila de Espindola <rafael.espindola@gmail.com>
+
+	* Makefile.tpl  (BUILD_CONFIGDIRS): Remove.
+	(TARGET_CONFIGDIRS): Remove.
+	* configure.in: Remove AC_SUBST(target_configdirs).
+	* Makefile.in, configure: Regenerated.
+
+
+2006-03-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR libgcj/17311
+	* ltmain.sh: Don't use "$finalize_rpath" for compile.
+
+2006-02-20  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/25670
+
+	* Makefile.tpl ([+compare-target+]): Print explanation messages.
+
+	* Makefile.def (ADAFLAGS, BOOT_ADAFLAGS, LANGUAGES): New flags_to_pass.
+	* Makefile.tpl (BASE_FLAGS_TO_PASS): Support optional flags_to_pass.
+	(EXTRA_GCC_FLAGS): Remove ADAFLAGS, BOOT_ADAFLAGS, LANGUAGES,
+	BUILD_PREFIX, BUILD_PREFIX_1.
+	* configure.in: (BUILD_PREFIX, BUILD_PREFIX_1): Don't substitute.
+
+	* Makefile.def (bootstrap stage 1): Pass LIBCFLAGS too.
+	* Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Override LIBCFLAGS too.
+
+	* Makefile.tpl (configure-stage[+id+]-[+prefix+][+module+],
+	all-stage[+id+]-[+prefix+][+module+], : Use $(current_stage) instead
+	of `cat stage_current`.  Always provide the `r' and `s' variables.
+	(clean-stage[+id+]-[+prefix+][+module+]): Likewise, and make it into
+	a single shell execution.
+	(configure-[+prefix+][+module+], all-[+prefix+][+module+]): For
+	bootstrapped modules, make the stage1 module if the build was not
+	started yet, else build the current stage.
+	(all-host, all-target): Omit bootstrapped modules (if bootstrapping).
+	(all-build, all-host, all-target, [+make_target+]-host,
+	[+make_target+]-target): Do not use \-continued lines.
+	(target modules): Depend on stage_last, not all-gcc, if bootstrapping.
+	(current_stage, restrap, stage_last): New.
+
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2006-02-14  Paolo Bonzini  <bonzini@gnu.org>
+
+	Sync from gcc:
+
+	2006-01-31  Richard Guenther  <rguenther@suse.de>
+		    Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def (target_modules): Add libgcc-math target module.
+	* configure.in (target_libraries): Add libgcc-math target library.
+	(--enable-libgcc-math): New configure switch.
+	* Makefile.in: Re-generate.
+	* configure: Re-generate.
+	* libgcc-math: New toplevel directory.
+
+	2006-01-18  Richard Henderson  <rth@redhat.com>
+		    Jakub Jelinek  <jakub@redhat.com>
+		    Diego Novillo  <dnovillo@redhat.com>
+
+	* libgomp: New directory.
+	* Makefile.def: Add target_module libgomp.
+	* Makefile.in: Regenerate.
+	* configure.in (target_libraries): Add target-libgomp.
+	* configure: Regenerate.
+
+2006-02-14  Paolo Bonzini  <bonzini@gnu.org>
+	    Andreas Schwab  <schwab@suse.de>
+
+	* configure: Regenerate.
+
+2006-01-16  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.in: Set with_gnu_as, with_gnu_ld, with_newlib earlier.
+	Set md_exec_prefix.  Use ACX_CHECK_INSTALLED_TARGET_TOOL to find
+	the assembler, linker and binutils.
+	* configure: Regenerate.
+
+2006-01-16  Nick Clifton  <nickc@redhat.com>
+
+	* config.sub, config.guess: Sync from config repository.
+
+2006-01-05  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.tpl (clean-stage[+id+]-[+prefix+][+module+]): Remove
+	@ from continuation.
+	* Makefile.in: Rebuilt.
+
+2006-01-04  Paolo Bonzini  <bonzini@gnu.org>
+
+	Sync from gcc:
+
+	2006-01-04  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/24252
+
+	* Makefile.def (flags_to_pass): Add STAGE1_CFLAGS and STAGE1_LANGUAGES.
+	* Makefile.tpl (OBJDUMP): New.
+	(EXTRA_HOST_FLAGS): Add it.
+	(EXTRA_GCC_FLAGS): Remove flags already specified in flags_to_pass.
+
+	* Makefile.tpl (stage[+id+]-start, stage[+id+]-end): Do not try
+	to use symbolic links between directories.  Avoid race conditions
+	or make them harmless.
+	* configure.in: Do not try to use symbolic links between directories.
+
+	* Makefile.def (LEAN): Pass.
+	* Makefile.tpl (LEAN): Define.
+	(stage[+id+]-start): Accept that the previous directory does not
+	exist, if the bootstrap is lean.
+	(stage[+id+]-bubble): Invoke lean bootstrap commands after
+	stage[+id+]-start.  Use a makefile variable and an `if' instead of a
+	configure substitution.
+	([+compare-target+]): Likewise.
+	([+bootstrap-target+]-lean): New.
+	* configure.in: Remove lean bootstrap support from here.
+
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+	2006-01-02  Andreas Schwab  <schwab@suse.de>
+
+	* configure.in: When reconfiguring remove Makefile in
+	all stage directories.
+	* configure: Regenerate.
+
+2005-12-27  Leif Ekblad  <leif@rdos.net>
+
+	* configure.in: Add support for RDOS target.
+	* configure: Regenerate.
+
+2005-12-27  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/1990
+	* libtool.m4: Synchronize with version in GCC sources.
+
+2005-12-20  Paolo Bonzini  <bonzini@gnu.org>
+
+	Revert Ada-related part of the previous change.
+
+	* Makefile.def (ADAFLAGS, BOOT_ADAFLAGS, ADAFLAGS_FOR_TARGET):
+	Do not pass.
+	* Makefile.tpl (BOOT_ADAFLAGS): Do not define.
+	* Makefile.in: Regenerate.
+	* configure.in: Do not include mt-ppc-aix target fragment.
+	* configure: Regenerate.
+
+2005-12-19  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.in: Select appropriate fragments for PowerPC/AIX.
+	* configure: Regenerate.
+
+	* Makefile.def (flags_to_pass): Add ADAFLAGS, BOOT_ADAFLAGS,
+	BOOT_CFLAGS, BOOT_LDFLAGS.
+	* Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Handle BOOT_ADAFLAGS,
+	BOOT_CFLAGS, BOOT_LDFLAGS.
+	(TARGET_FLAGS_TO_PASS): Handle ADAFLAGS_FOR_TARGET.
+	(stage[+id+]-bubble): Pass flags recursively to the comparison target.
+	(stage): Fail if we cannot complete the work.
+	* Makefile.in: Regenerate.
+
+2005-12-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.NEWLIB: Update copyright year for default
+	copyright.
+
+2005-12-15  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (all, do-[+make_target+], do-check, install,
+	install-host-nogcc): Don't invoke $(stage) at the end.
+	* Makefile.in: Regenerate.
+
+2005-12-14  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.in: Flip the top-level bootstrap switch.
+	* configure: Regenerate.
+
+	Merge from gcc:
+
+	2005-12-14  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.tpl: Throughout the file, use : $(MAKE) along with
+	$(stage) and $(unstage).
+	(EXTRA_TARGET_FLAGS): Correct double-quoting.
+	(all): Remove stray semicolon.
+	(local-distclean): Don't handle multilib.tmp and multilib.out.
+	(install.all): Set $s for consistency.
+	(configure-[+prefix+][+module+]): Instead of [+deps+], handle
+	check_multilibs setting.  Always make the install directory.
+	(configure-stage[+id+]-[+prefix+][+module+]): Likewise.
+	Correct @if/@endif.
+	(all-stage[+id+]-[+prefix+][+module+]): Correct @if/@endif.
+	($(TARGET_SUBDIR)/[+module+]/multilib.out): Remove.
+	(stage[+id+]-start, stage[+id+]-end): Stage $(TARGET_SUBDIR).
+	(multilib.out): Remove.
+	* Makefile.in: Regenerated.
+
+2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* config.sub: Replace ms1 arch with mt.  Allow ms1 as alias.
+	* configure.in: Replace ms1 arch with mt.
+	* configure: Rebuilt.
+
+2005-12-05  Paolo Bonzini  <bonzini@gnu.org>
+
+	Sync with gcc:
+
+2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* config.sub: Replace ms1 arch with mt.  Allow ms1 as alias.
+	* configure.in: Replace ms1 arch with mt.
+	* configure: Rebuilt.
+
+2005-12-05  Paolo Bonzini  <bonzini@gnu.org>
+
+	Sync with gcc:
+
+	2005-12-05  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.in (CONFIGURED_BISON, CONFIGURED_YACC, CONFIGURED_M4,
+	CONFIGURED_FLEX, CONFIGURED_LEX, CONFIGURED_MAKEINFO): Remove
+	"CONFIGURED_" from the AC_CHECK_PROGS invocation.  Move below.
+	Find in-tree tools if available.
+	(EXPECT, RUNTEST, LIPO, STRIP): Find them and substitute them.
+	(CONFIGURED_*_FOR_TARGET): Don't set nor substitute.
+	(*_FOR_TARGET): Set them with GCC_TARGET_TOOL.
+	(COMPILER_*_FOR_TARGET): New.
+	* Makefile.tpl (HOST_EXPORTS): Add *_FOR_TARGET symbols that gcc needs.
+	(BASE_TARGET_EXPORTS): Use COMPILER_*_FOR_TARGET symbols.
+	(CONFIGURED_*, USUAL_*): Remove.
+	(BISON, YACC, FLEX, LEX, M4, MAKEINFO, EXPECT, RUNTEST, LIPO,
+	STRIP): Use autoconf substitutions.
+	(COMPILER_AS_FOR_TARGET, COMPILER_LD_FOR_TARGET,
+	COMPILER_NM_FOR_TARGET): New.
+	(EXTRA_HOST_FLAGS): Pass LIPO and STRIP.
+
+	(all): Make all-host and all-target in parallel.
+	(do-[+make_target+], do-check, install, [+compare-target+]): Ensure
+	that $$r and $$s are set before invoking a recursive make.
+	(stage[+id+]-bubble): Likewise, and invoke the comparison at the end.
+	([+bootstrap-target+]): Inline most of the `all' target.
+
+	2005-11-29  Ben Elliston  <bje@au.ibm.com>
+
+	* Makefile.tpl (clean-target-libgcc): Invoke clean-target-libgcc
+	from the gcc build directory.
+	* Makefile.in: Regenerate.
+
+	2005-11-29  Ben Elliston  <bje@au.ibm.com>
+
+	* Makefile.def: Add new libdecnumber host_module.  Make all-gcc
+	depend on all-libdecnumber.
+	* configure.in (host_libs): Include libdecnumber.
+	* Makefile.in: Regenerate.
+	* configure: Likewise.
+
+	2005-11-21  Kean Johnston  <jkj@sco.com>
+
+	* config.sub, config.guess: Sync from upstream sources.
+
+2005-11-11  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.def: Remove gdb dependencies for gdbtk.
+	* Makefile.tpl (CONFIGURE_GDB_TK, INSTALL_GDB_TK): New variables.
+	(configure-gdb, install-gdb): New rules.
+	* configure.in: Set CONFIGURE_GDB_TK and INSTALL_GDB_TK.
+	* Makefile.in, configure: Regenerated.
+
+2005-10-22  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/24297
+	* Makefile.tpl (do-[+make-target+], do-check, install,
+	stage[+id+]-bubble, [+compare-target+]): Ensure $$r and $$s
+	are set before recursing.
+	* Makefile.in: Regenerate.
+
+2005-10-20  Eric Botcazou  <ebotcazou@adacore.com>
+
+	PR bootstrap/18939
+	* Makefile.def (gcc) <target>: Fix thinko.
+	* Makefile.in: Regenerate.
+
+2005-10-17  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	* configure.in (bfin-*-*): Use test, not brackets, in if statement.
+	* configure: Regenerate.
+
+2005-10-09  Kazu Hirata  <kazu@codesourcery.com>
+
+	* configure.in (arm-*-linux-gnueabi): Add to noconfigdirs
+	target-libffi, target-qthreads, target-libjava, and
+	targetlibobjc.
+	* configure: Regenerate.
+
+2005-10-06  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.def (flags_to_pass): Add OBJDUMP_FOR_TARGET.
+	* Makefile.tpl (BASE_TARGET_EXPORTS): Add OBJDUMP.
+	(OBJDUMP_FOR_TARGET, CONFIGURED_OBJDUMP_FOR_TARGET)
+	(USUAL_OBJDUMP_FOR_TARGET): New.
+	(EXTRA_TARGET_FLAGS): Add OBJDUMP.
+	* configure.in: Check for $OBJDUMP_FOR_TARGET.
+	* configure, Makefile.in: Regenerated.
+
+2005-10-05  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (all) [gcc-no-bootstrap]: Make prebootstrap packages
+	before other host packages.
+
+2005-10-05  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/22340
+
+	* configure.in (default_target): Remove.
+	* Makefile.tpl (all): Do not use prerequisites as subroutines
+	(all) [gcc-bootstrap]: Bootstrap gcc first if it was not done yet.
+	(do-[+make_target+], check, install, [+bootstrap_target+]): Do not
+	use prerequisites as subroutines.
+	(check-host, check-target): New.
+	(bootstrap configure & all targets): Do not use stage*-start
+	if the directory layout is already ok.
+	(non-bootstrap configure & all targets): Prepend a $(unstage).
+	(stage[+id+]-bubble): Do that here.  Do not use NOTPARALLEL.
+	(NOTPARALLEL): Remove.
+	(unstage, stage variables): New variables.
+	(unstage, stage targets): Simply expand to those variables.
+
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
+2005-10-04  James E Wilson  <wilson@specifix.com>
+
+	* Makefile.def (lang_env_dependencies): Add libmudflap.
+	* Makefile.in: Regenerate.
+
+2005-10-03  Catherine Moore  <clm@cm00re.com>
+
+	* configure.in (bfin-*-*): Support bfin.
+	* configure: Regenerated.
+
+2005-09-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.in (*-*-darwin*): Build bfd, binutils and opcodes.
+	* configure: Regenerated.
+
+2005-09-28  Geoffrey Keating  <geoffk@apple.com>
+
+	* Makefile.tpl (BASE_TARGET_EXPORTS): Add LIPO, STRIP.
+	(LIPO_FOR_TARGET): New.
+	(CONFIGURED_LIPO_FOR_TARGET): New.
+	(USUAL_LIPO_FOR_TARGET): New.
+	(STRIP_FOR_TARGET): New.
+	(CONFIGURED_STRIP_FOR_TARGET): New.
+	(USUAL_STRIP_FOR_TARGET): New.
+	* Makefile.def (flags_to_pass): Add LIPO_FOR_TARGET and
+	STRIP_FOR_TARGET.
+	* configure.in: Set LIPO_FOR_TARGET, STRIP_FOR_TARGET,
+	CONFIGURED_LIPO_FOR_TARGET, CONFIGURED_STRIP_FOR_TARGET.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2005-09-19  David Edelsohn  <edelsohn@gnu.org>
+
+	* configure.in (powerpc-*-aix*): Add target-libssp to noconfigdirs.
+	(rs6000-*-aix*): Same.
+	* configure: Regenerate.
+
+2005-09-14  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
+
+	* configure.in: Recognize f95 in the --enable-languages option,
+	and substitute it for fortran, issuing a warning.
+	* configure: Regenerate.
+
+2005-09-07  Ben Elliston  <bje@au.ibm.com>
+
+	Import from Autoconf sources:
+
+	2005-09-06  Paul Eggert  <eggert@cs.ucla.edu>
+	* move-if-change: Don't output "$2 is unchanged"; suggested by Ben
+	Elliston.  Handle weird characters correctly.
+
+2005-08-30  Phil Edwards  <phil@codesourcery.com>
+
+	* configure.in (*-*-vxworks*):  Add target-libstdc++-v3 to noconfigdirs.
+	* configure:  Regenerated.
+
+2005-08-20  Richard Earnshaw  <richard.earnshaw@arm.com>
+
+	* Makefile.def (libssp): Add to lang_env_dependencies.
+	* Makefile.in: Regenerate.
+
+2005-08-17  Christian Groessler  <chris@groessler.org>
+
+	* Makefile.tpl: (USUAL_CC_FOR_TARGET): Add missing trailing slash.
+	* Makefile.in: Regenerate.
+
+2005-08-12  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.in: Replace NCN_STRICT_CHECK_TOOL with
+	NCN_STRICT_CHECK_TOOLS, and likewise for NCN_STRICT_CHECK_TARGET_TOOLS.
+	Look for alternate names of the target cc and c++
+	* configure: Regenerate.
+
+2005-08-08  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.in (CC_FOR_TARGET, CXX_FOR_TARGET, GCJ_FOR_TARGET,
+	GCC_FOR_TARGET, RAW_CXX_FOR_TARGET, GFORTRAN_FOR_TARGET): Find
+	them with NCN_STRICT_CHECK_TARGET_TOOL, like the other target
+	tools; remove code to manually set them.
+	(Target tools): Look in the environment for them.
+	* Makefile.tpl (CC_FOR_TARGET, CXX_FOR_TARGET, GCJ_FOR_TARGET,
+	GCC_FOR_TARGET, RAW_CXX_FOR_TARGET, GFORTRAN_FOR_TARGET): Redefine.
+	(AS_FOR_TARGET, LD_FOR_TARGET, NM_FOR_TARGET): Look into gcc
+	build directory.
+	(CONFIGURED_CC_FOR_TARGET, CONFIGURED_CXX_FOR_TARGET,
+	CONFIGURED_GCJ_FOR_TARGET, CONFIGURED_GCC_FOR_TARGET,
+	CONFIGURED_GFORTRAN_FOR_TARGET, USUAL_CC_FOR_TARGET,
+	USUAL_CXX_FOR_TARGET, USUAL_GCJ_FOR_TARGET, USUAL_GCC_FOR_TARGET,
+	USUAL_RAW_CXX_FOR_TARGET, USUAL_GFORTRAN_FOR_TARGET): New.
+	(CXX_FOR_TARGET_FOR_RECURSIVE_MAKE,
+	RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE, RECURSE_FLAGS): Delete.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
+2005-07-27  Mark Mitchell  <mark@codesourcery.com>
+
+	* Makefile.tpl (EXTRA_TARGET_FLAGS): Set LDFLAGS=LDFLAGS_FOR_TARGET.
+	* Makefile.def (flags_to_pass): Add LDFLAGS_FOR_TARGET.
+	* Makefile.in: Regenerated.
+
+2005-07-26  Mark Mitchell  <mark@codesourcery.com>
+
+	* Makefile.tpl (SYSROOT_CFLAGS_FOR_TARGET): New variable.
+	(CFLAGS_FOR_TARGET): Use it.
+	(CXXFLAGS_FOR_TARGET): Likewise.
+	* Makefile.in: Regenerated.
+	* configure.in (--with-build-sysroot): New option.
+	* configure: Regenerated.
+
+2005-07-24  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl: Wrap install between unstage and stage
+	* Makefile.in: Regenerate.
+
+2005-07-16  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* all files: Update FSF address.
+
+2005-07-14  Jim Blandy  <jimb@redhat.com>
+
+	* configure.in: Add cases for Renesas m32c.
+	* configure: Regenerated.
+
+2005-07-14  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* COPYING, compile, config-ml.in, config.guess,
+	config.sub, install-sh, missing, mkinstalldirs,
+	symlink-tree, ylwrap: Sync from upstream sources.
+
+2005-07-13  Eric Christopher  <echristo@redhat.com>
+
+	* configure.in: Add toplevel noconfigdir support for tpf.
+	* configure: Regenerate.
+
+2005-07-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* Makefile.def (target_modules): Add libssp.
+	* configure.in (target_libraries): Add target-libssp.
+	* configure: Rebuilt.
+	* Makefile.in: Rebuilt.
+
+2005-07-11  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR ada/22340
+
+	* Makefile.def: Sync with gcc.
+	* Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Fix pasto.
+	* Makefile.in: Regenerate.
+
+2005-07-07  Andreas Schwab  <schwab@suse.de>
+
+	* Makefile.def (flags_to_pass): Add CFLAGS_FOR_BUILD.
+	* Makefile.tpl (EXTRA_GCC_FLAGS): Don't pass CFLAGS_FOR_BUILD here.
+	* Makefile.in: Regenerated.
+
+2005-07-07  Kazu Hirata  <kazu@codesourcery.com>
+
+	* configure.in: Add --enable-libssp and --disable-libssp.
+	* configure: Regenerate with autoconf-2.13.
+
+2005-07-06  Geoffrey Keating  <geoffk@apple.com>
+
+	* configure.in: Don't build sim or rda when targetting darwin.
+	* configure: Regenerate.
+
+2005-07-04  Ben Elliston  <bje@gnu.org>
+
+	* src-release (do-proto-toplev): Remove dejagnu bits.
+	(DEJAGNU_SUPPORT_DIRS): Remove.
+	(dejagnu.tar.bz2, dejagnu.tar): Likewise.
+	(GDBD_SUPPORT_DIRS): Likewise.
+	(gdb+dejagnu.tar.bz2, gdb+dejagnu.tar): Likewise.
+	(INSIGHTD_SUPPORT_DIRS): Likewise.
+	(insight+dejagnu.tar.bz2, insight+dejagnu.tar): Likewise.
+
+2005-06-30  Ben Elliston  <bje@gnu.org>
+
+	* setup.com (mpw): Remove unused directive.
+
+2005-06-22  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def (stagefeedback): Come after profile.
+	Define profiledbootstrap target.
+	* Makefile.tpl (profiledbootstrap): Remove.
+	(stageprofile-end): Zap stagefeedback.
+	(stagefeedback-start): Copy all .gcda files, not only GCC's.
+	* Makefile.in: Regenerate.
+
+2005-06-13  Zack Weinberg  <zack@codesourcery.com>
+
+	* depcomp: Update from automake CVS.  Add 'ia64hp' stanza.
+	In 'cpp' stanza, support '#line' as well as '# '.
+
+2005-06-07  Hans-Peter Nilsson  <hp@axis.com>
+
+	* configure.in (unsupported_languages): New macro.
+	<mmix-knuth-mmixware>: Set unsupported_languages.  Name explicit
+	non-ported target libraries in noconfigdirs.
+	<cris-*, crisv32-*> Ditto, except for non-aout, non-elf,
+	non-linux-gnu.  Remove libgcj_ex_libffi.
+ 	<lang_frag loop>: Set add_this_lang=no if the language is in
+	unsupported_languages.
+	* configure: Regenerate.
+
+2005-06-04  Tobias Schl"uter  <tobias.schlueter@physik.uni-muenchen.de>
+
+	* configure.in: Fix typo in handling of --with-mpfr-dir.
+	* configure: Regenerate.
+
+2005-06-02  Jim Blandy  <jimb@redhat.com>
+
+	* config.sub: Add cases for the Renesas m32c.  (This patch has been
+	accepted into the master sources.)
+
+2005-06-02  Aldy Hernandez  <aldyh@redhat.com>
+	    Michael Snyder  <msnyder@redhat.com>
+	    Stan Cox  <scox@redhat.com>
+
+	* configure.in: Set noconfigdirs for ms1.
+
+	* configure: Regenerate.
+
+2005-05-25  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (stage[+id+]-start): Iterate over target module as well.
+	(Dependencies): Consider target modules for bootstrap dependencies.
+	Make target bootstrap modules depend on each stage's gcc.
+	* Makefile.in: Regenerate.
+
+2005-05-20  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def (configure-gcc): Depend on binutils having been built.
+	(all-gcc): No need to do it here.
+	* Makefile.in: Regenerate.
+
+2005-05-19  Paul Brook  <paul@codesourcery.com>
+
+	* configure.in: Rewrite misleading error message when requested
+	language cannot be built.
+	* configure: Regenerate.
+
+2005-05-15  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* ylwrap: Import from Automake 1.9.5.
+
+2005-05-04  Mike Stump  <mrs@apple.com>
+
+	* configure.in: Always pass --target to target configures as
+	otherwise rebuilds that do --recheck will fail.
+	* configure: Rebuilt.
+
+2005-05-04  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (POSTSTAGE1_HOST_EXPORTS): Rename from
+	STAGE_HOST_EXPORTS.
+	(configure, all): Add bootstrap support.
+	(Host modules, target modules): Pass post-stage1 flags and exports.
+	(Top-level bootstrap): Remove bootstrap rules, expanded elsewhere.
+	* Makefile.in: Regenerate.
+
+2005-04-29  Paolo Bonzini  <bonzini@gnu.org>
+
+	Sync from gcc:
+
+	2005-04-22  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	* config.sub: Update from master copy.
+
+	2005-04-19  Hans-Peter Nilsson  <hp@axis.com>
+
+	* configure.in <crisv32-*-*, cris-*-*>: New local variable
+	libgcj_ex_libffi.  Have specific match for *-*-linux*.  Separate
+	matches for "*-*-aout" and "*-*-elf".  Don't disable libffi for
+	"*-*-elf" and "*-*-linux*".
+	* configure: Regenerate.
+
+2005-04-06  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (BUILD_CONFIGARGS): Include --with-build-subdir.
+	(TARGET_CONFIGARGS): Include --with-target-subdir.
+	(configure, all): New macros.  Use them throughout.
+
+2005-04-05  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl: Sync with gcc.
+	* Makefile.in: Regenerate.
+
+2005-03-30  J"orn Rennecke <joern.rennecke@st.com>
+
+	* config/mh-mingw32: Delete.
+	* configure.in: Don't use it.
+	* configure: Regenerate.
+
+2005-03-31  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def (bfd, opcodes, libstdc++-v3, libmudflap): Set lib_path.
+	* Makefile.tpl (SET_LIB_PATH, REALLY_SET_LIB_PATH): Remove.
+	(HOST_EXPORTS, STAGE_HOST_EXPORTS, TARGET_EXPORTS): Set $(RPATH_ENVVAR).
+	(HOST_LIB_PATH): Generate from Makefile.def.
+	(TARGET_LIB_PATH): Likewise.
+	(Old bootstrap targets): Include TARGET_LIB_PATH into RPATH_ENVVAR.
+	* Makefile.in: Regenerate.
+	* configure.in (set_lib_path, SET_LIB_PATH, SET_GCC_LIB_PATH): Remove.
+	(RPATH_ENVVAR): Include Darwin case.
+	* configure: Regenerate.
+
+2005-03-25  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.in (RPATH_ENVVAR): Set to DYLD_LIBRARY_PATH on Darwin.
+	* configure: Regenerate.
+
+2005-03-21  Zack Weinberg  <zack@codesourcery.com>
+
+	* Makefile.def: Remove libstdcxx_incdir, libsubdir, gxx_include_dir,
+	gcc_version, and gcc_version_trigger from set of flags to pass.
+	* Makefile.tpl: Remove definitions of above variables.
+	(config.status): Remove dependency on $(gcc_version_trigger).
+	* Makefile.in: Regenerate.
+	* configure.in: Do not reference config/gcc-version.m4 nor
+	config/gxx-include-dir.m4.  Do not invoke TL_AC_GCC_VERSION nor
+	TL_AC_GXX_INCLUDE_DIR.  Do not set gcc_version_trigger.
+	* configure: Regenerate.
+
+2005-03-16  Manfred Hollstein  <manfred.h@gmx.net>
+	    Andrew Pinski <pinskia@physics.uc.edu>
+
+	* Makefile.tpl (check-[+module+]): Fix shell statement inside if ... fi.
+	* Makefile.in: Regenerate.
+
+2005-03-01  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR libgcj/20160
+	* ltmain.sh: Avoid creating archives with components that have
+	duplicate basenames.
+
+2005-02-28  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR bootstrap/20250
+	* Makefile.tpl (HOST target installs): Fix copy and pasto, use install
+	instead of check.
+	* Makefile.in: Regenerate.
+
+2005-02-28  Paolo Bonzini  <bonzini@gnu.org>
+
+	Sync from gcc.
+
+	2005-02-28  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/17383
+	* Makefile.def (target_modules): Remove "stage", now unnecessary.
+	* Makefile.tpl (HOST_SUBDIR): New substitution.
+	(STAGE_HOST_EXPORTS, EXPECT, HOST_LIB_PATH, USUAL_AR_FOR_TARGET,
+	USUAL_AS_FOR_TARGET, USUAL_DLLTOOL_FOR_TARGET, USUAL_GCC_FOR_TARGET,
+	USUAL_LD_FOR_TARGET, USUAL_NM_FOR_TARGET, USUAL_OBJDUMP_FOR_TARGET,
+	USUAL_RANLIB_FOR_TARGET, USUAL_WINDRES_FOR_TARGET): Use it.
+	(Host modules, Bootstrapped modules): Use it.
+	(Build modules, Target modules): Do not create symlink trees,
+	always configure out-of-srcdir.
+	(distclean): Try removing $(host_subdir) with rm before using rm -rf.
+	* configure.in (FLAGS_FOR_TARGET, CC_FOR_TARGET, GCJ_FOR_TARGET,
+	GFORTRAN_FOR_TARGET, CXX_FOR_TARGET, RAW_CXX_FOR_TARGET): Use
+	$(HOST_SUBDIR).  Create a symlink for host_subdir.
+
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+	Merged from libada-gnattools-branch:
+	2004-11-28  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.def: Add gnattools as a module, depending on target-libada.
+	* Makefile.in: Regenerate.
+	* configure.in: Include gnattools in host_tools; disable it if ada
+	is disabled.
+	* configure: Regenerate.
+
+2005-02-23  Nick Clifton  <nickc@redhat.com>
+
+	* configure: Regenerate.
+
+2005-02-22  Paul Schlie  <schlie@comcast.net>
+
+	* configure.in: Allow darwin targeted ports to build tk, itcl and
+	libgui.
+
+2005-02-21  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	PR libgcj/10353
+	* configure.in (noconfigdirs) <sparc-*-solaris2.[0-6]>: Add libgcj.
+	* configure: Regenerate.
+
+2005-02-08  Andrew Cagney  <cagney@gnu.org>
+
+	* MAINTAINERS: Delete reference to dejagnu/ and mmalloc/ from the
+	gdb/ section.  Update GDB's URL.
+
+2005-01-31  Andrew Cagney  <cagney@gnu.org>
+
+	* gettext.m4: Only set ENABLE_NLS when gettext is present.
+
+2005-01-29  Hans-Peter Nilsson  <hp@axis.com>
+
+	* configure.in (noconfigdirs) <crisv32-*-*>: Match like cris-*-*.
+	<crisv32-*-*, cris-*-*>: Only disable target-newlib and
+	target-libgloss when not *-*-elf and *-*-aout.
+	* configure: Regenerate.
+
+2005-01-27  Andrew Cagney  <cagney@gnu.org>
+
+	* gettext.m4: Don't use NONE as a default for CATOBJEXT.
+
+2005-01-24  Andrew Cagney  <cagney@gnu.org>
+
+	* gettext.m4: Only fall back to ../intl/ when it's present.
+
+2005-01-17  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* install-sh, config.sub: Import from upstream.
+
+2005-01-17  Kelley Cook  <kcook@gcc.gnu.org>
+
+	PR bootstrap/18222
+	* Makefile.def: Pass CPPFLAGS_FOR_TARGET.
+	* Makefile.tpl: Define target CPPFLAGS on CPPFLAGS_FOR_TARGET.
+	* Makefile.in: Regenerate.
+
+2005-01-03  Paolo Bonzini  <bonzini@gnu.org>
+
+	Revert 2004-12-28 Makefile changes, a better fix will be
+	applied to mainline and src after GCC 4.0 branches.
+
+2004-12-28  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/17383
+
+	* Makefile.def (target_modules): Remove stage parameter,
+	it is always true now.
+	* Makefile.tpl (configure-build-[+module+],
+	configure-target-[+module+]): Always build symlink tree
+	for the directory and for include.  BUILD_SUBDIR and
+	TARGET_SUBDIR cannot be . anymore.
+	* Makefile.in: Regenerate.
+
+2004-12-25  David Edelsohn  <edelsohn@gnu.org>
+
+	Revert 2004-12-08 Makefile changes.
+
+2004-12-16  Andrew Stubbs  <andrew.stubbs@st.com>
+
+	* configure.in (sh64-*-*): Reenable gprof.
+	* configure: Regenerate.
+
+2004-12-09  Jim Blandy  <jimb@redhat.com>
+
+	* MAINTAINERS: List 'depcomp' as part of automake.
+
+2004-12-08  David Edelsohn  <edelsohn@gnu.org>
+
+	* Makefile.def (flags_to_pass): Add PICFLAG_FOR_TARGET.
+	* Makefile.tpl (EXTRA_HOST_FLAGS): Add PICFLAG.
+	(EXTRA_TARGET_FLAGS): Add PICFLAG.
+	* Makefile.in: Regenerate.
+
+2004-12-07  Matt Kraai  <kraai@ftbfs.org>
+
+	* Makefile.tpl: Generate normal dependencies if the LHS module is
+	not bootstrapped.
+	* Makefile.in: Regenerate.
+
+2004-12-03  Richard Sandiford  <rsandifo@redhat.com>
+
+	* configure.in: Include config/gxx-include-dir.m4.  Use
+	TL_AC_GXX_INCLUDE_DIR.  Remove some now-redundant AC_SUBSTs.
+	* configure: Regenerate.
+
+2004-12-03  Richard Sandiford  <rsandifo@redhat.com>
+
+	* config.if: Delete.
+	* configure.in: Set libstdcxx_incdir directly.
+	* configure: Regenerate.
+	* MAINTAINERS: Remove mention of config.if.
+	* src-release (DEVO_SUPPORT): Remove config.if.
+
+2004-12-02  Eric Christopher  <echristo@redhat.com>
+
+	* Makefile.tpl (clean-target-libgcc): Add stmp-dirs to list
+	of things to remove.
+	* Makefile.in: Regenerate.
+
+2004-12-02  Richard Sandiford  <rsandifo@redhat.com>
+
+	* configure.in: Clear gcc_version_trigger if the file doesn't exist.
+	* configure: Regenerate.
+
+2004-12-02  Richard Sandiford  <rsandifo@redhat.com>
+
+	* configure.in: Include config/gcc-version.m4.  Use TL_AC_GCC_VERSION
+	to set gcc_version_trigger.  Remove some now-redundant AC_SUBSTs.
+	* configure: Regenerate.
+
+2004-11-26  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* configure.in (hppa*-*-linux*): Don't add libgcj to noconfigdirs.
+	(hppa*64*-*-*): Delete incorrect comment.
+	* configure: Rebuilt.
+
+2004-11-15  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* install-sh, compile: Import from automake.
+
+2004-11-15  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* config.guess, config.sub:  Import from savannnah.
+
+2004-11-12  Mike Stump  <mrs@apple.com>
+
+	* Makefile.def: Add html support.
+	* Makefile.tpl: Likewise.
+	* Makefile.in: Regenerate.
+
+2004-11-11  Geoffrey Keating  <geoffk@apple.com>
+
+	PR 18423
+	* configure.in: Remove all instances of build-fixincludes from
+	noconfigdirs.
+	(build_configargs): Supply --target to subdirectories.
+	* configure: Regenerate.
+
+	* Makefile.def: Make gcc install depend on fixincludes install.
+	* Makefile.in: Regenerate.
+
+2004-11-08  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* configure.in (noconfigdirs) [mmix-*-*]: Disable
+	target-libgfortran.
+	* configure: Regenerate.
+
+2004-11-07  David Edelsohn  <edelsohn@gnu.org>
+
+	* config-ml.in: Pass FCFLAGS for multilibs, handle GFORTRAN
+	like CC.
+
+2004-11-05  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def (host fixincludes): Specify missing targets.
+	* Makefile.in: Regenerate.
+
+2004-11-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR other/17783
+	* configure.in: Set up LD_LIBRARY_PATH by default for gcc.
+	* configure: Regenerated.
+
+2004-11-04  Daniel Jacobowitz  <dan@debian.org>
+
+	* configure.in (arm-*-oabi*, thumb-*-oabi*): Remove.
+	* configure: Regenerated.
+
+2004-10-28  Eric B. Weddington  <ericw@evcohs.com>
+
+	PR target/18151
+	* configure.in (case ${target}): Do not build fixincludes for avr.
+	* configure: Regenerated.
+
+2004-10-26  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.in (case ${target}): Do not build fixincludes
+	on platforms where it is not used.
+	* configure: Regenerated.
+
+2004-10-23  Daniel Jacobowitz  <dan@debian.org>
+
+	* configure.in: Use an absolute path to install-sh.
+	* configure: Regenerated.
+
+2004-10-19  Andrew Cagney  <cagney@gnu.org>
+
+	* src-release (do-djunpack, do-md5sum): Install the generated file
+	directly into the proto-toplev/ directory.
+
+2004-10-19  Andrew Cagney  <cagney@gnu.org>
+
+	* src-release (GDB_SUPPORT_DIRS): Remove utils and intl.
+
+2004-10-12  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* configure.in (*-*-cygwin*): Supress warning if newlib not present.
+	* configure: Regenerate.
+
+2004-10-06  Paolo Bonzini  <bonzini@gnu.org>
+
+	Fix wrong conflict resolution in:
+
+	2004-08-16  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.in: Regenerate.
+	* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
+	in the recursive `make', instead of hardwiring `all'.
+	(Autogenerated TARGET-* variables): New.
+
+2004-10-05  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	Merged from GCC / libtool upstream:
+	2004-10-02  P.J. Darcy  <darcypj@us.ibm.com>
+	* ltcf-c.sh (tpf*): Add ld_shlibs=yes.
+	* ltcf-cxx.sh (tpf*): Likewise.
+	* ltconfig (tpf*): Add TPF OS configuration support.
+
+2004-09-30  Tomer Levi  <Tomer.Levi@nsc.com>
+
+	* configure.in: Enable target-libgloss for crx-*-*.
+	* configure: Regenerate.
+
+2004-09-24  Michael Roth  <mroth@nessie.de>
+
+	* configure.in (--without-headers): Add missing double quotes.
+	* configure: Regenerate.
+
+2004-09-24  Kelley Cook <kcook@gcc.gnu.org>
+
+	* ylwrap: Revert to previous version.
+
+2004-09-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR bootstrap/17369
+	* Makefile.tpl (REALLY_SET_LIB_PATH): Add @SET_GCC_LIB_PATH@.
+	(HOST_EXPORTS]): Add @SET_GCC_LIB_PATH@. Set and export
+	SET_GCC_LIB_PATH_CMD.
+	(BASE_TARGET_EXPORTS): Likewise.
+	* Makefile.in: Regenerated.
+
+	* configure.in (SET_GCC_LIB_PATH): Set and substitute.
+	* configure: Regenerated.
+
+2004-09-23  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* config.guess: New upstream version
+	* compile, depcomp, install-sh, ylwrap: Likewise.
+
+2004-09-19  Roger Sayle  <roger@eyesopen.com>
+
+	* config/mh-x86omitfp: New host makefile fragment.  Add
+	-fomit-frame-pointer to the default BOOT_CFLAGS.
+	* configure.in: Use it to speed up bootstrap on some IA-32 hosts.
+	* configure: Regenerate.
+
+2004-09-15  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR target/11572
+	* configure.in (*-*-darwin*): Renable libobjc.
+	* configure: Regenerate.
+
+2004-09-09  Daniel Berlin  <dberlin@dberlin.org>
+
+	* Makefile.def: Remove libbanshee.
+	* Makefile.tpl: Ditto.
+	* configure.in: Ditto.
+	* Makefile.in: Regen.
+	* configure: Ditto.
+
+2004-09-07  Paolo Bonzini  <bonzini@gnu.org>
+
+	* missing: Import latest version from master repository.
+
+2004-09-04  Nick Clifton  <nickc@redhat.com>
+
+	* config.sub: Import latest version from master repository.
+	* config.guess: Likewise.
+	This includes these changes:
+
+	2004-08-27  Hans-Peter Nilsson  <hp@axis.com>
+
+	* config.sub: Handle crisv32, alias etraxfs.
+	* config.guess (crisv32:Linux:*:*): Handle.
+
+	2004-08-13  Brad Smith  <brad@comstyle.com>
+
+	* config.guess (*:OpenBSD:*:*): Remove defunct MIPS machines.
+	(sgi:OpenBSD:*:*): Emit mips64, not mipseb.
+
+	2004-08-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* config.guess (*:Darwin:*:*): If uname -p reports "unknown",
+	assume the processor is a powerpc.  This is because coreutils
+	uname (at least versions 4.5.7 through 5.2.1) outputs "unknown"
+	in this case, due to a MacOS X bug that causes
+	sysctl ((int[]) {CTL_HW, HW_MACHINE_ARCH}, 2, buffer, &bufsize, 0, 0)
+	to return a negative number.
+	Problem reported by Petter Reinholdtsen in:
+	http://lists.gnu.org/archive/html/bug-gnu-utils/2003-02/msg00201.html
+
+	2004-07-19  Ben Elliston  <bje@gnu.org>
+
+	* config.guess (S7501:*:4.0:3.0): Handle NCR System V UNIX machine.
+
+	2004-06-24  Ben Elliston  <bje@gnu.org>
+
+	* config.guess: Update copyright years.
+	* config.sub: Likewise.
+
+	2004-06-22  Robert Millan  <robertmh@gnu.org>
+
+	* config.guess (*:FreeBSD:*:*): Remove check for glibc (unneeded
+	since GNU/kFreeBSD systems match *:GNU/*:*:* instead).
+
+	2004-06-22  Stanley F. Quayle <stan@stanq.com>
+
+	* config.guess (*:*VMS:*:*): New entry. Replaces
+	Alpha:OpenVMS:*. Recognize and advertise all VMS flavors as dec
+	manufacturer.
+
+	2004-06-22  Ben Elliston  <bje@gnu.org>
+
+	* config.guess: Cray fixes from Wendy Palm <wendyp@cray.com>.
+	* config.sub: Likewise.
+
+	2004-06-22  Ben Elliston  <bje@gnu.org>
+
+	Reported by Hans-Peter Nilsson <hp@bitrange.com>:
+	* config.sub: Correctly handle mmix-knuth and mmix-knuth-mmixware.
+
+	2004-06-11  Ben Elliston  <bje@gnu.org>
+
+	* config.guess (pegasos:OpenBSD:*:*): Remove.
+
+	2004-06-11  Ben Elliston  <bje@gnu.org>
+
+	From Wouter Verhelst <wouter@grep.be>:
+	* config.guess (M68*:*:R3V[5678]:*): Detect R3V8.
+
+	2004-06-11  Ben Elliston  <bje@gnu.org>
+
+	* config.guess (luna88k:OpenBSD:*:*): New.
+
+	2004-03-12  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
+
+	* config.guess (m32r*:Linux:*:*): New case.
+	* config.sub: Handle m32rle.
+
+	2004-03-12  Ben Elliston  <bje@wasabisystems.com>
+
+	From Jens Petersen  <petersen@redhat.com>:
+	* config.sub: Handle sparcv8.
+
+	2004-03-03  Ben Elliston  <bje@wasabisystems.com>
+
+	From Tom Smith <smith@cag.lkg.hp.com>:
+	* config.guess: Version suffixes are equally significant on Tru64
+	V4.* and V5.*, so do not ignore them on V5.*.  Handle a version
+	prefix of "P" (patched kernel).
+
+	2004-02-23  Tal Agmon  <Tal.Agmon@nsc.com>
+
+	* config.sub: Add support for National Semiconductor CRX target.
+
+2004-09-03  Jan Beulich  <jbeulich@novell.com>
+
+	* configure.in: Remove target-libstdc++-v3 from noconfigdirs for
+	*-*-netware, but add target-libmudflap.
+	Consolidate *-*-netware targets (of which really only i?86 exists)
+	into a single entry.
+	* configure: Likewise.
+
+2004-09-01  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (sorry): Remove.
+	(clean-stage[+id+], clean-stage[+id+]-module): New targets.
+	(cleanstrap targets): Depend on distclean, not distclean-stage1.
+	(do-clean): Clean per-stage directories too.
+	(do-distclean): Run distclean-stage1 too.
+	(.NOTPARALLEL): Enable during toplevel bootstrap.
+	(stage[+id+]-bubble): Enable parallel execution during
+	the recursive invocation.
+	* Makefile.in: Regenerate.
+
+	Sync from gcc (moving the Makefile.in change to Makefile.tpl):
+
+	2004-08-31  Robert Bowdidge <bowdidge@apple.com>
+
+	* Makefile.in: Move BOOT_CFLAGS above host makefile fragment include.
+	* configure.in: add test for powerpc-*-darwin* to specify makefile frag
+	* configure: regenerate
+	* config/mh-ppc-darwin: create file, override BOOT_CFLAGS for
+	-mdynamic-no-pic
+
+2004-08-31  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl: Move BOOT_CFLAGS above host makefile fragment
+	include.
+	* configure.in: Fix indentation.
+	* configure: Regenerate.
+
+2004-08-31  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def (build_modules): Add fixincludes.
+	(dependencies): Make gcc depend on fixincludes.
+	* configure.in (build_tools): Add fixincludes.
+	(build_configdirs): Always include build_libs.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2004-08-30  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def (bootstrap stages): Add 'lean' parameter.
+	* Makefile.tpl (configure-stageN-*, all-stageN-*): Turned into
+	phony targets; do not generate timestamp files.
+	(distclean-stageN): Remove references to their timestamp files.
+	(restageN, touch-stageN): Remove.
+	(stageN-bubble): Rewritten.
+	(compare): Support lean bootstraps.
+	* Makefile.in: Regenerate.
+
+	* configure.in: Only warn when bootstrapping but
+	build != host or build != target.  Support lean bootstraps.
+	* configure: Regenerate.
+
+	Sync from gcc:
+	2004-08-26  Phil Edwards  <phil@codesourcery.com>
+
+	* configure.in:  Give a better error message if GMP/MPFR are missing
+	and a language needing them has been requested.
+	* configure:  Regenerated.
+
+	2004-08-25  Phil Edwards  <phil@codesourcery.com>
+
+	* configure.in:  Print a list of available language front-ends if
+	a requested one is missing.  Tidy stray tab characters.
+	* configure:  Regenerated.
+
+2004-08-17  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+	* Makefile.def (bootstrap-stage): Rename extra_*_flags to
+	stage_*_flags.
+	* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
+	for bootstrapped modules if toplevel bootstrap is going.
+	(GCC bootstrap): Generate per-stage targets for all bootstrapped
+	modules.  Adjust for changes in Makefile.def.  Enable several
+	rules even in non-bootstrap mode, just to avoid peppering the
+	template with unnecessary "@if/@endif gcc-bootstrap" pairs.
+	(stage-[+prev+]-bubble): Remove.
+
+	* Makefile.def (Dependencies): Depend on all-build-bison,
+	all-build-flex, all-build-byacc, all-build-texinfo, rather
+	than the host variations.
+	* Makefile.tpl (BUILD_DIR_PREFIX): Remove.  Replace throughout
+	with BUILD_SUBDIR.
+	(BISON): Update for recent Bisons.
+	(YACC): Fix typo.
+	(cross): Depend on all-build.
+	(all): Do not depend on all-build.
+	(prebootstrap): Remove.
+	(dep-kind): Accept separate prefixes for MODULE and ON variables.
+	(Prebootstrap dependencies): Add them to the per-stage targets
+	and to all-prebootstrap.
+	* configure.in (build_configdirs): Always enable build_tools.
+	(BUILD_DIR_PREFIX): Remove.
+
+	* Makefile.def (gcc): Add target variable.
+	(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
+	* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
+	in the recursive `make', instead of hardwiring `all'.
+	(Autogenerated TARGET-* variables): New.
+
+2004-08-17  Robert Millan  <robertmh@gnu.org>
+
+	* configure.in: In noconfigdirs check, match GNU/k*BSD with GNU/Linux
+	(instead of FreeBSD).
+	* configure: Regenerate.
+
+2004-08-12  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.def, configure.in, src-release: Remove useless, bogus
+	references to tix.
+	* Makefile.in, configure: Regenerate.
+
+	* src-release: Stop distributing mmalloc with gdb (which doesn't
+	use it).
+	* Makefile.def: GDB doesn't depend on mmalloc anymore.
+	* Makefile.in: Regenerate.
+
+2004-08-09  Mark Mitchell  <mark@codesourcery.com>
+
+	* configure.in (arm*-*-eabi*): New target.
+	* configure: Regenerate.
+
+2004-08-01  Robert Millan  <robertmh@gnu.org>
+
+	* configure.in: Turn mt-linux into mt-gnu. Use mt-gnu and enable
+	libmudflap for all GNU-based systems (with Glibc).
+	* configure: Regenerate.
+
+2004-08-06  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def (bfd, opcodes, gcc, zlib): Mark as bootstrap module.
+	(bison, byacc, flex, texinfo): Do not mark as bootstrap module.
+	(Dependencies): New section.
+	* Makefile.tpl (Dependencies): Generate from Makefile.def.
+	(configure-target-[+module+]): Depend on maybe-all-gcc
+	(all-prebootstrap): New name of all-bootstrap.  Changed throughout.
+	(toplevel profiledbootstrap): Fix dependencies.
+	* Makefile.in: Regenerate.
+
+2004-08-03  Mark Mitchell  <mark@codesourcery.com>
+
+	* configure.in (arm*-*-symbianelf*): Add ${libgcj} and
+	target-libiberty to noconfigdirs.
+
+2004-08-03  Paul Brook  <paul@codesourcery.com>
+
+	* configure.in: Check for MPFR as well as GMP.
+	* configure: Regenerate.
+
+2004-08-03 Paolo Bonzini <bonzini@gnu.org>
+
+	* Makefile.def (host-modules): Add gcc.
+	* Makefile.in: Regenerate.
+	* Makefile.tpl (sorry): New rule.
+	(configure-host, all-host, [+make_target+]-host, do-check,
+	install-host): Do not add gcc as a special case.
+	(host modules): Add a small special-casing for gcc.  Export
+	extra_make_flags through the environment.
+	(maybe-configure-gcc, configure-gcc, maybe-all-gcc, all-gcc,
+	maybe-check-gcc, check-gcc, maybe-install-gcc, install-gcc,
+	other recursive targets for gcc): Remove.
+
+	(all, do-[+make_target+], do-check): Wrap between unstage and stage.
+	(stage, unstage): New rules.
+	(stage[+id+]-start, stage[+id+]-end, [+compare-target+],
+	distclean-stage[+id+]): Use stage_current.
+	([+bootstrap-target+], profiledbootstrap): Do not invoke manually
+	the stage*-start rules.
+
+2004-07-19  Robert Millan  <robertmh@gnu.org>
+
+	Synced from gcc:
+
+	2004-04-26  Robert Millan  <robertmh@gnu.org>
+
+	Add patches from libtool CVS.
+	* libtool.m4: Add kfreebsd*-gnu and knetbsd*-gnu.
+	* ltconfig: Likewise.
+	* ltcf-c.sh: Likewise.
+	* ltcf-cxx.sh: Likewise.
+	* ltcf-gcj.sh: Likewise.
+
+2004-07-12  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.in: Add noconfigdirs for crx-*-*.
+	* configure: Regenerate.
+
+2004-07-12  Paolo Bonzini  <bonzini@gnu.org>
+
+	Synced from gcc:
+
+	2004-07-09  Loren J. Rittle <ljrittle@acm.org>
+
+	* configure.in: Build libmudflap by default on FreeBSD.
+	* configure: Regenerated.
+
+	2004-07-09  Mark Mitchell  <mark@codesourcery.com>
+
+	* configure.in: Do not build libmudflap by default on non-GNU/Linux
+	systems.
+	* configure: Regenerated.
+
+	2004-07-08 John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR target/16344
+	* Makefile.tpl (profiledbootstrap): Build runtime libraries with
+	feedback based compiler.
+	* Makefile.in: Rebuilt.
+
+	2004-07-05  Phil Edwards  <phil@codesourcery.com>
+
+	* configure.in:  Do not prepend $srcdir to /dev/null in
+	makefile fragments.
+	* configure:  Regenerate.
+
+2004-07-08  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.def (host_modules): Set bootstrap=true for flex.
+	* Makefile.tpl (all-gcc): Depend on texinfo and flex.
+	* Makefile.in: Rebuilt.
+
+2004-07-01  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def (build_modules): Add bison, byacc, flex,
+	m4, texinfo.
+	(flags_to_pass): Add FLEX.
+	* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
+	(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
+	(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
+	DEFAULT_MAKEINFO): Remove.
+	(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
+	CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
+	(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
+	objdir or else use configured tool.
+	(all-build): New.
+	(all): Depend on it.
+	(Build module dependencies): Add.
+	* Makefile.in: Regenerate.
+	* configure.in: Better support for multiple build modules,
+	matching what is done for host/target modules.  Do not look
+	for "plausible" locations of build tools if Canadian cross.
+	Use autoconf's AC_PROG_CC to find a C compiler.  Define
+	BUILD_DIR_PREFIX.  Look for flex, makeinfo and m4.
+	* configure: Regenerate.
+
+2004-06-22  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (HOST_EXPORTS): Fix pasto.
+	* Makefile.in: Regenerate.
+
+2004-06-22  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (configure-build-[+module+],
+	configure-[+module+], configure-target-[+module+]): Pass
+	[+extra_configure_args+].
+	(all-build-[+module+], all-[+module+], check-[+module+],
+	install-[+module+], [+make_target+]-[+module+],
+	all-target-[+module+], check-target-[+module+],
+	install-target-[+module+], [+make_target+]-target-[+module+]):
+	Pass [+extra_make_args+].
+	(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
+	(GCC_HOST_EXPORTS): Remove.
+	(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
+	cross, check-gcc, check-gcc-c++, install-gcc,
+	gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
+	Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
+	* Makefile.in: Regenerate.
+
+2004-06-21  Christopher Faylor  <cgf@alum.bu.edu>
+
+	* configure.in: Check for srcdir/winsup rather than build directory
+	winsup.
+	* configure: Regenerate.
+
+2004-06-17  Corinna Vinschen  <vinschen@redhat.com>
+
+	* configure.in: Don't build Cygwin native newlib if winsup
+	directory is missing.  Emit warning instead.
+	* configure: Regenerate.
+
+2004-06-09  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (touch-stage[+id+]): New.
+	(restage[+prev+]): Depend on touch-stage[+id+].
+
+	* Makefile.tpl (RECURSE_FLAGS_TO_PASS): New.
+	Use it throughout.
+
+	* Makefile.def: Add profile and feedback bootstrap stages.
+	Remove next field from bootstrap stages.
+	* Makefile.tpl (LN, LN_S): Substitute.
+	(stageN-start, stageN-end): Use double-colon rules, to
+	provide a hook for additional setup commands.
+	(distclean-stageN-gcc, restageN): Create dependencies from
+	[+prev+], not from [+next+].
+	(stageN-bubble): Add commands for successive stages from
+	[+prev+], using double-colon rules.
+	(all-stageN-gcc): Fix typo.
+	(stagefeedback-start, profiledbootstrap): New.
+	* Makefile.in: Regenerate.
+	* configure.in: Call ACX_PROG_LN.
+	* configure: Regenerate.
+
+2004-06-03  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.in: Fix --enable-bootstrap breakage introduced in trees
+	without gcc.
+	* configure: Regenerate.
+
+2004-06-01  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl: Fix typo.
+	* Makefile.in: Regenerate.
+
+2004-06-01  Paolo Bonzini <bonzini@gnu.org>
+
+	* configure.in: Remove new- prefix from toplevel
+	bootstrap targets.
+	* configure: Regenerate.
+
+2004-06-01  Paolo Bonzini <bonzini@gnu.org>
+
+	Merge this patch from the gcc tree:
+
+	2004-05-30  Andreas Jaeger  <aj@suse.de>
+		    Jim Wilson <wilson@specifixinc.com>
+
+	* config-ml.in: Pass FFLAGS and ADAFLAGS for multilibs, handle F77
+	like CC.
+
+2004-06-01  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (all.normal): Rename to all.
+	(all): Replace with a rule to pick the default
+	target from configure.
+	(all-gcc, configure-gcc): Use conditionals to
+	do nothing when toplevel bootstrap is going on.
+	(GCC directory bootstrap) [gcc-bootstrap]: Disable.
+	(Toplevel bootstrap) [gcc-no-bootstrap]: Disable.
+	* configure.in: Support --enable-bootstrap.
+
+	* Makefile.def: Remove new- prefix from toplevel
+	bootstrap targets.
+	* Makefile.tpl: Likewise.
+
+	* Makefile.def: Add bootstrap_stage 4.  Add bootstrap2
+	target.
+
+	* Makefile.tpl (Toplevel bootstrap): Pass $(BASE_FLAGS_TO_PASS)
+	$(RECURSE_FLAGS) to recursive invocation of make.
+
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2004-05-27  Daniel Jacobowitz  <dan@debian.org>
+
+	* configure.in: Fix sed invocation for GFORTRAN_FOR_TARGET.
+	* configure: Regenerate.
+
+2004-05-25  Daniel Jacobowitz  <drow@false.org>
+
+	* Makefile.tpl (BUILD_EXPORTS, HOST_EXPORTS, GCC_HOST_EXPORTS)
+	(STAGE_HOST_EXPORTS, BASE_TARGET_EXPORTS, RAW_CXX_TARGET_EXPORTS)
+	(NORMAL_TARGET_EXPORTS): New macros.  Use them in all the recursive
+	targets.
+	* Makefile.in: Regenerate.
+
+2005-05-24  Paolo Bonzini <bonzini@gnu.org>
+
+	* configure.in: Test the ability to symlink directories.
+	* configure: Regenerate.
+
+	* Makefile.def (bootstrap-stage): New definitions.
+	* Makefile.tpl (configure-stage1-gcc,
+	configure-stage2-gcc, configure-stage3-gcc,
+	all-stage1-gcc, all-stage2-gcc, all-stage3-gcc,
+	new-bootstrap, new-cleanstrap, new-restage1, new-restage2,
+	new-restage3, compare): Autogenerate, see Makefile.in
+	entry for behavioral changes.
+	(distclean-stage1, new-stage1-start, new-stage1-end,
+	new-stage1-bubble, distclean-stage2, new-stage2-start,
+	new-stage2-end, new-stage2-bubble, distclean-stage3,
+	new-stage3-start, new-stage3-end): New autogenerated targets.
+	(objext, prebootstrap, BOOT_CFLAGS,
+	POSTSTAGE1_FLAGS_TO_PASS): Move above the autogenerated
+	targets.
+
+	* Makefile.in: Regenerate.
+	(distclean-stage1, new-stage1-start, new-stage1-end,
+	new-stage1-bubble, distclean-stage2, new-stage2-start,
+	new-stage2-end, new-stage2-bubble, distclean-stage3,
+	new-stage3-start, new-stage3-end): New targets.
+	(all-stage1-gcc): Move prebootstrap dependency from here...
+	(configure-stage1-gcc): ...to here.
+	(new-bootstrap): Use bubble targets.
+	(new-cleanstrap, new-restage1, new-restage2, new-restage3):
+	Use per-stage distclean targets.
+	(configure-stage1-gcc, configure-stage2-gcc,
+	configure-stage3-gcc, all-stage1-gcc,
+	all-stage2-gcc, all-stage3-gcc, new-bootstrap):
+	Use new-stageN-start to prepare the tree.
+
+2004-05-23  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def (host_modules): add libcpp.
+	* Makefile.tpl: Add dependencies on and for libcpp.
+	* Makefile.in: Regenerate.
+	* configure.in: Add libcpp host module.
+	* configure: Regenerate.
+
+2004-05-17  Zack Weinberg  <zack@codesourcery.com>
+
+	* Makefile.def, Makefile.tpl, configure.in: Remove all mention
+	of libf2c.
+	* configure, Makefile.in: Regenerate.
+
+2004-05-13  Diego Novillo  <dnovillo@redhat.com>
+
+	Merge from tree-ssa-20020619-branch.
+
+	* Makefile.def: Add libbanshee, libmudflap and libgfortran.
+	* Makefile.tpl (BUILD_CONFIGDIRS): Add libbanshee.
+	(HOST_GMPLIBS): Define.
+	(HOST_GMPINC): Define.
+	(TARGET_LIB_PATH): Add libmudflap.
+	(GFORTRAN_FOR_TARGET): Define.
+	(configure-build*): Export GFORTRAN.
+	(configure-gcc): Export GMPLIBS and GMPINC.
+	(all-gcc): Add maybe-all-libbanshee.
+	(configure-target-libgfortran): Define.
+	* Makefile.in: Regenerate.
+	* configure.in (host_libs): Add libbanshee.
+	(target_libraries): Add target-libmudflap and target-libgfortran.
+	Add --with-libbanshee.
+	Handle --disable-libmudflap.
+	(*-*-freebsd*): Use with_gmp.
+	Add $(libgcj) to noconfigdirs.
+	* configure: Regenerate.
+	* depcomp: New file.
+	* MAINTAINERS: Add tree-ssa maintainers.
+
+2004-04-28  Paolo Bonzini  <bonzini@gnu.org>
+
+	* config/acx.m4: Fix fastcompare support for new-bootstrap.
+	* configure: Regenerate.
+
+2004-04-27  Paolo Bonzini  <bonzini@gnu.org>
+
+	Revert:
+	2004-04-26  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def (flags_to_pass): Remove *dir variables that
+	are passed to the modules via TOPLEVEL_CONFIGURE_ARGUMENTS,
+	as well as prefix and exec_prefix.
+	* Makefile.in: Regenerate.
+
+2004-04-26  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def (host_modules): Mark with the bootstrap
+	flag packages on which gcc depends.
+	* Makefile.tpl (all-bootstrap): Use it.
+	* Makefile.in: Regenerate.
+
+2004-04-26  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.def (flags_to_pass): Remove *dir variables that
+	are passed to the modules via TOPLEVEL_CONFIGURE_ARGUMENTS,
+	as well as prefix and exec_prefix.
+	* Makefile.in: Regenerate.
+
+2004-04-26  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.in: Invoke ACX_PROG_CMP_IGNORE_INITIAL.
+	* configure: Regenerate.
+	* config/acx.m4: Mutuate ACX_PROG_CMP_IGNORE_INITIAL from gcc.
+	* gcc/Makefile.tpl (compare): Use the result of the test.
+	* gcc/Makefile.in: Regenerate.
+
+2004-04-23  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (all-stage1-gcc, all-stage2-gcc, all-stage3-gcc):
+	Always relocate gcc and prev-gcc to the original names, even
+	if the build fails.
+	(new-cleanstrap, new-restage1, new-restage2, new-restage3):
+	New targets.
+
+2004-04-19  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* configure.in (mips*-*-irix5*): Enable ld.
+	* configure: Regenerate.
+
+2004-04-15  James E Wilson  <wilson@specifixinc.com>
+
+	* Makefile.tpl (configure-[+module+], configure-gcc,
+	configure-stage1-gcc, configure-stage2-gcc, configure-stage3-gcc):
+	Set and export LDFLAGS.
+	* Makefile.in: Regenerate.
+
+2004-04-09  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	PR bootstrap/14871
+	* Makefile.tpl: If we don't have built-in-tree target tools,
+	use the ones found by configure rather than hacking around with
+	program_transform_name.
+	* configure.in: Give Makefile.tpl the information necessary
+	to do that.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2004-04-06  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	PR bootstrap/14760
+	* configure.in: When computing baseargs, strip *all* copies of
+	offending options.  Also, don't match/substitute the trailing space,
+	so that this actually works when two similar options are separated by
+	only one space.
+	* configure: Regenerate.
+
+2004-04-06  David Edelsohn  <edelsohn@gnu.org>
+
+	* configure.in (powerpc-*-aix*): Remove target-libada from noconfigdirs.
+	(rs6000-*-aix*): Same.
+	* configure: Regenerate.
+
+2004-03-25  Stan Shebs  <shebs@apple.com>
+
+	Remove MPW support, no longer used.
+	* mpw-README, mpw-build.in, mpw-config.in, mpw-configure,
+	mpw-install: Remove files.
+	* src-release (DEVO_SUPPORT): Remove names of removed files.
+	* MAINTAINERS: Likewise.
+
+2004-03-24  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl (top level bootstrap support): Remove now-unneeded
+	STRICT_WARN, WARN_CFLAGS flags passed down to make.
+	* Makefile.in: Regenerate.
+
+	* configure.in (top level bootstrap support): Rework --enable-werror
+	to set @stage2_werror_flag@.
+	* configure: Regenerate.
+	* Makefile.tpl (top level bootstrap support): Pass
+	@stage2_werror_flag@ down to configure in stages 2 and 3.
+	* Makefile.in: Regenerate.
+
+2004-03-23  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl (new-bootstrap): Set CC and CC_FOR_BUILD in configure
+	for stages 2 and 3 as well as in make.  As a consequence, remove
+	OUTPUT_OPTION (now detected by configure) from the flags passed down
+	to make.
+	* Makefile.in: Regenerate.
+
+	* Makefile.tpl (new-bootstrap): Fix typo.
+	* Makefile.in: Regenerate.
+
+2004-03-22  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Rearrange by moving recursive_targets rules
+	into their proper sections.
+	* Makefile.tpl (top level bootstrap support): Move disabling
+	of coverage flags from 'make' to 'configure'; improve comments.
+	* Makefile.in: Regenerate.
+
+	* Makefile.tpl (experimental top level bootstrap) Move stage1
+	language setting from all- target to configure- target; disable
+	intermodule optimization in stage 1; prevent gratuitous rebuilds
+	of stage 1.
+	* Makefile.in: Regenerate.
+	* configure.in: Comma-separate stage 1 language list for top
+	level bootstrap.
+	* configure: Regenerate.
+
+	* Makefile.tpl: Clean up experimental top level bootstrap support:
+	note known problems; set CONFIG_SHELL; don't set BUILD_CC; relocate
+	prev-gcc in configure- targets as well as all- targets.
+	* Makefile.in: Regenerate.
+
+2004-03-17  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.in: Remove symbolic link section.
+	* configure: Regenerate.
+	* Makefile.tpl (links): Remove.
+	* Makefile.in: Regenerate.
+
+2004-03-15  Paolo Bonzini  <bonzini@gnu.org>
+	    Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in (DEFAULT_YACC, DEFAULT_M4, DEFAULT_LEX):
+	Set with AC_CHECK_PROGS.
+	* configure.in: Fix comment typo from last patch.
+	* configure: Regenerate.
+
+2004-03-15  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Introduce experimental top level bootstrap support.
+	* Makefile.in: Regenerate.
+	* configure.in: Introduce support for top level bootstrap.
+	* configure: Regenerate.
+
+2004-03-12  Eric Botcazou  <ebotcazou@gcc.gnu.org>
+	    Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/14522
+	* configure.in: Cope with shells that do not support unquoted ^
+	* configure: Regenerate.
+
+2004-03-11  Eric Botcazou  <ebotcazou@gcc.gnu.org>
+	    Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/14522
+	* configure.in: Cope with shell that do not support nesting
+	quotes inside quoted backquote substitutions.
+	* configure: Regenerate.
+
+2004-03-10  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR bootstrap/14522
+	* configure.in: Fix escaping of $.
+	* configure: Regenerate.
+
+2004-03-11  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure: Regenerate.
+
+2004-03-08  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR ada/14131
+	Move language detection to the top level.
+	* configure.in: Find default values for the tools as
+	soon as possible.  Disable ada if GNAT is not found.
+	Emit error message about missing languages.  Expand
+	--enable-languages=all for the gcc subdirectory.
+
+2004-03-01  Richard Sandiford  <rsandifo@redhat.com>
+
+	* configure.in (mips64*-*-linux*): Override mips*-*-linux* case
+	and disable libgcj.
+	* configure: Regenerated.
+
+2004-02-28  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	PR bootstrap/7087
+	* Makefile.tpl: Guard XFOO sed statements better.
+	* Makefile.tpl: Add dependency for configure-target-libada.
+	* Makefile.in: Regenerate (incidentally fixes broken
+	commit when libada-branch was merged).
+
+2004-02-28  Andrew Cagney  <cagney@redhat.com>
+
+	* src-release (CVS_NAMES): Define.
+	(do-tar, do-tar): Prune $(CVS_NAMES).
+
+2004-02-23  Andrew Cagney  <cagney@redhat.com>
+
+	* texinfo/texinfo.tex: Update from version 2003-02-03.16 to
+	2004-02-19.09.
+
+2004-02-19  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	PR bootstrap/11932
+	* mkinstalldirs, install-sh: Import from automake CVS HEAD.
+
+2004-02-19  Andrew Cagney  <cagney@redhat.com>
+
+	* config.guess: Update from version 2003-06-12 to 2004-02-16.
+	* config.sub: Update from version 2003-06-13 to 2004-02-16.
+
+2004-02-11  David Edelsohn  <edelsohn@gnu.org>
+
+	* configure.in (powerpc-*-aix*): Add target-libada to noconfigdirs.
+	(rs6000-*-aix*): Same.
+	* configure: Regenerate.
+
+2004-02-11  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* configure.in (host): Add in missing $noconfigdirs to defines.
+	* configure: Regenerate.
+
+2004-02-10  Arnaud Charlet  <charlet@act-europe.fr>,
+	    Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	PR ada/6637, PR ada/5911
+	Merge with libada-branch:
+	* configure.in, Makefile.tpl, Makefile.def: Add target-libada,
+	with appropriate dependencies. Add --enable-libada configure switch.
+	* configure, Makefile.in: Regenerate.
+
+2004-02-05  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* configure.in: Don't pass --with-stabs on IRIX 5 either.
+	* configure: Regenerate.
+
+2004-02-02  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.NEWLIB: Update Red Hat license to 2004.
+
+2004-01-23  DJ Delorie  <dj@redhat.com>
+
+	* Makefile.def (target_modules) [libiberty]: Don't stage.
+	* Makefile.in: Rebuilt.
+
+2004-01-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.NEWLIB: Update to include copyrights for new
+	iconv code.
+
+2004-01-15  Andrew Cagney  <cagney@redhat.com>
+
+	* src-release: Update copyright year.
+	(do-proto-toplev): Configure using i686-pc-linux-gnu.
+	(NEWLIB_SUPPORT_DIRS): Delete macro.
+	(newlib.tar.bz2): Delete rule.
+
+2004-01-14  Loren J. Rittle <ljrittle@acm.org>
+
+	* Makefile.def (target_modules) [libtermcap, libiberty, zlib]: Stage.
+	* Makefile.tpl (configure-target-[+module+]): Support stage.
+	* Makefile.in: Rebuilt.
+
+2003-01-14  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+	* gettext.m4: Quote names of macros to be defined by AC_DEFUN
+	throughout.
+
+2004-01-04  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in: Use ./config.cache, not config.cache.
+	* configure: Regenerate.
+	* Makefile.tpl: Special-casing not needed for GCC any more.
+	* Makefile.in: Regenerate.
+
+	* configure.in: Don't share a cache file for host dirs.
+	* configure: Regenerate.
+
+	* config-ml.in: Don't mess with the cache file.
+
+2004-01-03  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Make GCC use a separate config.cache.
+	* Makefile.in: Regenerate.
+
+	PR bootstrap/11932, PR bootstrap/11933
+	(I don't know if it will fix either of them, but it relates
+	to them.)
+	* configure.in: Don't use shared config.cache for target
+	directories.
+	* configure: Regenerate.
+
+2003-12-31  Roger Sayle  <roger@eyesopen.com>
+
+	* configure.in (ia64*-*-hpux*): Disable building java libraries.
+	* configure: Regenerated.
+
+2003-12-21  Bernardo Innocenti  <bernie@develer.com>
+
+ 	* configure.in (*-*-uclinux): Exclude newlib, libgloss and rda.
+ 	* configure: Regenerated.
+
+2003-12-19  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	Port change over from GCC:
+	2003-11-20  Kelley Cook  <kcook@gcc.gnu.org>
+	* Makefile.tpl (BASE_FLAGS_TO_PASS): Pass along CONFIG_SHELL.
+	(configure-build-[+module+], configure-[+module+]): Likewise.
+	(configure-target-[+module+], configure-gcc, config.status): Likewise.
+	* Makefile.in: Regenerate.
+
+2003-12-08  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* configure.in (raw_libstdcxx_flags): Remove the leading space.
+	* configure: Regenerate.
+
+2003-11-27  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.NEWLIB: Add license info for long long routines added to
+	stdlib.
+
+2003-11-14  Arnaud Charlet  <charlet@act-europe.fr>
+
+	* Makefile.tpl (EXTRA_GCC_FLAGS): Pass BOOT_ADAFLAGS.
+	* Makefile.in: Regenerate.
+
+2003-10-20  Phil Edwards  <phil@codesourcery.com>
+
+	* configure.in (*-*-vxworks):  Add target-libiberty to noconfdirs.
+	* configure:  Regenerate.
+
+2003-10-13  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Make GCC_FLAGS_TO_PASS a superset of
+	HOST_FLAGS_TO_PASS.
+	* Makefile.in: Regenerate.
+
+2003-10-05  Mohan Embar  <gnustuff@thisiscool.com>
+
+	* configure.in: Allow explicit specification of CFLAGS_FOR_BUILD.
+	* configure: Rebuilt
+	* Makefile.tpl: Use CFLAGS_FOR_BUILD computed by configure
+	* Makefile.in: Rebuilt
+
+2003-10-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ltconfig (sys_lib_search_path_spec): Fix a typo for HPUX.
+
+2003-10-01  Phil Edwards  <pme@gcc.gnu.org>
+
+	* config-ml.in:  Use ac_configure_args directly instead of
+	ml_arguments.  Only set ml_norecursion if --no[-]recursion is
+	actually seen.
+
+2003-10-01  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	* config-ml.in: Propagate INSTALL variables.
+
+2003-09-21  Daniel Jacobowitz  <drow@mvista.com>
+
+	* configure.in: Pass a computed --program-transform-name
+	to subconfigures.
+	* configure: Regenerated.
+
+2003-09-20  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Don't pass down obsolete ENQUIRE variable.
+	* Makefile.in: Regenerate.
+
+	* Makefile.tpl: Don't pass (unused) DLLTOOL or WINDRES to gcc.
+	* Makefile.in: Regenerate.
+
+2003-09-17  Daniel Jacobowitz  <drow@mvista.com>
+
+	* configure.in (TOPLEVEL_CONFIGURE_ARGUMENTS, baseargs): Fix
+	quoting.
+	* configure: Regenerated.
+
+2003-09-12  Michael Chastain  <mec@shout.net>
+
+	Fix PR gdb/857.
+	* src-release (do-proto-topleve): Remove junk files
+	intl/config.cache, intl/config.status,
+	intl/config.h, intl/stamp-h.
+
+2003-09-14  Andrew Cagney  <cagney@redhat.com>
+
+	* src-release (dejagnu.tar): New target.
+	(dejagnu.tar.bz2): Recursively call "gdb-taz" rule.
+	(do-djunpack): Use $(PACKAGE) for the package name.
+
+2003-09-04  DJ Delorie  <dj@redhat.com>
+
+	* configure: Regenerate.
+
+2003-09-04  Robert Millan  <robertmh@gnu.org>
+
+	* configure.in: Match GNU/KFreeBSD with new kfreebsd*-gnu triplet.
+
+2003-09-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.in: Ensure arguments to sed are properly spaced.
+	* configure: Regenerate.
+
+2003-08-28  Daniel Jacobowitz  <drow@mvista.com>
+
+	Merge from gcc:
+	2003-07-20  Phil Edwards  <pme@gcc.gnu.org>
+	* install-sh:  Update to newer upstream versions (associated with
+	aclocal 1.7).
+	* missing:  Likewise, plus $1Help2man -> $1 typo fix.
+
+2003-08-27  Daniel Jacobowitz  <drow@mvista.com>
+
+	* configure.in: Set RAW_CXX_FOR_TARGET if unset.
+	* configure: Regenerated.
+
+2003-08-23  Phil Edwards  <pme@gcc.gnu.org>
+
+	* configure.in:  Use newline instead of semicolon when assuming
+	shell arguments in a for loop.
+	* configure:  Regenerated.
+
+2003-08-20  Geoffrey Keating  <geoffk@apple.com>
+
+	PR 8180
+	* configure.in: When testing with_libs and with_headers, treat
+	'no' as unset.  Based on a patch by Dan Kegel <dank@kegel.com>.
+	* configure: Regenerate.
+
+	* configure.in (TOPLEVEL_CONFIGURE_ARGUMENTS): Quote properly for
+	make, shell, etc.
+	(baseargs): Likewise.
+	* configure: Regenerate.
+
+2003-08-19  Geoffrey Keating  <geoffk@apple.com>
+
+	* configure.in: Disable libgcj for darwin not on powerpc.
+	* configure: Rebuild.
+
+2003-08-15  Michael Chastain  <mec@shout.net>
+
+	* src-release (do-proto-toplev): Remove junk files
+	dejagnu/example/calc/config.status,
+	dejagnu/example/calc/config.log.
+
+2003-08-14  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* config-ml.in, symlink-tree: Add license.
+
+2003-08-01  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	Merge from gcc:
+
+	2003-08-01  Matt Kraai  <kraai@alumni.cmu.edu>
+	* Makefile.tpl (check, check-c++): Express dependencies using
+	dependencies rather than commands.
+	* Makefile.in: Regenerate.
+
+	2003-07-31  Geoffrey Keating  <geoffk@apple.com>
+	* Makefile.tpl (libsubdir): Use gcc instead of gcc-lib.
+	* Makefile.in: Update.
+
+2003-08-01  Andrew Cagney  <cagney@redhat.com>
+
+	* configure.in (noconfigdirs): Do not add GDB when m32r-*-*.
+	* configure: Ditto.
+
+2003-07-30  Andreas Tobler  <a.tobler@schweiz.ch>
+
+	* configure.in: Enable libgcj for darwin.
+	* configure: Rebuild.
+
+2003-07-29  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* mkinstalldirs: Import autoconf 2.57 / automake 1.7 version.
+
+2003-07-27  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Use 'mkinstalldirs' rather than 'mkdir' when
+	creating target and build subdirs to build all parent dirs as needed.
+	* Makefile.in: Rebuild.
+	* configure.in: Don't build dirs explicitly here.
+	* configure: Rebuild.
+
+2003-07-22  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.tpl (all-make): Depend on intl.
+	* Makefile.in: Rebuilt.
+
+2003-07-16  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* config.if: Remove unused libc_interface determination.
+
+2003-07-14  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.in: Regenerate, correctly this time.
+
+2003-07-13  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Set INSTALL and friends using autoconf.  Remove
+	unused INSTALL_PROGRAM_ARGS.
+	* configure.in: Use AC_PROG_INSTALL.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2003-07-10  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure: Rebuilt.
+	2001-09-26  Alexandre Oliva  <aoliva@redhat.com>
+	* configure.in (noconfigdirs) [am33_2.0-*-linux*]: Don't build
+	newlib nor libgloss.
+	Wed May  9 10:07:19 2001  Alexandre Oliva  <aoliva@redhat.com>
+	* configure.in (am33_2.0-*-linux*): Added.
+
+2003-07-09  Bob Wilson  <bob.wilson@acm.org>
+
+	* configure.in: Add ${libgcj} to noconfigdirs for xtensa-*-* targets.
+	* configure: Regenerate.
+
+2003-07-06  H.J. Lu <hongjiu.lu@intel.com>
+
+	* config-ml.in: Replace PWD with PWD_COMMAND.
+	* Makefile.tpl: Likewise.
+	* Makefile.in: Regenerated.
+
+2003-06-27  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in: Clean up config-lang.in handling.  Delete
+	useless assignment to "subdirs".
+	* configure: Regenerate.
+
+2003-06-26  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in: Rename 'target_libs' to 'target_libraries'.
+	Remove useless reference to 'target_libs'.
+	* configure: Regenerate.
+
+2003-06-23  Keith Seitz  <kseitz@sources.redhat.com>
+
+	* Makefile.tpl: Add maybe-configure-itcl to configure-gdb.
+	* Makefile.in: Regenerate.
+
+2003-06-23  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.def: Introduce flags_to_pass.
+	* Makefile.tpl: Generate BASE_FLAGS_TO_PASS using it.
+	* Makefile.in: Regenerate.
+
+2003-06-23  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* configure.in (noconfigdirs) <cris-*-*>: Disable target-newlib
+	and target-libgloss.
+	<d30v-*-*, fr30-*-*, i960-*-*, m32r-*-*>: Disable gdb.
+	<h8300*-*-*>: Disable libf2c and ${libgcj}.
+	* configure: Regenerate.
+
+2003-06-17  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* configure.in: Update testsuite_flags to new location.
+	* configure. Regenerate.
+
+2003-06-18  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Remove BUILD_CC stuff.
+	* Makefile.in: Regenerate.
+
+2003-06-14  H.J. Lu <hongjiu.lu@intel.com>
+
+	* config.guess: Update to 2003-06-12 version.
+	* config.sub: Update to 2003-06-13 version.
+
+2003-06-12  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* MAINTAINERS: Add myself as MIPS co-maintainer.
+
+2003-06-12  H.J. Lu <hongjiu.lu@intel.com>
+
+	* config.guess: Update to 2003-06-06 version.
+	* config.sub: Update to 2003-06-06 version.
+
+2003-06-11  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* configure.in: Don't pass --with-stabs for mips*-sgi-irix6*o32.
+	* configure. Regenerate.
+
+2003-06-10  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in: Disable serial configure by default.
+	* configure: Regenerate.
+	* Makefile.tpl: Abolish .NOTPARALLEL.
+	* Makefile.in: Regenerate.
+
+	* Makefile.tpl: Replace {build,host,target}_canonical by
+	{build,host,target}.
+	* Makefile.in: Regenerate.
+
+	* Makefile.tpl: Fix stupid pasto.
+	* Makefile.in: Regenerate.
+
+2003-06-09  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Remove bogus conditional.
+	* Makefile.in: Regenerate.
+
+2003-06-03  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Make 'recursive targets' using autogen rather
+	than shell loop.  Remove duplicate 'clean' targets and false
+	comments.
+	* Makefile.def: Add systematic dependencies to 'recursive' targets.
+	Add systematic method of specifying missing targets in subdirs.
+	Add copyright boilerplate.
+	* Makefile.in: Regenerate.
+	* configure.in: Add 'recursive targets' to maybe list.
+	* configure: Regenerate.
+
+	* Makefile.tpl: Rename [+target+] to [+make_target+].
+	* Makefile.def: Rename 'target' to 'make_target'.
+
+2003-05-30  Nick Clifton  <nickc@redhat.com>
+
+	* README-maintainer-mode: Update URL for locating blessed config
+	tools.
+
+2003-05-29  Robert Millan  <rmh@debian.org>
+
+	* ltconfig: Import this patch and modify for use with current
+	version of ltconfig:
+
+	2003-05-21  Bruno Haible  <bruno@clisp.org>
+
+	* libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER): Add support for
+	GNU/FreeBSD.
+
+2003-05-28  DJ Delorie  <dj@redhat.com>
+
+	* Makefile.tpl: Make maybe-check-gcc .PHONY.
+	* Makefile.in: Regenerate.
+
+2003-05-28  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.NEWLIB: Add license info for newlib/libc/sys/linux/stdlib.
+
+2003-05-21  DJ Delorie  <dj@redhat.com>
+
+	* Makefile.tpl (configure-target-libiberty): Depend only on gcc, not
+	newlib or libgloss.
+	* Makefile.in: Regenerate.
+
+2003-05-21  DJ Delorie  <dj@redhat.com>
+
+	* Makefile.tpl: Add missing empty maybe-check-gcc target.
+	* Makefile.in: Regenerate.
+
+2003-05-20  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+	* configure.in: Use curly braces in the definition of tooldir.
+	* configure: Regenerate.
+
+2003-05-19  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in: Switch more things to use maybe dependencies.
+	* Makefile.tpl: Switch more things to use maybe dependencies.
+	Factor out common code from autogen IF statements.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
+2003-05-14  Kelley Cook  <kelleycook@wideopenwest.com>
+
+	* configure.in: Accept i[3456789]86 for machine type.
+	* configure: Regenerate.
+
+2003-05-18  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in: Switch more things to use maybe dependencies.
+	Rearrange a little.  Use GCC_TOPLEV_SUBDIRS.
+	* configure: Regenerate.
+	* Makefile.tpl: Switch more things to use maybe dependencies.
+	* Makefile.in: Regenerate.
+
+2003-05-16  Andreas Schwab  <schwab@suse.de>
+
+	* Makefile.tpl (install-opcodes): Define.
+	* Makefile.in: Rebuild.
+
+2003-05-13  Andreas Jaeger  <aj@suse.de>
+
+	* config.guess: Update to 2003-05-09 version.
+	* config.sub: Update to 2003-05-09 version.
+
+2003-05-13  Michael Eager <eager@mvista.com>
+
+	* configure.in: Correct sed script so that options in quotes are not
+	deleted.
+	* configure: Rebuild.
+
+2003-05-12  Corinna Vinschen  <corinna@vinschen.de>
+
+	* configure.in (FLAGS_FOR_TARGET): Remove $$s/newlib/libc/sys/cygwin
+	and $$s/newlib/libc/sys/cygwin32 include paths.
+	* configure: Ditto.
+
+2003-05-05  H.J. Lu <hjl@gnu.org>
+
+	* config-ml.in: Restored from gcc repository.
+
+2003-05-02  Chris Demetriou  <cgd@broadcom.com>
+
+	* Makefile.tpl: Require "makeinfo" from texinfo 4.2 or later.
+	* Makefile.in: Regenerate.
+
+2003-04-27  Daniel Jacobowitz  <drow@mvista.com>
+
+	* src-release (DEVO_SUPPORT): Add src-release, Makefile.tpl,
+	and Makefile.def.
+
+2003-04-27  Daniel Jacobowitz  <drow@mvista.com>
+
+	* Makefile.tpl: Clean $(BUILD_SUBDIR).
+	* Makefile.in: Regenerated.
+
+2003-04-18  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
+
+	* Makefile.tpl (MAKEINFOFLAGS): Default to --split-size=5000000.
+	* Makefile.in: Regenerate.
+
+2003-04-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* configure.in (powerpc64*-*-linux*): Remove.
+	* configure: Rebuilt.
+
+2003-04-17  Phil Edwards  <pme@gcc.gnu.org>
+
+	* Makefile.tpl (GCC_STRAP_TARGETS):  New variable containing all the
+	previous bootstrap targets, plus bubblestrap, quickstrap, cleanstrap,
+	and restrap.
+	* Makefile.in:  Regenerate.
+
+2003-04-16  Richard Earnshaw  <rearnsha@arm.com>
+
+	* configure.in (arm-*-netbsdelf*): Enable building java libraries.
+	* configure: Regenerated.
+
+2003-04-11  Alexandre Oliva  <aoliva@redhat.com>
+
+	* libtool.m4 (lt_cv_deplibs_check_method): Use pass_all on mips*.
+	* */configure: Rebuilt.
+
+2003-03-14  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES back down.
+	* Makefile.in: Regenerate.
+
+2003-03-14  Michael Chastain  <mec@shout.net>
+
+	* Makefile.in: Regenerate with correct Makefile.def.
+
+2003-03-12  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES up.  Delete unused
+	Make macro.
+	* Makefile.in: Regenerate.
+	* configure.in: Clean up gxx_include_dir logic.
+	* configure: Regenerate.
+
+2003-03-09  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
+
+	* configure.in (gxx_include_dir): Fix typo.
+	* configure: Regenerated.
+
+2003-03-06  Andrew Cagney  <cagney@redhat.com>
+
+	* texinfo/texinfo.tex: Import version 2003-02-03.16.
+
+2003-03-04  Daniel Jacobowitz  <drow@mvista.com>
+
+	* configure.in: Include $(build_tooldir)/sys-include in
+	FLAGS_FOR_TARGET.
+	* configure: Regenerated.
+
+2003-03-04  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Reindent.
+	* Makefile.in: Regenerate.
+	* configure.in: Reindent.  Don't set unused variables.
+	* configure: Regenerate.
+
+	* Makefile.tpl: Always pass down RANLIB.
+	* Makefile.in: Regenerate.
+
+	* Makefile.tpl: Don't set unused enable_shared, enable_threads macros.
+	* Makefile.in: Regenerate.
+	* configure.in: Remove unused logic relating to --enable-shared
+	and --enable-threads.  Remove bogus comments.  Remove redundant
+	noconfigdirs.
+	* configure: Regenerate.
+
+	* configure.in: Replace ${libstdcxx_version} by its value.
+	Remove reference to mh-dgux.
+	* configure: Regenerate.
+
+2003-02-28  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Rearrange.
+	* Makefile.in: Regenerate.
+
+2003-02-25  Nick Clifton  <nickc@redhat.com>
+
+	* configure: Remove site-file supprot - it is obsolete.
+
+2003-02-24  Uwe Stieber <uwe@wwws.de>
+
+	* configure.in: Add support for kaOS as cross build target system.
+	* configure: Regenerated.
+
+2003-02-20  Sean McNeil  <sean@blue.mcneil.com>
+
+	* Makefile.tpl: Add definition of CPPFLAGS to pass into
+	configure-target-* as some target builds may require additional
+	flags for preprocessor tests.
+	* Makefile.in: Regenerated.
+
+2003-02-19  Alexandre Oliva  <aoliva@redhat.com>
+
+	* libtool.m4 (LD): Append -melf* option to LD on IRIX with GNU ld.
+	* ltconfig: Handle it.
+	* ltcf-cxx.sh: Use with_gnu_ld passed as a shell variable instead of
+	auto-detecting it.
+
+2003-02-19  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ltcf-cxx.sh: Replace $linker_flags with $compiler_flags wherever
+	it is used as argument to $CC.
+	* ltcf-gcj.sh: Likewise.
+
+2003-02-19  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in: Introduce --enable-maintainer-mode.
+	* configure: Rebuilt.
+	* Makefile.tpl (Makefile.in, configure): Enable dependencies only
+	for maintainer mode.
+	* Makefile.in: Rebuilt.
+
+2003-02-19  Andrew Cagney <ac131313@redhat.com>
+
+	* configure: Regenerate using autoconf 2.13.
+
+2003-02-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* config.guess: Import latest version.
+	* config.sub: Import latest version.
+
+2003-02-18  Jason Merrill  <jason@redhat.com>
+
+	* Makefile.tpl (check-c++): Allow parallelism.
+
+2003-02-17  Andrew Cagney  <ac131313@redhat.com>
+
+	* configure: Regenerate using autoconf 000227.
+
+2003-02-15  Geoffrey Keating  <geoffk@apple.com>
+
+	* configure.in (*-*-darwin*): Rename from powerpc*-*-darwin*,
+	don't configure target-libobjc.
+	* configure: Regenerate.
+
+2003-02-14  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* Makefile.tpl (RANLIB): Define.
+	* Makefile.in: Regenerate.
+
+2003-02-06  Keith R Seitz  <keiths@redhat.com>
+
+	* Makefile.def: Remove "snavigator", "grep", and "db" modules.
+	* Makefile.tpl: Remove "all-snavigator" and "all-grep".
+	* Makefile.in: Regenerated.
+	* configure.in: Remove all traces of snavigator, db, and grep.
+	* configure: Regenerated.
+
+2003-01-31  Frank Ch. Eigler  <fche@redhat.com>
+
+	* Makefile.tpl (all-sid): Add libiberty/bfd/opcodes dependencies.
+	* Makefile.in: Regenerated.
+
+2003-01-30  Alexandre Oliva  <aoliva@redhat.com>
+
+	* config.if: Copy from GCC.
+
+2003-01-27  Phil Edwards  <pme@gcc.gnu.org>
+
+	* configure.in:  Revert 24Jan change.
+	* configure:  Regenerate.
+
+2003-01-23  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in: Revert previous change.
+	* configure: Regenerate.
+
+2003-01-23  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in: Make rda native-only.
+	* configure: Regenerate.
+
+2003-01-19  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in: Add missing \.
+	* configure: Rebuilt.
+
+2003-01-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* configure.in (baseargs): Avoid using \| in sed regular
+	expressions.
+	* configure: Rebuilt.
+
+2003-01-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* configure.in (baseargs): Remove all supported forms of
+	--cache-file, --srcdir, --host, --build and --target options
+	from argument lists.
+	* configure: Rebuilt.
+
+2003-01-15  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (noconfigdirs): Don't skip gas on IRIX 6.
+	* configure: Rebuilt.
+
+2003-01-09  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in: Substitute TOPLEVEL_CONFIGURE_ARGUMENTS.
+	* Makefile.tpl: Pass TOPLEVEL_CONFIGURE_ARGUMENTS to gcc.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2003-01-09  Christian Cornelssen  <ccorn@cs.tu-berlin.de>
+
+	* Makefile.tpl (BASE_FLAGS_TO_PASS): Also pass DESTDIR.
+	(install-info, dir.info): Prepend $(DESTDIR) to $(infodir).
+	* Makefile.in: Regenerate.
+
+2003-01-09  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in: Remove Makefile in build, host and target modules
+	unless configure was run with --no-recursion.
+	* configure: Rebuilt.
+
+2003-01-08  Chris Demetriou  <cgd@broadcom.com>
+
+	* config.guess: Update to 2003-01-03 version.
+	* config.sub: Update to 2003-01-03 version.
+
+2003-01-07  Christopher Faylor  <cgf@redhat.com>
+
+	* configure: Regenerate with proper autoconf 2.13.
+
+2003-01-07  Christopher Faylor  <cgf@redhat.com>
+
+	* configure.in: Add AC_PREREQ for consistency.
+	* configure: Regenerate.
+
+2003-01-06  Andrew Cagney  <ac131313@redhat.com>
+
+	* configure.in (GDB_TK): Add tcl directories conditional on
+	gdb/gdbtk directory being present.
+	* configure: Regenerate.
+
+2003-01-04 John David Anglin  <dave.anglin@nrc.ca>
+
+	* configure.in (LD): Improve test for gcc.  Try to set LD to the ld used
+	by gcc if LD is not defined and we are not doing a Canadian Cross.
+	* configure: Rebuilt.
+
+2003-01-01  Daniel Jacobowitz  <drow@mvista.com>
+
+	* src-release (ETC_SUPPORT): Add fdl.texi and texi2pod.pl.
+
+2002-12-31  Tom Tromey  <tromey@redhat.com>
+
+	* Makefile.in: Rebuilt.
+	* Makefile.def (target_modules) [libffi]: Allow installation.
+
+2002-12-31  Andreas Schwab  <schwab@suse.de>
+
+	* configure.in: Fix use of $program_transform_name.
+	* configure: Regenerated.
+
+2002-12-30  Daniel Jacobowitz  <drow@mvista.com>
+
+	* configure.in (baseargs): Don't remove first configure argument.
+	* configure: Regenerated.
+
+2002-12-29  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.tpl (local-distclean): Don't remove...
+	(multilib.ts): ... this.  Moved into...
+	(multilib.out): ... this.  Don't use sub-make.
+	($(BUILD_SUBDIR)/[+module+]/Makefile, [+module+]/Makefile,
+	$(TARGET_SUBDIR)/[+module+]/Makefile, gcc/Makefile): Moved into...
+	(configure-build-[+module+], configure-[+module+],
+	configure-target-[+module+], configure-gcc): ... these.  Test
+	for Makefile existence.  Drop config.status from dependencies.
+	* Makefile.in: Rebuilt.
+	* configure.in: Move gcc-version-trigger to the end of
+	ac_configure_args.  Add comments to maybedep.tmp and
+	serdep.tmp.  Introduce --disable-serial-configure.  Remove
+	nonopt from baseargs, matching and removing corresponding
+	whitespace while at it.
+	* configure: Rebuilt.
+
+2002-12-28  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (host_configargs): Replace reference to
+	no-longer-defined buildopts with --build=${build_alias}.
+	* configure: Rebuilt.
+
+2002-12-28  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.tpl ($(NOTPARALLEL)): Move to the end.  Bring uses of
+	program_transform_name to standard idiom.
+	(AUTOGEN, AUTOCONF): Define.
+	(Makefile.in): Use $(AUTOGEN).
+	(Makefile): Depend on config.status, and use autoconf-style rule to
+	build it.  Move original commands to...
+	(config.status): ... this new target.
+	(configure): Add $(srcdir).  Depend on config/acx.m4.  Use
+	$(AUTOCONF).
+	* Makefile.in: Rebuilt.
+
+2002-12-28  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Fix dramatic bustage due to change in
+	program_transform_name.
+	* Makefile.in: Regenerate.
+
+	* configure.in: Remove unnecessary PATH setting.
+	* configure: Regnerate.
+
+	* configure.in: Don't default to unprefixed tools unless
+	the native tools will work.
+	* configure: Regenerate.
+
+	* configure.in: Convert to autoconf script.  Blow away lots
+	of now-redundant Makefile fragments.
+	* configure: Generate using Autoconf.
+	* Makefile.tpl: Rewrite to reflect autoconfiscation.
+	* Makefile.in: Regenerate.
+
+2002-12-27  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure: Remove unneeded 'export's.  Make CC_FOR_TARGET,
+	CXX_FOR_TARGET, GCJ_FOR_TARGET substituted in configure.in only.
+
+	* ChangeLog: Move a couple of entries from here to winsup/cygwin,
+	where they belong.
+
+2002-12-24  Andreas Schwab  <schwab@suse.de>
+
+	* Makefile.tpl (multilib.out): Fix missing space.
+	* Makefile.in: Regenerate.
+
+2002-12-23  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Use shared multilib.out.  Use move-if-change for it.
+	Convert (cd foo; make) to (cd foo && make).  Clean up multilib.out.
+	* Makefile.in: Regenerate.
+	* configure.in: Remove unnecessary leftovers.
+
+2002-12-21  Geoffrey Keating  <geoffk@apple.com>
+
+	* configure.in (extra_ranlibflags_for_target): New variable.
+	(*-*-darwin): Add -c to ranlib commands.
+	* configure (tooldir): Handle extra_ranlibflags_for_target.
+
+2002-12-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.NEWLIB: Updated.
+	* COPYING.LIBGLOSS: Ditto.
+
+2002-12-19  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Revert HJL's change.
+	* Makefile.in: Regenerated.
+	* configure.in: Put build_prefix before $(BUILD_SUBDIR) here, and
+	always.
+
+2002-12-19  Andreas Schwab  <schwab@suse.de>
+
+	* Makefile.tpl, configure.in: Substitute libstdcxx_incdir.
+	* Makefile.in: Regenerate.
+
+2002-12-18  H.J. Lu <hjl@gnu.org>
+
+	* Makefile.tpl: Add @build_prefix@ before $(BUILD_SUBDIR).
+	* Makefile.in: Regenerated.
+
+	* configure.in (build_prefix): New. Substitute.
+
+2002-12-18  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Don't let real targets depend on phony targets.
+	* Makefile.in: Regenerate.
+
+	* Makefile.tpl (do-info): Depend on maybe-all-texinfo, not all-texinfo.
+	* Makefile.in: Regenerate.
+
+2002-12-16  Jason Merrill  <jason@redhat.com>
+
+	* Makefile.tpl (all-gcc): Use 'make quickstrap' if there was a
+	previous 'make bootstrap'.
+	* Makefile.in: Regenerate.
+
+2002-12-17  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* configure.in (noconfigdirs) [mmix-*-*]: Disable libgloss and gdb.
+
+2002-12-13  Jason Merrill  <jason@redhat.com>
+
+	* Makefile.tpl (check-gcc-c++): Renamed from check-c++.  Don't run
+	library tests.
+	(check-c++): Just depend on it and check-target-libstdc++-v3.
+	* Makefile.in: Regenerate.
+
+2002-12-13  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in, Makefile.tpl, Makefile.def: Remove tclX.
+	* Makefile.in: Regenerate.
+
+2002-12-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.NEWLIB: Update list of alternate Regent of California
+	licenses and discuss official revoking of advertising clause.
+	* COPYING.LIBGLOSS: Ditto.
+
+2002-12-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.tpl (configure-target-rda): Depend on $(ALL_GCC_C).
+	* Makefile.in: Rebuilt.
+
+2002-12-10  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure: Fix bug put in by gremlins.
+
+	* Makefile.tpl: Substitute more autoconfily.
+	* configure: Substitute more autoconfily.
+	* Makefile.in: Regenerate.
+
+2002-12-08  Andrew Cagney  <ac131313@redhat.com>
+
+	* Makefile.tpl (all-sim): Depend on maybe-configure-gdb.
+	* Makefile.in (all-sim): Ditto.
+
+2002-12-06  DJ Delorie  <dj@redhat.com>
+
+	* Makefile.tpl: Change configure dependencies to not have real
+	targets depend on phony targets.
+
+2002-12-05  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in: Revert unintentional change.
+
+	* src-release: Configure host subdirs.
+
+	* Makefile.tpl: Change dependency for */multilib.out so that
+	it works when gcc isn't in the tree.
+
+	* configure.in: Substitute more.
+	* configure: Run subconfigures from the Makefile.
+	* Makefile.tpl: Run subconfigures from the Makefile; add a few
+	convenience targets.  Make sure gcc isn't rebuilt after bootstrap.
+
+2002-12-03  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Add targets for configuring host subdirs in Makefile,
+	and corresponding dependencies.
+	* Makefile.in: Regenerate.
+
+	* configure.in (host_tools): Order binutils, gas and ld for
+	convenience in running the testsuites.
+
+	* Makefile.tpl: Introduce rules to serialize subconfigure runs.
+	* Makefile.in: Regenerate.
+	* configure.in: Introduce rules to serialize subconfigure runs.
+
+	* configure.in: Introduce BASE_CC_FOR_TARGET.
+	* Makefile.tpl: Reorganize and comment.  Introduce HOST_CONFIGARGS.
+	Realize configure-build-* targets.  Realize configure-target-* targets.
+	* Makefile.in: Regenerate.
+
+2002-12-02  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure: Move gcc_version_trigger stuff from here...
+	* configure.in: ...to here.
+
+	* configure.in: Separate subconfigure options added by this file from
+	options given by the user.  Add machinery to put args for host
+	subconfigures into the Makefile.
+
+	* Makefile.tpl: Remove 'vault' targets.
+	* Makefile.tpl: Reorder and comment dependencies.
+	* Makefile.in: Regenerate.
+
+2002-11-28  Geoffrey Keating  <geoffk@apple.com>
+
+	* configure.in: Move host-specific darwin noconfigdirs into
+	the host-specific section.
+
+2002-12-02  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Restore bkorb's style patch, accidentally lost
+	during replay.
+	* Makefile.in: Regenerate.
+
+	(finishing slow-motion replay)
+	* configure: Remove skip-this-dir support.
+	* Makefile.tpl: Remove skip-this-dir support.
+
+	* Makefile.tpl: Remove leftover support for non-autoconfiscated
+	subdirectories.
+	* Makefile.in: Regenerate.
+
+	* Makefile.tpl: Strip out useless setting of 'dir'.
+	* Makefile.in: Regenerate.
+
+2002-12-02  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	(finishing slow-motion replay)
+	* configure.in: Fix deeply stupid bug.
+
+	* configure.in: Introduce RAW_CXX_FOR_TARGET and simplify embedded
+	shell code in CXX_FOR_TARGET
+	* Makefile.def: Introduce raw_cxx.
+	* Makefile.tpl: Use raw_cxx to select between CXX_FOR_TARGET and
+	RAW_CXX_FOR_TARGET.
+	* Makefile.in: Regenerate.
+
+2002-12-02  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	(finishing slow-motion replay)
+	* Makefile.tpl: Remove unnecessary ifs.
+	* Makefile.in: Regenerate.
+
+	* Makefile.tpl: Implement soft dependency machinery.  Maybe-ize
+	dependencies.  Maybe-ize build-libiberty.  Create dummy install
+	targets for 'no_install' modules.
+	* configure: Move GDB_TK substitution to configure.in.  Move
+	build_modules stuff to configure.in.
+	* configure.in: Implement soft dependency machinery.  Maybe-ize
+	GDB_TK, rearrange slightly.  Move build_modules stuff from configure.
+	* Makefile.in: Regenerate.
+
+2002-12-01  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	(continuing slow-motion replay)
+	* Makefile.tpl: Make all-target, install-target behave similarly
+	to all, install (only hitting configured targets).  Eliminate
+	unused macro defintions.
+
+	* Makefile.tpl: Add all-gcc: all-build-libiberty dependency when
+	build != host.
+
+	* Makefile.tpl: Add all-gcc: all-libiberty dependency.
+
+	* ltcf-c.sh, ltcf-gcj.sh, Makefile.tpl: Correct BUILD/HOST confusion.
+
+	* configure.in: Produce lists of subdir targets we're actually
+	configuring.  Remove references to "dosrel".
+	* Makefile.tpl: Let configure set which subdir targets are hit.
+	Remove install-cross; clean up install; remove ALL.  Remove
+	references to "dosrel".  Remove "EXTRA_TARGET_HOST" hackery.
+	Autogenerate host module targets.  Remove empty dependency lines
+	and redundant dependency; rearrange slightly.
+	* Makefile.def: Add host-side libtermcap, utils.
+
+	* Makefile.in: Regenerate.
+
+2002-12-01  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	(Continuing slow-motion replay)
+	* Makefile.def: Add list of recursive targets to autogenerate.
+	Add build_modules.
+	* Makefile.tpl: Autogenerate do-* targets.  Autogenerate *-target-*
+	targets.  Autogenerate *-build-* targets.
+	* Makefile.in: Regenerate.
+
+2002-11-30  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	(Continuing slow-motion replay)
+	* configure: More autoconf-style substitutions.
+	* Makefile.tpl: More autoconf-style substitutions.
+	* Makefile.in: Regenerate.
+
+2002-11-30  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	(Continuing slow-motion replay)
+	* configure: Substitute more variables in a more autoconf-friendly
+	way.  Simplify slightly.
+	* Makefile.tpl: Make more variables substitutable in an
+	autoconf-friendly way.
+	* Makefile.in: Regenerate.
+
+2002-11-29  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	(Continuing slow-motion replay)
+	* configure.in (v810*): Remove special setting of tools.
+
+	* configure: Add support for extra required flags for ar or nm.
+	* configure.in (aix4.3+): Use above support for target-specific
+	issues, rather than using config/mt-aix43.
+
+2002-11-29  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	(Starting slow-motion replay merge from gcc 3.4 b-i-b branch)
+	* configure: Remove 'removing', which doesn't work.  Replace $subdir
+	with . everywhere.  Replace $subdirs with ''.  Replace $makesrcdir
+	with $srcdir.  Reformat indentation.  Substitute some variables
+	formerly hard-coded in the Makefile for build=host.
+	* Makefile.tpl: Autogenerate more; make more autoconf-friendly.
+	* Makefile.def: Autogenerate more.
+	* Makefile.in: Regenerate.
+
+2002-11-13  Bruce Korb  <bkorb@gnu.org>
+
+	* Makefile.tpl: syntactic cleanup
+
+2002-11-04  Kevin Buettner  <kevinb@redhat.com>
+
+	* Makefile.def (host_modules): Add rda.
+	* Makefile.in: Regenerate.
+	* configure.in (target_tool): Add target-rda to list.
+
+2002-10-25  Phil Edwards  <pme@gcc.gnu.org>
+
+	* Makefile.tpl (bootstrap):  Add bubblestrap, quickstrap, cleanstrap,
+	and restrap targets to this rule.
+	* Makefile.in:  Regenerate.
+
+2002-10-24  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* configure.in (i[3456]86-*-linux*): Add check to disable
+	${libgcj} for glibc1.
+
+2002-10-07  Svein E. Seldal  <Svein.Seldal@solidas.com>
+
+	* configure.in: Add tic4x target.
+
+2002-10-03  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Make SET_LIB_PATH substitution more autoconfy.
+	* Makefile.tpl: Make RPATH_ENVVAR substitution more autoconfy.
+	* configure.in: Make SET_LIB_PATH substitution more autoconfy.
+	* configure.in: Make RPATH_ENVVAR substitution more autoconfy.
+	* Makefile.in: Regenerate.
+
+2002-10-02  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Eliminate reference to all-gui, all-libproc.
+	* Makefile.in: Regenerate.
+
+	* Makefile.def: Remove order dependency comments.
+	* Makefile.tpl: Add explicit install-install dependencies.
+	* Makefile.in: Regenerate.
+
+	* Makefile.tpl: Remove material now in src-release.  (Finally!)
+	* Makefile.in: Regenerate.
+
+	* configure: Restore my original patch by syncing with gcc version.
+
+	* Bring following over from gcc:
+
+2002-09-30  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* configure.in (s390*-*-linux*): Enable libgcj.
+
+2002-10-02  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.in: Regenerate.  This really ought to fix things. :sigh:
+
+2002-10-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* configure: Move stray lines back to where they belong.
+
+2002-10-01  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Insert configure-target target, for src-release.
+
+	* configure: Finish reverting change which Andrew Cagney started
+	reverting.  Should fix bustage.
+
+	* src-release (BINUTILS_SUPPORT_DIRS): Add cpu directory.
+	* src-release: New file.  Contains material for making net
+	releases for gdb, binutils, et al., formerly in Makefile.in.
+
+2002-09-30  Nick Clifton  <nickc@redhat.com>
+
+	* cpu: New top level directory.  Intended to hold input files for
+	CGEN which have FSF copyright assignment.
+	* Makefile.in (BINUTILS_SUPPORT_DIRS): Add cpu directory.
+
+2002-09-29  Andrew Cagney  <ac131313@redhat.com>
+
+	Revert below (note that src does not contain Makefile.tpl):
+	* Makefile.tpl: Make subsituted variables more autoconfy.
+	* Makefile.in: Regenerate.
+
+2002-09-29  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure: Revert accidentally applied changes.
+
+	* Makefile.tpl: Make more autoconf-friendly.
+	* Makefile.in: Regenerate.
+	* configure: Make substitution more autoconf-like.
+
+2002-09-28  Richard Earnshaw  <rearnsha@arm.com>
+
+	* configure.in (arm-*-coff, strongarm-*-coff, xscale-*-coff): Use a
+	single entry to handle all these.
+	(arm-*-elf, strongarm-*-elf, xscale-*-elf): Likewise.  Also enable
+	libjava on arm-*-elf.
+
+2002-09-27  Geoffrey Keating  <geoffk@apple.com>
+
+	* configure.in (powerpc-*-darwin*): Don't configure BFD, TK, or the
+	things that depend on them.
+
+2002-09-25  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Make subsituted variables more autoconfy.
+	* Makefile.in: Regenerate.
+	* configure: Make seds more autoconfy.
+
+2002-09-25  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Rewrite substituted lines to look autoconfy.
+	* Makefile.in: Regenerate.
+	* configure.in: Rewrite sed statements to look autoconfy.
+
+	* Makefile.tpl: Autogenerate *-target-* lists, dependencies of
+	all-target-foo on configure-target-foo.
+	* Makefile.def: Ditto.
+	* Makefile.in: Rebuild.
+
+2002-09-22  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.def: New file.
+	* Makefile.tpl: New file.
+	* Makefile.in: Generate from Makefile.tpl with 'autogen Makefile.def'.
+
+	* configure.in: Minor rearrangement.  Simplify tests.
+
+2002-09-23  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* configure.in (with_headers): Skip copy if value is "yes".
+	(with_libs): Likewise.
+
+2002-09-20  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in (*-*-netbsd*): Use noconfigdirs, not skipdirs.
+	* configure.in (sh*-*-pe*): Ditto.
+	* configure.in (mips*-*-pe*): Ditto.
+	* configure.in (*arm-wince-pe): Ditto.
+
+	* configure.in: Rearrange.
+
+2002-09-12  Nick Clifton  <nickc@redhat.com>
+
+	* Import these changes from the config master repository:
+
+	2002-09-05  Svein E. Seldal  <Svein.Seldal@solidas.com>
+
+		* config.sub: Add tic4x target.
+
+	2002-09-03  Ben Elliston  <bje@redhat.com>
+
+		* config.guess: Detect NSR-D machines for nsr-tandem-nsk.
+		Reported by <Duncan_Stodart@insession.com>.
+
+2002-09-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.NEWLIB: More updates.
+
+2002-09-09  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.NEWLIB: Update.
+
+2002-08-23  Andrew Cagney  <ac131313@redhat.com>
+
+	* texinfo/texinfo.tex: Import version 2002-06-04.06.
+
+	* config.guess: Import version 2002-08-23.
+	* config.sub: Import version 2002-08-22.
+
+2002-08-20  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.in (GCC_FOR_TARGET): Prepend STAGE_CC_WRAPPER.
+	* configure.in (CC_FOR_TARGET, GCJ_FOR_TARGET, CXX_FOR_TARGET,
+	CXX_FOR_TARGET_FOR_RECURSIVE_MAKE): Likewise.
+
+2002-08-06  Federico G. Schwindt <fgsch@olimpo.com.br>
+
+	* configure.in (hppa*-*-openbsd*): Treat like hppa*-*-*elf*.
+
+2002-08-04  H.J. Lu  (hjl@gnu.org)
+
+	* configure.in (mips*-*-linux*): Don't skip target-libffi.
+
+2002-07-31  Alan Modra  <amodra@bigpond.net.au>
+
+	* configure.in: Move generic linux case to end.	 Copy generic
+	linux noconfigdirs to mips*-*-linux* entry and new
+	powerpc64*-*-linux* entry.  Add target-libffi for the latter.
+
+2002-07-19  Chris Demetriou  <cgd@broadcom.com>
+
+	* MAINTAINERS: Clarify on config.guess and config.sub, and add
+	one instance of them which was missed to the list to update.
+
+2002-07-16  Chris Demetriou  <cgd@broadcom.com>
+
+	* config.guess: Update to 2002-07-09 version.
+	* config.sub: Update to 2002-07-03 version.
+
+2002-07-11  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in: Remove two redundant tests.
+
+2002-07-11  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* configure.in (mips*-*-irix6*o32): Enable stabs.
+
+2002-07-08  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in: Don't build grez.
+	* Makefile.in: Ditto.
+
+	* Makefile.in: Remove references to bsp, cygmon, libstub.
+	* configure.in: Ditto.
+
+	* configure.in: Remove leftover reference to gdbtest.
+
+2002-07-08  Phil Edwards  <pme@gcc.gnu.org>
+
+	* configure.in (gxx_include_dir):  Change to match versioned
+	C++ headers if --enable-version-specific-runtime-libs is used.
+
+2002-07-04  Steve Ellcey  <sje@cup.hp.com>
+
+	* ltcf-cxx.sh (hpux*): Modify to support ia64-*-hpux*.
+
+2002-07-03  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in: Make --without-x work.
+
+2002-07-03  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* contrib: New directory.  Created to contain a copy of the
+	texi2pod.pl script so that it is in the same place as the version in
+	the FSF GCC sources.
+
+2002-07-02  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in: Rearrange target Makefile fragment collection.
+
+	* Makefile.in: Don't try to build gdbtest, tgas, ispell, inet, or
+	cvs[src].
+	* configure.in: Ditto.
+
+2002-07-01  Nathanael Nerode <neroden@gcc.gnu.org>
+
+	* Makefile.in: Eliminate 'apache' targets.
+	* configure.in: Eliminate 'apache' targets.
+
+	* configure.in: Eliminate redundant tests.  Reorganize.
+
+	* Makefile.in: Eliminate last reference to LIBGCC1_TEST.
+
+	* config-ml.in: Eliminate references to Cygnus configure.
+
+	* Makefile.in: Eliminate references to building emacs.
+
+2002-07-01  Denis Chertykov  <denisc@overta.ru>
+
+	* configure.in: Add support for ip2k.
+
+2002-06-24  Ben Elliston  <bje@redhat.com>
+
+	* configure.in (host_tools): Remove cgen.
+
+	* Makefile.in (all-cgen): Remove; runs from its source directory.
+	(check-cgen, install-cgen, clean-cgen): Likewise.
+	(all-opcodes): No not depend on all-cgen.
+	(all-sim): Likewise.
+
+2002-06-22  Nathanael Nerode  <neroden@twcny.rr.com>
+
+	* configure.in: Fix AIX configury bug.
+
+2002-06-19  Nathanael Nerode  <neroden@twcny.rr.com>
+
+	* configure.in: Replace ${topsrcdir} with ${srcdir}.
+
+	* configure.in: Move definition of libstdcxx_flags right above
+	usage, rather than way earlier.
+
+	* configure.in: Pull definition of is_cross_compiler earlier.
+
+	* configure.in: Rearrange a little.
+
+	* configure.in: Remove references to librx.
+	* Makefile.in: Remove references to librx.
+
+2002-06-19  Nathanael Nerode  <neroden@twcny.rr.com>
+
+	* configure.in: Eliminate ${gasdir} variable.
+
+2002-06-18  Dave Brolley  <brolley@redhat.com>
+
+	* configure.in: Add support for frv.
+	* config.sub: Add support for frv.
+
+2002-06-12  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* Makefile.in (CFLAGS_FOR_TARGET): Add -O2.
+
+2002-06-08  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* configure.in (vax-*-netbsd*): Re-enable gas.
+
+2002-05-31  Nathanael Nerode  <neroden@twcny.rr.com>
+
+	* Makefile.in: Replace HOST_PREFIX, HOST_PREFIX_1 with BUILD_PREFIX,
+	BUILD_PREFIX_1, to correct nomenclature.
+	* configure: Likewise.
+
+	* Makefile.in: Eliminate version-specific references to tcl8.1, tk8.1.
+	* configure.in: Eliminate version-specific references to tcl8.1, tk8.1.
+
+2002-05-31  Olaf Hering  <olh@suse.de>
+
+	* config-ml.in: Propogate DESTDIR also.
+
+2002-05-29  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* configure.in (vax-*-netbsd*): Don't build gas for this
+	platform.
+
+2002-05-28  Marek Michalkiewicz  <marekm@amelek.gda.pl>
+
+	* configure.in (noconfigdirs): Don't compile libiberty, libstdcxx
+	and libgcj for AVR.
+
+2002-05-28  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* config.sub: Add DLX target.
+
+2002-05-22  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* config.guess: Update to 2002-05-22 version.
+	* config.sub: Likewise.
+
+2002-05-16  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* Makefile.in: Allow for PWDCMD to override hardcoded pwd.
+	* config-ml.in: Likewise.
+	* configure: Likewise.
+	* configure.in: Likewise.
+
+2002-05-13  Nathanael Nerode  <neroden@twcny.rr.com>
+
+	* configure.in: Simplify makefile fragment collection.
+
+	* configure.in: Remove code to build emacs.
+
+	* configure.in : Remove --srcdir argument from targargs and buildargs
+	(it's always overridden in the Makefile anyway).  Rearrange a bit.
+
+	* configure: Move some logic to configure.in.
+	* configure.in: Move some logic from configure.
+
+2002-05-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.LIBGLOSS: New file.
+
+2002-05-07  Federico G. Schwindt <fgsch@olimpo.com.br>
+
+	* Makefile.in: Honour DESTDIR.
+
+2002-05-05  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (noconfigdirs): Don't disable libgcj on
+	sparc64-*-solaris* and sparcv9-*-solaris*.
+
+2002-05-03  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in: Revert 2002-04-18's patch; fixed in libjava.
+
+2002-05-03  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* configure.in (FLAGS_FOR_TARGET): Do not add
+	-B$$r/$(TARGET_SUBDIR)/newlib/ when compiling newlib natively
+	on i[3456]86-*-linux*.
+
+2002-05-01  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* configure.in (noconfigdirs): Replace [ ] with test.
+
+	* configure.in (noconfigdirs): Do not add target-newlib if
+	target == i[3456]86-*-linux*, and host == target.
+
+2002-04-29  Mark Mitchell  <mark@codesourcery.com>
+
+	* config.guess: Updated to 2002-04-26's version.
+	* config.sub: Updated to 2002-04-26's version.
+
+2002-04-29  Nathanael Nerode  <neroden@doctormoo.dyndns.org>
+
+	* configure.in: delete reference to absent file
+
+	* configure.in: replace '[' with 'test'
+
+	* configure.in: Eliminate references to gash.
+	* Makefile.in: Eliminate references to gash.
+
+	* configure.in: remove useless references to 'pic' makefile fragments.
+
+	* configure.in: (*-*-windows*) Finish removing.
+
+	* configure.in: Eliminate redundant test for libgui.
+
+2002-04-26  Joel Sherrill  <joel@OARcorp.com>
+
+	* configure.in (h8300*-*-rtems*): Disable libf2c and libgcj.
+	(sparc-*-elf*, sparc64-*-elf*): Disable libgcj.
+
+2002-04-19  Nathanael Nerode  <neroden@twcny.rr.com>
+
+	* configure.in: remove references to dead files
+
+2002-04-18  Tom Tromey  <tromey@redhat.com>
+
+	* configure.in: Disallow configuring libgcj when it is already
+	installed and we're using Solaris 2.8 linker.  Do enable libgcj on
+	Solaris 2.8 by default.  For PR libgcj/6158.
+
+2002-04-17  Nathanael Nerode  <neroden@twcny.rr.com>
+
+	* configure.in:  Move default CC setting out of config/mh-* fragments
+	directly into here.
+
+2002-04-17  Nathanael Nerode  <neroden@twcny.rr.com>
+
+	* configure.in: don't even try to configure or make a subdirectory
+	if there's no configure script for it.
+
+2002-04-15  Mark Mitchell  <mark@codesourcery.com>
+
+	* MAINTAINERS: Remove chill maintainers.
+	* Makefile.in (CHILLFLAGS): Remove.
+	(CHILL_LIB): Remove.
+	(TARGET_CONFIGDIRS): Remove libchill.
+	(CHILL_FOR_TARGET): Remove.
+	(BASE_FLAGS_TO_PASS): Don't pass CHILLFLAGS, CHILL_FOR_TARGET, or
+	CHILL_LIB.
+	(CONFIGURE_TARGET_MODULES): Remove configure-target-libchill.
+	(CHECK_TARGET_MODULES): Likewise.
+	(INSTALL_TARGET_MODULES): Likewise.
+	(CLEAN_TARGET_MODULES): Likewise.
+	(configure-target-libchill): Remove.
+	(all-target-libchill): Remove.
+	* configure.in (target_libs): Remove target-libchill.
+	Do not compute CHILL_FOR_TARGET.
+	* libchill: Remove directory.
+
+2002-04-15  DJ Delorie  <dj@redhat.com>
+
+	* Makefile.in, configure.in, configure: Sync with gcc, entries
+	follow...
+
+2002-04-08  Tom Tromey  <tromey@redhat.com>
+
+	* configure.in: Add FLAGS_FOR_TARGET to GCJ_FOR_TARGET.
+	Fixes PR libgcj/6068.
+
+2002-03-30  Krister Walfridsson  <cato@df.lth.se>
+
+	* configure.in (i*86-*-netbsdelf*): Don't disable libgcj.
+
+2002-03-27  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* configure.in (alpha*-dec-osf*): Enable libgcj.
+
+2002-03-24  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	Fix for: PR bootstrap/3591, target/5676
+	* configure.in (mcore-pe): Disable the configuration of
+	libstdc++-v3 since exceptions are not supported.
+
+2002-03-20  Anthony Green  <green@redhat.com>
+
+	* configure.in: Enable libgcj for xscale-elf target.
+
+2002-02-28  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (libstdcxx_flags): Don't add libstdc++-v3 flags for
+	libjava.
+	(CXX_FOR_TARGET): Explain why -shared-libgcc here.
+
+2002-02-22  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (CXX_FOR_TARGET): Add -shared-libgcc for
+	libstdc++-v3 and libjava.
+
+2002-02-11  Adam Megacz <adam@xwt.org>
+
+	* gcc/Makefile.in: Removed libstdc++-v3 dependancy for libjava and
+	boehm-gc
+
+2002-02-09  Alexandre Oliva  <aoliva@redhat.com>
+
+	* config.guess: Updated to 2002-01-30's version.
+	* config.sub: Updated to 2002-02-01's version.
+	Contribute sh64-elf.
+	2000-12-01  Alexandre Oliva  <aoliva@redhat.com>
+	* configure.in: Added sh64-*-*.
+
+2002-01-17  H.J. Lu <hjl@gnu.org>
+
+	* Makefile.in (all-fastjar): Also depend on all-libiberty.
+	(all-target-fastjar): Also depend on all-target-libiberty.
+
+Wed Dec  5 07:33:45 2001  Douglas B. Rupp  <rupp@gnat.com>
+
+	* configure, configure.in: Use temp file for long sed commands.
+
+2001-11-14  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* configure.in (noconfigdirs) [h8300*-*-*, h8500-*-*]: Disable
+	libf2c.
+
+2001-11-03  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* configure.in (noconfigdirs) [mmix-*-*]: Disable libgcj.
+
+2001-10-11  Hans-Peter Nilsson  <hp@axis.com>
+
+	* configure.in (noconfigdirs) [cris-*-*]: Disable libgcj.
+
+2001-10-02  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* configure: Handle temporary files securely using mkdir.
+
+2001-09-26  Will Cohen <wcohen@redhat.com>
+
+	* configure.in (*-*-linux*): Disable configuration of target-newlib
+	and target-libgloss.
+
+2001-09-26  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.in (EXTRA_TARGET_FLAGS): Pass RANLIB_FOR_TARGET for
+	RANLIB.
+
+2001-08-11  Graham Stott  <grahams@redhat.com>
+
+	* Makefile.in (check-c++): Add missing semicolon.
+
+2001-07-25  Andrew Haley  <aph@cambridge.redhat.com>
+
+	* configure.in (sh-*-linux*): New.
+
+2001-07-12  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
+
+	* configure.in (noconfigdirs): Don't compile libiberty, libstdcxx
+	and libgcj on m68hc11/m68hc12.
+
+2001-06-27  H.J. Lu  (hjl@gnu.org)
+
+	* Makefile (CFLAGS_FOR_BUILD): New.
+	(EXTRA_GCC_FLAGS): Add CFLAGS_FOR_BUILD.
+
+2001-06-01  Hans-Peter Nilsson  <hp@axis.com>
+
+	* configure.in (libstdcxx_flags): Do not try to execute
+	libstdc++-v3/testsuite_flags until it exists.
+
+2001-05-18  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* configure.in (libstdcxx_flags): Remove reference to libstdc++.INC.
+
+2001-05-09  Jeffrey Oldham  <oldham@codesourcery.com>
+
+	* ltcf-cxx.sh: Add -nostdlib to IRIX 6 archive_cmds.
+
+Mon Apr 23 09:15:03 2001  Anthony Green  <green@redhat.com>
+
+	* configure.in: Move *-chorusos target case to the proper switch.
+	Disable libgcj.
+
+2001-04-13  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
+
+	* Makefile.in (STAGE1_CFLAGS): Pass down.
+
+2001-04-13  Alan Modra  <amodra@one.net.au>
+
+	* config.guess: Add hppa64-linux support.  Note for next import that
+	this is already in the master file.
+	* configure.in: Likewise.  Accept `parisc' alias for `hppa'.
+
+2001-03-22  Colin Howell  <chowell@redhat.com>
+
+	* Makefile.in (DO_X): Do not backslash single-quotes in
+	backquotes (two places).
+
+2001-03-18  Laurynas Biveinis  <lauras@softhome.net>
+
+	* Makefile.in (DO_X): Quote nested quotes.
+
+2001-03-15  Laurynas Biveinis  <lauras@softhome.net>
+
+	* Makefile.in (DO_X): Use double quotes for quoting
+	"RANLIB=$${RANLIB}".
+
+2001-03-09  Nicola Pero <n.pero@mi.flashnet.it>
+
+	* configure.in: Only use `lang_requires' for languages athat are
+	actually enabled.
+
+2001-03-07  Tom Tromey  <tromey@redhat.com>
+
+	* configure.in: Allow config-lang.in to set `lang_requires' to list
+	of other required languages.
+
+2001-03-06  Laurynas Biveinis  <lauras@softhome.net>
+
+	* Makefile.in: Remove RANLIB definition. Use RANLIB
+	in RANLIB_FOR_TARGET, EXTRA_HOST_FLAGS, EXTRA_TARGET_FLAGS,
+	EXTRA_GCC_FLAGS, $(DO_X) targets only when the RANLIB is set.
+
+2001-02-28  Benjamin Kosnik  <bkoz@redhat.com>
+	    Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.in (check-c++): Use tabs, not spaces.
+
+2001-02-19  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* Makefile.in (check-c++): New rule.
+
+	* configure.in (target_libs): Remove libg++.
+	(noconfigdirs): Remove libg++.
+	(noconfigdirs): Same.
+	(noconfigdirs): Same.
+	(noconfigdirs): Same.
+
+	* config-ml.in: Remove libg++ references.
+
+	* Makefile.in (TARGET_CONFIGDIRS): Remove libio, libstdc++, libg++.
+	(ALL_TARGET_MODULES): Same.
+	(configure-target-libg++): Remove.
+	(all-target-libg++): Remove.
+	(configure-target-libio): Remove.
+	(all-target-libio): Remove.
+	(check-target-libio): Remove.
+	(.PHONY): Remove.
+	(libg++.tar.bz2): Remove.
+	(all-target-cygmon): Remove libio.
+	(all-target-libstdc++): Remove.
+	(configure-target-libstdc++): Remove.
+	(TARGET_LIB_PATH): Remove libstdc++.
+	(ALL_GCC_CXX): Remove libstdc++.
+	(all-target-gperf): Correct.
+
+2001-02-15  Anthony Green  <green@redhat.com>
+
+	* configure: Introduce GCJ_FOR_TARGET.
+	* configure.in: Ditto.
+	* Makefile.in: Ditto.
+
+2001-02-08  Chandrakala Chavva <cchavva@redhat.com>
+
+	* configure.in: for *-chorusos, don't config target-newlib and
+	target-libgloss.
+
+2001-02-04  Mark Mitchell  <mark@codesourcery.com>
+
+	Remove V2 C++ library.
+	* configure.in: Remove --enable-libstdcxx_v3 support.
+
+2001-01-27  Richard Henderson  <rth@redhat.com>
+
+	* configure.in (target_makefile_frag) [alpha*-*]: Use mt-alphaieee.
+
+2001-01-26  Tom Tromey  <tromey@redhat.com>
+
+	* configure.in: Allow libgcj to be built on Sparc Solaris.
+
+2001-01-23  Bryce McKinlay  <bryce@albatross.co.nz>
+
+	* configure.in: Enable libgcj on several additional platforms.
+
+2001-01-22  Bryce McKinlay  <bryce@albatross.co.nz>
+
+	* configure.in: Enable libgcj for linux targets.
+
+2001-01-09  Mike Stump  <mrs@wrs.com>
+
+	* Makefile.in (CONFIGURE_TARGET_MODULES): Pass back configuration
+	failures of subdirectories.
+
+2001-01-02  Laurynas Biveinis  <lauras@softhome.net>
+
+	* configure: handle DOS-style absolute paths.
+
+2001-01-02  Laurynas Biveinis  <lauras@softhome.net>
+
+	* configure.in: remove supported directories from $noconfigdirs for DJGPP.
+
+2000-12-18  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* Makefile.in (BASE_FLAGS_TO_PASS): Alphabetize.
+	(libstdcxx_incdir): Pass down.
+	* config.if: Remove expired bits for cxx_interface, add stub.
+	(libstdcxx_incdir): Add variable for g++ include directory.
+	* configure.in (gxx_include_dir): Use it.
+
+2000-12-15  Andreas Jaeger  <aj@suse.de>
+
+	* configure.in: Handle lang_dirs.
+
+2000-12-13  Anthony Green  <green@redhat.com>
+
+	* configure.in: Disable libgcj for any target not specifically
+	listed.  Disable libgcj for x86 and Alpha Linux until compatible
+	with g++ abi.
+
+2000-12-13  Mike Stump  <mrs@wrs.com>
+
+	* Makefile.in (local-distclean): Also remove fastjar.
+
+2000-12-10  Anthony Green  <green@redhat.com>
+
+	* configure.in: Define libgcj.  Disable libgcj target libraries for
+	most targets.
+
+2000-12-09  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+	* configure.in (target_libs): Revert 2000-12-08 patch.
+	(noconfigdirs): Added target-libjava.
+
+2000-12-09  Laurynas Biveinis  <lauras@softhome.net>
+
+	* Makefile.in: handle DOS-style absolute paths.
+
+2000-12-08  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+	* Makefile.in (TARGET_CONFIGDIRS): Wrong place. Removed note about
+	libjava.
+	* configure.in (target_libs): Removed `target-libjava'.
+
+2000-12-08  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+	* Makefile.in (TARGET_CONFIGDIRS): Added note about libjava.
+	(ALL_MODULES): Added fastjar.
+	(NATIVE_CHECK_MODULES, INSTALL_MODULES, CLEAN_MODULES): Likewise.
+	(all-target-libjava): all-fastjar replaces all-zip.
+	(all-fastjar): Added.
+	(configure-target-fastjar, all-target-fastjar): Likewise.
+	* configure.in (host_tools): Added fastjar.
+
+2000-12-07  Mike Stump  <mrs@wrs.com>
+
+	* Makefile.in (local-distclean): Remove leftover built files.
+
+2000-11-16  Fred Fish  <fnf@be.com>
+
+	* configure.in (enable_libstdcxx_v3): Fix typo,
+	libstd++ -> libstdc++.
+
+2000-11-13  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* configure: Provide the original toplevel configure arguments
+	(including $0) to subprocesses in the environment rather than
+	through gcc/configargs.h.
+
+2000-11-12  Mark Mitchell  <mark@codesourcery.com>
+
+	* configure: Turn on libstdc++ V3 by default.
+
+2000-10-16  Michael Meissner  <meissner@redhat.com>
+
+	* configure (gcc/configargs.h): Only create if there is a build GCC
+	directory created.
+
+2000-10-05  Phil Edwards  <pme@gcc.gnu.org>
+
+	* configure: Save configure arguments to gcc/configargs.h.
+
+2000-10-04  Andris Pavenis  <pavenis@latnet.lv>
+
+	* Makefile.in (bootstrap): avoid recursion if subdir missing
+	(cross): ditto
+	(do-proto-toplev): ditto
+
+Wed Sep 13 11:11:29 2000  Jeffrey A Law  (law@cygnus.com)
+
+	* configure.in: Do not build byacc for hppa64.  Provide paths to the
+	X11 libraries for hppa64.
+
+2000-09-02  Anthony Green  <green@cygnus.com>
+
+	* Makefile.in (all-gcc): Depend on all-zlib.
+	(CLEAN_MODULES): Add clean-zlib.
+	(ALL_MODULES): Add all-zlib.
+	* configure.in (host_libs): Add zlib.
+
+2000-08-25  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (FLAGS_FOR_TARGET): Use $target_configdirs and
+	$targargs to tell whether newlib is going to be built.
+
+	* configure.in [disable-libstdcxx-v3] (libstdcxx_flags): Search
+	$$r/TARGET_SUBDIR/libio for _G_config.h.
+
+2000-08-14  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* configure.in (libstdcxx_flags): Remove -isystem $$s/libio/stdio.
+
+	* configure: Make enable_threads and enable_shared defaults
+	explicit.  Substitute enable_threads into generated Makefiles.
+	* configure.in: Accept *-*-linux* not just *-*-linux-gnu*.
+	* libtool.m4: Accept *-*-linux* not just *-*-linux-gnu*.
+
+2000-08-02  Manfred Hollstein  <manfredh@redhat.com>
+
+	* configure.in: Re-enable all references to libg++ and librx.
+
+2002-04-09  Loren James Rittle  <rittle@labs.mot.com>
+
+	* configure.in: Add *-*-freebsd* configurations.
+
+2002-04-07  Andrew Cagney  <ac131313@redhat.com>
+
+	* Makefile.in (do-tar-bz2): Delete rule.  Replace with ...
+	(do-tar, do-bz2): New rules.
+	(taz): Update.  Replace do-tar-bz2 with do-tar and do-bz2.
+	(gdb-tar): New rule.
+	(gdb-taz): Rewrite.  Use gdb-tar and do-bz2.
+	(insight_dejagnu.tar): New rule.
+	(insight.tar): New rule.
+	(gdb+dejagnu.tar): New rule.
+	(gdb.tar): New rule.
+
+2002-04-07  Andrew Cagney  <ac131313@redhat.com>
+
+	* MAINTAINERS: Update dejagnu/
+
+2002-03-16  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ltmain.sh (relink_command): Fix typo in previous change.
+
+2002-03-15  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ltmain.sh (taglist): Initialized.  Don't let `CC' tag out of it.
+	(relink_command): Added --tag flags.
+	(mode=install): If relinking fails; error out.
+
+2002-03-12  Richard Henderson  <rth@redhat.com>
+
+	* Makefile.in (NOTPARALLEL): New.  Use it instead of explicit
+	.NOTPARALLEL tag.
+	(do-check): Rename from check.
+	(check): Allow parallel check.
+
+2002-03-11  Richard Henderson  <rth@redhat.com>
+
+	* Makefile.in (.NOTPARALLEL): Add fake tag.
+
+2002-03-07  H.J. Lu  (hjl@gnu.org)
+
+	* configure.in: Enable gprof for mips*-*-linux*.
+
+2002-02-28  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (libstdcxx_flags): Don't add libstdc++-v3 flags for
+	libjava.
+	(CXX_FOR_TARGET): Add -shared-libgcc for libstdc++-v3 and libjava.
+
+2002-02-24  Andrew Cagney  <ac131313@redhat.com>
+
+	* texinfo/texinfo.tex: Update to version 2002-02-14.08.
+
+2002-02-23  Daniel Jacobowitz  <drow@mvista.com>
+
+	* config.guess: Import from master sources, rev 1.232.
+	* config.sub: Import from master sources, rev 1.246.
+
+2002-02-23  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.in (MAKEINFO): Don't assume makeinfo will be built just
+	because its Makefile is there; test for the executable instead.
+
+2002-02-09  Alexandre Oliva  <aoliva@redhat.com>
+
+	Contribute sh64-elf.
+	2000-12-01  Alexandre Oliva  <aoliva@redhat.com>
+	* configure.in: Added sh64-*-*.
+
+2002-02-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.NEWLIB: Remove advertising clause from
+	Berkeley and Red Hat licenses.
+
+2002-02-01  Mo DeJong  <supermo@bayarea.net>
+
+	* Makefile.in: Add all-tix to deps for all-snavigator
+	so that tix is built when building snavigator.
+
+2002-02-01  Ben Elliston  <bje@redhat.com>
+
+	* config.guess: Import from master sources, rev 1.229.
+	* config.sub: Import from master sources, rev 1.240.
+
+2002-01-27  Daniel Jacobowitz  <drow@mvista.com>
+
+	From Steve Ellcey <sje@cup.hp.com>:
+	* libtool.m4 (HPUX_IA64_MODE): Set to 32 or 64 based on ABI.
+	(lt_cv_deplibs_check_method, lt_cv_file_magic_cmd,
+	lt_cv_file_magic_test_file): Set to appropriate values for HP-UX
+	IA64.
+	* ltcf-c.sh (archive_cmds, hardcode_*): Ditto.
+	* ltconfig (shlibpath_*, dynamic_linker, library_names_spec,
+	soname_spec, sys_lib_search_path_spec): Ditto.
+
+2002-01-26  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* configure.in (*-*-netbsd*): New.  Skip target-newlib,
+	target-libiberty, and target-libgloss.  Skip Java-related
+	libraries if not supported for NetBSD on target CPU.
+
+2002-01-23  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* configure.in: Import StrongARM and XScale target_configdirs from
+	FSF GCC version.
+
+2002-01-16  H.J. Lu  (hjl@gnu.org)
+
+	* config.guess: Import from master sources, rev 1.225.
+	* config.sub: Import from master sources, rev 1.238.
+
+	* MAINTAINERS: Updated notes on config.guess and config.sub.
+
+2002-01-11  Steve Ellcey  <sje@cup.hp.com>
+
+	* configure.in (ia64*-*-hpux*): New target for IA64 HP-UX,
+	ld and gdb are not supported.
+
+2002-01-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* Change reference to Cygnus Solutions to be Red Hat.
+
+2002-01-07  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.NEWLIB: Update generic copyright date.
+
+2002-01-07  Mark Salter  <msalter@redhat.com>
+
+	* configure.in: Remove target-bsp and target-cygmon from arm builds.
+	  Allow target-libgloss to be built for arm, strongarm, and xscale.
+
+2002-01-03  Ben Elliston  <bje@redhat.com>
+
+	* MAINTAINERS: Update URL for config.* scripts.
+
+2001-12-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* config.sub: Import latest version.
+	* config.guess: Likewise.
+
+2001-12-13  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* configure.in (FLAGS_FOR_TARGET): Remove -nostdinc and -isystem
+	options for i[3456]86-pc-linux* native builds.
+
+2001-12-05  Laurent Guerby  <guerby@acm.org>
+
+	* MAINTAINERS: gcc adopts symlink-tree, refer more to
+	libiberty.
+
+	Import this patch from gcc:
+
+	2000-12-09  Laurynas Biveinis  <lauras@softhome.net>
+
+	    * symlink-tree: handle DOS-style absolute paths.
+
+2001-11-28  DJ Delorie <dj@redhat.com>
+	    Zack Weinberg  <zack@codesourcery.com>
+
+	When build != host, create libiberty for the build machine.
+
+	* Makefile.in (TARGET_CONFIGARGS, BUILD_CONFIGARGS): Replace
+	CONFIG_ARGUMENTS.
+	(ALL_BUILD_MODULES_LIST, BUILD_CONFIGDIRS, BUILD_SUBDIR):
+	New variables.
+	(ALL_BUILD_MODULES, CONFIGURE_BUILD_MODULES): New variables
+	and rules.
+	(all.normal): Depend on ALL_BUILD_MODULES.
+	(CONFIGURE_TARGET_MODULES rule): Use TARGET_CONFIGARGS.
+	(all-build-libiberty): Depend on configure-build-libiberty.
+
+	* configure: Calculate and substitute proper value for
+	ALL_BUILD_MODULES.
+	* configure.in: Create the build subdirectory.
+	Calculate and substitute TARGET_CONFIGARGS (formerly
+	CONFIG_ARGUMENTS); also BUILD_SUBDIR and BUILD_CONFIGARGS (new).
+
+2001-11-26  Geoffrey Keating  <geoffk@redhat.com>
+
+	* config.sub: Update to version 1.232 on subversion.
+
+2001-11-20  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* Makefile.in (do-proto-toplev): Use msgfmt to generate .gmo
+	files from .po files for a distribution.
+
+2001-11-19  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* COPYING.NEWLIB: Mention preserved notice in specific parts.
+
+2001-11-13  Jeff Holcomb  <jeffh@redhat.com>
+
+	Merged from net gcc:
+	2001-07-30  Jeff Sturm  <jsturm@one-pont.com>
+	* ltcf-c.sh: Use $objext, not $ac_objext.
+	2001-07-27  Mark Kettenis  <kettenis@gnu.org>
+	* ltcf-cxx.sh: Add support for GNU.
+	2001-07-22  Timothy Wall  <twall@redhat.com>
+	* ltcf-c.sh: Don't disable shared libraries for AIX5/IA64.  Preserve
+	default settings if using GNU tools with that configuration.
+	* ltcf-cxx.sh: Ditto.
+	* ltcf-gcj.sh: Ditto.
+	2001-07-21  Michael Chastain  <chastain@redhat.com>
+	* ltconfig: Set max_cmd_len to a maximum of 512Kb, as it seems some
+	HPUX 11.0 systems have trouble with 1MB.  Mark as gcc-local.
+	* ltmain.sh: Mark as gcc-local.
+
+2001-11-13  Jeff Holcomb  <jeffh@redhat.com>
+
+	* Makefile.in (all-bison): Revert 2001-10-24.
+	Don't depend on texinfo.
+
+2001-11-12  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* COPYING.NEWLIB: Add BSD-style license/copyright blurb for my work.
+
+2001-11-08  Phil Edwards  <pedwards@disaster.jaj.com>
+
+	* configure.in (--enable-languages): Be more permissive about
+	syntax.  Check for empty lists better.  Warn about $LANGUAGES.
+
+2001-11-06  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* Makefile.in (MAKEINFO): Use "missing" for makeinfo older than 4.0.
+
+2001-10-24  Jeff Holcomb  <jeffh@redhat.com>
+
+	Makefile.in (all-bison): Don't depend on texinfo.
+
+2001-10-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* gettext.m4: Test po/POTFILES.in exists before trying to read.
+
+2001-09-29  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.in (configure-target-gperf): Depend on $(ALL_GCC_CXX).
+
+2001-09-28  Hans-Peter Nilsson  <hp@axis.com>
+
+	* config.sub, config.guess: Import latest from subversions.
+
+2001-09-21  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.in (AS_FOR_TARGET, LD_FOR_TARGET,
+	DLLTOOL_FOR_TARGET, WINDRES_FOR_TARGET, AR_FOR_TARGET,
+	RANLIB_FOR_TARGET, NM_FOR_TARGET): Don't use double quotes to
+	avoid quotes nesting problems.
+	(NATIVE_CHECK_MODULES): Ditto, just for consistency.
+	(DO_X): Export only variables that are set.
+
+2001-09-19  Ben Elliston  <bje@redhat.com>
+
+	* configure.in (sparc-sun-solaris2*): Don't use /usr/bin/which on
+	Solaris when testing for the /usr/ucb/cc compiler; it has incorrect
+	semantics.  Use the shell built-in "type" command instead.
+
+2001-09-15  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* config.sub: Reverted the earlier change, this version is not the
+	master file.
+
+2001-09-14  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* config.sub: Change machine triplets from mipsel*-* to mips*el-*.
+	Add support for mips64.
+
+2001-09-03  Jeff Holcomb  <jeffh@redhat.com>
+
+	* configure.in: Enable libstdc++-v3 for h8300 targets.
+
+2001-08-30  Eric Christopher  <echristo@redhat.com>
+	    Jason Eckhardt  <jle@redhat.com>
+
+	* config.sub: Add support for mipsisa32.
+
+2001-08-30  Eric Christopher  <echristo@redhat.com>
+
+	* config.sub, config.guess: Import latest from subversions.
+
+2001-08-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* config.sub, config.guess: Import latest from subversions.
+
+2001-07-26  DJ Delorie  <dj@redhat.com>
+
+	* MAINTAINERS: Clarify libiberty merge rules and procedures.
+
+2001-06-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Revert 2001-06-17.
+	(VER): If AM_INIT_AUTOMAKE uses BFD_VERSION, get version from bfd/.
+
+2001-06-17  H.J. Lu <hjl@gnu.org>
+
+	* Makefile.in (gas.tar.bz2): Pass TOOL=bfd PACKAGE=gas to make.
+	(gas+binutils.tar.bz2): Likewise.
+	(binutils.tar.bz2): Pass TOOL=bfd PACKAGE=binutils to make.
+
+Fri Jun  8 11:14:02 2001  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* Makefile.in (VER): When present, extract the version number from
+	the file version.in.
+
+2001-06-08  Alexandre Oliva  <aoliva@redhat.com>, Jeff Sturm  <jsturm@one-point.com>
+
+	* Makefile.in (AS_FOR_TARGET, LD_FOR_TARGET, NM_FOR_TARGET): If
+	gcc/xgcc is built, use -print-prog-name to find out the program
+	name to use.
+
+2001-06-04  Mark Mitchell  <mark@codesourcery.com>
+
+	* ltcf-c.sh (archive_cmds, archive_expsym_cmds) [solaris,
+	with_gcc]: Use `gcc -shared' to build a shared library.
+
+2001-06-04  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* ltcf-c.sh (archive_cmd) [hpux, with_gcc]: Use gcc to link shared
+	archives.
+
+2001-05-28  Simon Patarin <simon.patarin@inria.fr>
+
+	* ltcf-cxx.sh (osf3/osf4/osf5): Support creation of C++  shared
+	libraries when using g++ with native linker.
+
+2001-05-28  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ltconfig, ltmain.sh: Upgrade to libtool 1.4a 1.641.2.256.
+
+2001-05-24  Tom Rix <trix@redhat.com>
+
+	* configure.in : enable ld for aix
+
+2001-05-22  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ltcf-cxx.sh (allow_undefined_flag, no_undefined_flag)
+	[aix4*|aix5*]: Prepend blank.
+
+2001-05-20  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ltconfig, ltmain.sh, libtool.m4, ltcf-c.sh, ltcf-cxx.sh,
+	ltcf-gcj.sh: Upgraded to libtool 1.4a 1.641.2.254.  Rebuilt a number
+	of subdir/configure scripts to use the new libtool.m4.
+
+2001-05-14  H.J. Lu <hjl@gnu.org>
+
+	* config.if (libc_interface): Set to -libc6.2- for cross
+	compiling to Linux/glibc 2.2.
+
+2001-05-03  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (noconfigdirs) [*-cygwin*, *-mingw*, *-beos]: Disable
+	libgcj.
+
+2001-04-26  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (noconfigdirs): Don't reset it from scratch in the
+	target case; only append to it.
+
+2001-04-26  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (noconfigdirs) [hppa*-*-*, mips*-*-irix6*,
+	sparc-*-solaris2.8]: Disable ${libgcj}.
+
+2001-04-25  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (libgcj_saved): Copy from $libgcj.
+	(libgcj): Zero out if --enable-libgcj; add to noconfigdirs is
+	--disable-libgcj.
+
+2001-04-20  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ltconfig, ltmain.sh, ltcf-cxx.sh: Upgraded to libtool 1.4a
+	1.641.2.228.
+
+2001-04-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ltconfig, ltmain.sh, libtool.m4, ltcf-c.sh, ltcf-cxx.sh,
+	ltcf-gcj.sh: Upgraded to libtool 1.4a 1.641.2.226.
+
+2001-04-01  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.in (CXX_FOR_TARGET_FOR_RECURSIVE_MAKE, RECURSE_FLAGS):
+	New macros.
+	(bootstrap, cross): Use RECURSE_FLAGS.
+	* configure.in: Subst CXX_FOR_TARGET_FOR_RECURSIVE_MAKE.
+
+2001-03-27  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (CXX_FOR_TARGET): Use xgcc for libstdc++-v3.
+
+2001-03-23  Nick Clifton  <nickc@redhat.com>
+
+	* README-maintainer-mode: Add note about inability to use "make
+	distclean" in maintainer mode.
+
+2001-03-22  Alexandre Oliva  <aoliva@redhat.com>
+
+	Re-installed:
+	2001-01-02  Laurynas Biveinis  <lauras@softhome.net>
+	* ltcf-c.sh: Clear ac_cv_prog_cc_pic for DJGPP.  Do not add
+	'-DPIC' to ac_cv_prog_cc_pic for DJGPP.
+	* ltcf-cxx.sh: Likewise.
+	* ltcf-gcj.sh: Likewise.
+
+2001-03-22  Philip Blundell  <philb@gnu.org>
+
+	* config.sub, config.guess: Import latest from subversions.
+
+2001-03-22  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ltconfig, ltmain.sh, libtool.m4, ltcf-c.sh, ltcf-cxx.sh,
+	ltcf-gcj.sh: Upgraded to libtool 1.4a 1.641.2.198.
+
+2001-03-20  Michael Chastain  <chastain@redhat.com>
+
+	* Makefile.in: all-m4 depends on all-texinfo.
+
+2001-03-08  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.in (ALL_GCC, ALL_GCC_C, ALL_GCC_CXX): Set before use.
+
+2001-02-22  Jeff Johnston <jjohnstn@redhat.com>
+
+	* COPYING.NEWLIB: Remove DJ Delorie's address because it is no
+	longer valid.
+
+2001-02-16  Nick Clifton  <nickc@redhat.com>
+
+	* configure.in (noconfigdirs): Allow configuration of texinfo
+	for Cygwin hosts.
+
+2001-02-09  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* config.guess: Add linux target for S/390.
+	* config.sub: Likewise.
+	* configure.in: Likewise.
+
+2001-02-06  Ben Elliston  <bje@redhat.com>
+
+	* configure: Output host type to stdout, not stderr.
+
+2001-02-04  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* config.guess: Import from subversions.gnu.org (revision 1.181).
+	* config.sub: Import from subversions.gnu.org (revision 1.199).
+
+2001-01-30  Alan Modra  <alan@linuxcare.com.au>
+
+	* config.guess: Handle hppa64-linux systems.
+
+2001-01-27  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* ltcf-cxx.sh (ac_cv_prog_cc_pic_works, ac_cv_prog_cc_static_works):
+	Don't unset, it's non-portable and no longer necessary, set to empty
+	instead.
+
+2001-01-27  Michael Sokolov  <msokolov@ivan.Harhan.ORG>,  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
+
+	* ltconfig: Shell portability fix for the tagname validity check.
+
+2001-01-27  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* ltcf-cxx.sh: Use parentheses around eval $ac_compile.
+
+2001-01-27  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ltcf-c.sh (ld_shlibs) [aix5*]: Disable on unknown CPU types.
+	* ltcf-cxx.sh, ltcf-gcj.sh: Likewise.
+
+2001-01-24  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ltmain.sh (TAG disable-shared, TAG disable-static): Make sure we
+	keep at least one of build_libtool_libs or build_old_libs set to
+	yes.
+
+2001-01-24  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ltcf-gcj.sh (lt_simple_link_test_code): Remove stray `(0)'.
+	* libtool.m4 (_AC_LIBTOOL_GCJ): Pass $CPPFLAGS on.
+
+2000-11-07  Philip Blundell  <pb@futuretv.com>
+
+	* Makefile.in (ETC_SUPPORT): Also add configbuild.* and configdev.*.
+
+2000-11-03  Philip Blundell  <pb@futuretv.com>
+
+	* Makefile.in (ETC_SUPPORT): Add configure.texi and associated info
+	files.
+
+2001-01-15  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* COPYING.NEWLIB: Put into source repository.
+
+2001-01-15  Ben Elliston  <bje@redhat.com>
+
+	* configure.in (host_tools): Add sid.
+	Always configure cgen.
+	* Makefile.in (all-sid): New target.
+	(check-sid, clean-sid, install-sid): Likewise.
+
+2001-01-07  Andreas Jaeger  <aj@suse.de>
+
+	* config.sub, config.guess: Update from subversions.
+
+2000-12-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in: Disable language-specific target libraries for
+	languages that aren't enabled.
+
+2000-11-24  Nick Clifton  <nickc@redhat.com>
+
+	* configure.in (xscale-elf): Add target.
+	(xscale-coff): Add target.
+	(c4x, c5x, tic54x): Move after ARM targets.
+
+2000-11-23  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ltcf-gcj.sh: Added file, required by 2000-11-18 merge.
+
+2000-11-20  Ian Lance Taylor  <ian@zembu.com>
+
+	* ltcf-cxx.sh: Added file, required by 2000-11-18 merge.
+
+2000-11-18  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.in: Merge with GCC and libgcj.
+	(ALL_GCC_C, ALL_GCC_CXX): New macros.  Use them as dependencies of
+	configure-target-<library> when their configure scripts need the C
+	or C++ library to have already been built to work properly.
+	(do_proto_toplev): Set them to an empty string.
+
+2000-11-18  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.in (HOST_LIB_PATH, TARGET_LIB_PATH): New macros.
+	(REALLY_SET_LIB_PATH): Use them.
+
+2000-11-06  Christopher Faylor <cgf@cygnus.com>
+
+	* config.sub: Add support for Sun Chorus
+
+2000-11-02  Per Lundberg  <plundis@chaosdev.org>
+
+	* config.sub: Add support for the *-storm-chaos OS.
+
+2000-10-30  Stephane Carrez  <stcarrez@worldnet.fr>
+
+	* configure.in (noconfigdirs): Don't compile some
+	of the libraries for 68HC11 & 68hc12 targets.
+
+2000-09-30  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ltconfig, ltmain.sh, libtool.m4: Updated from libtool
+	multi-language branch, to work around Solaris' /bin/sh bug.  Rebuilt
+	all affected `configure' scripts.
+
+2000-09-25  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.in (DEVO_SUPPORT): Added gettext.m4, libtool.m4 and
+	ltcf-c.sh.
+
+2000-09-12  Philip Blundell  <philb@gnu.org>
+
+	* config.sub, config.guess: Update from subversions.
+
+2000-09-06  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.in (all-zlib): Added dummy target.
+
+	* ltconfig, ltmain.sh, libtool.m4, ltcf-c.sh: Updated from libtool
+	multi-language branch.
+
+2000-09-05  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.in (all-bootstrap): Added all-texinfo and all-zlib.
+	(bootstrap*): Depend on all-bootstrap.
+
+2000-09-02  Alexandre Oliva  <aoliva@redhat.com>, DJ Delorie  <dj@redhat.com>
+
+	* configure.in (FLAGS_FOR_TARGET): Use -nostdinc even for Canadian
+	crosses, but add gcc/include to the header search path for them.
+
+2000-08-31  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ltconfig, ltmain.sh: Updated from libtool multi-language branch.
+	* libtool.m4, ltcf-c.sh: Copied from libtool multi-language branch.
+	* gettext.m4: New file, extracted from aclocal.m4.
+
+2000-08-22  Alexandre Oliva  <aoliva@redhat.com>
+
+	* config-ml.in (CC, CXX): Avoid trailing whitespace.
+	(LD_LIBRARY_PATH, SHLIB_PATH): Adjust for multilibs and export to
+	sub-configures.
+
+2000-08-20  Doug Evans  <dje@casey.transmeta.com>
+
+	* Makefile.in (ALL_MODULES): Add all-cgen.
+	(CROSS_CHECK_MODULES,INSTALL_MODULES,CLEAN_MODULES): Similarily.
+	(all-cgen): New target.
+	(all-opcodes,all-sim): Depend on all-cgen.
+	* configure.in (host_tools): Add cgen.
+	Only configure cgen if --enable-cgen-maint.
+
+2000-08-17  Alexandre Oliva  <aoliva@redhat.com>
+
+	* config-ml.in (CC, CXX): Don't introduce a leading space.
+
+2000-08-16  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (libstdcxx_flags): Use
+	libstdc++-v3/src/libstdc++.INC.
+
+2000-08-15  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (libstdcxx_flags): Use libstdc++-v3/src/INCLUDES.
+
+2000-08-11  Jason Merrill  <jason@redhat.com>
+
+	* configure.in (CC_FOR_TARGET, CHILL_FOR_TARGET,
+	CXX_FOR_TARGET): Add -B$$r/gcc/ here.
+	(FLAGS_FOR_TARGET): Not here.
+	(CHILL_FOR_TARGET, CXX_FOR_TARGET): Don't check the list of languages.
+
+2000-08-07  DJ Delorie  <dj@redhat.com>
+
+	* configure.in (FLAGS_FOR_TARGET): invert test for xgcc, should mean
+	"if we're also building gcc, and it's a gcc that will run on the
+	build machine, we want to use its includes instead of the system's
+	default includes".
+
+2000-08-03  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (libstdcxx_flags): Don't use `"'.
+
+	* config-ml.in: Adjust multilib search paths to the
+	appropriate multilib tree.
+
+2000-08-02  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (CHILL_FOR_TARGET, CXX_FOR_TARGET): Convert blanks to
+	commas in $LANGUAGES.
+
+2000-08-01  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (qCXX_FOR_TARGET): Use echo instead of expr.
+
+2000-07-31  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (qCXX_FOR_TARGET): Quote `&' characters in
+	CXX_FOR_TARGET for sed.
+
+2000-07-30  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (CC_FOR_TARGET, CHILL_FOR_TARGET, CXX_FOR_TARGET):
+	Do not override if already set in the environment or in configure.
+	Don't duplicate $(FLAGS_FOR_TARGET) if it already appears in them.
+	(FLAGS_FOR_TARGET): Don't use host directories on Canadian crosses.
+
+2000-07-27  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.in (FLAGS_FOR_TARGET): New macro.
+	(GCC_FOR_TARGET): Use it.
+	(CC_FOR_TARGET, CXX_FOR_TARGET, CHILL_FOR_TARGET): Now defined...
+	* configure.in: ... here.
+	(FLAGS_FOR_TARGET): Define.  Add ld build dir to -L path.
+	(libstdcxx_flags): Define and append to CXX_FOR_TARGET.
+
+2000-07-24  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.in (configure-target-libf2c): Depend on $(ALL_GCC).
+	(configure-target-libchill, configure-target-libobjc): Likewise.
+
+	* configure.in: Use the same cache file for all target libs.
+	* config-ml.in: But different cache files per multilib variant.
+
+2000-07-23  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* configure (topsrcdir): Don't use dirname.
+
+2000-07-20  Jason Merrill  <jason@redhat.com>
+
+	* configure.in: Remove all references to libg++ and librx.
+
+	* configure, configure.in, Makefile.in: Unify gcc and binutils.
+
+2000-07-20  Hans-Peter Nilsson  <hp@axis.com>
+
+	* config.sub: Update to subversions version 2000-07-06.
+
+2000-07-12  Andrew Haley  <aph@cygnus.com>
+
+	* configure.in (host_makefile_frag): Use mh-ia64pic on IA-64 hosts.
+	(target_makefile_frag): Use mt-ia64pic on IA-64 targets.
+
+2000-07-07  Phil Edwards  <pme@sourceware.cygnus.com>
+
+	* symlink-tree:  Check number of arguments.
+
+2000-06-06  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* texinfo/texinfo.tex: Update to version 2000-05-28.15.
+
+2000-07-05  Jim Wilson  <wilson@cygnus.com>
+
+	* Makefile.in (CXX_FOR_TARGET): Add libstdc++ to the library
+	search path for a g++ extracted from the build tree.  This
+	will allow link tests run by configure scripts in
+	subdirectories to succeed.
+
+2000-07-01  Koundinya K  <kk@ddeorg.soft.net>
+
+	* ltconfig: Add support for mips-dde-sysv4.2MP
+
+2000-06-28  Corinna Vinschen  <vinschen@cygnus.com>
+
+	* ltconfig: Check for host_os beeing one of `cygwin', `mingw' or
+	`os2'. Force ac_cv_exeext to be ".exe" in that case.
+
+2000-06-19  Timothy Wall  <twall@cygnus.com>
+
+	* configure.in (noconfigdirs): Set noconfigdirs for tic54x target.
+	* config.sub: Add tic54x target.
+
+2000-06-07  Phillip Thomas  <pthomas@suse.de>
+
+	* README-maintainer-mode: New file: Contains notes on using
+	--enable-maintainer-mode with binutils.
+
+2000-05-29  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* texinfo/texinfo.tex: Update. Version from makeinfo 4.0.
+
+2000-05-30  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* config.sub: Import CVS version 1.167 Tue May 30 09:00:07 2000.
+	* config.guess: Import CVS version 1.148 Tue May 30 09:00:06 2000
+
+20000-05-21  H.J. Lu  (hjl@gnu.org)
+
+	* Makefile.in (CC_FOR_TARGET): Make sure as/ld in the gcc
+	directory are used if they exist. Make sure
+	$(build_tooldir)/include is searched for header files,
+	$(build_tooldir)/lib/ for library files.
+	(GCC_FOR_TARGET): Likewise.
+	(CXX_FOR_TARGET): Likewise.
+
+2000-05-18  Jeffrey A Law  (law@cygnus.com)
+
+	* configure.in (hppa*64*-*-*): Do build ld for this configuration.
+
+2000-05-17  Alexandre Oliva  <aoliva@cygnus.com>
+
+	* Makefile.in (configure-target-libiberty): Depend on
+	configure-target-newlib.
+
+2000-05-16  Alexandre Oliva  <aoliva@cygnus.com>
+
+	* configure.in, Makefile.in: Merge all libffi-related
+	configury stuff from the libgcj tree.
+
+2000-05-16  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	Thu Apr 27 11:01:48 2000 Andrew Cagney <cagney@b1.cygnus.com>:
+	* Makefile.in (do-tar-bz2, do-md5sum): Skip CVS directories.
+
+2000-05-16  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	Wed Apr 26 17:03:53 2000 Andrew Cagney <cagney@b1.cygnus.com>:
+	* Makefile.in (do-djunpack): New target. Update djunpack.bat with
+	current version information.  Add to proto-toplev directory.
+	(gdb-taz): Build do-djunpack.
+
+2000-05-15  David Edelsohn  <edelsohn@gnu.org>
+
+	* configure.in: Special case powerpc*-*-aix* target_makefile_frag.
+
+2000-05-13 Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
+
+	* ltmain.sh: Preserve in relink_command any environment
+	variables that may affect the linker behavior.
+
+2000-05-12  Jeffrey A Law  (law@cygnus.com)
+
+	* config.sub (basic_machine): Recognize hppa64 as a valid cpu type.
+
+2000-05-10  Jim Wilson  <wilson@cygnus.com>
+
+	* configure.in (ia64*-*-elf*): Add gdb and friends to noconfigdirs.
+
+2000-05-08  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* djunpack.bat: Change the Sed script to replace @V@ in fnchange.lst
+	with the version name.
+
+2000-05-01  Benjamin Kosnik  <bkoz@cygnus.com>
+
+	* config.if: Tweak.
+
+2000-04-23  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* djunpack.bat: New file.
+
+2000-04-19  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* Makefile.in (taz, gdb-taz, gas.tar.bz2, binutils.tar.bz2,
+	gas+binutils.tar.bz2, libg++.tar.bz2, gnats.tar.bz2, gdb.tar.bz2,
+	dejagnu.tar.bz2, gdb+dejagnu.tar.bz2, insight.tar.bz2,
+	insight+dejagnu.tar.bz2, newlib.tar.bz2): Pass MD5PROG to sub-make.
+
+2000-04-16  Dave Pitts  <dpitts@cozx.com>
+
+	* config.sub (case $basic_machine): Change default for "ibm-*"
+	to "openedition".
+
+2000-04-12  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* Makefile.in (gdb-taz): New target.  GDB specific archive.
+	(do-md5sum): New target.
+	(MD5PROG): Define.
+	(PACKAGE): Default to TOOL.
+	(VER): Default to a shell script.
+	(taz): Rewrite target.  Move real work to do-proto-toplev.  Include
+	md5 checksum generation.
+	(do-proto-toplev): New target. Create $(PACKAGE)-$(VER) link.
+	(do-tar-bz2): Delete creation of $(PACKAGE)-$(VER) link.
+	(gdb.tar.bz2, dejagnu.tar.bz2, gdb+dejagnu.tar.bz2,
+	insight.tar.bz2): Use gdb-taz to create archive.
+
+2000-04-07  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure (warn_cflags): Delete.
+
+2000-04-05  Benjamin Kosnik  <bkoz@cygnus.com>
+	    Martin v. Loewis  <martin@loewis.home.cs.tu-berlin.de>
+
+	* configure.in (enable_libstdcxx_v3): Add.
+	(target_libs): Add bits here to switch between libstdc++-v2 and
+	libstdc++-v3.
+	* config.if: And this file too.
+	* Makefile.in: Add libstdc++-v3 targets.
+
+2000-04-05  Michael Meissner  <meissner@redhat.com>
+
+	* config.sub (d30v): Add d30v as a basic machine type.
+
+2000-03-29  Jason Merrill  <jason@casey.cygnus.com>
+
+	* configure.in: -linux-gnu*, not -linux-gnu.
+
+2000-03-03  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* Makefile.in (taz): Set PACKAGE to TOOL when not defined.
+	(do-tar-bz2): Replace TOOL with PACKAGE.
+	(gdb.tar.bz2): Remove GDBTK from GDB package.
+	(gdb+dejagnu.tar.bz2, insight.tar.bz2, insight+dejagnu.tar.bz2,
+	dejagnu.tar.bz2): New packages.
+
+2000-02-27  Andreas Jaeger  <aj@suse.de>
+
+	* configure.in: Add entry for mips*-*-linux*, move catch all
+	*-*-*linux* entry below this one.
+
+2000-02-27  Ian Lance Taylor  <ian@zembu.com>
+
+	* ltconfig, ltmain.sh: Update to libtool 1.3.4.
+
+2000-02-24  Nick Clifton  <nickc@cygnus.com>
+
+	* config.sub: Support an OS of "wince".
+
+2000-02-24  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* config.guess, config.sub: Updated to match config's 2000-02-15
+	version.
+
+2000-02-23  Linas Vepstas <linas@linas.org>
+
+	* config.sub: Add support for Linux/IBM 370.
+	* configure.in: Likewise.
+
+2000-02-22  Nick Clifton  <nickc@cygnus.com>
+
+	* configure.in: Add mips-pe, sh-pe and arm-wince-pe targets.
+
+2000-02-20  Christopher Faylor <cgf@cygnus.com>
+
+	* config.guess: Guess "cygwin" rather than "cygwin32".
+
+2000-02-16  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure (gcc_version): When setting, narrow search to
+	lines containing `version_string'.
+
+2000-02-15  Denis Chertykov  <denisc@overta.ru>
+
+	* config.sub: Add support for avr target.
+
+2000-02-01  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* config.sub: Add mmix-knuth-mmixware.
+
+2000-01-27  Christopher Faylor <cgf@redhat.com>
+
+	* Makefile.in (CC_FOR_TARGET): Add new winsup directory
+	structure stuff to -L library search.
+	(CXX_FOR_TARGET): Ditto.
+	(CROSS_CHECK_MODULES): Fix spelling mistake.
+
+2000-01-24  Mark Mitchell  <mark@codesourcery.com>
+
+	* Makefile.in (CXX_FOR_TARGET): Use g++, not xgcc, to invoke
+	the C++ compiler.
+
+2000-01-12  Richard Henderson  <rth@cygnus.com>
+
+	* configure.in: Don't build some bits for beos.
+
+2000-01-12  Joel Sherrill (joel@OARcorp.com)
+
+	* Makefile.in (CC_FOR_TARGET): Use newlib libraries as well
+	as include files.
+
+2000-01-06  Geoff Keating  <geoffk@cygnus.com>
+
+	* configure.in: Use mt-aix43 to handle *_TARGET defs,
+	not mh-aix43.
+
+1999-12-14  Richard Henderson  <rth@cygnus.com>
+
+	* config.guess (alpha-osf, alpha-linux): Detect ev67.
+	* config.sub: Accept alphaev[78], alphaev8.
+
+1999-12-03  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
+
+	* config.guess, config.sub: Update from autoconf.
+
+Tue Nov 23 00:57:41 1999  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* config-ml.in (sparc*-*-*): Disable sparcv9 support if the
+	necessary libraries are missing.
+
+1999-10-25  Andreas Schwab  <schwab@suse.de>
+
+	* configure: Fix quoting inside arguments of eval.
+
+1999-10-21  Nick Clifton  <nickc@cygnus.com>
+
+	* config-ml.in: Allow suppression of some ARM multilibs.
+
+Tue Sep  7 23:33:57 1999  Linas Vepstas  <linas@linas.org>
+
+	* config.guess: Add OS/390 match pattern.
+	* config.sub: Add mvs, openedition targets.
+	* configure.in (i370-ibm-opened*): New.
+
+1999-09-04  Steve Chamberlain  <sac@pobox.com>
+
+	* config.sub: Add support for configuring for pj.
+
+1999-08-31  Nick Clifton  <nickc@cygnus.com>
+
+	* config.sub (maybe_os): Add support for configuring for fr30.
+
+1999-08-25  Nick Clifton  <nickc@cygnus.com>
+
+	* configure.in: Do not configure or build ld for AIX
+	platforms.  ld is known to be broken on these platforms.
+
+Wed Aug 25 01:12:25 1999  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* config-ml.in: Pass compiler flag corresponding to multidirs to
+	subdir configures.
+
+1999-08-09  Ian Lance Taylor  <ian@zembu.com>
+
+	* Makefile.in (LDFLAGS): Define.
+
+1999-08-08  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* configure.in (i[3456]-*-mingw32*): Don't put gprof in
+	noconfigdirs.
+	(*-*-cygwin*): Likewise.
+
+1999-08-08  Ian Lance Taylor  <ian@zembu.com>
+
+	* mkdep: New file.
+	* Makefile.in (GAS_SUPPORT_DIRS): Add mkdep.
+	(BINUTILS_SUPPORT_DIRS): Add mkdep.
+
+	From Eli Zaretskii <eliz@is.elta.co.il>:
+	* configure (tmpfile): Change cONf$$ to cNf$$ to avoid an overly
+	long file name when using DJGPP on MS-DOS.
+
+Wed Aug  4 02:07:14 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* config.sub (vxworks case): Use os=-vxworks, not os=vxworks.
+
+1999-07-30  Alan Modra  <alan@spri.levels.unisa.edu.au>
+
+	* Makefile.in (check-target-libio): Remove all-target-libstdc++
+	dependency as this causes "make check" to globally "make all"
+
+Tue Jun 22 23:45:18 1999  Tom Tromey  <tromey@cygnus.com>
+
+	* configure.in (target_libs): Added target-zlib.
+	* Makefile.in (ALL_TARGET_MODULES): Added zlib.
+	(CONFIGURE_TARGET_MODULES): Likewise.
+	(CHECK_TARGET_MODULES): Likewise.
+	(INSTALL_TARGET_MODULES): Likewise.
+	(CLEAN_TARGET_MODULES): Likewise.
+	(configure-target-zlib): New target.
+	(all-target-zlib): Likewise.
+	(all-target-libjava): Depend on all-target-zlib.
+	(configure-target-libjava): Depend on configure-target-zlib.
+
+	* Makefile.in (configure-target-libjava): Depend on
+	configure-target-newlib.
+	(configure-target-boehm-gc): New target.
+	(configure-target-qthreads): New target.
+
+	* configure.in (target_libs): Added target-qthreads.
+	* Makefile.in (ALL_TARGET_MODULES): Added qthreads.
+	(CONFIGURE_TARGET_MODULES): Likewise.
+	(CHECK_TARGET_MODULES): Likewise.
+	(INSTALL_TARGET_MODULES): Likewise.
+	(CLEAN_TARGET_MODULES): Likewise.
+	(all-target-qthreads): New target.
+	(configure-target-libjava): Depend on configure-target-qthreads.
+	(all-target-libjava): Depend on all-target-qthreads.
+
+	* Makefile.in (ALL_TARGET_MODULES): Added libjava, boehm-gc.
+	(CONFIGURE_TARGET_MODULES): Likewise.
+	(CHECK_TARGET_MODULES): Likewise.
+	(INSTALL_TARGET_MODULES): Likewise.
+	(CLEAN_TARGET_MODULES): Likewise.
+	(all-target-libjava): New target.
+	(all-target-boehm-gc): Likewise.
+	* configure.in (target_libs): Added libjava, boehm-gc.
+
+1999-07-22  Ian Lance Taylor  <ian@zembu.com>
+
+	* Makefile.in (binutils.tar.bz2): Don't pass makeall.bat and
+	configure.bat in SUPPORT_FILES.
+	(gas+binutils.tar.bz2): Likewise.
+
+	* makeall.bat: Remove; obsolete.
+
+1999-07-21  Ian Lance Taylor  <ian@zembu.com>
+
+	From Mark Elbrecht:
+	* configure.bat: Remove; obsolete.
+
+1999-07-11  Ian Lance Taylor  <ian@zembu.com>
+
+	* configure: Add -W -Wall to the default CFLAGS when compiling with
+	gcc.
+
+Thu Jul  8 12:32:23 1999  John David Anglin <dave@hiauly1.hia.nrc.ca>
+
+	* configure.in: Build ld, binutils & gas for hppa*-*-linux-gnu*.
+
+1999-06-30  Mark Mitchell  <mark@codesourcery.com>
+
+	* configure.in: Build ld on IRIX6.
+
+1999-06-12  Ian Lance Taylor  <ian@zembu.com>
+
+	* Makefile.in: Change distribution targets to use bzip2 instead of
+	gzip.
+	(TEXINFO_SUPPORT): Set to just texinfo/texinfo.tex.
+	(taz): Don't use texinfo/gpl.texinfo or texinfo/lgpl.texinfo.
+
+1999-06-04  Nick Clifton  <nickc@cygnus.com>
+
+	* config.sub: Add mcore target.
+
+1999-05-30  Cort Dougan  <cort@cs.nmt.edu>
+
+	* config.guess (ppc-*-linux-gnu): Also use ld emul elf32ppclinux.
+
+1999-05-25  H.J. Lu  (hjl@gnu.org)
+
+	* config.guess (dummy): Changed to $dummy.
+
+1999-05-24  Nick Clifton  <nickc@cygnus.com>
+
+	* config.sub: Tidied up case statements.
+
+1999-05-22  Ben Elliston  <bje@cygnus.com>
+
+	* config.guess: Handle NEC UX/4800. Contributed by Jiro Takabatake
+	<jiro@din.or.jp>.
+
+	* config.guess: Merge with FSF version. Future changes will be
+	more accurately recorded in this ChangeLog.
+	* config.sub: Likewise.
+
+1999-05-20   Stephen L Moshier  <moshier@world.std.com>
+
+	 * Makefile.in (GCC_FOR_TARGET): Add -I$(build_tooldir)/include.
+
+1999-04-30  Tom Tromey  <tromey@cygnus.com>
+
+	* ltmain.sh: [mode link] Always use CC given by ltconfig.
+
+1999-04-23  Tom Tromey  <tromey@cygnus.com>
+
+	* ltconfig, ltmain.sh: Update to libtool 1.2f.
+
+1999-04-20  Drew Moseley  <dmoseley@cygnus.com>
+
+	* configure.in (noconfigdirs): Don't build libstub for arm-elf targets.
+	(noconfigdirs): Don't build any bsp stuff for for arm-oabi targets.
+	Bad merge removed these two changes.
+
+Tue Apr 13 22:50:54 1999  Donn Terry (donn@interix.com)
+			  Martin Heller (Ing.-Buero_Heller@t-online.de)
+
+	* config.guess (interix Alpha): Add.
+
+1999-04-11  Richard Henderson  <rth@cygnus.com>
+
+	* configure.in (i?86-*-beos*): Do config gperf; don't config
+	gdb, newlib, or libgloss.
+
+1999-04-11  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+	* config-ml.in: On mips*-*-*, if multidirs contains mabi=64, try to
+	link a trivial program with -mabi=64.  If it fails, remove mabi=64
+	from multidirs.
+
+1999-04-10  Philipp Thomas  (kthomas@gwdg.de)
+
+	* config.sub: Set basic_machine to i586 when target_alias = k6-*.
+
+1999-04-08  Nick Clifton  <nickc@cygnus.com>
+
+	* config.sub: Add support for mcore targets.
+
+1999-04-07  Michael Meissner  <meissner@cygnus.com>
+
+	* configure.in (d30v-*): Use config/mt-d30v as makefile fragment,
+	not mt-ospace, in order to shut up assembler warning about using
+	symbols that are named the same as registers.
+
+1999-04-07  Drew Moseley  <dmoseley@cygnus.com>
+
+	* Makefile.in (all-target-cygmon): Added all-target-bsp to the
+	dependency list for all-target-cygmon.
+
+1999-04-05  Doug Evans  <devans@casey.cygnus.com>
+
+	* config-ml.in: Check $host, not $target, for selective multilibs.
+	(arm-*-*): Allow disabling of biendian, h/w fp, 26 bit apcs,
+	thumb interworking, and underscore prefix multilibs.
+
+1999-04-04  Ian Lance Taylor  <ian@zembu.com>
+
+	* missing: Update to version from current automake.
+
+Fri Apr  2 15:11:32 1999  H.J. Lu  (hjl@gnu.org)
+
+	* configure (gxx_include_dir): Removed.
+
+	* configure.in (gxx_include_dir): Handle it.
+	* Makefile.in: Likewise.
+
+1999-03-29  Gavin Romig-Koch  <gavin@cygnus.com>
+
+	* config.sub (mips64vr4111,mips64vr4111el) Add.
+
+1999-03-21  Ben Elliston  <bje@cygnus.com>
+
+	* config.guess: Correct typo for detecting ELF on FreeBSD.
+
+Thu Mar 18 00:17:50 1999  Mark Elbrecht <snowball3@usa.net>
+
+	* configure.in (pc-msdosdjgpp): Set host_makefile_frag to
+	config/mh-djgpp.
+
+Thu Mar 11 18:37:23 1999  Drew Moseley  <dmoseley@cygnus.com>
+
+	* Makefile.in (all-target-bsp): Added all-gcc all-binutils and
+	all-target-newlib to dependency list for all-target-bsp.
+
+Thu Mar 11 01:19:31 1999  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* config.sub: Add i386-uwin support.
+	* config.guess: Likewise.
+
+Thu Mar 11 01:07:55 1999  Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
+
+	* configure.in: cleanup, add mh-*pic handling for arm, special
+	case powerpc*-*-aix*
+
+Wed Mar 10 18:35:07 1999  Jeff Johnston  <jjohnstn@cygnus.com>
+
+	* configure.in (noconfigdirs): Removed target-libgloss so libnosys.a
+	can be built.
+
+Wed Mar 10 17:39:09 1999  Drew Moseley  <dmoseley@cygnus.com>
+
+	* configure.in: Added bsp support to arm-*-coff and arm-*-elf
+	targets.
+
+1999-03-02  Nick Clifton  <nickc@cygnus.com>
+
+	* config.sub: Rename CYGNUS LOCAL to EGCS LOCAL
+
+1999-02-28  Geoffrey Noer  <noer@cygnus.com>
+
+	* config.sub: Check for "cygwin*" rather than "cygwin32*"
+
+1999-02-24  Nick Clifton  <nickc@cygnus.com>
+
+	* config.sub: Fix typo in arm recognition.
+
+1999-02-24  Drew Moseley  <dmoseley@cygnus.com>
+
+	* configure.in (noconfigdirs): Changed target_configdirs to
+	include target-bsp only for m68k-*-elf* and m68k-*-coff*
+	rather than m68k-*-* since it is not known to work on
+	m68k-aout. Ditto for arm-*-*oabi.
+
+1999-02-24  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* configure.in (*-*-windows*): Remove, no longer used.
+
+1999-02-19  Ben Elliston <bje@cygnus.com>
+
+	* config.guess: Automatically recognise ELF on FreeBSD. From Niall
+	Smart and improved by Andrew Cagney.
+
+1999-02-18  Marc Espie <espie@cvs.openbsd.org>
+
+	* config.guess: Recognize openbsd-*-hppa.
+
+1999-02-17  H.J. Lu  (hjl@gnu.org)
+
+	* Makefile.in (REALLY_SET_LIB_PATH): Append $$$(RPATH_ENVVAR)
+	only if it is not empty.
+
+1999-02-17  Nick Clifton  <nickc@cygnus.com>
+
+	Patch from: Scott Bambrough <scottb@corelcomputer.com>
+
+	* config.guess: Modified to recognize uname's armv* syntax.
+
+	* config.sub: Modified to recognize uname's armv* syntax.
+
+1999-02-17  Mark Salter  <msalter@cygnus.com>
+
+	* configure.in: Added target-bsp for sparclite.
+
+1999-02-08  Richard Henderson  <rth@cygnus.com>
+
+	* config.sub: Recognize alphapca5[67] and up to alphaev8.
+
+1999-02-08  Nick Clifton  <nickc@cygnus.com>
+
+	* configure.in: Add support for strongarm port.
+	* config.sub: Add support for strongarm target.
+
+1999-02-07  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* configure.in (*-*-cygwin32*): Use config/mh-cygwin instead of
+	the old name config/mh-cygwin32.
+	Enable texinfo.
+
+1999-02-04  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Do build ld for ix86 Solaris.
+
+1999-02-02  Jim Wilson  <wilson@cygnus.com>
+
+	* Makefile.in (EXTRA_GCC_FLAGS):  Set AR to $AR instead of
+	$AR_FOR_TARGET.  Likewise for RANLIB.
+
+1999-02-02  Catherine Moore  <clm@cygnus.com>
+
+	* config.sub (oabi):  Recognize.
+	* configure.in (arm-*-oabi):  Handle.
+
+1999-01-30  Robert Lipe  (robertlipe@usa.net)
+
+	* config.guess: Improve detection of i686 on UnixWare 7.
+
+1999-01-30  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* config.guess: Add support for i386-pc-interix.
+	* config.sub: Likewise.
+	* configure.in: Likewise.
+
+1999-01-18  Christopher Faylor <cgf@cygnus.com>
+
+	* Makefile.in: Remove unneeded all-target-libio from
+	from all-target-winsup target since it is now unneeded.
+	Add all-target-libtermcap in its place since it is now
+	needed.
+
+1998-12-30  Christopher Faylor <cgf@cygnus.com>
+
+	* configure.in: makefile stub for cygwin target is probably
+	unnecessary.  Remove it for now.
+
+1998-12-30  Christopher Faylor <cgf@cygnus.com>
+
+	* configure.in: libtermcap.a should be built when cygwin is the
+	target as well as the host.
+	* config.guess: Allow mixed case in cygwin uname output.
+	* Makefile.in: Add libtermcap target.
+
+1998-12-23  Jeffrey A Law  (law@cygnus.com)
+
+	* config.sub: Clean up handling of hppa2.0.
+
+1998-12-22  Rodney Brown  (rodneybrown@pmsc.com)
+
+	* config.guess: Use C code to identify more HP machines.
+
+Thu Dec 17 01:22:30 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* config.sub: Handle hppa2.0.
+
+Tue Dec 15 17:02:58 1998  Bob Manson  <manson@charmed.cygnus.com>
+
+	* configure.in: Add cygmon for x86-coff and x86-elf. Configure
+	cygmon for all sparclite targets, regardless of object format.
+
+1998-12-15  Mark Salter  <msalter@cygnus.com>
+
+	* configure.in: Added target-bsp for several target architectures.
+
+	* Makefile.in: Added rules for bsp.
+
+Fri Dec  4 01:34:02 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* config.guess: Improve detection of hppa2.0 processors.
+
+Fri Dec  4 01:33:05 1998  Niall Smart <nialls@euristix.ie>
+
+	* config.guess: Recognize FreeBSD using ELF automatically.
+
+1998-11-26  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* configure (skip-this-dir): Add handling for new shell script, which
+	might be created by a sub-directory's configure to indicate, this particular
+	directory is "unwanted".
+	* Makefile.in ($(CONFIGURE_TARGET_MODULES)): Likewise.
+
+Wed Nov 18 18:28:45 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* ltconfig: import from libtool, after changing libtool to
+	account for the cygwin name change.
+
+Wed Nov 18 18:09:14 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* Makefile.in: CC_FOR_TARGET and CXX_FOR_TARGET should also
+	include newlib/libc/sys/cygwin and newlib/libc/sys/cygwin32.
+
+Wed Nov 18 20:13:29 1998  Christopher Faylor <cgf@cygnus.com>
+
+	* configure.in: Add libtermcap to list of cygwin dependencies.
+
+1998-11-17  Geoffrey Noer  <noer@cygnus.com>
+
+	* Makefile.in: modify CC_FOR_TARGET and CXX_FOR_TARGET so that
+	they include winsup/include when it's a cygwin target.
+
+1998-11-12  Tom Tromey  <tromey@cygnus.com>
+
+	* configure.in (host_tools): Added zip.
+	* Makefile.in (all-target-libjava): Depend on all-zip.
+	(all-zip): New target.
+	(ALL_MODULES): Added all-zip.
+	(NATIVE_CHECK_MODULES): Added check-zip.
+	(INSTALL_MODULES): Added install-zip.
+	(CLEAN_MODULES): Added clean-zip.
+
+1998-11-12  Geoffrey Noer  <noer@cygnus.com>
+
+	* Makefile.in: lose "32" from comment about cygwin.
+
+1998-11-05  Nick Clifton  <nickc@cygnus.com>
+
+	* configure.in: Use -Os to build target libraries for the fr30.
+
+1998-11-04  Dave Brolley  <brolley@cygnus.com>
+
+	* config.sub: Add fr30.
+
+1998-11-02  Geoffrey Noer  <noer@cygnus.com>
+
+	* configure.in: drop "32" from config/mh-cygwin32.  Check
+	cygwin* instead of cygwin32*.
+	* config.sub: Check cygwin* instead of cygwin32*.
+
+1998-10-22  Robert Lipe  <robertl@dgii.com>
+
+	* config.guess: Match any version of Unixware7.
+
+1998-10-20  Syd Polk  <spolk@cygnus.com>
+
+	* Makefile.in configure.in: Add the ability to use tcl8.1 and tk8.1
+	if desired.
+
+1998-10-18  Jeffrey A Law  (law@cygnus.com)
+
+	* config.if (cxx_interface, libstdcxx_interface): Do not try to set
+	these if the appropriate directories and files to not exist.
+
+1998-10-14  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (DEVO_SUPPORT): Add config.if.
+
+1998-10-13  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* configure: Add pattern to replace "build_tooldir"'s
+	definition in the generated Makefile with "tooldir"'s
+	actual value.
+
+Tue Oct 13 09:17:06 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* config.sub: Bring back lost sparcv9.
+
+	* Makefile.in (all-snvavigator): Remove all-flexlm dependency.
+
+Mon Oct 12 12:09:44 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (CHILL_FOR_TARGET): Mirror recent changes to
+	CC_FOR_TARGET and friends.
+
+Mon Oct 12 12:09:30 1998  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+	* Makefile.in (build_tooldir): New variable, same as tooldir.
+	(CC_FOR_TARGET, GCC_FOR_TARGET, CXX_FOR_TARGET): Add
+	-B$(build_tooldir)/bin/.
+	(BASE_FLAGS_TO_PASS): Pass build_tooldir down.
+
+Wed Sep 30 22:20:50 1998  Robert Lipe  <robertl@dgii.com>
+
+	* config.sub: Add support for i[34567]86-pc-udk.
+	* configure.in: Likewise.
+
+Wed Sep 30 19:23:48 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* Makefile.in: add bzip2 package building bits for user
+	tools module
+	* configure.in: ditto
+
+Wed Sep 30 03:00:05 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (TARGET_CONFIGDIRS): Add libobjc.
+	(ALL_TARGET_MODULES): Add all-target-libobjc.
+	(CONFIGURE_TARGET_MODULES, CHECK_TARGET_MODULES): Similarly.
+	(INSTALL_TARGET_MODULES, CLEAN_TARGET_MODULES): Similarly.
+	(all-target-libchill): Add dependencies.
+	* configure.in (target_libs): Add libchill.
+
+1998-09-30  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* configure.in (target_subdir): Remove duplicate line.
+
+Tue Sep 29 22:45:41 1998  Felix Lee  <flee@cygnus.com>
+
+	* Makefile.in (all-automake): fix dependencies.
+
+Mon Sep 28 04:04:27 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* configure.in: Minor cleanups for building in the $(target_alias)
+	subdir.
+
+1998-09-22  Jim Wilson  <wilson@cygnus.com>
+
+	* Makefile.in (bootstrap): Set r and s before make all.  Use
+	BASE_FLAGS_TO_PASS in make all.
+	(cross): Likewise.
+
+1998-09-20  Mark Mitchell  <mark@markmitchell.com>
+
+	* Makefile.in (bootstrap): Pass TARGET_FLAGS_TO_PASS to `make all'.
+
+Sun Sep 20 00:13:02 1998  Richard Henderson  <rth@cygnus.com>
+
+	* config.sub: Fix typo in last change.
+
+1998-09-19  Michael Hayes  <m.hayes@elec.canterbury.ac.nz>
+
+	* config.sub: Add support for C4x target.
+	* configure.in: Likewise.
+
+1998-09-13  David S. Miller  <davem@pierdol.cobaltmicro.com>
+
+	* config.sub: Recognize sparcv9 just like sparc64.
+
+Wed Sep  9 15:44:52 1998  Robert Lipe  <robertl@dgii.com>
+
+	* config.guess: Match "Pent II" or "PentII" for OpenServer.
+
+Tue Sep  8 01:18:39 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* config.guess: Correctly identify Pentium II sco boxes.
+
+	* config.guess: Fix "tr" code.  From Weiwen Liu.
+
+Sat Sep  5 13:56:52 1998  John Hughes  <john@Calva.COM>
+
+	* configure.in: Do not assume x86-svr4 or x86-unixware can handle
+	stabs.
+
+Sat Sep  5 02:12:02 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (TARGET_CONFIGDIRS): Add libchill.
+	(ALL_TARGET_MODULES): Add all-target-libchill.
+	(CONFIGURE_TARGET_MODULES, CHECK_TARGET_MODULES): Similarly.
+	(INSTALL_TARGET_MODULES, CLEAN_TARGET_MODULES): Similarly.
+	(all-target-libchill): Add dependencies.
+	* configure.in (target_libs): Add libchill.
+
+Sun Aug 30 22:27:02 1998  Lutz Wohlrab <lutz.wohlrab@informatik.tu-chemnitz.de>
+
+	* config.guess: Avoid assumptions about "tr" behaves when
+	LANG is set to something other than English.
+
+Sun Aug 30 22:14:44 1998  H.J. Lu  (hjl@gnu.org)
+
+	* configure (gxx_include_dir): Changed to
+	'${prefix}/include/g++'-${libstdcxx_interface}.
+
+	* config.if: New to determine the interfaces.
+
+Sun Aug 30 21:15:19 1998  Mark Klein (mklein@dis.com)
+
+	* config.guess: Detect and handle MPE/IX.
+	* config.sub: Deal with MPE/IX.
+
+Sat Aug 29 14:32:55 1998  David Edelsohn  <edelsohn@mhpcc.edu>
+
+	* configure.in: Use mh-aix43.
+
+1998-07-29  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* configure: Fix --without/--disable cases for gxx-include-dir.
+
+Fri Aug 28 12:28:26 1998  Per Bothner  <bothner@cygnus.com>
+
+	* mdata-sh:  Imported.  Needed for automake support.
+
+Thu Aug 13 12:49:29 1998  H.J. Lu  <hjl@gnu.org>
+
+	* Makefile.in (taz): Try "chmod -R og=u ." before
+	"chmod og=u `find . -print`".
+
+Fri Jul 31 09:38:33 1998  Catherine Moore  <clm@cygnus.com>
+
+	* configure.in: Add arm-elf and thumb-elf support.
+
+Mon Jul 27 16:23:58 1998  Doug Evans  <devans@canuck.cygnus.com>
+
+	* Makefile.in: Undo previous patch.
+
+Fri Jul 24 19:55:24 1998  Doug Evans  <devans@canuck.cygnus.com>
+
+	* Makefile.in (INSTALL_TARGET): Move EXTRA_TARGET_HOST_INSTALL_MODULES
+	to here ...
+	(install-no-fixedincludes): and here
+	(INSTALL_MODULES): ... from here.
+
+Fri Jul 24 17:01:42 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.sub: Merge with FSF.
+
+	* config.guess: Merge with FSF.
+
+Fri Jul 24 08:43:36 1998  Doug Evans  <devans@canuck.cygnus.com>
+
+	* configure (extraconfigdirs): New variable.
+	(SUBDIRS): Add extraconfigdirs and recurse on them too.
+	* Makefile.in (all): Move higher in file.
+	(EXTRA_TARGET_HOST_ALL_MODULES): New variable.
+	(EXTRA_TARGET_HOST_{INSTALL,CHECK}_MODULES): New variables.
+	(ALL_MODULES): Add EXTRA_TARGET_HOST_ALL_MODULES.
+	(CROSS_CHECK_MODULES): Add EXTRA_TARGET_HOST_CHECK_MODULES.
+	(INSTALL_MODULES): Add EXTRA_TARGET_HOST_INSTALL_MODULES.
+
+1998-07-23  Brendan Kehoe  <brendan@cygnus.com>
+
+	* Makefile.in (all-target-libjava): Depend on all-gcc and
+	all-target-newlib.
+	(configure-target-libjava): Depend on $(ALL_GCC).
+
+Sat Jul 18 14:32:43 CDT 1998  Robert Lipe  <robertl@dgii.com>
+
+	* config.guess: (*-pc-sco3.2v5) Add detection for Pentium II.
+	(*-pc-unixware7) Add detection for Pentium II, Pentium Pro.
+
+Fri Jul 17 13:30:18 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ylwrap: Change absolute path checks to check for DOS style path
+	names.
+
+	* ylwrap: Don't use a full path name if the source file is in the
+	same directory.  From hjl@lucon.org (H.J. Lu).
+
+	* config-ml.in: Default to being verbose, to match Feb 18 change to
+	configure.
+
+Thu Jul 16 12:29:51 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	Brought over from egcs:
+
+	Sat Jun 27 22:46:32 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* configure.in (target_subdir): Set to ${target_alias} instead
+	of "libraries".
+
+	Mon Sep  1 16:45:44 1997  Jim Wilson  <wilson@cygnus.com>
+
+	* configure.in (target_subdir): Set to libraries if enable_multilib.
+
+Wed Jul 15 01:00:54 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in ($(CONFIGURE_TARGET_MODULES)): If there are any
+	multilibs, force reconfiguration the first time we create
+	multilib.out in a subdirectory, in case TARGET_SUBDIR is `.'.
+
+Tue Jul 14 23:41:03 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Strip any --no option from CONFIG_ARGUMENTS, to
+	avoid confusion with --no-recursion.
+
+Tue Jul 14 15:37:41 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* configure.in: Win32 hosts shouldn't use install -x
+	* install-sh: remove -x option, and special .exe-handling
+	hack.
+
+Tue Jul 14 15:28:41 1998  Richard Henderson  <rth@cygnus.com>
+
+	* config.guess: Recognize i586-pc-beos.
+	* configure.in: Don't build some bits for beos.
+
+Tue Jul 14 13:22:18 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: If CC is set but CFLAGS is not, and CC is gcc, make
+	CFLAGS default to -O2.
+
+	* ltmain.sh: Add some hacks to make SunOS --enable-shared work
+	when using GNU ld.
+
+Fri Jul 10 13:18:23 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ltmain.sh: Correct install when using a different shell.
+
+Tue Jul  7 15:24:38 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ltconfig, ltmain.sh: Update to libtool 1.2b.
+
+Thu Jul  2 13:57:36 1998  Klaus Kaempf  <kkaempf@rmi.de>
+
+	* makefile.vms: Update to build binutils/makefile.vms.  Add install
+	target.
+
+Wed Jul  1 16:45:21 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ltconfig: Update to correct AIX handling.
+
+Sat Jun 27 22:46:32 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (BASE_FLAGS_TO_PASS): Add TARGET_SUBDIR.
+
+	* configure.in (target_subdir): Set to ${target_alias} instead
+	of "libraries".
+
+1998-06-26  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* Makefile.in (BASE_FLAGS_TO_PASS): Add gcc_version_trigger.
+	(Makefile): Depend on $(gcc_version_trigger).
+
+	* configure (gcc_version): Change default initializer to empty
+	string.
+	(gcc_version_trigger): New variable; pass this variable down
+	to subdir configures to enable them checking gcc's version
+	themselves. Emit make macros for both gcc_version vars.
+	(topsrcdir): Initialize reliably.
+	(recursion line): Remove --with-gcc-version=${gcc_version}.
+
+1998-06-24  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* configure (enable_version_specific_runtime_libs): Implement new flag
+	--enable-version-specific-runtime-libs which installs C++ runtime stuff
+	in $(libsubdir); emit definition in each generated Makefile.
+	(gxx_include_dir): Initialize depending on
+	$enable_version_specific_runtime_libs.
+
+1998-06-24  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* configure (gcc_version): Initialize properly depending on
+	how and where configure is started.
+	(recursion line): Pass a --with-gcc-version=${gcc_version}
+	to configures in subdirs.
+
+Wed Jun 24 16:01:59 1998  John Metzler  <jmetzler@cygnus.com>
+
+	* configure.in (noconfigdirs): Add configure pattern for mips tx39
+	cygmon
+
+Tue Jun 23 22:42:32 1998  Mark Alexander  <marka@cygnus.com>
+
+	* configure.in: Add cygmon and libstub support for mn10200.
+
+1998-06-19  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* configure (gcc_version): Add new variable describing the
+	particular gcc version we're building.
+	* Makefile.in (libsubdir): Add new macro for the directory
+	in which the compiler finds executables, libraries, etc.
+	(BASE_FLAGS_TO_PASS): Pass down gcc_version, target_alias
+	and libsubdir.
+
+Fri Jun 19 02:36:59 1998  Alexandre Oliva <oliva@dcc.unicamp.br>
+
+	* Makefile.in (local-clean): Remove *.log.
+	(warning.log): Built with warn_summary from build.log.
+	(mail-report.log): Run test_summary.
+	(mail-report-with-warnings.log): Run test_summary including
+	warning.log in the report.
+
+Thu Jun 18 11:26:03 1998  Robert Lipe  <robertl@dgii.com>
+
+	* config.guess: Detection of Pentium II for *-sco-3.2v5*.
+
+Mon Jun 15 14:53:54 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* Makefile.in (grep): Grep no longer depends on libiberty.
+
+Fri Jun 12 14:03:34 1998  Syd Polk  <spolk@cygnus.com>
+
+	* Makefile.in: all-snavigator needs all-libgui.
+
+Thu Jun 11 19:43:47 1998  Mark Alexander  <marka@cygnus.com>
+
+	* configure.in: Add cygmon and libstub support for mn10300.
+
+Wed Jun 10 11:19:47 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* missing: Update to version from automake 1.3.
+
+	* ltmain.sh: On installation, don't get confused if the same name
+	appears more than once in the list of library names.
+
+Wed Jun  3 14:51:42 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.sub: Accept m68060 and m5200 as CPU names.
+
+Mon Jun  1 17:25:16 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Use && rather than using -a in test, because odd
+	strings can confuse test.
+	* configure.in: Likewise.
+
+Thu May 28 19:31:13 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ltconfig, ltmain.sh: Bring in Visual C++ support.
+
+Sat May 23 23:44:13 1998  Alexandre Oliva <oliva@dcc.unicamp.br>
+
+	* Makefile.in (boostrap2-lean, bootstrap3-lean,
+	bootstrap4-lean): New targets.
+
+Mon May 11 23:55:56 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* mpw-* Delete.  Not used.
+
+Mon May 11 23:11:34 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* COPYING.LIB: Update FSF address.
+
+Fri May  8 01:30:20 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ltconfig, ltmain.sh: Update to libtool 1.2a.
+
+	* Makefile.in (GASB_SUPPORT_DIRS): Remove intl; already included via
+	GAS_SUPPORT_DIRS.
+
+Thu May  7 17:27:35 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ltconfig, ltmain.sh: Avoid producing a version number if
+	-version-info was not used.
+
+Tue May  5 18:02:24 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Add --with-newlib to CONFIG_ARGUMENTS if we are
+	building with newlib.
+
+1998-04-30  Paul Eggert  <eggert@twinsun.com>
+
+	* Makefile.in (EXTRA_GCC_FLAGS): Remove backslash at end;
+	Solaris `make' causes it to continue to next definition.
+
+Tue Apr 28 16:24:24 1998  Jason Molenda  (crash@bugshack.cygnus.com)
+
+	* Makefile.in (install-gdbtk): Call this 'install-gdb' so that
+	the right GUI libraries and files are installed along with GDB.
+
+Tue Apr 28 18:11:24 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Change alpha to alpha* in several places.
+
+Tue Apr 28 07:42:00 1998  Mark Alexander  <marka@cygnus.com>
+
+	* config.sub: Recognize sparc86x.
+
+Tue Apr 28 07:35:02 1998  Michael Meissner  <meissner@cygnus.com>
+
+	* configure.in (--enable-target-optspace): Remove debug echo.
+
+Thu Apr 23 21:31:16 1998  Jim Wilson  <wilson@cygnus.com>
+
+	* configure: Set CXXFLAGS from CXXFLAGS, not CFLAGS.
+
+Thu Apr 23 12:26:38 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ltconfig: Update cygwin32 support.
+
+	* Makefile.in (GAS_SUPPORT_DIRS): Add intl.
+	(BINUTILS_SUPPORT_DIRS, GASB_SUPPORT_DIRS): Likewise.
+	(GDB_SUPPORT_DIRS): Likewise.
+
+Wed Apr 22 12:30:10 1998  Michael Meissner  <meissner@cygnus.com>
+
+	* configure.in (target_makefile_frag): If --enable-target-optspace,
+	use -Os to compile target libraries rather than -O2.  Default to
+	using -Os for d10v and m32r if --{enable,disable}-target-optspace is
+	not used.
+	* configure.in (target_cflags): Ditto for d30v.
+
+Tue Apr 21 23:06:54 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* Makefile.in (all-bfd): Depend on all-intl.
+	(all-binutils): Likewise.
+	(all-gas): Likewise.
+	(all-gprof): Likewise.
+	(all-ld): Likewise.
+
+1998-04-19  Brendan Kehoe  <brendan@cygnus.com>
+
+	* configure.in (host_tools): Fix typo, lbtool -> libtool.
+
+Fri Apr 17 16:20:42 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (all-bfd): Depend upon all-libiberty.
+
+	* ltconfig, ltmain.sh: Bring in newer cygwin32 support.
+
+Fri Apr 17 12:22:22 1998  Bob Manson  <manson@charmed.cygnus.com>
+
+	* Makefile.in: Add libstub.
+
+	* configure.in: Ditto. Build libstub for targets that have cygmon
+	support.
+
+Tue Apr 14 18:01:55 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Don't set PICFLAG on ix86-cygwin32.
+
+Tue Apr 14 12:24:45 1998  J. Kean Johnston  <jkj@sco.com>
+
+	* configure.in: Recognise i[3456]96-*-sysv5* as a valid host, and
+	use mh-sysv5 if specified.  Support gprof on SCO Open Server.
+
+Tue Apr 14 11:33:51 1998  Krister Walfridsson <cato@df.lth.se>
+
+	* configure: Define DEFAULT_M4 by searching PATH.
+	* Makfile.in: Use DEFAULT_M4.
+
+Mon Apr 13 15:37:24 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ltconfig: Add cygwin32 support.
+
+	* Makefile.in, configure.in: Add libtool as a native only directory
+	to configure and build.
+
+Sun Apr 12 20:58:46 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (INSTALL_MODULES): Remove texinfo.
+
+Wed Apr  8 13:18:56 1998  Philippe De Muyter  <phdm@macqel.be>
+
+	* Makefile.in (EXTRA_GCC_FLAGS): XFOO lines shortened.
+
+Thu Apr  2 14:48:44 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* Makefile.in: add ash make rules
+	* configure.in: add ash to native_only and host_tools lists
+
+Thu Mar 26 12:53:20 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* Makefile.in (all-gettext, all-intl): New targets.
+	(ALL_MODULES): Added all-gettext, all-intl.
+	(CROSS_CHECK_MODULES): Added check-gettext, check-intl.
+	(INSTALL_MODULES): Added install-gettext, install-intl.
+	(CLEAN_MODULES): Added clean-gettext, clean-intl.
+
+	* configure.in (host_tools): Added gettext.
+	(native_only): Likewise.
+	(noconfigdirs) [various cases]: Likewise.
+	(host_libs): Added intl.
+
+Thu Mar 26 15:00:11 1998  Keith Seitz  <keiths@onions.cygnus.com>
+
+	* configure: Do not disable building gdbtk for cygwin32 hosts.
+
+Wed Mar 25 10:04:18 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* configure.in: Add thumb-coff target.
+	* config.sub: Add thumb-coff target.
+
+Wed Mar 25 11:49:12 1998  Jason Molenda  (crash@bugshack.cygnus.com)
+
+	* Makefile.in: Revert yesterday's change.
+	(all-target-winsup):  all-target-librx stays out of here.
+
+Tue Mar 24 16:58:29 1998  Jason Molenda  (crash@bugshack.cygnus.com)
+
+	* Makefile.in (TARGET_CONFIGDIRS, ALL_TARGET_MODULES,
+	CONFIGURE_TARGET_MODULES, CHECK_TARGET_MODULES,
+	INSTALL_TARGET_MODULES, CLEAN_TARGET_MODULES, all-target-winsup):
+	Remove references to librx and libg++.
+
+Tue Mar 24 18:28:12 1998  Eric Mumpower  <nocturne@cygnus.com>
+
+	* Makefile.in (BASE_FLAGS_TO_PASS): Pass $(lispdir) down to
+	recursive makes
+
+Tue Mar 24 11:37:45 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (CC_FOR_TARGET): Use $(TARGET_SUBDIR) when passing -B
+	for newlib directory.
+	(CXX_FOR_TARGET): Likewise.
+
+Mon Mar 23 11:30:21 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* ltconfig: Update after libtool/ltconfig.in change for
+	hpux11.
+
+Fri Mar 20 18:51:43 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ltconfig, ltmain.sh: Update to libtool 1.2.
+
+Fri Mar 20 09:32:14 1998  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* Makefile.in (install-gcc): Don't specify LANGUAGES here.
+	(install-gcc-cross): Instead, override LANGUAGES here.
+
+1998-03-18  Dave Love  <d.love@dl.ac.uk>
+
+	* Makefile.in ($(CONFIGURE_TARGET_MODULES)): Set CONFIG_SITE to a
+	non-existent file since /dev/null loses with bash 2.0/autoconf 2.12.
+
+Wed Mar 18 09:24:59 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* configure.in: Add Thumb-pe target.
+
+Tue Mar 17 16:59:00 1998  Syd Polk <spolk@cygnus.com>
+
+	* Makefile.in - changed sn targets to snavigator
+	* configure.in - changed sn targets to snavigator
+
+Tue Mar 17 10:33:28 1998  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* config-ml.in: After building symlink tree call make distclean
+	if a Makefile got linked into ${ml_dir}/${ml_libdir}; this happens
+	to be the case for libiberty.
+
+Tue Mar 17 10:22:37 1998  H.J. Lu  (hjl@gnu.ai.mit.edu)
+
+	* configure: When making link, also check the current
+	directory. The configure scripts may create one.
+
+Fri Mar  6 01:02:03 1998  Richard Henderson  <rth@cygnus.com>
+
+	* config.sub: Accept alphapca56 and alphaev6 properly.
+
+Fri Mar  6 00:14:55 1998  Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
+
+	* configure.in: Revert 3 Jan change for powerpc-linux-gnulibc1.
+
+Mon Feb 23 15:09:18 1998  Bruno Haible <bruno@linuix.mathematik.uni-karlsruhe.de
+
+	* config.sub (sco5): Fix typo.
+
+Mon Feb 23 14:46:06 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (INSTALL_MODULES): Move install-tcl before
+	install-itcl.
+	(install-itcl): Remove dependency on install-tcl.
+
+Mon Feb 23 09:53:28 1998  Mark Alexander  <marka@cygnus.com>
+
+	* configure.in: Remove libgloss from noconfigdirs for MN10300.
+
+Thu Feb 19 13:40:41 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Don't build libgui for a cygwin32 target when not on
+	a cygwin32 host.
+
+Wed Feb 18 12:29:00 1998  Jason Molenda  (crash@bugshack.cygnus.com)
+
+	* configure (redirect): Set to null, so default behavior of
+	configure is now --verbose.
+
+1998-02-16  Dave Love  <d.love@dl.ac.uk>
+
+	* Makefile.in ($(CONFIGURE_TARGET_MODULES)): Run configure with
+	CONFIG_SITE=/dev/null to forestall lossage with site configuration.
+
+Mon Feb 16 12:23:53 1998  Manfred Hollstein  <Manfred.Hollstein@ks.sel.alcatel.de>
+
+	* Makefile.in (BASE_FLAGS_TO_PASS, EXTRA_TARGET_FLAGS): Really add
+	this change to sync Makefile.in with its ChangeLog entries.
+
+Thu Feb 12 15:03:08 1998  H.J. Lu  <hjl@gnu.org>
+
+	* ltmain.sh (mkdir): Check that the directory doesn't exist
+	before we exit with error, so that we don't get races during
+	parallel builds.
+
+Sat Feb  7 15:19:18 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ltconfig, ltmain.sh: Update from libtool 1.0i.
+
+Fri Feb  6 01:33:52 1998  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* Makefile.in (BASE_FLAGS_TO_PASS): Don't pass PICFLAG and
+	PICFLAG_FOR_TARGET.
+	(EXTRA_TARGET_FLAGS): Don't pass PICFLAG_FOR_TARGET.
+
+	* configure: Emit a definition for the new macro enable_shared
+	into each Makefile.
+
+Thu Feb  5 17:01:12 1998  Jason Molenda  (crash@bugshack.cygnus.com)
+
+	* configure.in (host_tools, native_only): Add libtool.
+
+Wed Feb  4 16:53:58 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* configure.in: add target-gperf to noconfigdirs for Cygwin32.
+	Fix typo in ming config comment.
+
+Wed Feb  4 18:56:13 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ltconfig, ltmain.sh: Update from libtool 1.0h.
+
+Mon Feb  2 19:38:19 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.sub: Add tic30 cases, and map c30 to tic30.
+
+Sun Feb  1 02:40:41 1998  Richard Henderson  <rth@cygnus.com>
+
+	* Makefile.in (TARGET_CONFIGDIRS): Add libf2c.
+	(ALL_TARGET_MODULES, CONFIGURE_TARGET_MODULES): Similarly
+	(CHECK_TARGET_MODULES, INSTALL_TARGET_MODULES): Similarly
+	(CLEAN_TARGET_MODULES): Similarly
+	(all-target-libf2c): Add dependences.
+	* configure.in (target_libs): Add libf2c.
+
+Fri Jan 30 17:18:32 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* configure.in: Remove expect from noconfigdirs when target
+	is cygwin32.  OK to build expect and dejagnu with Canadian
+	Cross.
+
+Wed Jan 28 12:58:49 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Do build expect, dejagnu, and cvssrc for a cygwin32
+	host.
+
+	* config.guess: Use ${UNAME_MACHINE} rather than i386 for cygwin32
+	and mingw32.
+
+Wed Jan 28 10:26:37 1998  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* Makefile.in (BASE_FLAGS_TO_PASS): Remove passing $(local_prefix)
+	here as it is not defined in the toplevel Makefile.
+
+Tue Jan 27 23:25:06 1998  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* configure (package_makefile_rules_frag): New variable, which names
+	a file with generic rules, ...
+	Change comment to mention we now have FIVE parts.
+	* configure: Undo last change.
+
+Tue Jan 27 23:15:55 1998  Lassi A. Tuura  <lat@iki.fi>
+
+	* config.guess: More accurate determination of HP processor types.
+	* config.sub: More accurate determination of HP processor types.
+
+Sat Jan 24 01:59:45 1998  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* configure (package_makefile_frag): Move inserting the
+	${package_makefile_frag} to where it should be according
+	to the comment.
+
+Fri Jan 23 00:29:28 1998  Philip Blundell  <pb@nexus.co.uk>
+
+	* config.guess: Add support for Linux/ARM.
+
+Thu Jan 22 15:14:01 1998  Fred Fish  <fnf@cygnus.com>
+
+	* .cvsignore: Remove *-info and *-install since they match
+	release-info and mpw-install, which we don't want to just ignore.
+
+Thu Jan 22 01:38:33 1998  Richard Henderson  <rth@cygnus.com>
+
+	* configure.in: Revert 3 Jan change for alpha-linux-gnulibc1.
+
+Sat Jan 17 21:28:08 1998  Pieter Nagel <pnagel@epiuse.co.za>
+
+	* Makefile.in (FLAGS_TO_PASS): Pass down gcc_include_dir and
+	local_prefix to sub-make invocations.
+
+Sat Jan 17 21:04:59 1998 H.J. Lu  (hjl@gnu.org)
+
+	* configure.in: Check makefile fragments in the source
+	directory.
+
+Fri Jan 16 00:41:37 1998  Alexandre Oliva <oliva@dcc.unicamp.br>
+
+	* configure.in: Check whether host and target makefile
+	fragments exist before adding them to *_makefile_frag.
+
+Wed Jan 14 23:39:10 1998  Bob Manson  <manson@charmed.cygnus.com>
+
+	* configure.in (target_configdirs): Add cygmon for sparc64-elf.
+
+Wed Jan 14 12:48:07 1998  Keith Seitz  <keiths@pizza.cygnus.com>
+
+	* configure.in: Make sure we only replace RPATH_ENVVAR on
+	lines which begin with RPATH_ENVVAR, i.e. add "^" to the
+	regexp to sed.
+
+	* Makefile.in (BASE_FLAGS_TO_PASS): Pass RRPATH_ENVVAR down
+	to sub-makes.
+
+1998-01-13  Lee Iverson   (leei@ai.sri.com)
+
+	* config-ml.in (multi-do): LDFLAGS must include multilib
+	designator.
+
+Tue Jan 13 01:13:24 1998   Robert Lipe (robertl@dgii.com)
+
+	* config.guess: Recognize i[3456]-i586-UnixWare7-sysv5.
+
+Sun Jan  4 01:06:55 1998  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* config.sub: Add mingw32 support.
+	* configure.in: Likewise.
+
+Sat Jan  3 12:11:05 1998 Franz Sirl <franz.sirl-kernel@lauterbach.com>
+
+	* configure.in: Finalize support for {alpha|powerpc}*-*-linux-gnulibc1
+
+Sun Dec 28 11:28:58 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (INSTALL_TARGET): Do install-gcc first.
+	* configure (gxx_include_dir): Provide a definition for subdirs
+	which do not use autoconf.
+
+Wed Dec 24 22:46:55 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* config.guess: Sync with egcs.  Picks up new alpha support,
+	BeOS & some additional linux support.
+
+Tue Dec 23 12:44:24 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* config.guess: HP 9000/803 is a PA1.1 machine.
+
+Mon Dec 22 02:39:24 1997  Richard Henderson  <rth@cygnus.com>
+
+	* configure.in: It's alpha*-...
+
+Sun Dec 21 16:53:12 1997  H.J. Lu  (hjl@gnu.ai.mit.edu)
+
+	* configure.in (host_makefile_frag, target_makefile_frag):
+	Handle multiple config files.
+	(alpha-*-linux*): Treat alpha-*-linux* as alpha-*-linux* and
+	alpha-*-*.
+
+Thu Dec 18 13:13:03 1997  Doug Evans  <devans@canuck.cygnus.com>
+
+	* mkdep: New file.
+
+Wed Dec 17 09:53:02 1997  Michael Meissner  <meissner@cygnus.com>
+
+	* configure.in (d30v-*-*): Allow configuring of libide, vmake, etc.
+
+Tue Dec 16 17:36:05 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in: Add libgui directory.
+	(GDB_TK): Add all-libgui.
+	* configure.in: Add libgui directory.
+	* configure: Add all-libgui to GDB_TK.
+
+Mon Dec 15 16:12:28 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* config-ml.in (multidirs): Add m32r to multilib list.
+
+Fri Dec 12 10:43:31 1997  Brendan Kehoe  <brendan@canuck.cygnus.com>
+
+	* Makefile.in (all-target-gperf): Change dependency to
+	all-target-libstdc++.
+
+Thu Dec 11 23:30:51 1997  Fred Fish  <fnf@ninemoons.com>
+
+	* config.guess: Add BeOS support.
+
+Wed Dec 10 15:10:38 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	Source directory cvs renamed to cvssrc:
+	* configure.in (host_tools): Change cvs to cvssrc.
+	(native_only): Likewise.
+	(noconfigdirs) [various cases]: Likewise.
+	* Makefile.in (ALL_MODULES): Change all-cvs to all-cvssrc.
+	(CROSS_CHECK_MODULES): Change check-cvs to check-cvssrc.
+	(INSTALL_MODULES): Change install-cvs to install-cvssrc.
+	(CLEAN_MODULES): Change clean-cvs to clean-cvssrc.
+	(all-cvssrc): Rename target from all-cvs.
+
+Wed Dec  3 07:55:59 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* configure (gxx_include_dir): Fix thinko.
+
+Tue Dec  2 10:55:34 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (INSTALL_TARGET_CROSS): Define.
+	(install-cross, install-gcc-cross): New targets.
+
+Tue Dec  2 10:08:31 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* configure.in (noconfigdirs): Add support for Thumb target.
+
+	* config.sub (maybe_os): Add support for Thumb target.
+
+Sun Nov 30 16:12:27 1997  Bob Manson  <manson@charmed.cygnus.com>
+
+	* Makefile.in: Add rules for cygmon.
+
+	* configure.in: Build cygmon for sparc-elf and sparclite-aout.
+
+Thu Nov 27 01:31:30 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (INSTALL_TARGET): Do install-gcc first.
+	* configure (gxx_include_dir): Provide a definition for subdirs
+	which do not use autoconf.
+
+Wed Nov 26 11:53:33 1997  Keith Seitz  <keiths@onions.cygnus.com>
+
+	* Makefile.in, configure, configure.in, ChangeLog: merge with foundry's
+	11/18/97 build
+
+Wed Nov 26 16:08:50 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* From Franz Sirl.
+	* config.guess (powerpc*-*-linux): Handle glibc2 beta release
+	found on RedHat Linux systems.
+
+Fri Nov 21 09:51:01 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* config.guess (alpha stuff): Merge with FSF to avoid incorrect
+	guesses.
+
+Thu Nov 13 11:38:37 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* configure.in (i[3456]86-ncr-sysv4.3*): Tweak.
+
+Mon Nov 10 15:23:21 1997  H.J. Lu  <hjl@gnu.ai.mit.edu>
+
+	* ltmain.sh: If mkdir fails, check whether the directory was created
+	anyhow by some other process.
+
+Mon Nov 10 14:38:03 1997  Michael Meissner  <meissner@cygnus.com>
+
+	* configure.in (d30v-*-*): Configure all directories.
+
+Sun Nov  9 17:36:20 1997  Michael Meissner  <meissner@cygnus.com>
+
+	* configure.in (d30v-*-*): Configure newlib, libiberty directories
+	for the D30V.
+
+Sat Nov  8 14:42:59 1997  Michael Meissner  <meissner@cygnus.com>
+
+	* configure.in (d30v-*-*): Configure target-libgloss on the D30V.
+
+Fri Nov  7 10:34:09 1997  Rob Savoye  <rob@darkstar.cygnus.com>
+
+	* include/libiberty.h: Add extern "C" { so it can be used with C++
+	progrms.
+	* include/remote-sim.h:  Add extern "C" { so it can be used with C++
+	programs.
+
+Thu Oct 30 11:09:29 1997  Michael Meissner  <meissner@cygnus.com>
+
+	* configure.in (d30v-*-*): Configure GCC now.
+
+Mon Oct 27 13:17:24 1997  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* configure.in: Remove a "second pass" of tweaking noconfigdirs,
+	is no longer needed.
+
+Mon Oct 27 12:03:53 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* Makefile.in: check-target-libio depends on all-target-libstdc++.
+
+Sun Oct 26 11:48:27 1997  Manfred Hollstein  (manfred@s-direktnet.de)
+
+	* Makefile.in (bootstrap-lean): Combined with `normal' bootstrap
+	targets using "$@" to provide support for similar but not identical
+	targets without having to duplicate code.
+
+Mon Oct 20 15:28:49 1997  Klaus K"ampf  <kkaempf@progis.de>
+
+	* makefile.vms: Fix to work with DEC C.
+
+Tue Oct  7 23:58:57 1997  Gavin Koch  <gavin@cygnus.com>
+
+	* config.sub: Add mips-tx39-elf to marketing names.
+
+Tue Oct  7 14:24:41 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ltmain.sh: Handle symlinks in generated script.
+
+Wed Oct  1 13:11:27 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Handle autoconf style directory options: --bindir,
+	--datadir, --includedir, --infodir, --libdir, --libexecdir,
+	--mandir, --oldincludedir, --sbindir, --sharedstatedir,
+	--sysconfdir.
+	* Makefile.in (sbindir, libexecdir, sysconfdir): New variables.
+	(sharedstatedir, localstatedir, oldincludedir): New variables.
+	(BASE_FLAGS_TO_PASS): Pass down bindir, datadir, includedir,
+	infodir, libdir, libexecdir, localstatedir, mandir, oldincludedir,
+	sbindir, sharedstatedir, and sysconfdir.
+
+Mon Sep 29 00:38:08 1997 Aaron Jackson <jackson@negril.msrce.howard.edu>
+
+	* Makefile.in (bootstrap-lean): New target.
+
+Wed Sep 24 18:06:27 1997  Stu Grossman  <grossman@babylon-5.cygnus.com>
+
+	* configure.in (d30v):  Remove tcl, tk, expect, gdb, itcl, tix, db,
+	sn, and gnuserv from noconfigdirs.
+
+Wed Sep 24 15:18:32 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ltmain.sh: Tweak shell pattern to avoid bug in NetBSD /bin/sh.
+
+Thu Sep 18 23:58:27 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (cross): New target.
+
+Thu Sep 18 21:43:23 1997  Alexandre Oliva  <oliva@dcc.unicamp.br>
+			  Jeff Law	   <law@cygnus.com>
+
+	* Makefile.in (bootstrap2, bootstrap3): New targets.
+	(all-bootstrap): Remove outdated and confusing target.
+	(bootstrap, bootstrap2, bootstrap3): Don't pass BOOT_CFLAGS down.
+
+Thu Sep 18 15:37:42 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure (tooldir): enable_gdbtk=YES for cygwin32, NO for
+	windows.  Consistent with gdb/configure.
+
+1997-09-15 02:37  Ulrich Drepper  <drepper@cygnus.com>
+
+	* configure.in: Name Linux target fragment.
+
+	* configure: Rewrite so that project Makefile fragment is inserted
+	first and appears last in the resulting Makefile.
+
+Tue Sep 16 09:55:07 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* Makefile.in (install-itcl): Install tcl first.
+
+Fri Sep 12 16:19:20 1997  Geoffrey Noer  <noer@cygnus.com>
+
+	* configure.in: remove bison from noconfigdirs for Cygwin32 host
+
+Thu Sep 11 16:40:46 1997  H.J. Lu  (hjl@gnu.ai.mit.edu)
+
+	* Makefile.in (local-distclean): Also remove mh-frag mt-frag.
+
+	* configure.in (skipdirs): Add target-librx for Linux.
+	(alpha-*-linux*): Use config/mh-elfalphapic and config/mt-elfalphapic.
+
+Wed Sep 10 21:29:54 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (bootstrap): New target.
+
+Wed Sep 10 15:19:22 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* config.sub: Accept 'amigados' for backward compatability.
+
+Mon Sep  8 20:46:20 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.guess: Merge with FSF.
+
+Sun Sep  7 23:18:32 1997  Fred Fish  <fnf@ninemoons.com>
+
+	* config.sub: Change 'amigados' to 'amigaos' to match current usage.
+
+Sun Sep  7 15:55:28 1997  Gavin Koch  <gavin@cygnus.com>
+
+	* config.sub: Add "marketing-names" patch.
+
+Fri Sep  5 16:11:28 1997  Joel Sherrill  (joel@OARcorp.com)
+
+	* configure.in (*-*-rtems*): Do not build libgloss for rtems.
+
+Fri Sep  5 12:27:17 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* config.sub: Handle v850-elf.
+
+Wed Sep  3 22:01:58 1997  Fred Fish  <fnf@ninemoons.com>
+
+	* .cvsignore (*-install): Remove.
+
+Wed Sep  3 12:15:24 1997  Chris Provenzano  <proven@cygnus.com>
+
+	* ltconfig: Set CONFIG_SHELL in libtool.
+	* ltmain.sh: Use CONFIG_SHELL instead of /bin/sh
+
+Mon Sep  1 16:45:44 1997  Jim Wilson  <wilson@cygnus.com>
+
+	* configure.in (target_subdir): Set to libraries if enable_multilib.
+
+Wed Aug 27 16:15:11 1997  Jim Wilson  <wilson@cygnus.com>
+
+	* config.guess: Update from gcc directory.
+
+Tue Aug 26 16:46:46 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* Makefile.in (all-sim): Depends on all-readline.
+
+Wed Aug 20 19:57:37 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* Makefile.in (BISON, YACC): Use $$s.
+	(all-bison): Depend on all-texinfo.
+
+Tue Aug 19 01:41:32 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* Makefile.in (BISON): Add -L flag.
+	(YACC): Likewise.
+
+Mon Aug 18 11:30:50 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* configure.in (noconfigdirs): Add support for v850e target.
+
+	* config.sub (maybe_os): Add support for v850e target.
+
+Mon Aug 18 11:30:50 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* configure.in (noconfigdirs): Add support for v850ea target.
+
+	* config.sub (maybe_os): Add support for v850ea target.
+
+Mon Aug 18 09:24:06 1997  Gavin Koch  <gavin@cygnus.com>
+
+	* config.sub: Add mipstx39.  Delete r3900.
+
+Mon Aug 18 17:20:10 1997  Jason Molenda  (crash@godzilla.cygnus.co.jp)
+
+	* Makefile.in (all-autoconf): Depends on all-texinfo.
+
+Fri Aug 15 23:09:26 1997  Michael Meissner  <meissner@cygnus.com>
+
+	* config-ml.in ({powerpc,rs6000}*-*-*): Update to current AIX and
+	eabi targets.
+
+Thu Aug 14 14:42:17 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Get CFLAGS and CXXFLAGS from Makefile, if possible.
+
+	* configure: When handling a Canadian Cross, handle YACC as well as
+	BISON.  Just set BISON to bison.  When setting YACC, prefer bison.
+	* Makefile.in (all-bison): Depend upon all-texinfo.
+
+Tue Aug 12 20:09:48 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* Makefile.in (BISON): bison, not byacc or bison -y.
+	(YACC): bison -y or byacc or yacc.
+	(various): Add *-bison as appropriate.
+	(taz): No need to mess with BISON anymore.
+
+Tue Aug 12 22:33:08 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: If OSTYPE matches *win32*, try to find a good value for
+	CONFIG_SHELL.
+
+Sun Aug 10 14:41:11 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (taz): Get the version number from AM_INIT_AUTOMAKE in
+	configure.in if it is present.
+
+Sat Aug  9 00:58:01 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (LD_FOR_TARGET): Change ld.new to ld-new.
+
+Fri Aug  8 16:30:13 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* config.sub: Recognize `arc' cpu.
+	* configure.in: Likewise.
+	* config-ml.in: Likewise.
+
+Thu Aug  7 11:02:34 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in ($(INSTALL_X11_MODULES)): Depend upon installdirs.
+
+Wed Aug  6 16:27:29 1997  Chris Provenzano  <proven@cygnus.com>
+
+	* configure: Changed sed delimiter from ':' to '|' when
+	attempting to substitute ${config_shell} for SHELL. On
+	NT ${config_shell} may contain a ':' in it.
+
+Wed Aug  6 12:29:05 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* Makefile.in (EXTRA_GCC_FLAGS): Fix for non-bash shells.
+
+Wed Aug  6 00:42:35 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (AS_FOR_TARGET): Change as.new to as-new.
+
+Tue Aug  5 14:08:51 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (NM_FOR_TARGET): Change nm.new to nm-new.
+
+	* ylwrap: If the program is a relative path, force it to be
+	absolute.
+
+Tue Aug  5 12:12:44 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure (tooldir): Set BISON to `bison -y' and not just bison.
+
+Mon Aug  4 22:59:02 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* Makefile.in (CC_FOR_TARGET): When winsup/Makefile present,
+	correctly specify the target build directory $(TARGET_SUBDIR)/winsup
+	for libraries.
+
+Mon Aug  4 12:40:24 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* Makefile.in (EXTRA_GCC_FLAGS): Fix handling of macros with values
+	separated by spaces.
+
+Thu Jul 31 19:49:49 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ylwrap: New file.
+	* Makefile.in (DEVO_SUPPORT): Add ylwrap.
+
+	* ltmain.sh: Handle /bin/sh at start of install program.
+
+	* Makefile.in (DEVO_SUPPORT): Add ltconfig, ltmain.sh, and missing.
+
+	* ltconfig, ltmain.sh: New files, from libtool 1.0.
+	* missing: New file, from automake 1.2.
+
+Thu Jul 24 12:57:56 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in: Treat tix like tk, putting it in X11_MODULES.  Add
+	check-tk to CHECK_X11_MODULES.
+
+Wed Jul 23 17:03:29 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.sub: Merge with FSF.
+
+Tue Jul 22 19:08:29 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.guess: Merge with FSF.
+
+Tue Jul 22 14:50:42 1997  Robert Hoehne <robert.hoehne@Mathematik.TU-Chemnitz.DE>
+
+	* configure: Treat msdosdjgpp like go32.
+	* configure.in: Likewise.  Don't remove gprof for go32.
+
+	* configure: Change Makefile.tem2 to Makefile.tm2.
+
+Mon Jul 21 10:31:26 1997  Stephen Peters  <speters@cygnus.com>
+
+	* configure.in (noconfigdirs): For alpha-dec-osf*, don't ignore grep.
+
+Tue Jul 15 14:33:03 1997  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+	* install-sh (chmodcmd): Set to null if the DST directory already
+	exists.  Same as Nov 11th change.
+
+Mon Jul 14 11:01:15 1997  Martin M. Hunt  <hunt@cygnus.com>
+
+	* configure (GDB_TK): Needs itcl and tix.
+
+Mon Jul 14 00:32:10 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* config.guess: Update from FSF.
+
+Fri Jul 11 11:57:11 1997  Martin M. Hunt  <hunt@cygnus.com>
+
+	* Makefile.in (GDB_TK): Depend on itcl and tix.
+
+Fri Jul  4 13:25:31 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (INSTALL_PROGRAM_ARGS): New variable.
+	(INSTALL_PROGRAM): Use $(INSTALL_PROGRAM_ARGS).
+	(INSTALL_SCRIPT): New variable.
+	(BASE_FLAGS_TO_PASS): Pass down INSTALL_SCRIPT.
+	* configure.in: If host is *-*-cygwin32*, set INSTALL_PROGRAM_ARGS
+	to -x.
+	* install-sh: Add support for -x option.
+
+Mon Jun 30 15:51:30 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in, Makefile.in: Treat tix like itcl.
+
+Thu Jun 26 13:59:19 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (WINDRES): New variable.
+	(WINDRES_FOR_TARGET): New variable.
+	(BASE_FLAGS_TO_PASS): Add WINDRES_FOR_TARGET.
+	(EXTRA_HOST_FLAGS): Add WINDRES.
+	(EXTRA_TARGET_FLAGS): Add WINDRES.
+	(EXTRA_GCC_FLAGS): Add WINDRES.
+	($(DO_X)): Pass down WINDRES.
+	($(CONFIGURE_TARGET_MODULES)): Set WINDRES when configuring.
+	* configure: Treat WINDRES like DLLTOOL, and WINDRES_FOR_TARGET like
+	DLLTOOL_FOR_TARGET.
+
+Wed Jun 25 15:01:26 1997  Felix Lee  <flee@cygnus.com>
+
+	* configure.in: configure sim before gdb for win32-x-ppc
+
+Wed Jun 25 12:18:54 1997  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+	Move gperf into the toplevel, from libg++.
+	* configure.in (target_tools): Add target-gperf.
+	(native_only): Add target-gperf.
+	* Makefile.in (all-target-gperf): New target, depend on
+	all-target-libg++.
+	(configure-target-gperf): Empty rule.
+	(ALL_TARGET_MODULES): Add all-target-gperf.
+	(CONFIGURE_TARGET_MODULES): Add configure-target-gperf.
+	(CHECK_TARGET_MODULES): Add check-target-gperf.
+	(INSTALL_TARGET_MODULES): Add install-target-gperf.
+	(CLEAN_TARGET_MODULES): Add clean-target-gperf.
+
+Mon Jun 23 10:51:53 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* config.sub (mn10200): Recognize new basic machine.
+
+Thu Jun 19 14:16:42 1997  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+	* configure.in: Don't set ENABLE_MULTILIB, so we'll be passing
+	--enable-multilib down to subdirs; setting TARGET_SUBDIR was enough.
+
+Tue Jun 17 15:31:20 1997  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+	* configure.in: If we're building mips-sgi-irix6* native, turn on
+	ENABLE_MULTILIB and set TARGET_SUBDIR.
+
+Tue Jun 17 12:20:59 1997  Tom Tromey  <tromey@cygnus.com>
+
+	* Makefile.in (all-sn): Depend on all-grep.
+
+Mon Jun 16 11:11:10 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Use mh-ppcpic and mt-ppcpic for powerpc*-* targets.
+
+	* configure: Set CFLAGS and CXXFLAGS, and substitute them into
+	Makefile.  From Jeff Makey <jeff@cts.com>.
+	* Makefile.in: Add comment for CFLAGS and CXXFLAGS.
+
+	* Makefile.in (DISTBISONFILES): Remove.
+	(taz): Don't futz with DISTBISONFILES.  Change BISON to use
+	$(DEFAULT_YACC).
+
+	* configure.in: Build itl, db, sn, etc., when building for native
+	cygwin32.
+
+	* Makefile.in (LD): New variable.
+	(EXTRA_HOST_FLAGS): Pass down LD.
+	($(DO_X)): Likewise.
+
+Mon Jun 16 11:10:35 1997  Philip Blundell  <Philip.Blundell@pobox.com>
+
+	* Makefile.in (INSTALL): Use $(SHELL) when executing install-sh.
+
+Fri Jun 13 10:22:56 1997  Bob Manson  <manson@charmed.cygnus.com>
+
+	* configure.in (targargs): Strip out any supplied --build argument
+	before adding our own. Always add --build.
+
+Thu Jun 12 21:12:28 1997  Bob Manson  <manson@charmed.cygnus.com>
+
+	* configure.in (targargs): Pass --build if we're doing
+	a cross-compile.
+
+Fri Jun  6 21:38:40 1997  Rob Savoye  <rob@chinadoll.cygnus.com>
+
+	* configure: Use '|' instead of ":" as the separator in
+	sed. Otherwise sed chokes on NT path names with drive
+	designators. Also look for "?:*" as the leading characters in an
+	absolute pathname.
+
+Mon Jun  2 13:05:20 1997  Gavin Koch  <gavin@cygnus.com>
+
+	* config.sub: Support for r3900.
+
+Wed May 21 17:33:31 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Use install-sh, not install.sh.
+
+Wed May 14 16:06:51 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (taz): Improve check for BISON so it doesn't try to
+	apply it twice.
+
+Fri May  9 17:22:05 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (INSTALL_MODULES): Put install-opcodes before
+	install-binutils.
+
+Thu May  8 17:29:50 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in: Add automake targets.
+	* configure.in (host_tools): Add automake.
+
+Tue May  6 15:49:52 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Default CXX to c++, not gcc.
+	* Makefile.in (CXX): Set to c++, not gcc.
+	(CXX_FOR_TARGET): When cross, transform c++, not gcc.
+
+Thu May  1 10:11:43 1997  Geoffrey Noer  <noer@cygnus.com>
+
+	* install-sh: try appending a .exe if source file doesn't
+	exist
+
+Wed Apr 30 12:05:36 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* configure.in: Turn on multilib by default.
+	(cross_only): Remove target-libiberty.
+
+	* Makefile.in (all-gcc): Don't depend on libiberty.
+
+Mon Apr 28 18:39:45 1997  Michael Snyder  <msnyder@cleaver.cygnus.com>
+
+	* config.guess: improve algorithm for recognizing Gnu Hurd x86.
+
+Thu Apr 24 19:30:07 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (DEVO_SUPPORT): Add mpw-install.
+	(DISTBISONFILES): Add ld/Makefile.in
+
+Tue Apr 22 17:17:28 1997  Geoffrey Noer  <noer@pizza.cygnus.com>
+
+	* configure.in: if target is cygwin32 but host isn't cygwin32,
+	don't configure gdb tcl tk expect, not just gdb.
+
+Mon Apr 21 13:33:39 1997  Tom Tromey  <tromey@cygnus.com>
+
+	* configure.in: Added gnuserv everywhere sn appears.
+
+	* Makefile.in (ALL_MODULES): Added all-gnuserv.
+	(CROSS_CHECK_MODULES): Added check-gnuserv.
+	(INSTALL_MODULES): Added install-gnuserv.
+	(CLEAN_MODULES): Added clean-gnuserv.
+	(all-gnuserv): New target.
+
+Thu Apr 17 13:57:06 1997  Per Fogelstrom  <pefo@openbsd.org>
+
+	* config.guess: Fixes for MIPS OpenBSD systems.
+
+Tue Apr 15 12:21:07 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (INSTALL_XFORM): Remove.
+	(BASE_FLAGS_TO_PASS): Remove INSTALL_XFORM.
+
+	* mkinstalldirs: New file, copied from automake.
+	* Makefile.in (installdirs): Rename from install-dirs.  Use
+	mkinstalldirs.  Change all users.
+	(DEVO_SUPPORT): Add mkinstalldirs.
+
+Mon Apr 14 11:21:38 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* install-sh: Rename from install.sh.
+	* Makefile.in (INSTALL): Change install.sh to install-sh.
+	(DEVO_SUPPORT): Likewise.
+
+	* configure: Use ${config_shell} with ${moveifchange}.  From Thomas
+	Graichen <graichen@rzpd.de>.
+
+Fri Apr 11 16:37:10 1997  Niklas Hallqvist  <niklas@appli.se>
+
+	* config.guess: Recognize OpenBSD systems correctly.
+
+Fri Apr 11 17:07:04 1997  Jason Molenda  (crash@godzilla.cygnus.co.jp)
+
+	* README, Makefile.in (ETC_SUPPORT): Remove references to
+	cfg-paper*, configure.{texi,man,info*}._
+
+Sun Apr  6 18:47:57 1997  Andrew Cagney  <cagney@kremvax.cygnus.com>
+
+	* Makefile.in (all.normal): Ensure that gcc is built after all
+	the x11 - ie gdb - targets.
+
+Tue Apr  1 16:28:50 1997  Klaus Kaempf  <kkaempf@progis.de>
+
+	* makefile.vms: Don't run conf-a-gas.
+
+Mon Mar 31 16:26:55 1997  Joel Sherrill  <joel@oarcorp.com>
+
+	* configure.in (hppa1.1-*-rtems*): New target, like hppa-*-*elf*.
+
+Sun Mar 30 12:38:27 1997  Fred Fish  <fnf@cygnus.com>
+
+	* configure.in: Remove noconfigdirs case since gdb also
+	configures and builds for tic80-coff.
+
+Fri Mar 28 18:28:52 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Set cache_file to config.cache.
+	* Makefile.in (local-distclean): Remove config.cache.
+
+Wed Mar 26 18:49:39 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* COPYING: Update FSF address.
+
+Wed Mar 26 10:38:25 1997  Michael Meissner  <meissner@cygnus.com>
+
+	* configure.in (tic80-*-*): Remove G++ libraries and libgloss from
+	noconfigdirs.
+
+Mon Mar 24 15:02:39 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (install-dirs): Don't crash if prefix, and hence
+	MAKEDIRS, is empty.
+
+Mon Mar 24 12:40:55 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* config.sub: Tweak mn10300 entry.
+
+Fri Mar 21 15:35:27 1997  Michael Meissner  <meissner@cygnus.com>
+
+	* configure.in (host_tools): Put sim before gdb, so gdb's
+	configure.tgt can determine if the simulator was configured.
+
+Sun Mar 16 16:07:08 1997  Fred Fish  <fnf@cygnus.com>
+
+	* config.sub: Move BeOS $os case to be with other Cygnus
+	local cases.
+
+Sun Mar 16 01:34:55 1997  Martin Hunt <hunt@cygnus.com>
+
+	* config.sub: Remove misplaced comment that broke Linux.
+
+Sat Mar 15 22:50:15 1997  Fred Fish  <fnf@cygnus.com>
+
+	* config.sub: Add BeOS support.
+
+Mon Mar 10 13:30:11 1997  Tom Tromey  <tromey@cygnus.com>
+
+	* Makefile.in (CHECK_X11_MODULES): Don't run check-tk.
+
+Wed Mar  5 12:09:29 1997  Martin  <hunt@cygnus.com>
+
+	* configure.in (noconfigdirs): Remove tcl and tk from
+	noconfigdirs for cygwin32 builds.
+
+Fri Feb 28 18:20:15 1997  Fred Fish  <fnf@cygnus.com>
+
+	* configure.in (tic80-*-*): Remove ld from noconfigdirs.
+
+Thu Feb 27 14:57:26 1997  Ken Raeburn  <raeburn@cygnus.com>
+
+	* Makefile.in (GAS_SUPPORT_DIRS, BINUTILS_SUPPORT_DIRS): Remove
+	make-all.com, use makefile.vms instead.
+
+Tue Feb 25 18:46:14 1997  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* config.sub: Accept -lnews*.
+
+Tue Feb 25 13:19:14 1997  Andrew Cagney  <cagney@kremvax.tpgi.com.au>
+
+	* configure.in (noconfigdirs): Disable target-newlib,
+	target-examples and target-libiberty for d30v.
+
+Fri Feb 21 17:56:25 1997  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* configure.in (noconfigdirs): Enable ld for d30v.
+
+Fri Feb 21 20:58:51 1997  Michael Meissner  <meissner@cygnus.com>
+
+	* configure.in (tic80-*-*): Build compiler.
+
+Sun Feb 16 15:41:09 1997  Andrew Cagney  <cagney@critters.cygnus.com>
+
+	* configure.in (d30v-*): Remove sim directory from list of
+	unsupported d30v directories
+
+Tue Feb 18 17:32:42 1997  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* config.sub, configure.in: Add d30v target cpu.
+
+Thu Feb 13 22:04:44 1997  Klaus Kaempf  <kkaempf@progis.de>
+
+	* makefile.vms: New file.
+	* make-all.com: Remove.
+
+Wed Feb 12 12:54:18 1997  Jim Wilson  <wilson@cygnus.com>
+
+	* Makefile.in (EXTRA_GCC_FLAGS): Add LIBGCC2_DEBUG_CFLAGS.
+
+Sat Feb  8 20:36:49 1997  Michael Meissner  <meissner@cygnus.com>
+
+	* Makefile.in (all-itcl): The rule is all-itcl, not all-tcl.
+
+Tue Feb  4 11:39:29 1997  Tom Tromey  <tromey@cygnus.com>
+
+	* Makefile.in (ALL_MODULES): Added all-db.
+	(CROSS_CHECK_MODULES): Addec check-db.
+	(INSTALL_MODULES): Added install-db.
+	(CLEAN_MODULES): Added clean-db.
+
+Mon Feb  3 13:29:36 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.guess: Merge with latest FSF sources.
+
+Tue Jan 28 09:20:37 1997  Tom Tromey  <tromey@cygnus.com>
+
+	* Makefile.in (ALL_MODULES): Added all-itcl.
+	(CROSS_CHECK_MODULES): Added check-itcl.
+	(INSTALL_MODULES): Added install-itcl.
+	(CLEAN_MODULES): Added clean-itcl.
+
+Thu Jan 23 01:44:27 1997  Geoffrey Noer  <noer@cygnus.com>
+
+	* configure.in: build gdb for mn10200
+
+Fri Jan 17 15:32:15 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* Makefile.in (all-target-winsup): Depend on all-target-libio.
+
+Mon Jan 13 22:46:54 1997  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* configure.in (tic80-*-*): Turn off most targets right now.
+
+Fri Jan  3 16:04:03 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (MAKEINFO): Check for the existence of the Makefile,
+	rather than the makeinfo program.
+	(do-info): Depend upon all-texinfo.
+
+Tue Dec 31 16:00:31 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Remove uses of config/mh-linux.
+
+	* config.sub, config.guess: Merge with latest FSF sources.
+
+Fri Dec 27 23:04:33 1996  Fred Fish  <fnf@cygnus.com>
+
+	* config.sub (case $basic_machine): Add tic80 entries.
+
+Fri Dec 27 12:07:59 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.sub, config.guess: Merge with latest FSF sources.
+
+Wed Dec 18 22:46:39 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-build.in: Build ld before gcc, use NewFolderRecursive.
+	* mpw-config.in: Test for NewFolderRecursive.
+	* mpw-install: Use symbolic name for startup filename.
+	* mpw-README: Add various additional details.
+
+Wed Dec 18 13:11:46 1996  Jim Wilson  <wilson@cygnus.com>
+
+	* configure.in (mips*-sgi-irix6*): Remove binutils from noconfigdirs.
+
+Wed Dec 18 10:29:31 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* configure.in: Do build gcc and the target libraries for
+	the mn10200.
+
+Wed Dec  4 16:53:05 1996  Geoffrey Noer  <noer@cygnus.com>
+
+	* configure.in: don't avoid building gdb for mn10300 any more
+	* Makefile.in: double-quote GCC_FOR_TARGET line in EXTRA_GCC_FLAGS
+	instead of single-quoting it.
+
+Tue Dec  3 23:26:50 1996  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* configure.in: Don't use --with-stabs on IRIX 6.
+
+Tue Dec  3 09:05:25 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* configure.in (m32r): Build gdb, libg++ now.
+
+Sun Dec  1 00:18:59 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* configure.in (mips*-sgi-irix6*):  Remove gdb and related
+	directories from noconfigdirs.
+
+Tue Nov 26 11:45:33 1996  Kim Knuttila  <krk@cygnus.com>
+
+	* config.sub (basic_machine): added mips16 configuration
+
+Sat Nov 23 19:26:22 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* config.sub: Handle d10v-unknown.
+
+Sat Nov 23 10:23:01 1996  Gavin Koch  <gavin@cygnus.com>
+
+	* config.sub: Handle v850-unknown.
+
+Thu Nov 21 16:19:44 1996  Geoffrey Noer  <noer@cygnus.com>
+
+	* Makefile.in: add findutils
+	* configure.in: add findutils to list of host_tools
+
+Wed Nov 20 10:09:01 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* config.sub: Handle mn10200 and mn10300.
+
+Tue Nov 19 16:35:14 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* configure.in (d10v-*): Do not build librx.
+
+Mon Nov 18 13:28:41 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* configure.in (mn10300): Build everything except gdb & libgloss.
+
+Wed Nov 13 14:59:46 1996  Per Bothner  <bothner@deneb.cygnus.com>
+
+	* config.guess:  Patch for Dansk Data Elektronik servers,
+	from Niels Skou Olsen <nso@dde.dk>.
+
+	For ncr, use /bin/uname rather than uname, since GNU uname does not
+	support -p.  Suggested by Mark Mitchell <mmitchell@usa.net>.
+
+	Patch for MIPS R4000 running System V,
+	from Eric S. Raymond <esr@snark.thyrsus.com>.
+
+	Fix thinko for nextstep.
+
+	Patch for OSF1 in i?86, from Dan Murphy <dlm@osf.org> via Harlan Stenn.
+
+	Sat Jun 24 18:58:17 1995  Morten Welinder  <terra+@cs.cmu.edu>
+	* config.guess: Guess mips-dec-mach_bsd4.3.
+
+	Thu Oct 10 04:07:04 1996  Harlan Stenn <harlan@pfcs.com>
+	* config.guess (i?86-ncr-sysv*):  Emit just enough of the minor
+	release numbers.
+	* config.guess (mips-mips-riscos*):  Emit just enough of the
+	release number.
+
+	Tue Oct  8 10:37:22 1996  Frank Vance <fvance@waii.com>
+	* config.guess (sparc-auspex-sunos*):  Added.
+	(f300-fujitsu-*): Added.
+
+	Wed Sep 25 22:00:35 1996  Jeff Woolsey <woolsey@jlw.com>
+	* config.guess:  Recognize a Tadpole as a sparc.
+
+Wed Nov 13 00:53:09 1996  David J. MacKenzie  <djm@churchy.gnu.ai.mit.edu>
+
+	* config.guess: Don't assume that NextStep version is either 2 or
+	3.  NextStep 4 (aka OpenStep 4) has come out now.
+
+Mon Nov 11 23:52:03 1996  David J. MacKenzie  <djm@churchy.gnu.ai.mit.edu>
+
+	* config.guess: Support Cray T90 that reports itself as "CRAY TS".
+	From Rik Faith <faith@cs.unc.edu>.
+
+Fri Nov  8 11:34:58 1996  David J. MacKenzie  <djm@geech.gnu.ai.mit.edu>
+
+	* config.sub: Contributions from bug-gnu-utils to:
+	Support plain "hppa" (no version given) architecture, reported by
+	OpenStep.
+	OpenBSD like NetBSD.
+	LynxOs is not a hardware supplier.
+
+	* config.guess: Contributions from bug-gnu-utils to add support for:
+	OpenBSD like NetBSD.
+	Stratus systems.
+	More Pyramid systems.
+	i[n>4]86 Intel chips.
+	M680[n>4]0 Motorola chips.
+	Use unknown instead of lynx for hardware manufacturer.
+
+Mon Nov 11 10:09:08 1996  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+	* install.sh (chmodcmd): Set to null if the DST directory already
+	exists.
+
+Mon Nov 11 10:43:41 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* configure.in (powerpc*-{eabi,elf,linux,rtem,sysv,solaris}*): Do
+	not use mt-ppc target Makefile fragment any more.
+
+Sun Nov  3 19:17:07 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* configure.in (*-*-windows):  Exclude everything but those dirs
+	needed to build windows.
+
+Tue Oct 29 16:41:31 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* Makefile.in (all-target-winsup): Depend on all-target-librx.
+
+Mon Oct 28 17:32:46 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* configure.in:  Exclude mmalloc from i386-windows.
+
+Thu Oct 24 09:22:46 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* Undo my previous change.
+
+Thu Oct 24 12:12:04 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (EXTRA_GCC_FLAGS): Pass down GCC_FOR_TARGET
+	unconditionally.
+	(MAKEOVERRIDES): Define (revert this part of October 18 change).
+
+Thu Oct 24 09:02:07 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* Makefile.in (FLAGS_TO_PASS):  Add $(HOST_FLAGS) to allow the
+	host to add it's own flags.
+
+Tue Oct 22 15:20:26 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Handle GCC_FOR_TARGET like CC_FOR_TARGET.
+
+Fri Oct 18 13:37:13 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (CC_FOR_TARGET): Check for xgcc, not Makefile.
+	(CXX_FOR_TARGET): Likewise.
+	(GCC_FOR_TARGET): Define.
+	(BASE_FLAGS_TO_PASS): Remove GCC_FOR_TARGET.
+	(EXTRA_GCC_FLAGS): Define GCC_FOR_TARGET based on whether
+	CC_FOR_TARGET was specified on the command line.
+	(MAKEOVERRIDES): Don't define.
+
+Thu Oct 17 10:27:56 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* configure.in (m32r): Fix spelling of libg++ libs.
+
+Thu Oct 10 10:37:17 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* config.sub (-apple*): Remove, now redundant.
+
+Thu Oct 10 12:30:54 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Don't get confused by CPU-VENDOR-linux-gnu.
+
+	* configure: Rework yesterday's sed script patch.
+
+	* config.sub: Merge with FSF.
+
+Wed Oct  9 17:24:59 1996  Per Bothner  <bothner@deneb.cygnus.com>
+
+	* config.guess:  Merge from FSF.
+
+	1996-09-12  Richard Stallman  <rms@ethanol.gnu.ai.mit.edu>
+	* config.guess: Use pc instead of unknown, for pc clone systems.
+	Change linux to linux-gnu.
+
+	Mon Jul 15 23:51:11 1996  Karl Heuer  <kwzh@gnu.ai.mit.edu>
+	* config.guess: Avoid non-portable tr syntax.
+
+Wed Oct  9 06:06:46 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* test-build.mk (HOLES): Add "xargs" for gdb.
+
+	* configure: Avoid hpux10.20 sed bug.
+
+Tue Oct  8 08:32:48 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* configure.in:  Add support for windows host
+	(that is a build done under the Microsoft build environment).
+
+Tue Oct  8 10:39:08 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in: Replace all uses of srcroot with s, to shrink
+	command line lengths.
+
+	Patches from Geoffrey Noer <noer@cygnus.com>:
+	* configure.in: If configuring for newlib, pass --with-newlib to
+	subdirectories.
+	* Makefile.in (CC_FOR_TARGET): If winsup/Makefile exists, pass a
+	-Bnewlib/ and -Lwinsup to gcc.
+	(CXX_FOR_TARGET): Likewise.
+
+Mon Oct  7 10:59:35 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (ETC_SUPPORT): Add configure.
+
+Fri Oct  4 12:22:58 1996  Angela Marie Thomas (angela@cygnus.com)
+
+	* configure.in: Use config/mh-dgux386 for i[345]86-dg-dgux
+	host configuration file.
+
+Thu Oct  3 09:28:25 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* configure.in: Break mn10x00 support into separate
+	mn10200 and mn10300 configurations.
+	* config.sub: Likewise.
+
+Wed Oct  2 22:27:52 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* configure.in: Add lots of stuff to noconfigdirs for
+	the mn10x00 targets.
+
+	* config.sub, configure.in: Add mn10x00 support.
+
+Wed Oct  2 15:52:36 1996  Klaus Kaempf  <kkaempf@progis.de>
+
+	* make-all.com: Call conf-a-gas, not config-a-gas.
+
+Tue Oct  1 01:28:41 1996  James G. Smith  <jsmith@cygnus.co.uk>
+
+	* configure.in (noconfigdirs): Don't build libgloss for arm-coff
+	targets.
+
+Mon Sep 30 14:24:01 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-README: Add much more detail for native PowerMac.
+	* mpw-install: New file.
+	* mpw-configure: Add --norecursion and --help options.
+	* mpw-config.in: Translate readme and install files when
+	copying to objdir.
+	* mpw-build.in: Don't always depend on byacc and flex.
+	(install-only-top): New action.
+
+Fri Sep 27 17:39:44 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* configure.in:  You can now configure GDB for the v850.
+
+Tue Sep 24 19:05:12 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* configure.in (noconfigdirs): Don't configure any C++ dirs
+	if targeting D10V.
+
+Tue Sep 17 12:15:31 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.sub: Recognize mips64vr5000.
+
+Mon Sep 16 17:00:52 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Use a single line for host_tools and native_only.
+
+Mon Sep  9 12:21:30 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* config.sub, configure.in: Add entries for m32r.
+
+Thu Sep  5 13:52:47 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+	* Makefile.in (inet-install): Don't run install-gzip.
+
+Wed Sep  4 17:26:13 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* configure.in:  Don't config lots of things for *-*-windows*.
+
+Sat Aug 31 11:45:57 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-config.in: Test for mpw-true, true, and null-command scripts.
+	(host_libs, host_tools): Copy from configure.in.
+	* mpw-configure: Don't complain about directories not found.
+
+Thu Aug 29 16:44:58 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* configure.in (i[345]86): Recognize i686 for pentium pro.
+	(i[3456]86-*-dgux*): Use config/mh-sysv for the host configuration
+	file.
+
+	* config.guess (i[345]86): Ditto.
+
+Mon Aug 26 18:34:42 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* configure.in (noconfigdirs): Removed gdb for D10V.
+
+Thu Aug 22 17:13:52 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* configure.in: Remove ld, target-libio, target-libg++, and
+	target-libstdc++ from noconfigdirs.
+
+Wed Aug 21 18:56:38 1996  Fred Fish  <fnf@cygnus.com>
+
+	* configure: Fix three locations where shell scripts were
+	being run directly rather than with config_shell.
+
+Tue Aug 20 13:08:47 1996  J.T. Conklin  <jtc@hippo.cygnus.com>
+
+	* configure.in (v850-*-*): Set up initial $noconfigdirs.
+	* config.sub (basic_machine): Recognize v850.
+
+Thu Aug 15 12:19:33 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-configure: Handle multiple enable/disable options and
+	pass them down recursively, handle -c and -s flags appropriately
+	depending on choice of compiler, add escape mechanism for
+	quoted arguments to gC.
+
+Mon Aug 12 13:15:13 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* configure.in (powerpc*-*-*): For eabi, system V.4, Linux, and
+	solaris targets, use config/mt-ppc to set C{,XX}FLAGS_FOR_TARGETS
+	so that -mrelocatable-lib and -mno-eabi are used.
+
+	* Makefile.in (CONFIGURE_TARGET_MODULES): If target compiler does
+	not support --print-multi-lib, don't abort.
+
+Thu Aug  8 12:18:59 1996  Klaus Kaempf  <kkaempf@progis.de>
+
+	* make-all.com: Run config-a-gas.
+	* setup.com: Don't copy subdirectory files around.
+
+Tue Jul 30 17:49:31 1996  Brendan Kehoe  <brendan@cygnus.com>
+
+	* configure.in (*-*-ose): Remove exclusion of libgloss for this
+	target, it now compiles correctly.
+
+Sat Jul 27 15:10:43 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-config.in: Generate Mac include for elf/dwarf2.h.
+
+Tue Jul 23 10:47:04 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* configure.in (d10v-*-*): Remove ld from $noconfigdirs.
+
+Mon Jul 22 13:28:51 1996  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+	* configure.in (native_only): Add prms.
+
+Mon Jul 22 12:27:58 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (GAS_SUPPORT_DIRS): Add make-all.com and setup.com.
+	(BINUTILS_SUPPORT_DIRS): Likewise.
+
+Thu Jul 18 12:55:40 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* configure.in (d10v-*-*): Don't configure ld or gdb until the
+	d10v support is added.
+
+Wed Jul 17 14:33:09 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* configure.in (d10v-*-*): New target.
+
+Mon Jul 15 11:53:00 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* config.guess (HP 9000/811): Recognize this as a PA1.1
+	machine.
+
+Fri Jul 12 23:21:17 1996  Ken Raeburn  <raeburn@cygnus.com>
+
+	* Makefile.in (do-tar-gz): New target, split out from tail end of
+	taz target.  Run each command separately, don't use pipes.
+	(taz): Use it.
+
+Fri Jul 12 12:08:04 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-configure: Look for g-mpw-make.sed in config/mpw.
+	* mpw-build.in: No builds should depend on building byacc or flex,
+	they are assumed to be installed already.
+
+Fri Jul 12 09:52:52 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* Makefile.in (CONFIGURE_TARGET_MODULES): Set r environment
+	variable that CC_FOR_TARGET needs.
+
+Thu Jul 11 10:09:45 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* Makefile.in (CONFIGURE_TARGET_MODULES): Determine if the multlib
+	options have changed since the last time the subdirectory was
+	configured, and if it has, reconfigure.
+	(CLEAN_TARGET_MODULES): Delete multilib.out and tmpmulti.out, which
+	CONFIGURE_TARGET_MODULES uses to remember the old multilib options.
+
+Wed Jul 10 18:56:59 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* Makefile.in (ALL_MODULES,CROSS_CHECK_MODULES,INSTALL_MODULES,
+	CLEAN_MODULES): Add bash.
+	(all-bash): New target.
+
+Mon Jul  8 17:33:14 1996  Jim Wilson  <wilson@cygnus.com>
+
+	* configure.in (mips-sgi-irix6*): Use mh-irix6 instead of mh-irix5.
+
+Mon Jul  1 13:31:35 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* config.sub (basic_machine): Recognize d10v as a valid processor.
+
+Fri Jun 28 12:14:35 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-configure: Add support for --bindir.
+	* mpw-build.in: Use a GCC-specific build script for GCC actions.
+
+Wed Jun 26 17:20:12 1996  Geoffrey Noer  <noer@cygnus.com>
+
+	* configure.in: add bash, time, gawk to list of hosttools and things
+	to only build for native toolchains
+
+Tue Jun 25 23:09:03 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
+
+	* Makefile.in (docdir): Remove.
+
+Tue Jun 25 19:00:08 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
+
+	* Makefile.in (datadir): Set to $(prefix)/share.
+
+Mon Jun 24 23:26:07 1996  Geoffrey Noer  <noer@cygnus.com>
+
+	* configure.in: build diff and patch for cygwin32-hosted
+	toolchains.
+
+Mon Jun 24 15:01:12 1996  Joel Sherrill  <joel@merlin.gcs.redstone.army.mil>
+
+	* config.sub: Accept -rtems*.
+
+Sun Jun 23 22:41:54 1996  Geoffrey Noer  <noer@cygnus.com>
+
+	* configure.in: enable dosrel for cygwin32-hosted builds,
+		remove diff from the list of things not buildable
+		via Canadian Cross
+
+Sat Jun 22 11:39:01 1996  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* Makefile.in (TARGET_SUBDIR): Move comment to previous line so we
+	don't get ". ".
+
+Fri Jun 21 17:24:48 1996  Jim Wilson  <wilson@cygnus.com>
+
+	* configure.in (mips*-sgi-irix6*): Set noconfigdirs appropriately.
+
+Thu Jun 20 16:57:40 1996  Ken Raeburn  <raeburn@cygnus.com>
+
+	* Makefile.in (taz): Handle case where tex3patch didn't even get
+	checked out.  Also, if it was found, put the symlink in a new util
+	subdirectory.
+
+Thu Jun 20 12:20:33 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* config.guess (*:Linux:*:*): Add support for PowerPC Linux.
+
+Tue Jun 18 14:24:12 1996  Klaus Kaempf  (kkaempf@progis.de)
+
+	* config.sub: Recognize -openvms.
+	* configure.in (alpha*-*-*vms*): Set noconfigdirs.
+	* make-all.com, setup.com: New files.
+
+Mon Jun 17 16:34:46 1996  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* Makefile.in (taz): tex3patch moved to texinfo/util.
+
+Sat Jun 15 17:13:25 1996  Geoffrey Noer <noer@cygnus.com>
+
+	* configure: enable_gdbtk=no for cygwin32-hosted toolchains
+	* configure.in: remove make from disable-if-Can-Cross list
+		enable gdb if ${host} and ${target} are cygwin32
+
+Fri Jun  7 18:16:52 1996  Harlan Stenn <harlan@pfcs.com>
+
+	* config.guess (i?86-ncr-sysv*):  Emit minor release numbers.
+	Recognize the NCR 4850 machine and NCR Pentium-based platforms.
+
+Wed Jun  5 00:09:17 1996  Per Bothner  <bothner@wombat.gnu.ai.mit.edu>
+
+	* config.guess:  Combine mips-mips-riscos cases, and use cpp to
+	distinguish sysv/svr4/bsd variants.
+	Based on a patch from Harlan Stenn <harlan@pfcs.com>.
+
+Fri Jun  7 14:24:49 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+	* configure.in: Added copyright notice.
+	* move-if-change: Added copyright notice.
+
+Thu Jun  6 16:27:05 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* configure.in (powerpcle-*-solaris*): Until we get shared
+	libraries working, don't build gdb, sim, make, tcl, tk, or
+	expect.
+
+Tue Jun  4 20:41:45 1996  Per Bothner  <bothner@deneb.cygnus.com>
+
+	* config.guess:  Merge with FSF:
+
+	Mon Jun  3 08:49:14 1996  Karl Heuer  <kwzh@gnu.ai.mit.edu>
+	* config.guess (*:Linux:*:*): Add guess for sparc-unknown-linux.
+
+	Fri May 24 18:34:53 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
+	* config.guess (AViiON:dgux:*:*): Fix typo in recognizing mc88110.
+
+	Fri Apr 12 20:03:59 1996  Per Bothner  <bothner@spiff.gnu.ai.mit.edu>
+	* config.guess:  Combine two OSF1 rules.
+	Also recognize field test versions.  From mjr@zk3.dec.com.
+	* config.guess (dgux):  Use /usr/bin/uname rather than uname,
+	because GNU uname does not support -p.  From pmr@pajato.com.
+
+Tue Jun  4 11:07:25 1996  Tom Tromey  <tromey@csk3.cygnus.com>
+
+	* Makefile.in (MAKEDIRS): Removed $(tooldir).
+
+Tue May 28 12:30:50 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-README: Document GCCIncludes.
+
+Sun May 26 15:16:27 1996  Fred Fish  <fnf@cygnus.com>
+
+	* configure.in (alpha-*-linux*): Set enable_shared to yes.
+
+Tue May 21 15:41:39 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-configure: Handle --enable-FOO and --disable-FOO.
+
+Mon May 20 10:12:29 1996  Geoffrey Noer  <noer@cygnus.com>
+
+	* configure.in (*-*-cygwin32): Configure make.
+
+Tue May  7 14:19:42 1996  Tom Tromey  <tromey@snuffle.cygnus.com>
+
+	* Makefile.in (inet-install): Quote value of INSTALL_MODULES.
+
+Fri May  3 08:57:17 1996  Tom Tromey  <tromey@lisa.cygnus.com>
+
+	* Makefile.in (all-inet): Depend on all-perl.
+
+	* Makefile.in (inet-install): New target.
+
+	* Makefile.in (all-inet): Depend on all-tcl.
+	(all-inet): Depend on all-send-pr.
+
+Tue Apr 30 13:55:51 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* configure.in (powerpcle-*-solaris*): Turn off tk and tcl
+	temporarily.
+
+Thu Apr 25 11:48:20 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Don't configure --with-gnu-ld on AIX.
+
+Thu Apr 25 06:33:36 1996  Michael Meissner  <meissner@wogglebug.tiac.net>
+
+	* configure.in (powerpcle-*-solaris*): Turn off gdb temporarily.
+
+Tue Apr 23 09:07:39 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+	* Makefile.in (ALL_MODULES): Added all-inet.
+	(CROSS_CHECK_MODULES): Added check-inet.
+	(INSTALL_MODULES): Added install-inet.
+	(CLEAN_MODULES): Added clean-inet.
+	(all-indent): New target.
+
+	* configure.in (host_tools): Added inet.
+	(native_only): Added inet.
+	(noconfigdirs): Added inet.
+
+Fri Apr 19 15:35:29 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Don't configure libgloss if we are not configuring
+	newlib.
+
+Wed Apr 17 19:30:01 1996  Rob Savoye  <rob@chinadoll.cygnus.com>
+
+	* configure.in: Don't configure libgloss for unsupported
+	architectures.
+
+Tue Apr 16 11:17:05 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* Makefile.in (CLEAN_MODULES): Add clean-apache.
+
+Mon Apr 15 15:09:05 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+	* Makefile.in (ALL_MODULES): Include all-apache.
+	(CROSS_CHECK_MODULES): Include check-apache.
+	(INSTALL_MODULES): Include install-apache.
+	(all-apache): New target.
+
+	* configure.in: Added apache everywhere perl is seen.
+
+Mon Apr 15 14:59:13 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* Makefile.in: Add support for clean-{module} and
+	clean-target-{module} rules.
+
+Wed Apr 10 21:37:41 PDT 1996  Marilyn E. Sander <msander@cygnus.com>
+
+	* configure.in (*-*-ose) do not build libgloss.
+
+Mon Apr  8 16:16:20 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* config.guess (prep*:SunOS:5.*:*): Turn into
+	powerpele-unknown-solaris2.
+
+Mon Apr  8 14:45:41 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Permit --enable-shared to specify a list of
+	directories.
+
+Fri Apr  5 08:17:57 1996  Jason Molenda  (crash@phydeaux.cygnus.com)
+
+	* configure.in (host==solaris): Pass only the first word of $CC
+	to /usr/bin/which when checking if we're using /usr/ccs/bin/cc.
+
+Fri Apr  5 03:16:13 1996  Jason Molenda  (crash@phydeaux.cygnus.com)
+
+	* Makefile.in (BASE_FLAGS_TO_PASS): pass down $(MAKE).
+
+Thu Mar 28 14:11:11 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+	* Makefile.in (ALL_MODULES): Include all-perl.
+	(CROSS_CHECK_MODULES): Include check-perl.
+	(INSTALL_MODULES): Include install-perl.
+	(ALL_X11_MODULES): Include all-guile.
+	(CHECK_X11_MODULES): Include check-guile.
+	(INSTALL_X11_MODULES): Include install-guile.
+	(all-perl): New target.
+	(all-guile): New target.
+
+	* configure.in (host_tools): Include perl and guile.
+	(native_only): Include perl and guile.
+	(noconfigdirs): Don't build guile and perl; no ports have been
+	done.
+
+Tue Mar 26 21:18:50 1996  Andrew Cagney  <cagney@kremvax.highland.com.au>
+
+	* configure (--enable-*): Handle quoted option lists such as
+	--enable-sim-cflags='-g0 -O' better.
+
+Thu Mar 21 11:53:08 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* Makefile.in ({,inst}all-target): New rule so we can make and
+	install all of the target directories easily.
+
+Wed Mar 20 18:10:57 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* configure.in: Add missing global flag in sed substitution when
+	deleting `target-' from ${configdirs}.
+
+Thu Mar 14 19:15:06 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (DO_X): Don't get confused if CC contains `=' in an
+	option.
+
+	* configure.in (mips*-nec-sysvr4*): Use a host_makefile_frag of
+	config/mh-necv4.
+
+	* install.sh: Correct misspelling of transformbasename.
+
+	* config.guess: Recognize mips-*-sysv*.
+
+Mon Mar 11 15:36:42 1996  Dawn Perchik  <dawn@critters.cygnus.com>
+
+	* config.sub: Recognize mon960.
+
+Sun Mar 10 13:18:38 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Restore Canadian Cross handling of BISON and LEX,
+	removed in Feb 20 change.
+
+Fri Mar  8 20:07:09 1996  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* README:  Suggestions from Torbjorn Granlund <tege@matematik.su.se>:
+	Mention make install.  Remove the old copyright date as well the
+	clumsy and rather pointless copyright on the README file.
+
+Fri Mar  8 17:51:35 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in ($(CONFIGURE_TARGET_MODULES)): If there is a
+	Makefile after running symlink-tree, then run `make distclean' to
+	avoid clobbering any generated files in srcdir.
+
+Tue Mar  5 08:21:44 1996  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* configure.in (m68k-*-netbsd*): Build everything now.
+
+Wed Feb 28 12:25:46 1996  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* Makefile.in (taz): Fix quoting.
+
+Tue Feb 27 11:33:57 1996  Doug Evans  <dje@charmed.cygnus.com>
+
+	* configure.in (sparclet-*-*): Build everything now.
+
+Tue Feb 27 14:31:51 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* configure.in (m68k-*-linux*): New host.
+
+Mon Feb 26 14:32:44 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Check for bison before byacc.
+
+Tue Feb 20 23:12:35 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* Makefile.in configure:  Change the way LEX and BISON/YACC are
+	set.  configure now defines DEFAULT_LEX and DEFAULT_YACC by
+	searching PATH.  These are used as fallbacks by Makefile.in if
+	flex/bison/byacc aren't in objdir.
+
+Mon Feb 19 11:45:30 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in: Make everything which depends upon all-bfd also
+	depend upon all-opcodes, in case --with-commonbfdlib is used.
+
+Thu Feb 15 19:50:50 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* configure.in (host *-*-cygwin32): Don't build gdb if we are
+	building NT native compilers on Unix.
+
+Thu Feb 15 17:42:25 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Don't get CC from the host Makefile fragment if we
+	can find gcc in PATH, or if this is a Canadian Cross.  Move the
+	Solaris test for /usr/ucb/cc to the post target script, just after
+	the compiler sanity test.
+
+Wed Feb 14 16:57:40 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.sub: Merge with FSF.
+
+Tue Feb 13 14:27:48 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (RPATH_ENVVAR): New variable.
+	(REALLY_SET_LIB_PATH): Use it.
+	* configure.in: On HP/UX, set RPATH_ENVVAR to SHLIB_PATH.
+
+Mon Feb 12 15:28:49 1996  Doug Evans  <dje@charmed.cygnus.com>
+
+	* config.sub, configure.in: Recognize sparclet cpu.
+
+Mon Feb 12 15:33:59 1996  Christian Bauernfeind <chrisbfd@theorie3.physik.uni-erlangen.de>
+
+	* config.guess:  Support m68k-cbm-sysv4.
+
+Sat Feb 10 12:06:42 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* config.guess (*:Linux:*:*): Guess m68k-unknown-linux and
+	m68k-unknown-linuxaout from linker help string.  Put quotes around
+	$ld_help_string.
+
+Thu Dec  7 09:03:24 1995  Tom Horsley  <Tom.Horsley@mail.hcsc.com>
+
+	* config.guess (powerpc-harris-powerunix): Add guess for port
+	to new target.
+
+Thu Feb  8 15:37:52 1996  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+	* config.guess (UNAME_VERSION): Recognize X4.x as an OSF version.
+
+Mon Feb  5 16:36:51 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: If --enable-shared was used, set SET_LIB_PATH to
+	$(REALLY_SET_LIB_PATH) in Makefile.
+	* Makefile.in (SET_LIB_PATH): New variable.
+	(REALLY_SET_LIB_PATH): New variable.
+	($(DO_X)): Use $(SET_LIB_PATH).
+	(install.all, gcc-no-fixedincludes, $(ALL_MODULES)): Likewise.
+	($(NATIVE_CHECK_MODULES), $(CROSS_CHECK_MODULES)): Likewise.
+	($(INSTALL_MODULES), $(CONFIGURE_TARGET_MODULES)): Likewise.
+	($(ALL_TARGET_MODULES), $(CHECK_TARGET_MODULES)): Likewise.
+	($(INSTALL_TARGET_MODULES), $(ALL_X11_MODULES)): Likewise.
+	($(CHECK_X11_MODULES), $(INSTALL_X11_MODULES)): Likewise.
+	(all-gcc, all-bootstrap, check-gcc, install-gcc): Likewise.
+	(install-dosrel): Likewise.
+	(all-opcodes): Depend upon all-libiberty.
+
+Sun Feb  4 16:51:11 1996  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* config.guess (*:CYGWIN*): New
+
+Sat Feb  3 10:42:35 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* Makefile.in (all-target-winsup): All all-target-libiberty.
+
+Fri Feb  2 17:58:56 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* configure.in (noconfigdirs): Add missing # in front of comment.
+
+Thu Feb  1 14:38:13 1996  Geoffrey Noer  <noer@cygnus.com>
+
+	* configure.in: add second pass to things added to noconfigdirs
+	so *-gm-magic can exclude libgloss properly.
+
+Thu Feb  1 11:10:16 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-configure (extralibs_name, rez_name): Set correctly
+	for MWC68K compiler.
+
+	* mpw-README: Add more info on the necessary build tools.
+
+Thu Feb  1 10:22:38 1996  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* configure.in, config.sub: Recognize cygwin32.
+
+Wed Jan 31 14:17:10 1996  Richard Henderson  <rth@tamu.edu>
+
+	* config.guess, config.sub: Recognize A/UX.
+
+Wed Jan 31 13:52:14 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.sub: Merge with gcc/config.sub.
+
+Thu Jan 25 11:01:10 1996  Raymond Jou  <rjou@mexican.cygnus.com>
+
+	* mpw-build.in (do-binutils): Add build of stamps.
+
+Thu Jan 25 17:05:26 1996  James G. Smith  <jsmith@cygnus.co.uk>
+
+	* config.sub: Add recognition for mips64vr4100*-* targets.
+
+Wed Jan 24 12:47:55 1996  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+	* test-build.mk: Add checking of `hpux9' rather than just `hpux'.
+	Add creation of gconfigargs with `--enable-shared' turned on.
+	($(host)-stamp-stage2-configured): Pass $(gconfigargs).
+	($(host)-stamp-stage3-configured): Likewise.
+	(HOLES): Add chatr and ldd.
+	(i386-ncr-sysv4.3*): Add use of /usr/ccs/bin in the PATH and HOLE_DIRS.
+
+Wed Jan 24 20:32:30 1996  Torbjorn Granlund  <tege@noisy.matematik.su.se>
+
+	* configure: Pass --nfp to recursive configures.
+
+Mon Jan 22 10:41:56 1996  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* Makefile.in (DLLTOOL): New.
+	(DLLTOOL_FOR_TARGET): New.
+	(EXTRA_HOST_FLAGS): Pass down DLLTOOL.
+	(EXTRA_TARGET_FLAGS): Ditto.
+	(EXTRA_GCC_FLAGS): Ditto.
+	(CONFIGURE_TARGET_MODULES): Ditto.
+	(DO_X): Ditto.
+	* configure: Add DLLTOOL.
+
+Fri Jan 19 13:30:15 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	SCO OpenServer 5 changes from Robert Lipe <robertl@dgii.com>:
+	* configure.in (i[345]86-*-sco3.2v5*): Use mh-sysv instead of
+	mh-sco, since old workarounds no longer needed, and don't
+	build ld, since libraries have weak symbols in COFF.
+
+Sun Jan 14 23:01:31 1996  Fred Fish  <fnf@cygnus.com>
+
+	* Makefile.in (CONFIGURE_TARGET_MODULES): Add missing ';'.
+
+Fri Jan 12 15:25:35 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Make sure that ${CC} can be used to compile an
+	executable.
+
+Sat Jan  6 07:23:33 1996  Michael Meissner  <meissner@wogglebug.tiac.net>
+
+	* Makefile.in (all-gdb): Depend on $(GDB_TK).
+	* configure (GDB_TK): Set GDB_TK to either "all-tcl all-tk" or
+	nothing depending on whether gdbtk is being built.
+
+Wed Jan  3 17:54:41 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* Makefile.in (newlib.tar.gz): Delete building of newlib's info files.
+
+Mon Jan  1 19:09:14 1996  Brendan Kehoe  <brendan@rtl.cygnus.com>
+
+	* configure.in (noconfigdirs): Put ld or gas in this early, if the
+	user specifically used --with-gnu-ld=no or --with-gnu-as=no.
+
+Sat Dec 30 16:08:57 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* config-ml.in: Add support for
+	--disable-{softfloat,m68881,m68000,m68020} on m68*-*-*.
+	Simplify setting of multidirs from --disable-foo.
+
+Fri Dec 29 07:56:11 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* Makefile.in (EXTRA_GCC_FLAGS): If any of the make variables
+	LANGUAGES, BOOT_CFLAGS, STMP_FIXPROTO, LIMITS_H_TEST,
+	LIBGCC1_TEST, LIBGCC2_CFLAGS, LIBGCC2_INCLUDES, and ENQUIRE are
+	non-empty, pass them on to the	GCC make.
+	(all-bootstrap): New rule that is like all-gcc, except it executes
+	the GCC bootstrap rule instead of the GCC all rule.
+
+Wed Dec 27 15:51:48 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* config-ml.in (ml_realsrcdir): New, to account for ${subdir}.
+
+Tue Dec 26 11:45:31 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* config.guess (AViiON:dgux:*:*): Update from FSF to add pentium
+	DG/UX support.
+
+Fri Dec 15 10:01:27 1995  Stan Cox  <coxs@dg-rtp.dg.com>
+
+	* config.sub (i*86*) Change [345] to [3456]
+
+Wed Dec 20 17:41:40 1995  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+	* configure.in (noconfigdirs): Add gas or ld if --with-gnu-as=no or
+	--with-gnu-ld=no.
+
+Wed Dec 20 15:15:35 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* config-ml.in (rs6000*, powerpc*): Add switches to control which
+	AIX multilibs get built.
+
+Mon Dec 18 17:55:46 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
+
+	* configure.in (i386-win32): Don't build expect if we're not
+	building the tcl subdir.
+
+Mon Dec 18 11:47:19 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* Makefile.in: (configure-target-examples, all-target-examples):
+	New targets, configure and build example programs.
+
+Fri Dec 15 16:13:03 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-configure: If an mpw-config.in generated a file mk.sed,
+	use it as input to sedit the generated MPW makefile.
+	* mpw-README: Add a suggestion about Gestalt.h.
+
+Wed Dec 13 16:43:51 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.sub: Accept *-*-ieee*.
+
+Tue Dec 12 11:52:57 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (local-distclean): Remove $(TARGET_SUBDIR).  From
+	Ronald F. Guilmette <rfg@monkeys.com>.
+
+Mon Dec 11 15:31:58 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
+
+	* configure.in (host==powerpc-pe): Add many directories to noconfigdirs
+	for powerpc-pe native.
+	(target==i386-win32): add tcl, make to noconfigdirs if canadian cross.
+	(target==powerpc-pe): duplicate i386-win32 entry.
+
+Sat Dec  9 14:58:28 1995  Jim Wilson  <wilson@chestnut.cygnus.com>
+
+	* configure.in (noconfigdirs): Exclude target-newlib for all versions
+	of vxworks, not just vxworks5.1.
+
+Mon Dec  4 12:05:40 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-configure: Add support for exec-prefix.
+
+Mon Dec  4 10:22:50 1995  Jeffrey A. Law  <law@rtl.cygnus.com>
+
+	* config.guess: Recognize HP model 816 machines as having
+	a PA1.1 processor.
+
+Mon Dec  4 12:38:15 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Ignore new autoconf configure options.
+
+Thu Nov 30 16:57:33 1995  Per Bothner  <bothner@wombat.gnu.ai.mit.edu>
+
+	* config.guess:  Recognize Pentium under SCO.
+	From Robert Lipe <robertl@arnet.com>.
+
+Wed Nov 29 13:49:08 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* configure.in (noconfigdirs): Disable target-libio on v810-*-*.
+
+Wed Nov 29 12:12:01 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Don't configure gas for alpha-dec-osf*.
+
+Tue Nov 28 17:16:48 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Default to --with-stabs for some targets for which
+	it makes sense: mips*-*-*, alpha*-*-osf*, i[345]86*-*-sysv4* and
+	i[345]86*-*-unixware*.
+
+Mon Nov 27 13:44:15 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config-ml.in: Get list of multidirs using gcc --print-multi-lib
+	rather than basing it on the target.  Simplify handling of options
+	controlling which directories to configure.  Remove extraneous
+	slash in multi-clean target.
+
+Fri Nov 24 17:29:29 1995  Doug Evans  <dje@deneb.cygnus.com>
+
+	* config-ml.in: Prefix more variables with ml_ so they don't collide
+	with configure's.
+
+Wed Nov 22 11:27:02 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Don't turn -v into --v.
+
+Tue Nov 21 16:48:02 1995  Doug Evans  <dje@deneb.cygnus.com>
+
+	* configure.in (targargs): Fix typo.
+
+	* Makefile.in (DEVO_SUPPORT): Add symlink-tree.
+
+Tue Nov 21 14:08:28 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Strip --host and --target options from
+	CONFIG_ARGUMENTS, and always configure for --host only.  Add
+	--with-cross-host option when building with a cross-compiler.
+	* configure: Canonicalize the arguments put into config.status by
+	always using `=' for an option with an argument.  Pass a presumed
+	--host or --target explicitly.
+
+Fri Nov 17 17:50:30 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* config.sub: Merge -macos*, -magic*, -pe*, and -win32 cases
+	into general OS recognition case.
+
+Fri Nov 17 17:42:25 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
+
+	* configure.in (target_configdirs): add target-winsup only
+	for win32 target systems.
+
+Thu Nov 16 14:04:47 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (all-target-libgloss): Depend upon
+	configure-target-newlib, since when libgloss is built it looks to
+	see if the newlib directory exists.
+
+Wed Nov 15 14:47:52 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* Makefile.in (DEVO_SUPPORT): Use config-ml.in instead of
+	cfg-ml-*.in.
+
+Wed Nov 15 11:45:23 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Handle LD and LD_FOR_TARGET when configuring a
+	Canadian Cross.
+
+Tue Nov 14 14:56:11 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
+
+	* configure.in (target_libs): add target-winsup.
+	(target==i386-win32): add patch diff flex make to $noconfigdirs.
+	(target==ppcle-pe): remove ld from $noconfigdirs.
+
+Tue Nov 14 01:25:50 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* Makefile.in (CONFIGURE_TARGET_MODULES): Pass --with-target-subdir.
+	Preserve relative path names in $srcdir.  Build symlink tree if
+	configuring cross target dir and srcdir=. (= no VPATH support).
+	(configure-target-libg++): Depend on configure-target-librx.
+	* cfg-ml-com.in, cfg-ml-pos.in: Deleted.
+	* config-ml.in: New file.
+	* symlink-tree: New file.
+	* configure: Ensure srcdir="." if that's what it is.
+
+Mon Nov 13 12:34:20 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-README: Clarify some phrasing, add notes about CodeWarrior
+	includes and FLEX_SKELETON setting.
+	* mpw-configure (--with-gnu-ld): New option, controls whether
+	to use PPCLink or ld with PowerMac GCC.
+	* mpw-build.in (all-grez, do-grez, install-grez): New targets.
+	* mpw-config.in: Configure grez if targeting Mac.
+
+	* config.sub: Accept pmac and pmac-mpw as names for PowerMacs,
+	accept mpw and mac-mpw as names for m68k Macs, change macos7 to
+	just macos.
+	* configure.in: Configure grez resource compiler if targeting Mac.
+	* Makefile.in (all-grez, install-grez): New targets.
+
+Wed Nov  8 17:33:51 1995  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* configure: CXX defaults to gcc, not g++.  If we find
+	gcc in the path, set CC to gcc -O2.
+
+Tue Nov  7 15:45:17 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Default ${build} correctly.  Avoid picking up extra
+	spaces when reading CC and CXX from Makefile.  When doing a
+	Canadian Cross, use plausible default values for numerous
+	variables.
+	* configure.in: When doing a Canadian Cross, don't try to
+	configure tools whose configure script can't handle it.
+
+Mon Nov  6 19:32:17 1995  Jim Wilson  <wilson@chestnut.cygnus.com>
+
+	* cfg-ml-com.in (sh-*-*): Add m2 and ml/m2 to multidirs.
+
+Sun Nov  5 00:15:41 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* configure:  Remove dubious bug reporting address.
+
+Fri Nov  3 08:17:54 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* Makefile.in ($(CONFIGURE_TARGET_MODULES)):  If subdir has
+	configure script, run that instead of this directory's configure.
+	In either case, print a message that we're configuring the sub-dir.
+
+Thu Nov  2 23:23:36 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* configure.in: Before checking for the existence of various files,
+	use sed to filter out "target-".
+
+Thu Nov  2 13:24:56 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (DO_X): Split rule to decrease command line length
+	for systems with small ARG_MAX values.  From phdm@info.ucl.ac.be
+	(Philippe De Muyter).
+
+Wed Nov  1 15:18:35 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
+
+	* Makefile.in (all-patch): depend on all-libiberty.
+
+Wed Nov  1 12:23:20 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: If the only directory in target_configdirs which
+	actually exists is libiberty, then set target_configdirs to empty,
+	to avoid trying to build a target libiberty in a gas or gdb
+	distribution.
+
+Tue Oct 31 17:52:39 1995  J.T. Conklin  <jtc@slave.cygnus.com>
+
+	* configure.in (host_makefile_frag): Use m68k-sun-sunos* instead
+	of m68k-sun-* when selecting mh-sun3 to avoid matching NetBSD/sun3
+	systems.
+
+Tue Oct 31 16:57:32 1995  Jim Wilson  <wilson@chestnut.cygnus.com>
+
+	* configure.in (copy_dirs): Use sys-include instead of include
+	for --with-headers option.
+
+Tue Oct 31 10:29:36 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* Makefile.in, configure.in: Make winsup builds work with
+	new scheme.
+
+Mon Oct 30 18:57:09 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Build the linker on AIX.
+
+Mon Oct 30 12:27:16 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* Makefile.in (CC_FOR_TARGET, CXX_FOR_TARGET):  Add $(TARGET_SUBDIR)
+	where needed.
+
+Mon Oct 30 12:45:25 1995  Doug Evans  <dje@cygnus.com>
+
+	* Makefile.in (all-gcc): Fix typo.
+
+Sat Oct 28 10:27:59 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* Makefile.in ($(CHECK_TARGET_MODULES)):  Fix typo.
+
+Fri Oct 27 23:14:12 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* configure.in:  Rename libFOO to target-libFOO, and xiberty
+	to target-xiberty, to provide more flexibility.
+	(target_subdir):  Define.  Create if cross.
+	Set TARGET_SUBDIR in Makefile to ${target_subdir}.
+	* Makefile.in:  Rename all-libFOO -> all-target-libFOO, all-xiberty
+	-> all-target-libiberty, configure-libFOO -> configure-target-libFOO,
+	check-libFOO -> check-target-libFOO, etc.
+	($(DO_X)):  Iterate over TARGET_CONFIGDIRS after SUBDIRS.
+	($(CONFIGURE_TARGET_MODULES), $(CHECK_TARGET_MODULES),
+	$(ALL_TARGET_MODULES), $(INSTALL_TARGET_MODULES)): Update accordingly.
+	(configure-target-XXX):  Depend on $(ALL_GCC), not all-gcc, to
+	allow ALL_GCC="" to only configure.
+	(DEVO_SUPPORT):  Add cfg-ml-com.in and cfg-ml-pos.in.
+	(ETC_SUPPORT, ETC_SUPPORT_PFX):  Merge;  update 'taz' accordingly.
+	(LIBGXX_SUPPORT_DIRS):  Remove xiberty.
+
+Sat Oct 28 01:53:49 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* Makefile.in (taz): Build "info" in etc explicitly.
+
+Fri Oct 27 09:32:30 1995  Stu Grossman  (grossman@cygnus.com)
+
+	* configure.in:  Make sure that CC is undefined (as opposed to
+	null) if toplevel/config/mh-{host} doesn't define it.  Fixes a
+	problem with autoconf trying to configure on a host without GCC.
+
+Thu Oct 26 22:35:01 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-configure: Set host alias from choice of host compiler,
+	only use generic MPW Makefile sed if present, edit a file
+	named "hacked_Makefile.in" instead of "Makefile.in" if present.
+	* mpw-README: Add problem notes about CW6 and CW7.
+
+Thu Oct 26 05:45:10 1995  Ken Raeburn  <raeburn@kr-pc.cygnus.com>
+
+	* Makefile.in (taz): Use ";" instead of ";;".
+
+Wed Oct 25 15:18:24 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* Makefile.in (taz):  Grep for '^diststuff:' or '^info:' in
+	sub-directory Makefiles, instead of using DISTSTUFFDIRS and
+	DISTDOCDIRS.
+	(DISTSTUFFDIRS, DISTDOCDIRS):  Removed - no longer used.
+	(newlib.tar.gz):  Don't pass DISTDOCDIRS to recursive make.
+
+Wed Oct 25 14:43:55 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* Makefile.in (DISTDOCDIRS):  Remove ld gprof bnutils gas libg++ gdb
+	and gnats, because they are now subsumed by DISTSTUFFDIRS.
+	Move bfd to DISTSTUFFDIRS.
+
+Tue Oct 24 18:19:09 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
+
+	* Makefile.in (X11_LIB): Removed.
+	(X11_FLAGS_TO_PASS): pass only X11_EXTRA_CFLAGS and X11_EXTRA_LIBS.
+
+	* configure.in (host_makefile_frag): mh-aix & mh-sun removed.
+
+Sun Oct 22 13:04:42 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* cfg-ml-com.in (powerpc*): Shorten some of the multilib directory
+	names.
+
+Fri Oct 20 18:02:10 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* cfg-ml-com.in (powerpc*-eabi*): Add mcall-aixdesc varients.
+
+Thu Oct 19 10:40:57 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* configure.in (i[345]86-*-win32): Always build newlib.
+	Don't configure cvs, autoconf or texinfo.
+	* Makefile.in (LD_FOR_TARGET): New.
+	(BASE_FLAGS_TO_PASS, EXTRA_TARGET_FLAGS, CONFIGURE_TARGET_MODULES):
+	Pass down LD_FOR_TARGET.
+
+Wed Oct 18 15:53:56 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* winsup: New directory.
+	* Makefile.in: Build winsup.
+	* configure.in: Winsup is configured when target is win32.
+	Can only build win32 target GDB when native.
+
+Mon Oct 16 09:42:31 1995  Jeffrey A Law  (law@cygnus.com)
+
+	* config.guess: Recognize HP model 819 machines as having
+	a PA 1.1 processor.
+
+Mon Oct 16 10:49:43 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Fix sed loop which substitutes for CC and CXX to
+	avoid bug found in various sed implementations.
+
+Wed Oct 11 16:16:20 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* cfg-ml-com.in (powerpc-*-eabisim): Delete separate rule for
+	simulator.  Use standard powerpc-*-eabi*.
+
+Mon Oct  9 17:21:56 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Stop putting gas and binutils in noconfigdirs for
+	powerpc-*-aix* and rs6000-*-*.
+
+Mon Oct  9 12:38:40 1995  Michael Meissner  <meissner@cygnus.com>
+
+	* cfg-ml-com.in (powerpc*-*-eabisim*): Add support for building
+	-mcall-aixdesc libraries.
+
+Fri Oct  6 16:17:57 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	Mon Sep 25 22:49:32 1995  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* config.sub (arm | armel | armeb): Fix shell syntax.
+
+Fri Oct  6 14:40:28 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* cfg-ml-com.in ({powerpc,rs6000}-ibm-aix*): Add multilibs for
+	-msoft-float and -mcpu=common support.
+	(powerpc*-*-eabisim*): Add support for building -mcall-aix
+	libraries.
+
+Thu Oct  5 13:26:37 1995  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+	* configure.in: Allow configuration and build of emacs19 for the alpha.
+
+Wed Oct  4 22:05:36 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
+
+	* configure.in (CC): Get ^CC, not just any old CC, from
+	${host_makefile_frag}.
+
+Wed Oct  4 21:55:00 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
+
+	* configure.in (CC): Try to get CC from
+	${srcdir}/${host_makefile_frag}, not ${host_makefile_frag}.
+
+Wed Oct  4 21:44:12 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
+
+	* Makefile.in (TARGET_CONFIGDIRS): configure targetdirs
+	only if it exists in $(srcdir).
+
+Wed Oct  4 11:52:31 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: If CC and CXX are not set in the environment, set
+	them, based on either an existing Makefile or on searching for gcc
+	in PATH.  Substitute for CC and CXX in Makefile.
+	* configure.in: Remove libm from target_libs.  Separate
+	target_configdirs from configdirs.  If CC is not set in
+	environment, try to get it from a host Makefile fragment.  Rewrite
+	changes of configdirs to use skipdirs instead.  A few minor
+	tweaks.  Take directories out of target_configdirs as they are
+	taken out of configdirs.  Remove existing Makefile files from
+	subdirectories.  Substitute for TARGET_CONFIGDIRS and
+	CONFIG_ARGUMENTS in Makefile.
+	* Makefile.in (TARGET_CONFIGDIRS): New variable, automatically set
+	by configure.in.
+	(CONFIG_ARGUMENTS): Likewise.
+	(CONFIGURE_TARGET_MODULES): New variable.
+	($(DO_X)): Loop over TARGET_CONFIGDIRS as well as SUBDIRS.
+	($(CONFIGURE_TARGET_MODULES)): New target.
+	(configure-libg++, configure-libio): New targets.
+	(all-libg++): Depend upon configure-libg++.
+	(all-libio): Depend upon configure-libio.
+	(configure-libgloss, all-libgloss): New targets.
+	(configure-libstdc++): New target.
+	(all-libstdc++): Depend upon configure-libstdc++.
+	(configure-librx, all-librx): New targets.
+	(configure-newlib): New target.
+	(all-newlib): Depend upon configure-newlib
+	(configure-xiberty): New target.
+	(all-xiberty): Depend upon configure-xiberty.
+
+Sat Sep 30 04:32:59 1995  Jason Molenda (crash@phydeaux.cygnus.com)
+
+	* configure.in (host i[345]86-*-win32):  Expand the
+	noconfigdirs again.
+
+Thu Sep 28 21:18:49 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-configure: Fix sed command file name.
+
+Thu Sep 28 17:39:56 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* configure.in (host i[345]86-*-win32): Reduce the
+	noconfigdirs again.
+
+Wed Sep 27 12:24:00 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Don't configure ld and gdb for powerpc*-*-winnt*
+	or powerpc*-*-pe*, since they are not yet supported.
+
+Tue Sep 26 14:30:01 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	Add PowerMac support and many other enhancements.
+	* mpw-configure: New option --cc to select compiler to use,
+	paste options set according to --cc into the generated
+	Makefile, generate the Makefile by sed'ing the Unix Makefile.in
+	if mpw-make.sed is present.
+	* mpw-config.in: Don't test for gC1, test for mpw-touch,
+	add forward includes for PowerPC include files.
+	* mpw-build.in: Build using Makefile.PPC if present.
+	(do-byacc, etc): Remove separate version resource builds.
+	(do-gas): Build "stamps" before "all".
+	(do-gcc): Build "stamps-h" and "stamps-c" before "all".
+	* mpw-README: Update to reflect --cc option, PowerMac support,
+	and recently-reported compatibility problems.
+
+Fri Sep 22 12:15:42 1995  Doug Evans  <dje@deneb.cygnus.com>
+
+	* cfg-ml-com.in (m68*-*-*): Only build multilibs for
+	embedded m68k systems (-aout, -coff, -elf, -vxworks).
+	(--with-multilib-top): Pass to recursive invocations.
+
+Tue Sep 19 13:51:05 1995  J.T. Conklin  <jtc@blues.cygnus.com>
+
+	* configure.in (noconfigdirs): Disable libg++ and libstdc++ on
+	v810-*-*.
+
+Mon Sep 18 23:08:26 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* configure.in (noconfigdirs): Disable bfd, binutils, gas, gcc,
+	gdb, ld and opcodes on v810-*-*.
+
+Tue Sep 12 18:03:31 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (DO_X): Change do-realclean to do-maintainer-clean.
+	(local-maintainer-clean): New target.
+	(maintainer-clean): New target.
+	(realclean): Just depend upon maintainer-clean.
+
+Fri Sep  8 17:11:14 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* configure.in (noconfigdirs): Disable gdb on m68k-*-netbsd*.
+
+Fri Sep  8 16:46:29 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Build ld in mips*-*-bsd* case.
+
+Thu Sep  7 20:03:41 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* config.sub: Accept -lites* OS.  From Ian Dall.
+
+Fri Sep  1 08:06:58 1995  James G. Smith  <jsmith@beauty.cygnus.com>
+
+	* config.sub: recognise mips64vr4300 and mips64vr4300el as valid
+	targets.
+
+Wed Aug 30 21:06:50 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
+
+	* configure.in: treat i386-win32 canadian cross the same as
+	i386-go32 canadian cross.
+
+Thu Aug 24 14:53:20 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* cfg-ml-com.in (powerpc*-*-eabisim): Add support for PowerPC
+	running under the simulator to build a reduced set of libraries.
+	(powerpc-*-eabiaix): Add fine grained multilib support added to
+	other powerpc targets yesterday.
+
+Wed Aug 23 09:41:56 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* cfg-ml-com.in (powerpc*): Add support for -disable-biendian,
+	-disable-softfloat, -disable-relocatable, -disable-aix, and
+	-disable-sysv to control which multilib libraries get built.
+
+Thu Aug 17 16:03:41 1995  Ken Raeburn  <raeburn@kr-laptop.cygnus.com>
+
+	* configure: Add Makefile.tem to list of files to remove in trap
+	handler.
+
+Mon Aug 14 19:27:56 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* config.guess (*Linux*):  Add missing "exit"s.
+	Also, need specific check for alpha-unknown-linux (uses COFF).
+
+Fri Aug 11 15:38:20 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* config.guess:  Merge with FSF:
+
+	Wed Jun 28 17:57:27 1995  David Edelsohn  <edelsohn@mhpcc.edu>
+	* config.guess (AIX4): More robust release numbering discovery.
+
+	Thu Jun 22 19:01:24 1995  Kenneth Stailey  (kstailey@eagle.dol-esa.gov)
+	* config.guess (i386-sequent-ptx): Properly get version number.
+
+	Thu Jun 22 18:36:42 1995  Uwe Seimet  (seimet@iris1.chemie.uni-kl.de)
+	* config.guess (mips:*:4*:UMIPS): New case.
+
+Mon Aug  7 09:21:35 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* configure.in (i386-go32 host): Fix typo (deja-gnu -> dejagnu).
+	(i386-win32 host): Likewise.  Don't build readline.
+
+Sat Aug  5 09:51:49 1995  Fred Fish  <fnf@rtl.cygnus.com>
+
+	* Makefile.in (GDBTK_SUPPORT_DIRS):  Define and pass as part of
+	SUPPORT_FILES to submakes.
+
+Fri Aug  4 13:04:36 1995  Fred Fish  <fnf@cygnus.com>
+
+	* Makefile.in (GDB_SUPPORT_DIRS): Add utils.
+	(DEVO_SUPPORT): Add mpw-README, mpw-build.in, mpw-config.h and
+	mpw-configure.
+
+Wed Aug  2 16:32:40 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* configure.in (appdirs): Use =, not ==, in test expression when
+	trying to build the text to print in the warning message for
+	Solaris users.
+
+Mon Jul 31 09:56:18 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* cfg-ml-com.in (z8k-*-coff): Add 'std' multilib build.
+
+Fri Jul 28 00:16:31 1995  Jeffrey A. Law  <law@rtl.cygnus.com>
+
+	* config.guess: Recognize lynx-2.3.
+
+Thu Jul 27 15:47:59 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* config.sub (z8ksim): Deleted
+	(z8k-*-coff): New, this is the one true name of the target.
+
+Thu Jul 27 14:33:33 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* cfg-ml-pos.in (dotdot): Work around SunOS sed bug.
+
+Thu Jul 27 13:31:05 1995  Fred Fish  (fnf@cygnus.com)
+
+	* config.guess (*:Linux:*:*): First try asking the linker what the
+	default object file format is (elf, aout, or coff).  Then if this
+	fails, try previous methods.
+
+Thu Jul 27 11:28:17 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* configure.in: Don't build newlib for *-*-vxworks5.1.
+
+Thu Jul 27 11:18:47 1995  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+	* configure.in: Don't build newlib for a29k-*-vxworks5.1.
+	* test-build.mk: Add setting of --with-headers for a29k-vxworks5.1.
+
+Tue Jul 25 21:25:39 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* cfg-ml-pos.in (MULTITOP): Trim excess trailing "/.".
+
+Fri Jul 21 10:41:12 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* cfg-ml-com.in: New file.
+	* cfg-ml-pos.in: New file.
+
+Wed Jul 19 00:37:27 1995  Jeffrey A. Law  <law@rtl.cygnus.com>
+
+	* COPYING.NEWLIB: Add HP free copyright to list.
+
+Tue Jul 18 10:58:51 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* config.sub: Recognize -eabi* for the system, not just -eabi.
+
+Mon Jul  3 13:44:51 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* Makfile.in (DLLTOOL_FOR_TARGET): New name, pass it down.
+	* config.sub, configure.in (win32): New target and host.
+
+Wed Jun 28 23:57:08 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* configure.in: Add i386-pe configuration.
+
+Fri Jun 23 14:28:44 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-build.in (install): Install GDB after LD.
+
+Thu Jun 22 17:10:53 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-config.in (elf/mips.h): Always forward-include, needed
+	for GDB to build.
+
+Wed Jun 21 15:17:30 1995  Rob Savoye  <rob@darkstar.cygnus.com>
+
+	* testsuite: New directory for customer acceptance and whole tool
+	chain tests.
+
+Wed Jun 21 16:50:29 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* configure: If per-host line isn't found, but AC_OUTPUT is found
+	and a configure script exists, run it instead.
+
+Thu Jun 15 21:09:24 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* config.guess:  Update from FSF, for alpha-dec-winnt3.5 and  Crays.
+
+Tue Jun 13 21:43:27 1995  Rob Savoye  <rob@darkstar.cygnus.com>
+
+	* configure: Set build_{cpu,vendor,os,alias} to host values when
+	--build isn't specified.
+
+Mon Jun  5 18:26:36 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* Makefile.in (PICFLAG, PICFLAG_FOR_TARGET): New macros.
+	(FLAGS_TO_PASS): Pass them.
+	(EXTRA_TARGET_FLAGS): Ditto.
+
+Wed May 31 22:27:42 1995  Jim Wilson  <wilson@chestnut.cygnus.com>
+
+	* Makefile.in (all-libg++): Depend on all-libstdc++.
+
+Thu May 25 22:40:59 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* configure.in (noconfigdirs): Enable all packages for
+	  i386-unknown-netbsd.
+
+Sat May 20 13:22:31 1995  Angela Marie Thomas  <angela@cirdan.cygnus.com>
+
+	* configure.in (noconfigdirs): Don't configure tk for i386-go32
+	hosted builds (DOS builds)
+
+Thu May 18 18:08:49 1995  Ken Raeburn  <raeburn@kr-laptop.cygnus.com>
+
+	Changes for ARM based on patches from Richard Earnshaw:
+	* config.sub: Handle armeb and armel.
+	* configure.in: Omit arm linker only for riscix.
+
+Thu May 11 17:23:26 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* config.guess:  Update from FSF.
+
+Tue May  9 15:52:05 1995  Michael Meissner  <meissner@cygnus.com>
+
+	* config.sub: Recognize powerpcle as the little endian varient of
+	the PowerPC.  Recgonize ppc as a PowerPC variant, and ppcle as a
+	powerpcle variant.  Convert pentium into i586, not i486.  Add p5
+	alias for i586.  Map new x86 variants p6, k5, nexgen into i586
+	temporarily.
+
+Tue May  2 16:29:41 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* configure.in (hppa*-*-lites*): Treat like hppa*-*-*elf*.
+
+Sun Apr 30 21:38:09 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* config.sub: Accept -lites* as a basic system type.
+
+Thu Apr 27 11:33:29 1995  Michael Meissner  (meissner@cygnus.com)
+
+	* config.guess (*:Linux:*:*): Check for whether the pre-BFD linker is
+	installed, and if so return linuxoldld as the system name.
+
+Wed Apr 26 10:59:02 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* config.guess: Add hppa1.1-hp-lites support.
+
+Tue Apr 25 11:08:11 1995  Rob Savoye  <rob@darkstar.cygnus.com>
+
+	* configure.in: Don't build newlib for m68k-vxworks5.1.
+
+Wed Apr 19 17:02:43 1995  Jim Wilson  <wilson@chestnut.cygnus.com>
+
+	* configure.in (mips-sgi-irix6): Use mh-irix5.
+
+Fri Apr 14 15:21:17 1995  Doug Evans  <dje@chestnut.cygnus.com>
+
+	* Makefile.in (all-gcc): Depend on all-ld (for libgcc1-test).
+
+Wed Apr 12 16:06:01 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* test-build.mk: Enable building of shared libraries on IRIX 5 and
+	OSF/1.  Fix compiler flags.
+	* build-all.mk: Support Linux and OSF/1 3.0.  Fix compiler flags.
+
+Tue Apr 11 18:55:40 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* configure.in: Recognize --with-newlib.
+	(sparc-*-sunos4*): Build sim, dejagnu, expect, tcl if cross target.
+
+Mon Apr 10 14:38:20 1995  Jason Molenda (crash@phydeaux.cygnus.com)
+
+	* Makefile.in: move {all,check,install}-gdb from *_MODULES
+	to *_X11_MODULES due to gdbtk needing X include files et al.
+
+Mon Apr 10 11:42:22 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	Merge in support for Mac MPW as a host.
+	(Old change descriptions retained for informational value.)
+
+	* mpw-config.in: Add generic include forwards for cpu-specific
+	include files in aout and elf directories.
+
+	* mpw-configure: Added copyright.
+	* mpw-config.in: Check for presence of required build tools.
+	(target_libs): Add newlib.
+	(target_tools): Add examples.
+	(Read Me): Generate as "Read Me for MPW" instead.
+	* mpw-build.in: Base sub-builds on all-foo instead of do-foo.
+	(all-byacc, do-byacc, all-flex, do-flex, do-newlib): New actions.
+	(do-gas, do-gcc, do-gdb, do-ld): Build Version.r first.
+
+	* mpw-configure: Remove subdir-specific makefile hackery,
+	delete mk.tmp after using it.
+
+	* mpw-build.in (all): Display start and end times.
+
+	* mpw-configure (host_canonical): Set.
+	(target_cpu): Always add to makefiles.
+	(ARCHDEFS, EMUL): Add to makefile only if nonempty.
+	(TM_FILE, XM_FILE, NM_FILE): No longer add to makefile.
+	(mpw-mh-mpw): Look for in srcdir and srcroot.
+	Use sed instead of mpw-edit-prefix to edit prefix definitions.
+
+	* mpw-build.in: (install-only): New target.
+
+	* mpw-configure (host_alias, target_alias): Rename from hostalias
+	and targetalias, add into generated Makefile.
+	(mk.tmp): If present, add into generated Makefile.
+	* mpw-build.in (all-gas): Build config.h first before gas proper.
+
+	* mpw-configure (config.status): Write only if changed.
+	* mpw-config.in (readline): Configure it (not built, just used for
+	definitions).
+
+	* mpw-config.in (elf/mips.h): Add a forward include.
+
+	* mpw-config.in: Forward-include most .h files in include into
+	extra-include.
+	(readline): Don't build.
+	mpw-build.in (install): Install GDB.
+
+	* mpw-configure (prefix, mpw_prefix): Handle it.
+	* mpw-config.in (mmalloc, readline): Don't configure.
+	* mpw-build.in (thisscript): Rename to ThisScript.
+	Use mpw-build instead of BuildProgram everywhere.
+	(mmalloc, readline): Don't build.
+	* mpw-README: New file, basic documentation about the MPW port.
+
+	* mpw-config.in: Use forward-include to create include files.
+
+	* mpw-configure: Add more things to the top of each configured
+	Makefile, including contents of config/mpw-mh-mpw.
+	* mpw-config.in (extra-include): Create this directory and fill it
+	with Posix-like include files when configuring.
+
+	* config.sub (apple, mac, mpw): Add various aliases.
+
+	* mpw-build.in: New file, top-level build script fragment for MPW.
+	* mpw-configure: New file, configure script for MPW.
+	* mpw-config.in: New file, config fragment for MPW.
+
+Fri Apr  7 19:33:16 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* configure.in (host_libs): Remove glob, since it is gone from the
+	sources.
+
+Fri Mar 31 11:36:17 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
+
+	* Makefile.in: define empty GDB_NLM_DEPS var.
+
+	* configure.in(target_makefile_frag): use config/mt-netware
+	for netware targets.
+
+Thu Mar 30 13:51:43 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.sub: Merge in recent FSF changes.  Remove linux special
+	cases.
+
+Tue Mar 28 14:47:34 1995  Jason Molenda (crash@phydeaux.cygnus.com)
+
+	Revert this change:
+
+	Tue Mar 30 10:03:09 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+		* build-all.mk: Use CC=cc -Xs on Solaris.
+
+Tue Mar 21 10:43:32 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* glob/*: Removed.  Schauer's 24 Feb 1994 readline change made us
+	stop using it.
+	* Makefile.in: Nuke all references to glob subdirectory.
+
+Thu Mar 16 13:35:30 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* configure.in: Fix --enable-shared logic in per-host.
+
+Mon Mar 13 12:33:15 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in (*-hp-hpux[78]*): Use mh-hpux8.
+
+Mon Mar  6 10:21:58 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* configure.in (noconfigdirs): Don't build gas on AIX, for
+	powerpc*-*-aix* as well as for rs6000*-*-aix*.
+
+Wed Mar  1 12:51:53 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Fix --cache-file to work if the file argument is a
+	relative path.
+
+Tue Feb 28 17:36:07 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: If the --cache-file is used, pass it down to
+	configure in subdirectories.
+
+Mon Feb 27 12:52:46 1995  Kung Hsu  <kung@mexican.cygnus.com>
+
+	* config.sub: add vxworks29k configuration.
+
+Fri Feb 10 16:12:26 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* Makefile.in (taz): Do "diststuff" part quietly.
+
+Sun Feb  5 14:16:35 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* config.sub: Mini-merge with gcc/config.sub.
+
+Sat Feb  4 12:11:35 1995  Jim Wilson  <wilson@chestnut.cygnus.com>
+
+	* config.guess (IRIX): Sed - to _.
+
+Fri Feb  3 11:54:42 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* Makefile.in (source-vault, binary-vault): New targets.
+
+Thu Jan 26 13:00:11 1995  Michael Meissner  <meissner@cygnus.com>
+
+	* config.sub: Recognize -eabi as a basic system type.
+
+Thu Jan 12 13:13:23 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* configure.in (enable_shared stuff): Fix typo.
+
+Thu Jan 12 01:36:51 1995  deanm@medulla.LABS.TEK.COM (Dean Messing)
+
+	* Makefile.in (BASE_FLAGS_TO_PASS): Fix typo in passing LIBCXXFLAGS*.
+
+Wed Jan 11 16:29:53 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* Makefile.in (LIBCXXFLAGS_FOR_TARGET): Add -fno-implicit-templates.
+
+Mon Jan  9 12:48:01 1995  Jim Kingdon  <kingdon@lioth.cygnus.com>
+
+	* configure.in (rs6000-*-*): Don't build gas.
+
+Wed Jan  4 23:53:49 1995  Ian Lance Taylor  <ian@tweedledumb.cygnus.com>
+
+	* Makefile.in: Use /x/x/ instead of /brokensed/brokensed/, to
+	reduce command line length.
+	(AS_FOR_TARGET): Check for as.new, not Makefile.
+	(NM_FOR_TARGET): Check for nm.new, not Makefile.
+
+Wed Jan  4 13:02:39 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* config.guess:  Merge from FSF.
+
+Thu Dec 15 17:11:37 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* configure: Don't use $ when handling program_suffix.
+
+Mon Dec 12 12:09:37 1994  Stu Grossman  (grossman@cygnus.com)
+
+	* configure.in:  Configure tk for hppa/hpux.
+
+Fri Dec  2 15:55:38 1994  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* Makefile.in (LIBGXX_SUPPORT_DIRS):  Add libstdc++.
+
+Tue Nov 29 19:37:56 1994  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* Makefile.in:  Move -fno-implicit-template from CXXFLAGS
+	to LIBCXXFLAGS.  Tests are better run without it.
+
+Wed Nov 23 10:29:25 1994  Brendan Kehoe  (brendan@lisa.cygnus.com)
+
+	* Makefile.in (all-ispell): Depend on all-emacs19 instead of all-emacs.
+
+Mon Nov 21 11:14:01 1994  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* configure.in (*-*-netware*): Don't configure xiberty.
+
+Mon Nov 14 08:49:15 1994  Stu Grossman  (grossman@cygnus.com)
+
+	* configure.in:  Remove tk from native_only list.
+
+Fri Nov 11 15:31:26 1994  Bill Cox  (bill@rtl.cygnus.com)
+
+	* build-all.mk: Add mips-ncd-elf target to sun4 targets
+	  for special NCD build.
+
+Mon Nov  7 20:58:17 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* Makefile.in (DEVO_SUPPORT): Remove configure.bat and
+	makeall.bat, they're only useful for binutils snapshots.
+	(binutils.tar.gz, gas+binutils.tar.gz): Add configure.bat and
+	makeall.bat to specified SUPPORT_FILES.
+
+Mon Nov  7 17:25:18 1994  Bill Cox  (bill@cirdan.cygnus.com)
+
+	* build-all.mk: Add Ericsson targets to sun4 and solaris
+	  hosts.  Add  BNR's sun4 target to solaris host, so their
+	  build-from-source will be tested in-house first.
+
+Sat Nov  5 18:43:30 1994  Jason Merrill  (jason@phydeaux.cygnus.com)
+
+	* Makefile.in (LIBCFLAGS): New variable.
+	(CFLAGS_FOR_TARGET): Ditto.
+	(LIBCFLAGS_FOR_TARGET): Ditto.
+	(LIBCXXFLAGS): Ditto.
+	(CXXFLAGS_FOR_TARGET): Ditto.
+	(LIBCXXFLAGS_FOR_TARGET): Ditto.
+	(BASE_FLAGS_TO_PASS): Pass them.
+	(EXTRA_TARGET_FLAGS): Ditto.
+
+	* configure.in: Support --enable-shared.
+
+Sat Nov  5 15:44:00 1994  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* configure.in (target_libs):  Include libstdc++ again.
+	* config.guess:  Update from FSF (for FreeBSD).
+
+Thu Nov  3 16:32:30 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* Makefile.in (DEVO_SUPPORT): Include configure.bat and
+	makeall.bat.
+	(DISTDOCDIRS): Add `etc'.
+	(ETC_SUPPORT_PFX): New variable.
+	(taz): Include anything from etc starting with a word in
+	ETC_SUPPORT_PFX.
+
+Wed Oct 26 16:19:35 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* config.sub: Update for recent FSF changes.  Remove obsolete
+	h8300hds entry.  Add -windows* and -osx as basic os.  Minor
+	spacing changes.
+
+Thu Oct 20 18:41:56 1994  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* configure.in (target_libs):  Remove libstdc++ for libg++-2.6.1.
+
+	* config.guess:  Merge with FSF.
+	* configure.in:  Match on i?86-ncr-sysv4.3, not i?86-ncr-sysv43.
+
+Thu Oct 20 19:26:56 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* configure: Since the "trap 0" handler will override the exit
+	status on many systems, only use it for "exit 1", and make it set
+	a non-zero exit status; reset it before "exit 0".  Also, check
+	exit status of config.sub, and error out if it failed.
+
+Wed Oct 19 18:49:55 1994  Rob Savoye  (rob@cygnus.com)
+
+	* Makefile.in: (ALL_TARGET_MODULES,INSTALL_TARGET_MODULES) Build
+	and install libgloss.
+
+Tue Oct 18 15:25:24 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* Makefile.in (all-binutils): Depend upon all-byacc.
+
+	* configure.in: Don't build emacs on Irix 5.
+
+Mon Oct 17 16:22:12 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
+
+	* configure.in (*-*-netware*): Add libio.
+
+Thu Oct 13 15:51:20 1994  Jason Merrill  (jason@phydeaux.cygnus.com)
+
+	* Makefile.in (ALL_TARGET_MODULES): Add libstdc++.
+	(CHECK_TARGET_MODULES): Ditto.
+	(INSTALL_TARGET_MODULES): Ditto.
+	(TARGET_LIBS): Ditto.
+	(all-libstdc++): Note dependencies.
+
+Thu Oct 13 01:43:08 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* Makefile.in (BINUTILS_SUPPORT_DIRS): Add gas.
+
+Tue Oct 11 12:12:29 1994  Jason Merrill  (jason@phydeaux.cygnus.com)
+
+	* Makefile.in (CXXFLAGS): Use -fno-implicit-templates instead of
+	-fexternal-templates.
+
+	* configure.in (target_libs): Add libstdc++.
+	(noconfigdirs): Add libstdc++ as appropriate.
+
+Thu Oct  6 18:00:54 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* config.guess:  Update from FSF.
+
+Tue Oct  4 12:05:42 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* configure: Use ${config_shell} when running ${configsub}.
+
+Mon Oct  3 14:28:34 1994  Doug Evans  <dje@canuck.cygnus.com>
+
+	* config.sub: No longer recognize h8300h.
+
+Mon Oct  3 12:40:54 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* config.sub: Remove extraneous differences between config.sub and
+	gcc/config.sub.
+
+Sat Oct  1 00:23:12 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* Makefile.in (DISTSTUFFDIRS): Add gas.
+
+Thu Sep 22 19:04:55 1994  Doug Evans  (dje@canuck.cygnus.com)
+
+	* COPYING.NEWLIB: New file.
+
+Mon Sep 19 18:25:40 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* config.guess (HP-UX):  Patch from Harlan Stenn
+	<harlan@landmark.com> to also emit release level.
+
+Wed Sep  7 13:15:25 1994  Jim Wilson  (wilson@sphagnum.cygnus.com)
+
+	* config.guess (sun4*:SunOS:*:*): Change '-JL' to '_JL'.
+
+Tue Sep  6 23:23:18 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* config.sub:  Merge nextstep cleanup from FSF.
+
+Mon Sep  5 05:01:30 1994  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+	* configure.in (arm-*-*): Don't configure ld for this target.
+
+Thu Sep  1 09:35:00 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
+
+	* configure.in (*-*-netware): don't configure libg++, libio,
+	  librx, or newlib.
+
+Wed Aug 31 13:52:08 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* configure.in (alpha-dec-osf*): Use osf*, not osf1*.  Don't
+	configure ld--it works, but it doesn't support shared libraries.
+
+Sun Aug 28 18:13:45 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* config.guess (*-unknown-freebsd*):  Get rid of possible
+	trailing "(Release)" in version string.
+	Patch from Paul Richards <paul@isl.cf.ac.uk>.
+
+Sat Aug 27 15:00:49 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* config.guess:  Fix i486-ncr-sysv43 -> i486-ncr-sysv4.3.
+	Fix type: *-next-neststep -> *-next-nextstep.
+
+	* config.guess:  Merge from FSF:
+
+	Fri Aug 26 18:45:25 1994  Philippe De Muyter (phdm@info.ucl.ac.be)
+
+	* config.guess: Recognize powerpc-ibm-aix3.2.5.
+
+	Wed Apr 20 06:36:32 1994  Philippe De Muyter  (phdm@info.ucl.ac.be)
+
+	* config.guess: Recognize UnixWare 1.1 (UNAME_SYSTEM is SYSTEM_V
+	instead of UNIX_SV for UnixWare 1.0).
+
+Sat Aug 27 01:56:30 1994  Stu Grossman  (grossman@cygnus.com)
+
+	* Makefile.in (all-gdb):  Add dependencies on all-gcc and all-ld
+	to make gdb/nlm/* build after the compiler and linker.
+
+Fri Aug 26 14:30:05 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* config.guess (netbsd, freebsd, linux):  Accept any machine,
+	not just i[34]86.
+	(m68k-atari-sysv4):  Relocate to match FSF version.
+
+	* config.guess:  More merges from the FSF:
+
+	Add a space before function call or macro invocation.
+
+	Tue May 10 16:53:55 1994  Roland McGrath (roland@churchy.gnu.ai.mit.edu)
+
+	* config.guess: Add trap cmd to remove dummy.c and dummy when
+	interrupted.
+
+	Wed Apr 20 18:07:13 1994  Roland McGrath (roland@churchy.gnu.ai.mit.edu)
+
+	* config.guess (dummy.c): Redirect stderr for `hostinfo' command.
+	(dummy): Redirect stderr from compilation of dummy.c.
+
+	Sat Apr  9 14:59:28 1994  Christian Kranz  (kranz@sent5.uni-duisburg.de)
+
+	* config.guess: Distinguish between NeXTStep 2.1 and 3.x.
+
+Fri Aug 26 13:42:20 1994  Ken Raeburn  (raeburn@kr-laptop.cygnus.com)
+
+	* configure: Accept and ignore --cache*, for compatibility with
+	new autoconf.
+
+Fri Aug 26 13:05:27 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* config.guess:  Merge from FSF:
+
+	Thu Aug 25 20:28:51 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* config.guess (Pyramid*:OSx*:*:*): New case.
+	(PATH): Add /.attbin at end for finding uname.
+	(dummy.c): Handle i860-alliant-bsd.  Follow whitespace conventions.
+
+	Wed Aug 17 18:21:02 1994  Tor Egge  (tegge@pvv.unit.no)
+
+	* config.guess (M88*:DolphinOS:*:*): New case.
+
+	Thu Aug 11 17:00:13 1994  Stan Cox  (coxs@dg-rtp.dg.com)
+
+	* config.guess (AViiON:dgux:*:*): Use TARGET_BINARY_INTERFACE
+	to select whether to use ELF or COFF.
+
+	Sun Jul 24 16:20:53 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* config.guess: Recognize i860-stardent-sysv and i860-unknown-sysv.
+
+	Sun May  1 10:23:10 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* config.guess: Guess the OS version for HPUX.
+
+	Tue Mar  1 21:53:03 1994  Karl Heuer  (kwzh@hal.gnu.ai.mit.edu)
+
+	* config.guess (UNAME_VERSION): Recognize aix3.2.4 and aix3.2.5.
+
+Fri Aug 26 11:19:08 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* configure.in: Recognize --with-headers, --with-libs, and
+	--without-newlib.
+	* Makefile.in (all-xiberty): Depend upon all-ld.
+
+Wed Aug 24 12:36:50 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* configure.in: Change i[34]86 to i[345]86.
+
+Mon Aug 22 10:58:33 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* configure (version): A few more tweaks to help message.
+
+Fri Aug 19 12:40:25 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* Makefile.in:  Remove (for now) librx as a host library,
+	now that we're building it for target.
+
+Fri Aug 19 10:49:17 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* configure: Fix up help message; from karl@owl.hq.ileaf.com
+	(Karl Berry).
+
+Tue Aug 16 16:11:08 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* configure.in:  Also configure librx.
+
+Mon Aug 15 16:51:45 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* Makefile.in:  Update various rules to reflect that librx
+	is now needed for libg++.
+
+Fri Aug 12 18:07:21 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* config.sub: Accept mips64orion and mips64orionel as a CPU name.
+
+Mon Aug  8 11:36:17 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* configure.in: Configure the examples directory.
+
+Thu Aug  4 16:12:36 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* configure: Simplify Jun 2 1994 change.
+
+Wed Aug  3 04:58:16 1994  D. V. Henkel-Wallace  (gumby@cygnus.com)
+
+	* change CC to /usr/latest/bin/gcc for lynx host builds, since
+	/bin/gcc isn't good enough to build gcc.
+
+Wed Jul 27 09:07:14 1994  Fred Fish  (fnf@cygnus.com)
+
+	* Makefile.in (GDB_SUPPORT_FILES): Remove
+	(setup-dirs-gdb, gdb.tar.gz, make-gdb.tar.gz):  Remove old rules.
+	(gdb.tar.gz): Add new rule to use standard distribution building
+	mechanism.
+
+Mon Jul 25 11:10:06 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* configure.in: Warn about use of /usr/ucb/cc on Solaris.  From
+	Bill Cox <bill@cygnus.com>.
+
+Sat Jul 23 12:19:46 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* config.guess:  Recognize ISC.  Patch from kwzh@gnu.ai.mit.edu.
+
+Fri Jul 22 17:53:59 1994  Stu Grossman  (grossman@cygnus.com)
+
+	* configure:  Search current dir first in .gdbinit.
+
+Fri Jul 22 11:28:30 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* config.sub:  Recognize freebsd (merged from gcc config.sub).
+
+Thu Jul 21 14:10:52 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* config.sub:  Refer to NeXT's operating system as nextstep.
+
+	* config.sub (case $basic_machine):  Re-order the cases, to match
+	the order in the FSF version (which is mostly alphabethical).
+	Merge in some additions and changes from the FSF.
+
+Sat Jul 16 12:03:08 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* config.guess: Recognize m68k-atari-sysv4 and m88k-harris-csux7.
+	* config.sub: Recognize cxux7.
+	* configure.in: Use mh-cxux for m88k-harris-cxux*.
+
+Mon Jul 11 14:37:39 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* config.sub:  Fix typo powerpc -> powerpc-*.
+
+Sat Jul  9 13:03:43 1994  Michael Tiemann  (tiemann@blues.cygnus.com)
+
+	* Makefile.in: `all-emacs19' depends on `all-byacc'.
+
+	* Makefile.in: Add all-emacs19 and install-emacs19 rules (in
+	parallel with all-emacs and install-emacs).  Top-level command
+	`make all-emacs19 CC=gcc' now behaves as `make all-emacs CC=gcc'.
+
+Thu Jun 30 16:53:42 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* test-build.mk ($(host)-stamp-stage2-installed): Remove
+	$(relbindir)/make before doing ``make install'', and use
+	$(GNU_MAKE) while doing it.  Avoids problem on SunOS with
+	installing over running make binary.
+	($(host)-stamp-stage3-installed): Likewise.
+
+Tue Jun 28 13:43:25 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config.guess: Recognize Mach.
+
+Mon Jun 27 16:41:14 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* configure: Check ${exec_prefixoption}, not ${exec_prefix}, to
+	see whether --exec-prefix was used.
+
+Sun Jun 26 21:15:54 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* README:  Explicitly mention libg++/README.  (Zoo's idea.)
+
+Tue Jun 21 12:45:55 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* Makefile.in: Add all-librx target similar to all-libproc.
+
+Wed Jun  8 23:11:55 1994  Stu Grossman  (grossman@cygnus.com)
+
+	* config.guess:  Rearrange tests for Alpha-OSF1 to properly deal
+	with post 1.2 uname bogosity.
+
+Thu Jun  9 00:27:59 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* configure: Remove temporary files on receipt of a signal.
+
+Tue Jun  7 12:06:24 1994  Ian Lance Taylor  (ian@cygnus.com)
+
+	* configure: If there is a package_makefile_frag, remove
+	${subdir}/Makefile.tem after copying it in.
+
+Mon Jun  6 21:35:02 1994  D. V. Henkel-Wallace  (gumby@cygnus.com)
+
+	* build_all.mk: support rs6000 lynx identifies itself as
+	rs6000-lynx-lynxos2.2.2.  Also, use /usr/cygnus/progressive/bin/gcc
+	since /bin/gcc is too feeble to compile a modern gcc.
+
+Mon Jun  6 16:06:34 1994  Karen Christiansen (karen@cirdan.cygnus.com)
+
+	* brought devo/test-build.mk update-to-date with progressive/
+	  test-build.mk. Add lynx targets and hppa flag info.
+
+Sat Jun  4 17:23:54 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* configure.in:  Use mh-ncrsvr43.  Patch from
+	Tom McConnell <tmcconne@sedona.intel.com>.
+
+Fri Jun  3 17:47:24 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* config.guess (i386-unknown-bsdi):  No longer need to
+	check #if defined(__bsdi__) && defined(__i386__).
+
+Thu Jun  2 18:56:46 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* configure: Set program_transform_nameoption correctly.
+
+Thu Jun  2 10:57:06 1994  Karen Christiansen (karen@cirdan.cygnus.com)
+
+	* brought build-all.mk update-to-date with progressive build-all.mk,
+	  added new targets and hppa info.
+
+Thu Jun  2 00:12:44 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* configure: If config.guess result is a prefix of the user
+	specified target, assume a native build and use the user specified
+	target as the host alias.  Remove SunOS patch suffix removal hack.
+	* configure.in: Remove SunOS patch suffix removal hack.
+
+	* Makefile.in (CROSS_CHECK_MODULES): Remove check-flex, since it's
+	in NATIVE_CHECK_MODULES.
+
+Wed Jun  1 10:49:41 1994  Bill Cox  (bill@rtl.cygnus.com)
+
+	* Makefile.in: Rename HOST_ONLY to NATIVE.
+	* configure: Delete SunOs patch suffix from host_canonical
+	  and build_canonical variables that are prepended to Makefiles.
+	* configure.in: Add comments for easier maintenance.
+
+Tue May 31 19:39:47 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* Makefile.in: Add all-libproc target similar to all-gui.
+
+Tue May 31 17:16:33 1994  Tom Lord  (lord@cygnus.com)
+
+	* Makefile.in (CHECK_MODULES): split into
+	HOST_ONLY_CHECK_MODULES and CROSS_CHECK_MODULES.
+
+Tue May 31 16:36:36 1994  Paul Eggert  (eggert@twinsun.com)
+
+	* config.guess (i386-unknown-bsdi): New system to guess.
+
+Wed May 25 16:47:10 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* Makefile.in: Add all-gui target (but not yet build by "all").
+
+Thu May 26 08:53:19 1994  Bill Cox  (bill@rtl.cygnus.com)
+
+	* config.sub: Move deletion of patch suffix from here...
+	* configure.in: To here, at Ian's suggestion.  The top-
+	  level scripts might need to know of a patch level.
+
+Wed May 25 09:15:54 1994  Bill Cox  (bill@rtl.cygnus.com)
+
+	* config.sub: Strip off patch suffix so rtl is recognized
+	  as a sunos4.1.3 machine, even though it's been patched.
+
+Fri May 20 08:25:49 1994  Steve Chamberlain  (sac@deneb.cygnus.com)
+
+	* Makefile.in (INSTALL_LAST): Delete.
+	(INSTALL_DOSREL): New.
+
+Thu May 19 17:12:12 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* configure.in: Use ld for i[34]86-*-sysv4* and sparc-*-solaris2*.
+	Don't set use_gnu_ld to no for *-*-sysv4; that only controls
+	whether we pass down --with-gnu-ld anyhow.
+
+Thu May 19 09:29:12 1994  Steve Chamberlain  (sac@cygnus.com)
+
+	* Makefile.in (INSTALL_LAST): Change operation so it works
+	on more flavors of make.
+	* configure.in (go32): Don't build libg++ or libio.
+
+Fri May 13 13:28:34 1994  Steve Chamberlain  (sac@cygnus.com)
+
+	* Makefile.in (Move HOST_PREFIX_1 and friends up so
+	they can be overriden by templates.
+
+Sat May  7 16:46:44 1994  Steve Chamberlain  (sac@cygnus.com)
+
+	* configure.in (target==go32): Don't build gdb.
+	* dosrel: New directory.
+
+Fri May  6 14:19:25 1994  Steve Chamberlain  (sac@cygnus.com)
+
+	* configure.in (host==go32): Configure dosrel too.
+	* Makefile.in (INTALL_TARGET): Call INSTALL_LAST last.
+	(HOST_CC, HOST_PREFIX, HOST_PREFIX_1): Undefine, they should
+	be set by incoming names or templates.
+	(INSTALL_LAST): New rule.
+
+Thu May  5 17:35:05 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* config.sub (sparclitefrw, sparclitefrwcompat): Don't set the os.
+
+Thu May  5 20:06:45 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* configure.in (appdirs): New variable.  Currently empty, but will
+	be used in gas distribution.  If nonempty, lists a set of
+	directories at least one of which must get configured, or top
+	level configuration is considered to have failed.
+	(rs6000-*-lynxos*): Use new file name.
+
+Thu May  5 13:38:36 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Eliminate XTRAFLAGS.
+	* Makefile.in (CC_FOR_TARGET): If newlib exists, refer to the
+	newlib include files using -idirafter, and also use -nostdinc.
+	(CXX_FOR_TARGET): Likewise.
+	(XTRAFLAGS): Removed.
+	(BASE_FLAGS_TO_PASS): Remove XTRAFLAGS_FOR_TARGET.
+	(EXTRA_HOST_FLAGS): Remove XTRAFLAGS.
+	(EXTRA_TARGET_FLAGS, EXTRA_GCC_FLAGS): Likewise.
+	($(DO_X)): Don't pass down XTRAFLAGS.
+
+Thu May  5 00:16:36 1994  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+	* configure.in (mips*-dec-bsd*): New target; do build linker.
+	(mips*-*-bsd*): New target; don't build linker.
+
+Wed May  4 20:10:10 1994  D. V. Henkel-Wallace  (gumby@cygnus.com)
+
+	* configure.in: support rs6000-*-lynxos* configuration.
+	support sunos4 as a cross target.
+
+	* config.sub: look for lynx*, not lynx since the OS version may
+	legitimately be part of the name.
+
+Tue May  3 21:48:11 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* configure.in (i[34]86-*-sco*): Move to be with other i386
+	targets.
+	(romp-*-*): New target.  Skip various binary utilities.
+	(vax-*-*): New target.  Don't build newlib.
+	(vax-*-vms): Renamed from *-*-vms.  Don't build opcodes or newlib.
+
+Thu Apr 28 15:03:05 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+	* configure.in: Only set host_makefile_frag if config
+	directory exists.
+
+Wed Apr 27 12:14:30 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+	* install.sh: If $dstdir exists, don't check whether each
+	component does.
+
+Tue Apr 26 18:11:33 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* test-build.mk (HOLES): Add sleep; used by rcs/src/conf.sh.
+
+Mon Apr 25 15:06:34 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* configure.in (*-*-lynxos*): Don't configure newlib for either
+	native or cross Lynx.
+
+Sat Apr 16 11:58:16 1994  Doug Evans  (dje@canuck.cygnus.com)
+
+	* config.sub (sparc64-elf): Fix os.
+	(z8k): Remove duplicate.
+
+Thu Apr 14 23:33:17 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* Makefile.in (gcc-no-fixedincludes): Touch gcc/include/fixed, not
+	gcc/stmp-fixproto, to try to prevent fixproto from being run.
+
+Wed Apr 13 15:14:52 1994  Bill Cox  (bill@cygnus.com)
+
+	* configure: Make file links cleanly even if Lynx fails on
+	  an NFS symlink (at least fail cleanly).
+
+Mon Apr 11 10:58:56 1994  Jim Wilson  (wilson@sphagnum.cygnus.com)
+
+	* test-build.mk (CC): For mips-sgi-irix4, change -XNh1500 to
+	-XNh2000.
+
+Sat Apr  9 15:10:45 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+	* configure: Unknown options are fatal again.
+
+Fri Apr  8 12:01:41 1994  David J. Mackenzie  (djm@cygnus.com)
+
+	* configure: Ignore --x-includes and --x-libraries, for Autoconf
+	compatibility.
+
+Thu Apr  7 17:31:43 1994  Doug Evans  (dje@canuck.cygnus.com)
+
+	* build-all.mk: Add `clean' target.
+
+Wed Apr  6 20:44:56 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* config.guess:  Add SINIX support.
+	* configure.in:  Add mips-*-sysv4* support.
+
+Mon Apr  4 17:41:44 1994  Doug Evans  (dje@canuck.cygnus.com)
+
+	* build-all.mk: Document all useful targets.
+	If canonhost is sparc-sun-solaris2.3, change it to sparc-sun-solaris2.
+	If canonhost is mips-sgi-irix4.0.5H, change it to mips-sgi-irix4.
+
+Thu Mar 31 04:55:57 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+	* configure: Support --silent, --quiet.
+
+Wed Mar 30 21:37:38 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+	* configure: Support --disable-FEATURE.
+
+Tue Mar 29 19:15:05 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config.guess: Recognize NCR running SVR4.3.
+
+Mon Mar 28 14:55:15 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* config.guess:  Make BSDI generate i386-unknown-bsd386.
+	Patch from Paul Eggert <eggert@twinsun.com>.
+
+Mon Mar 28 12:54:52 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* configure.in (powerpc-*-aix*): Treat like rs6000-*-*.
+
+Sat Mar 26 11:25:48 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+	* configure: Make unrecognized options give nonfatal warnings
+	instead of fatal errors, and pass them to any subdirectory
+	configures in case they recognize them.
+	Make --x equivalent to --with-x.
+
+Fri Mar 25 21:52:10 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+	* configure: Add --enable-* options.  Clean up usage message and
+	some comments.
+
+Thu Mar 24 09:12:53 1994  Doug Evans  (dje@canuck.cygnus.com)
+
+	* Makefile.in (NM_FOR_TARGET): Build tree version is now nm.new.
+
+Sun Mar 20 11:28:22 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* configure.in (hppa*-*-*): Enable binutils.
+
+Sat Mar 19 11:50:16 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config.sub: Recognize cisco.
+
+Fri Mar 18 16:42:32 1994  Jason Merrill  (jason@deneb.cygnus.com)
+
+	* Makefile.in (CXXFLAGS): Add -fexternal-templates.
+
+Tue Mar 15 11:25:55 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config.guess: about target *-hitachi-hiuxwe2, don't print more
+	than one configuration name.  Add comment.
+
+Sun Mar  6 23:13:38 1994  Hisashi MINAMINO  (minamino@sra.co.jp)
+
+	* config.guess: about target *-hitachi-hiuxwe2, fixed
+	machine guessing order.  [Hitachi's CPU_IS_HP_MC68K
+	macro is incorrect.]
+
+Sun Mar 13 09:10:08 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* Makefile.in (TAGS): Just build TAGS in each subdirectory, rather
+	than the "make ls" stuff which used to be here.
+
+Fri Mar 11 12:52:39 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* config.guess:  Recognize i[34]86-unknown-freebsd.
+	From Shawn M Carey <smcarey@rodan.syr.edu>.
+
+Thu Mar  3 14:24:21 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* configure.in (noconfigdirs for alpha): Remove libg++ and libio.
+
+Wed Mar  2 13:28:48 1994  Jim Kingdon  (kingdon@deneb.cygnus.com)
+
+	* config.guess: Check for ptx.
+
+Mon Feb 28 16:46:50 1994  Kung Hsu  (kung@mexican.cygnus.com)
+
+	* config.sub: Add os9k checking.
+
+Thu Feb 24 07:09:04 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* config.guess: Handle OSF1 running on HPPA processors
+
+Fri Feb 18 14:14:00 1994  Ken Raeburn  (raeburn@rtl.cygnus.com)
+
+	* configure: If subdir configure fails, print out a message with
+	subdirectory name, in case subdir's configure code didn't identify
+	itself.
+
+Fri Feb 18 12:50:15 1994  Doug Evans  (dje@cygnus.com)
+
+	* configure.in: Remove embedded newlines from configdirs.
+	Avoid mismatches of substrings.  Fix matching strings at end
+	of configdirs.
+
+Fri Feb 11 15:33:33 1994  Stu Grossman  (grossman at cygnus.com)
+
+	* config.guess:  Add Lynx/rs6000 config support.
+
+Tue Feb  8 13:41:09 1994  Ken Raeburn  (raeburn@rtl.cygnus.com)
+
+	* configure.in (alpha-dec-osf1*, alpha*-*-*): Build gas.
+
+Mon Feb  7 15:42:36 1994  Jeffrey A. Law  (law@cygnus.com)
+
+	* configure.in (hppa*-*-osf*): Treat this just like most other
+	PA configurations (eg no binutils or ld).
+	(hppa*-*-*elf*): These configurations have binutils and ld.
+
+Sun Feb  6 16:35:07 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* config.sub (hiux): Fix typo.  From m-kasahr@sramhc.sra.co.JP.
+
+Sat Feb  5 01:00:33 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* configure.in (rs6000-*-*): Build gas.
+
+Wed Feb  2 13:57:57 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* Makefile.in:  Avoid bug in losing hpux sed.
+
+Wed Feb  2 14:53:05 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* Makefile.in, test-build.mk: Remove MUNCH_NM; it was only needed
+	for GDB and GDB has been fixed to not need it.
+
+Sun Jan 30 17:58:06 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* config.guess: Recognize vax hosts.
+
+Fri Jan 28 15:29:38 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* configure (while loop): Don't use "break 2" inside case
+	statement -- the case statement isn't an enclosing loop.
+
+Mon Jan 24 18:40:06 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* config.guess:  Clean up NeXT support, to allow nextstep
+	on Intel machines.  Make OS be nextstep.
+
+Sun Jan 23 18:47:22 1994  Richard Kenner  (kenner@vlsi1.ultra.nyu.edu)
+
+	* config.guess: Add alternate forms for Convex.
+
+Thu Jan 20 16:13:41 1994  Stu Grossman  (grossman at cygnus.com)
+
+	* configure:  Completely rewrite option processing.  Take
+	advantage of pattern-matching to avoid invoking test frequently.
+	Also clean up host and target defaulting logic.
+
+Mon Jan 17 15:06:56 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* Makefile.in: Replace all occurrances of "rootme" with "r" and
+	"$${rootme}" with "$$r", to increase the likelihood that the do-*
+	commands (plus user environment) will fit SCO limits.
+
+Thu Jan  6 11:20:57 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* configure.in: Don't issue warnings about directories which are
+	not being configured if -norecursion is set.  Correct test for
+	--with-gnu-as and --with-gnu-ld to not get confused by substring
+	matches.
+
+	* configure.in: Don't build gas for alpha-dec-osf1*.
+
+Tue Jan  4 17:10:19 1994  Stu Grossman  (grossman at cygnus.com)
+
+	* configure:  Back out Per's change of 12/19/1993.  It changes the
+	behavior of configure in unexpected and confusing ways.
+
+	Also, use different delim char when calculating
+	program_transform_name so that the name can contain slashes.
+
+Sat Jan  1 13:45:31 1994  Rob Savoye  (rob@darkstar.cygnus.com)
+
+	* configure.in, config.sub: Add support for VSTa micro-kernel.
+
+Sat Dec 25 20:00:47 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* configure.in: Nuke hacks which were used to get a special
+	version of GAS for HPPA configurations.
+
+Sun Dec 19 20:40:44 1993  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* configure:  If only ${target_alias} is given, use that
+	as the default for ${host_alias}.
+	* configure:  Add missing back-slashes before nested quotes.
+
+Wed Dec 15 18:07:18 1993  david d `zoo' zuhn  (zoo@andros.cygnus.com)
+
+	* Makefile.in (BASE_FLAGS_TO_PASS): add YACC=$(BISON)
+
+Tue Dec 14 21:25:33 1993  Per Bothner  (bothner@cygnus.com)
+
+	* config.guess:  Recognize some Tektronix configurations.
+	From Kaveh R. Ghazi <ghazi@noc.rutgers.edu>.
+
+Sat Dec 11 11:18:00 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* config.sub: Match any flavor of SH.
+
+Thu Dec  2 17:16:58 1993  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* configure.in: Don't try to configure newlib for Alpha.
+
+Thu Dec  2 14:35:54 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* configure.in: Don't build ld for Irix 5.  Don't build gas,
+	libg++ or libio for any Alpha target.
+
+	* configure.in (mips*-sgi-irix5*): New target; use mh-irix5.
+
+Wed Dec  1 17:00:33 1993  Jason Merrill  (jason@deneb.cygnus.com)
+
+	* Makefile.in (GZIPPROG): Renamed from GZIP, which gzip uses for
+	default arguments -- so it tried to compress itself.
+
+Tue Nov 30 13:45:15 1993  david d `zoo' zuhn  (zoo@andros.cygnus.com)
+
+	* configure.in (notsupp): ensure that a space is always at the end
+	  of the configdirs list, since the grep checks for an explicit space
+
+Tue Nov 16 15:04:27 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* configure.in (target i386-sysv4.2): don't build ld, since static
+	  versions of many libraries are not available.
+
+Tue Nov 16 14:28:12 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config.guess: Recognize Apollos (using environment variables).
+	* configure.in: Don't configure ld, binutils, or gprof for Apollo.
+
+Thu Nov 11 12:03:50 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config.guess: Recognize Sony news mips running newsos.
+
+Wed Nov 10 16:57:00 1993  Mark Eichin  (eichin@cygnus.com)
+
+	* Makefile.in (all-cygnus, build-cygnus): "fi else" needs to be
+	"fi ; else" for bash.
+
+Tue Nov  9 15:54:01 1993  Mark Eichin  (eichin@cygnus.com)
+
+	* Makefile.in (BASE_FLAGS_TO_PASS): pass SHELL.
+
+Fri Nov  5 08:07:27 1993  D. V. Henkel-Wallace  (gumby@blues.cygnus.com)
+
+	* config.sub: accept unixware as an alias for svr4.2.
+	Fix some inconsistancies with the gcc version.
+
+Fri Nov  5 15:14:12 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* Makefile.in (DISTDOCDIRS):  Add gdb.
+
+Fri Nov  5 11:59:42 1993  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* Makefile.in (DISTDOCDIRS):  Add libg++ and libio.
+
+Fri Nov  5 10:35:05 1993  Ken Raeburn  (raeburn@rover.cygnus.com)
+
+	* Makefile.in (taz): Only build "info" in DISTDOCDIRS.
+	(DISTDOCDIRS): Don't assume libg++ and gdb folks necessarily want
+	this now.
+
+Thu Nov  4 18:58:23 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config.sub: Accept hiux* as an OS name.
+
+	* Makefile.in: Change RUNTEST_FLAGS back to RUNTESTFLAGS per
+	etc/make-stds.texi.  The underscore came from gcc, and dje now
+	agrees that RUNTESTFLAGS is the correct name.
+
+Thu Nov  4 10:49:01 1993  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* install.sh:  Remove 'set -e'.  It makes any conditionals
+	in the script useless.
+
+	* config.guess: Automatically recognize arm-acorn-riscix
+	Patch from Richard Earnshaw (rwe11@cl.cam.ac.uk).
+
+Thu Nov 04 08:08:04 1993  Jeffrey Wheat  (cassidy@cygnus.com)
+
+	* Makefile.in: Change RUNTESTFLAGS to RUNTEST_FLAGS
+
+Wed Nov  3 22:09:46 1993  Ken Raeburn  (raeburn@rtl.cygnus.com)
+
+	* Makefile.in (DISTDOCDIRS): New variable.
+	(taz): Edit local Makefile.in sooner, instead of proto-toplev
+	Makefile.in later.  Build "info" and "dvi" in DISTDOCDIRS.
+
+Wed Nov  3 21:31:52 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* configure.in (hppa target): check the source directory for the
+	  pagas sub-directory
+
+Wed Nov  3 11:12:22 1993  Doug Evans  (dje@canuck.cygnus.com)
+
+	* config.sub: Allow -aout* and -elf*.
+
+Wed Nov  3 11:08:33 1993  Ken Raeburn  (raeburn@rtl.cygnus.com)
+
+	* configure.in: Don't build ld on i386-solaris2, same as for
+	sparc-solaris2.
+
+Tue Nov  2 14:21:25 1993  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* Makefile.in (taz): Add texinfo/lgpl.texinfo (for libg++).
+
+Tue Nov  2 13:38:30 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* configure.in:  Configure gdb for alpha.
+
+Mon Nov  1 10:42:54 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* Makefile.in (CXXFLAGS): Add -O.
+
+Wed Oct 27 10:45:06 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* config.guess: added support for DG Aviion
+
+Tue Oct 26 14:37:37 1993  Ken Raeburn  (raeburn@rover.cygnus.com)
+
+	* configure.in: Produce warning message for subdirectories not
+	configurable for this host/target combination.  Don't try to
+	configure gdb for vms.
+
+Mon Oct 25 11:22:15 1993  Ken Raeburn  (raeburn@rover.cygnus.com)
+
+	* Makefile.in (taz): Replace "byacc" with "bison -y" in the
+	appropriate files before making "diststuff".
+	(DISTBISONFILES): New var: list of files to be edited.
+	(DISTSTUFFDIRS): Add binutils.
+
+Fri Oct 22 20:32:15 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* config.sub: also handle mipsel and mips64el (for little endian mips)
+
+Fri Oct 22 07:59:20 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* configure.in: Add * to end of all OS names.
+
+Thu Oct 21 11:38:28 1993  Stan Shebs  (shebs@rtl.cygnus.com)
+
+	* configure.in: Build newlib for LynxOS native.
+
+Wed Oct 20 09:56:12 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config.guess: Add support for delta 88k running SVR3.
+
+	* configure.in: Add comment about HP compiler vs. emacs.
+
+Tue Oct 19 16:02:22 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* configure.in: don't build ld on solaris2 (not a viable option
+	  due to bugs in getpwnam & getpwuid)
+
+Tue Oct 19 15:13:56 1993  Ken Raeburn  (raeburn@rtl.cygnus.com)
+
+	* configure.in: Accept alpha-dec-osf1*, not just -osf1, since
+	config.guess will produce a full version number.
+
+Tue Oct 19 15:58:01 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* configure.in: Build linker and binutils for alpha-dec-osf1.
+
+Tue Oct 19 11:41:55 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* Makefile.in: Remove -O from CXXFLAGS for consistency with CFLAGS,
+	and gdb/testsuite/Makefile.in.
+
+Sat Oct  9 18:39:07 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* configure.in: recognize mips*- instead of mips-
+
+Fri Oct  8 14:15:39 1993  Ken Raeburn  (raeburn@cygnus.com)
+
+	* config.sub: Accept linux*coff and linux*elf as operating
+	systems.
+
+Thu Oct  7 12:57:19 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* config.sub: Recognize mips64, and mips3 as an alias for it.
+
+Wed Oct  6 13:54:21 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* configure.in: Remove alpha-dec-osf*, no longer necessary now that
+	gdb knows how to handle OSF/1 shared libraries.
+
+Tue Oct  5 11:55:04 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* configure.in: Recognize hppa*-*-hiux* (currently synonym for hpux).
+	* config.guess: Recognize Hitachi's HIUX.
+	* config.sub: Recognize h3050r* and hppahitachi.
+	Remove redundant cases for hp9k[23]*.
+
+Mon Oct  4 16:15:09 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* configure.in: default to '--with-gnu-as' and '--with-gnu-ld'
+	if gas and ld are in the source tree and are in ${configdirs}.
+	If ${use_gnu_as} or ${use_gnu_ld} are 'no', then don't set the
+	--with options (but still pass them down on the command line,
+	if they were explicitly specified).
+
+Fri Sep 24 19:11:13 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* configure: substitute SHELL value in Makefile.in with
+	${CONFIG_SHELL}
+
+Thu Sep 23 18:05:13 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* configure.in: Build gas, ld, and binutils for *-*-sysv4* and
+	*-*-solaris2* targets.
+
+Sun Sep 19 17:01:41 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* Makefile.in: define M4, and pass it down to sub-makes;
+	all-autoconf now depends on all-m4
+
+Sat Sep 18 00:38:23 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* Makefile.in ({AR,RANLIB}_FOR_TARGET): make contingent on
+	presence of {ar,ranlib} instead of a configured directory
+
+Wed Sep 15 08:41:44 1993  Jim Kingdon  (kingdon@cirdan.cygnus.com)
+
+	* config.guess: Accept 34?? as well as 33?? for NCR.
+
+Mon Sep 13 12:28:43 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* configure.in: grab mt-hppa for HPPA targets; use 'gas ' instead
+	of 'gas' in sed commands, since 'gash' is now in the tree as well.
+
+Fri Sep 10 11:23:52 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* configure: grab values for $(CC) and $(CXX) from the
+	environment, so that someone can do "CC=gcc configure; make" and
+	have it work right (matching the way that autoconf works now)
+
+	* configure.in, Makefile.in: add support for gash, the tcl
+	interface to Galaxy
+
+	* config.guess: add NetBSD variants (hp300, x86)
+
+Thu Sep  9 16:48:52 1993  Jason Merrill  (jason@deneb.cygnus.com)
+
+	* install.sh: Support -d option (in the manner of SunOS 4 install,
+	as it is more deterministic than that of GNU install)
+	(chmodcmd): Set file to mode 755 by default (should also do default
+	chgrp and chown, but I don't feel like dealing with that now)
+
+Tue Sep  7 11:59:39 1993  Doug Evans  (dje@canuck.cygnus.com)
+
+	* config.sub: Remove h8300hhms alias.
+
+Tue Aug 31 11:00:09 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* configure.in: Match *-*-solaris2* not *-sun-solaris2*.
+
+Mon Aug 30 18:29:10 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* Makefile.in (gcc-no-fixedincludes): touch stmp-fixproto as well
+	as stmp-fixinc
+
+Wed Aug 25 16:35:59 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
+
+	* config.sub: recognize m88110-bug-coff.
+
+Tue Aug 24 10:23:24 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* Makefile.in (all-libio): all dependencies on the toolchain used
+	to build this (gcc, gas, ld, etc)
+
+Fri Aug 20 17:24:24 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config.guess: Deal with OSF/1 1.3 on alpha.
+
+Thu Aug 19 11:43:04 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* install.sh: add some 'else true' clauses for portability
+
+	* configure.in: don't build libio for h8[35]00-*-* targets
+
+Tue Aug 17 19:02:31 1993  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* Makefile.in:  Add support for new libio.
+
+Sun Aug 15 20:48:55 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* install.sh: If one command fails, don't try the rest.  Don't try
+	to remove $dsttmp (via trap) unless we have already created it.
+	If $src doesn't exist, detect it and exit with an error.
+
+	* config.guess: Recognize BSD on hp300.
+
+Wed Aug 11 18:35:13 1993  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* config.guess:  Map (9000/[34]??:HP-UX:*:*) to m68k-hp-hpux.
+	Bug report from "Hamish (H.I.) Macdonald" <hamish@bnr.ca>.
+
+Wed Aug 11 15:37:51 1993  Jason Merrill  (jason@deneb.cygnus.com)
+
+	* Makefile.in (all-send-pr): depends on all-prms
+
+Wed Aug 11 16:56:03 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config.guess: Fix typo (9000/8??:4.3bsd -> 9000/7??:4.3bsd).
+
+Fri Aug  6 14:45:02 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* config.guess: From michael@mercury.cs.mun.ca (Michael Rendell):
+	Added test for mips-mips-riscos5.
+
+Thu Aug  5 15:45:08 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* configure.in: use mh-hp300 for 68k HP hosts
+
+Mon Aug  2 11:56:53 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* configure: add support for CONFIG_SHELL, so that you can use
+	some alternate shell for evaluating configure scripts
+
+Sun Aug  1 11:36:27 1993  Fred Fish  (fnf@deneb.cygnus.com)
+
+	* Makefile.in (make-gdb.tar.gz):  Sed bug reporting address
+	in configure script to bug-gdb@prep.ai.mit.edu when building
+	distribution archive.
+	* Makefile.in (COMPRESS):  Remove def.
+	* Makefile.in (gdb.tar.gz, make-gdb.tar.gz):  Renamed from
+	gdb.tar.Z and make-gdb.tar.Z respectively.
+	* Makefile.in (make-gdb.tar.gz):  Now only build gzip'd archive.
+	* Makefile.in (make-gdb.tar.gz):  Minor changes to move closer
+	to convergence with 'taz' target in Makefile.in.
+
+Fri Jul 30 12:34:57 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* install.sh (dsttmp): use trap to ensure that tmp files go
+	away on error conditions
+
+Wed Jul 28 11:57:36 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* Makefile.in (BASE_FLAGS_TO_PASS): remove LOADLIBES
+
+Tue Jul 27 12:43:40 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* Makefile.in (install-dirs): Deal with a prefix like /gnu;
+	its parent is '/' not ''.
+
+	* Makefile.in (DEVO_SUPPORT): Add comments about ChangeLog.
+
+Fri Jul 23 09:53:37 1993  Jason Merrill  (jason@wahini.cygnus.com)
+
+	* configure: if ${newsrcdir}/configure doesn't exist, don't assume
+	that ${newsrcdir}/configure.in does.
+
+Tue Jul 20 11:28:50 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* test-build.mk: support for CONFIG_SHELL
+
+Mon Jul 19 21:54:46 1993  Fred Fish  (fnf@deneb.cygnus.com)
+
+	* config.sub (netware):  Add as a basic system type.
+
+Wed Jul 14 12:03:11 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
+
+	* Makefile.in (Makefile): depend on configure.in.  Also drop the
+	  $(srcdir)/ from the dependency on Makefile.in.
+
+Tue Jul 13 20:10:58 1993  Doug Evans  (dje@canuck.cygnus.com)
+
+	* config.sub: Recognize h8300hhms as h8300h-hitachi-hms.
+	(h8300hhms is temporary until multi-libraries are implemented).
+	* configure.in: Handle h8300h too.
+
+Sun Jul 11 17:35:27 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config.guess: Recognize dpx/2 as m68k-bull-sysv3.
+
+Thu Jul  8 18:26:12 1993  John Gilmore  (gnu@cygnus.com)
+
+	* configure:  Remove extraneous output when guessing host type.
+	* config.guess:  Remove extraneous output when guessing using C
+	compiler rather than uname, or when guessing fails.
+
+Wed Jul  7 17:58:14 1993  david d `zoo' zuhn  (zoo at rtl.cygnus.com)
+
+	* Makefile.in: remove all.cross and install.cross targets
+
+	* configure: remove CROSS=-DCROSS_COMPILE and ALL=all.cross
+	  definitions
+
+Tue Jul  6 10:39:44 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
+
+	* configure.in (target sh): Build gprof.
+
+Thu Jul  1 16:52:56 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* config.sub: change -solaris to -solaris2
+
+Thu Jul  1 15:46:16 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* configure.in: Use config/mh-riscos for mips-*-sysv*.
+
+Wed Jun 30 09:31:58 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* configure: Correct error message for missing Makefile.in to
+	print correct directory.
+
+Tue Jun 29 13:52:16 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* install.sh: kludge around 386BSD shell bug
+
+Tue Jun 29 13:06:49 1993  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* config.guess:  Recognize NeXT.
+	* config.guess:  Recognize i486-ncr-sysv4.
+	* Makefile.in (taz):  rm $(TOOL)-$$VER before linking.
+
+Tue Jun 29 12:50:57 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (MAKEINFOFLAGS): New variable.
+	(FLAGS_TO_PASS): Pass MAKEINFO as MAKEINFO MAKEINFOFLAGS.
+	* build-all.mk, test-build.mk: Pass down --no-split as
+	MAKEINFOFLAGS when hosted on DOS.  Compile DOS hosted without -g.
+
+Thu Jun 24 13:39:11 1993  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Makefile.in (DEVO_SUPPORT):  Add COPYING COPYING.LIB install.sh.
+
+Wed Jun 23 12:59:21 1993  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Makefile.in (libg++.tar.z):  New rule.
+	* Makefile.in (taz):  Replace 'configure -rm' by 'make distclean'.
+	* Makefile.in (taz):  Only do a single chmod.
+
+Fri Jun 18 12:03:10 1993  david d `zoo' zuhn  (zoo at majipoor.cygnus.com)
+
+	* install.sh: don't use dirname anymore (replaced with sed usage)
+
+Thu Jun 17 18:43:42 1993  Fred Fish  (fnf@cygnus.com)
+
+	* Makefile.in:  Change extension for gzip'd files from '.z' to
+	'.gz' per new FSF standard usage.
+
+Thu Jun 17 16:58:50 1993  david d `zoo' zuhn  (zoo at majipoor.cygnus.com)
+
+	* configure: put quotes around the final value of program_transform_name
+
+Tue Jun 15 16:48:51 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: new install.sh support; update install-info rules
+
+Wed Jun  9 12:31:34 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* configure.in: Build diff for crosses, but not for go32 host.
+
+	* configure.in: Build gprof only for native, and don't build it
+	for mips-*-*, rs6000-*-*, or i[34]86-*-sco*.
+
+Mon Jun  7 13:12:11 1993  david d `zoo' zuhn  (zoo at deneb.cygnus.com)
+
+	* configure.in: don't build gas,ld,binutils on for *-*-sysv4
+
+Mon Jun  7 11:40:11 1993  Brendan Kehoe  (brendan@lisa.cygnus.com)
+
+	* configure.in (host_tools): Add prms.
+
+Fri Jun  4 13:30:42 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: install gcc, do installation of $(INSTALL_MODULES)
+	with $(FLAGS_TO_PASS) on the command line
+
+	* config.sub: Recognize lynx and lynxos
+
+Fri Jun  4 10:59:56 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* config.sub: Accept -ecoff*, not just -ecoff.
+
+Thu Jun  3 17:38:54 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* Makefile.in (taz): Use .gz suffix instead of .z.
+	(binutils.tar.gz, gas+binutils.tar.gz, gas.tar.gz): Fixed target
+	names.
+
+Thu Jun  3 00:27:06 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in (vault-install): add an 'else true' (for Ultrix)
+
+Wed Jun  2 18:19:16 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in (install-no-fixedincludes):  install gcc last, so
+	that rebuilds that might happen during 'make install' don't get
+	bogus gcc include files
+
+Wed Jun  2 16:14:10 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	Change from Utah for HPPA support:
+	* config.guess: Recognize hppa1.x-hp-bsd.
+
+Wed Jun  2 11:53:33 1993  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* config.guess:  Add support for Motorola Delta 68k, up to r3v7.
+	Patch from pot@fly.cnuce.cnr.it (Francesco Potorti`).
+
+Tue Jun  1 17:48:42 1993  Rob Savoye  (rob at darkstar.cygnus.com)
+
+	* config.sub: Add support for rom68k and bug boot monitors.
+
+Mon May 31 09:36:37 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* Makefile.in: Make all-opcodes depend on all-bfd.
+
+Thu May 27 08:05:31 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* config.guess: Added special check for i[34]86-univel-sysv4*.
+
+Wed May 26 16:33:40 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* config.guess: For i[34]86-unknown-sysv4 use UNAME_MACHINE for
+	the processor rather than assuming i486.
+
+Wed May 26 09:40:18 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config.guess: Recognize SunOS6 as Solaris3.
+
+Tue May 25 23:03:11 1993  Per Bothner  (bothner@cygnus.com)
+
+	* config.guess:  Fix typo.  Avoid #elif (not in K&R 1).
+	Recognize SunOS 5.* only (and not [6-9].*) as being Solaris2.
+
+Tue May 25 12:44:18 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* build-all.mk (all-cross): New target for Canadian Cross.
+	Added Q2 go32 targets.
+	* test-build.mk: Configure go32 cross sparclite-aout and
+	mips-idt-ecoff -with-gnu-ld.  Moved build binary directory from
+	PARTIAL_HOLE_DIRS to BUILD_HOLES_DIRS.
+
+Mon May 24 15:30:06 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: fix Alpha GDB typo; also, don't build DejaGnu for
+	GO32 hosted toolchains
+
+Mon May 24 14:18:41 1993  Rob Savoye  (rob at darkstar.cygnus.com)
+
+	* configure: change  so "-exec-prefix" gets passed down rather
+	than "-exec_prefix" so autoconf generated Makefiles get the
+	exec_prefix set right.
+
+Fri May 21 10:42:25 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* config.guess: get the Solaris2 minor version number
+
+	* Makefile.in: add standards.texi and make-stds.texi to ETC_SUPPORT
+
+Fri May 21 06:20:52 1993  Brendan Kehoe  (brendan@lisa.cygnus.com)
+
+	* config.guess: Recognize some Sequent platforms.
+
+Thu May 20 14:33:48 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: added the vault-install target
+
+	* configure.in: actually use the Sun3 makefile fragment that's in
+	config, also added the release dir to configdirs
+
+Thu May 20 14:19:18 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* Makefile.in (taz): Fix modes on stuff in $(TOOL) dir also.
+
+Tue May 18 20:26:41 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: remove some program from Alpha targetted toolchains
+
+Tue May 18 15:23:19 1993  Ken Raeburn  (raeburn@cygnus.com)
+
+	* Makefile.in (DISTSTUFFDIRS): Renamed from PROTODIRS.  Add ld and
+	gprof.
+	(taz): Run "make diststuff" in those directories instead of "make
+	proto-dir".  Look for "VERSION=" only at start of line in subdir
+	Makefile.  Use "gzip -9" for compression.
+	(TEXINFO_SUPPORT, DIST_SUPPORT, BINUTILS_SUPPORT_DIRS): New vars.
+	(binutils.tar.z): New target.
+
+Mon May 17 17:01:15 1993  Ken Raeburn  (raeburn@deneb.cygnus.com)
+
+	* Makefile.in (taz): Include gpl.texinfo.
+
+Fri May 14 06:48:38 1993  Ken Raeburn  (raeburn@deneb.cygnus.com)
+
+	* Makefile.in (setup-dirs): Merged into "taz" target.
+	(taz): Only do `proto-dir' stuff if a directory is actually needed
+	for this target.
+
+Wed May 12 13:09:44 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (MUNCH_NM): New variable, defined to be $(NM).
+	(FLAGS_TO_PASS): Pass down MUNCH_NM.
+	(HOST_CC, HOST_PREFIX, HOST_PREFIX_1): New variables.
+	(EXTRA_GCC_FLAGS): Pass down HOST_* variables.
+	(gcc-no-fixedincludes): Correct for current gcc Makefile.
+
+Tue May 11 10:14:25 1993  Fred Fish  (fnf@cygnus.com)
+
+	* Makefile.in (make-gdb.tar.Z):  Add configure, config.guess,
+	config.sub, and move-if-change to gdb testsuite distribution
+	archive, so the testsuite can be extracted, configured, and
+	run separately from the gdb distribution.  Blow away the Chill
+	tests that require a Chill compiled executable, since GNU Chill
+	is not yet publically available.
+
+Mon May 10 17:22:26 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* test-build.mk: set environment variables in a single command,
+	instead of a list of assignments and exports
+
+	* config.guess: recognize Alpha/OSF1 systems
+
+Mon May 10 14:55:51 1993  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* configure: Change help message to prefer --options rather than
+	  -options.
+
+Mon May 10 05:58:35 1993  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+	* config.sub: Convergent Tech. "miniframe" uses m68010, sez
+	zippy@ecst.csuchico.edu.
+	* config.guess: Recognize miniframe.
+
+Sun May  9 17:47:57 1993  Rob Savoye  (rob at darkstar.cygnus.com)
+
+       * Makefile.in: Use srcroot to find runtest rather than rootme.
+       Pass RUNTESTFLAGS and EXPECT down in BASE_FLAGS_TO_PASS.
+
+Fri May  7 14:55:59 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* test-build.mk: Extensive additions to support building on a
+	machine other than the host.
+
+Wed May  5 08:35:04 1993  Ken Raeburn  (raeburn@deneb.cygnus.com)
+
+	* configure (tooldir): Fix for i386-aix again.
+
+Mon May  3 19:00:27 1993  Per Bothner  (bothner@cygnus.com)
+
+	* configure, Makefile.in:  Change definition of $(tooldir)
+	to match the FSF.
+
+Fri Apr 30 15:55:21 1993  Fred Fish  (fnf@cygnus.com)
+
+	* config.guess:  Recognize i[34]86/SVR4.
+
+Fri Apr 30 15:52:46 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* Makefile.in (all-gdb): gdb depends on sim.
+
+Thu Apr 29 23:30:48 1993  Fred Fish  (fnf@cygnus.com)
+
+	* Makefile.in (gdb.tar.Z):  Make prototype gdb testsuite directory
+	at the same time we make the prototype gdb directory.
+	* Makefile.in (make-gdb.tar.Z):  Make the testsuite distribution
+	files at the same time as the gdb base release distribution.
+
+Thu Apr 29 12:50:37 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (check): Use individual check targets rather than
+	DO_X rule.
+	(check-gcc): Added.
+
+Thu Apr 29 09:50:07 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* config.sub: Use sysv3.2 not sysv32 for canonical OS
+	for System V release 3.2.
+
+Thu Apr 29 10:33:22 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* config.sub: Recognize hppaosf.
+	* configure.in: Do configure ld/binutils/gas for it.
+
+Tue Apr 27 06:25:34 1993  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+	* configure (tooldir): Alter syntax used to set this, for systems
+	where "\$" isn't handled right, like i386-aix.
+
+Thu Apr 22 08:17:35 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* configure: Pass program-transform-name, not
+	program_transform_name, to recursive configures.
+
+Thu Apr 22 02:58:21 1993  Ken Raeburn  (raeburn@cygnus.com)
+
+	* Makefile.in (gas+binutils.tar.z): New rule for building snapshots
+	of gas+ld+binutils.
+
+Mon Apr 19 17:41:30 1993  Per Bothner  (bothner@cygnus.com)
+
+	* config.guess:  Recognize AIX3.2 as distinct from 3.1.
+
+Sat Apr 17 17:19:50 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: rename m88k-motorola-m88kbcs to m88k-motorola-sysv
+
+Tue Apr 13 16:52:16 1993  Brendan Kehoe  (brendan@lisa.cygnus.com)
+
+	* Makefile.in (PRMS): Set back to all-prms.
+
+Sat Apr 10 12:04:07 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* test-build.mk: Pass -with-gnu-as for known MIPS native and MIPS
+	targets, rather than for MIPS hosts.
+
+Fri Apr  9 13:51:06 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: add comment for --with-x default values
+
+	* config.guess: handle Motorola Delta88 box for SVR3 and SVR4.
+
+	* Makefile.in: add check-* targets for each of the directories in
+	the tree.  Add a definition of RUNTEST that will use the one we
+	just built, if it exists.  Pass this down via FLAGS_TO_PASS.
+
+Thu Apr  8 09:21:30 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* configure.in: Removed obsolete references to bfd_target and
+	target_makefile_frag.
+
+	* build-all.mk: Set assorted targets for Q2.
+	* config.sub: Recognize z8k-sim and h8300-hms.
+	* test-build.mk: Really don't pass host to configure.
+	(HOLES): Added uname.
+
+Wed Apr  7 15:48:19 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* configure: Handle an empty program-prefix, program-suffix or
+	program-transform-name correctly.
+
+Tue Apr  6 13:48:41 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* build-all.mk: -G 8 no longer required for MIPS targets.
+	* test-build.mk: Don't pass host argument to configure; make it
+	guess.
+
+Tue Apr  6 10:36:53 1993  Fred Fish  (fnf@cygnus.com)
+
+	* Makefile.in (gdb.tar.Z):  Fix for building gzip'd distribution.
+	* Makefile.in (COMPRESS):  New macro, like GZIP.
+
+Fri Apr  2 09:02:31 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* test-build.mk: Use -with-gnu-as for mips-sgi-irix4 as well.
+
+	* build-all.mk: Set GCC to gcc -O -G 8 for MIPS targets, since gcc
+	with gas currently defaults to -G 0.
+
+Thu Apr  1 08:25:42 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (all-flex): flex depends on byacc.
+
+	* build-all.mk: If host not specified, use config.guess.  Pass TAG
+	to test-build.mk as RELEASE_TAG.
+	* test-build.mk (configargs): New variable containing arguments to
+	pass to configure.  Set to -with-gnu-as on mips-dec-ultrix.
+	(FLAGS_TO_PASS): Pass down RELEASE_TAG.
+
+	* config.guess: Use /bin/uname when checking -X argument on SCO,
+	to avoid invoking GNU uname which doesn't understand -X.
+
+	* test-build.mk: Don't use /usr/unsupported/bin/as on AIX.
+
+	* configure.in: Build gas for mips-*-*.
+
+Wed Mar 31 21:20:58 1993  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* Makefile.in (all.normal): insert missing backslash.
+
+Wed Mar 31 12:31:56 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* build-all.mk: Bump -XNh value to 1500 to match gcc requirements.
+
+	* Makefile.in: Complete overhaul to merge many almost identical
+	targets.
+
+Tue Mar 30 20:17:01 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* Makefile.in (setup-dirs-gdb): Renamed from setup-dirs.
+	(gdb.tar.Z): Adjusted.
+
+	* Makefile.in (setup-dirs, taz): New targets; should be general
+	enough to adapt for gdb sometime.  Build only .z file.
+	(gas.tar.z): New target.
+
+Tue Mar 30 10:03:09 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* build-all.mk: Use CC=cc -Xs on Solaris.
+
+Thu Mar 25 15:14:30 1993  Fred Fish  (fnf@cygnus.com)
+
+	* Makefile.in:  Incorporate changes suggested by wilson@cygnus.com
+	for handling BISON for FSF releases.
+
+Thu Mar 25 06:19:48 1993  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+	* configure: Actually implement the change zoo just documented.
+
+Wed Mar 24 13:02:44 1993  david d `zoo' zuhn  (zoo at poseidon.cygnus.com)
+
+	* configure: when using config.guess, only set target_alias when
+	it's not already been set (ie, on the command line)
+
+Mon Mar 22 23:07:39 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: add installcheck target, set PRMS to install-prms
+
+Sun Mar 21 16:46:12 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure: add support for package_makefile_fragment, handle the
+	case where a directory has a configure.in file but no Makefile.in
+	more gracefully (with an actual understandable error message, even);
+	add support for --without (and add this to the usage message); also
+	explicitly add a --host=${host_alias} to the command line when
+	config.guess is used
+
+Sun Mar 21 12:11:58 1993  Jim Wilson  (wilson@sphagnum.cygnus.com)
+
+	* configure: Must use both --host and --target in recursive calls.
+
+Thu Mar 18 12:31:35 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in: Change deja-gnu to dejagnu.
+
+Mon Mar 15 15:44:35 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* configure.in (h8300-*-*, h8500-*-*): Don't build libg++.
+
+Fri Mar 12 18:30:14 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: canonicalize all instances to *-*-solaris2*,
+	also strip out a number of tools to not build for go32 host
+
+Wed Mar 10 12:08:27 1993  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* config.guess: add GPL.
+
+	* Makefile.in, config.guess, config.sub, configure: bump
+	  copyrights to 93.
+
+Wed Mar 10 07:12:48 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (do-info): Removed obsolete check for existence of
+	localenv file.
+
+	* Makefile.in (MAKEOVERRIDES): Define to be empty.
+
+Wed Mar 10 03:11:56 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: a couple of 'else true' for decstation,
+	support for TclX
+
+	* configure.in: configure tclX too; don't remove Tk on RS/6000 anymore
+
+Tue Mar  9 16:06:12 1993  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in (setup-dirs): change invocation of make to $(MAKE).
+
+Mon Mar  8 14:52:11 1993  Ken Raeburn  (raeburn@cambridge)
+
+	* config.guess: Recognize i386-ibm-aix (PS/2).
+	* configure.in: Use config/mh-aix386 file for it.
+
+Mon Mar  8 11:12:43 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (GCC_FOR_TARGET): Eliminated definition; use
+	CC_FOR_TARGET instead.
+	(BASE_FLAGS_TO_PASS): Pass GCC_FOR_TARGET=$(CC_FOR_TARGET).
+
+Wed Mar  3 16:00:28 1993  Steve Chamberlain  (sac@ok.cygnus.com)
+
+	* Makefile.in: Add sim to list of directories sent with gdb
+
+Wed Mar  3 11:42:39 1993  Ken Raeburn  (raeburn@cygnus.com)
+
+	* configure.in: Put back mips-dec-bsd* case.
+
+Tue Mar  2 21:15:58 1993  Fred Fish  (fnf@cygnus.com)
+
+	(Ultrix 2.2 support from Michael Rendell <michael@mercury.cs.mun.ca>)
+	* configure.in (vax-*-ultrix2*):  Add Ultrix 2.2 triplet.
+	* config.guess:  Change 'VAX*:ULTRIX:*:*' to 'VAX*:ULTRIX*:*:*'.
+
+Tue Mar  2 18:11:03 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: remove no-op mips-dec-bsd* in "case $target"
+
+	* Makefile.in (dir.info): only run gen-info-dir if it exists,
+	(install-info): install dir.info only if it exists,
+	(all-expect, install-expect): pass along X11_FLAGS_TO_PASS
+
+Tue Mar  2 09:01:30 1993  Ken Raeburn  (raeburn@cygnus.com)
+
+	* configure.in: For vms target, skip bfd, ld, binutils.  Do build
+	gas for mips-dec-bsd.
+
+Tue Mar  2 08:35:24 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* configure (makesrcdir): If ${srcdir} is relative and not ".",
+	and ${subdir} is not ".", set makesrcdir based on ${invsubdir}.
+
+Tue Feb 23 14:18:28 1993  Mike Werner  (mtw@poseidon.cygnus.com)
+
+	* configure.in: Added "dejagnu" to hosttools list.
+
+Mon Feb 22 23:28:38 1993  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* config.sub, configure.in, config.guess:  Add support
+	for Bosx, an AIX variant from Bull.
+	Patches from F.Pierresteguy@frcl.bull.fr.
+
+Sun Feb 21 11:15:22 1993  Mike Werner  (mtw@poseidon.cygnus.com)
+
+	* devo/dejagnu: Initial creation of devo/dejagnu.
+	Migrated dejagnu testcases and support files for testing software
+	tools to reside as subdirectories, currently called "testsuite",
+	within the directory of the software tool.  Migrated all programs,
+	support libraries, etc. beloging to dejagnu proper from
+	devo/deja-gnu to devo/dejagnu.	These files were moved "as is"
+	with no modifications.	The changes to these files which will
+	allow them to configure, build, and execute properly will be made
+	in a future update.
+
+Fri Feb 19 20:19:39 1993  Brendan Kehoe  (brendan@lisa.cygnus.com)
+
+	* Makefile.in: Change send_pr to send-pr.
+	* configure.in: Likewise.
+	* send_pr: Renamed directory to send-pr.
+
+Fri Feb 19 19:00:13 1993  Per Bothner  (bothner@cygnus.com)
+
+	* Makefile.in:  Add some extra semi-colons (needed if SHELL=bash).
+
+Fri Feb 19 00:59:33 1993  John Gilmore  (gnu@cygnus.com)
+
+	* README:  Update for gdb-4.8 release.
+	* Makefile.in (gdb.tar.Z):  Add texinfo/tex3patch.  Build
+	gdb-xxx.tar.z (gzip'd) file also.
+
+Thu Feb 18 09:16:17 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: make all-diff depend on all-libiberty
+
+Tue Feb 16 16:06:31 1993  K. Richard Pixley  (rich@cygnus.com)
+
+	* config.guess: add vax-ultrix in the spirit of mips-ultrix.
+
+Tue Feb 16 05:57:15 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in, Makefile.in: add hello, tar, gzip, recode, indent
+
+Tue Feb 16 00:58:20 1993  John Gilmore  (gnu@cygnus.com)
+
+	* Makefile.in (DEVO_SUPPORT):  Remove etc directory
+	(ETC_SUPPORT):  Only add the files GDB wants from etc/.
+	(gdb.tar.Z):  Use ETC_SUPPORT.  Use byacc when building the file.
+
+Thu Feb 11 20:14:28 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in:  makeinfo binary is in a new location
+
+Tue Feb  9 12:42:27 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* config.sub: Accept -ecoff as an OS.
+
+	* Makefile.in: Various changes to eliminate a level of make
+	recursion and reduce the required command line length.
+	(BASE_FLAGS_TO_PASS): New variable holding flags passed to all
+	sub-makes.
+	(EXTRA_HOST_FLAGS, EXTRA_TARGET_FLAGS, EXTRA_GCC_FLAGS): New
+	variables holding settings for specific sub-makes.
+	(FLAGS_TO_PASS, TARGET_FLAGS_TO_PASS, GCC_FLAGS_TO_PASS): Rewrote
+	in terms of BASE_FLAGS_TO_PASS.
+	(TARGET_LIBS): New variable listing directories which use
+	TARGET_FLAGS_TO_PASS.
+	(subdir_do): Eliminated.
+	(do-*): New set of targets to replace subdir_do.
+	(various): All targets which used subdir_do now depend on do-*.
+	(local-clean): Renamed from do_clean.
+	(local-distclean): New target, dependency of distclean and
+	realclean.
+	(install-info): Don't create directories.  Depend on dir.info
+	rather than calling make recursively.
+	(install-dir.info): Eliminated.
+	(install-info-dirs): Create all info directories here.
+	(dir.info): Depend upon do-install-info.
+
+	* test-build.mk (HOLES): Added false.
+
+Sat Feb  6 14:05:09 1993  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* config.guess:  Recognize BSDI and BSDJ (Jolitz 386bsd).
+
+Thu Feb  4 20:49:18 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in (info): remove dependency on all-texinfo.  The
+	problem was really in texinfo/C, not at this level.
+
+Thu Feb  4 13:38:41 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (info): Added dependency on all-texinfo (PR 2112).
+
+Thu Feb  4 01:50:53 1993  John Gilmore  (gnu@cygnus.com)
+
+	* Makefile.in (make-gdb.tar.Z):  Change BISON to 'bison -y' for
+	GDB releases.
+
+Wed Feb  3 17:22:16 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* configure: Include srcdir in message about target of link not
+	being found.  Don't convert `-' to `_' in `with' options being
+	passed to subdirs.
+
+Tue Feb  2 18:57:59 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: add uudecode to host_tools
+
+	* Makefile.in: added {all,install}-uudecode targets, added them to
+	the appropriate lists
+
+Tue Feb  2 11:45:53 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (all-gcc): Added dependency on all-gas.
+
+	* configure.in (mips-*-*): Build ld and binutils.
+
+Mon Feb  1 12:35:41 1993  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* configure: check return code from mkdir, print error message and
+	  exit on failure.
+
+Sat Jan 30 16:40:28 1993  John Gilmore  (gnu@cygnus.com)
+
+	* Makefile.in (make-gdb.tar.Z):  New location for texinfo.tex.
+
+Thu Jan 28 15:09:59 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* test-build.mk (HOLES): Added tar, cpio and uudecode.
+
+Wed Jan 27 16:50:32 1993  Jim Wilson  (wilson@sphagnum.cygnus.com)
+
+	* config.sub (h8500):  Recognize this as a cpu type.
+
+Sat Jan 23 20:32:01 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure: source directory missing is no longer a warning
+
+	* configure.in: recognize irix[34]* instead of irix[34]
+
+	* Makefile.in: define and pass down X11_LIB
+
+Sat Jan 23 13:49:40 1993  Per Bothner  (bothner@cygnus.com)
+
+	* guess-systype: Renamed to ...
+	* config.guess:  ... by popular request.
+	* configure.in, Makefile.in:  Update accordingly.
+
+Thu Jan 21 12:20:55 1993  Per Bothner  (bothner@cygnus.com)
+
+	* guess-systype:  Patches from John Eaton <jwe@che.utexas.edu>:
+	+ Add Convex, Cray/Unicos, and Encore/Multimax support.
+	+ Execute ./dummy instead of assuming . is in PATH.
+
+Tue Jan 19 17:18:06 1993  Per Bothner  (bothner@cygnus.com)
+
+	* guess-systype:  New shell script.  Attempts to guess the
+	canonical host name of the executing host.
+	Only a few hosts are supported so far.
+	* configure:  Call guess-systype if no host is specified.
+
+Tue Jan 19 08:26:07 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (gcc-no-fixedincludes): Made to work with current
+	gcc Makefile.
+
+
+Fri Jan 15 10:27:02 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (GCC_FLAGS_TO_PASS): New variable.
+	(all-gcc, install-gcc, subdir_do): Use it.
+
+Wed Jan 13 17:06:45 1993  Jim Wilson  (wilson@sphagnum.cygnus.com)
+
+	* Makefile.in: Rename uninstalled gcc driver from gcc to xgcc.
+
+Wed Jan  6 20:29:16 1993  Mike Werner  (mtw@rtl.cygnus.com)
+
+	* Makefile.in: Removed explicit setting of SUBDIRS. SUBDIRS is now
+	  set exclusively by configure, using configure.in .
+
+Wed Jan  6 13:44:11 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* test-build.mk: set $PATH for all builds
+
+	* Makefile.in: pass TARGET_FLAGS_TO_PASS for xiberty and libm
+
+Wed Jan  6 11:02:10 1993  Fred Fish  (fnf@cygnus.com)
+
+	* Makefile.in (GCC_FOR_TARGET):  Supply a default that matches
+	the one used in gcc/Makefile.in, so that a null expansion doesn't
+	override the one needed to build gcc with a native cc.
+
+
+Tue Jan  5 07:55:12 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* configure: Accept -with arguments.
+
+Sun Jan  3 15:15:09 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* Makefile.in: added h8300sim
+
+Tue Dec 29 15:06:00 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* build-all.mk: If canonhost is i386-unknown-sco3.2v4, change it
+	to i386-sco3.2v4.  Set TARGETS and CFLAGS for i386-sco3.2v4.
+	(all-cygnus, native, build-cygnus): Make
+	$(canonhost)-stamp-3stage-done, not $(host)....
+	* test-build.mk (stamp-3stage-compared): Use tail +10c for
+	i386-sco3.2v4.  Added else true to if command.
+
+Mon Dec 28 12:08:56 1992  Ken Raeburn  (raeburn@cygnus.com)
+
+	* config.sub: (from FSF) Sequent uses a BSD-like OS.
+
+Mon Dec 28 08:32:06 1992  Minh Tran-Le  (mtranle@paris.intellicorp.com)
+
+	* configure.in (i[34]86-*-isc*): added; uses mh-sysv.
+
+Thu Dec 24 17:26:24 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: don't remove binutils from Solaris builds
+
+Thu Dec 24 14:08:38 1992 david d`zoo' zuhn  (zoo@cygnus.com)
+
+	* Makefile.in: get rid of earlier definitions for *clean,
+	also handle the recursive info rule better
+
+Thu Dec 24 12:40:21 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Makefile.in (mostlyclean, distclean, realclean):  Fix to
+	do more-or-less the right thing.
+
+Wed Dec 16 10:25:31 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in: Add lines defining CC and CXX, and use CXX rather
+	than gcc in definitions of CXX_FOR_BUILD and CXX_FOR_TARGET.
+
+Tue Dec 15 00:34:32 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: change all $(host_cpu)-$(host_vendor)-$(host_os) to
+	$(host_canonical).
+
+	* configure.in: split the configdirs list into 4 categories (native
+	v. cross, library v. tool) and handle the cross-only and native-
+	only in more reasonable (and correct!) way.
+
+Mon Dec 14 17:04:22 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* configure.in (hppa*-*-*):  Don't remove bfd and gdb from
+	configdirs anymore.
+
+Sun Dec 13 00:37:26 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: extensive cleanup::  removed all of the explicit
+	clean-* targets, collapsed many wrappers around subdir_do into
+	one, added additional targets to satisfy standards.texi, deleted
+	some old targets, some changes for consistency
+
+Fri Dec 11 20:18:02 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: handle some programs as cross-only, and others as
+	native only
+
+	* test-build.mk: handle partial holes in a more generic manner
+
+	* Makefile.in: m4 depends on libiberty
+
+Thu Dec  3 21:52:11 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: add m4, textutils, fileutils, sed, shellutils,
+	time, wdiff, and find to configdirs
+
+	* Makefile.in: all, clean, and install rules for the new programs
+	added to configure.in
+
+Mon Nov 30 14:54:34 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: use mh-sun for all *-sun-* hosts
+
+Fri Nov 27 18:35:54 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: define flags for X11 include files and library file
+	locations, pass them down to the programs that need this info
+
+	* build-all.mk: added a 'native' target, to 3stage the native toolchain
+
+Sun Nov 22 18:59:13 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: start building libg++ for HP-UX targets
+
+Wed Nov 18 19:33:11 1992  John Gilmore  (gnu@cygnus.com)
+
+	* README:  Update references to files moved into etc/.
+
+Sun Nov 15 09:36:08 1992  Fred Fish  (fnf@cygnus.com)
+
+	* config.sub (i386sol2, i486sol2):  i[34]86-unknown-solaris2.
+	* configure.in (i[34]86-*-solaris2*):  Use config/mh-sysv4.
+
+Thu Nov 12 08:50:42 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* configure: accept dash as well as underscore in long option
+	names for FSF compatibility.
+
+Wed Nov 11 08:04:37 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* config.sub: added -sco3.2v4 support from FSF.
+
+Sun Nov  8 21:14:30 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: expand the section that adds or removes
+	directories from the list of programs to build, to handle native
+	vs. cross in addition to host v. native
+
+Sat Nov  7 18:52:27 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Makefile.in:  Replace C++ in macro names with CXX.
+	This is less likely to break ...
+
+Sat Nov  7 15:16:58 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* test-build.mk: add -w to GNU_MAKE
+
+Fri Nov  6 23:10:37 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* config.sub: remove 'sparc'-->'sparc-sun' default transformation,
+	add 'sparc' to list of recognized cpus.  This needed to make
+	'sparc-aout' expand to 'sparc-unknown-aout' instead of 'sparc-sun-aout'.
+	Delete some redundant ose68 variants.  Recognize -wrs as an os,
+	then changes that into $CPU-wrs-vxworks.
+
+	* configure.in: remove most references to gdbtest, regularize
+	target based program removal
+
+	* test-build.mk: import from p3 tree (many fixes and changes)
+
+Fri Nov  6 20:59:00 1992  david d `zoo' zuhn  (zoo@cygnus.com)
+
+	* Makefile.in: added rules to handle tcl, tk, and expect
+
+	* configure.in: handle those directories if they exist
+
+Thu Nov  5 14:35:41 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* config.sub: removed bogus hppabsd and hppahpux names, since
+	"hppa" is not a valid cpu (hppa1.1 or hppa1.0 are, though)
+
+Thu Oct 29 00:12:41 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: all-gcc now depends on all-binutils.  all-libg++
+	depends upon all-xiberty
+
+	* Makefile.in: changes from p3, including:
+
+	Thu Oct  8 15:00:17 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (XTRAFLAGS): include newlib directories if
+	newlib/Makefile exists, rather than if host != target.
+
+	Fri Sep 25 13:41:52 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in: added -nostdinc to XTRAFLAGS if we are using gcc
+	from the same source tree and not building a cross-compiler.  This
+	matters for the libg++ configuration if reconfiguring a tree that
+	has already been installed.
+
+	Thu Sep 10 10:35:51 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in: added -I for newlib/targ-include to XTRAFLAGS, to
+	pick up the machine and system specific header files.
+
+	* Makefile.in: added AS_FOR_TARGET, passed down in
+	TARGET_FLAGS_TO_PASS.  Added CC_FOR_BUILD, which is intended to be
+	the C compiler to use to create programs which are run in the
+	build environment, set it to default to $(CC), and passed it down
+	in FLAGS_TO_PASS and TARGET_FLAGS_TO_PASS.
+
+	Mon Sep  7 22:34:42 1992  Ian Lance Taylor  (ian@cirdan.cygnus.com)
+
+	* Makefile.in: add $(host) = $(target) tests back to *_FOR_TARGET.
+	We need them for unusual native builds, like systems without
+	ranlib.
+
+	* configure: also define $(host_canonical) and
+	$(target_canonical), which are the full, canonical names for the
+	given host and target
+
+Sun Nov  1 16:38:17 1992  Per Bothner  (bothner@cygnus.com)
+
+	* Makefile.in:  Added separate definitions for C++.
+
+Fri Oct 30 11:37:52 1992  Fred Fish  (fnf@cygnus.com)
+
+	* configure.in (configdirs):  Add deja-gnu.
+
+Fri Oct 23 00:39:18 1992  John Gilmore  (gnu@cygnus.com)
+
+	* README:  Update for configure.texi and gdb-4.7 release.
+
+Wed Oct 21 21:54:27 1992  John Gilmore  (gnu@cygnus.com)
+
+	* Makefile.in:  Move "all" target to top of file.
+	Previously, first target was ".PHONY" which caused BSD4.4 make
+	to build .PHONY when make was run without arguments.
+
+Mon Oct 19 01:17:54 1992  John Gilmore  (gnu@cygnus.com)
+
+	* Makefile.in:  Add COPYING.LIB to GDB releases, now that there's
+	Library-copylefted code in libiberty.
+
+Tue Oct 13 01:22:32 1992  John Gilmore  (gnu@cygnus.com)
+
+	* config.sub:  Replace m68kmote with plain old m68k.
+
+Fri Oct  9 03:14:24 1992  John Gilmore  (gnu@cygnus.com)
+
+	* Makefile.in:  Remove space from blank line, avoid Make complaints.
+
+Thu Oct  8 18:41:45 1992  Ken Raeburn  (raeburn@cygnus.com)
+
+	* config.sub: Complain if no argument is given.  Added support for
+	386bsd as OS and target alias.
+
+Thu Oct  8 15:07:22 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (XTRAFLAGS): include newlib directories if
+	newlib/Makefile exists, rather than if host != target.
+
+Mon Oct  5 03:00:09 1992  Mark Eichin  (eichin at tweedledumber.cygnus.com)
+
+	* config.sub: recognize sparclite-wrs-vxworks.
+
+	* Makefile.in (install-xiberty): added *-xiberty make rules (from
+	p3.) Added clean-xiberty to clean.
+
+Thu Oct  1 17:59:19 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: use *-*-* instead of nested cases for host and target
+
+Tue Sep 29 14:11:18 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in: added -nostdinc to XTRAFLAGS if we are using gcc
+	from the same source tree and not building a cross-compiler.  This
+	matters for the libg++ configuration if reconfiguring a tree that
+	has already been installed.
+
+Sep 20 08:53:10 1992  Fred Fish  (fnf@cygnus.com)
+
+	* config.sub (i486v/i486v4):  Merge in from FSF version.
+
+Fri Sep 18 00:32:00 1992  Mark Eichin  (eichin@cygnus.com)
+
+	* configure: only set PWD if it is already set.
+
+Thu Sep 17 23:05:53 1992  Mark Eichin  (eichin@cygnus.com)
+
+	* configure: just set PWD=`pwd` at the top, since Ultrix sh
+	doesn't have unset and all success paths (and most error paths)
+	out set it anyway. (Note: should change all uses of ${PWD=`pwd`}
+	to just ${PWD} to avoid confusion.)
+
+Tue Sep 15 16:00:54 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* configure: always set $(tooldir) to $(libdir)/$(target_alias),
+	even for a native compilation.
+
+Tue Sep 15 02:22:56 1992  John Gilmore  (gnu@cygnus.com)
+
+	Changes to make the gdb.tar.Z rule work better.
+
+	* Makefile.in (GDB_SUPPORT_DIRS):  Add opcodes.
+	(DEVO_SUPPORT):  Add configure.texi.
+	(bfd-ilrt.tar.Z):  Remove ancient rule.
+
+Thu Sep 10 10:43:19 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in: added -I for newlib/targ-include to XTRAFLAGS, to
+	pick up the machine and system specific header files.
+
+	* configure.in, config.sub: added new target m68010-adobe-scout,
+	with alias of adobe68k.  Changed configure.in to check for
+	-scout before -sco* to avoid a false match.
+
+	* Makefile.in: added AS_FOR_TARGET, passed down in
+	TARGET_FLAGS_TO_PASS.  Added CC_FOR_BUILD, which is intended to be
+	the C compiler to use to create programs which are run in the
+	build environment, set it to default to $(CC), and passed it down
+	in FLAGS_TO_PASS and TARGET_FLAGS_TO_PASS.
+
+Wed Sep  9 12:21:42 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in: added TARGET_FLAGS_TO_PASS, CC_FOR_TARGET,
+	AR_FOR_TARGET, RANLIB_FOR_TARGET, NM_FOR_TARGET.  Pass
+	TARGET_FLAGS_TO_PASS, which defines CC, AR, RANLIB and NM as the
+	FOR_TARGET variants, to newlib and libg++.
+
+Tue Sep  8 17:28:30 1992  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* Makefile.in (all-gas, all-gdb): Require all-opcodes to be built
+	first.
+
+Wed Sep  2 02:50:05 1992  John Gilmore  (gnu@cygnus.com)
+
+	* config.sub:  Accept `elf' as an environment.
+
+Tue Sep  1 15:48:30 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* Makefile.in (all-opcodes):  cd into the right directory
+
+Sun Aug 30 21:12:11 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* configure: added -program_transform_name option, used as
+	argument to sed when installing programs.
+	configure.texi: added documentation for -program_prefix,
+	-program_suffix and -program_transform_name.
+
+Thu Aug 27 21:59:44 1992  John Gilmore  (gnu@cygnus.com)
+
+	* config.sub:  Accept i486 where i386 ok.
+
+Thu Aug 27 13:04:42 1992  Brendan Kehoe  (brendan@rtl.cygnus.com)
+
+	* config.sub: accept we32k
+
+Mon Aug 24 14:05:14 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* config.sub, configure.in: accept OSE68000 and OSE68k.
+
+	* Makefile.in: don't create all directories for ``make install'';
+	let the subdirectories create the ones they need.
+
+Tue Aug 11 23:13:17 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* COPYING: new file, GPL v2
+
+Tue Aug  4 01:12:43 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: use the new gen-info-dir, which needs a template
+	argument (which also lives in texinfo)
+
+	* configure.texi, standards.texi: fix INFO-DIR-ENTRY
+
+Mon Aug  3 00:34:17 1992  Fred Fish  (fnf@cygnus.com)
+
+	* config.sub (ncr3000):  Change i386 to i486.
+
+Thu Jul 23 00:12:17 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: add install-rcs, install-grep to
+	install-no-fixedincludes, removed install-bison and install-libgcc
+
+Tue Jul 21 01:01:50 1992  david d `zoo' zuhn (zoo@cygnus.com)
+
+	* configure.in: grab the HPUX makefile fragment if on HPUX
+
+Mon Jul 20 11:02:09 1992  D. V. Henkel-Wallace  (gumby@cygnus.com)
+
+	* Makefile.in: eradicate bison spoor (ditto libgcc).
+	 configure.in: recognise m68{k,000}-ericsson-OSE.
+	 es1800 is alias for m68k-ericsson-OSE
+
+Sun Jul 19 17:49:02 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: rearrange the parts that remove programs from
+	configdirs, based now on HOST==TARGET or by canonical triple.
+
+Fri Jul 17 22:52:49 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* test-build.mk: recurse explicitly with -f test-build.mk when
+	  appropriate.  predicate stage3 and comparison on the existence
+	  of gcc.  That is, if gcc isn't around, we aren't three-staging.
+	  On very clean, also remove ...stamp-co.  Build in-place before
+	  doing other builds.
+
+Thu Jul 16 18:33:09 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* Makefile.in, configure.in: add tgas
+
+Thu Jul 16 16:05:28 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* Makefile.in: a number of changes merged in from progressive.
+
+	* configure.in: add libm.
+
+	* .cvsignore: ignore some stuff that comes from test-build.mk.
+
+Tue Jul  7 00:24:52 1992  Fred Fish  (fnf@cygnus.com)
+
+	* config.sub:  Add es1800 (m68k-ericsson-es1800).
+
+Tue Jun 30 20:24:41 1992  D. V. Henkel-Wallace  (gumby@cygnus.com)
+
+	* configure: Add program_suffix (parallel to program_prefix)
+	* Makefile.in: adjust directory-creating script for losing decstation
+
+Mon Jun 22 23:43:48 1992  Per Bothner  (bothner@cygnus.com)
+
+	* configure:  Minor $subdir-related fixes.
+
+Mon Jun 22 18:30:26 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* configure: fix various problems with propogating
+	makefile_target_frag in subdirs.
+	* configure.in: config libgcc if its there
+
+Fri Jun 19 15:19:40 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* config.sub:  HPPA merge.
+
+Sun Jun 14 10:29:19 1992  John Gilmore  (gnu at cygnus.com)
+
+	* Makefile.in:  Replace all-bison with all-byacc in all
+	dependency lines for other tools (which now use byacc).
+
+Fri Jun 12 22:21:57 1992  John Gilmore  (gnu at cygnus.com)
+
+	* config.sub:  Add sun4sol2 => sparc-sun-solaris2.
+
+Thu Jun  4 12:07:32 1992  Mark Eichin  (eichin@cygnus.com)
+
+	* Makefile.in: make gprof rules similar to byacc rules (instead of
+	vestigal $(unsubdir) that didn't work...)
+
+Thu Jun  4 00:37:05 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* config.sub:  Add support for Linux.
+	* Makefile.in:  Use $(FLAGS_TO_PASS) more consistently
+	(at least for libg++).
+
+Tue Jun 02 20:03:00 1992  david d `zoo' zuhn (zoo@cygnus.com)
+
+	* configure.texi: fix doc for the -nfp option to configure
+
+Tue Jun  2 17:20:52 1992  Michael Tiemann  (tiemann@cygnus.com)
+
+	* Makefile.in (all-binutils): ar needs flex, so depend on all-flex.
+
+Sun May 31 15:04:08 1992  Mark Eichin  (eichin at cygnus.com)
+
+	* config.sub: changed [^-]+ to [^-][^-]* so that it works under
+	Sun sed. (BSD 4.3 sed doesn't handle [^-]+ either.)
+	* configure.in: added solaris* host_makefile_frag hook.
+
+Sun May 31 01:10:34 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* config.sub: changed recognition of m68000 so that various
+	m68k types can be specified via m680[01234]0
+
+Sat May 30 21:01:06 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* config.sub (basic_machine): fix sed so that '-foo' isn't
+	completely substituted out while .+'-foo' loses the '-foo'
+
+Wed May 27 23:18:52 1992  Michael Tiemann  (tiemann@rtl.cygnus.com)
+
+	* config.sub ($os): Add -aout.
+
+Fri May 22 14:00:02 1992  Per Bothner  (bothner@cygnus.com)
+
+	* configure:  If host_makefile_frag is absolute, don't
+	prefix ${invsubdir} (relevant to libg++ auto-configure).
+
+Thu May 21 18:00:09 1992  Michael Tiemann  (tiemann@rtl.cygnus.com)
+
+	* Makefile.in (tooldir): Define it.
+	(all-ld): Depend on all-flex.
+
+Sun May 10 21:45:59 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Makefile.in (check):  Fix libg++ special case.
+
+Fri May  8 08:31:41 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* configure: do not bury `pwd` into config.status, thus do fewer
+	  pwd's.
+
+	* configure: print the "Building in" message only when building in
+	  other than "." AND verbose.
+
+	* configure: remove -s, rework -v to better accomodate guested
+	  configures.
+
+	* standards.texi: updated to 3 may, fixed librid <-> libdir typo.
+
+Fri May  1 18:00:50 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in: macroize flags passed on recursion.  remove
+	  fileutils.
+
+Thu Apr 30 08:56:20 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* configure: get makesrcdir right for subdirs deeper than 1.
+
+	* Makefile.in: pass INSTALL, INSTALL_DATA, INSTALL_PROGRAM on
+	  install.
+
+Fri Apr 24 15:51:51 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in: don't print subdir_do or recursion lines.
+
+Fri Apr 24 15:22:04 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* standards.texi: added menu item.
+
+	* Makefile.in: build and install standards.info.
+
+	* standards.texi: new file.
+
+Wed Apr 22 18:06:55 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* configure: test for and move config.status pieces from
+	  ${subdir}/.
+
+Wed Apr 22 14:38:34 1992  Fred Fish  (fnf@cygnus.com)
+
+	* configure:  Test for existance of files before trying to mv
+	them, to avoid numerous non-existance messages.
+
+Tue Apr 21 12:31:33 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* configure: correct final line of config.status.
+
+	* configure: patch from eggert.  Avoids a protection problem if
+	  the original Makefile.in is read only.
+
+	* configure: use move-if-change from gcc to create config.status.
+	  Some makefiles depend on config.status to tell if a directory
+	  has been reconfigured for a different host.  This change
+	  prevents those directories from remaking everything in the case
+	  where the reconfig was only intended to rebuild a Makefile.
+
+	* configure: test for config.sub with "config.sub sun4" rather
+	  than "config.sub ${host_alias}".  Otherwise we can't tell a bad
+	  host alias from a missing config.sub.
+
+Mon Apr 20 18:16:36 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* Makefile.in: explicitly pass CFLAGS on recursion. no longer pass
+	  MINUS_G (this can be done with CFLAGS).  Default CFLAGS to -g.
+
+Fri Apr 17 18:27:51 1992  Per Bothner  (bothner@cygnus.com)
+
+	* configure: mkdir ${subdir} as needed.
+
+Wed Apr 15 17:37:22 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in,configure.in: added autoconf.
+
+Wed Apr 15 17:27:34 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* Makefile.in: no longer pass against on recursion.
+
+	* Makefile.in: added .NOEXPORT: so that stray makefile_frag
+	  definitions are not inherited.
+
+	* configure: correct makesrcdir when subdir is .
+
+Tue Apr 14 11:56:09 1992  Per Bothner  (bothner@cygnus.com)
+
+	* configure:  Add support for 'subdirs' variable, which is
+	like 'configdirs', except that configure doesn't re-invoke
+	itself for subdirs, it just creates a Makefile for each subdir.
+	* configure.texi:  Document subdirs.
+
+Mon Apr 13 18:50:16 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: added flex to configdirs
+
+Mon Apr 13 18:43:55 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in: remove clean-stamps from clean.
+
+Sat Apr 11 03:52:03 1992  John Gilmore  (gnu at cygnus.com)
+
+	* configure.in:  Add gdbtest to configdirs.
+
+Fri Apr 10 23:11:49 1992  Fred Fish  (fnf@cygnus.com)
+
+	* Makefile.in (MINUS_G):  Add macro, default to -g, pass on
+	to recursive makes.
+	* configure.in:  Recognize new ncr3000 config.
+
+Wed Apr  8 23:08:12 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in, configure.in: removed references to gdbm.
+
+Tue Apr  7 16:48:20 1992  Per Bothner  (bothner@cygnus.com)
+
+	* config.sub:  Don't canonicalize os value
+	newsos* to bsd (readline needs to check for newsos).
+	(This fix was earlier made Jan 31, but got re-broken.)
+
+Mon Apr  6 14:34:08 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* configure.in:  sco is an os, not a vendor!
+
+	* configure:  Quote $( better.  Keep various shells happy.
+
+Tue Mar 31 16:32:57 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in: eliminate stamp-files.
+
+Mon Mar 30 22:20:23 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in: add send_pr.  remove "force" from .stmp-gprof rule.
+	  Supress echoing of all the "if [ -d ... $(MAKE)" lines.
+
+Wed Mar 25 15:20:04 1992  Stu Grossman  (grossman@cygnus.com)
+
+	* config.sub:  fix iris/iris3.
+
+Wed Mar 25 10:34:19 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* configure: re-add -rm.
+
+Tue Mar 24 23:50:16 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Maskefile.in: add .stmp-rcs to all.
+
+	* configure.in: remove gas from rs6000 build, use aix host fragment.
+
+Mon Mar 23 19:43:35 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* configure: pass down site_option during recursion.
+
+Thu Mar 19 16:49:36 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* Makefile.in (all.cross):  Add .stmp-bfd .stmp-readline.
+
+Wed Mar 18 15:29:33 1992  Mike Stump  (mrs@cygnus.com)
+
+	* configure: Change exec_prefix so that it really defaults to prefix.
+
+Sat Mar 14 17:20:38 1992  Fred Fish  (fnf@cygnus.com)
+
+	* Makefile.in, configure.in:  Add support for mmalloc library.
+
+Fri Mar 13 18:44:18 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in: add stmp dependencies for a few more things.
+
+Thu Mar 12 04:56:24 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* configure: adjusted error message on objdir/srcdir configure
+	  collision, per john's suggestion.
+
+	* Makefile.in: add libiberty stmp to all and all.cross.
+
+Wed Mar 11 02:07:52 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in: remove force dependencies, add grep to all.
+
+Tue Mar 10 21:49:18 1992  K. Richard Pixley  (rich@mars.cygnus.com)
+
+	* Makefile.in: drop flex.  make stamp files work.
+
+	* configure: added test for conflicting configuration in srcdir,
+	  remove trailing slashes from srcdir.  Otherwise emacs gdb mode
+	  gets cranky.  use relative paths for configure and srcdir
+	  whenever possible.  Send some error messages to stderr that were
+	  going to stdout.
+
+Tue Mar 10 18:01:55 1992  Per Bothner  (bothner@cygnus.com)
+
+	* Makefile.in:  Fix libg++ rule to check for gcc directory
+	before using gcc/gcc.  Also pass XTRAFLAGS.
+
+Thu Mar  5 21:45:07 1992  K. Richard Pixley  (rich@sendai)
+
+	* Makefile.in: added stmp-files so that directories aren't polled
+	  when they are already built.
+
+	* configure.texi: fixed a node pointer problem.
+
+Thu Mar  5 12:05:58 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* config.sub configure.in gdb/configure.in
+	gdb/mips-tdep.c gdb/mipsread.c gdb/procfs.c gdb/signame.h
+	gdb/tm-irix3.h gdb/tm-mips.h gdb/xm-irix4.h gdb/config/mt-irix3
+	gdb/config/mh-irix4 texinfo/configure.in:  Port to SGI Irix-4.x.
+
+Wed Mar  4 02:57:46 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* configure: -recurring becomes -silent.  corrected help message
+	  for -site= option.
+
+	* Makefile.in: mkdir $(exec_prefix) and $(tooldir).
+
+Tue Mar  3 14:51:21 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* configure: when building Makefile for crosses, replace
+	  tooldir and program_prefix.  default srcdir from location of
+	  config.sub.  remove "for host in hosts" and "for target in
+	  targets" loops.
+
+Wed Feb 26 19:48:25 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* Makefile.in: Do not pass bindir or mandir to cvs.
+
+Wed Feb 26 18:04:40 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in, configure.in: removed traces of namesubdir,
+	  -subdirs, $(subdir), $(unsubdir), some rcs triggers.  Forced
+	  copyrights to '92, changed some from Cygnus to FSF.
+
+	* configure.texi: remove most references to multiple hosts,
+	  multiple targets, subdirs, etc.
+
+	* configure.man: removed rcsid. reference config.sub not
+	  config.subr.
+
+	* Makefile.in: mkdir $(infodir) on install-info.
+
+Wed Feb 19 15:41:13 1992  John Gilmore  (gnu at cygnus.com)
+
+	* configure.texi:  Explain better about .gdbinit and about
+	the environment that configure.in sections run in.
+
+Fri Feb  7 07:55:00 1992  John Gilmore  (gnu at cygnus.com)
+
+	* configure.in:  Ultrix is only a decstation if it's a MIPS.
+
+Fri Jan 31 21:54:51 1992  John Gilmore  (gnu at cygnus.com)
+
+	* README:  DOC.configure => cfg-paper.texi.
+
+Fri Jan 31 21:48:18 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* config.sub (near case $os):  Don't convert newsos* to bsd!
+
+Fri Jan 31 02:27:32 1992  John Gilmore  (gnu at cygnus.com)
+
+	* Makefile.in:  Reinstall change from gdb-4.3 that reduces
+	the number of copies of COPYING that go into the GDB tar file.
+
+Thu Jan 30 16:17:30 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* bfd/configure.in, gdb/config/mh-i386sco,
+	gdb/config/mt-i386v32, gdb/configure.in, readline/configure.in:
+	Fix SCO configuration stuff.
+
+Tue Jan 28 23:51:07 1992  Per Bothner  (bothner at cygnus.com)
+
+	* Makefile.in:  For libg++, make sure the -I pointing
+	to the gcc directory goes *after* all the libg++-local -I flags.
+	Also, move just-gcc dependency from just-libg++ to all-libg++.
+
+Tue Jan 28 12:56:24 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* configure:  Change -x to -f to keep Ultrix /bin/test happy.
+
+Sat Jan 18 17:45:11 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* Makefile.in (make-gdb.tar.Z):  Remove texinfo targets.
+
+Sat Jan 18 17:03:21 1992  Fred Fish  (fnf at cygnus.com)
+
+	* config.sub:  Add stratus configuration frags.  Also
+	submitted to FSF.
+
+Sat Jan 18 15:35:29 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* Makefile.in (DEV_SUPPORT):  add configure.man.
+
+	* config.sub(Decode manufacturer-specific):  add -none*.
+
+Fri Jan 17 17:58:05 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* Makefile.in:  remove form feeds to make Sun's make happy.
+	(DEVO_SUPPORT):  DOC.configure => cfg-paper.texi.
+
+Sat Jan  4 16:11:44 1992  John Gilmore  (gnu at cygnus.com)
+
+	* Makefile.in (AR_FLAGS):  Make quieter.
+
+Thu Jan  2 22:57:12 1992  John Gilmore  (gnu at cygnus.com)
+
+	* configure.in:  Add libg++.
+	* configure:  When verbose, don't output the command line at each
+	level; it will be unremarkably the same as the previous version,
+	which will be the same as what the user typed.
+
+Fri Dec 27 16:26:47 1991  K. Richard Pixley  (rich at cygnus.com)
+
+	* configure.in, Makefile.in: fix clean-info, add flex.  add
+	  fileutils.
+
+	* configure: be less sensitive to spaces in Makefile.in.  Do not
+	  look for sources in "..".  Doing so breaks subdirectories that
+	  might have their own configure.  If a subdir has it's own
+	  configure script, use it.
+
+Thu Dec 26 16:30:26 1991  K. Richard Pixley  (rich at cygnus.com)
+
+	* cfg-paper.texi: some changes suggested by rms.
+
+Thu Dec 26 10:13:36 1991  Fred Fish  (fnf at cygnus.com)
+
+	* config.sub:  Merge in some small additions from the FSF version,
+	taken from the gcc distribution, to bring the Cygnus and FSF
+	versions into closer sync.
+
+Fri Dec 20 11:34:18 1991  Fred Fish  (fnf at cygnus.com)
+
+	* configure.in:  Changed svr4 references to sysv4.
+
+Thu Dec 19 15:54:29 1991  K. Richard Pixley  (rich at cygnus.com)
+
+	* configure: added -V for version number option.
+
+Wed Dec 18 15:39:34 1991  K. Richard Pixley  (rich at cygnus.com)
+
+	* DOC.configure, cfg-paper.texi: revised, updated, and texinfo'd.
+	  renamed from DOC.configure to cfg-paper.texi.
+
+Mon Dec 16 23:05:19 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* configure, config.subr, config.sub: config.subr is now
+	  config.sub again.
+
+Fri Dec 13 01:17:06 1991  K. Richard Pixley  (rich at cygnus.com)
+
+	* configure.texi: new file, in progress.
+
+	* Makefile.in: build info file and install the man page for
+	  configure.
+
+	* configure.man: new file, first cut.
+
+	* configure: find config.subr again now that configuration "none"
+	  has gone.  removed all traces of the -ansi option.  removed all
+	  traces of the -languages option.
+
+	* config.subr: resync from rms.
+
+1991-12-11  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* configure, config.sub, config.subr: merge config.sub into
+	  config.subr, call the result config.subr, remove config.sub, use
+	  config.subr.
+
+	* Makefile.in: revised install for dir.info.
+
+1991-12-10  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* configure.in: add decstation host makefile frag.
+
+	* Makefile.in: BISON now bison -y again.  also install-gcc on
+	  install.  clean-gdbm on clean.  infodir belongs in datadir.
+	  Make directories for info install.  Build dir.info here then
+	  install it.
+
+1991-12-09  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* Makefile.in: fix for bad directory tests.
+
+1991-12-07  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* configure: \{1,2\} appears to be a sysv'ism.  Use a different
+	  regexp.  -srcdir relative was being handled incorrectly.
+
+	* Makefile.in: unwrapped some for loops so that parallel makes
+	  work again and so one can focus one's attention on a particular
+	  package.
+
+1991-12-06  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* configure: added PWD as a stand in for `pwd` (for speed). use
+	  elif wherever possible.  make -srcdir work without -objdir.
+	  -objdir= commented out.
+
+1991-12-05  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* configure: +options become --options.  -subdirs commented out.
+	  added -host, -datadir.  Renamed -destdir to -prefix.  Comment in
+	  Makefile now at top of generated Makefile.  Removed cvs log
+	  entries.  added -srcdir.  create .gdbinit only if there is one
+	  in ${srcdir}.
+
+	* Makefile.in: idestdir and ddestdir go away.  Added copyrights
+	  and shift gpl to v2.  Added ChangeLog if it didn't exist. docdir
+	  and mandir now keyed off datadir by default.
+
+1991-11-22  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* Freshly created ChangeLog.
+
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 76
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/MAINTAINERS sdcc-3.2.0+dfsg/support/sdbinutils/MAINTAINERS
--- sdcc-3.1.0+dfsg/support/sdbinutils/MAINTAINERS	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/MAINTAINERS	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,121 @@
+Please feel free to add, edit, delete this file.
+Please do not make ChangeLog entries.
+
+COPYING, COPYING.LIB, README
+	http://gnu.org.
+
+Makefile.*; configure; configure.ac; src-release
+	Any global maintainer can approve changes to these
+	files, but they should be aware	that they need to
+	be kept in sync with their counterparts in the GCC
+	repository.  Also please notify the following of
+	any committed patches:
+		binutils@sourceware.org
+		gdb-patches@sourceware.org
+
+bfd/; binutils/; elfcpp/; gas/; gold/; gprof/; ld/; opcodes/; cpu/;
+BFD's part of include/
+
+	binutils: http://sourceware.org/binutils/
+	Patches to binutils@sourceware.org.
+	Please notify the following of any interface changes:
+		gdb-patches@sourceware.org
+
+cgen/; cgen parts of opcodes/, sim/ & include/
+	cgen: http://sourceware.org/cgen/
+	Patches to cgen@sourceware.org
+	May need separate opcodes/ or sim/ approval for
+		commits of regenerated files there.
+
+config.guess; config.sub; readline/support/config.{sub,guess}
+	config: http://savannah.gnu.org/projects/config
+	Patches to config-patches@gnu.org.
+	Changes need to be done in tandem with the official CONFIG
+	sources or submitted to the master file maintainer and brought
+	in via a merge.  When updating any of these files, please be
+	sure to update all of them.
+	Please notify the following of any committed patches:
+		binutils@sourceware.org
+		gdb-patches@sourceware.org
+
+depcomp; mkinstalldirs
+        Send bug reports and patches to bug-automake@gnu.org.
+
+gdb/; readline/; sim/; GDB's part of include/
+	GDB: http://www.gnu.org/software/gdb/
+	Patches to gdb-patches@sourceware.org.
+	See also gdb/MAINTAINERS and sim/MAINTAINERS.
+
+include/
+	See binutils/, gdb/, sid/, gcc/, libiberty/ etc.
+
+intl/; config.rhost; libiberty/; libiberty's part of include/ 
+	gcc: http://gcc.gnu.org
+	Changes need to be done in tandem with the official GCC
+	sources or submitted to the master file maintainer and brought
+	in via a merge.  Note: approved patches in gcc's libiberty or
+	intl are automatically approved in this libiberty and intl also;
+	feel free to merge them yourself if needed sooner than the next
+	merge.  Otherwise, changes are automatically merged, usually
+	within a day.
+
+libdecnumber/
+	See libiberty.  The master copy of this directory is in the GCC
+	repository.
+
+ltconfig; ltmain.sh; ltcf-*.sh
+	libtool: http://www.gnu.org/software/libtool/
+	Changes need to be done in tandem with the official LIBTOOL
+	sources or submitted to the master file maintainer and brought
+	in via a merge.
+
+move-if-change
+	Send bug reports and patches to bug-gnulib@gnu.org.
+
+symlink-tree
+	gcc: http://gcc.gnu.org
+	See libiberty.
+
+newlib/; libgloss/
+	http://sourceware.org/newlib/
+	Patches to newlib@sourceware.org.
+
+sid/; SID's part of cgen/
+	sid: http://sourceware.org/sid/
+	Patches to sid@sourceware.org
+
+texinfo/texinfo.tex
+	texinfo: http://ftp.gnu.org.
+	Latest version can be found on ftp://ftp.gnu.org and can be
+	imported at any (reasonable) time.
+	Please not use GCC's texinfo.  Please do not import texinfo.
+
+tcl/; tix/; itcl/; tk/; libgui/
+	insight: http://sourceware.org/insight/
+	Contact insight@sourceware.org.
+
+winsup/
+	cygwin: http://sourceware.org/cygwin
+	Patches to cygwin-patches@cygwin.com.
+	General discussion cygwin@cygwin.com.
+
+config-ml.in; makefile.vms; mkdep; setup.com;
+etc/; utils/;
+	Any global maintainer can approve changes to these
+	files and directories.
+
+compile; depcomp; install-sh; missing; ylwrap;
+config/
+	Any global maintainer can approve changes to these
+	files and directories, but they should be aware
+	that they need to be kept in sync with their
+	counterparts in the GCC repository.
+
+modules file
+	If you understand the file format (or can cut-and-paste existing
+	entries), modify it. If it scares you, get someone who does
+	understand it to help you.  Be prepared to fix it if you do break it.
+
+/* Local variables: */
+/* change-log-default-name: "/dev/null" */
+/* End: */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/Makefile.def sdcc-3.2.0+dfsg/support/sdbinutils/Makefile.def
--- sdcc-3.1.0+dfsg/support/sdbinutils/Makefile.def	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/Makefile.def	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,548 @@
+#! /usr/bin/autogen
+AutoGen definitions Makefile.tpl;
+
+// Makefile.in is generated from Makefile.tpl by 'autogen Makefile.def'.
+// This file was originally written by Nathanael Nerode.
+//
+//   Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+//   Free Software Foundation
+//
+// This file is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+
+// "missing" indicates that that module doesn't supply
+// that recursive target in its Makefile.
+
+build_modules= { module= libiberty; };
+build_modules= { module= bison; };
+build_modules= { module= flex; };
+build_modules= { module= m4; };
+build_modules= { module= texinfo; };
+build_modules= { module= fixincludes; };
+
+host_modules= { module= bfd; lib_path=.libs; bootstrap=true; };
+host_modules= { module= opcodes; lib_path=.libs; bootstrap=true; };
+host_modules= { module= binutils; bootstrap=true; };
+host_modules= { module= bison; no_check_cross= true; };
+host_modules= { module= cgen; };
+host_modules= { module= dejagnu; };
+host_modules= { module= etc; };
+host_modules= { module= fastjar; no_check_cross= true; };
+host_modules= { module= fixincludes;
+		missing= TAGS; };
+host_modules= { module= flex; no_check_cross= true; };
+host_modules= { module= gas; bootstrap=true; };
+host_modules= { module= gcc; bootstrap=true; 
+		extra_make_flags="$(EXTRA_GCC_FLAGS)"; };
+host_modules= { module= gmp; lib_path=.libs; bootstrap=true;
+		extra_configure_flags='--disable-shared';
+		no_install= true;
+		// none-*-* disables asm optimizations, bootstrap-testing
+		// the compiler more thoroughly.
+	        host="none-${host_vendor}-${host_os}";
+		// gmp's configure will complain if given anything
+		// different from host for target.
+	        target="none-${host_vendor}-${host_os}"; };
+host_modules= { module= mpfr; lib_path=.libs; bootstrap=true;
+		extra_configure_flags='--disable-shared @extra_mpfr_configure_flags@';
+		no_install= true; };
+host_modules= { module= mpc; lib_path=.libs; bootstrap=true;
+		extra_configure_flags='--disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@';
+		no_install= true; };
+host_modules= { module= ppl; lib_path=src/.libs; bootstrap=true;
+		extra_configure_flags='--disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/';
+		no_install= true; };
+host_modules= { module= cloog; lib_path=.libs; bootstrap=true;
+		extra_configure_flags='--disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl';
+		extra_exports='CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS; ';
+		extra_make_flags='CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"';
+		no_install= true; };
+host_modules= { module= libelf; lib_path=.libs; bootstrap=true;
+		extra_configure_flags='--disable-shared';
+		no_install= true; };
+host_modules= { module= gold; bootstrap=true; };
+host_modules= { module= gprof; };
+host_modules= { module= intl; bootstrap=true; };
+host_modules= { module= tcl;
+                missing=mostlyclean; };
+host_modules= { module= itcl; };
+host_modules= { module= ld; bootstrap=true; };
+host_modules= { module= libcpp; bootstrap=true; };
+host_modules= { module= libdecnumber; bootstrap=true; };
+host_modules= { module= libgui; };
+host_modules= { module= libiberty; bootstrap=true;
+	        extra_configure_flags='@extra_host_libiberty_configure_flags@';};
+// We abuse missing to avoid installing anything for libiconv.
+host_modules= { module= libiconv;
+		extra_configure_flags='--disable-shared';
+		no_install= true;
+		missing= install-info;
+		missing= install-pdf;
+		missing= install-html;
+		missing= install-info; };
+host_modules= { module= m4; };
+host_modules= { module= readline; };
+host_modules= { module= sid; };
+host_modules= { module= sim; };
+host_modules= { module= texinfo; no_install= true; };
+host_modules= { module= zlib; no_install=true; no_check=true; bootstrap=true; };
+host_modules= { module= gdb; };
+host_modules= { module= expect; };
+host_modules= { module= guile; };
+host_modules= { module= tk; };
+host_modules= { module= libtermcap; no_check=true; 
+                missing=mostlyclean;
+                missing=clean;
+                missing=distclean;
+                missing=maintainer-clean; };
+host_modules= { module= utils; no_check=true; };
+host_modules= { module= gnattools; };
+host_modules= { module= lto-plugin; bootstrap=true;
+		extra_configure_flags=--enable-shared; };
+
+target_modules = { module= libstdc++-v3;
+		   bootstrap=true;
+		   lib_path=src/.libs;
+		   raw_cxx=true; };
+target_modules = { module= libmudflap; lib_path=.libs; };
+target_modules = { module= libssp; lib_path=.libs; };
+target_modules = { module= newlib; };
+target_modules = { module= libgcc; bootstrap=true; no_check=true; };
+target_modules = { module= libquadmath; };
+target_modules = { module= libgfortran; };
+target_modules = { module= libobjc; };
+target_modules = { module= libgo; };
+target_modules = { module= libtermcap; no_check=true;
+                   missing=mostlyclean;
+                   missing=clean;
+                   missing=distclean;
+                   missing=maintainer-clean; };
+target_modules = { module= winsup; };
+target_modules = { module= libgloss; no_check=true; };
+target_modules = { module= libffi; };
+target_modules = { module= libjava; raw_cxx=true;
+                   extra_configure_flags="$(EXTRA_CONFIGARGS_LIBJAVA)"; };
+target_modules = { module= zlib; };
+target_modules = { module= boehm-gc; };
+target_modules = { module= rda; };
+target_modules = { module= libada; };
+target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
+
+// These are (some of) the make targets to be done in each subdirectory.
+// Not all; these are the ones which don't have special options.
+// "depend" indicates that a target depends on another target uniformly
+// for each subdirectory.  There can be several such lines per target.
+recursive_targets = { make_target= info; 
+                      depend=configure; };
+recursive_targets = { make_target= dvi; 
+                      depend=configure; };
+recursive_targets = { make_target= pdf; 
+                      depend=configure; };
+recursive_targets = { make_target= html; 
+                      depend=configure; };
+recursive_targets = { make_target= TAGS; 
+                      depend=configure; };
+recursive_targets = { make_target= install-info; 
+                      depend=configure;
+                      depend=info; };
+recursive_targets = { make_target= install-pdf; 
+                      depend=configure;
+                      depend=pdf; };
+recursive_targets = { make_target= install-html; 
+                      depend=configure;
+                      depend=html; };
+recursive_targets = { make_target= installcheck; 
+                      depend=configure; };
+recursive_targets = { make_target= mostlyclean; };
+recursive_targets = { make_target= clean; };
+recursive_targets = { make_target= distclean; };
+recursive_targets = { make_target= maintainer-clean; };
+
+// Flags which need to be passed down.
+
+// Directories etc.
+flags_to_pass = { flag= DESTDIR ; };
+flags_to_pass = { flag= RPATH_ENVVAR ; };
+flags_to_pass = { flag= TARGET_SUBDIR ; };
+flags_to_pass = { flag= bindir ; };
+flags_to_pass = { flag= datadir ; };
+flags_to_pass = { flag= exec_prefix ; };
+flags_to_pass = { flag= includedir ; };
+flags_to_pass = { flag= datarootdir ; };
+flags_to_pass = { flag= docdir ; };
+flags_to_pass = { flag= infodir ; };
+flags_to_pass = { flag= pdfdir ; };
+flags_to_pass = { flag= htmldir ; };
+flags_to_pass = { flag= libdir ; };
+flags_to_pass = { flag= libexecdir ; };
+flags_to_pass = { flag= lispdir ; };
+flags_to_pass = { flag= localstatedir ; };
+flags_to_pass = { flag= mandir ; };
+flags_to_pass = { flag= oldincludedir ; };
+flags_to_pass = { flag= prefix ; };
+flags_to_pass = { flag= sbindir ; };
+flags_to_pass = { flag= sharedstatedir ; };
+flags_to_pass = { flag= sysconfdir ; };
+flags_to_pass = { flag= tooldir ; };
+flags_to_pass = { flag= build_tooldir ; };
+flags_to_pass = { flag= target_alias ; };
+
+// Build tools
+flags_to_pass = { flag= AWK ; };
+flags_to_pass = { flag= BISON ; };
+flags_to_pass = { flag= CC_FOR_BUILD ; };
+flags_to_pass = { flag= CFLAGS_FOR_BUILD ; };
+flags_to_pass = { flag= CXX_FOR_BUILD ; };
+flags_to_pass = { flag= EXPECT ; };
+flags_to_pass = { flag= FLEX ; };
+flags_to_pass = { flag= INSTALL ; };
+flags_to_pass = { flag= INSTALL_DATA ; };
+flags_to_pass = { flag= INSTALL_PROGRAM ; };
+flags_to_pass = { flag= INSTALL_SCRIPT ; };
+flags_to_pass = { flag= LDFLAGS_FOR_BUILD ; };
+flags_to_pass = { flag= LEX ; };
+flags_to_pass = { flag= M4 ; };
+flags_to_pass = { flag= MAKE ; };
+flags_to_pass = { flag= RUNTEST ; };
+flags_to_pass = { flag= RUNTESTFLAGS ; };
+flags_to_pass = { flag= SED ; };
+flags_to_pass = { flag= SHELL ; };
+flags_to_pass = { flag= YACC ; };
+
+// Host tools
+flags_to_pass = { flag= ADAFLAGS ; optional=true ; };
+flags_to_pass = { flag= ADA_CFLAGS ; };
+flags_to_pass = { flag= AR_FLAGS ; };
+flags_to_pass = { flag= BOOT_ADAFLAGS ; optional=true ; };
+flags_to_pass = { flag= BOOT_CFLAGS ; };
+flags_to_pass = { flag= BOOT_LDFLAGS ; };
+flags_to_pass = { flag= CFLAGS ; };
+flags_to_pass = { flag= CXXFLAGS ; };
+flags_to_pass = { flag= LDFLAGS ; };
+flags_to_pass = { flag= LIBCFLAGS ; };
+flags_to_pass = { flag= LIBCXXFLAGS ; };
+flags_to_pass = { flag= STAGE1_CHECKING ; };
+flags_to_pass = { flag= STAGE1_LANGUAGES ; };
+flags_to_pass = { flag= GNATBIND ; };
+flags_to_pass = { flag= GNATMAKE ; };
+
+// Target tools
+flags_to_pass = { flag= AR_FOR_TARGET ; };
+flags_to_pass = { flag= AS_FOR_TARGET ; };
+flags_to_pass = { flag= CC_FOR_TARGET ; };
+flags_to_pass = { flag= CFLAGS_FOR_TARGET ; };
+flags_to_pass = { flag= CPPFLAGS_FOR_TARGET ; };
+flags_to_pass = { flag= CXXFLAGS_FOR_TARGET ; };
+flags_to_pass = { flag= DLLTOOL_FOR_TARGET ; };
+flags_to_pass = { flag= FLAGS_FOR_TARGET ; };
+flags_to_pass = { flag= GCJ_FOR_TARGET ; };
+flags_to_pass = { flag= GFORTRAN_FOR_TARGET ; };
+flags_to_pass = { flag= GOC_FOR_TARGET ; };
+flags_to_pass = { flag= GOCFLAGS_FOR_TARGET ; };
+flags_to_pass = { flag= LD_FOR_TARGET ; };
+flags_to_pass = { flag= LIPO_FOR_TARGET ; };
+flags_to_pass = { flag= LDFLAGS_FOR_TARGET ; };
+flags_to_pass = { flag= LIBCFLAGS_FOR_TARGET ; };
+flags_to_pass = { flag= LIBCXXFLAGS_FOR_TARGET ; };
+flags_to_pass = { flag= NM_FOR_TARGET ; };
+flags_to_pass = { flag= OBJDUMP_FOR_TARGET ; };
+flags_to_pass = { flag= RANLIB_FOR_TARGET ; };
+flags_to_pass = { flag= STRIP_FOR_TARGET ; };
+flags_to_pass = { flag= WINDRES_FOR_TARGET ; };
+flags_to_pass = { flag= WINDMC_FOR_TARGET ; };
+
+// Miscellaneous
+flags_to_pass = { flag= BUILD_CONFIG ; };
+flags_to_pass = { flag= LANGUAGES ; optional=true ; };
+flags_to_pass = { flag= LEAN ; };
+
+// Inter-module dependencies
+
+// Build modules
+dependencies = { module=all-build-bison; on=all-build-texinfo; };
+dependencies = { module=all-build-flex; on=all-build-texinfo; };
+dependencies = { module=all-build-flex; on=all-build-bison; };
+dependencies = { module=all-build-flex; on=all-build-m4; };
+dependencies = { module=all-build-libiberty; on=all-build-texinfo; };
+dependencies = { module=all-build-m4; on=all-build-texinfo; };
+dependencies = { module=all-build-fixincludes; on=all-build-libiberty; };
+
+// Host modules specific to gcc.
+dependencies = { module=configure-gcc; on=configure-intl; };
+dependencies = { module=configure-gcc; on=all-lto-plugin; };
+dependencies = { module=configure-gcc; on=all-binutils; };
+dependencies = { module=configure-gcc; on=all-gas; };
+dependencies = { module=configure-gcc; on=all-ld; };
+dependencies = { module=configure-gcc; on=all-gold; };
+dependencies = { module=configure-gcc; on=all-libelf; };
+dependencies = { module=all-gcc; on=all-libiberty; hard=true; };
+dependencies = { module=all-gcc; on=all-gmp; };
+dependencies = { module=all-gcc; on=all-intl; };
+dependencies = { module=all-gcc; on=all-mpfr; };
+dependencies = { module=all-gcc; on=all-mpc; };
+dependencies = { module=all-gcc; on=all-ppl; };
+dependencies = { module=all-gcc; on=all-cloog; };
+dependencies = { module=all-gcc; on=all-build-texinfo; };
+dependencies = { module=all-gcc; on=all-build-bison; };
+dependencies = { module=all-gcc; on=all-build-flex; };
+dependencies = { module=all-gcc; on=all-build-libiberty; };
+dependencies = { module=all-gcc; on=all-build-fixincludes; };
+dependencies = { module=all-gcc; on=all-zlib; };
+dependencies = { module=all-gcc; on=all-libcpp; hard=true; };
+dependencies = { module=all-gcc; on=all-libdecnumber; hard=true; };
+dependencies = { module=all-gcc; on=all-libiberty; };
+dependencies = { module=all-gcc; on=all-fixincludes; };
+dependencies = { module=all-gcc; on=all-lto-plugin; };
+dependencies = { module=info-gcc; on=all-build-libiberty; };
+dependencies = { module=dvi-gcc; on=all-build-libiberty; };
+dependencies = { module=pdf-gcc; on=all-build-libiberty; };
+dependencies = { module=html-gcc; on=all-build-libiberty; };
+dependencies = { module=install-gcc ; on=install-fixincludes; };
+dependencies = { module=install-gcc ; on=install-lto-plugin; };
+dependencies = { module=install-strip-gcc ; on=install-strip-fixincludes; };
+
+dependencies = { module=configure-libcpp; on=configure-libiberty; hard=true; };
+dependencies = { module=configure-libcpp; on=configure-intl; };
+dependencies = { module=all-libcpp; on=all-libiberty; hard=true; };
+dependencies = { module=all-libcpp; on=all-intl; };
+
+dependencies = { module=all-fixincludes; on=all-libiberty; };
+
+dependencies = { module=all-gnattools; on=all-target-libada; };
+
+dependencies = { module=all-lto-plugin; on=all-libiberty; };
+
+dependencies = { module=all-utils; on=all-libiberty; };
+
+dependencies = { module=configure-mpfr; on=all-gmp; };
+dependencies = { module=configure-mpc; on=all-mpfr; };
+dependencies = { module=configure-ppl; on=all-gmp; };
+dependencies = { module=configure-ppl; on=all-mpfr; };
+dependencies = { module=configure-cloog; on=all-ppl; };
+
+// Host modules specific to gdb.
+dependencies = { module=configure-gdb; on=all-intl; };
+dependencies = { module=configure-gdb; on=configure-sim; };
+dependencies = { module=configure-gdb; on=all-bfd; };
+// Depend on all-libiconv so that configure checks for iconv
+// functions will work.
+dependencies = { module=configure-gdb; on=all-libiconv; };
+dependencies = { module=all-gdb; on=all-libiberty; };
+dependencies = { module=all-gdb; on=all-libiconv; };
+dependencies = { module=all-gdb; on=all-opcodes; };
+dependencies = { module=all-gdb; on=all-readline; };
+dependencies = { module=all-gdb; on=all-build-bison; };
+dependencies = { module=all-gdb; on=all-sim; };
+dependencies = { module=all-gdb; on=all-libdecnumber; };
+dependencies = { module=all-gdb; on=all-libtermcap; };
+
+dependencies = { module=configure-libgui; on=configure-tcl; };
+dependencies = { module=configure-libgui; on=configure-tk; };
+dependencies = { module=all-libgui; on=all-tcl; };
+dependencies = { module=all-libgui; on=all-tk; };
+dependencies = { module=all-libgui; on=all-itcl; };
+
+// Host modules specific to binutils.
+dependencies = { module=configure-bfd; on=configure-libiberty; hard=true; };
+dependencies = { module=configure-bfd; on=configure-intl; };
+dependencies = { module=all-bfd; on=all-libiberty; };
+dependencies = { module=all-bfd; on=all-intl; };
+dependencies = { module=configure-opcodes; on=configure-libiberty; hard=true; };
+dependencies = { module=all-opcodes; on=all-libiberty; };
+
+dependencies = { module=configure-binutils; on=configure-intl; };
+dependencies = { module=all-binutils; on=all-libiberty; };
+dependencies = { module=all-binutils; on=all-opcodes; };
+dependencies = { module=all-binutils; on=all-bfd; };
+dependencies = { module=all-binutils; on=all-build-flex; };
+dependencies = { module=all-binutils; on=all-build-bison; };
+dependencies = { module=all-binutils; on=all-intl; };
+
+// We put install-opcodes before install-binutils because the installed
+// binutils might be on PATH, and they might need the shared opcodes
+// library.
+dependencies = { module=install-binutils; on=install-opcodes; };
+dependencies = { module=install-strip-binutils; on=install-strip-opcodes; };
+
+// libopcodes depends on libbfd
+dependencies = { module=install-opcodes; on=install-bfd; };
+dependencies = { module=install-strip-opcodes; on=install-strip-bfd; };
+
+dependencies = { module=configure-gas; on=configure-intl; };
+dependencies = { module=all-gas; on=all-libiberty; };
+dependencies = { module=all-gas; on=all-opcodes; };
+dependencies = { module=all-gas; on=all-bfd; };
+dependencies = { module=all-gas; on=all-intl; };
+dependencies = { module=configure-gprof; on=configure-intl; };
+dependencies = { module=all-gprof; on=all-libiberty; };
+dependencies = { module=all-gprof; on=all-bfd; };
+dependencies = { module=all-gprof; on=all-opcodes; };
+dependencies = { module=all-gprof; on=all-intl; };
+dependencies = { module=configure-ld; on=configure-intl; };
+dependencies = { module=all-ld; on=all-libiberty; };
+dependencies = { module=all-ld; on=all-bfd; };
+dependencies = { module=all-ld; on=all-opcodes; };
+dependencies = { module=all-ld; on=all-build-bison; };
+dependencies = { module=all-ld; on=all-build-flex; };
+dependencies = { module=all-ld; on=all-intl; };
+dependencies = { module=install-ld; on=install-gold; };
+dependencies = { module=install-strip-ld; on=install-strip-gold; };
+dependencies = { module=configure-gold; on=configure-intl; };
+dependencies = { module=all-gold; on=all-libiberty; };
+dependencies = { module=all-gold; on=all-intl; };
+dependencies = { module=all-gold; on=all-bfd; };
+dependencies = { module=all-gold; on=all-build-bison; };
+dependencies = { module=check-gold; on=all-binutils; };
+dependencies = { module=check-gold; on=all-gas; };
+
+dependencies = { module=configure-opcodes; on=configure-intl; };
+dependencies = { module=all-opcodes; on=all-bfd; };
+dependencies = { module=all-opcodes; on=all-libiberty; };
+dependencies = { module=all-opcodes; on=all-intl; };
+
+// Other host modules in the 'src' repository.
+dependencies = { module=all-dejagnu; on=all-tcl; };
+dependencies = { module=all-dejagnu; on=all-expect; };
+dependencies = { module=all-dejagnu; on=all-tk; };
+dependencies = { module=configure-expect; on=configure-tcl; };
+dependencies = { module=configure-expect; on=configure-tk; };
+dependencies = { module=all-expect; on=all-tcl; };
+dependencies = { module=all-expect; on=all-tk; };
+
+// We put install-tcl before install-itcl because itcl wants to run a
+// program on installation which uses the Tcl libraries.
+dependencies = { module=configure-itcl; on=configure-tcl; };
+dependencies = { module=configure-itcl; on=configure-tk; };
+dependencies = { module=all-itcl; on=all-tcl; };
+dependencies = { module=all-itcl; on=all-tk; };
+dependencies = { module=install-itcl; on=install-tcl; };
+dependencies = { module=install-strip-itcl; on=install-strip-tcl; };
+
+dependencies = { module=configure-tk; on=configure-tcl; };
+dependencies = { module=all-tk; on=all-tcl; };
+
+dependencies = { module=all-sid; on=all-libiberty; };
+dependencies = { module=all-sid; on=all-bfd; };
+dependencies = { module=all-sid; on=all-opcodes; };
+dependencies = { module=all-sid; on=all-tcl; };
+dependencies = { module=all-sid; on=all-tk; };
+dependencies = { module=install-sid; on=install-tcl; };
+dependencies = { module=install-strip-sid; on=install-strip-tcl; };
+dependencies = { module=install-sid; on=install-tk; };
+dependencies = { module=install-strip-sid; on=install-strip-tk; };
+
+dependencies = { module=configure-sim; on=configure-intl; };
+dependencies = { module=all-sim; on=all-intl; };
+dependencies = { module=all-sim; on=all-libiberty; };
+dependencies = { module=all-sim; on=all-bfd; };
+dependencies = { module=all-sim; on=all-opcodes; };
+dependencies = { module=all-sim; on=all-readline; };
+dependencies = { module=all-sim; on=configure-gdb; };
+
+// Other host modules.
+dependencies = { module=all-fastjar; on=all-zlib; };
+dependencies = { module=all-fastjar; on=all-build-texinfo; };
+dependencies = { module=all-fastjar; on=all-libiberty; };
+
+// Warning, these are not well tested.
+dependencies = { module=all-bison; on=all-intl; };
+dependencies = { module=all-bison; on=all-build-texinfo; };
+dependencies = { module=all-flex; on=all-build-bison; };
+dependencies = { module=all-flex; on=all-intl; };
+dependencies = { module=all-flex; on=all-m4; };
+dependencies = { module=all-flex; on=all-build-texinfo; };
+dependencies = { module=all-m4; on=all-intl; };
+dependencies = { module=all-m4; on=all-build-texinfo; };
+
+// Target modules.  These can also have dependencies on the language
+// environment (e.g. on libstdc++).  By default target modules depend
+// on libgcc and newlib/libgloss.
+lang_env_dependencies = { module=libjava; cxx=true; };
+lang_env_dependencies = { module=newlib; no_c=true; };
+lang_env_dependencies = { module=libgloss; no_c=true; };
+lang_env_dependencies = { module=libgcc; no_gcc=true; no_c=true; };
+// libiberty does not depend on newlib or libgloss because it must be
+// built newlib on some targets (e.g. Cygwin).  It still needs
+// a dependency on libgcc for native targets to configure.
+lang_env_dependencies = { module=libiberty; no_c=true; };
+
+dependencies = { module=configure-target-boehm-gc; on=all-target-libstdc++-v3; };
+dependencies = { module=configure-target-fastjar; on=configure-target-zlib; };
+dependencies = { module=all-target-fastjar; on=all-target-zlib; };
+dependencies = { module=configure-target-libgo; on=configure-target-libffi; };
+dependencies = { module=configure-target-libgo; on=all-target-libstdc++-v3; };
+dependencies = { module=all-target-libgo; on=all-target-libffi; };
+dependencies = { module=configure-target-libjava; on=configure-target-zlib; };
+dependencies = { module=configure-target-libjava; on=configure-target-boehm-gc; };
+dependencies = { module=configure-target-libjava; on=configure-target-libffi; };
+dependencies = { module=all-target-libjava; on=all-fastjar; };
+dependencies = { module=all-target-libjava; on=all-target-zlib; };
+dependencies = { module=all-target-libjava; on=all-target-boehm-gc; };
+dependencies = { module=all-target-libjava; on=all-target-libffi; };
+dependencies = { module=configure-target-libobjc; on=configure-target-boehm-gc; };
+dependencies = { module=all-target-libobjc; on=all-target-boehm-gc; };
+dependencies = { module=configure-target-libstdc++-v3; on=configure-target-libgomp; };
+// parallel_list.o and parallel_settings.o depend on omp.h, which is
+// generated by the libgomp configure.  Unfortunately, due to the use of
+//  recursive make, we can't be that specific.
+dependencies = { module=all-target-libstdc++-v3; on=configure-target-libgomp; };
+
+// Target modules in the 'src' repository.
+lang_env_dependencies = { module=libtermcap; };
+lang_env_dependencies = { module=rda; };
+lang_env_dependencies = { module=winsup; };
+
+dependencies = { module=all-target-libgloss; on=all-target-newlib; };
+dependencies = { module=all-target-winsup; on=all-target-libtermcap; };
+dependencies = { module=configure-target-newlib; on=all-binutils; };
+dependencies = { module=configure-target-newlib; on=all-ld; };
+dependencies = { module=configure-target-libgfortran; on=all-target-libquadmath; };
+
+languages = { language=c;	gcc-check-target=check-gcc; };
+languages = { language=c++;	gcc-check-target="check-c++ check-c++0x";
+				lib-check-target=check-target-libstdc++-v3;
+				lib-check-target=check-target-libmudflap-c++; };
+languages = { language=fortran;	gcc-check-target=check-fortran;
+				lib-check-target=check-target-libquadmath;
+				lib-check-target=check-target-libgfortran; };
+languages = { language=java;	gcc-check-target=check-java;
+				lib-check-target=check-target-libjava; };
+languages = { language=ada;	gcc-check-target=check-ada;
+				lib-check-target=check-target-libada; };
+languages = { language=objc;	gcc-check-target=check-objc;
+				lib-check-target=check-target-libobjc; };
+languages = { language=obj-c++;	gcc-check-target=check-obj-c++; };
+languages = { language=go;	gcc-check-target=check-go;
+				lib-check-target=check-target-libgo; };
+
+// Toplevel bootstrap
+bootstrap_stage = { id=1 ; };
+bootstrap_stage = {
+	id=2 ; prev=1 ;
+	bootstrap_target=bootstrap2 ; };
+bootstrap_stage = {
+	id=3 ; prev=2 ; lean=1 ;
+	compare_target=compare ;
+	bootstrap_target=bootstrap ;
+	cleanstrap_target=cleanstrap ; };
+bootstrap_stage = {
+	id=4 ; prev=3 ; lean=2 ;
+	compare_target=compare3 ;
+	bootstrap_target=bootstrap4 ; };
+bootstrap_stage = {
+	id=profile ; prev=1 ; };
+bootstrap_stage = {
+	id=feedback ; prev=profile ;
+	bootstrap_target=profiledbootstrap ; };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/Makefile.in sdcc-3.2.0+dfsg/support/sdbinutils/Makefile.in
--- sdcc-3.1.0+dfsg/support/sdbinutils/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/Makefile.in	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,43116 @@
+
+# Makefile.in is generated from Makefile.tpl by 'autogen Makefile.def'.
+#
+# Makefile for directory with subdirs to build.
+#   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+#   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+#
+
+# First, test for a proper version of make, but only where one is required.
+
+@if gcc
+ifeq (,$(.VARIABLES)) # The variable .VARIABLES, new with 3.80, is never empty.
+$(error GNU make version 3.80 or newer is required.)
+endif
+@endif gcc
+
+# -------------------------------
+# Standard Autoconf-set variables
+# -------------------------------
+VPATH=@srcdir@
+
+build_alias=@build_noncanonical@
+build_vendor=@build_vendor@
+build_os=@build_os@
+build=@build@
+host_alias=@host_noncanonical@
+host_vendor=@host_vendor@
+host_os=@host_os@
+host=@host@
+target_alias=@target_noncanonical@
+target_vendor=@target_vendor@
+target_os=@target_os@
+target=@target@
+
+program_transform_name = @program_transform_name@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+srcdir = @srcdir@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+includedir = @includedir@
+oldincludedir = @oldincludedir@
+infodir = @infodir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+pdfdir = @pdfdir@
+htmldir = @htmldir@
+mandir = @mandir@
+man1dir = $(mandir)/man1
+man2dir = $(mandir)/man2
+man3dir = $(mandir)/man3
+man4dir = $(mandir)/man4
+man5dir = $(mandir)/man5
+man6dir = $(mandir)/man6
+man7dir = $(mandir)/man7
+man8dir = $(mandir)/man8
+man9dir = $(mandir)/man9
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_DATA = @INSTALL_DATA@
+LN = @LN@
+LN_S = @LN_S@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+
+# -------------------------------------------------
+# Miscellaneous non-standard autoconf-set variables
+# -------------------------------------------------
+
+# The gcc driver likes to know the arguments it was configured with.
+TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@
+
+tooldir = @tooldir@
+build_tooldir = @build_tooldir@
+
+# This is the name of the environment variable used for the path to
+# the libraries.
+RPATH_ENVVAR = @RPATH_ENVVAR@
+
+# On targets where RPATH_ENVVAR is PATH, a subdirectory of the GCC build path
+# is used instead of the directory itself to avoid including built
+# executables in PATH.
+GCC_SHLIB_SUBDIR = @GCC_SHLIB_SUBDIR@
+
+# Build programs are put under this directory.
+BUILD_SUBDIR = @build_subdir@
+# This is set by the configure script to the arguments to use when configuring
+# directories built for the build system.
+BUILD_CONFIGARGS = @build_configargs@ --with-build-subdir="$(BUILD_SUBDIR)"
+
+# Linker flags to use on the host, for stage1 or when not
+# bootstrapping.
+STAGE1_LDFLAGS = @stage1_ldflags@
+
+# Libraries to use on the host, for stage1 or when not bootstrapping.
+STAGE1_LIBS = @stage1_libs@
+
+# Linker flags to use for stage2 and later.
+POSTSTAGE1_LDFLAGS = @poststage1_ldflags@
+
+# Libraries to use for stage2 and later.
+POSTSTAGE1_LIBS = @poststage1_libs@
+
+# This is the list of variables to export in the environment when
+# configuring any subdirectory.  It must also be exported whenever
+# recursing into a build directory in case that directory's Makefile
+# re-runs configure.
+BASE_EXPORTS = \
+	FLEX="$(FLEX)"; export FLEX; \
+	LEX="$(LEX)"; export LEX; \
+	BISON="$(BISON)"; export BISON; \
+	YACC="$(YACC)"; export YACC; \
+	M4="$(M4)"; export M4; \
+	SED="$(SED)"; export SED; \
+	AWK="$(AWK)"; export AWK; \
+	MAKEINFO="$(MAKEINFO)"; export MAKEINFO;
+
+# This is the list of variables to export in the environment when
+# configuring subdirectories for the build system.
+BUILD_EXPORTS = \
+	$(BASE_EXPORTS) \
+	AR="$(AR_FOR_BUILD)"; export AR; \
+	AS="$(AS_FOR_BUILD)"; export AS; \
+	CC="$(CC_FOR_BUILD)"; export CC; \
+	CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
+	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+	CXX="$(CXX_FOR_BUILD)"; export CXX; \
+	CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
+	GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \
+	GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
+	GOC="$(GOC_FOR_BUILD)"; export GOC; \
+	GOCFLAGS="$(GOCFLAGS_FOR_BUILD)"; export GOCFLAGS; \
+	DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
+	LD="$(LD_FOR_BUILD)"; export LD; \
+	LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \
+	NM="$(NM_FOR_BUILD)"; export NM; \
+	RANLIB="$(RANLIB_FOR_BUILD)"; export RANLIB; \
+	WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \
+	WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC;
+
+# These variables must be set on the make command line for directories
+# built for the build system to override those in BASE_FLAGS_TO_PASSS.
+EXTRA_BUILD_FLAGS = \
+	CFLAGS="$(CFLAGS_FOR_BUILD)" \
+	LDFLAGS="$(LDFLAGS_FOR_BUILD)"
+
+# This is the list of directories to built for the host system.
+SUBDIRS = @configdirs@
+TARGET_CONFIGDIRS = @target_configdirs@
+# This is set by the configure script to the arguments to use when configuring
+# directories built for the host system.
+HOST_CONFIGARGS = @host_configargs@
+# Host programs are put under this directory, which is . except if building
+# with srcdir=..
+HOST_SUBDIR = @host_subdir@
+# This is the list of variables to export in the environment when
+# configuring subdirectories for the host system.  We need to pass
+# some to the GCC configure because of its hybrid host/target nature.
+HOST_EXPORTS = \
+	$(BASE_EXPORTS) \
+	CC="$(CC)"; export CC; \
+	ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \
+	CFLAGS="$(CFLAGS)"; export CFLAGS; \
+	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+	CXX="$(CXX)"; export CXX; \
+	CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
+	GCJ="$(GCJ)"; export GCJ; \
+	GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \
+	GOC="$(GOC)"; export GOC; \
+	AR="$(AR)"; export AR; \
+	AS="$(AS)"; export AS; \
+	CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
+	DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
+	LD="$(LD)"; export LD; \
+	LDFLAGS="$(STAGE1_LDFLAGS) $(LDFLAGS)"; export LDFLAGS; \
+	NM="$(NM)"; export NM; \
+	RANLIB="$(RANLIB)"; export RANLIB; \
+	WINDRES="$(WINDRES)"; export WINDRES; \
+	WINDMC="$(WINDMC)"; export WINDMC; \
+	OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
+	OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+	AR_FOR_TARGET="$(AR_FOR_TARGET)"; export AR_FOR_TARGET; \
+	AS_FOR_TARGET="$(AS_FOR_TARGET)"; export AS_FOR_TARGET; \
+	GCC_FOR_TARGET="$(GCC_FOR_TARGET)"; export GCC_FOR_TARGET; \
+	LD_FOR_TARGET="$(LD_FOR_TARGET)"; export LD_FOR_TARGET; \
+	NM_FOR_TARGET="$(NM_FOR_TARGET)"; export NM_FOR_TARGET; \
+	OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP_FOR_TARGET; \
+	RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
+	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
+	HOST_LIBS="$(STAGE1_LIBS)"; export HOST_LIBS; \
+	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
+	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
+	PPLLIBS="$(HOST_PPLLIBS)"; export PPLLIBS; \
+	PPLINC="$(HOST_PPLINC)"; export PPLINC; \
+	CLOOGLIBS="$(HOST_CLOOGLIBS)"; export CLOOGLIBS; \
+	CLOOGINC="$(HOST_CLOOGINC)"; export CLOOGINC; \
+	LIBELFLIBS="$(HOST_LIBELFLIBS)" ; export LIBELFLIBS; \
+	LIBELFINC="$(HOST_LIBELFINC)" ; export LIBELFINC; \
+@if gcc-bootstrap
+	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
+@endif gcc-bootstrap
+	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
+
+POSTSTAGE1_CXX_EXPORT = \
+	CXX='$(CXX)'; export CXX; \
+	CXX_FOR_BUILD='$(CXX_FOR_BUILD)'; export CXX_FOR_BUILD;
+@if target-libstdc++-v3-bootstrap
+# Override the above if we're bootstrapping C++.
+POSTSTAGE1_CXX_EXPORT = \
+	CXX="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/g++$(exeext) \
+	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ -nostdinc++ \
+	  -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
+	  -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
+	  -I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include/$(TARGET_SUBDIR) \
+	  -I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include \
+	  -I$$s/libstdc++-v3/libsupc++ \
+	  -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
+	  -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs"; \
+	  export CXX; \
+	CXX_FOR_BUILD="$$CXX"; export CXX_FOR_BUILD;
+@endif target-libstdc++-v3-bootstrap
+
+# Similar, for later GCC stages.
+POSTSTAGE1_HOST_EXPORTS = \
+	$(HOST_EXPORTS) \
+	CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
+	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ \
+	  $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
+	CC_FOR_BUILD="$$CC"; export CC_FOR_BUILD; \
+	$(POSTSTAGE1_CXX_EXPORT) \
+	GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND; \
+	LDFLAGS="$(POSTSTAGE1_LDFLAGS) $(BOOT_LDFLAGS)"; export LDFLAGS; \
+	HOST_LIBS="$(POSTSTAGE1_LIBS)"; export HOST_LIBS;
+
+# Target libraries are put under this directory:
+TARGET_SUBDIR = @target_subdir@
+# This is set by the configure script to the arguments to use when configuring
+# directories built for the target.
+TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)"
+# This is the list of variables to export in the environment when
+# configuring subdirectories for the target system.
+BASE_TARGET_EXPORTS = \
+	$(BASE_EXPORTS) \
+	AR="$(AR_FOR_TARGET)"; export AR; \
+	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
+	CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	GCJ="$(GCJ_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GCJ; \
+	GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \
+	GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \
+	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
+	LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+	LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \
+	NM="$(COMPILER_NM_FOR_TARGET)"; export NM; \
+	OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \
+	RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
+	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+	WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
+@if gcc-bootstrap
+	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
+@endif gcc-bootstrap
+	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
+	TARGET_CONFIGDIRS="$(TARGET_CONFIGDIRS)"; export TARGET_CONFIGDIRS;
+
+RAW_CXX_TARGET_EXPORTS = \
+	$(BASE_TARGET_EXPORTS) \
+	CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
+	CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
+
+NORMAL_TARGET_EXPORTS = \
+	$(BASE_TARGET_EXPORTS) \
+	CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
+
+# Where to find GMP
+HOST_GMPLIBS = @gmplibs@
+HOST_GMPINC = @gmpinc@
+
+# Where to find PPL
+HOST_PPLLIBS = @ppllibs@
+HOST_PPLINC = @pplinc@
+
+# Where to find CLOOG
+HOST_CLOOGLIBS = @clooglibs@
+HOST_CLOOGINC = @clooginc@
+
+# Where to find libelf
+HOST_LIBELFLIBS = @libelflibs@
+HOST_LIBELFINC = @libelfinc@
+
+EXTRA_CONFIGARGS_LIBJAVA = @EXTRA_CONFIGARGS_LIBJAVA@
+
+# ----------------------------------------------
+# Programs producing files for the BUILD machine
+# ----------------------------------------------
+
+SHELL = @SHELL@
+
+# pwd command to use.  Allow user to override default by setting PWDCMD in
+# the environment to account for automounters.  The make variable must not
+# be called PWDCMD, otherwise the value set here is passed to make
+# subprocesses and overrides the setting from the user's environment.
+# Don't use PWD since it is a common shell environment variable and we
+# don't want to corrupt it.
+PWD_COMMAND = $${PWDCMD-pwd}
+
+# compilers to use to create programs which must be run in the build
+# environment.
+AR_FOR_BUILD = @AR_FOR_BUILD@
+AS_FOR_BUILD = @AS_FOR_BUILD@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
+CXX_FOR_BUILD = @CXX_FOR_BUILD@
+DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
+GCJ_FOR_BUILD = @GCJ_FOR_BUILD@
+GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@
+GOC_FOR_BUILD = @GOC_FOR_BUILD@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LD_FOR_BUILD = @LD_FOR_BUILD@
+NM_FOR_BUILD = @NM_FOR_BUILD@
+RANLIB_FOR_BUILD = @RANLIB_FOR_BUILD@
+WINDMC_FOR_BUILD = @WINDMC_FOR_BUILD@
+WINDRES_FOR_BUILD = @WINDRES_FOR_BUILD@
+
+# Special variables passed down in EXTRA_GCC_FLAGS.  They are defined
+# here so that they can be overridden by Makefile fragments.
+BUILD_PREFIX = @BUILD_PREFIX@
+BUILD_PREFIX_1 = @BUILD_PREFIX_1@
+
+# Flags to pass to stage2 and later makes.  They are defined
+# here so that they can be overridden by Makefile fragments.
+BOOT_CFLAGS= -g -O2
+BOOT_LDFLAGS=
+BOOT_ADAFLAGS=-gnatpg -gnata
+
+AWK = @AWK@
+SED = @SED@
+BISON = @BISON@
+YACC = @YACC@
+FLEX = @FLEX@
+LEX = @LEX@
+M4 = @M4@
+MAKEINFO = @MAKEINFO@
+EXPECT = @EXPECT@
+RUNTEST = @RUNTEST@
+
+# This just becomes part of the MAKEINFO definition passed down to
+# sub-makes.  It lets flags be given on the command line while still
+# using the makeinfo from the object tree.
+# (Default to avoid splitting info files by setting the threshold high.)
+MAKEINFOFLAGS = --split-size=5000000
+
+# ---------------------------------------------
+# Programs producing files for the HOST machine
+# ---------------------------------------------
+
+AS = @AS@
+AR = @AR@
+AR_FLAGS = rc
+CC = @CC@
+CXX = @CXX@
+DLLTOOL = @DLLTOOL@
+LD = @LD@
+LIPO = @LIPO@
+NM = @NM@
+OBJDUMP = @OBJDUMP@
+RANLIB = @RANLIB@
+STRIP = @STRIP@
+WINDRES = @WINDRES@
+WINDMC = @WINDMC@
+
+GNATBIND = @GNATBIND@
+GNATMAKE = @GNATMAKE@
+
+CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBCFLAGS = $(CFLAGS)
+CXXFLAGS = @CXXFLAGS@
+LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
+GOCFLAGS = $(CFLAGS)
+
+TFLAGS =
+
+# Defaults for all stages; some are overridden below.
+
+STAGE_CFLAGS = $(BOOT_CFLAGS)
+STAGE_TFLAGS = $(TFLAGS)
+STAGE_CONFIGURE_FLAGS=@stage2_werror_flag@
+POSTSTAGE1_CONFIGURE_FLAGS = @POSTSTAGE1_CONFIGURE_FLAGS@
+
+
+# Defaults for stage 1; some are overridden below.
+STAGE1_CFLAGS = $(STAGE_CFLAGS)
+STAGE1_CXXFLAGS = $(CXXFLAGS)
+@if target-libstdc++-v3-bootstrap
+# Override the above if we're bootstrapping C++.
+STAGE1_CXXFLAGS = $(STAGE1_CFLAGS)
+@endif target-libstdc++-v3-bootstrap
+STAGE1_TFLAGS = $(STAGE_TFLAGS)
+# STAGE1_CONFIGURE_FLAGS overridden below, so we can use
+# POSTSTAGE1_CONFIGURE_FLAGS here.
+STAGE1_CONFIGURE_FLAGS = \
+	$(STAGE_CONFIGURE_FLAGS) $(POSTSTAGE1_CONFIGURE_FLAGS)
+
+# Defaults for stage 2; some are overridden below.
+STAGE2_CFLAGS = $(STAGE_CFLAGS)
+STAGE2_CXXFLAGS = $(CXXFLAGS)
+@if target-libstdc++-v3-bootstrap
+# Override the above if we're bootstrapping C++.
+STAGE2_CXXFLAGS = $(STAGE2_CFLAGS)
+@endif target-libstdc++-v3-bootstrap
+STAGE2_TFLAGS = $(STAGE_TFLAGS)
+# STAGE1_CONFIGURE_FLAGS overridden below, so we can use
+# POSTSTAGE1_CONFIGURE_FLAGS here.
+STAGE2_CONFIGURE_FLAGS = \
+	$(STAGE_CONFIGURE_FLAGS) $(POSTSTAGE1_CONFIGURE_FLAGS)
+
+# Defaults for stage 3; some are overridden below.
+STAGE3_CFLAGS = $(STAGE_CFLAGS)
+STAGE3_CXXFLAGS = $(CXXFLAGS)
+@if target-libstdc++-v3-bootstrap
+# Override the above if we're bootstrapping C++.
+STAGE3_CXXFLAGS = $(STAGE3_CFLAGS)
+@endif target-libstdc++-v3-bootstrap
+STAGE3_TFLAGS = $(STAGE_TFLAGS)
+# STAGE1_CONFIGURE_FLAGS overridden below, so we can use
+# POSTSTAGE1_CONFIGURE_FLAGS here.
+STAGE3_CONFIGURE_FLAGS = \
+	$(STAGE_CONFIGURE_FLAGS) $(POSTSTAGE1_CONFIGURE_FLAGS)
+
+# Defaults for stage 4; some are overridden below.
+STAGE4_CFLAGS = $(STAGE_CFLAGS)
+STAGE4_CXXFLAGS = $(CXXFLAGS)
+@if target-libstdc++-v3-bootstrap
+# Override the above if we're bootstrapping C++.
+STAGE4_CXXFLAGS = $(STAGE4_CFLAGS)
+@endif target-libstdc++-v3-bootstrap
+STAGE4_TFLAGS = $(STAGE_TFLAGS)
+# STAGE1_CONFIGURE_FLAGS overridden below, so we can use
+# POSTSTAGE1_CONFIGURE_FLAGS here.
+STAGE4_CONFIGURE_FLAGS = \
+	$(STAGE_CONFIGURE_FLAGS) $(POSTSTAGE1_CONFIGURE_FLAGS)
+
+# Defaults for stage profile; some are overridden below.
+STAGEprofile_CFLAGS = $(STAGE_CFLAGS)
+STAGEprofile_CXXFLAGS = $(CXXFLAGS)
+@if target-libstdc++-v3-bootstrap
+# Override the above if we're bootstrapping C++.
+STAGEprofile_CXXFLAGS = $(STAGEprofile_CFLAGS)
+@endif target-libstdc++-v3-bootstrap
+STAGEprofile_TFLAGS = $(STAGE_TFLAGS)
+# STAGE1_CONFIGURE_FLAGS overridden below, so we can use
+# POSTSTAGE1_CONFIGURE_FLAGS here.
+STAGEprofile_CONFIGURE_FLAGS = \
+	$(STAGE_CONFIGURE_FLAGS) $(POSTSTAGE1_CONFIGURE_FLAGS)
+
+# Defaults for stage feedback; some are overridden below.
+STAGEfeedback_CFLAGS = $(STAGE_CFLAGS)
+STAGEfeedback_CXXFLAGS = $(CXXFLAGS)
+@if target-libstdc++-v3-bootstrap
+# Override the above if we're bootstrapping C++.
+STAGEfeedback_CXXFLAGS = $(STAGEfeedback_CFLAGS)
+@endif target-libstdc++-v3-bootstrap
+STAGEfeedback_TFLAGS = $(STAGE_TFLAGS)
+# STAGE1_CONFIGURE_FLAGS overridden below, so we can use
+# POSTSTAGE1_CONFIGURE_FLAGS here.
+STAGEfeedback_CONFIGURE_FLAGS = \
+	$(STAGE_CONFIGURE_FLAGS) $(POSTSTAGE1_CONFIGURE_FLAGS)
+
+
+# Only build the C compiler for stage1, because that is the only one that
+# we can guarantee will build with the native compiler, and also it is the
+# only thing useful for building stage2. STAGE1_CFLAGS (via CFLAGS),
+# MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
+# overrideable (for a bootstrap build stage1 also builds gcc.info).
+
+STAGE1_CFLAGS = @stage1_cflags@
+STAGE1_CHECKING = @stage1_checking@
+STAGE1_LANGUAGES = @stage1_languages@
+# * We force-disable intermodule optimizations, even if
+#   --enable-intermodule was passed, since the installed compiler
+#   probably can't handle them.  Luckily, autoconf always respects
+#   the last argument when conflicting --enable arguments are passed.
+# * Likewise, we force-disable coverage flags, since the installed
+#   compiler probably has never heard of them.
+# * Don't remove this, because above we added
+#   POSTSTAGE1_CONFIGURE_FLAGS to STAGE_CONFIGURE_FLAGS, which
+#   we don't want for STAGE1_CONFIGURE_FLAGS.
+STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \
+	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"
+
+STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate
+STAGEprofile_TFLAGS = $(STAGE2_TFLAGS)
+
+STAGEfeedback_CFLAGS = $(STAGE3_CFLAGS) -fprofile-use
+STAGEfeedback_TFLAGS = $(STAGE3_TFLAGS)
+
+do-compare = @do_compare@
+do-compare3 = $(do-compare)
+
+# -----------------------------------------------
+# Programs producing files for the TARGET machine
+# -----------------------------------------------
+
+AR_FOR_TARGET=@AR_FOR_TARGET@
+AS_FOR_TARGET=@AS_FOR_TARGET@
+CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@
+
+# If GCC_FOR_TARGET is not overriden on the command line, then this
+# variable is passed down to the gcc Makefile, where it is used to
+# build libgcc2.a.  We define it here so that it can itself be
+# overridden on the command line.
+GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@
+CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@
+RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@
+GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@
+GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@
+GOC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GOC_FOR_TARGET@
+DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
+LD_FOR_TARGET=@LD_FOR_TARGET@
+
+LIPO_FOR_TARGET=@LIPO_FOR_TARGET@
+NM_FOR_TARGET=@NM_FOR_TARGET@
+OBJDUMP_FOR_TARGET=@OBJDUMP_FOR_TARGET@
+RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
+STRIP_FOR_TARGET=@STRIP_FOR_TARGET@
+WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
+WINDMC_FOR_TARGET=@WINDMC_FOR_TARGET@
+
+COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_TARGET@
+COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
+COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
+
+CFLAGS_FOR_TARGET = @CFLAGS_FOR_TARGET@
+CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@
+
+LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
+LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
+LDFLAGS_FOR_TARGET = @LDFLAGS_FOR_TARGET@
+GOCFLAGS_FOR_TARGET = -O2 -g
+
+FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
+SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
+DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
+
+XGCC_FLAGS_FOR_TARGET = $(FLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
+
+# ------------------------------------
+# Miscellaneous targets and flag lists
+# ------------------------------------
+
+# The first rule in the file had better be this one.  Don't put any above it.
+# This lives here to allow makefile fragments to contain dependencies.
+all:
+
+#### host and target specific makefile fragments come in here.
+@target_makefile_frag@
+@alphaieee_frag@
+@ospace_frag@
+@host_makefile_frag@
+###
+
+# This is the list of directories that may be needed in RPATH_ENVVAR
+# so that programs built for the target machine work.
+TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libmudflap)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(HOST_LIB_PATH_gcc)
+
+@if target-libstdc++-v3
+TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:
+@endif target-libstdc++-v3
+
+@if target-libmudflap
+TARGET_LIB_PATH_libmudflap = $$r/$(TARGET_SUBDIR)/libmudflap/.libs:
+@endif target-libmudflap
+
+@if target-libssp
+TARGET_LIB_PATH_libssp = $$r/$(TARGET_SUBDIR)/libssp/.libs:
+@endif target-libssp
+
+@if target-libgomp
+TARGET_LIB_PATH_libgomp = $$r/$(TARGET_SUBDIR)/libgomp/.libs:
+@endif target-libgomp
+
+
+
+# This is the list of directories that may be needed in RPATH_ENVVAR
+# so that programs built for the host machine work.
+HOST_LIB_PATH = $(HOST_LIB_PATH_bfd)$(HOST_LIB_PATH_opcodes)$(HOST_LIB_PATH_gmp)$(HOST_LIB_PATH_mpfr)$(HOST_LIB_PATH_mpc)$(HOST_LIB_PATH_ppl)$(HOST_LIB_PATH_cloog)$(HOST_LIB_PATH_libelf)
+
+# Define HOST_LIB_PATH_gcc here, for the sake of TARGET_LIB_PATH, ouch
+@if gcc
+HOST_LIB_PATH_gcc = $$r/$(HOST_SUBDIR)/gcc$(GCC_SHLIB_SUBDIR):$$r/$(HOST_SUBDIR)/prev-gcc$(GCC_SHLIB_SUBDIR):
+@endif gcc
+
+
+@if bfd
+HOST_LIB_PATH_bfd = \
+  $$r/$(HOST_SUBDIR)/bfd/.libs:$$r/$(HOST_SUBDIR)/prev-bfd/.libs:
+@endif bfd
+
+@if opcodes
+HOST_LIB_PATH_opcodes = \
+  $$r/$(HOST_SUBDIR)/opcodes/.libs:$$r/$(HOST_SUBDIR)/prev-opcodes/.libs:
+@endif opcodes
+
+@if gmp
+HOST_LIB_PATH_gmp = \
+  $$r/$(HOST_SUBDIR)/gmp/.libs:$$r/$(HOST_SUBDIR)/prev-gmp/.libs:
+@endif gmp
+
+@if mpfr
+HOST_LIB_PATH_mpfr = \
+  $$r/$(HOST_SUBDIR)/mpfr/.libs:$$r/$(HOST_SUBDIR)/prev-mpfr/.libs:
+@endif mpfr
+
+@if mpc
+HOST_LIB_PATH_mpc = \
+  $$r/$(HOST_SUBDIR)/mpc/.libs:$$r/$(HOST_SUBDIR)/prev-mpc/.libs:
+@endif mpc
+
+@if ppl
+HOST_LIB_PATH_ppl = \
+  $$r/$(HOST_SUBDIR)/ppl/src/.libs:$$r/$(HOST_SUBDIR)/prev-ppl/src/.libs:
+@endif ppl
+
+@if cloog
+HOST_LIB_PATH_cloog = \
+  $$r/$(HOST_SUBDIR)/cloog/.libs:$$r/$(HOST_SUBDIR)/prev-cloog/.libs:
+@endif cloog
+
+@if libelf
+HOST_LIB_PATH_libelf = \
+  $$r/$(HOST_SUBDIR)/libelf/.libs:$$r/$(HOST_SUBDIR)/prev-libelf/.libs:
+@endif libelf
+
+
+CXX_FOR_TARGET_FLAG_TO_PASS = \
+	"CXX_FOR_TARGET=$(CXX_FOR_TARGET)"
+@if target-libstdc++-v3
+# CXX_FOR_TARGET is tricky to get right for target libs that require a
+# functional C++ compiler.  When we recurse, if we expand
+# CXX_FOR_TARGET before configuring libstdc++-v3, we won't get
+# libstdc++ include flags from the script.  Instead, we get an
+# -funconfigured-* word, so that we'll get errors if this invalid C++
+# command line is used for anything, but also so that we can use the
+# word to decide whether or not to pass on this CXX_FOR_TARGET.  If we
+# don't pass it on, sub-make will use the default definition, that
+# re-expands it at the time of use, so we'll get it right when we need
+# it.  One potential exception is the expansion of CXX_FOR_TARGET
+# passed down as part of CXX within TARGET_FLAGS, but this wouldn't
+# really work, for C++ host programs can't depend on the current-stage
+# C++ target library.
+CXX_FOR_TARGET_FLAG_TO_PASS = \
+	$(shell if echo "$(CXX_FOR_TARGET)" | grep " -funconfigured-" > /dev/null; then :; else echo '"CXX_FOR_TARGET=$(CXX_FOR_TARGET)"'; fi)
+@endif target-libstdc++-v3
+
+# Flags to pass down to all sub-makes.
+BASE_FLAGS_TO_PASS = \
+	"DESTDIR=$(DESTDIR)" \
+	"RPATH_ENVVAR=$(RPATH_ENVVAR)" \
+	"TARGET_SUBDIR=$(TARGET_SUBDIR)" \
+	"bindir=$(bindir)" \
+	"datadir=$(datadir)" \
+	"exec_prefix=$(exec_prefix)" \
+	"includedir=$(includedir)" \
+	"datarootdir=$(datarootdir)" \
+	"docdir=$(docdir)" \
+	"infodir=$(infodir)" \
+	"pdfdir=$(pdfdir)" \
+	"htmldir=$(htmldir)" \
+	"libdir=$(libdir)" \
+	"libexecdir=$(libexecdir)" \
+	"lispdir=$(lispdir)" \
+	"localstatedir=$(localstatedir)" \
+	"mandir=$(mandir)" \
+	"oldincludedir=$(oldincludedir)" \
+	"prefix=$(prefix)" \
+	"sbindir=$(sbindir)" \
+	"sharedstatedir=$(sharedstatedir)" \
+	"sysconfdir=$(sysconfdir)" \
+	"tooldir=$(tooldir)" \
+	"build_tooldir=$(build_tooldir)" \
+	"target_alias=$(target_alias)" \
+	"AWK=$(AWK)" \
+	"BISON=$(BISON)" \
+	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
+	"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
+	"EXPECT=$(EXPECT)" \
+	"FLEX=$(FLEX)" \
+	"INSTALL=$(INSTALL)" \
+	"INSTALL_DATA=$(INSTALL_DATA)" \
+	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
+	"LDFLAGS_FOR_BUILD=$(LDFLAGS_FOR_BUILD)" \
+	"LEX=$(LEX)" \
+	"M4=$(M4)" \
+	"MAKE=$(MAKE)" \
+	"RUNTEST=$(RUNTEST)" \
+	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
+	"SED=$(SED)" \
+	"SHELL=$(SHELL)" \
+	"YACC=$(YACC)" \
+	"`echo 'ADAFLAGS=$(ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"ADA_CFLAGS=$(ADA_CFLAGS)" \
+	"AR_FLAGS=$(AR_FLAGS)" \
+	"`echo 'BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"BOOT_CFLAGS=$(BOOT_CFLAGS)" \
+	"BOOT_LDFLAGS=$(BOOT_LDFLAGS)" \
+	"CFLAGS=$(CFLAGS)" \
+	"CXXFLAGS=$(CXXFLAGS)" \
+	"LDFLAGS=$(LDFLAGS)" \
+	"LIBCFLAGS=$(LIBCFLAGS)" \
+	"LIBCXXFLAGS=$(LIBCXXFLAGS)" \
+	"STAGE1_CHECKING=$(STAGE1_CHECKING)" \
+	"STAGE1_LANGUAGES=$(STAGE1_LANGUAGES)" \
+	"GNATBIND=$(GNATBIND)" \
+	"GNATMAKE=$(GNATMAKE)" \
+	"AR_FOR_TARGET=$(AR_FOR_TARGET)" \
+	"AS_FOR_TARGET=$(AS_FOR_TARGET)" \
+	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
+	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+	"CPPFLAGS_FOR_TARGET=$(CPPFLAGS_FOR_TARGET)" \
+	"CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
+	"DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
+	"FLAGS_FOR_TARGET=$(FLAGS_FOR_TARGET)" \
+	"GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \
+	"GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \
+	"GOC_FOR_TARGET=$(GOC_FOR_TARGET)" \
+	"GOCFLAGS_FOR_TARGET=$(GOCFLAGS_FOR_TARGET)" \
+	"LD_FOR_TARGET=$(LD_FOR_TARGET)" \
+	"LIPO_FOR_TARGET=$(LIPO_FOR_TARGET)" \
+	"LDFLAGS_FOR_TARGET=$(LDFLAGS_FOR_TARGET)" \
+	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
+	"LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \
+	"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
+	"OBJDUMP_FOR_TARGET=$(OBJDUMP_FOR_TARGET)" \
+	"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
+	"STRIP_FOR_TARGET=$(STRIP_FOR_TARGET)" \
+	"WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
+	"WINDMC_FOR_TARGET=$(WINDMC_FOR_TARGET)" \
+	"BUILD_CONFIG=$(BUILD_CONFIG)" \
+	"`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"LEAN=$(LEAN)" \
+	"STAGE1_CFLAGS=$(STAGE1_CFLAGS)" \
+	"STAGE1_CXXFLAGS=$(STAGE1_CXXFLAGS)" \
+	"STAGE1_TFLAGS=$(STAGE1_TFLAGS)" \
+	"STAGE2_CFLAGS=$(STAGE2_CFLAGS)" \
+	"STAGE2_CXXFLAGS=$(STAGE2_CXXFLAGS)" \
+	"STAGE2_TFLAGS=$(STAGE2_TFLAGS)" \
+	"STAGE3_CFLAGS=$(STAGE3_CFLAGS)" \
+	"STAGE3_CXXFLAGS=$(STAGE3_CXXFLAGS)" \
+	"STAGE3_TFLAGS=$(STAGE3_TFLAGS)" \
+	"STAGE4_CFLAGS=$(STAGE4_CFLAGS)" \
+	"STAGE4_CXXFLAGS=$(STAGE4_CXXFLAGS)" \
+	"STAGE4_TFLAGS=$(STAGE4_TFLAGS)" \
+	"STAGEprofile_CFLAGS=$(STAGEprofile_CFLAGS)" \
+	"STAGEprofile_CXXFLAGS=$(STAGEprofile_CXXFLAGS)" \
+	"STAGEprofile_TFLAGS=$(STAGEprofile_TFLAGS)" \
+	"STAGEfeedback_CFLAGS=$(STAGEfeedback_CFLAGS)" \
+	"STAGEfeedback_CXXFLAGS=$(STAGEfeedback_CXXFLAGS)" \
+	"STAGEfeedback_TFLAGS=$(STAGEfeedback_TFLAGS)" \
+	$(CXX_FOR_TARGET_FLAG_TO_PASS) \
+	"TFLAGS=$(TFLAGS)" \
+	"CONFIG_SHELL=$(SHELL)" \
+	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 
+
+# We leave this in just in case, but it is not needed anymore.
+RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS)
+
+# Flags to pass down to most sub-makes, in which we're building with
+# the host environment.
+EXTRA_HOST_FLAGS = \
+	'AR=$(AR)' \
+	'AS=$(AS)' \
+	'CC=$(CC)' \
+	'CXX=$(CXX)' \
+	'DLLTOOL=$(DLLTOOL)' \
+	'GCJ=$(GCJ)' \
+	'GFORTRAN=$(GFORTRAN)' \
+	'GOC=$(GOC)' \
+	'LD=$(LD)' \
+	'LIPO=$(LIPO)' \
+	'NM=$(NM)' \
+	'OBJDUMP=$(OBJDUMP)' \
+	'RANLIB=$(RANLIB)' \
+	'STRIP=$(STRIP)' \
+	'WINDRES=$(WINDRES)' \
+	'WINDMC=$(WINDMC)'
+
+FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
+
+# Flags to pass to stage2 and later makes.
+
+POSTSTAGE1_FLAGS_TO_PASS = \
+	CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
+	CXX="$${CXX}" CXX_FOR_BUILD="$${CXX_FOR_BUILD}" \
+	GNATBIND="$${GNATBIND}" \
+	LDFLAGS="$${LDFLAGS}" \
+	HOST_LIBS="$${HOST_LIBS}" \
+	"`echo 'ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
+
+# Flags to pass down to makes which are built with the target environment.
+# The double $ decreases the length of the command line; those variables
+# are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.  The
+# *_CFLAGS_FOR_TARGET variables are not passed down and most often empty,
+# so we expand them here.
+EXTRA_TARGET_FLAGS = \
+	'AR=$$(AR_FOR_TARGET)' \
+	'AS=$(COMPILER_AS_FOR_TARGET)' \
+	'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+	'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
+	'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
+	'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
+	'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+	'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+	'GOC=$$(GOC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+	'GOCFLAGS=$$(GOCFLAGS_FOR_TARGET)' \
+	'LD=$(COMPILER_LD_FOR_TARGET)' \
+	'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
+	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
+	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
+	'NM=$(COMPILER_NM_FOR_TARGET)' \
+	'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
+	'RANLIB=$$(RANLIB_FOR_TARGET)' \
+	'WINDRES=$$(WINDRES_FOR_TARGET)' \
+	'WINDMC=$$(WINDMC_FOR_TARGET)' \
+	'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
+	"TFLAGS=$$TFLAGS"
+
+TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
+
+# Flags to pass down to gcc.  gcc builds a library, libgcc.a, so it
+# unfortunately needs the native compiler and the target ar and
+# ranlib.
+# If any variables are added here, they must be added to do-*, below.
+# The BUILD_* variables are a special case, which are used for the gcc
+# cross-building scheme.
+EXTRA_GCC_FLAGS = \
+	"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
+	"`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
+
+GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
+
+@if gcc
+BUILD_CONFIG = @BUILD_CONFIG@
+ifneq ($(BUILD_CONFIG),)
+include $(foreach CONFIG, $(BUILD_CONFIG), $(srcdir)/config/$(CONFIG).mk)
+endif
+@endif gcc
+
+.PHONY: configure-host
+configure-host:  \
+    maybe-configure-bfd \
+    maybe-configure-opcodes \
+    maybe-configure-binutils \
+    maybe-configure-bison \
+    maybe-configure-cgen \
+    maybe-configure-dejagnu \
+    maybe-configure-etc \
+    maybe-configure-fastjar \
+    maybe-configure-fixincludes \
+    maybe-configure-flex \
+    maybe-configure-gas \
+    maybe-configure-gcc \
+    maybe-configure-gmp \
+    maybe-configure-mpfr \
+    maybe-configure-mpc \
+    maybe-configure-ppl \
+    maybe-configure-cloog \
+    maybe-configure-libelf \
+    maybe-configure-gold \
+    maybe-configure-gprof \
+    maybe-configure-intl \
+    maybe-configure-tcl \
+    maybe-configure-itcl \
+    maybe-configure-ld \
+    maybe-configure-libcpp \
+    maybe-configure-libdecnumber \
+    maybe-configure-libgui \
+    maybe-configure-libiberty \
+    maybe-configure-libiconv \
+    maybe-configure-m4 \
+    maybe-configure-readline \
+    maybe-configure-sid \
+    maybe-configure-sim \
+    maybe-configure-texinfo \
+    maybe-configure-zlib \
+    maybe-configure-gdb \
+    maybe-configure-expect \
+    maybe-configure-guile \
+    maybe-configure-tk \
+    maybe-configure-libtermcap \
+    maybe-configure-utils \
+    maybe-configure-gnattools \
+    maybe-configure-lto-plugin
+.PHONY: configure-target
+configure-target:  \
+    maybe-configure-target-libstdc++-v3 \
+    maybe-configure-target-libmudflap \
+    maybe-configure-target-libssp \
+    maybe-configure-target-newlib \
+    maybe-configure-target-libgcc \
+    maybe-configure-target-libquadmath \
+    maybe-configure-target-libgfortran \
+    maybe-configure-target-libobjc \
+    maybe-configure-target-libgo \
+    maybe-configure-target-libtermcap \
+    maybe-configure-target-winsup \
+    maybe-configure-target-libgloss \
+    maybe-configure-target-libffi \
+    maybe-configure-target-libjava \
+    maybe-configure-target-zlib \
+    maybe-configure-target-boehm-gc \
+    maybe-configure-target-rda \
+    maybe-configure-target-libada \
+    maybe-configure-target-libgomp
+
+# The target built for a native non-bootstrap build.
+.PHONY: all
+all:
+@if gcc-bootstrap
+	[ -f stage_final ] || echo stage3 > stage_final
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) `cat stage_final`-bubble
+@endif gcc-bootstrap
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+@if gcc-bootstrap
+	if [ -f stage_last ]; then \
+	  TFLAGS="$(STAGE$(shell test ! -f stage_last || sed s,^stage,, stage_last)_TFLAGS)"; \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \
+	else \
+@endif gcc-bootstrap
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target \
+@if gcc-bootstrap
+	    ; \
+	fi \
+@endif gcc-bootstrap
+	&& :
+
+.PHONY: all-build
+
+all-build: maybe-all-build-libiberty
+all-build: maybe-all-build-bison
+all-build: maybe-all-build-flex
+all-build: maybe-all-build-m4
+all-build: maybe-all-build-texinfo
+all-build: maybe-all-build-fixincludes
+
+.PHONY: all-host
+
+@if bfd-no-bootstrap
+all-host: maybe-all-bfd
+@endif bfd-no-bootstrap
+@if opcodes-no-bootstrap
+all-host: maybe-all-opcodes
+@endif opcodes-no-bootstrap
+@if binutils-no-bootstrap
+all-host: maybe-all-binutils
+@endif binutils-no-bootstrap
+all-host: maybe-all-bison
+all-host: maybe-all-cgen
+all-host: maybe-all-dejagnu
+all-host: maybe-all-etc
+all-host: maybe-all-fastjar
+all-host: maybe-all-fixincludes
+all-host: maybe-all-flex
+@if gas-no-bootstrap
+all-host: maybe-all-gas
+@endif gas-no-bootstrap
+@if gcc-no-bootstrap
+all-host: maybe-all-gcc
+@endif gcc-no-bootstrap
+@if gmp-no-bootstrap
+all-host: maybe-all-gmp
+@endif gmp-no-bootstrap
+@if mpfr-no-bootstrap
+all-host: maybe-all-mpfr
+@endif mpfr-no-bootstrap
+@if mpc-no-bootstrap
+all-host: maybe-all-mpc
+@endif mpc-no-bootstrap
+@if ppl-no-bootstrap
+all-host: maybe-all-ppl
+@endif ppl-no-bootstrap
+@if cloog-no-bootstrap
+all-host: maybe-all-cloog
+@endif cloog-no-bootstrap
+@if libelf-no-bootstrap
+all-host: maybe-all-libelf
+@endif libelf-no-bootstrap
+@if gold-no-bootstrap
+all-host: maybe-all-gold
+@endif gold-no-bootstrap
+all-host: maybe-all-gprof
+@if intl-no-bootstrap
+all-host: maybe-all-intl
+@endif intl-no-bootstrap
+all-host: maybe-all-tcl
+all-host: maybe-all-itcl
+@if ld-no-bootstrap
+all-host: maybe-all-ld
+@endif ld-no-bootstrap
+@if libcpp-no-bootstrap
+all-host: maybe-all-libcpp
+@endif libcpp-no-bootstrap
+@if libdecnumber-no-bootstrap
+all-host: maybe-all-libdecnumber
+@endif libdecnumber-no-bootstrap
+all-host: maybe-all-libgui
+@if libiberty-no-bootstrap
+all-host: maybe-all-libiberty
+@endif libiberty-no-bootstrap
+all-host: maybe-all-libiconv
+all-host: maybe-all-m4
+all-host: maybe-all-readline
+all-host: maybe-all-sid
+all-host: maybe-all-sim
+all-host: maybe-all-texinfo
+@if zlib-no-bootstrap
+all-host: maybe-all-zlib
+@endif zlib-no-bootstrap
+all-host: maybe-all-gdb
+all-host: maybe-all-expect
+all-host: maybe-all-guile
+all-host: maybe-all-tk
+all-host: maybe-all-libtermcap
+all-host: maybe-all-utils
+all-host: maybe-all-gnattools
+@if lto-plugin-no-bootstrap
+all-host: maybe-all-lto-plugin
+@endif lto-plugin-no-bootstrap
+
+.PHONY: all-target
+
+@if target-libstdc++-v3-no-bootstrap
+all-target: maybe-all-target-libstdc++-v3
+@endif target-libstdc++-v3-no-bootstrap
+all-target: maybe-all-target-libmudflap
+all-target: maybe-all-target-libssp
+all-target: maybe-all-target-newlib
+@if target-libgcc-no-bootstrap
+all-target: maybe-all-target-libgcc
+@endif target-libgcc-no-bootstrap
+all-target: maybe-all-target-libquadmath
+all-target: maybe-all-target-libgfortran
+all-target: maybe-all-target-libobjc
+all-target: maybe-all-target-libgo
+all-target: maybe-all-target-libtermcap
+all-target: maybe-all-target-winsup
+all-target: maybe-all-target-libgloss
+all-target: maybe-all-target-libffi
+all-target: maybe-all-target-libjava
+all-target: maybe-all-target-zlib
+all-target: maybe-all-target-boehm-gc
+all-target: maybe-all-target-rda
+all-target: maybe-all-target-libada
+@if target-libgomp-no-bootstrap
+all-target: maybe-all-target-libgomp
+@endif target-libgomp-no-bootstrap
+
+# Do a target for all the subdirectories.  A ``make do-X'' will do a
+# ``make X'' in all subdirectories (because, in general, there is a
+# dependency (below) of X upon do-X, a ``make X'' will also do this,
+# but it may do additional work as well).
+
+.PHONY: do-info
+do-info:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) info-host \
+	  info-target
+
+
+.PHONY: info-host
+
+info-host: maybe-info-bfd
+info-host: maybe-info-opcodes
+info-host: maybe-info-binutils
+info-host: maybe-info-bison
+info-host: maybe-info-cgen
+info-host: maybe-info-dejagnu
+info-host: maybe-info-etc
+info-host: maybe-info-fastjar
+info-host: maybe-info-fixincludes
+info-host: maybe-info-flex
+info-host: maybe-info-gas
+info-host: maybe-info-gcc
+info-host: maybe-info-gmp
+info-host: maybe-info-mpfr
+info-host: maybe-info-mpc
+info-host: maybe-info-ppl
+info-host: maybe-info-cloog
+info-host: maybe-info-libelf
+info-host: maybe-info-gold
+info-host: maybe-info-gprof
+info-host: maybe-info-intl
+info-host: maybe-info-tcl
+info-host: maybe-info-itcl
+info-host: maybe-info-ld
+info-host: maybe-info-libcpp
+info-host: maybe-info-libdecnumber
+info-host: maybe-info-libgui
+info-host: maybe-info-libiberty
+info-host: maybe-info-libiconv
+info-host: maybe-info-m4
+info-host: maybe-info-readline
+info-host: maybe-info-sid
+info-host: maybe-info-sim
+info-host: maybe-info-texinfo
+info-host: maybe-info-zlib
+info-host: maybe-info-gdb
+info-host: maybe-info-expect
+info-host: maybe-info-guile
+info-host: maybe-info-tk
+info-host: maybe-info-libtermcap
+info-host: maybe-info-utils
+info-host: maybe-info-gnattools
+info-host: maybe-info-lto-plugin
+
+.PHONY: info-target
+
+info-target: maybe-info-target-libstdc++-v3
+info-target: maybe-info-target-libmudflap
+info-target: maybe-info-target-libssp
+info-target: maybe-info-target-newlib
+info-target: maybe-info-target-libgcc
+info-target: maybe-info-target-libquadmath
+info-target: maybe-info-target-libgfortran
+info-target: maybe-info-target-libobjc
+info-target: maybe-info-target-libgo
+info-target: maybe-info-target-libtermcap
+info-target: maybe-info-target-winsup
+info-target: maybe-info-target-libgloss
+info-target: maybe-info-target-libffi
+info-target: maybe-info-target-libjava
+info-target: maybe-info-target-zlib
+info-target: maybe-info-target-boehm-gc
+info-target: maybe-info-target-rda
+info-target: maybe-info-target-libada
+info-target: maybe-info-target-libgomp
+
+.PHONY: do-dvi
+do-dvi:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) dvi-host \
+	  dvi-target
+
+
+.PHONY: dvi-host
+
+dvi-host: maybe-dvi-bfd
+dvi-host: maybe-dvi-opcodes
+dvi-host: maybe-dvi-binutils
+dvi-host: maybe-dvi-bison
+dvi-host: maybe-dvi-cgen
+dvi-host: maybe-dvi-dejagnu
+dvi-host: maybe-dvi-etc
+dvi-host: maybe-dvi-fastjar
+dvi-host: maybe-dvi-fixincludes
+dvi-host: maybe-dvi-flex
+dvi-host: maybe-dvi-gas
+dvi-host: maybe-dvi-gcc
+dvi-host: maybe-dvi-gmp
+dvi-host: maybe-dvi-mpfr
+dvi-host: maybe-dvi-mpc
+dvi-host: maybe-dvi-ppl
+dvi-host: maybe-dvi-cloog
+dvi-host: maybe-dvi-libelf
+dvi-host: maybe-dvi-gold
+dvi-host: maybe-dvi-gprof
+dvi-host: maybe-dvi-intl
+dvi-host: maybe-dvi-tcl
+dvi-host: maybe-dvi-itcl
+dvi-host: maybe-dvi-ld
+dvi-host: maybe-dvi-libcpp
+dvi-host: maybe-dvi-libdecnumber
+dvi-host: maybe-dvi-libgui
+dvi-host: maybe-dvi-libiberty
+dvi-host: maybe-dvi-libiconv
+dvi-host: maybe-dvi-m4
+dvi-host: maybe-dvi-readline
+dvi-host: maybe-dvi-sid
+dvi-host: maybe-dvi-sim
+dvi-host: maybe-dvi-texinfo
+dvi-host: maybe-dvi-zlib
+dvi-host: maybe-dvi-gdb
+dvi-host: maybe-dvi-expect
+dvi-host: maybe-dvi-guile
+dvi-host: maybe-dvi-tk
+dvi-host: maybe-dvi-libtermcap
+dvi-host: maybe-dvi-utils
+dvi-host: maybe-dvi-gnattools
+dvi-host: maybe-dvi-lto-plugin
+
+.PHONY: dvi-target
+
+dvi-target: maybe-dvi-target-libstdc++-v3
+dvi-target: maybe-dvi-target-libmudflap
+dvi-target: maybe-dvi-target-libssp
+dvi-target: maybe-dvi-target-newlib
+dvi-target: maybe-dvi-target-libgcc
+dvi-target: maybe-dvi-target-libquadmath
+dvi-target: maybe-dvi-target-libgfortran
+dvi-target: maybe-dvi-target-libobjc
+dvi-target: maybe-dvi-target-libgo
+dvi-target: maybe-dvi-target-libtermcap
+dvi-target: maybe-dvi-target-winsup
+dvi-target: maybe-dvi-target-libgloss
+dvi-target: maybe-dvi-target-libffi
+dvi-target: maybe-dvi-target-libjava
+dvi-target: maybe-dvi-target-zlib
+dvi-target: maybe-dvi-target-boehm-gc
+dvi-target: maybe-dvi-target-rda
+dvi-target: maybe-dvi-target-libada
+dvi-target: maybe-dvi-target-libgomp
+
+.PHONY: do-pdf
+do-pdf:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) pdf-host \
+	  pdf-target
+
+
+.PHONY: pdf-host
+
+pdf-host: maybe-pdf-bfd
+pdf-host: maybe-pdf-opcodes
+pdf-host: maybe-pdf-binutils
+pdf-host: maybe-pdf-bison
+pdf-host: maybe-pdf-cgen
+pdf-host: maybe-pdf-dejagnu
+pdf-host: maybe-pdf-etc
+pdf-host: maybe-pdf-fastjar
+pdf-host: maybe-pdf-fixincludes
+pdf-host: maybe-pdf-flex
+pdf-host: maybe-pdf-gas
+pdf-host: maybe-pdf-gcc
+pdf-host: maybe-pdf-gmp
+pdf-host: maybe-pdf-mpfr
+pdf-host: maybe-pdf-mpc
+pdf-host: maybe-pdf-ppl
+pdf-host: maybe-pdf-cloog
+pdf-host: maybe-pdf-libelf
+pdf-host: maybe-pdf-gold
+pdf-host: maybe-pdf-gprof
+pdf-host: maybe-pdf-intl
+pdf-host: maybe-pdf-tcl
+pdf-host: maybe-pdf-itcl
+pdf-host: maybe-pdf-ld
+pdf-host: maybe-pdf-libcpp
+pdf-host: maybe-pdf-libdecnumber
+pdf-host: maybe-pdf-libgui
+pdf-host: maybe-pdf-libiberty
+pdf-host: maybe-pdf-libiconv
+pdf-host: maybe-pdf-m4
+pdf-host: maybe-pdf-readline
+pdf-host: maybe-pdf-sid
+pdf-host: maybe-pdf-sim
+pdf-host: maybe-pdf-texinfo
+pdf-host: maybe-pdf-zlib
+pdf-host: maybe-pdf-gdb
+pdf-host: maybe-pdf-expect
+pdf-host: maybe-pdf-guile
+pdf-host: maybe-pdf-tk
+pdf-host: maybe-pdf-libtermcap
+pdf-host: maybe-pdf-utils
+pdf-host: maybe-pdf-gnattools
+pdf-host: maybe-pdf-lto-plugin
+
+.PHONY: pdf-target
+
+pdf-target: maybe-pdf-target-libstdc++-v3
+pdf-target: maybe-pdf-target-libmudflap
+pdf-target: maybe-pdf-target-libssp
+pdf-target: maybe-pdf-target-newlib
+pdf-target: maybe-pdf-target-libgcc
+pdf-target: maybe-pdf-target-libquadmath
+pdf-target: maybe-pdf-target-libgfortran
+pdf-target: maybe-pdf-target-libobjc
+pdf-target: maybe-pdf-target-libgo
+pdf-target: maybe-pdf-target-libtermcap
+pdf-target: maybe-pdf-target-winsup
+pdf-target: maybe-pdf-target-libgloss
+pdf-target: maybe-pdf-target-libffi
+pdf-target: maybe-pdf-target-libjava
+pdf-target: maybe-pdf-target-zlib
+pdf-target: maybe-pdf-target-boehm-gc
+pdf-target: maybe-pdf-target-rda
+pdf-target: maybe-pdf-target-libada
+pdf-target: maybe-pdf-target-libgomp
+
+.PHONY: do-html
+do-html:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) html-host \
+	  html-target
+
+
+.PHONY: html-host
+
+html-host: maybe-html-bfd
+html-host: maybe-html-opcodes
+html-host: maybe-html-binutils
+html-host: maybe-html-bison
+html-host: maybe-html-cgen
+html-host: maybe-html-dejagnu
+html-host: maybe-html-etc
+html-host: maybe-html-fastjar
+html-host: maybe-html-fixincludes
+html-host: maybe-html-flex
+html-host: maybe-html-gas
+html-host: maybe-html-gcc
+html-host: maybe-html-gmp
+html-host: maybe-html-mpfr
+html-host: maybe-html-mpc
+html-host: maybe-html-ppl
+html-host: maybe-html-cloog
+html-host: maybe-html-libelf
+html-host: maybe-html-gold
+html-host: maybe-html-gprof
+html-host: maybe-html-intl
+html-host: maybe-html-tcl
+html-host: maybe-html-itcl
+html-host: maybe-html-ld
+html-host: maybe-html-libcpp
+html-host: maybe-html-libdecnumber
+html-host: maybe-html-libgui
+html-host: maybe-html-libiberty
+html-host: maybe-html-libiconv
+html-host: maybe-html-m4
+html-host: maybe-html-readline
+html-host: maybe-html-sid
+html-host: maybe-html-sim
+html-host: maybe-html-texinfo
+html-host: maybe-html-zlib
+html-host: maybe-html-gdb
+html-host: maybe-html-expect
+html-host: maybe-html-guile
+html-host: maybe-html-tk
+html-host: maybe-html-libtermcap
+html-host: maybe-html-utils
+html-host: maybe-html-gnattools
+html-host: maybe-html-lto-plugin
+
+.PHONY: html-target
+
+html-target: maybe-html-target-libstdc++-v3
+html-target: maybe-html-target-libmudflap
+html-target: maybe-html-target-libssp
+html-target: maybe-html-target-newlib
+html-target: maybe-html-target-libgcc
+html-target: maybe-html-target-libquadmath
+html-target: maybe-html-target-libgfortran
+html-target: maybe-html-target-libobjc
+html-target: maybe-html-target-libgo
+html-target: maybe-html-target-libtermcap
+html-target: maybe-html-target-winsup
+html-target: maybe-html-target-libgloss
+html-target: maybe-html-target-libffi
+html-target: maybe-html-target-libjava
+html-target: maybe-html-target-zlib
+html-target: maybe-html-target-boehm-gc
+html-target: maybe-html-target-rda
+html-target: maybe-html-target-libada
+html-target: maybe-html-target-libgomp
+
+.PHONY: do-TAGS
+do-TAGS:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) TAGS-host \
+	  TAGS-target
+
+
+.PHONY: TAGS-host
+
+TAGS-host: maybe-TAGS-bfd
+TAGS-host: maybe-TAGS-opcodes
+TAGS-host: maybe-TAGS-binutils
+TAGS-host: maybe-TAGS-bison
+TAGS-host: maybe-TAGS-cgen
+TAGS-host: maybe-TAGS-dejagnu
+TAGS-host: maybe-TAGS-etc
+TAGS-host: maybe-TAGS-fastjar
+TAGS-host: maybe-TAGS-fixincludes
+TAGS-host: maybe-TAGS-flex
+TAGS-host: maybe-TAGS-gas
+TAGS-host: maybe-TAGS-gcc
+TAGS-host: maybe-TAGS-gmp
+TAGS-host: maybe-TAGS-mpfr
+TAGS-host: maybe-TAGS-mpc
+TAGS-host: maybe-TAGS-ppl
+TAGS-host: maybe-TAGS-cloog
+TAGS-host: maybe-TAGS-libelf
+TAGS-host: maybe-TAGS-gold
+TAGS-host: maybe-TAGS-gprof
+TAGS-host: maybe-TAGS-intl
+TAGS-host: maybe-TAGS-tcl
+TAGS-host: maybe-TAGS-itcl
+TAGS-host: maybe-TAGS-ld
+TAGS-host: maybe-TAGS-libcpp
+TAGS-host: maybe-TAGS-libdecnumber
+TAGS-host: maybe-TAGS-libgui
+TAGS-host: maybe-TAGS-libiberty
+TAGS-host: maybe-TAGS-libiconv
+TAGS-host: maybe-TAGS-m4
+TAGS-host: maybe-TAGS-readline
+TAGS-host: maybe-TAGS-sid
+TAGS-host: maybe-TAGS-sim
+TAGS-host: maybe-TAGS-texinfo
+TAGS-host: maybe-TAGS-zlib
+TAGS-host: maybe-TAGS-gdb
+TAGS-host: maybe-TAGS-expect
+TAGS-host: maybe-TAGS-guile
+TAGS-host: maybe-TAGS-tk
+TAGS-host: maybe-TAGS-libtermcap
+TAGS-host: maybe-TAGS-utils
+TAGS-host: maybe-TAGS-gnattools
+TAGS-host: maybe-TAGS-lto-plugin
+
+.PHONY: TAGS-target
+
+TAGS-target: maybe-TAGS-target-libstdc++-v3
+TAGS-target: maybe-TAGS-target-libmudflap
+TAGS-target: maybe-TAGS-target-libssp
+TAGS-target: maybe-TAGS-target-newlib
+TAGS-target: maybe-TAGS-target-libgcc
+TAGS-target: maybe-TAGS-target-libquadmath
+TAGS-target: maybe-TAGS-target-libgfortran
+TAGS-target: maybe-TAGS-target-libobjc
+TAGS-target: maybe-TAGS-target-libgo
+TAGS-target: maybe-TAGS-target-libtermcap
+TAGS-target: maybe-TAGS-target-winsup
+TAGS-target: maybe-TAGS-target-libgloss
+TAGS-target: maybe-TAGS-target-libffi
+TAGS-target: maybe-TAGS-target-libjava
+TAGS-target: maybe-TAGS-target-zlib
+TAGS-target: maybe-TAGS-target-boehm-gc
+TAGS-target: maybe-TAGS-target-rda
+TAGS-target: maybe-TAGS-target-libada
+TAGS-target: maybe-TAGS-target-libgomp
+
+.PHONY: do-install-info
+do-install-info:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) install-info-host \
+	  install-info-target
+
+
+.PHONY: install-info-host
+
+install-info-host: maybe-install-info-bfd
+install-info-host: maybe-install-info-opcodes
+install-info-host: maybe-install-info-binutils
+install-info-host: maybe-install-info-bison
+install-info-host: maybe-install-info-cgen
+install-info-host: maybe-install-info-dejagnu
+install-info-host: maybe-install-info-etc
+install-info-host: maybe-install-info-fastjar
+install-info-host: maybe-install-info-fixincludes
+install-info-host: maybe-install-info-flex
+install-info-host: maybe-install-info-gas
+install-info-host: maybe-install-info-gcc
+install-info-host: maybe-install-info-gmp
+install-info-host: maybe-install-info-mpfr
+install-info-host: maybe-install-info-mpc
+install-info-host: maybe-install-info-ppl
+install-info-host: maybe-install-info-cloog
+install-info-host: maybe-install-info-libelf
+install-info-host: maybe-install-info-gold
+install-info-host: maybe-install-info-gprof
+install-info-host: maybe-install-info-intl
+install-info-host: maybe-install-info-tcl
+install-info-host: maybe-install-info-itcl
+install-info-host: maybe-install-info-ld
+install-info-host: maybe-install-info-libcpp
+install-info-host: maybe-install-info-libdecnumber
+install-info-host: maybe-install-info-libgui
+install-info-host: maybe-install-info-libiberty
+install-info-host: maybe-install-info-libiconv
+install-info-host: maybe-install-info-m4
+install-info-host: maybe-install-info-readline
+install-info-host: maybe-install-info-sid
+install-info-host: maybe-install-info-sim
+install-info-host: maybe-install-info-texinfo
+install-info-host: maybe-install-info-zlib
+install-info-host: maybe-install-info-gdb
+install-info-host: maybe-install-info-expect
+install-info-host: maybe-install-info-guile
+install-info-host: maybe-install-info-tk
+install-info-host: maybe-install-info-libtermcap
+install-info-host: maybe-install-info-utils
+install-info-host: maybe-install-info-gnattools
+install-info-host: maybe-install-info-lto-plugin
+
+.PHONY: install-info-target
+
+install-info-target: maybe-install-info-target-libstdc++-v3
+install-info-target: maybe-install-info-target-libmudflap
+install-info-target: maybe-install-info-target-libssp
+install-info-target: maybe-install-info-target-newlib
+install-info-target: maybe-install-info-target-libgcc
+install-info-target: maybe-install-info-target-libquadmath
+install-info-target: maybe-install-info-target-libgfortran
+install-info-target: maybe-install-info-target-libobjc
+install-info-target: maybe-install-info-target-libgo
+install-info-target: maybe-install-info-target-libtermcap
+install-info-target: maybe-install-info-target-winsup
+install-info-target: maybe-install-info-target-libgloss
+install-info-target: maybe-install-info-target-libffi
+install-info-target: maybe-install-info-target-libjava
+install-info-target: maybe-install-info-target-zlib
+install-info-target: maybe-install-info-target-boehm-gc
+install-info-target: maybe-install-info-target-rda
+install-info-target: maybe-install-info-target-libada
+install-info-target: maybe-install-info-target-libgomp
+
+.PHONY: do-install-pdf
+do-install-pdf:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) install-pdf-host \
+	  install-pdf-target
+
+
+.PHONY: install-pdf-host
+
+install-pdf-host: maybe-install-pdf-bfd
+install-pdf-host: maybe-install-pdf-opcodes
+install-pdf-host: maybe-install-pdf-binutils
+install-pdf-host: maybe-install-pdf-bison
+install-pdf-host: maybe-install-pdf-cgen
+install-pdf-host: maybe-install-pdf-dejagnu
+install-pdf-host: maybe-install-pdf-etc
+install-pdf-host: maybe-install-pdf-fastjar
+install-pdf-host: maybe-install-pdf-fixincludes
+install-pdf-host: maybe-install-pdf-flex
+install-pdf-host: maybe-install-pdf-gas
+install-pdf-host: maybe-install-pdf-gcc
+install-pdf-host: maybe-install-pdf-gmp
+install-pdf-host: maybe-install-pdf-mpfr
+install-pdf-host: maybe-install-pdf-mpc
+install-pdf-host: maybe-install-pdf-ppl
+install-pdf-host: maybe-install-pdf-cloog
+install-pdf-host: maybe-install-pdf-libelf
+install-pdf-host: maybe-install-pdf-gold
+install-pdf-host: maybe-install-pdf-gprof
+install-pdf-host: maybe-install-pdf-intl
+install-pdf-host: maybe-install-pdf-tcl
+install-pdf-host: maybe-install-pdf-itcl
+install-pdf-host: maybe-install-pdf-ld
+install-pdf-host: maybe-install-pdf-libcpp
+install-pdf-host: maybe-install-pdf-libdecnumber
+install-pdf-host: maybe-install-pdf-libgui
+install-pdf-host: maybe-install-pdf-libiberty
+install-pdf-host: maybe-install-pdf-libiconv
+install-pdf-host: maybe-install-pdf-m4
+install-pdf-host: maybe-install-pdf-readline
+install-pdf-host: maybe-install-pdf-sid
+install-pdf-host: maybe-install-pdf-sim
+install-pdf-host: maybe-install-pdf-texinfo
+install-pdf-host: maybe-install-pdf-zlib
+install-pdf-host: maybe-install-pdf-gdb
+install-pdf-host: maybe-install-pdf-expect
+install-pdf-host: maybe-install-pdf-guile
+install-pdf-host: maybe-install-pdf-tk
+install-pdf-host: maybe-install-pdf-libtermcap
+install-pdf-host: maybe-install-pdf-utils
+install-pdf-host: maybe-install-pdf-gnattools
+install-pdf-host: maybe-install-pdf-lto-plugin
+
+.PHONY: install-pdf-target
+
+install-pdf-target: maybe-install-pdf-target-libstdc++-v3
+install-pdf-target: maybe-install-pdf-target-libmudflap
+install-pdf-target: maybe-install-pdf-target-libssp
+install-pdf-target: maybe-install-pdf-target-newlib
+install-pdf-target: maybe-install-pdf-target-libgcc
+install-pdf-target: maybe-install-pdf-target-libquadmath
+install-pdf-target: maybe-install-pdf-target-libgfortran
+install-pdf-target: maybe-install-pdf-target-libobjc
+install-pdf-target: maybe-install-pdf-target-libgo
+install-pdf-target: maybe-install-pdf-target-libtermcap
+install-pdf-target: maybe-install-pdf-target-winsup
+install-pdf-target: maybe-install-pdf-target-libgloss
+install-pdf-target: maybe-install-pdf-target-libffi
+install-pdf-target: maybe-install-pdf-target-libjava
+install-pdf-target: maybe-install-pdf-target-zlib
+install-pdf-target: maybe-install-pdf-target-boehm-gc
+install-pdf-target: maybe-install-pdf-target-rda
+install-pdf-target: maybe-install-pdf-target-libada
+install-pdf-target: maybe-install-pdf-target-libgomp
+
+.PHONY: do-install-html
+do-install-html:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) install-html-host \
+	  install-html-target
+
+
+.PHONY: install-html-host
+
+install-html-host: maybe-install-html-bfd
+install-html-host: maybe-install-html-opcodes
+install-html-host: maybe-install-html-binutils
+install-html-host: maybe-install-html-bison
+install-html-host: maybe-install-html-cgen
+install-html-host: maybe-install-html-dejagnu
+install-html-host: maybe-install-html-etc
+install-html-host: maybe-install-html-fastjar
+install-html-host: maybe-install-html-fixincludes
+install-html-host: maybe-install-html-flex
+install-html-host: maybe-install-html-gas
+install-html-host: maybe-install-html-gcc
+install-html-host: maybe-install-html-gmp
+install-html-host: maybe-install-html-mpfr
+install-html-host: maybe-install-html-mpc
+install-html-host: maybe-install-html-ppl
+install-html-host: maybe-install-html-cloog
+install-html-host: maybe-install-html-libelf
+install-html-host: maybe-install-html-gold
+install-html-host: maybe-install-html-gprof
+install-html-host: maybe-install-html-intl
+install-html-host: maybe-install-html-tcl
+install-html-host: maybe-install-html-itcl
+install-html-host: maybe-install-html-ld
+install-html-host: maybe-install-html-libcpp
+install-html-host: maybe-install-html-libdecnumber
+install-html-host: maybe-install-html-libgui
+install-html-host: maybe-install-html-libiberty
+install-html-host: maybe-install-html-libiconv
+install-html-host: maybe-install-html-m4
+install-html-host: maybe-install-html-readline
+install-html-host: maybe-install-html-sid
+install-html-host: maybe-install-html-sim
+install-html-host: maybe-install-html-texinfo
+install-html-host: maybe-install-html-zlib
+install-html-host: maybe-install-html-gdb
+install-html-host: maybe-install-html-expect
+install-html-host: maybe-install-html-guile
+install-html-host: maybe-install-html-tk
+install-html-host: maybe-install-html-libtermcap
+install-html-host: maybe-install-html-utils
+install-html-host: maybe-install-html-gnattools
+install-html-host: maybe-install-html-lto-plugin
+
+.PHONY: install-html-target
+
+install-html-target: maybe-install-html-target-libstdc++-v3
+install-html-target: maybe-install-html-target-libmudflap
+install-html-target: maybe-install-html-target-libssp
+install-html-target: maybe-install-html-target-newlib
+install-html-target: maybe-install-html-target-libgcc
+install-html-target: maybe-install-html-target-libquadmath
+install-html-target: maybe-install-html-target-libgfortran
+install-html-target: maybe-install-html-target-libobjc
+install-html-target: maybe-install-html-target-libgo
+install-html-target: maybe-install-html-target-libtermcap
+install-html-target: maybe-install-html-target-winsup
+install-html-target: maybe-install-html-target-libgloss
+install-html-target: maybe-install-html-target-libffi
+install-html-target: maybe-install-html-target-libjava
+install-html-target: maybe-install-html-target-zlib
+install-html-target: maybe-install-html-target-boehm-gc
+install-html-target: maybe-install-html-target-rda
+install-html-target: maybe-install-html-target-libada
+install-html-target: maybe-install-html-target-libgomp
+
+.PHONY: do-installcheck
+do-installcheck:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) installcheck-host \
+	  installcheck-target
+
+
+.PHONY: installcheck-host
+
+installcheck-host: maybe-installcheck-bfd
+installcheck-host: maybe-installcheck-opcodes
+installcheck-host: maybe-installcheck-binutils
+installcheck-host: maybe-installcheck-bison
+installcheck-host: maybe-installcheck-cgen
+installcheck-host: maybe-installcheck-dejagnu
+installcheck-host: maybe-installcheck-etc
+installcheck-host: maybe-installcheck-fastjar
+installcheck-host: maybe-installcheck-fixincludes
+installcheck-host: maybe-installcheck-flex
+installcheck-host: maybe-installcheck-gas
+installcheck-host: maybe-installcheck-gcc
+installcheck-host: maybe-installcheck-gmp
+installcheck-host: maybe-installcheck-mpfr
+installcheck-host: maybe-installcheck-mpc
+installcheck-host: maybe-installcheck-ppl
+installcheck-host: maybe-installcheck-cloog
+installcheck-host: maybe-installcheck-libelf
+installcheck-host: maybe-installcheck-gold
+installcheck-host: maybe-installcheck-gprof
+installcheck-host: maybe-installcheck-intl
+installcheck-host: maybe-installcheck-tcl
+installcheck-host: maybe-installcheck-itcl
+installcheck-host: maybe-installcheck-ld
+installcheck-host: maybe-installcheck-libcpp
+installcheck-host: maybe-installcheck-libdecnumber
+installcheck-host: maybe-installcheck-libgui
+installcheck-host: maybe-installcheck-libiberty
+installcheck-host: maybe-installcheck-libiconv
+installcheck-host: maybe-installcheck-m4
+installcheck-host: maybe-installcheck-readline
+installcheck-host: maybe-installcheck-sid
+installcheck-host: maybe-installcheck-sim
+installcheck-host: maybe-installcheck-texinfo
+installcheck-host: maybe-installcheck-zlib
+installcheck-host: maybe-installcheck-gdb
+installcheck-host: maybe-installcheck-expect
+installcheck-host: maybe-installcheck-guile
+installcheck-host: maybe-installcheck-tk
+installcheck-host: maybe-installcheck-libtermcap
+installcheck-host: maybe-installcheck-utils
+installcheck-host: maybe-installcheck-gnattools
+installcheck-host: maybe-installcheck-lto-plugin
+
+.PHONY: installcheck-target
+
+installcheck-target: maybe-installcheck-target-libstdc++-v3
+installcheck-target: maybe-installcheck-target-libmudflap
+installcheck-target: maybe-installcheck-target-libssp
+installcheck-target: maybe-installcheck-target-newlib
+installcheck-target: maybe-installcheck-target-libgcc
+installcheck-target: maybe-installcheck-target-libquadmath
+installcheck-target: maybe-installcheck-target-libgfortran
+installcheck-target: maybe-installcheck-target-libobjc
+installcheck-target: maybe-installcheck-target-libgo
+installcheck-target: maybe-installcheck-target-libtermcap
+installcheck-target: maybe-installcheck-target-winsup
+installcheck-target: maybe-installcheck-target-libgloss
+installcheck-target: maybe-installcheck-target-libffi
+installcheck-target: maybe-installcheck-target-libjava
+installcheck-target: maybe-installcheck-target-zlib
+installcheck-target: maybe-installcheck-target-boehm-gc
+installcheck-target: maybe-installcheck-target-rda
+installcheck-target: maybe-installcheck-target-libada
+installcheck-target: maybe-installcheck-target-libgomp
+
+.PHONY: do-mostlyclean
+do-mostlyclean:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) mostlyclean-host \
+	  mostlyclean-target
+
+
+.PHONY: mostlyclean-host
+
+mostlyclean-host: maybe-mostlyclean-bfd
+mostlyclean-host: maybe-mostlyclean-opcodes
+mostlyclean-host: maybe-mostlyclean-binutils
+mostlyclean-host: maybe-mostlyclean-bison
+mostlyclean-host: maybe-mostlyclean-cgen
+mostlyclean-host: maybe-mostlyclean-dejagnu
+mostlyclean-host: maybe-mostlyclean-etc
+mostlyclean-host: maybe-mostlyclean-fastjar
+mostlyclean-host: maybe-mostlyclean-fixincludes
+mostlyclean-host: maybe-mostlyclean-flex
+mostlyclean-host: maybe-mostlyclean-gas
+mostlyclean-host: maybe-mostlyclean-gcc
+mostlyclean-host: maybe-mostlyclean-gmp
+mostlyclean-host: maybe-mostlyclean-mpfr
+mostlyclean-host: maybe-mostlyclean-mpc
+mostlyclean-host: maybe-mostlyclean-ppl
+mostlyclean-host: maybe-mostlyclean-cloog
+mostlyclean-host: maybe-mostlyclean-libelf
+mostlyclean-host: maybe-mostlyclean-gold
+mostlyclean-host: maybe-mostlyclean-gprof
+mostlyclean-host: maybe-mostlyclean-intl
+mostlyclean-host: maybe-mostlyclean-tcl
+mostlyclean-host: maybe-mostlyclean-itcl
+mostlyclean-host: maybe-mostlyclean-ld
+mostlyclean-host: maybe-mostlyclean-libcpp
+mostlyclean-host: maybe-mostlyclean-libdecnumber
+mostlyclean-host: maybe-mostlyclean-libgui
+mostlyclean-host: maybe-mostlyclean-libiberty
+mostlyclean-host: maybe-mostlyclean-libiconv
+mostlyclean-host: maybe-mostlyclean-m4
+mostlyclean-host: maybe-mostlyclean-readline
+mostlyclean-host: maybe-mostlyclean-sid
+mostlyclean-host: maybe-mostlyclean-sim
+mostlyclean-host: maybe-mostlyclean-texinfo
+mostlyclean-host: maybe-mostlyclean-zlib
+mostlyclean-host: maybe-mostlyclean-gdb
+mostlyclean-host: maybe-mostlyclean-expect
+mostlyclean-host: maybe-mostlyclean-guile
+mostlyclean-host: maybe-mostlyclean-tk
+mostlyclean-host: maybe-mostlyclean-libtermcap
+mostlyclean-host: maybe-mostlyclean-utils
+mostlyclean-host: maybe-mostlyclean-gnattools
+mostlyclean-host: maybe-mostlyclean-lto-plugin
+
+.PHONY: mostlyclean-target
+
+mostlyclean-target: maybe-mostlyclean-target-libstdc++-v3
+mostlyclean-target: maybe-mostlyclean-target-libmudflap
+mostlyclean-target: maybe-mostlyclean-target-libssp
+mostlyclean-target: maybe-mostlyclean-target-newlib
+mostlyclean-target: maybe-mostlyclean-target-libgcc
+mostlyclean-target: maybe-mostlyclean-target-libquadmath
+mostlyclean-target: maybe-mostlyclean-target-libgfortran
+mostlyclean-target: maybe-mostlyclean-target-libobjc
+mostlyclean-target: maybe-mostlyclean-target-libgo
+mostlyclean-target: maybe-mostlyclean-target-libtermcap
+mostlyclean-target: maybe-mostlyclean-target-winsup
+mostlyclean-target: maybe-mostlyclean-target-libgloss
+mostlyclean-target: maybe-mostlyclean-target-libffi
+mostlyclean-target: maybe-mostlyclean-target-libjava
+mostlyclean-target: maybe-mostlyclean-target-zlib
+mostlyclean-target: maybe-mostlyclean-target-boehm-gc
+mostlyclean-target: maybe-mostlyclean-target-rda
+mostlyclean-target: maybe-mostlyclean-target-libada
+mostlyclean-target: maybe-mostlyclean-target-libgomp
+
+.PHONY: do-clean
+do-clean:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) clean-host \
+	  clean-target
+
+
+.PHONY: clean-host
+
+clean-host: maybe-clean-bfd
+clean-host: maybe-clean-opcodes
+clean-host: maybe-clean-binutils
+clean-host: maybe-clean-bison
+clean-host: maybe-clean-cgen
+clean-host: maybe-clean-dejagnu
+clean-host: maybe-clean-etc
+clean-host: maybe-clean-fastjar
+clean-host: maybe-clean-fixincludes
+clean-host: maybe-clean-flex
+clean-host: maybe-clean-gas
+clean-host: maybe-clean-gcc
+clean-host: maybe-clean-gmp
+clean-host: maybe-clean-mpfr
+clean-host: maybe-clean-mpc
+clean-host: maybe-clean-ppl
+clean-host: maybe-clean-cloog
+clean-host: maybe-clean-libelf
+clean-host: maybe-clean-gold
+clean-host: maybe-clean-gprof
+clean-host: maybe-clean-intl
+clean-host: maybe-clean-tcl
+clean-host: maybe-clean-itcl
+clean-host: maybe-clean-ld
+clean-host: maybe-clean-libcpp
+clean-host: maybe-clean-libdecnumber
+clean-host: maybe-clean-libgui
+clean-host: maybe-clean-libiberty
+clean-host: maybe-clean-libiconv
+clean-host: maybe-clean-m4
+clean-host: maybe-clean-readline
+clean-host: maybe-clean-sid
+clean-host: maybe-clean-sim
+clean-host: maybe-clean-texinfo
+clean-host: maybe-clean-zlib
+clean-host: maybe-clean-gdb
+clean-host: maybe-clean-expect
+clean-host: maybe-clean-guile
+clean-host: maybe-clean-tk
+clean-host: maybe-clean-libtermcap
+clean-host: maybe-clean-utils
+clean-host: maybe-clean-gnattools
+clean-host: maybe-clean-lto-plugin
+
+.PHONY: clean-target
+
+clean-target: maybe-clean-target-libstdc++-v3
+clean-target: maybe-clean-target-libmudflap
+clean-target: maybe-clean-target-libssp
+clean-target: maybe-clean-target-newlib
+clean-target: maybe-clean-target-libgcc
+clean-target: maybe-clean-target-libquadmath
+clean-target: maybe-clean-target-libgfortran
+clean-target: maybe-clean-target-libobjc
+clean-target: maybe-clean-target-libgo
+clean-target: maybe-clean-target-libtermcap
+clean-target: maybe-clean-target-winsup
+clean-target: maybe-clean-target-libgloss
+clean-target: maybe-clean-target-libffi
+clean-target: maybe-clean-target-libjava
+clean-target: maybe-clean-target-zlib
+clean-target: maybe-clean-target-boehm-gc
+clean-target: maybe-clean-target-rda
+clean-target: maybe-clean-target-libada
+clean-target: maybe-clean-target-libgomp
+
+.PHONY: do-distclean
+do-distclean:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) distclean-host \
+	  distclean-target
+
+
+.PHONY: distclean-host
+
+distclean-host: maybe-distclean-bfd
+distclean-host: maybe-distclean-opcodes
+distclean-host: maybe-distclean-binutils
+distclean-host: maybe-distclean-bison
+distclean-host: maybe-distclean-cgen
+distclean-host: maybe-distclean-dejagnu
+distclean-host: maybe-distclean-etc
+distclean-host: maybe-distclean-fastjar
+distclean-host: maybe-distclean-fixincludes
+distclean-host: maybe-distclean-flex
+distclean-host: maybe-distclean-gas
+distclean-host: maybe-distclean-gcc
+distclean-host: maybe-distclean-gmp
+distclean-host: maybe-distclean-mpfr
+distclean-host: maybe-distclean-mpc
+distclean-host: maybe-distclean-ppl
+distclean-host: maybe-distclean-cloog
+distclean-host: maybe-distclean-libelf
+distclean-host: maybe-distclean-gold
+distclean-host: maybe-distclean-gprof
+distclean-host: maybe-distclean-intl
+distclean-host: maybe-distclean-tcl
+distclean-host: maybe-distclean-itcl
+distclean-host: maybe-distclean-ld
+distclean-host: maybe-distclean-libcpp
+distclean-host: maybe-distclean-libdecnumber
+distclean-host: maybe-distclean-libgui
+distclean-host: maybe-distclean-libiberty
+distclean-host: maybe-distclean-libiconv
+distclean-host: maybe-distclean-m4
+distclean-host: maybe-distclean-readline
+distclean-host: maybe-distclean-sid
+distclean-host: maybe-distclean-sim
+distclean-host: maybe-distclean-texinfo
+distclean-host: maybe-distclean-zlib
+distclean-host: maybe-distclean-gdb
+distclean-host: maybe-distclean-expect
+distclean-host: maybe-distclean-guile
+distclean-host: maybe-distclean-tk
+distclean-host: maybe-distclean-libtermcap
+distclean-host: maybe-distclean-utils
+distclean-host: maybe-distclean-gnattools
+distclean-host: maybe-distclean-lto-plugin
+
+.PHONY: distclean-target
+
+distclean-target: maybe-distclean-target-libstdc++-v3
+distclean-target: maybe-distclean-target-libmudflap
+distclean-target: maybe-distclean-target-libssp
+distclean-target: maybe-distclean-target-newlib
+distclean-target: maybe-distclean-target-libgcc
+distclean-target: maybe-distclean-target-libquadmath
+distclean-target: maybe-distclean-target-libgfortran
+distclean-target: maybe-distclean-target-libobjc
+distclean-target: maybe-distclean-target-libgo
+distclean-target: maybe-distclean-target-libtermcap
+distclean-target: maybe-distclean-target-winsup
+distclean-target: maybe-distclean-target-libgloss
+distclean-target: maybe-distclean-target-libffi
+distclean-target: maybe-distclean-target-libjava
+distclean-target: maybe-distclean-target-zlib
+distclean-target: maybe-distclean-target-boehm-gc
+distclean-target: maybe-distclean-target-rda
+distclean-target: maybe-distclean-target-libada
+distclean-target: maybe-distclean-target-libgomp
+
+.PHONY: do-maintainer-clean
+do-maintainer-clean:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) maintainer-clean-host \
+	  maintainer-clean-target
+
+
+.PHONY: maintainer-clean-host
+
+maintainer-clean-host: maybe-maintainer-clean-bfd
+maintainer-clean-host: maybe-maintainer-clean-opcodes
+maintainer-clean-host: maybe-maintainer-clean-binutils
+maintainer-clean-host: maybe-maintainer-clean-bison
+maintainer-clean-host: maybe-maintainer-clean-cgen
+maintainer-clean-host: maybe-maintainer-clean-dejagnu
+maintainer-clean-host: maybe-maintainer-clean-etc
+maintainer-clean-host: maybe-maintainer-clean-fastjar
+maintainer-clean-host: maybe-maintainer-clean-fixincludes
+maintainer-clean-host: maybe-maintainer-clean-flex
+maintainer-clean-host: maybe-maintainer-clean-gas
+maintainer-clean-host: maybe-maintainer-clean-gcc
+maintainer-clean-host: maybe-maintainer-clean-gmp
+maintainer-clean-host: maybe-maintainer-clean-mpfr
+maintainer-clean-host: maybe-maintainer-clean-mpc
+maintainer-clean-host: maybe-maintainer-clean-ppl
+maintainer-clean-host: maybe-maintainer-clean-cloog
+maintainer-clean-host: maybe-maintainer-clean-libelf
+maintainer-clean-host: maybe-maintainer-clean-gold
+maintainer-clean-host: maybe-maintainer-clean-gprof
+maintainer-clean-host: maybe-maintainer-clean-intl
+maintainer-clean-host: maybe-maintainer-clean-tcl
+maintainer-clean-host: maybe-maintainer-clean-itcl
+maintainer-clean-host: maybe-maintainer-clean-ld
+maintainer-clean-host: maybe-maintainer-clean-libcpp
+maintainer-clean-host: maybe-maintainer-clean-libdecnumber
+maintainer-clean-host: maybe-maintainer-clean-libgui
+maintainer-clean-host: maybe-maintainer-clean-libiberty
+maintainer-clean-host: maybe-maintainer-clean-libiconv
+maintainer-clean-host: maybe-maintainer-clean-m4
+maintainer-clean-host: maybe-maintainer-clean-readline
+maintainer-clean-host: maybe-maintainer-clean-sid
+maintainer-clean-host: maybe-maintainer-clean-sim
+maintainer-clean-host: maybe-maintainer-clean-texinfo
+maintainer-clean-host: maybe-maintainer-clean-zlib
+maintainer-clean-host: maybe-maintainer-clean-gdb
+maintainer-clean-host: maybe-maintainer-clean-expect
+maintainer-clean-host: maybe-maintainer-clean-guile
+maintainer-clean-host: maybe-maintainer-clean-tk
+maintainer-clean-host: maybe-maintainer-clean-libtermcap
+maintainer-clean-host: maybe-maintainer-clean-utils
+maintainer-clean-host: maybe-maintainer-clean-gnattools
+maintainer-clean-host: maybe-maintainer-clean-lto-plugin
+
+.PHONY: maintainer-clean-target
+
+maintainer-clean-target: maybe-maintainer-clean-target-libstdc++-v3
+maintainer-clean-target: maybe-maintainer-clean-target-libmudflap
+maintainer-clean-target: maybe-maintainer-clean-target-libssp
+maintainer-clean-target: maybe-maintainer-clean-target-newlib
+maintainer-clean-target: maybe-maintainer-clean-target-libgcc
+maintainer-clean-target: maybe-maintainer-clean-target-libquadmath
+maintainer-clean-target: maybe-maintainer-clean-target-libgfortran
+maintainer-clean-target: maybe-maintainer-clean-target-libobjc
+maintainer-clean-target: maybe-maintainer-clean-target-libgo
+maintainer-clean-target: maybe-maintainer-clean-target-libtermcap
+maintainer-clean-target: maybe-maintainer-clean-target-winsup
+maintainer-clean-target: maybe-maintainer-clean-target-libgloss
+maintainer-clean-target: maybe-maintainer-clean-target-libffi
+maintainer-clean-target: maybe-maintainer-clean-target-libjava
+maintainer-clean-target: maybe-maintainer-clean-target-zlib
+maintainer-clean-target: maybe-maintainer-clean-target-boehm-gc
+maintainer-clean-target: maybe-maintainer-clean-target-rda
+maintainer-clean-target: maybe-maintainer-clean-target-libada
+maintainer-clean-target: maybe-maintainer-clean-target-libgomp
+
+
+# Here are the targets which correspond to the do-X targets.
+
+.PHONY: info installcheck dvi pdf html
+.PHONY: install-info install-pdf install-html
+.PHONY: clean distclean mostlyclean maintainer-clean realclean
+.PHONY: local-clean local-distclean local-maintainer-clean
+info: do-info
+installcheck: do-installcheck
+dvi: do-dvi
+pdf: do-pdf
+html: do-html
+
+# Make sure makeinfo is built before we do a `make info', if we're
+# in fact building texinfo.
+do-info: maybe-all-texinfo
+
+install-info: do-install-info dir.info
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	if [ -f dir.info ] ; then \
+	  $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \
+	else true ; fi
+
+install-pdf: do-install-pdf
+
+install-html: do-install-html
+
+local-clean:
+	-rm -f *.a TEMP errs core *.o *~ \#* TAGS *.E *.log
+
+local-distclean:
+	-rm -f Makefile config.status config.cache mh-frag mt-frag
+	-rm -f maybedep.tmp serdep.tmp
+	-if [ "$(TARGET_SUBDIR)" != "." ]; then \
+	  rm -rf $(TARGET_SUBDIR); \
+	else true; fi
+	-rm -rf $(BUILD_SUBDIR)
+	-if [ "$(HOST_SUBDIR)" != "." ]; then \
+	  rm -rf $(HOST_SUBDIR); \
+	else true; fi
+	-rm -f texinfo/po/Makefile texinfo/po/Makefile.in texinfo/info/Makefile
+	-rm -f texinfo/doc/Makefile texinfo/po/POTFILES
+	-rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
+	-rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null
+	-rmdir fastjar gcc libiberty texinfo zlib 2>/dev/null
+	-find . -name config.cache -exec rm -f {} \; \; 2>/dev/null
+
+local-maintainer-clean:
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+clean: do-clean local-clean
+mostlyclean: do-mostlyclean local-clean
+distclean: do-distclean local-clean local-distclean
+maintainer-clean: local-maintainer-clean do-maintainer-clean local-clean 
+maintainer-clean: local-distclean
+realclean: maintainer-clean
+
+# Check target.
+
+.PHONY: check do-check
+check: do-check
+
+# Only include modules actually being configured and built.
+.PHONY: check-host
+check-host:  \
+    maybe-check-bfd \
+    maybe-check-opcodes \
+    maybe-check-binutils \
+    maybe-check-bison \
+    maybe-check-cgen \
+    maybe-check-dejagnu \
+    maybe-check-etc \
+    maybe-check-fastjar \
+    maybe-check-fixincludes \
+    maybe-check-flex \
+    maybe-check-gas \
+    maybe-check-gcc \
+    maybe-check-gmp \
+    maybe-check-mpfr \
+    maybe-check-mpc \
+    maybe-check-ppl \
+    maybe-check-cloog \
+    maybe-check-libelf \
+    maybe-check-gold \
+    maybe-check-gprof \
+    maybe-check-intl \
+    maybe-check-tcl \
+    maybe-check-itcl \
+    maybe-check-ld \
+    maybe-check-libcpp \
+    maybe-check-libdecnumber \
+    maybe-check-libgui \
+    maybe-check-libiberty \
+    maybe-check-libiconv \
+    maybe-check-m4 \
+    maybe-check-readline \
+    maybe-check-sid \
+    maybe-check-sim \
+    maybe-check-texinfo \
+    maybe-check-zlib \
+    maybe-check-gdb \
+    maybe-check-expect \
+    maybe-check-guile \
+    maybe-check-tk \
+    maybe-check-libtermcap \
+    maybe-check-utils \
+    maybe-check-gnattools \
+    maybe-check-lto-plugin
+
+.PHONY: check-target
+check-target:  \
+    maybe-check-target-libstdc++-v3 \
+    maybe-check-target-libmudflap \
+    maybe-check-target-libssp \
+    maybe-check-target-newlib \
+    maybe-check-target-libgcc \
+    maybe-check-target-libquadmath \
+    maybe-check-target-libgfortran \
+    maybe-check-target-libobjc \
+    maybe-check-target-libgo \
+    maybe-check-target-libtermcap \
+    maybe-check-target-winsup \
+    maybe-check-target-libgloss \
+    maybe-check-target-libffi \
+    maybe-check-target-libjava \
+    maybe-check-target-zlib \
+    maybe-check-target-boehm-gc \
+    maybe-check-target-rda \
+    maybe-check-target-libada \
+    maybe-check-target-libgomp
+
+do-check:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target
+
+# Automated reporting of test results.
+
+warning.log: build.log
+	$(srcdir)/contrib/warn_summary build.log > $@
+
+mail-report.log:
+	if test x'$(BOOT_CFLAGS)' != x''; then \
+	    BOOT_CFLAGS='$(BOOT_CFLAGS)'; export BOOT_CFLAGS; \
+	fi; \
+	$(srcdir)/contrib/test_summary -t >$@
+	chmod +x $@
+	echo If you really want to send e-mail, run ./$@ now
+
+mail-report-with-warnings.log: warning.log
+	if test x'$(BOOT_CFLAGS)' != x''; then \
+	    BOOT_CFLAGS='$(BOOT_CFLAGS)'; export BOOT_CFLAGS; \
+	fi; \
+	$(srcdir)/contrib/test_summary -t -i warning.log >$@
+	chmod +x $@
+	echo If you really want to send e-mail, run ./$@ now
+
+# Installation targets.
+
+.PHONY: install uninstall
+install:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target
+
+.PHONY: install-host-nogcc
+install-host-nogcc:  \
+    maybe-install-bfd \
+    maybe-install-opcodes \
+    maybe-install-binutils \
+    maybe-install-bison \
+    maybe-install-cgen \
+    maybe-install-dejagnu \
+    maybe-install-etc \
+    maybe-install-fastjar \
+    maybe-install-fixincludes \
+    maybe-install-flex \
+    maybe-install-gas \
+    maybe-install-gmp \
+    maybe-install-mpfr \
+    maybe-install-mpc \
+    maybe-install-ppl \
+    maybe-install-cloog \
+    maybe-install-libelf \
+    maybe-install-gold \
+    maybe-install-gprof \
+    maybe-install-intl \
+    maybe-install-tcl \
+    maybe-install-itcl \
+    maybe-install-ld \
+    maybe-install-libcpp \
+    maybe-install-libdecnumber \
+    maybe-install-libgui \
+    maybe-install-libiberty \
+    maybe-install-libiconv \
+    maybe-install-m4 \
+    maybe-install-readline \
+    maybe-install-sid \
+    maybe-install-sim \
+    maybe-install-texinfo \
+    maybe-install-zlib \
+    maybe-install-gdb \
+    maybe-install-expect \
+    maybe-install-guile \
+    maybe-install-tk \
+    maybe-install-libtermcap \
+    maybe-install-utils \
+    maybe-install-gnattools \
+    maybe-install-lto-plugin
+
+.PHONY: install-host
+install-host:  \
+    maybe-install-bfd \
+    maybe-install-opcodes \
+    maybe-install-binutils \
+    maybe-install-bison \
+    maybe-install-cgen \
+    maybe-install-dejagnu \
+    maybe-install-etc \
+    maybe-install-fastjar \
+    maybe-install-fixincludes \
+    maybe-install-flex \
+    maybe-install-gas \
+    maybe-install-gcc \
+    maybe-install-gmp \
+    maybe-install-mpfr \
+    maybe-install-mpc \
+    maybe-install-ppl \
+    maybe-install-cloog \
+    maybe-install-libelf \
+    maybe-install-gold \
+    maybe-install-gprof \
+    maybe-install-intl \
+    maybe-install-tcl \
+    maybe-install-itcl \
+    maybe-install-ld \
+    maybe-install-libcpp \
+    maybe-install-libdecnumber \
+    maybe-install-libgui \
+    maybe-install-libiberty \
+    maybe-install-libiconv \
+    maybe-install-m4 \
+    maybe-install-readline \
+    maybe-install-sid \
+    maybe-install-sim \
+    maybe-install-texinfo \
+    maybe-install-zlib \
+    maybe-install-gdb \
+    maybe-install-expect \
+    maybe-install-guile \
+    maybe-install-tk \
+    maybe-install-libtermcap \
+    maybe-install-utils \
+    maybe-install-gnattools \
+    maybe-install-lto-plugin
+
+.PHONY: install-target
+install-target:  \
+    maybe-install-target-libstdc++-v3 \
+    maybe-install-target-libmudflap \
+    maybe-install-target-libssp \
+    maybe-install-target-newlib \
+    maybe-install-target-libgcc \
+    maybe-install-target-libquadmath \
+    maybe-install-target-libgfortran \
+    maybe-install-target-libobjc \
+    maybe-install-target-libgo \
+    maybe-install-target-libtermcap \
+    maybe-install-target-winsup \
+    maybe-install-target-libgloss \
+    maybe-install-target-libffi \
+    maybe-install-target-libjava \
+    maybe-install-target-zlib \
+    maybe-install-target-boehm-gc \
+    maybe-install-target-rda \
+    maybe-install-target-libada \
+    maybe-install-target-libgomp
+
+uninstall:
+	@echo "the uninstall target is not supported in this tree"
+
+.PHONY: install.all
+install.all: install-no-fixedincludes
+	@if [ -f ./gcc/Makefile ] ; then \
+		r=`${PWD_COMMAND}` ; export r ; \
+		s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+		$(HOST_EXPORTS) \
+		(cd ./gcc && \
+		$(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
+	else \
+		true ; \
+	fi
+
+# install-no-fixedincludes is used because Cygnus can not distribute
+# the fixed header files.
+.PHONY: install-no-fixedincludes
+install-no-fixedincludes: installdirs install-host-nogcc \
+	install-target gcc-no-fixedincludes
+
+.PHONY: install-strip
+install-strip:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-strip-host install-strip-target
+
+.PHONY: install-strip-host
+install-strip-host:  \
+    maybe-install-strip-bfd \
+    maybe-install-strip-opcodes \
+    maybe-install-strip-binutils \
+    maybe-install-strip-bison \
+    maybe-install-strip-cgen \
+    maybe-install-strip-dejagnu \
+    maybe-install-strip-etc \
+    maybe-install-strip-fastjar \
+    maybe-install-strip-fixincludes \
+    maybe-install-strip-flex \
+    maybe-install-strip-gas \
+    maybe-install-strip-gcc \
+    maybe-install-strip-gmp \
+    maybe-install-strip-mpfr \
+    maybe-install-strip-mpc \
+    maybe-install-strip-ppl \
+    maybe-install-strip-cloog \
+    maybe-install-strip-libelf \
+    maybe-install-strip-gold \
+    maybe-install-strip-gprof \
+    maybe-install-strip-intl \
+    maybe-install-strip-tcl \
+    maybe-install-strip-itcl \
+    maybe-install-strip-ld \
+    maybe-install-strip-libcpp \
+    maybe-install-strip-libdecnumber \
+    maybe-install-strip-libgui \
+    maybe-install-strip-libiberty \
+    maybe-install-strip-libiconv \
+    maybe-install-strip-m4 \
+    maybe-install-strip-readline \
+    maybe-install-strip-sid \
+    maybe-install-strip-sim \
+    maybe-install-strip-texinfo \
+    maybe-install-strip-zlib \
+    maybe-install-strip-gdb \
+    maybe-install-strip-expect \
+    maybe-install-strip-guile \
+    maybe-install-strip-tk \
+    maybe-install-strip-libtermcap \
+    maybe-install-strip-utils \
+    maybe-install-strip-gnattools \
+    maybe-install-strip-lto-plugin
+
+.PHONY: install-strip-target
+install-strip-target:  \
+    maybe-install-strip-target-libstdc++-v3 \
+    maybe-install-strip-target-libmudflap \
+    maybe-install-strip-target-libssp \
+    maybe-install-strip-target-newlib \
+    maybe-install-strip-target-libgcc \
+    maybe-install-strip-target-libquadmath \
+    maybe-install-strip-target-libgfortran \
+    maybe-install-strip-target-libobjc \
+    maybe-install-strip-target-libgo \
+    maybe-install-strip-target-libtermcap \
+    maybe-install-strip-target-winsup \
+    maybe-install-strip-target-libgloss \
+    maybe-install-strip-target-libffi \
+    maybe-install-strip-target-libjava \
+    maybe-install-strip-target-zlib \
+    maybe-install-strip-target-boehm-gc \
+    maybe-install-strip-target-rda \
+    maybe-install-strip-target-libada \
+    maybe-install-strip-target-libgomp
+
+
+### other supporting targets
+
+MAKEDIRS= \
+	$(DESTDIR)$(prefix) \
+	$(DESTDIR)$(exec_prefix)
+.PHONY: installdirs
+installdirs: mkinstalldirs
+	$(SHELL) $(srcdir)/mkinstalldirs $(MAKEDIRS)
+
+dir.info: do-install-info
+	if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \
+	  $(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \
+	  mv -f dir.info.new dir.info ; \
+	else true ; \
+	fi
+
+dist:
+	@echo "Building a full distribution of this tree isn't done"
+	@echo "via 'make dist'.  Check out the etc/ subdirectory" 
+
+etags tags: TAGS
+
+# Right now this just builds TAGS in each subdirectory.  emacs19 has the
+# ability to use several tags files at once, so there is probably no need
+# to combine them into one big TAGS file (like CVS 1.3 does).  We could
+# (if we felt like it) have this Makefile write a piece of elisp which
+# the user could load to tell emacs19 where all the TAGS files we just
+# built are.
+TAGS: do-TAGS
+
+# ------------------------------------
+# Macros for configure and all targets
+# ------------------------------------
+
+
+
+
+
+# --------------------------------------
+# Modules which run on the build machine
+# --------------------------------------
+
+
+.PHONY: configure-build-libiberty maybe-configure-build-libiberty
+maybe-configure-build-libiberty:
+@if gcc-bootstrap
+configure-build-libiberty: stage_current
+@endif gcc-bootstrap
+@if build-libiberty
+maybe-configure-build-libiberty: configure-build-libiberty
+configure-build-libiberty: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty ; \
+	$(BUILD_EXPORTS)  \
+	echo Configuring in $(BUILD_SUBDIR)/libiberty; \
+	cd "$(BUILD_SUBDIR)/libiberty" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(BUILD_SUBDIR)/libiberty/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libiberty"; \
+	libsrcdir="$$s/libiberty"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif build-libiberty
+
+
+
+
+
+.PHONY: all-build-libiberty maybe-all-build-libiberty
+maybe-all-build-libiberty:
+@if gcc-bootstrap
+all-build-libiberty: stage_current
+@endif gcc-bootstrap
+@if build-libiberty
+TARGET-build-libiberty=all
+maybe-all-build-libiberty: all-build-libiberty
+all-build-libiberty: configure-build-libiberty
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(BUILD_EXPORTS)  \
+	(cd $(BUILD_SUBDIR)/libiberty && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+		$(TARGET-build-libiberty))
+@endif build-libiberty
+
+
+
+
+
+.PHONY: configure-build-bison maybe-configure-build-bison
+maybe-configure-build-bison:
+@if gcc-bootstrap
+configure-build-bison: stage_current
+@endif gcc-bootstrap
+@if build-bison
+maybe-configure-build-bison: configure-build-bison
+configure-build-bison: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison ; \
+	$(BUILD_EXPORTS)  \
+	echo Configuring in $(BUILD_SUBDIR)/bison; \
+	cd "$(BUILD_SUBDIR)/bison" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(BUILD_SUBDIR)/bison/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/bison"; \
+	libsrcdir="$$s/bison"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif build-bison
+
+
+
+
+
+.PHONY: all-build-bison maybe-all-build-bison
+maybe-all-build-bison:
+@if gcc-bootstrap
+all-build-bison: stage_current
+@endif gcc-bootstrap
+@if build-bison
+TARGET-build-bison=all
+maybe-all-build-bison: all-build-bison
+all-build-bison: configure-build-bison
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(BUILD_EXPORTS)  \
+	(cd $(BUILD_SUBDIR)/bison && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+		$(TARGET-build-bison))
+@endif build-bison
+
+
+
+
+
+.PHONY: configure-build-flex maybe-configure-build-flex
+maybe-configure-build-flex:
+@if gcc-bootstrap
+configure-build-flex: stage_current
+@endif gcc-bootstrap
+@if build-flex
+maybe-configure-build-flex: configure-build-flex
+configure-build-flex: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex ; \
+	$(BUILD_EXPORTS)  \
+	echo Configuring in $(BUILD_SUBDIR)/flex; \
+	cd "$(BUILD_SUBDIR)/flex" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(BUILD_SUBDIR)/flex/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/flex"; \
+	libsrcdir="$$s/flex"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif build-flex
+
+
+
+
+
+.PHONY: all-build-flex maybe-all-build-flex
+maybe-all-build-flex:
+@if gcc-bootstrap
+all-build-flex: stage_current
+@endif gcc-bootstrap
+@if build-flex
+TARGET-build-flex=all
+maybe-all-build-flex: all-build-flex
+all-build-flex: configure-build-flex
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(BUILD_EXPORTS)  \
+	(cd $(BUILD_SUBDIR)/flex && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+		$(TARGET-build-flex))
+@endif build-flex
+
+
+
+
+
+.PHONY: configure-build-m4 maybe-configure-build-m4
+maybe-configure-build-m4:
+@if gcc-bootstrap
+configure-build-m4: stage_current
+@endif gcc-bootstrap
+@if build-m4
+maybe-configure-build-m4: configure-build-m4
+configure-build-m4: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4 ; \
+	$(BUILD_EXPORTS)  \
+	echo Configuring in $(BUILD_SUBDIR)/m4; \
+	cd "$(BUILD_SUBDIR)/m4" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(BUILD_SUBDIR)/m4/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/m4"; \
+	libsrcdir="$$s/m4"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif build-m4
+
+
+
+
+
+.PHONY: all-build-m4 maybe-all-build-m4
+maybe-all-build-m4:
+@if gcc-bootstrap
+all-build-m4: stage_current
+@endif gcc-bootstrap
+@if build-m4
+TARGET-build-m4=all
+maybe-all-build-m4: all-build-m4
+all-build-m4: configure-build-m4
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(BUILD_EXPORTS)  \
+	(cd $(BUILD_SUBDIR)/m4 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+		$(TARGET-build-m4))
+@endif build-m4
+
+
+
+
+
+.PHONY: configure-build-texinfo maybe-configure-build-texinfo
+maybe-configure-build-texinfo:
+@if gcc-bootstrap
+configure-build-texinfo: stage_current
+@endif gcc-bootstrap
+@if build-texinfo
+maybe-configure-build-texinfo: configure-build-texinfo
+configure-build-texinfo: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo ; \
+	$(BUILD_EXPORTS)  \
+	echo Configuring in $(BUILD_SUBDIR)/texinfo; \
+	cd "$(BUILD_SUBDIR)/texinfo" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(BUILD_SUBDIR)/texinfo/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/texinfo"; \
+	libsrcdir="$$s/texinfo"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif build-texinfo
+
+
+
+
+
+.PHONY: all-build-texinfo maybe-all-build-texinfo
+maybe-all-build-texinfo:
+@if gcc-bootstrap
+all-build-texinfo: stage_current
+@endif gcc-bootstrap
+@if build-texinfo
+TARGET-build-texinfo=all
+maybe-all-build-texinfo: all-build-texinfo
+all-build-texinfo: configure-build-texinfo
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(BUILD_EXPORTS)  \
+	(cd $(BUILD_SUBDIR)/texinfo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+		$(TARGET-build-texinfo))
+@endif build-texinfo
+
+
+
+
+
+.PHONY: configure-build-fixincludes maybe-configure-build-fixincludes
+maybe-configure-build-fixincludes:
+@if gcc-bootstrap
+configure-build-fixincludes: stage_current
+@endif gcc-bootstrap
+@if build-fixincludes
+maybe-configure-build-fixincludes: configure-build-fixincludes
+configure-build-fixincludes: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes ; \
+	$(BUILD_EXPORTS)  \
+	echo Configuring in $(BUILD_SUBDIR)/fixincludes; \
+	cd "$(BUILD_SUBDIR)/fixincludes" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(BUILD_SUBDIR)/fixincludes/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/fixincludes"; \
+	libsrcdir="$$s/fixincludes"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif build-fixincludes
+
+
+
+
+
+.PHONY: all-build-fixincludes maybe-all-build-fixincludes
+maybe-all-build-fixincludes:
+@if gcc-bootstrap
+all-build-fixincludes: stage_current
+@endif gcc-bootstrap
+@if build-fixincludes
+TARGET-build-fixincludes=all
+maybe-all-build-fixincludes: all-build-fixincludes
+all-build-fixincludes: configure-build-fixincludes
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(BUILD_EXPORTS)  \
+	(cd $(BUILD_SUBDIR)/fixincludes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+		$(TARGET-build-fixincludes))
+@endif build-fixincludes
+
+
+
+
+
+# --------------------------------------
+# Modules which run on the host machine
+# --------------------------------------
+
+
+.PHONY: configure-bfd maybe-configure-bfd
+maybe-configure-bfd:
+@if gcc-bootstrap
+configure-bfd: stage_current
+@endif gcc-bootstrap
+@if bfd
+maybe-configure-bfd: configure-bfd
+configure-bfd: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/bfd; \
+	cd "$(HOST_SUBDIR)/bfd" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/bfd"; \
+	libsrcdir="$$s/bfd"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif bfd
+
+
+
+.PHONY: configure-stage1-bfd maybe-configure-stage1-bfd
+maybe-configure-stage1-bfd:
+@if bfd-bootstrap
+maybe-configure-stage1-bfd: configure-stage1-bfd
+configure-stage1-bfd:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+	cd $(HOST_SUBDIR)/bfd || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/bfd"; \
+	libsrcdir="$$s/bfd"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS)
+@endif bfd-bootstrap
+
+.PHONY: configure-stage2-bfd maybe-configure-stage2-bfd
+maybe-configure-stage2-bfd:
+@if bfd-bootstrap
+maybe-configure-stage2-bfd: configure-stage2-bfd
+configure-stage2-bfd:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+	cd $(HOST_SUBDIR)/bfd || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/bfd"; \
+	libsrcdir="$$s/bfd"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS)
+@endif bfd-bootstrap
+
+.PHONY: configure-stage3-bfd maybe-configure-stage3-bfd
+maybe-configure-stage3-bfd:
+@if bfd-bootstrap
+maybe-configure-stage3-bfd: configure-stage3-bfd
+configure-stage3-bfd:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+	cd $(HOST_SUBDIR)/bfd || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/bfd"; \
+	libsrcdir="$$s/bfd"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS)
+@endif bfd-bootstrap
+
+.PHONY: configure-stage4-bfd maybe-configure-stage4-bfd
+maybe-configure-stage4-bfd:
+@if bfd-bootstrap
+maybe-configure-stage4-bfd: configure-stage4-bfd
+configure-stage4-bfd:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+	cd $(HOST_SUBDIR)/bfd || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/bfd"; \
+	libsrcdir="$$s/bfd"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS)
+@endif bfd-bootstrap
+
+.PHONY: configure-stageprofile-bfd maybe-configure-stageprofile-bfd
+maybe-configure-stageprofile-bfd:
+@if bfd-bootstrap
+maybe-configure-stageprofile-bfd: configure-stageprofile-bfd
+configure-stageprofile-bfd:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+	cd $(HOST_SUBDIR)/bfd || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/bfd"; \
+	libsrcdir="$$s/bfd"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS)
+@endif bfd-bootstrap
+
+.PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd
+maybe-configure-stagefeedback-bfd:
+@if bfd-bootstrap
+maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd
+configure-stagefeedback-bfd:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+	cd $(HOST_SUBDIR)/bfd || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/bfd"; \
+	libsrcdir="$$s/bfd"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif bfd-bootstrap
+
+
+
+
+
+.PHONY: all-bfd maybe-all-bfd
+maybe-all-bfd:
+@if gcc-bootstrap
+all-bfd: stage_current
+@endif gcc-bootstrap
+@if bfd
+TARGET-bfd=all
+maybe-all-bfd: all-bfd
+all-bfd: configure-bfd
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/bfd && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-bfd))
+@endif bfd
+
+
+
+.PHONY: all-stage1-bfd maybe-all-stage1-bfd
+.PHONY: clean-stage1-bfd maybe-clean-stage1-bfd
+maybe-all-stage1-bfd:
+maybe-clean-stage1-bfd:
+@if bfd-bootstrap
+maybe-all-stage1-bfd: all-stage1-bfd
+all-stage1: all-stage1-bfd
+TARGET-stage1-bfd = $(TARGET-bfd)
+all-stage1-bfd: configure-stage1-bfd
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-bfd)
+
+maybe-clean-stage1-bfd: clean-stage1-bfd
+clean-stage1: clean-stage1-bfd
+clean-stage1-bfd:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage1-bfd/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		 clean
+@endif bfd-bootstrap
+
+
+.PHONY: all-stage2-bfd maybe-all-stage2-bfd
+.PHONY: clean-stage2-bfd maybe-clean-stage2-bfd
+maybe-all-stage2-bfd:
+maybe-clean-stage2-bfd:
+@if bfd-bootstrap
+maybe-all-stage2-bfd: all-stage2-bfd
+all-stage2: all-stage2-bfd
+TARGET-stage2-bfd = $(TARGET-bfd)
+all-stage2-bfd: configure-stage2-bfd
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-bfd)
+
+maybe-clean-stage2-bfd: clean-stage2-bfd
+clean-stage2: clean-stage2-bfd
+clean-stage2-bfd:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage2-bfd/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif bfd-bootstrap
+
+
+.PHONY: all-stage3-bfd maybe-all-stage3-bfd
+.PHONY: clean-stage3-bfd maybe-clean-stage3-bfd
+maybe-all-stage3-bfd:
+maybe-clean-stage3-bfd:
+@if bfd-bootstrap
+maybe-all-stage3-bfd: all-stage3-bfd
+all-stage3: all-stage3-bfd
+TARGET-stage3-bfd = $(TARGET-bfd)
+all-stage3-bfd: configure-stage3-bfd
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-bfd)
+
+maybe-clean-stage3-bfd: clean-stage3-bfd
+clean-stage3: clean-stage3-bfd
+clean-stage3-bfd:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage3-bfd/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif bfd-bootstrap
+
+
+.PHONY: all-stage4-bfd maybe-all-stage4-bfd
+.PHONY: clean-stage4-bfd maybe-clean-stage4-bfd
+maybe-all-stage4-bfd:
+maybe-clean-stage4-bfd:
+@if bfd-bootstrap
+maybe-all-stage4-bfd: all-stage4-bfd
+all-stage4: all-stage4-bfd
+TARGET-stage4-bfd = $(TARGET-bfd)
+all-stage4-bfd: configure-stage4-bfd
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE4_CFLAGS)" \
+		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-bfd)
+
+maybe-clean-stage4-bfd: clean-stage4-bfd
+clean-stage4: clean-stage4-bfd
+clean-stage4-bfd:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage4-bfd/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif bfd-bootstrap
+
+
+.PHONY: all-stageprofile-bfd maybe-all-stageprofile-bfd
+.PHONY: clean-stageprofile-bfd maybe-clean-stageprofile-bfd
+maybe-all-stageprofile-bfd:
+maybe-clean-stageprofile-bfd:
+@if bfd-bootstrap
+maybe-all-stageprofile-bfd: all-stageprofile-bfd
+all-stageprofile: all-stageprofile-bfd
+TARGET-stageprofile-bfd = $(TARGET-bfd)
+all-stageprofile-bfd: configure-stageprofile-bfd
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-bfd)
+
+maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
+clean-stageprofile: clean-stageprofile-bfd
+clean-stageprofile-bfd:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stageprofile-bfd/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif bfd-bootstrap
+
+
+.PHONY: all-stagefeedback-bfd maybe-all-stagefeedback-bfd
+.PHONY: clean-stagefeedback-bfd maybe-clean-stagefeedback-bfd
+maybe-all-stagefeedback-bfd:
+maybe-clean-stagefeedback-bfd:
+@if bfd-bootstrap
+maybe-all-stagefeedback-bfd: all-stagefeedback-bfd
+all-stagefeedback: all-stagefeedback-bfd
+TARGET-stagefeedback-bfd = $(TARGET-bfd)
+all-stagefeedback-bfd: configure-stagefeedback-bfd
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-bfd)
+
+maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
+clean-stagefeedback: clean-stagefeedback-bfd
+clean-stagefeedback-bfd:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stagefeedback-bfd/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif bfd-bootstrap
+
+
+
+
+
+.PHONY: check-bfd maybe-check-bfd
+maybe-check-bfd:
+@if bfd
+maybe-check-bfd: check-bfd
+
+check-bfd:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/bfd && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif bfd
+
+.PHONY: install-bfd maybe-install-bfd
+maybe-install-bfd:
+@if bfd
+maybe-install-bfd: install-bfd
+
+install-bfd: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/bfd && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif bfd
+
+.PHONY: install-strip-bfd maybe-install-strip-bfd
+maybe-install-strip-bfd:
+@if bfd
+maybe-install-strip-bfd: install-strip-bfd
+
+install-strip-bfd: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/bfd && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif bfd
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-bfd info-bfd
+maybe-info-bfd:
+@if bfd
+maybe-info-bfd: info-bfd
+
+info-bfd: \
+    configure-bfd 
+	@[ -f ./bfd/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in bfd" ; \
+	(cd $(HOST_SUBDIR)/bfd && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif bfd
+
+.PHONY: maybe-dvi-bfd dvi-bfd
+maybe-dvi-bfd:
+@if bfd
+maybe-dvi-bfd: dvi-bfd
+
+dvi-bfd: \
+    configure-bfd 
+	@[ -f ./bfd/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in bfd" ; \
+	(cd $(HOST_SUBDIR)/bfd && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif bfd
+
+.PHONY: maybe-pdf-bfd pdf-bfd
+maybe-pdf-bfd:
+@if bfd
+maybe-pdf-bfd: pdf-bfd
+
+pdf-bfd: \
+    configure-bfd 
+	@[ -f ./bfd/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in bfd" ; \
+	(cd $(HOST_SUBDIR)/bfd && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif bfd
+
+.PHONY: maybe-html-bfd html-bfd
+maybe-html-bfd:
+@if bfd
+maybe-html-bfd: html-bfd
+
+html-bfd: \
+    configure-bfd 
+	@[ -f ./bfd/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in bfd" ; \
+	(cd $(HOST_SUBDIR)/bfd && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif bfd
+
+.PHONY: maybe-TAGS-bfd TAGS-bfd
+maybe-TAGS-bfd:
+@if bfd
+maybe-TAGS-bfd: TAGS-bfd
+
+TAGS-bfd: \
+    configure-bfd 
+	@[ -f ./bfd/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in bfd" ; \
+	(cd $(HOST_SUBDIR)/bfd && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif bfd
+
+.PHONY: maybe-install-info-bfd install-info-bfd
+maybe-install-info-bfd:
+@if bfd
+maybe-install-info-bfd: install-info-bfd
+
+install-info-bfd: \
+    configure-bfd \
+    info-bfd 
+	@[ -f ./bfd/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in bfd" ; \
+	(cd $(HOST_SUBDIR)/bfd && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif bfd
+
+.PHONY: maybe-install-pdf-bfd install-pdf-bfd
+maybe-install-pdf-bfd:
+@if bfd
+maybe-install-pdf-bfd: install-pdf-bfd
+
+install-pdf-bfd: \
+    configure-bfd \
+    pdf-bfd 
+	@[ -f ./bfd/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in bfd" ; \
+	(cd $(HOST_SUBDIR)/bfd && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif bfd
+
+.PHONY: maybe-install-html-bfd install-html-bfd
+maybe-install-html-bfd:
+@if bfd
+maybe-install-html-bfd: install-html-bfd
+
+install-html-bfd: \
+    configure-bfd \
+    html-bfd 
+	@[ -f ./bfd/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in bfd" ; \
+	(cd $(HOST_SUBDIR)/bfd && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif bfd
+
+.PHONY: maybe-installcheck-bfd installcheck-bfd
+maybe-installcheck-bfd:
+@if bfd
+maybe-installcheck-bfd: installcheck-bfd
+
+installcheck-bfd: \
+    configure-bfd 
+	@[ -f ./bfd/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in bfd" ; \
+	(cd $(HOST_SUBDIR)/bfd && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif bfd
+
+.PHONY: maybe-mostlyclean-bfd mostlyclean-bfd
+maybe-mostlyclean-bfd:
+@if bfd
+maybe-mostlyclean-bfd: mostlyclean-bfd
+
+mostlyclean-bfd: 
+	@[ -f ./bfd/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in bfd" ; \
+	(cd $(HOST_SUBDIR)/bfd && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif bfd
+
+.PHONY: maybe-clean-bfd clean-bfd
+maybe-clean-bfd:
+@if bfd
+maybe-clean-bfd: clean-bfd
+
+clean-bfd: 
+	@[ -f ./bfd/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in bfd" ; \
+	(cd $(HOST_SUBDIR)/bfd && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif bfd
+
+.PHONY: maybe-distclean-bfd distclean-bfd
+maybe-distclean-bfd:
+@if bfd
+maybe-distclean-bfd: distclean-bfd
+
+distclean-bfd: 
+	@[ -f ./bfd/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in bfd" ; \
+	(cd $(HOST_SUBDIR)/bfd && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif bfd
+
+.PHONY: maybe-maintainer-clean-bfd maintainer-clean-bfd
+maybe-maintainer-clean-bfd:
+@if bfd
+maybe-maintainer-clean-bfd: maintainer-clean-bfd
+
+maintainer-clean-bfd: 
+	@[ -f ./bfd/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in bfd" ; \
+	(cd $(HOST_SUBDIR)/bfd && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif bfd
+
+
+
+.PHONY: configure-opcodes maybe-configure-opcodes
+maybe-configure-opcodes:
+@if gcc-bootstrap
+configure-opcodes: stage_current
+@endif gcc-bootstrap
+@if opcodes
+maybe-configure-opcodes: configure-opcodes
+configure-opcodes: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/opcodes; \
+	cd "$(HOST_SUBDIR)/opcodes" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/opcodes"; \
+	libsrcdir="$$s/opcodes"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif opcodes
+
+
+
+.PHONY: configure-stage1-opcodes maybe-configure-stage1-opcodes
+maybe-configure-stage1-opcodes:
+@if opcodes-bootstrap
+maybe-configure-stage1-opcodes: configure-stage1-opcodes
+configure-stage1-opcodes:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+	cd $(HOST_SUBDIR)/opcodes || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/opcodes"; \
+	libsrcdir="$$s/opcodes"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS)
+@endif opcodes-bootstrap
+
+.PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes
+maybe-configure-stage2-opcodes:
+@if opcodes-bootstrap
+maybe-configure-stage2-opcodes: configure-stage2-opcodes
+configure-stage2-opcodes:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+	cd $(HOST_SUBDIR)/opcodes || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/opcodes"; \
+	libsrcdir="$$s/opcodes"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS)
+@endif opcodes-bootstrap
+
+.PHONY: configure-stage3-opcodes maybe-configure-stage3-opcodes
+maybe-configure-stage3-opcodes:
+@if opcodes-bootstrap
+maybe-configure-stage3-opcodes: configure-stage3-opcodes
+configure-stage3-opcodes:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+	cd $(HOST_SUBDIR)/opcodes || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/opcodes"; \
+	libsrcdir="$$s/opcodes"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS)
+@endif opcodes-bootstrap
+
+.PHONY: configure-stage4-opcodes maybe-configure-stage4-opcodes
+maybe-configure-stage4-opcodes:
+@if opcodes-bootstrap
+maybe-configure-stage4-opcodes: configure-stage4-opcodes
+configure-stage4-opcodes:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+	cd $(HOST_SUBDIR)/opcodes || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/opcodes"; \
+	libsrcdir="$$s/opcodes"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS)
+@endif opcodes-bootstrap
+
+.PHONY: configure-stageprofile-opcodes maybe-configure-stageprofile-opcodes
+maybe-configure-stageprofile-opcodes:
+@if opcodes-bootstrap
+maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes
+configure-stageprofile-opcodes:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+	cd $(HOST_SUBDIR)/opcodes || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/opcodes"; \
+	libsrcdir="$$s/opcodes"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS)
+@endif opcodes-bootstrap
+
+.PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes
+maybe-configure-stagefeedback-opcodes:
+@if opcodes-bootstrap
+maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes
+configure-stagefeedback-opcodes:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+	cd $(HOST_SUBDIR)/opcodes || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/opcodes"; \
+	libsrcdir="$$s/opcodes"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif opcodes-bootstrap
+
+
+
+
+
+.PHONY: all-opcodes maybe-all-opcodes
+maybe-all-opcodes:
+@if gcc-bootstrap
+all-opcodes: stage_current
+@endif gcc-bootstrap
+@if opcodes
+TARGET-opcodes=all
+maybe-all-opcodes: all-opcodes
+all-opcodes: configure-opcodes
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/opcodes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-opcodes))
+@endif opcodes
+
+
+
+.PHONY: all-stage1-opcodes maybe-all-stage1-opcodes
+.PHONY: clean-stage1-opcodes maybe-clean-stage1-opcodes
+maybe-all-stage1-opcodes:
+maybe-clean-stage1-opcodes:
+@if opcodes-bootstrap
+maybe-all-stage1-opcodes: all-stage1-opcodes
+all-stage1: all-stage1-opcodes
+TARGET-stage1-opcodes = $(TARGET-opcodes)
+all-stage1-opcodes: configure-stage1-opcodes
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-opcodes)
+
+maybe-clean-stage1-opcodes: clean-stage1-opcodes
+clean-stage1: clean-stage1-opcodes
+clean-stage1-opcodes:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage1-opcodes/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		 clean
+@endif opcodes-bootstrap
+
+
+.PHONY: all-stage2-opcodes maybe-all-stage2-opcodes
+.PHONY: clean-stage2-opcodes maybe-clean-stage2-opcodes
+maybe-all-stage2-opcodes:
+maybe-clean-stage2-opcodes:
+@if opcodes-bootstrap
+maybe-all-stage2-opcodes: all-stage2-opcodes
+all-stage2: all-stage2-opcodes
+TARGET-stage2-opcodes = $(TARGET-opcodes)
+all-stage2-opcodes: configure-stage2-opcodes
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-opcodes)
+
+maybe-clean-stage2-opcodes: clean-stage2-opcodes
+clean-stage2: clean-stage2-opcodes
+clean-stage2-opcodes:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage2-opcodes/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif opcodes-bootstrap
+
+
+.PHONY: all-stage3-opcodes maybe-all-stage3-opcodes
+.PHONY: clean-stage3-opcodes maybe-clean-stage3-opcodes
+maybe-all-stage3-opcodes:
+maybe-clean-stage3-opcodes:
+@if opcodes-bootstrap
+maybe-all-stage3-opcodes: all-stage3-opcodes
+all-stage3: all-stage3-opcodes
+TARGET-stage3-opcodes = $(TARGET-opcodes)
+all-stage3-opcodes: configure-stage3-opcodes
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-opcodes)
+
+maybe-clean-stage3-opcodes: clean-stage3-opcodes
+clean-stage3: clean-stage3-opcodes
+clean-stage3-opcodes:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage3-opcodes/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif opcodes-bootstrap
+
+
+.PHONY: all-stage4-opcodes maybe-all-stage4-opcodes
+.PHONY: clean-stage4-opcodes maybe-clean-stage4-opcodes
+maybe-all-stage4-opcodes:
+maybe-clean-stage4-opcodes:
+@if opcodes-bootstrap
+maybe-all-stage4-opcodes: all-stage4-opcodes
+all-stage4: all-stage4-opcodes
+TARGET-stage4-opcodes = $(TARGET-opcodes)
+all-stage4-opcodes: configure-stage4-opcodes
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE4_CFLAGS)" \
+		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-opcodes)
+
+maybe-clean-stage4-opcodes: clean-stage4-opcodes
+clean-stage4: clean-stage4-opcodes
+clean-stage4-opcodes:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage4-opcodes/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif opcodes-bootstrap
+
+
+.PHONY: all-stageprofile-opcodes maybe-all-stageprofile-opcodes
+.PHONY: clean-stageprofile-opcodes maybe-clean-stageprofile-opcodes
+maybe-all-stageprofile-opcodes:
+maybe-clean-stageprofile-opcodes:
+@if opcodes-bootstrap
+maybe-all-stageprofile-opcodes: all-stageprofile-opcodes
+all-stageprofile: all-stageprofile-opcodes
+TARGET-stageprofile-opcodes = $(TARGET-opcodes)
+all-stageprofile-opcodes: configure-stageprofile-opcodes
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-opcodes)
+
+maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
+clean-stageprofile: clean-stageprofile-opcodes
+clean-stageprofile-opcodes:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stageprofile-opcodes/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif opcodes-bootstrap
+
+
+.PHONY: all-stagefeedback-opcodes maybe-all-stagefeedback-opcodes
+.PHONY: clean-stagefeedback-opcodes maybe-clean-stagefeedback-opcodes
+maybe-all-stagefeedback-opcodes:
+maybe-clean-stagefeedback-opcodes:
+@if opcodes-bootstrap
+maybe-all-stagefeedback-opcodes: all-stagefeedback-opcodes
+all-stagefeedback: all-stagefeedback-opcodes
+TARGET-stagefeedback-opcodes = $(TARGET-opcodes)
+all-stagefeedback-opcodes: configure-stagefeedback-opcodes
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-opcodes)
+
+maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
+clean-stagefeedback: clean-stagefeedback-opcodes
+clean-stagefeedback-opcodes:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stagefeedback-opcodes/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif opcodes-bootstrap
+
+
+
+
+
+.PHONY: check-opcodes maybe-check-opcodes
+maybe-check-opcodes:
+@if opcodes
+maybe-check-opcodes: check-opcodes
+
+check-opcodes:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/opcodes && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif opcodes
+
+.PHONY: install-opcodes maybe-install-opcodes
+maybe-install-opcodes:
+@if opcodes
+maybe-install-opcodes: install-opcodes
+
+install-opcodes: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/opcodes && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif opcodes
+
+.PHONY: install-strip-opcodes maybe-install-strip-opcodes
+maybe-install-strip-opcodes:
+@if opcodes
+maybe-install-strip-opcodes: install-strip-opcodes
+
+install-strip-opcodes: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/opcodes && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif opcodes
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-opcodes info-opcodes
+maybe-info-opcodes:
+@if opcodes
+maybe-info-opcodes: info-opcodes
+
+info-opcodes: \
+    configure-opcodes 
+	@[ -f ./opcodes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in opcodes" ; \
+	(cd $(HOST_SUBDIR)/opcodes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif opcodes
+
+.PHONY: maybe-dvi-opcodes dvi-opcodes
+maybe-dvi-opcodes:
+@if opcodes
+maybe-dvi-opcodes: dvi-opcodes
+
+dvi-opcodes: \
+    configure-opcodes 
+	@[ -f ./opcodes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in opcodes" ; \
+	(cd $(HOST_SUBDIR)/opcodes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif opcodes
+
+.PHONY: maybe-pdf-opcodes pdf-opcodes
+maybe-pdf-opcodes:
+@if opcodes
+maybe-pdf-opcodes: pdf-opcodes
+
+pdf-opcodes: \
+    configure-opcodes 
+	@[ -f ./opcodes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in opcodes" ; \
+	(cd $(HOST_SUBDIR)/opcodes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif opcodes
+
+.PHONY: maybe-html-opcodes html-opcodes
+maybe-html-opcodes:
+@if opcodes
+maybe-html-opcodes: html-opcodes
+
+html-opcodes: \
+    configure-opcodes 
+	@[ -f ./opcodes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in opcodes" ; \
+	(cd $(HOST_SUBDIR)/opcodes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif opcodes
+
+.PHONY: maybe-TAGS-opcodes TAGS-opcodes
+maybe-TAGS-opcodes:
+@if opcodes
+maybe-TAGS-opcodes: TAGS-opcodes
+
+TAGS-opcodes: \
+    configure-opcodes 
+	@[ -f ./opcodes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in opcodes" ; \
+	(cd $(HOST_SUBDIR)/opcodes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif opcodes
+
+.PHONY: maybe-install-info-opcodes install-info-opcodes
+maybe-install-info-opcodes:
+@if opcodes
+maybe-install-info-opcodes: install-info-opcodes
+
+install-info-opcodes: \
+    configure-opcodes \
+    info-opcodes 
+	@[ -f ./opcodes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in opcodes" ; \
+	(cd $(HOST_SUBDIR)/opcodes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif opcodes
+
+.PHONY: maybe-install-pdf-opcodes install-pdf-opcodes
+maybe-install-pdf-opcodes:
+@if opcodes
+maybe-install-pdf-opcodes: install-pdf-opcodes
+
+install-pdf-opcodes: \
+    configure-opcodes \
+    pdf-opcodes 
+	@[ -f ./opcodes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in opcodes" ; \
+	(cd $(HOST_SUBDIR)/opcodes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif opcodes
+
+.PHONY: maybe-install-html-opcodes install-html-opcodes
+maybe-install-html-opcodes:
+@if opcodes
+maybe-install-html-opcodes: install-html-opcodes
+
+install-html-opcodes: \
+    configure-opcodes \
+    html-opcodes 
+	@[ -f ./opcodes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in opcodes" ; \
+	(cd $(HOST_SUBDIR)/opcodes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif opcodes
+
+.PHONY: maybe-installcheck-opcodes installcheck-opcodes
+maybe-installcheck-opcodes:
+@if opcodes
+maybe-installcheck-opcodes: installcheck-opcodes
+
+installcheck-opcodes: \
+    configure-opcodes 
+	@[ -f ./opcodes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in opcodes" ; \
+	(cd $(HOST_SUBDIR)/opcodes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif opcodes
+
+.PHONY: maybe-mostlyclean-opcodes mostlyclean-opcodes
+maybe-mostlyclean-opcodes:
+@if opcodes
+maybe-mostlyclean-opcodes: mostlyclean-opcodes
+
+mostlyclean-opcodes: 
+	@[ -f ./opcodes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in opcodes" ; \
+	(cd $(HOST_SUBDIR)/opcodes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif opcodes
+
+.PHONY: maybe-clean-opcodes clean-opcodes
+maybe-clean-opcodes:
+@if opcodes
+maybe-clean-opcodes: clean-opcodes
+
+clean-opcodes: 
+	@[ -f ./opcodes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in opcodes" ; \
+	(cd $(HOST_SUBDIR)/opcodes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif opcodes
+
+.PHONY: maybe-distclean-opcodes distclean-opcodes
+maybe-distclean-opcodes:
+@if opcodes
+maybe-distclean-opcodes: distclean-opcodes
+
+distclean-opcodes: 
+	@[ -f ./opcodes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in opcodes" ; \
+	(cd $(HOST_SUBDIR)/opcodes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif opcodes
+
+.PHONY: maybe-maintainer-clean-opcodes maintainer-clean-opcodes
+maybe-maintainer-clean-opcodes:
+@if opcodes
+maybe-maintainer-clean-opcodes: maintainer-clean-opcodes
+
+maintainer-clean-opcodes: 
+	@[ -f ./opcodes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in opcodes" ; \
+	(cd $(HOST_SUBDIR)/opcodes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif opcodes
+
+
+
+.PHONY: configure-binutils maybe-configure-binutils
+maybe-configure-binutils:
+@if gcc-bootstrap
+configure-binutils: stage_current
+@endif gcc-bootstrap
+@if binutils
+maybe-configure-binutils: configure-binutils
+configure-binutils: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/binutils; \
+	cd "$(HOST_SUBDIR)/binutils" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/binutils"; \
+	libsrcdir="$$s/binutils"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif binutils
+
+
+
+.PHONY: configure-stage1-binutils maybe-configure-stage1-binutils
+maybe-configure-stage1-binutils:
+@if binutils-bootstrap
+maybe-configure-stage1-binutils: configure-stage1-binutils
+configure-stage1-binutils:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+	cd $(HOST_SUBDIR)/binutils || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/binutils"; \
+	libsrcdir="$$s/binutils"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS)
+@endif binutils-bootstrap
+
+.PHONY: configure-stage2-binutils maybe-configure-stage2-binutils
+maybe-configure-stage2-binutils:
+@if binutils-bootstrap
+maybe-configure-stage2-binutils: configure-stage2-binutils
+configure-stage2-binutils:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(HOST_SUBDIR)/binutils ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+	cd $(HOST_SUBDIR)/binutils || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/binutils"; \
+	libsrcdir="$$s/binutils"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS)
+@endif binutils-bootstrap
+
+.PHONY: configure-stage3-binutils maybe-configure-stage3-binutils
+maybe-configure-stage3-binutils:
+@if binutils-bootstrap
+maybe-configure-stage3-binutils: configure-stage3-binutils
+configure-stage3-binutils:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(HOST_SUBDIR)/binutils ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+	cd $(HOST_SUBDIR)/binutils || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/binutils"; \
+	libsrcdir="$$s/binutils"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS)
+@endif binutils-bootstrap
+
+.PHONY: configure-stage4-binutils maybe-configure-stage4-binutils
+maybe-configure-stage4-binutils:
+@if binutils-bootstrap
+maybe-configure-stage4-binutils: configure-stage4-binutils
+configure-stage4-binutils:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(HOST_SUBDIR)/binutils ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+	cd $(HOST_SUBDIR)/binutils || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/binutils"; \
+	libsrcdir="$$s/binutils"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS)
+@endif binutils-bootstrap
+
+.PHONY: configure-stageprofile-binutils maybe-configure-stageprofile-binutils
+maybe-configure-stageprofile-binutils:
+@if binutils-bootstrap
+maybe-configure-stageprofile-binutils: configure-stageprofile-binutils
+configure-stageprofile-binutils:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(HOST_SUBDIR)/binutils ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+	cd $(HOST_SUBDIR)/binutils || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/binutils"; \
+	libsrcdir="$$s/binutils"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS)
+@endif binutils-bootstrap
+
+.PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils
+maybe-configure-stagefeedback-binutils:
+@if binutils-bootstrap
+maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils
+configure-stagefeedback-binutils:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(HOST_SUBDIR)/binutils ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+	cd $(HOST_SUBDIR)/binutils || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/binutils"; \
+	libsrcdir="$$s/binutils"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif binutils-bootstrap
+
+
+
+
+
+.PHONY: all-binutils maybe-all-binutils
+maybe-all-binutils:
+@if gcc-bootstrap
+all-binutils: stage_current
+@endif gcc-bootstrap
+@if binutils
+TARGET-binutils=all
+maybe-all-binutils: all-binutils
+all-binutils: configure-binutils
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/binutils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-binutils))
+@endif binutils
+
+
+
+.PHONY: all-stage1-binutils maybe-all-stage1-binutils
+.PHONY: clean-stage1-binutils maybe-clean-stage1-binutils
+maybe-all-stage1-binutils:
+maybe-clean-stage1-binutils:
+@if binutils-bootstrap
+maybe-all-stage1-binutils: all-stage1-binutils
+all-stage1: all-stage1-binutils
+TARGET-stage1-binutils = $(TARGET-binutils)
+all-stage1-binutils: configure-stage1-binutils
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-binutils)
+
+maybe-clean-stage1-binutils: clean-stage1-binutils
+clean-stage1: clean-stage1-binutils
+clean-stage1-binutils:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage1-binutils/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		 clean
+@endif binutils-bootstrap
+
+
+.PHONY: all-stage2-binutils maybe-all-stage2-binutils
+.PHONY: clean-stage2-binutils maybe-clean-stage2-binutils
+maybe-all-stage2-binutils:
+maybe-clean-stage2-binutils:
+@if binutils-bootstrap
+maybe-all-stage2-binutils: all-stage2-binutils
+all-stage2: all-stage2-binutils
+TARGET-stage2-binutils = $(TARGET-binutils)
+all-stage2-binutils: configure-stage2-binutils
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-binutils)
+
+maybe-clean-stage2-binutils: clean-stage2-binutils
+clean-stage2: clean-stage2-binutils
+clean-stage2-binutils:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage2-binutils/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif binutils-bootstrap
+
+
+.PHONY: all-stage3-binutils maybe-all-stage3-binutils
+.PHONY: clean-stage3-binutils maybe-clean-stage3-binutils
+maybe-all-stage3-binutils:
+maybe-clean-stage3-binutils:
+@if binutils-bootstrap
+maybe-all-stage3-binutils: all-stage3-binutils
+all-stage3: all-stage3-binutils
+TARGET-stage3-binutils = $(TARGET-binutils)
+all-stage3-binutils: configure-stage3-binutils
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-binutils)
+
+maybe-clean-stage3-binutils: clean-stage3-binutils
+clean-stage3: clean-stage3-binutils
+clean-stage3-binutils:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage3-binutils/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif binutils-bootstrap
+
+
+.PHONY: all-stage4-binutils maybe-all-stage4-binutils
+.PHONY: clean-stage4-binutils maybe-clean-stage4-binutils
+maybe-all-stage4-binutils:
+maybe-clean-stage4-binutils:
+@if binutils-bootstrap
+maybe-all-stage4-binutils: all-stage4-binutils
+all-stage4: all-stage4-binutils
+TARGET-stage4-binutils = $(TARGET-binutils)
+all-stage4-binutils: configure-stage4-binutils
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE4_CFLAGS)" \
+		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-binutils)
+
+maybe-clean-stage4-binutils: clean-stage4-binutils
+clean-stage4: clean-stage4-binutils
+clean-stage4-binutils:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage4-binutils/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif binutils-bootstrap
+
+
+.PHONY: all-stageprofile-binutils maybe-all-stageprofile-binutils
+.PHONY: clean-stageprofile-binutils maybe-clean-stageprofile-binutils
+maybe-all-stageprofile-binutils:
+maybe-clean-stageprofile-binutils:
+@if binutils-bootstrap
+maybe-all-stageprofile-binutils: all-stageprofile-binutils
+all-stageprofile: all-stageprofile-binutils
+TARGET-stageprofile-binutils = $(TARGET-binutils)
+all-stageprofile-binutils: configure-stageprofile-binutils
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-binutils)
+
+maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
+clean-stageprofile: clean-stageprofile-binutils
+clean-stageprofile-binutils:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stageprofile-binutils/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif binutils-bootstrap
+
+
+.PHONY: all-stagefeedback-binutils maybe-all-stagefeedback-binutils
+.PHONY: clean-stagefeedback-binutils maybe-clean-stagefeedback-binutils
+maybe-all-stagefeedback-binutils:
+maybe-clean-stagefeedback-binutils:
+@if binutils-bootstrap
+maybe-all-stagefeedback-binutils: all-stagefeedback-binutils
+all-stagefeedback: all-stagefeedback-binutils
+TARGET-stagefeedback-binutils = $(TARGET-binutils)
+all-stagefeedback-binutils: configure-stagefeedback-binutils
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-binutils)
+
+maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
+clean-stagefeedback: clean-stagefeedback-binutils
+clean-stagefeedback-binutils:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stagefeedback-binutils/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif binutils-bootstrap
+
+
+
+
+
+.PHONY: check-binutils maybe-check-binutils
+maybe-check-binutils:
+@if binutils
+maybe-check-binutils: check-binutils
+
+check-binutils:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/binutils && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif binutils
+
+.PHONY: install-binutils maybe-install-binutils
+maybe-install-binutils:
+@if binutils
+maybe-install-binutils: install-binutils
+
+install-binutils: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/binutils && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif binutils
+
+.PHONY: install-strip-binutils maybe-install-strip-binutils
+maybe-install-strip-binutils:
+@if binutils
+maybe-install-strip-binutils: install-strip-binutils
+
+install-strip-binutils: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/binutils && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif binutils
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-binutils info-binutils
+maybe-info-binutils:
+@if binutils
+maybe-info-binutils: info-binutils
+
+info-binutils: \
+    configure-binutils 
+	@[ -f ./binutils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in binutils" ; \
+	(cd $(HOST_SUBDIR)/binutils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif binutils
+
+.PHONY: maybe-dvi-binutils dvi-binutils
+maybe-dvi-binutils:
+@if binutils
+maybe-dvi-binutils: dvi-binutils
+
+dvi-binutils: \
+    configure-binutils 
+	@[ -f ./binutils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in binutils" ; \
+	(cd $(HOST_SUBDIR)/binutils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif binutils
+
+.PHONY: maybe-pdf-binutils pdf-binutils
+maybe-pdf-binutils:
+@if binutils
+maybe-pdf-binutils: pdf-binutils
+
+pdf-binutils: \
+    configure-binutils 
+	@[ -f ./binutils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in binutils" ; \
+	(cd $(HOST_SUBDIR)/binutils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif binutils
+
+.PHONY: maybe-html-binutils html-binutils
+maybe-html-binutils:
+@if binutils
+maybe-html-binutils: html-binutils
+
+html-binutils: \
+    configure-binutils 
+	@[ -f ./binutils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in binutils" ; \
+	(cd $(HOST_SUBDIR)/binutils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif binutils
+
+.PHONY: maybe-TAGS-binutils TAGS-binutils
+maybe-TAGS-binutils:
+@if binutils
+maybe-TAGS-binutils: TAGS-binutils
+
+TAGS-binutils: \
+    configure-binutils 
+	@[ -f ./binutils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in binutils" ; \
+	(cd $(HOST_SUBDIR)/binutils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif binutils
+
+.PHONY: maybe-install-info-binutils install-info-binutils
+maybe-install-info-binutils:
+@if binutils
+maybe-install-info-binutils: install-info-binutils
+
+install-info-binutils: \
+    configure-binutils \
+    info-binutils 
+	@[ -f ./binutils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in binutils" ; \
+	(cd $(HOST_SUBDIR)/binutils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif binutils
+
+.PHONY: maybe-install-pdf-binutils install-pdf-binutils
+maybe-install-pdf-binutils:
+@if binutils
+maybe-install-pdf-binutils: install-pdf-binutils
+
+install-pdf-binutils: \
+    configure-binutils \
+    pdf-binutils 
+	@[ -f ./binutils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in binutils" ; \
+	(cd $(HOST_SUBDIR)/binutils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif binutils
+
+.PHONY: maybe-install-html-binutils install-html-binutils
+maybe-install-html-binutils:
+@if binutils
+maybe-install-html-binutils: install-html-binutils
+
+install-html-binutils: \
+    configure-binutils \
+    html-binutils 
+	@[ -f ./binutils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in binutils" ; \
+	(cd $(HOST_SUBDIR)/binutils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif binutils
+
+.PHONY: maybe-installcheck-binutils installcheck-binutils
+maybe-installcheck-binutils:
+@if binutils
+maybe-installcheck-binutils: installcheck-binutils
+
+installcheck-binutils: \
+    configure-binutils 
+	@[ -f ./binutils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in binutils" ; \
+	(cd $(HOST_SUBDIR)/binutils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif binutils
+
+.PHONY: maybe-mostlyclean-binutils mostlyclean-binutils
+maybe-mostlyclean-binutils:
+@if binutils
+maybe-mostlyclean-binutils: mostlyclean-binutils
+
+mostlyclean-binutils: 
+	@[ -f ./binutils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in binutils" ; \
+	(cd $(HOST_SUBDIR)/binutils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif binutils
+
+.PHONY: maybe-clean-binutils clean-binutils
+maybe-clean-binutils:
+@if binutils
+maybe-clean-binutils: clean-binutils
+
+clean-binutils: 
+	@[ -f ./binutils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in binutils" ; \
+	(cd $(HOST_SUBDIR)/binutils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif binutils
+
+.PHONY: maybe-distclean-binutils distclean-binutils
+maybe-distclean-binutils:
+@if binutils
+maybe-distclean-binutils: distclean-binutils
+
+distclean-binutils: 
+	@[ -f ./binutils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in binutils" ; \
+	(cd $(HOST_SUBDIR)/binutils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif binutils
+
+.PHONY: maybe-maintainer-clean-binutils maintainer-clean-binutils
+maybe-maintainer-clean-binutils:
+@if binutils
+maybe-maintainer-clean-binutils: maintainer-clean-binutils
+
+maintainer-clean-binutils: 
+	@[ -f ./binutils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in binutils" ; \
+	(cd $(HOST_SUBDIR)/binutils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif binutils
+
+
+
+.PHONY: configure-bison maybe-configure-bison
+maybe-configure-bison:
+@if gcc-bootstrap
+configure-bison: stage_current
+@endif gcc-bootstrap
+@if bison
+maybe-configure-bison: configure-bison
+configure-bison: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/bison/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/bison; \
+	cd "$(HOST_SUBDIR)/bison" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/bison/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/bison"; \
+	libsrcdir="$$s/bison"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif bison
+
+
+
+
+
+.PHONY: all-bison maybe-all-bison
+maybe-all-bison:
+@if gcc-bootstrap
+all-bison: stage_current
+@endif gcc-bootstrap
+@if bison
+TARGET-bison=all
+maybe-all-bison: all-bison
+all-bison: configure-bison
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/bison && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-bison))
+@endif bison
+
+
+
+
+.PHONY: check-bison maybe-check-bison
+maybe-check-bison:
+@if bison
+maybe-check-bison: check-bison
+
+# This module is only tested in a native toolchain.
+check-bison:
+	@: $(MAKE); $(unstage)
+	@if [ '$(host)' = '$(target)' ] ; then \
+	  r=`${PWD_COMMAND}`; export r; \
+	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	  $(HOST_EXPORTS) \
+	  (cd $(HOST_SUBDIR)/bison && \
+	    $(MAKE) $(FLAGS_TO_PASS)  check); \
+	fi
+
+@endif bison
+
+.PHONY: install-bison maybe-install-bison
+maybe-install-bison:
+@if bison
+maybe-install-bison: install-bison
+
+install-bison: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/bison && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif bison
+
+.PHONY: install-strip-bison maybe-install-strip-bison
+maybe-install-strip-bison:
+@if bison
+maybe-install-strip-bison: install-strip-bison
+
+install-strip-bison: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/bison && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif bison
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-bison info-bison
+maybe-info-bison:
+@if bison
+maybe-info-bison: info-bison
+
+info-bison: \
+    configure-bison 
+	@: $(MAKE); $(unstage)
+	@[ -f ./bison/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in bison" ; \
+	(cd $(HOST_SUBDIR)/bison && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif bison
+
+.PHONY: maybe-dvi-bison dvi-bison
+maybe-dvi-bison:
+@if bison
+maybe-dvi-bison: dvi-bison
+
+dvi-bison: \
+    configure-bison 
+	@: $(MAKE); $(unstage)
+	@[ -f ./bison/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in bison" ; \
+	(cd $(HOST_SUBDIR)/bison && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif bison
+
+.PHONY: maybe-pdf-bison pdf-bison
+maybe-pdf-bison:
+@if bison
+maybe-pdf-bison: pdf-bison
+
+pdf-bison: \
+    configure-bison 
+	@: $(MAKE); $(unstage)
+	@[ -f ./bison/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in bison" ; \
+	(cd $(HOST_SUBDIR)/bison && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif bison
+
+.PHONY: maybe-html-bison html-bison
+maybe-html-bison:
+@if bison
+maybe-html-bison: html-bison
+
+html-bison: \
+    configure-bison 
+	@: $(MAKE); $(unstage)
+	@[ -f ./bison/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in bison" ; \
+	(cd $(HOST_SUBDIR)/bison && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif bison
+
+.PHONY: maybe-TAGS-bison TAGS-bison
+maybe-TAGS-bison:
+@if bison
+maybe-TAGS-bison: TAGS-bison
+
+TAGS-bison: \
+    configure-bison 
+	@: $(MAKE); $(unstage)
+	@[ -f ./bison/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in bison" ; \
+	(cd $(HOST_SUBDIR)/bison && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif bison
+
+.PHONY: maybe-install-info-bison install-info-bison
+maybe-install-info-bison:
+@if bison
+maybe-install-info-bison: install-info-bison
+
+install-info-bison: \
+    configure-bison \
+    info-bison 
+	@: $(MAKE); $(unstage)
+	@[ -f ./bison/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in bison" ; \
+	(cd $(HOST_SUBDIR)/bison && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif bison
+
+.PHONY: maybe-install-pdf-bison install-pdf-bison
+maybe-install-pdf-bison:
+@if bison
+maybe-install-pdf-bison: install-pdf-bison
+
+install-pdf-bison: \
+    configure-bison \
+    pdf-bison 
+	@: $(MAKE); $(unstage)
+	@[ -f ./bison/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in bison" ; \
+	(cd $(HOST_SUBDIR)/bison && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif bison
+
+.PHONY: maybe-install-html-bison install-html-bison
+maybe-install-html-bison:
+@if bison
+maybe-install-html-bison: install-html-bison
+
+install-html-bison: \
+    configure-bison \
+    html-bison 
+	@: $(MAKE); $(unstage)
+	@[ -f ./bison/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in bison" ; \
+	(cd $(HOST_SUBDIR)/bison && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif bison
+
+.PHONY: maybe-installcheck-bison installcheck-bison
+maybe-installcheck-bison:
+@if bison
+maybe-installcheck-bison: installcheck-bison
+
+installcheck-bison: \
+    configure-bison 
+	@: $(MAKE); $(unstage)
+	@[ -f ./bison/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in bison" ; \
+	(cd $(HOST_SUBDIR)/bison && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif bison
+
+.PHONY: maybe-mostlyclean-bison mostlyclean-bison
+maybe-mostlyclean-bison:
+@if bison
+maybe-mostlyclean-bison: mostlyclean-bison
+
+mostlyclean-bison: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./bison/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in bison" ; \
+	(cd $(HOST_SUBDIR)/bison && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif bison
+
+.PHONY: maybe-clean-bison clean-bison
+maybe-clean-bison:
+@if bison
+maybe-clean-bison: clean-bison
+
+clean-bison: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./bison/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in bison" ; \
+	(cd $(HOST_SUBDIR)/bison && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif bison
+
+.PHONY: maybe-distclean-bison distclean-bison
+maybe-distclean-bison:
+@if bison
+maybe-distclean-bison: distclean-bison
+
+distclean-bison: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./bison/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in bison" ; \
+	(cd $(HOST_SUBDIR)/bison && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif bison
+
+.PHONY: maybe-maintainer-clean-bison maintainer-clean-bison
+maybe-maintainer-clean-bison:
+@if bison
+maybe-maintainer-clean-bison: maintainer-clean-bison
+
+maintainer-clean-bison: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./bison/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in bison" ; \
+	(cd $(HOST_SUBDIR)/bison && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif bison
+
+
+
+.PHONY: configure-cgen maybe-configure-cgen
+maybe-configure-cgen:
+@if gcc-bootstrap
+configure-cgen: stage_current
+@endif gcc-bootstrap
+@if cgen
+maybe-configure-cgen: configure-cgen
+configure-cgen: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/cgen/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cgen ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/cgen; \
+	cd "$(HOST_SUBDIR)/cgen" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/cgen/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/cgen"; \
+	libsrcdir="$$s/cgen"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif cgen
+
+
+
+
+
+.PHONY: all-cgen maybe-all-cgen
+maybe-all-cgen:
+@if gcc-bootstrap
+all-cgen: stage_current
+@endif gcc-bootstrap
+@if cgen
+TARGET-cgen=all
+maybe-all-cgen: all-cgen
+all-cgen: configure-cgen
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/cgen && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-cgen))
+@endif cgen
+
+
+
+
+.PHONY: check-cgen maybe-check-cgen
+maybe-check-cgen:
+@if cgen
+maybe-check-cgen: check-cgen
+
+check-cgen:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/cgen && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif cgen
+
+.PHONY: install-cgen maybe-install-cgen
+maybe-install-cgen:
+@if cgen
+maybe-install-cgen: install-cgen
+
+install-cgen: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/cgen && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif cgen
+
+.PHONY: install-strip-cgen maybe-install-strip-cgen
+maybe-install-strip-cgen:
+@if cgen
+maybe-install-strip-cgen: install-strip-cgen
+
+install-strip-cgen: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/cgen && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif cgen
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-cgen info-cgen
+maybe-info-cgen:
+@if cgen
+maybe-info-cgen: info-cgen
+
+info-cgen: \
+    configure-cgen 
+	@: $(MAKE); $(unstage)
+	@[ -f ./cgen/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in cgen" ; \
+	(cd $(HOST_SUBDIR)/cgen && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif cgen
+
+.PHONY: maybe-dvi-cgen dvi-cgen
+maybe-dvi-cgen:
+@if cgen
+maybe-dvi-cgen: dvi-cgen
+
+dvi-cgen: \
+    configure-cgen 
+	@: $(MAKE); $(unstage)
+	@[ -f ./cgen/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in cgen" ; \
+	(cd $(HOST_SUBDIR)/cgen && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif cgen
+
+.PHONY: maybe-pdf-cgen pdf-cgen
+maybe-pdf-cgen:
+@if cgen
+maybe-pdf-cgen: pdf-cgen
+
+pdf-cgen: \
+    configure-cgen 
+	@: $(MAKE); $(unstage)
+	@[ -f ./cgen/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in cgen" ; \
+	(cd $(HOST_SUBDIR)/cgen && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif cgen
+
+.PHONY: maybe-html-cgen html-cgen
+maybe-html-cgen:
+@if cgen
+maybe-html-cgen: html-cgen
+
+html-cgen: \
+    configure-cgen 
+	@: $(MAKE); $(unstage)
+	@[ -f ./cgen/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in cgen" ; \
+	(cd $(HOST_SUBDIR)/cgen && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif cgen
+
+.PHONY: maybe-TAGS-cgen TAGS-cgen
+maybe-TAGS-cgen:
+@if cgen
+maybe-TAGS-cgen: TAGS-cgen
+
+TAGS-cgen: \
+    configure-cgen 
+	@: $(MAKE); $(unstage)
+	@[ -f ./cgen/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in cgen" ; \
+	(cd $(HOST_SUBDIR)/cgen && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif cgen
+
+.PHONY: maybe-install-info-cgen install-info-cgen
+maybe-install-info-cgen:
+@if cgen
+maybe-install-info-cgen: install-info-cgen
+
+install-info-cgen: \
+    configure-cgen \
+    info-cgen 
+	@: $(MAKE); $(unstage)
+	@[ -f ./cgen/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in cgen" ; \
+	(cd $(HOST_SUBDIR)/cgen && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif cgen
+
+.PHONY: maybe-install-pdf-cgen install-pdf-cgen
+maybe-install-pdf-cgen:
+@if cgen
+maybe-install-pdf-cgen: install-pdf-cgen
+
+install-pdf-cgen: \
+    configure-cgen \
+    pdf-cgen 
+	@: $(MAKE); $(unstage)
+	@[ -f ./cgen/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in cgen" ; \
+	(cd $(HOST_SUBDIR)/cgen && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif cgen
+
+.PHONY: maybe-install-html-cgen install-html-cgen
+maybe-install-html-cgen:
+@if cgen
+maybe-install-html-cgen: install-html-cgen
+
+install-html-cgen: \
+    configure-cgen \
+    html-cgen 
+	@: $(MAKE); $(unstage)
+	@[ -f ./cgen/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in cgen" ; \
+	(cd $(HOST_SUBDIR)/cgen && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif cgen
+
+.PHONY: maybe-installcheck-cgen installcheck-cgen
+maybe-installcheck-cgen:
+@if cgen
+maybe-installcheck-cgen: installcheck-cgen
+
+installcheck-cgen: \
+    configure-cgen 
+	@: $(MAKE); $(unstage)
+	@[ -f ./cgen/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in cgen" ; \
+	(cd $(HOST_SUBDIR)/cgen && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif cgen
+
+.PHONY: maybe-mostlyclean-cgen mostlyclean-cgen
+maybe-mostlyclean-cgen:
+@if cgen
+maybe-mostlyclean-cgen: mostlyclean-cgen
+
+mostlyclean-cgen: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./cgen/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in cgen" ; \
+	(cd $(HOST_SUBDIR)/cgen && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif cgen
+
+.PHONY: maybe-clean-cgen clean-cgen
+maybe-clean-cgen:
+@if cgen
+maybe-clean-cgen: clean-cgen
+
+clean-cgen: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./cgen/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in cgen" ; \
+	(cd $(HOST_SUBDIR)/cgen && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif cgen
+
+.PHONY: maybe-distclean-cgen distclean-cgen
+maybe-distclean-cgen:
+@if cgen
+maybe-distclean-cgen: distclean-cgen
+
+distclean-cgen: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./cgen/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in cgen" ; \
+	(cd $(HOST_SUBDIR)/cgen && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif cgen
+
+.PHONY: maybe-maintainer-clean-cgen maintainer-clean-cgen
+maybe-maintainer-clean-cgen:
+@if cgen
+maybe-maintainer-clean-cgen: maintainer-clean-cgen
+
+maintainer-clean-cgen: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./cgen/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in cgen" ; \
+	(cd $(HOST_SUBDIR)/cgen && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif cgen
+
+
+
+.PHONY: configure-dejagnu maybe-configure-dejagnu
+maybe-configure-dejagnu:
+@if gcc-bootstrap
+configure-dejagnu: stage_current
+@endif gcc-bootstrap
+@if dejagnu
+maybe-configure-dejagnu: configure-dejagnu
+configure-dejagnu: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/dejagnu/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dejagnu ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/dejagnu; \
+	cd "$(HOST_SUBDIR)/dejagnu" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/dejagnu/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/dejagnu"; \
+	libsrcdir="$$s/dejagnu"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif dejagnu
+
+
+
+
+
+.PHONY: all-dejagnu maybe-all-dejagnu
+maybe-all-dejagnu:
+@if gcc-bootstrap
+all-dejagnu: stage_current
+@endif gcc-bootstrap
+@if dejagnu
+TARGET-dejagnu=all
+maybe-all-dejagnu: all-dejagnu
+all-dejagnu: configure-dejagnu
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/dejagnu && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-dejagnu))
+@endif dejagnu
+
+
+
+
+.PHONY: check-dejagnu maybe-check-dejagnu
+maybe-check-dejagnu:
+@if dejagnu
+maybe-check-dejagnu: check-dejagnu
+
+check-dejagnu:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/dejagnu && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif dejagnu
+
+.PHONY: install-dejagnu maybe-install-dejagnu
+maybe-install-dejagnu:
+@if dejagnu
+maybe-install-dejagnu: install-dejagnu
+
+install-dejagnu: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/dejagnu && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif dejagnu
+
+.PHONY: install-strip-dejagnu maybe-install-strip-dejagnu
+maybe-install-strip-dejagnu:
+@if dejagnu
+maybe-install-strip-dejagnu: install-strip-dejagnu
+
+install-strip-dejagnu: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/dejagnu && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif dejagnu
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-dejagnu info-dejagnu
+maybe-info-dejagnu:
+@if dejagnu
+maybe-info-dejagnu: info-dejagnu
+
+info-dejagnu: \
+    configure-dejagnu 
+	@: $(MAKE); $(unstage)
+	@[ -f ./dejagnu/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in dejagnu" ; \
+	(cd $(HOST_SUBDIR)/dejagnu && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif dejagnu
+
+.PHONY: maybe-dvi-dejagnu dvi-dejagnu
+maybe-dvi-dejagnu:
+@if dejagnu
+maybe-dvi-dejagnu: dvi-dejagnu
+
+dvi-dejagnu: \
+    configure-dejagnu 
+	@: $(MAKE); $(unstage)
+	@[ -f ./dejagnu/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in dejagnu" ; \
+	(cd $(HOST_SUBDIR)/dejagnu && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif dejagnu
+
+.PHONY: maybe-pdf-dejagnu pdf-dejagnu
+maybe-pdf-dejagnu:
+@if dejagnu
+maybe-pdf-dejagnu: pdf-dejagnu
+
+pdf-dejagnu: \
+    configure-dejagnu 
+	@: $(MAKE); $(unstage)
+	@[ -f ./dejagnu/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in dejagnu" ; \
+	(cd $(HOST_SUBDIR)/dejagnu && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif dejagnu
+
+.PHONY: maybe-html-dejagnu html-dejagnu
+maybe-html-dejagnu:
+@if dejagnu
+maybe-html-dejagnu: html-dejagnu
+
+html-dejagnu: \
+    configure-dejagnu 
+	@: $(MAKE); $(unstage)
+	@[ -f ./dejagnu/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in dejagnu" ; \
+	(cd $(HOST_SUBDIR)/dejagnu && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif dejagnu
+
+.PHONY: maybe-TAGS-dejagnu TAGS-dejagnu
+maybe-TAGS-dejagnu:
+@if dejagnu
+maybe-TAGS-dejagnu: TAGS-dejagnu
+
+TAGS-dejagnu: \
+    configure-dejagnu 
+	@: $(MAKE); $(unstage)
+	@[ -f ./dejagnu/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in dejagnu" ; \
+	(cd $(HOST_SUBDIR)/dejagnu && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif dejagnu
+
+.PHONY: maybe-install-info-dejagnu install-info-dejagnu
+maybe-install-info-dejagnu:
+@if dejagnu
+maybe-install-info-dejagnu: install-info-dejagnu
+
+install-info-dejagnu: \
+    configure-dejagnu \
+    info-dejagnu 
+	@: $(MAKE); $(unstage)
+	@[ -f ./dejagnu/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in dejagnu" ; \
+	(cd $(HOST_SUBDIR)/dejagnu && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif dejagnu
+
+.PHONY: maybe-install-pdf-dejagnu install-pdf-dejagnu
+maybe-install-pdf-dejagnu:
+@if dejagnu
+maybe-install-pdf-dejagnu: install-pdf-dejagnu
+
+install-pdf-dejagnu: \
+    configure-dejagnu \
+    pdf-dejagnu 
+	@: $(MAKE); $(unstage)
+	@[ -f ./dejagnu/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in dejagnu" ; \
+	(cd $(HOST_SUBDIR)/dejagnu && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif dejagnu
+
+.PHONY: maybe-install-html-dejagnu install-html-dejagnu
+maybe-install-html-dejagnu:
+@if dejagnu
+maybe-install-html-dejagnu: install-html-dejagnu
+
+install-html-dejagnu: \
+    configure-dejagnu \
+    html-dejagnu 
+	@: $(MAKE); $(unstage)
+	@[ -f ./dejagnu/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in dejagnu" ; \
+	(cd $(HOST_SUBDIR)/dejagnu && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif dejagnu
+
+.PHONY: maybe-installcheck-dejagnu installcheck-dejagnu
+maybe-installcheck-dejagnu:
+@if dejagnu
+maybe-installcheck-dejagnu: installcheck-dejagnu
+
+installcheck-dejagnu: \
+    configure-dejagnu 
+	@: $(MAKE); $(unstage)
+	@[ -f ./dejagnu/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in dejagnu" ; \
+	(cd $(HOST_SUBDIR)/dejagnu && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif dejagnu
+
+.PHONY: maybe-mostlyclean-dejagnu mostlyclean-dejagnu
+maybe-mostlyclean-dejagnu:
+@if dejagnu
+maybe-mostlyclean-dejagnu: mostlyclean-dejagnu
+
+mostlyclean-dejagnu: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./dejagnu/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in dejagnu" ; \
+	(cd $(HOST_SUBDIR)/dejagnu && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif dejagnu
+
+.PHONY: maybe-clean-dejagnu clean-dejagnu
+maybe-clean-dejagnu:
+@if dejagnu
+maybe-clean-dejagnu: clean-dejagnu
+
+clean-dejagnu: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./dejagnu/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in dejagnu" ; \
+	(cd $(HOST_SUBDIR)/dejagnu && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif dejagnu
+
+.PHONY: maybe-distclean-dejagnu distclean-dejagnu
+maybe-distclean-dejagnu:
+@if dejagnu
+maybe-distclean-dejagnu: distclean-dejagnu
+
+distclean-dejagnu: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./dejagnu/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in dejagnu" ; \
+	(cd $(HOST_SUBDIR)/dejagnu && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif dejagnu
+
+.PHONY: maybe-maintainer-clean-dejagnu maintainer-clean-dejagnu
+maybe-maintainer-clean-dejagnu:
+@if dejagnu
+maybe-maintainer-clean-dejagnu: maintainer-clean-dejagnu
+
+maintainer-clean-dejagnu: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./dejagnu/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in dejagnu" ; \
+	(cd $(HOST_SUBDIR)/dejagnu && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif dejagnu
+
+
+
+.PHONY: configure-etc maybe-configure-etc
+maybe-configure-etc:
+@if gcc-bootstrap
+configure-etc: stage_current
+@endif gcc-bootstrap
+@if etc
+maybe-configure-etc: configure-etc
+configure-etc: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/etc/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/etc ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/etc; \
+	cd "$(HOST_SUBDIR)/etc" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/etc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/etc"; \
+	libsrcdir="$$s/etc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif etc
+
+
+
+
+
+.PHONY: all-etc maybe-all-etc
+maybe-all-etc:
+@if gcc-bootstrap
+all-etc: stage_current
+@endif gcc-bootstrap
+@if etc
+TARGET-etc=all
+maybe-all-etc: all-etc
+all-etc: configure-etc
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/etc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-etc))
+@endif etc
+
+
+
+
+.PHONY: check-etc maybe-check-etc
+maybe-check-etc:
+@if etc
+maybe-check-etc: check-etc
+
+check-etc:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/etc && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif etc
+
+.PHONY: install-etc maybe-install-etc
+maybe-install-etc:
+@if etc
+maybe-install-etc: install-etc
+
+install-etc: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/etc && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif etc
+
+.PHONY: install-strip-etc maybe-install-strip-etc
+maybe-install-strip-etc:
+@if etc
+maybe-install-strip-etc: install-strip-etc
+
+install-strip-etc: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/etc && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif etc
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-etc info-etc
+maybe-info-etc:
+@if etc
+maybe-info-etc: info-etc
+
+info-etc: \
+    configure-etc 
+	@: $(MAKE); $(unstage)
+	@[ -f ./etc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in etc" ; \
+	(cd $(HOST_SUBDIR)/etc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif etc
+
+.PHONY: maybe-dvi-etc dvi-etc
+maybe-dvi-etc:
+@if etc
+maybe-dvi-etc: dvi-etc
+
+dvi-etc: \
+    configure-etc 
+	@: $(MAKE); $(unstage)
+	@[ -f ./etc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in etc" ; \
+	(cd $(HOST_SUBDIR)/etc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif etc
+
+.PHONY: maybe-pdf-etc pdf-etc
+maybe-pdf-etc:
+@if etc
+maybe-pdf-etc: pdf-etc
+
+pdf-etc: \
+    configure-etc 
+	@: $(MAKE); $(unstage)
+	@[ -f ./etc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in etc" ; \
+	(cd $(HOST_SUBDIR)/etc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif etc
+
+.PHONY: maybe-html-etc html-etc
+maybe-html-etc:
+@if etc
+maybe-html-etc: html-etc
+
+html-etc: \
+    configure-etc 
+	@: $(MAKE); $(unstage)
+	@[ -f ./etc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in etc" ; \
+	(cd $(HOST_SUBDIR)/etc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif etc
+
+.PHONY: maybe-TAGS-etc TAGS-etc
+maybe-TAGS-etc:
+@if etc
+maybe-TAGS-etc: TAGS-etc
+
+TAGS-etc: \
+    configure-etc 
+	@: $(MAKE); $(unstage)
+	@[ -f ./etc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in etc" ; \
+	(cd $(HOST_SUBDIR)/etc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif etc
+
+.PHONY: maybe-install-info-etc install-info-etc
+maybe-install-info-etc:
+@if etc
+maybe-install-info-etc: install-info-etc
+
+install-info-etc: \
+    configure-etc \
+    info-etc 
+	@: $(MAKE); $(unstage)
+	@[ -f ./etc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in etc" ; \
+	(cd $(HOST_SUBDIR)/etc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif etc
+
+.PHONY: maybe-install-pdf-etc install-pdf-etc
+maybe-install-pdf-etc:
+@if etc
+maybe-install-pdf-etc: install-pdf-etc
+
+install-pdf-etc: \
+    configure-etc \
+    pdf-etc 
+	@: $(MAKE); $(unstage)
+	@[ -f ./etc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in etc" ; \
+	(cd $(HOST_SUBDIR)/etc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif etc
+
+.PHONY: maybe-install-html-etc install-html-etc
+maybe-install-html-etc:
+@if etc
+maybe-install-html-etc: install-html-etc
+
+install-html-etc: \
+    configure-etc \
+    html-etc 
+	@: $(MAKE); $(unstage)
+	@[ -f ./etc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in etc" ; \
+	(cd $(HOST_SUBDIR)/etc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif etc
+
+.PHONY: maybe-installcheck-etc installcheck-etc
+maybe-installcheck-etc:
+@if etc
+maybe-installcheck-etc: installcheck-etc
+
+installcheck-etc: \
+    configure-etc 
+	@: $(MAKE); $(unstage)
+	@[ -f ./etc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in etc" ; \
+	(cd $(HOST_SUBDIR)/etc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif etc
+
+.PHONY: maybe-mostlyclean-etc mostlyclean-etc
+maybe-mostlyclean-etc:
+@if etc
+maybe-mostlyclean-etc: mostlyclean-etc
+
+mostlyclean-etc: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./etc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in etc" ; \
+	(cd $(HOST_SUBDIR)/etc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif etc
+
+.PHONY: maybe-clean-etc clean-etc
+maybe-clean-etc:
+@if etc
+maybe-clean-etc: clean-etc
+
+clean-etc: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./etc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in etc" ; \
+	(cd $(HOST_SUBDIR)/etc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif etc
+
+.PHONY: maybe-distclean-etc distclean-etc
+maybe-distclean-etc:
+@if etc
+maybe-distclean-etc: distclean-etc
+
+distclean-etc: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./etc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in etc" ; \
+	(cd $(HOST_SUBDIR)/etc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif etc
+
+.PHONY: maybe-maintainer-clean-etc maintainer-clean-etc
+maybe-maintainer-clean-etc:
+@if etc
+maybe-maintainer-clean-etc: maintainer-clean-etc
+
+maintainer-clean-etc: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./etc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in etc" ; \
+	(cd $(HOST_SUBDIR)/etc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif etc
+
+
+
+.PHONY: configure-fastjar maybe-configure-fastjar
+maybe-configure-fastjar:
+@if gcc-bootstrap
+configure-fastjar: stage_current
+@endif gcc-bootstrap
+@if fastjar
+maybe-configure-fastjar: configure-fastjar
+configure-fastjar: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/fastjar/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/fastjar; \
+	cd "$(HOST_SUBDIR)/fastjar" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/fastjar/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/fastjar"; \
+	libsrcdir="$$s/fastjar"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif fastjar
+
+
+
+
+
+.PHONY: all-fastjar maybe-all-fastjar
+maybe-all-fastjar:
+@if gcc-bootstrap
+all-fastjar: stage_current
+@endif gcc-bootstrap
+@if fastjar
+TARGET-fastjar=all
+maybe-all-fastjar: all-fastjar
+all-fastjar: configure-fastjar
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/fastjar && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-fastjar))
+@endif fastjar
+
+
+
+
+.PHONY: check-fastjar maybe-check-fastjar
+maybe-check-fastjar:
+@if fastjar
+maybe-check-fastjar: check-fastjar
+
+# This module is only tested in a native toolchain.
+check-fastjar:
+	@: $(MAKE); $(unstage)
+	@if [ '$(host)' = '$(target)' ] ; then \
+	  r=`${PWD_COMMAND}`; export r; \
+	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	  $(HOST_EXPORTS) \
+	  (cd $(HOST_SUBDIR)/fastjar && \
+	    $(MAKE) $(FLAGS_TO_PASS)  check); \
+	fi
+
+@endif fastjar
+
+.PHONY: install-fastjar maybe-install-fastjar
+maybe-install-fastjar:
+@if fastjar
+maybe-install-fastjar: install-fastjar
+
+install-fastjar: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/fastjar && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif fastjar
+
+.PHONY: install-strip-fastjar maybe-install-strip-fastjar
+maybe-install-strip-fastjar:
+@if fastjar
+maybe-install-strip-fastjar: install-strip-fastjar
+
+install-strip-fastjar: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/fastjar && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif fastjar
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-fastjar info-fastjar
+maybe-info-fastjar:
+@if fastjar
+maybe-info-fastjar: info-fastjar
+
+info-fastjar: \
+    configure-fastjar 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fastjar/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in fastjar" ; \
+	(cd $(HOST_SUBDIR)/fastjar && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif fastjar
+
+.PHONY: maybe-dvi-fastjar dvi-fastjar
+maybe-dvi-fastjar:
+@if fastjar
+maybe-dvi-fastjar: dvi-fastjar
+
+dvi-fastjar: \
+    configure-fastjar 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fastjar/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in fastjar" ; \
+	(cd $(HOST_SUBDIR)/fastjar && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif fastjar
+
+.PHONY: maybe-pdf-fastjar pdf-fastjar
+maybe-pdf-fastjar:
+@if fastjar
+maybe-pdf-fastjar: pdf-fastjar
+
+pdf-fastjar: \
+    configure-fastjar 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fastjar/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in fastjar" ; \
+	(cd $(HOST_SUBDIR)/fastjar && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif fastjar
+
+.PHONY: maybe-html-fastjar html-fastjar
+maybe-html-fastjar:
+@if fastjar
+maybe-html-fastjar: html-fastjar
+
+html-fastjar: \
+    configure-fastjar 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fastjar/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in fastjar" ; \
+	(cd $(HOST_SUBDIR)/fastjar && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif fastjar
+
+.PHONY: maybe-TAGS-fastjar TAGS-fastjar
+maybe-TAGS-fastjar:
+@if fastjar
+maybe-TAGS-fastjar: TAGS-fastjar
+
+TAGS-fastjar: \
+    configure-fastjar 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fastjar/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in fastjar" ; \
+	(cd $(HOST_SUBDIR)/fastjar && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif fastjar
+
+.PHONY: maybe-install-info-fastjar install-info-fastjar
+maybe-install-info-fastjar:
+@if fastjar
+maybe-install-info-fastjar: install-info-fastjar
+
+install-info-fastjar: \
+    configure-fastjar \
+    info-fastjar 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fastjar/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in fastjar" ; \
+	(cd $(HOST_SUBDIR)/fastjar && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif fastjar
+
+.PHONY: maybe-install-pdf-fastjar install-pdf-fastjar
+maybe-install-pdf-fastjar:
+@if fastjar
+maybe-install-pdf-fastjar: install-pdf-fastjar
+
+install-pdf-fastjar: \
+    configure-fastjar \
+    pdf-fastjar 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fastjar/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in fastjar" ; \
+	(cd $(HOST_SUBDIR)/fastjar && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif fastjar
+
+.PHONY: maybe-install-html-fastjar install-html-fastjar
+maybe-install-html-fastjar:
+@if fastjar
+maybe-install-html-fastjar: install-html-fastjar
+
+install-html-fastjar: \
+    configure-fastjar \
+    html-fastjar 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fastjar/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in fastjar" ; \
+	(cd $(HOST_SUBDIR)/fastjar && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif fastjar
+
+.PHONY: maybe-installcheck-fastjar installcheck-fastjar
+maybe-installcheck-fastjar:
+@if fastjar
+maybe-installcheck-fastjar: installcheck-fastjar
+
+installcheck-fastjar: \
+    configure-fastjar 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fastjar/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in fastjar" ; \
+	(cd $(HOST_SUBDIR)/fastjar && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif fastjar
+
+.PHONY: maybe-mostlyclean-fastjar mostlyclean-fastjar
+maybe-mostlyclean-fastjar:
+@if fastjar
+maybe-mostlyclean-fastjar: mostlyclean-fastjar
+
+mostlyclean-fastjar: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fastjar/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in fastjar" ; \
+	(cd $(HOST_SUBDIR)/fastjar && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif fastjar
+
+.PHONY: maybe-clean-fastjar clean-fastjar
+maybe-clean-fastjar:
+@if fastjar
+maybe-clean-fastjar: clean-fastjar
+
+clean-fastjar: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fastjar/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in fastjar" ; \
+	(cd $(HOST_SUBDIR)/fastjar && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif fastjar
+
+.PHONY: maybe-distclean-fastjar distclean-fastjar
+maybe-distclean-fastjar:
+@if fastjar
+maybe-distclean-fastjar: distclean-fastjar
+
+distclean-fastjar: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fastjar/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in fastjar" ; \
+	(cd $(HOST_SUBDIR)/fastjar && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif fastjar
+
+.PHONY: maybe-maintainer-clean-fastjar maintainer-clean-fastjar
+maybe-maintainer-clean-fastjar:
+@if fastjar
+maybe-maintainer-clean-fastjar: maintainer-clean-fastjar
+
+maintainer-clean-fastjar: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fastjar/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in fastjar" ; \
+	(cd $(HOST_SUBDIR)/fastjar && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif fastjar
+
+
+
+.PHONY: configure-fixincludes maybe-configure-fixincludes
+maybe-configure-fixincludes:
+@if gcc-bootstrap
+configure-fixincludes: stage_current
+@endif gcc-bootstrap
+@if fixincludes
+maybe-configure-fixincludes: configure-fixincludes
+configure-fixincludes: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/fixincludes; \
+	cd "$(HOST_SUBDIR)/fixincludes" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/fixincludes"; \
+	libsrcdir="$$s/fixincludes"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif fixincludes
+
+
+
+
+
+.PHONY: all-fixincludes maybe-all-fixincludes
+maybe-all-fixincludes:
+@if gcc-bootstrap
+all-fixincludes: stage_current
+@endif gcc-bootstrap
+@if fixincludes
+TARGET-fixincludes=all
+maybe-all-fixincludes: all-fixincludes
+all-fixincludes: configure-fixincludes
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/fixincludes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-fixincludes))
+@endif fixincludes
+
+
+
+
+.PHONY: check-fixincludes maybe-check-fixincludes
+maybe-check-fixincludes:
+@if fixincludes
+maybe-check-fixincludes: check-fixincludes
+
+check-fixincludes:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/fixincludes && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif fixincludes
+
+.PHONY: install-fixincludes maybe-install-fixincludes
+maybe-install-fixincludes:
+@if fixincludes
+maybe-install-fixincludes: install-fixincludes
+
+install-fixincludes: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/fixincludes && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif fixincludes
+
+.PHONY: install-strip-fixincludes maybe-install-strip-fixincludes
+maybe-install-strip-fixincludes:
+@if fixincludes
+maybe-install-strip-fixincludes: install-strip-fixincludes
+
+install-strip-fixincludes: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/fixincludes && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif fixincludes
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-fixincludes info-fixincludes
+maybe-info-fixincludes:
+@if fixincludes
+maybe-info-fixincludes: info-fixincludes
+
+info-fixincludes: \
+    configure-fixincludes 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fixincludes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in fixincludes" ; \
+	(cd $(HOST_SUBDIR)/fixincludes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif fixincludes
+
+.PHONY: maybe-dvi-fixincludes dvi-fixincludes
+maybe-dvi-fixincludes:
+@if fixincludes
+maybe-dvi-fixincludes: dvi-fixincludes
+
+dvi-fixincludes: \
+    configure-fixincludes 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fixincludes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in fixincludes" ; \
+	(cd $(HOST_SUBDIR)/fixincludes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif fixincludes
+
+.PHONY: maybe-pdf-fixincludes pdf-fixincludes
+maybe-pdf-fixincludes:
+@if fixincludes
+maybe-pdf-fixincludes: pdf-fixincludes
+
+pdf-fixincludes: \
+    configure-fixincludes 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fixincludes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in fixincludes" ; \
+	(cd $(HOST_SUBDIR)/fixincludes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif fixincludes
+
+.PHONY: maybe-html-fixincludes html-fixincludes
+maybe-html-fixincludes:
+@if fixincludes
+maybe-html-fixincludes: html-fixincludes
+
+html-fixincludes: \
+    configure-fixincludes 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fixincludes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in fixincludes" ; \
+	(cd $(HOST_SUBDIR)/fixincludes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif fixincludes
+
+.PHONY: maybe-TAGS-fixincludes TAGS-fixincludes
+maybe-TAGS-fixincludes:
+@if fixincludes
+maybe-TAGS-fixincludes: TAGS-fixincludes
+
+# fixincludes doesn't support TAGS.
+TAGS-fixincludes:
+
+@endif fixincludes
+
+.PHONY: maybe-install-info-fixincludes install-info-fixincludes
+maybe-install-info-fixincludes:
+@if fixincludes
+maybe-install-info-fixincludes: install-info-fixincludes
+
+install-info-fixincludes: \
+    configure-fixincludes \
+    info-fixincludes 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fixincludes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in fixincludes" ; \
+	(cd $(HOST_SUBDIR)/fixincludes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif fixincludes
+
+.PHONY: maybe-install-pdf-fixincludes install-pdf-fixincludes
+maybe-install-pdf-fixincludes:
+@if fixincludes
+maybe-install-pdf-fixincludes: install-pdf-fixincludes
+
+install-pdf-fixincludes: \
+    configure-fixincludes \
+    pdf-fixincludes 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fixincludes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in fixincludes" ; \
+	(cd $(HOST_SUBDIR)/fixincludes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif fixincludes
+
+.PHONY: maybe-install-html-fixincludes install-html-fixincludes
+maybe-install-html-fixincludes:
+@if fixincludes
+maybe-install-html-fixincludes: install-html-fixincludes
+
+install-html-fixincludes: \
+    configure-fixincludes \
+    html-fixincludes 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fixincludes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in fixincludes" ; \
+	(cd $(HOST_SUBDIR)/fixincludes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif fixincludes
+
+.PHONY: maybe-installcheck-fixincludes installcheck-fixincludes
+maybe-installcheck-fixincludes:
+@if fixincludes
+maybe-installcheck-fixincludes: installcheck-fixincludes
+
+installcheck-fixincludes: \
+    configure-fixincludes 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fixincludes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in fixincludes" ; \
+	(cd $(HOST_SUBDIR)/fixincludes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif fixincludes
+
+.PHONY: maybe-mostlyclean-fixincludes mostlyclean-fixincludes
+maybe-mostlyclean-fixincludes:
+@if fixincludes
+maybe-mostlyclean-fixincludes: mostlyclean-fixincludes
+
+mostlyclean-fixincludes: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fixincludes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in fixincludes" ; \
+	(cd $(HOST_SUBDIR)/fixincludes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif fixincludes
+
+.PHONY: maybe-clean-fixincludes clean-fixincludes
+maybe-clean-fixincludes:
+@if fixincludes
+maybe-clean-fixincludes: clean-fixincludes
+
+clean-fixincludes: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fixincludes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in fixincludes" ; \
+	(cd $(HOST_SUBDIR)/fixincludes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif fixincludes
+
+.PHONY: maybe-distclean-fixincludes distclean-fixincludes
+maybe-distclean-fixincludes:
+@if fixincludes
+maybe-distclean-fixincludes: distclean-fixincludes
+
+distclean-fixincludes: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fixincludes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in fixincludes" ; \
+	(cd $(HOST_SUBDIR)/fixincludes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif fixincludes
+
+.PHONY: maybe-maintainer-clean-fixincludes maintainer-clean-fixincludes
+maybe-maintainer-clean-fixincludes:
+@if fixincludes
+maybe-maintainer-clean-fixincludes: maintainer-clean-fixincludes
+
+maintainer-clean-fixincludes: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fixincludes/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in fixincludes" ; \
+	(cd $(HOST_SUBDIR)/fixincludes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif fixincludes
+
+
+
+.PHONY: configure-flex maybe-configure-flex
+maybe-configure-flex:
+@if gcc-bootstrap
+configure-flex: stage_current
+@endif gcc-bootstrap
+@if flex
+maybe-configure-flex: configure-flex
+configure-flex: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/flex/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/flex ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/flex; \
+	cd "$(HOST_SUBDIR)/flex" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/flex/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/flex"; \
+	libsrcdir="$$s/flex"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif flex
+
+
+
+
+
+.PHONY: all-flex maybe-all-flex
+maybe-all-flex:
+@if gcc-bootstrap
+all-flex: stage_current
+@endif gcc-bootstrap
+@if flex
+TARGET-flex=all
+maybe-all-flex: all-flex
+all-flex: configure-flex
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/flex && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-flex))
+@endif flex
+
+
+
+
+.PHONY: check-flex maybe-check-flex
+maybe-check-flex:
+@if flex
+maybe-check-flex: check-flex
+
+# This module is only tested in a native toolchain.
+check-flex:
+	@: $(MAKE); $(unstage)
+	@if [ '$(host)' = '$(target)' ] ; then \
+	  r=`${PWD_COMMAND}`; export r; \
+	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	  $(HOST_EXPORTS) \
+	  (cd $(HOST_SUBDIR)/flex && \
+	    $(MAKE) $(FLAGS_TO_PASS)  check); \
+	fi
+
+@endif flex
+
+.PHONY: install-flex maybe-install-flex
+maybe-install-flex:
+@if flex
+maybe-install-flex: install-flex
+
+install-flex: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/flex && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif flex
+
+.PHONY: install-strip-flex maybe-install-strip-flex
+maybe-install-strip-flex:
+@if flex
+maybe-install-strip-flex: install-strip-flex
+
+install-strip-flex: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/flex && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif flex
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-flex info-flex
+maybe-info-flex:
+@if flex
+maybe-info-flex: info-flex
+
+info-flex: \
+    configure-flex 
+	@: $(MAKE); $(unstage)
+	@[ -f ./flex/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in flex" ; \
+	(cd $(HOST_SUBDIR)/flex && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif flex
+
+.PHONY: maybe-dvi-flex dvi-flex
+maybe-dvi-flex:
+@if flex
+maybe-dvi-flex: dvi-flex
+
+dvi-flex: \
+    configure-flex 
+	@: $(MAKE); $(unstage)
+	@[ -f ./flex/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in flex" ; \
+	(cd $(HOST_SUBDIR)/flex && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif flex
+
+.PHONY: maybe-pdf-flex pdf-flex
+maybe-pdf-flex:
+@if flex
+maybe-pdf-flex: pdf-flex
+
+pdf-flex: \
+    configure-flex 
+	@: $(MAKE); $(unstage)
+	@[ -f ./flex/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in flex" ; \
+	(cd $(HOST_SUBDIR)/flex && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif flex
+
+.PHONY: maybe-html-flex html-flex
+maybe-html-flex:
+@if flex
+maybe-html-flex: html-flex
+
+html-flex: \
+    configure-flex 
+	@: $(MAKE); $(unstage)
+	@[ -f ./flex/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in flex" ; \
+	(cd $(HOST_SUBDIR)/flex && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif flex
+
+.PHONY: maybe-TAGS-flex TAGS-flex
+maybe-TAGS-flex:
+@if flex
+maybe-TAGS-flex: TAGS-flex
+
+TAGS-flex: \
+    configure-flex 
+	@: $(MAKE); $(unstage)
+	@[ -f ./flex/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in flex" ; \
+	(cd $(HOST_SUBDIR)/flex && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif flex
+
+.PHONY: maybe-install-info-flex install-info-flex
+maybe-install-info-flex:
+@if flex
+maybe-install-info-flex: install-info-flex
+
+install-info-flex: \
+    configure-flex \
+    info-flex 
+	@: $(MAKE); $(unstage)
+	@[ -f ./flex/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in flex" ; \
+	(cd $(HOST_SUBDIR)/flex && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif flex
+
+.PHONY: maybe-install-pdf-flex install-pdf-flex
+maybe-install-pdf-flex:
+@if flex
+maybe-install-pdf-flex: install-pdf-flex
+
+install-pdf-flex: \
+    configure-flex \
+    pdf-flex 
+	@: $(MAKE); $(unstage)
+	@[ -f ./flex/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in flex" ; \
+	(cd $(HOST_SUBDIR)/flex && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif flex
+
+.PHONY: maybe-install-html-flex install-html-flex
+maybe-install-html-flex:
+@if flex
+maybe-install-html-flex: install-html-flex
+
+install-html-flex: \
+    configure-flex \
+    html-flex 
+	@: $(MAKE); $(unstage)
+	@[ -f ./flex/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in flex" ; \
+	(cd $(HOST_SUBDIR)/flex && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif flex
+
+.PHONY: maybe-installcheck-flex installcheck-flex
+maybe-installcheck-flex:
+@if flex
+maybe-installcheck-flex: installcheck-flex
+
+installcheck-flex: \
+    configure-flex 
+	@: $(MAKE); $(unstage)
+	@[ -f ./flex/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in flex" ; \
+	(cd $(HOST_SUBDIR)/flex && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif flex
+
+.PHONY: maybe-mostlyclean-flex mostlyclean-flex
+maybe-mostlyclean-flex:
+@if flex
+maybe-mostlyclean-flex: mostlyclean-flex
+
+mostlyclean-flex: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./flex/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in flex" ; \
+	(cd $(HOST_SUBDIR)/flex && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif flex
+
+.PHONY: maybe-clean-flex clean-flex
+maybe-clean-flex:
+@if flex
+maybe-clean-flex: clean-flex
+
+clean-flex: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./flex/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in flex" ; \
+	(cd $(HOST_SUBDIR)/flex && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif flex
+
+.PHONY: maybe-distclean-flex distclean-flex
+maybe-distclean-flex:
+@if flex
+maybe-distclean-flex: distclean-flex
+
+distclean-flex: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./flex/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in flex" ; \
+	(cd $(HOST_SUBDIR)/flex && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif flex
+
+.PHONY: maybe-maintainer-clean-flex maintainer-clean-flex
+maybe-maintainer-clean-flex:
+@if flex
+maybe-maintainer-clean-flex: maintainer-clean-flex
+
+maintainer-clean-flex: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./flex/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in flex" ; \
+	(cd $(HOST_SUBDIR)/flex && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif flex
+
+
+
+.PHONY: configure-gas maybe-configure-gas
+maybe-configure-gas:
+@if gcc-bootstrap
+configure-gas: stage_current
+@endif gcc-bootstrap
+@if gas
+maybe-configure-gas: configure-gas
+configure-gas: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/gas; \
+	cd "$(HOST_SUBDIR)/gas" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gas"; \
+	libsrcdir="$$s/gas"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif gas
+
+
+
+.PHONY: configure-stage1-gas maybe-configure-stage1-gas
+maybe-configure-stage1-gas:
+@if gas-bootstrap
+maybe-configure-stage1-gas: configure-stage1-gas
+configure-stage1-gas:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
+	cd $(HOST_SUBDIR)/gas || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gas"; \
+	libsrcdir="$$s/gas"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS)
+@endif gas-bootstrap
+
+.PHONY: configure-stage2-gas maybe-configure-stage2-gas
+maybe-configure-stage2-gas:
+@if gas-bootstrap
+maybe-configure-stage2-gas: configure-stage2-gas
+configure-stage2-gas:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(HOST_SUBDIR)/gas ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
+	cd $(HOST_SUBDIR)/gas || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gas"; \
+	libsrcdir="$$s/gas"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS)
+@endif gas-bootstrap
+
+.PHONY: configure-stage3-gas maybe-configure-stage3-gas
+maybe-configure-stage3-gas:
+@if gas-bootstrap
+maybe-configure-stage3-gas: configure-stage3-gas
+configure-stage3-gas:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(HOST_SUBDIR)/gas ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
+	cd $(HOST_SUBDIR)/gas || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gas"; \
+	libsrcdir="$$s/gas"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS)
+@endif gas-bootstrap
+
+.PHONY: configure-stage4-gas maybe-configure-stage4-gas
+maybe-configure-stage4-gas:
+@if gas-bootstrap
+maybe-configure-stage4-gas: configure-stage4-gas
+configure-stage4-gas:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(HOST_SUBDIR)/gas ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
+	cd $(HOST_SUBDIR)/gas || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gas"; \
+	libsrcdir="$$s/gas"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS)
+@endif gas-bootstrap
+
+.PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas
+maybe-configure-stageprofile-gas:
+@if gas-bootstrap
+maybe-configure-stageprofile-gas: configure-stageprofile-gas
+configure-stageprofile-gas:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(HOST_SUBDIR)/gas ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
+	cd $(HOST_SUBDIR)/gas || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gas"; \
+	libsrcdir="$$s/gas"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS)
+@endif gas-bootstrap
+
+.PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas
+maybe-configure-stagefeedback-gas:
+@if gas-bootstrap
+maybe-configure-stagefeedback-gas: configure-stagefeedback-gas
+configure-stagefeedback-gas:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(HOST_SUBDIR)/gas ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
+	cd $(HOST_SUBDIR)/gas || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gas"; \
+	libsrcdir="$$s/gas"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif gas-bootstrap
+
+
+
+
+
+.PHONY: all-gas maybe-all-gas
+maybe-all-gas:
+@if gcc-bootstrap
+all-gas: stage_current
+@endif gcc-bootstrap
+@if gas
+TARGET-gas=all
+maybe-all-gas: all-gas
+all-gas: configure-gas
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/gas && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-gas))
+@endif gas
+
+
+
+.PHONY: all-stage1-gas maybe-all-stage1-gas
+.PHONY: clean-stage1-gas maybe-clean-stage1-gas
+maybe-all-stage1-gas:
+maybe-clean-stage1-gas:
+@if gas-bootstrap
+maybe-all-stage1-gas: all-stage1-gas
+all-stage1: all-stage1-gas
+TARGET-stage1-gas = $(TARGET-gas)
+all-stage1-gas: configure-stage1-gas
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-gas)
+
+maybe-clean-stage1-gas: clean-stage1-gas
+clean-stage1: clean-stage1-gas
+clean-stage1-gas:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage1-gas/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		 clean
+@endif gas-bootstrap
+
+
+.PHONY: all-stage2-gas maybe-all-stage2-gas
+.PHONY: clean-stage2-gas maybe-clean-stage2-gas
+maybe-all-stage2-gas:
+maybe-clean-stage2-gas:
+@if gas-bootstrap
+maybe-all-stage2-gas: all-stage2-gas
+all-stage2: all-stage2-gas
+TARGET-stage2-gas = $(TARGET-gas)
+all-stage2-gas: configure-stage2-gas
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-gas)
+
+maybe-clean-stage2-gas: clean-stage2-gas
+clean-stage2: clean-stage2-gas
+clean-stage2-gas:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage2-gas/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif gas-bootstrap
+
+
+.PHONY: all-stage3-gas maybe-all-stage3-gas
+.PHONY: clean-stage3-gas maybe-clean-stage3-gas
+maybe-all-stage3-gas:
+maybe-clean-stage3-gas:
+@if gas-bootstrap
+maybe-all-stage3-gas: all-stage3-gas
+all-stage3: all-stage3-gas
+TARGET-stage3-gas = $(TARGET-gas)
+all-stage3-gas: configure-stage3-gas
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-gas)
+
+maybe-clean-stage3-gas: clean-stage3-gas
+clean-stage3: clean-stage3-gas
+clean-stage3-gas:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage3-gas/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif gas-bootstrap
+
+
+.PHONY: all-stage4-gas maybe-all-stage4-gas
+.PHONY: clean-stage4-gas maybe-clean-stage4-gas
+maybe-all-stage4-gas:
+maybe-clean-stage4-gas:
+@if gas-bootstrap
+maybe-all-stage4-gas: all-stage4-gas
+all-stage4: all-stage4-gas
+TARGET-stage4-gas = $(TARGET-gas)
+all-stage4-gas: configure-stage4-gas
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE4_CFLAGS)" \
+		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-gas)
+
+maybe-clean-stage4-gas: clean-stage4-gas
+clean-stage4: clean-stage4-gas
+clean-stage4-gas:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage4-gas/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif gas-bootstrap
+
+
+.PHONY: all-stageprofile-gas maybe-all-stageprofile-gas
+.PHONY: clean-stageprofile-gas maybe-clean-stageprofile-gas
+maybe-all-stageprofile-gas:
+maybe-clean-stageprofile-gas:
+@if gas-bootstrap
+maybe-all-stageprofile-gas: all-stageprofile-gas
+all-stageprofile: all-stageprofile-gas
+TARGET-stageprofile-gas = $(TARGET-gas)
+all-stageprofile-gas: configure-stageprofile-gas
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-gas)
+
+maybe-clean-stageprofile-gas: clean-stageprofile-gas
+clean-stageprofile: clean-stageprofile-gas
+clean-stageprofile-gas:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stageprofile-gas/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif gas-bootstrap
+
+
+.PHONY: all-stagefeedback-gas maybe-all-stagefeedback-gas
+.PHONY: clean-stagefeedback-gas maybe-clean-stagefeedback-gas
+maybe-all-stagefeedback-gas:
+maybe-clean-stagefeedback-gas:
+@if gas-bootstrap
+maybe-all-stagefeedback-gas: all-stagefeedback-gas
+all-stagefeedback: all-stagefeedback-gas
+TARGET-stagefeedback-gas = $(TARGET-gas)
+all-stagefeedback-gas: configure-stagefeedback-gas
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-gas)
+
+maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
+clean-stagefeedback: clean-stagefeedback-gas
+clean-stagefeedback-gas:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stagefeedback-gas/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif gas-bootstrap
+
+
+
+
+
+.PHONY: check-gas maybe-check-gas
+maybe-check-gas:
+@if gas
+maybe-check-gas: check-gas
+
+check-gas:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gas && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif gas
+
+.PHONY: install-gas maybe-install-gas
+maybe-install-gas:
+@if gas
+maybe-install-gas: install-gas
+
+install-gas: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gas && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif gas
+
+.PHONY: install-strip-gas maybe-install-strip-gas
+maybe-install-strip-gas:
+@if gas
+maybe-install-strip-gas: install-strip-gas
+
+install-strip-gas: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gas && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif gas
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-gas info-gas
+maybe-info-gas:
+@if gas
+maybe-info-gas: info-gas
+
+info-gas: \
+    configure-gas 
+	@[ -f ./gas/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in gas" ; \
+	(cd $(HOST_SUBDIR)/gas && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif gas
+
+.PHONY: maybe-dvi-gas dvi-gas
+maybe-dvi-gas:
+@if gas
+maybe-dvi-gas: dvi-gas
+
+dvi-gas: \
+    configure-gas 
+	@[ -f ./gas/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in gas" ; \
+	(cd $(HOST_SUBDIR)/gas && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif gas
+
+.PHONY: maybe-pdf-gas pdf-gas
+maybe-pdf-gas:
+@if gas
+maybe-pdf-gas: pdf-gas
+
+pdf-gas: \
+    configure-gas 
+	@[ -f ./gas/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in gas" ; \
+	(cd $(HOST_SUBDIR)/gas && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif gas
+
+.PHONY: maybe-html-gas html-gas
+maybe-html-gas:
+@if gas
+maybe-html-gas: html-gas
+
+html-gas: \
+    configure-gas 
+	@[ -f ./gas/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in gas" ; \
+	(cd $(HOST_SUBDIR)/gas && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif gas
+
+.PHONY: maybe-TAGS-gas TAGS-gas
+maybe-TAGS-gas:
+@if gas
+maybe-TAGS-gas: TAGS-gas
+
+TAGS-gas: \
+    configure-gas 
+	@[ -f ./gas/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in gas" ; \
+	(cd $(HOST_SUBDIR)/gas && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif gas
+
+.PHONY: maybe-install-info-gas install-info-gas
+maybe-install-info-gas:
+@if gas
+maybe-install-info-gas: install-info-gas
+
+install-info-gas: \
+    configure-gas \
+    info-gas 
+	@[ -f ./gas/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in gas" ; \
+	(cd $(HOST_SUBDIR)/gas && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif gas
+
+.PHONY: maybe-install-pdf-gas install-pdf-gas
+maybe-install-pdf-gas:
+@if gas
+maybe-install-pdf-gas: install-pdf-gas
+
+install-pdf-gas: \
+    configure-gas \
+    pdf-gas 
+	@[ -f ./gas/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in gas" ; \
+	(cd $(HOST_SUBDIR)/gas && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif gas
+
+.PHONY: maybe-install-html-gas install-html-gas
+maybe-install-html-gas:
+@if gas
+maybe-install-html-gas: install-html-gas
+
+install-html-gas: \
+    configure-gas \
+    html-gas 
+	@[ -f ./gas/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in gas" ; \
+	(cd $(HOST_SUBDIR)/gas && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif gas
+
+.PHONY: maybe-installcheck-gas installcheck-gas
+maybe-installcheck-gas:
+@if gas
+maybe-installcheck-gas: installcheck-gas
+
+installcheck-gas: \
+    configure-gas 
+	@[ -f ./gas/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in gas" ; \
+	(cd $(HOST_SUBDIR)/gas && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif gas
+
+.PHONY: maybe-mostlyclean-gas mostlyclean-gas
+maybe-mostlyclean-gas:
+@if gas
+maybe-mostlyclean-gas: mostlyclean-gas
+
+mostlyclean-gas: 
+	@[ -f ./gas/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in gas" ; \
+	(cd $(HOST_SUBDIR)/gas && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif gas
+
+.PHONY: maybe-clean-gas clean-gas
+maybe-clean-gas:
+@if gas
+maybe-clean-gas: clean-gas
+
+clean-gas: 
+	@[ -f ./gas/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in gas" ; \
+	(cd $(HOST_SUBDIR)/gas && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif gas
+
+.PHONY: maybe-distclean-gas distclean-gas
+maybe-distclean-gas:
+@if gas
+maybe-distclean-gas: distclean-gas
+
+distclean-gas: 
+	@[ -f ./gas/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in gas" ; \
+	(cd $(HOST_SUBDIR)/gas && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif gas
+
+.PHONY: maybe-maintainer-clean-gas maintainer-clean-gas
+maybe-maintainer-clean-gas:
+@if gas
+maybe-maintainer-clean-gas: maintainer-clean-gas
+
+maintainer-clean-gas: 
+	@[ -f ./gas/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in gas" ; \
+	(cd $(HOST_SUBDIR)/gas && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif gas
+
+
+
+.PHONY: configure-gcc maybe-configure-gcc
+maybe-configure-gcc:
+@if gcc-bootstrap
+configure-gcc: stage_current
+@endif gcc-bootstrap
+@if gcc
+maybe-configure-gcc: configure-gcc
+configure-gcc: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/gcc; \
+	cd "$(HOST_SUBDIR)/gcc" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gcc"; \
+	libsrcdir="$$s/gcc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif gcc
+
+
+
+.PHONY: configure-stage1-gcc maybe-configure-stage1-gcc
+maybe-configure-stage1-gcc:
+@if gcc-bootstrap
+maybe-configure-stage1-gcc: configure-stage1-gcc
+configure-stage1-gcc:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
+	cd $(HOST_SUBDIR)/gcc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gcc"; \
+	libsrcdir="$$s/gcc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS)
+@endif gcc-bootstrap
+
+.PHONY: configure-stage2-gcc maybe-configure-stage2-gcc
+maybe-configure-stage2-gcc:
+@if gcc-bootstrap
+maybe-configure-stage2-gcc: configure-stage2-gcc
+configure-stage2-gcc:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(HOST_SUBDIR)/gcc ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
+	cd $(HOST_SUBDIR)/gcc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gcc"; \
+	libsrcdir="$$s/gcc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS)
+@endif gcc-bootstrap
+
+.PHONY: configure-stage3-gcc maybe-configure-stage3-gcc
+maybe-configure-stage3-gcc:
+@if gcc-bootstrap
+maybe-configure-stage3-gcc: configure-stage3-gcc
+configure-stage3-gcc:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(HOST_SUBDIR)/gcc ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
+	cd $(HOST_SUBDIR)/gcc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gcc"; \
+	libsrcdir="$$s/gcc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS)
+@endif gcc-bootstrap
+
+.PHONY: configure-stage4-gcc maybe-configure-stage4-gcc
+maybe-configure-stage4-gcc:
+@if gcc-bootstrap
+maybe-configure-stage4-gcc: configure-stage4-gcc
+configure-stage4-gcc:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(HOST_SUBDIR)/gcc ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
+	cd $(HOST_SUBDIR)/gcc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gcc"; \
+	libsrcdir="$$s/gcc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS)
+@endif gcc-bootstrap
+
+.PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc
+maybe-configure-stageprofile-gcc:
+@if gcc-bootstrap
+maybe-configure-stageprofile-gcc: configure-stageprofile-gcc
+configure-stageprofile-gcc:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(HOST_SUBDIR)/gcc ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
+	cd $(HOST_SUBDIR)/gcc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gcc"; \
+	libsrcdir="$$s/gcc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS)
+@endif gcc-bootstrap
+
+.PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc
+maybe-configure-stagefeedback-gcc:
+@if gcc-bootstrap
+maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc
+configure-stagefeedback-gcc:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(HOST_SUBDIR)/gcc ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
+	cd $(HOST_SUBDIR)/gcc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gcc"; \
+	libsrcdir="$$s/gcc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif gcc-bootstrap
+
+
+
+
+
+.PHONY: all-gcc maybe-all-gcc
+maybe-all-gcc:
+@if gcc-bootstrap
+all-gcc: stage_current
+@endif gcc-bootstrap
+@if gcc
+TARGET-gcc=all
+maybe-all-gcc: all-gcc
+all-gcc: configure-gcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/gcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) \
+		$(TARGET-gcc))
+@endif gcc
+
+
+
+.PHONY: all-stage1-gcc maybe-all-stage1-gcc
+.PHONY: clean-stage1-gcc maybe-clean-stage1-gcc
+maybe-all-stage1-gcc:
+maybe-clean-stage1-gcc:
+@if gcc-bootstrap
+maybe-all-stage1-gcc: all-stage1-gcc
+all-stage1: all-stage1-gcc
+TARGET-stage1-gcc = $(TARGET-gcc)
+all-stage1-gcc: configure-stage1-gcc
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)  $(EXTRA_GCC_FLAGS) \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-gcc)
+
+maybe-clean-stage1-gcc: clean-stage1-gcc
+clean-stage1: clean-stage1-gcc
+clean-stage1-gcc:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage1-gcc/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: all-stage2-gcc maybe-all-stage2-gcc
+.PHONY: clean-stage2-gcc maybe-clean-stage2-gcc
+maybe-all-stage2-gcc:
+maybe-clean-stage2-gcc:
+@if gcc-bootstrap
+maybe-all-stage2-gcc: all-stage2-gcc
+all-stage2: all-stage2-gcc
+TARGET-stage2-gcc = $(TARGET-gcc)
+all-stage2-gcc: configure-stage2-gcc
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-gcc)
+
+maybe-clean-stage2-gcc: clean-stage2-gcc
+clean-stage2: clean-stage2-gcc
+clean-stage2-gcc:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage2-gcc/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		$(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: all-stage3-gcc maybe-all-stage3-gcc
+.PHONY: clean-stage3-gcc maybe-clean-stage3-gcc
+maybe-all-stage3-gcc:
+maybe-clean-stage3-gcc:
+@if gcc-bootstrap
+maybe-all-stage3-gcc: all-stage3-gcc
+all-stage3: all-stage3-gcc
+TARGET-stage3-gcc = $(TARGET-gcc)
+all-stage3-gcc: configure-stage3-gcc
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-gcc)
+
+maybe-clean-stage3-gcc: clean-stage3-gcc
+clean-stage3: clean-stage3-gcc
+clean-stage3-gcc:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage3-gcc/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		$(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: all-stage4-gcc maybe-all-stage4-gcc
+.PHONY: clean-stage4-gcc maybe-clean-stage4-gcc
+maybe-all-stage4-gcc:
+maybe-clean-stage4-gcc:
+@if gcc-bootstrap
+maybe-all-stage4-gcc: all-stage4-gcc
+all-stage4: all-stage4-gcc
+TARGET-stage4-gcc = $(TARGET-gcc)
+all-stage4-gcc: configure-stage4-gcc
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE4_CFLAGS)" \
+		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-gcc)
+
+maybe-clean-stage4-gcc: clean-stage4-gcc
+clean-stage4: clean-stage4-gcc
+clean-stage4-gcc:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage4-gcc/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		$(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: all-stageprofile-gcc maybe-all-stageprofile-gcc
+.PHONY: clean-stageprofile-gcc maybe-clean-stageprofile-gcc
+maybe-all-stageprofile-gcc:
+maybe-clean-stageprofile-gcc:
+@if gcc-bootstrap
+maybe-all-stageprofile-gcc: all-stageprofile-gcc
+all-stageprofile: all-stageprofile-gcc
+TARGET-stageprofile-gcc = $(TARGET-gcc)
+all-stageprofile-gcc: configure-stageprofile-gcc
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-gcc)
+
+maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
+clean-stageprofile: clean-stageprofile-gcc
+clean-stageprofile-gcc:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stageprofile-gcc/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		$(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: all-stagefeedback-gcc maybe-all-stagefeedback-gcc
+.PHONY: clean-stagefeedback-gcc maybe-clean-stagefeedback-gcc
+maybe-all-stagefeedback-gcc:
+maybe-clean-stagefeedback-gcc:
+@if gcc-bootstrap
+maybe-all-stagefeedback-gcc: all-stagefeedback-gcc
+all-stagefeedback: all-stagefeedback-gcc
+TARGET-stagefeedback-gcc = $(TARGET-gcc)
+all-stagefeedback-gcc: configure-stagefeedback-gcc
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-gcc)
+
+maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
+clean-stagefeedback: clean-stagefeedback-gcc
+clean-stagefeedback-gcc:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stagefeedback-gcc/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		$(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+
+
+
+.PHONY: check-gcc maybe-check-gcc
+maybe-check-gcc:
+@if gcc
+maybe-check-gcc: check-gcc
+
+check-gcc:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gcc && \
+	  $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) check)
+
+@endif gcc
+
+.PHONY: install-gcc maybe-install-gcc
+maybe-install-gcc:
+@if gcc
+maybe-install-gcc: install-gcc
+
+install-gcc: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gcc && \
+	  $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) install)
+
+@endif gcc
+
+.PHONY: install-strip-gcc maybe-install-strip-gcc
+maybe-install-strip-gcc:
+@if gcc
+maybe-install-strip-gcc: install-strip-gcc
+
+install-strip-gcc: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gcc && \
+	  $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) install-strip)
+
+@endif gcc
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-gcc info-gcc
+maybe-info-gcc:
+@if gcc
+maybe-info-gcc: info-gcc
+
+info-gcc: \
+    configure-gcc 
+	@[ -f ./gcc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in gcc" ; \
+	(cd $(HOST_SUBDIR)/gcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif gcc
+
+.PHONY: maybe-dvi-gcc dvi-gcc
+maybe-dvi-gcc:
+@if gcc
+maybe-dvi-gcc: dvi-gcc
+
+dvi-gcc: \
+    configure-gcc 
+	@[ -f ./gcc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in gcc" ; \
+	(cd $(HOST_SUBDIR)/gcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif gcc
+
+.PHONY: maybe-pdf-gcc pdf-gcc
+maybe-pdf-gcc:
+@if gcc
+maybe-pdf-gcc: pdf-gcc
+
+pdf-gcc: \
+    configure-gcc 
+	@[ -f ./gcc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in gcc" ; \
+	(cd $(HOST_SUBDIR)/gcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif gcc
+
+.PHONY: maybe-html-gcc html-gcc
+maybe-html-gcc:
+@if gcc
+maybe-html-gcc: html-gcc
+
+html-gcc: \
+    configure-gcc 
+	@[ -f ./gcc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in gcc" ; \
+	(cd $(HOST_SUBDIR)/gcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif gcc
+
+.PHONY: maybe-TAGS-gcc TAGS-gcc
+maybe-TAGS-gcc:
+@if gcc
+maybe-TAGS-gcc: TAGS-gcc
+
+TAGS-gcc: \
+    configure-gcc 
+	@[ -f ./gcc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in gcc" ; \
+	(cd $(HOST_SUBDIR)/gcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif gcc
+
+.PHONY: maybe-install-info-gcc install-info-gcc
+maybe-install-info-gcc:
+@if gcc
+maybe-install-info-gcc: install-info-gcc
+
+install-info-gcc: \
+    configure-gcc \
+    info-gcc 
+	@[ -f ./gcc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in gcc" ; \
+	(cd $(HOST_SUBDIR)/gcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif gcc
+
+.PHONY: maybe-install-pdf-gcc install-pdf-gcc
+maybe-install-pdf-gcc:
+@if gcc
+maybe-install-pdf-gcc: install-pdf-gcc
+
+install-pdf-gcc: \
+    configure-gcc \
+    pdf-gcc 
+	@[ -f ./gcc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in gcc" ; \
+	(cd $(HOST_SUBDIR)/gcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif gcc
+
+.PHONY: maybe-install-html-gcc install-html-gcc
+maybe-install-html-gcc:
+@if gcc
+maybe-install-html-gcc: install-html-gcc
+
+install-html-gcc: \
+    configure-gcc \
+    html-gcc 
+	@[ -f ./gcc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in gcc" ; \
+	(cd $(HOST_SUBDIR)/gcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif gcc
+
+.PHONY: maybe-installcheck-gcc installcheck-gcc
+maybe-installcheck-gcc:
+@if gcc
+maybe-installcheck-gcc: installcheck-gcc
+
+installcheck-gcc: \
+    configure-gcc 
+	@[ -f ./gcc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in gcc" ; \
+	(cd $(HOST_SUBDIR)/gcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif gcc
+
+.PHONY: maybe-mostlyclean-gcc mostlyclean-gcc
+maybe-mostlyclean-gcc:
+@if gcc
+maybe-mostlyclean-gcc: mostlyclean-gcc
+
+mostlyclean-gcc: 
+	@[ -f ./gcc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in gcc" ; \
+	(cd $(HOST_SUBDIR)/gcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif gcc
+
+.PHONY: maybe-clean-gcc clean-gcc
+maybe-clean-gcc:
+@if gcc
+maybe-clean-gcc: clean-gcc
+
+clean-gcc: 
+	@[ -f ./gcc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in gcc" ; \
+	(cd $(HOST_SUBDIR)/gcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif gcc
+
+.PHONY: maybe-distclean-gcc distclean-gcc
+maybe-distclean-gcc:
+@if gcc
+maybe-distclean-gcc: distclean-gcc
+
+distclean-gcc: 
+	@[ -f ./gcc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in gcc" ; \
+	(cd $(HOST_SUBDIR)/gcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif gcc
+
+.PHONY: maybe-maintainer-clean-gcc maintainer-clean-gcc
+maybe-maintainer-clean-gcc:
+@if gcc
+maybe-maintainer-clean-gcc: maintainer-clean-gcc
+
+maintainer-clean-gcc: 
+	@[ -f ./gcc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in gcc" ; \
+	(cd $(HOST_SUBDIR)/gcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif gcc
+
+
+
+.PHONY: configure-gmp maybe-configure-gmp
+maybe-configure-gmp:
+@if gcc-bootstrap
+configure-gmp: stage_current
+@endif gcc-bootstrap
+@if gmp
+maybe-configure-gmp: configure-gmp
+configure-gmp: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/gmp; \
+	cd "$(HOST_SUBDIR)/gmp" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gmp"; \
+	libsrcdir="$$s/gmp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
+	  --target=none-${host_vendor}-${host_os} $${srcdiroption} --disable-shared \
+	  || exit 1
+@endif gmp
+
+
+
+.PHONY: configure-stage1-gmp maybe-configure-stage1-gmp
+maybe-configure-stage1-gmp:
+@if gmp-bootstrap
+maybe-configure-stage1-gmp: configure-stage1-gmp
+configure-stage1-gmp:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(HOST_SUBDIR)/gmp ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+	cd $(HOST_SUBDIR)/gmp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gmp"; \
+	libsrcdir="$$s/gmp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
+	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS) \
+	  --disable-shared
+@endif gmp-bootstrap
+
+.PHONY: configure-stage2-gmp maybe-configure-stage2-gmp
+maybe-configure-stage2-gmp:
+@if gmp-bootstrap
+maybe-configure-stage2-gmp: configure-stage2-gmp
+configure-stage2-gmp:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(HOST_SUBDIR)/gmp ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+	cd $(HOST_SUBDIR)/gmp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gmp"; \
+	libsrcdir="$$s/gmp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
+	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS) \
+	  --disable-shared
+@endif gmp-bootstrap
+
+.PHONY: configure-stage3-gmp maybe-configure-stage3-gmp
+maybe-configure-stage3-gmp:
+@if gmp-bootstrap
+maybe-configure-stage3-gmp: configure-stage3-gmp
+configure-stage3-gmp:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(HOST_SUBDIR)/gmp ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+	cd $(HOST_SUBDIR)/gmp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gmp"; \
+	libsrcdir="$$s/gmp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
+	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS) \
+	  --disable-shared
+@endif gmp-bootstrap
+
+.PHONY: configure-stage4-gmp maybe-configure-stage4-gmp
+maybe-configure-stage4-gmp:
+@if gmp-bootstrap
+maybe-configure-stage4-gmp: configure-stage4-gmp
+configure-stage4-gmp:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(HOST_SUBDIR)/gmp ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+	cd $(HOST_SUBDIR)/gmp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gmp"; \
+	libsrcdir="$$s/gmp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
+	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS) \
+	  --disable-shared
+@endif gmp-bootstrap
+
+.PHONY: configure-stageprofile-gmp maybe-configure-stageprofile-gmp
+maybe-configure-stageprofile-gmp:
+@if gmp-bootstrap
+maybe-configure-stageprofile-gmp: configure-stageprofile-gmp
+configure-stageprofile-gmp:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(HOST_SUBDIR)/gmp ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+	cd $(HOST_SUBDIR)/gmp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gmp"; \
+	libsrcdir="$$s/gmp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
+	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS) \
+	  --disable-shared
+@endif gmp-bootstrap
+
+.PHONY: configure-stagefeedback-gmp maybe-configure-stagefeedback-gmp
+maybe-configure-stagefeedback-gmp:
+@if gmp-bootstrap
+maybe-configure-stagefeedback-gmp: configure-stagefeedback-gmp
+configure-stagefeedback-gmp:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(HOST_SUBDIR)/gmp ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+	cd $(HOST_SUBDIR)/gmp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gmp"; \
+	libsrcdir="$$s/gmp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
+	  --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS) \
+	  --disable-shared
+@endif gmp-bootstrap
+
+
+
+
+
+.PHONY: all-gmp maybe-all-gmp
+maybe-all-gmp:
+@if gcc-bootstrap
+all-gmp: stage_current
+@endif gcc-bootstrap
+@if gmp
+TARGET-gmp=all
+maybe-all-gmp: all-gmp
+all-gmp: configure-gmp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/gmp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-gmp))
+@endif gmp
+
+
+
+.PHONY: all-stage1-gmp maybe-all-stage1-gmp
+.PHONY: clean-stage1-gmp maybe-clean-stage1-gmp
+maybe-all-stage1-gmp:
+maybe-clean-stage1-gmp:
+@if gmp-bootstrap
+maybe-all-stage1-gmp: all-stage1-gmp
+all-stage1: all-stage1-gmp
+TARGET-stage1-gmp = $(TARGET-gmp)
+all-stage1-gmp: configure-stage1-gmp
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gmp && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-gmp)
+
+maybe-clean-stage1-gmp: clean-stage1-gmp
+clean-stage1: clean-stage1-gmp
+clean-stage1-gmp:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage1-gmp/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gmp && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		 clean
+@endif gmp-bootstrap
+
+
+.PHONY: all-stage2-gmp maybe-all-stage2-gmp
+.PHONY: clean-stage2-gmp maybe-clean-stage2-gmp
+maybe-all-stage2-gmp:
+maybe-clean-stage2-gmp:
+@if gmp-bootstrap
+maybe-all-stage2-gmp: all-stage2-gmp
+all-stage2: all-stage2-gmp
+TARGET-stage2-gmp = $(TARGET-gmp)
+all-stage2-gmp: configure-stage2-gmp
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gmp && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-gmp)
+
+maybe-clean-stage2-gmp: clean-stage2-gmp
+clean-stage2: clean-stage2-gmp
+clean-stage2-gmp:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage2-gmp/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gmp && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif gmp-bootstrap
+
+
+.PHONY: all-stage3-gmp maybe-all-stage3-gmp
+.PHONY: clean-stage3-gmp maybe-clean-stage3-gmp
+maybe-all-stage3-gmp:
+maybe-clean-stage3-gmp:
+@if gmp-bootstrap
+maybe-all-stage3-gmp: all-stage3-gmp
+all-stage3: all-stage3-gmp
+TARGET-stage3-gmp = $(TARGET-gmp)
+all-stage3-gmp: configure-stage3-gmp
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gmp && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-gmp)
+
+maybe-clean-stage3-gmp: clean-stage3-gmp
+clean-stage3: clean-stage3-gmp
+clean-stage3-gmp:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage3-gmp/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gmp && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif gmp-bootstrap
+
+
+.PHONY: all-stage4-gmp maybe-all-stage4-gmp
+.PHONY: clean-stage4-gmp maybe-clean-stage4-gmp
+maybe-all-stage4-gmp:
+maybe-clean-stage4-gmp:
+@if gmp-bootstrap
+maybe-all-stage4-gmp: all-stage4-gmp
+all-stage4: all-stage4-gmp
+TARGET-stage4-gmp = $(TARGET-gmp)
+all-stage4-gmp: configure-stage4-gmp
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gmp && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE4_CFLAGS)" \
+		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-gmp)
+
+maybe-clean-stage4-gmp: clean-stage4-gmp
+clean-stage4: clean-stage4-gmp
+clean-stage4-gmp:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage4-gmp/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gmp && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif gmp-bootstrap
+
+
+.PHONY: all-stageprofile-gmp maybe-all-stageprofile-gmp
+.PHONY: clean-stageprofile-gmp maybe-clean-stageprofile-gmp
+maybe-all-stageprofile-gmp:
+maybe-clean-stageprofile-gmp:
+@if gmp-bootstrap
+maybe-all-stageprofile-gmp: all-stageprofile-gmp
+all-stageprofile: all-stageprofile-gmp
+TARGET-stageprofile-gmp = $(TARGET-gmp)
+all-stageprofile-gmp: configure-stageprofile-gmp
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gmp && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-gmp)
+
+maybe-clean-stageprofile-gmp: clean-stageprofile-gmp
+clean-stageprofile: clean-stageprofile-gmp
+clean-stageprofile-gmp:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stageprofile-gmp/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gmp && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif gmp-bootstrap
+
+
+.PHONY: all-stagefeedback-gmp maybe-all-stagefeedback-gmp
+.PHONY: clean-stagefeedback-gmp maybe-clean-stagefeedback-gmp
+maybe-all-stagefeedback-gmp:
+maybe-clean-stagefeedback-gmp:
+@if gmp-bootstrap
+maybe-all-stagefeedback-gmp: all-stagefeedback-gmp
+all-stagefeedback: all-stagefeedback-gmp
+TARGET-stagefeedback-gmp = $(TARGET-gmp)
+all-stagefeedback-gmp: configure-stagefeedback-gmp
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gmp && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-gmp)
+
+maybe-clean-stagefeedback-gmp: clean-stagefeedback-gmp
+clean-stagefeedback: clean-stagefeedback-gmp
+clean-stagefeedback-gmp:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stagefeedback-gmp/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gmp && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif gmp-bootstrap
+
+
+
+
+
+.PHONY: check-gmp maybe-check-gmp
+maybe-check-gmp:
+@if gmp
+maybe-check-gmp: check-gmp
+
+check-gmp:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gmp && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif gmp
+
+.PHONY: install-gmp maybe-install-gmp
+maybe-install-gmp:
+@if gmp
+maybe-install-gmp: install-gmp
+
+install-gmp:
+
+@endif gmp
+
+.PHONY: install-strip-gmp maybe-install-strip-gmp
+maybe-install-strip-gmp:
+@if gmp
+maybe-install-strip-gmp: install-strip-gmp
+
+install-strip-gmp:
+
+@endif gmp
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-gmp info-gmp
+maybe-info-gmp:
+@if gmp
+maybe-info-gmp: info-gmp
+
+info-gmp: \
+    configure-gmp 
+	@[ -f ./gmp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in gmp" ; \
+	(cd $(HOST_SUBDIR)/gmp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif gmp
+
+.PHONY: maybe-dvi-gmp dvi-gmp
+maybe-dvi-gmp:
+@if gmp
+maybe-dvi-gmp: dvi-gmp
+
+dvi-gmp: \
+    configure-gmp 
+	@[ -f ./gmp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in gmp" ; \
+	(cd $(HOST_SUBDIR)/gmp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif gmp
+
+.PHONY: maybe-pdf-gmp pdf-gmp
+maybe-pdf-gmp:
+@if gmp
+maybe-pdf-gmp: pdf-gmp
+
+pdf-gmp: \
+    configure-gmp 
+	@[ -f ./gmp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in gmp" ; \
+	(cd $(HOST_SUBDIR)/gmp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif gmp
+
+.PHONY: maybe-html-gmp html-gmp
+maybe-html-gmp:
+@if gmp
+maybe-html-gmp: html-gmp
+
+html-gmp: \
+    configure-gmp 
+	@[ -f ./gmp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in gmp" ; \
+	(cd $(HOST_SUBDIR)/gmp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif gmp
+
+.PHONY: maybe-TAGS-gmp TAGS-gmp
+maybe-TAGS-gmp:
+@if gmp
+maybe-TAGS-gmp: TAGS-gmp
+
+TAGS-gmp: \
+    configure-gmp 
+	@[ -f ./gmp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in gmp" ; \
+	(cd $(HOST_SUBDIR)/gmp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif gmp
+
+.PHONY: maybe-install-info-gmp install-info-gmp
+maybe-install-info-gmp:
+@if gmp
+maybe-install-info-gmp: install-info-gmp
+
+install-info-gmp: \
+    configure-gmp \
+    info-gmp 
+	@[ -f ./gmp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in gmp" ; \
+	(cd $(HOST_SUBDIR)/gmp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif gmp
+
+.PHONY: maybe-install-pdf-gmp install-pdf-gmp
+maybe-install-pdf-gmp:
+@if gmp
+maybe-install-pdf-gmp: install-pdf-gmp
+
+install-pdf-gmp: \
+    configure-gmp \
+    pdf-gmp 
+	@[ -f ./gmp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in gmp" ; \
+	(cd $(HOST_SUBDIR)/gmp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif gmp
+
+.PHONY: maybe-install-html-gmp install-html-gmp
+maybe-install-html-gmp:
+@if gmp
+maybe-install-html-gmp: install-html-gmp
+
+install-html-gmp: \
+    configure-gmp \
+    html-gmp 
+	@[ -f ./gmp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in gmp" ; \
+	(cd $(HOST_SUBDIR)/gmp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif gmp
+
+.PHONY: maybe-installcheck-gmp installcheck-gmp
+maybe-installcheck-gmp:
+@if gmp
+maybe-installcheck-gmp: installcheck-gmp
+
+installcheck-gmp: \
+    configure-gmp 
+	@[ -f ./gmp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in gmp" ; \
+	(cd $(HOST_SUBDIR)/gmp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif gmp
+
+.PHONY: maybe-mostlyclean-gmp mostlyclean-gmp
+maybe-mostlyclean-gmp:
+@if gmp
+maybe-mostlyclean-gmp: mostlyclean-gmp
+
+mostlyclean-gmp: 
+	@[ -f ./gmp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in gmp" ; \
+	(cd $(HOST_SUBDIR)/gmp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif gmp
+
+.PHONY: maybe-clean-gmp clean-gmp
+maybe-clean-gmp:
+@if gmp
+maybe-clean-gmp: clean-gmp
+
+clean-gmp: 
+	@[ -f ./gmp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in gmp" ; \
+	(cd $(HOST_SUBDIR)/gmp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif gmp
+
+.PHONY: maybe-distclean-gmp distclean-gmp
+maybe-distclean-gmp:
+@if gmp
+maybe-distclean-gmp: distclean-gmp
+
+distclean-gmp: 
+	@[ -f ./gmp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in gmp" ; \
+	(cd $(HOST_SUBDIR)/gmp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif gmp
+
+.PHONY: maybe-maintainer-clean-gmp maintainer-clean-gmp
+maybe-maintainer-clean-gmp:
+@if gmp
+maybe-maintainer-clean-gmp: maintainer-clean-gmp
+
+maintainer-clean-gmp: 
+	@[ -f ./gmp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in gmp" ; \
+	(cd $(HOST_SUBDIR)/gmp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif gmp
+
+
+
+.PHONY: configure-mpfr maybe-configure-mpfr
+maybe-configure-mpfr:
+@if gcc-bootstrap
+configure-mpfr: stage_current
+@endif gcc-bootstrap
+@if mpfr
+maybe-configure-mpfr: configure-mpfr
+configure-mpfr: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/mpfr; \
+	cd "$(HOST_SUBDIR)/mpfr" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/mpfr"; \
+	libsrcdir="$$s/mpfr"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} --disable-shared @extra_mpfr_configure_flags@ \
+	  || exit 1
+@endif mpfr
+
+
+
+.PHONY: configure-stage1-mpfr maybe-configure-stage1-mpfr
+maybe-configure-stage1-mpfr:
+@if mpfr-bootstrap
+maybe-configure-stage1-mpfr: configure-stage1-mpfr
+configure-stage1-mpfr:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(HOST_SUBDIR)/mpfr ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+	cd $(HOST_SUBDIR)/mpfr || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/mpfr"; \
+	libsrcdir="$$s/mpfr"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS) \
+	  --disable-shared @extra_mpfr_configure_flags@
+@endif mpfr-bootstrap
+
+.PHONY: configure-stage2-mpfr maybe-configure-stage2-mpfr
+maybe-configure-stage2-mpfr:
+@if mpfr-bootstrap
+maybe-configure-stage2-mpfr: configure-stage2-mpfr
+configure-stage2-mpfr:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(HOST_SUBDIR)/mpfr ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+	cd $(HOST_SUBDIR)/mpfr || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/mpfr"; \
+	libsrcdir="$$s/mpfr"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS) \
+	  --disable-shared @extra_mpfr_configure_flags@
+@endif mpfr-bootstrap
+
+.PHONY: configure-stage3-mpfr maybe-configure-stage3-mpfr
+maybe-configure-stage3-mpfr:
+@if mpfr-bootstrap
+maybe-configure-stage3-mpfr: configure-stage3-mpfr
+configure-stage3-mpfr:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(HOST_SUBDIR)/mpfr ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+	cd $(HOST_SUBDIR)/mpfr || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/mpfr"; \
+	libsrcdir="$$s/mpfr"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS) \
+	  --disable-shared @extra_mpfr_configure_flags@
+@endif mpfr-bootstrap
+
+.PHONY: configure-stage4-mpfr maybe-configure-stage4-mpfr
+maybe-configure-stage4-mpfr:
+@if mpfr-bootstrap
+maybe-configure-stage4-mpfr: configure-stage4-mpfr
+configure-stage4-mpfr:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(HOST_SUBDIR)/mpfr ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+	cd $(HOST_SUBDIR)/mpfr || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/mpfr"; \
+	libsrcdir="$$s/mpfr"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS) \
+	  --disable-shared @extra_mpfr_configure_flags@
+@endif mpfr-bootstrap
+
+.PHONY: configure-stageprofile-mpfr maybe-configure-stageprofile-mpfr
+maybe-configure-stageprofile-mpfr:
+@if mpfr-bootstrap
+maybe-configure-stageprofile-mpfr: configure-stageprofile-mpfr
+configure-stageprofile-mpfr:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(HOST_SUBDIR)/mpfr ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+	cd $(HOST_SUBDIR)/mpfr || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/mpfr"; \
+	libsrcdir="$$s/mpfr"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS) \
+	  --disable-shared @extra_mpfr_configure_flags@
+@endif mpfr-bootstrap
+
+.PHONY: configure-stagefeedback-mpfr maybe-configure-stagefeedback-mpfr
+maybe-configure-stagefeedback-mpfr:
+@if mpfr-bootstrap
+maybe-configure-stagefeedback-mpfr: configure-stagefeedback-mpfr
+configure-stagefeedback-mpfr:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(HOST_SUBDIR)/mpfr ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+	cd $(HOST_SUBDIR)/mpfr || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/mpfr"; \
+	libsrcdir="$$s/mpfr"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS) \
+	  --disable-shared @extra_mpfr_configure_flags@
+@endif mpfr-bootstrap
+
+
+
+
+
+.PHONY: all-mpfr maybe-all-mpfr
+maybe-all-mpfr:
+@if gcc-bootstrap
+all-mpfr: stage_current
+@endif gcc-bootstrap
+@if mpfr
+TARGET-mpfr=all
+maybe-all-mpfr: all-mpfr
+all-mpfr: configure-mpfr
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/mpfr && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-mpfr))
+@endif mpfr
+
+
+
+.PHONY: all-stage1-mpfr maybe-all-stage1-mpfr
+.PHONY: clean-stage1-mpfr maybe-clean-stage1-mpfr
+maybe-all-stage1-mpfr:
+maybe-clean-stage1-mpfr:
+@if mpfr-bootstrap
+maybe-all-stage1-mpfr: all-stage1-mpfr
+all-stage1: all-stage1-mpfr
+TARGET-stage1-mpfr = $(TARGET-mpfr)
+all-stage1-mpfr: configure-stage1-mpfr
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/mpfr && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-mpfr)
+
+maybe-clean-stage1-mpfr: clean-stage1-mpfr
+clean-stage1: clean-stage1-mpfr
+clean-stage1-mpfr:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage1-mpfr/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/mpfr && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		 clean
+@endif mpfr-bootstrap
+
+
+.PHONY: all-stage2-mpfr maybe-all-stage2-mpfr
+.PHONY: clean-stage2-mpfr maybe-clean-stage2-mpfr
+maybe-all-stage2-mpfr:
+maybe-clean-stage2-mpfr:
+@if mpfr-bootstrap
+maybe-all-stage2-mpfr: all-stage2-mpfr
+all-stage2: all-stage2-mpfr
+TARGET-stage2-mpfr = $(TARGET-mpfr)
+all-stage2-mpfr: configure-stage2-mpfr
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/mpfr && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-mpfr)
+
+maybe-clean-stage2-mpfr: clean-stage2-mpfr
+clean-stage2: clean-stage2-mpfr
+clean-stage2-mpfr:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage2-mpfr/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/mpfr && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif mpfr-bootstrap
+
+
+.PHONY: all-stage3-mpfr maybe-all-stage3-mpfr
+.PHONY: clean-stage3-mpfr maybe-clean-stage3-mpfr
+maybe-all-stage3-mpfr:
+maybe-clean-stage3-mpfr:
+@if mpfr-bootstrap
+maybe-all-stage3-mpfr: all-stage3-mpfr
+all-stage3: all-stage3-mpfr
+TARGET-stage3-mpfr = $(TARGET-mpfr)
+all-stage3-mpfr: configure-stage3-mpfr
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/mpfr && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-mpfr)
+
+maybe-clean-stage3-mpfr: clean-stage3-mpfr
+clean-stage3: clean-stage3-mpfr
+clean-stage3-mpfr:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage3-mpfr/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/mpfr && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif mpfr-bootstrap
+
+
+.PHONY: all-stage4-mpfr maybe-all-stage4-mpfr
+.PHONY: clean-stage4-mpfr maybe-clean-stage4-mpfr
+maybe-all-stage4-mpfr:
+maybe-clean-stage4-mpfr:
+@if mpfr-bootstrap
+maybe-all-stage4-mpfr: all-stage4-mpfr
+all-stage4: all-stage4-mpfr
+TARGET-stage4-mpfr = $(TARGET-mpfr)
+all-stage4-mpfr: configure-stage4-mpfr
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/mpfr && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE4_CFLAGS)" \
+		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-mpfr)
+
+maybe-clean-stage4-mpfr: clean-stage4-mpfr
+clean-stage4: clean-stage4-mpfr
+clean-stage4-mpfr:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage4-mpfr/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/mpfr && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif mpfr-bootstrap
+
+
+.PHONY: all-stageprofile-mpfr maybe-all-stageprofile-mpfr
+.PHONY: clean-stageprofile-mpfr maybe-clean-stageprofile-mpfr
+maybe-all-stageprofile-mpfr:
+maybe-clean-stageprofile-mpfr:
+@if mpfr-bootstrap
+maybe-all-stageprofile-mpfr: all-stageprofile-mpfr
+all-stageprofile: all-stageprofile-mpfr
+TARGET-stageprofile-mpfr = $(TARGET-mpfr)
+all-stageprofile-mpfr: configure-stageprofile-mpfr
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/mpfr && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-mpfr)
+
+maybe-clean-stageprofile-mpfr: clean-stageprofile-mpfr
+clean-stageprofile: clean-stageprofile-mpfr
+clean-stageprofile-mpfr:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stageprofile-mpfr/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/mpfr && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif mpfr-bootstrap
+
+
+.PHONY: all-stagefeedback-mpfr maybe-all-stagefeedback-mpfr
+.PHONY: clean-stagefeedback-mpfr maybe-clean-stagefeedback-mpfr
+maybe-all-stagefeedback-mpfr:
+maybe-clean-stagefeedback-mpfr:
+@if mpfr-bootstrap
+maybe-all-stagefeedback-mpfr: all-stagefeedback-mpfr
+all-stagefeedback: all-stagefeedback-mpfr
+TARGET-stagefeedback-mpfr = $(TARGET-mpfr)
+all-stagefeedback-mpfr: configure-stagefeedback-mpfr
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/mpfr && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-mpfr)
+
+maybe-clean-stagefeedback-mpfr: clean-stagefeedback-mpfr
+clean-stagefeedback: clean-stagefeedback-mpfr
+clean-stagefeedback-mpfr:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stagefeedback-mpfr/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/mpfr && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif mpfr-bootstrap
+
+
+
+
+
+.PHONY: check-mpfr maybe-check-mpfr
+maybe-check-mpfr:
+@if mpfr
+maybe-check-mpfr: check-mpfr
+
+check-mpfr:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/mpfr && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif mpfr
+
+.PHONY: install-mpfr maybe-install-mpfr
+maybe-install-mpfr:
+@if mpfr
+maybe-install-mpfr: install-mpfr
+
+install-mpfr:
+
+@endif mpfr
+
+.PHONY: install-strip-mpfr maybe-install-strip-mpfr
+maybe-install-strip-mpfr:
+@if mpfr
+maybe-install-strip-mpfr: install-strip-mpfr
+
+install-strip-mpfr:
+
+@endif mpfr
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-mpfr info-mpfr
+maybe-info-mpfr:
+@if mpfr
+maybe-info-mpfr: info-mpfr
+
+info-mpfr: \
+    configure-mpfr 
+	@[ -f ./mpfr/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in mpfr" ; \
+	(cd $(HOST_SUBDIR)/mpfr && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif mpfr
+
+.PHONY: maybe-dvi-mpfr dvi-mpfr
+maybe-dvi-mpfr:
+@if mpfr
+maybe-dvi-mpfr: dvi-mpfr
+
+dvi-mpfr: \
+    configure-mpfr 
+	@[ -f ./mpfr/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in mpfr" ; \
+	(cd $(HOST_SUBDIR)/mpfr && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif mpfr
+
+.PHONY: maybe-pdf-mpfr pdf-mpfr
+maybe-pdf-mpfr:
+@if mpfr
+maybe-pdf-mpfr: pdf-mpfr
+
+pdf-mpfr: \
+    configure-mpfr 
+	@[ -f ./mpfr/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in mpfr" ; \
+	(cd $(HOST_SUBDIR)/mpfr && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif mpfr
+
+.PHONY: maybe-html-mpfr html-mpfr
+maybe-html-mpfr:
+@if mpfr
+maybe-html-mpfr: html-mpfr
+
+html-mpfr: \
+    configure-mpfr 
+	@[ -f ./mpfr/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in mpfr" ; \
+	(cd $(HOST_SUBDIR)/mpfr && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif mpfr
+
+.PHONY: maybe-TAGS-mpfr TAGS-mpfr
+maybe-TAGS-mpfr:
+@if mpfr
+maybe-TAGS-mpfr: TAGS-mpfr
+
+TAGS-mpfr: \
+    configure-mpfr 
+	@[ -f ./mpfr/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in mpfr" ; \
+	(cd $(HOST_SUBDIR)/mpfr && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif mpfr
+
+.PHONY: maybe-install-info-mpfr install-info-mpfr
+maybe-install-info-mpfr:
+@if mpfr
+maybe-install-info-mpfr: install-info-mpfr
+
+install-info-mpfr: \
+    configure-mpfr \
+    info-mpfr 
+	@[ -f ./mpfr/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in mpfr" ; \
+	(cd $(HOST_SUBDIR)/mpfr && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif mpfr
+
+.PHONY: maybe-install-pdf-mpfr install-pdf-mpfr
+maybe-install-pdf-mpfr:
+@if mpfr
+maybe-install-pdf-mpfr: install-pdf-mpfr
+
+install-pdf-mpfr: \
+    configure-mpfr \
+    pdf-mpfr 
+	@[ -f ./mpfr/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in mpfr" ; \
+	(cd $(HOST_SUBDIR)/mpfr && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif mpfr
+
+.PHONY: maybe-install-html-mpfr install-html-mpfr
+maybe-install-html-mpfr:
+@if mpfr
+maybe-install-html-mpfr: install-html-mpfr
+
+install-html-mpfr: \
+    configure-mpfr \
+    html-mpfr 
+	@[ -f ./mpfr/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in mpfr" ; \
+	(cd $(HOST_SUBDIR)/mpfr && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif mpfr
+
+.PHONY: maybe-installcheck-mpfr installcheck-mpfr
+maybe-installcheck-mpfr:
+@if mpfr
+maybe-installcheck-mpfr: installcheck-mpfr
+
+installcheck-mpfr: \
+    configure-mpfr 
+	@[ -f ./mpfr/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in mpfr" ; \
+	(cd $(HOST_SUBDIR)/mpfr && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif mpfr
+
+.PHONY: maybe-mostlyclean-mpfr mostlyclean-mpfr
+maybe-mostlyclean-mpfr:
+@if mpfr
+maybe-mostlyclean-mpfr: mostlyclean-mpfr
+
+mostlyclean-mpfr: 
+	@[ -f ./mpfr/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in mpfr" ; \
+	(cd $(HOST_SUBDIR)/mpfr && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif mpfr
+
+.PHONY: maybe-clean-mpfr clean-mpfr
+maybe-clean-mpfr:
+@if mpfr
+maybe-clean-mpfr: clean-mpfr
+
+clean-mpfr: 
+	@[ -f ./mpfr/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in mpfr" ; \
+	(cd $(HOST_SUBDIR)/mpfr && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif mpfr
+
+.PHONY: maybe-distclean-mpfr distclean-mpfr
+maybe-distclean-mpfr:
+@if mpfr
+maybe-distclean-mpfr: distclean-mpfr
+
+distclean-mpfr: 
+	@[ -f ./mpfr/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in mpfr" ; \
+	(cd $(HOST_SUBDIR)/mpfr && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif mpfr
+
+.PHONY: maybe-maintainer-clean-mpfr maintainer-clean-mpfr
+maybe-maintainer-clean-mpfr:
+@if mpfr
+maybe-maintainer-clean-mpfr: maintainer-clean-mpfr
+
+maintainer-clean-mpfr: 
+	@[ -f ./mpfr/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in mpfr" ; \
+	(cd $(HOST_SUBDIR)/mpfr && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif mpfr
+
+
+
+.PHONY: configure-mpc maybe-configure-mpc
+maybe-configure-mpc:
+@if gcc-bootstrap
+configure-mpc: stage_current
+@endif gcc-bootstrap
+@if mpc
+maybe-configure-mpc: configure-mpc
+configure-mpc: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/mpc; \
+	cd "$(HOST_SUBDIR)/mpc" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/mpc"; \
+	libsrcdir="$$s/mpc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \
+	  || exit 1
+@endif mpc
+
+
+
+.PHONY: configure-stage1-mpc maybe-configure-stage1-mpc
+maybe-configure-stage1-mpc:
+@if mpc-bootstrap
+maybe-configure-stage1-mpc: configure-stage1-mpc
+configure-stage1-mpc:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(HOST_SUBDIR)/mpc ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+	cd $(HOST_SUBDIR)/mpc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/mpc"; \
+	libsrcdir="$$s/mpc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS) \
+	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
+@endif mpc-bootstrap
+
+.PHONY: configure-stage2-mpc maybe-configure-stage2-mpc
+maybe-configure-stage2-mpc:
+@if mpc-bootstrap
+maybe-configure-stage2-mpc: configure-stage2-mpc
+configure-stage2-mpc:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(HOST_SUBDIR)/mpc ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+	cd $(HOST_SUBDIR)/mpc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/mpc"; \
+	libsrcdir="$$s/mpc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS) \
+	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
+@endif mpc-bootstrap
+
+.PHONY: configure-stage3-mpc maybe-configure-stage3-mpc
+maybe-configure-stage3-mpc:
+@if mpc-bootstrap
+maybe-configure-stage3-mpc: configure-stage3-mpc
+configure-stage3-mpc:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(HOST_SUBDIR)/mpc ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+	cd $(HOST_SUBDIR)/mpc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/mpc"; \
+	libsrcdir="$$s/mpc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS) \
+	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
+@endif mpc-bootstrap
+
+.PHONY: configure-stage4-mpc maybe-configure-stage4-mpc
+maybe-configure-stage4-mpc:
+@if mpc-bootstrap
+maybe-configure-stage4-mpc: configure-stage4-mpc
+configure-stage4-mpc:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(HOST_SUBDIR)/mpc ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+	cd $(HOST_SUBDIR)/mpc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/mpc"; \
+	libsrcdir="$$s/mpc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS) \
+	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
+@endif mpc-bootstrap
+
+.PHONY: configure-stageprofile-mpc maybe-configure-stageprofile-mpc
+maybe-configure-stageprofile-mpc:
+@if mpc-bootstrap
+maybe-configure-stageprofile-mpc: configure-stageprofile-mpc
+configure-stageprofile-mpc:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(HOST_SUBDIR)/mpc ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+	cd $(HOST_SUBDIR)/mpc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/mpc"; \
+	libsrcdir="$$s/mpc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS) \
+	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
+@endif mpc-bootstrap
+
+.PHONY: configure-stagefeedback-mpc maybe-configure-stagefeedback-mpc
+maybe-configure-stagefeedback-mpc:
+@if mpc-bootstrap
+maybe-configure-stagefeedback-mpc: configure-stagefeedback-mpc
+configure-stagefeedback-mpc:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(HOST_SUBDIR)/mpc ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+	cd $(HOST_SUBDIR)/mpc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/mpc"; \
+	libsrcdir="$$s/mpc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS) \
+	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
+@endif mpc-bootstrap
+
+
+
+
+
+.PHONY: all-mpc maybe-all-mpc
+maybe-all-mpc:
+@if gcc-bootstrap
+all-mpc: stage_current
+@endif gcc-bootstrap
+@if mpc
+TARGET-mpc=all
+maybe-all-mpc: all-mpc
+all-mpc: configure-mpc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/mpc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-mpc))
+@endif mpc
+
+
+
+.PHONY: all-stage1-mpc maybe-all-stage1-mpc
+.PHONY: clean-stage1-mpc maybe-clean-stage1-mpc
+maybe-all-stage1-mpc:
+maybe-clean-stage1-mpc:
+@if mpc-bootstrap
+maybe-all-stage1-mpc: all-stage1-mpc
+all-stage1: all-stage1-mpc
+TARGET-stage1-mpc = $(TARGET-mpc)
+all-stage1-mpc: configure-stage1-mpc
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/mpc && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-mpc)
+
+maybe-clean-stage1-mpc: clean-stage1-mpc
+clean-stage1: clean-stage1-mpc
+clean-stage1-mpc:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage1-mpc/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/mpc && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		 clean
+@endif mpc-bootstrap
+
+
+.PHONY: all-stage2-mpc maybe-all-stage2-mpc
+.PHONY: clean-stage2-mpc maybe-clean-stage2-mpc
+maybe-all-stage2-mpc:
+maybe-clean-stage2-mpc:
+@if mpc-bootstrap
+maybe-all-stage2-mpc: all-stage2-mpc
+all-stage2: all-stage2-mpc
+TARGET-stage2-mpc = $(TARGET-mpc)
+all-stage2-mpc: configure-stage2-mpc
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/mpc && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-mpc)
+
+maybe-clean-stage2-mpc: clean-stage2-mpc
+clean-stage2: clean-stage2-mpc
+clean-stage2-mpc:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage2-mpc/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/mpc && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif mpc-bootstrap
+
+
+.PHONY: all-stage3-mpc maybe-all-stage3-mpc
+.PHONY: clean-stage3-mpc maybe-clean-stage3-mpc
+maybe-all-stage3-mpc:
+maybe-clean-stage3-mpc:
+@if mpc-bootstrap
+maybe-all-stage3-mpc: all-stage3-mpc
+all-stage3: all-stage3-mpc
+TARGET-stage3-mpc = $(TARGET-mpc)
+all-stage3-mpc: configure-stage3-mpc
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/mpc && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-mpc)
+
+maybe-clean-stage3-mpc: clean-stage3-mpc
+clean-stage3: clean-stage3-mpc
+clean-stage3-mpc:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage3-mpc/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/mpc && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif mpc-bootstrap
+
+
+.PHONY: all-stage4-mpc maybe-all-stage4-mpc
+.PHONY: clean-stage4-mpc maybe-clean-stage4-mpc
+maybe-all-stage4-mpc:
+maybe-clean-stage4-mpc:
+@if mpc-bootstrap
+maybe-all-stage4-mpc: all-stage4-mpc
+all-stage4: all-stage4-mpc
+TARGET-stage4-mpc = $(TARGET-mpc)
+all-stage4-mpc: configure-stage4-mpc
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/mpc && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE4_CFLAGS)" \
+		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-mpc)
+
+maybe-clean-stage4-mpc: clean-stage4-mpc
+clean-stage4: clean-stage4-mpc
+clean-stage4-mpc:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage4-mpc/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/mpc && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif mpc-bootstrap
+
+
+.PHONY: all-stageprofile-mpc maybe-all-stageprofile-mpc
+.PHONY: clean-stageprofile-mpc maybe-clean-stageprofile-mpc
+maybe-all-stageprofile-mpc:
+maybe-clean-stageprofile-mpc:
+@if mpc-bootstrap
+maybe-all-stageprofile-mpc: all-stageprofile-mpc
+all-stageprofile: all-stageprofile-mpc
+TARGET-stageprofile-mpc = $(TARGET-mpc)
+all-stageprofile-mpc: configure-stageprofile-mpc
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/mpc && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-mpc)
+
+maybe-clean-stageprofile-mpc: clean-stageprofile-mpc
+clean-stageprofile: clean-stageprofile-mpc
+clean-stageprofile-mpc:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stageprofile-mpc/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/mpc && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif mpc-bootstrap
+
+
+.PHONY: all-stagefeedback-mpc maybe-all-stagefeedback-mpc
+.PHONY: clean-stagefeedback-mpc maybe-clean-stagefeedback-mpc
+maybe-all-stagefeedback-mpc:
+maybe-clean-stagefeedback-mpc:
+@if mpc-bootstrap
+maybe-all-stagefeedback-mpc: all-stagefeedback-mpc
+all-stagefeedback: all-stagefeedback-mpc
+TARGET-stagefeedback-mpc = $(TARGET-mpc)
+all-stagefeedback-mpc: configure-stagefeedback-mpc
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/mpc && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-mpc)
+
+maybe-clean-stagefeedback-mpc: clean-stagefeedback-mpc
+clean-stagefeedback: clean-stagefeedback-mpc
+clean-stagefeedback-mpc:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stagefeedback-mpc/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/mpc && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif mpc-bootstrap
+
+
+
+
+
+.PHONY: check-mpc maybe-check-mpc
+maybe-check-mpc:
+@if mpc
+maybe-check-mpc: check-mpc
+
+check-mpc:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/mpc && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif mpc
+
+.PHONY: install-mpc maybe-install-mpc
+maybe-install-mpc:
+@if mpc
+maybe-install-mpc: install-mpc
+
+install-mpc:
+
+@endif mpc
+
+.PHONY: install-strip-mpc maybe-install-strip-mpc
+maybe-install-strip-mpc:
+@if mpc
+maybe-install-strip-mpc: install-strip-mpc
+
+install-strip-mpc:
+
+@endif mpc
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-mpc info-mpc
+maybe-info-mpc:
+@if mpc
+maybe-info-mpc: info-mpc
+
+info-mpc: \
+    configure-mpc 
+	@[ -f ./mpc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in mpc" ; \
+	(cd $(HOST_SUBDIR)/mpc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif mpc
+
+.PHONY: maybe-dvi-mpc dvi-mpc
+maybe-dvi-mpc:
+@if mpc
+maybe-dvi-mpc: dvi-mpc
+
+dvi-mpc: \
+    configure-mpc 
+	@[ -f ./mpc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in mpc" ; \
+	(cd $(HOST_SUBDIR)/mpc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif mpc
+
+.PHONY: maybe-pdf-mpc pdf-mpc
+maybe-pdf-mpc:
+@if mpc
+maybe-pdf-mpc: pdf-mpc
+
+pdf-mpc: \
+    configure-mpc 
+	@[ -f ./mpc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in mpc" ; \
+	(cd $(HOST_SUBDIR)/mpc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif mpc
+
+.PHONY: maybe-html-mpc html-mpc
+maybe-html-mpc:
+@if mpc
+maybe-html-mpc: html-mpc
+
+html-mpc: \
+    configure-mpc 
+	@[ -f ./mpc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in mpc" ; \
+	(cd $(HOST_SUBDIR)/mpc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif mpc
+
+.PHONY: maybe-TAGS-mpc TAGS-mpc
+maybe-TAGS-mpc:
+@if mpc
+maybe-TAGS-mpc: TAGS-mpc
+
+TAGS-mpc: \
+    configure-mpc 
+	@[ -f ./mpc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in mpc" ; \
+	(cd $(HOST_SUBDIR)/mpc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif mpc
+
+.PHONY: maybe-install-info-mpc install-info-mpc
+maybe-install-info-mpc:
+@if mpc
+maybe-install-info-mpc: install-info-mpc
+
+install-info-mpc: \
+    configure-mpc \
+    info-mpc 
+	@[ -f ./mpc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in mpc" ; \
+	(cd $(HOST_SUBDIR)/mpc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif mpc
+
+.PHONY: maybe-install-pdf-mpc install-pdf-mpc
+maybe-install-pdf-mpc:
+@if mpc
+maybe-install-pdf-mpc: install-pdf-mpc
+
+install-pdf-mpc: \
+    configure-mpc \
+    pdf-mpc 
+	@[ -f ./mpc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in mpc" ; \
+	(cd $(HOST_SUBDIR)/mpc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif mpc
+
+.PHONY: maybe-install-html-mpc install-html-mpc
+maybe-install-html-mpc:
+@if mpc
+maybe-install-html-mpc: install-html-mpc
+
+install-html-mpc: \
+    configure-mpc \
+    html-mpc 
+	@[ -f ./mpc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in mpc" ; \
+	(cd $(HOST_SUBDIR)/mpc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif mpc
+
+.PHONY: maybe-installcheck-mpc installcheck-mpc
+maybe-installcheck-mpc:
+@if mpc
+maybe-installcheck-mpc: installcheck-mpc
+
+installcheck-mpc: \
+    configure-mpc 
+	@[ -f ./mpc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in mpc" ; \
+	(cd $(HOST_SUBDIR)/mpc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif mpc
+
+.PHONY: maybe-mostlyclean-mpc mostlyclean-mpc
+maybe-mostlyclean-mpc:
+@if mpc
+maybe-mostlyclean-mpc: mostlyclean-mpc
+
+mostlyclean-mpc: 
+	@[ -f ./mpc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in mpc" ; \
+	(cd $(HOST_SUBDIR)/mpc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif mpc
+
+.PHONY: maybe-clean-mpc clean-mpc
+maybe-clean-mpc:
+@if mpc
+maybe-clean-mpc: clean-mpc
+
+clean-mpc: 
+	@[ -f ./mpc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in mpc" ; \
+	(cd $(HOST_SUBDIR)/mpc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif mpc
+
+.PHONY: maybe-distclean-mpc distclean-mpc
+maybe-distclean-mpc:
+@if mpc
+maybe-distclean-mpc: distclean-mpc
+
+distclean-mpc: 
+	@[ -f ./mpc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in mpc" ; \
+	(cd $(HOST_SUBDIR)/mpc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif mpc
+
+.PHONY: maybe-maintainer-clean-mpc maintainer-clean-mpc
+maybe-maintainer-clean-mpc:
+@if mpc
+maybe-maintainer-clean-mpc: maintainer-clean-mpc
+
+maintainer-clean-mpc: 
+	@[ -f ./mpc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in mpc" ; \
+	(cd $(HOST_SUBDIR)/mpc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif mpc
+
+
+
+.PHONY: configure-ppl maybe-configure-ppl
+maybe-configure-ppl:
+@if gcc-bootstrap
+configure-ppl: stage_current
+@endif gcc-bootstrap
+@if ppl
+maybe-configure-ppl: configure-ppl
+configure-ppl: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/ppl; \
+	cd "$(HOST_SUBDIR)/ppl" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/ppl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/ppl"; \
+	libsrcdir="$$s/ppl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ \
+	  || exit 1
+@endif ppl
+
+
+
+.PHONY: configure-stage1-ppl maybe-configure-stage1-ppl
+maybe-configure-stage1-ppl:
+@if ppl-bootstrap
+maybe-configure-stage1-ppl: configure-stage1-ppl
+configure-stage1-ppl:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(HOST_SUBDIR)/ppl ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
+	cd $(HOST_SUBDIR)/ppl || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/ppl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/ppl"; \
+	libsrcdir="$$s/ppl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS) \
+	  --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
+@endif ppl-bootstrap
+
+.PHONY: configure-stage2-ppl maybe-configure-stage2-ppl
+maybe-configure-stage2-ppl:
+@if ppl-bootstrap
+maybe-configure-stage2-ppl: configure-stage2-ppl
+configure-stage2-ppl:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(HOST_SUBDIR)/ppl ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
+	cd $(HOST_SUBDIR)/ppl || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/ppl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/ppl"; \
+	libsrcdir="$$s/ppl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS) \
+	  --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
+@endif ppl-bootstrap
+
+.PHONY: configure-stage3-ppl maybe-configure-stage3-ppl
+maybe-configure-stage3-ppl:
+@if ppl-bootstrap
+maybe-configure-stage3-ppl: configure-stage3-ppl
+configure-stage3-ppl:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(HOST_SUBDIR)/ppl ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
+	cd $(HOST_SUBDIR)/ppl || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/ppl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/ppl"; \
+	libsrcdir="$$s/ppl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS) \
+	  --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
+@endif ppl-bootstrap
+
+.PHONY: configure-stage4-ppl maybe-configure-stage4-ppl
+maybe-configure-stage4-ppl:
+@if ppl-bootstrap
+maybe-configure-stage4-ppl: configure-stage4-ppl
+configure-stage4-ppl:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(HOST_SUBDIR)/ppl ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
+	cd $(HOST_SUBDIR)/ppl || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/ppl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/ppl"; \
+	libsrcdir="$$s/ppl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS) \
+	  --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
+@endif ppl-bootstrap
+
+.PHONY: configure-stageprofile-ppl maybe-configure-stageprofile-ppl
+maybe-configure-stageprofile-ppl:
+@if ppl-bootstrap
+maybe-configure-stageprofile-ppl: configure-stageprofile-ppl
+configure-stageprofile-ppl:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(HOST_SUBDIR)/ppl ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
+	cd $(HOST_SUBDIR)/ppl || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/ppl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/ppl"; \
+	libsrcdir="$$s/ppl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS) \
+	  --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
+@endif ppl-bootstrap
+
+.PHONY: configure-stagefeedback-ppl maybe-configure-stagefeedback-ppl
+maybe-configure-stagefeedback-ppl:
+@if ppl-bootstrap
+maybe-configure-stagefeedback-ppl: configure-stagefeedback-ppl
+configure-stagefeedback-ppl:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(HOST_SUBDIR)/ppl ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
+	cd $(HOST_SUBDIR)/ppl || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/ppl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/ppl"; \
+	libsrcdir="$$s/ppl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS) \
+	  --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
+@endif ppl-bootstrap
+
+
+
+
+
+.PHONY: all-ppl maybe-all-ppl
+maybe-all-ppl:
+@if gcc-bootstrap
+all-ppl: stage_current
+@endif gcc-bootstrap
+@if ppl
+TARGET-ppl=all
+maybe-all-ppl: all-ppl
+all-ppl: configure-ppl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/ppl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-ppl))
+@endif ppl
+
+
+
+.PHONY: all-stage1-ppl maybe-all-stage1-ppl
+.PHONY: clean-stage1-ppl maybe-clean-stage1-ppl
+maybe-all-stage1-ppl:
+maybe-clean-stage1-ppl:
+@if ppl-bootstrap
+maybe-all-stage1-ppl: all-stage1-ppl
+all-stage1: all-stage1-ppl
+TARGET-stage1-ppl = $(TARGET-ppl)
+all-stage1-ppl: configure-stage1-ppl
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/ppl && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-ppl)
+
+maybe-clean-stage1-ppl: clean-stage1-ppl
+clean-stage1: clean-stage1-ppl
+clean-stage1-ppl:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage1-ppl/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/ppl && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		 clean
+@endif ppl-bootstrap
+
+
+.PHONY: all-stage2-ppl maybe-all-stage2-ppl
+.PHONY: clean-stage2-ppl maybe-clean-stage2-ppl
+maybe-all-stage2-ppl:
+maybe-clean-stage2-ppl:
+@if ppl-bootstrap
+maybe-all-stage2-ppl: all-stage2-ppl
+all-stage2: all-stage2-ppl
+TARGET-stage2-ppl = $(TARGET-ppl)
+all-stage2-ppl: configure-stage2-ppl
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/ppl && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-ppl)
+
+maybe-clean-stage2-ppl: clean-stage2-ppl
+clean-stage2: clean-stage2-ppl
+clean-stage2-ppl:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage2-ppl/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/ppl && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif ppl-bootstrap
+
+
+.PHONY: all-stage3-ppl maybe-all-stage3-ppl
+.PHONY: clean-stage3-ppl maybe-clean-stage3-ppl
+maybe-all-stage3-ppl:
+maybe-clean-stage3-ppl:
+@if ppl-bootstrap
+maybe-all-stage3-ppl: all-stage3-ppl
+all-stage3: all-stage3-ppl
+TARGET-stage3-ppl = $(TARGET-ppl)
+all-stage3-ppl: configure-stage3-ppl
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/ppl && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-ppl)
+
+maybe-clean-stage3-ppl: clean-stage3-ppl
+clean-stage3: clean-stage3-ppl
+clean-stage3-ppl:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage3-ppl/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/ppl && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif ppl-bootstrap
+
+
+.PHONY: all-stage4-ppl maybe-all-stage4-ppl
+.PHONY: clean-stage4-ppl maybe-clean-stage4-ppl
+maybe-all-stage4-ppl:
+maybe-clean-stage4-ppl:
+@if ppl-bootstrap
+maybe-all-stage4-ppl: all-stage4-ppl
+all-stage4: all-stage4-ppl
+TARGET-stage4-ppl = $(TARGET-ppl)
+all-stage4-ppl: configure-stage4-ppl
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/ppl && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE4_CFLAGS)" \
+		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-ppl)
+
+maybe-clean-stage4-ppl: clean-stage4-ppl
+clean-stage4: clean-stage4-ppl
+clean-stage4-ppl:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage4-ppl/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/ppl && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif ppl-bootstrap
+
+
+.PHONY: all-stageprofile-ppl maybe-all-stageprofile-ppl
+.PHONY: clean-stageprofile-ppl maybe-clean-stageprofile-ppl
+maybe-all-stageprofile-ppl:
+maybe-clean-stageprofile-ppl:
+@if ppl-bootstrap
+maybe-all-stageprofile-ppl: all-stageprofile-ppl
+all-stageprofile: all-stageprofile-ppl
+TARGET-stageprofile-ppl = $(TARGET-ppl)
+all-stageprofile-ppl: configure-stageprofile-ppl
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/ppl && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-ppl)
+
+maybe-clean-stageprofile-ppl: clean-stageprofile-ppl
+clean-stageprofile: clean-stageprofile-ppl
+clean-stageprofile-ppl:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stageprofile-ppl/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/ppl && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif ppl-bootstrap
+
+
+.PHONY: all-stagefeedback-ppl maybe-all-stagefeedback-ppl
+.PHONY: clean-stagefeedback-ppl maybe-clean-stagefeedback-ppl
+maybe-all-stagefeedback-ppl:
+maybe-clean-stagefeedback-ppl:
+@if ppl-bootstrap
+maybe-all-stagefeedback-ppl: all-stagefeedback-ppl
+all-stagefeedback: all-stagefeedback-ppl
+TARGET-stagefeedback-ppl = $(TARGET-ppl)
+all-stagefeedback-ppl: configure-stagefeedback-ppl
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/ppl && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-ppl)
+
+maybe-clean-stagefeedback-ppl: clean-stagefeedback-ppl
+clean-stagefeedback: clean-stagefeedback-ppl
+clean-stagefeedback-ppl:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stagefeedback-ppl/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/ppl && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif ppl-bootstrap
+
+
+
+
+
+.PHONY: check-ppl maybe-check-ppl
+maybe-check-ppl:
+@if ppl
+maybe-check-ppl: check-ppl
+
+check-ppl:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/ppl && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif ppl
+
+.PHONY: install-ppl maybe-install-ppl
+maybe-install-ppl:
+@if ppl
+maybe-install-ppl: install-ppl
+
+install-ppl:
+
+@endif ppl
+
+.PHONY: install-strip-ppl maybe-install-strip-ppl
+maybe-install-strip-ppl:
+@if ppl
+maybe-install-strip-ppl: install-strip-ppl
+
+install-strip-ppl:
+
+@endif ppl
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-ppl info-ppl
+maybe-info-ppl:
+@if ppl
+maybe-info-ppl: info-ppl
+
+info-ppl: \
+    configure-ppl 
+	@[ -f ./ppl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in ppl" ; \
+	(cd $(HOST_SUBDIR)/ppl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif ppl
+
+.PHONY: maybe-dvi-ppl dvi-ppl
+maybe-dvi-ppl:
+@if ppl
+maybe-dvi-ppl: dvi-ppl
+
+dvi-ppl: \
+    configure-ppl 
+	@[ -f ./ppl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in ppl" ; \
+	(cd $(HOST_SUBDIR)/ppl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif ppl
+
+.PHONY: maybe-pdf-ppl pdf-ppl
+maybe-pdf-ppl:
+@if ppl
+maybe-pdf-ppl: pdf-ppl
+
+pdf-ppl: \
+    configure-ppl 
+	@[ -f ./ppl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in ppl" ; \
+	(cd $(HOST_SUBDIR)/ppl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif ppl
+
+.PHONY: maybe-html-ppl html-ppl
+maybe-html-ppl:
+@if ppl
+maybe-html-ppl: html-ppl
+
+html-ppl: \
+    configure-ppl 
+	@[ -f ./ppl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in ppl" ; \
+	(cd $(HOST_SUBDIR)/ppl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif ppl
+
+.PHONY: maybe-TAGS-ppl TAGS-ppl
+maybe-TAGS-ppl:
+@if ppl
+maybe-TAGS-ppl: TAGS-ppl
+
+TAGS-ppl: \
+    configure-ppl 
+	@[ -f ./ppl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in ppl" ; \
+	(cd $(HOST_SUBDIR)/ppl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif ppl
+
+.PHONY: maybe-install-info-ppl install-info-ppl
+maybe-install-info-ppl:
+@if ppl
+maybe-install-info-ppl: install-info-ppl
+
+install-info-ppl: \
+    configure-ppl \
+    info-ppl 
+	@[ -f ./ppl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in ppl" ; \
+	(cd $(HOST_SUBDIR)/ppl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif ppl
+
+.PHONY: maybe-install-pdf-ppl install-pdf-ppl
+maybe-install-pdf-ppl:
+@if ppl
+maybe-install-pdf-ppl: install-pdf-ppl
+
+install-pdf-ppl: \
+    configure-ppl \
+    pdf-ppl 
+	@[ -f ./ppl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in ppl" ; \
+	(cd $(HOST_SUBDIR)/ppl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif ppl
+
+.PHONY: maybe-install-html-ppl install-html-ppl
+maybe-install-html-ppl:
+@if ppl
+maybe-install-html-ppl: install-html-ppl
+
+install-html-ppl: \
+    configure-ppl \
+    html-ppl 
+	@[ -f ./ppl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in ppl" ; \
+	(cd $(HOST_SUBDIR)/ppl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif ppl
+
+.PHONY: maybe-installcheck-ppl installcheck-ppl
+maybe-installcheck-ppl:
+@if ppl
+maybe-installcheck-ppl: installcheck-ppl
+
+installcheck-ppl: \
+    configure-ppl 
+	@[ -f ./ppl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in ppl" ; \
+	(cd $(HOST_SUBDIR)/ppl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif ppl
+
+.PHONY: maybe-mostlyclean-ppl mostlyclean-ppl
+maybe-mostlyclean-ppl:
+@if ppl
+maybe-mostlyclean-ppl: mostlyclean-ppl
+
+mostlyclean-ppl: 
+	@[ -f ./ppl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in ppl" ; \
+	(cd $(HOST_SUBDIR)/ppl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif ppl
+
+.PHONY: maybe-clean-ppl clean-ppl
+maybe-clean-ppl:
+@if ppl
+maybe-clean-ppl: clean-ppl
+
+clean-ppl: 
+	@[ -f ./ppl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in ppl" ; \
+	(cd $(HOST_SUBDIR)/ppl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif ppl
+
+.PHONY: maybe-distclean-ppl distclean-ppl
+maybe-distclean-ppl:
+@if ppl
+maybe-distclean-ppl: distclean-ppl
+
+distclean-ppl: 
+	@[ -f ./ppl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in ppl" ; \
+	(cd $(HOST_SUBDIR)/ppl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif ppl
+
+.PHONY: maybe-maintainer-clean-ppl maintainer-clean-ppl
+maybe-maintainer-clean-ppl:
+@if ppl
+maybe-maintainer-clean-ppl: maintainer-clean-ppl
+
+maintainer-clean-ppl: 
+	@[ -f ./ppl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in ppl" ; \
+	(cd $(HOST_SUBDIR)/ppl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif ppl
+
+
+
+.PHONY: configure-cloog maybe-configure-cloog
+maybe-configure-cloog:
+@if gcc-bootstrap
+configure-cloog: stage_current
+@endif gcc-bootstrap
+@if cloog
+maybe-configure-cloog: configure-cloog
+configure-cloog: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
+	$(HOST_EXPORTS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+	echo Configuring in $(HOST_SUBDIR)/cloog; \
+	cd "$(HOST_SUBDIR)/cloog" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/cloog"; \
+	libsrcdir="$$s/cloog"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl \
+	  || exit 1
+@endif cloog
+
+
+
+.PHONY: configure-stage1-cloog maybe-configure-stage1-cloog
+maybe-configure-stage1-cloog:
+@if cloog-bootstrap
+maybe-configure-stage1-cloog: configure-stage1-cloog
+configure-stage1-cloog:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+	echo Configuring stage 1 in $(HOST_SUBDIR)/cloog ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
+	cd $(HOST_SUBDIR)/cloog || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/cloog"; \
+	libsrcdir="$$s/cloog"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS) \
+	  --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl
+@endif cloog-bootstrap
+
+.PHONY: configure-stage2-cloog maybe-configure-stage2-cloog
+maybe-configure-stage2-cloog:
+@if cloog-bootstrap
+maybe-configure-stage2-cloog: configure-stage2-cloog
+configure-stage2-cloog:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+	echo Configuring stage 2 in $(HOST_SUBDIR)/cloog ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
+	cd $(HOST_SUBDIR)/cloog || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/cloog"; \
+	libsrcdir="$$s/cloog"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS) \
+	  --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl
+@endif cloog-bootstrap
+
+.PHONY: configure-stage3-cloog maybe-configure-stage3-cloog
+maybe-configure-stage3-cloog:
+@if cloog-bootstrap
+maybe-configure-stage3-cloog: configure-stage3-cloog
+configure-stage3-cloog:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+	echo Configuring stage 3 in $(HOST_SUBDIR)/cloog ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
+	cd $(HOST_SUBDIR)/cloog || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/cloog"; \
+	libsrcdir="$$s/cloog"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS) \
+	  --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl
+@endif cloog-bootstrap
+
+.PHONY: configure-stage4-cloog maybe-configure-stage4-cloog
+maybe-configure-stage4-cloog:
+@if cloog-bootstrap
+maybe-configure-stage4-cloog: configure-stage4-cloog
+configure-stage4-cloog:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+	echo Configuring stage 4 in $(HOST_SUBDIR)/cloog ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
+	cd $(HOST_SUBDIR)/cloog || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/cloog"; \
+	libsrcdir="$$s/cloog"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS) \
+	  --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl
+@endif cloog-bootstrap
+
+.PHONY: configure-stageprofile-cloog maybe-configure-stageprofile-cloog
+maybe-configure-stageprofile-cloog:
+@if cloog-bootstrap
+maybe-configure-stageprofile-cloog: configure-stageprofile-cloog
+configure-stageprofile-cloog:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+	echo Configuring stage profile in $(HOST_SUBDIR)/cloog ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
+	cd $(HOST_SUBDIR)/cloog || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/cloog"; \
+	libsrcdir="$$s/cloog"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS) \
+	  --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl
+@endif cloog-bootstrap
+
+.PHONY: configure-stagefeedback-cloog maybe-configure-stagefeedback-cloog
+maybe-configure-stagefeedback-cloog:
+@if cloog-bootstrap
+maybe-configure-stagefeedback-cloog: configure-stagefeedback-cloog
+configure-stagefeedback-cloog:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+	echo Configuring stage feedback in $(HOST_SUBDIR)/cloog ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
+	cd $(HOST_SUBDIR)/cloog || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/cloog"; \
+	libsrcdir="$$s/cloog"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS) \
+	  --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl
+@endif cloog-bootstrap
+
+
+
+
+
+.PHONY: all-cloog maybe-all-cloog
+maybe-all-cloog:
+@if gcc-bootstrap
+all-cloog: stage_current
+@endif gcc-bootstrap
+@if cloog
+TARGET-cloog=all
+maybe-all-cloog: all-cloog
+all-cloog: configure-cloog
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+	(cd $(HOST_SUBDIR)/cloog && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
+		$(TARGET-cloog))
+@endif cloog
+
+
+
+.PHONY: all-stage1-cloog maybe-all-stage1-cloog
+.PHONY: clean-stage1-cloog maybe-clean-stage1-cloog
+maybe-all-stage1-cloog:
+maybe-clean-stage1-cloog:
+@if cloog-bootstrap
+maybe-all-stage1-cloog: all-stage1-cloog
+all-stage1: all-stage1-cloog
+TARGET-stage1-cloog = $(TARGET-cloog)
+all-stage1-cloog: configure-stage1-cloog
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(HOST_EXPORTS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+	cd $(HOST_SUBDIR)/cloog && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)  CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-cloog)
+
+maybe-clean-stage1-cloog: clean-stage1-cloog
+clean-stage1: clean-stage1-cloog
+clean-stage1-cloog:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage1-cloog/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/cloog && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" clean
+@endif cloog-bootstrap
+
+
+.PHONY: all-stage2-cloog maybe-all-stage2-cloog
+.PHONY: clean-stage2-cloog maybe-clean-stage2-cloog
+maybe-all-stage2-cloog:
+maybe-clean-stage2-cloog:
+@if cloog-bootstrap
+maybe-all-stage2-cloog: all-stage2-cloog
+all-stage2: all-stage2-cloog
+TARGET-stage2-cloog = $(TARGET-cloog)
+all-stage2-cloog: configure-stage2-cloog
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+	cd $(HOST_SUBDIR)/cloog && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-cloog)
+
+maybe-clean-stage2-cloog: clean-stage2-cloog
+clean-stage2: clean-stage2-cloog
+clean-stage2-cloog:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage2-cloog/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/cloog && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" clean
+@endif cloog-bootstrap
+
+
+.PHONY: all-stage3-cloog maybe-all-stage3-cloog
+.PHONY: clean-stage3-cloog maybe-clean-stage3-cloog
+maybe-all-stage3-cloog:
+maybe-clean-stage3-cloog:
+@if cloog-bootstrap
+maybe-all-stage3-cloog: all-stage3-cloog
+all-stage3: all-stage3-cloog
+TARGET-stage3-cloog = $(TARGET-cloog)
+all-stage3-cloog: configure-stage3-cloog
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+	cd $(HOST_SUBDIR)/cloog && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-cloog)
+
+maybe-clean-stage3-cloog: clean-stage3-cloog
+clean-stage3: clean-stage3-cloog
+clean-stage3-cloog:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage3-cloog/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/cloog && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" clean
+@endif cloog-bootstrap
+
+
+.PHONY: all-stage4-cloog maybe-all-stage4-cloog
+.PHONY: clean-stage4-cloog maybe-clean-stage4-cloog
+maybe-all-stage4-cloog:
+maybe-clean-stage4-cloog:
+@if cloog-bootstrap
+maybe-all-stage4-cloog: all-stage4-cloog
+all-stage4: all-stage4-cloog
+TARGET-stage4-cloog = $(TARGET-cloog)
+all-stage4-cloog: configure-stage4-cloog
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+	cd $(HOST_SUBDIR)/cloog && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE4_CFLAGS)" \
+		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-cloog)
+
+maybe-clean-stage4-cloog: clean-stage4-cloog
+clean-stage4: clean-stage4-cloog
+clean-stage4-cloog:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage4-cloog/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/cloog && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" clean
+@endif cloog-bootstrap
+
+
+.PHONY: all-stageprofile-cloog maybe-all-stageprofile-cloog
+.PHONY: clean-stageprofile-cloog maybe-clean-stageprofile-cloog
+maybe-all-stageprofile-cloog:
+maybe-clean-stageprofile-cloog:
+@if cloog-bootstrap
+maybe-all-stageprofile-cloog: all-stageprofile-cloog
+all-stageprofile: all-stageprofile-cloog
+TARGET-stageprofile-cloog = $(TARGET-cloog)
+all-stageprofile-cloog: configure-stageprofile-cloog
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+	cd $(HOST_SUBDIR)/cloog && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-cloog)
+
+maybe-clean-stageprofile-cloog: clean-stageprofile-cloog
+clean-stageprofile: clean-stageprofile-cloog
+clean-stageprofile-cloog:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stageprofile-cloog/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/cloog && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" clean
+@endif cloog-bootstrap
+
+
+.PHONY: all-stagefeedback-cloog maybe-all-stagefeedback-cloog
+.PHONY: clean-stagefeedback-cloog maybe-clean-stagefeedback-cloog
+maybe-all-stagefeedback-cloog:
+maybe-clean-stagefeedback-cloog:
+@if cloog-bootstrap
+maybe-all-stagefeedback-cloog: all-stagefeedback-cloog
+all-stagefeedback: all-stagefeedback-cloog
+TARGET-stagefeedback-cloog = $(TARGET-cloog)
+all-stagefeedback-cloog: configure-stagefeedback-cloog
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+	cd $(HOST_SUBDIR)/cloog && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-cloog)
+
+maybe-clean-stagefeedback-cloog: clean-stagefeedback-cloog
+clean-stagefeedback: clean-stagefeedback-cloog
+clean-stagefeedback-cloog:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stagefeedback-cloog/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/cloog && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" clean
+@endif cloog-bootstrap
+
+
+
+
+
+.PHONY: check-cloog maybe-check-cloog
+maybe-check-cloog:
+@if cloog
+maybe-check-cloog: check-cloog
+
+check-cloog:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/cloog && \
+	  $(MAKE) $(FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" check)
+
+@endif cloog
+
+.PHONY: install-cloog maybe-install-cloog
+maybe-install-cloog:
+@if cloog
+maybe-install-cloog: install-cloog
+
+install-cloog:
+
+@endif cloog
+
+.PHONY: install-strip-cloog maybe-install-strip-cloog
+maybe-install-strip-cloog:
+@if cloog
+maybe-install-strip-cloog: install-strip-cloog
+
+install-strip-cloog:
+
+@endif cloog
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-cloog info-cloog
+maybe-info-cloog:
+@if cloog
+maybe-info-cloog: info-cloog
+
+info-cloog: \
+    configure-cloog 
+	@[ -f ./cloog/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in cloog" ; \
+	(cd $(HOST_SUBDIR)/cloog && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif cloog
+
+.PHONY: maybe-dvi-cloog dvi-cloog
+maybe-dvi-cloog:
+@if cloog
+maybe-dvi-cloog: dvi-cloog
+
+dvi-cloog: \
+    configure-cloog 
+	@[ -f ./cloog/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in cloog" ; \
+	(cd $(HOST_SUBDIR)/cloog && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif cloog
+
+.PHONY: maybe-pdf-cloog pdf-cloog
+maybe-pdf-cloog:
+@if cloog
+maybe-pdf-cloog: pdf-cloog
+
+pdf-cloog: \
+    configure-cloog 
+	@[ -f ./cloog/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in cloog" ; \
+	(cd $(HOST_SUBDIR)/cloog && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif cloog
+
+.PHONY: maybe-html-cloog html-cloog
+maybe-html-cloog:
+@if cloog
+maybe-html-cloog: html-cloog
+
+html-cloog: \
+    configure-cloog 
+	@[ -f ./cloog/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in cloog" ; \
+	(cd $(HOST_SUBDIR)/cloog && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif cloog
+
+.PHONY: maybe-TAGS-cloog TAGS-cloog
+maybe-TAGS-cloog:
+@if cloog
+maybe-TAGS-cloog: TAGS-cloog
+
+TAGS-cloog: \
+    configure-cloog 
+	@[ -f ./cloog/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in cloog" ; \
+	(cd $(HOST_SUBDIR)/cloog && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif cloog
+
+.PHONY: maybe-install-info-cloog install-info-cloog
+maybe-install-info-cloog:
+@if cloog
+maybe-install-info-cloog: install-info-cloog
+
+install-info-cloog: \
+    configure-cloog \
+    info-cloog 
+	@[ -f ./cloog/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in cloog" ; \
+	(cd $(HOST_SUBDIR)/cloog && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif cloog
+
+.PHONY: maybe-install-pdf-cloog install-pdf-cloog
+maybe-install-pdf-cloog:
+@if cloog
+maybe-install-pdf-cloog: install-pdf-cloog
+
+install-pdf-cloog: \
+    configure-cloog \
+    pdf-cloog 
+	@[ -f ./cloog/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in cloog" ; \
+	(cd $(HOST_SUBDIR)/cloog && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif cloog
+
+.PHONY: maybe-install-html-cloog install-html-cloog
+maybe-install-html-cloog:
+@if cloog
+maybe-install-html-cloog: install-html-cloog
+
+install-html-cloog: \
+    configure-cloog \
+    html-cloog 
+	@[ -f ./cloog/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in cloog" ; \
+	(cd $(HOST_SUBDIR)/cloog && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif cloog
+
+.PHONY: maybe-installcheck-cloog installcheck-cloog
+maybe-installcheck-cloog:
+@if cloog
+maybe-installcheck-cloog: installcheck-cloog
+
+installcheck-cloog: \
+    configure-cloog 
+	@[ -f ./cloog/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in cloog" ; \
+	(cd $(HOST_SUBDIR)/cloog && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif cloog
+
+.PHONY: maybe-mostlyclean-cloog mostlyclean-cloog
+maybe-mostlyclean-cloog:
+@if cloog
+maybe-mostlyclean-cloog: mostlyclean-cloog
+
+mostlyclean-cloog: 
+	@[ -f ./cloog/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in cloog" ; \
+	(cd $(HOST_SUBDIR)/cloog && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif cloog
+
+.PHONY: maybe-clean-cloog clean-cloog
+maybe-clean-cloog:
+@if cloog
+maybe-clean-cloog: clean-cloog
+
+clean-cloog: 
+	@[ -f ./cloog/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in cloog" ; \
+	(cd $(HOST_SUBDIR)/cloog && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif cloog
+
+.PHONY: maybe-distclean-cloog distclean-cloog
+maybe-distclean-cloog:
+@if cloog
+maybe-distclean-cloog: distclean-cloog
+
+distclean-cloog: 
+	@[ -f ./cloog/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in cloog" ; \
+	(cd $(HOST_SUBDIR)/cloog && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif cloog
+
+.PHONY: maybe-maintainer-clean-cloog maintainer-clean-cloog
+maybe-maintainer-clean-cloog:
+@if cloog
+maybe-maintainer-clean-cloog: maintainer-clean-cloog
+
+maintainer-clean-cloog: 
+	@[ -f ./cloog/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in cloog" ; \
+	(cd $(HOST_SUBDIR)/cloog && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif cloog
+
+
+
+.PHONY: configure-libelf maybe-configure-libelf
+maybe-configure-libelf:
+@if gcc-bootstrap
+configure-libelf: stage_current
+@endif gcc-bootstrap
+@if libelf
+maybe-configure-libelf: configure-libelf
+configure-libelf: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/libelf; \
+	cd "$(HOST_SUBDIR)/libelf" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libelf"; \
+	libsrcdir="$$s/libelf"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} --disable-shared \
+	  || exit 1
+@endif libelf
+
+
+
+.PHONY: configure-stage1-libelf maybe-configure-stage1-libelf
+maybe-configure-stage1-libelf:
+@if libelf-bootstrap
+maybe-configure-stage1-libelf: configure-stage1-libelf
+configure-stage1-libelf:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(HOST_SUBDIR)/libelf ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
+	cd $(HOST_SUBDIR)/libelf || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libelf"; \
+	libsrcdir="$$s/libelf"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS) \
+	  --disable-shared
+@endif libelf-bootstrap
+
+.PHONY: configure-stage2-libelf maybe-configure-stage2-libelf
+maybe-configure-stage2-libelf:
+@if libelf-bootstrap
+maybe-configure-stage2-libelf: configure-stage2-libelf
+configure-stage2-libelf:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(HOST_SUBDIR)/libelf ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
+	cd $(HOST_SUBDIR)/libelf || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libelf"; \
+	libsrcdir="$$s/libelf"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS) \
+	  --disable-shared
+@endif libelf-bootstrap
+
+.PHONY: configure-stage3-libelf maybe-configure-stage3-libelf
+maybe-configure-stage3-libelf:
+@if libelf-bootstrap
+maybe-configure-stage3-libelf: configure-stage3-libelf
+configure-stage3-libelf:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(HOST_SUBDIR)/libelf ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
+	cd $(HOST_SUBDIR)/libelf || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libelf"; \
+	libsrcdir="$$s/libelf"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS) \
+	  --disable-shared
+@endif libelf-bootstrap
+
+.PHONY: configure-stage4-libelf maybe-configure-stage4-libelf
+maybe-configure-stage4-libelf:
+@if libelf-bootstrap
+maybe-configure-stage4-libelf: configure-stage4-libelf
+configure-stage4-libelf:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(HOST_SUBDIR)/libelf ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
+	cd $(HOST_SUBDIR)/libelf || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libelf"; \
+	libsrcdir="$$s/libelf"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS) \
+	  --disable-shared
+@endif libelf-bootstrap
+
+.PHONY: configure-stageprofile-libelf maybe-configure-stageprofile-libelf
+maybe-configure-stageprofile-libelf:
+@if libelf-bootstrap
+maybe-configure-stageprofile-libelf: configure-stageprofile-libelf
+configure-stageprofile-libelf:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(HOST_SUBDIR)/libelf ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
+	cd $(HOST_SUBDIR)/libelf || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libelf"; \
+	libsrcdir="$$s/libelf"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS) \
+	  --disable-shared
+@endif libelf-bootstrap
+
+.PHONY: configure-stagefeedback-libelf maybe-configure-stagefeedback-libelf
+maybe-configure-stagefeedback-libelf:
+@if libelf-bootstrap
+maybe-configure-stagefeedback-libelf: configure-stagefeedback-libelf
+configure-stagefeedback-libelf:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(HOST_SUBDIR)/libelf ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
+	cd $(HOST_SUBDIR)/libelf || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libelf"; \
+	libsrcdir="$$s/libelf"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS) \
+	  --disable-shared
+@endif libelf-bootstrap
+
+
+
+
+
+.PHONY: all-libelf maybe-all-libelf
+maybe-all-libelf:
+@if gcc-bootstrap
+all-libelf: stage_current
+@endif gcc-bootstrap
+@if libelf
+TARGET-libelf=all
+maybe-all-libelf: all-libelf
+all-libelf: configure-libelf
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/libelf && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-libelf))
+@endif libelf
+
+
+
+.PHONY: all-stage1-libelf maybe-all-stage1-libelf
+.PHONY: clean-stage1-libelf maybe-clean-stage1-libelf
+maybe-all-stage1-libelf:
+maybe-clean-stage1-libelf:
+@if libelf-bootstrap
+maybe-all-stage1-libelf: all-stage1-libelf
+all-stage1: all-stage1-libelf
+TARGET-stage1-libelf = $(TARGET-libelf)
+all-stage1-libelf: configure-stage1-libelf
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libelf && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-libelf)
+
+maybe-clean-stage1-libelf: clean-stage1-libelf
+clean-stage1: clean-stage1-libelf
+clean-stage1-libelf:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage1-libelf/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libelf && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		 clean
+@endif libelf-bootstrap
+
+
+.PHONY: all-stage2-libelf maybe-all-stage2-libelf
+.PHONY: clean-stage2-libelf maybe-clean-stage2-libelf
+maybe-all-stage2-libelf:
+maybe-clean-stage2-libelf:
+@if libelf-bootstrap
+maybe-all-stage2-libelf: all-stage2-libelf
+all-stage2: all-stage2-libelf
+TARGET-stage2-libelf = $(TARGET-libelf)
+all-stage2-libelf: configure-stage2-libelf
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libelf && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-libelf)
+
+maybe-clean-stage2-libelf: clean-stage2-libelf
+clean-stage2: clean-stage2-libelf
+clean-stage2-libelf:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage2-libelf/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libelf && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif libelf-bootstrap
+
+
+.PHONY: all-stage3-libelf maybe-all-stage3-libelf
+.PHONY: clean-stage3-libelf maybe-clean-stage3-libelf
+maybe-all-stage3-libelf:
+maybe-clean-stage3-libelf:
+@if libelf-bootstrap
+maybe-all-stage3-libelf: all-stage3-libelf
+all-stage3: all-stage3-libelf
+TARGET-stage3-libelf = $(TARGET-libelf)
+all-stage3-libelf: configure-stage3-libelf
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libelf && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-libelf)
+
+maybe-clean-stage3-libelf: clean-stage3-libelf
+clean-stage3: clean-stage3-libelf
+clean-stage3-libelf:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage3-libelf/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libelf && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif libelf-bootstrap
+
+
+.PHONY: all-stage4-libelf maybe-all-stage4-libelf
+.PHONY: clean-stage4-libelf maybe-clean-stage4-libelf
+maybe-all-stage4-libelf:
+maybe-clean-stage4-libelf:
+@if libelf-bootstrap
+maybe-all-stage4-libelf: all-stage4-libelf
+all-stage4: all-stage4-libelf
+TARGET-stage4-libelf = $(TARGET-libelf)
+all-stage4-libelf: configure-stage4-libelf
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libelf && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE4_CFLAGS)" \
+		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-libelf)
+
+maybe-clean-stage4-libelf: clean-stage4-libelf
+clean-stage4: clean-stage4-libelf
+clean-stage4-libelf:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage4-libelf/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libelf && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif libelf-bootstrap
+
+
+.PHONY: all-stageprofile-libelf maybe-all-stageprofile-libelf
+.PHONY: clean-stageprofile-libelf maybe-clean-stageprofile-libelf
+maybe-all-stageprofile-libelf:
+maybe-clean-stageprofile-libelf:
+@if libelf-bootstrap
+maybe-all-stageprofile-libelf: all-stageprofile-libelf
+all-stageprofile: all-stageprofile-libelf
+TARGET-stageprofile-libelf = $(TARGET-libelf)
+all-stageprofile-libelf: configure-stageprofile-libelf
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libelf && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-libelf)
+
+maybe-clean-stageprofile-libelf: clean-stageprofile-libelf
+clean-stageprofile: clean-stageprofile-libelf
+clean-stageprofile-libelf:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stageprofile-libelf/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libelf && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif libelf-bootstrap
+
+
+.PHONY: all-stagefeedback-libelf maybe-all-stagefeedback-libelf
+.PHONY: clean-stagefeedback-libelf maybe-clean-stagefeedback-libelf
+maybe-all-stagefeedback-libelf:
+maybe-clean-stagefeedback-libelf:
+@if libelf-bootstrap
+maybe-all-stagefeedback-libelf: all-stagefeedback-libelf
+all-stagefeedback: all-stagefeedback-libelf
+TARGET-stagefeedback-libelf = $(TARGET-libelf)
+all-stagefeedback-libelf: configure-stagefeedback-libelf
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libelf && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-libelf)
+
+maybe-clean-stagefeedback-libelf: clean-stagefeedback-libelf
+clean-stagefeedback: clean-stagefeedback-libelf
+clean-stagefeedback-libelf:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stagefeedback-libelf/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libelf && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif libelf-bootstrap
+
+
+
+
+
+.PHONY: check-libelf maybe-check-libelf
+maybe-check-libelf:
+@if libelf
+maybe-check-libelf: check-libelf
+
+check-libelf:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/libelf && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif libelf
+
+.PHONY: install-libelf maybe-install-libelf
+maybe-install-libelf:
+@if libelf
+maybe-install-libelf: install-libelf
+
+install-libelf:
+
+@endif libelf
+
+.PHONY: install-strip-libelf maybe-install-strip-libelf
+maybe-install-strip-libelf:
+@if libelf
+maybe-install-strip-libelf: install-strip-libelf
+
+install-strip-libelf:
+
+@endif libelf
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-libelf info-libelf
+maybe-info-libelf:
+@if libelf
+maybe-info-libelf: info-libelf
+
+info-libelf: \
+    configure-libelf 
+	@[ -f ./libelf/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in libelf" ; \
+	(cd $(HOST_SUBDIR)/libelf && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif libelf
+
+.PHONY: maybe-dvi-libelf dvi-libelf
+maybe-dvi-libelf:
+@if libelf
+maybe-dvi-libelf: dvi-libelf
+
+dvi-libelf: \
+    configure-libelf 
+	@[ -f ./libelf/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in libelf" ; \
+	(cd $(HOST_SUBDIR)/libelf && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif libelf
+
+.PHONY: maybe-pdf-libelf pdf-libelf
+maybe-pdf-libelf:
+@if libelf
+maybe-pdf-libelf: pdf-libelf
+
+pdf-libelf: \
+    configure-libelf 
+	@[ -f ./libelf/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in libelf" ; \
+	(cd $(HOST_SUBDIR)/libelf && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif libelf
+
+.PHONY: maybe-html-libelf html-libelf
+maybe-html-libelf:
+@if libelf
+maybe-html-libelf: html-libelf
+
+html-libelf: \
+    configure-libelf 
+	@[ -f ./libelf/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in libelf" ; \
+	(cd $(HOST_SUBDIR)/libelf && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif libelf
+
+.PHONY: maybe-TAGS-libelf TAGS-libelf
+maybe-TAGS-libelf:
+@if libelf
+maybe-TAGS-libelf: TAGS-libelf
+
+TAGS-libelf: \
+    configure-libelf 
+	@[ -f ./libelf/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in libelf" ; \
+	(cd $(HOST_SUBDIR)/libelf && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif libelf
+
+.PHONY: maybe-install-info-libelf install-info-libelf
+maybe-install-info-libelf:
+@if libelf
+maybe-install-info-libelf: install-info-libelf
+
+install-info-libelf: \
+    configure-libelf \
+    info-libelf 
+	@[ -f ./libelf/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in libelf" ; \
+	(cd $(HOST_SUBDIR)/libelf && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif libelf
+
+.PHONY: maybe-install-pdf-libelf install-pdf-libelf
+maybe-install-pdf-libelf:
+@if libelf
+maybe-install-pdf-libelf: install-pdf-libelf
+
+install-pdf-libelf: \
+    configure-libelf \
+    pdf-libelf 
+	@[ -f ./libelf/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in libelf" ; \
+	(cd $(HOST_SUBDIR)/libelf && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif libelf
+
+.PHONY: maybe-install-html-libelf install-html-libelf
+maybe-install-html-libelf:
+@if libelf
+maybe-install-html-libelf: install-html-libelf
+
+install-html-libelf: \
+    configure-libelf \
+    html-libelf 
+	@[ -f ./libelf/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in libelf" ; \
+	(cd $(HOST_SUBDIR)/libelf && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif libelf
+
+.PHONY: maybe-installcheck-libelf installcheck-libelf
+maybe-installcheck-libelf:
+@if libelf
+maybe-installcheck-libelf: installcheck-libelf
+
+installcheck-libelf: \
+    configure-libelf 
+	@[ -f ./libelf/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in libelf" ; \
+	(cd $(HOST_SUBDIR)/libelf && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif libelf
+
+.PHONY: maybe-mostlyclean-libelf mostlyclean-libelf
+maybe-mostlyclean-libelf:
+@if libelf
+maybe-mostlyclean-libelf: mostlyclean-libelf
+
+mostlyclean-libelf: 
+	@[ -f ./libelf/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in libelf" ; \
+	(cd $(HOST_SUBDIR)/libelf && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif libelf
+
+.PHONY: maybe-clean-libelf clean-libelf
+maybe-clean-libelf:
+@if libelf
+maybe-clean-libelf: clean-libelf
+
+clean-libelf: 
+	@[ -f ./libelf/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in libelf" ; \
+	(cd $(HOST_SUBDIR)/libelf && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif libelf
+
+.PHONY: maybe-distclean-libelf distclean-libelf
+maybe-distclean-libelf:
+@if libelf
+maybe-distclean-libelf: distclean-libelf
+
+distclean-libelf: 
+	@[ -f ./libelf/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in libelf" ; \
+	(cd $(HOST_SUBDIR)/libelf && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif libelf
+
+.PHONY: maybe-maintainer-clean-libelf maintainer-clean-libelf
+maybe-maintainer-clean-libelf:
+@if libelf
+maybe-maintainer-clean-libelf: maintainer-clean-libelf
+
+maintainer-clean-libelf: 
+	@[ -f ./libelf/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in libelf" ; \
+	(cd $(HOST_SUBDIR)/libelf && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif libelf
+
+
+
+.PHONY: configure-gold maybe-configure-gold
+maybe-configure-gold:
+@if gcc-bootstrap
+configure-gold: stage_current
+@endif gcc-bootstrap
+@if gold
+maybe-configure-gold: configure-gold
+configure-gold: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/gold; \
+	cd "$(HOST_SUBDIR)/gold" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gold"; \
+	libsrcdir="$$s/gold"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif gold
+
+
+
+.PHONY: configure-stage1-gold maybe-configure-stage1-gold
+maybe-configure-stage1-gold:
+@if gold-bootstrap
+maybe-configure-stage1-gold: configure-stage1-gold
+configure-stage1-gold:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(HOST_SUBDIR)/gold ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
+	cd $(HOST_SUBDIR)/gold || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gold"; \
+	libsrcdir="$$s/gold"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS)
+@endif gold-bootstrap
+
+.PHONY: configure-stage2-gold maybe-configure-stage2-gold
+maybe-configure-stage2-gold:
+@if gold-bootstrap
+maybe-configure-stage2-gold: configure-stage2-gold
+configure-stage2-gold:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(HOST_SUBDIR)/gold ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
+	cd $(HOST_SUBDIR)/gold || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gold"; \
+	libsrcdir="$$s/gold"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS)
+@endif gold-bootstrap
+
+.PHONY: configure-stage3-gold maybe-configure-stage3-gold
+maybe-configure-stage3-gold:
+@if gold-bootstrap
+maybe-configure-stage3-gold: configure-stage3-gold
+configure-stage3-gold:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(HOST_SUBDIR)/gold ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
+	cd $(HOST_SUBDIR)/gold || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gold"; \
+	libsrcdir="$$s/gold"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS)
+@endif gold-bootstrap
+
+.PHONY: configure-stage4-gold maybe-configure-stage4-gold
+maybe-configure-stage4-gold:
+@if gold-bootstrap
+maybe-configure-stage4-gold: configure-stage4-gold
+configure-stage4-gold:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(HOST_SUBDIR)/gold ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
+	cd $(HOST_SUBDIR)/gold || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gold"; \
+	libsrcdir="$$s/gold"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS)
+@endif gold-bootstrap
+
+.PHONY: configure-stageprofile-gold maybe-configure-stageprofile-gold
+maybe-configure-stageprofile-gold:
+@if gold-bootstrap
+maybe-configure-stageprofile-gold: configure-stageprofile-gold
+configure-stageprofile-gold:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(HOST_SUBDIR)/gold ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
+	cd $(HOST_SUBDIR)/gold || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gold"; \
+	libsrcdir="$$s/gold"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS)
+@endif gold-bootstrap
+
+.PHONY: configure-stagefeedback-gold maybe-configure-stagefeedback-gold
+maybe-configure-stagefeedback-gold:
+@if gold-bootstrap
+maybe-configure-stagefeedback-gold: configure-stagefeedback-gold
+configure-stagefeedback-gold:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(HOST_SUBDIR)/gold ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
+	cd $(HOST_SUBDIR)/gold || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gold"; \
+	libsrcdir="$$s/gold"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif gold-bootstrap
+
+
+
+
+
+.PHONY: all-gold maybe-all-gold
+maybe-all-gold:
+@if gcc-bootstrap
+all-gold: stage_current
+@endif gcc-bootstrap
+@if gold
+TARGET-gold=all
+maybe-all-gold: all-gold
+all-gold: configure-gold
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/gold && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-gold))
+@endif gold
+
+
+
+.PHONY: all-stage1-gold maybe-all-stage1-gold
+.PHONY: clean-stage1-gold maybe-clean-stage1-gold
+maybe-all-stage1-gold:
+maybe-clean-stage1-gold:
+@if gold-bootstrap
+maybe-all-stage1-gold: all-stage1-gold
+all-stage1: all-stage1-gold
+TARGET-stage1-gold = $(TARGET-gold)
+all-stage1-gold: configure-stage1-gold
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gold && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-gold)
+
+maybe-clean-stage1-gold: clean-stage1-gold
+clean-stage1: clean-stage1-gold
+clean-stage1-gold:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage1-gold/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gold && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		 clean
+@endif gold-bootstrap
+
+
+.PHONY: all-stage2-gold maybe-all-stage2-gold
+.PHONY: clean-stage2-gold maybe-clean-stage2-gold
+maybe-all-stage2-gold:
+maybe-clean-stage2-gold:
+@if gold-bootstrap
+maybe-all-stage2-gold: all-stage2-gold
+all-stage2: all-stage2-gold
+TARGET-stage2-gold = $(TARGET-gold)
+all-stage2-gold: configure-stage2-gold
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gold && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-gold)
+
+maybe-clean-stage2-gold: clean-stage2-gold
+clean-stage2: clean-stage2-gold
+clean-stage2-gold:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage2-gold/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gold && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif gold-bootstrap
+
+
+.PHONY: all-stage3-gold maybe-all-stage3-gold
+.PHONY: clean-stage3-gold maybe-clean-stage3-gold
+maybe-all-stage3-gold:
+maybe-clean-stage3-gold:
+@if gold-bootstrap
+maybe-all-stage3-gold: all-stage3-gold
+all-stage3: all-stage3-gold
+TARGET-stage3-gold = $(TARGET-gold)
+all-stage3-gold: configure-stage3-gold
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gold && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-gold)
+
+maybe-clean-stage3-gold: clean-stage3-gold
+clean-stage3: clean-stage3-gold
+clean-stage3-gold:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage3-gold/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gold && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif gold-bootstrap
+
+
+.PHONY: all-stage4-gold maybe-all-stage4-gold
+.PHONY: clean-stage4-gold maybe-clean-stage4-gold
+maybe-all-stage4-gold:
+maybe-clean-stage4-gold:
+@if gold-bootstrap
+maybe-all-stage4-gold: all-stage4-gold
+all-stage4: all-stage4-gold
+TARGET-stage4-gold = $(TARGET-gold)
+all-stage4-gold: configure-stage4-gold
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gold && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE4_CFLAGS)" \
+		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-gold)
+
+maybe-clean-stage4-gold: clean-stage4-gold
+clean-stage4: clean-stage4-gold
+clean-stage4-gold:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage4-gold/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gold && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif gold-bootstrap
+
+
+.PHONY: all-stageprofile-gold maybe-all-stageprofile-gold
+.PHONY: clean-stageprofile-gold maybe-clean-stageprofile-gold
+maybe-all-stageprofile-gold:
+maybe-clean-stageprofile-gold:
+@if gold-bootstrap
+maybe-all-stageprofile-gold: all-stageprofile-gold
+all-stageprofile: all-stageprofile-gold
+TARGET-stageprofile-gold = $(TARGET-gold)
+all-stageprofile-gold: configure-stageprofile-gold
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gold && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-gold)
+
+maybe-clean-stageprofile-gold: clean-stageprofile-gold
+clean-stageprofile: clean-stageprofile-gold
+clean-stageprofile-gold:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stageprofile-gold/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gold && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif gold-bootstrap
+
+
+.PHONY: all-stagefeedback-gold maybe-all-stagefeedback-gold
+.PHONY: clean-stagefeedback-gold maybe-clean-stagefeedback-gold
+maybe-all-stagefeedback-gold:
+maybe-clean-stagefeedback-gold:
+@if gold-bootstrap
+maybe-all-stagefeedback-gold: all-stagefeedback-gold
+all-stagefeedback: all-stagefeedback-gold
+TARGET-stagefeedback-gold = $(TARGET-gold)
+all-stagefeedback-gold: configure-stagefeedback-gold
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gold && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-gold)
+
+maybe-clean-stagefeedback-gold: clean-stagefeedback-gold
+clean-stagefeedback: clean-stagefeedback-gold
+clean-stagefeedback-gold:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stagefeedback-gold/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/gold && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif gold-bootstrap
+
+
+
+
+
+.PHONY: check-gold maybe-check-gold
+maybe-check-gold:
+@if gold
+maybe-check-gold: check-gold
+
+check-gold:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gold && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif gold
+
+.PHONY: install-gold maybe-install-gold
+maybe-install-gold:
+@if gold
+maybe-install-gold: install-gold
+
+install-gold: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gold && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif gold
+
+.PHONY: install-strip-gold maybe-install-strip-gold
+maybe-install-strip-gold:
+@if gold
+maybe-install-strip-gold: install-strip-gold
+
+install-strip-gold: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gold && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif gold
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-gold info-gold
+maybe-info-gold:
+@if gold
+maybe-info-gold: info-gold
+
+info-gold: \
+    configure-gold 
+	@[ -f ./gold/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in gold" ; \
+	(cd $(HOST_SUBDIR)/gold && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif gold
+
+.PHONY: maybe-dvi-gold dvi-gold
+maybe-dvi-gold:
+@if gold
+maybe-dvi-gold: dvi-gold
+
+dvi-gold: \
+    configure-gold 
+	@[ -f ./gold/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in gold" ; \
+	(cd $(HOST_SUBDIR)/gold && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif gold
+
+.PHONY: maybe-pdf-gold pdf-gold
+maybe-pdf-gold:
+@if gold
+maybe-pdf-gold: pdf-gold
+
+pdf-gold: \
+    configure-gold 
+	@[ -f ./gold/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in gold" ; \
+	(cd $(HOST_SUBDIR)/gold && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif gold
+
+.PHONY: maybe-html-gold html-gold
+maybe-html-gold:
+@if gold
+maybe-html-gold: html-gold
+
+html-gold: \
+    configure-gold 
+	@[ -f ./gold/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in gold" ; \
+	(cd $(HOST_SUBDIR)/gold && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif gold
+
+.PHONY: maybe-TAGS-gold TAGS-gold
+maybe-TAGS-gold:
+@if gold
+maybe-TAGS-gold: TAGS-gold
+
+TAGS-gold: \
+    configure-gold 
+	@[ -f ./gold/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in gold" ; \
+	(cd $(HOST_SUBDIR)/gold && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif gold
+
+.PHONY: maybe-install-info-gold install-info-gold
+maybe-install-info-gold:
+@if gold
+maybe-install-info-gold: install-info-gold
+
+install-info-gold: \
+    configure-gold \
+    info-gold 
+	@[ -f ./gold/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in gold" ; \
+	(cd $(HOST_SUBDIR)/gold && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif gold
+
+.PHONY: maybe-install-pdf-gold install-pdf-gold
+maybe-install-pdf-gold:
+@if gold
+maybe-install-pdf-gold: install-pdf-gold
+
+install-pdf-gold: \
+    configure-gold \
+    pdf-gold 
+	@[ -f ./gold/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in gold" ; \
+	(cd $(HOST_SUBDIR)/gold && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif gold
+
+.PHONY: maybe-install-html-gold install-html-gold
+maybe-install-html-gold:
+@if gold
+maybe-install-html-gold: install-html-gold
+
+install-html-gold: \
+    configure-gold \
+    html-gold 
+	@[ -f ./gold/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in gold" ; \
+	(cd $(HOST_SUBDIR)/gold && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif gold
+
+.PHONY: maybe-installcheck-gold installcheck-gold
+maybe-installcheck-gold:
+@if gold
+maybe-installcheck-gold: installcheck-gold
+
+installcheck-gold: \
+    configure-gold 
+	@[ -f ./gold/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in gold" ; \
+	(cd $(HOST_SUBDIR)/gold && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif gold
+
+.PHONY: maybe-mostlyclean-gold mostlyclean-gold
+maybe-mostlyclean-gold:
+@if gold
+maybe-mostlyclean-gold: mostlyclean-gold
+
+mostlyclean-gold: 
+	@[ -f ./gold/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in gold" ; \
+	(cd $(HOST_SUBDIR)/gold && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif gold
+
+.PHONY: maybe-clean-gold clean-gold
+maybe-clean-gold:
+@if gold
+maybe-clean-gold: clean-gold
+
+clean-gold: 
+	@[ -f ./gold/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in gold" ; \
+	(cd $(HOST_SUBDIR)/gold && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif gold
+
+.PHONY: maybe-distclean-gold distclean-gold
+maybe-distclean-gold:
+@if gold
+maybe-distclean-gold: distclean-gold
+
+distclean-gold: 
+	@[ -f ./gold/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in gold" ; \
+	(cd $(HOST_SUBDIR)/gold && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif gold
+
+.PHONY: maybe-maintainer-clean-gold maintainer-clean-gold
+maybe-maintainer-clean-gold:
+@if gold
+maybe-maintainer-clean-gold: maintainer-clean-gold
+
+maintainer-clean-gold: 
+	@[ -f ./gold/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in gold" ; \
+	(cd $(HOST_SUBDIR)/gold && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif gold
+
+
+
+.PHONY: configure-gprof maybe-configure-gprof
+maybe-configure-gprof:
+@if gcc-bootstrap
+configure-gprof: stage_current
+@endif gcc-bootstrap
+@if gprof
+maybe-configure-gprof: configure-gprof
+configure-gprof: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/gprof; \
+	cd "$(HOST_SUBDIR)/gprof" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gprof/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gprof"; \
+	libsrcdir="$$s/gprof"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif gprof
+
+
+
+
+
+.PHONY: all-gprof maybe-all-gprof
+maybe-all-gprof:
+@if gcc-bootstrap
+all-gprof: stage_current
+@endif gcc-bootstrap
+@if gprof
+TARGET-gprof=all
+maybe-all-gprof: all-gprof
+all-gprof: configure-gprof
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/gprof && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-gprof))
+@endif gprof
+
+
+
+
+.PHONY: check-gprof maybe-check-gprof
+maybe-check-gprof:
+@if gprof
+maybe-check-gprof: check-gprof
+
+check-gprof:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gprof && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif gprof
+
+.PHONY: install-gprof maybe-install-gprof
+maybe-install-gprof:
+@if gprof
+maybe-install-gprof: install-gprof
+
+install-gprof: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gprof && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif gprof
+
+.PHONY: install-strip-gprof maybe-install-strip-gprof
+maybe-install-strip-gprof:
+@if gprof
+maybe-install-strip-gprof: install-strip-gprof
+
+install-strip-gprof: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gprof && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif gprof
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-gprof info-gprof
+maybe-info-gprof:
+@if gprof
+maybe-info-gprof: info-gprof
+
+info-gprof: \
+    configure-gprof 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gprof/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in gprof" ; \
+	(cd $(HOST_SUBDIR)/gprof && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif gprof
+
+.PHONY: maybe-dvi-gprof dvi-gprof
+maybe-dvi-gprof:
+@if gprof
+maybe-dvi-gprof: dvi-gprof
+
+dvi-gprof: \
+    configure-gprof 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gprof/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in gprof" ; \
+	(cd $(HOST_SUBDIR)/gprof && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif gprof
+
+.PHONY: maybe-pdf-gprof pdf-gprof
+maybe-pdf-gprof:
+@if gprof
+maybe-pdf-gprof: pdf-gprof
+
+pdf-gprof: \
+    configure-gprof 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gprof/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in gprof" ; \
+	(cd $(HOST_SUBDIR)/gprof && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif gprof
+
+.PHONY: maybe-html-gprof html-gprof
+maybe-html-gprof:
+@if gprof
+maybe-html-gprof: html-gprof
+
+html-gprof: \
+    configure-gprof 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gprof/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in gprof" ; \
+	(cd $(HOST_SUBDIR)/gprof && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif gprof
+
+.PHONY: maybe-TAGS-gprof TAGS-gprof
+maybe-TAGS-gprof:
+@if gprof
+maybe-TAGS-gprof: TAGS-gprof
+
+TAGS-gprof: \
+    configure-gprof 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gprof/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in gprof" ; \
+	(cd $(HOST_SUBDIR)/gprof && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif gprof
+
+.PHONY: maybe-install-info-gprof install-info-gprof
+maybe-install-info-gprof:
+@if gprof
+maybe-install-info-gprof: install-info-gprof
+
+install-info-gprof: \
+    configure-gprof \
+    info-gprof 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gprof/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in gprof" ; \
+	(cd $(HOST_SUBDIR)/gprof && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif gprof
+
+.PHONY: maybe-install-pdf-gprof install-pdf-gprof
+maybe-install-pdf-gprof:
+@if gprof
+maybe-install-pdf-gprof: install-pdf-gprof
+
+install-pdf-gprof: \
+    configure-gprof \
+    pdf-gprof 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gprof/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in gprof" ; \
+	(cd $(HOST_SUBDIR)/gprof && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif gprof
+
+.PHONY: maybe-install-html-gprof install-html-gprof
+maybe-install-html-gprof:
+@if gprof
+maybe-install-html-gprof: install-html-gprof
+
+install-html-gprof: \
+    configure-gprof \
+    html-gprof 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gprof/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in gprof" ; \
+	(cd $(HOST_SUBDIR)/gprof && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif gprof
+
+.PHONY: maybe-installcheck-gprof installcheck-gprof
+maybe-installcheck-gprof:
+@if gprof
+maybe-installcheck-gprof: installcheck-gprof
+
+installcheck-gprof: \
+    configure-gprof 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gprof/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in gprof" ; \
+	(cd $(HOST_SUBDIR)/gprof && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif gprof
+
+.PHONY: maybe-mostlyclean-gprof mostlyclean-gprof
+maybe-mostlyclean-gprof:
+@if gprof
+maybe-mostlyclean-gprof: mostlyclean-gprof
+
+mostlyclean-gprof: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gprof/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in gprof" ; \
+	(cd $(HOST_SUBDIR)/gprof && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif gprof
+
+.PHONY: maybe-clean-gprof clean-gprof
+maybe-clean-gprof:
+@if gprof
+maybe-clean-gprof: clean-gprof
+
+clean-gprof: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gprof/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in gprof" ; \
+	(cd $(HOST_SUBDIR)/gprof && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif gprof
+
+.PHONY: maybe-distclean-gprof distclean-gprof
+maybe-distclean-gprof:
+@if gprof
+maybe-distclean-gprof: distclean-gprof
+
+distclean-gprof: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gprof/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in gprof" ; \
+	(cd $(HOST_SUBDIR)/gprof && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif gprof
+
+.PHONY: maybe-maintainer-clean-gprof maintainer-clean-gprof
+maybe-maintainer-clean-gprof:
+@if gprof
+maybe-maintainer-clean-gprof: maintainer-clean-gprof
+
+maintainer-clean-gprof: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gprof/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in gprof" ; \
+	(cd $(HOST_SUBDIR)/gprof && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif gprof
+
+
+
+.PHONY: configure-intl maybe-configure-intl
+maybe-configure-intl:
+@if gcc-bootstrap
+configure-intl: stage_current
+@endif gcc-bootstrap
+@if intl
+maybe-configure-intl: configure-intl
+configure-intl: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/intl; \
+	cd "$(HOST_SUBDIR)/intl" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/intl"; \
+	libsrcdir="$$s/intl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif intl
+
+
+
+.PHONY: configure-stage1-intl maybe-configure-stage1-intl
+maybe-configure-stage1-intl:
+@if intl-bootstrap
+maybe-configure-stage1-intl: configure-stage1-intl
+configure-stage1-intl:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+	cd $(HOST_SUBDIR)/intl || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/intl"; \
+	libsrcdir="$$s/intl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS)
+@endif intl-bootstrap
+
+.PHONY: configure-stage2-intl maybe-configure-stage2-intl
+maybe-configure-stage2-intl:
+@if intl-bootstrap
+maybe-configure-stage2-intl: configure-stage2-intl
+configure-stage2-intl:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(HOST_SUBDIR)/intl ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+	cd $(HOST_SUBDIR)/intl || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/intl"; \
+	libsrcdir="$$s/intl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS)
+@endif intl-bootstrap
+
+.PHONY: configure-stage3-intl maybe-configure-stage3-intl
+maybe-configure-stage3-intl:
+@if intl-bootstrap
+maybe-configure-stage3-intl: configure-stage3-intl
+configure-stage3-intl:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(HOST_SUBDIR)/intl ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+	cd $(HOST_SUBDIR)/intl || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/intl"; \
+	libsrcdir="$$s/intl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS)
+@endif intl-bootstrap
+
+.PHONY: configure-stage4-intl maybe-configure-stage4-intl
+maybe-configure-stage4-intl:
+@if intl-bootstrap
+maybe-configure-stage4-intl: configure-stage4-intl
+configure-stage4-intl:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(HOST_SUBDIR)/intl ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+	cd $(HOST_SUBDIR)/intl || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/intl"; \
+	libsrcdir="$$s/intl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS)
+@endif intl-bootstrap
+
+.PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl
+maybe-configure-stageprofile-intl:
+@if intl-bootstrap
+maybe-configure-stageprofile-intl: configure-stageprofile-intl
+configure-stageprofile-intl:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(HOST_SUBDIR)/intl ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+	cd $(HOST_SUBDIR)/intl || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/intl"; \
+	libsrcdir="$$s/intl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS)
+@endif intl-bootstrap
+
+.PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl
+maybe-configure-stagefeedback-intl:
+@if intl-bootstrap
+maybe-configure-stagefeedback-intl: configure-stagefeedback-intl
+configure-stagefeedback-intl:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(HOST_SUBDIR)/intl ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+	cd $(HOST_SUBDIR)/intl || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/intl"; \
+	libsrcdir="$$s/intl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif intl-bootstrap
+
+
+
+
+
+.PHONY: all-intl maybe-all-intl
+maybe-all-intl:
+@if gcc-bootstrap
+all-intl: stage_current
+@endif gcc-bootstrap
+@if intl
+TARGET-intl=all
+maybe-all-intl: all-intl
+all-intl: configure-intl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/intl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-intl))
+@endif intl
+
+
+
+.PHONY: all-stage1-intl maybe-all-stage1-intl
+.PHONY: clean-stage1-intl maybe-clean-stage1-intl
+maybe-all-stage1-intl:
+maybe-clean-stage1-intl:
+@if intl-bootstrap
+maybe-all-stage1-intl: all-stage1-intl
+all-stage1: all-stage1-intl
+TARGET-stage1-intl = $(TARGET-intl)
+all-stage1-intl: configure-stage1-intl
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-intl)
+
+maybe-clean-stage1-intl: clean-stage1-intl
+clean-stage1: clean-stage1-intl
+clean-stage1-intl:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage1-intl/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		 clean
+@endif intl-bootstrap
+
+
+.PHONY: all-stage2-intl maybe-all-stage2-intl
+.PHONY: clean-stage2-intl maybe-clean-stage2-intl
+maybe-all-stage2-intl:
+maybe-clean-stage2-intl:
+@if intl-bootstrap
+maybe-all-stage2-intl: all-stage2-intl
+all-stage2: all-stage2-intl
+TARGET-stage2-intl = $(TARGET-intl)
+all-stage2-intl: configure-stage2-intl
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-intl)
+
+maybe-clean-stage2-intl: clean-stage2-intl
+clean-stage2: clean-stage2-intl
+clean-stage2-intl:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage2-intl/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif intl-bootstrap
+
+
+.PHONY: all-stage3-intl maybe-all-stage3-intl
+.PHONY: clean-stage3-intl maybe-clean-stage3-intl
+maybe-all-stage3-intl:
+maybe-clean-stage3-intl:
+@if intl-bootstrap
+maybe-all-stage3-intl: all-stage3-intl
+all-stage3: all-stage3-intl
+TARGET-stage3-intl = $(TARGET-intl)
+all-stage3-intl: configure-stage3-intl
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-intl)
+
+maybe-clean-stage3-intl: clean-stage3-intl
+clean-stage3: clean-stage3-intl
+clean-stage3-intl:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage3-intl/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif intl-bootstrap
+
+
+.PHONY: all-stage4-intl maybe-all-stage4-intl
+.PHONY: clean-stage4-intl maybe-clean-stage4-intl
+maybe-all-stage4-intl:
+maybe-clean-stage4-intl:
+@if intl-bootstrap
+maybe-all-stage4-intl: all-stage4-intl
+all-stage4: all-stage4-intl
+TARGET-stage4-intl = $(TARGET-intl)
+all-stage4-intl: configure-stage4-intl
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE4_CFLAGS)" \
+		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-intl)
+
+maybe-clean-stage4-intl: clean-stage4-intl
+clean-stage4: clean-stage4-intl
+clean-stage4-intl:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage4-intl/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif intl-bootstrap
+
+
+.PHONY: all-stageprofile-intl maybe-all-stageprofile-intl
+.PHONY: clean-stageprofile-intl maybe-clean-stageprofile-intl
+maybe-all-stageprofile-intl:
+maybe-clean-stageprofile-intl:
+@if intl-bootstrap
+maybe-all-stageprofile-intl: all-stageprofile-intl
+all-stageprofile: all-stageprofile-intl
+TARGET-stageprofile-intl = $(TARGET-intl)
+all-stageprofile-intl: configure-stageprofile-intl
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-intl)
+
+maybe-clean-stageprofile-intl: clean-stageprofile-intl
+clean-stageprofile: clean-stageprofile-intl
+clean-stageprofile-intl:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stageprofile-intl/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif intl-bootstrap
+
+
+.PHONY: all-stagefeedback-intl maybe-all-stagefeedback-intl
+.PHONY: clean-stagefeedback-intl maybe-clean-stagefeedback-intl
+maybe-all-stagefeedback-intl:
+maybe-clean-stagefeedback-intl:
+@if intl-bootstrap
+maybe-all-stagefeedback-intl: all-stagefeedback-intl
+all-stagefeedback: all-stagefeedback-intl
+TARGET-stagefeedback-intl = $(TARGET-intl)
+all-stagefeedback-intl: configure-stagefeedback-intl
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-intl)
+
+maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
+clean-stagefeedback: clean-stagefeedback-intl
+clean-stagefeedback-intl:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stagefeedback-intl/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif intl-bootstrap
+
+
+
+
+
+.PHONY: check-intl maybe-check-intl
+maybe-check-intl:
+@if intl
+maybe-check-intl: check-intl
+
+check-intl:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/intl && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif intl
+
+.PHONY: install-intl maybe-install-intl
+maybe-install-intl:
+@if intl
+maybe-install-intl: install-intl
+
+install-intl: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/intl && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif intl
+
+.PHONY: install-strip-intl maybe-install-strip-intl
+maybe-install-strip-intl:
+@if intl
+maybe-install-strip-intl: install-strip-intl
+
+install-strip-intl: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/intl && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif intl
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-intl info-intl
+maybe-info-intl:
+@if intl
+maybe-info-intl: info-intl
+
+info-intl: \
+    configure-intl 
+	@[ -f ./intl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in intl" ; \
+	(cd $(HOST_SUBDIR)/intl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif intl
+
+.PHONY: maybe-dvi-intl dvi-intl
+maybe-dvi-intl:
+@if intl
+maybe-dvi-intl: dvi-intl
+
+dvi-intl: \
+    configure-intl 
+	@[ -f ./intl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in intl" ; \
+	(cd $(HOST_SUBDIR)/intl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif intl
+
+.PHONY: maybe-pdf-intl pdf-intl
+maybe-pdf-intl:
+@if intl
+maybe-pdf-intl: pdf-intl
+
+pdf-intl: \
+    configure-intl 
+	@[ -f ./intl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in intl" ; \
+	(cd $(HOST_SUBDIR)/intl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif intl
+
+.PHONY: maybe-html-intl html-intl
+maybe-html-intl:
+@if intl
+maybe-html-intl: html-intl
+
+html-intl: \
+    configure-intl 
+	@[ -f ./intl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in intl" ; \
+	(cd $(HOST_SUBDIR)/intl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif intl
+
+.PHONY: maybe-TAGS-intl TAGS-intl
+maybe-TAGS-intl:
+@if intl
+maybe-TAGS-intl: TAGS-intl
+
+TAGS-intl: \
+    configure-intl 
+	@[ -f ./intl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in intl" ; \
+	(cd $(HOST_SUBDIR)/intl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif intl
+
+.PHONY: maybe-install-info-intl install-info-intl
+maybe-install-info-intl:
+@if intl
+maybe-install-info-intl: install-info-intl
+
+install-info-intl: \
+    configure-intl \
+    info-intl 
+	@[ -f ./intl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in intl" ; \
+	(cd $(HOST_SUBDIR)/intl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif intl
+
+.PHONY: maybe-install-pdf-intl install-pdf-intl
+maybe-install-pdf-intl:
+@if intl
+maybe-install-pdf-intl: install-pdf-intl
+
+install-pdf-intl: \
+    configure-intl \
+    pdf-intl 
+	@[ -f ./intl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in intl" ; \
+	(cd $(HOST_SUBDIR)/intl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif intl
+
+.PHONY: maybe-install-html-intl install-html-intl
+maybe-install-html-intl:
+@if intl
+maybe-install-html-intl: install-html-intl
+
+install-html-intl: \
+    configure-intl \
+    html-intl 
+	@[ -f ./intl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in intl" ; \
+	(cd $(HOST_SUBDIR)/intl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif intl
+
+.PHONY: maybe-installcheck-intl installcheck-intl
+maybe-installcheck-intl:
+@if intl
+maybe-installcheck-intl: installcheck-intl
+
+installcheck-intl: \
+    configure-intl 
+	@[ -f ./intl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in intl" ; \
+	(cd $(HOST_SUBDIR)/intl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif intl
+
+.PHONY: maybe-mostlyclean-intl mostlyclean-intl
+maybe-mostlyclean-intl:
+@if intl
+maybe-mostlyclean-intl: mostlyclean-intl
+
+mostlyclean-intl: 
+	@[ -f ./intl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in intl" ; \
+	(cd $(HOST_SUBDIR)/intl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif intl
+
+.PHONY: maybe-clean-intl clean-intl
+maybe-clean-intl:
+@if intl
+maybe-clean-intl: clean-intl
+
+clean-intl: 
+	@[ -f ./intl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in intl" ; \
+	(cd $(HOST_SUBDIR)/intl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif intl
+
+.PHONY: maybe-distclean-intl distclean-intl
+maybe-distclean-intl:
+@if intl
+maybe-distclean-intl: distclean-intl
+
+distclean-intl: 
+	@[ -f ./intl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in intl" ; \
+	(cd $(HOST_SUBDIR)/intl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif intl
+
+.PHONY: maybe-maintainer-clean-intl maintainer-clean-intl
+maybe-maintainer-clean-intl:
+@if intl
+maybe-maintainer-clean-intl: maintainer-clean-intl
+
+maintainer-clean-intl: 
+	@[ -f ./intl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in intl" ; \
+	(cd $(HOST_SUBDIR)/intl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif intl
+
+
+
+.PHONY: configure-tcl maybe-configure-tcl
+maybe-configure-tcl:
+@if gcc-bootstrap
+configure-tcl: stage_current
+@endif gcc-bootstrap
+@if tcl
+maybe-configure-tcl: configure-tcl
+configure-tcl: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/tcl/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tcl ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/tcl; \
+	cd "$(HOST_SUBDIR)/tcl" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/tcl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/tcl"; \
+	libsrcdir="$$s/tcl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif tcl
+
+
+
+
+
+.PHONY: all-tcl maybe-all-tcl
+maybe-all-tcl:
+@if gcc-bootstrap
+all-tcl: stage_current
+@endif gcc-bootstrap
+@if tcl
+TARGET-tcl=all
+maybe-all-tcl: all-tcl
+all-tcl: configure-tcl
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/tcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-tcl))
+@endif tcl
+
+
+
+
+.PHONY: check-tcl maybe-check-tcl
+maybe-check-tcl:
+@if tcl
+maybe-check-tcl: check-tcl
+
+check-tcl:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/tcl && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif tcl
+
+.PHONY: install-tcl maybe-install-tcl
+maybe-install-tcl:
+@if tcl
+maybe-install-tcl: install-tcl
+
+install-tcl: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/tcl && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif tcl
+
+.PHONY: install-strip-tcl maybe-install-strip-tcl
+maybe-install-strip-tcl:
+@if tcl
+maybe-install-strip-tcl: install-strip-tcl
+
+install-strip-tcl: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/tcl && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif tcl
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-tcl info-tcl
+maybe-info-tcl:
+@if tcl
+maybe-info-tcl: info-tcl
+
+info-tcl: \
+    configure-tcl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in tcl" ; \
+	(cd $(HOST_SUBDIR)/tcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif tcl
+
+.PHONY: maybe-dvi-tcl dvi-tcl
+maybe-dvi-tcl:
+@if tcl
+maybe-dvi-tcl: dvi-tcl
+
+dvi-tcl: \
+    configure-tcl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in tcl" ; \
+	(cd $(HOST_SUBDIR)/tcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif tcl
+
+.PHONY: maybe-pdf-tcl pdf-tcl
+maybe-pdf-tcl:
+@if tcl
+maybe-pdf-tcl: pdf-tcl
+
+pdf-tcl: \
+    configure-tcl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in tcl" ; \
+	(cd $(HOST_SUBDIR)/tcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif tcl
+
+.PHONY: maybe-html-tcl html-tcl
+maybe-html-tcl:
+@if tcl
+maybe-html-tcl: html-tcl
+
+html-tcl: \
+    configure-tcl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in tcl" ; \
+	(cd $(HOST_SUBDIR)/tcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif tcl
+
+.PHONY: maybe-TAGS-tcl TAGS-tcl
+maybe-TAGS-tcl:
+@if tcl
+maybe-TAGS-tcl: TAGS-tcl
+
+TAGS-tcl: \
+    configure-tcl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in tcl" ; \
+	(cd $(HOST_SUBDIR)/tcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif tcl
+
+.PHONY: maybe-install-info-tcl install-info-tcl
+maybe-install-info-tcl:
+@if tcl
+maybe-install-info-tcl: install-info-tcl
+
+install-info-tcl: \
+    configure-tcl \
+    info-tcl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in tcl" ; \
+	(cd $(HOST_SUBDIR)/tcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif tcl
+
+.PHONY: maybe-install-pdf-tcl install-pdf-tcl
+maybe-install-pdf-tcl:
+@if tcl
+maybe-install-pdf-tcl: install-pdf-tcl
+
+install-pdf-tcl: \
+    configure-tcl \
+    pdf-tcl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in tcl" ; \
+	(cd $(HOST_SUBDIR)/tcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif tcl
+
+.PHONY: maybe-install-html-tcl install-html-tcl
+maybe-install-html-tcl:
+@if tcl
+maybe-install-html-tcl: install-html-tcl
+
+install-html-tcl: \
+    configure-tcl \
+    html-tcl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in tcl" ; \
+	(cd $(HOST_SUBDIR)/tcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif tcl
+
+.PHONY: maybe-installcheck-tcl installcheck-tcl
+maybe-installcheck-tcl:
+@if tcl
+maybe-installcheck-tcl: installcheck-tcl
+
+installcheck-tcl: \
+    configure-tcl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in tcl" ; \
+	(cd $(HOST_SUBDIR)/tcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif tcl
+
+.PHONY: maybe-mostlyclean-tcl mostlyclean-tcl
+maybe-mostlyclean-tcl:
+@if tcl
+maybe-mostlyclean-tcl: mostlyclean-tcl
+
+# tcl doesn't support mostlyclean.
+mostlyclean-tcl:
+
+@endif tcl
+
+.PHONY: maybe-clean-tcl clean-tcl
+maybe-clean-tcl:
+@if tcl
+maybe-clean-tcl: clean-tcl
+
+clean-tcl: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in tcl" ; \
+	(cd $(HOST_SUBDIR)/tcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif tcl
+
+.PHONY: maybe-distclean-tcl distclean-tcl
+maybe-distclean-tcl:
+@if tcl
+maybe-distclean-tcl: distclean-tcl
+
+distclean-tcl: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in tcl" ; \
+	(cd $(HOST_SUBDIR)/tcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif tcl
+
+.PHONY: maybe-maintainer-clean-tcl maintainer-clean-tcl
+maybe-maintainer-clean-tcl:
+@if tcl
+maybe-maintainer-clean-tcl: maintainer-clean-tcl
+
+maintainer-clean-tcl: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in tcl" ; \
+	(cd $(HOST_SUBDIR)/tcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif tcl
+
+
+
+.PHONY: configure-itcl maybe-configure-itcl
+maybe-configure-itcl:
+@if gcc-bootstrap
+configure-itcl: stage_current
+@endif gcc-bootstrap
+@if itcl
+maybe-configure-itcl: configure-itcl
+configure-itcl: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/itcl/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/itcl ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/itcl; \
+	cd "$(HOST_SUBDIR)/itcl" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/itcl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/itcl"; \
+	libsrcdir="$$s/itcl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif itcl
+
+
+
+
+
+.PHONY: all-itcl maybe-all-itcl
+maybe-all-itcl:
+@if gcc-bootstrap
+all-itcl: stage_current
+@endif gcc-bootstrap
+@if itcl
+TARGET-itcl=all
+maybe-all-itcl: all-itcl
+all-itcl: configure-itcl
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/itcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-itcl))
+@endif itcl
+
+
+
+
+.PHONY: check-itcl maybe-check-itcl
+maybe-check-itcl:
+@if itcl
+maybe-check-itcl: check-itcl
+
+check-itcl:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/itcl && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif itcl
+
+.PHONY: install-itcl maybe-install-itcl
+maybe-install-itcl:
+@if itcl
+maybe-install-itcl: install-itcl
+
+install-itcl: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/itcl && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif itcl
+
+.PHONY: install-strip-itcl maybe-install-strip-itcl
+maybe-install-strip-itcl:
+@if itcl
+maybe-install-strip-itcl: install-strip-itcl
+
+install-strip-itcl: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/itcl && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif itcl
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-itcl info-itcl
+maybe-info-itcl:
+@if itcl
+maybe-info-itcl: info-itcl
+
+info-itcl: \
+    configure-itcl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./itcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in itcl" ; \
+	(cd $(HOST_SUBDIR)/itcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif itcl
+
+.PHONY: maybe-dvi-itcl dvi-itcl
+maybe-dvi-itcl:
+@if itcl
+maybe-dvi-itcl: dvi-itcl
+
+dvi-itcl: \
+    configure-itcl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./itcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in itcl" ; \
+	(cd $(HOST_SUBDIR)/itcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif itcl
+
+.PHONY: maybe-pdf-itcl pdf-itcl
+maybe-pdf-itcl:
+@if itcl
+maybe-pdf-itcl: pdf-itcl
+
+pdf-itcl: \
+    configure-itcl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./itcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in itcl" ; \
+	(cd $(HOST_SUBDIR)/itcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif itcl
+
+.PHONY: maybe-html-itcl html-itcl
+maybe-html-itcl:
+@if itcl
+maybe-html-itcl: html-itcl
+
+html-itcl: \
+    configure-itcl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./itcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in itcl" ; \
+	(cd $(HOST_SUBDIR)/itcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif itcl
+
+.PHONY: maybe-TAGS-itcl TAGS-itcl
+maybe-TAGS-itcl:
+@if itcl
+maybe-TAGS-itcl: TAGS-itcl
+
+TAGS-itcl: \
+    configure-itcl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./itcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in itcl" ; \
+	(cd $(HOST_SUBDIR)/itcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif itcl
+
+.PHONY: maybe-install-info-itcl install-info-itcl
+maybe-install-info-itcl:
+@if itcl
+maybe-install-info-itcl: install-info-itcl
+
+install-info-itcl: \
+    configure-itcl \
+    info-itcl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./itcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in itcl" ; \
+	(cd $(HOST_SUBDIR)/itcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif itcl
+
+.PHONY: maybe-install-pdf-itcl install-pdf-itcl
+maybe-install-pdf-itcl:
+@if itcl
+maybe-install-pdf-itcl: install-pdf-itcl
+
+install-pdf-itcl: \
+    configure-itcl \
+    pdf-itcl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./itcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in itcl" ; \
+	(cd $(HOST_SUBDIR)/itcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif itcl
+
+.PHONY: maybe-install-html-itcl install-html-itcl
+maybe-install-html-itcl:
+@if itcl
+maybe-install-html-itcl: install-html-itcl
+
+install-html-itcl: \
+    configure-itcl \
+    html-itcl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./itcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in itcl" ; \
+	(cd $(HOST_SUBDIR)/itcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif itcl
+
+.PHONY: maybe-installcheck-itcl installcheck-itcl
+maybe-installcheck-itcl:
+@if itcl
+maybe-installcheck-itcl: installcheck-itcl
+
+installcheck-itcl: \
+    configure-itcl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./itcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in itcl" ; \
+	(cd $(HOST_SUBDIR)/itcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif itcl
+
+.PHONY: maybe-mostlyclean-itcl mostlyclean-itcl
+maybe-mostlyclean-itcl:
+@if itcl
+maybe-mostlyclean-itcl: mostlyclean-itcl
+
+mostlyclean-itcl: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./itcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in itcl" ; \
+	(cd $(HOST_SUBDIR)/itcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif itcl
+
+.PHONY: maybe-clean-itcl clean-itcl
+maybe-clean-itcl:
+@if itcl
+maybe-clean-itcl: clean-itcl
+
+clean-itcl: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./itcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in itcl" ; \
+	(cd $(HOST_SUBDIR)/itcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif itcl
+
+.PHONY: maybe-distclean-itcl distclean-itcl
+maybe-distclean-itcl:
+@if itcl
+maybe-distclean-itcl: distclean-itcl
+
+distclean-itcl: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./itcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in itcl" ; \
+	(cd $(HOST_SUBDIR)/itcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif itcl
+
+.PHONY: maybe-maintainer-clean-itcl maintainer-clean-itcl
+maybe-maintainer-clean-itcl:
+@if itcl
+maybe-maintainer-clean-itcl: maintainer-clean-itcl
+
+maintainer-clean-itcl: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./itcl/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in itcl" ; \
+	(cd $(HOST_SUBDIR)/itcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif itcl
+
+
+
+.PHONY: configure-ld maybe-configure-ld
+maybe-configure-ld:
+@if gcc-bootstrap
+configure-ld: stage_current
+@endif gcc-bootstrap
+@if ld
+maybe-configure-ld: configure-ld
+configure-ld: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/ld; \
+	cd "$(HOST_SUBDIR)/ld" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/ld"; \
+	libsrcdir="$$s/ld"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif ld
+
+
+
+.PHONY: configure-stage1-ld maybe-configure-stage1-ld
+maybe-configure-stage1-ld:
+@if ld-bootstrap
+maybe-configure-stage1-ld: configure-stage1-ld
+configure-stage1-ld:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
+	cd $(HOST_SUBDIR)/ld || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/ld"; \
+	libsrcdir="$$s/ld"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS)
+@endif ld-bootstrap
+
+.PHONY: configure-stage2-ld maybe-configure-stage2-ld
+maybe-configure-stage2-ld:
+@if ld-bootstrap
+maybe-configure-stage2-ld: configure-stage2-ld
+configure-stage2-ld:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(HOST_SUBDIR)/ld ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
+	cd $(HOST_SUBDIR)/ld || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/ld"; \
+	libsrcdir="$$s/ld"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS)
+@endif ld-bootstrap
+
+.PHONY: configure-stage3-ld maybe-configure-stage3-ld
+maybe-configure-stage3-ld:
+@if ld-bootstrap
+maybe-configure-stage3-ld: configure-stage3-ld
+configure-stage3-ld:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(HOST_SUBDIR)/ld ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
+	cd $(HOST_SUBDIR)/ld || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/ld"; \
+	libsrcdir="$$s/ld"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS)
+@endif ld-bootstrap
+
+.PHONY: configure-stage4-ld maybe-configure-stage4-ld
+maybe-configure-stage4-ld:
+@if ld-bootstrap
+maybe-configure-stage4-ld: configure-stage4-ld
+configure-stage4-ld:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(HOST_SUBDIR)/ld ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
+	cd $(HOST_SUBDIR)/ld || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/ld"; \
+	libsrcdir="$$s/ld"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS)
+@endif ld-bootstrap
+
+.PHONY: configure-stageprofile-ld maybe-configure-stageprofile-ld
+maybe-configure-stageprofile-ld:
+@if ld-bootstrap
+maybe-configure-stageprofile-ld: configure-stageprofile-ld
+configure-stageprofile-ld:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(HOST_SUBDIR)/ld ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
+	cd $(HOST_SUBDIR)/ld || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/ld"; \
+	libsrcdir="$$s/ld"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS)
+@endif ld-bootstrap
+
+.PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld
+maybe-configure-stagefeedback-ld:
+@if ld-bootstrap
+maybe-configure-stagefeedback-ld: configure-stagefeedback-ld
+configure-stagefeedback-ld:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(HOST_SUBDIR)/ld ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
+	cd $(HOST_SUBDIR)/ld || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/ld"; \
+	libsrcdir="$$s/ld"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif ld-bootstrap
+
+
+
+
+
+.PHONY: all-ld maybe-all-ld
+maybe-all-ld:
+@if gcc-bootstrap
+all-ld: stage_current
+@endif gcc-bootstrap
+@if ld
+TARGET-ld=all
+maybe-all-ld: all-ld
+all-ld: configure-ld
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/ld && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-ld))
+@endif ld
+
+
+
+.PHONY: all-stage1-ld maybe-all-stage1-ld
+.PHONY: clean-stage1-ld maybe-clean-stage1-ld
+maybe-all-stage1-ld:
+maybe-clean-stage1-ld:
+@if ld-bootstrap
+maybe-all-stage1-ld: all-stage1-ld
+all-stage1: all-stage1-ld
+TARGET-stage1-ld = $(TARGET-ld)
+all-stage1-ld: configure-stage1-ld
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-ld)
+
+maybe-clean-stage1-ld: clean-stage1-ld
+clean-stage1: clean-stage1-ld
+clean-stage1-ld:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage1-ld/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		 clean
+@endif ld-bootstrap
+
+
+.PHONY: all-stage2-ld maybe-all-stage2-ld
+.PHONY: clean-stage2-ld maybe-clean-stage2-ld
+maybe-all-stage2-ld:
+maybe-clean-stage2-ld:
+@if ld-bootstrap
+maybe-all-stage2-ld: all-stage2-ld
+all-stage2: all-stage2-ld
+TARGET-stage2-ld = $(TARGET-ld)
+all-stage2-ld: configure-stage2-ld
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-ld)
+
+maybe-clean-stage2-ld: clean-stage2-ld
+clean-stage2: clean-stage2-ld
+clean-stage2-ld:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage2-ld/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif ld-bootstrap
+
+
+.PHONY: all-stage3-ld maybe-all-stage3-ld
+.PHONY: clean-stage3-ld maybe-clean-stage3-ld
+maybe-all-stage3-ld:
+maybe-clean-stage3-ld:
+@if ld-bootstrap
+maybe-all-stage3-ld: all-stage3-ld
+all-stage3: all-stage3-ld
+TARGET-stage3-ld = $(TARGET-ld)
+all-stage3-ld: configure-stage3-ld
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-ld)
+
+maybe-clean-stage3-ld: clean-stage3-ld
+clean-stage3: clean-stage3-ld
+clean-stage3-ld:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage3-ld/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif ld-bootstrap
+
+
+.PHONY: all-stage4-ld maybe-all-stage4-ld
+.PHONY: clean-stage4-ld maybe-clean-stage4-ld
+maybe-all-stage4-ld:
+maybe-clean-stage4-ld:
+@if ld-bootstrap
+maybe-all-stage4-ld: all-stage4-ld
+all-stage4: all-stage4-ld
+TARGET-stage4-ld = $(TARGET-ld)
+all-stage4-ld: configure-stage4-ld
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE4_CFLAGS)" \
+		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-ld)
+
+maybe-clean-stage4-ld: clean-stage4-ld
+clean-stage4: clean-stage4-ld
+clean-stage4-ld:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage4-ld/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif ld-bootstrap
+
+
+.PHONY: all-stageprofile-ld maybe-all-stageprofile-ld
+.PHONY: clean-stageprofile-ld maybe-clean-stageprofile-ld
+maybe-all-stageprofile-ld:
+maybe-clean-stageprofile-ld:
+@if ld-bootstrap
+maybe-all-stageprofile-ld: all-stageprofile-ld
+all-stageprofile: all-stageprofile-ld
+TARGET-stageprofile-ld = $(TARGET-ld)
+all-stageprofile-ld: configure-stageprofile-ld
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-ld)
+
+maybe-clean-stageprofile-ld: clean-stageprofile-ld
+clean-stageprofile: clean-stageprofile-ld
+clean-stageprofile-ld:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stageprofile-ld/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif ld-bootstrap
+
+
+.PHONY: all-stagefeedback-ld maybe-all-stagefeedback-ld
+.PHONY: clean-stagefeedback-ld maybe-clean-stagefeedback-ld
+maybe-all-stagefeedback-ld:
+maybe-clean-stagefeedback-ld:
+@if ld-bootstrap
+maybe-all-stagefeedback-ld: all-stagefeedback-ld
+all-stagefeedback: all-stagefeedback-ld
+TARGET-stagefeedback-ld = $(TARGET-ld)
+all-stagefeedback-ld: configure-stagefeedback-ld
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-ld)
+
+maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
+clean-stagefeedback: clean-stagefeedback-ld
+clean-stagefeedback-ld:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stagefeedback-ld/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif ld-bootstrap
+
+
+
+
+
+.PHONY: check-ld maybe-check-ld
+maybe-check-ld:
+@if ld
+maybe-check-ld: check-ld
+
+check-ld:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/ld && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif ld
+
+.PHONY: install-ld maybe-install-ld
+maybe-install-ld:
+@if ld
+maybe-install-ld: install-ld
+
+install-ld: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/ld && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif ld
+
+.PHONY: install-strip-ld maybe-install-strip-ld
+maybe-install-strip-ld:
+@if ld
+maybe-install-strip-ld: install-strip-ld
+
+install-strip-ld: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/ld && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif ld
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-ld info-ld
+maybe-info-ld:
+@if ld
+maybe-info-ld: info-ld
+
+info-ld: \
+    configure-ld 
+	@[ -f ./ld/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in ld" ; \
+	(cd $(HOST_SUBDIR)/ld && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif ld
+
+.PHONY: maybe-dvi-ld dvi-ld
+maybe-dvi-ld:
+@if ld
+maybe-dvi-ld: dvi-ld
+
+dvi-ld: \
+    configure-ld 
+	@[ -f ./ld/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in ld" ; \
+	(cd $(HOST_SUBDIR)/ld && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif ld
+
+.PHONY: maybe-pdf-ld pdf-ld
+maybe-pdf-ld:
+@if ld
+maybe-pdf-ld: pdf-ld
+
+pdf-ld: \
+    configure-ld 
+	@[ -f ./ld/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in ld" ; \
+	(cd $(HOST_SUBDIR)/ld && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif ld
+
+.PHONY: maybe-html-ld html-ld
+maybe-html-ld:
+@if ld
+maybe-html-ld: html-ld
+
+html-ld: \
+    configure-ld 
+	@[ -f ./ld/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in ld" ; \
+	(cd $(HOST_SUBDIR)/ld && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif ld
+
+.PHONY: maybe-TAGS-ld TAGS-ld
+maybe-TAGS-ld:
+@if ld
+maybe-TAGS-ld: TAGS-ld
+
+TAGS-ld: \
+    configure-ld 
+	@[ -f ./ld/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in ld" ; \
+	(cd $(HOST_SUBDIR)/ld && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif ld
+
+.PHONY: maybe-install-info-ld install-info-ld
+maybe-install-info-ld:
+@if ld
+maybe-install-info-ld: install-info-ld
+
+install-info-ld: \
+    configure-ld \
+    info-ld 
+	@[ -f ./ld/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in ld" ; \
+	(cd $(HOST_SUBDIR)/ld && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif ld
+
+.PHONY: maybe-install-pdf-ld install-pdf-ld
+maybe-install-pdf-ld:
+@if ld
+maybe-install-pdf-ld: install-pdf-ld
+
+install-pdf-ld: \
+    configure-ld \
+    pdf-ld 
+	@[ -f ./ld/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in ld" ; \
+	(cd $(HOST_SUBDIR)/ld && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif ld
+
+.PHONY: maybe-install-html-ld install-html-ld
+maybe-install-html-ld:
+@if ld
+maybe-install-html-ld: install-html-ld
+
+install-html-ld: \
+    configure-ld \
+    html-ld 
+	@[ -f ./ld/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in ld" ; \
+	(cd $(HOST_SUBDIR)/ld && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif ld
+
+.PHONY: maybe-installcheck-ld installcheck-ld
+maybe-installcheck-ld:
+@if ld
+maybe-installcheck-ld: installcheck-ld
+
+installcheck-ld: \
+    configure-ld 
+	@[ -f ./ld/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in ld" ; \
+	(cd $(HOST_SUBDIR)/ld && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif ld
+
+.PHONY: maybe-mostlyclean-ld mostlyclean-ld
+maybe-mostlyclean-ld:
+@if ld
+maybe-mostlyclean-ld: mostlyclean-ld
+
+mostlyclean-ld: 
+	@[ -f ./ld/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in ld" ; \
+	(cd $(HOST_SUBDIR)/ld && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif ld
+
+.PHONY: maybe-clean-ld clean-ld
+maybe-clean-ld:
+@if ld
+maybe-clean-ld: clean-ld
+
+clean-ld: 
+	@[ -f ./ld/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in ld" ; \
+	(cd $(HOST_SUBDIR)/ld && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif ld
+
+.PHONY: maybe-distclean-ld distclean-ld
+maybe-distclean-ld:
+@if ld
+maybe-distclean-ld: distclean-ld
+
+distclean-ld: 
+	@[ -f ./ld/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in ld" ; \
+	(cd $(HOST_SUBDIR)/ld && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif ld
+
+.PHONY: maybe-maintainer-clean-ld maintainer-clean-ld
+maybe-maintainer-clean-ld:
+@if ld
+maybe-maintainer-clean-ld: maintainer-clean-ld
+
+maintainer-clean-ld: 
+	@[ -f ./ld/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in ld" ; \
+	(cd $(HOST_SUBDIR)/ld && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif ld
+
+
+
+.PHONY: configure-libcpp maybe-configure-libcpp
+maybe-configure-libcpp:
+@if gcc-bootstrap
+configure-libcpp: stage_current
+@endif gcc-bootstrap
+@if libcpp
+maybe-configure-libcpp: configure-libcpp
+configure-libcpp: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/libcpp; \
+	cd "$(HOST_SUBDIR)/libcpp" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libcpp"; \
+	libsrcdir="$$s/libcpp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif libcpp
+
+
+
+.PHONY: configure-stage1-libcpp maybe-configure-stage1-libcpp
+maybe-configure-stage1-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stage1-libcpp: configure-stage1-libcpp
+configure-stage1-libcpp:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
+	cd $(HOST_SUBDIR)/libcpp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libcpp"; \
+	libsrcdir="$$s/libcpp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS)
+@endif libcpp-bootstrap
+
+.PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp
+maybe-configure-stage2-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stage2-libcpp: configure-stage2-libcpp
+configure-stage2-libcpp:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(HOST_SUBDIR)/libcpp ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
+	cd $(HOST_SUBDIR)/libcpp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libcpp"; \
+	libsrcdir="$$s/libcpp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS)
+@endif libcpp-bootstrap
+
+.PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp
+maybe-configure-stage3-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stage3-libcpp: configure-stage3-libcpp
+configure-stage3-libcpp:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(HOST_SUBDIR)/libcpp ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
+	cd $(HOST_SUBDIR)/libcpp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libcpp"; \
+	libsrcdir="$$s/libcpp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS)
+@endif libcpp-bootstrap
+
+.PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp
+maybe-configure-stage4-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stage4-libcpp: configure-stage4-libcpp
+configure-stage4-libcpp:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
+	cd $(HOST_SUBDIR)/libcpp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libcpp"; \
+	libsrcdir="$$s/libcpp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS)
+@endif libcpp-bootstrap
+
+.PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp
+maybe-configure-stageprofile-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp
+configure-stageprofile-libcpp:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(HOST_SUBDIR)/libcpp ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
+	cd $(HOST_SUBDIR)/libcpp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libcpp"; \
+	libsrcdir="$$s/libcpp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS)
+@endif libcpp-bootstrap
+
+.PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp
+maybe-configure-stagefeedback-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp
+configure-stagefeedback-libcpp:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
+	cd $(HOST_SUBDIR)/libcpp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libcpp"; \
+	libsrcdir="$$s/libcpp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif libcpp-bootstrap
+
+
+
+
+
+.PHONY: all-libcpp maybe-all-libcpp
+maybe-all-libcpp:
+@if gcc-bootstrap
+all-libcpp: stage_current
+@endif gcc-bootstrap
+@if libcpp
+TARGET-libcpp=all
+maybe-all-libcpp: all-libcpp
+all-libcpp: configure-libcpp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/libcpp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-libcpp))
+@endif libcpp
+
+
+
+.PHONY: all-stage1-libcpp maybe-all-stage1-libcpp
+.PHONY: clean-stage1-libcpp maybe-clean-stage1-libcpp
+maybe-all-stage1-libcpp:
+maybe-clean-stage1-libcpp:
+@if libcpp-bootstrap
+maybe-all-stage1-libcpp: all-stage1-libcpp
+all-stage1: all-stage1-libcpp
+TARGET-stage1-libcpp = $(TARGET-libcpp)
+all-stage1-libcpp: configure-stage1-libcpp
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-libcpp)
+
+maybe-clean-stage1-libcpp: clean-stage1-libcpp
+clean-stage1: clean-stage1-libcpp
+clean-stage1-libcpp:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage1-libcpp/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		 clean
+@endif libcpp-bootstrap
+
+
+.PHONY: all-stage2-libcpp maybe-all-stage2-libcpp
+.PHONY: clean-stage2-libcpp maybe-clean-stage2-libcpp
+maybe-all-stage2-libcpp:
+maybe-clean-stage2-libcpp:
+@if libcpp-bootstrap
+maybe-all-stage2-libcpp: all-stage2-libcpp
+all-stage2: all-stage2-libcpp
+TARGET-stage2-libcpp = $(TARGET-libcpp)
+all-stage2-libcpp: configure-stage2-libcpp
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-libcpp)
+
+maybe-clean-stage2-libcpp: clean-stage2-libcpp
+clean-stage2: clean-stage2-libcpp
+clean-stage2-libcpp:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage2-libcpp/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif libcpp-bootstrap
+
+
+.PHONY: all-stage3-libcpp maybe-all-stage3-libcpp
+.PHONY: clean-stage3-libcpp maybe-clean-stage3-libcpp
+maybe-all-stage3-libcpp:
+maybe-clean-stage3-libcpp:
+@if libcpp-bootstrap
+maybe-all-stage3-libcpp: all-stage3-libcpp
+all-stage3: all-stage3-libcpp
+TARGET-stage3-libcpp = $(TARGET-libcpp)
+all-stage3-libcpp: configure-stage3-libcpp
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-libcpp)
+
+maybe-clean-stage3-libcpp: clean-stage3-libcpp
+clean-stage3: clean-stage3-libcpp
+clean-stage3-libcpp:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage3-libcpp/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif libcpp-bootstrap
+
+
+.PHONY: all-stage4-libcpp maybe-all-stage4-libcpp
+.PHONY: clean-stage4-libcpp maybe-clean-stage4-libcpp
+maybe-all-stage4-libcpp:
+maybe-clean-stage4-libcpp:
+@if libcpp-bootstrap
+maybe-all-stage4-libcpp: all-stage4-libcpp
+all-stage4: all-stage4-libcpp
+TARGET-stage4-libcpp = $(TARGET-libcpp)
+all-stage4-libcpp: configure-stage4-libcpp
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE4_CFLAGS)" \
+		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-libcpp)
+
+maybe-clean-stage4-libcpp: clean-stage4-libcpp
+clean-stage4: clean-stage4-libcpp
+clean-stage4-libcpp:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage4-libcpp/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif libcpp-bootstrap
+
+
+.PHONY: all-stageprofile-libcpp maybe-all-stageprofile-libcpp
+.PHONY: clean-stageprofile-libcpp maybe-clean-stageprofile-libcpp
+maybe-all-stageprofile-libcpp:
+maybe-clean-stageprofile-libcpp:
+@if libcpp-bootstrap
+maybe-all-stageprofile-libcpp: all-stageprofile-libcpp
+all-stageprofile: all-stageprofile-libcpp
+TARGET-stageprofile-libcpp = $(TARGET-libcpp)
+all-stageprofile-libcpp: configure-stageprofile-libcpp
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-libcpp)
+
+maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
+clean-stageprofile: clean-stageprofile-libcpp
+clean-stageprofile-libcpp:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stageprofile-libcpp/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif libcpp-bootstrap
+
+
+.PHONY: all-stagefeedback-libcpp maybe-all-stagefeedback-libcpp
+.PHONY: clean-stagefeedback-libcpp maybe-clean-stagefeedback-libcpp
+maybe-all-stagefeedback-libcpp:
+maybe-clean-stagefeedback-libcpp:
+@if libcpp-bootstrap
+maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp
+all-stagefeedback: all-stagefeedback-libcpp
+TARGET-stagefeedback-libcpp = $(TARGET-libcpp)
+all-stagefeedback-libcpp: configure-stagefeedback-libcpp
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-libcpp)
+
+maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
+clean-stagefeedback: clean-stagefeedback-libcpp
+clean-stagefeedback-libcpp:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stagefeedback-libcpp/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif libcpp-bootstrap
+
+
+
+
+
+.PHONY: check-libcpp maybe-check-libcpp
+maybe-check-libcpp:
+@if libcpp
+maybe-check-libcpp: check-libcpp
+
+check-libcpp:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/libcpp && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif libcpp
+
+.PHONY: install-libcpp maybe-install-libcpp
+maybe-install-libcpp:
+@if libcpp
+maybe-install-libcpp: install-libcpp
+
+install-libcpp: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/libcpp && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif libcpp
+
+.PHONY: install-strip-libcpp maybe-install-strip-libcpp
+maybe-install-strip-libcpp:
+@if libcpp
+maybe-install-strip-libcpp: install-strip-libcpp
+
+install-strip-libcpp: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/libcpp && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif libcpp
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-libcpp info-libcpp
+maybe-info-libcpp:
+@if libcpp
+maybe-info-libcpp: info-libcpp
+
+info-libcpp: \
+    configure-libcpp 
+	@[ -f ./libcpp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in libcpp" ; \
+	(cd $(HOST_SUBDIR)/libcpp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif libcpp
+
+.PHONY: maybe-dvi-libcpp dvi-libcpp
+maybe-dvi-libcpp:
+@if libcpp
+maybe-dvi-libcpp: dvi-libcpp
+
+dvi-libcpp: \
+    configure-libcpp 
+	@[ -f ./libcpp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in libcpp" ; \
+	(cd $(HOST_SUBDIR)/libcpp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif libcpp
+
+.PHONY: maybe-pdf-libcpp pdf-libcpp
+maybe-pdf-libcpp:
+@if libcpp
+maybe-pdf-libcpp: pdf-libcpp
+
+pdf-libcpp: \
+    configure-libcpp 
+	@[ -f ./libcpp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in libcpp" ; \
+	(cd $(HOST_SUBDIR)/libcpp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif libcpp
+
+.PHONY: maybe-html-libcpp html-libcpp
+maybe-html-libcpp:
+@if libcpp
+maybe-html-libcpp: html-libcpp
+
+html-libcpp: \
+    configure-libcpp 
+	@[ -f ./libcpp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in libcpp" ; \
+	(cd $(HOST_SUBDIR)/libcpp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif libcpp
+
+.PHONY: maybe-TAGS-libcpp TAGS-libcpp
+maybe-TAGS-libcpp:
+@if libcpp
+maybe-TAGS-libcpp: TAGS-libcpp
+
+TAGS-libcpp: \
+    configure-libcpp 
+	@[ -f ./libcpp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in libcpp" ; \
+	(cd $(HOST_SUBDIR)/libcpp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif libcpp
+
+.PHONY: maybe-install-info-libcpp install-info-libcpp
+maybe-install-info-libcpp:
+@if libcpp
+maybe-install-info-libcpp: install-info-libcpp
+
+install-info-libcpp: \
+    configure-libcpp \
+    info-libcpp 
+	@[ -f ./libcpp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in libcpp" ; \
+	(cd $(HOST_SUBDIR)/libcpp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif libcpp
+
+.PHONY: maybe-install-pdf-libcpp install-pdf-libcpp
+maybe-install-pdf-libcpp:
+@if libcpp
+maybe-install-pdf-libcpp: install-pdf-libcpp
+
+install-pdf-libcpp: \
+    configure-libcpp \
+    pdf-libcpp 
+	@[ -f ./libcpp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in libcpp" ; \
+	(cd $(HOST_SUBDIR)/libcpp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif libcpp
+
+.PHONY: maybe-install-html-libcpp install-html-libcpp
+maybe-install-html-libcpp:
+@if libcpp
+maybe-install-html-libcpp: install-html-libcpp
+
+install-html-libcpp: \
+    configure-libcpp \
+    html-libcpp 
+	@[ -f ./libcpp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in libcpp" ; \
+	(cd $(HOST_SUBDIR)/libcpp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif libcpp
+
+.PHONY: maybe-installcheck-libcpp installcheck-libcpp
+maybe-installcheck-libcpp:
+@if libcpp
+maybe-installcheck-libcpp: installcheck-libcpp
+
+installcheck-libcpp: \
+    configure-libcpp 
+	@[ -f ./libcpp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in libcpp" ; \
+	(cd $(HOST_SUBDIR)/libcpp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif libcpp
+
+.PHONY: maybe-mostlyclean-libcpp mostlyclean-libcpp
+maybe-mostlyclean-libcpp:
+@if libcpp
+maybe-mostlyclean-libcpp: mostlyclean-libcpp
+
+mostlyclean-libcpp: 
+	@[ -f ./libcpp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in libcpp" ; \
+	(cd $(HOST_SUBDIR)/libcpp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif libcpp
+
+.PHONY: maybe-clean-libcpp clean-libcpp
+maybe-clean-libcpp:
+@if libcpp
+maybe-clean-libcpp: clean-libcpp
+
+clean-libcpp: 
+	@[ -f ./libcpp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in libcpp" ; \
+	(cd $(HOST_SUBDIR)/libcpp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif libcpp
+
+.PHONY: maybe-distclean-libcpp distclean-libcpp
+maybe-distclean-libcpp:
+@if libcpp
+maybe-distclean-libcpp: distclean-libcpp
+
+distclean-libcpp: 
+	@[ -f ./libcpp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in libcpp" ; \
+	(cd $(HOST_SUBDIR)/libcpp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif libcpp
+
+.PHONY: maybe-maintainer-clean-libcpp maintainer-clean-libcpp
+maybe-maintainer-clean-libcpp:
+@if libcpp
+maybe-maintainer-clean-libcpp: maintainer-clean-libcpp
+
+maintainer-clean-libcpp: 
+	@[ -f ./libcpp/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in libcpp" ; \
+	(cd $(HOST_SUBDIR)/libcpp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif libcpp
+
+
+
+.PHONY: configure-libdecnumber maybe-configure-libdecnumber
+maybe-configure-libdecnumber:
+@if gcc-bootstrap
+configure-libdecnumber: stage_current
+@endif gcc-bootstrap
+@if libdecnumber
+maybe-configure-libdecnumber: configure-libdecnumber
+configure-libdecnumber: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/libdecnumber; \
+	cd "$(HOST_SUBDIR)/libdecnumber" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
+	libsrcdir="$$s/libdecnumber"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif libdecnumber
+
+
+
+.PHONY: configure-stage1-libdecnumber maybe-configure-stage1-libdecnumber
+maybe-configure-stage1-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stage1-libdecnumber: configure-stage1-libdecnumber
+configure-stage1-libdecnumber:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
+	libsrcdir="$$s/libdecnumber"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
+
+.PHONY: configure-stage2-libdecnumber maybe-configure-stage2-libdecnumber
+maybe-configure-stage2-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stage2-libdecnumber: configure-stage2-libdecnumber
+configure-stage2-libdecnumber:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(HOST_SUBDIR)/libdecnumber ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
+	libsrcdir="$$s/libdecnumber"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
+
+.PHONY: configure-stage3-libdecnumber maybe-configure-stage3-libdecnumber
+maybe-configure-stage3-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stage3-libdecnumber: configure-stage3-libdecnumber
+configure-stage3-libdecnumber:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(HOST_SUBDIR)/libdecnumber ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
+	libsrcdir="$$s/libdecnumber"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
+
+.PHONY: configure-stage4-libdecnumber maybe-configure-stage4-libdecnumber
+maybe-configure-stage4-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stage4-libdecnumber: configure-stage4-libdecnumber
+configure-stage4-libdecnumber:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(HOST_SUBDIR)/libdecnumber ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
+	libsrcdir="$$s/libdecnumber"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
+
+.PHONY: configure-stageprofile-libdecnumber maybe-configure-stageprofile-libdecnumber
+maybe-configure-stageprofile-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
+configure-stageprofile-libdecnumber:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
+	libsrcdir="$$s/libdecnumber"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
+
+.PHONY: configure-stagefeedback-libdecnumber maybe-configure-stagefeedback-libdecnumber
+maybe-configure-stagefeedback-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
+configure-stagefeedback-libdecnumber:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(HOST_SUBDIR)/libdecnumber ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
+	libsrcdir="$$s/libdecnumber"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
+
+
+
+
+
+.PHONY: all-libdecnumber maybe-all-libdecnumber
+maybe-all-libdecnumber:
+@if gcc-bootstrap
+all-libdecnumber: stage_current
+@endif gcc-bootstrap
+@if libdecnumber
+TARGET-libdecnumber=all
+maybe-all-libdecnumber: all-libdecnumber
+all-libdecnumber: configure-libdecnumber
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/libdecnumber && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-libdecnumber))
+@endif libdecnumber
+
+
+
+.PHONY: all-stage1-libdecnumber maybe-all-stage1-libdecnumber
+.PHONY: clean-stage1-libdecnumber maybe-clean-stage1-libdecnumber
+maybe-all-stage1-libdecnumber:
+maybe-clean-stage1-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stage1-libdecnumber: all-stage1-libdecnumber
+all-stage1: all-stage1-libdecnumber
+TARGET-stage1-libdecnumber = $(TARGET-libdecnumber)
+all-stage1-libdecnumber: configure-stage1-libdecnumber
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libdecnumber && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-libdecnumber)
+
+maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber
+clean-stage1: clean-stage1-libdecnumber
+clean-stage1-libdecnumber:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage1-libdecnumber/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libdecnumber && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		 clean
+@endif libdecnumber-bootstrap
+
+
+.PHONY: all-stage2-libdecnumber maybe-all-stage2-libdecnumber
+.PHONY: clean-stage2-libdecnumber maybe-clean-stage2-libdecnumber
+maybe-all-stage2-libdecnumber:
+maybe-clean-stage2-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stage2-libdecnumber: all-stage2-libdecnumber
+all-stage2: all-stage2-libdecnumber
+TARGET-stage2-libdecnumber = $(TARGET-libdecnumber)
+all-stage2-libdecnumber: configure-stage2-libdecnumber
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libdecnumber && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-libdecnumber)
+
+maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber
+clean-stage2: clean-stage2-libdecnumber
+clean-stage2-libdecnumber:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage2-libdecnumber/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libdecnumber && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif libdecnumber-bootstrap
+
+
+.PHONY: all-stage3-libdecnumber maybe-all-stage3-libdecnumber
+.PHONY: clean-stage3-libdecnumber maybe-clean-stage3-libdecnumber
+maybe-all-stage3-libdecnumber:
+maybe-clean-stage3-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stage3-libdecnumber: all-stage3-libdecnumber
+all-stage3: all-stage3-libdecnumber
+TARGET-stage3-libdecnumber = $(TARGET-libdecnumber)
+all-stage3-libdecnumber: configure-stage3-libdecnumber
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libdecnumber && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-libdecnumber)
+
+maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber
+clean-stage3: clean-stage3-libdecnumber
+clean-stage3-libdecnumber:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage3-libdecnumber/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libdecnumber && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif libdecnumber-bootstrap
+
+
+.PHONY: all-stage4-libdecnumber maybe-all-stage4-libdecnumber
+.PHONY: clean-stage4-libdecnumber maybe-clean-stage4-libdecnumber
+maybe-all-stage4-libdecnumber:
+maybe-clean-stage4-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stage4-libdecnumber: all-stage4-libdecnumber
+all-stage4: all-stage4-libdecnumber
+TARGET-stage4-libdecnumber = $(TARGET-libdecnumber)
+all-stage4-libdecnumber: configure-stage4-libdecnumber
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libdecnumber && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE4_CFLAGS)" \
+		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-libdecnumber)
+
+maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber
+clean-stage4: clean-stage4-libdecnumber
+clean-stage4-libdecnumber:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage4-libdecnumber/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libdecnumber && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif libdecnumber-bootstrap
+
+
+.PHONY: all-stageprofile-libdecnumber maybe-all-stageprofile-libdecnumber
+.PHONY: clean-stageprofile-libdecnumber maybe-clean-stageprofile-libdecnumber
+maybe-all-stageprofile-libdecnumber:
+maybe-clean-stageprofile-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stageprofile-libdecnumber: all-stageprofile-libdecnumber
+all-stageprofile: all-stageprofile-libdecnumber
+TARGET-stageprofile-libdecnumber = $(TARGET-libdecnumber)
+all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libdecnumber && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-libdecnumber)
+
+maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber
+clean-stageprofile: clean-stageprofile-libdecnumber
+clean-stageprofile-libdecnumber:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stageprofile-libdecnumber/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libdecnumber && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif libdecnumber-bootstrap
+
+
+.PHONY: all-stagefeedback-libdecnumber maybe-all-stagefeedback-libdecnumber
+.PHONY: clean-stagefeedback-libdecnumber maybe-clean-stagefeedback-libdecnumber
+maybe-all-stagefeedback-libdecnumber:
+maybe-clean-stagefeedback-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stagefeedback-libdecnumber: all-stagefeedback-libdecnumber
+all-stagefeedback: all-stagefeedback-libdecnumber
+TARGET-stagefeedback-libdecnumber = $(TARGET-libdecnumber)
+all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libdecnumber && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-libdecnumber)
+
+maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber
+clean-stagefeedback: clean-stagefeedback-libdecnumber
+clean-stagefeedback-libdecnumber:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stagefeedback-libdecnumber/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libdecnumber && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif libdecnumber-bootstrap
+
+
+
+
+
+.PHONY: check-libdecnumber maybe-check-libdecnumber
+maybe-check-libdecnumber:
+@if libdecnumber
+maybe-check-libdecnumber: check-libdecnumber
+
+check-libdecnumber:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/libdecnumber && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif libdecnumber
+
+.PHONY: install-libdecnumber maybe-install-libdecnumber
+maybe-install-libdecnumber:
+@if libdecnumber
+maybe-install-libdecnumber: install-libdecnumber
+
+install-libdecnumber: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/libdecnumber && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif libdecnumber
+
+.PHONY: install-strip-libdecnumber maybe-install-strip-libdecnumber
+maybe-install-strip-libdecnumber:
+@if libdecnumber
+maybe-install-strip-libdecnumber: install-strip-libdecnumber
+
+install-strip-libdecnumber: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/libdecnumber && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif libdecnumber
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-libdecnumber info-libdecnumber
+maybe-info-libdecnumber:
+@if libdecnumber
+maybe-info-libdecnumber: info-libdecnumber
+
+info-libdecnumber: \
+    configure-libdecnumber 
+	@[ -f ./libdecnumber/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in libdecnumber" ; \
+	(cd $(HOST_SUBDIR)/libdecnumber && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-dvi-libdecnumber dvi-libdecnumber
+maybe-dvi-libdecnumber:
+@if libdecnumber
+maybe-dvi-libdecnumber: dvi-libdecnumber
+
+dvi-libdecnumber: \
+    configure-libdecnumber 
+	@[ -f ./libdecnumber/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in libdecnumber" ; \
+	(cd $(HOST_SUBDIR)/libdecnumber && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-pdf-libdecnumber pdf-libdecnumber
+maybe-pdf-libdecnumber:
+@if libdecnumber
+maybe-pdf-libdecnumber: pdf-libdecnumber
+
+pdf-libdecnumber: \
+    configure-libdecnumber 
+	@[ -f ./libdecnumber/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in libdecnumber" ; \
+	(cd $(HOST_SUBDIR)/libdecnumber && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-html-libdecnumber html-libdecnumber
+maybe-html-libdecnumber:
+@if libdecnumber
+maybe-html-libdecnumber: html-libdecnumber
+
+html-libdecnumber: \
+    configure-libdecnumber 
+	@[ -f ./libdecnumber/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in libdecnumber" ; \
+	(cd $(HOST_SUBDIR)/libdecnumber && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-TAGS-libdecnumber TAGS-libdecnumber
+maybe-TAGS-libdecnumber:
+@if libdecnumber
+maybe-TAGS-libdecnumber: TAGS-libdecnumber
+
+TAGS-libdecnumber: \
+    configure-libdecnumber 
+	@[ -f ./libdecnumber/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in libdecnumber" ; \
+	(cd $(HOST_SUBDIR)/libdecnumber && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-install-info-libdecnumber install-info-libdecnumber
+maybe-install-info-libdecnumber:
+@if libdecnumber
+maybe-install-info-libdecnumber: install-info-libdecnumber
+
+install-info-libdecnumber: \
+    configure-libdecnumber \
+    info-libdecnumber 
+	@[ -f ./libdecnumber/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in libdecnumber" ; \
+	(cd $(HOST_SUBDIR)/libdecnumber && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-install-pdf-libdecnumber install-pdf-libdecnumber
+maybe-install-pdf-libdecnumber:
+@if libdecnumber
+maybe-install-pdf-libdecnumber: install-pdf-libdecnumber
+
+install-pdf-libdecnumber: \
+    configure-libdecnumber \
+    pdf-libdecnumber 
+	@[ -f ./libdecnumber/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in libdecnumber" ; \
+	(cd $(HOST_SUBDIR)/libdecnumber && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-install-html-libdecnumber install-html-libdecnumber
+maybe-install-html-libdecnumber:
+@if libdecnumber
+maybe-install-html-libdecnumber: install-html-libdecnumber
+
+install-html-libdecnumber: \
+    configure-libdecnumber \
+    html-libdecnumber 
+	@[ -f ./libdecnumber/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in libdecnumber" ; \
+	(cd $(HOST_SUBDIR)/libdecnumber && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-installcheck-libdecnumber installcheck-libdecnumber
+maybe-installcheck-libdecnumber:
+@if libdecnumber
+maybe-installcheck-libdecnumber: installcheck-libdecnumber
+
+installcheck-libdecnumber: \
+    configure-libdecnumber 
+	@[ -f ./libdecnumber/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in libdecnumber" ; \
+	(cd $(HOST_SUBDIR)/libdecnumber && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-mostlyclean-libdecnumber mostlyclean-libdecnumber
+maybe-mostlyclean-libdecnumber:
+@if libdecnumber
+maybe-mostlyclean-libdecnumber: mostlyclean-libdecnumber
+
+mostlyclean-libdecnumber: 
+	@[ -f ./libdecnumber/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in libdecnumber" ; \
+	(cd $(HOST_SUBDIR)/libdecnumber && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-clean-libdecnumber clean-libdecnumber
+maybe-clean-libdecnumber:
+@if libdecnumber
+maybe-clean-libdecnumber: clean-libdecnumber
+
+clean-libdecnumber: 
+	@[ -f ./libdecnumber/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in libdecnumber" ; \
+	(cd $(HOST_SUBDIR)/libdecnumber && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-distclean-libdecnumber distclean-libdecnumber
+maybe-distclean-libdecnumber:
+@if libdecnumber
+maybe-distclean-libdecnumber: distclean-libdecnumber
+
+distclean-libdecnumber: 
+	@[ -f ./libdecnumber/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in libdecnumber" ; \
+	(cd $(HOST_SUBDIR)/libdecnumber && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif libdecnumber
+
+.PHONY: maybe-maintainer-clean-libdecnumber maintainer-clean-libdecnumber
+maybe-maintainer-clean-libdecnumber:
+@if libdecnumber
+maybe-maintainer-clean-libdecnumber: maintainer-clean-libdecnumber
+
+maintainer-clean-libdecnumber: 
+	@[ -f ./libdecnumber/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in libdecnumber" ; \
+	(cd $(HOST_SUBDIR)/libdecnumber && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif libdecnumber
+
+
+
+.PHONY: configure-libgui maybe-configure-libgui
+maybe-configure-libgui:
+@if gcc-bootstrap
+configure-libgui: stage_current
+@endif gcc-bootstrap
+@if libgui
+maybe-configure-libgui: configure-libgui
+configure-libgui: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/libgui; \
+	cd "$(HOST_SUBDIR)/libgui" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libgui/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libgui"; \
+	libsrcdir="$$s/libgui"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif libgui
+
+
+
+
+
+.PHONY: all-libgui maybe-all-libgui
+maybe-all-libgui:
+@if gcc-bootstrap
+all-libgui: stage_current
+@endif gcc-bootstrap
+@if libgui
+TARGET-libgui=all
+maybe-all-libgui: all-libgui
+all-libgui: configure-libgui
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/libgui && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-libgui))
+@endif libgui
+
+
+
+
+.PHONY: check-libgui maybe-check-libgui
+maybe-check-libgui:
+@if libgui
+maybe-check-libgui: check-libgui
+
+check-libgui:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/libgui && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif libgui
+
+.PHONY: install-libgui maybe-install-libgui
+maybe-install-libgui:
+@if libgui
+maybe-install-libgui: install-libgui
+
+install-libgui: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/libgui && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif libgui
+
+.PHONY: install-strip-libgui maybe-install-strip-libgui
+maybe-install-strip-libgui:
+@if libgui
+maybe-install-strip-libgui: install-strip-libgui
+
+install-strip-libgui: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/libgui && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif libgui
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-libgui info-libgui
+maybe-info-libgui:
+@if libgui
+maybe-info-libgui: info-libgui
+
+info-libgui: \
+    configure-libgui 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libgui/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in libgui" ; \
+	(cd $(HOST_SUBDIR)/libgui && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif libgui
+
+.PHONY: maybe-dvi-libgui dvi-libgui
+maybe-dvi-libgui:
+@if libgui
+maybe-dvi-libgui: dvi-libgui
+
+dvi-libgui: \
+    configure-libgui 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libgui/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in libgui" ; \
+	(cd $(HOST_SUBDIR)/libgui && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif libgui
+
+.PHONY: maybe-pdf-libgui pdf-libgui
+maybe-pdf-libgui:
+@if libgui
+maybe-pdf-libgui: pdf-libgui
+
+pdf-libgui: \
+    configure-libgui 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libgui/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in libgui" ; \
+	(cd $(HOST_SUBDIR)/libgui && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif libgui
+
+.PHONY: maybe-html-libgui html-libgui
+maybe-html-libgui:
+@if libgui
+maybe-html-libgui: html-libgui
+
+html-libgui: \
+    configure-libgui 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libgui/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in libgui" ; \
+	(cd $(HOST_SUBDIR)/libgui && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif libgui
+
+.PHONY: maybe-TAGS-libgui TAGS-libgui
+maybe-TAGS-libgui:
+@if libgui
+maybe-TAGS-libgui: TAGS-libgui
+
+TAGS-libgui: \
+    configure-libgui 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libgui/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in libgui" ; \
+	(cd $(HOST_SUBDIR)/libgui && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif libgui
+
+.PHONY: maybe-install-info-libgui install-info-libgui
+maybe-install-info-libgui:
+@if libgui
+maybe-install-info-libgui: install-info-libgui
+
+install-info-libgui: \
+    configure-libgui \
+    info-libgui 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libgui/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in libgui" ; \
+	(cd $(HOST_SUBDIR)/libgui && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif libgui
+
+.PHONY: maybe-install-pdf-libgui install-pdf-libgui
+maybe-install-pdf-libgui:
+@if libgui
+maybe-install-pdf-libgui: install-pdf-libgui
+
+install-pdf-libgui: \
+    configure-libgui \
+    pdf-libgui 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libgui/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in libgui" ; \
+	(cd $(HOST_SUBDIR)/libgui && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif libgui
+
+.PHONY: maybe-install-html-libgui install-html-libgui
+maybe-install-html-libgui:
+@if libgui
+maybe-install-html-libgui: install-html-libgui
+
+install-html-libgui: \
+    configure-libgui \
+    html-libgui 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libgui/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in libgui" ; \
+	(cd $(HOST_SUBDIR)/libgui && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif libgui
+
+.PHONY: maybe-installcheck-libgui installcheck-libgui
+maybe-installcheck-libgui:
+@if libgui
+maybe-installcheck-libgui: installcheck-libgui
+
+installcheck-libgui: \
+    configure-libgui 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libgui/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in libgui" ; \
+	(cd $(HOST_SUBDIR)/libgui && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif libgui
+
+.PHONY: maybe-mostlyclean-libgui mostlyclean-libgui
+maybe-mostlyclean-libgui:
+@if libgui
+maybe-mostlyclean-libgui: mostlyclean-libgui
+
+mostlyclean-libgui: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libgui/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in libgui" ; \
+	(cd $(HOST_SUBDIR)/libgui && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif libgui
+
+.PHONY: maybe-clean-libgui clean-libgui
+maybe-clean-libgui:
+@if libgui
+maybe-clean-libgui: clean-libgui
+
+clean-libgui: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libgui/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in libgui" ; \
+	(cd $(HOST_SUBDIR)/libgui && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif libgui
+
+.PHONY: maybe-distclean-libgui distclean-libgui
+maybe-distclean-libgui:
+@if libgui
+maybe-distclean-libgui: distclean-libgui
+
+distclean-libgui: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libgui/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in libgui" ; \
+	(cd $(HOST_SUBDIR)/libgui && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif libgui
+
+.PHONY: maybe-maintainer-clean-libgui maintainer-clean-libgui
+maybe-maintainer-clean-libgui:
+@if libgui
+maybe-maintainer-clean-libgui: maintainer-clean-libgui
+
+maintainer-clean-libgui: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libgui/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in libgui" ; \
+	(cd $(HOST_SUBDIR)/libgui && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif libgui
+
+
+
+.PHONY: configure-libiberty maybe-configure-libiberty
+maybe-configure-libiberty:
+@if gcc-bootstrap
+configure-libiberty: stage_current
+@endif gcc-bootstrap
+@if libiberty
+maybe-configure-libiberty: configure-libiberty
+configure-libiberty: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/libiberty; \
+	cd "$(HOST_SUBDIR)/libiberty" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libiberty"; \
+	libsrcdir="$$s/libiberty"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} @extra_host_libiberty_configure_flags@ \
+	  || exit 1
+@endif libiberty
+
+
+
+.PHONY: configure-stage1-libiberty maybe-configure-stage1-libiberty
+maybe-configure-stage1-libiberty:
+@if libiberty-bootstrap
+maybe-configure-stage1-libiberty: configure-stage1-libiberty
+configure-stage1-libiberty:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
+	cd $(HOST_SUBDIR)/libiberty || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libiberty"; \
+	libsrcdir="$$s/libiberty"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS) \
+	  @extra_host_libiberty_configure_flags@
+@endif libiberty-bootstrap
+
+.PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty
+maybe-configure-stage2-libiberty:
+@if libiberty-bootstrap
+maybe-configure-stage2-libiberty: configure-stage2-libiberty
+configure-stage2-libiberty:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
+	cd $(HOST_SUBDIR)/libiberty || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libiberty"; \
+	libsrcdir="$$s/libiberty"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS) \
+	  @extra_host_libiberty_configure_flags@
+@endif libiberty-bootstrap
+
+.PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty
+maybe-configure-stage3-libiberty:
+@if libiberty-bootstrap
+maybe-configure-stage3-libiberty: configure-stage3-libiberty
+configure-stage3-libiberty:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
+	cd $(HOST_SUBDIR)/libiberty || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libiberty"; \
+	libsrcdir="$$s/libiberty"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS) \
+	  @extra_host_libiberty_configure_flags@
+@endif libiberty-bootstrap
+
+.PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty
+maybe-configure-stage4-libiberty:
+@if libiberty-bootstrap
+maybe-configure-stage4-libiberty: configure-stage4-libiberty
+configure-stage4-libiberty:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
+	cd $(HOST_SUBDIR)/libiberty || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libiberty"; \
+	libsrcdir="$$s/libiberty"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS) \
+	  @extra_host_libiberty_configure_flags@
+@endif libiberty-bootstrap
+
+.PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty
+maybe-configure-stageprofile-libiberty:
+@if libiberty-bootstrap
+maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty
+configure-stageprofile-libiberty:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(HOST_SUBDIR)/libiberty ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
+	cd $(HOST_SUBDIR)/libiberty || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libiberty"; \
+	libsrcdir="$$s/libiberty"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS) \
+	  @extra_host_libiberty_configure_flags@
+@endif libiberty-bootstrap
+
+.PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty
+maybe-configure-stagefeedback-libiberty:
+@if libiberty-bootstrap
+maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty
+configure-stagefeedback-libiberty:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
+	cd $(HOST_SUBDIR)/libiberty || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libiberty"; \
+	libsrcdir="$$s/libiberty"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS) \
+	  @extra_host_libiberty_configure_flags@
+@endif libiberty-bootstrap
+
+
+
+
+
+.PHONY: all-libiberty maybe-all-libiberty
+maybe-all-libiberty:
+@if gcc-bootstrap
+all-libiberty: stage_current
+@endif gcc-bootstrap
+@if libiberty
+TARGET-libiberty=all
+maybe-all-libiberty: all-libiberty
+all-libiberty: configure-libiberty
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/libiberty && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-libiberty))
+@endif libiberty
+
+
+
+.PHONY: all-stage1-libiberty maybe-all-stage1-libiberty
+.PHONY: clean-stage1-libiberty maybe-clean-stage1-libiberty
+maybe-all-stage1-libiberty:
+maybe-clean-stage1-libiberty:
+@if libiberty-bootstrap
+maybe-all-stage1-libiberty: all-stage1-libiberty
+all-stage1: all-stage1-libiberty
+TARGET-stage1-libiberty = $(TARGET-libiberty)
+all-stage1-libiberty: configure-stage1-libiberty
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-libiberty)
+
+maybe-clean-stage1-libiberty: clean-stage1-libiberty
+clean-stage1: clean-stage1-libiberty
+clean-stage1-libiberty:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage1-libiberty/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		 clean
+@endif libiberty-bootstrap
+
+
+.PHONY: all-stage2-libiberty maybe-all-stage2-libiberty
+.PHONY: clean-stage2-libiberty maybe-clean-stage2-libiberty
+maybe-all-stage2-libiberty:
+maybe-clean-stage2-libiberty:
+@if libiberty-bootstrap
+maybe-all-stage2-libiberty: all-stage2-libiberty
+all-stage2: all-stage2-libiberty
+TARGET-stage2-libiberty = $(TARGET-libiberty)
+all-stage2-libiberty: configure-stage2-libiberty
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-libiberty)
+
+maybe-clean-stage2-libiberty: clean-stage2-libiberty
+clean-stage2: clean-stage2-libiberty
+clean-stage2-libiberty:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage2-libiberty/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif libiberty-bootstrap
+
+
+.PHONY: all-stage3-libiberty maybe-all-stage3-libiberty
+.PHONY: clean-stage3-libiberty maybe-clean-stage3-libiberty
+maybe-all-stage3-libiberty:
+maybe-clean-stage3-libiberty:
+@if libiberty-bootstrap
+maybe-all-stage3-libiberty: all-stage3-libiberty
+all-stage3: all-stage3-libiberty
+TARGET-stage3-libiberty = $(TARGET-libiberty)
+all-stage3-libiberty: configure-stage3-libiberty
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-libiberty)
+
+maybe-clean-stage3-libiberty: clean-stage3-libiberty
+clean-stage3: clean-stage3-libiberty
+clean-stage3-libiberty:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage3-libiberty/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif libiberty-bootstrap
+
+
+.PHONY: all-stage4-libiberty maybe-all-stage4-libiberty
+.PHONY: clean-stage4-libiberty maybe-clean-stage4-libiberty
+maybe-all-stage4-libiberty:
+maybe-clean-stage4-libiberty:
+@if libiberty-bootstrap
+maybe-all-stage4-libiberty: all-stage4-libiberty
+all-stage4: all-stage4-libiberty
+TARGET-stage4-libiberty = $(TARGET-libiberty)
+all-stage4-libiberty: configure-stage4-libiberty
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE4_CFLAGS)" \
+		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-libiberty)
+
+maybe-clean-stage4-libiberty: clean-stage4-libiberty
+clean-stage4: clean-stage4-libiberty
+clean-stage4-libiberty:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage4-libiberty/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif libiberty-bootstrap
+
+
+.PHONY: all-stageprofile-libiberty maybe-all-stageprofile-libiberty
+.PHONY: clean-stageprofile-libiberty maybe-clean-stageprofile-libiberty
+maybe-all-stageprofile-libiberty:
+maybe-clean-stageprofile-libiberty:
+@if libiberty-bootstrap
+maybe-all-stageprofile-libiberty: all-stageprofile-libiberty
+all-stageprofile: all-stageprofile-libiberty
+TARGET-stageprofile-libiberty = $(TARGET-libiberty)
+all-stageprofile-libiberty: configure-stageprofile-libiberty
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-libiberty)
+
+maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
+clean-stageprofile: clean-stageprofile-libiberty
+clean-stageprofile-libiberty:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stageprofile-libiberty/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif libiberty-bootstrap
+
+
+.PHONY: all-stagefeedback-libiberty maybe-all-stagefeedback-libiberty
+.PHONY: clean-stagefeedback-libiberty maybe-clean-stagefeedback-libiberty
+maybe-all-stagefeedback-libiberty:
+maybe-clean-stagefeedback-libiberty:
+@if libiberty-bootstrap
+maybe-all-stagefeedback-libiberty: all-stagefeedback-libiberty
+all-stagefeedback: all-stagefeedback-libiberty
+TARGET-stagefeedback-libiberty = $(TARGET-libiberty)
+all-stagefeedback-libiberty: configure-stagefeedback-libiberty
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-libiberty)
+
+maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
+clean-stagefeedback: clean-stagefeedback-libiberty
+clean-stagefeedback-libiberty:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stagefeedback-libiberty/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif libiberty-bootstrap
+
+
+
+
+
+.PHONY: check-libiberty maybe-check-libiberty
+maybe-check-libiberty:
+@if libiberty
+maybe-check-libiberty: check-libiberty
+
+check-libiberty:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/libiberty && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif libiberty
+
+.PHONY: install-libiberty maybe-install-libiberty
+maybe-install-libiberty:
+@if libiberty
+maybe-install-libiberty: install-libiberty
+
+install-libiberty: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/libiberty && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif libiberty
+
+.PHONY: install-strip-libiberty maybe-install-strip-libiberty
+maybe-install-strip-libiberty:
+@if libiberty
+maybe-install-strip-libiberty: install-strip-libiberty
+
+install-strip-libiberty: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/libiberty && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif libiberty
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-libiberty info-libiberty
+maybe-info-libiberty:
+@if libiberty
+maybe-info-libiberty: info-libiberty
+
+info-libiberty: \
+    configure-libiberty 
+	@[ -f ./libiberty/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in libiberty" ; \
+	(cd $(HOST_SUBDIR)/libiberty && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif libiberty
+
+.PHONY: maybe-dvi-libiberty dvi-libiberty
+maybe-dvi-libiberty:
+@if libiberty
+maybe-dvi-libiberty: dvi-libiberty
+
+dvi-libiberty: \
+    configure-libiberty 
+	@[ -f ./libiberty/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in libiberty" ; \
+	(cd $(HOST_SUBDIR)/libiberty && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif libiberty
+
+.PHONY: maybe-pdf-libiberty pdf-libiberty
+maybe-pdf-libiberty:
+@if libiberty
+maybe-pdf-libiberty: pdf-libiberty
+
+pdf-libiberty: \
+    configure-libiberty 
+	@[ -f ./libiberty/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in libiberty" ; \
+	(cd $(HOST_SUBDIR)/libiberty && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif libiberty
+
+.PHONY: maybe-html-libiberty html-libiberty
+maybe-html-libiberty:
+@if libiberty
+maybe-html-libiberty: html-libiberty
+
+html-libiberty: \
+    configure-libiberty 
+	@[ -f ./libiberty/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in libiberty" ; \
+	(cd $(HOST_SUBDIR)/libiberty && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif libiberty
+
+.PHONY: maybe-TAGS-libiberty TAGS-libiberty
+maybe-TAGS-libiberty:
+@if libiberty
+maybe-TAGS-libiberty: TAGS-libiberty
+
+TAGS-libiberty: \
+    configure-libiberty 
+	@[ -f ./libiberty/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in libiberty" ; \
+	(cd $(HOST_SUBDIR)/libiberty && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif libiberty
+
+.PHONY: maybe-install-info-libiberty install-info-libiberty
+maybe-install-info-libiberty:
+@if libiberty
+maybe-install-info-libiberty: install-info-libiberty
+
+install-info-libiberty: \
+    configure-libiberty \
+    info-libiberty 
+	@[ -f ./libiberty/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in libiberty" ; \
+	(cd $(HOST_SUBDIR)/libiberty && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif libiberty
+
+.PHONY: maybe-install-pdf-libiberty install-pdf-libiberty
+maybe-install-pdf-libiberty:
+@if libiberty
+maybe-install-pdf-libiberty: install-pdf-libiberty
+
+install-pdf-libiberty: \
+    configure-libiberty \
+    pdf-libiberty 
+	@[ -f ./libiberty/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in libiberty" ; \
+	(cd $(HOST_SUBDIR)/libiberty && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif libiberty
+
+.PHONY: maybe-install-html-libiberty install-html-libiberty
+maybe-install-html-libiberty:
+@if libiberty
+maybe-install-html-libiberty: install-html-libiberty
+
+install-html-libiberty: \
+    configure-libiberty \
+    html-libiberty 
+	@[ -f ./libiberty/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in libiberty" ; \
+	(cd $(HOST_SUBDIR)/libiberty && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif libiberty
+
+.PHONY: maybe-installcheck-libiberty installcheck-libiberty
+maybe-installcheck-libiberty:
+@if libiberty
+maybe-installcheck-libiberty: installcheck-libiberty
+
+installcheck-libiberty: \
+    configure-libiberty 
+	@[ -f ./libiberty/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in libiberty" ; \
+	(cd $(HOST_SUBDIR)/libiberty && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif libiberty
+
+.PHONY: maybe-mostlyclean-libiberty mostlyclean-libiberty
+maybe-mostlyclean-libiberty:
+@if libiberty
+maybe-mostlyclean-libiberty: mostlyclean-libiberty
+
+mostlyclean-libiberty: 
+	@[ -f ./libiberty/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in libiberty" ; \
+	(cd $(HOST_SUBDIR)/libiberty && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif libiberty
+
+.PHONY: maybe-clean-libiberty clean-libiberty
+maybe-clean-libiberty:
+@if libiberty
+maybe-clean-libiberty: clean-libiberty
+
+clean-libiberty: 
+	@[ -f ./libiberty/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in libiberty" ; \
+	(cd $(HOST_SUBDIR)/libiberty && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif libiberty
+
+.PHONY: maybe-distclean-libiberty distclean-libiberty
+maybe-distclean-libiberty:
+@if libiberty
+maybe-distclean-libiberty: distclean-libiberty
+
+distclean-libiberty: 
+	@[ -f ./libiberty/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in libiberty" ; \
+	(cd $(HOST_SUBDIR)/libiberty && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif libiberty
+
+.PHONY: maybe-maintainer-clean-libiberty maintainer-clean-libiberty
+maybe-maintainer-clean-libiberty:
+@if libiberty
+maybe-maintainer-clean-libiberty: maintainer-clean-libiberty
+
+maintainer-clean-libiberty: 
+	@[ -f ./libiberty/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in libiberty" ; \
+	(cd $(HOST_SUBDIR)/libiberty && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif libiberty
+
+
+
+.PHONY: configure-libiconv maybe-configure-libiconv
+maybe-configure-libiconv:
+@if gcc-bootstrap
+configure-libiconv: stage_current
+@endif gcc-bootstrap
+@if libiconv
+maybe-configure-libiconv: configure-libiconv
+configure-libiconv: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/libiconv/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/libiconv; \
+	cd "$(HOST_SUBDIR)/libiconv" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libiconv"; \
+	libsrcdir="$$s/libiconv"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} --disable-shared \
+	  || exit 1
+@endif libiconv
+
+
+
+
+
+.PHONY: all-libiconv maybe-all-libiconv
+maybe-all-libiconv:
+@if gcc-bootstrap
+all-libiconv: stage_current
+@endif gcc-bootstrap
+@if libiconv
+TARGET-libiconv=all
+maybe-all-libiconv: all-libiconv
+all-libiconv: configure-libiconv
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/libiconv && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-libiconv))
+@endif libiconv
+
+
+
+
+.PHONY: check-libiconv maybe-check-libiconv
+maybe-check-libiconv:
+@if libiconv
+maybe-check-libiconv: check-libiconv
+
+check-libiconv:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/libiconv && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif libiconv
+
+.PHONY: install-libiconv maybe-install-libiconv
+maybe-install-libiconv:
+@if libiconv
+maybe-install-libiconv: install-libiconv
+
+install-libiconv:
+
+@endif libiconv
+
+.PHONY: install-strip-libiconv maybe-install-strip-libiconv
+maybe-install-strip-libiconv:
+@if libiconv
+maybe-install-strip-libiconv: install-strip-libiconv
+
+install-strip-libiconv:
+
+@endif libiconv
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-libiconv info-libiconv
+maybe-info-libiconv:
+@if libiconv
+maybe-info-libiconv: info-libiconv
+
+info-libiconv: \
+    configure-libiconv 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libiconv/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in libiconv" ; \
+	(cd $(HOST_SUBDIR)/libiconv && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif libiconv
+
+.PHONY: maybe-dvi-libiconv dvi-libiconv
+maybe-dvi-libiconv:
+@if libiconv
+maybe-dvi-libiconv: dvi-libiconv
+
+dvi-libiconv: \
+    configure-libiconv 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libiconv/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in libiconv" ; \
+	(cd $(HOST_SUBDIR)/libiconv && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif libiconv
+
+.PHONY: maybe-pdf-libiconv pdf-libiconv
+maybe-pdf-libiconv:
+@if libiconv
+maybe-pdf-libiconv: pdf-libiconv
+
+pdf-libiconv: \
+    configure-libiconv 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libiconv/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in libiconv" ; \
+	(cd $(HOST_SUBDIR)/libiconv && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif libiconv
+
+.PHONY: maybe-html-libiconv html-libiconv
+maybe-html-libiconv:
+@if libiconv
+maybe-html-libiconv: html-libiconv
+
+html-libiconv: \
+    configure-libiconv 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libiconv/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in libiconv" ; \
+	(cd $(HOST_SUBDIR)/libiconv && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif libiconv
+
+.PHONY: maybe-TAGS-libiconv TAGS-libiconv
+maybe-TAGS-libiconv:
+@if libiconv
+maybe-TAGS-libiconv: TAGS-libiconv
+
+TAGS-libiconv: \
+    configure-libiconv 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libiconv/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in libiconv" ; \
+	(cd $(HOST_SUBDIR)/libiconv && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif libiconv
+
+.PHONY: maybe-install-info-libiconv install-info-libiconv
+maybe-install-info-libiconv:
+@if libiconv
+maybe-install-info-libiconv: install-info-libiconv
+
+# libiconv doesn't support install-info.
+install-info-libiconv:
+
+@endif libiconv
+
+.PHONY: maybe-install-pdf-libiconv install-pdf-libiconv
+maybe-install-pdf-libiconv:
+@if libiconv
+maybe-install-pdf-libiconv: install-pdf-libiconv
+
+# libiconv doesn't support install-pdf.
+install-pdf-libiconv:
+
+@endif libiconv
+
+.PHONY: maybe-install-html-libiconv install-html-libiconv
+maybe-install-html-libiconv:
+@if libiconv
+maybe-install-html-libiconv: install-html-libiconv
+
+# libiconv doesn't support install-html.
+install-html-libiconv:
+
+@endif libiconv
+
+.PHONY: maybe-installcheck-libiconv installcheck-libiconv
+maybe-installcheck-libiconv:
+@if libiconv
+maybe-installcheck-libiconv: installcheck-libiconv
+
+installcheck-libiconv: \
+    configure-libiconv 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libiconv/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in libiconv" ; \
+	(cd $(HOST_SUBDIR)/libiconv && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif libiconv
+
+.PHONY: maybe-mostlyclean-libiconv mostlyclean-libiconv
+maybe-mostlyclean-libiconv:
+@if libiconv
+maybe-mostlyclean-libiconv: mostlyclean-libiconv
+
+mostlyclean-libiconv: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libiconv/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in libiconv" ; \
+	(cd $(HOST_SUBDIR)/libiconv && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif libiconv
+
+.PHONY: maybe-clean-libiconv clean-libiconv
+maybe-clean-libiconv:
+@if libiconv
+maybe-clean-libiconv: clean-libiconv
+
+clean-libiconv: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libiconv/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in libiconv" ; \
+	(cd $(HOST_SUBDIR)/libiconv && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif libiconv
+
+.PHONY: maybe-distclean-libiconv distclean-libiconv
+maybe-distclean-libiconv:
+@if libiconv
+maybe-distclean-libiconv: distclean-libiconv
+
+distclean-libiconv: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libiconv/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in libiconv" ; \
+	(cd $(HOST_SUBDIR)/libiconv && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif libiconv
+
+.PHONY: maybe-maintainer-clean-libiconv maintainer-clean-libiconv
+maybe-maintainer-clean-libiconv:
+@if libiconv
+maybe-maintainer-clean-libiconv: maintainer-clean-libiconv
+
+maintainer-clean-libiconv: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libiconv/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in libiconv" ; \
+	(cd $(HOST_SUBDIR)/libiconv && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif libiconv
+
+
+
+.PHONY: configure-m4 maybe-configure-m4
+maybe-configure-m4:
+@if gcc-bootstrap
+configure-m4: stage_current
+@endif gcc-bootstrap
+@if m4
+maybe-configure-m4: configure-m4
+configure-m4: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/m4/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/m4 ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/m4; \
+	cd "$(HOST_SUBDIR)/m4" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/m4/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/m4"; \
+	libsrcdir="$$s/m4"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif m4
+
+
+
+
+
+.PHONY: all-m4 maybe-all-m4
+maybe-all-m4:
+@if gcc-bootstrap
+all-m4: stage_current
+@endif gcc-bootstrap
+@if m4
+TARGET-m4=all
+maybe-all-m4: all-m4
+all-m4: configure-m4
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/m4 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-m4))
+@endif m4
+
+
+
+
+.PHONY: check-m4 maybe-check-m4
+maybe-check-m4:
+@if m4
+maybe-check-m4: check-m4
+
+check-m4:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/m4 && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif m4
+
+.PHONY: install-m4 maybe-install-m4
+maybe-install-m4:
+@if m4
+maybe-install-m4: install-m4
+
+install-m4: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/m4 && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif m4
+
+.PHONY: install-strip-m4 maybe-install-strip-m4
+maybe-install-strip-m4:
+@if m4
+maybe-install-strip-m4: install-strip-m4
+
+install-strip-m4: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/m4 && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif m4
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-m4 info-m4
+maybe-info-m4:
+@if m4
+maybe-info-m4: info-m4
+
+info-m4: \
+    configure-m4 
+	@: $(MAKE); $(unstage)
+	@[ -f ./m4/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in m4" ; \
+	(cd $(HOST_SUBDIR)/m4 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif m4
+
+.PHONY: maybe-dvi-m4 dvi-m4
+maybe-dvi-m4:
+@if m4
+maybe-dvi-m4: dvi-m4
+
+dvi-m4: \
+    configure-m4 
+	@: $(MAKE); $(unstage)
+	@[ -f ./m4/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in m4" ; \
+	(cd $(HOST_SUBDIR)/m4 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif m4
+
+.PHONY: maybe-pdf-m4 pdf-m4
+maybe-pdf-m4:
+@if m4
+maybe-pdf-m4: pdf-m4
+
+pdf-m4: \
+    configure-m4 
+	@: $(MAKE); $(unstage)
+	@[ -f ./m4/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in m4" ; \
+	(cd $(HOST_SUBDIR)/m4 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif m4
+
+.PHONY: maybe-html-m4 html-m4
+maybe-html-m4:
+@if m4
+maybe-html-m4: html-m4
+
+html-m4: \
+    configure-m4 
+	@: $(MAKE); $(unstage)
+	@[ -f ./m4/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in m4" ; \
+	(cd $(HOST_SUBDIR)/m4 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif m4
+
+.PHONY: maybe-TAGS-m4 TAGS-m4
+maybe-TAGS-m4:
+@if m4
+maybe-TAGS-m4: TAGS-m4
+
+TAGS-m4: \
+    configure-m4 
+	@: $(MAKE); $(unstage)
+	@[ -f ./m4/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in m4" ; \
+	(cd $(HOST_SUBDIR)/m4 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif m4
+
+.PHONY: maybe-install-info-m4 install-info-m4
+maybe-install-info-m4:
+@if m4
+maybe-install-info-m4: install-info-m4
+
+install-info-m4: \
+    configure-m4 \
+    info-m4 
+	@: $(MAKE); $(unstage)
+	@[ -f ./m4/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in m4" ; \
+	(cd $(HOST_SUBDIR)/m4 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif m4
+
+.PHONY: maybe-install-pdf-m4 install-pdf-m4
+maybe-install-pdf-m4:
+@if m4
+maybe-install-pdf-m4: install-pdf-m4
+
+install-pdf-m4: \
+    configure-m4 \
+    pdf-m4 
+	@: $(MAKE); $(unstage)
+	@[ -f ./m4/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in m4" ; \
+	(cd $(HOST_SUBDIR)/m4 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif m4
+
+.PHONY: maybe-install-html-m4 install-html-m4
+maybe-install-html-m4:
+@if m4
+maybe-install-html-m4: install-html-m4
+
+install-html-m4: \
+    configure-m4 \
+    html-m4 
+	@: $(MAKE); $(unstage)
+	@[ -f ./m4/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in m4" ; \
+	(cd $(HOST_SUBDIR)/m4 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif m4
+
+.PHONY: maybe-installcheck-m4 installcheck-m4
+maybe-installcheck-m4:
+@if m4
+maybe-installcheck-m4: installcheck-m4
+
+installcheck-m4: \
+    configure-m4 
+	@: $(MAKE); $(unstage)
+	@[ -f ./m4/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in m4" ; \
+	(cd $(HOST_SUBDIR)/m4 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif m4
+
+.PHONY: maybe-mostlyclean-m4 mostlyclean-m4
+maybe-mostlyclean-m4:
+@if m4
+maybe-mostlyclean-m4: mostlyclean-m4
+
+mostlyclean-m4: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./m4/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in m4" ; \
+	(cd $(HOST_SUBDIR)/m4 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif m4
+
+.PHONY: maybe-clean-m4 clean-m4
+maybe-clean-m4:
+@if m4
+maybe-clean-m4: clean-m4
+
+clean-m4: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./m4/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in m4" ; \
+	(cd $(HOST_SUBDIR)/m4 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif m4
+
+.PHONY: maybe-distclean-m4 distclean-m4
+maybe-distclean-m4:
+@if m4
+maybe-distclean-m4: distclean-m4
+
+distclean-m4: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./m4/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in m4" ; \
+	(cd $(HOST_SUBDIR)/m4 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif m4
+
+.PHONY: maybe-maintainer-clean-m4 maintainer-clean-m4
+maybe-maintainer-clean-m4:
+@if m4
+maybe-maintainer-clean-m4: maintainer-clean-m4
+
+maintainer-clean-m4: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./m4/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in m4" ; \
+	(cd $(HOST_SUBDIR)/m4 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif m4
+
+
+
+.PHONY: configure-readline maybe-configure-readline
+maybe-configure-readline:
+@if gcc-bootstrap
+configure-readline: stage_current
+@endif gcc-bootstrap
+@if readline
+maybe-configure-readline: configure-readline
+configure-readline: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/readline/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/readline ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/readline; \
+	cd "$(HOST_SUBDIR)/readline" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/readline/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/readline"; \
+	libsrcdir="$$s/readline"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif readline
+
+
+
+
+
+.PHONY: all-readline maybe-all-readline
+maybe-all-readline:
+@if gcc-bootstrap
+all-readline: stage_current
+@endif gcc-bootstrap
+@if readline
+TARGET-readline=all
+maybe-all-readline: all-readline
+all-readline: configure-readline
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/readline && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-readline))
+@endif readline
+
+
+
+
+.PHONY: check-readline maybe-check-readline
+maybe-check-readline:
+@if readline
+maybe-check-readline: check-readline
+
+check-readline:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/readline && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif readline
+
+.PHONY: install-readline maybe-install-readline
+maybe-install-readline:
+@if readline
+maybe-install-readline: install-readline
+
+install-readline: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/readline && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif readline
+
+.PHONY: install-strip-readline maybe-install-strip-readline
+maybe-install-strip-readline:
+@if readline
+maybe-install-strip-readline: install-strip-readline
+
+install-strip-readline: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/readline && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif readline
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-readline info-readline
+maybe-info-readline:
+@if readline
+maybe-info-readline: info-readline
+
+info-readline: \
+    configure-readline 
+	@: $(MAKE); $(unstage)
+	@[ -f ./readline/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in readline" ; \
+	(cd $(HOST_SUBDIR)/readline && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif readline
+
+.PHONY: maybe-dvi-readline dvi-readline
+maybe-dvi-readline:
+@if readline
+maybe-dvi-readline: dvi-readline
+
+dvi-readline: \
+    configure-readline 
+	@: $(MAKE); $(unstage)
+	@[ -f ./readline/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in readline" ; \
+	(cd $(HOST_SUBDIR)/readline && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif readline
+
+.PHONY: maybe-pdf-readline pdf-readline
+maybe-pdf-readline:
+@if readline
+maybe-pdf-readline: pdf-readline
+
+pdf-readline: \
+    configure-readline 
+	@: $(MAKE); $(unstage)
+	@[ -f ./readline/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in readline" ; \
+	(cd $(HOST_SUBDIR)/readline && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif readline
+
+.PHONY: maybe-html-readline html-readline
+maybe-html-readline:
+@if readline
+maybe-html-readline: html-readline
+
+html-readline: \
+    configure-readline 
+	@: $(MAKE); $(unstage)
+	@[ -f ./readline/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in readline" ; \
+	(cd $(HOST_SUBDIR)/readline && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif readline
+
+.PHONY: maybe-TAGS-readline TAGS-readline
+maybe-TAGS-readline:
+@if readline
+maybe-TAGS-readline: TAGS-readline
+
+TAGS-readline: \
+    configure-readline 
+	@: $(MAKE); $(unstage)
+	@[ -f ./readline/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in readline" ; \
+	(cd $(HOST_SUBDIR)/readline && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif readline
+
+.PHONY: maybe-install-info-readline install-info-readline
+maybe-install-info-readline:
+@if readline
+maybe-install-info-readline: install-info-readline
+
+install-info-readline: \
+    configure-readline \
+    info-readline 
+	@: $(MAKE); $(unstage)
+	@[ -f ./readline/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in readline" ; \
+	(cd $(HOST_SUBDIR)/readline && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif readline
+
+.PHONY: maybe-install-pdf-readline install-pdf-readline
+maybe-install-pdf-readline:
+@if readline
+maybe-install-pdf-readline: install-pdf-readline
+
+install-pdf-readline: \
+    configure-readline \
+    pdf-readline 
+	@: $(MAKE); $(unstage)
+	@[ -f ./readline/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in readline" ; \
+	(cd $(HOST_SUBDIR)/readline && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif readline
+
+.PHONY: maybe-install-html-readline install-html-readline
+maybe-install-html-readline:
+@if readline
+maybe-install-html-readline: install-html-readline
+
+install-html-readline: \
+    configure-readline \
+    html-readline 
+	@: $(MAKE); $(unstage)
+	@[ -f ./readline/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in readline" ; \
+	(cd $(HOST_SUBDIR)/readline && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif readline
+
+.PHONY: maybe-installcheck-readline installcheck-readline
+maybe-installcheck-readline:
+@if readline
+maybe-installcheck-readline: installcheck-readline
+
+installcheck-readline: \
+    configure-readline 
+	@: $(MAKE); $(unstage)
+	@[ -f ./readline/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in readline" ; \
+	(cd $(HOST_SUBDIR)/readline && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif readline
+
+.PHONY: maybe-mostlyclean-readline mostlyclean-readline
+maybe-mostlyclean-readline:
+@if readline
+maybe-mostlyclean-readline: mostlyclean-readline
+
+mostlyclean-readline: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./readline/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in readline" ; \
+	(cd $(HOST_SUBDIR)/readline && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif readline
+
+.PHONY: maybe-clean-readline clean-readline
+maybe-clean-readline:
+@if readline
+maybe-clean-readline: clean-readline
+
+clean-readline: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./readline/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in readline" ; \
+	(cd $(HOST_SUBDIR)/readline && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif readline
+
+.PHONY: maybe-distclean-readline distclean-readline
+maybe-distclean-readline:
+@if readline
+maybe-distclean-readline: distclean-readline
+
+distclean-readline: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./readline/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in readline" ; \
+	(cd $(HOST_SUBDIR)/readline && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif readline
+
+.PHONY: maybe-maintainer-clean-readline maintainer-clean-readline
+maybe-maintainer-clean-readline:
+@if readline
+maybe-maintainer-clean-readline: maintainer-clean-readline
+
+maintainer-clean-readline: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./readline/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in readline" ; \
+	(cd $(HOST_SUBDIR)/readline && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif readline
+
+
+
+.PHONY: configure-sid maybe-configure-sid
+maybe-configure-sid:
+@if gcc-bootstrap
+configure-sid: stage_current
+@endif gcc-bootstrap
+@if sid
+maybe-configure-sid: configure-sid
+configure-sid: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/sid/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sid ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/sid; \
+	cd "$(HOST_SUBDIR)/sid" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/sid/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/sid"; \
+	libsrcdir="$$s/sid"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif sid
+
+
+
+
+
+.PHONY: all-sid maybe-all-sid
+maybe-all-sid:
+@if gcc-bootstrap
+all-sid: stage_current
+@endif gcc-bootstrap
+@if sid
+TARGET-sid=all
+maybe-all-sid: all-sid
+all-sid: configure-sid
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/sid && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-sid))
+@endif sid
+
+
+
+
+.PHONY: check-sid maybe-check-sid
+maybe-check-sid:
+@if sid
+maybe-check-sid: check-sid
+
+check-sid:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/sid && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif sid
+
+.PHONY: install-sid maybe-install-sid
+maybe-install-sid:
+@if sid
+maybe-install-sid: install-sid
+
+install-sid: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/sid && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif sid
+
+.PHONY: install-strip-sid maybe-install-strip-sid
+maybe-install-strip-sid:
+@if sid
+maybe-install-strip-sid: install-strip-sid
+
+install-strip-sid: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/sid && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif sid
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-sid info-sid
+maybe-info-sid:
+@if sid
+maybe-info-sid: info-sid
+
+info-sid: \
+    configure-sid 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sid/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in sid" ; \
+	(cd $(HOST_SUBDIR)/sid && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif sid
+
+.PHONY: maybe-dvi-sid dvi-sid
+maybe-dvi-sid:
+@if sid
+maybe-dvi-sid: dvi-sid
+
+dvi-sid: \
+    configure-sid 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sid/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in sid" ; \
+	(cd $(HOST_SUBDIR)/sid && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif sid
+
+.PHONY: maybe-pdf-sid pdf-sid
+maybe-pdf-sid:
+@if sid
+maybe-pdf-sid: pdf-sid
+
+pdf-sid: \
+    configure-sid 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sid/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in sid" ; \
+	(cd $(HOST_SUBDIR)/sid && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif sid
+
+.PHONY: maybe-html-sid html-sid
+maybe-html-sid:
+@if sid
+maybe-html-sid: html-sid
+
+html-sid: \
+    configure-sid 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sid/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in sid" ; \
+	(cd $(HOST_SUBDIR)/sid && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif sid
+
+.PHONY: maybe-TAGS-sid TAGS-sid
+maybe-TAGS-sid:
+@if sid
+maybe-TAGS-sid: TAGS-sid
+
+TAGS-sid: \
+    configure-sid 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sid/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in sid" ; \
+	(cd $(HOST_SUBDIR)/sid && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif sid
+
+.PHONY: maybe-install-info-sid install-info-sid
+maybe-install-info-sid:
+@if sid
+maybe-install-info-sid: install-info-sid
+
+install-info-sid: \
+    configure-sid \
+    info-sid 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sid/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in sid" ; \
+	(cd $(HOST_SUBDIR)/sid && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif sid
+
+.PHONY: maybe-install-pdf-sid install-pdf-sid
+maybe-install-pdf-sid:
+@if sid
+maybe-install-pdf-sid: install-pdf-sid
+
+install-pdf-sid: \
+    configure-sid \
+    pdf-sid 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sid/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in sid" ; \
+	(cd $(HOST_SUBDIR)/sid && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif sid
+
+.PHONY: maybe-install-html-sid install-html-sid
+maybe-install-html-sid:
+@if sid
+maybe-install-html-sid: install-html-sid
+
+install-html-sid: \
+    configure-sid \
+    html-sid 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sid/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in sid" ; \
+	(cd $(HOST_SUBDIR)/sid && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif sid
+
+.PHONY: maybe-installcheck-sid installcheck-sid
+maybe-installcheck-sid:
+@if sid
+maybe-installcheck-sid: installcheck-sid
+
+installcheck-sid: \
+    configure-sid 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sid/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in sid" ; \
+	(cd $(HOST_SUBDIR)/sid && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif sid
+
+.PHONY: maybe-mostlyclean-sid mostlyclean-sid
+maybe-mostlyclean-sid:
+@if sid
+maybe-mostlyclean-sid: mostlyclean-sid
+
+mostlyclean-sid: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sid/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in sid" ; \
+	(cd $(HOST_SUBDIR)/sid && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif sid
+
+.PHONY: maybe-clean-sid clean-sid
+maybe-clean-sid:
+@if sid
+maybe-clean-sid: clean-sid
+
+clean-sid: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sid/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in sid" ; \
+	(cd $(HOST_SUBDIR)/sid && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif sid
+
+.PHONY: maybe-distclean-sid distclean-sid
+maybe-distclean-sid:
+@if sid
+maybe-distclean-sid: distclean-sid
+
+distclean-sid: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sid/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in sid" ; \
+	(cd $(HOST_SUBDIR)/sid && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif sid
+
+.PHONY: maybe-maintainer-clean-sid maintainer-clean-sid
+maybe-maintainer-clean-sid:
+@if sid
+maybe-maintainer-clean-sid: maintainer-clean-sid
+
+maintainer-clean-sid: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sid/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in sid" ; \
+	(cd $(HOST_SUBDIR)/sid && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif sid
+
+
+
+.PHONY: configure-sim maybe-configure-sim
+maybe-configure-sim:
+@if gcc-bootstrap
+configure-sim: stage_current
+@endif gcc-bootstrap
+@if sim
+maybe-configure-sim: configure-sim
+configure-sim: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/sim/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sim ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/sim; \
+	cd "$(HOST_SUBDIR)/sim" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/sim/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/sim"; \
+	libsrcdir="$$s/sim"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif sim
+
+
+
+
+
+.PHONY: all-sim maybe-all-sim
+maybe-all-sim:
+@if gcc-bootstrap
+all-sim: stage_current
+@endif gcc-bootstrap
+@if sim
+TARGET-sim=all
+maybe-all-sim: all-sim
+all-sim: configure-sim
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/sim && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-sim))
+@endif sim
+
+
+
+
+.PHONY: check-sim maybe-check-sim
+maybe-check-sim:
+@if sim
+maybe-check-sim: check-sim
+
+check-sim:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/sim && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif sim
+
+.PHONY: install-sim maybe-install-sim
+maybe-install-sim:
+@if sim
+maybe-install-sim: install-sim
+
+install-sim: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/sim && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif sim
+
+.PHONY: install-strip-sim maybe-install-strip-sim
+maybe-install-strip-sim:
+@if sim
+maybe-install-strip-sim: install-strip-sim
+
+install-strip-sim: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/sim && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif sim
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-sim info-sim
+maybe-info-sim:
+@if sim
+maybe-info-sim: info-sim
+
+info-sim: \
+    configure-sim 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sim/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in sim" ; \
+	(cd $(HOST_SUBDIR)/sim && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif sim
+
+.PHONY: maybe-dvi-sim dvi-sim
+maybe-dvi-sim:
+@if sim
+maybe-dvi-sim: dvi-sim
+
+dvi-sim: \
+    configure-sim 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sim/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in sim" ; \
+	(cd $(HOST_SUBDIR)/sim && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif sim
+
+.PHONY: maybe-pdf-sim pdf-sim
+maybe-pdf-sim:
+@if sim
+maybe-pdf-sim: pdf-sim
+
+pdf-sim: \
+    configure-sim 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sim/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in sim" ; \
+	(cd $(HOST_SUBDIR)/sim && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif sim
+
+.PHONY: maybe-html-sim html-sim
+maybe-html-sim:
+@if sim
+maybe-html-sim: html-sim
+
+html-sim: \
+    configure-sim 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sim/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in sim" ; \
+	(cd $(HOST_SUBDIR)/sim && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif sim
+
+.PHONY: maybe-TAGS-sim TAGS-sim
+maybe-TAGS-sim:
+@if sim
+maybe-TAGS-sim: TAGS-sim
+
+TAGS-sim: \
+    configure-sim 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sim/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in sim" ; \
+	(cd $(HOST_SUBDIR)/sim && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif sim
+
+.PHONY: maybe-install-info-sim install-info-sim
+maybe-install-info-sim:
+@if sim
+maybe-install-info-sim: install-info-sim
+
+install-info-sim: \
+    configure-sim \
+    info-sim 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sim/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in sim" ; \
+	(cd $(HOST_SUBDIR)/sim && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif sim
+
+.PHONY: maybe-install-pdf-sim install-pdf-sim
+maybe-install-pdf-sim:
+@if sim
+maybe-install-pdf-sim: install-pdf-sim
+
+install-pdf-sim: \
+    configure-sim \
+    pdf-sim 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sim/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in sim" ; \
+	(cd $(HOST_SUBDIR)/sim && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif sim
+
+.PHONY: maybe-install-html-sim install-html-sim
+maybe-install-html-sim:
+@if sim
+maybe-install-html-sim: install-html-sim
+
+install-html-sim: \
+    configure-sim \
+    html-sim 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sim/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in sim" ; \
+	(cd $(HOST_SUBDIR)/sim && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif sim
+
+.PHONY: maybe-installcheck-sim installcheck-sim
+maybe-installcheck-sim:
+@if sim
+maybe-installcheck-sim: installcheck-sim
+
+installcheck-sim: \
+    configure-sim 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sim/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in sim" ; \
+	(cd $(HOST_SUBDIR)/sim && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif sim
+
+.PHONY: maybe-mostlyclean-sim mostlyclean-sim
+maybe-mostlyclean-sim:
+@if sim
+maybe-mostlyclean-sim: mostlyclean-sim
+
+mostlyclean-sim: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sim/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in sim" ; \
+	(cd $(HOST_SUBDIR)/sim && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif sim
+
+.PHONY: maybe-clean-sim clean-sim
+maybe-clean-sim:
+@if sim
+maybe-clean-sim: clean-sim
+
+clean-sim: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sim/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in sim" ; \
+	(cd $(HOST_SUBDIR)/sim && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif sim
+
+.PHONY: maybe-distclean-sim distclean-sim
+maybe-distclean-sim:
+@if sim
+maybe-distclean-sim: distclean-sim
+
+distclean-sim: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sim/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in sim" ; \
+	(cd $(HOST_SUBDIR)/sim && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif sim
+
+.PHONY: maybe-maintainer-clean-sim maintainer-clean-sim
+maybe-maintainer-clean-sim:
+@if sim
+maybe-maintainer-clean-sim: maintainer-clean-sim
+
+maintainer-clean-sim: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sim/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in sim" ; \
+	(cd $(HOST_SUBDIR)/sim && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif sim
+
+
+
+.PHONY: configure-texinfo maybe-configure-texinfo
+maybe-configure-texinfo:
+@if gcc-bootstrap
+configure-texinfo: stage_current
+@endif gcc-bootstrap
+@if texinfo
+maybe-configure-texinfo: configure-texinfo
+configure-texinfo: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/texinfo/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/texinfo ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/texinfo; \
+	cd "$(HOST_SUBDIR)/texinfo" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/texinfo/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/texinfo"; \
+	libsrcdir="$$s/texinfo"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif texinfo
+
+
+
+
+
+.PHONY: all-texinfo maybe-all-texinfo
+maybe-all-texinfo:
+@if gcc-bootstrap
+all-texinfo: stage_current
+@endif gcc-bootstrap
+@if texinfo
+TARGET-texinfo=all
+maybe-all-texinfo: all-texinfo
+all-texinfo: configure-texinfo
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/texinfo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-texinfo))
+@endif texinfo
+
+
+
+
+.PHONY: check-texinfo maybe-check-texinfo
+maybe-check-texinfo:
+@if texinfo
+maybe-check-texinfo: check-texinfo
+
+check-texinfo:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/texinfo && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif texinfo
+
+.PHONY: install-texinfo maybe-install-texinfo
+maybe-install-texinfo:
+@if texinfo
+maybe-install-texinfo: install-texinfo
+
+install-texinfo:
+
+@endif texinfo
+
+.PHONY: install-strip-texinfo maybe-install-strip-texinfo
+maybe-install-strip-texinfo:
+@if texinfo
+maybe-install-strip-texinfo: install-strip-texinfo
+
+install-strip-texinfo:
+
+@endif texinfo
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-texinfo info-texinfo
+maybe-info-texinfo:
+@if texinfo
+maybe-info-texinfo: info-texinfo
+
+info-texinfo: \
+    configure-texinfo 
+	@: $(MAKE); $(unstage)
+	@[ -f ./texinfo/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in texinfo" ; \
+	(cd $(HOST_SUBDIR)/texinfo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif texinfo
+
+.PHONY: maybe-dvi-texinfo dvi-texinfo
+maybe-dvi-texinfo:
+@if texinfo
+maybe-dvi-texinfo: dvi-texinfo
+
+dvi-texinfo: \
+    configure-texinfo 
+	@: $(MAKE); $(unstage)
+	@[ -f ./texinfo/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in texinfo" ; \
+	(cd $(HOST_SUBDIR)/texinfo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif texinfo
+
+.PHONY: maybe-pdf-texinfo pdf-texinfo
+maybe-pdf-texinfo:
+@if texinfo
+maybe-pdf-texinfo: pdf-texinfo
+
+pdf-texinfo: \
+    configure-texinfo 
+	@: $(MAKE); $(unstage)
+	@[ -f ./texinfo/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in texinfo" ; \
+	(cd $(HOST_SUBDIR)/texinfo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif texinfo
+
+.PHONY: maybe-html-texinfo html-texinfo
+maybe-html-texinfo:
+@if texinfo
+maybe-html-texinfo: html-texinfo
+
+html-texinfo: \
+    configure-texinfo 
+	@: $(MAKE); $(unstage)
+	@[ -f ./texinfo/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in texinfo" ; \
+	(cd $(HOST_SUBDIR)/texinfo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif texinfo
+
+.PHONY: maybe-TAGS-texinfo TAGS-texinfo
+maybe-TAGS-texinfo:
+@if texinfo
+maybe-TAGS-texinfo: TAGS-texinfo
+
+TAGS-texinfo: \
+    configure-texinfo 
+	@: $(MAKE); $(unstage)
+	@[ -f ./texinfo/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in texinfo" ; \
+	(cd $(HOST_SUBDIR)/texinfo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif texinfo
+
+.PHONY: maybe-install-info-texinfo install-info-texinfo
+maybe-install-info-texinfo:
+@if texinfo
+maybe-install-info-texinfo: install-info-texinfo
+
+install-info-texinfo: \
+    configure-texinfo \
+    info-texinfo 
+	@: $(MAKE); $(unstage)
+	@[ -f ./texinfo/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in texinfo" ; \
+	(cd $(HOST_SUBDIR)/texinfo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif texinfo
+
+.PHONY: maybe-install-pdf-texinfo install-pdf-texinfo
+maybe-install-pdf-texinfo:
+@if texinfo
+maybe-install-pdf-texinfo: install-pdf-texinfo
+
+install-pdf-texinfo: \
+    configure-texinfo \
+    pdf-texinfo 
+	@: $(MAKE); $(unstage)
+	@[ -f ./texinfo/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in texinfo" ; \
+	(cd $(HOST_SUBDIR)/texinfo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif texinfo
+
+.PHONY: maybe-install-html-texinfo install-html-texinfo
+maybe-install-html-texinfo:
+@if texinfo
+maybe-install-html-texinfo: install-html-texinfo
+
+install-html-texinfo: \
+    configure-texinfo \
+    html-texinfo 
+	@: $(MAKE); $(unstage)
+	@[ -f ./texinfo/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in texinfo" ; \
+	(cd $(HOST_SUBDIR)/texinfo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif texinfo
+
+.PHONY: maybe-installcheck-texinfo installcheck-texinfo
+maybe-installcheck-texinfo:
+@if texinfo
+maybe-installcheck-texinfo: installcheck-texinfo
+
+installcheck-texinfo: \
+    configure-texinfo 
+	@: $(MAKE); $(unstage)
+	@[ -f ./texinfo/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in texinfo" ; \
+	(cd $(HOST_SUBDIR)/texinfo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif texinfo
+
+.PHONY: maybe-mostlyclean-texinfo mostlyclean-texinfo
+maybe-mostlyclean-texinfo:
+@if texinfo
+maybe-mostlyclean-texinfo: mostlyclean-texinfo
+
+mostlyclean-texinfo: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./texinfo/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in texinfo" ; \
+	(cd $(HOST_SUBDIR)/texinfo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif texinfo
+
+.PHONY: maybe-clean-texinfo clean-texinfo
+maybe-clean-texinfo:
+@if texinfo
+maybe-clean-texinfo: clean-texinfo
+
+clean-texinfo: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./texinfo/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in texinfo" ; \
+	(cd $(HOST_SUBDIR)/texinfo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif texinfo
+
+.PHONY: maybe-distclean-texinfo distclean-texinfo
+maybe-distclean-texinfo:
+@if texinfo
+maybe-distclean-texinfo: distclean-texinfo
+
+distclean-texinfo: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./texinfo/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in texinfo" ; \
+	(cd $(HOST_SUBDIR)/texinfo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif texinfo
+
+.PHONY: maybe-maintainer-clean-texinfo maintainer-clean-texinfo
+maybe-maintainer-clean-texinfo:
+@if texinfo
+maybe-maintainer-clean-texinfo: maintainer-clean-texinfo
+
+maintainer-clean-texinfo: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./texinfo/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in texinfo" ; \
+	(cd $(HOST_SUBDIR)/texinfo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif texinfo
+
+
+
+.PHONY: configure-zlib maybe-configure-zlib
+maybe-configure-zlib:
+@if gcc-bootstrap
+configure-zlib: stage_current
+@endif gcc-bootstrap
+@if zlib
+maybe-configure-zlib: configure-zlib
+configure-zlib: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/zlib; \
+	cd "$(HOST_SUBDIR)/zlib" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/zlib"; \
+	libsrcdir="$$s/zlib"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif zlib
+
+
+
+.PHONY: configure-stage1-zlib maybe-configure-stage1-zlib
+maybe-configure-stage1-zlib:
+@if zlib-bootstrap
+maybe-configure-stage1-zlib: configure-stage1-zlib
+configure-stage1-zlib:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
+	cd $(HOST_SUBDIR)/zlib || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/zlib"; \
+	libsrcdir="$$s/zlib"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS)
+@endif zlib-bootstrap
+
+.PHONY: configure-stage2-zlib maybe-configure-stage2-zlib
+maybe-configure-stage2-zlib:
+@if zlib-bootstrap
+maybe-configure-stage2-zlib: configure-stage2-zlib
+configure-stage2-zlib:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(HOST_SUBDIR)/zlib ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
+	cd $(HOST_SUBDIR)/zlib || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/zlib"; \
+	libsrcdir="$$s/zlib"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS)
+@endif zlib-bootstrap
+
+.PHONY: configure-stage3-zlib maybe-configure-stage3-zlib
+maybe-configure-stage3-zlib:
+@if zlib-bootstrap
+maybe-configure-stage3-zlib: configure-stage3-zlib
+configure-stage3-zlib:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(HOST_SUBDIR)/zlib ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
+	cd $(HOST_SUBDIR)/zlib || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/zlib"; \
+	libsrcdir="$$s/zlib"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS)
+@endif zlib-bootstrap
+
+.PHONY: configure-stage4-zlib maybe-configure-stage4-zlib
+maybe-configure-stage4-zlib:
+@if zlib-bootstrap
+maybe-configure-stage4-zlib: configure-stage4-zlib
+configure-stage4-zlib:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(HOST_SUBDIR)/zlib ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
+	cd $(HOST_SUBDIR)/zlib || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/zlib"; \
+	libsrcdir="$$s/zlib"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS)
+@endif zlib-bootstrap
+
+.PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib
+maybe-configure-stageprofile-zlib:
+@if zlib-bootstrap
+maybe-configure-stageprofile-zlib: configure-stageprofile-zlib
+configure-stageprofile-zlib:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(HOST_SUBDIR)/zlib ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
+	cd $(HOST_SUBDIR)/zlib || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/zlib"; \
+	libsrcdir="$$s/zlib"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS)
+@endif zlib-bootstrap
+
+.PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib
+maybe-configure-stagefeedback-zlib:
+@if zlib-bootstrap
+maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib
+configure-stagefeedback-zlib:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(HOST_SUBDIR)/zlib ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
+	cd $(HOST_SUBDIR)/zlib || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/zlib"; \
+	libsrcdir="$$s/zlib"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif zlib-bootstrap
+
+
+
+
+
+.PHONY: all-zlib maybe-all-zlib
+maybe-all-zlib:
+@if gcc-bootstrap
+all-zlib: stage_current
+@endif gcc-bootstrap
+@if zlib
+TARGET-zlib=all
+maybe-all-zlib: all-zlib
+all-zlib: configure-zlib
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-zlib))
+@endif zlib
+
+
+
+.PHONY: all-stage1-zlib maybe-all-stage1-zlib
+.PHONY: clean-stage1-zlib maybe-clean-stage1-zlib
+maybe-all-stage1-zlib:
+maybe-clean-stage1-zlib:
+@if zlib-bootstrap
+maybe-all-stage1-zlib: all-stage1-zlib
+all-stage1: all-stage1-zlib
+TARGET-stage1-zlib = $(TARGET-zlib)
+all-stage1-zlib: configure-stage1-zlib
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-zlib)
+
+maybe-clean-stage1-zlib: clean-stage1-zlib
+clean-stage1: clean-stage1-zlib
+clean-stage1-zlib:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage1-zlib/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		 clean
+@endif zlib-bootstrap
+
+
+.PHONY: all-stage2-zlib maybe-all-stage2-zlib
+.PHONY: clean-stage2-zlib maybe-clean-stage2-zlib
+maybe-all-stage2-zlib:
+maybe-clean-stage2-zlib:
+@if zlib-bootstrap
+maybe-all-stage2-zlib: all-stage2-zlib
+all-stage2: all-stage2-zlib
+TARGET-stage2-zlib = $(TARGET-zlib)
+all-stage2-zlib: configure-stage2-zlib
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-zlib)
+
+maybe-clean-stage2-zlib: clean-stage2-zlib
+clean-stage2: clean-stage2-zlib
+clean-stage2-zlib:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage2-zlib/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif zlib-bootstrap
+
+
+.PHONY: all-stage3-zlib maybe-all-stage3-zlib
+.PHONY: clean-stage3-zlib maybe-clean-stage3-zlib
+maybe-all-stage3-zlib:
+maybe-clean-stage3-zlib:
+@if zlib-bootstrap
+maybe-all-stage3-zlib: all-stage3-zlib
+all-stage3: all-stage3-zlib
+TARGET-stage3-zlib = $(TARGET-zlib)
+all-stage3-zlib: configure-stage3-zlib
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-zlib)
+
+maybe-clean-stage3-zlib: clean-stage3-zlib
+clean-stage3: clean-stage3-zlib
+clean-stage3-zlib:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage3-zlib/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif zlib-bootstrap
+
+
+.PHONY: all-stage4-zlib maybe-all-stage4-zlib
+.PHONY: clean-stage4-zlib maybe-clean-stage4-zlib
+maybe-all-stage4-zlib:
+maybe-clean-stage4-zlib:
+@if zlib-bootstrap
+maybe-all-stage4-zlib: all-stage4-zlib
+all-stage4: all-stage4-zlib
+TARGET-stage4-zlib = $(TARGET-zlib)
+all-stage4-zlib: configure-stage4-zlib
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE4_CFLAGS)" \
+		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-zlib)
+
+maybe-clean-stage4-zlib: clean-stage4-zlib
+clean-stage4: clean-stage4-zlib
+clean-stage4-zlib:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage4-zlib/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif zlib-bootstrap
+
+
+.PHONY: all-stageprofile-zlib maybe-all-stageprofile-zlib
+.PHONY: clean-stageprofile-zlib maybe-clean-stageprofile-zlib
+maybe-all-stageprofile-zlib:
+maybe-clean-stageprofile-zlib:
+@if zlib-bootstrap
+maybe-all-stageprofile-zlib: all-stageprofile-zlib
+all-stageprofile: all-stageprofile-zlib
+TARGET-stageprofile-zlib = $(TARGET-zlib)
+all-stageprofile-zlib: configure-stageprofile-zlib
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-zlib)
+
+maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
+clean-stageprofile: clean-stageprofile-zlib
+clean-stageprofile-zlib:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stageprofile-zlib/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif zlib-bootstrap
+
+
+.PHONY: all-stagefeedback-zlib maybe-all-stagefeedback-zlib
+.PHONY: clean-stagefeedback-zlib maybe-clean-stagefeedback-zlib
+maybe-all-stagefeedback-zlib:
+maybe-clean-stagefeedback-zlib:
+@if zlib-bootstrap
+maybe-all-stagefeedback-zlib: all-stagefeedback-zlib
+all-stagefeedback: all-stagefeedback-zlib
+TARGET-stagefeedback-zlib = $(TARGET-zlib)
+all-stagefeedback-zlib: configure-stagefeedback-zlib
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-zlib)
+
+maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
+clean-stagefeedback: clean-stagefeedback-zlib
+clean-stagefeedback-zlib:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stagefeedback-zlib/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif zlib-bootstrap
+
+
+
+
+
+.PHONY: check-zlib maybe-check-zlib
+maybe-check-zlib:
+@if zlib
+maybe-check-zlib: check-zlib
+
+check-zlib:
+
+@endif zlib
+
+.PHONY: install-zlib maybe-install-zlib
+maybe-install-zlib:
+@if zlib
+maybe-install-zlib: install-zlib
+
+install-zlib:
+
+@endif zlib
+
+.PHONY: install-strip-zlib maybe-install-strip-zlib
+maybe-install-strip-zlib:
+@if zlib
+maybe-install-strip-zlib: install-strip-zlib
+
+install-strip-zlib:
+
+@endif zlib
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-zlib info-zlib
+maybe-info-zlib:
+@if zlib
+maybe-info-zlib: info-zlib
+
+info-zlib: \
+    configure-zlib 
+	@[ -f ./zlib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in zlib" ; \
+	(cd $(HOST_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif zlib
+
+.PHONY: maybe-dvi-zlib dvi-zlib
+maybe-dvi-zlib:
+@if zlib
+maybe-dvi-zlib: dvi-zlib
+
+dvi-zlib: \
+    configure-zlib 
+	@[ -f ./zlib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in zlib" ; \
+	(cd $(HOST_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif zlib
+
+.PHONY: maybe-pdf-zlib pdf-zlib
+maybe-pdf-zlib:
+@if zlib
+maybe-pdf-zlib: pdf-zlib
+
+pdf-zlib: \
+    configure-zlib 
+	@[ -f ./zlib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in zlib" ; \
+	(cd $(HOST_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif zlib
+
+.PHONY: maybe-html-zlib html-zlib
+maybe-html-zlib:
+@if zlib
+maybe-html-zlib: html-zlib
+
+html-zlib: \
+    configure-zlib 
+	@[ -f ./zlib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in zlib" ; \
+	(cd $(HOST_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif zlib
+
+.PHONY: maybe-TAGS-zlib TAGS-zlib
+maybe-TAGS-zlib:
+@if zlib
+maybe-TAGS-zlib: TAGS-zlib
+
+TAGS-zlib: \
+    configure-zlib 
+	@[ -f ./zlib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in zlib" ; \
+	(cd $(HOST_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif zlib
+
+.PHONY: maybe-install-info-zlib install-info-zlib
+maybe-install-info-zlib:
+@if zlib
+maybe-install-info-zlib: install-info-zlib
+
+install-info-zlib: \
+    configure-zlib \
+    info-zlib 
+	@[ -f ./zlib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in zlib" ; \
+	(cd $(HOST_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif zlib
+
+.PHONY: maybe-install-pdf-zlib install-pdf-zlib
+maybe-install-pdf-zlib:
+@if zlib
+maybe-install-pdf-zlib: install-pdf-zlib
+
+install-pdf-zlib: \
+    configure-zlib \
+    pdf-zlib 
+	@[ -f ./zlib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in zlib" ; \
+	(cd $(HOST_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif zlib
+
+.PHONY: maybe-install-html-zlib install-html-zlib
+maybe-install-html-zlib:
+@if zlib
+maybe-install-html-zlib: install-html-zlib
+
+install-html-zlib: \
+    configure-zlib \
+    html-zlib 
+	@[ -f ./zlib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in zlib" ; \
+	(cd $(HOST_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif zlib
+
+.PHONY: maybe-installcheck-zlib installcheck-zlib
+maybe-installcheck-zlib:
+@if zlib
+maybe-installcheck-zlib: installcheck-zlib
+
+installcheck-zlib: \
+    configure-zlib 
+	@[ -f ./zlib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in zlib" ; \
+	(cd $(HOST_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif zlib
+
+.PHONY: maybe-mostlyclean-zlib mostlyclean-zlib
+maybe-mostlyclean-zlib:
+@if zlib
+maybe-mostlyclean-zlib: mostlyclean-zlib
+
+mostlyclean-zlib: 
+	@[ -f ./zlib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in zlib" ; \
+	(cd $(HOST_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif zlib
+
+.PHONY: maybe-clean-zlib clean-zlib
+maybe-clean-zlib:
+@if zlib
+maybe-clean-zlib: clean-zlib
+
+clean-zlib: 
+	@[ -f ./zlib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in zlib" ; \
+	(cd $(HOST_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif zlib
+
+.PHONY: maybe-distclean-zlib distclean-zlib
+maybe-distclean-zlib:
+@if zlib
+maybe-distclean-zlib: distclean-zlib
+
+distclean-zlib: 
+	@[ -f ./zlib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in zlib" ; \
+	(cd $(HOST_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif zlib
+
+.PHONY: maybe-maintainer-clean-zlib maintainer-clean-zlib
+maybe-maintainer-clean-zlib:
+@if zlib
+maybe-maintainer-clean-zlib: maintainer-clean-zlib
+
+maintainer-clean-zlib: 
+	@[ -f ./zlib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in zlib" ; \
+	(cd $(HOST_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif zlib
+
+
+
+.PHONY: configure-gdb maybe-configure-gdb
+maybe-configure-gdb:
+@if gcc-bootstrap
+configure-gdb: stage_current
+@endif gcc-bootstrap
+@if gdb
+maybe-configure-gdb: configure-gdb
+configure-gdb: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/gdb/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/gdb; \
+	cd "$(HOST_SUBDIR)/gdb" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gdb/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gdb"; \
+	libsrcdir="$$s/gdb"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif gdb
+
+
+
+
+
+.PHONY: all-gdb maybe-all-gdb
+maybe-all-gdb:
+@if gcc-bootstrap
+all-gdb: stage_current
+@endif gcc-bootstrap
+@if gdb
+TARGET-gdb=all
+maybe-all-gdb: all-gdb
+all-gdb: configure-gdb
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/gdb && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-gdb))
+@endif gdb
+
+
+
+
+.PHONY: check-gdb maybe-check-gdb
+maybe-check-gdb:
+@if gdb
+maybe-check-gdb: check-gdb
+
+check-gdb:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gdb && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif gdb
+
+.PHONY: install-gdb maybe-install-gdb
+maybe-install-gdb:
+@if gdb
+maybe-install-gdb: install-gdb
+
+install-gdb: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gdb && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif gdb
+
+.PHONY: install-strip-gdb maybe-install-strip-gdb
+maybe-install-strip-gdb:
+@if gdb
+maybe-install-strip-gdb: install-strip-gdb
+
+install-strip-gdb: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gdb && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif gdb
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-gdb info-gdb
+maybe-info-gdb:
+@if gdb
+maybe-info-gdb: info-gdb
+
+info-gdb: \
+    configure-gdb 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gdb/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in gdb" ; \
+	(cd $(HOST_SUBDIR)/gdb && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif gdb
+
+.PHONY: maybe-dvi-gdb dvi-gdb
+maybe-dvi-gdb:
+@if gdb
+maybe-dvi-gdb: dvi-gdb
+
+dvi-gdb: \
+    configure-gdb 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gdb/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in gdb" ; \
+	(cd $(HOST_SUBDIR)/gdb && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif gdb
+
+.PHONY: maybe-pdf-gdb pdf-gdb
+maybe-pdf-gdb:
+@if gdb
+maybe-pdf-gdb: pdf-gdb
+
+pdf-gdb: \
+    configure-gdb 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gdb/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in gdb" ; \
+	(cd $(HOST_SUBDIR)/gdb && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif gdb
+
+.PHONY: maybe-html-gdb html-gdb
+maybe-html-gdb:
+@if gdb
+maybe-html-gdb: html-gdb
+
+html-gdb: \
+    configure-gdb 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gdb/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in gdb" ; \
+	(cd $(HOST_SUBDIR)/gdb && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif gdb
+
+.PHONY: maybe-TAGS-gdb TAGS-gdb
+maybe-TAGS-gdb:
+@if gdb
+maybe-TAGS-gdb: TAGS-gdb
+
+TAGS-gdb: \
+    configure-gdb 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gdb/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in gdb" ; \
+	(cd $(HOST_SUBDIR)/gdb && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif gdb
+
+.PHONY: maybe-install-info-gdb install-info-gdb
+maybe-install-info-gdb:
+@if gdb
+maybe-install-info-gdb: install-info-gdb
+
+install-info-gdb: \
+    configure-gdb \
+    info-gdb 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gdb/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in gdb" ; \
+	(cd $(HOST_SUBDIR)/gdb && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif gdb
+
+.PHONY: maybe-install-pdf-gdb install-pdf-gdb
+maybe-install-pdf-gdb:
+@if gdb
+maybe-install-pdf-gdb: install-pdf-gdb
+
+install-pdf-gdb: \
+    configure-gdb \
+    pdf-gdb 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gdb/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in gdb" ; \
+	(cd $(HOST_SUBDIR)/gdb && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif gdb
+
+.PHONY: maybe-install-html-gdb install-html-gdb
+maybe-install-html-gdb:
+@if gdb
+maybe-install-html-gdb: install-html-gdb
+
+install-html-gdb: \
+    configure-gdb \
+    html-gdb 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gdb/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in gdb" ; \
+	(cd $(HOST_SUBDIR)/gdb && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif gdb
+
+.PHONY: maybe-installcheck-gdb installcheck-gdb
+maybe-installcheck-gdb:
+@if gdb
+maybe-installcheck-gdb: installcheck-gdb
+
+installcheck-gdb: \
+    configure-gdb 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gdb/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in gdb" ; \
+	(cd $(HOST_SUBDIR)/gdb && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif gdb
+
+.PHONY: maybe-mostlyclean-gdb mostlyclean-gdb
+maybe-mostlyclean-gdb:
+@if gdb
+maybe-mostlyclean-gdb: mostlyclean-gdb
+
+mostlyclean-gdb: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gdb/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in gdb" ; \
+	(cd $(HOST_SUBDIR)/gdb && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif gdb
+
+.PHONY: maybe-clean-gdb clean-gdb
+maybe-clean-gdb:
+@if gdb
+maybe-clean-gdb: clean-gdb
+
+clean-gdb: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gdb/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in gdb" ; \
+	(cd $(HOST_SUBDIR)/gdb && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif gdb
+
+.PHONY: maybe-distclean-gdb distclean-gdb
+maybe-distclean-gdb:
+@if gdb
+maybe-distclean-gdb: distclean-gdb
+
+distclean-gdb: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gdb/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in gdb" ; \
+	(cd $(HOST_SUBDIR)/gdb && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif gdb
+
+.PHONY: maybe-maintainer-clean-gdb maintainer-clean-gdb
+maybe-maintainer-clean-gdb:
+@if gdb
+maybe-maintainer-clean-gdb: maintainer-clean-gdb
+
+maintainer-clean-gdb: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gdb/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in gdb" ; \
+	(cd $(HOST_SUBDIR)/gdb && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif gdb
+
+
+
+.PHONY: configure-expect maybe-configure-expect
+maybe-configure-expect:
+@if gcc-bootstrap
+configure-expect: stage_current
+@endif gcc-bootstrap
+@if expect
+maybe-configure-expect: configure-expect
+configure-expect: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/expect/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/expect ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/expect; \
+	cd "$(HOST_SUBDIR)/expect" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/expect/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/expect"; \
+	libsrcdir="$$s/expect"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif expect
+
+
+
+
+
+.PHONY: all-expect maybe-all-expect
+maybe-all-expect:
+@if gcc-bootstrap
+all-expect: stage_current
+@endif gcc-bootstrap
+@if expect
+TARGET-expect=all
+maybe-all-expect: all-expect
+all-expect: configure-expect
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/expect && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-expect))
+@endif expect
+
+
+
+
+.PHONY: check-expect maybe-check-expect
+maybe-check-expect:
+@if expect
+maybe-check-expect: check-expect
+
+check-expect:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/expect && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif expect
+
+.PHONY: install-expect maybe-install-expect
+maybe-install-expect:
+@if expect
+maybe-install-expect: install-expect
+
+install-expect: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/expect && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif expect
+
+.PHONY: install-strip-expect maybe-install-strip-expect
+maybe-install-strip-expect:
+@if expect
+maybe-install-strip-expect: install-strip-expect
+
+install-strip-expect: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/expect && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif expect
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-expect info-expect
+maybe-info-expect:
+@if expect
+maybe-info-expect: info-expect
+
+info-expect: \
+    configure-expect 
+	@: $(MAKE); $(unstage)
+	@[ -f ./expect/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in expect" ; \
+	(cd $(HOST_SUBDIR)/expect && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif expect
+
+.PHONY: maybe-dvi-expect dvi-expect
+maybe-dvi-expect:
+@if expect
+maybe-dvi-expect: dvi-expect
+
+dvi-expect: \
+    configure-expect 
+	@: $(MAKE); $(unstage)
+	@[ -f ./expect/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in expect" ; \
+	(cd $(HOST_SUBDIR)/expect && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif expect
+
+.PHONY: maybe-pdf-expect pdf-expect
+maybe-pdf-expect:
+@if expect
+maybe-pdf-expect: pdf-expect
+
+pdf-expect: \
+    configure-expect 
+	@: $(MAKE); $(unstage)
+	@[ -f ./expect/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in expect" ; \
+	(cd $(HOST_SUBDIR)/expect && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif expect
+
+.PHONY: maybe-html-expect html-expect
+maybe-html-expect:
+@if expect
+maybe-html-expect: html-expect
+
+html-expect: \
+    configure-expect 
+	@: $(MAKE); $(unstage)
+	@[ -f ./expect/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in expect" ; \
+	(cd $(HOST_SUBDIR)/expect && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif expect
+
+.PHONY: maybe-TAGS-expect TAGS-expect
+maybe-TAGS-expect:
+@if expect
+maybe-TAGS-expect: TAGS-expect
+
+TAGS-expect: \
+    configure-expect 
+	@: $(MAKE); $(unstage)
+	@[ -f ./expect/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in expect" ; \
+	(cd $(HOST_SUBDIR)/expect && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif expect
+
+.PHONY: maybe-install-info-expect install-info-expect
+maybe-install-info-expect:
+@if expect
+maybe-install-info-expect: install-info-expect
+
+install-info-expect: \
+    configure-expect \
+    info-expect 
+	@: $(MAKE); $(unstage)
+	@[ -f ./expect/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in expect" ; \
+	(cd $(HOST_SUBDIR)/expect && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif expect
+
+.PHONY: maybe-install-pdf-expect install-pdf-expect
+maybe-install-pdf-expect:
+@if expect
+maybe-install-pdf-expect: install-pdf-expect
+
+install-pdf-expect: \
+    configure-expect \
+    pdf-expect 
+	@: $(MAKE); $(unstage)
+	@[ -f ./expect/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in expect" ; \
+	(cd $(HOST_SUBDIR)/expect && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif expect
+
+.PHONY: maybe-install-html-expect install-html-expect
+maybe-install-html-expect:
+@if expect
+maybe-install-html-expect: install-html-expect
+
+install-html-expect: \
+    configure-expect \
+    html-expect 
+	@: $(MAKE); $(unstage)
+	@[ -f ./expect/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in expect" ; \
+	(cd $(HOST_SUBDIR)/expect && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif expect
+
+.PHONY: maybe-installcheck-expect installcheck-expect
+maybe-installcheck-expect:
+@if expect
+maybe-installcheck-expect: installcheck-expect
+
+installcheck-expect: \
+    configure-expect 
+	@: $(MAKE); $(unstage)
+	@[ -f ./expect/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in expect" ; \
+	(cd $(HOST_SUBDIR)/expect && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif expect
+
+.PHONY: maybe-mostlyclean-expect mostlyclean-expect
+maybe-mostlyclean-expect:
+@if expect
+maybe-mostlyclean-expect: mostlyclean-expect
+
+mostlyclean-expect: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./expect/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in expect" ; \
+	(cd $(HOST_SUBDIR)/expect && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif expect
+
+.PHONY: maybe-clean-expect clean-expect
+maybe-clean-expect:
+@if expect
+maybe-clean-expect: clean-expect
+
+clean-expect: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./expect/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in expect" ; \
+	(cd $(HOST_SUBDIR)/expect && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif expect
+
+.PHONY: maybe-distclean-expect distclean-expect
+maybe-distclean-expect:
+@if expect
+maybe-distclean-expect: distclean-expect
+
+distclean-expect: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./expect/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in expect" ; \
+	(cd $(HOST_SUBDIR)/expect && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif expect
+
+.PHONY: maybe-maintainer-clean-expect maintainer-clean-expect
+maybe-maintainer-clean-expect:
+@if expect
+maybe-maintainer-clean-expect: maintainer-clean-expect
+
+maintainer-clean-expect: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./expect/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in expect" ; \
+	(cd $(HOST_SUBDIR)/expect && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif expect
+
+
+
+.PHONY: configure-guile maybe-configure-guile
+maybe-configure-guile:
+@if gcc-bootstrap
+configure-guile: stage_current
+@endif gcc-bootstrap
+@if guile
+maybe-configure-guile: configure-guile
+configure-guile: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/guile; \
+	cd "$(HOST_SUBDIR)/guile" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/guile/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/guile"; \
+	libsrcdir="$$s/guile"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif guile
+
+
+
+
+
+.PHONY: all-guile maybe-all-guile
+maybe-all-guile:
+@if gcc-bootstrap
+all-guile: stage_current
+@endif gcc-bootstrap
+@if guile
+TARGET-guile=all
+maybe-all-guile: all-guile
+all-guile: configure-guile
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/guile && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-guile))
+@endif guile
+
+
+
+
+.PHONY: check-guile maybe-check-guile
+maybe-check-guile:
+@if guile
+maybe-check-guile: check-guile
+
+check-guile:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/guile && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif guile
+
+.PHONY: install-guile maybe-install-guile
+maybe-install-guile:
+@if guile
+maybe-install-guile: install-guile
+
+install-guile: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/guile && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif guile
+
+.PHONY: install-strip-guile maybe-install-strip-guile
+maybe-install-strip-guile:
+@if guile
+maybe-install-strip-guile: install-strip-guile
+
+install-strip-guile: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/guile && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif guile
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-guile info-guile
+maybe-info-guile:
+@if guile
+maybe-info-guile: info-guile
+
+info-guile: \
+    configure-guile 
+	@: $(MAKE); $(unstage)
+	@[ -f ./guile/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in guile" ; \
+	(cd $(HOST_SUBDIR)/guile && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif guile
+
+.PHONY: maybe-dvi-guile dvi-guile
+maybe-dvi-guile:
+@if guile
+maybe-dvi-guile: dvi-guile
+
+dvi-guile: \
+    configure-guile 
+	@: $(MAKE); $(unstage)
+	@[ -f ./guile/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in guile" ; \
+	(cd $(HOST_SUBDIR)/guile && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif guile
+
+.PHONY: maybe-pdf-guile pdf-guile
+maybe-pdf-guile:
+@if guile
+maybe-pdf-guile: pdf-guile
+
+pdf-guile: \
+    configure-guile 
+	@: $(MAKE); $(unstage)
+	@[ -f ./guile/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in guile" ; \
+	(cd $(HOST_SUBDIR)/guile && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif guile
+
+.PHONY: maybe-html-guile html-guile
+maybe-html-guile:
+@if guile
+maybe-html-guile: html-guile
+
+html-guile: \
+    configure-guile 
+	@: $(MAKE); $(unstage)
+	@[ -f ./guile/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in guile" ; \
+	(cd $(HOST_SUBDIR)/guile && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif guile
+
+.PHONY: maybe-TAGS-guile TAGS-guile
+maybe-TAGS-guile:
+@if guile
+maybe-TAGS-guile: TAGS-guile
+
+TAGS-guile: \
+    configure-guile 
+	@: $(MAKE); $(unstage)
+	@[ -f ./guile/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in guile" ; \
+	(cd $(HOST_SUBDIR)/guile && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif guile
+
+.PHONY: maybe-install-info-guile install-info-guile
+maybe-install-info-guile:
+@if guile
+maybe-install-info-guile: install-info-guile
+
+install-info-guile: \
+    configure-guile \
+    info-guile 
+	@: $(MAKE); $(unstage)
+	@[ -f ./guile/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in guile" ; \
+	(cd $(HOST_SUBDIR)/guile && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif guile
+
+.PHONY: maybe-install-pdf-guile install-pdf-guile
+maybe-install-pdf-guile:
+@if guile
+maybe-install-pdf-guile: install-pdf-guile
+
+install-pdf-guile: \
+    configure-guile \
+    pdf-guile 
+	@: $(MAKE); $(unstage)
+	@[ -f ./guile/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in guile" ; \
+	(cd $(HOST_SUBDIR)/guile && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif guile
+
+.PHONY: maybe-install-html-guile install-html-guile
+maybe-install-html-guile:
+@if guile
+maybe-install-html-guile: install-html-guile
+
+install-html-guile: \
+    configure-guile \
+    html-guile 
+	@: $(MAKE); $(unstage)
+	@[ -f ./guile/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in guile" ; \
+	(cd $(HOST_SUBDIR)/guile && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif guile
+
+.PHONY: maybe-installcheck-guile installcheck-guile
+maybe-installcheck-guile:
+@if guile
+maybe-installcheck-guile: installcheck-guile
+
+installcheck-guile: \
+    configure-guile 
+	@: $(MAKE); $(unstage)
+	@[ -f ./guile/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in guile" ; \
+	(cd $(HOST_SUBDIR)/guile && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif guile
+
+.PHONY: maybe-mostlyclean-guile mostlyclean-guile
+maybe-mostlyclean-guile:
+@if guile
+maybe-mostlyclean-guile: mostlyclean-guile
+
+mostlyclean-guile: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./guile/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in guile" ; \
+	(cd $(HOST_SUBDIR)/guile && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif guile
+
+.PHONY: maybe-clean-guile clean-guile
+maybe-clean-guile:
+@if guile
+maybe-clean-guile: clean-guile
+
+clean-guile: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./guile/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in guile" ; \
+	(cd $(HOST_SUBDIR)/guile && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif guile
+
+.PHONY: maybe-distclean-guile distclean-guile
+maybe-distclean-guile:
+@if guile
+maybe-distclean-guile: distclean-guile
+
+distclean-guile: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./guile/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in guile" ; \
+	(cd $(HOST_SUBDIR)/guile && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif guile
+
+.PHONY: maybe-maintainer-clean-guile maintainer-clean-guile
+maybe-maintainer-clean-guile:
+@if guile
+maybe-maintainer-clean-guile: maintainer-clean-guile
+
+maintainer-clean-guile: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./guile/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in guile" ; \
+	(cd $(HOST_SUBDIR)/guile && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif guile
+
+
+
+.PHONY: configure-tk maybe-configure-tk
+maybe-configure-tk:
+@if gcc-bootstrap
+configure-tk: stage_current
+@endif gcc-bootstrap
+@if tk
+maybe-configure-tk: configure-tk
+configure-tk: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/tk; \
+	cd "$(HOST_SUBDIR)/tk" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/tk/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/tk"; \
+	libsrcdir="$$s/tk"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif tk
+
+
+
+
+
+.PHONY: all-tk maybe-all-tk
+maybe-all-tk:
+@if gcc-bootstrap
+all-tk: stage_current
+@endif gcc-bootstrap
+@if tk
+TARGET-tk=all
+maybe-all-tk: all-tk
+all-tk: configure-tk
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/tk && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-tk))
+@endif tk
+
+
+
+
+.PHONY: check-tk maybe-check-tk
+maybe-check-tk:
+@if tk
+maybe-check-tk: check-tk
+
+check-tk:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/tk && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif tk
+
+.PHONY: install-tk maybe-install-tk
+maybe-install-tk:
+@if tk
+maybe-install-tk: install-tk
+
+install-tk: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/tk && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif tk
+
+.PHONY: install-strip-tk maybe-install-strip-tk
+maybe-install-strip-tk:
+@if tk
+maybe-install-strip-tk: install-strip-tk
+
+install-strip-tk: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/tk && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif tk
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-tk info-tk
+maybe-info-tk:
+@if tk
+maybe-info-tk: info-tk
+
+info-tk: \
+    configure-tk 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tk/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in tk" ; \
+	(cd $(HOST_SUBDIR)/tk && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif tk
+
+.PHONY: maybe-dvi-tk dvi-tk
+maybe-dvi-tk:
+@if tk
+maybe-dvi-tk: dvi-tk
+
+dvi-tk: \
+    configure-tk 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tk/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in tk" ; \
+	(cd $(HOST_SUBDIR)/tk && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif tk
+
+.PHONY: maybe-pdf-tk pdf-tk
+maybe-pdf-tk:
+@if tk
+maybe-pdf-tk: pdf-tk
+
+pdf-tk: \
+    configure-tk 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tk/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in tk" ; \
+	(cd $(HOST_SUBDIR)/tk && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif tk
+
+.PHONY: maybe-html-tk html-tk
+maybe-html-tk:
+@if tk
+maybe-html-tk: html-tk
+
+html-tk: \
+    configure-tk 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tk/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in tk" ; \
+	(cd $(HOST_SUBDIR)/tk && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif tk
+
+.PHONY: maybe-TAGS-tk TAGS-tk
+maybe-TAGS-tk:
+@if tk
+maybe-TAGS-tk: TAGS-tk
+
+TAGS-tk: \
+    configure-tk 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tk/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in tk" ; \
+	(cd $(HOST_SUBDIR)/tk && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif tk
+
+.PHONY: maybe-install-info-tk install-info-tk
+maybe-install-info-tk:
+@if tk
+maybe-install-info-tk: install-info-tk
+
+install-info-tk: \
+    configure-tk \
+    info-tk 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tk/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in tk" ; \
+	(cd $(HOST_SUBDIR)/tk && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif tk
+
+.PHONY: maybe-install-pdf-tk install-pdf-tk
+maybe-install-pdf-tk:
+@if tk
+maybe-install-pdf-tk: install-pdf-tk
+
+install-pdf-tk: \
+    configure-tk \
+    pdf-tk 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tk/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in tk" ; \
+	(cd $(HOST_SUBDIR)/tk && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif tk
+
+.PHONY: maybe-install-html-tk install-html-tk
+maybe-install-html-tk:
+@if tk
+maybe-install-html-tk: install-html-tk
+
+install-html-tk: \
+    configure-tk \
+    html-tk 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tk/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in tk" ; \
+	(cd $(HOST_SUBDIR)/tk && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif tk
+
+.PHONY: maybe-installcheck-tk installcheck-tk
+maybe-installcheck-tk:
+@if tk
+maybe-installcheck-tk: installcheck-tk
+
+installcheck-tk: \
+    configure-tk 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tk/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in tk" ; \
+	(cd $(HOST_SUBDIR)/tk && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif tk
+
+.PHONY: maybe-mostlyclean-tk mostlyclean-tk
+maybe-mostlyclean-tk:
+@if tk
+maybe-mostlyclean-tk: mostlyclean-tk
+
+mostlyclean-tk: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tk/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in tk" ; \
+	(cd $(HOST_SUBDIR)/tk && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif tk
+
+.PHONY: maybe-clean-tk clean-tk
+maybe-clean-tk:
+@if tk
+maybe-clean-tk: clean-tk
+
+clean-tk: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tk/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in tk" ; \
+	(cd $(HOST_SUBDIR)/tk && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif tk
+
+.PHONY: maybe-distclean-tk distclean-tk
+maybe-distclean-tk:
+@if tk
+maybe-distclean-tk: distclean-tk
+
+distclean-tk: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tk/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in tk" ; \
+	(cd $(HOST_SUBDIR)/tk && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif tk
+
+.PHONY: maybe-maintainer-clean-tk maintainer-clean-tk
+maybe-maintainer-clean-tk:
+@if tk
+maybe-maintainer-clean-tk: maintainer-clean-tk
+
+maintainer-clean-tk: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tk/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in tk" ; \
+	(cd $(HOST_SUBDIR)/tk && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif tk
+
+
+
+.PHONY: configure-libtermcap maybe-configure-libtermcap
+maybe-configure-libtermcap:
+@if gcc-bootstrap
+configure-libtermcap: stage_current
+@endif gcc-bootstrap
+@if libtermcap
+maybe-configure-libtermcap: configure-libtermcap
+configure-libtermcap: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/libtermcap/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtermcap ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/libtermcap; \
+	cd "$(HOST_SUBDIR)/libtermcap" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libtermcap/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libtermcap"; \
+	libsrcdir="$$s/libtermcap"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif libtermcap
+
+
+
+
+
+.PHONY: all-libtermcap maybe-all-libtermcap
+maybe-all-libtermcap:
+@if gcc-bootstrap
+all-libtermcap: stage_current
+@endif gcc-bootstrap
+@if libtermcap
+TARGET-libtermcap=all
+maybe-all-libtermcap: all-libtermcap
+all-libtermcap: configure-libtermcap
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-libtermcap))
+@endif libtermcap
+
+
+
+
+.PHONY: check-libtermcap maybe-check-libtermcap
+maybe-check-libtermcap:
+@if libtermcap
+maybe-check-libtermcap: check-libtermcap
+
+check-libtermcap:
+
+@endif libtermcap
+
+.PHONY: install-libtermcap maybe-install-libtermcap
+maybe-install-libtermcap:
+@if libtermcap
+maybe-install-libtermcap: install-libtermcap
+
+install-libtermcap: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/libtermcap && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif libtermcap
+
+.PHONY: install-strip-libtermcap maybe-install-strip-libtermcap
+maybe-install-strip-libtermcap:
+@if libtermcap
+maybe-install-strip-libtermcap: install-strip-libtermcap
+
+install-strip-libtermcap: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/libtermcap && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif libtermcap
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-libtermcap info-libtermcap
+maybe-info-libtermcap:
+@if libtermcap
+maybe-info-libtermcap: info-libtermcap
+
+info-libtermcap: \
+    configure-libtermcap 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libtermcap/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in libtermcap" ; \
+	(cd $(HOST_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif libtermcap
+
+.PHONY: maybe-dvi-libtermcap dvi-libtermcap
+maybe-dvi-libtermcap:
+@if libtermcap
+maybe-dvi-libtermcap: dvi-libtermcap
+
+dvi-libtermcap: \
+    configure-libtermcap 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libtermcap/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in libtermcap" ; \
+	(cd $(HOST_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif libtermcap
+
+.PHONY: maybe-pdf-libtermcap pdf-libtermcap
+maybe-pdf-libtermcap:
+@if libtermcap
+maybe-pdf-libtermcap: pdf-libtermcap
+
+pdf-libtermcap: \
+    configure-libtermcap 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libtermcap/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in libtermcap" ; \
+	(cd $(HOST_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif libtermcap
+
+.PHONY: maybe-html-libtermcap html-libtermcap
+maybe-html-libtermcap:
+@if libtermcap
+maybe-html-libtermcap: html-libtermcap
+
+html-libtermcap: \
+    configure-libtermcap 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libtermcap/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in libtermcap" ; \
+	(cd $(HOST_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif libtermcap
+
+.PHONY: maybe-TAGS-libtermcap TAGS-libtermcap
+maybe-TAGS-libtermcap:
+@if libtermcap
+maybe-TAGS-libtermcap: TAGS-libtermcap
+
+TAGS-libtermcap: \
+    configure-libtermcap 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libtermcap/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in libtermcap" ; \
+	(cd $(HOST_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif libtermcap
+
+.PHONY: maybe-install-info-libtermcap install-info-libtermcap
+maybe-install-info-libtermcap:
+@if libtermcap
+maybe-install-info-libtermcap: install-info-libtermcap
+
+install-info-libtermcap: \
+    configure-libtermcap \
+    info-libtermcap 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libtermcap/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in libtermcap" ; \
+	(cd $(HOST_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif libtermcap
+
+.PHONY: maybe-install-pdf-libtermcap install-pdf-libtermcap
+maybe-install-pdf-libtermcap:
+@if libtermcap
+maybe-install-pdf-libtermcap: install-pdf-libtermcap
+
+install-pdf-libtermcap: \
+    configure-libtermcap \
+    pdf-libtermcap 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libtermcap/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in libtermcap" ; \
+	(cd $(HOST_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif libtermcap
+
+.PHONY: maybe-install-html-libtermcap install-html-libtermcap
+maybe-install-html-libtermcap:
+@if libtermcap
+maybe-install-html-libtermcap: install-html-libtermcap
+
+install-html-libtermcap: \
+    configure-libtermcap \
+    html-libtermcap 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libtermcap/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in libtermcap" ; \
+	(cd $(HOST_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif libtermcap
+
+.PHONY: maybe-installcheck-libtermcap installcheck-libtermcap
+maybe-installcheck-libtermcap:
+@if libtermcap
+maybe-installcheck-libtermcap: installcheck-libtermcap
+
+installcheck-libtermcap: \
+    configure-libtermcap 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libtermcap/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in libtermcap" ; \
+	(cd $(HOST_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif libtermcap
+
+.PHONY: maybe-mostlyclean-libtermcap mostlyclean-libtermcap
+maybe-mostlyclean-libtermcap:
+@if libtermcap
+maybe-mostlyclean-libtermcap: mostlyclean-libtermcap
+
+# libtermcap doesn't support mostlyclean.
+mostlyclean-libtermcap:
+
+@endif libtermcap
+
+.PHONY: maybe-clean-libtermcap clean-libtermcap
+maybe-clean-libtermcap:
+@if libtermcap
+maybe-clean-libtermcap: clean-libtermcap
+
+# libtermcap doesn't support clean.
+clean-libtermcap:
+
+@endif libtermcap
+
+.PHONY: maybe-distclean-libtermcap distclean-libtermcap
+maybe-distclean-libtermcap:
+@if libtermcap
+maybe-distclean-libtermcap: distclean-libtermcap
+
+# libtermcap doesn't support distclean.
+distclean-libtermcap:
+
+@endif libtermcap
+
+.PHONY: maybe-maintainer-clean-libtermcap maintainer-clean-libtermcap
+maybe-maintainer-clean-libtermcap:
+@if libtermcap
+maybe-maintainer-clean-libtermcap: maintainer-clean-libtermcap
+
+# libtermcap doesn't support maintainer-clean.
+maintainer-clean-libtermcap:
+
+@endif libtermcap
+
+
+
+.PHONY: configure-utils maybe-configure-utils
+maybe-configure-utils:
+@if gcc-bootstrap
+configure-utils: stage_current
+@endif gcc-bootstrap
+@if utils
+maybe-configure-utils: configure-utils
+configure-utils: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/utils; \
+	cd "$(HOST_SUBDIR)/utils" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/utils/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/utils"; \
+	libsrcdir="$$s/utils"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif utils
+
+
+
+
+
+.PHONY: all-utils maybe-all-utils
+maybe-all-utils:
+@if gcc-bootstrap
+all-utils: stage_current
+@endif gcc-bootstrap
+@if utils
+TARGET-utils=all
+maybe-all-utils: all-utils
+all-utils: configure-utils
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/utils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-utils))
+@endif utils
+
+
+
+
+.PHONY: check-utils maybe-check-utils
+maybe-check-utils:
+@if utils
+maybe-check-utils: check-utils
+
+check-utils:
+
+@endif utils
+
+.PHONY: install-utils maybe-install-utils
+maybe-install-utils:
+@if utils
+maybe-install-utils: install-utils
+
+install-utils: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/utils && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif utils
+
+.PHONY: install-strip-utils maybe-install-strip-utils
+maybe-install-strip-utils:
+@if utils
+maybe-install-strip-utils: install-strip-utils
+
+install-strip-utils: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/utils && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif utils
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-utils info-utils
+maybe-info-utils:
+@if utils
+maybe-info-utils: info-utils
+
+info-utils: \
+    configure-utils 
+	@: $(MAKE); $(unstage)
+	@[ -f ./utils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in utils" ; \
+	(cd $(HOST_SUBDIR)/utils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif utils
+
+.PHONY: maybe-dvi-utils dvi-utils
+maybe-dvi-utils:
+@if utils
+maybe-dvi-utils: dvi-utils
+
+dvi-utils: \
+    configure-utils 
+	@: $(MAKE); $(unstage)
+	@[ -f ./utils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in utils" ; \
+	(cd $(HOST_SUBDIR)/utils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif utils
+
+.PHONY: maybe-pdf-utils pdf-utils
+maybe-pdf-utils:
+@if utils
+maybe-pdf-utils: pdf-utils
+
+pdf-utils: \
+    configure-utils 
+	@: $(MAKE); $(unstage)
+	@[ -f ./utils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in utils" ; \
+	(cd $(HOST_SUBDIR)/utils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif utils
+
+.PHONY: maybe-html-utils html-utils
+maybe-html-utils:
+@if utils
+maybe-html-utils: html-utils
+
+html-utils: \
+    configure-utils 
+	@: $(MAKE); $(unstage)
+	@[ -f ./utils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in utils" ; \
+	(cd $(HOST_SUBDIR)/utils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif utils
+
+.PHONY: maybe-TAGS-utils TAGS-utils
+maybe-TAGS-utils:
+@if utils
+maybe-TAGS-utils: TAGS-utils
+
+TAGS-utils: \
+    configure-utils 
+	@: $(MAKE); $(unstage)
+	@[ -f ./utils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in utils" ; \
+	(cd $(HOST_SUBDIR)/utils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif utils
+
+.PHONY: maybe-install-info-utils install-info-utils
+maybe-install-info-utils:
+@if utils
+maybe-install-info-utils: install-info-utils
+
+install-info-utils: \
+    configure-utils \
+    info-utils 
+	@: $(MAKE); $(unstage)
+	@[ -f ./utils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in utils" ; \
+	(cd $(HOST_SUBDIR)/utils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif utils
+
+.PHONY: maybe-install-pdf-utils install-pdf-utils
+maybe-install-pdf-utils:
+@if utils
+maybe-install-pdf-utils: install-pdf-utils
+
+install-pdf-utils: \
+    configure-utils \
+    pdf-utils 
+	@: $(MAKE); $(unstage)
+	@[ -f ./utils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in utils" ; \
+	(cd $(HOST_SUBDIR)/utils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif utils
+
+.PHONY: maybe-install-html-utils install-html-utils
+maybe-install-html-utils:
+@if utils
+maybe-install-html-utils: install-html-utils
+
+install-html-utils: \
+    configure-utils \
+    html-utils 
+	@: $(MAKE); $(unstage)
+	@[ -f ./utils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in utils" ; \
+	(cd $(HOST_SUBDIR)/utils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif utils
+
+.PHONY: maybe-installcheck-utils installcheck-utils
+maybe-installcheck-utils:
+@if utils
+maybe-installcheck-utils: installcheck-utils
+
+installcheck-utils: \
+    configure-utils 
+	@: $(MAKE); $(unstage)
+	@[ -f ./utils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in utils" ; \
+	(cd $(HOST_SUBDIR)/utils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif utils
+
+.PHONY: maybe-mostlyclean-utils mostlyclean-utils
+maybe-mostlyclean-utils:
+@if utils
+maybe-mostlyclean-utils: mostlyclean-utils
+
+mostlyclean-utils: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./utils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in utils" ; \
+	(cd $(HOST_SUBDIR)/utils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif utils
+
+.PHONY: maybe-clean-utils clean-utils
+maybe-clean-utils:
+@if utils
+maybe-clean-utils: clean-utils
+
+clean-utils: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./utils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in utils" ; \
+	(cd $(HOST_SUBDIR)/utils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif utils
+
+.PHONY: maybe-distclean-utils distclean-utils
+maybe-distclean-utils:
+@if utils
+maybe-distclean-utils: distclean-utils
+
+distclean-utils: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./utils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in utils" ; \
+	(cd $(HOST_SUBDIR)/utils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif utils
+
+.PHONY: maybe-maintainer-clean-utils maintainer-clean-utils
+maybe-maintainer-clean-utils:
+@if utils
+maybe-maintainer-clean-utils: maintainer-clean-utils
+
+maintainer-clean-utils: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./utils/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in utils" ; \
+	(cd $(HOST_SUBDIR)/utils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif utils
+
+
+
+.PHONY: configure-gnattools maybe-configure-gnattools
+maybe-configure-gnattools:
+@if gcc-bootstrap
+configure-gnattools: stage_current
+@endif gcc-bootstrap
+@if gnattools
+maybe-configure-gnattools: configure-gnattools
+configure-gnattools: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/gnattools; \
+	cd "$(HOST_SUBDIR)/gnattools" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gnattools/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gnattools"; \
+	libsrcdir="$$s/gnattools"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif gnattools
+
+
+
+
+
+.PHONY: all-gnattools maybe-all-gnattools
+maybe-all-gnattools:
+@if gcc-bootstrap
+all-gnattools: stage_current
+@endif gcc-bootstrap
+@if gnattools
+TARGET-gnattools=all
+maybe-all-gnattools: all-gnattools
+all-gnattools: configure-gnattools
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/gnattools && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-gnattools))
+@endif gnattools
+
+
+
+
+.PHONY: check-gnattools maybe-check-gnattools
+maybe-check-gnattools:
+@if gnattools
+maybe-check-gnattools: check-gnattools
+
+check-gnattools:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gnattools && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif gnattools
+
+.PHONY: install-gnattools maybe-install-gnattools
+maybe-install-gnattools:
+@if gnattools
+maybe-install-gnattools: install-gnattools
+
+install-gnattools: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gnattools && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif gnattools
+
+.PHONY: install-strip-gnattools maybe-install-strip-gnattools
+maybe-install-strip-gnattools:
+@if gnattools
+maybe-install-strip-gnattools: install-strip-gnattools
+
+install-strip-gnattools: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gnattools && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif gnattools
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-gnattools info-gnattools
+maybe-info-gnattools:
+@if gnattools
+maybe-info-gnattools: info-gnattools
+
+info-gnattools: \
+    configure-gnattools 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnattools/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in gnattools" ; \
+	(cd $(HOST_SUBDIR)/gnattools && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-dvi-gnattools dvi-gnattools
+maybe-dvi-gnattools:
+@if gnattools
+maybe-dvi-gnattools: dvi-gnattools
+
+dvi-gnattools: \
+    configure-gnattools 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnattools/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in gnattools" ; \
+	(cd $(HOST_SUBDIR)/gnattools && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-pdf-gnattools pdf-gnattools
+maybe-pdf-gnattools:
+@if gnattools
+maybe-pdf-gnattools: pdf-gnattools
+
+pdf-gnattools: \
+    configure-gnattools 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnattools/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in gnattools" ; \
+	(cd $(HOST_SUBDIR)/gnattools && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-html-gnattools html-gnattools
+maybe-html-gnattools:
+@if gnattools
+maybe-html-gnattools: html-gnattools
+
+html-gnattools: \
+    configure-gnattools 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnattools/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in gnattools" ; \
+	(cd $(HOST_SUBDIR)/gnattools && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-TAGS-gnattools TAGS-gnattools
+maybe-TAGS-gnattools:
+@if gnattools
+maybe-TAGS-gnattools: TAGS-gnattools
+
+TAGS-gnattools: \
+    configure-gnattools 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnattools/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in gnattools" ; \
+	(cd $(HOST_SUBDIR)/gnattools && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-install-info-gnattools install-info-gnattools
+maybe-install-info-gnattools:
+@if gnattools
+maybe-install-info-gnattools: install-info-gnattools
+
+install-info-gnattools: \
+    configure-gnattools \
+    info-gnattools 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnattools/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in gnattools" ; \
+	(cd $(HOST_SUBDIR)/gnattools && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-install-pdf-gnattools install-pdf-gnattools
+maybe-install-pdf-gnattools:
+@if gnattools
+maybe-install-pdf-gnattools: install-pdf-gnattools
+
+install-pdf-gnattools: \
+    configure-gnattools \
+    pdf-gnattools 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnattools/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in gnattools" ; \
+	(cd $(HOST_SUBDIR)/gnattools && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-install-html-gnattools install-html-gnattools
+maybe-install-html-gnattools:
+@if gnattools
+maybe-install-html-gnattools: install-html-gnattools
+
+install-html-gnattools: \
+    configure-gnattools \
+    html-gnattools 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnattools/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in gnattools" ; \
+	(cd $(HOST_SUBDIR)/gnattools && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-installcheck-gnattools installcheck-gnattools
+maybe-installcheck-gnattools:
+@if gnattools
+maybe-installcheck-gnattools: installcheck-gnattools
+
+installcheck-gnattools: \
+    configure-gnattools 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnattools/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in gnattools" ; \
+	(cd $(HOST_SUBDIR)/gnattools && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-mostlyclean-gnattools mostlyclean-gnattools
+maybe-mostlyclean-gnattools:
+@if gnattools
+maybe-mostlyclean-gnattools: mostlyclean-gnattools
+
+mostlyclean-gnattools: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnattools/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in gnattools" ; \
+	(cd $(HOST_SUBDIR)/gnattools && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-clean-gnattools clean-gnattools
+maybe-clean-gnattools:
+@if gnattools
+maybe-clean-gnattools: clean-gnattools
+
+clean-gnattools: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnattools/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in gnattools" ; \
+	(cd $(HOST_SUBDIR)/gnattools && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-distclean-gnattools distclean-gnattools
+maybe-distclean-gnattools:
+@if gnattools
+maybe-distclean-gnattools: distclean-gnattools
+
+distclean-gnattools: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnattools/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in gnattools" ; \
+	(cd $(HOST_SUBDIR)/gnattools && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif gnattools
+
+.PHONY: maybe-maintainer-clean-gnattools maintainer-clean-gnattools
+maybe-maintainer-clean-gnattools:
+@if gnattools
+maybe-maintainer-clean-gnattools: maintainer-clean-gnattools
+
+maintainer-clean-gnattools: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnattools/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in gnattools" ; \
+	(cd $(HOST_SUBDIR)/gnattools && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif gnattools
+
+
+
+.PHONY: configure-lto-plugin maybe-configure-lto-plugin
+maybe-configure-lto-plugin:
+@if gcc-bootstrap
+configure-lto-plugin: stage_current
+@endif gcc-bootstrap
+@if lto-plugin
+maybe-configure-lto-plugin: configure-lto-plugin
+configure-lto-plugin: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/lto-plugin; \
+	cd "$(HOST_SUBDIR)/lto-plugin" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
+	libsrcdir="$$s/lto-plugin"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} --enable-shared \
+	  || exit 1
+@endif lto-plugin
+
+
+
+.PHONY: configure-stage1-lto-plugin maybe-configure-stage1-lto-plugin
+maybe-configure-stage1-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-configure-stage1-lto-plugin: configure-stage1-lto-plugin
+configure-stage1-lto-plugin:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(HOST_SUBDIR)/lto-plugin ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \
+	cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
+	libsrcdir="$$s/lto-plugin"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS) \
+	  --enable-shared
+@endif lto-plugin-bootstrap
+
+.PHONY: configure-stage2-lto-plugin maybe-configure-stage2-lto-plugin
+maybe-configure-stage2-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-configure-stage2-lto-plugin: configure-stage2-lto-plugin
+configure-stage2-lto-plugin:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(HOST_SUBDIR)/lto-plugin ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \
+	cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
+	libsrcdir="$$s/lto-plugin"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS) \
+	  --enable-shared
+@endif lto-plugin-bootstrap
+
+.PHONY: configure-stage3-lto-plugin maybe-configure-stage3-lto-plugin
+maybe-configure-stage3-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-configure-stage3-lto-plugin: configure-stage3-lto-plugin
+configure-stage3-lto-plugin:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(HOST_SUBDIR)/lto-plugin ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \
+	cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
+	libsrcdir="$$s/lto-plugin"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS) \
+	  --enable-shared
+@endif lto-plugin-bootstrap
+
+.PHONY: configure-stage4-lto-plugin maybe-configure-stage4-lto-plugin
+maybe-configure-stage4-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-configure-stage4-lto-plugin: configure-stage4-lto-plugin
+configure-stage4-lto-plugin:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(HOST_SUBDIR)/lto-plugin ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \
+	cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
+	libsrcdir="$$s/lto-plugin"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS) \
+	  --enable-shared
+@endif lto-plugin-bootstrap
+
+.PHONY: configure-stageprofile-lto-plugin maybe-configure-stageprofile-lto-plugin
+maybe-configure-stageprofile-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-configure-stageprofile-lto-plugin: configure-stageprofile-lto-plugin
+configure-stageprofile-lto-plugin:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(HOST_SUBDIR)/lto-plugin ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \
+	cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
+	libsrcdir="$$s/lto-plugin"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS) \
+	  --enable-shared
+@endif lto-plugin-bootstrap
+
+.PHONY: configure-stagefeedback-lto-plugin maybe-configure-stagefeedback-lto-plugin
+maybe-configure-stagefeedback-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-configure-stagefeedback-lto-plugin: configure-stagefeedback-lto-plugin
+configure-stagefeedback-lto-plugin:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS) \
+	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(HOST_SUBDIR)/lto-plugin ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \
+	cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
+	libsrcdir="$$s/lto-plugin"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS) \
+	  --enable-shared
+@endif lto-plugin-bootstrap
+
+
+
+
+
+.PHONY: all-lto-plugin maybe-all-lto-plugin
+maybe-all-lto-plugin:
+@if gcc-bootstrap
+all-lto-plugin: stage_current
+@endif gcc-bootstrap
+@if lto-plugin
+TARGET-lto-plugin=all
+maybe-all-lto-plugin: all-lto-plugin
+all-lto-plugin: configure-lto-plugin
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/lto-plugin && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+		$(TARGET-lto-plugin))
+@endif lto-plugin
+
+
+
+.PHONY: all-stage1-lto-plugin maybe-all-stage1-lto-plugin
+.PHONY: clean-stage1-lto-plugin maybe-clean-stage1-lto-plugin
+maybe-all-stage1-lto-plugin:
+maybe-clean-stage1-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-all-stage1-lto-plugin: all-stage1-lto-plugin
+all-stage1: all-stage1-lto-plugin
+TARGET-stage1-lto-plugin = $(TARGET-lto-plugin)
+all-stage1-lto-plugin: configure-stage1-lto-plugin
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/lto-plugin && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE1_CFLAGS)" \
+		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+		LIBCFLAGS="$(LIBCFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-lto-plugin)
+
+maybe-clean-stage1-lto-plugin: clean-stage1-lto-plugin
+clean-stage1: clean-stage1-lto-plugin
+clean-stage1-lto-plugin:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage1-lto-plugin/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/lto-plugin && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		 clean
+@endif lto-plugin-bootstrap
+
+
+.PHONY: all-stage2-lto-plugin maybe-all-stage2-lto-plugin
+.PHONY: clean-stage2-lto-plugin maybe-clean-stage2-lto-plugin
+maybe-all-stage2-lto-plugin:
+maybe-clean-stage2-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-all-stage2-lto-plugin: all-stage2-lto-plugin
+all-stage2: all-stage2-lto-plugin
+TARGET-stage2-lto-plugin = $(TARGET-lto-plugin)
+all-stage2-lto-plugin: configure-stage2-lto-plugin
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/lto-plugin && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE2_CFLAGS)" \
+		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE2_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-lto-plugin)
+
+maybe-clean-stage2-lto-plugin: clean-stage2-lto-plugin
+clean-stage2: clean-stage2-lto-plugin
+clean-stage2-lto-plugin:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage2-lto-plugin/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/lto-plugin && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif lto-plugin-bootstrap
+
+
+.PHONY: all-stage3-lto-plugin maybe-all-stage3-lto-plugin
+.PHONY: clean-stage3-lto-plugin maybe-clean-stage3-lto-plugin
+maybe-all-stage3-lto-plugin:
+maybe-clean-stage3-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-all-stage3-lto-plugin: all-stage3-lto-plugin
+all-stage3: all-stage3-lto-plugin
+TARGET-stage3-lto-plugin = $(TARGET-lto-plugin)
+all-stage3-lto-plugin: configure-stage3-lto-plugin
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/lto-plugin && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE3_CFLAGS)" \
+		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE3_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-lto-plugin)
+
+maybe-clean-stage3-lto-plugin: clean-stage3-lto-plugin
+clean-stage3: clean-stage3-lto-plugin
+clean-stage3-lto-plugin:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage3-lto-plugin/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/lto-plugin && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif lto-plugin-bootstrap
+
+
+.PHONY: all-stage4-lto-plugin maybe-all-stage4-lto-plugin
+.PHONY: clean-stage4-lto-plugin maybe-clean-stage4-lto-plugin
+maybe-all-stage4-lto-plugin:
+maybe-clean-stage4-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-all-stage4-lto-plugin: all-stage4-lto-plugin
+all-stage4: all-stage4-lto-plugin
+TARGET-stage4-lto-plugin = $(TARGET-lto-plugin)
+all-stage4-lto-plugin: configure-stage4-lto-plugin
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/lto-plugin && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGE4_CFLAGS)" \
+		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-lto-plugin)
+
+maybe-clean-stage4-lto-plugin: clean-stage4-lto-plugin
+clean-stage4: clean-stage4-lto-plugin
+clean-stage4-lto-plugin:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stage4-lto-plugin/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/lto-plugin && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif lto-plugin-bootstrap
+
+
+.PHONY: all-stageprofile-lto-plugin maybe-all-stageprofile-lto-plugin
+.PHONY: clean-stageprofile-lto-plugin maybe-clean-stageprofile-lto-plugin
+maybe-all-stageprofile-lto-plugin:
+maybe-clean-stageprofile-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-all-stageprofile-lto-plugin: all-stageprofile-lto-plugin
+all-stageprofile: all-stageprofile-lto-plugin
+TARGET-stageprofile-lto-plugin = $(TARGET-lto-plugin)
+all-stageprofile-lto-plugin: configure-stageprofile-lto-plugin
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/lto-plugin && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEprofile_CFLAGS)" \
+		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-lto-plugin)
+
+maybe-clean-stageprofile-lto-plugin: clean-stageprofile-lto-plugin
+clean-stageprofile: clean-stageprofile-lto-plugin
+clean-stageprofile-lto-plugin:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stageprofile-lto-plugin/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/lto-plugin && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif lto-plugin-bootstrap
+
+
+.PHONY: all-stagefeedback-lto-plugin maybe-all-stagefeedback-lto-plugin
+.PHONY: clean-stagefeedback-lto-plugin maybe-clean-stagefeedback-lto-plugin
+maybe-all-stagefeedback-lto-plugin:
+maybe-clean-stagefeedback-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-all-stagefeedback-lto-plugin: all-stagefeedback-lto-plugin
+all-stagefeedback: all-stagefeedback-lto-plugin
+TARGET-stagefeedback-lto-plugin = $(TARGET-lto-plugin)
+all-stagefeedback-lto-plugin: configure-stagefeedback-lto-plugin
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(HOST_EXPORTS) \
+	$(POSTSTAGE1_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/lto-plugin && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-lto-plugin)
+
+maybe-clean-stagefeedback-lto-plugin: clean-stagefeedback-lto-plugin
+clean-stagefeedback: clean-stagefeedback-lto-plugin
+clean-stagefeedback-lto-plugin:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+	else \
+	  [ -f $(HOST_SUBDIR)/stagefeedback-lto-plugin/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(HOST_SUBDIR)/lto-plugin && \
+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 clean
+@endif lto-plugin-bootstrap
+
+
+
+
+
+.PHONY: check-lto-plugin maybe-check-lto-plugin
+maybe-check-lto-plugin:
+@if lto-plugin
+maybe-check-lto-plugin: check-lto-plugin
+
+check-lto-plugin:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/lto-plugin && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif lto-plugin
+
+.PHONY: install-lto-plugin maybe-install-lto-plugin
+maybe-install-lto-plugin:
+@if lto-plugin
+maybe-install-lto-plugin: install-lto-plugin
+
+install-lto-plugin: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/lto-plugin && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif lto-plugin
+
+.PHONY: install-strip-lto-plugin maybe-install-strip-lto-plugin
+maybe-install-strip-lto-plugin:
+@if lto-plugin
+maybe-install-strip-lto-plugin: install-strip-lto-plugin
+
+install-strip-lto-plugin: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/lto-plugin && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif lto-plugin
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-lto-plugin info-lto-plugin
+maybe-info-lto-plugin:
+@if lto-plugin
+maybe-info-lto-plugin: info-lto-plugin
+
+info-lto-plugin: \
+    configure-lto-plugin 
+	@[ -f ./lto-plugin/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in lto-plugin" ; \
+	(cd $(HOST_SUBDIR)/lto-plugin && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif lto-plugin
+
+.PHONY: maybe-dvi-lto-plugin dvi-lto-plugin
+maybe-dvi-lto-plugin:
+@if lto-plugin
+maybe-dvi-lto-plugin: dvi-lto-plugin
+
+dvi-lto-plugin: \
+    configure-lto-plugin 
+	@[ -f ./lto-plugin/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in lto-plugin" ; \
+	(cd $(HOST_SUBDIR)/lto-plugin && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif lto-plugin
+
+.PHONY: maybe-pdf-lto-plugin pdf-lto-plugin
+maybe-pdf-lto-plugin:
+@if lto-plugin
+maybe-pdf-lto-plugin: pdf-lto-plugin
+
+pdf-lto-plugin: \
+    configure-lto-plugin 
+	@[ -f ./lto-plugin/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in lto-plugin" ; \
+	(cd $(HOST_SUBDIR)/lto-plugin && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif lto-plugin
+
+.PHONY: maybe-html-lto-plugin html-lto-plugin
+maybe-html-lto-plugin:
+@if lto-plugin
+maybe-html-lto-plugin: html-lto-plugin
+
+html-lto-plugin: \
+    configure-lto-plugin 
+	@[ -f ./lto-plugin/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in lto-plugin" ; \
+	(cd $(HOST_SUBDIR)/lto-plugin && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif lto-plugin
+
+.PHONY: maybe-TAGS-lto-plugin TAGS-lto-plugin
+maybe-TAGS-lto-plugin:
+@if lto-plugin
+maybe-TAGS-lto-plugin: TAGS-lto-plugin
+
+TAGS-lto-plugin: \
+    configure-lto-plugin 
+	@[ -f ./lto-plugin/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in lto-plugin" ; \
+	(cd $(HOST_SUBDIR)/lto-plugin && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif lto-plugin
+
+.PHONY: maybe-install-info-lto-plugin install-info-lto-plugin
+maybe-install-info-lto-plugin:
+@if lto-plugin
+maybe-install-info-lto-plugin: install-info-lto-plugin
+
+install-info-lto-plugin: \
+    configure-lto-plugin \
+    info-lto-plugin 
+	@[ -f ./lto-plugin/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in lto-plugin" ; \
+	(cd $(HOST_SUBDIR)/lto-plugin && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif lto-plugin
+
+.PHONY: maybe-install-pdf-lto-plugin install-pdf-lto-plugin
+maybe-install-pdf-lto-plugin:
+@if lto-plugin
+maybe-install-pdf-lto-plugin: install-pdf-lto-plugin
+
+install-pdf-lto-plugin: \
+    configure-lto-plugin \
+    pdf-lto-plugin 
+	@[ -f ./lto-plugin/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in lto-plugin" ; \
+	(cd $(HOST_SUBDIR)/lto-plugin && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif lto-plugin
+
+.PHONY: maybe-install-html-lto-plugin install-html-lto-plugin
+maybe-install-html-lto-plugin:
+@if lto-plugin
+maybe-install-html-lto-plugin: install-html-lto-plugin
+
+install-html-lto-plugin: \
+    configure-lto-plugin \
+    html-lto-plugin 
+	@[ -f ./lto-plugin/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in lto-plugin" ; \
+	(cd $(HOST_SUBDIR)/lto-plugin && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif lto-plugin
+
+.PHONY: maybe-installcheck-lto-plugin installcheck-lto-plugin
+maybe-installcheck-lto-plugin:
+@if lto-plugin
+maybe-installcheck-lto-plugin: installcheck-lto-plugin
+
+installcheck-lto-plugin: \
+    configure-lto-plugin 
+	@[ -f ./lto-plugin/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in lto-plugin" ; \
+	(cd $(HOST_SUBDIR)/lto-plugin && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif lto-plugin
+
+.PHONY: maybe-mostlyclean-lto-plugin mostlyclean-lto-plugin
+maybe-mostlyclean-lto-plugin:
+@if lto-plugin
+maybe-mostlyclean-lto-plugin: mostlyclean-lto-plugin
+
+mostlyclean-lto-plugin: 
+	@[ -f ./lto-plugin/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in lto-plugin" ; \
+	(cd $(HOST_SUBDIR)/lto-plugin && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif lto-plugin
+
+.PHONY: maybe-clean-lto-plugin clean-lto-plugin
+maybe-clean-lto-plugin:
+@if lto-plugin
+maybe-clean-lto-plugin: clean-lto-plugin
+
+clean-lto-plugin: 
+	@[ -f ./lto-plugin/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in lto-plugin" ; \
+	(cd $(HOST_SUBDIR)/lto-plugin && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif lto-plugin
+
+.PHONY: maybe-distclean-lto-plugin distclean-lto-plugin
+maybe-distclean-lto-plugin:
+@if lto-plugin
+maybe-distclean-lto-plugin: distclean-lto-plugin
+
+distclean-lto-plugin: 
+	@[ -f ./lto-plugin/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in lto-plugin" ; \
+	(cd $(HOST_SUBDIR)/lto-plugin && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif lto-plugin
+
+.PHONY: maybe-maintainer-clean-lto-plugin maintainer-clean-lto-plugin
+maybe-maintainer-clean-lto-plugin:
+@if lto-plugin
+maybe-maintainer-clean-lto-plugin: maintainer-clean-lto-plugin
+
+maintainer-clean-lto-plugin: 
+	@[ -f ./lto-plugin/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in lto-plugin" ; \
+	(cd $(HOST_SUBDIR)/lto-plugin && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif lto-plugin
+
+
+
+# ---------------------------------------
+# Modules which run on the target machine
+# ---------------------------------------
+
+
+
+
+.PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
+maybe-configure-target-libstdc++-v3:
+@if gcc-bootstrap
+configure-target-libstdc++-v3: stage_current
+@endif gcc-bootstrap
+@if target-libstdc++-v3
+maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3
+configure-target-libstdc++-v3: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libstdc++-v3..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+	    mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
+	$(RAW_CXX_TARGET_EXPORTS)  \
+	echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
+	cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
+	libsrcdir="$$s/libstdc++-v3"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif target-libstdc++-v3
+
+
+
+.PHONY: configure-stage1-target-libstdc++-v3 maybe-configure-stage1-target-libstdc++-v3
+maybe-configure-stage1-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3
+configure-stage1-target-libstdc++-v3:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	echo "Checking multilib configuration for libstdc++-v3..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+	    mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(TARGET_SUBDIR)/libstdc++-v3 ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
+	cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
+	libsrcdir="$$s/libstdc++-v3"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
+
+.PHONY: configure-stage2-target-libstdc++-v3 maybe-configure-stage2-target-libstdc++-v3
+maybe-configure-stage2-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3
+configure-stage2-target-libstdc++-v3:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	echo "Checking multilib configuration for libstdc++-v3..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+	    mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	 \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(TARGET_SUBDIR)/libstdc++-v3 ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
+	cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
+	libsrcdir="$$s/libstdc++-v3"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
+
+.PHONY: configure-stage3-target-libstdc++-v3 maybe-configure-stage3-target-libstdc++-v3
+maybe-configure-stage3-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3
+configure-stage3-target-libstdc++-v3:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	echo "Checking multilib configuration for libstdc++-v3..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+	    mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	 \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(TARGET_SUBDIR)/libstdc++-v3 ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
+	cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
+	libsrcdir="$$s/libstdc++-v3"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
+
+.PHONY: configure-stage4-target-libstdc++-v3 maybe-configure-stage4-target-libstdc++-v3
+maybe-configure-stage4-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stage4-target-libstdc++-v3: configure-stage4-target-libstdc++-v3
+configure-stage4-target-libstdc++-v3:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	echo "Checking multilib configuration for libstdc++-v3..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+	    mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	 \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(TARGET_SUBDIR)/libstdc++-v3 ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
+	cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
+	libsrcdir="$$s/libstdc++-v3"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
+
+.PHONY: configure-stageprofile-target-libstdc++-v3 maybe-configure-stageprofile-target-libstdc++-v3
+maybe-configure-stageprofile-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stageprofile-target-libstdc++-v3: configure-stageprofile-target-libstdc++-v3
+configure-stageprofile-target-libstdc++-v3:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	echo "Checking multilib configuration for libstdc++-v3..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+	    mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	 \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(TARGET_SUBDIR)/libstdc++-v3 ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
+	cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
+	libsrcdir="$$s/libstdc++-v3"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
+
+.PHONY: configure-stagefeedback-target-libstdc++-v3 maybe-configure-stagefeedback-target-libstdc++-v3
+maybe-configure-stagefeedback-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stagefeedback-target-libstdc++-v3: configure-stagefeedback-target-libstdc++-v3
+configure-stagefeedback-target-libstdc++-v3:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	echo "Checking multilib configuration for libstdc++-v3..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+	    mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	 \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(TARGET_SUBDIR)/libstdc++-v3 ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
+	cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
+	libsrcdir="$$s/libstdc++-v3"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
+
+
+
+
+
+.PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
+maybe-all-target-libstdc++-v3:
+@if gcc-bootstrap
+all-target-libstdc++-v3: stage_current
+@endif gcc-bootstrap
+@if target-libstdc++-v3
+TARGET-target-libstdc++-v3=all
+maybe-all-target-libstdc++-v3: all-target-libstdc++-v3
+all-target-libstdc++-v3: configure-target-libstdc++-v3
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS)  \
+	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+		$(TARGET-target-libstdc++-v3))
+@endif target-libstdc++-v3
+
+
+
+.PHONY: all-stage1-target-libstdc++-v3 maybe-all-stage1-target-libstdc++-v3
+.PHONY: clean-stage1-target-libstdc++-v3 maybe-clean-stage1-target-libstdc++-v3
+maybe-all-stage1-target-libstdc++-v3:
+maybe-clean-stage1-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stage1-target-libstdc++-v3: all-stage1-target-libstdc++-v3
+all-stage1: all-stage1-target-libstdc++-v3
+TARGET-stage1-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(RAW_CXX_TARGET_EXPORTS)  \
+	cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-target-libstdc++-v3)
+
+maybe-clean-stage1-target-libstdc++-v3: clean-stage1-target-libstdc++-v3
+clean-stage1: clean-stage1-target-libstdc++-v3
+clean-stage1-target-libstdc++-v3:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+	else \
+	  [ -f $(TARGET_SUBDIR)/stage1-libstdc++-v3/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+		 clean
+@endif target-libstdc++-v3-bootstrap
+
+
+.PHONY: all-stage2-target-libstdc++-v3 maybe-all-stage2-target-libstdc++-v3
+.PHONY: clean-stage2-target-libstdc++-v3 maybe-clean-stage2-target-libstdc++-v3
+maybe-all-stage2-target-libstdc++-v3:
+maybe-clean-stage2-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stage2-target-libstdc++-v3: all-stage2-target-libstdc++-v3
+all-stage2: all-stage2-target-libstdc++-v3
+TARGET-stage2-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	  \
+	cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-target-libstdc++-v3)
+
+maybe-clean-stage2-target-libstdc++-v3: clean-stage2-target-libstdc++-v3
+clean-stage2: clean-stage2-target-libstdc++-v3
+clean-stage2-target-libstdc++-v3:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+	else \
+	  [ -f $(TARGET_SUBDIR)/stage2-libstdc++-v3/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+		  \
+		 clean
+@endif target-libstdc++-v3-bootstrap
+
+
+.PHONY: all-stage3-target-libstdc++-v3 maybe-all-stage3-target-libstdc++-v3
+.PHONY: clean-stage3-target-libstdc++-v3 maybe-clean-stage3-target-libstdc++-v3
+maybe-all-stage3-target-libstdc++-v3:
+maybe-clean-stage3-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stage3-target-libstdc++-v3: all-stage3-target-libstdc++-v3
+all-stage3: all-stage3-target-libstdc++-v3
+TARGET-stage3-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	  \
+	cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-target-libstdc++-v3)
+
+maybe-clean-stage3-target-libstdc++-v3: clean-stage3-target-libstdc++-v3
+clean-stage3: clean-stage3-target-libstdc++-v3
+clean-stage3-target-libstdc++-v3:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+	else \
+	  [ -f $(TARGET_SUBDIR)/stage3-libstdc++-v3/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+		  \
+		 clean
+@endif target-libstdc++-v3-bootstrap
+
+
+.PHONY: all-stage4-target-libstdc++-v3 maybe-all-stage4-target-libstdc++-v3
+.PHONY: clean-stage4-target-libstdc++-v3 maybe-clean-stage4-target-libstdc++-v3
+maybe-all-stage4-target-libstdc++-v3:
+maybe-clean-stage4-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stage4-target-libstdc++-v3: all-stage4-target-libstdc++-v3
+all-stage4: all-stage4-target-libstdc++-v3
+TARGET-stage4-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stage4-target-libstdc++-v3: configure-stage4-target-libstdc++-v3
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	  \
+	cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-target-libstdc++-v3)
+
+maybe-clean-stage4-target-libstdc++-v3: clean-stage4-target-libstdc++-v3
+clean-stage4: clean-stage4-target-libstdc++-v3
+clean-stage4-target-libstdc++-v3:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+	else \
+	  [ -f $(TARGET_SUBDIR)/stage4-libstdc++-v3/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+		  \
+		 clean
+@endif target-libstdc++-v3-bootstrap
+
+
+.PHONY: all-stageprofile-target-libstdc++-v3 maybe-all-stageprofile-target-libstdc++-v3
+.PHONY: clean-stageprofile-target-libstdc++-v3 maybe-clean-stageprofile-target-libstdc++-v3
+maybe-all-stageprofile-target-libstdc++-v3:
+maybe-clean-stageprofile-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stageprofile-target-libstdc++-v3: all-stageprofile-target-libstdc++-v3
+all-stageprofile: all-stageprofile-target-libstdc++-v3
+TARGET-stageprofile-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stageprofile-target-libstdc++-v3: configure-stageprofile-target-libstdc++-v3
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	  \
+	cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-target-libstdc++-v3)
+
+maybe-clean-stageprofile-target-libstdc++-v3: clean-stageprofile-target-libstdc++-v3
+clean-stageprofile: clean-stageprofile-target-libstdc++-v3
+clean-stageprofile-target-libstdc++-v3:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+	else \
+	  [ -f $(TARGET_SUBDIR)/stageprofile-libstdc++-v3/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+		  \
+		 clean
+@endif target-libstdc++-v3-bootstrap
+
+
+.PHONY: all-stagefeedback-target-libstdc++-v3 maybe-all-stagefeedback-target-libstdc++-v3
+.PHONY: clean-stagefeedback-target-libstdc++-v3 maybe-clean-stagefeedback-target-libstdc++-v3
+maybe-all-stagefeedback-target-libstdc++-v3:
+maybe-clean-stagefeedback-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stagefeedback-target-libstdc++-v3: all-stagefeedback-target-libstdc++-v3
+all-stagefeedback: all-stagefeedback-target-libstdc++-v3
+TARGET-stagefeedback-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stagefeedback-target-libstdc++-v3: configure-stagefeedback-target-libstdc++-v3
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	  \
+	cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-target-libstdc++-v3)
+
+maybe-clean-stagefeedback-target-libstdc++-v3: clean-stagefeedback-target-libstdc++-v3
+clean-stagefeedback: clean-stagefeedback-target-libstdc++-v3
+clean-stagefeedback-target-libstdc++-v3:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+	else \
+	  [ -f $(TARGET_SUBDIR)/stagefeedback-libstdc++-v3/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+		  \
+		 clean
+@endif target-libstdc++-v3-bootstrap
+
+
+
+
+
+
+.PHONY: check-target-libstdc++-v3 maybe-check-target-libstdc++-v3
+maybe-check-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-check-target-libstdc++-v3: check-target-libstdc++-v3
+
+check-target-libstdc++-v3:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
+
+@endif target-libstdc++-v3
+
+.PHONY: install-target-libstdc++-v3 maybe-install-target-libstdc++-v3
+maybe-install-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-install-target-libstdc++-v3: install-target-libstdc++-v3
+
+install-target-libstdc++-v3: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libstdc++-v3
+
+.PHONY: install-strip-target-libstdc++-v3 maybe-install-strip-target-libstdc++-v3
+maybe-install-strip-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-install-strip-target-libstdc++-v3: install-strip-target-libstdc++-v3
+
+install-strip-target-libstdc++-v3: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libstdc++-v3
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libstdc++-v3 info-target-libstdc++-v3
+maybe-info-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-info-target-libstdc++-v3: info-target-libstdc++-v3
+
+info-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing info in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           info) \
+	  || exit 1
+
+@endif target-libstdc++-v3
+
+.PHONY: maybe-dvi-target-libstdc++-v3 dvi-target-libstdc++-v3
+maybe-dvi-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-dvi-target-libstdc++-v3: dvi-target-libstdc++-v3
+
+dvi-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing dvi in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           dvi) \
+	  || exit 1
+
+@endif target-libstdc++-v3
+
+.PHONY: maybe-pdf-target-libstdc++-v3 pdf-target-libstdc++-v3
+maybe-pdf-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-pdf-target-libstdc++-v3: pdf-target-libstdc++-v3
+
+pdf-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing pdf in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           pdf) \
+	  || exit 1
+
+@endif target-libstdc++-v3
+
+.PHONY: maybe-html-target-libstdc++-v3 html-target-libstdc++-v3
+maybe-html-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-html-target-libstdc++-v3: html-target-libstdc++-v3
+
+html-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing html in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           html) \
+	  || exit 1
+
+@endif target-libstdc++-v3
+
+.PHONY: maybe-TAGS-target-libstdc++-v3 TAGS-target-libstdc++-v3
+maybe-TAGS-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-TAGS-target-libstdc++-v3: TAGS-target-libstdc++-v3
+
+TAGS-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           TAGS) \
+	  || exit 1
+
+@endif target-libstdc++-v3
+
+.PHONY: maybe-install-info-target-libstdc++-v3 install-info-target-libstdc++-v3
+maybe-install-info-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-install-info-target-libstdc++-v3: install-info-target-libstdc++-v3
+
+install-info-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 \
+    info-target-libstdc++-v3 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing install-info in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-info) \
+	  || exit 1
+
+@endif target-libstdc++-v3
+
+.PHONY: maybe-install-pdf-target-libstdc++-v3 install-pdf-target-libstdc++-v3
+maybe-install-pdf-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-install-pdf-target-libstdc++-v3: install-pdf-target-libstdc++-v3
+
+install-pdf-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 \
+    pdf-target-libstdc++-v3 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-pdf) \
+	  || exit 1
+
+@endif target-libstdc++-v3
+
+.PHONY: maybe-install-html-target-libstdc++-v3 install-html-target-libstdc++-v3
+maybe-install-html-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-install-html-target-libstdc++-v3: install-html-target-libstdc++-v3
+
+install-html-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 \
+    html-target-libstdc++-v3 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-html) \
+	  || exit 1
+
+@endif target-libstdc++-v3
+
+.PHONY: maybe-installcheck-target-libstdc++-v3 installcheck-target-libstdc++-v3
+maybe-installcheck-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-installcheck-target-libstdc++-v3: installcheck-target-libstdc++-v3
+
+installcheck-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           installcheck) \
+	  || exit 1
+
+@endif target-libstdc++-v3
+
+.PHONY: maybe-mostlyclean-target-libstdc++-v3 mostlyclean-target-libstdc++-v3
+maybe-mostlyclean-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-mostlyclean-target-libstdc++-v3: mostlyclean-target-libstdc++-v3
+
+mostlyclean-target-libstdc++-v3: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           mostlyclean) \
+	  || exit 1
+
+@endif target-libstdc++-v3
+
+.PHONY: maybe-clean-target-libstdc++-v3 clean-target-libstdc++-v3
+maybe-clean-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-clean-target-libstdc++-v3: clean-target-libstdc++-v3
+
+clean-target-libstdc++-v3: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           clean) \
+	  || exit 1
+
+@endif target-libstdc++-v3
+
+.PHONY: maybe-distclean-target-libstdc++-v3 distclean-target-libstdc++-v3
+maybe-distclean-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-distclean-target-libstdc++-v3: distclean-target-libstdc++-v3
+
+distclean-target-libstdc++-v3: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing distclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           distclean) \
+	  || exit 1
+
+@endif target-libstdc++-v3
+
+.PHONY: maybe-maintainer-clean-target-libstdc++-v3 maintainer-clean-target-libstdc++-v3
+maybe-maintainer-clean-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-maintainer-clean-target-libstdc++-v3: maintainer-clean-target-libstdc++-v3
+
+maintainer-clean-target-libstdc++-v3: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           maintainer-clean) \
+	  || exit 1
+
+@endif target-libstdc++-v3
+
+
+
+
+
+.PHONY: configure-target-libmudflap maybe-configure-target-libmudflap
+maybe-configure-target-libmudflap:
+@if gcc-bootstrap
+configure-target-libmudflap: stage_current
+@endif gcc-bootstrap
+@if target-libmudflap
+maybe-configure-target-libmudflap: configure-target-libmudflap
+configure-target-libmudflap: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libmudflap..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmudflap/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libmudflap/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libmudflap/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libmudflap/Makefile; \
+	    mv $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libmudflap/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	echo Configuring in $(TARGET_SUBDIR)/libmudflap; \
+	cd "$(TARGET_SUBDIR)/libmudflap" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libmudflap/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libmudflap"; \
+	libsrcdir="$$s/libmudflap"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif target-libmudflap
+
+
+
+
+
+.PHONY: all-target-libmudflap maybe-all-target-libmudflap
+maybe-all-target-libmudflap:
+@if gcc-bootstrap
+all-target-libmudflap: stage_current
+@endif gcc-bootstrap
+@if target-libmudflap
+TARGET-target-libmudflap=all
+maybe-all-target-libmudflap: all-target-libmudflap
+all-target-libmudflap: configure-target-libmudflap
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	(cd $(TARGET_SUBDIR)/libmudflap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+		$(TARGET-target-libmudflap))
+@endif target-libmudflap
+
+
+
+
+
+.PHONY: check-target-libmudflap maybe-check-target-libmudflap
+maybe-check-target-libmudflap:
+@if target-libmudflap
+maybe-check-target-libmudflap: check-target-libmudflap
+
+check-target-libmudflap:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libmudflap && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-libmudflap
+
+.PHONY: install-target-libmudflap maybe-install-target-libmudflap
+maybe-install-target-libmudflap:
+@if target-libmudflap
+maybe-install-target-libmudflap: install-target-libmudflap
+
+install-target-libmudflap: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libmudflap && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libmudflap
+
+.PHONY: install-strip-target-libmudflap maybe-install-strip-target-libmudflap
+maybe-install-strip-target-libmudflap:
+@if target-libmudflap
+maybe-install-strip-target-libmudflap: install-strip-target-libmudflap
+
+install-strip-target-libmudflap: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libmudflap && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libmudflap
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libmudflap info-target-libmudflap
+maybe-info-target-libmudflap:
+@if target-libmudflap
+maybe-info-target-libmudflap: info-target-libmudflap
+
+info-target-libmudflap: \
+    configure-target-libmudflap 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing info in $(TARGET_SUBDIR)/libmudflap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libmudflap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           info) \
+	  || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-dvi-target-libmudflap dvi-target-libmudflap
+maybe-dvi-target-libmudflap:
+@if target-libmudflap
+maybe-dvi-target-libmudflap: dvi-target-libmudflap
+
+dvi-target-libmudflap: \
+    configure-target-libmudflap 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing dvi in $(TARGET_SUBDIR)/libmudflap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libmudflap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           dvi) \
+	  || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-pdf-target-libmudflap pdf-target-libmudflap
+maybe-pdf-target-libmudflap:
+@if target-libmudflap
+maybe-pdf-target-libmudflap: pdf-target-libmudflap
+
+pdf-target-libmudflap: \
+    configure-target-libmudflap 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing pdf in $(TARGET_SUBDIR)/libmudflap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libmudflap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           pdf) \
+	  || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-html-target-libmudflap html-target-libmudflap
+maybe-html-target-libmudflap:
+@if target-libmudflap
+maybe-html-target-libmudflap: html-target-libmudflap
+
+html-target-libmudflap: \
+    configure-target-libmudflap 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing html in $(TARGET_SUBDIR)/libmudflap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libmudflap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           html) \
+	  || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-TAGS-target-libmudflap TAGS-target-libmudflap
+maybe-TAGS-target-libmudflap:
+@if target-libmudflap
+maybe-TAGS-target-libmudflap: TAGS-target-libmudflap
+
+TAGS-target-libmudflap: \
+    configure-target-libmudflap 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/libmudflap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libmudflap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           TAGS) \
+	  || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-install-info-target-libmudflap install-info-target-libmudflap
+maybe-install-info-target-libmudflap:
+@if target-libmudflap
+maybe-install-info-target-libmudflap: install-info-target-libmudflap
+
+install-info-target-libmudflap: \
+    configure-target-libmudflap \
+    info-target-libmudflap 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-info in $(TARGET_SUBDIR)/libmudflap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libmudflap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-info) \
+	  || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-install-pdf-target-libmudflap install-pdf-target-libmudflap
+maybe-install-pdf-target-libmudflap:
+@if target-libmudflap
+maybe-install-pdf-target-libmudflap: install-pdf-target-libmudflap
+
+install-pdf-target-libmudflap: \
+    configure-target-libmudflap \
+    pdf-target-libmudflap 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libmudflap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libmudflap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-pdf) \
+	  || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-install-html-target-libmudflap install-html-target-libmudflap
+maybe-install-html-target-libmudflap:
+@if target-libmudflap
+maybe-install-html-target-libmudflap: install-html-target-libmudflap
+
+install-html-target-libmudflap: \
+    configure-target-libmudflap \
+    html-target-libmudflap 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libmudflap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libmudflap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-html) \
+	  || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-installcheck-target-libmudflap installcheck-target-libmudflap
+maybe-installcheck-target-libmudflap:
+@if target-libmudflap
+maybe-installcheck-target-libmudflap: installcheck-target-libmudflap
+
+installcheck-target-libmudflap: \
+    configure-target-libmudflap 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/libmudflap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libmudflap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           installcheck) \
+	  || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-mostlyclean-target-libmudflap mostlyclean-target-libmudflap
+maybe-mostlyclean-target-libmudflap:
+@if target-libmudflap
+maybe-mostlyclean-target-libmudflap: mostlyclean-target-libmudflap
+
+mostlyclean-target-libmudflap: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libmudflap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libmudflap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           mostlyclean) \
+	  || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-clean-target-libmudflap clean-target-libmudflap
+maybe-clean-target-libmudflap:
+@if target-libmudflap
+maybe-clean-target-libmudflap: clean-target-libmudflap
+
+clean-target-libmudflap: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing clean in $(TARGET_SUBDIR)/libmudflap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libmudflap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           clean) \
+	  || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-distclean-target-libmudflap distclean-target-libmudflap
+maybe-distclean-target-libmudflap:
+@if target-libmudflap
+maybe-distclean-target-libmudflap: distclean-target-libmudflap
+
+distclean-target-libmudflap: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing distclean in $(TARGET_SUBDIR)/libmudflap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libmudflap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           distclean) \
+	  || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-maintainer-clean-target-libmudflap maintainer-clean-target-libmudflap
+maybe-maintainer-clean-target-libmudflap:
+@if target-libmudflap
+maybe-maintainer-clean-target-libmudflap: maintainer-clean-target-libmudflap
+
+maintainer-clean-target-libmudflap: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libmudflap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libmudflap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           maintainer-clean) \
+	  || exit 1
+
+@endif target-libmudflap
+
+
+
+
+
+.PHONY: configure-target-libssp maybe-configure-target-libssp
+maybe-configure-target-libssp:
+@if gcc-bootstrap
+configure-target-libssp: stage_current
+@endif gcc-bootstrap
+@if target-libssp
+maybe-configure-target-libssp: configure-target-libssp
+configure-target-libssp: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libssp..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libssp/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libssp/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libssp/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libssp/Makefile; \
+	    mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libssp/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	echo Configuring in $(TARGET_SUBDIR)/libssp; \
+	cd "$(TARGET_SUBDIR)/libssp" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libssp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libssp"; \
+	libsrcdir="$$s/libssp"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif target-libssp
+
+
+
+
+
+.PHONY: all-target-libssp maybe-all-target-libssp
+maybe-all-target-libssp:
+@if gcc-bootstrap
+all-target-libssp: stage_current
+@endif gcc-bootstrap
+@if target-libssp
+TARGET-target-libssp=all
+maybe-all-target-libssp: all-target-libssp
+all-target-libssp: configure-target-libssp
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	(cd $(TARGET_SUBDIR)/libssp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+		$(TARGET-target-libssp))
+@endif target-libssp
+
+
+
+
+
+.PHONY: check-target-libssp maybe-check-target-libssp
+maybe-check-target-libssp:
+@if target-libssp
+maybe-check-target-libssp: check-target-libssp
+
+check-target-libssp:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libssp && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-libssp
+
+.PHONY: install-target-libssp maybe-install-target-libssp
+maybe-install-target-libssp:
+@if target-libssp
+maybe-install-target-libssp: install-target-libssp
+
+install-target-libssp: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libssp && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libssp
+
+.PHONY: install-strip-target-libssp maybe-install-strip-target-libssp
+maybe-install-strip-target-libssp:
+@if target-libssp
+maybe-install-strip-target-libssp: install-strip-target-libssp
+
+install-strip-target-libssp: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libssp && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libssp
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libssp info-target-libssp
+maybe-info-target-libssp:
+@if target-libssp
+maybe-info-target-libssp: info-target-libssp
+
+info-target-libssp: \
+    configure-target-libssp 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing info in $(TARGET_SUBDIR)/libssp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libssp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           info) \
+	  || exit 1
+
+@endif target-libssp
+
+.PHONY: maybe-dvi-target-libssp dvi-target-libssp
+maybe-dvi-target-libssp:
+@if target-libssp
+maybe-dvi-target-libssp: dvi-target-libssp
+
+dvi-target-libssp: \
+    configure-target-libssp 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing dvi in $(TARGET_SUBDIR)/libssp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libssp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           dvi) \
+	  || exit 1
+
+@endif target-libssp
+
+.PHONY: maybe-pdf-target-libssp pdf-target-libssp
+maybe-pdf-target-libssp:
+@if target-libssp
+maybe-pdf-target-libssp: pdf-target-libssp
+
+pdf-target-libssp: \
+    configure-target-libssp 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing pdf in $(TARGET_SUBDIR)/libssp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libssp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           pdf) \
+	  || exit 1
+
+@endif target-libssp
+
+.PHONY: maybe-html-target-libssp html-target-libssp
+maybe-html-target-libssp:
+@if target-libssp
+maybe-html-target-libssp: html-target-libssp
+
+html-target-libssp: \
+    configure-target-libssp 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing html in $(TARGET_SUBDIR)/libssp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libssp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           html) \
+	  || exit 1
+
+@endif target-libssp
+
+.PHONY: maybe-TAGS-target-libssp TAGS-target-libssp
+maybe-TAGS-target-libssp:
+@if target-libssp
+maybe-TAGS-target-libssp: TAGS-target-libssp
+
+TAGS-target-libssp: \
+    configure-target-libssp 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/libssp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libssp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           TAGS) \
+	  || exit 1
+
+@endif target-libssp
+
+.PHONY: maybe-install-info-target-libssp install-info-target-libssp
+maybe-install-info-target-libssp:
+@if target-libssp
+maybe-install-info-target-libssp: install-info-target-libssp
+
+install-info-target-libssp: \
+    configure-target-libssp \
+    info-target-libssp 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-info in $(TARGET_SUBDIR)/libssp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libssp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-info) \
+	  || exit 1
+
+@endif target-libssp
+
+.PHONY: maybe-install-pdf-target-libssp install-pdf-target-libssp
+maybe-install-pdf-target-libssp:
+@if target-libssp
+maybe-install-pdf-target-libssp: install-pdf-target-libssp
+
+install-pdf-target-libssp: \
+    configure-target-libssp \
+    pdf-target-libssp 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libssp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libssp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-pdf) \
+	  || exit 1
+
+@endif target-libssp
+
+.PHONY: maybe-install-html-target-libssp install-html-target-libssp
+maybe-install-html-target-libssp:
+@if target-libssp
+maybe-install-html-target-libssp: install-html-target-libssp
+
+install-html-target-libssp: \
+    configure-target-libssp \
+    html-target-libssp 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libssp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libssp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-html) \
+	  || exit 1
+
+@endif target-libssp
+
+.PHONY: maybe-installcheck-target-libssp installcheck-target-libssp
+maybe-installcheck-target-libssp:
+@if target-libssp
+maybe-installcheck-target-libssp: installcheck-target-libssp
+
+installcheck-target-libssp: \
+    configure-target-libssp 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/libssp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libssp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           installcheck) \
+	  || exit 1
+
+@endif target-libssp
+
+.PHONY: maybe-mostlyclean-target-libssp mostlyclean-target-libssp
+maybe-mostlyclean-target-libssp:
+@if target-libssp
+maybe-mostlyclean-target-libssp: mostlyclean-target-libssp
+
+mostlyclean-target-libssp: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libssp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libssp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           mostlyclean) \
+	  || exit 1
+
+@endif target-libssp
+
+.PHONY: maybe-clean-target-libssp clean-target-libssp
+maybe-clean-target-libssp:
+@if target-libssp
+maybe-clean-target-libssp: clean-target-libssp
+
+clean-target-libssp: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing clean in $(TARGET_SUBDIR)/libssp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libssp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           clean) \
+	  || exit 1
+
+@endif target-libssp
+
+.PHONY: maybe-distclean-target-libssp distclean-target-libssp
+maybe-distclean-target-libssp:
+@if target-libssp
+maybe-distclean-target-libssp: distclean-target-libssp
+
+distclean-target-libssp: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing distclean in $(TARGET_SUBDIR)/libssp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libssp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           distclean) \
+	  || exit 1
+
+@endif target-libssp
+
+.PHONY: maybe-maintainer-clean-target-libssp maintainer-clean-target-libssp
+maybe-maintainer-clean-target-libssp:
+@if target-libssp
+maybe-maintainer-clean-target-libssp: maintainer-clean-target-libssp
+
+maintainer-clean-target-libssp: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libssp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libssp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           maintainer-clean) \
+	  || exit 1
+
+@endif target-libssp
+
+
+
+
+
+.PHONY: configure-target-newlib maybe-configure-target-newlib
+maybe-configure-target-newlib:
+@if gcc-bootstrap
+configure-target-newlib: stage_current
+@endif gcc-bootstrap
+@if target-newlib
+maybe-configure-target-newlib: configure-target-newlib
+configure-target-newlib: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for newlib..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/newlib/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/newlib/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/newlib/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/newlib/Makefile; \
+	    mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	echo Configuring in $(TARGET_SUBDIR)/newlib; \
+	cd "$(TARGET_SUBDIR)/newlib" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/newlib/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/newlib"; \
+	libsrcdir="$$s/newlib"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif target-newlib
+
+
+
+
+
+.PHONY: all-target-newlib maybe-all-target-newlib
+maybe-all-target-newlib:
+@if gcc-bootstrap
+all-target-newlib: stage_current
+@endif gcc-bootstrap
+@if target-newlib
+TARGET-target-newlib=all
+maybe-all-target-newlib: all-target-newlib
+all-target-newlib: configure-target-newlib
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	(cd $(TARGET_SUBDIR)/newlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+		$(TARGET-target-newlib))
+@endif target-newlib
+
+
+
+
+
+.PHONY: check-target-newlib maybe-check-target-newlib
+maybe-check-target-newlib:
+@if target-newlib
+maybe-check-target-newlib: check-target-newlib
+
+check-target-newlib:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/newlib && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-newlib
+
+.PHONY: install-target-newlib maybe-install-target-newlib
+maybe-install-target-newlib:
+@if target-newlib
+maybe-install-target-newlib: install-target-newlib
+
+install-target-newlib: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/newlib && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-newlib
+
+.PHONY: install-strip-target-newlib maybe-install-strip-target-newlib
+maybe-install-strip-target-newlib:
+@if target-newlib
+maybe-install-strip-target-newlib: install-strip-target-newlib
+
+install-strip-target-newlib: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/newlib && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-newlib
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-newlib info-target-newlib
+maybe-info-target-newlib:
+@if target-newlib
+maybe-info-target-newlib: info-target-newlib
+
+info-target-newlib: \
+    configure-target-newlib 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing info in $(TARGET_SUBDIR)/newlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/newlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           info) \
+	  || exit 1
+
+@endif target-newlib
+
+.PHONY: maybe-dvi-target-newlib dvi-target-newlib
+maybe-dvi-target-newlib:
+@if target-newlib
+maybe-dvi-target-newlib: dvi-target-newlib
+
+dvi-target-newlib: \
+    configure-target-newlib 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing dvi in $(TARGET_SUBDIR)/newlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/newlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           dvi) \
+	  || exit 1
+
+@endif target-newlib
+
+.PHONY: maybe-pdf-target-newlib pdf-target-newlib
+maybe-pdf-target-newlib:
+@if target-newlib
+maybe-pdf-target-newlib: pdf-target-newlib
+
+pdf-target-newlib: \
+    configure-target-newlib 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing pdf in $(TARGET_SUBDIR)/newlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/newlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           pdf) \
+	  || exit 1
+
+@endif target-newlib
+
+.PHONY: maybe-html-target-newlib html-target-newlib
+maybe-html-target-newlib:
+@if target-newlib
+maybe-html-target-newlib: html-target-newlib
+
+html-target-newlib: \
+    configure-target-newlib 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing html in $(TARGET_SUBDIR)/newlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/newlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           html) \
+	  || exit 1
+
+@endif target-newlib
+
+.PHONY: maybe-TAGS-target-newlib TAGS-target-newlib
+maybe-TAGS-target-newlib:
+@if target-newlib
+maybe-TAGS-target-newlib: TAGS-target-newlib
+
+TAGS-target-newlib: \
+    configure-target-newlib 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/newlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/newlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           TAGS) \
+	  || exit 1
+
+@endif target-newlib
+
+.PHONY: maybe-install-info-target-newlib install-info-target-newlib
+maybe-install-info-target-newlib:
+@if target-newlib
+maybe-install-info-target-newlib: install-info-target-newlib
+
+install-info-target-newlib: \
+    configure-target-newlib \
+    info-target-newlib 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-info in $(TARGET_SUBDIR)/newlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/newlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-info) \
+	  || exit 1
+
+@endif target-newlib
+
+.PHONY: maybe-install-pdf-target-newlib install-pdf-target-newlib
+maybe-install-pdf-target-newlib:
+@if target-newlib
+maybe-install-pdf-target-newlib: install-pdf-target-newlib
+
+install-pdf-target-newlib: \
+    configure-target-newlib \
+    pdf-target-newlib 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/newlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/newlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-pdf) \
+	  || exit 1
+
+@endif target-newlib
+
+.PHONY: maybe-install-html-target-newlib install-html-target-newlib
+maybe-install-html-target-newlib:
+@if target-newlib
+maybe-install-html-target-newlib: install-html-target-newlib
+
+install-html-target-newlib: \
+    configure-target-newlib \
+    html-target-newlib 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/newlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/newlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-html) \
+	  || exit 1
+
+@endif target-newlib
+
+.PHONY: maybe-installcheck-target-newlib installcheck-target-newlib
+maybe-installcheck-target-newlib:
+@if target-newlib
+maybe-installcheck-target-newlib: installcheck-target-newlib
+
+installcheck-target-newlib: \
+    configure-target-newlib 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/newlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/newlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           installcheck) \
+	  || exit 1
+
+@endif target-newlib
+
+.PHONY: maybe-mostlyclean-target-newlib mostlyclean-target-newlib
+maybe-mostlyclean-target-newlib:
+@if target-newlib
+maybe-mostlyclean-target-newlib: mostlyclean-target-newlib
+
+mostlyclean-target-newlib: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/newlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/newlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           mostlyclean) \
+	  || exit 1
+
+@endif target-newlib
+
+.PHONY: maybe-clean-target-newlib clean-target-newlib
+maybe-clean-target-newlib:
+@if target-newlib
+maybe-clean-target-newlib: clean-target-newlib
+
+clean-target-newlib: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing clean in $(TARGET_SUBDIR)/newlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/newlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           clean) \
+	  || exit 1
+
+@endif target-newlib
+
+.PHONY: maybe-distclean-target-newlib distclean-target-newlib
+maybe-distclean-target-newlib:
+@if target-newlib
+maybe-distclean-target-newlib: distclean-target-newlib
+
+distclean-target-newlib: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing distclean in $(TARGET_SUBDIR)/newlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/newlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           distclean) \
+	  || exit 1
+
+@endif target-newlib
+
+.PHONY: maybe-maintainer-clean-target-newlib maintainer-clean-target-newlib
+maybe-maintainer-clean-target-newlib:
+@if target-newlib
+maybe-maintainer-clean-target-newlib: maintainer-clean-target-newlib
+
+maintainer-clean-target-newlib: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/newlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/newlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           maintainer-clean) \
+	  || exit 1
+
+@endif target-newlib
+
+
+
+
+
+.PHONY: configure-target-libgcc maybe-configure-target-libgcc
+maybe-configure-target-libgcc:
+@if gcc-bootstrap
+configure-target-libgcc: stage_current
+@endif gcc-bootstrap
+@if target-libgcc
+maybe-configure-target-libgcc: configure-target-libgcc
+configure-target-libgcc: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libgcc..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+	    mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	echo Configuring in $(TARGET_SUBDIR)/libgcc; \
+	cd "$(TARGET_SUBDIR)/libgcc" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libgcc"; \
+	libsrcdir="$$s/libgcc"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif target-libgcc
+
+
+
+.PHONY: configure-stage1-target-libgcc maybe-configure-stage1-target-libgcc
+maybe-configure-stage1-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-configure-stage1-target-libgcc: configure-stage1-target-libgcc
+configure-stage1-target-libgcc:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	echo "Checking multilib configuration for libgcc..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+	    mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
+	$(NORMAL_TARGET_EXPORTS) \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(TARGET_SUBDIR)/libgcc ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libgcc"; \
+	libsrcdir="$$s/libgcc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS)
+@endif target-libgcc-bootstrap
+
+.PHONY: configure-stage2-target-libgcc maybe-configure-stage2-target-libgcc
+maybe-configure-stage2-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-configure-stage2-target-libgcc: configure-stage2-target-libgcc
+configure-stage2-target-libgcc:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	echo "Checking multilib configuration for libgcc..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+	    mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
+	$(NORMAL_TARGET_EXPORTS) \
+	 \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(TARGET_SUBDIR)/libgcc ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libgcc"; \
+	libsrcdir="$$s/libgcc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS)
+@endif target-libgcc-bootstrap
+
+.PHONY: configure-stage3-target-libgcc maybe-configure-stage3-target-libgcc
+maybe-configure-stage3-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-configure-stage3-target-libgcc: configure-stage3-target-libgcc
+configure-stage3-target-libgcc:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	echo "Checking multilib configuration for libgcc..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+	    mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
+	$(NORMAL_TARGET_EXPORTS) \
+	 \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(TARGET_SUBDIR)/libgcc ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libgcc"; \
+	libsrcdir="$$s/libgcc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS)
+@endif target-libgcc-bootstrap
+
+.PHONY: configure-stage4-target-libgcc maybe-configure-stage4-target-libgcc
+maybe-configure-stage4-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-configure-stage4-target-libgcc: configure-stage4-target-libgcc
+configure-stage4-target-libgcc:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	echo "Checking multilib configuration for libgcc..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+	    mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
+	$(NORMAL_TARGET_EXPORTS) \
+	 \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(TARGET_SUBDIR)/libgcc ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libgcc"; \
+	libsrcdir="$$s/libgcc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS)
+@endif target-libgcc-bootstrap
+
+.PHONY: configure-stageprofile-target-libgcc maybe-configure-stageprofile-target-libgcc
+maybe-configure-stageprofile-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-configure-stageprofile-target-libgcc: configure-stageprofile-target-libgcc
+configure-stageprofile-target-libgcc:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	echo "Checking multilib configuration for libgcc..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+	    mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
+	$(NORMAL_TARGET_EXPORTS) \
+	 \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(TARGET_SUBDIR)/libgcc ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libgcc"; \
+	libsrcdir="$$s/libgcc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS)
+@endif target-libgcc-bootstrap
+
+.PHONY: configure-stagefeedback-target-libgcc maybe-configure-stagefeedback-target-libgcc
+maybe-configure-stagefeedback-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-configure-stagefeedback-target-libgcc: configure-stagefeedback-target-libgcc
+configure-stagefeedback-target-libgcc:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	echo "Checking multilib configuration for libgcc..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+	    mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
+	$(NORMAL_TARGET_EXPORTS) \
+	 \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(TARGET_SUBDIR)/libgcc ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libgcc"; \
+	libsrcdir="$$s/libgcc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif target-libgcc-bootstrap
+
+
+
+
+
+.PHONY: all-target-libgcc maybe-all-target-libgcc
+maybe-all-target-libgcc:
+@if gcc-bootstrap
+all-target-libgcc: stage_current
+@endif gcc-bootstrap
+@if target-libgcc
+TARGET-target-libgcc=all
+maybe-all-target-libgcc: all-target-libgcc
+all-target-libgcc: configure-target-libgcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	(cd $(TARGET_SUBDIR)/libgcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+		$(TARGET-target-libgcc))
+@endif target-libgcc
+
+
+
+.PHONY: all-stage1-target-libgcc maybe-all-stage1-target-libgcc
+.PHONY: clean-stage1-target-libgcc maybe-clean-stage1-target-libgcc
+maybe-all-stage1-target-libgcc:
+maybe-clean-stage1-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-all-stage1-target-libgcc: all-stage1-target-libgcc
+all-stage1: all-stage1-target-libgcc
+TARGET-stage1-target-libgcc = $(TARGET-target-libgcc)
+all-stage1-target-libgcc: configure-stage1-target-libgcc
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	cd $(TARGET_SUBDIR)/libgcc && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-target-libgcc)
+
+maybe-clean-stage1-target-libgcc: clean-stage1-target-libgcc
+clean-stage1: clean-stage1-target-libgcc
+clean-stage1-target-libgcc:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
+	else \
+	  [ -f $(TARGET_SUBDIR)/stage1-libgcc/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(TARGET_SUBDIR)/libgcc && \
+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
+		 clean
+@endif target-libgcc-bootstrap
+
+
+.PHONY: all-stage2-target-libgcc maybe-all-stage2-target-libgcc
+.PHONY: clean-stage2-target-libgcc maybe-clean-stage2-target-libgcc
+maybe-all-stage2-target-libgcc:
+maybe-clean-stage2-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-all-stage2-target-libgcc: all-stage2-target-libgcc
+all-stage2: all-stage2-target-libgcc
+TARGET-stage2-target-libgcc = $(TARGET-target-libgcc)
+all-stage2-target-libgcc: configure-stage2-target-libgcc
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(NORMAL_TARGET_EXPORTS) \
+	  \
+	cd $(TARGET_SUBDIR)/libgcc && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS)   \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-target-libgcc)
+
+maybe-clean-stage2-target-libgcc: clean-stage2-target-libgcc
+clean-stage2: clean-stage2-target-libgcc
+clean-stage2-target-libgcc:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
+	else \
+	  [ -f $(TARGET_SUBDIR)/stage2-libgcc/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(TARGET_SUBDIR)/libgcc && \
+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
+		  \
+		 clean
+@endif target-libgcc-bootstrap
+
+
+.PHONY: all-stage3-target-libgcc maybe-all-stage3-target-libgcc
+.PHONY: clean-stage3-target-libgcc maybe-clean-stage3-target-libgcc
+maybe-all-stage3-target-libgcc:
+maybe-clean-stage3-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-all-stage3-target-libgcc: all-stage3-target-libgcc
+all-stage3: all-stage3-target-libgcc
+TARGET-stage3-target-libgcc = $(TARGET-target-libgcc)
+all-stage3-target-libgcc: configure-stage3-target-libgcc
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(NORMAL_TARGET_EXPORTS) \
+	  \
+	cd $(TARGET_SUBDIR)/libgcc && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS)   \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-target-libgcc)
+
+maybe-clean-stage3-target-libgcc: clean-stage3-target-libgcc
+clean-stage3: clean-stage3-target-libgcc
+clean-stage3-target-libgcc:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
+	else \
+	  [ -f $(TARGET_SUBDIR)/stage3-libgcc/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(TARGET_SUBDIR)/libgcc && \
+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
+		  \
+		 clean
+@endif target-libgcc-bootstrap
+
+
+.PHONY: all-stage4-target-libgcc maybe-all-stage4-target-libgcc
+.PHONY: clean-stage4-target-libgcc maybe-clean-stage4-target-libgcc
+maybe-all-stage4-target-libgcc:
+maybe-clean-stage4-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-all-stage4-target-libgcc: all-stage4-target-libgcc
+all-stage4: all-stage4-target-libgcc
+TARGET-stage4-target-libgcc = $(TARGET-target-libgcc)
+all-stage4-target-libgcc: configure-stage4-target-libgcc
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(NORMAL_TARGET_EXPORTS) \
+	  \
+	cd $(TARGET_SUBDIR)/libgcc && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS)   \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-target-libgcc)
+
+maybe-clean-stage4-target-libgcc: clean-stage4-target-libgcc
+clean-stage4: clean-stage4-target-libgcc
+clean-stage4-target-libgcc:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
+	else \
+	  [ -f $(TARGET_SUBDIR)/stage4-libgcc/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(TARGET_SUBDIR)/libgcc && \
+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
+		  \
+		 clean
+@endif target-libgcc-bootstrap
+
+
+.PHONY: all-stageprofile-target-libgcc maybe-all-stageprofile-target-libgcc
+.PHONY: clean-stageprofile-target-libgcc maybe-clean-stageprofile-target-libgcc
+maybe-all-stageprofile-target-libgcc:
+maybe-clean-stageprofile-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-all-stageprofile-target-libgcc: all-stageprofile-target-libgcc
+all-stageprofile: all-stageprofile-target-libgcc
+TARGET-stageprofile-target-libgcc = $(TARGET-target-libgcc)
+all-stageprofile-target-libgcc: configure-stageprofile-target-libgcc
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(NORMAL_TARGET_EXPORTS) \
+	  \
+	cd $(TARGET_SUBDIR)/libgcc && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS)   \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-target-libgcc)
+
+maybe-clean-stageprofile-target-libgcc: clean-stageprofile-target-libgcc
+clean-stageprofile: clean-stageprofile-target-libgcc
+clean-stageprofile-target-libgcc:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
+	else \
+	  [ -f $(TARGET_SUBDIR)/stageprofile-libgcc/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(TARGET_SUBDIR)/libgcc && \
+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
+		  \
+		 clean
+@endif target-libgcc-bootstrap
+
+
+.PHONY: all-stagefeedback-target-libgcc maybe-all-stagefeedback-target-libgcc
+.PHONY: clean-stagefeedback-target-libgcc maybe-clean-stagefeedback-target-libgcc
+maybe-all-stagefeedback-target-libgcc:
+maybe-clean-stagefeedback-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-all-stagefeedback-target-libgcc: all-stagefeedback-target-libgcc
+all-stagefeedback: all-stagefeedback-target-libgcc
+TARGET-stagefeedback-target-libgcc = $(TARGET-target-libgcc)
+all-stagefeedback-target-libgcc: configure-stagefeedback-target-libgcc
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(NORMAL_TARGET_EXPORTS) \
+	  \
+	cd $(TARGET_SUBDIR)/libgcc && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS)   \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-target-libgcc)
+
+maybe-clean-stagefeedback-target-libgcc: clean-stagefeedback-target-libgcc
+clean-stagefeedback: clean-stagefeedback-target-libgcc
+clean-stagefeedback-target-libgcc:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
+	else \
+	  [ -f $(TARGET_SUBDIR)/stagefeedback-libgcc/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(TARGET_SUBDIR)/libgcc && \
+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
+		  \
+		 clean
+@endif target-libgcc-bootstrap
+
+
+
+
+
+
+.PHONY: check-target-libgcc maybe-check-target-libgcc
+maybe-check-target-libgcc:
+@if target-libgcc
+maybe-check-target-libgcc: check-target-libgcc
+
+# Dummy target for uncheckable module.
+check-target-libgcc:
+
+@endif target-libgcc
+
+.PHONY: install-target-libgcc maybe-install-target-libgcc
+maybe-install-target-libgcc:
+@if target-libgcc
+maybe-install-target-libgcc: install-target-libgcc
+
+install-target-libgcc: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libgcc && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libgcc
+
+.PHONY: install-strip-target-libgcc maybe-install-strip-target-libgcc
+maybe-install-strip-target-libgcc:
+@if target-libgcc
+maybe-install-strip-target-libgcc: install-strip-target-libgcc
+
+install-strip-target-libgcc: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libgcc && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libgcc
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libgcc info-target-libgcc
+maybe-info-target-libgcc:
+@if target-libgcc
+maybe-info-target-libgcc: info-target-libgcc
+
+info-target-libgcc: \
+    configure-target-libgcc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing info in $(TARGET_SUBDIR)/libgcc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           info) \
+	  || exit 1
+
+@endif target-libgcc
+
+.PHONY: maybe-dvi-target-libgcc dvi-target-libgcc
+maybe-dvi-target-libgcc:
+@if target-libgcc
+maybe-dvi-target-libgcc: dvi-target-libgcc
+
+dvi-target-libgcc: \
+    configure-target-libgcc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing dvi in $(TARGET_SUBDIR)/libgcc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           dvi) \
+	  || exit 1
+
+@endif target-libgcc
+
+.PHONY: maybe-pdf-target-libgcc pdf-target-libgcc
+maybe-pdf-target-libgcc:
+@if target-libgcc
+maybe-pdf-target-libgcc: pdf-target-libgcc
+
+pdf-target-libgcc: \
+    configure-target-libgcc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing pdf in $(TARGET_SUBDIR)/libgcc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           pdf) \
+	  || exit 1
+
+@endif target-libgcc
+
+.PHONY: maybe-html-target-libgcc html-target-libgcc
+maybe-html-target-libgcc:
+@if target-libgcc
+maybe-html-target-libgcc: html-target-libgcc
+
+html-target-libgcc: \
+    configure-target-libgcc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing html in $(TARGET_SUBDIR)/libgcc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           html) \
+	  || exit 1
+
+@endif target-libgcc
+
+.PHONY: maybe-TAGS-target-libgcc TAGS-target-libgcc
+maybe-TAGS-target-libgcc:
+@if target-libgcc
+maybe-TAGS-target-libgcc: TAGS-target-libgcc
+
+TAGS-target-libgcc: \
+    configure-target-libgcc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/libgcc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           TAGS) \
+	  || exit 1
+
+@endif target-libgcc
+
+.PHONY: maybe-install-info-target-libgcc install-info-target-libgcc
+maybe-install-info-target-libgcc:
+@if target-libgcc
+maybe-install-info-target-libgcc: install-info-target-libgcc
+
+install-info-target-libgcc: \
+    configure-target-libgcc \
+    info-target-libgcc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-info in $(TARGET_SUBDIR)/libgcc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-info) \
+	  || exit 1
+
+@endif target-libgcc
+
+.PHONY: maybe-install-pdf-target-libgcc install-pdf-target-libgcc
+maybe-install-pdf-target-libgcc:
+@if target-libgcc
+maybe-install-pdf-target-libgcc: install-pdf-target-libgcc
+
+install-pdf-target-libgcc: \
+    configure-target-libgcc \
+    pdf-target-libgcc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libgcc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-pdf) \
+	  || exit 1
+
+@endif target-libgcc
+
+.PHONY: maybe-install-html-target-libgcc install-html-target-libgcc
+maybe-install-html-target-libgcc:
+@if target-libgcc
+maybe-install-html-target-libgcc: install-html-target-libgcc
+
+install-html-target-libgcc: \
+    configure-target-libgcc \
+    html-target-libgcc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libgcc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-html) \
+	  || exit 1
+
+@endif target-libgcc
+
+.PHONY: maybe-installcheck-target-libgcc installcheck-target-libgcc
+maybe-installcheck-target-libgcc:
+@if target-libgcc
+maybe-installcheck-target-libgcc: installcheck-target-libgcc
+
+installcheck-target-libgcc: \
+    configure-target-libgcc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/libgcc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           installcheck) \
+	  || exit 1
+
+@endif target-libgcc
+
+.PHONY: maybe-mostlyclean-target-libgcc mostlyclean-target-libgcc
+maybe-mostlyclean-target-libgcc:
+@if target-libgcc
+maybe-mostlyclean-target-libgcc: mostlyclean-target-libgcc
+
+mostlyclean-target-libgcc: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgcc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           mostlyclean) \
+	  || exit 1
+
+@endif target-libgcc
+
+.PHONY: maybe-clean-target-libgcc clean-target-libgcc
+maybe-clean-target-libgcc:
+@if target-libgcc
+maybe-clean-target-libgcc: clean-target-libgcc
+
+clean-target-libgcc: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing clean in $(TARGET_SUBDIR)/libgcc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           clean) \
+	  || exit 1
+
+@endif target-libgcc
+
+.PHONY: maybe-distclean-target-libgcc distclean-target-libgcc
+maybe-distclean-target-libgcc:
+@if target-libgcc
+maybe-distclean-target-libgcc: distclean-target-libgcc
+
+distclean-target-libgcc: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing distclean in $(TARGET_SUBDIR)/libgcc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           distclean) \
+	  || exit 1
+
+@endif target-libgcc
+
+.PHONY: maybe-maintainer-clean-target-libgcc maintainer-clean-target-libgcc
+maybe-maintainer-clean-target-libgcc:
+@if target-libgcc
+maybe-maintainer-clean-target-libgcc: maintainer-clean-target-libgcc
+
+maintainer-clean-target-libgcc: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgcc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           maintainer-clean) \
+	  || exit 1
+
+@endif target-libgcc
+
+
+
+
+
+.PHONY: configure-target-libquadmath maybe-configure-target-libquadmath
+maybe-configure-target-libquadmath:
+@if gcc-bootstrap
+configure-target-libquadmath: stage_current
+@endif gcc-bootstrap
+@if target-libquadmath
+maybe-configure-target-libquadmath: configure-target-libquadmath
+configure-target-libquadmath: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libquadmath..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libquadmath ; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libquadmath/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libquadmath/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libquadmath/multilib.tmp $(TARGET_SUBDIR)/libquadmath/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libquadmath/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libquadmath/Makefile; \
+	    mv $(TARGET_SUBDIR)/libquadmath/multilib.tmp $(TARGET_SUBDIR)/libquadmath/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libquadmath/multilib.tmp $(TARGET_SUBDIR)/libquadmath/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libquadmath/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libquadmath ; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	echo Configuring in $(TARGET_SUBDIR)/libquadmath; \
+	cd "$(TARGET_SUBDIR)/libquadmath" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libquadmath/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libquadmath"; \
+	libsrcdir="$$s/libquadmath"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif target-libquadmath
+
+
+
+
+
+.PHONY: all-target-libquadmath maybe-all-target-libquadmath
+maybe-all-target-libquadmath:
+@if gcc-bootstrap
+all-target-libquadmath: stage_current
+@endif gcc-bootstrap
+@if target-libquadmath
+TARGET-target-libquadmath=all
+maybe-all-target-libquadmath: all-target-libquadmath
+all-target-libquadmath: configure-target-libquadmath
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	(cd $(TARGET_SUBDIR)/libquadmath && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+		$(TARGET-target-libquadmath))
+@endif target-libquadmath
+
+
+
+
+
+.PHONY: check-target-libquadmath maybe-check-target-libquadmath
+maybe-check-target-libquadmath:
+@if target-libquadmath
+maybe-check-target-libquadmath: check-target-libquadmath
+
+check-target-libquadmath:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libquadmath && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-libquadmath
+
+.PHONY: install-target-libquadmath maybe-install-target-libquadmath
+maybe-install-target-libquadmath:
+@if target-libquadmath
+maybe-install-target-libquadmath: install-target-libquadmath
+
+install-target-libquadmath: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libquadmath && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libquadmath
+
+.PHONY: install-strip-target-libquadmath maybe-install-strip-target-libquadmath
+maybe-install-strip-target-libquadmath:
+@if target-libquadmath
+maybe-install-strip-target-libquadmath: install-strip-target-libquadmath
+
+install-strip-target-libquadmath: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libquadmath && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libquadmath
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libquadmath info-target-libquadmath
+maybe-info-target-libquadmath:
+@if target-libquadmath
+maybe-info-target-libquadmath: info-target-libquadmath
+
+info-target-libquadmath: \
+    configure-target-libquadmath 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing info in $(TARGET_SUBDIR)/libquadmath" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libquadmath && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           info) \
+	  || exit 1
+
+@endif target-libquadmath
+
+.PHONY: maybe-dvi-target-libquadmath dvi-target-libquadmath
+maybe-dvi-target-libquadmath:
+@if target-libquadmath
+maybe-dvi-target-libquadmath: dvi-target-libquadmath
+
+dvi-target-libquadmath: \
+    configure-target-libquadmath 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing dvi in $(TARGET_SUBDIR)/libquadmath" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libquadmath && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           dvi) \
+	  || exit 1
+
+@endif target-libquadmath
+
+.PHONY: maybe-pdf-target-libquadmath pdf-target-libquadmath
+maybe-pdf-target-libquadmath:
+@if target-libquadmath
+maybe-pdf-target-libquadmath: pdf-target-libquadmath
+
+pdf-target-libquadmath: \
+    configure-target-libquadmath 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing pdf in $(TARGET_SUBDIR)/libquadmath" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libquadmath && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           pdf) \
+	  || exit 1
+
+@endif target-libquadmath
+
+.PHONY: maybe-html-target-libquadmath html-target-libquadmath
+maybe-html-target-libquadmath:
+@if target-libquadmath
+maybe-html-target-libquadmath: html-target-libquadmath
+
+html-target-libquadmath: \
+    configure-target-libquadmath 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing html in $(TARGET_SUBDIR)/libquadmath" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libquadmath && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           html) \
+	  || exit 1
+
+@endif target-libquadmath
+
+.PHONY: maybe-TAGS-target-libquadmath TAGS-target-libquadmath
+maybe-TAGS-target-libquadmath:
+@if target-libquadmath
+maybe-TAGS-target-libquadmath: TAGS-target-libquadmath
+
+TAGS-target-libquadmath: \
+    configure-target-libquadmath 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/libquadmath" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libquadmath && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           TAGS) \
+	  || exit 1
+
+@endif target-libquadmath
+
+.PHONY: maybe-install-info-target-libquadmath install-info-target-libquadmath
+maybe-install-info-target-libquadmath:
+@if target-libquadmath
+maybe-install-info-target-libquadmath: install-info-target-libquadmath
+
+install-info-target-libquadmath: \
+    configure-target-libquadmath \
+    info-target-libquadmath 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-info in $(TARGET_SUBDIR)/libquadmath" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libquadmath && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-info) \
+	  || exit 1
+
+@endif target-libquadmath
+
+.PHONY: maybe-install-pdf-target-libquadmath install-pdf-target-libquadmath
+maybe-install-pdf-target-libquadmath:
+@if target-libquadmath
+maybe-install-pdf-target-libquadmath: install-pdf-target-libquadmath
+
+install-pdf-target-libquadmath: \
+    configure-target-libquadmath \
+    pdf-target-libquadmath 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libquadmath" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libquadmath && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-pdf) \
+	  || exit 1
+
+@endif target-libquadmath
+
+.PHONY: maybe-install-html-target-libquadmath install-html-target-libquadmath
+maybe-install-html-target-libquadmath:
+@if target-libquadmath
+maybe-install-html-target-libquadmath: install-html-target-libquadmath
+
+install-html-target-libquadmath: \
+    configure-target-libquadmath \
+    html-target-libquadmath 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libquadmath" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libquadmath && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-html) \
+	  || exit 1
+
+@endif target-libquadmath
+
+.PHONY: maybe-installcheck-target-libquadmath installcheck-target-libquadmath
+maybe-installcheck-target-libquadmath:
+@if target-libquadmath
+maybe-installcheck-target-libquadmath: installcheck-target-libquadmath
+
+installcheck-target-libquadmath: \
+    configure-target-libquadmath 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/libquadmath" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libquadmath && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           installcheck) \
+	  || exit 1
+
+@endif target-libquadmath
+
+.PHONY: maybe-mostlyclean-target-libquadmath mostlyclean-target-libquadmath
+maybe-mostlyclean-target-libquadmath:
+@if target-libquadmath
+maybe-mostlyclean-target-libquadmath: mostlyclean-target-libquadmath
+
+mostlyclean-target-libquadmath: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libquadmath" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libquadmath && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           mostlyclean) \
+	  || exit 1
+
+@endif target-libquadmath
+
+.PHONY: maybe-clean-target-libquadmath clean-target-libquadmath
+maybe-clean-target-libquadmath:
+@if target-libquadmath
+maybe-clean-target-libquadmath: clean-target-libquadmath
+
+clean-target-libquadmath: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing clean in $(TARGET_SUBDIR)/libquadmath" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libquadmath && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           clean) \
+	  || exit 1
+
+@endif target-libquadmath
+
+.PHONY: maybe-distclean-target-libquadmath distclean-target-libquadmath
+maybe-distclean-target-libquadmath:
+@if target-libquadmath
+maybe-distclean-target-libquadmath: distclean-target-libquadmath
+
+distclean-target-libquadmath: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing distclean in $(TARGET_SUBDIR)/libquadmath" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libquadmath && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           distclean) \
+	  || exit 1
+
+@endif target-libquadmath
+
+.PHONY: maybe-maintainer-clean-target-libquadmath maintainer-clean-target-libquadmath
+maybe-maintainer-clean-target-libquadmath:
+@if target-libquadmath
+maybe-maintainer-clean-target-libquadmath: maintainer-clean-target-libquadmath
+
+maintainer-clean-target-libquadmath: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libquadmath" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libquadmath && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           maintainer-clean) \
+	  || exit 1
+
+@endif target-libquadmath
+
+
+
+
+
+.PHONY: configure-target-libgfortran maybe-configure-target-libgfortran
+maybe-configure-target-libgfortran:
+@if gcc-bootstrap
+configure-target-libgfortran: stage_current
+@endif gcc-bootstrap
+@if target-libgfortran
+maybe-configure-target-libgfortran: configure-target-libgfortran
+configure-target-libgfortran: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libgfortran..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgfortran/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libgfortran/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libgfortran/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libgfortran/Makefile; \
+	    mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	echo Configuring in $(TARGET_SUBDIR)/libgfortran; \
+	cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libgfortran/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libgfortran"; \
+	libsrcdir="$$s/libgfortran"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif target-libgfortran
+
+
+
+
+
+.PHONY: all-target-libgfortran maybe-all-target-libgfortran
+maybe-all-target-libgfortran:
+@if gcc-bootstrap
+all-target-libgfortran: stage_current
+@endif gcc-bootstrap
+@if target-libgfortran
+TARGET-target-libgfortran=all
+maybe-all-target-libgfortran: all-target-libgfortran
+all-target-libgfortran: configure-target-libgfortran
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	(cd $(TARGET_SUBDIR)/libgfortran && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+		$(TARGET-target-libgfortran))
+@endif target-libgfortran
+
+
+
+
+
+.PHONY: check-target-libgfortran maybe-check-target-libgfortran
+maybe-check-target-libgfortran:
+@if target-libgfortran
+maybe-check-target-libgfortran: check-target-libgfortran
+
+check-target-libgfortran:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libgfortran && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-libgfortran
+
+.PHONY: install-target-libgfortran maybe-install-target-libgfortran
+maybe-install-target-libgfortran:
+@if target-libgfortran
+maybe-install-target-libgfortran: install-target-libgfortran
+
+install-target-libgfortran: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libgfortran && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libgfortran
+
+.PHONY: install-strip-target-libgfortran maybe-install-strip-target-libgfortran
+maybe-install-strip-target-libgfortran:
+@if target-libgfortran
+maybe-install-strip-target-libgfortran: install-strip-target-libgfortran
+
+install-strip-target-libgfortran: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libgfortran && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libgfortran
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libgfortran info-target-libgfortran
+maybe-info-target-libgfortran:
+@if target-libgfortran
+maybe-info-target-libgfortran: info-target-libgfortran
+
+info-target-libgfortran: \
+    configure-target-libgfortran 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing info in $(TARGET_SUBDIR)/libgfortran" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgfortran && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           info) \
+	  || exit 1
+
+@endif target-libgfortran
+
+.PHONY: maybe-dvi-target-libgfortran dvi-target-libgfortran
+maybe-dvi-target-libgfortran:
+@if target-libgfortran
+maybe-dvi-target-libgfortran: dvi-target-libgfortran
+
+dvi-target-libgfortran: \
+    configure-target-libgfortran 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing dvi in $(TARGET_SUBDIR)/libgfortran" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgfortran && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           dvi) \
+	  || exit 1
+
+@endif target-libgfortran
+
+.PHONY: maybe-pdf-target-libgfortran pdf-target-libgfortran
+maybe-pdf-target-libgfortran:
+@if target-libgfortran
+maybe-pdf-target-libgfortran: pdf-target-libgfortran
+
+pdf-target-libgfortran: \
+    configure-target-libgfortran 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing pdf in $(TARGET_SUBDIR)/libgfortran" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgfortran && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           pdf) \
+	  || exit 1
+
+@endif target-libgfortran
+
+.PHONY: maybe-html-target-libgfortran html-target-libgfortran
+maybe-html-target-libgfortran:
+@if target-libgfortran
+maybe-html-target-libgfortran: html-target-libgfortran
+
+html-target-libgfortran: \
+    configure-target-libgfortran 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing html in $(TARGET_SUBDIR)/libgfortran" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgfortran && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           html) \
+	  || exit 1
+
+@endif target-libgfortran
+
+.PHONY: maybe-TAGS-target-libgfortran TAGS-target-libgfortran
+maybe-TAGS-target-libgfortran:
+@if target-libgfortran
+maybe-TAGS-target-libgfortran: TAGS-target-libgfortran
+
+TAGS-target-libgfortran: \
+    configure-target-libgfortran 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/libgfortran" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgfortran && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           TAGS) \
+	  || exit 1
+
+@endif target-libgfortran
+
+.PHONY: maybe-install-info-target-libgfortran install-info-target-libgfortran
+maybe-install-info-target-libgfortran:
+@if target-libgfortran
+maybe-install-info-target-libgfortran: install-info-target-libgfortran
+
+install-info-target-libgfortran: \
+    configure-target-libgfortran \
+    info-target-libgfortran 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-info in $(TARGET_SUBDIR)/libgfortran" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgfortran && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-info) \
+	  || exit 1
+
+@endif target-libgfortran
+
+.PHONY: maybe-install-pdf-target-libgfortran install-pdf-target-libgfortran
+maybe-install-pdf-target-libgfortran:
+@if target-libgfortran
+maybe-install-pdf-target-libgfortran: install-pdf-target-libgfortran
+
+install-pdf-target-libgfortran: \
+    configure-target-libgfortran \
+    pdf-target-libgfortran 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libgfortran" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgfortran && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-pdf) \
+	  || exit 1
+
+@endif target-libgfortran
+
+.PHONY: maybe-install-html-target-libgfortran install-html-target-libgfortran
+maybe-install-html-target-libgfortran:
+@if target-libgfortran
+maybe-install-html-target-libgfortran: install-html-target-libgfortran
+
+install-html-target-libgfortran: \
+    configure-target-libgfortran \
+    html-target-libgfortran 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libgfortran" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgfortran && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-html) \
+	  || exit 1
+
+@endif target-libgfortran
+
+.PHONY: maybe-installcheck-target-libgfortran installcheck-target-libgfortran
+maybe-installcheck-target-libgfortran:
+@if target-libgfortran
+maybe-installcheck-target-libgfortran: installcheck-target-libgfortran
+
+installcheck-target-libgfortran: \
+    configure-target-libgfortran 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/libgfortran" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgfortran && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           installcheck) \
+	  || exit 1
+
+@endif target-libgfortran
+
+.PHONY: maybe-mostlyclean-target-libgfortran mostlyclean-target-libgfortran
+maybe-mostlyclean-target-libgfortran:
+@if target-libgfortran
+maybe-mostlyclean-target-libgfortran: mostlyclean-target-libgfortran
+
+mostlyclean-target-libgfortran: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgfortran" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgfortran && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           mostlyclean) \
+	  || exit 1
+
+@endif target-libgfortran
+
+.PHONY: maybe-clean-target-libgfortran clean-target-libgfortran
+maybe-clean-target-libgfortran:
+@if target-libgfortran
+maybe-clean-target-libgfortran: clean-target-libgfortran
+
+clean-target-libgfortran: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing clean in $(TARGET_SUBDIR)/libgfortran" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgfortran && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           clean) \
+	  || exit 1
+
+@endif target-libgfortran
+
+.PHONY: maybe-distclean-target-libgfortran distclean-target-libgfortran
+maybe-distclean-target-libgfortran:
+@if target-libgfortran
+maybe-distclean-target-libgfortran: distclean-target-libgfortran
+
+distclean-target-libgfortran: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing distclean in $(TARGET_SUBDIR)/libgfortran" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgfortran && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           distclean) \
+	  || exit 1
+
+@endif target-libgfortran
+
+.PHONY: maybe-maintainer-clean-target-libgfortran maintainer-clean-target-libgfortran
+maybe-maintainer-clean-target-libgfortran:
+@if target-libgfortran
+maybe-maintainer-clean-target-libgfortran: maintainer-clean-target-libgfortran
+
+maintainer-clean-target-libgfortran: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgfortran" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgfortran && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           maintainer-clean) \
+	  || exit 1
+
+@endif target-libgfortran
+
+
+
+
+
+.PHONY: configure-target-libobjc maybe-configure-target-libobjc
+maybe-configure-target-libobjc:
+@if gcc-bootstrap
+configure-target-libobjc: stage_current
+@endif gcc-bootstrap
+@if target-libobjc
+maybe-configure-target-libobjc: configure-target-libobjc
+configure-target-libobjc: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libobjc..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libobjc/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libobjc/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libobjc/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libobjc/Makefile; \
+	    mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	echo Configuring in $(TARGET_SUBDIR)/libobjc; \
+	cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libobjc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libobjc"; \
+	libsrcdir="$$s/libobjc"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif target-libobjc
+
+
+
+
+
+.PHONY: all-target-libobjc maybe-all-target-libobjc
+maybe-all-target-libobjc:
+@if gcc-bootstrap
+all-target-libobjc: stage_current
+@endif gcc-bootstrap
+@if target-libobjc
+TARGET-target-libobjc=all
+maybe-all-target-libobjc: all-target-libobjc
+all-target-libobjc: configure-target-libobjc
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	(cd $(TARGET_SUBDIR)/libobjc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+		$(TARGET-target-libobjc))
+@endif target-libobjc
+
+
+
+
+
+.PHONY: check-target-libobjc maybe-check-target-libobjc
+maybe-check-target-libobjc:
+@if target-libobjc
+maybe-check-target-libobjc: check-target-libobjc
+
+check-target-libobjc:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libobjc && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-libobjc
+
+.PHONY: install-target-libobjc maybe-install-target-libobjc
+maybe-install-target-libobjc:
+@if target-libobjc
+maybe-install-target-libobjc: install-target-libobjc
+
+install-target-libobjc: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libobjc && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libobjc
+
+.PHONY: install-strip-target-libobjc maybe-install-strip-target-libobjc
+maybe-install-strip-target-libobjc:
+@if target-libobjc
+maybe-install-strip-target-libobjc: install-strip-target-libobjc
+
+install-strip-target-libobjc: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libobjc && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libobjc
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libobjc info-target-libobjc
+maybe-info-target-libobjc:
+@if target-libobjc
+maybe-info-target-libobjc: info-target-libobjc
+
+info-target-libobjc: \
+    configure-target-libobjc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing info in $(TARGET_SUBDIR)/libobjc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libobjc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           info) \
+	  || exit 1
+
+@endif target-libobjc
+
+.PHONY: maybe-dvi-target-libobjc dvi-target-libobjc
+maybe-dvi-target-libobjc:
+@if target-libobjc
+maybe-dvi-target-libobjc: dvi-target-libobjc
+
+dvi-target-libobjc: \
+    configure-target-libobjc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing dvi in $(TARGET_SUBDIR)/libobjc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libobjc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           dvi) \
+	  || exit 1
+
+@endif target-libobjc
+
+.PHONY: maybe-pdf-target-libobjc pdf-target-libobjc
+maybe-pdf-target-libobjc:
+@if target-libobjc
+maybe-pdf-target-libobjc: pdf-target-libobjc
+
+pdf-target-libobjc: \
+    configure-target-libobjc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing pdf in $(TARGET_SUBDIR)/libobjc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libobjc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           pdf) \
+	  || exit 1
+
+@endif target-libobjc
+
+.PHONY: maybe-html-target-libobjc html-target-libobjc
+maybe-html-target-libobjc:
+@if target-libobjc
+maybe-html-target-libobjc: html-target-libobjc
+
+html-target-libobjc: \
+    configure-target-libobjc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing html in $(TARGET_SUBDIR)/libobjc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libobjc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           html) \
+	  || exit 1
+
+@endif target-libobjc
+
+.PHONY: maybe-TAGS-target-libobjc TAGS-target-libobjc
+maybe-TAGS-target-libobjc:
+@if target-libobjc
+maybe-TAGS-target-libobjc: TAGS-target-libobjc
+
+TAGS-target-libobjc: \
+    configure-target-libobjc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/libobjc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libobjc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           TAGS) \
+	  || exit 1
+
+@endif target-libobjc
+
+.PHONY: maybe-install-info-target-libobjc install-info-target-libobjc
+maybe-install-info-target-libobjc:
+@if target-libobjc
+maybe-install-info-target-libobjc: install-info-target-libobjc
+
+install-info-target-libobjc: \
+    configure-target-libobjc \
+    info-target-libobjc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-info in $(TARGET_SUBDIR)/libobjc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libobjc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-info) \
+	  || exit 1
+
+@endif target-libobjc
+
+.PHONY: maybe-install-pdf-target-libobjc install-pdf-target-libobjc
+maybe-install-pdf-target-libobjc:
+@if target-libobjc
+maybe-install-pdf-target-libobjc: install-pdf-target-libobjc
+
+install-pdf-target-libobjc: \
+    configure-target-libobjc \
+    pdf-target-libobjc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libobjc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libobjc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-pdf) \
+	  || exit 1
+
+@endif target-libobjc
+
+.PHONY: maybe-install-html-target-libobjc install-html-target-libobjc
+maybe-install-html-target-libobjc:
+@if target-libobjc
+maybe-install-html-target-libobjc: install-html-target-libobjc
+
+install-html-target-libobjc: \
+    configure-target-libobjc \
+    html-target-libobjc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libobjc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libobjc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-html) \
+	  || exit 1
+
+@endif target-libobjc
+
+.PHONY: maybe-installcheck-target-libobjc installcheck-target-libobjc
+maybe-installcheck-target-libobjc:
+@if target-libobjc
+maybe-installcheck-target-libobjc: installcheck-target-libobjc
+
+installcheck-target-libobjc: \
+    configure-target-libobjc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/libobjc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libobjc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           installcheck) \
+	  || exit 1
+
+@endif target-libobjc
+
+.PHONY: maybe-mostlyclean-target-libobjc mostlyclean-target-libobjc
+maybe-mostlyclean-target-libobjc:
+@if target-libobjc
+maybe-mostlyclean-target-libobjc: mostlyclean-target-libobjc
+
+mostlyclean-target-libobjc: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libobjc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libobjc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           mostlyclean) \
+	  || exit 1
+
+@endif target-libobjc
+
+.PHONY: maybe-clean-target-libobjc clean-target-libobjc
+maybe-clean-target-libobjc:
+@if target-libobjc
+maybe-clean-target-libobjc: clean-target-libobjc
+
+clean-target-libobjc: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing clean in $(TARGET_SUBDIR)/libobjc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libobjc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           clean) \
+	  || exit 1
+
+@endif target-libobjc
+
+.PHONY: maybe-distclean-target-libobjc distclean-target-libobjc
+maybe-distclean-target-libobjc:
+@if target-libobjc
+maybe-distclean-target-libobjc: distclean-target-libobjc
+
+distclean-target-libobjc: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing distclean in $(TARGET_SUBDIR)/libobjc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libobjc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           distclean) \
+	  || exit 1
+
+@endif target-libobjc
+
+.PHONY: maybe-maintainer-clean-target-libobjc maintainer-clean-target-libobjc
+maybe-maintainer-clean-target-libobjc:
+@if target-libobjc
+maybe-maintainer-clean-target-libobjc: maintainer-clean-target-libobjc
+
+maintainer-clean-target-libobjc: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libobjc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libobjc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           maintainer-clean) \
+	  || exit 1
+
+@endif target-libobjc
+
+
+
+
+
+.PHONY: configure-target-libgo maybe-configure-target-libgo
+maybe-configure-target-libgo:
+@if gcc-bootstrap
+configure-target-libgo: stage_current
+@endif gcc-bootstrap
+@if target-libgo
+maybe-configure-target-libgo: configure-target-libgo
+configure-target-libgo: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libgo..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgo ; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgo/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libgo/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libgo/multilib.tmp $(TARGET_SUBDIR)/libgo/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libgo/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libgo/Makefile; \
+	    mv $(TARGET_SUBDIR)/libgo/multilib.tmp $(TARGET_SUBDIR)/libgo/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libgo/multilib.tmp $(TARGET_SUBDIR)/libgo/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgo/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgo ; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	echo Configuring in $(TARGET_SUBDIR)/libgo; \
+	cd "$(TARGET_SUBDIR)/libgo" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libgo/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libgo"; \
+	libsrcdir="$$s/libgo"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif target-libgo
+
+
+
+
+
+.PHONY: all-target-libgo maybe-all-target-libgo
+maybe-all-target-libgo:
+@if gcc-bootstrap
+all-target-libgo: stage_current
+@endif gcc-bootstrap
+@if target-libgo
+TARGET-target-libgo=all
+maybe-all-target-libgo: all-target-libgo
+all-target-libgo: configure-target-libgo
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	(cd $(TARGET_SUBDIR)/libgo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+		$(TARGET-target-libgo))
+@endif target-libgo
+
+
+
+
+
+.PHONY: check-target-libgo maybe-check-target-libgo
+maybe-check-target-libgo:
+@if target-libgo
+maybe-check-target-libgo: check-target-libgo
+
+check-target-libgo:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libgo && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-libgo
+
+.PHONY: install-target-libgo maybe-install-target-libgo
+maybe-install-target-libgo:
+@if target-libgo
+maybe-install-target-libgo: install-target-libgo
+
+install-target-libgo: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libgo && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libgo
+
+.PHONY: install-strip-target-libgo maybe-install-strip-target-libgo
+maybe-install-strip-target-libgo:
+@if target-libgo
+maybe-install-strip-target-libgo: install-strip-target-libgo
+
+install-strip-target-libgo: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libgo && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libgo
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libgo info-target-libgo
+maybe-info-target-libgo:
+@if target-libgo
+maybe-info-target-libgo: info-target-libgo
+
+info-target-libgo: \
+    configure-target-libgo 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing info in $(TARGET_SUBDIR)/libgo" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           info) \
+	  || exit 1
+
+@endif target-libgo
+
+.PHONY: maybe-dvi-target-libgo dvi-target-libgo
+maybe-dvi-target-libgo:
+@if target-libgo
+maybe-dvi-target-libgo: dvi-target-libgo
+
+dvi-target-libgo: \
+    configure-target-libgo 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing dvi in $(TARGET_SUBDIR)/libgo" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           dvi) \
+	  || exit 1
+
+@endif target-libgo
+
+.PHONY: maybe-pdf-target-libgo pdf-target-libgo
+maybe-pdf-target-libgo:
+@if target-libgo
+maybe-pdf-target-libgo: pdf-target-libgo
+
+pdf-target-libgo: \
+    configure-target-libgo 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing pdf in $(TARGET_SUBDIR)/libgo" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           pdf) \
+	  || exit 1
+
+@endif target-libgo
+
+.PHONY: maybe-html-target-libgo html-target-libgo
+maybe-html-target-libgo:
+@if target-libgo
+maybe-html-target-libgo: html-target-libgo
+
+html-target-libgo: \
+    configure-target-libgo 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing html in $(TARGET_SUBDIR)/libgo" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           html) \
+	  || exit 1
+
+@endif target-libgo
+
+.PHONY: maybe-TAGS-target-libgo TAGS-target-libgo
+maybe-TAGS-target-libgo:
+@if target-libgo
+maybe-TAGS-target-libgo: TAGS-target-libgo
+
+TAGS-target-libgo: \
+    configure-target-libgo 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/libgo" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           TAGS) \
+	  || exit 1
+
+@endif target-libgo
+
+.PHONY: maybe-install-info-target-libgo install-info-target-libgo
+maybe-install-info-target-libgo:
+@if target-libgo
+maybe-install-info-target-libgo: install-info-target-libgo
+
+install-info-target-libgo: \
+    configure-target-libgo \
+    info-target-libgo 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-info in $(TARGET_SUBDIR)/libgo" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-info) \
+	  || exit 1
+
+@endif target-libgo
+
+.PHONY: maybe-install-pdf-target-libgo install-pdf-target-libgo
+maybe-install-pdf-target-libgo:
+@if target-libgo
+maybe-install-pdf-target-libgo: install-pdf-target-libgo
+
+install-pdf-target-libgo: \
+    configure-target-libgo \
+    pdf-target-libgo 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libgo" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-pdf) \
+	  || exit 1
+
+@endif target-libgo
+
+.PHONY: maybe-install-html-target-libgo install-html-target-libgo
+maybe-install-html-target-libgo:
+@if target-libgo
+maybe-install-html-target-libgo: install-html-target-libgo
+
+install-html-target-libgo: \
+    configure-target-libgo \
+    html-target-libgo 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libgo" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-html) \
+	  || exit 1
+
+@endif target-libgo
+
+.PHONY: maybe-installcheck-target-libgo installcheck-target-libgo
+maybe-installcheck-target-libgo:
+@if target-libgo
+maybe-installcheck-target-libgo: installcheck-target-libgo
+
+installcheck-target-libgo: \
+    configure-target-libgo 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/libgo" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           installcheck) \
+	  || exit 1
+
+@endif target-libgo
+
+.PHONY: maybe-mostlyclean-target-libgo mostlyclean-target-libgo
+maybe-mostlyclean-target-libgo:
+@if target-libgo
+maybe-mostlyclean-target-libgo: mostlyclean-target-libgo
+
+mostlyclean-target-libgo: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgo" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           mostlyclean) \
+	  || exit 1
+
+@endif target-libgo
+
+.PHONY: maybe-clean-target-libgo clean-target-libgo
+maybe-clean-target-libgo:
+@if target-libgo
+maybe-clean-target-libgo: clean-target-libgo
+
+clean-target-libgo: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing clean in $(TARGET_SUBDIR)/libgo" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           clean) \
+	  || exit 1
+
+@endif target-libgo
+
+.PHONY: maybe-distclean-target-libgo distclean-target-libgo
+maybe-distclean-target-libgo:
+@if target-libgo
+maybe-distclean-target-libgo: distclean-target-libgo
+
+distclean-target-libgo: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing distclean in $(TARGET_SUBDIR)/libgo" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           distclean) \
+	  || exit 1
+
+@endif target-libgo
+
+.PHONY: maybe-maintainer-clean-target-libgo maintainer-clean-target-libgo
+maybe-maintainer-clean-target-libgo:
+@if target-libgo
+maybe-maintainer-clean-target-libgo: maintainer-clean-target-libgo
+
+maintainer-clean-target-libgo: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgo" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           maintainer-clean) \
+	  || exit 1
+
+@endif target-libgo
+
+
+
+
+
+.PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
+maybe-configure-target-libtermcap:
+@if gcc-bootstrap
+configure-target-libtermcap: stage_current
+@endif gcc-bootstrap
+@if target-libtermcap
+maybe-configure-target-libtermcap: configure-target-libtermcap
+configure-target-libtermcap: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libtermcap..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libtermcap/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libtermcap/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libtermcap/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libtermcap/Makefile; \
+	    mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	echo Configuring in $(TARGET_SUBDIR)/libtermcap; \
+	cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libtermcap/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libtermcap"; \
+	libsrcdir="$$s/libtermcap"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif target-libtermcap
+
+
+
+
+
+.PHONY: all-target-libtermcap maybe-all-target-libtermcap
+maybe-all-target-libtermcap:
+@if gcc-bootstrap
+all-target-libtermcap: stage_current
+@endif gcc-bootstrap
+@if target-libtermcap
+TARGET-target-libtermcap=all
+maybe-all-target-libtermcap: all-target-libtermcap
+all-target-libtermcap: configure-target-libtermcap
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	(cd $(TARGET_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+		$(TARGET-target-libtermcap))
+@endif target-libtermcap
+
+
+
+
+
+.PHONY: check-target-libtermcap maybe-check-target-libtermcap
+maybe-check-target-libtermcap:
+@if target-libtermcap
+maybe-check-target-libtermcap: check-target-libtermcap
+
+# Dummy target for uncheckable module.
+check-target-libtermcap:
+
+@endif target-libtermcap
+
+.PHONY: install-target-libtermcap maybe-install-target-libtermcap
+maybe-install-target-libtermcap:
+@if target-libtermcap
+maybe-install-target-libtermcap: install-target-libtermcap
+
+install-target-libtermcap: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libtermcap && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libtermcap
+
+.PHONY: install-strip-target-libtermcap maybe-install-strip-target-libtermcap
+maybe-install-strip-target-libtermcap:
+@if target-libtermcap
+maybe-install-strip-target-libtermcap: install-strip-target-libtermcap
+
+install-strip-target-libtermcap: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libtermcap && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libtermcap
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libtermcap info-target-libtermcap
+maybe-info-target-libtermcap:
+@if target-libtermcap
+maybe-info-target-libtermcap: info-target-libtermcap
+
+info-target-libtermcap: \
+    configure-target-libtermcap 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing info in $(TARGET_SUBDIR)/libtermcap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           info) \
+	  || exit 1
+
+@endif target-libtermcap
+
+.PHONY: maybe-dvi-target-libtermcap dvi-target-libtermcap
+maybe-dvi-target-libtermcap:
+@if target-libtermcap
+maybe-dvi-target-libtermcap: dvi-target-libtermcap
+
+dvi-target-libtermcap: \
+    configure-target-libtermcap 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing dvi in $(TARGET_SUBDIR)/libtermcap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           dvi) \
+	  || exit 1
+
+@endif target-libtermcap
+
+.PHONY: maybe-pdf-target-libtermcap pdf-target-libtermcap
+maybe-pdf-target-libtermcap:
+@if target-libtermcap
+maybe-pdf-target-libtermcap: pdf-target-libtermcap
+
+pdf-target-libtermcap: \
+    configure-target-libtermcap 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing pdf in $(TARGET_SUBDIR)/libtermcap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           pdf) \
+	  || exit 1
+
+@endif target-libtermcap
+
+.PHONY: maybe-html-target-libtermcap html-target-libtermcap
+maybe-html-target-libtermcap:
+@if target-libtermcap
+maybe-html-target-libtermcap: html-target-libtermcap
+
+html-target-libtermcap: \
+    configure-target-libtermcap 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing html in $(TARGET_SUBDIR)/libtermcap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           html) \
+	  || exit 1
+
+@endif target-libtermcap
+
+.PHONY: maybe-TAGS-target-libtermcap TAGS-target-libtermcap
+maybe-TAGS-target-libtermcap:
+@if target-libtermcap
+maybe-TAGS-target-libtermcap: TAGS-target-libtermcap
+
+TAGS-target-libtermcap: \
+    configure-target-libtermcap 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/libtermcap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           TAGS) \
+	  || exit 1
+
+@endif target-libtermcap
+
+.PHONY: maybe-install-info-target-libtermcap install-info-target-libtermcap
+maybe-install-info-target-libtermcap:
+@if target-libtermcap
+maybe-install-info-target-libtermcap: install-info-target-libtermcap
+
+install-info-target-libtermcap: \
+    configure-target-libtermcap \
+    info-target-libtermcap 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-info in $(TARGET_SUBDIR)/libtermcap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-info) \
+	  || exit 1
+
+@endif target-libtermcap
+
+.PHONY: maybe-install-pdf-target-libtermcap install-pdf-target-libtermcap
+maybe-install-pdf-target-libtermcap:
+@if target-libtermcap
+maybe-install-pdf-target-libtermcap: install-pdf-target-libtermcap
+
+install-pdf-target-libtermcap: \
+    configure-target-libtermcap \
+    pdf-target-libtermcap 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libtermcap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-pdf) \
+	  || exit 1
+
+@endif target-libtermcap
+
+.PHONY: maybe-install-html-target-libtermcap install-html-target-libtermcap
+maybe-install-html-target-libtermcap:
+@if target-libtermcap
+maybe-install-html-target-libtermcap: install-html-target-libtermcap
+
+install-html-target-libtermcap: \
+    configure-target-libtermcap \
+    html-target-libtermcap 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libtermcap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-html) \
+	  || exit 1
+
+@endif target-libtermcap
+
+.PHONY: maybe-installcheck-target-libtermcap installcheck-target-libtermcap
+maybe-installcheck-target-libtermcap:
+@if target-libtermcap
+maybe-installcheck-target-libtermcap: installcheck-target-libtermcap
+
+installcheck-target-libtermcap: \
+    configure-target-libtermcap 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/libtermcap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           installcheck) \
+	  || exit 1
+
+@endif target-libtermcap
+
+.PHONY: maybe-mostlyclean-target-libtermcap mostlyclean-target-libtermcap
+maybe-mostlyclean-target-libtermcap:
+@if target-libtermcap
+maybe-mostlyclean-target-libtermcap: mostlyclean-target-libtermcap
+
+# libtermcap doesn't support mostlyclean.
+mostlyclean-target-libtermcap:
+
+@endif target-libtermcap
+
+.PHONY: maybe-clean-target-libtermcap clean-target-libtermcap
+maybe-clean-target-libtermcap:
+@if target-libtermcap
+maybe-clean-target-libtermcap: clean-target-libtermcap
+
+# libtermcap doesn't support clean.
+clean-target-libtermcap:
+
+@endif target-libtermcap
+
+.PHONY: maybe-distclean-target-libtermcap distclean-target-libtermcap
+maybe-distclean-target-libtermcap:
+@if target-libtermcap
+maybe-distclean-target-libtermcap: distclean-target-libtermcap
+
+# libtermcap doesn't support distclean.
+distclean-target-libtermcap:
+
+@endif target-libtermcap
+
+.PHONY: maybe-maintainer-clean-target-libtermcap maintainer-clean-target-libtermcap
+maybe-maintainer-clean-target-libtermcap:
+@if target-libtermcap
+maybe-maintainer-clean-target-libtermcap: maintainer-clean-target-libtermcap
+
+# libtermcap doesn't support maintainer-clean.
+maintainer-clean-target-libtermcap:
+
+@endif target-libtermcap
+
+
+
+
+
+.PHONY: configure-target-winsup maybe-configure-target-winsup
+maybe-configure-target-winsup:
+@if gcc-bootstrap
+configure-target-winsup: stage_current
+@endif gcc-bootstrap
+@if target-winsup
+maybe-configure-target-winsup: configure-target-winsup
+configure-target-winsup: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for winsup..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/winsup/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/winsup/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/winsup/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/winsup/Makefile; \
+	    mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	echo Configuring in $(TARGET_SUBDIR)/winsup; \
+	cd "$(TARGET_SUBDIR)/winsup" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/winsup/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/winsup"; \
+	libsrcdir="$$s/winsup"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif target-winsup
+
+
+
+
+
+.PHONY: all-target-winsup maybe-all-target-winsup
+maybe-all-target-winsup:
+@if gcc-bootstrap
+all-target-winsup: stage_current
+@endif gcc-bootstrap
+@if target-winsup
+TARGET-target-winsup=all
+maybe-all-target-winsup: all-target-winsup
+all-target-winsup: configure-target-winsup
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	(cd $(TARGET_SUBDIR)/winsup && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+		$(TARGET-target-winsup))
+@endif target-winsup
+
+
+
+
+
+.PHONY: check-target-winsup maybe-check-target-winsup
+maybe-check-target-winsup:
+@if target-winsup
+maybe-check-target-winsup: check-target-winsup
+
+check-target-winsup:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/winsup && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-winsup
+
+.PHONY: install-target-winsup maybe-install-target-winsup
+maybe-install-target-winsup:
+@if target-winsup
+maybe-install-target-winsup: install-target-winsup
+
+install-target-winsup: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/winsup && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-winsup
+
+.PHONY: install-strip-target-winsup maybe-install-strip-target-winsup
+maybe-install-strip-target-winsup:
+@if target-winsup
+maybe-install-strip-target-winsup: install-strip-target-winsup
+
+install-strip-target-winsup: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/winsup && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-winsup
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-winsup info-target-winsup
+maybe-info-target-winsup:
+@if target-winsup
+maybe-info-target-winsup: info-target-winsup
+
+info-target-winsup: \
+    configure-target-winsup 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing info in $(TARGET_SUBDIR)/winsup" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/winsup && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           info) \
+	  || exit 1
+
+@endif target-winsup
+
+.PHONY: maybe-dvi-target-winsup dvi-target-winsup
+maybe-dvi-target-winsup:
+@if target-winsup
+maybe-dvi-target-winsup: dvi-target-winsup
+
+dvi-target-winsup: \
+    configure-target-winsup 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing dvi in $(TARGET_SUBDIR)/winsup" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/winsup && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           dvi) \
+	  || exit 1
+
+@endif target-winsup
+
+.PHONY: maybe-pdf-target-winsup pdf-target-winsup
+maybe-pdf-target-winsup:
+@if target-winsup
+maybe-pdf-target-winsup: pdf-target-winsup
+
+pdf-target-winsup: \
+    configure-target-winsup 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing pdf in $(TARGET_SUBDIR)/winsup" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/winsup && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           pdf) \
+	  || exit 1
+
+@endif target-winsup
+
+.PHONY: maybe-html-target-winsup html-target-winsup
+maybe-html-target-winsup:
+@if target-winsup
+maybe-html-target-winsup: html-target-winsup
+
+html-target-winsup: \
+    configure-target-winsup 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing html in $(TARGET_SUBDIR)/winsup" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/winsup && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           html) \
+	  || exit 1
+
+@endif target-winsup
+
+.PHONY: maybe-TAGS-target-winsup TAGS-target-winsup
+maybe-TAGS-target-winsup:
+@if target-winsup
+maybe-TAGS-target-winsup: TAGS-target-winsup
+
+TAGS-target-winsup: \
+    configure-target-winsup 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/winsup" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/winsup && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           TAGS) \
+	  || exit 1
+
+@endif target-winsup
+
+.PHONY: maybe-install-info-target-winsup install-info-target-winsup
+maybe-install-info-target-winsup:
+@if target-winsup
+maybe-install-info-target-winsup: install-info-target-winsup
+
+install-info-target-winsup: \
+    configure-target-winsup \
+    info-target-winsup 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-info in $(TARGET_SUBDIR)/winsup" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/winsup && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-info) \
+	  || exit 1
+
+@endif target-winsup
+
+.PHONY: maybe-install-pdf-target-winsup install-pdf-target-winsup
+maybe-install-pdf-target-winsup:
+@if target-winsup
+maybe-install-pdf-target-winsup: install-pdf-target-winsup
+
+install-pdf-target-winsup: \
+    configure-target-winsup \
+    pdf-target-winsup 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/winsup" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/winsup && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-pdf) \
+	  || exit 1
+
+@endif target-winsup
+
+.PHONY: maybe-install-html-target-winsup install-html-target-winsup
+maybe-install-html-target-winsup:
+@if target-winsup
+maybe-install-html-target-winsup: install-html-target-winsup
+
+install-html-target-winsup: \
+    configure-target-winsup \
+    html-target-winsup 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/winsup" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/winsup && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-html) \
+	  || exit 1
+
+@endif target-winsup
+
+.PHONY: maybe-installcheck-target-winsup installcheck-target-winsup
+maybe-installcheck-target-winsup:
+@if target-winsup
+maybe-installcheck-target-winsup: installcheck-target-winsup
+
+installcheck-target-winsup: \
+    configure-target-winsup 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/winsup" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/winsup && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           installcheck) \
+	  || exit 1
+
+@endif target-winsup
+
+.PHONY: maybe-mostlyclean-target-winsup mostlyclean-target-winsup
+maybe-mostlyclean-target-winsup:
+@if target-winsup
+maybe-mostlyclean-target-winsup: mostlyclean-target-winsup
+
+mostlyclean-target-winsup: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/winsup" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/winsup && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           mostlyclean) \
+	  || exit 1
+
+@endif target-winsup
+
+.PHONY: maybe-clean-target-winsup clean-target-winsup
+maybe-clean-target-winsup:
+@if target-winsup
+maybe-clean-target-winsup: clean-target-winsup
+
+clean-target-winsup: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing clean in $(TARGET_SUBDIR)/winsup" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/winsup && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           clean) \
+	  || exit 1
+
+@endif target-winsup
+
+.PHONY: maybe-distclean-target-winsup distclean-target-winsup
+maybe-distclean-target-winsup:
+@if target-winsup
+maybe-distclean-target-winsup: distclean-target-winsup
+
+distclean-target-winsup: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing distclean in $(TARGET_SUBDIR)/winsup" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/winsup && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           distclean) \
+	  || exit 1
+
+@endif target-winsup
+
+.PHONY: maybe-maintainer-clean-target-winsup maintainer-clean-target-winsup
+maybe-maintainer-clean-target-winsup:
+@if target-winsup
+maybe-maintainer-clean-target-winsup: maintainer-clean-target-winsup
+
+maintainer-clean-target-winsup: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/winsup" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/winsup && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           maintainer-clean) \
+	  || exit 1
+
+@endif target-winsup
+
+
+
+
+
+.PHONY: configure-target-libgloss maybe-configure-target-libgloss
+maybe-configure-target-libgloss:
+@if gcc-bootstrap
+configure-target-libgloss: stage_current
+@endif gcc-bootstrap
+@if target-libgloss
+maybe-configure-target-libgloss: configure-target-libgloss
+configure-target-libgloss: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libgloss..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgloss/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libgloss/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libgloss/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libgloss/Makefile; \
+	    mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	echo Configuring in $(TARGET_SUBDIR)/libgloss; \
+	cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libgloss/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libgloss"; \
+	libsrcdir="$$s/libgloss"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif target-libgloss
+
+
+
+
+
+.PHONY: all-target-libgloss maybe-all-target-libgloss
+maybe-all-target-libgloss:
+@if gcc-bootstrap
+all-target-libgloss: stage_current
+@endif gcc-bootstrap
+@if target-libgloss
+TARGET-target-libgloss=all
+maybe-all-target-libgloss: all-target-libgloss
+all-target-libgloss: configure-target-libgloss
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	(cd $(TARGET_SUBDIR)/libgloss && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+		$(TARGET-target-libgloss))
+@endif target-libgloss
+
+
+
+
+
+.PHONY: check-target-libgloss maybe-check-target-libgloss
+maybe-check-target-libgloss:
+@if target-libgloss
+maybe-check-target-libgloss: check-target-libgloss
+
+# Dummy target for uncheckable module.
+check-target-libgloss:
+
+@endif target-libgloss
+
+.PHONY: install-target-libgloss maybe-install-target-libgloss
+maybe-install-target-libgloss:
+@if target-libgloss
+maybe-install-target-libgloss: install-target-libgloss
+
+install-target-libgloss: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libgloss && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libgloss
+
+.PHONY: install-strip-target-libgloss maybe-install-strip-target-libgloss
+maybe-install-strip-target-libgloss:
+@if target-libgloss
+maybe-install-strip-target-libgloss: install-strip-target-libgloss
+
+install-strip-target-libgloss: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libgloss && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libgloss
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libgloss info-target-libgloss
+maybe-info-target-libgloss:
+@if target-libgloss
+maybe-info-target-libgloss: info-target-libgloss
+
+info-target-libgloss: \
+    configure-target-libgloss 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing info in $(TARGET_SUBDIR)/libgloss" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgloss && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           info) \
+	  || exit 1
+
+@endif target-libgloss
+
+.PHONY: maybe-dvi-target-libgloss dvi-target-libgloss
+maybe-dvi-target-libgloss:
+@if target-libgloss
+maybe-dvi-target-libgloss: dvi-target-libgloss
+
+dvi-target-libgloss: \
+    configure-target-libgloss 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing dvi in $(TARGET_SUBDIR)/libgloss" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgloss && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           dvi) \
+	  || exit 1
+
+@endif target-libgloss
+
+.PHONY: maybe-pdf-target-libgloss pdf-target-libgloss
+maybe-pdf-target-libgloss:
+@if target-libgloss
+maybe-pdf-target-libgloss: pdf-target-libgloss
+
+pdf-target-libgloss: \
+    configure-target-libgloss 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing pdf in $(TARGET_SUBDIR)/libgloss" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgloss && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           pdf) \
+	  || exit 1
+
+@endif target-libgloss
+
+.PHONY: maybe-html-target-libgloss html-target-libgloss
+maybe-html-target-libgloss:
+@if target-libgloss
+maybe-html-target-libgloss: html-target-libgloss
+
+html-target-libgloss: \
+    configure-target-libgloss 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing html in $(TARGET_SUBDIR)/libgloss" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgloss && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           html) \
+	  || exit 1
+
+@endif target-libgloss
+
+.PHONY: maybe-TAGS-target-libgloss TAGS-target-libgloss
+maybe-TAGS-target-libgloss:
+@if target-libgloss
+maybe-TAGS-target-libgloss: TAGS-target-libgloss
+
+TAGS-target-libgloss: \
+    configure-target-libgloss 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/libgloss" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgloss && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           TAGS) \
+	  || exit 1
+
+@endif target-libgloss
+
+.PHONY: maybe-install-info-target-libgloss install-info-target-libgloss
+maybe-install-info-target-libgloss:
+@if target-libgloss
+maybe-install-info-target-libgloss: install-info-target-libgloss
+
+install-info-target-libgloss: \
+    configure-target-libgloss \
+    info-target-libgloss 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-info in $(TARGET_SUBDIR)/libgloss" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgloss && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-info) \
+	  || exit 1
+
+@endif target-libgloss
+
+.PHONY: maybe-install-pdf-target-libgloss install-pdf-target-libgloss
+maybe-install-pdf-target-libgloss:
+@if target-libgloss
+maybe-install-pdf-target-libgloss: install-pdf-target-libgloss
+
+install-pdf-target-libgloss: \
+    configure-target-libgloss \
+    pdf-target-libgloss 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libgloss" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgloss && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-pdf) \
+	  || exit 1
+
+@endif target-libgloss
+
+.PHONY: maybe-install-html-target-libgloss install-html-target-libgloss
+maybe-install-html-target-libgloss:
+@if target-libgloss
+maybe-install-html-target-libgloss: install-html-target-libgloss
+
+install-html-target-libgloss: \
+    configure-target-libgloss \
+    html-target-libgloss 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libgloss" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgloss && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-html) \
+	  || exit 1
+
+@endif target-libgloss
+
+.PHONY: maybe-installcheck-target-libgloss installcheck-target-libgloss
+maybe-installcheck-target-libgloss:
+@if target-libgloss
+maybe-installcheck-target-libgloss: installcheck-target-libgloss
+
+installcheck-target-libgloss: \
+    configure-target-libgloss 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/libgloss" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgloss && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           installcheck) \
+	  || exit 1
+
+@endif target-libgloss
+
+.PHONY: maybe-mostlyclean-target-libgloss mostlyclean-target-libgloss
+maybe-mostlyclean-target-libgloss:
+@if target-libgloss
+maybe-mostlyclean-target-libgloss: mostlyclean-target-libgloss
+
+mostlyclean-target-libgloss: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgloss" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgloss && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           mostlyclean) \
+	  || exit 1
+
+@endif target-libgloss
+
+.PHONY: maybe-clean-target-libgloss clean-target-libgloss
+maybe-clean-target-libgloss:
+@if target-libgloss
+maybe-clean-target-libgloss: clean-target-libgloss
+
+clean-target-libgloss: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing clean in $(TARGET_SUBDIR)/libgloss" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgloss && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           clean) \
+	  || exit 1
+
+@endif target-libgloss
+
+.PHONY: maybe-distclean-target-libgloss distclean-target-libgloss
+maybe-distclean-target-libgloss:
+@if target-libgloss
+maybe-distclean-target-libgloss: distclean-target-libgloss
+
+distclean-target-libgloss: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing distclean in $(TARGET_SUBDIR)/libgloss" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgloss && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           distclean) \
+	  || exit 1
+
+@endif target-libgloss
+
+.PHONY: maybe-maintainer-clean-target-libgloss maintainer-clean-target-libgloss
+maybe-maintainer-clean-target-libgloss:
+@if target-libgloss
+maybe-maintainer-clean-target-libgloss: maintainer-clean-target-libgloss
+
+maintainer-clean-target-libgloss: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgloss" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgloss && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           maintainer-clean) \
+	  || exit 1
+
+@endif target-libgloss
+
+
+
+
+
+.PHONY: configure-target-libffi maybe-configure-target-libffi
+maybe-configure-target-libffi:
+@if gcc-bootstrap
+configure-target-libffi: stage_current
+@endif gcc-bootstrap
+@if target-libffi
+maybe-configure-target-libffi: configure-target-libffi
+configure-target-libffi: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libffi..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libffi/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libffi/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libffi/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libffi/Makefile; \
+	    mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	echo Configuring in $(TARGET_SUBDIR)/libffi; \
+	cd "$(TARGET_SUBDIR)/libffi" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libffi/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libffi"; \
+	libsrcdir="$$s/libffi"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif target-libffi
+
+
+
+
+
+.PHONY: all-target-libffi maybe-all-target-libffi
+maybe-all-target-libffi:
+@if gcc-bootstrap
+all-target-libffi: stage_current
+@endif gcc-bootstrap
+@if target-libffi
+TARGET-target-libffi=all
+maybe-all-target-libffi: all-target-libffi
+all-target-libffi: configure-target-libffi
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	(cd $(TARGET_SUBDIR)/libffi && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+		$(TARGET-target-libffi))
+@endif target-libffi
+
+
+
+
+
+.PHONY: check-target-libffi maybe-check-target-libffi
+maybe-check-target-libffi:
+@if target-libffi
+maybe-check-target-libffi: check-target-libffi
+
+check-target-libffi:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libffi && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-libffi
+
+.PHONY: install-target-libffi maybe-install-target-libffi
+maybe-install-target-libffi:
+@if target-libffi
+maybe-install-target-libffi: install-target-libffi
+
+install-target-libffi: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libffi && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libffi
+
+.PHONY: install-strip-target-libffi maybe-install-strip-target-libffi
+maybe-install-strip-target-libffi:
+@if target-libffi
+maybe-install-strip-target-libffi: install-strip-target-libffi
+
+install-strip-target-libffi: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libffi && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libffi
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libffi info-target-libffi
+maybe-info-target-libffi:
+@if target-libffi
+maybe-info-target-libffi: info-target-libffi
+
+info-target-libffi: \
+    configure-target-libffi 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing info in $(TARGET_SUBDIR)/libffi" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libffi && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           info) \
+	  || exit 1
+
+@endif target-libffi
+
+.PHONY: maybe-dvi-target-libffi dvi-target-libffi
+maybe-dvi-target-libffi:
+@if target-libffi
+maybe-dvi-target-libffi: dvi-target-libffi
+
+dvi-target-libffi: \
+    configure-target-libffi 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing dvi in $(TARGET_SUBDIR)/libffi" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libffi && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           dvi) \
+	  || exit 1
+
+@endif target-libffi
+
+.PHONY: maybe-pdf-target-libffi pdf-target-libffi
+maybe-pdf-target-libffi:
+@if target-libffi
+maybe-pdf-target-libffi: pdf-target-libffi
+
+pdf-target-libffi: \
+    configure-target-libffi 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing pdf in $(TARGET_SUBDIR)/libffi" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libffi && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           pdf) \
+	  || exit 1
+
+@endif target-libffi
+
+.PHONY: maybe-html-target-libffi html-target-libffi
+maybe-html-target-libffi:
+@if target-libffi
+maybe-html-target-libffi: html-target-libffi
+
+html-target-libffi: \
+    configure-target-libffi 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing html in $(TARGET_SUBDIR)/libffi" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libffi && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           html) \
+	  || exit 1
+
+@endif target-libffi
+
+.PHONY: maybe-TAGS-target-libffi TAGS-target-libffi
+maybe-TAGS-target-libffi:
+@if target-libffi
+maybe-TAGS-target-libffi: TAGS-target-libffi
+
+TAGS-target-libffi: \
+    configure-target-libffi 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/libffi" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libffi && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           TAGS) \
+	  || exit 1
+
+@endif target-libffi
+
+.PHONY: maybe-install-info-target-libffi install-info-target-libffi
+maybe-install-info-target-libffi:
+@if target-libffi
+maybe-install-info-target-libffi: install-info-target-libffi
+
+install-info-target-libffi: \
+    configure-target-libffi \
+    info-target-libffi 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-info in $(TARGET_SUBDIR)/libffi" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libffi && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-info) \
+	  || exit 1
+
+@endif target-libffi
+
+.PHONY: maybe-install-pdf-target-libffi install-pdf-target-libffi
+maybe-install-pdf-target-libffi:
+@if target-libffi
+maybe-install-pdf-target-libffi: install-pdf-target-libffi
+
+install-pdf-target-libffi: \
+    configure-target-libffi \
+    pdf-target-libffi 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libffi" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libffi && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-pdf) \
+	  || exit 1
+
+@endif target-libffi
+
+.PHONY: maybe-install-html-target-libffi install-html-target-libffi
+maybe-install-html-target-libffi:
+@if target-libffi
+maybe-install-html-target-libffi: install-html-target-libffi
+
+install-html-target-libffi: \
+    configure-target-libffi \
+    html-target-libffi 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libffi" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libffi && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-html) \
+	  || exit 1
+
+@endif target-libffi
+
+.PHONY: maybe-installcheck-target-libffi installcheck-target-libffi
+maybe-installcheck-target-libffi:
+@if target-libffi
+maybe-installcheck-target-libffi: installcheck-target-libffi
+
+installcheck-target-libffi: \
+    configure-target-libffi 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/libffi" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libffi && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           installcheck) \
+	  || exit 1
+
+@endif target-libffi
+
+.PHONY: maybe-mostlyclean-target-libffi mostlyclean-target-libffi
+maybe-mostlyclean-target-libffi:
+@if target-libffi
+maybe-mostlyclean-target-libffi: mostlyclean-target-libffi
+
+mostlyclean-target-libffi: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libffi" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libffi && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           mostlyclean) \
+	  || exit 1
+
+@endif target-libffi
+
+.PHONY: maybe-clean-target-libffi clean-target-libffi
+maybe-clean-target-libffi:
+@if target-libffi
+maybe-clean-target-libffi: clean-target-libffi
+
+clean-target-libffi: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing clean in $(TARGET_SUBDIR)/libffi" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libffi && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           clean) \
+	  || exit 1
+
+@endif target-libffi
+
+.PHONY: maybe-distclean-target-libffi distclean-target-libffi
+maybe-distclean-target-libffi:
+@if target-libffi
+maybe-distclean-target-libffi: distclean-target-libffi
+
+distclean-target-libffi: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing distclean in $(TARGET_SUBDIR)/libffi" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libffi && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           distclean) \
+	  || exit 1
+
+@endif target-libffi
+
+.PHONY: maybe-maintainer-clean-target-libffi maintainer-clean-target-libffi
+maybe-maintainer-clean-target-libffi:
+@if target-libffi
+maybe-maintainer-clean-target-libffi: maintainer-clean-target-libffi
+
+maintainer-clean-target-libffi: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libffi" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libffi && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           maintainer-clean) \
+	  || exit 1
+
+@endif target-libffi
+
+
+
+
+
+.PHONY: configure-target-libjava maybe-configure-target-libjava
+maybe-configure-target-libjava:
+@if gcc-bootstrap
+configure-target-libjava: stage_current
+@endif gcc-bootstrap
+@if target-libjava
+maybe-configure-target-libjava: configure-target-libjava
+configure-target-libjava: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libjava..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libjava/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libjava/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libjava/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libjava/Makefile; \
+	    mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
+	$(RAW_CXX_TARGET_EXPORTS)  \
+	echo Configuring in $(TARGET_SUBDIR)/libjava; \
+	cd "$(TARGET_SUBDIR)/libjava" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libjava/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libjava"; \
+	libsrcdir="$$s/libjava"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption} $(EXTRA_CONFIGARGS_LIBJAVA) \
+	  || exit 1
+@endif target-libjava
+
+
+
+
+
+.PHONY: all-target-libjava maybe-all-target-libjava
+maybe-all-target-libjava:
+@if gcc-bootstrap
+all-target-libjava: stage_current
+@endif gcc-bootstrap
+@if target-libjava
+TARGET-target-libjava=all
+maybe-all-target-libjava: all-target-libjava
+all-target-libjava: configure-target-libjava
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS)  \
+	(cd $(TARGET_SUBDIR)/libjava && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+		$(TARGET-target-libjava))
+@endif target-libjava
+
+
+
+
+
+.PHONY: check-target-libjava maybe-check-target-libjava
+maybe-check-target-libjava:
+@if target-libjava
+maybe-check-target-libjava: check-target-libjava
+
+check-target-libjava:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libjava && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
+
+@endif target-libjava
+
+.PHONY: install-target-libjava maybe-install-target-libjava
+maybe-install-target-libjava:
+@if target-libjava
+maybe-install-target-libjava: install-target-libjava
+
+install-target-libjava: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libjava && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libjava
+
+.PHONY: install-strip-target-libjava maybe-install-strip-target-libjava
+maybe-install-strip-target-libjava:
+@if target-libjava
+maybe-install-strip-target-libjava: install-strip-target-libjava
+
+install-strip-target-libjava: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libjava && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libjava
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libjava info-target-libjava
+maybe-info-target-libjava:
+@if target-libjava
+maybe-info-target-libjava: info-target-libjava
+
+info-target-libjava: \
+    configure-target-libjava 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing info in $(TARGET_SUBDIR)/libjava" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libjava && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           info) \
+	  || exit 1
+
+@endif target-libjava
+
+.PHONY: maybe-dvi-target-libjava dvi-target-libjava
+maybe-dvi-target-libjava:
+@if target-libjava
+maybe-dvi-target-libjava: dvi-target-libjava
+
+dvi-target-libjava: \
+    configure-target-libjava 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing dvi in $(TARGET_SUBDIR)/libjava" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libjava && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           dvi) \
+	  || exit 1
+
+@endif target-libjava
+
+.PHONY: maybe-pdf-target-libjava pdf-target-libjava
+maybe-pdf-target-libjava:
+@if target-libjava
+maybe-pdf-target-libjava: pdf-target-libjava
+
+pdf-target-libjava: \
+    configure-target-libjava 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing pdf in $(TARGET_SUBDIR)/libjava" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libjava && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           pdf) \
+	  || exit 1
+
+@endif target-libjava
+
+.PHONY: maybe-html-target-libjava html-target-libjava
+maybe-html-target-libjava:
+@if target-libjava
+maybe-html-target-libjava: html-target-libjava
+
+html-target-libjava: \
+    configure-target-libjava 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing html in $(TARGET_SUBDIR)/libjava" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libjava && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           html) \
+	  || exit 1
+
+@endif target-libjava
+
+.PHONY: maybe-TAGS-target-libjava TAGS-target-libjava
+maybe-TAGS-target-libjava:
+@if target-libjava
+maybe-TAGS-target-libjava: TAGS-target-libjava
+
+TAGS-target-libjava: \
+    configure-target-libjava 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/libjava" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libjava && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           TAGS) \
+	  || exit 1
+
+@endif target-libjava
+
+.PHONY: maybe-install-info-target-libjava install-info-target-libjava
+maybe-install-info-target-libjava:
+@if target-libjava
+maybe-install-info-target-libjava: install-info-target-libjava
+
+install-info-target-libjava: \
+    configure-target-libjava \
+    info-target-libjava 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing install-info in $(TARGET_SUBDIR)/libjava" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libjava && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-info) \
+	  || exit 1
+
+@endif target-libjava
+
+.PHONY: maybe-install-pdf-target-libjava install-pdf-target-libjava
+maybe-install-pdf-target-libjava:
+@if target-libjava
+maybe-install-pdf-target-libjava: install-pdf-target-libjava
+
+install-pdf-target-libjava: \
+    configure-target-libjava \
+    pdf-target-libjava 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libjava" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libjava && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-pdf) \
+	  || exit 1
+
+@endif target-libjava
+
+.PHONY: maybe-install-html-target-libjava install-html-target-libjava
+maybe-install-html-target-libjava:
+@if target-libjava
+maybe-install-html-target-libjava: install-html-target-libjava
+
+install-html-target-libjava: \
+    configure-target-libjava \
+    html-target-libjava 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libjava" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libjava && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-html) \
+	  || exit 1
+
+@endif target-libjava
+
+.PHONY: maybe-installcheck-target-libjava installcheck-target-libjava
+maybe-installcheck-target-libjava:
+@if target-libjava
+maybe-installcheck-target-libjava: installcheck-target-libjava
+
+installcheck-target-libjava: \
+    configure-target-libjava 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/libjava" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libjava && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           installcheck) \
+	  || exit 1
+
+@endif target-libjava
+
+.PHONY: maybe-mostlyclean-target-libjava mostlyclean-target-libjava
+maybe-mostlyclean-target-libjava:
+@if target-libjava
+maybe-mostlyclean-target-libjava: mostlyclean-target-libjava
+
+mostlyclean-target-libjava: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libjava" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libjava && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           mostlyclean) \
+	  || exit 1
+
+@endif target-libjava
+
+.PHONY: maybe-clean-target-libjava clean-target-libjava
+maybe-clean-target-libjava:
+@if target-libjava
+maybe-clean-target-libjava: clean-target-libjava
+
+clean-target-libjava: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing clean in $(TARGET_SUBDIR)/libjava" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libjava && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           clean) \
+	  || exit 1
+
+@endif target-libjava
+
+.PHONY: maybe-distclean-target-libjava distclean-target-libjava
+maybe-distclean-target-libjava:
+@if target-libjava
+maybe-distclean-target-libjava: distclean-target-libjava
+
+distclean-target-libjava: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing distclean in $(TARGET_SUBDIR)/libjava" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libjava && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           distclean) \
+	  || exit 1
+
+@endif target-libjava
+
+.PHONY: maybe-maintainer-clean-target-libjava maintainer-clean-target-libjava
+maybe-maintainer-clean-target-libjava:
+@if target-libjava
+maybe-maintainer-clean-target-libjava: maintainer-clean-target-libjava
+
+maintainer-clean-target-libjava: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libjava" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libjava && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           maintainer-clean) \
+	  || exit 1
+
+@endif target-libjava
+
+
+
+
+
+.PHONY: configure-target-zlib maybe-configure-target-zlib
+maybe-configure-target-zlib:
+@if gcc-bootstrap
+configure-target-zlib: stage_current
+@endif gcc-bootstrap
+@if target-zlib
+maybe-configure-target-zlib: configure-target-zlib
+configure-target-zlib: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for zlib..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/zlib/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/zlib/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/zlib/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/zlib/Makefile; \
+	    mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	echo Configuring in $(TARGET_SUBDIR)/zlib; \
+	cd "$(TARGET_SUBDIR)/zlib" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/zlib/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/zlib"; \
+	libsrcdir="$$s/zlib"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif target-zlib
+
+
+
+
+
+.PHONY: all-target-zlib maybe-all-target-zlib
+maybe-all-target-zlib:
+@if gcc-bootstrap
+all-target-zlib: stage_current
+@endif gcc-bootstrap
+@if target-zlib
+TARGET-target-zlib=all
+maybe-all-target-zlib: all-target-zlib
+all-target-zlib: configure-target-zlib
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	(cd $(TARGET_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+		$(TARGET-target-zlib))
+@endif target-zlib
+
+
+
+
+
+.PHONY: check-target-zlib maybe-check-target-zlib
+maybe-check-target-zlib:
+@if target-zlib
+maybe-check-target-zlib: check-target-zlib
+
+check-target-zlib:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/zlib && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-zlib
+
+.PHONY: install-target-zlib maybe-install-target-zlib
+maybe-install-target-zlib:
+@if target-zlib
+maybe-install-target-zlib: install-target-zlib
+
+install-target-zlib: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/zlib && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-zlib
+
+.PHONY: install-strip-target-zlib maybe-install-strip-target-zlib
+maybe-install-strip-target-zlib:
+@if target-zlib
+maybe-install-strip-target-zlib: install-strip-target-zlib
+
+install-strip-target-zlib: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/zlib && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-zlib
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-zlib info-target-zlib
+maybe-info-target-zlib:
+@if target-zlib
+maybe-info-target-zlib: info-target-zlib
+
+info-target-zlib: \
+    configure-target-zlib 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing info in $(TARGET_SUBDIR)/zlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           info) \
+	  || exit 1
+
+@endif target-zlib
+
+.PHONY: maybe-dvi-target-zlib dvi-target-zlib
+maybe-dvi-target-zlib:
+@if target-zlib
+maybe-dvi-target-zlib: dvi-target-zlib
+
+dvi-target-zlib: \
+    configure-target-zlib 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing dvi in $(TARGET_SUBDIR)/zlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           dvi) \
+	  || exit 1
+
+@endif target-zlib
+
+.PHONY: maybe-pdf-target-zlib pdf-target-zlib
+maybe-pdf-target-zlib:
+@if target-zlib
+maybe-pdf-target-zlib: pdf-target-zlib
+
+pdf-target-zlib: \
+    configure-target-zlib 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing pdf in $(TARGET_SUBDIR)/zlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           pdf) \
+	  || exit 1
+
+@endif target-zlib
+
+.PHONY: maybe-html-target-zlib html-target-zlib
+maybe-html-target-zlib:
+@if target-zlib
+maybe-html-target-zlib: html-target-zlib
+
+html-target-zlib: \
+    configure-target-zlib 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing html in $(TARGET_SUBDIR)/zlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           html) \
+	  || exit 1
+
+@endif target-zlib
+
+.PHONY: maybe-TAGS-target-zlib TAGS-target-zlib
+maybe-TAGS-target-zlib:
+@if target-zlib
+maybe-TAGS-target-zlib: TAGS-target-zlib
+
+TAGS-target-zlib: \
+    configure-target-zlib 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/zlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           TAGS) \
+	  || exit 1
+
+@endif target-zlib
+
+.PHONY: maybe-install-info-target-zlib install-info-target-zlib
+maybe-install-info-target-zlib:
+@if target-zlib
+maybe-install-info-target-zlib: install-info-target-zlib
+
+install-info-target-zlib: \
+    configure-target-zlib \
+    info-target-zlib 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-info in $(TARGET_SUBDIR)/zlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-info) \
+	  || exit 1
+
+@endif target-zlib
+
+.PHONY: maybe-install-pdf-target-zlib install-pdf-target-zlib
+maybe-install-pdf-target-zlib:
+@if target-zlib
+maybe-install-pdf-target-zlib: install-pdf-target-zlib
+
+install-pdf-target-zlib: \
+    configure-target-zlib \
+    pdf-target-zlib 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/zlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-pdf) \
+	  || exit 1
+
+@endif target-zlib
+
+.PHONY: maybe-install-html-target-zlib install-html-target-zlib
+maybe-install-html-target-zlib:
+@if target-zlib
+maybe-install-html-target-zlib: install-html-target-zlib
+
+install-html-target-zlib: \
+    configure-target-zlib \
+    html-target-zlib 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/zlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-html) \
+	  || exit 1
+
+@endif target-zlib
+
+.PHONY: maybe-installcheck-target-zlib installcheck-target-zlib
+maybe-installcheck-target-zlib:
+@if target-zlib
+maybe-installcheck-target-zlib: installcheck-target-zlib
+
+installcheck-target-zlib: \
+    configure-target-zlib 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/zlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           installcheck) \
+	  || exit 1
+
+@endif target-zlib
+
+.PHONY: maybe-mostlyclean-target-zlib mostlyclean-target-zlib
+maybe-mostlyclean-target-zlib:
+@if target-zlib
+maybe-mostlyclean-target-zlib: mostlyclean-target-zlib
+
+mostlyclean-target-zlib: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/zlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           mostlyclean) \
+	  || exit 1
+
+@endif target-zlib
+
+.PHONY: maybe-clean-target-zlib clean-target-zlib
+maybe-clean-target-zlib:
+@if target-zlib
+maybe-clean-target-zlib: clean-target-zlib
+
+clean-target-zlib: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing clean in $(TARGET_SUBDIR)/zlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           clean) \
+	  || exit 1
+
+@endif target-zlib
+
+.PHONY: maybe-distclean-target-zlib distclean-target-zlib
+maybe-distclean-target-zlib:
+@if target-zlib
+maybe-distclean-target-zlib: distclean-target-zlib
+
+distclean-target-zlib: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing distclean in $(TARGET_SUBDIR)/zlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           distclean) \
+	  || exit 1
+
+@endif target-zlib
+
+.PHONY: maybe-maintainer-clean-target-zlib maintainer-clean-target-zlib
+maybe-maintainer-clean-target-zlib:
+@if target-zlib
+maybe-maintainer-clean-target-zlib: maintainer-clean-target-zlib
+
+maintainer-clean-target-zlib: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/zlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           maintainer-clean) \
+	  || exit 1
+
+@endif target-zlib
+
+
+
+
+
+.PHONY: configure-target-boehm-gc maybe-configure-target-boehm-gc
+maybe-configure-target-boehm-gc:
+@if gcc-bootstrap
+configure-target-boehm-gc: stage_current
+@endif gcc-bootstrap
+@if target-boehm-gc
+maybe-configure-target-boehm-gc: configure-target-boehm-gc
+configure-target-boehm-gc: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for boehm-gc..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/boehm-gc/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/boehm-gc/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/boehm-gc/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/boehm-gc/Makefile; \
+	    mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \
+	cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/boehm-gc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/boehm-gc"; \
+	libsrcdir="$$s/boehm-gc"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif target-boehm-gc
+
+
+
+
+
+.PHONY: all-target-boehm-gc maybe-all-target-boehm-gc
+maybe-all-target-boehm-gc:
+@if gcc-bootstrap
+all-target-boehm-gc: stage_current
+@endif gcc-bootstrap
+@if target-boehm-gc
+TARGET-target-boehm-gc=all
+maybe-all-target-boehm-gc: all-target-boehm-gc
+all-target-boehm-gc: configure-target-boehm-gc
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	(cd $(TARGET_SUBDIR)/boehm-gc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+		$(TARGET-target-boehm-gc))
+@endif target-boehm-gc
+
+
+
+
+
+.PHONY: check-target-boehm-gc maybe-check-target-boehm-gc
+maybe-check-target-boehm-gc:
+@if target-boehm-gc
+maybe-check-target-boehm-gc: check-target-boehm-gc
+
+check-target-boehm-gc:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/boehm-gc && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-boehm-gc
+
+.PHONY: install-target-boehm-gc maybe-install-target-boehm-gc
+maybe-install-target-boehm-gc:
+@if target-boehm-gc
+maybe-install-target-boehm-gc: install-target-boehm-gc
+
+install-target-boehm-gc: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/boehm-gc && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-boehm-gc
+
+.PHONY: install-strip-target-boehm-gc maybe-install-strip-target-boehm-gc
+maybe-install-strip-target-boehm-gc:
+@if target-boehm-gc
+maybe-install-strip-target-boehm-gc: install-strip-target-boehm-gc
+
+install-strip-target-boehm-gc: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/boehm-gc && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-boehm-gc
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-boehm-gc info-target-boehm-gc
+maybe-info-target-boehm-gc:
+@if target-boehm-gc
+maybe-info-target-boehm-gc: info-target-boehm-gc
+
+info-target-boehm-gc: \
+    configure-target-boehm-gc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing info in $(TARGET_SUBDIR)/boehm-gc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/boehm-gc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           info) \
+	  || exit 1
+
+@endif target-boehm-gc
+
+.PHONY: maybe-dvi-target-boehm-gc dvi-target-boehm-gc
+maybe-dvi-target-boehm-gc:
+@if target-boehm-gc
+maybe-dvi-target-boehm-gc: dvi-target-boehm-gc
+
+dvi-target-boehm-gc: \
+    configure-target-boehm-gc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing dvi in $(TARGET_SUBDIR)/boehm-gc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/boehm-gc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           dvi) \
+	  || exit 1
+
+@endif target-boehm-gc
+
+.PHONY: maybe-pdf-target-boehm-gc pdf-target-boehm-gc
+maybe-pdf-target-boehm-gc:
+@if target-boehm-gc
+maybe-pdf-target-boehm-gc: pdf-target-boehm-gc
+
+pdf-target-boehm-gc: \
+    configure-target-boehm-gc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing pdf in $(TARGET_SUBDIR)/boehm-gc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/boehm-gc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           pdf) \
+	  || exit 1
+
+@endif target-boehm-gc
+
+.PHONY: maybe-html-target-boehm-gc html-target-boehm-gc
+maybe-html-target-boehm-gc:
+@if target-boehm-gc
+maybe-html-target-boehm-gc: html-target-boehm-gc
+
+html-target-boehm-gc: \
+    configure-target-boehm-gc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing html in $(TARGET_SUBDIR)/boehm-gc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/boehm-gc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           html) \
+	  || exit 1
+
+@endif target-boehm-gc
+
+.PHONY: maybe-TAGS-target-boehm-gc TAGS-target-boehm-gc
+maybe-TAGS-target-boehm-gc:
+@if target-boehm-gc
+maybe-TAGS-target-boehm-gc: TAGS-target-boehm-gc
+
+TAGS-target-boehm-gc: \
+    configure-target-boehm-gc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/boehm-gc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/boehm-gc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           TAGS) \
+	  || exit 1
+
+@endif target-boehm-gc
+
+.PHONY: maybe-install-info-target-boehm-gc install-info-target-boehm-gc
+maybe-install-info-target-boehm-gc:
+@if target-boehm-gc
+maybe-install-info-target-boehm-gc: install-info-target-boehm-gc
+
+install-info-target-boehm-gc: \
+    configure-target-boehm-gc \
+    info-target-boehm-gc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-info in $(TARGET_SUBDIR)/boehm-gc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/boehm-gc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-info) \
+	  || exit 1
+
+@endif target-boehm-gc
+
+.PHONY: maybe-install-pdf-target-boehm-gc install-pdf-target-boehm-gc
+maybe-install-pdf-target-boehm-gc:
+@if target-boehm-gc
+maybe-install-pdf-target-boehm-gc: install-pdf-target-boehm-gc
+
+install-pdf-target-boehm-gc: \
+    configure-target-boehm-gc \
+    pdf-target-boehm-gc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/boehm-gc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/boehm-gc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-pdf) \
+	  || exit 1
+
+@endif target-boehm-gc
+
+.PHONY: maybe-install-html-target-boehm-gc install-html-target-boehm-gc
+maybe-install-html-target-boehm-gc:
+@if target-boehm-gc
+maybe-install-html-target-boehm-gc: install-html-target-boehm-gc
+
+install-html-target-boehm-gc: \
+    configure-target-boehm-gc \
+    html-target-boehm-gc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/boehm-gc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/boehm-gc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-html) \
+	  || exit 1
+
+@endif target-boehm-gc
+
+.PHONY: maybe-installcheck-target-boehm-gc installcheck-target-boehm-gc
+maybe-installcheck-target-boehm-gc:
+@if target-boehm-gc
+maybe-installcheck-target-boehm-gc: installcheck-target-boehm-gc
+
+installcheck-target-boehm-gc: \
+    configure-target-boehm-gc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/boehm-gc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/boehm-gc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           installcheck) \
+	  || exit 1
+
+@endif target-boehm-gc
+
+.PHONY: maybe-mostlyclean-target-boehm-gc mostlyclean-target-boehm-gc
+maybe-mostlyclean-target-boehm-gc:
+@if target-boehm-gc
+maybe-mostlyclean-target-boehm-gc: mostlyclean-target-boehm-gc
+
+mostlyclean-target-boehm-gc: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/boehm-gc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/boehm-gc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           mostlyclean) \
+	  || exit 1
+
+@endif target-boehm-gc
+
+.PHONY: maybe-clean-target-boehm-gc clean-target-boehm-gc
+maybe-clean-target-boehm-gc:
+@if target-boehm-gc
+maybe-clean-target-boehm-gc: clean-target-boehm-gc
+
+clean-target-boehm-gc: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing clean in $(TARGET_SUBDIR)/boehm-gc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/boehm-gc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           clean) \
+	  || exit 1
+
+@endif target-boehm-gc
+
+.PHONY: maybe-distclean-target-boehm-gc distclean-target-boehm-gc
+maybe-distclean-target-boehm-gc:
+@if target-boehm-gc
+maybe-distclean-target-boehm-gc: distclean-target-boehm-gc
+
+distclean-target-boehm-gc: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing distclean in $(TARGET_SUBDIR)/boehm-gc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/boehm-gc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           distclean) \
+	  || exit 1
+
+@endif target-boehm-gc
+
+.PHONY: maybe-maintainer-clean-target-boehm-gc maintainer-clean-target-boehm-gc
+maybe-maintainer-clean-target-boehm-gc:
+@if target-boehm-gc
+maybe-maintainer-clean-target-boehm-gc: maintainer-clean-target-boehm-gc
+
+maintainer-clean-target-boehm-gc: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/boehm-gc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/boehm-gc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           maintainer-clean) \
+	  || exit 1
+
+@endif target-boehm-gc
+
+
+
+
+
+.PHONY: configure-target-rda maybe-configure-target-rda
+maybe-configure-target-rda:
+@if gcc-bootstrap
+configure-target-rda: stage_current
+@endif gcc-bootstrap
+@if target-rda
+maybe-configure-target-rda: configure-target-rda
+configure-target-rda: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for rda..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/rda/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/rda/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/rda/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/rda/Makefile; \
+	    mv $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	echo Configuring in $(TARGET_SUBDIR)/rda; \
+	cd "$(TARGET_SUBDIR)/rda" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/rda/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/rda"; \
+	libsrcdir="$$s/rda"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif target-rda
+
+
+
+
+
+.PHONY: all-target-rda maybe-all-target-rda
+maybe-all-target-rda:
+@if gcc-bootstrap
+all-target-rda: stage_current
+@endif gcc-bootstrap
+@if target-rda
+TARGET-target-rda=all
+maybe-all-target-rda: all-target-rda
+all-target-rda: configure-target-rda
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	(cd $(TARGET_SUBDIR)/rda && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+		$(TARGET-target-rda))
+@endif target-rda
+
+
+
+
+
+.PHONY: check-target-rda maybe-check-target-rda
+maybe-check-target-rda:
+@if target-rda
+maybe-check-target-rda: check-target-rda
+
+check-target-rda:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/rda && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-rda
+
+.PHONY: install-target-rda maybe-install-target-rda
+maybe-install-target-rda:
+@if target-rda
+maybe-install-target-rda: install-target-rda
+
+install-target-rda: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/rda && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-rda
+
+.PHONY: install-strip-target-rda maybe-install-strip-target-rda
+maybe-install-strip-target-rda:
+@if target-rda
+maybe-install-strip-target-rda: install-strip-target-rda
+
+install-strip-target-rda: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/rda && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-rda
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-rda info-target-rda
+maybe-info-target-rda:
+@if target-rda
+maybe-info-target-rda: info-target-rda
+
+info-target-rda: \
+    configure-target-rda 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing info in $(TARGET_SUBDIR)/rda" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/rda && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           info) \
+	  || exit 1
+
+@endif target-rda
+
+.PHONY: maybe-dvi-target-rda dvi-target-rda
+maybe-dvi-target-rda:
+@if target-rda
+maybe-dvi-target-rda: dvi-target-rda
+
+dvi-target-rda: \
+    configure-target-rda 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing dvi in $(TARGET_SUBDIR)/rda" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/rda && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           dvi) \
+	  || exit 1
+
+@endif target-rda
+
+.PHONY: maybe-pdf-target-rda pdf-target-rda
+maybe-pdf-target-rda:
+@if target-rda
+maybe-pdf-target-rda: pdf-target-rda
+
+pdf-target-rda: \
+    configure-target-rda 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing pdf in $(TARGET_SUBDIR)/rda" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/rda && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           pdf) \
+	  || exit 1
+
+@endif target-rda
+
+.PHONY: maybe-html-target-rda html-target-rda
+maybe-html-target-rda:
+@if target-rda
+maybe-html-target-rda: html-target-rda
+
+html-target-rda: \
+    configure-target-rda 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing html in $(TARGET_SUBDIR)/rda" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/rda && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           html) \
+	  || exit 1
+
+@endif target-rda
+
+.PHONY: maybe-TAGS-target-rda TAGS-target-rda
+maybe-TAGS-target-rda:
+@if target-rda
+maybe-TAGS-target-rda: TAGS-target-rda
+
+TAGS-target-rda: \
+    configure-target-rda 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/rda" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/rda && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           TAGS) \
+	  || exit 1
+
+@endif target-rda
+
+.PHONY: maybe-install-info-target-rda install-info-target-rda
+maybe-install-info-target-rda:
+@if target-rda
+maybe-install-info-target-rda: install-info-target-rda
+
+install-info-target-rda: \
+    configure-target-rda \
+    info-target-rda 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-info in $(TARGET_SUBDIR)/rda" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/rda && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-info) \
+	  || exit 1
+
+@endif target-rda
+
+.PHONY: maybe-install-pdf-target-rda install-pdf-target-rda
+maybe-install-pdf-target-rda:
+@if target-rda
+maybe-install-pdf-target-rda: install-pdf-target-rda
+
+install-pdf-target-rda: \
+    configure-target-rda \
+    pdf-target-rda 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/rda" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/rda && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-pdf) \
+	  || exit 1
+
+@endif target-rda
+
+.PHONY: maybe-install-html-target-rda install-html-target-rda
+maybe-install-html-target-rda:
+@if target-rda
+maybe-install-html-target-rda: install-html-target-rda
+
+install-html-target-rda: \
+    configure-target-rda \
+    html-target-rda 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/rda" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/rda && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-html) \
+	  || exit 1
+
+@endif target-rda
+
+.PHONY: maybe-installcheck-target-rda installcheck-target-rda
+maybe-installcheck-target-rda:
+@if target-rda
+maybe-installcheck-target-rda: installcheck-target-rda
+
+installcheck-target-rda: \
+    configure-target-rda 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/rda" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/rda && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           installcheck) \
+	  || exit 1
+
+@endif target-rda
+
+.PHONY: maybe-mostlyclean-target-rda mostlyclean-target-rda
+maybe-mostlyclean-target-rda:
+@if target-rda
+maybe-mostlyclean-target-rda: mostlyclean-target-rda
+
+mostlyclean-target-rda: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/rda" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/rda && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           mostlyclean) \
+	  || exit 1
+
+@endif target-rda
+
+.PHONY: maybe-clean-target-rda clean-target-rda
+maybe-clean-target-rda:
+@if target-rda
+maybe-clean-target-rda: clean-target-rda
+
+clean-target-rda: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing clean in $(TARGET_SUBDIR)/rda" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/rda && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           clean) \
+	  || exit 1
+
+@endif target-rda
+
+.PHONY: maybe-distclean-target-rda distclean-target-rda
+maybe-distclean-target-rda:
+@if target-rda
+maybe-distclean-target-rda: distclean-target-rda
+
+distclean-target-rda: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing distclean in $(TARGET_SUBDIR)/rda" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/rda && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           distclean) \
+	  || exit 1
+
+@endif target-rda
+
+.PHONY: maybe-maintainer-clean-target-rda maintainer-clean-target-rda
+maybe-maintainer-clean-target-rda:
+@if target-rda
+maybe-maintainer-clean-target-rda: maintainer-clean-target-rda
+
+maintainer-clean-target-rda: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/rda" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/rda && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           maintainer-clean) \
+	  || exit 1
+
+@endif target-rda
+
+
+
+
+
+.PHONY: configure-target-libada maybe-configure-target-libada
+maybe-configure-target-libada:
+@if gcc-bootstrap
+configure-target-libada: stage_current
+@endif gcc-bootstrap
+@if target-libada
+maybe-configure-target-libada: configure-target-libada
+configure-target-libada: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libada..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libada/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libada/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libada/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libada/Makefile; \
+	    mv $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	echo Configuring in $(TARGET_SUBDIR)/libada; \
+	cd "$(TARGET_SUBDIR)/libada" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libada/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libada"; \
+	libsrcdir="$$s/libada"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif target-libada
+
+
+
+
+
+.PHONY: all-target-libada maybe-all-target-libada
+maybe-all-target-libada:
+@if gcc-bootstrap
+all-target-libada: stage_current
+@endif gcc-bootstrap
+@if target-libada
+TARGET-target-libada=all
+maybe-all-target-libada: all-target-libada
+all-target-libada: configure-target-libada
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	(cd $(TARGET_SUBDIR)/libada && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+		$(TARGET-target-libada))
+@endif target-libada
+
+
+
+
+
+.PHONY: check-target-libada maybe-check-target-libada
+maybe-check-target-libada:
+@if target-libada
+maybe-check-target-libada: check-target-libada
+
+check-target-libada:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libada && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-libada
+
+.PHONY: install-target-libada maybe-install-target-libada
+maybe-install-target-libada:
+@if target-libada
+maybe-install-target-libada: install-target-libada
+
+install-target-libada: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libada && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libada
+
+.PHONY: install-strip-target-libada maybe-install-strip-target-libada
+maybe-install-strip-target-libada:
+@if target-libada
+maybe-install-strip-target-libada: install-strip-target-libada
+
+install-strip-target-libada: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libada && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libada
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libada info-target-libada
+maybe-info-target-libada:
+@if target-libada
+maybe-info-target-libada: info-target-libada
+
+info-target-libada: \
+    configure-target-libada 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing info in $(TARGET_SUBDIR)/libada" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libada && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           info) \
+	  || exit 1
+
+@endif target-libada
+
+.PHONY: maybe-dvi-target-libada dvi-target-libada
+maybe-dvi-target-libada:
+@if target-libada
+maybe-dvi-target-libada: dvi-target-libada
+
+dvi-target-libada: \
+    configure-target-libada 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing dvi in $(TARGET_SUBDIR)/libada" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libada && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           dvi) \
+	  || exit 1
+
+@endif target-libada
+
+.PHONY: maybe-pdf-target-libada pdf-target-libada
+maybe-pdf-target-libada:
+@if target-libada
+maybe-pdf-target-libada: pdf-target-libada
+
+pdf-target-libada: \
+    configure-target-libada 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing pdf in $(TARGET_SUBDIR)/libada" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libada && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           pdf) \
+	  || exit 1
+
+@endif target-libada
+
+.PHONY: maybe-html-target-libada html-target-libada
+maybe-html-target-libada:
+@if target-libada
+maybe-html-target-libada: html-target-libada
+
+html-target-libada: \
+    configure-target-libada 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing html in $(TARGET_SUBDIR)/libada" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libada && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           html) \
+	  || exit 1
+
+@endif target-libada
+
+.PHONY: maybe-TAGS-target-libada TAGS-target-libada
+maybe-TAGS-target-libada:
+@if target-libada
+maybe-TAGS-target-libada: TAGS-target-libada
+
+TAGS-target-libada: \
+    configure-target-libada 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/libada" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libada && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           TAGS) \
+	  || exit 1
+
+@endif target-libada
+
+.PHONY: maybe-install-info-target-libada install-info-target-libada
+maybe-install-info-target-libada:
+@if target-libada
+maybe-install-info-target-libada: install-info-target-libada
+
+install-info-target-libada: \
+    configure-target-libada \
+    info-target-libada 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-info in $(TARGET_SUBDIR)/libada" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libada && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-info) \
+	  || exit 1
+
+@endif target-libada
+
+.PHONY: maybe-install-pdf-target-libada install-pdf-target-libada
+maybe-install-pdf-target-libada:
+@if target-libada
+maybe-install-pdf-target-libada: install-pdf-target-libada
+
+install-pdf-target-libada: \
+    configure-target-libada \
+    pdf-target-libada 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libada" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libada && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-pdf) \
+	  || exit 1
+
+@endif target-libada
+
+.PHONY: maybe-install-html-target-libada install-html-target-libada
+maybe-install-html-target-libada:
+@if target-libada
+maybe-install-html-target-libada: install-html-target-libada
+
+install-html-target-libada: \
+    configure-target-libada \
+    html-target-libada 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libada" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libada && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-html) \
+	  || exit 1
+
+@endif target-libada
+
+.PHONY: maybe-installcheck-target-libada installcheck-target-libada
+maybe-installcheck-target-libada:
+@if target-libada
+maybe-installcheck-target-libada: installcheck-target-libada
+
+installcheck-target-libada: \
+    configure-target-libada 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/libada" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libada && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           installcheck) \
+	  || exit 1
+
+@endif target-libada
+
+.PHONY: maybe-mostlyclean-target-libada mostlyclean-target-libada
+maybe-mostlyclean-target-libada:
+@if target-libada
+maybe-mostlyclean-target-libada: mostlyclean-target-libada
+
+mostlyclean-target-libada: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libada" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libada && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           mostlyclean) \
+	  || exit 1
+
+@endif target-libada
+
+.PHONY: maybe-clean-target-libada clean-target-libada
+maybe-clean-target-libada:
+@if target-libada
+maybe-clean-target-libada: clean-target-libada
+
+clean-target-libada: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing clean in $(TARGET_SUBDIR)/libada" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libada && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           clean) \
+	  || exit 1
+
+@endif target-libada
+
+.PHONY: maybe-distclean-target-libada distclean-target-libada
+maybe-distclean-target-libada:
+@if target-libada
+maybe-distclean-target-libada: distclean-target-libada
+
+distclean-target-libada: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing distclean in $(TARGET_SUBDIR)/libada" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libada && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           distclean) \
+	  || exit 1
+
+@endif target-libada
+
+.PHONY: maybe-maintainer-clean-target-libada maintainer-clean-target-libada
+maybe-maintainer-clean-target-libada:
+@if target-libada
+maybe-maintainer-clean-target-libada: maintainer-clean-target-libada
+
+maintainer-clean-target-libada: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libada" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libada && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           maintainer-clean) \
+	  || exit 1
+
+@endif target-libada
+
+
+
+
+
+.PHONY: configure-target-libgomp maybe-configure-target-libgomp
+maybe-configure-target-libgomp:
+@if gcc-bootstrap
+configure-target-libgomp: stage_current
+@endif gcc-bootstrap
+@if target-libgomp
+maybe-configure-target-libgomp: configure-target-libgomp
+configure-target-libgomp: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libgomp..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \
+	    mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	echo Configuring in $(TARGET_SUBDIR)/libgomp; \
+	cd "$(TARGET_SUBDIR)/libgomp" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libgomp"; \
+	libsrcdir="$$s/libgomp"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption}  \
+	  || exit 1
+@endif target-libgomp
+
+
+
+.PHONY: configure-stage1-target-libgomp maybe-configure-stage1-target-libgomp
+maybe-configure-stage1-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-configure-stage1-target-libgomp: configure-stage1-target-libgomp
+configure-stage1-target-libgomp:
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	echo "Checking multilib configuration for libgomp..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \
+	    mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
+	$(NORMAL_TARGET_EXPORTS) \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+	echo Configuring stage 1 in $(TARGET_SUBDIR)/libgomp ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
+	cd $(TARGET_SUBDIR)/libgomp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libgomp"; \
+	libsrcdir="$$s/libgomp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  $(STAGE1_CONFIGURE_FLAGS)
+@endif target-libgomp-bootstrap
+
+.PHONY: configure-stage2-target-libgomp maybe-configure-stage2-target-libgomp
+maybe-configure-stage2-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-configure-stage2-target-libgomp: configure-stage2-target-libgomp
+configure-stage2-target-libgomp:
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	echo "Checking multilib configuration for libgomp..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \
+	    mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
+	$(NORMAL_TARGET_EXPORTS) \
+	 \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+	echo Configuring stage 2 in $(TARGET_SUBDIR)/libgomp ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
+	cd $(TARGET_SUBDIR)/libgomp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libgomp"; \
+	libsrcdir="$$s/libgomp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE2_CONFIGURE_FLAGS)
+@endif target-libgomp-bootstrap
+
+.PHONY: configure-stage3-target-libgomp maybe-configure-stage3-target-libgomp
+maybe-configure-stage3-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-configure-stage3-target-libgomp: configure-stage3-target-libgomp
+configure-stage3-target-libgomp:
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	echo "Checking multilib configuration for libgomp..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \
+	    mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
+	$(NORMAL_TARGET_EXPORTS) \
+	 \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+	echo Configuring stage 3 in $(TARGET_SUBDIR)/libgomp ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
+	cd $(TARGET_SUBDIR)/libgomp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libgomp"; \
+	libsrcdir="$$s/libgomp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE3_CONFIGURE_FLAGS)
+@endif target-libgomp-bootstrap
+
+.PHONY: configure-stage4-target-libgomp maybe-configure-stage4-target-libgomp
+maybe-configure-stage4-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-configure-stage4-target-libgomp: configure-stage4-target-libgomp
+configure-stage4-target-libgomp:
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	echo "Checking multilib configuration for libgomp..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \
+	    mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
+	$(NORMAL_TARGET_EXPORTS) \
+	 \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+	echo Configuring stage 4 in $(TARGET_SUBDIR)/libgomp ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
+	cd $(TARGET_SUBDIR)/libgomp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libgomp"; \
+	libsrcdir="$$s/libgomp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGE4_CONFIGURE_FLAGS)
+@endif target-libgomp-bootstrap
+
+.PHONY: configure-stageprofile-target-libgomp maybe-configure-stageprofile-target-libgomp
+maybe-configure-stageprofile-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-configure-stageprofile-target-libgomp: configure-stageprofile-target-libgomp
+configure-stageprofile-target-libgomp:
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	echo "Checking multilib configuration for libgomp..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \
+	    mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
+	$(NORMAL_TARGET_EXPORTS) \
+	 \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+	echo Configuring stage profile in $(TARGET_SUBDIR)/libgomp ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
+	cd $(TARGET_SUBDIR)/libgomp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libgomp"; \
+	libsrcdir="$$s/libgomp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEprofile_CONFIGURE_FLAGS)
+@endif target-libgomp-bootstrap
+
+.PHONY: configure-stagefeedback-target-libgomp maybe-configure-stagefeedback-target-libgomp
+maybe-configure-stagefeedback-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-configure-stagefeedback-target-libgomp: configure-stagefeedback-target-libgomp
+configure-stagefeedback-target-libgomp:
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	echo "Checking multilib configuration for libgomp..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \
+	    mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
+	$(NORMAL_TARGET_EXPORTS) \
+	 \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+	echo Configuring stage feedback in $(TARGET_SUBDIR)/libgomp ; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
+	cd $(TARGET_SUBDIR)/libgomp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libgomp"; \
+	libsrcdir="$$s/libgomp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias} $${srcdiroption} \
+	  --with-build-libsubdir=$(HOST_SUBDIR) \
+	  $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif target-libgomp-bootstrap
+
+
+
+
+
+.PHONY: all-target-libgomp maybe-all-target-libgomp
+maybe-all-target-libgomp:
+@if gcc-bootstrap
+all-target-libgomp: stage_current
+@endif gcc-bootstrap
+@if target-libgomp
+TARGET-target-libgomp=all
+maybe-all-target-libgomp: all-target-libgomp
+all-target-libgomp: configure-target-libgomp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	(cd $(TARGET_SUBDIR)/libgomp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+		$(TARGET-target-libgomp))
+@endif target-libgomp
+
+
+
+.PHONY: all-stage1-target-libgomp maybe-all-stage1-target-libgomp
+.PHONY: clean-stage1-target-libgomp maybe-clean-stage1-target-libgomp
+maybe-all-stage1-target-libgomp:
+maybe-clean-stage1-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-all-stage1-target-libgomp: all-stage1-target-libgomp
+all-stage1: all-stage1-target-libgomp
+TARGET-stage1-target-libgomp = $(TARGET-target-libgomp)
+all-stage1-target-libgomp: configure-stage1-target-libgomp
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE1_TFLAGS)"; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	cd $(TARGET_SUBDIR)/libgomp && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS)   \
+		TFLAGS="$(STAGE1_TFLAGS)" \
+		$(TARGET-stage1-target-libgomp)
+
+maybe-clean-stage1-target-libgomp: clean-stage1-target-libgomp
+clean-stage1: clean-stage1-target-libgomp
+clean-stage1-target-libgomp:
+	@if [ $(current_stage) = stage1 ]; then \
+	  [ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
+	else \
+	  [ -f $(TARGET_SUBDIR)/stage1-libgomp/Makefile ] || exit 0; \
+	  $(MAKE) stage1-start; \
+	fi; \
+	cd $(TARGET_SUBDIR)/libgomp && \
+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
+		 clean
+@endif target-libgomp-bootstrap
+
+
+.PHONY: all-stage2-target-libgomp maybe-all-stage2-target-libgomp
+.PHONY: clean-stage2-target-libgomp maybe-clean-stage2-target-libgomp
+maybe-all-stage2-target-libgomp:
+maybe-clean-stage2-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-all-stage2-target-libgomp: all-stage2-target-libgomp
+all-stage2: all-stage2-target-libgomp
+TARGET-stage2-target-libgomp = $(TARGET-target-libgomp)
+all-stage2-target-libgomp: configure-stage2-target-libgomp
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(NORMAL_TARGET_EXPORTS) \
+	  \
+	cd $(TARGET_SUBDIR)/libgomp && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS)   \
+		TFLAGS="$(STAGE2_TFLAGS)" \
+		$(TARGET-stage2-target-libgomp)
+
+maybe-clean-stage2-target-libgomp: clean-stage2-target-libgomp
+clean-stage2: clean-stage2-target-libgomp
+clean-stage2-target-libgomp:
+	@if [ $(current_stage) = stage2 ]; then \
+	  [ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
+	else \
+	  [ -f $(TARGET_SUBDIR)/stage2-libgomp/Makefile ] || exit 0; \
+	  $(MAKE) stage2-start; \
+	fi; \
+	cd $(TARGET_SUBDIR)/libgomp && \
+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
+		  \
+		 clean
+@endif target-libgomp-bootstrap
+
+
+.PHONY: all-stage3-target-libgomp maybe-all-stage3-target-libgomp
+.PHONY: clean-stage3-target-libgomp maybe-clean-stage3-target-libgomp
+maybe-all-stage3-target-libgomp:
+maybe-clean-stage3-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-all-stage3-target-libgomp: all-stage3-target-libgomp
+all-stage3: all-stage3-target-libgomp
+TARGET-stage3-target-libgomp = $(TARGET-target-libgomp)
+all-stage3-target-libgomp: configure-stage3-target-libgomp
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(NORMAL_TARGET_EXPORTS) \
+	  \
+	cd $(TARGET_SUBDIR)/libgomp && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS)   \
+		TFLAGS="$(STAGE3_TFLAGS)" \
+		$(TARGET-stage3-target-libgomp)
+
+maybe-clean-stage3-target-libgomp: clean-stage3-target-libgomp
+clean-stage3: clean-stage3-target-libgomp
+clean-stage3-target-libgomp:
+	@if [ $(current_stage) = stage3 ]; then \
+	  [ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
+	else \
+	  [ -f $(TARGET_SUBDIR)/stage3-libgomp/Makefile ] || exit 0; \
+	  $(MAKE) stage3-start; \
+	fi; \
+	cd $(TARGET_SUBDIR)/libgomp && \
+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
+		  \
+		 clean
+@endif target-libgomp-bootstrap
+
+
+.PHONY: all-stage4-target-libgomp maybe-all-stage4-target-libgomp
+.PHONY: clean-stage4-target-libgomp maybe-clean-stage4-target-libgomp
+maybe-all-stage4-target-libgomp:
+maybe-clean-stage4-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-all-stage4-target-libgomp: all-stage4-target-libgomp
+all-stage4: all-stage4-target-libgomp
+TARGET-stage4-target-libgomp = $(TARGET-target-libgomp)
+all-stage4-target-libgomp: configure-stage4-target-libgomp
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(NORMAL_TARGET_EXPORTS) \
+	  \
+	cd $(TARGET_SUBDIR)/libgomp && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS)   \
+		TFLAGS="$(STAGE4_TFLAGS)" \
+		$(TARGET-stage4-target-libgomp)
+
+maybe-clean-stage4-target-libgomp: clean-stage4-target-libgomp
+clean-stage4: clean-stage4-target-libgomp
+clean-stage4-target-libgomp:
+	@if [ $(current_stage) = stage4 ]; then \
+	  [ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
+	else \
+	  [ -f $(TARGET_SUBDIR)/stage4-libgomp/Makefile ] || exit 0; \
+	  $(MAKE) stage4-start; \
+	fi; \
+	cd $(TARGET_SUBDIR)/libgomp && \
+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
+		  \
+		 clean
+@endif target-libgomp-bootstrap
+
+
+.PHONY: all-stageprofile-target-libgomp maybe-all-stageprofile-target-libgomp
+.PHONY: clean-stageprofile-target-libgomp maybe-clean-stageprofile-target-libgomp
+maybe-all-stageprofile-target-libgomp:
+maybe-clean-stageprofile-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-all-stageprofile-target-libgomp: all-stageprofile-target-libgomp
+all-stageprofile: all-stageprofile-target-libgomp
+TARGET-stageprofile-target-libgomp = $(TARGET-target-libgomp)
+all-stageprofile-target-libgomp: configure-stageprofile-target-libgomp
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
+	$(NORMAL_TARGET_EXPORTS) \
+	  \
+	cd $(TARGET_SUBDIR)/libgomp && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS)   \
+		TFLAGS="$(STAGEprofile_TFLAGS)" \
+		$(TARGET-stageprofile-target-libgomp)
+
+maybe-clean-stageprofile-target-libgomp: clean-stageprofile-target-libgomp
+clean-stageprofile: clean-stageprofile-target-libgomp
+clean-stageprofile-target-libgomp:
+	@if [ $(current_stage) = stageprofile ]; then \
+	  [ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
+	else \
+	  [ -f $(TARGET_SUBDIR)/stageprofile-libgomp/Makefile ] || exit 0; \
+	  $(MAKE) stageprofile-start; \
+	fi; \
+	cd $(TARGET_SUBDIR)/libgomp && \
+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
+		  \
+		 clean
+@endif target-libgomp-bootstrap
+
+
+.PHONY: all-stagefeedback-target-libgomp maybe-all-stagefeedback-target-libgomp
+.PHONY: clean-stagefeedback-target-libgomp maybe-clean-stagefeedback-target-libgomp
+maybe-all-stagefeedback-target-libgomp:
+maybe-clean-stagefeedback-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-all-stagefeedback-target-libgomp: all-stagefeedback-target-libgomp
+all-stagefeedback: all-stagefeedback-target-libgomp
+TARGET-stagefeedback-target-libgomp = $(TARGET-target-libgomp)
+all-stagefeedback-target-libgomp: configure-stagefeedback-target-libgomp
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(NORMAL_TARGET_EXPORTS) \
+	  \
+	cd $(TARGET_SUBDIR)/libgomp && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		$(EXTRA_TARGET_FLAGS)   \
+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
+		$(TARGET-stagefeedback-target-libgomp)
+
+maybe-clean-stagefeedback-target-libgomp: clean-stagefeedback-target-libgomp
+clean-stagefeedback: clean-stagefeedback-target-libgomp
+clean-stagefeedback-target-libgomp:
+	@if [ $(current_stage) = stagefeedback ]; then \
+	  [ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
+	else \
+	  [ -f $(TARGET_SUBDIR)/stagefeedback-libgomp/Makefile ] || exit 0; \
+	  $(MAKE) stagefeedback-start; \
+	fi; \
+	cd $(TARGET_SUBDIR)/libgomp && \
+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
+		  \
+		 clean
+@endif target-libgomp-bootstrap
+
+
+
+
+
+
+.PHONY: check-target-libgomp maybe-check-target-libgomp
+maybe-check-target-libgomp:
+@if target-libgomp
+maybe-check-target-libgomp: check-target-libgomp
+
+check-target-libgomp:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libgomp && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-libgomp
+
+.PHONY: install-target-libgomp maybe-install-target-libgomp
+maybe-install-target-libgomp:
+@if target-libgomp
+maybe-install-target-libgomp: install-target-libgomp
+
+install-target-libgomp: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libgomp && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libgomp
+
+.PHONY: install-strip-target-libgomp maybe-install-strip-target-libgomp
+maybe-install-strip-target-libgomp:
+@if target-libgomp
+maybe-install-strip-target-libgomp: install-strip-target-libgomp
+
+install-strip-target-libgomp: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libgomp && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libgomp
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libgomp info-target-libgomp
+maybe-info-target-libgomp:
+@if target-libgomp
+maybe-info-target-libgomp: info-target-libgomp
+
+info-target-libgomp: \
+    configure-target-libgomp 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing info in $(TARGET_SUBDIR)/libgomp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgomp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           info) \
+	  || exit 1
+
+@endif target-libgomp
+
+.PHONY: maybe-dvi-target-libgomp dvi-target-libgomp
+maybe-dvi-target-libgomp:
+@if target-libgomp
+maybe-dvi-target-libgomp: dvi-target-libgomp
+
+dvi-target-libgomp: \
+    configure-target-libgomp 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing dvi in $(TARGET_SUBDIR)/libgomp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgomp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           dvi) \
+	  || exit 1
+
+@endif target-libgomp
+
+.PHONY: maybe-pdf-target-libgomp pdf-target-libgomp
+maybe-pdf-target-libgomp:
+@if target-libgomp
+maybe-pdf-target-libgomp: pdf-target-libgomp
+
+pdf-target-libgomp: \
+    configure-target-libgomp 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing pdf in $(TARGET_SUBDIR)/libgomp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgomp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           pdf) \
+	  || exit 1
+
+@endif target-libgomp
+
+.PHONY: maybe-html-target-libgomp html-target-libgomp
+maybe-html-target-libgomp:
+@if target-libgomp
+maybe-html-target-libgomp: html-target-libgomp
+
+html-target-libgomp: \
+    configure-target-libgomp 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing html in $(TARGET_SUBDIR)/libgomp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgomp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           html) \
+	  || exit 1
+
+@endif target-libgomp
+
+.PHONY: maybe-TAGS-target-libgomp TAGS-target-libgomp
+maybe-TAGS-target-libgomp:
+@if target-libgomp
+maybe-TAGS-target-libgomp: TAGS-target-libgomp
+
+TAGS-target-libgomp: \
+    configure-target-libgomp 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/libgomp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgomp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           TAGS) \
+	  || exit 1
+
+@endif target-libgomp
+
+.PHONY: maybe-install-info-target-libgomp install-info-target-libgomp
+maybe-install-info-target-libgomp:
+@if target-libgomp
+maybe-install-info-target-libgomp: install-info-target-libgomp
+
+install-info-target-libgomp: \
+    configure-target-libgomp \
+    info-target-libgomp 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-info in $(TARGET_SUBDIR)/libgomp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgomp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-info) \
+	  || exit 1
+
+@endif target-libgomp
+
+.PHONY: maybe-install-pdf-target-libgomp install-pdf-target-libgomp
+maybe-install-pdf-target-libgomp:
+@if target-libgomp
+maybe-install-pdf-target-libgomp: install-pdf-target-libgomp
+
+install-pdf-target-libgomp: \
+    configure-target-libgomp \
+    pdf-target-libgomp 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libgomp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgomp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-pdf) \
+	  || exit 1
+
+@endif target-libgomp
+
+.PHONY: maybe-install-html-target-libgomp install-html-target-libgomp
+maybe-install-html-target-libgomp:
+@if target-libgomp
+maybe-install-html-target-libgomp: install-html-target-libgomp
+
+install-html-target-libgomp: \
+    configure-target-libgomp \
+    html-target-libgomp 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libgomp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgomp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-html) \
+	  || exit 1
+
+@endif target-libgomp
+
+.PHONY: maybe-installcheck-target-libgomp installcheck-target-libgomp
+maybe-installcheck-target-libgomp:
+@if target-libgomp
+maybe-installcheck-target-libgomp: installcheck-target-libgomp
+
+installcheck-target-libgomp: \
+    configure-target-libgomp 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/libgomp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgomp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           installcheck) \
+	  || exit 1
+
+@endif target-libgomp
+
+.PHONY: maybe-mostlyclean-target-libgomp mostlyclean-target-libgomp
+maybe-mostlyclean-target-libgomp:
+@if target-libgomp
+maybe-mostlyclean-target-libgomp: mostlyclean-target-libgomp
+
+mostlyclean-target-libgomp: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgomp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgomp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           mostlyclean) \
+	  || exit 1
+
+@endif target-libgomp
+
+.PHONY: maybe-clean-target-libgomp clean-target-libgomp
+maybe-clean-target-libgomp:
+@if target-libgomp
+maybe-clean-target-libgomp: clean-target-libgomp
+
+clean-target-libgomp: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing clean in $(TARGET_SUBDIR)/libgomp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgomp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           clean) \
+	  || exit 1
+
+@endif target-libgomp
+
+.PHONY: maybe-distclean-target-libgomp distclean-target-libgomp
+maybe-distclean-target-libgomp:
+@if target-libgomp
+maybe-distclean-target-libgomp: distclean-target-libgomp
+
+distclean-target-libgomp: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing distclean in $(TARGET_SUBDIR)/libgomp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgomp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           distclean) \
+	  || exit 1
+
+@endif target-libgomp
+
+.PHONY: maybe-maintainer-clean-target-libgomp maintainer-clean-target-libgomp
+maybe-maintainer-clean-target-libgomp:
+@if target-libgomp
+maybe-maintainer-clean-target-libgomp: maintainer-clean-target-libgomp
+
+maintainer-clean-target-libgomp: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgomp" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgomp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           maintainer-clean) \
+	  || exit 1
+
+@endif target-libgomp
+
+
+
+@if target-libmudflap
+.PHONY: check-target-libmudflap-c++
+check-target-libmudflap-c++:
+	$(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) c++frags.exp" check-target-libmudflap
+
+@endif target-libmudflap
+
+# ----------
+# GCC module
+# ----------
+
+@if gcc-no-bootstrap
+.PHONY: cross
+cross: all-build all-gas all-ld
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	echo "Building the C and C++ compiler"; \
+	cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
+	echo "Building runtime libraries"; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LANGUAGES="c c++" all
+@endif gcc-no-bootstrap
+
+@if gcc
+
+.PHONY: check-gcc-c check-c
+check-gcc-c:
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-gcc);
+check-c: check-gcc-c
+
+.PHONY: check-gcc-c++ check-c++
+check-gcc-c++:
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++ check-c++0x);
+check-c++: check-gcc-c++ check-target-libstdc++-v3 check-target-libmudflap-c++
+
+.PHONY: check-gcc-fortran check-fortran
+check-gcc-fortran:
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-fortran);
+check-fortran: check-gcc-fortran check-target-libquadmath check-target-libgfortran
+
+.PHONY: check-gcc-java check-java
+check-gcc-java:
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-java);
+check-java: check-gcc-java check-target-libjava
+
+.PHONY: check-gcc-ada check-ada
+check-gcc-ada:
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-ada);
+check-ada: check-gcc-ada check-target-libada
+
+.PHONY: check-gcc-objc check-objc
+check-gcc-objc:
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-objc);
+check-objc: check-gcc-objc check-target-libobjc
+
+.PHONY: check-gcc-obj-c++ check-obj-c++
+check-gcc-obj-c++:
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-obj-c++);
+check-obj-c++: check-gcc-obj-c++
+
+.PHONY: check-gcc-go check-go
+check-gcc-go:
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-go);
+check-go: check-gcc-go check-target-libgo
+
+
+# Install the gcc headers files, but not the fixed include files,
+# which Cygnus is not allowed to distribute.  This rule is very
+# dependent on the workings of the gcc Makefile.in.
+.PHONY: gcc-no-fixedincludes
+gcc-no-fixedincludes:
+	@if [ -f ./gcc/Makefile ]; then \
+	  rm -rf gcc/tmp-include; \
+	  mv gcc/include gcc/tmp-include 2>/dev/null; \
+	  mkdir gcc/include; \
+	  cp $(srcdir)/gcc/gsyslimits.h gcc/include/syslimits.h; \
+	  touch gcc/stmp-fixinc gcc/include/fixed; \
+	  rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
+	  r=`${PWD_COMMAND}`; export r; \
+	  s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
+	  $(HOST_EXPORTS) \
+	  (cd ./gcc && \
+	   $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
+	  rm -rf gcc/include; \
+	  mv gcc/tmp-include gcc/include 2>/dev/null; \
+	else true; fi
+@endif gcc
+
+# ---------------------
+# GCC bootstrap support
+# ---------------------
+
+# We track the current stage (the one in 'gcc') in the stage_current file.
+# stage_last instead tracks the stage that was built last.  These targets
+# are dummy when toplevel bootstrap is not active.
+
+# While making host and target tools, symlinks to the final stage must be
+# there, so $(unstage) should be run at various points.  To avoid excessive
+# recursive invocations of make, we "inline" them using a variable.  These
+# must be referenced as ": $(MAKE) ; $(unstage)" rather than "$(unstage)"
+# to avoid warnings from the GNU Make job server.
+
+unstage = :
+stage = :
+current_stage = ""
+
+@if gcc-bootstrap
+unstage = if [ -f stage_last ]; then [ -f stage_current ] || $(MAKE) `cat stage_last`-start || exit 1; else :; fi
+stage = if [ -f stage_current ]; then $(MAKE) `cat stage_current`-end || exit 1; else :; fi
+current_stage = "`cat stage_current 2> /dev/null`"
+@endif gcc-bootstrap
+
+.PHONY: unstage stage
+unstage:
+	@: $(MAKE); $(unstage)
+stage:
+	@: $(MAKE); $(stage)
+
+# Disable commands for lean bootstrap.
+LEAN = false
+
+# We name the build directories for the various stages "stage1-gcc",
+# "stage2-gcc","stage3-gcc", etc.
+
+# Since the 'compare' process will fail (on debugging information) if any
+# directory names are different, we need to link the gcc directory for
+# the previous stage to a constant name ('prev-gcc'), and to make the name of
+# the build directories constant as well. For the latter, we use naked names
+# like 'gcc', because the scripts in that directory assume it.  We use
+# mv on platforms where symlinks to directories do not work or are not
+# reliable.
+
+# 'touch' doesn't work right on some platforms.
+STAMP = echo timestamp > 
+
+# We only want to compare .o files, so set this!
+objext = .o
+
+
+.PHONY: stage1-start stage1-end
+
+stage1-start::
+	@: $(MAKE); $(stage); \
+	echo stage1 > stage_current ; \
+	echo stage1 > stage_last; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
+@if bfd
+	@cd $(HOST_SUBDIR); [ -d stage1-bfd ] || \
+	  mkdir stage1-bfd; \
+	mv stage1-bfd bfd 
+@endif bfd
+@if opcodes
+	@cd $(HOST_SUBDIR); [ -d stage1-opcodes ] || \
+	  mkdir stage1-opcodes; \
+	mv stage1-opcodes opcodes 
+@endif opcodes
+@if binutils
+	@cd $(HOST_SUBDIR); [ -d stage1-binutils ] || \
+	  mkdir stage1-binutils; \
+	mv stage1-binutils binutils 
+@endif binutils
+@if gas
+	@cd $(HOST_SUBDIR); [ -d stage1-gas ] || \
+	  mkdir stage1-gas; \
+	mv stage1-gas gas 
+@endif gas
+@if gcc
+	@cd $(HOST_SUBDIR); [ -d stage1-gcc ] || \
+	  mkdir stage1-gcc; \
+	mv stage1-gcc gcc 
+@endif gcc
+@if gmp
+	@cd $(HOST_SUBDIR); [ -d stage1-gmp ] || \
+	  mkdir stage1-gmp; \
+	mv stage1-gmp gmp 
+@endif gmp
+@if mpfr
+	@cd $(HOST_SUBDIR); [ -d stage1-mpfr ] || \
+	  mkdir stage1-mpfr; \
+	mv stage1-mpfr mpfr 
+@endif mpfr
+@if mpc
+	@cd $(HOST_SUBDIR); [ -d stage1-mpc ] || \
+	  mkdir stage1-mpc; \
+	mv stage1-mpc mpc 
+@endif mpc
+@if ppl
+	@cd $(HOST_SUBDIR); [ -d stage1-ppl ] || \
+	  mkdir stage1-ppl; \
+	mv stage1-ppl ppl 
+@endif ppl
+@if cloog
+	@cd $(HOST_SUBDIR); [ -d stage1-cloog ] || \
+	  mkdir stage1-cloog; \
+	mv stage1-cloog cloog 
+@endif cloog
+@if libelf
+	@cd $(HOST_SUBDIR); [ -d stage1-libelf ] || \
+	  mkdir stage1-libelf; \
+	mv stage1-libelf libelf 
+@endif libelf
+@if gold
+	@cd $(HOST_SUBDIR); [ -d stage1-gold ] || \
+	  mkdir stage1-gold; \
+	mv stage1-gold gold 
+@endif gold
+@if intl
+	@cd $(HOST_SUBDIR); [ -d stage1-intl ] || \
+	  mkdir stage1-intl; \
+	mv stage1-intl intl 
+@endif intl
+@if ld
+	@cd $(HOST_SUBDIR); [ -d stage1-ld ] || \
+	  mkdir stage1-ld; \
+	mv stage1-ld ld 
+@endif ld
+@if libcpp
+	@cd $(HOST_SUBDIR); [ -d stage1-libcpp ] || \
+	  mkdir stage1-libcpp; \
+	mv stage1-libcpp libcpp 
+@endif libcpp
+@if libdecnumber
+	@cd $(HOST_SUBDIR); [ -d stage1-libdecnumber ] || \
+	  mkdir stage1-libdecnumber; \
+	mv stage1-libdecnumber libdecnumber 
+@endif libdecnumber
+@if libiberty
+	@cd $(HOST_SUBDIR); [ -d stage1-libiberty ] || \
+	  mkdir stage1-libiberty; \
+	mv stage1-libiberty libiberty 
+@endif libiberty
+@if zlib
+	@cd $(HOST_SUBDIR); [ -d stage1-zlib ] || \
+	  mkdir stage1-zlib; \
+	mv stage1-zlib zlib 
+@endif zlib
+@if lto-plugin
+	@cd $(HOST_SUBDIR); [ -d stage1-lto-plugin ] || \
+	  mkdir stage1-lto-plugin; \
+	mv stage1-lto-plugin lto-plugin 
+@endif lto-plugin
+	@[ -d stage1-$(TARGET_SUBDIR) ] || \
+	  mkdir stage1-$(TARGET_SUBDIR); \
+	mv stage1-$(TARGET_SUBDIR) $(TARGET_SUBDIR) 
+
+stage1-end:: 
+@if bfd
+	@if test -d $(HOST_SUBDIR)/bfd ; then \
+	  cd $(HOST_SUBDIR); mv bfd stage1-bfd  ; \
+	fi
+@endif bfd
+@if opcodes
+	@if test -d $(HOST_SUBDIR)/opcodes ; then \
+	  cd $(HOST_SUBDIR); mv opcodes stage1-opcodes  ; \
+	fi
+@endif opcodes
+@if binutils
+	@if test -d $(HOST_SUBDIR)/binutils ; then \
+	  cd $(HOST_SUBDIR); mv binutils stage1-binutils  ; \
+	fi
+@endif binutils
+@if gas
+	@if test -d $(HOST_SUBDIR)/gas ; then \
+	  cd $(HOST_SUBDIR); mv gas stage1-gas  ; \
+	fi
+@endif gas
+@if gcc
+	@if test -d $(HOST_SUBDIR)/gcc ; then \
+	  cd $(HOST_SUBDIR); mv gcc stage1-gcc  ; \
+	fi
+@endif gcc
+@if gmp
+	@if test -d $(HOST_SUBDIR)/gmp ; then \
+	  cd $(HOST_SUBDIR); mv gmp stage1-gmp  ; \
+	fi
+@endif gmp
+@if mpfr
+	@if test -d $(HOST_SUBDIR)/mpfr ; then \
+	  cd $(HOST_SUBDIR); mv mpfr stage1-mpfr  ; \
+	fi
+@endif mpfr
+@if mpc
+	@if test -d $(HOST_SUBDIR)/mpc ; then \
+	  cd $(HOST_SUBDIR); mv mpc stage1-mpc  ; \
+	fi
+@endif mpc
+@if ppl
+	@if test -d $(HOST_SUBDIR)/ppl ; then \
+	  cd $(HOST_SUBDIR); mv ppl stage1-ppl  ; \
+	fi
+@endif ppl
+@if cloog
+	@if test -d $(HOST_SUBDIR)/cloog ; then \
+	  cd $(HOST_SUBDIR); mv cloog stage1-cloog  ; \
+	fi
+@endif cloog
+@if libelf
+	@if test -d $(HOST_SUBDIR)/libelf ; then \
+	  cd $(HOST_SUBDIR); mv libelf stage1-libelf  ; \
+	fi
+@endif libelf
+@if gold
+	@if test -d $(HOST_SUBDIR)/gold ; then \
+	  cd $(HOST_SUBDIR); mv gold stage1-gold  ; \
+	fi
+@endif gold
+@if intl
+	@if test -d $(HOST_SUBDIR)/intl ; then \
+	  cd $(HOST_SUBDIR); mv intl stage1-intl  ; \
+	fi
+@endif intl
+@if ld
+	@if test -d $(HOST_SUBDIR)/ld ; then \
+	  cd $(HOST_SUBDIR); mv ld stage1-ld  ; \
+	fi
+@endif ld
+@if libcpp
+	@if test -d $(HOST_SUBDIR)/libcpp ; then \
+	  cd $(HOST_SUBDIR); mv libcpp stage1-libcpp  ; \
+	fi
+@endif libcpp
+@if libdecnumber
+	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
+	  cd $(HOST_SUBDIR); mv libdecnumber stage1-libdecnumber  ; \
+	fi
+@endif libdecnumber
+@if libiberty
+	@if test -d $(HOST_SUBDIR)/libiberty ; then \
+	  cd $(HOST_SUBDIR); mv libiberty stage1-libiberty  ; \
+	fi
+@endif libiberty
+@if zlib
+	@if test -d $(HOST_SUBDIR)/zlib ; then \
+	  cd $(HOST_SUBDIR); mv zlib stage1-zlib  ; \
+	fi
+@endif zlib
+@if lto-plugin
+	@if test -d $(HOST_SUBDIR)/lto-plugin ; then \
+	  cd $(HOST_SUBDIR); mv lto-plugin stage1-lto-plugin  ; \
+	fi
+@endif lto-plugin
+	@if test -d $(TARGET_SUBDIR) ; then \
+	  mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR)  ; \
+	fi
+	rm -f stage_current
+
+# Bubble a bug fix through all the stages up to stage 1.  They are
+# remade, but not reconfigured.  The next stage (if any) will not be
+# reconfigured either.
+.PHONY: stage1-bubble
+stage1-bubble:: 
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	if test -f stage1-lean  ; then \
+	  echo Skipping rebuild of stage1 ; \
+	else \
+	  $(MAKE) stage1-start; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1; \
+	fi
+
+.PHONY: all-stage1 clean-stage1
+do-clean: clean-stage1
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+
+.PHONY: distclean-stage1
+distclean-stage1::
+	@: $(MAKE); $(stage)
+	@test "`cat stage_last`" != stage1 || rm -f stage_last
+	rm -rf stage1-* 
+
+
+@endif gcc-bootstrap
+
+
+.PHONY: stage2-start stage2-end
+
+stage2-start::
+	@: $(MAKE); $(stage); \
+	echo stage2 > stage_current ; \
+	echo stage2 > stage_last; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
+@if bfd
+	@cd $(HOST_SUBDIR); [ -d stage2-bfd ] || \
+	  mkdir stage2-bfd; \
+	mv stage2-bfd bfd  ; \
+	mv stage1-bfd prev-bfd || test -f stage1-lean 
+@endif bfd
+@if opcodes
+	@cd $(HOST_SUBDIR); [ -d stage2-opcodes ] || \
+	  mkdir stage2-opcodes; \
+	mv stage2-opcodes opcodes  ; \
+	mv stage1-opcodes prev-opcodes || test -f stage1-lean 
+@endif opcodes
+@if binutils
+	@cd $(HOST_SUBDIR); [ -d stage2-binutils ] || \
+	  mkdir stage2-binutils; \
+	mv stage2-binutils binutils  ; \
+	mv stage1-binutils prev-binutils || test -f stage1-lean 
+@endif binutils
+@if gas
+	@cd $(HOST_SUBDIR); [ -d stage2-gas ] || \
+	  mkdir stage2-gas; \
+	mv stage2-gas gas  ; \
+	mv stage1-gas prev-gas || test -f stage1-lean 
+@endif gas
+@if gcc
+	@cd $(HOST_SUBDIR); [ -d stage2-gcc ] || \
+	  mkdir stage2-gcc; \
+	mv stage2-gcc gcc  ; \
+	mv stage1-gcc prev-gcc || test -f stage1-lean 
+@endif gcc
+@if gmp
+	@cd $(HOST_SUBDIR); [ -d stage2-gmp ] || \
+	  mkdir stage2-gmp; \
+	mv stage2-gmp gmp  ; \
+	mv stage1-gmp prev-gmp || test -f stage1-lean 
+@endif gmp
+@if mpfr
+	@cd $(HOST_SUBDIR); [ -d stage2-mpfr ] || \
+	  mkdir stage2-mpfr; \
+	mv stage2-mpfr mpfr  ; \
+	mv stage1-mpfr prev-mpfr || test -f stage1-lean 
+@endif mpfr
+@if mpc
+	@cd $(HOST_SUBDIR); [ -d stage2-mpc ] || \
+	  mkdir stage2-mpc; \
+	mv stage2-mpc mpc  ; \
+	mv stage1-mpc prev-mpc || test -f stage1-lean 
+@endif mpc
+@if ppl
+	@cd $(HOST_SUBDIR); [ -d stage2-ppl ] || \
+	  mkdir stage2-ppl; \
+	mv stage2-ppl ppl  ; \
+	mv stage1-ppl prev-ppl || test -f stage1-lean 
+@endif ppl
+@if cloog
+	@cd $(HOST_SUBDIR); [ -d stage2-cloog ] || \
+	  mkdir stage2-cloog; \
+	mv stage2-cloog cloog  ; \
+	mv stage1-cloog prev-cloog || test -f stage1-lean 
+@endif cloog
+@if libelf
+	@cd $(HOST_SUBDIR); [ -d stage2-libelf ] || \
+	  mkdir stage2-libelf; \
+	mv stage2-libelf libelf  ; \
+	mv stage1-libelf prev-libelf || test -f stage1-lean 
+@endif libelf
+@if gold
+	@cd $(HOST_SUBDIR); [ -d stage2-gold ] || \
+	  mkdir stage2-gold; \
+	mv stage2-gold gold  ; \
+	mv stage1-gold prev-gold || test -f stage1-lean 
+@endif gold
+@if intl
+	@cd $(HOST_SUBDIR); [ -d stage2-intl ] || \
+	  mkdir stage2-intl; \
+	mv stage2-intl intl  ; \
+	mv stage1-intl prev-intl || test -f stage1-lean 
+@endif intl
+@if ld
+	@cd $(HOST_SUBDIR); [ -d stage2-ld ] || \
+	  mkdir stage2-ld; \
+	mv stage2-ld ld  ; \
+	mv stage1-ld prev-ld || test -f stage1-lean 
+@endif ld
+@if libcpp
+	@cd $(HOST_SUBDIR); [ -d stage2-libcpp ] || \
+	  mkdir stage2-libcpp; \
+	mv stage2-libcpp libcpp  ; \
+	mv stage1-libcpp prev-libcpp || test -f stage1-lean 
+@endif libcpp
+@if libdecnumber
+	@cd $(HOST_SUBDIR); [ -d stage2-libdecnumber ] || \
+	  mkdir stage2-libdecnumber; \
+	mv stage2-libdecnumber libdecnumber  ; \
+	mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean 
+@endif libdecnumber
+@if libiberty
+	@cd $(HOST_SUBDIR); [ -d stage2-libiberty ] || \
+	  mkdir stage2-libiberty; \
+	mv stage2-libiberty libiberty  ; \
+	mv stage1-libiberty prev-libiberty || test -f stage1-lean 
+@endif libiberty
+@if zlib
+	@cd $(HOST_SUBDIR); [ -d stage2-zlib ] || \
+	  mkdir stage2-zlib; \
+	mv stage2-zlib zlib  ; \
+	mv stage1-zlib prev-zlib || test -f stage1-lean 
+@endif zlib
+@if lto-plugin
+	@cd $(HOST_SUBDIR); [ -d stage2-lto-plugin ] || \
+	  mkdir stage2-lto-plugin; \
+	mv stage2-lto-plugin lto-plugin  ; \
+	mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
+@endif lto-plugin
+	@[ -d stage2-$(TARGET_SUBDIR) ] || \
+	  mkdir stage2-$(TARGET_SUBDIR); \
+	mv stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
+	mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean 
+
+stage2-end:: 
+@if bfd
+	@if test -d $(HOST_SUBDIR)/bfd ; then \
+	  cd $(HOST_SUBDIR); mv bfd stage2-bfd ; \
+	  mv prev-bfd stage1-bfd ; :  ; \
+	fi
+@endif bfd
+@if opcodes
+	@if test -d $(HOST_SUBDIR)/opcodes ; then \
+	  cd $(HOST_SUBDIR); mv opcodes stage2-opcodes ; \
+	  mv prev-opcodes stage1-opcodes ; :  ; \
+	fi
+@endif opcodes
+@if binutils
+	@if test -d $(HOST_SUBDIR)/binutils ; then \
+	  cd $(HOST_SUBDIR); mv binutils stage2-binutils ; \
+	  mv prev-binutils stage1-binutils ; :  ; \
+	fi
+@endif binutils
+@if gas
+	@if test -d $(HOST_SUBDIR)/gas ; then \
+	  cd $(HOST_SUBDIR); mv gas stage2-gas ; \
+	  mv prev-gas stage1-gas ; :  ; \
+	fi
+@endif gas
+@if gcc
+	@if test -d $(HOST_SUBDIR)/gcc ; then \
+	  cd $(HOST_SUBDIR); mv gcc stage2-gcc ; \
+	  mv prev-gcc stage1-gcc ; :  ; \
+	fi
+@endif gcc
+@if gmp
+	@if test -d $(HOST_SUBDIR)/gmp ; then \
+	  cd $(HOST_SUBDIR); mv gmp stage2-gmp ; \
+	  mv prev-gmp stage1-gmp ; :  ; \
+	fi
+@endif gmp
+@if mpfr
+	@if test -d $(HOST_SUBDIR)/mpfr ; then \
+	  cd $(HOST_SUBDIR); mv mpfr stage2-mpfr ; \
+	  mv prev-mpfr stage1-mpfr ; :  ; \
+	fi
+@endif mpfr
+@if mpc
+	@if test -d $(HOST_SUBDIR)/mpc ; then \
+	  cd $(HOST_SUBDIR); mv mpc stage2-mpc ; \
+	  mv prev-mpc stage1-mpc ; :  ; \
+	fi
+@endif mpc
+@if ppl
+	@if test -d $(HOST_SUBDIR)/ppl ; then \
+	  cd $(HOST_SUBDIR); mv ppl stage2-ppl ; \
+	  mv prev-ppl stage1-ppl ; :  ; \
+	fi
+@endif ppl
+@if cloog
+	@if test -d $(HOST_SUBDIR)/cloog ; then \
+	  cd $(HOST_SUBDIR); mv cloog stage2-cloog ; \
+	  mv prev-cloog stage1-cloog ; :  ; \
+	fi
+@endif cloog
+@if libelf
+	@if test -d $(HOST_SUBDIR)/libelf ; then \
+	  cd $(HOST_SUBDIR); mv libelf stage2-libelf ; \
+	  mv prev-libelf stage1-libelf ; :  ; \
+	fi
+@endif libelf
+@if gold
+	@if test -d $(HOST_SUBDIR)/gold ; then \
+	  cd $(HOST_SUBDIR); mv gold stage2-gold ; \
+	  mv prev-gold stage1-gold ; :  ; \
+	fi
+@endif gold
+@if intl
+	@if test -d $(HOST_SUBDIR)/intl ; then \
+	  cd $(HOST_SUBDIR); mv intl stage2-intl ; \
+	  mv prev-intl stage1-intl ; :  ; \
+	fi
+@endif intl
+@if ld
+	@if test -d $(HOST_SUBDIR)/ld ; then \
+	  cd $(HOST_SUBDIR); mv ld stage2-ld ; \
+	  mv prev-ld stage1-ld ; :  ; \
+	fi
+@endif ld
+@if libcpp
+	@if test -d $(HOST_SUBDIR)/libcpp ; then \
+	  cd $(HOST_SUBDIR); mv libcpp stage2-libcpp ; \
+	  mv prev-libcpp stage1-libcpp ; :  ; \
+	fi
+@endif libcpp
+@if libdecnumber
+	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
+	  cd $(HOST_SUBDIR); mv libdecnumber stage2-libdecnumber ; \
+	  mv prev-libdecnumber stage1-libdecnumber ; :  ; \
+	fi
+@endif libdecnumber
+@if libiberty
+	@if test -d $(HOST_SUBDIR)/libiberty ; then \
+	  cd $(HOST_SUBDIR); mv libiberty stage2-libiberty ; \
+	  mv prev-libiberty stage1-libiberty ; :  ; \
+	fi
+@endif libiberty
+@if zlib
+	@if test -d $(HOST_SUBDIR)/zlib ; then \
+	  cd $(HOST_SUBDIR); mv zlib stage2-zlib ; \
+	  mv prev-zlib stage1-zlib ; :  ; \
+	fi
+@endif zlib
+@if lto-plugin
+	@if test -d $(HOST_SUBDIR)/lto-plugin ; then \
+	  cd $(HOST_SUBDIR); mv lto-plugin stage2-lto-plugin ; \
+	  mv prev-lto-plugin stage1-lto-plugin ; :  ; \
+	fi
+@endif lto-plugin
+	@if test -d $(TARGET_SUBDIR) ; then \
+	  mv $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR)  ; \
+	  mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; :  ; \
+	fi
+	rm -f stage_current
+
+# Bubble a bug fix through all the stages up to stage 2.  They are
+# remade, but not reconfigured.  The next stage (if any) will not be
+# reconfigured either.
+.PHONY: stage2-bubble
+stage2-bubble:: stage1-bubble
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	if test -f stage2-lean || test -f stage1-lean  ; then \
+	  echo Skipping rebuild of stage2 ; \
+	else \
+	  $(MAKE) stage2-start; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2; \
+	fi
+
+.PHONY: all-stage2 clean-stage2
+do-clean: clean-stage2
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+
+
+.PHONY: bootstrap2 bootstrap2-lean
+bootstrap2:
+	echo stage2 > stage_final
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage2-bubble
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+
+bootstrap2-lean:
+	echo stage2 > stage_final
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage2-bubble
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE2_TFLAGS)"; \
+	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage1:: distclean-stage2 
+.PHONY: distclean-stage2
+distclean-stage2::
+	@: $(MAKE); $(stage)
+	@test "`cat stage_last`" != stage2 || rm -f stage_last
+	rm -rf stage2-* 
+
+
+@endif gcc-bootstrap
+
+
+.PHONY: stage3-start stage3-end
+
+stage3-start::
+	@: $(MAKE); $(stage); \
+	echo stage3 > stage_current ; \
+	echo stage3 > stage_last; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
+@if bfd
+	@cd $(HOST_SUBDIR); [ -d stage3-bfd ] || \
+	  mkdir stage3-bfd; \
+	mv stage3-bfd bfd  ; \
+	mv stage2-bfd prev-bfd || test -f stage2-lean 
+@endif bfd
+@if opcodes
+	@cd $(HOST_SUBDIR); [ -d stage3-opcodes ] || \
+	  mkdir stage3-opcodes; \
+	mv stage3-opcodes opcodes  ; \
+	mv stage2-opcodes prev-opcodes || test -f stage2-lean 
+@endif opcodes
+@if binutils
+	@cd $(HOST_SUBDIR); [ -d stage3-binutils ] || \
+	  mkdir stage3-binutils; \
+	mv stage3-binutils binutils  ; \
+	mv stage2-binutils prev-binutils || test -f stage2-lean 
+@endif binutils
+@if gas
+	@cd $(HOST_SUBDIR); [ -d stage3-gas ] || \
+	  mkdir stage3-gas; \
+	mv stage3-gas gas  ; \
+	mv stage2-gas prev-gas || test -f stage2-lean 
+@endif gas
+@if gcc
+	@cd $(HOST_SUBDIR); [ -d stage3-gcc ] || \
+	  mkdir stage3-gcc; \
+	mv stage3-gcc gcc  ; \
+	mv stage2-gcc prev-gcc || test -f stage2-lean 
+@endif gcc
+@if gmp
+	@cd $(HOST_SUBDIR); [ -d stage3-gmp ] || \
+	  mkdir stage3-gmp; \
+	mv stage3-gmp gmp  ; \
+	mv stage2-gmp prev-gmp || test -f stage2-lean 
+@endif gmp
+@if mpfr
+	@cd $(HOST_SUBDIR); [ -d stage3-mpfr ] || \
+	  mkdir stage3-mpfr; \
+	mv stage3-mpfr mpfr  ; \
+	mv stage2-mpfr prev-mpfr || test -f stage2-lean 
+@endif mpfr
+@if mpc
+	@cd $(HOST_SUBDIR); [ -d stage3-mpc ] || \
+	  mkdir stage3-mpc; \
+	mv stage3-mpc mpc  ; \
+	mv stage2-mpc prev-mpc || test -f stage2-lean 
+@endif mpc
+@if ppl
+	@cd $(HOST_SUBDIR); [ -d stage3-ppl ] || \
+	  mkdir stage3-ppl; \
+	mv stage3-ppl ppl  ; \
+	mv stage2-ppl prev-ppl || test -f stage2-lean 
+@endif ppl
+@if cloog
+	@cd $(HOST_SUBDIR); [ -d stage3-cloog ] || \
+	  mkdir stage3-cloog; \
+	mv stage3-cloog cloog  ; \
+	mv stage2-cloog prev-cloog || test -f stage2-lean 
+@endif cloog
+@if libelf
+	@cd $(HOST_SUBDIR); [ -d stage3-libelf ] || \
+	  mkdir stage3-libelf; \
+	mv stage3-libelf libelf  ; \
+	mv stage2-libelf prev-libelf || test -f stage2-lean 
+@endif libelf
+@if gold
+	@cd $(HOST_SUBDIR); [ -d stage3-gold ] || \
+	  mkdir stage3-gold; \
+	mv stage3-gold gold  ; \
+	mv stage2-gold prev-gold || test -f stage2-lean 
+@endif gold
+@if intl
+	@cd $(HOST_SUBDIR); [ -d stage3-intl ] || \
+	  mkdir stage3-intl; \
+	mv stage3-intl intl  ; \
+	mv stage2-intl prev-intl || test -f stage2-lean 
+@endif intl
+@if ld
+	@cd $(HOST_SUBDIR); [ -d stage3-ld ] || \
+	  mkdir stage3-ld; \
+	mv stage3-ld ld  ; \
+	mv stage2-ld prev-ld || test -f stage2-lean 
+@endif ld
+@if libcpp
+	@cd $(HOST_SUBDIR); [ -d stage3-libcpp ] || \
+	  mkdir stage3-libcpp; \
+	mv stage3-libcpp libcpp  ; \
+	mv stage2-libcpp prev-libcpp || test -f stage2-lean 
+@endif libcpp
+@if libdecnumber
+	@cd $(HOST_SUBDIR); [ -d stage3-libdecnumber ] || \
+	  mkdir stage3-libdecnumber; \
+	mv stage3-libdecnumber libdecnumber  ; \
+	mv stage2-libdecnumber prev-libdecnumber || test -f stage2-lean 
+@endif libdecnumber
+@if libiberty
+	@cd $(HOST_SUBDIR); [ -d stage3-libiberty ] || \
+	  mkdir stage3-libiberty; \
+	mv stage3-libiberty libiberty  ; \
+	mv stage2-libiberty prev-libiberty || test -f stage2-lean 
+@endif libiberty
+@if zlib
+	@cd $(HOST_SUBDIR); [ -d stage3-zlib ] || \
+	  mkdir stage3-zlib; \
+	mv stage3-zlib zlib  ; \
+	mv stage2-zlib prev-zlib || test -f stage2-lean 
+@endif zlib
+@if lto-plugin
+	@cd $(HOST_SUBDIR); [ -d stage3-lto-plugin ] || \
+	  mkdir stage3-lto-plugin; \
+	mv stage3-lto-plugin lto-plugin  ; \
+	mv stage2-lto-plugin prev-lto-plugin || test -f stage2-lean 
+@endif lto-plugin
+	@[ -d stage3-$(TARGET_SUBDIR) ] || \
+	  mkdir stage3-$(TARGET_SUBDIR); \
+	mv stage3-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
+	mv stage2-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage2-lean 
+
+stage3-end:: 
+@if bfd
+	@if test -d $(HOST_SUBDIR)/bfd ; then \
+	  cd $(HOST_SUBDIR); mv bfd stage3-bfd ; \
+	  mv prev-bfd stage2-bfd ; :  ; \
+	fi
+@endif bfd
+@if opcodes
+	@if test -d $(HOST_SUBDIR)/opcodes ; then \
+	  cd $(HOST_SUBDIR); mv opcodes stage3-opcodes ; \
+	  mv prev-opcodes stage2-opcodes ; :  ; \
+	fi
+@endif opcodes
+@if binutils
+	@if test -d $(HOST_SUBDIR)/binutils ; then \
+	  cd $(HOST_SUBDIR); mv binutils stage3-binutils ; \
+	  mv prev-binutils stage2-binutils ; :  ; \
+	fi
+@endif binutils
+@if gas
+	@if test -d $(HOST_SUBDIR)/gas ; then \
+	  cd $(HOST_SUBDIR); mv gas stage3-gas ; \
+	  mv prev-gas stage2-gas ; :  ; \
+	fi
+@endif gas
+@if gcc
+	@if test -d $(HOST_SUBDIR)/gcc ; then \
+	  cd $(HOST_SUBDIR); mv gcc stage3-gcc ; \
+	  mv prev-gcc stage2-gcc ; :  ; \
+	fi
+@endif gcc
+@if gmp
+	@if test -d $(HOST_SUBDIR)/gmp ; then \
+	  cd $(HOST_SUBDIR); mv gmp stage3-gmp ; \
+	  mv prev-gmp stage2-gmp ; :  ; \
+	fi
+@endif gmp
+@if mpfr
+	@if test -d $(HOST_SUBDIR)/mpfr ; then \
+	  cd $(HOST_SUBDIR); mv mpfr stage3-mpfr ; \
+	  mv prev-mpfr stage2-mpfr ; :  ; \
+	fi
+@endif mpfr
+@if mpc
+	@if test -d $(HOST_SUBDIR)/mpc ; then \
+	  cd $(HOST_SUBDIR); mv mpc stage3-mpc ; \
+	  mv prev-mpc stage2-mpc ; :  ; \
+	fi
+@endif mpc
+@if ppl
+	@if test -d $(HOST_SUBDIR)/ppl ; then \
+	  cd $(HOST_SUBDIR); mv ppl stage3-ppl ; \
+	  mv prev-ppl stage2-ppl ; :  ; \
+	fi
+@endif ppl
+@if cloog
+	@if test -d $(HOST_SUBDIR)/cloog ; then \
+	  cd $(HOST_SUBDIR); mv cloog stage3-cloog ; \
+	  mv prev-cloog stage2-cloog ; :  ; \
+	fi
+@endif cloog
+@if libelf
+	@if test -d $(HOST_SUBDIR)/libelf ; then \
+	  cd $(HOST_SUBDIR); mv libelf stage3-libelf ; \
+	  mv prev-libelf stage2-libelf ; :  ; \
+	fi
+@endif libelf
+@if gold
+	@if test -d $(HOST_SUBDIR)/gold ; then \
+	  cd $(HOST_SUBDIR); mv gold stage3-gold ; \
+	  mv prev-gold stage2-gold ; :  ; \
+	fi
+@endif gold
+@if intl
+	@if test -d $(HOST_SUBDIR)/intl ; then \
+	  cd $(HOST_SUBDIR); mv intl stage3-intl ; \
+	  mv prev-intl stage2-intl ; :  ; \
+	fi
+@endif intl
+@if ld
+	@if test -d $(HOST_SUBDIR)/ld ; then \
+	  cd $(HOST_SUBDIR); mv ld stage3-ld ; \
+	  mv prev-ld stage2-ld ; :  ; \
+	fi
+@endif ld
+@if libcpp
+	@if test -d $(HOST_SUBDIR)/libcpp ; then \
+	  cd $(HOST_SUBDIR); mv libcpp stage3-libcpp ; \
+	  mv prev-libcpp stage2-libcpp ; :  ; \
+	fi
+@endif libcpp
+@if libdecnumber
+	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
+	  cd $(HOST_SUBDIR); mv libdecnumber stage3-libdecnumber ; \
+	  mv prev-libdecnumber stage2-libdecnumber ; :  ; \
+	fi
+@endif libdecnumber
+@if libiberty
+	@if test -d $(HOST_SUBDIR)/libiberty ; then \
+	  cd $(HOST_SUBDIR); mv libiberty stage3-libiberty ; \
+	  mv prev-libiberty stage2-libiberty ; :  ; \
+	fi
+@endif libiberty
+@if zlib
+	@if test -d $(HOST_SUBDIR)/zlib ; then \
+	  cd $(HOST_SUBDIR); mv zlib stage3-zlib ; \
+	  mv prev-zlib stage2-zlib ; :  ; \
+	fi
+@endif zlib
+@if lto-plugin
+	@if test -d $(HOST_SUBDIR)/lto-plugin ; then \
+	  cd $(HOST_SUBDIR); mv lto-plugin stage3-lto-plugin ; \
+	  mv prev-lto-plugin stage2-lto-plugin ; :  ; \
+	fi
+@endif lto-plugin
+	@if test -d $(TARGET_SUBDIR) ; then \
+	  mv $(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR)  ; \
+	  mv prev-$(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR) ; :  ; \
+	fi
+	rm -f stage_current
+
+# Bubble a bug fix through all the stages up to stage 3.  They are
+# remade, but not reconfigured.  The next stage (if any) will not be
+# reconfigured either.
+.PHONY: stage3-bubble
+stage3-bubble:: stage2-bubble
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	if test -f stage3-lean || test -f stage2-lean  ; then \
+	  echo Skipping rebuild of stage3 ; \
+	else \
+	  $(MAKE) stage3-start; \
+	  if $(LEAN); then \
+	    rm -rf stage1-* ; \
+	    $(STAMP) stage1-lean ; \
+	  fi; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage3; \
+	fi
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) compare
+
+.PHONY: all-stage3 clean-stage3
+do-clean: clean-stage3
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+compare:
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	if test -f stage2-lean; then \
+	  echo Cannot compare object files as stage 2 was deleted. ; \
+	  exit 0 ; \
+	fi; \
+	: $(MAKE); $(stage); \
+	rm -f .bad_compare ; \
+	echo Comparing stages 2 and 3 ; \
+        sed=`echo stage3 | sed 's,^stage,,;s,.,.,g'`; \
+	files=`find stage3-* -name "*$(objext)" -print | \
+		 sed -n s,^stage$$sed-,,p` ; \
+	for file in $${files} ; do \
+	  f1=$$r/stage2-$$file; f2=$$r/stage3-$$file; \
+	  if test ! -f $$f1; then continue; fi; \
+	  $(do-compare) > /dev/null 2>&1; \
+	  if test $$? -eq 1; then \
+	    case $$file in \
+	      @compare_exclusions@) \
+	        echo warning: $$file differs ;; \
+	      *) \
+	        echo $$file differs >> .bad_compare ;; \
+	    esac ; \
+	  fi ; \
+	done ; \
+	if [ -f .bad_compare ]; then \
+	  echo "Bootstrap comparison failure!"; \
+	  cat .bad_compare; \
+	  exit 1; \
+	else \
+	  echo Comparison successful.; \
+	fi ; \
+	$(STAMP) compare
+	if $(LEAN); then \
+	  rm -rf stage2-*; \
+	  $(STAMP) stage2-lean; \
+	fi
+
+
+
+.PHONY: bootstrap bootstrap-lean
+bootstrap:
+	echo stage3 > stage_final
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage3-bubble
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+
+bootstrap-lean:
+	echo stage3 > stage_final
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage3-bubble
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage2:: distclean-stage3 
+.PHONY: distclean-stage3
+distclean-stage3::
+	@: $(MAKE); $(stage)
+	@test "`cat stage_last`" != stage3 || rm -f stage_last
+	rm -rf stage3-* compare 
+
+
+.PHONY: cleanstrap
+cleanstrap: do-distclean local-clean
+	echo stage3 > stage_final
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage3-bubble
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE3_TFLAGS)"; \
+	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+
+@endif gcc-bootstrap
+
+
+.PHONY: stage4-start stage4-end
+
+stage4-start::
+	@: $(MAKE); $(stage); \
+	echo stage4 > stage_current ; \
+	echo stage4 > stage_last; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
+@if bfd
+	@cd $(HOST_SUBDIR); [ -d stage4-bfd ] || \
+	  mkdir stage4-bfd; \
+	mv stage4-bfd bfd  ; \
+	mv stage3-bfd prev-bfd || test -f stage3-lean 
+@endif bfd
+@if opcodes
+	@cd $(HOST_SUBDIR); [ -d stage4-opcodes ] || \
+	  mkdir stage4-opcodes; \
+	mv stage4-opcodes opcodes  ; \
+	mv stage3-opcodes prev-opcodes || test -f stage3-lean 
+@endif opcodes
+@if binutils
+	@cd $(HOST_SUBDIR); [ -d stage4-binutils ] || \
+	  mkdir stage4-binutils; \
+	mv stage4-binutils binutils  ; \
+	mv stage3-binutils prev-binutils || test -f stage3-lean 
+@endif binutils
+@if gas
+	@cd $(HOST_SUBDIR); [ -d stage4-gas ] || \
+	  mkdir stage4-gas; \
+	mv stage4-gas gas  ; \
+	mv stage3-gas prev-gas || test -f stage3-lean 
+@endif gas
+@if gcc
+	@cd $(HOST_SUBDIR); [ -d stage4-gcc ] || \
+	  mkdir stage4-gcc; \
+	mv stage4-gcc gcc  ; \
+	mv stage3-gcc prev-gcc || test -f stage3-lean 
+@endif gcc
+@if gmp
+	@cd $(HOST_SUBDIR); [ -d stage4-gmp ] || \
+	  mkdir stage4-gmp; \
+	mv stage4-gmp gmp  ; \
+	mv stage3-gmp prev-gmp || test -f stage3-lean 
+@endif gmp
+@if mpfr
+	@cd $(HOST_SUBDIR); [ -d stage4-mpfr ] || \
+	  mkdir stage4-mpfr; \
+	mv stage4-mpfr mpfr  ; \
+	mv stage3-mpfr prev-mpfr || test -f stage3-lean 
+@endif mpfr
+@if mpc
+	@cd $(HOST_SUBDIR); [ -d stage4-mpc ] || \
+	  mkdir stage4-mpc; \
+	mv stage4-mpc mpc  ; \
+	mv stage3-mpc prev-mpc || test -f stage3-lean 
+@endif mpc
+@if ppl
+	@cd $(HOST_SUBDIR); [ -d stage4-ppl ] || \
+	  mkdir stage4-ppl; \
+	mv stage4-ppl ppl  ; \
+	mv stage3-ppl prev-ppl || test -f stage3-lean 
+@endif ppl
+@if cloog
+	@cd $(HOST_SUBDIR); [ -d stage4-cloog ] || \
+	  mkdir stage4-cloog; \
+	mv stage4-cloog cloog  ; \
+	mv stage3-cloog prev-cloog || test -f stage3-lean 
+@endif cloog
+@if libelf
+	@cd $(HOST_SUBDIR); [ -d stage4-libelf ] || \
+	  mkdir stage4-libelf; \
+	mv stage4-libelf libelf  ; \
+	mv stage3-libelf prev-libelf || test -f stage3-lean 
+@endif libelf
+@if gold
+	@cd $(HOST_SUBDIR); [ -d stage4-gold ] || \
+	  mkdir stage4-gold; \
+	mv stage4-gold gold  ; \
+	mv stage3-gold prev-gold || test -f stage3-lean 
+@endif gold
+@if intl
+	@cd $(HOST_SUBDIR); [ -d stage4-intl ] || \
+	  mkdir stage4-intl; \
+	mv stage4-intl intl  ; \
+	mv stage3-intl prev-intl || test -f stage3-lean 
+@endif intl
+@if ld
+	@cd $(HOST_SUBDIR); [ -d stage4-ld ] || \
+	  mkdir stage4-ld; \
+	mv stage4-ld ld  ; \
+	mv stage3-ld prev-ld || test -f stage3-lean 
+@endif ld
+@if libcpp
+	@cd $(HOST_SUBDIR); [ -d stage4-libcpp ] || \
+	  mkdir stage4-libcpp; \
+	mv stage4-libcpp libcpp  ; \
+	mv stage3-libcpp prev-libcpp || test -f stage3-lean 
+@endif libcpp
+@if libdecnumber
+	@cd $(HOST_SUBDIR); [ -d stage4-libdecnumber ] || \
+	  mkdir stage4-libdecnumber; \
+	mv stage4-libdecnumber libdecnumber  ; \
+	mv stage3-libdecnumber prev-libdecnumber || test -f stage3-lean 
+@endif libdecnumber
+@if libiberty
+	@cd $(HOST_SUBDIR); [ -d stage4-libiberty ] || \
+	  mkdir stage4-libiberty; \
+	mv stage4-libiberty libiberty  ; \
+	mv stage3-libiberty prev-libiberty || test -f stage3-lean 
+@endif libiberty
+@if zlib
+	@cd $(HOST_SUBDIR); [ -d stage4-zlib ] || \
+	  mkdir stage4-zlib; \
+	mv stage4-zlib zlib  ; \
+	mv stage3-zlib prev-zlib || test -f stage3-lean 
+@endif zlib
+@if lto-plugin
+	@cd $(HOST_SUBDIR); [ -d stage4-lto-plugin ] || \
+	  mkdir stage4-lto-plugin; \
+	mv stage4-lto-plugin lto-plugin  ; \
+	mv stage3-lto-plugin prev-lto-plugin || test -f stage3-lean 
+@endif lto-plugin
+	@[ -d stage4-$(TARGET_SUBDIR) ] || \
+	  mkdir stage4-$(TARGET_SUBDIR); \
+	mv stage4-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
+	mv stage3-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage3-lean 
+
+stage4-end:: 
+@if bfd
+	@if test -d $(HOST_SUBDIR)/bfd ; then \
+	  cd $(HOST_SUBDIR); mv bfd stage4-bfd ; \
+	  mv prev-bfd stage3-bfd ; :  ; \
+	fi
+@endif bfd
+@if opcodes
+	@if test -d $(HOST_SUBDIR)/opcodes ; then \
+	  cd $(HOST_SUBDIR); mv opcodes stage4-opcodes ; \
+	  mv prev-opcodes stage3-opcodes ; :  ; \
+	fi
+@endif opcodes
+@if binutils
+	@if test -d $(HOST_SUBDIR)/binutils ; then \
+	  cd $(HOST_SUBDIR); mv binutils stage4-binutils ; \
+	  mv prev-binutils stage3-binutils ; :  ; \
+	fi
+@endif binutils
+@if gas
+	@if test -d $(HOST_SUBDIR)/gas ; then \
+	  cd $(HOST_SUBDIR); mv gas stage4-gas ; \
+	  mv prev-gas stage3-gas ; :  ; \
+	fi
+@endif gas
+@if gcc
+	@if test -d $(HOST_SUBDIR)/gcc ; then \
+	  cd $(HOST_SUBDIR); mv gcc stage4-gcc ; \
+	  mv prev-gcc stage3-gcc ; :  ; \
+	fi
+@endif gcc
+@if gmp
+	@if test -d $(HOST_SUBDIR)/gmp ; then \
+	  cd $(HOST_SUBDIR); mv gmp stage4-gmp ; \
+	  mv prev-gmp stage3-gmp ; :  ; \
+	fi
+@endif gmp
+@if mpfr
+	@if test -d $(HOST_SUBDIR)/mpfr ; then \
+	  cd $(HOST_SUBDIR); mv mpfr stage4-mpfr ; \
+	  mv prev-mpfr stage3-mpfr ; :  ; \
+	fi
+@endif mpfr
+@if mpc
+	@if test -d $(HOST_SUBDIR)/mpc ; then \
+	  cd $(HOST_SUBDIR); mv mpc stage4-mpc ; \
+	  mv prev-mpc stage3-mpc ; :  ; \
+	fi
+@endif mpc
+@if ppl
+	@if test -d $(HOST_SUBDIR)/ppl ; then \
+	  cd $(HOST_SUBDIR); mv ppl stage4-ppl ; \
+	  mv prev-ppl stage3-ppl ; :  ; \
+	fi
+@endif ppl
+@if cloog
+	@if test -d $(HOST_SUBDIR)/cloog ; then \
+	  cd $(HOST_SUBDIR); mv cloog stage4-cloog ; \
+	  mv prev-cloog stage3-cloog ; :  ; \
+	fi
+@endif cloog
+@if libelf
+	@if test -d $(HOST_SUBDIR)/libelf ; then \
+	  cd $(HOST_SUBDIR); mv libelf stage4-libelf ; \
+	  mv prev-libelf stage3-libelf ; :  ; \
+	fi
+@endif libelf
+@if gold
+	@if test -d $(HOST_SUBDIR)/gold ; then \
+	  cd $(HOST_SUBDIR); mv gold stage4-gold ; \
+	  mv prev-gold stage3-gold ; :  ; \
+	fi
+@endif gold
+@if intl
+	@if test -d $(HOST_SUBDIR)/intl ; then \
+	  cd $(HOST_SUBDIR); mv intl stage4-intl ; \
+	  mv prev-intl stage3-intl ; :  ; \
+	fi
+@endif intl
+@if ld
+	@if test -d $(HOST_SUBDIR)/ld ; then \
+	  cd $(HOST_SUBDIR); mv ld stage4-ld ; \
+	  mv prev-ld stage3-ld ; :  ; \
+	fi
+@endif ld
+@if libcpp
+	@if test -d $(HOST_SUBDIR)/libcpp ; then \
+	  cd $(HOST_SUBDIR); mv libcpp stage4-libcpp ; \
+	  mv prev-libcpp stage3-libcpp ; :  ; \
+	fi
+@endif libcpp
+@if libdecnumber
+	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
+	  cd $(HOST_SUBDIR); mv libdecnumber stage4-libdecnumber ; \
+	  mv prev-libdecnumber stage3-libdecnumber ; :  ; \
+	fi
+@endif libdecnumber
+@if libiberty
+	@if test -d $(HOST_SUBDIR)/libiberty ; then \
+	  cd $(HOST_SUBDIR); mv libiberty stage4-libiberty ; \
+	  mv prev-libiberty stage3-libiberty ; :  ; \
+	fi
+@endif libiberty
+@if zlib
+	@if test -d $(HOST_SUBDIR)/zlib ; then \
+	  cd $(HOST_SUBDIR); mv zlib stage4-zlib ; \
+	  mv prev-zlib stage3-zlib ; :  ; \
+	fi
+@endif zlib
+@if lto-plugin
+	@if test -d $(HOST_SUBDIR)/lto-plugin ; then \
+	  cd $(HOST_SUBDIR); mv lto-plugin stage4-lto-plugin ; \
+	  mv prev-lto-plugin stage3-lto-plugin ; :  ; \
+	fi
+@endif lto-plugin
+	@if test -d $(TARGET_SUBDIR) ; then \
+	  mv $(TARGET_SUBDIR) stage4-$(TARGET_SUBDIR)  ; \
+	  mv prev-$(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR) ; :  ; \
+	fi
+	rm -f stage_current
+
+# Bubble a bug fix through all the stages up to stage 4.  They are
+# remade, but not reconfigured.  The next stage (if any) will not be
+# reconfigured either.
+.PHONY: stage4-bubble
+stage4-bubble:: stage3-bubble
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	if test -f stage4-lean || test -f stage3-lean  ; then \
+	  echo Skipping rebuild of stage4 ; \
+	else \
+	  $(MAKE) stage4-start; \
+	  if $(LEAN); then \
+	    rm -rf stage2-* ; \
+	    $(STAMP) stage2-lean ; \
+	  fi; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4; \
+	fi
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) compare3
+
+.PHONY: all-stage4 clean-stage4
+do-clean: clean-stage4
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+compare3:
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	if test -f stage3-lean; then \
+	  echo Cannot compare object files as stage 3 was deleted. ; \
+	  exit 0 ; \
+	fi; \
+	: $(MAKE); $(stage); \
+	rm -f .bad_compare ; \
+	echo Comparing stages 3 and 4 ; \
+        sed=`echo stage4 | sed 's,^stage,,;s,.,.,g'`; \
+	files=`find stage4-* -name "*$(objext)" -print | \
+		 sed -n s,^stage$$sed-,,p` ; \
+	for file in $${files} ; do \
+	  f1=$$r/stage3-$$file; f2=$$r/stage4-$$file; \
+	  if test ! -f $$f1; then continue; fi; \
+	  $(do-compare3) > /dev/null 2>&1; \
+	  if test $$? -eq 1; then \
+	    case $$file in \
+	      @compare_exclusions@) \
+	        echo warning: $$file differs ;; \
+	      *) \
+	        echo $$file differs >> .bad_compare ;; \
+	    esac ; \
+	  fi ; \
+	done ; \
+	if [ -f .bad_compare ]; then \
+	  echo "Bootstrap comparison failure!"; \
+	  cat .bad_compare; \
+	  exit 1; \
+	else \
+	  echo Comparison successful.; \
+	fi ; \
+	$(STAMP) compare3
+	if $(LEAN); then \
+	  rm -rf stage3-*; \
+	  $(STAMP) stage3-lean; \
+	fi
+
+
+
+.PHONY: bootstrap4 bootstrap4-lean
+bootstrap4:
+	echo stage4 > stage_final
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage4-bubble
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+
+bootstrap4-lean:
+	echo stage4 > stage_final
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage4-bubble
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE4_TFLAGS)"; \
+	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage3:: distclean-stage4 
+.PHONY: distclean-stage4
+distclean-stage4::
+	@: $(MAKE); $(stage)
+	@test "`cat stage_last`" != stage4 || rm -f stage_last
+	rm -rf stage4-* compare3 
+
+
+@endif gcc-bootstrap
+
+
+.PHONY: stageprofile-start stageprofile-end
+
+stageprofile-start::
+	@: $(MAKE); $(stage); \
+	echo stageprofile > stage_current ; \
+	echo stageprofile > stage_last; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
+@if bfd
+	@cd $(HOST_SUBDIR); [ -d stageprofile-bfd ] || \
+	  mkdir stageprofile-bfd; \
+	mv stageprofile-bfd bfd  ; \
+	mv stage1-bfd prev-bfd || test -f stage1-lean 
+@endif bfd
+@if opcodes
+	@cd $(HOST_SUBDIR); [ -d stageprofile-opcodes ] || \
+	  mkdir stageprofile-opcodes; \
+	mv stageprofile-opcodes opcodes  ; \
+	mv stage1-opcodes prev-opcodes || test -f stage1-lean 
+@endif opcodes
+@if binutils
+	@cd $(HOST_SUBDIR); [ -d stageprofile-binutils ] || \
+	  mkdir stageprofile-binutils; \
+	mv stageprofile-binutils binutils  ; \
+	mv stage1-binutils prev-binutils || test -f stage1-lean 
+@endif binutils
+@if gas
+	@cd $(HOST_SUBDIR); [ -d stageprofile-gas ] || \
+	  mkdir stageprofile-gas; \
+	mv stageprofile-gas gas  ; \
+	mv stage1-gas prev-gas || test -f stage1-lean 
+@endif gas
+@if gcc
+	@cd $(HOST_SUBDIR); [ -d stageprofile-gcc ] || \
+	  mkdir stageprofile-gcc; \
+	mv stageprofile-gcc gcc  ; \
+	mv stage1-gcc prev-gcc || test -f stage1-lean 
+@endif gcc
+@if gmp
+	@cd $(HOST_SUBDIR); [ -d stageprofile-gmp ] || \
+	  mkdir stageprofile-gmp; \
+	mv stageprofile-gmp gmp  ; \
+	mv stage1-gmp prev-gmp || test -f stage1-lean 
+@endif gmp
+@if mpfr
+	@cd $(HOST_SUBDIR); [ -d stageprofile-mpfr ] || \
+	  mkdir stageprofile-mpfr; \
+	mv stageprofile-mpfr mpfr  ; \
+	mv stage1-mpfr prev-mpfr || test -f stage1-lean 
+@endif mpfr
+@if mpc
+	@cd $(HOST_SUBDIR); [ -d stageprofile-mpc ] || \
+	  mkdir stageprofile-mpc; \
+	mv stageprofile-mpc mpc  ; \
+	mv stage1-mpc prev-mpc || test -f stage1-lean 
+@endif mpc
+@if ppl
+	@cd $(HOST_SUBDIR); [ -d stageprofile-ppl ] || \
+	  mkdir stageprofile-ppl; \
+	mv stageprofile-ppl ppl  ; \
+	mv stage1-ppl prev-ppl || test -f stage1-lean 
+@endif ppl
+@if cloog
+	@cd $(HOST_SUBDIR); [ -d stageprofile-cloog ] || \
+	  mkdir stageprofile-cloog; \
+	mv stageprofile-cloog cloog  ; \
+	mv stage1-cloog prev-cloog || test -f stage1-lean 
+@endif cloog
+@if libelf
+	@cd $(HOST_SUBDIR); [ -d stageprofile-libelf ] || \
+	  mkdir stageprofile-libelf; \
+	mv stageprofile-libelf libelf  ; \
+	mv stage1-libelf prev-libelf || test -f stage1-lean 
+@endif libelf
+@if gold
+	@cd $(HOST_SUBDIR); [ -d stageprofile-gold ] || \
+	  mkdir stageprofile-gold; \
+	mv stageprofile-gold gold  ; \
+	mv stage1-gold prev-gold || test -f stage1-lean 
+@endif gold
+@if intl
+	@cd $(HOST_SUBDIR); [ -d stageprofile-intl ] || \
+	  mkdir stageprofile-intl; \
+	mv stageprofile-intl intl  ; \
+	mv stage1-intl prev-intl || test -f stage1-lean 
+@endif intl
+@if ld
+	@cd $(HOST_SUBDIR); [ -d stageprofile-ld ] || \
+	  mkdir stageprofile-ld; \
+	mv stageprofile-ld ld  ; \
+	mv stage1-ld prev-ld || test -f stage1-lean 
+@endif ld
+@if libcpp
+	@cd $(HOST_SUBDIR); [ -d stageprofile-libcpp ] || \
+	  mkdir stageprofile-libcpp; \
+	mv stageprofile-libcpp libcpp  ; \
+	mv stage1-libcpp prev-libcpp || test -f stage1-lean 
+@endif libcpp
+@if libdecnumber
+	@cd $(HOST_SUBDIR); [ -d stageprofile-libdecnumber ] || \
+	  mkdir stageprofile-libdecnumber; \
+	mv stageprofile-libdecnumber libdecnumber  ; \
+	mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean 
+@endif libdecnumber
+@if libiberty
+	@cd $(HOST_SUBDIR); [ -d stageprofile-libiberty ] || \
+	  mkdir stageprofile-libiberty; \
+	mv stageprofile-libiberty libiberty  ; \
+	mv stage1-libiberty prev-libiberty || test -f stage1-lean 
+@endif libiberty
+@if zlib
+	@cd $(HOST_SUBDIR); [ -d stageprofile-zlib ] || \
+	  mkdir stageprofile-zlib; \
+	mv stageprofile-zlib zlib  ; \
+	mv stage1-zlib prev-zlib || test -f stage1-lean 
+@endif zlib
+@if lto-plugin
+	@cd $(HOST_SUBDIR); [ -d stageprofile-lto-plugin ] || \
+	  mkdir stageprofile-lto-plugin; \
+	mv stageprofile-lto-plugin lto-plugin  ; \
+	mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
+@endif lto-plugin
+	@[ -d stageprofile-$(TARGET_SUBDIR) ] || \
+	  mkdir stageprofile-$(TARGET_SUBDIR); \
+	mv stageprofile-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
+	mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean 
+
+stageprofile-end:: 
+@if bfd
+	@if test -d $(HOST_SUBDIR)/bfd ; then \
+	  cd $(HOST_SUBDIR); mv bfd stageprofile-bfd ; \
+	  mv prev-bfd stage1-bfd ; :  ; \
+	fi
+@endif bfd
+@if opcodes
+	@if test -d $(HOST_SUBDIR)/opcodes ; then \
+	  cd $(HOST_SUBDIR); mv opcodes stageprofile-opcodes ; \
+	  mv prev-opcodes stage1-opcodes ; :  ; \
+	fi
+@endif opcodes
+@if binutils
+	@if test -d $(HOST_SUBDIR)/binutils ; then \
+	  cd $(HOST_SUBDIR); mv binutils stageprofile-binutils ; \
+	  mv prev-binutils stage1-binutils ; :  ; \
+	fi
+@endif binutils
+@if gas
+	@if test -d $(HOST_SUBDIR)/gas ; then \
+	  cd $(HOST_SUBDIR); mv gas stageprofile-gas ; \
+	  mv prev-gas stage1-gas ; :  ; \
+	fi
+@endif gas
+@if gcc
+	@if test -d $(HOST_SUBDIR)/gcc ; then \
+	  cd $(HOST_SUBDIR); mv gcc stageprofile-gcc ; \
+	  mv prev-gcc stage1-gcc ; :  ; \
+	fi
+@endif gcc
+@if gmp
+	@if test -d $(HOST_SUBDIR)/gmp ; then \
+	  cd $(HOST_SUBDIR); mv gmp stageprofile-gmp ; \
+	  mv prev-gmp stage1-gmp ; :  ; \
+	fi
+@endif gmp
+@if mpfr
+	@if test -d $(HOST_SUBDIR)/mpfr ; then \
+	  cd $(HOST_SUBDIR); mv mpfr stageprofile-mpfr ; \
+	  mv prev-mpfr stage1-mpfr ; :  ; \
+	fi
+@endif mpfr
+@if mpc
+	@if test -d $(HOST_SUBDIR)/mpc ; then \
+	  cd $(HOST_SUBDIR); mv mpc stageprofile-mpc ; \
+	  mv prev-mpc stage1-mpc ; :  ; \
+	fi
+@endif mpc
+@if ppl
+	@if test -d $(HOST_SUBDIR)/ppl ; then \
+	  cd $(HOST_SUBDIR); mv ppl stageprofile-ppl ; \
+	  mv prev-ppl stage1-ppl ; :  ; \
+	fi
+@endif ppl
+@if cloog
+	@if test -d $(HOST_SUBDIR)/cloog ; then \
+	  cd $(HOST_SUBDIR); mv cloog stageprofile-cloog ; \
+	  mv prev-cloog stage1-cloog ; :  ; \
+	fi
+@endif cloog
+@if libelf
+	@if test -d $(HOST_SUBDIR)/libelf ; then \
+	  cd $(HOST_SUBDIR); mv libelf stageprofile-libelf ; \
+	  mv prev-libelf stage1-libelf ; :  ; \
+	fi
+@endif libelf
+@if gold
+	@if test -d $(HOST_SUBDIR)/gold ; then \
+	  cd $(HOST_SUBDIR); mv gold stageprofile-gold ; \
+	  mv prev-gold stage1-gold ; :  ; \
+	fi
+@endif gold
+@if intl
+	@if test -d $(HOST_SUBDIR)/intl ; then \
+	  cd $(HOST_SUBDIR); mv intl stageprofile-intl ; \
+	  mv prev-intl stage1-intl ; :  ; \
+	fi
+@endif intl
+@if ld
+	@if test -d $(HOST_SUBDIR)/ld ; then \
+	  cd $(HOST_SUBDIR); mv ld stageprofile-ld ; \
+	  mv prev-ld stage1-ld ; :  ; \
+	fi
+@endif ld
+@if libcpp
+	@if test -d $(HOST_SUBDIR)/libcpp ; then \
+	  cd $(HOST_SUBDIR); mv libcpp stageprofile-libcpp ; \
+	  mv prev-libcpp stage1-libcpp ; :  ; \
+	fi
+@endif libcpp
+@if libdecnumber
+	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
+	  cd $(HOST_SUBDIR); mv libdecnumber stageprofile-libdecnumber ; \
+	  mv prev-libdecnumber stage1-libdecnumber ; :  ; \
+	fi
+@endif libdecnumber
+@if libiberty
+	@if test -d $(HOST_SUBDIR)/libiberty ; then \
+	  cd $(HOST_SUBDIR); mv libiberty stageprofile-libiberty ; \
+	  mv prev-libiberty stage1-libiberty ; :  ; \
+	fi
+@endif libiberty
+@if zlib
+	@if test -d $(HOST_SUBDIR)/zlib ; then \
+	  cd $(HOST_SUBDIR); mv zlib stageprofile-zlib ; \
+	  mv prev-zlib stage1-zlib ; :  ; \
+	fi
+@endif zlib
+@if lto-plugin
+	@if test -d $(HOST_SUBDIR)/lto-plugin ; then \
+	  cd $(HOST_SUBDIR); mv lto-plugin stageprofile-lto-plugin ; \
+	  mv prev-lto-plugin stage1-lto-plugin ; :  ; \
+	fi
+@endif lto-plugin
+	@if test -d $(TARGET_SUBDIR) ; then \
+	  mv $(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR)  ; \
+	  mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; :  ; \
+	fi
+	rm -f stage_current
+
+# Bubble a bug fix through all the stages up to stage profile.  They are
+# remade, but not reconfigured.  The next stage (if any) will not be
+# reconfigured either.
+.PHONY: stageprofile-bubble
+stageprofile-bubble:: stage1-bubble
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	if test -f stageprofile-lean || test -f stage1-lean  ; then \
+	  echo Skipping rebuild of stageprofile ; \
+	else \
+	  $(MAKE) stageprofile-start; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageprofile; \
+	fi
+
+.PHONY: all-stageprofile clean-stageprofile
+do-clean: clean-stageprofile
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage1:: distclean-stageprofile 
+.PHONY: distclean-stageprofile
+distclean-stageprofile::
+	@: $(MAKE); $(stage)
+	@test "`cat stage_last`" != stageprofile || rm -f stage_last
+	rm -rf stageprofile-* 
+
+
+@endif gcc-bootstrap
+
+
+.PHONY: stagefeedback-start stagefeedback-end
+
+stagefeedback-start::
+	@: $(MAKE); $(stage); \
+	echo stagefeedback > stage_current ; \
+	echo stagefeedback > stage_last; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
+@if bfd
+	@cd $(HOST_SUBDIR); [ -d stagefeedback-bfd ] || \
+	  mkdir stagefeedback-bfd; \
+	mv stagefeedback-bfd bfd  ; \
+	mv stageprofile-bfd prev-bfd || test -f stageprofile-lean 
+@endif bfd
+@if opcodes
+	@cd $(HOST_SUBDIR); [ -d stagefeedback-opcodes ] || \
+	  mkdir stagefeedback-opcodes; \
+	mv stagefeedback-opcodes opcodes  ; \
+	mv stageprofile-opcodes prev-opcodes || test -f stageprofile-lean 
+@endif opcodes
+@if binutils
+	@cd $(HOST_SUBDIR); [ -d stagefeedback-binutils ] || \
+	  mkdir stagefeedback-binutils; \
+	mv stagefeedback-binutils binutils  ; \
+	mv stageprofile-binutils prev-binutils || test -f stageprofile-lean 
+@endif binutils
+@if gas
+	@cd $(HOST_SUBDIR); [ -d stagefeedback-gas ] || \
+	  mkdir stagefeedback-gas; \
+	mv stagefeedback-gas gas  ; \
+	mv stageprofile-gas prev-gas || test -f stageprofile-lean 
+@endif gas
+@if gcc
+	@cd $(HOST_SUBDIR); [ -d stagefeedback-gcc ] || \
+	  mkdir stagefeedback-gcc; \
+	mv stagefeedback-gcc gcc  ; \
+	mv stageprofile-gcc prev-gcc || test -f stageprofile-lean 
+@endif gcc
+@if gmp
+	@cd $(HOST_SUBDIR); [ -d stagefeedback-gmp ] || \
+	  mkdir stagefeedback-gmp; \
+	mv stagefeedback-gmp gmp  ; \
+	mv stageprofile-gmp prev-gmp || test -f stageprofile-lean 
+@endif gmp
+@if mpfr
+	@cd $(HOST_SUBDIR); [ -d stagefeedback-mpfr ] || \
+	  mkdir stagefeedback-mpfr; \
+	mv stagefeedback-mpfr mpfr  ; \
+	mv stageprofile-mpfr prev-mpfr || test -f stageprofile-lean 
+@endif mpfr
+@if mpc
+	@cd $(HOST_SUBDIR); [ -d stagefeedback-mpc ] || \
+	  mkdir stagefeedback-mpc; \
+	mv stagefeedback-mpc mpc  ; \
+	mv stageprofile-mpc prev-mpc || test -f stageprofile-lean 
+@endif mpc
+@if ppl
+	@cd $(HOST_SUBDIR); [ -d stagefeedback-ppl ] || \
+	  mkdir stagefeedback-ppl; \
+	mv stagefeedback-ppl ppl  ; \
+	mv stageprofile-ppl prev-ppl || test -f stageprofile-lean 
+@endif ppl
+@if cloog
+	@cd $(HOST_SUBDIR); [ -d stagefeedback-cloog ] || \
+	  mkdir stagefeedback-cloog; \
+	mv stagefeedback-cloog cloog  ; \
+	mv stageprofile-cloog prev-cloog || test -f stageprofile-lean 
+@endif cloog
+@if libelf
+	@cd $(HOST_SUBDIR); [ -d stagefeedback-libelf ] || \
+	  mkdir stagefeedback-libelf; \
+	mv stagefeedback-libelf libelf  ; \
+	mv stageprofile-libelf prev-libelf || test -f stageprofile-lean 
+@endif libelf
+@if gold
+	@cd $(HOST_SUBDIR); [ -d stagefeedback-gold ] || \
+	  mkdir stagefeedback-gold; \
+	mv stagefeedback-gold gold  ; \
+	mv stageprofile-gold prev-gold || test -f stageprofile-lean 
+@endif gold
+@if intl
+	@cd $(HOST_SUBDIR); [ -d stagefeedback-intl ] || \
+	  mkdir stagefeedback-intl; \
+	mv stagefeedback-intl intl  ; \
+	mv stageprofile-intl prev-intl || test -f stageprofile-lean 
+@endif intl
+@if ld
+	@cd $(HOST_SUBDIR); [ -d stagefeedback-ld ] || \
+	  mkdir stagefeedback-ld; \
+	mv stagefeedback-ld ld  ; \
+	mv stageprofile-ld prev-ld || test -f stageprofile-lean 
+@endif ld
+@if libcpp
+	@cd $(HOST_SUBDIR); [ -d stagefeedback-libcpp ] || \
+	  mkdir stagefeedback-libcpp; \
+	mv stagefeedback-libcpp libcpp  ; \
+	mv stageprofile-libcpp prev-libcpp || test -f stageprofile-lean 
+@endif libcpp
+@if libdecnumber
+	@cd $(HOST_SUBDIR); [ -d stagefeedback-libdecnumber ] || \
+	  mkdir stagefeedback-libdecnumber; \
+	mv stagefeedback-libdecnumber libdecnumber  ; \
+	mv stageprofile-libdecnumber prev-libdecnumber || test -f stageprofile-lean 
+@endif libdecnumber
+@if libiberty
+	@cd $(HOST_SUBDIR); [ -d stagefeedback-libiberty ] || \
+	  mkdir stagefeedback-libiberty; \
+	mv stagefeedback-libiberty libiberty  ; \
+	mv stageprofile-libiberty prev-libiberty || test -f stageprofile-lean 
+@endif libiberty
+@if zlib
+	@cd $(HOST_SUBDIR); [ -d stagefeedback-zlib ] || \
+	  mkdir stagefeedback-zlib; \
+	mv stagefeedback-zlib zlib  ; \
+	mv stageprofile-zlib prev-zlib || test -f stageprofile-lean 
+@endif zlib
+@if lto-plugin
+	@cd $(HOST_SUBDIR); [ -d stagefeedback-lto-plugin ] || \
+	  mkdir stagefeedback-lto-plugin; \
+	mv stagefeedback-lto-plugin lto-plugin  ; \
+	mv stageprofile-lto-plugin prev-lto-plugin || test -f stageprofile-lean 
+@endif lto-plugin
+	@[ -d stagefeedback-$(TARGET_SUBDIR) ] || \
+	  mkdir stagefeedback-$(TARGET_SUBDIR); \
+	mv stagefeedback-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
+	mv stageprofile-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stageprofile-lean 
+
+stagefeedback-end:: 
+@if bfd
+	@if test -d $(HOST_SUBDIR)/bfd ; then \
+	  cd $(HOST_SUBDIR); mv bfd stagefeedback-bfd ; \
+	  mv prev-bfd stageprofile-bfd ; :  ; \
+	fi
+@endif bfd
+@if opcodes
+	@if test -d $(HOST_SUBDIR)/opcodes ; then \
+	  cd $(HOST_SUBDIR); mv opcodes stagefeedback-opcodes ; \
+	  mv prev-opcodes stageprofile-opcodes ; :  ; \
+	fi
+@endif opcodes
+@if binutils
+	@if test -d $(HOST_SUBDIR)/binutils ; then \
+	  cd $(HOST_SUBDIR); mv binutils stagefeedback-binutils ; \
+	  mv prev-binutils stageprofile-binutils ; :  ; \
+	fi
+@endif binutils
+@if gas
+	@if test -d $(HOST_SUBDIR)/gas ; then \
+	  cd $(HOST_SUBDIR); mv gas stagefeedback-gas ; \
+	  mv prev-gas stageprofile-gas ; :  ; \
+	fi
+@endif gas
+@if gcc
+	@if test -d $(HOST_SUBDIR)/gcc ; then \
+	  cd $(HOST_SUBDIR); mv gcc stagefeedback-gcc ; \
+	  mv prev-gcc stageprofile-gcc ; :  ; \
+	fi
+@endif gcc
+@if gmp
+	@if test -d $(HOST_SUBDIR)/gmp ; then \
+	  cd $(HOST_SUBDIR); mv gmp stagefeedback-gmp ; \
+	  mv prev-gmp stageprofile-gmp ; :  ; \
+	fi
+@endif gmp
+@if mpfr
+	@if test -d $(HOST_SUBDIR)/mpfr ; then \
+	  cd $(HOST_SUBDIR); mv mpfr stagefeedback-mpfr ; \
+	  mv prev-mpfr stageprofile-mpfr ; :  ; \
+	fi
+@endif mpfr
+@if mpc
+	@if test -d $(HOST_SUBDIR)/mpc ; then \
+	  cd $(HOST_SUBDIR); mv mpc stagefeedback-mpc ; \
+	  mv prev-mpc stageprofile-mpc ; :  ; \
+	fi
+@endif mpc
+@if ppl
+	@if test -d $(HOST_SUBDIR)/ppl ; then \
+	  cd $(HOST_SUBDIR); mv ppl stagefeedback-ppl ; \
+	  mv prev-ppl stageprofile-ppl ; :  ; \
+	fi
+@endif ppl
+@if cloog
+	@if test -d $(HOST_SUBDIR)/cloog ; then \
+	  cd $(HOST_SUBDIR); mv cloog stagefeedback-cloog ; \
+	  mv prev-cloog stageprofile-cloog ; :  ; \
+	fi
+@endif cloog
+@if libelf
+	@if test -d $(HOST_SUBDIR)/libelf ; then \
+	  cd $(HOST_SUBDIR); mv libelf stagefeedback-libelf ; \
+	  mv prev-libelf stageprofile-libelf ; :  ; \
+	fi
+@endif libelf
+@if gold
+	@if test -d $(HOST_SUBDIR)/gold ; then \
+	  cd $(HOST_SUBDIR); mv gold stagefeedback-gold ; \
+	  mv prev-gold stageprofile-gold ; :  ; \
+	fi
+@endif gold
+@if intl
+	@if test -d $(HOST_SUBDIR)/intl ; then \
+	  cd $(HOST_SUBDIR); mv intl stagefeedback-intl ; \
+	  mv prev-intl stageprofile-intl ; :  ; \
+	fi
+@endif intl
+@if ld
+	@if test -d $(HOST_SUBDIR)/ld ; then \
+	  cd $(HOST_SUBDIR); mv ld stagefeedback-ld ; \
+	  mv prev-ld stageprofile-ld ; :  ; \
+	fi
+@endif ld
+@if libcpp
+	@if test -d $(HOST_SUBDIR)/libcpp ; then \
+	  cd $(HOST_SUBDIR); mv libcpp stagefeedback-libcpp ; \
+	  mv prev-libcpp stageprofile-libcpp ; :  ; \
+	fi
+@endif libcpp
+@if libdecnumber
+	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
+	  cd $(HOST_SUBDIR); mv libdecnumber stagefeedback-libdecnumber ; \
+	  mv prev-libdecnumber stageprofile-libdecnumber ; :  ; \
+	fi
+@endif libdecnumber
+@if libiberty
+	@if test -d $(HOST_SUBDIR)/libiberty ; then \
+	  cd $(HOST_SUBDIR); mv libiberty stagefeedback-libiberty ; \
+	  mv prev-libiberty stageprofile-libiberty ; :  ; \
+	fi
+@endif libiberty
+@if zlib
+	@if test -d $(HOST_SUBDIR)/zlib ; then \
+	  cd $(HOST_SUBDIR); mv zlib stagefeedback-zlib ; \
+	  mv prev-zlib stageprofile-zlib ; :  ; \
+	fi
+@endif zlib
+@if lto-plugin
+	@if test -d $(HOST_SUBDIR)/lto-plugin ; then \
+	  cd $(HOST_SUBDIR); mv lto-plugin stagefeedback-lto-plugin ; \
+	  mv prev-lto-plugin stageprofile-lto-plugin ; :  ; \
+	fi
+@endif lto-plugin
+	@if test -d $(TARGET_SUBDIR) ; then \
+	  mv $(TARGET_SUBDIR) stagefeedback-$(TARGET_SUBDIR)  ; \
+	  mv prev-$(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR) ; :  ; \
+	fi
+	rm -f stage_current
+
+# Bubble a bug fix through all the stages up to stage feedback.  They are
+# remade, but not reconfigured.  The next stage (if any) will not be
+# reconfigured either.
+.PHONY: stagefeedback-bubble
+stagefeedback-bubble:: stageprofile-bubble
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	if test -f stagefeedback-lean || test -f stageprofile-lean  ; then \
+	  echo Skipping rebuild of stagefeedback ; \
+	else \
+	  $(MAKE) stagefeedback-start; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stagefeedback; \
+	fi
+
+.PHONY: all-stagefeedback clean-stagefeedback
+do-clean: clean-stagefeedback
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+
+
+.PHONY: profiledbootstrap profiledbootstrap-lean
+profiledbootstrap:
+	echo stagefeedback > stage_final
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stagefeedback-bubble
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+
+profiledbootstrap-lean:
+	echo stagefeedback > stage_final
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stagefeedback-bubble
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stageprofile:: distclean-stagefeedback 
+.PHONY: distclean-stagefeedback
+distclean-stagefeedback::
+	@: $(MAKE); $(stage)
+	@test "`cat stage_last`" != stagefeedback || rm -f stage_last
+	rm -rf stagefeedback-* 
+
+
+@endif gcc-bootstrap
+
+
+
+stageprofile-end::
+	$(MAKE) distclean-stagefeedback
+
+stagefeedback-start::
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	for i in prev-*; do \
+	  j=`echo $$i | sed s/^prev-//` ; \
+	  cd $$r/$$i && \
+	  { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../'$$j'/&",' | $(SHELL) ; } && \
+	  { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../'$$j'/&",' | $(SHELL) ; } ; \
+	done
+
+@if gcc-bootstrap
+do-distclean: distclean-stage1
+
+# Provide a GCC build when we're building target libraries.  This does
+# not work as a dependency, just as the minimum necessary to avoid errors.
+stage_last:
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble
+
+# Same as unstage, but not phony and defaulting to stage1-start.  We place
+# it in the dependency so that for example `make -j3 all-gcc' works.
+stage_current:
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+
+.PHONY: restrap
+restrap::
+	@: $(MAKE); $(stage)
+	rm -rf stage1-$(TARGET_SUBDIR) stage2-* stage3-* stage4-* stageprofile-* stagefeedback-*
+restrap:: all
+@endif gcc-bootstrap
+
+# --------------------------------------
+# Dependencies between different modules
+# --------------------------------------
+
+# Generic dependencies for target modules on host stuff, especially gcc
+@if gcc-bootstrap
+configure-stage1-target-libstdc++-v3: maybe-all-stage1-gcc
+configure-stage2-target-libstdc++-v3: maybe-all-stage2-gcc
+configure-stage3-target-libstdc++-v3: maybe-all-stage3-gcc
+configure-stage4-target-libstdc++-v3: maybe-all-stage4-gcc
+configure-stageprofile-target-libstdc++-v3: maybe-all-stageprofile-gcc
+configure-stagefeedback-target-libstdc++-v3: maybe-all-stagefeedback-gcc
+configure-target-libmudflap: stage_last
+configure-target-libssp: stage_last
+configure-target-newlib: stage_last
+configure-stage1-target-libgcc: maybe-all-stage1-gcc
+configure-stage2-target-libgcc: maybe-all-stage2-gcc
+configure-stage3-target-libgcc: maybe-all-stage3-gcc
+configure-stage4-target-libgcc: maybe-all-stage4-gcc
+configure-stageprofile-target-libgcc: maybe-all-stageprofile-gcc
+configure-stagefeedback-target-libgcc: maybe-all-stagefeedback-gcc
+configure-target-libquadmath: stage_last
+configure-target-libgfortran: stage_last
+configure-target-libobjc: stage_last
+configure-target-libgo: stage_last
+configure-target-libtermcap: stage_last
+configure-target-winsup: stage_last
+configure-target-libgloss: stage_last
+configure-target-libffi: stage_last
+configure-target-libjava: stage_last
+configure-target-zlib: stage_last
+configure-target-boehm-gc: stage_last
+configure-target-rda: stage_last
+configure-target-libada: stage_last
+configure-stage1-target-libgomp: maybe-all-stage1-gcc
+configure-stage2-target-libgomp: maybe-all-stage2-gcc
+configure-stage3-target-libgomp: maybe-all-stage3-gcc
+configure-stage4-target-libgomp: maybe-all-stage4-gcc
+configure-stageprofile-target-libgomp: maybe-all-stageprofile-gcc
+configure-stagefeedback-target-libgomp: maybe-all-stagefeedback-gcc
+@endif gcc-bootstrap
+
+@if gcc-no-bootstrap
+configure-target-libstdc++-v3: maybe-all-gcc
+configure-target-libmudflap: maybe-all-gcc
+configure-target-libssp: maybe-all-gcc
+configure-target-newlib: maybe-all-gcc
+configure-target-libgcc: maybe-all-gcc
+configure-target-libquadmath: maybe-all-gcc
+configure-target-libgfortran: maybe-all-gcc
+configure-target-libobjc: maybe-all-gcc
+configure-target-libgo: maybe-all-gcc
+configure-target-libtermcap: maybe-all-gcc
+configure-target-winsup: maybe-all-gcc
+configure-target-libgloss: maybe-all-gcc
+configure-target-libffi: maybe-all-gcc
+configure-target-libjava: maybe-all-gcc
+configure-target-zlib: maybe-all-gcc
+configure-target-boehm-gc: maybe-all-gcc
+configure-target-rda: maybe-all-gcc
+configure-target-libada: maybe-all-gcc
+configure-target-libgomp: maybe-all-gcc
+@endif gcc-no-bootstrap
+
+
+# There are two types of dependencies here: 'hard' dependencies, where one
+# module simply won't build without the other; and 'soft' dependencies, where
+# if the depended-on module is missing, the depending module will do without
+# or find a substitute somewhere (perhaps installed).  Soft dependencies
+# are made here to depend on a 'maybe-' target.  If you're not sure,
+# it's safer to use a soft dependency.
+
+
+
+
+
+
+# With all the machinery above in place, it is pretty easy to generate
+# dependencies.  Host dependencies are a bit more complex because we have
+# to check for bootstrap/prebootstrap dependencies.  To resolve
+# prebootstrap dependencies, prebootstrap modules are gathered in
+# a hash table.
+all-build-bison: maybe-all-build-texinfo
+all-build-flex: maybe-all-build-texinfo
+all-build-flex: maybe-all-build-bison
+all-build-flex: maybe-all-build-m4
+all-build-libiberty: maybe-all-build-texinfo
+all-build-m4: maybe-all-build-texinfo
+all-build-fixincludes: maybe-all-build-libiberty
+configure-gcc: maybe-configure-intl
+
+configure-stage1-gcc: maybe-configure-stage1-intl
+configure-stage2-gcc: maybe-configure-stage2-intl
+configure-stage3-gcc: maybe-configure-stage3-intl
+configure-stage4-gcc: maybe-configure-stage4-intl
+configure-stageprofile-gcc: maybe-configure-stageprofile-intl
+configure-stagefeedback-gcc: maybe-configure-stagefeedback-intl
+configure-gcc: maybe-all-lto-plugin
+
+configure-stage1-gcc: maybe-all-stage1-lto-plugin
+configure-stage2-gcc: maybe-all-stage2-lto-plugin
+configure-stage3-gcc: maybe-all-stage3-lto-plugin
+configure-stage4-gcc: maybe-all-stage4-lto-plugin
+configure-stageprofile-gcc: maybe-all-stageprofile-lto-plugin
+configure-stagefeedback-gcc: maybe-all-stagefeedback-lto-plugin
+configure-gcc: maybe-all-binutils
+
+configure-stage1-gcc: maybe-all-stage1-binutils
+configure-stage2-gcc: maybe-all-stage2-binutils
+configure-stage3-gcc: maybe-all-stage3-binutils
+configure-stage4-gcc: maybe-all-stage4-binutils
+configure-stageprofile-gcc: maybe-all-stageprofile-binutils
+configure-stagefeedback-gcc: maybe-all-stagefeedback-binutils
+configure-gcc: maybe-all-gas
+
+configure-stage1-gcc: maybe-all-stage1-gas
+configure-stage2-gcc: maybe-all-stage2-gas
+configure-stage3-gcc: maybe-all-stage3-gas
+configure-stage4-gcc: maybe-all-stage4-gas
+configure-stageprofile-gcc: maybe-all-stageprofile-gas
+configure-stagefeedback-gcc: maybe-all-stagefeedback-gas
+configure-gcc: maybe-all-ld
+
+configure-stage1-gcc: maybe-all-stage1-ld
+configure-stage2-gcc: maybe-all-stage2-ld
+configure-stage3-gcc: maybe-all-stage3-ld
+configure-stage4-gcc: maybe-all-stage4-ld
+configure-stageprofile-gcc: maybe-all-stageprofile-ld
+configure-stagefeedback-gcc: maybe-all-stagefeedback-ld
+configure-gcc: maybe-all-gold
+
+configure-stage1-gcc: maybe-all-stage1-gold
+configure-stage2-gcc: maybe-all-stage2-gold
+configure-stage3-gcc: maybe-all-stage3-gold
+configure-stage4-gcc: maybe-all-stage4-gold
+configure-stageprofile-gcc: maybe-all-stageprofile-gold
+configure-stagefeedback-gcc: maybe-all-stagefeedback-gold
+configure-gcc: maybe-all-libelf
+
+configure-stage1-gcc: maybe-all-stage1-libelf
+configure-stage2-gcc: maybe-all-stage2-libelf
+configure-stage3-gcc: maybe-all-stage3-libelf
+configure-stage4-gcc: maybe-all-stage4-libelf
+configure-stageprofile-gcc: maybe-all-stageprofile-libelf
+configure-stagefeedback-gcc: maybe-all-stagefeedback-libelf
+all-gcc: all-libiberty
+
+all-stage1-gcc: all-stage1-libiberty
+all-stage2-gcc: all-stage2-libiberty
+all-stage3-gcc: all-stage3-libiberty
+all-stage4-gcc: all-stage4-libiberty
+all-stageprofile-gcc: all-stageprofile-libiberty
+all-stagefeedback-gcc: all-stagefeedback-libiberty
+all-gcc: maybe-all-gmp
+
+all-stage1-gcc: maybe-all-stage1-gmp
+all-stage2-gcc: maybe-all-stage2-gmp
+all-stage3-gcc: maybe-all-stage3-gmp
+all-stage4-gcc: maybe-all-stage4-gmp
+all-stageprofile-gcc: maybe-all-stageprofile-gmp
+all-stagefeedback-gcc: maybe-all-stagefeedback-gmp
+all-gcc: maybe-all-intl
+
+all-stage1-gcc: maybe-all-stage1-intl
+all-stage2-gcc: maybe-all-stage2-intl
+all-stage3-gcc: maybe-all-stage3-intl
+all-stage4-gcc: maybe-all-stage4-intl
+all-stageprofile-gcc: maybe-all-stageprofile-intl
+all-stagefeedback-gcc: maybe-all-stagefeedback-intl
+all-gcc: maybe-all-mpfr
+
+all-stage1-gcc: maybe-all-stage1-mpfr
+all-stage2-gcc: maybe-all-stage2-mpfr
+all-stage3-gcc: maybe-all-stage3-mpfr
+all-stage4-gcc: maybe-all-stage4-mpfr
+all-stageprofile-gcc: maybe-all-stageprofile-mpfr
+all-stagefeedback-gcc: maybe-all-stagefeedback-mpfr
+all-gcc: maybe-all-mpc
+
+all-stage1-gcc: maybe-all-stage1-mpc
+all-stage2-gcc: maybe-all-stage2-mpc
+all-stage3-gcc: maybe-all-stage3-mpc
+all-stage4-gcc: maybe-all-stage4-mpc
+all-stageprofile-gcc: maybe-all-stageprofile-mpc
+all-stagefeedback-gcc: maybe-all-stagefeedback-mpc
+all-gcc: maybe-all-ppl
+
+all-stage1-gcc: maybe-all-stage1-ppl
+all-stage2-gcc: maybe-all-stage2-ppl
+all-stage3-gcc: maybe-all-stage3-ppl
+all-stage4-gcc: maybe-all-stage4-ppl
+all-stageprofile-gcc: maybe-all-stageprofile-ppl
+all-stagefeedback-gcc: maybe-all-stagefeedback-ppl
+all-gcc: maybe-all-cloog
+
+all-stage1-gcc: maybe-all-stage1-cloog
+all-stage2-gcc: maybe-all-stage2-cloog
+all-stage3-gcc: maybe-all-stage3-cloog
+all-stage4-gcc: maybe-all-stage4-cloog
+all-stageprofile-gcc: maybe-all-stageprofile-cloog
+all-stagefeedback-gcc: maybe-all-stagefeedback-cloog
+all-gcc: maybe-all-build-texinfo
+
+all-stage1-gcc: maybe-all-build-texinfo
+all-stage2-gcc: maybe-all-build-texinfo
+all-stage3-gcc: maybe-all-build-texinfo
+all-stage4-gcc: maybe-all-build-texinfo
+all-stageprofile-gcc: maybe-all-build-texinfo
+all-stagefeedback-gcc: maybe-all-build-texinfo
+all-gcc: maybe-all-build-bison
+
+all-stage1-gcc: maybe-all-build-bison
+all-stage2-gcc: maybe-all-build-bison
+all-stage3-gcc: maybe-all-build-bison
+all-stage4-gcc: maybe-all-build-bison
+all-stageprofile-gcc: maybe-all-build-bison
+all-stagefeedback-gcc: maybe-all-build-bison
+all-gcc: maybe-all-build-flex
+
+all-stage1-gcc: maybe-all-build-flex
+all-stage2-gcc: maybe-all-build-flex
+all-stage3-gcc: maybe-all-build-flex
+all-stage4-gcc: maybe-all-build-flex
+all-stageprofile-gcc: maybe-all-build-flex
+all-stagefeedback-gcc: maybe-all-build-flex
+all-gcc: maybe-all-build-libiberty
+
+all-stage1-gcc: maybe-all-build-libiberty
+all-stage2-gcc: maybe-all-build-libiberty
+all-stage3-gcc: maybe-all-build-libiberty
+all-stage4-gcc: maybe-all-build-libiberty
+all-stageprofile-gcc: maybe-all-build-libiberty
+all-stagefeedback-gcc: maybe-all-build-libiberty
+all-gcc: maybe-all-build-fixincludes
+
+all-stage1-gcc: maybe-all-build-fixincludes
+all-stage2-gcc: maybe-all-build-fixincludes
+all-stage3-gcc: maybe-all-build-fixincludes
+all-stage4-gcc: maybe-all-build-fixincludes
+all-stageprofile-gcc: maybe-all-build-fixincludes
+all-stagefeedback-gcc: maybe-all-build-fixincludes
+all-gcc: maybe-all-zlib
+
+all-stage1-gcc: maybe-all-stage1-zlib
+all-stage2-gcc: maybe-all-stage2-zlib
+all-stage3-gcc: maybe-all-stage3-zlib
+all-stage4-gcc: maybe-all-stage4-zlib
+all-stageprofile-gcc: maybe-all-stageprofile-zlib
+all-stagefeedback-gcc: maybe-all-stagefeedback-zlib
+all-gcc: all-libcpp
+
+all-stage1-gcc: all-stage1-libcpp
+all-stage2-gcc: all-stage2-libcpp
+all-stage3-gcc: all-stage3-libcpp
+all-stage4-gcc: all-stage4-libcpp
+all-stageprofile-gcc: all-stageprofile-libcpp
+all-stagefeedback-gcc: all-stagefeedback-libcpp
+all-gcc: all-libdecnumber
+
+all-stage1-gcc: all-stage1-libdecnumber
+all-stage2-gcc: all-stage2-libdecnumber
+all-stage3-gcc: all-stage3-libdecnumber
+all-stage4-gcc: all-stage4-libdecnumber
+all-stageprofile-gcc: all-stageprofile-libdecnumber
+all-stagefeedback-gcc: all-stagefeedback-libdecnumber
+all-gcc: maybe-all-libiberty
+
+all-stage1-gcc: maybe-all-stage1-libiberty
+all-stage2-gcc: maybe-all-stage2-libiberty
+all-stage3-gcc: maybe-all-stage3-libiberty
+all-stage4-gcc: maybe-all-stage4-libiberty
+all-stageprofile-gcc: maybe-all-stageprofile-libiberty
+all-stagefeedback-gcc: maybe-all-stagefeedback-libiberty
+all-gcc: maybe-all-fixincludes
+all-gcc: maybe-all-lto-plugin
+
+all-stage1-gcc: maybe-all-stage1-lto-plugin
+all-stage2-gcc: maybe-all-stage2-lto-plugin
+all-stage3-gcc: maybe-all-stage3-lto-plugin
+all-stage4-gcc: maybe-all-stage4-lto-plugin
+all-stageprofile-gcc: maybe-all-stageprofile-lto-plugin
+all-stagefeedback-gcc: maybe-all-stagefeedback-lto-plugin
+info-gcc: maybe-all-build-libiberty
+
+info-stage1-gcc: maybe-all-build-libiberty
+info-stage2-gcc: maybe-all-build-libiberty
+info-stage3-gcc: maybe-all-build-libiberty
+info-stage4-gcc: maybe-all-build-libiberty
+info-stageprofile-gcc: maybe-all-build-libiberty
+info-stagefeedback-gcc: maybe-all-build-libiberty
+dvi-gcc: maybe-all-build-libiberty
+
+dvi-stage1-gcc: maybe-all-build-libiberty
+dvi-stage2-gcc: maybe-all-build-libiberty
+dvi-stage3-gcc: maybe-all-build-libiberty
+dvi-stage4-gcc: maybe-all-build-libiberty
+dvi-stageprofile-gcc: maybe-all-build-libiberty
+dvi-stagefeedback-gcc: maybe-all-build-libiberty
+pdf-gcc: maybe-all-build-libiberty
+
+pdf-stage1-gcc: maybe-all-build-libiberty
+pdf-stage2-gcc: maybe-all-build-libiberty
+pdf-stage3-gcc: maybe-all-build-libiberty
+pdf-stage4-gcc: maybe-all-build-libiberty
+pdf-stageprofile-gcc: maybe-all-build-libiberty
+pdf-stagefeedback-gcc: maybe-all-build-libiberty
+html-gcc: maybe-all-build-libiberty
+
+html-stage1-gcc: maybe-all-build-libiberty
+html-stage2-gcc: maybe-all-build-libiberty
+html-stage3-gcc: maybe-all-build-libiberty
+html-stage4-gcc: maybe-all-build-libiberty
+html-stageprofile-gcc: maybe-all-build-libiberty
+html-stagefeedback-gcc: maybe-all-build-libiberty
+install-gcc: maybe-install-fixincludes
+install-gcc: maybe-install-lto-plugin
+install-strip-gcc: maybe-install-strip-fixincludes
+configure-libcpp: configure-libiberty
+
+configure-stage1-libcpp: configure-stage1-libiberty
+configure-stage2-libcpp: configure-stage2-libiberty
+configure-stage3-libcpp: configure-stage3-libiberty
+configure-stage4-libcpp: configure-stage4-libiberty
+configure-stageprofile-libcpp: configure-stageprofile-libiberty
+configure-stagefeedback-libcpp: configure-stagefeedback-libiberty
+configure-libcpp: maybe-configure-intl
+
+configure-stage1-libcpp: maybe-configure-stage1-intl
+configure-stage2-libcpp: maybe-configure-stage2-intl
+configure-stage3-libcpp: maybe-configure-stage3-intl
+configure-stage4-libcpp: maybe-configure-stage4-intl
+configure-stageprofile-libcpp: maybe-configure-stageprofile-intl
+configure-stagefeedback-libcpp: maybe-configure-stagefeedback-intl
+all-libcpp: all-libiberty
+
+all-stage1-libcpp: all-stage1-libiberty
+all-stage2-libcpp: all-stage2-libiberty
+all-stage3-libcpp: all-stage3-libiberty
+all-stage4-libcpp: all-stage4-libiberty
+all-stageprofile-libcpp: all-stageprofile-libiberty
+all-stagefeedback-libcpp: all-stagefeedback-libiberty
+all-libcpp: maybe-all-intl
+
+all-stage1-libcpp: maybe-all-stage1-intl
+all-stage2-libcpp: maybe-all-stage2-intl
+all-stage3-libcpp: maybe-all-stage3-intl
+all-stage4-libcpp: maybe-all-stage4-intl
+all-stageprofile-libcpp: maybe-all-stageprofile-intl
+all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
+all-fixincludes: maybe-all-libiberty
+all-gnattools: maybe-all-target-libada
+all-lto-plugin: maybe-all-libiberty
+
+all-stage1-lto-plugin: maybe-all-stage1-libiberty
+all-stage2-lto-plugin: maybe-all-stage2-libiberty
+all-stage3-lto-plugin: maybe-all-stage3-libiberty
+all-stage4-lto-plugin: maybe-all-stage4-libiberty
+all-stageprofile-lto-plugin: maybe-all-stageprofile-libiberty
+all-stagefeedback-lto-plugin: maybe-all-stagefeedback-libiberty
+all-utils: maybe-all-libiberty
+configure-mpfr: maybe-all-gmp
+
+configure-stage1-mpfr: maybe-all-stage1-gmp
+configure-stage2-mpfr: maybe-all-stage2-gmp
+configure-stage3-mpfr: maybe-all-stage3-gmp
+configure-stage4-mpfr: maybe-all-stage4-gmp
+configure-stageprofile-mpfr: maybe-all-stageprofile-gmp
+configure-stagefeedback-mpfr: maybe-all-stagefeedback-gmp
+configure-mpc: maybe-all-mpfr
+
+configure-stage1-mpc: maybe-all-stage1-mpfr
+configure-stage2-mpc: maybe-all-stage2-mpfr
+configure-stage3-mpc: maybe-all-stage3-mpfr
+configure-stage4-mpc: maybe-all-stage4-mpfr
+configure-stageprofile-mpc: maybe-all-stageprofile-mpfr
+configure-stagefeedback-mpc: maybe-all-stagefeedback-mpfr
+configure-ppl: maybe-all-gmp
+
+configure-stage1-ppl: maybe-all-stage1-gmp
+configure-stage2-ppl: maybe-all-stage2-gmp
+configure-stage3-ppl: maybe-all-stage3-gmp
+configure-stage4-ppl: maybe-all-stage4-gmp
+configure-stageprofile-ppl: maybe-all-stageprofile-gmp
+configure-stagefeedback-ppl: maybe-all-stagefeedback-gmp
+configure-ppl: maybe-all-mpfr
+
+configure-stage1-ppl: maybe-all-stage1-mpfr
+configure-stage2-ppl: maybe-all-stage2-mpfr
+configure-stage3-ppl: maybe-all-stage3-mpfr
+configure-stage4-ppl: maybe-all-stage4-mpfr
+configure-stageprofile-ppl: maybe-all-stageprofile-mpfr
+configure-stagefeedback-ppl: maybe-all-stagefeedback-mpfr
+configure-cloog: maybe-all-ppl
+
+configure-stage1-cloog: maybe-all-stage1-ppl
+configure-stage2-cloog: maybe-all-stage2-ppl
+configure-stage3-cloog: maybe-all-stage3-ppl
+configure-stage4-cloog: maybe-all-stage4-ppl
+configure-stageprofile-cloog: maybe-all-stageprofile-ppl
+configure-stagefeedback-cloog: maybe-all-stagefeedback-ppl
+configure-gdb: maybe-all-intl
+configure-gdb: maybe-configure-sim
+configure-gdb: maybe-all-bfd
+configure-gdb: maybe-all-libiconv
+all-gdb: maybe-all-libiberty
+all-gdb: maybe-all-libiconv
+all-gdb: maybe-all-opcodes
+all-gdb: maybe-all-readline
+all-gdb: maybe-all-build-bison
+all-gdb: maybe-all-sim
+all-gdb: maybe-all-libdecnumber
+all-gdb: maybe-all-libtermcap
+configure-libgui: maybe-configure-tcl
+configure-libgui: maybe-configure-tk
+all-libgui: maybe-all-tcl
+all-libgui: maybe-all-tk
+all-libgui: maybe-all-itcl
+configure-bfd: configure-libiberty
+
+configure-stage1-bfd: configure-stage1-libiberty
+configure-stage2-bfd: configure-stage2-libiberty
+configure-stage3-bfd: configure-stage3-libiberty
+configure-stage4-bfd: configure-stage4-libiberty
+configure-stageprofile-bfd: configure-stageprofile-libiberty
+configure-stagefeedback-bfd: configure-stagefeedback-libiberty
+configure-bfd: maybe-configure-intl
+
+configure-stage1-bfd: maybe-configure-stage1-intl
+configure-stage2-bfd: maybe-configure-stage2-intl
+configure-stage3-bfd: maybe-configure-stage3-intl
+configure-stage4-bfd: maybe-configure-stage4-intl
+configure-stageprofile-bfd: maybe-configure-stageprofile-intl
+configure-stagefeedback-bfd: maybe-configure-stagefeedback-intl
+all-bfd: maybe-all-libiberty
+
+all-stage1-bfd: maybe-all-stage1-libiberty
+all-stage2-bfd: maybe-all-stage2-libiberty
+all-stage3-bfd: maybe-all-stage3-libiberty
+all-stage4-bfd: maybe-all-stage4-libiberty
+all-stageprofile-bfd: maybe-all-stageprofile-libiberty
+all-stagefeedback-bfd: maybe-all-stagefeedback-libiberty
+all-bfd: maybe-all-intl
+
+all-stage1-bfd: maybe-all-stage1-intl
+all-stage2-bfd: maybe-all-stage2-intl
+all-stage3-bfd: maybe-all-stage3-intl
+all-stage4-bfd: maybe-all-stage4-intl
+all-stageprofile-bfd: maybe-all-stageprofile-intl
+all-stagefeedback-bfd: maybe-all-stagefeedback-intl
+configure-opcodes: configure-libiberty
+
+configure-stage1-opcodes: configure-stage1-libiberty
+configure-stage2-opcodes: configure-stage2-libiberty
+configure-stage3-opcodes: configure-stage3-libiberty
+configure-stage4-opcodes: configure-stage4-libiberty
+configure-stageprofile-opcodes: configure-stageprofile-libiberty
+configure-stagefeedback-opcodes: configure-stagefeedback-libiberty
+all-opcodes: maybe-all-libiberty
+
+all-stage1-opcodes: maybe-all-stage1-libiberty
+all-stage2-opcodes: maybe-all-stage2-libiberty
+all-stage3-opcodes: maybe-all-stage3-libiberty
+all-stage4-opcodes: maybe-all-stage4-libiberty
+all-stageprofile-opcodes: maybe-all-stageprofile-libiberty
+all-stagefeedback-opcodes: maybe-all-stagefeedback-libiberty
+configure-binutils: maybe-configure-intl
+
+configure-stage1-binutils: maybe-configure-stage1-intl
+configure-stage2-binutils: maybe-configure-stage2-intl
+configure-stage3-binutils: maybe-configure-stage3-intl
+configure-stage4-binutils: maybe-configure-stage4-intl
+configure-stageprofile-binutils: maybe-configure-stageprofile-intl
+configure-stagefeedback-binutils: maybe-configure-stagefeedback-intl
+all-binutils: maybe-all-libiberty
+
+all-stage1-binutils: maybe-all-stage1-libiberty
+all-stage2-binutils: maybe-all-stage2-libiberty
+all-stage3-binutils: maybe-all-stage3-libiberty
+all-stage4-binutils: maybe-all-stage4-libiberty
+all-stageprofile-binutils: maybe-all-stageprofile-libiberty
+all-stagefeedback-binutils: maybe-all-stagefeedback-libiberty
+all-binutils: maybe-all-opcodes
+
+all-stage1-binutils: maybe-all-stage1-opcodes
+all-stage2-binutils: maybe-all-stage2-opcodes
+all-stage3-binutils: maybe-all-stage3-opcodes
+all-stage4-binutils: maybe-all-stage4-opcodes
+all-stageprofile-binutils: maybe-all-stageprofile-opcodes
+all-stagefeedback-binutils: maybe-all-stagefeedback-opcodes
+all-binutils: maybe-all-bfd
+
+all-stage1-binutils: maybe-all-stage1-bfd
+all-stage2-binutils: maybe-all-stage2-bfd
+all-stage3-binutils: maybe-all-stage3-bfd
+all-stage4-binutils: maybe-all-stage4-bfd
+all-stageprofile-binutils: maybe-all-stageprofile-bfd
+all-stagefeedback-binutils: maybe-all-stagefeedback-bfd
+all-binutils: maybe-all-build-flex
+
+all-stage1-binutils: maybe-all-build-flex
+all-stage2-binutils: maybe-all-build-flex
+all-stage3-binutils: maybe-all-build-flex
+all-stage4-binutils: maybe-all-build-flex
+all-stageprofile-binutils: maybe-all-build-flex
+all-stagefeedback-binutils: maybe-all-build-flex
+all-binutils: maybe-all-build-bison
+
+all-stage1-binutils: maybe-all-build-bison
+all-stage2-binutils: maybe-all-build-bison
+all-stage3-binutils: maybe-all-build-bison
+all-stage4-binutils: maybe-all-build-bison
+all-stageprofile-binutils: maybe-all-build-bison
+all-stagefeedback-binutils: maybe-all-build-bison
+all-binutils: maybe-all-intl
+
+all-stage1-binutils: maybe-all-stage1-intl
+all-stage2-binutils: maybe-all-stage2-intl
+all-stage3-binutils: maybe-all-stage3-intl
+all-stage4-binutils: maybe-all-stage4-intl
+all-stageprofile-binutils: maybe-all-stageprofile-intl
+all-stagefeedback-binutils: maybe-all-stagefeedback-intl
+install-binutils: maybe-install-opcodes
+install-strip-binutils: maybe-install-strip-opcodes
+install-opcodes: maybe-install-bfd
+install-strip-opcodes: maybe-install-strip-bfd
+configure-gas: maybe-configure-intl
+
+configure-stage1-gas: maybe-configure-stage1-intl
+configure-stage2-gas: maybe-configure-stage2-intl
+configure-stage3-gas: maybe-configure-stage3-intl
+configure-stage4-gas: maybe-configure-stage4-intl
+configure-stageprofile-gas: maybe-configure-stageprofile-intl
+configure-stagefeedback-gas: maybe-configure-stagefeedback-intl
+all-gas: maybe-all-libiberty
+
+all-stage1-gas: maybe-all-stage1-libiberty
+all-stage2-gas: maybe-all-stage2-libiberty
+all-stage3-gas: maybe-all-stage3-libiberty
+all-stage4-gas: maybe-all-stage4-libiberty
+all-stageprofile-gas: maybe-all-stageprofile-libiberty
+all-stagefeedback-gas: maybe-all-stagefeedback-libiberty
+all-gas: maybe-all-opcodes
+
+all-stage1-gas: maybe-all-stage1-opcodes
+all-stage2-gas: maybe-all-stage2-opcodes
+all-stage3-gas: maybe-all-stage3-opcodes
+all-stage4-gas: maybe-all-stage4-opcodes
+all-stageprofile-gas: maybe-all-stageprofile-opcodes
+all-stagefeedback-gas: maybe-all-stagefeedback-opcodes
+all-gas: maybe-all-bfd
+
+all-stage1-gas: maybe-all-stage1-bfd
+all-stage2-gas: maybe-all-stage2-bfd
+all-stage3-gas: maybe-all-stage3-bfd
+all-stage4-gas: maybe-all-stage4-bfd
+all-stageprofile-gas: maybe-all-stageprofile-bfd
+all-stagefeedback-gas: maybe-all-stagefeedback-bfd
+all-gas: maybe-all-intl
+
+all-stage1-gas: maybe-all-stage1-intl
+all-stage2-gas: maybe-all-stage2-intl
+all-stage3-gas: maybe-all-stage3-intl
+all-stage4-gas: maybe-all-stage4-intl
+all-stageprofile-gas: maybe-all-stageprofile-intl
+all-stagefeedback-gas: maybe-all-stagefeedback-intl
+configure-gprof: maybe-configure-intl
+all-gprof: maybe-all-libiberty
+all-gprof: maybe-all-bfd
+all-gprof: maybe-all-opcodes
+all-gprof: maybe-all-intl
+configure-ld: maybe-configure-intl
+
+configure-stage1-ld: maybe-configure-stage1-intl
+configure-stage2-ld: maybe-configure-stage2-intl
+configure-stage3-ld: maybe-configure-stage3-intl
+configure-stage4-ld: maybe-configure-stage4-intl
+configure-stageprofile-ld: maybe-configure-stageprofile-intl
+configure-stagefeedback-ld: maybe-configure-stagefeedback-intl
+all-ld: maybe-all-libiberty
+
+all-stage1-ld: maybe-all-stage1-libiberty
+all-stage2-ld: maybe-all-stage2-libiberty
+all-stage3-ld: maybe-all-stage3-libiberty
+all-stage4-ld: maybe-all-stage4-libiberty
+all-stageprofile-ld: maybe-all-stageprofile-libiberty
+all-stagefeedback-ld: maybe-all-stagefeedback-libiberty
+all-ld: maybe-all-bfd
+
+all-stage1-ld: maybe-all-stage1-bfd
+all-stage2-ld: maybe-all-stage2-bfd
+all-stage3-ld: maybe-all-stage3-bfd
+all-stage4-ld: maybe-all-stage4-bfd
+all-stageprofile-ld: maybe-all-stageprofile-bfd
+all-stagefeedback-ld: maybe-all-stagefeedback-bfd
+all-ld: maybe-all-opcodes
+
+all-stage1-ld: maybe-all-stage1-opcodes
+all-stage2-ld: maybe-all-stage2-opcodes
+all-stage3-ld: maybe-all-stage3-opcodes
+all-stage4-ld: maybe-all-stage4-opcodes
+all-stageprofile-ld: maybe-all-stageprofile-opcodes
+all-stagefeedback-ld: maybe-all-stagefeedback-opcodes
+all-ld: maybe-all-build-bison
+
+all-stage1-ld: maybe-all-build-bison
+all-stage2-ld: maybe-all-build-bison
+all-stage3-ld: maybe-all-build-bison
+all-stage4-ld: maybe-all-build-bison
+all-stageprofile-ld: maybe-all-build-bison
+all-stagefeedback-ld: maybe-all-build-bison
+all-ld: maybe-all-build-flex
+
+all-stage1-ld: maybe-all-build-flex
+all-stage2-ld: maybe-all-build-flex
+all-stage3-ld: maybe-all-build-flex
+all-stage4-ld: maybe-all-build-flex
+all-stageprofile-ld: maybe-all-build-flex
+all-stagefeedback-ld: maybe-all-build-flex
+all-ld: maybe-all-intl
+
+all-stage1-ld: maybe-all-stage1-intl
+all-stage2-ld: maybe-all-stage2-intl
+all-stage3-ld: maybe-all-stage3-intl
+all-stage4-ld: maybe-all-stage4-intl
+all-stageprofile-ld: maybe-all-stageprofile-intl
+all-stagefeedback-ld: maybe-all-stagefeedback-intl
+install-ld: maybe-install-gold
+install-strip-ld: maybe-install-strip-gold
+configure-gold: maybe-configure-intl
+
+configure-stage1-gold: maybe-configure-stage1-intl
+configure-stage2-gold: maybe-configure-stage2-intl
+configure-stage3-gold: maybe-configure-stage3-intl
+configure-stage4-gold: maybe-configure-stage4-intl
+configure-stageprofile-gold: maybe-configure-stageprofile-intl
+configure-stagefeedback-gold: maybe-configure-stagefeedback-intl
+all-gold: maybe-all-libiberty
+
+all-stage1-gold: maybe-all-stage1-libiberty
+all-stage2-gold: maybe-all-stage2-libiberty
+all-stage3-gold: maybe-all-stage3-libiberty
+all-stage4-gold: maybe-all-stage4-libiberty
+all-stageprofile-gold: maybe-all-stageprofile-libiberty
+all-stagefeedback-gold: maybe-all-stagefeedback-libiberty
+all-gold: maybe-all-intl
+
+all-stage1-gold: maybe-all-stage1-intl
+all-stage2-gold: maybe-all-stage2-intl
+all-stage3-gold: maybe-all-stage3-intl
+all-stage4-gold: maybe-all-stage4-intl
+all-stageprofile-gold: maybe-all-stageprofile-intl
+all-stagefeedback-gold: maybe-all-stagefeedback-intl
+all-gold: maybe-all-bfd
+
+all-stage1-gold: maybe-all-stage1-bfd
+all-stage2-gold: maybe-all-stage2-bfd
+all-stage3-gold: maybe-all-stage3-bfd
+all-stage4-gold: maybe-all-stage4-bfd
+all-stageprofile-gold: maybe-all-stageprofile-bfd
+all-stagefeedback-gold: maybe-all-stagefeedback-bfd
+all-gold: maybe-all-build-bison
+
+all-stage1-gold: maybe-all-build-bison
+all-stage2-gold: maybe-all-build-bison
+all-stage3-gold: maybe-all-build-bison
+all-stage4-gold: maybe-all-build-bison
+all-stageprofile-gold: maybe-all-build-bison
+all-stagefeedback-gold: maybe-all-build-bison
+check-gold: maybe-all-binutils
+
+check-stage1-gold: maybe-all-stage1-binutils
+check-stage2-gold: maybe-all-stage2-binutils
+check-stage3-gold: maybe-all-stage3-binutils
+check-stage4-gold: maybe-all-stage4-binutils
+check-stageprofile-gold: maybe-all-stageprofile-binutils
+check-stagefeedback-gold: maybe-all-stagefeedback-binutils
+check-gold: maybe-all-gas
+
+check-stage1-gold: maybe-all-stage1-gas
+check-stage2-gold: maybe-all-stage2-gas
+check-stage3-gold: maybe-all-stage3-gas
+check-stage4-gold: maybe-all-stage4-gas
+check-stageprofile-gold: maybe-all-stageprofile-gas
+check-stagefeedback-gold: maybe-all-stagefeedback-gas
+configure-opcodes: maybe-configure-intl
+
+configure-stage1-opcodes: maybe-configure-stage1-intl
+configure-stage2-opcodes: maybe-configure-stage2-intl
+configure-stage3-opcodes: maybe-configure-stage3-intl
+configure-stage4-opcodes: maybe-configure-stage4-intl
+configure-stageprofile-opcodes: maybe-configure-stageprofile-intl
+configure-stagefeedback-opcodes: maybe-configure-stagefeedback-intl
+all-opcodes: maybe-all-bfd
+
+all-stage1-opcodes: maybe-all-stage1-bfd
+all-stage2-opcodes: maybe-all-stage2-bfd
+all-stage3-opcodes: maybe-all-stage3-bfd
+all-stage4-opcodes: maybe-all-stage4-bfd
+all-stageprofile-opcodes: maybe-all-stageprofile-bfd
+all-stagefeedback-opcodes: maybe-all-stagefeedback-bfd
+all-opcodes: maybe-all-libiberty
+
+all-stage1-opcodes: maybe-all-stage1-libiberty
+all-stage2-opcodes: maybe-all-stage2-libiberty
+all-stage3-opcodes: maybe-all-stage3-libiberty
+all-stage4-opcodes: maybe-all-stage4-libiberty
+all-stageprofile-opcodes: maybe-all-stageprofile-libiberty
+all-stagefeedback-opcodes: maybe-all-stagefeedback-libiberty
+all-opcodes: maybe-all-intl
+
+all-stage1-opcodes: maybe-all-stage1-intl
+all-stage2-opcodes: maybe-all-stage2-intl
+all-stage3-opcodes: maybe-all-stage3-intl
+all-stage4-opcodes: maybe-all-stage4-intl
+all-stageprofile-opcodes: maybe-all-stageprofile-intl
+all-stagefeedback-opcodes: maybe-all-stagefeedback-intl
+all-dejagnu: maybe-all-tcl
+all-dejagnu: maybe-all-expect
+all-dejagnu: maybe-all-tk
+configure-expect: maybe-configure-tcl
+configure-expect: maybe-configure-tk
+all-expect: maybe-all-tcl
+all-expect: maybe-all-tk
+configure-itcl: maybe-configure-tcl
+configure-itcl: maybe-configure-tk
+all-itcl: maybe-all-tcl
+all-itcl: maybe-all-tk
+install-itcl: maybe-install-tcl
+install-strip-itcl: maybe-install-strip-tcl
+configure-tk: maybe-configure-tcl
+all-tk: maybe-all-tcl
+all-sid: maybe-all-libiberty
+all-sid: maybe-all-bfd
+all-sid: maybe-all-opcodes
+all-sid: maybe-all-tcl
+all-sid: maybe-all-tk
+install-sid: maybe-install-tcl
+install-strip-sid: maybe-install-strip-tcl
+install-sid: maybe-install-tk
+install-strip-sid: maybe-install-strip-tk
+configure-sim: maybe-configure-intl
+all-sim: maybe-all-intl
+all-sim: maybe-all-libiberty
+all-sim: maybe-all-bfd
+all-sim: maybe-all-opcodes
+all-sim: maybe-all-readline
+all-sim: maybe-configure-gdb
+all-fastjar: maybe-all-zlib
+all-fastjar: maybe-all-build-texinfo
+all-fastjar: maybe-all-libiberty
+all-bison: maybe-all-intl
+all-bison: maybe-all-build-texinfo
+all-flex: maybe-all-build-bison
+all-flex: maybe-all-intl
+all-flex: maybe-all-m4
+all-flex: maybe-all-build-texinfo
+all-m4: maybe-all-intl
+all-m4: maybe-all-build-texinfo
+configure-target-boehm-gc: maybe-all-target-libstdc++-v3
+configure-target-fastjar: maybe-configure-target-zlib
+all-target-fastjar: maybe-all-target-zlib
+configure-target-libgo: maybe-configure-target-libffi
+configure-target-libgo: maybe-all-target-libstdc++-v3
+all-target-libgo: maybe-all-target-libffi
+configure-target-libjava: maybe-configure-target-zlib
+configure-target-libjava: maybe-configure-target-boehm-gc
+configure-target-libjava: maybe-configure-target-libffi
+all-target-libjava: maybe-all-fastjar
+all-target-libjava: maybe-all-target-zlib
+all-target-libjava: maybe-all-target-boehm-gc
+all-target-libjava: maybe-all-target-libffi
+configure-target-libobjc: maybe-configure-target-boehm-gc
+all-target-libobjc: maybe-all-target-boehm-gc
+configure-target-libstdc++-v3: maybe-configure-target-libgomp
+
+configure-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp
+configure-stage2-target-libstdc++-v3: maybe-configure-stage2-target-libgomp
+configure-stage3-target-libstdc++-v3: maybe-configure-stage3-target-libgomp
+configure-stage4-target-libstdc++-v3: maybe-configure-stage4-target-libgomp
+configure-stageprofile-target-libstdc++-v3: maybe-configure-stageprofile-target-libgomp
+configure-stagefeedback-target-libstdc++-v3: maybe-configure-stagefeedback-target-libgomp
+all-target-libstdc++-v3: maybe-configure-target-libgomp
+
+all-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp
+all-stage2-target-libstdc++-v3: maybe-configure-stage2-target-libgomp
+all-stage3-target-libstdc++-v3: maybe-configure-stage3-target-libgomp
+all-stage4-target-libstdc++-v3: maybe-configure-stage4-target-libgomp
+all-stageprofile-target-libstdc++-v3: maybe-configure-stageprofile-target-libgomp
+all-stagefeedback-target-libstdc++-v3: maybe-configure-stagefeedback-target-libgomp
+all-target-libgloss: maybe-all-target-newlib
+all-target-winsup: maybe-all-target-libtermcap
+configure-target-newlib: maybe-all-binutils
+configure-target-newlib: maybe-all-ld
+configure-target-libgfortran: maybe-all-target-libquadmath
+
+
+# Dependencies for target modules on other target modules are
+# described by lang_env_dependencies; the defaults apply to anything
+# not mentioned there.
+
+
+@if gcc-bootstrap
+configure-stage1-target-libstdc++-v3: maybe-all-stage1-target-libgcc
+configure-stage2-target-libstdc++-v3: maybe-all-stage2-target-libgcc
+configure-stage3-target-libstdc++-v3: maybe-all-stage3-target-libgcc
+configure-stage4-target-libstdc++-v3: maybe-all-stage4-target-libgcc
+configure-stageprofile-target-libstdc++-v3: maybe-all-stageprofile-target-libgcc
+configure-stagefeedback-target-libstdc++-v3: maybe-all-stagefeedback-target-libgcc
+configure-stage1-target-libgomp: maybe-all-stage1-target-libgcc
+configure-stage2-target-libgomp: maybe-all-stage2-target-libgcc
+configure-stage3-target-libgomp: maybe-all-stage3-target-libgcc
+configure-stage4-target-libgomp: maybe-all-stage4-target-libgcc
+configure-stageprofile-target-libgomp: maybe-all-stageprofile-target-libgcc
+configure-stagefeedback-target-libgomp: maybe-all-stagefeedback-target-libgcc
+@endif gcc-bootstrap
+
+@if gcc-no-bootstrap
+configure-target-libstdc++-v3: maybe-all-target-libgcc
+configure-target-libmudflap: maybe-all-target-libgcc
+configure-target-libssp: maybe-all-target-libgcc
+configure-target-newlib: maybe-all-target-libgcc
+configure-target-libquadmath: maybe-all-target-libgcc
+configure-target-libgfortran: maybe-all-target-libgcc
+configure-target-libobjc: maybe-all-target-libgcc
+configure-target-libgo: maybe-all-target-libgcc
+configure-target-libtermcap: maybe-all-target-libgcc
+configure-target-winsup: maybe-all-target-libgcc
+configure-target-libgloss: maybe-all-target-libgcc
+configure-target-libffi: maybe-all-target-libgcc
+configure-target-libjava: maybe-all-target-libgcc
+configure-target-zlib: maybe-all-target-libgcc
+configure-target-boehm-gc: maybe-all-target-libgcc
+configure-target-rda: maybe-all-target-libgcc
+configure-target-libada: maybe-all-target-libgcc
+configure-target-libgomp: maybe-all-target-libgcc
+@endif gcc-no-bootstrap
+
+
+configure-target-libstdc++-v3: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libmudflap: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libssp: maybe-all-target-newlib maybe-all-target-libgloss
+
+
+
+configure-target-libquadmath: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libgfortran: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libobjc: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libgo: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libtermcap: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-winsup: maybe-all-target-newlib maybe-all-target-libgloss
+
+
+configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libjava: maybe-all-target-newlib maybe-all-target-libgloss
+configure-target-libjava: maybe-all-target-libstdc++-v3
+
+configure-target-zlib: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-boehm-gc: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-rda: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libgomp: maybe-all-target-newlib maybe-all-target-libgloss
+
+
+CONFIGURE_GDB_TK = @CONFIGURE_GDB_TK@
+GDB_TK = @GDB_TK@
+INSTALL_GDB_TK = @INSTALL_GDB_TK@
+configure-gdb: $(CONFIGURE_GDB_TK)
+all-gdb: $(gdbnlmrequirements) $(GDB_TK)
+install-gdb: $(INSTALL_GDB_TK)
+
+# Serialization dependencies.  Host configures don't work well in parallel to
+# each other, due to contention over config.cache.  Target configures and 
+# build configures are similar.
+@serialization_dependencies@
+
+# --------------------------------
+# Regenerating top level configury
+# --------------------------------
+
+# Rebuilding Makefile.in, using autogen.
+AUTOGEN = autogen
+$(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
+	cd $(srcdir) && $(AUTOGEN) Makefile.def
+
+# Rebuilding Makefile.
+Makefile: $(srcdir)/Makefile.in config.status
+	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+config.status: configure
+	CONFIG_SHELL="$(SHELL)" $(SHELL) ./config.status --recheck
+
+# Rebuilding configure.
+AUTOCONF = autoconf
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4 \
+	$(srcdir)/config/override.m4 $(srcdir)/config/proginstall.m4
+	cd $(srcdir) && $(AUTOCONF)
+
+# ------------------------------
+# Special directives to GNU Make
+# ------------------------------
+
+# Don't pass command-line variables to submakes.
+.NOEXPORT:
+MAKEOVERRIDES=
+
+# end of Makefile.in
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/Makefile.tpl sdcc-3.2.0+dfsg/support/sdbinutils/Makefile.tpl
--- sdcc-3.1.0+dfsg/support/sdbinutils/Makefile.tpl	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/Makefile.tpl	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1899 @@
+[+ AutoGen5 template -*- Mode: Makefile -*-
+in
++]
+
+# Makefile.in is generated from Makefile.tpl by 'autogen Makefile.def'.
+#
+# Makefile for directory with subdirs to build.
+#   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+#   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+#
+
+# First, test for a proper version of make, but only where one is required.
+
+@if gcc
+ifeq (,$(.VARIABLES)) # The variable .VARIABLES, new with 3.80, is never empty.
+$(error GNU make version 3.80 or newer is required.)
+endif
+@endif gcc
+
+# -------------------------------
+# Standard Autoconf-set variables
+# -------------------------------
+VPATH=@srcdir@
+
+build_alias=@build_noncanonical@
+build_vendor=@build_vendor@
+build_os=@build_os@
+build=@build@
+host_alias=@host_noncanonical@
+host_vendor=@host_vendor@
+host_os=@host_os@
+host=@host@
+target_alias=@target_noncanonical@
+target_vendor=@target_vendor@
+target_os=@target_os@
+target=@target@
+
+program_transform_name = @program_transform_name@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+srcdir = @srcdir@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+includedir = @includedir@
+oldincludedir = @oldincludedir@
+infodir = @infodir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+pdfdir = @pdfdir@
+htmldir = @htmldir@
+mandir = @mandir@
+man1dir = $(mandir)/man1
+man2dir = $(mandir)/man2
+man3dir = $(mandir)/man3
+man4dir = $(mandir)/man4
+man5dir = $(mandir)/man5
+man6dir = $(mandir)/man6
+man7dir = $(mandir)/man7
+man8dir = $(mandir)/man8
+man9dir = $(mandir)/man9
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_DATA = @INSTALL_DATA@
+LN = @LN@
+LN_S = @LN_S@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+
+# -------------------------------------------------
+# Miscellaneous non-standard autoconf-set variables
+# -------------------------------------------------
+
+# The gcc driver likes to know the arguments it was configured with.
+TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@
+
+tooldir = @tooldir@
+build_tooldir = @build_tooldir@
+
+# This is the name of the environment variable used for the path to
+# the libraries.
+RPATH_ENVVAR = @RPATH_ENVVAR@
+
+# On targets where RPATH_ENVVAR is PATH, a subdirectory of the GCC build path
+# is used instead of the directory itself to avoid including built
+# executables in PATH.
+GCC_SHLIB_SUBDIR = @GCC_SHLIB_SUBDIR@
+
+# Build programs are put under this directory.
+BUILD_SUBDIR = @build_subdir@
+# This is set by the configure script to the arguments to use when configuring
+# directories built for the build system.
+BUILD_CONFIGARGS = @build_configargs@ --with-build-subdir="$(BUILD_SUBDIR)"
+
+# Linker flags to use on the host, for stage1 or when not
+# bootstrapping.
+STAGE1_LDFLAGS = @stage1_ldflags@
+
+# Libraries to use on the host, for stage1 or when not bootstrapping.
+STAGE1_LIBS = @stage1_libs@
+
+# Linker flags to use for stage2 and later.
+POSTSTAGE1_LDFLAGS = @poststage1_ldflags@
+
+# Libraries to use for stage2 and later.
+POSTSTAGE1_LIBS = @poststage1_libs@
+
+# This is the list of variables to export in the environment when
+# configuring any subdirectory.  It must also be exported whenever
+# recursing into a build directory in case that directory's Makefile
+# re-runs configure.
+BASE_EXPORTS = \
+	FLEX="$(FLEX)"; export FLEX; \
+	LEX="$(LEX)"; export LEX; \
+	BISON="$(BISON)"; export BISON; \
+	YACC="$(YACC)"; export YACC; \
+	M4="$(M4)"; export M4; \
+	SED="$(SED)"; export SED; \
+	AWK="$(AWK)"; export AWK; \
+	MAKEINFO="$(MAKEINFO)"; export MAKEINFO;
+
+# This is the list of variables to export in the environment when
+# configuring subdirectories for the build system.
+BUILD_EXPORTS = \
+	$(BASE_EXPORTS) \
+	AR="$(AR_FOR_BUILD)"; export AR; \
+	AS="$(AS_FOR_BUILD)"; export AS; \
+	CC="$(CC_FOR_BUILD)"; export CC; \
+	CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
+	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+	CXX="$(CXX_FOR_BUILD)"; export CXX; \
+	CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
+	GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \
+	GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
+	GOC="$(GOC_FOR_BUILD)"; export GOC; \
+	GOCFLAGS="$(GOCFLAGS_FOR_BUILD)"; export GOCFLAGS; \
+	DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
+	LD="$(LD_FOR_BUILD)"; export LD; \
+	LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \
+	NM="$(NM_FOR_BUILD)"; export NM; \
+	RANLIB="$(RANLIB_FOR_BUILD)"; export RANLIB; \
+	WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \
+	WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC;
+
+# These variables must be set on the make command line for directories
+# built for the build system to override those in BASE_FLAGS_TO_PASSS.
+EXTRA_BUILD_FLAGS = \
+	CFLAGS="$(CFLAGS_FOR_BUILD)" \
+	LDFLAGS="$(LDFLAGS_FOR_BUILD)"
+
+# This is the list of directories to built for the host system.
+SUBDIRS = @configdirs@
+TARGET_CONFIGDIRS = @target_configdirs@
+# This is set by the configure script to the arguments to use when configuring
+# directories built for the host system.
+HOST_CONFIGARGS = @host_configargs@
+# Host programs are put under this directory, which is . except if building
+# with srcdir=..
+HOST_SUBDIR = @host_subdir@
+# This is the list of variables to export in the environment when
+# configuring subdirectories for the host system.  We need to pass
+# some to the GCC configure because of its hybrid host/target nature.
+HOST_EXPORTS = \
+	$(BASE_EXPORTS) \
+	CC="$(CC)"; export CC; \
+	ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \
+	CFLAGS="$(CFLAGS)"; export CFLAGS; \
+	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+	CXX="$(CXX)"; export CXX; \
+	CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
+	GCJ="$(GCJ)"; export GCJ; \
+	GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \
+	GOC="$(GOC)"; export GOC; \
+	AR="$(AR)"; export AR; \
+	AS="$(AS)"; export AS; \
+	CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
+	DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
+	LD="$(LD)"; export LD; \
+	LDFLAGS="$(STAGE1_LDFLAGS) $(LDFLAGS)"; export LDFLAGS; \
+	NM="$(NM)"; export NM; \
+	RANLIB="$(RANLIB)"; export RANLIB; \
+	WINDRES="$(WINDRES)"; export WINDRES; \
+	WINDMC="$(WINDMC)"; export WINDMC; \
+	OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
+	OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+	AR_FOR_TARGET="$(AR_FOR_TARGET)"; export AR_FOR_TARGET; \
+	AS_FOR_TARGET="$(AS_FOR_TARGET)"; export AS_FOR_TARGET; \
+	GCC_FOR_TARGET="$(GCC_FOR_TARGET)"; export GCC_FOR_TARGET; \
+	LD_FOR_TARGET="$(LD_FOR_TARGET)"; export LD_FOR_TARGET; \
+	NM_FOR_TARGET="$(NM_FOR_TARGET)"; export NM_FOR_TARGET; \
+	OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP_FOR_TARGET; \
+	RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
+	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
+	HOST_LIBS="$(STAGE1_LIBS)"; export HOST_LIBS; \
+	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
+	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
+	PPLLIBS="$(HOST_PPLLIBS)"; export PPLLIBS; \
+	PPLINC="$(HOST_PPLINC)"; export PPLINC; \
+	CLOOGLIBS="$(HOST_CLOOGLIBS)"; export CLOOGLIBS; \
+	CLOOGINC="$(HOST_CLOOGINC)"; export CLOOGINC; \
+	LIBELFLIBS="$(HOST_LIBELFLIBS)" ; export LIBELFLIBS; \
+	LIBELFINC="$(HOST_LIBELFINC)" ; export LIBELFINC; \
+@if gcc-bootstrap
+	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
+@endif gcc-bootstrap
+	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
+
+POSTSTAGE1_CXX_EXPORT = \
+	CXX='$(CXX)'; export CXX; \
+	CXX_FOR_BUILD='$(CXX_FOR_BUILD)'; export CXX_FOR_BUILD;
+@if target-libstdc++-v3-bootstrap
+# Override the above if we're bootstrapping C++.
+POSTSTAGE1_CXX_EXPORT = \
+	CXX="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/g++$(exeext) \
+	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ -nostdinc++ \
+	  -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
+	  -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
+	  -I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include/$(TARGET_SUBDIR) \
+	  -I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include \
+	  -I$$s/libstdc++-v3/libsupc++ \
+	  -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
+	  -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs"; \
+	  export CXX; \
+	CXX_FOR_BUILD="$$CXX"; export CXX_FOR_BUILD;
+@endif target-libstdc++-v3-bootstrap
+
+# Similar, for later GCC stages.
+POSTSTAGE1_HOST_EXPORTS = \
+	$(HOST_EXPORTS) \
+	CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
+	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ \
+	  $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
+	CC_FOR_BUILD="$$CC"; export CC_FOR_BUILD; \
+	$(POSTSTAGE1_CXX_EXPORT) \
+	GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND; \
+	LDFLAGS="$(POSTSTAGE1_LDFLAGS) $(BOOT_LDFLAGS)"; export LDFLAGS; \
+	HOST_LIBS="$(POSTSTAGE1_LIBS)"; export HOST_LIBS;
+
+# Target libraries are put under this directory:
+TARGET_SUBDIR = @target_subdir@
+# This is set by the configure script to the arguments to use when configuring
+# directories built for the target.
+TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)"
+# This is the list of variables to export in the environment when
+# configuring subdirectories for the target system.
+BASE_TARGET_EXPORTS = \
+	$(BASE_EXPORTS) \
+	AR="$(AR_FOR_TARGET)"; export AR; \
+	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
+	CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	GCJ="$(GCJ_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GCJ; \
+	GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \
+	GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \
+	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
+	LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+	LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \
+	NM="$(COMPILER_NM_FOR_TARGET)"; export NM; \
+	OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \
+	RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
+	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+	WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
+@if gcc-bootstrap
+	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
+@endif gcc-bootstrap
+	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
+	TARGET_CONFIGDIRS="$(TARGET_CONFIGDIRS)"; export TARGET_CONFIGDIRS;
+
+RAW_CXX_TARGET_EXPORTS = \
+	$(BASE_TARGET_EXPORTS) \
+	CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
+	CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
+
+NORMAL_TARGET_EXPORTS = \
+	$(BASE_TARGET_EXPORTS) \
+	CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
+
+# Where to find GMP
+HOST_GMPLIBS = @gmplibs@
+HOST_GMPINC = @gmpinc@
+
+# Where to find PPL
+HOST_PPLLIBS = @ppllibs@
+HOST_PPLINC = @pplinc@
+
+# Where to find CLOOG
+HOST_CLOOGLIBS = @clooglibs@
+HOST_CLOOGINC = @clooginc@
+
+# Where to find libelf
+HOST_LIBELFLIBS = @libelflibs@
+HOST_LIBELFINC = @libelfinc@
+
+EXTRA_CONFIGARGS_LIBJAVA = @EXTRA_CONFIGARGS_LIBJAVA@
+
+# ----------------------------------------------
+# Programs producing files for the BUILD machine
+# ----------------------------------------------
+
+SHELL = @SHELL@
+
+# pwd command to use.  Allow user to override default by setting PWDCMD in
+# the environment to account for automounters.  The make variable must not
+# be called PWDCMD, otherwise the value set here is passed to make
+# subprocesses and overrides the setting from the user's environment.
+# Don't use PWD since it is a common shell environment variable and we
+# don't want to corrupt it.
+PWD_COMMAND = $${PWDCMD-pwd}
+
+# compilers to use to create programs which must be run in the build
+# environment.
+AR_FOR_BUILD = @AR_FOR_BUILD@
+AS_FOR_BUILD = @AS_FOR_BUILD@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
+CXX_FOR_BUILD = @CXX_FOR_BUILD@
+DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
+GCJ_FOR_BUILD = @GCJ_FOR_BUILD@
+GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@
+GOC_FOR_BUILD = @GOC_FOR_BUILD@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+LD_FOR_BUILD = @LD_FOR_BUILD@
+NM_FOR_BUILD = @NM_FOR_BUILD@
+RANLIB_FOR_BUILD = @RANLIB_FOR_BUILD@
+WINDMC_FOR_BUILD = @WINDMC_FOR_BUILD@
+WINDRES_FOR_BUILD = @WINDRES_FOR_BUILD@
+
+# Special variables passed down in EXTRA_GCC_FLAGS.  They are defined
+# here so that they can be overridden by Makefile fragments.
+BUILD_PREFIX = @BUILD_PREFIX@
+BUILD_PREFIX_1 = @BUILD_PREFIX_1@
+
+# Flags to pass to stage2 and later makes.  They are defined
+# here so that they can be overridden by Makefile fragments.
+BOOT_CFLAGS= -g -O2
+BOOT_LDFLAGS=
+BOOT_ADAFLAGS=-gnatpg -gnata
+
+AWK = @AWK@
+SED = @SED@
+BISON = @BISON@
+YACC = @YACC@
+FLEX = @FLEX@
+LEX = @LEX@
+M4 = @M4@
+MAKEINFO = @MAKEINFO@
+EXPECT = @EXPECT@
+RUNTEST = @RUNTEST@
+
+# This just becomes part of the MAKEINFO definition passed down to
+# sub-makes.  It lets flags be given on the command line while still
+# using the makeinfo from the object tree.
+# (Default to avoid splitting info files by setting the threshold high.)
+MAKEINFOFLAGS = --split-size=5000000
+
+# ---------------------------------------------
+# Programs producing files for the HOST machine
+# ---------------------------------------------
+
+AS = @AS@
+AR = @AR@
+AR_FLAGS = rc
+CC = @CC@
+CXX = @CXX@
+DLLTOOL = @DLLTOOL@
+LD = @LD@
+LIPO = @LIPO@
+NM = @NM@
+OBJDUMP = @OBJDUMP@
+RANLIB = @RANLIB@
+STRIP = @STRIP@
+WINDRES = @WINDRES@
+WINDMC = @WINDMC@
+
+GNATBIND = @GNATBIND@
+GNATMAKE = @GNATMAKE@
+
+CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBCFLAGS = $(CFLAGS)
+CXXFLAGS = @CXXFLAGS@
+LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
+GOCFLAGS = $(CFLAGS)
+
+TFLAGS =
+
+# Defaults for all stages; some are overridden below.
+
+STAGE_CFLAGS = $(BOOT_CFLAGS)
+STAGE_TFLAGS = $(TFLAGS)
+STAGE_CONFIGURE_FLAGS=@stage2_werror_flag@
+POSTSTAGE1_CONFIGURE_FLAGS = @POSTSTAGE1_CONFIGURE_FLAGS@
+
+[+ FOR bootstrap-stage +]
+# Defaults for stage [+id+]; some are overridden below.
+STAGE[+id+]_CFLAGS = $(STAGE_CFLAGS)
+STAGE[+id+]_CXXFLAGS = $(CXXFLAGS)
+@if target-libstdc++-v3-bootstrap
+# Override the above if we're bootstrapping C++.
+STAGE[+id+]_CXXFLAGS = $(STAGE[+id+]_CFLAGS)
+@endif target-libstdc++-v3-bootstrap
+STAGE[+id+]_TFLAGS = $(STAGE_TFLAGS)
+# STAGE1_CONFIGURE_FLAGS overridden below, so we can use
+# POSTSTAGE1_CONFIGURE_FLAGS here.
+STAGE[+id+]_CONFIGURE_FLAGS = \
+	$(STAGE_CONFIGURE_FLAGS) $(POSTSTAGE1_CONFIGURE_FLAGS)
+[+ ENDFOR bootstrap-stage +]
+
+# Only build the C compiler for stage1, because that is the only one that
+# we can guarantee will build with the native compiler, and also it is the
+# only thing useful for building stage2. STAGE1_CFLAGS (via CFLAGS),
+# MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
+# overrideable (for a bootstrap build stage1 also builds gcc.info).
+
+STAGE1_CFLAGS = @stage1_cflags@
+STAGE1_CHECKING = @stage1_checking@
+STAGE1_LANGUAGES = @stage1_languages@
+# * We force-disable intermodule optimizations, even if
+#   --enable-intermodule was passed, since the installed compiler
+#   probably can't handle them.  Luckily, autoconf always respects
+#   the last argument when conflicting --enable arguments are passed.
+# * Likewise, we force-disable coverage flags, since the installed
+#   compiler probably has never heard of them.
+# * Don't remove this, because above we added
+#   POSTSTAGE1_CONFIGURE_FLAGS to STAGE[+id+]_CONFIGURE_FLAGS, which
+#   we don't want for STAGE1_CONFIGURE_FLAGS.
+STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \
+	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"
+
+STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate
+STAGEprofile_TFLAGS = $(STAGE2_TFLAGS)
+
+STAGEfeedback_CFLAGS = $(STAGE3_CFLAGS) -fprofile-use
+STAGEfeedback_TFLAGS = $(STAGE3_TFLAGS)
+
+do-compare = @do_compare@
+do-compare3 = $(do-compare)
+
+# -----------------------------------------------
+# Programs producing files for the TARGET machine
+# -----------------------------------------------
+
+AR_FOR_TARGET=@AR_FOR_TARGET@
+AS_FOR_TARGET=@AS_FOR_TARGET@
+CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@
+
+# If GCC_FOR_TARGET is not overriden on the command line, then this
+# variable is passed down to the gcc Makefile, where it is used to
+# build libgcc2.a.  We define it here so that it can itself be
+# overridden on the command line.
+GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@
+CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@
+RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@
+GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@
+GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@
+GOC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GOC_FOR_TARGET@
+DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
+LD_FOR_TARGET=@LD_FOR_TARGET@
+
+LIPO_FOR_TARGET=@LIPO_FOR_TARGET@
+NM_FOR_TARGET=@NM_FOR_TARGET@
+OBJDUMP_FOR_TARGET=@OBJDUMP_FOR_TARGET@
+RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
+STRIP_FOR_TARGET=@STRIP_FOR_TARGET@
+WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
+WINDMC_FOR_TARGET=@WINDMC_FOR_TARGET@
+
+COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_TARGET@
+COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
+COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
+
+CFLAGS_FOR_TARGET = @CFLAGS_FOR_TARGET@
+CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@
+
+LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
+LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
+LDFLAGS_FOR_TARGET = @LDFLAGS_FOR_TARGET@
+GOCFLAGS_FOR_TARGET = -O2 -g
+
+FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
+SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
+DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
+
+XGCC_FLAGS_FOR_TARGET = $(FLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
+
+# ------------------------------------
+# Miscellaneous targets and flag lists
+# ------------------------------------
+
+# The first rule in the file had better be this one.  Don't put any above it.
+# This lives here to allow makefile fragments to contain dependencies.
+all:
+
+#### host and target specific makefile fragments come in here.
+@target_makefile_frag@
+@alphaieee_frag@
+@ospace_frag@
+@host_makefile_frag@
+###
+
+# This is the list of directories that may be needed in RPATH_ENVVAR
+# so that programs built for the target machine work.
+TARGET_LIB_PATH = [+ FOR target_modules +][+
+  IF lib_path +]$(TARGET_LIB_PATH_[+module+])[+ ENDIF lib_path +][+
+  ENDFOR target_modules +]$(HOST_LIB_PATH_gcc)
+[+ FOR target_modules +][+ IF lib_path +]
+@if target-[+module+]
+TARGET_LIB_PATH_[+module+] = $$r/$(TARGET_SUBDIR)/[+module+]/[+lib_path+]:
+@endif target-[+module+]
+[+ ENDIF lib_path +][+ ENDFOR target_modules +]
+
+
+# This is the list of directories that may be needed in RPATH_ENVVAR
+# so that programs built for the host machine work.
+HOST_LIB_PATH = [+ FOR host_modules +][+
+  IF lib_path +]$(HOST_LIB_PATH_[+module+])[+ ENDIF lib_path +][+
+  ENDFOR host_modules +]
+
+# Define HOST_LIB_PATH_gcc here, for the sake of TARGET_LIB_PATH, ouch
+@if gcc
+HOST_LIB_PATH_gcc = $$r/$(HOST_SUBDIR)/gcc$(GCC_SHLIB_SUBDIR):$$r/$(HOST_SUBDIR)/prev-gcc$(GCC_SHLIB_SUBDIR):
+@endif gcc
+
+[+ FOR host_modules +][+ IF lib_path +]
+@if [+module+]
+HOST_LIB_PATH_[+module+] = \
+  $$r/$(HOST_SUBDIR)/[+module+]/[+lib_path+]:[+ IF bootstrap
+  +]$$r/$(HOST_SUBDIR)/prev-[+module+]/[+lib_path+]:[+ ENDIF bootstrap +]
+@endif [+module+]
+[+ ENDIF lib_path +][+ ENDFOR host_modules +]
+
+CXX_FOR_TARGET_FLAG_TO_PASS = \
+	"CXX_FOR_TARGET=$(CXX_FOR_TARGET)"
+@if target-libstdc++-v3
+# CXX_FOR_TARGET is tricky to get right for target libs that require a
+# functional C++ compiler.  When we recurse, if we expand
+# CXX_FOR_TARGET before configuring libstdc++-v3, we won't get
+# libstdc++ include flags from the script.  Instead, we get an
+# -funconfigured-* word, so that we'll get errors if this invalid C++
+# command line is used for anything, but also so that we can use the
+# word to decide whether or not to pass on this CXX_FOR_TARGET.  If we
+# don't pass it on, sub-make will use the default definition, that
+# re-expands it at the time of use, so we'll get it right when we need
+# it.  One potential exception is the expansion of CXX_FOR_TARGET
+# passed down as part of CXX within TARGET_FLAGS, but this wouldn't
+# really work, for C++ host programs can't depend on the current-stage
+# C++ target library.
+CXX_FOR_TARGET_FLAG_TO_PASS = \
+	$(shell if echo "$(CXX_FOR_TARGET)" | grep " -funconfigured-" > /dev/null; then :; else echo '"CXX_FOR_TARGET=$(CXX_FOR_TARGET)"'; fi)
+@endif target-libstdc++-v3
+
+# Flags to pass down to all sub-makes.
+BASE_FLAGS_TO_PASS =[+ FOR flags_to_pass +][+ IF optional +] \
+	"`echo '[+flag+]=$([+flag+])' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"[+ ELSE optional +] \
+	"[+flag+]=$([+flag+])"[+ ENDIF optional+][+ ENDFOR flags_to_pass +][+ FOR bootstrap-stage +] \
+	"STAGE[+id+]_CFLAGS=$(STAGE[+id+]_CFLAGS)" \
+	"STAGE[+id+]_CXXFLAGS=$(STAGE[+id+]_CXXFLAGS)" \
+	"STAGE[+id+]_TFLAGS=$(STAGE[+id+]_TFLAGS)"[+ ENDFOR bootstrap-stage +] \
+	$(CXX_FOR_TARGET_FLAG_TO_PASS) \
+	"TFLAGS=$(TFLAGS)" \
+	"CONFIG_SHELL=$(SHELL)" \
+	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 
+
+# We leave this in just in case, but it is not needed anymore.
+RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS)
+
+# Flags to pass down to most sub-makes, in which we're building with
+# the host environment.
+EXTRA_HOST_FLAGS = \
+	'AR=$(AR)' \
+	'AS=$(AS)' \
+	'CC=$(CC)' \
+	'CXX=$(CXX)' \
+	'DLLTOOL=$(DLLTOOL)' \
+	'GCJ=$(GCJ)' \
+	'GFORTRAN=$(GFORTRAN)' \
+	'GOC=$(GOC)' \
+	'LD=$(LD)' \
+	'LIPO=$(LIPO)' \
+	'NM=$(NM)' \
+	'OBJDUMP=$(OBJDUMP)' \
+	'RANLIB=$(RANLIB)' \
+	'STRIP=$(STRIP)' \
+	'WINDRES=$(WINDRES)' \
+	'WINDMC=$(WINDMC)'
+
+FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
+
+# Flags to pass to stage2 and later makes.
+
+POSTSTAGE1_FLAGS_TO_PASS = \
+	CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
+	CXX="$${CXX}" CXX_FOR_BUILD="$${CXX_FOR_BUILD}" \
+	GNATBIND="$${GNATBIND}" \
+	LDFLAGS="$${LDFLAGS}" \
+	HOST_LIBS="$${HOST_LIBS}" \
+	"`echo 'ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
+
+# Flags to pass down to makes which are built with the target environment.
+# The double $ decreases the length of the command line; those variables
+# are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.  The
+# *_CFLAGS_FOR_TARGET variables are not passed down and most often empty,
+# so we expand them here.
+EXTRA_TARGET_FLAGS = \
+	'AR=$$(AR_FOR_TARGET)' \
+	'AS=$(COMPILER_AS_FOR_TARGET)' \
+	'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+	'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
+	'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
+	'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
+	'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+	'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+	'GOC=$$(GOC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+	'GOCFLAGS=$$(GOCFLAGS_FOR_TARGET)' \
+	'LD=$(COMPILER_LD_FOR_TARGET)' \
+	'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
+	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
+	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
+	'NM=$(COMPILER_NM_FOR_TARGET)' \
+	'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
+	'RANLIB=$$(RANLIB_FOR_TARGET)' \
+	'WINDRES=$$(WINDRES_FOR_TARGET)' \
+	'WINDMC=$$(WINDMC_FOR_TARGET)' \
+	'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
+	"TFLAGS=$$TFLAGS"
+
+TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
+
+# Flags to pass down to gcc.  gcc builds a library, libgcc.a, so it
+# unfortunately needs the native compiler and the target ar and
+# ranlib.
+# If any variables are added here, they must be added to do-*, below.
+# The BUILD_* variables are a special case, which are used for the gcc
+# cross-building scheme.
+EXTRA_GCC_FLAGS = \
+	"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
+	"`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
+
+GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
+
+@if gcc
+BUILD_CONFIG = @BUILD_CONFIG@
+ifneq ($(BUILD_CONFIG),)
+include $(foreach CONFIG, $(BUILD_CONFIG), $(srcdir)/config/$(CONFIG).mk)
+endif
+@endif gcc
+
+.PHONY: configure-host
+configure-host: [+
+  FOR host_modules +] \
+    maybe-configure-[+module+][+
+  ENDFOR host_modules +]
+.PHONY: configure-target
+configure-target: [+
+  FOR target_modules +] \
+    maybe-configure-target-[+module+][+
+  ENDFOR target_modules +]
+
+# The target built for a native non-bootstrap build.
+.PHONY: all
+all:
+@if gcc-bootstrap
+	[ -f stage_final ] || echo stage3 > stage_final
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) `cat stage_final`-bubble
+@endif gcc-bootstrap
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+@if gcc-bootstrap
+	if [ -f stage_last ]; then \
+	  TFLAGS="$(STAGE$(shell test ! -f stage_last || sed s,^stage,, stage_last)_TFLAGS)"; \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \
+	else \
+@endif gcc-bootstrap
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target \
+@if gcc-bootstrap
+	    ; \
+	fi \
+@endif gcc-bootstrap
+	&& :
+
+.PHONY: all-build
+[+ FOR build_modules +]
+all-build: maybe-all-build-[+module+][+ ENDFOR build_modules +]
+
+.PHONY: all-host
+[+ FOR host_modules +][+ IF bootstrap +]
+@if [+module+]-no-bootstrap[+ ENDIF bootstrap +]
+all-host: maybe-all-[+module+][+ IF bootstrap +]
+@endif [+module+]-no-bootstrap[+ ENDIF bootstrap +][+ ENDFOR host_modules +]
+
+.PHONY: all-target
+[+ FOR target_modules +][+ IF bootstrap +]
+@if target-[+module+]-no-bootstrap[+ ENDIF bootstrap +]
+all-target: maybe-all-target-[+module+][+ IF bootstrap +]
+@endif target-[+module+]-no-bootstrap[+
+  ENDIF bootstrap +][+ ENDFOR target_modules +]
+
+# Do a target for all the subdirectories.  A ``make do-X'' will do a
+# ``make X'' in all subdirectories (because, in general, there is a
+# dependency (below) of X upon do-X, a ``make X'' will also do this,
+# but it may do additional work as well).
+[+ FOR recursive_targets +]
+.PHONY: do-[+make_target+]
+do-[+make_target+]:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) [+make_target+]-host \
+	  [+make_target+]-target
+
+
+.PHONY: [+make_target+]-host
+[+ FOR host_modules +]
+[+make_target+]-host: maybe-[+make_target+]-[+module+][+ ENDFOR host_modules +]
+
+.PHONY: [+make_target+]-target
+[+ FOR target_modules +]
+[+make_target+]-target: maybe-[+make_target+]-target-[+module+][+ ENDFOR target_modules +]
+[+ ENDFOR recursive_targets +]
+
+# Here are the targets which correspond to the do-X targets.
+
+.PHONY: info installcheck dvi pdf html
+.PHONY: install-info install-pdf install-html
+.PHONY: clean distclean mostlyclean maintainer-clean realclean
+.PHONY: local-clean local-distclean local-maintainer-clean
+info: do-info
+installcheck: do-installcheck
+dvi: do-dvi
+pdf: do-pdf
+html: do-html
+
+# Make sure makeinfo is built before we do a `make info', if we're
+# in fact building texinfo.
+do-info: maybe-all-texinfo
+
+install-info: do-install-info dir.info
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	if [ -f dir.info ] ; then \
+	  $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \
+	else true ; fi
+
+install-pdf: do-install-pdf
+
+install-html: do-install-html
+
+local-clean:
+	-rm -f *.a TEMP errs core *.o *~ \#* TAGS *.E *.log
+
+local-distclean:
+	-rm -f Makefile config.status config.cache mh-frag mt-frag
+	-rm -f maybedep.tmp serdep.tmp
+	-if [ "$(TARGET_SUBDIR)" != "." ]; then \
+	  rm -rf $(TARGET_SUBDIR); \
+	else true; fi
+	-rm -rf $(BUILD_SUBDIR)
+	-if [ "$(HOST_SUBDIR)" != "." ]; then \
+	  rm -rf $(HOST_SUBDIR); \
+	else true; fi
+	-rm -f texinfo/po/Makefile texinfo/po/Makefile.in texinfo/info/Makefile
+	-rm -f texinfo/doc/Makefile texinfo/po/POTFILES
+	-rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
+	-rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null
+	-rmdir fastjar gcc libiberty texinfo zlib 2>/dev/null
+	-find . -name config.cache -exec rm -f {} \; \; 2>/dev/null
+
+local-maintainer-clean:
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+clean: do-clean local-clean
+mostlyclean: do-mostlyclean local-clean
+distclean: do-distclean local-clean local-distclean
+maintainer-clean: local-maintainer-clean do-maintainer-clean local-clean 
+maintainer-clean: local-distclean
+realclean: maintainer-clean
+
+# Check target.
+
+.PHONY: check do-check
+check: do-check
+
+# Only include modules actually being configured and built.
+.PHONY: check-host
+check-host: [+
+  FOR host_modules +] \
+    maybe-check-[+module+][+
+  ENDFOR host_modules +]
+
+.PHONY: check-target
+check-target: [+
+  FOR target_modules +] \
+    maybe-check-target-[+module+][+
+  ENDFOR target_modules +]
+
+do-check:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target
+
+# Automated reporting of test results.
+
+warning.log: build.log
+	$(srcdir)/contrib/warn_summary build.log > $@
+
+mail-report.log:
+	if test x'$(BOOT_CFLAGS)' != x''; then \
+	    BOOT_CFLAGS='$(BOOT_CFLAGS)'; export BOOT_CFLAGS; \
+	fi; \
+	$(srcdir)/contrib/test_summary -t >$@
+	chmod +x $@
+	echo If you really want to send e-mail, run ./$@ now
+
+mail-report-with-warnings.log: warning.log
+	if test x'$(BOOT_CFLAGS)' != x''; then \
+	    BOOT_CFLAGS='$(BOOT_CFLAGS)'; export BOOT_CFLAGS; \
+	fi; \
+	$(srcdir)/contrib/test_summary -t -i warning.log >$@
+	chmod +x $@
+	echo If you really want to send e-mail, run ./$@ now
+
+# Installation targets.
+
+.PHONY: install uninstall
+install:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target
+
+.PHONY: install-host-nogcc
+install-host-nogcc: [+
+  FOR host_modules +][+ IF (not (= (get "module") "gcc")) +] \
+    maybe-install-[+module+][+ ENDIF +][+
+  ENDFOR host_modules +]
+
+.PHONY: install-host
+install-host: [+
+  FOR host_modules +] \
+    maybe-install-[+module+][+
+  ENDFOR host_modules +]
+
+.PHONY: install-target
+install-target: [+
+  FOR target_modules +] \
+    maybe-install-target-[+module+][+
+  ENDFOR target_modules +]
+
+uninstall:
+	@echo "the uninstall target is not supported in this tree"
+
+.PHONY: install.all
+install.all: install-no-fixedincludes
+	@if [ -f ./gcc/Makefile ] ; then \
+		r=`${PWD_COMMAND}` ; export r ; \
+		s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+		$(HOST_EXPORTS) \
+		(cd ./gcc && \
+		$(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
+	else \
+		true ; \
+	fi
+
+# install-no-fixedincludes is used because Cygnus can not distribute
+# the fixed header files.
+.PHONY: install-no-fixedincludes
+install-no-fixedincludes: installdirs install-host-nogcc \
+	install-target gcc-no-fixedincludes
+
+.PHONY: install-strip
+install-strip:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-strip-host install-strip-target
+
+.PHONY: install-strip-host
+install-strip-host: [+
+  FOR host_modules +] \
+    maybe-install-strip-[+module+][+
+  ENDFOR host_modules +]
+
+.PHONY: install-strip-target
+install-strip-target: [+
+  FOR target_modules +] \
+    maybe-install-strip-target-[+module+][+
+  ENDFOR target_modules +]
+
+
+### other supporting targets
+
+MAKEDIRS= \
+	$(DESTDIR)$(prefix) \
+	$(DESTDIR)$(exec_prefix)
+.PHONY: installdirs
+installdirs: mkinstalldirs
+	$(SHELL) $(srcdir)/mkinstalldirs $(MAKEDIRS)
+
+dir.info: do-install-info
+	if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \
+	  $(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \
+	  mv -f dir.info.new dir.info ; \
+	else true ; \
+	fi
+
+dist:
+	@echo "Building a full distribution of this tree isn't done"
+	@echo "via 'make dist'.  Check out the etc/ subdirectory" 
+
+etags tags: TAGS
+
+# Right now this just builds TAGS in each subdirectory.  emacs19 has the
+# ability to use several tags files at once, so there is probably no need
+# to combine them into one big TAGS file (like CVS 1.3 does).  We could
+# (if we felt like it) have this Makefile write a piece of elisp which
+# the user could load to tell emacs19 where all the TAGS files we just
+# built are.
+TAGS: do-TAGS
+
+# ------------------------------------
+# Macros for configure and all targets
+# ------------------------------------
+
+[+ DEFINE configure +]
+.PHONY: configure-[+prefix+][+module+] maybe-configure-[+prefix+][+module+]
+maybe-configure-[+prefix+][+module+]:
+@if gcc-bootstrap
+configure-[+prefix+][+module+]: stage_current
+@endif gcc-bootstrap
+@if [+prefix+][+module+]
+maybe-configure-[+prefix+][+module+]: configure-[+prefix+][+module+]
+configure-[+prefix+][+module+]: [+ IF bootstrap +][+ ELSE +]
+	@: $(MAKE); $(unstage)[+ ENDIF bootstrap +]
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	[+ IF check_multilibs
+	+]echo "Checking multilib configuration for [+module+]..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
+	$(CC_FOR_TARGET) --print-multi-lib > [+subdir+]/[+module+]/multilib.tmp 2> /dev/null ; \
+	if test -r [+subdir+]/[+module+]/multilib.out; then \
+	  if cmp -s [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; then \
+	    rm -f [+subdir+]/[+module+]/multilib.tmp; \
+	  else \
+	    rm -f [+subdir+]/[+module+]/Makefile; \
+	    mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \
+	  fi; \
+	else \
+	  mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \
+	fi; \
+	[+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
+	[+exports+] [+extra_exports+] \
+	echo Configuring in [+subdir+]/[+module+]; \
+	cd "[+subdir+]/[+module+]" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo [+subdir+]/[+module+]/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/[+module+]"; \
+	libsrcdir="$$s/[+module+]"; \
+	[+ IF no-config-site +]rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file [+ ENDIF +]$(SHELL) $${libsrcdir}/configure \
+	  [+args+] --build=${build_alias} --host=[+host_alias+] \
+	  --target=[+target_alias+] $${srcdiroption} [+extra_configure_flags+] \
+	  || exit 1
+@endif [+prefix+][+module+]
+
+[+ IF bootstrap +]
+[+ FOR bootstrap_stage +]
+.PHONY: configure-stage[+id+]-[+prefix+][+module+] maybe-configure-stage[+id+]-[+prefix+][+module+]
+maybe-configure-stage[+id+]-[+prefix+][+module+]:
+@if [+prefix+][+module+]-bootstrap
+maybe-configure-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+]
+configure-stage[+id+]-[+prefix+][+module+]:
+	@[ $(current_stage) = stage[+id+] ] || $(MAKE) stage[+id+]-start
+	@$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+]
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE[+id+]_TFLAGS)"; \
+	[+ IF check_multilibs
+	+]echo "Checking multilib configuration for [+module+]..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > [+subdir+]/[+module+]/multilib.tmp 2> /dev/null ; \
+	if test -r [+subdir+]/[+module+]/multilib.out; then \
+	  if cmp -s [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; then \
+	    rm -f [+subdir+]/[+module+]/multilib.tmp; \
+	  else \
+	    rm -f [+subdir+]/[+module+]/Makefile; \
+	    mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \
+	  fi; \
+	else \
+	  mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \
+	fi; \
+	[+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
+	[+exports+][+ IF prev +] \
+	[+poststage1_exports+][+ ENDIF prev +][+ IF prefix +] \
+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;[+ ELSE prefix +] \
+	CFLAGS="$(STAGE[+id+]_CFLAGS)"; export CFLAGS; \
+	CXXFLAGS="$(STAGE[+id+]_CXXFLAGS)"; export CXXFLAGS;[+ IF prev +] \
+	LIBCFLAGS="$(STAGE[+id+]_CFLAGS)"[+ ELSE prev +] \
+	LIBCFLAGS="$(LIBCFLAGS)"[+ ENDIF prev +]; export LIBCFLAGS;[+
+  ENDIF prefix +] [+extra_exports+] \
+	echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \
+	$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
+	cd [+subdir+]/[+module+] || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo [+subdir+]/[+module+]/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/[+module+]"; \
+	libsrcdir="$$s/[+module+]"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  [+args+] --build=${build_alias} --host=[+host_alias+] \
+	  --target=[+target_alias+] $${srcdiroption} [+ IF prev +]\
+	  --with-build-libsubdir=$(HOST_SUBDIR) [+ ENDIF prev +]\
+	  $(STAGE[+id+]_CONFIGURE_FLAGS)[+ IF extra_configure_flags +] \
+	  [+extra_configure_flags+][+ ENDIF extra_configure_flags +]
+@endif [+prefix+][+module+]-bootstrap
+[+ ENDFOR bootstrap_stage +]
+[+ ENDIF bootstrap +]
+[+ ENDDEF +]
+
+[+ DEFINE all +]
+.PHONY: all-[+prefix+][+module+] maybe-all-[+prefix+][+module+]
+maybe-all-[+prefix+][+module+]:
+@if gcc-bootstrap
+all-[+prefix+][+module+]: stage_current
+@endif gcc-bootstrap
+@if [+prefix+][+module+]
+TARGET-[+prefix+][+module+]=[+
+  IF all_target +][+all_target+][+ ELSE +]all[+ ENDIF all_target +]
+maybe-all-[+prefix+][+module+]: all-[+prefix+][+module+]
+all-[+prefix+][+module+]: configure-[+prefix+][+module+][+ IF bootstrap +][+ ELSE +]
+	@: $(MAKE); $(unstage)[+ ENDIF bootstrap +]
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	[+exports+] [+extra_exports+] \
+	(cd [+subdir+]/[+module+] && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) [+args+] [+extra_make_flags+] \
+		$(TARGET-[+prefix+][+module+]))
+@endif [+prefix+][+module+]
+
+[+ IF bootstrap +]
+[+ FOR bootstrap_stage +]
+.PHONY: all-stage[+id+]-[+prefix+][+module+] maybe-all-stage[+id+]-[+prefix+][+module+]
+.PHONY: clean-stage[+id+]-[+prefix+][+module+] maybe-clean-stage[+id+]-[+prefix+][+module+]
+maybe-all-stage[+id+]-[+prefix+][+module+]:
+maybe-clean-stage[+id+]-[+prefix+][+module+]:
+@if [+prefix+][+module+]-bootstrap
+maybe-all-stage[+id+]-[+prefix+][+module+]: all-stage[+id+]-[+prefix+][+module+]
+all-stage[+id+]: all-stage[+id+]-[+prefix+][+module+]
+TARGET-stage[+id+]-[+prefix+][+module+] = $(TARGET-[+prefix+][+module+])
+all-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+]
+	@[ $(current_stage) = stage[+id+] ] || $(MAKE) stage[+id+]-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE[+id+]_TFLAGS)"; \
+	[+exports+][+ IF prev +] \
+	[+poststage1_exports+][+ ENDIF prev +] [+extra_exports+] \
+	cd [+subdir+]/[+module+] && \
+	$(MAKE) $(BASE_FLAGS_TO_PASS)[+ IF prefix +] \
+		CFLAGS="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"[+ ELSE prefix +] \
+		CFLAGS="$(STAGE[+id+]_CFLAGS)" \
+		CXXFLAGS="$(STAGE[+id+]_CXXFLAGS)"[+ IF prev +] \
+		LIBCFLAGS="$(STAGE[+id+]_CFLAGS)"[+ ELSE prev +] \
+		LIBCFLAGS="$(LIBCFLAGS)"[+ ENDIF prev +][+ ENDIF prefix +] \
+		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+		[+args+] [+
+		IF prev +][+poststage1_args+][+ ENDIF prev
+		+] [+extra_make_flags+] \
+		TFLAGS="$(STAGE[+id+]_TFLAGS)" \
+		$(TARGET-stage[+id+]-[+prefix+][+module+])
+
+maybe-clean-stage[+id+]-[+prefix+][+module+]: clean-stage[+id+]-[+prefix+][+module+]
+clean-stage[+id+]: clean-stage[+id+]-[+prefix+][+module+]
+clean-stage[+id+]-[+prefix+][+module+]:
+	@if [ $(current_stage) = stage[+id+] ]; then \
+	  [ -f [+subdir+]/[+module+]/Makefile ] || exit 0; \
+	else \
+	  [ -f [+subdir+]/stage[+id+]-[+module+]/Makefile ] || exit 0; \
+	  $(MAKE) stage[+id+]-start; \
+	fi; \
+	cd [+subdir+]/[+module+] && \
+	$(MAKE) [+args+] [+ IF prev +] \
+		[+poststage1_args+] [+ ENDIF prev +] \
+		[+extra_make_flags+] clean
+@endif [+prefix+][+module+]-bootstrap
+
+[+ ENDFOR bootstrap_stage +]
+[+ ENDIF bootstrap +]
+[+ ENDDEF +]
+
+# --------------------------------------
+# Modules which run on the build machine
+# --------------------------------------
+[+ FOR build_modules +]
+[+ configure prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)"
+	     host_alias=(get "host" "${build_alias}")
+	     target_alias=(get "target" "${target_alias}")
+	     args="$(BUILD_CONFIGARGS)" no-config-site=true +]
+
+[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)"
+	     args="$(EXTRA_BUILD_FLAGS)" +]
+[+ ENDFOR build_module +]
+
+# --------------------------------------
+# Modules which run on the host machine
+# --------------------------------------
+[+ FOR host_modules +]
+[+ configure prefix="" subdir="$(HOST_SUBDIR)"
+	     exports="$(HOST_EXPORTS)"
+	     poststage1_exports="$(POSTSTAGE1_HOST_EXPORTS)"
+	     host_alias=(get "host" "${host_alias}")
+	     target_alias=(get "target" "${target_alias}")
+	     args="$(HOST_CONFIGARGS)" +]
+
+[+ all prefix="" subdir="$(HOST_SUBDIR)"
+       exports="$(HOST_EXPORTS)"
+       poststage1_exports="$(POSTSTAGE1_HOST_EXPORTS)"
+       args="$(EXTRA_HOST_FLAGS)"
+       poststage1_args="$(POSTSTAGE1_FLAGS_TO_PASS)" +]
+
+.PHONY: check-[+module+] maybe-check-[+module+]
+maybe-check-[+module+]:
+@if [+module+]
+maybe-check-[+module+]: check-[+module+]
+[+ IF no_check +]
+check-[+module+]:
+[+ ELIF no_check_cross +]
+# This module is only tested in a native toolchain.
+check-[+module+]:
+	@: $(MAKE); $(unstage)
+	@if [ '$(host)' = '$(target)' ] ; then \
+	  r=`${PWD_COMMAND}`; export r; \
+	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	  $(HOST_EXPORTS) \
+	  (cd $(HOST_SUBDIR)/[+module+] && \
+	    $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] check); \
+	fi
+[+ ELSE check +]
+check-[+module+]:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/[+module+] && \
+	  $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] check)
+[+ ENDIF no_check +]
+@endif [+module+]
+
+.PHONY: install-[+module+] maybe-install-[+module+]
+maybe-install-[+module+]:
+@if [+module+]
+maybe-install-[+module+]: install-[+module+]
+[+ IF no_install +]
+install-[+module+]:
+[+ ELSE install +]
+install-[+module+]: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/[+module+] && \
+	  $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] install)
+[+ ENDIF no_install +]
+@endif [+module+]
+
+.PHONY: install-strip-[+module+] maybe-install-strip-[+module+]
+maybe-install-strip-[+module+]:
+@if [+module+]
+maybe-install-strip-[+module+]: install-strip-[+module+]
+[+ IF no_install +]
+install-strip-[+module+]:
+[+ ELSE install +]
+install-strip-[+module+]: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/[+module+] && \
+	  $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] install-strip)
+[+ ENDIF no_install +]
+@endif [+module+]
+
+# Other targets (info, dvi, pdf, etc.)
+[+ FOR recursive_targets +]
+.PHONY: maybe-[+make_target+]-[+module+] [+make_target+]-[+module+]
+maybe-[+make_target+]-[+module+]:
+@if [+module+]
+maybe-[+make_target+]-[+module+]: [+make_target+]-[+module+]
+[+ IF (match-value? = "missing" (get "make_target") ) +]
+# [+module+] doesn't support [+make_target+].
+[+make_target+]-[+module+]:
+[+ ELSE +]
+[+make_target+]-[+module+]: [+
+  FOR depend +]\
+    [+depend+]-[+module+] [+
+  ENDFOR depend +]
+	@[+ IF bootstrap +][+ ELSE +]: $(MAKE); $(unstage)
+	@[+ ENDIF bootstrap +][ -f ./[+module+]/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) [+extra_make_flags+]; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing [+make_target+] in [+module+]" ; \
+	(cd $(HOST_SUBDIR)/[+module+] && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          [+make_target+]) \
+	  || exit 1
+[+ ENDIF +]
+@endif [+module+]
+[+ ENDFOR recursive_targets +]
+[+ ENDFOR host_modules +]
+
+# ---------------------------------------
+# Modules which run on the target machine
+# ---------------------------------------
+[+ FOR target_modules +]
+
+[+ IF raw_cxx +]
+[+ configure prefix="target-" subdir="$(TARGET_SUBDIR)"
+	     check_multilibs=true
+	     exports="$(RAW_CXX_TARGET_EXPORTS)"
+	     host_alias=(get "host" "${target_alias}")
+	     target_alias=(get "target" "${target_alias}")
+	     args="$(TARGET_CONFIGARGS)" no-config-site=true +]
+
+[+ all prefix="target-" subdir="$(TARGET_SUBDIR)"
+       exports="$(RAW_CXX_TARGET_EXPORTS)"
+       args="$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'" +]
+[+ ELSE +]
+[+ configure prefix="target-" subdir="$(TARGET_SUBDIR)"
+	     check_multilibs=true
+	     exports="$(NORMAL_TARGET_EXPORTS)"
+	     host_alias=(get "host" "${target_alias}")
+	     target_alias=(get "target" "${target_alias}")
+	     args="$(TARGET_CONFIGARGS)" no-config-site=true +]
+
+[+ all prefix="target-" subdir="$(TARGET_SUBDIR)"
+       exports="$(NORMAL_TARGET_EXPORTS)"
+       args="$(EXTRA_TARGET_FLAGS)" +]
+[+ ENDIF +]
+
+.PHONY: check-target-[+module+] maybe-check-target-[+module+]
+maybe-check-target-[+module+]:
+@if target-[+module+]
+maybe-check-target-[+module+]: check-target-[+module+]
+[+ IF no_check +]
+# Dummy target for uncheckable module.
+check-target-[+module+]:
+[+ ELSE check +]
+check-target-[+module+]:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
+IF raw_cxx +]
+	$(RAW_CXX_TARGET_EXPORTS) \[+
+ELSE normal_cxx +]
+	$(NORMAL_TARGET_EXPORTS) \[+
+ENDIF raw_cxx +]
+	(cd $(TARGET_SUBDIR)/[+module+] && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS) [+
+	    IF raw_cxx 
+	      +] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+ 
+	    ENDIF raw_cxx 
+	  +] [+extra_make_flags+] check)
+[+ ENDIF no_check +]
+@endif target-[+module+]
+
+.PHONY: install-target-[+module+] maybe-install-target-[+module+]
+maybe-install-target-[+module+]:
+@if target-[+module+]
+maybe-install-target-[+module+]: install-target-[+module+]
+[+ IF no_install +]
+# Dummy target for uninstallable.
+install-target-[+module+]:
+[+ ELSE install +]
+install-target-[+module+]: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
+IF raw_cxx +]
+	$(RAW_CXX_TARGET_EXPORTS) \[+
+ELSE normal_cxx +]
+	$(NORMAL_TARGET_EXPORTS) \[+
+ENDIF raw_cxx +]
+	(cd $(TARGET_SUBDIR)/[+module+] && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS) [+extra_make_flags+] install)
+[+ ENDIF no_install +]
+@endif target-[+module+]
+
+.PHONY: install-strip-target-[+module+] maybe-install-strip-target-[+module+]
+maybe-install-strip-target-[+module+]:
+@if target-[+module+]
+maybe-install-strip-target-[+module+]: install-strip-target-[+module+]
+[+ IF no_install +]
+# Dummy target for uninstallable.
+install-strip-target-[+module+]:
+[+ ELSE install +]
+install-strip-target-[+module+]: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
+IF raw_cxx +]
+	$(RAW_CXX_TARGET_EXPORTS) \[+
+ELSE normal_cxx +]
+	$(NORMAL_TARGET_EXPORTS) \[+
+ENDIF raw_cxx +]
+	(cd $(TARGET_SUBDIR)/[+module+] && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS) [+extra_make_flags+] install-strip)
+[+ ENDIF no_install +]
+@endif target-[+module+]
+
+# Other targets (info, dvi, pdf, etc.)
+[+ FOR recursive_targets +]
+.PHONY: maybe-[+make_target+]-target-[+module+] [+make_target+]-target-[+module+]
+maybe-[+make_target+]-target-[+module+]:
+@if target-[+module+]
+maybe-[+make_target+]-target-[+module+]: [+make_target+]-target-[+module+]
+[+ IF (match-value? = "missing" (get "make_target") ) +]
+# [+module+] doesn't support [+make_target+].
+[+make_target+]-target-[+module+]:
+[+ ELSE +]
+[+make_target+]-target-[+module+]: [+
+  FOR depend +]\
+    [+depend+]-target-[+module+] [+
+  ENDFOR depend +]
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
+IF raw_cxx +]
+	$(RAW_CXX_TARGET_EXPORTS) \[+
+ELSE normal_cxx +]
+	$(NORMAL_TARGET_EXPORTS) \[+
+ENDIF raw_cxx +]
+	echo "Doing [+make_target+] in $(TARGET_SUBDIR)/[+module+]" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/[+module+] && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          [+extra_make_flags+] [+make_target+]) \
+	  || exit 1
+[+ ENDIF +]
+@endif target-[+module+]
+[+ ENDFOR recursive_targets +]
+[+ ENDFOR target_modules +]
+
+@if target-libmudflap
+.PHONY: check-target-libmudflap-c++
+check-target-libmudflap-c++:
+	$(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) c++frags.exp" check-target-libmudflap
+
+@endif target-libmudflap
+
+# ----------
+# GCC module
+# ----------
+
+@if gcc-no-bootstrap
+.PHONY: cross
+cross: all-build all-gas all-ld
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	echo "Building the C and C++ compiler"; \
+	cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
+	echo "Building runtime libraries"; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LANGUAGES="c c++" all
+@endif gcc-no-bootstrap
+
+@if gcc
+[+ FOR languages +]
+.PHONY: check-gcc-[+language+] check-[+language+]
+check-gcc-[+language+]:
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) [+gcc-check-target+]);
+check-[+language+]: check-gcc-[+language+][+ FOR lib-check-target +] [+ lib-check-target +][+ ENDFOR lib-check-target +]
+[+ ENDFOR languages +]
+
+# Install the gcc headers files, but not the fixed include files,
+# which Cygnus is not allowed to distribute.  This rule is very
+# dependent on the workings of the gcc Makefile.in.
+.PHONY: gcc-no-fixedincludes
+gcc-no-fixedincludes:
+	@if [ -f ./gcc/Makefile ]; then \
+	  rm -rf gcc/tmp-include; \
+	  mv gcc/include gcc/tmp-include 2>/dev/null; \
+	  mkdir gcc/include; \
+	  cp $(srcdir)/gcc/gsyslimits.h gcc/include/syslimits.h; \
+	  touch gcc/stmp-fixinc gcc/include/fixed; \
+	  rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
+	  r=`${PWD_COMMAND}`; export r; \
+	  s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
+	  $(HOST_EXPORTS) \
+	  (cd ./gcc && \
+	   $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
+	  rm -rf gcc/include; \
+	  mv gcc/tmp-include gcc/include 2>/dev/null; \
+	else true; fi
+@endif gcc
+
+# ---------------------
+# GCC bootstrap support
+# ---------------------
+
+# We track the current stage (the one in 'gcc') in the stage_current file.
+# stage_last instead tracks the stage that was built last.  These targets
+# are dummy when toplevel bootstrap is not active.
+
+# While making host and target tools, symlinks to the final stage must be
+# there, so $(unstage) should be run at various points.  To avoid excessive
+# recursive invocations of make, we "inline" them using a variable.  These
+# must be referenced as ": $(MAKE) ; $(unstage)" rather than "$(unstage)"
+# to avoid warnings from the GNU Make job server.
+
+unstage = :
+stage = :
+current_stage = ""
+
+@if gcc-bootstrap
+unstage = if [ -f stage_last ]; then [ -f stage_current ] || $(MAKE) `cat stage_last`-start || exit 1; else :; fi
+stage = if [ -f stage_current ]; then $(MAKE) `cat stage_current`-end || exit 1; else :; fi
+current_stage = "`cat stage_current 2> /dev/null`"
+@endif gcc-bootstrap
+
+.PHONY: unstage stage
+unstage:
+	@: $(MAKE); $(unstage)
+stage:
+	@: $(MAKE); $(stage)
+
+# Disable commands for lean bootstrap.
+LEAN = false
+
+# We name the build directories for the various stages "stage1-gcc",
+# "stage2-gcc","stage3-gcc", etc.
+
+# Since the 'compare' process will fail (on debugging information) if any
+# directory names are different, we need to link the gcc directory for
+# the previous stage to a constant name ('prev-gcc'), and to make the name of
+# the build directories constant as well. For the latter, we use naked names
+# like 'gcc', because the scripts in that directory assume it.  We use
+# mv on platforms where symlinks to directories do not work or are not
+# reliable.
+
+# 'touch' doesn't work right on some platforms.
+STAMP = echo timestamp > 
+
+# We only want to compare .o files, so set this!
+objext = .o
+
+[+ FOR bootstrap-stage +]
+.PHONY: stage[+id+]-start stage[+id+]-end
+
+stage[+id+]-start::
+	@: $(MAKE); $(stage); \
+	echo stage[+id+] > stage_current ; \
+	echo stage[+id+] > stage_last; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)[+
+   FOR host_modules +][+ IF bootstrap +]
+@if [+ module +]
+	@cd $(HOST_SUBDIR); [ -d stage[+id+]-[+module+] ] || \
+	  mkdir stage[+id+]-[+module+]; \
+	mv stage[+id+]-[+module+] [+module+] [+ IF prev +] ; \
+	mv stage[+prev+]-[+module+] prev-[+module+] || test -f stage[+prev+]-lean [+ ENDIF prev +]
+@endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +]
+	@[ -d stage[+id+]-$(TARGET_SUBDIR) ] || \
+	  mkdir stage[+id+]-$(TARGET_SUBDIR); \
+	mv stage[+id+]-$(TARGET_SUBDIR) $(TARGET_SUBDIR) [+ IF prev +] ; \
+	mv stage[+prev+]-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage[+prev+]-lean [+ ENDIF prev +]
+
+stage[+id+]-end:: [+ FOR host_modules +][+ IF bootstrap +]
+@if [+ module +]
+	@if test -d $(HOST_SUBDIR)/[+module+] ; then \
+	  cd $(HOST_SUBDIR); mv [+module+] stage[+id+]-[+module+] [+ IF prev +]; \
+	  mv prev-[+module+] stage[+prev+]-[+module+] ; : [+ ENDIF prev +] ; \
+	fi
+@endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +]
+	@if test -d $(TARGET_SUBDIR) ; then \
+	  mv $(TARGET_SUBDIR) stage[+id+]-$(TARGET_SUBDIR) [+ IF prev +] ; \
+	  mv prev-$(TARGET_SUBDIR) stage[+prev+]-$(TARGET_SUBDIR) ; : [+ ENDIF prev +] ; \
+	fi
+	rm -f stage_current
+
+# Bubble a bug fix through all the stages up to stage [+id+].  They are
+# remade, but not reconfigured.  The next stage (if any) will not be
+# reconfigured either.
+.PHONY: stage[+id+]-bubble
+stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +]
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	if test -f stage[+id+]-lean [+
+	  IF prev +]|| test -f stage[+prev+]-lean [+ ENDIF prev +] ; then \
+	  echo Skipping rebuild of stage[+id+] ; \
+	else \
+	  $(MAKE) stage[+id+]-start; \[+IF lean +]
+	  if $(LEAN); then \
+	    rm -rf stage[+lean+]-* ; \
+	    $(STAMP) stage[+lean+]-lean ; \
+	  fi; \[+ ENDIF lean +]
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage[+id+]; \
+	fi[+ IF compare-target +]
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) [+compare-target+][+ ENDIF compare-target +]
+
+.PHONY: all-stage[+id+] clean-stage[+id+]
+do-clean: clean-stage[+id+]
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+[+ IF compare-target +]
+[+compare-target+]:
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	if test -f stage[+prev+]-lean; then \
+	  echo Cannot compare object files as stage [+prev+] was deleted. ; \
+	  exit 0 ; \
+	fi; \
+	: $(MAKE); $(stage); \
+	rm -f .bad_compare ; \
+	echo Comparing stages [+prev+] and [+id+] ; \
+        sed=`echo stage[+id+] | sed 's,^stage,,;s,.,.,g'`; \
+	files=`find stage[+id+]-* -name "*$(objext)" -print | \
+		 sed -n s,^stage$$sed-,,p` ; \
+	for file in $${files} ; do \
+	  f1=$$r/stage[+prev+]-$$file; f2=$$r/stage[+id+]-$$file; \
+	  if test ! -f $$f1; then continue; fi; \
+	  $(do-[+compare-target+]) > /dev/null 2>&1; \
+	  if test $$? -eq 1; then \
+	    case $$file in \
+	      @compare_exclusions@) \
+	        echo warning: $$file differs ;; \
+	      *) \
+	        echo $$file differs >> .bad_compare ;; \
+	    esac ; \
+	  fi ; \
+	done ; \
+	if [ -f .bad_compare ]; then \
+	  echo "Bootstrap comparison failure!"; \
+	  cat .bad_compare; \
+	  exit 1; \
+	else \
+	  echo Comparison successful.; \
+	fi ; \
+	$(STAMP) [+compare-target+][+ IF prev +]
+	if $(LEAN); then \
+	  rm -rf stage[+prev+]-*; \
+	  $(STAMP) stage[+prev+]-lean; \
+	fi[+ ENDIF prev +]
+[+ ENDIF compare-target +]
+
+[+ IF bootstrap-target +]
+.PHONY: [+bootstrap-target+] [+bootstrap-target+]-lean
+[+bootstrap-target+]:
+	echo stage[+id+] > stage_final
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage[+id+]-bubble
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE[+id+]_TFLAGS)"; \
+	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+
+[+bootstrap-target+]-lean:
+	echo stage[+id+] > stage_final
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage[+id+]-bubble
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE[+id+]_TFLAGS)"; \
+	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+[+ ENDIF bootstrap-target +]
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+[+ IF prev +]distclean-stage[+prev+]:: distclean-stage[+id+] [+ ENDIF prev +]
+.PHONY: distclean-stage[+id+]
+distclean-stage[+id+]::
+	@: $(MAKE); $(stage)
+	@test "`cat stage_last`" != stage[+id+] || rm -f stage_last
+	rm -rf stage[+id+]-* [+
+	  IF compare-target +][+compare-target+] [+ ENDIF compare-target +]
+
+[+ IF cleanstrap-target +]
+.PHONY: [+cleanstrap-target+]
+[+cleanstrap-target+]: do-distclean local-clean
+	echo stage[+id+] > stage_final
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage[+id+]-bubble
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	TFLAGS="$(STAGE[+id+]_TFLAGS)"; \
+	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+[+ ENDIF cleanstrap-target +]
+@endif gcc-bootstrap
+
+[+ ENDFOR bootstrap-stage +]
+
+stageprofile-end::
+	$(MAKE) distclean-stagefeedback
+
+stagefeedback-start::
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	for i in prev-*; do \
+	  j=`echo $$i | sed s/^prev-//` ; \
+	  cd $$r/$$i && \
+	  { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../'$$j'/&",' | $(SHELL) ; } && \
+	  { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../'$$j'/&",' | $(SHELL) ; } ; \
+	done
+
+@if gcc-bootstrap
+do-distclean: distclean-stage1
+
+# Provide a GCC build when we're building target libraries.  This does
+# not work as a dependency, just as the minimum necessary to avoid errors.
+stage_last:
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble
+
+# Same as unstage, but not phony and defaulting to stage1-start.  We place
+# it in the dependency so that for example `make -j3 all-gcc' works.
+stage_current:
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+
+.PHONY: restrap
+restrap::
+	@: $(MAKE); $(stage)
+	rm -rf stage1-$(TARGET_SUBDIR)[+ FOR bootstrap-stage +][+ IF prev
+	  +] stage[+id+]-*[+ ENDIF prev +][+ ENDFOR bootstrap-stage +]
+restrap:: all
+@endif gcc-bootstrap
+
+# --------------------------------------
+# Dependencies between different modules
+# --------------------------------------
+
+# Generic dependencies for target modules on host stuff, especially gcc
+@if gcc-bootstrap[+ FOR target_modules +][+ IF bootstrap
+  +][+ FOR bootstrap_stage +]
+configure-stage[+id+]-target-[+module+]: maybe-all-stage[+id+]-gcc[+
+  ENDFOR +][+ ELSE bootstrap +]
+configure-target-[+module+]: stage_last[+
+  ENDIF bootstrap +][+ ENDFOR target_modules +]
+@endif gcc-bootstrap
+
+@if gcc-no-bootstrap[+ FOR target_modules +]
+configure-target-[+module+]: maybe-all-gcc[+
+  ENDFOR target_modules +]
+@endif gcc-no-bootstrap
+
+
+# There are two types of dependencies here: 'hard' dependencies, where one
+# module simply won't build without the other; and 'soft' dependencies, where
+# if the depended-on module is missing, the depending module will do without
+# or find a substitute somewhere (perhaps installed).  Soft dependencies
+# are made here to depend on a 'maybe-' target.  If you're not sure,
+# it's safer to use a soft dependency.
+
+[+ ;; These Scheme functions build the bulk of the dependencies.
+   ;; dep-target builds a string like "maybe-all-MODULE_KIND-gcc",
+   ;; where "maybe-" is only included if HARD is not true, and all-gcc
+   ;; is taken from VAR-NAME.
+   (define dep-target (lambda (module-kind var-name hard)
+      (string-append
+         (if hard "" "maybe-")
+         (dep-subtarget var-name)
+         module-kind
+         (dep-module var-name)
+      )))
+
+   ;; make-dep builds a dependency from the MODULE and ON AutoGen vars.
+   (define make-dep (lambda (module-kind on-kind)
+      (string-append
+         (dep-target module-kind "module" #t) ": "
+         (dep-target on-kind "on" (exist? "hard")))))
+
+   ;; dep-subtarget extracts everything up to the first dash in the given
+   ;; AutoGen variable, for example it extracts "all-" out of "all-gcc".
+   (define dep-subtarget (lambda (var-name)
+      (substring (get var-name) 0 (+ 1 (string-index (get var-name) #\-)))))
+
+   ;; dep-module extracts everything up to the first dash in the given
+   ;; AutoGen variable, for example it extracts "gcc" out of "all-gcc".
+   (define dep-module (lambda (var-name)
+      (substring (get var-name) (+ 1 (string-index (get var-name) #\-)))))
+
+   ;; dep-stage builds a string for the prefix of a bootstrap stage.
+   (define dep-stage (lambda ()
+      (string-append
+	 "stage"
+	 (get "id")
+	 "-")))
+
+   ;; dep-maybe is the same as the AutoGen expression "- hard 'maybe-'"
+   ;; but is written in Scheme.
+   (define dep-maybe (lambda ()
+      (if (exist? "hard") "" "maybe-")))
+
+   ;; dep-kind returns "normal" if the dependency is on an "install" target,
+   ;; or if either module is not bootstrapped.  It returns "bootstrap" for
+   ;; configure or build dependencies between bootstrapped modules; it returns
+   ;; "prebootstrap" for configure or build dependencies of bootstrapped
+   ;; modules on a build module (e.g. all-gcc on all-build-bison).  All this
+   ;; is only necessary for host modules.
+   (define dep-kind (lambda ()
+      (if (and (hash-ref boot-modules (dep-module "module"))
+	       (=* (dep-module "on") "build-"))
+	  "prebootstrap"
+
+	  (if (or (= (dep-subtarget "on") "install-")
+		  (not (hash-ref boot-modules (dep-module "module")))
+		  (not (hash-ref boot-modules (dep-module "on"))))
+              "normal"
+	      "bootstrap"))))
+
+   ;; We now build the hash table that is used by dep-kind.
+   (define boot-modules (make-hash-table 113))
++]
+
+[+ FOR host_modules +][+
+   (if (exist? "bootstrap")
+       (hash-create-handle! boot-modules (get "module") #t))
+   "" +][+ ENDFOR host_modules +]
+[+ FOR target_modules +][+
+   (if (exist? "bootstrap")
+       (hash-create-handle! boot-modules (string-append "target-" (get "module")) #t))
+   "" +][+ ENDFOR target_modules +]
+
+# With all the machinery above in place, it is pretty easy to generate
+# dependencies.  Host dependencies are a bit more complex because we have
+# to check for bootstrap/prebootstrap dependencies.  To resolve
+# prebootstrap dependencies, prebootstrap modules are gathered in
+# a hash table.
+[+ FOR dependencies +][+ (make-dep "" "") +]
+[+ CASE (dep-kind) +]
+[+ == "prebootstrap"
+     +][+ FOR bootstrap_stage +]
+[+ (make-dep (dep-stage) "") +][+
+       ENDFOR bootstrap_stage +]
+[+ == "bootstrap"
+     +][+ FOR bootstrap_stage +]
+[+ (make-dep (dep-stage) (dep-stage)) +][+
+       ENDFOR bootstrap_stage +]
+[+ ESAC +][+
+ENDFOR dependencies +]
+
+# Dependencies for target modules on other target modules are
+# described by lang_env_dependencies; the defaults apply to anything
+# not mentioned there.
+[+
+   ;; Predicate for whether LANG was specified in lang_env_dependencies.
+   (define lang-dep (lambda (lang)
+      (hash-ref lang-env-deps (string-append (get "module") "-" lang))))
+
+   ;; Build the hash table we will need.
+   (define lang-env-deps (make-hash-table 7))
++][+ FOR lang_env_dependencies +][+
+   (if (exist? "cxx")
+       (hash-create-handle! lang-env-deps
+	  (string-append (get "module") "-" "cxx") #t))
+
+   (if (exist? "no_c")
+       (hash-create-handle! lang-env-deps
+	  (string-append (get "module") "-" "no_c") #t))
+
+   (if (exist? "no_gcc")
+       (hash-create-handle! lang-env-deps
+	  (string-append (get "module") "-" "no_gcc") #t))
+   "" +][+ ENDFOR lang_env_dependencies +]
+
+@if gcc-bootstrap[+ FOR target_modules +][+ IF (not (lang-dep "no_gcc"))
+  +][+ IF bootstrap +][+ FOR bootstrap_stage +]
+configure-stage[+id+]-target-[+module+]: maybe-all-stage[+id+]-target-libgcc[+
+  ENDFOR +][+ ENDIF bootstrap +][+ ENDIF +][+ ENDFOR target_modules +]
+@endif gcc-bootstrap
+
+@if gcc-no-bootstrap[+ FOR target_modules +][+ IF (not (lang-dep "no_gcc")) +]
+configure-target-[+module+]: maybe-all-target-libgcc[+
+  ENDIF +][+ ENDFOR target_modules +]
+@endif gcc-no-bootstrap
+
+[+ FOR target_modules +][+ IF (not (lang-dep "no_c")) +]
+configure-target-[+module+]: maybe-all-target-newlib maybe-all-target-libgloss[+
+  ENDIF +][+ IF (lang-dep "cxx") +]
+configure-target-[+module+]: maybe-all-target-libstdc++-v3[+
+  ENDIF +]
+[+ ENDFOR target_modules +]
+
+CONFIGURE_GDB_TK = @CONFIGURE_GDB_TK@
+GDB_TK = @GDB_TK@
+INSTALL_GDB_TK = @INSTALL_GDB_TK@
+configure-gdb: $(CONFIGURE_GDB_TK)
+all-gdb: $(gdbnlmrequirements) $(GDB_TK)
+install-gdb: $(INSTALL_GDB_TK)
+
+# Serialization dependencies.  Host configures don't work well in parallel to
+# each other, due to contention over config.cache.  Target configures and 
+# build configures are similar.
+@serialization_dependencies@
+
+# --------------------------------
+# Regenerating top level configury
+# --------------------------------
+
+# Rebuilding Makefile.in, using autogen.
+AUTOGEN = autogen
+$(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
+	cd $(srcdir) && $(AUTOGEN) Makefile.def
+
+# Rebuilding Makefile.
+Makefile: $(srcdir)/Makefile.in config.status
+	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+config.status: configure
+	CONFIG_SHELL="$(SHELL)" $(SHELL) ./config.status --recheck
+
+# Rebuilding configure.
+AUTOCONF = autoconf
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4 \
+	$(srcdir)/config/override.m4 $(srcdir)/config/proginstall.m4
+	cd $(srcdir) && $(AUTOCONF)
+
+# ------------------------------
+# Special directives to GNU Make
+# ------------------------------
+
+# Don't pass command-line variables to submakes.
+.NOEXPORT:
+MAKEOVERRIDES=
+
+# end of Makefile.in
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/README sdcc-3.2.0+dfsg/support/sdbinutils/README
--- sdcc-3.1.0+dfsg/support/sdbinutils/README	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/README	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,47 @@
+		   README for GNU development tools
+
+This directory contains various GNU compilers, assemblers, linkers, 
+debuggers, etc., plus their support routines, definitions, and documentation.
+
+If you are receiving this as part of a GDB release, see the file gdb/README.
+If with a binutils release, see binutils/README;  if with a libg++ release,
+see libg++/README, etc.  That'll give you info about this
+package -- supported targets, how to use it, how to report bugs, etc.
+
+It is now possible to automatically configure and build a variety of
+tools with one command.  To build all of the tools contained herein,
+run the ``configure'' script here, e.g.:
+
+	./configure 
+	make
+
+To install them (by default in /usr/local/bin, /usr/local/lib, etc),
+then do:
+	make install
+
+(If the configure script can't determine your type of computer, give it
+the name as an argument, for instance ``./configure sun4''.  You can
+use the script ``config.sub'' to test whether a name is recognized; if
+it is, config.sub translates it to a triplet specifying CPU, vendor,
+and OS.)
+
+If you have more than one compiler on your system, it is often best to
+explicitly set CC in the environment before running configure, and to
+also set CC when running make.  For example (assuming sh/bash/ksh):
+
+	CC=gcc ./configure
+	make
+
+A similar example using csh:
+
+	setenv CC gcc
+	./configure
+	make
+
+Much of the code and documentation enclosed is copyright by
+the Free Software Foundation, Inc.  See the file COPYING or
+COPYING.LIB in the various directories, for a description of the
+GNU General Public License terms under which you can copy the files.
+
+REPORTING BUGS: Again, see gdb/README, binutils/README, etc., for info
+on where and how to report problems.
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/README-maintainer-mode sdcc-3.2.0+dfsg/support/sdbinutils/README-maintainer-mode
--- sdcc-3.1.0+dfsg/support/sdbinutils/README-maintainer-mode	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/README-maintainer-mode	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,25 @@
+
+                Notes on enabling maintainer mode
+
+Note that if you configure with --enable-maintainer-mode, you will need
+special versions of automake, autoconf, libtool and gettext. You will
+find the sources for these in the respective upstream directories:
+
+  ftp://ftp.gnu.org/gnu/autoconf
+  ftp://ftp.gnu.org/gnu/automake
+  ftp://ftp.gnu.org/gnu/libtool
+  ftp://ftp.gnu.org/gnu/gettext
+
+The required versions of the tools for this tree are
+  autoconf 2.64
+  automake 1.11
+  libtool 2.2.6
+  gettext 0.14.5
+
+Note - "make distclean" does not work with maintainer mode enabled.
+The Makefiles in the some of the po/ subdirectories depend upon the
+Makefiles in their parent directories, and distclean will delete the
+Makefiles in the parent directories before running the Makefiles in
+the child directories.  There is no easy way around this (short of
+changing the automake macros) as these dependencies need to exist in
+order to correctly build the NLS files.
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/COPYING sdcc-3.2.0+dfsg/support/sdbinutils/bfd/COPYING
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/COPYING	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/COPYING	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2702 @@
+2011-11-21  Tristan Gingold  <gingold@adacore.com>
+
+	* configure.in: Bump version to 2.22
+	* Makefile.am (RELEASE): Set.
+	* configure, Makefile.in: Regenerate.
+
+2011-11-15  Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+	Backport from mainline:
+
+	2011-11-14  Maxim Kuvyrkov  <maxim@codesourcery.com>
+        * elfxx-mips.c (mips_n64_exe_plt0_entry): Use 64-bit move.
+
+2011-11-15  Alan Modra  <amodra@gmail.com>
+	    Andreas Tobler  <andreast@fgznet.ch>
+
+	* elflink.c (_bfd_elf_create_got_section): Replace
+	bfd_make_section_with_flags with bfd_make_section_anyway_with_flags.
+	(_bfd_elf_link_create_dynamic_sections): Likewise.
+	* elf32-ppc.c (ppc_elf_create_glink): Likewise.
+	(ppc_elf_create_dynamic_sections): Likewise.
+
+2011-11-09  Alan Modra  <amodra@gmail.com>
+
+	* elflink.c (bfd_elf_gc_mark_dynamic_ref_symbol): Mark syms in
+	executables when export_dynamic.
+
+2011-11-08  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (struct ppc64_elf_obj_tdata): Rename
+	ha_relocs_not_using_r2 to unexpected_toc_insn.
+	(ok_lo_toc_insn): New function.
+	(ppc64_elf_edit_toc): Check insn on lo toc reloc.  Emit warning.
+	(ppc64_elf_relocate_section): Don't check insn on lo toc reloc here.
+	Handle addic on lo toc reloc.
+
+2011-10-25  Alan Modra  <amodra@gmail.com>
+
+	Apply mainline patches
+	2011-10-20  Alan Modra  <amodra@gmail.com>
+	* elf32-i386.c (i386_opcode16): Delete.
+	(elf_i386_check_tls_transition): Use memcmp to compare contents.
+	* elf64-x86-64.c (x86_64_opcode16, x86_64_opcode32): Delete.
+	(elf_x86_64_check_tls_transition): Use memcmp to compare contents.
+
+	2011-10-19  Alan Modra  <amodra@gmail.com>
+	PR ld/13311
+	* elflink.c (elf_link_output_extsym): Correct test for warning when
+	forced local executable syms are referenced from shared libraries.
+
+	2011-10-19  Alan Modra  <amodra@gmail.com>
+	PR ld/13254
+	* elflink.c (bfd_elf_final_link): Emit error_textrel error.
+
+	2011-10-17  Alan Modra  <amodra@gmail.com>
+	PR ld/12975
+	PR ld/13195
+	* elf64-ppc.c (ppc64_elf_gc_mark_dynamic_ref): Apply 2011-09-15
+	and 2011-09-29 bfd_elf_gc_mark_dynamic_ref_symbol changes here too.
+
+	2011-10-11  Alan Modra  <amodra@gmail.com>
+	PR binutils/13278
+	* archive.c (bfd_generic_archive_p): Only check first element
+	when target_defaulted.
+	(_bfd_construct_extended_name_table): Use ar_maxnamelen.
+	(_bfd_archive_bsd44_construct_extended_name_table): Likewise.
+
+	2011-10-11  Alan Modra  <amodra@gmail.com>
+	PR binutils/13257
+	* archive.c (_bfd_find_nested_archive, _bfd_get_elt_at_filepos): Open
+	thin archive element using container target if not defaulted.
+
+	2011-10-10  Alan Modra  <amodra@gmail.com>
+	* elf64-ppc.c (ppc64_elf_howto_table): Add R_PPC64_TOCSAVE entry.
+	(struct ppc_link_hash_table): Add tocsave_htab.
+	(struct tocsave_entry): New.
+	(tocsave_htab_hash, tocsave_htab_eq, tocsave_find): New functions.
+	(ppc64_elf_link_hash_table_create): Create tocsave_htab..
+	(ppc64_elf_link_hash_table_free): ..and delete it.
+	(build_plt_stub): Always put STD_R2_40R1 first.
+	(ppc64_elf_size_stubs): Check for R_PPC64_TOCSAVE following reloc
+	on plt call.  If present add prologue nop location to tocsave_htab.
+	(ppc64_elf_relocate_section): Convert prologue nop to std.  Skip
+	first insn of plt call stub when R_PPC64_TOCSAVE present.
+
+	2011-10-08  H.J. Lu  <hongjiu.lu@intel.com>
+	PR ld/13250
+	* elflink.c (elf_link_add_object_symbols): Preserve the maximum
+	alignment and size for common symbols.
+
+	2011-10-08  Alan Modra  <amodra@gmail.com>
+	PR ld/13229
+	PR ld/13244
+	* elflink.c (elf_link_add_object_symbols): Don't make IR symbols
+	dynamic.
+
+	2011-10-08  Alan Modra  <amodra@gmail.com>
+	* elflink.c (elf_link_output_extsym): Strip defined plugin symbols
+	even when strip_discarded is false.
+
+	2011-09-30  Alan Modra  <amodra@gmail.com>
+	PR ld/13235
+	* elf64-ppc.c (struct ppc64_elf_obj_tdata): Add ha_relocs_not_using_r2.
+	(ppc64_elf_edit_toc): Check HA relocs.
+	(ha_reloc_match): Delete function.
+	(ppc64_elf_relocate_section): Remove delayed HA nop optimization.
+	Instead do it and low part optimization based on
+	ha_relocs_not_using_r2.
+
+2011-10-18  David S. Miller  <davem@davemloft.net>
+
+	PR binutils/13301
+	* elfxx-sparc.c (sparc_elf_find_reloc_at_ofs): New function.
+	(_bfd_sparc_elf_relocate_section): Always move the __tls_get_addr
+	call delay slot instruction forward 4 bytes when performing
+	relaxation.
+
+2011-10-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/13177
+	* elflink.c (elf_gc_sweep_symbol): Don't hide symbols without PLT
+	nor GOT references.
+
+2011-10-14  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (cris_elf_gc_sweep_hook) <R_CRIS_16_GOTPLT>
+	<R_CRIS_32_GOTPLT>: Fix missing update of gotplt refcount for
+	global symbols.
+	<R_CRIS_8, R_CRIS_16, R_CRIS_32>: New cases for similar missing
+	updates of the plt refcount.
+	(elf_cris_adjust_gotplt_to_got): Assert integrity of the gotplt
+	refcount in relation to the plt refcount.
+
+2011-10-13  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Mark PLT calls via
+	stubs as resolved.
+
+2011-09-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/13195
+	* elflink.c (_bfd_elf_merge_symbol): Don't set dynamic_def when
+	clearing def_dynamic.
+	(elf_link_add_object_symbols): Likewise.  Set dynamic_def when
+	setting def_dynamic.
+	(bfd_elf_gc_mark_dynamic_ref_symbol): Check if a symbol is
+	versioned.
+
+2011-09-29  Alan Modra  <amodra@gmail.com>
+
+	PR ld/13233
+	* elflink.c (_bfd_elf_gc_mark_extra_sections): Mark single member
+	debug and special section groups.
+
+2011-09-26  Tristan Gingold  <gingold@adacore.com>
+
+	* configure.in: Bump version to 2.21.90
+	* configure: Regenerate.
+
+2011-09-21  David S. Miller  <davem@davemloft.net>
+
+	* elfxx-sparc.c (_bfd_sparc_elf_merge_private_bfd_data): New.
+	* elfxx-sparc.h: Declare it.
+	* elf32-sparc.c (elf32_sparc_merge_private_bfd_data): Call it.
+	* elf64-sparc.c (elf64_sparc_merge_private_bfd_data): Likewise.
+
+2011-09-21  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_convert_section_name_to_bfd): Add comment.
+	Deals with size limited strings.
+	(bfd_mach_o_build_commands): Initialize more fields.
+
+2011-09-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/13177
+	* elflink.c (elf_gc_sweep_symbol): Also hide symbols without PLT
+	nor GOT references.
+
+2011-09-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12975
+	* bfd-in.h (bfd_elf_size_dynamic_sections): Remove pointer
+	to struct bfd_elf_version_tree.
+
+	* elflink.c (elf_info_failed): Remove verdefs.
+	(_bfd_elf_export_symbol): Updated.
+	_bfd_elf_link_assign_sym_version): Likewise.
+	(bfd_elf_size_dynamic_sections): Remove pointer to struct
+	bfd_elf_version_tree.  Updated.
+	(bfd_elf_gc_mark_dynamic_ref_symbol): Check if a symbol is hidden
+	by linker script.
+
+	* linker.c (bfd_hide_sym_by_version): New.
+
+	* bfd-in2.h: Regenerated.
+
+2011-09-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/13178
+	* elf-ifunc.c (_bfd_elf_allocate_ifunc_dyn_relocs): Use .got.plt
+	if there are no GOT relocations.
+
+2011-09-09  Kai Tietz  <ktietz@redhat.com>
+
+	* peicode.h (pe_ILF_build_a_bfd): Don't remove leading underscore
+	for targets without symbol_leading_char.
+
+2011-09-08  Bernd Jendrissek  <bernd.jendrissek@gmail.com>
+
+	* bfdwin.c (bfd_get_file_window): Fix memory leak.
+
+2011-09-07  Alan Modra  <amodra@gmail.com>
+
+	PR ld/13131
+	* bfd/elf64-ppc.c (adjust_toc_syms): Ensure ppc64_elf_howto_table
+	is initialized.
+
+2011-09-06  Alan Modra  <amodra@gmail.com>
+
+	PR ld/13131
+	* elf64-ppc.c (adjust_toc_syms): Delete redundant code.
+	(ppc64_elf_edit_toc): Fix style nit.  Report some details
+	on linker failure due to reference in debug or non-alloc
+	sections to optimized away toc entry, and don't abort.
+
+2011-09-01  Christophe Lyon  <christophe.lyon@st.com>
+
+	* elf32-arm.c (elf32_arm_output_arch_local_syms): Skip excluded
+	sections.
+
+2011-08-26  Nick Clifton  <nickc@redhat.com>
+
+	* po/es.po: Updated Spanish translation.
+
+2011-08-19  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (ppc64_elf_edit_toc): Ignore can_optimize bit if
+	we haven't seen expected -mcmodel=medium/large code relocs.
+
+2011-08-18  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_read_segment): Initialize list.
+
+2011-08-17  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_write_section_32): Fix typo.
+
+2011-08-17  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12762
+	* bfd-in.h (struct bfd_section_already_linked): Forward declare.
+	(_bfd_handle_already_linked): Declare.
+	* coff-alpha.c (_bfd_ecoff_section_already_linked): Define as
+	_bfd_coff_section_already_linked.
+	* coff-mips.c (_bfd_ecoff_section_already_linked): Likewise.
+	* coffcode.h (coff_section_already_linked): Likewise.
+	* cofflink.c (coff_link_add_symbols): Revert 2011-07-09 changes.
+	* elf-bfd.h: Likewise.
+	* libbfd-in.h: Likewise.
+	* targets.c: Likewise.
+	* linker.c (bfd_section_already_linked): Likewise.
+	(bfd_section_already_linked_table_lookup): Likewise.
+	(bfd_section_already_linked_table_insert): Likewise.
+	(_bfd_generic_section_already_linked): Likewise.  Call
+	_bfd_handle_already_linked.
+	(_bfd_handle_already_linked): New function, split out from..
+	* elflink.c (_bfd_elf_section_already_linked): ..here.  Revert
+	2011-07-09 changes.  Avoid unnecessary strcmp when matching
+	already_linked_list entries.  Match plugin linkonce section.
+	(section_signature): Delete.
+	* coffgen.c (_bfd_coff_section_already_linked): New function.
+	* libcoff-in.h (_bfd_coff_section_already_linked): Declare.
+	* libbfd.h: Regenerate.
+	* libcoff.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2011-08-14  Alan Modra  <amodra@gmail.com>
+
+	* elf32-ppc.c (ppc_elf_select_plt_layout): Force bss-plt when
+	shared and call to _mcount will go via plt.
+
+2011-08-14  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c: Prefix all einfo error strings with "%P: ".
+	* elf32-ppc.c: Likewise.
+	(ppc_elf_select_plt_layout): Use einfo rather than info to report
+	forced bss-plt.
+
+2011-08-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/13082
+	* elf64-x86-64.c (x86_64_elf_howto_table): Add R_X86_64_RELATIVE64.
+	(elf_x86_64_relocate_section): Treat R_X86_64_64 like R_X86_64_32
+	and zero-extend it to 64bit if addend is zero for x32.  Generate
+	R_X86_64_RELATIVE64 for x32.
+
+2011-08-09  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+	* bfd-in.h (bfd_elf32_arm_set_target_relocs): Update prototype.
+	* bfd-in2.h (bfd_elf32_arm_set_target_relocs): Likewise.
+	* elf32-arm.c (elf32_arm_link_hash_table): New field.
+	(elf232_arm_link_hash_table_create): Initialise new field.
+	(check_use_blx): Change test depending on fix_arm1176.
+	(bfd_elf32_arm_set_target_relocs): Set fix_arm1176 from
+	command line options.
+
+2011-08-08  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (struct mach_o_segment_name_xlat): Add comments.
+	(segsec_names_xlat): Reorder elements.
+	(bfd_mach_o_read_section_32): Fix typo.
+	(bfd_mach_o_read_section_64): Fix typo.
+
+2011-08-08  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.h (BFD_MACH_O_SEGNAME_SIZE): New macro.
+	(BFD_MACH_O_SECTNAME_SIZE): Ditto.
+	(bfd_mach_o_section): Use them.  Add next field.
+	(bfd_mach_o_segment_command): Replace sections array by
+	sect_head and sect_tail.
+	(bfd_mach_o_get_mach_o_section): New macro.
+	(bfd_mach_o_lookup_section): Remove.
+	(bfd_mach_o_new_section_hook): New function.
+	* mach-o.c (bfd_mach_o_normalize_section_name): Use strncmp
+	instead of strcmp.
+	(bfd_mach_o_convert_section_name_to_bfd): Replaces section
+	parameter with segname and sectname parameters.  Adjust.
+	(bfd_mach_o_append_section_to_segment): New function.  Use a
+	linked list for Mach-O sections.
+	(bfd_mach_o_write_segment_32): Adjust.
+	(bfd_mach_o_write_segment_64): Ditto.
+	(bfd_mach_o_build_commands): Fix comment.  Adjust.
+	(bfd_mach_o_flatten_sections): Adjust.
+	(bfd_mach_o_print_section_map): Adjust.
+	(bfd_mach_o_set_section_flags_from_bfd): Ditto.
+	(bfd_mach_o_new_section_hook): New function.
+	(bfd_mach_o_init_section_from_mach_o): Ditto.
+	(bfd_mach_o_read_section_32): Remove section parameter.
+	Return a section instead.
+	(bfd_mach_o_read_section_64): Ditto.
+	(bfd_mach_o_read_section): Ditto.
+	(bfd_mach_o_make_bfd_section): Adjust.
+	(bfd_mach_o_read_segment): Adjust for new profile of
+	bfd_mach_o_read_section.
+	(bfd_mach_o_lookup_section): Remove.
+	* mach-o-target.c (bfd_mach_o_new_section_hook): Remove.
+
+2011-08-08  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.h (bfd_mach_o_version_min_command): New structure.
+	(bfd_mach_o_load_command): Add version_min.
+	(mach_o_data_struct): Fix comment.
+	* mach-o.c (bfd_mach_o_read_version_min): New function.
+	(bfd_mach_o_read_command): Handle BFD_MACH_O_LC_FUNCTION_STARTS,
+	BFD_MACH_O_LC_VERSION_MIN_MACOSX and
+	BFD_MACH_O_LC_VERSION_MIN_IPHONEOS.
+	(bfd_mach_o_get_name_or_null): New function.
+	(bfd_mach_o_get_name): Use the above new one.
+	(bfd_mach_o_load_command_name): Add the above new commands.
+	(bfd_mach_o_bfd_print_private_bfd_data): Display numerically
+	unknown commands.  Handle BFD_MACH_O_LC_FUNCTION_STARTS,
+	BFD_MACH_O_LC_VERSION_MIN_MACOSX and
+	BFD_MACH_O_LC_VERSION_MIN_IPHONEOS.
+
+2011-08-08  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.h: Move size macros to external.h
+	Move reloc macros to reloc.h and x86-64.h.
+	* mach-o-i386.c: Includes mach-o/reloc.h
+	* mach-o-x86-64.c: Ditto and includes mach-o/x86-64.h
+	* mach-o.c: Add includes.
+	(bfd_mach_o_write_header): Use structure from external.h to convert.
+	(bfd_mach_o_write_thread): Ditto.
+	(bfd_mach_o_write_relocs): Ditto.
+	(bfd_mach_o_write_section_32): Ditto.
+	(bfd_mach_o_write_section_64): Ditto.
+	(bfd_mach_o_write_segment_32): Ditto.
+	(bfd_mach_o_write_segment_64): Ditto.
+	(bfd_mach_o_write_symtab): Ditto.
+	(bfd_mach_o_write_contents): Ditto.
+	(bfd_mach_o_read_header): Ditto.
+	(bfd_mach_o_read_section_32): Ditto.
+	(bfd_mach_o_read_section_64): Ditto.
+	(bfd_mach_o_read_symtab_symbol): Ditto.
+	(bfd_mach_o_read_dylinker): Ditto.
+	(bfd_mach_o_read_dylib): Ditto.
+	(bfd_mach_o_read_dysymtab): Ditto.
+	(bfd_mach_o_read_symtab): Ditto.
+	(bfd_mach_o_read_linkedit): Ditto.
+	(bfd_mach_o_read_str): Ditto.
+	(bfd_mach_o_read_dyld_info): Ditto.
+	(bfd_mach_o_read_segment): Ditto.
+	(bfd_mach_o_read_command): Ditto.
+	(bfd_mach_o_archive_p): Ditto.
+	(bfd_mach_o_canonicalize_one_reloc): Ditto. Change the BUF parameter.
+	(bfd_mach_o_canonicalize_relocs): Adjust to call the above function.
+	(bfd_mach_o_read_dysymtab_symbol): Rename BUF variable.
+	(bfd_mach_o_read_uuid): Remove useless cast.  Use a macro instead
+	of an hard-coded value.
+
+2011-08-08  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o-x86-64.c (bfd_mach_o_x86_64_mkobject): Fix cut-and-past typos.
+	(bfd_mach_o_x86_64_swap_reloc_out): Handle BFD_RELOC_32_PCREL,
+	BFD_RELOC_MACH_O_X86_64_SUBTRACTOR64 and
+	BFD_RELOC_MACH_O_X86_64_GOT_LOAD.  Share common code.
+
+2011-08-08  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_normalize_section_name): New function.
+	(bfd_mach_o_convert_section_name_to_bfd): Use it.
+	(bfd_mach_o_get_section_type_from_name): New function.
+	(bfd_mach_o_get_section_attribute_from_name): Ditto.
+	* mach-o.h (bfd_mach_o_section): Move bfdsection field at the end.
+	Add comments.  Add prototypes for the above new functions.
+
+2011-08-05  Mark Kettenis  <kettenis@gnu.org>
+
+	* netbsd-core.c (netbsd_core_vec): Init match_priority field.
+
+2011-08-05  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (maybe_strip_output): New function.
+	(ppc64_elf_size_stubs): Use it to strip .branch_lt and .eh_frame.
+
+2011-08-05  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12762
+	* elflink.c (_bfd_elf_section_already_linked): Return matched
+	status.  Remove COFF comdat section handling.
+	* linker.c (_bfd_generic_section_already_linked): Return matched
+	status.  Don't set SEC_GROUP in l_flags for plugin entries.
+	(bfd_section_already_linked): Update prototype.
+	* targets.c (_section_already_linked): Likewise.
+	* elf-bfd.h (_bfd_elf_section_already_linked): Likewise.
+	* libbfd-in.h (_bfd_generic_section_already_linked): Likewise.
+	(_bfd_nolink_section_already_linked): Update.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2011-08-05  Alan Modra  <amodra@gmail.com>
+
+	* elf32-ppc.c: Include dwarf2.h.
+	(struct ppc_elf_link_hash_table): Add glink_eh_frame.
+	(ppc_elf_create_glink): Create .eh_frame section.
+	(glink_eh_frame_cie): New array.
+	(ppc_elf_size_dynamic_sections): Size glink_eh_frame.
+	(ppc_elf_finish_dynamic_sections): Write glink_eh_frame.
+
+2011-08-04  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (_bfd_vms_write_eeom): Round vms_linkage_index.
+	(_bfd_vms_write_etir): Initialize vms_linkage_index to 0.
+
+2011-08-03  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_canonicalize_symtab): Handle no symbols case.
+	(bfd_mach_o_read_symtab_symbols): Return if no symbols.
+
+2011-08-02  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* elfxx-mips.c (check_4byte_branch): Remove function.
+	(check_relocated_bzc): New function.
+	(_bfd_mips_elf_relax_section): Permit the relaxation of LUI
+	instructions that immediately follow a compact branch
+	instruction.
+
+2011-08-02  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (build_plt_stub): Correct emitted relocs when no
+	plt_static_chain.
+	(ppc_build_one_stub): Adjust get_relocs call to suit..
+	(ppc_size_one_stub): ..and reloc sizing.  Correct plt size corner case.
+
+2011-08-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/13048
+	* archures.c (bfd_mach_i386_intel_syntax): New.
+	(bfd_mach_i386_i8086): Updated.
+	(bfd_mach_i386_i386): Likewise.
+	(bfd_mach_x86_64): Likewise.
+	(bfd_mach_x64_32): Likewise.
+	(bfd_mach_i386_i386_intel_syntax): Likewise.
+	(bfd_mach_x86_64_intel_syntax): Likewise.
+	(bfd_mach_x64_32_intel_syntax): Likewise.
+	(bfd_mach_l1om): Likewise.
+	(bfd_mach_l1om_intel_syntax): Likewise.
+	(bfd_mach_k1om): Likewise.
+	(bfd_mach_k1om_intel_syntax): Likewise.
+
+	* bfd-in2.h: Regenerated.
+
+	* cpu-i386.c (bfd_i386_compatible): Check mach instead of
+	bits_per_address.
+	(bfd_x64_32_arch_intel_syntax): Set bits_per_address to 64.
+	(bfd_x64_32_arch): Likewise.
+
+	* elf64-x86-64.c: Include "libiberty.h".
+	(x86_64_elf_howto_table): Append x32 R_X86_64_32.
+	(elf_x86_64_rtype_to_howto): Support x32 R_X86_64_32.
+	(elf_x86_64_reloc_type_lookup): Likewise.
+	(elf_x86_64_reloc_name_lookup): Likewise.
+	(elf_x86_64_relocate_section): Likewise.
+	(elf_x86_64_check_relocs): Allow R_X86_64_64 relocations for x32.
+
+2011-07-29  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* elfxx-mips.c (check_br32): Fix return type.
+
+2011-07-29  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* elfxx-mips.c (bz_insn_16): Correct opcode mask.
+
+2011-07-29  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* elfxx-mips.c: Adjust comments throughout.
+	(mips_elf_relax_delete_bytes): Reshape code.
+	(_bfd_mips_elf_relax_section): Remove check for
+	R_MICROMIPS_GPREL16 relocations.  Reshape code.
+
+2011-07-28  Roland McGrath  <mcgrathr@google.com>
+
+	* elf32-i386.c (NACL_PLT_ENTRY_SIZE, NACLMASK): New macros.
+	(elf_i386_nacl_plt0_entry): New variable.
+	(elf_i386_plt_entry): New variable.
+	(elf_i386_nacl_pic_plt0_entry): New variable.
+	(elf_i386_nacl_pic_plt_entry): New variable.
+	(elf_i386_nacl_plt, elf_i386_nacl_arch_bed): New variables.
+	(elf_backend_arch_data): New macro setting for elf_i386_nacl_vec stanza.
+	(elf_backend_plt_alignment): Likewise.
+
+	* config.bfd: Handle i[3-7]86-*-nacl*.
+	* elf32-i386.c (bfd_elf32_i386_nacl_vec): New backend vector stanza.
+	* targets.c: Support bfd_elf32_i386_nacl_vec.
+	* configure.in: Likewise.
+	* configure: Regenerated.
+
+	* elf32-i386.c (struct elf_i386_plt_layout): New type.
+	(GET_PLT_ENTRY_SIZE): New macro.
+	(elf_i386_plt): New variable.
+	(struct elf_i386_backend_data): New member `plt'.
+	(elf_i386_arch_bed): Add initializer for it.
+	(elf_i386_vxworks_arch_bed): Likewise.
+	(elf_i386_allocate_dynrelocs): Use GET_PLT_ENTRY_SIZE.
+	(elf_i386_plt_sym_val): Likewise.
+	(elf_i386_relocate_section): Likewise.
+	(elf_i386_finish_dynamic_symbol): Likewise.
+	Also use other elf_i386_plt_layout members for PLT details.
+	(elf_i386_finish_dynamic_sections): Likewise.
+
+	* elf32-i386.c (struct elf_i386_backend_data): New type.
+	(get_elf_i386_backend_data): New macro.
+	(elf_i386_arch_bed): New variable.
+	(elf_backend_arch_data): New macro.
+	(struct elf_i386_link_hash_table): Remove plt0_pad_byte and is_vxworks.
+	(elf_i386_link_hash_table_create): Don't initialize them.
+	(elf_i386_create_dynamic_sections): Find is_vxworks flags in
+	elf_i386_backend_data, not elf_i386_link_hash_table.
+	(elf_i386_adjust_dynamic_symbol): Likewise.
+	(elf_i386_allocate_dynrelocs): Likewise.
+	(elf_i386_readonly_dynrelocs): Likewise.
+	(elf_i386_size_dynamic_sections): Likewise.
+	(elf_i386_relocate_section): Likewise.
+	(elf_i386_finish_dynamic_symbol): Likewise.
+	(elf_i386_finish_dynamic_sections): Likewise.  Same for plt0_pad_byte.
+	(elf_i386_vxworks_link_hash_table_create): Function removed.
+	(elf_i386_vxworks_arch_bed): New variable.
+	(elf_backend_arch_data): New macro in elf32-i386-vxworks stanza.
+
+	* elf-bfd.h (elf_backend_data): New member arch_backend_data.
+	* elfxx-target.h (elf_backend_arch_data): New macro.
+	(elfNN_bed): Use it as initializer for the new member.
+
+2011-07-28  Mikulas Patocka  <mikulas@artax.karlin.mff.cuni.cz>
+
+	* elf64-hppa.c (elf_hppa_final_link_relocate): Fix handling of out
+	of range branches.
+
+2011-07-26  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf2.c (dwarf_debug_sections): Add .debug_macro
+	and .zdebug_macro entry.
+	(dwarf_debug_section_enum): Add debug_macro.
+
+2011-07-26  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c: Include dwarf2.h.
+	(struct ppc_link_hash_table): Add glink_eh_frame.
+	(create_linkage_sections): Create .eh_frame section.
+	(ppc64_elf_size_dynamic_sections): Arrange to drop unneeded
+	glink_eh_frame.
+	(glink_eh_frame_cie): New array.
+	(ppc64_elf_size_stubs): Size glink_eh_frame.
+	(ppc64_elf_build_stubs): Init glink_eh_frame contents.
+	(ppc64_elf_finish_dynamic_sections): Write glink_eh_frame.
+
+2011-07-25  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	PR ld/12815
+	* elf64-mmix.c (struct _mmix_elf_section_data): New members
+	has_warned_bpo and has_warned_pushj.
+	(mmix_final_link_relocate): Remove PARAMS and PTR macros,
+	converting to ISO C.  Add new parameter error_message.  All
+	callers changed.
+	(mmix_elf_perform_relocation): Ditto.
+	<case R_MMIX_PUSHJ_STUBBABLE, case R_MMIX_BASE_PLUS_OFFSET>:
+	Handle the case where mmix_elf_check_common_relocs has not been
+	called, missing preparations for relocs of the respective type.
+
+2011-07-24  Chao-ying Fu  <fu@mips.com>
+	    Ilie Garbacea  <ilie@mips.com>
+	    Maciej W. Rozycki  <macro@codesourcery.com>
+	    Joseph Myers  <joseph@codesourcery.com>
+	    Catherine Moore  <clm@codesourcery.com>
+	    Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* archures.c (bfd_mach_mips_micromips): New macro.
+	* cpu-mips.c (I_micromips): New enum value.
+	(arch_info_struct): Add bfd_mach_mips_micromips.
+	* elfxx-mips.h (_bfd_mips_elf_is_target_special_symbol): New
+	prototype.
+	(_bfd_mips_elf_relax_section): Likewise.
+	(_bfd_mips16_elf_reloc_unshuffle): Rename to...
+	(_bfd_mips_elf_reloc_unshuffle): ... this.  Handle microMIPS
+	ASE.
+	(_bfd_mips16_elf_reloc_shuffle): Rename to...
+	(_bfd_mips_elf_reloc_shuffle): ... this.  Handle microMIPS ASE.
+	(gprel16_reloc_p): Handle microMIPS ASE.
+	(literal_reloc_p): New function.
+	* elf32-mips.c (elf_micromips_howto_table_rel): New variable.
+	(_bfd_mips_elf32_gprel16_reloc): Handle microMIPS ASE.
+	(mips16_gprel_reloc): Update for _bfd_mips_elf_reloc_unshuffle
+	and _bfd_mips_elf_reloc_shuffle changes.
+	(mips_elf_gprel32_reloc): Update comment.
+	(micromips_reloc_map): New variable.
+	(bfd_elf32_bfd_reloc_type_lookup): Handle microMIPS ASE.
+	(mips_elf32_rtype_to_howto): Likewise.
+	(mips_info_to_howto_rel): Likewise.
+	(bfd_elf32_bfd_is_target_special_symbol): Define.
+	(bfd_elf32_bfd_relax_section): Likewise.
+	* elf64-mips.c (micromips_elf64_howto_table_rel): New variable.
+	(micromips_elf64_howto_table_rela): Likewise.
+	(mips16_gprel_reloc): Update for _bfd_mips_elf_reloc_unshuffle
+	and _bfd_mips_elf_reloc_shuffle changes.
+	(micromips_reloc_map): Likewise.
+	(bfd_elf64_bfd_reloc_type_lookup): Handle microMIPS ASE.
+	(bfd_elf64_bfd_reloc_name_lookup): Likewise.
+	(mips_elf64_rtype_to_howto): Likewise.
+	(bfd_elf64_bfd_is_target_special_symbol): Define.
+	* elfn32-mips.c (elf_micromips_howto_table_rel): New variable.
+	(elf_micromips_howto_table_rela): Likewise.
+	(mips16_gprel_reloc): Update for _bfd_mips_elf_reloc_unshuffle
+	and _bfd_mips_elf_reloc_shuffle changes.
+	(micromips_reloc_map): Likewise.
+	(bfd_elf32_bfd_reloc_type_lookup): Handle microMIPS ASE.
+	(bfd_elf32_bfd_reloc_name_lookup): Likewise.
+	(mips_elf_n32_rtype_to_howto): Likewise.
+	(bfd_elf32_bfd_is_target_special_symbol): Define.
+	* elfxx-mips.c (LA25_LUI_MICROMIPS_1): New macro.
+	(LA25_LUI_MICROMIPS_2): Likewise.
+	(LA25_J_MICROMIPS_1, LA25_J_MICROMIPS_2): Likewise.
+	(LA25_ADDIU_MICROMIPS_1, LA25_ADDIU_MICROMIPS_2): Likewise.
+	(TLS_RELOC_P): Handle microMIPS ASE.
+	(mips_elf_create_stub_symbol): Adjust value of stub symbol if
+	target is a microMIPS function.
+	(micromips_reloc_p): New function.
+	(micromips_reloc_shuffle_p): Likewise.
+	(got16_reloc_p, call16_reloc_p): Handle microMIPS ASE.
+	(got_disp_reloc_p, got_page_reloc_p): New functions.
+	(got_ofst_reloc_p): Likewise.
+	(got_hi16_reloc_p, got_lo16_reloc_p): Likewise.
+	(call_hi16_reloc_p, call_lo16_reloc_p): Likewise.
+	(hi16_reloc_p, lo16_reloc_p, jal_reloc_p): Handle microMIPS ASE.
+	(micromips_branch_reloc_p): New function.
+	(tls_gd_reloc_p, tls_ldm_reloc_p): Likewise.
+	(tls_gottprel_reloc_p): Likewise.
+	(_bfd_mips16_elf_reloc_unshuffle): Rename to...
+	(_bfd_mips_elf_reloc_unshuffle): ... this.  Handle microMIPS
+	ASE.
+	(_bfd_mips16_elf_reloc_shuffle): Rename to...
+	(_bfd_mips_elf_reloc_shuffle): ... this.  Handle microMIPS ASE.
+	(_bfd_mips_elf_lo16_reloc): Handle microMIPS ASE.
+	(mips_tls_got_index, mips_elf_got_page): Likewise.
+	(mips_elf_create_local_got_entry): Likewise.
+	(mips_elf_relocation_needs_la25_stub): Likewise.
+	(mips_elf_calculate_relocation): Likewise.
+	(mips_elf_perform_relocation): Likewise.
+	(_bfd_mips_elf_symbol_processing): Likewise.
+	(_bfd_mips_elf_add_symbol_hook): Likewise.
+	(_bfd_mips_elf_link_output_symbol_hook): Likewise.
+	(mips_elf_add_lo16_rel_addend): Likewise.
+	(_bfd_mips_elf_check_relocs): Likewise.
+	(mips_elf_adjust_addend): Likewise.
+	(_bfd_mips_elf_relocate_section): Likewise.
+	(mips_elf_create_la25_stub): Likewise.
+	(_bfd_mips_vxworks_finish_dynamic_symbol): Likewise.
+	(_bfd_mips_elf_gc_sweep_hook): Likewise.
+	(_bfd_mips_elf_is_target_special_symbol): New function.
+	(mips_elf_relax_delete_bytes): Likewise.
+	(opcode_descriptor): New structure.
+	(RA): New macro.
+	(OP32_SREG, OP32_TREG, OP16_VALID_REG): Likewise.
+	(b_insns_32, bc_insn_32, bz_insn_32, bzal_insn_32): New variables.
+	(beq_insn_32): Likewise.
+	(b_insn_16, bz_insn_16): New variables.
+	(BZC32_REG_FIELD): New macro.
+	(bz_rs_insns_32, bz_rt_insns_32): New variables.
+	(bzc_insns_32, bz_insns_16):Likewise.
+	(BZ16_REG, BZ16_REG_FIELD): New macros.
+	(jal_insn_32_bd16, jal_insn_32_bd32): New variables.
+	(jal_x_insn_32_bd32): Likewise.
+	(j_insn_32, jalr_insn_32): Likewise.
+	(ds_insns_32_bd16, ds_insns_32_bd32): Likewise.
+	(jalr_insn_16_bd16, jalr_insn_16_bd32, jr_insn_16): Likewise.
+	(JR16_REG): New macro.
+	(ds_insns_16_bd16): New variable.
+	(lui_insn): Likewise.
+	(addiu_insn, addiupc_insn): Likewise.
+	(ADDIUPC_REG_FIELD): New macro.
+	(MOVE32_RD, MOVE32_RS): Likewise.
+	(MOVE16_RD_FIELD, MOVE16_RS_FIELD): Likewise.
+	(move_insns_32, move_insns_16): New variables.
+	(nop_insn_32, nop_insn_16): Likewise.
+	(MATCH): New macro.
+	(find_match): New function.
+	(check_br16_dslot, check_br32_dslot): Likewise.
+	(check_br16, check_br32): Likewise.
+	(IS_BITSIZE): New macro.
+	(check_4byte_branch): New function.
+	(_bfd_mips_elf_relax_section): Likewise.
+	(_bfd_mips_elf_merge_private_bfd_data): Disallow linking MIPS16
+	and microMIPS modules together.
+	(_bfd_mips_elf_print_private_bfd_data):	Handle microMIPS ASE.
+	* reloc.c (BFD_RELOC_MICROMIPS_7_PCREL_S1): New relocation.
+	(BFD_RELOC_MICROMIPS_10_PCREL_S1): Likewise.
+	(BFD_RELOC_MICROMIPS_16_PCREL_S1): Likewise.
+	(BFD_RELOC_MICROMIPS_GPREL16): Likewise.
+	(BFD_RELOC_MICROMIPS_JMP, BFD_RELOC_MICROMIPS_HI16): Likewise.
+	(BFD_RELOC_MICROMIPS_HI16_S): Likewise.
+	(BFD_RELOC_MICROMIPS_LO16): Likewise.
+	(BFD_RELOC_MICROMIPS_LITERAL): Likewise.
+	(BFD_RELOC_MICROMIPS_GOT16): Likewise.
+	(BFD_RELOC_MICROMIPS_CALL16): Likewise.
+	(BFD_RELOC_MICROMIPS_GOT_HI16): Likewise.
+	(BFD_RELOC_MICROMIPS_GOT_LO16): Likewise.
+	(BFD_RELOC_MICROMIPS_CALL_HI16): Likewise.
+	(BFD_RELOC_MICROMIPS_CALL_LO16): Likewise.
+	(BFD_RELOC_MICROMIPS_SUB): Likewise.
+	(BFD_RELOC_MICROMIPS_GOT_PAGE): Likewise.
+	(BFD_RELOC_MICROMIPS_GOT_OFST): Likewise.
+	(BFD_RELOC_MICROMIPS_GOT_DISP): Likewise.
+	(BFD_RELOC_MICROMIPS_HIGHEST): Likewise.
+	(BFD_RELOC_MICROMIPS_HIGHER): Likewise.
+	(BFD_RELOC_MICROMIPS_SCN_DISP): Likewise.
+	(BFD_RELOC_MICROMIPS_JALR): Likewise.
+	(BFD_RELOC_MICROMIPS_TLS_GD): Likewise.
+	(BFD_RELOC_MICROMIPS_TLS_LDM): Likewise.
+	(BFD_RELOC_MICROMIPS_TLS_DTPREL_HI16): Likewise.
+	(BFD_RELOC_MICROMIPS_TLS_DTPREL_LO16): Likewise.
+	(BFD_RELOC_MICROMIPS_TLS_GOTTPREL): Likewise.
+	(BFD_RELOC_MICROMIPS_TLS_TPREL_HI16): Likewise.
+	(BFD_RELOC_MICROMIPS_TLS_TPREL_LO16): Likewise.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2011-07-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am (ALL_MACHINES): Add cpu-k1om.lo.
+	(ALL_MACHINES_CFILES): Add cpu-k1om.c.
+	* Makefile.in: Regenerated.
+
+	* archures.c (bfd_architecture): Add bfd_arch_k1om.
+	(bfd_k1om_arch): New.
+	(bfd_archures_list): Add &bfd_k1om_arch.
+	* bfd-in2.h: Regenerated.
+
+	* config.bfd (targ64_selvecs): Add bfd_elf64_k1om_vec if
+	bfd_elf64_x86_64_vec is supported.  Add bfd_elf64_k1om_freebsd_vec
+	if bfd_elf64_x86_64_freebsd_vec is supported.
+	(targ_selvecs): Likewise.
+
+	* configure.in: Support bfd_elf64_k1om_vec and
+	bfd_elf64_k1om_freebsd_vec.
+	* configure: Regenerated.
+
+	* cpu-k1om.c: New.
+
+	* elf64-x86-64.c (elf64_k1om_elf_object_p): New.
+	(bfd_elf64_k1om_vec): Likewise.
+	(bfd_elf64_k1om_freebsd_vec): Likewise.
+
+	* targets.c (bfd_elf64_k1om_vec): New.
+	(bfd_elf64_k1om_freebsd_vec): Likewise.
+	(_bfd_target_vector): Add bfd_elf64_k1om_vec and
+	bfd_elf64_k1om_freebsd_vec.
+
+2011-07-20  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Fix false coff-go32-exe matches.
+	* coff-i386.c (TARGET_SYM) <_bfd_check_format>: Conditionally use
+	COFF_CHECK_FORMAT.
+	* coff-stgo32.c (go32_check_format): New forward declaration.
+	(COFF_CHECK_FORMAT): New defintion.
+	(go32_check_format): New function.
+
+2011-07-15  Alan Modra  <amodra@gmail.com>
+
+	* configure.in: Bump version.
+	* configure: Regenerate.
+
+2011-07-14  Alan Modra  <amodra@gmail.com>
+
+	* linker.c (_bfd_generic_section_already_linked): Set l_flags.
+	* elf-bfd.h (struct already_linked): Forward declare.
+
+2011-07-14  Alan Modra  <amodra@gmail.com>
+
+	* elflink.c (_bfd_elf_fix_symbol_flags): Loop on indirect syms.
+	(_bfd_elf_adjust_dynamic_symbol): Remove FIXME.
+
+2011-07-14  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (struct ppc_link_hash_table): Add plt_static_chain.
+	(build_plt_stub): Add plt_static_chain param, don't load r11 if false.
+	(build_tls_get_addr_stub): Likewise.
+	(ppc_build_one_stub): Update calls to above.
+	(ppc_size_one_stub): Adjust stub size.
+	(ppc64_elf_size_stubs): Add plt_static_chain param, save to htab.
+	* elf64-ppc.h (ppc64_elf_size_stubs): Update prototype.
+
+2011-07-12  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-arm.c (elf32_arm_section_flags): Delete.
+	(elf_backend_section_flags): Remove.
+
+2011-07-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12982
+	* elflink.c (bfd_elf_size_dynamic_sections): Also skip BFD_PLUGIN
+	when setting stack_flags.
+
+2011-07-11  Catherine Moore  <clm@codesourcery.com>
+
+	* aout-adobe.c (aout_32_bfd_lookup_section_flags): New definition.
+	* aout-target.h (MY_bfd_lookup_section_flags): New definition.
+	* aout-tic30.c (MY_bfd_lookup_section_flags): New definition.
+	* bfd-in2.h: Regenerated.
+	* bfd.c (bfd_lookup_section_flags): New definition.
+	* binary.c (binary_bfd_lookup_section_flags): New definition.
+	* bout.c (b_out_bfd_lookup_section_flags): New definition.
+	* coff-alpha.c (_bfd_ecoff_bfd_lookup_section_flags): New definition.
+	* coff-mips.c (_bfd_ecoff_bfd_lookup_section_flags): New definition.
+	* coff-rs6000.c (rs6000coff_vec): Include
+	bfd_generic_lookup_section_flags.
+	(pmac_xcoff_vec): Likewise.
+	* coffcode.h (coff_bfd_lookup_section_flags): New definition.
+	* coff64-rs6000.c (rs6000coff64_vec): Include
+	bfd_generic_lookup_section_flags.
+	(aix5coff64_vec): Likewise.
+	* ecoff.c (bfd_debug_section): Initialize flag_info field.
+	* elf-bfd.h (elf_backend_lookup_section_flags_hook): Declare.
+	(bfd_elf_lookup_section_flags): Declare.
+	* elflink.c (bfd_elf_lookup_section_flags): New function.
+	* elfxx-target.h (bfd_elfNN_bfd_lookup_section_flags): Define.
+	(elf_backend_lookup_section_flags_hook): Define.
+	(elf_backend_data): Add elf_backend_lookup_section_flags_hook.
+	* i386msdos.c (msdos_bfd_lookup_section_flags): New define.
+	* i386os9k.c (os9k_bfd_lookup_section_flags): New define.
+	* ieee.c (ieee_bfd_lookup_section_flags): New define.
+	* ihex.c (ihex_bfd_lookup_section_flags): New define.
+	* libbfd-in.h (_bfd_nolink_bfd_lookup_section_flags): Declare.
+	(bfd_generic_lookup_section_flags): Declare.
+	* libbfd.h: Regenerated.
+	* mach-o-target.c (bfd_mach_o_bfd_lookup_section_flags): New.
+	* mmo.c (mmo_bfd_lookup_section_flags): New definition.
+	* nlm-target.h (nlm_bfd_lookup_section_flags): New definition.
+	* oasys.c (oasys_bfd_lookup_section_flags): New definition.
+	* pef.c (bfd_pef_bfd_lookup_section_flags): New definition.
+	* plugin.c (bfd_plugin_bfd_lookup_section_flags): New definition.
+	* ppcboot.c (ppcboot_bfd_lookup_section_flags): New definition.
+	* reloc.c (bfd_generic_lookup_section_flags): New function.
+	* som.c (som_bfd_lookup_section_flags): New definition.
+	* srec.c (srec_bfd_lookup_section_flags): New definition.
+	* targets.c (flag_info): Declare.
+	(NAME##_bfd_lookup_section_flags): Add to LINK jump table.
+	(_bfd_lookup_section_flags): New.
+	* tekhex.c (tekhex_bfd_lookup_section_flags): New definition.
+	* versados.c (versados_bfd_lookup_section_flags): New definition.
+	* vms-alpha.c (alpha_vms_bfd_lookup_section_flag): New definition.
+	* xsym.c (bfd_sym_bfd_lookup_section_flags): New definition.
+
+2011-07-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12978
+	* elfnn-ia64.c (count_dyn_reloc): Fix a typo.
+
+2011-07-09  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12942
+	* elflink.c (elf_link_add_object_symbols): Use elf_discarded_section
+	rather than kept_section to determine whether a symbol is from
+	a discarded section.
+	* cofflink.c (coff_link_add_symbols): Make symbols from discarded
+	sections appear undefined.
+
+2011-07-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12942
+	* elf-bfd.h (_bfd_elf_section_already_linked): Replace
+	"asection *" with "struct already_linked *".
+	* libbfd-in.h (_bfd_nolink_section_already_linked): Likewise.
+	(_bfd_generic_section_already_linked): Likewise.
+	(bfd_section_already_linked_table_insert): Likewise.
+	(struct already_linked): New.
+	(struct bfd_section_already_linked): Use it.
+	* elflink.c (_bfd_elf_section_already_linked): Replace.
+	"asection *" with "struct already_linked *".  Replace the plugin
+	dummy with the LTO output.
+	* linker.c (_bfd_generic_section_already_linked): Likewise.
+	* targets.c (struct already_linked): Add forward declaration.
+	(bfd_target): Replace "struct bfd_section *" with
+	"struct already_linked *" in _section_already_linked.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2011-07-06  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.h: Move loader related definitions to
+	include/mach-o/loader.h.  Include it.
+
+2011-07-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_backend_post_process_headers): Always
+	define to _bfd_elf_set_osabi.
+
+2011-07-03  Samuel Thibault  <samuel.thibault@gnu.org>
+	    Thomas Schwinge  <thomas@schwinge.name>
+
+	PR binutils/12913
+	* elf.c (_bfd_elf_set_osabi): Use ELFOSABI_GNU name instead of
+	ELFOSABI_LINUX alias.
+	* elf32-hppa.c: Likewise.
+	* elf32-i370.c: Likewise.
+	* elf64-hppa.c: Likewise.
+
+2011-07-01  Ian Lance Taylor  <iant@google.com>
+
+	* elf32-i386.c (elf_i386_eh_frame_plt): Correct expression: change
+	DW_OP_lit3 to DW_OP_lit2.
+
+2011-07-01  Alan Modra  <amodra@gmail.com>
+
+	* elf32-ppc.c (ppc_elf_copy_indirect_symbol): Don't look at
+	dyn relocs when called to copy flags for a weak sym.
+	* elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Likewise.
+	(ppc64_elf_merge_private_bfd_data): Delete.
+	(bfd_elf64_bfd_merge_private_bfd_data): Define as
+	_bfd_generic_verify_endian_match.
+
+2011-06-30  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* bfd/elf32-tic6x.c (elf32_tic6x_set_osabi): Also set it if
+	link_info is NULL.
+
+2011-06-28  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (vms_private_data_struct): Make vms_linkage_index
+	unsigned int.
+	(_bfd_vms_write_etir): Write linkage index from reloc.
+
+2011-06-28  Fawzi Mohamed <fawzi.mohamed@nokia.com>
+
+	* mach-o.c (bfd_mach_o_read_command): Also ignore
+	BFD_MACH_O_LC_ROUTINES_64.
+
+2011-06-27  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (_bfd_vms_write_etir): Use 'section' to get current
+	section target index.
+
+2011-06-27  Nick Clifton  <nickc@redhat.com>
+
+	* cisco-core.c (cisco_core_little_vec): Add initialization of
+	match_priority field.
+
+2011-06-27  Tristan Gingold  <gingold@adacore.com>
+
+	* cache.c: Include bfd_stdint.h.
+	(cache_bmmap): Change profile.  Return region start and size.
+	* bfdio.c (struct bfd_iovec): Change bmmap profile.
+	(bfd_mmap): Change profile and adjust.   Update comment.
+	(memory_bmmap): Change profile.
+	* opncls.c (opncls_bmmap): Change profile.
+	* vms-lib.c (vms_lib_bmmap): Likewise.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2011-06-27  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-misc.c (vms_time_to_time_t): Adjust overflow detection.
+	Add comment.
+
+2011-06-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_backend_post_process_headers): Don't
+	define for FreeBSD/x86-64 nor FreeBSD/L1OM.  Define for L1OM.
+
+2011-06-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elf64-x86-64.c (elf_x86_64_link_hash_table_create): Initialize
+	PLT_EH_FRAME.
+	* elf32-i386.c (elf_i386_link_hash_table): Likewise.
+
+2011-06-24  Richard Henderson  <rth@redhat.com>
+
+	PR ld/12928
+	* elf64-alpha.c (elf64_alpha_relax_tls_get_addr): Recover the
+	tlsgd insn before swapping adjacent insns.
+
+2011-06-24  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (alpha_vms_slurp_relocs): Add a guard for relocs in the
+	absolute section.
+
+2011-06-24  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12921
+	* elf.c (assign_file_positions_for_load_sections): Don't align
+	sh_offset for all SHT_NOBITS sections here, just .tbss sections
+	that don't get a PT_LOAD.
+
+2011-06-22  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c (sh_elf_relocate_section): Allow R_SH_TLS_LE_32 for PIE.
+	(sh_elf_check_relocs): Likewise.
+
+2011-06-22  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_check_relocs): No dynamic reloc for
+	TPREL in a PIE image.
+	(alpha_dynamic_entries_for_reloc): Likewise.
+	(elf64_alpha_relocate_section): Allow TPREL in PIE images.
+	(elf64_alpha_relax_got_load): Likewise.
+
+2011-06-22  Ramana Radhakrishnan  <ramana.radhakrishnan@linaro.org>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Allow R_ARM_TLS_LE32
+	for PIE.
+
+2011-06-22  Alan Modra  <amodra@gmail.com>
+
+	* elflink.c (_bfd_elf_merge_symbol): Allow type changes for
+	plugin symbols.  Fix segfault on linker scrip defined syms.
+
+2011-06-20  Jakub Jelinek  <jakub@redhat.com>
+
+	PR ld/12570
+	* elf-eh-frame.c (_bfd_elf_parse_eh_frame): Allow no relocations
+	at all for linker created .eh_frame sections.
+	(_bfd_elf_discard_section_eh_frame): Handle linker created
+	.eh_frame sections with no relocations.
+	* elf64-x86-64.c: Include dwarf2.h.
+	(elf_x86_64_eh_frame_plt): New variable.
+	(PLT_CIE_LENGTH, PLT_FDE_LENGTH, PLT_FDE_START_OFFSET,
+	PLT_FDE_LEN_OFFSET): Define.
+	(struct elf_x86_64_link_hash_table): Add plt_eh_frame field.
+	(elf_x86_64_create_dynamic_sections): Create and fill in
+	.eh_frame section for .plt section.
+	(elf_x86_64_size_dynamic_sections): Write .plt section size
+	into .eh_frame FDE covering .plt section.
+	(elf_x86_64_finish_dynamic_sections): Write .plt section
+	start into .eh_frame FDE covering .plt section.  Call
+	_bfd_elf_write_section_eh_frame on htab->plt_eh_frame section.
+	(elf_backend_plt_alignment): Define to 4.
+	* elf32-i386.c: Include dwarf2.h.
+	(elf_i386_eh_frame_plt): New variable.
+	(PLT_CIE_LENGTH, PLT_FDE_LENGTH, PLT_FDE_START_OFFSET,
+	PLT_FDE_LEN_OFFSET): Define.
+	(struct elf_i386_link_hash_table): Add plt_eh_frame field.
+	(elf_i386_create_dynamic_sections): Create and fill in
+	.eh_frame section for .plt section.
+	(elf_i386_size_dynamic_sections): Write .plt section size
+	into .eh_frame FDE covering .plt section.
+	(elf_i386_finish_dynamic_sections): Write .plt section
+	start into .eh_frame FDE covering .plt section.  Call
+	_bfd_elf_write_section_eh_frame on htab->plt_eh_frame section.
+	(elf_backend_plt_alignment): Define to 4.
+
+2011-06-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_backend_post_process_headers): Defined
+	for x32.
+
+2011-06-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c: Include <stdarg.h> and CORE_HEADER if
+	CORE_HEADER is defined.
+	(elf_x86_64_write_core_note): New.
+	(elf_backend_write_core_note): Likewise.
+
+	* hosts/x86-64linux.h (uint64_t): New.
+	(user_regsx32_struct): Likewise.
+	(elf_gregx32_t): Likewise.
+	(ELF_NGREGX32): Likewise.
+	(elf_gregsetx32_t): Likewise.
+	(elf_prstatusx32): Likewise.
+	(prstatusx32_t): Likewise.
+	(user_fpregs32_struct): Removed.
+	(user_fpxregs32_struct): Likewise.
+	(user32): Likewise.
+	(elf_fpregset32_t): Likewise.
+	(elf_fpxregset32_t): Likewise.
+	(prgregset32_t): Likewise.
+	(prfpregset32_t): Likewise.
+
+2011-06-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_x86_64_grok_prstatus): Support x32.
+	(elf_x86_64_grok_psinfo): Likewise.
+
+2011-06-16  Nick Clifton  <nickc@redhat.com>
+
+	* elf.c (elf_find_function): Fail if not provided with a symbol
+	table.
+
+2011-06-15  Ulrich Weigand  <ulrich.weigand@linaro.org>
+
+	* elf-bfd.h (elfcore_write_arm_vfp): Add prototype.
+	* elf.c (elfcore_grok_arm_vfp): New function.
+	(elfcore_grok_note): Call it to handle NT_ARM_VFP notes.
+	(elfcore_write_arm_vfp): New function.
+	(elfcore_write_register_note): Call it to handle .reg-arm-vfp.
+
+2011-06-14  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_copy_indirect_symbol): Rename from
+	elf64_alpha_merge_ind_symbols; adjust for the generic interface.
+	(elf64_alpha_always_size_sections): Don't call
+	elf64_alpha_merge_ind_symbols.
+	(elf_backend_copy_indirect_symbol): New.
+
+2011-06-14  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12887
+	* elf-eh-frame.c (_bfd_elf_parse_eh_frame): Check sec_info_type
+	before doing anything.
+	(_bfd_elf_discard_section_eh_frame): Likewise.
+
+2011-06-14  Alan Modra  <amodra@gmail.com>
+
+	* Makefile.am: Formatting.
+	* Makefile.in: Regenerate.
+	* configure.in (bfd_elf64_tilegx_vec): Add elfxx-tilegx.lo.
+	* po/SRC-POTFILES.in: Regnerate.
+
+2011-06-14  Alan Modra  <amodra@gmail.com>
+
+	* elf32-tilepro.c (tilepro_elf_size_dynamic_sections): Don't use PTR.
+	(allocate_dynrelocs, readonly_dynrelocs): Replace PTR with void *.
+	Don't handle warning symbols here.
+	* elfxx-tilegx.c (tilegx_elf_size_dynamic_sections): As above.
+	(allocate_dynrelocs, readonly_dynrelocs): As above.
+
+2011-06-14  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12851
+	* elflink.c (_bfd_elf_gc_mark_extra_sections): New function.
+	(elf_gc_sweep): Don't treat debug and sections like .comment
+	specially here.
+	(bfd_elf_gc_sections): Treat note sections as gc roots only when
+	not part of a group.  Always call gc_mark_extra_sections.
+	* elf-bfd.h (_bfd_elf_gc_mark_extra_sections): Declare.
+	* elfxx-target.h (elf_backend_gc_mark_extra_sections): Default to
+	_bfd_elf_gc_mark_extra_sections.
+	* elf32-arm.c (elf32_arm_gc_mark_extra_sections): Call
+	_bfd_elf_gc_mark_extra_sections.
+	* elf32-tic6x.c (elf32_tic6x_gc_mark_extra_sections): Likewise.
+
+2011-06-13  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-tilepro.c (tilepro_elf_check_relocs): Delete unused local
+	variable 'local_got_offsets'.
+	* elfxx-tilegx.c (tilegx_elf_check_relocs): Likewise.
+	(tilegx_finish_dyn): Delete unused local variable 'abi_64_p'.
+
+2011-06-13  Walter Lee  <walt@tilera.com>
+
+	* Makefile.am (ALL_MACHINES): Add cpu-tilegx.lo and cpu-tilepro.lo.
+	(ALL_MACHINE_CFILES): Add cpu-tilegx.c and cpu-tilepro.c.
+	(BFD32_BACKENDS): Add elf32-tilegx.lo, elf32-tilepro.lo,
+	and elfxx-tilegx.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-tilegx.c elf32-tilepro.c, and
+	elfxx-tilegx.c.
+	(BFD64_BACKENDS): Add elf64-tilegx.lo.
+	(BFD64_BACKENDS_CFILES): Add elf64-tilegx.c.
+	* Makefile.in: Regenerate.
+	* arctures.c (bfd_architecture): Define bfd_arch_tilepro,
+	bfd_arch_tilegx, bfd_mach_tilepro, bfd_mach_tilegx.
+	(bfd_arch_info): Add bfd_tilegx_arch, bfd_tilepro_arch.
+	(bfd_archures_list): Add bfd_tilegx_arch, bfd_tilepro_arch.
+	bfd-in2.h: Regenerate.
+	* config.bfd: Handle tilegx-*-* and tilepro-*-*.
+	* configure.in: Handle bfd_elf32_tilegx_vec, bfd_elf32_tilepro_vec,
+	and bfd_elf64_tilegx_vec.
+	* configure: Regenerate.
+	* elf-bfd.h (enum elf_target_id): Define TILEGX_ELF_DATA and
+	TILEPRO_ELF_DATA.
+	* libbfd.h: Regenerate.
+	* reloc.c: Add BFD_RELOC_TILEPRO_{COPY, GLOB_DAT, JMP_SLOT,
+	RELATIVE, BROFF_X1, JOFFLONG_X1, JOFFLONG_X1_PLT, IMM8_X0,
+	IMM8_Y0, IMM8_X1, IMM8_Y1, DEST_IMM8_X1, MT_IMM15_X1, MF_IMM15_X1,
+	IMM16_X0, IMM16_X1, IMM16_X0_LO, IMM16_X1_LO, IMM16_X0_HI,
+	IMM16_X1_HI, IMM16_X0_HA, IMM16_X1_HA, IMM16_X0_PCREL,
+	IMM16_X1_PCREL, IMM16_X0_LO_PCREL, IMM16_X1_LO_PCREL,
+	IMM16_X0_HI_PCREL, IMM16_X1_HI_PCREL, IMM16_X0_HA_PCREL,
+	IMM16_X1_HA_PCREL, IMM16_X0_GOT, IMM16_X1_GOT, IMM16_X0_GOT_LO,
+	IMM16_X1_GOT_LO, IMM16_X0_GOT_HI, IMM16_X1_GOT_HI,
+	IMM16_X0_GOT_HA, IMM16_X1_GOT_HA, MMSTART_X0, MMEND_X0,
+	MMSTART_X1, MMEND_X1, SHAMT_X0, SHAMT_X1, SHAMT_Y0, SHAMT_Y1,
+	IMM16_X0_TLS_GD, IMM16_X1_TLS_GD, IMM16_X0_TLS_GD_LO,
+	IMM16_X1_TLS_GD_LO, IMM16_X0_TLS_GD_HI, IMM16_X1_TLS_GD_HI,
+	IMM16_X0_TLS_GD_HA, IMM16_X1_TLS_GD_HA, IMM16_X0_TLS_IE,
+	IMM16_X1_TLS_IE, IMM16_X0_TLS_IE_LO, IMM16_X1_TLS_IE_LO,
+	IMM16_X0_TLS_IE_HI, IMM16_X1_TLS_IE_HI, IMM16_X0_TLS_IE_HA,
+	IMM16_X1_TLS_IE_HA, TLS_DTPMOD32, TLS_DTPOFF32, TLS_TPOFF32}
+	Add BFD_RELOC_TILEGX_{HW0, HW1, HW2, HW3, HW0_LAST, HW1_LAST,
+	HW2_LAST, COPY, GLOB_DAT, JMP_SLOT, RELATIVE, BROFF_X1,
+	JUMPOFF_X1, JUMPOFF_X1_PLT, IMM8_X0, IMM8_Y0, IMM8_X1, IMM8_Y1,
+	DEST_IMM8_X1, MT_IMM14_X1, MF_IMM14_X1, MMSTART_X0, MMEND_X0,
+	SHAMT_X0, SHAMT_X1, SHAMT_Y0, SHAMT_Y1, IMM16_X0_HW0,
+	IMM16_X1_HW0, IMM16_X0_HW1, IMM16_X1_HW1, IMM16_X0_HW2,
+	IMM16_X1_HW2, IMM16_X0_HW3, IMM16_X1_HW3, IMM16_X0_HW0_LAST,
+	IMM16_X1_HW0_LAST, IMM16_X0_HW1_LAST, IMM16_X1_HW1_LAST,
+	IMM16_X0_HW2_LAST, IMM16_X1_HW2_LAST, IMM16_X0_HW0_PCREL,
+	IMM16_X1_HW0_PCREL, IMM16_X0_HW1_PCREL, IMM16_X1_HW1_PCREL,
+	IMM16_X0_HW2_PCREL, IMM16_X1_HW2_PCREL, IMM16_X0_HW3_PCREL,
+	IMM16_X1_HW3_PCREL, IMM16_X0_HW0_LAST_PCREL,
+	IMM16_X1_HW0_LAST_PCREL, IMM16_X0_HW1_LAST_PCREL,
+	IMM16_X1_HW1_LAST_PCREL, IMM16_X0_HW2_LAST_PCREL,
+	IMM16_X1_HW2_LAST_PCREL, IMM16_X0_HW0_GOT, IMM16_X1_HW0_GOT,
+	IMM16_X0_HW1_GOT, IMM16_X1_HW1_GOT, IMM16_X0_HW2_GOT,
+	IMM16_X1_HW2_GOT, IMM16_X0_HW3_GOT, IMM16_X1_HW3_GOT,
+	IMM16_X0_HW0_LAST_GOT, IMM16_X1_HW0_LAST_GOT,
+	IMM16_X0_HW1_LAST_GOT, IMM16_X1_HW1_LAST_GOT,
+	IMM16_X0_HW2_LAST_GOT, IMM16_X1_HW2_LAST_GOT, IMM16_X0_HW0_TLS_GD,
+	IMM16_X1_HW0_TLS_GD, IMM16_X0_HW1_TLS_GD, IMM16_X1_HW1_TLS_GD,
+	IMM16_X0_HW2_TLS_GD, IMM16_X1_HW2_TLS_GD, IMM16_X0_HW3_TLS_GD,
+	IMM16_X1_HW3_TLS_GD, IMM16_X0_HW0_LAST_TLS_GD,
+	IMM16_X1_HW0_LAST_TLS_GD, IMM16_X0_HW1_LAST_TLS_GD,
+	IMM16_X1_HW1_LAST_TLS_GD, IMM16_X0_HW2_LAST_TLS_GD,
+	IMM16_X1_HW2_LAST_TLS_GD, IMM16_X0_HW0_TLS_IE,
+	IMM16_X1_HW0_TLS_IE, IMM16_X0_HW1_TLS_IE, IMM16_X1_HW1_TLS_IE,
+	IMM16_X0_HW2_TLS_IE, IMM16_X1_HW2_TLS_IE, IMM16_X0_HW3_TLS_IE,
+	IMM16_X1_HW3_TLS_IE, IMM16_X0_HW0_LAST_TLS_IE,
+	IMM16_X1_HW0_LAST_TLS_IE, IMM16_X0_HW1_LAST_TLS_IE,
+	IMM16_X1_HW1_LAST_TLS_IE, IMM16_X0_HW2_LAST_TLS_IE,
+	IMM16_X1_HW2_LAST_TLS_IE, TLS_DTPMOD64, TLS_DTPOFF64, TLS_TPOFF64,
+	TLS_DTPMOD32, TLS_DTPOFF32, TLS_TPOFF32}
+	* targets.c (bfd_elf32_tilegx_vec): Declare.
+	(bfd_elf32_tilepro_vec): Declare.
+	(bfd_elf64_tilegx_vec): Declare.
+	(bfd_target_vector): Add bfd_elf32_tilegx_vec, bfd_elf32_tilepro_vec,
+	and bfd_elf64_tilegx_vec.
+	* cpu-tilegx.c: New file.
+	* cpu-tilepro.c: New file.
+	* elf32-tilepro.h: New file.
+	* elf32-tilepro.c: New file.
+	* elf32-tilegx.c: New file.
+	* elf32-tilegx.h: New file.
+	* elf64-tilegx.c: New file.
+	* elf64-tilegx.h: New file.
+	* elfxx-tilegx.c: New file.
+	* elfxx-tilegx.h: New file.
+
+2011-06-13  Alan Modra  <amodra@gmail.com>
+
+	* linker.c (bfd_link_hash_traverse): Follow warning symbol link.
+	(_bfd_generic_link_write_global_symbol, fix_syms): Don't handle
+	warning symbols here.
+	* elf-m10300.c (elf32_mn10300_finish_hash_table_entry): Likewise.
+	* elf32-arm.c (allocate_dynrelocs_for_symbol,
+	elf32_arm_readonly_dynrelocs): Likewise.
+	* elf32-bfin.c (bfin_discard_copies): Likewise.
+	* elf32-cris.c (elf_cris_adjust_gotplt_to_got,
+	elf_cris_discard_excess_dso_dynamics,
+	elf_cris_discard_excess_program_dynamics): Likewise.
+	* elf32-hppa.c (allocate_plt_static, allocate_dynrelocs,
+	clobber_millicode_symbols, readonly_dynrelocs): Likewise.
+	* elf32-i370.c (i370_elf_adjust_dynindx): Likewise.
+	* elf32-i386.c (elf_i386_allocate_dynrelocs,
+	elf_i386_readonly_dynrelocs): Likewise.
+	* elf32-lm32.c (allocate_dynrelocs, readonly_dynrelocs): Likewise.
+	* elf32-m32c.c (m32c_relax_plt_check, m32c_relax_plt_realloc): Likewise.
+	* elf32-m32r.c (allocate_dynrelocs, readonly_dynrelocs): Likewise.
+	* elf32-m68k.c (elf_m68k_discard_copies): Likewise.
+	* elf32-microblaze.c (allocate_dynrelocs): Likewise.
+	* elf32-ppc.c (allocate_dynrelocs, maybe_set_textrel): Likewise.
+	* elf32-s390.c (allocate_dynrelocs, readonly_dynrelocs): Likewise.
+	* elf32-score.c (score_elf_sort_hash_table_f): Likewise.
+	* elf32-score7.c (score_elf_sort_hash_table_f): Likewise.
+	* elf32-sh.c (allocate_dynrelocs, readonly_dynrelocs): Likewise.
+	* elf32-tic6x.c (elf32_tic6x_allocate_dynrelocs,
+	elf32_tic6x_readonly_dynrelocs): Likewise.
+	* elf32-vax.c (elf_vax_discard_copies): Likewise.
+	* elf32-xstormy16.c (xstormy16_relax_plt_check,
+	xstormy16_relax_plt_realloc): Likewise.
+	* elf32-xtensa.c (elf_xtensa_allocate_dynrelocs): Likewise.
+	* elf64-alpha.c (elf64_alpha_output_extsym,
+	elf64_alpha_calc_got_offsets_for_symbol,
+	elf64_alpha_calc_dynrel_sizes, elf64_alpha_size_rela_got_1): Likewise.
+	* elf64-hppa.c (elf64_hppa_mark_exported_functions,
+	allocate_global_data_opd, elf64_hppa_mark_milli_and_exported_functions,
+	elf_hppa_unmark_useless_dynamic_symbols,
+	elf_hppa_remark_useless_dynamic_symbols): Likewise.
+	* elf64-ppc.c (ppc64_elf_gc_mark_dynamic_ref, func_desc_adjust,
+	adjust_opd_syms, adjust_toc_syms, allocate_dynrelocs,
+	readonly_dynrelocs, merge_global_got, reallocate_got,
+	undo_symbol_twiddle): Likewise.
+	* elf64-s390.c (allocate_dynrelocs, readonly_dynrelocs): Likewise.
+	* elf64-sh64.c (sh64_elf64_discard_copies): Likewise.
+	* elf64-x86-64.c (elf_x86_64_allocate_dynrelocs,
+	elf_x86_64_readonly_dynrelocs): Likewise.
+	* elflink.c (elf_link_renumber_hash_table_dynsyms,
+	elf_link_renumber_local_hash_table_dynsyms, _bfd_elf_export_symbol,
+	_bfd_elf_link_find_version_dependencies,
+	_bfd_elf_link_assign_sym_version, _bfd_elf_adjust_dynamic_symbol,
+	_bfd_elf_link_sec_merge_syms, elf_adjust_dynstr_offsets,
+	elf_collect_hash_codes, elf_collect_gnu_hash_codes,
+	elf_renumber_gnu_hash_syms, elf_gc_sweep_symbol,
+	elf_gc_propagate_vtable_entries_used,
+	elf_gc_smash_unused_vtentry_relocs, bfd_elf_gc_mark_dynamic_ref_symbol,
+	elf_gc_allocate_got_offsets): Likewise.
+	* elfnn-ia64.c (elfNN_ia64_global_dyn_info_free,
+	elfNN_ia64_global_dyn_sym_thunk): Likewise.
+	* elfxx-mips.c (mips_elf_check_symbols, mips_elf_output_extsym,
+	mips_elf_sort_hash_table_f, allocate_dynrelocs): Likewise.
+	* elfxx-sparc.c (allocate_dynrelocs, readonly_dynrelocs): Likewise.
+	* i386linux.c (linux_tally_symbols): Likewise.
+	* m68klinux.c (linux_tally_symbols): Likewise.
+	* sparclinux.c (linux_tally_symbols): Likewise.
+	* sunos.c (sunos_scan_dynamic_symbol): Likewise.
+	* xcofflink.c (xcoff_post_gc_symbol): Likewise.
+
+	* elflink.c (elf_link_output_extsym): Make it a bfd_hash_traverse
+	function.  Update all callers.
+	* aoutx.h (aout_link_write_other_symbol): Likewise.
+	* pdp11.c (aout_link_write_other_symbol): Likewise.
+	* cofflink.c (_bfd_coff_write_global_sym): Likewise.
+	* ecoff.c (ecoff_link_write_external): Likewise.
+	* xcofflink.c (xcoff_write_global_symbol): Likewise.
+	* vms-alpha.c (alpha_vms_link_output_symbol): Likewise.  Handle
+	warning symbols.
+	* ecoff.c (ecoff_link_hash_traverse): Delete.
+	* coff-ppc.c (ppc_bfd_coff_final_link): Use bfd_hash_traverse for
+	_bfd_coff_write_global_sym.
+	* libcoff-in.h (_bfd_coff_write_global_sym): Update prototype.
+	* libcoff.h: Regenerate.
+
+2011-06-10  Nick Clifton  <nickc@redhat.com>
+
+	* elflink.c (_bfd_elf_link_create_dynamic_sections): If the
+	backend does not provide a function for creating dynamic sections
+	then fail.
+	(bfd_elf_final_link): Issue a warning message if a dynamic section
+	has the SHT_NOTE type.
+	(bfd_elf_final_link): Do not look for dynamic strings in a section
+	that does not have the SHT_STRTAB type or the name .dynstr.
+	* elf32-arm.c (elf32_arm_finish_dynamic_sections): Fail if the got
+	section is not in the output binary.
+	* elf32-hppa.c (elf32_hppa_finish_dynamic_sections): Likewise.
+
+2011-06-09  Tristan Gingold  <gingold@adacore.com>
+
+	* elfnn-ia64.c (elfNN_ia64_relax_section, elfNN_ia64_choose_gp)
+	(elfNN_ia64_relocate_section, elfNN_vms_object_p): Remove trailing
+	spaces.
+
+2011-06-09  Tristan Gingold  <gingold@adacore.com>
+
+	* bfd.c (bfd_get_sign_extend_vma): Handle aixcoff.
+
+2011-06-09  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/12845
+	* elf.c (_bfd_elf_init_private_section_data): Add an assertion
+	that the output section has an allocated bfd_elf_section_data
+	structure.
+	* elfxx-mips.c (mips_elf_check_symbols): Do not create a stub for
+	symbols in sections that have been removed by garbage collection.
+
+2011-06-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_x86_64_check_relocs): Allow R_X86_64_64
+	relocations in SEC_DEBUGGING sections when building shared
+	libraries.
+
+2011-06-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12851
+	* elflink.c (elf_gc_sweep): Don't check SHT_NOTE sections here.
+	(bfd_elf_gc_sections): Also check SHT_NOTE sections.
+
+2011-06-08  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms (OBJS): Add elfxx-ia64.obj
+	Remove vax case.
+
+2011-06-08  Alan Modra  <amodra@gmail.com>
+
+	* aix386-core.c, * cisco-core.c, * hpux-core.c, * osf-core.c,
+	* sco5-core.c: Init match_priority field.
+
+2011-06-08  Alan Modra  <amodra@gmail.com>
+
+	* elflink.c (_bfd_elf_archive_symbol_lookup): Follow warning and
+	indirect links here.
+
+2011-06-07  Joel Brobecker  <brobecker@adacore.com>
+
+	* irix-core.c (irix_core_vec): Add match_priority field.
+
+2011-06-06  Alan Modra  <amodra@gmail.com>
+
+	* targets.c (bfd_target): Make ar_max_namelen an unsigned char.
+	Add match_priority.
+	* configure.in: Bump bfd version.
+	* elfcode.h (elf_object_p): Delete hacks preventing match of
+	EM_NONE and ELFOSABI_NONE targets when a better match exists.
+	* elfxx-target.h (elf_match_priority): Define and use.
+	* format.c (bfd_check_format_matches): Use target match_priority
+	to choose best of multiple matching targets.  In cases with multiple
+	matches rerun _bfd_check_format if we don't choose the last match.
+	* aout-adobe.c, * aout-arm.c, * aout-target.h, * aout-tic30.c,
+	* binary.c, * bout.c, * coff-alpha.c, * coff-i386.c, * coff-i860.c,
+	* coff-i960.c, * coff-ia64.c, * coff-mips.c, * coff-or32.c,
+	* coff-ppc.c, * coff-rs6000.c, * coff-sh.c, * coff-tic30.c,
+	* coff-tic54x.c, * coff-x86_64.c, * coff64-rs6000.c, * coffcode.h,
+	* i386msdos.c, * i386os9k.c, * ieee.c, * ihex.c, * mach-o-target.c,
+	* mipsbsd.c, * mmo.c, * nlm-target.h, * oasys.c, * pdp11.c,
+	* pe-mips.c, * pef.c, * plugin.c, * ppcboot.c, * som.c, * srec.c,
+	* tekhex.c, * trad-core.c, * verilog.c, * versados.c, * vms-alpha.c,
+	* vms-lib.c, * xsym.c: Init match_priority field.
+	* configure: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2011-06-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12842
+	* elfcode.h (elf_object_p): Revert the last change.
+
+2011-06-04  Alan Modra  <amodra@gmail.com>
+
+	* archures.c (bfd_arch_get_compatible): If one arch is unknown,
+	return the other arch.
+	* elfcode.h (elf_object_p): Allow explicit match to generic ELF
+	target.
+
+2011-06-03  Bertram Felgenhauer  <bertram.felgenhauer@gmail.com>
+
+	PR ld/12682
+	* hash.c (higher_primer_number): Add more, small, prime numbers.
+	(bfd_hash_set_default_size): Likewise.
+
+2011-06-02  Nick Clifton  <nickc@redhat.com>
+
+	* coff-mcore.c: Fix spelling typo.
+	* coff-stgo32.c: Likewise.
+	* elf32-arm.c: Likewise.
+	* elf32-avr.c: Likewise.
+	* elf-m68hc1x.c: Likewise.
+	* elf32-mcore.c: Likewise.
+	* elf32-mep.c: Likewise.
+	* elf32-mt.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-xtensa.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elfxx-mips.c: Likewise.
+	* netbsd.h: Likewise.
+	* nlmcode.h: Likewise.
+	* vms-alpha.c: Likewise.
+	* po/bfd.pot: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2011-06-01  DJ Delorie  <dj@redhat.com>
+
+	* config.bfd: Add bfd_elf32_rx_be_ns_vec.
+	* target.c: Likewise.
+	* configure.in: Likewise.
+	* configure.in: Regenerate.
+	* elf32-rx.c: Add elf32-rx-be-ns target.
+	(rx_elf_object_p): Never allow the be-ns target by default,
+	only allow it if the user requests it.
+
+2011-06-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_size_dynamic_sections): Properly warn
+	relocation in readonly section in a shared object.
+	* elf64-x86-64.c (elf_x86_64_size_dynamic_sections): Likewise.
+
+2011-05-31  Nick Clifton  <nickc@redhat.com>
+
+	* archive.c (adjust_relative_path): Fix comment to prevent it
+	corrupting the auto-generated bfd.h.
+
+2011-05-31  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Only do bl conversion
+	for known functions.
+	(elf32_arm_swap_symbol_in): Only set ST_BRANCH_TO_ARM for function
+	symbols.
+
+2011-05-31  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (arm_stub_is_thumb): Add
+	arm_stub_long_branch_v4t_thumb_tls_pic.
+	(elf32_arm_final_link_relocate): TLS stubs are always ARM.
+	Handle Thumb stubs.
+
+2011-05-27  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/12710
+	* archive.c (_bfd_get_elt_at_filepos): Set correct error value if
+	unable to read a file pointed to by an entry in a thin archive.
+	(adjust_relative_path): Use lrealpath to canonicalize paths.
+	Handle the case where the reference path is above the current
+	path in the directory tree.
+
+2011-05-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12809
+	* elf64-x86-64.c (elf_x86_64_relocate_section): Handle
+	R_X86_64_TPOFF64 in executable.
+
+2011-05-26  Alan Modra  <amodra@gmail.com>
+
+	* elf-bfd.h (SYMBOL_REFERENCES_LOCAL): Remove most of comment.
+	* elflink.c (_bfd_elf_symbol_refs_local_p): Expand
+	local_protected comment.
+
+2011-05-25  Tristan Gingold  <gingold@adacore.com>
+
+	* configure.in (bfd_elf32_ia64_big_vec, bfd_elf32_ia64_hpux_big_vec)
+	(bfd_elf64_ia64_big_vec, bfd_elf64_ia64_hpux_big_vec)
+	(bfd_elf64_ia64_little_vec, bfd_elf64_ia64_vms_vec): Add elfxx-ia64.lo
+	* Makefile.am (BFD64_BACKENDS): Add elfxx-ia64.lo
+	(BFD64_BACKENDS_CFILES): Add elfxx-ia64.c
+	(elf32-ia64.c): Created from elfnn-ia64.c
+	(elf64-ia64.c): Likewise.
+	* elfxx-ia64.h: New file.
+	* elfxx-ia64.c: Split with elfnn-ia64.c.  Keep only the following
+	functions.Includes elfxx-ia64.h.
+	(elfNN_ia64_reloc): Renames to ia64_elf_reloc.  Adjust error message.
+	(IA64_HOWTO): Adjust.
+	(lookup_howto): Renames to ia64_elf_lookup_howto.  Make it public.
+	(elfNN_ia64_reloc_type_lookup): Renames to
+	ia64_elf_reloc_type_lookup. Make it public. Adjust calls.
+	(elfNN_ia64_reloc_name_lookup): Renames to
+	ia64_elf_reloc_name_lookup. Make it public.
+	(elfNN_ia64_relax_br): Renames to ia64_elf_relax_br.  Make it public.
+	(elfNN_ia64_relax_brl): Renames to ia64_elf_relax_brl. Make it
+	public.
+	(elfNN_ia64_relax_ldxmov): Renames to ia64_elf_relax_ldxmov.
+	Move it and make it public.  Move prototype to elfxx-ia64.h
+	(elfNN_ia64_install_value): Renames to ia64_elf_install_value.
+	Move prototype to elfxx-ia64.h
+	* elfnn-ia64.c: New file, split from elfxx-ia64.c.
+	(elfNN_ia64_info_to_howto): Adjust calls.
+	(elfNN_ia64_relax_section): Adjust calls.
+	(count_dyn_reloc): Fix typo.
+	(elfNN_ia64_relocate_section): Adjust calls.
+	(elfNN_ia64_finish_dynamic_symbol): Likewise.
+	(bfd_elfNN_bfd_reloc_type_lookup)
+	(bfd_elfNN_bfd_reloc_name_lookup): Adjust macros.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
+2011-05-23  DJ Delorie  <dj@redhat.com>
+
+	* elf32-rx.c (rx_elf_object_p): When reading an RX object in, undo
+	the vma/lma swapping done in elf32_rx_modify_program_headers.
+
+2011-05-23  Nick Clifton  <nickc@redhat.com>
+
+	* elf-m10300.c (mn10300_elf_mkobject): New function.
+	(bfd_elf32_mkobject): Define.
+
+2011-05-23  Alan Modra  <amodra@gmail.com>
+
+	* elf-bfd.h: Comment typo fix.
+	* elf32-ppc.c (struct ppc_elf_dyn_relocs): Delete.  Replace with
+	struct elf_dyn_relocs throughout.
+	* elf64-ppc.c (struct ppc_dyn_relocs): Likewise.
+
+2011-05-23  Alan Modra  <amodra@gmail.com>
+
+	* elf32-frv.c: Use info->callbacks->einfo throughout file in linker
+	functions rather than warning callback or _bfd_error_handler.
+	* elf32-ppc.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf32-ppc.c (ppc_elf_tls_optimize): Use %H in __tls_get_addr lost
+	arg error.
+	* elf64-ppc.c (ppc64_elf_tls_optimize): Likewise.
+
+2011-05-23  Alan Modra  <amodra@gmail.com>
+
+	PR 12763
+	* elf.c (assign_file_positions_for_load_sections): Set sh_offset for
+	.tbss, and page align same for all SHT_NOBITS sections.
+
+2011-05-21  Alan Modra  <amodra@gmail.com>
+
+	PR 12763
+	* elf.c (_bfd_elf_make_section_from_shdr): Set up TLS section LMAs
+	from PT_TLS header.
+	(_bfd_elf_map_sections_to_segments): Don't create a final PT_LOAD
+	segment if just for .tbss.
+	(assign_file_positions_for_load_sections): Don't report "can't
+	allocate in segment" errors for .tbss.
+	(assign_file_positions_for_non_load_sections): Don't set p_filesz
+	from SHT_NOBITS section filepos.
+
+2011-05-20  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* elf32-tic6x.c (elf32_tic6x_howto_table): Add entries for
+	R_C6000_PCR_H16 and R_C6000_PCR_L16.
+	(elf32_tic6x_relocate_section): Handle them.
+
+2011-05-18  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/12761
+	* elflink.c (elf_link_add_object_symbols): Process .gnu.warning
+	sections when building shared libraries.
+
+2011-05-18  Rafał Krypa  <r.krypa@samsung.com>
+
+	PR ld/12778
+	* elf32-arm.c (elf32_arm_gc_sweep_hook): Use the computed dynamic
+	reloc pointer.
+
+2011-05-18  Tristan Gingold  <gingold@adacore.com>
+
+	* xcofflink.c (xcoff_link_add_symbols): Handle C_DWARF symbols.
+	(xcoff_sweep): Always keep dwarf sections.
+	(xcoff_link_input_bfd): Handle dwarf symbols and sections.
+
+2011-05-18  Tristan Gingold  <gingold@adacore.com>
+
+	* libxcoff.h (struct xcoff_dwsect_name): New type.
+	(XCOFF_DWSECT_NBR_NAMES): New macro.
+	(xcoff_dwsect_names): Declare.
+	* coffcode.h (sec_to_styp_flags): Handle xcoff dwarf sections.
+	(styp_to_sec_flags): Ditto.
+	(coff_new_section_hook): Ditto.
+	(coff_slurp_symbol_table): Handle C_DWARF and C_INFO.
+	* coff-rs6000.c (xcoff_dwsect_name): New variable.
+
+2011-05-17  Tomohiro Kashiwada  <kikairoya@gmail.com>
+
+	PR ld/12759
+	* elf32-rx.c (ignore_lma): New variable.
+	(bfd_elf32_rx_set_target_flags): Add ignore_lma parameter.
+	(rx_modify_program_headers): Only copy the LMA into the VMA if
+	ignore_lma is true.
+
+2011-05-17  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12760
+	* coff-aux.c (coff_m68k_aux_link_add_one_symbol): Adjust "notice" call.
+	* elflink.c (elf_link_add_object_symbols): Likewise.
+	* linker.c (_bfd_generic_link_add_one_symbol): Likewise.
+
+2011-05-16  Alan Modra  <amodra@gmail.com>
+
+	* linker.c (_bfd_generic_link_add_one_symbol): Don't init u.undef.weak.
+
+2011-05-15  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_check_relocs): Record both local and
+	global GOT entries for GOT_PAGE relocations against global symbols.
+
+2011-05-13  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* config.bfd (tic6x-*-elf, tic6x-*-uclinux): New.
+	(tic6x-*-*): Replaced by these.
+	* elf32-tic6x.c (elf32_tic6x_set_osabi): New static function.
+	(elf32_tic6x_check_relocs): Create dynamic sections if -shared.
+	(elf_backend_relocs_compatible, elf_backend_post_process_headers):
+	Define.
+	(elf32_bed, TARGET_LITTLE_SYM, TARGET_LITTLE_NAME, TARGET_BIG_SYM,
+	TARGET_BIG_NAME, ELF_OSABI): Redefine twice, and include
+	"elf32-target.h" two more times.
+	* configure.in: Handle bfd_elf32_tic6x_linux_be_vec,
+	bfd_elf32_tic6x_linux_le_vec, bfd_elf32_tic6x_elf_be_vec and
+	bfd_elf32_tic6x_elf_le_vec.
+	* configure: Regenerate.
+
+2011-05-13  Jan Beulich  <jbeulich@novell.com>
+
+	* config.bfd: Add targets x86_64-*-pe and x86_64-*-pep.
+
+2011-05-12  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* config.in: Regenerated.
+	* configure: Regenerated.
+	* configure.in: New tests for HAVE_PRPSINFO_T_PR_PID,
+	HAVE_PRPSINFO32_T_PR_PID, HAVE_PSINFO_T_PR_PID and
+	HAVE_PSINFO32_T_PR_PID.
+	* elf.c (elfcore_grok_psinfo): Protect reading psinfo.pr_pid by
+	HAVE_PRPSINFO_T_PR_PID, HAVE_PRPSINFO32_T_PR_PID, HAVE_PSINFO_T_PR_PID
+	and HAVE_PSINFO32_T_PR_PID.
+	* hosts/x86-64linux.h (HAVE_PRPSINFO32_T_PR_PID): New redefinition.
+
+2011-05-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elf.c (elfcore_grok_psinfo): Initialize CORE_PID for both native and
+	32bit psinfo.
+	* elf32-ppc.c (ppc_elf_grok_psinfo): Initialize core_pid.
+	* elf64-ppc.c (ppc64_elf_grok_psinfo): Likewise.
+
+2011-05-09  Paul Brook  <paul@codesourcery.com>
+
+	* bfd-in.h (elf32_tic6x_fix_exidx_coverage): Add prototype.
+	* bfd-in2.h: Regenerate.
+	* elf32-tic6x.c: Include limits.h.
+	(tic6x_unwind_edit_type, tic6x_unwind_table_edit,
+	_tic6x_elf_section_data): New.
+	(elf32_tic6x_section_data): Define.
+	(elf32_tic6x_new_section_hook): Allocate target specific data.
+	(elf32_tic6x_add_unwind_table_edit): New function.
+	(get_tic6x_elf_section_data, elf32_tic6x_adjust_exidx_size,
+	elf32_tic6x_insert_cantunwind_after, elf32_tic6x_add_low31,
+	elf32_tic6x_copy_exidx_entry): New functions.
+	(elf_backend_write_section): Define.
+
+2011-05-09  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-tic6x.c (is_tic6x_elf_unwind_section_name,
+	elf32_tic6x_fake_sections): New functions.
+	(elf_backend_fake_sections): Define.
+
+2011-05-09  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-tic6x.c (elf32_tic6x_gc_mark_extra_sections): New function.
+	(elf_backend_gc_mark_extra_sections): Define.
+
+2011-05-07  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	PR ld/12365
+	* cofflink.c (bfd_coff_link_input_bfd): Check for and warn about
+	references to symbols defined in discarded sections.
+
+2011-05-07  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	PR ld/12365
+	* coffgen.c (coff_write_symbol): Assume input section is its own
+	output section if output_section member not set.
+	(coff_write_alien_symbol): Likewise.
+
+2011-05-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12730
+	* elf.c (_bfd_elf_section_offset): Check SEC_ELF_REVERSE_COPY.
+
+	* elflink.c (elf_link_input_bfd): Reverse copy .ctors/.dtors
+	sections if needed.
+
+	* section.c (SEC_ELF_REVERSE_COPY): New.
+	* bfd-in2.h: Regenerated.
+
+2011-05-07  Anders Kaseorg  <andersk@ksplice.com>
+
+	PR 12739
+	* libbfd.c (bfd_get_8, bfd_get_signed_8): Use const cast.
+	* bfd-in2.h: Regenerate.
+
+2011-05-06  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (evax_section_flags): Remove SEC_IN_MEMORY.
+	(_bfd_vms_slurp_egsd): Rename old_flags to vms_flags.  Handle
+	any code section.  Add comments.
+	(alpha_vms_object_p): Use void * instead of PTR.
+	(alpha_vms_create_eisd_for_section): Fix test for setting DZRO.
+	(build_module_list): Guard against no DST section.  Add comments.
+	(alpha_vms_link_output_symbol): Discard undefined symbols.
+	(alpha_vms_get_section_contents): Simply memcpy if the section was
+	already loaded.  Fix typo.
+	(vms_new_section_hook): Use void * instead of PTR.
+	(vms_alpha_vec): Ditto.
+
+2011-05-06  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf32-arm.c (cortex_a8_erratum_scan): If the stub is a Thumb
+	branch to a PLT entry, redirect it to the PLT's Thumb entry point.
+
+2011-05-05  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* elf32-tic6x.c (elf32_tic6x_final_link): New function.
+	(elf32_tic6x_merge_attributes): Do not warn for PID or PIC
+	mismatch.  Choose the lower of the two values.
+	(bfd_elf32_bfd_final_link): New macro.
+
+2011-04-28  Tristan Gingold  <gingold@adacore.com>
+
+	* coff-rs6000.c (_bfd_xcoff_swap_aux_in): Adjust for x_file.
+	(bfd_xcoff_swap_aux_out): Ditto.
+	* coff64-rs6000.c (_bfd_xcoff64_swap_aux_in): Ditto.
+	(bfd_xcoff64_swap_aux_out): Ditto.
+
+2011-05-04  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12727
+	* elf64-ppc.c (ppc_build_one_stub <ppc_sub_plt_call>): Clear
+	was_undefined on dot-symbols.
+
+2011-05-03  Paul Brook  <paul@codesourcery.com>
+
+
+	* elf32-tic6x.c (elf32_tic6x_howto_table,
+	elf32_tic6x_howto_table_rel, (elf32_tic6x_gc_sweep_hook,
+	elf32_tic6x_relocate_section, elf32_tic6x_check_relocs):
+	Add R_C6000_EHTYPE.
+
+2011-05-01  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12718
+	* elf32-i386.c (elf_i386_check_relocs): Ensure dynobj set before
+	creating ifunc sections.
+	* elf64-x86-64.c (elf_x86_64_check_relocs): Likewise.
+
+2011-04-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_x86_64_merge_symbol): Correct parameter
+	names.
+
+2011-04-28  Tom Tromey  <tromey@redhat.com>
+
+	* bfdio.c (memory_bstat): Pass correct size to memset.
+
+2011-04-28  Mike Frysinger  <vapier@gentoo.org>
+
+	* dwarf2.c (dwarf_debug_sections): Mark const.
+	* elf.c (special_sections): Likewise.
+	* libbfd-in.h (dwarf_debug_sections): Likewise.
+	* libbfd.h: Regenerate.
+
+2011-04-26  Kai Tietz  <ktietz@redhat.com>
+
+	* coffcode.h (sec_to_styp_flags): Allow linkonce for
+	debugging sections.
+
+2011-04-26  Tristan Gingold  <gingold@adacore.com>
+
+	* coff64-rs6000.c: Convert to ISO-C.  Remove PARAMS and PTR macros.
+
+2011-04-24  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12365
+	PR ld/12696
+	* coff-aux.c (coff_m68k_aux_link_add_one_symbol): Update "notice" call.
+	* linker.c (_bfd_link_hash_newfunc): Clear bitfields.
+	(_bfd_generic_link_add_one_symbol): Update "notice" call.
+	* elflink.c (_bfd_elf_merge_symbol): Don't skip weak redefs when
+	it is a redef of an IR symbol in a real BFD.
+
+2011-04-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_readonly_dynrelocs): Warn relocation
+	in readonly section in a shared object.
+	(elf_i386_size_dynamic_sections): Likewise.
+	* elf64-x86-64.c (elf_x86_64_readonly_dynrelocs): Likewise.
+	(elf_x86_64_size_dynamic_sections): Likewise.
+
+2011-04-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12694
+	* elf32-i386.c (elf_i386_readonly_dynrelocs): Skip local IFUNC
+	symbols.
+	* elf64-x86-64.c (elf_x86_64_readonly_dynrelocs): Likewise.
+
+2011-04-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_finish_dynamic_symbol): Return false
+	on dynamic symbol error.
+	* elf64-x86-64.c (elf_x86_64_finish_dynamic_symbol): Likewise.
+
+2011-04-20  Tristan Gingold  <gingold@adacore.com>
+
+	* config.bfd (alpha*-*-*vms*, ia64*-*-*vms*): Define targ_selvecs.
+
+2011-04-20  Alan Modra  <amodra@gmail.com>
+
+	* hash.c (bfd_default_hash_table_size): Make it an unsigned long.
+	(bfd_hash_table_init_n): Overflow checking.
+	(bfd_hash_set_default_size): Return current size.  Take unsigned long
+	arg.  Add 65537 to hash_size primes.
+	* bfd-in.h (bfd_hash_set_default_size): Update prototype.
+	* bfd-in2.h: Regenerate.
+
+2011-04-20  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elf-bfd.h (RELOC_AGAINST_DISCARDED_SECTION): Fix +1 overrun of
+	memmove elements.
+
+2011-04-20  Alan Modra  <amodra@gmail.com>
+
+	* libbfd.c (bfd_log2): Do return rounded up value.
+	* elflink.c (bfd_elf_size_dynsym_hash_dynstr): Replace bfd_log2
+	call with expanded old round down version of the function.
+
+	* archive.c (_bfd_get_elt_at_filepos): Don't release n_nfd.
+	* elflink.c (elf_link_add_object_symbols): Delete redundant code.
+
+2011-04-20  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12365
+	* elfcode.h (elf_slurp_symbol_table): Put common plugin IR symbols
+	in their own common section.
+	* elflink.c (elf_link_add_object_symbols): Likewise.
+	* linker.c (generic_link_check_archive_element): Don't lose flags
+	if common section is pre-existing.
+	(_bfd_generic_link_add_one_symbol): Likewise.
+
+2011-04-20  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12365
+	* elflink.c (_bfd_elf_merge_symbol): Update multiple_common calls.
+	* linker.c (_bfd_generic_link_add_one_symbol): Likewise.  Call
+	multiple_definition regardless of allow_multiple_definition.
+	* simple.c (simple_dummy_multiple_definition): Update.
+	* xcofflink.c (xcoff_link_add_symbols): Update multiple_definition
+	calls.
+
+2011-04-18  Tristan Gingold  <gingold@adacore.com>
+
+	* coff-rs6000.c: Convert to ISO-C.  Remove PARAMS macro.
+
+2011-04-18  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12365
+	PR ld/12672
+	* bfd.c (BFD_PLUGIN): Define.
+	(BFD_FLAGS_SAVED, BFD_FLAGS_FOR_BFD_USE_MASK): Add BFD_PLUGIN.
+	* bfd-in2.h: Regenerate.
+	* elflink.c (elf_link_output_extsym): Strip undefined plugin syms.
+	* opncls.c (bfd_make_readable): Don't lose original bfd flags.
+
+2011-04-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elf64-ppc.c (ppc64_elf_get_synthetic_symtab): Do not check for
+	SEC_LOAD.
+
+2011-04-15  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+	* elf-bfd.h (struct sdt_note): New struct.
+	(struct elf_obj_tdata) <sdt_note_head>: New field.
+	* elf.c (elfobj_grok_stapsdt_note_1): New function.
+	(elfobj_grok_stapsdt_note): Likewise.
+	(elf_parse_notes): Added code to treat SystemTap note
+	sections.
+
+2011-04-12  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_size_dynamic_sections): Do not
+	exclude empty .got sections.
+
+2011-04-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_reloc_type_lookup): Fix the out of bound
+	array access for BFD_RELOC_386_IRELATIVE.
+
+2011-04-11  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* elf32-tic6x.c (elf32_tic6x_check_relocs): Initialize pc_count field.
+
+2011-04-11  Mark Wielaard  <mjw@redhat.com>
+
+	PR 10549
+	* elf-bfd.h (has_ifunc_symbols): Renamed to has_gnu_symbols.
+	(has_gnu_symbols): Renamed from has_ifunc_symbols.
+	* elf.c (_bfd_elf_set_osabi): Use new has_gnu_symbols name.
+	* elf32-arm.c (elf32_arm_add_symbol_hook): Set has_gnu_symbols
+	also if STB_GNU_UNIQUE symbol binding was seen.
+	* elf32-i386.c (elf_i386_add_symbol_hook): Likewise.
+	* elf32-ppc.c (ppc_elf_add_symbol_hook): Likewise.
+	* elf32-sparc.c (elf32_sparc_add_symbol_hook): Likewise.
+	* elf64-ppc.c (ppc64_elf_add_symbol_hook): Likewise.
+	* elf64-sparc.c (elf64_sparc_add_symbol_hook): Likewise.
+	* elf64-x86-64.c (elf_x86_64_add_symbol_hook): Likewise.
+
+2011-04-11  Alan Modra  <amodra@gmail.com>
+
+	* bfd-in.h (bfd_get_section_limit): Don't use rawsize with output
+	sections.
+	* libbfd.c (_bfd_generic_get_section_contents): Likewise.
+	(_bfd_generic_get_section_contents_in_window): Likewise.
+	* section.c (bfd_get_section_contents): Likewise.
+	* compress.c (bfd_get_full_section_contents): Likewise.
+	* elf32-rx.c (rx_final_link): Ignore rawsize.
+	* elf32-microblaze.c (microblaze_elf_relocate_section): Use correct
+	bfd with bfd_get_section_limit.
+	* elfxx-ia64.c (elfNN_ia64_choose_gp): Add "final" parameter.  Use
+	os->size during final link.  Update callers.
+	* bfd-in2.h: Regenerate.
+
+2011-04-10  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	PR ld/12637
+	* elfxx-mips.c (mips_elf_merge_got_with): Use arg->global_count
+	as the number of global entries when merging with the primary GOT.
+
+2011-04-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c: Update copyright year.
+	* elf64-x86-64.c: Likewise.
+
+2011-04-09  Kai Tietz  <ktietz@redhat.com>
+
+	* peXXigen.c (_bfd_XXi_final_link_postscripte): Sort pdata in temporary
+	buffer and use rawsize for sorting.
+	* coffcode.h (coff_compute_section_file_positions): Set rawsize
+	before doing alignment.
+
+2011-04-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_relocate_section): Return relocation
+	error on unsupported relocation.
+	* elf64-x86-64.c (elf_x86_64_relocate_section): Likewise.
+
+2011-04-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/12657
+	* hosts/x86-64linux.h (elf_prstatus32): Replace __pid_t with
+	pid_t.
+
+2011-04-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12654
+	* elf32-i386.c (elf_i386_relocate_section): Check !executable
+	instead of shared for R_386_TLS_LDO_32.
+
+2011-04-08  Tristan Gingold  <gingold@adacore.com>
+
+	* Makefile.am (SOURCE_HFILES): Remove xcoff-target.h
+	* coff-pmac: Remove
+	* xcoff-target.h: Remove
+	* Makefile.in: Regenerate.
+
+2011-04-07  Cary Coutant  <ccoutant@google.com>
+
+	* dwarf2.c (scan_unit_for_symbols): Check for DW_AT_specification.
+
+2011-04-07  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-tic6x.c (elf32_tic6x_howto_table): R_C6000_PREL31 is
+	pc-relative.
+	(elf32_tic6x_howto_table_rel): Ditto.
+	(elf32_tic6x_relocate_section): Implement R_C6000_PREL31.
+	(elf32_tic6x_check_relocs): Ditto.
+
+2011-04-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* config.bfd (thumb-*-oabi): Don't handle in list of obsolete
+	targets.
+	(strongarm*, thumb*, xscale*): Remove architectures.
+	(strongarm-*-kaos*, thumb-*-coff, thumb-*-elf, thumb-epoc-pe*,
+	thumb-*-pe*, strongarm-*-elf, strongarm-*-coff, xscale-*-elf,
+	xscale-*-coff): Remove targets.
+
+2011-04-01  Tristan Gingold  <gingold@adacore.com>
+
+	* elfxx-ia64.c: include bfd_stdint.h
+
+2011-03-31  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elf32-tic6x.c (elf32_tic6x_relocate_section): Remove unused variable
+	dynobj and its initialization.
+
+2011-03-31  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms (DEFS): Add HAVE_bfd_elf64_ia64_vms_vec.
+	* configure.com: Set BFD_HOST_64BIT_LONG_LONG and
+	BFD_HOST_LONG_LONG to 1.
+
+2011-03-31  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (vms_get_remaining_object_record): Fix dec-c warning.
+	(_bfd_vms_write_etir): Ditto.
+	(_bfd_vms_slurp_etir): Avoid to use intptr_t
+	* configure.com: Generate bfd_stdint.h
+
+2011-03-31  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* elf32-tic6x.h (struct elf32_tic6x_params): New.
+	(elf32_tic6x_setup): Declare.
+	* elf32-tic6x.c: Include <limits.h>.
+	(ELF_DYNAMIC_LINKER, DEFAULT_STACK_SIZE, PLT_ENTRY_SIZE): Define.
+	(struct elf32_tic6x_link_hash_table, struct elf32_link_hash_entry):
+	New structures.
+	(elf32_tic6x_link_hash_table, is_tic6x_elf): New macros.
+	(tic6x_elf_scom_section, tic6x_elf_scom_symbol,
+	tic6x_elf_scom_symbol_ptr): New static variables.
+	(elf32_tic6x_howto_table, elf32_tic6x_howto_table_rel,
+	elf32_tic6x_reloc_map): Add R_C6000_JUMP_SLOT, R_C6000_EHTYPE,
+	R_C6000_PCR_H16 and R_C6000_PCR_L16.
+	(elf32_tic6x_link_hash_newfunc, elf32_tic6x_link_hash_table_create,
+	elf32_tic6x_link_hash_table_free, elf32_tic6x_setup,
+	elf32_tic6x_using_dsbt, elf32_tic6x_install_rela,
+	elf32_tic6x_create_dynamic_sections, elf32_tic6x_make_got_dynreloc,
+	elf32_tic6x_finish_dynamic_symbol, elf32_tic6x_gc_sweep_hook,
+	elf32_tic6x_adjust_dynamic_symbol): New static functions.
+	(elf32_tic6x_relocate_section): For R_C6000_PCR_S21, convert branches
+	to weak symbols as required by the ABI.
+	Handle GOT and DSBT_INDEX relocs, and copy relocs to the output file
+	as needed when generating DSBT output.
+	(elf32_tic6x_check_relocs, elf32_tic6x_add_symbol_hook,
+	elf32_tic6x_symbol_processing, elf32_tic6x_section_from_bfd_section,
+	elf32_tic6x_allocate_dynrelocs, elf32_tic6x_size_dynamic_sections,
+	elf32_tic6x_always_size_sections, elf32_tic6x_modify_program_headers,
+	elf32_tic6x_finish_dynamic_sections, elf32_tic6x_plt_sym_val,
+	elf32_tic6x_copy_private_data, elf32_tic6x_link_omit_section_dynsym):
+	New static functions.
+	(ELF_MAXPAGESIZE): Define to 0x1000.
+	(bfd_elf32_bfd_copy_private_bfd_data,
+	bfd_elf32_bfd_link_hash_table_create,
+	bfd_elf32_bfd_link_hash_table_free, elf_backend_can_refcount,
+	elf_backend_want_got_plt, elf_backend_want_dynbss,
+	elf_backend_plt_readonly, elf_backend_got_header_size,
+	elf_backend_gc_sweep_hook, elf_backend_modify_program_headers,
+	elf_backend_create_dynamic_sections, elf_backend_adjust_dynamic_symbol,
+	elf_backend_check_relocs, elf_backend_add_symbol_hook,
+	elf_backend_symbol_processing, elf_backend_link_output_symbol_hook,
+	elf_backend_section_from_bfd_section,
+	elf_backend_finish_dynamic_symbol, elf_backend_always_size_sections,
+	elf32_tic6x_size_dynamic_sections, elf_backend_finish_dynamic_sections,
+	elf_backend_omit_section_dynsym, elf_backend_plt_sym_val): Define.
+
+	* bfd/reloc.c (BFD_RELOC_C6000_JUMP_SLOT, BFD_RELOC_C6000_EHTYPE,
+	BFD_RELOC_C6000_PCR_H16, BFD_RELOC_C6000_PCR_S16): Add.
+	* bfd/bfd-in2.h: Regenerate.
+	* bfd/libbfd.h: Regenerate.
+	* config.bfd: Accept tic6x-*-* instead of tic6x-*-elf.
+
+2011-03-31  Tristan Gingold  <gingold@adacore.com>
+
+	* coffcode.h (coff_slurp_symbol_table): Silently discard C_NULL
+	entry on xcoff when value is C_NULL_VALUE.
+
+2011-03-31  Tristan Gingold  <gingold@adacore.com>
+
+	* libcoff-in.h (exec_hdr): Remove.
+	* libcoff.h: Regenerate.
+
+2011-03-30  Nick Clifton  <nickc@redhat.com>
+
+	* po/da.po: Updated Danish translation.
+
+2011-03-29  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_gc_mark_hook): New.
+	(elf64_alpha_gc_sweep_hook): New.
+	(elf_backend_gc_mark_hook, elf_backend_gc_sweep_hook): New.
+	(elf_backend_can_gc_sections): New.
+
+2011-03-26  John Marino  <binutils@marino.st>
+
+	* config.bfd: Add x86_64-*-dragonfly*, fix i386-*-dragonfly*.
+	* configure.in: Delete unused bfd_elf32_i386_dragonfly_vec.
+	* configure: Regenerate.
+
+2011-03-25  Michael Snyder  <msnyder@vmware.com>
+
+	* coffcode.h (coff_set_alignment_hook): Check return of bfd_seek.
+
+2011-03-25  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (_bfd_vms_find_nearest_dst_line): Allow the use
+	of find_nearest_line on object files.
+
+2011-03-25  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (evax_section_flags): Make $CODE$ section read-only.
+	Minor reordering.
+	(alpha_vms_create_eisd_for_section): Make code sections read-only.
+
+2011-03-24  Alan Modra  <amodra@gmail.com>
+
+	* elf32-ppc.c (ppc_elf_tls_optimize): Catch more cases where
+	old-style __tls_get_addr calls without marker relocs don't match
+	their arg setup insn one for one.  If such mismatches are found
+	report the reloc and don't do any tls optimization.
+	* elf64-ppc.c (ppc64_elf_tls_optimize): Likewise.
+
+2011-03-22  Eric B. Weddington  <eric.weddington@atmel.com>
+
+	* bfd-in2.h: Regenerate.
+
+2011-03-22  Eric B. Weddington  <eric.weddington@atmel.com>
+
+	* archures.c: Add AVR XMEGA architecture information.
+	* cpu-avr.c (arch_info_struct): Likewise.
+	* elf32-avr.c (bfd_elf_avr_final_write_processing): Likewise.
+	(elf32_avr_object_p): Likewise.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* reloc.c (BFD_RELOC_ARM_IRELATIVE): New relocation.
+	* bfd-in2.h: Regenerate.
+	* elf32-arm.c (elf32_arm_howto_table_2): Rename existing definition
+	to elf32_arm_howto_table_3 and replace with a single R_ARM_IRELATIVE
+	entry.
+	(elf32_arm_howto_from_type): Update accordingly.
+	(elf32_arm_reloc_map): Map BFD_RELOC_ARM_IRELATIVE to R_ARM_IRELATIVE.
+	(elf32_arm_reloc_name_lookup): Handle elf32_arm_howto_table_3.
+	(arm_plt_info): New structure, split out from elf32_arm_link_hash_entry
+	with an extra noncall_refcount field.
+	(arm_local_iplt_info): New structure.
+	(elf_arm_obj_tdata): Add local_iplt.
+	(elf32_arm_local_iplt): New accessor macro.
+	(elf32_arm_link_hash_entry): Replace plt_thumb_refcount,
+	plt_maybe_thumb_refcount and plt_got_offset with an arm_plt_info.
+	Change tls_type to a bitfield and add is_iplt.
+	(elf32_arm_link_hash_newfunc): Update accordingly.
+	(elf32_arm_allocate_local_sym_info): New function.
+	(elf32_arm_create_local_iplt): Likewise.
+	(elf32_arm_get_plt_info): Likewise.
+	(elf32_arm_plt_needs_thumb_stub_p): Likewise.
+	(elf32_arm_get_local_dynreloc_list): Likewise.
+	(create_ifunc_sections): Likewise.
+	(elf32_arm_copy_indirect_symbol): Update after the changes to
+	elf32_arm_link_hash_entry.  Assert the is_iplt has not yet been set.
+	(arm_type_of_stub): Add an st_type argument.  Use elf32_arm_get_plt_info
+	to get PLT information.  Assert that all STT_GNU_IFUNC references
+	are turned into PLT references.
+	(arm_build_one_stub): Pass the symbol type to
+	elf32_arm_final_link_relocate.
+	(elf32_arm_size_stubs): Pass the symbol type to arm_type_of_stub.
+	(elf32_arm_allocate_irelocs): New function.
+	(elf32_arm_add_dynreloc): In static objects, use .rel.iplt for
+	all R_ARM_IRELATIVE.
+	(elf32_arm_allocate_plt_entry): New function.
+	(elf32_arm_populate_plt_entry): Likewise.
+	(elf32_arm_final_link_relocate): Add an st_type parameter.
+	Set srelgot to null for static objects.  Use separate variables
+	to record which st_value and st_type should be used when generating
+	a dynamic relocation.  Use elf32_arm_get_plt_info to find the
+	symbol's PLT information, setting has_iplt_entry, splt,
+	plt_offset and gotplt_offset accordingly.  Check whether
+	STT_GNU_IFUNC symbols should resolve to an .iplt entry, and change
+	the relocation target accordingly.  Broaden assert to include
+	.iplts.  Don't set sreloc for static relocations.  Assert that
+	we only generate dynamic R_ARM_RELATIVE relocations for R_ARM_ABS32
+	and R_ARM_ABS32_NOI.  Generate R_ARM_IRELATIVE relocations instead
+	of R_ARM_RELATIVE relocations if the target is an STT_GNU_IFUNC
+	symbol.  Pass the symbol type to arm_type_of_stub.  Conditionally
+	resolve GOT references to the .igot.plt entry.
+	(elf32_arm_relocate_section): Update the call to
+	elf32_arm_final_link_relocate.
+	(elf32_arm_gc_sweep_hook): Use elf32_arm_get_plt_info to get PLT
+	information.  Treat R_ARM_REL32 and R_ARM_REL32_NOI as call
+	relocations in shared libraries and relocatable executables.
+	Count non-call PLT references.  Use elf32_arm_get_local_dynreloc_list
+	to get the list of dynamic relocations for a local symbol.
+	(elf32_arm_check_relocs): Always create ifunc sections.  Set isym
+	at the same time as setting h.  Use elf32_arm_allocate_local_sym_info
+	to allocate local symbol information.  Treat R_ARM_REL32 and
+	R_ARM_REL32_NOI as call relocations in shared libraries and
+	relocatable executables.  Record PLT information for local
+	STT_GNU_IFUNC functions as well as global functions.   Count
+	non-call PLT references.  Use elf32_arm_get_local_dynreloc_list
+	to get the list of dynamic relocations for a local symbol.
+	(elf32_arm_adjust_dynamic_symbol): Handle STT_GNU_IFUNC symbols.
+	Don't remove STT_GNU_IFUNC PLTs unless all references have been
+	removed.  Update after the changes to elf32_arm_link_hash_entry.
+	(allocate_dynrelocs_for_symbol): Decide whether STT_GNU_IFUNC PLT
+	entries should live in .plt or .iplt.  Check whether the .igot.plt
+	and .got entries can be combined.  Use elf32_arm_allocate_plt_entry
+	to allocate .plt and .(i)got.plt entries.  Detect which .got
+	entries will need R_ARM_IRELATIVE relocations and use
+	elf32_arm_allocate_irelocs to allocate them.  Likewise other
+	non-.got dynamic relocations.
+	(elf32_arm_size_dynamic_sections): Allocate .iplt, .igot.plt
+	and dynamic relocations for local STT_GNU_IFUNC symbols.
+	Check whether the .igot.plt and .got entries can be combined.
+	Detect which .got entries will need R_ARM_IRELATIVE relocations
+	and use elf32_arm_allocate_irelocs to allocate them.  Use stashed
+	section pointers intead of strcmp checks.  Handle iplt and igotplt.
+	(elf32_arm_finish_dynamic_symbol): Use elf32_arm_populate_plt_entry
+	to fill in .plt, .got.plt and .rel(a).plt entries.  Point
+	STT_GNU_IFUNC symbols at an .iplt entry if non-call relocations
+	resolve to it.
+	(elf32_arm_output_plt_map_1): New function, split out from
+	elf32_arm_output_plt_map.  Handle .iplt entries.  Use
+	elf32_arm_plt_needs_thumb_stub_p.
+	(elf32_arm_output_plt_map): Call it.
+	(elf32_arm_output_arch_local_syms): Add mapping symbols for
+	local .iplt entries.
+	(elf32_arm_swap_symbol_in): Handle Thumb STT_GNU_IFUNC symbols.
+	(elf32_arm_swap_symbol_out): Likewise.
+	(elf32_arm_add_symbol_hook): New function.
+	(elf_backend_add_symbol_hook): Define for all targets.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf-bfd.h (elf_link_hash_entry): Add target_internal.
+	* elf.c (swap_out_syms): Set st_target_internal for each
+	Elf_Internal_Sym.
+	* elfcode.h (elf_swap_symbol_in): Likewise.
+	* elf32-i370.c (i370_elf_finish_dynamic_sections): Likewise.
+	* elf32-sh-symbian.c (sh_symbian_relocate_section): Likewise.
+	* elf64-sparc.c (elf64_sparc_output_arch_syms): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_size_dynamic_sections): Likewise.
+	* elflink.c (elf_link_output_extsym): Likewise.
+	(bfd_elf_final_link): Likewise.
+	(elf_link_add_object_symbols): Copy st_target_internal
+	to the hash table if we see a definition.
+	(_bfd_elf_copy_link_hash_symbol_type): Copy target_internal.
+	* elf32-arm.c (elf32_arm_stub_hash_entry): Replace st_type with
+	a branch_type field.
+	(a8_erratum_fix, a8_erratum_reloc): Likewise.
+	(arm_type_of_stub): Replace actual_st_type with an
+	actual_branch_type parameter.
+	(arm_build_one_stub): Use branch types rather than st_types to
+	determine the type of branch.
+	(cortex_a8_erratum_scan): Likewise.
+	(elf32_arm_size_stubs): Likewise.
+	(bfd_elf32_arm_process_before_allocation): Likewise.
+	(allocate_dynrelocs_for_symbol): Likewise.
+	(elf32_arm_finish_dynamic_sections): Likewise.
+	(elf32_arm_final_link_relocate): Replace sym_flags parameter with
+	a branch_type parameter.
+	(elf32_arm_relocate_section): Update call accordingly.
+	(elf32_arm_adjust_dynamic_symbol): Don't check STT_ARM_TFUNC.
+	(elf32_arm_output_map_sym): Initialize st_target_internal.
+	(elf32_arm_output_stub_sym): Likewise.
+	(elf32_arm_symbol_processing): Delete.
+	(elf32_arm_swap_symbol_in): Convert STT_ARM_TFUNCs into STT_FUNCs.
+	Use st_target_internal to record the branch type.
+	(elf32_arm_swap_symbol_out): Use st_target_internal to test for
+	Thumb functions.
+	(elf32_arm_is_function_type): Delete.
+	(elf_backend_symbol_processing): Likewise.
+	(elf_backend_is_function_type): Likewise.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf32-arm.c (elf32_arm_check_relocs): Always assign a dynobj.
+	(elf32_arm_finish_dynamic_sections): Move sgot != NULL assertion
+	into the PLT block.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf32-arm.c (elf32_arm_check_relocs): Use call_reloc_p,
+	may_need_local_target_p and may_become_dynamic_p to classify
+	the relocation type.  Don't check info->symbolic or h->def_regular
+	when deciding whether to record a potential dynamic reloc.
+	Don't treat potential dynamic relocs as PLT references.
+	(elf32_arm_gc_sweep_hook): Update to match.  Assert that we don't
+	try to make the PLT reference count go negative.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Always fill in the
+	GOT entry here, rather than leaving it to finish_dynamic_symbol.
+	Only create a dynamic relocation for local references if
+	info->shared.
+	(allocate_dynrelocs_for_symbol): Update dynamic relocation
+	allocation accordingly.
+	(elf32_arm_finish_dynamic_symbol): Don't initialise the GOT entry here.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf32-arm.c (elf32_arm_allocate_dynrelocs): New function.
+	(elf32_arm_add_dynreloc): Likewise.
+	(elf32_arm_adjust_dynamic_symbol): Use elf32_arm_allocate_dynrelocs
+	to allocate dynamic relocations.
+	(elf32_arm_size_dynamic_sections): Likewise.
+	(allocate_dynrelocs): Likewise.  Rename to
+	allocate_dynrelocs_for_symbol.
+	(elf32_arm_final_link_relocate): Use elf32_arm_add_dynreloc to
+	create dynamic relocations.
+	(elf32_arm_finish_dynamic_symbol): Likewise.
+
+2011-03-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_x86_64_check_tls_transition): Supprt TLS
+	x32 GD->IE and GD->LE transitions.
+	(elf_x86_64_relocate_section): Supprt TLS x32 GD->IE, GD->LE
+	and LD->LE transitions.
+
+2011-03-10  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (ppc64_elf_relocate_section): Provide section/offset
+	for LO_DS error message and correct multiple.
+
+2011-03-10  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (bfd_elf64_bfd_link_just_syms): Define.
+	(ppc64_elf_link_just_syms): New function.
+	(opd_entry_value): Don't assume big-endian host.
+	(get_r2off): New function.
+	(ppc_build_one_stub, ppc_size_one_stub): Use it here.
+
+2011-03-06  Michael Snyder  <msnyder@vmware.com>
+
+	* compress.c (bfd_compress_section_contents): Check for out of mem.
+
+	* elf64-x86-64.c (elf_x86_64_relocate_section): Document
+	that case statement falls through intentionally.
+
+	* elf32-i386.c (elf_i386_relocate_section): Document fall through.
+
+2011-03-04  Alan Modra  <amodra@gmail.com>
+
+	* archive.c (bsd_write_armap): Don't call stat in deterministic
+	mode, and don't use st_mtime if stat returns error.
+
+2011-03-03  Michael Snyder  <msnyder@vmware.com>
+
+	* elf64-x86-64.c (elf_x86_64_relocate_section): Remove dead code.
+
+	* coff-x86_64.c (coff_amd64_rtype_to_howto): Fencepost error.
+
+	* aoutx.h (aout_final_link): Use sizeof int not sizeof int*.
+	(aout_link_write_other_symbol): Missing break statement.
+
+	* dwarf2.c (scan_unit_for_symbols): Stop memory leak.
+
+	* archive.c (_bfd_slurp_extended_name_table): Fail if bfd_seek fails.
+
+2011-03-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_x86_64_check_tls_transition): Supprt TLS
+	x32 IE->LE transition.
+	(elf_x86_64_relocate_section): Likewise.
+
+2011-03-02  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* elflink.c (is_reloc_section): Remove function.
+	(get_dynamic_reloc_section_name): Construct string manually.
+
+2011-02-28  Kai Tietz  <kai.tietz@onevision.com>
+
+	* archive.c (_bfd_find_nested_archive): Use filename_(n)cmp.
+	(adjust_relative_path): Likewise.
+	(_bfd_construct_extended_name_table): Likewise.
+	* corefile.c (generic_core_file_matches_executable_p): Likewise.
+	* elf32-bfin.c (bfinfdpic_relocate_section): Likewise.
+	* elf32-frv.c (elf32_frv_relocate_section): Likewise.
+	* elf32-spu.c (sort_bfds): Likewise.
+	(spu_elf_auto_overlay): Likewise.
+	* syms.c (_bfd_stab_section_find_nearest_line): Likewise.
+	* xcofflink.c (xcoff_set_import_path): Likewise.
+	* xtensa-isa.c (xtensa_regfile_lookup): Likewise.
+	(xtensa_regfile_lookup_shortname): Likewise.
+
+2011-02-28  Alan Modra  <amodra@gmail.com>
+
+	PR 12513
+	* archive.c (bfd_slurp_bsd_armap_f2): Sanity check parsed_size and
+	stringsize.  Properly sanity check symdef_count.  Remove redundant
+	bfd_release.
+
+2011-02-25  Rafael Ávila de Espíndola <respindola@mozilla.com>
+
+	* plugin.c (bfd_plugin_object_p): Correctly set the filesize
+	and handle claim_file seeking. Only try to load the plugin once.
+
+2011-02-22  Andreas Schwab  <schwab@redhat.com>
+
+	* elf32-m68k.c (elf_m68k_finish_dynamic_symbol): For a TLS_GD
+	relocation read the value from the second GOT slot.
+
+2011-02-15  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (alpha_vms_link_add_archive_symbols): Add a comment.
+
+2011-02-15  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (ppc64_elf_edit_toc): Reinstate second read of
+	toc relocs.  Fuss over free(NULL).
+
+2011-02-14  Mike Frysinger  <vapier@gentoo.org>
+
+	* elflink.c (bfd_elf_size_dynamic_sections): Add
+	bfd_get_symbol_leading_char to the start of newname.
+
+2011-02-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure: Regenerate.
+
+2011-02-09  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (ppc64_elf_edit_toc): Don't free toc relocs until
+	we are done.  When optimising large toc, check that a global
+	symbol on a toc reloc is defined in a kept section.
+
+2011-02-08  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/12467
+	* elf.c (assign_file_positions_for_load_sections): Set the program
+	header offset and entry size to zero if there are no program
+	headers.
+
+2011-02-08  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (ppc64_elf_edit_toc): Don't segfault on NULL
+	local_syms when looking for local symbols in .toc.
+
+2011-02-01  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (ppc64_elf_next_input_section): Use elf_gp value
+	for toc pointer on any section having makes_toc_func_call set.
+	(check_pasted_section): Ensure pasted .init/.fini fragments use
+	the same toc if any has makes_toc_func_call set.
+
+2011-01-28  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf32-ppc.c (ppc_elf_link_hash_newfunc): Initialize has_sda_refs
+	field.
+
+2011-01-22  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Ignore
+	common sections too.
+
+2011-01-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_backend_want_plt_sym): Redefine to 0 after
+	Solaris target.
+
+2011-01-18  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	Fix compilation for mingw64.
+	* coffcode.h (coff_slurp_symbol_table): Add intptr_t intermediate
+	typecast to avoid warning.
+	* elf32-rx.c: Add "bfd_stdint.h" include required for int32_t type
+	usage.
+	* elfxx-ia64.c (elfNN_ia64_relax_br): Use intptr_t typeacast instead
+	of long for pointer to avoid warning.
+	(elfNN_ia64_relax_brl): Idem.
+	(elfNN_ia64_install_value): Idem.
+	* vms-alpha.c (_bfd_vms_slurp_etir): Idem.
+
+2011-01-17  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf32-arm.c (elf32_arm_check_relocs): Check needs_plt rather than
+	h->needs_plt when deciding whether to record a possible dynamic reloc.
+
+2011-01-17  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf32-arm.c (elf32_arm_gc_sweep_hook): Remove all registered
+	dynamic relocs for the removed section.
+
+2011-01-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_x86_64_check_relocs): Check invalid x32
+	relocations.
+
+2011-01-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_x86_64_link_hash_table): Add pointer_r_type.
+	(elf_x86_64_link_hash_table_create): Set pointer_r_type.
+	(elf_x86_64_check_relocs): Handle R_X86_64_32 like R_X86_64_64
+	for ILP32.  Remove ABI_64_P PIC check for R_X86_64_8,
+	R_X86_64_16, R_X86_64_32 and R_X86_64_32S.
+	(elf_x86_64_relocate_section):  Handle R_X86_64_32 like R_X86_64_64
+	for ILP32.
+
+2011-01-14  Alan Modra  <amodra@gmail.com>
+
+	* bfd.c (bfd_perror): Flush stdout before and stderr after printing
+	error.
+	(_bfd_default_error_handler): Likewise.
+	* elf.c (print_segment_map): Likewise.
+	* libbfd.c (warn_deprecated): Likewise.
+	* som.c (som_sizeof_headers): No need to do so here.
+	* coff-i860.c: Replace use of printf for error messages with
+	_bfd_error_handler.
+	* coff-ppc.c: Likewise.
+	* coff-sh.c: Likewise.
+	* elf32-bfin.c: Likewise.
+	* elf32-dlx.c: Likewise.
+	* elf32-mep.c: Likewise.
+	* elf32-v850.c: Likewise.
+	* mach-o.c: Likewise.
+	* pef.c: Likewise.
+
+2011-01-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_x86_64_link_hash_table): Remove
+	swap_reloca_out.
+	(elf_x86_64_link_hash_table_create): Don't set swap_reloca_out.
+	(elf_x86_64_check_relocs): Align relocation section to 4 byte
+	for 32bit.
+	(elf_x86_64_gc_sweep_hook): Replace ELF64_ST_TYPE with
+	ELF_ST_TYPE.
+	(elf_x86_64_finish_dynamic_symbol): Updated.
+	(elf_x86_64_finish_dynamic_sections): Don't use
+	Elf64_External_Dyn, bfd_elf64_swap_dyn_in, nor
+	bfd_elf64_swap_dyn_out.
+
+2011-01-14  J. Park  <grassman@gmail.com>
+
+	PR ld/12339
+	* elf32-arm.c (allocate_dynrelocs): Don't set up eh before
+	following bfd_link_hash_warning symbol link.
+
+2011-01-10  Nathan Sidwell  <nathan@codesourcery.com>
+	    Glauber de Oliveira Costa  <glommer@gmail.com>
+
+	* reloc.c (BFD_RELOC_ARM_TLS_GOTDESC, BFD_RELOC_ARM_TLS_CALL,
+	BFD_RELOC_ARM_THM_TLS_CALL, BFD_RELOC_ARM_TLS_DESCSEQ,
+	BFD_RELOC_ARM_THM_TLS_DESCSEQ, BFD_RELOC_ARM_TLS_DESC): New
+	relocations.
+	* libbfd.h: Rebuilt.
+	* bfd-in2.h: Rebuilt.
+	* elf32-arm.c (elf32_arm_howto_table_1): Add new relocations.
+	(elf32_arm_reloc_map): Likewise.
+	(tls_trampoline, dl_tlsdesc_lazy_trampoline): New PLT templates.
+	(elf32_arm_stub_long_branch_any_tls_pic,
+	elf32_arm_stub_long_branch_v4t_thumb_tls_pic): New stub templates.
+	(DEF_STUBS): Add new stubs.
+	(struct_elf_arm_obj_data): Add local_tlsdesc_gotent field.
+	(elf32_arm_local_tlsdesc_gotent): New.
+	(GOT_TLS_GDESC): New mask.
+	(GOT_TLS_GD_ANY): Define.
+	(struct elf32_arm_link_hash_entry): Add tlsdesc_got field.
+	(elf32_arm_compute_jump_table_size): New.
+	(struct elf32_arm_link_hash_table): Add next_tls_desc_index,
+	num_tls_desc, dt_tlsdesc_plt, dt_tlsdesc_got, tls_trampoline,
+	sgotplt_jump_table_size fields.
+	(elf32_arm_link_hash_newfunc): Initialize tlsdesc_got field.
+	(elf32_arm_link_hash_table_create): Initialize new fields.
+	(arm_type_of_stub): Check TLS desc relocs too.
+	(elf32_arm_stub_name): TLS desc relocs can be shared.
+	(elf32_arm_tls_transition): Determine relaxation.
+	(arm_stub_required_alignment): Add tls stubs.
+	(elf32_arm_size_stubs): Likewise.
+	(elf32_arm_tls_relax): Perform TLS relaxing.
+	(elf32_arm_final_link_relocate): Process TLS DESC relocations.
+	(IS_ARM_TLS_GNU_RELOC): New.
+	(IS_ARM_TLS_RELOC): Use it.
+	(elf32_arm_relocate_section): Perform TLS relaxing.
+	(elf32_arm_check_relocs): Anticipate TLS relaxing, process tls
+	desc relocations.
+	(allocate_dynrelocs): Allocate tls desc relcoations.
+	(elf32_arm_output_arch_local_syms): Emit tls trampoline mapping
+	symbols.
+	(elf32_arm_size_dynamic_sections): Allocate tls trampolines and
+	got slots.
+	(elf32_arm_always_size_sections): New. Create _TLS_MODULE_BASE
+	symbol.
+	(elf32_arm_finish_dynamic_symbol): Adjust.
+	(arm_put_trampoline): New.
+	(elf32_arm_finish_dynamic_sections): Emit new dynamic tags and tls
+	trampolines.
+	(elf_backend_always_size_sections): Define.
+
+2011-01-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-ifunc.c (_bfd_elf_allocate_ifunc_dyn_relocs): Optimized.
+
+2011-01-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12366
+	PR ld/12371
+	* elf-ifunc.c (_bfd_elf_allocate_ifunc_dyn_relocs): Properly
+	handle symbols marked with regular reference, but not non-GOT
+	reference when building shared library.
+
+	* elf32-i386.c (elf_i386_gc_sweep_hook): Properly handle
+	local and global STT_GNU_IFUNC symols when building shared
+	library.
+	* elf64-x86-64.c (elf_x86_64_gc_sweep_hook): Likewise.
+
+2011-01-05  DJ Delorie  <dj@redhat.com>
+
+	* reloc.c: Add BFD_RELOC_RX_OP_NEG.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* elf32-rx.c: Add it to the list, corresponding to R_RX_OPneg.
+
+2011-01-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* cpu-i386.c (bfd_i386_compatible): New.
+	(bfd_x64_32_arch_intel_syntax): Replace bfd_default_compatible
+	with bfd_i386_compatible.
+	(bfd_x86_64_arch_intel_syntax): Likewise.
+	(bfd_i386_arch_intel_syntax): Likewise.
+	(i8086_arch): Likewise.
+	(bfd_x64_32_arch): Likewise.
+	(bfd_x86_64_arch): Likewise.
+	(bfd_i386_arch): Likewise.
+
+For older changes see ChangeLog-2010
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-0001 sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-0001
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-0001	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-0001	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,9592 @@
+2001-12-31  Jakub Jelinek  <jakub@redhat.com>
+
+	* elflink.h (elf_bfd_final_link): Check if dynobj is not NULL
+	before looking for .eh_frame_hdr section.
+	* elf-eh-frame.c (_bfd_elf_write_section_eh_frame_hdr): If
+	.eh_frame_hdr section is being stripped from output, don't do
+	anything.
+
+2001-12-27  Tom Rix  <trix@redhat.com>
+
+	* coff-rs6000.c (xcoff_generate_rtinit): Clean data_buffer alloc/free.
+	* coff64-rs6000.c (xcoff64_generate_rtinit): Same.
+	(xcoff_write_archive_contents_big): Rewrite.
+	(xcoff_write_armap_big): Rewrite.
+	(xcoff_write_one_armap_big): Delete.
+	* libxcoff.h : Clean up.
+
+2001-12-21  Tom Rix  <trix@redhat.com>
+
+        * xcofflink.c (bfd_xcoff_link_generate_rtinit): New function.
+	Interface to linker for generation of __rtinit.
+	* libxcoff.h (struct xcoff_backend_data_rec): Add new ops to xcoff
+	backend to generate special linker symbol __rtinit.
+	* coff-rs6000.c (bfd_xcoff_backend_data, bfd_pmac_xcoff_backend_data)
+	:  Add new rtinit ops
+	* coff64-rs6000.c (bfd_xcoff_aix5_backend_data,
+	bfd_xcoff_backend_data): Same.
+	* bfd-in.h: Add bfd_xcoff_link_generate_rtinit.
+	* bfd-in2.h : Regenerate.
+
+2001-12-21  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-sparc.c (_bfd_sparc_elf_howto_table): Fix dst_mask for
+	R_SPARC_DISP32.  Support R_SPARC_PLT32.
+	(sparc_reloc_map): Add BFD_RELOC_16_PCREL and BFD_RELOC_SPARC_PLT32.
+	(elf32_sparc_check_relocs): Handle R_SPARC_PLT32.
+	(elf32_sparc_relocate_section): Likewise.
+	* elf64-sparc.c (sparc64_elf_howto_table): Fix dst_mask for
+	R_SPARC_DISP32.  Support R_SPARC_PLT32 and R_SPARC_PLT64.
+	(sparc_reloc_map): Add BFD_RELOC_16_PCREL, BFD_RELOC_64_PCREL
+	and BFD_RELOC_SPARC_PLT32.
+	(sparc64_elf_check_relocs): Handle R_SPARC_PLT32 and R_SPARC_PLT64.
+	(sparc64_elf_relocate_section): Likewise.
+	* reloc.c (bfd_reloc_code_type): Add BFD_RELOC_SPARC_PLT32.
+	* bfd-in2.h, libbfd.h: Rebuilt.
+
+2001-12-20  Tom Rix  <trix@redhat.com>
+
+	* coffcode.h (coff_compute_section_file_positions): Add special AIX
+	loader alignment of text section.
+
+2001-12-20  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* config.bfd (mips-dec-netbsd*): Delete alias for mips*el-*-netbsd*.
+
+	* config.bfd (arm-*-netbsdelf*): Add target.
+	* configure.in: Include netbsd-core.lo for native arm-*-netbsd*.
+	* configure: Regenerate.
+
+2001-12-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* elfcode.h (elf_slurp_symbol_table): Test elf_elfsections for NULL,
+	as can happen with a core file, before dereferencing.
+
+2001-12-19  Michael Snyder  <msnyder@redhat.com>
+
+	* elf32-i386.c (elf_i386_grok_psinfo): Fix copy-and-paste error:
+	target is i386 (not mips), and size of descdata is 124 (not 128).
+
+2001-12-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): If new_size
+	is 0, temporarily grow it to minimal CIE size.
+	(_bfd_elf_write_section_eh_frame): If input .eh_frame section would
+	end up empty, build a fake minimal CIE.
+
+2001-12-19  Steve Ellcey  <sje@cup.hp.com>
+
+	* config.bfd (bfd_elf32_ia64_hpux_big_vec): New vector for
+	ia64*-*-hpux* target.
+	(bfd_elf64_ia64_hpux_big_vec): Likewise.
+	* targets.c: Ditto.
+	* configure.in: Ditto.
+	* configure: Regenerate
+	* elfxx-ia64.c (elfNN_ia64_final_write_processing): Replace use of
+	alloca with bfd_malloc.
+	(get_local_sym_hash): Likewise.
+	(elfNN_hpux_post_process_headers): New function.
+	#include elfNN-target.h again with values for IA64 HP-UX vector.
+
+2001-12-18  Michael Snyder  <msnyder@redhat.com>
+
+        * elf.c (assign_file_positions_for_segments): Don't sort PT_NOTE
+        sections of corefiles.  Also it makes no sense to sort if count == 1.
+
+2001-12-18  H.J. Lu <hjl@gnu.org>
+
+	* elf.c (_bfd_elf_copy_private_bfd_data): Also copy GP.
+
+2001-12-18  H.J. Lu <hjl@gnu.org>
+
+	* elf.c (_bfd_elf_copy_private_bfd_data): Update comments.
+
+2001-12-18  H.J. Lu <hjl@gnu.org>
+
+	* elf-bfd.h (_bfd_elf_copy_private_bfd_data): New. Prototype.
+	(_bfd_mips_elf_copy_private_bfd_data): Removed.
+
+	* elf.c (_bfd_elf_copy_private_bfd_data): New. Copy e_flags in
+	the ELF header.
+
+	* elf32-i370.c (??_elf_copy_private_bfd_data): Removed.
+	(bfd_elf??_bfd_copy_private_bfd_data): Removed.
+	* elf32-m32r.c: Likewise.
+	* elf32-m68k.c: Likewise.
+	* elf32-mcore.c: Likewise.
+	* elf32-mips.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-v850.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf64-sparc.c: Likewise.
+	* elfxx-ia64.c: Likewise.
+
+	* elf64-mips.c (bfd_elf64_bfd_copy_private_bfd_data): Removed.
+
+	* elfxx-target.h (bfd_elfNN_bfd_copy_private_bfd_data): Defined
+	to _bfd_elf_copy_private_bfd_data.
+
+2001-12-18  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* elf32-s390 (elf_s390_check_relocs): Pass addend to
+	gc_record_vtentry.
+	* elf64-s390 (elf_s390_check_relocs): Likewise.
+	Fix by Andreas Jaeger <aj@suse.de>.
+
+2001-12-18  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* configure.host: Correctly match all NetBSD/mips
+	hosts.
+
+2001-12-18  matthew green  <mrg@eterna.com.au>
+
+	* config.bfd (m68*-*-netbsdelf*): New target.
+	(m68*-*-netbsd): Also include bfd_elf32_m68k_vec.
+	(m68*-*-netbsdaout*): New alias for m68*-*-netbsd.
+
+2001-12-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* elflink.h (size_dynamic_sections): Skip anonymous version tag.
+	(elf_link_assign_sym_version): Don't count anonymous version tag.
+
+2001-12-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf-eh-frame.c (struct cie): Add make_lsda_relative.
+	(struct eh_cie_fde): Add lsda_encoding, lsda_offset,
+	make_lsda_relative.
+	(read_value, write_value): New.
+	(_bfd_elf_discard_section_eh_frame): Inicialize
+	lsda_encoding, lsda_offset and make_lsda_relative.
+	(_bfd_elf_eh_frame_section_offset): If make_lsda_relative,
+	request no dynamic reloc for LSDA field of FDE.
+	(_bfd_elf_write_section_eh_frame): Handle make_lsda_relative.
+	If a non-DW_EH_PE_absptr value is 0, don't adjust it by base
+	or pcrel.  Fix address computation for DW_EH_PE_pcrel relocs.
+	Update LSDA field if LSDA encoding is DW_EH_PE_pcrel, because
+	. might have changed due to deleted FDE or CIEs.
+
+2001-12-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf-strtab.c (struct elf_strtab_hash_entry): Add u.next.
+	(last_eq): Remove.
+	(_bfd_elf_strtab_finalize): Don't use a hash table for last
+	character chains, instead use an array.
+
+2001-12-18  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* elf.c (elfcore_netbsd_get_lwpid): New function.
+	(elfcore_grok_netbsd_procinfo): New function.
+	(elfcore_grok_netbsd_note): New function.
+	(elfcore_read_notes): Call elfcore_grok_netbsd_note to process
+	NetBSD ELF core file notes.
+
+2001-12-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* elfcode.h (struct bfd_preserve): New.
+	(elf_object_p): Replace preserved_* vars with instance of above.
+	Save and restore arch_info pointer rather than arch, mach so that
+	more cases can be restored.  Save and restore new section_tail,
+	section_htab structure, and init appropriately.  Move "rest of
+	section header" code so that i_shdrp needs no NULL initialisation.
+	Free old section_htab on success.
+	* elfcore.h (elf_core_file_p): Likewise.
+
+2001-12-17  Tom Rix  <trix@redhat.com>
+
+	* coffcode.h (sec_to_styp_flags): Add STYP_EXCEPT and STYP_TYPCHK for
+	xcoff.
+
+2001-12-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf-bfd.h (elf_discarded_section): Define.
+	* elflink.h (elf_link_input_bfd): Use it.
+	(elf_reloc_symbol_deleted_p): Likewise.
+
+	* elf64-alpha.c (elf64_alpha_relocate_section): Don't warn about
+	overflows for pc relative relocs against discarded sections.
+
+2001-12-17  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elf32-mips.c (_bfd_mips_elf_relocate_section): Formatting.
+	* elf64-mips.c: Add most of the fixes and tweaks done in elf32-mips.c
+	over the last months. Add some code for mips16 handling.
+	(mips_elf64_check_mips16_stubs): New function.
+	(mips_elf64_stub_section_p): Likewise.
+	(mips_elf64_calculate_relocation): Change interface to support mips16.
+	(mips_elf64_perform_relocation): Likewise.
+
+2001-12-17  Alan Modra  <amodra@bigpond.net.au>
+
+	Support for more than 64k ELF sections.
+	* elf-bfd.h (elf_size_info <swap_symbol_out>): Add shndx param.
+	(bfd_elf32_swap_symbol_in): Likewise.
+	(bfd_elf32_swap_symbol_out): Likewise.
+	(bfd_elf64_swap_symbol_in): Likewise.
+	(bfd_elf64_swap_symbol_out): Likewise.
+	(elf_reloc_cookie): Add locsym_shndx field.  Make locsyms a PTR.
+	(elf_obj_tdata): Add num_elf_sections, symtab_shndx_hdr and
+	symtab_shndx_section.
+	(elf_numsections): Define.
+	(elf_symtab_shndx): Define.
+	* elf.c (setup_group): Use elf_numsections rather than header e_shnum.
+	(bfd_elf_find_section): Likewise.
+	(bfd_section_from_elf_index): Likewise.
+	(bfd_section_from_shdr): Likewise.  Handle SHT_SYMTAB_SHNDX.
+	(bfd_section_from_r_symndx): Read symbol shndx extension, and
+	translate st_shndx for > SHN_HIRESERVE.
+	(assign_section_numbers): Skip reserved sections.  Assign
+	symtab_shndx_section and elf_numsections.  Exclude reserved
+	sections from e_shnum.  Set up symtab_shndx_hdr.
+	(_bfd_elf_compute_section_file_positions): Handle symtab_shndx_hdr.
+	(map_sections_to_segments): Don't map eh_frame_hdr unless required.
+	(assign_file_positions_except_relocs): Use elf_numsections rather
+	than header e_shnum.  Skip reserved sections and symtab_shndx_section.
+	(prep_headers): Set name for symtab_shndx_hdr.
+	(_bfd_elf_assign_file_positions_for_relocs): Use elf_numsections.
+	(_bfd_elf_write_object_contents): Likewise.  Skip reserved sections.
+	(_bfd_elf_section_from_bfd_section): Check bfd_{abs,com,und}_section
+	first.  Use elf_section_data if available.  Use elf_numsections.
+	Start scan at index 1.
+	(copy_private_bfd_data ): Comment fixes.
+	(MAP_ONESYMTAB): Define above SHN_HIOS.
+	(MAP_DYNSYMTAB): Likewise.
+	(MAP_STRTAB): Likewise.
+	(MAP_SHSTRTAB): Likewise.
+	(MAP_SYM_SHNDX): New define.
+	(_bfd_elf_copy_private_symbol_data): Handle symtab_shndx_section.
+	(swap_out_syms): Swap out SHT_SYMTAB_SHNDX section too.
+	* elfcode.h (elf_swap_symbol_in): Add shndx param, and handle shndx
+	extension.
+	(elf_swap_symbol_out): Likewise.
+	(elf_object_p): Set elf_numsections, and use instead of e_shnum.
+	Initialialise reserved elf_elfsections to point at shdr[0].  Remove
+	redundant bfd_release calls.
+	(elf_slurp_symbol_table): Read symbol shndx extension, and use with
+	elf_swap_symbol_in.  Translate st_shndx for > SHN_HIRESERVE too.
+	* elflink.h (elf_link_is_defined_archive_symbol): Read symbol shndx
+	extension, and use with elf_swap_symbol_in.
+	(elf_link_record_local_dynamic_symbol): Likewise.
+	(elf_link_add_object_symbols): Likewise.  Also translate st_shndx
+	for elf sections > SHN_HIRESERVE.
+	(NAME(bfd_elf,size_dynamic_sections)): Adjust elf_swap_symbol_out
+	call.
+	(struct elf_final_link_info): Add locsym_shndx and symshndxbuf.
+	(elf_bfd_final_link): Allocate the above, and tidy code allocating
+	other buffers.  Use elf_numsections instead of e_shnum.  Adjust
+	elf_swap_symbol_out calls.
+	(elf_link_output_sym): Swap out symbol shndx extension too.
+	(elf_link_flush_output_syms): And flush them to disk.
+	(elf_link_output_extsym): Use SHN_BAD.  Adjust elf_swap_symbol_out
+	calls.
+	(elf_gc_mark): Read symbol shndx extension, and use with
+	elf_swap_symbol_in.
+	(elf_link_input_bfd): Likewise,  Translate st_shndx for elf sections
+	> SHN_HIRESERVE too.  Use SHN_BAD.
+	(elf_reloc_symbol_deleted_p): Use symbol shndx extensions with
+	elf_swap_symbol_in.  Translate st_shndx > SHN_HIRESERVE too.
+	(elf_bfd_discard_info): Read symbol shndx extension.  Don't attempt
+	to continue after a bfd error.
+	* elf-m10200.c (mn10200_elf_relax_section): Only read local syms.
+	Stash them immediately to symtab_hdr->contents rather than later
+	in multiple places.  Clean up afterwards.  Read symbol shndx
+	extension, and use with swap_symbol_in.  Translate SHN_UNDEF,
+	SHN_ABS, SHN_COMMON and elf sections > SHN_HIRESERVE to bfd
+	sections too.  Remove dead code.
+	(mn10200_elf_relax_delete_bytes): Use symbol shndx extension
+	when swapping in symbols.  Tidy code adjusting global syms.
+	Don't swap in global syms.
+	(mn10200_elf_symbol_address_p): Likewise.  Remove extsyms param.
+	(mn10200_elf_get_relocated_section_contents): Read symbol shndx
+	extension, and use with swap_symbol_in.  Rename "size" -> "amt"
+	to maximize code in common with other files.  Translate st_shndx
+	for > SHN_HIRESERVE too.  Remove dead code.
+	* elf-m10300.c (mn10300_elf_relax_section): Only read local syms.
+	Stash them immediately to symtab_hdr->contents rather than later
+	in multiple places.  Clean up afterwards.  Read symbol shndx
+	extension, and use with swap_symbol_in.  Remove dead code.
+	(mn10300_elf_relax_delete_bytes): As for elf-m10200.c.
+	(mn10300_elf_symbol_address_p): Likewise.
+	(mn10300_elf_get_relocated_section_contents): Likewise.
+	* elf32-h8300.c (elf32_h8_relax_section): As for elf-m10300.c.
+	(elf32_h8_relax_delete_bytes): Likewise.
+	(elf32_h8_symbol_address_p): Likewise.
+	(elf32_h8_get_relocated_section_contents): Likewise.
+	* elf32-hppa.c (elf32_hppa_size_stubs): Read symbol shndx
+	extension, and use with swap_symbol_in.
+	* elf64-hppa.c (elf64_hppa_check_relocs): Likewise.
+	* elf32-i370.c (i370_elf_finish_dynamic_sections): Adjust call to
+	bfd_elf32_swap_symbol_out.
+	* elf32-m32r.c (m32r_elf_get_relocated_section_contents): Translate
+	elf sections > SHN_HIRESERVE too.
+	* elf32-m68k.c (bfd_m68k_elf32_create_embedded_relocs): Only read
+	local syms.  Read symbol shndx extension, and use with swap_symbol_in.
+	* elf32-mips.c (_bfd_mips_elf_final_write_processing): Use
+	elf_numsections rather than header e_shnum.
+	* elf32-sh.c (sh_elf_relax_section): As for elf-m10300.c.
+	(sh_elf_relax_delete_bytes): Likewise.
+	(sh_elf_get_relocated_section_contents): Likewise.  Only read local
+	symbols.
+	* elf32-v850.c (v850_elf_symbol_processing): Use an unsigned int to
+	hold section index.  Use elf_numsections rather than e_shnum.
+	Rename "index" -> "indx" to avoid shadowing warning.
+	(v850_elf_add_symbol_hook): Likewise.
+	* elf64-alpha.c (elf64_alpha_relax_section): Only read local syms.
+	Read symbol shndx extension, and use with swap_symbol_in.
+	* elf32-xstormy16.c (xstormy16_elf_relax_section): Likewise.
+	Translate SHN_COMMON and elf sections > SHN_HIRESERVE too.
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Likewise.
+	(elfNN_ia64_aix_add_symbol_hook): Use elf_numsections.
+
+	* elf-m10300.c (mn10300_elf_gc_mark_hook): Remove unnecessary checks
+	before calling bfd_section_from_elf_index on local syms.
+	* elf32-arm.h (elf32_arm_gc_mark_hook): Likewise.
+	* elf32-avr.c (elf32_avr_gc_mark_hook): Likewise.
+	* elf32-cris.c (cris_elf_gc_mark_hook): Likewise.
+	* elf32-d10v.c (elf32_d10v_gc_mark_hook): Likewise.
+	* elf32-fr30.c (fr30_elf_gc_mark_hook): Likewise.
+	* elf32-hppa.c (elf32_hppa_gc_mark_hook): Likewise.
+	* elf32-i386.c (elf_i386_gc_mark_hook): Likewise.
+	* elf32-m32r.c (m32r_elf_gc_mark_hook): Likewise.
+	* elf32-m68k.c (elf_m68k_gc_mark_hook): Likewise.
+	* elf32-mcore.c (mcore_elf_gc_mark_hook): Likewise.
+	* elf32-mips.c (_bfd_mips_elf_gc_mark_hook): Likewise.
+	* elf32-openrisc.c (openrisc_elf_gc_mark_hook): Likewise.
+	* elf32-ppc.c (ppc_elf_gc_mark_hook): Likewise.
+	* elf32-s390.c (elf_s390_gc_mark_hook): Likewise.
+	* elf32-sh.c (sh_elf_gc_mark_hook): Likewise.
+	* elf32-sparc.c (elf32_sparc_gc_mark_hook): Likewise.
+	* elf32-v850.c (v850_elf_gc_mark_hook): Likewise.
+	* elf32-xstormy16.c (xstormy16_elf_gc_mark_hook): Likewise.
+	* elf64-mips.c (mips_elf64_gc_mark_hook): Likewise.
+	* elf64-mmix.c (mmix_elf_gc_mark_hook): Likewise.
+	* elf64-ppc.c (ppc64_elf_gc_mark_hook): Likewise.
+	* elf64-s390.c (elf_s390_gc_mark_hook): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_gc_mark_hook): Likewise.
+
+2001-12-17  Alan Modra  <amodra@bigpond.net.au>
+
+	Hash bfd sections for fast lookup and create.
+	* bfd.c (struct _bfd): Add section_htab, section_tail.
+	* libbfd-in.h (_bfd_delete_bfd): Declare.
+	(bfd_section_hash_newfunc): Declare.
+	* opncls.c (_bfd_new_bfd): Free memory on failure.  Init
+	section_htab and section_tail.
+	(_bfd_delete_bfd): New function.
+	(bfd_openr): Use it.
+	(bfd_fdopenr): Likewise.
+	(bfd_openstreamr): Likewise.
+	(bfd_openw): Likewise.
+	(bfd_close): Likewise.
+	(bfd_close_all_done): Likewise.
+	(bfd_release): Comment.
+	* section.c (struct section_hash_entry): New.
+	(bfd_section_hash_newfunc): New function.
+	(section_hash_lookup): Define.
+	(bfd_section_init): New function, split out from
+	bfd_make_section_anyway.
+	(bfd_get_section_by_name): Lookup via hash table.
+	(bfd_get_unique_section_name): Likewise.
+	(bfd_make_section_old_way): Rewrite to use hash table.
+	(bfd_make_section_anyway): Likewise.
+	(bfd_make_section): Likewise.  Return NULL for attempts to make
+	BFD_{ABS,COM,UND,IND}_SECTION_NAME.
+	(_bfd_strip_section_from_output): Adjust section_tail if needed.
+	* configure.in: Bump bfd version.
+	* configure: Regenerate.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2001-12-15  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elf64-mips.c (mips_elf64_link_hash_entry): New link hash.
+	(mips_elf64_high): New Function.
+	(mips_elf64_higher): Likewise.
+	(mips_elf64_highest): Likewise.
+	(mips_elf64_info_to_howto_rel): Likewise.
+	(mips_elf64_info_to_howto_rela): Likewise.
+	(mips_elf64_write_rel): Likewise.
+	(mips_elf64_write_rela): Likewise.
+	(mips_elf64_link_hash_newfunc): Likewise.
+	(mips_elf64_hi16_reloc): Likewise.
+	(mips_elf64_higher_reloc): Likewise.
+	(mips_elf64_highest_reloc): Likewise.
+	(mips_elf64_gprel16_reloc): Likewise.
+	(mips_elf64_gprel16_reloca): Likewise.
+	(mips_elf64_literal_reloc): Likewise.
+	(mips_elf64_gprel32_reloc): Likewise.
+	(mips_elf64_shift6_reloc): Likewise.
+	(mips_elf64_got16_reloc): Likewise.
+	(mips_elf64_assign_gp): Likewise.
+	(mips_elf64_final_gp): Likewise.
+	(gprel16_with_gp): Likewise.
+	(mips_elf64_additional_program_headers): Likewise.
+	(mips_elf64_link_hash_table_create): Likewise.
+	(mips_elf64_got_offset_from_index): Likewise.
+	(_mips_elf64_got_info): Likewise.
+	(mips_elf64_sign_extend): Likewise.
+	(mips_elf64_overflow_p): Likewise.
+	(mips_elf64_global_got_index): Likewise.
+	(mips_elf64_sort_hash_table_f): Likewise.
+	(mips_elf64_sort_hash_table): Likewise.
+	(mips_elf64_swap_msym_out): Likewise.
+	(mips_elf64_create_local_got_entry): Likewise.
+	(mips_elf64_local_got_index): Likewise.
+	(mips_elf64_got_page): Likewise.
+	(mips_elf64_got16_entry): Likewise.
+	(mips_elf64_local_relocation_p): Likewise.
+	(mips_elf64_next_relocation): Likewise.
+	(mips_elf64_create_dynamic_relocation): Likewise.
+	(mips_elf64_calculate_relocation): Likewise.
+	(mips_elf64_obtain_contents): Likewise.
+	(mips_elf64_perform_relocation): Likewise.
+	(mips_elf64_relocate_section): Likewise.
+	(mips_elf64_create_dynamic_sections): Likewise.
+	(mips_elf64_adjust_dynamic_symbol): Likewise.
+	(mips_elf64_always_size_sections): Likewise.
+	(mips_elf64_size_dynamic_sections): Likewise.
+	(mips_elf64_finish_dynamic_symbol): Likewise.
+	(mips_elf64_finish_dynamic_sections): Likewise.
+	(mips_elf64_gc_mark_hook): Likewise.
+	(mips_elf64_gc_sweep_hook): Likewise.
+	(mips_elf64_create_got_section): Likewise.
+	(mips_elf64_record_global_got_symbol): Likewise.
+	(mips_elf64_create_msym_section): Likewise.
+	(mips_elf64_allocate_dynamic_relocations): Likewise.
+	(mips_elf64_check_relocs): Likewise.
+	(mips_elf64_output_extsym): Likewise.
+	(mips_elf64_swap_gptab_in): Likewise.
+	(mips_elf64_swap_gptab_out): Likewise.
+	(gptab_compare): Likewise.
+	(mips_elf64_final_link): Likewise.
+	(prev_reloc_addend): Remenber addend of previous parts of a combined
+	reloc.
+	(ELF_MIPS_GP_OFFSET): New define.
+	(STUB_LW,STUB_MOVE,STUB_JALR,STUB_LI16): Likewise.
+	(MIPS_FUNCTION_STUB_SIZE): Likewise.
+	(mips_elf64_howto_rel): Fix HOWTO defines.
+	(mips_elf64_howto_rela): Likewise.
+	(mips_elf64_swap_reloca_out): Fix signedness.
+	(mips_elf64_be_swap_reloc_in): Use ELF64* instead of ELF32*.
+	(mips_elf64_be_swap_reloca_in): Likewise.
+	(mips_elf64_be_swap_reloc_out): Likewise. Preserve extended type info.
+	(mips_elf64_be_swap_reloca_out): Likewise.
+
+2001-12-15  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf-bfd.h (_bfd_elf_maybe_strip_eh_frame_hdr): New prototype.
+	* elf-eh-frame.c (struct eh_frame_hdr_info): Add strip.
+	(_bfd_elf_discard_section_eh_frame): Don't create .eh_frame_hdr
+	sec_info here.  Free ehbuf.
+	(_bfd_elf_discard_section_eh_frame_hdr): Don't size the section
+	if hdr_info->strip.
+	(_bfd_elf_maybe_strip_eh_frame_hdr): New.
+	* elflink.h (size_dynamic_sections): Call it.
+
+2001-12-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_bfd_discard_info): Fix segfault when dynobj NULL.
+
+2001-12-13  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf-bfd.h (enum elf_link_info_type): New.
+	(struct bfd_elf_section_data): Remove stab_info and merge_info
+	fields, add sec_info and sec_info_type.
+	(struct elf_obj_tdata): Add eh_frame_hdr field.
+	(_bfd_elf_discard_section_eh_frame): New prototype.
+	(_bfd_elf_discard_section_eh_frame_hdr): Likewise.
+	(_bfd_elf_eh_frame_section_offset): Likewise.
+	(_bfd_elf_write_section_eh_frame): Likewise.
+	(_bfd_elf_write_section_eh_frame_hdr): Likewise.
+	* Makefile.am (BFD32_BACKENDS): Add elf-eh-frame.lo.
+	(BFD32_BACKENDS_CFILES): Add elf-eh-frame.c.
+	(elf-eh-frame.lo): New.
+	* Makefile.in: Rebuilt.
+	* configure.in (elf): Add elf-eh-frame.lo.
+	* configure: Rebuilt.
+	* elf.c (_bfd_elf_print_private_bfd_data): Support PT_GNU_EH_FRAME.
+	(map_sections_to_segments): Create PT_GNU_EH_FRAME if requested.
+	(get_program_header_size): Take into account PT_GNU_EH_FRAME
+	segment.
+	(_bfd_elf_rela_local_sym): Use sec_info_type and sec_info.
+	(_bfd_elf_rel_local_sym): Likewise.
+	(_bfd_elf_section_offset): Likewise.  Call
+	_bfd_elf_eh_frame_section_offset too.
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Use sec_info_type and
+	sec_info.
+	* elf64-alpha.c (elf64_alpha_relocate_section): Likewise.
+	* elf-eh-frame.c: New file.
+	* elflink.h (elf_link_add_object_symbols): Don't optimize SHF_MERGE
+	.stab sections.  Set sec_info_type, use sec_info instead
+	of merge_info and stab_info.
+	(elf_link_create_dynamic_sections): Create .eh_frame_hdr section
+	if --eh-frame-hdr.
+	(elf_bfd_final_link): Write .eh_frame_hdr section.
+	(elf_link_sec_merge_syms): Use sec_info_type and sec_info.
+	(elf_link_input_bfd): Likewise.
+	Call _bfd_elf_write_section_eh_frame to write .eh_frame sections.
+	(elf_bfd_discard_info): Add output_bfd argument.
+	Call _bfd_elf_discard_section_eh_frame and
+	_bfd_elf_discard_section_eh_frame_hdr.
+	(elf_section_ignore_discarded_relocs): Use sec_info_type, not section
+	names.
+	* bfd-in.h (bfd_elf32_discard_info, bfd_elf64_discard_info): Adjust
+	prototypes.
+	* bfd-in2.h (bfd_elf32_discard_info, bfd_elf64_discard_info): Likewise.
+
+2001-12-12  Richard Henderson  <rth@redhat.com>
+
+	* syms.c (_bfd_generic_read_minisymbols): Early return for
+	no symbols.  Patch from FreeBSD folk; exact origin unknown.
+
+2001-12-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* elfcode.h (elf_swap_ehdr_out): Adjust value written for e_shnum
+	and e_shstrndx if out of range.
+	(elf_object_p): Read extended values for e_shnum and e_shstrndx
+	from the first section header.  Allocate space in elf_elfsections
+	for reserved sections and set to NULLs.
+	(elf_write_shdrs_and_ehdr): Set overflow fields in first section
+	header.  Skip reserved sections in elf_elfsections.  Remove
+	duplicate size calculation.
+
+2001-12-07  Geoffrey Keating  <geoffk@redhat.com>
+	    Richard Henderson  <rth@redhat.com>
+	    Corinna Vinschen  <vinschen@redhat.com>
+
+	* Makefile.am: Add support for xstormy16.
+	* archures.c: Add support for xstormy16.
+	* config.bfd: Add support for xstormy16.
+	* configure.in: Add support for xstormy16.
+	* reloc.c: Add support for xstormy16.
+	* targets.c: Add support for xstormy16.
+	* cpu-xstormy16.c: New file.
+	* elf32-xstormy16.c: New file.
+	* Makefile.in: Regenerated.
+	* bfd-in2.h: Regenerated.
+	* configure: Regenerated.
+	* libbfd.h: Regenerated.
+
+2001-12-07  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elf.c (assign_file_positions_for_segments): Combine sentance
+	fragments into a single sentance in order to permit better
+	translation into foreign languages.
+
+2001-12-07  Jim Blandy  <jimb@redhat.com>
+
+	* elf32-s390.c (elf32_s390_grok_prstatus): New function.
+	(elf_backend_grok_prstatus): Define.
+
+2001-12-07  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-sparc.c (elf32_sparc_relocate_section): Revert
+	2001-09-14 change.
+
+2001-12-07  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf.c (_bfd_elf_rela_local_sym): Only call
+	_bfd_merged_section_offset if merge_info is non-NULL.
+	(_bfd_elf_rel_local_sym, _bfd_elf_section_offset): New.
+	* elf-bfd.h (_bfd_elf_rel_local_sym, _bfd_elf_section_offset): New
+	prototypes.
+	* elf32-arm.h (elf32_arm_final_link_relocate): Use
+	_bfd_elf_section_offset.
+	(elf32_arm_relocate_section): Use _bfd_elf_rel_local_sym.
+	* elf32-i386.c (elf_i386_relocate_section): Use
+	_bfd_elf_section_offset and _bfd_elf_rel_local_sym.
+	* elf32-sh.c (sh_elf_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Use
+	_bfd_elf_section_offset.
+	* elf32-cris.c (cris_elf_relocate_section): Likewise.
+	* elf32-hppa.c (elf32_hppa_relocate_section): Likewise.
+	* elf32-i370.c (i370_elf_relocate_section): Likewise.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-mips.c (mips_elf_create_dynamic_relocation): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	* elf32-s390.c (elf_s390_relocate_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relocate_section): Likewise.
+	* elf64-ppc.c (ppc64_elf_relocate_section): Likewise.
+	* elf64-s390.c (elf_s390_relocate_section): Likewise.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_install_dyn_reloc): Likewise.
+
+2001-12-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-hppa.c (clobber_millicode_symbols): Don't do anything if
+	already forced local.
+
+2001-12-05  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elf32-arm.h (elf32_arm_merge_private_bfd_data): Combine
+	fragmented sentence parts into a whole sentence to permit
+	better translation into foreign languages.
+
+2001-12-06  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
+2001-12-05  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* Makefile.am: split up BFD_LIBS like statements in BFD32_LIBS and
+	BFD64_LIBS, make the latter depending on the availability of BFD64.
+	Add archive64.c source file.
+	* archive64.c: New file implementing bfd_elf64_archive_slurp_armap
+	and bfd_elf64_archive_write_armap, code from elf64-mips.c
+	* archive.c (bfd_slurp_armap): Add ELF64 archive support.
+	* config.bfd (mips*-*-irix6*): Allow with BFD64 only.
+	(mips64*el-*-linux*): Likewise.
+	(mips*el-*-linux*): Likewise. Reorder entries.
+	* configure.in (bfd_libs): Define in dependency of BFD64 and
+	AC_SUBST it.
+	* elf64-mips.c (mips_elf64_slurp_armap): Remove, use
+	bfd_elf64_archive_slurp_armap instead.
+	(mips_elf64_write_armap): Remove, use bfd_elf64_archive_write_armap
+	instead.
+
+2001-12-04  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* config.bfd: Remove trailing blanks.
+	* elf32-mips.c (gprel16_with_gp): Remove superfluous casts.
+
+2001-12-04  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-d10v.c (elf_d10v_howto_table): Adjust bit-size of
+	R_D10V_10_PCREL_L, R_D10V_10_PCREL_R, R_D10V_18,
+	R_D10V_18_PCREL.  Check 10_PCREL relocations as signed.
+	Disable pointless overflow checking of NONE and 32.
+
+2001-12-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* reloc.c (bfd_install_relocation): Correct reloc address test.
+	(bfd_perform_relocation): Formatting fix.
+	* bfd-in2.h: Regenerate for 2001-12-02 reloc.c change.
+
+2001-12-03  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* configure.in (LINGUAS): Add tr.
+	* configure: Regenerate.
+	* po/tr.po: Import from translation project's web site.
+
+2001-12-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-hppa.c (hppa_get_stub_entry): Remove debug message that
+	happens to trigger on undefined symbols.
+	(final_link_relocate): Return bfd_reloc_undefined for undefined
+	stubs.
+	(elf32_hppa_relocate_section): Don't say we can't handle a reloc
+	if we have already warned about an undefined symbol.
+
+2001-12-02  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elf32-mips.c (NEWABI_P): New define.
+	(USE_REL): Remove, replaced by
+	(elf_backend_may_use_rel_p): New define.
+	(elf_backend_may_use_rela_p): Likewise.
+	(elf_backend_default_use_rela_p): Likewise.
+	(elf_mips_howto_table): Rename to elf_mips_howto_table_rel.
+	Fix some relocation definitions.
+	(elf_mips_howto_table_rela): New RELA relocation definitions for
+	NewABI support.
+	(mips32_64bit_reloc): Use the renamed elf_mips_howto_table_rel.
+	(bfd_elf32_bfd_reloc_type_lookup): Likewise.
+	(mips_rtype_to_howto): Likewise.
+	(_bfd_mips_elf_relocate_section): Likewise.
+	(_bfd_mips_elf_object_p): Typo.
+	(elf_backend_sign_extend_vma): Reordered together with many other
+	defines nearby to resemble the order of declaration in the header
+	file.
+
+2001-12-02  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* coff-mips.c (mips_bfd_reloc_type_lookup): Replace
+	BFD_RELOC_MIPS_GPREL by BFD_RELOC_GPREL16.
+	* pe-mips.c (mips_bfd_reloc_type_lookup): Likewise.
+	* elf32-mips.c (mips_reloc_map): Likewise. Replace
+	BFD_RELOC_MIPS_GPREL32 by BFD_RELOC_GPREL32.
+	* elf64-mips.c (mips_reloc_map): Likewise.
+	* reloc.c (BFD_RELOC_MIPS_GPREL): Remove.
+	(BFD_RELOC_MIPS_GPREL32): Remove.
+
+2001-11-30  H.J. Lu <hjl@gnu.org>
+
+	* elflink.h (elf_add_default_symbol): New.
+	(elf_link_add_object_symbols): Call elf_add_default_symbol ()
+	to create an indirect symbol from the default for the symbol
+	with the default version if needed.
+
+2001-11-29  "Peter.Schauer" <Peter.Schauer@regent.e-technik.tu-muenchen.de>
+
+	* elf.c (elfcore_grok_prstatus): Do not overwite the core signal
+	if it has already been set by another thread.
+
+2001-11-28  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf64-alpha.c (ALPHA_ELF_GOT_ENTRY_RELOCS_XLATED): Defined.
+	(elf64_alpha_relocate_section): Translate local_got_entries
+	for STT_SECTION symbol to SHF_MERGE section the first time
+	we see it.
+	* elfxx-ia64.c (struct elfNN_ia64_local_hash_entry): Add
+	sec_merge_done.
+	(get_local_sym_hash): New, extracted from get_dyn_sym_info.
+	(get_dyn_sym_info): Use it.
+	(elfNN_ia64_relocate_section): Translate local dyn entries
+	for STT_SECTION symbol to SHF_MERGE section the first time
+	we see it.
+
+2001-11-27  H.J. Lu <hjl@gnu.org>
+
+	* elflink.h (elf_bfd_discard_info): Skip if the input bfd isn't
+	ELF.
+
+2001-11-26  Jeffrey A Law  (law@cygnus.com)
+
+	* stabs.c (_bfd_discard_section_stabs): Use PARAMS in function
+	prototypes.
+
+2001-11-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-hppa.c (elf32_hppa_size_stubs): Decrease default stub
+	group sizes to accommodate c++.
+
+2001-11-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-sparc.c (elf32_sparc_relocate_section): Don't clear
+	relocations in non-alloced sections against global symbols
+	defined in shared library being built.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+
+2001-11-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf.c (_bfd_elf_rela_local_sym): New.
+	* elflink.h (elf_link_input_bfd): Don't consider empty
+	merged sections as removed in relocation tests.
+	* elf-bfd.h (_bfd_elf_rela_local_sym): Add prototype.
+	* elf32-i386.c (elf_i386_relocate_section): Handle relocs
+	against STT_SECTION symbol of SHF_MERGE section.
+	* elf32-arm.h (elf32_arm_relocate_section): Likewise.
+	* elf32-avr.c (elf32_avr_relocate_section): Call
+	_bfd_elf_rela_local_sym.
+	* elf32-cris.c (cris_elf_relocate_section): Likewise.
+	* elf32-d10v.c (elf32_d10v_relocate_section): Likewise.
+	* elf32-fr30.c (fr30_final_link_relocate): Likewise.
+	* elf32-h8300.c (elf32_h8_relocate_section): Likewise.
+	* elf32-hppa.c (elf32_hppa_relocate_section): Likewise.
+	* elf32-i370.c (i370_elf_relocate_section): Likewise.
+	* elf32-i860.c (elf32_i860_relocate_section): Likewise.
+	* elf32-m32r.c (m32r_elf_relocate_section): Likewise.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-mcore.c (mcore_elf_relocate_section): Likewise.
+	* elf32-openrisc.c (openrisc_elf_relocate_section): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	* elf32-s390.c (elf_s390_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+	* elf32-v850.c (v850_elf_relocate_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relocate_section): Likewise.
+	* elf64-mmix.c (mmix_elf_relocate_section): Likewise.
+	* elf64-ppc.c (ppc64_elf_relocate_section): Likewise.
+	* elf64-s390.c (elf_s390_relocate_section): Likewise.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+	* elf-hppa.h (elf_hppa_relocate_section): Likewise.
+	* elf-m10200.c (mn10200_elf_relocate_section): Likewise.
+	* elf-m10300.c (mn10300_elf_relocate_section): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Likewise.
+	* elf32-sh.c (sh_elf_relocate_section): Likewise for
+	!partial_inplace relocs. Handle relocs against STT_SECTION
+	symbol of SHF_MERGE for partial_inplace relocs.
+
+2001-11-21  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* po/Make-in (distclean): Move SRC-POTFILES.in and
+	BLD-POTFILES.in to maintainer-clean target.
+
+2001-11-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Test r_symndx rather
+	than sym_sec->output_section to detect relocs against discarded
+	sections.
+
+2001-11-19  H.J. Lu  <hjl@gnu.org>
+
+	* elflink.h (elf_link_input_bfd): Assert r_symndx != 0 when
+	discarding relocations.
+
+2001-11-19  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* section.c (bfd_is_const_section): New macro.  Return true if the
+	given seciton is one of the special, constant, sections.
+	* bfd-in2.h: Regenerate.
+	* coffgen.c (coff_count_linenumbers): Use bfd_is_const_section.
+	(coff_write_native_symbol): Use bfd_is_const_section.
+
+2001-11-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-hppa.c (clobber_millicode_symbols): Dec dynstr refcount.
+
+	* elf32-hppa.c (elf32_hppa_size_stubs): Don't consider undefined
+	millicode syms as candidates for import stubs.
+
+	* elf32-hppa.c (PLABEL_PLT_ENTRY_SIZE): Delete.
+	(allocate_PIC_calls): Rename to allocate_plt_static.
+	(allocate_dynrelocs): Move most of code handling .plt entries to..
+	(allocate_plt_static): ..here.  Don't drop plabel entries.
+
+2001-11-19  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* mmo.c: Adjust documentation tags to use texinfo 4 features.
+
+2001-11-16  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* section.c (bfd_is_const_section): New macro.  Return true if the
+	section pointer refers to one of the special, constant sections.
+	* bfd-in2.h: Regenerate.
+
+	* coffgen.c (coff_count_linenumbers): Only update the line number
+	count in non-special sections.
+	(coff_write_native_symbol): Only update the line number file
+	position in non-special sections.
+
+2001-11-15  Daniel Jacobowitz  <drow@mvista.com>
+
+	* elflink.h (elf_reloc_symbol_deleted_p): Catch all relocs against
+	local syms from discarded sections.  Update comment.
+
+2001-11-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* po/SRC-POTFILES.in: Regenerate.
+
+	* elflink.h (elf_link_input_bfd): Complain about all relocs
+	against local syms from discarded sections.  K&R fixes.
+	(elf_reloc_symbol_deleted_p): Don't try to swap in external syms.
+	K&R fixes.
+
+2001-11-15  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf64-sparc.c (sparc64_elf_relocate_section): Disregard
+	overflows in the .stab section.
+
+2001-11-14  Daniel Jacobowitz  <drow@mvista.com>
+
+	* bfd-in.h (bfd_elf32_discard_info): Add prototype.
+	(bfd_elf64_discard_info): Likewise.
+	* bfd-in2.h: Regenerate.
+	* elf-bfd.h (struct elf_reloc_cookie): New.
+	(struct elf_backend_data): Add elf_backend_discard_info,
+	elf_backend_ignore_discarded_relocs, and elf_backend_write_section.
+	(_bfd_elf32_reloc_symbol_deleted_p): Add prototype.
+	(_bfd_elf64_reloc_symbol_deleted_p): Likewise.
+	* elf32-mips.c (_bfd_elf32_mips_discard_info): New.
+	(_bfd_elf32_mips_ignore_discarded_relocs): New.
+	(_bfd_elf32_mips_write_section): New.
+	(elf_backend_discard_info): Define.
+	(elf_backend_ignore_discarded_relocs): Define.
+	(elf_backend_write_section): Define.
+	* elfcode.h (elf_bfd_discard_info): Define.
+	(elf_reloc_symbol_deleted_p): Define.
+	* elflink.h (elf_link_input_bfd): Check
+	elf_section_ignore_discarded_relocs.  Call
+	bed->elf_backend_write_section if available.
+	(elf_reloc_symbol_deleted_p): New.
+	(elf_bfd_discard_info): New.
+	(elf_section_ignore_discarded_relocs): New.
+	* elfxx-target.h (elf_backend_discard_info): Define.
+	(elf_backend_ignore_discarded_relocs): Define.
+	(elf_backend_write_section): Define.
+	(elfNN_bed): Add elf_backend_discard_info,
+	elf_backend_ignore_discarded_relocs, and
+	elf_backend_write_section.
+	* libbfd-in.h (_bfd_discard_section_stabs): Add prototype.
+	* libbfd.h: Regenerate.
+	* stabs.c (_bfd_discard_section_stabs): New.
+
+2001-11-14  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* elf32-s390.c (elf_s390_relocate_section): Use the "unresolved_reloc"
+	scheme to get rid of an ugly complicated test.
+	* elf64-s390.c (elf_s390_relocate_section): Likewise.
+
+2001-11-14  Andreas Jaeger  <aj@suse.de>
+
+	* cpu-i386.c (bfd_x86_64_arch_intel_syntax,bfd_x86_64_arch): Use
+	x86-64 for display.
+
+2001-11-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf2.c (struct line_head) [total_length]: Change type to
+	bfd_vma.
+	(struct dwarf2_debug): Add dwarf_str_buffer and dwarf_str_size.
+	(struct comp_unit): Add stash and offset_size.
+	(read_8_bytes): Return bfd_vma.
+	(read_indirect_string): New.
+	(read_attribute): Handle DW_FORM_strp.
+	(decode_line_info): Support 64-bit DWARF format.
+	(_bfd_dwarf2_find_nearest_line): Likewise.
+	(parse_comp_unit): Set offset_size and stash.
+
+2001-11-13  Keith Walker <keith.walker@arm.com>
+
+	* dwarf2.c (read_attribute_value): New function to handle
+	DW_FORM_indirect.
+	(read_attribute): Use it.
+
+2001-11-13  Geoffrey Keating  <geoffk@redhat.com>
+
+	* dwarf2.c (decode_line_info): Properly deal with unknown standard
+	opcodes.
+
+2001-11-13  John Marshall  <jmarshall@acm.org>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* section.c (bfd_make_section_anyway): Don't increment section_id
+	and the BFD's section_count if adding the section failed.
+	* vms.c (vms_new_section_hook): Adjust for bfd_make_section_anyway
+	change.
+
+2001-11-12  Orjan Friberg  <orjanf@axis.com>
+
+	* elf32-cris.c (cris_elf_grok_prstatus): Adjust values to match new
+	core dump format.
+
+2001-11-11  H.J. Lu <hjl@gnu.org>
+
+	* elf32-mips.c (_bfd_mips_elf_finish_dynamic_sections): Call
+	_bfd_elf_strtab_size instead of _bfd_stringtab_size.
+
+	* elf64-sparc.c (sparc64_elf_size_dynamic_sections): Change
+	dynstr type to `struct elf_strtab_hash *'.
+
+2001-11-11  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* elf-strtab.c (_bfd_elf_strtab_finalize): Make first variable i
+	size_t.  Rename second i to j.
+
+2001-11-10  Jeffrey A Law  (law@cygnus.com)
+
+	* binary.c: Include safe-ctype.h after bfd.h and sysdep.h.
+
+2001-11-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-arm.h (elf32_arm_final_link_relocate): Don't copy STN_UNDEF
+	relocs into shared libs.
+	* elf32-cris.c (cris_elf_relocate_section): Likewise.
+	* elf32-i370.c (i370_elf_relocate_section): Likewise.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-mips.c (mips_elf_calculate_relocation): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	* elf32-sh.c (sh_elf_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relocate_section): Likewise.
+	* elf64-s390.c (elf_s390_relocate_section): Likewise.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Likewise.
+
+	* elf.c (bfd_section_from_r_symndx): New function.
+	* elf-bfd.h (LOCAL_SYM_CACHE_SIZE): Define.
+	(struct sym_sec_cache): New.
+	(bfd_section_from_r_symndx): Declare.
+	(struct bfd_elf_section_data): Change local_dynrel type to PTR.
+	* elflink.h (elf_link_input_bfd): Don't test for removed linkonce
+	relocs when relocatable.  Don't	zero entire reloc, just zero the
+	addend and sym.
+	* elf32-hppa.c (struct elf32_hppa_link_hash_table): Add sym_sec.
+	(elf32_hppa_link_hash_table_create): Init it.
+	(elf32_hppa_check_relocs): Track dynamic relocs needed for local
+	syms on a per-section basis as we do for globals.
+	(elf32_hppa_gc_sweep_hook): Update for local_dynrel change.
+	(allocate_dynrelocs): Warning fix.
+	(elf32_hppa_size_dynamic_sections): Don't allocate relocs when
+	section has been discarded.
+	(elf32_hppa_relocate_section): Don't copy STN_UNDEF relocs
+	into shared libs.
+	* elf32-i386.c (struct elf_i386_link_hash_table): Add sym_sec.
+	(elf_i386_link_hash_table_create): Init it.
+	(elf_i386_check_relocs): Track dynamic relocs needed for local
+	syms on a per-section basis as we do for globals.
+	(elf_i386_gc_sweep_hook): Update for local_dynrel change.
+	Remove dead code.
+	(allocate_dynrelocs): Warning fix.
+	(elf_i386_size_dynamic_sections): Don't allocate relocs when
+	section has been discarded.
+	(elf_i386_relocate_section): Don't copy STN_UNDEF relocs
+	into shared libs.
+	* elf32-s390.c (struct elf_s390_link_hash_table): Add sym_sec.
+	(elf_s390_link_hash_table_create): Init it.
+	(elf_s390_check_relocs): Track dynamic relocs needed for local
+	syms on a per-section basis as we do for globals.
+	(elf_s390_gc_sweep_hook): Update for local_dynrel change.
+	Remove dead code.
+	(allocate_dynrelocs): Warning fix.
+	(elf_s390_size_dynamic_sections): Don't allocate relocs when
+	section has been discarded.
+	(elf_s390_relocate_section): Don't copy STN_UNDEF relocs
+	into shared libs.
+	* elf64-ppc.c (struct ppc_link_hash_table): Add sym_sec.
+	(ppc64_link_hash_table_create): Init it.
+	(ppc64_elf_check_relocs): Track dynamic relocs needed for local
+	syms on a per-section basis as we do for globals.
+	(ppc64_elf_gc_sweep_hook): Update for local_dynrel change.
+	(allocate_dynrelocs): Call the correct record_dynamic_dymbol
+	function.  Warning fix.
+	(ppc64_elf_size_dynamic_sections): Don't allocate relocs when
+	section has been discarded.
+	(ppc64_elf_relocate_section): Don't copy STN_UNDEF relocs
+	into shared libs.
+	* elf64-s390.c (struct elf_s390_link_hash_table): Add sym_sec.
+	(elf_s390_link_hash_table_create): Init it.
+	(elf_s390_check_relocs): Track dynamic relocs needed for local
+	syms on a per-section basis as we do for globals.
+	(elf_s390_gc_sweep_hook): Update for local_dynrel change.
+	Remove dead code.
+	(allocate_dynrelocs): Warning fix.
+	(elf_s390_size_dynamic_sections): Don't allocate relocs when
+	section has been discarded.
+	(elf_s390_relocate_section): Don't copy STN_UNDEF relocs
+	into shared libs.
+
+2001-11-08  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* elf32-s390: Major rework that introduces all recent changes to
+	the s390 backends.  Get a closer match to elf32-i386.
+	(elf_s390_relocate_section): Make use of dynamic section short-cuts.
+	Localise vars, and delay setting.  Better error reporting, replace
+	BFD_ASSERT with abort.  Check ELF_LINK_HASH_DEF_DYNAMIC to see if a
+	symbol is not defined in the regular object file and tread the weak
+	definition as the normal one.  Don't discard relocs for undefweak or
+	undefined symbols and check !DEF_REGULAR as well as DEF_DYNAMIC in
+	test for avoided copy relocs.  Reinstate fudge for unresolved relocs
+	in debugging sections.
+	(elf32_s390_adjust_dynamic_symbol): Handle nocopyreloc.  Don't do copy
+	reloc processing for weakdefs.  Remove redundant casts and aborts.
+	Delay setting of vars until needed.  Move creation of dynamic symbols
+	and allocation of .plt and .rela.plt to allocate_dynrelocs.  Replace
+	BFD_ASSERT with abort.  Discard .plt entries for everything with
+	plt.refcount <= 0.
+	(elf_s390_check_relocs):  Don't allocate space for dynamic relocs,
+	.got or .relgot here but do it in allocate_dynrelocs.  Reference count
+	possible .plt and .got entries.  Don't test input section SEC_READONLY
+	here to try to avoid copy relocs, and keep dyn_relocs regardless of
+	ELF_LINK_NON_GOT_REF.  Don't set DF_TEXTREL here.  Delay setting of
+	variables until needed.  Remove separate switch stmt for creating .got
+	section.  Initialise local_got_refcounts to 0.  Cache pointer to
+	"sreloc" section in elf_section_data. Tweak condition under which .got
+	created.  Report files with bad relocation section names.
+	(elf_s390_finish_dynamic_symbol): Don't copy relocs for symbols that
+	have been forced local.  Use same test to decide if we can use a
+	relative reloc for got as elf_s390_relocate_section.  Expand SHN_UNDEF
+	comment.  Move expressions out of function calls.  Replace BFD_ASSERT
+	with abort.
+	(elf_s390_finish_dynamic_sections): Migrate common code out of switch
+	statement.  Replace BFD_ASSERT with abort.
+	(elf_s390_size_dynamic_sections): Call readonly_dynrelocs. Rename "i"
+	to "ibfd".  Allocate space for local dyn relocs.  Use DF_TEXTREL flag
+	instead of looking up section names for DT_TEXTREL.  Replace
+	BFD_ASSERT with abort.  Zero out the dynamic allocated content space.
+	Add a comment to remind us that one day this ought to be fixed.
+	(struct elf_s390_link_hash_entry): Rename "root" to "elf".
+	(struct elf_s390_link_hash_table): Likewise.
+	(elf_s390_link_hash_newfunc): Rename to link_hash_newfunc and get
+	rid of unnecessary casts.
+	(struct elf_s390_dyn_relocs): Add "sec", and "pc_count" fields.
+	Remove "section" field.
+	(elf_s390_gc_sweep_hook): Sweep dyn_relocs and local_dynrel.
+	Reference count possible .plt entries.  Don't deallocate .got and
+	.relgot space here.
+	(struct elf_s390_pcrel_relocs_copied): Rename to elf_s390_dyn_relocs.
+	Update comment.
+	(struct elf_s390_link_hash_entry): Rename pcrel_relocs_copied to
+	dyn_relocs.
+	(elf_s390_discard_copies):  Delete.
+	(elf_s390_link_hash_traverse): Delete.
+	(bfd_elf32_bfd_final_link): Delete.  (ie. use regular final link
+	rather than gc variety).
+	(struct elf_s390_link_hash_table): Add sgot, sgotplt, srelgot, splt,
+	srelplt, sdynbss, srelbss fields.
+	(elf_s390_link_hash_table_create): Init them.
+	(WILL_CALL_FINISH_DYNAMIC_SYMBOL): Define.
+	(allocate_dynrelocs): New function.
+	(create_got_section): New function.
+	(elf_backend_can_refcount): Define.
+	(elf_backend_copy_indirect_symbol): Define.
+	(elf_s390_copy_indirect_symbol): New function.
+	(elf_s390_create_dynamic_sections): New function.
+	(readonly_dynrelocs): New function.
+	* elf64-s390.c: Likewise.
+
+2001-11-07  Jakub Jelinek  <jakub@redhat.com>
+
+	* Makefile.am (BFD32_BACKENDS): Add elf-strtab.lo.
+	(BFD32_BACKENDS_CFILES): Add elf-strtab.c.
+	(elf-strtab.lo): Add rule.
+	* Makefile.in: Rebuilt.
+	* configure.in (elf): Add elf-strtab.lo.
+	* configure: Rebuilt.
+	* elf-bfd.h (elf_strtab_hash): Forward declare.
+	(struct elf_link_hash_table): Change dynstr type to
+	struct elf_strtab_hash *.
+	(struct elf_obj_tdata): Change strtab_ptr type to
+	struct elf_strtab_hash *.
+	(_bfd_elf_strtab_init, _bfd_elf_strtab_free, _bfd_elf_strtab_add,
+	_bfd_elf_strtab_addref, _bfd_elf_strtab_delref,
+	_bfd_elf_strtab_clear_all_refs, _bfd_elf_strtab_size,
+	_bfd_elf_strtab_offset, _bfd_elf_strtab_emit,
+	_bfd_elf_strtab_finalize): New prototypes.
+	* elf-strtab.c: New file.
+	* elflink.h (elf_link_add_object_symbols): Use _bfd_elf_strtab_add
+	and _bfd_elf_strtab_size instead of _bfd_stringtab calls.
+	Call _bfd_elf_strtab_delref if DT_NEEDED entry is not needed or
+	when forcing dynamic symbol to local.
+	(elf_link_create_dynamic_sections): Call
+	_bfd_elf_strtab_init instead of elf_stringtab_init.
+	(elf_link_record_local_dynamic_symbol): Likewise, change
+	dynstr type.  Use _bfd_elf_strtab functions instead of
+	_bfd_stringtab calls.
+	(size_dynamic_sections): Use _bfd_elf_strtab functions instead of
+	_bfd_stringtab calls.  For DT_RUNPATH and Verdaux vda_name fields,
+	call _bfd_elf_strtab_addref.  Call elf_finalize_dynstr.
+	(elf_adjust_dynstr_offsets, elf_finalize_dynstr): New functions.
+	(elf_fix_symbol_flags): Call _bfd_elf_strtab_delref when forcing
+	dynamic symbol to local.
+	(elf_link_assign_sym_version): Likewise.
+	(elf_bfd_final_link): Call _bfd_elf_strtab_emit instead of
+	_bfd_stringtab_emit.
+	* elflink.c (_bfd_elf_link_record_dynamic_symbol): Change dynstr
+	type.  Call _bfd_elf_strtab functions instead of
+	_bfd_stringtab functions.
+	* elf64-sparc.c (sparc64_elf_size_dynamic_sections): Likewise.
+	* elf.c (_bfd_elf_init_reloc_shdr): Likewise.
+	(elf_fake_sections): Likewise.
+	(assign_section_numbers): Call _bfd_elf_strtab_clear_all_refs
+	on shstrtab hash table, call _bfd_elf_strtab_addref on each section
+	name in the output.  Call _bfd_elf_strtab_finalize and
+	use _bfd_elf_strtab_offset to finalize sh_name section header fields.
+	(_bfd_elf_compute_section_file_positions): Use _bfd_elf_strtab_size
+	instead of _bfd_stringtab_size.
+	(prep_headers): Change shstrtab type.
+	Use _bfd_elf_strtab calls instead of _bfd_stringtab calls.
+
+2001-11-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_link_input_bfd <removed linkonce relocs>): Fix
+	bad symtab segfault.  Formatting and warning fixes.  Improve
+	error message for internationalisation.
+
+2001-11-06  H.J. Lu  (hjl@gnu.org)
+
+	* elflink.h (elf_link_input_bfd): Complain about relocs against
+	discarded sections.
+
+2001-11-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* elfxx-target.h (elfNN_bed): Correct want_got_sym, want_dynbss order.
+
+2001-11-02  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-mips.c (mips_elf_calculate_relocation): Don't create
+	dynamic relocation for symbols defined in regular objects when
+	creating executables.
+
+2001-11-02  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* configure.in (ALL_LINGUAS): Add "fr".
+	* configure: Regenerate.
+	* po/fr.po: New file.
+
+	* coffgen.c (coff_object_p): Add comment to H.J.'s recent patch.
+
+2001-11-02  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* som.c (setup_sections): Initialize subspace_sections.
+
+2001-11-02  H.J. Lu  (hjl@gnu.org)
+
+	* coffgen.c (coff_object_p): Return 0 if the header is too big.
+
+2001-11-02  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elfcore.h (elf_core_file_p): Preserve and clear abfd section
+	information.  Save bfd arch and mach values.  Restore on error.
+
+2001-11-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-hppa.c (hppa_handle_PIC_calls): Rename to mark_PIC_calls.
+	(allocate_PIC_calls): New function.
+	(allocate_dynrelocs): Don't allocate pic_call plt entries here.
+	(elf32_hppa_size_dynamic_sections): Call allocate_PIC_calls.
+	(elf32_hppa_finish_dynamic_symbol): Remove dead code.
+
+2001-11-02  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (cris_elf_grok_prstatus): New function.
+	(cris_elf_grok_psinfo): New function.
+	(elf_backend_grok_prstatus): Define.
+	(elf_backend_grok_psinfo): Define.
+
+2001-11-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_relocate_section): Correct branch
+	prediction bits.
+
+2001-10-31  Chris Demetriou  <cgd@demetriou.com>
+
+	* elf32-mips.c (_bfd_mips_elf_hi16_reloc): Handle PC-relative
+	relocations properly.
+
+2001-10-31  H.J. Lu <hjl@gnu.org>
+
+	* elflink.h (elf_link_output_extsym): Don't clear the visibility
+	field for relocateable.
+
+2001-11-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-hppa.c (elf32_hppa_finish_dynamic_sections): Don't count
+	.plt relocs in DT_RELASZ.
+
+2001-10-29  NIIBE Yutaka  <gniibe@m17n.org>
+
+	* config.bfd: Supports sh3/sh4/sh3eb/sh4eb-unknown-linux-gnu
+	targets.
+
+2001-10-31  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* targets.c: Fix typo: bfd_mmo_mmix_vec => bfd_mmo_vec.
+
+2001-10-30  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* Makefile.am (ALL_MACHINES): Add cpu-mmix.lo.
+	(BFD64_BACKENDS): Add elf64-mmix.lo and mmo.lo.
+	(BFD64_BACKENDS_CFILES): Add elf64-mmix.c and mmo.c.
+	Regenerate dependencies.
+	* configure.in (bfd_elf64_mmix_vec, bfd_mmo_vec): New vectors.
+	* config.bfd: [BFD64] (mmix-*-*): New case.
+	* cpu-mmix.c, mmo.c, elf64-mmix.c: New files.
+	* archures.c (enum bfd_architecture): Add bfd_arch_mmix.
+	(bfd_mmix_arch): Declare.
+	(bfd_archures_list): Add bfd_mmix_arch.
+	* targets.c (enum bfd_flavour): Add bfd_target_mmo_flavour.
+	(bfd_elf64_mmix_vec, bfd_mmo_vec): Declare.
+	(bfd_target_vect) [BFD64]: Add bfd_elf64_mmix_vec and
+	bfd_mmo_mmix_vec.
+	* reloc.c: Add MMIX relocations.
+	* bfd.c (struct _bfd, tdata): Add mmo_data.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* configure: Rebuild.
+
+2001-10-30  Richard Earnshaw (rearnsha@arm.com)
+
+	* elf.c (_bfd_elf_make_section_from_shdr): Set the LMA based on the
+	p_paddr of the segment that contains it.
+	(copy_private_bfd_data): If the LMA for a segment is known, use it
+	for matching sections to segments.
+	(assign_file_positions_for_segments): Use the LMA when adjusting
+	for inter-section alignment padding.
+
+2001-10-29  Kazu Hirata  <kazu@hxi.com>
+
+	* README: Fix a typo.
+
+2001-10-24  Richard Henderson  <rth@redhat.com>
+
+	* peXXigen.c (_bfd_XX_print_private_bfd_data_common): Copy
+	timestamp to time_t for ctime.
+
+2001-10-24  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (cris_reloc_type_lookup): Change loop to use
+	unsigned, increasing index.
+
+2001-10-23  H.J. Lu <hjl@gnu.org>
+
+	* elf32-mips.c (_bfd_mips_elf_modify_segment_map): Check
+	m != NULL before accessing it.
+
+2001-10-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_link_input_bfd): Zero the reloc instead of doing
+	bfd_reloc_type_lookup (bfd, BFD_RELOC_NONE) as bfd_reloc_type_lookup
+	doesn't accept BFD_RELOC_* on some targets, eg. hppa.
+
+	* elf32-hppa.c (elf32_hppa_link_hash_entry): Remove plt_abs.
+	(hppa_link_hash_newfunc): Likewise.
+	(elf32_hppa_finish_dynamic_symbol): Likewise.
+	(allocate_dynrelocs): Always allocate .got relocs if shared.
+	(elf32_hppa_relocate_section): Output them too.  Similarly
+	consolidate .plt reloc code, and no longer initialise .plt
+	when a reloc is output.
+	(elf32_hppa_finish_dynamic_symbol): Only initialise .plt entries
+	when no reloc is output.
+
+	From Herbert Xu <herbert@gondor.apana.org.au>
+	* elf32-hppa.c (final_link_relocate): Call bfd_set_error for
+	unreachable branches.
+
+2001-10-22  H.J. Lu <hjl@gnu.org>
+
+	* configure.in (WIN32LIBADD): Use -L../libiberty for
+	mips*-*-linux*.
+	* configure: Rebuild.
+
+2001-10-21  H.J. Lu <hjl@gnu.org>
+
+	* configure.in (WIN32LIBADD): Include -L../libiberty/pic -liberty
+	if shared library is enabled only for Linux hosts.
+	* configure: Rebuild.
+
+2001-10-21  H.J. Lu <hjl@gnu.org>
+
+	* configure.in (WIN32LIBADD): Check if PICFLAG is defined in
+	../libiberty/Makefile instead of $enable_shared.
+	* configure: Rebuild.
+
+2001-10-21  H.J. Lu <hjl@gnu.org>
+
+	* elf32-cris.c (cris_reloc_type_lookup): Use int for index.  Cover
+	index 0.
+
+2001-10-20  H.J. Lu <hjl@gnu.org>
+
+	* configure.in (WIN32LIBADD): Include -L../libiberty/pic -liberty
+	if shared library is enabled.
+	* configure: Rebuild.
+
+2001-10-20  H.J. Lu <hjl@gnu.org>
+
+	* elf32-cris.c (cris_reloc_type_lookup): Allow index 0.
+
+2001-10-19  H.J. Lu <hjl@gnu.org>
+
+	* elfcode.h (elf_object_p): Don't clear D_PAGED if the section
+	size is empty.
+
+2001-10-18  H.J. Lu <hjl@gnu.org>
+
+	* elf32-i370.c (i370_elf_relocate_section): Ignore R_XXX_NONE.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+
+2001-10-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* section.c (_bfd_strip_section_from_output): Don't count
+	SEC_EXCLUDE sections as references.  Set SEC_EXCLUDE.
+
+2001-10-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-m10200.c (mn10200_elf_relax_section): Cast assignment to
+	Elf_Internal_Shdr.contents now that it's no longer a PTR.
+	* elf-m10300.c (mn10300_elf_relax_section): Likewise.
+	* elf32-h8300.c (elf32_h8_relax_section): Likewise.
+	* elf32-m68k.c (bfd_m68k_elf32_create_embedded_relocs): Likewise.
+	* elf32-sh.c (sh_elf_relax_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relax_section): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Likewise.
+	* elf.c (setup_group): Warning fixes.
+	* elflink.h (elf_link_sort_relocs): Likewise.
+	* pdp11.c (slurp_reloc_table): Likewise.
+
+2001-10-16  Jeff Holcomb  <jeffh@redhat.com>
+
+	* elflink.h (elf_link_sort_relocs): Remove unnecessary pointer
+	casts.
+
+2001-10-15  H.J. Lu <hjl@gnu.org>
+
+	* elflink.h (elf_link_input_bfd): Set type to BFD_RELOC_NONE
+	for relocations against discarded link-once section.
+
+2001-10-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-i386.c (elf_i386_relocate_section): Report some detail on
+	bfd_reloc_outofrange and similar errors.
+
+	* elf.c (_bfd_elf_link_hash_copy_indirect): Test ind->root.type
+	rather than ind->weakdef.
+	* elf32-hppa.c (elf32_hppa_copy_indirect_symbol): Likewise.
+	* elf32-i386.c (elf_i386_copy_indirect_symbol): Likewise.
+	* elf32-mips.c (_bfd_mips_elf_copy_indirect_symbol): Likewise.
+	* elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_hash_copy_indirect): Likewise.
+
+2001-10-15  Alan Modra  <amodra@bigpond.net.au>
+	    H.J. Lu  <hjl@gnu.org>
+
+	* elf32-hppa.c (elf32_hppa_copy_indirect_symbol): Merge dyn_reloc
+	counts for aliases instead of aborting.
+	* elf32-i386.c (elf_i386_copy_indirect_symbol): Likewise.
+	* elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Likewise.
+
+	* elf32-hppa.c (elf32_hppa_adjust_dynamic_symbol): Set plt.offset
+	to -1 for non-function symbols.
+	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Likewise.
+	* elf32-s390.c (elf_s390_adjust_dynamic_symbol): Likewise.
+	* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol): Likewise.
+	* elf64-s390.c (elf_s390_adjust_dynamic_symbol): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_adjust_dynamic_symbol): Likewise.
+	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Refer to
+	plt.offset instead of plt.refcount when setting to -1.
+
+2001-10-12  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elf32-arm.h (elf32_arm_relocate_section): Treat R_ARM_THM_PC22
+	like R_ARM_PC24.  Include reloc number in error message about
+	unresolvable relocs.
+
+2001-10-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* elflink.h (elf_link_sort_cmp2): Don't mix PLT and non-PLT
+	relocations against the same symbol in .rel{,a}.dyn section.
+
+2001-10-10  Kazu Hirata  <kazu@hxi.com>
+
+	* aout-encap.c: Fix comment typos.
+	* aoutx.h: Likewise.
+	* archive.c: Likewise.
+	* bout.c: Likewise.
+	* coff64-rs6000.c: Likewise.
+	* coffcode.h: Likewise.
+	* coffgen.c: Likewise.
+	* cofflink.c: Likewise.
+	* coff-mips.c: Likewise.
+	* ecoff.c: Likewise.
+	* elf32-m32r.c: Likewise.
+	* libcoff-in.h: Likewise.
+	* libecoff.h: Likewise.
+	* libxcoff.h: Likewise.
+	* nlm32-i386.c: Likewise.
+	* pdp11.c: Likewise.
+	* section.c: Likewise.
+	* som.c: Likewise.
+	* som.h: Likewise.
+	* bfd-in2.h: Regenerate.
+	* libcoff.h: Likewise.
+
+2001-10-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (elf_map_symbols): Don't create new section symbols; Use
+	existing section syms.  Update comments.
+	(copy_private_bfd_data): Formatting fixes.
+	(elfcore_grok_win32pstatus): Likewise.
+	(swap_out_syms): Likewise.  Remove unnecessary level of braces.
+
+2001-10-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct bfd_elf_section_data): Rename "group" to
+	"group_name".
+	(elf_group_name): Define.
+	(elf_next_in_group): Define.
+	* elf.c: Make use of elf_group_name and elf_next_in_group throughout.
+	(setup_group): Don't use sec->lineno for SHT_GROUP section to store
+	first member section; Instead use elf_next_in_group.
+	(bfd_section_from_shdr): Likewise.
+	(set_group_contents): Likewise.  Use elf_section_syms, not sec->symbol.
+
+2001-10-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct bfd_elf_section_data): Add "group" and
+	"next_in_group".  Fix gp and gp_size comments.
+	* elf.c (union elf_internal_group): New.
+	(setup_group): New function.
+	(_bfd_elf_make_section_from_shdr): Set BFD flags for SHT_GROUP.
+	Call setup_group for SHF_GROUP sections.
+	(bfd_section_from_shdr): Build a BFD section for SHT_GROUP.
+	(elf_fake_sections): Set header type for SEC_GROUP, and header
+	flags for sections in a group.
+	(set_group_contents): New function.
+	(_bfd_elf_compute_section_file_positions): Call it.
+	(assign_section_numbers): Set sh_link for SHT_GROUP.
+
+	* elflink.h (gc_mark_hook): Handle section groups.
+	* elfxx-target.h: Add SEC_GROUP to applicable_flags.
+	* section.c (SEC_GROUP): Define.
+	(struct sec): Comment fixes.
+	* bfd-in2.h: Regenerate.
+
+	* elf.c (bfd_elf_print_symbol): Formatting fix; migrate expression
+	out of function args.
+	(_bfd_elf_canonicalize_reloc): Similarly.
+	(_bfd_elf_get_symtab): Here too.
+	(_bfd_elf_canonicalize_dynamic_symtab): And here.
+	* elfcode.h (elf_slurp_symbol_table): Don't recalculate size for
+	bfd_bread, and remove unnecessary cast.
+
+2001-10-08  Aldy Hernandez  <aldyh@redhat.com>
+
+	* config.bfd (targ_cpu): Add arm9e-*-elf.
+
+2001-10-06  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
+
+	* dwarf2.c (comp_unit_find_nearest_line): Check for end of
+	compilation unit.
+
+2001-10-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd.c (bfd_assert): Report bfd version.
+	(_bfd_abort): Likewise.
+
+	* elflink.h (elf_link_input_bfd): Don't zero discarded link-once
+	section sym values.  Instead replace any relocs against them with
+	relocs against STN_UNDEF, which has a zero value.
+
+	* elf32-arc.c (elf_arc_howto_table): Set partial_inplace for all
+	relocs.
+
+2001-10-05  Jeff Law <law@redhat.com>
+
+	* som.h (som_exec_data): New field "version_id".
+	* som.c (som_object_setup): Record the version_id if it
+	exists.
+	(som_prep_headers): Do not initialize version_id here.
+	(som_finish_writing): Initialize version_id here.
+
+2000-10-05  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elf32-mips.c (elf_mips_howto_table): Fix some relocation howtos
+	according to the MIPS/SGI ELF64 ABI Draft.
+	(mips_elf_sort_hash_table): Typo.
+
+2001-10-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-mips.c (_bfd_mips_elf_copy_indirect_symbol): Comment typo.
+
+	* elf32-mips.c (_bfd_mips_elf_copy_indirect_symbol): Bail out after
+	copying flags if this is a weakdef.
+
+2001-10-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_link_hash_entry): Reorganise for better
+	packing.
+
+	* elf32-mips.c (mips_elf_record_global_got_symbol): Set got.offset
+	to 1 rather than 0 to avoid confusing copy_indirect_symbol.
+	(mips_elf_sort_hash_table_f): Compare got.offset against 1.
+
+	* Makefile.am (BFD_H_DEPS): Add symcat.h.  Ensure everything
+	depends on $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS), not just those
+	backends we configure.  Run "make dep-am".
+	(install-data-local): Install symcat.h.
+	* dep-in.sed: Remove symcat.h from dependencies.
+	* Makefile.in: Regenerate.
+
+2001-10-03  Vassili Karpov  <malc@pulsesoft.com>
+
+	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Handle nocopyreloc.
+
+2001-10-03  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elf64-mips.c (elf_backend_may_use_rela_p): New define.
+	(elf_backend_default_use_rela_p): New define.
+
+2001-10-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* elfxx-ia64.c (elfNN_ia64_hash_copy_indirect): Fix typos in last
+	change.
+
+	* configure.in (AC_OUTPUT <bfd-in3.h>): Remove version.h.
+	* configure: Regenerate.
+	* Makefile.am (BFD_H_FILES): Add version.h.
+	* Makefile.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+	* elflink.h (elf_fix_symbol_flags): Copy flags to weakdef using
+	elf_backend_copy_indirect_symbol so that backend has a chance to
+	copy other necessary fields.
+	* elf-bfd.h (struct elf_backend_data): Update description of
+	elf_backend_copy_indirect_symbol.
+	* elf.c (_bfd_elf_link_hash_copy_indirect): Bail out after
+	copying flags if this is a weakdef.
+	* elfxx-ia64.c (elfNN_ia64_hash_copy_indirect): Likewise.
+	(elfNN_ia64_aix_add_symbol_hook): Use elf_link_hash_lookup rather
+	than bfd_link_hash_lookup.
+	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Don't do copy
+	reloc processing for weakdefs.
+	* elf32-hppa.c (elf32_hppa_adjust_dynamic_symbol): Likewise.
+	* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol): Likewise.
+
+2001-10-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_check_relocs): Use a local var and cast
+	result of ELF64_R_TYPE to enum before using in a switch.
+	(ppc64_elf_gc_mark_hook): Likewise.
+	(ppc64_elf_gc_sweep_hook): Likewise.
+	(ppc64_elf_reloc_type_class): Likewise.
+
+2001-10-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* version.h: New file.
+	* bfd-in.h: (BFD_VERSION): Substitute bfd_version.
+	(BFD_VERSION_DATE): Define.
+	(BFD_VERSION_STRING): Define.
+	* configure.in: AC_SUBST bfd_version, bfd_version_date and
+	bfd_version_string.
+	(AC_OUTPUT <bfd-in3.h>): Depend on version.h.
+	* bfd-in2.h: Regenerate.
+	* configure: Regenerate.
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+	* bfd-in.h: Include "symcat.h".
+	(CONCAT4): Redefine as for old CAT4.
+	* aout-arm.c: Use equivalent CONCAT* macro in place of CAT* macros.
+	Add warning regarding whitespace.
+	* aout-cris.c: Likewise.
+	* aout-ns32k.c: Likewise.
+	* aout-sparcle.c: Likewise.
+	* aout-tic30.c: Likewise.
+	* aout0.c: Likewise.
+	* armnetbsd.c: Likewise.
+	* demo64.c: Likewise.
+	* elf-bfd.h: Likewise.
+	* gen-aout.c: Likewise.
+	* host-aout.c: Likewise.
+	* hp300bsd.c: Likewise.
+	* hp300hpux.c: Likewise.
+	* i386aout.c: Likewise.
+	* i386bsd.c: Likewise.
+	* i386dynix.c: Likewise.
+	* i386freebsd.c: Likewise.
+	* i386linux.c: Likewise.
+	* i386lynx.c: Likewise.
+	* i386mach3.c: Likewise.
+	* i386netbsd.c: Likewise.
+	* libaout.h: Likewise.
+	* m68k4knetbsd.c: Likewise.
+	* m68klinux.c: Likewise.
+	* m68klynx.c: Likewise.
+	* m68knetbsd.c: Likewise.
+	* m88kmach3.c: Likewise.
+	* mipsbsd.c: Likewise.
+	* newsos3.c: Likewise.
+	* ns32knetbsd.c: Likewise.
+	* pc532-mach.c: Likewise.
+	* pdp11.c: Likewise.
+	* riscix.c: Likewise.
+	* sparclinux.c: Likewise.
+	* sparclynx.c: Likewise.
+	* sparcnetbsd.c: Likewise.
+	* sunos.c: Likewise.
+	* targets.c: Likewise.
+	* vaxnetbsd.c: Likewise.
+	* vms-hdr.c: Likewise.
+
+2001-10-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd-in.h: Remove comments regarding generated files.
+	* libbfd-in.h: Likewise.
+	* libcoff-in.h: Likewise.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Likewise.
+	* libcoff.h: Likewise.
+
+2001-09-30  kaz Kojima  <kkojima@rr.iij4u.or.jp>
+	    Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* elf32-sh.c (sh_elf_howto_table, R_SH_REL32): Make
+	partial_inplace, matching assembler output.  Set src_mask to
+	all ones.
+	(sh_elf_relocate_section): Delete misplaced comment.
+	For relocatable linking against section symbol, call
+	_bfd_relocate_contents for partial_inplace relocs and adjust
+	rel->r_addend for others.
+	<case R_SH_DIR32, R_SH_REL32>: Fetch partial_inplace addend with
+	bfd_get_32, not at rel->r_addend.
+
+2001-09-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (_bfd_elf_link_hash_copy_indirect): Set ind refcounts to
+	the old dir refcount, so we indirectly set them to init_refcount.
+	Short-circuit asserts when we've just verified they are true.
+
+2001-09-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* section.c (struct sec): Remove kept_section.
+	(STD_SECTION): Remove kept_section initialisation.
+	(bfd_make_section_anyway): Here too.
+	* ecoff.c (bfd_debug_section): Remove kept_section initialisation.
+	* cofflink.c (_bfd_coff_link_input_bfd): Don't test kept_section.
+	* elflink.h (elf_link_input_bfd): Set discarded link-once section
+	symbols to zero, and remove all code involved with kept_section
+	and tracking section symbol values.
+	* bfd-in2.h: Regenerate.
+	* configure.in: Bump version number.
+	* configure: Regenerate.
+
+2001-09-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (struct ppc_dyn_relocs): New.
+	(IS_ABSOLUTE_RELOC): Define.
+	(struct ppc_link_hash_entry): New.
+	(struct ppc_link_hash_table): New.
+	(ppc_hash_table): Define.
+	(link_hash_newfunc): New function.
+	(ppc64_elf_link_hash_table_create): New function.
+	(create_got_section): New function.
+	(ppc64_elf_create_dynamic_sections): Call create_got_section.  Stash
+	pointers to our dynamic sections in hash table.
+	(ppc64_elf_copy_indirect_symbol): New function.
+	(ppc64_elf_check_relocs): Remove DEBUG code.  Use short-cuts to
+	dynamic sections.  Localise vars.  Modify code for refcounts
+	starting from zero.  Don't allocate here, or force symbols dynamic.
+	Don't copy all relocs if shared, select ones we need.  Add code
+	to track possible copy relocs for non-shared link.
+	(ppc64_elf_gc_mark_hook): Update comment.
+	(ppc64_elf_gc_sweep_hook): Sweep dynrelocs too.
+	(ppc64_elf_adjust_dynamic_symbol): Remove DEBUG code.  Rewrite .plt
+	code for reference counting garbage collection.  Don't create .plt
+	entries for functions that don't comply with ABI naming convention,
+	and don't allocate .plt space here.  Use short-cuts to dynamic
+	sections.  If possible, keep dynamic relocations instead of using
+	copy relocs.  Remove confused comments.
+	(ppc_adjust_dynindx): Delete.
+	(WILL_CALL_FINISH_DYNAMIC_SYMBOL): Define.
+	(allocate_dynrelocs): New function.
+	(readonly_dynrelocs): New function.
+	(ppc64_elf_size_dynamic_sections): Rewrite.  Allocate local .got
+	space here, and call allocate_dynrelocs to allocate space for
+	global .plt, .got and reloc sections.  Use short-cuts to dynamic
+	sections.  Call readonly_dynrelocs to determine whether we need
+	DT_TEXTREL.  Don't generate section symbols here, the generic
+	ELF linker code does it for us.
+	(ppc64_elf_final_link): Call regular ELF backend linker rather than
+	gc variety, since we do our own .got handling.
+	(ppc64_elf_relocate_section): Remove DEBUG code.  Make use of
+	dynamic section short-cuts.  Localise vars, and delay setting.
+	Handle unknown relocs in main switch statement.  Replace ugly
+	complicated tests for unresolvable relocs with a simple direct
+	scheme using "unresolved_reloc" var.  Test ELF_ST_VISIBILITY
+	before allowing an undefined sym in a shared lib.  Do R_*_DS tests
+	after main switch, when we've set addend.  Do non-addend insn
+	tweaks before main swithc.  Ignore input_section->vma when
+	calculating reloc offsets as it's always zero.  Rewrite dynamic
+	reloc handling.  Consolidate R_*_HA handling.  Handle more relocs.
+	(ppc64_elf_finish_dynamic_symbol): Remove DEBUG code.  Make use
+	of dynamic section short-cuts.  Reorganise .plt handling code.
+	Remove confused comments.  Take note of ELF_LINK_FORCED_LOCAL.
+	Move expressions out of swap_reloca_out function calls.
+	(ppc64_elf_reloc_type_class): New function.
+	(ppc64_elf_info_to_howto): Move common expression to local var.
+	(ppc64_elf_finish_dynamic_sections): Remove DEBUG code.  Make use
+	of dynamic section short-cuts.  Don't fiddle with section syms
+	here as the ELF linker does it for us.
+	(elf_backend_can_refcount): Define.
+	(bfd_elf64_bfd_link_hash_table_create): Define.
+	(elf_backend_copy_indirect_symbol): Define.
+	(elf_backend_reloc_type_class): Define.
+	(elf_backend_*, bfd_elf64_bfd_* defines): Sort.
+
+2001-09-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_link_local_dynamic_entry): Add init_refcount.
+	(struct elf_backend_data): Add can_refcount.
+	* elf.c (_bfd_elf_link_hash_newfunc): Get rid of a few casts.  Set
+	got.refcount and plt.refcount from init_refcount.
+	(_bfd_elf_link_hash_table_init): Set up init_refcount.
+	(_bfd_elf_link_hash_copy_indirect): Reference got/plt.refcount
+	rather than got/plt.offset, and test for <= 0 rather than -1.
+	* elflink.h (size_dynamic_sections): Set init_refcount to -1.
+	* elfxx-target.h (elf_backend_can_refcount): Define.
+	(elfNN_bed): Init can_refcount.
+	* linker.c (_bfd_link_hash_newfunc): Get rid of a few casts.
+	(_bfd_generic_link_hash_newfunc): Likewise.
+	* elf32-cris.c (cris_elf_check_relocs): Modify for refcounts
+	starting from zero.
+	(elf_backend_can_refcount): Define.
+	* elf32-hppa.c (elf32_hppa_check_relocs): Modify for refcounts
+	starting from zero.
+	(elf32_hppa_copy_indirect_symbol): Make static to agree with
+	prototype.
+	(elf_backend_can_refcount): Define.
+	* elf32-i386.c (elf_i386_check_relocs): Modify for refcounts
+	starting from zero.
+	(allocate_dynrelocs): Set plt/got.offset rather than *.refcount.
+	(elf_i386_finish_dynamic_symbol): Expand SHN_UNDEF comment.
+	(elf_i386_finish_dynamic_sections): Use local var so line < 80 chars.
+	(elf_backend_can_refcount): Define.
+	(elf_i386_copy_indirect_symbol): Make static to agree with
+	prototype.  Formatting fix.
+	* elf32-m68k.c (elf_m68k_check_relocs): Modify for refcounts
+	starting from zero.
+	(elf_backend_can_refcount): Define.
+	* elf32-ppc.c (ppc_elf_check_relocs): Modify for refcounts
+	starting from zero.
+	(elf_backend_can_refcount): Define.
+	* elf32-s390.c (elf_s390_check_relocs): Modify for refcounts
+	starting from zero.
+	(elf_backend_can_refcount): Define.
+	* elf64-s390.c (elf_s390_check_relocs): Modify for refcounts
+	starting from zero.
+	(elf_backend_can_refcount): Define.
+	* elf64-x86-64.c (elf64_x86_64_check_relocs): Modify for refcounts
+	starting from zero.
+	(elf_backend_can_refcount): Define.
+
+	* som.c (som_write_symbol_strings): Cast current_offset in
+	bfd_seek call to match param type.
+
+2001-09-28  J. Brobecker <brobecker@gnat.com>
+
+	* som.c (som_write_symbol_strings): Fix incorrect type of
+	current_offset to match the function definition. Fixes a build
+	failure on HPUX-11.00.
+
+2001-09-28  Richard Henderson  <rth@redhat.com>
+
+	* elfxx-target.h [section_flags]: Add SEC_ARCH_BIT_0, SEC_SMALL_DATA,
+	SEC_MERGE, SEC_STRINGS.
+
+	* section.c (SEC_ARCH_BIT_0): New; replace unused SEC_BALIGN.
+	* bfd-in2.h: Rebuild.
+
+2001-09-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-x86-64.c (elf64_x86_64_reloc_type_lookup): Don't map bfd
+	reloc code using x86_64_reloc_map.
+
+	* elf32-hppa.c (elf32_hppa_check_relocs): Update comment since we
+	no longer allocate here.  Localise some vars to blocks where they
+	are used.
+	(elf32_hppa_adjust_dynamic_symbol): Correct a comment.  Delay
+	setting of vars until needed.
+	(allocate_dynrelocs): Don't create a .plt entry without a reloc
+	when symbol visibilty makes a function local.
+	(elf32_hppa_finish_dynamic_symbol): Move expressions out of
+	swap_reloca_out function calls.
+	(elf32_hppa_relocate_section): Likewies.  Comment typo fix.
+	(elf32_hppa_finish_dynamic_sections): Migrate common code out of
+	switch statement.
+
+	* elf32-i386.c (elf_i386_check_relocs): Update comment since we
+	no longer allocate here.  Localise some vars to blocks where they
+	are used.  Remove separate switch stmt for creating .got sec.
+	(elf_i386_adjust_dynamic_symbol): Correct a comment.  Remove
+	redundant casts and aborts.  Delay setting of vars until needed.
+	(allocate_dynrelocs): Remove redundant casts and aborts.
+	(elf_i386_size_dynamic_sections): Move comment.
+	(elf_i386_finish_dynamic_symbol): Move expressions out of function
+	calls.
+	(elf_i386_relocate_section): Likewise.  Comment typo fix.
+	(elf_i386_finish_dynamic_sections): Migrate common code out of
+	switch statement.
+	(elf_backend_* defines): Sort.
+
+	* elf32-i386.c (allocate_dynrelocs): Don't create a .plt entry
+	without a reloc when symbol visibilty makes a function local.
+
+2001-09-27  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elf32-arm.h (elf32_arm_merge_private_bfd_data): Fix detection of
+	conflicting float flags.
+
+2001-09-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-i386 (elf_i386_copy_indirect_symbol): New function.
+	(elf_backend_copy_indirect_symbol): Define.
+	(struct elf_i386_link_hash_entry): Rename "root" to "elf".
+	(struct elf_i386_link_hash_table): Likewise.
+	(link_hash_newfunc): Get rid of unnecessary casts.
+	(elf_i386_link_hash_table_create): Likewise.
+	(elf_i386_check_relocs): Initialise local_got_refcounts to 0.
+	Don't test input section SEC_READONLY here to try to avoid copy
+	relocs, and keep dyn_relocs regardleas of ELF_LINK_NON_GOT_REF.
+	(elf_i386_adjust_dynamic_symbol): Check output section SEC_READONLY
+	here to properly test whether we need copy relocs.  Do so for weak
+	syms too.
+
+	* elf32-hppa (elf32_hppa_copy_indirect_symbol): New function.
+	(elf_backend_copy_indirect_symbol): Define.
+	(struct elf32_hppa_link_hash_table): Rename "root" to "elf".
+	(stub_hash_newfunc): Get rid of unnecessary casts.
+	(hppa_link_hash_newfunc): Likewise.
+	(elf32_hppa_check_relocs): Initialise local_got_refcounts to 0.
+	Don't test input section SEC_READONLY here to try to avoid copy
+	relocs, and keep dyn_relocs regardleas of ELF_LINK_NON_GOT_REF.
+	(elf32_hppa_adjust_dynamic_symbol): Check output section SEC_READONLY
+	here to properly test whether we need copy relocs.  Do so for weak
+	syms too.
+
+2001-09-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd.c (_bfd_default_error_handlerl): Define using VPARAMS,
+	VA_OPEN, VA_FIXEDARG, VA_CLOSE.
+	(bfd_archive_filename): Cast bfd_malloc arg to the correct size.
+
+2001-09-25  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf64-sparc.c (sparc64_elf_build_plt): Fix .plt[32768+] slot
+	computation.
+
+2001-09-25  H.J. Lu  <hjl@gnu.org>
+
+	* bfd-in2.h: Regenerated.
+
+2001-09-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-i386.c: Add comment re linker function names and ordering.
+	(elf_i386_link_hash_newfunc): Rename to link_hash_newfunc.
+	(elf_i386_grok_prstatus): Move before linker functions.
+	(elf_i386_grok_psinfo): Likewise.
+	(elf_i386_fake_sections): Move so that functions are ordered.
+	(elf_i386_reloc_type_class): Likewise.  Comment function purpose.
+
+2001-09-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-hppa.c: Rename occurrences of "hplink" to "htab"
+	throughout file.
+
+	* elf32-hppa.c: (LONG_BRANCH_PIC_IN_SHLIB): Delete.  Remove all
+	code handling this option.
+	(LONG_BRANCH_VIA_PLT): Likewise.
+	(RELATIVE_DYNRELOCS): Define as zero.
+	(struct elf32_hppa_dyn_reloc_entry): Add "sec", and
+	"pc_count" fields.  Remove "section" field.
+	(elf32_hppa_link_hash_entry): Rename reloc_entries to dyn_relocs.
+	(elf32_hppa_check_relocs): Don't allocate space for dynamic
+	relocs here.  Instead, record all needed dynamic relocs via
+	dyn_relocs and local_dynrel.  Cache pointer to "sreloc" section
+	in elf_section_data.
+	(elf32_hppa_gc_sweep_hook): Sweep dyn_relocs and local_dynrel.
+	(allocate_plt_and_got_and_discard_relocs): Rename to
+	allocate_dynrelocs.  Allocate rather than discarding dyn relocs.
+	(readonly_dynrelocs): New function.
+	(elf32_hppa_size_dynamic_sections): Mark output_bfd unused.
+	Call readonly_dynrelocs to determine need for DT_TEXTREL.
+	Rename "i" to "ibfd".  Allocate space for local dyn relocs.
+	(elf32_hppa_relocate_section): Make use of cached sreloc.
+	(elf32_hppa_reloc_type_class): New function.
+	(elf_backend_reloc_type_class): Define.
+
+2001-09-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct bfd_elf_section_data): Add "local_dynrel"
+	and "sreloc" fields.
+	* elf32-i386.c (struct elf_i386_dyn_relocs): Add "sec", and
+	"pc_count" fields.  Remove "section" field.
+	(elf_i386_check_relocs): Don't set DF_TEXTREL here.  Don't
+	allocate space for dynamic relocs here.  Instead, record all
+	needed dynamic relocs via dyn_relocs and local_dynrel.  Cache
+	pointer to "sreloc" section in elf_section_data.
+	(elf_i386_gc_sweep_hook): Sweep dyn_relocs and local_dynrel.
+	(allocate_plt_and_got_and_discard_relocs): Rename to
+	allocate_dynrelocs.  Allocate rather than discarding dyn relocs.
+	(readonly_dynrelocs): New function.
+	(elf_i386_size_dynamic_sections): Call readonly_dynrelocs.
+	Rename "i" to "ibfd".  Allocate space for local dyn relocs.
+	(elf_i386_relocate_section): Make use of cached sreloc.
+
+2001-09-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (elf_backend_reloc_type_class): Pass in the entire
+	reloc rather than just the type.
+	(_bfd_elf_reloc_type_class): Likewise.
+	* elf.c (_bfd_elf_reloc_type_class): Likewise.
+	* elf32-arm.h (elf32_arm_reloc_type_class): Likewise.
+	* elf32-cris.c (elf_cris_reloc_type_class): Likewise.
+	* elf32-i386.c (elf_i386_reloc_type_class): Likewise.
+	* elf32-m68k.c (elf32_m68k_reloc_type_class): Likewise.
+	* elf32-ppc.c (ppc_elf_reloc_type_class): Likewise.
+	* elf32-s390.c (elf_s390_reloc_type_class): Likewise.
+	* elf32-sh.c (sh_elf_reloc_type_class): Likewise.
+	* elf32-sparc.c (elf32_sparc_reloc_type_class): Likewise.
+	* elf64-alpha.c (elf64_alpha_reloc_type_class): Likewise.
+	* elf64-s390.c (elf_s390_reloc_type_class): Likewise.
+	* elf64-sparc.c (sparc64_elf_reloc_type_class): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_reloc_type_class): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_reloc_type_class): Likewise.
+	* elflink.h: Formatting fixes.
+	(elf_link_sort_relocs): Make "count" and "size" bfd_size_type.
+	Call bfd_zmalloc rather than calloc.  Remove unnecessary cast of
+	o->contents to PTR.  Update call to elf_backend_reloc_type_class.
+
+2001-09-22  John Reiser  <jreiser@BitWagon.com>
+
+	* elfcode.h (elf_object_p): Allow for no section header at all in
+	non-ET_REL files.  Honor 0 for e_shnum, e_shstrndx, e_shoff.
+
+2001-09-21  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elfxx-ia64.c: Fix compile time warning messages.
+	* coff-mcore.c: Fix compile time warning messages.
+	* coff-ppc.c: Fix compile time warning messages.
+	* coffcode.h: Fix compile time warning messages.
+	* elf32-mips.c: Fix compile time warning messages.
+	* elf64-alpha.c: Fix compile time warning messages.
+	* libbfd.c: Fix compile time warning messages.
+	* bfd-in2.h: Regenerate.
+
+2001-09-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+	* aoutx.h: Formatting fixes.
+	* merge.c (_bfd_merged_section_offset): Break line at 80 chars.
+
+	* linker.c: Replace bfd_get_filename with bfd_archive_filename
+	in error message.
+
+2001-09-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd.c (bfd_archive_filename): New function.
+	* bfd-in2.h: Regenerate.
+	* aout-adobe.c: Replace bfd_get_filename with bfd_archive_filename
+	in error messages where the bfd is an input bfd.
+	* aout-cris.c: Likewise.
+	* coff-arm.c: Likewise.
+	* coff-mcore.c: Likewise.
+	* coff-ppc.c: Likewise.
+	* coff-rs6000.c: Likewise.
+	* coff-sh.c: Likewise.
+	* coff-tic54x.c: Likewise.
+	* coff-tic80.c: Likewise.
+	* coff64-rs6000.c: Likewise.
+	* coffcode.h: Likewise.
+	* coffgen.c: Likewise.
+	* cofflink.c: Likewise.
+	* ecofflink.c: Likewise.
+	* elf-hppa.h: Likewise.
+	* elf.c: Likewise.
+	* elf32-arm.h: Likewise.
+	* elf32-cris.c: Likewise.
+	* elf32-gen.c: Likewise.
+	* elf32-hppa.c: Likewise.
+	* elf32-i370.c: Likewise.
+	* elf32-i386.c: Likewise.
+	* elf32-m32r.c: Likewise.
+	* elf32-mcore.c: Likewise.
+	* elf32-mips.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-s390.c: Likewise.
+	* elf32-sh.c: Likewise.
+	* elf32-sparc.c: Likewise.
+	* elf32-v850.c: Likewise.
+	* elf64-alpha.c: Likewise.
+	* elf64-gen.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf64-s390.c: Likewise.
+	* elf64-sparc.c: Likewise.
+	* elf64-x86-64.c: Likewise.
+	* elflink.h: Likewise.
+	* elfxx-ia64.c: Likewise.
+	* ieee.c: Likewise.
+	* ihex.c: Likewise.
+	* libbfd.c: Likewise.
+	* pdp11.c: Likewise.
+	* pe-mips.c: Likewise.
+	* peicode.h: Likewise.
+	* srec.c: Likewise.
+	* xcofflink.c: Likewise.
+
+	* elf32-arm.h: Make _bfd_error_handler calls K&R compatible.
+
+	* elflink.c (_bfd_elf_create_linker_section): Better grammar for
+	error message.
+
+	* coff-mcore.c (coff_mcore_relocate_section): Internalionalise
+	error message.
+
+	* elf64-sparc.c (sparc64_elf_add_symbol_hook): Constify stt_types.
+	Consolidate error messages, and split long messages to two lines.
+
+2001-09-20  John Reiser  <jreiser@BitWagon.com>
+
+	* elf32-i386.c (elf_i386_relocate_section): Coordinate info->symbolic
+	and info->allow_shlib_undefined.
+	* elf32-cris.c: Likewise.
+	* elf32-hppa.c: Likewise.
+	* elf32-m68k.c: Likewise.
+	* elf32-mips.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-s390.c: Likewise.
+	* elf32-sh.c: Likewise.
+	* elf32-sparc.c: Likewise.
+	* elf64-alpha.c: Likewise.
+	* elf64-hppa.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf64-s390.c: Likewise.
+	* elf64-sparc.c: Likewise.
+	* elf64-x86-64.c: Likewise.
+	* elfxx-ia64.c: Likewise.
+
+2001-09-18  Bruno Haible  <haible@clisp.cons.org>
+
+	* aoutx.h: Include "safe-ctype.h" instead of <ctype.h>.
+	(aout_link_write_symbols): Use ISDIGIT instead of isdigit.
+	* archive.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(_bfd_generic_read_ar_hdr_mag): Use ISDIGIT instead of isdigit.
+	* archures.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(bfd_default_scan): Use ISDIGIT instead of isdigit.
+	* bfd.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(bfd_scan_vma): Use ISXDIGIT/ISDIGIT/ISLOWER instead of
+	isxdigit/isdigit/islower.
+	* binary.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(mangle_name): Use ISALNUM instead of isalnum.
+	* cpu-v850.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(scan): Use ISDIGIT instead of isdigit.
+	* hosts/alphavms.h: Don't include <ctype.h>.
+	* ieee.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(ieee_object_p): Use TOUPPER instead of toupper.
+	* ihex.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(ihex_bad_byte): Use ISPRINT instead of isprint.
+	* merge.c: Don't include <ctype.h>.
+	* oasys.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(oasys_write_sections): Use ISDIGIT instead of isdigit.
+	* pdp11.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(aout_link_write_symbols): Use ISDIGIT instead of isdigit.
+	* ppcboot.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(mangle_name): Use ISALNUM instead of isalnum.
+	* som.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(som_set_reloc_info): Use ISUPPER/ISLOWER/ISDIGIT instead of
+	isupper/islower/isdigit.
+	(som_decode_symclass): Use TOUPPER instead of toupper.
+	* srec.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(srec_bad_byte): Use ISPRINT instead of isprint.
+	(srec_scan): Use ISSPACE instead of isspace.
+	* stabs.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(_bfd_link_section_stabs): Use ISDIGIT instead of isdigit.
+	* syms.c: Include "safe-ctype.h"
+	(islower, toupper): Remove macro definitions.
+	(bfd_decode_symclass): Use TOUPPER instead of toupper.
+	* vms-gsd.c: Don't include <ctype.h>.
+	* vms-hdr.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(_bfd_vms_write_hdr): Use ISLOWER/TOUPPER instead of
+	islower/toupper.
+	* vms-tir.c: Don't include <ctype.h>.
+
+2001-09-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* libbfd.c (bfd_bread): New function replacing bfd_read without
+	redundant params.  Allow reads up to (size_t) -2 in length.
+	(bfd_bwrite): Similarly for bfd_write.
+	(real_read): Return a size_t.
+	(bfd_read): Call bfd_bread.
+	(bfd_write): Call bfd_bwrite.
+	(warn_deprecated): New function to annoy everybody.
+	(bfd_get_file_window): Don't call bfd_set_error unnecessarily.
+	* bfd-in.h (bfd_bread, bfd_bwrite, warn_deprecated): Declare.
+	(bfd_read, bfd_write): Define as macro.
+	* aix386-core.c: Replace calls to bfd_read with bfd_bread, and
+	likewise for bfd_write.  Ensure function args are correct size by
+	using casts or local vars.  In some cases, remove unnecessary
+	casts.  Formatting fixes, in some cases removing a large expression
+	from function args by using a local var.  Replace CONST with const.
+	Modify variable types to avoid warings.  Use casts to avoid
+	warnings when using negative numbers in unsigned expressions.
+	* aout-adobe.c: Likewise.
+	* aout-arm.c: Likewise.
+	* aout-cris.c: Likewise.
+	* aout-encap.c: Likewise.
+	* aout-ns32k.c: Likewise.
+	* aout-target.h: Likewise.
+	* aout-tic30.c: Likewise.
+	* aoutf1.h: Likewise.
+	* aoutx.h: Likewise.
+	* archive.c: Likewise.
+	* archures.c: Likewise.
+	* bfd-in.h: Likewise.
+	* bfd.c: Likewise.
+	* binary.c: Likewise.
+	* bout.c: Likewise.
+	* cache.c: Likewise.
+	* cisco-core.c: Likewise.
+	* coff-a29k.c: Likewise.
+	* coff-alpha.c: Likewise.
+	* coff-arm.c: Likewise.
+	* coff-h8300.c: Likewise.
+	* coff-h8500.c: Likewise.
+	* coff-i386.c: Likewise.
+	* coff-i860.c: Likewise.
+	* coff-i960.c: Likewise.
+	* coff-ia64.c: Likewise.
+	* coff-m68k.c: Likewise.
+	* coff-m88k.c: Likewise.
+	* coff-mcore.c: Likewise.
+	* coff-mips.c: Likewise.
+	* coff-ppc.c: Likewise.
+	* coff-rs6000.c: Likewise.
+	* coff-sh.c: Likewise.
+	* coff-sparc.c: Likewise.
+	* coff-stgo32.c: Likewise.
+	* coff-tic30.c: Likewise.
+	* coff-tic54x.c: Likewise.
+	* coff-tic80.c: Likewise.
+	* coff-w65.c: Likewise.
+	* coff-z8k.c: Likewise.
+	* coff64-rs6000.c: Likewise.
+	* coffcode.h: Likewise.
+	* coffgen.c: Likewise.
+	* cofflink.c: Likewise.
+	* coffswap.h: Likewise.
+	* corefile.c: Likewise.
+	* cpu-arc.c: Likewise.
+	* cpu-h8300.c: Likewise.
+	* cpu-h8500.c: Likewise.
+	* cpu-i960.c: Likewise.
+	* cpu-ia64-opc.c: Likewise.
+	* cpu-ns32k.c: Likewise.
+	* cpu-pdp11.c: Likewise.
+	* cpu-pj.c: Likewise.
+	* cpu-sh.c: Likewise.
+	* cpu-w65.c: Likewise.
+	* cpu-z8k.c: Likewise.
+	* dwarf1.c: Likewise.
+	* dwarf2.c: Likewise.
+	* ecoff.c: Likewise.
+	* ecofflink.c: Likewise.
+	* ecoffswap.h: Likewise.
+	* elf-bfd.h: Likewise.
+	* elf-hppa.h: Likewise.
+	* elf-m10200.c: Likewise.
+	* elf-m10300.c: Likewise.
+	* elf.c: Likewise.
+	* elf32-arc.c: Likewise.
+	* elf32-arm.h: Likewise.
+	* elf32-avr.c: Likewise.
+	* elf32-cris.c: Likewise.
+	* elf32-fr30.c: Likewise.
+	* elf32-gen.c: Likewise.
+	* elf32-h8300.c: Likewise.
+	* elf32-hppa.c: Likewise.
+	* elf32-i370.c: Likewise.
+	* elf32-i386.c: Likewise.
+	* elf32-i860.c: Likewise.
+	* elf32-m32r.c: Likewise.
+	* elf32-m68k.c: Likewise.
+	* elf32-mcore.c: Likewise.
+	* elf32-mips.c: Likewise.
+	* elf32-openrisc.c: Likewise.
+	* elf32-pj.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-s390.c: Likewise.
+	* elf32-sh-lin.c: Likewise.
+	* elf32-sh.c: Likewise.
+	* elf32-sparc.c: Likewise.
+	* elf32-v850.c: Likewise.
+	* elf64-alpha.c: Likewise.
+	* elf64-hppa.c: Likewise.
+	* elf64-mips.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf64-s390.c: Likewise.
+	* elf64-sparc.c: Likewise.
+	* elf64-x86-64.c: Likewise.
+	* elfarm-nabi.c: Likewise.
+	* elfcode.h: Likewise.
+	* elfcore.h: Likewise.
+	* elflink.c: Likewise.
+	* elflink.h: Likewise.
+	* elfxx-ia64.c: Likewise.
+	* elfxx-target.h: Likewise.
+	* format.c: Likewise.
+	* hash.c: Likewise.
+	* hp300hpux.c: Likewise.
+	* hppabsd-core.c: Likewise.
+	* hpux-core.c: Likewise.
+	* i386aout.c: Likewise.
+	* i386dynix.c: Likewise.
+	* i386linux.c: Likewise.
+	* i386lynx.c: Likewise.
+	* i386mach3.c: Likewise.
+	* i386msdos.c: Likewise.
+	* i386os9k.c: Likewise.
+	* ieee.c: Likewise.
+	* ihex.c: Likewise.
+	* irix-core.c: Likewise.
+	* libaout.h: Likewise.
+	* libbfd-in.h: Likewise.
+	* libbfd.c: Likewise.
+	* libcoff-in.h: Likewise.
+	* libecoff.h: Likewise.
+	* libieee.h: Likewise.
+	* libnlm.h: Likewise.
+	* libpei.h: Likewise.
+	* libxcoff.h: Likewise.
+	* linker.c: Likewise.
+	* lynx-core.c: Likewise.
+	* m68klinux.c: Likewise.
+	* merge.c: Likewise.
+	* mipsbsd.c: Likewise.
+	* netbsd-core.c: Likewise.
+	* nlm.c: Likewise.
+	* nlm32-alpha.c: Likewise.
+	* nlm32-i386.c: Likewise.
+	* nlm32-ppc.c: Likewise.
+	* nlm32-sparc.c: Likewise.
+	* nlmcode.h: Likewise.
+	* nlmswap.h: Likewise.
+	* ns32k.h: Likewise.
+	* oasys.c: Likewise.
+	* opncls.c: Likewise.
+	* osf-core.c: Likewise.
+	* pc532-mach.c: Likewise.
+	* pdp11.c: Likewise.
+	* pe-mips.c: Likewise.
+	* peXXigen.c: Likewise.
+	* peicode.h: Likewise.
+	* ppcboot.c: Likewise.
+	* ptrace-core.c: Likewise.
+	* reloc.c: Likewise.
+	* reloc16.c: Likewise.
+	* riscix.c: Likewise.
+	* rs6000-core.c: Likewise.
+	* sco5-core.c: Likewise.
+	* section.c: Likewise.
+	* som.c: Likewise.
+	* sparclinux.c: Likewise.
+	* sparclynx.c: Likewise.
+	* srec.c: Likewise.
+	* stabs.c: Likewise.
+	* sunos.c: Likewise.
+	* syms.c: Likewise.
+	* targets.c: Likewise.
+	* tekhex.c: Likewise.
+	* trad-core.c: Likewise.
+	* versados.c: Likewise.
+	* vms-gsd.c: Likewise.
+	* vms-hdr.c: Likewise.
+	* vms-misc.c: Likewise.
+	* vms-tir.c: Likewise.
+	* vms.c: Likewise.
+	* vms.h: Likewise.
+	* xcofflink.c: Likewise.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* libcoff.h: Regenerate.
+
+	* bfd.c (struct _bfd): Make "where" and "origin" unsigned.
+	* bfd-in.h (file_ptr): Change from a long int to a bfd_signed_vma.
+	(ufile_ptr): Define.
+	(bfd_tell): Return a ufile_ptr.
+	* libbfd.c (bfd_tell): Likewise.
+	(bfd_seek): Use bfd_size_type locals.  Don't call bfd_set_error
+	unnecessarily.
+	* aix386-core.c: Test != 0 for bfd_seek errors rather than < 0.
+	* aoutf1.h: Likewise.
+	* som.c: Likewise.
+	* cache.c (bfd_cache_lookup_worker): Guard against abfd->where
+	larger than unsigned long can represent.
+
+	* libbfd.c (bfd_malloc): Take a bfd_size_type arg.  Error if
+	size overflows size_t.
+	(bfd_realloc): Likewise.
+	(bfd_zmalloc): Likewise.
+	* opncls.c (bfd_alloc): Likewise.
+	(bfd_zalloc): Likewise.
+	* libbfd-in.h (bfd_malloc, bfd_realloc, bfd_zmalloc): Update.
+	(bfd_alloc, bfd_zalloc): Update.
+
+	* libbfd.c (bfd_get_8): Mask with 0xff in case char is more than
+	8 bits.
+	(bfd_get_signed_8): Likewise.
+	(H_PUT_64, H_PUT_32, H_PUT_16, H_PUT_8,
+	H_PUT_S64, H_PUT_S32, H_PUT_S16, H_PUT_S8,
+	H_GET_64, H_GET_32, H_GET_16, H_GET_8,
+	H_GET_S64, H_GET_S32, H_GET_S16, H_GET_S8): Define and use.
+	* libaout.h: Likewise define and use here.
+	* aout-adobe.c: Use H_GET_* and H_PUT_* macros.
+	* aout-arm.c: Likewise.
+	* aout-encap.c: Likewise.
+	* aout-ns32k.c: Likewise.
+	* aout-tic30.c: Likewise.
+	* aoutf1.h: Likewise.
+	* aoutx.h: Likewise.
+	* bout.c: Likewise.
+	* coff-alpha.c: Likewise.
+	* coff-h8300.c: Likewise.
+	* coff-h8500.c: Likewise.
+	* coff-i960.c: Likewise.
+	* coff-ia64.c: Likewise.
+	* coff-m88k.c: Likewise.
+	* coff-mips.c: Likewise.
+	* coff-ppc.c: Likewise.
+	* coff-rs6000.c: Likewise.
+	* coff-sh.c: Likewise.
+	* coff-sparc.c: Likewise.
+	* coff-stgo32.c: Likewise.
+	* coff-tic30.c: Likewise.
+	* coff-tic80.c: Likewise.
+	* coff-w65.c: Likewise.
+	* coff-z8k.c: Likewise.
+	* coff64-rs6000.c: Likewise.
+	* coffgen.c: Likewise.
+	* cofflink.c: Likewise.
+	* coffswap.h: Likewise.
+	* ecoff.c: Likewise.
+	* ecoffswap.h: Likewise.
+	* elf.c: Likewise.
+	* elf32-mips.c: Likewise.
+	* elf64-mips.c: Likewise.
+	* hp300hpux.c: Likewise.
+	* i386dynix.c: Likewise.
+	* i386lynx.c: Likewise.
+	* i386msdos.c: Likewise.
+	* i386os9k.c: Likewise.
+	* libpei.h: Likewise.
+	* nlm32-alpha.c: Likewise.
+	* nlm32-i386.c: Likewise.
+	* nlm32-ppc.c: Likewise.
+	* nlmcode.h: Likewise.
+	* nlmswap.h: Likewise.
+	* oasys.c: Likewise.
+	* pdp11.c: Likewise.
+	* pe-mips.c: Likewise.
+	* peXXigen.c: Likewise.
+	* peicode.h: Likewise.
+	* riscix.c: Likewise.
+	* sunos.c: Likewise.
+	* xcofflink.c: Likewise.
+	* elfcode.h: (put_word, get_word, put_signed_word, get_signed_word):
+	Rename to H_PUT_WORD, H_GET_WORD, H_PUT_SIGNED_WORD, H_GET_SIGNED_WORD.
+	* coff-rs6000.c (PUTWORD, PUTHALF, PUTBYTE): Don't define. Use
+	equivalent H_PUT_* macro instead.
+	(GETWORD, GETHALF, GETBYTE): Similarly.
+	* coff64-rs6000.c (PUTWORD, PUTHALF, PUTBYTE): Likewise.
+	(GETWORD, GETHALF, GETBYTE): Likewise.
+	* coffswap.h (PUTWORD, PUTHALF, PUTBYTE): Likewise.
+
+	* bfd-in.h (struct orl): Change "pos" to a union.
+	* archive.c (_bfd_compute_and_write_armap): Use it instead of casts.
+	(bsd_write_armap): Here too.
+	(coff_write_armap): And here.
+	* coff-rs6000.c (xcoff_write_armap_old): And here.
+	(xcoff_write_one_armap_big): And here.
+	(xcoff_write_armap_big): And here.
+	* ecoff.c (_bfd_ecoff_write_armap): And here.
+	* elf64-mips.c (mips_elf64_write_armap): And here.
+
+	* aoutf1.h (sunos_set_arch_mach): Make "mach" param an enum.
+	* elf-m10300.c (elf_mn10300_mach): Return an unsigned long.
+	* elf32-h8300.c (elf32_h8_mach): Likewise.
+	* elf32-mips.c (elf_mips_mach): Likewise.
+	* sparclynx.c (NAME(lynx,set_arch_mach)): Likewise.
+
+	* aix386-core.c (aix386_core_file_p): Remove redundant bfd_release
+	calls.
+	(aix386_core_vec): Typo fix.
+
+	* aout-arm.c: Include libaout.h and aout/aout64.h after N_TXTADDR
+	etc. to avoid redefined macro warning.
+	(MY(put_reloc)): Use bfd_vma for "value" rather than long.
+	(MY(fix_pcrel_26)): Likewise.
+	* aout-ns32k.c (MY(put_reloc)): Likewise.
+	* aout-cris.c (MY(swap_ext_reloc_out)): Likewise for r_addend.
+	* aoutx.h (NAME(aout,swap_ext_reloc_out)): Likewise.
+	* coff-arm.c (coff_arm_relocate_section): Likewise for my_offset.
+
+	* aout-encap.c: Include "file", not <file> for binutils headers.
+	(encap_object_p): Half baked attempt to fix compile errors in
+	code dealing with "magic".
+
+	* aout-ns32k.c: Include "file", not <file> for binutils headers.
+	(_bfd_ns32k_relocate_contents): get_data and put_data manipulate
+	bfd_vma's rather than longs.
+	* cpu-ns32k.c (ns32k_sign_extend): Delete.
+	(_bfd_ns32k_get_displacement): Return a bfd_vma, don't pass in offset.
+	(_bfd_ns32k_get_immediate): Likewise.  Add code for 8 byte values,
+	remove case 3.
+	(_bfd_ns32k_put_displacement): Accept a bfd_vma, don't pass in offset.
+	Use unsigned comparisons.
+	(bfd_ns32k_put_immediate): Likewise, and add code for 8 byte values.
+	(do_ns32k_reloc): get_data and put_data operate on bfd_vma's.
+	(_bfd_do_ns32k_reloc_contents): Likewise.
+	* ns32k.h (_bfd_ns32k_get_displacement): Update prototype.
+	(_bfd_ns32k_get_immediate): Likewise.
+	(_bfd_ns32k_put_displacement): Likewise.
+	(_bfd_ns32k_put_immediate): Likewise.
+	(bfd_reloc_status_type): Likewise.
+
+	* aoutx.h (NAME(aout,find_nearest_line)): Rename 'p' to 'colon'
+	to avoid shadowing.
+	* pdp11.c (NAME(aout,find_nearest_line)): Likewise.
+	* coff-h8300.c (h8300_reloc16_extra_cases): Remove shadowing "value".
+	* coff-ppc.c (enum ref_category): Rename "data" to "tocdata" to
+	avoid shadowing.
+	(record_toc): Use a bfd_signed_vma for our_toc_offset.
+	* coffcode.h (coff_write_relocs): Rename "i" to avoid shadowing.
+	* elf.c (bfd_elf_get_bfd_needed_list): Rename "link" var to avoid
+	shadow warning.
+	(_bfd_elfcore_strndup): Likewise for "dup".
+	* elf32-cris.c (cris_elf_relocate_section): "symname" instead of
+	"name" to avoid shadowing.
+	* elf32-hppa.c (elf32_hppa_relocate_section): Remove duplicate
+	definition of "off".
+	* elf32-i386.c (elf_i386_relocate_section): Likewise.
+	* elf32-mips.c (_bfd_mips_elf_modify_segment_map): Remove duplicate
+	definition of "s".
+	(_bfd_mips_elf_final_link): Rename "i" to "j".  Remove duplicate
+	"secpp".
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Rename inner "indx"
+	to avoid shadowing.
+	* elflink.h (elf_link_add_object_symbols): Rename "link" to "shlink"
+	to avoid shadowing.
+	(elf_link_input_bfd): Likewise.
+	(elf_bfd_final_link): Remove duplicate innermost "off" var.
+	* oasys.c (oasys_write_data): Rename innermost "p" to "sym".
+	* reloc16.c (bfd_coff_reloc16_relax_section): Rename "i" param to
+	"input_section".
+	* som.c (som_prep_for_fixups): Rename inner "i" to "j".
+	* sunos.c (sunos_add_dynamic_symbols): Localise "s" var.
+	(sunos_write_dynamic_symbol): Remove unused vars.
+	* syms.c (_bfd_stab_section_find_nearest_line): Remove duplicate
+	innermost "directory_name" and "file_name" vars.
+	* tekhex.c (first_phase): Rename local var "type" to "stype".
+	(tekhex_write_object_contents): Rename innermost "s" to "sym".
+	* vms-gsd.c (vms_secflag_by_name): Change "size" param to "hassize",
+	doing comparison at caller.
+	(vms_esecflag_by_name): Likewise.
+	* vms-tir.c (etir_sto): Rename innermost "psect" to "psect1".
+	* xcofflink.c (xcoff_link_input_bfd): Delete duplicate innermost "o".
+	(xcoff_write_global_symbol): Rename "p" param to "inf".
+
+	* cisco-core.c: Add missing prototypes.
+	(cisco_core_file_failing_command): Add ATTRIBUTE_UNUSED.
+	(cisco_core_file_failing_signal): Likewise.
+	(cisco_core_file_matches_executable_p): Likewise.
+	* hpux-core.c (hpux_core_core_file_failing_signal): Likewise.
+	* netbsd-core.c (netbsd_core_file_matches_executable_p): Likewise.
+	* osf-core.c (osf_core_core_file_matches_executable_p): Likewise.
+	* sco5-core.c (sco5_core_file_matches_executable_p): Likewise.
+
+	* coff-arm.c (coff_arm_link_hash_table): Use bfd_size_type for
+	thumb_glue_size and arm_glue_size.
+	* elf32-arm.h (elf32_arm_link_hash_table): Likewise here.
+
+	* coff64-rs6000.c: Group prototypes together.
+
+	* coffcode.h (coff_set_arch_mach): Add ATTRIBUTE_UNUSED.
+	(buy_and_read): Remove "seek" param.  Change "size" to bfd_size_type.
+
+	* cpu-arc.c: Add missing prototypes.
+	* cpu-h8500.c: Likewise.
+	* cpu-i960.c: Likewise.
+	* cpu-pj.c: Likewise.
+	* cpu-sh.c: Likewise.
+	* cpu-w65.c: Likewise.
+	* cpu-z8k.c: Likewise.
+	* elf32-fr30.c: Likewise.
+	* elf32-h8300.c: Likewise.
+	* elf32-i370.c: Likewise.
+	* hpux-core.c: Likewise.
+	* versados.c: Likewise.
+
+	* cpu-h8300.c (bfd_default_scan_num_mach): Don't declare.
+	* cpu-h8500.c: Likewise.
+	* cpu-i960.c: Likewise.
+	* cpu-z8k.c: Likewise.
+
+	* cpu-ia64-opc.c: Correct comment.
+
+	* dwarf2.c (_bfd_dwarf2_find_nearest_line): Remove unused var.
+
+	* elf-bfd.h (elf_size_info): Change count param of write_out_phdrs
+	to unsigned.
+	(bfd_elf32_write_out_phdrs): Likewise.
+	(bfd_elf64_write_out_phdrs): Likewise.
+	(elf_linker_section_pointers): Change addend to bfd_vma.
+	(_bfd_elf_find_pointer_linker_section): Likewise.
+	(_bfd_elfcore_make_pseudosection): Change size param to size_t and
+	filepos to unsigned file_ptr.
+	(_bfd_elfcore_strndup): Change max param to size_t.
+	* elf.c (_bfd_elfcore_make_pseudosection): As above.
+	(_bfd_elfcore_strndup): Likewise.
+	(_bfd_elf_find_pointer_linker_section): Likewise.
+
+	* elf-hppa.h (elf_hppa_relocate_insn): Return an int, and change
+	insn and sym_value to ints.
+
+	* elf.c (elf_read): Make "offset" param a file_ptr, "size" a
+	bfd_size_type.
+	(elfcore_read_notes): Likewise.
+
+	* elf32-arm.h (elf32_arm_final_link_relocate): Change sym_flags
+	param from unsigned char to int.
+	(elf32_arm_relocate_section): If USE_REL, cast "rel" appropriately
+	for info_to_howto call.
+	(add_dynamic_entry): Define macro.
+	(elf32_arm_size_dynamic_sections): Use add_dynamic_entry.
+
+	* elf32-cris.c (add_dynamic_entry): Define macro.
+	(elf_cris_size_dynamic_sections): Use add_dynamic_entry.
+
+	* elf32-h8300.c (elf32_h8_final_write_processing): Make static.
+	(elf32_h8_object_p): Likewise.
+	(elf32_h8_merge_private_bfd_data): Likewise.
+	(elf32_h8_relax_section): Cast gap to int so signed comparisons work.
+
+	* elf32-hppa.c (add_dynamic_entry): Define macro.
+	(elf32_hppa_size_dynamic_sections): Use it.
+	* elf32-i370.c (add_dynamic_entry): Define macro.
+	(i370_elf_size_dynamic_sections): Use it.
+	(i370_noop): Make static.
+	* elf32-i386.c (add_dynamic_entry): Define macro.
+	(elf_i386_size_dynamic_sections): Use it.
+	* elf32-m68k.c (add_dynamic_entry): Define macro.
+	(elf_m68k_size_dynamic_sections): Use it.
+	* elf32-ppc.c (add_dynamic_entry): Define macro.
+	(ppc_elf_size_dynamic_sections): Use it.
+	* elf32-s390.c (add_dynamic_entry): Define macro.
+	(elf_s390_size_dynamic_sections): Use it.
+	* elf64-alpha.c (add_dynamic_entry): Define macro.
+	(elf64_alpha_size_dynamic_sections): Use it.
+	* elf64-hppa.c (add_dynamic_entry): Define macro.
+	(elf64_hppa_size_dynamic_sections): Use it.
+	* elf64-ppc.c (add_dynamic_entry): Define macro.
+	(ppc64_elf_size_dynamic_sections): Use it.
+	* elf64-s390.c (add_dynamic_entry): Define macro.
+	(elf_s390_size_dynamic_sections): Use it.
+	* elf64-sparc.c (add_dynamic_entry): Define macro.
+	(sparc64_elf_size_dynamic_sections): Use it.
+	* elf64-x86-64.c (add_dynamic_entry): Define macro.
+	(elf64_x86_64_size_dynamic_sections): Use it.
+	* elfxx-ia64.c (add_dynamic_entry): Define macro.
+	(elfNN_ia64_size_dynamic_sections): Use it.
+
+	* elf32-v850.c (SEXT24): Modify to avoid signed/unsigned warning.
+	(v850_elf_perform_relocation): Make "r_type" param unsigned.
+
+	* elf64-mips.c (mips_elf64_slurp_one_reloc_table): Just return
+	false if the first malloc fails rather than going via error_return.
+
+	* elf64-sparc.c (sparc64_elf_plt_entry_offset): Use a bfd_vma for
+	"index" param.
+	(sparc64_elf_plt_ptr_offset): Likewise, and for "max" param too.
+
+	* elflink.h (elf_link_input_bfd): s/ingored/ignored/ in error message.
+
+	* elfxx-ia64.c (global_sym_index): Return a long.
+
+	* ieee.c (get_symbol): Use int rather than char param.
+	(ieee_slurp_sections): Move "section" var to inner blocks.
+	(copy_expression): Don't init "value" to zero or worry about
+	clearing to zero after using.
+	(ieee_write_debug_part): Rename "output_buffer" to "obuff" to avoid
+	shadowing.
+
+	* ihex.c (ihex_write_record): Make "count" var a size_t, "addr" an
+	unsigned int.
+
+	* libbfd-in.h (BFD_ALIGN): Add cast to avoid signed/unsigned warning.
+	(bfd_write_bigendian_4byte_int): Pass an unsigned int value param.
+
+	* mipsbsd.c (mips_fix_jmp_addr): Add "error_message" param.
+
+	* pc532-mach.c (MYNSX): Delete.
+	(ns32kaout_bfd_reloc_type_lookup): Define prototype without MYNSX.
+	(write_object_contents): Correct prototype.
+
+	* peicode.h (pe_ILF_build_a_bfd): Use an unsigned int param rather
+	than unsigned short.
+
+	* section.c (bfd_set_section_contents): Remove redundant
+	"offset < 0" test.  Check that "count" doesn't overflow size_t.
+	(bfd_get_section_contents): Likewise.
+
+	* som.c (som_fixup_formats): Add missing braces.
+	(som_reloc_addend): Pass a bfd_vma for "addend".
+
+	* srec.c (srec_write_record): Pass "type" as an unsigned int.
+	(srec_write_symbols): Remove an unnecessary var.
+
+	* targets.c (_bfd_target_vector): Sort entries.  Sort externs
+	to match.
+	* configure.in: Sort to match.  Bump version number.
+	* configure: Regenerate.
+
+	* tekhex.c (move_section_contents): Assert offset == 0.
+
+	* versados.c (new_symbol_string): Constify arg.
+	(process_esd): Use bfd_und_section_ptr rather than &bfd_und_section.
+	(versados_get_symbol_info): Make static.
+	(versados_print_symbol): Likewise.
+	(versados_get_reloc_upper_bound): Likewise.
+	(versados_canonicalize_reloc): Likewise.
+
+2001-09-18  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elflink.h (elf_link_input_bfd): Fix typo in error message.
+
+2001-09-17  H.J. Lu  <hjl@gnu.org>
+
+	* dwarf1.c (parse_die): Take a new arg for the end of the
+	section. Return false if die is beyond the section.
+	(parse_functions_in_unit): Pass the end of the section to
+	parse_die ().
+	(_bfd_dwarf1_find_nearest_line): Likewise.
+
+2001-09-14  Michael Rauch <mrauch@netbsd.org>
+
+	* elf32-sparc.c (elf32_sparc_relocate_section): Treat R_SPARC_UA32
+	just like R_SPARC_32.
+
+2001-09-14  Kevin Lo <kevlo@openbsd.org>
+
+	* configure.bfd: Add arm-openbsd target.
+
+2001-09-14  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* config.bfd: Change machine triplets from mips*el*-* to mips*el-*.
+	Add support for mips64.
+
+2001-09-13  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-openrisc.c (ELF_MACHINE_ALT1): Define as EM_OPENRISC_OLD.
+
+2001-09-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf.c (prep_headers): Get the machine code from the elf
+	backend data.
+	* elf-m10200.c (ELF_MACHINE_CODE): Redefine to EM_MN10200.
+	(ELF_MACHINE_ALT1): Define to EM_CYGNUS_MN10200.
+	* elf-m10300.c (ELF_MACHINE_CODE): Redefine to EM_MN10300.
+	(ELF_MACHINE_ALT1): Define to EM_CYGNUS_MN10300.
+	* elf-arc.c (arc_elf_final_write_processing): Don't override
+	e_machine, it's now properly set in prep_headers.
+	* elf32-avr.c (elf32_avr_object_p): Accept both EM_AVR and
+	EM_AVR_OLD.
+	(ELF_MACHINE_ALT1): Define to EM_AVR_OLD.
+	* elf-d10v.c (ELF_MACHINE_CODE): Redefine to EM_D10V.
+	(ELF_MACHINE_ALT1): Define to EM_CYGNUS_D10V.
+	* elf-d30v.c (ELF_MACHINE_CODE): Redefine to EM_D30V.
+	(ELF_MACHINE_ALT1): Define to EM_CYGNUS_D30V.
+	* elf-fr30.c (ELF_MACHINE_CODE): Redefine to EM_FR30.
+	(ELF_MACHINE_ALT1): Define to EM_CYGNUS_FR30.
+	* elf-m32r.c (ELF_MACHINE_CODE): Redefine to EM_M32R.
+	(ELF_MACHINE_ALT1): Define to EM_CYGNUS_M32R.
+	* elf32-pj.c (ELF_MACHINE_ALT1): DEfine to EM_PJ_OLD.
+	* elf-v850.c (ELF_MACHINE_CODE): Redefine to EM_V850.
+	(ELF_MACHINE_ALT1): Define to EM_CYGNUS_V850.
+
+2001-09-11  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_section_flags): New.
+	(elf64_alpha_fake_sections): Map SEC_SMALL_DATA to SHF_ALPHA_GPREL.
+
+2001-09-11  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_relocate_section): Do not
+	apply HINT relocations against dynamic symbols.
+
+2001-09-11  H.J. Lu  <hjl@gnu.org>
+
+	* linker.c (link_action): Change COMMON_ROW\defw from CREF to COM.
+
+2001-09-09  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c: Delete all unused ERIC_neverdef and rth_notdef code.
+
+	* elf64-alpha.c (elf64_alpha_relax_with_lituse): Nop out gpdisp
+	following a call to a near function.
+
+2001-09-08  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_relocate_section): Soft fail
+	relocation errors.  Fail gp-relative relocations against
+	dynamic symbols.
+
+2001-09-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-i386.c (elf_i386_relocate_section): Check !DEF_REGULAR
+	as well as DEF_DYNAMIC in test for avoided copy relocs.
+	(allocate_plt_and_got_and_discard_relocs): Likewise.
+	* elf32-hppa.c (elf_i386_relocate_section): Likewise.
+	(allocate_plt_and_got_and_discard_relocs): Likewise.
+
+2001-09-07  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elf32-mips.c (mips_elf_calculate_relocation): Fix overflow handling
+	of R_MIPS_PC16.
+
+2001-09-06  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elf64-mips.c (mips_elf64_howto_table_rel): Fix relocation HOWTO
+	definitions.
+	(mips_elf64_howto_table_rel): Likewise.
+
+2001-09-05  Tom Rix <trix@redhat.com>
+
+	* xcofflink.c (bfd_xcoff_import_symbol): Handle import file XMC_XO
+	and syscall symbols.
+	(write_global_symbol) : Same.
+	(bfd_xcoff_export_symbol): Remove unused syscall param.
+	* libxcoff.h: Change prototype of bfd_xcoff_export symbol and
+	bfd_xcoff_import_symbol.
+	* bfd-in.h: Same.
+	* bfd-in2.h : Regenerate.
+
+2001-09-04  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (SKIP_HOWTO): New.
+	(elf64_alpha_howto_table): Use it to remove dead ECOFF relocs.
+	Fix sizes of 16-bit mem format relocs.
+	(elf64_alpha_reloc_map): Update to match.
+	(elf64_alpha_relax_with_lituse): Use GPREL16 as appropriate.
+	(elf64_alpha_relax_without_lituse): Likewise.
+	(elf64_alpha_check_relocs): Handle GPREL16.
+	(elf64_alpha_relocate_section): Likewise.
+	* reloc.c (BFD_RELOC_ALPHA_USER_*): Remove.
+	(BFD_RELOC_ALPHA_GPREL_HI16, BFD_RELOC_ALPHA_GPREL_LO16): New.
+	* bfd-in2.h, libbfd.h: Rebuild.
+
+2001-09-04  Jeff Law <law@redhat.com>
+
+	* elf32-h8300.c (elf32_h8_relax_section): New function.
+	(elf32_h8_relax_delete_bytes): Likewise.
+	(elf32_h8_symbol_address_p): Likewise.
+	(elf32_h8_get_relocated_section_contents): Likewise.
+	(bfd_elf32_bfd_relax_section): Define.
+	(bfd_elf32_bfd_get_relocated_section_contents): Likewise.
+
+	* elf32-h8300.c (special): New function.
+	(h8_elf_howto_table): Use it for SPECIAL_FUNCTION field in
+	all relocations.
+	(elf32_h8_final_link_relocate): Treat R_H8_DIR24A8 like 32bit
+	relocations.  Fix problems with the true 24bit reloc R_H8_DIR24R8.
+	Fix minor problems with 8bit and 16bit PC relative relocations.
+
+2001-09-01  Andreas Jaeger  <aj@suse.de>
+
+	* vms-tir.c: Add missing prototypes.
+	* vms-hdr.c: Likewise.
+	* vms-gsd.c: Likewise.
+	* vms-misc.c: Likewise.
+
+2001-08-31  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-mips.c (_bfd_mips_elf_check_relocs): Report filename
+	with bad relocation.
+
+2001-08-31  Eric Christopher  <echristo@redhat.com>
+	    Jason Eckhardt  <jle@redhat.com>
+
+	* archures.c: Add mipsisa32 and mipsisa64. Remove mips32,
+	mips32_4k and mips64.
+	* aoutx.h: Remove bfd_mach_mips32, bfd_mach_mips32_4k,
+	bfd_mach_mips64.  Add bfd_mach_mipsisa32, bfd_mach_mipsisa64.
+	* cpu-mips.c: Ditto.
+	* elf32-mips.c (_bfd_mips_elf_final_write_processing): Ditto.
+	* bfd-in2.h: Regenerate.
+
+2001-08-31  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_relocate_section): Duplicate memory
+	value into R_ALPHA_RELATIVE's addend.
+	(elf64_alpha_finish_dynamic_symbol): Likewise.
+
+2001-08-31  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elf32-arm.h (elf32_arm_relocate_section): Do not rightshift
+	recomputed addend during relocatable link if not USE_REL.
+
+	* elflink.h (elf_gc_propagate_vtable_entries_used): Fix off-by-one
+	error.
+
+2001-08-30  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-mips.c (mips_elf_calculate_relocation): Revert the last
+	2 changes.
+	(_bfd_mips_elf_adjust_dynamic_symbol): Allocate dynamic
+	relocations for weak definitions.
+
+2001-08-30  H.J. Lu  <hjl@gnu.org>
+
+	* Makefile.am (BFD32_BACKENDS): Add elf32-h8300.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-h8300.c.
+	* Makefile.in: Rebuild.
+
+2001-08-30  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-mips.c (mips_elf_calculate_relocation): Don't create
+	dynamic relocation for undefined weak symbols when creating
+	executables. Check h->root.root.type, instead of h->root.type.
+
+2001-08-29  Joel Sherrill <joel@OARcorp.com>
+
+	* config.bfd (i[3456]86-*-rtems*, m68*-*-rtems*): Change
+	default from coff to elf.
+
+2001-08-29  Jeff Law <law@redhat.com>
+
+	* elf32-h8300.c (h8_elf_howto_table): Add new PC relative
+	relocations.
+	(h8_reloc_map): Similarly.
+	(elf32_h8_final_link_relocate): Remove incorrect overflow tests.
+	Add support for PC relative relocations.
+
+	* elf32-h8300.c: Put all prototypes together.
+	(elf32_h8_info_to_howto): Parameter elf_reloc is used.
+	(elf32_h8_final_link_relocate): New function for linker.
+	(elf32_h8_relocate_section): Similarly.
+	(elf_backend_relocate_section): Define.
+
+	* cpu-h8300.c (h8300_scan, compatible): Prototype.
+	(h8300_scan): Handle architecture:machine encodings typically
+	found in linker scripts.
+	* elf.c (prep_headers): Do not try to do H8 machine recognition
+	here.
+	* elf32-h8300.c:  Add some missing prototypes.
+	(elf32_h8_mach, elf32_h8_final_write_processing): New functions.
+	(elf32_h8_object_p): Similarly.
+
+2001-08-29  Tom Rix <trix@redhat.com>
+
+	* xcofflink.c (xcoff_link_add_symbols):  Fix XTY_LD symbol that
+	does not follow a XTY_SD.
+
+2001-08-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* targmatch.sed: Delete case statements.
+	* config.bfd <powerpc-*-aix* entry>: Select 64 bit xcoff for
+	aix4.3 and above.
+
+2001-08-29  J"orn Rennecke <amylaar@redhat.com>
+
+	* Makefile.am (elf32-h8300.lo): New target.
+	* config.bfd (h8300*-*-elf): New case.
+	* configure.in (bfd_elf32_h8300_vec): New case.
+	* elf.c (prep_headers): Add case for bfd_arch_h8300.
+	* reloc.c (BFD_RELOC_H8_DIR16A8): New relocation.
+	(BFD_RELOC_H8_DIR16R8, BFD_RELOC_H8_DIR24A8): Likewise.
+	(BFD_RELOC_H8_DIR24R8, BFD_RELOC_H8_DIR32A16): Likewise.
+	* targets.c (bfd_target bfd_elf32_h8300_vec): New extern declaration.
+	* elf32-h8300.c: New file.
+	* Makefile.in, bfd-in2.h, libbfd.h, configure: Regenerated.
+
+2001-08-28  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* sparclynx.c: Add missing prototypes.
+	* coff-mcore.c: Add missing prototypes.
+	* elf32-pj.c: Add missing prototypes.
+	* nlm32-sparc.c: Add missing prototypes.
+	* oasys.c: Add missing prototypes.
+	* pdp11.c: Add missing prototypes.
+	* pe-mips.c: Add missing prototypes.
+	* riscix.c: Add missing prototypes.
+
+2001-08-27  Daniel Jacobowitz  <drow@mvista.com>
+
+	* elf32-i386.c: Add missing prototypes.
+	* elf32-ppc.c: Likewise.
+	* elf32-sh-lin.c: Likewise.
+	* elfarm-nabi.c: Likewise.
+
+2001-08-27  Daniel Jacobowitz  <drow@mvista.com>
+
+	* elf32-i386.c (elf_i386_grok_prstatus): New function.
+	(elf_i386_grok_psinfo): New function.
+	(elf_backend_grok_prstatus): Define.
+	(elf_backend_grok_psinfo): Likewise.
+	* elf32-ppc.c (ppc_elf_grok_prstatus): New function.
+	(ppc_elf_grok_psinfo): New function.
+	(elf_backend_grok_prstatus): Define.
+	(elf_backend_grok_psinfo): Likewise.
+	* elf32-sh-lin.c (elf32_shlin_grok_prstatus): New function.
+	(elf32_shlin_grok_psinfo): New function.
+	(elf_backend_grok_prstatus): Define.
+	(elf_backend_grok_psinfo): Likewise.
+	* elfarm-nabi.c (elf32_arm_nabi_grok_prstatus): New function.
+	(elf32_arm_nabi_grok_psinfo): New function.
+	(elf_backend_grok_prstatus): Define.
+	(elf_backend_grok_psinfo): Likewise.
+
+2001-08-27  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-mips.c (mips_elf_create_dynamic_relocation): Add more
+	sanity check.
+	(mips_elf_calculate_relocation): Create dynamic relocation for
+	symbols with weak definition or the ELF_LINK_HASH_DEF_REGULAR
+	bit is not set.
+
+2001-08-27  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-mips.c (_bfd_mips_elf_hide_symbol): Add prototype.
+	(_bfd_mips_elf_copy_indirect_symbol): Likewise.
+	(_bfd_elf32_mips_grok_prstatus): Likewise.
+	(_bfd_elf32_mips_grok_psinfo): Likewise.
+	(_bfd_mips_elf_hide_symbol): Make it static and cast to
+	`struct mips_elf_link_hash_entry *'.
+	(_bfd_mips_elf_copy_indirect_symbol): Make it static.
+
+2001-08-27  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* mipsbsd.c: Add missing prototypes.
+	* hp300hpux.c: Add missing prototypes.
+	* i386aout.c: Add missing prototypes.
+	* i386lynx.c: Add missing prototypes.
+	* i386mach3.c: Add missing prototypes.
+	* i386msdos.c: Add missing prototypes.
+	* i386os9k.c: Add missing prototypes.
+
+2001-08-27  Linus Nordberg  <linus@swox.se>
+	    Torbjorn Granlund  <tege@swox.com>
+	    Staffan Ulfberg  <staffanu@swox.se>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* config.bfd: Add powerpc64 target.  Add powerpc64 vectors to
+	targ64_selvecs for 32 bit powerpc targets.
+	* Makefile.am (BFD64_BACKENDS): Add elf64-ppc.lo.
+	(BFD64_BACKENDS_CFILES): Add elf64-ppc.c.
+	Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* configure.in: Add elf64_powerpc vecs.
+	* configure: Regenerate.
+	* cpu-powerpc.c: Default to bfd_mach_ppc_620 entry for 64 bit.
+	* elf.c (prep_headers): EM_PPC64 for 64 bit ppc elf target.
+	* targets.c: Add bfd_elf64_powerpc_vec and bfd_elf64_powerpcle_vec.
+	* elf64-ppc.c: New file.
+	* reloc.c: Add powerpc64 relocs.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2001-08-27  Andreas Schwab  <schwab@suse.de>
+
+	* elf32-m68k.c (elf32_m68k_check_relocs): Set DF_TEXTREL if the
+	reloc is against read-only section.
+	(elf32_m68k_size_dynamic_sections): Use DF_TEXTREL flag instead of
+	looking up section names for DT_TEXTREL.
+	(elf32_m68k_reloc_type_class): New function.
+	(elf_backend_reloc_type_class): Define.
+
+2001-08-27  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-s390.c (elf_s390_check_relocs): Set DF_TEXTREL if the
+	reloc is against read-only section.
+	(elf_s390_size_dynamic_sections): Use DF_TEXTREL flag instead of
+	looking up section names for DT_TEXTREL.
+	(elf_s390_reloc_type_class): New.
+	(elf_backend_reloc_type_class): Define.
+
+	* elf32-s390.c (elf_s390_check_relocs): Set DF_TEXTREL if the
+	reloc is against read-only section.
+	(elf_s390_size_dynamic_sections): Use DF_TEXTREL flag instead of
+	looking up section names for DT_TEXTREL.
+	(elf_s390_reloc_type_class): New.
+	(elf_backend_reloc_type_class): Define.
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Set DF_TEXTREL if the reloc
+	is against read-only section.
+	(ppc_elf_size_dynamic_sections): Use DF_TEXTREL flag instead of
+	looking up section names for DT_TEXTREL.
+	(ppc_elf_reloc_type_class): New.
+	(elf_backend_reloc_type_class): Define.
+
+2001-08-26  Andreas Jaeger  <aj@suse.de>
+
+	* elf32-cris.c (cris_elf_check_relocs): Set DF_TEXTREL if the
+	reloc is against read-only section.
+	(elf_cris_size_dynamic_sections): Use DF_TEXTREL flag instead of
+	looking up section names for DT_TEXTREL.
+	(elf_cris_reloc_type_class): New.
+	(elf_backend_reloc_type_class): Define.
+
+	* elf32-sh.c (sh_elf_check_relocs): Set DF_TEXTREL if the reloc is
+	against read-only section.
+	(elf_backend_reloc_type_class): Define.
+	(sh_elf_reloc_type_class): New.
+	(sh_elf_size_dynamic_sections): Use DF_TEXTREL flag instead of
+	looking up section names for DT_TEXTREL.
+
+	* elf32-arm.h (elf32_arm_check_relocs): Set DF_TEXTREL if the
+	reloc is against read-only section.
+	(elf32_arm_size_dynamic_sections): Use DF_TEXTREL flag instead of
+	looking up section names for DT_TEXTREL.
+	(elf32_arm_reloc_type_class): New.
+	(elf_backend_reloc_type_class): Define.
+
+2001-08-25  Andreas Jaeger  <aj@suse.de>
+
+	* oasys.c: Add missing prototypes.
+
+	* elf64-alpha.c (elf64_alpha_size_dynamic_sections): Add unused
+	attribute for parameter.
+	* elf.c (_bfd_elf_reloc_type_class): Likewise.
+
+	* versados.c (get_4): Make static.
+	(get_10): Make static.
+	Add missing prototypes.
+	(process_esd): Fix call to versados_new_symbol.
+
+2001-08-25  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* coff-a29k.c: Add missing prototypes.
+	* coff-apollo.c: Add missing prototypes.
+	* coff-arm.c: Add missing prototypes.
+	* coff-i860.c: Add missing prototypes.
+	* coff-rs6000.c: Add missing prototypes.
+	* coff-tic80.c: Add missing prototypes.
+	* elf-m10200.c: Add missing prototypes.
+	* elf-m10300.c: Add missing prototypes.
+	* elf32-arm.h: Add missing prototypes.
+	* elf32-d10v.c: Add missing prototypes.
+	* elf32-m32r.c: Add missing prototypes.
+	* elf32-mcore.c: Add missing prototypes.
+	* elf32-openrisc.c: Add missing prototypes.
+	* elf32-sh.c: Add missing prototypes.
+	* elf32-sparc.c: Add missing prototypes.
+	* elf32-v850.c: Add missing prototypes.
+	* elfarm-nabi.c: Add missing prototypes.
+	* elfarm-oabi.c: Add missing prototypes.
+
+2001-08-25  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elf32-mips.c (elf_mips_abi_name): Return the right ABI string for
+	E_MIPS_ABI_O64 and E_MIPS_ABI_EABI64
+
+2001-08-24  H.J. Lu  <hjl@gnu.org>
+
+	* elf.c (_bfd_elf_merge_sections): Fail if not using an ELF
+	hash structure.
+
+2001-08-24  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elf-bfd.h (elf_hash_table): Revert definition.
+	(is_elf_hash_table): New macro.
+	* elflink.h (elf_link_add_object_symbols): Test
+	is_elf_hash_table before accessing ELF only fields in hash
+	structure.
+	(elf_link_create_dynamic_sections): Fail if not using an ELF
+	hash structure.
+	(elf_add_dynamic_entry): Fail if not using an ELF hash
+	structure.
+	(elf_link_record_local_dynamic_symbol): Fail if not using an
+	ELF hash structure.
+	(size_dynamic_sections): Fail if not using an ELF hash
+	structure.
+	(elf_adjust_dynamic_symbol): Fail if not using an ELF
+	hash structure.
+	(elf_bfd_final_link): Fail if not using an ELF hash
+	structure.
+
+2001-08-24  H.J. Lu  <hjl@gnu.org>
+
+	* elf-bfd.h (elf_hash_table): Return NULL if the linker hash
+	table is not an ELF linker hash table.
+
+	* elf.c (_bfd_elf_link_hash_table_init): Set the linker hash
+	table type to bfd_link_elf_hash_table.
+
+	* elfxx-target.h (bfd_elfNN_bfd_link_hash_table_create): Revert
+	the last change.
+
+	* linker.c (_bfd_link_hash_table_init): Set the linker hash
+	table type to bfd_link_generic_hash_table.
+
+2001-08-24  Alexandre Oliva  <aoliva@redhat.com>
+
+	* bfd.c (bfd_alt_mach_code): New function.
+	* bfd-in2.h: Rebuilt.
+
+2001-08-24  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf-m10300.c (mn10300_elf_relocate_section): Test the right
+	`type' field in the hash entry when deciding whether to follow a
+	link.
+
+2001-08-24  Jakub Jelinek  <jakub@redhat.com>
+
+	* elflink.h (elf_link_sort_cmp1): Sort RELATIVE relocs first, not
+	last.
+	(elf_link_sort_relocs): Adjust accordingly.
+
+	* elf64-alpha.c (struct alpha_elf_link_hash_entry): Add reltext flag.
+	(elf64_alpha_check_relocs): Set it if section this reloc is against
+	is read-only.  Set DF_TEXTREL if a RELATIVE reloc is needed against
+	read-only section.
+	(elf64_alpha_calc_dynrel_sizes): Set DF_TEXTREL flag if relocation
+	is is against read-only section.
+	(elf64_alpha_size_dynamic_sections): Use DF_TEXTREL flag, don't
+	check section names.
+	(elf64_alpha_reloc_type_class): New.
+	(elf_backend_reloc_type_class): Define.
+
+2001-08-24  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* linker.c (_bfd_generic_link_add_archive_symbols): Replace alloca()
+	by bfd_malloc().
+
+2001-08-23  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-x86-64.c (elf64_x86_64_check_relocs): Set DF_TEXTREL if
+	the reloc is against read-only section.
+	(elf64_x86_64_size_dynamic_sections): Use DF_TEXTREL flag instead
+	of looking up section names for DT_TEXTREL.
+	(elf64_x86_64_reloc_type_class): New.
+	(elf_backend_reloc_type_class): Define.
+
+2001-08-23  H.J. Lu  <hjl@gnu.org>
+
+	* syms.c (bfd_print_symbol_vandf): Add abfd to arg.
+	* bfd-in2.h (bfd_print_symbol_vandf): Regenerated.
+
+	* aoutx.h (NAME(aout,print_symbol)): Pass abfd to
+	bfd_print_symbol_vandf.
+	* coffgen.c (coff_print_symbol): Likewise.
+	* elf.c (bfd_elf_print_symbol): Likewise.
+	* ieee.c (ieee_print_symbol): Likewise.
+	* nlmcode.h (nlm_print_symbol): Likewise.
+	* oasys.c (oasys_print_symbol): Likewise.
+	* pdp11.c (NAME(aout,print_symbol)): Likewise.
+	* som.c (som_print_symbol): Likewise.
+	* srec.c (srec_print_symbol): Likewise.
+	* tekhex.c (tekhex_print_symbol): Likewise.
+	* versados.c (versados_print_symbol): Likewise.
+	* vms.c (vms_print_symbol): Likewise.
+
+	* elf.c (_bfd_elf_print_private_bfd_data): Replace fprintf_vma
+	with bfd_fprintf_vma.
+	(bfd_elf_print_symbol): Likewise.
+	* syms.c (bfd_print_symbol_vandf): Likewise.
+
+2001-08-23  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* aoutf1.h (sunos_write_object_contents): Silence compile time
+	warning.
+	* libaout.h (N_SET_DYNAMIC): Silence compile time warning.
+
+	* bout.c: Add missing function prototypes.  Fix formatting.
+	* coff-z8k.c: Add missing function prototypes.  Fix formatting.
+	* coff-w65.c: Add missing function prototypes.  Fix formatting.
+	* coff-h8500.c: Add missing function prototypes.  Fix formatting.
+	* coff-h8300.c: Add missing function prototypes.  Fix formatting.
+	* coff-tic54x.c: Add missing function prototypes.  Fix formatting.
+	* coff-tic30.c: Add missing function prototypes.  Fix formatting.
+	* coff-m68k.c: Add missing function prototypes.  Fix formatting.
+	* coff-rs6000.c: Add missing function prototypes.  Fix formatting.
+	* coff-sh.c: Add missing function prototypes.  Fix formatting.
+
+2001-08-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf-bfd.h (enum elf_reloc_type_class): New.
+	(struct elf_backend_data): Add elf_backend_reloc_type_class.
+	(_bfd_elf_reloc_type_class): New.
+	* elfxx-target.h (elf_backend_reloc_type_class): Define.
+	(elfNN_bed): Add elf_backend_reloc_type_class.
+	* elf.c (_bfd_elf_reloc_type_class): New.
+	* elf32-i386.c (elf_i386_check_relocs): Set DF_TEXTREL if the reloc
+	is against read-only section.
+	(elf_i386_size_dynamic_sections): Use DF_TEXTREL flag instead of
+	looking up section names for DT_TEXTREL.
+	(elf_i386_reloc_type_class): New.
+	(elf_backend_reloc_type_class): Define.
+	* elf32-sparc.c (elf32_sparc_check_relocs): Set DF_TEXTREL if the
+	reloc is against read-only section.
+	(elf32_sparc_size_dynamic_sections): Use DF_TEXTREL flag instead of
+	looking up section names for DT_TEXTREL.
+	(elf32_sparc_reloc_type_class): New.
+	(elf_backend_reloc_type_class): Define.
+	* elf64-sparc.c (sparc64_elf_check_relocs): Set DF_TEXTREL if the
+	reloc is against read-only section.
+	(sparc64_elf_size_dynamic_sections): Use DF_TEXTREL flag instead of
+	looking up section names for DT_TEXTREL.
+	(sparc64_elf_reloc_type_class): New.
+	(elf_backend_reloc_type_class): Define.
+	* elfxx-ia64.c (struct elfNN_ia64_link_hash_table): Add reltext field.
+	(elfNN_ia64_hash_table_create): Clear ia64_info.
+	(get_reloc_section): Set DF_TEXTREL if the reloc is against read-only
+	section.
+	(elfNN_ia64_size_dynamic_sections): Use ia64_info->reltext flag
+	instead of looking up section names for DT_TEXTREL.
+	(elfNN_ia64_reloc_type_class): New.
+	(elf_backend_reloc_type_class): Define.
+	* elflink.h (size_dynamic_sections): Add spare DT_NULL tags.
+	(struct elf_link_sort_rela): New.
+	(elf_link_sort_cmp1, elf_link_sort_cmp2, elf_link_sort_relocs): New.
+	(elf_bfd_final_link): Call elf_link_sort_relocs.
+	Convert one spare DT_NULL into DT_RELCOUNT resp. DT_RELACOUNT if
+	necessary.
+
+2001-08-23  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* configure.in (x86-bsdi): No corefile support.
+	* configure: Regenerate.
+
+2001-08-22  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* coff-stgo32.c (COFF_SECTION_ALIGNMENT_ENTRIES): Add missing
+	comma.
+
+2001-08-21  Mark Elbrecht  <snowball3@bigfoot.com>
+
+	* coff-go32.c: Make DWARF2 sections use an alignment of 0.  Set
+	the alignment of dwarf2 linkonce sections to 0.
+	* coff-sto32.c: Likewise.
+
+2001-08-20  Andreas Jaeger  <aj@suse.de>
+
+	* coff-sparc.c: Add missing prototypes.
+	* elf32-s390.c: Likewise.
+	* elf32-i960.c: Likewise.
+	* aout-target.h: Likewise.
+
+2001-08-20  H.J. Lu  <hjl@gnu.org>
+
+	* elf-bfd.h (elf_obj_tdata): Add num_section_syms.
+	(elf_num_section_syms): New for num_section_syms.
+
+	* elf.c (elf_map_symbols): Set num_section_syms.
+	(_bfd_elf_symbol_from_bfd_symbol): Check num_section_syms for
+	the section symbol index.
+
+2001-08-20  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elfxx-target.h (bfd_elfNN_bfd_link_hash_table_create): Never
+	select the generic has table creator.  All elf backends need elf
+	specific fields in the hash table.
+
+2001-08-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* archive.c (offsetof): Remove define.
+	* elf.c: Likewise.
+	* oasys.c: Likewise
+	* sysdep.h (offsetof): Define.
+
+2001-08-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd.c (bfd_get_gp_size): Return an unsigned int.
+	(bfd_set_gp_size): Make param unsigned.
+	* bfd-in2.h: Regenerate.
+	* elf32-ppc.c (ppc_elf_add_symbol_hook): Use elf_gp_size rather
+	than calling bfd_get_gp_size.
+	* elf64-alpha.c (elf64_alpha_add_symbol_hook): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_add_symbol_hook): Likewise.
+
+2001-08-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* linker.c (default_fill_link_order): Handle four byte fill value.
+
+2001-08-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-sparc.c (sparc64_elf_output_arch_syms): Add missing
+	prototype.
+	* nlm32-alpha.c (nlm_alpha_write_external): Fix warning.
+
+	* elf64-mips.c (UNUSED_RELOC): Define.
+	(mips_elf64_howto_table_rel): Use it.
+	(mips_elf64_howto_table_rela): Here too.
+	(mips_elf64_write_relocs): Fix signed/unsigned warning.
+
+	* coffcode.h (coff_write_object_contents): Add ATTRIBUTE_UNUSED to
+	silence warning.
+	* coffgen.c (coff_print_symbol): Fix warnings.
+	(coff_find_nearest_line): Likewise.
+	* cofflink.c (_bfd_coff_link_input_bfd): Likewise.
+	* coff-alpha.c (alpha_convert_external_reloc): Likewise.
+	* format.c (bfd_check_format_matches): Likewise.
+	(bfd_set_format): Likewise.
+	* coff-ia64.c: Add missing prototypes.
+	* elf64-alpha.c (struct alpha_elf_link_hash_entry): Make addend
+	signed to silence warnings.
+	(elf64_alpha_relocate_section): Likewise.
+	(elf64_alpha_find_reloc_at_ofs): Fix warnings.
+	(elf64_alpha_add_symbol_hook): Likewise.
+	(elf64_alpha_final_link): Likewise.
+	(elf64_alpha_relax_section): Remove redundant assign to info.gotent.
+	(elf64_alpha_merge_gots): Add ATTRIBUTE_UNUSED to unused args.
+	(elf64_alpha_size_got_sections): Likewise.
+	* elfxx-ia64.c: Add missing prototypes.
+	(elfNN_ia64_relocate_section): Fix warning.
+	(elfNN_ia64_unwind_entry_compare): Make params const.
+
+2001-08-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* config.bfd (targ64_selvecs): New.
+	<powerpc-*-aix* entry>: Use it here instead of ineffectual #ifdef.
+
+	* bfd-in.h (BFD_VERSION): Remove wrong comment.
+	(BFD_DEFAULT_TARGET_SIZE): New.
+	(BFD_ARCH_SIZE): Comment.
+	* configure.in (target_size): New.  Set instead of target64 in
+	selvecs case statement.  Set target64 from it.
+	(bfd_default_target_size): New.  Set from taget_size. AC_SUBST.
+	* bfd-in2.h: Regenerate.
+	* configure: Regenerate.
+
+2001-08-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd.c (enum bfd_error): Add bfd_error_wrong_object_format.
+	(bfd_errmsgs): Add corresponding message.
+	* archive.c (bfd_generic_archive_p): Don't release bfd_ardata when
+	finding an archive that contains different format object files.
+	Return bfd_error_wrong_object_format for this case.
+	* format.c: Formatting fixes.  s/CONST/const/.
+	(bfd_check_format_matches): Accept archives that give
+	bfd_error_wrong_object_format if no full match is found.  Tidy
+	code handling matching_vector.  Don't return a pointer to freed
+	memory in `matching'.  Handle ambiguous matches as for partial
+	archive matches.
+	* bfd-in2.h: Regenerate.
+
+2001-08-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* libieee.h (common_header_type): Add last_byte field.
+
+	* ieee.c: Add missing prototypes.  Some format fixes.
+	(struct output_buffer_struct): Move for availability to prototypes.
+	(ieee_part_after): New function.
+	(ieee_slurp_debug): Use it here.
+	(ieee_seek): Pass in ieee_data_struct rather than bfd.  Use
+	ieee_part_after to set last_byte to one past end of current part.
+	Update callers.
+	(ieee_pos): Pass in ieee_data_struct rather than bfd.
+	Update callers.
+	(parse_expression): Don't go beyond the end of the current part.
+	(ieee_slurp_external_symbols): Correct type passed to read_2bytes.
+	(ieee_get_symtab_upper_bound, ieee_get_symtab,
+	ieee_get_symbol_info, ieee_print_symbol, ieee_new_section_hook,
+	ieee_get_reloc_upper_bound, ieee_canonicalize_reloc, block,
+	ieee_set_section_contents, ieee_write_object_contents,
+	ieee_make_empty_symbol): Make static.
+	(ieee_archive_p): Correct comments regarding bfd_read.
+	(ieee_object_p): Similarly.
+	(ieee_mkobject): Move it.  Clear output_ptr_start, output_ptr,
+	output_ptr_end, input_ptr_start, input_ptr, input_ptr_end,
+	input_bfd, output_bfd, output_buffer.
+	(do_as_repeat): Write out ieee_set_current_pc_enum value as for
+	do_with_relocs, ie. as a symbol for relocatable files.
+	(ieee_vec): Add comments showing functions referenced by macros.
+
+2001-08-14  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* aout-tic30.c: Add missing prototypes.  Fix formatting.
+	* aout-ns32k.c: Add missing prototypes.  Fix formatting.
+	* peXXigen.c: Add missining prototypes.  Fix formatting.
+	* aout-adobe.c: Add missining prototypes.  Fix formatting.
+
+2001-08-13  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elf32-v850.c: Add missing function prototypes.
+	Fix some formatting.
+
+	* cpu-v850.c: Add missing function prototype.
+	Fix some formatting.
+
+2001-08-11  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elf-bfd.h (struct elf_backend_data): Add new fields
+	'elf_backend_sprintf_vma' and 'elf_backend_fprintf_vma'.
+	(bfd_elf_sprintf_vma): Rename function prototype to
+	'_bfd_elf_sprintf_vma'.
+	(bfd_elf_fprintf_vma): Rename function prototype to
+	'_bfd_elf_fprintf_vma'.
+	* bfd.c (bfd_sprintf_vma): Do not invoke bfd_elf_sprintf_vma
+	directly, instead indirect via the elf_backend_data structure.
+	(bfd_fprintf_vma): Do not invoke bfd_elf_fprintf_vma directly,
+	instead indirect via the elf_backend_data structure.
+	* elf.c (bfd_elf_sprintf_vma): Rename to _bfd_elf_sprintf_vma.
+	(bfd_elf_fprintf_vma): Rename to _bfd_elf_fprintf_vma.
+	* elfxx-target.h (elf_backend_sprintf_vma): Initialise if not
+	already defined.
+	(elf_backend_fprintf_vma): Initialise if not already defined.
+	(struct elf_backend_data): Initialise the
+	elf_backend_sprintf_vma and elf_backend_fprintf_vma fields.
+
+2001-08-10  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-sparc.c: Add missing prototypes.
+	* elf32-cris.c: Likewise.
+	* elf32-i370.c: Likewise.
+	* elf64-hppa.c: Likewise.
+	* elf64-s390.c: Likewise.
+
+2001-08-10  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-x86-64.c (elf64_x86_64_elf_object_p): Make static.
+	Add prototypes where needed.
+
+2001-08-10  H.J. Lu  <hjl@gnu.org>
+
+	* bfd.c (bfd_sprintf_vma): Fix a typo in the last change.
+	(bfd_fprintf_vma): Likewise.
+
+2001-08-10  H.J. Lu  <hjl@gnu.org>
+
+	* bfd.c (bfd_sprintf_vma): Don't return void.
+	(bfd_fprintf_vma): Likewise.
+
+2001-08-10  Andreas Jaeger  <aj@suse.de>
+
+	* configure.in: Add -Wstrict-prototypes and -Wmissing-prototypes
+	to build warnings.
+	* configure: Regenerate.
+
+2001-08-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (bfd_elf_sprintf_vma): Add ATTRIBUTE_UNUSED to quiet
+	warning if not BFD64.  Add braces so emacs auto format works.
+	(bfd_elf_fprintf_vma): Likewise.
+
+	* libxcoff.h (struct xcoff_backend_data_rec): Constify src param
+	of _xcoff_swap_ld*.
+	* coff-rs6000.c (xcoff_swap_ldhdr_in): Modify type of external
+	param to agree with libxcoff.h.
+	(xcoff_swap_ldhdr_out): Likewise.
+	(xcoff_swap_ldsym_in): Likewise.
+	(xcoff_swap_ldsym_out): Likewise.
+	(xcoff_swap_ldrel_in): Likewise.
+	(xcoff_swap_ldrel_out): Likewise.
+	(xcoff_create_csect_from_smclas): Likewise.
+	* coff64-rs6000.c: Add missing prototypes.
+	(xcoff64_swap_ldhdr_in): Modify type of external param to agree
+	with libxcoff.h.
+	(xcoff64_swap_ldhdr_out): Likewise.
+	(xcoff64_swap_ldsym_in): Likewise.
+	(xcoff64_swap_ldsym_out): Likewise.
+	(xcoff64_swap_ldrel_in): Likewise.
+	(xcoff64_swap_ldrel_out): Likewise.
+	(xcoff64_ppc_relocate_section): Make static.
+	(xcoff64_slurp_armap): Likewise.
+	(xcoff64_archive_p): Likewise.
+	(xcoff64_openr_next_archived_file): Likewise.
+	(xcoff64_sizeof_headers): Likewise.
+	(xcoff64_is_lineno_count_overflow): Likewise.
+	(xcoff64_is_reloc_count_overflow): Likewise.
+	(xcoff64_loader_symbol_offset): Likewise.
+	(xcoff64_loader_reloc_offset): Likewise.
+	* elf64-gen.c: Add missing prototypes.
+
+2001-08-09  H.J. Lu  <hjl@gnu.org>
+
+	* elf.c (bfd_elf_sprintf_vma): Check ELFCLASS64 only in BFD64.
+	(bfd_elf_fprintf_vma): Likewise.
+
+2001-08-09  H.J. Lu  <hjl@gnu.org>
+
+	* bfd-in.h (bfd_elf_sprintf_vma, bfd_elf_fprintf_vma): Moved
+	to ...
+	* elf-bfd.h: Here.
+	* bfd-in2.h: Regenerated.
+
+2001-08-09  H.J. Lu  <hjl@gnu.org>
+
+	* bfd-in.h (bfd_sprintf_vma): New prototype.
+	(bfd_fprintf_vma): Likewise.
+	(bfd_elf_sprintf_vma): Likewise.
+	(bfd_elf_fprintf_vma): Likewise.
+	(bfd_printf_vma): New. Defined with bfd_fprintf_vma.
+	* bfd-in2.h: Regenerated.
+
+	* bfd.c (bfd_sprintf_vma): New. Defined.
+	(bfd_fprintf_vma): Likewise.
+
+	* elf.c (bfd_elf_sprintf_vma): New. Defined.
+	(bfd_elf_fprintf_vma): Likewise.
+
+2001-08-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* coff-rs6000.c: Add missing prototypes.
+	(xcoff_ppc_relocate_section, xcoff_is_lineno_count_overflow,
+	xcoff_is_reloc_count_overflow, xcoff_loader_symbol_offset,
+	xcoff_loader_reloc_offset): Make static.
+	* dwarf1.c: Add missing prototypes.
+	* dwarf2.c: Add missing prototypes.
+	(struct abbrev_info): Move definition.
+	(struct attr_abbrev, ABBREV_HASH_SIZE, ATTR_ALLOC_CHUNK): Likewise.
+	* elf.c: Add missing prototypes.
+	* elf32-gen.c: Likewise.
+	* elf32-i386.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	(ppc_elf_sort_rela): Use PTR instead of "void *".
+	* elflink.h: Add missing prototypes.  Formatting fixes.
+	* merge.c: Add missing prototypes.
+	(last4_eq): Use PTR instead of "void *".
+	(last_eq): Likewise.
+	* syms.c: Add missing prototypes.
+
+2001-08-09  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* bfd.c: Fix formatting.
+	* bfd-in2.h: Regenerate.
+
+2001-08-09  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elf32-arc.c (R_ARC_B22_PCREL): Change 'partial_inplace' to
+	true (this target uses REL relocations) and 'pcrel_offset' to
+	false (the PC is implied, not stored in the offset).
+
+2001-08-08  Alan Modra  <amodra@bigpond.net.au>
+
+	1999-10-19  Linus Nordberg  <linus@swox.se>
+	* elf-bfd.h (struct elf_backend_data): Add want_got_sym.
+	* elfxx-target.h (elf_backend_want_got_sym): Define.
+	(elfNN_bed): Add elf_backend_want_got_sym.
+	* elflink.c (_bfd_elf_create_got_section): Define
+	_GLOBAL_OFFSET_TABLE_ only if bed->want_got_sym.
+
+2001-08-08  Alexandre Oliva  <aoliva@redhat.com>
+
+	* dwarf2.c (struct dwarf2_debug): Add sec, sec_info_ptr and syms.
+	(find_rela_addend): New function.
+	(parse_comp_unit): Call it to find the abbrev offset addend.
+	(_bfd_dwarf2_find_nearest_line): Initialize and maintain the new
+	members of dwarf2_debug as debugging information is read.
+
+2001-08-07  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* coff-sh.c (sh_coff_reloc_type_lookup): Provide for sh-coff
+	targets as well as sh-pe.
+
+2001-08-03  Ben Harris <bjh21@netbsd.org>
+
+	* elf32-arm.h (elf32_arm_final_link_relocate): Include offset of
+	reloc from start of section when computing value for R_ARM_REL32
+	reloc.
+
+2001-08-03  Alan Modra  <amodra@bigpond.net.au>
+
+	From  H.J. Lu  <hjl@gnu.org>
+	* elf32-i386.c (allocate_plt_and_got_and_discard_relocs): Don't
+	keep relocs for undefined syms if there are no dynamic sections in
+	executable.
+	* elf32-hppa.c (allocate_plt_and_got_and_discard_relocs): Likewise.
+
+2001-08-02  Paul Sokolovsky  <paul.sokolovsky@technologist.com>
+
+	* cofflink.c (coff_link_check_ar_symbols): also search for
+	__imp__symbol as well as _symbol.
+	* linker.c (_bfd_generic_link_add_archive_symbols): also
+	search for __imp__symbol as well as _symbol.
+
+2001-08-01  Adam Nemet  <anemet@lnxw.com>
+
+	* elf.c (elf_sort_sections): Return zero only as the last step.
+
+2001-08-01  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* config.bfd (arm-vxworks): Change name of define from VXWORKS to
+	ARM_COFF_BUGFIX.
+	(arm-epoc-pe): Define ARM_COFF_BUGFIX.
+	coff-arm.c (coff_arm_relocate_section): Replace VXWORKS with
+	ARM_COFF_BUGFIX.
+
+2001-07-30  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* libecoff.h (_bfd_ecoff_styp_to_sec_flags): Changed return type
+	to match corresponding bfd_coff_backend data member.
+
+2001-07-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Update dependencies with "make dep-am".
+	* Makefile.in: Regenerate
+
+2001-07-15  H.J. Lu  <hjl@gnu.org>
+
+	* Makefile.am (po/SRC-POTFILES.in): Use tmp.src instead of tmp.
+	(po/BLD-POTFILES.in): Use tmp.bld instead of tmp.
+	* Makefile.in: Regenerate.
+
+2001-07-11  H.J. Lu  <hjl@gnu.org>
+
+	* elf64-alpha.c (elf64_alpha_check_relocs): Set the ALLOC|LOAD
+	flags when creating the reloc section if the ALLOC flag in the
+	source section is set.
+
+2001-07-11  Steve Ellcey  <sje@cup.hp.com>
+
+	* reloc.c (bfd_reloc_code_type): Add IA64 relocs
+	BFD_RELOC_IA64_LTOFF_FPTR32MSB and BFD_RELOC_IA64_LTOFF_FPTR32LSB
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* elfxx-ia64.c (ia64_howto_table): Define how to handle
+	new relocations.
+	(elfNN_ia64_reloc_type_lookup): Handle new relocations.
+	(elfNN_ia64_check_relocs): Likewise.
+	(elfNN_ia64_install_value): Likewise.
+	(elfNN_ia64_relocate_section): Likewise.
+
+2001-07-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-sparc.c (_bfd_sparc_elf_howto_table): Remove support for
+	R_SPARC_UA64.
+	(elf32_sparc_check_relocs): Likewise.
+	Only create .rela section for alloced sections in shared libraries.
+	(elf32_sparc_relocate_section): Likewise.
+	Remove redundant check.
+	Optimize unaligned reloc usage.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Remove redundant
+	check.
+
+2001-07-11  H.J. Lu  <hjl@gnu.org>
+
+	* elf64-alpha.c (elf64_alpha_check_relocs): Only use the same
+	ALLOC|LOAD flags as the source section for debugging sections
+	when creating the reloc section.
+
+2001-07-05  Jim Wilson  <wilson@redhat.com>
+
+	* linker.c (_bfd_generic_link_add_one_symbol, case BIG): Use
+	the section of the bigger symbol.
+
+	* syms.c (bfd_is_local_label): Return false if BSF_SECTION_SYM.
+
+2001-07-05  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* peicode.h (coff_swap_scnhdr_in): For sections containing
+	uninitialised data, only set their size to s_paddr if this does
+	not reset their size to zero.  MS's latest compilers will set
+	s_paddr to zero.
+
+2001-07-04  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-mips.c (_bfd_mips_elf_final_write_processing):
+	Handle bfd_mach_mips4400, bfd_mach_mips4600 and
+	bfd_mach_mips5000.
+
+2001-07-03  Mark Elbrecht  <snowball3@softhome.net>
+
+	* bfd.c (bfd_get_sign_extend_vma): Support DJGPP COFF targets.
+
+	* cofflink.c (_bfd_coff_link_input_bfd): Skip section symbols from
+	sections being discarded.
+
+2001-06-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* elfcore.h (elf_core_file_p): Call bfd_section_from_phdr directly
+	instead of _bfd_elfcore_section_from_phdr.
+	* elf-bfd.h (_bfd_elfcore_section_from_phdr): Remove.
+	* elf.c (_bfd_elfcore_section_from_phdr): Remove.
+	(_bfd_elfcore_make_pseudosection): Expedite tail-call.
+	(elfcore_grok_prstatus): Likewise.
+	(elfcore_grok_lwpstatus): Likewise.
+	(bfd_get_elf_phdr_upper_bound): Likewise.
+	(elfcore_make_note_pseudosection): Formatting.
+	(_bfd_elfcore_strndup): Formatting.
+	* elf32-mips.c (mips_elf_sym_is_global): Formatting.
+	(_bfd_elf32_mips_grok_prstatus): Expedite tail-call.
+
+2001-06-29  Daniel Jacobowitz  <drow@mvista.com>
+
+	* elf-bfd.h: Add prototypes for _bfd_elfcore_make_pseudosection
+	and _bfd_elfcore_strndup.
+	(struct elf_backend_data): Add elf_backend_grok_prstatus
+	and elf_backend_grok_psinfo.
+	* elf.c (_bfd_elfcore_make_pseudosection): New function.
+	(elfcore_grok_prstatus): Use it.
+	(elfcore_make_note_pseudosection): Likewise.
+	(elfcore_strndup):  Rename to...
+	(_bfd_elfcore_strndup): Here, and make global.
+	(elfcore_grok_psinfo): Use _bfd_elfcore_strndup.
+	(elfcore_grok_note): Call elf_backend_grok_prstatus
+	and elf_backend_grok_psinfo if available.
+	* elf32-mips.c (_bfd_elf32_mips_grok_prstatus): New function.
+	(_bfd_elf32_mips_grok_psinfo): New function.
+	(elf_backend_grok_prstatus): Define.
+	(elf_backend_grok_psinfo): Define.
+	* elfxx-target.h (elf_backend_grok_prstatus): Default to NULL.
+	(elf_backend_grok_psinfo): Likewise.
+	(elfNN_bed): Include elf_backend_grok_prstatus and
+	elf_backend_grok_psinfo.
+
+2001-06-29  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-hppa.c (elf32_hppa_finish_dynamic_sections): Check if
+	hplink->sgot is NULL before filling GOT.  Check if hplink->splt
+	is NULL before filling PLT.
+
+2001-06-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_link_output_extsym): Revert 1999-04-10.
+
+2001-06-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-hppa.c (elf32_hppa_check_relocs): Don't make syms dynamic
+	here..
+	(elf32_hppa_adjust_dynamic_symbol): ..nor here..
+	(allocate_plt_and_got_and_discard_relocs): .. instead do so here
+	after gc has run.
+
+	* elf32-hppa.c (RELATIVE_DYNAMIC_RELOCS): Delete.
+	(IS_ABSOLUTE_RELOC): Define.
+	(elf32_hppa_link_hash_entry): Always include reloc_entries field.
+	(hppa_link_hash_newfunc): Always init it.
+	(elf32_hppa_check_relocs): Mark symbols as ELF_LINK_NON_GOT_REF to
+	create COPY relocs only when the reloc is in a read-only section.
+	Instead, allocate space for a dynamic reloc to reference the
+	library symbol directly.  Keep track of space we allocate using
+	relocs_entries.
+	(hppa_discard_copies): Delete, and move code to..
+	(allocate_plt_and_got): ..here.  Rename to
+	allocate_plt_and_got_and_discard_relocs.  Remove unneeded dynamic
+	relocs for non-shared link.
+	(elf32_hppa_size_dynamic_sections): Update calls to above.
+	(elf32_hppa_relocate_section): Write out the dynamic relocs used
+	in lieu of COPY relocs.
+
+	* elf32-i386.c (elf_i386_check_relocs): Don't make syms dynamic
+	here..
+	(elf_i386_adjust_dynamic_symbol): ..nor here..
+	(allocate_plt_and_got_and_discard_relocs): .. instead do so here
+	after gc has run.
+	(elf_i386_size_dynamic_sections): Fix a comment.
+	(elf_i386_relocate_section <R_386_32, R_386_PC32>): Rearrange code
+	involved in writing reloc out.
+
+2001-06-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-i386.c (elf_i386_check_relocs <R_386_32, R_386_PC32>):
+	Ensure syms are dynamic if we might be emitting a reloc.
+	(allocate_plt_and_got_and_discard_relocs): Don't discard relocs
+	for undefweak or undefined syms..
+	(elf_i386_relocate_section <R_386_32, R_386_PC32>): .. and emit.
+
+	* elf32-i386.c (allocate_plt_and_got_and_discard_relocs): Discard
+	relocs without ELF_LINK_HASH_DEF_DYNAMIC set.
+	(elf_i386_relocate_section <R_386_32, R_386_PC32>): Remove
+	redundant bfd_link_hash_defined, bfd_link_hash_defweak test.
+
+2001-06-24  H.J. Lu  <hjl@gnu.org>
+
+	* cpu-i960.c (scan_960_mach): Don't modify const char *. Use
+	strncasecmp/strcasecmp instead of strncmp/strcmp.
+
+2001-06-23  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-i386.c (elf_i386_relocate_section <R_386_32, R_386_PC32>):
+	Check ELF_LINK_HASH_DEF_DYNAMIC to see if a symbol is not defined
+	in the regular object file and treat the weak definition as
+	the normal one.
+
+2001-06-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-i386.c (elf_i386_relocate_section <R_386_GOT32>): Tighten
+	unresolved_reloc test to exclude cases where we use "relocation"
+	before setting it to point into the .got.  Reinstate fudge for
+	unresolved relocs in debugging sections.
+
+	* elf32-i386.c (elf_i386_relocate_section): Replace ugly
+	complicated tests for unresolvable relocs with a simple direct
+	scheme using "unresolved_reloc" var.
+
+	* elf32-i386.c (struct elf_i386_pcrel_relocs_copied): Rename to
+	elf_i386_dyn_relocs.  Update comment.
+	(struct elf_i386_link_hash_entry): Rename pcrel_relocs_copied to
+	dyn_relocs.
+	(elf_i386_adjust_dynamic_symbol): Remove a BFD_ASSERT, change
+	others to aborts.
+	(allocate_plt_and_got_and_discard_relocs): Replace BFD_ASSERT with
+	abort.
+	(elf_i386_size_dynamic_sections): Likewise.
+	(elf_i386_finish_dynamic_symbol): Likewise.
+	(elf_i386_finish_dynamic_sections): Likewise.
+	(elf_i386_relocate_section): Likewise.  Tidy R_386_GOT32 and error
+	handling code.
+
+	Avoid creating COPY relocs if possible.
+	* elf32-i386.c (elf_i386_check_relocs): Tweak condition under
+	which .got created.  Mark symbols used by R_386_32 and R_386_PC32
+	relocs as ELF_LINK_NON_GOT_REF to create COPY relocs only when the
+	reloc is in a read-only section.  Instead, allocate space for a
+	dynamic reloc to reference the library symbol directly.  Keep
+	track of space we allocate using pcrel_relocs_copied.
+	(discard_copies): Delete, and move code to ..
+	(allocate_plt_and_got): ..here.  Rename to
+	allocate_plt_and_got_and_discard_relocs.  Remove unneeded dynamic
+	relocs for non-shared link.
+	(elf_i386_size_dynamic_sections): Update calls to above functions.
+	(elf_i386_relocate_section): Write out the dynamic relocs.  Add
+	more ugly logic to avoid "unresolvable relocation" error.  Use
+	htab shortcut in place of elf_hash_table macro.
+	(elf_i386_finish_dynamic_sections): Allow that dynamic .got may
+	not always be created now.
+
+2001-06-20  Bo Thorsen  <bo@suse.co.uk>
+
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Fix linking of
+	shared libraries.
+
+2001-06-18  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* configure.host (mips64-*-linux): Reformat.
+
+2001-06-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-hppa.c (elf32_hppa_size_dynamic_sections): Always
+	allocate local .got space.  Use shortcuts from hash table for .got
+	and .plt rather than comparing section names.
+	(elf32_hppa_check_relocs): Use local_plt_refcounts var rather than
+	adjusting index into local_got_refcounts to document what we are
+	really doing.
+	(elf32_hppa_relocate_section): Similarly for local_plt_offsets.
+	Tidy .got and .plt error checking.
+
+2001-06-20  Catherine Moore  <clm@redhat.com>
+
+	* elf-bfd.h (struct elf_backend_data):
+	elf_backend_emit_relocs: New field: Function for emitting
+	relocs.
+	elf_backend_count_relocs: New field: Function for determining
+	the number of relocs to be emitted.
+	* elfxx-target.h: Provide default (NULL) values for
+	elf_backend_emit_relocs and elf_backend_count_relocs.
+	* elflink.h (elf_link_size_reloc_section): Make the hash table
+	big enough to hold the relocs counted by either reloc_count or
+	o->reloc_count.
+	(elf_bfd_final_link) emit_relocs: New boolean, set if relocs
+	should be emitted, either because of a command line option
+	stored in the info structure or because the target provides a
+	special reloc emitting function.
+	If the target provides a reloc counting function use it,
+	unless performing a relocatable link or emitting all relocs.
+	Also set the SEC_RELOC flag on any output section which will
+	contain relocs.
+	(elf_link_input_bfd): emit_relocs: New boolean, set if relocs
+	should be emitted, either because of a command line option
+	stored in the info structure or because the target provides a
+	special reloc emitting function.
+	If the target provides a reloc emitting function, use it,
+	unless performing a relocatable link or emitting all relocs.
+
+2001-06-20  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-i386.c (elf_i386_size_dynamic_sections): Always
+	allocate local .got space.
+
+2001-06-19  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Fix creation of
+	dynamic symbols.
+
+2001-06-18  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elflink.h (struct elf_assign_sym_version_info): Remove member
+	export_dynamic.  All users changed to use info member.
+	NAME(bfd_elf,size_dynamic_sections)): Remove parameter
+	export_dynamic, instead use member in parameter info.
+	* bfd-in.h (bfd_elf32_size_dynamic_sections,
+	bfd_elf64_size_dynamic_sections): Update prototype.
+	* bfd-in2.h: Regenerate.
+
+2001-06-18  H.J. Lu  <hjl@gnu.org>
+
+	* elflink.h (elf_info_failed): Add a new field, verdefs.
+	(NAME(bfd_elf,size_dynamic_sections): Pass verdefs to
+	elf_export_symbol.
+	(elf_export_symbol): Check eif->verdefs to decide if a symbol
+	should be exported.
+
+2001-06-17  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-mips.c (mips_elf_link_hash_entry): Add a new field,
+	readonly_reloc, to record if a relocation in the .rel.dyn
+	section is against a read-only section.
+	(mips_elf_link_hash_newfunc): Initialize the readonly_reloc
+	field to false.
+	(_bfd_mips_elf_check_relocs): Record if there is a relocation
+	in the .rel.dyn section against a read-only section by setting
+	DF_TEXTREL or readonly_reloc.
+	(_bfd_mips_elf_copy_indirect_symbol): Copy readonly_reloc if
+	it is true.
+	(_bfd_mips_elf_adjust_dynamic_symbol): Record DF_TEXTREL if
+	there is a relocation in the .rel.dyn section against a
+	read-only section.
+	(_bfd_mips_elf_size_dynamic_sections): Set DT_TEXTREL if
+	DF_TEXTREL is set.
+
+2001-06-12  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* coffcode.h (styp_flags_to_sec_flags): Change to a boolean
+	function.  Move flagword result into parameter list.  Remove
+	comment about setting bfd_error_handler to intercept failure
+	results.
+	* coffgen.c (make_a_section_from_file): Examine result of
+	calling bfd_coff_styp_to_sec_flags and pass a failure back to
+	caller.
+	* ecoff.h (styp_flags_to_sec_flags): Change to a boolean
+	function.  Move flagword result into parameter list.
+	* libcoff.h: Regenerate.
+	* libecoff.h: Regenerate.
+
+2001-06-13  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* aoutx.h (adjust_z_magic): Only pad the tesxt section if the data
+	section is going to follow it.
+
+2001-06-12  Catherine Moore  <clm@redhat.com>
+
+	* elflink.h (elf_gc_propagate_vtable_entries): Replace FILE_ALIGN
+	with the file_align entry from elf_backend_data.
+	(elf_gc_smash_unused_vtentry_relocs): Likewise.
+	(elf_gc_record_vtentry): Likewise.
+
+2001-06-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h: Whitespace changes.
+	(elf_link_read_relocs_from_section): Use "unsigned int" iterator
+	rather than "unsigned char".
+	(elf_link_output_relocs): Likewise.
+	(elf_link_input_bfd): Likewise.
+	(elf_reloc_link_order): LIkewise.
+	* elf.c: s/CONST/const/.  Whitespace changes.
+	* elf32-mips.c: Formatting fix.
+
+	* Makefile.am (SOURCE_HFILES): Include xcoff-target.h, remove xcoff.h.
+	* Makefile.in: Regenerate.
+	* po/Make-in: Remove trailing tab.
+
+2001-06-09  Philip Blundell  <philb@gnu.org>
+
+	* elf32-arm.h (elf32_arm_plt0_entry): Correct error in last
+	change.
+	(elf32_arm_plt_entry): Likewise.
+
+2001-06-08  H.J. Lu  <hjl@gnu.org>
+
+	* elf.c (swap_out_syms): Keep names for global section symbols.
+
+2001-06-07  H.J. Lu  <hjl@gnu.org>
+
+	* config.bfd: Put back ecoff for Linux/mips. Firmwares on some
+	MIPS-based machines need it.
+
+2001-06-07  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-mips.c (_bfd_mips_elf_object_p): Set the bad symtab
+	for SGI only.
+
+	* config.bfd: Remove ecoff from Linux/mips.
+
+2001-06-07  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-x86-64.c (elf64_x86_64_finish_dynamic_symbol): Add an
+	assertion.
+	(elf64_x86_64_check_relocs): Fix VTENTRY relocation; set an
+	alignment of 8 for .rela sections; handle further relocations.
+
+2001-06-06  Christian Groessler <cpg@aladdin.de>
+
+	* coff-z8k.c: Fix formatting.
+	Fix howtos: howto->size was always 1.
+
+2001-06-05  Thiemo Seufer  <seufer@csv.ica.uni-stuttgart.de>
+
+	* configure.host (mips64*-*-linux*): Define.
+
+2001-06-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-i386.c (elf_i386_discard_copies): Rename to
+	discard_copies, and use elf_link_hash_entry arg rather than
+	elf_i386_link_hash_entry.
+	(elf_i386_link_hash_traverse): Delete.
+	(elf_i386_size_dynamic_sections): Adjust call to discard_copies.
+	Tidy sizing of dynamic sections.
+	(elf_i386_check_relocs <R_386_32, R_386_PC32>): Reference count
+	possible .plt entries.
+	(elf_i386_gc_sweep_hook): Likewise.
+	(elf_i386_adjust_dynamic_symbol): Discard .plt entries for
+	everything with plt.refcount <= 0.
+
+	* elf32-i386.c (elf_i386_check_relocs): Don't allocate .got and
+	.relgot space here.
+	(elf_i386_gc_sweep_hook): ..and no need to deallocate here..
+	(elf_i386_adjust_dynamic_symbol): ..and don't allocate .plt and
+	.rel.plt here..
+	(allocate_plt_and_got): ..instead do it all here.  New function.
+	(elf_i386_size_dynamic_sections): Allocate local .got space and
+	call allocate_plt_and_got.  No need to zap .relgot if not dynamic.
+	(bfd_elf32_bfd_final_link): Delete.  (ie. use regular final link
+	rather than gc variety).
+	(WILL_CALL_FINISH_DYNAMIC_SYMBOL): Define.
+	(elf_i386_relocate_section): Use it here and correct handling of
+	R_386_GOT32.  Provide section and offset for "unresolvable
+	relocation" error message.
+	(elf_i386_finish_dynamic_symbol): Correct handling of R_386_GOT32.
+
+	* elf32-i386.c (struct elf_i386_link_hash_table): Add sgot,
+	sgotplt, srelgot, splt, srelplt, sdynbss, srelbss fields.
+	(elf_i386_link_hash_table_create): Init them.
+	(create_got_section): New function.
+	(elf_i386_create_dynamic_sections): New function.
+	(elf_backend_create_dynamic_sections): Set to above.
+	(elf_i386_check_relocs): Use shortcuts from hash table rather than
+	calling bfd_get_section_by_name.
+	(elf_i386_gc_sweep_hook): Likewise.
+	(elf_i386_adjust_dynamic_symbol): Likewise.
+	(elf_i386_size_dynamic_sections): Likewise.
+	(elf_i386_relocate_section): Likewise.
+	(elf_i386_finish_dynamic_sections): Likewise.
+
+	* elf32-hppa.c (allocate_plt_and_got): Skip indirect and warning syms.
+
+2001-06-02  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-hppa.c (elf32_hppa_object_p): Check ELFOSABI_LINUX
+	and ELFOSABI_HPUX.
+	* elf64-hppa.c (elf64_hppa_object_p): Likewise.
+
+2001-06-02  H.J. Lu  <hjl@gnu.org>
+
+	* aout-cris.c (MACHTYPE_OK): New. Defined.
+
+2001-06-02  Hans-Peter Nilsson  <hp@axis.com>
+
+	* section.c (_bfd_strip_section_from_output): Handle NULL
+	output_section.
+
+2001-06-02  H.J. Lu  <hjl@gnu.org>
+
+	* config.bfd (powerpc-*-aix*, powerpc-*-beos*, rs6000-*-*): Add
+	rs6000coff64_vec only if BFD64 is defined.
+	(powerpc64-*-aix*): Enable only if BFD64 is defined.
+
+2001-06-02  H.J. Lu  <hjl@gnu.org>
+
+	* coff-ia64.c (ia64coff_object_p): Rewrite with
+	external_PEI_DOS_hdr and external_PEI_IMAGE_hdr.
+
+2001-06-01  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Add PC8
+	relocation, small reformatting.
+
+2001-05-29  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-x86-64.c (elf64_x86_64_check_relocs): Handle R_X86_64_64.
+	(elf64_x86_64_relocate_section): Likewise.
+
+2001-05-30  Alan Modra  <amodra@one.net.au>
+
+	* elf32-hppa.c (elf32_hppa_check_relocs): Don't NEED_PLT for
+	millicode.  Don't allocate .got and .rela.got space here..
+	(elf32_hppa_gc_sweep_hook): ..and no need to deallocate here..
+	(elf32_hppa_adjust_dynamic_symbol): ..and don't allocate .plt and
+	.rela.plt here..
+	(hppa_handle_PIC_calls): ..nor here..
+	(allocate_plt_and_got): ..instead do it all here.  New function.
+	(elf32_hppa_size_dynamic_sections): Allocate local .got space and
+	call allocate_plt_and_got.  No need to zap .got if not dynamic.
+	(elf32_hppa_final_link): Call regular bfd_final_link instead of
+	gc_common_final_link.
+	(WILL_CALL_FINISH_DYNAMIC_SYMBOL): Define.
+	(elf32_hppa_relocate_section): Use it here.
+	(elf32_hppa_finish_dynamic_symbol): Remove superfluous test of
+	dynamic_sections_created.
+	(hppa_type_of_stub): Don't LONG_BRANCH_VIA_PLT if millicode sym.
+
+2001-05-28  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-x86-64.c (elf64_86_64_size_info): Remove, we can use the
+	generic version since we want a hashsize of 4.
+	(elf_backend_size_info): Likewise.
+
+2001-05-28  Thiemo Seufer  <seufer@csv.ica.uni-stuttgart.de>
+
+	* elflink.h (elf_link_size_reloc_section): Use bfd_zmalloc instead of
+	a zeroing loop.
+	(elf_link_output_relocs): Handle MIPS ELF64 relocations correctly.
+	(elf_link_input_bfd): Likewise.
+	(elf_reloc_link_order): Likewise.
+	(elf_finish_pointer_linker_section): Typo. Handle MIPS ELF64
+	relocations correctly.
+
+2001-05-28  Nicolas Pitre <nico@cam.org>
+
+	* elf32-arm.h: fix PLT generation for big endian ARM
+
+2001-05-28  Alan Modra  <amodra@one.net.au>
+
+	* elf32-hppa.c (elf32_hppa_relocate_section): Set up .plt entries
+	for symbols forced local that need plabels.
+	(elf32_hppa_adjust_dynamic_symbol): Don't allocate space in
+	.plt.rela for local syms if non-shared.
+	(hppa_build_one_stub): Mask lsb of plt.offset.
+	(elf32_hppa_finish_dynamic_symbol): Abort if lsb of plt.offset set.
+	(clobber_millicode_symbols): Correct comment.
+	(elf32_hppa_relocate_section): Likewise.
+	(elf32_hppa_finish_dynamic_symbol): Likewise.
+
+2001-05-28  Jeff Sturm  <jsturm@one-point.com>
+
+	* reloc.c: Add BFD_RELOC_SPARC_UA16 and BFD_RELOC_SPARC_UA64.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* elf32-sparc.c: Enable BFD_RELOC_SPARC_UA16, BFD_RELOC_SPARC_UA32
+	and BFD_RELOC_SPARC_UA64 mapping
+	* elf64-sparc.c: Likewise.
+
+2001-05-25  H.J. Lu  <hjl@gnu.org>
+
+	* Makefile.am (BFD32_BACKENDS): Remove coff-pmac.lo.
+	(BFD32_BACKENDS_CFILES): Remove coff-pmac.c.
+	(coff-rs6000.lo): Remove the old dependency.
+	* Makefile.in: Rebuild.
+
+	* configure.in (pmac_xcoff_vec): Replace coff-pmac.lo with
+	coff-rs6000.lo.
+
+2001-05-25  H.J. Lu  <hjl@gnu.org>
+
+	* coff-rs6000.c (rs6000coff_vec): Use rs6000coff_core_p,
+	rs6000coff_core_file_matches_executable_p,
+	rs6000coff_core_file_failing_command and
+	rs6000coff_core_file_failing_signal only if AIX_CORE is
+	defined.
+	(pmac_xcoff_vec): Likewise.
+	* coff64-rs6000.c (rs6000coff64_vec): Likewise.
+
+2001-05-25  Timothy Wall  <twall@redhat.com>
+
+	* elfxx-ia64.c (allocate_dynrel_entries): Don't allocate an entry
+	for __GLOB_DATA_PTR on AIX5.  Clean up some relocation bugs.
+
+2001-05-25  H.J. Lu  <hjl@gnu.org>
+
+	* bfd-in2.h: Regenerated.
+	* libcoff.h: Likewise.
+
+2001-05-25  Alan Modra  <amodra@one.net.au>
+
+	* elf32-hppa.c (elf32_hppa_relocate_section): Don't allow
+	undefined millicode syms in shared libs.
+	(hppa_build_one_stub): Turn BFD_ASSERTs into aborts.
+	(elf32_hppa_check_relocs): Likewise.
+	(elf32_hppa_adjust_dynamic_symbol): Likewise.
+	(elf32_hppa_size_dynamic_sections): Likewise.
+	(elf32_hppa_relocate_section): Likewise.
+	(elf32_hppa_finish_dynamic_symbol): Likewise.
+	(elf32_hppa_finish_dynamic_sections): Likewise.
+
+2001-05-24  Tom Rix <trix@redhat.com>
+
+	* Makefile.am coff-pmac bfd now defined in coff-rs6000.c
+	xcoff-target.h not used to define rs6000 or ppc bfd.
+	* Makefile.in same
+
+	* bfd-in.h : (struct lineno_cache_entry) promote element "offset"
+	to 64 bit.
+
+	* coff-rs6000.c : Many changes for 64 bit support.  Move common
+	32/64 code to xcofflink.c.  Explictly define the rs6000coff_vec
+	and pmac_xcoff_vec
+
+	* coff64-rs6000.c : Many changes for 64 bit support.  64 bit
+	linker now supported.  Explictly define the rs6000coff64_vec.
+
+	* coffcode.h : (coff_set_arch_mach_hook) xcoff 64 bit support
+	(coff_print_aux) same
+	(coff_write_object_contents) same
+	(coff_slurp_line_table) same
+
+	* coffgen.c : (coff_fix_symbol_name) formatting
+	(coff_mangle_symbols) xcoff 64 bit support
+	(coff_write_symbol) same
+	(coff_write_alien_symbol) same
+	(coff_write_native_symbol) same
+	(coff_write_symbols) same
+	(coff_get_symbol_info) same
+	(bfd_coff_get_syment) same
+	(coff_print_symbol) same
+
+	* config.bfd : add powerpc64-*-aix* target
+
+	* libcoff-in.h : formatting
+
+	* libcoff.h : move xcoff extern declarations to libxcoff.h
+
+	* libxcoff.h : New file
+
+	* xcofflink.c : Many changes for xcoff64 support.  Move common
+	structures to include/coff/xcoff.h.  Move specific structure to
+	backends coff-rs6000.c and coff64-rs6000.c.  Use new backend
+	functions, defined in libxcoff.h, to isolate 32/64 dependencies.
+
+	(bfd_xcoff_size_dynamic_sections) : special __rtinit symbol for
+	aix4.2+ -binitfini.
+
+	(xcoff_build_ldsyms) : handle special __rtinit symbol.
+
+2001-05-23  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf64-sparc.c (sparc64_elf_slurp_reloc_table): Fix typo
+	s/ENTIRES/ENTRIES/.
+
+2001-05-23  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* reloc.c (bfd_reloc_code_real): Add MIPS ELF64 relocations.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+	* aoutx.h (aout_@var{size}_machine_type): Add MIPS r12k support.
+	* archures.c (bfd_mach_mips12000): Define.
+	* cpu-mips.c (arch_info_struct): Add MIPS r12k support.
+	* elf32-mips.c (_bfd_mips_elf_final_write_processing): Add MIPS r12k
+	support.
+	(_bfd_mips_elf_size_dynamic_sections): Use official bfd typedef.
+	* bfd-in2.h: Regenerate.
+	* elfxx-target.h: Do not redefine bfd_elfNN_bfd_make_debug_symbol.
+
+2001-05-23  kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c (elf_sh_plt0_entry_be, elf_sh_plt0_entry,
+	elf_sh_plt_entry_be, elf_sh_plt_entry, elf_sh_pic_plt_entry_be,
+	elf_sh_pic_plt_entry): New PLT code, that does not use r2, since
+	that is used by GCC.
+
+2001-05-23  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elf-bfd.h (NUM_SHDR_ENTRIES): New macro: compute the number
+	of entries in a structured section.
+	* elf.c: Use new macro.
+	* elf32-i386.c: Use new macro.
+	* elf32-mips.c: Use new macro.
+	* elf64-alpha.c: Use new macro.
+	* elf64-sparc.c: Use new macro.
+	* elfcode.h: Use new macro.
+	* elflink.h: Use new macro.
+
+2001-05-23  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* bfdint.texi: Replace -oformat with --oformat.
+
+2001-05-21  Andreas Jaeger  <aj@suse.de>
+
+	* dwarf2.c (decode_line_info): Fix error message.
+	(read_abbrevs): Fix test for offset as suggested by Alan Modra and
+	adjust error message.
+
+2001-05-18  H.J. Lu  <hjl@gnu.org>
+
+	* elflink.h (elf_link_add_object_symbols): Revert the last
+	change.
+
+2001-05-17  Alan Modra  <amodra@one.net.au>
+
+	* elf32-hppa.c (clobber_millicode_symbols): Temporarily set
+	ELF_LINK_FORCED_LOCAL to suit 2001-04-30 change.
+	(hppa_build_one_stub): Add an assert to check plt.offset.
+
+2001-05-17  H.J. Lu  <hjl@gnu.org>
+
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Set the
+	version definition to basename of the output filename.
+
+2001-05-17  H.J. Lu  <hjl@gnu.org>
+
+	* elflink.h (elf_link_add_object_symbols): Set DT_NEEDED to
+	basename of the bfd filename.
+
+2001-05-16  Alan Modra  <amodra@one.net.au>
+
+	* section.c (asection): Add linker_has_input field.
+	(STD_SECTION): Adjust initialization to suit.
+	* ecoff.c (bfd_debug_section): Likewise.
+	* bfd-in2.h: Regenerate.
+
+2001-05-15  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf-m10300.c (mn10300_elf_relax_section): Don't relax
+	negative 32-bit operands to 16 operands when the operand is
+	going to be zero-extended by the modified opcode.
+
+2001-05-12  Peter Targett  <peter.targett@arccores.com>
+
+	* cpu-arc.c (arch_info_struct): Add entry 'base' representing old
+	name for 'arc5' core versions.
+	(bfd_arc_arch): Make bfd_mach_arc_6 default.
+
+	* elf32-arc.c (arc_elf_object_p): Make E_ARC_MACH_ARC6 default
+	architecture.
+	(arc_elf_final_write_processing): Make bfd_mach_arc_6 default.
+
+2001-05-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* elfxx-ia64.c (is_unwind_section_name): Consider linkonce unwind
+	sections as well.
+	(elfNN_ia64_final_write_processing): Map .gnu.linkonce.ia64unw.FOO
+	to .gnu.linkonce.t.FOO text section.
+
+2001-05-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* merge.c (struct sec_merge_hash_entry): Add u.entsize and u.suffix
+	fields, change sec into secinfo.
+	(struct sec_merge_info): Add chain, remove last fields.
+	(struct sec_merge_sec_info): Add next, sec, psecinfo fields.
+	(sec_merge_hash_lookup): If lookup could not use a string only
+	because it has bad alignment, mark the old string for deletion.
+	(sec_merge_add): Add secinfo argument. Don't compute entry's
+	position, instead record the section.
+	(sec_merge_emit): Update for the sec into secinfo change in
+	struct sec_merge_hash_entry.
+	(_bfd_merge_section): Only record the section for merging, defer
+	putting strings into the hash table.
+	(cmplengthentry, last4_eq, last_eq, record_section, merge_strings,
+	_bfd_merge_sections): New functions.
+	(_bfd_merged_section_offset): Update for the sec_merge_hash_entry
+	changes.
+	* libbfd-in.h (_bfd_merge_sections): Add prototype.
+	(_bfd_nolink_bfd_merge_sections): Define.
+	* libbfd.h: Likewise.
+	(bfd_generic_merge_sections): Add prototype.
+	* targets.c (BFD_JUMP_TABLE_LINK): Add _bfd_merge_sections.
+	(struct bfd_target): Likewise.
+	* bfd.c (bfd_merge_sections): Define.
+	* bfd-in2.h: Rebuilt.
+	* elf.c (_bfd_elf_merge_sections): New function.
+	* elf-bfd.h (_bfd_elf_merge_sections): Add prototype.
+	* elfxx-target.h (bfd_elfNN_bfd_merge_sections): Define.
+	* reloc.c (bfd_generic_merge_sections): New function.
+	* vms.c (vms_bfd_merge_sections): New function.
+	* aout-adobe.c (aout_32_bfd_merge_sections): Define.
+	* aout-target.h (MY_bfd_merge_sections): Define.
+	* aout-tic30.c (MY_bfd_merge_sections): Define.
+	* binary.c (binary_bfd_merge_sections): Define.
+	* bout.c (b_out_bfd_merge_sections): Define.
+	* coff-alpha.c (_bfd_ecoff_bfd_merge_sections): Define.
+	* coffcode.c (coff_bfd_merge_sections): Define.
+	* coff-mips.c (_bfd_ecoff_bfd_merge_sections): Define.
+	* i386msdos.c (msdos_bfd_merge_sections): Define.
+	* i386os9k.c (os9k_bfd_merge_sections): Define.
+	* ieee.c (ieee_bfd_merge_sections): Define.
+	* ihex.c (ihex_bfd_merge_sections): Define.
+	* nlm-target.h (nlm_bfd_merge_sections): Define.
+	* oasys.c (oasys_bfd_merge_sections): Define.
+	* ppcboot.c (ppcboot_bfd_merge_sections): Define.
+	* som.c (som_bfd_merge_sections): Define.
+	* srec.c (srec_bfd_merge_sections): Define.
+	* tekhex.c (tekhex_bfd_merge_sections): Define.
+	* versados.c (versados_bfd_merge_sections): Define.
+	* xcoff-target.h (_bfd_xcoff_bfd_merge_sections): Define.
+
+2001-05-11  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* dwarf1.c (_bfd_dwarf1_find_nearest_line): Change type of 'addr'
+	to be unsigned long, in order to match its use.
+
+2001-05-10  H.J. Lu  <hjl@gnu.org>
+
+	* linker.c (_bfd_generic_link_add_one_symbol): Check loop on
+	indirect symbols.
+
+2001-05-09  H.J. Lu  <hjl@gnu.org>
+
+	* elflink.h (elf_link_add_object_symbols): Fix a typo. Allocate
+	versymhdr->sh_size bytes for extversym instead of hdr->sh_size.
+	Remove the unused veriable `dynver'.
+
+2001-05-08  Ian Lance Taylor  <ian@zembu.com>
+
+	* coff-i386.c (coff_i386_reloc): Don't dump core if output_bfd is
+	NULL or is not COFF.
+	(coff_i386_rtype_to_howto): Don't dump core if output section
+	owner is not COFF.
+
+2001-05-07  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* ecoff.c (bfd_debug_section): Fix initialization.
+	* elf.c (_bfd_elf_slurp_version_tables): Change maxidx to unsigned, it
+	is always a positive integer. Cast away sign mismatch.
+	* elf32-mips.c: Fix misleading comment and typo.
+	(_bfd_mips_elf_section_from_bfd_section): Remove unused attribute, use
+	correct data type.
+	* elflink.c: Fix typo.
+	(_bfd_elf_create_dynamic_sections): Remove superfluous initialization.
+	* ecoffswap.h (ecoff_swap_fdr_in): Cast away sign mismatch.
+
+2001-05-04  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (SREL16, SREL32, SREL64): Set pcrel_offset true.
+
+2001-05-04  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elf32-arm.h (elf32_arm_final_link_relocate): Set
+	EF_ARM_HASENTRY if the start address is set.
+
+2001-05-03  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* targets.c (_bfd_target_vector_entries): Compute value based on
+	the size of the _bfd_target_vector and not bfd_target_vector.
+
+2001-05-03  H.J. Lu  <hjl@gnu.org>
+
+	* elfcode.h: Include "libiberty.h".
+
+	* elflink.h (elf_link_add_object_symbols): Set
+	elf_dt_name (abfd) to basename of the bfd filename.
+	(NAME(bfd_elf,size_dynamic_sections)): Set vn_file to basename
+	of the bfd filename.
+
+2001-05-03  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-gen.c (elf_generic_info_to_howto): Add unused attribute.
+	(elf_generic_info_to_howto_rel): Likewise.
+	* coff-alpha.c (reloc_nil): Likewise.
+	(alpha_ecoff_bad_format_hook): Likewise.
+	(alpha_adjust_reloc_out): Likewise.
+	(alpha_bfd_reloc_type_lookup): Likewise.
+	(alpha_convert_external_reloc): Likewise.
+	* elf64-alpha.c (elf64_alpha_reloc_nil): Likewise.
+	(elf64_alpha_reloc_bad): Likewise.
+	(elf64_alpha_reloc_gpdisp): Likewise.
+	(elf64_alpha_bfd_reloc_type_lookup): Likewise.
+	(elf64_alpha_info_to_howto): Likewise.
+	(elf64_alpha_add_symbol_hook): Likewise.
+	(elf64_alpha_create_got_section): Likewise.
+	(elf64_alpha_is_local_label_name): Likewise.
+	(elf64_alpha_merge_ind_symbols): Likewise.
+	* elf64-mips.c (mips_elf64_reloc_type_lookup): Likewise.
+	(mips_elf64_get_reloc_upper_bound): Likewise.
+	* nlm32-alpha.c (nlm_alpha_mangle_relocs): Likewise.
+	(nlm_alpha_get_public_offset): Likewise.
+
+2001-05-02  Johan Rydberg  <jrydberg@opencores.org>
+
+	* elf32-openrisc.c (openrisc_elf_howto_table): Do not complain
+	about overflow in R_OPENRISC_LO_16_IN_INSN and
+	R_OPENRISC_HI_16_IN_INSN.
+
+2001-04-30  H.J. Lu  <hjl@gnu.org>
+
+	* elf.c (_bfd_elf_link_hash_hide_symbol): Set dynindx to -1
+	only for ELF_LINK_FORCED_LOCAL.
+	* elf32-hppa.c (elf32_hppa_hide_symbol): Likewise.
+	* elf32-mips.c (_bfd_mips_elf_hide_symbol): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_hash_hide_symbol): Likewise.
+
+	* elflink.h (elf_fix_symbol_flags): Set ELF_LINK_FORCED_LOCAL
+	if the symbol has hidden or internal visibility.
+
+2001-04-30  Alan Modra  <amodra@one.net.au>
+
+	* elf32-hppa.c (final_link_relocate): Branch to .+8 for
+	calls to undefined weak symbols.
+
+2001-04-30  Andreas Jaeger  <aj@suse.de>, Andreas Schwab <schwab@suse.de>
+
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Correct test for
+	R_X86_64_GOTPCREL, don't use assignments instead of comparisons.
+
+2001-04-27  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-x86-64.c (elf64_x86_64_finish_dynamic_sections): Only swap
+	out handled entries.
+	(elf64_x86_64_finish_dynamic_symbol): Set up GOT entries.
+	(elf64_x86_64_relocate_section): Fix GOTPCREL calculation.
+	(elf64_x86_64_relocate_section): Merge entries for GOTPCREL and
+	GOT32.
+
+2001-04-27  Sean McNeil <sean@mcneil.com>
+
+	* config.bfd: Add arm-vxworks target.
+	* coff-arm (coff_arm_relocate_section): Add in symbol value to
+	addend (fro VXworks targets).
+
+2001-04-26  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-i386.c (elf_i386_check_relocs): Verify if r_symndx is
+	valid.
+
+2001-04-25  Frank Ch. Eigler  <fche@redhat.com>
+
+	* bfd-in.h (bfd_cache_close): Declare newly exported function.
+	* bfd-in2.h: Regenerated.
+
+2001-04-24  Jakub Jelinek  <jakub@redhat.com>
+
+	* merge.c (struct sec_merge_hash_entry): Add alignment field.
+	(struct sec_merge_hash): Remove alignment_power.
+	(sec_merge_hash_newfunc): Clear alignment.
+	(sec_merge_hash_lookup): Pass alignment as argument.
+	Use hashp->root.next, not hashp->next to walk the hash chain.
+	If a string already in the hashtable does not have required
+	alignment, create a new hashtable entry.
+	(sec_merge_init): Remove alignment_power argument.
+	(sec_merge_add): Add alignment argument.
+	(sec_merge_emit): Alignment is now a per-entity thing, not per
+	section.
+	(_bfd_merge_section): Sanity check even non-SEC_STRINGS sections
+	for proper alignment.
+	Pass alignment information to sec_merge_add.
+
+2001-04-24  Christian Groessler  <cpg@aladdin.de>
+
+	* coff-z8k.c (extra_case): added handler for R_DISP7, R_CALLR
+	and R_REL16 reloc types; accept odd values for R_REL16 type
+
+2001-04-24  Johan Rydberg  <jrydberg@opencores.org>
+
+	* cpu-openrisc.c: New file.
+	* elf32-openrisc.c: Likewise.
+
+	* Makefile.am (ALL_MACHINES): Add cpu-openrisc.lo.
+	(ALL_MACHINES_CFILES): Add cpu-openrisc.c.
+	(BFD32_BACKENDS): Add elf32-openrisc.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-openrisc.c.
+	(cpu-openrisc.lo, elf32-openrisc.lo): New rules.
+	* Makefile.in: Regenerated.
+	* config.bfd: (openrisc-*-elf): New target.
+	* configure.in (bfd_elf32_openrisc_vec): New vector.
+	* configure: Regenerated.
+	* libbfd.h: Regenerated.
+	* bfd-in2.h: Regenerated.
+	* reloc.c: Add OpenRISC relocations.
+	* targets.c (bfd_elf32_openrisc_vec): Declare.
+	(bfd_target_vect): Add bfd_elf32_openrisc_vec.
+	* archures.c (enum bfd_architecture): Add bfd_arch_openrisc.
+	(bfd_openrisc_arch): Declare.
+	(bfd_archures_list): Add bfd_openrisc_arch.
+	* elf.c (prep_headers): Add bfd_arch_openrisc.
+
+2001-04-23  Bo Thorsen  <bo@suse.de>
+
+	* elf64-x86-64.c: Add c++ vtable hack.
+	Small whitespace and comment changes.
+
+2001-04-19  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-x86-64.c (elf64_x86_64_plt0_entry): Fix instructions.
+	(elf64_x86_64_plt_entry): Likewise.
+	(elf64_x86_64_finish_dynamic_sections): Fix PLT0 generation.
+	(elf64_x86_64_finish_dynamic_symbol): Fix PLT generation.
+
+2001-04-17  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c: Tweak comments related to dynamic linking.
+	(cris_elf_relocate_section): When not creating shared object, fill
+	in the .got table for any symbol not in the dynamic symbol table.
+	(elf_cris_finish_dynamic_symbol): When not creating shared object,
+	only emit a .got.rela reloc if the symbol is in the dynamic symbol
+	table.
+	(cris_elf_check_relocs): Use variable r_type in all places rather
+	than the original expression.  Add default case in switch for
+	reloc types.
+	(elf_cris_size_dynamic_sections): Iterate over
+	elf_cris_discard_excess_program_dynamics when not creating shared
+	library.
+	(elf_cris_discard_excess_dso_dynamics): Renamed from
+	elf_cris_discard_copies.  Correct typo, s/Rel/Rela/.
+	(elf_cris_discard_excess_program_dynamics): New.
+
+2001-04-14  Mark Elbrecht  <snowball3@bigfoot.com>
+
+	* coffcode.h (coff_write_object_contents): Use
+	bfd_coff_swap_filehdr_out instead of coff_swap_filehdr_out.
+
+2001-04-14  H.J. Lu  <hjl@gnu.org>
+
+	* bfd-in2.h: Regenerate.
+
+2001-04-14  Jakub Jelinek <jakub@redhat.com>
+
+	* section.c (STD_SECTION): Add entsize.
+
+2001-04-13  H.J. Lu  <hjl@gnu.org>
+
+	* section.c (SEC_MERGE): Define new flag for merging.
+	(SEC_STRINGS): Likewise.
+	(entsize): New field.
+
+2001-04-13  Roger Sayle  <roger@metaphorics.com>
+
+	* coff-i386.c (TARGET_SYM): SEC_READONLY is an applicable section
+	flag on pe-i386 targets.
+
+2001-04-13  Jakub Jelinek  <jakub@redhat.com>
+
+	* libbfd-in.h (_bfd_merge_section): New.
+	(_bfd_write_merged_section): New.
+	(_bfd_merged_section_offset): New.
+	* libbfd.h: Rebuilt.
+	* linker.c (_bfd_generic_link_output_symbols): Handle
+	discard_sec_merge.
+	* aoutx.h (aout_link_write_symbols): Likewise.
+	* pdp11.c (aout_link_write_symbols): Likewise.
+	* elflink.h (elf_link_add_object_symbols): Call _bfd_merge_section.
+	(elf_bfd_final_link): Adjust global symbols pointing into SEC_MERGE
+	sections.
+	(elf_link_sec_merge_syms): New.
+	(elf_link_input_bfd): Call _bfd_merged_section_offset
+	and _bfd_write_merged_section.
+	Handle discard_sec_merge.
+	* elf-bfd.h (struct elf_link_hash_table): Add merge_info
+	field.
+	(struct bfd_elf_section_data): Likewise.
+	* elf.c (_bfd_elf_make_section_from_shdr): Set SEC_MERGE and
+	SEC_STRINGS section flags and entsize from their ELF counterparts.
+	(_bfd_elf_link_hash_table_init): Initialize merge_info.
+	(elf_fake_sections): Set SHF_MERGE, SHF_STRINGS and sh_entsize
+	from their BFD counterparts.
+	* merge.c: New file.
+	* Makefile.am: Add strtab.lo.
+	* Makefile.in: Rebuilt.
+
+2001-04-09  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elflink.h (elf_fix_symbol_flags): For non-default visibilities,
+	only hide symbols marked STV_INTERNAL or STV_HIDDEN.
+
+2001-04-05  Steven J. Hill  <sjhill@cotw.com>
+
+	* config.bfd (mips*el*-*-linux-gnu*): Use traditional little
+	endian MIPS ELF target.
+	* config.bfd (mips*-*-linux-gnu*): Use traditional big endian
+	MIPS ELF target.
+
+	* configure.in (bfd_elf64_tradbigmips_vec): New. Traditional
+	64bit big endian MIPS ELF target.
+	(bfd_elf64_tradlittlemips_vec): New. Traditional 64bit little
+	endian MIPS ELF target.
+	* configure: Regenerated.
+
+	* elf32-mips.c (IRIX_COMPAT): Handle traditional 64bit and
+	little endian targets.
+	(mips_elf_sym_is_global): Handle traditional targets.
+
+	* elf64-mips.c (bfd_elf64_tradbigmips_vec): New. Traditional
+	64bit big endian MIPS ELF target.
+	(bfd_elf64_tradlittlemips_vec): New. Traditional 64bit little
+	endian MIPS ELF target.
+
+	* targets.c: (_bfd_target_vector): Add bfd_elf64_tradbigmips_vec
+	and bfd_elf64_tradlittlemips_vec.
+
+2001-04-05  David Mosberger  <davidm@hpl.hp.com>
+
+	* elf32-i386.c (elf_i386_fake_sections): Treat ".reloc" as an
+	ordinary "progbits" section.
+
+2001-04-04  Alan Modra  <alan@linuxcare.com.au>
+
+	* elflink.h (elf_fix_symbol_flags): Call elf_backend_hide_symbol
+	when -Bsymbolic causes a symbol to no longer need a .plt entry.
+
+2001-04-03  David Mosberger  <davidm@hpl.hp.com>
+
+	* efi-app-ia32.c (ALIGN_SECTIONS_IN_FILE): Deleted.
+
+2001-03-30  H.J. Lu  <hjl@gnu.org>
+
+	* efi-app-ia32.c (PEI_TARGET_SUBSYSTEM): Rename from ...
+	(PEI_DEFAULT_TARGET_SUBSYSTEM): This.
+
+2001-03-26  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-gen.c (elf32_generic_link_add_symbols): New. Check
+	if there are any relocations for generic ELF.
+	(bfd_elf32_bfd_link_add_symbols): Defined to
+	elf32_generic_link_add_symbols.
+	* elf64-gen.c (elf64_generic_link_add_symbols): New. Check
+	if there are any relocations for generic ELF.
+	(bfd_elf64_bfd_link_add_symbols): Defined to
+	elf64_generic_link_add_symbols.
+
+2001-03-23  Nick Clifton  <nickc@redhat.com>
+
+	* Makefile.am (BUILD_CFILES): New variable: List of C source
+	files created in build directory.
+	(BUILD_HFILES): New variable: List of header files created in
+	build directory.
+	(POTFILES): Delete.
+	(po/POTFILES.in): Replace rule with empty entry.
+	(po/SRC-POTFILES.in): New rule: Create a list of source files
+	in the source directory.
+	(po/BLD-POTFILES.in): New rule: Create a list of source files
+	in the build directory.
+	(MOSTLYCLEAN): Do not delete source files created in build
+	directory.
+	* Makefile.in: Regenerate.
+	* configure.in: Insert SRC-POTFILES.in and BLD-POTFILES.in
+	into po/Makefile.
+	* configure: Regenerate.
+
+	* po/Make-in: Replace occurrences of POTFILES with SRC-POTFILES
+	and BLD_POTFILES.
+	Add .. to the search path when building bfd.pot.
+	Delete POTFILES when performing distclean.
+	Add comment describing why distclean is broken in maintainer mode.
+	* po/POTFILES.in: Delete.
+	* po/SRC-POTFILES.in: New file.
+	* po/BLD-POTFILES.in: New file.
+	* po/bfd.pot: Regenerate.
+
+2001-03-22  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c: Shlib and PIC support.  PCREL tweaks.
+	(elf_cris_discard_copies, elf_cris_adjust_gotplt_to_got,
+	elf_cris_try_fold_plt_to_got, elf_cris_link_hash_newfunc,
+	elf_cris_link_hash_table_create, elf_cris_adjust_dynamic_symbol,
+	elf_cris_size_dynamic_sections, elf_cris_finish_dynamic_symbol,
+	elf_cris_finish_dynamic_sections,elf_cris_hide_symbol): New
+	functions.
+	(cris_elf_howto_table) <R_CRIS_8_PCREL, R_CRIS_16_PCREL,
+	R_CRIS_32_PCREL>: Correct comments.  Set pcrel_offset to false.
+	<R_CRIS_COPY, R_CRIS_GLOB_DAT, R_CRIS_JUMP_SLOT, R_CRIS_RELATIVE,
+	R_CRIS_16_GOT, R_CRIS_32_GOT, R_CRIS_16_GOTPLT, R_CRIS_32_GOTPLT,
+	R_CRIS_32_GOTREL, R_CRIS_32_PLT_GOTREL, R_CRIS_32_PLT_PCREL>:
+	New HOWTO members for new relocs.
+	(cris_reloc_map): Map new relocs.
+	(ELF_DYNAMIC_INTERPRETER): Define.
+	(PLT_ENTRY_SIZE): Define.
+	(elf_cris_plt0_entry, elf_cris_plt_entry, elf_cris_pic_plt0_entry,
+	elf_cris_pic_plt_entry): New, PLT templates.
+	(struct elf_cris_pcrel_relocs_copied, struct
+	elf_cris_link_hash_entry, struct elf_cris_link_hash_table): New.
+	(elf_cris_link_hash_traverse, elf_cris_hash_table): Define.
+	(cris_final_link_relocate): Check that 16-bit GOT relocs have
+	positive values.  Adjust PCREL relocs to be relative to location
+	after relocation.
+	(cris_elf_relocate_section): Handle relocations to dynamic
+	objects.  Handle new relocations.  Call error handler when seeing
+	non-PIC relocation for read-only sections while generating shared
+	object.
+	(cris_elf_check_relocs): Set reference counts for GOT and PLT
+	entries.
+	(bfd_elf32_bfd_link_hash_table_create,
+	elf_backend_adjust_dynamic_symbol,
+	elf_backend_size_dynamic_sections,
+	elf_backend_finish_dynamic_symbol,
+	elf_backend_finish_dynamic_sections,
+	elf_backend_create_dynamic_sections, bfd_elf32_bfd_final_link,
+	elf_backend_hide_symbol, elf_backend_want_got_plt,
+	elf_backend_plt_readonly, elf_backend_want_plt_sym,
+	elf_backend_got_header_size, elf_backend_plt_header_size):
+	Define.
+
+	* reloc.c: (BFD_RELOC_CRIS_COPY, BFD_RELOC_CRIS_GLOB_DAT,
+	BFD_RELOC_CRIS_JUMP_SLOT, BFD_RELOC_CRIS_RELATIVE,
+	BFD_RELOC_CRIS_32_GOT, BFD_RELOC_CRIS_16_GOT,
+	BFD_RELOC_CRIS_32_GOTPLT, BFD_RELOC_CRIS_16_GOTPLT,
+	BFD_RELOC_CRIS_32_GOTREL, BFD_RELOC_CRIS_32_PLT_GOTREL,
+	BFD_RELOC_CRIS_32_PLT_PCREL): New relocs.
+	* bfd-in2.h, libbfd.h: Regenerate.
+
+2001-03-21  Diego Novillo  <dnovillo@redhat.com>
+
+	(_bfd_mips_elf_relocate_section): Give a better error message when
+	a relocation is not recognized.
+
+2001-03-21  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf32-hppa.c (elf32_hppa_set_gp): Check sec->output_section
+	non-NULL before attempting to dereference.
+
+2001-03-20  H.J. Lu  <hjl@gnu.org>
+
+	* configure.in: Remove the redundent AC_ARG_PROGRAM.
+	* configure: Rebuild.
+
+2001-03-20  Andreas Schwab  <schwab@suse.de>
+
+	* elf32-m68k.c (elf_m68k_relocate_section): Don't need the
+	relocation value when resolving a reference from a debugging
+	section.
+
+2001-03-16  Scott Thomason  <SThomaso@hii.com>
+
+	* coff64-rs6000.c (xcoff64_swap_sym_out): Fix syntax errors.
+	(xcoff64_swap_sym_out): Fix syntax errors.
+
+2001-03-16  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elf32-arm.h (elf32_arm_merge_private_bfd_data): Fix warning.
+
+2001-03-15  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf32-hppa.c (elf32_hppa_link_hash_entry): Add maybe_pic_call.
+	(hppa_link_hash_newfunc): Init it.
+	(hppa_type_of_stub): Only use non-PIC to PIC call stub if caller
+	section appears to be non-PIC.
+	(final_link_relocate): Likewise.
+	(elf32_hppa_adjust_dynamic_symbol): Set maybe_pic_call for any
+	possible candidate function, and set pic_call for those that will
+	only have a .plt entry for the PIC call stub.
+	(hppa_handle_PIC_calls): Set maybe_pic_call.
+
+2001-03-12  DJ Delorie  <dj@redhat.com>
+
+	* elf32-sh.c (sh_elf_relocate_section): Only relocation
+	R_SH_DIR8WP* relocs if they're against external symbols, else
+	they're just for relaxing.  Validate the reloc values.
+
+2001-03-12  Stefan Geuken <mail@stefan-geuken.de>
+
+	* binary.c (bfd_external_binary_architecture): Declare.
+	(binary_object_p): If bfd_external_binary_architecture is defined,
+	set the architecture to this string.
+
+2001-03-11  Philip Blundell  <philb@gnu.org>
+
+	* elf32-arm.h (elf32_arm_finish_dynamic_symbol): Don't make PLT
+	entries that could serve as a definition for a weak symbol.
+
+2001-03-08  Nick Clifton  <nickc@redhat.com>
+
+	* Most files: Update copyright notices using Perl script created
+	by Kevin Buettner <kevinb@redhat.com>.
+
+2001-03-07  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-arm.h (elf32_arm_final_link_relocate): Conditionalise
+	prior patch on ! defined OLD_ARM_ABI.
+
+2001-03-07  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Fix handling of
+	some relocation values.
+
+2001-03-06  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-arm.h (elf32_arm_final_link_relocate): Clear bit zero
+	of offset in BLX(1) instruction.
+	* coff-arm.c (coff_arm_relocate_section): Clear bit zero of
+	offset in BLX(1) instruction.
+	Fix formatting.
+
+2001-03-06  Nick Clifton  <nickc@redhat.com>
+
+	* coff-arm.c (coff_arm_reloc_type_lookup): Add
+	BFD_RELOC_THUMB_PCREL_BLX.
+
+2001-03-06  Igor Shevlyakov  <igor@windriver.com>
+
+	* archures.c (bfd_default_scan): Add Coldfire CPUs.
+	* bfd-in2.h: Regenerate.
+	* cpu-m68k.c: Add Coldfire CPUs for arch table.
+	* ieee.c (ieee_write_processor): Set proper id for
+	Coldfire CPUs.
+
+2001-03-01  D.J. Barrow <djbarrow@de.ibm.com,barrow_dj@yahoo.com>
+
+	* configure.in: Add s390 target.
+	* configure: Regenerate.
+
+2001-02-28  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Add relocation
+	to addend.
+
+2001-02-28  Philip Blundell  <pb@futuretv.com>
+
+	* elf32-arm.h: Update mentions of renamed EF_xx constants.
+	(elf32_arm_print_private_bfd_data): Handle ARM EABI version 2.
+
+2001-02-27  H.J. Lu  <hjl@gnu.org>
+
+	* aoutx.h (NAME(aout,bfd_free_cached_info)): Return true if
+	abfd->tdata.aout_data == NULL.
+
+2001-02-27  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf32-hppa.c: Correct field selector in stub comments.
+	(clobber_millicode_symbols): Formatting fix.
+
+	* configure.in: Bump version to 2.11.90.
+	* configure: Regenerate.
+	* Makefile.am (CFILES): Rename to SOURCE_CFILES.
+	(CFILES): $SOURCE_CFILES + generated C files.
+	(POTFILES): Include $HFILES not $SOURCE_HFILES.
+	Run "make dep-am"
+	* Makefile.in: Regenerate.
+	* doc/Makefile.in: This too.
+
+2001-02-26  Timothy Wall  <twall@cygnus.com>
+
+	* elfxx-ia64.c (elfNN_ia64_aix_add_symbol_hook): Remove obsolete
+	comments.
+
+2001-02-26  Nick Clifton <nickc@redhat.com>
+
+	* coffcode.h (styp_to_sec_flags) [COFF_WITH_PE version]: Tidy
+	up, replacing multiple if statements with a switch.
+	(handle_COMDAT): New function.
+
+2001-02-26  H.J. Lu  <hjl@gnu.org>
+
+	* coffcode.h (styp_to_sec_flags) [COFF_WITH_PE version]: Issue
+	a warning for section flags we do not handle instead of
+	aborting.
+
+2001-02-26  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-x86-64.c (x86_64_elf_howto_table): Fix order of entries.
+
+2001-02-22  Timothy Wall  <twall@cygnus.com>
+
+	* config.bfd (targ_cpu): Add vectors for ia64-*-aix* (aka Monterey).
+	* configure.in: Add objects for elf64_ia64_aix vectors.
+	* configure: Regenerated.
+	* configure.host: Recognize ia64-*-aix*.
+	* elfxx-ia64.c: Add hooks for ELF64 on AIX5.  Define new vectors
+	for AIX.  AIX5 requires most relocations to be dynamic (*all*
+	binaries are somewhat similar to shared libraries).
+	* targets.c: Add elf64_ia64_aix vectors.
+
+2001-02-21  David Mosberger  <davidm@hpl.hp.com>
+
+	* cpu-ia64-opc.c (elf64_ia64_operands}: Fix typo: error string for
+	C8 said "1" instead of "8".  Clarify error string for IMM22:
+	"signed integer" instead of just "integer".
+
+2001-02-20  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-x86-64.c (elf64_x86_64_finish_dynamic_symbol): Don't make
+	PLT entries that could serve as a definition for a weak symbol.
+
+2001-02-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-sparc.c (elf32_sparc_finish_dynamic_symbol): Don't make PLT
+	entries that could serve as a definition for a weak symbol.
+	* elf64-sparc.c (sparc64_elf_finish_dynamic_symbol): Likewise.
+
+2001-02-18  David O'Brien  <obrien@FreeBSD>
+
+	* configure.in: Recognize FreeBSD/arm, FreeBSD/PowerPC, and treat
+	FreeBSD/i386-CURRENT differently until I can figure out the needed
+	corefile changes.
+	* configure: Regenerate.
+	* config.bfd: Recognize FreeBSD/x86-64, FreeBSD/ia64, FreeBSD/arm,
+	FreeBSD/PowerPC, and FreeBSD/sparc64.
+
+2001-02-18  lars brinkhoff  <lars@nocrew.org>
+
+	* Makefile.am: Add PDP-11 a.out target.
+	* config.bfd: Likewise.
+	* configure.in: Likewise.
+	* targets.c: Likewise.
+	* archures.c: Likewise.
+	* bfd-in2.h: Likewise.  Add PDP-11 relocations.
+	* libbfd.h: Add PDP-11 relocations.
+	* reloc.c: Likewise.
+	* cpu-pdp11.c: New file.
+	* pdp11.c: New file.
+
+	* libaout.h (GET_WORD) [ARCH_SIZE==16]: Define.
+	(GET_SWORD) [ARCH_SIZE==16]: Likewise.
+	(GET_SWORD) [ARCH_SIZE==16]: Likewise.
+	(PUT_WORD) [ARCH_SIZE==16]: Likewise.
+	(GET_MAGIC): New macro.
+	(PUT_MAGIC): Likewise.
+	* aout-target.h (MY(object_p)): Use GET_MAGIC to read magic word.
+
+2001-02-18  Jim Kingdon  <jkingdon@engr.sgi.com>
+
+	* irix-core.c (irix_core_core_file_p): Set the architecture (GDB
+	multiarch needs it).
+
+2001-02-18  H.J. Lu  <hjl@gnu.org>
+
+	* elflink.h (elf_link_input_bfd): Ignore invalid section symbol
+	index.
+
+2001-02-18  Kazu Hirata  <kazu@hxi.com>
+
+	* vms-misc.c: Fix formatting.
+
+2001-02-16  Kazu Hirata  <kazu@hxi.com>
+
+	* vms.c: Fix formatting.
+
+2001-02-14  H.J. Lu  <hjl@gnu.org>
+
+	* elf.c (elf_find_function): New function.
+	(_bfd_elf_find_nearest_line): Call elf_find_function () to find
+	the file name and function name.
+
+2001-02-14  Nick Clifton  <nickc@redhat.com>
+
+	* ecoff.c (bfd_debug_section): Update to initialise new fields in
+	asection structure.
+
+	* Makefile.am (BFD32_BACKENDS_CFILES): Remove peigen.c
+	(BFD64_BACKENDS): Add pepigen.c
+	Add rules to create peigen.c and pepigen.c from peXXigen.c.
+
+	* Makefile.in: Regenerate.
+	* configure:  Regenerate.
+	* po/POTFILES.in: Regenerate.
+	* po/bfd.pot: Regenerate.
+
+2001-02-14  H.J. Lu  <hjl@gnu.org>
+
+	* libcoff-in.h (pe_tdata): Add members target_subsystem and
+	force_minimum_alignment.
+
+2001-02-14  Bo Thorsen  <bo@suse.de>
+
+	* elf64-x86-64.c: Small formatting fixes and rearrangements of code.
+	(elf64_86_64_size_info): Struct added to fix a problem
+	with the hashtable string entries.
+	(elf64_x86_64_adjust_dynamic_symbol): Add generation of .got.plt.
+	(elf64_x86_64_size_dynamic_sections): A FIXME removed.
+	(elf64_x86_64_size_dynamic_sections): Fix a dynamic entry and
+	remove the FIXME for this.
+	(elf64_x86_64_adjust_dynamic_symbol): Fix check for unneeded .plt
+	section. Also removed the FIXME for it.
+	(x86_64_elf_howto_table): Use bfd_elf_generic_reloc.
+	(ELF_DYNAMIC_INTERPRETER): Fix the name of the dynamic linker.
+	(elf64_x86_64_finish_dynamic_sections): Enable .got.plt writing.
+
+2001-02-13  Richard Henderson  <rth@redhat.com>
+
+	* elfxx-ia64.c (elfNN_ia64_final_link): Set __gp if required
+	and not user provided.
+
+2001-02-13  Kazu Hirata  <kazu@hxi.com>
+
+	* vms.c (vms_print_symbol): Remove unreachable code.
+
+	* rs6000-core.c: Fix formatting.
+
+2001-02-13  David Mosberger  <davidm@hpl.hp.com>
+
+	* peicode.h (coff_swap_filehdr_out) [COFF_IMAGE_WITH_PE]: Define
+	as _bfd_XXi_only_swap_filehdr_out.
+	(pe_mkobject) [PEI_FORCE_MINIMUM_ALIGNMENT]: Set
+	pe->force_minimum_alignment to TRUE.
+	(pe_mkobject) [PEI_TARGET_SUBSYSTEM]: Set pe->target_subsystem to
+	PEI_TARGET_SUBSYSTEM.
+	(pe_print_private_bfd_data): Call
+	_bfd_XX_print_private_bfd_data_common() instead of
+	_bfd_pe_print_private_bfd_data_common().
+	(pe_bfd_copy_private_bfd_data): Call
+	_bfd_XX_bfd_copy_private_bfd_data_common() instead of
+	_bfd_pe_bfd_copy_private_bfd_data_common().
+	(coff_bfd_copy_private_section_data): Define as
+	_bfd_XX_bfd_copy_private_section_data instead of
+	_bfd_pe_bfd_copy_private_section_data.
+	(coff_get_symbol_info): Define as _bfd_XX_get_symbol_info instead
+	of a _bfd_pe_get_symbol_info.
+
+	* peigen.c: Delete.
+
+	* peXXigen.c: Renamed from peigen.c.
+	(COFF_WITH_XX): Define this macro (will get expanded into
+	COFF_WITH_pep or COFF_WITH_pe, depending on whether this is being
+	compiled as peigen.c or pepigen.c.
+	[COFF_WITH_pep]: Include "coff/ia64.h" instead of "coff/i386.h" to
+	define the canonical PEP structures and definitions.
+	(_bfd_XXi_swap_aouthdr_out): If pe->force_minimum_alignment is in
+	effect, enforce minimum file and section alignments.  If
+	extra->Subsystem is IMAGE_SUBSYSTEM_UNKNOWN, set it to
+	pe->target_subsystem (this defaults to IMAGE_SUBSYSTEM_UNKNOWN,
+	so, by default, this is a no-op).
+
+	* libpei.h: Rename COFF_WITH_PEP to COFF_WITH_pep.
+	(_bfd_XX_bfd_copy_private_bfd_data_common): Add macros to map
+	_bfd_XXfoo to _bfd_pepfoo if COFF_WIT_PEP is defined and to
+	_bfd_pefoo if it's not defined.  Use these macros to define
+	coff swap macros.
+
+	* libcoff.h (pe_tdata): Add members target_subsystem and
+	force_minimum_alignment.
+
+	* efi-app-ia64.c (COFF_WITH_pep): Rename COFF_WITH_PEP to
+	COFF_WITH_pep.
+	(PEI_TARGET_SUBSYSTEM): Rename from PEI_DEFAULT_TARGET_SUBSYSTEM.
+
+	* configure.in (bfd_efi_app_ia64_vec): Use pepigen.lo instead of
+	peigen.lo.
+
+	* coff-ia64.c: Rename COFF_WITH_PEP to COFF_WITH_pep.
+	(AOUTSZ): Rename PEP64AOUTSZ and PEP64AOUTHDR to PEPAOUTSZ and
+	PEPAOUTHDR.
+
+	* Makefile.in (BFD64_BACKENDS): Mention pepigen.lo.
+	(BFD64_BACKENDS_CFILES): Mention pepigen.c
+	(peigen.c): Add rule to generate from peXXigen.c.
+	(pepigen.c): Ditto.
+	(pepigen.lo): List dependencies for pepigen.lo.
+
+2001-02-13  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf32-hppa.c (elf32_hppa_set_gp): Handle weak $global$.  If
+	$global$ referenced but not defined, set its value here.
+
+2001-02-09  Bo Thorsen  <bo@suse.de>
+
+	* elf64-x86-64.c (elf64_x86_64_check_relocs): Set .rela.got section
+	alignment to 3.
+	(elf64_x86_64_check_relocs): Write R_X86_64_GOTPCREL GOT entry
+	and relocation.
+	(elf64_x86_64_relocate_section): Fix formatting.
+	(elf64_x86_64_relocate_section): Fix addend for relocation of
+	R_X86_64_(8|16|32|PC8|PC16|PC32).
+
+2001-02-12  Jan Hubicka  <jh@suse.cz>
+
+	* elf64-x86-64.c (x86_64_elf_howto): Fix name of R_X86_64_GOTPCREL.
+
+2001-02-11  H.J. Lu  <hjl@gnu.org>
+
+	* elflink.h (elf_bfd_final_link): Use file_align for SYMTAB
+	alignment.
+
+2001-02-11  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+	* elf32-mips.c (mips_elf_create_dynamic_relocation): Undo patch
+	from 2000-10-13.  Do not add the symbol's value for R_MIPS_REL32
+	relocations against dynsym symbols.
+
+	* elf32-mips.c (elf_mips_howto_table): Fix the comment on
+	the R_MIPS_26 relocation.
+	(mips_elf_calculate_relocation): Use (p + 4) instead of p for
+	the R_MIPS_26 relocation.
+	(mips_elf_perform_relocation): Fix the comment on the R_MIPS16_26
+	relocation.
+	* elf64-mips.c (mips_elf64_howto_table_rel): Fix the comment on
+	the R_MIPS_26 relocation.
+	(mips_elf64_howto_table_rela): Likewise.
+
+	* elf32-mips.c (struct mips_elf_link_hash_entry): Added no_fn_stub
+	member to mark symbols that have non-CALL relocations against
+	them.
+	(mips_elf_link_hash_newfunc): Initialize no_fn_stub.
+	(mips_elf_calculate_relocation): Handle R_MIPS_CALL16 like
+	R_MIPS_GOT16.
+	(_bfd_mips_elf_check_relocs): Set no_fn_stub for a symbol if a
+	non-CALL relocation against it is encountered.
+	(_bfd_mips_elf_copy_indirect_symbol): Merge no_fn_stub as well.
+	(_bfd_mips_elf_adjust_dynamic_symbol): Only create a stub if
+	no_fn_stub is not set.
+
+	* elf32-mips.c (mips_elf_output_extsym): Get the output section
+	information from the real symbol for indirect ones.
+	Check no_fn_stub to find out if a symbol has a function stub
+	indeed.
+
+2001-02-11  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* Makefile.am (stamp-lib): ranlib the libbfd.a in the build directory.
+	* Makefile.in: Regenerate.
+
+2001-02-09  David Mosberger  <davidm@hpl.hp.com>
+
+	* elfxx-ia64.c (is_unwind_section_name): New function.  Returns
+	true if section name is an unwind table section name.
+	(elfNN_ia64_additional_program_headers): Count each unwind section
+	separately.
+	(elfNN_ia64_modify_segment_map): Install one unwind program header
+	for each unwind separate section.  Note: normally the linker
+	script merges the unwind sections that go into a single segment,
+	so this still generates at most one unwind program header per
+	segment.
+
+	* elfxx-ia64.c (elfNN_ia64_section_from_shdr): Accept any section
+	name for SHT_IA_64_UNWIND, not just .IA_64.unwind.
+	(elfNN_ia64_fake_sections): Mark sections with names that start
+	with .IA_64.unwind but not with .IA_64.unwind_info as an IA-64
+	unwind section.
+
+	* elfxx-ia64.c (elfNN_ia64_final_write_processing): New function.
+	Use it to make sh_info in unwind section point to the text section
+	it applies to.
+
+2001-02-09  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* Makefile.am: Add linux target for S/390.
+	* archures.c: Likewise.
+	* bfd-in2.h: Likewise.
+	* config.bfd: Likewise.
+	* configure.in: Likewise.
+	* elf.c: Likewise.
+	* libbfd.h: Likewise.
+	* targets.c: Likewise.
+	* cpu-s390.c: New file.
+	* elf32-s390.c: New file.
+	* elf64-s390.c: New file.
+
+2001-02-09  Nick Clifton  <nickc@redhat.com>
+
+	* peigen.c (_bfd_pe_get_symbol_info): Suppress addition of
+	ImageBase.  This has already been done by coff_swap_hdr_in.
+
+2001-02-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf64-sparc.c (sparc64_elf_copy_private_bfd_data): New function.
+
+2001-02-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf64-sparc.c (sparc64_elf_check_relocs): Don't trust reloc_count.
+	(sparc64_elf_relocate_section): Likewise.
+
+2001-02-09  Mark Kettenis  <kettenis@gnu.org>
+
+	* elf32-sparc.c (_bfd_sparc_elf_howto_table): Treat R_SPARC_UA32
+	similar to R_SPARC_32.
+	* elf64-sparc.c	(sparc64_elf_howto_table): Likewise.
+
+2001-02-08  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-i386.c (elf_i386_check_relocs): Reserve R_386_PC32
+	relocation entries for weak definitions when building DSO with
+	-Bsymbolic.
+
+2001-02-08  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (alpha_elf_dynamic_symbol_p): Respect weakness
+	before visibility.  Locally defined protected symbols are not
+	dynamic.
+
+2001-02-08  Geoffrey Keating  <geoffk@redhat.com>
+
+	* config.bfd: Enable coff64 for rs6000-*.  Patch from
+	<hzoli@austin.ibm.com>.
+
+2001-02-07  Mark Elbrecht  <snowball3@bigfoot.com>
+
+	* coffgen.c (coff_find_nearest_line): If stabs info is successfully
+	found, do not attempt to find dwarf2 info before returning.
+
+2001-02-07  Jakub Jelinek  <jakub@redhat.com>
+
+	* elflink.h (is_global_symbol_definition): Rename to
+	is_global_data_symbol_definition and have it reject function
+	symbols.
+	(elf_link_is_defined_archive_symbol): Use renamed function.
+
+2001-02-07  Todd Vierling  <tv@wasabisystems.com>
+
+	* libbfd-in.h (bfd_target_vector): Change extern array to pointer.
+	* libbfd.h (bfd_target_vector): Likewise.
+	* targets.c (bfd_target_vector): Rename to _bfd_target_vector and
+	make static; create pointer reference named bfd_target_vector.
+	(_bfd_target_vector_entries): Calculate this based on the array
+	typed _bfd_target_vector.
+
+2001-02-06  H.J. Lu  <hjl@gnu.org>
+
+	* elfxx-ia64.c (elfNN_ia64_dynamic_symbol_p): Only hidden and
+	internal symbols are not dynamic.
+	* elf64-alpha.c (alpha_elf_dynamic_symbol_p): Likewise.
+
+2001-02-06  Nick Clifton  <nickc@redhat.com>
+
+	* Makefile.am (BFD64_BACKENDS_CFILES): Remove elf64-ia64.c, so
+	that it will not be pulled into the list of files that make up
+	po/POTFILES.in.
+	* Makefile.in: Regenerate.
+	* po/bfd.pot:  Regenerate.
+
+2001-02-06  H.J. Lu  <hjl@gnu.org>
+
+	* peicode.h (coff_swap_filehdr_in): Remove the e_magic
+	checking.
+	(pe_bfd_object_p): Rewrite with external_PEI_DOS_hdr and
+	external_PEI_IMAGE_hdr.
+
+2001-02-06  Kazu Hirata  <kazu@hxi.com>
+
+	* elf-m10200.c: Fix formatting.
+
+2001-02-04  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-v850.c (v850_elf_reloc): Do not convert reloc addend to PC
+	rel, it will be handled later on.
+
+2001-02-02  Fred Fish  <fnf@ninemoons.com>
+
+	* Makefile.in: Fix typo.
+
+2001-02-01  Kazu Hirata  <kazu@hxi.com>
+
+	* elf-m10300.c: Fix formatting.
+
+2001-01-30  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf64-hppa.c (elf64_hppa_elf_get_symbol_type): New function.
+	(elf_backend_get_symbol_type): Define.
+	(elf64_hppa_object_p): Set architecture and machine from elf
+	header flags.
+
+2001-01-30  Curtis L. Janssen  <cljanss@ca.sandia.gov>
+
+	* elf64-alpha.c (elf64_alpha_find_nearest_line): Query dwarf2
+	before mdebug.
+
+2001-01-26  Richard Henderson  <rth@redhat.com>
+
+	* elfxx-ia64.c (elfNN_ia64_dynamic_symbol_p): Return false
+	for non-default visibility.
+	* elf64-alpha.c (alpha_elf_dynamic_symbol_p): Likewise, but
+	delete ugly macro and replace with pretty function.
+
+2001-01-25  Mark Elbrecht  <snowball3@bigfoot.com>
+
+	* coff-go32.c: Update copyright.
+	* coff-stgo32.c: Likewise.
+	* coff-go32.c (COFF_LONG_FILENAMES): Define.
+	* coff-stgo32.c (COFF_LONG_FILENAMES): Likewise.
+	* coff-go32.c (COFF_SECTION_ALIGNMENT_ENTRIES): Remove .bss entry.
+	* coff-stgo32.c (COFF_SECTION_ALIGNMENT_ENTRIES): Likewise.
+
+2001-01-25  Kazu Hirata  <kazu@hxi.com>
+
+	* bfd-in2.h: Rebuild.
+	* libbfd.h: Likewise.
+
+2001-01-23  H.J. Lu  <hjl@gnu.org>
+
+	* bfd-in2.h: Rebuild.
+
+2001-01-23  H.J. Lu  <hjl@gnu.org>
+
+	* vms-misc.c (_bfd_vms_next_record): Return -1 if PRIV(vms_buf)
+	is NULL or PRIV(vms_rec) is outside of the buffer.
+
+2001-01-23  Kazu Hirata  <kazu@hxi.com>
+
+	* coff64-rs6000.c: Fix formatting.
+	* coff-arm.c: Likewise.
+	* coffgen.c: Likewise.
+	* cofflink.c: Likewise.
+	* coff-mcore.c: Likewise.
+	* coff-mips.c: Likewise.
+	* coff-pmac.c: Likewise.
+	* coff-ppc.c: Likewise.
+	* coff-rs6000.c: Likewise.
+	* elf32.c: Likewise.
+	* elf32-fr30.c: Likewise.
+	* elf32-i370.c: Likewise.
+	* elf32-i860.c: Likewise.
+	* elf32-m32r.c: Likewise.
+	* elf32-m68k.c: Likewise.
+	* elf32-mcore.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-sh.c: Likewise.
+	* elf32-v850.c: Likewise.
+	* elf64-alpha.c: Likewise.
+	* elf64-sparc.c: Likewise.
+	* elflink.c: Likewise.
+	* elflink.h: Likewise.
+	* elf-m10200.c: Likewise.
+	* elf-m10300.c: Likewise.
+	* elfxx-ia64.c: Likewise.
+
+	* aoutx.h: Fix formatting.
+	* bfd.c: Likewise.
+	* bfd-in2.h: Likewise.
+	* bfd-in.h: Likewise.
+	* cpu-i386.c: Likewise.
+	* cpu-m68hc11.c: Likewise.
+	* dwarf2.c: Likewise.
+	* elf64-x86-64.c: Likewise.
+	* format.c: Likewise.
+	* freebsd.h: Likewise.
+	* hash.c: Likewise.
+	* hp300hpux.c: Likewise.
+	* hppabsd-core.c: Likewise.
+	* hpux-core.c: Likewise.
+
+2001-01-22  Bo Thorsen  <bo@suse.de>
+
+	* elf64-x86-64.c: Added PIC support for X86-64.
+	(elf64_x86_64_link_hash_newfunc): Function added.
+	(elf64_x86_64_link_hash_table_create): Likewise.
+	(elf64_x86_64_check_relocs): Likewise.
+	(elf64_x86_64_gc_mark_hook): Likewise.
+	(elf64_x86_64_gc_sweep_hook): Likewise.
+	(elf64_x86_64_adjust_dynamic_symbol): Likewise.
+	(elf64_x86_64_size_dynamic_sections): Likewise.
+	(elf64_x86_64_discard_copies): Likewise.
+	(elf64_x86_64_finish_dynamic_symbol): Likewise.
+	(elf64_x86_64_finish_dynamic_sections): Likewise.
+	(elf64_x86_64_relocate_section): Add relocation of PIC sections.
+
+2001-01-21  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+	* Makefile.am (install-data-local): Make use of $(DESTDIR).
+	* Makefile.in: Regenerate.
+
+2001-01-21  Kazu Hirata  <kazu@hxi.com>
+
+	* coff-a29k.c: Fix formatting.
+
+2001-01-19  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-i386.c (elf_i386_check_relocs): Report files with bad
+	relocation section names.
+	(elf_i386_relocate_section): Report files with bad relocation
+	section names and return false.
+
+2001-01-17  Bo Thorsen  <bo@suse.de>
+
+	* targets.c: Alphabetize list of xvecs.
+
+2001-01-14  Alan Modra  <alan@linuxcare.com.au>
+
+	* config.bfd: Add linux target variant for elfxx-hppa.
+	* configure.in: Recognize bfd_elf32_hppa_linux_vec and
+	bfd_elf64_hppa_linux_vec.
+	* configure: Regenerate.
+	* elf64-hppa.c: Include elf64-target.h again to support linux
+	target variant.
+	(elf64_hppa_post_process_headers): Set ELFOSABI_LINUX for linux.
+	* elf32-hppa.c: Include elf32-target.h again to support linux
+	target variant.
+	(elf32_hppa_post_process_headers): New function.
+	(elf_backend_post_process_headers): Define.
+	* targets.c (bfd_target_vector): Add bfd_elf64_hppa_linux_vec and
+	bfd_elf32_hppa_linux_vec.
+
+	* elf32-hppa.c (elf32_hppa_link_hash_table): Add text_segment_base,
+	and data_segment_base fields.
+	(elf32_hppa_link_hash_table_create ): Init them.
+	(elf32_hppa_check_relocs): Update comments.
+	(hppa_record_segment_addr): New function.
+	(elf32_hppa_relocate_section): Call it.
+	(final_link_relocate): Handle R_PARISC_SEGREL32.
+	(elf32_hppa_final_link): New function.
+	(bfd_elf32_bfd_final_link): Define to call it.
+	(hppa_unwind_entry_compare): New function.
+	* cache.c (bfd_open_file): Create files in write+read mode.
+
+	* elf-hppa.h (elf_hppa_howto_table): Set bitsize value for
+	SEGREL32 and numerous other relocs.  Change duplicate
+	R_PARISC_NONE relocs to R_PARISC_UNIMPLEMENTED.
+
+	* opncls.c (bfd_fdopenr): Add parens like the comment says around
+	O_ACCMODE.
+
+	* elf32-hppa.c (elf32_hppa_size_dynamic_sections): Don't create
+	.plt entries for DT_INIT and DT_FINI.
+	(elf32_hppa_finish_dynamic_sections): Remove special handling of
+	DT_INIT and DT_FINI.
+
+	* elf64-hppa.c (elf64_hppa_finish_dynamic_symbol): Use 16-bit
+	offsets for stub .plt access if wide mode.  Check offset in range.
+
+2001-01-13  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-fr30.c (fr30_elf_howto_table): Remove spurious blank
+	line.
+
+	* coffcode.h (coff_canonicalize_reloc): Remove spurious blank
+	line.
+
+2001-01-12  Alan Modra  <alan@linuxcare.com.au>
+
+	* configure.in ([bfd_elf64_x86_64_vec]): Set target64.
+	* configure: Regenerate.
+
+2001-01-11  Peter Targett  <peter.targett@arccores.com>
+
+	* bfd-in2.h (bfd_architecture): Add bfd_mach_arc_5,
+	bfd_mach_arc_6, bfd_mach_arc_7, bfd_mach_arc_8 for ARC variants.
+	* cpu-arc.c (arch_info_struct): Add entries for variants.
+	(bfd_arc_arch) Set default to bfd_mach_arc_5.
+	(arc_get_mach) Don't assume machine names prefixed arc- before
+	testing.
+	* elf32-arc.c (arc_elf_object_p): Set machine number based on new
+	selections.
+	(arc_elf_final_write_processing) Likewise.
+	(ELF_MACHINE_CODE) Use EM_ARC.
+
+2001-01-10  Nick Clifton  <nickc@redhat.com>
+
+	* coff-arm.c (LOCAL_LABEL_PREFIX): Change definition to "".
+
+2001-01-07  Philip Blundell  <philb@gnu.org>
+
+	* README: Replace `bug-gnu-utils@gnu.org' with
+	`bug-binutils@gnu.org'.
+
+2001-01-04  Kazu Hirata  <kazu@hxi.com>
+
+	* som.c: Fix formatting.
+
+2001-01-03  Kazu Hirata  <kazu@hxi.com>
+
+	* ecoffswap.h: Fix formatting.
+	* elf-bfd.h: Likewise.
+	* elfarm-nabi.c: Likewise.
+	* elfarm-oabi.c: Likewise.
+	* elfcode.h: Likewise.
+	* elfcore.h: Likewise.
+	* elflink.c: Likewise.
+	* elflink.h: Likewise.
+	* elfxx-ia64.c: Likewise.
+	* elfxx-target.h: Likewise.
+	* libbfd.c: Likewise
+	* linker.c: Likewise.
+	* lynx-core.c: Likewise.
+
+2001-01-02  Kazu Hirata  <kazu@hxi.com>
+
+	* pc532-mach.c: Fix formatting.
+	* pe-arm.c: Likewise.
+	* pe-i386.c: Likewise.
+	* pe-mips.c: Likewise.
+	* pe-ppc.c: Likewise.
+	* pe-sh.c: Likewise.
+	* pei-mips.c: Likewise.
+	* pei-sh.c: Likewise.
+	* peicode.h: Likewise.
+	* ppcboot.c: Likewise.
+	* ptrace-core.c: Likewise.
+
+2001-01-01  Kazu Hirata  <kazu@hxi.com>
+
+	* reloc.c: Fix formatting.
+	* riscix.c: Likewise.
+	* rs6000-core.c: Likewise.
+	* xcoff-target.h: Likewise.
+
+2000-12-29  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* elfcode.h (elf_object_p): Also restore the bfd mach field on
+	error, by calling bfd_default_set_arch_mach with incoming
+	values.
+
+2000-12-26  Kazu Hirata  <kazu@hxi.com>
+
+	* vaxnetbsd.c: Fix formatting.
+	* versados.c: Likewise.
+	* vms-gsd.c: Likewise.
+	* vms-hdr.c: Likewise.
+	* vms-misc.c: Likewise.
+
+2000-12-25  Alexandre Oliva  <aoliva@redhat.com>
+
+	* archive.c (coff_write_armap): Don't write more than symbol_count
+	`archive_member_file_ptr's.
+
+2000-12-25  Kazu Hirata  <kazu@hxi.com>
+
+	* vms-tir.c: Fix formatting.
+
+2000-12-23  Kazu Hirata  <kazu@hxi.com>
+
+	* vms.c: Fix formatting.
+	* vms.h: Likewise.
+
+2000-12-21  Santeri Paavolainen <santtu@ssh.com>
+
+	* vms-hdr.c: Include alloca.h if HAVE_ALLOCA_H is defined.
+
+	* peicode.h (pe_ILF_object_p): Add const to import of TARGET_LITTLE_SYM.
+
+	* elf32-m32r.c (m32r_elf_generic_reloc): Add cast to avoid (void *)
+	arithmetic.
+
+	* elf32-fr30.c: Add casts to avoid (void *) arithmetic.
+
+	* coffcode.h (styp_to_sec_flags): Add empty statement after label.
+
+2000-12-21  Richard Sandiford  <rsandifo@redhat.com>
+
+	* libbfd.c (bfd_get_bits): Added
+	(bfd_put_bits): Likewise
+	* bfd-in.h: Declared the above.
+	* bfd-in2.h: Regenerated.
+
+2000-12-20  Kazu Hirata  <kazu@hxi.com>
+
+	* targets.c: Fix formatting.
+	* tekhex.c: Likewise.
+	* trad-core.c: Likewise.
+
+2000-12-19  Kazu Hirata  <kazu@hxi.com>
+
+	* sco5-core.c: Fix formatting.
+	* section.c: Likewise.
+	* sparclinux.c: Likewise.
+	* sparclynx.c: Likewise.
+	* sparcnetbsd.c: Likewise.
+	* srec.c: Likewise.
+	* stabs.c: Likewise.
+	* stab-syms.c: Likewise.
+	* sunos.c: Likewise.
+	* syms.c: Likewise.
+	* sysdep.h: Likewise.
+
+2000-12-18  Nick Clifton  <nickc@redhat.com>
+
+	* coff-arm.c (EXTRA_S_FLAGS): Only define if not already
+	defined.
+	* epoc-pe-arm.c (EXTRA_S_FLAGS): Define.
+	* epoc-pei-arm.c (EXTRA_S_FLAGS): Define.
+
+2000-12-18  Nick Clifton  <nickc@redhat.com>
+
+	* vms-misc.c (_bfd_vms_get_record): Add default case to
+	file_format switch.
+
+2000-12-15  Miloslav Trmac <mitr@volny.cz>
+
+	* elfcore.h (elf_core_file_p): Move to the start of the program
+	headers before attempting to read them.
+
+2000-12-14  Kazu Hirata  <kazu@hxi.com>
+
+	* peigen.c: Fix formatting.
+	* som.c: Likewise.
+	* som.h: Likewise.
+
+2000-12-13  Kazu Hirata  <kazu@hxi.com>
+
+	* peigen.c: Fix formatting.
+
+2000-12-12  Jim Wilson  <wilson@redhat.com>
+
+	*  elfxx-ia64.c (get_dyn_sym_info): Cast %p argument to void *.
+
+2000-12-08  Mark Salter  <msalter@redhat.com>
+
+	* binary.c (binary_set_section_contents): Ignore sections
+	with zero size.
+
+2000-12-12  Kazu Hirata  <kazu@hxi.com>
+
+	* m68klinux.c: Fix formatting.
+	* m68knetbsd.c: Likewise.
+	* mipsbsd.c: Likewise.
+	* netbsd-core.c: Likewise.
+	* netbsd.h: Likewise.
+	* newsos3.c: Likewise.
+	* nlm32-alpha.c: Likewise.
+	* nlm32-i386.c: Likewise.
+	* nlm32-ppc.c: Likewise.
+	* nlm32-sparc.c: Likewise.
+	* nlmcode.h: Likewise.
+	* nlmswap.h: Likewise.
+	* nlm-target.h: Likewise.
+	* ns32knetbsd.c: Likewise.
+
+2000-12-10  Fred Fish  <fnf@be.com>
+
+	* elflink.h (elf_link_output_extsym): Don't complain about undefined
+	symbols in shared objects if allow_shlib_undefined is true.
+
+2000-12-12  Nick Clifton  <nickc@redhat.com>
+
+	* cpu-sh.c: Fix formattng.
+	* elf.c: Fix formattng.
+	* elf32-mips.c: Fix formattng.
+	* elf32-sh.c: Fix formattng.
+	* elf64-alpha.c: Fix formattng.
+
+2000-12-09  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-mips.c (_bfd_mips_elf_find_nearest_line): Pass
+	dwarf2_find_line_info as last parameter to invocation of
+	_bfd_dwarf2_find_nearest_line.
+	* elf32-arm.h (elf32_arm_find_nearest_line): Pass
+	dwarf2_find_line_info as last parameter to invocation of
+	_bfd_dwarf2_find_nearest_line.
+
+2000-12-08  Mark Elbrecht  <snowball3@bigfoot.com>
+
+	* Makefile.am (BFD32_BACKENDS): Move dwarf2.lo from here...
+	(BFD_LIBS): ...to here.
+	(BFD32_BACKENDS_CFILES): Move dwarf2.c from here...
+	(BFD_LIBS_CFILES): ...to here.
+	* Makefile.in: Regenerate.
+	* configure.in: Remove dwarf.lo from the elf shell variable.
+	* configure: Regenerate.
+	* libcoff-in.h (coff_tdata): Add pointer dwarf2_find_line_info.
+	* libcoff.h: Regenerate.
+	* coffgen.c (coff_find_nearest_line): Call
+	_bfd_dwarf2_find_nearest_line.
+	* dwarf2.c (_bfd_dwarf2_find_nearest_line): Add parameter. Update
+	accordingly.
+	(read_abbrevs): Likewise
+	(decode_line_info): Likewise.
+	(parse_comp_unit): Likewise.
+	(comp_unit_find_nearest_line): Likewise.
+	* libbfd-in.h (_bfd_dwarf2_find_nearest_line): Update prototype.
+	* libbfd.h: Regenerate.
+	* elf.c (_bfd_elf_find_nearest_line): Update call.
+	* elf-bfd.h (elf_obj_tdata): Change dwarf2_find_line_info to type PTR.
+	* dwarf2.c (concat_filename): Use IS_ABSOLUTE_PATH.
+	* coffcode.h (STYP_XCOFF_DEBUG, STYP_DEBUG_INFO): New macros.
+	(sec_to_styp_flags): Use them. Handle DWARF2 sections.
+	(styp_to_sec_flags): Handle DWARF2 sections.
+	* elf32-arm.h (elf32_arm_find_nearest_line): Add parameter to call
+	to _bfd_find_nearest_line.
+	* elf32-mips.c (_bfd_mips_elf_find_nearest_line): Add parameter to
+	call to _bfd_find_nearest_line.
+
+2000-12-08  Kazu Hirata  <kazu@hxi.com>
+
+	* coffgen.c: Fix formatting.
+	* elf-m10300.c: Likewise.
+	* elf32-i386.c: Likewise.
+	* elf32-i960.c: Likewise.
+	* elf32-m68k.c: Likewise.
+	* elf32-mcore.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-sh.c: Likewise.
+	* elf32-sparc.c: Likewise.
+	* elf32-v850.c: Likewise.
+	* elf64-alpha.c: Likewise.
+	* elf64-hppa.c: Likewise.
+	* elf64-mips.c: Likewise.
+	* elf64-sparc.c: Likewise.
+
+2000-12-07  Kazu Hirata  <kazu@hxi.com>
+
+	* elf32-ppc.c: Fix formatting.
+	* elf64-x86-64.c: Likewise.
+
+2000-12-06  Ulf Carlsson  <ulfc@engr.sgi.com>
+
+	From  Ralf Baechle  <ralf@gnu.org>
+
+	* elf32-mips.c (elf32_mips_merge_private_bfd_data): Always permit
+	BFDs containing no sections or empty .text, .data or .bss sections
+	to be merged, regardless of their flags.
+
+2000-12-06  Kazu Hirata  <kazu@hxi.com>
+
+	* elf32-m32r.c: Fix formatting.
+	* elf32-m68hc11.c: Likewise.
+	* elf32-m68hc12.c: Likewise.
+	* elf32-m68k.c: Likewise.
+	* elf32-mcore.c: Likewise.
+	* elf32-pj.c: Likewise.
+	* elf32-ppc.c: Likewise.
+
+2000-12-05  Kazu Hirata  <kazu@hxi.com>
+
+	* elf32-fr30.c: Fix formatting.
+	* elf32-hppa.c: Likewise.
+	* elf32-i370.c: Likewise.
+	* elf32-i386.c: Likewise.
+	* elf32-i860.c: Likewise.
+	* elf32-i960.c: Likewise.
+
+2000-12-03  Kazu Hirata  <kazu@hxi.com>
+
+	* elf32-arm.h: Fix formatting.
+	* elf32-avr.c: Likewise.
+	* elf32-cris.c: Likewise.
+	* elf32-d10v.c: Likewise.
+	* elf32-d30v.c: Likewise.
+	* elf-hppa.h: Likewise.
+	* elf-m10200.c: Likewise.
+	* elf-m10300.c: Likewise.
+
+2000-12-01  Chris Demetriou  <cgd@sibyte.com>
+
+	* aoutx.h (NAME(aout,machine_type)): Add bfd_mach_mips32 and
+	bfd_mach_mips32_4k.  Update FIXME comment.
+	* archures.c (bfd_mach_mips32): New constant.
+	(bfd_mach_mips4K, bfd_mach_mips32_4k) Rename the former to
+	the latter, renumber it.
+	* bfd-in2.h (bfd_mach_mips32): New constant.
+	(bfd_mach_mips4K, bfd_mach_mips32_4k) Rename the former to
+	the latter, renumber it.
+	* cpu-mips.c (I_mips32): New constant.
+	(I_mips4K, I_mips32_4k): Rename the former to the latter.
+	(arch_info_struct): Add bfd_mach_mips32 entry, replace
+	bfd_mach_mips4K entry with bfd_mach_mips32_4k entry.
+	* elf32-mips.c (elf_mips_isa): Add E_MIPS_ARCH_32 case.
+	(elf_mips_mach): Likewise.  Also, replace E_MIPS_MACH_MIPS32
+	with E_MIPS_MACH_MIPS32_4K.
+	(_bfd_mips_elf_final_write_processing): Replace
+	bfd_mach_mips4K with bfd_mach_mips32_4k case, add
+	bfd_mach_mips32 case.
+	(_bfd_mips_elf_merge_private_bfd_data): Generalize ISA mixing
+	comparison with support for MIPS32.
+	(_bfd_mips_elf_print_private_bfd_data): Print ISA name for
+	MIPS32.
+
+	* aoutx.h (NAME(aout,machine_type)): Add cases for
+	bfd_mach_mips5 and bfd_mach_mips64.
+	* archures.c (bfd_mach_mips5, bfd_mach_mips64): New constants.
+	* bfd-in2.h (bfd_mach_mips5, bfd_mach_mips64): Likewise.
+	* cpu_mips.c (I_mips5, I_mips64): New definitions.
+	(arch_info_struct): Add entries for bfd_mach_mips5 and
+	bfd_mach_mips64.
+	* elf32-mips.c (elf_mips_isa, elf_mips_mach,
+	_bfd_mips_elf_print_private_bfd_data): Add cases for
+	E_MIPS_ARCH_5 and E_MIPS_ARCH_64.
+	(_bfd_mips_elf_final_write_processing): Add cases for
+	bfd_mach_mips5 and bfd_mach_mips64.
+
+	* aoutx.h (NAME(aout,machine_type)): Add a
+	bfd_mach_mips_sb1 case.
+	* archures.c (bfd_mach_mips_sb1): New constant.
+	* bfd-in2.h (bfd_mach_mips_sb1): New constant.
+	* cpu-mips.c (I_sb1): New constant.
+	(arch_info_struct): Add entry for bfd_mach_mips_sb1.
+	* elf32-mips.c (elf_mips_mach): Add case for
+	E_MIPS_MACH_SB1.
+	(_bfd_mips_elf_final_write_processing): Add case for
+	bfd_mach_mips_sb1.
+
+2000-12-01  Joel Sherrill <joel@OARcorp.com>
+
+	* config.bfd (arm-*-rtems*, a29k-*rtems*): New targets.
+	(sparc*-*-rtemself*, sparc*-*-rtemsaout*): New targets.
+	(sparc*-*-rtems*): Switched from a.out to ELF.
+
+2000-11-30  Jan Hubicka  <jh@suse.cz>
+
+	* Makefile.am (BFD64_BACKENDS): Add elf64-x86-64.lo
+	BFD64_BACKENDS_CFILES): Add elf64-x86-64.c
+	(elf64-x86-64.lo): Add dependencies.
+	* archures.c (DESCRIPTION): Add bfd_mach_x86_64,
+	bfd_mach_x86_64_intel_syntax.
+	* elf.c (prep_headers): Use EM_x86_64 for 64bit output.
+	* config.bfd (x86_64): Add.
+	* configure.in: Add support for bfd_elf64_x86_64_vec.
+	* cpu-i386.c (bfd_x86_64_arch_intel_syntax, bfd_x86_64_arch): Add.
+	(bfd_i386_arch, i8086_ar): Link in.
+	* elf64-x86-64.c: New file.
+	* reloc.c (ENUMDOC): Add BFD_RELOC_X86_64*.
+	* targets.c (bfd_elf64_x86_64_vec): Add.
+	(bfd_target_vect): Add bfd_elf64_x86_64_vec.
+
+2000-11-30  Kazu Hirata  <kazu@hxi.com>
+
+	* xcofflink.c: Fix formatting.
+
+2000-11-28  Kazu Hirata  <kazu@hxi.com>
+
+	* aoutx.h: Fix formatting.
+	* bfd-in.h: Likewise.
+	* bfd-in2.h: Likewise.
+	* cache.c: Likewise.
+	* cisco-core.c: Likewise.
+	* coff64-rs6000.c: Likewise.
+	* coffcode.h: Likewise.
+	* coffswap.h: Likewise.
+	* corefile.c: Likewise.
+	* elf32-mips.c: Likewise.
+
+2000-11-27  Kazu Hirata  <kazu@hxi.com>
+
+	* aout-adobe.c: Fix formatting.
+	* coff64-rs6000.c: Likewise.
+	* coffgen.c: Likewise.
+	* cofflink.c: Likewise.
+
+2000-11-27  Philip Blundell  <pb@futuretv.com>
+
+	* libcoff-in.h (coff_tdata): Add `strings_written' flag.
+	(obj_coff_strings_written): New accessor macro for above.
+	* libcoff.h: Regenerate.
+	* cofflink.c (_bfd_coff_final_link): Say that we wrote the
+	strings.
+	* coffcode.h (coff_write_object_contents): No need to write out
+	the string table if it's already been done.
+
+2000-11-22  Philip Blundell  <pb@futuretv.com>
+
+	* cofflink.c (_bfd_coff_generic_relocate_section): Don't object to
+	weak undefined symbols.
+
+2000-11-24  Nick Clifton  <nickc@redhat.com>
+
+	* archures.c (bfd_mach_arm_5TE): Define.
+	(bfd_mach_arm+XScale): Define.
+	* bfd-in2.h: Regenerate.
+
+	* coff-arm.c (coff_arm_reloc_type_lookup): Accept
+	BFD_RELOC_ARM_PCREL_BLX.
+
+	* coffcode.h (coff_set_flags): Set flags for 5t, 5te and
+	XScale machine numbers.
+
+	* config.bfd (xscale-elf): Add target.
+	(xscale-coff): Add target.
+
+	* cpu-arm.c: Add xscale machine name.
+	Add v5t, v5te and XScale machine numbers.
+
+2000-11-23  Kazu Hirata  <kazu@hxi.com>
+
+	* aix386-core.c: Fix formatting.
+
+2000-11-22  Jim Wilson  <wilson@redhat.com>
+
+	* coff-ia64.c (howto_table): Use EMPTY_HOWTO.
+	(in_reloc_p): Add ATTRIBUTE_UNUSED to unused parameters.
+	* cpu-ia64-opc.c (ins_rsvd, ext_rsvd, ins_const, ext_const): Likewise.
+	(ins_imms_scaled): Initialize sign_bit at function entry.
+	(elf64_ia64_operands): Add missing initializers.
+	* elfxx-ia64.c (elfNN_ia64_reloc, elfNN_ia64_reloc_type_lookup,
+	elfNN_ia64_info_to_howto, elfNN_ia64_fake_sections,
+	elfNN_ia64_add_symbol_hook, elfNN_ia64_is_local_label_name,
+	elfNN_ia64_local_hash_table_init, get_fptr, get_pltoff,
+	elfNN_ia64_adjust_dynamic_symbol): Add ATTRIBUTE_UNUSED for unused
+	parameters.
+	(elfNN_ia64_info_to_howto): Initialize free_relocs, free_contents,
+	and free_extsyms at function entry.
+	(elfNN_add_symbol_hook): Add unsigned cast to bfd_get_gp_size result.
+	(elfNN_ia64_create_dynamic_sections): Delete unused local h.
+	(get_got): Delete unused local srel.
+	(elfNN_ia64_check_relocs): Initialize dynrel_type when declared.
+	(elfNN_ia64_relocate_section): Delete unused local dynindx.
+
+2000-11-21  Kazu Hirata  <kazu@hxi.com>
+
+	* coff-a29k.c: Fix formatting.
+	* coff-h8500.c: Likewise.
+	* coff-i960.c: Likewise.
+	* coff-ppc.c: Likewise.
+	* coff-rs6000.c: Likewise.
+	* coff-stgo32.c: Likewise.
+	* coff-tic54x.c: Likewise.
+	* coff-w65.c: Likewise.
+	* cpu-h8500.c: Likewise.
+	* cpu-hppa.c: Likewise.
+	* cpu-ns32k.c: Likewise.
+	* ecoff.c: Likewise.
+	* ecofflink.c: Likewise.
+
+2000-11-21  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-sh.c (sh_elf_reloc_loop): Fix compile time warning, and
+	remove possibility of infinite loop.
+
+2000-11-20  Kazu Hirata  <kazu@hxi.com>
+
+	* aix386-core.c: Fix formatting.
+	* aout-adobe.c: Likewise.
+	* aout-arm.c: Likewise.
+	* aout-encap.c: Likewise.
+	* aout-ns32k.c: Likewise.
+	* aout-target.h: Likewise.
+	* aout-tic30.c: Likewise.
+	* aoutf1.h: Likewise.
+	* aoutx.h: Likewise.
+	* archive.c: Likewise.
+	* bfd-in.h: Likewise.
+	* bfd-in2.h: Likewise.
+	* bfd.c: Likewise.
+	* bout.c: Likewise.
+
+2000-11-17  H.J. Lu  <hjl@gnu.org>
+
+	* elfxx-ia64.c (elfNN_ia64_size_dynamic_sections): Don't create
+	pltoff entries for DT_INIT and DT_FINI.
+	(elfNN_ia64_final_link): Don't set DT_INIT/FINI entries.
+	(elfNN_ia64_finish_dynamic_sections): Don't fill in DT_INIT/FINI
+	entries.
+
+2000-11-16  Richard Henderson  <rth@redhat.com>
+
+	* elfxx-ia64.c (elfNN_ia64_check_relocs): Handle IPLT relocs.
+	(allocate_dynrel_entries): Likewise.
+	(elfNN_ia64_relocate_section): Likewise.  Set REL addends correctly.
+	(set_pltoff_entry): Likewise.
+	(ia64_howto_table): Remove R_IA64_SEGBASE, and R_IA64_EPLT[ML]SB
+	(elfNN_ia64_reloc_type_lookup): Likewise.
+	(elfNN_ia64_install_value): Likewise.
+	(elfNN_ia64_relocate_section): Likewise.
+	* reloc.c (BFD_RELOC_IA64_SEGBASE): Remove.
+	(BFD_RELOC_IA64_EPLTMSB, BFD_RELOC_IA64_EPLTLSB): Remove.
+
+2000-11-16  Kazu Hirata  <kazu@hxi.com>
+
+	* cpu-a29k.c: Fix formatting.
+	* cpu-alpha.c: Likewise.
+	* cpu-arm.c: Likewise.
+	* cpu-avr.c: Likewise.
+	* cpu-d10v.c: Likewise.
+	* cpu-h8500.c: Likewise.
+	* cpu-hppa.c: Likewise.
+	* cpu-i370.c: Likewise.
+	* cpu-i386.c: Likewise.
+	* cpu-i960.c: Likewise.
+	* cpu-ia64-opc.c: Likewise.
+	* cpu-ia64.c: Likewise.
+	* cpu-m32r.c: Likewise.
+	* cpu-m68hc11.c: Likewise.
+	* cpu-m68hc12.c: Likewise.
+	* cpu-m68k.c: Likewise.
+	* cpu-m88k.c: Likewise.
+	* cpu-mips.c: Likewise.
+	* cpu-ns32k.c: Likewise.
+	* cpu-pj.c: Likewise.
+	* cpu-powerpc.c: Likewise.
+	* cpu-sh.c: Likewise.
+	* cpu-sparc.c: Likewise.
+	* cpu-tic54x.c: Likewise.
+	* cpu-v850.c: Likewise.
+	* cpu-vax.c: Likewise.
+	* cpu-w65.c: Likewise.
+	* cpu-we32k.c: Likewise.
+	* cpu-z8k.c: Likewise.
+	* dwarf1.c: Likewise.
+	* dwarf2.c: Likewise.
+
+2000-11-15  Kazu Hirata  <kazu@hxi.com>
+
+	* coff-arm.c: Fix formatting.
+	* coff-ppc.c: Likewise.
+	* coff-rs6000.c: Likewise.
+	* coff-sh.c: Likewise.
+	* coff-sparc.c: Likewise.
+	* coff-tic30.c: Likewise.
+	* coff-tic54x.c: Likewise.
+	* coff-tic80.c: Likewise.
+	* coff-w65.c: Likewise.
+	* coff-we32k.c: Likewise.
+	* coff-z8k.c: Likewise.
+
+2000-11-15  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_check_relocs): Create the reloc
+	section with the same ALLOC|LOAD flags as the source section.
+
+2000-11-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_relax_opt_call): Only check bits used
+	by STO_ALPHA constants.
+
+2000-11-14  Kazu Hirata  <kazu@hxi.com>
+
+	* coff-pmac.c: Fix formatting.
+	* coff-ppc.c: Likewise.
+
+2000-11-13  H.J. Lu  <hjl@gnu.org>
+
+	* elflink.h (elf_link_add_object_symbols): Also add indirect
+	symbols for common symbols with the default version.
+
+2000-11-09  Philip Blundell  <pb@futuretv.com>
+
+	* section.c (STD_SECTION): Set gc_mark flag.
+
+2000-11-11  Kazu Hirata  <kazu@hxi.com>
+
+	* coff-i960.c: Likewise.
+	* coff-m68k.c: Likewise.
+	* coff-m88k.c: Likewise.
+	* coff-mcore.c: Likewise.
+	* coff-mips.c: Likewise.
+
+2000-11-11  Bernd Schmidt  <bernds@cygnus.co.uk>
+
+	* elf32-sh.c (sh_elf_relocate_section): Ignore R_SH_NONE relocs.
+
+2000-11-10  Kazu Hirata  <kazu@hxi.com>
+
+	* coff-h8300.c: Fix formatting.
+	* coff-h8500.c: Likewise.
+	* coff-i386.c: Likewise.
+	* coff-i860.c: Likewise.
+	* coff-i960.c: Likewise.
+	* coff-ia64.c: Likewise.
+
+2000-11-09  Kazu Hirata  <kazu@hxi.com>
+
+	* archive.c: Fix formatting.
+	* archures.c: Likewise.
+
+2000-11-07  Richard Henderson  <rth@redhat.com>
+
+	* elfxx-ia64.c (elf64_ia64_final_link): New local unwind_output_sec.
+	Set it before bfd_elf64_bfd_final_link call.  Use it after the call.
+	* section.c (bfd_set_section_contents): Call memcpy if
+	section->contents set and location not equal to contents plus offset.
+
+2000-11-08  Kazu Hirata  <kazu@hxi.com>
+
+	* bfd-in.h: Fix formatting.
+	* bfd-in2.h: Likewise.
+	* bfd.c: Likewise.
+	* binary.c: Likewise.
+	* bout.c: Likewise.
+	* coff-a29k.c: Likewise.
+	* coff-alpha.c: Likewise.
+	* coff-apollo.c: Likewise.
+	* coff-aux.c: Likewise.
+
+2000-11-07  Kazu Hirata  <kazu@hxi.com>
+
+	* aix386-core.c: Fix formatting.
+	* aoutf1.h: Likewise.
+	* aoutx.h: Likewise.
+	* archures.c: Likewise.
+	* armnetbsd.c: Likewise.
+
+2000-11-07  Alan Modra  <alan@linuxcare.com.au>
+
+	* coff-h8300.c (special): Adjust reloc address.
+
+2000-11-06  Steve Ellcey <sje@cup.hp.com>
+
+	* archures.c (bfd_mach_ia64_elf64, bfd_mach_ia64_elf32): Add defines
+	to differentiate elf32 and elf64 on ia64.
+	* bfd-in2.h: Regenerate.
+	* config.bfd: Add target for "ia64*-*-hpux*".
+	* configure.in: Add bfd_elf32_ia64_big_vec to selvecs switch.
+	* configure: Regenerate.
+	* cpu-ia64.c (bfd_ia64_elf32_arch): Add elf32 arch info structure.
+	* targets.c: Add bfd_target bfd_elf32_ia64_big_vec.
+
+	* Makefile.am: Make elf32-ia64.c and elf64-ia64.c derived objects
+	from elfxx-ia64.c.  Add depenency rules for making elf32-ia64.lo.
+	* Makefile.in: Regnerate.
+	* elf64-ia64.c: Deleted.
+	* elfxx-ia64.c: New file, paramaterized version of elf64-ia64.c.
+
+2000-11-06  Kazu Hirata  <kazu@hxi.com>
+
+	* aout-adobe.c: Fix formatting.
+	* aout-arm.c: Likewise.
+	* aout-cris.c: Likewise.
+	* aout-encap.c: Likewise.
+	* aout-ns32k.c: Likewise.
+	* aout-target.h: Likewise.
+	* aout-tic30.c: Likewise.
+
+2000-11-05  Philip Blundell  <philb@gnu.org>
+
+	* elf32-arm.h (elf32_arm_merge_private_bfd_data): Always permit
+	BFDs containing no sections to be merged, regardless of their flags.
+
+2000-11-04  Philip Blundell  <philb@gnu.org>
+
+	* elf32-arm.h (elf32_arm_relocate_section): Suppress error message
+	if a relocation for an undefined symbol also results in an
+	overflow.
+
+2000-11-06  Christopher Faylor <cgf@cygnus.com>
+
+	* config.bfd: Add support for Sun Chorus.
+
+2000-11-05  David O'Brien  <obrien@FreeBSD.org>
+
+	* configure.in: Recognize alpha-*-freebsd*.
+	* configure: Regenerate.
+
+2000-11-02  Luciano Gemme <ishitawa@yahoo.com>
+
+	* srec.c (CHUNK): Rename to DEFAULT_CHUNK.
+	(Chunk): New global variable set by a parameter in objcopy.c.
+	(S3Forced): New global variable set by a parameter in
+	objcopy.c.
+	(srec_set_section_contents): If S3Forced is true, always generate
+	S3 records.
+	(srec_write_section): Use 'Chunk' to limit maximum length of S
+	records.
+
+2000-11-02  Per Lundberg  <plundis@chaosdev.org>
+
+	* config.bfd: Add support for i[3456]86-chaosdev-storm-chaos.
+	* Makefile.in: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* po/bfd.pot: Regenerate.
+
+2000-10-31  Philip Blundell  <philb@gnu.org>
+
+	* elf32-arm.h (elf32_arm_merge_private_bfd_data): Only handle
+	EF_SOFT_FLOAT if it is defined.
+
+2000-10-27  Philip Blundell  <philb@gnu.org>
+
+	* elf32-arm.h (elf32_arm_copy_private_bfd_data): Don't refuse
+	attempts to mix PIC code with non-PIC, just mark the output as
+	being position dependent.
+	(elf32_arm_merge_private_bfd_data): Likewise.  Print an error
+	message for EF_SOFT_FLOAT mismatches.  Display diagnostics for
+	all mismatches, not just the first one.
+
+2000-10-25  Chris Demetriou  <cgd@sibyte.com>
+
+	* ieee.c (ieee_archive_p): Plug one of many possible
+	memory leaks in error handling.
+
+2000-10-20  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-sparc.c (elf32_sparc_merge_private_bfd_data,
+	elf32_sparc_object_p, elf32_sparc_final_write_processing):
+	Support v8plusb.
+	* elf64-sparc.c (sparc64_elf_merge_private_bfd_data,
+	sparc64_elf_object_p): Support v9b.
+	* archures.c: Declare v8plusb and v9b machines.
+	* bfd-in2.h: Ditto.
+	* cpu-sparc.c: Ditto.
+
+2000-10-16  Geoffrey Keating  <geoffk@shoggoth.cygnus.com>
+
+	* elf64-sparc.c (sparc64_elf_relocate_section): Clear the location
+	of a GOT reloc.
+
+	* elf32-ppc.c (SYMBOL_REFERENCES_LOCAL): New macro.
+	(SYMBOL_CALLS_LOCAL): New macro.
+	(ppc_elf_adjust_dynamic_symbol): Use SYMBOL_CALLS_LOCAL.
+	(ppc_elf_check_relocs): Use SYMBOL_REFERENCES_LOCAL.
+	(ppc_elf_finish_dynamic_symbol): Use SYMBOL_REFERENCES_LOCAL.
+	(ppc_elf_relocate_section): Use flag variable to determine
+	whether the relocation refers to a local symbol.
+	Test whether a PLTREL24 reloc will produce a reloc by looking
+	to see whether a PLT entry was made.
+
+2000-10-14  Geoffrey Keating  <geoffk@shoggoth.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_finish_dynamic_symbol): Don't make PLT
+	entries that could serve as a definition for a weak symbol.
+
+2000-10-13  Ulf Carlsson  <ulfc@engr.sgi.com>
+
+	From  Ralf Baechle  <ralf@gnu.org>
+
+	* elf32-mips.c (mips_elf_create_dynamic_relocation): New argument
+	local_p.  Add symbol value only for non-R_MIPS_REL32 relocations
+	against local symbols.
+	(_bfd_mips_elf_finish_dynamic_sections): Undo patch from 2000-10-01.
+
+2000-10-12  Alan Modra  <alan@linuxcare.com.au>
+
+	* section.c (struct sec): Add kept_section.
+	(struct bfd_comdat_info): Remove sec, we can use above.
+	(STD_SECTION): Add initializer.
+	(bfd_make_section_anyway): Init here too.
+
+	* bfd-in2.h: Regenerate.
+
+	* elflink.h (elf_link_add_object_symbols): Remove unnecessary
+	zeroing of `flags'.
+	(elf_link_input_bfd): Set all asection->symbol->value's here, and
+	fudge values for discarded link-once section symbols.
+
+	* elf64-hppa.c: Include alloca-conf.h
+
+2000-10-11  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf.c (swap_out_syms): Revert 2000-10-07 changes.
+
+	* ieee.c (ieee_make_empty_symbol): Oops, bfd_zalloc needs another arg.
+
+2000-10-10  Alan Modra  <alan@linuxcare.com.au>
+
+	* ieee.c (ieee_make_empty_symbol): Use bfd_zalloc, not bfd_zmalloc.
+
+2000-10-10  Tom Rix <trix@redhat.com>
+
+	* section.c (bfd_make_section_anyway): Release newsect ptr when
+	newsect->symbol fails to alloc.  Use bfd_release instead of free.
+
+2000-10-09  Richard Henderson  <rth@cygnus.com
+
+	* elf64-ia64.c (elf64_ia64_unwind_entry_compare_bfd): New.
+	(elf64_ia64_unwind_entry_compare): New.
+	(elf64_ia64_final_link): Sort the .IA_64.unwind section.
+
+2000-10-07  Alan Modra  <alan@linuxcare.com.au>
+
+	* elflink.h (size_dynamic_sections): Don't create various tags if
+	.dynstr is excluded from the link.  Don't set first dynsym entry
+	if dynsymcount is zero.
+	(elf_bfd_final_link): Don't try to swap out dynamic syms if
+	.dynsym excluded from the link.  Don't try to write any dynamic
+	sections excluded from the link.
+
+	* elf.c (swap_out_syms): Handle global section symbols.
+
+2000-10-05  DJ Delorie  <dj@redhat.com>
+
+	* peigen.c (_bfd_pei_swap_scnhdr_out): note extended relocs
+	* coffcode.h (coff_set_alignment_hook): read extended reloc count
+	(coff_write_relocs): write extended reloc count
+	(coff_write_object_contents): account for extended relocs
+
+2000-10-05  Jim Wilson  <wilson@cygnus.com>
+
+	* elf-bfd.h (struct elf_backend_data): Add elf_backend_section_flags
+	field.
+	* elf.c (_bfd_elf_make_section_from_shdr): Call the
+	elf_backend_section_flags function.
+	* elf64-ia64.c (elf64_ia64_section_from_shdr): Delete flag conversion
+	code.
+	(elf64_ia64_section_flags): New function containing flag conversion
+	code.
+	(elf_backend_section_flags): Define to elf64_ia64_section_flags.
+	* elfxx-target.h (elf_backend_section_flags): Define.
+	(elfNN_bed): Initialize elf_backend_section_flags field.
+
+2000-10-02  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf32-hppa.c (elf32_hppa_check_relocs): Correct call to
+	_bfd_elf32_gc_record_vtable.  Correct a comment.
+
+2000-10-01  Ulf Carlsson  <ulfc@engr.sgi.com>
+
+	From  Ralf Baechle  <ralf@gnu.org>
+
+	* elf32-mips.c (_bfd_mips_elf_finish_dynamic_sections): Mark gld
+	produces binaries with got[1] = 0x80000001 to differenciate them
+	for the dynamic linker from the broken binaries produced by old
+	versions.
+
+2000-09-30  Petr Sorfa <petrs@sco.com>
+
+	* elf.c (elfcore_grok_pstatus): Check for size of pxstatus_t.
+	(elfcore_grok_lwpstatus): Check for size of lwpxstatus_t.
+	* configure.in: Add check for pxstatus_t and lwpxstatus_t.
+	* configure: Regenerate.
+
+2000-09-27  Hans-Peter Nilsson  <hp@axis.com>
+
+	Define two bfd_targets for absence and presence of leading
+	underscore on symbols.  Make sure to only link same kind.
+	* elf32-cris.c (cris_elf_object_p,
+	cris_elf_final_write_processing, cris_elf_print_private_bfd_data,
+	cris_elf_merge_private_bfd_data): New.
+	(elf_backend_object_p, elf_backend_final_write_processing,
+	bfd_elf32_bfd_print_private_bfd_data,
+	bfd_elf32_bfd_merge_private_bfd_data): Define.
+	<Target vector definition>: Include elf32-target.h twice with
+	different macro settings:
+	(TARGET_LITTLE_SYM): First as bfd_elf32_cris_vec, then as
+	bfd_elf32_us_cris_vec.
+	(TARGET_LITTLE_NAME): First as "elf32-cris", then "elf32-us-cris".
+	(elf_symbol_leading_char): First as 0, then '_'.
+	(INCLUDED_TARGET_FILE): Define for second include of elf32-target.h.
+	* config.bfd (cris-*-*): Add bfd_elf32_us_cris_vec to targ_selvecs.
+	* configure.in (bfd_elf32_cris_vec, cris_aout_vec): New vector.
+	* configure: Regenerate.
+	* targets.c: Declare bfd_elf32_us_cris_vec.
+	* po/bfd.pot: Regenerate.
+
+2000-09-29  Momchil Velikov  <velco@fadata.bg>
+
+	* elf32-arm.h (arm_add_to_rel): Correctly adjust the addend for
+	R_ARM_THM_PC22 relocations.
+
+2000-09-29  NIIBE Yutaka <gniibe@chroot.org>
+
+	* elflink.h (elf_link_add_object_symbols): Don't bfd_release runpath.
+
+2000-09-29  Momchil Velikov <velco@fadata.bg>
+
+	* elf.c (elf_fake_sections): Do not mark the section SHT_NOBITS if
+	is has the SEC_HAS_CONTENTS flag set.
+
+2000-09-28  ��rjan Friberg  <orjanf@axis.com>
+	    Hans-Peter Nilsson  <hp@axis.com>
+
+	* aout-cris.c (N_TXTADDR): Define.
+
+2000-09-28  John David Anglin <dave@hiauly1.hia.nrc.ca>
+
+	* som.c: Include alloca-conf.h.
+	* Makefile.am: "make dep-am"
+	* Makefile.in: Regenerate.
+
+2000-09-27  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf32-hppa.c (plt_stub): New.
+	(PLT_STUB_ENTRY): Define.
+	(elf32_hppa_link_hash_table): Change multi_subspace to packed
+	boolean.  Add need_plt_stub, has_12bit_branch and has_17bit_branch.
+	(elf32_hppa_link_hash_table_create): Init to suit.
+	(elf32_hppa_check_relocs): Set has_12bit_branch and
+	has_17bit_branch as appropriate.
+	(elf32_hppa_adjust_dynamic_symbol): Set need_plt_stub for
+	non-local functions.
+	(elf32_hppa_size_dynamic_sections): Correct setting of reltext.
+	Add space for plt_stub as needed.
+	(elf32_hppa_finish_dynamic_symbol): Point .plt entries for global
+	functions at plt_stub.
+	(elf32_hppa_finish_dynamic_sections): Write plt_stub.
+	(elf32_hppa_create_dynamic_sections): Leave .plt executable.
+
+	* elf32-hppa.h (elf32_hppa_size_stubs): Add group_size param.
+	* elf32-hppa.c (elf32_hppa_size_stubs): Likewise.  Use it instead
+	of fixed size, and if negative, disable handling of input sections
+	before stub section.  Set up default stub group size depending
+	on detected branch relocs.
+	(hppa_build_one_stub): Use lrsel and rrsel for import stubs to
+	ensure different offsets from sym_value aren't rounded to
+	different 2k blocks.  Use lrsel and rrsel for other stubs too for
+	consistency rather than necessity.
+	(elf32_hppa_check_relocs): Handle R_PARISC_DIR14F.
+	(final_link_relocate): Likewise.
+	(elf32_hppa_relocate_section): Likewise.
+
+	* elf-hppa.h (elf_hppa_howto_table): Add R_PARISC_DIR14F reloc.
+	(_bfd_elf_hppa_gen_reloc_type): Generate them.
+	(elf_hppa_final_link_relocate): Handle them.
+	(elf_hppa_relocate_insn): Likewise.
+	(_bfd_elf_hppa_gen_reloc_type): Add missing e_ldsel and e_rdsel cases.
+
+2000-09-26  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elfcode.h (elf_object_p): Preserve and clear abfd section
+	information.  Restore at error.
+
+2000-09-26  Paul Sokolovsky  <Paul.Sokolovsky@technologist.com>
+
+	* peigen.c (_bfd_pei_swap_aouthdr_in): If some DataDirectory
+	is empty, make sure that its rva also 0. NT loader dislikes
+	having otherwise.
+
+2000-09-26  Steve Ellcey <sje@cup.hp.com>
+
+	* som.c (som_bfd_derive_misc_symbol_info): Make weak symbols
+	global by default.
+
+2000-09-21  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf32-hppa.c (elf32_hppa_check_relocs): Fix weak sym handling in
+	currently unused RELATIVE_DYNAMIC_RELOCS code.
+	(hppa_discard_copies): Likewise.
+	(elf32_hppa_size_stubs): Size `input_list' array correctly.  Correct
+	comments.  Don't check non-code output sections for stub grouping.
+
+2000-09-20  Alan Modra  <alan@linuxcare.com.au>
+
+	* section.c (bfd_get_unique_section_name): Return NULL if
+	bfd_malloc fails.
+
+2000-09-19  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* elf32-m68k.c (elf_cpu32_plt0_entry): Change the PLT entry 0
+	instruction sequence to actually work.
+	(elf_m68k_finish_dynamic_sections): Change the patch-in offset
+	accordingly.
+
+2000-09-18  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-sh.c (sh_elf_relocate_section): Use
+	_bfd_final_link_relocate to apply the relocation against a section
+	symbol, when doing relocatable links.
+
+2000-09-18  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf32-hppa.c (elf32_hppa_stub_hash_entry): Rename input_section
+	to id_sec.
+	(stub_hash_newfunc): Here too.
+	(hppa_add_stub): And here.
+	(elf32_hppa_link_hash_table): Remove stub_section_created,
+	reloc_section_created, first_init_sec and first_fini_sec.  Add
+	stub_group.
+	(elf32_hppa_link_hash_table_create): Init to suit.
+	(hppa_get_stub_entry): Add support for grouping stub sections.
+	(hppa_add_stub): Likewise.  Remove sec_count param and init/fini
+	section code.  Index stub vars by section->id.
+	(elf32_hppa_size_stubs): Likewise.  Remove duplicated function
+	exit paths.  Zap allocation of above removed vars.  Refine
+	link-once test.
+
+	* elf32-hppa.h (elf32_hppa_size_stubs): Add output_bfd param.
+	* elf32-hppa.c (elf32_hppa_size_stubs): Likewise.
+	(hppa_get_stub_entry): Pass in pointer to elf32_hppa_link_hash_table
+	rather than pointer to bfd_link_info.
+	(hppa_add_stub): Likewise.
+	(final_link_relocate): Likewise.
+
+2000-09-17  David Huggins-Daines  <dhd@linuxcare.com>
+
+	(elf32_hppa_size_stubs): Don't try to build stubs for discarded
+	link-once sections.
+
+2000-09-16  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-sh.c (ELF_MAXPAGESIZE): Define to 128, to match
+	ld/emulparams/shelf.sh.
+
+2000-09-10  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* elf32-m68k.c (bfd_m68k_elf32_create_embedded_relocs): New function.
+	* bfd-in.h (bfd_m68k_elf32_create_embedded_relocs): Add declaration.
+	* bfd-in2.h: Regenerate.
+
+2000-09-15  Kenneth Block  <Kenneth.Block@compaq.com>
+
+	* elf64-alpha.c (elf64_alpha_relax_with_lituse): ld performs
+	LITUSE relocations incorrectly if -relax is specified on the ld
+	command line and the displacement field of the load or store
+	instruction is non-zero. (Patch by paul.winalski@compaq.com)
+
+2000-09-15  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf32-hppa.c (hppa_add_stub): Dont set first_init_sec and
+	first_fini_sec here.
+	(elf32_hppa_size_stubs): Instead correctly find the first .init
+	and .fini section here.
+
+2000-09-15  David Huggins-Daines  <dhd@linuxcare.com>
+
+	* elf32-hppa.c (clobber_millicode_symbols): New function.
+	(elf32_hppa_size_dynamic_sections): Call it.
+
+2000-09-14  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf32-hppa.c (elf32_hppa_link_hash_entry): Make pic_call
+	packed.  Add plabel, plt_abs packed booleans.
+	(hppa_link_hash_newfunc): Init new fields.
+	(PLABEL_PLT_ENTRY_SIZE): Define.
+	(hppa_stub_name): Use size_t len vars.
+	(hppa_add_stub): Likewise.
+	(elf32_hppa_build_stubs): Likewise.
+	(hppa_build_one_stub): Kill some compiler warnings.
+	(elf32_hppa_check_relocs): Always generate a plt entry for PLABELs
+	if dynamic linking.  Munge the local plt offsets into
+	local_got_refcounts.  Set h->plabel for all global PLABELs.  Use
+	size_t len vars.  Add assert for plabel addend.
+	(elf32_hppa_gc_sweep_hook): Sweep local plt entries too.
+	(elf32_hppa_hide_symbol): New function.
+	(elf_backend_hide_symbol): Define.
+	(elf32_hppa_adjust_dynamic_symbol): Don't throw away plt entries
+	with h->plabel set.  Don't make plt entries to have dynamic syms
+	when they have been forced local.  If plt entry is used by a
+	plabel, make it PLABEL_PLT_ENTRY_SIZE.
+	(elf32_hppa_size_dynamic_sections): Set plt_abs for init fns.
+	Set up .plt offsets for local syms.
+	(elf32_hppa_relocate_section): Initialise plt entries for local
+	syms.  Leave weak undefined plabels zero.  Make global plabel
+	relocs against function symbol, and leave the addend zero.
+	Use *ABS* DIR32 relocs instead of SEGREL32 for dynamic got relocs.
+	(elf32_hppa_finish_dynamic_symbol): Set up IPLT relocs for
+	non-dynamic syms.  Init extra plt for plabels.  Use *ABS* DIR32
+	relocs instead of SEGREL32 for dynamic got relocs.
+	(elf32_hppa_finish_dynamic_sections): Reserve one more .got entry.
+	(elf_backend_got_header_size): Adjust.
+	(elf32_hppa_set_gp): Calculate an "ideal" LTP.
+
+	* elf32-hppa.c (LONG_BRANCH_VIA_PLT): Define.
+	(hppa_type_of_stub): Use it instead of #if 0
+	(hppa_discard_copies): Use it here too.
+	(elf32_hppa_size_dynamic_sections): And here.
+
+	* elf32-hppa.c (elf32_hppa_link_hash_table): Remove `offset' field.
+	(elf32_hppa_link_hash_table_create): And here.
+	(hppa_build_one_stub): And here.  Instead keep track of stub
+	offset using _raw_size.
+	(elf32_hppa_size_stubs): Likewise.
+	(elf32_hppa_build_stubs): Likewise.
+	(hppa_size_one_stub): Likewise.  Resize reloc section too.
+
+	* elf32-hppa.c (hppa_add_stub): Correct first_init_sec and
+	first_fini_sec handling.  Don't search for reloc section or set
+	hplink->reloc_section_created here.
+	(elf32_hppa_size_stubs): Instead search for reloc sections, and
+	set reloc_section_created here.
+	(hppa_handle_PIC_calls): Set ELF_LINK_HASH_NEEDS_PLT.
+	(elf32_hppa_size_dynamic_sections): Make a .plt entry for DT_INIT
+	and DT_FINI.
+	(elf32_hppa_finish_dynamic_sections): Set DT_INIT and DT_FINI.
+
+	* elf32-hppa.c (hppa_build_one_stub): Replace `elf_hash_table (info)'
+	with `hplink->root.'.
+	(elf32_hppa_check_relocs): Likewise.
+	(elf32_hppa_gc_sweep_hook): Likewise.
+	(elf32_hppa_adjust_dynamic_symbol): Likewise.
+	(hppa_handle_PIC_calls): Likewise.
+	(elf32_hppa_size_dynamic_sections): Likewise.
+	(elf32_hppa_set_gp): Likewise.
+	(elf32_hppa_relocate_section): Likewise.
+	(elf32_hppa_finish_dynamic_symbol): Likewise.
+	(elf32_hppa_finish_dynamic_sections): Likewise.
+
+	From  David Huggins-Daines  <dhd@linuxcare.com>
+	* elf32-hppa.c (hppa_type_of_stub): Generate import stubs for
+	defined weak symbols in shared links.
+	(final_link_relocate): Calls to defined weak symbols in shared
+	objects must go via import stubs, as the target might not be known
+	at link time.
+
+2000-09-14  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-sh.c (sh_elf_howto_table): Moved R_SH_GOT32, R_SH_PLT32,
+	R_SH_COPY, R_SH_GLOB_DAT, R_SH_JMP_SLOT, R_SH_RELATIVE,
+	R_SH_GOTOFF, R_SH_GOTPC) to the range from 160 to 167.  Replaced
+	the original entries with EMPTY_HOWTOs, and added new ones to fill
+	in the gap.
+	(sh_elf_info_to_howto): Make sure the new gap isn't used.
+	(sh_elf_relocate_section): Likewise.
+
+2000-09-13  Anders Norlander  <anorland@acc.umu.se>
+
+	* cpu-mips.c (arch_info_struct): Add mips:4K
+	* bfd-in2.h (bfd_mach_mips4K): New define.
+	* archures.c: Add bfd_mach_mips4K to comment.
+	* elf32-mips.c (_bfd_mips_elf_final_write_processing): Return
+	E_MIPS_ARCH_2 for bfd_mach_mips4K.
+
+2000-09-13  Marco Franzen <marcof@thyron.com>
+
+	* som.c (som_write_symbol_strings): Do not used fixed buffers,
+	use size_t as a counter.
+	(som_write_space_strings): Similarly.
+
+2000-09-12  Jason Eckhardt  <jle@cygnus.com>
+
+	* elf32-i860.c (elf32_i860_relocate_pc26): New function
+	and prototype.
+	(elf32_i860_relocate_section): Invoke new function from here.
+
+2000-09-11  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* elf.c (_bfd_elf_make_section_from_shdr): Make debug_sec_names
+	static.
+
+2000-09-10  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* coff-m68k.c (bfd_m68k_coff_create_embedded_relocs): Emit 8 NULs for
+	target section name instead of dumping core when the target symbol is
+	undefined.
+
+2000-09-09  Kazu Hirata  <kazu@hxi.com>
+
+	* riscix.c: Remove DEFUN.
+
+2000-09-08  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-arm.h (elf32_arm_merge_private_bfd_data): Do not
+	initialise flags in output bfd if the input bfd is the default
+	architecture with the default flags.
+
+2000-09-08  Kazu Hirata  <kazu@hxi.com>
+
+	* archive.c: Fix formatting.
+	* coff-arm.c: Likewise.
+	* doc/chew.c: Likewise.
+
+2000-09-08  Alan Modra  <alan@linuxcare.com.au>
+
+	* section.c (bfd_get_unique_section_name): Put a dot before the
+	numeric suffix.
+
+2000-09-07  Kazu Hirata  <kazu@hxi.com>
+
+	* doc/chew.c: Remove all uses of DEFUN and DEFUN_VOID.
+	* elf.c: Fix formatting.
+
+2000-09-07  Alexandre Oliva  <aoliva@redhat.com>
+
+	* config.bfd (sh-*-linux*): Added.
+	* configure.in (bfd_elf32_shlin_vec, bfd_elf32_shblin_vec): New.
+	* targets.c: Declare them.
+	* elf32-sh-lin.c: New file.
+	* Makefile.am: Compile it.
+	* elf32-sh.c: Don't override defines from elf32-sh-lin.c.
+	* configure, Makefile.in: Rebuilt.
+
+2000-09-06  Geoffrey Keating  <geoffk@cygnus.com>
+
+	* xcofflink.c (xcoff_link_input_bfd): Include the .tocbss
+	pseduo-section when determining where the TOC ends.
+
+	* coff-rs6000.c (_bfd_xcoff_swap_aux_out): Use bfd_h_put_16 to
+	output x_tvndx as it is only two bytes wide.
+
+	* coff-rs6000.c (xcoff_howto_table): A modifiable branch-absolute
+	reloc is 26 or 32 bits wide.
+
+	* coff-rs6000.c (_bfd_xcoff_rtype2howto): The bitsize is irrelevant
+	for relocs that don't change anything.  Also look at the full
+	6 bits of bitsize.
+
+2000-09-06  Philip Blundell  <philb@gnu.org>
+
+	* config.bfd (arm*-*-uclinux*): New target.
+
+2000-09-06  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure: Rebuilt with new libtool.m4.
+
+2000-09-06  Alan Modra  <alan@linuxcare.com.au>
+
+	* section.c (bfd_get_unique_section_name): Avoid c++ reserved
+	word for variable name.
+	* bfd-in2.h: Regenerate.
+
+2000-09-05  Nick Clifton  <nickc@redhat.com>
+
+	* config.in: Regenerate.
+	* libbfd.h: Regenerate.
+	* po/bfd.pot: Regenerate.
+	* doc/bfdint.texi: Remove CVS date string - it foils compares with
+	local versions.
+
+2000-09-05  Steven Johnson  <sbjohnson@ozemail.com.au>
+
+	* cpu-powerpc.c  (arch_info_struct): Added MPC860 Family entry.
+
+2000-09-05  Alan Modra  <alan@linuxcare.com.au>
+
+	Shared library and PIC support.
+	* elf32-hppa.c (PLT_ENTRY_SIZE): New.
+	(GOT_ENTRY_SIZE): New.
+	(ELF_DYNAMIC_INTERPRETER): New.
+	(STUB_SUFFIX): Define.
+	(LONG_BRANCH_PIC_IN_SHLIB): Define.
+	(RELATIVE_DYNAMIC_RELOCS): Define.
+	(enum elf32_hppa_stub_type): New.
+	(struct elf32_hppa_stub_hash_entry): Rename offset to
+	stub_offset.  Add a number of new fields.
+	(struct elf32_hppa_link_hash_entry): New.
+	(struct elf32_hppa_link_hash_table): Add numerous fields.  Remove
+	global_value.
+	(elf32_hppa_hash_table): Rename to hppa_link_hash_table.
+	(elf32_hppa_stub_hash_lookup): Rename to hppa_stub_hash_lookup.
+	(elf32_hppa_stub_hash_newfunc): Rename to stub_hash_newfunc.  Init
+	new fields.
+	(hppa_link_hash_newfunc): New function.
+	(elf32_hppa_link_hash_table_create): Use above function. Init new
+	fields.
+	(elf32_hppa_stub_name): Rename to hppa_stub_name.  Pass in reloc
+	instead of addend, and remove sym_name from args.  Don't use
+	symbol name for local syms, instead use sym index.
+	(elf32_hppa_size_of_stub): Rename to hppa_type_of_stub, and return
+	stub type rather than size.  Pass in hash and handle import stub
+	case.  Also pass in reloc instead of offset so we can calculate
+	PCREL22F and PCREL12F branches properly.
+	(elf32_hppa_build_one_stub): Rename to hppa_build_one_stub.  Build
+	import and export stubs too.
+	(elf32_hppa_size_one_stub): Rename to hppa_size_one_stub.  Handle
+	import and export stub sizing.
+	(elf32_hppa_check_relocs): New function.
+	(elf32_hppa_adjust_dynamic_symbol): New function.
+	(hppa_discard_copies): New function.
+	(elf32_hppa_size_dynamic_sections): New function.
+	(elf_backend_size_dynamic_sections): Define.
+	(elf32_hppa_finish_dynamic_symbol): New function.
+	(elf_backend_finish_dynamic_symbol): Define.
+	(elf32_hppa_size_stubs): Stash params in link hash table, and move
+	some local vars into the link hash table too.  For shared links,
+	trundle over function syms, generating export stubs.  Handle
+	PCREL22F branches.  Break out stub creation code from here..
+	(hppa_add_stub): .. to here.  New function.
+	(elf32_hppa_final_link): Rename to elf32_hppa_set_gp, and don't
+	call the bfd linker.  Use elf_gp to record global pointer.
+	Calculate a value from sections if $global$ is missing.
+	(bfd_elf32_bfd_final_link): Define as _bfd_elf32_gc_common_final_link.
+	(elf32_hppa_gc_mark_hook): New function.
+	(elf_backend_gc_mark_hook): Define.
+	(elf32_hppa_gc_sweep_hook): New function.
+	(elf_backend_gc_sweep_hook): Define.
+	(elf32_hppa_bfd_final_link_relocate): Rename to final_link_relocate.
+	Add rel to args, and remove howto, input_bfd, offset, addend,
+	sym_name as we can recalculate these locally.  Handle calls to
+	dynamic objects, extra PIC relocs, PCREL22F branches.  Change
+	handling of undefined weak syms.  Check that stubs are in range.
+	Only look for import stubs on PCREL17F and PCREL22F relocs.  Add
+	message on hitting a DPREL21L reloc that needs fixing.  Subtract
+	off PC for PCREL14F.  Break out code that does a stub lookup from
+	here..
+	(hppa_get_stub_entry): ..to here.  New function.
+	(elf32_hppa_relocate_insn): Merge into final_link_relocate.
+	(elf32_hppa_relocate_section): Handle got and plt relocs, dynamic
+	relocs, etc. etc.
+	(elf32_hppa_finish_dynamic_sections): New function.
+	(elf_backend_finish_dynamic_sections): Define.
+	(elf_backend_final_write_processing) Define.
+	(hppa_handle_PIC_calls): New function.
+	(elf32_hppa_build_stubs): Call it.  Pass link_info to
+	hppa_build_one_stub.
+	(elf32_hppa_create_dynamic_sections): New function
+	to create .plt and .got then set .plt flags correctly.
+	(elf_backend_create_dynamic_sections): Define.
+	(elf32_hppa_object_p): New function.
+	(elf_backend_object_p): Define.
+	(elf32_hppa_elf_get_symbol_type): New function.
+	(elf_backend_get_symbol_type): Define.
+	(elf_backend_can_gc_sections): Define.
+	(elf_backend_want_got_plt): Define.
+	(elf_backend_plt_alignment): Set to 2.
+	(elf_backend_plt_readonly): Define.
+	(elf_backend_want_plt_sym): Define.
+	(elf_backend_got_header_size): Reserve one entry.
+
+	* elf32-hppa.h (elf32_hppa_build_stubs): Don't pass stub bfd.
+	(elf32_hppa_size_stubs): Pass in multi_subspace.
+	(elf32_hppa_set_gp): Declare.
+
+	* section.c (SEC_HAS_GOT_REF): Define new flag for asection.
+	(bfd_get_unique_section_name): New function.
+	* bfd-in2.h: Regenerate.
+
+	* elf64-hppa.c (elf64_hppa_check_relocs): Handle R_PARISC_PCREL12F.
+	(elf64_hppa_size_dynamic_sections): Remove the FIXME at bfd_zalloc
+	comment.
+
+	From  David Huggins-Daines  <dhd@linuxcare.com>
+	* elf64-hppa.c (elf64_hppa_check_relocs): Fix a warning.
+	(elf64_hppa_mark_exported_functions): Set dyn_h->st_shndx.
+	(elf64_hppa_link_output_symbol_hook): Test dyn_h->st_shndx has
+	been updated in finish_dynamic_symbol before modifying function
+	symbol.
+
+	* elf-hppa.h (elf_hppa_howto_table): Restructure into groups of
+	eight entries.  Replace NULL with bfd_elf_generic_reloc.  Add
+	R_PARISC_GNU_VTENTRY, R_PARISC_GNU_VTINHERIT and R_PARISC_PCREL12F.
+	(_bfd_elf_hppa_gen_reloc_type): Handle R_PARISC_GNU_VT*.  Add some
+	comments.  Handle format == 12 for R_HPPA_PCREL_CALL.
+	(elf_hppa_final_link_relocate): Handle R_PARISC_PCREL12F.
+	(elf_hppa_relocate_insn): Likewise.  Reformat some comments.
+	(elf_hppa_final_write_processing): Expose it for ARCH_SIZE == 32.
+
+	From David Huggins-Daines  <dhd@linuxcare.com>
+	* elf-hppa.h (elf_hppa_is_local_label_name): Accept the SysV/ELF
+	style of local labels as well.
+
+2000-09-03  Philip Blundell  <philb@gnu.org>
+
+	* elf32-arm.h (elf32_arm_relocate_section): Don't try to relocate
+	references to undefined symbols in debugging sections.
+
+2000-09-02  H.J. Lu  <hjl@gnu.org>
+
+	* reloc.c (BFD_RELOC_SH_COPY, BFD_RELOC_SH_GLOB_DAT,
+	BFD_RELOC_SH_JMP_SLOT, BFD_RELOC_SH_RELATIVE,
+	BFD_RELOC_SH_GOTPC): Move them from the MIPS section to the SH
+	section.
+
+2000-09-02  Jason Eckhardt  <jle@cygnus.com>
+
+	* elf32-i860.c (bfd_elf32_bfd_is_local_label_name): Define macro.
+	(elf32_i860_is_local_label_name): New function and prototype.
+
+2000-09-02  Nick Clifton  <nickc@redhat.com>
+
+	* configure.in: Increase version number to 2.10.91.
+	* configure: Regenerate.
+	* aclocal.m4: Regenerate.
+	* config.in: Regenerate.
+	* po/bfd.pot: Regenerate.
+
+2000-09-02  Daniel Berlin <dberlin@redhat.com>
+
+	* elf.c (_bfd_elf_make_section_from_shdr): Add
+	.gnu.linkobce.wi. to the list of debug section names.
+
+2000-09-02  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf2.c (find_debug_info): New function: Locate a section
+	containing dwarf2 debug information.
+	(bfd_dwarf2_find_nearest_line): Find all sections containing
+	debug information and include them in the stash.
+
+2000-09-01  Niibe Yutaka  <gniibe@m17n.org>, Kaz Kojima  <kkojima@rr.iij4u.or.jp>, Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-sh.c (R_SH_GOT32, R_SH_PLT32, R_SH_COPY, R_SH_GLOB_DAT,
+	R_SH_JMP_SLOT, R_SH_RELATIVE, R_SH_GOTOFF, R_SH_GOTPC): New.
+	(sh_reloc_map): Add new relocs.
+	(sh_elf_check_relocs, sh_elf_link_hash_newfunc,
+	sh_elf_link_hash_table_create, sh_elf_adjust_dynamic_symbol,
+	sh_elf_size_dynamic_sections, sh_elf_finish_dynamic_symbol,
+	sh_elf_finishe_dynamic_sections, sh_elf_discard_copies): New
+	functions.
+	(ELF_DYNAMIC_INTERPRETER, PLT_ENTRY_SIZE): Define.
+	(elf_sh_plt0_entry_be, elf_sh_plt0_entry_le,
+	elf_sh_plt_entry_be, elf_sh_plt_entry_le,
+	elf_sh_pic_plt_entry_be, elf_sh_pic_plt_entry_le):
+	New array constants.
+	(elf_sh_plt0_entry, elf_sh_plt_entry, elf_sh_pic_plt_entry):
+	New variables.
+	(elf_sh_sizeof_plt, elf_sh_plt_plt0_offset,
+	elf_sh_plt0_linker_offset, elf_sh_plt0_gotid_offset,
+	elf_sh_plt_temp_offset, elf_sh_plt_symbol_offset,
+	elf_sh_plt_reloc_offset): Define.
+	(elf_sh_pcrel_relocs_copied, elf_sh_link_hash_entry,
+	elf_sh_link_hash_table): New structs.
+	(sh_elf_link_hash_traverse, sh_elf_hash_table): New macros.
+	(sh_elf_relocate_section, sh_elf_check_relocs): Handle new
+	relocation types.
+	(elf_backend_create_dynamic_sections,
+	bfd_elf32_bfd_link_hash_table_create,
+	elf_backend_adjust_dynamic_symbol,
+	elf_backend_size_dynamic_sections,
+	elf_backend_finish_dynamic_symbol,
+	elf_backend_finish_dynamic_sections, elf_backend_want_got_plt,
+	elf_backend_plt_readonly, elf_backend_want_plt_sym,
+	elf_backend_got_header_size, elf_backend_plt_header_size):
+	Define.
+	* reloc.c (BFD_RELOC_SH_COPY, BFD_RELOC_SH_GLOB_DAT,
+	BFD_RELOC_SH_JMP_SLOT, BFD_RELOC_SH_RELATIVE, BFD_RELOC_SH_GOTPC):
+	New relocs.
+	* bfd-in2.h, libbfd.h: Rebuilt.
+
+2000-09-01  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf32-i386.c (elf_i386_finish_dynamic_symbol): Revert 2000-08-27
+	change.
+
+2000-08-31  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+	* elf32-sh.c (sh_elf_merge_private_data): If ibfd's elf header flags
+	not initialized, set them to indicate the SH1 instruction set.
+
+2000-08-31  Alexandre Oliva  <aoliva@redhat.com>
+
+	* acinclude.m4: Include libtool and gettext macros from the
+	top level.
+	* aclocal.m4, configure: Rebuilt.
+
+2000-08-29  Michael Snyder  <msnyder@seadog.cygnus.com>
+
+	* elf.c: Eliminate references to __sparcv9 macro; replace with
+	autoconf variables HAVE_PSINFO32_T etc.
+	* configure.in: Auto-configure HAVE_PSINFO_32_T, HAVE_PRPSINFO32_T,
+	HAVE_PSTATUS32_T, HAVE_PRSTATUS32_T, HAVE_PRSTATUS32_T_PR_WHO.
+	* config.in: Ditto.
+	* acinclude.m4 (BFD_HAVE_SYS_PROCFS_TYPE) define _SYSCALL32 so it can
+	detect the above typedefs.  (BFD_HAVE_SYS_PROCFS_TYPE_MEMBER): Ditto.
+	* aclocal.m4: Ditto.
+	* configure: Regenerate.
+
+2000-08-27  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf32-i386.c (elf_i386_check_relocs): Keep info on relocs copied
+	for any shared link, not just shared -Bsymbolic.
+	(elf_i386_size_dynamic_sections): Call elf_i386_discard_copies on
+	any shared link, and pass link info to it.
+	(elf_i386_size_dynamic_sections): Update comment.
+	(elf_i386_discard_copies): Modify to discard relocs for symbols
+	that have been forced local.
+	(elf_i386_finish_dynamic_symbol): Don't copy relocs for symbols
+	that have been forced local.
+
+2000-08-24  Denis Chertykov  <denisc@overta.ru> & Nick Clifton  <nickc@redhat.com>
+
+	* elflink.h (elf_link_add_object_symbols): Allow common
+	symbols to have an alignment of 1 if explicitly requested, and
+	not overridden by other definitions.
+
+2000-08-22  Doug Kwan <dkwan@transmeta.com>
+
+	* coff-w65.c (CREATE_LITTLE_COFF_TARGET): Fix typo.
+	* coffcode.h (coff_set_flags): Add detection of w65 architecture.
+
+2000-08-22  H.J. Lu  <hjl@gnu.org>
+
+	* elf-bfd.h (elf_link_hash_table): Add runpath.
+
+	* bfd-in.h (bfd_elf_get_runpath_list): New prototype.
+	* bfd-in2.h: Rebuilt.
+
+	* elf.c (_bfd_elf_link_hash_table_init): Initialize the
+	"runpath" field to NULL.
+	(bfd_elf_get_runpath_list): New function.
+
+	* elflink.h (elf_link_add_object_symbols): Record DT_RPATH and
+	DT_RUNPATH entries.
+
+2000-08-22  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-sh.c (sh_elf_relocate_section) [R_SH_IND12W,
+	R_SH_DIR8WPN, R_SH_DIR8WPZ, R_SH_DIR8WPL]: Handle them
+	explicitly.  Improve validation of r_type.
+
+2000-08-21  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-i386.c (elf_i386_size_dynamic_sections): Zero out the
+	dynamic allocated content space.  Add a comment to remind us that
+	one day this ought to be fixed.
+	* elf32-m68k.c (elf_m68k_size_dynamic_sections): Likewise.
+	* elf32-sparc.c (elf32_sparc_size_dynamic_sections): Likewise.
+	* elf64-hppa.c (elf64_hppa_size_dynamic_sections): Likewise.
+
+2000-08-21  Jason Eckhardt  <jle@cygnus.com>
+
+	* elf32-i860.c (elf32_i860_relocate_pc16): Just write the immediate
+	field with the newly relocated value instead of adding it to the
+	existing immediate field.
+	(elf32_i860_relocate_splitn): Likewise.
+	(elf32_i860_relocate_highadj): Likewise.
+
+2000-08-16  Jason Eckhardt  <jle@cygnus.com>
+
+	* elf32-i860.c (elf32_i860_relocate_pc16): Implemented function (it
+	was previously just a stub).
+
+2000-08-16  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elflink.c (_bfd_elf_create_got_section): Don't abort().
+	Formatting fixes.
+	(_bfd_elf_create_dynamic_sections): Likewise.
+
+2000-08-16  Andrew Macleod  <amacleod@cygnus.com>
+
+	* elf64-sparc.c (sparc64_elf_relocate_section): Set relocation address
+	for undefined symbols to be the beginning of the section.
+
+	* elf64-sparc.c (sparc64_elf_adjust_dynamic_symbol): Don't allocate
+	four extra entries at the beginning of the .rela.plt section.
+	(sparc64_elf_finish_dynamic_symbol): Adjust the offset in the .rela.plt
+	section to account for the four reserved entries in the .plt section.
+
+2000-08-15  Geoffrey Keating  <geoffk@cygnus.com>
+
+	* xcofflink.c (_bfd_ppc_xcoff_relocate_section): Add ori r0,r0,0
+	to the list of NOPs we recognize after a branch-and-link.
+	Use the ori NOP when one is needed.
+
+	* coff-rs6000.c (_bfd_xcoff_slurp_armap): Finish implementation
+	for large archives.
+
+2000-08-14  Jim Wilson  <wilson@cygnus.com>
+
+	* elf64-ia64.c (elf64_ia64_merge_private_bfd_data): Handle
+	EF_IA_64_REDUCEDFP, EF_IA_64_CONS_GP, and EF_IA_64_NOFUNCDESC_CONS_GP.
+	(elf64_ia64_print_private_bfd_data): Likewise.  Also handle
+	EF_IA_64_ABSOLUTE.
+
+2000-08-11  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-sh.c (sh_elf_set_mach_from_flags): Make it static.
+
+2000-08-10  Jason Eckhardt  <jle@cygnus.com>
+
+	* elf32-i860.c (elf32_i860_relocate_section): New function.
+	(i860_final_link_relocate): New function.
+	(elf32_i860_relocate_splitn): New function.
+	(elf32_i860_relocate_pc16): New function.
+	(elf32_i860_relocate_highadj): New function.
+	(elf32_i860_howto): Minor adjustments to some relocations.
+	(elf_info_to_howto_rel): Define.
+	(elf_backend_relocate_section): Define.
+
+2000-08-10  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-arm.h: Fix formatting.
+
+2000-08-10  Bernd Schmidt  <bernds@cygnus.co.uk>
+
+	* elf32-sh.c (sh_elf_reloc_loop): Make LAST_SYMBOL_SECTION static.
+
+2000-08-08  Jason Eckhardt  <jle@cygnus.com>
+
+	* elf32-i860.c (elf32_i860_howto_table): Updated some fields.
+
+2000-08-07  Kazu Hirata  <kazu@hxi.com>
+
+	* ieee.c (ieee_write_debug_part): Rewrite a comment.
+	* elf64-ia64.c: Fix a typo.
+
+2000-08-05  Jason Eckhardt  <jle@cygnus.com>
+
+	* elf32-i860.c (elf32_i860_howto_table): New structure.
+	(lookup_howto): New function.
+	(elf32_i860_reloc_type_lookup): New function.
+	(elf32_i860_info_to_howto_rela): New function.
+	(elf_code_to_howto_index): New structure.
+	(elf_info_to_howto): Re-define as elf32_i860_info_to_howto_rela.
+	(bfd_elf32_bfd_reloc_type_lookup): Re-define as
+	elf32_i860_reloc_type_lookup.
+
+2000-08-04  Rodney Brown  <RodneyBrown@pmsc.com>
+
+	* som.c (struct fixup_format): Constify `format'.
+	(som_hppa_howto_table): Use SOM_HOWTO macro.
+	(try_prev_fixup, hppa_som_reloc): Decorate unused parameter.
+	(som_bfd_reloc_type_lookup): Likewise.
+	(compare_subspaces): Remove unused `count1', `count2'.
+	(som_begin_writing): Remove unused `total_reloc_size'.
+	(som_bfd_derive_misc_symbol_info): Decorate unused parameter.
+	(som_print_symbol, som_bfd_is_local_label_name): Likewise.
+	(som_set_reloc_info): Constify `cp'. Remove unused `addend'.
+	(som_find_nearest_line): Decorate unused parameter(s).
+	(som_sizeof_headers, som_get_symbol_info, som_write_armap): Likewise.
+	(som_bfd_link_split_section): Likewise.
+
+2000-08-03  Nick Clifton  <nickc@cygnus.com>
+
+	* section.c: Restore backed out code.
+	* elf.c: Restore backed out code.
+	(copy_private_bfd_data): Fix bug preventing stipped dynamic
+	binaries from working.
+	* bfd-in2.h: Regenerate.
+
+2000-08-03  H.J. Lu  <hjl@gnu.org>
+
+	* section.c: Back out the change made by Nick Clifton
+	<nickc@cygnus.com> on 2000-07-31. It breaks stripping dynamic
+	binaries.
+	* bfd-in2.h: Likewise.
+	* elf.c: Likewise.
+
+2000-08-03  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-sh.c (sh_elf_reloc_loop): Warning removal.
+
+2000-07-31  Jason Eckhardt  <jle@cygnus.com>
+
+	* reloc.c (BFD_RELOC_860_*): New bfd relocs for i860.
+	* bfd-in2.h, libbfd.h: Regenerate.
+
+2000-07-31  Nick Clifton  <nickc@cygnus.com>
+
+	* section.c (struct sec): Add new boolean field 'segment_mark'.
+	(STD_SECTION): Initialise new field to zero.
+
+	* bfd-in2.h: Regenerate.
+
+	* elf.c (copy_private_bfd_data): Reorganise section to segment
+	mapping to cope with moved sections requiring new segments,
+	and overlapping segments.
+	(SEGMENT_END): New macro: Return the end address of a segment.
+	(IS_CONTAINED_BY_VMA): New macro: Determine if a segment
+	contains a section by comparing their VMA addresses.
+	(IS_CONTAINED_BY_LMA): New macro: Determine if a segment
+	contains a section by comparing their LMA addresses.
+	(INCLUDE_SECTION_IN_SEGMENT): New macro: Determine if a
+	section should be included in a segment.
+	(SEGMENT_AFTER_SEGMENT): New macro: Determine if one segment
+	follows another in memory.
+	(SEGMENT_OVERLAPS_SEGMENT): New macro: Determine if two
+	segments overlap.
+
+2000-07-22  Jason Eckhardt  <jle@cygnus.com>
+
+	* cpu-i860.c: Added comments.
+
+	* elf32-i860.c (TARGET_LITTLE_SYM): Defined to
+	bfd_elf32_i860_little_vec.
+	(TARGET_LITTLE_NAME): Defined to "elf32-i860-little".
+	(ELF_MAXPAGESIZE): Changed to 4096.
+
+	* targets.c (bfd_elf32_i860_little_vec): Declaration of
+	new target.
+	(bfd_target_vector): Added bfd_elf32_i860_little_vec.
+
+	* config.bfd (i860-stardent-sysv4*, i860-stardent-elf*): Added
+	config for little endian elf32 i860.
+	(targ_defvec): Define for the new config above
+	as "bfd_elf32_i860_little_vec".
+	(targ_selvecs): Define for the new config above
+	as "bfd_elf32_i860_vec bfd_elf32_i860_little_vec"
+
+	* configure.in (bfd_elf32_i860_little_vec): Added recognition
+	of new target vec.
+
+	* configure: Regenerated.
+
+2000-07-27  H.J. Lu  <hjl@gnu.org>
+
+	* elflink.h (elf_merge_symbol): Take one more argument,
+	dt_needed, to indicate if the symbol comes from a DT_NEEDED
+	entry. Don't overide the existing weak definition if dt_needed
+	is true.
+	(elf_link_add_object_symbols): Pass dt_needed to
+	elf_merge_symbol ().
+
+2000-07-27  Nick Clifton  <nickc@cygnus.com>
+
+	* elflink.h (elf_link_size_reloc_section): Zeroes the section's
+	allocated contents.
+
+2000-07-25  Geoffrey Keating  <geoffk@cygnus.com>
+
+	* configure.host (*-*-aix*): AIX has 'long long' always.
+
+	* coff-rs6000.c (xcoff_write_one_armap_big): New procedure.
+	(xcoff_write_armap_big): Write both 32-bit and 64-bit armaps.
+	(xcoff_write_archive_contents_big): Don't update the offset
+	of the symbol table, xcoff_write_armap will do it.
+
+2000-07-23  Ulf Carlsson  <ulfc@engr.sgi.com>
+
+	* elf32-mips.c (_bfd_mips_elf_check_relocs): Use abfd instead
+	of dynobj for SGI_COMPAT checks.
+
+2000-07-21  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* coff-m68k.c (bfd_m68k_coff_create_embedded_relocs): New function.
+	* bfd-in.h (bfd_m68k_coff_create_embedded_relocs): Add declaration.
+	* bfd-in2.h: Regenerate.
+
+2000-07-21  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-mips.c (_bfd_mips_elf_check_relocs): Detect out of
+	range symbol indices in relocs and issue an error message.
+
+2000-07-20  H.J. Lu  <hjl@gnu.org>
+
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Don't check
+	info->new_dtags when setting DT_FLAGS_1. It will only be set
+	by the new linker options. It shouldn't break anything.
+
+2000-07-20  H.J. Lu  <hjl@gnu.org>
+
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Set DT_FLAGS_1
+	only if info->new_dtags is true.
+
+2000-07-20  H.J. Lu  <hjl@gnu.org>
+
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Set
+	DT_RUNPATH and DT_FLAGS only if info->new_dtags is true.
+
+2000-07-20  Hans-Peter Nilsson  <hp@axis.com>
+
+	* Makefile.am (ALL_MACHINES): Add cpu-cris.lo.
+	(ALL_MACHINES_CFILES): Add cpu-cris.c.
+	(BFD32_BACKENDS): Add aout-cris.lo and elf32-cris.lo.
+	(BFD32_BACKENDS_CFILES): Add aout-cris.c and elf32-cris.c.
+	(cpu-cris.lo, aout-cris.lo, elf32-cris.lo): New rules.
+	* Makefile.in: Rebuild.
+	* aclocal.m4: Rebuild.
+	* aoutx.h (NAME(aout,machine_type)): Add case for bfd_arch_cris.
+	* archures.c (enum bfd_architecture): Add bfd_arch_cris.
+	(bfd_cris_arch): Declare.
+	(bfd_archures_list): Add bfd_cris_arch.
+	* bfd-in2.h: Rebuild.
+	* config.bfd: (cris-*-*): New target.
+	* configure.in (bfd_elf32_cris_vec, cris_aout_vec): New vectors.
+	* configure: Rebuild.
+	* elf.c (prep_headers): Add bfd_arch_cris.
+	* libbfd.h: Rebuild.
+	* libaout.h (enum machine_type): Add M_CRIS.
+	* reloc.c: Add CRIS relocations.
+	* targets.c (bfd_elf32_cris_vec, cris_aout_vec): Declare.
+	(bfd_target_vect): Add bfd_elf32_cris_vec and cris_aout_vec.
+	* cpu-cris.c, aout-cris.c, elf32-cris.c: New files.
+	* po/POTFILES.in, po/bfd.pot: Regenerate.
+
+2000-07-19  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-arm.h (elf32_arm_size_dynamic_sections): Also set
+	DF_TEXTREL if DT_TEXTREL is set.
+	* elf32-i370.c (i370_elf_size_dynamic_sections): Likewise.
+	* elf32-i386.c (elf_i386_size_dynamic_sections): Likewise.
+	* elf32-m68k.c (elf_m68k_size_dynamic_sections): Likewise.
+	* elf32-mips.c (_bfd_mips_elf_size_dynamic_sections): Likewise.
+	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Likewise.
+	* elf32-sparc.c (elf32_sparc_size_dynamic_sections): Likewise.
+	* elf64-alpha.c (elf64_alpha_size_dynamic_sections): Likewise.
+	* elf64-hppa.c (elf64_hppa_size_dynamic_sections): Likewise.
+	* elf64-ia64.c (elf64_ia64_size_dynamic_sections): Likewise.
+	* elf64-sparc.c (sparc64_elf_size_dynamic_sections): Likewise.
+
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Also
+	set DF_SYMBOLIC for symbolic link. Also set DT_RUNPATH if
+	DT_RPATH is set.
+	Set the DT_FLAGS and DT_FLAGS_1 entries if necessary.
+
+2000-07-19  H.J. Lu  <hjl@gnu.org>
+
+	* bfd-in.h (bfd_elf_set_dt_needed_soname): New.
+	* bfd-in2.h: Rebuild.
+
+	* elf-bfd.h (elf_obj_tdata): Add dt_soname.
+	(elf_dt_soname): New.
+
+	* elf.c (bfd_elf_set_dt_needed_soname): New.
+
+	* elflink.h (elf_link_add_object_symbols): Add the DT_NEEDED
+	entry if the shared object loaded by DT_NEEDED is used to
+	resolve the reference in a regular object.
+
+2000-07-19  H.J. Lu  <hjl@gnu.org>
+
+	* elf.c (_bfd_elf_print_private_bfd_data): Handle DT_CONFIG,
+	DT_DEPAUDIT and DT_AUDIT as strings.
+
+2000-07-19  Nick Clifton  <nickc@cygnus.com>
+
+	* format.c: Fix formatting.
+
+2000-07-19  H.J. Lu  <hjl@gnu.org>
+
+	* elf.c (_bfd_elf_print_private_bfd_data): Fix DT_CHECKSUM.
+
+2000-07-19  H.J. Lu  <hjl@gnu.org>
+
+	* elf.c (_bfd_elf_print_private_bfd_data): Handle DT_BIND_NOW,
+	DT_INIT_ARRAY, DT_FINI_ARRAY, DT_INIT_ARRAYSZ, DT_FINI_ARRAYSZ,
+	DT_RUNPATH, DT_FLAGS, DT_PREINIT_ARRAY, DT_PREINIT_ARRAYSZ,
+	DT_PLTPADSZ, DT_MOVEENT, DT_MOVESZ, DT_FEATURE, DT_POSFLAG_1,
+	DT_SYMINSZ, DT_SYMINENT, DT_CONFIG, DT_DEPAUDIT, DT_AUDIT,
+	DT_PLTPAD, DT_MOVETAB, DT_SYMINFO, DT_RELACOUNT, DT_RELCOUNT,
+	DT_FLAGS_1, DT_USED and DT_CHECKSUM.
+
+2000-07-18  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* elf.c (bfd_elf_get_sign_extend_vma, bfd_elf_get_arch_size): Move
+	renamed functions from here...
+	(assign_section_numbers): Use renamed functions.
+	(prep_headers): Use renamed functions.
+
+	* bfd.c (bfd_get_sign_extend_vma, bfd_get_arch_size): ...To here.
+	* bfd-in.h (bfd_get_sign_extend_vma, bfd_get_arch_size): Update.
+	* bfd-in2.h: Regenerate.
+
+2000-07-18  Ulf Carlsson  <ulfc@engr.sgi.com>
+
+	* elf32-mips.c (_bfd_mips_elf_finish_dynamic_symbol): Add
+	parenthesis in if statement.
+
+2000-07-17  Koundinya K  <kk@ddeorg.soft.net>
+
+	Enable the support for Traditional MIPS.
+	* elf32-mips.c (IRIX_COMPAT): Recognize bfd_elf32_tradbigmips_vecand
+	return ict_none appropriately for traditional mips targets.
+	(STUB_LW): Change 0x8f998000 to 0x8f998010 for traditional mips.
+	(STUB_MOVE): Conditionalize for traditonal mips.
+	(STUB_LI16): Likewise.
+	(_bfd_mips_elf_modify_segment_map): Conditionalize to avoid making
+	room for RTPROC header.
+	(_bfd_mips_elf_modify_segment_map): For a normal mips executable set
+	the permission for the PT_DYNAMIC as read, write and execute.
+	(mips_elf_calculate_relocation): Check for the symbol _DYNAMIC_LINKING
+	for traditonal mips.
+	(_bfd_mips_elf_create_dynamic_sections): Add the symbol
+	_DYNAMIC_LINKING for traditonal mips.
+	(_bfd_mips_elf_create_dynamic_sections): Add the symbol __RLD_MAP
+	in case of traditonal mips.
+	(_bfd_mips_elf_adjust_dynamic_symbol): Create a stub only if a PLT
+	entry is required. For a function if PLT is not required then set the
+	corresponding hash table entry to 0.
+	(_bfd_mips_elf_size_dynamic_sections): Add DT_DEBUG entry for
+	traditonal mips.
+	(_bfd_mips_elf_finish_dynamic_symbol): for a undefined symbol in a
+	shared object set the value to 0.
+	(_bfd_mips_elf_finish_dynamic_symbol): Check for the symbol
+	_DYNAMIC_LINKING for traditonal mips.
+	(_bfd_mips_elf_finish_dynamic_symbol): Check for the symbol __RLD_MAP
+	for traditonal mips.
+
+2000-07-15  H.J. Lu  <hjl@gnu.org>
+
+	* aoutx.h (translate_to_native_sym_flags): Handle BSF_LOCAL.
+
+2000-07-12  Charles Wilson  <cwilson@ece.gatech.edu>
+
+	* libbfd.c (bfd_seek): fix 'seek beyond EOF' error when writing
+	out a structure that is BFD_IN_MEMORY.
+
+2000-07-11  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf64-hppa.c (get_dyn_name): Pass in section pointer instead of
+	bfd pointer.  Print section id instead of bfd pointer for local
+	syms.  Prefix addend with `+' for global syms as well as local.
+	Correct calculation of name component lengths.
+	(elf64_hppa_check_relocs): Update call to get_dyn_name.
+
+	From David Huggins-Daines  <dhd@linuxcare.com>
+	* elf-hppa.h (elf_hppa_relocate_section): Update calls here too.
+	* elf64-hppa.c (elf64_hppa_check_relocs): Fix some warnings.
+	(elf64_hppa_modify_segment_map): Likewise.
+
+2000-07-11  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* elf.c (bfd_elf_get_sign_extend_vma): Return tendency of VMA
+	addresses to be "naturally" sign extended.  Return -1 if unknown.
+	* bfd-in.h (bfd_elf_get_sign_extend_vma): Add declaration.
+	* bfd-in2.h: Regenerate.
+
+2000-07-11  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* ecoffswap.h (ecoff_get_off, ecoff_put_off): Add ECOFF_SIGNED_32
+	and ECOF_SIGNED_64 to list ways to extract an offset.
+	(ecoff_swap_fdr_in, ecoff_swap_fdr_out, ecoff_swap_pdr_in,
+	ecoff_swap_pdr_out, ecoff_swap_ext_in, ecoff_swap_ext_out):
+	Update.
+	* elf64-mips.c (ECOFF_SIGNED_64): Define instead of ECOFF_64.
+	* elf32-mips.c (ECOFF_SIGNED_32): Define instead of ECOFF_32.
+
+2000-07-11  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* elfcode.h (elf_object_p): Use bfd_set_start_address and not
+	bfd_get_start_address.
+	(elf_swap_ehdr_in): Sign extend e_entry when applicable.
+	(elf_swap_ehdr_out): Ditto.
+
+2000-07-10  Alexander Aganichev  <AAganichev@hypercom.com>
+
+	* archures.c (bfd_default_scan): Add set of bfd_mach_ cases for
+	compatibility with older binutils.
+
+2000-07-10  Alan Modra  <alan@linuxcare.com.au>
+
+	* section.c (bfd_make_section_anyway): Start section_id at 0x10.
+	(STD_SECTION): Avoid negative ids, instead use 0 to 3.
+
+	From Ryan Bradetich  <rbradetich@uswest.net>
+	* dwarf1.c (parse_die): Cure signed/unsigned char warnings.
+	(parse_line_table): Ditto.
+	(_bfd_dwarf1_find_nearest_line): Ditto.
+	* syms.c (cmpindexentry): Remove extra `*' from params.
+
+2000-07-09  Koundinya K  <kk@ddeorg.soft.net>
+
+	* elf32-mips.c (sort_dynamic_relocs): New Function.
+	(_bfd_mips_elf_finish_dynamic_sections): Call sort_dynamic_relocs
+	via qsort to sort the dynamic relocations in increasing r_symndx
+	value.
+
+2000-07-09  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf64-hppa.c (elf64_hppa_dyn_hash_table_init): Add
+	ATTRIBUTE_UNUSED to unused args.
+	(get_opd): Likewise.
+	(get_plt): Likewise.
+	(get_dlt): Likewise.
+	(get_stub): Likewise.
+	(elf64_hppa_adjust_dynamic_symbol): Likewise.
+	(elf64_hppa_link_output_symbol_hook): Likewise.
+	(elf64_hppa_check_relocs): Delete unused var.
+	(elf64_hppa_size_dynamic_sections): Likewise.
+	(elf64_hppa_finalize_opd): Likewise.
+	(elf64_hppa_finalize_dynreloc): Likewise.
+	(elf64_hppa_modify_segment_map): Likewise.
+	(elf64_hppa_finish_dynamic_sections): Likewise.
+
+	* elf-hppa.h (elf_hppa_final_write_processing): Add
+	ATTRIBUTE_UNUSED to unused args.
+	(elf_hppa_final_link_relocate): Likewise.
+	(elf_hppa_record_segment_addrs): Add paretheses.
+	(elf_hppa_relocate_section): Constify dyn_name.
+
+	From  David Huggins-Daines  <dhd@linuxcare.com>
+	* config.bfd: Add hppa*64*-*-linux-gnu 64-bit target, and
+	rearrange case statement so that it gets preferred to 32-bit ones.
+
+	* elf32-hppa.c (elf32_hppa_bfd_final_link_relocate): Use
+	asection->id instead of address of asection structure.
+	(elf32_hppa_size_stubs): Likewise.
+
+	* elf32-hppa.c (elf32_hppa_size_stubs): Use just one stub section
+	for .init* and .fini*.
+
+	* elf32-hppa.c (elf32_hppa_bfd_final_link_relocate): Mask pointers
+	and addends used in stub names to 32 bits.
+	(elf32_hppa_size_stubs): Likewise.
+
+	* elf-hppa.h (elf_hppa_final_link_relocate): Don't sum addend
+	twice for R_PARISC_GPREL64.  Use bfd_put_32 for R_PARISC_PCREL32,
+	not bfd_put_64.  Fix minor comment typo and formatting.
+
+	Changes to create multiple linker stubs, positioned immediately
+	before the section where they are required.
+	* elf32-hppa.c: Don't include hppa_stubs.h.
+	(elf32_hppa_stub_hash_entry): Add a pointer to the stub section.
+	(elf32_hppa_stub_hash_table): Delete.
+	(elf32_hppa_link_hash_entry): Delete.
+	(elf32_hppa_link_hash_table): Use plain bfd_hash_table for
+	stub_hash_table, and store the struct here rather than a pointer.
+	Delete output_symbol_count.  Add offset array.  Change
+	global_value to a bfd_vma.
+	(elf32_hppa_stub_hash_lookup): Use table instead of table->root.
+	(elf32_hppa_stub_hash_traverse): Delete.
+	(elf32_hppa_name_of_stub): Delete.
+	(elf32_hppa_link_hash_lookup): Delete.
+	(elf32_hppa_link_hash_traverse): Delete.
+	(elf32_hppa_stub_hash_table_init): Delete.
+	(elf32_hppa_size_of_stub): Pass input section and offset rather
+	than location and calculate location here.  Don't pass name as all
+	stubs are now the same size.
+	(elf32_hppa_stub_hash_newfunc): Init new fields.
+	(elf32_hppa_link_hash_table_create): Likewise, and stub_hash_table
+	too.
+	(elf32_hppa_bfd_final_link_relocate): Cast enums to int before
+	comparing against ints.  Rewrite stub handling code.
+	(elf32_hppa_relocate_section): Make r_type and r_symndx unsigned.
+	Case enums to int before comparing against ints.  Remove
+	bfd_reloc_dangerous case.
+	(elf32_hppa_build_one_stub): Rewrite.
+	(elf32_hppa_size_one_stub): New function.
+	(elf32_hppa_build_stubs): Rewrite.
+	(elf32_hppa_size_stubs): Pass in linker call-back functions.
+	Rewrite stub-handling specific code.
+
+	* elf32-hppa.h (elf32_hppa_size_stubs): Update prototype.
+
+	* elf64-hppa.c (elf64_hppa_dyn_hash_entry): Fix a comment typo.
+
+	* hppa_stubs.h: Delete.
+	* Makefile.am (SOURCE_HFILES): Remove hppa_stubs.h
+	(elf32-hppa.lo): Remove hppa_stubs.h from dependencies.
+	* Makefile.in: Regenerate.
+
+	* elf-hppa.h (_bfd_elf_hppa_gen_reloc_type): Handle e_nlsel and
+	e_nlrsel.
+
+	* libhppa.h (hppa_field_adjust): Correct e_nsel case.
+
+	* elf32-hppa.c (elf32_hppa_relocate_section): Mention the offset
+	and section name for bfd_reloc_notsupported error message.
+	(elf32_hppa_bfd_final_link_relocate): Print reasons for returning
+	bfd_reloc_notsupported.
+	(elf32_hppa_relocate_section): Add ATTRIBUTE_UNUSED to output_bfd.
+
+	* elf32-hppa.c (elf32_hppa_bfd_final_link_relocate): Handle
+	undefined weak symbols for all relocs.
+	(elf32_hppa_size_of_stub): Adjust calculation by 8 since branch
+	offsets are relative to one past the delay slot.
+	(elf32_hppa_size_stubs): Account for reloc addend when calculating
+	branch destination.  Put addend into stub name too.
+	(elf32_hppa_bfd_final_link_relocate): Account for reloc addend and
+	adjust by 8 when deciding whether a linker stub is needed.  Put
+	addend into stub name as for above.
+
+	* elf32-hppa.c (hppa_elf_relocate_insn): Change signed/unsigned on
+	various args and vars.
+	(elf32_hppa_bfd_final_link_relocate): Here too.
+	(elf32_hppa_size_stubs): Rename index -> indx.  Use e_indx for
+	inner block var to avoid shadowing.
+
+	* elf32-hppa.h (_bfd_elf32_hppa_gen_reloc_type):  Make `field' arg
+	unsigned.
+	* elf64-hppa.h (_bfd_elf64_hppa_gen_reloc_type): Ditto.
+	* elf-hppa.h (_bfd_elf_hppa_gen_reloc_type): Ditto.
+	(elf_hppa_fake_sections): Rename local var to avoid shadowing.
+
+	* libhppa.h: Change practically all unsigned ints to plain ints.
+	Remove tests on gcc version.  Instead use ATTRIBUTE_UNUSED for
+	prototypes.
+
+	From Ryan Bradetich  <rbradetich@uswest.net>
+	* libhppa.h (hppa_opcode_type): New enum to replace #define's.
+	* elf32-hppa.c (elf32_hppa_bfd_final_link_relocate): Modify to
+	suit above.
+	From  David Huggins-Daines  <dhd@linuxcare.com>
+	* elf-hppa.h (elf_hppa_relocate_insn): Update the opcode constants
+	to the new OP_* ones.
+
+	* elf32-hppa.c (elf32_hppa_size_stubs): Consolidate freeing on
+	error exit.  Bail out earlier on plabel relocs that we aren't
+	interested in.  Don't tell elf32_hppa_stub_hash_lookup to copy
+	string, and then don't free our copy.
+	(elf32_hppa_build_one_stub): Make insn unsigned int.
+
+	* libhppa.h (bfd_hppa_insn2fmt): 22 bit branches are only
+	available with BL, not BE and BLE.
+
+	* elf32-hppa.c (hppa_elf_relocate_insn): Add some more example
+	code for elf arg relocs.
+	(elf32_hppa_bfd_final_link_relocate): Replace boolean is_local
+	argument with elf_link_hash_entry h.  Handle undefined weak
+	symbols.  Move $global$ lookup from here...
+	(elf32_hppa_relocate_section): ...to here.  Return correct error
+	message for non-handled relocs.
+	(elf32_hppa_size_of_stub): Correctly test branch range.  Previous
+	wrong test was -0x3ffff to +0x40000.
+
+	* elf-hppa.h (elf_hppa_final_link_relocate): R_PARISC_DIR17R,
+	R_PARISC_DIR17F, and R_PARISC_DIR21L are for absolute branches;
+	Handle them as such.
+	(elf_hppa_relocate_insn): Fix a typo.
+
+	* libhppa.h (GET_FIELD, GET_BIT, MASK, CATENATE, ELEVEN): Delete.
+	(assemble_3, assemble_6, assemble_12, assemble_16, assemble_16a,
+	assemble_17, assemble_21): Delete.
+	Supply defines for all 64 possible opcodes.
+	(bfd_hppa_insn2fmt): Add bfd argument, and use to select wide mode
+	formats.  Handle COMICLR.
+	(hppa_rebuild_insn): Delete bfd argument.  Handle formats 10, -11,
+	-10, -16, 16, 22.
+
+	* elf32-hppa.c (hppa_elf_relocate_insn): Complete rewrite.
+	(elf32_hppa_bfd_final_link_relocate): Major rewrite.
+	(elf32_hppa_build_one_stub): Modify hppa_elf_relocate_insn calls
+	to suit.
+	(elf32_hppa_size_stubs): Don't free stub_name twice.  Read in all
+	the local syms - did this code get deleted accidentally?  Ignore
+	undefined and undefweak syms.
+
+	* elf-hppa.h (elf_hppa_final_link): Move hppa_info to outermost
+	block.  Use it instead of elf64_hppa_hash_table (info).
+	(elf_hppa_final_link_relocate): Use hppa_info instead of
+	elf64_hppa_hash_table (info).
+
+	* libhppa.h (re_assemble_3, re_assemble_12, re_assemble_16,
+	re_assemble_17, re_assemble_21, re_assemble_22): Don't mask insn.
+	(hppa_rebuild_insn): Mask immediate bits here instead.
+	* elf-hppa.h (elf_hppa_relocate_insn): Mask here too.
+
+2000-07-08  Alan Modra  <alan@linuxcare.com.au>
+
+	* section.c (struct sec): Add id field.  Tidy comment formatting.
+	(bfd_make_section_anyway): Set id.
+	(STD_SECTION): Init id too.
+	Change CONST to const throughout.
+	* archures.c (bfd_arch_info): Tidy comment.
+	(bfd_arch_list): Change a CONST to const.
+	* libbfd-in.h: Tidy comments and replace CONST with const.
+	* elf-bfd.h: Likewise.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* libcoff.h: Regenerate.
+
+2000-07-07  DJ Delorie  <dj@redhat.com>
+
+	* archive.c (_bfd_write_archive_contents): Add an informative
+	comment.
+
+2000-07-06  Kazu Hirata  <kazu@hxi.com>
+
+	* srec.c: Fix formatting.
+
+2000-06-05  DJ Delorie  <dj@redhat.com>
+
+	* MAINTAINERS: new
+
+2000-07-04  Alexandre Oliva  <aoliva@redhat.com>
+
+	* coff-arm.c (coff_arm_relocate_section): Do not ignore the symbol
+	value of PC-relative offsets.
+
+2000-07-03  Jim Wilson  <wilson@cygnus.com>
+
+	* elf64-alpha.c (alpha_elf_size_info): New.
+	(elf_backend_size_info): Define to alpha_elf_size_info.
+	* elfcode.h (elf_size_info): Change hash bucket size to 4.
+
+2000-07-03  Ulf Carlsson  <ulfc@engr.sgi.com>
+
+	* elf32-mips.c: Include elf32-target.h again for the traditional
+	MIPS targets.
+
+2000-07-03  Marek Michalkiewicz  <marekm@linux.org.pl>
+
+	* elf32-avr.c (bfd_elf32_bfd_reloc_type_lookup):
+	Add ATTRIBUTE_UNUSED to unused arguments to avoid warnings.
+	(avr_info_to_howto_rela): Likewise.
+	(elf32_avr_gc_mark_hook): Likewise.
+	(elf32_avr_gc_sweep_hook): Likewise.
+	(elf32_avr_relocate_section): Likewise.
+
+2000-07-03  Mark Elbrecht  <snowball3@bigfoot.com>
+
+	* cofflink.c (_bfd_coff_write_global_sym): Turn a weak symbol into
+	an external symbol for a non-shared, non-relocatable link.
+
+2000-07-03  Nick Clifton  <nickc@redhat.com>
+
+	* cofflink.c (IS_EXTERNAL): New macro: Return true if the symbol
+	is an external symbol.
+	(IS_WEAK_EXTERNAL): New macro: Return true if the symbol is a weak
+	external symbol.
+
+2000-07-03  Kazu Hirata  <kazu@hxi.com>
+
+	* reloc16.c: Fix formatting.
+
+2000-07-01  Koundinya K  <kk@ddeorg.soft.net>
+
+	* config.bfd: Change targ_defvec and targ_selvecs for mips*-*-sysv4*
+	to add a new target for traditional mips i.e
+	bfd_elf32_tradbigmips_vec and bfd_elf32_tradlittlemips_vec.
+	* configure.in: Likewise.
+	* configure: Rebuild.
+	* targets.c (bfd_elf32_tradbigmips_vec): Declare and put in
+	bfd_target_vector.
+	(bfd_elf32_tradlittlemips_vec): Likewise.
+	* elfxx-target.h: Add macro INCLUDED_TARGET_FILE which is more a test
+	to see that elfNN_bed does not get redefined even if the target file
+	is included twice for a chip. See elf32-mips.c.
+
+2000-07-01  Alan Modra  <alan@linuxcare.com.au>
+
+	* Makefile.am (DEP): Fix 2000-06-22.  grep after running dep.sed
+	(CLEANFILES): Add DEPA.
+	* Makefile.in: Regenerate.
+
+2000-06-30  DJ Delorie  <dj@cygnus.com>
+
+	* peicode.h (coff_swap_filehdr_in): can't use e_magic because we
+	can't assume the PE header is at 0x80.
+
+2000-06-29  Mark Elbrecht  <snowball3@bigfoot.com>
+
+	* syms.c (_bfd_stab_section_find_nearest_line): Use IS_ABSOLUTE_PATH.
+
+2000-06-28  Mark Elbrecht  <snowball3@bigfoot.com>
+
+	* go32stub.h: Update stub.
+
+2000-06-26  Marek Michalkiewicz  <marekm@linux.org.pl>
+
+	* archures.c (bfd_mach_avr5): Define.
+	* bfd-in2.h (bfd_mach_avr5): Define.
+	* cpu-avr.c (arch_info_struct): Rename bfd_mach_avr4 to
+	bfd_mach_avr5, add bfd_mach_avr4.  Update comments.
+	(compatible): Update comment.  Add missing test.
+	* elf32-avr.c (avr_final_link_relocate): Support 8K wrap
+	for avr2 and avr4.  Simplify 8K wrap code.
+	(bfd_elf_avr_final_write_processing): Recognize bfd_mach_avr5.
+	(elf32_avr_object_p): Recognize E_AVR_MACH_AVR5.
+
+2000-06-26  Kazu Hirata  <kazu@hxi.com>
+
+	* coff-h8300.c: Fix formatting.
+	* cpu-h8300.c: Likewise.
+
+2000-06-24  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-arm.h (elf32_arm_final_link_relocate): Print `(local)'
+	for local symbols whose names are unknown.
+
+2000-06-22  Alan Modra  <alan@linuxcare.com.au>
+
+	* Makefile.am (DEP): grep for leading `/' in DEP1, and fail if we
+	find one.
+	* Makefile.in: Regenerate.
+	* doc/Makefile.in: Regenerate.
+
+2000-06-20  H.J. Lu  <hjl@gnu.org>
+
+	* Makefile.am: Rebuild dependency.
+	* Makefile.in: Rebuild.
+
+2000-06-20  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+	* elf32-mips.c (_bfd_mips_elf_copy_indirect_symbol): New function.
+	(elf_backend_copy_indirect_symbol): Map to the new function.
+
+2000-06-20  Alan Modra  <alan@linuxcare.com.au>
+
+	* archive.c (normalize): Correct pointer comparison when checking
+	for backslashes.
+	(bfd_bsd_truncate_arname): Likewise.
+	(bfd_gnu_truncate_arname): Likewise.
+
+2000-06-20  Ulf Carlsson  <ulfc@engr.sgi.com>
+
+	* elf-bfd.h (struct elf_obj_tdata): Define per BFD Irix 5 virtual
+	sections elf_{text,data}_{section,symbol}.
+	* elf32-mips.c: mips_elf_{text,data}_{section,symbol}{,_ptr}: Remove.
+	(_bfd_mips_elf_hide_symbol): New function.
+	(elf_backend_hide_symbol): Map to the new function.
+	(_bfd_mips_elf_add_symbol_hook): Change to use new per BFD
+	definitions of mips_elf_{text,data}_{section,symbol}.
+	(mips_elf_local_relocation_p): Try to find the direct symbol
+	based on new check_forced argument.
+	(mips_elf_calculate_relocation): Use new version of
+	mips_elf_local_relocation_p.
+	(mips_elf_relocate_section): Likewise.
+	(_bfd_mips_elf_relocate_section): Likewise.
+	(mips_elf_sort_hash_table): Only assert that have enough GOT
+	space.
+	(mips_elf_got16_entry): Match all 32 bits to the existing GOT
+	entry if the relocation based on the new external argument.
+	(mips_elf_create_dynamic_relocation): Assert that we have a
+	section contents allocated where we can swap out the dynamic
+	relocations.
+	(mips_elf_calculate_relocation): Find the real hash-table entry
+	correctly by using h->root.root.type.  Only create a dynamic
+	relocation entry if the symbol is defined in a shared library.
+	Create an external GOT entry for the GOT16 relocation if the
+	symbol was forced local.
+	(_bfd_mips_elf_finish_dynamic_symbol): Don't assert there is a
+	dynamic index if the symbol was forced local.
+
+2000-06-20  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+	* elf32-mips.c: Fix typos in comments.
+
+2000-06-19  Mark Kettenis  <kettenis@gnu.org>
+
+	* rs6000-core.c: Wrap definition of `union VmInfo' within #ifdef
+	CORE_VERSION_1.
+
+2000-06-18  Stephane Carrez  <stcarrez@worldnet.fr>
+
+	* Makefile.in, bfd-in2.h, libbfd.h, configure: Rebuild.
+	* Makefile.am (ALL_MACHINES, ALL_MACHINES_CFILES, BFD32_BACKENDS,
+	BFD32_BACKENDS_CFILES): Add 68hc12, 68hc11 files.
+	* configure.in (bfd_elf32_m68hc12_vec): Recognize.
+	(bfd_elf32_m68hc11_vec): Likewise.
+	* config.bfd (targ_cpu): Recognize 68hc12 and 68hc11.
+	Supports 68hc11 & 68hc12  at the same time.
+	* targets.c (bfd_elf32_m68hc12_vec): Declare and put in
+	bfd_target_vector.
+	(bfd_elf32_m68hc11_vec): Likewise.
+	* elf.c (prep_headers): Recognize bfd_arch_m68hc12 and 68hc11.
+	* archures.c (bfd_m68hc12_arch): Define and register in global list
+	(bfd_m68hc11_arch): Likewise.
+	* reloc.c (BFD_RELOC_M68HC11_HI8, BFD_RELOC_M68HC11_LO8,
+	BFD_RELOC_M68HC11_3B): Define.
+	* cpu-m68hc12.c, elf32-m68hc12.c: New files for 68hc12 support.
+	* cpu-m68hc11.c, elf32-m68hc11.c: New files for 68hc11 support.
+
+2000-06-18  Ulf Carlsson  <ulfc@engr.sgi.com>
+
+	* elf_bfd.h (struct elf_backend_data): Add info argument to
+	elf_backend_hide_symbol.
+	(_bfd_elf_link_hash_hide_symbol): Likewise.
+	* elf.c (_bfd_elf_link_hash_hide_symbol): Likewise.
+	* elf64-ia64.c (elf64_ia64_hash_hide_symbol): Likewise.
+	* elflink.h (elf_link_add_object_symbols): Likewise.
+	(elf_link_assign_sym_version): Likewise.
+
+2000-06-18  H.J. Lu  <hjl@gnu.org>
+
+	* coff-i386.c (coff_i386_reloc): Don't return in case of
+	output_bfd == (bfd *) NULL if COFF_WITH_PE is defined.
+	Compensate PE relocations when linking with non-PE object
+	files to generate a non-PE executable.
+
+2000-06-17  Ulf Carlsson  <ulfc@engr.sgi.com>
+
+	* elf32-mips.c (mips_elf_calculate_relocation): Explicitly write
+	GOT entries if we're doing a static link or -Bsymbolic link.
+
+2000-06-15  Ulf Carlsson  <ulfc@engr.sgi.com>
+
+	* elflink.h (elf_link_adjust_relocs): Check for and call backend
+	specifific swap_reloc_{in,out} and swap_reloca_{in,out} if
+	available.
+	(elf_link_output_relocs): Likewise.
+	(elf_reloc_link_order): Likewise.
+
+2000-06-16  Nicholas Duffek  <nsd@redhat.com>
+
+	* archures.c (enum bfd_architecture): #define constants for
+	PowerPc and RS6000 machine numbers.
+	* bfd-in2.h: Regenerate.
+	* coffcode.h (coff_set_arch_mach_hook): #ifdef XCOFF64, set arch
+	to bfd_arch_powerpc instead of bfd_arch_rs6000.  Refer to PowerPc
+	and RS6000 machine numbers using #defined constants from
+	archures.c.
+	* cpu-powerpc.c (arch_info_struct): Refer to PowerPc and RS6000
+	machine numbers using #defined constants from archures.c.  Add
+	entries for EC603e, 630, A35, RS64II, RS64III, 7400.  Specify
+	64-bit words in 620 entry.
+	* cpu-rs6000.c (arch_info_struct): Create with entries for RS1,
+	RSC, and RS2.
+	(bfd_rs6000_arch): Change default machine to 0 (bfd_mach_rs6k).
+
+2000-06-16  Nicholas Duffek  <nsd@cygnus.com>
+
+	* coffcode.h (coff_mkobject_hook): Set xcoff_tdata.xcoff64.
+	* libcoff-in.h (struct xcoff_tdata): Define xcoff64 field.
+	* libcoff.h (struct xcoff_tdata): Define xcoff64 field.
+
+2000-06-16  Nicholas Duffek  <nsd@redhat.com>
+
+	* bfd-in.h (bfd_family_coff): Define.
+	* bfd-in2.h: Regenerate.
+	* coffgen.c (coff_count_linenumbers, coff_symbol_from,
+	coff_find_nearest_line): Check COFFness using bfd_family_coff()
+	instead of bfd_target_coff_flavour.
+	* cofflink.c (_bfd_coff_final_link): Likewise.
+	* cpu-ns32k.c (do_ns32k_reloc): Don't strcmp() target name to
+	exclude XCOFF files.
+	* reloc.c (bfd_perform_relocation, bfd_install_relocation):
+	Likewise.
+	* targets.c (enum bfd_flavour): Add bfd_target_xcoff_flavour.
+	* xcoff-target.h (TARGET_SYM): Use bfd_target_xcoff_flavour.
+	* xcofflink.c (XCOFF_XVECP): Delete.
+	(bfd_xcoff_link_record_set, bfd_xcoff_import_symbol,
+	bfd_xcoff_export_symbol, bfd_xcoff_link_count_reloc,
+	bfd_xcoff_record_link_assignment,
+	bfd_xcoff_size_dynamic_sections): Replace XCOFF_XVECP() with
+	check for bfd_target_xcoff_flavour.
+
+2000-06-16  Nicholas Duffek  <nsd@redhat.com>
+
+	* rs6000-core.c: Support 64-bit core files, support pre-4.3 core
+	files on AIX 4.3.
+	(read_hdr): New function.
+	(rs6000coff_core_p): Store mstsave or __context64 struct instead
+	of trying to extract individual registers.  Set abfd->arch_info
+	to match the architecture that created the core file.
+	(rs6000coff_get_section_contents): Delete.
+	* xcoff-target.h (rs6000coff_get_section_contents): Delete.
+
+2000-06-14  H.J. Lu  <hjl@gnu.org>
+
+	* vms-misc.c (_bfd_vms_next_record): Return -1 if PRIV(vms_rec)
+	is NULL.
+
+2000-06-13  H.J. Lu  <hjl@gnu.org>
+
+	* configure: Regenerate.
+
+2000-06-13  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+	* peicode.h (pe_ILF_object_p): Use TARGET_LITTLE_SYM instead of
+	armpei_little_vec.
+
+2000-06-08  David O'Brien  <obrien@FreeBSD.org>
+
+	* configure.in (VERSION): Update to show this is the CVS mainline.
+
+2000-06-07  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf32-d10v.c: Include elf/d10v.h
+	(enum reloc_type): Delete.
+	* elf32-d30v.c: Include elf/d30v.h
+	(enum reloc_type): Delete.
+
+	* Makefile.am: Run "make dep-am" to regenerate dependencies.
+	* Makefile.in: Regenerate.
+
+	* elf32-i386.c (elf_howto_table): Remove EMPTY_HOWTOs.
+	(elf32_i386_vtinherit_howto, elf32_i386_vtentry_howto): Delete and
+	move HOWTOs into elf_howto_table.
+	(R_386_standard, R_386_ext_offset): Define.
+	(R_386_ext, R_386_vt_offset, R_386_vt): Define.
+	(elf_i386_reloc_type_lookup): Modify calculation of index into
+	elf_howto_table since we've removed the padding.
+	(elf_i386_info_to_howto_rel): Likewise.
+	(elf_i386_relocate_section): Likewise.
+
+2000-06-06  Michael Snyder  <msnyder@seadog.cygnus.com>
+
+	* elf.c (elf_grok_pr_status): Eliminate reference to prgregset_t.
+
+2000-06-05  H.J. Lu  <hjl@gnu.org>
+
+	* elflink.c (_bfd_elf_link_record_dynamic_symbol): Don't flag
+	an error when seeing an undefined symbol with hidden/internal
+	attribute. It is handled in *_relocate_section ().
+
+2000-06-05  H.J. Lu  <hjl@gnu.org>
+
+	* elflink.h (elf_fix_symbol_flags): Follow the link for the
+	indirect symbol for the ELF_LINK_NON_ELF bit.
+	(elf_link_output_extsym): Don't output the indirect symbol even
+	if the ELF_LINK_NON_ELF bit is set.
+
+2000-06-01  J.T. Conklin  <jtc@redback.com>
+
+	* config.bfd (i[3456]86-*-netbsdelf*): New target.
+	(i[3456]86-*-netbsdaout*): New target.
+	(i[3456]86-*-netbsd*): Add bfd_elf32_i386_vec to targ_selvecs.
+	(i[3456]86-*-openbsd*): Likewise.
+
+2000-05-30  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* trad-core.c: From hpux-core.c, include <dirent.h> or
+	<sys/ndir.h> when possible.
+
+2000-05-31  Ulrich Drepper  <drepper@redhat.com>
+
+	* elf.c (_bfd_elf_slurp_version_tables): Correct reading of version
+	definitions.  We must not assume they are sorted in the file
+	according to their index numbers.
+
+2000-05-31  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf-hppa.h: (elf_hppa_final_link_relocate): Use e_rsel field
+	selector for R_PARISC_PCREL17R.  R_PARISC_DIR17R and
+	R_PARISC_DIR17F are for absolute branches; Handle them as such.
+
+2000-05-30  Nick Clifton  <nickc@cygnus.com>
+
+	* cpu-i960.c (scan_960_mach): Accept 80960KA, 80960KB,
+	80960CA, 80960MC as valid machine names.
+
+2000-05-30  H.J. Lu  <hjl@gnu.org>
+
+	* elflink.c (_bfd_elf_link_record_dynamic_symbol): Clear the
+	visibility bits if the symbol is undefined. Correctly handle
+	weak undefined symbols with hidden and internal attributes.
+
+	* elflink.h (elf_link_add_object_symbols): Always turn the
+	symbol into local if it has the hidden or internal attribute.
+
+2000-05-29  Philip Blundell  <philb@gnu.org>
+
+	* ppcboot.c:  Add packed attribute if compiling with GCC.
+
+2000-05-29  Anatoly Vorobey  <mellon@pobox.com>
+
+	* elf.c (_bfd_elf_link_hash_table_init): Initialize dynlocal.
+
+2000-05-26  Michael Snyder  <msnyder@seadog.cygnus.com>
+
+	* elf.c (elfcore_grok_prstatus, elfcore_grok_pstatus,
+	elfcore_grok_psinfo): Add code to allow debugging a 32-bit
+	corefile on a 64-bit (Sparc Solaris) host.  Also clean up
+	a few old comments.
+
+2000-05-26  Alan Modra  <alan@linuxcare.com.au>
+
+	* Makefile.am: Update dependencies with "make dep-am"
+	* Makefile.in: Regenerate.
+
+	* sysdep.h (gettext, dgettext, dcgettext, textdomain,
+	bindtextdomain): Replace defines with those from intl/libgettext.h
+	to quieten gcc warnings.
+
+2000-05-26  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* aoutx.h (find_nearest_line): Use IS_ABSOLUTE_PATH.
+
+	* archive.c (normalize, bfd_bsd_truncate_arname,
+	bfd_gnu_truncate_arname) [HAVE_DOS_BASED_FILE_SYSTEM]: Support
+	file names with backslashes.
+
+	* cache.c (bfd_open_file) [__MSDOS__]: Don't unlink the file
+	before opening it.
+
+	* sysdep.h: Include filenames.h.
+
+2000-05-26  Alan Modra  <alan@linuxcare.com.au>
+
+	* opncls.c (bfd_close_all_done): Mask file perms with 0777 not 0x777.
+
+2000-05-26  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf64-sparc.c (sparc64_elf_relax_section): New.
+	(sparc64_elf_relocate_section): Optimize tail call into branch always
+	if possible.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+	(elf32_sparc_relax_section): New.
+
+2000-05-26  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf64-sparc.c: Add ATTRIBUTE_UNUSED to unused function parameters.
+	Remove unusued variables.
+	(sparc64_elf_relocate_section): Change r_symndx type to unsigned long.
+	(sparc64_elf_merge_private_bfd_data): Fix shared library case from
+	previous fix, so that shared libs really don't influence targets
+	extension mask and memory model.
+
+2000-05-23  H.J. Lu  <hjl@gnu.org>
+
+	* elf64-alpha.c (elf64_alpha_relocate_section): Check
+	h->root.other not h->other.
+	* elf32-mips.c (mips_elf_calculate_relocation): Likewise.
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Fix a typo.
+
+2000-05-23  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-i386.c (elf_i386_relocate_section): Don't allow the
+	undefined symbol with the non-default visibility attributes.
+	* elf-hppa.h (elf_hppa_relocate_section): Likewise.
+	* elf32-arm.h (elf32_arm_relocate_section): Likewise.
+	* elf32-i370.c (i370_elf_relocate_section): Likewise.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-mcore.c (mcore_elf_relocate_section): Likewise.
+	* elf32-mips.c (mips_elf_calculate_relocation): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relocate_section): Likewise.
+	* elf64-ia64.c (elf64_ia64_relocate_section): Likewise.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+
+2000-05-22  Richard Henderson  <rth@cygnus.com>
+
+	* elf64-ia64.c (ia64_howto_table): Add PCREL60B, PCREL21BI,
+	PCREL22, PCREL64I.  Zero size of special relocs.
+	(elf64_ia64_reloc_type_lookup): Likewise.
+	(USE_BRL, oor_brl, oor_ip): New.
+	(elf64_ia64_relax_section): New.
+	(elf64_ia64_check_relocs): Handle PCREL60B, PCREL22, PCREL64I.
+	(elf64_ia64_install_value): Likewise, plus PCREL21BI.
+	(elf64_ia64_relocate_section): Likewise.
+	(bfd_elf64_bfd_relax_section): New.
+	* reloc.c (BFD_RELOC_IA64_PCREL21BI): New.
+	(BFD_RELOC_IA64_{PCREL22,PCREL60B,PCREL64I}): New.
+	* bfd-in2.h, libbfd.h: Regenerate.
+
+2000-05-22  Nick Clifton  <nickc@cygnus.com>
+
+	* configure.in : Add peigen.lo to MIPS PE targets.
+	* configure: Regenerate.
+
+2000-05-22  Momchil Velikov  <velco@fadata.bg>
+
+	* libbfd.c (_bfd_generic_verify_endian_match): Compare endianess
+	only if it is known for both input and output bfds. Separate
+	error message strings as in some languages, it may be necessary
+	to change more than one place in the string to change between
+	'big' and 'little'.
+
+	* elf32-ppc.c (ppc_elf_merge_private_bfd_data): Remove inline
+	endianess checks, call _bfd_generic_verify_endian_match() instead.
+
+	* elf32-mips.c (_bfd_mips_elf_merge_private_bfd_data): Likewise.
+
+	* elf32-mcore.c (mcore_elf_merge_private_bfd_data): Likewise.
+
+	* elf32-arm.h (elf32_arm_merge_private_bfd_data): Likewise. Verify
+	endianess before checking bfd flavours.
+
+2000-05-22  H.J. Lu  <hjl@gnu.org>
+
+	* elflink.h (elf_link_output_extsym): Clear the visibility
+	field for symbols not defined locally.
+
+2000-05-18  Alan Modra  <alan@linuxcare.com.au>
+
+	* libhppa.h (re_assemble_3, re_assemble_12, re_assemble_16,
+	re_assemble_17, re_assemble_21, re_assemble_22): Don't mask insn.
+	(hppa_rebuild_insn): Mask immediate bits here instead.
+	* elf-hppa.h (elf_hppa_relocate_insn): Mask here too.
+
+2000-05-18  Momchil Velikov <velco@fadata.bg>
+
+	* elflink.h (elf_bfd_final_link, elf_link_input_bfd): When emiting
+	relocs for an executable, ensure that they are virtual addresses.
+
+2000-05-18  Jeffrey A Law  (law@cygnus.com)
+
+	* config.bfd (hppa*64*-*-hpux11*): New target triplet.
+
+2000-05-17  S. Bharadwaj Yadavalli  <sby@scrugs.lkg.dec.com>
+	    Rick Gorton	            <gorton@scrugs.lkg.dec.com>
+
+	* elflink.h: Add emitrelocations support: when enabled, relocation
+	information and relocation sections are put into final output
+	executables.  If the emitrelocations flag is set, do the following:
+	(elf_bfd_final_link): Emit relocation sections.
+	(elf_link_input_bfd): Compute relocation section contents.
+	(elf_gc_sections): Don't clean relocation sections.
+
+2000-05-16  Catherine Moore  <clm@cygnus.com>
+
+	* som.c (som_decode_symclass):  Recognize weak symbols.
+
+2000-05-16  Szabolcs Szakacsits <szaka@F-Secure.com>
+
+	* peigen.c (pe_print_idata): Undo part of 2000-05-12 change that
+	read idata section only from dataoff.
+	(pe_print_edata): Correctly check for valid eat_member.
+
+2000-05-16  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+	* elf32-sh.c (sh_elf_relax_delete_bytes): Handle R_SH_SWITCH8.
+
+2000-05-14  Philip Blundell  <philb@gnu.org>
+
+	* config.bfd (armeb-*-elf, arm*b-*-linux-gnu*): New targets.
+
+2000-05-12  Alan Modra  <alan@linuxcare.com.au>
+
+	* targets.c (bfd_target_vector): #ifdef BFD64 rs6000coff64_vec
+
+	* peigen.c (pe_print_idata): Look for .idata section and print
+	info even if data directory has zero entries.  Read idata section
+	starting from dataoff, and adjust all data offsets to suit.  Cast
+	all bfd_vma vars to unsigned long before passing to fprintf.
+	* peigen.c (pe_print_edata): Similarly, look for .edata section
+	and print info even if data directory has zero entries.  Cast
+	all bfd_vma vars to unsigned long before passing to fprintf.
+
+	From Szabolcs Szakacsits <szaka@F-Secure.com>
+	* peigen.c (pe_print_idata): Use bfd_section_size rather than data
+	directory size which may be bogus.
+	* peigen.c (pe_print_edata): Similarly.
+
+2000-05-09  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf.c (bfd_section_from_shdr): Don't set use_rela_p if rela
+	section is empty.
+	(copy_private_bfd_data): Allow for space possibly taken up by elf
+	headers when calculating segment physical address from lma.
+
+2000-05-08  Alan Modra  <alan@linuxcare.com.au>
+
+	* versados.c (versados_scan): Init stringlen and pass_2_done.
+
+	* trad-core.c (trad_unix_core_file_p): Return
+	bfd_error_wrong_format rather than bfd_error_file_truncated.
+
+	* peigen.c (_bfd_pei_swap_aouthdr_out): Pass ImageBase to
+	add_data_entry.  DataDirectory virtual address is relative.
+	(pe_print_idata): Account for relative DataDirectory virtual
+	addresses.  Don't trash datasize inside POWERPC_LE_PE code.
+	(pe_print_edata): Similarly.
+
+	From Szabolcs Szakacsits <szaka@F-Secure.com>
+	* peigen.c (dir_names): Add Delay Import Directory.
+	(pe_print_idata):  Always search for bfd section containing
+	idata address rather than looking up section name.  Print this
+	section name rather than .idata.
+	(pe_print_edata): Similarly.  Also print some fields as %08lx.
+	(_bfd_pe_print_private_bfd_data_common): Print Reserved1 field as
+	Win32Version.
+
+2000-05-05  Clinton Popetz  <cpopetz@cygnus.com>
+
+	* xcoff.h: Rename to xcoff-target.h
+	* Makefile.am: Change all instances of xcoff.h to xcoff-target.h
+	* coff-rs6000.c: Ditto.
+	* coff64-rs6000.c: Ditto.
+	* coff-pmac.c: Ditto.
+	* Makefile.in: Regenerate.
+
+2000-05-05  Clinton Popetz  <cpopetz@cygnus.com>
+
+	* coffcode.h (coff_set_arch_mach_hook, coff_set_flags):
+	Change U802TOC64MAGIC to U803XTOCMAGIC.
+
+2000-05-04  Michael Snyder  <msnyder@seadog.cygnus.com>
+
+	* elf.c (bfd_elf_get_arch_size): New function, return 32 | 64 | -1.
+	* bfd-in.h: Prototype bfd_elf_get_arch_size.
+	* bfd-in2.h: Prototype bfd_elf_get_arch_size.
+
+2000-05-04  Alan Modra  <alan@linuxcare.com.au>
+
+	* libhppa.h (HPPA_R_CONSTANT): Cast argument to bfd_signed_vma.
+
+2000-05-03  Martin v. L��wis  <loewis@informatik.hu-berlin.de>
+
+	* elflink.h (elf_link_add_object_symbols): Reset dynindx for
+	hidden and internal symbols.
+	(elf_fix_symbol_flags): Clear NEEDS_PLT for symbols with
+	visibility.
+	* elflink.c (_bfd_elf_link_record_dynamic_symbol): Do not
+	assign a PLT or GOT entry to symbols with hidden and
+	internal visibility.
+
+2000-05-03  Mark Elbrecht  <snowball3@bigfoot.com>
+
+	* coff-go32.c (COFF_SECTION_ALIGNMENT_ENTRIES): Add entry for
+	the .bss section.
+	* coff-stgo32.c (COFF_SECTION_ALIGNMENT_ENTRIES): Likewise.
+
+2000-05-02  H.J. Lu  <hjl@gnu.org>
+
+	* elf.c (prep_headers): Use ELFOSABI_NONE instead of
+	ELFOSABI_SYSV.
+
+2000-05-02  Alan Modra  <alan@linuxcare.com.au>
+
+	* targets.c (bfd_target_vector): Restore bfd_elf32_hppa_vec.
+	* Makefile.am (BFD32_BACKENDS): Restore elf32-hppa.lo.  Regenerate
+	dependencies.
+	* Makefile.in: Regenerate.
+
+2000-05-01  Jim Wilson  <wilson@cygnus.com>
+
+	* Makefile.am (BFD32_BACKENDS): Add efi-app-ia32.lo.
+	(BFD32_BACKENDS_CFILES): Add efi-app-ia32.c.
+	(BFD64_BACKENDS): Delete coff-ia64.lo.  Add efi-app-ia64.lo.
+	(BFD64_BACKENDS_CFILES): Delete coff-ia64.c.  Add efi-app-ia64.c.
+	* Makefile.in: Rebuild.
+
+2000-05-02  Alan Modra  <alan@linuxcare.com.au>
+
+	* config.bfd: Re-enable elf32-hppa.  It now compiles, even if it
+	doesn't work very well.
+
+	* elf-hppa.h (elf_hppa_internal_shdr): Define.
+	(elf_hppa_fake_sections): hdr is elf_hppa_internal_shdr.
+	Set hdr->s_type to 1 if ARCH_SIZE == 32.
+	(_bfd_elf_hppa_gen_reloc_type): Add prototype.
+	(elf_hppa_info_to_howto): Likewise.
+	(elf_hppa_info_to_howto_rel): Likewise.
+	(elf_hppa_reloc_type_lookup): Likewise.
+	(elf_hppa_is_local_label_name): Likewise.
+	(elf_hppa_fake_sections): Likewise.
+	(elf_hppa_final_write_processing): Likewise.
+	(elf_hppa_howto_table): Fully initialise all entries.
+	(_bfd_elf_hppa_gen_reloc_type): Add ATTRIBUTE_UNUSED to args.
+	(elf_hppa_info_to_howto): Likewise.
+	(elf_hppa_info_to_howto_rel): Likewise.
+	(elf_hppa_reloc_type_lookup): Likewise.
+	(elf_hppa_final_write_processing, elf_hppa_add_symbol_hook,
+	elf_hppa_unmark_useless_dynamic_symbols,
+	elf_hppa_remark_useless_dynamic_symbols,
+	elf_hppa_record_segment_addrs, elf_hppa_final_link,
+	elf_hppa_relocate_section, elf_hppa_final_link_relocate,
+	elf_hppa_relocate_insn): Compile only if ARCH_SIZE == 64 until
+	elf32-hppa.c mess is cleaned up.
+	(elf_hppa_final_link_relocate): Make insn and r_type unsigned
+	int.  Delete r_field.  In case R_PARISC_PCREL21L, don't set
+	r_field then call hppa_field_adjust inline func with variable
+	r_field arg, instead call hppa_field_adjust with fixed arg.
+	In case R_PARISC_PCREL22F, don't set r_field.
+	(elf_hppa_relocate_insn): Change args and return type to unsigned
+	int.  Call re_assemble_* funcs to do the work.
+
+	* elf32-hppa.c (hppa_elf_relocate_insn): Don't assume 32 bit when
+	sign extending.
+
+	* libhppa.h (HPPA_R_CONSTANT): Don't assume 32 bit when sign
+	extending.
+	(sign_extend): Mask first before sign extending.
+	(low_sign_extend): Rewrite without condition expression.
+	(ones, dis_assemble_3, dis_assemble_12, dis_assemble_16,
+	dis_assemble_17, dis_assemble_21, dis_assemble_22): Delete.
+	(assemble_3, assemble_6, assemble_12, assemble_16, assemble_16a,
+	assemble_17, assemble_21, sign_unext, low_sign_unext): Return
+	result as function return value rather than through pointer arg.
+	Accept unsigned int args, and return unsigned int.
+	(re_assemble_3): New.  Combines function of dis_assemble_3 with
+	re-assembly of opcode and immediate.
+	(re_assemble_12): Likewise.
+	(re_assemble_16): Likewise.
+	(re_assemble_17): Likewise.
+	(re_assemble_21): Likewise.
+	(re_assemble_22): Likewise.
+	(hppa_field_adjust): Rewrite and document, paying attention to
+	size of types and signed/unsigned issues.
+	(get_opcode): Shift before masking.
+	(FDLW): Rename to FLDW.
+	(bfd_hppa_insn2fmt): Change arg to unsigned int.  Delete fmt.
+	(hppa_rebuild_insn): Change args and return value to unsigned
+	int.  Make use of re_assemble_*.  Correct case 11.
+
+	* dep-in.sed: Handle ../opcodes/.
+	* Makefile.am (SOURCE_HFILES): Add elf-hppa.h, elf32-hppa.h,
+	elf64-hppa.h, hppa_stubs.h, xcoff.h.
+	(BFD32_BACKENDS_CFILES): Restore elf32-hppa.c.
+	Remove elf64-hppa.lo, cpu-ia64.lo, elf64-ia64.lo, elfarm-oabi.lo,
+	elfarm-nabi.lo dependencies outside of auto-dependency area.
+	Regenerate dependencies.
+	* Makefile.in: Regenerate.
+
+	* configure.in (TRAD_HEADER): Test non-null before
+	AC_DEFINE_UNQUOTED.
+	* configure: Regenerate.
+
+	* reloc.c: Fix mis-spelling in comment.
+
+2000-05-01  Alan Modra  <alan@linuxcare.com.au>
+
+	* coff-sh.c (bfd_coff_small_swap_table): Fix Fri Apr 28 change.
+	* vms.c (vms_openr_next_archived_file): Return NULL.
+
+2000-04-28  Clinton Popetz  <cpopetz@cygnus.com>
+
+	* coffcode.h Copy changes mistakenly done to libcoff.h in
+	4/24/2000 patch.
+
+2000-04-29  Andreas Jaeger  <aj@suse.de>
+
+	* libbfd-in.h: Correctly check GCC version.
+	* bfd-in.h: Likewise.
+	* libhppa.h: Likewise.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2000-04-28  Clinton Popetz  <cpopetz@cygnus.com>
+
+	* Makefile.am (BFD64_BACKENDS, BFD64_BACKENDS_CFILES): Add
+	coffdu-rs6000.{lo,c}.
+	(coff-pmac.lo, coff-rs6000.lo, coff64-rs6000.lo): Add dependency
+	on xcoff.h
+	* Makefile.in: Regenerate.
+	* xcoff.h: New file.
+	* coff-pmac.c: Use xcoff.h instead of coff-rs6000.c.
+	* coff-rs6000.c: Move all declarations and defines that are
+	common to the xcoff backends into xcoff.h
+	* coff64-rs6000.c: Ditto,
+
+2000-04-28  Clinton Popetz  <cpopetz@cygnus.com>
+
+	* coff-mips.c (mips_ecoff_backend_data):  Add initialization of
+	_bfd_coff_force_symnames in strings and
+	_bfd_coff_debug_string_prefix_length to their default values.
+	* coff-sh.c: (bfd_coff_small_swap_table): Ditto.
+
+2000-04-28  Clinton Popetz  <cpopetz@cygnus.com>
+
+	* coff-alpha.c (alpha_ecoff_backend_data): Add initialization of
+	_bfd_coff_force_symnames in strings and
+	_bfd_coff_debug_string_prefix_length to their default values.
+
+2000-04-27  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf32-m68k.c (elf_m68k_gc_sweep_hook):  Return if dynobj NULL.
+	Check local_got_refcounts before dereferencing.
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Check splt != NULL
+	before deciding we don't need R_PPC_PLT32 relocation.
+	(ppc_elf_gc_sweep_hook): Check local_got_refcounts before
+	dereferencing.
+
+	* elflink.h (elf_gc_common_finalize_got_offsets): Fix comment.
+
+	* elf32-i386.c (elf_i386_check_relocs): Reference count .got and
+	.plt entries.
+	(elf_i386_gc_sweep_hook): Garbage collect .got and .plt entries.
+	(elf_i386_adjust_dynamic_symbol): Recognize unused .plt entries.
+	(elf_i386_relocate_section): Allow for .plt to go missing.
+	(elf_i386_finish_dynamic_symbol): Use same test to decide if we
+	can use a relative reloc for got as elf_i386_relocate_section.
+	(bfd_elf32_bfd_final_link): Define to use gc form of final link.
+
+2000-04-26  Clinton Popetz  <cpopetz@cygnus.com>
+
+	* config.bfd: Remove extraneous bfd_powerpc_64_arch.
+
+2000-04-24  Clinton Popetz  <cpopetz@cygnus.com>
+
+	* Makefile.am (coff64-rs6000.lo): New rule.
+	* Makefile.in: Regenerate.
+	* coff-rs6000.c (xcoff_mkobject, xcoff_copy_private_bfd_data,
+	xcoff_is_local_label_name, xcoff_rtype2howto,
+	xcoff_reloc_type_lookup, xcoff_slurp_armap, xcoff_archive_p,
+	xcoff_read_ar_hdr, xcoff_openr_next_archived_file, xcoff_write_armap,
+	xcoff_write_archive_contents): No longer static, and prefix with _bfd_.
+	(NO_COFF_SYMBOLS): Define.
+	(xcoff64_swap_sym_in, xcoff64_swap_sym_out, xcoff64_swap_aux_in,
+	xcoff64_swap_aux_out): New functions; handle xcoff symbol tables
+	internally.
+	(MINUS_ONE): New macro.
+	(xcoff_howto_tabl, xcoff_reloc_type_lookup): Add 64 bit POS
+	relocation.
+	(coff_SWAP_sym_in, coff_SWAP_sym_out, coff_SWAP_aux_in,
+	coff_SWAP_aux_out): Map to the new functions.
+	* coff64-rs6000.c: New file.
+	* libcoff.h (bfd_coff_backend_data): Add new fields
+	_bfd_coff_force_symnames_in_strings and
+	_bfd_coff_debug_string_prefix_length.
+	(bfd_coff_force_symnames_in_strings,
+	bfd_coff_debug_string_prefix_length): New macros for above fields.
+	* coffcode.h (coff_set_arch_mach_hook): Handle XCOFF64 magic.
+	Set machine to 620 for XCOFF64.  Use bfd_coff_swap_sym_in instead
+	of using coff_swap_sym_in directly.
+	(FORCE_SYMNAMES_IN_STRINGS): New macro, defined for XCOFF64.
+	(coff_set_flags) Set magic for XCOFF64.
+	(coff_compute_section_file_positions): Add symbol name length to
+	string section length if bfd_coff_debug_string_prefix_length is
+	true.
+	(coff_write_object_contents): Don't do reloc overflow for XCOFF64.
+	(coff_slurp_line_table): Use bfd_coff_swap_lineno_in instead of
+	using coff_swap_lineno_in directly.
+	(bfd_coff_backend_data): Add _bfd_coff_force_symnames_in_strings
+	and _bfd_coff_debug_string_prefix_length fields.
+	* coffgen.c (coff_fix_symbol_name, coff_write_symbols): Force
+	symbol names into strings table when
+	bfd_coff_force_symnames_in_strings is true.
+	* coffswap.h (MAX_SCNHDR_NRELOC, MAX_SCNHDR_NLNNO, GET_RELOC_VADDR,
+	SET_RELOC_VADDR): New macros.
+	(coff_swap_reloc_in, coff_swap_reloc_out): Use above macros.
+	(coff_swap_aux_in, coff_swap_aux_out): Remove RS6000COFF_C
+	code.
+	(coff_swap_aouthdr_in, coff_swap_aouthdr_out): Handle XCOFF64
+	changes within RS6000COFF_C specific code.
+	(coff_swap_scnhdr_out): Use PUT_SCNHDR_NLNNO, PUT_SCNHDR_NRELOC,
+	MAX_SCNHDR_NRELOC, and MAX_SCNHDR_NLNNO.
+	* reloc.c (bfd_perform_relocation, bfd_install_relocation):
+	Extend existing hack on target name.
+	* xcofflink.c (XCOFF_XVECP): Extend existing hack on
+	target name.
+	* coff-tic54x.c (ticof): Keep up to date with new fields
+	in bfd_coff_backend_data.
+	* config.bfd: Add bfd_powerpc_64_arch to targ_arch and define
+	targ_selvecs to include rs6000coff64_vec for rs6000.
+	* configure.in: Add rs6000coff64_vec case.
+	* cpu-powerpc.c: New bfd_arch_info_type.
+
+2000-04-24  Jeffrey A Law  (law@cygnus.com)
+
+	* config.bfd: Only disable elf32-hppa vectors, not all of the
+	BSD and OSF configuration support.  Provide (disabled) clauses
+	for PA64 support.
+	* configure.in: Add clause for PA64 support.
+	* configure: Rebuilt.
+
+	* targets.c (bfd_target_vector): Add bfd_elf64_hppa_vec.
+	(bfd_elf64_hppa_vec): Declare.
+
+	* Makefile.am (BFD64_BACKENDS): Add elf64-hppa.lo
+	(BFD64_BACKENDS_CFILES): Add elf64-hppa.c
+	(elf64-hppa.lo): Add dependencies.
+	* Makefile.in: Rebuilt.
+
+	* elf64-hppa.c, elf64-hppa.h: New files with PA64 support.
+
+2000-04-24  Jason Eckhardt  <jle@cygnus.com>
+
+	* libhppa.h (dis_assemble_16): New function.
+	(pa_arch): Added pa20w element.
+
+2000-04-24  Ulrich Drepper  <drepper@cygnus.com>
+
+	* elf-bfd.h: Add prototypes for bfd_elf32_write_relocs,
+	bfd_elf32_slurp_reloc_table, bfd_elf64_write_relocs, and
+	bfd_elf64_slurp_reloc_table.
+
+	* elfcode.h (elf_write_relocs, elf_slurp_reloc_table): New
+	definitions to get external names.
+	(elf_write_relocs): Renamed from write_relocs and make global.
+	(elf_slurp_reloc_table): Make global.
+	(_bfd_elf,size_info): Use elf_write_relocs instead of write_relocs.
+
+	* archive.c (hpux_uid_gid_encode): New function.
+	(bfd_ar_hdr_from_filesystem): Use it if HPUX_LARGE_AR_IDS is
+	defined and the ID is greater than 99999.
+	(bfd_generic_stat_arch_elt): If HPUX_LARGE_AR_IDS is defined decode
+	special uid/gid fields into 32 bit values.
+
+2000-04-21  Matthew Green  <mrg@cygnus.com>
+
+	* config.bfd: Add NetBSD/sparc64 support.
+
+2000-04-21  Richard Henderson  <rth@cygnus.com>
+	    David Mosberger  <davidm@hpl.hp.com>
+	    Timothy Wall <twall@cygnus.com>
+	    Jim Wilson  <wilson@cygnus.com>
+
+	* Makefile.am (ALL_MACHINES): Add cpu-ia64.lo.
+	(ALL_MACHINES_CFILES): Add cpu-ia64.c.
+	(BFD64_BACKENDS): Add elf64-ia64.lo.
+	(BFD64_BACKENDS_CFILES): Add elf64-ia64.c.
+	(cpu-ia64.lo, elf64-ia64.lo): New rules.
+	* Makefile.in: Rebuild.
+	* archures.c (enum bfd_architecture): Add bfd_arch_ia64.
+	(bfd_ia64_arch): Declare.
+	(bfd_archures_list): Add bfd_ia64_arch.
+	* bfd-in2.h: Rebuild.
+	* config.bfd: (ia64*-*-linux-gnu*, ia64*-*-elf*): New targets.
+	* configure: Rebuild.
+	* configure.host: (ia64-*-linux*): New host.
+	* configure.in (bfd_elf64_ia64_little_vec, bfd_elf64_ia64_big_vec,
+	bfd_efi_app_ia64_vec, bfd_efi_app_ia64_vec): New vectors.
+	* elf.c (prep_headers): Add bfd_arch_ia64.
+	* libbfd.h: Rebuild.
+	* reloc.c: Add IA-64 relocations.
+	* targets.c (bfd_elf64_ia64_little_vec, bfd_elf64_ia64_big_vec):
+	Declare.
+	(bfd_target_vect): Add bfd_elf64_ia64_little_vec.
+	* cpu-ia64-opc.c, cpu-ia64.c, elf64-ia64.c: New files.
+
+2000-04-21  Richard Henderson  <rth@cygnus.com>
+
+	* elf32-d30v.c (bfd_elf_d30v_reloc): Don't modify section
+	contents when performing a partial link.
+	(bfd_elf_d30v_reloc_21): Likewise.
+
+2000-04-20  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-i386.c (elf_i386_relocate_section): Restrict 1998-12-10
+	patch to symbols defined by a shared object.
+	* elf32-ppc.c (ppc_elf_relocate_section): Similarly.
+
+2000-04-19  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	K&R compiler fixes.
+	* dwarf2.c (concat_filename): Avoid string literal concatenation.
+	* ieee.c (ieee_get_symtab): Don't initialise union in struct.
+
+2000-04-11  David Mosberger  <davidm@hpl.hp.com>
+
+	* Makefile.am (BFD64_BACKENDS): Mention coff-ia64.lo.
+	(BFD64_BACKENDS_CFILES): Mention coff-ia64.c
+	(coff-ia64.lo): Add dependency.
+	* Makefile.in: Regenerate.
+	* coff-ia64.c: New file.
+	* efi-app-ia32.c: Ditto.
+	* efi-app-ia64.c: Ditto.
+	* coffcode.h (coff_set_arch_mach_hook): Handle IA64MAGIC.
+	(coff_set_flags): Ditto.
+	(coff_write_object_contents) [IA64]: Set magic number to ZMAGIC.
+	* config.bfd (i[3456]86-*-linux-gnu*): Mention bfd_efi_app_ia32_vec.
+	* configure.in (elf): Handle bfd_efi_app_ia32 and bfd_efi_app_ia64_vec.
+	* configure: Regenerate.
+	* libpei.h (GET_OPTHDR_IMAGE_BASE): New macro.
+	(PUT_OPTHDR_IMAGE_BASE): Ditto.
+	(GET_OPTHDR_SIZE_OF_STACK_RESERVE): Ditto.
+	(PUT_OPTHDR_SIZE_OF_STACK_RESERVE): Ditto.
+	(GET_OPTHDR_SIZE_OF_STACK_COMMIT): Ditto.
+	(PUT_OPTHDR_SIZE_OF_STACK_COMMIT): Ditto.
+	(GET_OPTHDR_SIZE_OF_HEAP_RESERVE): Ditto.
+	(PUT_OPTHDR_SIZE_OF_HEAP_RESERVE): Ditto.
+	(GET_OPTHDR_SIZE_OF_HEAP_COMMIT): Ditto.
+	(PUT_OPTHDR_SIZE_OF_HEAP_COMMIT): Ditto.
+	(GET_PDATA_ENTRY): Ditto.
+	* peigen.c (_bfd_pei_swap_aouthdr_in) [COFF_WITH_PEP64]: Don't read
+	data_start.  Use above macros to read fields that are 64 bit wide for
+	COFF_WITH_PEP64.  Don't truncate entry and text_start to 32 bits.
+	(_bfd_pei_swap_aouthdr_out) [PEI_FORCE_MINIMUM_ALIGNMENT]: Force
+	FileAlignment and SectionAlignment to minimum alignment if they
+	are zero.
+	(_bfd_pei_swap_aouthdr_out) [PEI_DEFAULT_TARGET_SUBSYSTEM]: Set
+	Subsystem to default PEI_DEFAULT_TARGET_SUBSYSTEM.
+	(_bfd_pei_swap_aouthdr_out) [COFF_WITH_PEP64]: Don't set data_start.
+	Use above macros to write fields that are 64 bit wide for
+	COFF_WITH_PEP64.
+	(pe_print_pdata): Set PDATA_ROW_SIZE to 3*8 for COFF_WITH_PEP64,
+	5*4 otherwise.  This should be right for IA-32 and IA-64, but may
+	be wrong for platforms.  Use PDATA_ROW_SIZE instead of hardcoded
+	value of 20 bytes.  Modify printing for COFF_WITH_PEP64 to print
+	begin address, end address, and unwind info address only.  Use
+	GET_PDATA_ENTRY() to read .pdata entries.  Use fprintf_vma() to
+	print addresses.
+	(tbl): Add SECTION, REL32, RESERVED1, MIPS_JMPADDR16, DIR64, and
+	HIGH3ADJ relocation names.
+	(_bfd_pe_print_private_bfd_data): Print Subsystem name in legible form.
+	* targets.c: Declare bfd_efi_app_ia32_vec and
+	bfd_efi_app_ia64_vec.
+	(bfd_target_vector): Mention bfd_efi_app_ia32_vec and
+	bfd_efi_app_ia64_vec.
+
+2000-04-17  Timothy Wall  <twall@cygnus.com>
+
+	* bfd-in2.h: Add prototypes for tic54x load page access.
+	* bfd-in.h: Regenerate.
+	* coff-tic54x.c: Add load page functions; allow bfd_arch_unknown
+	in customized _set_arch_mach function.
+	* coffcode.h (coff_set_alignment_hook): Set section load page if
+	the appropriate macro is defined.
+	(write_object_contents): Read section load page.
+
+2000-04-13  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf32-hppa.h: Update copyright date.
+
+	* elf32-fr30.c (fr30_elf_i20_reloc): Don't use U suffix.
+	* elf32-mips.c (_bfd_mips_elf_relocate_section): And here.
+
+	* elf32-d30v.c (MAX32): Don't use LL suffix.
+	(MIN32): Define in terms of MAX32.
+	(bfd_elf_d30v_reloc): Make relocation a bfd_signed_vma.
+
+	* coff-a29k.c (SIGN_EXTEND_HWORD): Replace with more concise
+	expression.
+
+	* peicode.h (pe_ILF_build_a_bfd): Remove UL from hex constants.
+
+2000-04-12  Alan Modra  <alan@linuxcare.com.au>
+
+	* dep-in.sed: Match space before file name, not after.
+	* Makefile.am: Regenerate dependencies.
+	* Makefile.in: Regenerate.
+
+	* reloc.c (_bfd_relocate_contents): In complain_overflow_bitfield
+	case, allow address wrap-around stupidly removed 2000-03-17.  Sign
+	extend without an if statement.
+
+2000-04-11  Alan Modra  <alan@linuxcare.com.au>
+
+	* coff-mips.c (mips_gprel_reloc): Test for 16 bit range using
+	signed quantites.
+	* elf32-mips.c (gprel16_with_gp): Likewise.
+	* elf32-hppa.c (elf32_hppa_bfd_final_link_relocate): Test range
+	here using -0x40000, not (int)0xfffc0000.
+	(elf32_hppa_size_of_stub): Likewise.
+
+2000-04-11  Timothy Wall  <twall@cygnus.com>
+
+	* coff-tic54x.c: Now builds with all targets.
+	* Makefile.am: Add coff/tic54x.h to coff-tic54x.o dependencies.
+	* Makefile.in: Regenerate.
+	* coffcode.h (coff_set_arch_mach_hook): Eliminate warning on
+	unitialized variable.
+
+2000-04-07  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure.in (WARN_CFLAGS): Set to -W -Wall by default.  Add
+	--enable-build-warnings option.
+	* Makefile.am (AM_CFLAGS, WARN_CFLAGS): Add definitions.
+	* Makefile.in, configure: Re-generate.
+
+2000-04-07  Nick Clifton  <nickc@cygnus.com>
+
+	* reloc.c: Add BFD_RELOC_ARM_PCREL_BLX and
+	BFD_RELOC_THUMB_PCREL_BLX.
+
+	* elf32-arm.h (elf32_arm_final_link_relocate): Handle
+	R_ARM_XPC25 and R_ARM_THM_PC22.
+
+	* elfarm-nabi.c (elf32_arm_howto_): Fix definitions of
+	R_ARM_XPC25 and R_ARM_THM_XPC22.
+	(elf32_arm_reloc_map): Make BFD_RELOC_{ARM|THUMB}_PCREL_BLX to
+	R_ARM_[XPC25|THM_XPC22].
+
+	* elfarm-oabi.c: Define OLD_ARM_ABI and change include from
+	elf/arm-oabi.h to elf/arm.h
+
+	* Makefile.am: Fix dependency for elfarm-oabi.c
+	* Makefile.in: Regenerate.
+
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2000-04-06  Michael Snyder  <msnyder@seadog.cygnus.com>
+
+	* elfcore.h (elf_core_file_p): preserve value of tdata at entry,
+	and restore it on failure.  Release newly allocated tdata on
+	failure.
+
+2000-04-07  Jim Wilson  <wilson@cygnus.com>
+
+	* dwarf2.c (struct dwarf2_debug): New field dwarf_line_size.
+	(decode_line_info): Set it.  Report error if unit->line_offset is
+	equal to or larger than it.
+
+2000-04-07  Timothy Wall  <twall@cygnus.com>
+
+	* targets.c: Added vecs for tic54x.
+	* reloc.c: Added relocs for tic54x.
+	* libbfd.h: Regenerated.
+	* configure: Add TI COFF vecs for tic54x.
+	* configure.in: Ditto.
+	* config.bfd (targ_cpu): Recognize new tic54x target.
+	* coffcode.h (coff_slurp_symbol_table): Additions for TI COFF handling.
+	* bfd-in2.h: Add tic54x target and relocations.
+	* Makefile.am, Makefile.in: Add tic54x target.
+	* archures.c (bfd_archures_list): Add tic54x target.
+	* coff-tic54x.c: New.
+	* cpu-tic54x.c: New.
+
+2000-04-06  Michael Snyder  <msnyder@seadog.cygnus.com>
+
+	* elfcore.h (elf_core_file_p): call backend_object_p which
+	thereby gets an opportunity to update the arch/machine type.
+
+2000-04-06  Timothy Wall  <twall@cygnus.com>
+
+	* coffcode.h (coff_slurp_symbol_table): Handle C_STATLAB storage
+	class.  Handle SEC_CLINK and SEC_BLOCK flags.
+	* section.c: Add SEC_CLINK and SEC_BLOCK flags.
+	* bfd-in2.h: Add SEC_CLINK and SEC_BLOCK flags.
+
+2000-04-06  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-arm.h (elf32_arm_set_private_flags): Only check for
+	EF_INTERWORK if this is an unknown EABI.
+	(elf32_arm_merge_private_bfd_data): Check EABI version
+	numbers.  Only check EF_xxx flags if the EABI version number
+	is unknown.
+	(elf32_arm_check_private_bfd_data): Only check EF_xxx flags
+	if the EABI version number is unknown.
+	(elf32_arm_print_private_bfd_data): Only decode EF_xxx flags
+	if the EABI version number is unknown.
+
+2000-04-05  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+	* reloc.c (_bfd_relocate_contents): Add BFD_RELOC_SH_LOOP_START and
+	BFD_RELOC_SH_LOOP_END.
+	* elf32-sh.c (sh_elf_howto_tab): Change special_func to
+	sh_elf_ignore_reloc for all entries that sh_elf_reloc used to ignore.
+	Add entries for R_SH_LOOP_START and R_SH_LOOP_END.
+	(sh_elf_reloc_loop): New function.
+	(sh_elf_reloc): No need to test for always-to-be-ignored relocs
+	any more.
+	(sh_rel): Add entries for BFD_RELOC_SH_LOOP_{START,END}.
+	(sh_elf_relocate_section): Handle BFD_RELOC_SH_LOOP_{START,END}.
+	* bfd-in2.h, libbfd.h: Regenerate.
+
+2000-04-04  Alan Modra  <alan@linuxcare.com.au>
+
+	* po/bfd.pot: Regenerate.
+
+	* Makefile.am: Remove extraneous mkdep comment.
+	(MKDEP): Use gcc -MM rather than mkdep.
+	(DEP): Quote when passing vars to sub-make.  Add warning
+	message to end.
+	(DEP1): Rewrite for "gcc -MM".
+	(CLEANFILES): Add DEP2.
+	Update dependencies.
+	* Makefile.in: Regenerate.
+
+2000-04-03  Kevin Buettner  <kevinb@redhat.com>
+
+	* configure.in: Added corefile support for AIX 4.3.  In particular,
+	AIX_CORE_DUMPX_CORE will be defined in addition to AIX_CORE when
+	compiling rs6000-core.c.
+	* configure: Regenerated.
+
+2000-04-03  H.J. Lu  <hjl@gnu.org>
+
+	* cache.c (bfd_open_file): Unlink the output file only if
+	it has non-zero size.
+
+2000-04-01  Ken Block USG  <block@zk3.dec.com>
+
+	* elf64-alpha.c (elf64_alpha_relocate_section): Don't emit
+	relative relocations for non-loaded sections in shared objects.
+	(elf64_alpha_check_relocs): Similarly.
+
+2000-04-03  Hans-Peter Nilsson  <hp@axis.com>
+
+	* aoutx.h (NAME(aout,reloc_type_lookup)): Add BFD_RELOC_8 and
+	BFD_RELOC_16 to switch for extended relocs.
+	(MY_swap_ext_reloc_in): New.
+	(MY_swap_ext_reloc_out): New.
+	(NAME(aout,slurp_reloc_table)): Use MY_swap_ext_reloc_in rather
+	than NAME(aout,swap_ext_reloc_in) for extended relocs.
+	(NAME(aout,squirt_out_relocs)): Similarly use
+	MY_swap_ext_reloc_out.
+	(aout_link_reloc_link_order): Use MY_put_ext_reloc if defined.
+
+2000-04-03  Kazu Hirata  <kazu@hxi.com>
+
+	* coff-h8300.c (h8300_reloc16_extra_cases): Add bsr:16 -> bsr:8 to
+	the R_PCRWORD_B case.
+
+2000-03-31  Thomas de Lellis  <tdel@wrs.com>
+
+	* srec.c : Set CHUNK size to 16 bytes to prevent download failures
+	on some targets.
+	* ihex.c : Ditto.
+
+2000-03-30  Donald Lindsay  <dlindsay@cygnus.com>
+
+	* elf32-m32r.c (m32r_elf_generic_reloc): new function.  All
+	HOWTO references to bfd_elf_generic_reloc, that have
+	partial_inplace == true, now use the new function.  The function
+	is based on the recent rewrite of m32r_elf_lo16_reloc(), and
+	extends its fixes to the R_M32R_{16,24,32} relocs.
+	The new logic in m32r_elf_lo16_reloc() has been removed, and
+	it instead calls the new routine to obtain that functionality.
+
+2000-03-27  Alan Modra  <alan@linuxcare.com.au>
+
+	* elf32-avr.c (elf32_avr_gc_mark_hook, elf32_avr_gc_sweep_hook,
+	elf32_avr_check_relocs, avr_final_link_relocate,
+	elf32_avr_relocate_section, bfd_elf_avr_final_write_processing,
+	elf32_avr_object_p): Add prototypes.
+	(elf32_avr_gc_mark_hook): Add default for h->root.type.
+	(bfd_elf_avr_final_write_processing): Make static.
+
+2000-03-27  Denis Chertykov  <denisc@overta.ru>
+
+	* cpu-avr.c: New file.  BFD support routines for AVR architecture.
+	* archures.c (bfd_architecture): Add AVR architecture.
+	(bfd_archures_list): Add reference to AVR architecture info.
+	* elf.c (prep_headers): Handle bfd_arch_avr.
+	* reloc.c: Add various AVR relocation enums.
+	* targets.c (bfd_elf32_avr_vec): Declare and add to target vector
+	list.
+	* Makefile.am: Add support for AVR elf.
+	* configure.in: Likewise.
+	* config.bfd: Likewise.
+	* Makefile.in: Regenerate.
+	* configure: This too.
+	* bfd-in2.h: And this.
+	* libbfd.h: And this.
+
+2000-03-24  H.J. Lu  <hjl@gnu.org>
+
+	* elf64-alpha.c (elf64_alpha_merge_ind_symbols): Add prototype.
+	(elf64_alpha_find_reloc_at_ofs): Likewise.
+
+2000-03-17  Alan Modra  <alan@linuxcare.com.au>
+
+	* reloc.c (bfd_check_overflow): In case complain_overflow_bitfield,
+	flag an overflow if the bitfield is outside -2**n to 2**n-1.  The
+	allowable range used to be -2**(n-1) to 2**n-1.
+	* reloc.c (_bfd_relocate_contents): Same here.  Also replace
+	"boolean overflow" with "bfd_reloc_status_type flag".
+
+2000-03-14  Doug Evans  <dje@casey.transmeta.com>
+
+	* elf32-m32r.c (m32r_elf_lo16_reloc): Rewrite.
+
+2000-03-14  Kazu Hirata  <kazu@hxi.com>
+
+	* reloc16.c (bfd_coff_reloc16_relax_section): Count the total number
+	of shrinks properly, including the last reloc.
+
+2000-03-13  Kazu Hirata  <kazu@hxi.com>
+
+	* coff-h8300.c (h8300_reloc16_extra_cases): Fix the sanity
+	check for R_MOVL2.
+
+2000-03-11  Alan Modra  <alan@linuxcare.com.au>
+
+	* ieee.c (ieee_archive_p): Return bfd_error_wrong_format on
+	a format mismatch rather than an "error" from bfd_read such as
+	bfd_error_file_truncated.
+
+2000-03-10  Geoff Keating  <geoffk@cygnus.com>
+
+	* elf32-mips.c (_bfd_mips_elf_relocate_section): Do proper
+	sign-extension and big-endian compensation for
+	R_MIPS_64 even in ld -r.
+
+2000-03-10  Geoffrey Keating  <geoffk@cygnus.com>
+
+	* elf32-mips.c (mips_elf_next_relocation): Rename from
+	mips_elf_next_lo16_relocation, and generalize to look
+	for any relocation type.
+	(elf_mips_howto_table): Make R_MIPS_PC16 pcrel_offset.
+	(elf_mips_gnu_rel_hi16): Howto for R_MIPS_GNU_REL_HI16.
+	(elf_mips_gnu_rel_lo16): Howto for R_MIPS_GNU_REL_LO16.
+	(elf_mips_gnu_rel16_s2): Howto for R_MIPS_GNU_REL16_S2.
+	(elf_mips_gnu_pcrel64): Howto for R_MIPS_PC64.
+	(elf_mips_gnu_pcrel32): Howto for R_MIPS_PC32.
+	(bfd_elf32_bfd_reloc_type_lookup): Add new relocs.
+	(mips_rtype_to_howto): Likewise.
+	(mips_elf_calculate_relocation): Handle new relocs.
+	(_bfd_mips_elf_relocate_section): REL_HI16/REL_LO16 relocs
+	are paired.  The addend for R_MIPS_GNU_REL16_S2
+	is shifted right two bits.
+
+2000-03-10  Alan Modra  <alan@linuxcare.com.au>
+
+	* reloc.c (bfd_perform_relocation): Undo emacs formatting of
+	comment, and ensure it doesn't happen again.
+	(bfd_install_relocation): Same here.
+	(_bfd_relocate_contents): Don't bother assigning unused signmask
+	shift result.  Fix typos in comments.
+	Remove trailing whitespace throughout file.
+
+2000-03-07  Doug Evans  <dje@casey.transmeta.com>
+
+	* reloc.c (reloc_howto_struct): Fix partial_inplace comment.
+	* bfd-in2.h: Rebuild.
+
+2000-03-06  Nick Clifton  <nickc@cygnus.com>
+
+	* peicode.h (struct pe_ILF_vars): Add sym_ptr_table and
+	sym_ptr_ptr fields.
+	(SIZEOF_ILF_SYM_PTR_TABLE): Define.
+	(SIZEOF_ILF_STRINGS): Redefine.
+	(pe_ILF_make_a_symbol-reloc): New function.  Creates a symbol
+	relative reloc, as opposed to a section relative reloc.
+	(pe_ILF_make_a_symbol): Set the class of local symbols to C_STAT
+	not C_LABEL.
+	Add length of symbol's prefix to string pointer.
+	Store a pointer to the symbol in the symbol pointer table.
+	(pe_ILF_build_a_bfd): Do not build .idata$2 or .idata$7.
+	Initialise the symbol pointer table.
+	Store the hint in the Hint/Name table.
+	Make the jump reloc be symbol realtive, not section relative.
+	Create an import symbol for imported code.
+
+2000-03-06  Catherine Moore  <clm@cygnus.com>
+
+	* elf.c (swap_out_syms):  Check for null type_ptr.
+
+2000-03-01  Hans-Peter Nilsson  <hp@axis.com>
+
+	* aout-target.h (MY(write_object_contents)): Remove unused
+	and unusable "#if CHOOSE_RELOC_SIZE".
+	* pc532-mach.c (MY(write_object_contents)): Ditto.
+	* netbsd.h (MY(write_object_contents)): Ditto.
+	* hp300hpux.c (MY(write_object_contents)): Ditto.
+	* freebsd.h (MY(write_object_contents)): Ditto.
+	* aout-tic30.c (tic30_aout_write_object_contents): Ditto.
+
+2000-02-29  H.J. Lu  <hjl@gnu.org>
+
+	* peicode.h (jtab): Make it static.
+
+	* coff-sh.c (sh_align_load_span): Declared if COFF_WITH_PE is
+	defined and COFF_IMAGE_WITH_PE is not defined.
+	(_bfd_sh_align_load_span): Defined as sh_align_load_span if
+	COFF_WITH_PE is defined and COFF_IMAGE_WITH_PE is not defined.
+
+2000-03-01  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c (bfd_arm_process_before_allocation): Make
+	'symndx' signed to prevent compile time warning.
+
+	* coff-mcore.c: Remove unused prototype for pe_object_p.
+
+	* coff-sh.c: Add "#ifndef COFF_IMAGE_WITH_PE" around static
+	functions that are not used when COFF_IMAGE_WITH_PE is
+	defined.
+	(struct sh_opcode): Change type of 'flags' field to unsigned
+	long so that it can hold the USESAS flag.
+
+	* coffcode.h (styp_to_sec_flags): Initialise 'target_name'.
+
+	* elf-m10300.c (mn10300_elf_relax_section): Initialise
+	'sym_sec'.
+
+	* elf32-i370.c: Add ATTRIBUTE_UNUSED to unused function
+	parameters.
+	Remove unusued variables and code.
+	(elf_backend_add_symbol_hook): Fix prototype.
+
+	* elf32-m68k.c (elf_m68k_gc_sweep_hook): Initialise 'sgot' and
+	'srelgot'.
+
+	* elf32-mcore.c (mcore_elf_relocate_section): Initialise
+	'oldinst'.
+
+	* elf32-mips.c: Add ATTRIBUTE_UNUSED to unused function
+	parameters.
+	Remove unusued variables and code.
+	(elf_backend_add_symbol_hook): Fix prototype.
+
+	* elf32-sh.c (sh_elf_set_mach_from_flags): Use 'flags'.
+
+	* elflink.h (elf_bfd_link_add_symbols): Add ATTRIBUTE_UNUSED
+	to unused function parameter.
+
+	* pe-mips.c: Add ATTRIBUTE_UNUSED to unused function
+	parameters.
+	Use EMPTY_HOWTO to initialise empty howto slots.
+	Remove unused variables.
+
+	* peicode.h (pe_ILF_build_a_bfd): Initialise id6.
+
+2000-03-01  H.J. Lu  <hjl@gnu.org>
+
+	* aoutx.h (aout_link_input_section_std): Pass "true" to
+	the undefined_symbol callback.
+	(aout_link_input_section_ext): Likewise.
+	* bout.c (get_value): Likewise.
+	* coff-a29k.c (coff_a29k_relocate_section): Likewise.
+	* coff-alpha.c (alpha_ecoff_get_relocated_section_conten):
+	Likewise.
+	(alpha_relocate_section): Likewise.
+	* coff-arm.c (coff_arm_relocate_section): Likewise.
+	* coff-i960.c (coff_i960_relocate_section): Likewise.
+	* coff-mcore.c (coff_mcore_relocate_section): Likewise.
+	* coff-mips.c (mips_relocate_section): Likewise.
+	* coff-ppc.c (coff_ppc_relocate_section): Likewise.
+	* coff-sh.c (sh_relocate_section): Likewise.
+	* coff-tic80.c (coff_tic80_relocate_section): Likewise.
+	* cofflink.c (_bfd_coff_generic_relocate_section): Likewise.
+	* elf-m10200.c (mn10200_elf_relocate_section): Likewise.
+	* elf-m10300.c (mn10300_elf_relocate_section): Likewise.
+	* elf32-d10v.c (elf32_d10v_relocate_section): Likewise.
+	* elf32-fr30.c (fr30_elf_relocate_section): Likewise.
+	* elf32-hppa.c (elf32_hppa_relocate_section): Likewise.
+	* elf32-i370.c (i370_elf_relocate_section): Likewise.
+	* elf32-m32r.c (m32r_elf_relocate_section): Likewise.
+	* elf32-mcore.c (mcore_elf_relocate_section): Likewise.
+	* elf32-sh.c (sh_elf_relocate_section): Likewise.
+	* elf32-v850.c (v850_elf_relocate_section): Likewise.
+	* elflink.c (_bfd_elf_link_record_dynamic_symbol): Likewise.
+	* elflink.h (elf_link_output_extsym): Likewise.
+	* pe-mips.c (coff_pe_mips_relocate_section): Likewise.
+	* reloc.c (bfd_generic_get_relocated_section_conten): Likewise.
+	* reloc16.c (_bfd_ppc_xcoff_relocate_section): Likewise.
+
+	* elf-hppa.h (elf_hppa_relocate_section): Pass "false" to the
+	undefined_symbol callback when building shared library with
+	-Bsymbolic and undefined symbols are allowed. Otherwise, pass
+	"true".
+	* elf32-arm.h (elf32_arm_relocate_section): Likewise.
+	* elf32-i386.c (elf_i386_relocate_section): Likewise.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-mips.c (mips_elf_calculate_relocation): Likewise.
+	(elf32_mips_get_relocated_section_content): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relocate_section): Likewise.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+
+2000-02-28  Nick Clifton  <nickc@cygnus.com>
+
+	* Makefile.am: Add rules to build pe[i]-{sh|mips}.lo objects.
+	* Makefile.in: Regenerate.
+
+	* configure.in: Add support for mips and sh pe vectors.
+	* configure: regenerate.
+
+	* config.bfd: Add support for arm-wince, mips-pe and sh-pe
+	targets.
+
+	* targets.c: Add mips and sh pe vectors.
+
+	* libpei.h (coff_final_link_postscript): Only define if not
+	already defined.
+
+	* coffcode.h: Add support for WinCE magic numbers.
+
+	* peigen.c (pe_print_reloc): Update comment and rearrange
+	appending of newline character.
+
+	* peicode.h: Add support for Image Library Format.
+	(pe_ILF_vars): Structure containing data used by ILF code.
+	(pe_ILF_make_a_section): New function.  Create a section based
+	on ILF data.
+	(pe_ILF_make_a_reloc): New function.  Create a reloc based on
+	ILF data.
+	(pe_ILF_make_a_symbol): New function.  Create a symbol based
+	on ILF data.
+	(pe_ILF_save_relocs): New function.  Store the relocs created
+	by pe_ILF_make_a_reloc in a section.
+	(pe_ILF_build_a_bfd): New function.  Create a BFD describing
+	an ILF object.
+	(pe_ILF_object_p): New function.  Return a bfd_target pointer
+	for an ILF object.
+	(pe_bfd_object_p): If an ILF object is detected call
+	pe_ILF_object_p on it.
+
+	* coff-arm.c: Add support for WinCE relocs which are different
+	from normal ARM COFF relocs.
+	* pe-arm.c: Unset TARGET_UNDERSCORE for a WinCE target.
+
+	* coff-sh.c: Add support for sh-pe target.
+	* pe-sh.c: New file.  Support code for sh-pe target.
+	* pei-sh.c: New file.  Support code for sh-pe target.
+
+	* pe-mips.c: New file.  Support code for mips-pe target.
+	* pei-mips.c: New file.  Support code for mips-pe target.
+
+2000-02-27  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-sparc.c (elf32_sparc_merge_private_bfd_data): Don't bump
+	architecture if the object causing the bump is dynamic.
+	* elf64-sparc.c (sparc64_elf_merge_private_bfd_data): Likewise,
+	and also don't it for memory ordering.
+	(sparc64_elf_write_relocs): Take src_rela out of the loop.
+
+2000-02-27  Ian Lance Taylor  <ian@zembu.com>
+
+	* dwarf2.c (read_abbrevs): Use _raw_size directly rather than
+	calling bfd_get_section_size_before_reloc.
+	(decode_line_info): Likewise.
+	(_bfd_dwarf2_find_nearest_line): Likewise.
+
+2000-02-27  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* Makefile.am (stamp-lib): Use $(LIBTOOL) --config to get the
+	name of the libtool directory.
+	* Makefile.in: Rebuild.
+
+2000-02-25  Rodney Brown (RodneyBrown@pmsc.com)
+
+	* som.c (SOM_HOWTO): Define.
+	(som_hppa_howto_table): Use it.
+
+2000-02-25  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
+
+	* config.bfd: Enable 64 bit support for GNU/Linux/sparc.
+
+	* config.bfd: Enable 64 bit support for Solaris7+/sparc.
+
+2000-02-24  Catherine Moore  <clm@cygnus.com>
+
+	* som.c (som_misc_symbol_info):  Add field
+	secondary_def.
+	(som_bfd_derive_misc_symbol_info):  Initialize
+	secondary_def.
+	(som_build_and_write_symbol_table): Keep track
+	of secondary_def field.
+	(som_slurp_symbol_table): Set BSF_WEAK symbol flag
+	if secondary_def field is set.
+	(som_bfd_ar_write_symbol_stuff): Initialize
+	secondary_def.
+
+2000-02-23  Stephane Carrez  <stcarrez@worldnet.fr>
+
+	* dwarf2.c (read_address): Read 16-bits addresses.
+	(parse_comp_unit): Accept addr_size == 2.
+
+2000-02-23  Alan Modra  <alan@spri.levels.unisa.edu.au>
+
+	* bfd-in.h: Update copyright date.
+
+2000-02-23  Linas Vepstas <linas@linas.org>
+
+	* cpu-i370.c: New file.
+	* elf32-i370.c:  New file.
+	* archures.c (enum bfd_architecture): Add bfd_arch_i370.
+	(bfd_i370_arch): New.
+	(bfd_archures_list): Add bfd_i370_arch.
+	* elf.c (prep_headers): Add bfd_arch_i370.
+	* Makefile.am: Add support for IBM 370 elf.
+	* config.bfd: Likewise.
+	* configure.in: Likewise.
+	* libbfd.h (bfd_reloc_code_real_names): Likewise.
+	* reloc.c (bfd_reloc_code_type): Likewise.
+	* targets.c: Likewise.
+
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2000-02-22  Ian Lance Taylor  <ian@zembu.com>
+
+	* elf32-i386.c (elf_i386_info_to_howto_rel): Give a warning for
+	invalid relocation types, and change them to R_386_NONE.
+
+2000-02-22  H.J. Lu  <hjl@gnu.org>
+
+	* elflink.h (elf_link_add_object_symbols): If a version symbol is
+	not defined, don't add a second ELF_VER_CHR.
+
+	* elflink.h (elf_bfd_final_link): Call output_extsym for global
+	symbols converted to local symbols even when stripping all
+	symbols.
+	(elf_link_output_extsym): Process global symbols converted to
+	local symbols even if they are being stripped.
+
+2000-02-21  Alan Modra  <alan@spri.levels.unisa.edu.au>
+
+	* archures.c (bfd_octets_per_byte): Return unsigned int.
+	(bfd_arch_mach_octets_per_byte): Ditto.
+	* libbfd.c (bfd_read, bfd_seek): Quell signed vs. unsigned
+	comparison warning.
+	* section.c (bfd_get_section_size_before_reloc): Quell signed
+	vs. unsigned comparison warning.
+	(bfd_get_section_size_after_reloc): Same here.  Fix parentheses too.
+	* trad-core.c (trad_unix_core_file_p): Correct 2000-01-27
+	change.  What was I thinking?
+	* bfd-in2.h: Regenerate.
+
+	* elflink.h (elf_gc_sweep): Skip non-elf input bfds.
+	(elf_gc_sections): Same here.
+	(elf_gc_common_finalize_got_offsets): And here.
+
+2000-02-21  Ian Lance Taylor  <ian@zembu.com>
+
+	ELF HPPA doesn't work at present; remove it until it does.
+	* config.bfd: Comment out setting targ_defvec to
+	bfd_elf32_hppa_vec.
+	* Makefile.am: Rebuild dependencies.
+	(BFD32_BACKENDS): Remove elf32-hppa.lo.
+	(BFD32_BACKENDS_CFILES): Remove elf32-hppa.c.
+	(SOURCE_HFILES): Remove elf32-hppa.h and hppa_stubs.h.
+	* Makefile.in: Rebuild.
+	* targets.c (bfd_target_vector): Comment out bfd_elf32_hppa_vec.
+
+2000-02-18  Geoff Keating  <geoffk@cygnus.com>
+
+	* coffcode.h (coff_set_arch_mach_hook): Use free(), because there
+	is no bfd_free().  Revert bfd_free part of previous change.
+
+2000-02-18  Geoff Keating  <geoffk@cygnus.com>
+
+	* coffcode.h (coff_set_arch_mach_hook): Don't use variable-size
+	arrays.
+	(coff_compute_section_file_positions): Use bfd_free to pair
+	bfd_malloc.
+	(coff_write_object_contents): Likewise.
+
+	* coff-rs6000.c (xcoff_howto_table_16): New variable.
+	(xcoff_rtype2howto): Handle 16-bit variants of 32-bit relocs.
+
+2000-02-18  Ulrich Drepper  <drepper@cygnus.com>
+
+	* coff-rs6000.c (XCOFFARMAGBIG): New macro.
+	(xcoff_ar_file_hdr_big): New structure.
+	(SIZEOF_AR_FILE_HDR_BIG): New macro.
+	(xcoff_ar_hdr_big): New structure.
+	(SIZEOF_AR_HDR_BIG): New macro.
+	(xcoff_big_format_p): New macro.
+	(xcoff_ardata_big): New macro.
+	(arch_xhdr_big): New macro.
+	(xcoff_slurp_armap): Handle large archives.
+	(xcoff_archive_p): Detect large archives.
+	(xcoff_read_ar_hdr): Handle large archives.
+	(xcoff_openr_next_archived_file): Handle large archives.
+	(xcoff_generic_stat_arch_elt): Handle large archives.
+	(xcoff_write_armap_old): Rename from xcoff_write_armap.
+	(xcoff_write_armap_big): New function.
+	(xcoff_write_armap): New function, dispatch to _old or _big.
+	(xcoff_write_archive_contents_old): Rename from
+	xcoff_write_archive_contents.
+	(xcoff_write_archive_contents_big): New function.
+	(xcoff_write_archive_contents): New function, dispatch to _old or
+	_big.
+
+2000-02-18  Richard Henderson  <rth@cygnus.com>
+
+	* elf-bfd.h (struct elf_link_hash_table): Remove copy_indirect
+	and hide_symbol members.
+	(elf_link_hash_copy_indirect): Remove.
+	(elf_link_hash_hide_symbol): Remove.
+	(struct elf_backend_data): Add elf_backend_copy_indirect_symbol
+	and elf_backend_hide_symbol.
+	(_bfd_elf_link_hash_copy_indirect): Declare.
+	(_bfd_elf_link_hash_hide_symbol): Declare.
+	* elf.c (_bfd_elf_link_hash_copy_indirect): Remove table argument.
+	(_bfd_elf_link_hash_hide_symbol): Likewise.
+	(_bfd_elf_link_hash_table_init): Don't init killed members.
+	* elflink.h (elf_link_add_object_symbols): Use the bed function
+	pointers not elf_link_hash_{copy_indirect,hide_symbol}.
+	(elf_link_assign_sym_version): Likewise.
+	* elfxx-target.h (elf_backend_copy_indirect_symbol): Default.
+	(elf_backend_hide_symbol): Likewise.
+	(elfNN_bed): Update for new members.
+
+2000-02-17  Kevin Buettner  <kevinb@redhat.com>
+
+	* rs6000-core.c (CORE_DATA_SIZE_FIELD, CORE_COMM_FIELD, SAVE_FIELD,
+	STACK_END_ADDR): Define for new core file format.
+	(LOADER_OFFSET_FIELD, LOADER_REGION_SIZE, CORE_DUMP): New defines
+	for handling the vagaries of the various core file structures used
+	by AIX over the years.
+	(rs6000coff_core_p, rs6000coff_core_file_matches_executable,
+	Rs6kCorData): Use above defines to adapt code to use AIX 4.3's
+	core_dumpx structure.
+
+2000-02-17  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+	* archures.c (bfd_mach_sh2, bfd_mach_sh_dsp): New macros.
+	(bfd_mach_sh3_dsp): Likewise.
+	(bfd_mach_sh4): Reinstate.
+	(bfd_default_scan): Recognize 7410, 7708, 7729 and 7750.
+	* bfd-in2.h: Regenerate.
+	* coff-sh.c (struct sh_opcode): flags is no longer short.
+	(USESAS, USESAS_REG, USESR8, SETSAS, SETSAS_REG): New macros.
+	(sh_opcode41, sh_opcode42): Integrate as sh_opcode41.
+	(sh_opcode01, sh_opcode02, sh_opcode40): Add sh-dsp opcodes.
+	(sh_opcode41, sh_opcode4, sh_opcode80): Likewise.
+	(sh_opcodes): No longer const.
+	(sh_dsp_opcodef0, sh_dsp_opcodef): New arrays.
+	(sh_insn_uses_reg): Check for USESAS and USESR8.
+	(sh_insn_sets_reg, sh_insns_conflict): Check for SETSAS.
+	(_bfd_sh_align_load_span): Return early for SH4.
+	Modify sh_opcodes lookup table for sh-dsp / sh3-dsp.
+	Take into account that field b of a parallel processing insn
+	could be mistaken for a separate insn.
+	* cpu-sh.c (arch_info_struct): New array elements for
+	sh2, sh-dsp and sh3-dsp.
+	Reinstate element for sh4.
+	(SH2_NEXT, SH_DSP_NEXT, SH3_DSP_NEXT): New macros.
+	(SH4_NEXT): Reinstate.
+	(SH3_NEXT, SH3E_NEXT): Adjust.
+	* elf-bfd.h (_sh_elf_set_mach_from_flags): Declare.
+	* elf32-sh.c (sh_elf_set_private_flags): New function.
+	(sh_elf_copy_private_data, sh_elf_set_mach_from_flags): Likewise.
+	(sh_elf_merge_private_data): New function.
+	(elf_backend_object_p, bfd_elf32_bfd_set_private_bfd_flags): Define.
+	(bfd_elf32_bfd_copy_private_bfd_data): Define.
+	(bfd_elf32_bfd_merge_private_bfd_data): Change to
+	sh_elf_merge_private_data.
+
+2000-02-13  Richard Henderson  <rth@cygnus.com>
+
+	* elf-bfd.h (struct elf_link_hash_table): Add copy_indirect and
+	hide_symbol members.
+	(elf_link_hash_copy_indirect): New.
+	(elf_link_hash_hide_symbol): New.
+	* elflink.h (elf_link_add_object_symbols): Break out copy from
+	indirect new new symbol to elf.c.
+	(elf_link_assign_sym_version): Break out privatization of
+	non-exported symbol to elf.c.
+	* elf.c (_bfd_elf_link_hash_copy_indirect): New.
+	(_bfd_elf_link_hash_hide_symbol): New.
+	(_bfd_elf_link_hash_table_init): Init copy_indirect and hide_symbol.
+
+2000-02-13  Ian Lance Taylor  <ian@zembu.com>
+
+	* section.c (_bfd_strip_section_from_output): Add info parameter.
+	If it passed as non-NULL, use it to check whether any input BFD
+	has an input section which uses this output section.  Change all
+	callers.
+	* bfd-in2.h: Rebuild.
+
+	* bfd-in.h: Move declarations of bfd_get_elf_phdr_upper_bound and
+	bfd_get_elf_phdrs in from bfd-in2.h, correcting patch of
+	1999-11-29.
+	* bfd-in2.h: Rebuild.
+
+2000-02-10  Timothy Wall  <twall@cygnus.com>
+
+	* coffswap.h (coff_swap_sym_in): Add hook SWAP_SYM_IN_POST to
+	allow final modifications of swapped-in symbol.
+	(coff_swap_sym_out): Ditto with SWAP_SYM_OUT_POST.
+	* coffcode.h (coff_write_relocs): Use macro
+	SECTION_RELATIVE_ABSOLUTE_SYMBOL_P if defined to determine whether
+	symbol index should be set to -1.
+
+2000-02-10  Toshiyasu Morita (toshi.morita@sega.com)
+
+	* coff-sh.c (USES1_REG, USES2_REG, SETS1_REG, SETS2_REG,
+	USESF1_REG, USESF2_REG, SETSF1_REG, SETSF2_REG): New macros.
+	* (sh_insn_sets_reg, sh_insn_sets_freg): New prototypes.
+	* (sh_insn_sets_reg, sh_insn_uses_or_sets_reg, sh_insns_sets_freg,
+	sh_insns_uses_or_sets_freg): New functions.
+	* (sh_insn_uses_reg, sh_insn_uses_freg): Use new macros.
+	* (sh_insns_conflict): Use new functions and new macros to
+	detect conflicts when two instructions both set same integer registers,
+	both set same fp register, and both set special register.
+
+2000-02-09  Timothy Wall  <twall@cygnus.com>
+
+	* coffgen.c (coff_real_object_p): Set arch/mach info prior to
+	swapping in sections, so that the swapping routines have access to
+	the arch/mach info.
+
+2000-02-08 Mark Elbrecht <snowball3@bigfoot.com>
+
+	* coff-go32.c: Update comment. Update copyright.
+
+2000-01-27  Thomas de Lellis  <tdel@windriver.com>
+
+	* syms.c (bfd_decode_symclass)
+	Two new class characters were added - 'V' and 'v'.  The
+	meaning of 'W' is now restricted to just weak non-object
+	symbols.  This allows differentiation between, for example,
+	weak functions vs weak objects.  nm for example now dumps:
+	'W' = weak global
+	'w' = weak unresolved
+	'V' = weak global object
+	'v' = weak unresolved object
+
+	(bfd_is_undefined_symclass): New function.  Return true if the
+	given symbol class represents and undefined/unresolved symbol.
+
+	(bfd_symbol_info): Use bfd_is_undefined_symclass to check for
+	unresolved symbols.
+
+	* bfd-in2.h: Add prototype for bfd_is_undefined_symbol().
+
+	* elf32-arm.h (elf32_arm_get_symbol_type): If a symbol has the
+	STT_ARM_16BIT flag set, but it is not attached to a data object
+	return STT_ARM_16BIT so that it will be treated as code by the
+	disassembler.
+
+2000-01-27  Alan Modra  <alan@spri.levels.unisa.edu.au>
+
+	* coff-i386.c (i3coff_object_p): Remove prototype.
+	Update copyright.
+
+	* elflink.c (_bfd_elf_link_record_dynamic_symbol): Add const
+	to name.  Update copyright.
+
+	* trad-core.c (trad_unix_core_file_p): Cast core_regsec
+	assignment to avoid warning.  Update copyright.
+
+2000-01-24  Robert Lipe  (robertl@sco.com)
+
+	* coffcode.h (coff_write_object_contents): Get buff via bfd_malloc
+	instead of using GNU C extension.
+
+2000-01-21  Nick Clifton  <nickc@cygnus.com>
+
+	* libbfd.c (bfd_read): Do not attempt to get a negativly sized
+	amount from a bfd_in_memory structure.
+	(bfd_seek): Do not allow seeks past the end of a bfd_in_memory
+	structure.
+
+2000-01-14  Nick Clifton  <nickc@cygnus.com>
+
+	* linker.c (default_indirect_link_order): oops - fix incorrectly
+	applied patch from Tim Wall.
+
+2000-01-13  Timothy Wall (twall@tiac.net>
+
+	* coffcode.h: Use bfd_coff_xxx instead of the macro XXX (where xxx
+	= scnhsz, filhsz, relsz, aoutsz, etc)
+
+	* coffswap.h: Ditto.
+
+2000-01-13  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-arm.h (elf32_thumb_to_arm_stub): Fix offset in branch to
+	interwork thumb to arm stub.
+
+2000-01-13  Timothy Wall (twall@tiac.net>
+
+	* archures.c (bfd_octets_per_byte): New function: Return
+	target byte size.
+	(bfd_arch_mach_octets_per_byte): New function: Return target
+	byte size.
+
+	* section.c: Distinguish between octets and bytes for usage of
+	_cooked_size,  _raw_size, and output_offset.  Clarify
+	description of bfd_set_section_contents.
+
+	* bfd-in2.h: Regenerate.
+
+	* coffgen.c: Indicate that the offset parameter is in bytes, not
+	octets.
+
+	* cofflink.c (bfd_coff_link_input_bfd): Use bfd_octets_per_byte
+	where appropriate to get the octet offset when calling
+	bfd_set_section_contents.
+	(bfd_coff_reloc_link_order): Ditto.
+
+	* linker.c (bfd_generic_reloc_link_order): Ditto.
+	(_bfd_default_link_order): Ditto.
+
+	* reloc.c (bfd_perform_relocation):  Distinguish between octets
+	and bytes.  Use octets when indexing into octet data; use bytes
+	when calculating target addresses.
+	(bfd_install_relocation): Ditto.
+
+	* srec.c (srec_write_section): Ditto.
+
+2000-01-13  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-mcore.c (COFF_DEFAULT_SECTION_ALIGNMENT_POWER): Change from
+	3 to 2.  This allows 4 byte sized sections, which is necessary for
+	dlltool to build functioning DLLs.
+
+2000-01-10  Philip Blundell  <pb@futuretv.com>
+
+	* config.bfd (arm*-*-linux-gnu*): Match instead of arm*-*-linux-gnu.
+	(arm*-*-conix*): New target.
+
+2000-01-10  Egor Duda  <deo@logos-m.ru>
+
+	* config.bfd: Include elf32_i386 vector to target list for cygwin
+	and mingw.
+
+	* config.in: Undefine HAVE_WIN32_PSTATUS_T.
+	* configure.in: Test for structure win32_pstatus_t in
+	<sys/procfs.h>
+	* configure: Regenerate.
+
+	* elf.c (elfcore_grok_win32pstatus): New function: process
+	win32_pstatus_t notes in elf core file.
+	(elfcore_grok_note): Detect win32_pstatus notes.
+
+2000-01-03  Martin v. Loewis  <loewis@informatik.hu-berlin.de>
+
+	* elflink.c (_bfd_elf_link_record_dynamic_symbol): Process symbol
+	visibility.
+	* elflink.h (elf_link_add_object_symbols): Combine visibilities.
+	* elf.c (bfd_elf_print_symbol): Interpret st_other as visibility.
+
+For older changes see ChangeLog-9899
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-0203 sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-0203
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-0203	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-0203	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,11405 @@
+2003-12-19  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
+
+	Adfd m32r-linux and PIC support.  Add new ABI that uses RELA.
+	* config.bfd (m32r*-*-linux*, m32r*le-*-linux*, m32r*le-*-*): Added.
+	* configure.in (bfd_elf32_m32rlin_vec, bfd_elf32_m32rlelin_vec,
+	bfd_elf32_m32rle_vec): Added
+	* configure: Regenerated.
+	* elf32-m32r.c (m32r_info_to_howto, m32r_elf_adjust_dynamic_symbol,
+	m32r_elf_size_dynamic_sections, m32r_elf_create_dynamic_sections,
+	m32r_elf_finish_dynamic_sections, m32r_elf_finish_dynamic_symbol,
+	allocate_dynrelocs, readonly_dynrelocs, m32r_elf_reloc_type_class,
+	m32r_elf_fake_sections): Added.
+	(m32r_elf_howto_table): Added
+	R_M32R_16_RELA, R_M32R_32_RELA, R_M32R_24_RELA,
+	R_M32R_10_PCREL_RELA, R_M32R_18_PCREL_RELA,
+	R_M32R_26_PCREL_RELA, R_M32R_HI16_ULO_RELA,
+	R_M32R_HI16_SLO_RELA, R_M32R_LO16_RELA,
+	R_M32R_SDA16_RELA, R_M32R_RELA_GNU_VTINHERIT,
+	R_M32R_RELA_GNU_VTENTRY, R_M32R_GOT24,
+	R_M32R_26_PLTREL, R_M32R_COPY, R_M32R_GLOB_DAT,
+	R_M32R_JMP_SLOT, R_M32R_RELATIVE, R_M32R_GOTOFF,
+	R_M32R_GOTPC24, R_M32R_GOT16_HI_ULO,
+	R_M32R_GOT16_HI_SLO, R_M32R_GOT16_LO,
+	R_M32R_GOTPC_HI_ULO, R_M32R_GOTPC_HI_SLO,
+	R_M32R_GOTPC_LO.
+	(m32r_elf_relocate_section, m32r_elf_check_relocs): Changed for
+	New ABI.
+	* reloc.c: Add BFD_RELOC_M32R_GOT24, BFD_RELOC_M32R_26_PLTREL,
+	BFD_RELOC_M32R_COPY, BFD_RELOC_M32R_GLOB_DAT,
+	BFD_RELOC_M32R_JMP_SLOT, BFD_RELOC_M32R_RELATIVE,
+	BFD_RELOC_M32R_GOTOFF, BFD_RELOC_M32R_GOTPC24,
+	BFD_RELOC_M32R_GOT16_HI_ULO, BFD_RELOC_M32R_GOT16_HI_SLO,
+	BFD_RELOC_M32R_GOT16_LO, BFD_RELOC_M32R_GOTPC_HI_ULO,
+	BFD_RELOC_M32R_GOTPC_HI_SLO, BFD_RELOC_M32R_GOTPC_LO.
+	* targets.c (bfd_elf32_m32rlin_vec, bfd_elf32_m32rlelin_vec,
+	bfd_elf32_m32rle_vec): Added.
+	* bfd-in2.h: Regenerated.
+	* libbfd.h: Regenerated.
+
+2003-12-19  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* coffcode.h (styp_to_sec_flags): Don't treat .reloc section
+	as SEC_DEBUGGING.
+
+2003-12-18  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elf32-mips.c (elf_mips_howto_table_rel): Replace all uses of
+	mips_elf_generic_reloc with _bfd_mips_elf_generic_reloc.  Use
+	_bfd_mips_elf_hi16_reloc for R_MIPS_HI16 and R_MIPS_GNU_REL_HI16,
+	_bfd_mips_elf_lo16_reloc for R_MIPS_LO16 and R_MIPS_GNU_REL_LO16,
+	and _bfd_mips_elf_got16_reloc for R_MIPS_GOT16.  Change rightshift
+	to 16 for R_MIPS_HI16 and R_MIPS_GNU_REL_HI16.
+	(mips_elf_generic_reloc, struct mips_hi16, mips_elf_hi16_reloc)
+	(mips_elf_lo16_reloc, mips_elf_got16_reloc): Delete.
+	(_bfd_mips_elf32_gprel16_reloc): Remove special case.
+	(mips_elf_gprel32_reloc, mips32_64bit_reloc): Likewise.
+
+	* elf64-mips.c (mips_elf64_howto_table_rel): Replace all uses of
+	mips_elf_generic_reloc with _bfd_mips_elf_generic_reloc.  Use
+	_bfd_mips_elf_hi16_reloc for R_MIPS_HI16, _bfd_mips_elf_lo16_reloc
+	for R_MIPS_LO16 and _bfd_mips_elf_got16_reloc for R_MIPS_GOT16.
+	Change R_MIPS_HI16's rightshift to 16.
+	(mips_elf64_howto_table_rela): Replace all uses of
+	mips_elf_generic_reloc with _bfd_mips_elf_generic_reloc.
+	Use _bfd_mips_elf_generic_reloc for R_MIPS_GOT16 as well.
+	(mips_elf64_hi16_reloc, mips_elf64_got16_reloc): Delete.
+	(mips_elf64_shift6_reloc): Remove special case.  Use
+	_bfd_mips_elf_generic_reloc instead of returning bfd_reloc_continue.
+
+	* elfn32-mips.c (prev_reloc_section): Delete.
+	(prev_reloc_address, prev_reloc_addend): Delete.
+	(elf_mips_howto_table_rel, elf_mips_howto_table_rela): As for
+	elf64-mips.c
+	(GET_RELOC_ADDEND, SET_RELOC_ADDEND): Delete.
+	(mips_elf_generic_reloc, struct mips_hi16, mips_elf_hi16_reloc)
+	(mips_elf_lo16_reloc, mips_elf_got16_reloc): Delete.
+	(mips_elf_gprel16_reloc): Delete use of GET_RELOC_ADDEND.
+	(mips_elf_literal_reloc, mips_elf_gprel32_reloc): Likewise.
+	(mips16_jump_reloc, mips16_gprel_reloc): Likewise.
+	(mips_elf_shift6_reloc): Likewise.  Delete use of SET_RELOC_ADDEND.
+
+	* elfxx-mips.c (_bfd_mips_elf_gprel16_with_gp): Use
+	_bfd_relocate_contents to install an in-place addend.
+	(mips_hi16): New structure.
+	(mips_hi16_list): Moved from elf32-mips.c.
+	(_bfd_mips_elf_hi16_reloc, _bfd_mips_elf_got16_reloc): New functions.
+	(_bfd_mips_elf_lo16_reloc, _bfd_mips_elf_generic_reloc): New functions.
+	(mips_elf_calculate_relocation): Assume addend is unshifted.
+	(_bfd_mips_elf_relocate_section): Don't apply the howto rightshift
+	on top of the usual high-part shift.  Don't shift the addend right
+	before calling mips_elf_calculate_relocation.
+
+	* elfxx-mips.h (_bfd_mips_elf_hi16_reloc): Declare.
+	(_bfd_mips_elf_got16_reloc, _bfd_mips_elf_lo16_reloc): Declare.
+	(_bfd_mips_elf_generic_reloc): Declare.
+
+2003-12-16  Eric Youngdale  <eric@mkssoftware.com>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* peicode.h (pe_ILF_build_a_bfd): Only skip one instance of each
+	prefix character, if they are present.
+
+2003-12-15  Dmitry Semyonov  <Dmitry.Semyonov@oktet.ru>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Ensure that correct flags
+	are set on known section types.
+
+2003-12-12  Nick Clifton  <nickc@redhat.com>
+
+	* po/ro.po: Updated translation.
+
+2003-12-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-hppa.c (elf64_hppa_link_output_symbol_hook): Check for
+	NULL dyn_h.
+
+2003-12-11  Nick Clifton  <nickc@redhat.com>
+
+	* elf.c (INCLUDE_SECTION_IN_SEGMENT): Skip PT_GNU_STACK segments.
+
+2003-12-08  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elfxx-mips.h, elfxx-mips.c, cpu-mips.c: Convert prototypes.
+	Remove casts that were only needed for K&R compatibility.
+
+2003-12-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_backend_data): Remove "bfd *" and add
+	"elflink_hash_entry *" param to elf_backend_link_output_symbol_hook.
+	Add "elflink_hash_entry *" param to elf_backend_output_arch_syms.
+	* elflink.h (elf_link_output_sym): Add "elflink_hash_entry *" param,
+	and pass to output_symbol_hook.
+	(elf_bfd_final_link): Adjust elf_link_output_sym calls.
+	(elf_link_output_extsym): Likewise.
+	(elf_link_input_bfd): Likewise.
+	* elf32-sh64.c (sh64_elf_link_output_symbol_hook): Adjust.
+	* elf32-v850.c (v850_elf_link_output_symbol_hook): Likewise.
+	* elf64-mmix.c (mmix_elf_link_output_symbol_hook): Likewise.
+	* elf64-sh64.c (sh64_elf64_link_output_symbol_hook): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_link_output_symbol_hook): Likewise.
+	* elfxx-mips.h (_bfd_mips_elf_link_output_symbol_hook): Likewise.
+	* elf64-sparc.c (sparc64_elf_output_arch_syms): Likewise.
+	* elf64-hppa.c (elf64_hppa_link_output_symbol_hook): Likewise.
+	Validate dynh->h against h.
+	* elf64-ppc.c (struct ppc_link_hash_entry): Add adjust_done bitfield.
+	(link_hash_newfunc): Init it.
+	(adjust_opd_syms): New function.
+	(ppc64_elf_edit_opd): Set adjust_done when global .opd sym adjusted.
+	Set opd.adjust for all .opd relocs.  Call adjust_opd_syms.
+	(ppc64_elf_tls_optimize): Adjust possible .opd sym values here.
+	(ppc64_elf_relocate_section): Also adjust syms not a multiple of 24.
+	(ppc64_elf_output_symbol_hook): New function.
+	(elf_backend_link_output_symbol_hook): Define.
+
+2003-12-07  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elf32-mips.c, elfn32-mips.c, elf64-mips.c: Convert prototypes.
+	Remove casts that were only needed for K&R compatibility.
+
+2003-12-05  Dmitry Semyonov  <Dmitry.Semyonov@oktet.ru>
+
+	* coff-arm.c (aoutarm_std_reloc_howto [ARM_WINCE]): Set
+	partial_inplace for these relocs to FALSE for comptability with
+	the MS linker.
+	Remap ARM_26D relocation from 5 to 0. This fixes "bad fixup" error
+	generated by MS linker, and brings the relocation in line the MS
+	PE documentation.
+
+2003-12-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-ppc.c (ppc_elf_relax_section): Don't check relax_finalizing.
+
+2003-12-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Use the
+	need_relax_finalize field in link_info instead of
+	relax_finalizing to check if the relax finalize pass is being
+	done.
+
+2003-12-04  Dmitry Semyonov  <Dmitry.Semyonov@oktet.ru>
+
+	* coff-arm.c (coff_arm_relocate_section, bfd_arm_process_before_allocation):
+	Change ARM26* to ARM_26* in comments to match definitions.
+	(coff_arm_adjust_symndx): Replace hard-coded constants with
+	appropriate definitions (ARM_26*).
+
+2003-12-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* coff-i860.c (coff_i860_reloc_nyi): Return bfd_reloc_not_supported.
+	* elf-m10300.c (elf32_mn10300_finish_hash_table_entry): Warning fixes.
+	(mn10300_elf_relax_section): Likewise.
+	* nlm32-alpha.c (ONES): Define.
+	(nlm32_alpha_howto_table): Use it to avoid warnings.
+
+2003-12-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-i386.c (elf_i386_object_p): Delete.
+	(elf_backend_object_p): Don't define.
+	* elf32-s390.c (elf_s390_object_p): No need to alloc tdata here.
+	* elf32-sh.c (sh_elf_object_p): Likewise.
+	* elf32-sparc.c (elf32_sparc_object_p): Likewise.
+	* elf64-alpha.c (elf64_alpha_object_p): Likewise.
+	* elf64-s390.c (elf_s390_object_p): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_elf_object_p): Likewise.
+
+2003-12-03  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
+
+	* archures.c (bfd_mach_m32r2): Add new machine type.
+	* bfd-in2.h: Regenerate.
+	* cpu-m32r.c : Add new machine type.
+	* elf32-m32r.c (m32r_elf_object_p, m32r_elf_final_write_processing,
+	m32r_elf_merge_private_bfd_data): Add support for new machine
+	type.
+
+2003-12-03  Dave Airlie  <airlied@linux.ie>
+
+	* config.bfd: Add vax-linux-gnu target.
+	* configure.in: Likewise.
+	* configure: Regenerate.
+
+2003-12-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* ecoff.c (ecoff_link_add_archive_symbols): Update for renamed
+	bfd_link_hash_entry field "next" -> "und_next".
+	* linker.c (_bfd_link_hash_newfunc): Likewise.
+	(bfd_link_add_undef): Likewise.
+	(_bfd_generic_link_add_archive_symbols): Likewise.
+	(_bfd_generic_link_add_one_symbol): Likewise.
+	* xcofflink.c (xcoff_link_add_symbols): Likewise.
+
+2003-12-02  Nick Clifton  <nickc@redhat.com>
+
+	* configure.in (ALL_LINGUAS): Add ro.
+	* po/ro.po: New Romanian translation.
+
+2003-12-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2003-12-01  Dmitry Semyonov  <Dmitry.Semyonov@oktet.ru>
+
+	* coffcode.h (coff_compute_section_file_positions): Set page_size
+	to 1 instead of 0 in the case file alignment value is zero.
+
+2003-12-01  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* coff-rs6000.c: Remove ARGSUSED and VARARGS.
+	* coff64-rs6000.c: Likewise.
+	* coffcode.h: Likewise.
+	* elf32-vax.c: Likewise.
+	* hash.c: Likewise.
+	* hppabsd-core.c: Likewise.
+	* hpux-core.c: Likewise.
+	* ihex.c: Likewise.
+	* netbsd-core.c: Likewise.
+	* osf-core.c: Likewise.
+	* pdp11.c: Likewise.
+	* ptrace-core.c: Likewise.
+	* sco5-core.c: Likewise.
+	* section.c: Likewise.
+	* sunos.c: Likewise.
+	* trad-core.c: Likewise.
+
+2003-12-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (is_elf_hash_table): Take hash tab rather than info arg.
+	* elf.c (_bfd_elf_merge_sections): Adjust to suit.
+	(_bfd_elf_link_just_syms): Likewise.
+	(bfd_elf_get_needed_list): Likewise.
+	(bfd_elf_get_runpath_list): Likewise.
+	(_bfd_elf_link_hash_copy_indirect): Remove unneeded parens.
+	* elf32-hppa.c (elf32_hppa_setup_section_lists): Don't check hash tab
+	creator flavour.
+	(elf32_hppa_set_gp): Look up output sections rather than using htab.
+	* elf32-i960.c: Comment fix.  Formatting.
+	* elf32-m32r.c (m32r_elf_add_symbol_hook): Use is_elf_hash_table
+	rather than testing creator flavour.
+	* elf32-sh64.c (sh64_elf_add_symbol_hook): Likewise.
+	* elf64-sh64.c (sh64_elf64_add_symbol_hook): Likewise.
+	* elflink.c (_bfd_elf_link_create_dynamic_sections): Adjust for
+	is_elf_hash_table change.  Remove redundant test.
+	(bfd_elf_record_link_assignment): Use is_elf_hash_table rather than
+	testing creator flavour.
+	(elf_link_record_local_dynamic_symbol): Adjust for is_elf_hash_table.
+	(_bfd_elf_fix_symbol_flags): Likewise.
+	(_bfd_elf_adjust_dynamic_symbol): Likewise.
+	* elflink.h (elf_link_add_object_symbols): Likewise.  Remove redundant
+	checks.  Use is_elf_hash_table rather than testing creator flavour.
+	Use hash_table throughout in place of info->hash.
+	(elf_add_dynamic_entry): Adjust for is_elf_hash_table change.
+	(NAME(bfd_elf,size_dynamic_sections)): Likewise.  Remove redundant
+	check.
+	(elf_bfd_final_link): Adjust for is_elf_hash_table change.
+	(elf_link_check_versioned_symbol): Use is_elf_hash_table rather than
+	testing creator flavour.
+	(elf_gc_sections): Add is_elf_hash_table check.
+	(elf_gc_common_finalize_got_offsets): Likewise.
+	(elf_bfd_discard_info): Adjust for is_elf_hash_table change.  Remove
+	redundant check.
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Use is_elf_hash_table
+	rather than testing creator flavour.
+
+2003-11-28  Christian Groessler  <chris@groessler.org>
+
+	* cpu-z8k.c: Convert to ISO C90.
+	* coff-z8k.c: Likewise.
+
+2003-11-27  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf-bfd.h (elf_backend_data::elf_backend_modify_segment_map):
+	Add link info argument.
+	* elf32-i370.c (elf_backend_modify_segment_map): Likewise.
+	* elf32-ppc.c (ppc_elf_modify_segment_map): Likewise.
+	* elf32-xtensa.c (elf_xtensa_modify_segment_map): Likewise.
+	* elf64-hppa.c (elf64_hppa_modify_segment_map): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_modify_segment_map): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_modify_segment_map): Likewise.
+	* elfxx-mips.h (_bfd_mips_elf_modify_segment_map): Likewise.
+	* elf.c (assign_file_positions_except_relocs,
+	assign_file_positions_for_segments): Likewise.  Adjust calls.
+
+2003-11-27  Mark Kettenis  <kettenis@gnu.org>
+
+	* elf.c (elfcore_grok_netbsd_procinfo): Make a pseudosection out
+	of the note.
+
+2003-11-26  Daniel Jacobowitz  <drow@mvista.com>
+	    Richard Sandiford  <rsandifo@redhat.com>
+
+	* elfxx-mips.c (mips_elf_set_global_got_offset): Don't set no_fn_stub.
+	(mips_elf_set_no_stub): New function.
+	(mips_elf_multi_got): Call it.
+	(_bfd_mips_elf_finish_dynamic_symbol): If a relocation is needed for
+	a secondary GOT entry, create an R_MIPS_32 or R_MIPS_64 relocation and
+	use mips_elf_create_dynamic_relocation to deal with any compatibility
+	issues.  Store the adjusted addend in the GOT slot.
+
+2003-11-25  Mattias Engdeg�rd  <mattias@virtutech.se>
+
+	* stabs.c (_bfd_link_section_stabs): Skip N_EXCL stabs when
+	procesing N_BINCL stabs.
+
+2003-11-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc_type_of_stub): Disallow stubs other than
+	ppc_stub_plt_call to symbols defined in shared libs.
+
+2003-11-22  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf-bfd.h (ELF_LINK_POINTER_EQUALITY_NEEDED): Define new flag.
+	* elf.c (_bfd_elf_link_hash_copy_indirect): Copy it.
+	* elf32-i386.c (elf_i386_copy_indirect_symbol): Likewise.
+	(elf_i386_check_relocs): Set it.
+	(elf_i386_finish_dynamic_symbol): If it is not set,
+	clear st_value of SHN_UNDEF symbol.
+
+2003-11-20  Jim Blandy  <jimb@redhat.com>
+
+	* cpu-powerpc.c (powerpc_compatible): Any ISA in the PowerPC
+	family is a superset of <bfd_arch_rs6000,bfd_mach_rs6k>.
+
+2003-11-20  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* elf32-s390.c (elf_s390_relocate_section): Don't recalculate symbol
+	section for reloc output and subtract the output section's address
+	from the addend when converting a relocation into one against a
+	section symbol.
+	* elf64-s390.c (elf_s390_relocate_section): Likewise.
+
+2003-11-18  James E Wilson  <wilson@specifixinc.com>
+
+	* elfxx-ia64.c (get_fptr): For fptr_rel, use dynobj not abfd.
+	(elfNN_ia64_size_dynamic_sections): When stripping sections, check
+	for ia64_info->rel_fptr_sec.
+
+2003-11-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (toc_adjusting_stub_needed): Exit early if section
+	size is zero.
+
+2003-11-17  Daniel Jacobowitz  <drow@mvista.com>
+
+	* elf.c (_bfd_elf_link_hash_copy_indirect): Copy
+	ELF_LINK_HASH_NEEDS_PLT.  Fix formatting.
+	* elf32-hppa.c (elf32_hppa_copy_indirect_symbol): Likewise.
+	* elf32-i386.c (elf_i386_copy_indirect_symbol): Likewise.
+	* elf32-ppc.c (ppc_elf_copy_indirect_symbol): Likewise.
+	* elf32-s390.c (elf_s390_copy_indirect_symbol): Likewise.
+	* elf32-sh.c (sh_elf_copy_indirect_symbol): Likewise.
+	* elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Likewise.
+	* elf64-s390.c (elf_s390_copy_indirect_symbol): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_copy_indirect_symbol): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_hash_copy_indirect): Likewise.
+	* elf32-xtensa.c (elf_xtensa_copy_indirect_symbol): Remove.
+	(elf_backend_copy_indirect_symbol): Don't define.
+
+2003-11-14  Daniel Jacobowitz  <drow@mvista.com>
+
+	* elfxx-mips.c (mips_elf_merge_gots): Weaken assert for local
+	GOT entries.
+
+2003-11-13  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* elf32-s390.c (elf_s390_relocate_section): Only convert R_390_32
+	to R_390_RELATIVE. Convert the other relocations against local
+	symbols to relocations against the start of the section.
+	* elf64-s390.c (elf_s390_relocate_section): Only convert R_390_64
+	to R_390_RELATIVE. Convert the other relocations against local
+	symbols to relocations against the start of the section.
+
+2003-11-11  Nick Clifton  <nickc@redhat.com>
+
+	* elf-m10300.c (bfd_mn10300_elf_size_dynamic_sections): Use
+	info->executable not info->shared to decide if a .interp section
+	should be present.
+	* elf32-arm.h (elf32_arm_size_dynamic_sections): Likewise.
+	* elf32-cris.c (elf_cris_size_dynamic_sections): Likewise.
+	* elf32-hppa.c (elf32_hppa_size_dynamic_sections): Likewise.
+	* elf32-i370.c (i370_elf_size_dynamic_sections): Likewise.
+	* elf32-m68k.c (elf_m68k_size_dynamic_sections): Likewise.
+	* elf32-vax.c (elf_vax_size_dynamic_sections): Likewise.
+	* elf32-xtensa.c (elf_xtensa_size_dynamic_sections): Likewise.
+	* elf64-hppa.c (elf64_hppa_size_dynamic_sections): Likewise.
+	* elfxx-mips.c (_bfd_mips_size_dynamic_sections): Likewise.
+	* elflink.h (size_dynamic_sections): Likewise.
+
+2003-11-10  Jonathan Wilson <jonwil@tpgi.com.au>
+
+	* peXXigen.c (_bfd_XXi_swap_aouthdr_out): Swap out tls pointer.
+	(_bfd_XXi_final_link_postscript): Look for __tks_used symbol.  If
+	found initialise the tls data directory entry.
+
+2003-11-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_install_value): Delete.
+	(shared_stub_entry, stub_entry): Make them arrays of ints.
+	Remove initial branch.
+	(ppc_elf_relax_section): Write one branch around all trampolines
+	instead.  Correct bogus R_PPC_PLTREL24 handling.  Correct
+	branch range check.  Only use shared_stub_entry when shared.
+	Test that branches can reach stubs.  Write trampolines out at
+	end so that just one realloc is used.  Handle little-endian
+	mode.  Move relevant code from ppc_elf_install_value to here.
+	(ppc_elf_relocate_section): Move code handling RELAX32 from
+	ppc_elf_install_value to here.
+
+2003-11-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_howto_raw); Add entry for R_PPC_RELAX32PC.
+	(ppc_elf_install_value): Handle R_PPC_RELAX32PC.  Merge duplicate
+	cases.
+	(shared_stub_entry): Correct opcode.
+	(ppc_elf_relax_section): Generate R_PPC_RELAX32PC relocs.
+	(ppc_elf_relocate_section): Handle them.
+
+2003-11-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (_bfd_elf_rela_local_sym): Accept asection **, and return
+	updated section in case of merged section.
+	* elf-bfd.h (_bfd_elf_rela_local_sym): Update declaration.
+	* elf-hppa.h (elf_hppa_relocate_section): Adjust call.
+	* elf-m10200.c (mn10200_elf_relocate_section): Likewise.
+	* elf-m10300.c (mn10300_elf_relocate_section): Likewise.
+	* elf32-arm.h (elf32_arm_relocate_section): Likewise.
+	* elf32-avr.c (elf32_avr_relocate_section): Likewise.
+	* elf32-cris.c (cris_elf_relocate_section): Likewise.
+	* elf32-fr30.c (fr30_elf_relocate_section): Likewise.
+	* elf32-frv.c (elf32_frv_relocate_section): Likewise.
+	* elf32-h8300.c (elf32_h8_relocate_section): Likewise.
+	* elf32-hppa.c (elf32_hppa_relocate_section): Likewise.
+	* elf32-i370.c (i370_elf_relocate_section): Likewise.
+	* elf32-i860.c (elf32_i860_relocate_section): Likewise.
+	* elf32-m32r.c (m32r_elf_relocate_section): Likewise.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-mcore.c (mcore_elf_relocate_section): Likewise.
+	* elf32-msp430.c (elf32_msp430_relocate_section): Likewise.
+	* elf32-openrisc.c (openrisc_elf_relocate_section): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	* elf32-s390.c (elf_s390_relocate_section): Likewise.
+	* elf32-sh.c (sh_elf_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+	* elf32-v850.c (v850_elf_relocate_section) Likewise.
+	* elf32-vax.c (elf_vax_relocate_section): Likewise.
+	* elf32-xstormy16.c (xstormy16_elf_relocate_section): Likewise.
+	* elf32-xtensa.c (elf_xtensa_relocate_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relocate_section): Likewise.
+	* elf64-mmix.c (mmix_elf_relocate_section): Likewise.
+	* elf64-ppc.c (ppc64_elf_relocate_section): Likewise.
+	* elf64-s390.c (elf_s390_relocate_section): Likewise.
+	* elf64-sh64.c (sh_elf64_relocate_section): Likewise.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Likewise.
+
+	* elf32-cris.c (cris_elf_relocate_section): Don't recalculate symbol
+	section for reloc output.
+	* elf32-i370.c (i370_elf_relocate_section): Likewise.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+	* elf32-vax.c (elf_vax_relocate_section): Likewise.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Don't recalculate everything
+	for R_PPC_RELAX32 reloc.  Don't bother checking ppc_elf_install_value
+	return value.
+	* elf64-ppc.c (ppc64_elf_relocate_section <R_PPC64_TOC>): Sanity check
+	sec->id.
+
+2003-11-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-d10v.c (extract_rel_addend, insert_rel_addend): New functions.
+	(elf32_d10v_relocate_section): Use them to handle -r reloc
+	adjustments, and in place of _bfd_elf_rela_local_sym.
+
+	* cpu-iq2000.c (arch_info_struct): Warning fix.
+
+2003-11-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-hppa.c (ELIMINATE_COPY_RELOCS): Define.
+	(elf32_hppa_copy_indirect_symbol): Don't copy NON_GOT_REF on
+	weakdefs.
+	(elf32_hppa_check_relocs): Use ELIMINATE_COPY_RELOCS.
+	(elf32_hppa_adjust_dynamic_symbol): Likewise.  Copy weakdef
+	NON_GOT_REF.
+	(allocate_dynrelocs): Use ELIMINATE_COPY_RELOCS and
+	SYMBOL_CALLS_LOCAL.  Discard relocs for undef weak syms with
+	non-default visibility.
+	(elf32_hppa_relocate_section): Use ELIMINATE_COPY_RELOCS and
+	SYMBOL_CALLS_LOCAL.
+
+2003-11-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* aout-target.h, aoutf1.h, bfdio.c, bfdwin.c: Update copyright date.
+	* coff-apollo.c, coff-sparc.c, coff-w65.c, coff-we32k.c: Ditto.
+	* coff-z8k.c, coffgen.c, cpu-frv.c, cpu-h8500.c, cpu-hppa.c: Ditto.
+	* cpu-ia64-opc.c, cpu-m10300.c, cpu-mips.c, cpu-msp430.c: Ditto.
+	* cpu-rs6000.c, cpu-z8k.c, efi-app-ia32.c, elf32-am33lin.c: Ditto.
+	* gen-aout.c, hash.c, hp300hpux.c, init.c, mach-o.c: Ditto.
+	* nlm-target.h, nlm.c, som.h, stabs.c, sysdep.h, xsym.h: Ditto.
+
+	* elf-m10300.c (_bfd_mn10300_elf_create_got_section): Fix
+	"dereferencing type-punned pointer" warnings.
+
+	* aout-adobe.c (aout_adobe_set_section_contents): Constify location.
+	* aoutx.h (NAME(aout,set_section_contents)): Ditto.
+	* bfd-in2.h: Regenerate.
+	* binary.c (binary_set_section_contents): Ditto.
+	* bout.c (b_out_set_section_contents): Ditto.
+	* coff-tic54x.c (tic54x_set_section_contents): Ditto.
+	* coffcode.h (coff_set_section_contents): Ditto.
+	* ecoff.c (_bfd_ecoff_set_section_contents): Ditto.
+	* elf-bfd.h (_bfd_elf_set_section_contents): Ditto.
+	* elf.c (_bfd_elf_set_section_contents): Ditto.
+	* elfxx-mips.c (_bfd_mips_elf_set_section_contents): Ditto.
+	* elfxx-mips.h (_bfd_mips_elf_set_section_contents): Ditto.
+	* i386msdos.c (msdos_set_section_contents): Ditto.
+	* ieee.c (ieee_set_section_contents): Ditto.
+	* ihex.c (ihex_set_section_contents): Ditto.
+	* libaout.h (NAME(aout,set_section_contents)): Ditto.
+	* libbfd-in.h (_bfd_nowrite_set_section_contents): Ditto.
+	(_bfd_generic_set_section_contents): Ditto.
+	* libbfd.h: Regenerate.
+	* libbfd.c (_bfd_generic_set_section_contents): Ditto.
+	* libecoff.h (_bfd_ecoff_set_section_contents): Ditto.
+	* libnlm.h (nlmNAME(set_section_contents)): Ditto.
+	(struct nlm_backend_data <nlm_mangle_relocs>): Ditto.
+	* mmo.c (mmo_set_section_contents): Ditto.
+	* nlm32-alpha.c (nlm_alpha_mangle_relocs): Ditto.
+	* nlm32-i386.c (nlm_i386_mangle_relocs): Ditto.
+	* nlm32-ppc.c (nlm_powerpc_mangle_relocs): Ditto.
+	* nlm32-sparc.c (nlm_sparc_mangle_relocs): Ditto.
+	* nlmcode.h (nlm_set_section_contents): Ditto.
+	* oasys.c (oasys_set_section_contents): Ditto.
+	* pdp11.c (NAME(aout,set_section_contents)): Ditto.
+	* ppcboot.c (ppcboot_set_section_contents): Ditto.
+	* srec.c (srec_set_section_contents): Ditto.
+	* targets.c (BFD_JUMP_TABLE_WRITE <_bfd_set_section_contents>): Ditto.
+	* tekhex.c (tekhex_set_section_contents): Ditto.
+	(move_section_contents): Ditto.
+	* versados.c (versados_set_section_contents): Ditto.
+	* vms-misc.c (_bfd_save_vms_section): Ditto.
+	* vms.c (vms_set_section_contents): Ditto.
+	* vms.h (_bfd_save_vms_section): Ditto.
+
+2003-11-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc_size_one_stub): Size relbrlt.  Accept info arg
+	rather than htab.
+	(ppc64_elf_size_stubs): Adjust ppc_size_one_stub traversal.  Zero
+	relbrlt size.
+	(ppc64_elf_build_stubs): Allocate space for relbrlt.
+
+2003-11-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd-in.h (_bfd_elf_tls_setup): Declare.
+	* bfd-in2.h: Regenerate.
+	* elf-bfd.h (struct elf_link_tls_segment): Delete.
+	(struct elf_link_hash_table): Add tls_sec and tls_size.
+	* elf.c (_bfd_elf_link_hash_table_init): Init tls_sec and tls_size.
+	* elflink.c (_bfd_elf_tls_setup): New function.
+	* elflink.h (struct elf_final_link_info): Remove first_tls_sec.
+	(elf_bfd_final_link): Don't set first_tls_sec here.  Update code
+	saving tls segment info, round segment size up.
+	(elf_link_output_extsym): Adjust code using tls segment info.
+	(elf_link_input_bfd): Likewise.
+	* elf32-i386.c (dtpoff_base, tpoff): Likewise.
+	* elf32-s390.c (dtpoff_base, tpoff): Likewise.
+	* elf32-sh.c (dtpoff_base, tpoff): Likewise.
+	* elf32-sparc.c (dtpoff_base, tpoff): Likewise.
+	* elf64-s390.c (dtpoff_base, tpoff): Likewise.
+	* elf64-x86-64.c (dtpoff_base, tpoff): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_tprel_base): Likewise.
+	(elfNN_ia64_dtprel_base): Likewise.
+	* elf64-alpha.c (alpha_get_dtprel_base): Likewise.
+	(alpha_get_tprel_base): Likewise.
+	(struct alpha_relax_info): Remove tls_segment.
+	(elf64_alpha_relax_got_load): Adjust invocation of
+	alpha_get_dtprel_base and alpha_get_tprel_base.
+	(elf64_alpha_relax_tls_get_addr): Likewise.
+	(elf64_alpha_relax_section): Likewise.
+	(elf64_alpha_relocate_section): Likewise.
+	(elf64_alpha_relax_find_tls_segment): Delete.
+	* elf32-ppc.c (struct ppc_elf_link_hash_table): Remove tls_sec.
+	(ppc_elf_tls_setup): Call _bfd_elf_tls_setup.  Return section.
+	(ppc_elf_relocate_section): Adjust to use elf.tls_sec.
+	* elf32-ppc.h (ppc_elf_tls_setup): Update.
+	* elf64-ppc.c (struct ppc_link_hash_table): Remove tls_sec.
+	(ppc64_elf_tls_setup): Call _bfd_elf_tls_setup.  Return section.
+	(ppc64_elf_tls_optimize): Adjust to use elf.tls_sec.
+	(ppc64_elf_relocate_section): Likewise.
+	* elf64-ppc.h (ppc64_elf_tls_setup): Update.
+
+2003-11-03  Daniel Jacobowitz  <drow@mvista.com>
+
+	* elf-bfd.h (struct elf_backend_data): Remove plt_header_size.
+	* elf-m10300.c (elf_backend_plt_header_size): Don't define.
+	* elf32-arm.h (elf_backend_plt_header_size): Don't define.
+	* elf32-cris.c (elf_backend_plt_header_size): Don't define.
+	* elf32-i386.c (elf_backend_plt_header_size): Don't define.
+	* elf32-mips.c (elf_backend_plt_header_size): Don't define.
+	* elf32-ppc.c (elf_backend_plt_header_size): Don't define.
+	* elf32-s390.c (elf_backend_plt_header_size): Don't define.
+	* elf32-sh.c (elf_backend_plt_header_size): Don't define.
+	* elf32-sparc.c (elf_backend_plt_header_size): Don't define.
+	* elf64-alpha.c (elf_backend_plt_header_size): Don't define.
+	* elf64-hppa.c (elf_backend_plt_header_size): Don't define.
+	* elf64-mips.c (elf_backend_plt_header_size): Don't define.
+	* elf64-ppc.c (elf_backend_plt_header_size): Don't define.
+	* elf64-s390.c (elf_backend_plt_header_size): Don't define.
+	* elf64-sh64.c (elf_backend_plt_header_size): Don't define.
+	* elf64-sparc.c (elf_backend_plt_header_size): Don't define.
+	* elf64-x86-64.c (elf_backend_plt_header_size): Don't define.
+	* elfn32-mips.c (elf_backend_plt_header_size): Don't define.
+	* elfxx-ia64.c (elf_backend_plt_header_size): Don't define.
+	* elfxx-target.h (elf_backend_plt_header_size): Don't define
+	or include in target initializer.
+
+2003-11-03  Andrew Cagney  <cagney@redhat.com>
+
+	* section.c (bfd_set_section_contents): Make the "location" buffer
+	constant.
+	* bfd-in2.h: Re-generate.
+
+2003-10-30  Andrew Cagney  <cagney@redhat.com>
+
+	* syms.c: Replace "struct symbol_cache_entry" with "struct
+	bfd_symbol".
+	* vms.h, targets.c, section.c, reloc.c, peicode.h: Ditto.
+	* mipsbsd.c, elf.c, linker.c, elf-bfd.h, ecoff.c: Ditto.
+	* cpu-z8k.c, cpu-ns32k.c, cpu-h8500.c, bfd.c, bfd-in.h: Ditto.
+	* bfd-in2.h: Re-generate.
+
+2003-10-30  Jakub Jelinek  <jakub@redhat.com>
+
+	* elfxx-ia64.c: Include objalloc.h, hashtab.h.
+	(struct elfNN_ia64_local_hash_entry): Remove root. Add id and r_sym
+	fields.
+	(struct elfNN_ia64_local_hash_table): Remove.
+	(struct elfNN_ia64_link_hash_table): Change loc_hash_table's type
+	to htab_t.  Add loc_hash_memory field.
+	(elfNN_ia64_local_hash_table_init, elfNN_ia64_new_loc_hash_entry):
+	Removed.
+	(elfNN_ia64_local_htab_hash, elfNN_ia64_local_htab_eq): New
+	functions.
+	(elfNN_ia64_hash_table_create): Use hashtab.h hashtable for
+	loc_hash_table.  Initialize loc_hash_memory.
+	(elfNN_ia64_hash_table_free): New function.
+	(elfNN_ia64_local_hash_lookup): Remove.
+	(elfNN_ia64_local_dyn_sym_thunk): Change into htab_traverse
+	callback.
+	(elfNN_ia64_dyn_sym_traverse): Use htab_traverse.
+	(get_local_sym_hash): Use hashtab.h hashtable for loc_hash_table.
+	(bfd_elfNN_bfd_link_hash_table_free): Define.
+
+2003-10-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (_bfd_elf_link_record_dynamic_symbol): Modify versioned
+	symbol string in place.
+
+2003-10-30  Jim Blandy  <jimb@redhat.com>
+
+	* cpu-rs6000.c (rs6000_compatible): Check the correct arch_info
+	object's mach field: all PowerPC machines are supersets of the
+	original rs6000, but not later rs6000 machines.
+
+2003-10-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* dwarf2.c (struct attribute): Delete "unsnd", "snd" and "addr".
+	Add "val" and "sval" fields.
+	(DW_STRING, DW_UNSND, DW_BLOCK, DW_SND, DW_ADDR): Delete.
+	(read_attribute_value): Expand and adjust DW_* occurrences.
+	(scan_unit_for_functions, parse_comp_unit): Likewise.
+
+2003-10-30  Phil Edwards  <phil@codesourcery.com>
+
+	* config.bfd (arm-*-vxworks):  Remove separate stanza; merge with
+	other common ELF triples.
+	(i[3-7]86-*-vxworks):  Change to ELF format.
+	(mips*-*-windiss):  New triple, add to common MIPS/ELF stanza.
+	(sh-*-vxworks):  New stanza.
+
+2003-10-30  Lars Knoll  <lars@trolltech.com>
+	    Michael Matz  <matz@suse.de>
+	    Jakub Jelinek  <jakub@redhat.com>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* merge.c (struct sec_merge_sec_info): Update comment.
+	(struct sec_merge_hash_entry): Remove entsize.
+	(sec_merge_hash_lookup): Only adjust alignment when creating.
+	(sec_merge_emit): Remove register keyword.
+	(cmplengthentry, last4_eq, last_eq): Delete.
+	(strrevcmp, strrevcmp_align, is_suffix): New.
+	(merge_strings): Use them to implement fast suffix merging.
+	* elf-strtab.c (struct elf_strtab_hash_entry): Update comments.
+	Make "len" signed.
+	(_bfd_elf_strtab_add): Lose on >2G strings.
+	(_bfd_elf_strtab_emit): Don't emit strings with len < 0.
+	(cmplengthentry, last4_eq): Delete.
+	(strrevcmp, is_suffix): New.
+	(_bfd_elf_strtab_finalize): Rework to implement fast suffix merging.
+
+2003-10-29  Daniel Jacobowitz  <drow@mvista.com>
+
+	* elf32-arm.h (elf32_arm_final_link_relocate): Move check for
+	SEC_ALLOC.
+
+2003-10-29  Philip Blundell  <philb@gnu.org>
+
+	* elf32-arm.h (elf32_arm_plt0_entry, elf32_arm_plt_entry): New
+	code sequence.
+	(PLT_HEADER_SIZE): New.
+	(struct elf32_arm_pcrel_relocs_copied): Rename to ...
+	(struct elf32_arm_relocs_copied): ... this.  Count both
+	pcrel and non-pcrel relocs.  All uses updated.
+	(struct elf32_arm_link_hash_table): Add pointers to dynamic linker
+	sections and symbol/section mapping cache.
+	(create_got_section): New.
+	(elf32_arm_create_dynamic_sections): New.
+	(elf_backend_create_dynamic_sections): Use it.
+	(elf32_arm_final_link_relocate): Support garbage collection of relocs.
+	(elf32_arm_check_relocs): Likewise.
+	(elf32_arm_adjust_dynamic_symbol): Likewise.
+	(elf32_arm_copy_indirect_symbol): New.
+	(elf32_arm_link_hash_table_create): Initialise new fields.
+	(elf32_arm_gc_sweep_hook): Implement.
+	(elf32_arm_discard_copies): Delete.
+	(elf32_arm_finish_dynamic_symbol): Use new PLT code.
+	(elf32_arm_finish_dynamic_sections): Likewise.
+	(elf_backend_can_refcount): Define.
+	(elf_backend_copy_indirect_symbol): Likewise.
+	(elf_backend_plt_header_size): Set to PLT_HEADER_SIZE.
+
+2003-10-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (elf_backend_grok_prstatus): Define.
+	(elf_backend_grok_psinfo): Define.
+	(ppc64_elf_grok_prstatus, ppc64_elf_grok_psinfo): New functions.
+
+	* elf.c (_bfd_elfcore_make_pseudosection): Allow multiple
+	sections with the same name.
+	(elfcore_grok_lwpstatus): Likewise.
+	(elfcore_grok_win32pstatus): Likewise.
+	(elfcore_grok_note): Likewise.
+	(elfcore_grok_nto_status): Likewise.
+	(elfcore_grok_nto_gregs): Likewise.
+
+2003-10-27  Daniel Jacobowitz  <drow@mvista.com>
+
+	* elf32-arm.h (elf32_arm_merge_private_bfd_data): Never skip dynamic
+	objects.
+
+2003-10-14  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elfxx-mips.c (mips_elf_create_got_section): Initialize global_gotno.
+
+2003-10-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Look up
+	hash table for real symbols.
+
+2003-10-23  Michael Snyder  <msnyder@redhat.com>
+
+	* section.c (asection): Fix typo in comment.
+
+2003-10-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (get_tls_mask): Add toc_symndx param, save toc
+	reloc symbol index to it.  Don't allow gd syms in shared libs
+	to be optimized.
+	(ppc64_elf_tls_optimize): Adjust get_tls_mask call.
+	(ppc64_elf_size_stubs): Likewise.
+	(ppc64_elf_relocate_section): Check that tls relocs are only used
+	with tls syms, and similarly for non-tls.  Correct symbol used
+	when optimizing toc tls code.
+
+2003-10-22  Nick Clifton  <nickc@redhat.com>
+
+	* peicode.h (coff_swap_scnhdr_in): Only remove padding when
+	processing an executable.
+
+2003-10-22  Jakub Jelinek  <jakub@redhat.com>
+
+	* elflink.c (_bfd_elf_export_symbol): Adjust for globals and locals
+	field changes.
+	(_bfd_elf_link_assign_sym_version): Likewise.
+	* elflink.h (size_dynamic_sections): Likewise.
+
+2003-10-21  Alexandre Oliva  <aoliva@redhat.com>,
+	    Michael Snyder  <msnyder@redhat.com>
+
+	* archures.c (bfd_mach_sh4a, bfd_mach_sh4al_dsp, bfd_mach_sh4_nofpu,
+	bfd_mach_sh4a_nofpu): New machine types.
+	* bfd-in2.h: Rebuilt.
+	* cpu-sh.c (compatible): Remove unused function.
+	(SH4A_NEXT, SH4AL_DSP_NEXT, SH4_NOFPU_NEXT, SH4A_NOFPU_NEXT): New.
+	(arch_info_struct): Add sh4a, sh4al_dsp, sh4-nofpu and sh4a-nofpu.
+	* elf32-sh.c (sh_elf_set_mach_from_flags): Handle them.
+
+2003-10-21  Wouter van Heyst <wouter@vidicode.nl>
+
+	* elf32-arm.h (elf32_arm_merge_private_bfd_data): Correct text
+	describing mismatched formats involving the Maverick FP type.
+
+2003-10-21  Anil Paranjpe  <anilp1@KPITCummins.com>
+
+	* binary.c (binary_object_p): Pass machine flag along with
+	architecture.
+
+2003-10-21  Thorsten Brehm  <brehm@gmx.net>
+
+	* archures.c (bfd_default_scan): Add support for mcf528x.
+	* ieee.c (ieee_write_processor): Likewise.
+
+2003-10-21  Peter Barada  <pbarada@mail.wm.sps.mot.com>
+	    Bernardo Innocenti  <bernie@develer.com>
+
+	* archures.c: Add MCF528x (MCFv4) support.
+	* cpu-m68k.c (arch_info_struct): Likewise.
+	* bfd-in2.h: Regenerate.
+
+2003-10-20  Andrew Cagney  <cagney@redhat.com>
+
+	* targets.c: Replace "struct sec" with "struct bfd_section"
+	* syms.c, sparclynx.c, section.c, opncls.c: Ditto.
+	* libcoff-in.h, libbfd-in.h, elfxx-target.h: Ditto.
+	* elf.c, coffgen.c, bfd.c, bfd-in.h, aoutf1.h: Ditto.
+	* aout-tic30.c, aout-target.h:
+	* bfd-in2.h, libcoff.h, libbfd.h: Regenerate.
+
+2003-10-18  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	Support linker relaxation of new R_MMIX_PUSHJ_STUBBABLE relocs.
+	* elf64-mmix.c (MAX_PUSHJ_STUB_SIZE): New macro.
+	(struct _mmix_elf_section_data): New member pjs.
+	(mmix_set_relaxable_size, mmix_elf_get_section_contents): New
+	functions.
+	(elf_mmix_howto_table): New entry for R_MMIX_PUSHJ_STUBBABLE.
+	(mmix_reloc_map): Ditto.
+	(mmix_elf_relocate_section): Handle R_MMIX_PUSHJ_STUBBABLE.
+	(mmix_final_link_relocate, mmix_elf_check_common_relocs): Ditto.
+	(mmix_elf_perform_relocation): Ditto.  Don't mark parameter addr
+	unused.
+	(mmix_elf_check_relocs): Move early return to after
+	mmix_elf_check_common_relocs call.
+	(mmix_elf_symbol_processing): Fix cut-and-pasto in head comment.
+	(_bfd_mmix_before_linker_allocation): Rename from
+	_bfd_mmix_prepare_linker_allocated_gregs.  All referers changed.
+	Arrange to set the initial relaxable size of sections.
+	(_bfd_mmix_after_linker_allocation): Rename from
+	_bfd_mmix_finalize_linker_allocated_gregs.
+	(mmix_elf_relax_section): Relax a R_MMIX_PUSHJ_STUBBABLE reloc.
+	(bfd_elf64_get_section_contents): Define.
+	* reloc.c: Add ENUMX for BFD_RELOC_MMIX_PUSHJ_STUBBABLE.
+	* libbfd.h, bfd-in2.h: Regenerate.
+
+	* reloc.c (bfd_generic_relax_section): Default-set
+	section->_cooked_size here.
+	(bfd_generic_get_relocated_section_contents): Don't set it here.
+	Explain why.
+
+2003-10-17  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* elf32-hppa.c (elf32_hppa_relocate_section): Skip relocation if
+	output section has been discarded.
+
+2003-10-17  Shrinivas Atre  <shrinivasa@KPITCummins.com>
+
+	* coff-h8300.c (funcvec_hash_newfunc): Handle normal mode.
+	(h8300_reloc16_extra_cases): Likewise.
+	(h8300_bfd_link_add_symbols): Likewise.
+
+2003-10-17 Dhananjay Deshpande <dhananjayd@kpitcummins.com>
+
+	* cpu-h8300.c (h8300sxn_info_struct): Correct address size.
+	(h8300sn_info_struct): Likewise.
+	(h8300hn_info_struct): Likewise.
+
+2003-10-16  Pavel Roskin  <proski@gnu.org>
+
+	* peXXigen.c (_bfd_XXi_swap_aouthdr_out): Don't calculate image size
+	for sections which lack size info.
+
+2003-10-17  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* configure.host: Add __USE_MINGW_FSEEK to HDEFINES for
+	 mingw32.
+
+2003-10-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Also warn
+	undefined patterns with '*'.
+
+2003-10-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Don't
+	use the last CIE from a different section.
+	(_bfd_elf_write_section_eh_frame): Don't pad beyond the raw
+	size of the output section.
+
+2003-10-07  Roland McGrath  <roland@redhat.com>
+
+	* elf.c (_bfd_elf_make_section_from_phdr): Set alignment_power of
+	new section from p_align header field.
+
+2003-10-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-xtensa.c (xtensa_read_table_entries): The external size
+	of entry is 8 bytes.
+
+2003-10-15  Andrew Cagney  <cagney@redhat.com>
+
+	* targets.c (BFD_JUMP_TABLE_SYMBOLS): Replace NAME##_get_symtab
+	with NAME##_canonicalize_symtab.
+	* libcoff-in.h (coff_canonicalize_symtab): Update.
+	* xsym.h (bfd_sym_canonicalize_symtab): Update.
+	* elf-bfd.h (_bfd_elf_canonicalize_symtab): Update.
+	* coffgen.c (coff_canonicalize_symtab): Update.
+	* libbfd-in.h (_bfd_nosymbols_canonicalize_symtab): Update.
+	* libnlm.h (nlmNAME(canonicalize_symtab)): Update.
+	* ieee.c (ieee_vec): Update comment.
+	* libecoff.h (_bfd_ecoff_canonicalize_symtab): Update.
+	* mmo.c (mmo_canonicalize_symtab): Update.
+	* nlm-target.h (nlm_canonicalize_symtab): Update.
+	* nlmcode.h (nlm_canonicalize_symtab): Update.
+	* i386msdos.c (msdos_canonicalize_symtab): Update.
+	* hp300hpux.c (MY (canonicalize_symtab)): Update.
+	* oasys.c (oasys_canonicalize_symtab): Update.
+	* som.c (som_canonicalize_symtab): Update.
+	* pef.c (bfd_pef_canonicalize_symtab): Update.
+	* nlmcode.h (nlm_canonicalize_symtab): Update.
+	* xsym.c (bfd_sym_canonicalize_symtab): Update.
+	* vms.c (vms_canonicalize_symtab): Update.
+	* versados.c (versados_canonicalize_symtab): Update.
+	* mach-o.c (bfd_mach_o_canonicalize_symtab): Update.
+	* ieee.c (ieee_canonicalize_symtab): Update.
+	* pdp11.c (NAME(aout,canonicalize_symtab)): Update.
+	* reloc.c: Update comment.
+	* libaout.h (NAME(aout,canonicalize_symtab)): Update.
+	* coff64-rs6000.c (aix5coff64_vec): Update.
+	* coff64-rs6000.c (bfd_xcoff_aix5_backend_data): Update.
+	* coff-rs6000.c (rs6000coff_vec, pmac_xcoff_vec): Update.
+	* aoutx.h (NAME(aout,canonicalize_symtab)): Update.
+	* elfxx-target.h (bfd_elfNN_canonicalize_symtab): Update.
+	* hp300hpux.c (MY_canonicalize_symtab): Update.
+	* ecoff.c (_bfd_ecoff_canonicalize_symtab): Update.
+	* aout-tic30.c (MY_canonicalize_symtab): Update.
+	* aout-target.h (MY_canonicalize_symtab): Update.
+	* ppcboot.c (ppcboot_canonicalize_symtab): Update.
+	* elf.c (_bfd_elf_canonicalize_symtab): Update.
+	* elfcode.h (elf_canonicalize_symtab): Update.
+	* ihex.c (ihex_canonicalize_symtab): Update.
+	* tekhex.c (tekhex_canonicalize_symtab): Update.
+	* binary.c (binary_canonicalize_symtab): Update.
+	* srec.c (srec_canonicalize_symtab): Update.
+
+2003-10-15  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* elf32-h8300.c (elf_reloc_map): Fix a comment typo.
+
+2003-10-15  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c (sh_elf_relocate_section): Handle R_SH_IMM_*_PCREL
+	relocations.
+	(sh_elf_check_relocs): Likewise.
+
+	* elf32-sh64.c (elf_backend_merge_symbol_attribute): Define.
+	(sh64_elf_merge_symbol_attribute): New.
+	* elf64-sh64.c (elf_backend_merge_symbol_attribute): Define.
+	(sh64_elf64_merge_symbol_attribute): New.
+
+2003-10-14  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf-bfd.h (struct elf_backend_data): New function pointer member
+	elf_backend_merge_symbol_attribute.
+	* elflink.h (elf_link_add_object_symbols): Adjust call to
+	elf_backend_merge_symbol_attribute if the backend defined it.
+	* elfxx-target.h (elf_backend_merge_symbol_attribute): New macro.
+	(elfNN_bed): Add that to the initializer.
+
+2003-10-14  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (get_is_linkonce_section): Delete.
+	(xtensa_is_property_section, xtensa_is_littable_section): Use
+	XTENSA_INSN_SEC_NAME and XTENSA_LIT_SEC_NAME macros.  Do not recognize
+	linkonce sections containing ".xt.insn" and ".xt.lit" substrings.
+	(xtensa_get_property_section_name): Check section name instead of
+	calling get_is_linkonce_section.  Remove unused bfd parameter.  Use
+	XTENSA_INSN_SEC_NAME and XTENSA_LIT_SEC_NAME macros.  Never generate
+	linkonce section names by appending ".xt.insn" or ".xt.lit".
+	(xtensa_read_table_entries): Remove bfd argument in call to
+	xtensa_get_property_section_name.  Free section name when done.
+	(elf_xtensa_combine_prop_entries): Free leaking table.
+
+2003-10-13  Richard Sandiford  <rsandifo@redht.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_size_dynamic_sections): Don't add
+	DT_MIPS_LIBLIST or DT_MIPS_CONFLICT entries.
+	(_bfd_mips_elf_finish_dynamic_symbol): Don't handle them.  Don't
+	handle DT_MIPS_MSYM.  Set DT_RELSZ based on the number of relocations
+	that were needed.
+	(_bfd_mips_elf_modify_segment_map): Fix placement of PT_MIPS_OPTIONS.
+	(_bfd_mips_elf_merge_private_bfd_data): Ignore EF_MIPS_UCODE.
+
+2003-10-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfd-in.h (bfd_elf32_ia64_after_parse): New prototype.
+	(bfd_elf64_ia64_after_parse): Likewise.
+	* bfd-in2.h: Regenerated.
+
+	* elfxx-ia64.c (oor_ip): New.
+	(oor_branch_size): Likewise.
+	(bfd_elfNN_ia64_after_parse): Likewise.
+	(elfNN_ia64_relax_section): Use oor_ip if oor_branch_size
+	equals sizeof (oor_ip).
+
+2003-10-12  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf64-sh64.c (sh_elf64_relocate_section): Tidy up for the
+	renumbering of some relocation numbers.
+
+2003-10-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* coff-sh.c: Move definition of MAP and guard more code with
+	COFF_IMAGE_WITH_PE.
+
+	* section.c (bfd_get_section_size_before_reloc): Ignore reloc_done.
+	* bfd-in2.h: Regenerate.
+
+2003-10-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* doc/Makefile.in: Likewise.
+
+2003-10-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* cofflink.c: Include "safe-ctype.h".
+	(coff_link_add_symbols): Use ISDIGIT instead of isdigit.
+
+2003-10-08  Dave Brolley  <brolley@redhat.com>
+	On behalf of Michael Snyder  <msnyder@redhat.com>
+
+	* archures.c: Add FRV fr550 machine.
+	* cpu-frv.c: Ditto.
+	* elf32-frv.c: Ditto.
+	* bfd-in2.h: Regenerate.
+
+2003-10-08  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elfxx-mips.c (STUB_MOVE,STUB_LI16): Fix stub code
+	for non-SGI N64 ABI. Improve code consitency.
+
+2003-10-07  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-frv.c (elf32_frv_howto_table): Set R_FRV_LABEL16's
+	rightshift to 2.
+
+2003-10-07  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* libbfd-in.h (_bfd_link_section_stabs): Add string offset
+	parameter.
+	* cofflink.c (coff_link_add_symbols): Deal with split stab
+	sections.
+	* elflink.h (elf_link_add_object_symbols): Deal with split stab
+	sections.
+	* stabs.c (_bfd_link_section_stabs): Add string offset parameter.
+	* libbfd.h: Regenerated.
+
+	* coffcode.h (coff_set_alignment_hook): With PE_COFF reloc
+	overflow, set reloc start position to after the count
+	reloc. Subtract one from num relocs. Give error on 0xffff relocs
+	and no overflow.
+	* cofflink.c (_bfd_coff_final_link): Deal with PE_COFF reloc
+	overflow.
+	* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Do overflow if >=
+	0xffff.
+
+2003-10-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-eh-frame.c (_bfd_elf_write_section_eh_frame): Pad the
+	last CIE/FDE if needed.
+
+2003-10-06  Nick Clifton  <nickc@redhat.com>
+
+	* targets.c (_bfd_target_vector): Include bfd_elf64_sparc_vec if
+	BFD64 is enabled.
+
+2003-10-06  Matt Thomas <matt@3am-software.com>
+
+	* config.bfd: Move the hppa*-*-netbsd* case to the hppa*-*-linux* case.
+
+2003-10-06  Robert Millan  <robertmh@gnu.org>
+
+	* configure.in: Match GNU/KNetBSD with new knetbsd*-gnu triplet.
+	* config.bfd: Likewise.
+	* configure: Regenerate.
+
+2003-10-04  Christian Groessler  <chris@groessler.org>
+
+	* coff-z8k.c (extra_case): Fix displacement length check for R_JR
+	and R_CALLR.
+
+2003-10-04  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* elf32-m68hc1x.c: Update to ISO C90; replace PTR with void*.
+	* elf32-m68hc11.c: Likewise.
+	* elf32-m68hc12.c: Likewise.
+	* elf32-m68hc1x.h: Likewise.
+
+2003-10-04  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* elf32-m68hc1x.c (_bfd_m68hc11_elf_merge_private_bfd_data): Fix merge
+	of flags between HC12 and HCS12.
+
+2003-10-04  Bryce McKinlay  <bryce@mckinlay.net.nz>
+
+	* merge.c (_bfd_merge_sections): Set SEC_EXCLUDE flag on sections
+	which become empty after merging.
+
+2003-09-30  Jakub Jelinek  <jakub@redhat.com>
+
+	* elfxx-ia64.c (ia64_howto_table): Fix size of R_IA64_TPREL64[LM]SB,
+	R_IA64_DTPREL{32,64}[LM]SB and R_IA64_DTPMOD64[LM]SB.
+
+2003-09-30  Chris Demetriou  <cgd@broadcom.com>
+
+	* archures.c (bfd_mach_mipsisa64r2): New define.
+	* bfd-in2.h: Regenerate.
+	* aoutx.h (NAME(aout,machine_type)): Handle bfd_mach_mipsisa64r2.
+	* cpu-mips.c (I_mipsisa64r2): New enum value.
+	(arch_info_struct): Add entry for I_mipsisa64r2.
+	* elfxx-mips.c (_bfd_elf_mips_mach)
+	(_bfd_mips_elf_print_private_bfd_data): Handle E_MIPS_ARCH_64R2.
+	(mips_set_isa_flags): Add bfd_mach_mipsisa64r2 case.
+	(mips_mach_extensions): Add entry for bfd_mach_mipsisa64r2.
+
+2003-09-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_hpux_backend_symbol_processing): New.
+	Handle SHN_IA_64_ANSI_COMMON.
+	(elf_backend_section_from_bfd_section): Defined.
+
+2003-09-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (elf_link_read_relocs_from_section): Add an argument
+	of a pointer to section. Check bad symbol index.
+	(_bfd_elf_link_read_relocs): Modify calls to
+	elf_link_read_relocs_from_section.
+
+2003-09-23  DJ Delorie  <dj@redhat.com>
+
+	* elf32-sh.c (sh_elf_howto_table): R_SH_SWITCH8,
+	R_SH_GNU_VTINHERIT, R_SH_GNU_VTENTRY,
+	R_SH_LOOP_START,R_SH_LOOP_END moved to "reserved" spaces,
+	R_SH_DIR16, R_SH_DIR8, R_SH_DIR8UL, R_SH_DIR8UW, R_SH_DIR8U,
+	R_SH_DIR8SW, R_SH_DIR8S, R_SH_DIR4UL, R_SH_DIR4UW, R_SH_DIR4U,
+	R_SH_PSHA, R_SH_PSHL added.
+	(sh_reloc_map): Add R_SH_DIR16 and R_SH_DIR8.
+	(sh_elf_relocate_section): Support new relocs.
+
+2003-09-23  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_xtensa_relocate_section): Fix typo that clobbered
+	dynamic relocation offsets.
+
+2003-09-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* simple.c (bfd_simple_get_relocated_section_contents): Free the
+	hash table using _bfd_generic_link_hash_table_free.
+
+2003-09-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct bfd_elf_special_section): Remove "suffix".  Change
+	type of prefix_length and suffix_length to int.  Rename "attributes"
+	to "attr".  Comment.
+	(_bfd_elf_get_sec_type_attr): Update prototype.
+	* elf.c (get_special_section): Rewrite.
+	(_bfd_elf_get_sec_type_attr): Return struct rather than passing in
+	attr and type pointers.
+	(_bfd_elf_new_section_hook): Adjust for above.
+	(special_sections): Merge suffix with prefix.  Set
+	prefix_length for all entries.  Set suffix_length appropriately.
+	* elf32-m32r.c (m32r_elf_special_sections): Likewise.
+	* elf32-m68hc11.c (elf32_m68hc11_special_sections): Likewise.
+	* elf32-m68hc12.c (elf32_m68hc12_special_sections): Likewise.
+	* elf32-mcore.c (mcore_elf_special_sections): Likewise.
+	* elf32-sh64.c (sh64_elf_special_sections): Likewise.
+	* elf32-v850.c (v850_elf_special_sections): Likewise.
+	* elf32-xtensa.c (elf_xtensa_special_sections): Likewise.
+	* elf64-alpha.c (elf64_alpha_special_sections): Likewise.
+	* elf64-hppa.c (elf64_hppa_special_sections): Likewise.
+	* elf64-ppc.c (ppc64_elf_special_sections): Likewise.
+	* elf64-sh64.c (sh64_elf64_special_sections): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_special_sections): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_special_sections): Likewise.
+	* elf32-ppc.c (ppc_elf_special_sections): Likewise.  Fix .plt flags.
+
+2003-09-21  Daniel Jacobowitz  <drow@mvista.com>
+
+	* elf64-alpha.c (elf64_alpha_create_got_section): Initialize
+	->got if the section already exists.
+
+2003-09-19  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* dwarf2.c (decode_line_info): Cope with an initially empty
+	filename table.
+
+2003-09-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* acinclude.m4: Include ../config/accross.m4.
+	* aclocal.m4: Regenerated.
+
+	* configure.host (HOST_64BIT_TYPE): Remove if it is set to long
+	or long long.
+	(HOST_U_64BIT_TYPE): Remove if it is set to unsigned long long.
+	(host64): Remove if HOST_64BIT_TYPE is set to long.
+
+	* configure.in (HOST_64BIT_TYPE): Set according to the size of
+	long and long long.
+	(HOST_U_64BIT_TYPE): Likewise.
+	(host64): Likewise.
+	* configure: Regenerated.
+
+2003-09-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (elfcore_write_note): Don't use sizeof(Elf_External_note)
+	since some ABIs round up the size of the struct.
+
+2003-09-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (_bfd_elf_merge_symbol): Allow type change if
+	the old symbol is undefined and the new symbol is defined.
+
+2003-09-18  Andreas Schwab  <schwab@suse.de>
+
+	* simple.c (bfd_simple_get_relocated_section_contents): Use
+	_bfd_generic_link_hash_table_create instead of
+	bfd_link_hash_table_create.
+
+2003-09-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_special_sections): Mark all sections
+	started with ".sbss" or "".sdata" as SHF_IA_64_SHORT.
+
+2003-09-10  John David Anglin	<dave.anglin@nrc-cnrc.nrc.ca>
+	    Randolph Chung	<randolph@tausq.org>
+
+	* elf32-hppa.c (struct elf32_hppa_link_hash_entry,
+	hppa_link_hash_newfunc, hppa_build_one_stub,
+	elf32_hppa_adjust_dynamic_symbol, mark_PIC_calls, allocate_plt_static,
+	allocate_dynrelocs, elf32_hppa_size_dynamic_sections,
+	elf32_hppa_finish_dynamic_symbol): Remove pic_call field and all code
+	for generating import stubs for calls to statically linked PIC
+	functions.
+	(hppa_type_of_stub): Don't generate an import stub for calls to
+	statically linked pic functions.  Generate import stubs for calls
+	in a shared object, to functions not in a regular file, and to
+	defined weak functions.  Add new argument INFO.
+	(hppa_build_one_stub): Don't undef ADDIL_DP.
+	(elf32_hppa_check_relocs): Don't set SEC_HAS_GOT_REF flag.
+	(elf32_hppa_size_stubs): Pass info to hppa_type_of_stub.
+	(final_link_relocate): Change all DLTIND relocs to DPREL relocs in a
+	non-shared link.  Convert instructions that use the the linkage table
+	pointer, or a facsimile thereof, to use the global data pointer when
+	the reloc has been changed.
+
+2003-09-08  Joel Brobecker  <brobecker@gnat.com>
+
+	* archures.c: Add new machine names for hppa.
+	* bfd-in2.h: Regenerate.
+	* cpu-hppa.c: Use the new machine names.
+
+2003-09-06  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* elf32-m68hc1x.h (struct m68hc11_elf_link_hash_table): Remove
+	all_local_syms member.
+	* elf32-m68hc1x.c (elf32_m68hc11_size_stubs): Use bfd_elf_get_elf_syms
+	to get the local symbols.
+
+2003-09-06  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* elf32-m68hc12.c (elf32_m68hc12_special_sections): New for hc11.
+	(elf_backend_special_sections): Define.a
+
+	PR savannah/4950:
+	* elf32-m68hc11.c (elf32_m68hc11_special_sections): The .vectors
+	section is read-only.
+
+2003-09-04  Nick Clifton  <nickc@redhat.com>
+
+	* archures.c (bfd_mach_v850e1): Define.
+	* bfd-in2.h: Regenerate.
+	* cpu-v850.h (scan): Accept bfd_mach_v850e1.
+	(arch_info_struct): Include an entry for bfd_mach_v850e1.
+	* elf32-v850.c (v850_elf_object_p): Accept E_V850E1_ARCH flag.
+	(v850_elf_final_write_processing): Accept bfd_mach_v850e1.
+	(v850_elf_print_private_bfd_data): Interpret E_V850E1_ARCH flag.
+	(v850_elf_merge_private_bfd_data): Allow v850e1 binaries to be
+	linked with v850e binaries.  Mark the output as v850e.
+
+2003-09-03  Nick Clifton  <nickc@redhat.com>
+
+	* cofflink.c (_bfd_coff_link_input_bfd): Do not skip section
+	symbols that are used in relocs.
+
+2003-08-30  Robert Millan  <robertmh@gnu.org>
+
+	* configure.in: Match GNU/KFreeBSD with new kfreebsd*-gnu triplet.
+	* config.bfd: Likewise.
+	* configure: Regenerate.
+
+2003-08-31  Christian Groessler  <chris@groessler.org>
+
+	* elf32-i860.c (i860_howto_pc26_reloc): Finish relocation here
+	instead of returning bfd_reloc_continue.
+
+2003-08-31  Andreas Jaeger  <aj@suse.de>
+
+	* merge.c: Update to ISO C90.
+
+2003-08-27  Ian Lance Taylor  <ian@airs.com>
+
+	* configure.in: Check for strtoull.
+	* bfd.c (bfd_scan_vma): Use strtoull when available.
+	* configure, config.in: Regenerate.
+
+	* configure.in: Define and substitute BFD_HOST_LONG_LONG.
+	* bfd-in.h: Define BFD_HOST_LONG_LONG.  Test it rather than
+	__GNUC__ when deciding whether to use long long for
+	BFD_HOST_64_BIT.
+	* configure, Makefile.in, doc/Makefile.in, bfd-in2.h: Regenerate.
+
+2003-08-27  Christian Groessler  <chris@groessler.org>
+
+	* elf32-i860.c (i860_howto_pc26_reloc, i860_howto_pc16_reloc,
+	i860_howto_splitn_reloc, i860_howto_highadj_reloc): New
+	functions.
+	(elf32_i860_howto_table): Insert the new functions as
+	'special_function's in the proper reloc type entries.
+
+2003-08-27  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elf32-frv.c (elf32_frv_relocate_section): Use
+	_bfd_elf_rela_local_sym.
+
+2003-08-26  Michael Snyder  <msnyder@redhat.com>
+
+	* cpu-frv.c: Remove unused enum.
+
+2003-08-25  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+	* reloc.c: Fix documentation for MIPS ELF relocations.
+	libbfd.h: Regenerate.
+	bfd-in2.h: Regenerate.
+
+2003-08-24  Jason Eckhardt  <jle@rice.edu>
+
+	* coff-i860.c (CALC_ADDEND): Define to be a no-op.
+
+2003-08-24  Jason Eckhardt  <jle@rice.edu>
+
+	* elf32-i860.c (elf32_i860_relocate_pc16): Subtract 4 and
+	shift by 2 before storing the relocated value.
+
+2003-08-23  Jason Eckhardt  <jle@rice.edu>
+
+	* coff-i860.c (coff_i860_reloc_nyi): New function.
+	(howto_table): Add entries for relocations PAIR, HIGHADJ, HIGH,
+	LOWn, SPLITn, and BRADDR.
+	(RTYPE2HOWTO): Check that the r_type is within the howto_table
+	before trying to access the entry.
+	(coff_i860_rtype_to_howto): Likewise.
+	(coff_i860_reloc_type_lookup): New function.
+	(i860_reloc_processing): New function.
+	(coff_bfd_reloc_type_lookup): Define macro.
+	(RELOC_PROCESSING): Define macro.
+	Minor formatting adjustments.
+
+2003-08-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_link_add_object_symbols): Don't crash on NULL owner.
+
+2003-08-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_create_dynamic_sections): Align the
+	.got section at 8 bytes.
+
+2003-08-21  Nick Clifton  <nickc@redhat.com>
+
+	* cofflink.c: Update to ISO C90 and tidy up formatting.
+
+2003-08-21  Randolph Chung  <tausq@debian.org>
+
+	* elf32-hppa.c (elf32_hppa_object_p): For elf32-hppa-linux, objects
+	can have OSABI=Linux or OSABI=SysV.  Check for both.
+	* elf64-hppa.c (elf64_hppa_object_p): Likewise.
+
+2003-08-21  Nick Clifton  <nickc@redhat.com>
+
+	* po/sv.po: Updated Swedish translation.
+
+2003-08-20  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elf64-mips.c (elf_backend_copy_indirect_symbol): Define.
+
+2003-08-20  Nick Clifton  <nickc@redhat.com>
+
+	* elf-bfd.h (RELOC_FOR_GLOBAL_SYMBOL): New macro used to
+	replace some duplicated code in most elfxx-xxxx.c files.  This
+	version uses the new fields in bfd_link_info.
+
+	* elf-m10300.c (mn10300_elf_relocate_section): Use new macro.
+	* elf32-arm.h (elf32_arm_relocate_section): Likewise.
+	* elf32-cris.c (cris_elf_relocate_section): Likewise.
+	* elf32-hppa.c (elf32_hppa_relocate_section): Likewise.
+	* elf32-i386.c (elf_i386_relocate_section): Likewise.
+	* elf32-ip2k.c (ip2k_elf_relocate_section): Likewise.
+	* elf32-iq2000.c (iq2000_elf_relocate_section): Likewise.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	* elf32-s390.c (elf_s390_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+	* elf32-vax.c (elf_vax_relocate_section): Likewise.
+	* elf32-xtensa.c (elf_xtensa_relocate_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relocate_section): Likewise.
+	* elf64-ppc.c (ppc64_elf_relocate_section): Likewise.
+	* elf64-s390.c (elf_s390_relocate_section): Likewise.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Likewise.
+
+	* elf-hppa.h (elf_hppa_unmark_useless_dynamic_symbols,
+	elf_hppa_remark_useless_dynamic_symbols,
+	elf_hppa_relocate_section): Use the new fields in
+	bfd_link_info structure.
+	* elf32-sh.c (sh_elf_relocate_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_check_relocs): Likewise.
+	* elf64-hppa.c (elf64_hppa_check_relocs): Likewise.
+	* elf64-sh64.c (sh_elf64_relocate_section): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_check_relocs): Likewise.
+	* elfxx-mips.c (mips_elf_calculate_relocation): Likewise.
+
+	* elflink.h (elf_link_output_extsym): Fix test for reporting
+	undefined symbols in shared libraries.  Remove redundant test
+	of shlib_undefined when reporting references to forced local
+	symbols.
+
+2003-08-18  Andreas Schwab  <schwab@suse.de>
+
+	* libpei.h (bfd_pe_executable_p): Also recognize efi-app
+	executables.
+
+2003-08-17  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* simple.c (bfd_simple_get_relocated_section_contents): Move
+	reloc_done hack to before first bfd_section_size call.  Change all
+	returns to use new wrapper macro RETURN, restoring sec->reloc_done.
+
+2003-08-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c: Don't include elf/ppc.h.
+
+2003-08-14  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_modify_segment_map): Fix PT_DYNAMIC
+	code to work with 64-bit bfds.
+
+2003-08-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* dep-in.sed: Remove libintl.h.
+	* Makefile.am (SRC-POTFILES.in, BLD-POTFILES.in): Unset LC_COLLATE.
+	(POTFILES.in): Remove target.
+	* Makefile.in: Regenerate.
+
+2003-08-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_next_input_section): Update comment.
+	(ppc64_elf_relocate_section): For zero sym R_PPC64_TOC relocs,
+	use the function sym from the previous reloc.
+
+2003-08-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-i386.c (elf_i386_relocate_section): Make undefined symbols
+	fatal if -pie.
+	* elf32-s390.c (elf_s390_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relocate_section): Likewise.
+	* elf64-ppc.c (ppc64_elf_relocate_section): Likewise.
+	* elf64-s390.c (elf_s390_relocate_section): Likewise.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	(ppc_elf_relocate_section) <case R_PPC_RELAX32>: Issue fatal error
+	on undefined symbols if -pie.
+	* elf32-sh.c (sh_elf_relocate_section): Likewise.
+
+2003-08-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_relocate_section): Add special case for crt1.o
+	branch to __libc_start_main.
+
+2003-08-08 Dmitry Diky <diwil@mail.ru>
+
+	* archures.c: Add xW42 and xE42 parts. Sort MPU list according to
+	gcc order.
+	* cpu-msp430.c: Likewise.
+	* elf32-msp430.c: Likewise.
+	* bfd-in2.h: Regenerate.
+
+2003-08-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elfxx-target.h: Remove PTR cast.
+	* targets.c (bfd_target): Make backend_data const void *.
+	* elf-bfd.h: Constify all occurrences of struct elf_backend_data.
+	* elf-m10300.c: Likewise.
+	* elf.c: Likewise.
+	* elf32-hppa.c: Likewise.
+	* elf32-i386.c: Likewise.
+	* elf32-m68hc1x.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-s390.c: Likewise.
+	* elf32-sh.c: Likewise.
+	* elf32-sh64.c: Likewise.
+	* elf32-sparc.c: Likewise.
+	* elf32-xtensa.c: Likewise.
+	* elf64-mips.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf64-s390.c: Likewise.
+	* elf64-sh64.c: Likewise.
+	* elf64-sparc.c: Likewise.
+	* elf64-x86-64.c: Likewise.
+	* elfcode.h: Likewise.
+	* elfcore.h: Likewise.
+	* elflink.c: Likewise.
+	* elflink.h: Likewise.
+	* elfxx-ia64.c: Likewise.
+	* elfxx-mips.c: Likewise.
+	* elfxx-mips.h: Likewise.
+	* elf.c (prep_headers): Remove useless check for null backend_data.
+	* bfd-in2.h: Regenerate.
+
+	* elf-bfd.h: Remove PARAMS macro.  Replace PTR with void *.
+	(NAME): Use ## rather than CONCAT4 macro.
+	* elfcode.h: Remove one remaining PARAMS macro.
+	* elf-eh-frame.c: Convert to C90, remove unneeded casts and prototypes.
+	* elf-strtab.c: Likewise.
+	* elf-hppa.h: Likewise.
+	* elf32-hppa.h: Likewise.
+	* elf32-hppa.c: Likewise.
+	(elf32_hppa_add_symbol_hook): Delete.
+	(elf_backend_add_symbol_hook): Don't define.
+	* libhppa.h: Convert to C90.  Replace INLINE with inline.
+
+2003-08-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc_stub_name): Tweak names for better readability.
+	(ppc64_elf_adjust_dynamic_symbol): Allow copy relocs against
+	function descriptors, but warn.
+	(ppc_build_one_stub): Remove a couple of vars.  Move code creating
+	stub syms so that we can avoid a stub sym if we already have a
+	plt sym.  Do not redefine an existing symbol.
+	(ppc64_elf_build_stubs): When --emit-stub-syms, print a symbol for
+	glink.
+
+2003-08-06  Nick Clifton  <nickc@redhat.com>
+
+	* po/fr.po: Updated French translation.
+
+2003-08-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (_bfd_elf_create_dynamic_sections): Mark .dynbss with
+	SEC_LINKER_CREATED.
+
+2003-08-05  Daniel Jacobowitz  <drow@mvista.com>
+
+	* elf32-arm.h (WILL_CALL_FINISH_DYNAMIC_SYMBOL): Define.
+	(elf32_arm_final_link_relocate, elf32_arm_relocate_section): Use it.
+
+2003-08-03  Jeff Muizelaar  <muizelaar@rogers.com>
+
+	* coffcode.h (coff_slurp_line_table): Return with a warning
+	message if the line number table could not be read.
+
+2003-08-04  Nick Clifton  <nickc@redhat.com>
+
+	* elflink.h (elf_link_add_object_symbols): Prepend "warning: "
+	to messages produced for .gnu.warning.SYMBOL sections.
+
+2003-08-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elfcode.h: Convert to C90, remove unneeded casts and prototypes.
+	* elfcore.h: Likewise.
+	* elflink.c: Likewise.
+	* elflink.h: Likewise.
+	* elf.c (sym_is_global): Remove INLINE.
+	(align_file_position): Replace INLINE with inline.
+	* elfcode.h (elf_swap_dyn_in, elf_swap_dyn_out): Remove INLINE.
+	(elf_file_p): Replace INLINE with inline.
+
+2003-08-02  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c (sh_elf_check_relocs): Don't set DF_TEXTREL here.
+
+2003-08-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (get_got): Align the .got section at 8 bytes.
+
+2003-08-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_finish_dynamic_symbol): Use
+	ElfNN_External_Rela instead of Elf64_External_Rela.
+
+2003-08-01  Nick Clifton  <nickc@redhat.com>
+
+	* config.bfd: Add code to catch obsolete configurations and warn
+	about them unless --enable-obsolete is used.  Use this to mark
+	vax-vms port as obsolete.
+
+2003-07-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_install_value): Tidy.
+	(ppc_elf_relax_section): Remove dead code.  Remove unnecessary casts.
+	Formatting.
+	* elfxx-target.h: Remove PARAMS macro.  Formatting.
+
+2003-07-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (bfd_section_from_r_symndx): Test for SHN_UNDEF.
+	* elf64-ppc.c (get_fdh): New function, split out from
+	ppc64_elf_edit_opd.
+	(ppc64_elf_check_relocs): Use get_fdh.
+	(func_desc_adjust): Likewise.  Tidy.
+	(ppc64_elf_edit_opd): Tighten reloc checks.  Free local_syms on error
+	exit.  Use get_fdh.  Account for superfluous dynamic relocs.
+	(ppc64_elf_relocate_section): Warning fix.
+
+2003-07-30  Jason Eckhardt  <jle@rice.edu>
+
+	* coff-i860.c: Convert to ISO C90.  Remove superflous prototypes.
+
+2003-07-30  Jason Eckhardt  <jle@rice.edu>
+
+	* elf32-i860.c: Convert to ISO C90.  Remove superflous prototypes.
+
+2003-07-30  Randolph Chung  <tausq@debian.org>
+
+	* elf-hppa.h (elf_hppa_relocate_section): Look up dyn_h for undefweak.
+	* elf64-hppa.c (elf64_hppa_finalize_dlt): Check h->root.type.
+
+2003-07-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c: Convert to C90, remove unnecessary prototypes and casts.
+	Replace PTR with void *.  Formatting.
+	(_bfd_elf_assign_file_position_for_section): Remove INLINE.
+	(make_mapping): Likewise.
+
+2003-07-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (func_desc_adjust): Give linker created function
+	descriptor symbols a size and type.
+	(ppc64_elf_relocate_section): Correct lq insn test.
+
+2003-07-28  Eric Christopher  <echristo@redhat.com>
+
+	* elf32-ppc.c (R_PPC_RELAX32): New relocation.
+	(ppc_elf_install_value): New function.
+	(ppc_elf_sort_rela): Remove.
+	(ppc_elf_relax_section): Rewrite. Remove old relaxation
+	and replace with out of range branch stubs.
+	(ppc_elf_relocate_section): Handle R_PPC_RELAX32.
+
+2003-07-29  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf-m10300.c (mn10300_elf_relax_section): Take symbol hash table
+	from input_bfd.
+
+2003-07-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (special_sections): Set attributes for .got and .plt.
+
+2003-07-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol): Ensure no copy relocs
+	on function descriptors.
+	(ELIMINATE_COPY_RELOCS): Expand comment.
+	(ppc64_elf_special_sections): Move.  Don't include non-ppc64 sections.
+	Do include ".toc1".
+
+2003-07-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (_bfd_elf_new_section_hook): Set the default section
+	type to SHT_NULL.
+	(elf_fake_sections): Set the section type based on asect->flags
+	if it is SHT_NULL. Don't abort on processor specific section
+	types.
+
+2003-07-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfd-in2.h: Regenerated.
+
+2003-07-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (bfd_elf_special_section): New.
+	(elf_backend_data): Add special_sections, a pointer to
+	bfd_elf_special_section.
+	(elf_section_type). New.
+	(elf_section_flags): New.
+	(_bfd_elf_get_sec_type_attr): New.
+
+	* elf.c (_bfd_elf_make_section_from_shdr): Always use the
+	real section type/flags.
+	(special_sections): New.
+	(get_special_section): New.
+	(_bfd_elf_get_sec_type_attr): New.
+	(_bfd_elf_new_section_hook): Check special_section to set
+	elf_section_type and elf_section_flags.
+	(elf_fake_sections): Don't use section name to set ELF section
+	data.
+
+	* elf32-m32r.c (m32r_elf_special_sections): New.
+	(elf_backend_special_sections): Defined.
+
+	* elf32-m68hc11.c (elf32_m68hc11_special_sections): New.
+	(elf_backend_special_sections): Defined.
+
+	* elf32-mcore.c (mcore_elf_special_sections): New.
+	(elf_backend_special_sections): Defined.
+
+	* elf32-ppc.c (ppc_elf_special_sections): New.
+	(elf_backend_special_sections): Defined.
+
+	* elf32-sh64.c (sh64_elf_special_sections): New.
+	(elf_backend_special_sections): Defined.
+
+	* elf32-v850.c (v850_elf_special_sections): New.
+	(elf_backend_special_sections): Defined.
+
+	* elf32-xtensa.c (elf_xtensa_special_sections): New.
+	(elf_backend_special_sections): Defined.
+
+	* elf64-alpha.c (elf64_alpha_special_sections): New.
+	(elf_backend_special_sections): Defined.
+
+	* elf64-hppa.c (elf64_hppa_special_sections): New.
+	(elf_backend_special_sections): Defined.
+
+	* elf64-ppc.c (ppc64_elf_special_sections): New.
+	(elf_backend_special_sections): Defined.
+
+	* elf64-sh64.c (sh64_elf64_special_sections): New.
+	(elf_backend_special_sections): Defined.
+
+	* elfxx-ia64.c (elfNN_ia64_special_sections): New.
+	(elf_backend_special_sections): Defined.
+
+	* elfxx-mips.c (_bfd_mips_elf_special_sections): New.
+
+	* elfxx-mips.h (_bfd_mips_elf_special_sections): New.
+	(elf_backend_special_sections): Defined.
+
+	* elfxx-target.h (elf_backend_special_sections): New. Default
+	to NULL.
+	(elfNN_bed): Initialize special_sections.
+
+	* section.c (bfd_abs_section): Remove const.
+	(bfd_und_section): Likewise.
+	(bfd_com_section): Likewise.
+	(bfd_ind_section): Likewise.
+
+2003-07-24  Nick Clifton  <nickc@redhat.com>
+
+	* coff-arm.c (EXTRA_S_FLAGS): Include SEC_CODE so that code
+	sections are assigned the LOAD attribute.
+
+2003-07-25  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c: Convert to C90.  Replace PTR with void *.
+	* elf32-sh64-com.c: Likewise.
+	* elf32-sh64.c: Likewise.
+	* elf32-sh64.h: Likewise.
+	* elf64-sh64.c: Likewise.
+
+2003-07-24  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c (sh_elf_adjust_dynamic_symbol): Use SYMBOL_CALLS_LOCAL.
+	(allocate_dynrelocs): Likewise.
+	(sh_elf_relocate_section): Likewise. Use SYMBOL_REFERENCES_LOCAL.
+	(sh_elf_finish_dynamic_symbol): Use SYMBOL_REFERENCES_LOCAL.
+
+2003-07-24  Nick Clifton  <nickc@redhat.com>
+
+	* po/fr.po: Updated French translation.
+
+2003-07-23  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (xtensa_elf_dynamic_symbol_p): Make inline and move
+	near the beginning of the file.  Swap order of arguments.  Call
+	_bfd_elf_dynamic_symbol_p with "ignore_protected" set to 0.
+	(elf_xtensa_fix_refcounts): Adjust xtensa_elf_dynamic_symbol_p call.
+	(elf_xtensa_relocate_section): Likewise.
+	(shrink_dynamic_reloc_sections): Likewise.
+
+2003-07-23  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (plt_reloc_count): Fix typo in comment.
+	(elf_xtensa_size_dynamic_sections): Use elf_discarded_section.
+	(elf_xtensa_combine_prop_entries): Avoid returning non-zero without
+	first printing an error message.
+	(elf_xtensa_finish_dynamic_sections): Likewise.
+	(elf_xtensa_discard_info_for_section): Adjust size of .got.loc when
+	discarding literal table entries.
+	(elf_xtensa_merge_private_bfd_data): Remove newline from error message.
+	(elf_xtensa_do_asm_simplify): Likewise.
+
+2003-07-23  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* elf32-m68hc1x.c (elf32_m68hc11_size_stubs): Avoid crash when
+	we have a local symbol in common section.
+
+2003-07-22  H.J. Lu <hongjiu.lu@intel.com>
+
+	* elflink.c (_bfd_elf_dynamic_symbol_p): Don't return TRUE for
+	weak symbols.
+
+2003-07-22  Nick Clifton  <nickc@redhat.com>
+
+	* coffcode.h (coff_slurp_symbol_table): Add C_TCSYM and C_ECOML to
+	expected RS6000 storage classes.
+
+2003-07-21  H.J. Lu <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_size_dynamic_sections): Mark
+	output_bfd unused to silence gcc.
+
+2003-07-21  Nick Clifton  <nickc@redhat.com>
+
+	* po/sv.po: Updated Swedish translation.
+
+2003-07-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (SYMBOL_REFERENCES_LOCAL, SYMBOL_CALLS_LOCAL): Use..
+	(_bfd_elf_symbol_refs_local_p): ..this.  Declare.
+	* elflink.c (_bfd_elf_symbol_refs_local_p): New function.
+	* elf32-i386.c (elf_i386_relocate_section): Remove h NULL test
+	now done in _bfd_elf_symbol_refs_local_p.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	* elf64-ppc.c (ppc64_elf_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+
+2003-07-18  H.J. Lu <hongjiu.lu@intel.com>
+
+	* elflink.c (_bfd_elf_dynamic_symbol_p): Undo the last change.
+
+2003-07-18  H.J. Lu <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (SYMBOL_REFERENCES_LOCAL): Fix a typo.
+	(SYMBOL_CALLS_LOCAL): Likewise.
+
+	* elflink.c (_bfd_elf_dynamic_symbol_p): Return TRUE
+	immediately if symbol isn't defined locally.
+
+2003-07-18  Richard Henderson  <rth@redhat.com>
+
+	* elflink.c (_bfd_elf_dynamic_symbol_p): New.
+	* elf-bfd.h (_bfd_elf_dynamic_symbol_p): Declare it.
+	(SYMBOL_REFERENCES_LOCAL, SYMBOL_CALLS_LOCAL): Use it.
+	* elf32-xtensa.c (xtensa_elf_dynamic_symbol_p): Likewise.
+	* elf64-alpha.c (alpha_elf_dynamic_symbol_p): Likewise.
+	* elf64-hppa.c (elf64_hppa_dynamic_symbol_p): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_dynamic_symbol_p): Likewise.
+	Update all callers to provide the relocation being resolved.
+
+2003-07-17  Shaun Jackman <sjackman@pathwayconnect.com>
+
+	* config.bfd (arm-wince-pe): Add -DARM_COFF_BUGFIX to
+	targ_cflags.
+
+2003-07-17  Nick Clifton  <nickc@redhat.com>
+
+	* po/es.po: New Spanish translation.
+	* po/sv.po: New Swedish translation.
+	* po/opcodes.pot: Regenerate.
+
+2003-07-16  Richard Henderson  <rth@redhat.com>
+
+	* config.bfd, configure.host, configure.in: Remove ia64-aix support.
+	* elfxx-ia64.c, targets.c: Likewise.
+
+2003-07-16  Richard Henderson  <rth@redhat.com>
+
+	* elfxx-ia64.c (elfNN_ia64_dynamic_symbol_p): Properly return false
+	for symbols defined locally plus -Bsymbolic.  Tidy logic.
+
+2003-07-15  Richard Sandiford  <rsandifo@redhat.com>
+
+	* archures.c (bfd_mach_mips7000): New.
+	* bfd-in2.h: Regenerated.
+	* cpu-mips.c (arch_info_struct): Add an entry for mips:7000.
+	* elfxx-mips.c (mips_set_isa_flags): Handle bfd_mach_mips7000.
+	(mips_mach_extensions): Add an entry for it.
+
+2003-07-14  Nick Clifton  <nickc@redhat.com>
+
+	* po/tr.po: Update with latest version.
+	* po/SRC-POTFILES.in: Regenerate.
+	* po/bfd.pot: Regenerate.
+	* Makfile.in: Regenerate.
+	* configure: Regenerate.
+
+2003-07-12  Jeff Baker  <jbaker@qnx.com>
+
+	* config.bfd (__QNXTARGET__): Define for Neutrino architectures.
+	* elf32-arm.h (ELF_MAXPAGESIZE): Set to 4k for Neutrino.
+	* elf32-sh.c (ELF_MAXPAGESIZE): Set to 4k for Neutrino.
+	* elf32-ppc.c (ELF_MAXPAGESIZE): Set to 4k for Neutrino.
+
+2003-07-12  Jeff Muizelaar  <muizelaar@rogers.com>
+
+	* coffcode.h (coff_set_section_contents): Set the
+	IMAGE_FILE_32BIT_MACHINE flag for PE targets.
+
+2003-07-11  Richard Sandiford  <rsandifo@redhat.com>
+
+	* bfd-in.h (bfd_h8300_pad_address): Declare.
+	* bfd-in2.h: Regenerate.
+	* cpu-h8300.c (bfd_h8300_pad_address): New function.
+	* coff-h8300.c (h8300_reloc16_estimate): Use it to canonicalize
+	addresses before checking whether they can be relaxed.
+	(h8300_reloc16_extra_cases): Likewise for the R_MOVL2 sanity check.
+	Don't complain about overflows in general 8-bit relocations.
+	* elf32-h8300.c (elf32_h8_relax_section): Use bfd_h8300_pad_address.
+	Fix handling of R_H8_DIR24A8.
+
+2003-07-11  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elf32-h8300.c: Convert function prototypes and definitions
+	to C90 syntax.
+	* coff-h8300.c: Likewise.
+	* cpu-h8300.c: Likewise.
+
+2003-07-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* po/SRC-POTFILES.in: Regenerate.
+	* po/bfd.pot: Likewise.
+
+2003-07-10  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_xtensa_create_dynamic_sections): Create new
+	.got.loc section.  Do not set SEC_ALLOC or SEC_LOAD flags for the
+	.xt.lit.plt section.
+	(elf_xtensa_size_dynamic_sections): Set size of the .got.loc section
+	and allocate memory for it.
+	(elf_xtensa_combine_prop_entries): Copy contents of .xt.lit output
+	section to the .got.loc section.
+	(elf_xtensa_finish_dynamic_sections): Fix up call to
+	elf_xtensa_combine_prop_entries and set DT_XTENSA_GOT_LOC_OFF to
+	the address of .got.loc.
+	(relax_property_section): Shrink .got.loc to match changes in any
+	literal table section.
+	(xtensa_is_property_section): Change to match
+	xtensa_get_property_section_name.
+	(xtensa_is_littable_section): New.
+
+2003-07-10  H.J. Lu <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (IA64_HOWTO): Set dst_mask to -1 instead of
+	-1LL.
+
+2003-07-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (BFD32_BACKENDS): Add elf32-am33lin.lo.
+	(BFD32_BACKENDS_CFILES): elf32-am33lin.c not elf32-am33lin.lo.
+	Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2003-07-10  Alexandre Oliva  <aoliva@redhat.com>
+
+	2001-09-12  Alexandre Oliva  <aoliva@redhat.com>
+	* elf32-am33lin.c (ELF_MACHINE_CODE): Redefine to EM_MN10300.
+	(ELF_MACHINE_ALT1): Define to EM_CYGNUS_MN10300.
+	2001-06-02  Nick Clifton  <nickc@cambridge.redhat.com>
+	* elf32-am33lin.c: Rename global functions.
+	2001-05-09  Alexandre Oliva  <aoliva@redhat.com>
+	* config.bfd (am33_2.0, am33_2.0-*-linux*): Added.
+	* configure.in (bfd_elf32_am33lin_vec): Added.
+	* Makefile.am (BFD32_BACKENDS): Added elf32-am33lin.lo.
+	(elf32-am33lin.lo): List dependencies.
+	* aclocal.m4, configure, Makefile.in: Rebuilt.
+	* elf-m10300.c (TARGET_LITTLE_SYM, TARGET_LITTLE_NAME,
+	ELF_ARCH, ELF_MACHINE_CODE, ELF_MAXPAGESIZE): Define only if
+	ELF_ARCH was not defined before.
+	(elf_symbol_leading_char): Define if not defined.
+	* elf32-am33lin.c: Override the definitions above.
+	* targets.c (bfd_elf32_am33lin_vec): New.
+
+2003-07-09  Alexandre Oliva  <aoliva@redhat.com>
+
+	2002-12-12  Alexandre Oliva  <aoliva@redhat.com>
+	* elf-m10300.c (elf32_mn10300_link_hash_newfunc): Initialize
+	pcrel_relocs_copied.
+	2001-12-13  Alexandre Oliva  <aoliva@redhat.com>
+	* elf-m10300.c (ELF_DYNAMIC_INTERPRETER): Renamed from
+	ld-linux.so.2 to ld.so.1.
+	2001-10-10  Alexandre Oliva  <aoliva@redhat.com>
+	* elf-m10300.c (elf_mn10300_sizeof_plt0): New macro.
+	(_bfd_mn10300_elf_adjust_dynamic_symbol): Use it.
+	(_bfd_mn10300_elf_finish_dynamic_symbol): Likewise.
+	* elf-m10300.c (_bfd_mn10300_elf_size_dynamic_sections): Allocate
+	.rela.* section contents with bfd_zalloc.
+	2001-09-25  Alexandre Oliva  <aoliva@redhat.com>
+	* elf-m10300.c: Added declarations for functions missing them.
+	Merge some shared-library changes from the i386 back-end.  Use
+	R_MN10300_RELATIVE instead of R_MN10300_PCREL32 and
+	R_MN10300_GLOB_DAT instead of R_MN10300_32 where appropriate.
+	(struct elf32_mn10300_link_hash_entry): Remove duplicates of
+	members of elf_link_hash_entry.  Adjusted references.
+	(mn10300_elf_final_link_relocate): dynobj was already loaded
+	into a local variable, use it.
+	2001-09-21  Nick Clifton  <nickc@cambridge.redhat.com>
+	* elf-m10300.c: Add missing function prototypes.
+	2001-08-24  Alexandre Oliva  <aoliva@redhat.com>
+	* elf-m10300.c (mn10300_elf_relocate_section): Don't compute
+	relocation for dynamic relocations.
+	2001-05-16  Alexandre Oliva  <aoliva@redhat.com>
+	* reloc.c (BFD_RELOC_MN10300_GOTOFF24): New.
+	* elf-m10300.c: Introduce GOTPC16, GOTOFF24, GOTOFF16 and
+	PLT16, and rename GOTPC to GOTPC32 and GOTOFF to GOTOFF32.
+	(_bfd_mn10300_elf_create_dynamic_sections): Move creation ot PLT...
+	(_bfd_mn10300_elf_create_got_section): ... here, so that its
+	adress is already known at the time we compute relaxations.
+	(mn10300_elf_relax_section): Relax GOTPC32, GOTOFF32, GOT32
+	and PLT32 to narrower relocations.
+	* libbfd.h, bfd-in2.h: Rebuilt.
+	2001-04-12  Alexandre Oliva  <aoliva@redhat.com>
+	* reloc.c (BFD_RELOC_MN10300_GOT32, BFD_RELOC_MN10300_GOT24,
+	BFD_RELOC_MN10300_GOT16, BFD_RELOC_MN10300_COPY,
+	BFD_RELOC_MN10300_GLOB_DAT, BFD_RELOC_MN10300_JMP_SLOT,
+	BFD_RELOC_MN10300_RELATIVE): New relocs.
+	* libbfd.h, bfd-in2.h: Rebuilt.
+	* elf-m10300.c (struct elf_mn10300_pcrel_relocs_copied): New.
+	(struct elf32_mn10300_link_hash_entry): Added DSO-related
+	fields.
+	(elf_mn10300_howto): Defined new relocation types.
+	(mn10300_reloc_map): Map them.
+	(_bfd_mn10300_elf_create_got_section): New fn.
+	(mn10300_elf_check_relocs): Handle PIC relocs.
+	(mn10300_elf_final_link_relocate): Likewise.
+	(mn10300_elf_relocate_section): Handle DSOs.
+	(PLT0_ENTRY_SIZE, PLT_ENTRY_SIZE, PIC_PLT_ENTRY_SIZE): New macros.
+	(elf_mn10300_plt0_entry, elf_mn10300_plt_entry,
+	elf_mn10300_pic_plt_entry): New.
+	(elf_mn10300_sizeof_plt, elf_mn10300_plt_plt0_offset,
+	elf_mn10300_plt0_linker_offset, elf_mn10300_plt0_gotid_offset,
+	elf_mn10300_plt_temp_offset, elf_mn10300_plt_symbol_offset,
+	elf_mn10300_plt_reloc_offset: New macros.
+	(ELF_DYNAMIC_INTERPRETER): Likewise.
+	(_bfd_mn10300_elf_create_dynamic_sections): New function.
+	(_bfd_mn10300_elf_adjust_dynamic_symbol): Likewise.
+	(_bfd_mn10300_elf_discard_copies): Likewise.
+	(_bfd_mn10300_elf_size_dynamic_sections): Likewise.
+	(_bfd_mn10300_elf_finish_dynamic_symbol): Likewise.
+	(_bfd_mn10300_elf_finish_dynamic_sections): Likewise.
+	(elf_backend_can_gc_sections,
+	elf_backend_create_dynamic_sections,
+	elf_backend_adjust_dynamic_sections,
+	elf_backend_size_dynamic_sections,
+	elf_backend_finish_dynamic_symbol,
+	elf_backend_finish_dynamic_sections, elf_backend_want_got_plt,
+	elf_backend_plt_readonly, elf_backend_want_plt_sym,
+	elf_backend_got_header_size, elf_backend_plt_header_size): New
+	macros.
+
+2003-07-09  Alexandre Oliva  <aoliva@redhat.com>
+
+	2001-05-06  Alexandre Oliva  <aoliva@redhat.com>
+	* elf-m10300.c (compute_function_info): Account for AM33
+	registers in `movm' when computing stack space for `call' when
+	linking for AM33/2.0 link.
+	2000-04-01  Alexandre Oliva  <aoliva@cygnus.com>
+	* archures.c (bfd_mach_am33_2): Renamed from bfd_mach_am332.
+	* bfd-in2.h: Rebuilt.
+	* cpu-m10300.c (bfd_am33_2_arch): Renamed from bfd_am332_arch.
+	* elf-m10300.c: Updated.
+	2000-03-31  Alexandre Oliva  <aoliva@cygnus.com>
+	* archures.c (bfd_mach_am332): Defined.
+	* bfd-in2.h: Rebuilt.
+	* cpu-m10300.c (bfd_am332_arch): Defined.
+	(bfd_am33_arch): Chained with am33-2.
+	* elf-m10300.c (elf_mn10300_mach): Handle am332.
+	(_bfd_mn10300_elf_final_write_processing): Likewise.
+
+2003-07-09  H.J. Lu <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (IA64_HOWTO): Set dst_mask to -1LL.
+
+2003-07-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (bfd_elf64_mkobject): Define.
+	(struct ppc64_elf_obj_tdata): New.
+	(ppc64_elf_tdata, ppc64_tlsld_got): Define.
+	(ppc64_elf_mkobject): New function.
+	(struct got_entry): Add "owner".  Move "tls_type".
+	(struct ppc_link_hash_table): Delete "relgot", "tlsld_got".
+	(ppc64_elf_init_stub_bfd): New function.
+	(create_got_section): Create header .got in dynobj.  Create .got
+	and .rela.got in each bfd.  Stash pointers in ppc64_elf_obj_tdata.
+	(ppc64_elf_create_dynamic_sections): Don't call create_got_section.
+	Look for dynobj .got, and test it.
+	(ppc64_elf_copy_indirect_symbol): Adjust for changed got.
+	(update_local_sym_info): Likewise.
+	(ppc64_elf_check_relocs): Likewise.
+	(ppc64_elf_gc_sweep_hook): Likewise.
+	(ppc64_elf_tls_optimize): Likewise.
+	(allocate_dynrelocs): Likewise.
+	(ppc64_elf_size_dynamic_sections): Likewise.
+	(ppc64_elf_relocate_section): Likewise.
+	(ppc64_elf_next_toc_section): Update comment.
+	(toc_adjusting_stub_needed): Remove unneeded cast.
+	(ppc64_elf_build_stubs): Check for stub sections in stub bfd by
+	testing section flags.
+	(ppc64_elf_build_stubs): Likewise.
+	(ppc64_elf_size_stubs): Likewise.  Remove stub_bfd param.
+	(ppc64_elf_finish_dynamic_sections): Write out got sections.
+	(func_desc_adjust): Copy over dynamic info for undef weaks.
+	* elf64-ppc.h (ppc64_elf_init_stub_bfd): Declare.
+	(ppc64_elf_size_stubs): Update prototype.
+	* elflink.h (elf_link_sort_relocs): Use link_orders to find reldyn
+	input sections rather than scanning dynobj.
+
+2003-07-09  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elfxx-mips.c (mips_elf_link_hash_entry): Remove min_dyn_reloc_index.
+	(bfd_mips_elf_swap_msym_in, bfd_mips_elf_swap_msym_out): Delete.
+	(mips_elf_create_msym_section): Delete.
+	(mips_elf_create_dynamic_relocation): Don't set min_dyn_reloc_index.
+	(_bfd_mips_elf_copy_indirect_symbol): Likewise.
+	(_bfd_mips_elf_create_dynamic_sections): Don't create .msym.
+	(_bfd_mips_elf_size_dynamic_sections): Don't calculate its size.
+	(_bfd_mips_elf_size_dynamic_sections): Don't add DT_MIPS_MSYM.
+	(_bfd_mips_elf_finish_dynamic_symbol): Don't add symbols to .msym.
+	(_bfd_mips_elf_finish_dynamic_sections): Likewise.
+
+2003-07-09  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elfxx-mips.c (mips_elf_irix6_finish_dynamic_symbol): Make the
+	symbols protected.
+
+2003-07-09  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elfxx-mips.c (mips_elf_create_dynamic_relocation): Fix handling
+	of relocations whose offset is -2.
+
+2003-07-09  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elfxx-mips.c (mips_elf_create_dynamic_relocation): Treat
+	forced-local symbols like other locals.  Don't create relocations
+	against STN_UNDEF in irix objects.
+
+2003-07-09  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elfxx-mips.c (mips_elf_create_dynamic_relocation): In SGI-
+	compatible objects, add the values of defined external symbols
+	to the addend.
+
+2003-07-09  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_finish_dynamic_symbol): Always
+	initialize a GOT entry to the symbol's st_value.
+
+2003-07-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_obj_tdata): Move linker_section_pointers..
+	* elf32-ppc.c (struct ppc_elf_obj_tdata): ..to here.  New.
+	(ppc_elf_tdata): Define.
+	(elf_local_ptr_offsets): Adjust.
+	(ppc_elf_mkobject): New function.
+	(bfd_elf32_mkobject): Define.
+
+	* elfcode.h (elf_object_p): Allocate tdata via _bfd_set_format.
+	* elfcore.h (elf_core_file_p): Likewise.
+	* section.c (bfd_section_init): Remove prototype.
+
+2003-07-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_link_hash_entry): Remove linker_section_pointer
+	field.
+	(enum elf_linker_section_enum): Delete.
+	(struct elf_linker_section): Delete.
+	(struct elf_linker_section_pointers): Delete.
+	(struct elf_obj_tdata): Remove #if 0 chunk.  Remove linker_section.
+	Make linker_section_pointers a void**.
+	(elf_local_ptr_offsets, elf_linker_section): Don't define.
+	* elf32-ppc.c (enum elf_linker_section_enum): New, cut-down version
+	of old item in elf-bfd.h.
+	(struct elf_linker_section): Likewise.
+	(struct elf_linker_section_pointers): Likewise.
+	(elf_local_ptr_offsets): Define.
+	(struct ppc_elf_link_hash_entry): Add linker_section_pointer.
+	(ppc_elf_link_hash_newfunc): Init it.
+	(struct ppc_elf_link_hash_table): Add sbss.
+	(ppc_elf_link_hash_table_create): zmalloc rather than clearing
+	individual fields.
+	(elf_create_linker_section): Fold into..
+	(ppc_elf_create_linker_section): ..here.  Remove hole_size code.
+	Make rela section here if shared.
+	(elf_find_pointer_linker_section): Pass lsect rather than enum.
+	(elf_create_pointer_linker_section): Adjust.  zalloc rather than
+	clearing in a loop.
+	(elf_finish_pointer_linker_section): Adjust.  Don't make rela
+	section here.
+	(ppc_elf_check_relocs): Adjust.
+	(ppc_elf_add_symbol_hook): Tighten hash creator test.  Remove code
+	creating .sbss by hand.
+	* elf.c (_bfd_elf_link_hash_newfunc): Adjust.
+
+2003-07-04  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-s390.c (elf_howto_table): Change R_390_GOT12 to
+	complain_overflow_bitfield.
+	* elf64-s390.c (elf_howto_table): Change R_390_GOT12 to
+	complain_overflow_bitfield.
+
+2003-07-04  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf-bfd.h (SYMBOL_REFERENCES_LOCAL, SYMBOL_CALLS_LOCAL): Return
+	true even if -pie.
+
+2003-07-04  Jakub Jelinek  <jakub@redhat.com>
+
+	* elfxx-ia64.c (struct elfNN_ia64_link_hash_table): Add rel_fptr_sec.
+	(elfNN_ia64_dynamic_symbol_p): Change info->shared into
+	!info->executable.
+	(get_fptr): For -pie create .opd as writable section and create
+	.rela.opd as well.
+	(elfNN_ia64_check_relocs): Change info->shared into
+	!info->executable.
+	(allocate_fptr): Likewise.
+	(allocate_dynrel_entries): Account for a relative reloc for -pie
+	@fptr().  Don't account for a relative reloc if -pie want_ltoff_fptr
+	for undefweak symbol.  Account for an IPLT reloc in .rela.opd
+	section if -pie.
+	(set_got_entry): Don't create a relative reloc if -pie
+	want_ltoff_fptr for undefweak symbol.
+	(set_fptr_entry): Emit an IPLT reloc in .rela.opd for -pie.
+	(elfNN_ia64_relocate_section): Emit a relative reloc for -pie
+	@fptr().
+
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Issue undefined_symbol
+	even if -pie.
+	* elf32-i386.c (elf_i386_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+	* elf64-s390.c (elf_s390_relocate_section): Likewise.
+	* elf64-ppc.c (ppc64_elf_relocate_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+	* elf32-s390.c (elf_s390_relocate_section): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+
+2003-07-04  Paul Clarke <paulc@senet.com.au>
+
+	* elf32-h8300.c (R_H8_DIR32A16): Fix name field.
+	(elf32_h8_relax_section) <R_H8_DIR16A8>: Adjust position of relocation.
+	<R_H8_DIR32A16>: Fix type of relocation.
+
+2003-07-04  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c (sh_elf_create_dynamic_sections): Return if dynamic
+	sections were created already.  Remove unnecessary tests of
+	the previous change.
+
+2003-07-04  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c (sh_elf_create_dynamic_sections): Don't call
+	bfd_make_section for existing sections.
+
+2003-07-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-sparc.c (elf32_sparc_check_relocs): Don't call
+	create_got_section if we already have done so.
+	* elf32-sh.c (sh_elf_create_dynamic_sections): Likewise.
+	(sh_elf_check_relocs): Likewise.
+	(sh_elf_adjust_dynamic_symbol): Delete "dynobj" var.  Use
+	htab->root.dynobj instead.
+	(sh_elf_check_relocs): Likewise.
+	(sh_elf_finish_dynamic_sections): Likewise.
+
+	* section.c (bfd_make_section): Return NULL for existing section.
+
+2003-07-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_create_dynamic_sections): Don't call
+	ppc_elf_create_got if we've already done so.
+
+	* elf-bfd.h (_bfd_elf_create_linker_section) Don't declare.
+	(_bfd_elf_find_pointer_linker_section): Likewise.
+	(bfd_elf32_create_pointer_linker_section): Likewise.
+	(bfd_elf32_finish_pointer_linker_section): Likewise.
+	(bfd_elf64_create_pointer_linker_section): Likewise.
+	(bfd_elf64_finish_pointer_linker_section): Likewise.
+	(_bfd_elf_make_linker_section_rela): Likewise.
+	* elfcode.h (elf_create_pointer_linker_section): Don't define.
+	(elf_finish_pointer_linker_section): Likewise.
+	* elflink.c (_bfd_elf_make_linker_section_rela): Delete.
+	(_bfd_elf_create_linker_section): Move this function..
+	(_bfd_elf_find_pointer_linker_section): ..and this..
+	* elflink.h (elf_create_pointer_linker_section): ..and this..
+	(elf_finish_pointer_linker_section): ..and this..
+	* elf32-ppc.c: ..to here, renaming to the following, and adjusting
+	calls.
+	(elf_create_linker_section): Convert to C90, tidy.
+	(elf_find_pointer_linker_section): Likewise.
+	(elf_create_pointer_linker_section): Likewise.
+	(elf_finish_pointer_linker_section): Likewise.
+	* elf32-i370.c: Delete #if 0 code.
+
+2003-07-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_func_desc_adjust): Don't allow _savef* and
+	_restf* to be satisfied by shared libs, and always force them local.
+	(toc_adjusting_stub_needed): Avoid scanning linker created sections.
+	Correct test for "bl".
+	(ppc64_elf_relocate_section <R_PPC64_TLS>): Correct test for
+	primary opcode 31.
+
+2003-07-01  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* elf32-s390.c (s390_elf_ldisp_reloc): New prototype.
+	(s390_tls_reloc): New function.
+	(elf_howto_table): Add long displacement relocations R_390_20,
+	R_390_GOT20, R_390_GOTPLT20 and R_390_TLS_GOTIE20.
+	(elf_s390_reloc_type_lookup): Likewise.
+	(elf_s390_check_relocs): Likewise.
+	(elf_s390_gc_sweep_hook): Likewise.
+	(elf_s390_relocate_section): Likewise.
+	* elf64-s390.c: Same changes as for elf32-s390.c.
+	* reloc.c: Add long displacement relocations BFD_RELOC_390_20,
+	BFD_RELOC_390_GOT20, BFD_RELOC_390_GOTPLT20 and
+	BFD_RELOC_390_TLS_GOTIE20.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Likewise.
+
+2003-06-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* cpu-ia64-opc.c (ext_imms_scaled): Don't sign extend using shifts.
+	(ins_imms, ins_immsm1u4): Likewise.  Warning fix.
+
+2003-06-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* archive.c: Convert to C90, remove unnecessary prototypes and casts.
+	Replace PTR with void *.  Formatting.
+	* archive64.c: Likewise.
+	* archures.c: Likewise.
+	* bfd-in.h: Likewise.
+	* bfd.c: Likewise.
+	* bfdio.c: Likewise.
+	* bfdwin.c: Likewise.
+	* cache.c: Likewise.
+	* corefile.c: Likewise.
+	* format.c: Likewise.
+	* init.c: Likewise.
+	* libbfd-in.h: Likewise.
+	* libbfd.c: Likewise.
+	* linker.c: Likewise.
+	* opncls.c: Likewise.
+	* reloc.c: Likewise.
+	* section.c: Likewise.
+	* simple.c: Likewise.
+	* syms.c: Likewise.
+	* targets.c: Likewise.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+	* ecoff.c (bfd_debug_section): Add missing kept_section initialization.
+	* libbfd-in.h (_bfd_sh_align_load_span): Don't declare if defined.
+	* libbfd.c (COERCE32, EIGHT_GAZILLION): Simplify.
+	(bfd_getb64): Rewrite without parens.
+	(bfd_getl64, bfd_getb_signed_64, bfd_getl_signed_64): Likewise.
+	* cache.c (insert, snip): Remove INLINE.
+	* linker.c (bfd_link_add_undef): Likewise.
+
+2003-06-29  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-x86-64.c: Convert to ISO C90 prototypes, remove
+	unnecessary prototypes.  Replace PTR with void *.
+	(elf64_x86_64_adjust_dynamic_symbol): Use SYMBOL_CALLS_LOCAL to
+	trim plt entries.  Move undefweak non-default visibility test ...
+	(allocate_dynrelocs): ... from here.
+	(WILL_CALL_FINISH_DYNAMIC_SYMBOL): Pass SHARED instead of INFO.
+	Change all callers.
+	(allocate_dynrelocs): Use SYMBOL_CALLS_LOCAL.  Use
+	SYMBOL_REFERENCES_LOCAL for dynreloc check.
+	(elf64_x86_64_relocate_section): Use SYMBOL_CALLS_LOCAL for
+	dynreloc and .got relocs.
+	(elf64_x86_64_finish_dynamic_symbol): Use SYMBOL_REFERENCES_LOCAL
+	for .got relocs.
+
+2003-06-29  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elfxx-mips.c: Allow lazy binding for R_MIPS_JALR.
+
+2003-06-27  Nick Clifton  <nickc@redhat.com>
+
+	* opncls.c (bfd_add_gnu_debuglink_section): Rename to
+	bfd_add_gnu_debuglink_section and only create the section, do not
+	fill in its contents.
+	(bfd_fill_in_gnu_debuglink_section): New function.  Fill in the
+	contents of a .gnu-debuglink section.
+	* bfd-in2.h: Regenerate.
+
+2003-06-27  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elfxx-mips.c: Revert .got alignment to 2**4.
+
+2003-06-27  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elf32-mips.c: Fix addend for _gp_disp special symbol.
+
+2003-06-27  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elfxx-mips.c (_bfd_mips_elf_fake_sections): Remove non-default
+	relocation header setup.
+
+2003-06-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_howto_table): Remove unnecessary cast.
+	(ppc_elf_reloc_type_lookup): Modify comment.
+	(ppc_elf_info_to_howto): Ditto.
+	(ppc_elf_relocate_section): Ditto.
+	(ppc_elf_check_relocs): Call ppc_elf_howto_init.
+
+2003-06-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* aout-ns32k.c: Correct spelling of "relocatable".
+	* aoutx.h: Likewise.
+	* bfd-in.h: Likewise.
+	* bfd.c: Likewise.
+	* bout.c: Likewise.
+	* coff-a29k.c: Likewise.
+	* coff-alpha.c: Likewise.
+	* coff-arm.c: Likewise.
+	* coff-i386.c: Likewise.
+	* coff-i860.c: Likewise.
+	* coff-i960.c: Likewise.
+	* coff-m68k.c: Likewise.
+	* coff-m88k.c: Likewise.
+	* coff-mcore.c: Likewise.
+	* coff-mips.c: Likewise.
+	* coff-or32.c: Likewise.
+	* coff-ppc.c: Likewise.
+	* coff-rs6000.c: Likewise.
+	* coff-sh.c: Likewise.
+	* coff-tic80.c: Likewise.
+	* coff64-rs6000.c: Likewise.
+	* cofflink.c: Likewise.
+	* cpu-ns32k.c: Likewise.
+	* ecoff.c: Likewise.
+	* ecofflink.c: Likewise.
+	* elf-bfd.h: Likewise.
+	* elf-eh-frame.c: Likewise.
+	* elf-hppa.h: Likewise.
+	* elf-m10200.c: Likewise.
+	* elf-m10300.c: Likewise.
+	* elf.c: Likewise.
+	* elf32-arm.h: Likewise.
+	* elf32-avr.c: Likewise.
+	* elf32-cris.c: Likewise.
+	* elf32-d10v.c: Likewise.
+	* elf32-dlx.c: Likewise.
+	* elf32-fr30.c: Likewise.
+	* elf32-frv.c: Likewise.
+	* elf32-h8300.c: Likewise.
+	* elf32-hppa.c: Likewise.
+	* elf32-i370.c: Likewise.
+	* elf32-i386.c: Likewise.
+	* elf32-i860.c: Likewise.
+	* elf32-i960.c: Likewise.
+	* elf32-ip2k.c: Likewise.
+	* elf32-iq2000.c: Likewise.
+	* elf32-m32r.c: Likewise.
+	* elf32-m68hc11.c: Likewise.
+	* elf32-m68hc1x.c: Likewise.
+	* elf32-m68k.c: Likewise.
+	* elf32-mcore.c: Likewise.
+	* elf32-mips.c: Likewise.
+	* elf32-msp430.c: Likewise.
+	* elf32-openrisc.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-s390.c: Likewise.
+	* elf32-sh.c: Likewise.
+	* elf32-sh64.c: Likewise.
+	* elf32-sparc.c: Likewise.
+	* elf32-v850.c: Likewise.
+	* elf32-vax.c: Likewise.
+	* elf32-xstormy16.c: Likewise.
+	* elf32-xtensa.c: Likewise.
+	* elf64-alpha.c: Likewise.
+	* elf64-hppa.c: Likewise.
+	* elf64-mips.c: Likewise.
+	* elf64-mmix.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf64-s390.c: Likewise.
+	* elf64-sh64.c: Likewise.
+	* elf64-sparc.c: Likewise.
+	* elf64-x86-64.c: Likewise.
+	* elfcode.h: Likewise.
+	* elflink.h: Likewise.
+	* elfn32-mips.c: Likewise.
+	* elfxx-ia64.c: Likewise.
+	* elfxx-mips.c: Likewise.
+	* i386linux.c: Likewise.
+	* ieee.c: Likewise.
+	* libcoff-in.h: Likewise.
+	* linker.c: Likewise.
+	* m68klinux.c: Likewise.
+	* pdp11.c: Likewise.
+	* pe-mips.c: Likewise.
+	* peXXigen.c: Likewise.
+	* reloc.c: Likewise.
+	* reloc16.c: Likewise.
+	* sparclinux.c: Likewise.
+	* sunos.c: Likewise.
+	* syms.c: Likewise.
+	* versados.c: Likewise.
+	* vms.c: Likewise.
+	* xcofflink.c: Likewise.
+	* bfd-in2.h: Regenerate.
+	* libcoff.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2003-06-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Report plt reloc against
+	local sym errors.
+
+	* elf32-i386.c: Convert to C90 function definitions, remove unnecessary
+	prototypes and casts.  Replace PTR with void *.  Formatting.
+	* elf32-ppc.c: Likewise.  Break long strings too.
+	(ppc_elf_relax_section): Use enum elf_ppc_reloc_type for r_type.
+	(ppc_elf_unhandled_reloc): Internationalize error message.
+	* elf32-ppc.h: Remove PARAMS.
+
+2003-06-23  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-ppc.c (ppc_elf_begin_write_processing): Use bytes to count
+	APUinfo slots.
+	(ppc_elf_final_write_processing): Likewise.
+
+2003-06-23  H.J. Lu <hongjiu.lu@intel.com>
+
+	* elflink.h (elf_link_input_bfd): Check raw size when using
+	kept_section to preserve debug information discarded by
+	linkonce.
+
+2003-06-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (struct ppc_link_hash_table): Add top_id.
+	(ppc64_elf_setup_section_lists): Set it.
+	(ppc64_elf_relocate_section): Check sym section id against top_id.
+	(ppc_build_one_stub): Comment on top_id.
+
+2003-06-20  Ralf Corsepius  <corsepiu@faw.uni-ulm.de>
+
+	* config.bfd: Add tic4x-*-rtems*.
+
+2003-06-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c: Convert to C90 function definitions, remove unnecessary
+	prototypes and casts.  Replace PTR with void *.  Format copyright.
+	Mention ABI links.
+	(struct ppc_link_hash_table): Rename sgot, srelgot, splt, srelplt,
+	sdynbss, srelbss, sglink, sbrlt and srelbrlt to got, relgot .. relbrlt.
+	(ppc_type_of_stub): Make r_type an enum.
+	(ppc64_elf_size_stubs): Likewise.
+	* elf64-ppc.h: Remove PARAMS macro.
+
+2003-06-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_link_hash_table_create): Reinstate init of
+	elf hash tab fields.
+
+	* elf64-ppc.c (ppc64_elf_reloc_type_lookup): Tidy prototype.
+	(ppc64_elf_info_to_howto): Likewise.
+	(ppc64_elf_build_stubs): Add "stats" param, and print statistics.
+	* elf64-ppc.h (ppc64_elf_build_stubs): Adjust prototype.
+
+2003-06-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-sparc.c (sparc64_elf_relocate_section): Ignore R_SPARC_DISP32
+	reloc overflow on discarded eh_frame entries.
+
+2003-06-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (toc_adjusting_stub_needed): New function.
+	(ppc64_elf_next_input_section): Use it here to set has_gp_reloc.
+	Return error condition.
+	(ppc64_elf_size_stubs): Restrict toc adjusting stubs to sections
+	that have has_gp_reloc set.
+	(struct ppc_link_hash_table): Add stub_count.
+	(ppc_build_one_stub): Increment it.
+	(ppc64_elf_link_hash_table_create): zmalloc rather than clearing
+	individual fields.
+	* elf64-ppc.h (ppc64_elf_next_input_section): Update prototype.
+
+2003-06-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_gc_record_vtentry): Revert last change.  Correct
+	size calculation from addend.  Round size up.
+
+2003-06-18  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (cris_elf_relocate_section) <case
+	R_CRIS_32_GOTREL>: When linking a program, don't complain about a
+	symbol from a normal object or an undefined weak symbol.
+
+2003-06-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_relocate_section): Accept a symbol on
+	R_PPC64_TOC relocs.
+
+2003-06-17  H.J. Lu <hongjiu.lu@intel.com>
+
+	* section.c (struct sec): Put back kept_section.
+	(STD_SECTION): Put back kept_section initialization.
+	* bfd-in2.h: Regenerate.
+
+	* elflink.h (elf_link_input_bfd): Also check discarded linkonce
+	sections for relocateable output. Use kept_section to preserve
+	debug information discarded by linkonce.
+
+2003-06-17  Roland McGrath  <roland@redhat.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Support
+	segment-relative relocation between different segments.
+
+2003-06-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_relocate_section): Do unaligned reloc
+	optimizations earlier.
+
+	* elf64-ppc.c (struct ppc_link_hash_table): Reinstate top_index.
+	Restore previous input_list type.
+	(ppc64_elf_link_hash_table_create): Undo last change.
+	(ppc64_elf_setup_section_lists): Reinstate code setting up input lists
+	per output section, but don't bother with bfd_abs_section marker.
+	(ppc64_elf_next_input_section): Adjust for multiple input section
+	lists.
+	(group_sections): Likewise.
+
+2003-06-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf64-ppc.c (ppc64_elf_relocation_section): Ensure
+	*r_offset == r_addend for RELATIVE relocs against .got.
+
+2003-06-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_relocate_section): Optimize unaligned relocs.
+
+2003-06-17  Nick Clifton  <nickc@redhat.com>
+
+	* elflink.h (elf_gc_record_vtentry): Allocate an extra element
+	in the vtable_entries_used array to allow for the accessing
+	the largest element.
+
+2003-06-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (struct ppc_link_hash_table): Remove top_index.  Modify
+	input_list.
+	(ppc64_elf_link_hash_table_create): Init input_list here.
+	(ppc64_elf_setup_section_lists): Remove code setting up input lists
+	per output section.  Set toc_off for abs and other standard sections.
+	(ppc64_elf_reinit_toc): Don't set elf_gp on input bfds lacking a toc.
+	(ppc64_elf_next_input_section): Adjust for single input section list.
+	Don't set toc_curr from input bfds that haven't set elf_gp.
+	(group_sections): Adjust for single input section list.
+
+	* elf64-ppc.c (ppc64_elf_relocate_section): Correct pcrel section zero.
+
+2003-06-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_relocate_section): When optimizing toctprel
+	tls, check that a TOC16_DS or TOC16_LO_DS reloc isn't pointing to a
+	dtprel entry.  Ensure TLS_LD DTPMOD reloc has a zero addend.  Write
+	got section for RELATIVE relocs.  Fix wrong comment.  Change condition
+	under which dynamic relocs update the section contents.
+
+2003-06-13  Robert Millan  <zeratul2@wanadoo.es>
+
+	* config.bfd: Add i386-netbsd-gnu target.
+
+2003-06-12  Nick Clifton  <nickc@redhat.com>
+
+	* opncls.c (calc_crc32): Rename to
+	bfd_calc_gnu_debuglink_crc32 and export.
+	(GNU_DEBUGLINK): Define and use to replace occurrences of
+	hard-coded ".gnu_debuglink" in the code.
+	(get_debug_link_info): Prevent aborts by replacing call to
+	xmalloc with a call to malloc.
+	(find_separate_debug_file): Prevent aborts by replacing calls
+	to xmalloc and xstrdup with calls to malloc and strdup.
+	(bfd_add_gnu_debuglink): New function.  Add a .gnu_debuglink
+	section to a bfd.
+	* bfd-in2.h: Regenerate.
+
+2003-06-12 Federico G. Schwindt <fgsch@lodoss.net>
+
+	* config.bfd (i[3-7]86-*-openbsd[0-2].* | i[3-7]86-*-openbsd3.[0-3]):
+	New target (was i[3-7]86-*-openbsd* before).
+	(i[3-7]86-*-openbsd*): Change to use bfd_elf32_i386_vec.
+	(vax-*-openbsd*): New target.
+
+2003-06-11  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elfxx-mips.c (MIPS_ELF_OPTIONS_SECTION_NAME): Use .MIPS.options
+	for n32, too.
+	(MIPS_ELF_STUB_SECTION_NAME): Use .MIPS.stubs for n32, too.
+	(mips_elf_rel_dyn_section): Use appropriate section alignment.
+	(mips_elf_create_got_section): Likewise.
+	(_bfd_mips_elf_create_dynamic_sections): Likewise.
+
+2003-06-11  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elf32-mips.c (mips_elf_generic_reloc): New Function.
+	(elf_mips_howto_table_rel): Use it.
+	(gprel32_with_gp): Move prototype.
+	(mips_elf_hi16_reloc): Check for ! BSF_LOCAL instead of zero addend.
+	Use mips_elf_generic_reloc.
+	(mips_elf_got16_reloc): Check for ! BSF_LOCAL instead of zero addend.
+	Code cleanup.
+	(_bfd_mips_elf32_gprel16_reloc): Check for ! BSF_LOCAL instead of
+	zero addend.
+	(mips_elf_gprel32_reloc): Likewise. Use the same GP assignment logic
+	as in the other *_gprel*_reloc functions.
+	(gprel32_with_gp): Handle partial_inplace properly.
+	(mips32_64bit_reloc): Use mips_elf_generic_reloc.
+	(mips16_gprel_reloc): Check for ! BSF_LOCAL instead of zero addend.
+	Do addend handling directly instead of calling
+	_bfd_mips_elf_gprel16_with_gp. Handle partial_inplace properly.
+	* elf64-mips.c (mips_elf64_hi16_reloc): Check for ! BSF_LOCAL instead
+	of zero addend. Handle partial_inplace properly.
+	(mips_elf64_got16_reloc): Check for ! BSF_LOCAL instead of zero
+	addend.
+	(mips_elf64_gprel16_reloc): Likewise.
+	(mips_elf64_literal_reloc): Likewise.
+	(mips_elf64_gprel32_reloc): Likewise. Use the same GP assignment
+	logic as in the other *_gprel*_reloc functions. Handle
+	partial_inplace properly.
+	(mips_elf64_shift6_reloc): Check for ! BSF_LOCAL instead of zero
+	addend. Handle partial_inplace properly.
+	(mips16_gprel_reloc): Likewise. Do addend handling directly instead
+	of calling _bfd_mips_elf_gprel16_with_gp.
+	* elfn32-mips.c (mips_elf_got16_reloc): Check for BSF_LOCAL.
+	(mips_elf_gprel32_reloc): Check for ! BSF_LOCAL instead
+	of zero addend.
+	(mips_elf_shift6_reloc): Handle partial_inplace properly.
+	(mips16_gprel_reloc): Likewise. Do addend handling directly instead
+	of calling _bfd_mips_elf_gprel16_with_gp.
+	* elfxx-mips.c (_bfd_mips_elf_gprel16_with_gp): Handle
+	partial_inplace properly. Fix wrong addend handling. Fix overflow
+	check.
+	(_bfd_mips_elf_sign_extend): Renamed from mips_elf_sign_extend and
+	exported.
+	(mips_elf_calculate_relocation): Use _bfd_mips_elf_sign_extend.
+	(_bfd_mips_elf_relocate_section): Likewise.
+	(mips_elf_create_dynamic_relocation): Update sec_info_type access.
+	* elfxx-mips.h (_bfd_mips_relax_section): Fix prototype declaration.
+	(_bfd_mips_elf_sign_extend): New prototype.
+
+2003-06-11 Federico G. Schwindt <fgsch@lodoss.net>
+
+	* config.bfd (sparc-*-openbsd[0-2].* | sparc-*-openbsd3.[0-1]):
+	New target (was sparc-*-openbsd* before).
+	(sparc-*-openbsd*): Change to use bfd_elf32_sparc_vec.
+
+	* configure.in (vax-*-openbsd*): Set COREFILE to netbsd-core.lo.
+	* configure: Regenerate.
+
+2003-06-11  H.J. Lu <hongjiu.lu@intel.com>
+
+	* po/Make-in (DESTDIR): New.
+	(install-data-yes): Support $(DESTDIR).
+	(uninstall): Likewise.
+
+2003-06-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (config.status): Depend on version.h.
+	Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2003-06-10  Alan Modra  <amodra@bigpond.net.au>
+	    Gary Hade <garyhade@us.ibm.com>
+
+	* elf64-ppc.c (ppc64_elf_relocate_section <*_DS>): Special case lq.
+
+2003-06-10  Richard Sandiford  <rsandifo@redhat.com>
+
+	* archures.c (bfd_mach_h8300sxn): New architecture.
+	* bfd-in2.h: Regenerate.
+	* cpu-h8300.c (h8300_scan): Check for 'sxn'.
+	(h8300sxn_info_struct): New.
+	(h8300sx_info_struct): Link to it.
+	* elf32-h8300.c (elf32_h8_mach): Add h8300sxn case.
+	(elf32_h8_final_write_processing): Likewise.
+
+2003-06-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c: Move TARGET_LITTLE_SYM and other macros used by
+	elfxx-target.h so that we can use elf_backend_got_header_size.
+	(ELF_MACHINE_ALT1, ELF_MACHINE_ALT2): Delete.
+	(GLINK_CALL_STUB_SIZE): Modify.  Define new glink call stub and
+	associated macros.
+	(ppc64_elf_howto_raw <GOT_TPREL16_DS, GOT_TPREL16_LO_DS>): Correct
+	dst_mask.
+	(enum ppc_stub_type): Add ppc_stub_long_branch_r2off and
+	ppc_stub_plt_branch_r2off.
+	(struct ppc_stub_hash_entry): Reorganize.
+	(struct ppc_link_hash_table): Add no_multi_toc, multi_toc_needed,
+	toc_curr, toc_off and emit_stub_syms.
+	(ppc64_elf_link_hash_table_create): Init them.
+	(ppc_stub_name): Correct string size.
+	(ppc64_elf_check_relocs): Set has_gp_reloc on GOT and TOC relocs.
+	(ppc64_elf_size_dynamic_sections): Set no_multi_toc if GOT entries
+	used.
+	(ppc_type_of_stub): Tweak root.type test.
+	(build_plt_stub): Remove glink code.  Adjust for insn macro changes.
+	(ppc_size_one_stub): Handle ppc_stub_long_branch_r2off and
+	ppc_stub_plt_branch_r2off.
+	(ppc_build_one_stub): Likewise.  Fix var shadowing.  Correct addis,addi
+	range test.  Use toc_off to calculte r2 values.  Handle emit_stub_syms.
+	(ppc64_elf_setup_section_lists): Remove htab creator flavour test.
+	Initialize elf_gp and toc_curr.
+	(ppc64_elf_next_toc_section, ppc64_elf_reinit_toc): New functions.
+	(ppc64_elf_next_input_section): Set toc_off.
+	(group_sections): Ensure groups have the same TOC.
+	(ppc64_elf_size_stubs): Check whether we need a TOC adjusting stub.
+	(ppc64_elf_build_stubs): Add emit_stub_syms param, and stash in htab.
+	Build new glink stub.
+	(ppc64_elf_relocate_section): Handle multiple TOCs.  Fix comments.
+	(ppc64_elf_finish_dynamic_sections): Adjust DT_PPC64_GLINK.
+	* elf64-ppc.h (ppc64_elf_build_stubs): Update prototype.
+	(ppc64_elf_next_toc_section, ppc64_elf_reinit_toc): Declare.
+	* section.c (struct sec): Rename flag12 to has_gp_reloc.
+	(STD_SECTION): Update.
+	* ecoff.c (bfd_debug_section): Update comment.
+	* bfd-in2.h: Regenerate.
+
+2003-06-05  Daniel Jacobowitz  <drow@mvista.com>
+
+	* elfcode.h (elf_slurp_reloc_table_from_section): Don't dereference
+	NULL function pointers.
+
+2003-06-05  Daniel Jacobowitz  <drow@mvista.com>
+
+	* simple.c (bfd_simple_get_relocated_section_contents): Call
+	_bfd_generic_link_add_symbols instead of bfd_link_add_symbols.
+
+2003-06-04  Svein E. Seldal  <Svein.Seldal@solidas.com>
+
+	* coff-tic54x.c: Removed the ticoff0_bad_format_hook() and
+	ticoff1_bad_format_hook() functions. Removed the coff0 and coff1
+	swaptables.
+	* coff-tic4x.c: Ditto
+	* coffcode.h: Added extra arguments to CREATE_BIG_COFF_TARGET_VEC
+	and CREATE_LITTLE_COFF_TARGET_VEC. Created the macro
+	CREATE_BIGHDR_COFF_TARGET_VEC. Created the ticoff0_bad_format_hook(),
+	ticoff1_bad_format_hook() functions. Created the coff0 and coff1
+	swap tables.
+	* coff-tic4x.c: Adopted new CREATE_xxx_COFF_TARGET_VEC macros.
+	* coff-a29k.c: Append COFF_SWAP_TABLE argument
+	* coff-apollo.c: Ditto
+	* coff-arm.c: Ditto
+	* coff-h8300.c: Ditto
+	* coff-h8500.c: Ditto
+	* coff-i960.c: Ditto
+	* coff-m68k.c: Ditto
+	* coff-m88k.c: Ditto
+	* coff-mcore.c: Ditto
+	* coff-sh.c: Ditto
+	* coff-sparc.c: Ditto
+	* coff-tic80.c: Ditto
+	* coff-we32k.c: Ditto
+	* coff-z8k.c: Ditto
+	* coff-w65.c: Ditto
+
+2003-06-04  Svein E. Seldal  <Svein.Seldal@solidas.com>
+
+	* coff-tic4x.c (ticoff0_swap_table, ticoff1_swap_table): Fixed
+	initialization bug
+
+2003-06-03  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf.c (_bfd_elf_print_private_bfd_data): Handle PT_GNU_STACK.
+	(bfd_section_from_phdr): Likewise.
+	(map_sections_to_segments): Create PT_GNU_STACK segment header.
+	(get_program_header_size): Count with PT_GNU_STACK.
+	* elf-bfd.h (struct elf_obj_tdata): Add stack_flags.
+	* elflink.h (bfd_elfNN_size_dynamic_sections): Set stack_flags.
+
+2003-06-03  H.J. Lu <hongjiu.lu@intel.com>
+
+	* elflink.h (elf_link_input_bfd): Call linker error_handler
+	for discarded definitions.
+
+2003-06-03  Elias Athanasopoulos  <elathan@phys.uoa.gr>
+
+	* syms.c (decode_section_type): Return 'n' if section flags are
+	SEC_HAS_CONTENTS && SEC_READONLY.
+
+2003-06-03  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-v850.c (v850_elf_howto_t): Rename R_V850_32to
+	R_V850_ABS32.  Add entry for R_V850_REL32.
+	(v850_elf_reloc_map): Likewise.
+	(v850_elf_check_relocs): Likewise.
+	(v850_elf_perform_relocation): Likewise.
+	(v850_elf_final_link_relocate): Likewise.  Include computation
+	to make R_V850_REl32 pc-relative.
+
+2003-06-03  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c (sh_elf_size_dynamic_sections): Create .interp section
+	and DT_DEBUG dynamic tag even for position independent executables.
+	* elf64-sh64.c (sh64_elf64_size_dynamic_sections): Likewize.
+
+2003-06-02  Daniel Jacobowitz  <drow@mvista.com>
+
+	* config.bfd: Move obsolete entries out of the range of the
+	targmatch sed script.
+
+2003-06-02  Daniel Jacobowitz  <drow@mvista.com>
+
+	* config.bfd (mips*-dec-bsd*, mips*-*-pe*): Mark as obsolete.
+
+2003-05-31  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-ppc.c (allocate_dynrelocs): Use single slot for first 8192
+	plt entries, not just 8191.
+
+2003-05-30  Daniel Jacobowitz  <drow@mvista.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_discard_info): Correct loop index.
+	Reported by Ken Faiczak <kfaiczak@SANDVINE.com>.
+
+2003-05-30  Ulrich Drepper  <drepper@redhat.com>
+	    Jakub Jelinek  <jakub@redhat.com>
+
+	* elflink.h (elf_link_add_object_symbols): Use !info->executable
+	instead of info->shared where appropriate.
+	(bfd_elfNN_size_dynamic_sections, elf_link_output_extsym): Likewise.
+	* elflink.c (_bfd_elf_create_got_section): Likewise.
+	(_bfd_elf_link_create_dynamic_sections): Likewise.
+	(_bfd_elf_link_assign_sym_version): Likewise.
+	* elf32-i386.c (elf_i386_size_dynamic_sections): Create .interp section
+	and DT_DEBUG dynamic tag even for position independent executables.
+	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Likewise.
+	* elf32-s390.c (elf_s390_size_dynamic_sections: Likewise.
+	* elf64-ppc.c (ppc64_elf_size_dynamic_sections: Likewise.
+	* elf64-s390.c (elf_s390_size_dynamic_sections: Likewise.
+	* elf64-x86-64.c (elf64_x86_64_size_dynamic_sections: Likewise.
+	* elfxx-ia64.c (elfNN_ia64_size_dynamic_sections: Likewise.
+	* elf32-sparc.c (elf32_sparc_size_dynamic_sections: Likewise.
+	* elf64-alpha.c (elf64_alpha_size_dynamic_sections: Likewise.
+	* elf64-sparc.c (sparc64_elf_size_dynamic_sections: Likewise.
+
+2003-05-30  Kris Warkentin <kewarken@qnx.com>
+
+	* elf.c (elfcore_grok_nto_status): Only set lwpid for the active or
+	signalled thread.
+	(elfcore_grok_nto_gregs): Only make .reg section for the active thread.
+
+2003-05-29  Nick Clifton  <nickc@redhat.com>
+
+	* pef.c: Include "safe-ctype.h" instead of <ctype.h>.
+	Tidy up formatting.
+	* Makefile.am: Add dependency on safe-ctype.h.
+	* Makefile.in: Regenerate.
+
+2003-05-29  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elfxx-mips.c: Don't force symbols local unconditionally.
+
+2003-05-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-hppa.c (elf32_hppa_relocate_section): Delete bogus
+	undefined_symbol call.
+
+2003-05-27  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elfxx-mips.c (mips_elf_hash_sort_data): Fix formattting.
+	(mips_elf_link_hash_table): Likewise.
+
+2003-05-22  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elf64-mips.c (elf_mips_gnu_rel16_s2): Add internally used
+	R_MIPS_GNU_REL16_S2 support.
+	(bfd_elf64_bfd_reloc_type_lookup): Use it.
+	(mips_elf64_rtype_to_howto): Use it.
+	* elfn32-mips.c (elf_mips_gnu_rel16_s2): Add internally used
+	R_MIPS_GNU_REL16_S2 support.
+	(bfd_elf32_bfd_reloc_type_lookup): Use it.
+	(mips_elf_n32_rtype_to_howto): Use it.
+
+2003-05-21  Stuart F. Downing  <sdowning@fame.com>
+
+	* som.h: Define PA_2_0 before including a.out.h
+
+2003-05-07  Eric Christopher  <echristo@redhat.com>
+	    Alexandre Oliva   <aoliva@redhat.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Adjust
+	pic tests, change to warning.
+	(_bfd_mips_elf_final_link): Remove EF_MIPS_CPIC flag setting.
+
+2003-05-21  Marcus Comstedt  <marcus@mc.pp.se>
+
+	* config.bfd: Check for a target triplet of shl-...-netbsdelf as
+	well as shle-...-netbsdelf.  Remove duplicate entry.
+
+2003-05-21  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-xstormy16.c (xstormy16_elf_howto_table): Fix dst_mask
+	for X_STORMY16_REL_12 reloc.
+
+	* elf.c (bfd_elf_get_needed_list): Use is_elf_hash_table to check
+	the type of the hash table in the bfd_link_info structure.
+	(bfd_elf_get_runpath_list): Likewise.
+
+2003-05-19  Roland McGrath  <roland@redhat.com>
+
+	* elf.c (bfd_elf_bfd_from_remote_memory): New function.
+	* bfd-in.h: Declare it.
+	* bfd-in2.h: Regenerated.
+	* elfcode.h (NAME(_bfd_elf,bfd_from_remote_memory)): New function.
+	* elf-bfd.h (struct elf_backend_data): New function pointer member
+	elf_backend_bfd_from_remote_memory.
+	(_bfd_elf32_bfd_from_remote_memory, _bfd_elf64_bfd_from_remote_memory):
+	Declare them.
+	* elfxx-target.h (elf_backend_bfd_from_remote_memory): New macro.
+	(elfNN_bed): Add that to the initializer.
+
+2003-05-15  Roland McGrath  <roland@redhat.com>
+
+	* elf.c (elfcore_grok_note): Grok NT_AUXV note, make ".auxv" section.
+
+2003-05-20  Jakub Jelinek  <jakub@redhat.com>
+
+	* elflink.h (elf_link_output_extsym): Only issue error about !=
+	STV_DEFAULT symbols if they are bfd_link_hash_undefined.
+
+2003-05-20  H.J. Lu <hongjiu.lu@intel.com>
+
+	* elflink.c (_bfd_elf_merge_symbol): Check ELF_LINK_DYNAMIC_DEF
+	when removing the old definition for symbols with non-default
+	visibility.
+
+2003-05-18  Jason Eckhardt  <jle@rice.edu>
+
+	* elf32-i860.c (elf32_i860_relocate_highadj): Simplify calculation.
+
+2003-05-17  Andreas Schwab  <schwab@suse.de>
+
+	* elf32-m68k.c (elf_m68k_check_relocs): Cache reloc section in
+	elf_section_data during processing of pc-relative and absolute
+	relocations.
+	(elf_m68k_relocate_section): Use the cached reloc section instead
+	of computing it again.  Fix handling of visibility.  Don't modify
+	addend when copying over a relocation into the output.
+
+2003-05-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Use SYMBOL_CALLS_LOCAL
+	to trim plt entries.  Move undefweak non-default visibility test..
+	(allocate_dynrelocs): ..from here.
+	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Don't test
+	dynamic_sections_created here.  Update comment.  Move undefweak
+	non-default visibility test..
+	(allocate_dynrelocs): ..from here.  Fix comment.
+	* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol): Use SYMBOL_CALLS_LOCAL
+	to trim plt entries.  Move undefweak non-default visibility test..
+	(allocate_dynrelocs): ..from here.  Fix comment.
+	* elflink.h (elf_link_output_extsym): Compare ELF_ST_VISIBILITY with
+	STV_DEFAULT rather than comparing with zero.
+	* elflink.c (_bfd_elf_merge_symbol): Likewise.
+	(_bfd_elf_fix_symbol_flags): Likewise.  Format comment.
+
+2003-05-17  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* bfd.c (_bfd_get_gp_value): Prevent illegal access for abfd null
+	pointers.
+	(_bfd_set_gp_value): Likewise.
+
+2003-05-16  Michael Snyder  <msnyder@redhat.com>
+	From Bernd Schmidt  <bernds@redhat.com>
+	* archures.c (bfd_mach_h8300sx): New.
+	* bfd-in2.h: Regenerate.
+	* cpu-h8300.c (h8300_scan)): Add support for h8300sx.
+	(h8300sx_info_struct): New.
+	(h8300s_info_struct): Link to it.
+	* elf32-h8300.c (elf32_h8_mach): Add support for h8300sx.
+	(elf32_h8_final_write_processing): Likewise.
+	(elf32_h8_relax_section): Likewise.
+
+2003-05-16  Kelley Cook  <kelleycook@wideopenwest.com>
+
+	* config.bfd: Accept i[3-7]86 variants.
+	* configure.host: Likewise.
+	* configure.in: Likewise.
+	* configure: Regenerate.
+
+2003-05-15  H.J. Lu <hongjiu.lu@intel.com>
+
+	* elflink.c (_bfd_elf_fix_symbol_flags): Also hide protected
+	symbol.
+
+2003-05-15  H.J. Lu <hongjiu.lu@intel.com>
+
+	* elflink.h (elf_link_check_versioned_symbol): Also allow
+	the base version.
+
+2003-05-15  Alan Modra  <amodra@bigpond.net.au>
+	    H.J. Lu <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (allocate_dynrelocs): Use SYMBOL_CALLS_LOCAL.
+	(elf_i386_relocate_section): Likewise.
+	* elf32-ppc.c (allocate_dynrelocs): Likewise.
+	(ppc_elf_relocate_section): Likewise.
+	* elf64-ppc.c (allocate_dynrelocs): Likewise.
+	(ppc64_elf_relocate_section): Likewise.
+
+2003-05-15  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elf32-mips.c (gprel32_with_gp): Remove useless N64 ABI case.
+
+2003-05-13  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* elf32-m68hc1x.c (_bfd_m68hc11_elf_merge_private_bfd_data): Check for
+	processor capability, allow merge of HC12 and HCS12 in some cases.
+	(m68hc11_elf_hash_table_create): Use bfd_malloc instead of bfd_zalloc.
+	* cpu-m68hc12.c (bfd_m68hc12s_arch): New struct.
+	(bfd_m68hc12_arch): Link it.
+	(scan_mach): New function.
+
+2003-05-13  Andrew Haley  <aph@redhat.com>
+
+	* elf.c (bfd_elf_hash): Mask lower 32 bits of hash.
+
+2003-05-13  Alan Modra  <amodra@bigpond.net.au>
+	    H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (SYMBOL_REFERENCES_LOCAL, SYMBOL_CALLS_LOCAL): Move from
+	elf32-ppc.c.  Add ELF_LINK_FORCED_LOCAL check.
+	* elf32-ppc.c: (SYMBOL_REFERENCES_LOCAL, SYMBOL_CALLS_LOCAL): Delete.
+	(allocate_dynrelocs): Use SYMBOL_REFERENCES_LOCAL for dynreloc check.
+	(ppc_elf_relocate_section): Likewise.
+	* elf64-ppc.c (allocate_dynrelocs): Likewise.
+	(ppc64_elf_relocate_section): Likewise.  Use for .got relocs too.
+	(ppc64_elf_adjust_dynamic_symbol): Don't assume symbols with .plt
+	relocs need no other types.
+	* elf32-i386.c (allocate_dynrelocs): Use SYMBOL_REFERENCES_LOCAL for
+	dynreloc check.
+	(elf_i386_relocate_section): Likewise.  Use for .got relocs too.
+	(elf_i386_finish_dynamic_symbol): Use SYMBOL_REFERENCES_LOCAL for
+	.got relocs.
+
+2003-05-13  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c (sh_elf_adjust_dynamic_symbol): For weak symbols,
+	copy ELF_LINK_NON_GOT_REF from weakdef.
+	(allocate_dynrelocs): For undef weak syms with non-default
+	visibility, a) don't allocate plt entries, b) don't allocate
+	.got relocs, c) discard dyn rel space
+	(sh_elf_relocate_section): d) don't generate .got relocs, e)
+	don't generate dynamic relocs.
+	(sh_elf_copy_indirect_symbol): Don't copy ELF_LINK_NON_GOT_REF
+	for weakdefs when symbol already adjusted.
+
+2003-05-12  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-xstormy16.c (xstormy16_elf_howto_table): use 'bitfield'
+	overflow detection for R_XSTORMY16_16 reloc.
+
+2003-05-12  Paul Clarke  <paulc@senet.com.au>
+
+	* elf32-h8300.c: Fix typo in name of R_H8_DIR8 reloc.
+
+2003-05-11  Jason Eckhardt  <jle@rice.edu>
+
+	* elf32-i860.c (elf32_i860_relocate_highadj): Properly
+	adjust upper bits.
+	(elf32_i860_relocate_splitn): Obtain upper 5 bits from the
+	proper place.
+	(elf32_i860_relocate_pc16): Obtain upper 5 bits from the
+	proper place.
+
+2003-05-11  Andreas Schwab  <schwab@suse.de>
+
+	* elf32-m68k.c (elf_m68k_relocate_section): Replace ugly
+	complicated tests for unresolvable relocs with a simple direct
+	scheme using "unresolved_reloc" var.  Report some detail on
+	bfd_reloc_outofrange and similar errors.
+
+2003-05-09  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* elf32-s390.c (allocate_dynrelocs, elf_s390_relocate_section):
+	Fix WILL_CALL_FINISH_DYNAMIC_SYMBOL call.
+	(WILL_CALL_FINISH_DYNAMIC_SYMBOL): Pass SHARED instead of INFO.
+	* elf64-s390.c: Likewise.
+
+2003-05-09  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* elf32-s390.c (ELIMINATE_COPY_RELOCS): Define as one.
+	(elf_s390_adjust_dynamic_symbol): For weak symbols, copy
+	ELF_LINK_NON_GOT_REF from weakdef.
+	(elf_s390_copy_indirect_symbol): Test whether the weakdef sym has
+	already been adjusted before treating it specially.
+	* el64-s390.c: Likwise.
+
+2003-05-09  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* elf32-s390.c (allocate_dynrelocs): For undef weak syms with
+	non-default visibility, a) don't make them dynamic, b) discard
+	space for dynamic relocs.
+	(elf_s390_relocate_section): Initialize the GOT entries and skip
+	R_390_{8,16,32}/R_390_PC{16,16DBL,32DBL,32} for weak undefined
+	symbols with non-default visibility.
+	* elf64-s390.c: Likewise.
+
+2003-05-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* cpu-arm.c (arm_check_note): Warning fix.
+	* elf32-iq2000.c (iq2000_elf_check_relocs): Warning fixes.  Arrange
+	to keep relocs if edited.
+	(iq2000_elf_print_private_bfd_data): Return TRUE.
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Use ELFNN_R_SYM, not
+	ELF64_R_SYM.
+	(elfNN_ia64_relax_ldxmov): Warning fix.
+	* xtensa-isa.c (xtensa_add_isa): Warning fix.
+	* xtensa-modules.c (get_num_opcodes): Warning fix.
+
+2003-05-09  Andrey Petrov <petrov@netbsd.org>
+
+	* elf.c (elf_fake_sections): Use correct cast for sh_name.
+
+2003-05-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
+	elflink.h.  Replace LOG_FILE_ALIGN with bed->s->log_file_align.
+	(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
+	(bfd_elf_record_link_assignment): Move from elflink.h.
+	(_bfd_elf_merge_symbol): Likewise.
+	(_bfd_elf_add_default_symbol): Likewise.
+	(_bfd_elf_export_symbol): Likewise.
+	(_bfd_elf_link_find_version_dependencies): Likewise.
+	(_bfd_elf_link_assign_sym_version): Likewise.
+	(_bfd_elf_link_read_relocs): Likewise.
+	(_bfd_elf_link_size_reloc_section): Likewise.
+	(_bfd_elf_fix_symbol_flags): Likewise.
+	(_bfd_elf_adjust_dynamic_symbol): Likewise.
+	(_bfd_elf_link_sec_merge_syms): Likewise.
+	(elf_link_read_relocs_from_section): Likewise.  Use bed->s->sizeof_rel
+	and bed->s->sizeof_rela.
+	(_bfd_elf_link_output_relocs): Likewise.
+	* elf-bfd.h (struct elf_size_info): Rename file_align to
+	log_file_align.
+	(struct elf_info_failed): Move from elflink.h.
+	(struct elf_assign_sym_version_info): Likewise.
+	(struct elf_find_verdep_info): Likewise.
+	(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
+	(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
+	_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
+	_bfd_elf_link_assign_sym_version,
+	_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
+	_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
+	_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
+	_bfd_elf_link_sec_merge_syms): Declare.
+	(bfd_elf32_link_create_dynamic_sections): Don't declare.
+	(_bfd_elf32_link_read_relocs): Likewise.
+	(bfd_elf64_link_create_dynamic_sections): Likewise.
+	(_bfd_elf64_link_read_relocs): Likewise.
+	* elflink.h: Move lots o' stuff elsewhere.
+	* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
+	(bfd_elf64_record_link_assignment): Likewise.
+	(bfd_elf_record_link_assignment): Declare.
+	* bfd-in2.h: Regenerate.
+	* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
+	(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
+	* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
+	(assign_file_positions_for_segments): Likewise.
+	(assign_file_positions_except_relocs): Likewise.
+	(swap_out_syms, elfcore_write_note): Likewise.
+	* elf-m10200.c: Adjust for changed function names.
+	* elf-m10300.c: Likewise.
+	* elf32-arm.h: Likewise.
+	* elf32-h8300.c: Likewise.
+	* elf32-hppa.c: Likewise.
+	* elf32-ip2k.c: Likewise.
+	* elf32-m32r.c: Likewise.
+	* elf32-m68hc11.c: Likewise.
+	* elf32-m68hc1x.c: Likewise.
+	* elf32-m68k.c: Likewise.
+	* elf32-mips.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-sh.c: Likewise.
+	* elf32-v850.c: Likewise.
+	* elf32-xtensa.c: Likewise.
+	* elf64-alpha.c: Likewise.
+	* elf64-hppa.c: Likewise.
+	* elf64-mmix.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf64-sh64.c: Likewise.
+	* elfxx-ia64.c: Likewise.
+	* elfxx-mips.c: Likewise.
+	(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
+	* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
+	* elf64-hppa.c (hppa64_elf_size_info): Likewise.
+	* elf64-mips.c (mips_elf64_size_info): Likewise.
+	* elf64-s390.c (s390_elf64_size_info): Likewise.
+	* elf64-sparc.c (sparc64_elf_size_info): Likewise.
+
+2003-05-08  H.J. Lu <hongjiu.lu@intel.com>
+
+	* elflink.h (elf_add_default_symbol): After skipping the
+	unversioned symbol, go to non-default one.
+
+2003-05-07  H.J. Lu <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (_bfd_elf_link_hash_hide_symbol): Also clear the
+	want_plt field.
+	(elfNN_ia64_relocate_section): Don't do dynamic symbol lookup
+	for symbols with non-default visibility.
+
+2003-05-07  H.J. Lu <hongjiu.lu@intel.com>
+
+	* elflink.h (elf_link_check_versioned_symbol): Also handle the
+	case that a DSO references a hidden symbol which may be
+	satisfied by a versioned symbol in another DSO.
+	(elf_link_output_extsym): Check versioned definition for hidden
+	symbol referenced by a DSO.
+
+2003-05-07  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-xstormy16.c (xstormy16_elf_howto_table): Reset
+	R_XSTORMY16_16 reloc to ignore overflows.
+
+2003-05-06  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Improve
+	error message for mixing different-endian files.  Check for ABI
+	compatibility of input files with the selected emulation.
+
+2003-05-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-i386.c (allocate_dynrelocs): For undef weak syms with
+	non-default visibility, a) don't make them dynamic, b) discard
+	space for dynamic relocs.
+	* elf64-x86-64.c (allocate_dynrelocs): Likewise.
+
+	* elf32-ppc.c (allocate_dynrelocs): For undef weak syms with
+	non-default visibility, a) don't allocate plt entries, b) don't
+	allocate .got relocs, c) discard dyn rel space,
+	(ppc_elf_relocate_section): d) don't generate .got relocs, e)
+	don't generate dynamic relocs.
+	* elf64-ppc.c (allocate_dynrelocs): As above.
+	(ppc64_elf_relocate_section): As above.
+
+2003-05-05  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-x86-64.c (allocate_dynrelocs): Don't allocate dynamic
+	relocation entries for weak undefined symbols with non-default
+	visibility.
+	(elf64_x86_64_relocate_section): Initialize the GOT entries and
+	skip R_386_32/R_386_PC32 for weak undefined symbols with
+	non-default visibility.
+
+2003-05-04  H.J. Lu <hjl@gnu.org>
+
+	* elf32-i386.c (allocate_dynrelocs): Don't allocate dynamic
+	relocation entries for weak undefined symbols with non-default
+	visibility.
+	(elf_i386_relocate_section): Initialize the GOT entries and
+	skip R_386_32/R_386_PC32 for weak undefined symbols with
+	non-default visibility.
+
+	* elfxx-ia64.c (allocate_fptr): Don't allocate function
+	descriptors for weak undefined symbols with non-default
+	visibility.
+	(allocate_dynrel_entries): Don't allocate relocation entries
+	for symbols resolved to 0.
+	(set_got_entry): Don't install dynamic relocation for weak
+	undefined symbols with non-default visibility.
+	(set_pltoff_entry): Likewise.
+
+	* elflink.h (elf_fix_symbol_flags): Hide weak undefined symbols
+	with non-default visibility.
+	(elf_link_output_extsym): Don't make weak undefined symbols
+	with non-default visibility dynamic.
+
+2003-05-04  H.J. Lu <hjl@gnu.org>
+
+	* elflink.h (elf_merge_symbol): Correctly handle weak definition.
+
+2003-05-04  H.J. Lu <hjl@gnu.org>
+
+	* elflink.h (elf_merge_symbol): Don't record a hidden/internal
+	symbol dynamic. Check indirection when removing the old
+	definition for symbols with non-default visibility.
+	(elf_add_default_symbol): Skip when told by elf_merge_symbol.
+
+2003-05-02  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-xstormy16.c (xstormy16_elf_howto_table): Make the
+	R_XSTORMY16_8 and R_XSTORMY16_16 relocs detect and complain about
+	unsigned overflow.
+
+2003-05-02  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-x86-64.c (elf_x86_64_copy_indirect_symbol): Don't copy
+	ELF_LINK_NON_GOT_REF for weakdefs when symbol already adjusted.
+	(ELIMINATE_COPY_RELOCS): Define as one.  Use throughout.
+	(elf_x86_64_adjust_dynamic_symbol): For weak symbols, copy
+	ELF_LINK_NON_GOT_REF from weakdef.
+
+2003-05-02  Charles Lepple <clepple@ghz.cc>
+	    Nick Clifton <nickc@redhat.com>
+
+	* acinclude.m4: Fix name of --enable-install-libbfd switch.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
+2003-05-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_copy_indirect_symbol): Test whether the
+	weakdef sym has already been adjusted before treating it specially.
+	* elf32-i386.c (elf_i386_copy_indirect_symbol): Don't copy
+	ELF_LINK_NON_GOT_REF for weakdefs when symbol already adjusted.
+	* elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Likewise.
+	(ppc64_elf_check_relocs): Set ELF_LINK_NON_GOT_REF.
+
+2003-04-28  H.J. Lu <hjl@gnu.org>
+
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Relax ldxmov during
+	the relax finalize pass.
+
+	* section.c (struct sec): Add need_finalize_relax and remove
+	flag11.
+	(STD_SECTION): Update struct sec initializer.
+	* bfd-in2.h: Regenerated.
+
+2003-04-28  H.J. Lu <hjl@gnu.org>
+
+	* elflink.h (elf_merge_symbol): Call elf_backend_copy_indirect_symbol
+	to copy any information related to dynamic linking when we flip
+	the indirection.
+
+2003-04-27  H.J. Lu <hjl@gnu.org>
+
+	* elf-bfd.h (ELF_LINK_DYNAMIC_DEF): New.
+	(ELF_LINK_DYNAMIC_WEAK): New.
+
+	* elflink.h (elf_merge_symbol): Add one argument to indicate if
+	a symbol should be skipped. Ignore definitions in dynamic
+	objects for symbols with non-default visibility.
+	(elf_add_default_symbol): Adjusted.
+	(elf_link_add_object_symbols): Check if a symbol should be
+	skipped. Don't merge the visibility field with the one from
+	a dynamic object.
+	(elf_link_check_versioned_symbol): Use undef_bfd.
+	(elf_link_output_extsym): Warn if a forced local symbol is
+	referenced from dynamic objects. Make non-weak undefined symbol
+	with non-default visibility a fatal error.
+
+2003-04-27  Daniel Jacobowitz  <drow@mvista.com>
+
+	* configure.in: Bump version on HEAD to 2.14.90.
+	* configure: Regenerated.
+
+2003-04-26  Stephane Carrez  <stcarrez@nerim.fr>
+
+	PR savannah/3331:
+	* elf32-m68hc11.c (m68hc11_elf_relax_section): Clear prev_insn_group
+	when we couldn't relax something.
+
+2003-04-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_merge_symbol): When we find a regular definition
+	for an indirect symbol, flip the indirection so that the old
+	direct symbol now points to the new definition.
+
+2003-04-24  Roland McGrath  <roland@redhat.com>
+
+	* elf.c (bfd_section_from_phdr): Map PT_GNU_EH_FRAME to "eh_frame_hdr".
+
+2003-04-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c: Formatting and comment fixes.
+	(ELIMINATE_COPY_RELOCS): Move before ppc_elf_copy_indirect_symbol.
+	(ppc_elf_copy_indirect_symbol): Copy flags here for weakdefs.
+
+2003-04-24 Dhananjay Deshpande <dhananjayd@kpitcummins.com>
+
+	* archures.c (bfd_mach_h8300hn, bfd_mach_h8300sn): Added.
+	* bfd-in2.h: Rebuilt.
+	* coff-h8300.c (BADMAG): Add check for H8300HNBADMAG & H8300SNBADMAG.
+	* coffcode.h (coff_set_arch_mach_hook): Add case for H8300HNMAGIC
+	& H8300SNMAGIC.
+	(coff_set_flags): Add case for bfd_mach_h8300hn & bfd_mach_h8300sn.
+	* cpu-h8300.c (h8300_scan): Handle h8300hn, h8300sn.
+	(h8300sn_info_struct, h8300hn_info_struct): New.
+	* elf32-h8300.c (elf32_h8_mach): Handle case for h8300hn & h8300sn
+	(elf32_h8_final_write_processing): Likewise.
+
+2003-04-23  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c (tpoff): New.
+	(struct elf_sh_dyn_relocs): Remove tls_tpoff32.
+	(WILL_CALL_FINISH_DYNAMIC_SYMBOL): Pass SHARED instead of INFO.
+	(allocate_dynrelocs): Don't make unnecessary dynamic TLS
+	relocations.  Adjust WILL_CALL_FINISH_DYNAMIC_SYMBOL uses.
+	(sh_elf_relocate_section): Likewise. Remove unnecessary tests.
+	(dtpoff_base): Fix wrong indentation.
+	(sh_elf_check_relocs): Don't set DF_STATIC_TLS flag with non-TLS
+	relocations.  Don't set tls_tpoff32 flag.  Don't make unnecessary
+	R_SH_TLS_TPOFF32 relocations.
+
+2003-04-23  J"orn Rennecke <joern.rennecke@superh.com>
+
+	* archures.c (enum bfd_architecture): Amend comment to refer to SuperH.
+	* cpu-sh.c: Likewise.
+	* elf32-sh.c: Likewise.
+	* reloc.c (bfd_reloc_code_real): Likewise.
+	* elf32-sh64-com.c: Change comment to refer to SuperH.
+	* elf32-sh64.c: Likewise.
+	* elf64-sh64.c: Likewise.
+	* bfd-in2.h (enum bfd_architecture): Regenerate.
+
+2003-04-23  Alan Modra  <amodra@bigpond.net.au>
+
+	From Julien LEMOINE <speedblue@debian.org>
+	* elf32-i386.c (elf_i386_info_to_howto): Delete.
+	(elf_info_to_howto): Define as elf_i386_info_to_howto_rel.
+
+2003-04-22  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
+
+	* archures.c: Replace references to Mitsubishi M32R with references
+	to Renesas M32R.
+	* relocs.c: Likewise.
+	* bfd-in2.h: Regenerate.
+
+2003-04-21  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (alpha_elf_dynamic_symbol_p): Return false for an
+	executable when a symbol is defined both regular and dynamic.
+
+2003-04-21  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* Makefile.am (BFD32_BACKENDS): Add elf32-m68hc1x.lo.
+	(elf32-m68hc1x.lo): Update dependencies
+	* configure.in: Add elf32-m68hc1x.lo.
+	* configure: Rebuild.
+	* Makefile.in: Rebuild.
+
+2003-04-21  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* elf32-m68hc1x.c: New file (from elf32-m68hc11.c and elf32-m68hc12.c)
+	(m68hc11_elf_hash_table_create): New function.
+	(elf32_m68hc11_link_hash_table_free): New function.
+	(stub_hash_newfunc): New function.
+	(m68hc11_add_stub): New function.
+	(elf32_m68hc11_add_symbol_hook): New function.
+	(elf32_m68hc11_setup_section_lists): New function.
+	(elf32_m68hc11_next_input_section): New function.
+	(elf32_m68hc11_size_stubs): New function.
+	(elf32_m68hc11_build_stubs): New function.
+	(m68hc11_get_relocation_value): New function.
+	(elf32_m68hc11_relocate_section): Call the above to redirect
+	some relocations to the trampoline code.
+	(m68hc11_elf_export_one_stub): New function.
+	(m68hc11_elf_set_symbol): New function.
+	(elf32_m68hc11_build_stubs): Call it via bfd_hash_traverse.
+	(m68hc11_elf_get_bank_parameters): Get parameters only when the info
+	is not yet initialized.
+
+	* elf32-m68hc1x.h: New file (from elf32-m68hc11.c and elf32-m68hc12.c)
+	(elf32_m68hc11_stub_hash_entry): New struct.
+	(m68hc11_page_info): Add trampoline handler address.
+	(m68hc11_elf_link_hash_table): Add stubs generation members.
+	(elf32_m68hc11_add_symbol_hook): Declare.
+	(elf32_m68hc11_setup_section_lists): Declare.
+	(elf32_m68hc11_size_stubs): Declare.
+	(elf32_m68hc11_build_stubs): Declare.
+
+	* elf32-m68hc11.c (m68hc11_elf_ignore_reloc): Move to elf32-m68hc1x.c.
+	(elf32_m68hc11_gc_mark_hook, elf32_m68hc11_gc_sweep_hook): Likewise.
+	(elf32_m68hc11_check_relocs, elf32_m68hc11_relocate_section): Ditto.
+	(_bfd_m68hc11_elf_set_private_flags): Ditto.
+	(_bfd_m68hc11_elf_merge_private_bfd_data): Ditto.
+	(_bfd_m68hc11_elf_print_private_bfd_data): Ditto.
+	(bfd_elf32_bfd_link_hash_table_create): Define.
+	(elf_backend_add_symbol_hook): Define.
+	(m68hc11_elf_bfd_link_hash_table_create): New function.
+	(m68hc11_elf_build_one_stub): New function.
+	(m68hc11_elf_size_one_stub): New function.
+	(m68hc11_elf_bfd_link_hash_table_create): Install the above.
+	(bfd_elf32_bfd_link_hash_table_create): Define.
+
+	* elf32-m68hc12.c (m68hc11_elf_ignore_reloc): Remove.
+	(m68hc12_addr_is_banked): Remove, use m68hc11_addr_is_banked.
+	(m68hc12_phys_addr): Ditto.
+	(m68hc12_phys_page): Ditto.
+	(m68hc12_elf_special_reloc): Move to elf32-m68hc1x.c.
+	(elf32_m68hc11_gc_mark_hook): Likewise.
+	(elf32_m68hc11_gc_sweep_hook): Likewise.
+	(elf32_m68hc11_check_relocs): Likewise.
+	(elf32_m68hc11_relocate_section): Likewise.
+	(_bfd_m68hc12_elf_set_private_flags): Likewise.
+	(_bfd_m68hc12_elf_merge_private_bfd_data): Likewise.
+	(_bfd_m68hc12_elf_print_private_bfd_data): Likewise.
+	(m68hc12_elf_build_one_stub): New function.
+	(m68hc12_elf_size_one_stub): New function.
+	(m68hc12_elf_bfd_link_hash_table_create): New function, use the above.
+	(elf_backend_add_symbol_hook): Define.
+	(elf_m68hc11_howto_table): Use TRUE for pcrel relocs; fix masks.
+
+2003-04-18  Nick Clifton  <nickc@redhat.com>
+
+	* format.c (bfd_check_format_matches): Only check associated
+	vector if the matching_vector has been created.
+
+2003-04-15  Alexandre Oliva  <aoliva@redhat.com>
+
+	* dwarf2.c (_bfd_dwarf2_find_nearest_line): Fix typo in
+	2003-04-09's change.
+
+2003-04-15  Brian Ford  <ford@vss.fsi.com>
+
+	* peicode.h (coff_swap_scnhdr_in): If a section holds
+	uninitialized data and is from an object file or from an
+	executable image that has not initialized the s_size field, or if
+	the physical size is padded, use the virtual size (stored in
+	s_paddr) instead.
+
+2003-04-15  H.J. Lu <hjl@gnu.org>
+
+	* elflink.h (elf_link_add_object_symbols): Properly report
+	filename for alignment reduction.
+
+2003-04-15  Rohit Kumar Srivastava <rohits@kpitcummins.com>
+
+	* archures.c: Replace occurrances of 'Hitachi' with 'Renesas'.
+	* reloc.c: Likewise.
+	* coff-h8300.c: Likewise.
+	* coff-h8500.c: Likewise.
+	* coff-sh.c: Likewise.
+	* cpu-h8300.c: Likewise.
+	* cpu-sh.c: Likewise.
+	* elf32-h8300.c: Likewise.
+	* elf32-sh.c: Likewise.
+	* elf32-sh64-com.c: Likewise.
+	* elf32-sh64.c: Likewise.
+	* elf64-sh64.c: Likewise.
+	* bfd-in2.h: Regenerate.
+
+2003-04-14  H.J. Lu <hjl@gnu.org>
+
+	* elflink.h (elf_link_add_object_symbols): Maintain maximum
+	alignment for common symbols. Warn reducing alignment for
+	common symbols. Report old filename when symbol size changes.
+
+2003-04-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): Adjust two other
+	occurrences of the same test changed in the previous patch.
+	Optimize.
+
+2003-04-11  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elfxx-mips.c (mips_elf_get_global_gotsym_index): New.
+	(mips_elf_calculate_relocation): Decay GOT_PAGE/GOT_OFST to
+	GOT_DISP/addend only if the symbol got a global GOT entry.
+
+2003-04-10  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): Decay
+	GOT_PAGE/GOT_OFST referencing overridable symbol to
+	GOT_DISP/addend.
+	(_bfd_mips_elf_check_relocs): Handle GOT_PAGE referencing
+	global symbol as GOT_DISP.
+
+2003-04-10  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_xtensa_relocate_section): Don't continue to the
+	next relocation on an undefined symbol.
+
+2003-04-09  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_relocate_section) <R_ALPHA_GPREL32>:
+	Ignore relocations against r_symndx == 0.
+
+2003-04-09  H.J. Lu <hjl@gnu.org>
+
+	* elf64-alpha.c (elf64_alpha_relocate_section): Don't return
+	FALSE for undefined symbols.
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Likewise.
+
+2003-04-09  Alexandre Oliva  <aoliva@redhat.com>
+
+	* dwarf2.c (_bfd_dwarf2_find_nearest_line): Try DWARF3-standard
+	and IRIX-specific shift-to-64-bit 4-byte lengths before following
+	addr_size.
+
+2003-04-08  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-mips.c (bfd_elf32_bfd_reloc_type_lookup): Detect (ctor)
+	pointer size from ABI, not arch_bits_per_address.
+
+2003-04-07  Kevin Buettner  <kevinb@redhat.com>
+
+	* elfn32-mips.c (elf32_mips_grok_prstatus): Adjust core file related
+	constants for n32 ABI.
+
+2003-04-06  Andrew Cagney  <cagney@redhat.com>
+
+	* simple.c (bfd_simple_get_relocated_section_contents): Disable
+	free that leads to GDB vs BFD memory corruption.
+
+2003-04-04  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* elf32-m68hc11.c (m68hc11_elf_relax_delete_bytes): Also adjust
+	symbols that mark the end of the section.
+	(m68hc11_elf_relax_section): Use R_M68HC11_PCREL_8 relocs when
+	converting to a relative branch so that the offset is computed after
+	the relaxation; also relocate a jsr into a bsr if possible but don't
+	relax them if they are to a far symbol as we need to call the
+	trampoline code.
+	(elf_m68hc11_howto_table): Set pcrel_offset to true.
+
+2003-04-04  Svein E. Seldal  <Svein.Seldal@solidas.com>
+
+	* archures.c: Namespace cleanup. Rename bfd_mach_c3x to
+	bfd_mach_tic3x and bfd_mach_c4x to bfd_mach_tic4x
+	* bfd-in2.h: Regenerate
+	* coff-tic4x.c: Namespace cleanup. Replace s/c4x/tic4x/
+	* cpu-tic4x.c: Ditto
+
+2003-04-03  Nick Clifton  <nickc@redhat.com>
+
+	* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Compute ps and ss
+	differently for object files and executables.
+	* peicode.h (coff_swap_scnhdr_in): Only set the s_size field
+	for object files or for executables who have not already
+	initialised the field.
+	* libpei.h (bfd_pe_executable_p): New macro.  Return true if
+	the PE format bfd is an executable.
+
+2003-04-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Don't use SYMBOL_REFERENCES_LOCAL
+	here as it's too early to reliably determine locality.
+	(ppc_elf_gc_sweep_hook): Likewise.
+	(SYMBOL_REFERENCES_LOCAL): Expand comment.
+
+2003-04-02  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-modules.c: Remove comment indicating that this is a
+	generated file.
+
+2003-04-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* elfxx-mips.c (_bfd_mips_elf_hide_symbol): Test for NULL dynobj.
+
+2003-04-01  Bob Wilson  <bob.wilson@acm.org>
+
+	* Makefile.am (ALL_MACHINES): Add cpu-xtensa.lo.
+	(ALL_MACHINES_CFILES): Add cpu-xtensa.c.
+	(BFD32_BACKENDS): Add elf32-xtensa.lo, xtensa-isa.lo, and
+	xtensa-modules.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-xtensa.c, xtensa-isa.c, and
+	xtensa-modules.c.
+	(cpu-xtensa.lo): New target.
+	(elf32-xtensa.lo): Likewise.
+	(xtensa-isa.lo): Likewise.
+	(xtensa-modules.lo): Likewise.
+	* Makefile.in: Regenerate.
+	* archures.c (bfd_architecture): Add bfd_{arch,mach}_xtensa.
+	(bfd_archures_list): Add bfd_xtensa_arch.
+	* config.bfd: Handle xtensa-*-*.
+	* configure.in: Handle bfd_elf32_xtensa_{le,be}_vec.
+	* configure: Regenerate.
+	* reloc.c: Add BFD_RELOC_XTENSA_{RTLD,GLOB_DAT,JMP_SLOT,RELATIVE,
+	PLT,OP0,OP1,OP2,ASM_EXPAND,ASM_SIMPLIFY}.
+	* targets.c (bfd_elf32_xtensa_be_vec): Declare.
+	(bfd_elf32_xtensa_le_vec): Likewise.
+	(bfd_target_vector): Add bfd_elf32_xtensa_{be,le}_vec.
+	* cpu-xtensa.c: New file.
+	* elf32-xtensa.c: Likewise.
+	* xtensa-isa.c: Likewise.
+	* xtensa-modules.c: Likewise.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Likewise.
+
+2003-04-01  Nick Clifton  <nickc@redhat.com>
+
+	* archures.c (bfd_mach_arm_unknown): Define.
+	* bfd-in.h (bfd_arm_merge_machines, bfd_arm+update_notes,
+	bfd_arm_get_mach_from_notes): Prototype.
+	* bfd-in2.h: Regenerate.
+	* coff-arm.c (coff_arm_merge_private_bfd_data): Call
+	bfd_arm_merge_machines.
+	(coff_arm_final_link_postscript): Call bfd_arm_update_notes.
+	* coffcode.h (coff_set_arch_mach_hook): Call
+	bfd_arm_get_mach_from_notes.
+	* coffgen.c (coff_real_object_p): Revert previous delta.
+	* cpu_arm.c (arm_check_note): New function.  Examine a note in a
+	.note section.
+	(bfd_arm_merge_machines): New function: Handle the merging of ARM
+	binaries compiled for different architectures..
+	(bfd_arm_update_notes): New function: Update an ARM note section.
+	(bfd_arm_get_mach_from_notes): New function: Extract a bfd machine
+	number from an ARM note section.
+	* elf32-arm.h (elf32_arm_object_p): Use
+	bfd_arm_get_mach_from_notes.
+	(elf32_arm_merge_private_bfd_data): Use bfd_arm_merge_machines.
+	(elf32_arm_final_write_processing): Use bfd_arm_update_notes.
+
+2003-04-01  Ben Elliston  <bje@wasabisystems.com>
+
+	* dwarf2.c (read_attribute_value): Correct typo in comment.
+
+2003-04-01  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf2.c (concat_filename): Use bfd_malloc() and strdup()
+	instead of concat().
+	(decode_line_info): Only free filename if it is not NULL.
+	(add_line_info): Make a copy of the filename when storing it into
+	the info structure.
+
+2003-03-31  Andreas Schwab  <schwab@suse.de>
+	    Daniel Jacobowitz  <drow@mvista.com>
+
+	* simple.c (bfd_simple_get_relocated_section_contents): Add
+	parameter symbol_table.  Optionally use it instead of the symbol
+	table from the bfd.  Save and restore output offsets and output
+	sections  around bfd_get_relocated_section_contents.  Fix a memory
+	leak.
+	(simple_save_output_info, simple_restore_output_info): New
+	functions.
+	* bfd-in2.h: Regenerate.
+	* dwarf2.c (read_abbrevs): Use
+	bfd_simple_get_relocated_section_contents instead of
+	bfd_get_section_contents.
+	(decode_line_info): Likewise.
+	(_bfd_dwarf2_find_nearest_line): Likewise.  Don't call
+	find_rela_addend.
+	(find_rela_addend): Remove.
+	* elfxx-ia64.c (elfNN_ia64_reloc): Weaken sanity check for
+	debugging sections.
+	(elfNN_ia64_hash_table_create): Create the hash table with malloc,
+	not bfd_zalloc.
+
+2003-03-31  David Heine  <dlheine@suif.stanford.edu>
+
+	* aoutx.h (aout_link_hash_table_create): Use bfd_malloc instead of
+	bfd_alloc.
+	* dwarf2.c (concat_filename): Always allocate space for the
+	returned filename.
+	(decode_line_info): Free the allocated filename returned by
+	concat_filename.
+	* elf-eh-frame.c (bfd_elf_write_section_eh_frame): Fix memory leaks.
+	* elf.c (copy_private_bfd_data): Likewise.
+	(_bfd_elf_slurp_version_tables): Fix bug freeing contents pointer.
+	* elflink.h (elf_link_sort_relocs): Fix memory leak.
+	* format.c (bfd_check_format_matches): Likewise.
+	* linker.c (bfd_generic_final_link): Likewise.
+	* opncls.c (find_separate_debug_info): Likewise.
+	* simple.c (bfd_simple_get_relocated_section_contents): Likewise.
+
+2003-03-28  H.J. Lu <hjl@gnu.org>
+
+	* elflink.h (elf_link_add_object_symbols): Correctly combine
+	visibilities.
+
+2003-03-27  Jakub Jelinek  <jakub@redhat.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Reset self_dtpmod_offset
+	to -1 before recomputing got offsets.
+
+2003-03-26  Andreas Schwab  <schwab@suse.de>
+
+	* elf32-m68k.c (WILL_CALL_FINISH_DYNAMIC_SYMBOL): Define.
+	(elf_m68k_relocate_section): Use it to correctly handle symbols
+	forced to be local.
+	(elf_m68k_finish_dynamic_symbol): Emit RELATIVE reloc for got
+	entries for symbols that are forced to be local.
+
+2003-03-25  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elfxx-mips.c (_bfd_mips_relax_section): New function.
+	* elfxx-mips.h (_bfd_mips_relax_section): Declare.
+	* elfn32-mips.c, elf64-mips.c: Use it.
+
+2003-03-25  Stan Cox   <scox@redhat.com>
+	    Nick Clifton  <nickc@redhat.com>
+
+	Contribute support for Intel's iWMMXt chip - an ARM variant:
+
+	* archures.c: Add bfd_mach_arm_iWMMXt.
+	* reloc.c: Add BFD_RELOC_ARM_CP_OFF_IMM_S2.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* coff-arm.c (coff_arm_merge_private_bfd_data): Allow iWMMXt
+	object files to be linked with XScale ones.
+	(coff_arm_final_link_postscript): Update note section.
+	* coffcode.h (coff_set_arch_mach_hook): Handle note section.
+	* coffgen.c (coff_real_object_p): Call bfd_coff_set_arch_mach_hook
+	after identifying a coff binary.
+	* cpu-arm.c (processors): Add iWMMXt.
+	(arch_inf): Likewise.
+	* elf32-arm.h (arm_object_p): Handle note section.
+	(elf32_arm_merge_private_bfd_data): Allow iWMMXt object files to
+	be linked with XScale ones.
+	(elf32_arm_section_flags): New function: Set flags on note section.
+	(elf32_arm_final_write_processing): Handle note section.
+
+2003-03-21  DJ Delorie  <dj@redhat.com>
+
+	* elf32-xstormy16.c (elf32_xstormy16_relocate_section): Call
+	_bfd_elf_rela_local_sym.
+
+2003-03-20  H.J. Lu <hjl@gnu.org>
+
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Don't try relax for
+	non-ELF outputs.
+
+2003-03-20  Nick Clifton  <nickc@redhat.com>
+
+	* peXXigen.c (_bfd_XXi_swap_aouthdr_out): Initialise $idata2 and
+	$idata5 in case bfd_coff_final_link is not called.
+
+2003-03-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf64-sparc.c (struct sparc64_elf_section_data): Add reloc_count
+	field.
+	(canon_reloc_count): Define.
+	(sparc64_elf_slurp_one_reloc_table, sparc64_elf_slurp_reloc_table,
+	sparc64_elf_canonicalize_dynamic_reloc): Use it instead of
+	reloc_count.
+	(sparc64_elf_canonicalize_reloc): New routine.
+	(bfd_elf64_canonicalize_reloc): Define.
+
+2003-03-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Handle relaxation
+	againt mergeable sections.  Take r_addend into account when caching
+	trampolines.
+
+2003-03-18  Richard Henderson  <rth@redhat.com>
+
+	* elfxx-ia64.c (get_dyn_sym_info): Return NULL gracefully for
+	local symbols that have no dyninfo.
+
+2003-03-14  Gene Smith  <gene.smith@siemens.com>
+
+	* ieee.c (ieee_write_expression): Handle the case where symbol is
+	NULL.
+	General formatting improvements.
+
+2003-03-13  Nick Clifton  <nickc@redhat.com>
+
+	* configure.in (LINGUAS): Add zh_CN.
+	* configure: Regenerate.
+	* po/zh_CN.po: New file.
+
+2003-03-13  Elias Athanasopoulos  <elathan@phys.uoa.gr>
+
+	* aout-cris.c (BYTES_IN_WORD): Don't define.
+	aout-encap.c: Likewise.
+	aout-ns32k.c: Likewise.
+	aout-tic30.c: Likewise.
+	hp300bsd.c: Likewise.
+	i386aout.c: Likewise.
+	i386dynix.c: Likewise.
+	i386linux.c: Likewise.
+	i386lynx.c: Likewise.
+	i386mach3.c: Likewise.
+	m68k4knetbsd.c: Likewise.
+	m68klinux.c: Likewise.
+	m68klynx.c: Likewise.
+	m68knetbsd.c: Likewise.
+	m88kmach3.c: Likewise.
+	mipsbsd.c: Likewise.
+	newsos3.c: Likewise.
+	sparclinux.c: Likewise.
+	sparclynx.c: Likewise.
+	sparcnetbsd.c: Likewise.
+	vaxbsd.c: Likewise. Fix comment formatting.
+
+2003-03-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Reverted 2003-03-02's patch.
+
+	* elfxx-target.h (bfd_elfNN_canonicalize_reloc): Make it
+	overridable.
+	* elf64-mips.c (mips_elf64_canonicalize_reloc,
+	mips_elf64_get_dynamic_reloc_upper_bound,
+	mips_elf64_canonicalize_dynamic_reloc): New, adapted from elf.c.
+	(bfd_elf64_get_canonicalize_reloc,
+	bfd_elf64_get_dynamic_reloc_upper_bound,
+	bfd_elf64_canonicalize_dynamic_reloc): Define.
+	(mips_elf64_slurp_reloc_table): Support dynamic.
+	(mips_elf64_slurp_one_reloc_table): Adjust.
+
+2003-03-12  Nick Clifton  <nickc@redhat.com>
+
+	* xsym.c (bfd_sym_fetch_type_information_table_entry): Change
+	'index' to 'offset' in test for zero value.
+
+2003-03-11  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elfxx-mips.c (mips_elf_create_dynamic_relocation): Do not create
+	dynamic relocations pointing to local or section symbols, use the
+	NULL symbol instead.  Document the choice to not emit an
+	additional R_MIPS_64 relocation.
+
+2003-03-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Subtract tls seg vma from
+	zero index dynamic tls relocs generated for the GOT.  Tidy code.
+	Set "relocation" to 1 on DTPMOD32 relocs.  Optimize HA adjustment.
+	* elf64-ppc.c (ppc64_elf_relocate_section): Likewise.
+
+2003-03-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Don't look for a nop after
+	a tls_get_addr call.
+
+	* elf32-ppc.c (ELIMINATE_COPY_RELOCS): Define as one.
+	(ppc_elf_adjust_dynamic_symbol): For weak symbols, copy
+	ELF_LINK_NON_GOT_REF from weakdef.
+	* elf64-ppc.c (ELIMINATE_COPY_RELOCS): Define as one.
+	(ppc64_elf_adjust_dynamic_symbol): For weak symbols, copy
+	ELF_LINK_NON_GOT_REF from weakdef.
+	* elf32-i386.c (ELIMINATE_COPY_RELOCS): Define as one.  Use throughout.
+	(elf_i386_adjust_dynamic_symbol): For weak symbols, copy
+	ELF_LINK_NON_GOT_REF from weakdef.
+
+2003-03-06  Jakub Jelinek <jakub@redhat.com>
+	Andrew Haley  <aph@redhat.com>
+
+	* elflink.h (elf_bfd_discard_info): Don't process eh frames if
+	output is relocateable.
+
+2003-03-06  Steven Konopa <skonopa@kgo.csc.com>
+
+	* som.c (som_fixup_formats): Correct formats for R_AUX_UNWIND and
+	R_COMMENT.
+
+2003-03-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_create_linker_section): Don't capitalize
+	error messages.
+	(ELIMINATE_COPY_RELOCS): Define to zero.
+	(ppc_elf_relocate_section): Don't deref htab->tls_sec when calculating
+	TLSLD relocs.  Report reloc types on a number of errors.  Optimize
+	LOCAL24PC check for non-local syms.  Don't capitalize error messages.
+	* elf64-ppc.c (ELIMINATE_COPY_RELOCS): Define to zero.
+	(ppc64_elf_relocate_section): Don't deref htab->tls_sec when
+	calculating TLSLD relocs.  Report reloc types on a number of errors.
+	Don't capitalize error messages.
+
+2003-03-03  H.J. Lu <hjl@gnu.org>
+
+	* elfxx-ia64.c (USE_BRL): Removed.
+	(oor_ip): Removed.
+
+2003-03-03  J"orn Rennecke <joern.rennecke@superh.com>
+
+	* elf32-sh.c (sh_elf_howto_tab): Make R_SH_IND12W into an ordinary
+	relocation (no special function), and make it non-partial_inplace.
+	(sh_elf_relax_section): When creating a bsr, use a consistent value
+	no matter if the symbol is extern or not;  set addend to -4.
+	Don't swap load / non-load instructions for SH4.
+	(sh_elf_relax_delete_bytes): In R_SH_IND12W case, check the offset
+	rather than if the symbol is external to determine if adjusting the
+	offset makes sense.  Adjust the addend too if appropriate.
+	(sh_elf_relocate_section): In R_SH_IND12W, don't fiddle with the
+	relocation.
+
+2003-03-03  Nick Clifton  <nickc@redhat.com>
+
+	* po/da.po: Installed latest translation.
+
+2003-03-02  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elf32-mips.c (elf_mips_howto_table_rel): Change definition of
+	R_MIPS_PC16 to rightshift 2.
+	(elf_reloc_map mips_reloc_map): Map to rightshifted BFD reloc.
+	(bfd_elf32_bfd_reloc_type_lookup): Support
+	BFD_RELOC_MIPSEMB_16_PCREL_S2.
+	* elf64-mips.c (mips_elf64_howto_table_rel): Change definition of
+	R_MIPS_PC16 to rightshift 2.
+	(mips_elf64_howto_table_rela): Likewise.
+	(mips_reloc_map): Map to rightshifted BFD reloc.
+	* elfn32-mips.c: The same as in elf64-mips.c.
+	* elfxx-mips.c (mips_elf_got_for_ibfd): Typo in comment.
+	(mips_elf_calculate_relocation): Handle rightshifted addends for
+	R_MIPS_PC16.
+	* reloc.c (BFD_RELOC_MIPSEMB_16_PCREL_S2): New BFD relocation for
+	MIPS Embedded PIC. Remove superfluous empty COMMENT.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2003-02-28  Richard Henderson  <rth@redhat.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Correct bounds
+	for ltoff22x relaxation.
+
+2003-03-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd-in.h (_bfd): Don't define.
+	* bfd.c: Rename occurrences of "struct _bfd" to "struct bfd".
+	* syms.c: Likewise.
+	* bfd-in2.h: Regenerate.
+
+2003-02-27  Richard Henderson  <rth@redhat.com>
+
+	* elfxx-ia64.c (struct elfNN_ia64_dyn_sym_info): Add want_gotx;
+	(elfNN_ia64_check_relocs): Set it.
+	(allocate_global_data_got): Check it.
+	(allocate_local_got): Likewise.
+	(allocate_dynrel_entries): Likewise.
+	(elfNN_ia64_relax_ldxmov): New.
+	(elfNN_ia64_relax_section): Handle LTOFF22X, LDXMOV.
+	(elfNN_ia64_choose_gp): Split out from ...
+	(elfNN_ia64_final_link): ... here.
+
+2003-02-27  Andrew Cagney  <cagney@redhat.com>
+
+	* bfd.c (struct bfd): Rename "struct _bfd".
+	* bfd-in.h: Update copyright.
+	(struct bfd): Rename "struct _bfd".
+	(_bfd): Define for backward compatibility.
+	* bfd-in2.h: Regenerate.
+
+2003-02-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_bfd_final_link): Apportion reloc counts to rel_hdr
+	and rel_hdr2 when initially counting input relocs rather than after
+	creating output reloc sections.
+	(elf_link_read_relocs_from_section): Don't abort with wrong reloc
+	sizes.
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2003-02-24  Kris Warkentin  <kewarken@qnx.com>
+
+	* elf.c (elfcore_read_notes): Add check for QNX style core file.
+	(elfcore_grog_nto_note): New function.
+	(elfcore_grog_nto_gregs): New function.
+	(elfcore_grog_nto_status): New function.
+
+2003-02-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (_bfd_elf_create_got_section): Check existing .got
+	section flags before concluding that we've already been called.
+	Don't use register keyword.
+	(_bfd_elf_create_dynamic_sections): Don't use register keyword.
+	(_bfd_elf_create_linker_section): Formatting.
+
+2003-02-20  jmc  <jmc@prioris.mini.pw.edu.pl>
+
+	* coff-h8300.c: Fix typo: intial -> initial.
+	* coff-ppc.c: Likewise.
+
+2003-02-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c: Formatting.
+	(allocate_dynrelocs): LD and GD relocs against the same sym need
+	separate GOT entries.
+	(ppc_elf_relocate_section): Correct GOT handling for multiple GOT
+	entries per symbol.
+
+2003-02-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-hppa.c (elf32_hppa_gc_sweep_hook): Simplify dynamic reloc
+	removal.  Localize vars.  Remove unnecessary dynobj test.
+	* elf32-i386 (WILL_CALL_FINISH_DYNAMIC_SYMBOL): Pass SHARED instead
+	of INFO.
+	(allocate_dynrelocs): Adjust WILL_CALL_FINISH_DYNAMIC_SYMBOL uses,
+	and optimize.
+	(elf_i386_relocate_section): Likewise.
+	(elf_i386_gc_sweep_hook): Simplify dyn reloc removal.  Localize vars.
+	* elf32-s390.c (elf_s390_gc_sweep_hook): Likewise.
+	* elf32-sh.c (sh_elf_gc_sweep_hook): Likewise.
+	* elf64-s390.c (elf_s390_gc_sweep_hook): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_gc_sweep_hook): Likewise.
+	* elf32-sparc.c (elf32_sparc_gc_sweep_hook): Likewise.  Remove
+	local_dynrel for section too.  Don't touch HIPLT22, LOPLT10, PCPLT32
+	or PCPLT10 relocs.  Don't subtract twice on PLT32 relocs.
+	Formatting.
+
+	* elf64-ppc.c (ELIMINATE_COPY_RELOCS): Define.
+	(ppc64_elf_check_relocs): Use it.  Correct comment.  Move SEC_ALLOC
+	test.
+	(ppc64_elf_adjust_dynamic_symbol): Use ELIMINATE_COPY_RELOCS.
+	(WILL_CALL_FINISH_DYNAMIC_SYMBOL): Pass SHARED instead of INFO.
+	(allocate_dynrelocs): Adjust WILL_CALL_FINISH_DYNAMIC_SYMBOL uses,
+	and optimize.  Use ELIMINATE_COPY_RELOCS.
+	(ppc64_elf_relocate_section): Likewise.
+
+	* elf32-ppc.c (struct ppc_elf_dyn_relocs): Add pc_count field.
+	(ppc_elf_copy_indirect_symbol): Copy pc_count field.
+	(ELIMINATE_COPY_RELOCS): Define.
+	(ppc_elf_adjust_dynamic_symbol): Convert copy relocs to dynamic.
+	(WILL_CALL_FINISH_DYNAMIC_SYMBOL): Pass SHARED instead of INFO.
+	(MUST_BE_DYN_RELOC): Define.
+	(allocate_dynrelocs): Adjust WILL_CALL_FINISH_DYNAMIC_SYMBOL uses,
+	and optimize.  Trim dyn_relocs.
+	(ppc_elf_check_relocs): Don't generate dyn_relocs when we know they'll
+	not be used.  Do generate dyn_relocs for copy reloc avoidance.  Keep
+	track of pc_rel dyn relocs.
+	(ppc_elf_relocate_section): Remove "will_become_local".  Adjust
+	WILL_CALL_FINISH_DYNAMIC_SYMBOL use.  Trim dyn relocs as per
+	allocate_dynrelocs.  Don't recalculate "sec".
+
+2003-02-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Remove unnecessary test.
+	* elf64-ppc.c (ppc64_elf_tls_optimize): Decrement tlsld_got.refcount
+	on invalid LD relocs.
+	(allocate_dynrelocs): Invalid LD relocs don't use tlsld_got entry.
+	(ppc64_elf_relocate_section): Unify new handling of LD relocs and
+	tlsld_got entry.  Use IS_PPC64_TLS_RELOC.
+
+	* elf32-ppc.h: New file.
+	* elf32-ppc.c: Include elf32-ppc.h.
+	(NOP, CROR_151515, CROR_313131, TP_OFFSET, DTP_OFFSET): Define.
+	(struct ppc_elf_link_hash_entry): Rename "root" to "elf".  Adjust uses.
+	Add "tls_mask" field.
+	(TLS_GD, TLS_LD, TLS_TPREL, TLS_DTPREL, TLS_TLS, TLS_TPRELGD): Define.
+	(struct ppc_elf_link_hash_table): Rename "root" to "elf".  Adjust uses.
+	Add got, relgot, plt, relplt, dynbss, relbss, dynsbss, relsbss,
+	sdata, sdata2, tls_sec, tls_get_addr, tlsld_got fields.
+	Make use of htab shortcuts throughout file.
+	(ppc_elf_link_hash_newfunc): Init tls_mask field.
+	(ppc_elf_link_hash_table_create): Init new fields.
+	(ppc_elf_copy_indirect_symbol): Copy tls_mask.
+	(ppc_elf_howto_raw): Add tls relocs.
+	(ppc_elf_reloc_type_lookup): Handle them.
+	(ppc_elf_unhandled_reloc): New function.
+	(ppc_elf_create_got): Stash got section pointer in hash table,
+	return status.  Make .rela.got too.
+	(ppc_elf_create_dynamic_sections): Stash section pointers in htab.
+	(ppc_elf_adjust_dynamic_symbol): Only set up copy relocs when
+	NON_GOT_REF set.  Don't allocate space in .plt here..
+	(allocate_dynrelocs): ..do so here instead, properly ref-counting and
+	not allocating plt entries unnecessarily.  Allocate got entries here.
+	(WILL_CALL_FINISH_DYNAMIC_SYMBOL): Define.
+	(ppc_elf_size_dynamic_sections): Allocate local got entries.  Pass
+	"info" during allocate_dynrelocs hash traversal.  Use htab section
+	shortcuts rather than searching for named sections.  Get rid of
+	"plt" and "strip" booleans.
+	(update_local_sym_info, bad_shared_reloc): New functions.
+	(ppc_elf_check_relocs): Handle TLS relocs.  Move .rela.got creation to
+	ppc_elf_create_got.  Don't mark got or plt reloc syms dynamic, do so
+	in allocate_dynreloc.  Use update_local_sym_info and bad_shared_reloc.
+	Disallow R_PPC_EMB_RELSDA, R_PPC_EMB_NADDR32, R_PPC_EMB_NADDR16,
+	R_PPC_EMB_NADDR16_LO, R_PPC_EMB_NADDR16_HI and R_PPC_EMB_NADDR16_HA
+	in shared libs.  R_PPC_PLTREL32 is a plt reloc too.  Refcount all
+	relocs that might use a plt entry.  Set NON_GOT_REF too.
+	Enumerate all do-nothing relocs.
+	(ppc_elf_gc_sweep_hook): Simplify removal of dynrelocs.  Handle
+	tls relocs and all plt relocs.
+	(ppc_elf_tls_setup, ppc_elf_tls_optimize): New functions.
+	(ppc_elf_finish_dynamic_symbol): Don't build got entries here.
+	(ppc_elf_finish_dynamic_sections): Rewrite tag code using htab
+	shortcuts.
+	(ppc_elf_relocate_section): Tidy.  Handle TLS relocs.  Use
+	bfd_elf_local_sym_name.  Simplify unresolved reloc code.  Build got
+	entries and got relocs here.  Warn on non-zero got reloc addend.
+	Split out branch taken/not taken reloc code into a separate switch
+	and correct offset calculation. Allow BRTAKEN/BRNTAKEN dynamic relocs.
+	Split out HA reloc adjustments to separate switch statement.  Don't
+	warn on reloc overflow if we've already warned about undefined.
+	Don't rebuild sym name when reporting errors.  Report all possible
+	errors from _bfd_final_link_relocate.
+	(bfd_elf32_bfd_final_link): Don't define.
+
+2003-02-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_relocate_section): Don't init "r".  Don't
+	rebuild sym name when reporting errors.
+
+2003-02-17  Nick Clifton  <nickc@redhat.com>
+
+	* elflink.h (elf_link_output_extsym): Only check
+	allow_shlib_undefined for shared libraries.
+	* elf32-i386.c (elf_i386_relocate_section): Remove bogus check
+	of allow_shlib_undefined.
+	* elf32-cris.c (cris_elf_relocate_section): Likewise.
+	* elf32-hppa.c (elf32_hppa_relocate_section): Likewise.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	* elf32-s390.c (elf_s390_relocate_section): Likewise.
+	* elf32-sh.c (sh_elf_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+	* elf32-vax.c (elf_vax_relocate_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relocate_section): Likewise.
+	* elf64-hppa.c (elf64_hppa_relocate_section): Likewise.
+	* elf64-ppc.c (ppc64_elf_relocate_section): Likewise.
+	* elf64-s390.c (elf_s390_relocate_section): Likewise.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_relocate_section): Likewise.
+
+2003-02-17  Nick Clifton  <nickc@redhat.com>
+
+	* elf.c (SEGMENT_AFTER_SEGMENT): Add third parameter - the
+	address field to use in the comparison.
+	(SEGMENT_OVERLAPS): Check that LMAs overlap as well.
+
+2003-02-14  Bob Wilson  <bob.wilson@acm.org>
+
+	* elfcore.h (elf_core_file_p): Compare alternate machine codes for ELF
+	backends when checking if the generic ELF target should be used.
+
+	* syms.c (_bfd_stab_section_find_nearest_line): For line number stabs
+	outside of functions, treat values as absolute addresses.
+
+	* bfd.c: Change embedded documentation to use consistent indentation
+	and to split up long lines.  Change informal style of description
+	for functions lacking real documentation.
+	* coffcode.h: Break up long lines in embedded documentation.
+	* format.c: Likewise.
+	* targets.c: Likewise.
+	* libcoff.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2003-02-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_link_hash_table_create): Init tls_get_addr.
+	(ppc64_elf_copy_indirect_symbol): Merge tls_mask too.
+	(ppc64_elf_gc_sweep_hook): Simplify removal of dyn_relocs.
+	(allocate_dynrelocs): Don't treat undefined and undefweak specially.
+	(ppc_size_one_stub): Fix warning, and tighten plt entry check.
+	(group_sections): Don't share a stub section if stubs are for a large
+	section.  Adjust comment.
+	(ppc64_elf_size_stubs): Roughly double the size left for stubs if
+	!stubs_always_before_branch.
+	(ppc64_elf_relocate_section): Initialize tlsld GOT entry once.  Don't
+	treat undefined and undefweak specially when processing dyn relocs.
+
+2003-02-13  Jakub Jelinek  <jakub@redhat.com>
+
+	* elflink.h (elf_link_add_object_symbols): Handle .symver x, x@FOO.
+
+2003-02-13  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-arm.h (elf32_thumb_to_arm_stub): Include section VMAs
+	in computation of offset to insert into BL instruction.
+
+2003-02-11  Uwe Stieber  <uwe@wwws.de>
+
+	* config.bfd: Add support for kaOS as cross build target system.
+
+2003-02-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_check_relocs): Match versioned
+	.__tls_get_addr too.
+	(ppc64_elf_tls_setup): Ensure cached tls_get_addr is not indirect.
+
+2003-02-10  Kaz kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c (elf_sh_dyn_relocs): Add tls_tpoff32 field.
+	(elf_sh_link_hash_entry): Remove tls_tpoff32 field.
+	(sh_elf_link_hash_newfunc): Remove the initialization of
+	tls_tpoff32 field.
+	(allocate_dynrelocs): Keep dyn_relocs if it includes the entry
+	for which tls_tpoff32 flag is set.
+	(sh_elf_relocate_section): Covert to LE only if the dyn_relocs
+	of the symbol includes the entry matched with the input_section
+	and having tls_tpoff32 flag on.  When linking statically, set
+	symbol index of R_SH_TLS_TPOFF32 relocation to zero if the symbol
+	is defined in this executable.
+	(sh_elf_check_relocs): Set tls_tpoff32 flag appropriately.
+
+2003-02-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-s390.c (elf_s390_size_dynamic_sections): Set relocs to TRUE
+	even if there is just non-empty .rela.plt.
+
+2003-02-10  Nick Clifton  <nickc@redhat.com>
+
+	* archures.c (bfd_mach_arm_ep9312): Define.
+	* bfd-in2.h: Regenerate.
+	* cpu-arm.c (processors[]): Add ep9312.
+	(bfd_arm_arch): Add ep9312.
+	* elf32-arm.h (elf32_arm_merge_private_data): Update error
+	messages and add test for Maverick floating point support.
+	(elf32_arm_print_private_bfd_data): Handle
+	EF_ARM_MAVERICK_FLOAT flag.
+	(elf32_arm_object_p): New function.
+	(elf_backend_object_p): Define.
+
+2003-02-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c: Rename assorted occurrences of tls_type and similar
+	variables, structure fields or function params to tls_mask or
+	similar to better reflect usage.
+	(struct got_entry): Comment.
+	(struct ppc_link_hash_entry): Expand comment, and renumber TLS_*.
+	(get_tls_mask): Rename from get_tls_type.
+
+2003-02-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (TLS_GD_LD): Don't define..
+	(TLS_GD): ..define this instead and update all uses.
+	(TLS_TPRELGD): Define.
+	(ppc64_elf_link_hash_table_create): Tweak initialization of
+	init_refcount and init_offset.
+	(ppc64_elf_check_relocs): Add one extra element to t_symndx array.
+	Mark second slot of GD or LD toc entries.
+	(get_tls_type): Return an int.  Distinguish toc GD and LD entries
+	from other tls types.
+	(ppc64_elf_tls_setup): New function, split out from..
+	(ppc64_elf_tls_optimize): ..here.  Don't optimize when symbols are
+	defined in a dynamic object.  Fix LD optimization.  Don't set TLS_TPREL
+	on GD->IE optimization, use TLS_TPRELGD instead.  Use get_tls_type
+	return value to properly decide whether toc GD and LD entries can
+	optimize away __tls_get_addr call.  Check next reloc after DTPMOD64
+	to determine GD or LD rather than looking at TLS_LD flag.  Don't
+	attempt to adjust got entry tls_type here..
+	(allocate_dynrelocs): ..instead, adjust got entry tls_type here, and
+	look for possible merges.
+	(ppc64_elf_size_dynamic_sections): Adjust local got entries for
+	optimization.
+	(ppc64_elf_size_stubs): Tweak __tls_get_addr fudge.
+	(ppc64_elf_relocate_section): Rename some vars to better reflect usage.
+	Make use of return value from get_tls_type to properly detect GD and
+	LD optimizations.  Split tlsld/gd hi/ha from lo/ds case.  Don't
+	handle tls_get_addr removal when looking at REL24 relocs, do it when
+	looking at the previous reloc.  Check reloc after DTPMOD64 to determine
+	GD or LD.
+	* elf64-ppc.h (ppc64_elf_tls_setup): Declare.
+
+2003-02-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-hppa.c (group_sections): Don't share a stub section if
+	stubs are for a large section.
+
+	* elf32-hppa.c (elf32_hppa_size_stubs): Double the size left for
+	stubs if !stubs_always_before_branch.
+
+2003-02-07  Nick Clifton  <nickc@redhat.com>
+
+	* elf.c (swap_out_syms): Generate an error message if an
+	equivalent output section cannot be found for a symbol.
+
+2003-02-07  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_relax_section): Don't crash if
+	local_got_entries is NULL.
+
+2003-02-06  Andreas Schwab  <schwab@suse.de>
+
+	* elf-eh-frame.c (get_DW_EH_PE_signed): Define.
+	(read_value): Add parameter is_signed, use signed extraction if
+	the value is signed.
+	(_bfd_elf_write_section_eh_frame): Pass signed flag of the
+	encoding to read_value.
+
+2003-02-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Don't copy got and
+	plt info when called to transfer weak sym info.
+
+2003-02-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* reloc.c: Add PPC and PPC64 TLS relocs.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* elf64-ppc.c (TP_OFFSET, DTP_OFFSET): Declare.
+	(ppc64_elf_howto_raw): Add TLS howto's.  Adjust R_PPC64_NONE to be
+	against a 32 bit field.
+	(ppc64_elf_reloc_type_lookup): Handle TLS relocs.
+	(_ppc64_elf_section_data): Add t_symndx and comments.
+	(ppc64_elf_section_data): Use elf_section_data macro.
+	(ppc64_elf_new_section_hook): American spelling.
+	(struct got_entry, struct plt_entry): New.
+	(MUST_BE_DYN_RELOC): Rename from IS_ABSOLUTE_RELOC.
+	(struct ppc_stub_hash_entry): Add "addend" field.
+	(struct ppc_link_hash_entry): Add "tls_type".
+	(TLS_TLS, TLS_GD_LD, TLS_LD, TLS_TPREL, TLS_DTPREL,
+	TLS_EXPLICIT): Define.
+	(struct ppc_link_hash_table): Add tls_sec, tls_get_addr, tlsld_got.
+	(link_hash_newfunc): Init new fields.
+	(ppc64_elf_link_hash_table_create): Likewise.  Set init_refcount and
+	init_offset to NULL.
+	(ppc64_elf_copy_indirect_symbol): Copy got and plt info.  Don't call
+	_bfd_elf_link_hash_copy_indirect, rather insert relevant code from
+	there.
+	(update_local_sym_info, update_plt_info): New functions.
+	(ppc64_elf_check_relocs): Use them.  Handle TLS relocs.  Adjust GOT
+	handling to use got.glist rather than got.refcount.  Likewise for PLT.
+	(ppc64_elf_gc_sweep_hook): Handle TLS relocs, new GOT and PLT lists.
+	(func_desc_adjust): Adjust for new PLT list.
+	(ppc64_elf_adjust_dynamic_symbol): Likewise.
+	(get_sym_h, get_tls_type): New functions.
+	(ppc64_elf_edit_opd): Remove unused variable.  Use get_sym_h.
+	(ppc64_elf_tls_optimize): New function.
+	(allocate_dynrelocs): Adjust for new PLT and GOT lists.  Allocate
+	TLS relocs.
+	(ppc64_elf_size_dynamic_sections): Likewise.
+	(ppc_type_of_stub): Adjust for new PLT list.
+	(ppc_build_one_stub): Likewise.
+	(ppc64_elf_size_stubs): Likewise.  Use get_sym_h.  Treat __tls_get_addr
+	calls specially.
+	(ppc64_elf_relocate_section): Adjust for new GOT and PLT lists.  Handle
+	TLS relocs.  Report local syms using bfd_elf_local_sym_name.  Don't
+	init GOT entries that have a reloc.  Generate GOT relocs here..
+	(ppc64_elf_finish_dynamic_symbol): ..not here.  Adjust for PLT list.
+	* elf64-ppc.h (ppc64_elf_tls_optimize): Declare.
+
+2003-02-04  Andreas Schwab  <schwab@suse.de>
+
+	* elf32-m68k.c (elf_m68k_hash_entry): Define.
+	(elf_m68k_link_hash_traverse): Remove.
+	(elf_m68k_link_hash_newfunc): Use struct bfd_hash_entry and
+	elf_m68k_hash_entry instead of struct elf_m68k_link_hash_entry to
+	reduce casting.
+	(elf_m68k_check_relocs): Use elf_m68k_hash_entry instead of
+	casting.
+	(elf_m68k_size_dynamic_sections): Use elf_link_hash_traverse
+	instead of elf_m68k_link_hash_traverse.
+	(elf_m68k_discard_copies): Change first parameter to pointer to
+	struct elf_link_hash_entry and use elf_m68k_hash_entry when struct
+	elf_m68k_link_hash_entry is needed.
+
+2003-02-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct got_entry, struct plt_entry): Forward declare.
+	(struct elf_link_hash_entry): Add "glist" and "plist" fields to
+	"got" union, and declare as gotplt_union.  Use gotplt_uinion for
+	"plt" field.
+	(struct elf_link_hash_table): Make "init_refcount" a gotplt_union.
+	Add "init_offset" field.
+	(struct elf_obj_tdata <local_got>): Add "struct got_entry **" to union.
+	(elf_local_got_ents): Declare.
+	* elf.c (_bfd_elf_link_hash_newfunc): Adjust initialization of "got"
+	and "plt".
+	(_bfd_elf_link_hash_hide_symbol): Use "init_offset".
+	(_bfd_elf_link_hash_table_init): Set "init_offset".
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Set init_refcount
+	from init_offset.
+	(elf_adjust_dynamic_symbol): Set plt and got offsets using init_offset.
+
+	* elf.c (bfd_elf_local_sym_name): Split out from..
+	(group_signature): ..here.
+	* elf-bfd.h (bfd_elf_local_sym_name): Declare.
+
+2003-02-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (enum elf_link_info_type): Remove.
+	(struct bfd_elf_section_data): Move sec_info_type, use_rela_p fields
+	to struct sec.  Remove linkonce_p field.
+	(elf_linkonce_p): Delete.
+	(elf_discarded_section): Update for sec_info_type change.
+	* section.c (struct sec): Add sec_info_type, use_rela_p, has_tls_reloc,
+	flag11, flag12, flag13, flag14, flag15, flag16, flag20, flag24.
+	(ELF_INFO_TYPE_NONE): Define.
+	(ELF_INFO_TYPE_STABS): Define.
+	(ELF_INFO_TYPE_MERGE): Define.
+	(ELF_INFO_TYPE_EH_FRAME): Define.
+	(ELF_INFO_TYPE_JUST_SYMS): Define.
+	(STD_SECTION): Update struct sec initializer.
+	* ecoff.c (bfd_debug_section): Likewise.
+	* elf.c: Likewise.  Update occurrences of sec_info_type and use_rela_p.
+	* elflink.h: Likewise.
+	* elf-eh-frame.c: Likewise.
+	* elf64-alpha.c: Likewise.
+	* elfxx-ia64.c: Likewise.
+	* elfxx-mips.c: Likewise.
+	* bfd-in2.h: Regenerate.
+
+	* elf32-sparc.c (sec_do_relax): Use elf_section_data macro rather than
+	referring to used_by_bfd.
+	* elf64-sparc.c (sec_do_relax): Likewise.
+	* elf64-mmix.c (mmix_elf_section_data): Likewise.
+	* elfxx-mips.c (mips_elf_section_data): Likewise.
+	* ieee.c (ieee_slurp_section_data): Use ieee_per_section macro.
+	(ieee_get_section_contents): Likewise.
+	(ieee_new_section_hook): Formatting.
+	(ieee_canonicalize_reloc): Remove commented out code.
+	* mmo.c (mmo_section_data): Define.  Use throughout file.
+	* oasys.c (oasys_get_section_contents): Use oasys_per_section macro.
+
+2003-01-31  Graydon Hoare <graydon@redhat.com>
+
+	* Makefile.am (opncls.lo): Add dependency upon libiberty.h.
+	* Makefile.in: Regenerate.
+	* opncls.c (calc_crc32, get_debug_link_info,
+	seperate_debug_file_exists, find_seperate_debug_file): New
+	internal functions.
+	(bfd_follow_gnu_debuglink): New function.  Follow the pointer
+	contained inside a .gnu_debuglink section.
+	* bfd-in2.h: Regenerate.
+
+2003-01-29  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elfxx-mips.c (mips_elf_got_entry_hash): Don't dereference
+	entry->abfd when it's NULL.
+
+2003-01-27  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elfxx-mips.c (mips_elf_create_dynamic_relocation): Handle
+	_bfd_elf_section_offset returning -2 the same way as -1.
+
+	* elfxx-mips.c (mips_elf_multi_got): New function.
+	(struct mips_got_entry): Make symndx and gotidx signed.  Moved
+	addend into union along with address and link hash entry.
+	(struct mips_got_info): Added bfd2got and next.
+	(struct mips_elf_hash_sort_data): Added max_unref_got_dynindx.
+	(mips_elf_got_section, mips_elf_create_got_section): Use
+	SEC_EXCLUDE bit to tell whether we really need the got
+	section.  Take boolean arguments to disregard an excluded
+	section, or to create it as excluded.  Adjust all callers.
+	Use mips_elf_got_section all over.
+	(mips_elf_local_got_index, mips_elf_got_page,
+	mips_elf_got16_entry): Take input bfd as argument, and pass it
+	on to mips_elf_create_local_got_entry.
+	(mips_elf_global_got_index, mips_elf_create_local_got_entry):
+	Take input bfd as argument, and manage entries in the
+	appropriate GOT.
+	(mips_elf_got_offset_from_index): Take input bfd as argument,
+	and use it to adjust the GP offset of the bfd.
+	(mips_elf_sort_hash_table, mips_elf_sort_hash_table_f): Move
+	unreferenced GOT entries of global symbols to the end.
+	(mips_elf_record_global_got_symbol): Take input bfd as
+	argument.  Add entries to the master GOT hash table.
+	(struct mips_elf_bfd2got_hash): New.
+	(struct mips_elf_got_per_bfd_arg): New.
+	(struct mips_elf_set_global_got_offset_arg): New.
+	(mips_elf_hash_bfd_vma, mips_elf_multi_got_entry_hash,
+	mips_elf_multi_got_entry_eq, mips_elf_bfd2got_entry_hash,
+	mips_elf_bfd2got_entry_eq, mips_elf_make_got_per_bfd,
+	mips_elf_merge_gots, mips_elf_set_global_got_offset,
+	mips_elf_resolve_final_got_entry,
+	mips_elf_resolve_final_got_entries, mips_elf_adjust_gp,
+	mips_elf_got_for_ibfd): New functions.
+	(ELF_MIPS_GP_OFFSET): Don't depend on SGI_COMPAT.
+	(MIPS_ELF_GOT_MAX_SIZE): New macro.
+	(STUB_LW): Generate 64-bit stub regardless of SGI_COMPAT.
+	(mips_elf_got_entry_hash): Take new fields into account.  Use
+	mips_elf_hash_bfd_vma.
+	(mips_elf_got_entry_eq): Take new fields into account.
+	(mips_elf_create_got_section): Initialize new fields.
+	(mips_elf_calculate_relocation): Pass input_bfd to functions
+	that now take it.  Adjust gp for the input_bfd.
+	(mips_elf_allocate_dynamic_relocation,
+	mips_elf_create_dynamic_relocation,
+	_bfd_mips_elf_create_dynamic_sections): Use...
+	(mips_elf_rel_dyn_section): New function.  Borrow code from...
+	(_bfd_mips_elf_check_relocs): Pass input_bfd to functions that
+	now take it.  Create the got section if needed, even if
+	excluded, before recording a global got symbol.  Move some
+	code to...
+	(mips_elf_record_local_got_symbol): New fn.
+	(_bfd_mips_elf_size_dynamic_sections): Disable combreloc.
+	Compute multi-got global entries offsets.  Move GOT code to...
+	(_bfd_mips_elf_always_size_sections): Call mips_elf_multi_got
+	if the GOT is too big.
+	(_bfd_mips_elf_finish_dynamic_symbol): Set got entry of
+	undefweak symbol to zero.  Generate dynamic relocations for
+	non-primary GOT entries for global symbols.
+	(_bfd_mips_elf_finish_dynamic_sections): Handle multi-got
+	case.  Generate dynamic relocations for local got entries.
+	Sort dynamic relocations on N64 too, using...
+	(sort_dynamic_relocs_64): New fns.
+	(_bfd_mips_elf_hide_symbol): Adjust multi-got counters.
+	(_bfd_mips_elf_merge_private_bfd_data): Ignore EF_MIPS_XGOT.
+
+2003-01-27  Alexandre Oliva  <aoliva@redhat.com>
+
+	* bfd.c (struct _bfd): Added id field.
+	* opncls.c (_bfd_id_counter): New static variable.
+	(_bfd_new_bfd): Use it.
+	* bfd-in2.h: Rebuilt.
+
+2003-01-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-sparc.c (bfd_elf32_new_section_hook): Define.
+
+2003-01-25  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-sparc.c (_bfd_sparc_elf_howto_table): Add TLS relocs.
+	(elf32_sparc_rev32_howto): New variable.
+	(sparc_reloc_map): Add TLS relocs.
+	(elf32_sparc_reloc_type_lookup, elf32_sparc_info_to_howto):
+	Handle REV32.
+	(sparc_elf_hix22_reloc, sparc_elf_lox10_reloc, elf32_sparc_mkobject):
+	New functions.
+	(struct elf32_sparc_dyn_relocs, struct elf32_sparc_link_hash_entry,
+	struct elf32_sparc_link_hash_table):
+	New structures.
+	(elf32_sparc_tdata, elf32_sparc_local_got_tls_type,
+	elf32_sparc_hash_table): Define.
+	(link_hash_newfunc, elf32_sparc_link_hash_table_create,
+	create_got_section, elf32_sparc_create_dynamic_sections,
+	elf32_sparc_copy_indirect_symbol, elf32_sparc_tls_transition): New
+	functions.
+	(elf32_sparc_check_relocs): Handle TLS relocs.  Add dynamic reloc
+	reference counting.
+	(elf32_sparc_gc_sweep_hook): Likewise.
+	(elf32_sparc_adjust_dynamic_symbol): Likewise.
+	(elf32_sparc_size_dynamic_sections): Likewise.
+	(elf32_sparc_relocate_section): Likewise.
+	(allocate_dynrelocs, readonly_dynrelocs, dtpoff_base, tpoff):
+	New functions.
+	(elf32_sparc_object_p): Allocate backend private object data.
+	(bfd_elf32_bfd_link_hash_table_create,
+	elf_backend_copy_indirect_symbol, bfd_elf32_mkobject,
+	elf_backend_can_refcount): Define.
+	(elf_backend_create_dynamic_sections): Define to
+	elf32_sparc_create_dynamic_sections.
+	* reloc.c: Add SPARC TLS relocs.
+	* bfd-in2.h, libbfd.h: Rebuilt.
+	* elf64-sparc.c (sparc64_elf_howto_table): Add TLS relocs.
+	(sparc_reloc_map): Likewise.
+
+2003-01-24  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* bfd-in2.h: Regenerate.
+	* elf32-s390.c (elf_s390_mkobject, elf_s390_tls_transition,
+	s390_tls_reloc, dtpoff_base, tpoff, invalid_tls_insn): New functions.
+	(elf_howto_table): Add TLS relocs.
+	(elf_s390_reloc_type_lookup): Likewise.
+	(elf_s390_link_hash_entry): Add tls_type.
+	(elf_s390_hash_entry, elf_s390_obj_tdata, elf_s390_local_got_tls_type):
+	New macros.
+	(elf_s390_link_hash_table): Add tls_ldm_got.
+	(link_hash_newfunc): Initialize tls_type.
+	(elf_s390_link_hash_table_create): Initialize refcount of tls_ldm_got.
+	(elf_s390_copy_indirect_symbol): Copy tls_type information.
+	(elf_s390_check_relocs): Support TLS relocs.
+	(elf_s390_gc_sweep_hook): Likewise.
+	(allocate_dynrelocs): Likewise.
+	(elf_s390_size_dynamic_sections): Likewise.
+	(elf_s390_relocate_section): Likewise.
+	(elf_s390_finish_dynamic_symbol): Likewise.
+	(bfd_elf32_mkobject): Define for TLS.
+	* elf64-s390.c: Same changes as for elf32-s390.c.
+	* libbfd.h: Regenerate.
+	* reloc.c: Add s390 TLS relocations.
+
+2003-01-24  Charles Lepple  <clepple@ghz.cc>
+
+	* aclocal.m4: Fix name of --enable-install-libbfd switch.
+
+2003-01-23  Nick Clifton  <nickc@redhat.com>
+
+	* Add sh2e support:
+	2002-04-02  Elena Zannoni  <ezannoni@redhat.com>
+	* archures.c (bfd_mach_sh2e): Added.
+	* bfd-in2.h: Rebuilt.
+	* cpu-sh.c (arch_info_struct): Added SH2e.
+	* elf32-sh.c (sh_elf_set_mach_from_flags): Handle EF_SH2E.
+
+2003-01-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct bfd_elf_section_data): Remove tdata.  Change
+	dynindx to an int.  Rearrange for better packing.
+	* elf.c (_bfd_elf_new_section_hook): Don't alloc if already done.
+	* elf32-mips.c (bfd_elf32_new_section_hook): Define.
+	* elf32-sh64.h: New.  Split out from include/elf/sh.h.
+	(struct _sh64_elf_section_data): New struct.
+	(sh64_elf_section_data): Don't dereference sh64_info (was tdata).
+	* elf32-sh64-com.c: Include elf32-sh64.h.
+	* elf32-sh64.c: Likewise.
+	(sh64_elf_new_section_hook): New function.
+	(bfd_elf32_new_section_hook): Define.
+	(sh64_elf_fake_sections): Adjust for sh64_elf_section_data change.
+	(sh64_bfd_elf_copy_private_section_data): Likewise.
+	(sh64_elf_final_write_processing): Likewise.
+	* elf32-sparc.c (struct elf32_sparc_section_data): New.
+	(elf32_sparc_new_section_hook): New function.
+	(SET_SEC_DO_RELAX, SEC_DO_RELAX): Delete.
+	(sec_do_relax): Define.
+	(elf32_sparc_relax_section): Adjust to use sec_do_relax.
+	(elf32_sparc_relocate_section): Likewise.
+	* elf64-mips.c (bfd_elf64_new_section_hook): Define.
+	* elf64-mmix.c (struct _mmix_elf_section_data): New.
+	(mmix_elf_section_data): Define.  Use throughout file.
+	(mmix_elf_new_section_hook): New function.
+	(bfd_elf64_new_section_hook): Define.
+	* elf64-ppc.c (struct _ppc64_elf_section_data): New.
+	(ppc64_elf_section_data): Define.  Use throughout.
+	(ppc64_elf_new_section_hook): New function.
+	(bfd_elf64_new_section_hook): Define.
+	* elf64-sparc.c (struct sparc64_elf_section_data): New.
+	(sparc64_elf_new_section_hook): New function.
+	(SET_SEC_DO_RELAX, SEC_DO_RELAX): Delete.
+	(sec_do_relax): Define.
+	(sparc64_elf_relax_section): Adjust to use sec_do_relax.
+	(sparc64_elf_relocate_section): Likewise.
+	(bfd_elf64_new_section_hook): Define.
+	* elfn32-mips.c (bfd_elf32_new_section_hook): Define.
+	* elfxx-mips.c (struct _mips_elf_section_data): New.
+	(mips_elf_section_data): Define.  Use throughout.
+	(_bfd_mips_elf_new_section_hook): New function.
+	(mips_elf_create_got_section): Don't alloc used_by_bfd.
+	* elfxx-mips.h (_bfd_mips_elf_new_section_hook): Declare.
+	* elfxx-target.h (bfd_elfNN_new_section_hook): Add #ifndef.
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2003-01-21  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (ALPHA_ELF_LINK_HASH_PLT_LOC): New.
+	(struct alpha_elf_link_hash_entry): Add plt_old_section, plt_old_value.
+	(elf64_alpha_adjust_dynamic_symbol): Set them.
+	(elf64_alpha_size_plt_section_1): Reset them when plt entry removed.
+	(elf64_alpha_relax_tls_get_addr): Handle LDM relocs.  Frob the
+	symbol index when relaxing LDM to TPREL.
+	(elf64_alpha_relax_section): Likewise.  Allow relaxation of GD
+	relocs, even if the target isn't locally defined.
+	(elf64_alpha_check_relocs): Frob LDM reloc symndx to zero.
+	(elf64_alpha_relocate_section): Likewise.  Force TP-relative
+	relocs vs symndx 0 to the tp base.
+
+2003-01-21  Fabio Alemagna  <falemagn@aros.org>
+
+	* config.bfd: Handle i[3456]86-*-aros*.
+
+2003-01-21  Andreas Schwab  <schwab@suse.de>
+
+	* elf32-ppc.c (struct ppc_elf_dyn_relocs): Define.
+	(struct ppc_elf_link_hash_entry): Define.
+	(ppc_elf_hash_entry): New function.
+	(struct ppc_elf_link_hash_table): Define.
+	(ppc_elf_hash_table): New function.
+	(ppc_elf_link_hash_newfunc): New function.
+	(ppc_elf_link_hash_table_create): New function.
+	(ppc_elf_copy_indirect_symbol): New function.
+	(allocate_dynrelocs): New function.
+	(readonly_dynrelocs): New function.
+	(ppc_elf_size_dynamic_sections): Allocate space for dynamic
+	relocs and determine DT_TEXTREL.
+	(ppc_elf_check_relocs): Don't do that here, just count the
+	dynamic relocs.
+	(ppc_elf_gc_sweep_hook): Discard any dynamic relocs against the
+	removed section.
+	(bfd_elf32_bfd_link_hash_table_create): Define.
+	(elf_backend_copy_indirect_symbol): Define.
+
+2003-01-21  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (alpha_dynamic_entries_for_reloc): GOTTPREL and
+	TPREL also get a reloc if shared.  Remove SREL support.
+	(elf64_alpha_emit_dynrel): New.
+	(elf64_alpha_relocate_section): Use it.  Resolve dynamic TPREL
+	and GOTTPREL relocs to local symbols against the tp base.
+	(elf64_alpha_finish_dynamic_symbol): Use elf64_alpha_emit_dynrel.
+
+	* elf64-alpha.c (elf64_alpha_relax_got_load): Decrement got
+	use count before clobbering r_type.
+	(elf64_alpha_relax_tls_get_addr): Don't use pos[1] if insn
+	ordering would mean dataflow inspection is necessary.
+
+2003-01-20  Svein E. Seldal  <Svein.Seldal@solidas.com>
+
+	* coffcode.h (coff_set_flags): Added get/set arch hooks.
+
+2003-01-20  Fabio Alemagna  <falemagn@aros.org>
+
+	* elf32-sh.c: Treat elfNN_bed like other macros defined in
+	  elfxx-target.h and #undef it before #define'ing it.
+	* elf32-i386.c: Likewise.
+	* elf32-sh64.c: Likewise.
+	* elf64-alpha.c: Likewise.
+	* elf64-sh64.c: Likewise.
+
+2003-01-20  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* bfd-in2.h: Regenerate.
+	* elf32-s390.c (elf_s390_adjust_gotplt): New prototype.
+	(elf_howto_table): Rename R_390_GOTOFF to R_390_GOTOFF32. Add
+	R_390_GOTOFF16, R_390_GOTOFF64, R_390_GOTPLT12, R_390_GOTPLT16,
+	R_390_GOTPLT32, R_390_GOTPLT64, R_390_GOTPLTENT, R_390_PLTOFF16,
+	R_390_PLTOFF32 and R_390_PLTOFF64.
+	(elf_s390_reloc_type_lookup): Likewise.
+	(struct elf_s390_link_hash_entry): Add gotplt_refcount to keep track
+	of GOTPLT references to a function.
+	(link_hash_newfunc): Initialize gotplt_refcount.
+	(elf_s390_check_relocs): Move allocation of local_got_refcounts array
+	and creation of the got section out of the main switch. Add support
+	for the gotoff, gotplt and pltoff relocations.
+	(elf_s390_gc_sweep_hook): Add reference counting for gotoff, gotplt
+	and pltoff.
+	(elf_s390_adjust_gotplt): New function.
+	(elf_s390_adjust_dynamic_symbol): Adjust gotplt refcount for removed
+	plt entries.
+	(allocate_dynrelocs): Add comment.
+	(elf_s390_relocate_section): Change r_type to unsigned. Add support
+	for gotoff, gotplt and pltoff relocations.
+	* elf64-s390.c: Same changes as for elf32-s390.c.
+	* libbfd.h: Regenerate.
+	* reloc.c: Add BFD_RELOC_390_GOTOFF64, BFD_RELOC_390_GOTPLT12,
+	BFD_RELOC_390_GOTPLT16, BFD_RELOC_390_GOTPLT32, BFD_RELOC_390_GOTPLT64,
+	BFD_RELOC_390_GOTPLTENT, BFD_RELOC_390_PLTOFF16, BFD_RELOC_390_PLTOFF32
+	and BFD_RELOC_390_PLTOFF64.
+
+2003-01-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Handle
+	R_IA64_TPREL64[LM]SB against non-global symbol properly.
+
+2003-01-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* elfxx-ia64.c (struct elfNN_ia64_link_hash_table): Add
+	self_dtpmod_done and self_dtpmod_offset.
+	(allocate_global_data_got): Only use one got entry for all
+	dtpmod relocs against local symbols.
+	(allocate_dynrel_entries): Only need .rela.got entry for
+	dtpmod against global symbol.
+	(elfNN_ia64_size_dynamic_sections): Initialize self_dtpmod_offset.
+	Reserve space in .rela.got for the local dtpmod entry.
+	(set_got_entry): Initialize the common local dtpmod .got entry.
+	(elfNN_ia64_relocate_section): Handle R_IA_64_DTPREL64LSB
+	and R_IA_64_DTPREL64MSB.
+
+2003-01-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c: Include elf/ppc64.h rather than elf/ppc.h.
+	(R_PPC_*): Rename all occurrences to R_PPC64_*.
+	(R_PPC64_ADDR30): Rename all occurrences to R_PPC64_REL30.
+	(enum elf_ppc_reloc_type): Ditto to enum elf_ppc64_reloc_type.
+	(ppc64_elf_gc_sweep_hook): Handle R_PPC64_REL30 along with other
+	relative relocs, not with absolute ones.
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2003-01-15  Andreas Schwab  <schwab@suse.de>
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Don't set DF_TEXTREL for a
+	relocation against a non-allocated readonly section.
+
+2003-01-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Adjust addend for GOT16_HA.
+	* elf64-ppc.c (ppc64_elf_relocate_section): Likewise.  PLTGOT16_HA too.
+
+2002-01-08  Klee Dienes  <kdienes@apple.com>
+
+	* Makefile.am (ALL_MACHINES): Use cpu-msp430.lo, not cpu-msp430.c.
+	(BFD32_BACKENDS): Use elf32-msp430.lo, not elf32-msp430.c.
+	* Makefile.in: Regenerate.
+
+2003-01-08  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elfn32-mips.c (prev_reloc_section): New.
+	(GET_RELOC_ADDEND): Use it.  Parenthesize macro arguments.
+	(SET_RELOC_ADDEND): Parenthesize macro argument.
+
+2003-01-07  John David Anglin  <dave.anglin@nrc.gc.ca>
+
+	* elf32-hppa.c (final_link_relocate): For all DP relative relocations,
+	adjust addil instructions if the symbol has no section.
+
+2003-01-07  DJ Delorie  <dj@redhat.com>
+
+	* elf32-xstormy16.c (xstormy16_elf_howto_table): Make REL_12 not
+	partial_inplace.
+
+2003-01-07  Andreas Schwab  <schwab@suse.de>
+
+	* elf32-m68k.c (elf_m68k_check_relocs): Don't set DF_TEXTREL for
+	PC relative relocations.
+	(elf_m68k_discard_copies): Set it here instead.
+
+2002-01-02  Ben Elliston  <bje@redhat.com>
+	    Jeff Johnston  <jjohnstn@redhat.com>
+
+	* Makefile.am (ALL_MACHINES): Add cpu-iq2000.lo.
+	(ALL_MACHINES_CFILES): Add cpu-iq2000.c.
+	(BFD32_BACKENDS): Add elf32-iq2000.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-iq2000.c.
+	(cpu-iq2000.lo): New target.
+	* Makefile.in: Regenerate.
+	* config.bfd: Handle iq2000-*-elf.
+	* archures.c (bfd_architecture): Add bfd_{arch,mach}_iq2000.
+	(bfd_archures_list): Add bfd_iq2000_arch.
+	* configure.in: Handle bfd_elf32_iq2000_vec.
+	* configure: Regenerate.
+	* reloc.c: Add BFD_RELOC_IQ2000_OFFSET_16, BFD_RELOC_IQ2000_OFFSET_21,
+	and BFD_RELOC_IQ2000_UHI16.
+	* targets.c (bfd_elf32_iq2000_vec): Declare.
+	(bfd_target_vector): Add bfd_elf32_iq2000_vec.
+	* elf.c (prep_headers): Set e_machine to EM_IQ2000.
+	* cpu-iq2000.c: New file.
+	* elf32-iq2000.c: Likewise.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Likewise.
+
+2003-01-02  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elfxx-mips.c: Include libiberty.h.
+	(elf_mips_isa, _bfd_mips_elf_mach_extends_p): Remove.
+	(mips_set_isa_flags): New function, split out from...
+	(_bfd_mips_elf_final_write_processing): ...here.  Only call
+	mips_set_isa_flags if the EF_MIPS_MACH bits are clear.
+	(mips_mach_extensions): New array.
+	(mips_32bit_flags_p): New function.
+	(_bfd_mips_elf_merge_private_bfd_data): Rework architecture checks.
+	Use mips_32bit_flags_p to check if one binary is 32-bit and the
+	other is 64-bit.  When adopting IBFD's architecture, adopt the
+	bfd_mach as well as the flags.
+
+2003-01-02  Nick Kelsey  <nickk@ubicom.com>
+
+	* elf32-ip2k.c: Re-work of linker relaxation code for the ip2k to
+	fix internal errors, fix bad code generation, fix incorrect stabs
+	information, and improve ability to eliminate redundant page
+	instructions. Added code to ip2k_final_link_relocate to self-verify
+	the linker relaxation.  Fix formatting problems.
+
+2002-12-30  Chris Demetriou  <cgd@broadcom.com>
+
+	* aoutx.h (NAME(aout,machine_type)): Add bfd_mach_mipsisa32r2 case.
+	* archures.c (bfd_mach_mipsisa32r2): New define.
+	* bfd-in2.h: Regenerate.
+	* cpu-mips.c (I_mipsisa32r2): New enum value.
+	(arch_info_struct): Add entry for I_mipsisa32r2.
+	* elfxx-mips.c (elf_mips_isa, _bfd_elf_mips_mach)
+	(_bfd_mips_elf_print_private_bfd_data): Handle E_MIPS_ARCH_32R2.
+	(_bfd_mips_elf_final_write_processing): Add
+	bfd_mach_mipsisa32r2 case.
+	(_bfd_mips_elf_merge_private_bfd_data): Handle merging of
+	binaries marked as using MIPS32 Release 2.
+
+2002-12-30    Dmitry Diky <diwil@mail.ru>
+
+	* Makefile.am: Add msp430 target.
+	* configure.in: Likewise.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+	* archures.c: Add msp430 architecture vector.
+	* config.bfd: Likewise.
+	* reloc.c: Add msp430 relocs.
+	* targets.c: Add msp320 target.
+	* cpu-msp430.c: New file: msp430 cpu detection.
+	* elf32-msp430.c: New file: msp430 reloc processing.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2002-12-28  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf.c (elf_sort_sections): Don't reorder .tbss.
+	(assign_file_positions_for_segments): Only adjust off/voff
+	for increased alignment in PT_LOAD or PT_NOTE segment,
+	but adjust p_filesz for .tbss too.  in PT_LOAD consider
+	.tbss to have zero memory size.
+	(copy_private_bfd_data) [SECTION_SIZE]: Define.
+	[IS_CONTAINED_BY_VMA, IS_CONTAINED_BY_LMA]: Use it.
+	[INCLUDE_SECTION_IN_SEGMENT]: Only put SHF_TLS sections
+	into PT_TLS segment.  Never put SHF_TLS sections in
+	segments other than PT_TLS or PT_LOAD.
+
+	* elf64-alpha.c (elf64_alpha_finish_dynamic_sections): Clear .plt
+	sh_entsize.
+
+2002-12-23  DJ Delorie  <dj@redhat.com>
+
+	* coff64-rs6000.c (xcoff64_ppc_relocate_section): Fix logic reversal.
+
+2002-12-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_link_output_extsym): Heed strip_discarded.
+
+2002-12-23  Nick Clifton  <nickc@redhat.com>
+
+	* archures.c (bfd_arch_get_compatible): Add third parameter
+	'accept_unknowns'.  Only accept unknown format BFDs if
+	accept_unknowns is true, or if the format is "binary".
+	* bfd-in2.h: Regenerate.
+
+2002-12-21  Nick Clifton  <nickc@redhat.com>
+
+	* coff-arm.c (coff_arm_relocate_section): Disable WINCE workaround
+	that subtracted 8 from pc relative relocations.
+
+2002-12-20  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* coff-h8300.c: Fix comment typos.
+	* coffcode.h: Likewise.
+	* cpu-cris.c: Likewise.
+	* elf32-vax.c: Likewise.
+	* genlink.h: Likewise.
+	* linker.c: Likewise.
+	* som.c: Likewise.
+	* tekhex.c: Likewise.
+	* vms-misc.c: Likewise.
+
+2002-12-20  DJ Delorie  <dj@redhat.com>
+
+	* reloc.c: Add BFD_RELOC_XSTORMY16_12.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* elf32-xstormy16.c (xstormy16_elf_howto): Add R_XSTORMY16_12.
+	(xstormy16_reloc_map): Add R_XSTORMY16_12.
+
+2002-12-19  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* doc/bfdint.texi: Fix typos.
+
+2002-12-20  Paul Eggert  <eggert@twinsun.com>
+
+	Port to POSIX 1003.1-2001.
+	* acinclude.m4 (AM_INSTALL_LIBBFD): Do not rely on "test -o".
+	* configure.in (build-warnings): Likewise.
+	(Horrible hacks to build DLLs on Windows): Do not rely on "tail -1".
+	* aclocal.m4: Regenerate.
+	* config.in: Regenerate.
+	* configure: Regenerate.
+
+2002-12-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* coff-h8300.c: Include libiberty.h.
+	(h8300_reloc16_extra_cases): Check the hash table creator before
+	referencing h8300 specific fields.  Stash the hash table pointer
+	in a local var.  Comment typo fixes.
+	(h8300_bfd_link_add_symbols): Likewise.
+
+	* reloc.c (struct reloc_howto_struct): Revise src_mask and
+	dst_mask comments.
+	* bfd-in2.h: Regenerate.
+
+2002-12-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Reorganize dynamic reloc
+	code a little.  Comment on dynamic relocs against section symbols.
+
+2002-12-17  Roger Sayle  <roger@eyesopen.com>
+
+	* configure.host (ia64-*-hpux*): Support 64 bit targets using
+	the HP compiler's "long long".
+
+2002-12-16  Andrew MacLeod  <amacleod@redhat.com>
+
+	* elf32-xstormy16.c (xstormy16_elf_howto): Add R_XSTORMY16_LO16
+	and R_XSTORMY16_HI16) howto entries.
+	(xstormy16_reloc_map): Map R_XSTORMY16_{LO,HI}16 to BFD_RELOC_{LO,HI}16.
+	(xstormy16_info_to_howto_rela): Use R_XSTORMY16_GNU_VTINHERIT to
+	determine the start of the second reloc table.
+
+2002-12-16  Nathan Tallent  <eraxxon@alumni.rice.edu>
+
+	* ecofflink.c: Fix the reading of the debugging information
+	of Tru64/Alpha binaries that are produced by recent Compaq
+	compilers.
+	(mk_fdrtab): Fix error in creating the FDR (file descriptor)
+	table.
+	(lookup_line): Because of the strange information sometimes
+	generated by Compaq's recent compilers, change how the FDR
+	table is searched so that PDRs (procedure descriptors) are
+	correctly found.  Note that this change is really more of a hack;
+	however, I have included extensive documentation as to why
+	this is the best solution short of an extensive rewrite or
+	another hack.
+	(fdrtab_lookup): Add comments to explain the algorithm.
+
+2002-12-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf-m10300.c (elf32_mn10300_link_hash_newfunc): Reorder
+	initializers to match struct declaration.
+
+2002-12-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* dwarf2.c (comp_unit_contains_address): Comment typo fix.
+	* elf.c (get_program_header_size): Likewise.
+	* elf32-m32r.c (m32r_elf_lo16_reloc): Likewise.
+	(m32r_elf_generic_reloc): Likewise.
+	* elf32-ppc.c (ppc_elf_howto_init): Likewise.
+	* elflink.h (elf_bfd_discard_info): Likewise.
+
+2002-12-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-i386.c (elf_i386_finish_dynamic_sections): Add output_offset
+	to DT_JMPREL.  Use srelplt input section size for DT_PLTRELSZ and
+	DT_RELSZ adjustment, not output section.  Avoid writing tags when
+	unchanged.  Don't assume linker script is sane, adjust DT_REL too.
+	* elf32-hppa.c (elf32_hppa_finish_dynamic_sections): Just use raw
+	size of srelplt for DT_PLTRELSZ.  Use srelplt input section size for
+	DT_RELASZ adjustment, not output section.  Avoid writing tags when
+	unchanged.  Adjust DT_RELA.
+	* elf64-ppc.c (ppc64_elf_finish_dynamic_sections): Tweaks for better
+	formatting.  Avoid writing tags when unchanged.  Adjust DT_RELA.
+
+2002-12-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): Don't divide
+	addend by 4.
+
+2002-12-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elfxx-mips.c (struct mips_got_entry): New.
+	(struct mips_got_info): Added got_entries field.
+	(mips_elf_got_entry_hash, mips_elf_got_entry_eq): New functions.
+	(mips_elf_local_got_index, mips_elf_got_page,
+	mips_elf_got16_entry): Re-implement in terms of new...
+	(mips_elf_create_local_got_entry): Rewrite to use got_entries.
+	Change return type.
+	(mips_elf_highest): Warning clean-up.
+	(mips_elf_create_got_section): Initialize got_entries.
+	(_bfd_mips_elf_check_relocs): Use got_entries to estimate
+	local got size.
+	(_bfd_mips_elf_size_dynamic_sections): Do not account for
+	GOT_PAGE entries, since we now reuse GOT16 entries.
+
+2002-12-10  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* aoutx.h (set_section_contents): Allow an otherwise unrepresentable
+	read-only section that lies after .text and before .data to be
+	written into the output file and included in a_text.
+	(translate_to_native_sym_flags): If an otherwise unrepresentable
+	section was merged with .text, convert its symbols to N_TEXT
+	symbols.
+	* libaout.h (aout_section_merge_with_text_p): New macro.
+
+2002-12-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd-in.h: Comment typo fix.  Formatting.
+	* bfd-in2.h: Regenerate.
+	* coff64-rs6000.c (xcoff64_openr_next_archived_file): Warning fix.
+	* elf32-m68hc12.c (m68hc12_elf_set_mach_from_flags): Prototype.
+	* elf64-mmix.c (mmix_dump_bpo_gregs): Warning fix.
+
+2002-12-05  Richard Henderson  <rth@redhat.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Handle PCREL21BI.
+	Only send PCREL21B though the plt.  Fix installed reloc type.
+	(elfNN_ia64_relocate_section): Give error for dynamic reloc
+	against PCREL22 or PCREL64I; clean up error messages for
+	branch relocs.
+
+2002-12-04  Kevin Buettner  <kevinb@redhat.com>
+
+	* elf64-mips.c (elf64_mips_grok_prstatus, elf64_mips_grok_psinfo):
+	New functions.
+	(elf_backend_grok_prstatus, elf_backend_grok_psinfo): Define.
+
+2002-12-04  David Mosberger  <davidm@hpl.hp.com>
+
+	* cpu-ia64-opc.c: Add operand constant "ar.csd".
+
+2002-12-04  H.J. Lu <hjl@gnu.org>
+
+	* elfxx-ia64.c (get_local_sym_hash): Use section ID instead of
+	BFD address when constructing local name.
+
+2002-12-04  Andreas Schwab  <schwab@suse.de>
+
+	* elf32-m68k.c (struct elf_m68k_link_hash_table): Add sym_sec
+	member.
+	(elf_m68k_link_hash_table_create): Initialize it.
+	(elf_m68k_check_relocs): Handle symbols that are forced to be
+	local due to visibility changes.
+	(elf_m68k_adjust_dynamic_symbol): Likewise.
+	(elf_m68k_size_dynamic_sections): Likewise.
+	(elf_m68k_discard_copies): Likewise.
+	(elf_m68k_relocate_section): Likewise.
+
+2002-12-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_edit_opd): Correct typo.
+
+2002-12-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* srec.c (srec_write_symbols): Restore '$' prefix to address
+	accidentally removed in 2002-04-04 change.
+	(srec_get_symtab): Use 0 instead of `(long) FALSE'.
+
+2002-12-03  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-ppc.c (apuinfo_list_init): New function.
+	(apuinfo_list_add): New function: Add a value to the list.
+	(apuinfo_list_length): New function: Return the number of
+	values on the list.
+	(apuinfo_list_element): New function: Return a value on the
+	list.
+	(apuinfo_list_finish): New function: Free the resources used
+	by the list.
+	(ppc_elf_begin_write_processing): New function.  Scan the
+	input bfds for apuinfo sections.
+	(ppc_elf_write_section): New function: Delay the creation of
+	the contents of an apuinfo section in an output bfd.
+	(ppc_elf_final_write_processing): New function.  Create the
+	contents of an apuinfo section in an output bfd.
+	(elf_backend_begin_write_processing): Define.
+	(elf_backend_final_write_processing): Define.
+	(elf_backend_write_section): Define.
+
+2002-12-03  Richard Henderson  <rth@redhat.com>
+
+	* cpu-ia64-opc.c (elf64_ia64_operands): Add ldxmov entry.
+
+2002-12-01  Stephane Carrez  <stcarrez@nerim.fr>
+
+	Fix PR savannah/1417:
+	* elf32-m68hc11.c (m68hc11_elf_relax_delete_bytes): Don't adjust
+	branch if it goes to the start of the deleted region.
+
+2002-12-01  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* bfd-in2.h (bfd_mach_m6812): Rebuild.
+	* archures.c (bfd_mach_m6812_default, bfd_mach_m6812,
+	bfd_mach_m6812s): Declare.
+
+	* elf32-m68hc12.c (m68hc12_elf_set_mach_from_flags): New function.
+	(_bfd_m68hc12_elf_set_private_flags): Call it.
+	(_bfd_m68hc12_elf_print_private_bfd_data): Report processor version.
+	(_bfd_m68hc12_elf_merge_private_bfd_data): Merge the flags and
+	report microcontroller incompatibilities (HC12 vs HCS12).
+	(elf_backend_object_p): Update.
+
+2002-11-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd-in.h (TRUE_FALSE_ALREADY_DEFINED, BFD_TRUE_FALSE): Delete.
+	(enum bfd_boolean, boolean): Delete.
+	(bfd_boolean): Typedef to an int.
+	(FALSE, TRUE): Define.
+	* aix386-core.c, aix5ppc-core.c, aout-adobe.c, aout-arm.c, aout-cris.c,
+	aout-encap.c, aout-ns32k.c, aout-target.h, aout-tic30.c, aoutf1.h,
+	aoutx.h, archive.c, archive64.c, archures.c, bfd-in.h, bfd.c, bfdwin.c,
+	binary.c, bout.c, cache.c, cisco-core.c, coff-a29k.c, coff-alpha.c,
+	coff-apollo.c, coff-arm.c, coff-aux.c, coff-h8300.c, coff-h8500.c,
+	coff-i386.c, coff-i860.c, coff-i960.c, coff-ia64.c, coff-m68k.c,
+	coff-m88k.c, coff-mcore.c, coff-mips.c, coff-or32.c, coff-ppc.c,
+	coff-rs6000.c, coff-sh.c, coff-sparc.c, coff-stgo32.c, coff-tic30.c,
+	coff-tic4x.c, coff-tic54x.c, coff-tic80.c, coff-w65.c, coff-we32k.c,
+	coff-z8k.c, coff64-rs6000.c, coffcode.h, coffgen.c, cofflink.c,
+	corefile.c, cpu-a29k.c, cpu-alpha.c, cpu-arc.c, cpu-arm.c, cpu-avr.c,
+	cpu-cris.c, cpu-d10v.c, cpu-d30v.c, cpu-dlx.c, cpu-fr30.c, cpu-frv.c,
+	cpu-h8300.c, cpu-h8500.c, cpu-hppa.c, cpu-i370.c, cpu-i386.c,
+	cpu-i860.c, cpu-i960.c, cpu-ia64.c, cpu-ip2k.c, cpu-m10200.c,
+	cpu-m10300.c, cpu-m32r.c, cpu-m68hc11.c, cpu-m68hc12.c, cpu-m68k.c,
+	cpu-m88k.c, cpu-mcore.c, cpu-mips.c, cpu-mmix.c, cpu-ns32k.c,
+	cpu-openrisc.c, cpu-or32.c, cpu-pdp11.c, cpu-pj.c, cpu-powerpc.c,
+	cpu-rs6000.c, cpu-s390.c, cpu-sh.c, cpu-sparc.c, cpu-tic30.c,
+	cpu-tic4x.c, cpu-tic54x.c, cpu-tic80.c, cpu-v850.c, cpu-vax.c,
+	cpu-w65.c, cpu-we32k.c, cpu-xstormy16.c, cpu-z8k.c, dwarf1.c,
+	dwarf2.c, ecoff.c, ecofflink.c, efi-app-ia32.c, efi-app-ia64.c,
+	elf-bfd.h, elf-eh-frame.c, elf-hppa.h, elf-m10200.c, elf-m10300.c,
+	elf-strtab.c, elf.c, elf32-arc.c, elf32-arm.h, elf32-avr.c,
+	elf32-cris.c, elf32-d10v.c, elf32-d30v.c, elf32-dlx.c, elf32-fr30.c,
+	elf32-frv.c, elf32-gen.c, elf32-h8300.c, elf32-hppa.c, elf32-hppa.h,
+	elf32-i370.c, elf32-i386.c, elf32-i860.c, elf32-i960.c, elf32-ip2k.c,
+	elf32-m32r.c, elf32-m68hc11.c, elf32-m68hc12.c, elf32-m68k.c,
+	elf32-mcore.c, elf32-mips.c, elf32-openrisc.c, elf32-or32.c,
+	elf32-pj.c, elf32-ppc.c, elf32-s390.c, elf32-sh.c, elf32-sh64-com.c,
+	elf32-sh64.c, elf32-sparc.c, elf32-v850.c, elf32-vax.c,
+	elf32-xstormy16.c, elf64-alpha.c, elf64-gen.c, elf64-hppa.c,
+	elf64-mips.c, elf64-mmix.c, elf64-ppc.c, elf64-ppc.h, elf64-s390.c,
+	elf64-sh64.c, elf64-sparc.c, elf64-x86-64.c, elfarm-nabi.c,
+	elfarm-oabi.c, elfcode.h, elfcore.h, elflink.c, elflink.h,
+	elfn32-mips.c, elfxx-ia64.c, elfxx-mips.c, elfxx-mips.h,
+	elfxx-target.h, format.c, freebsd.h, genlink.h, hash.c, hp300hpux.c,
+	hppabsd-core.c, hpux-core.c, i386aout.c, i386linux.c, i386lynx.c,
+	i386mach3.c, i386msdos.c, i386os9k.c, ieee.c, ihex.c, irix-core.c,
+	libaout.h, libbfd-in.h, libbfd.c, libcoff-in.h, libecoff.h, libieee.h,
+	libnlm.h, liboasys.h, libpei.h, libxcoff.h, linker.c, lynx-core.c,
+	m68klinux.c, m68klynx.c, mach-o.c, mach-o.h, merge.c, mipsbsd.c,
+	mmo.c, netbsd-core.c, netbsd.h, nlm.c, nlm32-alpha.c, nlm32-i386.c,
+	nlm32-ppc.c, nlm32-sparc.c, nlmcode.h, oasys.c, opncls.c, osf-core.c,
+	pc532-mach.c, pdp11.c, pe-arm.c, pe-i386.c, pe-mcore.c, pe-mips.c,
+	pe-sh.c, peXXigen.c, pef.c, pei-arm.c, pei-i386.c, pei-mcore.c,
+	pei-mips.c, pei-sh.c, peicode.h, ppcboot.c, ptrace-core.c, reloc.c,
+	reloc16.c, riscix.c, rs6000-core.c, sco5-core.c, section.c, simple.c,
+	som.c, som.h, sparclinux.c, sparclynx.c, srec.c, stabs.c, sunos.c,
+	syms.c, targets.c, tekhex.c, ticoff.h, trad-core.c, versados.c,
+	vms-gsd.c, vms-hdr.c, vms-misc.c, vms-tir.c, vms.c, vms.h,
+	xcoff-target.h, xcofflink.c, xsym.c, xsym.h: Replace boolean with
+	bfd_boolean, true with TRUE, false with FALSE.  Simplify comparisons
+	of bfd_boolean vars with TRUE/FALSE.  Formatting.
+	* bfd-in2.h, libbfd.h, libcoff.h: Regenerate
+
+2002-11-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h: Replace occurrences of Elf32_Internal_* and
+	Elf64_Internal_* with Elf_Internal_*.  Replace Elf_Internal_Rel
+	with Elf_Internal_Rela.
+	* elf-hppa.h, elf-m10200.c, elf-m10300.c, elf32-arc.c, elf32-arm.h,
+	elf32-avr.c, elf32-cris.c, elf32-d10v.c, elf32-d30v.c, elf32-dlx.c,
+	elf32-fr30.c, elf32-frv.c, elf32-gen.c, elf32-h8300.c, elf32-hppa.c,
+	elf32-i370.c, elf32-i386.c, elf32-i860.c, elf32-i960.c, elf32-ip2k.c,
+	elf32-m32r.c, elf32-m68hc11.c, elf32-m68hc12.c, elf32-m68k.c,
+	elf32-mcore.c, elf32-mips.c, elf32-openrisc.c, elf32-or32.c,
+	elf32-ppc.c, elf32-s390.c, elf32-sh.c, elf32-v850.c, elf32-vax.c,
+	elf32-xstormy16.c, elf64-alpha.c, elf64-gen.c, elf64-hppa.c,
+	elf64-mips.c, elf64-mmix.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
+	elf64-sparc.c, elf64-x86-64.c, elfarm-nabi.c, elfarm-oabi.c,
+	elfcode.h, elflink.h, elfn32-mips.c, elfxx-ia64.c, elfxx-mips.c: Ditto.
+	* elf-hppa.h (elf_hppa_internal_shdr): Delete.  Use Elf_Internal_Shdr
+	throughout instead.
+	* elf.c (_bfd_elf_no_info_to_howto_rel): Delete.
+	* elfcode.h (elf_swap_reloca_in): Pass source operand as a bfd_byte *.
+	Remove INLINE keyword.
+	(elf_swap_reloc_in): Likewise.  Also clear r_addend.
+	(elf_swap_reloc_out, elf_swap_reloca_out): Pass destination operand
+	as a bfd_byte *.
+	(elf_write_relocs): Consolidate REL and RELA code.
+	(elf_slurp_reloc_table_from_section): Simplify REL code.
+	(NAME(_bfd_elf,size_info)): Populate reloc swap entries.
+	* elf-bfd.h (MAX_INT_RELS_PER_EXT_REL): Define.
+	* elflink.h (elf_link_read_relocs_from_section): Consolidate REL and
+	RELA code.
+	(elf_link_adjust_relocs): Likewise.  Don't malloc space for temp
+	reloc array, use a fixed size of MAX_INT_RELS_PER_EXT_REL.
+	(elf_link_output_relocs): Likewise.
+	(elf_reloc_link_order): Likewise.
+	(elf_finish_pointer_linker_section): Likewise.
+	(struct elf_link_sort_rela): Remove union.
+	(elf_link_sort_cmp1): Update to suit.
+	(elf_link_sort_cmp2): Here too.
+	(elf_link_sort_relocs): Consolidate REL and RELA code.  Fix memory
+	over-allocation for int_rels_per_ext_rel != 1 case.
+	* elf32-arm.h: Update all bfd_elf32_swap_reloc_out calls.
+	* elf32-i386.c: Likewise.
+	* elf32-cris.c: Likewise for bfd_elf32_swap_reloca_out.
+	* elf32-hppa.c, elf32-i370.c, elf32-m68k.c, elf32-ppc.c, elf32-s390.c,
+	elf32-sh.c, elf32-vax.c, elfxx-mips.c: Likewise.
+	* elf64-alpha.c: Likewise for bfd_elf64_swap_reloca_out.
+	* elf64-hppa.c, elf64-mips.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c,
+	elf64-sparc.c, elf64-x86-64.c: Likewise.
+	* elfxx-ia64.c: Likewise for bfd_elfNN_swap_reloca_out.
+	* elfxx-mips.c (sort_dynamic_relocs): Likewise for
+	bfd_elf32_swap_reloc_in.
+
+	* elf32-arm.h: Update elf32_arm_info_to_howto calls.
+	* elf32-mips.c: Likewise for mips_info_to_howto_rel.
+	(mips_elf64_swap_reloc_in): Zero r_addend.
+	(mips_elf64_be_swap_reloc_in): Likewise.
+	(mips_elf64_slurp_one_reloc_table): Simplify.
+
+	* elf64-alpha.c (alpha_elf_size_info): Populate reloc swap entries.
+	* elf64-hppa.c (hppa64_elf_size_info): Likewise.
+	* elf64-sparc.c (sparc64_elf_size_info): Likewise.
+
+2002-11-28  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c (sh_elf_relocate_section): Don't complain about
+	unresolved debugging relocs in dynamic applications.
+	* elf64-sh64.c (sh_elf64_relocate_section): Likewise.
+
+2002-11-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-eh-frame.c (ENSURE_NO_RELOCS): Disregard R_*_NONE relocs.
+	(_bfd_elf_discard_section_eh_frame): Don't discard duplicate CIEs
+	on a relocatable link.  Comment typos.
+	* elf.c (_bfd_elf_link_hash_newfunc): Assign elements of structure
+	in the order they are declared.  Clear elf_hash_value too.
+	(_bfd_elf_link_hash_table_init): Likewise assign in order.  Clear
+	eh_info and tls_segment.
+	* elflink.h (elf_link_input_bfd <emit_relocs>): Keep reloc offsets
+	sorted when discarding relocs by turning them into R_*_NONE.
+
+	* libbfd.c (warn_deprecated): Comment spelling.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2002-11-21  Richard Henderson  <rth@redhat.com>
+
+	* elflink.h (elf_link_add_object_symbols): Don't overwrite the
+	arch's st_other bits when merging visibilities.
+	(elf_link_output_extsym): Tidy clearing of visibility field.
+
+2002-11-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* coff-mcore.c (SWAP_IN_RELOC_OFFSET): Define.
+	(SWAP_OUT_RELOC_OFFSET): Define.
+
+2002-11-20  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf.c (_bfd_elf_link_hash_table_init): Make sure
+	can_refcount is properly extended to the type of
+	init_refcount.
+
+2002-11-19  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elfxx-mips.c (MIPS_RELOC_RELA_P): New macro.
+	(_bfd_mips_elf_relocate_section): Use it.
+
+	* elfxx-mips.c (MNAME): New macro.
+	(_bfd_mips_elf_check_relocs): Use it.
+	(_bfd_mips_elf_discard_info): Likewise.
+	(_bfd_mips_elf_final_link): Likewise.
+
+2002-11-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_edit_opd): When deleting relocs, adjust
+	rel_hdr.sh_size too.
+
+2002-11-18  Klee Dienes  <kdienes@apple.com>
+
+	* Makefile.am (BFD32_LIBS): Add bfdwin.lo, bfdio.lo.
+	(BFD32_LIBS_CFILES): Add bfdwin.c, bfdio.c.
+	(BFD_H_FILES): Add bfdwin.c, bfdio.c.
+	(LIBBFD_H_FILES): Add bfdwin.c, bfdio.c.
+	Add dependencies for bfdwin.c, bfdio.c.
+	* bfd.c: Remove bfd_get_mtime, bfd_get_size.
+	* libbfd.c: Remove real_read, bfd_bread, _bfd_window_internal,
+	bfd_init_window, bfd_free_window, bfd_get_file_window, bfd_bwrite,
+	bfd_tell, bfd_flush, bfd_stat, bfd_seek.
+	* bfdio.c: New file.  Contains real_read, bfd_bread, bfd_write,
+	bfd_tell, bfd_flush, bfd_stat, bfd_seek, bfd_ge_mtime,
+	bfd_get_size (moved from libbfd.c and bfd.c).
+	* bfdwin.c New file.  Contains _bfd_window_internal,
+	bfd_init_window, bfd_free_window, bfd_get_file_window (moved from
+	libbfd.c and bfd.c).
+	* po/SRC-POTFILES.in: Regenerate.
+	* po/bfd.pot: Regenerate.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* aclocal.m4: Regenerate.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2002-11-18  Klee Dienes  <kdienes@apple.com>
+
+	* bfd.c (bfd_preserve_save): Don't zero BFD_IN_MEMORY.
+
+2002-11-15  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* coff-h8300.c (h8300_reloc16_estimate): Do not optimize away
+	jsr after a short jump.
+	* elf32-h8300.c (elf32_h8_relax_section): Likewise.
+
+2002-11-15  Klee Dienes  <kdienes@apple.com>
+
+	* pef.c (bfd_pef_convert_architecture): Move declaration of
+	ARCH_POWERPC and ARCH_M68K to the start of the function.
+
+2002-11-14  Svein E. Seldal  <Svein.Seldal@solidas.com>
+
+	* coff-tic4x.c (tic4x_howto_table): Formatting fixup
+
+2002-11-14  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* elf64-mmix.c (_bfd_mmix_finalize_linker_allocated_gregs):
+	For bpo_gregs_section->contents, allocate _raw_size, not
+	_cooked_size.
+
+2002-11-13  Klee Dienes  <kdienes@apple.com>
+
+	* config.bfd: Add entries for powerpc-*-darwin and cousins.
+
+2002-11-13  H.J. Lu <hjl@gnu.org>
+
+	* elfcode.h (elf_object_p): Don't restore abfd->arch_info.
+
+2002-11-13  Klee Dienes  <kdienes@apple.com>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd.c (struct bfd_preserve): New.
+	(bfd_preserve_save): New function.
+	(bfd_preserve_restore): Ditto.
+	(bfd_preserve_finish): Ditto.
+	* bfd-in2.h: Regenerate.
+	* mach-o.c: Formatting.
+	(bfd_mach_o_scan_read_symtab_symbol): Make "value" unsigned.
+	(bfd_mach_o_object_p): Use bfd_preserve_save/restore/finish.
+	(bfd_mach_o_core_p): Ditto.
+	(bfd_mach_o_scan): Pass in mdata.
+	* mach-o.h (bfd_mach_o_scan): Update prototype.
+	* pef.c: Formatting.
+	(bfd_pef_object_p): Use bfd_preserve_save/restore/finish.
+	(bfd_pef_xlib_object_p): Ditto.
+	(bfd_pef_scan): Pass in mdata.  Move version check to bfd_pef_object_p.
+	* pef.h (bfd_pef_scan): Update prototype.
+	* xsym.c: Formatting, K&R fixes.
+	(bfd_sym_object_p): Use bfd_preserve_save/restore/finish.
+	(bfd_sym_scan): New function split out from bfd_sym_object_p.
+	* xsym.h (bfd_sym_scan): Declare.
+	* elfcode.h (elf_object_p): Use bfd_preserve_save/restore/finish.
+	* elfcore.h (elf_core_file_p): Likewise.
+	* targets.c (_bfd_target_vector): Revert 2002-11-08 change.
+
+2002-11-12  Nick Clifton  <nickc@redhat.com>
+
+	* po/da.po: Updated Danish translation.
+
+2002-11-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_link_add_object_symbols): Optimize stabs for
+	relocatable link too.
+	(elf_link_input_bfd): When emitting relocs, adjust offsets for
+	eh_frame and stab sections.  Zap deleted relocs.
+	(elf_reloc_symbol_deleted_p): Return true for zero r_symndx.
+	(elf_bfd_discard_info): Run for relocatable link too.
+	* elf64-ppc.c (ppc64_elf_edit_opd): Rename from edit_opd.  Make global.
+	Handle ld -r case.
+	(ppc64_elf_size_dynamic_sections): Don't call edit_opd from here.
+	* elf64-ppc.h (ppc64_elf_edit_opd): Declare.
+
+	* elf-bfd.h (struct cie_header): Move from elf_eh-frame.c.
+	(struct cie, struct eh_cie_fde, struct eh_frame_sec_info): Likewise.
+	(struct eh_frame_array_ent, struct eh_frame_hdr_info): Likewise.
+	(enum elf_link_info_type): Remove ELF_INFO_TYPE_EH_FRAME_HDR.
+	(struct eh_frame_hdr_info): Add "hdr_sec", remove "split".
+	(struct elf_link_hash_table): Add eh_info.
+	(struct elf_obj_tdata): Change eh_frame_hdr to an asection *.
+	(_bfd_elf_discard_section_eh_frame): Update prototype.
+	(_bfd_elf_discard_section_eh_frame_hdr): Likewise.
+	(_bfd_elf_write_section_eh_frame): Likewise.
+	(_bfd_elf_write_section_eh_frame_hdr): Likewise.
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Remove "ehdrsec"
+	param.  Get "hdr_info" from link hash table.
+	(_bfd_elf_discard_section_eh_frame_hdr): Remove "sec" param.  Get
+	header section from link hash table.  Save header section to elf_tdata.
+	(_bfd_elf_maybe_strip_eh_frame_hdr): Remove local "sec".  Use
+	header section from link hash table.  Don't alloc hdr_info.  Clear
+	hdr_sec instead of setting "strip".
+	(_bfd_elf_eh_frame_section_offset): Formatting.
+	(_bfd_elf_write_section_eh_frame): Remove "ehdrsec", add "info" param.
+	Get header section from link hash table.
+	(_bfd_elf_write_section_eh_frame_hdr): Remove "sec", add "info" param.
+	Get header section from link hash table.
+	* elf.c (map_sections_to_segments): Use cached eh_frame_hdr.
+	(get_program_header_size): Likewise.
+	(_bfd_elf_section_offset): Formatting.
+	* elflink.h (elf_link_create_dynamic_sections): Stash eh frame header
+	section pointer in link hash table.
+	(elf_bfd_final_link): Adjust _bfd_elf_write_section_eh_frame_hdr
+	and _bfd_elf_write_section_eh_frame calls.  Update comment about
+	eh_frame entries.
+	(elf_bfd_discard_info): Adjust _bfd_elf_discard_section_eh_frame and
+	_bfd_elf_discard_section_eh_frame_hdr calls.  Remove "ehdr".
+
+	* po/SRC-POTFILES.in: Regenerate.
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Don't zero
+	relocs for discarded FDEs.  Remove dead code.
+	(_bfd_elf_write_section_eh_frame_hdr): Remove dead code.
+	* elflink.h (elf_bfd_discard_info): Don't save edited relocs.
+	Tidy conditions under which stabs are edited.  Formatting.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Ignore overflows
+	from discarded relocs.
+	* elfxx-ia64.c (elfNN_ia64_install_dyn_reloc): Add reloc output
+	section adjustments after testing magic values.
+
+2002-11-12  Thomas Moestl <tmm@FreeBSD.org>
+
+	* elf64-sparc.c (sparc64_elf_adjust_dynamic_symbol): Correct
+	references to large plt symbols.
+
+2002-11-12  Klee Dienes  <kdienes@apple.com>
+
+	* mach-o.c (bfd_mach_o_scan_read_thread): Don't re-use 'i' when
+	looking for an unused section name.
+
+2002-11-11  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* coff-h8300.c: Fix formatting.
+	* elf32-h8300.c: Likewise.
+	* reloc16.c: Likewise.
+
+2002-11-09  Jeroen Dobbelaere  <jeroen.dobbelaere@acunia.com>
+
+	* elf32-arm.h (elf32_arm_size_dynamic_sections): Don't strip output
+	section when dynamic section unused;  _bfd_strip_section_from_output
+	instead.
+
+2002-11-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* targets.c (_bfd_target_vector): Disable pef_vec, pef_xlib_vec
+	and sym_vec.
+
+	* dwarf2.c: Revert last change.
+
+2002-11-07  Michal Ludvig  <mludvig@suse.cz>
+
+	* dwarf2.c (read_indirect_string, read_abbrevs, decode_line_info,
+	_bfd_dwarf2_find_nearest_line): Use
+	bfd_simple_get_relocated_section_contents() instead of
+	bfd_get_section_contents().
+	* reloc.c (bfd_perform_relocation): Add sanity check.
+	* simple.c (simple_get_relocated_section_contents): If the section
+	does not have any relocs associated with it, just return the
+	unadjusted contents.
+
+2002-11-07  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (cris_elf_relocate_section) <case R_CRIS_16_GOT,
+	case R_CRIS_32_GOT>: Correct test for filling in constant .got
+	contents, enabling for a non-DSO, for symbols defined in the
+	program with --export-dynamic.
+
+2002-11-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c: Comment typo fixes.
+	(ppc64_elf_merge_private_bfd_data): Allow BFD_ENDIAN_UNKNOWN input.
+
+2002-11-07  Nick Clifton  <nickc@redhat.com>
+
+	* po/da.po: Updated Danish translation.
+
+2002-11-06  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf64-mips.c (mips_elf64_slurp_one_reloc_table): Generate
+	exactly three internal relocs per external reloc.  Set reloc_count
+	to the external reloc count.
+
+2002-11-06  Klee Dienes  <kdienes@apple.com>
+
+	 * coff-stgo32.c (stub_bytes): Mark as const.
+	 Fix comment formatting.
+
+2002-11-06  Klee Dienes  <kdienes@apple.com>
+
+	* Makefile.am (BFD32_BACKENDS): Add mach-o.lo, pef.lo, and
+	xsym.lo.
+	(BFD32_BACKENDS_CFILES): Add mach-o.c, pef.c, and xsym.c.
+	(SOURCE_HFILES): Add mach-o.h, pef.h, pef-traceback.h, xsym.h
+	* archures.c (enum bfd_architecture): Add bfd_arch_m98k.
+	* bfd.c (struct bfd): Add private data for mach-o, pef, and sym.
+	* targets.c (enum bfd_flavour): Add flavours for mach-o, pef, and
+	sym.
+	(_bfd_target_vector): Add target vectors for mach-o, pef, and sym.
+	* Makefile.in: Regenerate.
+	* doc/Makefile.in: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* xsym.c: New file.  Contains support for the Apple/Metrowerks
+	xSYM debugging format.
+	* xsym.h: New file.
+	* pef.c: New file.  Contains support for the Apple Code Fragment
+	Manager Preferred Executable Format
+	* pef.h: New file.
+	* pef-traceback.h: New file.  Contains support for parsing PowerPC
+	traceback tables as used by PEF executables (and perhaps other
+	systems as well).
+	* mach-o.c: New file.  Contains support for the Mach-O object file
+	format.
+	* mach-o.h: New file.
+	* mach-o-target.c: New file.  Declares the mach-o targets
+	themselves.  Included three times by mach-o.c; each time with a
+	different set of macros set.
+
+2002-11-06  Graeme Peterson  <gp@qnx.com>
+
+	* Makefile.am: Remove entries for elf32-qnx.[ch].
+	* Makefile.in: Regenerate.
+	* config.bfd: Change arm-nto to use bfd_elf32_{big|little}arm_vec,
+	ppc-nto to use bfd_elf32_powerpc{le}_vec, sh-nto to use
+	bfd_elf32_sh{l}_vec, and i386-nto to use bfd_elf32_i386_vec.
+	* configure.in: Remove support for bfd_elf32_sh{l}qnx_vec,
+	bfd_elf32_powerpc{le}qnx_vec, bfd_elf32_{big|little}armqnx_vec,
+	and bfd_elf32_i386qnx_vec, and removed elf32-qnx.lo from other targets.
+	bfd_elf32_sh{l}_vec, and i386-nto to use bfd_elf32_i386_vec.
+	* configure: Regenerate.
+	* elf32-qnx.c: Remove.
+	* elf32-qnx.h: Remove.
+	* elf.c: Remove calls to QNX specific set_nonloadable_filepos,
+	is_contained_by_filepos, and copy_private_bfd_data_p.
+	* elf-bfd.h (struct elf_backend_data): Remove set_nonloadable_filepos,
+	is_contained_by_filepos, and copy_private_bfd_data_p.
+	* elf32-i386.c: Remove QNX extended bfd support.
+	* elf32-ppc.c: Remove QNX extended bfd support.
+	* elf32-sh.c: Remove QNX extended bfd support.
+	* elfarm-nabi.c: Remove QNX extended bfd support.
+	* targets.c: Remove qnx vectors.
+	* elfxx-target.h (elf_backend_set_nonloadable_filepos): Remove
+	(elf_backend_is_contained_by_filepos): Remove.
+	(elf_backend_copy_private_bfd_data_p): Remove.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2002-11-06  David O'Brien  <obrien@FreeBSD.org>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-sparc.c (sparc64_elf_relocate_section): Adjust addend of
+	dynamic relocs against section symbols for the output section vma.
+
+2002-11-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-arm.h (t2a1_push_insn, t2a2_ldr_insn, t2a3_mov_insn,
+	t2a4_bx_insn, t2a5_pop_insn, t2a6_bx_insn): Remove.
+
+2002-11-05  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* config.bfd (sh-*-linux*): Use bfd_elf*_sh64*lin_vec as sh64
+	vectors in target_selvecs.
+	(shle-*-netbsdelf*): Use bfd_elf*_sh64*nbsd_vec as sh64 vectors
+	in target_selvecs.
+	(sh-*-netbsdelf*): Likewise.
+	* configure.in (assocvecs): New variable.  Handle assocvecs like
+	selvecs.
+	* configure: Regenerate.
+	* format.c (bfd_check_format_matches): Store bfd_target pointers
+	in matching_vector instead of target names.  Select first target
+	from bfd_associated_vector that matches a list of ambiguous targets.
+	* targets.c (_bfd_associated_vector): New array.
+	(bfd_associated_vector): New variable.
+	(_bfd_target_vector): Add bfd_elf*_sh64*lin_vec.
+	* libbfd-in.h (bfd_associated_vector): Declare.
+	* libbfd.h: Regenerate.
+
+2002-11-05  Elias Athanasopoulos  <eathan@otenet.gr>
+
+	* vms-gsd.c (_bfd_vms_write_gsd): Check that symbol->udata.p is
+	non-NULL before dereferencing.
+
+2002-11-04  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* vms.c (vms_object_p): Restore the start address when returning
+	NULL.
+
+2002-11-04  Alan Modra  <amodra@bigpond.net.au>
+	    Hans-Peter Nilsson  <hp@axis.com>
+
+	* elflink.h (struct elf_final_link_info): Add shndxbuf_size.
+	(elf_bfd_final_link): Don't bother zeroing symtab_hdr fields.
+	Set up a larger symshndxbuf, and write it out.  Free it on
+	exit rather than freeing symbuf twice.  Correct section index
+	on output section symbol loop.
+	(elf_link_output_sym): Accumulate symbol extension section
+	indices, reallocating symshndxbuf rather than writing it out.
+	(elf_link_flush_output_syms): Don't flush symshndxbuf.
+	* elf.c (assign_section_numbers): Init i_shdrp to all zero.
+	Use bfd_zalloc to clear i_shdrp[0] too.
+
+2002-11-03  Stephen Clarke <stephen.clarke@earthling.net>
+
+	 * elf32-sh64-com.c (sh64_address_in_cranges): Use
+	_raw_size of cranges section if _cooked_size not yet set.
+
+2002-11-03  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-v850.c (v850_elf_relax_delete_bytes): Correct parameters
+	for bfd_elf32_swap_symbol_out.
+
+2002-10-31  David O'Brien  <obrien@FreeBSD.org>
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Don't mix
+	signed and unsigned in comparison.
+
+2002-10-30  Daniel Jacobowitz  <drow@mvista.com>
+
+	* coffcode.h: Remove extraneous '\'.
+
+2002-10-28  H.J. Lu <hjl@gnu.org>
+
+	* Makefile.am (targets.lo): Depend on Makefile instead of
+	config.status.
+	(archures.lo): Likewise.
+	* Makefile.in: Regenerated.
+
+2002-10-25  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* config.bfd (mips*el-*-netbsd*, mips*-*-netbsd*): Add
+	bfd_elf64_bigmips_vec and bfd_elf64_littlemips_vec to
+	targ_selvecs.
+
+2002-10-25  Jim Wilson  <wilson@redhat.com>
+
+	* elf64-sh64.c (sh_elf64_relocate_section): Call
+	_bfd_elf_rela_local_sym.  Handle relocs against STT_SECTION symbol
+	of SHF_MERGE section.
+
+2002-10-25  Hans-Peter Nilsson  <hp@axis.com>
+
+	* simple.c: Correct placement of ATTRIBUTE_UNUSED.
+
+2002-10-24  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* aoutx.h (NAME(aout,swap_ext_reloc_in)): Cast bytes->r_index to
+	unsigned int.  Cast RELOC_BASE10, RELOC_BASE13 and RELOC_BASE22 to
+	unsigned int.
+	(NAME(aout,final_link)): Cast enum used in assignment.
+	(aout_link_write_symbols): Cast enums in comparisons, int values to
+	boolean, enums in assignments to int.
+	(aout_link_input_section_std): Cast rel->r_index to unsigned int.
+	(aout_link_input_section_ext): Likewise.  Cast enums used in
+	comparisons with unsigned ints.
+	(aout_link_reloc_link_order): Cast enum to int in assignment.
+	* archive.c (_bfd_generic_read_ar_hdr_mag): Cast result of memchr
+	calls to char *.
+	* bfd-in.h (bfd_set_section_vma): Cast enum true to unsigned int in
+	assignment.
+	* bfd-in2.h (bfd_set_section_vma): Likewise.
+	* bfd.c (bfd_record_phdr): Cast enums in assignments.
+	* binary.c (bfd_alloc): Cast enum to long.
+	* coffgen.c (_bfd_coff_is_local_label_name): Cast return to boolean.
+	* dwarf2.c (read_abbrevs): Add casts to enum types.
+	(read_attribute_value): Likewise.
+	(arange_add): Cast result of bfd_zalloc call.
+	(comp_unit_contains_address): Return true and false.
+	(comp_unit_find_nearest_line): Cast return to boolean.
+	* format.c (bfd_check_format_matches, bfd_set_format): Likewise.
+	* gen-aout.c: define macro '_' if not defined.
+	* libbfd.c (bfd_realloc): Cast malloc and realloc to PTR.
+	(bfd_bwrite): Cast bfd_realloc to bfd_byte *.
+	(bfd_write_bigendian_4byte_int): Cast return to boolean.
+	(bfd_seek): Cast bfd_realloc to bfd_byte *.
+	(bfd_generic_is_local_label_name): Cast return to boolean.
+	* libcoff.h (_bfd_coff_adjust_symndx): Remove extraneous '\'.
+	* linker.c (_bfd_link_hash_newfunc): Cast bfd_hash_allocate result to
+	struct bfd_hash_entry *.
+	(_bfd_generic_link_hash_newfunc): likewise.
+	(_bfd_generic_final_link): Cast enum to unsigned int.
+	* merge.c (sec_merge_emit): Cast return to boolean.
+	(merge_strings): Add casts to const unsigned char *.
+	* reloc.c (bfd_get_reloc_code_name): Cast enums in comparison to int.
+	(bfd_generic_get_relocated_section_content): Cast enum to unsigned int.
+	* section.c (bfd_section_hash_newfunc): Cast bfd_hash_allocate result
+	to struct bfd_hash_entry *.
+	(bfd_set_section_content): Add cast to PTR in comparison.
+	* simple.c (simple_dummy_warning, simple_dummy_undefined_symbol,
+	simple_dummy_reloc_overflow, simple_dummy_reloc_dangerous,
+	simple_dummy_unattached_reloc,
+	bfd_simple_get_relocated_section_contents): Add K&R declarations and
+	function definitions.
+	* srec.c (S3Forced): Initialize to false.
+	(srec_get_symtab): Cast return value from bfd_alloc to asymbol *.
+	* stabs.c (_bfd_link_section_stabs): Cast enum to int in comparisons.
+	(_bfd_discard_section_stabs): Likewise.  Also cast return to boolean.
+	* syms.c (bfd_is_undefined_symclass): Cast return to boolean.
+	(_bfd_stab_section_find_nearest_line): Cast enum to bfd_byte in
+	comparisons.
+
+2002-10-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_check_relocs): Only put maybe_dynamic
+	relocs into shared lib non-allocated reloc sections.
+
+2002-10-23  Nathan Tallent  <eraxxon@alumni.rice.edu>
+
+	* dwarf2.c (add_line_info): Ensure that the line_info_table is
+	sorted even when given an out-of-order line sequence.
+	(lookup_address_in_line_info_table): When an exact VMA match is
+	not found, return line information with the closest VMA.
+
+2002-10-23 Ross Alexander <ross.alexander@uk.neceur.com>
+
+	* elf64-hppa.c: Force DT_FLAGS to always be set.  Required by
+	HPUX 11.00 patch PHSS_26559.
+
+2002-10-22  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_modify_segment_map): Don't move
+	the options section into a separate section unless IRIX 6
+	compatibility is enabled.
+
+2002-10-22  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elflink.h (struct elf_link_sort_rela): Turn rel and rela
+	into arrays.
+	(elf_link_sort_cmp1, elf_link_sort_cmp2): Adjust.
+	(elf_link_sort_relocs): Likewise.  Take int_rels_per_ext_rel
+	into account.
+	* elfxx-mips.c (mips_elf_create_dynamic_relocation): Compose
+	R_MIPS_REL32 with R_MIPS64 if ABI_64_P.
+
+2002-10-21  Graeme Peterson  <gp@qnx.com>
+
+	* targets.c (_bfd_target_vector): Add missing qnx vectors.
+
+2002-10-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* targets.c (bfd_target_list): Don't return the default target twice.
+
+2002-10-21  Elias Athanasopoulos  <eathan@otenet.gr>
+
+	* archive.c (_bfd_archive_bsd_update_armap_timestamp): Replace
+	perror with bfd_perror.
+
+2002-10-19  H.J. Lu <hjl@gnu.org>
+
+	* elflink.h (elf_link_add_object_symbols): Correctly handle
+	DT_RPATH and DT_RUNPATH.
+
+2002-10-19  Mark Kettenis  <kettenis@gnu.org>
+
+	* elf.c (elfcore_grok_note): Fix recognition on NT_PRXFPREG notes.
+
+2002-10-17  Denis Chertykov  <denisc@overta.ru>
+
+	* elf32-ip2k.c (ELF_MACHINE_ALT1): Define alternate machine code
+	for ip2k port.
+
+2002-10-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elfxx-target.h (USE_REL): Don't define as 1.
+	* elf32-arm.h (USE_REL): Provide a default define of 0.
+	Use #if rather than #ifdef when testing USE_REL.
+	* elf32-m32r.c: Likewise.
+
+	* elf32-arc.c (USE_REL): Define as 1.
+	* elf32-d10v.c (USE_REL): Likewise.
+	* elf32-m32r.c (USE_REL): Likewise.
+	* elf32-m68hc11.c (USE_REL): Likewise.
+	* elf32-m68hc12.c (USE_REL): Likewise.
+	* elf32-or32.c (USE_REL): Likewise.
+	* elfarm-nabi.c (USE_REL): Likewise.
+
+2002-10-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* config.bfd (s390-*-linux*): Add targ64_selvecs.
+	(s390x-*-linux*): Add targ_selvecs.
+
+2002-10-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (BFD32_BACKENDS): Remove elfarmqnx-nabi.lo,
+	elf32-i386-fbsd.lo, elf32-i386qnx.lo, elf32-ppcqnx.lo,
+	elf32-sh-lin.lo, elf32-sh64-lin.lo, elf32-sh-nbsd.lo,
+	elf32-sh64-nbsd.lo, elf32-shqnx.lo.  Add elf32-qnx.lo.
+	(BFD32_BACKENDS_CFILES): Likewise for corresponding C files.
+	(BFD64_BACKENDS): Remove elf64-sh64-lin.lo, elf64-sh64-nbsd.lo.
+	(BFD64_BACKENDS_CFILES): Likewise for corresponding C files.
+	(SOURCE_HFILES): Add elf32-qnx.h.
+	(BUILD_HFILES): Add bfdver.h.
+	Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* configure.in Update bfd vector dependencies.
+	* configure: Regenerate.
+	* elf32-i386-fbsd.c: Delete.  Move code to elf32-i386.c.
+	* elf32-i386qnx.c: Likewise.
+	* elf32-ppcqnx.c: Delete.  Move code to elf32-ppc.c.
+	* elf32-sh-nbsd.c: Delete.  Move code to elf32-sh.c.
+	* elf32-sh-lin.c: Likewise.
+	* elf32-shqnx.c: Likewise.
+	* elf32-sh64-lin.c: Delete.  Move code to elf32-sh64.c.
+	* elf32-sh64-nbsd.c: Likewise.
+	* elf64-sh64-lin.c: Delete.  Move code to elf64-sh64.c.
+	* elf64-sh64-nbsd.c: Likewise.
+	* elfarmqnx-nabi.c: Delete.  Move code to elfarm-nabi.c.
+	* elf32-arm.h (ELF_MAXPAGESIZE): Always define.
+	* elf32-i386.c: Remove ELF_ARCH and ELF32_I386_C_INCLUDED tests.
+	* elf32-ppc.c: Remove ELF32_PPC_C_INCLUDED tests.
+	* elf32-qnx.h (elf_backend_set_nonloadable_filepos): Always define.
+	(elf_backend_is_contained_by_filepos): Likewise.
+	(elf_backend_copy_private_bfd_data_p): Likewise.
+	Globalize and move functions to..
+	* elf32-qnx.c: ..here.  New file.
+	* elf32-sh.c: Remove ELF_ARCH and ELF32_SH_C_INCLUDED tests.  Don't
+	emit target vectors when INCLUDE_SHMEDIA.
+	* elf32-sh64.c: Remove ELF_ARCH test.  Move TARGET_* etc. defines to
+	end of file.
+	* elf64-sh64.c: Remove ELF_ARCH test.
+	* elfarm-nabi.c: Remove ELFARM_NABI_C_INCLUDED test.
+	* po/BLD-POTFILES.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2002-10-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_link_add_object_symbols): Error out on dynamic objects
+	loaded with --just-symbols.
+
+	* elf32-i386qnx.c (TARGET_LITTLE_NAME): Define.
+	* elf32-ppcqnx.c (TARGET_LITTLE_NAME, TARGET_BIG_NAME): Define.
+	* elf32-shqnx.c (TARGET_LITTLE_NAME, TARGET_BIG_NAME): Define.
+	* elfarmqnx-nabi.c (TARGET_LITTLE_NAME, TARGET_BIG_NAME): Define.
+
+2002-10-15  Richard Henderson  <rth@redhat.com>
+
+	* Makefile.am (BFD64_BACKENDS): Remove elf64-alpha-fbsd.
+	(BFD64_BACKENDS_CFILES): Likewise.
+	* configure.in (bfd_elf64_alpha_freebsd_vec): Use elf64-alpha.
+	* elf64-alpha-fbsd.c: Remove file, move code ...
+	* elf64-alpha.c: ... here.
+	* Makefile.in, configure: Rebuild.
+
+2002-10-14  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_relocate_section) [BRSGP]: Increment
+	VALUE, not ADDEND.
+
+2002-10-14  Stephen Clarke <stephen.clarke@superh.com>
+
+	* elf32-sh.c (elf_sh_link_hash_entry): Replace
+	datalabel_got_offset with union of datalabel_got
+	offset and refcount.
+	(sh_elf_link_hash_newfunc): Initialize datalabel_got.refcount.
+	(allocate_dynrelocs): Delete unnecessary code for
+	STT_DATALABEL type.  Create entry in got for
+	datalabel version of symbol if datalabel_got.refcount > 0.
+	(sh_elf_relocate_section): Use datalabel_got union.
+	(sh_elf_gc_sweep_hook): Pull common code to initialize
+	h and eh out of switch statement.  Declare seen_stt_datalabel.
+	Initialize it.  Decrement datalabel_got.refcount for
+	got relocs when seen_stt_datalabel is true.
+	Decrement local_got_refcounts entry for datalabel got relocs
+	of local symbols.
+	(sh_elf_copy_indirect_symbol): Copy datalabel_got field over.
+	(sh_elf_check_relocs): Declare seen_stt_datalabel.
+	Initialize it.  When seen_stt_datalabel is true, increment
+	datalabel_got refcount rather than got.refcount.
+	(sh_elf_finish_dynamic_symbol): Create relocs to
+	initialize got entry for datalabel version of symbol.
+
+2002-10-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	(BFD_H_FILES): Remove version.h.
+	* bfd-in.h (BFD_VERSION, BFD_VERSION_DATE, BFD_VERSION_STRING): Move..
+	* version.h: ..to here.
+	* configure.in (bfd_version_date): Remove.
+	(AC_OUTPUT): Make bfdver.h from version.h.
+	* bfd.c: #include "bfdver.h".
+	* vms-hdr.c: Likewise.
+	* Makefile.in: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* configure: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2002-10-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* archures.c (bfd_mach_i386_i386, bfd_mach_i386_i8086,
+	bfd_mach_i386_i386_intel_syntax, bfd_mach_x86_64,
+	bfd_mach_x86_64_intel_syntax bfd_mach_ppc, bfd_mach_ppc64,
+	bfd_mach_rs6k, bfd_mach_d10v, bfd_mach_sh, bfd_mach_v850,
+	bfd_mach_arc_5, bfd_mach_arc_6, bfd_mach_arc_7, bfd_mach_arc_8,
+	bfd_mach_m32r, bfd_mach_frv, bfd_mach_frvsimple,
+	bfd_mach_ia64_elf64, bfd_mach_ia64_elf32,
+	bfd_mach_ip2022, bfd_mach_ip2022ext,
+	bfd_mach_s390_31, bfd_mach_s390_64, bfd_mach_xstormy16): Renumber.
+	* bfd-in2.h: Regenerate.
+
+2002-10-14  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* config.bfd (sh*eb-*-linux*, sh*-*-linux*): Add the alternative
+	endian vector to targ_selvecs.
+
+2002-10-13  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): Take
+	save_addend argument.  Don't apply the 32-bit mask to a
+	GPREL32 value if it's to be used in another relocation.  Don't
+	use forced-check computation of local_p to decide whether to
+	add gp0 to GPREL16 value.  Don't use only the lowest 16 bits
+	of the addend of a non-in-place GPREL16 relocation.
+	(_bfd_mips_elf_relocate_section): Pass use_saved_addend_p to
+	mips_elf_calculate_relocation().
+
+2002-10-12  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* elf32-m68hc11.c (m68hc11_elf_relax_section): Don't treat relocs
+	with symbols in other sections if we relaxed something;  the sections
+	output offsets must be re-computed before.
+
+2002-10-12  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* elf32-m68hc11.c (m68hc11_elf_relax_section): Update symbols
+	handling to use Elf_Internal_Sym.
+	(m68hc11_elf_relax_delete_bytes): Likewise.
+
+2002-10-11  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c (sh_elf_optimized_tls_reloc, sh_elf_mkobject,
+	sh_elf_object_p, dtpoff_base): New functions.
+	(sh_elf_howto_table): Add TLS relocs.
+	(sh_reloc_map): Likewise.
+	(sh_elf_info_to_howto): Support TLS relocs.
+	(elf_sh_link_hash_entry): Add tls_type and tls_tpoff32.
+	(sh_elf_hash_entry, sh_elf_tdata, sh_elf_local_got_tls_type):
+	New macros.
+	(sh_elf_obj_tdata): New.
+	(elf_sh_link_hash_table): Add tls_ldm_got.
+	(sh_elf_link_hash_table_create): Clear refcount of tls_ldm_got.
+	(allocate_dynrelocs): Support TLS relocs.
+	(sh_elf_size_dynamic_sections): Likewise.
+	(sh_elf_relocate_section): Support TLS relocs.  Don't try to find
+	.rela.got section when found already.  Return false after printing
+	error about unresolvable relocation.
+	(sh_elf_gc_sweep_hook): Support TLS relocs.
+	(sh_elf_check_relocs): Likewise.
+	(sh_elf_finish_dynamic_symbol): Likewise.
+	(bfd_elf32_mkobject, elf_backend_object_p): Define for TLS case.
+	* reloc.c: Add SH TLS relocs.
+	* bfd-in2.h, libbfd.h: Regenerate.
+
+2002-10-11  Daniel Jacobowitz  <drow@mvista.com>
+
+	* Makefile.in: Regenerated.
+
+2002-10-11  Daniel Jacobowitz  <drow@mvista.com>
+
+	* Makefile.am: Run dep-am.
+	(BFD_H_DEP): Add simple.c and linker.c.
+	(BFD32_LIBS): Add simple.lo.
+	(BFD32_LIBS_CFILES): Add simple.c.
+	* Makefile.in: Regenerated.
+	* bfd-in2.h: Regenerated.
+	* simple.c: New file.
+
+2002-10-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* coff-arm.c (record_arm_to_thumb_glue): Avoid type-punned pointers.
+	(record_thumb_to_arm_glue): Likewise.
+	* ecoff.c (ecoff_link_add_externals): Likewise.
+	* elf32-arm.h (record_arm_to_thumb_glue): Likewise.
+	(record_thumb_to_arm_glue): Likewise.
+	* elf32-m32r.c (m32r_elf_add_symbol_hook): Likewise.
+	* elf32-sh.c (sh_elf_create_dynamic_sections): Likewise.
+	* elf32-sh64.c (sh64_elf_add_symbol_hook): Likewise.
+	* elf64-alpha.c (elf64_alpha_create_dynamic_sections): Likewise.
+	* elf64-ppc.c (func_desc_adjust): Likewise.
+	* elf64-sh64.c (sh64_elf64_add_symbol_hook): Likewise.
+	(sh64_elf64_create_dynamic_sections): Likewise.
+	* elflink.c (_bfd_elf_create_got_section): Likewise.
+	(_bfd_elf_create_dynamic_sections): Likewise.
+	(_bfd_elf_create_linker_section): Likewise.
+	* elflink.h (elf_add_default_symbol): Likewise.
+	(elf_link_create_dynamic_sections): Likewise.
+	(NAME(bfd_elf,size_dynamic_sections)): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_aix_add_symbol_hook): Likewise.
+	* elfxx-mips.c (mips_elf_create_got_section): Likewise.
+	(_bfd_mips_elf_add_symbol_hook): Likewise.
+	(_bfd_mips_elf_create_dynamic_sections): Likewise.
+	* linker.c (generic_link_add_symbol_list): Likewise.
+	* xcofflink.c (xcoff_link_add_symbols): Likewise.
+
+	* elfxx-ia64.c (oor_brl, oor_ip): Conditionally define.
+
+	* elf64-ppc.c (edit_opd): Only zero opd syms when function is
+	completely removed.  Correct local sym adjustment.
+
+2002-10-10  Stephen Clarke <stephen.clarke@superh.com>
+
+	* elf32-sh.c (elf_sh_pic_plt_entry_be, elf_sh_pic_plt_entry_le):
+	Correct mistake in calculation of address of .got.
+	* elf64-sh64.c (elf_sh64_pic_plt_entry_be,
+	elf_sh64_pic_plt_entry_le): Likewise.
+
+2002-10-09  Richard Shann <richard.shann@superh.com>
+	    Stephen Clarke <stephen.clarke@superh.com>
+
+	* Makefile.am: Add entries for elf32-sh64-lin.c and
+	elf64-sh64-lin.c. Regenerate.
+	* Makefile.in: Regenerate.
+	* config.bfd: Change sh64eb-*-linux* and sh64-*-linux*
+	to use sh64 vectors rather than sh vectors.
+	* configure.in: Add bfd_elf32_sh64lin_vec, bfd_elf32_sh64blin_vec,
+	bfd_elf64_sh64lin_vec, bfd_elf64_sh64blin_vec.
+	* configure: Regenerate.
+	* elf32-sh64-lin.c: New file.
+	* elf64-sh64-lin.c: New file.
+	* targets.c: Add bfd_elf32_sh64lin_vec, bfd_elf32_sh64blin_vec,
+	bfd_elf64_sh64lin_vec, bfd_elf64_sh64blin_vec.
+
+2002-10-08  H.J. Lu <hjl@gnu.org>
+
+	* elf32-i386.c (elf_i386_relocate_section): Re-arrange the
+	IE->LE transition for R_386_TLS_IE.
+
+2002-10-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (edit_opd): Correct test for discarded sections.
+
+2002-10-07  Mark Elbrecht  <snowball3@softhome.net>
+
+	* cofflink.c (mark_relocs): Don't mark relocations in excluded
+	sections.
+
+2002-10-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_link_input_bfd): Remove BFD_VERSION_DATE dependent
+	code.
+
+	* elf64-ppc.c (ppc64_elf_build_stubs): Increment .glink indx.
+
+2002-10-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* opncls.c: Formatting.
+	(_bfd_new_bfd): Use a smaller section hash table.
+
+2002-10-05  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elfxx-mips.c (mips_elf_create_dynamic_relocation): Set the type
+	of the other two relocations packed with a REL32 to NONE.
+
+2002-10-02  Stephen Clarke <stephen.clarke@superh.com>
+
+	* elf32-sh.c (elf_sh_link_hash_entry): Add gotplt_refcount.
+	(sh_elf_link_hash_newfunc): Initialize it.
+	(allocate_dynrelocs): Transfer gotplt refs from plt.refcount
+	to got.refcount for symbols that are forced local or when
+	we have direct got refs.
+	(sh_elf_gc_sweep_hook): Adjust gotplt_refcount.  Use it
+	to correctly adjust got.refcount and plt.refcount.
+	(sh_elf_copy_indirect_symbol): Copy gotplt_refcount across.
+	(sh_elf_check_relocs): Increment gotplt_refcount.
+
+2002-10-01  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-i386.c (elf_i386_relocate_section): Fix
+	movl foo@indntpoff, %eax IE->LE transition.
+
+2002-10-01  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Change TLSGD
+	sequence and its transitions.
+
+2002-10-01  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-i386.c (elf_i386_relocate_section): Resolve R_386_TLS_LDO_32
+	to st_value + addend in non-code sections.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Resolve
+	R_X86_64_DTPOFF32 to st_value + addend in non-code sections.
+
+2002-09-30  Gavin Romig-Koch  <gavin@redhat.com>
+	    Ken Raeburn  <raeburn@cygnus.com>
+	    Aldy Hernandez  <aldyh@redhat.com>
+	    Eric Christopher  <echristo@redhat.com>
+	    Richard Sandiford  <rsandifo@redhat.com>
+
+	* archures.c (bfd_mach_mips4120, bfd_mach_mips5400): New.
+	(bfd_mach_mips5500): New.
+	* cpu-mips.c (I_mips4120, I_mips5400, I_mips5500): New.
+	(arch_info_struct): Add corresponding entries here.
+	* elfxx-mips.c (_bfd_elf_mips_mach): Handle E_MIPS_MACH_4120,
+	E_MIPS_MACH_5400 and E_MIPS_MACH_5500.
+	(_bfd_mips_elf_final_write_processing): Handle bfd_mach_mips4120,
+	bfd_mach_mips5400 and bfd_mach_mips5500.
+	(_bfd_mips_elf_mach_extends_p): New function.
+	(_bfd_mips_elf_merge_private_bfd_data): Use it to help merge
+	the EF_MIPS_MACH flags.
+	* bfd-in2.h: Regenerate.
+
+2002-09-28  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* elf32-vax.c (elf_vax_size_dynamic_section): Don't strip
+	.got sections.
+
+2002-09-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (map_sections_to_segments): Correct test for start of
+	writable section in the same page as end of read-only section.
+
+2002-09-27  Matt Thomas  <matt@3am-software.com>
+
+	* elf32-vax.c (elf_vax_check_relocs): Remove unused
+	local_got_refcounts usage.  Remove allocation of got slot.
+	(elf_vax_gc_sweep_hook): Remove unused local_got_refcounts usage.
+	Remove de-allocation of got slot.
+	(elf_vax_size_dynamic_section): Fix some indentation.  Add hash
+	traversal for elf_vax_instantiate_got_entries.  Allow empty .got
+	sections to be GC'ed.
+	(elf_vax_instantiate_got_entries): New function.
+	(elf_vax_relocate_section): Simplify R_VAX_GOT32 handling.  Remove
+	tests that are now handled by elf_vax_instantiate_got_entries.
+	Assert GOT entry falls within .got section size.  Remove redundant
+	comparisions.  Fix comments.
+
+2002-09-27  Jakub Jelinek  <jakub@redhat.com>
+
+	* reloc.c: Add x86-64 TLS relocs.
+	* bfd-in2.h, libbfd.h: Rebuilt.
+	* elf64-x86-64.c (x86_64_elf_howto): Fix size fields for 32-bit
+	relocs.  Add TLS relocs.
+	(x86_64_reloc_map): Add TLS relocs.
+	(elf64_x86_64_info_to_howto): Adjust for added TLS relocs.
+	(struct elf64_x86_64_link_hash_entry): Add tls_type field.
+	(GOT_UNKNOWN, GOT_NORMAL, GOT_TLS_GD, GOT_TLS_IE): Define.
+	(elf64_x86_64_hash_entry): Define.
+	(struct elf64_x86_64_obj_tdata): New.
+	(elf64_x86_64_tdata, elf64_x86_64_local_got_tls_type): Define.
+	(struct elf64_x86_64_link_hash_table): Add tls_ld_got.
+	(link_hash_newfunc): Initialize tls_type.
+	(elf64_x86_64_link_hash_table_create): Initialize tls_ld_got.
+	(elf64_x86_64_copy_indirect_symbol): Swap tls_type if necessary.
+	(elf64_x86_64_mkobject): New.
+	(elf64_x86_64_elf_object_p): Allocate struct elf64_x86_64_obj_tdata.
+	(elf64_x86_64_tls_transition): New.
+	(elf64_x86_64_check_relocs): Add r_type variable and use it.
+	Handle TLS relocs.
+	(elf64_x86_64_gc_sweep_hook): Handle TLS relocs.
+	(allocate_dynrelocs): Allocate GOT space for TLS relocs.
+	(elf64_x86_64_size_dynamic_sections): Likewise.
+	(dtpoff_base, tpoff): New.
+	(elf64_x86_64_relocate_section): Handle TLS relocs.
+	(elf64_x86_64_finish_dynamic_symbol): Only handle non-TLS GOT
+	entries.
+	(bfd_elf64_mkobject): Define.
+
+	* elf32-i386.c (elf_i386_check_relocs) [R_386_TLS_LE]: Set
+	DF_STATIC_TLS if shared.
+
+2002-09-26  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elfxx-mips.c (_bfd_mips_elf_fake_sections): Don't emit unneeded
+	empty relocation sections.
+
+2002-09-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc_build_one_stub): Don't build glink stubs here.
+	(ppc64_elf_build_stubs): Build them here instead.
+
+2002-09-24  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-sparc.c (elf32_sparc_relocate_section): Put R_SPARC_RELATIVE
+	addend into r_addend, not *r_offset.
+	(elf32_sparc_finish_dynamic_symbol): Likewise.
+	* elf64-sparc.c (sparc64_elf_finish_dynamic_symbol): Clear xword at
+	R_SPARC_RELATIVE's r_offset.
+
+2002-09-23  Nathan Tallent  <eraxxon@alumni.rice.edu>
+
+	* dwarf2.c (decode_line_info): Update to correctly decode
+	the (non-standard DWARF2) out-of-order address sequences
+	generated by the Intel C++ 6.0 compiler for ia64-Linux.
+
+2002-09-23  Mark Elbrecht  <snowball3@softhome.net>
+
+	* config.bfd: For DJGPP targets, match with any cpu and any machine.
+
+2002-09-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Zero relocs
+	for discarded FDEs.  Remove redundant assignment.
+	* elflink.h (elf_bfd_discard_info): Save edited relocs.
+
+2002-09-22  H.J. Lu <hjl@gnu.org>
+
+	* elf64-alpha.c (elf64_alpha_merge_ind_symbols): Don't merge
+	the relocation count between different .reloc sections.
+
+2002-09-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Allow ".sbss.*" and
+	".sdata.*" for R_PPC_SDAREL16, ".sbss2*" and ".sdata2*" for
+	R_PPC_EMB_SDA2REL.  Similarly for R_PPC_EMB_SDA21 and
+	R_PPC_EMB_RELSDA.
+
+	* elfcode.h (elf_slurp_reloc_table_from_section): Make "symcount"
+	unsigned.  Move "symcount" assignment out of loop.
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+	* po/SRC-POTFILES.in: Regnerate.
+
+2002-09-19  Nathan Tallent  <eraxxon@alumni.rice.edu>
+
+	* dwarf2.c (_bfd_dwarf2_find_nearest_line): If address length is
+	zero, set it to 8 for (non-standard) 64-bit DWARF2 formats
+	(e.g. IRIX64).
+
+2002-09-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-ppc.c (ppc_elf_finish_dynamic_symbol): Clear .got word
+	even if generating R_PPC_RELATIVE reloc.
+	(ppc_elf_relocate_section): Make sure relocation is performed
+	if skip == -2.  Clear memory at r_offset when creating dynamic
+	relocation.
+
+2002-09-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* reloc.c (BFD_RELOC_386_TLS_TPOFF, BFD_RELOC_386_TLS_IE,
+	BFD_RELOC_386_TLS_GOTIE): Add.
+	* bfd-in2.h, libbfd.h: Rebuilt.
+	* elf32-i386.c (elf_howto_table): Add R_386_TLS_TPOFF, R_386_TLS_IE
+	and R_386_TLS_GOTIE.
+	(elf_i386_reloc_type_lookup): Handle it.
+	(struct elf_i386_link_hash_entry): Change tls_type type to unsigned
+	char instead of enum, change GOT_* into defines.
+	(GOT_TLS_IE_POS, GOT_TLS_IE_NEG, GOT_TLS_IE_BOTH): Define.
+	(elf_i386_tls_transition): Handle R_386_TLS_IE and R_386_TLS_GOTIE.
+	(elf_i386_check_relocs): Likewise.  Avoid crash if local symbol is
+	accessed both as normal and TLS symbol.  Move R_386_TLS_LDM and
+	R_386_PLT32 cases so that R_386_TLS_IE can fall through.
+	Handle R_386_TLS_LE_32 and R_386_TLS_LE in shared libs.
+	(elf_i386_gc_sweep_hook): Handle R_386_TLS_IE and R_386_TLS_GOTIE.
+	Handle R_386_TLS_LE_32 and R_386_TLS_LE in shared libs.
+	(allocate_dynrelocs): Allocate 2 .got and 2 .rel.got entries if
+	tls_type is GOT_TLS_IE_BOTH.
+	(elf_i386_size_dynamic_sections): Likewise.
+	(elf_i386_relocate_section): Handle R_386_TLS_IE and R_386_TLS_GOTIE.
+	Handle R_386_TLS_LE_32 and R_386_TLS_LE in shared libs.
+	(elf_i386_finish_dynamic_symbol): Use tls_type & GOT_TLS_IE to catch
+	all 4 GOT_TLS_* TLS types.
+
+2002-09-19  Nick Clifton  <nickc@redhat.com>
+
+	* elflink.h (elf_fix_symbol_flags): When examining weak symbols,
+	follow indirect links.
+
+2002-09-19  Nathan Tallent  <eraxxon@alumni.rice.edu>
+
+	* ecoffswap.h (ecoff_swap_pdr_in) <isym, iline>: Update to
+	correctly sign-extend 32-bit ECOFF null values (0xffffffff, -1)
+	on 64 bit machines.
+	(ecoff_swap_sym_in) <iss>: Likewise.
+	* ecoff.c (_bfd_ecoff_slurp_symbolic_info): Fix error reading
+	ECOFF information: 'ioptMax' refers to the actual *size*
+	of the optimization symtab, not the number of entries.
+
+2002-09-19  Daniel Jacobowitz  <drow@mvista.com>
+
+	* elf32-arm.h (elf32_arm_adjust_dynamic_symbol): Update
+	ELF_LINK_HASH_NEEDS_PLT logic.
+
+2002-09-18  Daniel Jacobowitz  <drow@mvista.com>
+
+	* elfcode.h (elf_slurp_reloc_table_from_section): Check
+	correct relocation count.
+
+2002-09-17  Daniel Jacobowitz  <drow@mvista.com>
+
+	* bfd-in.h (bfd_get_dynamic_symcount): Define.
+	* bfd.c (struct _bfd): Add dynsymcount.
+	* bfd-in2.h: Regenerated.
+	* elf.c (_bfd_elf_canonicalize_dynamic_symtab): Set
+	abfd->dynsymcount.
+	* elfcode.h (elf_slurp_reloc_table_from_section): Check
+	for overflow.
+
+2002-09-17  Stan Cox <scox@redhat.com>
+
+	* elf64-mips.c (mips_elf64_be_swap_reloca_out): Handle type2 and type3.
+	(mips_elf64_final_gp): Don't make up gp value.
+	* elfn32-mips.c (mips_elf_final_gp): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_final_link): Always create
+	.MIPS.options/.options section.
+
+2002-09-17  David O'Brien  <obrien@FreeBSD.org>
+
+	* elf32-i386-fbsd.c: Always label using the EI_OSABI method.
+	It is benign for FreeBSD < 4.1.  Minor reformatting.
+	* elf64-alpha-fbsd.c: Likewise.
+
+2002-09-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-i386.c (elf_i386_relocate_section) [R_386_TLS_TPOFF32]: Negate
+	addend.
+
+2002-09-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-alpha.c (alpha_elf_size_info): Make static.
+
+2002-09-17  Svein E. Seldal  <Svein.Seldal@solidas.com>
+
+	* coff-tic4x.c: Add function declarations and ATTRIBUTE_UNUSED.
+	* cpu-tic4x.c: Ditto.
+
+2002-09-17  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elf64-mips.c (define elf_backend_ignore_discarded_relocs): Remove
+	duplicate define.
+
+2002-09-16  Bruno Haible  <bruno@clisp.org>
+
+	* elf32-i386.c: Don't defined ELF_ARCH etc. if this file is included
+	by a target variant implementation.
+	* elf64-alpha.c: Likewise.
+	* elf32-i386-fbsd.c: New file.
+	* elf64-alpha-fbsd.c: New file.
+	* targets.c: Support bfd_elf32_i386_freebsd_vec and
+	bfd_elf64_alpha_freebsd_vec.
+	* configure.in: Accept the vectors bfd_elf32_i386_freebsd_vec,
+	bfd_elf64_alpha_freebsd_vec.
+	* Makefile.am (BFD32_BACKENDS): Add elf32-i386-fbsd.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-i386-fbsd.c.
+	(BFD64_BACKENDS): Add elf64-alpha-fbsd.lo.
+	(BFD64_BACKENDS_CFILES): Add elf64-alpha-fbsd.c.
+	(elf32-i386-fbsd.lo, elf64-alpha-fbsd.lo): Add dependencies.
+	* config.bfd: For FreeBSD targets, set targ_defvec to a FreeBSD
+	specific targets. Define OLD_FREEBSD_ABI_LABEL if appropriate.
+
+2002-09-12  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-i386.c (dtpoff_base, tpoff): Don't crash if tls_segment is
+	NULL.
+	(elf_i386_relocate_section): Return false after printing error about
+	unresolvable relocation.
+
+2002-09-12  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-arm.h (elf32_arm_final_link_relocate): Fix handling of
+	R_ARM_THM_PC11.
+
+2002-09-11  Jeffrey Law  <law@redhat.com>
+
+	* elf32-h8300.c (elf32_h8_relax_section): Fix typo.
+
+2002-09-11  Andrew Haley  <aph@cambridge.redhat.com>
+
+	* elf.c (_bfd_elf_find_nearest_line): Check functionname_ptr and
+	line_ptr before deciding we've found a symbol.
+
+2002-09-11  Nick Clifton  <nickc@redhat.com>
+
+	* po/da.po: New Danish translation file.
+	* configure.in (LINGUAS): Add 'da'.
+	* configure: Regenerate.
+
+2002-09-10  Michael Snyder  <msnyder@redhat.com>
+
+	* irix-core.c (do_sections, do_sections64): New functions.
+	(irix_core_core_file_p): Call new functions do_sections,
+	do_sections64, depending on corefile (32-bit or 64-bit).
+
+2002-09-09  Richard Henderson  <rth@redhat.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Handle PCREL21M
+	and PCREL21F like PCREL21B.
+
+2002-09-04  Kevin Buettner  <kevinb@redhat.com>
+
+	* config.bfd (mips*-*-irix6*): Add new ABI vectors.  Make n32 default
+	vector.
+
+2002-09-02  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-v850.c (v850_elf_final_link_relocate): Use helpful
+	names instead of cryptically overloaded bfd_reloc error
+	codes.
+	(v850_elf_relocate_section): Likewise.
+	(v850_elf_relax_section): Replace caching of external symbols
+	with caching of internal symbols obtained from calling
+	bfd_elf_get_elf_syms().
+	Fixup problems with freeing cached allocated memory blocks.
+
+2002-09-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* cpu-pj.c (scan_mach, compatible, arch_info_struct): Remove.
+	(bfd_pj_arch): Use bfd_default_scan.
+	* cpu-v850.c (scan): Remove.
+	(N): Use bfd_default_scan.
+	* cpu-z8k.c (scan_mach): Remove.
+	(arch_info_struct, bfd_z8k_arch): Reorganize so that the default is
+	first.  Use bfd_default_scan.
+
+	* ecoff.c (_bfd_ecoff_set_arch_mach_hook): Don't use hard-coded
+	bfd_mach constants.
+	(ecoff_get_magic): Likewise.
+	* elf32-v850.c (v850_elf_object_p): Likewise.
+	(v850_elf_final_write_processing): Likewise.
+	* mipsbsd.c (MY(set_arch_mach)): Likewise.
+	(MY(write_object_contents)): Likewise.
+	* coff64-rs6000.c (xcoff64_write_object_contents): Likewise.
+	* coffcode.h (coff_write_object_contents): Likewise.
+	(coff_set_arch_mach_hook): Add comment describing machine == 0.
+	Remove unnecessary "machine" assignments.
+	(coff_write_relocs): Test for the absolute section sym by testing
+	section and flags.
+
+	* aoutx.h (NAME(aout,machine_type)): Recognize bfd_mach_i386_i386
+	and bfd_mach_i386_i386_intel_syntax.
+	* pdp11.c (NAME(aout,machine_type)): Likewise.
+
+2002-08-30  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* bfd-in.h (align_power): Cast constants to bfd_vma type.
+	* bfd-in2.h (align_power): Likewise.
+
+2002-08-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+	* cpu-avr.c (compatible): Don't use hard-coded mach constants.
+	* cpu-powerpc.c (powerpc_compatible): Likewise.
+	* cpu-rs6000.c (rs6000_compatible): Likewise.
+
+2002-08-28  Catherine Moore  <clm@redhat.com>
+
+	* elf32-v850.c (v850_elf_reloc_map): Add new relocs.
+	(v850-elf-reloc): Don't resolve pc relative relocs.
+	(v850_elf_ignore_reloc): New routine.
+	(v850_elf_final_link_relocate): Handle new relocs.
+	(v850_elf_relax_delete_bytes ): New routine.
+	(v850_elf_relax_section): New routine.
+	(bfd_elf32_bfd_relax_section): Define.
+	(HOWTO): New entries for new relocs.
+	* reloc.c (BFD_RELOC_V850_LONGCALL): New reloc.
+	(BFD_RELOC_V850_LONGJUMP): New reloc.
+	(BFD_RELOC_V850_ALIGN): New reloc.
+	* archures.c: Remove redundant v850ea architecture.
+	* cpu-v850.c: Remove redundant v850ea support.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerated.
+
+2002-08-28  Svein E. Seldal  <Svein.Seldal@solidas.com>
+
+	* config.bfd: Add tic4x-*-*coff* and c4x-*-*coff* target.
+	* configure.in: Add tic4x_coff vector files.
+	* configure: Regenerate.
+	* Makefile.am: Add tic4x target.
+	* Makefile.in: Regenerate.
+
+2002-08-27  Michael Hayes <m.hayes@elec.canterbury.ac.nz>
+
+	* archures.c: Add the BFD arch type tic4x.
+	* bfd-in.h: Add BFD_IN_MEMORY flag.
+	* coff-tic4x.c: New file.
+	* coffswap.h (coff_swap_sym_out): Add preadjuster.
+	* cpu-tic4x.c: New file.
+	* targets.c: Added tic4x- in list of xvecs.
+	* ticoff.h: New file.
+	* bfd-in2.h: Regenerate.
+
+2002-08-27  Adam Nemet  <anemet@lnxw.com>
+
+	* elf32-arm.h (elf32_arm_finish_dynamic_sections): Set the last
+	bit of DT_INIT and DT_FINI for Thumb functions.
+
+2002-08-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* coffcode.h (coff_set_arch_mach_hook): Handle W65MAGIC.
+
+2002-08-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* aoutx.h (NAME(aout,reloc_type_lookup)): Handle BFD_RELOC_8.
+
+2002-08-24  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c (sh_elf_copy_indirect_symbol): New.
+	(create_got_section, allocate_dynrelocs, readonly_dynrelocs):
+	Likewise.
+	(struct elf_sh_pcrel_relocs_copied): Removed.
+	(struct elf_sh_dyn_relocs): New.
+	(struct elf_sh_link_hash_entry): Replace pcrel_relocs_copied
+	field with dyn_relocs.
+	(struct elf_sh_link_hash_table): Add short-cuts to get dynamic
+	sections and sym_sec.
+	(sh_elf_link_hash_newfunc): Clear dyn_relocs.
+	(sh_elf_link_hash_table_create): Clear shorts-cuts and sym_sec.
+	(sh_elf_create_dynamic_sections): Use create_got_section instead
+	of _bfd_elf_create_got_section.
+	(sh_elf_check_relocs): Likewise.
+	(sh_elf_create_dynamic_sections): Use short-cuts to the dynamic
+	sections.
+	(sh_elf_adjust_dynamic_symbol, sh_elf_size_dynamic_sections,
+	sh_elf_relocate_section, sh_elf_check_relocs,
+	sh_elf_finish_dynamic_symbol, sh_elf_finish_dynamic_sections):
+	Likewise.
+	(sh_elf_adjust_dynamic_symbol): Handle nocopyreloc. Keep the
+	dynamic relocations and avoiding the copy relocation when we
+	didn't find any dynamic relocations in the section which has
+	contents or is read-only.
+	(WILL_CALL_FINISH_DYNAMIC_SYMBOL): New.
+	(sh_elf_size_dynamic_sections): Don't reset the size of
+	.rela.got section even if dynamic_sections_created flag is off.
+	Don't use sh_elf_discard_copies. Scan all input bfd and use
+	allocate_dynrelocs. Call readonly_dynrelocs to determine
+	whether we need DT_TEXTREL.
+	(sh_elf_adjust_dynamic_symbol): Use plt.refcount to determine
+	whether the symbol was never referred to.
+	(sh_elf_relocate_section): Use WILL_CALL_FINISH_DYNAMIC_SYMBOL.
+	(sh_elf_gc_sweep_hook): Fill with the real sweep function.
+	(sh_elf_check_relocs): Call create_got_section if the short-cut
+	to .got is null. Increment reference counters only instead of
+	allocating space on dynamic sections here. Don't conditionalize
+	uninitialized got.offset value when marking the symbol as a
+	global offset table entry. Keep relocations for symbols satisfied
+	by a dynamic library to avoid copy relocations for the symbol.
+	Set dynobj field of an elf hash table if needed.
+	(sh_elf_finish_dynamic_sections): Handle null section pointer
+	correctly.
+	(elf_backend_copy_indirect_symbol): Defined.
+	(elf_backend_can_refcount): Defined.
+
+2002-08-23  Nick Clifton  <nickc@redhat.com>
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Undo
+	previous change.  Add comment explaining why.
+
+2002-08-23  Stephen Clarke <stephen.clarke@superh.com>
+
+	* elf32-sh.c (elf_sh_plt0_entry_be, elf_sh_plt0_entry_le): Copy
+	contents of .got.plt[2] to tr0, not address of .got.plt.
+	(sh_elf_finish_dynamic_symbol): Do not apply GOT_BIAS when
+	patching absolute plt entry. For shmedia plt entry, set bottom bit
+	of branch to plt0 as this is a branch to an shmedia instruction.
+	* elf64-sh64.c (elf_sh64_plt0_entry_be, elf_sh64_plt0_entry_le):
+	Copy contents of .got.plt[2] to tr0, not address of .got.plt.
+	(elf_sh64_plt_entry_be, elf_sh64_plt_entry_le): Use ptrel to
+	branch to plt0.
+	(sh64_elf64_finish_dynamic_symbol): Do not apply GOT_BIAS when
+	patching absolute plt entry. For shmedia plt entry, branch to
+	plt0 is now ptrel, so use relative offset.  Set bottom bit of
+	branch target as it is a branch to an shmedia instruction.
+
+2002-08-23  Stephen Clarke <stephen.clarke@superh.com>,
+	    Richard Shann <richard.shann@superh.com>
+
+	* elf32-sh.c (sh_elf_finish_dynamic_sections): Set LSB of DT_INIT
+	value if .init is an SHmedia function.  Similarly for DT_FINI.
+	* elf64-sh64.c (sh64_elf64_finish_dynamic_sections): Likewise.
+
+2002-08-23  Stephen Clarke <stephen.clarke@superh.com>
+
+	* elf32-sh.c (sh_elf_size_dynamic_sections): Zero initialize
+	dynamic section.
+	* elf64-sh64.c (sh64_elf64_size_dynamic_sections): Likewise.
+
+2002-08-22  Kaz Kojima <kkojima@rr.iij4u.or.jp>
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Use a simple
+	byte read when reading the return address register column.
+
+2002-08-22  Nick Clifton  <nickc@redhat.com>
+
+	* config.bfd: Add powepc64-*-*bsd* target.
+
+2002-08-22  Graeme Peterson  <gp@qnx.com>
+
+	* Makefile.am: Add entries for elf32-shqnx.c
+	* Makefile.in: Regenerate.
+	* config.bfd: Add support sh-*-nto* target.
+	* configure.in: Add support for bfd_elf32_sh{l}qnx_vec.
+	* configure: Regenerate.
+	* elf32-qnx.h: Changed typo "elf_i386qnx_*" to "elf_qnx_*" .
+	* elf32-sh.c: Do not include elf32-target.h if
+	ELF32_SH_C_INCLUDED is defined.
+	* elf32-shqnx.c: New file: Support for QNX.
+	* targets.c: Add bfd_elf32_sh{l}qnx_vec.
+
+2002-08-22  Nick Clifton  <nickc@redhat.com>
+
+	* po/tr.po: Updated Turkish translation.
+
+	* syms.c (_bfd_generic_read_minisymbols): Set bfd_error if the
+	symbols are not read.
+
+2002-08-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-m68hc11.c: Formatting fixes.
+	(elf32_m68hc11_gc_mark_hook): Correct params.  Remove unnecessary test.
+	* elf32-m68hc12.c: Formatting fixes.
+	(elf32_m68hc11_gc_mark_hook): Correct params.  Remove unnecessary test.
+
+2002-08-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* coff-rs6000.c (rs6000coff_vec <object_flags>): Add SEC_CODE and
+	SEC_DATA.
+	(pmac_xcoff_vec): Likewise.
+	* coff64-rs6000.c (rs6000coff64_vec): Likewise.
+	(aix5coff64_vec): Likewise.
+
+2002-08-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_backend_data): Add struct elf_backend_data
+	param to elf_backend_copy_indirect_symbol.
+	(_bfd_elf_link_hash_copy_indirect): Likewise.
+	* elflink.h (elf_add_default_symbol, elf_fix_symbol_flags): Adjust
+	calls to copy_indirect_symbol.
+	* elf32-hppa.c (elf32_hppa_copy_indirect_symbol): Likewise.
+	* elf32-i386.c (elf_i386_copy_indirect_symbol): Likewise.
+	* elf32-s390.c (elf_s390_copy_indirect_symbol): Likewise.
+	* elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Likewise.
+	* elf64-s390.c (elf_s390_copy_indirect_symbol): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_copy_indirect_symbol): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_hash_copy_indirect): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_copy_indirect_symbol): Likewise.
+	* elfxx-mips.h (_bfd_mips_elf_copy_indirect_symbol): Likewise.
+	* elf.c (_bfd_elf_link_hash_copy_indirect): Likewise.  Properly
+	test refcounts for "used" values.
+
+2002-08-21  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Add PARAMS to
+	argument declaration.
+
+2002-08-19  Elena Zannoni <ezannoni@redhat.com>
+
+	* archures.c (bfd_mach_ppc_e500): Added.
+	* bfd-in2.h: Rebuilt.
+	* cpu-powerpc.c (bfd_powerpc_archs): Added e500.
+
+2002-08-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-m68hc12.c (elf_backend_can_gc_sections): False.
+
+2002-08-17  Andrew Cagney  <ac131313@redhat.com>
+
+	* elf.c (bfd_elf_get_elf_syms): Change type of `esym' to
+	`bfd_byte'.
+
+2002-08-17  Stan Cox  <scox@redhat.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_modify_segment_map): Use the
+	IRIX 6 segment layout for NEWABI.
+
+2002-08-16  Stephen Clarke <stephen.clarke@superh.com>
+
+	* elf32-sh.c (sh_elf_gc_mark_hook): For sh64, skip indirect
+	symbols when looking for section referred to by a relocation.
+	* elf64-sh.c (sh_elf64_gc_mark_hook): Likewise.
+
+2002-08-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-i370.c: Move reloc enum to include/elf/i370.h.
+
+2002-08-15  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (elf_cris_discard_excess_program_dynamics): Add
+	missing check for whether the symbol is referenced by DSO before
+	unexporting it as an unneeded dynamic symbol.
+
+2002-08-14  H.J. Lu <hjl@gnu.org>
+
+	* libbfd.h: Regenerate.
+
+2002-08-14  H.J. Lu <hjl@gnu.org>
+
+	* config.bfd: Always add 64bit vectors to 32bit Linux/mips.
+
+2002-08-14  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* elf32-m68hc11.c (m68hc11_relax_group): New to relax group of
+	instructions.
+	(m68hc11_direct_relax): New to define table of relaxable instructions.
+	(find_relaxable_insn): New, find a relaxable insn.
+	(compare_reloc): New to compare two relocs.
+	(m68hc11_elf_relax_section): New, relax text sections.
+	(m68hc11_elf_relax_delete_bytes): New, delete bytes and adjust branchs.
+	(elf32_m68hc11_check_relocs): New function for GC support.
+	(elf32_m68hc11_relocate_section): New function for GC support.
+	(bfd_elf32_bfd_relax_section): Define to support linker relaxation.
+	(elf_backend_check_relocs): Likewise.
+	(elf_backend_relocate_section): Likewise.
+
+2002-08-13  H.J. Lu <hjl@gnu.org>
+
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections): Don't count
+	definitions in shared objects when checking symbol with
+	undefined version.
+
+2002-08-13  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* elf32-m68hc11.c (elf32_m68hc11_gc_mark_hook): New for section GC.
+	(elf32_m68hc11_gc_sweep_hook): Likewise.
+	(elf_backend_gc_mark_hook): Define for GC section support.
+	(elf_backend_gc_sweep_hook): Likewise.
+	(elf_backend_can_gc_sections): Likewise.
+
+	* elf32-m68hc12.c: Likewise.
+
+2002-08-13  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* elf32-m68hc11.c (_bfd_m68hc11_elf_print_private_bfd_data): New.
+	(_bfd_m68hc11_elf_merge_private_bfd_data): New function.
+	(_bfd_m68hc11_elf_set_private_flags): New function.
+	Use them to set/check/print ELF flags specific to 68HC11.
+
+	* elf32-m68hc12.c (_bfd_m68hc12_elf_print_private_bfd_data): New.
+	(_bfd_m68hc12_elf_merge_private_bfd_data): New function.
+	(_bfd_m68hc12_elf_set_private_flags): New function.
+	Use them to set/check/print ELF flags specific to 68HC12.
+
+2002-08-13  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* elf32-m68hc11.c (elf_m68hc11_howto_table): Add the new relocs;
+	fix masks for PC-rel relocs.
+	(m68hc11_elf_ignore_reloc): New function.
+
+	* elf32-m68hc12.c (m68hc12_elf_special_reloc): New to handle specific
+	68HC12 banked addressing relocs.
+	(m68hc12_phys_addr): New to compute physical address of banked memory.
+	(m68hc12_phys_page): Likewise for page.
+	(m68hc12_addr_is_banked): New to see if address is in banked area.
+	(elf_m68hc12_howto_table): Add new relocs and rename to xx12.
+
+2002-08-13  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* reloc.c (BFD_RELOC_M68HC11_RL_JUMP, BFD_RELOC_M68HC11_RL_GROUP,
+	BFD_RELOC_M68HC11_LO16, BFD_RELOC_M68HC11_PAGE,
+	BFD_RELOC_M68HC11_24): New relocs for 68HC11/68HC12.
+	* bfd-in2.h: Regenerate.
+
+2002-08-12  H.J. Lu <hjl@gnu.org>
+
+	* elflink.h (elf_add_default_symbol): Preserve section across
+	elf_merge_symbol.
+
+2002-08-09  Graeme Peterson  <gp@qnx.com>
+
+	* Makefile.am: Add entries for elf32-ppcqnx.c, and add
+	elf32-qnx.h dependency to elfarmqnx-nabi.c and elf32-i386qnx.c.
+	* Makefile.in: Regenerate.
+	* config.bfd: Add support for powerpc{le}-*-nto targets.
+	* configure.in: Add support for bfd_elf32_powerpc{le}qnx_vec.
+	* configure: Regenerate.
+	* elf32-i386qnx.c: Moved backend functions into a QNX specific
+	common file "elf32-qnx.h", and now include that file.
+	* elf32-qnx.h: New file: QNX specific common elf backend.
+	* elf32-ppc.c: Do not include elf32-target.h if
+	ELF32_PPC_C_INCLUDED is defined.
+	* elf32-ppcqnx.c: New file: Support for QNX.
+	* elfarmqnx-nabi.c: Include elf32-qnx.h for qnx elf backend.
+	* targets.c: Add bfd_elf32_powerpc{le}qnx_vec.
+
+2002-08-09  Nick Clifton  <nickc@redhat.com>
+
+	* po/sv.po: Updated Swedish translation.
+
+2002-08-09  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elfxx-mips.c (mips_elf_global_got_index): Avoid segfault if
+	g->global_gotsym is NULL.
+
+2002-08-08  H.J. Lu <hjl@gnu.org>
+
+	* elflink.h (elf_add_default_symbol): Don't warn if a definition
+	overrides an indirect versioned symbol.
+
+2002-08-08  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-i386.c (elf_i386_relocate_section): Fill in proper addend
+	for R_386_TLS_TPOFF32 relocs against symndx 0.
+
+2002-08-07  H.J. Lu <hjl@gnu.org>
+
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Check symbol
+	with undefined version if needed.
+	(elf_link_assign_sym_version): Match a default symbol with a
+	version without definition. No need to hide the default
+	definition separately.
+
+2002-08-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_link_output_extsym): Don't output symbols from
+	SEC_EXCLUDE sections.
+
+	* aoutx.h (aout_link_write_symbols): Correct handling of warning syms.
+
+2002-08-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (edit_opd): Arrange to drop symbols for discarded .opd
+	entries.
+
+2002-08-07  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elfxx-mips.c (mips_elf_create_dynamic_relocation): Cast signedness
+	mismatch.
+
+2002-08-07  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elfxx-mips.c (ABI_64_P): Remove superfluous check.
+
+2002-08-07  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elf32-mips.c (mips_reloc_map): Fix typo.
+
+2002-08-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* xcofflink.c (xcoff_write_global_symbol): Set n_scnum for abs_section.
+
+2002-08-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_howto_raw): Zero all src_mask entries.
+
+2002-08-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* libxcoff.h: Use PARAMS on function declarations.
+	* coff-rs6000.c (xcoff_generate_rtinit): Simplify size calc.
+	* coff64-rs6000.c (xcoff64_generate_rtinit): Likewise.
+
+	* coff-rs6000.c: (xcoff_rtype2howto): Don't place reloc address in
+	addend.
+	* coff64-rs6000.c: (xcoff64_rtype2howto): Likewise.
+
+2002-08-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* coff-rs6000.c: Formatting fixes.
+	(xcoff_calculate_relocation): Use PARAMS in declaration.
+	(xcoff_complain_overflow): Likewise.
+	(xcoff_ppc_relocate_section): Use old-style function pointer call.
+	(bfd_xcoff_backend_data): Remove useless comments.
+	(rs6000coff_vec): Likewise.
+	(bfd_pmac_xcoff_backend_data): Likewise.
+	(pmac_xcoff_vec): Likewise.
+
+	* coff64-rs6000.c: Formatting fixes.
+	(xcoff64_calculate_relocation): Use PARAMS in declaration.
+	(xcoff64_ppc_relocate_section): Use old-style function pointer call.
+	(bfd_xcoff_backend_data): Remove useless comments.
+	(rs6000coff64_vec): Likewise.
+	(bfd_xcoff_aix5_backend_data): Likewise.
+	(aix5coff64_vec): Likewise.
+
+2002-08-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* coff-rs6000.c (xcoff_howto_table): Revert some of last change to
+	mask entries.  Use complain_overflow_dont for R_REF.
+	(xcoff_reloc_type_ba): Revert last change.
+	(xcoff_reloc_type_br): Likewise.
+	(xcoff_reloc_type_crel): Likewise.
+	(xcoff_ppc_relocate_section): Likewise.
+	* coff64-rs6000.c (xcoff64_reloc_type_br): Likewise.
+	(xcoff64_ppc_relocate_section): Likewise.
+	(xcoff64_howto_table): Revert some of last change to mask entries.
+	Use complain_overflow_dont for R_REF.
+
+	* coff-rs6000.c (xcoff_howto_table): Fix src_mask entries.  Make all
+	relocs with bitsize == 16 have size = 1.
+	(xcoff_reloc_type_ba): Correct src_mask and dst_mask adjustment.
+	(xcoff_reloc_type_br): Likewise.
+	(xcoff_reloc_type_crel): Likewise.
+	(xcoff_ppc_relocate_section): Set up src_mask and dst_mask correctly.
+	* coff64-rs6000.c (xcoff64_reloc_type_br): Correct src_mask and
+	dst_mask adjustment.
+	(xcoff64_ppc_relocate_section): Set up src_mask and dst_mask correctly.
+	(xcoff64_howto_table): Fix src_mask entries.  Make all relocs with
+	bitsize == 16 have size = 1.
+
+2002-08-01  Denis Chertykov  <denisc@overta.ru>
+
+	* elf32-ip2k.c: Processor manufacturer changed to Ubicom.
+	(struct misc): New field isymbuf. All free_* fields removed.
+	(symbol_value): Pass in internal syms. No need to swap syms in.
+	(ip2k_elf_relax_section): Use bfd_elf_get_elf_syms. Properly free
+	possibly cached info.
+	(tidyup_after_error): Removed.
+	(ip2k_elf_relax_section_pass1): Don't use removed fields of struct
+	misc. Use new field.
+	(adjust_all_relocations): Use internal syms. No need to swap syms
+	in and out.
+	(add_page_insn): Don't use removed fields of struct misc.
+
+2002-08-01  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-arm.h: Revert previous delta.
+
+2002-08-01  Nick Clifton  <nickc@redhat.com>
+
+	* configure.in (AM_INIT_AUTOMAKE): Bump version number.
+	* configure: Regenerate.
+
+2002-07-31  H.J. Lu <hjl@gnu.org>
+
+	* config.bfd: Add x86-64 vector to Linux/i386 if 64bit BFD is
+	selected.
+
+2002-07-31  H.J. Lu <hjl@gnu.org>
+
+	* config.bfd: Add n32 vectors to 32bit Linux/mips if 64bit BFD
+	is selected.
+
+2002-07-31  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-i386.c (elf_i386_copy_indirect_symbol): Swap tls_type
+	if _bfd_elf_link_hash_copy_indirect will swap got.refcount.
+
+2002-07-31  Ian Dall  <ian@sibyl.beware.dropbear.id.au>
+
+	* cpu-ns32k.c (_bfd_ns32k_put_immdeiate, _bfd_ns32k_get_immediate):
+	There is no 8 byte relocation type for this architecture.
+	(do_ns32k_reloc): Use bfd_vma instead of native types.
+	(bfd_ns32k_put_immediate, _bfd_ns32k_relocate_contents) put_data
+	returns void.
+	(_bfd_ns32k_put_displacement): Don't check for overflow. We can
+	rely on generic code to do that.
+	* aout-ns32k.c (howto_table): Add appropriate overflow detection
+	to all table entries.
+	(_bfd_ns32k_relocate_contents): put_data returns void.
+	* ns32k.h: (_bfd_ns32k_put_displacement, _bfd_ns32k_put_immediate)
+	(_bfd_do_ns32k_reloc_contents): Fix prototypes. put data functions
+	return void.
+
+2002-07-31  Ian Dall  <ian@sibyl.beware.dropbear.id.au>
+
+	* aoutx.h (aout_link_check_ar_symbols): Whether to include an
+	archive object is target dependant.
+
+2002-07-31  Adam Nemet  <anemet@lnxw.com>
+
+	* elf32-arm.h (ARM_PLT_ENTRY_SIZE): Rename PLT_ENTRY_SIZE.
+	(THUMB_PLT_ENTRY_SIZE): New macro.
+	(PLT_ENTRY_SIZE): Return the appropriate *_PLT_ENTRY_SIZE.
+	(elf32_arm_plt0_entry): Rename PLT_ENTRY_SIZE to
+	ARM_PLT_ENTRY_SIZE.
+	(elf32_arm_plt_entry): Likewise.
+	(elf_backend_plt_header_size): Likewise.
+	(elf32_thumb_plt0_entry): New global.
+	(elf32_arm_finish_dynamic_sections): Use it.  Put Thumb entries
+	into .plt.thumb.
+	(elf32_thumb_plt_entry): New global.
+	(elf32_arm_finish_dynamic_symbol): Use it.  Use .thumb.plt for
+	Thumb entries.  Set the bottom bit of the corresponding GOT entry
+	for a Thumb PLT entry.
+	(struct elf32_arm_plt_entry_info): New structure.
+	(struct elf32_arm_link_hash_entry, plt_info): New member of this
+	type.
+	(elf32_arm_link_hash_newfunc): Initialize new member.
+	(elf32_arm_final_link_relocate, R_ARM_THM_PC22 case): Handle
+	relocations against the PLT.
+	(elf32_arm_check_relocs, case R_ARM_PLT32 case): Set
+	first_rel_type if this is the first time we encounter the symbol.
+	(elf32_arm_check_relocs, case R_ARM_THM_PC22 case): New case.
+	Determine if relocation needs a PLT entry.  Set first_rel_type if
+	this is the first time we encounter the symbol
+	(elf32_arm_adjust_dynamic_symbol): Create PLT entries for Thumb
+	functions as well.
+	(elf32_arm_size_dynamic_sections): Handle .plt.thumb like .plt.
+	(elf32_arm_create_dynamic_sections): New function.  Create the
+	.plt.thumb section.
+	(elf_backend_create_dynamic_sections): Call it.
+
+2002-07-31  Nick Clifton  <nickc@redhat.com>
+
+	* bfd.c (bfd_alt_mach_code): Rename parameter 'index' to
+	'alternative' in order to avoid shadowing global symbol of the
+	same name.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* libcoff.h: Regenerate.
+
+2002-07-31  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* Makefile.am: Add n32 ABI support.
+	* Makefile.in: Regenerate.
+	* config.bfd: Add n32 vectors to mips64*-*-linux* targets. Treat 64
+	bit vectors for mips*-*-linux targets as optional.
+	* configure.in: Add n32 ABI vectors.
+	* configure: Regenerate.
+	* elf32-mips.c (mips_elf32_object_p): Reject n32 ABI files.
+	* elfn32-mips.c: New file, n32 ABI support.
+	* targets.c: Add n32 ABI vectors.
+
+2002-07-30  Graeme Peterson  <gp@qnx.com>
+
+	* elfarmqnx-nabi.c: New file: Support for QNX.
+	* config.bfd: Add support for arm-*-nto target.
+	* configure.in: Add support for bfd_elf32_{big|little}armqnx_vec.
+	* configure: Regenerate.
+	* Makefile.am: Add entries for elfarmqnx-nabi.c.
+	* Makefile.in: Regenerate.
+	* elf32-arm.h (ELF_MAXPAGESIZE): Do not define if already defined.
+	Do not define global function if ELFARM_NABI_C_INCLUDED is defined.
+	* elfarm-nabi.c: Do not include elf32-arm.h if
+	ELFARM_NABI_C_INCLUDED is defined.
+	* targets.c: Add bfd_elf32_{big|little}armqnx_vec.
+
+2002-07-30  Nick Clifton  <nickc@redhat.com>
+
+	* po/sv.po: Updated Swedish translation.
+
+2002-07-30  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf.c (elf_fake_sections): Fix up .tbss sh_size and sh_type.
+
+2002-07-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* aoutx.h (some_aout_object_p): Clean up tdata properly on error.
+	* archive.c (bfd_generic_archive_p): Likewise.
+	* coff-rs6000.c (_bfd_xcoff_archive_p): Likewise.
+	(_bfd_xcoff_archive_p): Use bfd_scan_vma in place of strtol.
+	* coff64-rs6000.c (xcoff64_slurp_armap): Likewise.
+	(xcoff64_archive_p): Likewise.
+	(xcoff64_openr_next_archived_file): Likewise.
+	(xcoff64_archive_p): Clean up tdata properly on error.
+	* coffgen.c (coff_real_object_p): Likewise.
+	(coff_object_p): Release filehdr and opthdr.
+	* ecoff.c (_bfd_ecoff_archive_p): Clean up tdata properly on error.
+	* ieee.c (ieee_archive_p): Likewise.
+	* ihex.c (ihex_object_p): Likewise.
+	(ihex_mkobject): Always allocate tdata.
+	* peicode.h (pe_ILF_object_p): Release bfd_alloc'd buffer on error.
+	* srec.c (srec_mkobject): Always allocate tdata.
+	(srec_object_p): Clean up tdata properly on error.
+	(symbolsrec_object_p): Likewise.
+	* versados.c (versados_object_p): Likewise.
+	* vms-misc.c (_bfd_vms_get_record): Use bfd_malloc instead of malloc,
+	and bfd_realloc instead of realloc.
+	(add_new_contents): Use bfd_alloc instead of bfd_malloc for sections.
+	* vms.c (vms_initialize): Always allocate tdata.  Use bfd_alloc in
+	place of bfd_malloc, simplifying error freeing.  Free hash table too.
+	(vms_object_p): Clean up tdata on error.
+	(vms_mkobject): Don't complain on stderr if vms_initialize fails.
+	(vms_close_and_cleanup): Adjust for bfd_alloc use.
+
+2002-07-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* elfxx-ia64.c (elfNN_ia64_final_write_processing): Set e_flags.
+
+2002-07-26  Chris Demetriou  <cgd@broadcom.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Merge ASE
+	flags into resulting BFD.
+
+2002-07-26  Alan Modra  <amodra@bigpond.net.au>
+
+	From John Reiser <jreiser@BitWagon.com>
+	* elf32-i386.c (elf_i386_link_hash_table_create): Clear
+	tls_ldm_got.refcount.
+
+2002-07-25  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elf64-mips.c: Update TODO comment.
+	(mips_elf64_higher_reloc,mips_elf64_highest_reloc,
+	mips_elf64_gprel16_reloca): Remove prototypes.
+	(mips16_jump_reloc,mips16_gprel_reloc): Add functions.
+	(UNUSED_RELOC): Replace by EMPTY_RELOC.
+	(mips_elf64_howto_table_rel): Use special R_MIPS_HI16 handling. Remove
+	wrong comments. Remove disfunctional support of R_MIPS_HIGHER and
+	R_MIPS_HIGHEST.
+	(mips_elf64_howto_table_rela): Fix handling of R_MIPS_GPREL16 and
+	R_MIPS_GOT16. Remove wrong comments.
+	(elf_mips16_jump_howto,elf_mips16_gprel_howto,
+	elf_mips_gnu_vtinherit_howto,elf_mips_gnu_vtentry_howto): New, code
+	from elf32-mips.c.
+	(mips_elf64_hi16_reloc): Fix formatting.
+	(mips_elf64_higher_reloc,mips_elf64_highest_reloc): Remove.
+	(mips_elf64_got16_reloc): Fix formatting. Remove superfluous code.
+	Better comment. Fall back to R_MIPS_GOT_DISP instead of abort().
+	(mips_elf64_gprel16_reloc): Make static. Add check for
+	partial_inplace.
+	(mips_elf64_gprel16_reloca): Remove.
+	(mips_elf64_literal_reloc): New function.
+	(mips_elf64_gprel32_reloc): Fix formatting.
+	(mips_elf64_shift6_reloc): Fix comment. Make static.
+	(mips16_jump_reloc,mips16_gprel_reloc): New functions, code from
+	elf32-mips.c.
+	(elf_reloc_map,mips_reloc_map): New mapping table, similiar as in
+	elf32-mips.c
+	(bfd_elf64_bfd_reloc_type_lookup): Use the mapping table. Enable GNU
+	specific relocations.
+	(mips_elf64_rtype_to_howto): Enable GNU specific relocations.
+	(mips_elf64_object_p): Invert logic to check for SGI-ish ABI.
+	(ELF_MAXPAGESIZE): Add comment.
+
+2002-07-25  Nick Clifton  <nickc@redhat.com>
+
+	* po/sv.po: Updated Swedish translation.
+	* po/es.po: Updated Spanish translation.
+	* po/fr.po: Updated French translation.
+
+2002-07-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (_bfd_elf32_link_record_local_dynamic_symbol): Define
+	as elf_link_record_local_dynamic_symbol.
+	(_bfd_elf64_link_record_local_dynamic_symbol): Likewise.
+	(elf_link_record_local_dynamic_symbol): Declare.  Now returns int.
+	* elflink.h (elf_link_record_local_dynamic_symbol): Move to..
+	* elflink.c: .. here.  Use bfd_elf_get_elf_syms.  Check whether an
+	attempt is made to record a symbol in a discarded section, and
+	return `2' in that case.
+
+2002-07-24  Nick Clifton  <nickc@redhat.com>
+
+	* po/sv.po: Updated Swedish translation.
+	* po/es.po: Updated Spanish translation.
+
+2002-07-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* po/SRC-POTFILES.in: Regenerate.
+
+	* elf-hppa.h (elf_hppa_relocate_section): If relocatable, return
+	immediately.  Remove code handling relocatable linking.
+	* elf32-avr.c (elf32_avr_relocate_section): Likewise.
+	* elf32-cris.c (cris_elf_relocate_section): Likewise.
+	* elf32-fr30.c (elf32_frv_relocate_section): Likewise.
+	* elf32-frv.c (elf32_frv_relocate_section): Likewise.
+	* elf32-h8300.c (elf32_h8_relocate_section): Likewise.
+	* elf32-hppa.c (elf32_hppa_relocate_section): Likewise.
+	* elf32-ip2k.c (ip2k_elf_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+	* elf32-v850.c (v850_elf_relocate_section): Likewise.
+	* elf32-vax.c (elf_vax_relocate_section): Likewise.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+	* elf32-avr.c (elf_backend_rela_normal): Define.
+	* elf32-cris.c: Likewise.
+	* elf32-fr30.c: Likewise.
+	* elf32-frv.c: Likewise.
+	* elf32-h8300.c: Likewise.
+	* elf32-hppa.c: Likewise.
+	* elf32-ip2k.c: Likewise.
+	* elf32-sparc.c: Likewise.
+	* elf32-v850.c: Likewise.
+	* elf32-vax.c: Likewise.
+	* elf64-hppa.c: Likewise.
+	* elf64-sparc.c: Likewise.
+	* elf32-fr30.c (elf32_frv_relocate_section): Edit comment.
+	* elf32-frv.c (elf32_frv_relocate_section): Likewise.
+	* elf32-i860.c (elf32_i860_relocate_section): Likewise.
+	* elf32-ip2k.c (ip2k_elf_relocate_section): Likewise.
+	* elf32-m32r.c (m32r_elf_relocate_section): Likewise.
+	* elf32-openrisc.c (openrisc_elf_relocate_section): Likewise.
+	* elf32-xstormy16.c (xstormy16_elf_relocate_section): Likewise.
+	* elf-m10200.c (USE_RELA): Don't define.
+	* elf-m10300.c: Likewise.
+	* elfarm-oabi.c: Likewise.
+	* elf32-i370.c: Likewise.
+	* elf32-ip2k.c: Likewise.
+	* elf32-m68k.c: Likewise.
+	* elf32-mcore.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-s390.c: Likewise.
+	* elf32-vax.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf64-s390.c: Likewise.
+	* elf64-x86-64.c: Likewise.
+	* elfxx-ia64.c: Likewise.
+	* elf32-avr.c (USE_REL): Don't undef.
+	* elf32-ip2k.c: Likewise.
+
+2002-07-23  Nick Clifton  <nickc@redhat.com>
+
+	* elf-bfd.h (struct elf_backend_data): Add new bitfield
+	'want_p_paddr_set_to_zero'.
+	* elfxx-target.h: Set default value for want_p_paddr_set_to_zero
+	to false;
+	* elfxx-ia64.c: Set want_p_paddr_set_zero for HPUX target.
+	* elf.c (copy_private_bfd_data): Test want_p_paddr_set_zero.
+
+2002-07-23  Gabor Keresztfalvi  <keresztg@mail.com>
+
+	* nlmcode.h (nlm_swap_auxiliary_headers_out): Swapped the order of
+	the MeSsAgEs and CoPyRiGhT tags to make >=NW4.x NLM loaders to
+	show the Copyright string.
+	Minor formatting tidy ups.
+
+2002-07-23  Nick Clifton  <nickc@redhat.com>
+
+	* po/fr.po: Updated French translation.
+	* po/sv.po: Updated Swedish translation.
+
+2002-07-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_link_input_bfd): Don't change internal symbols
+	when outputting relocs.
+
+2002-07-20  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* elf64-alpha.c (elf64_alpha_size_dynamic_sections): Only insert
+	DT_PLTGOT into the dynamic section if there is a PLT.
+
+2002-07-19  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elfxx-mips.c (_bfd_mips_elf_discard_info): New function, code from
+	elf32-mips.c.
+	(_bfd_mips_elf_write_section): Likewise.
+	* elfxx-mips.h (_bfd_mips_elf_discard_info): New prototype.
+	(_bfd_mips_elf_write_section): Likewise.
+	* elf32-mips.c (elf32_mips_discard_info): Move to elfxx-mips.c.
+	(elf32_mips_write_section): Likewise.
+	* elf64-mips.c (_bfd_mips_elf_ignore_discarded_relocs): Use it.
+	(_bfd_mips_elf_write_section): Likewise.
+
+2002-07-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elfxx-ia64.c: (elfNN_ia64_modify_segment_map): Properly scan
+	PT_IA_64_UNWIND segments for a given section.
+
+2002-07-17  H.J. Lu <hjl@gnu.org>
+
+	* Makefile.am: Fix a typo.
+	* Makefile.in: Regenerate.
+
+2002-07-15  Denis Chertykov  <denisc@overta.ru>
+	    Frank Ch. Eigler  <fche@redhat.com>
+	    Ben Elliston  <bje@redhat.com>
+	    Alan Lehotsky  <alehotsky@cygnus.com>
+	    John Healy  <jhealy@redhat.com>
+	    Graham Stott  <grahams@redhat.com>
+	    Jeff Johnston  <jjohnstn@redhat.com>
+
+	* Makefile.am: Add support for ip2k.
+	* Makefile.in: Regenerate.
+	* doc/Makefile.in: Regenerate.
+	* archures.c: Add support for ip2k.
+	* config.bfd: Add support for ip2k.
+	* configure.in: Add support for ip2k.
+	* configure: Regenerate.
+	* reloc.c: Add support for ip2k.
+	* targets.c: Add support for ip2k.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* cpu-ip2k.c: New file.
+	* elf32-ip2k.c: New file.
+
+2002-07-17  Ian Rickards  <irickard@arm.com>
+
+	* dwarf2.c (concat_filename): If we can't establish the directory
+	just return the filename.
+
+2002-07-16  Moritz Jodeit  <moritz@jodeit.org>
+
+	* peXXigen.c (_bfd_XXi_swap_aouthdr_out): Correct order of memset args.
+
+2002-07-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h: Formatting fixes, tidy prototypes.
+	(elf_link_assign_sym_version): Move common code out of loop.
+
+2002-07-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_link_input_bfd): Don't call reloc_emitter when
+	reloc section size is zero.  Correct reloc output location.
+
+2002-07-16  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* elf-hppa.h (elf_hppa_reloc_final_type): Use R_PARISC_PCREL16F as
+	the final type for the e_fsel selector when generating PA2.0W code.
+	(elf_hppa_relocate_insn): Provide support for PA2.0W 16-bit format 1
+	relocations.
+
+2002-07-14  H.J. Lu <hjl@gnu.org>
+
+	* elflink.h (elf_link_assign_sym_version): Hide the default
+	definition if there is a hidden versioned definition.
+
+2002-07-12  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (cris_elf_relocate_section): Drop nonsensical
+	dynamic reference test in assertion when initializing GOT with
+	static contents.  Just assert that there are either no dynamic
+	sections, the symbol is defined in the regular objects or that the
+	symbol is undef weak.  Tweak comment.
+	(elf_cris_finish_dynamic_symbol): Emit .got reloc for a program
+	only if the symbol isn't defined in the program and isn't undef
+	weak.
+	(elf_cris_adjust_dynamic_symbol): Simplify condition for getting
+	rid of PLT entry: only do it if the symbol isn't defined in a DSO.
+	When doing so, clear ELF_LINK_HASH_NEEDS_PLT.  Tweak comments.
+	(elf_cris_discard_excess_program_dynamics): Don't consider
+	ELF_LINK_HASH_REF_DYNAMIC when omitting .got runtime relocs.
+
+2002-07-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-i386.c (elf_i386_relocate_section): Don't complain about
+	unresolved debugging relocs in dynamic applications.
+	* elf32-s390.c (elf_s390_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+	* elf64-ppc.c (ppc64_elf_relocate_section): Likewise.
+	* elf64-s390.c (elf_s390_relocate_section): Likewise.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+
+2002-07-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ONES): Define.
+	(ppc64_elf_howto_table): Use ONES here to avoid warnings.  Fill in
+	missing src_mask fields.  Tweak R_PPC64_NONE, R_PPC64_COPY.  Fill
+	in missing dst_mask fields on R_PPC64_PLT32, R_PPC64_PLTREL32.
+
+	* elf64-ppc.c (ppc64_elf_get_symbol_info): Delete.
+	(ppc64_elf_set_private_flags): Delete.
+	(ppc64_elf_section_from_shdr): Delete.
+	(ppc64_elf_merge_private_bfd_data): Remove flag checking/merging code.
+	(ppc64_elf_fake_sections): Delete.
+	(bfd_elf64_bfd_set_private_flags): Don't define.
+	(bfd_elf64_get_symbol_info): Likewise.
+	(elf_backend_section_from_shdr): Likewise.
+	(elf_backend_fake_sections): Likewise.
+
+2002-07-10  Marco Walther  <Marco.Walther@sun.com>
+
+	* elf.c: (assign_section_numbers) Set sh_entsize for .stab only
+	when not already set.
+	* elf64-sparc.c: (sparc64_elf_fake_sections): New function.
+	(elf_backend_fake_sections): Define.
+
+2002-07-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* merge.c (_bfd_merge_section): Remove redundant output_section check.
+	Formatting.
+	(_bfd_merge_sections): Don't set SEC_EXCLUDE on unused sections.
+
+2002-07-09  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (cris_elf_relocate_section): Move sanity-check for
+	NULL sym_hashes to just before use.
+	<case R_CRIS_32_GOTREL>: In test for local symbol, accept also
+	symbol with non-default visibility.
+	<case R_CRIS_32_GOTREL, case R_CRIS_32_PLT_GOTREL>: Ditto.
+	<case R_CRIS_8_PCREL, case R_CRIS_16_PCREL, case R_CRIS_32_PCREL>:
+	Ditto.
+	(cris_elf_gc_sweep_hook): Only decrease h->plt.refcount for
+	symbol with non-default visibility.
+	(cris_elf_check_relocs): At tests for local symbol before
+	increasing h->plt.refcount, also check for non-default
+	visibility.  Ditto when checking for local symbol to eliminate
+	pc-relative runtime relocs.
+
+2002-07-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c: Formatting.
+	(IS_SOLARIS_PT_INTERP): Add p_paddr and p_memsz checks.
+	(INCLUDE_SECTION_IN_SEGMENT): Remove IS_SOLARIS_PT_INTERP.
+	(copy_private_bfd_data): Set p_vaddr on broken Solaris PT_INTERP
+	segments.
+
+2002-07-07  Mark Mitchell  <mark@codesourcery.com>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* cofflink.c (_bfd_coff_final_link): On PE COFF systems, take into
+	account the impact of relocation count overflow when computing
+	section offsets.
+	* coffcode.h (coff_write_relocs): Use obj_pe when deciding whether
+	or not to apply the PE COFF reloc overflow handling.  Fix a
+	fencepost error in deciding whether or not to use that technique.
+
+2002-07-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_reloc_cookie): Remove locsym_shndx,
+	change type of locsyms.
+	(bfd_elf_get_elf_syms): Declare.
+	* elf.c (bfd_elf_get_elf_syms): New function.
+	(group_signature): Use bfd_elf_get_elf_syms.
+	(bfd_section_from_r_symndx): Likewise.
+	* elfcode.h (elf_slurp_symbol_table): Likewise.
+	* elflink.h (elf_link_is_defined_archive_symbol): Likewise.
+	(elf_link_add_object_symbols): Likewise.  Reorganise to increase
+	locality of various data structures.  Properly free internal relocs.
+	(elf_bfd_final_link): Properly free internal relocs.
+	(elf_link_check_versioned_symbol): Use bfd_elf_get_elf_syms.
+	(elf_link_input_bfd): Likewise.
+	(elf_gc_mark): Likewise.  Properly free internal relocs.
+	(elf_gc_sweep): Properly free internal relocs.
+	(elf_reloc_symbol_deleted_p): No need to swap syms in.
+	(elf_bfd_discard_info): Use bfd_elf_get_elf_syms.  Properly free
+	internal relocs.
+	* elf-m10200.c (mn10200_elf_relax_section): Use bfd_elf_get_elf_syms.
+	Properly free possibly cached info.
+	(mn10200_elf_relax_delete_bytes): Remove symbol swapping code.
+	(mn10200_elf_symbol_address_p): Pass in internal syms.  Remove
+	symbol swapping code.
+	(mn10200_elf_get_relocated_section_contents): Use bfd_elf_get_elf_syms.
+	Properly free possibly cached info.
+	* elf-m10300.c (mn10300_elf_relax_section): As above for elf-m10200.c.
+	(mn10300_elf_relax_delete_bytes): Likewise.
+	(mn10300_elf_symbol_address_p): Likewise.
+	(mn10300_elf_get_relocated_section_contents): Likewise.
+	* elf32-h8300.c (elf32_h8_relax_section): As above for elf-m10200.c.
+	(elf32_h8_relax_delete_bytes): Likewise.
+	(elf32_h8_symbol_address_p): Likewise.
+	(elf32_h8_get_relocated_section_contents): Likewise.
+	* elf32-m32r.c (m32r_elf_relax_section): As above for elf-m10200.c.
+	(m32r_elf_relax_delete_bytes): Likewise.
+	(m32r_elf_get_relocated_section_contents): Likewise.
+	* elf32-sh.c (sh_elf_reloc_loop): Free section contents using
+	elf_section_data to determine whether cached.
+	(sh_elf_relax_section): As above for elf-m10200.c.
+	(sh_elf_relax_delete_bytes): Likewise.
+	(sh_elf_get_relocated_section_contents): Likewise.
+	* elf32-xstormy16.c (xstormy16_elf_relax_section): As above.
+	* elf64-alpha.c (elf64_alpha_relax_section): As above.  Also delay
+	reading of local syms.
+	* elf64-mmix.c (mmix_elf_relax_section): Likewise.
+	* elf64-sh64.c (sh_elf64_get_relocated_section_contents): As above.
+	* elfxx-ia64.c (elfNN_ia64_relax_section): As above.
+	* elfxx-mips.c (_bfd_mips_elf_check_relocs): Properly free internal
+	relocs.
+	* elf32-arm.h (bfd_elf32_arm_process_before_allocation): Properly
+	free internal relocs and section contents.  Don't read symbols.
+	* elf32-hppa.c (get_local_syms): Use bfd_elf_get_elf_syms.
+	(elf32_hppa_size_stubs): Don't free local syms.
+	* elf32-m68k.c (bfd_m68k_elf32_create_embedded_relocs): Delay
+	reading of local syms.  Use bfd_elf_get_elf_syms.  Properly free
+	possibly cached info.
+	* elf32-mips.c (bfd_mips_elf32_create_embedded_relocs): Likewise.
+	* elf64-hppa.c (elf64_hppa_check_relocs): Use bfd_elf_get_elf_syms.
+	* elf64-ppc.c (struct ppc_link_hash_table): Delete bfd_count and
+	all_local_syms.
+	(get_local_syms): Delete function.
+	(edit_opd): Use bfd_elf_get_elf_syms.  Free on error exit.  Cache
+	on exit.
+	(ppc64_elf_size_stubs): Use bfd_elf_get_elf_syms.  Free/cache on exit.
+
+2002-07-05  Jim Wilson  <wilson@redhat.com>
+
+	* syms.c (decode_section_type): New.
+	(bfd_decode_symclass): Call decode_section_type.
+
+2002-07-04  Jakub Jelinek  <jakub@redhat.com>
+
+	* merge.c (_bfd_merged_section_offset): Avoid accessing byte before
+	section content start.
+	Reported by Michael Schumacher <mike@hightec-rt.com>.
+
+2002-07-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* section.c (_bfd_strip_section_from_output): Remove unnecessary
+	link order code.  Don't actually remove the output section here;
+	Just set a flag for the linker to do so.
+	* elflink.c (_bfd_elf_link_renumber_dynsyms): Test for removed
+	sections when setting up output section dynsyms.
+
+2002-07-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_link_add_object_symbols): Revert 1999-09-02 hpux
+	fudge.
+	* elf.c (bfd_section_from_shdr): Work around broken hpux shared
+	libs here instead.
+
+2002-07-02  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* elf64-s390.c (create_got_section): Set .got section alignment to
+	8 bytes.
+	(elf_s390_check_relocs): Set .rela.dyn section alignment to 8 bytes.
+
+2002-07-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (_bfd_elf_reloc_type_class): Fix comment grammar.
+
+2002-07-01  Matt Thomas  <matt@3am-software.com>
+
+	* elf32-vax.c (elf32_vax_print_private_bfd_data): Change EF_*
+	to EF_VAX_*.
+
+2002-07-01  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elfxx-mips.c (ABI_64_P): Fix comment.
+	(MIPS_ELF_OPTIONS_SECTION_NAME,MIPS_ELF_STUB_SECTION_NAME): Use the
+	new section names for N64 ABI.
+	(mips_elf_output_extsym): No special _gp_disp handling for NewABI.
+	(mips_elf_calculate_relocation): Code formatting.
+	(mips_elf_create_dynamic_relocation): Likewise.
+	(_bfd_mips_elf_fake_sections): IRIX6 needs this hack, too.
+	(_bfd_mips_elf_size_dynamic_sections): Handle GOT_PAGE for any NewABI.
+	(_bfd_mips_elf_relocate_section): No special handling for R_MIPS_64
+	in any NewABI.
+	(_bfd_mips_elf_finish_dynamic_symbol): No special _gp_disp handling
+	for NewABI.
+	(_bfd_mips_elf_modify_segment_map): Handle any N64 ABI.
+	(_bfd_mips_elf_gc_sweep_hook): NewABI GOT relocs should be handled
+	here, too.
+
+2002-07-01  Andreas Schwab  <schwab@suse.de>
+
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Only convert
+	R_X86_64_64 to R_X86_64_RELATIVE.
+
+2002-07-01  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* vaxbsd.c: New BFD backend for VAX BSD and Ultrix.
+	* Makefile.am (BFD32_BACKENDS, BFD32_BACKENDS_CFILES): Add new backend.
+	Run "make dep-am".
+	* config.bfd (vax-*-bsd* | vax-*-ultrix*): Use vaxbsd_vec instead of
+	host_aout_vec.
+	* configure.in (vaxbsd_vec): Add.
+	* targets.c (vaxbsd_vec): Add.
+	* Makefile.in: Rebuild.
+	* configure: Rebuild.
+	* po/SRC-POTFILES.in: Rebuild.
+
+2002-07-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_gc_mark): Pass in the section whose relocs we are
+	examining to gc_mark_hook, rather than the bfd.
+	(elf_gc_sections): Adjust.
+	* elf-bfd.h (struct elf_backend_data <gc_mark_hook>): Likewise.
+	* elf-m10300.c (mn10300_elf_gc_mark_hook): Likewise.
+	* elf32-arm.h (elf32_arm_gc_mark_hook): Likewise.
+	* elf32-avr.c (elf32_avr_gc_mark_hook): Likewise.
+	* elf32-cris.c (cris_elf_gc_mark_hook): Likewise.
+	* elf32-d10v.c (elf32_d10v_gc_mark_hook): Likewise.
+	* elf32-fr30.c (fr30_elf_gc_mark_hook): Likewise.
+	* elf32-hppa.c (elf32_hppa_gc_mark_hook): Likewise.
+	* elf32-i386.c (elf_i386_gc_mark_hook): Likewise.
+	* elf32-m32r.c (m32r_elf_gc_mark_hook): Likewise.
+	* elf32-m68k.c (elf_m68k_gc_mark_hook): Likewise.
+	* elf32-mcore.c (mcore_elf_gc_mark_hook): Likewise.
+	* elf32-openrisc.c (openrisc_elf_gc_mark_hook): Likewise.
+	* elf32-ppc.c (ppc_elf_gc_mark_hook): Likewise.
+	* elf32-s390.c (elf_s390_gc_mark_hook): Likewise.
+	* elf32-sh.c (sh_elf_gc_mark_hook): Likewise.
+	* elf32-sparc.c (elf32_sparc_gc_mark_hook): Likewise.
+	* elf32-v850.c (v850_elf_gc_mark_hook): Likewise.
+	* elf32-vax.c (elf_vax_gc_mark_hook): Likewise.
+	* elf32-xstormy16.c (xstormy16_elf_gc_mark_hook): Likewise.
+	* elf64-mmix.c (mmix_elf_gc_mark_hook): Likewise.
+	* elf64-ppc.c (ppc64_elf_gc_mark_hook): Likewise.
+	* elf64-s390.c (elf_s390_gc_mark_hook): Likewise.
+	* elf64-sh64.c (sh_elf64_gc_mark_hook): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_gc_mark_hook): Likewise.
+	* elfxx-mips.h (_bfd_mips_elf_gc_mark_hook): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_gc_mark_hook): Likewise.
+	* elf32-frv.c (elf32_frv_gc_mark_hook): Likewise.  Also remove
+	redundant local sym tests.
+	* elf64-ppc.c (struct ppc_link_hash_entry): Add is_entry.
+	(link_hash_newfunc): Init is_entry.
+	(ppc64_elf_copy_indirect_symbol): Copy is_entry.
+	(ppc64_elf_link_hash_table_create): Init all_local_syms.
+	(create_linkage_sections): Use bfd_make_section_anyway rather than
+	bfd_make_section.
+	(ppc64_elf_mark_entry_syms): New function.
+	(ppc64_elf_check_relocs): Don't bother testing elf_bad_symtab.  Set
+	up opd entry to function section map.
+	(ppc64_elf_gc_mark_hook): Special case opd section relocs, and
+	relocs that reference the opd section.
+	(edit_opd): New function.
+	(ppc64_elf_size_dynamic_sections): Call get_local_syms and edit_opd.
+	(ppc64_elf_setup_section_lists): Don't calculate htab->bfd_count here.
+	(get_local_syms): Do so here.  Exit if we already have local syms.
+	Remove bogus comment imported from elf32-hppa.c.  Don't attempt to
+	read local syms on non-ELF input.
+	(ppc64_elf_size_stubs): Call _bfd_elf64_link_read_relocs rather
+	than duplicating it's function here.  Adjust free of internal
+	relocs to suit.
+	(ppc64_elf_relocate_section): Adjust local syms in opd section.
+	* elf64-ppc.h (ppc64_elf_mark_entry_syms): Declare.
+	* elf32-hppa.c (elf32_hppa_size_stubs): Call
+	_bfd_elf32_link_read_relocs rather than duplicating it's function
+	here.  Adjust free of internal relocs to suit.
+
+2002-07-01  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-x86-64.c (elf64_x86_64_check_relocs): Certain relocations
+	are not allowed in shared libs code, enforce -fPIC.
+
+2002-06-29  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* mmo.c (mmo_write_loc_chunk): Don't eliminate leading and
+	trailing zero-sequences when there's previous left-over data.
+
+2002-06-27  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* elf64-hppa.c (elf64_hppa_reloc_type_class): New function.
+	(elf64_hppa_finish_dynamic_sections): Check other_rel_sec, dlt_rel_sec
+	and opd_rel_sec in order for starting rela section.  Check _raw_size.
+	(elf_backend_reloc_type_class): Define.
+
+2002-06-27  Kevin Buettner <kevinb@redhat.com>
+
+	* dwarf2.c (decode_line_info): Handle older, non-standard, 64-bit
+	DWARF2 formats.
+
+2002-06-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* cpu-powerpc.c: Comment on ordering of arch_info.
+	* elf32-ppc.c (ppc_elf_object_p): New function.
+	(elf_backend_object_p): Define.
+	* elf64-ppc.c (ppc64_elf_object_p): New function.
+	(elf_backend_object_p): Define.
+
+2002-06-26  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* configure.in (vax-*-netbsd*): Set COREFILE to netbsd-core.lo.
+	* configure: Regenerate.
+
+2002-06-25  Jason Eckhardt  <jle@rice.edu>
+
+	* dwarf2.c (decode_line_info): Check unit->addr_size
+	to read in the proper number of prologue bytes.
+
+2002-06-25  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* config.bfd (powerpc-*-aix5*): Only create a selvecs for
+	aix5coff64_vec if 64-bit bfd support has been enabled.
+	(powerpc64-*-aix5*): Only define if 64-bit bfd support has
+	been enabled.
+
+	* targets.c (_bfd_target_vector[]): Only include
+	aix5coff64_vec if 64-bit bfd support has been enabled.
+
+2002-06-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc_add_stub): Replace strcpy/strncpy with memcpy.
+	* elf32-hppa.c (hppa_add_stub): Likewise.
+	* elflink.c (_bfd_elf_link_record_dynamic_symbol): Likewise.
+	* elflink.h (elf_add_default_symbol): Fix comment typo.
+	(elf_add_default_symbol): Replace strcpy and strncpy with memcpy.
+	(elf_link_add_object_symbols): Likewise.
+	(elf_link_assign_sym_version): Likewise.
+	* hash.c (bfd_hash_lookup): Likewise.
+	* linker.c (_bfd_generic_link_add_one_symbol): Likewise.
+	* section.c (bfd_get_unique_section_name): Likewise.
+	* syms.c (_bfd_stab_section_find_nearest_line): Likewise.
+	* elf.c (_bfd_elf_make_section_from_phdr): Likewise.
+	(assign_section_numbers): Likewise.
+	(_bfd_elfcore_make_pseudosection): Likewise.
+	(elfcore_grok_lwpstatus): Likewise.
+	(elfcore_grok_win32pstatus): Likewise.
+	(elfcore_write_note): Constify input params.  Use PTR instead of
+	void *.  Include terminating NUL in namesz.  Correct padding.
+	Support NULL "name" param.  Use memcpy instead of strcpy.
+	(elfcore_write_prpsinfo): Constify input params.
+	(elfcore_write_prstatus): Likewise.  Use PTR instead of void *.
+	(elfcore_write_lwpstatus): Likewise.
+	(elfcore_write_pstatus): Likewise.
+	(elfcore_write_prfpreg): Likewise.
+	(elfcore_write_prxfpreg): Likewise.
+	* elf-bfd.h (elfcore_write_note): Update declaration.
+	(elfcore_write_prpsinfo): Likewise.
+	(elfcore_write_prstatus): Likewise.
+	(elfcore_write_pstatus): Likewise.
+	(elfcore_write_prfpreg): Likewise.
+	(elfcore_write_prxfpreg): Likewise.
+	(elfcore_write_lwpstatus): Likewise.
+
+2002-06-25  Jason Eckhardt  <jle@rice.edu>
+
+	* ecoff.c (ecoff_set_symbol_info): Set BSF_FUNCTION for
+	symbols of type stProc and stStaticProc.
+
+2002-06-25  Nick Clifton  <nickc@redhat.com>
+
+	* ecoff.c: VArious formatting fixes.
+
+2002-06-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* coff-rs6000.c (xcoff_generate_rtinit): Fix typo.
+
+2002-06-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* aout-adobe.c: Don't compare against "true" or "false.
+	* aout-target.h: Likewise.
+	* aoutx.h: Likewise.
+	* archive.c: Likewise.
+	* bout.c: Likewise.
+	* cache.c: Likewise.
+	* coff-a29k.c: Likewise.
+	* coff-alpha.c: Likewise.
+	* coff-i386.c: Likewise.
+	* coff-mips.c: Likewise.
+	* coff-or32.c: Likewise.
+	* coff64-rs6000.c: Likewise.
+	* coffcode.h: Likewise.
+	* coffgen.c: Likewise.
+	* cpu-ns32k.c: Likewise.
+	* ecoff.c: Likewise.
+	* ecofflink.c: Likewise.
+	* elf.c: Likewise.
+	* elf32-arm.h: Likewise.
+	* elf32-cris.c: Likewise.
+	* elf32-d30v.c: Likewise.
+	* elf32-i386.c: Likewise.
+	* elf32-mcore.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-sh.c: Likewise.
+	* elf32-sh64.c: Likewise.
+	* elf32-v850.c: Likewise.
+	* elf64-alpha.c: Likewise.
+	* elf64-sh64.c: Likewise.
+	* elfcode.h: Likewise.
+	* elfcore.h: Likewise.
+	* elflink.h: Likewise.
+	* elfxx-mips.c: Likewise.
+	* i386os9k.c: Likewise.
+	* ieee.c: Likewise.
+	* libbfd.c: Likewise.
+	* linker.c: Likewise.
+	* mmo.c: Likewise.
+	* nlm32-alpha.c: Likewise.
+	* nlm32-i386.c: Likewise.
+	* nlm32-ppc.c: Likewise.
+	* nlm32-sparc.c: Likewise.
+	* nlmcode.h: Likewise.
+	* oasys.c: Likewise.
+	* pdp11.c: Likewise.
+	* peicode.h: Likewise.
+	* reloc.c: Likewise.
+	* som.c: Likewise.
+	* srec.c: Likewise.
+	* tekhex.c: Likewise.
+	* vms.c: Likewise.
+	* xcofflink.c: Likewise.
+	* elf64-sparc.c: Edit comment to not use "== false".
+
+	* aoutf1.h: Don't use "? true : false".
+	* ecoff.c: Likewise.
+	* format.c: Likewise.
+	* ieee.c: Likewise.
+	* linker.c: Likewise.
+	* mmo.c: Likewise.
+	* oasys.c: Likewise.
+
+2002-06-23  H.J. Lu  <hjl@gnu.org>
+
+	* elflink.h (elf_link_add_archive_symbols): For the default
+	version, check references with only one `@' first.
+
+2002-06-23  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* elf64-hppa.c (elf64_hppa_mark_milli_and_exported_functions): New
+	function.
+	(allocate_global_data_dlt): Don't add millicode symbols to dynamic
+	symbol table.
+	(allocate_global_data_opd, allocate_dynrel_entries): Likewise.
+	(elf64_hppa_size_dynamic_sections): Revise to use
+	elf64_hppa_mark_milli_and_exported_functions.
+	(elf64_hppa_finish_dynamic_symbol): Remove code to keep millicode
+	symbols out of dynamic symbol table.
+
+2002-06-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* configure: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+	* elflink.h: Comment typo fixes.
+
+2002-06-23  H.J. Lu  <hjl@gnu.org>
+
+	* elf-bfd.h (elf_link_loaded_list): New structure.
+	(elf_link_hash_table): Add "loaded".
+	* elf.c (_bfd_elf_link_hash_table_init): Initialize "loaded".
+	* elflink.h (elf_link_check_versioned_symbol): New function.
+	(elf_link_output_extsym): Call elf_link_check_versioned_symbol.
+
+2002-06-19  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elflink.h (size_dynamic_sections): If the target does not
+	support an ELF style hash table, return true, indicating that
+	nothing needed to be done, rather than false, indicating that the
+	section's size could not be computed.
+
+2002-06-18  Dave Brolley  <brolley@redhat.com>
+
+	From Catherine Moore, Michael Meissner, Dave Brolley:
+	* po/SRC-POTFILES.in: Add cpu-frv.c and elf32-frv.c
+	* targets.c: Support bfd_elf32_frv_vec.
+	* reloc.c: Add FRV relocs.
+	* configure.in: Add support for bfd-elf32-frv-vec.
+	* config.bfd (targ_cpu): Add support for frv-*-elf.
+	* archures.c: Add frv arch and machines.
+	* Makefile.am (ALL_MACHINES): Add cpu-frv.lo.
+	(ALL_MACHINES_CFILES): Add cpu-frv.c.
+	(BFD32_BACKENDS): Add elf32-frv.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-frv.c
+	(cpu-frv.lo): New target.
+	(elf32-frv.lo): New target.
+	* cpu-frv.c: New file.
+	* elf32-frv.c: New file.
+
+2002-06-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* elfcode.h (elf_object_p): Sanity check eh_shoff == 0 implies
+	e_shnum == 0.
+	Only read the first section header if e_shoff is non-zero.
+	Don't consider e_shstrndx if there are no sections.
+
+2002-06-17  Tom Rix <trix@redhat.com>
+
+	* elf32-d10v.c (elf_d10v_howto_table): Change R_D10V_10_PCREL_R,
+	R_D10V_10_PCREL_L and R_D10V_18_PCREL to use
+	complain_overflow_bitfield.
+
+2002-06-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* opncls.c (bfd_openr): Remove redundant bfd_set_error.
+	(bfd_fdopenr): Likewise.
+	(bfd_openstreamr): Likewise.
+	(bfd_openw): Likewise.
+
+	* targets.c: Sort target vecs.
+	(_bfd_target_vector): Add aix5coff64_vec, bfd_elf32_sh64_vec,
+	bfd_elf32_sh64l_vec, bfd_elf32_sh64lnbsd_vec,
+	bfd_elf32_sh64nbsd_vec, bfd_elf64_sh64_vec, bfd_elf64_sh64l_vec,
+	bfd_elf64_sh64lnbsd_vec, bfd_elf64_sh64nbsd_vec.
+	* configure.in: Sort target vecs.  Add m88kmach3_vec.
+	* configure: Regenerate.
+
+2002-06-16  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* elf64-mmix.c (bpo_reloc_request_sort_fn): Use member
+	bpo_reloc_no to break sort order ties, not address of items.
+
+2002-06-16  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* elf-hppa.h (elf_hppa_final_link): Fix formatting in comment.
+	Skip excluded sections in determing __gp value.
+	(elf_hppa_final_link_relocate): Use the symbol's address in
+	R_PARISC_FPTR64 relocations that don't need an opd entry.
+	* elf64-hppa.c (allocate_dynrel_entries): Simplify code.
+	(elf64_hppa_finalize_dynreloc): Likewise.
+	(elf64_hppa_size_dynamic_sections): Move comments and fix typo.
+	(elf64_hppa_finish_dynamic_symbol): Break up assert.
+
+2002-06-14  Sergey Grigoriev  <serge@leopold.Physik.Uni-Augsburg.DE>
+
+	* pei-i386.c (COFF_SECTION_ALIGNMENT_ENTRIES): Enable 16 byte
+	alignment for .bss, .data and .text sections so that sse and sse2
+	code will work.
+	* pe-i386.c (COFF_SECTION_ALIGNMENT_ENTRIES): Likewise.
+
+2002-06013  J"orn Rennecke  <joern.rennecke@superh.com>
+
+	config.bfd: Add support for sh[1234]l*-*-elf* | sh3el*-*-elf*,
+	sh[1234]*-elf*.
+
+2002-06-12  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* elflink.h (elf_bfd_final_link): Improve error handling for missing
+	dynamic sections.
+
+	* elf64-hppa.c (allocate_global_data_opd): We don't need an opd entry
+	for a symbol that has no output section.
+	(allocate_dynrel_entries): Correct comment.
+	(elf64_hppa_finalize_dynreloc): Likewise.  Don't create an opd entry
+	unless we want one.
+	(elf64_hppa_finalize_opd): Prevent segfault if dyn_h is NULL.
+	(elf64_hppa_finalize_dlt): Likewise.  Prevent segfault for symbols
+	with no section.  Remove unnecessary parentheses.
+
+2002-06-11  Tom Rix  <trix@redhat.com>
+
+	* coffcode.h (coff_compute_section_file_positions): Add data
+	section to AIX loader alignment check.
+
+	* coff-rs6000.c (_bfd_xcoff_mkobject): Set default text section
+	alignment to 4 bytes.
+	(_bfd_xcoff_copy_private_bfd_data): Use text and data alignment
+	power accessor macro.
+	(do_shared_object_padding): Remove invalid assertion.
+
+2002-06-10  Richard Sandiford  <rsandifo@redhat.com>
+
+	* section.c (_bfd_strip_section_from_output): Set SEC_EXCLUDE
+	for removed output sections.
+
+2002-06-10  Geoffrey Keating  <geoffk@redhat.com>
+
+	* merge.c (merge_strings): Use htab_create_alloc with calloc, not
+	htab_alloc.
+	* elf-strtab.c (_bfd_elf_strtab_finalize): Likewise.
+
+2002-06-08  H.J. Lu <hjl@gnu.org>
+
+	* elf.c (copy_private_bfd_data): Don't cast to bfd_size_type to
+	work around a long long bug in gcc 2.96 on mips.
+
+2002-06-08  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* Makefile.am (BFD32_BACKENDS): Add vax1knetbsd.lo.
+	(BFD32_BACKENDS_CFILES): Add vax1knetbsd.c.
+	Regenerate dependency lists.
+	* Makefile.in: Regenerate.
+	* config.bfd (vax-*-netbsdelf*, vax-*-netbsdaout*): Add
+	vax1knetbsd_vec to targ_selvecs.
+	* configure.in: Add vax1knetbsd_vec.
+	* configure: Regenerate.
+	* targets.c (_bfd_target_vector): Add vax1knetbsd_vec.
+	* vax1knetbsd.c: New file.
+	* vaxnetbsd.c: Update copyright years.
+	(TARGET_PAGE_SIZE): Set to 0x1000.
+	(DEFAULT_MID): Set to M_VAX4K_NETBSD.
+
+2002-06-08  Matt Thomas  <matt@3am-software.com>
+
+	* libaout.h (enum machine_type): Add M_VAX4K_NETBSD.
+
+2002-06-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-sh64.c (sh64_elf64_link_output_symbol_hook): Make static.
+
+2002-06-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+	* armnetbsd.c: Replace CONST with const.
+	* corefile.c: Likewise.
+	* elf32-dlx.c: Likewise.
+	* elf64-mips.c: Likewise.
+	* mmo.c: Likewise.
+	* ns32knetbsd.c: Likewise.
+
+	* elf64-sparc.c (sparc64_elf_add_symbol_hook): Check the hash
+	table is elf64-sparc.
+
+2002-06-08  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elfxx-mips.c (_bfd_mips_elf_relocate_section): Simplify code.
+	Fix RELA addends to get not shifted in the result. Don't do special
+	handling of R_MIPS_64 for NewABI.
+
+2002-06-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* aoutx.h (NAME(aout,slurp_symbol_table)): Use bfd_zmalloc.
+	(NAME(aout,slurp_reloc_table)): Likewise.
+	* coff-mips.c (mips_relax_section): Use bfd_zalloc.
+	* coff-rs6000.c (xcoff_write_armap_big): Use bfd_zmalloc.
+	(xcoff_write_archive_contents_big): Likewise.
+	(xcoff_generate_rtinit): Likewise.
+	(xcoff_generate_rtinit): Likewise, and check error return.
+	* coff64-rs6000.c (xcoff64_generate_rtinit): Likewise.
+	* coffgen.c (coff_section_symbol): Use bfd_zalloc.
+	(coff_get_normalized_symtab): Likewise.
+	(coff_make_empty_symbol): Likewise.
+	(bfd_coff_set_symbol_class): Likewise.
+	* cofflink.c (coff_link_add_symbols): Likewise.
+	* ecoff.c (_bfd_ecoff_make_empty_symbol): Likewise.
+	* ecofflink.c (ecoff_write_shuffle): Use bfd_zmalloc.
+	(bfd_ecoff_write_accumulated_debug): Likewise.
+	* elf64-alpha.c (get_got_entry): Use bfd_zalloc.
+	* i386linux.c (bfd_i386linux_size_dynamic_sections): Likewise.
+	* i386lynx.c (NAME(lynx,slurp_reloc_table)): Use bfd_zmalloc.
+	* ieee.c (do_with_relocs): Use bfd_zalloc.
+	* m68klinux.c (bfd_m68klinux_size_dynamic_sections): Likewise.
+	* pdp11.c (NAME(aout,slurp_symbol_table)): Use bfd_zmalloc.
+	(NAME(aout,slurp_reloc_table)): Likewise.
+	(NAME(aout,squirt_out_relocs)): Don't memset when zalloc'd.
+	* reloc16.c (bfd_coff_reloc16_relax_section): Use bfd_zmalloc.
+	* som.c (som_build_and_write_symbol_table): Likewise.
+	(som_slurp_string_table): Likewise.
+	(som_slurp_symbol_table): Likewise.
+	(som_bfd_ar_write_symbol_stuff): Likewise.
+	* sparclinux.c (bfd_sparclinux_size_dynamic_sections): Use bfd_zalloc.
+	* sunos.c (bfd_sunos_size_dynamic_sections): Likewise.
+	* tekhex.c (find_chunk): Likewise.  Get rid of unused "sname".
+	* vms-gsd.c (_bfd_vms_slurp_gsd): Use bfd_zmalloc.
+	* xcofflink.c (xcoff_link_add_symbols): Use bfd_zalloc/bfd_zmalloc.
+
+2002-06-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct bfd_elf_section_data <group_name>): Replace with
+	"group" union.
+	(elf_group_name): Update.
+	(elf_group_id): Define.
+	(bfd_elf_set_group_contents): Declare.
+	* elf.c (elf_fake_sections): Qualify use of elf_group_name.
+	(set_group_contents): Rename to bfd_elf_set_group_contents.  Remove
+	ATTRIBUTE_UNUSED from failedptrarg.  If elf_group_id is set, use
+	that sym for the signature.
+	(_bfd_elf_compute_section_file_positions): Don't call
+	set_group_contents for "ld -r" case.
+	(swap_out_syms): Use bfd_zalloc.
+	* elflink.h (elf_link_add_archive_symbols): Likewise.
+	(NAME(bfd_elf,size_dynamic_sections)): Likewise.
+	(elf_bfd_final_link): Call bfd_elf_set_group_contents.
+
+2002-06-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_relocate_section): Allow unresolved
+	relocs in opd for non-shared too.
+
+2002-06-06  Jeffrey Law  <law@redhat.com>
+
+	* elf32-h8300.c (elf32_h8_relax_section): Ignore uninteresting
+	relocations.
+
+2002-06-06  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* merge.c: Include libiberty.h.
+	* elf-strtab.c: Include libiberty.h.
+
+2002-06-06  Elias Athanasopoulos  <eathan@otenet.gr>
+
+	* peXXigen.c (pe_print_idata): Remove unused variable.
+
+2002-06-06  David Heine <dlheine@tensilica.com>
+
+	* elf.c (assign_file_positions_for_segments): Remove unallocated
+	sections from the section to segment mapping for PT_LOAD segments.
+	Update comment about empty loadable segments.
+
+2002-06-06  Richard Sandiford  <rsandifo@redhat.com>
+
+	* stabs.c (_bfd_link_section_stabs): Check that the symbol offset
+	is within the .stabstr section.
+
+2002-06-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_size_info <swap_symbol_in>): Function args
+	are "const PTR", not "const PTR *".
+	(bfd_elf32_swap_symbol_in): Likewise.
+	(bfd_elf64_swap_symbol_in): Likewise.
+	* elfcode.h (elf_swap_symbol_in): Change input args to const PTR.
+	(elf_slurp_symbol_table): Adjust call to elf_swap_symbol_in.
+	* elflink.h (elf_link_is_defined_archive_symbol): Likewise.
+	(elf_link_add_object_symbols): Likewise.
+	(elf_link_record_local_dynamic_symbol): Likewise.
+	(elf_link_input_bfd): Likewise.
+	(elf_gc_mark): Likewise.
+	(elf_reloc_symbol_deleted_p): Likewise.
+	* elf-m10200.c (mn10200_elf_relax_section): Likewise.
+	(mn10200_elf_relax_delete_bytes): Likewise.
+	(mn10200_elf_symbol_address_p): Likewise.
+	(mn10200_elf_get_relocated_section_contents): Likewise.
+	* elf-m10300.c (mn10300_elf_relax_section): Likewise.
+	(mn10300_elf_relax_section): Likewise.
+	(mn10300_elf_relax_delete_bytes): Likewise.
+	(mn10300_elf_symbol_address_p): Likewise.
+	(mn10300_elf_get_relocated_section_contents): Likewise.
+	* elf32-h8300.c (elf32_h8_relax_section): Likewise.
+	(elf32_h8_relax_delete_bytes): Likewise.
+	(elf32_h8_symbol_address_p): Likewise.
+	(elf32_h8_get_relocated_section_contents): Likewise.
+	* elf32-hppa.c (get_local_syms): Likewise.
+	* elf32-m68k.c (bfd_m68k_elf32_create_embedded_relocs): Likewise.
+	* elf32-mips.c (bfd_mips_elf32_create_embedded_relocs): Likewise.
+	* elf32-sh.c (sh_elf_relax_section): Likewise.
+	(sh_elf_relax_delete_bytes): Likewise.
+	(sh_elf_get_relocated_section_contents): Likewise.
+	* elf32-xstormy16.c (xstormy16_elf_relax_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relax_section): Likewise.
+	* elf64-hppa.c (elf64_hppa_check_relocs): Likewise.
+	* elf64-mmix.c (mmix_elf_relax_section): Likewise.
+	* elf64-ppc.c (get_local_syms): Likewise.
+	* elf64-sh64.c (sh_elf64_get_relocated_section_contents): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Likewise.
+
+2002-06-05  J"orn Rennecke <joern.rennecke@superh.com>
+
+	* config.bfd (sh64l*-*-elf*, shl*-*-elf*): New configurations.
+
+2002-06-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (group_signature): Swap in the whole symbol, and handle
+	extracting section symbol names.
+	(setup_group): Add comment.
+	(set_group_contents): When called from objcopy or ld, arrange for
+	section contents to be written.  Write group member output section
+	indices to allow objcopy to reorganize sections.
+	(_bfd_elf_copy_private_section_data): Copy group info.
+
+	* elf-bfd.h (struct elf_size_info): Add swap_symbol_in field.
+	(bfd_elf32_swap_symbol_in): Update prototype.
+	(bfd_elf64_swap_symbol_in): Likewise.
+	* elfcode.h (elf_swap_symbol_in): Change input args to const PTR *.
+	(elf_slurp_symbol_table): Adjust call to elf_swap_symbol_in.
+	* elflink.h (elf_link_is_defined_archive_symbol): Likewise.
+	(elf_link_add_object_symbols): Likewise.
+	(elf_link_record_local_dynamic_symbol): Likewise.
+	(elf_link_input_bfd): Likewise.
+	(elf_gc_mark): Likewise.
+	(elf_reloc_symbol_deleted_p): Likewise.
+	* elf-m10200.c (mn10200_elf_relax_section): Likewise.
+	(mn10200_elf_relax_delete_bytes): Likewise.
+	(mn10200_elf_symbol_address_p): Likewise.
+	(mn10200_elf_get_relocated_section_contents): Likewise.
+	* elf-m10300.c (mn10300_elf_relax_section): Likewise.
+	(mn10300_elf_relax_section): Likewise.
+	(mn10300_elf_relax_delete_bytes): Likewise.
+	(mn10300_elf_symbol_address_p): Likewise.
+	(mn10300_elf_get_relocated_section_contents): Likewise.
+	* elf32-h8300.c (elf32_h8_relax_section): Likewise.
+	(elf32_h8_relax_delete_bytes): Likewise.
+	(elf32_h8_symbol_address_p): Likewise.
+	(elf32_h8_get_relocated_section_contents): Likewise.
+	* elf32-hppa.c (get_local_syms): Likewise.
+	* elf32-m68k.c (bfd_m68k_elf32_create_embedded_relocs): Likewise.
+	* elf32-mips.c (bfd_mips_elf32_create_embedded_relocs): Likewise.
+	* elf32-sh.c (sh_elf_relax_section): Likewise.
+	(sh_elf_relax_delete_bytes): Likewise.
+	(sh_elf_get_relocated_section_contents): Likewise.
+	* elf32-xstormy16.c (xstormy16_elf_relax_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relax_section): Likewise.
+	* elf64-hppa.c (elf64_hppa_check_relocs): Likewise.
+	* elf64-mmix.c (mmix_elf_relax_section): Likewise.
+	* elf64-ppc.c (get_local_syms): Likewise.
+	* elf64-sh64.c (sh_elf64_get_relocated_section_contents): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Likewise.
+	* elfcode.h (NAME(_bfd_elf,size_info)): Update initialiser.
+	* elf64-alpha.c (alpha_elf_size_info): Likewise.
+	* elf64-hppa.c (hppa64_elf_size_info): Likewise.
+	* elf64-mips.c (mips_elf64_size_info): Likewise.
+	* elf64-s390.c (s390_elf64_size_info): Likewise.
+	* elf64-sparc.c (sparc64_elf_size_info): Likewise.
+
+2002-06-05  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+	* elf32-mips.c (elf32_mips_ignore_discarded_relocs): Move to...
+	elfxx-mips.c (_bfd_mips_elf_ignore_discarded_relocs): ... here.
+	elf64-mips.c (elf_backend_ignore_discarded_relocs): Use
+	_bfd_mips_elf_ignore_discarded_relocs.
+	elfxx-mips.h (_bfd_mips_elf_ignore_discarded_relocs): Declare.
+
+2002-06-05  H.J. Lu <hjl@gnu.org>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): Call
+	_bfd_elf_rel_local_sym for STT_SECTION relocations against
+	the SEC_MERGE section.
+
+2002-06-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* coff-alpha.c: Update copyright date.
+	* coff-mips.c: Likewise.
+	* xcoff-target.h: Likewise.
+
+	* bfd-in.h: Remove "taken from the source" comment.
+	* libbfd-in.h: Likewise.
+	* libcoff-in.h: Likewise.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* libcoff.h: Regenerate.
+
+	* elf.c (bfd_elf_discard_group): Return true.
+	* elf-bfd.h (bfd_elf_discard_group): Declare.
+	* bfd-in.h (bfd_elf_discard_group): Don't declare here.
+	* section.c (bfd_discard_group): Rename to bfd_generic_discard_group.
+	* bfd.c (bfd_discard_group): Define.
+	* targets.c (struct bfd_target): Add _bfd_discard_group.
+	(BFD_JUMP_TABLE_LINK): Here too.
+	* libbfd-in.h (_bfd_nolink_bfd_discard_group): Define.
+	* aout-adobe.c (aout_32_bfd_discard_group): Define.
+	* aout-target.h (MY_bfd_discard_group): Define.
+	* aout-tic30.c (MY_bfd_discard_group): Define.
+	* binary.c (binary_bfd_discard_group): Define.
+	* bout.c (b_out_bfd_discard_group): Define.
+	* coff-alpha.c (_bfd_ecoff_bfd_discard_group): Define.
+	* coffcode.h (coff_bfd_discard_group): Define.
+	* coff-mips.c (_bfd_ecoff_bfd_discard_group): Define.
+	* elfxx-target.h (bfd_elfNN_bfd_discard_group): Define.
+	* i386msdos.c (msdos_bfd_discard_group): Define.
+	* i386os9k.c (os9k_bfd_discard_group): Define.
+	* ieee.c (ieee_bfd_discard_group): Define.
+	* ihex.c (ihex_bfd_discard_group): Define.
+	* mmo.c (mmo_bfd_discard_group): Define.
+	* nlm-target.h (nlm_bfd_discard_group): Define.
+	* oasys.c (oasys_bfd_discard_group): Define.
+	* ppcboot.c (ppcboot_bfd_discard_group): Define.
+	* som.c (som_bfd_discard_group): Define.
+	* srec.c (srec_bfd_discard_group): Define.
+	* tekhex.c (tekhex_bfd_discard_group): Define.
+	* versados.c (versados_bfd_discard_group): Define.
+	* vms.c (vms_bfd_discard_group): Define.
+	* xcoff-target.h (_bfd_xcoff_bfd_discard_group): Define.
+	* coff64-rs6000.c (rs6000coff64_vec): Update initialiser.
+	(aix5coff64_vec): Likewise.
+	* coff-rs6000.c (rs6000coff_vec, pmac_xcoff_vec): Likewise.
+
+2002-06-04  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* Makefile.am (BFD32_BACKENDS): Add elf32-sh64-com.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-sh64-com.c.
+	(elf32-sh64-com.lo): New dependency list.
+	* Makefile.in: Regenerate.
+	* configure.in (bfd_elf32_sh64_vec, bfd_elf32_sh64l_vec)
+	(bfd_elf32_sh64nbsd_vec, bfd_elf32_sh64lnbsd_vec): Add
+	elf32-sh64-com.lo.
+	* configure: Regenerate.
+	* elf32-sh64.c (sh64_address_in_cranges)
+	(sh64_get_contents_type, sh64_address_is_shmedia): Move to...
+	(crange_qsort_cmpb, crange_qsort_cmpl, crange_bsearch_cmpb):
+	(crange_bsearch_cmpl): Prepend _bfd_sh64_ to name and move to...
+	* elf32-sh64-com.c: ...here.  New file.
+
+2002-06-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-openrisc.c (openrisc_elf_gc_mark_hook): Remove
+	ATTRIBUTE_UNUSED on used params.
+	* elf32-vax.c (elf_vax_gc_mark_hook): Remove unnecessary checks
+	before calling bfd_section_from_elf_index on local syms.
+	* elf64-sh64.c (sh_elf64_gc_mark_hook): Likewise.
+
+2002-06-04  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* Makefile.am (BFD32_BACKENDS): Add elf32-sh64-nbsd.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-sh64-nbsd.c.
+	(BFD64_BACKENDS): Add elf64-sh64-nbsd.lo.
+	(BFD64_BACKENDS_CFILES): Add elf64-sh64-nbsd.c.
+	(elf32-sh64-nbsd.lo, elf64-sh64-nbsd.lo): New rules.
+	* Makefile.in: Regenerate.
+	* config.bfd (sh5le-*-netbsd*, sh5-*-netbsd*, sh64le-*-netbsd*)
+	(sh64-*-netbsd*): New targets.
+	* configure.in: Add bfd_elf32_sh64nbsd_vec, bfd_elf32_sh64lnbsd_vec,
+	bfd_elf64_sh64nbsd_vec, and bfd_elf64_sh64lnbsd_vec.
+	* configure: Regenerate.
+	* elf32-sh64-nbsd.c: New file.
+	* elf64-sh64-nbsd.c: New file.
+	* targets.c: Add extern decls for bfd_elf32_sh64nbsd_vec,
+	bfd_elf32_sh64lnbsd_vec, bfd_elf64_sh64nbsd_vec, and
+	bfd_elf64_sh64lnbsd_vec.
+
+2002-06-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (setup_group): Set SEC_LINK_ONCE on GRP_COMDAT groups.
+	(bfd_section_from_shdr): Likewise.  Set section name of group
+	sections from signature.
+	(group_signature): Split out from setup_group.  Ensure symbol table
+	is available.
+	(bfd_elf_discard_group): New function.
+	(_bfd_elf_make_section_from_shdr): Don't set SEC_LINK_ONCE on
+	.gnu.linkonce* sections if they are members of a group.
+	(set_group_contents): Set GRP_COMDAT flag.
+	* section.c (bfd_discard_group): New function.
+	* bfd-in.h (bfd_elf_discard_group): Declare.
+	* bfd-in2.h: Regenerate.
+	* elf-bfd.h (struct bfd_elf_section_data): Add linkonce_p field.
+	(elf_linkonce_p): Define.
+
+2002-06-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (bfd_section_from_shdr): Make "name" const.
+	* elf-bfd.h (elf_backend_section_from_shdr): Likewise.
+	* elf32-i370.c (i370_elf_section_from_shdr): Likewise.
+	* elf32-ppc.c (ppc_elf_section_from_shdr): Likewise.
+	* elf32-sh64.c (sh64_backend_section_from_shdr): Likewise.
+	* elf32-v850.c (v850_elf_section_from_shdr): Likewise.
+	* elf64-alpha.c (elf64_alpha_section_from_shdr): Likewise.
+	* elf64-hppa.c (elf64_hppa_section_from_shdr): Likewise.
+	* elf64-ppc.c (ppc64_elf_section_from_shdr): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_section_from_shdr): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_section_from_shdr): Likewise.
+	* elfxx-mips.h (_bfd_mips_elf_section_from_shdr): Likewise.
+
+2002-06-03  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+	* elfxx-mips.c (ABI_64_P): Use backend's data to determine the
+	ABI.
+
+2002-06-02  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* elf32-arc.c: Fix formatting.
+	* elf32-arm.h: Likewise.
+	* elf32-cris.c: Likewise.
+	* elf32-dlx.c: Likewise.
+	* elf32-hppa.c: Likewise.
+	* elf32-i386.c: Likewise.
+	* elf32-i386qnx.c: Likewise.
+	* elf32-or32.c: Likewise.
+	* elf32-s390.c: Likewise.
+	* elf32-sh64.c: Likewise.
+	* elf32-vax.c: Likewise.
+	* elf32-xstormy16.c: Likewise.
+	* elf64-alpha.c: Likewise.
+	* elf64-mmix.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf64-s390.c: Likewise.
+	* elf64-sh64.c: Likewise.
+	* elf64-x86-64.c: Likewise.
+
+2002-06-02  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_relocate_section): Don't dereference
+	null when there are no got entries for a symbol.
+	(elf64_alpha_relax_find_tls_segment): Rearrange to avoid
+	uninitialized variable warning.
+
+2002-06-01  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_relax_with_lituse): Don't test for
+	undefined symbols here.
+	(elf64_alpha_relax_section): Do it here.  Also test for not
+	defined in the current module.
+	(elf64_alpha_relocate_section_r): Split out of ...
+	(elf64_alpha_relocate_section): ... here.  Don't dereference
+	NULL when looking up local got entries.
+
+2002-06-01  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_relax_with_lituse): Reject undefined
+	symbols from JSR relaxation.
+	(elf64_alpha_size_plt_section_1): New.
+	(elf64_alpha_calc_dynrel_sizes): Split out .rela.got bits ...
+	(elf64_alpha_size_rela_got_1): ... here.
+	(elf64_alpha_size_dynamic_sections): Split out .rela.got bits ...
+	(elf64_alpha_size_rela_got_section): ... here.
+	(elf64_alpha_size_plt_section): New.
+	(elf64_alpha_relax_section): Call them.
+	(elf64_alpha_size_got_sections): Remove output_bfd arg.
+	(elf64_alpha_finish_dynamic_symbol): Check gotent use_count.
+
+2002-06-01  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (alpha_get_dtprel_base, alpha_get_tprel_base): New.
+	(elf64_alpha_relocate_section): Use them.  Reject LE TLS relocs
+	in shared libraries.  Fix DTPRELHI and TPRELHI value.
+	(INSN_ADDQ, INSN_RDUNIQ): New.
+	(struct alpha_relax_info): Add symtab_hdr, tls_segment, first_gotent.
+	(elf64_alpha_relax_with_lituse): Return boolean.  Remove irelend
+	argument.  Reject dynamic symbols.  Use LITUSE symbolic constants.
+	(elf64_alpha_relax_got_load): Rename from relax_without_lituse.
+	Handle GOTDTPREL and GOTTPREL relocations.
+	(elf64_alpha_relax_gprelhilo): New.
+	(elf64_alpha_relax_tls_get_addr): New.
+	(elf64_alpha_relax_find_tls_segment): New.
+	(elf64_alpha_relax_section): Handle TLS relocations.
+	(ALPHA_ELF_LINK_HASH_TLS_IE): New.
+	(elf64_alpha_check_relocs): Set it.
+
+2002-06-01  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_relax_section): Don't store computed gp.
+
+	* elf64-alpha.c (elf64_alpha_check_relocs): Fix typo on maybe_dynamic
+	check; don't suppress dynamic relocs for non-allocated sections.
+
+	* elf64-alpha.c: Remove dead code.
+
+2002-05-31  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+	* elf64-ppc.c (ppc64_elf_size_dynamic_sections): Don't allocate
+	space for bss .plt.
+
+2002-05-31  Graeme Peterson  <gp@qnx.com>
+
+	* Makefile.am (BFD32_BACKENDS): Add elf32-i386qnx.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-i386qnx.c.
+	Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* config.bfd: Add i[3456]86-*-nto-qnx* support.
+	* configure.in: Add bfd_elf32_i386qnx_vec support.
+	* configure: Regenerate.
+	* elf-bfd.h (struct elf_backend_data): Add set_nonloadable_filepos,
+	is_contained_by_filepos, and copy_private_bfd_data_p.
+	* elf.c (assign_file_positions_for_segments): Call backend
+	set_nonloadable_filepos.  Fix non-K&R call to _bfd_error_handler.
+	(IS_CONTAINED_BY_FILEPOS): Define.
+	(INCLUDE_SECTION_IN_SEGMENT): Also test IS_CONTAINED_BY_FILEPOS.
+	(copy_private_bfd_data): Use IS_CONTAINED_BY_FILEPOS.  Typo fix.
+	Fix non-K&R call to _bfd_error_handler.
+	(_bfd_elf_copy_private_section_data): Use backend
+	copy_private_bfd_data_p.
+	* elf32-i386.c: Don't include elfxx-target.h when
+	ELF32_I386_C_INCLUDED is defined.
+	* elf32-i386qnx.c: New QNX elf backend file.
+	* elfxx-target.h: Add elf_backend_set_nonloadable_filepos,
+	elf_backend_is_contained_by_filepos, and
+	elf_backend_do_copy_private_bfd_data.
+	* targets.c: Add bfd_target bfd_elf32_i386qnx_vec.
+
+2002-05-31  Alan Modra  <amodra@bigpond.net.au>
+
+	* elfarm-oabi.c (bfd_elf32_arm_add_glue_sections_to_bfd): Define.
+	Move other similar defines to start of file.
+
+2002-05-30  Tom Rix  <trix@redhat.com>
+
+	* coff-rs6000.c (xcoff_rtype2howto): Handle 16 bit R_RBA.
+	* coff64-rs6000.c (xcoff64_rtype2howto): Same.
+
+2002-05-30  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (ALPHA_ELF_LINK_HASH_LU_TLSGD,
+	ALPHA_ELF_LINK_HASH_LU_TLSLDM, ALPHA_ELF_LINK_HASH_LU_FUNC): New.
+	(ALPHA_ELF_GOT_ENTRY_RELOCS_DONE): Remove.
+	(ALPHA_ELF_GOT_ENTRY_RELOCS_XLATED): Remove.
+	(struct alpha_elf_got_entry): Add reloc_type, reloc_done, reloc_xlated.
+	(struct alpha_elf_obj_tdata): Rename total_got_entries and
+	n_local_got_entries to total_got_size and local_got_size.
+	(elf64_alpha_howto, elf64_alpha_reloc_map): Update for TLS relocs.
+	(alpha_got_entry_size): New.
+	(elf64_alpha_relax_with_lituse): Use it.
+	(elf64_alpha_relax_without_lituse): Likewise.
+	(MAX_GOT_SIZE): Rename from MAX_GOT_ENTRIES.
+	(get_got_entry): New.
+	(elf64_alpha_check_relocs): Handle TLS relocs.  Reorganize.
+	(elf64_alpha_adjust_dynamic_symbol): Test LU_FUNC as a mask.
+	(elf64_alpha_merge_ind_symbols): Check gotent->reloc_type.
+	(elf64_alpha_can_merge_gots, elf64_alpha_merge_gots): Likewise.
+	(elf64_alpha_calc_got_offsets_for_symbol): Use alpha_got_entry_size.
+	(elf64_alpha_calc_got_offsets): Likewise.
+	(alpha_dynamic_entries_for_reloc): New.
+	(elf64_alpha_calc_dynrel_sizes): Use it.
+	(elf64_alpha_size_dynamic_sections): Likewise.
+	(elf64_alpha_relocate_section): Handle TLS relocations.
+	* reloc.c: Add Alpha TLS relocations.
+	* bfd-in2.h, libbfd.h: Rebuild.
+
+2002-05-29 Ralf Habacker <ralf.habacker@freenet.de>
+
+	* peXXigen.c (pe_print_idata): Remove double printed
+	import table lines; add Bound-To comment.
+
+2002-05-29  Matt Thomas  <matt@3am-software.com>
+
+	* Makefile.am (BFD32_BACKENDS): Add elf32-vax.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-vax.c.
+	(elf32-vax.lo): New rule.
+	* Makefile.in: Regenerate.
+	* configure.in (bfd_elf32_vax_vec)
+	(vaxnetbsd_vec): New vectors.
+	* configure: Regenerate.
+	* config.bfd (vax-*-netbsdelf*)
+	(vax-*-netbsdaout*)
+	(vax-*-netbsd*): New targets.
+	* elf32-vax.c: New file.
+	* reloc.c: Add VAX relocations.
+	* bfd-in2.h: Regenerate.
+	* targets.c (_bfd_target_vector): Add bfd_elf32_vax_vec.
+
+2002-05-29  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* config.bfd (arm-*-netbsd*): Add bfd_elf32_littlearm_vec
+	and bfd_elf32_bigarm_vec to targ_selvecs.
+
+2002-05-29  Ralf Habacker  <ralf.habacker@freenet.de>
+
+	* peXXigen.c (pe_print_idata): Fix seg faults on printing import tables
+	with auto-imported symbols.
+
+2002-05-29  Adam Nemet  <anemet@lnxw.com>
+
+	* elf32-arm.h (bfd_elf32_arm_get_bfd_for_interworking): Don't add glue
+	sections only record bfd.
+	(bfd_elf32_arm_add_glue_sections_to_bfd): New function.
+	* bfd-in.h (bfd_elf32_arm_add_glue_sections_to_bfd): Declare it.
+	* bfd-in2.h: Regenerate.
+
+2002-05-28  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* syms.c (_bfd_stab_section_find_nearest_line): Move
+	declaration and initialisation of saw_line and saw_func out of
+	for loop.
+
+2002-05-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_get_symbol_info): New function.
+	(bfd_elf64_get_symbol_info): Define.
+	* elfxx-target.h (bfd_elfNN_get_symbol_info): Only define if undef.
+
+2002-05-29  Andrey Volkov  <avolkov@transas.com>
+
+	* cpu-h8300.c: Make default h8300 machine first in machine list.
+
+2002-05-28  Kuang Hwa Lin <kuang@sbcglobal.net>
+
+	* config.bfd: Added DLX configuraton.
+	* Makefile.am: Added DLX configuraton.
+	* configure.in: Added DLX configuraton.
+	* archures.c: Add DLX architecture.
+	* reloc.c: Add DLX relocs.
+	* targets.c: Added DLX target vector.
+	* configure: Regenerate.
+	* Makefile.in: Regenreate.
+	* bfd-in2.h: Regenreate.
+	* elf32-dlx.c: New file: Support DLX target.
+	* cpu-dlx.c: New file: Support DLX target.
+
+2002-05-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-m68k.c (elf32_m68k_print_private_bfd_data): Formatting.
+
+	* elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Revert last change.
+	(ppc64_elf_check_relocs): Don't set up function descriptor symbol
+	strings to point inside function code sym string.
+	(func_desc_adjust): Likewise.
+	(ppc64_elf_hide_symbol): Rewrite code to look up function code sym.
+
+2002-05-24  Michal Ludvig  <mludvig@suse.cz>
+
+	* elf64-x86-64.c (elf64_x86_64_grok_prstatus): Added.
+	(elf64_x86_64_grok_psinfo): Added.
+
+2002-05-24  TAMURA Kent <kent@netbsd.org>
+
+	* config.bfd: Add a target for i386-netbsdpe.
+
+2002-05-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Don't copy is_func
+	and is_func_descriptor.
+	(func_desc_adjust): Hide function code sym in shared libs unless
+	there is a matching exported function descriptor sym.
+
+2002-05-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf.c (_bfd_elf_make_section_from_shdr): Set SEC_THREAD_LOCAL
+	for symbols from SHF_TLS section.
+	(_bfd_elf_print_private_bfd_data): Add PT_TLS.
+	(elf_fake_sections): Set SHF_TLS for SEC_THREAD_LOCAL sections.
+	(map_sections_to_segments): Build PT_TLS segment if necessary.
+	(assign_file_positions_for_segments): Likewise.
+	(get_program_header_size): Account for PT_TLS segment.
+	(swap_out_syms): Set type of BSF_THREAD_LOCAL symbols and symbols from
+	SEC_THREAD_LOCAL sections to STT_TLS.
+	* reloc.c: Add 386 and IA-64 TLS relocs.
+	* section.c (SEC_THREAD_LOCAL): Define.
+	(SEC_CONSTRUCTOR_TEXT, SEC_CONSTRUCTOR_DATA, SEC_CONSTRUCTOR_BSS):
+	Remove.
+	* elflink.h (elf_link_add_object_symbols): Support .tcommon.
+	(size_dynamic_sections): If DF_STATIC_TLS, set DF_FLAGS
+	unconditionally.
+	(struct elf_final_link_info): Add first_tls_sec.
+	(elf_bfd_final_link): Set first_tls_sec.
+	Compute elf_hash_table (info)->tls_segment.
+	(elf_link_output_extsym): Handle STT_TLS symbols.
+	(elf_link_input_bfd): Likewise.
+	* syms.c (BSF_THREAD_LOCAL): Define.
+	* bfd-in2.h: Rebuilt.
+	* libbfd.h: Rebuilt.
+	* elf32-i386.c (elf_i386_tls_transition, dtpoff_base, tpoff,
+	elf_i386_mkobject, elf_i386_object_p): New functions.
+	(elf_howto_table): Add TLS relocs.
+	(elf_i386_reloc_type_lookup): Support TLS relocs.
+	(elf_i386_info_to_howto_rel): Likewise.
+	(struct elf_i386_link_hash_entry): Add tls_type.
+	(struct elf_i386_obj_tdata): New.
+	(elf_i386_hash_entry, elf_i386_tdata, elf_i386_local_got_tls_type):
+	New macros.
+	(struct elf_i386_link_hash_table): Add tls_ldm_got.
+	(link_hash_newfunc): Clear tls_type.
+	(elf_i386_check_relocs): Support TLS relocs.
+	(elf_i386_gc_sweep_hook): Likewise.
+	(allocate_dynrelocs): Likewise.
+	(elf_i386_size_dynamic_sections): Likewise.
+	(elf_i386_relocate_section): Likewise.
+	(elf_i386_finish_dynamic_symbol): Likewise.
+	(bfd_elf32_mkobject, elf_backend_object_p): Define.
+	* elfxx-ia64.c (struct elfNN_ia64_dyn_sym_info): Add tprel_offset,
+	dtpmod_offset, dtprel_offset, tprel_done, dtpmod_done, dtprel_done,
+	want_tprel, want_dtpmod, want_dtprel.
+	(elfNN_ia64_tprel_base, elfNN_ia64_dtprel_base): New functions.
+	(ia64_howto_table): Add TLS relocs, rename R_IA64_LTOFF_TP22 to
+	R_IA64_LTOFF_TPREL22.
+	(elf_code_to_howto_index): Add TLS relocs.
+	(elfNN_ia64_check_relocs): Support TLS relocs.
+	(allocate_global_data_got): Account for TLS .got data.
+	(allocate_dynrel_entries): Account for TLS dynamic relocations.
+	(elfNN_ia64_install_value): Supprt TLS relocs.
+	(set_got_entry): Support TLS relocs.
+	(elfNN_ia64_relocate_section): Likewise.
+
+2002-05-23  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elf32-arm.h (elf32_arm_final_link_relocate): For the Thumb
+	BLX reloc round the relocation up rather than down.
+	* coff-arm.c (coff_arm_relocate_section): Likewise.
+
+2002-05-21  H.J. Lu  (hjl@gnu.org)
+
+	* linker.c (_bfd_generic_link_add_one_symbol): Allow multiple
+	definition.
+
+2002-05-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_size_stubs): Don't strip .branch_lt.
+	(ppc64_elf_relocate_section): Handle unresolved relocs in opd.
+
+2002-05-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_relocate_section): Return false for
+	unresolved relocs.
+	(ppc64_elf_size_dynamic_sections): Check for splt NULL.
+
+2002-05-21  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* bfd.c (bfd_get_arch_size): Remove bfd_set_error call for
+	non-ELF targets.
+
+2002-05-21  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elf-bfd.h (elf_backend_emit_relocs): Change prototype to return
+	an error value.
+	* elflink.h (elf_link_output_relocs): Likewise. Improve error message.
+	return with false on error.
+	(elf_link_input_bfd): Check reloc_emitter return value.
+
+2002-05-21  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* config.bfd (armeb-*-netbsdelf*): New target.
+
+2002-05-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc_build_one_stub): Point undefined function syms
+	at the plt call stub.
+
+2002-05-19  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* cpu-mips.c (mips_compatible): Don't try to check machine
+	compatibility.
+
+2002-05-18  Tom Rix  <trix@redhat.com>
+
+	* coff64-rs6000.c (_bfd_xcoff64_swap_aux_out): Fix C_FILE auxent.
+
+2002-05-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_info_to_howto): Formatting.
+	(ppc64_elf_relocate_section): Don't warn about reloc overflow when
+	we've already warned about an undefined symbol.  Report more
+	detail on reloc errors.
+
+2002-05-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* acinclude.m4 (AM_INSTALL_LIBBFD): New.
+	* configure.in: Invoke AM_INSTALL_LIBBFD.
+	* Makefile.am (install-data-local): Revert 2002-05-13.  Move to..
+	(install_libbfd): .. New target.
+	(uninstall_libbfd): Likewise.
+	(install-bfdlibLTLIBRARIES): Likewise.
+	(uninstall-bfdlibLTLIBRARIES): Likewise.
+	(bfdlibdir): New.
+	(bfdincludedir): New.
+	(lib_LTLIBRARIES): Rename to bfdlib_LTLIBRARIES.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+
+2002-05-17  Stuart Balfour <sbalfour@cisco.com>
+
+	* hash.c (bfd_hash_lookup): Remove computation of len from inside
+	hash loop.
+
+2002-05-16  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* config.bfd: Add targets for sh64-linux (little endian and
+	big endian).
+
+2002-05-15  Laurent Pinchart <laurent.pinchart@skynet.be>
+
+	* peXXigen.c (pe_print_idata): Do not assume that the first thunk
+	is located in the same section as the import table.  Instead
+	check, and if necessary load the section containing the thunk.
+
+2002-05-15  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* aix5ppc-core.c (xcoff64_core_p): Replace bfd_read with
+	bfd_bread.
+	(xcoff64_core_file_matches_executable_p): Replace bfd_read
+	with bfd_bread.
+
+2002-05-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* aix5ppc-core.c: Warning fixes.
+	* aout-adobe.c (aout_32_bfd_link_just_syms): Define.
+	* aout-target.h (MY_bfd_link_just_syms): Define.
+	* aout-tic30.c (MY_bfd_link_just_syms): Define.
+	* bfd.c (bfd_link_just_syms): Define.
+	* binary.c (binary_bfd_link_just_syms): Define.
+	* bout.c (b_out_bfd_link_just_syms): Define.
+	* coff-rs6000.c (rs6000coff_vec, pmac_xcoff_vec): Update initializer.
+	* coff64-rs6000.c (rs6000coff64_vec, aix5coff64_vec): Likewise.
+	* coffcode.h (coff_bfd_link_just_syms): Define.
+	* elf-bfd.h (enum elf_link_info_type): Add ELF_INFO_TYPE_JUST_SYMS.
+	(elf_discarded_section): Check for ELF_INFO_TYPE_JUST_SYMS.
+	(_bfd_elf_link_just_syms): Declare.
+	* elf.c (_bfd_elf_link_just_syms): New function.
+	* elf-eh-frame.c (_bfd_elf_maybe_strip_eh_frame_hdr): Check that
+	sections haven't already been discarded by the linker.
+	* elflink.h (elf_link_add_object_symbols): Likewise for stab
+	sections and SEC_MERGE sections.
+	(elf_bfd_discard_info): Similarly here.
+	* elfxx-target.h (bfd_elfNN_bfd_link_just_syms): Define.
+	* i386msdos.c (msdos_bfd_link_just_syms): Define.
+	* i386os9k.c (os9k_bfd_link_just_syms): Define.
+	* ieee.c (ieee_bfd_link_just_syms): Define.
+	* ihex.c (ihex_bfd_link_just_syms): Define.
+	* libbfd-in.h (_bfd_nolink_bfd_link_just_syms): Define.
+	(_bfd_generic_link_just_syms): Declare.
+	* libecoff.h (_bfd_ecoff_bfd_link_just_syms): Define.
+	* linker.c (_bfd_generic_link_just_syms): New function.
+	* mmo.c (mmo_bfd_link_just_syms): Define.
+	* nlm-target.h (nlm_bfd_link_just_syms): Define.
+	* oasys.c (oasys_bfd_link_just_syms): Define.
+	* ppcboot.c (ppcboot_bfd_link_just_syms): Define.
+	* som.c (som_bfd_link_just_syms): Define.
+	* srec.c (srec_bfd_link_just_syms): Define.
+	* targets.c (struct bfd_target): Add _bfd_link_just_syms.
+	(BFD_JUMP_TABLE_LINK): And here.
+	* tekhex.c (tekhex_bfd_link_just_syms): Define.
+	* versados.c (versados_bfd_link_just_syms): Define.
+	* vms.c (vms_bfd_link_just_syms): Define.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2002-05-15  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elf32-mips.c: Remove superfluous definitions copied from
+	elfxx-mips.c.
+	(bfd_elf32_bigmips_vec,bfd_elf32_littlemips_vec): Use the
+	SGIish vectors to check the special case.
+	(mips_elf_hi16_reloc): Fix comment.
+	(mips_elf_got16_reloc): Likewise.
+	(_bfd_mips_elf32_gprel16_reloc): Likewise.
+	(elf_reloc_map): Code cleanup.
+	(mips_reloc_map): Add comment.
+	(bfd_elf23_bfd_reloc_type_lookup): Code cleanup.
+	(mips_elf32_rtype_to_howto): Likewise.
+	(mips_elf32_discard_info): Likewise.
+	(elf32_mips_irix_compat): Invert logic: Only SGIish vectors
+	lead to IRIX compatibility now.
+
+2002-05-15  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elfxx-mips.c: Call it IRIX, not Irix in comments.
+
+2002-05-13  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* config.bfd (shle-*-netbsdelf*): Add target which includes
+	sh64 support.
+
+2002-05-13  David Edelsohn  <edelsohn@gnu.org>
+
+	* configure.in: Revert 2002-04-07.  Instead, auto-configure
+	HAVE_ST_C_IMPL.
+	* configure: Regenerate.
+	* config.in: Regenerate.
+	* rs6000-core.c (CNEW_IMPL): Guard use of c_impl with HAVE_ST_C_IMPL
+	or AIX_5_CORE.
+
+2002-05-11  Federico G. Schwindt <fgsch@olimpo.com.br>
+
+	* configure.in (sparc*-*-openbsd*): Support sparc64-openbsd
+	corefiles as well.2
+	* configure: Regenerate.
+
+2002-05-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (install-data-local): Install headers to
+	$(exec_prefix)/include.
+	* Makefile.in: Regenerate.
+
+2002-05-11  Ralf Corsepius  <corsepiu@faw.uni-ulm.de>
+	    Daniel Jacobowitz  <drow@mvista.com>
+
+	* coff-sh.c (sh_reloc_map): Map to R_SH_IMM32 for non-PE.  Don't
+	map BFD_RELOC_RVA.
+
+2002-05-11  Federico G. Schwindt <fgsch@olimpo.com.br>
+
+	* config.bfd (alpha*-*-openbsd*, sparc64*-*-openbsd*,
+	hppa*-*-openbsd*): New targets.
+	* configure.in (alpha*-*-openbsd*): Set COREFILE.
+	* configure: Regenerate.
+
+2002-05-10  Tom Rix  <trix@redhat.com>
+
+	* coff64-rs6000.c (xcoff64_reloc_type_br): New function for
+	xcoff64_ppc_relocate_section.
+	* coff-rs6000.c : Extern common xcoff_reloc_type functions.
+	* libxcoff.h: Common xcoff_reloc_type function declaration.
+
+2002-05-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-i386.c (elf_i386_relocate_section): Remove overflow checks
+	added in 2002-05-09 commit.
+
+	* elf32-hppa.c (elf32_hppa_size_stubs): Revert part of 2002-05-04,
+	don't look for stubs on all undefined syms.
+
+2002-05-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (RA_REGISTER_MASK, RA_REGISTER_SHIFT): Delete.
+	(ppc64_elf_howto_raw <R_PPC64_RELATIVE>): Not pc_relative or
+	pcrel_offset.
+
+	* elf32-i386.c (elf_howto_table): Comments.
+	(elf_i386_relocate_section): Handle more relocs for relocatable
+	linking and against SEC_MERGE sections.
+
+2002-05-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_create_got): New function.
+	(ppc_elf_create_dynamic_sections): Call ppc_elf_create_got before
+	_bfd_elf_create_dynamic_sections.  Correct .plt flags.
+	(ppc_elf_check_relocs): Use ppc_elf_create_got in place of
+	_bfd_elf_create_got_section.
+
+2002-05-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_backend_data): Add rela_normal.
+	* elfxx-target.h (elf_backend_rela_normal): Define.
+	(elfNN_bed): Init rela_normal.
+	* elflink.h (elf_link_input_bfd <emit_relocs>): Handle adjustment
+	for section symbols here if rela_normal.  Simplify abs section test.
+	* elf-m10200.c (mn10200_elf_relocate_section): If relocatable,
+	return immediately.  Remove code handling relocatable linking.
+	* elf-m10300.c (mn10300_elf_relocate_section): Likewise.
+	* elf32-fr30.c (fr30_elf_relocate_section): Likewise.
+	* elf32-i370.c (i370_elf_relocate_section): Likewise.
+	* elf32-i860.c (elf32_i860_relocate_section): Likewise.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-mcore.c (mcore_elf_relocate_section): Likewise.
+	* elf32-openrisc.c (openrisc_elf_relocate_section): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	* elf32-s390.c (elf_s390_relocate_section): Likewise.
+	* elf32-xstormy16.c (xstormy16_elf_relocate_section): Likewise.
+	* elf64-ppc.c (ppc64_elf_relocate_section): Likewise.
+	* elf64-s390.c (elf_s390_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Likewise.
+	* elf32-arm.h (elf32_arm_relocate_section): Likewise #ifndef USE_REL.
+	* elf32-m32r.c (m32r_elf_relocate_section): Likewise.
+	* elf-m10200.c (elf_backend_rela_normal): Define.
+	* elf-m10300.c (elf_backend_rela_normal): Define.
+	* elf32-fr30.c (elf_backend_rela_normal): Define.
+	* elf32-i370.c (elf_backend_rela_normal): Define.
+	* elf32-i860.c (elf_backend_rela_normal): Define.
+	* elf32-m68k.c (elf_backend_rela_normal): Define.
+	* elf32-mcore.c (elf_backend_rela_normal): Define.
+	* elf32-openrisc.c (elf_backend_rela_normal): Define.
+	* elf32-ppc.c (elf_backend_rela_normal): Define.
+	* elf32-s390.c (elf_backend_rela_normal): Define.
+	* elf32-xstormy16.c (elf_backend_rela_normal): Define.
+	* elf64-ppc.c (elf_backend_rela_normal): Define.
+	* elf64-s390.c (elf_backend_rela_normal): Define.
+	* elf64-x86-64.c (elf_backend_rela_normal): Define.
+	* elfxx-ia64.c (elf_backend_rela_normal): Define.
+	* elf32-arm.h (elf_backend_rela_normal): Define #ifndef USE_REL.
+	* elf32-m32r.c (elf_backend_rela_normal): Likewise.
+
+2002-05-06  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elf32-arm.h (elf32_arm_final_link_relocate): Convert
+	'reloc_signed_max' and 'reloc_signed_min' into half-word offsets.
+
+2002-05-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_link_input_bfd <emit_relocs>): Adjust r_offset
+	when not relocatable.  Fix reloc_emitter call for K&R.
+
+2002-05-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_relocate_section): Reinstate code
+	reloading local sym addend mistakenly removed in 2002-05-01 change.
+
+	* dwarf2.c (struct line_head): Make prologue_length a bfd_vma.
+	(read_abbrevs): Change "offset" param to bfd_vma.
+	(parse_comp_unit): Change "version" and addr_size to unsigned ints.
+	Change "abbrev_offset" to bfd_vma.
+	(read_indirect_string): Use correct conversion chars in error
+	message format string, cast bfd_vma's to unsigned long.
+	(read_abbrevs): Likewise.
+	(read_attribute_value): Likewise.
+	(decode_line_info): Likewise.
+	(scan_unit_for_functions): Likewise.
+	(parse_comp_unit): Likewise.
+
+2002-05-04  Tom Rix  <trix@redhat.com>
+
+	* coffswap.h (coff_swap_reloc_in): Remove XCOFF support.
+	(coff_swap_reloc_out): Same.
+	* coff-rs6000.c: (xcoff_swap_reloc_in): Moved from coffswap.h.
+	(xcoff_swap_reloc_out): Same.
+	(xcoff_rtype2howto): Renamed from _bfd_xcoff_rtype2howto. Special
+	case some 16 bit relocs. Add reloc value to output.
+	(xcoff_howto_table): Remove 64 bit R_POS, add 16 bit
+	R_RBR. Improve names.
+	(_bfd_xcoff_reloc_type_lookup): Adjust for removal of 64 bit R_POS.
+	(bfd_xcoff_backend_data): Update with new reloc swap names.
+	(bfd_pmac_xcoff_backend_data) : Same.
+	* coff64-rs6000.c: (xcoff64_swap_reloc_in): Moved from coffswap.h.
+	(xcoff64_swap_reloc_out): Same.
+	(xcoff64_rtype2howto): Special case some 16 bit relocs and 32 bit
+	R_POS. Add reloc value to output.
+	(xcoff64_howto_table): Move 64 bit R_POS to first entry.  Add 16
+	bit R_RBR. Improve names, masks.
+	(xcoff64_reloc_type_lookup): Adjust for move of 64 bit R_POS.
+	(bfd_xcoff_backend_data): Update with new reloc swap names.
+	(bfd_xcoff_aix5_backend_data) : Same.
+
+2002-05-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-hppa.c (struct elf32_hppa_link_hash_table): Add
+	bfd_count top_index, input_list, all_local_syms.
+	(elf32_hppa_setup_section_lists): New function, split from
+	elf32_hppa_size_stubs.
+	(elf32_hppa_next_input_section): Likewise.
+	(group_sections): Likewise.
+	(get_local_syms): Likewise.
+	(elf32_hppa_size_stubs): Adjust for split out functions.  Look for
+	stubs on undefined syms too.
+	(elf32_hppa_set_gp): Use bfd_link_hash* instead of elf_link_hash*.
+	Only access htab elf fields when we have an elf hash table.
+	* elf32-hppa.h (elf32_hppa_setup_section_lists): Declare.
+	(elf32_hppa_next_input_section): Declare.
+
+2002-05-04  Bob Byrnes  <byrnes@curl.com>
+
+	* opncls.c (_bfd_new_bfd_contained_in): Check return value of
+	_bfd_new_bfd.
+
+2002-05-03  H.J. Lu  (hjl@gnu.org)
+
+	* elfxx-mips.c (mips_elf_link_hash_entry): Add forced_local.
+	(mips_elf_link_hash_newfunc): Initialize forced_local to false.
+	(mips_elf_record_global_got_symbol): Call _bfd_mips_elf_hide_symbol
+	to hide a global symbol.
+	(_bfd_mips_elf_hide_symbol): Return if forced_local is true. Set
+	forced_local to true.
+
+2002-05-02  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_relocate_section): Force relative relocs
+	vs SHN_UNDEF to zero.
+
+2002-05-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_howto_raw <R_PPC64_SECTOFF>): Change to a
+	16 bit reloc.
+	<R_PPC64_SECTOFF_DS>: Likewise.
+	(ppc64_elf_reloc_type_lookup): Map from BFD_RELOC_16_BASEREL to
+	SECTOFF reloc.
+	* elf32-ppc.c (ppc_elf_howto_raw <R_PPC_SECTOFF>): Correct.
+	(ppc_elf_reloc_type_lookup): Map from BFD_RELOC_16_BASEREL to
+	SECTOFF reloc.
+
+	* elf64-ppc.c (ppc64_elf_addr16_ha_reloc): Delete.
+	(ppc64_elf_ha_reloc): New function.
+	(ppc64_elf_brtaken_reloc): New function.
+	(ppc64_elf_sectoff_reloc): New function.
+	(ppc64_elf_sectoff_ha_reloc): New function.
+	(ppc64_elf_toc_reloc): New function.
+	(ppc64_elf_toc_ha_reloc): New function.
+	(ppc64_elf_toc64_reloc): New function.
+	(ppc64_elf_unhandled_reloc): New function.
+	(ppc64_elf_howto_raw): Use the above.
+	<R_PPC64_RELATIVE>: Mark pc_relative, pcrel_offset.
+	<R_PPC64_SECTOFF>: Not pc_relative or pcrel_offset.  Fix dst_mask.
+	<R_PPC64_SECTOFF_DS>: Likewise.
+	(IS_ABSOLUTE_RELOC): Update.
+	(struct ppc_link_hash_table): Add have_undefweak.
+	(ppc64_elf_link_hash_table_create): Init.
+	(func_desc_adjust): Set have_undefweak.
+	(ppc64_elf_func_desc_adjust): Call func_desc_adjust earlier.  Only
+	add the .sfpr blr when have_undefweak.
+	(ppc64_elf_setup_section_lists): Check hash table flavour.
+	(ppc64_elf_next_input_section): Move output_section->owner test to
+	ppc64elf.em.
+	(ppc64_elf_set_toc): Rename to ppc64_elf_toc, remove info param
+	and relocatable test.  Return TOCstart and don't set elf_gp.
+	(ppc64_elf_relocate_section): Correct BRTAKEN/BRNTAKEN branch
+	offset calculation.  Add assert on weak sym branch tweaks.
+	* elf64-ppc.h (ppc64_elf_set_toc): Delete.
+	(ppc64_elf_toc): Declare.
+	(ppc64_elf_next_input_section): Update.
+
+2002-05-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* syms.c (_bfd_stab_section_find_nearest_line): Don't bomb on NULL
+	file_name.
+
+2002-05-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (CROR_151515, CROR_313131): Define.
+	(ppc64_elf_relocate_section): Use them.  Don't look for plt calls
+	on R_PPC64_ADDR24 relocs.  Require a nop or no link reg on plt
+	call branches.  Correct undefined weak destination.
+	(ppc64_elf_func_desc_adjust): Always create at least one blr in
+	.sfpr, and correct case where either only savef* or restf* is
+	needed.
+
+	Long branch stubs, multiple stub sections.
+	* elf64-ppc.h (ppc64_elf_setup_section_lists): Declare.
+	(ppc64_elf_next_input_section): Declare.
+	* elf64-ppc.c: Move linker-only prototypes.
+	(STUB_SUFFIX): Define.
+	(enum ppc_stub_type): New.
+	(struct ppc_stub_hash_entry): New.
+	(struct ppc_branch_hash_entry): New.
+	(struct ppc_link_hash_entry): Add stub_cache, oh.
+	(struct ppc_link_hash_table): Add stub_hash_table etc.  Remove
+	sstub.  Add sbrlt, srelbrlt, has_14bit_branch, stub_iteration.
+	Rename plt_overflow to stub_error.
+	(ppc_stub_hash_lookup): Define.
+	(ppc_branch_hash_lookup): Define.
+	(stub_hash_newfunc): New function.
+	(branch_hash_newfunc): New function.
+	(link_hash_newfunc): Init new fields.
+	(ppc64_elf_link_hash_table_create): Likewise.
+	(ppc64_elf_link_hash_table_free): New function.
+	(ppc_stub_name): New function.
+	(ppc_get_stub_entry): New function.
+	(ppc_add_stub): New function.
+	(create_linkage_sections): Use bfd_make_section_anyway.  Create
+	.branch_lt and .rela.branch_lt sections.  Don't create .stub.
+	(ppc64_elf_check_relocs): Set has_14bit_branch on R_PPC64_REL14*,
+	and set up for plt call stubs.  Link func and func desc syms.
+	(ppc64_elf_gc_sweep_hook): Handle REL14* as per REL24.
+	(func_desc_adjust): Avoid hash lookup when func desc sym available
+	via shortcut, and set links when processing.
+	(ppc64_elf_hide_symbol): Likewise.
+	(allocate_dynrelocs): Don't allocate stub section here.
+	(ppc64_elf_size_dynamic_sections): Handle sbrlt and srelbrlt.
+	Remove sstub code.
+	(ppc_type_of_stub): New function.
+	(build_one_stub): Delete.
+	(ppc_build_one_stub): New function.
+	(ppc_size_one_stub): New function.
+	(ppc64_elf_setup_section_lists): New function.
+	(ppc64_elf_next_input_section): New function.
+	(group_sections): New function.
+	(get_local_syms): New function.
+	(ppc64_elf_size_stubs): Rewrite.
+	(ppc64_elf_build_stubs): Rewrite.
+	(ppc64_elf_relocate_section): Look up stub entry for REL24
+	relocs.  Don't propagate REL14* to dynamic objects.  Look for long
+	branch stubs if REL14* or REL24 relocs won't reach.
+	(bfd_elf64_bfd_link_hash_table_free): Define.
+
+2002-04-30  Mark Mitchell  <mark@codesourcery.com>
+
+	* config.bfd: Add support for powerpc-*-windiss.
+
+2002-04-30  Tom Rix  <trix@redhat.com>
+
+	* xcofflink.c (xcoff_link_add_symbols): Always copy undef C_EXT
+	symbol names into the hash table.
+
+2002-04-28  Tom Rix  <trix@redhat.com>
+
+	* coff-rs6000.c (xcoff_calculate_relocation) : Function table for
+	calulating relocations.
+	(xcoff_complain_overflow) : Function table for relocation errors.
+	(xcoff_ppc_relocate_section): Use relocation and complain function
+	tables.
+	(xcoff_complain_overflow_unsigned_func): New complain function.
+	(xcoff_complain_overflow_signed_func): Same.
+	(xcoff_complain_overflow_bitfield_func): Same.
+	(xcoff_complain_overflow_dont_func): Same.
+	(xcoff_reloc_type_crel): New recot function.
+	(xcoff_reloc_type_br): Same.
+	(xcoff_reloc_type_ba): Same.
+	(xcoff_reloc_type_toc): Same.
+	(xcoff_reloc_type_rel): Same.
+	(xcoff_reloc_type_neg): Same.
+	(xcoff_reloc_type_pos): Same.
+	(xcoff_reloc_type_fail): Same.
+	(xcoff_reloc_type_noop): Same.
+	* libxcoff.h : Declare common parts for xcoff64.
+	* coff64-rs6000.c (xcoff64_ppc_relocate_section): Use relocation
+	and complain function tables.
+
+2002-04-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-x86-64.c (struct elf64_x86_64_dyn_relocs): Comment typo.
+	* elf32-hppa.c (elf32_hppa_final_link): Formatting.
+
+2002-04-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* opncls.c (bfd_make_readable): Call bfd_section_list_clear.
+	* xcofflink.c (xcoff_link_add_dynamic_symbols): Likewise.
+
+	* elflink.h (elf_bfd_final_link): Ensure input bfd class is the
+	same as the output before calling elf_link_input_bfd.
+
+	* coffcode.h (coff_compute_section_file_positions): Set
+	section_tail after shuffling section list.
+
+2002-04-24  Christian Groessler <chris@groessler.org>
+
+	* coff-z8k.c (extra_case): Fix R_IMM32 relocations: The
+	addresses are 23bit with a special layout, not plain 32bit
+	values.  Prevent relocation of immediate values.
+
+2002-04-24  Chris G. Demetriou  <cgd@broadcom.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_print_private_bfd_data): If MDMX or
+	MIPS-16 ASE flags are set, print something to indicate that.
+
+2002-04-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-hppa.c (hppa_type_of_stub): Correct and simplify condition
+	under which a plt call stub is used.
+	(final_link_relocate): Similarly.
+	(allocate_plt_static): Clear h-plabel except when plt entry is
+	exclusively used for a plabel.
+	(allocate_dynrelocs): Use the above to simplify plt sizing.
+	(struct elf32_hppa_link_hash_table): Add has_22bit_branch.
+	(elf32_hppa_link_hash_table_create): Init.
+	(BL22_RP): Define.
+	(hppa_build_one_stub): Use BL22_RP if has_22bit_branch.
+	(elf32_hppa_check_relocs): Set has_22bit_branch.
+
+	* elf32-hppa.c (elf32_hppa_check_relocs): Remove debug message.
+	(final_link_relocate): Likewise.
+
+2002-04-22  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Don't build
+	search table if some FDE is DW_EH_PE_aligned encoded either.
+	(_bfd_elf_write_section_eh_frame): Handle terminating FDE specially.
+
+2002-04-22  Richard Smith  <richard@ex-parrot.com>
+	    Jakub Jelinek  <jakub@redhat.com>
+
+	* elf-eh-frame.c (struct eh_cie_fde): Add per_encoding_relative.
+	(_bfd_elf_discard_section_eh_frame): Set it for CIEs with pcrel
+	encoded personality.
+	(_bfd_elf_write_section_eh_frame): Adjust pcrel encoded personality
+	for CIE/FDE removal.
+
+2002-04-20  Tom Rix  <trix@redhat.com>
+
+	* coff64-rs6000.c (_bfd_xcoff64_swap_aux_in): Fix C_FILE auxent.
+
+2002-04-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* archures.c (bfd_lookup_arch): Move the list order comment..
+	(struct bfd_arch_info): ..to where it belongs.
+	* bfd-in2.h: Regenerate.
+
+	* archures.c (bfd_lookup_arch): Add comment on list order.
+	(bfd_default_set_arch_mach): Use bfd_lookup_arch.
+	* cpu-powerpc.c (bfd_powerpc_archs): Re-order so that the default
+	is always at head of list.
+
+2002-04-18  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* coff-arm.c (coff_thumb_pcrel_12, coff_thumb_pcrel_9,
+	insert_thumb_branch, record_thumb_to_arm_glue): Suppress
+	definition of these functions for ARM_WINCE builds as they are
+	not used.
+	(SWAP_IN_RELOC_OFFSET, SWAP_OUT_RELOC_OFFSET): Do not define
+	for ARM_WINCE builds.
+
+2002-04-18  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* coff-arm.c (bfd_arm_process_before_allocation):
+
+2002-04-17  J"orn Rennecke <joern.rennecke@superh.com>
+
+	* cpu-sh.c (scan_mach): Delete.
+	(arch_info_struct): Replace scan_mach with bfd_default_scan.
+	(bfd_sh_arch): Likewise.
+
+2002-04-16  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* ihex.c (ihex_write_object_contents): Fix check for records
+	crossing 64K boundaries.
+
+2002-04-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-m32r.c (m32r_elf_add_symbol_hook): Check the hash table
+	type rather than just assuming entries are ELF.
+	* elf32-sh64.c (sh64_elf_add_symbol_hook): Likewise.
+	* elf64-sh64.c (sh64_elf64_add_symbol_hook): Likewise.
+	* elf64-sparc.c (sparc64_elf_add_symbol_hook): Likewise.
+	* elf64-mmix.c (mmix_elf_add_symbol_hook): Use bfd_link_hash_entry
+	rather than elf_link_hash_entry.
+
+2002-04-15  Richard Henderson  <rth@redhat.com>
+
+	* elf32-mips.c (mips_elf32_object_p): Revert 0404 fragment: allow
+	n32 binaries.
+
+2002-04-15  Michael Snyder  <msnyder@redhat.com>
+
+	* opncls.c (bfd_close): Write contents if writeable.
+	Minor formatting tidy-ups.
+
+2002-04-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_add_symbol_hook): Check the hash table type.
+
+2002-04-12  Michael Snyder  <msnyder@redhat.com>
+
+	* bfd-in.h (bfd_get_section_lma): New access macro.
+	Minor white-space fix-up.
+
+2002-04-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (prep_headers): Don't zero EI_OSABI, EI_ABIVERSION or
+	header pad.
+
+2002-04-09  DJ Delorie  <dj@redhat.com>
+
+	* elfarm-nabi.c (elf32_arm_howto_table): Fix ABS16 masks.
+
+2002-04-09  Casper S. Hornstrup <chorns@users.sourceforge.net>
+
+	* coffcode.h (coff_read_word): New.
+	(coff_compute_checksum): New.
+	(coff_apply_checksum): New.
+	(coff_write_object_contents): Call coff_apply_checksum () to
+	apply checksum to PE image.
+
+2002-04-08  Randolph Chung  <tausq@debian.org>
+
+	* elf32-hppa.c (hppa_unwind_entry_compare): Move to elf-hppa.h.
+	(elf32_hppa_final_link): Split out sorting logic to..
+	* elf-hppa.h (elf_hppa_sort_unwind): ..here.
+	(elf_hppa_final_link): Call elf_hppa_sort_unwind.
+
+2002-04-07  Andrew Cagney  <ac131313@redhat.com>
+
+	* configure.in: Add missing ``|'' to powerpc-*-aix4.[4-9]*
+	pattern.
+	* configure: Re-generate.
+
+2002-04-07  Andrew Cagney  <ac131313@redhat.com>
+
+	* configure.in: Only define AIX_CORE_DUMPX_CORE when AIX version
+	is greater or equal to 4.3.3.
+	* configure: Regenerate.
+	Fix PR gdb/344.
+
+2002-04-05  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (cris_elf_howto_table) <R_CRIS_16_PCREL,
+	R_CRIS_32_PCREL>: Fix typo in name.
+	(cris_elf_check_relocs): Always create .rela.got here when
+	R_CRIS_16_GOTPLT or R_CRIS_32_GOTPLT is seen.
+	(elf_cris_adjust_gotplt_to_got): Don't create .rela.got here;
+	assume it's created.
+
+2002-04-04  Daniel Jacobowitz  <drow@mvista.com>
+
+	* aout-adobe.c (aout_32_bfd_link_hash_table_free): Define.
+	* aout-target.h (MY_bfd_link_hash_table_free): Conditionally
+	define.
+	* aout-tic30.c (MY_bfd_link_hash_table_free): Likewise.
+	* bfd.c (bfd_link_hash_table_free): Define.
+	* binary.c (binary_bfd_link_hash_table_free): Define.
+	* bout.c (b_out_bfd_link_hash_table_free): Define.
+	* coff-rs6000.c (rs6000coff_vec): Include
+	_bfd_generic_link_hash_table_free.
+	(pmac_xcoff_vec): Likewise.
+	* coff64-rs6000.c (rs6000coff64_vec): Likewise.
+	(aix5coff64_vec): Likewise.
+	* coffcode.h (coff_bfd_link_hash_table_free): Conditionally define.
+	* elf-m10300.c (elf32_mn10300_link_hash_table_free): New function.
+	(bfd_elf32_bfd_link_hash_table_free): Define.
+	* elf32-hppa.c (elf32_hppa_link_hash_table_free): New function.
+	(bfd_elf32_bfd_link_hash_table_free): Define.
+	* elfxx-target.h (bfd_elfNN_bfd_link_hash_table_free): Conditionally
+	define.
+	* i386msdos.c (msdos_bfd_link_hash_table_free): Define.
+	* i386os9k.c (os9k_bfd_link_hash_table_free): Define.
+	* ieee.c (ieee_bfd_link_hash_table_free): Define.
+	* ihex.c (ihex_bfd_link_hash_table_free): Define.
+	* libbfd-in.h (_bfd_nolink_bfd_link_hash_table_free): Define.
+	(_bfd_generic_link_hash_table_free): Add prototype.
+	* libcoff-in.h (_bfd_xcoff_bfd_link_hash_table_free): Add prototype.
+	* libecoff.h (_bfd_ecoff_bfd_link_hash_table_free): Define.
+	* linker.c (_bfd_generic_link_hash_table_free): New function.
+	* mmo.c (mmo_bfd_link_hash_table_free): Define.
+	* nlm-target.h (nlm_bfd_link_hash_table_free): Define.
+	* oasys.c (oasys_bfd_link_hash_table_free): Define.
+	* ppcboot.c (ppcboot_bfd_link_hash_table_free): Define.
+	* som.c (som_bfd_link_hash_table_free): Define.
+	* srec.c (srec_bfd_link_hash_table_free): Define.
+	* tekhex.c (tekhex_bfd_link_hash_table_free): Define.
+	* versados.c (versados_bfd_link_hash_table_free): Define.
+	* vms.c (vms_bfd_link_hash_table_free): New function.
+	* xcofflink.c (_bfd_xcoff_bfd_link_hash_table_free): New function.
+
+	* coff-arm.c (coff_arm_link_hash_table_create): Use bfd_malloc
+	instead of bfd_alloc.
+	* coff-h8300.c (h8300_coff_link_hash_table_create): Likewise.
+	* coff-mcore.c (coff_mcore_link_hash_table_create): Likewise.
+	* coff-ppc.c (ppc_coff_link_hash_table_create): Likewise.
+	* cofflink.c (_bfd_coff_link_hash_table_create): Likewise.
+	* ecoff.c (_bfd_ecoff_bfd_link_hash_table_create): Likewise.
+	* elf-m10300.c (elf32_mn10300_link_hash_table_create): Likewise.
+	* elf.c (_bfd_elf_link_hash_table_create): Likewise.
+	* elf32-arm.h (elf32_arm_link_hash_table_create): Likewise.
+	* elf32-cris.c (elf_cris_link_hash_table_create): Likewise.
+	* elf32-hppa.c (elf32_hppa_link_hash_table_create): Likewise.
+	* elf32-i386.c (elf_i386_link_hash_table_create): Likewise.
+	* elf32-m68k.c (elf_m68k_link_hash_table_create): Likewise.
+	* elf32-s390.c (elf_s390_link_hash_table_create): Likewise.
+	* elf32-sh.c (sh_elf_link_hash_table_create): Likewise.
+	* elf64-alpha.c (elf64_alpha_bfd_link_hash_table_create): Likewise.
+	* elf64-ppc.c (ppc64_elf_link_hash_table_create): Likewise.
+	* elf64-s390.c (elf_s390_link_hash_table_create): Likewise.
+	* elf64-sh64.c (sh64_elf64_link_hash_table_create): Likewise.
+	* elf64-sparc.c (sparc64_elf_bfd_link_hash_table_create): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_link_hash_table_create): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_link_hash_table_create): Likewise.
+	* linker.c (_bfd_generic_link_hash_table_create): Likewise.
+	* m68klinux.c (linux_link_hash_table_create): Likewise.
+	* sparclinux.c (linux_link_hash_table_create): Likewise.
+	* sunos.c (sunos_link_hash_table_create): Likewise.
+	* xcofflink.c (_bfd_xcoff_bfd_link_hash_table_create): Likewise.
+
+	* targets.c: Add _bfd_link_hash_table_free to xvec.
+
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* libcoff.h: Regenerate.
+
+2002-04-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* dep-in.sed: Cope with absolute paths.
+	* Makefile.am (dep.sed): Subst TOPDIR, and not INCDIR.
+	Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* coff-arm.c: Fix copyright date.
+	* cpu-h8300.c: Likewise.
+	* cpu-i370.c: Likewise.
+	* cpu-s390.c: Likewise.
+	* cpu-mips.c: Likewise.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2002-04-04  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* Makefile.am: Add elfxx-mips.c to the known backends.
+	(elf32-mips.lo): remove dependency to coff/external.h.
+	* Makefile.in: Regenerate.
+	* configure.in: Add elfxx-mips.lo to all vectors using elf32-mips.lo
+	Remove elf32-mips.lo from 64 bit vectors. Update dependencies
+	accordingly.
+	* configure: Regenerate.
+	* elf-bfd.h: Move all MIPS ELF specific prototypes to elfxx-mips.h.
+	(irix_compat_t): IRIX compatibility level, moved from elf32-mips.c.
+	(elf_backend_mips_irix_compat, elf_backend_mips_rtype_to_howto): New
+	MIPS specific backend functions.
+	* elf32-mips.c: Moved most code to elfxx-mips.c.
+	(mips_elf_hi16_reloc): Rename from _bfd_mips_elf_hi16_reloc and make
+	static.
+	(mips_elf_lo16_reloc): Likewise, was _bfd_mips_elf_lo16_reloc.
+	(mips_elf_got16_reloc): Likewise, was _bfd_mips_elf_got16_reloc.
+	(mips_elf_gprel32_reloc): Likewise, was _bfd_mips_elf_gprel32_reloc.
+	(mips_elf32_rtype_to_howto): Rename from mips_rtype_to_howto. Changed
+	interface to allow selection of the right REL or RELA howto table.
+	(mips_elf32_object_p): Rename from _bfd_mips_elf_object_p and made
+	static. Let it refuse n32 objects.
+	(elf32_mips_grok_prstatus): Rename from _bfd_elf32_mips_grok_prstatus.
+	(elf32_mips_grok_psinfo): Rename from _bfd_elf32_mips_grok_psinfo.
+	(elf32_mips_discard_info): Rename from _bfd_elf32_mips_discard_info.
+	(elf32_mips_ignore_discarded_relocs): Rename from
+	_bfd_elf32_mips_ignore_discarded_relocs.
+	(elf32_mips_write_section): Rename from _bfd_elf32_mips_write_section.
+	(elf32_mips_irix_compat): New function, replaces IRIX_COMPAT.
+	(elf_mips_howto_table_rela): Remove.
+	* elf64-mips.c: Moved most code to elfxx-mips.c.
+	(bfd_elf64_bfd_reloc_type_lookup): Make static.
+	(mips_elf64_rtype_to_howto): New function.
+	(mips_elf64_object_p): Likewise.
+	(elf64_mips_irix_compat): Likewise.
+	* elfxx-mips.c: New file containing common code merged together from
+	elf32-mips.c and elf64-mips.c.
+	* elfxx-mips.h: New file containing MIPS specific prototypes from
+	elf-bfd.h.
+	* elfxx-target.h: Add handling for elf_backend_mips_irix_compat and
+	elf_backend_mips_rtype_to_howto.
+
+2002-04-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* srec.c (MAXCHUNK, Chunk): Revise comments.
+	(srec_write_record): Correct buffer size.
+	(srec_write_header): Do without intermediate buffer.
+	(srec_write_section): Validate Chunk.
+	(srec_write_terminator): Pass NULL instead of dummy buffer.
+	(srec_write_symbols): Pass file and symbol names directly to
+	bfd_bwrite so sprintf won't overflow buffer.
+
+2002-04-03  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-sparc.c (elf32_sparc_relocate_section): Don't emit dynamic
+	PC relative relocs against hidden symbols.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+
+2002-04-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (_bfd_elf_make_section_from_shdr): When setting section
+	LMAs, loop over segments until p_vaddr and p_memsz specify an
+	extent enclosing the section.
+
+2002-04-02  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* ihex.c (ihex_write_object_contents): Do not allow records to
+	cross a 64K boundary - wrap if necessary.
+
+2002-04-01  Nathan Williams  <nathanw@wasabisystems.com>
+
+	* elf.c (elfcore_netbsd_get_lwpid): Fix off-by-one error
+	which caused the returned LWP ID to always be 0.
+
+2002-04-01  Richard Henderson  <rth@redhat.com>
+
+	* elf32-sparc.c (WILL_CALL_FINISH_DYNAMIC_SYMBOL): New.
+	(elf32_sparc_relocate_section): Use it to figure out when to
+	initialize .got entries.
+	* elf64-sparc.c: Similarly.
+
+2002-03-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* linker.c (link_action): Ignore duplicate warning syms.
+	(_bfd_generic_link_write_global_symbol): Follow warning symbol link.
+	* elflink.h (elf_adjust_dynstr_offsets): Likewise.
+	(elf_adjust_dynamic_symbol): Likewise.
+	(elf_export_symbol): Likewise.
+	(elf_link_find_version_dependencies): Likewise.
+	(elf_link_assign_sym_version): Likewise.
+	(elf_link_sec_merge_syms): Likewise.
+	(elf_link_output_extsym): Likewise.
+	(elf_gc_sweep_symbol): Likewise.
+	(elf_gc_propagate_vtable_entries_used): Likewise.
+	(elf_gc_smash_unused_vtentry_relocs): Likewise.
+	(elf_gc_allocate_got_offsets): Likewise.
+	(elf_collect_hash_codes): Likewise.
+	* elflink.c (elf_link_renumber_hash_table_dynsyms): Likewise.
+	* elf-hppa.h (elf_hppa_unmark_useless_dynamic_symbols): Likewise.
+	(elf_hppa_remark_useless_dynamic_symbols): Likewise.
+	* elf-m10300.c (elf32_mn10300_finish_hash_table_entry): Likewise.
+	* elf32-arm.h (elf32_arm_discard_copies): Likewise.
+	* elf32-cris.c (elf_cris_adjust_gotplt_to_got): Likewise.
+	(elf_cris_discard_excess_dso_dynamics): Likewise.
+	* elf32-hppa.c (clobber_millicode_symbols): Likewise.
+	(mark_PIC_calls): Likewise.
+	(allocate_plt_static): Likewise.
+	(allocate_dynrelocs): Likewise.
+	(readonly_dynrelocs): Likewise.
+	* elf32-i386.c (allocate_dynrelocs): Likewise.
+	(readonly_dynrelocs): Likewise.
+	* elf32-i370.c (i370_elf_adjust_dynindx): Likewise.
+	* elf32-m68k.c (elf_m68k_discard_copies): Likewise.
+	* elf32-mips.c (mips_elf_output_extsym): Likewise.
+	(mips_elf_sort_hash_table_f): Likewise.
+	(mips_elf_check_mips16_stubs): Likewise.
+	* elf32-s390.c (allocate_dynrelocs): Likewise.
+	(readonly_dynrelocs): Likewise.
+	* elf32-sh.c (sh_elf_discard_copies): Likewise.
+	* elf32-xstormy16.c (xstormy16_relax_plt_check): Likewise.
+	(xstormy16_relax_plt_realloc): Likewise.
+	* elf64-alpha.c (elf64_alpha_calc_got_offsets_for_symbol): Likewise.
+	(elf64_alpha_output_extsym): Likewise.
+	* elf64-hppa.c (elf64_hppa_mark_exported_functions): Likewise.
+	* elf64-mips.c (mips_elf64_sort_hash_table_f): Likewise.
+	(mips_elf64_check_mips16_stubs): Likewise.
+	(mips_elf64_output_extsym): Likewise.
+	* elf64-ppc.c (func_desc_adjust): Likewise.
+	(allocate_dynrelocs): Likewise.
+	(readonly_dynrelocs): Likewise.
+	* elf64-s390.c (allocate_dynrelocs): Likewise.
+	(readonly_dynrelocs): Likewise.
+	* elf64-sh64.c (sh64_elf64_discard_copies): Likewise.
+	* elf64-x86-64.c (allocate_dynrelocs): Likewise.
+	(readonly_dynrelocs): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_global_dyn_sym_thunk): Likewise.
+	* aoutx.h (aout_link_write_other_symbol): Likewise.
+	* cofflink.c (_bfd_coff_write_task_globals): Likewise.
+	(_bfd_coff_write_global_sym): Likewise.
+	* i386linux.c (linux_tally_symbols): Likewise.
+	* m68klinux.c (linux_tally_symbols): Likewise.
+	* sparclinux.c (linux_tally_symbols): Likewise.
+	* pdp11.c (aout_link_write_other_symbol): Likewise.
+	* sunos.c (sunos_scan_dynamic_symbol): Likewise.
+	* xcofflink.c (xcoff_build_ldsyms): Likewise.
+	(xcoff_write_global_symbol): Likewise.
+
+	* cofflink.c (_bfd_coff_final_link): Formatting.
+	* cpu-mips.c (mips_compatible): Make static, prototype.
+	* elf32-i386.c (elf_i386_check_relocs): Formatting.
+	* elf32-sh.c (sh_elf_size_dynamic_sections): Likewise.
+	* elf64-alpha.c (elf64_alpha_output_extsym): Likewise.
+	* elf64-mips.c (mips_elf64_sort_hash_table): Likewise.
+	(mips_elf64_final_link): Likewise.
+	* elflink.h (elf_link_find_version_dependencies): Remove duplicate
+	prototype.
+
+2002-03-27  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* coff-arm.c (SWAP_IN_RELOC_OFFSET): Define.
+	(SWAP_OUT_RELOC_OFFSET): Define.
+
+2002-03-27  Gregory Steuck <greg@nest.cx>
+
+	* elf.c (_bfd_elf_get_symtab_upper_bound): Leave space for
+	terminating NULL if empty symbol table.
+	(_bfd_elf_get_dynamic_symtab_upper_bound): Likewise.
+
+2002-03-26  H.J. Lu  (hjl@gnu.org)
+
+	* elflink.h (elf_link_input_bfd): Revert the last change since
+	the gcc exception handling isn't fixed yet.
+
+2002-03-26  H.J. Lu  (hjl@gnu.org)
+
+	* elflink.h (elf_link_input_bfd): Complain about relocations
+	against local symbols in discarded sections.
+
+2002-03-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_gc_mark): Don't recurse into non-ELF sections.
+
+2002-03-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (_bfd_elf_make_section_from_shdr): Don't set lma based on
+	section file offset for !SEC_LOAD sections.
+
+2002-03-21  Richard Earnshaw  <rearnsha@arm.com>
+
+	* elf32-arm.h (elf32_arm_final_link_relocate <case R_ARM_GOTOFF>,
+	<case R_ARM_GOT>): Handle relocations to Thumb functions.
+
+2002-03-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* coff64-rs6000.c (_bfd_xcoff64_put_symbol_name): Prototype.
+	Whitespace changes.
+	* archive.c: Update copyright date.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* Makefile.am: Run "make dep-am"
+	* Makefile.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2002-03-20  Daniel Jacobowitz  <drow@mvista.com>
+
+	* dwarf2.c (struct funcinfo): Move up.
+	(lookup_address_in_function_table): New argument function_ptr.
+	Set it.
+	(lookup_address_in_line_table): New argument function.  If function
+	is non-NULL, use it to handle ``addr'' before the first line note of
+	the function.
+	(comp_unit_find_nearest_line): Update and swap calls to
+	lookup_address_in_function_table and lookup_address_in_line_table.
+	* syms.c (_bfd_stab_section_find_nearest_line): Use the first
+	N_SLINE encountered if we see an N_FUN before any N_SLINE.
+
+2002-03-20  Tom Rix  <trix@redhat.com>
+
+	* coff-rs6000.c (_bfd_xcoff_stat_arch_elt): Renamed from
+	_bfd_xcoff_generic_stat_arch_elt.  Fix format check.
+	* coff64-rs6000.c : Use _bfd_xcoff_stat_arch_elt.
+
+2002-03-19  Tom Rix  <trix@redhat.com>
+
+	* xcofflink.c (_bfd_xcoff_bfd_link_add_symbols): Look through all
+	dynamic objects in archives.
+
+2002-03-19  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* elflink.h (NAME(bfd_elf,record_link_assignment)): Don't set
+	STT_NOTYPE symbols to STT_OBJECT.
+
+2002-03-18  Jan Hubicka  <jh@suse.cz>
+
+	* cpu-i386.c (bfd_x86_64_arch): Rename to "i386:x86-64"
+
+2002-03-18  Tom Rix  <trix@redhat.com>
+
+	* aix5ppc.core.c : New file for AIX 5 64 bit core support.
+	* bfd-in.h : Add bfd_xcoff_ar_archive_set_magic declaration.
+	* coff-rs6000 (do_pad) : New function for archive padding.
+	(do_copy) : New function for object file copying in archives.
+	(do_shared_object_padding) : New function for padding shared
+	objects to their text section alignment in archives.
+	(bfd_xcoff_ar_achive_set_magic) : Stub.
+	(xcoff_write_armap_big) : Use do_copy and do_pad.
+	(xcoff_write_archive_contents_big) : Use do_shared_object_padding,
+	do_copy and do_pad.
+	* coff64-rs6000.c (xcoff64_write_ojbect_contents) : Use
+	bfd_xcoff_magic_number.
+	(xcoff64_bad_format_hook) : New function for _bfd_bad_format_hook
+	fop.
+	(xcoff_backend_data_r) : Use xcoff64_bad_format_hook.
+	(bfd_xcoff_aix5_backend_data) : New Aix 5 backend data.
+	(aix5coff64_vec) : New Aix 5 target aix5coff64-rs6000.
+	* rs6000-core.c : Update copyright date.
+	* xcofflink.c (bfd_xcoff_size_dynamic_sections): Check for NULL
+	csectpp.
+	* coffcode.h (coff_new_section_hook) : Use new accessor macros.
+	(coff_set_arch_mach_hook) : Add Aix 5 U64_TOCMAGIC magic #.
+	(coff_set_flags) : Use bfd_xcoff_magic_number.
+	* libxcoff.h (bfd_xcoff_is_xcoff64): Add U64_TOCMAGIC.
+	* configure.in : Add powerpc-*-aix5 and rs6000-*-aix5 support.
+	* Makefile.am : Same.
+	* config.bfd : Same.
+	* targets.c : Same.
+	* configure : Regnerate.
+	* Makefile.in : Same.
+	* bfd-in2.h : Same.
+
+2002-03-18  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* po/fr.po: Updated version.
+
+2002-03-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* libbfd.c (bfd_write_bigendian_4byte_int): Return true iff success.
+	* libbfd.h: Regenerate.
+	* archive.c (coff_write_armap): Pass on failures from
+	bfd_write_bigendian_4byte_int.
+
+2002-03-14  H.J. Lu <hjl@gnu.org>
+
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Set the BFD
+	error to bfd_error_nonrepresentable_section for reinit_array
+	section in DSO.
+
+2002-03-14  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* coffcode.h (coff_slurp_symbol_table): When adding BSF_WEAK flag,
+	OR it in rather than replacing previously selected flags.
+
+	* elfxx-target.h (TARGET_BIG_SYM): Set ar_max_namelen to 15.
+	(TARGET_LITTLE_SYM): Set ar_max_namelen to 15.
+
+2002-03-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* cpu-mips.c (mips_compatible): New.  Don't check bits_per_word.
+	(N): Use the above.
+	* elflink.h (elf_bfd_final_link): Revert last change.  Instead,
+	ensure reloc size matches before calling elf_link_input_bfd.
+	Add an assert to check reloc size when counting output relocs.
+
+2002-03-14  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* mmo.c (mmo_get_loc): Return NULL rather than false.
+
+2002-03-13  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* po/fr.po: Updated version.
+
+2002-03-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* archures.c (bfd_default_compatible): Test bits_per_word.
+	* cpu-i386.c (i386_compatible): Remove.  Replace occurrences with
+	bfd_default_compatible.
+	* cpu-i370.c (i370_compatible): Likewise.
+	* cpu-sparc.c (sparc_compatible): Likewise.
+	* cpu-h8300.c (compatible): Test in->arch == out->arch.
+
+	* elflink.h: Formatting fixes.
+	(elf_link_output_extsym): Merge undefined and undef weak cases.
+
+	* elflink.h (elf_bfd_final_link): Only call elf_link_input_bfd
+	when word size of input matches output word size.
+
+2002-03-12  Andreas Jaeger  <aj@suse.de>
+
+	* cpu-i386.c (i386_compatible): New.  Use it instead of
+	bfd_default_compatible.
+
+2002-03-07  H.J. Lu  (hjl@gnu.org)
+
+	* coff-sh.c (shcoff_reloc_map): Use bfd_reloc_code_real_type
+	as the type for bfd_reloc_val.
+
+2002-03-05  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* elf-hppa.h (elf_hppa_is_dynamic_loader_symbol): New function.
+	(elf_hppa_relocate_section): Ignore undefined dynamic loader symbols.
+	(elf_hppa_final_link_relocate): Correct relocations for indirect
+	references to local data through the DLT.  Fix .opd creation for
+	local symbols using R_PARISC_LTOFF_FPTR32 and R_PARISC_FPTR64
+	relocations.  Use e_lsel selector for R_PARISC_DLTIND21L,
+	R_PARISC_LTOFF_FPTR21L and R_PARISC_LTOFF_TP21L as per
+	"Processor-Specific ELF for PA_RISC, Version 1.43" document.
+	Similarly, use e_rsel for DLT and LTOFF 'R' relocations.
+	* elf32-hppa.c (final_link_relocate): Revise relocation selectors
+	as per "Processor-Specific ELF for PA_RISC, Version 1.43" document.
+
+2002-03-05  Jakub Jelinek  <jakub@redhat.com>
+
+	* merge.c (_bfd_merge_sections): Don't segfault if there
+	is nothing to merge due to GC.
+
+2002-03-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-hppa.c (clobber_millicode_symbols): Remove hack to keep
+	symbols that have been forced local.
+
+	* elflink.h (elf_bfd_final_link): Call elf_link_output_extsym
+	to output forced local syms for non-shared link.
+	(elf_link_output_extsym): Tweak condition for calling backend
+	adjust_dynamic_symbol so that previous behaviour is kept.
+	Whitespace changes throughout file.
+
+2002-03-04  H.J. Lu <hjl@gnu.org>
+
+	* elf.c (bfd_section_from_shdr): Handle special sections,
+	.init_array, .fini_array and .preinit_array.
+	(elf_fake_sections): Likewise.
+
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Create the
+	DT entry only if the section is in output for .init_array,
+	.fini_array and .preinit_array. Complain about .preinit_array
+	section in DSO.
+	(elf_bfd_final_link): Warn zero size for .init_array,
+	.fini_array and .preinit_array sections.
+
+	* elfxx-ia64.c (elfNN_ia64_section_from_shdr): Remove
+	SHT_INIT_ARRAY, SHT_FINI_ARRAY and SHT_PREINIT_ARRAY.
+	(elfNN_ia64_fake_sections): Remove .init_array, .fini_array and
+	.preinit_array.
+
+2002-03-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* configure.in (WIN32LIBADD): Don't eval PICFLAG assignment.
+	* configure: Regenerate.
+
+2002-03-02  Tom Rix  <trix@redhat.com>
+
+	* coff64-rs6000.c (xcoff64_howto_table): Replace howto types with
+	symbolic equiv.
+	* coff-rs6000.c (xcoff_howto_table): Same.
+
+2002-03-01  David Mosberger  <davidm@hpl.hp.com>
+
+	* elflink.h (size_dynamic_sections): If section named
+	".preinit_array" exists, create DT_PREINIT_ARRAY and
+	DT_PREINIT_ARRAYSZ entries in dynamic table.  Analogously for
+	".init_array" and ".fini_array".
+	(elf_bfd_final_link): Handle DT_PREINIT_ARRAYSZ, DT_INIT_ARRAYSZ,
+	DT_FINI_ARRAYSZ, DT_PREINIT_ARRAY, DT_INIT_ARRAY, and
+	DT_FINI_ARRAY.
+
+2002-02-26  Andrew Macleod  <amacleod@cygnus.com>
+
+	* elflink.h (elf_bfd_final_link): Don't crash on SHN_UNDEF local
+	dynsyms.
+
+2002-02-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-hppa.h: Update copyright date.
+
+	* elf64-ppc.c (ppc64_elf_check_relocs): Warning fix.
+	(ppc64_elf_relocate_section): Don't generate power4 style branch
+	hints for *_BRTAKEN and *_BRNTAKEN relocs.
+
+2002-02-22  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf64-sh64.c (sh_elf64_relocate_section): Fix a typo from my
+	last patch.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+
+2002-02-21  Andreas Jaeger  <aj@suse.de>
+
+	* elf64-x86-64.c: Major rework that introduces all recent changes
+	to the x86-64 backend.  Get a closer match to elf32-i386.
+	(struct elf64_x86_64_dyn_relocs): Rename from
+	elf64_x86_64_pcrel_relocs_copied, add additional fields.  Change
+	all users.
+	(struct elf64_x86_64_link_hash_table): Add short cuts to some
+	sections.
+	(link_hash_newfunc): Rename from elf64_x86_64_link_hash_newfunc,
+	remove casts, initialize new hash members.
+	(create_got_section): New.
+	(elf64_x86_64_create_dynamic_sections): New.
+	(elf64_x86_64_copy_indirect_symbol): New.
+	(elf64_x86_64_check_relocs): Don't allocate space for dynamic
+	relocs, .got or .relgot here but do it in allocate_dynrelocs.
+	Reference count possible .plt and .got entries.  Don't test input
+	section SEC_READONLY here to try to avoid copy relocs, and keep
+	dyn_relocs regardless of ELF_LINK_NON_GOT_REF.  Don't set
+	DF_TEXTREL here.  Delay setting of variables until needed.  Cache
+	pointer to "sreloc" section in elf_section_data. Tweak condition
+	under which .got created.  Report files with bad relocation
+	section names.
+	(elf64_x86_64_gc_sweep_hook): Sweep dyn_relocs and local_dynrel.
+	Reference count possible .plt entries.  Don't deallocate .got and
+	.relgot space here.
+	(elf64_x86_64_adjust_dynamic_symbol): Handle nocopyreloc.  Don't
+	do copy reloc processing for weakdefs.  Remove redundant casts and
+	aborts.  Delay setting of vars until needed.  Move creation of
+	dynamic symbols and allocation of .plt and .rela.plt to
+	allocate_dynrelocs.  Replace BFD_ASSERT with abort.
+	(WILL_CALL_FINISH_DYNAMIC_SYMBOL): New.
+	(allocate_dynrelocs): New.
+	(readonly_dynrelocs): New.
+	(elf64_x86_64_size_dynamic_sections): Call readonly_dynrelocs.
+	Allocate space for dyn relocs.  Replace BFD_ASSERT with abort.
+	Zero out the dynamic allocated content space.
+	(elf64_x86_64_discard_copies): Removed.
+	(elf64_x86_64_relocate_section): Make use of dynamic section
+	short-cuts.  Localise vars, and delay setting.  Better error
+	reporting, replace BFD_ASSERT with abort.  Check
+	ELF_LINK_HASH_DEF_DYNAMIC to see if a symbol is not defined in the
+	regular object file and tread the weak definition as the normal
+	one.  Don't discard relocs for undefweak or undefined symbols and
+	check !DEF_REGULAR as well as DEF_DYNAMIC in test for avoided copy
+	relocs.
+	(elf64_x86_64_finish_dynamic_symbol): Don't copy relocs for
+	symbols that have been forced local.  Use same test to decide if
+	we can use a relative reloc for got as relocate_section.  Expand
+	SHN_UNDEF comment.  Move expressions out of function calls.
+	Replace BFD_ASSERT with abort.
+	(bfd_elf64_bfd_final_link): Removed.
+	(elf_backend_copy_indirect_symbol): Define.
+
+2002-02-20  Tom Rix  <trix@redhat.com>
+
+	* coff-rs6000.c (xcoff_howto_table): Add 16 bit R_BA.
+	(_bfd_xcoff_reloc_type_lookup): Use it.
+	* coff64-rs6000.c (xcoff64_howto_table): Same.
+	(xcoff64_reloc_type_lookup): Same.
+
+2002-02-20  Peter Schauer  <pes@regent.e-technik.tu-muenchen.de>
+
+	* osf-core.c (osf_core_vec): OSF/1 (Digital Unix) core files are
+	little endian.
+
+2002-02-19  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* archures.c (bfd_mach_s390_esa): Rename to bfd_mach_s390_31.
+	(bfd_mach_s390_esame): Rename to bfd_mach_s390_64.
+	* bfd-in2.h: Regenerate.
+	* cpu-s390.c (arch_info_struct): Use renamed architecture defines.
+	Replace architecture name "s390" with "s390:31-bit" and "s390:esame"
+	with "s390:64-bit".
+	* elf32-s390.c (elf_howto_table): Add 32 bit pc relative relocations.
+	(elf_s390_reloc_type_lookup): Likewise.
+	(elf_s390_check_relocs): Likewise.
+	(elf_s390_gc_sweep_hook): Likewise.
+	(elf_s390_relocate_section): Likewise.
+	(elf_s390_object_p): Use renamed architecture define.
+	* elf64-s390.c (elf_s390_object_p): Use renamed architecture define.
+
+2002-02-19  Frank Ch. Eigler  <fche@redhat.com>
+
+	* syms.c (stt[]): Sorted.  Added .init/.fini -> "t" mapping.
+
+2002-02-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Enable
+	absptr -> pcrel optimization for shared libs.
+	Only create minimal .eh_frame_hdr if absptr FDE encoding in shared
+	library cannot be converted to pcrel.
+	(_bfd_elf_eh_frame_section_offset): Return -2 if making absptr
+	relative.
+	* elf32-i386.c (elf_i386_relocate_section): If
+	_bfd_elf_section_offset returned -2, skip, but make sure the
+	relocation is installed.
+	* elf32-arm.h (elf32_arm_final_link_relocate): Likewise.
+	* elf32-cris.c (cris_elf_relocate_section): Likewise.
+	* elf32-hppa.c (elf32_hppa_relocate_section): Likewise.
+	* elf32-i370.c (i370_elf_relocate_section): Likewise.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	* elf32-s390.c (elf_s390_relocate_section): Likewise.
+	* elf32-sh.c (sh_elf_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+	* elf64-ppc.c (ppc64_elf_relocate_section): Likewise.
+	* elf64-s390.c (elf_s390_relocate_section): Likewise.
+	* elf64-sh64.c (sh_elf64_relocate_section): Likewise.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relocate_section): Handle
+	_bfd_elf_section_offset returning -2 the same way as -1.
+	* elfxx-ia64.c (elfNN_ia64_install_dyn_reloc): Likewise.
+	* elf32-mips.c (mips_elf_create_dynamic_relocation): Add FIXME
+	and BFD_ASSERT.
+	* elf64-mips.c (mips_elf64_create_dynamic_relocation): Likewise.
+
+2002-02-18  Tom Rix  <trix@redhat.com>
+
+	* xcofflink.c (bfd_xcoff_link_gernate_rtinit): Add -brtl support.
+	(bfd_xcoff_size_dynamic_sections): Same.
+	* bfd-in.h (bfd_xcoff_link_generate_rtinit): Same.
+	(bfd_xcoff_size_dynamic_sections): Same.
+	* coff-rs6000.c (xcoff_generate_rtinit): Same.
+	* coff-rs646000.c (xcoff64_generate_rtinit): Same.
+	* libxcoff.h (struct xcoff_backend_data_rec): Same.
+	* xcofflink.c (xcoff_build_ldsyms, xcoff_link_add_symbols): Clean.
+	* bfd-in2.h: Regenerate.
+
+2002-02-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (STFD_FR0_0R1, LFD_FR0_0R1, BLR): Define.
+	(struct ppc_link_hash_table): Add sfpr.
+	(ppc64_elf_link_hash_table_create): Init it.
+	(ppc64_elf_create_dynamic_sections): Split creation of .stub and
+	.glink out to..
+	(create_linkage_sections): ..here.  Make .sfpr too.
+	(ppc64_elf_check_relocs): Call create_linkage_sections, and set
+	dynobj early.
+	(MIN_SAVE_FPR, MAX_SAVE_FPR): Define.
+	(ppc64_elf_func_desc_adjust): Look for missing ._savef* and
+	._restf* functions, and create as needed.
+	(func_desc_adjust): Only force_local for shared libs.
+
+2002-02-18  David O'Brien  <obrien@FreeBSD.org>
+
+	* configure.in: Bump version number post 2.12 branching.
+	* configure: Regenerate.
+
+2002-02-17  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* mmo.c: Correct and improve comments.
+	(mmo_write_chunk): Store trailing byte in bfd buffer; don't
+	zero-pad.  Use input to fill up non-empty bfd buffer.
+	(mmo_flush_chunk): New function.
+	(mmo_write_loc_chunk): Add parameter last_vmap, all callers
+	changed.  Don't emit location specifier if VMA is same as
+	*LAST_VMAP after omitting leading zero contents.  Call
+	mmo_flush_chunk before emitting location specifier.
+	(mmo_write_loc_chunk_list): Call mmo_flush_chunk when finished
+	with mmo_write_loc_chunk calls.
+	(mmo_internal_write_section): Call mmo_flush_chunk after
+	mmo_write_chunk.
+	(mmo_write_symbols_and_terminator): Move :Main to first position
+	in symbol array.  Add faked one if it does not exist if there are
+	other symbols.  Don't add it if there are no symbols at all.  Move
+	out test for value of :Main from symbol loop.  Rename table
+	fakemain to maintable and variable mainsym to fakemain.
+
+2002-02-15  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_relocate_section) [BRSGP]: A target
+	section with no got matches any got.  Simplify error generaion.
+
+2002-02-15  Alan Modra  <amodra@bigpond.net.au>
+
+	Support arbitrary length fill patterns.
+	* linker.c (bfd_new_link_order): Zero all fields with bfd_zalloc.
+	(_bfd_default_link_order): Remove bfd_fill_link_order code.
+	Call default_data_link_order.
+	(default_fill_link_order): Delete.
+	(default_data_link_order): New function.
+	* elf32-mips.c (_bfd_mips_elf_final_link): Replace occurrences
+	of bfd_fill_link_order with bfd_data_link_order.
+	* elf64-alpha.c (elf64_alpha_final_link): Likewise.
+	* elf64-mips.c (mips_elf64_final_link): Likewise.
+
+	* bfd.c (bfd_scan_vma): Clamp overflows to max bfd_vma value.
+	Correct value returned in "end" for "0x<non-hex>".
+
+2002-02-14  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* cpu-arm.c (processors): Replace 'arch' field with 'mach'.
+	(scan): Test against 'mach' field in info structure.
+
+2002-02-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (elf_fake_sections): Use SHT_NOBITS when SEC_NEVER_LOAD.
+
+2002-02-14  Matt Fredette  <fredette@netbsd.org>
+
+	* elf32-m68k.c (elf32_m68k_print_private_bfd_data): Recognize
+	EF_M68000.
+
+2002-02-13  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elf.c (_bfd_elf_make_section_from_shdr): Do not insist on
+	non-zero physical addresses when adjusting the LMAs of new
+	sections.
+
+2002-02-12  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* elf-hppa.h (elf_hppa_reloc_final_type): New function stripped
+	from _bfd_elf_hppa_gen_reloc_type.
+	(_bfd_elf_hppa_gen_reloc_type): Remove duplicate prototype.
+	* elf32-hppa.h (elf32_hppa_reloc_final_type): Add protptype.
+	* elf32-hppa.c: Include elf32-hppa.h before elf-hppa.h.
+	* elf64-hppa.h (elf64_hppa_reloc_final_type): Add protptype.
+
+2002-02-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf-m10300.c (mn10300_elf_relax_section): Skip section before
+	loading its contents if there's nothing to do in it.
+
+2002-02-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_size_stubs): Correct test for crossing
+	64k boundary.
+
+	* elf64-ppc.c (ppc64_elf_size_dynamic_sections): Add dynamic
+	DT_PPC64_OPD and DT_PPC64_OPDSZ tags.
+	(ppc64_elf_finish_dynamic_sections): Set values for them.
+
+2002-02-11  Michael Snyder  <msnyder@redhat.com>
+
+	* elf-bfd.h (elfcore_write_lwpstatus): Add prototype.
+	* elf.c (elfcore_grok_pstatus): Add prototype.
+	(elfcore_grok_lwpstatus): Add prototype.
+	(elfcore_write_lwpstatus): New function.
+	(elfcore_write_pstatus): Fix typo, eliminate unnecessary memcpy.
+
+2002-02-11  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-sh.c: Added missing prototypes.
+	* elf32-sh64.c: Likewise.
+	(sh_elf_align_loads): Mark unused args as such.
+	* elf64-sh64.c: Added missing prototypes.
+	(struct elf_sh64_link_hash_entry): Fix typo.
+	(sh_elf64_relocate_section): Fix info argument passed to
+	_bfd_elf_section_offset.
+
+2002-02-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: "make dep-am".
+	* Makefile.in: Regenerate.
+	* aclocal.m4: Regenerate.
+	* config.in: Regenerate.
+	* configure: Regenerate.
+
+2002-02-10  Daniel Jacobowitz  <drow@mvista.com>
+
+	* coff-rs6000.c (xcoff_generate_rtinit): Silence uninitialized
+	variable warnings.
+	* elf32-sh.c (sh_elf_relax_section): Silence signed/unsigned
+	comparison warning.
+	* trad-core.c (trad_unix_core_file_p): Silence pointer/integer
+	cast warnings for the common case.
+
+2002-02-10  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* config.bfd (sh-*-linux*, sh-*-elf* | sh-*-rtemself*): Add sh64
+	vectors.
+	(sh-*-netbsdelf*): New, to trump sh*-*-netbsdelf* and add sh64
+	vectors.
+
+2002-02-09  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_howto): Add R_ALPHA_BRSGP.
+	(elf64_alpha_reloc_map, elf64_alpha_check_relocs): Likewise.
+	(elf64_alpha_relocate_section): Likewise.
+	* reloc.c (BFD_RELOC_ALPHA_BRSGP): New.
+	* bfd-in2.h, libbfd.h: Rebuild.
+
+2002-02-09  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* elf64-mmix.c (_bfd_mmix_finalize_linker_allocated_gregs): Check
+	that base-plus-offset reloc accounting is consistent.
+	(mmix_elf_relax_section): Keep base-plus-offset reloc accounting
+	up to date for undefined symbols.
+
+2002-02-08  Eric Christopher  <echristo@redhat.com>
+
+	From Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* elf32-mips.c (_bfd_mips_elf_fake_sections): Don't create .rela
+	sections for the O32 ABI.
+
+2002-02-08  Chris Demetriou  <cgd@broadcom.com>
+
+	* elf32-arm.h: Fix formatting of _("...").
+	* elf32-d10v.c: Likewise.
+	* elf32-m68k.c: Likewise.
+	* elf32-mips.c: Likewise.
+
+2002-02-08  Ivan Guzvinec <ivang@opencores.org>
+
+	* coff-or32.c: Fix compile time warning messages.
+
+2002-02-08  Alexandre Oliva  <aoliva@redhat.com>
+
+	Contribute sh64-elf.
+	2002-01-23  Alexandre Oliva  <aoliva@redhat.com>
+	* reloc.c (R_SH_GOTPLT32, R_SH_GOT_LOW16, R_SH_GOT_MEDLOW16,
+	R_SH_GOT_MEDHI16, R_SH_GOT_HI16, R_SH_GOTPLT_LOW16,
+	R_SH_GOTPLT_MEDLOW16, R_SH_GOTPLT_MEDHI16, R_SH_GOTPLT_HI16,
+	R_SH_PLT_LOW16, R_SH_PLT_MEDLOW16, R_SH_PLT_MEDHI16,
+	R_SH_PLT_HI16, R_SH_GOTOFF_LOW16, R_SH_GOTOFF_MEDLOW16,
+	R_SH_GOTOFF_MEDHI16, R_SH_GOTOFF_HI16, R_SH_GOTPC_LOW16,
+	R_SH_GOTPC_MEDLOW16, R_SH_GOTPC_MEDHI16, R_SH_GOTPC_HI16,
+	R_SH_GOT10BY4, R_SH_GOTPLT10BY4, R_SH_GOT10BY8, R_SH_GOTPLT10BY8,
+	R_SH_COPY64, R_SH_GLOB_DAT64, R_SH_JMP_SLOT64, R_SH_RELATIVE64):
+	New relocs.
+	* libbfd.h, bfd-in2.h: Rebuilt.
+	* elf32-sh.c (sh_elf_howto_table): Define new relocs.
+	(sh_reloc_map): Map them.
+	(PLT_ENTRY_SIZE, elf_sh_plt0_entry_be, elf_sh_plt0_entry_le,
+	elf_sh_plt_entry_be, elf_sh_plt_entry_le, elf_sh_pic_plt_entry_be,
+	elf_sh_pic_plt_entry_le, elf_sh_plt0_entry, elf_sh_plt_entry,
+	elf_sh_pic_plt_entry, elf_sh_sizeof_plt, elf_sh_plt_plt0_offset,
+	elf_sh_plt0_gotplt_offset, elf_sh_plt_temp_offset,
+	elf_sh_plt_symbol_offset, elf_sh_plt_reloc_offset,
+	movi_shori_putval) [INCLUDE_SHMEDIA]: New.
+	(elf_sh_link_hash_entry) [INCLUDE_SHMEDIA]: Add
+	datalabel_got_offset.
+	(sh_elf_link_hash_newfunc): Initialize it.
+	(sh_elf_relocate_section): Augment the scope of
+	seen_stt_datalabel.  Introduce GOTPLT support.  Extend GOTPC, PLT,
+	GOT and GOTOFF handling to new SHmedia relocation types.  Support
+	GOT_BIAS.
+	(sh_elf_check_relocs): Likewise.
+	(sh_elf_finish_dynamic_symbol) [TARGET_SHMEDIA]: Set up values in
+	PLT entries using movi_shori_putval.  Support GOT_BIAS.
+	(sh_elf_finish_dynamic_sections): Likewise.
+	* elf32-sh64.c (shmedia_prepare_reloc): Do not add addend to
+	relocation, it's now done by the caller.
+	(GOT_BIAS): New.
+	* elf64-sh64.c (GOT_BIAS, PLT_ENTRY_SIZE, elf_sh64_sizeof_plt,
+	elf_sh64_plt_plt0_offset, elf_sh64_plt0_gotplt_offset,
+	elf_sh64_plt_temp_offset, elf_sh64_plt_symbol_offset,
+	elf_sh64_plt_reloc_offset, ELF_DYNAMIC_INTERPRETER,
+	elf_sh64_pcrel_relocs_copied, elf_sh64_link_hash_entry,
+	elf_sh64_link_hash_table, sh64_elf64_link_hash_traverse,
+	sh64_elf64_hash_table): New.
+	(sh_elf64_howto_table): Introduce new relocs.
+	(sh_elf64_info_to_howto): Accept new PIC relocs.
+	(sh_elf64_relocate_section): Augment the scope of
+	seen_stt_datalabel.  Support new PIC relocs.
+	(sh_elf64_check_relocs): Support new PIC relocs.
+	(elf_sh64_plt0_entry_be, elf_sh64_plt0_entry_le,
+	elf_sh64_plt_entry_be, elf_sh64_plt_entry_le,
+	elf_sh64_pic_plt_entry_be, elf_sh64_pic_plt_entry_le,
+	elf_sh64_plt0_entry, elf_sh64_plt_entry, elf_sh64_pic_plt_entry,
+	sh64_elf64_link_hash_newfunc, sh64_elf64_link_hash_table_create,
+	movi_shori_putval, movi_3shori_putval,
+	sh64_elf64_create_dynamic_sections,
+	sh64_elf64_adjust_dynamic_symbol, sh64_elf64_discard_copies,
+	sh64_elf64_size_dynamic_sections,
+	sh64_elf64_finish_dynamic_symbol,
+	sh64_elf64_finish_dynamic_sections): New.
+	(elf_backend_create_dynamic-sections,
+	bfd_elf64_bfd_link_hash_table_create,
+	elf_backend_adjust_dynamic_symbol,
+	elf_backend_size_dynamic_sections,
+	elf_backend_finish_dynamic_symbol,
+	elf_backend_finish_dynamic_sections, elf_backend_want_got_plt,
+	elf_backend_plt_readonly, elf_backend_want_plt_sym,
+	elf_backend_got_header_size, elf_backend_plt_header_size):
+	Define.
+	2001-05-16  Alexandre Oliva  <aoliva@redhat.com>
+	* elf32-sh.c: Renumbered and renamed some SH5 relocations to
+	match official numbers and names; moved unmaching ones to the
+	range 0xf2-0xff.
+	* elf32-sh64.c, elf64-sh64.c: Likewise.
+	2001-03-12  DJ Delorie  <dj@redhat.com>
+	* elf32-sh.c (sh_elf_relax_section): Don't relax SHmedia
+	sections.
+	2001-03-12  DJ Delorie  <dj@redhat.com>
+	* elf32-sh64.c (shmedia_prepare_reloc): Validate relocs that must
+	be aligned.
+	* elf64-sh64.c (sh_elf64_relocate_section): Ditto.
+	2001-01-14  Hans-Peter Nilsson  <hpn@cygnus.com>
+	* elf32-sh64.c (bfd_elf32_bfd_copy_private_section_data): Define.
+	(sh64_elf_fake_sections): Set type to SHT_SH5_CR_SORTED for a
+	.cranges section with SEC_SORT_ENTRIES set.
+	(sh64_backend_section_from_shdr): Set SEC_SORT_ENTRIES on an
+	incoming sorted .cranges section.
+	(sh64_bfd_elf_copy_private_section_data): New.
+	(sh64_elf_final_write_processing): Only sort .cranges and modify
+	start address if called by linker.
+	2001-01-08  Ben Elliston  <bje@redhat.com>
+	* elf32-sh64.c (sh64_elf_final_write_processing): Activate
+	Hans-Peter Nilsson's set bit 0 patch from 2001-01-06.
+	* elf64-sh64.c (sh64_elf64_final_write_processing): Ditto.
+	2001-01-06  Hans-Peter Nilsson  <hpn@cygnus.com>
+	* elf64-sh64.c (sh_elf64_howto_table): No open brace at start of
+	line.  Add comments before all entries.
+	<R_SH_PT_16, R_SH_SHMEDIA_CODE>: Correct and clarify describing
+	comment.
+	(sh_elf64_reloc): Correct head comment.
+	(sh_elf64_relocate_section): Correct spacing.
+	<relocating for a local symbol>: Do not honour STO_SH5_ISA32;
+	instead call reloc_dangerous callback.
+	<case R_SH_SHMEDIA_CODE>: New case.
+	(sh_elf64_gc_mark_hook): Correct spacing.
+	(sh_elf64_check_relocs): Ditto.
+	* elf32-sh64.c (shmedia_prepare_reloc) <case R_SH_SHMEDIA_CODE>:
+	New case.
+	* elf32-sh.c: Correct #endif comments for #ifndef-wrapped
+	functions.
+	(sh_elf_howto_table) <R_SH_PT_16, R_SH_SHMEDIA_CODE>: Correct,
+	clarify describing comment.  Add comments before all entries.
+	(sh_elf_relocate_section) <relocating for a local symbol>: Do not
+	honour STO_SH5_ISA32; instead call reloc_dangerous callback.
+	2001-01-06  Hans-Peter Nilsson  <hpn@cygnus.com>
+	Sort .cranges section in final link.  Prepare to set bit 0 on
+	entry address.
+	* elf32-sh64.c (struct sh64_find_section_vma_data): New.
+	(sh64_elf_link_output_symbol_hook): Fix typo in prototype.
+	(sh64_elf_set_mach_from_flags): Set SEC_DEBUGGING on incoming
+	.cranges section.
+	(sh64_backend_section_from_shdr): New, to recognize
+	SHT_SH5_CR_SORTED on incoming .cranges section.
+	(elf_backend_section_from_shdr): Define.
+	(sh64_elf_final_write_processing): Sort outgoing .cranges
+	section.  (New, temporarily disabled:) Set bit 0 on entry address
+	according to ISA type.
+	(sh64_find_section_for_address): New.
+	(crange_qsort_cmpb, crange_qsort_cmpl, crange_bsearch_cmpb,
+	crange_bsearch_cmpl): Move here from opcodes/sh64-dis.c.
+	(sh64_address_in_cranges): Move here from opcodes/sh64-dis.c.  Use
+	bfd_malloc, not xmalloc.
+	(sh64_get_contents_type): Move here from opcodes/sh64-dis.c.  Make
+	global.
+	* elf32-sh64.c (sh64_elf64_final_write_processing): New, (but
+	temporarily disabled) setting bit 0 on entry address.
+	(elf_backend_final_write_processing): Define.
+	2001-01-05  Hans-Peter Nilsson  <hpn@cygnus.com>
+	* elf32-sh.c (sh_elf_howto_table) <R_SH_PT_16>: Adjust fields to
+	be a proper relocation for PTA and PTB rather than a marker.
+	<R_SH_IMMU5, R_SH_IMMS6, R_SH_IMMU6, R_SH_IMMS10, R_SH_IMMS10BY2,
+	R_SH_IMMS10BY4, R_SH_IMMS10BY8, R_SH_IMMS16, R_SH_IMMU16,
+	R_SH_IMM_LOW16, R_SH_IMM_LOW16_PCREL, R_SH_IMM_MEDLOW16,
+	R_SH_IMM_MEDLOW16_PCREL, R_SH_IMM_MEDHI16, R_SH_IMM_MEDHI16_PCREL,
+	R_SH_IMM_HI16, R_SH_IMM_HI16_PCREL, R_SH_64, R_SH_64_PCREL>:
+	Zero src_mask.
+	* elf64-sh64.c: Ditto.
+	(sh_elf64_relocate_section) <case R_SH_PT_16>: New case.
+	* elf32-sh64.c: Include opcodes/sh64-opc.h
+	(shmedia_prepare_reloc): Take a bfd_link_info pointer as first
+	argument.  Drop const qualifiers from "bfd *" and "bfd_byte *"
+	parameters.  No unused parameters.  Caller changed.
+	<case R_SH_PT_16>: New case.
+	* Makefile.am (elf32-sh64.lo): Add dependency on sh64-opc.h.
+	* Makefile.in: Regenerate.
+	2000-12-30  Hans-Peter Nilsson  <hpn@cygnus.com>
+	* elf64-sh64.c (sh64_elf64_fake_sections): Set SHF_SH5_ISA32 for
+	all code sections.
+	(sh_elf64_set_mach_from_flags): Change from EF_SH64 to EF_SH5.
+	(sh64_elf_merge_private_data): Ditto.
+	* elf32-sh64.c (sh64_elf_fake_sections): Use sh64_elf_section_data
+	to access stored section flags.
+	(sh64_elf_final_write_processing): Return immediately unless
+	called by linker.  Use sh64_elf_section_data (cranges) to get size
+	of linker-generated cranges entries.
+	(sh64_elf_copy_private_data): Add missing "return true".
+	(sh64_elf_set_mach_from_flags): Change from EF_SH64 to EF_SH5.
+	(sh_elf64_merge_private_data): Ditto.
+	2000-12-19  Hans-Peter Nilsson  <hpn@cygnus.com>
+	* elf64-sh64.c (sh64_elf64_fake_sections): New, copy of
+	elf64-sh64.c:sh64_elf_fake_sections.
+	(elf_backend_fake_sections): Define as sh64_elf64_fake_sections.
+	2000-12-18  Hans-Peter Nilsson  <hpn@cygnus.com>
+	* elf32-sh64.c (sh64_elf_copy_private_data_internal): Delete.
+	(sh64_elf_final_write_processing): New.
+	(elf_backend_final_write_processing): Define.
+	(sh64_elf_fake_sections): Get header flags from tdata field.
+	(sh64_elf_copy_private_data): Do not call
+	sh64_elf_copy_private_data_internal, just copy e_flags field.
+	(sh64_elf_merge_private_data): Do not call
+	sh64_elf_copy_private_data_internal.
+	2000-12-12  Hans-Peter Nilsson  <hpn@cygnus.com>
+	Remove EF_SH64_ABI64, let ELF size make difference.
+	Remove SH64-specific BFD section flag.
+	* elf32-sh64.c (sh64_elf_fake_sections): Recognize section as
+	containing SHmedia through elf_section_data (asect)->tdata
+	non-zero, not using a BFD section flag.
+	(sh64_elf_set_mach_from_flags): Don't recognize EF_SH64_ABI64.
+	(sh64_elf_merge_private_data): Similar.
+	(elf_backend_section_flags): Don't define.
+	(sh64_elf_backend_section_flags): Delete.
+	* elf64-sh64.c (sh_elf64_set_mach_from_flags): Recognize EF_SH64,
+	not EF_SH64_ABI64.
+	(sh_elf64_merge_private_data): Similar.
+	* section.c (Section flags definitions): Don't define
+	SEC_SH_ISA_SHMEDIA.
+	(bfd-in2.h): Regenerate.
+	2000-12-09  Hans-Peter Nilsson  <hpn@cygnus.com>
+	Make DataLabel references work with partial linking.
+	* elf32-sh64.c: Fix formatting.
+	(sh64_elf_link_output_symbol_hook): New.
+	(elf_backend_link_output_symbol_hook): Define to
+	sh64_elf_link_output_symbol_hook.
+	(sh64_elf_add_symbol_hook): Make DataLabel symbol just global
+	undefined if partial linking.  Adjust sanity check.
+	* elf64-sh64.c (sh64_elf64_link_output_symbol_hook): New.
+	(elf_backend_link_output_symbol_hook): Define to
+	sh64_elf64_link_output_symbol_hook.
+	(sh64_elf64_add_symbol_hook): Make DataLabel symbol just global
+	undefined if partial linking.  Adjust sanity check.
+	2000-12-07  Hans-Peter Nilsson  <hpn@cygnus.com>
+	Implement semantics for inter-file DataLabel references.
+	* elf64-sh64.c (DATALABEL_SUFFIX): Define.
+	(sh64_elf64_add_symbol_hook): New.
+	(sh_elf64_relocate_section): If passing an indirect symbol with
+	st_type STT_DATALABEL on the way to a symbol with st_other
+	STO_SH5_ISA32, do not bitor 1 to the relocation.
+	(elf_backend_add_symbol_hook): Define to
+	sh64_elf64_add_symbol_hook.
+	* elf64-sh32.c: Tweak comments.
+	(DATALABEL_SUFFIX): Define.
+	(sh64_elf_add_symbol_hook): New.
+	(elf_backend_add_symbol_hook): Define to sh64_elf_add_symbol_hook.
+	* elf32-sh.c (sh_elf_relocate_section): If passing an indirect
+	symbol with st_type STT_DATALABEL on the way to a symbol with
+	st_other STO_SH5_ISA32, do not bitor 1 to the relocation.
+	2000-12-05  Hans-Peter Nilsson  <hpn@cygnus.com>
+	Pass through STT_DATALABEL.
+	* elf32-sh64.c (sh64_elf_get_symbol_type): New.
+	(elf_backend_get_symbol_type): Define.
+	* elf64-sh64.c (sh64_elf64_get_symbol_type): New.
+	(elf_backend_get_symbol_type): Define.
+	2000-11-30  Hans-Peter Nilsson  <hpn@cygnus.com>
+	* elf32-sh64.c: Tweak comments.
+	(sh64_elf_copy_private_data_internal): Add prototype.
+	(bfd_elf32_bfd_set_private_flags): Define.
+	(sh64_elf_copy_private_data_internal): Compare machine name, not
+	textual BFD target name, to check whether to copy section flag
+	SHF_SH5_ISA32.
+	(sh64_elf_merge_private_data): Validize bfd_get_arch_size.
+	Tweak section-contents-type-mismatch message.
+	(shmedia_prepare_reloc): Add ATTRIBUTE_UNUSED markers.
+	Validize reloc-types.
+	* elf64-sh64.c: New file.
+	* targets.c (bfd_elf64_sh64_vec, bfd_elf64_sh64l_vec): Declare.
+	* Makefile.am (BFD64_BACKENDS): Add elf64-sh64.lo.
+	(BFD64_BACKENDS_CFILES): Add elf64-sh64.c.
+	Regenerate dependencies.
+	* Makefile.in: Regenerate.
+	* config.bfd (sh64-*-elf*): Add bfd_elf64_sh64_vec and
+	bfd_elf64_sh64l_vec.
+	* configure.in: Handle bfd_elf64_sh64_vec and
+	bfd_elf64_sh64l_vec.
+	* configure: Regenerate.
+	* po/POTFILES.in: Regenerate.
+	* po/bfd.pot: Regenerate.
+	2000-11-29  Hans-Peter Nilsson  <hpn@cygnus.com>
+	* elf32-sh64.c (sh64_elf_set_mach_from_flags): Do not recognize
+	anything else but EF_SH64 and EF_SH64_ABI64.
+	(sh64_elf_merge_private_data): Emit error for anything else but
+	EF_SH64 and EF_SH64_ABI64.
+	* config.bfd: Remove bfd_elf32_shblin_vec and bfd_elf32_shlin_vec
+	from targ_selvecs.
+	* configure.in: Add cofflink.lo to bfd_elf32_sh64_vec and
+	bfd_elf32_sh64l_vec as a temporary measure.
+	* configure: Regenerate.
+	2000-11-27  Hans-Peter Nilsson  <hpn@cygnus.com>
+	* cpu-sh.c (arch_info_struct): Include sh5 item
+	unconditionalized.
+	* config.bfd (sh64-*-elf*): Do not set targ_cflags.
+	Add targ_selvecs bfd_elf32_sh_vec, bfd_elf32_shl_vec,
+	bfd_elf32_shblin_vec and bfd_elf32_shlin_vec.
+	* elf32-sh64.c: Tweak comments.
+	(sh64_elf_set_mach_from_flags): Recognize all machine flags that
+	are proper subsets of SH64 as bfd_mach_sh5.  Add EF_SH64_ABI64.
+	(sh64_elf_copy_private_data_internal): Wrap long line.
+	(sh64_elf_merge_private_data): Rewrite to allow objects from
+	SH64 subsets to be linked together.
+	(INCLUDE_SHMEDIA): Define.
+	* elf32-sh.c (sh_elf_relocate_section) <local symbol>:
+	Parenthesize plus-expression inside or-expression.
+	<global symbol>: Ditto.
+	(sh_elf_set_mach_from_flags): Remove code refusing
+	deleted EF_SH64_32BIT_ABI flag.
+	2000-11-26  Hans-Peter Nilsson  <hpn@cygnus.com>
+	* elf32-sh.c (sh_elf_howto_table) <R_SH_IMM_LOW16_PCREL,
+	R_SH_IMM_MEDLOW16_PCREL, R_SH_IMM_MEDHI16_PCREL,
+	R_SH_IMM_HI16_PCREL, R_SH_64_PCREL>: Set pcrel_offset to true.
+	(sh_elf_relocate_section) <local symbol>: Or 1 in
+	calculation of relocation if sym->st_other & STO_SH5_ISA32.
+	<global symbol>: Ditto if h->other & STO_SH5_ISA32.
+	* elf32-sh64.c (shmedia_prepare_reloc): Add rel->r_addend to
+	relocation.
+	2000-11-24  Hans-Peter Nilsson  <hpn@cygnus.com>
+	* Makefile.am (BFD32_BACKENDS): Add elf32-sh64.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-sh64.c.
+	Regenerate dependencies.
+	* Makefile.in: Regenerate.
+	* archures.c: Add bfd_mach_sh5.
+	* config.bfd: Map targ_cpu sh* to bfd_sh_arch.
+	Handle sh64-*-elf*.  Set targ_cflags to -DINCLUDE_SHMEDIA.
+	* configure.in: Handle bfd_elf32_sh64_vec and bfd_elf32_sh64l_vec.
+	* configure: Regenerate.
+	* reloc.c (BFD_RELOC_SH_SHMEDIA_CODE, BFD_RELOC_SH_IMMU5,
+	BFD_RELOC_SH_IMMS6, BFD_RELOC_SH_IMMS6BY32, BFD_RELOC_SH_IMMU6,
+	BFD_RELOC_SH_IMMS10, BFD_RELOC_SH_IMMS10BY2,
+	BFD_RELOC_SH_IMMS10BY4, BFD_RELOC_SH_IMMS10BY8,
+	BFD_RELOC_SH_IMMS16, BFD_RELOC_SH_IMMU16, BFD_RELOC_SH_IMM_LOW16,
+	BFD_RELOC_SH_IMM_LOW16_PCREL, BFD_RELOC_SH_IMM_MEDLOW16,
+	BFD_RELOC_SH_IMM_MEDLOW16_PCREL, BFD_RELOC_SH_IMM_MEDHI16,
+	BFD_RELOC_SH_IMM_MEDHI16_PCREL, BFD_RELOC_SH_IMM_HI16,
+	BFD_RELOC_SH_IMM_HI16_PCREL, BFD_RELOC_SH_PT_16): New relocations.
+	* cpu-sh.c [INCLUDE_SHMEDIA] (arch_info_struct): Define and link
+	in item for SH5.
+	* elf32-sh.c [INCLUDE_SHMEDIA] (sh_elf_howto_table): Add howto items
+	for SHmedia relocs.
+	[INCLUDE_SHMEDIA] (sh_rel): Add mappings for SHmedia relocs.
+	[INCLUDE_SHMEDIA] (sh_elf_relocate_section) [default]: Call
+	shmedia_prepare_reloc, goto final_link_relocate if it returns
+	non-zero, else fail as before.
+	(sh_elf_set_mach_from_flags): Provide function only if not defined
+	as macro.  Do not recognize objects with EF_SH64_32BIT_ABI set.
+	(sh_elf_set_private_flags): Provide function only if not defined
+	as a macro.
+	(sh_elf_copy_private_data): Similar.
+	(sh_elf_merge_private_data): Similar.
+	* section.c (SEC_SH_ISA_SHMEDIA): New.
+	* targets.c (bfd_elf32_sh64_vec, bfd_elf32_sh64l_vec): Declare.
+	* elf32-sh64.c: New file.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* po/POTFILES.in: Regenerate.
+	* po/bfd.pot: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2002-02-07  Daniel Jacobowitz  <drow@mvista.com>
+
+	* bfd-in.h: Update <stdbool.h> check to only see if <stdbool.h> has
+	been included, not drag it in.
+	* bfd-in2.h: Regenerate.
+
+2002-02-06  H.J. Lu  (hjl@gnu.org)
+
+	* elf32-mips.c (_bfd_mips_elf_merge_private_bfd_data): Update
+	the mach and ISA fields if necessary.
+
+2002-02-06  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* coffcode.h (coff_set_arch_mach_hook): Select the highest known
+	ARM architecture when an F_ARM_5 flag is detected, since we cannot
+	be sure exactly which architecture this represents.
+
+2002-02-05  Nick Clifton  <nickc@redhat.com>
+
+	* po/tr.po: Updated translation.
+
+2002-02-05  Alan Modra  <amodra@bigpond.net.au>
+
+	From Jimi X <jimix@watson.ibm.com>
+	* archures (bfd_mach_ppc64): Define.
+	(bfd_powerpc_arch): Rename to bfd_powerpc_archs.
+	(bfd_powerpc_arch): Define.
+	* bfd-in2.h: Regenerate.
+	* cpu-powerpc.c (arch_info_struct): Rename to bfd_powerpc_archs.
+	(bfd_powerpc_arch): Move to tail of bfd_powerpc_archs.
+	(bfd_powerpc_archs): Add default powerpc64 arch.
+
+2002-02-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_size_dynamic_sections): Check for relocs
+	against section syms in readonly sections.  Don't do the global
+	sym check if we find one.
+	* elf64-s390.c (elf_s390_size_dynamic_sections): Likewise.
+	* elf32-hppa.c (elf32_hppa_size_dynamic_sections): Likewise.
+	* elf32-i386.c (elf_i386_size_dynamic_sections): Likewise.
+	* elf32-s390.c (elf_s390_size_dynamic_sections): Likewise.
+	(elf_s390_grok_prstatus): Add missing prototype.
+
+2002-02-04  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* elf64-mmix.c (mmix_dump_bpo_gregs): New function.
+	(mmix_elf_check_common_relocs) <case R_MMIX_BASE_PLUS_OFFSET>:
+	Call bfd_get_section_by_name only once.  Initialize
+	bpodata->n_bpo_relocs_this_section.
+	(_bfd_mmix_prepare_linker_allocated_gregs): Remove comment
+	referring to DSOs.
+	(bpo_reloc_request_sort_fn): Don't use difference of values as
+	return-value.
+
+2002-02-02  David O'Brien  <obrien@FreeBSD>
+
+	* configure.in: Tweak the FreeBSD 4.x recognition more.  Only treat
+	version 4.5 and later the same as 5-CURRENT.
+	* configure: Re-generate.
+
+2002-02-02  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* config.bfd (hppa*-*-netbsd*): New target.
+
+2002-01-31  Philipp Thomas  <pthomas@suse.de>
+
+	* coff-arm.c (coff_arm_merge_private_bfd_data): Move ERROR
+	to front of message. Unify messages with elf32-arm.h. Use
+	commas where neccessary.
+	* elf32-arm.h (elf32_arm_merge_private_bfd_data): Use all upcase
+	ERROR in messages. Unify messages with coff-arm.c. Correct
+	VFP/FPA error message.
+	(elf32_arm_print_private_bfd_data): Don't mark APCS-26 and
+	APCS-32 for translation.
+
+2002-02-01  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	Perform on-demand global register allocation from
+	R_MMIX_BASE_PLUS_OFFSET relocs.
+	* elf64-mmix.c (struct bpo_reloc_section_info, struct
+	bpo_reloc_request, struct bpo_greg_section_info): New.
+	(mmix_elf_check_common_relocs, mmix_elf_gc_sweep_hook,
+	bpo_reloc_request_sort_fn, mmix_elf_relax_section,
+	_bfd_mmix_check_all_relocs,
+	_bfd_mmix_prepare_linker_allocated_gregs,
+	_bfd_mmix_finalize_linker_allocated_gregs): New functions.
+	(elf_mmix_howto_table): Correct src_mask for most relocs.
+	(mmix_elf_perform_relocation) <case R_MMIX_BASE_PLUS_OFFSET>: New
+	case.
+	(mmix_final_link_relocate) <case R_MMIX_BASE_PLUS_OFFSET>: New
+	case.  Fix typo in comment.  New label do_mmix_reloc.
+	(mmix_elf_check_relocs): Abuse bfd_link_info member base_file to
+	store first object file with a base-plus-offset reloc.  Call
+	mmix_elf_check_common_relocs for the part common with mmo.
+	(mmix_elf_final_link): Write out linker-allocated register
+	contents section.
+	(elf_backend_gc_sweep_hook): Define.
+	(bfd_elf64_bfd_relax_section): Define.
+
+	* mmo.c: Don't include <ctype.h>
+	(mmo_init): Correct init-once logic.
+
+2002-02-01  Tom Rix  <trix@redhat.com>
+
+	* config.bfd: Conditionally support <aiaff> for pre AIX 4.3.
+
+2002-02-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am"
+	* Makefile.in: Regenerate.
+
+2002-01-31  David O'Brien  <obrien@FreeBSD>
+
+	* configure.in: Recognize the differences in core files from FreeBSD
+	4.{0,1} and later versions of 4.x.  This treats 4.2+ the same as
+	5-CURRENT.
+	* configure: Regenerate.
+
+2002-01-31  Ivan Guzvinec  <ivang@opencores.org>
+
+	* coff-or32.c: New file.
+	* cpu-or32.c: New file.
+	* elf32-or32.c: New file.
+	* archures.c: Add support for or32.
+	* targets.c: Add support for or32.
+	* bfd-in2.h: Regenerate.
+	* coffcode.h (coff_set_arch_mach_hook, coff_set_flags,
+	coff_write_object_contents): Add support for or32.
+	* config.bfd: Add target.
+	* configure.in: Add support for or32.
+	* configure: Regenerate.
+	* Makefile.am: Add support for or32.
+	* Makefile.in: Regenerate.
+	* po/SRC-POTFILES.in: Add or32 files.
+	* po/bfd.pot: Regenerate.
+
+2002-01-31  Nick Clifton  <nickc@cambridge.redhat.com>
+	    Don Lindsay  <lindsayd@cisco.com>
+
+	* elf32-mips.c (mips_elf_calculate_relocation): Replace 'return
+	false' with a return of a bfd_reloc_ error code.
+
+2002-01-31  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (elf_cris_discard_excess_program_dynamics): Don't
+	unexport unreferenced symbols when --export-dynamic.  Call
+	_bfd_elf_strtab_delref when unexporting.
+
+2002-01-30  Daniel Jacobowitz  <drow@mvista.com>
+
+	* bfd-in.h: Include <stdbool.h> if it is available.
+	* bfd-in2.h: Regenerated.
+
+2002-01-31  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (func_desc_adjust): STV_PROTECTED functions should
+	not go via the plt.
+
+2002-01-30  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* archures.c: Tidy up formatting of embedded comments.
+	* bfd.c: Tidy up formatting of embedded comments.
+	* bfd-in.h: Fix formatting of comments.
+	* reloc.c: Tidy up formatting of ordinary & embedded comments.
+	* section.c: Tidy up formatting of embedded comments.
+	* syms.c: Tidy up formatting of embedded comments.
+	* targets.c: Tidy up formatting of embedded comments.
+
+	* bfd-in2.h: Regenerate.
+
+2002-01-30  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* vms-tir.c (cmd_name): New function.
+	(tir_cmd_name): New function.
+	(etir_sta, etir_sto, etir_opr, etir_stc): Use cmd_name().
+	(tir_opr, tir_ctl, tir_cmd): use tir_cmd_name().
+	Fix formatting.
+
+	* peXXigen.c (pe_print_idata): Rearrange message to aid in
+	translation.
+	(pe_print_pdata): Rearrange message to aid in translation.
+
+	* libbfd.c (warn_deprecated): Rearrange error message to aid in
+	translation.
+
+	* ihex.c (ihex_write_object_contents): Fix spelling typo.
+
+	* ieee.c (ieee_slurp_external_symbols): Remove spurious space.
+
+	* elf64-sparc.c (sparc64_elf_add_symbol_hook): Rearrange error
+	message to aid in translation.
+
+	* elf64-mmix.c (mmix_final_link_relocate): Rearrange error message
+	to aid in translation.
+
+	* elf32-arm.h (elf32_arm_merge_private_bfd_data): Fix typo.
+
+2002-01-30  Philipp Thomas  <pthomas@suse.de>
+
+	* coff-arm.c, elf32-elf.h: Unify messages.
+
+2002-01-30  Nick Clifton <nickc@redhat.com>
+
+	* po/sv.po: Updated translation.
+
+2002-01-30  Philipp Thomas  <pthomas@suse.de>
+
+	* dwarf2.c (read_abbrev): Use full section name in error message.
+	(decode_line_info): Likewise.
+
+	* elf.c (_bfd_elf_symbol_from_bfd_symbol): Don't translate debugging
+	message.
+
+2002-01-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (func_desc_adjust): Only provide missing function
+	descriptor symbols for undefined function code syms.  Clear
+	ELF_LINK_NON_ELF so that they can stay weak.
+
+2002-01-29  Chris Demetriou  <cgd@broadcom.com>
+	    Mitch Lichtenberg  <mpl@broadcom.com>
+
+	* bfd-in.h (bfd_mips_elf32_create_embedded_relocs): New prototype.
+	* elf32-mips.c (bfd_mips_elf32_create_embedded_relocs): New function
+	to handle 32-bit ELF embedded reloc (ld --embedded-relocs)
+	generation.
+	* bfd-in2.h: Regenerate.
+
+2002-01-29  Chris Demetriou  <cgd@broadcom.com>
+
+	* elf32-mips.c: Add additional comments about HI16 relocation
+	processing.
+	(_bfd_mips_elf_hi16_reloc): Don't subtract address here for
+	pc-relative relocations.  (Reverts change made on 2001-10-31.)
+	(_bfd_mips_elf_lo16_reloc): Subtract address of LO16 part here
+	for pc-relative relocations.
+	(mips_elf_calculate_relocation): Add a comment about a kludge
+	in the R_MIPS_GNU_REL_HI16 handling.
+	(_bfd_mips_elf_relocate_section): Implement that kludge;
+	adjust pc-relative HI16 relocation for difference in HI16 and
+	LO16 addresses, since it can't easily be done in
+	mips_elf_calculate_relocation.
+
+2002-01-29  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* elf32-i386 (elf_i386_adjust_dynamic_symbol): Do not replace PLT32
+	relocations with PC32 relocations for undefined or weak symbols.
+	* elf32-s390 (elf_i386_adjust_dynamic_symbol): Likewise.
+	* elf64-s390x (elf_i386_adjust_dynamic_symbol): Likewise.
+
+2002-01-28  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* elfcore.h (elf_core_file_p): Improve comment for last change.
+
+2002-01-27  Daniel Jacobowitz  <drow@mvista.com>
+
+	* configure: Regenerated.
+
+2002-01-27  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* elfcore.h (elf_core_file_p): Set the machine architecture
+	before processing the program headers.
+
+2002-01-26  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* configure.in <64-bit configuration>: If using gcc, check and
+	emit error for egcs-1.1.2.
+	* configure: Regenerate.
+
+2002-01-26  Egor Duda  <deo@logos-m.ru>
+
+	* elf.c (elfcore_grok_win32pstatus): Copy only as much information
+	as possible to avoid stack corruption.
+
+2002-01-26  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_check_relocs): Don't set reltext
+	for non-allocated sections.
+
+2002-01-25  Mark Kettenis  <kettenis@gnu.org>
+
+	* elf.c (elfcore_write_prstatus): Make sure we pass the address of
+	prstat.pr_reg even if it is a struct.
+
+2002-01-25  Steve Ellcey <sje@cup.hp.com>
+
+	* elfxx-ia64.c: Reset AIX vector function overrides for HP-UX.
+
+2002-01-25  Philipp Thomas  <pthomas@suse.de>
+
+	* coffgen.c (coff_print_symbol): Don't mark info message
+	for translation.
+
+2002-01-25  Nick Clifton <nickc@redhat.com>
+
+	* po/fr.po: Updated translation.
+	* po/es.po: Updated translation.
+
+2002-01-25  Philipp Thomas  <pthomas@suse.de>
+
+	* coff-alpha.c (alpha_relocate_section): Unify warning message
+	for GP relative relocations without GP defined.
+	* coff-mips.c (mips_relocate_section): Likewise.
+
+2002-01-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-eh-frame.c (_bfd_elf_eh_frame_section_offset): Avoid
+	unsigned overflow when new_offset < old_offset.
+
+2002-01-24  Philipp Thomas  <pthomas@suse.de>
+
+	* bfd.c (_bfd_abort): Fix typo.
+
+2002-01-23  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_adjust_dynamic_symbol): Don't suppress
+	plt entries for undefweak symbols.
+
+2002-01-23  Steve Ellcey <sje@cup.hp.com>
+
+	* targets.c (bfd_elf32_ia64_hpux_big_vec): Add to DEFAULT_VECTOR.
+	(bfd_elf64_ia64_hpux_big_vec): Ditto.
+	(bfd_elf32_h8300_vec): Ditto.
+
+2002-01-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c: Remove stale part of ABI comment.
+	(NO_OPD_RELOCS): Define.
+	(ppc64_elf_check_relocs): Use it.
+	(ppc64_elf_relocate_section): Here too.
+	(build_one_stub): Don't point function syms at the stub.  Instead,
+	hijack plt.offset.
+	(ppc64_elf_relocate_section): Check whether REL24 relocs should
+	really go to the stub.  Make all dynamic relocs in opd against
+	locals.
+	(ppc64_elf_finish_dynamic_symbol): Allow for non-standard use of
+	plt.offset.
+
+2002-01-22  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (INSN_UNOP): Encode with RB as $sp.
+
+2002-01-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_finish_dynamic_sections): Correct sign of
+	TOC_BASE_OFF adjustment.
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2002-01-22  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* configure.host (hppa*64*-*-hpux*, hppa*64*-*-linux*): Add new
+	host defines.
+
+2002-01-21  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (cris_elf_relocate_section) <case R_CRIS_32_GOTREL>:
+	Check for and emit error if sgot is NULL at this point.
+
+2002-01-21  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* config.bfd (ia64*-*-netbsd*): New target.
+
+2002-01-21  Thomas Klausner <wiz@danbala.ifoer.tuwien.ac.at>
+
+	* som.c (som_write_space_strings): Comment typo fix.
+
+2002-01-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (struct ppc_link_hash_entry): Add is_func and
+	is_func_descriptor fields.
+	(link_hash_newfunc): Init them.
+	(ppc64_elf_check_relocs): Only R_PPC24_REL24 syms starting with a
+	dot are candidates for plt entries.  When processing .opd relocs,
+	set function descriptor strings to point inside function code
+	string, and set new ppc_link_hash_entry fields.
+	(ppc64_elf_gc_sweep_hook): Don't sweep R_PPC64_REL24 relocs.
+	(ppc64_elf_adjust_dynamic_symbol): Remove most code dealing with
+	function descriptors.  It's now done in..
+	(func_desc_adjust): New.
+	(ppc64_elf_func_desc_adjust): New.
+	(define elf_backend_always_size_sections): Define.
+	(ppc64_elf_hide_symbol): New.
+	(define elf_backend_hide_symbol): Define.
+	(allocate_dynrelocs): Remove code looking up function descriptors
+	as that has been done earlier.
+	(ppc64_elf_size_dynamic_sections): Use htab shortcut to elf hash
+	table.
+	(ppc64_elf_finish_dynamic_symbol): Likewise.  Remove code looking
+	up function descriptor.
+	(build_one_stub): Look up the function code sym.  Check for
+	invalid plt offsets.
+	(ppc64_elf_relocate_section): Tweak calls to undefined weak syms.
+	Convert R_PPC64_TOC relocs to R_PPC64_RELATIVE in shared libs.
+
+	* elf-bfd.h (elf_backend_data <elf_backend_hide_symbol>): Add
+	boolean param.
+	(_bfd_elf_link_hash_hide_symbol): Likewise.
+	* elflink.h (elf_link_add_object_symbols): Adjust call to
+	elf_backend_hide_symbol.
+	(elf_fix_symbol_flags): Likewise.
+	(elf_link_assign_sym_version): Likewise. Use bfd_malloc rather
+	than bfd_alloc.
+	* elf.c (_bfd_elf_link_hash_hide_symbol): Add "force_local" param.
+	Set ELF_LINK_FORCED_LOCAL and call _bfd_elf_strtab_delref.
+	* elf32-hppa.c (elf32_hppa_hide_symbol): Likewise.
+	(clobber_millicode_symbols): Adjust to suit new hide_symbol.
+	* elf32-cris.c (elf_cris_hide_symbol): Add "force_local" param
+	and adjust to suit.
+	* elf32-mips.c (_bfd_mips_elf_hide_symbol): Likewise, and call
+	_bfd_elf_link_hash_hide_symbol rather than duplicating code.
+	* elfxx-ia64.c (elfNN_ia64_hash_hide_symbol): Likewise.
+
+2002-01-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol): Test for a
+	dynamic function descriptor symbol, not the associated function
+	symbol.
+
+2002-01-17  Eric Christopher  <echristo@redhat.com>
+
+	* elf32-mips.c (mips_elf_calculate_relocation): Fix typo.
+
+2002-01-17  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* po/bfd.pot: Regenerate.
+	* po/fr.po: Regenerate.
+
+2002-01-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (elf_backend_data <elf_backend_section_from_bfd_section>):
+	Remove "Elf_Internal_Shdr *" param.
+	(_bfd_mips_elf_section_from_bfd_section): Ditto.
+	* elf32-mips.c (_bfd_mips_elf_section_from_bfd_section): Ditto.
+	* elf32-m32r.c (_bfd_m32r_elf_section_from_bfd_section): Ditto.
+	* elf32-v850.c (v850_elf_section_from_bfd_section): Ditto.
+	* elf64-mmix.c (mmix_elf_section_from_bfd_section): Ditto.
+	* elfxx-ia64.c (elfNN_hpux_backend_section_from_bfd_section): Ditto.
+	* elf.c (_bfd_elf_section_from_bfd_section): Allow backend
+	function to override special sections.  Remove hdr arg from
+	backend call, and don't loop.
+
+2002-01-16  Eric Christopher  <echristo@redhat.com>
+
+	* elf32-mips.c (mips_elf_calculate_relocation): Set require_jalxp
+	on R_MIPS_26 and target is 16bit. Add R_MIPS16_GPREL to list of
+	relocations requiring gp0 and gp.
+
+2002-01-16  Richard Earnshaw  <rearnsha@arm.com>
+
+	* elf32-arm.h (elf32_arm_merge_private_bfd_data): Handle
+	EF_ARM_VFP_FLOAT.
+	(elf32_arm_print_private_bfd_data): Likewise.
+
+2002-01-16  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* po/tr.po: Import new version.
+
+2002-01-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_howto_raw): Remove stale FIXMEs.
+	(ppc64_elf_reloc_type_lookup): Use proper CTOR reloc.
+	(ORI_R0_R0_0): Correct.
+
+2002-01-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (_bfd_elf_create_dynamic_sections): Don't set SEC_CODE
+	when plt_not_loaded.
+	* elf64-ppc.c (ppc64_elf_create_dynamic_sections): No need to
+	clear .plt SEC_CODE here.  Create .stub and correct .glink flags.
+	(PLT_INITIAL_ENTRY_SIZE): Set to 24.
+	(ppc64_elf_glink_code): Delete.
+	(PPC64_ELF_GLINK_SIZE): Delete.
+	(ADDIS_R12_R2, STD_R2_40R1, LD_R11_0R12, LD_R2_0R12, MTCTR_R11,
+	BCTR, ADDIS_R12_R12_1, LD_R2_40R1, NOP, LI_R0_0, B_DOT, LIS_R0_0,
+	ORI_R0_R0_0): Define.
+	(PLT_CALL_STUB_SIZE, GLINK_CALL_STUB_SIZE): Define.
+	(struct ppc_link_hash_table): Add sstub and plt_overflow.
+	(ppc64_elf_link_hash_table_create): Init them.
+	(ppc64_elf_check_relocs <R_PPC64_REL24>): Refcount .plt entry.
+	Don't copy to shared lib.
+	(ppc64_elf_check_relocs): Call bfd_set_error on errors.
+	(ppc64_elf_gc_sweep_hook <R_PPC64_REL24>): Sweep plt refcount.
+	(allocate_dynrelocs <plt>): Don't change function sym here.  Make
+	room for .stub and .glink code.
+	(ppc64_elf_size_dynamic_sections): Handle .stub.  Make entry for
+	DT_PPC64_GLINK.
+	(ppc64_elf_final_link): Rename to ppc64_elf_set_toc.  Don't call
+	bfd_elf64_bfd_final_link.
+	(bfd_elf64_bfd_final_link): Don't define.
+	(ppc64_elf_size_stubs): New.
+	(build_plt_stub): New.
+	(build_one_stub): New.
+	(ppc64_elf_build_stubs): New.
+	(ppc64_elf_relocate_section <toc relocs>): Remove assert.
+	(ppc64_elf_relocate_section): Don't copy R_PPC64_REL24 relocs.
+	(ppc64_elf_finish_dynamic_symbol): Don't build stubs here.  Set
+	DT_PPC64_GLINK entry.  Tweak DT_PLTGOT, DT_JMPREL, DT_PLTRELSZ in
+	case output sections not separate.  Adjust DT_RELASZ to not
+	include plt relocs.  Set reserved got entry.  Set got and plt
+	entry size.
+	(elf_backend_got_header_size): Set to 8.
+	* elf64-ppc.h: New file.
+
+2002-01-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-arm.h (elf32_arm_size_dynamic_sections): When removing
+	sections, use bfd_section_list_remove.
+	* elf32-i370.c (i370_elf_size_dynamic_sections): Likewise.
+	* elflink.h (elf_link_add_object_symbols): When removing all
+	sections, use bfd_section_list_clear.
+
+2002-01-15  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* po/sv.po: New file: Swedish translation.
+	* configure.in (ALL_LINGUAS): Add sv.
+	* configure: Regenerate.
+
+2002-01-15  Jakub Jelinek  <jakub@redhat.com>
+
+	* elflink.h (elf_link_input_bfd): Back out 2002-01-07 change.
+	* elf.c (merge_sections_remove_hook): New function.
+	(_bfd_elf_merge_sections): Pass it as 3rd argument to
+	_bfd_merge_sections.
+	* libbfd-in.h (_bfd_merge_sections): Add 3rd argument.
+	* libbfd.h: Rebuilt.
+	* merge.c (_bfd_merge_sections): Add remove_hook argument.
+	Call remove_hook if a SEC_EXCLUDE section is encountered.
+
+2002-01-15  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elf32-xstormy16.c (xstormy16_reloc_map): Add new field 'table'.
+	(xstormy16_reloc_map): Initialise new field with correct howto
+	table.
+	(xstormy16_reloc_type_lookup): Use 'table' field to locate correct
+	howto entry.
+
+2002-01-10  Michael Snyder  <msnyder@redhat.com>
+
+	* elf.c (elfcore_write_prstatus): Use long instead of pid_t;
+	(elfcore_write_pstatus): Use long instead of pid_t;
+	* elf-bfd.h: Change prototypes to use long instead of pid_t;
+
+2002-01-09  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* elf.c: Update copyright years.
+	(elfcore_grok_netbsd_note): Use NT_NETBSDCORE_PROCINFO
+	and NT_NETBSDCORE_FIRSTMACH.  Improve a comment.
+
+2002-01-08  Michael Snyder  <msnyder@redhat.com>
+
+	Add capability to write corefile note sections, for gdb.
+	* elf.c (elfcore_write_note): New function.
+	(elfcore_write_prpsinfo): New function.
+	(elfcore_write_prstatus): New function.
+	(elfcore_write_pstatus): New function.
+	(elfcore_write_prfpreg): New function.
+	(elfcore_write_prxfpreg): New function.
+	* elf-bfd.h: Add prototypes for above functions.
+
+2002-01-08  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf.c (elf_fake_sections): Propagate errors from
+	elf_backend_fake_section.
+
+2002-01-07  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* Makefile.am (BFD32_BACKENDS): Add elf32-sh-nbsd.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-sh-nbsd.c.
+	(elf32-sh-nbsd.lo): New rule.
+	* Makefile.in: Regenerate.
+	* config.bfd (sh*le-*-netbsdelf*): New target.
+	(sh*-*-netbsdelf*): New target.
+	* configure.in: Include netbsd-core.lo for native sh*-*-netbsd*.
+	(bfd_elf32_shnbsd_vec): New vector.
+	(bfd_elf32_shlnbsd_vec): New vector.
+	* configure: Regenerate.
+	* elf32-sh-nbsd.c: New file.
+	* targets.c: Update copyright years.
+	(_bfd_target_vector): Add bfd_elf32_shlnbsd_vec and
+	bfd_elf32_shnbsd_vec.
+
+2002-01-07  Aldy Hernandez  <aldyh@redhat.com>
+
+	* coff-rs6000.c (READ20): Use bfd_scan_vma.
+
+2002-01-07  Geoffrey Keating  <geoffk@redhat.com>
+
+	* elflink.h (elf_link_input_bfd): Don't ask for the merged offset
+	of a symbol in a section that will be deleted.
+
+2002-01-07  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* po/es.po: New file: Spanish translation.
+	* configure.in (ALL_LINGUAS): Add es.
+	* configure: Regenerate.
+
+2002-01-06  Steve Ellcey  <sje@cup.hp.com>
+
+	* elfxx-ia64.c (is_unwind_section_name): Add target vector as
+	argument so we can handle HP-UX specially.
+	(elfNN_ia64_hpux_vec): New for use in is_unwind_section_name.
+	(elfNN_hpux_backend_section_from_bfd_section): New for support
+	of SHN_IA_64_ANSI_COMMON.
+	(elfNN_ia64_relax_section): Add support for SHN_IA_64_ANSI_COMMON.
+	(is_unwind_section_name): Add special HP-UX support.
+	(elfNN_ia64_section_from_shdr): Add support for more sections.
+	(elfNN_ia64_fake_sections): Modify is_unwind_section_name call and
+	add support for more sections.
+	(elfNN_ia64_additional_program_headers): Modify
+	is_unwind_section_name call.
+	(elfNN_ia64_modify_segment_map): Remove assumption that there is
+	only one unwind section in segment.
+
+2002-01-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* syms.c (_bfd_generic_make_empty_symbol): New function.
+	* libbfd-in.h (_bfd_nosymbols_make_empty_symbol): Define as
+	_bfd_generic_make_empty_symbol.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* hppabsd-core.c (hppabsd_core_make_empty_symbol): Delete function.
+	(hppabsd_core_get_symtab_upper_bound): Don't define.
+	(hppabsd_core_get_symtab): Likewise.
+	(hppabsd_core_print_symbol): Likewise.
+	(hppabsd_core_get_symbol_info): Likewise.
+	(hppabsd_core_bfd_is_local_label_name): Likewise.
+	(hppabsd_core_get_lineno): Likewise.
+	(hppabsd_core_find_nearest_line): Likewise.
+	(hppabsd_core_bfd_make_debug_symbol): Likewise.
+	(hppabsd_core_read_minisymbols): Likewise.
+	(hppabsd_core_minisymbol_to_symbol): Likewise.
+	(hppabsd_core_vec): Use BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols).
+	Formatting fixes.
+	* hpux-core.c: Similarly.
+	* irix-core.c: Similarly.
+	* osf-core.c: Similarly.
+	* sco5-core.c: Similarly.
+	* binary.c (binary_make_empty_symbol): Remove function, define as
+	_bfd_generic_make_empty_symbol.
+	* ihex.c (ihex_make_empty_symbol): Likewise.
+	* mmo.c (mmo_make_empty_symbol): Likewise.
+	* ppcboot.c (ppcboot_make_empty_symbol): Likewise.
+	* srec.c (srec_make_empty_symbol): Likewise.
+	* versados.c (versados_make_empty_symbol): Likewise.
+	* vms.c (_bfd_vms_make_empty_symbol): Remove.
+	(vms_make_empty_symbol): Define as _bfd_generic_make_empty_symbol.
+	* vms-gsd.c (_bfd_vms_slurp_gsd): Call bfd_make_empty_symbol
+	rather than _bfd_vms_make_empty_symbol.
+	* vms-misc.c (new_symbol): Likewise.
+
+2002-01-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* section.c (bfd_section_init): Remove unnecessary initialisations.
+	(bfd_section_list_clear): New function.
+	(bfd_section_list_remove, bfd_section_list_insert): New macros.
+	(_bfd_strip_section_from_output): Use them.
+	* coffcode.h (coff_set_alignment_hook): Likewise.
+	* elf32-mips.c (_bfd_mips_elf_final_link): Likewise.
+	* elf64-mips.c (mips_elf64_final_link): Likewise.
+	* elf64-mmix.c (mmix_elf_final_link): Likewise.
+	* sunos.c (sunos_add_dynamic_symbols): Likewise.
+	* xcofflink.c (_bfd_xcoff_bfd_final_link): Likewise.
+	* bfd-in2.h: Regenerate.
+
+	* netbsd-core.c (netbsd_core_file_p): Use bfd_make_section_anyway
+	rather than doing our own section handling.  Clean up after errors
+	with bfd_release and bfd_section_list_clear.  Handle unexpected
+	flags.
+	* aoutf1.h (sunos4_core_file_p): Likewise.
+	* aix386-core.c (aix386_core_file_p): Likewise.
+	* cisco-core.c (cisco_core_file_validate): Likewise.
+	* ptrace-core.c (ptrace_unix_core_file_p): Likewise.
+	* trad-core.c (trad_unix_core_file_p): Likewise.
+
+	* hppabsd-core.c (hppabsd_core_core_file_p): Clean up after errors
+	with bfd_release and bfd_section_list_clear.
+	* hpux-core.c (hpux_core_core_file_p): Likewise.
+	* irix-core.c (irix_core_core_file_p): Likewise.
+	* lynx-core.c (lynx_core_file_p): Likewise.
+	* osf-core.c (osf_core_core_file_p): Likewise.
+	* rs6000-core.c (rs6000coff_core_p): Likewise.
+	* sco5-core.c (sco5_core_file_p): Likewise.
+
+	* elf32-mips.c (_bfd_mips_elf_lo16_reloc): Simplify, and perform
+	sign extension adjustments without conditionals.
+
+2002-01-04  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf-eh-frame.c (_bfd_elf_write_section_eh_frame): Don't crash if
+	CIE at .eh_frame start is removed due to no FDEs referencing it.
+
+2002-01-04  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* config.bfd (x86_64-*-netbsd*): New target.
+	* configure.in (x86_64-*-netbsd*): Set COREFILE
+	to netbsd-core.lo.
+	* configure: Regenerated.
+
+2002-01-03  Tom Rix  <trix@redhat.com>
+
+	* xcofflink.c (_bfd_xcoff_bfd_final_link): Update .pad section ordering
+	for recent bfd_make_section_anyway change.
+
+2002-01-03  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elf32-arm.h (elf32_arm_final_link_relocate): Handle
+	R_ARM_THM_PC11 reloc.
+
+2002-01-02  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* configure.in (LINGUAS): Add ja.
+	* configure: Regenerate.
+	* po/ja.po: Import from translation project's web site.
+
+2002-01-02  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* elf32-arm.h (elf32_arm_merge_private_bfd_data): Reformat error
+	messages to ease translation into other languages.
+
+For older changes see ChangeLog-0001
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-2004 sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-2004
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-2004	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-2004	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,5063 @@
+2004-12-31  Paul Brook  <paul@copdesourcery.com>
+
+	* elf32-arm.c (elf32_arm_symbian_plt_entry): Fix comment typo.
+
+2004-12-31  Alan Modra  <amodra@bigpond.net.au>
+
+	* reloc.c (BFD_RELOC_AVR_LDI, BFD_RELOC_AVR_6, BFD_RELOC_AVR_6_ADIW):
+	Commit missing changes from 2004-12-22.
+	* bfd-in2.h: Regenerate.
+
+2004-12-23  Tomer Levi  <Tomer.Levi@nsc.com>
+
+	* elf32-crx.c (elf32_crx_relax_section): Support 'bcop' relaxation.
+
+2004-12-21  Kris Warkentin  <kewarken@qnx.com>
+
+	* elf.c (elfcore_grok_nto_gregs): Change name to elfcore_grok_nto_regs.
+	Add 'base' argument for constructing register sections.  Reformat.
+	(elfcore_grok_nto_note): Call elfcore_grok_nto_regs for both
+	gp and fp regs.  Reformat.
+
+2004-12-22  Klaus Rudolph  <lts-rudolph@gmx.de>
+
+	* reloc.c: Add new relocs R_AVR_LDI, R_AVR_6, R_AVR_6_ADIW.
+	* bfd-in2.h: Regenerate.
+	* elf32-avr.c (elf_avr_nowto_table): Add the new relocs.
+	(avr_reloc_map): Likewise.
+	(avr_final_link_relocate): Likewise.
+
+2004-12-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (_bfd_elf_merge_symbol): Treat old definitions from
+	as-needed dynamic libs as undefined.
+	(elf_link_add_object_symbols): Remove DYN_AS_NEEDED from as-needed
+	libs when finding they are needed.
+
+2004-12-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (struct ppc64_elf_obj_tdata): Add opd_relocs.
+	(opd_entry_value): Use opd_relocs if available.
+	(ppc64_elf_relocate_section): Don't set reloc_done.  Instead
+	copy .opd relocations to opd_relocs.
+	(ppc64_elf_edit_toc): Set rel_hdr.sh_size after editing relocs.
+
+2004-12-16  Richard Sandiford  <rsandifo@redhat.com>
+
+	* reloc.c (BFD_RELOC_V850_LO16_SPLIT_OFFSET): New bfd_reloc_code_type.
+	* elf32-v850.c (v850_elf_howto_table): Add entry for
+	R_V850_LO16_SPLIT_OFFSET.
+	(v850_elf_reloc_map): Map it to BFD_RELOC_V850_LO16_SPLIT_OFFSET.
+	(v850_elf_perform_lo16_relocation): New function, extracted from...
+	(v850_elf_perform_relocation): ...here.  Use it to handle
+	R_V850_LO16_SPLIT_OFFSET.
+	(v850_elf_check_relocs, v850_elf_final_link_relocate): Handle
+	R_V850_LO16_SPLIT_OFFSET.
+	* libbfd.h, bfd-in2.h: Regenerate.
+
+2004-12-14  P.J. Darcy  <darcypj@us.ibm.com>
+
+	* config.bfd: Add s390x-ibm-tpf support.
+
+2004-12-14  Tomer Levi  <Tomer.Levi@nsc.com>
+
+	* elf32-crx.c (elf32_crx_relax_delete_bytes): Add 'struct bfd_link_info *'
+	to prototype, to make hash info available.
+	Prevent wrapped symbols from being adjusted twice.
+
+2004-12-14  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): Don't report an
+	overflow for calls to undefined weak symbols.
+
+2004-12-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* elfcode.h (elf_slurp_symbol_table): Use bfd_elf_sym_name so that
+	canonical sections syms have a name.
+
+2004-12-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (opd_entry_value): Don't use cached relocs if they
+	have been adjusted for output.
+	(ppc64_elf_relocate_section): Mark sections with reloc_done.
+
+2004-12-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (bfd_elf_sym_name): Rename from bfd_elf_local_sym_name and
+	add symtab_hdr param.
+	(group_signature): Update calls.
+	* elf-bfd.h (bfd_elf_sym_name): Update.
+	* elf32-ppc.c (ppc_elf_relocate_section): Update.
+	* elf64-ppc.c (ppc64_elf_edit_opd, ppc64_elf_edit_toc): Update.
+	(ppc64_elf_relocate_section): Update.
+	* elflink.c (elf_link_input_bfd): Update.
+
+2004-12-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf.c (bfd_elf_local_sym_name): Avoid crashes with invalid
+	st_shndx on STT_SECTION sections.
+
+2004-12-09  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elfcode.h (elf_slurp_reloc_table_from_section): Don't canonicalize
+	ELF section symbols.
+
+2004-12-09  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): For R_MIPS_JALR,
+	return a real value, unless it is a PLT symbol.
+	(mips_elf_perform_relocation): On the RM9000, turn a jal into a
+	bal if possible.
+
+	* elfn32-mips.c (elf_mips_howto_table_rela): Change dst_mask of
+	R_MIPS_JALR entry to 0.
+
+	* archures.c: Define bfd_mach_mips9000.
+	* elfxx-mips.c (_bfd_elf_mips_mach): Handle E_MIPS_MACH_9000.
+	(mips_set_isa_flags): Handle bfd_mach_mips9000.
+	* cpu-mips.c (I_mips9000): Define.
+	(arch_info_struct): Add case for bfd_mach_mips9000.
+	* aoutx.h (NAME(aout,machine_type)): Handle bfd_mach_mips9000.
+	* bfd-in2.h: Regenerate.
+
+2004-12-08  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): Test for R_MIPS_26
+	overflow.
+
+2004-12-07  Ben Elliston  <bje@gnu.org>
+
+	* netbsd-core.c (netbsd_core_file_p): Make `i' unsigned.
+
+2004-12-06  Daniel Jacobowitz  <dan@debian.org>
+
+	Suggested by Fergal Daly <fergal@esatclear.ie>:
+	* simple.c (simple_dummy_multiple_definition): New function.
+	(bfd_simple_get_relocated_section_contents): Use it.
+
+2004-12-03  Jan Beulich  <jbeulich@novell.com>
+
+	* elf.c (elf_find_function): Don't use the last file symbol ever,
+	seen, but the last one seen prior to the symbol being reported.
+	Don't report a filename at all for global symbols when that might
+	be ambiguous/wrong.
+
+2004-12-01  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_copy_private_bfd_data): Set EI_OSABI.
+	(elf32_arm_post_process_headers): Set EI_OSABI depending on ABI
+	version.
+
+2004-12-01  Paul Brook  <paul@codesourcery.com>
+
+	* elflink.c (elf_link_add_object_symbols): Make symbols from discarded
+	sections undefined.
+
+2004-11-30  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (struct elf32_arm_link_hash_table): Remove
+	no_pipeline_knowledge
+	(elf32_arm_link_hash_table_create): Ditto.
+	(bfd_elf32_arm_process_before_allocation): Ditto.
+	(elf32_arm_final_link_relocate): Ditto.  Remove oabi relocation
+	handling.
+	* bfd-in.h (bfd_elf32_arm_process_before_allocation): Update
+	prototype.
+	* bfd-in2.h: Regenerate.
+
+2004-11-30  Randolph Chung  <tausq@debian.org>
+
+	* elf32-hppa.c (elf32_hppa_grok_prstatus): New function.
+	(elf32_hppa_grok_psinfo): New function.
+	(elf_backend_grok_prstatus): Define.
+	(elf_backend_grok_psinfo): Define.
+
+2004-11-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 574:
+	* elfcode.h (elf_slurp_symbol_table): Handle STT_TLS.
+
+2004-11-24  Paul Brook  <paul@codesourcery.com>
+
+	* elf.c (assign_section_numbers): Number SHT_GROUP sections first.
+
+2004-11-24  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_swap_symbol_in): New function.
+	(elf32_arm_swap_symbol_out): New function.
+	(elf32_arm_size_info): Add.
+	(elf_backend_size_info): Define.
+
+2004-11-20  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* hpux-core.c (hpux_core_core_file_p): Use offsetof macro in calls to
+	make_bfd_asection.
+
+2004-11-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-arm.c (elf32_arm_finish_dynamic_sections): Warning fix.
+	* elf32-iq2000.c (iq2000_reloc_type_lookup): C90 function decl.
+	* nlmcode.h (nlm_write_object_contents): Warning fix.
+
+2004-11-18  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (ebb_propose_action): Fix argument order.
+
+2004-11-17  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (PLT_THUMB_STUB_SIZE): Define.
+	(elf32_arm_plt_thumb_stub): New.
+	(struct elf32_arm_link_hash_entry): Add plt_thumb_refcount
+	and plt_got_offset.
+	(elf32_arm_link_hash_traverse): Fix typo.
+	(elf32_arm_link_hash_table): Add obfd.
+	(elf32_arm_link_hash_newfunc): Initialize new fields.
+	(elf32_arm_copy_indirect_symbol): Copy plt_thumb_refcount.
+	(elf32_arm_link_hash_table_create): Initialize obfd.
+	(record_arm_to_thumb_glue): Mark the glue as a local ARM function.
+	(record_thumb_to_arm_glue): Mark the glue as a local Thumb function.
+	(bfd_elf32_arm_get_bfd_for_interworking): Verify that the
+	interworking BFD is not dynamic.
+	(bfd_elf32_arm_process_before_allocation): Handle R_ARM_PLT32.  Do
+	not emit glue for PLT references.
+	(elf32_arm_final_link_relocate): Handle Thumb functions.  Do not
+	emit glue for PLT references.  Support the Thumb PLT prefix.
+	(elf32_arm_gc_sweep_hook): Handle R_ARM_THM_PC22 and
+	plt_thumb_refcount.
+	(elf32_arm_check_relocs): Likewise.
+	(elf32_arm_adjust_dynamic_symbol): Handle Thumb functions and
+	plt_thumb_refcount.
+	(allocate_dynrelocs): Handle Thumb PLT references.
+	(elf32_arm_finish_dynamic_symbol): Likewise.
+	(elf32_arm_symbol_processing): New function.
+	(elf_backend_symbol_processing): Define.
+
+2004-11-16  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elf-bfd.h (eh_cie_fde): Add new fields: add_augmentation_size and
+	add_fde_encoding.  Remove need_relative.
+	* elf-eh-frame.c (extra_augmentation_string_bytes)
+	(extra_augmentation_data_bytes, size_of_output_cie_fde): New functions.
+	(_bfd_elf_discard_section_eh_frame): Consider changing the FDE encoding
+	in cases where the CIE has no existing 'R' augmentation.  Use
+	size_of_output_cie_fde when assigning offsets.  Use the final offset
+	as the new section size.
+	(_bfd_elf_eh_frame_section_offset): Remove need_relative handling.
+	Account for any extra augmentation bytes in the returned offset.
+	(_bfd_elf_write_section_eh_frame): Rework so that the entries are
+	moved before being modified.  Pad growing entries with DW_CFA_nops.
+	Add 'z' and 'R' augmentations as directed by add_augmentation_size
+	and add_fde_encoding.
+
+2004-11-15  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_relocate_section): Use
+	arm_real_reloc_type.
+
+2004-11-16  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elfxx-mips.c (mips_elf_create_dynamic_relocation): Return early
+	for discard relocations; don't add an R_MIPS_NONE to the main body
+	of .rel.dyn.
+
+2004-11-04  Paul Brook  <paul@codesourcery.com>
+
+	* elf-bfd.h (_bfd_elf_slurp_version_tables): Update prototype.
+	* elf.c (_bfd_elf_print_private_bfd_data): Pass extra argument.
+	(_bfd_elf_slurp_version_tables): Add extra argument.  Create extra
+	default version definition for unversioned symbols.
+	* elfcode.h (elf_slurp_symbol_table): Pass extra argument.
+	* elflink.c (elf_link_add_object_symbols): Pass extra argument to
+	_bfd_elf_slurp_version_tables.  Set default version for unversioned
+	imported symbols.
+
+2004-11-15  Paul Brook  <paul@codesourcery.com>
+
+	* elflink.c (elf_link_add_object_symbols): Don't assume version
+	indices are consecutive.
+
+2004-11-14  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Deal with
+	composite relocations against the personality data.
+
+2004-11-13  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Resolve
+	R_ARM_PREL31 relocations to PLT entries.
+	(elf32_arm_relocate_section, elf32_arm_gc_sweep_hook): Ditto.
+	(elf32_arm_check_relocs): Ditto.
+
+2004-11-12  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-isa.c (xtensa_interface_class_id): New.
+
+2004-11-11  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (property_table_compare): Remove assertion about
+	entries with the same address and non-zero size.
+	(xtensa_read_table_entries): Report such entries as errors.
+
+2004-11-11  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Correct logic for
+	R_ARM_RELATIVE on Symbian OS.
+
+2004-11-09  Mark Mitchell  <mark@codesourcery.com>
+
+	* som.c (som_bfd_print_private_bfd_data): New function.
+	(som_object_setup): Save the auxiliary header.  Don't assume that
+	zero is an invalid entry point for a shared library.
+	(som_object_p): Allocate the auxiliary header on the heap.
+
+	* elf32-arm.c (elf32_arm_begin_write_processing): Do not use a K&R
+	declaration.
+	(elf32_arm_symbian_modify_segment_map): Likewise.
+
+2004-11-09  Daniel Jacobowitz  <dan@debian.org>
+
+	From David Poole <daveml@mbuf.com>:
+	* elf32-arm.c (elf32_arm_readonly_dynrelocs): New function.
+	(elf32_arm_size_dynamic_sections): Call it.
+
+2004-11-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (SOURCE_HFILES): Remove elf32-arm.h.
+	(ALL_MACHINES_CFILES): Fix typo.
+	* Makefile.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2004-11-08  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): When generating an
+	R_ARM_RELATIVE relocation for Symbian OS, mention the section
+	symbol in the relocation.
+
+2004-11-08  Inderpreet Singh  <inderpreetb@nioda.hcltech.com>
+	    Vineet Sharma  <vineets@noida.hcltech.com>
+
+	* coff-maxq.c: New File.
+	* cpu-maxq.c: New File.
+	* coffcode.h: Likewise.
+	* config.bfd: Likewise.
+	* configure.in (maxqcoff_vec): New target vector.
+	* Makefile.am: Add support for maxq target.
+	* configure.in: Likewise.
+	* archures.c:. Likewise.
+	* targets.c: Likewise.
+	* bfd_in2.h : Regenerated.
+	* Makefile.in: Regenerated.
+	* configure: Regenerated.
+	* doc/Makefile.in: Regenerated.
+
+2004-11-08  Aaron W. LaFramboise <aaron98wiridge9@aaronwl.com>
+
+	* coff-i386.c (coff_i386_reloc): Fix weak symbols.
+	* cofflink.c (_bfd_coff_link_input_bfd): Don't process
+	C_NT_WEAK aux entries.
+	(_bfd_coff_generic_relocate_section): Handle undefined
+	aliases.
+
+2004-11-07  Andreas Schwab  <schwab@suse.de>
+
+	* elf32-m68k.c (elf_m68k_adjust_dynamic_symbol): Use
+	SYMBOL_CALLS_LOCAL and check for undefweak symbols with
+	non-default visibility.
+
+2004-11-01  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_symbian_begin_write_processing): Clear
+	D_PAGED.
+	(elf32_arm_symbian_modify_segment_map): Don't
+	reset includes_filehdr and includes_phdrs here.
+
+2004-11-04  Daniel Jacobowitz  <dan@debian.org>
+
+	* Makefile.am (BFD32_BACKENDS, BFD32_BACKENDS_CFILES): Replace
+	elfarm-nabi with elf32-arm.  Remove elfarm-oabi.
+	(elf32-arm.lo): Replace elfarm-nabi.lo rule.  Remove elf32-arm.h
+	dependency.
+	* config.bfd: Move arm-*-oabi* and thumb-*-oabi* from obsolete list
+	to a new removed list.  Remove normal configuration stanzas.
+	* configure.in: (bfd_elf32_bigarm_vec, bfd_elf32_bigarm_symbian_vec)
+	(bfd_elf32_littlearm_symbian_vec, bfd_elf32_littlearm_vec): Replace
+	elfarm-nabi.lo with elf32-arm.lo.
+	(bfd_elf32_bigarm_oabi_vec, bfd_elf32_littlearm_oabi_vec): Remove.
+	* elf32-arm.c: Renamed from elfarm-nabi.c.  Inline elf32-arm.h.
+	* elf32-arm.h: Remove.
+	* elfarm-oabi.c: Remove.
+	* targets.c (_bfd_target_vector): Remove bfd_elf32_bigarm_oabi_vec
+	and bfd_elf32_littlearm_oabi_vec.
+	* aclocal.m4, Makefile.in, configure, doc/Makefile.in: Regenerated.
+
+2004-11-04  Hans-Peter Nilsson  <hp@axis.com>
+
+	* config.bfd: Support crisv32-*-* like cris-*-*.
+	* archures.c (bfd_mach_cris_v0_v10, bfd_mach_cris_v32)
+	(bfd_mach_cris_v10_v32): New macros.
+	* cpu-cris.c: Tweak formatting.
+	(get_compatible): New function.
+	(N): New macro.
+	(bfd_cris_arch_compat_v10_v32, bfd_cris_arch_v32): New
+	bfd_arch_info_type:s.
+	(bfd_cris_arch): Use bfd_mach_cris_v0_v10 for member mach,
+	get_compatible for member compatible and link bfd_cris_arch_v32 as
+	next.
+	* elf32-cris.c (cris_elf_pcrel_reloc)
+	(cris_elf_set_mach_from_flags): New functions.
+	(cris_elf_howto_table) <R_CRIS_8_PCREL, R_CRIS_16_PCREL>
+	<R_CRIS_32_PCREL>: Use cris_elf_pcrel_reloc.
+	(cris_elf_grok_prstatus, cris_elf_grok_psinfo): Give correct
+	numbers for bfd_mach_cris_v32.
+	(PLT_ENTRY_SIZE_V32): New macro.
+	(elf_cris_plt0_entry): Drop last comma in initializer.
+	(elf_cris_plt0_entry_v32, elf_cris_plt_entry_v32)
+	(elf_cris_pic_plt0_entry_v32, elf_cris_pic_plt_entry_v32): New
+	PLT initializers.
+	(cris_elf_relocate_section): Change all "%B(%A)" messages to
+	"%B, section %A".
+	(elf_cris_finish_dynamic_symbol): Do V32-specific PLT entries.
+	(elf_cris_finish_dynamic_sections): Similar.
+	(elf_cris_adjust_dynamic_symbol): Similar.
+	(cris_elf_check_relocs): Change all "%B(%A)" messages to "%B,
+	section %A".
+	<switch with PIC relocs>: Emit error and return FALSE for
+	bfd_mach_cris_v10_v32.
+	<case R_CRIS_8_PCREL, case R_CRIS_16_PCREL, case R_CRIS_32_PCREL>:
+	Emit warning when generating textrel reloc.
+	(cris_elf_object_p): Call cris_elf_set_mach_from_flags.
+	(cris_elf_final_write_processing): Set flags according to mach.
+	(cris_elf_print_private_bfd_data): Display
+	EF_CRIS_VARIANT_COMMON_V10_V32 and EF_CRIS_VARIANT_V32.
+	(cris_elf_merge_private_bfd_data): Drop variables old_flags,
+	new_flags.  Don't call cris_elf_final_write_processing.  Don't
+	look at the actual elf header flags at all; use
+	bfd_get_symbol_leading_char to check ibfd, obfd.  Trap difference
+	in bfd_get_mach for ibfd and obfd and handle merging of compatible
+	objects.
+	(bfd_elf32_bfd_copy_private_bfd_data): Define.
+	* reloc.c (BFD_RELOC_CRIS_SIGNED_8, BFD_RELOC_CRIS_UNSIGNED_8)
+	(BFD_RELOC_CRIS_SIGNED_16, BFD_RELOC_CRIS_UNSIGNED_16)
+	(BFD_RELOC_CRIS_LAPCQ_OFFSET): New relocs.
+	* bfd-in2.h, libbfd.h: Regenerate.
+
+2004-11-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.h (ppc64_elf_edit_toc): Declare.
+	* elf64-ppc.c (struct ppc_link_hash_entry <adjust_done>): Update
+	comment.
+	(struct adjust_toc_info): New.
+	(adjust_toc_syms, ppc64_elf_edit_toc): New functions.
+
+2004-11-03  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf.c (assign_file_positions_for_segments): Set next_file_pos even
+	if there are no segments.
+
+2004-11-02  Daniel Jacobowitz  <dan@debian.org>
+
+	* config.bfd: Mark arm-*-oabi and thumb-*-oabi as obsolete.
+
+2004-11-02  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-iq2000.c: Convert to ISO C90 formatting.
+
+2004-11-02  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elflink.c (_bfd_elf_create_got_section): Hide _GLOBAL_OFFSET_TABLE_.
+
+2004-10-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Handle weak
+	undefined symbols for R_IA64_SECREL32MSB, R_IA64_SECREL32LSB,
+	R_IA64_SECREL64MSB and R_IA64_SECREL64LSB.
+
+2004-10-28  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c (tpoff): Take alignment into account.
+
+2004-10-28  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-iq2000.c (iq2000_elf_relocate_section): Do nothing when
+	performing a relocatable link.
+	(iq2000_elf_object_p): Do not set elf_bad_symtab.  This is only
+	for MIPS ports under Irix.
+
+2004-10-27  Richard Earnshaw  <rearnsha@arm.com>
+
+	* elf32-arm.h (bfd_elf32_arm_process_before_allocation): Handle
+	R_ARM_CALL and R_ARM_JUMP24 as aliases of R_ARM_PC24.
+	(elf32_arm_final_link_relocate): Ditto.
+	(arm_add_to_rel, elf32_arm_relocate_section): Ditto.
+	(elf32_arm_gc_sweep_hook, elf32_arm_check_relocs): Ditto
+	(elf32_arm_adjust_dynamic_symbol): Ditto.
+	* elfarm-nabi.c (elf32_arm_howto_table): Add R_ARM_CALL and
+	R_ARM_JUMP32.  Move R_ARM_R{REL32,ABS32,PC24,BASE}...
+	(elf32_arm_r_howto): ... To here.
+	(elf32_arm_howto_from_type): Use elf32_arm_r_howto.
+
+2004-10-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 475
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Correct
+	R_IA64_SECREL32MSB, R_IA64_SECREL32LSB, R_IA64_SECREL64MSB
+	and R_IA64_SECREL64LSB.
+
+2004-10-26  Paul Brook  <paul@codesourcery.com>
+
+	* elflink.c (elf_finalize_dynstr): Skip shared aux structure.
+	(bfd_elf_size_dynamic_sections): Create default version definition.
+	(elf_link_output_extsym): Adjust for default symbol version.
+
+2004-10-24  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* mmo.c: Adjust to ISO C.
+
+	* mmo.c (mmo_write_section_description): New function broken out
+	of mmo_internal_write_section.
+	(mmo_internal_write_section): For each of .text and .data, call
+	mmo_write_section_description before outputting contents if it has
+	nontrivially deducible vma or contents.
+	(mmo_has_leading_or_trailing_zero_tetra_p): New function.
+	(mmo_canonicalize_symtab): Adjust absolute symbols to .data
+	symbols if found within the .data address range.
+
+2004-10-24  Daniel Jacobowitz  <dan@debian.org>
+
+	* opncls.c (bfd_close): Return TRUE for BFD_IN_MEMORY.
+
+2004-10-24  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* mmo.c (File Layout): Correct place of misplaced blurb about
+	special data.
+
+2004-10-22  Mark Kettenis  <kettenis@gnu.org>
+
+	* config.bfd: Add mips64*-*-openbsd.
+
+2004-10-21  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (ebb_propose_action): Put declarations before
+	statements.
+
+2004-10-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.in: (AM_INIT_AUTOMAKE): Set version to 2.15.94.
+	* configure: Regenerate.
+
+2004-10-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 463
+	* aoutx.h (aout_link_input_section_std): Pass proper hash entry
+	to linker reloc_overflow callback.
+	(aout_link_input_section_ext): Likewise.
+	(aout_link_reloc_link_order): Likewise.
+	* coff-a29k.c (coff_a29k_relocate_section): Likewise.
+	* coff-alpha.c (alpha_ecoff_get_relocated_section_contents):
+	Likewise.
+	(alpha_relocate_section): Likewise.
+	* coff-arm.c (coff_arm_relocate_section): Likewise.
+	* coff-h8300.c (h8300_reloc16_extra_cases): Likewise.
+	* coff-h8500.c (extra_case): Likewise.
+	* coff-i960.c (coff_i960_relocate_section): Likewise.
+	* coff-mcore.c (coff_mcore_relocate_section): Likewise.
+	* coff-mips.c (mips_relocate_section): Likewise.
+	* coff-or32.c (coff_or32_relocate_section): Likewise.
+	* coff-ppc.c (coff_ppc_relocate_section): Likewise.
+	* coff-rs6000.c (xcoff_ppc_relocate_section): Likewise.
+	* coff-sh.c (sh_relocate_section): Likewise.
+	* coff-tic80.c (coff_tic80_relocate_section): Likewise.
+	* coff-w65.c (w65_reloc16_extra_cases): Likewise.
+	* coff-z8k.c (extra_case): Likewise.
+	* coff64-rs6000.c (xcoff64_ppc_relocate_section): Likewise.
+	* cofflink.c (_bfd_coff_reloc_link_order): Likewise.
+	(_bfd_coff_generic_relocate_section): Likewise.
+	* ecoff.c (ecoff_reloc_link_order): Likewise.
+	* elf-hppa.h (elf_hppa_relocate_section): Likewise.
+	* elf-m10200.c (mn10200_elf_relocate_section): Likewise.
+	* elf-m10300.c (mn10300_elf_relocate_section): Likewise.
+	* elf32-arm.h (elf32_arm_relocate_section): Likewise.
+	* elf32-avr.c (elf32_avr_relocate_section): Likewise.
+	* elf32-cr16c.c (elf32_cr16c_relocate_section): Likewise.
+	* elf32-cris.c (cris_elf_relocate_section): Likewise.
+	* elf32-crx.c (elf32_crx_relocate_section): Likewise.
+	* elf32-d10v.c (elf32_d10v_relocate_section): Likewise.
+	* elf32-fr30.c (fr30_elf_relocate_section): Likewise.
+	* elf32-frv.c (elf32_frv_relocate_section): Likewise.
+	* elf32-h8300.c (elf32_h8_relocate_section): Likewise.
+	* elf32-hppa.c (elf32_hppa_relocate_section): Likewise.
+	* elf32-i370.c (i370_elf_relocate_section): Likewise.
+	* elf32-i386.c (elf_i386_relocate_section): Likewise.
+	* elf32-i860.c (elf32_i860_relocate_section): Likewise.
+	* elf32-ip2k.c (ip2k_elf_relocate_section): Likewise.
+	* elf32-iq2000.c (iq2000_elf_relocate_section): Likewise.
+	* elf32-m32r.c (m32r_elf_relocate_section): Likewise.
+	* elf32-m68hc1x.c (elf32_m68hc11_relocate_section): Likewise.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-mcore.c (mcore_elf_relocate_section): Likewise.
+	* elf32-msp430.c (elf32_msp430_relocate_section): Likewise.
+	* elf32-openrisc.c (openrisc_elf_relocate_section): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	* elf32-s390.c (elf_s390_relocate_section): Likewise.
+	* elf32-sh.c (sh_elf_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+	* elf32-v850.c (v850_elf_relocate_section): Likewise.
+	* elf32-vax.c (elf_vax_relocate_section): Likewise.
+	* elf32-xstormy16.c (xstormy16_elf_relocate_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relocate_section): Likewise.
+	* elf64-mmix.c (mmix_elf_relocate_section): Likewise.
+	* elf64-ppc.c (ppc64_elf_relocate_section): Likewise.
+	* elf64-s390.c (elf_s390_relocate_section): Likewise.
+	* elf64-sh64.c (sh_elf64_relocate_section): Likewise.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+	* elflink.c (elf_reloc_link_order): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_relocate_section): Likewise.
+	(_bfd_elf_mips_get_relocated_section_contents): Likewise.
+	* linker.c (_bfd_generic_reloc_link_order): Likewise.
+	* pdp11.c (pdp11_aout_link_input_section): Likewise.
+	(aout_link_reloc_link_order): Likewise.
+	* reloc.c (bfd_generic_get_relocated_section_contents):
+	Likewise.
+	* xcofflink.c (xcoff_reloc_link_order): Likewise.
+	* simple.c (simple_dummy_reloc_overflow): Updated.
+
+2004-10-20  Andreas Schwab  <schwab@suse.de>
+
+	* elf32-m68k.c (elf_m68k_plt_sym_val): New function.
+	(elf_backend_plt_sym_val): Define.
+
+2004-10-19  Danny Smith  <dannysmith@users.sourceforege.net>
+
+	* config.bfd: Set targ_underscore=yes for PE COFF targets
+
+2004-10-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (opd_entry_value): Handle --just-symbols objects.
+	(ppc64_elf_edit_opd): Likewise.
+
+2004-10-18  Mark Mitchell  <mark@codesourcery.com>
+
+	* elfarm-nabi.c (ELF_DYNAMIC_SEC_FLAGS): Add comment.
+	* elflink.c (_bfd_elf_create_dynamic_sections): For a loaded PLT,
+	set SEC_ALLOC and SEC_LOAD.
+
+2004-10-18  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-xstormy16.c (xstormy16_elf_relocate_section): Compute
+	'name' for relocs against both local and global symbols.
+
+2004-10-16  Daniel Jacobowitz  <dan@debian.org>
+
+	* bfd-in2.h: Regenerate.
+	* bfd.c (struct bfd): Add no_export.
+	* elflink.c (elf_link_add_object_symbols): Handle no_export.
+
+2004-10-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* config.bfd: Whitespace cleanup.
+	* Makefile.am: Run "make dep-am"
+	* Makefile.in: Regenerate.
+
+2004-10-15  Jakub Jelinek  <jakub@redhat.com>
+
+	* elflink.c (struct already_linked_section): Removed.
+	(try_match_symbols_in_sections, already_linked): Removed.
+	(_bfd_elf_section_already_linked): Skip ^\.gnu\.linkonce\.[^.]*\.
+	prefix of section names when finding already_linked_table
+	chain.  Compare section names.  Instead of calling already_linked,
+	do it inline and only for sections in the same already_linked_list.
+
+2004-10-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-eh-frame.c (_bfd_elf_eh_frame_section_offset): Add "info"
+	parameter.  If called after _bfd_elf_write_section_eh_frame,
+	don't allow a -2 return unless need_* bit is already set, and
+	handle offsets adjusted for output_offset.
+	* elf-bfd.h (_bfd_elf_eh_frame_section_offset): Update prototype.
+	* elf.c (_bfd_elf_section_offset): Update call.
+
+2004-10-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 440
+	* coffcode.h (coff_compute_section_file_positions): Cast to
+	bfd_vma when computing page alignment.
+
+2004-10-13  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-arm.h (elf32_arm_finish_dynamic_sections): Use file
+	offsets, not VMAs, for DT_VERSYM, DT_VERDEF, DT_VERNEED.
+
+2004-10-12  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-arm.h (elf32_arm_finish_dynamic_symbol): Make .rel.plt
+	relocations use a virtual address, not a section offset.
+
+2004-10-12  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_xtensa_get_private_bfd_flags): Delete.
+	(narrow_instruction, widen_instruction): Remove unnecessary calls to
+	xtensa_format_encode.
+	(ebb_propose_action): Inline call to ebb_add_proposed_action.
+	(ebb_add_proposed_action): Delete.
+
+2004-10-12  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c: Use ISO C90 formatting.
+
+2004-10-12  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.h (elf32_arm_merge_private_bfd_data): Rephrase error
+	message.
+
+2004-10-12  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.h: Support EABI version 4 objects.
+
+2004-10-12  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 325
+	* cpu-i386.c (bfd_x86_64_arch_intel_syntax): Place last in chain.
+	Don't mark as default.
+	(bfd_x86_64_arch): Don't mark as default.
+
+2004-10-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (enum action_discarded): New.
+	(elf_section_complain_discarded): Delete.
+	(elf_action_discarded): New function subsuming the above and also
+	controlling reloc behaviour.
+	(elf_link_input_bfd): Use it.
+
+2004-10-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf.c (bfd_section_from_shdr): Handle SHT_GNU_LIBLIST.
+	(special_sections): Add .gnu.liblist and .gnu.conflict.
+	(assign_section_numbers): Handle SHT_GNU_LIBLIST.
+
+2004-10-11  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 233
+	* elflink.c (elf_link_input_bfd): Try harder to support
+	relocations against symbols in removed linkonce sections.
+
+2004-10-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_link_input_bfd): Revert PR 354 change.
+
+	PR 354
+	* elflink.c (elf_link_input_bfd): Check that relocs in SEC_ALLOC
+	sections do not reference symbols in non-SEC_ALLOC sections.
+
+2004-10-11  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 437
+	* elflink.c (elf_link_sort_relocs): Don't bomb on unusual sections.
+	(_bfd_elf_link_omit_section_dynsym): Formatting.
+
+2004-10-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* libbfd-in.h (BFD_ASSERT, BFD_FAIL): Wrap macro body in do while.
+	* libbfd.h: Regnerate.
+	* elf32-cris.c: Add missing semicolon to BFD_ASSERTs.
+	* elf32-frv.c: Likewise.
+	* elf32-m32r.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf64-hppa.c: Likewise.
+	* elfxx-ia64.c: Likewise.
+	* opncls.c: Likewise.
+
+2004-10-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct eh_frame_hdr_info): Add offsets_adjusted.
+	* elf-eh-frame.c (_bfd_elf_write_section_eh_frame): Adjust
+	offsets stored in struct eh_cie_fde entries before doing other
+	work.
+
+	* elf-bfd.h (struct eh_cie_fde): Add cie_inf, remove sec.
+	(struct eh_frame_hdr_info): Add last_cie_inf, remove last_cie_offset.
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Delete code
+	setting offsets for removed CIEs.  Don't set "sec", instead set
+	cie_inf for FDEs.  Keep a pointer to last struct eh_cie_fde for a
+	CIE in hdr_info.  Only set make_relative and make_lsda_relative
+	for CIEs.  Use pointers rather than array indices.
+	(_bfd_elf_eh_frame_section_offset): Test/set make_relative,
+	make_lsda_relative, need_* on cie_inf for FDEs.
+	(_bfd_elf_write_section_eh_frame): Adjust offset and new_offset for
+	section output_offset.  Delete cie_offset, instead use cie_inf
+	pointer to CIE entry.  Use need_relative and need_lsda_relative on
+	CIE entry for FDEs.  Use pointers rather than array indices.
+
+2004-10-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* coff-rs6000.c (rs6000coff_vec): Add initializer for
+	bfd_is_target_special_symbol.
+	* coff64-rs6000.c (rs6000coff64_vec): Likewise.
+	* som.c (som_bfd_is_target_special_symbol): Define.
+
+2004-10-08  Nick Clifton  <nickc@redhat.com>
+
+	* configure.in: (AM_INIT_AUTOMAKE): Set version to 2.15.93.
+	* configure: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* syms.c (bfd_is_target_special_symbol): New interface function.
+	Returns true when a symbol should be considered to be special.
+	* targets.c (bfd_target): Include bfd_is_target_special_symbol in
+	the symbol jump table.
+	* elf32-arm.h (elf32_arm_is_target_special_symbol): New function.
+	Return true iff the symbol is a mapping symbol.
+	(bfd_elf32_bfd_is_target_special_symbol): Define.
+	* elfxx-target.h: Provide a default definition for
+	bfd_is_target_special_symbol.
+	* aout-target.h: Likewise.
+	* aout-tic30.c: Likewise.
+	* binary.c: Likewise.
+	* coffcode.h: Likewise.
+	* i386msdos.c: Likewise.
+	* ieee.c: Likewise.
+	* ihex.c: Likewise.
+	* libaout.h: Likewise.
+	* libbfd-in.h: Likewise
+	* libecoff.h: Likewise.
+	* mach-o.c: Likewise.
+	* mmo.c: Likewise.
+	* nlm-target.h: Likewise.
+	* oasys.c: Likewise.
+	* pef.c: Likewise.
+	* ppcboot.c: Likewise.
+	* srec.c: Likewise.
+	* tekhex.c: Likewise.
+	* versados.c: Likewise.
+	* vms.c: Likewise.
+	* xcoff-target.h: Likewise.
+	* xsym.c: Likewise.
+	* libbfd.h: Regenerate.
+
+2004-10-08  Daniel Jacobowitz  <dan@debian.org>
+
+	* config.bfd: Include 64-bit support for i[3-7]86-*-solaris2*.
+	* elf64-x86-64.c (elf64_x86_64_section_from_shdr): New function.
+	(elf_backend_section_from_shdr): Define.
+
+2004-10-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* syms.c (bfd_is_local_label): Return false for file symbols.
+
+2004-10-07  Bob Wilson  <bob.wilson@acm.org>
+	    David Heine  <dlheine@tensilica.com>
+
+	* elf32-xtensa.c (elf32xtensa_size_opt): New global variable.
+	(xtensa_default_isa): Global variable moved here from xtensa-isa.c.
+	(elf32xtensa_no_literal_movement): New global variable.
+	(elf_howto_table): Add entries for new relocations.
+	(elf_xtensa_reloc_type_lookup): Handle new relocations.
+	(property_table_compare): When addresses are equal, compare sizes and
+	various property flags.
+	(property_table_matches): New.
+	(xtensa_read_table_entries): Extend to read new property tables.  Add
+	output_addr parameter to indicate that output addresses should be used.
+	Use bfd_get_section_limit.
+	(elf_xtensa_find_property_entry): New.
+	(elf_xtensa_in_literal_pool): Use elf_xtensa_find_property_entry.
+	(elf_xtensa_check_relocs): Handle new relocations.
+	(elf_xtensa_do_reloc): Use bfd_get_section_limit.  Handle new
+	relocations.  Use new xtensa-isa.h functions.
+	(build_encoding_error_message): Remove encode_result parameter.  Add
+	new target_address parameter used to detect alignment errors.
+	(elf_xtensa_relocate_section): Use bfd_get_section_limit.  Clean up
+	error handling.  Use new is_operand_relocation function.
+	(elf_xtensa_combine_prop_entries, elf_xtensa_merge_private_bfd_data):
+	Use underbar macro for error messages.  Formatting.
+	(get_const16_opcode): New.
+	(get_l32r_opcode): Add a separate flag for initialization.
+	(get_relocation_opnd): Operand number is no longer explicit in the
+	relocation.  Change to decode the opcode and analyze its operands.
+	(get_relocation_slot): New.
+	(get_relocation_opcode): Add bfd parameter.  Use bfd_get_section_limit.
+	Use new xtensa-isa.h functions to handle multislot instructions.
+	(is_l32r_relocation): Add bfd parameter.  Use is_operand_relocation.
+	(get_asm_simplify_size, is_alt_relocation, is_operand_relocation,
+	insn_decode_len, insn_decode_opcode, check_branch_target_aligned,
+	check_loop_aligned, check_branch_target_aligned_address, narrowable,
+	widenable, narrow_instruction, widen_instruction, op_single_fmt_table,
+	get_single_format, init_op_single_format_table): New.
+	(elf_xtensa_do_asm_simplify): Add error_message parameter and use it
+	instead of calling _bfd_error_handler.  Use new xtensa-isa.h functions.
+	(contract_asm_expansion): Add error_message parameter and pass it to
+	elf_xtensa_do_asm_simplify.  Replace use of R_XTENSA_OP0 relocation
+	with R_XTENSA_SLOT0_OP.
+	(get_expanded_call_opcode): Extend to handle either L32R or CONST16
+	instructions.  Use new xtensa-isa.h functions.
+	(r_reloc struct): Add new virtual_offset field.
+	(r_reloc_init): Add contents and content_length parameters.  Set
+	virtual_offset field to zero.  Add contents to target_offset field for
+	partial_inplace relocations.
+	(r_reloc_is_defined): Check for null.
+	(print_r_reloc): New debug function.
+	(source_reloc struct): Replace xtensa_operand field with pair of the
+	opcode and the operand position.  Add is_abs_literal field.
+	(init_source_reloc): Specify operand by opcode/position pair.  Set
+	is_abs_literal field.
+	(source_reloc_compare): When target_offsets are equal, compare other
+	fields to make sorting predictable.
+	(literal_value struct): Add is_abs_literal field.
+	(value_map_hash_table struct): Add has_last_loc and last_loc fields.
+	(init_literal_value): New.
+	(is_same_value): Replace with ...
+	(literal_value_equal): ... this function.  Add comparisons of
+	virtual_offset and is_abs_literal fields.
+	(value_map_hash_table_init): Use bfd_zmalloc.  Check for allocation
+	failure.  Initialize has_last_loc field.
+	(value_map_hash_table_delete): New.
+	(hash_literal_value): Rename to ...
+	(literal_value_hash): ... this.  Include is_abs_literal flag and
+	virtual_offset field in the hash value.
+	(get_cached_value): Rename to ...
+	(value_map_get_cached_value): ... this.  Update calls to
+	literal_value_hash and literal_value_equal.
+	(add_value_map): Check for allocation failure.  Update calls to
+	value_map_get_cached_value and literal_value_hash.
+	(text_action, text_action_list, text_action_t): New types.
+	(find_fill_action, compute_removed_action_diff, adjust_fill_action,
+	text_action_add, text_action_add_literal, offset_with_removed_text,
+	offset_with_removed_text_before_fill, find_insn_action,
+	print_action_list, print_removed_literals): New.
+	(offset_with_removed_literals): Delete.
+	(xtensa_relax_info struct): Add is_relaxable_asm_section, action_list,
+	fix_array, fix_array_count, allocated_relocs, relocs_count, and
+	allocated_relocs_count fields.
+	(init_xtensa_relax_info): Initialize new fields.
+	(reloc_bfd_fix struct): Add new translated field.
+	(reloc_bfd_fix_init): Add translated parameter and use it to set the
+	translated field.
+	(fix_compare, cache_fix_array): New.
+	(get_bfd_fix): Remove fix_list parameter and get all relax_info for the
+	section via get_xtensa_relax_info.  Use cache_fix_array to set up
+	sorted fix_array and use bsearch instead of linear search.
+	(section_cache_t): New struct.
+	(init_section_cache, section_cache_section, clear_section_cache): New.
+	(ebb_t, ebb_target_enum, proposed_action, ebb_constraint): New types.
+	(init_ebb_constraint, free_ebb_constraint, init_ebb, extend_ebb_bounds,
+	extend_ebb_bounds_forward, extend_ebb_bounds_backward,
+	insn_block_decodable_len, ebb_propose_action, ebb_add_proposed_action):
+	New.
+	(retrieve_contents): Use bfd_get_section_limit.
+	(elf_xtensa_relax_section): Add relocations_analyzed flag.  Update call
+	to compute_removed_literals.  Free value_map_hash_table when no longer
+	needed.
+	(analyze_relocations): Check is_relaxable_asm_section flag.  Call
+	compute_text_actions for all sections.
+	(find_relaxable_sections): Mark sections as relaxable if they contain
+	ASM_EXPAND relocations that can be optimized.  Adjust r_reloc_init
+	call.  Increment relax_info src_count field only for appropriate
+	relocation types.  Remove is_literal_section check.
+	(collect_source_relocs): Use bfd_get_section_limit.  Adjust calls to
+	r_reloc_init and find_associated_l32r_irel.  Check
+	is_relaxable_asm_section flag.  Handle L32R instructions with absolute
+	literals.  Pass is_abs_literal flag to init_source_reloc.
+	(is_resolvable_asm_expansion): Use bfd_get_section_limit.  Check for
+	CONST16 instructions.  Adjust calls to r_reloc_init and
+	pcrel_reloc_fits.  Handle weak symbols conservatively.
+	(find_associated_l32r_irel): Add bfd parameter and pass it to
+	is_l32r_relocation.
+	(compute_text_actions, compute_ebb_proposed_actions,
+	compute_ebb_actions, check_section_ebb_pcrels_fit,
+	check_section_ebb_reduces, text_action_add_proposed,
+	compute_fill_extra_space): New.
+	(remove_literals): Replace with ...
+	(compute_removed_literals): ... this function.  Call
+	init_section_cache.  Use bfd_get_section_limit.  Sort internal_relocs.
+	Call xtensa_read_table_entries to get the property table.  Skip
+	relocations other than R_XTENSA_32 and R_XTENSA_PLT.  Use new
+	is_removable_literal, remove_dead_literal, and
+	identify_literal_placement functions.
+	(get_irel_at_offset): Rewrite to use bsearch on sorted relocations
+	instead of linear search.
+	(is_removable_literal, remove_dead_literal,
+	identify_literal_placement): New.
+	(relocations_reach): Update check for literal not referenced by any
+	PC-relative relocations.  Adjust call to pcrel_reloc_fits.
+	(coalesce_shared_literal, move_shared_literal): New.
+	(relax_section): Use bfd_get_section_limit.  Call
+	translate_section_fixes.  Update calls to r_reloc_init and
+	offset_with_removed_text.  Check new is_relaxable_asm_section flag.
+	Add call to pin_internal_relocs.  Add special handling for
+	R_XTENSA_ASM_SIMPLIFY and R_XTENSA_DIFF* relocs.  Use virtual_offset
+	info to calculate new addend_displacement variable.  Replace code for
+	deleting literals with more general code to perform the actions
+	determined by the action_list for the section.
+	(translate_section_fixes, translate_reloc_bfd_fix): New.
+	(translate_reloc): Check new is_relaxable_asm_section flag.  Call
+	find_removed_literal only if is_operand_relocation.  Update call to
+	offset_with_removed_text.  Use new target_offset and removed_bytes
+	variables.
+	(move_literal): New.
+	(relax_property_section):  Use bfd_get_section_limit.  Set new
+	is_full_prop_section flag and handle new property tables.  Update calls
+	to r_reloc_init and offset_with_removed_text.  Check
+	is_relaxable_asm_section flag.  Handle expansion of zero-sized
+	unreachable entries, with use of offset_with_removed_text_before_fill.
+	For relocatable links, combine entries only for literal tables.
+	(relax_section_symbols): Check is_relaxable_asm_section flag.  Update
+	calls to offset_with_removed_text.  Translate st_size field for
+	function symbols.
+	(do_fix_for_relocatable_link): Change to return bfd_boolean to indicate
+	failure.  Add contents parameter.  Update call to get_bfd_fix.  Update
+	call to r_reloc_init.  Call _bfd_error_handler and return FALSE for
+	R_XTENSA_ASM_EXPAND relocs.
+	(do_fix_for_final_link): Add input_bfd and contents parameters.  Update
+	call to get_bfd_fix.  Include offset from contents for partial_inplace
+	relocations.
+	(is_reloc_sym_weak): New.
+	(pcrel_reloc_fits): Use new xtensa-isa.h functions.
+	(prop_sec_len): New.
+	(xtensa_is_property_section): Handle new property sections.
+	(is_literal_section): Delete.
+	(internal_reloc_compare): When r_offset matches, compare r_info and
+	r_addend to make sorting predictable.
+	(internal_reloc_matches): New.
+	(xtensa_get_property_section_name): Handle new property sections.
+	(xtensa_get_property_predef_flags): New.
+	(xtensa_callback_required_dependence): Use bfd_get_section_limit.
+	Update calls to xtensa_isa_init, is_l32r_relocation, and r_reloc_init.
+	* xtensa-isa.c (xtensa_default_isa): Moved to elf32-xtensa.c.
+	(xtisa_errno, xtisa_error_msg): New variables.
+	(xtensa_isa_errno, xtensa_isa_error_msg): New.
+	(xtensa_insnbuf_alloc): Add error handling.
+	(xtensa_insnbuf_to_chars): Add num_chars parameter.  Update to
+	use xtensa_format_decode.  Add error handling.
+	(xtensa_insnbuf_from_chars): Add num_chars parameter.  Decode the
+	instruction length to find the number of bytes to copy.
+	(xtensa_isa_init): Add error handling.  Replace calls to
+	xtensa_load_isa and xtensa_extend_isa with code to initialize lookup
+	tables in the xtensa_modules structure.
+	(xtensa_check_isa_config, xtensa_add_isa, xtensa_load_isa,
+	xtensa_extend_isa): Delete.
+	(xtensa_isa_free): Change to only free lookup tables.
+	(opname_lookup_compare): Replace with ...
+	(xtensa_isa_name_compare): ... this function.  Use strcasecmp.
+	(xtensa_insn_maxlength): Rename to ...
+	(xtensa_isa_maxlength): ... this.
+	(xtensa_insn_length): Delete.
+	(xtensa_insn_length_from_first_byte): Replace with ...
+	(xtensa_isa_length_from_chars): ... this function.
+	(xtensa_num_opcodes): Rename to ...
+	(xtensa_isa_num_opcodes): ... this.
+	(xtensa_isa_num_pipe_stages, xtensa_isa_num_formats,
+	xtensa_isa_num_regfiles, xtensa_isa_num_stages,
+	xtensa_isa_num_sysregs, xtensa_isa_num_interfaces,
+	xtensa_isa_num_funcUnits, xtensa_format_name, xtensa_format_lookup,
+	xtensa_format_decode, xtensa_format_encode, xtensa_format_length,
+	xtensa_format_num_slots, xtensa_format_slot_nop_opcode,
+	xtensa_format_get_slot, xtensa_format_set_slot): New functions.
+	(xtensa_opcode_lookup): Add error handling.
+	(xtensa_decode_insn): Replace with ...
+	(xtensa_opcode_decode): ... this function, with new format and
+	slot parameters.  Add error handling.
+	(xtensa_encode_insn): Replace with ...
+	(xtensa_opcode_encode): ... this function, which does the encoding via
+	one of the entries in the "encode_fns" array.  Add error handling.
+	(xtensa_opcode_name): Add error handling.
+	(xtensa_opcode_is_branch, xtensa_opcode_is_jump, xtensa_opcode_is_loop,
+	xtensa_opcode_is_call): New.
+	(xtensa_num_operands): Replace with ...
+	(xtensa_opcode_num_operands): ... this function.  Add error handling.
+	(xtensa_opcode_num_stateOperands,
+	xtensa_opcode_num_interfaceOperands, xtensa_opcode_num_funcUnit_uses,
+	xtensa_opcode_funcUnit_use, xtensa_operand_name,
+	xtensa_operand_is_visible): New.
+	(xtensa_get_operand, xtensa_operand_kind): Delete.
+	(xtensa_operand_inout): Add error handling and special-case for
+	"sout" operands.
+	(xtensa_operand_get_field, xtensa_operand_set_field): Rewritten to
+	operate on one slot of an instruction.  Added error handling.
+	(xtensa_operand_encode): Handle default operands with no encoding
+	functions.  Check for success by comparing against decoded value.
+	Add error handling.
+	(xtensa_operand_decode): Handle default operands.  Return decoded value
+	through argument pointer.  Add error handling.
+	(xtensa_operand_is_register, xtensa_operand_regfile,
+	xtensa_operand_num_regs, xtensa_operand_is_known_reg): New.
+	(xtensa_operand_isPCRelative): Rename to ...
+	(xtensa_operand_is_PCrelative): ... this.  Add error handling.
+	(xtensa_operand_do_reloc, xtensa_operand_undo_reloc): Return value
+	through argument pointer.  Add error handling.
+	(xtensa_stateOperand_state, xtensa_stateOperand_inout,
+	xtensa_interfaceOperand_interface, xtensa_regfile_lookup,
+	xtensa_regfile_lookup_shortname, xtensa_regfile_name,
+	xtensa_regfile_shortname, xtensa_regfile_view_parent,
+	xtensa_regfile_num_bits, xtensa_regfile_num_entries,
+	xtensa_state_lookup, xtensa_state_name, xtensa_state_num_bits,
+	xtensa_state_is_exported, xtensa_sysreg_lookup,
+	xtensa_sysreg_lookup_name, xtensa_sysreg_name, xtensa_sysreg_number,
+	xtensa_sysreg_is_user, xtensa_interface_lookup, xtensa_interface_name,
+	xtensa_interface_num_bits, xtensa_interface_inout,
+	xtensa_interface_has_side_effect, xtensa_funcUnit_lookup,
+	xtensa_funcUnit_name, xtensa_funcUnit_num_copies): New.
+	* xtensa-modules.c: Rewrite to use new data structures.
+	* reloc.c (BFD_RELOC_XTENSA_DIFF8, BFD_RELOC_XTENSA_DIFF16,
+	BFD_RELOC_XTENSA_DIFF32, BFD_RELOC_XTENSA_SLOT0_OP,
+	BFD_RELOC_XTENSA_SLOT1_OP, BFD_RELOC_XTENSA_SLOT2_OP,
+	BFD_RELOC_XTENSA_SLOT3_OP, BFD_RELOC_XTENSA_SLOT4_OP,
+	BFD_RELOC_XTENSA_SLOT5_OP, BFD_RELOC_XTENSA_SLOT6_OP,
+	BFD_RELOC_XTENSA_SLOT7_OP, BFD_RELOC_XTENSA_SLOT8_OP,
+	BFD_RELOC_XTENSA_SLOT9_OP, BFD_RELOC_XTENSA_SLOT10_OP,
+	BFD_RELOC_XTENSA_SLOT11_OP, BFD_RELOC_XTENSA_SLOT12_OP,
+	BFD_RELOC_XTENSA_SLOT13_OP, BFD_RELOC_XTENSA_SLOT14_OP,
+	BFD_RELOC_XTENSA_SLOT0_ALT, BFD_RELOC_XTENSA_SLOT1_ALT,
+	BFD_RELOC_XTENSA_SLOT2_ALT, BFD_RELOC_XTENSA_SLOT3_ALT,
+	BFD_RELOC_XTENSA_SLOT4_ALT, BFD_RELOC_XTENSA_SLOT5_ALT,
+	BFD_RELOC_XTENSA_SLOT6_ALT, BFD_RELOC_XTENSA_SLOT7_ALT,
+	BFD_RELOC_XTENSA_SLOT8_ALT, BFD_RELOC_XTENSA_SLOT9_ALT,
+	BFD_RELOC_XTENSA_SLOT10_ALT, BFD_RELOC_XTENSA_SLOT11_ALT,
+	BFD_RELOC_XTENSA_SLOT12_ALT, BFD_RELOC_XTENSA_SLOT13_ALT,
+	BFD_RELOC_XTENSA_SLOT14_ALT): Add new relocations.
+	* Makefile.am (xtensa-isa.lo, xtensa-modules.lo): Update dependencies.
+	* Makefile.in: Regenerate.
+	* bfd-in2.h: Likewise.
+	* libbfd.h: Likewise.
+
+2004-10-07  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elf64-mips.c (mips_elf64_write_rel): Use STN_UNDEF for relocs
+	against the absolute section.
+	(mips_elf64_write_rela): Likewise.
+
+2004-10-07  Jan Beulich <jbeulich@novell.com>
+
+	* elf.c (elf_find_function): Don't generally check for matching
+	section, just for non-file symbols.  Remove redunant comparison
+	for the latter.
+	* elf32-arm.h (arm_elf_find_function): Likewise.
+
+2004-10-07  Jeff Baker  <jbaker@qnx.com>
+
+	* elflink.c (_bfd_elf_add_dynamic_entry): Add code to warn if
+	adding a DT_TEXTREL to a shared object and --warn-shared-textrel
+	was specified.
+
+2004-10-04  Roland McGrath  <roland@redhat.com>
+
+	* hash.c (bfd_hash_set_default_size): Use const for table.
+	Use size_t instead of int for variable compared to sizeof results.
+
+2004-10-05  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 425
+	* syms.c (_bfd_stab_section_find_nearest_line): Ignore R_*_NONE relocs.
+
+2004-10-01  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.h (elf32_arm_fake_sections,
+	is_arm_elf_unwind_section_name, elf32_arm_section_from_shdr): New
+	functions.
+	(elf_backend_fake_sections, elf_backend_section_from_shdr): Define.
+
+2004-10-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct eh_cie_fde): Add need_relative and
+	need_lsda_relative.
+	* elf-eh-frame.c (_bfd_elf_eh_frame_section_offset): Set
+	need_relative or need_lsda_relative if we are processing an
+	offset for a reloc on a FDE initial loc or LSDA field
+	respectively.
+	(_bfd_elf_write_section_eh_frame): Test need_relative and
+	need_lsda_relative in place of corresponding make_* field
+	when deciding to use pc-relative encodings.
+
+2004-09-30  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.h (bfd_elf32_arm_set_target_relocs): Handle "abs"
+	target2 relocation type.
+
+2004-09-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 414
+	* elflink.c (_bfd_elf_merge_symbol): Check TLS symbol.
+
+2004-09-30  Paul Brook  <paul@codesourcery.com>
+
+	* reloc.c: Add BFD_RELOC_ARM_SMI.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Ditto.
+
+2004-09-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* dwarf2.c (_bfd_dwarf2_find_nearest_line): Add output section
+	vma and output offset to address.
+	* simple.c (simple_save_output_info): Only set output section
+	and offset for debug sections, or those not already set up by
+	the linker.
+	(bfd_simple_get_relocated_section_contents): Update comment.
+
+2004-09-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (IS_LOADED): Delete.
+	(assign_file_positions_for_segments): Just test SEC_LOAD instead.
+	Restore SEC_HAS_CONTENTS test to the one place it was used prior
+	to 2004-09-22.
+
+2004-09-23  Alan Modra  <amodra@bigpond.net.au>
+
+	PR gas/396
+	* elf32-sparc.c (elf32_sparc_final_write_processing): Handle
+	bfd_mach_sparc_sparclet and bfd_mach_sparc_sparclite.  Remove
+	redundant assignment of EM_SPARC.
+
+2004-09-22  Brian Ford  <ford@vss.fsi.com>
+
+	* pei-i386.c (COFF_SECTION_ALIGNMENT_ENTRIES): Enable 16 byte
+	alignment for .rdata sections so sse[2] code works with gcc >= 3.3.3
+	constants.
+	* pe-i386.c (COFF_SECTION_ALIGNMENT_ENTRIES): Likewise.
+
+2004-09-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_modify_segment_map): Delete.
+	(elf_backend_modify_segment_map): Don't define.
+
+2004-09-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (IS_LOADED): Define.
+	(assign_file_positions_for_segments): Don't round up file offset of
+	PT_LOAD segments containing no SEC_LOAD sections, instead round down.
+	Delete code handling link script adjustment of lma.  Do the adjust
+	in later code handling similar ajustments.  Remove dead code error
+	check.  Warn if section lma would require a negative offset
+	adjustment.  Tweak lma adjustment to use p_filesz rather than p_memsz.
+	Use p_vaddr + p_memsz inside section loop in place of voff.  Don't
+	update voff in section loop.  Change voff in segment loop to be an
+	adjustment on top of "off".  Set sec->filepos and update "off" later.
+	Test for loadable sections consistently using IS_LOADED.  Similarly,
+	test for alloc-only sections other than .tbss consistently.
+	Don't bother checking SEC_ALLOC in PT_LOAD segments.  Remove FIXME.
+	Tidy PT_NOTE handling.  Use %B and %A in error messages.
+	(assign_file_positions_except_relocs): Use %B in error message.
+
+2004-09-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am (AUTOMAKE_OPTIONS): Require 1.9.
+	(CONFIG_STATUS_DEPENDENCIES): New.
+	(Makefile): Removed.
+	(config.status): Likewise.
+	* Makefile.in: Regenerated.
+
+2004-09-17  Paul Brook  <paul@codesourcery.com>
+
+	* bfd-in.h (bfd_elf32_arm_set_target_relocs): Add prototype.
+	(bfd_elf32_arm_process_before_allocation): Update prototype.
+	* bfd-in2.h: Regenerate.
+	* elf32-arm.h (elf32_arm_link_hash_table): Add target2_reloc.
+	(elf32_arm_link_hash_table_create): Set it.
+	(bfd_elf32_arm_process_before_allocation): Remove target1_is_rel.
+	(bfd_elf32_arm_set_target_relocs): New function.
+	(arm_real_reloc_type): New function.
+	(elf32_arm_final_link_relocate): Use it.  Handle R_ARM_PREL31 and
+	R_ARM_GOT_PREL.  Remove R_ARM_TARGET1.
+	(elf32_arm_gc_sweep_hook): Ditto.
+	(elf32_arm_check_relocs): Ditto.
+	(elf32_arm_relocate_section): Handle R_ARM_GOT_PREL.
+	* elfarm-nabi.c (elf32_arm_howto_table): Add R_ARM_PREL31 and
+	R_ARM_GOT_TARGET2.
+	(elf32_arm_got_prel): New variable.
+	(elf32_arm_howto_from_type): New function.
+	(elf32_arm_info_to_howto): Use it.
+	(elf32_arm_reloc_map): Add BFD_RELOC_ARM_PREL31 and
+	BFD_RELOC_ARM_TARGET2.
+	* libbfd.h: Regenerate.
+	* reloc.c: Add BFD_RELOC_ARM_TARGET2 and BFD_RELOC_ARM_PREL31.
+
+2004-09-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* ecoff.c: Update u.undef.next refs.
+	* elf64-ppc.c: Likewise.
+	* elflink.c: Likewise.
+	* linker.c: Likewise.
+	* xcofflink.c: Likewise.
+
+	* elf-bfd.h (struct elf_link_hash_entry): Rearrange.  Add FIXME to
+	dynamic_def.  Combine weakdef and elf_hash_value.  Move vtable
+	fields to indirect struct.
+	* elf-m10300.c: Update u.weakdef refs.
+	* elf32-arm.h: Likewise.
+	* elf32-cris.c: Likewise.
+	* elf32-frv.c: Likewise.
+	* elf32-hppa.c: Likewise.
+	* elf32-i370.c: Likewise.
+	* elf32-i386.c: Likewise.
+	* elf32-m32r.c: Likewise.
+	* elf32-m68k.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-s390.c: Likewise.
+	* elf32-sh.c: Likewise.
+	* elf32-sparc.c: Likewise.
+	* elf32-vax.c: Likewise.
+	* elf32-xtensa.c: Likewise.
+	* elf64-alpha.c: Likewise.
+	* elf64-hppa.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf64-s390.c: Likewise.
+	* elf64-sh64.c: Likewise.
+	* elf64-sparc.c: Likewise.
+	* elf64-x86-64.c: Likewise.
+	* elfxx-ia64.c: Likewise.
+	* elfxx-mips.c: Likewise.
+	* elflink.c: Likewise.  Also u.elf_hash_value.
+	(elf_gc_propagate_vtable_entries_used): Update for h->vtable
+	indirection.
+	(elf_gc_smash_unused_vtentry_relocs): Likewise.
+	(bfd_elf_gc_record_vtinherit): Alloc vtable.
+	(bfd_elf_gc_record_vtentry): Likewise.
+	* elf.c (_bfd_elf_link_hash_newfunc): Use memset.
+
+2004-09-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+	* po/bfd.pot: Regenerate.
+
+2004-09-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_link_hash_entry): Replace elf_link_hash_flags
+	with bitfields.  Make "type" and "other" bitfields too.
+	(ELF_LINK_HASH_REF_REGULAR, ELF_LINK_HASH_DEF_REGULAR,
+	ELF_LINK_HASH_REF_DYNAMIC, ELF_LINK_HASH_DEF_DYNAMIC,
+	ELF_LINK_HASH_REF_REGULAR_NONWEAK, ELF_LINK_HASH_DYNAMIC_ADJUSTED,
+	ELF_LINK_HASH_NEEDS_COPY, ELF_LINK_HASH_NEEDS_PLT, ELF_LINK_NON_ELF,
+	ELF_LINK_HIDDEN, ELF_LINK_FORCED_LOCAL, ELF_LINK_HASH_MARK,
+	ELF_LINK_NON_GOT_REF, ELF_LINK_DYNAMIC_DEF, ELF_LINK_DYNAMIC_WEAK,
+	ELF_LINK_POINTER_EQUALITY_NEEDED): Delete.
+	(ELF_COMMON_DEF_P, WILL_CALL_FINISH_DYNAMIC_SYMBOL): Update.
+	* elf-hppa.h: Update all uses of elf_link_hash_flags.
+	* elf-m10300.c: Likewise.
+	* elf.c: Likewise.
+	* elf32-arm.h: Likewise.
+	* elf32-cris.c: Likewise.
+	* elf32-frv.c: Likewise.
+	* elf32-hppa.c: Likewise.
+	* elf32-i370.c: Likewise.
+	* elf32-i386.c: Likewise.
+	* elf32-m32r.c: Likewise.
+	* elf32-m68k.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-s390.c: Likewise.
+	* elf32-sh-symbian.c: Likewise.
+	* elf32-sh.c: Likewise.
+	* elf32-sh64.c: Likewise.
+	* elf32-sparc.c: Likewise.
+	* elf32-vax.c: Likewise.
+	* elf32-xtensa.c: Likewise.
+	* elf64-alpha.c: Likewise.
+	* elf64-hppa.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf64-s390.c: Likewise.
+	* elf64-sh64.c: Likewise.
+	* elf64-sparc.c: Likewise.
+	* elf64-x86-64.c: Likewise.
+	* elflink.c: Likewise.
+	* elfxx-ia64.c: Likewise.
+	* elfxx-mips.c: Likewise.
+	* configure.in (AM_INIT_AUTOMAKE): Set version to 2.15.92.
+	* configure: Regenerate.
+	* aclocal.m4: Regenerate.
+
+2004-09-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-arm.h (elf32_arm_gc_sweep_hook): Add #ifndef OLD_ARM_ABI
+	around uses of R_ARM_TARGET1.
+	(elf32_arm_check_relocs): Likewise.
+
+2004-09-13  Paul Brook  <paul@codesourcery.com>
+
+	* bfd-in.h (bfd_elf32_arm_process_before_allocation): Update
+	prototype.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* elf32-arm.h (elf32_arm_link_hash_table): Add target1_is_rel.
+	(elf32_arm_link_hash_table_create): Set target1_is_rel.
+	(bfd_elf32_arm_process_before_allocation): Ditto.
+	(elf32_arm_final_link_relocate): Handle R_ARM_TARGET1.
+	(elf32_arm_gc_sweep_hook, elf32_arm_check_relocs): Ditto.
+	* elfarm-nabi.c (elf32_arm_howto_table): Rename RELABS to TARGET1.
+	* reloc.c: Ditto.
+
+2004-09-10  Joel Brobecker  <brobecker@gnat.com>
+
+	* hpux-core.c (thread_section_p): New function.
+	(hpux_core_core_file_p): Fix computation of offset in call
+	to bfd_seek. Create a ".reg" section from an arbitrary
+	".reg/<id>" section if none was created after having read
+	all sections.
+
+2004-09-11  Andreas Schwab  <schwab@suse.de>
+
+	* acinclude.m4: Fix spelling of ACX_NONCANONICAL_*.
+	* aclocal.m4: Rebuild.
+	* configure: Rebuild.
+
+2004-09-10  Joel Brobecker  <brobecker@gnat.com>
+
+	* section.c (bfd_sections_find_if): Fix parameter name in
+	comment to match code.
+
+2004-09-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c  (assign_file_positions_except_relocs): Assign relocs
+	stored in a bfd section.
+
+2004-09-08  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (elf_cris_adjust_gotplt_to_got): Reset
+	h->gotplt_refcount to 0, not -1.
+
+2004-09-07  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (cris_elf_relocate_section) <case R_CRIS_16_GOTPLT,
+	case R_CRIS_32_GOTPLT>: For internal error message, handle NULL
+	symname.
+	(cris_elf_check_relocs) <case R_CRIS_32_PLT_PCREL>: Don't try to
+	handle symbol visibility here.
+
+2004-09-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (struct ppc_link_hash_table): Add stub_globals.
+	(is_ppc64_elf_target): Rename from is_ppc64_target.  Update all
+	callers.
+	(ppc_stub_name): Remove trailing "+0" on stub name.
+	(create_linkage_sections): Create relocations for
+	branch lookup table when --emit-relocs as well as when --shared.
+	(ppc_build_one_stub): Emit relocs for long branch stubs.  Adjust
+	relbrlt test.  For --emit-stub-syms, always output a sym even when
+	one already exists on a plt call stub.  Put stub type in the stub
+	symbol name.
+	(ppc_size_one_stub): Size long branch stub relocs.  Adjust relbrlt
+	test.
+	(ppc64_elf_size_stubs): Count global sym stubs added.  Zero
+	reloc_count in stub sections.  Adjust relbrlt test.
+	(ppc64_elf_build_stubs): Adjust relbrlt test.  Tweak stats output.
+	* elflink.c (bfd_elf_size_dynamic_sections): Fix comment typo.
+	(elf_link_input_bfd): Ignore symbol index zero relocs when checking
+	for relocs against discarded symbols.  Fix comments.
+
+2004-09-06  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf-bfd.h (_bfd_elf_make_dynamic_segment): Declare it.
+	* elf.c (_bfd_elf_make_dynamic_segment): New function, split out
+	from ...
+	(map_sections_to_segments): ... here.  Use it.  Assign a file
+	position to the .dynamic section if it is not loadable, but part
+	of the PT_DYNAMIC segment.
+	* elf32-arm.h (elf32_arm_finish_dynamic_sections): Use file
+	offsets, not VMAs, for the BPABI.  Do not fill in the header in
+	the .got.plt section for the BPABI.
+	* elfarm-nabi.c (elf32_arm_symbian_modify_segment_map): Add a
+	PT_DYNAMIC segment.
+	(elf_backend_want_got_plt): Define to zero for Symbian OS.
+
+2004-09-06  Nick Clifton  <nickc@redhat.com>
+
+	* elflink.c (elf_link_add_object_symbols): Set the error code to
+	bfd_error_wrong_format when the input format does not match the
+	output format.
+
+2004-09-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (is_ppc64_target): New function, extracted from..
+	(ppc64_elf_check_directives): ..here.
+	(ppc64_elf_size_dynamic_sections): Use it here to check bfd type
+	before accessing ppc64_elf_tdata.
+	(ppc64_elf_finish_dynamic_sections): And here too.
+
+2004-09-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd.c (_bfd_default_error_handler): Correct loop exit.
+
+2004-09-03  Mark Mitchell  <mark@codesourcery.com>
+
+	* config.bfd (arm*-*-symbianelf*): Use OS-specific target vectors.
+	* configure.in (bfd_elf32_bigarm_symbian_vec): Add it.
+	(bfd_elf32_littlearm_symbian_vec): Likewise.
+	* configure: Regenerated.
+	* elf-bfd.h (elf_backend_data): Add dynamic_sec_flags.
+	* elf32-arm.h (PLT_HEADER_SIZE): Do not define.
+	(PLT_ENTRY_SIZE): Likewise.
+	(bfd_vma_elf32_arm_symbian_plt_entry): New
+	variable.
+	(elf32_arm_link_hash_table): Add plt_header_size, plt_entry_size,
+	and symbian_p.
+	(create_got_section): Don't create sections when generating BPABI
+	objects.
+	(elf32_arm_create_dynamic_sections): Tidy.
+	(elf32_arm_link_hash_table_create): Set plt_header_size,
+	plt_entry_size, and symbian_p.
+	(elf32_arm_check_relocs): Do not mark .rel.dyn as loadable when
+	generating BPABI objects.
+	(allocate_dynrelocs): Use htab->plt_header_size, not
+	PLT_HEADER_SIZE.  Do not add to .got.plt when
+	generating BPABI objects.
+	(elf32_arm_finish_dynamic_symbol): Generate Symbian OS PLTs.
+	* elfarm-nabi.c: Add SymbianOS target vectors.
+	* elflink.c (_bfd_elf_create_got_section): Use dynamic_sec_flags.
+	(_bfd_elf_link_create_dynamic_sections): Likewise.
+	* elfxx-target.h (ELF_DYNAMIC_SEC_FLAGS): New macro.
+	(elfNN_bed): Use it.
+	* targets.c (bfd_elf32_bigarm_symbian_vec): New variable.
+	(bfd_elf32_littlearm_symbian_vec): Likewise.
+	(_bfd_target_vector): Add them.
+
+2004-09-03  Nick Clifton  <nickc@redhat.com>
+
+	PR 360
+	* coffcode.h (handle_COMDAT): Replace abort with an warning
+	message and allow the scan to continue.
+
+2004-09-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_get_synthetic_symtab): Use static_syms passed
+	in when reading relocs, not our sorted syms.  Remove unnecessary
+	var.
+
+2004-08-31  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	* elf.c (special_sections): Add .gnu.linkonce.b modelled on .bss.
+
+2004-08-30  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* acinclude.m4: Require AC_CANONICAL_TARGET, not AC_CANONICAL_SYSTEM.
+	Include ../config/acx.m4 and use ACX_NONCANONICAL_* where appropriate;
+	replace uses of *_alias with *_noncanonical.
+	* aclocal.m4: Rebuild with aclocal 1.4p6.
+	* Makefile.in: Rebuild with automake 1.4p6.
+	* doc/Makefile.in: Rebuild with automake 1.4p6.
+	* configure.in: Autoupdate with autoupdate 2.59.
+	* config.in: Regenerate with autoheader 2.59.
+	* configure: Regnerate with autoconf 2.59.
+
+2004-08-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_get_synthetic_symtab): Copy input
+	symbol pointer arrays before modifying.
+
+2004-08-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd.c (bfd_get_synthetic_symtab): Pass counts and both symbol tables.
+	* elf-bfd.h (_bfd_elf_get_synthetic_symtab): Adjust.
+	* elf.c (_bfd_elf_get_synthetic_symtab): Adjust.
+	* libbfd-in.h (_bfd_nodynamic_get_synthetic_symtab): Adjust.
+	* targets.c (struct bfd_target <_bfd_get_synthetic_symtab>): Adjust.
+	* elf64-ppc.c (ppc64_elf_get_synthetic_symtab): Don't read symbols.
+	Use both symbol tables on non-relocatable objects.  Use a common
+	error exit.  Fix "mid" warning.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2004-08-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_branch_reloc): Check .opd is in a regular
+	object file.
+	(struct sfpr_def_parms): Save some space.
+	(sfpr_define): Here too.
+
+	* elf64-ppc.c (compare_symbols): Put section syms first.
+	(sym_exists_at): New function.
+	(ppc64_elf_get_synthetic_symtab): Use relocs to find code entry
+	points only for relocatable files.  Use .opd section contents
+	otherwise.  Generally clean up the code.
+
+2004-08-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (STD_R0_0R1, STD_R0_0R12, LD_R0_0R1, LD_R0_0R12,
+	LI_R12_0, STVX_VR0_R12_R0, LVX_VR0_R12_R0, MTLR_R0, SFPR_MAX): Define.
+	(struct sfpr_def_parms): New.
+	(sfpr_define): New function.
+	(savegpr0, savegpr0_tail, restgpr0, restgpr0_tail): New functions.
+	(savegpr1, savegpr1_tail, restgpr1, restgpr1_tail): New functions.
+	(savefpr, savefpr0_tail, restfpr, restfpr0_tail): New functions.
+	(savefpr1_tail, restfpr1_tail): New functions.
+	(savevr, savevr_tail, restvr, restvr_tail): New functions.
+	(MIN_SAVE_FPR, MAX_SAVE_FPR): Don't define.
+	(ppc64_elf_func_desc_adjust): Use sfpr_define in place of existing
+	code.  Define all ABI mandated _save and _rest functions.
+
+2004-08-26  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.h (INTERWORK_FLAG): Return true for EABIv3 objects.
+
+2004-08-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-m32r.c (m32r_elf_relocate_section): Don't compare with
+	TRUE or FALSE.
+
+2004-08-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-i386.c (elf_i386_relocate_section): Tweak last change so
+	that pcrel correction is applied for R_386_PC32.
+
+2004-08-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-i386.c (elf_i386_relocate_section): Zero section contents
+	for R_386_32 and R_386_PC32 relocs against symbols defined in
+	discarded sections.
+
+2004-08-25  Dmitry Diky  <diwil@spec.ru>
+
+	* reloc.c (BFD_RELOC_MSP430_2X_PCREL,BFD_RELOC_MSP430_RL_PCREL):
+	Add new relocations.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* elf32-msp430.c: Clean-up code.
+	(elf_msp430_howto_table): Add new relocation entries.
+	(bfd_elf32_bfd_reloc_type_lookup): New relocation handlers.
+	(msp430_elf_relax_section): New function.
+	(msp430_elf_relax_delete_bytes): New function.
+	(msp430_elf_symbol_address_p): New function.
+
+2004-08-24  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
+
+	* elf32-m32r.c (m32r_elf_relocate_section): Handle
+	R_M32R_SDA16_RELA in the same way as R_M32R_SDA16.
+
+2004-08-20  Daniel Jacobowitz  <dan@debian.org>
+
+	* elflink.c (_bfd_elf_section_already_linked): Handle
+	SEC_LINK_DUPLICATES_SAME_CONTENTS.
+
+2004-08-19  Mark Mitchell  <mark@codesourcery.com>
+
+	* config.bfd (arm*-*-symbianelf*): New target.
+	(arm*-*-eabi*): Likewise.
+
+2004-08-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc_get_stub_entry): Change third param to a
+	"struct ppc_link_hash_entry *".
+	(ppc64_elf_relocate_section): Ditto for type of h.  Introduce h_elf
+	to satisfy RELOC_FOR_GLOBAL_SYMBOL.
+
+2004-08-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf64-ppc.c (ppc64_elf_edit_opd): Support 16 byte long .opd
+	entries (where fd_aux overlaps next entry's fd_func).
+	Add non_overlapping argument, use it.
+	(ppc64_elf_check_relocs, ppc64_elf_gc_mark_hook, adjust_opd_syms,
+	ppc64_elf_size_stubs, ppc64_elf_relocate_section,
+	ppc64_elf_output_symbol_hook): Use address / 8 instead of address / 24
+	as indexes into opd_sym_map/opd_adjust array.
+	* elf64-ppc.h (ppc64_elf_edit_opd): Adjust prototype.
+
+2004-08-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (func_desc_adjust): Give undefined dot-symbols a value
+	if we can look up their function descriptor in a regular file.
+
+2004-08-18  Nick Clifton  <nickc@redhat.com>
+
+	PR 324
+	* cofflink.c (coff_link_add_symbols): Check that the comdat
+	pointer in the coff_section_data structure has been initialised
+	before using it.
+
+2004-08-18  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 338
+	* elflink.c (bfd_elf_record_link_assignment): Add comment about
+	changing bfd_link_hash_undefined to bfd_link_hash_new.
+
+2004-08-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* elfxx-target.h (bfd_elfNN_get_synthetic_symtab): Only define
+	if not yet defined.
+	* elf64-ppc.c (bfd_elf64_get_synthetic_symtab): Define.
+	(synthetic_opd, synthetic_relocatable): New variables.
+	(compare_symbols, compare_relocs): New helper routines.
+	(ppc64_elf_get_synthetic_symtab): New function.
+	* bfd.c (bfd_get_synthetic_symtab): Rename dynsyms argument
+	to relsyms.
+	* bfd-in2.h: Regenerated.
+	* elf.c (_bfd_elf_get_synthetic_symtab): Rename dynsyms argument
+	to relsyms.  Return 0 if abfd is relocatable.
+
+2004-08-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_gc_sweep): Keep non-alloc, non-load sections.
+
+2004-08-17  Nick Clifton  <nickc@redhat.com>
+
+	* (is_arm_mapping_symbol_name): New function - return true
+	when a symbol name matches the requirements for an ARM mapping
+	symbol name.
+	(arm_elf_find_function): New function based on
+	elf_find_function in elf.c but skipping ARM mapping symbols
+	and including thumb function symbols.
+	(elf32_arm_find_nearest_line): Use arm_elf_find_function.
+	(elf32_arm_output_symbol_hook): Use is_arm_mapping_symbol_name.
+
+2004-08-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_branch_reloc): New function.
+	(ppc64_elf_howto_raw): Use ppc64_elf_branch_reloc.
+	(ppc64_elf_brtaken_reloc): Here too.
+
+2004-08-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (add_symbol_adjust): Correct mismatched function
+	symbol visibility.
+	(ppc64_elf_check_directives): Check that we have the right hash
+	table before proceeding.
+
+2004-08-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (struct ppc64_elf_obj_tdata): Add "deleted_section".
+	(adjust_opd_syms): Attach opd syms for deleted entries to one of
+	the sections that will be discarded.
+
+2004-08-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_section_complain_discarded): Ignore .fixup.
+
+2004-08-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd.c (_bfd_default_error_handler): Account for doubled '%' in
+	free space available.
+
+2004-08-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* pdp11.c (struct pdp11_aout_reloc_external): Delete.  Replace
+	occurrences with bfd_byte * thoughout file.
+
+	* coff-rs6000.c (do_shared_object_padding): Warning fix.
+	(xcoff_write_armap_big): Likewise.
+	(xcoff_write_archive_contents_old): Likewise.
+	(xcoff_write_archive_contents_big): Likewise.
+
+	* elf64-mmix.c (mmix_elf_get_section_contents): Delete declaration.
+
+2004-08-13  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-arm.h: Convert to ISO C90.
+
+2004-08-13  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 293
+	* elf32-hppa.c (elf32_hppa_hide_symbol): Use init_refcount to
+	zero the plt field.
+
+2004-08-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd.c (_bfd_default_error_handler): Handle %A and %B.
+	(bfd_archive_filename, bfd_get_section_ident): Delete.
+	* ecofflink.c (bfd_ecoff_debug_accumulate_other): Don't call
+	bfd_archive_filename.
+	* elflink.c (elf_link_input_bfd): Don't use callbacks->error_handler
+	to warn about symbols in discarded sections.  Use _bfd_error_handler.
+	* aout-adobe.c (aout_adobe_callback): See below.
+	* aout-cris.c (swap_ext_reloc_in): ..
+	* coff-arm.c (find_thumb_glue, find_arm_glue,
+	coff_arm_relocate_section, bfd_arm_process_before_allocation,
+	coff_arm_merge_private_bfd_data, _bfd_coff_arm_set_private_flags,
+	coff_arm_copy_private_bfd_data): ..
+	* coff-i860.c (i860_reloc_processing): ..
+	* coff-mcore.c (mcore_coff_unsupported_reloc,
+	coff_mcore_relocate_section): ..
+	* coff-ppc.c (coff_ppc_relocate_section): ..
+	* coff-rs6000.c (xcoff_create_csect_from_smclas
+	* coff-sh.c (sh_relax_section, sh_relax_delete_bytes,
+	sh_swap_insns, sh_relocate_section): ..
+	* coff-tic54x.c (tic54x_reloc_processing): ..
+	* coff-tic80.c (coff_tic80_relocate_section): ..
+	* coff64-rs6000.c (xcoff64_create_csect_from_smclas): ..
+	* coffcode.h (styp_to_sec_flags, coff_slurp_line_table,
+	coff_slurp_symbol_table, coff_classify_symbol,
+	coff_slurp_reloc_table): ..
+	* coffgen.c (_bfd_coff_read_string_table): ..
+	* cofflink.c (coff_link_add_symbols, _bfd_coff_link_input_bfd,
+	_bfd_coff_generic_relocate_section): ..
+	* cpu-arm.c (bfd_arm_merge_machines): ..
+	* cpu-sh.c (sh_merge_bfd_arch): ..
+	* elf-hppa.h (elf_hppa_relocate_section): ..
+	* elf.c (bfd_elf_string_from_elf_section, setup_group,
+	_bfd_elf_setup_group_pointers, bfd_section_from_shdr,
+	assign_section_numbers, _bfd_elf_symbol_from_bfd_symbol,
+	copy_private_bfd_data, _bfd_elf_validate_reloc): ..
+	* elf32-arm.h (find_thumb_glue, find_arm_glue,
+	bfd_elf32_arm_process_before_allocation, elf32_thumb_to_arm_stub,
+	elf32_arm_to_thumb_stub, elf32_arm_final_link_relocate,
+	elf32_arm_relocate_section, elf32_arm_set_private_flags,
+	elf32_arm_copy_private_bfd_data, elf32_arm_merge_private_bfd_data): ..
+	* elf32-cris.c (cris_elf_relocate_section, cris_elf_check_relocs,
+	cris_elf_merge_private_bfd_data
+	* elf32-frv.c (elf32_frv_relocate_section, elf32_frv_check_relocs): ..
+	* elf32-gen.c (elf32_generic_link_add_symbols): ..
+	* elf32-hppa.c (hppa_add_stub, hppa_build_one_stub,
+	elf32_hppa_check_relocs, get_local_syms, final_link_relocate,
+	elf32_hppa_relocate_section): ..
+	* elf32-i370.c (i370_elf_merge_private_bfd_data,
+	i370_elf_check_relocs, i370_elf_relocate_section): ..
+	* elf32-i386.c (elf_i386_info_to_howto_rel, elf_i386_check_relocs,
+	elf_i386_relocate_section): ..
+	* elf32-m32r.c (m32r_elf_relocate_section,
+	m32r_elf_merge_private_bfd_data): ..
+	* elf32-m68hc1x.c (m68hc12_add_stub,
+	_bfd_m68hc11_elf_merge_private_bfd_data): ..
+	* elf32-m68k.c (elf_m68k_relocate_section): ..
+	* elf32-mcore.c (mcore_elf_unsupported_reloc,
+	mcore_elf_relocate_section): ..
+	* elf32-ppc.c (ppc_elf_merge_private_bfd_data, bad_shared_reloc,
+	ppc_elf_check_relocs, ppc_elf_relocate_section,
+	ppc_elf_begin_write_processing): ..
+	* elf32-s390.c (elf_s390_check_relocs, invalid_tls_insn,
+	elf_s390_relocate_section): ..
+	* elf32-sh-symbian.c (sh_symbian_import_as,
+	sh_symbian_process_embedded_commands,
+	sh_symbian_relocate_section): ..
+	* elf32-sh.c (sh_elf_relax_section, sh_elf_relax_delete_bytes,
+	sh_elf_swap_insns, sh_elf_relocate_section, sh_elf_check_relocs,
+	sh_elf_merge_private_data): ..
+	* elf32-sparc.c (elf32_sparc_check_relocs,
+	elf32_sparc_relocate_section,
+	elf32_sparc_merge_private_bfd_data): ..
+	* elf32-v850.c (v850_elf_check_relocs,
+	v850_elf_merge_private_bfd_data): ..
+	* elf32-xtensa.c (elf_xtensa_check_relocs,
+	elf_xtensa_relocate_section, elf_xtensa_merge_private_bfd_data): ..
+	* elf64-alpha.c (elf64_alpha_relax_with_lituse,
+	elf64_alpha_relax_got_load, elf64_alpha_size_got_sections,
+	elf64_alpha_relocate_section_r, elf64_alpha_relocate_section): ..
+	* elf64-gen.c (elf64_generic_link_add_symbols): ..
+	* elf64-ppc.c (ppc64_elf_merge_private_bfd_data, ppc_add_stub,
+	ppc64_elf_check_relocs, ppc64_elf_edit_opd,
+	ppc64_elf_relocate_section): ..
+	* elf64-s390.c (elf_s390_check_relocs, invalid_tls_insn,
+	elf_s390_relocate_section): ..
+	* elf64-sh64.c (sh_elf64_relocate_section): ..
+	* elf64-sparc.c (sparc64_elf_check_relocs,
+	sparc64_elf_add_symbol_hook, sparc64_elf_relocate_section,
+	sparc64_elf_merge_private_bfd_data): ..
+	* elf64-x86-64.c (elf64_x86_64_check_relocs,
+	elf64_x86_64_relocate_section): ..
+	* elflink.c (_bfd_elf_add_default_symbol,
+	_bfd_elf_link_assign_sym_version, elf_link_read_relocs_from_section,
+	_bfd_elf_link_output_relocs, elf_link_add_object_symbols,
+	bfd_elf_size_dynamic_sections, elf_link_output_extsym,
+	elf_get_linked_section_vma, elf_fixup_link_order,
+	bfd_elf_final_link, bfd_elf_gc_record_vtinherit,
+	bfd_elf_gc_record_vtinherit, _bfd_elf_section_already_linked): ..
+	* elfxx-ia64.c (elfNN_ia64_relax_section,
+	elfNN_ia64_relocate_section, elfNN_ia64_merge_private_bfd_data): ..
+	* elfxx-mips.c (mips_elf_perform_relocation,
+	_bfd_mips_elf_check_relocs,
+	_bfd_mips_elf_merge_private_bfd_data): ..
+	* ieee.c (ieee_slurp_external_symbols): ..
+	* ihex.c (ihex_bad_byte, ihex_scan, ihex_read_section): ..
+	* libbfd.c (_bfd_generic_verify_endian_match): ..
+	* linker.c (_bfd_generic_link_add_one_symbol,
+	_bfd_generic_section_already_linked): ..
+	* pdp11.c (translate_to_native_sym_flags): ..
+	* pe-mips.c (coff_pe_mips_relocate_section): ..
+	* peicode.h (pe_ILF_build_a_bfd): ..
+	* srec.c (srec_bad_byte): ..
+	* stabs.c (_bfd_link_section_stabs): ..
+	* xcofflink.c (xcoff_link_add_symbols, xcoff_link_input_bfd): ..
+	Replace all uses of bfd_archive_filename and bfd_get_section_ident
+	with corresponding %B and %A in _bfd_error_handler format string.
+	Replace occurrences of "fprintf (stderr," with _bfd_error_handler
+	calls to use %A and %B.  Fix "against symbol .. from section" and
+	similar error messages.  Combine multiple _bfd_error_handler calls
+	where they were separated due to bfd_archive_filename deficiencies.
+	* bfd-in2.h: Regenerate.
+
+2004-08-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_relocate_section): Report unrecognized
+	relocation.
+
+2004-08-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (struct ppc_link_hash_entry): Add was_undefined.
+	(struct ppc_link_hash_table): Remove no_multi_toc, multi_toc_needed.
+	Make emit_stub_syms, stub_error and has_14bit_branch bit-fields.
+	Add twiddled_syms.
+	(link_hash_newfunc): Init was_undefined.
+	(add_symbol_adjust): Don't set undefined dot symbols to defweak;
+	Use undefweak instead.
+	(ppc64_elf_check_directives): Fix undefs chain.
+	(ppc64_elf_next_toc_section): Remove no_multi_toc and multi_toc_needed
+	references.
+	(ppc64_elf_size_stubs): Adjust for add_symbol_adjust change.
+	(undo_symbol_twiddle, ppc64_elf_restore_symbols): New functions.
+	* elf64-ppc.h (ppc64_elf_restore_symbols): Declare.
+
+2004-08-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): For -fno-pic
+	error, test input_section flags rather than sec.
+
+2004-08-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_backend_data): Add
+	elf_backend_archive_symbol_lookup.
+	(_bfd_elf_archive_symbol_lookup): Declare.
+	* elflink.c (_bfd_elf_archive_symbol_lookup): New function..
+	(elf_link_add_archive_symbols): ..extracted from here.  Call the
+	backend version.
+	* elfxx-target.h (elf_backend_archive_symbol_lookup): Provide default.
+	(elfNN_bed): Init new field.
+	* elf64-ppc.c (elf_backend_check_directives): Define.
+	(elf_backend_archive_symbol_lookup): Define.
+	(struct ppc_link_hash_table): Add tls_get_add_fd.  Make tls_get_add
+	a ppc_link_hash_entry pointer.
+	(get_fdh): Move.
+	(ppc64_elf_archive_symbol_lookup, opd_entry_value): New functions.
+	(add_symbol_adjust, ppc64_elf_check_directives): New functions.
+	(ppc64_elf_check_relocs, ppc64_elf_gc_mark_hook, func_desc_adjust,
+	ppc64_elf_adjust_dynamic_symbol, ppc64_elf_tls_setup,
+	ppc64_elf_tls_optimize, allocate_dynrelocs, ppc_type_of_stub,
+	ppc_build_one_stub, ppc64_elf_size_stubs, ppc64_elf_relocate_section,
+	ppc64_elf_finish_dynamic_symbol): Handle branch relocs to function
+	descriptor symbols.
+
+2004-08-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (struct ppc_link_hash_entry): Expand adjust_done comment.
+	(ppc64_elf_add_symbol_hook): Test for NULL section.
+	(get_sym_h): Formatting.
+	(ppc64_elf_size_stubs): Include reloc addend in value stored as
+	stub target_value.
+
+	* elf64-ppc.c (ppc64_elf_relocate_section): Combine handling of
+	long branch stubs with code handling plt and r2off branch stubs.
+
+2004-08-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (_bfd_elf_gc_mark): Declare.
+	* elflink.c (elf_link_input_bfd): Formatting.
+	(_bfd_elf_gc_mark): Rename from elf_gc_mark and make global.  Adjust
+	all callers.
+	* elf64-ppc.c (struct ppc_link_hash_entry): Remove is_entry.
+	(link_hash_newfunc): Don't set it.
+	(ppc64_elf_copy_indirect_symbol): Nor copy it.
+	(ppc64_elf_mark_entry_syms): Delete.
+	(ppc64_elf_gc_mark_hook): Mark entry syms here.  Also mark opd
+	sections.  Use get_opd_info.
+	* elf64-ppc.h (ppc64_elf_mark_entry_syms): Delete.
+
+2004-08-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (adjust_opd_syms): Fix merge error.
+
+	* elf64-ppc.c (struct ppc_link_hash_table): Remove have_undefweak.
+	(func_desc_adjust): Don't set have_undefweak.
+	(ppc64_elf_func_desc_adjust): Don't add an extr nop to sfpr.
+	(ppc64_elf_relocate_section): NOP out calls to undefweak functions.
+
+	* elf64-ppc.c (struct ppc_link_hash_entry): Make "oh" a
+	"struct ppc_link_hash_entry *".  Adjust all references.
+	(ppc64_elf_hide_symbol): Correct a comment.
+
+	* elf64-ppc.c (get_opd_info): New function.
+	(adjust_opd_syms): Use get_opd_info.  Define removed symbols as zero.
+	(ppc64_elf_edit_opd): Use get_opd_info.  Check that sym has a dot
+	before calling get_fdh.  Test fdh rather than h before dereferencing
+	fdh.  Mark removed symbols in opd_adjust.
+	(ppc64_elf_tls_optimize): Don't bother with opd adjustment here.
+	(ppc64_elf_relocate_section): Use get_opd_info, and handle removed
+	opd symbols.
+	(ppc64_elf_output_symbol_hook): Likewise.
+
+2004-08-06  Paul Brook  <paul@codesourcery.com>
+
+	* elfarm-nabi.c (elf32_arm_howto_table): Add new EABI relocations.
+	(elf32_arm_reloc_map): Add BFD_RELOC_ARM_RELABS32,
+	BFD_RELOC_ARM_ROSEGREL32 and BFD_RELOC_ARM_SBREL32.
+	* reloc.c: Add BFD_RELOC_ARM_RELABS32, BFD_RELOC_ARM_ROSEGREL32
+	and BFD_RELOC_ARM_SBREL32.
+	* bfd-in2.h, bbfd.h: Regenerate.
+
+2004-08-01  Thiemo Seufer  <seufer@csv.ica.uni-stuttgart.de>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): Test only for
+	the dynamic link symbol actually in use.
+
+2004-08-01  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* elf32-m68hc1x.c (elf32_m68hc11_size_stubs): Handle bfd_link_hash_new
+
+2004-07-31  Joel Brobecker  <brobecker@gnat.com>
+	    Thiemo Seufer  <seufer@csv.ica.uni-stuttgart.de>
+
+	* elfxx-mips.c (_bfd_mips_elf_symbol_processing): Handle
+	SHN_MIPS_TEXT and SHN_MIPS_DATA.
+
+2004-07-30  H.J. Lu  <hongjiu.lu@intel.com>
+	    Nick Clifton  <nickc@redhat.com>
+
+	PR 290
+	* bfd.c (_bfd_default_error_handler): Make it global.
+
+	* elf-bfd.h (elf_backend_data): Add link_order_error_handler.
+
+	* elf.c (assign_section_numbers): Cope gracefully with sections
+	which have SHF_LINK_ORDER set but no sh_link set up.
+	* elflink.c (elf_get_linked_section_vma): Likewise.
+
+	* elfxx-ia64.c (elf_backend_link_order_error_handler): New. Set
+	it to NULL.
+
+	* elfxx-target.h (elf_backend_link_order_error_handler): New.
+	Set it to _bfd_default_error_handler.
+	(elfNN_bed): Add elf_backend_link_order_error_handler.
+
+	* libbfd-in.h (_bfd_default_error_handler): New.
+
+	* libbfd.h: Regenerated.
+
+2004-07-30  Jakub Jelinek  <jakub@redhat.com>
+
+	* archures.c (bfd_mach_sparc_64bit_p): Define.
+	* elf32-sparc.c (elf32_sparc_merge_private_bfd_data): Use it.
+	* bfd-in2.h: Rebuilt.
+
+2004-07-29  Alexandre Oliva  <aoliva@redhat.com>
+
+	Introduce SH2a support.
+	2004-02-18  Corinna Vinschen  <vinschen@redhat.com>
+	* archures.c (bfd_mach_sh2a_nofpu): New.
+	* bfd-in2.h: Rebuilt.
+	* cpu-sh.c (SH2A_NOFPU_NEXT): New.
+	(arch_info_struct): Add sh2a_nofpu.
+	* elf32-sh.c (sh_elf_set_mach_from_flags): Handle sh2a_nofpu.
+	2003-12-29  DJ Delorie  <dj@redhat.com>
+	* reloc.c: Add relocs for sh2a.
+	* bfd-in2.h: Regenerate.
+	* libbfd.hh: Regenerate.
+	2003-12-01  Michael Snyder  <msnyder@redhat.com>
+	* archures.c (bfd_mach_sh2a): New.
+	* bfd-in2.h: Rebuilt.
+	* cpu-sh.c (SH_NEXT, SH2_NEXT, etc.): Change defines to enums.
+	(SH2A_NEXT): New.
+	(arch_info_struct): Add sh2a.
+	* elf32-sh.c (sh_elf_set_mach_from_flags): Handle sh2a.
+
+2004-07-28  Nick Clifton  <nickc@redhat.com>
+	    John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR 273
+	* som.c (setup_sections): Improve estimation of space sizes in
+	relocatable objects.
+
+2004-07-27  Jason Thorpe  <thorpej@wasabisystems.com>
+	* config.bfd (hppa*-*-netbsd*): Set targ_defvec to
+	bfd_elf32_hppa_nbsd_vec.  Add bfd_elf32_hppa_linux_vec
+	to targ_selvecs.
+	* configure.in (bfd_elf32_hppa_nbsd_vec): Add case.
+	* configure: Regenerate.
+	* elf32-hppa.c (elf32_hppa_object_p): Add "elf32-hppa-netbsd"
+	case that accepts OSABI=NetBSD and OSABI=SysV.
+	(elf32_hppa_set_gp): For "elf32-hppa-netbsd", set the GP to
+	the base of .got or .data (if .got does not exist).
+	(elf32_hppa_post_process_headers): For elf32-hppa-netbsd,
+	set OSABI=NetBSD.
+	(TARGET_BIG_SYM): Add bfd_elf32_hppa_nbsd_vec case.
+	(TARGET_BIG_NAME): Add "elf32-hppa-netbsd" case.
+	* targets.c (bfd_elf32_hppa_nbsd_vec): Add extern declaration.
+	(_bfd_target_vector): Add bfd_elf32_hppa_nbsd_vec.
+
+2004-07-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 161/251
+	* elf-bfd.h (bfd_elf_section_data): Add sec_group.
+	(elf_sec_group): Defined.
+	(bfd_elf_match_symbols_in_sections): New prototype.
+	(_bfd_elf_setup_group_pointers): Likewise.
+
+	* elf.c (bfd_elf_discard_group): Abort.
+	(bfd_elf_set_group_contents): Also include relocation sections.
+	Remove zero-fill for ld -r.
+	(_bfd_elf_setup_group_pointers): New function.
+	(elf_sort_elf_symbol): Likewise.
+	(elf_sym_name_compare): Likewise.
+	(bfd_elf_match_symbols_in_sections): Likewise.
+
+	* elfcode.h (elf_object_p): Call _bfd_elf_setup_group_pointers.
+
+	* elflink.c (match_group_member): New.
+	(elf_link_input_bfd): Check group member for discarded section.
+	(try_match_symbols_in_sections): New function.
+	(already_linked): Likewise.
+	(_bfd_elf_section_already_linked): Support mixing comdat group
+	and linkonce section.
+
+	* libbfd-in.h (bfd_section_already_linked_table_traverse): New.
+	* linker.c (bfd_section_already_linked_table_traverse): New.
+
+	* libbfd.h: Regenerated.
+
+2004-07-27  Tomer Levi  <Tomer.Levi@nsc.com>
+
+	* reloc.c: Add BFD_RELOC_CRX_SWITCH8, BFD_RELOC_CRX_SWITCH16,
+	BFD_RELOC_CRX_SWITCH32.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* elf32-crx.c: Support relocation/relaxation of
+	BFD_RELOC_CRX_SWITCH* types.
+
+2004-07-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c: Correct "Linker stubs" comment.
+
+2004-07-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (bfd_elf_section_data): Add a pointer for the
+	linked-to section.
+	(elf_linked_to_section): New.
+
+	* elf.c (assign_section_numbers): Set up sh_link for
+	SHF_LINK_ORDER.
+
+	* elfxx-ia64.c (elfNN_ia64_final_write_processing): Set sh_info
+	to sh_link for SHT_IA_64_UNWIND sections.
+
+2004-07-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (elf_fixup_link_order): Add _() to error message.
+
+2004-07-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (elf_fixup_link_order): Issue a warning and flag
+	an error if failed.
+
+2004-07-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* aout-adobe.c (aout_32_section_already_linked): Defined.
+	* aout-target.h (MY_section_already_linked): Likewise.
+	* aout-tic30.c (MY_section_already_linked): Likewise.
+	* binary.c (binary_section_already_linked): Likewise.
+	* bout.c (b_out_section_already_linked): Likewise.
+	* coff-alpha.c (_bfd_ecoff_section_already_linked): Likewise.
+	* coff-mips.c (_bfd_ecoff_section_already_linked): Likewise.
+	* coffcode.h (coff_section_already_linked): Likewise.
+	* i386msdos.c (msdos_section_already_linked): Likewise.
+	* i386os9k.c (os9k_section_already_linked): Likewise.
+	* ieee.c (ieee_section_already_linked): Likewise.
+	* ihex.c (ihex_section_already_linked): Likewise.
+	* mach-o.c (bfd_mach_o_section_already_linked): Likewise.
+	* mmo.c (mmo_section_already_linked): Likewise.
+	* nlm-target.h (nlm_section_already_linked): Likewise.
+	* oasys.c (oasys_section_already_linked): Likewise.
+	* pef.c (bfd_pef_section_already_linked): Likewise.
+	* ppcboot.c (ppcboot_section_already_linked): Likewise.
+	* som.c (som_bfd_discard_group): Likewise.
+	* srec.c (srec_section_already_linked): Likewise.
+	* tekhex.c (tekhex_section_already_linked): Likewise.
+	* versados.c (versados_section_already_linked): Likewise.
+	* vms.c (vms_section_already_linked): Likewise.
+	* coff-target.h (_bfd_xcoff_section_already_linked): Likewise.
+	* xsym.c (bfd_sym_section_already_linked): Likewise.
+
+	* bfd-in.h (bfd_section_already_linked_table_init): New.
+	(bfd_section_already_linked_table_free): Likewise.
+
+	* coff-rs6000.c (rs6000coff_vec): Add
+	_bfd_generic_section_already_linked.
+	(pmac_xcoff_vec): Likewise.
+	* coff64-rs6000.c (rs6000coff64_vec): Likewise.
+	(aix5coff64_vec): Likewise.
+
+	* elf-bfd.h (_bfd_elf_section_already_linked): New prototype.
+	* elflink.c (_bfd_elf_section_already_linked): New function.
+
+	* elfxx-target.h (bfd_elfNN_section_already_linked): Defined.
+
+	* libbfd-in.h (_bfd_nolink_section_already_linked): Defined.
+	(_bfd_generic_section_already_linked): New.
+	(bfd_section_already_linked_hash_entry): Likewise.
+	(bfd_section_already_linked): Likewise.
+	(bfd_section_already_linked_table_lookup): Likewise.
+	(bfd_section_already_linked_table_insert): Likewise.
+
+	* linker.c (bfd_section_already_linked): New.
+	(_bfd_section_already_linked_table): Likewise.
+	(bfd_section_already_linked_table_lookup): Likewise.
+	(bfd_section_already_linked_table_insert): Likewise.
+	(already_linked_newfunc): Likewise.
+	(bfd_section_already_linked_table_init): Likewise.
+	(bfd_section_already_linked_table_free): Likewise.
+	(_bfd_generic_section_already_linked): Likewise.
+
+	* section.c (bfd_section): Remove comdat.
+	(bfd_comdat_info): Moved to ...
+	* bfd-in.h (coff_comdat_info): Here.
+	(bfd_coff_get_comdat_section): New.
+	* coffgen.c (bfd_coff_get_comdat_section): Likewise.
+	* libcoff-in.h (coff_section_tdata): Add comdat.
+	* coffcode.h (handle_COMDAT): Updated.
+	* cofflink.c (coff_link_add_symbols): Likewise.
+	* ecoff.c (bfd_debug_section): Likewise.
+
+	* targets.c (bfd_target): Add _section_already_linked.
+	(BFD_JUMP_TABLE_LINK): Updated.
+
+	* bfd-in2.h: Regenerated.
+	* libbfd.h: Likewise.
+	* libcoff.h: Likewise.
+
+2003-07-21  Paul Brook  <paul@codesourcery.com>
+
+	* elflink.c (elf_get_linked_section_vma, compare_link_order,
+	elf_fixup_link_order): New functions.
+	(bfd_elf_final_link): Call elf_fixup_link_order.
+
+2004-07-21  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf-bfd.h (ELF_COMMON_DEF_P): New.
+	* elflink.c (_bfd_elf_symbol_refs_local_p): Use it to handle
+	common definitions.
+	* elf-m10300.c: Use SYMBOL_REFERENCES_LOCAL instead of
+	_bfd_elf_symbol_refs_local_p.
+	* elf32-frv.c (FRVFDPIC_SYM_LOCAL): Remove hack for common
+	symbols.
+
+2004-07-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfd-in.h (dynamic_lib_link_class): Add DYN_NO_ADD_NEEDED and
+	DYN_NO_NEEDED.
+	(bfd_elf_get_dyn_lib_class): New prototype.
+	* elf.c (bfd_elf_get_dyn_lib_class): New function.
+
+	* elflink.c (elf_link_add_object_symbols): Check DYN_AS_NEEDED,
+	DYN_DT_NEEDED and DYN_NO_NEEDED bits to see if a DT_NEEDED
+	entry is needed. Issue an error if a DT_NEEDED entry is needed
+	for a file marked DYN_NO_NEEDED.
+	(elf_link_check_versioned_symbol): Check the DYN_DT_NEEDED bit
+	for DT_NEEDED tags.
+
+	* bfd-in2.h: Regenerated.
+
+2004-07-14  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* elflink.c (elf_section_complain_discarded): Don't complain in
+	.PARISC.unwind.
+
+2004-07-10  James E Wilson  <wilson@specifixinc.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relax_ldxmov): Remove abfd parameter.
+	(elfNN_ia64_install_value, elfNN_ia64_relax_brl): Likewise.
+	(elfNN_ia64_relax_section, elfNN_ia64_relocate_section,
+	elfNN_ia64_finish_dynamic_symbol, elfNN_ia64_finish_dynamic_sections):
+	Fix callers.
+	(elfNN_ia64_relax_brl): Change bfd_get_64 to bfd_getl64.  Change
+	bfd_put_64 to bfd_putl64.
+	(elfNN_ia64_relax_ldxmov, elfNN_ia64_install_value): Likewise.
+
+2004-07-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 240
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Only warn br in
+	.init/.fini sections when trying to relax it.
+
+2004-07-09  Jie Zhang  <zhangjie@magima.com.cn>
+
+	* elf.c (assign_file_positions_for_segments): Make sure the
+	.dynamic section is the first section in the PT_DYNAMIC segment.
+
+2004-07-09  Nick Clifton  <nickc@redhat.com>
+
+	* config.bfd: Change sh-sybmian-elf to sh-*-symbianelf.
+	* elf32-sh-symbian.c: Rename the sh_find_elf_flags and
+	sh_elf_get_flags_from_mach functions so that they do not conflict
+	when this target is built with other sh-elf targets.
+	* elf32-sh.c (sh_elf_get_flags_from_mach): Remove bogus
+	suppression of this function.
+	(sh_elf_find_flags): Likewise.
+
+2004-07-07  Tomer Levi  <Tomer.Levi@nsc.com>
+
+	* Makefile.am (ALL_MACHINES): Add cpu-crx.lo.
+	(ALL_MACHINES_CFILES): Add cpu-crx.c.
+	(BFD32_BACKENDS): Add elf32-crx.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-crx.c.
+	(cpu-crx.lo): New target.
+	(elf32-crx.lo): New target.
+	* Makefile.in: Regenerate.
+	* archures.c (bfd_architecture): Add bfd_{arch,mach}_crx.
+	(bfd_archures_list): Add bfd_crx_arch.
+	* bfd-in2.h: Regenerate.
+	* config.bfd: Handle crx-*-elf*, crx*.
+	* configure.in: Handle bfd_elf32_crx_vec.
+	* configure: Regenerate.
+	* cpu-crx.c: New file.
+	* elf32-crx.c: Likewise.
+	* libbfd.h: Regenerate.
+	* reloc.c: Add BFD_RELOC_CRX_REL4, BFD_RELOC_CRX_REL8,
+	BFD_RELOC_CRX_REL8_CMP, BFD_RELOC_CRX_REL16, BFD_RELOC_CRX_REL24,
+	BFD_RELOC_CRX_REL32, BFD_RELOC_CRX_REGREL12, BFD_RELOC_CRX_REGREL22,
+	BFD_RELOC_CRX_REGREL28, BFD_RELOC_CRX_REGREL32, BFD_RELOC_CRX_ABS16,
+	BFD_RELOC_CRX_ABS32, BFD_RELOC_CRX_NUM8, BFD_RELOC_CRX_NUM16,
+	BFD_RELOC_CRX_NUM32, BFD_RELOC_CRX_IMM16 and BFD_RELOC_CRX_IMM32
+	* targets.c (bfd_elf32_crx_vec): Declare.
+	(bfd_target_vector): Add bfd_elf32_crx_vec.
+
+2004-07-06  Nick Clifton  <nickc@redhat.com>
+
+	* config.bfd: Add sh-symbian-elf target.
+	* configure.in: Add bfd_elf32_shl_symbian_vec.
+	* configure: Regenerate.
+	* elf-bfd.h (struct elf_backend_data): Add new field
+	'check_directives'.
+	* elflink.c (elf_link_add_object_symbols): Invoke the
+	check_directives function, if defined.
+	* elfxx-target.h: Provide a default, NULL definition for
+	check_directives.
+	* targets.c: Add bfd_elf32_shl_symbian_vec.
+	* elf32-sh.c (sh_elf_swap_insns): Protect against unnecessary
+	definition.
+	(elf32_shlin_grok_prstatus, elf32_shlib_grok_psinfo,
+	* sh_elf_get_flags_from_mach, sh_elf_find_flags): Likewise.
+	(TARGET_BIG_SYM, TARGET_LITTLE_SYM): Only define if they have
+	not already been defined.
+	* elf32-sh64.c: Use SH_TARGET_ALREADY_DEFINED.
+	* sh-symbian.c: New file.  Provide functions to support the
+	* sh-symbian-elf target.
+	* Makefile.am: Add elf32-sh-symbian.c
+	* Makefile.in: Regenerate.
+
+2004-07-05  Andrew Stubbs <andrew.stubbs@superh.com>
+
+	* elf32-sh.c: Include ../opcodes/sh-opc.h.
+	* Makefile.am: Ran make dep-am.
+	* Makefile.in: Ran make dep-in.
+
+2004-07-03  Aaron W. LaFramboise  <aaron98wiridge9@aaronwl.com>
+
+	* cofflink.c (_bfd_coff_generic_relocate_section): Resolve PE weak
+	externals properly.
+
+2004-07-02  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* config.bfd: Add want64 to configuration target s390-*-linux*.
+
+2004-07-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfd.c (bfd_get_section_ident): New.
+
+	* elflink.c (elf_link_read_relocs_from_section): Call
+	bfd_get_section_ident to identify the section when reporting
+	error.
+	(_bfd_elf_link_output_relocs): Likewise.
+	(elf_link_output_extsym): Likewise.
+	(elf_link_input_bfd): Likewise.
+	(bfd_elf_gc_record_vtinherit): Likewise.
+
+	* bfd-in2.h: Regenerated.
+
+2004-07-01  Jie Zhang  <zhangjie@magima.com.cn>
+	    Nick Clifton  <nickc@redhat.com>
+
+	PR 204
+	* elfxx-mips.c (_bfd_mips_elf_final_link): Pass the correct number
+	of section symbols to mips_elf_sort_hash_table ().
+
+2004-07-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_section_ignore_discarded_relocs): Revert last
+	change.  Comment.
+	(elf_section_complain_discarded): New function.  Handle
+	.gcc_except_table too.
+	(elf_link_input_bfd): Rewrite handling of relocs against symbols
+	in discarded sections.
+	* elf-bfd.h (elf_discarded_section): Protect macro arg.
+
+2004-06-30  James E Wilson  <wilson@specifixinc.com>
+
+	* elfxx-ia64.c (elfNN_ia64_check_relocs): New local pltoff.  Initialize
+	to NULL.  Call get_pltoff if NULL and NEED_PLTOFF is true.
+
+2004-06-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 233
+	* elflink.c (elf_link_input_bfd): Issue an error for non-debug
+	local references to discarded sections and report their
+	locations.
+
+2004-06-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_section_ignore_discarded_relocs): Don't test
+	sec_info_type, test section name instead.
+
+2004-06-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 240
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Don't relax branch
+	in .init/.fini sections.
+
+2004-06-29  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_xtensa_relocate_section): Use
+	bfd_get_section_limit.
+
+2004-06-29  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_xtensa_combine_prop_entries): Don't change the
+	output section size.
+
+2004-06-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-mmix.c (mmix_set_relaxable_size): Save original size in
+	rawsize.
+	(mmix_elf_perform_relocation): Adjust for above change.
+	(mmix_elf_relocate_section): Likewise.
+	(mmix_elf_relax_section): Likewise.  Use output_section->rawsize.
+	(mmix_elf_get_section_contents): Delete.
+	(bfd_elf64_get_section_contents): Delete.
+	(mmix_elf_relocate_section): Zero stub area.
+	* linker.c (default_indirect_link_order): Alloc max of section size
+	and rawsize.
+	* simple.c (bfd_simple_get_relocated_section_contents): Likewise.
+	* section.c (bfd_malloc_and_get_section): Likewise.
+	(struct bfd_section): Update rawsize comment.
+	* bfd-in2.h: Regenerate.
+
+	* reloc16.c (bfd_coff_reloc16_relax_section): Set rawsize.
+
+2004-06-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd-in.h (bfd_get_section_limit): Define.
+	* reloc.c (bfd_perform_relocation, bfd_install_relocation)
+	(_bfd_final_link_relocate): Use bfd_get_section_limit.
+	* aout-tic30.c (tic30_aout_final_link_relocate): Likewise.
+	* coff-arm.c (coff_arm_relocate_section): Likewise.
+	* coff-mips.c (mips_refhi_reloc, mips_gprel_reloc): Likewise.
+	* cpu-ns32k.c (do_ns32k_reloc): Likewise.
+	(bfd_ns32k_final_link_relocate): Likewise.
+	* elf32-d30v.c (bfd_elf_d30v_reloc, bfd_elf_d30v_reloc_21): Likwise.
+	* elf32-dlx.c (_bfd_dlx_elf_hi16_reloc): Likewise.
+	* elf32-i860.c (i860_howto_pc26_reloc, i860_howto_pc16_reloc)
+	(i860_howto_highadj_reloc, i860_howto_splitn_reloc): Likewise.
+	* elf32-m32r.c (m32r_elf_do_10_pcrel_reloc, m32r_elf_hi16_reloc)
+	(m32r_elf_generic_reloc, m32r_elf_relocate_section): Likewise.
+	* elf32-m68hc1x.c (m68hc11_elf_special_reloc): Likewise.
+	* elf32-mips.c (gprel32_with_gp, mips16_gprel_reloc): Likewise.
+	* elf32-or32.c (or32_elf_consth_reloc): Likewise.
+	* elf32-ppc.c (ppc_elf_addr16_ha_reloc): Likewise.
+	* elf32-s390.c (s390_elf_ldisp_reloc): Likewise.
+	* elf32-sh.c (sh_elf_reloc_loop): Likewise.
+	* elf32-sparc.c (sparc_elf_wdisp16_reloc): Likewise.
+	(sparc_elf_hix22_reloc, sparc_elf_lox10_reloc): Likwise.
+	* elf32-v850.c (v850_elf_reloc): Likewise.
+	* elf32-xstormy16.c (xstormy16_elf_24_reloc): Likewise.
+	* elf32-xtensa.c (bfd_elf_xtensa_reloc): Likewise.
+	* elf64-alpha.c (elf64_alpha_reloc_gpdisp): Likewise.
+	* elf64-mips.c (mips_elf64_gprel32_reloc)
+	(mips16_gprel_reloc): Likewise.
+	* elf64-mmix.c (mmix_elf_reloc): Likewise.
+	* elf64-s390.c (s390_elf_ldisp_reloc): Likewise.
+	* elf64-sparc.c (init_insn_reloc): Likewise.
+	* elfn32-mips.c (gprel32_with_gp, mips16_gprel_reloc): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_gprel16_with_gp)
+	(_bfd_mips_elf_hi16_reloc, _bfd_mips_elf_lo16_reloc)
+	(_bfd_mips_elf_generic_reloc): Likewise.
+	* bfd-in2.h: Regenerate.
+
+2004-06-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd-in.h (struct stab_info): Move from stabs.c.
+	* stabs.c (struct stab_link_includes_table): Delete.
+	(stab_link_includes_lookup): Delete.
+	(_bfd_write_section_stabs, _bfd_write_stab_strings): Remove one
+	level of indirection from sinfo parm.
+	(_bfd_link_section_stabs): Likewise.  Set SEC_LINKER_CREATED on
+	stabstr section.  Adjust hash table accesses.
+	* coff-ppc.c (ppc_bfd_coff_final_link): Do include rawsize in contents
+	alloc.  Adjust stab_info test.
+	* cofflink.c (_bfd_coff_link_hash_table_init): Clear stab_info.
+	(_bfd_coff_final_link): Adjust stab_info test.
+	(_bfd_coff_link_input_bfd): Ignore SEC_LINKER_CREATED sections.
+	* elf-bfd.h (struct elf_link_hash_table): Include struct stab_info
+	in place.
+	* libcoff-in.h (struct coff_link_hash_table): Likewise.
+	* elf.c (_bfd_elf_link_hash_table_init): Clear stab_info.
+	* elflink.c (bfd_elf_final_link): Don't attempt to link linker created
+	stabstr section.  Adjust stab_info test.
+	* libbfd-in.h (_bfd_link_section_stabs, _bfd_write_section_stabs)
+	(_bfd_write_stab_strings): Adjust prototypes.
+	* libbfd.h: Regenerate.
+	* libcoff.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2004-06-27  Mark Kettenis  <kettenis@gnu.org>
+
+	From Miod Vallat <miod@online.fr>:
+	* aoutx.h (NAME(aout,machine_type)): Handle bfd_arch_m88k.
+
+2004-06-26  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf-m10300.c (struct elf_mn10300_pcrel_relocs_copied): Delete.
+	(struct elf32_mn10300_link_hash_entry): Remove
+	pcrel_relocs_copied.
+	(mn10300_elf_check_relocs): Only reserve dynamic relocations for
+	R_MN10300_32.  Don't adjust pcrel_relocs_copied.
+	(mn10300_elf_final_link_relocate): Fail for direct, pc-relative
+	and gotoff relocations if the symbol doesn't bind locally.  Use
+	_bfd_elf_symbol_refs_local_p to test.  Don't create dynamic
+	relocation for PCREL32.
+	(mn10300_elf_relocate_section): Use _bfd_elf_symbol_refs_local_p
+	to test whether a symbol binds locally.
+	(elf32_mn10300_link_hash_newfunc): Don't initialize
+	pcrel_relocs_copied.
+	(_bfd_mn10300_elf_discard_copies): Delete.
+	(_bfd_mn10300_elf_size_dynamic_sections): Don't call it.
+
+2004-06-26  Mark Kettenis  <kettenis@gnu.org>
+
+	* config.bfd: Replace m88k-*-openbsd* with m88*-*-openbsd*.
+
+2004-06-25  Joel Brobecker  <brobecker@gnat.com>
+
+	* som.c (som_set_reloc_info): Correct small typo.
+
+2004-06-25  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
+
+	* elf32-m32r.c (m32r_elf_howto_table): Support R_M32R_GOTOFF.
+	(m32r_elf_relocate_section): Changed for R_M32R_GOTOFF.
+	(m32r_elf_gcsweep_hook): Likewise.
+	(m32r_elf_check_relocs): Likewise.
+	(m32r_elf_howto_table): Added R_M32R_GOTOFF_HI_ULO,
+	R_M32R_GOTOFF_HI_SLO and R_M32R_GOTOFF_LO.
+	* reloc.c: Added BFD_RELOC_M32R_GOTOFF_HI_ULO,
+	BFD_RELOC_M32R_GOTOFF_HI_SLO and BFD_RELOC_M32R_GOTOFF_LO.
+	* bfd-in2.h: Regenerated.
+	* libbfd.h: Regenerated.
+
+2004-06-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf64_x86_64_check_relocs): Warn overflow
+	relocation symbol.
+	(elf64_x86_64_relocate_section): Issue an error for
+	R_X86_64_PC8, R_X86_64_PC16 and R_X86_64_PC32 relocations
+	against global symbols when building shared library.
+
+2004-06-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* section.c (struct sec): Rename "_cooked_size" to "size".
+	Rename "_raw_size" to "rawsize".
+	(STD_SECTION): Adjust comments.
+	(bfd_set_section_size, bfd_get_section_contents): Use size.
+	(bfd_malloc_and_get_section): New function.
+	* bfd-in.h (bfd_section_size, bfd_get_section_size): Use size.
+	* coff-sh.c (sh_relax_section): Alloc coff_section_data struct early.
+	Correctly free reloc and contents memory.
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Delete FIXME
+	and fake CIE now that we can shink section size to zero.
+	(_bfd_elf_write_section_eh_frame): Likewise..
+	* elf32-ppc.c (ppc_elf_relax_section): Delay reading section contents.
+	* elf-m10300.c (mn10300_elf_final_link_relocate): Don't use
+	_bfd_stab_section_offset.  Use _bfd_elf_section_offset.
+	* stabs.c (_bfd_stab_section_offset_): Remove unused args and
+	unneeded indirection.
+	* elf.c (_bfd_elf_section_offset): .. and update call.
+	* libbfd-in.h (_bfd_stab_section_offset): Update prototype.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+	Replace occurrences of "_raw_size" and "_cooked_size" in most places
+	with "size".  Set new "rawsize" for stabs, eh_frame, and SEC_MERGE
+	sections.  Use "rawsize", if non-zero, for bfd_get_section_contents
+	calls if the section might be a stabs, eh_frame, or SEC_MERGE section.
+	Similarly use "rawsize", if non-zero, in reloc functions to validate
+	reloc addresses.  Use new bfd_malloc_and_get_section in most places
+	where bfd_get_section_contents was called.  Expand all occurrences of
+	bfd_section_size and bfd_get_section_size.  Rename "raw_size" var in
+	grok_prstatus and similar functions to "size".
+	* aix386-core.c (aix386_core_file_p): ..
+	* aix5ppc-core.c (xcoff64_core_p): ..
+	* aout-adobe.c (aout_adobe_callback, aout_adobe_write_object_contents,
+	aout_adobe_set_section_contents): ..
+	* aout-target.h (callback): ..
+	* aout-tic30.c (tic30_aout_callback, tic30_aout_final_link_relocate,
+	MY_bfd_final_link): ..
+	* aoutf1.h (sunos4_core_file_p): ..
+	* aoutx.h (some_aout_object_p, adjust_o_magic, adjust_z_magic,
+	adjust_n_magic, adjust_sizes_and_vmas, translate_from_native_sym_flags,
+	final_link, aout_link_input_section): ..
+	* binary.c (binary_object_p, binary_canonicalize_symtab,
+	binary_set_section_contents): ..
+	* bout.c (b_out_callback, b_out_write_object_contents,
+	b_out_set_section_contents, b_out_bfd_relax_section,
+	b_out_bfd_get_relocated_section_contents): ..
+	* cisco-core.c (cisco_core_file_validate): ..
+	* coff-alpha.c (alpha_ecoff_object_p,
+	alpha_ecoff_get_relocated_section_conten, alpha_relocate_section): ..
+	* coff-arm.c (coff_arm_relocate_section,
+	bfd_arm_allocate_interworking_sections): ..
+	* coff-h8300.c (h8300_reloc16_extra_cases,
+	h8300_bfd_link_add_symbols): ..
+	* coff-mips.c (mips_refhi_reloc, mips_gprel_reloc): ..
+	* coff-ppc.c (coff_ppc_relocate_section, ppc_allocate_toc_section,
+	ppc_bfd_coff_final_link): ..
+	* coff-rs6000.c (xcoff_reloc_type_br, xcoff_ppc_relocate_section): ..
+	* coff-sh.c (sh_relax_section, sh_relax_delete_bytes,
+	sh_align_loads, sh_coff_get_relocated_section_contents): ..
+	* coff64-rs6000.c (xcoff64_write_object_contents,
+	xcoff64_reloc_type_br, xcoff64_ppc_relocate_section): ..
+	* coffcode.h (coff_compute_section_file_positions,
+	coff_write_object_contents): ..
+	* coffgen.c (make_a_section_from_file, coff_write_symbols,
+	coff_section_symbol, build_debug_section): ..
+	* cofflink.c (coff_link_add_symbols, _bfd_coff_final_link,
+	process_embedded_commands, _bfd_coff_link_input_bfd,
+	_bfd_coff_write_global_sym): ..
+	* cpu-arm.c (bfd_arm_update_notes, bfd_arm_get_mach_from_notes): ..
+	* cpu-ns32k.c (do_ns32k_reloc, _bfd_ns32k_final_link_relocate): ..
+	* dwarf1.c (parse_line_table, _bfd_dwarf1_find_nearest_line): ..
+	* dwarf2.c (read_indirect_string, read_abbrevs, decode_line_info,
+	_bfd_dwarf2_find_nearest_line): ..
+	* ecoff.c (bfd_debug_section, ecoff_set_symbol_info,
+	ecoff_compute_section_file_positions,
+	_bfd_ecoff_write_object_contents, ecoff_indirect_link_order): ..
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame,
+	_bfd_elf_discard_section_eh_frame_hdr,
+	_bfd_elf_maybe_strip_eh_frame_hdr, _bfd_elf_eh_frame_section_offset,
+	_bfd_elf_write_section_eh_frame,
+	_bfd_elf_write_section_eh_frame_hdr): ..
+	* elf-hppa.h (elf_hppa_sort_unwind): ..
+	* elf-m10200.c (mn10200_elf_relax_section,
+	mn10200_elf_relax_delete_bytes,
+	mn10200_elf_get_relocated_section_contents): ..
+	* elf-m10300.c (_bfd_mn10300_elf_create_got_section,
+	mn10300_elf_check_relocs, mn10300_elf_relax_section,
+	mn10300_elf_relax_delete_bytes,
+	mn10300_elf_get_relocated_section_contents,
+	_bfd_mn10300_elf_adjust_dynamic_symbol,
+	_bfd_mn10300_elf_discard_copies,
+	_bfd_mn10300_elf_size_dynamic_sections,
+	_bfd_mn10300_elf_finish_dynamic_sections): ..
+	* elf.c (_bfd_elf_print_private_bfd_data, bfd_elf_get_bfd_needed_list,
+	_bfd_elf_make_section_from_phdr, elf_fake_sections,
+	bfd_elf_set_group_contents, map_sections_to_segments,
+	elf_sort_sections, assign_file_positions_for_segments,
+	SECTION_SIZE, copy_private_bfd_data,
+	_bfd_elf_get_dynamic_reloc_upper_bound,
+	_bfd_elf_canonicalize_dynamic_reloc, elfcore_maybe_make_sect,
+	_bfd_elfcore_make_pseudosection, elfcore_grok_prstatus,
+	elfcore_grok_lwpstatus, elfcore_grok_win32pstatus,
+	elfcore_grok_note, elfcore_grok_nto_status, elfcore_grok_nto_gregs,
+	_bfd_elf_rel_local_sym, _bfd_elf_get_synthetic_symtab): ..
+	* elf32-arm.h (bfd_elf32_arm_allocate_interworking_sect,
+	bfd_elf32_arm_process_before_allocation,
+	elf32_arm_adjust_dynamic_symbol, allocate_dynrelocs,
+	elf32_arm_size_dynamic_sections, elf32_arm_finish_dynamic_sections,
+	elf32_arm_write_section): ..
+	* elf32-cris.c (cris_elf_grok_prstatus,
+	elf_cris_finish_dynamic_sections, cris_elf_gc_sweep_hook,
+	elf_cris_adjust_gotplt_to_got, elf_cris_adjust_dynamic_symbol,
+	cris_elf_check_relocs, elf_cris_size_dynamic_sections,
+	elf_cris_discard_excess_dso_dynamics,
+	elf_cris_discard_excess_program_dynamics): ..
+	* elf32-d30v.c (bfd_elf_d30v_reloc, bfd_elf_d30v_reloc_21): ..
+	* elf32-dlx.c (_bfd_dlx_elf_hi16_reloc): ..
+	* elf32-frv.c (_frvfdpic_add_dyn_reloc, _frvfdpic_add_rofixup,
+	_frv_create_got_section, _frvfdpic_assign_plt_entries,
+	elf32_frvfdpic_size_dynamic_sections,
+	elf32_frvfdpic_modify_segment_map,
+	elf32_frvfdpic_finish_dynamic_sections): ..
+	* elf32-h8300.c (elf32_h8_relax_section, elf32_h8_relax_delete_bytes,
+	elf32_h8_get_relocated_section_contents): ..
+	* elf32-hppa.c (hppa_build_one_stub, hppa_size_one_stub,
+	elf32_hppa_adjust_dynamic_symbol, allocate_plt_static,
+	allocate_dynrelocs, elf32_hppa_size_dynamic_sections, group_sections,
+	elf32_hppa_size_stubs, elf32_hppa_set_gp, elf32_hppa_build_stubs,
+	elf32_hppa_finish_dynamic_sections): ..
+	* elf32-i370.c (i370_elf_adjust_dynamic_symbol,
+	i370_elf_size_dynamic_sections, i370_elf_check_relocs,
+	i370_elf_finish_dynamic_sections): ..
+	* elf32-i386.c (elf_i386_grok_prstatus, elf_i386_adjust_dynamic_symbol,
+	allocate_dynrelocs, elf_i386_size_dynamic_sections,
+	elf_i386_relocate_section, elf_i386_finish_dynamic_sections): ..
+	* elf32-i860.c (i860_howto_pc26_reloc, i860_howto_pc16_reloc,
+	i860_howto_highadj_reloc, i860_howto_splitn_reloc): ..
+	* elf32-ip2k.c (ip2k_is_switch_table_128,
+	ip2k_relax_switch_table_128, ip2k_is_switch_table_256,
+	ip2k_relax_switch_table_256, ip2k_elf_relax_section,
+	adjust_all_relocations, ip2k_elf_relax_delete_bytes): ..
+	* elf32-m32r.c (m32r_elf_do_10_pcrel_reloc, m32r_elf_hi16_reloc,
+	m32r_elf_generic_reloc, m32r_elf_adjust_dynamic_symbol,
+	allocate_dynrelocs, m32r_elf_size_dynamic_sections,
+	m32r_elf_relocate_section, m32r_elf_finish_dynamic_sections,
+	m32r_elf_relax_section, m32r_elf_relax_delete_bytes,
+	m32r_elf_get_relocated_section_contents): ..
+	* elf32-m68hc11.c (m68hc11_elf_build_one_stub,
+	m68hc11_elf_size_one_stub, m68hc11_elf_relax_section,
+	m68hc11_elf_relax_delete_bytes): ..
+	* elf32-m68hc12.c (m68hc12_elf_build_one_stub,
+	m68hc12_elf_size_one_stub): ..
+	* elf32-m68hc1x.c (elf32_m68hc11_size_stubs,
+	elf32_m68hc11_build_stubs, m68hc11_elf_special_reloc): ..
+	* elf32-m68k.c (elf_m68k_check_relocs, elf_m68k_gc_sweep_hook,
+	elf_m68k_adjust_dynamic_symbol, elf_m68k_size_dynamic_sections,
+	elf_m68k_discard_copies, elf_m68k_finish_dynamic_sections): ..
+	* elf32-mips.c (gprel32_with_gp, mips16_gprel_reloc,
+	elf32_mips_grok_prstatus): ..
+	* elf32-or32.c (or32_elf_consth_reloc): ..
+	* elf32-ppc.c (ppc_elf_relax_section, ppc_elf_addr16_ha_reloc,
+	elf_create_pointer_linker_section, ppc_elf_create_linker_section,
+	ppc_elf_additional_program_headers, ppc_elf_adjust_dynamic_symbol,
+	allocate_dynrelocs, ppc_elf_size_dynamic_sections,
+	ppc_elf_finish_dynamic_sections, ppc_elf_grok_prstatus,
+	ppc_elf_final_write_processing): ..
+	* elf32-s390.c (s390_elf_ldisp_reloc, elf_s390_adjust_dynamic_symbol,
+	allocate_dynrelocs, elf_s390_size_dynamic_sections,
+	elf_s390_finish_dynamic_sections, elf_s390_grok_prstatus): ..
+	* elf32-sh.c (sh_elf_reloc_loop, sh_elf_relax_section,
+	sh_elf_relax_delete_bytes, sh_elf_align_loads,
+	sh_elf_adjust_dynamic_symbol, allocate_dynrelocs,
+	sh_elf_size_dynamic_sections, sh_elf_get_relocated_section_contents,
+	sh_elf_finish_dynamic_sections, elf32_shlin_grok_prstatus): ..
+	* elf32-sh64-com.c (sh64_address_in_cranges,
+	sh64_get_contents_type): ..
+	* elf32-sh64.c (sh64_find_section_for_address,
+	sh64_elf_final_write_processing): ..
+	* elf32-sparc.c (sparc_elf_wdisp16_reloc, sparc_elf_hix22_reloc,
+	sparc_elf_lox10_reloc, elf32_sparc_adjust_dynamic_symbol,
+	allocate_dynrelocs, elf32_sparc_size_dynamic_sections,
+	elf32_sparc_relocate_section, elf32_sparc_finish_dynamic_sections): ..
+	* elf32-v850.c (v850_elf_reloc, v850_elf_relax_section): ..
+	* elf32-vax.c (elf_vax_check_relocs, elf_vax_adjust_dynamic_symbol,
+	elf_vax_size_dynamic_sections, elf_vax_discard_copies,
+	elf_vax_instantiate_got_entries, elf_vax_relocate_section,
+	elf_vax_finish_dynamic_sections): ..
+	* elf32-xstormy16.c (xstormy16_elf_24_reloc,
+	xstormy16_elf_check_relocs, xstormy16_relax_plt_check,
+	xstormy16_elf_relax_section, xstormy16_elf_always_size_sections,
+	xstormy16_elf_finish_dynamic_sections): ..
+	* elf32-xtensa.c (xtensa_read_table_entries,
+	elf_xtensa_allocate_got_size, elf_xtensa_allocate_local_got_size,
+	elf_xtensa_size_dynamic_sections, elf_xtensa_do_reloc,
+	bfd_elf_xtensa_reloc, elf_xtensa_relocate_section,
+	elf_xtensa_combine_prop_entries, elf_xtensa_finish_dynamic_sections,
+	elf_xtensa_discard_info_for_section, elf_xtensa_grok_prstatus,
+	get_relocation_opcode, retrieve_contents, find_relaxable_sections,
+	collect_source_relocs, is_resolvable_asm_expansion, remove_literals,
+	relax_section, shrink_dynamic_reloc_sections, relax_property_section,
+	xtensa_callback_required_dependence): ..
+	* elf64-alpha.c (elf64_alpha_reloc_gpdisp, elf64_alpha_relax_section,
+	elf64_alpha_check_relocs, elf64_alpha_adjust_dynamic_symbol,
+	elf64_alpha_calc_got_offsets_for_symbol, elf64_alpha_calc_got_offsets,
+	elf64_alpha_size_plt_section, elf64_alpha_size_plt_section_1,
+	elf64_alpha_always_size_sections, elf64_alpha_calc_dynrel_sizes,
+	elf64_alpha_size_rela_got_section, elf64_alpha_size_rela_got_1,
+	elf64_alpha_size_dynamic_sections, elf64_alpha_emit_dynrel,
+	elf64_alpha_finish_dynamic_sections, elf64_alpha_final_link): ..
+	* elf64-hppa.c (allocate_dynrel_entries,
+	elf64_hppa_size_dynamic_sections,
+	elf64_hppa_finish_dynamic_sections): ..
+	* elf64-mips.c (mips_elf64_gprel32_reloc, mips16_gprel_reloc,
+	mips_elf64_canonicalize_dynamic_reloc, mips_elf64_slurp_reloc_table,
+	elf64_mips_grok_prstatus): ..
+	* elf64-mmix.c (mmix_elf_perform_relocation, mmix_elf_reloc,
+	mmix_elf_relocate_section, mmix_elf_final_link,
+	mmix_set_relaxable_size, _bfd_mmix_after_linker_allocation,
+	mmix_elf_relax_section, mmix_elf_get_section_contents): ..
+	* elf64-ppc.c (ppc64_elf_object_p, ppc64_elf_grok_prstatus,
+	ppc64_elf_check_relocs, ppc64_elf_func_desc_adjust,
+	ppc64_elf_adjust_dynamic_symbol, ppc64_elf_edit_opd,
+	allocate_dynrelocs, ppc64_elf_size_dynamic_sections,
+	ppc_build_one_stub, ppc_size_one_stub, ppc64_elf_next_toc_section,
+	toc_adjusting_stub_needed, group_sections, ppc64_elf_size_stubs,
+	ppc64_elf_build_stubs, ppc64_elf_relocate_section,
+	ppc64_elf_finish_dynamic_sections): ..
+	* elf64-s390.c (s390_elf_ldisp_reloc, elf_s390_adjust_dynamic_symbol,
+	allocate_dynrelocs, elf_s390_size_dynamic_sections,
+	elf_s390_finish_dynamic_sections): ..
+	* elf64-sh64.c (sh_elf64_get_relocated_section_contents,
+	sh_elf64_check_relocs, sh64_elf64_adjust_dynamic_symbol,
+	sh64_elf64_discard_copies, sh64_elf64_size_dynamic_sections,
+	sh64_elf64_finish_dynamic_sections): ..
+	* elf64-sparc.c (sparc64_elf_slurp_reloc_table, init_insn_reloc,
+	sparc64_elf_check_relocs, sparc64_elf_adjust_dynamic_symbol,
+	sparc64_elf_size_dynamic_sections, sparc64_elf_relocate_section,
+	sparc64_elf_finish_dynamic_symbol,
+	sparc64_elf_finish_dynamic_sections): ..
+	* elf64-x86-64.c (elf64_x86_64_grok_prstatus,
+	elf64_x86_64_adjust_dynamic_symbol, allocate_dynrelocs,
+	elf64_x86_64_size_dynamic_sections, elf64_x86_64_relocate_section,
+	elf64_x86_64_finish_dynamic_sections): ..
+	* elfarm-nabi.c (elf32_arm_nabi_grok_prstatus): ..
+	* elfcode.h (elf_slurp_reloc_table): ..
+	* elflink.c (_bfd_elf_create_got_section, elf_add_dt_needed_tag,
+	elf_finalize_dynstr, elf_link_add_object_symbols,
+	bfd_elf_size_dynamic_sections, elf_link_sort_relocs,
+	elf_link_input_bfd, bfd_elf_final_link, bfd_elf_discard_info): ..
+	* elfn32-mips.c (gprel32_with_gp, mips16_gprel_reloc,
+	elf32_mips_grok_prstatus): ..
+	* elfxx-ia64.c (elfNN_ia64_relax_section, allocate_dynrel_entries,
+	elfNN_ia64_size_dynamic_sections, elfNN_ia64_install_dyn_reloc,
+	elfNN_ia64_choose_gp, elfNN_ia64_final_link,
+	elfNN_ia64_finish_dynamic_sections): ..
+	* elfxx-mips.c (mips_elf_create_procedure_table,
+	mips_elf_check_mips16_stubs, _bfd_mips_elf_gprel16_with_gp,
+	_bfd_mips_elf_hi16_reloc, _bfd_mips_elf_generic_reloc,
+	mips_elf_global_got_index, mips_elf_multi_got,
+	mips_elf_create_compact_rel_section, mips_elf_calculate_relocation,
+	mips_elf_allocate_dynamic_relocations,
+	mips_elf_create_dynamic_relocation, _bfd_mips_elf_fake_sections,
+	_bfd_mips_relax_section, _bfd_mips_elf_adjust_dynamic_symbol,
+	_bfd_mips_elf_always_size_sections,
+	_bfd_mips_elf_size_dynamic_sections,
+	_bfd_mips_elf_finish_dynamic_symbol,
+	_bfd_mips_elf_finish_dynamic_sections,
+	_bfd_mips_elf_modify_segment_map, _bfd_mips_elf_discard_info,
+	_bfd_mips_elf_write_section, _bfd_mips_elf_set_section_contents,
+	_bfd_elf_mips_get_relocated_section_contents,
+	_bfd_mips_elf_final_link, _bfd_mips_elf_merge_private_bfd_data): ..
+	* hp300hpux.c (callback): ..
+	* hppabsd-core.c (make_bfd_asection): ..
+	* hpux-core.c (make_bfd_asection): ..
+	* i386linux.c (linux_link_create_dynamic_sections,
+	bfd_i386linux_size_dynamic_sections, linux_finish_dynamic_link): ..
+	* i386msdos.c (msdos_write_object_contents): ..
+	* i386os9k.c (os9k_callback, os9k_write_object_contents,
+	os9k_set_section_contents): ..
+	* ieee.c (parse_expression, ieee_slurp_external_symbols,
+	ieee_slurp_sections, ieee_slurp_debug, ieee_slurp_section_data,
+	ieee_write_section_part, do_with_relocs, do_as_repeat,
+	do_without_relocs, ieee_write_debug_part, init_for_output,
+	ieee_set_section_contents): ..
+	* ihex.c (ihex_scan, ihex_read_section, ihex_get_section_contents): ..
+	* irix-core.c (do_sections, make_bfd_asection): ..
+	* libaout.h (aout_section_merge_with_text_p): ..
+	* libbfd.c (_bfd_generic_get_section_contents,
+	_bfd_generic_get_section_contents_in_window): ..
+	* linker.c (default_indirect_link_order): ..
+	* lynx-core.c (make_bfd_asection): ..
+	* m68klinux.c (linux_link_create_dynamic_sections,
+	bfd_m68klinux_size_dynamic_sections, linux_finish_dynamic_link): ..
+	* mach-o.c (bfd_mach_o_make_bfd_section,
+	bfd_mach_o_scan_read_dylinker, bfd_mach_o_scan_read_dylib,
+	bfd_mach_o_scan_read_thread, bfd_mach_o_scan_read_symtab,
+	bfd_mach_o_scan_read_segment): ..
+	* merge.c (_bfd_add_merge_section, record_section, merge_strings,
+	_bfd_merge_sections): ..
+	* mmo.c (mmo_find_sec_w_addr, mmo_get_spec_section, mmo_get_loc,
+	mmo_map_set_sizes, mmo_canonicalize_symtab,
+	mmo_internal_write_section, mmo_write_object_contents): ..
+	* netbsd-core.c (netbsd_core_file_p): ..
+	* nlm32-alpha.c (nlm_alpha_read_reloc, nlm_alpha_write_import,
+	nlm_alpha_set_public_section): ..
+	* nlm32-ppc.c (nlm_powerpc_read_reloc, nlm_powerpc_write_reloc): ..
+	* nlm32-sparc.c (nlm_sparc_write_import): ..
+	* nlmcode.h (add_bfd_section, nlm_swap_auxiliary_headers_in,
+	nlm_compute_section_file_positions): ..
+	* oasys.c (oasys_object_p, oasys_slurp_section_data,
+	oasys_write_sections, oasys_write_data, oasys_set_section_contents): ..
+	* opncls.c (get_debug_link_info): ..
+	* osf-core.c (make_bfd_asection): ..
+	* pdp11.c (some_aout_object_p, adjust_o_magic, adjust_z_magic,
+	adjust_n_magic, adjust_sizes_and_vmas, squirt_out_relocs,
+	final_link, aout_link_input_section): ..
+	* peXXigen.c (_bfd_XXi_swap_sym_in, _bfd_XXi_swap_aouthdr_out,
+	pe_print_idata, pe_print_edata, pe_print_pdata, pe_print_reloc): ..
+	* pef.c (bfd_pef_make_bfd_section, bfd_pef_print_loader_section,
+	bfd_pef_scan_start_address, bfd_pef_parse_symbols): ..
+	* ppcboot.c (ppcboot_object_p, ppcboot_canonicalize_symtab): ..
+	* ptrace-core.c (ptrace_unix_core_file_p): ..
+	* reloc.c (bfd_perform_relocation, bfd_install_relocation,
+	_bfd_final_link_relocate, bfd_generic_relax_section,
+	bfd_generic_get_relocated_section_contents): ..
+	* reloc16.c (bfd_coff_reloc16_relax_section,
+	bfd_coff_reloc16_get_relocated_section_c): ..
+	* riscix.c (riscix_some_aout_object_p): ..
+	* rs6000-core.c (read_hdr, make_bfd_asection): ..
+	* sco5-core.c (make_bfd_asection): ..
+	* simple.c (bfd_simple_get_relocated_section_contents): ..
+	* som.c (som_object_setup, setup_sections, som_prep_headers,
+	som_write_fixups, som_begin_writing, bfd_section_from_som_symbol,
+	som_set_reloc_info, som_get_section_contents,
+	som_bfd_link_split_section): ..
+	* sparclinux.c (linux_link_create_dynamic_sections,
+	bfd_sparclinux_size_dynamic_sections, linux_finish_dynamic_link): ..
+	* srec.c (srec_scan, srec_read_section, srec_get_section_contents): ..
+	* stabs.c (_bfd_link_section_stabs, _bfd_discard_section_stabs,
+	_bfd_write_stab_strings, _bfd_stab_section_offset): ..
+	* sunos.c (sunos_read_dynamic_info, sunos_create_dynamic_sections,
+	bfd_sunos_size_dynamic_sections, sunos_scan_std_relocs,
+	sunos_scan_ext_relocs, sunos_scan_dynamic_symbol,
+	sunos_write_dynamic_symbol, sunos_check_dynamic_reloc,
+	sunos_finish_dynamic_link): ..
+	* syms.c (_bfd_stab_section_find_nearest_line): ..
+	* tekhex.c (first_phase, tekhex_set_section_contents,
+	tekhex_write_object_contents): ..
+	* trad-core.c (trad_unix_core_file_p): ..
+	* versados.c (process_esd, process_otr, process_otr): ..
+	* vms-gsd.c (_bfd_vms_slurp_gsd, _bfd_vms_write_gsd): ..
+	* vms-misc.c (add_new_contents): ..
+	* vms-tir.c (check_section, new_section, _bfd_vms_write_tir): ..
+	* vms.c (vms_set_section_contents): ..
+	* xcofflink.c (xcoff_get_section_contents, xcoff_link_add_symbols,
+	xcoff_sweep, bfd_xcoff_size_dynamic_sections, xcoff_build_ldsyms,
+	_bfd_xcoff_bfd_final_link, xcoff_link_input_bfd): ..
+	* xsym.c (bfd_sym_scan): .. See above.
+
+2004-06-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Add addend when
+	calling _bfd_merged_section_offset only for section symbols.
+
+2004-06-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_relax_section): Implement reference code
+	for handling SEC_MERGE symbols in relax_section.
+
+2004-06-21  Alexandre Oliva  <aoliva@redhat.com>
+
+	2003-05-15  Richard Sandiford  <rsandifo@redhat.com>
+	* cpu-h8300.c (compatible): Allow h8300s and h8300sx code to be
+	linked together. Mark the result as h8300sx code.
+
+2004-06-21  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf-bfd.h (struct elf_backend_data): Added
+	elf_backend_omit_section_dynsym.
+	(_bfd_elf_link_omit_section_dynsym): Declare.
+	* elf32-frv.c (_frvfdpic_link_omit_section_dynsym): New.
+	(elf_backend_omit_section_dynsym): Use it for frvfdpic.
+	* elflink.c (_bfd_elf_link_omit_section_dynsym): Split out of...
+	(_bfd_elf_link_renumber_dynsyms): ... this function.
+	* elfxx-target.h (elf_backend_omit_section_dynsym): Default to
+	_bfd_elf_link_omit_section_dynsym).
+	(elfNN_bed): Added elf_backend_omit_section_dynsym.
+
+2004-06-21  Nick Clifton  <nickc@redhat.com>
+
+	* coffcode.h (styp_to_sec_flags): Ignore IMAGE_SCN_MEM_NOT_PAGED
+	flags.
+
+2004-06-17  Jerome Guitton  <guitton@gnat.com>
+
+	* bfd-in.h (bfd_cache_close_all): New function declaration.
+	* bfd-in2.h: Regenerate.
+	* cache.c (bfd_cache_close_all): New function definition.
+
+2004-06-16  Mark Kettenis  <kettenis@gnu.org>
+
+	* configure.in: Don't set COREFILE to trad-core.lo for FreeBSD
+	4.10 and beyond.
+	* configure: Regenerate.
+
+2004-06-16  Daniel Jacobowitz  <dan@debian.org>
+
+	* elf32-ppc.c (ppc_elf_create_linker_section): Create symbols in
+	the pre-existing section.
+
+2004-06-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* section.c (struct sec): Remove usused flags.  Reorganize a little.
+	(bfd_get_section_size_before_reloc): Delete.
+	(bfd_get_section_size_after_reloc): Delete.
+	(STD_SECTION): Update.
+	(bfd_get_section_size_now): Delete.
+	(bfd_set_section_contents): Don't referece reloc_done.
+	(bfd_get_section_contents): Remove reloc_done comment.
+	* bout.c (b_out_bfd_get_relocated_section_contents): Don't set
+	reloc_done.
+	* coff-alpha.c (alpha_ecoff_get_relocated_section_contents): Likewise.
+	* ecoff.c (bfd_debug_section): Update initializer.
+	* elfxx-mips.c (_bfd_elf_mips_get_relocated_section_contents): Ditto.
+	* reloc.c (bfd_generic_get_relocated_section_contents): Likewise.
+	* bfd-in.h (bfd_section_size): Expand.
+	(bfd_get_section_size): New macro.
+	* bfd-in2.h: Regenerate.
+	* coff64-rs6000.c (xcoff64_write_object_contents): Replace
+	bfd_get_section_size_before_reloc with bfd_get_section_size.
+	* coffcode.h (coff_write_object_contents): Likewise.
+	* coffgen.c (build_debug_section): Likewise.
+	* dwarf1.c (parse_line_table): Likewise.
+	(_bfd_dwarf1_find_nearest_line): Likewise.
+	* ecoff.c (_bfd_ecoff_write_object_contents): Likewise.
+	* i386msdos.c (msdos_write_object_contents): Likewise.
+	* pdp11.c (squirt_out_relocs): Likewise.
+	* elf32-sh64.c (sh64_find_section_for_address): Remove comment.
+	* elf64-mmix.c (mmix_elf_final_link): Update comment.
+
+2004-06-14  Chris Demetriou  <cgd@broadcom.com>
+
+	* elf32-mips.c (elf_mips_gnu_pcrel32): Add (undoing 2004-04-24
+	removal) with updated comment.
+	(bfd_elf32_bfd_reloc_type_lookup): Add back case for
+	BFD_RELOC_32_PCREL.
+	(mips_elf32_rtype_to_howto): Add back case for R_MIPS_PC32.
+	* elfxx-mips.c (mips_elf_calculate_relocation): Likewise.
+
+2004-06-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Ignore reloc
+	overflow on branches to undefweaks.
+
+2004-06-11  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+	* coff-alpha.c (alpha_relocate_section): Set used_by_bfd directly
+	as ecoff_section_data() does not return a valid lvalue.
+
+2004-06-09  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elflink.c (elf_sort_symbol): Compare section id, not pointers.
+	(elf_link_add_object_symbols): Likewise.
+
+	* elf-m10300.c (_bfd_mn10300_elf_reloc_type_class): New.
+	(elf_backend_reloc_type_class): New.
+
+2004-06-08  Mark Kettenis  <kettenis@gnu.org>
+
+	* configure.in (hppa*-*-netbsd*, hppa*-*-openbsd): Set COREFILE to
+	netbsd-core.lo.
+	* configure: Regenerate.
+
+2004-06-07  Daniel Jacobowitz  <dan@debian.org>
+
+	From:  Albert Chin-A-Young  <china@thewrittenword.com>
+	* elf-bfd.h (struct eh_cie_fde): Convert unsigned char bitfields
+	to unsigned int.
+
+2004-05-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Undo the last
+	change.
+
+2004-05-28  DJ Delorie  <dj@redhat.com>
+
+	* elf-m10300.c (mn10300_elf_relax_section): Preserve reloc addend
+	for linking, but otherwise adjust reloc for merged sections.
+
+2004-05-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Properly call
+	_bfd_merged_section_offset for local symbols.
+
+2004-05-28  Andrew Stubbs <andrew.stubbs@superh.com>
+
+	* Makefile.am: Regenerate dependencies.
+	* Makefile.in: Regenerate.
+	* archures.c: Add bfd_mach_sh3_nommu .
+	* bfd-in2.h: Regenerate.
+	* cpu-sh.c: Add sh3-nommu architecture.
+	(bfd_to_arch_table): Create new table.
+	(sh_get_arch_from_bfd_mach): Create new function.
+	(sh_get_arch_up_from_bfd_mach): Create new function.
+	(sh_merge_bfd_arch): Create new function.
+	* elf32-sh.c (sh_ef_bfd_table): Add table.
+	(sh_elf_check_relocs): Replace switch statement with
+	use of sh_ef_bfd_table .
+	(sh_elf_get_flags_from_mach): Add new function.
+	(sh_find_elf_flags): Likewise.
+	(sh_elf_copy_private_data): Replace most of non-elf contents
+	with a call to sh_merge_bfd_arch() .
+
+2004-05-27  Michael Chastain  <mec.gnu@mindspring.com>
+
+	* Makefile.am (bfdver.h): Use explicit filename, not $< .
+	* Makefile.in: Regenerate.
+
+2004-05-27  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf-m10300.c (elf32_mn10300_finish_hash_table_entry): Avoid
+	custom calling conventions for dynamic symbols.
+	(mn10300_elf_relax_section): Avoid relaxing a function as a local
+	symbol if it's an alias to a global one.
+
+2004-05-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (_bfd_elf_make_section_from_shdr): Undo the last
+	change.
+
+2004-05-27  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf-m10300.c (mn10300_elf_relax_section): Don't test isym within
+	loop over hashes.
+
+2004-05-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (_bfd_elf_make_section_from_shdr): Don't set SEC_EXCLUDE
+	for SHT_GROUP sections.
+
+2004-05-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_link_add_object_symbols): Don't set up merge
+	section data here..
+	* elf.c (_bfd_elf_merge_sections): .. Do it here instead.
+	* merge.c: Formatting.  Remove unnecessary casts.  Expand
+	bfd_get_section_alignment macro.
+	(struct sec_merge_sec_info): Rename "first" to "first_str".  Update
+	use throughout file.
+	(_bfd_add_merge_section): Rename from _bfd_merge_section.  Update
+	comment.  Abort on dynamic or non-SEC_MERGE input.  Don't test
+	section name to determine sinfo group, instead test output section
+	and alignment.
+	(_bfd_merge_sections): Add struct bfd_link_info param.  Call
+	_bfd_strip_section_from_output rather than just twiddling flags.
+	* libbfd-in.h (_bfd_add_merge_section): Rename, update comment.
+	(_bfd_merge_sections): Update prototype.
+	* libbfd.h: Regenerate.
+
+2004-05-24  Mark Kettenis  <kettenis@gnu.org>
+
+	* netbsd-core.c: Correctly indent section that sets architecture
+	from machine ID.
+
+	From Miod Vallat <miod@online.fr>:
+	* m88kopenbsd.c: New file.
+	* targets.c (m88k_openbsd_vec): New.
+	* config.bfd: Add m88k-*-openbsd*.
+	* configure.in (m88k-*-openbsd*): Set COREFILE to netbsd-core.lo.
+	(m88kopenbsd_vec): New.
+	* configure: Regenerate.
+	* Makefile.am (BFD32_BACKENDS): Add m88kopenbsd.lo.
+	(BFD32_BACKENDS_CFILES): Add m88kopenbsd.c.
+	Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2004-05-24  Nick Clifton  <nickc@redhat.com>
+
+	* hash.c: Remove bogus node "Changing the default Hash Table Size"
+	introduced by hash table size patch.
+
+2004-05-22  Ben Elliston  <bje@au.ibm.com>
+
+	* configure.in (is_release): Remove.
+	(bfd_version_date, bfd_version, bfd_version_string): Likewise.
+	(AC_OUTPUT): Don't output bfdver.h from version.h.
+	* configure: Regenerate.
+	* Makefile.am (RELEASE): New variable.
+	(bfdver.h): New target.
+	* Makefile.in: Regenerate.
+	* doc/Makefile.in: Likewise.
+
+2004-05-22  Ben Elliston  <bje@au.ibm.com>
+
+	* Makefile.am (config.status): Don't depend on version.h.
+	* Makefile.in: Regenerate.
+
+2004-05-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* merge.c (_bfd_merged_section_offset): Remove "addend" param.
+	* libbfd-in.h (_bfd_merged_section_offset): Adjust prototype.
+	* libbfd.h: Regenerate.
+	* elf.c (_bfd_elf_rela_local_sym): Adjust call.
+	(_bfd_elf_rel_local_sym): Likewise.
+	* elflink.c (_bfd_elf_link_sec_merge_syms): Likewise.
+	(elf_link_input_bfd): Likewise.
+	* elf32-ppc.c (ppc_elf_relax_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relocate_section): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Likewise.
+	(elfNN_ia64_relocate_section): Likewise.
+
+2004-05-21  Andy Chittenden  <achittenden@bluearc.com>
+
+	* hash.c (bfd_default_hash_table_size): New variable.
+	(bfd_hash_table_init): Use new variable instead of DEFAULT_SIZE.
+	(bfd_hash_set_default_size): New function.  Set the default size
+	to a selected prime number close to the argument.  Document new
+	function.
+	* bfd-in.h: Add prototype for  bfd_hash_set_default_size.
+	* bfd-in2.h: Regenerate.
+	* Makefile.am (hash.lo): Add dependency upon libiberty.h.
+	* Makefile.in: Regenerate.
+
+2004-05-21  Mark Kettenis  <kettenis@gnu.org>
+
+	* libaout.h (machine_type): Add M_88K_OPENBSD and M_HPPA_OPENBSD.
+	* netbsd-core.c (netbsd_core_file_p): Set architecture for alpha,
+	arm, m68k, m88k and hppa core files.
+
+2004-05-21  Nick Clifton  <nickc@redhat.com>
+
+	* bfdio.c (bfd_bread): Do not use iovec if it is NULL.
+	(bfd_bwrite): Likewise.
+	(bfd_tell): Likewise.
+	(bfd_flush): Likewise.
+	(bfd_stat): Likewise.
+	(bfd_seek): Likewise.
+	(bfd_get_mtime): Likewise.
+	(bfd_get_size): Likewise.
+
+2004-05-19  Ben Elliston  <bje@au.ibm.com>
+
+	* dwarf2.c (_bfd_dwarf2_find_nearest_line): Comment correction.
+
+2004-05-19  Mikulas Patocka  <mikulas@artax.karlin.mff.cuni.cz>
+
+	* archive.c (_bfd_get_elt_at_filepos): Cope with a nested archives.
+	(bfd_generic_openr_next_archived_file): Likewise.
+
+2004-05-17  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (xtensa_get_property_section_name): Determine linkonce
+	section names by inserting a new substring after .gnu.linkonce, except
+	for .gnu.linkonce.t.* where the "t." is replaced.
+
+2004-05-17  Adam Nemet  <anemet@lnxw.com>
+
+	* config.bfd (sparc-*-lynxos* case): Add to obsolete list.
+	(m68-*-lynxos* case): Likewise.
+	(powerpc-*-lyxnos* case): New case.
+	(i[3-7]86-*-lynxos* case): Update to LynxOS 4.0 ELF.
+
+2004-05-17  David Heine  <dlheine@tensilica.com>
+
+	* aout-target.h (MY_bfd_copy_private_header_data): Define.
+	* aout-tic30.c (MY_bfd_copy_private_header_data): Define.
+	* bfd.c (bfd_copy_private_header_data): Define.
+	* coff-rs6000.c (rs6000coff_vec, pmac_xcoff_vec): Add entries for new
+	interface.
+	* coff64-rs6000.c (rs6000coff64_vec, aix5coff64_vec): Likewise.
+	* coffcode.h (coff_bfd_copy_private_header_data): Define.
+	* elf-bfd.h (_bfd_elf_copy_private_header_data): Declare.
+	* elf.c (_bfd_elf_copy_private_section_data): Remove code to set up
+	segments by calling copy_private_bfd_data.
+	(_bfd_elf_copy_private_header_data): Define.
+	* elfxx-target.h (bfd_elfNN_bfd_copy_private_header_data): Define.
+	* libbfd-in.h (_bfd_generic_bfd_copy_private_header_data): Define.
+	* libecoff.h (_bfd_ecoff_bfd_copy_private_header_data): Define.
+	* mach-o.c (bfd_mach_o_bfd_copy_private_header_data): Define.
+	* mmo.c (mmo_bfd_copy_private_header_data): Define.
+	* ppcboot.c (ppcboot_bfd_copy_private_header_data): Define.
+	* som.c (som_bfd_copy_private_header_data): Define.
+	* targets.c (BFD_JUMP_TABLE_COPY): Add _bfd_copy_private_header_data.
+	* vms.c (vms_bfd_copy_private_header_data): Define.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2004-05-15  Thiemo Seufer  <seufer@csv.ica.uni-stuttgart.de>
+
+	* elfxx-mips.c (MINUS_TWO): Define.
+	(mips_elf_higher, mips_elf_highest,
+	mips_elf_create_dynamic_relocation): Use MINUS_ONE and MINUS_TWO for
+	some bfd_vma values.
+	(_bfd_mips_elf_finish_dynamic_symbol): Likewise. Code cleanup.
+
+2004-05-14  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* som.c (log2): Rename to exact_log2.  Adjust all callers.
+
+2004-05-13  Paul Brook  <paul@codesourcery.com>
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Handle
+	dwarf3 format CIE entries.  Remove comment about the size of the
+	ra_column field.  It is now correctly deduced.
+
+2004-05-13  Joel Sherrill <joel@oarcorp.com>
+
+	* config.bfd (or32-*-rtems*): Switch to elf.
+
+2004-05-13  Nick Clifton  <nickc@redhat.com>
+
+	* po/fr.po: Updated French translation.
+
+2004-05-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* elflink.c (bfd_elf_final_link): Don't output STT_SECTION symbol
+	into .dynsym if elf_section_data (sec)->dynindx <= 0.
+	Adjust counting of last_local.
+	(_bfd_elf_link_renumber_dynsyms): Don't assign dynindx to sections
+	other than SHT_PROGBITS/SHT_NOBITS and neither for .got/.got.plt/.plt
+	created by the linker nor !SHF_ALLOC.
+
+	* elf32-i386.c (elf_i386_finish_dynamic_sections): Point
+	DT_PLTGOT to the start of the .got.plt section instead of the
+	.got output section.  Set sh_entsize for .got section in addition
+	to .got.plt.
+	(elf_i386_relocate_section): Don't assume _GLOBAL_OFFSET_TABLE_
+	is at sgot->output_section->vma.
+	* elf64-x86-64.c (elf64_x86_64_finish_dynamic_sections): Point
+	DT_PLTGOT to the start of the .got.plt section instead of the
+	.got output section.
+	(elf64_x86_64_relocate_section): Don't assume _GLOBAL_OFFSET_TABLE_
+	is at sgot->output_section->vma.  Set sh_entsize for .got section
+	in addition to .got.plt.
+	* elf.c (_bfd_elf_print_private_bfd_data): Handle PT_GNU_RELRO.
+	(bfd_section_from_phdr): Likewise.
+	(map_sections_to_segments): Likewise.
+	(assign_file_positions_for_segments): Likewise.
+	(get_program_header_size): Likewise.
+	* elflink.c (bfd_elf_size_dynamic_sections): Set
+	elf_tdata (output_bfd)->relro from info->relro.
+	* elf-bfd.h (struct elf_obj_tdata): Add relro field.
+
+2004-05-08  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-frv.c (_frvfdpic_add_dyn_reloc): Don't warn when we get
+	a zero symndx for which we hadn't accounted a dynamic relocation.
+	(_frvfdpic_add_rofixup): Likewise.
+
+2004-05-07  Brian Ford  <ford@vss.fsi.com>
+	    DJ Delorie  <dj@redhat.com>
+
+	* coffcode.h (coff_write_object_contents) [COFF_IMAGE_WITH_PE]:
+	Propagate IMAGE_FILE_LARGE_ADDRESS_AWARE.
+	* peXXigen.c (_bfd_XX_print_private_bfd_data_common): Recognize
+	IMAGE_FILE_LARGE_ADDRESS_AWARE.  Use PE defines.
+
+2004-05-07  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-frv.c (elf32_frvfdpic_modify_segment_map): Return
+	immediately if there's no link info.
+	(elf32_frvfdpic_copy_private_bfd_data): New.
+	(bfd_elf32_bfd_copy_private_bfd_data): Use it for frvfdpic.
+
+2004-05-06  Zack Weinberg  <zack@codesourcery.com>
+
+	* dwarf2.c (add_line_info): Also set info->filename to NULL if
+	filename argument is null; do not call strlen on a null pointer.
+
+2004-05-06  Daniel Jacobowitz  <drow@mvista.com>
+
+	* elf32-arm.h (elf32_arm_relocate_section): Remove R_ARM_PLT32
+	special case.
+
+2004-05-05  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (bfd_elf32_frvfdpic_vec): New.
+	* configure: Rebuilt.
+	* targets.c (bfd_elf32_frvfdpic_vec): New.
+	* config.bfd: Enable it on frv-*-elf and frv-*-*linux*, as default
+	on the latter.
+	* elf32-frv.c: Prefix all identifiers added for FDPIC support with
+	frvfdpic instead of frv.  Rearrange elf-target macros such that
+	the FDPIC-specific ones are only defined for this new target
+	vector.
+	(bfd_elf32_frvfdpic_vec): Declare.
+	(IS_FDPIC): New.
+	(elf32_frv_relocate_section): Use it to enable segment checking
+	and to control rofixup emission.  Add output section vma to
+	applied relocation in non-LOAD non-ALLOC sections.  Use
+	_bfd_error_handler for errors.
+	(_frv_create_got_section): Create .rel.got and .rofixup only in
+	FDPIC.  Create non-dynamic _gp at .got+2048 in non-FDPIC, like the
+	linker script.
+	(elf32_frvfdpic_size_dynamic_sections): Assume FDPIC.
+	(elf32_frvfdpic_modify_segment_map): Likewise.
+	(elf32_frv_finish_dynamic_sections): New, do-nothing.
+	(elf32_frvfdpic_finish_dynamic_sections): Assume FDPIC.  Improve
+	error message if we miscompute the rofixup size.
+	(frvfdpic_elf_use_relative_eh_frame): Assume FDPIC.
+	(frvfdpic_elf_encode_eh_address): Likewise.
+	(elf32_frv_check_relocs): Reject FDPIC-only relocs in non-FDPIC.
+	Record relocs only in FDPIC.  Make sure _gp is defined for GPREL
+	relocs.  Reject unknown relocation types.
+	(elf32_frv_object_p): Make sure target vector matches FDPIC bits.
+	(frv_elf_merge_private_bfd_data): Likewise.
+	(ELF_MAXPAGESIZE): Revert to 0x1000 for elf32-frv; keep it as
+	0x4000 for newly-added elf32-frvfdpic.
+
+2004-05-05  Nick Clifton  <nickc@redhat.com>
+
+	PR/136
+	* cache.c (bfd_cache_lookup_worker): Call abort() rather than
+	returning NULL as most users of this function do not check its
+	return value.
+	* hppabsd-core.c (hppabsd_core_core_file_p): Do not check result
+	of bfd_cache_lookup().
+	* sco5-core.c (sco5_core_file_p): Likewise.
+	* trad-core.c (trad_unix_core_file_p): Likewise.
+
+2004-05-05  Nick Clifton  <nickc@redhat.com>
+
+	* cache.c (bfd_cache_lookup): Improve formatting.
+	* archive.c: Fix formatting.
+
+2004-05-05  Peter Barada  <peter@the-baradas.com>
+
+	* bfd_archures.c(bfd_architecture): Add 521x,5249,547x,548x.
+	* cpu-m68k.c(bfd_m68k_arch): Likewise.
+	* bfd-in2.h(bfd_architecture): Regenerate.
+
+2004-05-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (_bfd_elf_rela_local_sym): Set kept_section for excluded
+	SEC_MERGE sections.
+	* elflink.c (elf_link_input_bfd): Adjust output reloc index for
+	those against discarded link-once and SEC_MERGE section symbols.
+
+2004-05-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* section.c (bfd_get_section_by_name_if): New.
+	* bfd-in2.h: Regenerated.
+
+2004-05-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* som.c (som_bfd_is_group_section): Define.
+
+2004-05-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* section.c (bfd_make_section_anyway): Copy the whole
+	bfd_hash_entry, not just "next" from existing entry.
+
+2004-04-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (bfd_section_from_shdr): Maintain the section order in
+	a section group.
+	(special_sections): Add ".note.GNU-stack".
+	(elf_fake_sections): Handle section group for relocatable
+	link..
+
+2004-04-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* section.c (bfd_sections_find_if): New.
+	* bfd-in2.h: Regenerated.
+
+2004-04-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* section.c (bfd_make_section_anyway): Add all sections to hash tab.
+
+	* elf-bfd.h (bfd_elf_is_group_section): Declare.
+	* elf.c (bfd_elf_is_group_section): New function.
+	* elfxx-target.h (bfd_elfNN_bfd_is_group_section
+	* section.c (bfd_generic_is_group_section): New function.
+	* targets.c (struct bfd_target): Add _bfd_is_group_section field.
+	(BFD_JUMP_TABLE_LINK): Adjust.
+	* aout-adobe.c (aout_32_bfd_is_group_section): Define.
+	* aout-target.h (MY_bfd_is_group_section): Define.
+	* aout-tic30.c (MY_bfd_is_group_section): Define.
+	* bfd.c (bfd_is_group_section): Define.
+	* binary.c (binary_bfd_is_group_section): Define.
+	* bout.c (b_out_bfd_is_group_section): Define.
+	* coff-alpha.c (_bfd_ecoff_bfd_is_group_section): Define.
+	* coff-mips.c (_bfd_ecoff_bfd_is_group_section): Define.
+	* coff-rs6000.c (rs6000coff_vec, pmac_xcoff_vec): Adjust.
+	* coff64-rs6000.c (rs6000coff64_vec, aix5coff64_vec): Adjust.
+	* coffcode.h (coff_bfd_is_group_section): Define.
+	* i386msdos.c (msdos_bfd_is_group_section): Define.
+	* i386os9k.c (os9k_bfd_is_group_section): Define.
+	* ieee.c (ieee_bfd_is_group_section): Define.
+	* ihex.c (ihex_bfd_is_group_section): Define.
+	* libbfd-in.h (_bfd_nolink_bfd_is_group_section): Define.
+	* mach-o.c (bfd_mach_o_bfd_is_group_section): Define.
+	* mmo.c (mmo_bfd_is_group_section): Define.
+	* nlm-target.h (nlm_bfd_is_group_section): Define.
+	* oasys.c (oasys_bfd_is_group_section): Define.
+	* pef.c (bfd_pef_bfd_is_group_section): Define.
+	* ppcboot.c (ppcboot_bfd_is_group_section): Define.
+	* srec.c (srec_bfd_is_group_section): Define.
+	* tekhex.c (tekhex_bfd_is_group_section): Define.
+	* versados.c (versados_bfd_is_group_section): Define.
+	* vms.c (vms_bfd_is_group_section): Define.
+	* xsym.c (bfd_sym_bfd_is_group_section): Define.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2004-04-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_gc_mark): Follow indirect and warning syms.
+
+2004-04-30  Hans-Peter Nilsson  <hp@axis.com>
+
+	* configure.in: Update version to 2.15.91.
+	* configure: Regenerate.
+
+2004-04-29  Brian Ford  <ford@vss.fsi.com>
+
+	* bfd.c (bfd_get_sign_extend_vma): Add pe[i]-i386 case to DJGPP hack.
+	* coffcode.h (DOT_DEBUG, GNU_LINKONCE_WI): Define.
+	[!COFF_WITH_PE] (sec_to_styp_flags, styp_to_sec_flags): Use them.
+	(coff_compute_section_file_positions) [RS6000COFF_C]: Likewise.
+	[COFF_WITH_PE] (sec_to_styp_flags): Handle DWARF 2/3 .debug* and
+	.gnu.linkonce.wi. sections.
+	* pe-i386.c (COFF_SUPPORT_GNU_LINKONCE): Define.
+	(COFF_SECTION_ALIGNMENT_ENTRIES): Add entries for .debug and
+	.gnu.linkonce.wi..
+	* pei-i386.c (COFF_SUPPORT_GNU_LINKONCE): Likewise.
+	(COFF_SECTION_ALIGNMENT_ENTRIES): Likewise.
+
+2004-04-28  Chris Demetriou  <cgd@broadcom.com>
+
+	* reloc.c: Remove BFD_RELOC_PCREL_HI16_S and BFD_RELOC_PCREL_LO16.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Likewise.
+
+2004-04-28  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* som.c (struct som_misc_symbol_info): Add is_comdat, is_common and
+	dup_common fields.
+	(setup_sections): Use som_subspace_dictionary_record struct instead
+	subspace_dictionary_record.  Set SEC_LINK_ONCE if subspace is
+	is_comdat, is_common or dup_common.
+	(som_prep_headers): Use som_subspace_dictionary_record struct.  Set
+	is_comdat, is_common and dup_common in section subspace_dict from
+	copy_data.
+	(som_begin_writing): Use som_subspace_dictionary_record struct.
+	(som_finish_writing): Likewise.
+	(som_bfd_derive_misc_symbol_info): Add support to set is_comdat,
+	is_common and dup_common flags in info for symbol.  Add comment
+	regarding linker support for these fields.  Slightly reorganize
+	function.
+	(som_build_and_write_symbol_table): Set is_comdat, is_common and
+	dup_common fields in symbol table from symbol info.
+	(bfd_som_set_subsection_attributes): Add comdat, common and dup_common
+	arguments.  Set corresponding fields in copy_data.  Change all callers.
+	(som_bfd_ar_write_symbol_stuff): Set dup_common flag in library
+	symbol table.
+	(som_vec): Add SEC_LINK_ONCE to applicable section flags.
+	* som.h (som_subspace_dictionary_record): Define.
+	(som_copyable_section_data_struct): Add is_comdat, is_common and
+	dup_common fields.
+	(som_section_data_struct): Use som_subspace_dictionary_record struct
+	instead of subspace_dictionary_record.
+	(bfd_boolean bfd_som_set_subsection_attributes): Adjust prototype.
+
+2004-04-27  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (xtensa_read_table_entries): Use section _cooked_size
+	if set.  Check reloc_done flag before applying relocations.  Use
+	output addresses, both when applying relocations and when comparing
+	against the specified section.
+	(elf_xtensa_relocate_section): Use output address to check if dynamic
+	reloc is in a literal pool.  Set section's reloc_done flag.
+
+2004-04-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-sh64.c (elf_backend_section_flags): New. Defined.
+	(sh64_elf_set_mach_from_flags): Remove the kludge for .cranges
+	section.
+	(sh64_elf_section_flags): New. Set SEC_DEBUGGING for .cranges
+	section.
+
+2004-04-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-alpha.c (elf64_alpha_read_ecoff_info): Don't assign
+	structure field removed in 2004-04-24 patch.
+	* elf64-sparc.c (sparc64_elf_plt_sym_val): Warning fix.
+
+	* elf-bfd.h (struct elf_backend_data <elf_backend_section_flags>):
+	Constify hdr arg.
+	* elf32-arm.h (elf32_arm_section_flags): Likewise.
+	* elf64-alpha.c (elf64_alpha_section_flags): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_section_flags): Likewise.
+	* elf.c (_bfd_elf_make_section_from_shdr): Set the bfd_section
+	field before calling elf_backend_section_flags.
+
+2004-04-24  Chris Demetriou  <cgd@broadcom.com>
+
+	* elf32-mips.c (elf_mips_gnu_rel_hi16, elf_mips_gnu_rel_lo16)
+	(elf_mips_gnu_pcrel64, elf_mips_gnu_pcrel32): Remove.
+	(bfd_elf32_bfd_reloc_type_lookup): Remove cases for
+	BFD_RELOC_PCREL_HI16_S, BFD_RELOC_PCREL_LO16, BFD_RELOC_64_PCREL,
+	and BFD_RELOC_32_PCREL.
+	(mips_elf32_rtype_to_howto): Remove cases for R_MIPS_GNU_REL_HI16,
+	R_MIPS_GNU_REL_LO16, R_MIPS_PC64, R_MIPS_PC32.
+	* elfxx-mips.c (mips_elf_calculate_relocation): Likewise.
+	(_bfd_mips_elf_lo16_reloc): Remove handling for R_MIPS_GNU_REL_HI16.
+	(mips_elf_next_relocation): Move comment about matching HI/LO
+	relocations to...
+	(_bfd_mips_elf_relocate_section): Here.  Remove handling for
+	R_MIPS_GNU_REL_HI16.
+
+2004-04-23  Chris Demetriou  <cgd@broadcom.com>
+
+	* coff-mips.c (mips_relhi_reloc, mips_rello_reloc)
+	(mips_switch_reloc, mips_read_relocs, mips_relax_section)
+	(mips_relax_pcrel16, PCREL16_EXPANSION_ADJUSTMENT): Remove.
+	(mips_relocate_hi): Remove now-unused 'adjust' and 'pcrel' arguments,
+	and update comments to reflect current usage.
+	(mips_howto_table): Remove entries for MIPS_R_RELHI, MIPS_R_RELLO,
+	and MIPS_R_SWITCH, as well as several empty entries.  Update comment
+	for MIPS_R_PCREL16.
+	(mips_ecoff_swap_reloc_in, mips_ecoff_swap_reloc_out)
+	(mips_adjust_reloc_out, mips_bfd_reloc_type_lookup): Remove support
+	for MIPS_R_SWITCH, MIPS_R_RELLO, and MIPS_R_RELHI relocations.
+	(mips_adjust_reloc_in): Likewise, adjust maximum accepted relocation
+	type number to be MIPS_R_PCREL16.
+	(mips_relocate_section): Remove support for link-time relaxation
+	of branches used by embedded-PIC.  Remove support for MIPS_R_SWITCH,
+	MIPS_R_RELLO, and MIPS_R_RELHI relocations.
+	(_bfd_ecoff_bfd_relax_section): Redefine to bfd_generic_relax_section.
+	* ecoff.c (ecoff_indirect_link_order): Remove support for link-time
+	relaxation of branches used by embedded-PIC.
+	* ecofflink.c (bfd_ecoff_debug_accumulate): Likewise.
+	* libecoff.h (struct ecoff_section_tdata): Remove embedded-PIC
+	related members, update comment.
+	* pe-mips.c: Remove disabled (commented-out and #if 0'd)
+	code related to embedded-PIC.
+	* elfxx-mips.c (_bfd_mips_elf_read_ecoff_info): Remove
+	initialization of now-removed 'adjust' member of
+	'struct ecoff_debug_info'.
+
+2004-04-23  Chris Demetriou  <cgd@broadcom.com>
+
+	* elfxx-mips.c (mips_elf_get_global_gotsym_index): Remove.
+
+2004-04-21  Philip Blundell  <pb@nexus.co.uk>
+
+	* elf32-arm.h (elf32_arm_check_relocs): Don't output REL32
+	relocs for locally defined symbols during -shared final link.
+	(elf32_arm_final_link_relocate): Likewise.
+
+2004-04-22  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf64-x86-64.c (elf64_x86_64_copy_indirect_symbol): Copy also
+	ELF_LINK_POINTER_EQUALITY_NEEDED.
+	(elf64_x86_64_check_relocs): Set ELF_LINK_POINTER_EQUALITY_NEEDED
+	if r_type is not R_X86_64_PC32.
+	(elf64_x86_64_finish_dynamic_symbol): If
+	ELF_LINK_POINTER_EQUALITY_NEEDED is not set, clear st_value of
+	SHN_UNDEF symbols.
+
+2004-04-22  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c (sh_elf_plt_sym_val): New function.
+	(elf_backend_plt_sym_val): Define.
+
+2004-04-22  Andrew Cagney  <cagney@redhat.com>
+
+	* opncls.c (bfd_alloc): Fix type of "wanted" in doco.
+
+2004-04-22  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* hpux-core.c (hpux_core_core_file_p): Add cast in call to
+	make_bfd_asection.
+	* som.c (som_set_section_contents): Constantify second argument.
+	(hppa_som_gen_reloc_type): Abort for unsupported selectors.
+	(som_object_setup): Rework to avoid warning.
+	(setup_sections, som_write_fixups, bfd_section_from_som_symbol):
+	Likewise.
+
+2004-04-22  Andrew Cagney  <cagney@redhat.com>
+
+	* cache.c (bfd_cache_close): Check for a previously closed file.
+
+2004-04-22  Jakub Jelinek  <jakub@redhat.com>
+
+	* bfd.c (bfd_get_synthetic_symtab): Define.
+	* targets.c (BFD_JUMP_TABLE_DYNAMIC): Add
+	NAME##_get_synthetic_symtab.
+	(struct bfd_target): Add _bfd_get_synthetic_symtab.
+	* libbfd-in.h (_bfd_nodynamic_get_synthetic_symtab): Define.
+	* elf-bfd.h (struct elf_backend_data): Add plt_sym_val and
+	relplt_name fields.
+	(_bfd_elf_get_synthetic_symtab): New prototype.
+	* elfcode.h (elf_get_synthetic_symtab): Define.
+	* elf.c (_bfd_elf_get_synthetic_symtab): New function.
+	* elfxx-target.h (bfd_elfNN_get_synthetic_symtab): Define.
+	(elf_backend_plt_sym_val, elf_backend_relplt_name): Define.
+	(elfNN_bed): Add elf_backend_plt_sym_val and elf_backend_relplt_name.
+	* bfd-in2.h: Rebuilt.
+	* libbfd.h: Rebuilt.
+	* elf32-i386.c (elf_i386_plt_sym_val): New function.
+	(elf_backend_plt_sym_val): Define.
+	* elf64-x86-64.c (elf64_x86_64_plt_sym_val): New function.
+	(elf_backend_plt_sym_val): Define.
+	* elf32-s390.c (elf_s390_plt_sym_val): New function.
+	(elf_backend_plt_sym_val): Define.
+	* elf64-s390.c (elf_s390_plt_sym_val): New function.
+	(elf_backend_plt_sym_val): Define.
+	* elf32-sparc (elf32_sparc_plt_sym_val): New function.
+	(elf_backend_plt_sym_val): Define.
+	* elf64-sparc.c (sparc64_elf_plt_sym_val): New function.
+	(elf_backend_plt_sym_val): Define.
+	* elf32-ppc.c (ppc_elf_plt_sym_val): New function.
+	(elf_backend_plt_sym_val): Define.
+	* aout-target.h (MY_get_synthetic_symtab): Define.
+	* aout-tic30.c (MY_get_synthetic_symtab): Define.
+	* coff-rs6000.c (rs6000coff_vec): Add
+	_bfd_nodynamic_get_synthetic_symtab.
+	(pmac_xcoff_vec): Likewise.
+	* coff64-rs6000.c (rs6000coff64_vec): Add
+	_bfd_nodynamic_get_synthetic_symtab.
+	(aix5coff64_vec): Likewise.
+	* sunos.c (MY_get_synthetic_symtab): Define.
+	* vms.c (vms_get_synthetic_symtab): Define.
+
+2004-04-22  Nick Clifton  <nickc@redhat.com>
+
+	* bfd.c (bfd_archive_filename): Return NULL on NULL input.
+
+2004-04-22  Peter Barada <peter@the-baradas.com>
+
+	* archures.c: Add bfd_mach_mcfv4e to bfd_architecture.
+	* bfd2-in.h: Regenerate.
+	* cpu-m68k.c: Add 'm68k:mcfv4e' to arch_info_struct[].
+
+2004-04-21  Chris Demetriou  <cgd@broadcom.com>
+
+	* coff-mips.c (bfd_mips_ecoff_create_embedded_relocs): Remove.
+	* elf32-mips.c (bfd_mips_elf32_create_embedded_relocs): Remove.
+	* bfd-in.h (bfd_mips_ecoff_create_embedded_relocs)
+	(bfd_mips_elf32_create_embedded_relocs): Remove prototypes
+	* bfd-in2.h: Regenerate.
+
+2004-04-21  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (is_same_value): Add final_static_link argument and
+	require relocations against a weak symbol to reference the same
+	symbol hash entry if not a final, static link.
+	(get_cached_value, add_value_map): Add final_static_link argument.
+	(remove_literals): Pass final_static_link argument as needed.
+
+2004-04-21  Andrew Cagney  <cagney@redhat.com>
+
+	* opncls.c (_bfd_new_bfd_contained_in): Copy "iovec".
+	(struct opncls, opncls_btell, opncls_bseek, opncls_bread)
+	(opncls_bwrite, opncls_bclose, opncls_bflush)
+	(opncls_bstat, opncls_iovec, bfd_openr_iovec): Implement a
+	bfd iovec that uses function callbacks.
+	(bfd_close): Use the iovec's bclose.
+	* cache.c (cache_btell, cache_bseek, cache_bread, cache_bwrite)
+	(cache_bclose, cache_bflush, cache_bstat)
+	(cache_iovec): New functions and global variable, implement a
+	cache "iovec", where applicable set bfd_error.
+	(bfd_cache_init, bfd_cache_close): Set/test the bfd's iovec.
+	* bfdio.c (struct bfd_iovec): Define.
+	(real_read): Delete function.
+	(bfd_bread, bfd_bread, bfd_bwrite, bfd_tell, bfd_flush, bfd_stat)
+	(bfd_seek, bfd_get_mtime, bfd_get_size): Use the bfd's "iovec",
+	assume that bread and bwrite set bfd_error.
+	* bfd.c (struct bfd): Add "iovec", update comments.
+	* bfd-in2.h, libbfd.h: Re-generate.
+
+2004-04-21  Andrew Cagney  <cagney@redhat.com>
+
+	* libaout.h (enum machine_type): Add M_POWERPC_NETBSD.
+
+2004-04-21  Eric Botcazou  <ebotcazou@act-europe.fr>
+
+	* elflink.c (elf_gc_mark_dynamic_ref_symbol): New function.
+	(bfd_elf_gc_sections): Fail if a shared object is being created.
+	Do not fail if dynamic sections have been created.  Instead call
+	elf_gc_mark_dynamic_ref_symbol to mark sections that contain
+	dynamically referenced symbols.  Do not mark the whole graph
+	rooted at .eh_frame, only the section proper.
+
+2004-04-20  DJ Delorie  <dj@redhat.com>
+
+	* reloc.c: Add BFD_RELOC_32_SECREL.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Likewise.
+	* coff-i386.c (howto_table) [COFF_WITH_PE]: Add R_SECREL32.
+	(coff_i386_rtype_to_howto) [COFF_WITH_PE]: Handle it.
+	(coff_i386_reloc_type_lookup) [COFF_WITH_PE]: Likewise.
+
+2004-04-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-sparc.c (elf32_sparc_relocate_section): Handle
+	relocs against hidden/protected undefweak symbols properly.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+
+2004-04-18  Mark Kettenis  <kettenis@gnu.org>
+
+	* libaout.h (enum machine_type): Add M_POWERPC_NETBSD.
+	* netbsd-core.c (netbsd_core_file_p): Set architecture for PowerPC
+	core files.
+
+2004-04-17  Brian Ford  <ford@vss.fsi.com>
+
+	* peXXigen.c (_bfd_XXi_swap_aouthdr_out): Use the first non-zero
+	filepos for the SizeOfHeaders field.
+	(_bfd_XXi_swap_scnhdr_out): Correct section flags lossage on reloc
+	overflow.
+	(_bfd_XXi_swap_sym_in): Remove redundant section flags assignment.
+
+2004-04-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* simple.c (bfd_simple_get_relocated_section_contents): Don't
+	change reloc_done.  Set and restore _cooked_size.
+	(RETURN): Delete.
+
+2004-04-15  Mark Kettenis  <kettenis@gnu.org>
+
+	* netbsd-core.c (netbsd_core_file_p): Set architecture for VAX
+	core files.
+
+2004-04-15  Nick Clifton  <nickc@redhat.com>
+
+	* bfd.c (bfd_archive_filename): Catch NULL bfd pointers.
+
+2004-04-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-sparc.c (sparc64_elf_check_relocs): Fix thinko last change.
+
+2004-04-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (_bfd_elf_merge_symbol): Treat weak as strong only
+	when it is a definition.
+
+2004-04-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-sparc.c (elf32_sparc_relocate_section): Don't abort
+	when statically linking PIC code.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+
+2004-04-11  Thiemo Seufer  <seufer@csv.ica.uni-stuttgart.de>
+
+	* config.bfd: Remove mips*-*-mach3* and mips*-dec-mach3* targets.
+	* configure.in: Remove mips-dec-bsd*, mips-dec-mach3*, mips-*-mach3*
+	targets amd aout_mips_big_vec, aout_mips_little_vec target vectors.
+	* configure: Regenerate.
+
+2004-04-08  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elflink.c: Include libiberty.h.
+	* Makefile.am (elflink.lo): Depend on libiberty.h.
+	* Makefile.in: Regenerate.
+
+2004-04-06  Daniel Jacobowitz  <drow@mvista.com>
+
+	* elfxx-mips.c (MIPS_ELF_STUB_SECTION_NAME): Always use
+	".MIPS.stubs".
+
+2004-04-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_size_dynamic_sections): Always
+	reserve the memory for dynamic linker
+
+2004-04-05  Mark Kettenis  <kettenis@gnu.org>
+
+	* netbsd-core.c (CORE_WCOOKIE_OFFSET): New define.
+	(netbsd_core_file_p): Create a .wcookie section for OpenBSD/sparc.
+
+2004-04-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-cr16c.c (elf32_cr16c_relocate_section): Use
+	RELOC_FOR_GLOBAL_SYMBOL.
+	(elf32_cr16c_add_symbol_hook): Remove const from Elf_Internal_Sym.
+
+2004-04-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-arm.h (elf32_arm_final_link_relocate): Handle
+	R_ARM_ALU* only if OLD_ARM_ABI is not defined.
+
+2004-04-01  Paul Brook  <paul@codesourcery.com>
+
+	* bfd-in.h (bfd_elf32_arm_process_before_allocation): Update.
+	* elf32-arm.h (struct elf32_elf_section_map): New.
+	(struct _arm_elf_section_data): New.
+	(elf32_arm_section_data): Define.
+	(struct elf32_arm_link_hash_table): Add byteswap_code.
+	(elf32_arm_link_hash_table_create): Initialize byteswap_code.
+	(bfd_elf32_arm_process_before_allocation): Add byteswap_code.
+	(elf32_arm_post_process_headers): Set EF_ARM_BE8.
+	(elf32_arm_output_symbol_hook, elf32_arm_new_section_hook,
+	elf32_arm_compare_mapping, elf32_arm_write_section): New functions.
+	(bfd_elf32_new_section_hook, elf_backend_write_section,
+	elf_backend_link_output_symbol_hook): Define.
+
+2004-04-01  Andy Chittenden  <achittenden@bluearc.com>
+
+	* stabs.c (struct stab_link_includes_totals): Add field 'symb'
+	that keeps the characters in a B_INCL..B_EINCL range.
+	(_bfd_link_section_stabs): When computing the sum of the
+	characters in a B_INCL..B_EINCL range also keep a copy of those
+	characters.  Use this information to distinguish between
+	include sections that have the same sum and the same length
+	but which are nevertheless unique.
+
+2004-03-31  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.h (elf32_arm_final_link_relocate): Add R_ARM_ALU*.
+	* elfarm-nabi.c (elf32_arm_howto_table): Ditto.
+
+2004-03-31  Andy Chittenden <achittenden@bluearc.com>
+
+	* stabs.c (struct stab_link_includes_totals): Rename field 'total'
+	to 'sum_chars' and add field 'num_chars'.
+	(_bfd_link_section_stabs): When computing the sum of the
+	characters in a B_INCL..B_EINCL range also keep a count of the
+	number of characters.  Use this information to help distinguish
+	between include sections when have the same sum but which
+	nevertheless are still unique.
+
+2004-03-31  Mattias Engdegård  <mattias@virtutech.se>
+
+	* stabs.c (_bfd_link_section_stabs): Do not skip N_EXCL stabs.
+
+2004-03-30  Galit Heller  <Galit.Heller@nsc.com>
+	    Tomer Levi    <Tomer.Levi@nsc.com>
+
+	* Makefile.am (ALL_MACHINES): Add cpu-cr16c.lo.
+	(ALL_MACHINES_CFILES): Add cpu-cr16c.c.
+	(BFD32_BACKENDS): Add elf32-cr16c.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-cr16c.c.
+	(cpu-cr16c.lo): New target.
+	(elf32-cr16c.lo): Likewise.
+	* Makefile.in: Regenerate.
+	* archures.c (bfd_architecture): Add bfd_{arch,mach}_cr16c.
+	(bfd_archures_list): Add bfd_cr16c_arch.
+	* config.bfd: Handle cr16c-*-elf*.
+	* configure.in: Handle bfd_elf32_cr16c_vec.
+	* configure: Regenerate.
+	* reloc.c: Add BFD_RELOC_16C_NUM08, BFD_RELOC_16C_NUM08_C,
+	BFD_RELOC_16C_NUM16, BFD_RELOC_16C_NUM16_C,
+	BFD_RELOC_16C_NUM32, BFD_RELOC_16C_NUM32_C,
+	BFD_RELOC_16C_DISP04, BFD_RELOC_16C_DISP04_C,
+	BFD_RELOC_16C_DISP08, BFD_RELOC_16C_DISP08_C,
+	BFD_RELOC_16C_DISP16, BFD_RELOC_16C_DISP16_C,
+	BFD_RELOC_16C_DISP24, BFD_RELOC_16C_DISP24_C,
+	BFD_RELOC_16C_DISP24a, BFD_RELOC_16C_DISP24a_C,
+	BFD_RELOC_16C_REG04, BFD_RELOC_16C_REG04_C,
+	BFD_RELOC_16C_REG04a, BFD_RELOC_16C_REG04a_C,
+	BFD_RELOC_16C_REG14, BFD_RELOC_16C_REG14_C,
+	BFD_RELOC_16C_REG16, BFD_RELOC_16C_REG16_C,
+	BFD_RELOC_16C_REG20, BFD_RELOC_16C_REG20_C,
+	BFD_RELOC_16C_ABS20, BFD_RELOC_16C_ABS20_C,
+	BFD_RELOC_16C_ABS24, BFD_RELOC_16C_ABS24_C,
+	BFD_RELOC_16C_IMM04, BFD_RELOC_16C_IMM04_C,
+	BFD_RELOC_16C_IMM16, BFD_RELOC_16C_IMM16_C,
+	BFD_RELOC_16C_IMM20, BFD_RELOC_16C_IMM20_C,
+	BFD_RELOC_16C_IMM24, BFD_RELOC_16C_IMM24_C,
+	BFD_RELOC_16C_IMM32, BFD_RELOC_16C_IMM32_C.
+	* targets.c (bfd_elf32_cr16c_vec): Declare.
+	(bfd_target_vector): Add bfd_elf32_cr16c_vec.
+	* cpu-cr16c.c: New file.
+	* elf32-cr16c.c: Likewise.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Likewise.
+
+2004-03-30  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf.c (map_sections_to_segments): Fix handling of .tbss.
+
+2004-03-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Remove all mention of elflink.h.
+	* Makefile.in: Regenerate.
+	* bfd-in.h (bfd_elf_discard_info): Declare.
+	(bfd_elf32_discard_info, bfd_elf64_discard_info): Delete.
+	* bfd-in2.h: Regenerate.
+	* elf-bfd.h (bfd_elf32_print_symbol, bfd_elf64_print_symbol,
+	bfd_elf32_link_record_dynamic_symbol,
+	bfd_elf64_link_record_dynamic_symbol,
+	_bfd_elf_link_record_dynamic_symbol, bfd_elf32_bfd_final_link,
+	bfd_elf64_bfd_final_link, elf_link_record_local_dynamic_symbol,
+	_bfd_elf32_link_record_local_dynamic_symbol,
+	_bfd_elf64_link_record_local_dynamic_symbol,
+	_bfd_elf32_gc_sections, _bfd_elf32_gc_common_finalize_got_offsets,
+	_bfd_elf32_gc_common_final_link, _bfd_elf64_gc_common_final_link,
+	_bfd_elf32_gc_record_vtinherit, _bfd_elf32_gc_record_vtentry,
+	_bfd_elf64_gc_sections, _bfd_elf64_gc_common_finalize_got_offsets,
+	_bfd_elf64_gc_record_vtinherit, _bfd_elf64_gc_record_vtentry,
+	_bfd_elf32_reloc_symbol_deleted_p,
+	_bfd_elf64_reloc_symbol_deleted_p): Delete.
+	(bfd_elf_link_record_dynamic_symbol,
+	bfd_elf_link_record_local_dynamic_symbol,
+	bfd_elf_final_link, bfd_elf_gc_sections,
+	bfd_elf_gc_record_vtinherit, bfd_elf_gc_record_vtentry,
+	bfd_elf_gc_common_finalize_got_offsets, bfd_elf_gc_common_final_link,
+	bfd_elf_reloc_symbol_deleted_p): Declare.
+	(WILL_CALL_FINISH_DYNAMIC_SYMBOL): Define.
+	* elf32-arm.h: Update for changed function names.  Remove local
+	WILL_CALL_FINISH_DYNAMIC_SECTION define.
+	* elf-hppa.h, elf-m10300.c, elf32-cris.c, elf32-d10v.c, elf32-dlx.c,
+	* elf32-fr30.c, elf32-frv.c, elf32-h8300.c, elf32-hppa.c, elf32-i386.c,
+	* elf32-iq2000.c, elf32-m32r.c, elf32-m68hc1x.c, elf32-m68k.c,
+	* elf32-mcore.c, elf32-openrisc.c, elf32-ppc.c, elf32-s390.c,
+	* elf32-sh.c, elf32-sparc.c, elf32-v850.c, elf32-vax.c,
+	* elf32-xstormy16.c, elf32-xtensa.c, elf64-alpha.c, elf64-hppa.c,
+	* elf64-mmix.c, elf64-ppc.c, elf64-s390.c, elf64-sh64.c, elf64-sparc.c,
+	* elf64-x86-64.c, elfxx-ia64.c, elfxx-mips.c, elfxx-target.h: Likewise.
+	* elfxx-target.h (bfd_elfNN_bfd_final_link): Define.
+	(bfd_elfNN_print_symbol): Define.
+	* elfcode.h: Don't include elflink.h.
+	(elf_bfd_discard_info, elf_reloc_symbol_deleted_p,
+	elf_link_record_dynamic_symbol, elf_bfd_final_link, elf_gc_sections,
+	elf_gc_common_finalize_got_offsets, elf_gc_common_final_link,
+	elf_gc_record_vtinherit, elf_gc_record_vtentry,
+	elf_link_record_local_dynamic_symbol): Don't define.
+	* elflink.c: Update for changed function names.  Move elflink.h
+	code here.
+	* elflink.h: Delete file.
+	* po/SRC-POTFILES.in: Regenerate.
+	* po/bfd.pot: Regenerate.
+
+2004-03-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-mmix.c (mmix_elf_relocate_section): Restore code setting
+	"name" for global syms accidentally removed in 2004-03-20 change.
+
+2004-03-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_reloc_cookie): Add r_sym_shift field.
+	* elflink.h: Replace all occurrences of sizeof (Elf_External_*)
+	where Elf_External_* is different for 64 and 32 bit, with
+	corresponding elf_size_info field.
+	(struct elf_final_link_info): Use "bfd_byte *" instead
+	of "Elf_External_Sym *" for external_syms and symbuf.
+	(elf_link_adjust_relocs): Set up r_type_mask and r_sym_shift local
+	vars and use instead of ELF_R_INFO and ELF_R_TYPE macros.
+	(struct elf_link_sort_rela): Add "sym_mask" alias for "offset".
+	(elf_link_sort_cmp1): Use sym_mask field instead of ELF_R_SYM.
+	(elf_link_sort_cmp2): Adjust.
+	(elf_link_sort_relocs): Set up r_sym_mask local var instead of
+	using ELF_R_SYM macro.  Set u.sym_mask.
+	(elf_bfd_final_link): Call _bfd_elf_stringtab_init instead of macro
+	version, elf_stringtab_init.  Ditto for bfd_section_from_elf_index
+	vs. section_from_elf_index.  Adjust Elf_External_Sym pointer
+	arithmetic.  Pass bed to elf_link_flush_output_syms.  Adjust
+	Elf_External_Dyn pointer arithmentic.  Use bed swap_dyn_in and
+	swap_syn_out functions.  Rearrange dyn swap in/out switch.
+	(elf_link_output_sym): Adjust Elf_External_Sym pointer arithmentic.
+	Pass bed to elf_link_flush_output_syms.  Use bed swap_symbol_out.
+	(elf_link_flush_output_syms): Add elf_backend_data arg.
+	(elf_link_check_versioned_symbol): Likewise.
+	(elf_link_output_extsym): Pass bed to elf_link_check_versioned_symbol.
+	Adjust Elf_External_Sym pointer arithmetic.  Use bed swap_symbol_out.
+	(elf_link_input_bfd): Use bfd_section_from_elf_index.  Set up
+	r_type_mask and r_sym_shift local vars and use instead of ELF_R_SYM,
+	ELF_R_TYPE and ELF_R_INFO macros.
+	(elf_reloc_link_order): Select ELF32_R_INFO or ELF64_R_INFO invocation
+	based on size rather than using ELF_R_INFO.
+	(elf_gc_mark): Set up r_sym_shift local var and use instead of
+	ELF_R_SYM macro.
+	(struct alloc_got_off_arg): New.
+	(elf_gc_common_finalize_got_offsets): Use elf_size_info instead of
+	ARCH_SIZE.  Pass get entry size down to elf_gc_allocate_got_offsets.
+	(elf_gc_allocate_got_offsets): Adjust.
+	(elf_reloc_symbol_deleted_p): Usee cookie.r_sym_shift instead of
+	ELF_R_SYM.  Use bfd_section_from_elf_index.
+	(elf_bfd_discard_info): Set cookie.r_sym_shift.
+	* elfcode.h (elf_stringtab_init, section_from_elf_index): Delete.
+	(elf_slurp_symbol_table): Use bfd_section_from_elf_index.
+
+2004-03-26  Stan Shebs  <shebs@apple.com>
+
+	Remove MPW support, no longer used.
+	* config.bfd (powerpc-*-mpw*): Remove configuration.
+	* mpw-config.in, mpw-make.sed: Remove files.
+	* ecoffswap.h [MPW_C]: Remove MPW-C-friendly version of code.
+
+2004-03-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (elf_backend_add_symbol_hook): Define.
+	(ppc64_elf_add_symbol_hook): New function.
+	* elf-bfd.h (struct elf_backend_data <elf_add_symbol_hook>): Remove
+	const from Elf_Internal_Sym param.
+	* elflink.c (elf_link_add_object_symbols): Adjust.
+	* elf-hppa.h (elf_hppa_add_symbol_hook): Adjust.
+	* elf32-frv.c (elf32_frv_add_symbol_hook): Adjust.
+	* elf32-i370.c (elf_backend_add_symbol_hook): Adjust.
+	* elf32-m32r.c (m32r_elf_add_symbol_hook): Adjust.
+	* elf32-m68hc1x.c (elf32_m68hc11_add_symbol_hook): Adjust.
+	* elf32-m68hc1x.h (elf32_m68hc11_add_symbol_hook): Adjust.
+	* elf32-ppc.c (ppc_elf_add_symbol_hook): Adjust.
+	* elf32-sh64.c (sh64_elf_add_symbol_hook): Adjust.
+	* elf32-v850.c (v850_elf_add_symbol_hook): Adjust.
+	* elf64-alpha.c (elf64_alpha_add_symbol_hook): Adjust.
+	* elf64-mmix.c (mmix_elf_add_symbol_hook): Adjust.
+	* elf64-sh64.c (sh64_elf64_add_symbol_hook): Adjust.
+	* elf64-sparc.c (sparc64_elf_add_symbol_hook): Adjust.
+	* elfxx-ia64.c (elfNN_ia64_add_symbol_hook): Adjust.
+	* elfxx-mips.c (_bfd_mips_elf_add_symbol_hook): Adjust.
+	* elfxx-mips.h (_bfd_mips_elf_add_symbol_hook): Adjust.
+
+2004-03-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* elfxx-target.h (bfd_elfNN_bfd_link_add_symbols): Define.
+	* elf-bfd.h (_bfd_elf_link_add_archive_symbols): Delete.
+	(_bfd_elf_sort_symbol, _bfd_elf_add_dt_needed_tag): Delete.
+	(_bfd_elf_finalize_dynstr, bfd_elf32_bfd_link_add_symbols): Delete.
+	(bfd_elf64_bfd_link_add_symbols): Delete.
+	(bfd_elf_link_add_symbols): Declare.
+	* elfcode.h (elf_bfd_link_add_symbols): Delete.
+	* elflink.c: Include safe-ctype.h.
+	(elf_add_dt_needed_tag): Rename from _bfd_elf_add_dt_needed_tag,
+	make static.
+	(elf_sort_symbol): Rename from _bfd_elf_sort_symbol, make static.
+	(elf_finalize_dynstr): Rename from _bfd_elf_finalize_dynstr, make
+	static.
+	(elf_link_add_archive_symbols): Rename from
+	_bfd_elf_link_add_archive_symbols, make static.
+	(elf_link_add_object_symbols): New function.  Corresponding
+	elflink.h function converted to use elf_size_info.
+	(bfd_elf_link_add_symbols): Likewise.
+	(bfd_elf_size_dynamic_sections): Adjust.
+	* elflink.h (elf_bfd_link_add_symbols): Delete.
+	(elf_link_add_object_symbols): Delete.
+	* elf32-gen.c (elf32_generic_link_add_symbols): Call
+	bfd_elf_link_add_symbols.
+	* elf64-gen.c (elf64_generic_link_add_symbols): Likewise.
+
+2004-03-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.h (elf_link_add_object_symbols): Add DT_NEEDED for as-needed
+	and chained shared libs only if dynsym.  Clear dynsym on forced-local.
+
+	* elf-bfd.h (_bfd_elf_add_dynamic_entry): Declare.
+	(bfd_elf32_add_dynamic_entry, bfd_elf64_add_dynamic_entry): Delete.
+	(_bfd_elf_add_dt_needed_tag): Declare.
+	(_bfd_elf_sort_symbol): Declare.
+	(_bfd_elf_finalize_dynstr): Declare.
+	(RELOC_FOR_GLOBAL_SYM): Formatting.
+	* elfcode.h (elf_add_dynamic_entry): Delete.
+	* elflink.c (_bfd_elf_add_dynamic_entry): New function.  Corresponding
+	elflink.h function converted to use elf_size_info.
+	(_bfd_elf_add_dt_needed_tag): Likewise.
+	(_bfd_elf_sort_symbol): Likewise.
+	(_bfd_elf_finalize_dynstr): Likewise.
+	(compute_bucket_count): Likewise.
+	(bfd_elf_size_dynamic_sections): Likewise.  Check result of
+	_bfd_elf_strtab_add before calling _bfd_elf_strtab_addref.
+	(elf_adjust_dynstr_offsets, elf_collect_hash_codes): Moved from..
+	* elflink.h: ..here.
+	(sort_symbol, add_dt_needed_tag): Delete.
+	(elf_add_dynamic_entry, elf_finalize_dynstr): Delete.
+	(compute_bucket_count, NAME(bfd_elf,size_dynamic_sections)): Delete.
+	Update all users.
+	* elf32-arm.h (add_dynamic_entry): Update.  Remove casts.
+	* elf32-cris.c (add_dynamic_entry): Likewise.
+	* elf32-hppa.c (add_dynamic_entry): Likewise.
+	* elf32-i370.c (add_dynamic_entry): Likewise.
+	* elf32-i386.c (add_dynamic_entry): Likewise.
+	* elf32-m32r.c (add_dynamic_entry): Likewise.
+	* elf32-m68k.c (add_dynamic_entry): Likewise.
+	* elf32-ppc.c (add_dynamic_entry): Likewise.
+	* elf32-s390.c (add_dynamic_entry): Likewise.
+	* elf32-sh.c (add_dynamic_entry): Likewise.
+	* elf32-sparc.c (add_dynamic_entry): Likewise.
+	* elf32-vax.c (add_dynamic_entry): Likewise.
+	* elf32-xtensa.c (add_dynamic_entry): Likewise.
+	* elf64-alpha.c (add_dynamic_entry): Likewise.
+	* elf64-hppa.c (add_dynamic_entry): Likewise.
+	* elf64-ppc.c (add_dynamic_entry): Likewise.
+	* elf64-s390.c (add_dynamic_entry): Likewise.
+	* elf64-sparc.c (add_dynamic_entry): Likewise.
+	* elf64-x86-64.c (add_dynamic_entry): Likewise.
+	* elfxx-ia64.c (add_dynamic_entry): Likewise.
+	* elfxx-mips.c (MIPS_ELF_ADD_DYNAMIC_ENTRY): Likewise.
+	* elf-m10300.c (_bfd_mn10300_elf_size_dynamic_sections): Likewise.
+	* elf32-frv.c (elf32_frv_size_dynamic_sections): Likewise.
+	* elf64-sh64.c (sh64_elf64_size_dynamic_sections): Likewise.
+
+2004-03-23  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.h (arm_print_private_bfd_data): Add EABI v3.
+
+2004-03-22  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_xtensa_check_relocs): Remove code to read
+	literal tables and check for relocs outside of literal pools.
+	(elf_xtensa_make_sym_local): Don't clear ELF_LINK_NON_GOT_REF flag.
+	(elf_xtensa_fix_refcounts): Don't check ELF_LINK_NON_GOT_REF or
+	set DF_TEXTREL.
+	(elf_xtensa_size_dynamic_sections): Don't add DT_TEXTREL entry.
+	(elf_xtensa_relocate_section): Read literal tables and check for
+	dynamic relocations in read-only sections and not in literal pools.
+
+2004-03-23  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 51.
+	* linker.c (bfd_wrapped_link_hash_lookup): Handle info->wrap_char.
+
+2004-03-22  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (cris_elf_relocate_section) <case R_CRIS_16_GOTPLT,
+	R_CRIS_16_GOTPLT>: Also error if there's no PLT for a symbol
+	not defined by the executable, or defined in a DSO.
+	<eliding run-time relocation of .got>: Initialize GOT entry for a
+	function symbol or ELF_LINK_HASH_NEEDS_PLT statically in an
+	executable.
+	(cris_elf_gc_sweep_hook): Improve fallthrough marking.
+	(elf_cris_try_fold_plt_to_got): Improve head comment.  Do not fold
+	a PLT reloc to GOT for an executable.
+	(elf_cris_adjust_dynamic_symbol): Only fold a .got.plt entry with
+	.got for a DSO and explain why.
+	(elf_cris_discard_excess_program_dynamics): Also lose GOT-relocs
+	and unreferenced symbols for which a PLT is defined.  Adjust
+	dynamic-symbol pruning correspondingly, to make sure we don't lose
+	a dynamic symbol also defined by a DSO.
+
+2004-03-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (RELOC_FOR_GLOBAL_SYMBOL): Add input_bfd, input_section
+	and rel args.  Group input and output args.  Wrap to 80 columns.
+	* elf-m10200.c, elf-m10300.c, elf32-arm.h, elf32-avr.c,
+	elf32-cris.c, elf32-d10v.c, elf32-fr30.c, elf32-h8300.c,
+	elf32-hppa.c, elf32-i386.c, elf32-i860.c, elf32-ip2k.c,
+	elf32-iq2000.c, elf32-m68hc1x.c, elf32-m68k.c, elf32-mcore.c,
+	elf32-msp430.c, elf32-openrisc.c, elf32-ppc.c, elf32-s390.c,
+	elf32-sparc.c, elf32-v850.c, elf32-vax.c, elf32-xstormy16.c,
+	elf32-xtensa.c, elf64-alpha.c, elf64-mmix.c, elf64-ppc.c,
+	elf64-s390.c, elf64-sparc.c, elf64-x86-64.c, elfxx-ia64.c: Update
+	RELOC_FOR_GLOBAL_SYMBOL invocation.
+
+2004-03-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (RELOC_FOR_GLOBAL_SYMBOL): Report error if
+	unresolved symbols in objects aren't allowed.
+
+	* elf-hppa.h (elf_hppa_relocate_section): Properly handle
+	unresolved symbols.
+	(elf_hppa_remark_useless_dynamic_symbols): Likewise.
+	(elf_hppa_unmark_useless_dynamic_symbols):
+	* elf32-frv.c (elf32_frv_relocate_section): Likewise.
+	* elf32-hppa.c (elf32_hppa_size_stubs): Likewise.
+	(elf32_hppa_relocate_section): Likewise.
+	* elf32-i370.c (i370_elf_relocate_section): Likewise.
+	* elf32-m32r.c (m32r_elf_relocate_section): Likewise.
+	* elf32-sh.c (sh_elf_relocate_section): Likewise.
+	* elf64-sh64.c (sh_elf64_relocate_section): Likewise.
+	* elfxx-mips.c (mips_elf_calculate_relocation): Likewise.
+
+	* elf-m10200.c (mn10200_elf_relocate_section): Use
+	RELOC_FOR_GLOBAL_SYMBOL.
+	* elf32-avr.c (elf32_avr_relocate_section): Likewise.
+	* elf32-d10v.c (elf32_d10v_relocate_section): Likewise.
+	* elf32-fr30.c (fr30_elf_relocate_section): Likewise.
+	* elf32-h8300.c (elf32_h8_relocate_section): Likewise.
+	* elf32-i860.c (elf32_i860_relocate_section): Likewise.
+	* elf32-m68hc1x.c (m68hc11_get_relocation_value): Likewise.
+	* elf32-mcore.c (mcore_elf_relocate_section): Likewise.
+	* elf32-msp430.c (elf32_msp430_relocate_section): Likewise.
+	* elf32-openrisc.c (openrisc_elf_relocate_section): Likewise.
+	* elf32-v850.c (v850_elf_relocate_section): Likewise.
+	* elf32-xstormy16.c (xstormy16_elf_relocate_section): Likewise.
+	* elf64-mmix.c (mmix_elf_relocate_section): Likewise.
+
+2004-03-19  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* elf32-hppa.c (elf32_hppa_check_relocs): Handle R_PARISC_PCREL32.
+	(final_link_relocate): Likewise.
+	* elf-hppa.h (elf_hppa_reloc_final_type): Handle selectors for
+	R_PARISC_PCREL32 and R_PARISC_PCREL64 relocations.
+
+2004-03-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* aclocal.m4: Regenerate.
+	* config.in: Regenerate.
+	* po/bfd.pot: Regenerate.
+
+2004-03-19  Alan Modra  <amodra@bigpond.net.au>
+	    H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (_bfd_elf_merge_symbol): Revert last change.  Move
+	type and size change code to where it was previously.  Remove
+	dt_needed param.  Treat old weak syms as strong if new sym is
+	from a shared lib, even when old sym is from another shared
+	lib.  Remove unnecessary tests of oldweak and newweak.  Correct
+	comments.
+	(_bfd_elf_add_default_symbol): Remove dt_needed param.  Update
+	_bfd_elf_merge_symbol calls.
+	* elflink.h (elf_link_add_object_symbols): Update calls.  Remove
+	dt_needed local var.  Update comments.
+	* elf-bfd.h (_bfd_elf_merge_symbol): Update prototype.
+	(_bfd_elf_add_default_symbol): Likewise.
+
+	* elflink.c (_bfd_elf_merge_symbol): Reinstate code to handle
+	strong syms in one shared object overriding weak syms in another.
+
+2004-03-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_obj_tdata): Delete dt_soname field.  Add
+	dyn_lib_class field.  Rearrange for better packing.
+	(elf_dt_soname): Delete.
+	(elf_dyn_lib_class): Define.
+	* elf.c (bfd_elf_set_dt_needed_name): Update comment.
+	(bfd_elf_set_dt_needed_soname): Delete.
+	(bfd_elf_set_dyn_lib_class): New function.
+	* elflink.h (add_dt_needed_tag): New function.  Split out from..
+	(elf_link_add_object_symbols): ..here.  Rename "name" to "soname".
+	Use elf_dyn_lib_class to set dt_needed and add_needed.  Move fallback
+	initialization of soname.
+	(elf_link_check_versioned_symbol): Test elf_dyn_lib_class instead of
+	elf_dt_soname.
+	* bfd-in.h (enum dynamic_lib_link_class): New.
+	(bfd_elf_set_dt_needed_soname): Delete.
+	(bfd_elf_set_dyn_lib_class): Declare.
+	* bfd-in2.h: Regenerate.
+
+	* elflink.c (_bfd_elf_merge_symbol): Rewrite weak symbol handling.
+	(_bfd_elf_add_default_symbol): Remove indirect BFD_ASSERTs.
+	* elflink.h (elf_link_add_object_symbols): Don't clear dt_needed in
+	symbol loop.  Instead use add_needed to flag tag as written.
+
+2004-03-17  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Correct
+	logic for null_input_bfd detection.
+
+2004-03-17  Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* config.bfd: Switch sh-*-rtems* to ELF.  Add sh-*-rtemscoff*.
+
+2004-03-16  Mark Kettenis  <kettenis@gnu.org>
+
+	* netbsd-core.c (netbsd_core_file_p) [CORE_FPU_OFFSET]: Remove
+	code.
+
+2004-03-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_link_read_relocs_from_section): Don't use
+	NUM_SHDR_ENTRIES in end of reloc calc.  Move NULL shdr check..
+	(_bfd_elf_link_read_relocs): ..to here.
+	* elf32-ppc.c (ppc_elf_relax_section): Formatting.
+
+2004-03-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* configure.in (HOST_64BIT_TYPE, HOST_U_64BIT_TYPE): Don't override
+	values selected in configure.host.  Require both to be defined
+	before setting BFD_HOST_64_BIT_DEFINED.  Protect assignment to
+	corresponding BFD_HOST vars with quotes.
+	<${host64}-${target64}-${want64} in *true*>: Don't exempt gcc;
+	Always require BFD_HOST_64_BIT_DEFINED.
+	<file_ptr type>: Find off_t size before emitting message.  Combine
+	off_t and ftello64 conditional.
+	* configure: Regenerate.
+
+2004-03-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-m32r.c (m32r_elf_create_dynamic_sections): Fix pointer
+	aliasing warning.  Remove trailing whitespace throughout file.
+
+2004-03-15  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* elf-hppa.h (elf_hppa_relocate_section): Pass input_bfd instead of
+	input_section in calls to get_dyn_name.
+	* elf64-hppa.c (get_dyn_name): Change type of first argument to "bfd *".	Use section id of first section in input BFD to build dynamic name for
+	local symbols.
+	(elf64_hppa_check_relocs): Pass abfd in call to get_dyn_name.
+
+2004-03-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd-in.h (bfd_int64_t, bfd_uint64_t): New types.
+	(BFD_HOST_64_BIT, BFD_HOST_U_64_BIT): Don't define here.
+	(bfd_getb64, bfd_getl64, bfd_get_bits): Return bfd_uint64_t.
+	(bfd_getb_signed_64, bfd_getl_signed_64): Return bfd_int64_t.
+	(bfd_putb64, bfd_putl64, bfd_put_bits): Accept bfd_uint64_t.
+	* configure.in (HOST_U_64BIT_TYPE): Set when sizeof long is 8.
+	(BFD_HOST_64_BIT_DEFINED, BFD_HOST_64_BIT, BFD_HOST_U_64_BIT): Set
+	when using long.
+	* libbfd.c (EIGHT_GAZILLION, COERCE64): Use bfd_int64_t.
+	(bfd_getb64): Return bfd_uint64_t.  Enable when BFD_HOST_64_BIT.
+	(bfd_getl64, bfd_getb_signed_64, bfd_getl_signed_64): Likewise.
+	(bfd_putb64): Accept bfd_uint64_t.  Enable when BFD_HOST_64_BIT.
+	(bfd_putl64, bfd_put_bits, bfd_get_bits): Likewise.
+	* dwarf2.c (struct attribute): Use bfd_int64_t and bfd_uint64_t.
+	(read_8_bytes, read_indirect_string, read_address): Likewise.
+	(read_abbrevs, parse_comp_unit): Likewise.
+	* targets.c (struct bfd_target): Likewise.
+	* aix386-core.c (NO_GET64, NO_PUT64, NO_GETS64): Define and use.
+	* hppabsd-core.c: Likewise.  Formatting.
+	* hpux-core.c: Likewise.
+	* irix-core.c: Likewise.
+	* netbsd-core.c: Likewise.
+	* osf-core.c: Likewise.
+	* ptrace-core.c: Likewise.
+	* sco5-core.c: Likewise.
+	* trad-core.c: Likewise.
+	* configure: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2004-03-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd-in.h (bfd_getb64, bfd_getl64): Replace bfd_byte* with void*.
+	(bfd_getb32, bfd_getl32, bfd_getb16, bfd_getl16): Likewise.
+	(bfd_getb_signed_64, bfd_getl_signed_64): Likewise.
+	(bfd_getb_signed_32, bfd_getl_signed_32): Likewise.
+	(bfd_getb_signed_16, bfd_getl_signed_16): Likewise.
+	(bfd_putb64, bfd_putl64, bfd_putb32, bfd_putl32): Likewise.
+	(bfd_putb16, bfd_putl16, bfd_get_bits, bfd_put_bits): Likewise.
+	* libbfd.c: Likewise in function definitions.
+	(bfd_put_8): Mask with 0xff rather than casting to char.
+	(bfd_putb16, bfd_putl16, bfd_putb32, bfd_putl32): Likewise.
+	(bfd_putb64, bfd_putl64, bfd_put_bits): Likewise.
+	(H_PUT_64, H_PUT_32, H_PUT_16, H_PUT_8): Remove casts, simplify.
+	(H_PUT_S64, H_PUT_S32, H_PUT_S16, H_PUT_S8): Likewise.
+	(H_GET_64, H_GET_32, H_GET_16, H_GET_8): Likewise.
+	(H_GET_S64, H_GET_S32, H_GET_S16, H_GET_S8): Likewise.
+	* libaout.h (H_PUT_64 H_PUT_32, H_PUT_16): Remove casts, simplify.
+	(H_PUT_S64, H_PUT_S32, H_PUT_S16): Likewise.
+	(H_GET_64, H_GET_32, H_GET_16): Likewise.
+	(H_GET_S64, H_GET_S32, H_GET_S16): Likewise.
+	* archive.c (do_slurp_coff_armap): Update swap prototype.
+	* coff-tic54x.c (tic54x_getl32): Replace bfd_byte* with void*.
+	(tic54x_getl_signed_32): Likewise.
+	(tic54x_putl32): Likewise.  Mask with 0xff rather than casting to char.
+	* mach-o.c (bfd_mach_o_read_header): Update get32 prototype.
+	* pdp11.c (bfd_getp32): Make static, replace bfd_byte* with void*.
+	(bfd_getp_signed_32, bfd_putp32): Likewise.
+	* targets.c (struct bfd_target): Use void* in place of bfd_byte* for
+	bfd_getx64, bfd_getx_signed_64, bfd_putx64, bfd_getx32,
+	bfd_getx_signed_32, bfd_putx32, bfd_getx16, bfd_getx_signed_16,
+	bfd_putx16, bfd_h_getx64, bfd_h_getx_signed_64, bfd_h_putx64,
+	bfd_h_getx32, bfd_h_getx_signed_32, bfd_h_putx32, bfd_h_getx16,
+	bfd_h_getx_signed_16, bfd_h_putx16.
+	* aix386-core.c (NO_GET, NO_GETS, NO_PUT): Update prototypes.
+	* hppabsd-core.c: Similarly.  Rename NO_SIGNED_GET to NO_GETS.
+	* hpux-core.c: Likewise.
+	* irix-core.c: Likewise.
+	* netbsd-core.c: Likewise.
+	* osf-core.c: Likewise.
+	* ptrace-core.c: Likewise.
+	* sco5-core.c: Likewise.
+	* trad-core.c: Likewise.
+	* bfd-in2.h: Regenerate.
+
+2004-03-15  Matt Thomas  <matt@3am-software.com>
+
+	* config.bfd: Add x86-64 vector to NetBSD/i386 if 64bit BFD is
+	selected.
+
+2004-03-13  Mark Kettenis  <kettenis@gnu.org>
+
+	* config.bfd: Add x86_64-*-openbsd*.
+	* configure.in (x86_64-*-openbsd*): Set COREFILE to
+	netbsd-core.lo.
+	* configure: Regenerate.
+
+2004-03-12  Nick Clifton  <nickc@redhat.com>
+	    Dave Murphy  <wintermute2k4@ntlworld.com>
+
+	* elf32-arm.h (elf32_arm_merge_private_bfd_data): Skip most checks
+	if the input bfd does not contain any code.
+
+2004-03-09  Steve Ellcey  <sje@cup.hp.com>
+
+	* elfxx-ia64.c (plt_full_entry): Change ld8 to ld8.acq.
+
+2004-03-05  Fred Fish  <fnf@redhat.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_finish_dynamic_symbol): Just force
+	mips16 symbols to be even rather than testing first for even/odd.
+	(_bfd_mips_elf_link_output_symbol_hook): Ditto.
+
+2004-03-05  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf.c (map_sections_to_segments): Ignore .tbss sections for
+	layout purposes.
+
+2004-03-03  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elflink.c (bfd_elf_record_link_assignment): Mark undefweak and
+	undefined symbols as hash_new.
+
+2003-03-03  Andrew Stubbs  <andrew.stubbs@superh.com>
+
+	* archures.c: Add bfd_mach_sh4_nommu_nofpu.
+	* cpu-sh.c: Ditto.
+	* elf32-sh.c: Ditto.
+	* bfd-in2.h: Regenerate.
+
+2004-03-02  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-frv.c (struct frv_pic_relocs_info): Added fixups and
+	dynrelocs.
+	(_frv_count_got_plt_entries): Initialize them.
+	(frv_pic_relocs_info_find): Add insert argument.  Adjust all
+	callers.
+	(frv_pic_relocs_info_for_global): Likewise.
+	(frv_pic_relocs_info_for_local): Likewise.
+	(frv_pic_merge_early_relocs_info): New.
+	(_frv_resolve_final_relocs_info): Use it in case one entry maps to
+	another.
+	(_frv_add_dyn_reloc): Add entry argument.  Adjust all callers.
+	Check that we don't exceed the allocated count for entry.
+	(_frv_add_rofixup): Likewise.
+	(_frv_emit_got_relocs_plt_entries): Adjust for coding standards.
+	(elf32_frv_finish_dynamic_sections): Improve error message in case
+	we emit too few rofixup entries.
+
+2004-03-01  Richard Sandiford  <rsandifo@redhat.com>
+
+	* archures.c (bfd_mach_fr450): New.
+	* bfd-in2.h: Regenerate.
+	* cpu-frv.c (arch_info_450): New bfd_arch_info_type.
+	(arch_info_500): Link to it.
+	* elf32-frv.c (elf32_frv_machine, frv_elf_merge_private_bfd_data)
+	(frv_elf_print_private_bfd_data): Handle fr405 and fr450 header flags.
+	(frv_elf_arch_extension_p): New function.
+	(frv_elf_merge_private_bfd_data): Use it.
+
+2004-02-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (_bfd_elf_link_add_archive_symbols): New prototype.
+
+	* elflink.h (is_global_data_symbol_definition): Moved to
+	elflink.c.
+	(elf_link_is_defined_archive_symbol): Likewise.
+	(elf_link_add_archive_symbols): Likewise. Renamed to
+	_bfd_elf_link_add_archive_symbols.
+
+	* elflink.c (elf_link_is_defined_archive_symbol): Get the size
+	of ELF symbol table entry from backend.
+	(_bfd_elf_link_add_archive_symbols): Call bfd_link_add_symbols
+	instead of elf_link_add_object_symbols.
+
+2004-02-27  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf-bfd.h (struct elf_backend_data): Added
+	elf_backend_can_make_relative_eh_frame,
+	elf_backend_can_make_lsda_relative_eh_frame and
+	elf_backend_encode_eh_address.
+	(_bfd_elf_encode_eh_address): Declare.
+	(_bfd_elf_can_make_relative): Declare.
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Use new
+	hooks to decide whether to attempt to make_relative and
+	make_lsda_relative.
+	(_bfd_elf_write_section_eh_frame_hdr): Call encode_eh_address.
+	(_bfd_elf_can_make_relative): New.
+	(_bfd_elf_encode_eh_address): New.
+	* elf32-frv.c (frv_elf_use_relative_eh_frame): New.
+	(frv_elf_encode_eh_address): New.
+	(elf_backend_can_make_relative_eh_frame): Define.
+	(elf_backend_can_make_lsda_relative_eh_frame): Define.
+	(elf_backend_encode_eh_address): Define.
+	* elfxx-target.h
+	(elf_backend_can_make_relative_eh_frame): Define.
+	(elf_backend_can_make_lsda_relative_eh_frame): Define.
+	(elf_backend_encode_eh_address): Define.
+	(elfNN_bed): Add them.
+
+2004-02-27  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-frv.c (elf32_frv_howto_table) <R_FRV_LABEL16>: Set
+	complain_on_overflow to signed.
+
+2004-02-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.h (sort_symbol): New.
+	(elf_link_add_object_symbols): Use a sorted symbol array for
+	weakdef.
+
+2004-02-27  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-s390.c (allocate_dynrelocs): Use SYMBOL_REFERENCES_LOCAL
+	for pc relative relocs.
+	(elf_s390_relocate_section): Likewise.
+	* elf64-s390.c (allocate_dynrelocs): Use SYMBOL_REFERENCES_LOCAL
+	for pc relative relocs.
+	(elf_s390_relocate_section): Likewise.
+
+2004-02-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_check_relocs): Fix call to
+	count_dyn_reloc.
+
+2004-02-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_dyn_reloc_entry): Add the reltext.
+	field to track if a relocation is against readonly section.
+	(count_dyn_reloc): Take a new argument for rent->reltext.
+	(elfNN_ia64_check_relocs): Adjust call to count_dyn_reloc.
+	(get_reloc_section): Don't set ia64_info->reltext here.
+	(allocate_dynrel_entries): Set ia64_info->reltext here.
+
+2004-02-24  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-frv.c (FRV_SYM_LOCAL): Weak undefined doesn't imply local.
+	(_frv_emit_got_relocs_plt_entries): Decay relocation to protected
+	function's descriptor to symbol+offset, and map local undefweak
+	symbol to NULL function descriptor.
+	(elf32_frv_relocate_section): Likewise.
+
+2004-02-23  Mark Kettenis  <kettenis@gnu.org>
+
+	* libaout.h (enum machine_type): Add M_SPARC64_NETBSD and
+	M_X86_64_NETBSD.
+	* netbsd-core.c (M_SPARC64_OPENBSD): Define.
+	(netbsd_core_file_p): Set architecture from machine ID for
+	selected machines.
+
+2004-02-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* elflink.h (size_dynamic_sections): If not adding DT_FLAGS and
+	DF_BIND_NOW is set in info->flags, create DT_BIND_NOW dynamic entry.
+
+2004-02-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (_bfd_elf_merge_symbol): Properly handle undefined
+	symbols with non-default visibility.
+
+2004-02-21  Danny Smith  <daanysmith@users.sourceforge.net>
+
+	* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Clear
+	IMAGE_SCN_MEM_WRITE on known sections only.
+
+2004-02-20  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-ppc.c (allocate_dynrelocs): Create dynsym for undef weak
+	symbols used in PIE relocs.
+
+2004-02-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf32-sparc.c (elf32_sparc_finish_dynamic_sections): Clear
+	.plt sh_entsize.
+
+2004-02-18  Daniel Jacobowitz  <drow@mvista.com>
+
+	* configure.in: Update version to 2.15.90.
+	* configure: Regenerate.
+
+2004-02-17  Daniel Jacobowitz  <drow@mvista.com>
+	    Richard Sandiford  <rsandifo@redhat.com>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): Use
+	_bfd_elf_symbol_refs_local_p to decide whether to decay
+	a GOT_PAGE/GOT_OFST pair to GOT_DISP/addend.
+	(_bfd_mips_elf_check_relocs): Add a global GOT entry for GOT_PAGE
+	relocs if the symbol wasn't defined by a regular object file.
+	Don't check the symbol's dynindx.
+
+2004-02-16  Andrew Cagney  <cagney@redhat.com>
+
+	* bfd-in.h (file_ptr, ufile_ptr): Configure type using
+	@bfd_file_ptr@.
+	* bfd-in2.h: Re-generate.
+
+2004-02-14  Andrew Cagney  <cagney@redhat.com>
+
+	* configure.host (HDEFINES): When hppa*-*-hpux*, define
+	_LARGEFILE64_SOURCE.
+
+2004-02-13  Andrew Cagney  <cagney@redhat.com>
+
+	* elf.c	(vma_page_aligned_bias): New function.
+	(assign_file_positions_except_relocs)
+	(assign_file_positions_for_segments): Replace broken modulo
+	arithmetic with call to vma_page_aligned_bias.
+
+2004-02-11  Andrew Cagney  <cagney@redhat.com>
+
+	* bfd-in.h: Update copyright.
+	(bfd_tell): Change return type to file_ptr.
+	* bfd-in2.h: Re-generate.
+	* cache.c: Update copyright.
+	(bfd_cache_lookup_worker): Use real_fseek, do not cast offset
+	parameter.
+	(close_one): Use real_ftell.
+	* bfdio.c: Update copyright.
+	(real_ftell, real_fseek): New functions.
+	(bfd_tell): Use real_fseek and real_ftell, change return type to
+	file_ptr.
+	(bfd_seek): Use real_ftell and real_fseek, change type of
+	file_position to a file_ptr.
+	* libbfd-in.h: Update copyright.
+	(real_ftell, real_fseek): Declare.
+	* libbfd.h: Re-generate.
+
+	* configure.in (AC_CHECK_FUNCS): Check for ftello, ftello64,
+	fseeko and fseeko64.  Determine bfd_file_ptr.
+	* configure: Re-generate.
+	* config.in: Re-generate.
+
+2004-02-09  Anil Paranjpe  <anilp1@KPITCummins.com>
+
+	* coff-h8300.c: Added comments about relaxation for ldc.w and stc.w.
+	* elf32-h8300.c: Likewise.
+
+2004-02-09  Christian Vogel <vogelchr@vogel.cx>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_calc_got_offsets_for_symbol): Catch
+	GOT entries with no associated GOT subsection.
+
+2004-02-09  Richard Sandiford  <rsandifo@redhat.com>
+
+	* bfd-elf.h (elf_backend_name_local_section_symbols): New hook.
+	* elf.c (swap_out_syms): Use it to decide whether local section
+	symbols should be named.
+	* elfxx-target.h (elf_backend_name_local_section_symbols): New macro.
+	* elfxx-mips.h (_bfd_mips_elf_name_local_section_symbols): Declare.
+	(elf_backend_name_local_section_symbols): Define.
+	* elfxx-mips.c (_bfd_mips_elf_name_local_section_symbols): New.
+
+2004-01-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relax_brl): New function.
+	(elfNN_ia64_relax_section): Optimize brl to br during the relax
+	finalize pass.
+
+2004-01-30  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-frv.c (elf32_frv_always_size_sections): Initialize pointer
+	to bfd_link_hash_entry passed by reference to
+	_bfd_generic_link_add_one_symbol.
+
+2004-01-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Disallow imm
+	relocations against dynamic symbols.
+
+2004-01-23  Daniel Jacobowitz  <drow@mvista.com>
+
+	* elf32-arm.h (elf32_arm_check_relocs): Revert part of 2004-01-13
+	change.
+
+2004-01-21  Tom Rix  <tcrix@worldnet.att.net>
+
+	* reloc.c: New 5 bit reloc, BFD_RELOC_M68HC12_5B, for m68hc12 movb/movw.
+	* bfd-in2.h, libbfd.h: Rebuilt.
+
+2004-01-20  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Don't remove
+	IMAGE_SCN_MEM_WRITE flag from .text section if WP_TEXT
+	flag has been cleared.
+
+2004-01-19  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* coff-h8300.c: Add and adjust comments about relaxation.
+	* elf32-h8300.c: Likewise.
+
+2004-01-16  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* coff-h8300.c: Fix comment typos.
+	* elf32-h8300.c: Likewise.
+
+2004-01-16  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* coff-h8300.c: Add comments about relaxation.
+	* elf32-h8300.c: Likewise.
+
+2004-01-14  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+	* acinclude.m4: Quote names of macros to be defined by AC_DEFUN
+	throughout.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+
+2004-01-13  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* elf64-mips.c (mips_elf64_slurp_one_reloc_table): Call
+	mips_elf64_rtype_to_howto instead of using howto_table.
+
+2004-01-13  Daniel Jacobowitz  <drow@mvista.com>
+
+	* elf32-arm.h (elf32_arm_final_link_relocate): Check that we created
+	the .plt section.
+	(elf32_arm_check_relocs): Don't increment the PLT refcount for
+	relocs which would not use the PLT.
+
+2004-01-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_check_relocs): Ignore !SEC_ALLOC relocs.
+	(ppc64_elf_gc_sweep_hook): Likewise.
+	(ppc64_elf_size_dynamic_sections): Test for .plt directly.
+
+2004-01-12  Anil Paranjpe  <anilp1@KPITCummins.com>
+
+	Adds linker relaxation support for bit manipulation insns like
+	band, bclr, biand, bild, bior, bist, bixor, bld, bnot, bor, bset,
+	bst, btst, bxor.
+	* elf32-h8300.c: Opcode for bit manipulation insn is checked in
+	elf32_h8_relax_section function while relxation for aa:16 and aa:32.
+	* coff-h8300.c: Opcode for bit manipulation insn is checked in
+	h8300_reloc16_extra_cases function while relxation for aa:16 and aa:32.
+
+2004-01-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* dwarf2.c: Convert to C90, remove unneeded casts and prototypes.
+
+2004-01-11  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* elf32-h8300.c: Fix formatting.
+
+2004-01-11  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* elf32-cris.c (cris_elf_gc_sweep_hook): Return early if no
+	dynamic object is present.  Declare r_symndx and h in an inner
+	scope.
+	* elf32-vax.c (elf_vax_gc_sweep_hook): Likewise.
+
+2004-01-09  Daniel Jacobowitz  <drow@mvista.com>
+
+	* elf32-arm.h (struct elf32_arm_relocs_copied): Remove pc_count.
+	(elf32_arm_copy_indirect_symbol): Don't copy pc_count.
+	(elf32_arm_final_link_relocate): Handle PLT32 and PC24 relocs
+	identically.  Do not emit PC24 relocations for shared libraries.
+	(elf32_arm_gc_sweep_hook): Handle PLT32 and PC24 relocs
+	identically.  Don't adjust pc_count.
+	(elf32_arm_check_relocs): Handle PLT32 and PC24 relocs identically.
+	Set ELF_LINK_HASH_NEEDS_PLT for both.  Don't adjust pc_count; don't
+	adjust count for branch relocations.
+	(allocate_dynrelocs): Correct typo in call to
+	WILL_CALL_FINISH_DYNAMIC_SYMBOL.  Never allocate space for
+	PC24 or PLT32 relocs when linking.
+
+2004-01-09  Dmitry Semyonov  <Dmitry.Semyonov@oktet.ru>
+
+	* coff-arm.c (aoutarm_std_reloc_howto): [ARM_WINCE] Synchronize ARM_26D
+	relocation howto with ARM_26 one for consistency.
+	(coff_arm_relocate_section): Set partial_inplace for ARM_26 relocations
+	that will be converted to ARM_26D ones, since we always want 'done'
+	relocations to be reflected in section's data.
+	(coff_arm_relocate_section): [ARM_WINCE] Quick fix for BL instruction
+	offset.
+	(_bfd_final_link_relocate): Do not modify "inplace" data, if not
+	requested.
+
+2004-01-08  Dmitry Semyonov  <Dmitry.Semyonov@oktet.ru>
+
+	* coff-arm.c (coff_arm_relocate_section): Do not alter relocs that
+	are not partial_inplace during a relocatable link.
+
+2004-01-08  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* elf32-m68k.c (elf_m68k_gc_sweep_hook): Return early
+	if no dynamic object is present.  Declare r_symndx and h in an
+	inner scope.
+
+2004-01-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Don't install
+	trampoline if it is known out of range.
+
+2004-01-06  Alexandre Oliva  <aoliva@redhat.com>
+
+	2003-12-17  Alexandre Oliva  <aoliva@redhat.com>
+	* elf32-frv.c (_frv_osec_readonly_p): New.
+	(_frv_emit_got_relocs_plt_entries): Don't emit rofixup for
+	undefweak symbol.
+	(_frv_count_got_plt_entries): Adjust expected count accordingly.
+	(elf32_frv_relocate_section): Likewise.  Error out if attempting
+	to emit rofixups or dynamic relocs in read-only segments.  Use
+	_bfd_elf_section_offset to adjust r_offsets in rofixups and
+	dynamic relocations.
+	2003-12-12  Alexandre Oliva  <aoliva@redhat.com>
+	* elf32-frv.c (elf32_frv_relocate_section): Compute dynamic
+	relocations or fixups involving merged sections correctly.  Avoid
+	crash when undefined symbol is referenced by R_FRV_32 or
+	R_FRV_FUNCDESC_VALUE.
+	2003-12-02  Alexandre Oliva  <aoliva@redhat.com>
+	* elf32-frv.c (elf32_frv_relocate_section): Add output_offset of
+	input section holding local symbol to addend of R_FRV_32 or
+	R_FRV_FUNCDESC_VALUE dynamic relocation.
+	2003-11-27  Alexandre Oliva  <aoliva@redhat.com>
+	* elf32-frv.c (elf32_frv_modify_segment_map): Add link info arg.
+	(elf32_frv_always_size_sections): Don't store pointer to
+	__stacksize symbol in sec_info.
+	(elf32_frv_modify_segment_map): Look it up here.
+	2003-11-26  Alexandre Oliva  <aoliva@redhat.com>
+	* elf32-frv.c (_frv_emit_got_relocs_plt_entries): Emit the address
+	of the lazy PLT entry, not only its offset, as the low word of a
+	function descriptor.
+	2003-11-10  Alexandre Oliva  <aoliva@redhat.com>
+	* elf32-frv.c (elf32_frv_always_size_sections): Define __stacksize
+	if a hash table entry already exists but is not a definition.
+	2003-11-05  Alexandre Oliva  <aoliva@redhat.com>
+	* elf32-frv.c (frv_elf_link_hash_table_create): Use bfd_zalloc.
+	(_frv_add_rofixup): Don't inline.
+	(_frv_emit_got_relocs_plt_entries): Use NULL as funcdesc address
+	for undefweak symbols.
+	(elf32_frv_relocate_section): Avoid crash while computing
+	relocation when linking with shared library.  Only emit rofixups
+	and dynamic relocations for alloc&load sections.  Mark binaries
+	with inter-segment relocations for relocation as a unit.
+	(_frv_create_got_section): Rename .rofixup.got to .rofixup.
+	(DEFAULT_STACK_SIZE): New.
+	(_frv_count_got_plt_entries): Fix thinko in deciding whether to
+	emit rofixups or dynamic relocs when linking dynamic non-PIE
+	executables.
+	(elf32_frv_size_dynamic_sections): Generate rofixup on PIEs and
+	shared libs too.  Reserve the last entry for the GOT pointer.
+	(elf32_frv_finish_dynamic_sections): Emit it.
+	(elf32_frv_always_size_sections): New.
+	(elf32_frv_modify_segment_map): New.
+	(elf32_frv_check_relocs): Reserve relocs32 space only in ALLOC
+	sections.
+	(frv_elf_merge_private_bfd_data): Clear PIC bit if FDPIC is set.
+	(frv_elf_print_private_bfd_data): Handle FDPIC and LIBPIC.
+	(elf_backend_always_size_sections): New.
+	(elf_backend_modify_segment_map): New.
+	2003-10-31  Alexandre Oliva  <aoliva@redhat.com>
+	* config.bfd: Added frv-*-*linux*.
+	* elf32-frv.c (_frv_emit_got_relocs_plt_entries): Use idx 0 for
+	ABS section, instead of crashing.
+	(elf32_frv_relocate_section): Don't crash before warning about
+	different segments in non-PIC relocation.
+	2003-10-17  Alexandre Oliva  <aoliva@redhat.com>
+	* elf32-frv.c (elf32_frv_relocate_section): Don't warn on LABEL24
+	relocs to undefweak symbols.
+	(elf32_frv_relocate_section): Ditto for undefined symbols.
+	2003-10-06  Alexandre Oliva  <aoliva@redhat.com>
+	* elf32-frv.c (elf32_frv_create_dynamic_sections): Make sure
+	gotfixup section was created.
+	2003-09-30  Alexandre Oliva  <aoliva@redhat.com>
+	* elf32-frv.c (elf32_frv_howto_table): Change GOT12,
+	FUNCDESC_GOT12, GOTOFF12 and FUNCDESC_GOTOFF12 to
+	complain_overflow_signed.
+	* elf32-frv.c (_frv_add_rofixup): Do not error out if contents
+	have not been allocated.
+	(_frv_emit_got_relocs_plt_entries): Return non-void.  Assert
+	privfd only if dynamic sections were created.
+	(elf32_frv_relocate_section): Compute gprel_segment, and use it
+	for GPREL relocs.  When linking relocatable FDPIC executables,
+	emit warnings for relocations that would be illegal on PIE or
+	shared libraries.  Emit rofixup for R_FRV_32 only if input object
+	is not FDPIC.
+	(_frv_create_got_section): Define _gp symbol in the rofixup
+	section.
+	(elf32_frv_finish_dynamic_sections): If rofixups needed but
+	dynamic sections missing, error out requesting -melf32frvfd.
+	2003-09-19  Alexandre Oliva  <aoliva@redhat.com>
+	* elf32-frv.c (_frv_emit_got_relocs_plt_entries): Rearrange
+	computation of addends from section and global or local symbol
+	value.  Change return type to bfd_boolean, and return a failure if
+	a dynamic FUNCDESC or FUNCDESC_VALUE relocation that requires a
+	nonzero addend is required.
+	(elf32_frv_relocate_section): Likewise.  Print error for
+	unsupported nonzero addends.
+	2003-09-18  Alexandre Oliva  <aoliva@redhat.com>
+	* elf32-frv.c (FRV_SYM_LOCAL): In the absence of dynamic sections,
+	force everything local.
+	(_frv_emit_got_relocs_plt_entries): Cope with NULL sec.
+	* elf32-frv.c (struct frv_elf_link_hash_table): Added sgotfixup.
+	(frv_gotfixup_section): New.
+	(FRV_SYM_LOCAL): Accept undefweak and local common symbols.
+	(struct frv_pic_relocs_info): Split relocs into relocs32, relocsfd
+	and relocsfdv.
+	(_frv_add_rofixup): New.
+	(_frv_emit_got_relocs_plt_entries): Generate fixups for non-PIE
+	fdpic executables.  Use FRV_SYM_LOCAL more widely to simplify and
+	improve some ugly conditions.
+	(elf32_frv_relocate_section): Likewise.  Reject inter-segment
+	relocations in fdpic.
+	(_frv_create_got_section): Create .rofixup.got section.
+	(struct _frv_dynamic_got_info): Added fixups.
+	(_frv_count_got_plt_entries): Account in-GOT relocations into
+	relocs32, relocsfd and relocsfdv.  Account them into relocs or
+	fixups, as appropriate.
+	(elf32_frv_size_dynamic_sections): Size rofixup section.  Simplify
+	sizing of gotrel.
+	(elf32_frv_finish_dynamic_sections): Verify that the right number
+	of relocations and fixups was generated.
+	(elf32_frv_check_relocs): Compute relocs32, relocsfd and
+	relocsfdv.
+	* elf32-frv.c (FRV_SYM_LOCAL): New macro, used instead of
+	SYMBOL_CALLS_LOCAL and SYMBOL_REFERENCES_LOCAL.
+	(FRV_FUNCDESC_LOCAL): New macro, used to decide whether a function
+	descriptor of a (formerly-)global symbol is local.
+	(struct frv_pic_relocs_info): Adjust comments.
+	(_frv_emit_got_relocs_plt_entries): Adjust.
+	(elf32_frv_relocate_section): Likewise.
+	(_frv_count_got_plt_entries): Likewise.
+	* elf32-frv.c (_frv_emit_got_relocs_plt_entries): Don't add global
+	symbol's value to addend in the common preamble.  Decay dynamic
+	symbols to section+offset if they bind or call locally, for GOT
+	and FUNCDESC_VALUE, respectively.
+	(elf32_frv_relocate_section): Likewise.
+	(elf32_frv_check_relocs): Don't register as dynamic symbols of
+	internal or hidden visibility.
+	2003-09-17  Alexandre Oliva  <aoliva@redhat.com>
+	* elf32-frv.c (_frv_emit_got_relocs_plt_entries): Get addend as
+	argument, so as to not call _bfd_elf_rel_local_sym to compute it.
+	(elf32_frv_relocate_section): Pass relocation addend in.  Use
+	original relocation addend to look up the got relocs/plt entries
+	table.  Do not call _bfd_elf_rel_local_sym.  Don't error out when
+	processing relocations that reference .scommon symbols.
+	2003-09-15  Alexandre Oliva  <aoliva@redhat.com>
+	Introduce support for dynamic linking.
+	* elf32-frv.c (R_FRV_FUNCDESC_VALUE): Mark it as 64 bits.
+	(elf32_frv_rel_32_howto, elf32_frv_rel_funcdesc_howto,
+	elf32_frv_rel_funcdesc_value_howto): New REL descriptors.
+	(frv_reloc_type_lookup): Return REL howtos for executables and
+	dynamic libraries.
+	(frv_info_to_howto_rel): New.
+	(struct frv_elf_link_hash_table): New.
+	(frv_hash_table, frv_got_section, frv_gotrel_section,
+	frv_plt_section, frv_pltrel_section, frv_relocs_info,
+	frv_got_initial_offset, frv_plt_initial_offset): New macros.
+	(frv_elf_link_hash_table_create): New.
+	(struct frv_pic_relocs_info): New.
+	(frv_pic_relocs_info_hash, frv_pic_relocs_info_eq): New.
+	(frv_pic_relocs_info_find): New.
+	(frv_pic_relocs_info_for_global, frv_pic_relocs_info_for_local):
+	New.
+	(FRV_LZPLT_BLOCK_SIZE, FRV_LZPLT_RESOLVE_LOC): New.
+	(_frv_add_dyn_reloc, _frv_osec_to_segment): New.
+	(_frv_emit_got_relocs_plt_entries): New.
+	(elf32_frv_relocate_section): Add support for dynamic linking.
+	Handle new relocations.
+	(_frv_create_got_section): New.
+	(elf32_frv_create_dynamic_sections): New.
+	(ELF_DYNAMIC_INTERPRETER): New.
+	(struct _frv_dynamic_got_info): New.
+	(_frv_count_got_plt_entries): New.
+	(struct _frv_dynamic_got_plt_info): New.
+	(_frv_compute_got_alloc_data): New.
+	(_frv_get_got_entry, _frv_get_fd_entry): New.
+	(_frv_assign_got_entries, _frv_assign_plt_entries): New.
+	(_frv_resolve_final_relocs_info): New.
+	(elf32_frv_size_dynamic_sections): New.
+	(elf32_frv_finish_dynamic_sections): New.
+	(elf32_frv_adjust_dynamic_symbol): New.
+	(elf32_frv_finish_dynamic_symbol): New.
+	(elf32_frv_check_relocs): Handle new relocs.  Explain how the
+	whole thing works.
+	(elf_info_to_howto_rel): Define.
+	(bfd_elf32_bfd_link_hash_table_create): Define.
+	(elf_backend_create_dynamic_sections): Define.
+	(elf_backend_adjust_dynamic_symbol): Define.
+	(elf_backend_size_dynamic_sections): Define.
+	(elf_backend_finish_dynamic_symbol): Define.
+	(elf_backend_finish_dynamic_sections): Define.
+	(elf_backend_want_got_sym): Define.
+	(elf_backend_got_header_size): Define.
+	(elf_backend_want_got_plt): Define.
+	(elf_backend_plt_readonly): Define.
+	(elf_backend_want_plt_sym): Define.
+	(elf_backend_plt_header_size): Define.
+	(elf_backend_may_use_rel_p): Define.
+	(elf_backend_may_use_rela_p): Define.
+	(elf_backend_default_use_rela_p): Define.
+	2003-08-08  Alexandre Oliva  <aoliva@redhat.com>
+	* elf32-frv.c (R_FRV_FUNCDESC_VALUE, R_FRV_FUNCDESC_GOTOFF12,
+	R_FRV_FUNCDESC_GOTOFFHI, R_FRV_FUNCDESC_GOTOFFLO, R_FRV_GOTOFF12,
+	R_FRV_GOTOFFHI, R_FRV_GOTOFFLO): New.
+	(frv_reloc_map): Map the corresponding BFD relocs to them.
+	(frv_reloc_type_lookup): ... and back to BFD relocs.
+	* reloc.c: New relocs.
+	* bfd-in2.h, libbfd.h: Rebuilt.
+	2003-08-04  Alexandre Oliva  <aoliva@redhat.com>
+	* elf32-frv.c (R_FRV_GOT12, R_FRV_GOTHI, R_FRV_GOTLO,
+	R_FRV_FUNCDESC, R_FRV_FUNCDESC_GOT12, R_FRV_FUNCDESC_GOTHI,
+	R_FRV_FUNCDESC_GOTLO): New.
+	(frv_reloc_map): Map the corresponding BFD relocs to them.
+	(frv_reloc_type_lookup): ... and back to BFD relocs.
+	* reloc.c: New relocs.
+	* bfd-in2.h, libbfd.h: Rebuilt.
+
+2004-01-05  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+	* elf32-mips.c (ELF_MAXPAGESIZE): Redefine for traditional
+	targets to support pages of up to 64kB.
+	(elf32_bed): Redefine to get a separate backend data structure for
+	traditional targets.
+	* elf64-mips.c (ELF_MAXPAGESIZE): Redefine for traditional
+	targets to support pages of up to 64kB.
+	(elf64_bed): Redefine to get a separate backend data structure for
+	traditional targets.
+	* elfn32-mips.c (ELF_MAXPAGESIZE): Redefine for traditional
+	targets to support pages of up to 64kB.
+	(elf32_bed): Redefine to get a separate backend data structure for
+	traditional targets.
+
+2004-01-04  Mark Kettenis  <kettenis@gnu.org>
+
+	* elf32-sparc.c (elf32_sparc_grok_psinfo): New function.
+
+2004-01-02  Mark Kettenis  <kettenis@gnu.org>
+
+	* elf32-i386.c (elf_i386_grok_prstatus): Add support for FreeBSD.
+	(elf_i386_grok_psinfo): Likewise.
+
+2004-01-02  Bernardo Innocenti  <bernie@develer.com>
+
+	* config.bfd: Add m68k-uClinux target.
+
+2004-01-01  Grant Edwards <grante@visi.com>
+
+	* elflink.h (elf_gc_sections): Warn when gc-sections option is ignored.
+	* elf32-h8300.c (elf32_h8_gc_mark_hook): New function.
+	(elf32_h8_gc_sweep_hook): New function.
+	(elf_backend_gc_mark_hook): Define.
+	(elf_backend_gc_sweep_hook): Define.
+	(elf_backend_can_gc_sections): Define.
+
+For older changes see ChangeLog-0203
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-2005 sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-2005
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-2005	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-2005	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,5269 @@
+2005-12-31  Valeriy E. Ushakov  <uwe@NetBSD.org>
+	    Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c (sh_elf_relocate_section): Don't reset relocation
+	for R_SH_REL32 in shared objects if the symbol is locally called.
+
+2005-12-31  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_relocate_section): Adjust relocs against
+	opd section sym when opd has been edited.  Use correct addend
+	when determining branch 'y' bit and branch overflow.  Adjust and
+	save opd relocs for ld -r too.
+
+2005-12-30  Eric Christopher  <echristo@apple.com>
+
+	* elfxx-mips.c (mips_elf_record_global_got_symbol): Add assert
+	to verify we have a got.
+	(_bfd_mips_elf_check_relocs): Add R_MIPS_TLS_GOTTPREL to relocs
+	needing a GOT.
+
+2005-12-30  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* configure.host (hppa*64*-*-hpux*): Set host64 to true.
+
+2005-12-29  Nick Clifton  <nickc@redhat.com>
+
+	* hash.c (bfd_hash_set_default_size): Add more entries to the
+	hash_size_primes table.
+
+	* stabs.c (_bfd_link_section_stabs): Use bfd_hash_table_init
+	rather than bfd_hash_table_init_n(...,251) so that the size of the
+	hash table can be controlled by the user.
+
+2005-12-27  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* elf32-hppa.c (elf32_hppa_size_dynamic_sections): Use info->executable
+	instead of !info->shared.
+
+2005-12-27  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
+
+	* vaxlinux.h: New file. (TRAD_CORE_EXTRA_SIZE_ALLOWED): Define.
+	(HOST_MACHINE_ARCH): Define. This allows cross-building vax-linux
+	hosted binutils.
+
+2005-12-27  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf32-mt.c (mt_elf_merge_private_bfd_data): Do not allow mixing
+	object files from different mt variants.
+
+2005-12-27  Leif Ekblad  <leif@rdos.net>
+
+	* config.bfd: Add support for RDOS targets.
+
+2005-12-27  Marty Leisner  <leisner@rochester.rr.com>
+
+	* dwarf2.c (lookup_symbol_in_function_table): Check for a function
+	name before passing it to strcmp.
+
+2005-12-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (elf_find_function): Don't ignore section syms.
+	Simplify filename logic.
+
+2005-12-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (add_stub_sym): Pass info rather than htab.
+	Use different names for pic vs non-pic, '.' instead of '_'.
+	(allocate_dynrelocs): Adjust add_stub_sym call.
+
+2005-12-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (bfd_section_from_shdr): Treat invalid reloc sections as
+	normal sections rather than returning false.
+
+2005-12-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* coff-h8300.c (h8300_reloc16_extra_cases): Use input section
+	"output_offset" instead of link order "offset".
+	* coff-h8500.c (extra_case): Likewise.
+	* coff-w65.c (w65_reloc16_extra_cases): Likewise.
+	* coff-z80.c (extra_case): Likewise.
+	* coff-z8k.c (extra_case): Likewise.
+	* linker.c (default_indirect_link_order): Likewise, "size" too.
+	* ecoff.c (ecoff_indirect_link_order): Likewise.
+
+2005-12-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2005-12-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* aix5ppc-core.c: Remove duplicate prototypes.
+	(xcoff64_core_file_matches_executable_p): Provide implementation
+	for !AIX_5_CORE.
+	* corefile.c (generic_core_file_matches_executable_p): Correct
+	syntax error in prototype.
+	* libbfd-in.h (generic_core_file_matches_executable_p): Delete.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2005-12-23  Michael Weiser  <michael@weiser.dinsnail.net>
+
+	PR 1150
+	* elf-bfd.h (struct elf_backend_data): New field
+	'elf_backend_ignore_undef_symbol'.
+	* elfxx-target.h (elf_backend_ignore_undef_symbol): Define to NULL
+	if not already defined.
+	(elfNN_bed): Initialise the elf_backend_ignore_undef_symbol field.
+	* elfxx-mips.c (_bfd_mips_elf_ignore_undef_symbol): New function.
+	* elfxx-mips.h (elf_backend_ignore_undef_symbol): Define and
+	prototype.
+	* elflink.c (elf_link_output_extsym): Check
+	elf_backend_ignore_undef_symbol before reporting an undefined
+	symbol in a shared library.
+
+2005-12-23  Joel Brobecker  <brobecker@adacore.com>
+
+	* corefile.c (generic_core_file_matches_executable_p): New function.
+	* libbfd-in.h (generic_core_file_matches_executable_p): Add
+	declaration.
+	* libbfd.h: Regenerate.
+	* hpux-core.c: ANSIfy function declarations and prototypes.
+	(thread_section_p): Manually expand bfd_section_name macro
+	to make it clear that parameter ABFD is not used.
+	(hpux_core_core_file_matches_executable_p): Delete, replaced
+	by macro pointing to generic_core_file_matches_executable_p.
+
+	* aix386-core.c: Replace core_file_matches_executable_p null
+	implementation by generic_core_file_matches_executable_p by
+	using a macro.
+	* aix5ppc-core.c: Likewise.
+	* cisco-core.c: Likewise.
+	* hppabsd-core.c: Likewise.
+	* irix-core.c: Likewise.
+	* lynx-core.c: Likewise.
+	* mach-o.c: Likewise.
+	* netbsd-core.c: Likewise.
+	* osf-core.c: Likewise.
+	* ptrace-core.c: Likewise.
+	* sco5-core.c: Likewise.
+	* trad-core.c: Likewise.
+
+2005-12-19  David Heine  <dlheine@tensilica.com>
+
+	* elf32-xtensa.c (action_list_count, xlate_map_entry, xlate_map,
+	xlate_offset_with_removed_text, build_xlate_map, free_xlate_map): New.
+	(check_section_ebb_pcrels_fit): Build new xlate_map, use it and free it
+	when finished.
+
+2005-12-16  Nathan Sidwell  <nathan@codesourcery.com>
+
+	Second part of ms1 to mt renaming.
+	* archures.c (bfd_arch_mt): Renamed.
+	(bfd_mt_arch): Renamed.
+	(bfd_archures_list): Adjusted.
+	* bfd-in2.h: Rebuilt.
+	* config.bfd (mt): Remove special case targ_archs.
+	(mt-*-elf): Rename bfd_elf32_mt_vec.
+	* configure: Rebuilt.
+	* configure.in (bfd_elf32_mt_vec): Renamed.
+	(selarchs) Remove mt special case.
+	* cpu-mt.c (arch_info_struct): Adjust.
+	(bfd_mt_arch): Renamed, adjust.
+	* elf32-mt.c (mt_reloc_type_lookup, mt_info_to_howto_rela,
+	mt_elf_relocate_hi16, mt_final_link_relocate, mt_relocate_section,
+	mt_elf_howto_table): Renamed, adjusted.
+	(mt_elf_gc_mark_hook, mt_elf_gc_sweep_hook, mt_elf_check_relocs,
+	elf32_mt_machine, mt_elf_object_p, mt_elf_set_private_flags,
+	mt_elf_copy_private_bfd_data, mt_elf_merge_private_bfd_data,
+	mt_elf_print_private_bfd_data): Renamed, adjusted.
+	(TARGET_BIG_SYM, TARGET_BIG_NAME, ELF_ARCH, ELF_MACHINE_CODE,
+	ELF_MAXPAGESIZE, elf_info_to_howto, elf_backend_relocate_section,
+	bfd_elf32_bfd_reloc_type_lookup, elf_backend_gc_mark_hook,
+	elf_backend_gc_sweep_hook, elf_backend_check_relocs,
+	eld_backend_object_p, bfd_elf32_bfd_set_private_flags,
+	bfd_elf32_bfd_copy_private_bfd_data,
+	bfd_elf32_bfd_merge_private_bfd_data,
+	bfd_elf32_bfd_print_private_bfd_data): Adjusted.
+	* libbfd.h: Regenerated.
+	* reloc.c (BFD_RELOC_MT_PC16, BFD_RELOC_MT_HI16,
+	BFD_RELOC_MT_LO16, BFD_RELOC_MT_GNU_VTINHERIT,
+	BFD_RELOC_MT_GNU_VTENTRY, BFD_RELOC_MT_PCINSN8): Renamed.
+	* targets.c (bfd_elf32_mt_vec): Renamed.
+	(_bfd_target_vector): Adjusted.
+
+2005-12-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/2008
+	* elf.c (_bfd_elf_setup_sections): Return FALSE if
+	elf_linked_to_section will be set to NULL.
+
+	* format.c (bfd_check_format_matches): Don't check the default
+	target twice.
+
+2005-12-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_relocate_section): Force tail calls in
+	shared libs to resolve locally.
+
+2005-12-12  Paul Brook  <paul@codesourcery.com>
+
+	* bfd-in2.h: Regenerate.
+	* elf32-arm.c (elf32_arm_reloc_map): Add BFD_RELOC_ARM_PCREL_CALL and
+	BFD_RELOC_ARM_PCREL_JUMP.
+	(check_use_blx): New function.
+	(bfd_elf32_arm_process_before_allocation): Don't allocate glue if
+	using BLX.
+	(elf32_arm_final_link_relocate): Perform bl<->blx conversion for
+	R_ARM_CALL and R_ARM_THM.
+	(elf32_arm_get_eabi_attr_int): New function.
+	(elf32_arm_size_dynamic_sections): Call check_use_blx.
+	* libbfd.h: Regenerate.
+	* reloc.c: Add BFD_RELOC_ARM_PCREL_CALL and BFD_RELOC_ARM_PCREL_JUMP.
+
+2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* Makefile.am (ALL_MACHINES, ALL_MACHINES_CFILES,
+	BFD32_BACKENDS, BFD32_BACKENDS_CFILES): Replace ms1 with mt.
+	(cpu_mt.lo, elf32-mt.lo): Update target and dependency names.
+	* Makefile.in: Rebuilt.
+	* config.bfd: Replace ms1 arch with mt.
+	* configure.in: Replace ms1 files with mt files.
+	* configure: Rebuilt.
+	* elf32-mt.c: Renamed from elf32-ms1.c.  Update include files.
+	* cpu-mt.c: Renamed from cpu-ms1.c.
+
+2005-12-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_size_stubs): Don't consider non-ppc64 input.
+
+2005-12-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_gc_mark_dynamic_ref_symbol):  Use !info-executable
+	to test for linking shared libs, not info->shared.
+
+2005-12-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (struct ppc_elf_link_hash_table): Add emit_stub_syms.
+	(ppc_elf_select_plt_layout): Add emit_stub_syms param, save to htab.
+	(add_stub_sym): New function.
+	(allocate_dynrelocs): Call add_stub_sym.
+	(ppc_elf_size_dynamic_sections): Emit __glink and __glink_PLTresolve
+	when emit_stub_syms.
+	* elf32-ppc.h (ppc_elf_select_plt_layout): Update prototype.
+
+2005-12-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* reloc.c (enum complain_overflow): Correct comments.
+	(bfd_check_overflow): Combine complain_overflow_bitfield and
+	complain_overflow_signed code.
+	(_bfd_relocate_contents): Likewise.
+	(bfd_howto_32): Use complain_overflow_dont.
+	* elf32-d10v.c (elf_d10v_howto_table): Revert 2002-06-17 change.
+	* bfd-in2.h: Regenerate.
+
+2005-12-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (assign_section_numbers): Remove extra code in the last
+	change.
+
+2005-12-07  H.J. Lu  <hongjiu.lu@intel.com>
+	    Andreas Schwab  <schwab@suse.de>
+
+	PR binutils/1991
+	* elf.c (assign_section_numbers): Always use the output section
+	when setting up sh_link for SHF_LINK_ORDER.
+
+2005-12-07  Thiemo Seufer  <ths@networkno.de>
+	    H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/1932
+	* bfd-in.h (bfd_elf_record_link_assignment): Add output_bfd
+	and hidden arguments.
+
+	* bfd.c (bfd_hide_symbol): Removed.
+
+	* bfd-in2.h: Regenerated.
+
+	* elflink.c (bfd_elf_record_link_assignment): Handle hidden
+	symbols which were provided by a linker script.
+
+2005-12-06  Paul Gilliam  <pgilliam@us.ibm.com>
+
+	* cpu-powerpc.c (bfd_powerpc_archs): Add ppc 750.
+
+2005-11-18  Mark Kettenis  <kettenis@gnu.org>
+
+	* elf64-hppa.c (elf64_hppa_section_from_phdr): Create .kernel
+	pseudo-section.  Make sure .reg section comes after the proc
+	section it's generated from.
+
+2005-12-01  Kazuhiro Inaoka <inaoka.kazuhiro@renesas.com>
+
+	* elf32-m32r.c (m32r_elf_sweep_hook): Fix an illegal duplicate check.
+	(m32r_elf_relocate_section): Fix R_M32R_10_PCREL_RELA linkage bug.
+	(m32r_elf_gc_sweep_hook): Likewise.
+	(m32r_elf_check_relocs): Likewise.
+
+2005-11-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (_bfd_generic_match_sections_by_type): Don't define.
+	* libbfd-in.h (_bfd_generic_match_sections_by_type): Delete.
+	* libbfd.c (_bfd_generic_match_sections_by_type): Delete.
+	* targets.c (bfd_match_sections_by_type): Don't define.
+	(BFD_JUMP_TABLE_LINK): Remove _bfd_generic_match_sections_by_type.
+	* coff-rs6000.c (rs6000coff_vec, pmac_xcoff_vec): Likewise.
+	* coff64-rs6000.c (rs6000coff64_vec, aix5coff64_vec): Likewise.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2005-11-23  Daniel Jacobowitz  <dan@codesourcery.com>
+	    Thiemo Seufer <ths@networkno.de>
+
+	* elf32-mips.c (elf_mips_howto_table_rel): Use rightshift 2 for
+	R_MIPS_PC16.
+	(mips_reloc_map): Map BFD_RELOC_16_PCREL_S2 to R_MIPS_PC16.
+	(bfd_elf32_bfd_reloc_type_lookup): Don't handle
+	BFD_RELOC_16_PCREL_S2.
+	* elf64-mips.c (mips_elf64_howto_table_rel): Use rightshift 2 for
+	R_MIPS_PC16.
+	(mips_elf64_howto_table_rela): Likewise.
+	(mips_reloc_map): Map BFD_RELOC_16_PCREL_S2 to R_MIPS_PC16.
+	(bfd_elf64_bfd_reloc_type_lookup): Don't handle
+	BFD_RELOC_16_PCREL_S2.
+	* elfn32-mips.c (elf_mips_howto_table_rel): Use rightshift 2 for
+	R_MIPS_PC16.
+	(elf_mips_howto_table_rela): Likewise.
+	(mips_reloc_map): Map BFD_RELOC_16_PCREL_S2 to R_MIPS_PC16.
+	(bfd_elf32_bfd_reloc_type_lookup): Don't handle
+	BFD_RELOC_16_PCREL_S2.
+	* elfxx-mips.c: Formatting fixes.
+	(mips_elf_calculate_relocation): Handle R_MIPS_GNU_REL16_S2
+	and R_MIPS_PC16 identically.
+
+2005-11-23  Frederic Riss  <frederic.riss@st.com>
+
+	* elfcode.h (elf_object_p): Delay the setting of start_address
+	until we're sure the backend matches the binary.
+
+2005-11-20  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* som.c (som_decode_symclass): Decode BSF_WEAK symbols in the same
+	manner as bfd_decode_symclass.
+
+2005-11-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_check_relocs): Don't set has_14bit_branch
+	on branches to same section.
+
+2005-11-17  Randolph Chung  <tausq@debian.org>
+
+	* elf64-hppa.c (elf64_hppa_object_p): Recognize corefiles under
+	hppa64-hp-hpux11.11.
+	(elf64_hppa_section_from_phdr): New function.
+	(elf_backend_section_from_phdr): Define.
+
+2005-11-11  Nick Clifton  <nickc@redhat.com>
+
+	PR 1150
+	* elfxx-mips.c (mips_elf_calculate_relocation): Ignore an
+	undefined symbol if it is optional.
+	(_bfd_mips_elf_merge_symbol_attribute): Make sure that the
+	optional flag is merged as well as the visibility.
+	* elfxx-mips.h (_bfd_mips_elf_merge_symbol_attribute): Prototype.
+	(elf_backend_merge_symbol_attribute): Define.
+
+2005-11-08  Nathan Sidwell  <nathan@codesourcery.com>
+
+	Add ms2 support
+	* archures.c (bfd_mach_ms2): Define.
+	* cpu-ms1.c (arch_info_struct): Add ms2 stanza.
+	* elf32-ms1.c (elf32_ms1_machine): Add ms2 case.
+	(ms1_elf_merge_private_bfd_data): Remove unused variables.  Add
+	correct merging logic, with workaround.
+	(ms1_elf_print_private_bfd_data): Add ms2 case.
+	* reloc.c (BFD_RELOC_MS1_PCINSN8): Add ms2 specific reloc.
+	* libbfd.h: Regenerated.
+	* bfd-in2.h: Regenerated.
+
+2005-11-07  Steve Ellcey  <sje@cup.hp.com>
+
+	* warning.m4 (AM_BINUTILS_WARNINGS): Default to empty string
+	if compiler is not GCC.
+	* configure: Regenerate
+
+2005-11-07  Steve Ellcey  <sje@cup.hp.com>
+
+	* configure: Regenerate after modifying bfd/warning.m4.
+
+2005-11-07  Steve Ellcey  <sje@cup.hp.com>
+
+	* configure.host (ia64-*-hpux*): Set _LARGEFILE64_SOURCE.
+
+2005-11-03  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* configure.in: Check for fopen64.
+	* libbfd-in.h (real_fopen): New prototype.
+	* configure, config.in, libbfd.h: Regenerated.
+	* bfdio.c (real_fopen): New function.
+	* opncls.c (bfd_fopen, bfd_fill_in_gnu_debuglink_section): Use it.
+	* cache.c (bfd_open_file): Likewise.
+
+2005-11-03  Thiemo Seufer  <ths@networkno.de>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): Handle only
+	forced local symbols here.
+	(mips_elf_create_dynamic_relocation): Likewise.
+	(_bfd_mips_elf_finish_dynamic_symbol): Fix typo in comment.
+
+2005-11-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (elf_fake_sections): When calculating tbss size, just use
+	the last link_order.
+	(assign_file_positions_for_segments): Likewise.
+	* elflink.c (bfd_elf_final_link): Likewise.
+	(elf_reloc_link_order): Correct comment.
+
+2005-11-02  Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/1775
+	* elf32-m68k.c (elf_m68k_finish_dynamic_symbol): Add required
+	parentheses.
+
+2005-10-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerated.
+
+	* dep-in.sed: Replace " ./" with " ".
+
+2005-10-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* hpux-core.c: Include <machine/reg.h> only if HPUX_CORE is
+	define.
+	* osf-core.c: Include <sys/core.h> only if OSF_CORE is defined.
+	* sco5-core.c: Include <sys/paccess.h> and <sys/region.h> only
+	if SCO5_CORE is defined.
+
+2005-10-29  Mark Kettenis  <kettenis@gnu.org>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2005-10-28  Joel Brobecker  <brobecker@adacore.com>
+
+	From Eric Botcazou  <botcazou@adacore.com>
+	* coffcode.h (coff_compute_section_file_positions): Fix small
+	error in preprocessor directives.
+
+2005-10-28  Joel Brobecker  <brobecker@adacore.com>
+
+	Mostly from Eric Botcazou <botcazou@adacore.com>
+	* rs6000-core.c: ANSIfy all function definitions.
+	Add missing function prototypes.
+	(ptr_to_uint): New type.
+	(rs6000coff_core_p): Use it as intermediate step in casts.
+	(rs6000coff_core_file_matches_executable_p): Likewise.
+	* xcoff-target.h (rs6000coff_core_p): Fix prototype.
+	(rs6000coff_core_file_matches_executable_p): Likewise.
+
+2005-10-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/1472
+	* aoutx.h (NAME (aout, machine_type)): Handle
+	bfd_mach_sparc_v8plus, bfd_mach_sparc_v8plusa,
+	bfd_mach_sparc_v8plusb, bfd_mach_sparc_v9, bfd_mach_sparc_v9a
+	and bfd_mach_sparc_v9b.
+
+2005-10-28  Hans-Peter Nilsson  <hp@axis.com>
+
+	PR ld/1567
+	* elf32-cris.c (cris_elf_howto_table) <R_CRIS_32>: Set
+	complain_on_overflow field to complain_overflow_dont.
+
+2005-10-27  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 973
+	* cache.c (enum cache_flag): New.
+	(close_one): Save file mtime.
+	(bfd_cache_lookup): Add flag arg, adjust all users.
+	(bfd_cache_lookup_worker): Likewise.
+	(cache_btell): Use CACHE_NO_OPEN and return abfd->where if file
+	not open.
+	(cache_bflush): Similarly, and return success of file not open.
+	(cache_bseek): Use CACHE_NO_SEEK if SEEK_SET or SEEK_END.
+	(cache_bstat): Use CACHE_NO_SEEK_ERROR.
+
+	* bfdwin.c (bfd_get_file_window): Seek into file in place of
+	using bfd_cache_lookup.
+
+	* cache.c (BFD_CACHE_MAX_OPEN): Make private to this file.
+	(bfd_last_cache, bfd_cache_lookup, bfd_cache_lookup_worker): Likewise.
+	* libbfd-in.h (bfd_cache_lookup_worker, bfd_last_cache): Delete.
+	* libbfd.h: Regenerate.
+
+	* hppabsd-core.c (hppabsd_core_core_file_p): Use bfd_stat, not fstat.
+	* sco5-core.c (sco5_core_file_p): Likewise.
+	* trad-core.c (trad_unix_core_file_p): Likewise.
+
+	* cache.c: Reorganize file to avoid forward reference.
+
+2005-10-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* cache.c (bfd_cache_lookup_worker): Don't abort on failing to
+	reopen file.
+	(cache_btell, cache_bseek, cache_bflush, cache_bstat): Return -1 on
+	bfd_cache_lookup failure.
+	(cache_bread, cache_bwrite): Return 0 on the same.
+	* bfdwin.c (bfd_get_file_window): Likewise.
+	* hppabsd-core.c (hppabsd_core_core_file_p): Likewise.
+	* sco5-core.c (sco5_core_file_p): Likewise.
+	* trad-core.c (trad_unix_core_file_p): Likewise.
+
+2005-10-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* cache.c (bfd_cache_lookup_worker): Use bfd_error_handler
+	rather than bfd_perror.  Print file name.  Internationalise.
+
+2005-10-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* cache.c (bfd_open_file): Set bfd_error_system_call on failure
+	to open file.
+	(bfd_cache_lookup_worker): Remove check that file pos is in
+	unsigned long range.  Print system error before aborting.
+
+2005-10-25  Arnold Metselaar  <arnold.metselaar@planet.nl>
+
+	* Makefile.am: Add rules for coff-z80 and cpu-z80.
+	* Makefile.in: Regenerated.
+	* archures.c: Add bfd_arch_z80 and support for it.
+	* coffcode.h(coff_set_arch_mach_hook): Add case Z80MAGIC.
+	(coff_set_flags): Add case bfd_arch_z80.
+	* config.bfd: Add z80coff_vec.
+	* configure.in: Add z80coff_vec.
+	* reloc.c: Add BFD_RELOC_Z80_DISP8
+	* targets.c: Add z80coff_vec.
+	* coff-z80.c: New file
+	* cpu-z80.c: New file
+	* configure: Regenerated.
+	* libbfd.h: Regenerated.
+	* bfd-in2.h: Regenerated.
+
+2005-10-26  Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/1540
+	* elf-bfd.h (elf_backend_copy_indirect_symbol): Replace pointer to
+	elf_backend_data with pointer to bfd_link_info.
+	(_bfd_elf_link_hash_copy_indirect): Likewise.
+	* elf.c (_bfd_elf_link_hash_copy_indirect): Likewise.  Handle
+	direct and indirect symbols both having dynamic link info.
+	* elf32-arm.c (elf32_arm_copy_indirect_symbol): Likewise.
+	* elf32-hppa.c (elf32_hppa_copy_indirect_symbol): Likewise.
+	* elf32-i386.c (elf_i386_copy_indirect_symbol): Likewise.
+	* elf32-m32r.c (m32r_elf_copy_indirect_symbol): Likewise.
+	* elf32-ppc.c (ppc_elf_copy_indirect_symbol): Likewise.
+	* elf32-s390.c (elf_s390_copy_indirect_symbol): Likewise.
+	* elf32-sh.c (sh_elf_copy_indirect_symbol): Likewise.
+	* elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Likewise.
+	* elf64-s390.c (elf_s390_copy_indirect_symbol): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_copy_indirect_symbol): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_hash_copy_indirect): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_copy_indirect_symbol): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_copy_indirect_symbol): Likewise.
+	* elflink.c: Adjust all calls to bed->elf_backend_copy_indirect_symbol.
+	* elfxx-mips.h (_bfd_mips_elf_copy_indirect_symbol): Update prototype.
+	* elfxx-sparc.h (_bfd_sparc_elf_copy_indirect_symbol): Likewise.
+
+2005-10-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* po/SRC-POTFILES.in: Regenerate.
+	* po/bfd.pot: Regenerate.
+
+2005-10-24  Jie Zhang <jie.zhang@analog.com>
+
+	* elf32-bfin.c (bfd_bfin_elf32_create_embedded_relocs): Fix signedness
+	warning.
+
+2005-10-24  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	* elf32-bfin.c (bfin_howto_table): Set src_mask to 0 for all relocs.
+	(bfin_imm16_reloc): Always add in the addend.  Don't fetch existing
+	contents from section.
+	(bfin_relocate_section): Rework so as to not call special_functions.
+	Handle the relocation stack here.  Treat pcrel24 relocs specially.
+
+2005-10-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_link_input_bfd): Don't use linker_mark and
+	SEC_EXCLUDE to test for sections dropped from output.  Instead,
+	use bfd_section_removed_from_list on normal sections.  Don't
+	attempt to handle symbols with unknown reserved section indices.
+	* linker.c (_bfd_generic_link_output_symbols): Don't use
+	linker_mark to test for symbols belonging to dropped sections.
+	Do allow absolute symbols.
+
+2005-10-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-i370.c (i370_elf_fake_sections): Don't set SHF_EXCLUDE on
+	group sections.
+
+2005-10-24  Jan Beulich  <jbeulich@novell.com>
+
+	* cpu-ia64-opc.c (elf64_ia64_operands): Move memory operand out of
+	set of indirect operands.
+
+2005-10-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_fake_sections): Don't set SHF_EXCLUDE on
+	group sections.
+
+2005-10-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* coff-rs6000.c (rs6000coff_vec): Initialize
+	_bfd_init_private_section_data with
+	_bfd_generic_init_private_section_data.
+	(pmac_xcoff_vec): Likewise.
+	* coff64-rs6000.c (rs6000coff64_vec): Likewise.
+	(aix5coff64_vec): Likewise.
+
+2005-10-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/1487
+	* elf-bfd.h (_bfd_generic_init_private_section_data): New.
+	(_bfd_elf_init_private_section_data): New.
+
+	* elf.c (elf_fake_sections): Don't set SHF_GROUP for
+	relocatable link.
+	(bfd_elf_set_group_contents): Don't handle relocatable link
+	specially.
+	(assign_section_numbers): If it isn't called by assembler,
+	use the output section of elf_linked_to_section for
+	SHF_LINK_ORDER.
+	(_bfd_elf_init_private_section_data): New.
+	(_bfd_elf_copy_private_section_data): Call it.
+
+	* libbfd-in.h (_bfd_generic_init_private_section_data): New.
+
+	* libbfd.c (_bfd_generic_init_private_section_data): New.
+
+	* targets.c (BFD_JUMP_TABLE_COPY): Add
+	_bfd_generic_init_private_section_data.
+	(bfd_init_private_section_data): Likewise.
+
+	* bfd-in2.h: Regenerated.
+	* libbfd.h: Likewise.
+
+2005-10-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (dec_dynrel_count): Don't report errors for local
+	syms in gc'd sections.
+	(ppc64_elf_edit_opd): Don't adjust reloc counts when NO_OPD_RELOCS.
+	(elf_backend_action_discarded): Define.
+	(ppc64_elf_action_discarded): New function.
+
+2005-10-19  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (find_arm_elf_section_entry): New function.
+	(get_arm_elf_section_data): Use it.
+	(unrecord_section_with_arm_elf_section_data): Use it.
+
+2005-10-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* coff-rs6000.c (rs6000coff_vec): Initialize
+	_bfd_match_sections_by_type with
+	_bfd_generic_match_sections_by_type.
+	(pmac_xcoff_vec): Likewise.
+	* coff64-rs6000.c (rs6000coff64_vec): Likewise.
+	(aix5coff64_vec): Likewise.
+
+2005-10-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/1467
+	* elf-bfd.h (_bfd_elf_match_sections_by_type): New.
+	(_bfd_generic_match_sections_by_type): New. Defined.
+
+	* elf.c (_bfd_elf_match_sections_by_type): New.
+
+	* libbfd-in.h (_bfd_generic_match_sections_by_type): New.
+
+	* bfd-in2.h: Regenerated.
+	* libbfd.h: Likewise.
+
+	* libbfd.c (_bfd_generic_match_sections_by_type): New.
+
+	* targets.c (BFD_JUMP_TABLE_LINK): Initialize
+	_bfd_match_sections_by_type with
+	_bfd_generic_match_sections_by_type.
+	(bfd_target): Add _bfd_match_sections_by_type.
+
+2005-10-08  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c: Move #include "elf/arm.h" after libbfd.h.
+	(NUM_KNOWN_ATTRIBUTES): Define.
+	(aeabi_attribute, aeabi_attribute_list): Define.
+	(elf32_arm_obj_tdata): Add known_eabi_attributes and
+	other_eabi_attributes.
+	(uleb128_size, is_default_attr, eabi_attr_size,
+	elf32_arm_eabi_attr_size, write_uleb128, write_eabi_attribute,
+	elf32_arm_set_eabi_attr_contents, elf32_arm_bfd_final_link,
+	elf32_arm_new_eabi_attr, attr_strdup, elf32_arm_add_eabi_attr_int,
+	elf32_arm_add_eabi_attr_compat, copy_eabi_attributes,
+	elf32_arm_merge_eabi_attributes): New functions.
+	(elf32_arm_copy_private_bfd_data): Copy EABI object attributes.
+	(elf32_arm_fake_sections): Handle .ARM.attributes.
+	(elf32_arm_parse_attributes): New function.
+	(elf32_arm_section_from_shdr): Use it.
+	(bfd_elf32_bfd_final_link): Define.
+
+2005-10-06  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_check_relocs): Avoid aliasing warnings from
+	GCC.
+	(elf32_arm_size_dynamic_sections): Likewise.
+	* ecofflink.c (bfd_ecoff_debug_one_external): Likewise.
+	* elf32-hppa.c (elf32_hppa_check_relocs): Likewise.
+	* elf32-m32r.c (m32r_elf_check_relocs): Likewise.
+	* elf32-m68k.c (elf_m68k_check_relocs): Likewise.
+	* elf32-ppc.c (ppc_elf_check_relocs): Likewise.
+	* elf32-s390.c (elf_s390_check_relocs): Likewise.
+	(elf_s390_size_dynamic_sections): Likewise.
+	* elf32-sh.c (sh_elf_check_relocs): Likewise.
+	* elf64-ppc.c (ppc64_elf_check_relocs, dec_dynrel_count)
+	(ppc64_elf_size_dynamic_sections): Likewise.
+	* elf64-s390.c (elf_s390_check_relocs): Likewise.
+	(elf_s390_size_dynamic_sections): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_finish_dynamic_sections): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_check_relocs): Likewise.
+	(_bfd_sparc_elf_size_dynamic_sections): Likewise.
+	* ieee.c (ieee_slurp_section_data): Likewise.
+	* oasys.c (oasys_slurp_section_data): Likewise.
+
+2005-10-04  Bob Wilson  <bob.wilson@acm.org>
+
+	* archive.c: Add missing SUBSECTION for documentation.
+	* bfd.c: Likewise.
+	* cache.c: Likewise.
+	* corefile.c: Likewise.
+	* format.c: Likewise.
+	* init.c: Likewise.
+	* libbfd.c: Likewise.
+	* opncls.c: Likewise.
+	* elf.c: Remove blank line after SECTION heading.
+	* reloc.c: Change "howto manager" SECTION to a SUBSECTION.
+
+2005-10-04  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-arm.c (get_arm_elf_section_data): Cache the last pointer
+	matched so that the typical case of scanning for the previous
+	section to last one can be handled quickly.
+
+2005-10-03  David Heine  <dlheine@tensilica.com>
+
+	* elf32-xtensa.c (relocations_reach): Skip range check for
+	absolute literals.
+
+2005-10-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (_bfd_elf_get_synthetic_symtab): Set BSF_GLOBAL on
+	synthetic syms.
+
+2005-09-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerated.
+	* aclocal.m4: Likewise.
+
+2005-09-30  Catherine Moore  <clm@cm00re.com>
+
+	* Makefile.am: Bfin support.
+	* Makefile.in: Regenerated.
+	* aclocal.m4: Regenerated.
+	* archures.c (bfd_mach_bfin): New.
+	(bfd_arch_bfin): New.
+	bfd-in.h (bfd_bfin_elf32_create_embedded_relocs): New.
+	* bfd-in2.h: Regenerated.
+	* config.bfd: Bfin support.
+	* configure: Regenerated.
+	* configure.in: Bfin support.
+	* libbfd.h: Regenerated.
+	* reloc.c: Add BFD relocations for Bfin.
+	* targets.c (bfd_elf32_bfin_vec): New.
+	* cpu-bfin.c: New file.
+	* elf32-bfin.c: New file.
+
+2005-09-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc_type_of_stub): Check both func desc and func
+	entry sym before deciding no stub is needed.
+	(ppc64_elf_size_stubs): When calculating branch destination,
+	don't use func desc sym for old ABI objects unless func entry
+	is undefined.
+
+2005-09-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/1321
+	* elf-bfd.h (_bfd_elf_setup_group_pointers): Renamed to ...
+	(_bfd_elf_setup_sections): This.
+	* elf.c: Likewise.
+	* elfcode.h (elf_object_p): Likewise.
+
+	* elf.c (_bfd_elf_setup_sections): Process SHF_LINK_ORDER.
+	(_bfd_elf_copy_private_section_data): Likewise.
+
+2005-09-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (elf_fixup_link_order): Report locations for mixed
+	ordered and unordered input sections.
+
+2005-09-22  James E. Wilson  <wilson@specifix.com>
+
+	* dwarf2.c (struct funcinfo): Delete nesting_level field.
+	(lookup_address_in_function_table): Delete code to set funcinfo
+	caller_func field.  Delete local curr_func.
+	(scan_unit_for_symbols): New locals nested_funcs, nested_funcs_size.
+	Delete code setting funcinfo nesting_level field.  Add code to set
+	funcinfo caller_func field.
+
+2005-09-20  James E. Wilson  <wilson@specifix.com>
+
+	* dwarf2.c (find_abstract_instance_name): Don't early exit when name
+	set.  For DW_AT_name case, only set name if not already set.  Handle
+	DW_AT_MIPS_linkage_name.
+
+2005-09-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (_bfd_elf_merge_symbol): Simplify.
+
+2005-09-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc_build_one_stub): Replace assertion that long
+	branch offset is in range with an error.  Print full stub name on
+	errors.
+	(ppc_size_one_stub): Print full stub name on errors.
+	(group_sections): Warn if section size exceeds group size.
+	(ppc64_elf_size_stubs): Continue relaxing when stub types change.
+
+2005-09-09  Kevin Buettner  <kevinb@redhat.com>
+
+	* elf32-am33lin.c (bfd.h, sysdep.h, elf-bfd.h, elf/mn10300.h):
+	Include.
+	(elf32_am33lin_grok_prstatus, elf32_am33lin_grok_psinfo): New
+	functions.
+	(elf_backend_grok_prstatus, elf_backend_grok_psinfo): Define.
+
+2005-09-09  Richard Earnshaw  <richard.earnshaw@arm.com>
+
+	* elf32-arm.c (elf32_arm_section_from_shdr): Accept SHT_ARM_PREEMPTMAP
+	and SHT_ARM_ATTRIBUTES.
+
+2005-09-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (elf_get_linked_section_vma): Fix a typo in comment.
+	* elfxx-ia64.c (elf_backend_link_order_error_handler): Likewise.
+
+2005-09-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/1263
+	* elflink.c (elf_link_add_object_symbols): Abort for
+	--just-symbols on DSO.
+
+2005-09-08  Paul Brook  <paul@codesourcery.com>
+
+	* reloc.c: Rename BFD_RELOC_ARM_SMI to BFD_RELOC_ARM_SMC.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2005-09-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/1301
+	* elflink.c (_bfd_elf_merge_symbol): Don't check undefined
+	symbol introduced by "ld -u" for TLS.
+
+2005-09-02  Paul Brook  <paul@codesourcery.com>
+
+	* libbdf.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* reloc.c: Add BFD_RELOC_ARM_T32_CP_OFF_IMM and
+	BFD_RELOC_ARM_T32_CP_OFF_IMM_S2.
+
+2005-09-01  Dmitry Diky <diwil@spec.ru>
+
+	* elf32-msp430.c (msp430_elf_relax_delete_bytes): Do not adjust
+	local symbols and move it to
+	(msp430_elf_relax_adjust_locals): New function - walk over the
+	sections in the bfd and adjust relocations as necessary.
+
+2005-08-31  DJ Delorie  <dj@redhat.com>
+
+	* elf32-i386.c (elf_i386_check_relocs): Don't cast a unary &
+	address operator, as that breaks GCC's strict aliasing rules.
+	(elf_i386_size_dynamic_sections): Avoid the need for type
+	punning.
+	* elf64-x86-64.c (elf_x86_64_check_relocs): Don't cast a unary
+	& address operator, as that breaks GCC's strict aliasing
+	rules.
+	(elf_x86_64_size_dynamic_sections): Avoid the need for type
+	punning.
+
+2005-08-30  Phil Edwards  <phil@codesourcery.com>
+
+	* config.bfd (i[3-7]86-*-vxworks):  Match vxworks* instead.
+
+2005-08-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/1247
+	* elfxx-ia64.c (allocate_fptr): Check undefined symbol.
+
+2005-08-29  Steven J. Hill <sjhill@realitydiluted.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_relocate_section): Initialise
+	'value' to avoid compile time warning message.
+
+2005-08-26  Christian Groessler  <chris@groessler.org>
+
+	* coff-z8k.c: (r_jr, r_disp7, r_callr): Fix src_mask and dst_mask
+	of HOWTO.
+	(coff_z8k_select_reloc): Remove.
+	(SELECT_RELOC): Remove.
+	(coff_z8k_reloc_type_lookup): New function.
+	(coff_bfd_reloc_type_lookup): Define.
+	* configure.in: Add cofflink.lo to z8kcoff_vec.
+	* configure: Regenerate.
+	* reloc.c: (bfd_reloc_code_type): Add z8k relocations.
+	(bfd_install_relocation): Don't clear reloc_entry->addend for
+	coff-z8k target.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2005-08-25  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh.c (sh_elf_get_flags_from_mach): Fix off-by-one error.
+
+2005-08-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/1208
+	* elf-hppa.h (elf_hppa_relocate_section): Print out the name
+	of unresolvable relocation.
+	* elf-m10300.c (mn10300_elf_relocate_section): Likewise.
+	* elf32-arm.c (elf32_arm_relocate_section): Likewise.
+	* elf32-i386.c (elf_i386_relocate_section): Likewise.
+	* elf32-m32r.c (m32r_elf_relocate_section): Likewise.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-s390.c (elf_s390_relocate_section): Likewise.
+	* elf32-sh.c (sh_elf_relocate_section): Likewise.
+	* elf32-xtensa.c (elf_xtensa_relocate_section): Likewise.
+	* elf64-s390.c (elf_s390_relocate_section): Likewise.
+	* elf64-sh64.c (sh_elf64_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_relocate_section): Likewise.
+
+2005-08-18  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* config.bfd: Add bfd_elf32_shnbsd_vec and bfd_elf32_shlnbsd_vec
+	to targ_selvecs for sh5*-*-netbsd* and sh64*-*-netbsd*.
+
+2005-08-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* coff-a29k.c: Delete.
+	* cpu-a29k.c: Delete.
+	* Makefile.am: Remove mention of a29k files.
+	* aoutf1.h: Remove a29k support.
+	* aoutx.h: Likewise.
+	* archures.c: Likewise.
+	* coffcode.h: Likewise.
+	* config.bfd: Likewise.
+	* configure.in: Likewise.
+	* ieee.c: Likewise.
+	* mipsbsd.c: Likewise.
+	* pdp11.c: Likewise.
+	* sparclynx.c: Likewise.
+	* targets.c: Likewise.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2005-08-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-m10300.c (_bfd_mn10300_elf_adjust_dynamic_symbol): Warn on
+	zero size dynamic variables.
+	* elf32-arm.c (elf32_arm_adjust_dynamic_symbol): Likewise.
+	* elf32-cris.c (elf_cris_adjust_dynamic_symbol): Likewise.
+	* elf32-hppa.c (elf32_hppa_adjust_dynamic_symbol): Likewise.
+	* elf32-i370.c (i370_elf_adjust_dynamic_symbol): Likewise.
+	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Likewise.
+	* elf32-m32r.c (m32r_elf_adjust_dynamic_symbol): Likewise.
+	* elf32-m68k.c (elf_m68k_adjust_dynamic_symbol): Likewise.
+	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Likewise.
+	* elf32-s390.c (elf_s390_adjust_dynamic_symbol): Likewise.
+	* elf32-sh.c (sh_elf_adjust_dynamic_symbol): Likewise.
+	* elf32-vax.c (elf_vax_adjust_dynamic_symbol): Likewise.
+	* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol): Likewise.
+	* elf64-s390.c (elf_s390_adjust_dynamic_symbol): Likewise.
+	* elf64-sh64.c (sh64_elf64_adjust_dynamic_symbol): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_adjust_dynamic_symbol): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_adjust_dynamic_symbol): Likewise.
+
+2005-08-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/1179
+	* dwarf2.c (_bfd_dwarf2_find_nearest_line): Use section lma
+	instead of vma.
+	(_bfd_dwarf2_find_line): Likewise.
+
+2005-08-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-mmix.c (mmix_elf_add_symbol_hook): Mark reg section
+	SEC_LINKER_CREATED.
+	(mmix_elf_final_link): Check that section hasn't already been
+	removed before removing.
+	* mmo.c (mmo_scan): Mark reg contents section SEC_LINKER_CREATED.
+	(mmo_canonicalize_symtab): Likewise for reg section.
+
+2005-08-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-cris.c (elf_cris_adjust_gotplt_to_got): Move assert later.
+	* elfxx-mips.c (_bfd_mips_elf_hide_symbol): Cope with being called
+	without any got section.
+
+2005-08-17  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* cofflink.c (_bfd_coff_generic_relocate_section): Correct
+	comment.
+
+2005-08-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (_bfd_elf_define_linkage_sym): Don't call
+	bfd_elf_link_record_dynamic_symbol.  Call elf_backend_hide_symbol.
+	(_bfd_elf_link_renumber_dynsyms): Formatting.
+	(struct elf_gc_sweep_symbol_info): New.
+	(elf_gc_sweep_symbol): Rewrite.
+	(elf_gc_sweep): Adjust params and elf_gc_sweep_symbol call.
+	Call _bfd_elf_link_renumber_dynsyms.
+	(bfd_elf_gc_sections): Adjust elf_gc_sweep call.
+
+2005-08-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_edit_opd): Don't call dec_dynrel_count
+	when relocatable.
+
+2005-08-15  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (ELF_MACHINE_CODE, ELF_MACHINE_ALT1): Swap values
+	of EM_XTENSA and EM_XTENSA_OLD.
+
+2005-08-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (_bfd_elf_define_linkage_sym): Declare.
+	* elflink.c (_bfd_elf_define_linkage_sym): New function, extracted
+	from..
+	(_bfd_elf_create_got_section): ..here.
+	(_bfd_elf_link_create_dynamic_sections): Call it for _DYNAMIC.
+	(_bfd_elf_create_dynamic_sections): ..and _PROCEDURE_LINKAGE_TABLE_.
+	* elf-m10300.c (_bfd_mn10300_elf_create_got_section): Use
+	_bfd_elf_define_linkage_sym.
+	* elf32-frv.c (_frv_create_got_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_create_dynamic_sections): Likewise.
+
+2005-08-15  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_howto_table_1): Make R_ARM_PLT32 the same as
+	R_ARM_PC24.
+
+2005-08-13  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR ld/1135
+	* elf64-hppa.c (elf64_hppa_special_sections): Add flag definitions for
+	.plt, .dlt, .sdata, .sbss and .tbss.
+
+2005-08-12  Dmitry Diky  <diwil@spec.ru>
+
+	* elf32-msp430.c (msp430_elf_relax_delete_bytes): Adjust relocations
+	referenced by .section + DISPLACEMENT.
+
+2005-08-10  James E. Wilson  <wilson@specifix.com>
+
+	* dwarf2.c (scan_unit_for_symbols, case DT_AT_location): Verify that
+	DW_OP_addr is only opcode in location before using it.
+
+2005-08-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_final_link): Reset gp.
+
+2005-08-09  Rodney Brown  <rbrown@bravurasolutions.com.au>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* aix5ppc-core.c (xcoff64_core_p): Constify return_value
+	variable.  Also, do not use core_hdr macro as it evaluates to a
+	cast of an lvalue which is no longer supported by GCC 4.0.
+
+2005-08-08  Eric Dönges <Eric.Doenges@betty-tv.com>
+
+	* archures.c (bfd_mach_msp21): New MSP430 machine number.
+	* bfd-in2.h: Regenerate.
+	* cpu-msp430.c (arch_info_struct): Add support for msp430x21xx
+	variants.
+
+2005-08-07  Nick Clifton  <nickc@redhat.com>
+	    Paul Brook  <paul@codesourcery.com>
+
+	PR 1147
+	* elf32-arm.c (bfd_elf32_close_and_cleanup): Define.
+	(elf32_arm_close_and_cleanup): New function - walk over the
+	sections in the bfd that is being closed removing them from the
+	list of recorded sections.
+	(unrecord_section_via_map_over_sections): New helper function.
+	(record_section_with_arm_elf_section_data): Call bfd_malloc
+	instead of bfd_alloc.  Remove unneeded abfd parameter.
+	(elf32_arm_new_section_hook): Do not pass bfd to
+	record_section_with_arm_elf_section_data.
+
+	* elfxx-target.h (bfd_elfNN_close_and_cleanup): Only define if not
+	already defined by the target.
+
+2005-08-05  Fred Fish  <fnf@specifix.com>
+
+	* dwarf2.c (read_rangelist): Use addr_size instead of offset_size
+	to determine how many bytes to read from each rangelist entry.
+
+2005-08-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfd.c (bfd_hide_symbol): New.
+	* bfd-in2.h: Regenerated.
+
+2005-08-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf64_x86_64_merge_symbol): When mixing a
+	large common symbol and a normal common symbol, always turn
+	the large common symbol into a normal one.
+
+2005-08-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (struct elf_linker_section): Replace sym_val field
+	with sym.
+	(ppc_elf_relocate_section): Adjust for above.
+	(create_sdata_sym): New function.
+	(ppc_elf_create_linker_section): Call it.
+	(ppc_elf_check_relocs): Correct has_sda_refs and non_got_refs.
+	Create sdata syms for all SDA relocs.
+	(ppc_elf_adjust_dynamic_symbol): Don't special case _SDA_BASE_
+	and _SDA2_BASE_.
+	(ppc_elf_set_sdata_syms): Delete.
+	* elflink.c (bfd_elf_size_dynamic_sections): Don't create DT_INIT
+	and DT_FINI tags unless associated section has input.
+	(bfd_elf_set_symbol, _bfd_elf_provide_symbol): Delete.
+	(_bfd_elf_provide_section_bound_symbols): Delete.
+	* bfd-in.h (_bfd_elf_provide_symbol): Delete.
+	(_bfd_elf_provide_section_bound_symbols): Delete.
+	* bfd-in2.h: Regenerate.
+
+2005-08-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (fix_syms, _bfd_elf_fix_excluded_sec_syms): Move to..
+	* linker.c (fix_syms, _bfd_fix_excluded_sec_syms): ..here.
+	* bfd-in.h (_bfd_fix_excluded_sec_syms): Rename.
+	* bfd-in2.h: Regenerate.
+
+2005-08-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Resize .rela.got
+	only if it isn't NULL.
+
+2005-08-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_howto_table): Undo the overflow change for
+	R_386_PC16 made on 2005-07-18.
+
+	* elf64-x86-64.c (x86_64_elf_howto_table): Undo the overflow
+	change for R_X86_64_PC16 made on 2005-07-18.
+
+2005-08-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (struct ppc_elf_link_hash_table): Remove hgot.  Use
+	elf.hgot throughout file.
+
+2005-08-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Correct value of
+	_GLOBAL_OFFSET_TABLE_ for > 32k GOT.
+
+2005-08-02  Andreas Schwab  <schwab@suse.de>
+
+	* elfxx-ia64.c (struct elfNN_ia64_allocate_data): Add only_got.
+	(elfNN_ia64_relax_section): Reallocate .rela.got when .got has
+	changed.
+	(allocate_dynrel_entries): Look only at GOT relocations when
+	only_got is true.
+	(elfNN_ia64_size_dynamic_sections): Set only_got to false before
+	calling allocate_dynrel_entries.
+
+2005-08-02  Nick Clifton  <nickc@redhat.com>
+
+	PR 1147
+	* elf32-arm.c (struct _arm_elf_section_data): Turn into a typedef
+	and make the mapcount field unsigned.
+	(struct section_list): New: Used to keep track of which sections
+	have an _arm_elf_section_data structure.
+	(record_section_with_arm_elf_section_data): New function.
+	(get_arm_elf_section_data): New function.
+	(unrecord_section_with_arm_elf_section_data): New function.
+	(elf32_arm_output_symbol_hook): Use get_arm_elf_section_data.
+	(elf32_arm_new_section_hook): Call
+	record_section_with_arm_elf_section_data.
+	(elf32_arm_write_section): Use get_arm_elf_section_data and
+	unrecord_section_with_arm_elf_section_data.
+
+2005-08-01  Richard Sandiford  <richard@codesourcery.com>
+
+	* elfxx-mips.c (mips_mach_extends_p): Treat MIPS64 as an extension
+	of MIPS32 and MIPS64r2 as an extension of MIPS32r2.
+
+2005-07-30  David Daney  <ddaney@avtrex.com>
+
+	* elflink.c (elf_gc_sweep):  Set dynsymcount to correct value.
+
+2005-07-29  David Daney  <ddaney@avtrex.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_add_symbol_hook):  Ignore _gp_disp
+	if it is in the *ABS* section.
+
+2005-07-29  Paul Brook  <paul@codesourcery.com>
+
+	* reloc.c: Add BFD_RELOC_ARM_T32_ADD_PC12.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2005-07-29  Paul Brook  <paul@codesourcery.com>
+
+	* reloc.c (BFD_RELOC_ARM_T32_IMM12): Add.
+	* bfd-in2.h: Regeenrate.
+	* libbfd.h: Regenerate.
+
+2005-07-29  Pavel Kankovsky  <peak@argo.troja.mff.cuni.cz>
+
+	* peXXigen.c (pe_print_edata): Compute the size of the export
+	table from the size field in the DataDictionary and not the size
+	of the section.  Some linkers embed the export table inside a
+	larger section.
+
+2005-07-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_backend_data): Add action_discarded.
+	(enum action_discarded): Move from..
+	* elflink.c (enum action_discarded): ..here.
+	(_bfd_elf_default_action_discarded): Rename from elf_action_discarded.
+	Remove target specific section checks.
+	(elf_link_input_bfd): Adjust.
+	* elfxx-target.h (elf_backend_action_discarded): Define.
+	(elfNN_bed): Init new field.
+	* bfd-in.h (_bfd_elf_default_action_discarded): Declare.
+	* bfd-in2.h: Regenerate.
+	* elf-hppa.h (elf_hppa_action_discarded): New function.
+	* elf32-hppa.c (elf_backend_action_discarded): Define.
+	* elf64-hppa.c (elf_backend_action_discarded): Define.
+	* elf32-ppc.c (ppc_elf_action_discarded): New function.
+	(elf_backend_action_discarded): Define.
+
+2005-07-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (fix_syms): Handle symbols defined in input sections.
+
+2005-07-27  Jan Beulich  <jbeulich@novell.com>
+
+	* elf64-x86-64.c (R_X86_64_standard, R_X86_64_vt_offset): New.
+	(elf64_x86_64_info_to_howto): Use them.
+
+2005-07-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (_bfd_elf_merge_symbol): Skip weak redefinition
+	regardless of strength of previous definition.
+
+2005-07-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_gc_mark_dynamic_ref_symbol): Handle -shared.
+	(bfd_elf_gc_sections): Allow -gc-sections when -shared.
+	* elf32-ppc.c (ppc_elf_gc_sweep_hook): Correct for -shared.
+
+2005-07-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_gc_sweep): Move gcc_except_table code..
+	(bfd_elf_gc_sections): ..to here.
+
+2005-07-25  DJ Delorie  <dj@redhat.com>
+
+	* reloc.c: Remove unused M32C relocs, add BFD_RELOC_M32C_HI8.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+	* elf32-m32c.c (m32c_elf_howto_table): Add R_M32C_8, R_M32C_LO16,
+	R_M32C_HI8, R_M32C_HI16.
+	(m32c_reloc_map): Likewise.
+	(m32c_elf_relocate_section): Add R_M32C_HI8 and R_M32C_HI16.
+
+2005-07-25  Jan Hubicka  <jh@suse.cz>
+	    H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (_bfd_elf_large_com_section): New.
+	* elf.c (_bfd_elf_large_com_section): New. Defined.
+
+	* elf64-x86-64.c (elf64_x86_64_add_symbol_hook): New.
+	(elf64_x86_64_elf_section_from_bfd_section): New.
+	(elf64_x86_64_symbol_processing): New.
+	(elf64_x86_64_common_definition): New.
+	(elf64_x86_64_common_section_index): New.
+	(elf64_x86_64_common_section): New.
+	(elf64_x86_64_merge_symbol): New.
+	(elf64_x86_64_additional_program_headers): New.
+	(elf64_x86_64_special_sections): New.
+	(elf_backend_section_from_bfd_section): New. Defined.
+	(elf_backend_add_symbol_hook): Likewise.
+	(elf_backend_common_section_index): Likewise.
+	(elf_backend_common_section): Likewise.
+	(elf_backend_common_definition): Likewise.
+	(elf_backend_merge_symbol): Likewise.
+	(elf_backend_special_sections): Likewise.
+	(elf_backend_additional_program_headers): Likewise.
+
+2005-07-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (elf_backend_data): Add common_definition,
+	common_section_index, common_section, and merge_symbol.
+	(_bfd_elf_common_definition): New.
+	(_bfd_elf_common_section_index): New.
+	(_bfd_elf_common_section): New.
+
+	* elf.c (elf_fake_sections): Don't clear sh_flags.
+
+	* elflink.c (_bfd_elf_merge_symbol): Call backend merge_symbol
+	if it is available.
+	(is_global_data_symbol_definition): Call backend
+	common_definition instead of checking SHN_COMMON.
+	(elf_link_add_object_symbols): Likewise.
+	(elf_link_output_extsym): Call backend common_section_index
+	for common section index.
+	(_bfd_elf_common_definition): New.
+	(_bfd_elf_common_section_index): New.
+	(_bfd_elf_common_section): New.
+
+	* elfxx-target.h (elf_backend_common_definition): New.
+	(elf_backend_common_section_index): New.
+	(elf_backend_common_section): New.
+	(elf_backend_merge_symbol): New.
+	(elfNN_bed): Initialize common_definition, common_section_index,
+	common_section, and merge_symbol.
+
+	* section.c (BFD_FAKE_SECTION): New.
+	(STD_SECTION): Use it.
+	* bfd-in2.h: Regenerated.
+
+2005-07-23  Olaf Hering <olh@suse.de>
+
+	* elflink.c (elf_link_input_bfd): Add '\n' for linker einfo
+	callback.
+
+2005-07-21  Ralf Corsepius  <ralf.corsepius@rtems.org>
+
+	* config.bfd: Remove i[3-7]86-*-rtemself*.
+	Remove sparc-*-rtemself*.
+
+2005-07-22  Kazuhiro Inaoka <inaoka.kazuhiro@renesas.com>
+
+	* elf32-m32r.c (m32r_elf_check_relocs): Fix pc count for
+	R_M32R_REL32.
+
+2005-07-21  Ben Elliston  <bje@gnu.org>
+
+	* Makefile.am (BFD32_BACKENDS): Remove cf-m68klynx.lo.
+	(BFD32_BACKENDS): Likewise, remove m68klynx.lo.
+	(BFD32_BACKENDS_CFILES): Remove cf-m68klynx.c, m68klynx.c.
+	(cf-m68klynx.lo, m68klynx.lo): Remove targets.
+	* Makefile.in: Regenerate.
+	* cf-m68klynx.c: Remove.
+	* m68klynx.c: Likewise.
+	* configure.in (m68klynx_aout_vec): Remove vector.
+	(m68klynx_coff_vec): Likewise.
+	* configure: Regenerate.
+	* targets.c (m68klynx_aout_vec): Remove extern.
+	(m68klynx_coff_vec): Likewise.
+	(_bfd_target_vector): Remove m68klynx_{aout,coff}_vec.
+	* po/SRC-POTFILES.in: Remove cf-m68klynx.c, m68klynx.c.
+
+2005-07-20  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
+
+	* elf32-m32r.c (m32r_elf_howto_table): Support R_M32R_REL32.
+	(m32r_reloc_map): Likewise.
+	(m32r_elf_relocate_section): Likewise.
+	(m32r_elf_gc_sweep_hook): Likewise.
+	(m32r_elf_check_relocs): Likewise.
+
+2005-07-18  Nick Clifton  <nickc@redhat.com>
+
+	* reloc.c: Add M32C and MS1 relocs.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2005-07-18  Nick Clifton  <nickc@redhat.com>
+
+	* config.bfd: Move m32c entry to correct location.
+	* archures.c: Likewise.
+	* configure.in: Likewise.
+	* configure: Regenerate.
+	* targets.c: Move ms1 vector to correct location.
+
+2005-07-18  Jan Beulich  <jbeulich@novell.com>
+
+	* elf32-i386.c (elf_howto_table): Adjust overflow complaint handler
+	for R_386_PC16.
+	* elf64-x86-64.c (x86_64_elf_howto_table): Adjust overflow complaint
+	handler for R_X86_64_PC16, R_X86_64_8, and R_X86_64_DTPOFF.
+
+2005-07-16  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	PR ld/1021
+	PR ld/1031
+	* elflink.c (elf_link_add_object_symbols): Also append the version
+	name to non-hidden absolute symbols that are functions.
+
+2005-07-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_set_sdata_syms): Return void.  Remove hack
+	for zero size sections.  Don't set .sbss syms here.
+	* elf32-ppc.h (ppc_elf_set_sdata_syms): Adjust prototype.
+
+2005-07-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2005-07-15  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (vsprint_msg): Add prototype.
+	(build_encoding_error_message): Delete.  Code moved into....
+	(elf_xtensa_do_reloc): ....here, and changed to give better
+	error messages for out of range literals.
+
+2005-07-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (bfd_elf_record_link_assignment): Remove output_bfd param.
+	(_bfd_elf_provide_symbol): Allow redefinition of weak syms and those
+	defined in output sections.  Call bfd_elf_record_link_assignment.
+	* bfd-in.h (bfd_elf_record_link_assignment): Update prototype.
+	* bfd-in2.h: Regenerate.
+
+2005-07-14  Jim Blandy  <jimb@redhat.com>
+
+	Add support for m32c-*-elf (Renesas m32c and m16c).
+	* Makefile.am (ALL_MACHINES): Add cpu-m32c.lo.
+	(ALL_MACHINES_CFILES): Add cpu-m32c.c.
+	(BFD32_BACKENDS): Add elf32-m32c.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-m32c.c.
+	(cpu-m32c.lo, elf32-m32c.lo): New rules, generated by 'make dep-am'.
+	* Makefile.in: Regenerated.
+	* archures.c (bfd_arch_m32c, bfd_mach_m16c, bfd_mach_m32c): New
+	arch and mach codes.
+	(bfd_m32c_arch): New arch info object.
+	(bfd_archures_list): List bfd_m32c_arch.
+	* bfd-in2.h: Regenerated.
+	* config.bfd: Add case for the m32c.
+	* configure.in: Add case for the m32c.
+	* configure: Regenerated.
+	* cpu-m32c.c, elf32-m32c.c: New files.
+	* libbfd.h: Regenerated.
+	* targets.c (bfd_elf32_m32c_vec): Declare.
+	(_bfd_target_vector): List bfd_elf32_m32c_vec.
+
+2005-07-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd-in.h (_bfd_elf_fix_excluded_sec_syms): Declare.
+	(_bfd_elf_provide_section_bound_symbols): Remove param name.
+	Formatting.
+	* bfd-in2.h: Regenerate.
+	* elflink.c (bfd_elf_gc_sections): Don't call generic function.
+	(_bfd_elf_provide_symbol): Formatting.
+	(_bfd_elf_provide_section_bound_symbols): Remove all hacks, just
+	create section relative syms.
+	(fix_syms, _bfd_elf_fix_excluded_sec_syms): New functions.
+	* elf32-ppc.c (ppc_elf_set_sdata_syms): Use
+	_bfd_elf_provide_section_bound_symbols.
+	* reloc.c (bfd_mark_used_section): Delete.
+	(bfd_generic_gc_sections): Don't call the above.
+
+2005-07-14  Paul Woegerer <paul.woegerer@nsc.com>
+
+	PR 1063
+	* cache.c (bfd_last_cache): Initialise to NULL.
+
+2005-07-14  Daniel Marques  <marques@cs.cornell.edu>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* coff-alpha.c (alpha_ecoff_bad_format_hook): Detect compressed
+	Alpha binaries and issue a helpful error message.
+	(alpha_ecoff_swap_reloc_out): Increase maximum allowed internal
+	symbol index to 15 to allow for binaries produced by DEC
+	compilers.
+
+2005-07-13  Steve Ellcey  <sje@cup.hp.com>
+
+	* bfd.m4 (BFD_NEED_DECLARATION): Remove.
+
+2005-07-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_relocate_section): Don't use a plt stub
+	when !can_plt_call.
+
+2005-07-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-xtensa.c (bfd_elf_xtensa_reloc): Warning fix.
+
+2005-07-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_set_sdata_syms): Correct __sbss_start value.
+
+2005-07-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (_bfd_elf_symbol_refs_local_p): Revert the last
+	change.
+
+2005-07-08  Paul Koning  <pkoning@equallogic.com>
+
+	* dwarf2.c (read_address): Check sign_extend_vma to handle targets
+	where addresses are sign extended.
+
+2005-07-08  Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* config.bfd: Mark i960-*-rtems*, or32-*-rtems* as obsolete.
+	Mark a29k-*rtems*, hppa*-*-rtems*, *-go32-rtems*,
+	i[3-7]86*-*-rtemscoff*, mips*el-*-rtems*, powerpcle-*-rtems*,
+	sparc*-*-rtemsaout* as removed
+
+2005-07-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-hppa.h (elf_hppa_final_link): Use gp val of zero when none
+	of the usual sections are found.
+	* elf-m10300.c (_bfd_mn10300_elf_size_dynamic_sections): Tidy.
+	Strip .dynbss if it is zero size.
+	* elf32-arm.c (elf32_arm_size_dynamic_sections): Likewise.
+	* elf32-cris.c (elf_cris_size_dynamic_sections): Likewise.
+	* elf32-hppa.c (elf32_hppa_size_dynamic_sections): Likewise.
+	* elf32-i370.c (i370_elf_size_dynamic_sections): Likewise, and
+	.dynsbss.
+	(i370_elf_finish_dynamic_sections): Don't attempt to write .got
+	when it is zero size.
+	* elf32-i386.c (elf_i386_size_dynamic_sections): Correct handling
+	of .dynbss and zero size sections.
+	* elf32-m32r.c (m32r_elf_size_dynamic_sections): Strip .dynbss if
+	it is zero size.
+	* elf32-m68k.c (elf_m68k_size_dynamic_sections): Tidy.  Strip
+	.dynbss if zero size.
+	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Likewise, .dynsbss
+	too.
+	* elf32-s390.c (elf_s390_size_dynamic_sections): Likewise.
+	* elf32-sh.c (sh_elf_size_dynamic_sections): Likewise.
+	* elf32-vax.c (elf_vax_size_dynamic_sections): Likewise.
+	* elf32-xtensa.c (elf_xtensa_size_dynamic_sections): Tidy.  Strip
+	.plt.* and .got.plt.* if zero size.
+	* elf64-alpha.c (elf64_alpha_size_dynamic_sections): Tidy.  Strip
+	.got* and .dynbss if zero size.
+	* elf64-hppa.c (elf64_hppa_size_dynamic_sections): Tidy.  Strip
+	* elf64-ppc.c (create_linkage_sections): Create branch lookup table
+	in .data.rel.ro.brlt or .rodata.brlt, and similarly for associated
+	reloc section.
+	(create_got_section): Always create new .got and .rela.got sections.
+	(ppc64_elf_size_dynamic_sections): Tidy.  Strip .dynbss if zero size.
+	* elf64-s390.c (elf_s390_size_dynamic_sections): Likewise.
+	* elf64-sh64.c (sh64_elf64_size_dynamic_sections): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_size_dynamic_sections): Handle
+	dynamic bss sections correctly.
+	* elfxx-mips.c (_bfd_mips_elf_size_dynamic_sections): Tidy.
+	* elfxx-sparc.c (_bfd_sparc_elf_size_dynamic_sections): Tidy.  Strip
+	.dynbss if zero size.
+
+2005-07-08  Ben Elliston  <bje@au.ibm.com>
+
+	* elf32-xtensa.c: Include <stdarg.h> unconditionally, not only
+	when ANSI_PROTOTYPES is defined.  Remove #ifdef logic.
+
+2005-07-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (elf_backend_data): Add special_sections.
+
+	* elf.c (_bfd_elf_get_sec_type_attr): Check special_sections
+	first.
+
+	* elf32-arm.c (elf_backend_get_sec_type_attr): Removed.
+	(elf_backend_special_sections): New. Defined.
+	* elf32-m32r.c: Likewise.
+	* elf32-m68hc11.c: Likewise.
+	* elf32-m68hc12.c: Likewise.
+	* elf32-mcore.c: Likewise.
+	* elf32-sh64.c: Likewise.
+	* elf32-v850.c: Likewise.
+	* elf32-xtensa.c: Likewise.
+	* elf64-alpha.c: Likewise.
+	* elf64-hppa.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf64-sh64.c: Likewise.
+	* elfxx-ia64.c: Likewise.
+	* elfxx-mips.c: Likewise.
+	* elfxx-mips.h: Likewise.
+
+	* elfxx-target.h (elf_backend_special_sections): New.
+	(elfNN_bed): Initialize special_sections.
+
+2005-07-07  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-modules.c: Update tables with Xtensa MMU features.
+
+2005-07-07  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* elf32-xtensa.c (vsprint_msg): Add format attribute.  Fix
+	format bugs.
+	* vms.h (_bfd_vms_debug): Add format attribute.
+	(_bfd_vms_debug, _bfd_hexdump): Fix typos.
+
+2005-07-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 975
+	* elflink.c (_bfd_elf_symbol_refs_local_p): Only undefined
+	symbol with default visibility is local.
+
+2005-07-07  Ben Elliston  <bje@gnu.org>
+
+	* config.bfd: Mark m68*-*-rtemscoff as obsolete.
+
+2005-07-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* dwarf2.c (varinfo): Add addr.
+	(lookup_symbol_in_variable_table): Also check addr.
+	(scan_unit_for_symbols): Set addr for variable.
+	(comp_unit_find_line): Updated.
+
+2005-07-06  Nick Clifton  <nickc@redhat.com>
+
+	* coff-alpha.c (alpha_adjust_reloc_in): Issue an informative error
+	message if an unknown reloc is encountered.
+	(alpha_relocate_section): Likewise.
+
+	* ecoff.c (_bfd_ecoff_write_object_contents): Cope with a reloc
+	with a missing howto field.
+
+2005-07-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* po/SRC-POTFILES.in: Add cpu-ms1.c, elf32-ms1.c, elf-vxworks.c,
+	elfxx-sparc.c.
+
+2005-07-05  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-ppc.c (ppc_elf_vxworks_special_sections): Remove.
+	(ppc_elf_vxworks_get_sec_type_attr): New function.
+	(elf_backend_special_sections): Remove vxwords definition.
+	(elf_backend_get_sec_type_attr): Define for vxworks.
+
+2005-07-05  Nick Clifton  <nickc@redhat.com>
+
+	* elf64-ppc.c (ppc64_elf_info_to_howto): Fix typo.
+
+2005-07-05  Paul Brook  <paul@codesourcery.com>
+
+	* config.bfd: Add separate case for ppc-vxworks.
+	* configure: Regenerate.
+	* configure.in: Include elf-vxworks.lo on ppc targets.
+	* elf-vxworks.c (elf_vxworks_final_write_processing): Handle
+	.rela.plt.unloaded.
+	* elf32-ppc.c: Add VxWorks target vec.	Include elf-vxworks.h.
+	(PLT_ENTRY_SIZE, PLT_INITIAL_ENTRY_SIZE, PLT_SLOT_SIZE): Remove.
+	(VXWORKS_PLT_ENTRY_SIZE, ppc_elf_vxworks_plt_entry,
+	ppc_elf_vxworks_pic_plt_entry, VXWORKS_PLT_INITIAL_ENTRY_SIZE,
+	ppc_elf_vxworks_plt0_entry, ppc_elf_vxworks_pic_plt0_entry,
+	VXWORKS_PLT_NON_JMP_SLOT_RELOCS, VXWORKS_PLTRESOLVE_RELOCS,
+	VXWORKS_PLTRESOLVE_RELOCS_SHLIB): New.
+	(ppc_elf_link_hash_table): Add srelplt2, sgotplt, hgot, hplt,
+	is_vxworks, plt_entry_size, plt_slot_size, plt_initial_entry_size.
+	(ppc_elf_link_hash_table_create): Initialize hadtab plt fields.
+	(ppc_elf_create_got): Create .got.plt for VxWorks.
+	(ppc_elf_create_dynamic_sections): Create unloaded plt relocation
+	section for VxWorks.
+	(ppc_elf_select_plt_layout): Handle VxWorks plt format.
+	(allocate_got): VxWorks does not need a got header.
+	(allocate_dynrelocs): Handle VxWorks plt format.
+	(ppc_elf_size_dynamic_sections): Save _G_O_T_ and _P_L_T_ symbols for
+	VxWorks.  Handle VxWorks plt/got.
+	(ppc_elf_finish_dynamic_sections): Fill in VxWorks plt.
+	(ppc_elf_vxworks_special_sections): New.
+	(ppc_elf_vxworks_link_hash_table_create,
+	ppc_elf_vxworks_add_symbol_hook,
+	elf_i386_vxworks_link_output_symbol_hook,
+	ppc_elf_vxworks_final_write_processing): New functions.
+	* targets.c (bfd_elf32_powerpc_vxworks_vec): Declare.
+	(_bfd_target_vector): Use it.
+
+2005-07-05  Jakub Jelinek  <jakub@redhat.com>
+
+	* libbfd-in.h (struct artdata): Add extended_names_size field.
+	* libbfd.h: Rebuilt.
+	* coff-rs600.c (_bfd_xcoff_archive_p): Don't clear fields in freshly
+	allocated object by bfd_zalloc.
+	* coff64-rs6000.c (xcoff64_archive_p): Likewise.
+	* ecoff.c (_bfd_ecoff_archive_p): Likewise.
+	* archive.c (_bfd_generic_mkarchive, bfd_generic_archive_p): Likewise.
+	(get_extended_arelt_filename): Fail if index is bigger or equal to
+	extended_names_size.
+	(_bfd_generic_read_ar_hdr_mag): Don't set bfd_error_malformed_archive,
+	get_extended_arelt_filename already did that.
+	(_bfd_slurp_extended_name_table): Initialize extended_names_size field.
+	Allocate one extra byte and clear it, in case extended names table
+	is not terminated.
+
+	* libbfd-in.h (bfd_malloc2, bfd_realloc2, bfd_zmalloc2, bfd_alloc2,
+	bfd_zalloc2): New prototypes.
+	* bfd-in.h (HALF_BFD_SIZE_TYPE): Define.
+	* libbfd.c (bfd_malloc2, bfd_realloc2, bfd_zmalloc2): New functions.
+	* opncls.c (bfd_alloc2, bfd_zalloc2): New functions.
+	* elf.c (bfd_elf_get_elf_syms, setup_group, assign_section_numbers,
+	elf_map_symbols, map_sections_to_segments,
+	assign_file_positions_for_segments, copy_private_bfd_data,
+	swap_out_syms, _bfd_elf_slurp_version_tables): Use bfd_*alloc2
+	where appropriate.
+	* bfd-in2.h: Rebuilt.
+	* libbfd.h: Rebuilt.
+
+	* elf.c (_bfd_elf_print_private_bfd_data): Don't crash on bogus
+	verdef or verneed section.
+	(_bfd_elf_slurp_version_tables): Handle corrupt verdef and/or
+	verneed sections gracefully.
+	* elfxx-sparc.c (_bfd_sparc_elf_info_to_howto_ptr): Don't crash on
+	bogus relocation values.
+	* elf64-ppc.c (ppc64_elf_info_to_howto): Likewise.
+	* elf64-s390.c (elf_s390_info_to_howto): Likewise.
+	* elf32-s390.c (elf_s390_info_to_howto): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_info_to_howto): Likewise.
+	* elfxx-ia64.c (lookup_howto): Likewise.
+
+	* elf.c (bfd_elf_get_str_section): Allocate an extra byte after
+	the end of strtab and clear it.
+	(elf_read): Remove.
+
+2005-07-05  Nick Clifton  <nickc@redhat.com>
+
+	* po/vi.po: New Vietnamese translation.
+	* configure.in (ALL_LINGUAS): Add vi.
+	* configure: Regenerate.
+
+2005-07-05  Peter S. Mazinger <ps.m@gmx.net>
+
+	* elf32-arm.c (elf32_arm_size_dynamic_sections): Fix a typo and
+	touchup logic like i386/ppc.
+
+2005-07-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (special_sections): Move const qualifier.
+	(special_sections_b..special_sections_t): Likewise.
+	* elf32-arm.c (elf32_arm_symbian_get_sec_type_attr): Remove duplicate
+	const.
+	(elf32_arm_symbian_special_sections): Move const qualifier.
+	* elf32-m32r.c: Similarly.
+	* elf32-m68hc11.c: Similarly.
+	* elf32-m68hc12.c: Similarly.
+	* elf32-mcore.c: Similarly.
+	* elf32-ppc.c: Similarly.
+	* elf32-sh64.c: Similarly.
+	* elf32-v850.c: Similarly.
+	* elf32-xtensa.c: Similarly.
+	* elf64-alpha.c: Similarly.
+	* elf64-hppa.c: Similarly.
+	* elf64-ppc.c: Similarly.
+	* elf64-sh64.c: Similarly.
+	* elfxx-ia64.c: Similarly.
+	* elfxx-mips.c: Similarly.
+
+2005-07-04  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
+
+	* elf32-m32r.c (m32r_elf_size_dynamic_sections): Use
+	info->executable instead of !info->shared where appropriate.
+
+2005-07-04  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 1042
+	* elf.c (assign_file_positions_for_segments): Remove excluded
+	sections from the segment map.
+
+2005-07-04  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 1004
+	* elf-bfd.h (struct elf_backend_data): Add get_sec_type_attr.  Delete
+	special_sections.
+	(_bfd_elf_get_special_section): Declare.
+	(bfd_elf_special_section): Update prototype.
+	* elf.c (special_sections): Remove unused outer entries.
+	(get_special_section): Delete.
+	(_bfd_elf_get_special_section): New function.
+	(_bfd_elf_get_sec_type_attr): Replace "name" arg with "sec".  Update
+	special_sections indexing.
+	(_bfd_elf_new_section_hook): Call backend get_sec_type_attr.
+	* elf32-arm.c (symbian_special_sections_d): Delete.
+	(symbian_special_sections_g, symbian_special_sections_h): Delete.
+	(symbian_special_sections_i, symbian_special_sections_f): Delete.
+	(symbian_special_sections_p): Delete.
+	(elf32_arm_symbian_special_sections): Merge above to here.
+	(elf32_arm_symbian_get_sec_type_attr): New function.
+	(elf_backend_special_sections): Don't define.
+	(elf_backend_get_sec_type_attr): Define.
+	* elf32-m32r.c: Similarly to elf32-arm.c.
+	* elf32-m68hc11.c: Likewise.
+	* elf32-m68hc12.c: Likewise.
+	* elf32-mcore.c: Likewise.
+	* elf32-sh64.c: Likewise.
+	* elf32-v850.c: Likewise.
+	* elf32-xtensa.c: Likewise.
+	* elf64-alpha.c: Likewise.
+	* elf64-hppa.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf64-sh64.c: Likewise.
+	* elfxx-ia64.c: Likewise.
+	* elfxx-mips.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	(bfd_elf_special_section ppc_alt_plt): New.  Use it if .plt loadable.
+	* elfxx-mips.h (_bfd_mips_elf_get_sec_type_attr): Declare.
+	(_bfd_mips_elf_special_sections, elf_backend_special_sections): Delete.
+	(elf_backend_get_sec_type_attr): Define.
+	* elfxx-target.h (elf_backend_get_sec_type_attr): Define.
+	(elf_backend_special_sections): Don't define.
+	(elfNN_bed): Update.
+
+2005-07-01  Nick Clifton  <nickc@redhat.com>
+
+	* cpu-d10v.c: Update to ISO C90 style function declarations and
+	fix formatting.
+	* cpu-d30v.c: Likewsie.
+	* cpu-i370.c: Likewsie.
+	* cpu-xstormy16.c: Likewsie.
+	* elf32-arc.c: Likewsie.
+	* elf32-d10v.c: Likewsie.
+	* elf32-d30v.c: Likewsie.
+	* elf32-dlx.c: Likewsie.
+	* elf32-i370.c: Likewsie.
+	* elf32-i960.c: Likewsie.
+	* elf32-ip2k.c: Likewsie.
+	* elf32-m32r.c: Likewsie.
+	* elf32-mcore.c: Likewsie.
+	* elf32-openrisc.c: Likewsie.
+	* elf32-or32.c: Likewsie.
+	* elf32-pj.c: Likewsie.
+	* elf32-v850.c: Likewsie.
+	* elf32-xstormy16.c: Likewsie.
+
+2005-07-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-alpha.c (elf64_alpha_create_got_section): Always create
+	a new .got section.
+	(elf64_alpha_create_dynamic_sections): Always make new sections
+	by using bfd_make_section_anyway_with_flags.  Check that .got not
+	already created.
+	(elf64_alpha_check_relocs): Delete "got_created".  Use tdata->gotobj
+	instead.
+
+2005-06-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Ignore dynamic
+	_SDA_BASE_ and _SDA2_BASE_ symbols.
+	* elflink.c (_bfd_elf_provide_symbol): Correct comment.  Define
+	sym if not def_regular.
+	(_bfd_elf_provide_section_bound_symbols): Similarly.
+
+2005-06-30  Ben Elliston  <bje@gnu.org>
+
+	* config.bfd: Mark as obsolete:
+	    m68*-apollo-*
+	    m68*-apple-aux*
+	    m68*-bull-sysv*
+
+2005-06-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (_bfd_elf_gc_mark): Mark sections referenced by
+	.eh_frame specially..
+	(bfd_elf_gc_sections): ..rather than totally ignoring .eh_frame.
+	Don't recheck sections we have already marked.
+	(elf_gc_sweep): Keep non-code sections referenced from .eh_frame.
+	* section.c (struct bfd_section): Add gc_mark_from_eh.
+	(STD_SECTION): Adjust.
+	* ecoff.c (bfd_debug_section): Adjust.
+	* bfd-in2.h: Regenerate.
+
+2005-06-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_gc_sweep): Do not refcount on sections that have
+	not been processed by check_relocs.
+
+2005-06-29  Paul Brook  <paul@codesourcery.com>
+
+	* bfd-in.h (_bfd_elf_provide_symbol): Update prototype.
+	* bfd-in2.h: Regenerate.
+	* elf32-ppc.c (ppc_elf_set_sdata_syms): Make sdata symbols section
+	relative.
+	* elflink.c (bfd_elf_set_symbol): Add section argument.
+	(_bfd_elf_provide_symbol): Ditto.
+	(_bfd_elf_provide_section_bound_symbols): Pass NULL section argument.
+
+2005-06-27  Carlos O'Donell <carlos@systemhalted.org>
+
+	* elf32-hppa.c (struct elf32_hppa_stub_hash_entry):
+	Use bh_root, and hh.
+	(struct elf32_hppa_link_hash_entry): Use eh, and hsh_cache.
+	(struct elf32_hppa_dyn_reloc_entry): Use hdh_next.
+	(struct elf32_hppa_link_hash_table): Use etab and bstab.
+	(stub_hash_newfunc): Use hh.
+	(hppa_link_hash_newfunc): Use hsh_cache.
+	(elf32_hppa_link_hash_table_create): Use etab, and bstab.
+	(elf32_hppa_link_hash_table_free): Use bstab.
+	(hppa_stub_name): Use eh.
+	(hppa_get_stub_entry): Use hh, hsh_entry, and hsh_cache.
+	(hppa_add_stub): Use bstab.
+	(hppa_type_of_stub): Use eh.
+	(hppa_build_one_stub): Use hh and bh_root.
+	(elf32_hppa_copy_indirect_symbol): Use hdh_next.
+	(elf32_hppa_check_relocs): Use eh, etab, and hdh_next.
+	(elf32_hppa_gc_sweep_hook): Use hdh_next.
+	(elf32_hppa_adjust_dynamic_symbol): Use hdh_next, and etab.
+	(allocate_plt_static): Use etab.
+	(allocate_dynrelocs): Use etab, and hdh_next.
+	(readonly_dynrelocs): Use hdh_next.
+	(elf32_hppa_size_dynamic_sections): Use etab, and hdh_next.
+	(get_local_syms): Use eh, bstab, and hh.
+	(elf32_hppa_size_stubs): Use eh, bstab, and hh.
+	(elf32_hppa_set_gp): Use etab.
+	(elf32_hppa_build_stubs): Use bstab.
+	(final_link_relocate): Use eh, bh_root.
+	(elf32_hppa_relocate_section): Use elf, etab.
+	(elf32_hppa_finish_dynamic_sections): Use etab.
+
+2005-06-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_hpux_backend_symbol_processing): Remove
+	the extra `;'.
+
+2005-06-21  Carlos O'Donell <carlos@systemhalted.org>
+
+	* elf32-hppa.c (hppa_elf_hash_entry): Define.
+	(hppa_stub_hash_entry): Define.
+	(stub_hash_newfunc): Rename variables.
+	(hppa_link_hash_newfunc): Likewise.
+	(elf32_hppa_link_hash_table_free): Likewise.
+	(hppa_stub_name): Likewise.
+	(hppa_get_stub_entry): Likewise.
+	(hppa_add_stub): Likewise.
+	(hppa_type_of_stub): Likewise.
+	(hppa_build_one_stub): Likewise.
+	(hppa_size_one_stub): Likewise.
+	(elf32_hppa_create_dynamic_sections): Likewise.
+	(elf32_hppa_copy_indirect_symbol): Likewise.
+	(elf32_hppa_check_relocs): Likewise.
+	(elf32_hppa_gc_mark_hook): Likewise.
+	(elf32_hppa_gc_sweep_hook): Likewise.
+	(elf32_hppa_grok_psinfo): Likewise.
+	(elf32_hppa_hide_symbol): Likewise.
+	(elf32_hppa_adjust_dynamic_symbol): Likewise.
+	(allocate_dynrelocs): Likewise.
+	(clobber_millicode_symbols): Likewise.
+	(readonly_dynrelocs): Likewise.
+	(elf32_hppa_size_dynamic_sections): Likewise.
+	(get_local_syms): Likewise.
+	(elf32_hppa_size_stubs): Likewise.
+	(hppa_record_segment_addr): Likewise.
+	(final_link_relocate): Likewise.
+	(elf32_hppa_relocate_section): Likewise.
+	(elf32_hppa_finish_dynamic_symbol): Likewise.
+
+2005-06-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 1025
+	* elf-m10300.c (mn10300_elf_check_relocs): Handle indirect
+	symbol.
+	* elf32-arm.c (elf32_arm_check_relocs): Likewise.
+	* elf32-avr.c (elf32_avr_check_relocs): Likewise.
+	* elf32-cris.c (cris_elf_check_relocs): Likewise.
+	* elf32-d10v.c (elf32_d10v_check_relocs): Likewise.
+	* elf32-dlx.c (elf32_dlx_check_relocs): Likewise.
+	* elf32-fr30.c (fr30_elf_check_relocs): Likewise.
+	* elf32-frv.c (elf32_frv_check_relocs): Likewise.
+	* elf32-i370.c (i370_elf_check_relocs): Likewise.
+	* elf32-iq2000.c (iq2000_elf_check_relocs): Likewise.
+	* elf32-m32r.c (m32r_elf_check_relocs): Likewise.
+	* elf32-m68hc1x.c (elf32_m68hc11_check_relocs): Likewise.
+	* elf32-m68k.c (elf_m68k_check_relocs): Likewise.
+	* elf32-mcore.c (mcore_elf_check_relocs): Likewise.
+	* elf32-ms1.c (ms1_elf_check_relocs): Likewise.
+	* elf32-msp430.c (elf32_msp430_check_relocs): Likewise.
+	* elf32-openrisc.c (openrisc_elf_check_relocs): Likewise.
+	* elf32-ppc.c (ppc_elf_check_relocs): Likewise.
+	* elf32-s390.c (elf_s390_check_relocs): Likewise.
+	* elf32-sh.c (sh_elf_check_relocs): Likewise.
+	* elf32-v850.c (v850_elf_check_relocs): Likewise.
+	* elf32-vax.c (elf_vax_check_relocs): Likewise.
+	* elf64-mmix.c (mmix_elf_check_relocs): Likewise.
+	* elf64-ppc.c (ppc64_elf_check_relocs): Likewise.
+	* elf64-s390.c (elf_s390_check_relocs): Likewise.
+	* elf64-sh64.c (sh_elf64_check_relocs): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_check_relocs): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_check_relocs): Likewise.
+
+2005-06-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 1022
+	* elf32-hppa.c (elf32_hppa_check_relocs): Handle indirect
+	symbol.
+
+2005-06-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 1025
+	* elf32-i386.c (elf_i386_check_relocs): Handle indirect symbol.
+	* elf64-x86-64.c (elf64_x86_64_check_relocs): Likewise.
+
+2005-06-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* reloc.c: Add BFD_RELOC_X86_64_GOTOFF64 and
+	BFD_RELOC_X86_64_GOTPC32.
+	* bfd-in2.h: Regenerated.
+
+2005-06-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf.c (bfd_section_from_shdr): Kill bogus warning.
+
+	* elf.c (bfd_section_from_shdr): Fail if sh_entsize is bogus for
+	symbol, relocation, group or versym sections.
+
+	* coffcode.h (coff_slurp_reloc_table): Don't crash if native_relocs
+	is NULL.
+	* peXXigen.c (pe_print_idata): Don't crash if dll_name or start_address
+	doesn't point into the section.
+
+2005-06-17  Jan Beulich  <jbeulich@novell.com>
+
+	* bfd-in2.h (elf_x86_64_reloc_type): Add BFD_RELOC_X86_64_GOTOFF64
+	and BFD_RELOC_X86_64_GOTPC32.
+	* libbfd.h (bfd_reloc_code_real_names): Likewise.
+	* elf64-x86-64.c (x86_64_elf_howto_table): Add entries for
+	R_X86_64_PC64, R_X86_64_GOTOFF64, and R_X86_64_GOTPC32.
+	(x86_64_reloc_map): Add entries for R_X86_64_PC64, R_X86_64_GOTOFF64,
+	and R_X86_64_GOTPC32.
+	(elf64_x86_64_info_to_howto): Adjust bounding relocation type.
+	(elf64_x86_64_check_relocs): Also handle R_X86_64_PC64,
+	R_X86_64_GOTOFF64, and R_X86_64_GOTPC32.
+	(elf64_x86_64_relocate_section): Likewise.
+	(elf64_x86_64_gc_sweep_hook): Also handle R_X86_64_PC64.
+
+2005-06-15  Mark Kettenis  <kettenis@gnu.org>
+
+	* archive.c: Include "libiberty.h".
+
+2005-06-15  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-v850.c (ELF_MACHINE_ALT2): Define so that binaries
+	produced by the GreenHills toolchain can be assimilated.
+
+2005-06-14  Steve Ellcey  <sje@cup.hp.com>
+
+	* som.c (som_find_inliner_info): New.
+
+2005-06-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (_bfd_elf_merge_symbol): Fix a typo in comment.
+
+2005-06-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf.c (bfd_section_from_shdr): Fail if name is NULL.
+	Prevent endless recursion on broken objects.
+
+	* archive.c (do_slurp_coff_armap): Check for overflows.
+
+2005-06-10  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elfcode.h (elf_write_relocs): Do nothing if there are no
+	relocations.
+
+2005-06-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* dwarf2.c (decode_line_info): Revert last change.  Instead set
+	initial low_pc to -1 to avoid need to test whether loc_pc has
+	been set.
+
+2005-06-09  Christopher Faylor  <cgf@timesys.com>
+
+	* coffcode.h (sec_to_styp_flags): Set appropriate section flags when
+	either SEC_ALLOC OR SEC_LOAD.
+
+2005-06-09  Christopher Faylor  <cgf@timesys.com>
+
+	* coffcode.h (sec_to_styp_flags): Remove read/write flags from noload
+	section header.  Do not add STYP_NOLOAD since it does not appear to be
+	a valid PE flag.
+
+2005-06-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 1000
+	* dwarf2.c (lookup_address_in_line_info_table): Restore code
+	handling NULL function info, removed with 2005-04-03 change.
+
+2005-06-08  Mark Mitchell  <mark@codesourcery.com>
+
+	* opncls.c (bfd_fopen): Mark returned BFD as cacheable if FD == -1.
+
+2005-06-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_mark_used_section): Delete.
+	(bfd_elf_gc_sections): Call bfd_generic_gc_sections.
+	* reloc.c (bfd_mark_used_section): New function.
+	(bfd_generic_gc_sections): Call bfd_mark_used_section.
+
+2005-06-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* opncls.c (bfd_fopen): Don't set bfd_error unconditionally.
+	(bfd_fdopenr): Same.
+
+2005-06-07  Mark Mitchell  <mark@codesourcery.com>
+
+	* opncls.c (bfd_fdopenr): Add missing break statements.
+
+2005-06-07  Mark Mitchell  <mark@codesourcery.com>
+
+	* opncls.c (bfd_fopen): New API.
+	(bfd_openr): Use it.
+	(bfd_fdopenr): Likewise.
+	* bfd-in2.h: Regenerated.
+
+2005-06-07  Aldy Hernandez  <aldyh@redhat.com>
+	    Michael Snyder  <msnyder@redhat.com>
+	    Stan Cox  <scox@redhat.com>
+
+	* Makefile.am (ALL_MACHINES): Add ms1 support.
+	(ALL_MACHINES_CFILES): Same.
+	(BFD32_BACKENDS): Same.
+	(BFD32_BACKENDS_CFILES): Same.
+
+	* Makefile.in: Regenerate.
+
+	* archures.c (bfd_architecture): Add ms1 entries.
+	Externalize bfd_ms1_arch.
+	(bfd_archures_list): Add bfd_ms1_arch.
+
+	* bfd-in2.h: Regenerate.
+
+	* cpu-ms1.c: New file.
+
+	* elf32-ms1.c: New file.
+
+	* targets.c: Define extern of bfd_elf32_ms1_vec.
+	Add bfd_elf32_ms1_vec to _bfd_target_vector.
+
+	* configure.in: Add bfd_elf32_ms1_vec case.
+
+	* configure: Regenerate.
+
+	* config.bfd: Add ms1-*-elf to table.
+
+2005-06-07  Zack Weinberg  <zack@codesourcery.com>
+
+	* coff-i386.c: Change md_apply_fix3 to md_apply_fix in comment.
+
+2005-06-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* coff-rs6000.c (rs6000coff_vec, pmac_xcoff_vec): Init _bfd_find_line.
+	* coff64-rs6000.c (rs6000coff64_vec, aix5coff64_vec): Likewise.
+
+2005-06-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 990
+	* bfd.c (bfd_find_line): New.
+
+	* dwarf2.c (comp_unit): Add variable_table.
+	(funcinfo): Add file, line, and sec.
+	(varinfo): New.
+	(lookup_symbol_in_function_table): New.
+	(lookup_symbol_in_variable_table): New.
+	(scan_unit_for_functions): Renamed to ...
+	(scan_unit_for_symbols): This. Handle DW_TAG_entry_point and
+	DW_TAG_variable.
+	(comp_unit_find_nearest_line): Updated.
+	(comp_unit_find_line): New.
+	(_bfd_dwarf2_find_line): New.
+
+	* elf-bfd.h (_bfd_elf_find_line): New.
+	(_bfd_generic_find_line): New. Defined.
+
+	* elf.c (_bfd_elf_find_line): New.
+
+	* libbfd-in.h (_bfd_dwarf2_find_line): New.
+	(_bfd_generic_find_line): New.
+
+	* bfd-in2.h: Regenerated.
+	* libbfd.h: Likewise.
+
+	* libbfd.c (_bfd_generic_find_line): New.
+
+	* targets.c (BFD_JUMP_TABLE_SYMBOLS): Initialize _bfd_find_line
+	with _bfd_generic_find_line.
+	(bfd_target): Add _bfd_find_line.
+
+2005-06-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* dwarf2.c (decode_line_info): Properly set low_pc.
+
+2005-06-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-pcc.c (ppc64_elf_gc_mark_hook): For the local sym in .opd
+	case, include addend when indexing .opd section map.
+	(ppc64_elf_edit_opd): Add no_opd_opt param.  Do nothing besides
+	clear opd_adjust array if no_opd_opt set.  Tidy code.
+	Ignore zero size .opd.  Check bfd_alloc return value.
+	(ppc_stub_name): Return immediately on bfd_malloc fail.
+	* elf64-ppc.h (ppc64_elf_edit_opd): Update prototype.
+
+2005-06-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* dwarf2.c (comp_unit): Fix a typo in comment.
+
+2005-06-03  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
+
+	* elf32-vax.c (rtype_to_howto): Remove PARAMS.
+	(reloc_type_lookup): Dito.
+	(elf_vax_discard_copies): Dito.
+	(elf_vax_instantiate_got_entries): Dito.
+	(elf_vax_link_hash_traverse): Dito.
+	(elf_vax_link_hash_newfunc): Dito.
+	(elf_vax_link_hash_table_create): Dito.
+	(elf32_vax_set_private_flags): Dito.
+	(elf32_vax_merge_private_bfd_data): Dito.
+	(elf32_vax_print_private_bfd_data): Dito.
+	(elf_vax_check_relocs): Dito.
+	(elf_vax_gc_mark_hook): Dito.
+	(elf_vax_gc_sweep_hook): Dito.
+	(elf_vax_size_dynamic_sections): Dito.
+	(elf_vax_discard_copies): Dito.
+	(elf_vax_instantiate_got_entries): Dito.
+	(elf_vax_relocate_section): Dito.
+	(elf_vax_finish_dynamic_symbol): Dito.
+	(elf_vax_finish_dynamic_sections): Dito.
+	(elf_vax_hash_table): Break-up of line isn't needed.
+	(elf_vax_check_relocs): Remove leading whitespace
+	(elf_vax_relocate_section): Remove redundant whitespace
+	(elf_vax_link_hash_newfunc): Don't cast NULL.
+	(elf_vax_link_hash_table_create): Dito.
+	* cpu-vax.c (bfd_vax_arch) Remove a trailing space.
+
+2005-06-03  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 568
+	* configure.in: Bump version
+	* configure: Regenerate.
+	* elflink.c (elf_link_input_bfd): Use einfo linker callback to print
+	discarded section sym refs and kill linker output.
+	* simple.c (simple_dummy_einfo): New function.
+	(bfd_simple_get_relocated_section_contents): Init callbacks.einfo.
+
+	* elf32-i386.c (elf_i386_relocate_section): Handle zero symndx
+	for all reloc types.
+
+2005-06-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (add_symbol_adjust): Set sym visibility to most
+	restrictive of func code and func descr for undefined syms as well
+	as defined.
+
+2005-05-31  Jim Blandy  <jimb@redhat.com>
+
+	* Makefile.am: Regenerate dependencies with 'make dep-am'.
+	* Makefile.in: Regenerate.
+
+2005-05-31  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (ALPHA_ELF_LINK_HASH_LU_JSRDIRECT): New.
+	(ALPHA_ELF_LINK_HASH_TLS_IE): Renumber to 0x80.
+	(ALPHA_ELF_LINK_HASH_LU_PLT): Rename from ALPHA_ELF_LINK_HASH_LU_FUNC.
+	(elf64_alpha_want_plt): Update to match.
+	(elf64_alpha_check_relocs): Collect JSRDIRECT in gotent_flags.
+	(elf64_alpha_relax_with_lituse): Likewise.  Handle JSRDIRECT.
+
+2005-05-31  Zack Weinberg  <zack@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_reloc_type_lookup)
+	(elf32_arm_nabi_grok_prstatus, elf32_arm_nabi_grok_psinfo):
+	Use ISO C90 function declaration style.
+
+2005-05-31  James E Wilson  <wilson@specifixinc.com>
+
+	* elfcode.h (NAME(bfd_elf,bfd_from_remote_memory)): Check for program
+	header PF_R flag on PT_LOAD segments.
+
+2005-05-30  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_relocate_section): Use dtp_base for
+	the zero index relocs produced by elf64_alpha_relax_tls_get_addr.
+
+2005-05-29  Richard Henderson  <rth@redhat.com>
+
+	* configure.in (--enable-secureplt): New.
+	* elf64-alpha.c (INSN_LDA, INSN_LDAH, INSN_LDQ, INSN_BR): New.
+	(INSN_SUBQ, INSN_S4SUBQ, INSN_JMP): New.
+	(INSN_A, INSN_AB, INSN_ABC, INSN_ABO, INSN_AD): New.
+	(elf64_alpha_use_secureplt): New.
+	(OLD_PLT_HEADER_SIZE, OLD_PLT_ENTRY_SIZE): New.
+	(NEW_PLT_HEADER_SIZE, NEW_PLT_ENTRY_SIZE): New.
+	(PLT_HEADER_SIZE, PLT_ENTRY_SIZE): Conditionalize on secureplt.
+	(ALPHA_ELF_LINK_HASH_PLT_LOC): Remove.
+	(struct alpha_elf_link_hash_entry): Add plt_offset.
+	(PLT_HEADER_WORD1, PLT_HEADER_WORD2, PLT_HEADER_WORD3): Remove.
+	(PLT_HEADER_WORD4, PLT_ENTRY_WORD1, PLT_ENTRY_WORD2): Remove.
+	(PLT_ENTRY_WORD3): Remove.
+	(elf64_alpha_create_dynamic_sections): If secureplt, set SEC_READONLY
+	on .plt and create .got.plt.
+	(elf64_alpha_output_extsym): Remove .plt frobbing for symbol values.
+	(get_got_entry): Initialize plt_offset.
+	(elf64_alpha_want_plt): New.
+	(elf64_alpha_check_relocs): Use it.
+	(elf64_alpha_adjust_dynamic_symbol): Likewise.  Don't allocate
+	plt entries here.
+	(elf64_alpha_calc_got_offsets_for_symbol): Don't report internal
+	error as user error.
+	(elf64_alpha_size_plt_section_1): Allocate one plt entry per
+	got subsection.
+	(elf64_alpha_size_plt_section): Size .got.plt section.
+	(elf64_alpha_size_rela_got_1): Don't allocate relocations if
+	plt entries used.
+	(elf64_alpha_size_dynamic_sections): Call elf64_alpha_size_plt_section.
+	Add PLTRO DYNAMIC entry.
+	(elf64_alpha_finish_dynamic_symbol): Generate secureplt format.
+	(elf64_alpha_finish_dynamic_sections): Likewise.
+
+2005-05-28  David Daney  <ddaney@avtrex.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_finish_dynamic_sections):  Move
+	calculation of DT_RELSZ to occur after all dynamic relocations
+	are created.
+
+2005-05-28  Eli Zaretskii  <eliz@gnu.org>
+
+	* configure.in: Add snprintf and vsnprintf to AC_CHECK_DECLS.
+	* config.in, configure: Regenerate.
+
+2005-05-26  Mark Kettenis  <kettenis@gnu.org>
+	    Maciej W. Rozycki  <macro@linux-mips.org>
+
+	* elfxx-mips.c (_bfd_mips_elf_section_processing): Warn and
+	stop processing of options if one of invalid size is
+	encountered.
+	(_bfd_mips_elf_section_from_shdr): Likewise.
+	(_bfd_mips_elf_fake_sections): Reset the type of empty special
+	sections.
+
+2005-05-26  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (struct alpha_elf_link_hash_entry): Remove
+	plt_old_section, plt_old_value.
+	(elf64_alpha_adjust_dynamic_symbol): Don't set it.
+	(elf64_alpha_size_plt_section_1): Don't use it.
+
+2005-05-26  Jakub Jelinek  <jakub@redhat.com>
+
+	* elfcode.h (elf_object_p): Fail if e_shoff != 0, e_shnum == 0 and
+	first shdr has sh_size == 0.  Fail if e_shnum is large to cause
+	arithmetic overflow when allocating the i_shdr array.
+	Sanity check sh_link and sh_info fields.  Fix e_shstrndx sanity check.
+
+2005-05-25  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c: Update all function definitions to ISO C.  Remove
+	all function prototypes; rearrange functions into def-use order.
+
+2005-05-25  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_merge_gots): Fix gotent iteration
+	in the presence of deleting elements.
+	(elf64_alpha_size_got_sections): Zero dead got section size.
+
+2005-05-23  Fred Fish  <fnf@specifixinc.com>
+
+	* dwarf2.c (struct dwarf2_debug): Add inliner_chain member.
+	(struct funcinfo): Add caller_func, caller_file, caller_line.
+	tag, and nesting_level members.
+	(lookup_address_in_function_table): Change first passed parameter
+	from "struct funcinfo *" to "struct comp_unit *".
+	(lookup_address_in_function_table): Dereference unit to find function
+	table.
+	(lookup_address_in_function_table): Traverse the function list to
+	create a chain of inlined functions back to the first non inlined
+	function.
+	(scan_unit_for_functions): Remember tag and nesting level.  Handle
+	DW_AT_call_file and DW_AT_call_line.
+	(comp_unit_find_nearest_line): Adjust lookup_address_in_function_table
+	call to pass unit pointer instead of function table pointer.  For
+	inlined functions, save pointer to the inliner chain.
+	(_bfd_dwarf2_find_nearest_line): Initialize inliner_chain to NULL.
+	(_bfd_dwarf2_find_inliner_info): New function that returns information
+	from the inliner chain after a call to bfd_find_nearest_line.
+
+	* bfd.c (bfd_find_inliner_info): Define using BFD_SEND.
+	* targets.c (BFD_JUMP_TABLE_SYMBOLS): Add entry for
+	NAME##_find_inliner_info.
+	(bfd_target): Add _bfd_find_inliner_info.
+	* bfd-in2.h: Regenerate.
+
+	* libbfd-in.h (_bfd_nosymbols_find_inliner_info): Define as
+	macro that always returns bfd_false.
+	(_bfd_dwarf2_find_inliner_info): Declare.
+	* libbfd.h: Regenerate.
+
+	* elf32-arm.c (elf32_arm_find_inliner_info): New function
+	that calls _bfd_dwarf2_find_inliner_info.
+	(bfd_elf32_find_inliner_info): Define to elf32_arm_find_inliner_info.
+
+	* elfxx-mips.c (_bfd_mips_elf_find_inliner_info): New function
+	that calls _bfd_dwarf2_find_inliner_info.
+	* elfxx-mips.h (_bfd_mips_elf_find_inliner_info): Declare.
+	* elfn32-mips.c (bfd_elf32_find_inliner_info): Define to
+	_bfd_mips_elf_find_inliner_info.
+	* elf64-mips.c (bfd_elf64_find_inliner_info): Ditto.
+	* elf32-mips.c (bfd_elf32_find_inliner_info): Ditto.
+
+	* elf.c (_bfd_elf_find_inliner_info): New function that calls
+	_bfd_dwarf2_find_inliner_info.
+	* elf-bfd.h (_bfd_elf_find_inliner_info): Declare.
+	* elfxx-target.h (bfd_elfNN_find_inliner_info): Define to
+	_bfd_elf_find_inliner_info.
+
+	* coffgen.c (coff_find_inliner_info): New function that
+	calls _bfd_dwarf2_find_inliner_info.
+	* libcoff-in.h (coff_find_inliner_info): Declare.
+	* libcoff.h: Regenerate.
+	* coff-rs6000.c (rs6000coff_vec): Add coff_find_inliner_info.
+	(pmac_xcoff_vec) Ditto.
+	* coff64-rs6000.c (rs6000coff64_vec): Ditto.
+	(aix5coff64_vec): Ditto.
+
+	* aout-target.h (MY_find_inliner_info): Define as
+	_bfd_nosymbols_find_inliner_info.
+	* aout-tic30.c (MY_find_inliner_info): Ditto.
+	* binary.c (binary_find_inliner_info): Ditto.
+	* i386msdos.c (msdos_find_inliner_info): Ditto.
+	* ihex.c (ihex_find_inliner_info): Ditto.
+	* libaout.h (aout_32_find_inliner_info): Ditto.
+	* libecoff.h (_bfd_ecoff_find_inliner_info): Ditto.
+	* mach-o.c (bfd_mach_o_find_inliner_info): Ditto.
+	* mmo.c (mmo_find_inliner_info): Ditto.
+	* nlm-target.h (nlm_find_inliner_info): Ditto.
+	* pef.c (bfd_pef_find_inliner_info): Ditto.
+	* ppcboot.c (ppcboot_find_inliner_info): Ditto.
+	* srec.c (srec_find_inliner_info): Ditto.
+	* tekhex.c (tekhex_find_inliner_info): Ditto.
+	* versados.c (versados_find_inliner_info): Ditto.
+	* xsym.c (bfd_sym_find_inliner_info): Ditto.
+
+	* ieee.c (ieee_find_inliner_info): New function that always
+	returns FALSE.
+	* oasys.c (oasys_find_inliner_info): Ditto.
+	* vms.c (vms_find_inliner_info): Ditto.
+
+2005-05-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_check_relocs): For old gcc -fPIC code
+	force old plt layout.
+
+2005-05-22  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_relax_section): Ignore non-allocated
+	sections.
+	(elf64_alpha_check_relocs): Likewise.
+	(elf64_alpha_relocate_section): Don't emit dynamic relocations to
+	non-allocated sections.
+
+2005-05-22  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_relax_with_lituse): Relax jsr to
+	undefweak to use zero register.  Call elf64_alpha_relax_got_load
+	if not all uses removed.
+	(elf64_alpha_relax_got_load): Relax undefweak to lda zero.
+	(elf64_alpha_relax_section): Handle undefweak symbols.
+	(elf64_alpha_calc_dynrel_sizes): Don't add relocs for undefweak.
+	(elf64_alpha_size_rela_got_1): Likewise.
+	(elf64_alpha_relocate_section): Likewise.
+
+2005-05-22  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_relax_section): Only operate
+	on SEC_CODE sections.
+
+2005-05-22  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* som.c (try_prev_fixup): Changed type of subspace_reloc_sizep to
+	unsigned int *.
+	(som_write_space_strings): Change type of tmp_space and p to char *.
+	(som_write_symbol_strings): Likewise.  Also change type of comp to
+	char *comp[4].
+	(som_begin_writing): Change type of strings_size to unsigned int.
+	(som_finish_writing): Likewise.
+	(som_slurp_reloc_table): Change type of external_relocs to unsigned
+	char *.
+	* som.h (struct som_section_data_struct): Change type of reloc_stream
+	field to unsigned char *.
+
+2005-05-20  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Don't eliminate
+	copy relocations for VxWorks.
+
+2005-05-20  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-ppc.c (struct ppc_elf_link_hash_entry): Add new field
+	has_sda_refs.
+	(ppc_elf_copy_indirect_symbol): Copy has_sda_refs.
+	(ppc_elf_check_relocs): Set has_sda_refs.
+	(ppc_elf_adjust_dynamic_symbol): Check has_sda_refs before eliminating
+	copy relocations.  Use has_sda_refs to place variables in .sbss.
+	(ppc_elf_finish_dynamic_symbol): Use has_sda_refs to place variables in
+	.sbss.
+
+2005-05-20  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (bfd_elf_xtensa_reloc): Make sure that
+	xtensa_default_isa is initialized.
+
+2005-05-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (allocate_dynrelocs): Correct plt offset assigned
+	for second and subsequent list entries.  Only allocate multiple
+	glink stubs when shared or pie.
+	(ppc_elf_finish_dynamic_symbol): Break out early when only one
+	glink stub is needed.
+
+2005-05-19  Zack Weinberg  <zack@codesourcery.com>
+
+	* Makefile.am: Have 'all' depend on 'info'.
+	* Makefile.in: Regenerate.
+
+2005-05-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_link_hash_table): Delete init_refcount and
+	init_offset.  Add init_got_refcount, init_plt_refcount,
+	init_got_offset and init_plt_offset.
+	* elf.c (_bfd_elf_link_hash_newfunc): Adjust for above change.
+	(_bfd_elf_link_hash_hide_symbol): Likewise.
+	(_bfd_elf_link_hash_table_init): Likewise.
+	* elf32-hppa.c (elf32_hppa_hide_symbol): Likewise.
+	* elf64-ppc.c (ppc64_elf_link_hash_table_create): Likewise.
+	* elflink.c (_bfd_elf_adjust_dynamic_symbol): Likewise.
+	(bfd_elf_size_dynamic_sections): Likewise.
+	* elf32-ppc.c (GLINK_PLTRESOLVE): Now 16 insns.
+	(LWZU_0_X_12, LWZ_0_4_30, LWZ_0_X_12, LWZ_11_X_11, LWZ_11_X_30,
+	LWZ_12_4_12, LWZ_12_8_30, LWZ_12_X_12, SUB_11_11_30): Delete.
+	(ADDIS_12_12, BCL_20_31, LWZU_0_12, LWZ_0_12, LWZ_11_11, LWZ_11_30,
+	LWZ_12_12, MFLR_0, MFLR_12, MTLR_0, SUB_11_11_12): Define.
+	(struct plt_entry): New.
+	(ppc_elf_link_hash_table_create): Set new init_plt fields.
+	(ppc_elf_copy_indirect_symbol): Handle merge of plt plist.  Don't
+	use _bfd_elf_link_hash_copy_indirect.
+	(update_plt_info, find_plt_ent): New functions.
+	(ppc_elf_check_relocs): Handle R_PPC_PLTREL24 with non-zero addend
+	and adjust for use of plt list rather than refcount.
+	(ppc_elf_gc_sweep_hook): Likewise.
+	(ppc_elf_tls_optimize): Likewise.
+	(ppc_elf_adjust_dynamic_symbol): Likewise.
+	(allocate_dynrelocs): Likewise.
+	(ppc_elf_relax_section): Likewise.
+	(ppc_elf_relocate_section): Likewise.  Adjust R_PPC_PLTREL24 addends
+	when performing a relocatable link.
+	(ppc_elf_finish_dynamic_symbol): Likewise.  Write .glink stubs here..
+	(ppc_elf_finish_dynamic_sections): ..rather than here.  Use new
+	pic resolver stub.
+
+2005-05-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (assign_file_positions_for_segments): Use maximum of
+	maxpagesize and section alignment when adjusting initial
+	segment offset and section offsets.
+
+2005-05-18  Zack Weinberg  <zack@codesourcery.com>
+
+	* elf32-arm.c: Make all #ifndef OLD_ARM_ABI blocks
+	unconditional.
+
+2005-05-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (group_signature): Undo the last change. Check if the
+	symbol table section is correct.
+
+2005-05-17  Zack Weinberg  <zack@codesourcery.com>
+
+	* elf32-arm.c: Wherever possible, use official reloc names
+	from AAELF.
+	(elf32_arm_howto_table, elf32_arm_tls_gd32_howto)
+	(elf32_arm_tls_ldo32_howto, elf32_arm_tls_ldm32_howto)
+	(elf32_arm_tls_le32_howto, elf32_arm_tls_ie32_howto)
+	(elf32_arm_vtinherit_howto, elf32_arm_vtentry_howto)
+	(elf32_arm_pc11_howto, elf32_arm_thm_pc9_howto, elf32_arm_got_prel)
+	(elf32_arm_r_howto): Replace with elf32_arm_howto_table_1,
+	elf32_arm_howto_table_2, and elf32_arm_howto_table_3.
+	Add many new relocations from AAELF.
+	(elf32_arm_howto_from_type): Update to match.
+	(elf32_arm_reloc_map): Add entries for R_ARM_THM_JUMP24,
+	R_ARM_THM_JUMP11, R_ARM_THM_JUMP19, R_ARM_THM_JUMP8,
+	R_ARM_THM_JUMP6, R_ARM_GNU_VTINHERIT, and R_ARM_GNU_VTENTRY.
+	(elf32_arm_reloc_type_lookup): Use elf32_arm_howto_from_type.
+	(elf32_arm_final_link_relocate): Add support for
+	R_ARM_THM_JUMP24, R_ARM_THM_JUMP19, R_ARM_THM_JUMP6.  Remove
+	case entries redundant with default.
+
+	* reloc.c: Reorganize ARM relocations.  Add Thumb
+	assembler-internal relocations BFD_RELOC_ARM_T32_OFFSET_U8,
+	BFD_RELOC_ARM_T32_OFFSET_IMM, BFD_RELOC_ARM_T32_IMMEDIATE.
+	Add visible relocations BFD_RELOC_THUMB_PCREL_BRANCH7,
+	BFD_RELOC_THUMB_BRANCH20, BFD_RELOC_THUMB_BRANCH25.
+	Delete unused relocations BFD_RELOC_ARM_GOT12, BFD_RELOC_ARM_COPY.
+	* bfd-in2.h, libbfd.h: Regenerate.
+
+2005-05-17  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf.c (_bfd_elf_write_object_contents): Check for non-NULL
+	elf_shstrtab.
+	* format.c (bfd_check_format_matches): Set output_has_begun
+	for both_direction.
+	* section.c (bfd_set_section_contents): Use bfd_write_p.  Remove
+	special case for both_direction.
+
+2005-05-17  Nick Clifton  <nickc@redhat.com>
+
+	* elf.c (group_signature): Check for a group section which is
+	actually a (corrupt) symbol table section in disguise and prevent
+	an infinite loop from occurring.
+
+2005-05-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relax_brl): Undo the change made on
+	2005-02-16.
+
+2005-05-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relax_br): Keep the original
+	predicate on slot 0 only if slot 0 isn't br.
+
+2005-05-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 797
+	* elf32-i386.c (elf_i386_size_dynamic_sections): Also remove
+	empty sdynbss section.
+	* elf64-x86-64.c (elf64_x86_64_size_dynamic_sections): Likewise.
+
+2005-05-17  Tavis Ormandy <taviso@gentoo.org>
+
+	* elf.c (bfd_section_from_shdr): Add sanity check when parsing
+	dynamic sections.
+
+2005-05-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (LIS_11. LIS_12): Define.
+	(LWZU_0_X_12, LWZ_0_X_12, LWZ_12_4_12, LWZ_12_X_12): Define.
+	(ppc_elf_finish_dynamic_sections): Provide non-pic plt call stub
+	for --data-plt when building non-pie executables.
+
+2005-05-17  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Gracefully handle
+	the situation where a symbols's section is not known but a section
+	relative R_ARM_RELATIVE reloc has to be generated for the Symbian
+	OS.
+
+	* elf32-v850.c (v850_elf_relocate_section): Move code to test for
+	the presence of a symbol table to just before the symbol table is
+	actually used.
+
+2005-05-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 834
+	* elfxx-ia64.c (elfNN_ia64_relax_br): New.
+	(elfNN_ia64_relax_section): Use it.
+
+2005-05-14  Mark Kettenis  <kettenis@gnu.org>
+
+	* elflink.c (bfd_elf_size_dynamic_sections): Use lbasename instead
+	of basename.
+
+2005-05-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Set DT_PPC_GOT,
+	not DT_PPC_GLINK.
+	(ppc_elf_finish_dynamic_sections): Likewise.
+
+2005-05-13  Fred Fish  <fnf@specifixinc.com>
+
+	* libbfd-in.h: Fix a comment typo, 'neaderst' -> 'nearest'
+	* libbfd.h: Rebuilt.
+
+2005-05-13  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (xtensa_get_property_section_name): Add missing
+	periods in linkonce_kind values.
+
+2005-05-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_relocate_section): Allow R_386_GOTOFF
+	against protected function when building executable.
+
+2005-05-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (LWZU_0_X_11): Delete.
+	(B, LWZ_11_X_11, LWZ_11_X_30, MTCTR_11): Define.
+	(ppc_elf_select_plt_layout): Set .got flags too.  Formatting.
+	(ppc_elf_size_dynamic_sections): Allocate space for .glink branch
+	table.
+	(ppc_elf_finish_dynamic_symbol): Point .plt entries into the branch
+	table.
+	(ppc_elf_finish_dynamic_sections): Adjust DT_PPC_GLINK value.
+	Generate .glink branch table and updated stubs.
+
+2005-05-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* reloc.c (BFD_RELOC_HI16_PCREL): Define.
+	(BFD_RELOC_HI16_S_PCREL, BFD_RELOC_LO16_PCREL): Define.
+	* elf32-ppc.c (GLINK_PLTRESOLVE, GLINK_ENTRY_SIZE): Define.
+	(CROR_151515, CROR_313131): Delete.
+	(ADDIS_11_11, ADDI_11_11, SUB_11_11_30, ADD_0_11_11, ADD_11_0_11,
+	LWZ_0_4_30, MTCTR_0, LWZ_12_8_30, BCTR, ADDIS_11_30,
+	LWZU_0_X_11): Define.
+	(ppc_elf_howto_raw): Add R_PPC_REL16, R_PPC_REL16_LO, R_PPC_REL16_HI
+	and R_PPC_REL16_HA entries.
+	(ppc_elf_reloc_type_lookup): Convert new bfd reloc types.
+	(ppc_elf_addr16_ha_reloc): Also handle R_PPC_REL16_HA.
+	(struct ppc_elf_link_hash_table): Add glink, glink_pltresolve,
+	new_plt, and old_plt.
+	(ppc_elf_create_dynamic_sections): Create .glink section.
+	(ppc_elf_check_relocs): Set new_plt and old_plt.
+	(ppc_elf_select_plt_layout): New function.
+	(ppc_elf_tls_setup): Set plt output section elf type and flags.
+	(allocate_got): Handle differences between old and new got layout.
+	(allocate_dynrelocs): Likewise for plt.
+	(ppc_elf_size_dynamic_sections): Likewise.  Allocate memory for
+	.glink.  Don't allocate memory for old bss .plt.  Emit DT_PPC_GLINK.
+	(ppc_elf_relax_section): Rename ppc_info to htab.  Handle .glink
+	destination of R_PPC_PLTREL24 relocs.
+	(ppc_elf_relocate_section): Handle new relocs and changed destination
+	of R_PPC_PLTREL24.
+	(ppc_elf_finish_dynamic_symbol): Init new style plt and handle
+	differences in layout.
+	(ppc_elf_finish_dynamic_sections): Set DT_PPC_GLINK value.  Don't
+	put a blrl in new got.  Write glink contents.
+	* elf32-ppc.h (ppc_elf_select_plt_layout): Declare.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2005-05-11  Andreas Schwab  <schwab@suse.de>
+
+	* elf32-i386.c (elf_i386_finish_dynamic_sections): Fix signedness
+	warning.
+
+2005-05-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (_bfd_elf_make_section_from_shdr): Only check debug
+	section if SEC_ALLOC isn't set.
+
+2005-05-09  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* configure.in: Replace AC_COMPILE_CHECK_SIZEOF with AC_CHECK_SIZEOF.
+	* acinclude.m4: Don't sinclude accross.m4.
+	* config.in, configure, Makefile.in, doc/Makefile.in: Regenerate.
+
+2005-05-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (struct ppc64_elf_obj_tdata): Add has_dotsym.
+	(ppc64_elf_add_symbol_hook): Set has_dotsym.
+	(ppc64_elf_check_directives): Only process syms when has_dotsym.
+	(func_desc_adjust): Hide fake function descriptors when function
+	code entry is defined.
+	(adjust_opd_syms): Adjust for deleted_section becoming union field.
+
+2005-05-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* elfcode.h (elf_object_p): Add more sanity checks on elf header.
+
+2005-05-08  Dave Korn   <dave.korn@artimi.com>
+
+	* coff-tic80.c:  Undefine _CONST after system headers to prevent
+	clash with tic80-specific definition in include/coff/tic80.h
+
+2005-05-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 939
+	* elflink.c (elf_link_output_extsym): Use output_bfd if
+	h->root.u.def.section is bfd_abs_section_ptr when reporting
+	error.
+
+2005-05-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (elf_backend_data): Update special_sections to
+	array of pointer to bfd_elf_special_section.
+	* elf.c (special_sections): Likewise.
+	* elf32-arm.c (elf32_arm_symbian_special_sections): Likewise.
+	* elf32-m32r.c (m32r_elf_special_sections): Likewise.
+	* elf32-m68hc11.c (elf32_m68hc11_special_sections): Likewise.
+	* elf32-m68hc12.c (elf32_m68hc12_special_sections): Likewise.
+	* elf32-mcore.c (mcore_elf_special_sections): Likewise.
+	* elf32-ppc.c (ppc_elf_special_sections): Likewise.
+	* elf32-sh64.c (sh64_elf_special_sections): Likewise.
+	* elf32-v850.c (v850_elf_special_sections): Likewise.
+	* elf32-xtensa.c (elf_xtensa_special_sections): Likewise.
+	* elf64-alpha.c (elf64_alpha_special_sections): Likewise.
+	* elf64-hppa.c (elf64_hppa_special_sections): Likewise.
+	* elf64-ppc.c (ppc64_elf_special_sections): Likewise.
+	* elf64-sh64.c (sh64_elf64_special_sections): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_special_sections): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_special_sections): Likewise.
+	* elfxx-mips.h (_bfd_mips_elf_special_sections): Likewise.
+
+	* elf.c (get_special_section): Updated.
+
+2005-05-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_backend_data): Remove got_symbol_offset.
+	* elfxx-target.h (elf_backend_got_symbol_offset): Delete.
+	* elflink.c (_bfd_elf_create_got_section): Use zero in place of
+	got_symbol_offset.
+	* elf-m10300.c (_bfd_mn10300_elf_create_got_section): Likewise.
+	* elf32-frv.c (_frv_create_got_section): Likewise.
+	* elf32-i370.c (i370_elf_finish_dynamic_sections): Delete ppc code.
+	(elf_backend_got_symbol_offset): Don't define.
+	* elf64-ppc.c (elf_backend_got_symbol_offset): Don't define.
+	* elf32-ppc.c (struct ppc_elf_link_hash_table): Add got_header_size
+	and got_gap.
+	(ppc_elf_create_got): Tidy.
+	(ppc_elf_create_dynamic_sections): Don't set SEC_IN_MEMORY for .plt.
+	(ppc_elf_check_relocs): Reduce string comparisons by using elf.hgot.
+	(ppc_elf_gc_sweep_hook): Likewise.
+	(ppc_elf_relocate_section): Likewise.
+	(ppc_elf_finish_dynamic_symbol): Likewise.
+	(allocate_got): New function.
+	(allocate_dynrelocs): Use allocate_got.
+	(ppc_elf_size_dynamic_sections): Likewise.  Delay tlsld_got allocation
+	so that local got can refcount it.  Set got_header_size.
+	(ppc_elf_relocate_section): Use value of elf.hgot rather than hard-
+	coded 4.
+	(ppc_elf_finish_dynamic_sections): Likewise.
+	(elf_backend_got_symbol_offset): Don't define.
+	(elf_backend_got_header_size): Ditto.
+
+2005-05-05  Steve Ellcey  <sje@cup.hp.com>
+
+	* configure.in (ACX_HEADER_STRING): New.
+	* configure: Regenerate.
+	* config.in: Regenerate.
+	* sysdep.h (STRING_WITH_STRINGS): Use.
+
+2005-05-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (_bfd_elf_close_and_cleanup): Only call
+	_bfd_dwarf2_cleanup_debug_info on bfd_object.
+
+2005-05-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (_bfd_elf_provide_section_bound_symbols): Use
+	"__bss_start" instead of "_edata" as fallback.
+
+2005-05-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfd-in2.h: Regenerated.
+
+2005-05-05  Paul Brook  <paul@codesourcery.com>
+
+	* config.bfd: Use bfd_elf32_i386_vxworks_vec for i?86-*-vxworks.
+	* configure.in: Add bfd_elf32_i386_vxworks_vec. i386 targets need
+	elf-vxworks.lo.
+	* configure: Regenerate.
+	* Makefile.am (BFD32_BACKENDS): Add elf-vxworks.lo.
+	(BFD32_BACKENDS_CFILES): Add elf-vxworks.c.
+	(elf32-i386.lo): Depend on elf-vxworks.h.
+	(elf-vxworks.lo): New rule.
+	* Makefile.in: Regenerate.
+	* elf-bfd.h (elf_backend_data): Update type of
+	elf_backend_emit_relocs.
+	(_bfd_elf_link_output_relocs): Update prototype.
+	* elflink.c (_bfd_elf_link_output_relocs): Always use
+	bed->elf_backend_emit_relocs when outputting relocations.
+	* elfxx-target.h (elf_backend_emit_relocs): Default to
+	_bfd_elf_link_output_relocs.
+	* targets.c (bfd_elf32_i386_vxworks_vec): Declare.
+	(_bfd_target_vector): Add bfd_elf32_i386_vxworks_vec.
+	* elf32-i386.c: Add elf32-i386-vxworks target BFD.
+	(elf_i386_plt0_entry): Remove padding.
+	(elf_i386_pic_plt0_entry): Ditto.
+	(PLTRESOLVE_RELOCS_SHLIB, PLTRESOLVE_RELOCS): Define.
+	(PLT_NON_JUMP_SLOT_RELOCS): Define.
+	(elf_i386_link_hash_table): Add srelplt2, hgot, hplt, is_vxworks and
+	plt0_pad_byte fields.
+	(elf_i386_link_hash_table_create): Zero them.
+	(elf_i386_create_dynamic_sections): Create static relocation section.
+	(allocate_dynrelocs): Allocate space for static PLT relocations.
+	(elf_i386_size_dynamic_sections): Save shortcuts to PLT and GOT
+	symbols.  Give PLT symbols function type.  Don't strip PLT sections
+	if we have exported symbols from them.
+	(elf_i386_finish_dynamic_symbol): Fill in VxWorks PLT static
+	relocation section.  Don't mark _GLOBAL_OFFSET_TABLE_ as absolute on
+	VxWorks.
+	(elf_i386_finish_dynamic_sections): Allow different pad bytes.
+	Add relocation for GOT location.  Fill in PLT static relocations.
+	(elf_i386_vxworks_link_hash_table_create): New function.
+	(elf_i386_vxworks_link_output_symbol_hook): New function.
+	* elf-vxworks.h: New file.
+
+2005-05-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* section.c (bfd_make_section_anyway_with_flags): New.
+	(bfd_make_section_anyway): Call bfd_make_section_anyway_with_flags,
+	(bfd_make_section_with_flags): New.
+	(bfd_make_section): Call bfd_make_section_with_flags.
+
+	* elf-m10300.c (_bfd_mn10300_elf_create_got_section): Call
+	bfd_make_section_with_flags/bfd_make_section_anyway_with_flags
+	instead of bfd_make_section/bfd_make_section and don't call
+	bfd_set_section_flags.
+	(mn10300_elf_check_relocs): Likewise.
+	(_bfd_mn10300_elf_create_dynamic_sections): Likewise.
+	* elf32-arm.c (create_got_section): Likewise.
+	(bfd_elf32_arm_add_glue_sections_to_bfd): Likewise.
+	(elf32_arm_check_relocs): Likewise.
+	* elf32-cris.c (cris_elf_check_relocs): Likewise.
+	* elf32-frv.c (elf32_frv_add_symbol_hook): Likewise.
+	(_frv_create_got_section): Likewise.
+	(elf32_frvfdpic_create_dynamic_sections): Likewise.
+	* elf32-hppa.c (elf32_hppa_create_dynamic_sections): Likewise.
+	(elf32_hppa_check_relocs): Likewise.
+	* elf32-i370.c (i370_elf_create_dynamic_sections): Likewise.
+	(i370_elf_check_relocs): Likewise.
+	* elf32-i386.c (create_got_section): Likewise.
+	(elf_i386_check_relocs): Likewise.
+	* elf32-m32r.c (m32r_elf_add_symbol_hook): Likewise.
+	(create_got_section): Likewise.
+	(m32r_elf_create_dynamic_sections): Likewise.
+	(m32r_elf_check_relocs): Likewise.
+	* elf32-m68k.c (elf_m68k_check_relocs): Likewise.
+	* elf32-ppc.c (ppc_elf_create_got): Likewise.
+	(ppc_elf_create_dynamic_sections): Likewise.
+	(ppc_elf_add_symbol_hook): Likewise.
+	(ppc_elf_check_relocs): Likewise.
+	* elf32-s390.c (create_got_section): Likewise.
+	(elf_s390_check_relocs): Likewise.
+	* elf32-sh.c (create_got_section): Likewise.
+	(sh_elf_create_dynamic_sections): Likewise.
+	(sh_elf_check_relocs): Likewise.
+	* elf32-vax.c (elf_vax_check_relocs): Likewise.
+	* elf32-xstormy16.c (xstormy16_elf_check_relocs): Likewise.
+	* elf32-xtensa.c (elf_xtensa_create_dynamic_sections): Likewise.
+	(add_extra_plt_sections): Likewise.
+	* elf64-alpha.c (elf64_alpha_add_symbol_hook): Likewise.
+	(elf64_alpha_create_got_section): Likewise.
+	(elf64_alpha_create_dynamic_sections): Likewise.
+	(elf64_alpha_check_relocs): Likewise.
+	* elf64-hppa.c (get_reloc_section): Likewise.
+	(get_opd): Likewise.
+	(get_plt): Likewise.
+	(get_dlt): Likewise.
+	(get_stub): Likewise.
+	(elf64_hppa_create_dynamic_sectionso): Likewise.
+	* elf64-mmix.c (mmix_elf_check_common_relocs): Likewise.
+	* elf64-ppc.c (create_linkage_sections): Likewise.
+	(ppc64_elf_check_relocs): Likewise.
+	* elf64-s390.c (create_got_section): Likewise.
+	(elf_s390_check_relocs): Likewise.
+	* elf64-sh64.c (sh_elf64_check_relocs): Likewise.
+	(sh64_elf64_create_dynamic_sections): Likewise.
+	* elf64-x86-64.c (create_got_section): Likewise.
+	(elf64_x86_64_check_relocs): Likewise.
+	* elflink.c (_bfd_elf_create_got_section): Likewise.
+	(_bfd_elf_link_create_dynamic_sections): Likewise.
+	(elf_link_add_object_symbols): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_add_symbol_hook): Likewise.
+	(elfNN_ia64_create_dynamic_sections): Likewise.
+	(get_fptr): Likewise.
+	(get_pltoff): Likewise.
+	(get_reloc_section): Likewise.
+	(elfNN_ia64_object_p): Likewise.
+	* elfxx-mips.c (mips_elf_rel_dyn_section): Likewise.
+	(mips_elf_create_compact_rel_section): Likewise.
+	(mips_elf_create_got_section): Likewise.
+	(_bfd_mips_elf_create_dynamic_sections): Likewise.
+	* elfxx-sparc.c (create_got_section): Likewise.
+	(_bfd_sparc_elf_check_relocs): Likewise.
+
+	* elf.c (_bfd_elf_new_section_hook): Call _bfd_elf_get_sec_type_attr
+	on linker created sections.
+
+2005-05-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 882
+	* elflink.c (_bfd_elf_link_assign_sym_version): Allow version
+	script on executable.
+
+2005-05-05  John Levon  <levon@movementarian.org>
+
+	* dwarf2.c (read_abbrevs): If bfd_realloc fails, free currently
+	allocated memory before returning.
+	(decode_line_info): Likewise.
+	(_bfd_dwarf2_cleanup_debug_info): New function:  Frees memory
+	allocated by functions in this file.
+	* elf-bfd.h (_bfd_dwarf2_cleanup_debug_info): Prototype.
+	* elf.c (_bfd_elf_close_and_cleanup): Call
+	_bfd_dwarf2_cleanup_debug_info.
+
+2005-05-05  Hans-Peter Nilsson  <hp@axis.com>
+
+	* Makefile.am (INCLUDES): Don't -D_GNU_SOURCE here.
+	* configure.in: Call AC_GNU_SOURCE here, after AC_PROG_CC.
+	* configure, config.in, Makefile.in: Regenerate.
+	* sysdep.h (stpcpy): Revert last change.
+
+2005-05-05  Hans-Peter Nilsson  <hp@axis.com>
+
+	* sysdep.h (stpcpy): Wrap declaration in parentheses.
+
+2005-05-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (ARCH_SIZE): New.
+	(LOG_SECTION_ALIGN): Likewise.
+	(elfNN_ia64_create_dynamic_sections): Use LOG_SECTION_ALIGN to
+	align relocation sections.
+	(get_fptr): Likewise.
+	(get_reloc_section): Likewise.
+	(elfNN_ia64_tprel_base): Likewise.
+	(elfNN_ia64_check_relocs): Support 32bit relocations.
+	(allocate_global_fptr_got): Likewise.
+	(allocate_dynrel_entries): Likewise.
+	(set_got_entry): Likewise.
+	(set_pltoff_entry): Likewise.
+	(elfNN_ia64_relocate_section): Likewise.
+
+2005-05-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.in: Add AC_CHECK_DECLS(stpcpy).
+	* configure: Regenerate.
+	* config.in: Likewise.
+
+	* sysdep.h (stpcpy): New.
+
+2005-05-04  Nick Clifton  <nickc@redhat.com>
+
+	* Update the address and phone number of the FSF organization in
+	the GPL notices in the following files:
+	aix386-core.c, aix5ppc-core.c, aout-adobe.c, aout-arm.c,
+	aout-cris.c, aout-ns32k.c, aout-sparcle.c, aout-target.h,
+	aout-tic30.c, aout0.c, aout32.c, aout64.c, aoutf1.h, aoutx.h,
+	archive.c, archive64.c, archures.c, armnetbsd.c, bfd-in.h,
+	bfd-in2.h, bfd.c, bfdio.c, bfdwin.c, binary.c, bout.c, cache.c,
+	cf-i386lynx.c, cf-m68klynx.c, cf-sparclynx.c, cisco-core.c,
+	coff-a29k.c, coff-alpha.c, coff-apollo.c, coff-arm.c, coff-aux.c,
+	coff-go32.c, coff-h8300.c, coff-h8500.c, coff-i386.c, coff-i860.c,
+	coff-i960.c, coff-ia64.c, coff-m68k.c, coff-m88k.c, coff-maxq.c,
+	coff-mcore.c, coff-mips.c, coff-or32.c, coff-pmac.c, coff-ppc.c,
+	coff-rs6000.c, coff-sh.c, coff-sparc.c, coff-stgo32.c,
+	coff-svm68k.c, coff-tic30.c, coff-tic4x.c, coff-tic54x.c,
+	coff-tic80.c, coff-u68k.c, coff-w65.c, coff-we32k.c, coff-z8k.c,
+	coff64-rs6000.c, coffcode.h, coffgen.c, cofflink.c, coffswap.h,
+	corefile.c, cpu-a29k.c, cpu-alpha.c, cpu-arc.c, cpu-arm.c,
+	cpu-avr.c, cpu-cr16c.c, cpu-cris.c, cpu-crx.c, cpu-d10v.c,
+	cpu-d30v.c, cpu-dlx.c, cpu-fr30.c, cpu-frv.c, cpu-h8300.c,
+	cpu-h8500.c, cpu-hppa.c, cpu-i370.c, cpu-i386.c, cpu-i860.c,
+	cpu-i960.c, cpu-ia64-opc.c, cpu-ia64.c, cpu-ip2k.c, cpu-iq2000.c,
+	cpu-m10200.c, cpu-m10300.c, cpu-m32r.c, cpu-m68hc11.c,
+	cpu-m68hc12.c, cpu-m68k.c, cpu-m88k.c, cpu-maxq.c, cpu-mcore.c,
+	cpu-mips.c, cpu-mmix.c, cpu-msp430.c, cpu-ns32k.c, cpu-openrisc.c,
+	cpu-or32.c, cpu-pdp11.c, cpu-pj.c, cpu-powerpc.c, cpu-rs6000.c,
+	cpu-s390.c, cpu-sh.c, cpu-sparc.c, cpu-tic30.c, cpu-tic4x.c,
+	cpu-tic54x.c, cpu-tic80.c, cpu-v850.c, cpu-vax.c, cpu-w65.c,
+	cpu-we32k.c, cpu-xstormy16.c, cpu-xtensa.c, cpu-z8k.c, demo64.c,
+	dwarf1.c, dwarf2.c, ecoff.c, ecofflink.c, ecoffswap.h,
+	efi-app-ia32.c, efi-app-ia64.c, elf-bfd.h, elf-eh-frame.c,
+	elf-hppa.h, elf-m10200.c, elf-m10300.c, elf-strtab.c, elf.c,
+	elf32-am33lin.c, elf32-arc.c, elf32-arm.c, elf32-avr.c,
+	elf32-cr16c.c, elf32-cris.c, elf32-crx.c, elf32-d10v.c,
+	elf32-d30v.c, elf32-dlx.c, elf32-fr30.c, elf32-frv.c, elf32-gen.c,
+	elf32-h8300.c, elf32-hppa.c, elf32-hppa.h, elf32-i370.c,
+	elf32-i386.c, elf32-i860.c, elf32-i960.c, elf32-ip2k.c,
+	elf32-iq2000.c, elf32-m32r.c, elf32-m68hc11.c, elf32-m68hc12.c,
+	elf32-m68hc1x.c, elf32-m68hc1x.h, elf32-m68k.c, elf32-m88k.c,
+	elf32-mcore.c, elf32-mips.c, elf32-msp430.c, elf32-openrisc.c,
+	elf32-or32.c, elf32-pj.c, elf32-ppc.c, elf32-ppc.h, elf32-s390.c,
+	elf32-sh-symbian.c, elf32-sh.c, elf32-sh64-com.c, elf32-sh64.c,
+	elf32-sh64.h, elf32-sparc.c, elf32-v850.c, elf32-vax.c,
+	elf32-xstormy16.c, elf32-xtensa.c, elf32.c, elf64-alpha.c,
+	elf64-gen.c, elf64-hppa.c, elf64-hppa.h, elf64-mips.c,
+	elf64-mmix.c, elf64-ppc.c, elf64-ppc.h, elf64-s390.c,
+	elf64-sh64.c, elf64-sparc.c, elf64-x86-64.c, elf64.c, elfcode.h,
+	elfcore.h, elflink.c, elfn32-mips.c, elfxx-ia64.c, elfxx-mips.c,
+	elfxx-mips.h, elfxx-sparc.c, elfxx-sparc.h, elfxx-target.h,
+	epoc-pe-arm.c, epoc-pei-arm.c, format.c, freebsd.h, gen-aout.c,
+	genlink.h, hash.c, host-aout.c, hp300bsd.c, hp300hpux.c,
+	hppabsd-core.c, hpux-core.c, i386aout.c, i386bsd.c, i386dynix.c,
+	i386freebsd.c, i386linux.c, i386lynx.c, i386mach3.c, i386msdos.c,
+	i386netbsd.c, i386os9k.c, ieee.c, ihex.c, init.c, irix-core.c,
+	libaout.h, libbfd-in.h, libbfd.c, libbfd.h, libcoff-in.h,
+	libcoff.h, libecoff.h, libhppa.h, libieee.h, libnlm.h, liboasys.h,
+	libpei.h, libxcoff.h, linker.c, lynx-core.c, m68k4knetbsd.c,
+	m68klinux.c, m68klynx.c, m68knetbsd.c, m88kmach3.c, m88kopenbsd.c,
+	mach-o-target.c, mach-o.c, mach-o.h, merge.c, mipsbsd.c, mmo.c,
+	netbsd-core.c, netbsd.h, newsos3.c, nlm-target.h, nlm.c,
+	nlm32-alpha.c, nlm32-i386.c, nlm32-ppc.c, nlm32-sparc.c, nlm32.c,
+	nlm64.c, nlmcode.h, nlmswap.h, ns32k.h, ns32knetbsd.c, oasys.c,
+	opncls.c, osf-core.c, pc532-mach.c, pdp11.c, pe-arm.c, pe-i386.c,
+	pe-mcore.c, pe-mips.c, pe-ppc.c, pe-sh.c, peXXigen.c,
+	pef-traceback.h, pef.c, pef.h, pei-arm.c, pei-i386.c, pei-mcore.c,
+	pei-mips.c, pei-ppc.c, pei-sh.c, peicode.h, ppcboot.c,
+	ptrace-core.c, reloc.c, reloc16.c, riscix.c, rs6000-core.c,
+	sco5-core.c, section.c, simple.c, som.c, som.h, sparclinux.c,
+	sparclynx.c, sparcnetbsd.c, srec.c, stab-syms.c, stabs.c, sunos.c,
+	syms.c, sysdep.h, targets.c, tekhex.c, ticoff.h, trad-core.c,
+	vax1knetbsd.c, vaxbsd.c, vaxnetbsd.c, versados.c, vms-gsd.c,
+	vms-hdr.c, vms-misc.c, vms-tir.c, vms.c, vms.h, xcoff-target.h,
+	xcofflink.c, xsym.c, xsym.h, xtensa-isa.c, xtensa-modules.c,
+	hosts/alphavms.h
+
+2005-05-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfd-in.h (_bfd_elf_provide_section_bound_symbols): New.
+	* bfd-in2.h: Regenerated.
+
+	* elflink.c (bfd_elf_set_symbol): New.
+	(_bfd_elf_provide_symbol): Call it.
+	(_bfd_elf_provide_section_bound_symbols): New.
+
+2005-05-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (_bfd_elf_merge_symbol): Only skip weak definitions
+	at the end, if a strong definition has already been seen.
+
+2005-05-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* section.c (struct bfd_section): Replace link_order_head and
+	link_order_tail with map_head and map_tail union.
+	(STD_SECTION): Update.
+	(_bfd_strip_section_from_output): Delete.
+	* aoutx.h: Update throughout for above changes.
+	* coff-ppc.c: Likewise.
+	* cofflink.c: Likewise.
+	* ecoff.c: Likewise.
+	* elf-eh-frame.c: Likewise.
+	* elf-m10300.c: Likewise.
+	* elf.c: Likewise.
+	* elf32-arm.c: Likewise.
+	* elf32-cris.c: Likewise.
+	* elf32-hppa.c: Likewise.
+	* elf32-i386.c: Likewise.
+	* elf32-m32r.c: Likewise.
+	* elf32-m68hc1x.c: Likewise.
+	* elf32-m68k.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-s390.c: Likewise.
+	* elf32-sh.c: Likewise.
+	* elf32-vax.c: Likewise.
+	* elf32-xtensa.c: Likewise.
+	* elf64-alpha.c: Likewise.
+	* elf64-hppa.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf64-s390.c: Likewise.
+	* elf64-sh64.c: Likewise.
+	* elf64-x86-64.c: Likewise.
+	* elflink.c: Likewise.
+	* elfxx-ia64.c: Likewise.
+	* elfxx-mips.c: Likewise.
+	* elfxx-sparc.c: Likewise.
+	* linker.c: Likewise.
+	* merge.c: Likewise.
+	* pdp11.c: Likewise.
+	* xcofflink.c: Likewise.
+	* elflink.c (bfd_boolean bfd_elf_size_dynsym_hash_dynstr): Split
+	out from bfd_elf_size_dynamic_sections.
+	* bfd-in.h (bfd_boolean bfd_elf_size_dynsym_hash_dynstr): Declare.
+	* bfd-in2.h: Regenerate.
+
+2005-05-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* section.c (bfd_section_list_remove): Don't clear s->next.
+	(bfd_section_list_append): Always init s->prev.
+	(bfd_section_list_prepend): Define.
+	(bfd_section_list_insert_after): Minor optimization.
+	(bfd_section_removed_from_list): Rewrite.
+	* elf.c (assign_section_numbers): Simplify list traversal now that
+	bfd_section_list_remove doesn't destroy removed section next ptr.
+	* sunos.c (sunos_add_dynamic_symbols): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_object_p): Use bfd_section_list_prepend.
+	* xcofflink.c (_bfd_xcoff_bfd_final_link): Simplify list traversal.
+	* bfd-in2.h: Regenerate.
+
+2005-05-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfd.c (bfd): Remove section_tail and add section_last.
+	(bfd_preserve): Likewise.
+	(bfd_preserve_save): Likewise.
+	(bfd_preserve_restore): Likewise.
+	* opncls.c (_bfd_new_bfd): Likewise.
+
+	* coffcode.h (coff_compute_section_file_positions): Updated.
+	(coff_compute_section_file_positions): Likewise.
+	* elf.c (assign_section_numbers): Likewise.
+	* elf32-i370.c (i370_elf_size_dynamic_sections): Likewise.
+	* elf64-mmix.c (mmix_elf_final_link): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_object_p): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_link_hash_table_create): Likewise.
+	* sunos.c (sunos_add_dynamic_symbols): Likewise.
+	* xcofflink.c (_bfd_xcoff_bfd_final_link): Likewise.
+
+	* ecoff.c (bfd_debug_section): Initialize prev.
+
+	* section.c (bfd_section): Add prev.
+	(bfd_section_list_remove): Updated.
+	(bfd_section_list_append): New.
+	(bfd_section_list_insert_after): New.
+	(bfd_section_list_insert_before): New.
+	(bfd_section_list_insert): Removed.
+	(bfd_section_removed_from_list): Updated.
+	(STD_SECTION): Initialize prev.
+	(bfd_section_init): Updated.
+	(bfd_section_list_clear): Updated.
+
+	* bfd-in2.h: Regenerated.
+
+2005-05-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (_bfd_elf_new_section_hook): Don't call
+	_bfd_elf_get_sec_type_attr on sections from input files.
+
+2005-05-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* merge.c (sec_merge_init): Call bfd_hash_table_init_n with
+	hash table size 16699 instead of bfd_hash_table_init.
+
+2005-05-01  Paul Brook  <paul@codesourcery.com>
+
+	* elflink.c (_bfd_elf_merge_symbol): Skip weak definitions if a strong
+	definition has already been seen.
+
+2005-05-01  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (bfd_elf32_arm_process_before_allocation): Treat
+	R_ARM_PLT32 the same as R_ARM_PC24.
+	(arm_add_to_rel): Ditto.
+
+2005-04-29  Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* config.bfd: Add h8300*-*-rtemscoff.
+	Switch h8300*-*-rtems* to elf.
+
+2005-04-29  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* aclocal.m4, Makefile.in: Regnerated.
+
+2005-04-28  Paul Brook  <paul@codesourcery.com>
+
+	Merge changes only applied to Makefile.in.
+	* Makefile.am (BFD32_BACKENDS): Add elfxx-sparc.lo
+	(BFD32_BACKENDS_CFILES): Add elfxx-sparc.c
+	(elfxx-sparc.lo): New rule.
+	(elf32-sparc.lo): Add elfxx-sparc.h dependency.
+	(elf64-sparc.lo): Likewise.
+
+2005-04-28  Julian Brown  <julian@codesourcery.com>
+
+	* elflink.c (_bfd_elf_provide_symbol): Provide symbol for weak
+	import.
+
+2005-04-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (bfd_elf_sym_name): Also take "asection *".
+
+	* elf.c (bfd_elf_sym_name): Updated.
+	(group_signature): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	* elf64-ppc.c (ppc64_elf_edit_opd): Likewise.
+	(ppc64_elf_edit_toc): Likewise.
+	(ppc64_elf_relocate_section): Likewise.
+	* elfcode.h (elf_slurp_symbol_table): Likewise.
+	* elflink.c (elf_link_input_bfd): Likewise.
+
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Call
+	bfd_elf_sym_name to get local symbol name when reporting errors.
+
+2005-04-27  Nick Clifton  <nickc@redhat.com>
+
+	* elflink.c (elf_link_input_bfd): Handle the case where a badly
+	formatted input file results in a reloc which has no associated
+	global symbol.
+
+2005-04-26  Jerome Guitton  <guitton@gnat.com>
+
+	* bfd.m4 (BFD_NEED_DECLARATION): Restore.
+
+2005-04-25  David S. Miller  <davem@davemloft.net>
+
+	* elfxx-sparc.c (sparc_elf_append_rela_64): Add BFD64 protection.
+	(sparc_elf_r_info_64, _bfd_sparc_elf_finish_dynamic_symbol,
+	sparc64_finish_dyn, _bfd_sparc_elf_finish_dynamic_sections):
+	Likewise.
+
+2005-04-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 858
+	* elflink.c (elf_link_input_bfd): Make non-debugging reference
+	to discarded section an error.
+
+2005-04-21  Jerome Guitton  <guitton@gnat.com>
+
+	* configure.in: Replace BFD_NEED_DECLARATION checks by the
+	corresponding AC_CHECK_DECLS.
+	* sysdep.h: Replace NEED_DECLARATION_* checks by the corresponding
+	HAVE_DECL_*.
+	* bfd.m4 (BFD_NEED_DECLARATION): Remove, obsolete.
+	* configure: Regenerate.
+	* config.in: Ditto.
+
+2005-04-21  Andreas Schwab  <schwab@suse.de>
+
+	* elfxx-sparc.h (struct _bfd_sparc_elf_link_hash_table): Remove
+	unsigned from type of dynamic_interpreter.
+	* elfxx-sparc.c (_bfd_sparc_elf_link_hash_table_create): Remove
+	casts again.
+
+	* elf.c (assign_section_numbers): Fix comment.
+
+2005-04-21  Jerome Guitton  <guitton@gnat.com>
+
+	* som.c (som_bfd_print_private_bfd_data): Add explicit cast to long
+	for struct som_exec_auxhdr fields.
+
+2005-04-21  Nick Clifton  <nickc@redhat.com>
+
+	* aout-adobe.c: Convert to ISO C and fix formatting.
+	* aout-arm.c: Convert to ISO C and fix formatting.
+	* aout-cris.c: Convert to ISO C and fix formatting.
+	* aout-ns32k.c: Convert to ISO C and fix formatting.
+	* aout-tic30.c: Convert to ISO C and fix formatting.
+	* coffcode.h: Convert to ISO C and fix formatting.
+	* coffswap.h: Convert to ISO C and fix formatting.
+	* i386aout.c: Convert to ISO C and fix formatting.
+	* libaout.h: Convert to ISO C and fix formatting.
+	* libcoff-in.h: Convert to ISO C and fix formatting.
+	* libcoff.h: Convert to ISO C and fix formatting.
+	* libecoff.h: Convert to ISO C and fix formatting.
+	* libnlm.h: Convert to ISO C and fix formatting.
+	* libpei.h: Convert to ISO C and fix formatting.
+	* libxcoff.h: Convert to ISO C and fix formatting.
+	* nlm-target.h: Convert to ISO C and fix formatting.
+	* nlm.c: Convert to ISO C and fix formatting.
+	* nlm32-alpha.c: Convert to ISO C and fix formatting.
+	* nlm32-i386.c: Convert to ISO C and fix formatting.
+	* nlm32-ppc.c: Convert to ISO C and fix formatting.
+	* nlm32-sparc.c: Convert to ISO C and fix formatting.
+	* nlmcode.h: Convert to ISO C and fix formatting.
+	* nlmswap.h: Convert to ISO C and fix formatting.
+	* pe-mips.c: Convert to ISO C and fix formatting.
+	* peXXigen.c: Convert to ISO C and fix formatting.
+	* peicode.h: Convert to ISO C and fix formatting.
+	* vms-gsd.c: Convert to ISO C and fix formatting.
+	* vms-hdr.c: Convert to ISO C and fix formatting.
+	* vms-misc.c: Convert to ISO C and fix formatting.
+	* vms-tir.c: Convert to ISO C and fix formatting.
+	* vms.c: Convert to ISO C and fix formatting.
+	* vms.h: Convert to ISO C and fix formatting.
+
+	* coffgen.c (coff_print_symbol): Restore correct formatting of
+	output.
+
+2005-04-20  David S. Miller  <davem@davemloft.net>
+
+	* elfxx-sparc.c (sparc_elf_r_symndx_64): Fix compiler warning.
+	(_bfd_sparc_elf_link_hash_table_create): Likewise.
+	(allocate_dynrelocs): Likewise.
+
+2005-04-20  Jerome Guitton  <guitton@gnat.com>
+
+	* configure.in: Fix the check for basename declaration. Add check
+	for declarations of ftello, ftello64, fseeko, fseeko64.
+	* configure: Regenerate.
+	* config.in: Ditto.
+	* sysdep.h: If needed, declare ftello, ftello64, fseeko, fseeko64.
+
+2005-04-19  David S. Miller  <davem@davemloft.net>
+
+	* elfxx-sparc.c: New file.
+	* elfxx-sparc.h: New file.
+	* Makefile.in (BFD32_BACKENDS): Add elfxx-sparc.lo
+	(BFD32_BACKENDS_CFILES): Add elfxx-sparc.c
+	(elfxx-sparc.lo): New rule.
+	(elf32-sparc.lo): Add elfxx-sparc.h dependency.
+	(elf64-sparc.lo): Likewise.
+	* configure.in (bfd_elf32_sparc_vec): Add elfxx-sparc.lo
+	(bfd_elf64_sparc_vec): Likewise.
+	* configure: Regenerate.
+	* elf32-sparc.c: Remove common code now in elfxx-sparc.c
+	* elf64-sparc.c: Likewise, also use elf64_sparc_*() naming
+	which is more consistent with elf32-sparc.c
+
+2005-04-19  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elfxx-mips.c (struct mips_elf_link_hash_entry): Update comment.
+	(mips_elf_create_local_got_entry): Check h->root.forced_local.
+
+2005-04-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Don't bother with
+	dynamic relocs in non-SEC_ALLOC sections.
+	(ppc_elf_gc_sweep_hook): Likewise.
+	(ppc_elf_relax_section): Likewise.
+	(ppc_elf_relocate_section): Likewise.
+
+2005-04-18  Nick Clifton  <nickc@redhat.com>
+
+	* aix5ppc-core.c (xcoff64_core_p): Fix compile time warning
+	assigning a value to return_value.
+
+2005-04-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 855
+	* elf.c (_bfd_elf_copy_private_section_data): Don't copy linker
+	created group data.
+
+2005-04-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 855
+	* elf.c (setup_group): Properly handle zero group count.
+
+2005-04-17  Mark Kettenis  <kettenis@gnu.org>
+
+	* som.c (hppa_som_reloc, som_mkobject, som_is_space)
+	(som_is_subspace, compare_subspaces, som_compute_checksum)
+	(som_build_and_write_symbol_table, som_slurp_symbol_table): New
+	protoypes.
+	(hppa_som_reloc, compare_syms, compare_subspaces)
+	(som_print_symbol, som_get_section_contents)
+	(som_set_section_contents): Remove space after 'void *'.
+	(som_bfd_print_private_bfd_data): Use %lx to print longs.
+	(som_bfd_merge_private_bfd_data)
+	(som_bfd_copy_private_header_data, som_bfd_set_private_flags): New
+	defines.
+
+2005-04-15  Julian Brown  <julian@codesourcery.com>
+
+	* bfd-in.h (bfd_elf32_arm_set_target_relocs): Update prototype.
+	* bfd-in2.h: Regenerate.
+	* elf32-arm.c (elf32_arm_link_hash_table): New field, 'use_blx'.
+	(elf32_arm_link_hash_table_create): Initialise fix_v4bx, use_blx.
+	(bfd_elf32_arm_set_target_relocs): Handle use_blx.
+	(elf32_arm_final_link_relocate): Use Thumb BLX for R_ARM_THM_PC22
+	relocations if requested to.
+	(allocate_dynrelocs): Don't count size of omitted Thumb stubs based on
+	use_blx rather than symbian_p.
+	(elf32_arm_finish_dynamic_symbol): Don't output Thumb PLT stubs if
+	use_blx is in effect.
+	(elf32_arm_symbian_link_hash_table_create): Enable use_blx by default
+	for SymbianOS.
+
+2005-04-15  Nick Clifton  <nickc@redhat.com>
+
+	* coffgen.c (coff_print_symbol): Use fprintf_vma to print vma
+	values.
+
+2005-04-15  Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/815
+	* elflink.c (elf_smash_syms): Clear undef.next if it's not being
+	used as a list pointer.
+
+2005-04-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (NO_WERROR): Define.
+	* warning.m4: New file
+	* acinclude.m4: Include warning.m4.
+	* configure.in: Invoke AM_BINUTILS_WARNINGS.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2005-04-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* merge.c (sec_merge_emit): Tidy.  Check for bfd_zmalloc errors.
+	Write trailing padding.
+
+	* merge.c (merge_strings): Round up section size for alignment.
+
+2005-04-14  David S. Miller  <davem@davemloft.net>
+
+	Add TLS support for 64-bit Sparc ELF.
+	*  elf64-sparc.c (sparc64_elf_dyn_relocs,
+	sparc64_elf_link_hash_entry, sparc64_elf_obj_tdata): New structs.
+	(GOT_UNKNOWN, GOT_NORMAL, GOT_TLD_GD, GOT_TLD_IE,
+	sparc64_elf_hash_entry, sparc64_elf_tdata,
+	sparc64_elf_local_got_tls_type): New defines.
+	(sparc64_elf_mkobject): New function.
+	(sparc64_elf_link_hash_table): Add members for dynamic linker
+	sections PLT, RELPLT, DYNBSS, and RELBSS.  Add tls_ldm_got
+	uion to track TLS GOT references.  Add sym_sec to cache
+	mappings from local sym to section.
+	(link_hash_newfunc): New function.
+	(sparc64_elf_bfd_link_hash_table_create): Rename to
+	sparc64_elf_link_hash_table_create for consistency.
+	Pass link_hash_newfunc to _bfd_elf_link_hash_table_init.
+	(sparc64_elf_create_dynamic_sections): Initialize new section
+	members of sparc64_elf_link_hash_table.  Only init srelbss
+	if not-shared.
+	(sparc64_elf_copy_indirect_symbol, sparc64_elf_tls_transition):
+	New functions.
+	(SPARC_NOP): Define.
+	(sparc64_elf_build_plt, sparc64_elf_plt_entry_offset,
+	sparc64_elf_plt_ptr_offset): Delete.
+	(sparc64_plt_entry_build): New function to build PLT entries
+	gradually instread of all at once at the end of linking.
+	(sparc64_elf_check_relocs): Delete dynobj, sgot, and srelgot
+	local vars.  Get them from sparc64_elf_hash_table instead.
+	Check early on if r_symndx is in bounds.  Handle TLS transitions.
+	Account for TLS GOT references and DF_STATIC_TLS, as needed.
+	For TLS relocs, record the tls_type in either
+	sparc64_elf_local_got_tls_type or sparc64_elf_hash_entry as
+	appropriate.  For R_SPARC_TLS_{GD,LDM}_CALL, emit a reference
+	to the __tls_get_addr symbol.  For PLT relocs, track references
+	via h->plt.refcount.  When R_SPARC_{PC10,PC22,PC_HH22,PC_HM10,
+	PC_LM22} and h not-NULL, set h->non_got_ref.  For global data
+	symbol references, count the number of relocations needed for
+	that symbol.  For default switch case, don't error, this lets
+	the TLS relocs not explicitly handled by this function get
+	accepted.
+	(sparc64_elf_gc_mark_hook, sparc64_gc_sweep_hook): New functions.
+	(sparc64_elf_adjust_dynamic_symbol): Remove dynobj local var, get
+	it from sparc64_elf_hash_table.  Store the real PLT offset
+	in h->plt.offset, and build PLT entries one at a time.  Also
+	get .dynbss section pointer from htab.
+	(allocate_dynrelocs, readonly_dynrelocs,
+	sparc64_omit_section_dynsym): New functions.
+	(sparc64_elf_omit_section_dynsym): Use these new functions as
+	helpers.
+	(dtpoff_base, tpoff): New functions.
+	(sparc64_elf_relocate_section): Kill dynobj, sgot, and splt
+	locals, get them from sparc64_elf_hash_table.  Handle TLS
+	relocations and refcounting in main relocation loop.
+	(sparc64_elf_finish_dynamic_symbol): Use
+	sparc64_elf_link_hash_table.  Build PLT entries as we see
+	them.  Handle TLS GOT relocations.
+	(sparc64_elf_finish_dynamic_sections): Get sgot and dynobj
+	from sparc64_elf_hash_table.  Initialize only PLT header
+	not all entries since we not build PLT entries one by one.
+	(elf_backend_copy_indirect_symbol, bfd_elf64_mkobject,
+	elf_backend_gc_mark_hook, elf_backend_gc_sweep_hook,
+	elf_backend_can_gc_sections, elf_backend_can_refcount): Define.
+
+2005-04-13  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elflink.c (elf_link_input_bfd): Update check for removed
+	sections.
+
+2005-04-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* aclocal.m4: Regenerate.
+	* libcoff.h: Regenerate.
+
+2005-04-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* linker.c (_bfd_generic_link_output_symbols): Also check if
+	the output section of an input section has been removed from
+	the output file.
+
+	* section.c (bfd_section_list_remove): Clear the next field
+	of the removed section.
+	(bfd_section_removed_from_list): New.
+	* bfd-in2.h: Regenerated.
+
+2005-04-11  David S. Miller  <davem@davemloft.net>
+
+	* elf32-sparc.c (elf32_sparc_relocate_section,
+	R_SPARC_TLS_LDO_{HIX22,LOX10}): When not shared, transition to
+	R_SPARC_TLS_LE_{HIX22,LOX10}.
+	(elf32_sparc_relocate_section, R_SPARC_TLS_{LDO,LE}_HIX22): Only
+	xor relocation with 0xffffffff if R_SPARC_TLS_LE_HIX22.
+	(elf32_sparc_relocate_section, R_SPARC_TLS_{LDO,LE}_LOX10): Only
+	or 0x1c00 into relocation if R_SPARC_TLS_LE_HIX22.
+
+2005-04-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* coffcode.h (STRING_SIZE_SIZE): Updated to match libcoff-in.h.
+
+2005-04-11  Nick Clifton  <nickc@redhat.com>
+
+	* aout-target.h:  Convert to ISO C.
+	* aoutf1.h:  Convert to ISO C.
+	* aoutx.h:  Convert to ISO C.
+	* bout.c:  Convert to ISO C.
+	* dwarf1.c:  Convert to ISO C.
+	* ecoffswap.h:  Convert to ISO C.
+	* freebsd.h:  Convert to ISO C.
+	* genlink.h:  Convert to ISO C.
+	* ieee.c:  Convert to ISO C.
+	* ihex.c:  Convert to ISO C.
+	* libcoff-in.h:  Convert to ISO C.
+	* mach-o.c:  Convert to ISO C.
+	* mach-o.h:  Convert to ISO C.
+	* netbsd.h:  Convert to ISO C.
+	* ns32k.h:  Convert to ISO C.
+	* ns32knetbsd.c:  Convert to ISO C.
+	* oasys.c:  Convert to ISO C.
+	* pdp11.c:  Convert to ISO C.
+	* pef-traceback.h:  Convert to ISO C.
+	* pef.c:  Convert to ISO C.
+	* pef.h:  Convert to ISO C.
+	* riscix.c:  Convert to ISO C.
+	* som.c:  Convert to ISO C.
+	* som.h:  Convert to ISO C.
+	* srec.c:  Convert to ISO C.
+	* stabs.c:  Convert to ISO C.
+	* sunos.c:  Convert to ISO C.
+	* tekhex.c:  Convert to ISO C.
+	* versados.c:  Convert to ISO C.
+	* version.h:  Convert to ISO C.
+	* xcoff-target.h:  Convert to ISO C.
+	* xcofflink.c:  Convert to ISO C.
+	* xsym.c:  Convert to ISO C.
+	* xsym.h:  Convert to ISO C.
+
+2005-04-08  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (ARM2THUMB_GLUE_SIZE): Rename...
+	(ARM2THUMB_STATIC_GLUE_SIZE): ... to this.
+	(ARM2THUMB_PIC_GLUE_SIZE): Define.
+	(a2t1p_ldr_insn, a2t2p_add_pc_insn, a2t3p_bx_r12_insn): Add.
+	(elf32_arm_to_thumb_stub): Create PIC stubs.
+	(record_arm_to_thumb_glue): Use different stub size for relocatable
+	images.
+
+2005-04-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (dec_dynrel_count): New function split out from
+	ppc64_elf_edit_toc, with additional code from ppc64_elf_edit_opd.
+	(ppc64_elf_edit_toc, ppc64_elf_edit_opd): Use it.
+	(ppc64_elf_tls_optimize): Likewise.
+
+2005-04-05  Mark Kettenis  <kettenis@gnu.org>
+
+	* netbsd-core.c (SPARC_WCOOKIE_OFFSET): Renamed from
+	CORE_WCOOKIE_OFFSET.
+	(SPARC64_WCOOKIE_OFFSET): New.
+	(netbsd_core_file_p): Provide .wcookie section for OpenBSD/sparc64.
+
+2005-04-05  Nick Clifton  <nickc@redhat.com>
+
+	* po/rw.po: New translation: Kinyarwanda
+	* configure.in (ALL_LINGUAS): Add rw
+	* configure: Regenerate.
+
+2005-04-05  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elfxx-mips.c (MIPS_ELF_OPTIONS_SECTION_NAME_P): New macro.
+	(_bfd_mips_elf_section_from_shdr): Use it to check for recognized
+	SHT_MIPS_OPTIONS names.  Allow all sections with unrecognised
+	section flags.
+	(_bfd_mips_elf_fake_sections): Use MIPS_ELF_OPTIONS_SECTION_NAME_P
+	to check for SHT_MIPS_OPTIONS sections.
+	(_bfd_mips_elf_set_section_contents): Likewise.
+
+2005-04-04  Eric Christopher  <echristo@redhat.com>
+
+	* elfxx-mips.c (_bfd_elf_mips_get_relocated_section_contents):
+	Clean up gp handling code.
+
+2005-04-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (bfd_elf_set_group_contents): Ignore linker created
+	group section.
+	(assign_section_numbers): Accept link_info. Check SHT_GROUP
+	sections for relocatable files only. Remove the linker created
+	group sections.
+	(_bfd_elf_compute_section_file_positions): Pass link_info to
+	assign_section_numbers.
+
+	* elfxx-ia64.c (elfNN_ia64_object_p): New.
+	(elf_backend_object_p): Defined.
+
+2005-04-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (elf_section_data): Use (sec) instead of sec.
+
+2005-04-03  Fred Fish  <fnf@specifixinc.com>
+
+	* dwarf2.c (struct dwarf2_debug): Add dwarf_ranges_buffer and
+	dwarf_ranges_size members.
+	(struct comp_unit): Add base_address member.
+	(struct funcinfo): Replace low/high members with an arange.
+	(arange_add): Replace incoming "unit" parameter with "abfd" and
+	"first_arange" pointers.  Reorganize/rewrite function body.
+	(decode_line_info): Change arange_add call to pass bfd and arange
+	pointers.
+	(lookup_address_in_line_info_table): Use arange list instead of
+	individual low/high members.  Walk function's arange list to find
+	lowest PC in list, to test for overlapping functions.
+	(read_debug_ranges): New function, reads the debug_ranges section.
+	(lookup_address_in_function_table): Use arange list instead of
+	individual low/high members.  Rewrite to find smallest range that
+	matches.
+	(read_rangelist): Read a given rangelist from debug_ranges.
+	(scan_unit_for_functions): Use arange list instead of individual
+	low/high members.  Handle a DW_AT_ranges attribute.
+	(parse_comp_unit): Use arange list instead of individual low/high
+	members.  Save comp unit base address.  Handle a DW_AT_ranges
+	attribute.
+
+2005-04-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (assign_section_numbers): Really use the kept section.
+
+2005-03-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (_bfd_elf_check_kept_section): New.
+
+	* elf.c (assign_section_numbers): When sh_link points to a
+	discarded section, call _bfd_elf_check_kept_section to see if
+	the kept section can be used. Otherwise reject sh_link
+	pointing to discarded section.
+
+	* elflink.c (_bfd_elf_check_kept_section): New.
+	(elf_link_input_bfd): Use it.
+
+2005-04-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_edit_toc): Account for dynamic relocs
+	that we no longer need.
+
+2005-04-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_get_synthetic_symtab): Return -1 on errors
+	rather than 0.
+	(ppc64_elf_check_relocs): Remove unnecessary SEC_ALLOC check.
+
+2005-03-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (assign_section_numbers): Fix a typo.
+
+2005-03-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (elf_link_input_bfd): Remove the extra `\n' in
+	error message.
+	(_bfd_elf_section_already_linked): Likewise.
+
+2005-03-31  Jerome Guitton  <guitton@gnat.com>
+
+	* config.in: Regenerate.
+
+2005-03-31  Jerome Guitton  <guitton@gnat.com>
+
+	* config.in (HAVE_DECL_BASENAME): New configure macro.
+	* configure.in: Check for basename.
+	* configure: Regenerate.
+
+2005-03-30  Julian Brown  <julian@codesourcery.com>
+
+	* bfd-in.h (bfd_is_arm_mapping_symbol_name): Rename from
+	bfd_elf32_is_arm_mapping_symbol_name.
+	* bfd-in2.h: Regenerate.
+	* cpu-arm.c (bfd_is_arm_mapping_symbol_name): Rename from
+	bfd_elf32_is_arm_mapping_symbol_name.
+	* elf32-arm.c (elf32_arm_is_target_special_symbol): Rename
+	bfd_elf32_is_arm_mapping_symbol_name to bfd_is_arm_mapping_symbol_name.
+	(arm_elf_find_function): Likewise.
+	(elf32_arm_output_symbol_hook): Likewise.
+
+2005-03-30  Julian Brown  <julian@codesourcery.com>
+
+	* bfd-in.h (bfd_elf32_is_arm_mapping_symbol_name): Add prototype.
+	* bfd-in2.h: Regenerate.
+	* elf32-arm.c (elf32_arm_is_target_special_symbol): Rename call to
+	bfd_elf32_is_arm_mapping_symbol_name.
+	(elf32_arm_output_symbol_hook): Likewise.
+	(arm_elf_find_function): Likewise, and include STT_NOTYPE in test for
+	mapping symbols.
+	(is_arm_mapping_symbol_name): Function moved from here...
+	* cpu-arm.c (bfd_elf32_is_arm_mapping_symbol_name): ...to here, renamed
+	and made global.
+
+2005-03-29  Aaron W. LaFramboise  <aaron98wiridge9@aaronwl.com>
+
+	* configure.in: Check for ffs decl and alphabetize.
+	* config.in: Regenerate.
+	* configure: Regenerate.
+	* sysdep.h [NEED_DECLARATION_FFS] (ffs): Prototype and alphabetize.
+
+2005-03-29  Fred Fish  <fnf@specifixinc.com>
+
+	* dwarf2.c (struct comp_unit): Fix typo.
+	(scan_unit_for_functions): Remove unused local variable "name"
+	and dead code that set it.
+
+2005-03-29  Daniel Jacobowitz  <dan@codesourcery.com>
+	    Phil Blundell  <philb@gnu.org>
+
+	* bfd-in2.h, libbfd.h: Regenerated.
+	* reloc.c: Add ARM TLS relocations.
+	* elf32-arm.c (elf32_arm_howto_table): Add dynamic TLS
+	relocations.
+	(elf32_arm_tls_gd32_howto, elf32_arm_tls_ldo32_howto)
+	(elf32_arm_tls_ldm32_howto, elf32_arm_tls_le32_howto)
+	(elf32_arm_tls_ie32_howto): New.
+	(elf32_arm_howto_from_type): Support TLS relocations.
+	(elf32_arm_reloc_map): Likewise.
+	(elf32_arm_reloc_type_lookup): Likewise.
+	(TCB_SIZE): Define.
+	(struct elf32_arm_obj_tdata): New.
+	(elf32_arm_tdata, elf32_arm_local_got_tls_type): Define.
+	(elf32_arm_mkobject): New function.
+	(struct elf32_arm_relocs_copied): Add pc_count.
+	(elf32_arm_hash_entry, GOT_UNKNOWN, GOT_NORMAL, GOT_TLS_GD)
+	(GOT_TLS_IE): Define.
+	(struct elf32_arm_link_hash_table): Add tls_ldm_got.
+	(elf32_arm_link_hash_newfunc): Initialize tls_type.
+	(elf32_arm_copy_indirect_symbol): Copy pc_count and tls_type.
+	(elf32_arm_link_hash_table_create): Initialize tls_ldm_got.
+	(dtpoff_base, tpoff): New functions.
+	(elf32_arm_final_link_relocate): Handle TLS relocations.
+	(IS_ARM_TLS_RELOC): Define.
+	(elf32_arm_relocate_section): Warn about TLS mismatches.
+	(elf32_arm_gc_sweep_hook): Handle TLS relocations and pc_count.
+	(elf32_arm_check_relocs): Detect invalid symbol indexes.  Handle
+	TLS relocations and pc_count.
+	(elf32_arm_adjust_dynamic_symbol): Check non_got_ref.
+	(allocate_dynrelocs): Handle TLS.  Bind REL32 relocs to local
+	calls.
+	(elf32_arm_size_dynamic_sections): Handle TLS.
+	(elf32_arm_finish_dynamic_symbol): Likewise.
+	(bfd_elf32_mkobject): Define.
+
+2005-03-29  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_check_relocs): Increment count for all
+	relocation types.  Don't count relocations which will use a PLT.
+
+2005-03-29  Joel Brobecker  <brobecker@gnat.com>
+
+	* elf.c (elfcore_grok_nto_status): Print tid as long.
+	(elfcore_grok_nto_regs): Likewise.
+
+2005-03-29  Joel Brobecker  <brobecker@gnat.com>
+
+	* irix-core.c: Remove some unnecessary prototypes.
+
+2005-03-28  Joel Brobecker  <brobecker@adacore.com>
+
+	* irix-core.c: Convert to ISO C.
+
+2005-03-28  Joel Brobecker  <brobecker@adacore.com>
+
+	* irix-core.c (do_sections): Replace + by | in expression.
+	(irix_core_core_file_matches_executable_p): Add ATTRIBUTE_UNUSED
+	to unused parameters to avoid a compiler warning.
+
+2005-03-28  Mark Kettenis  <kettenis@gnu.org>
+
+	* netbsd-core.c: Convert to ISO C.  Fix formatting.
+
+2005-03-24  Eric Christopher  <echristo@redhat.com>
+
+	* elfxx-mips.c: Revert previous patch.
+
+2005-03-24  Nick Clifton  <nickc@redhat.com>
+
+	* targets.c (_bfd_target_vector): Only include the
+	bfd_elf32_ia64_hpux_big_vec vector when building a 64-bit BFD with
+	all targets enabled.
+
+2005-03-24  James E Wilson  <wilson@specifixinc.com>
+
+	* Makefile.am (BFD32_BACKENDS): Delete elf32-ia64.lo.
+	(BFD64_BACKENDS): Add elf32-ia64.lo.
+	* Makefile.in: Regenerate.
+
+2005-03-23  Eric Christopher  <echristo@redhat.com>
+
+	* elfxx-mips.c (MIPS_ELF_READONLY_SECTION): New.
+	(mips_elf_calculate_relocation): Use. Define DF_TEXTREL
+	after emitting relocation.
+	(_bfd_mips_elf_adjust_dynamic_symbol): Ditto.
+	(_bfd_mips_elf_check_relocs): Remove code to set DF_TEXTREL
+	and readonly_reloc.
+
+2005-03-23  Mike Frysinger  <vapier@gentoo.org>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* config.bfd: Accept any C library to accompany a GNU Linux
+	implementation, not just the GNU C library.
+	* configure.in: Likewise.
+	* configure: Regenerate.
+
+2005-03-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfd-in.h (_bfd_elf_provide_symbol): New.
+	* bfd-in2.h: Regenerated.
+
+	* elf32-ppc.c (set_linker_sym): Moved to elflink.c.
+	(ppc_elf_set_sdata_syms): Call _bfd_elf_provide_symbol instead
+	of set_linker_sym.
+
+	* elflink.c (_bfd_elf_provide_symbol): New. Moved and renamed
+	from elf32-ppc.c.
+
+2005-03-22  Hans-Peter Nilsson  <hp@axis.com>
+
+	* hash.c (strtab_hash_newfunc): Fix typo in allocated size.
+
+2005-03-22  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-isa.c (xtensa_opcode_lookup, xtensa_state_lookup,
+	xtensa_sysreg_lookup_name, xtensa_interface_lookup,
+	xtensa_funcUnit_lookup): Skip bsearch call if count is zero.
+	(xtensa_opcode_decode): Rearrange code.
+
+2005-03-22  Nick Clifton  <nickc@redhat.com>
+
+	* binary.c: Convert to ISO C90 formatting.
+	* coff-arm.c: Convert to ISO C90 formatting.
+	* coffgen.c: Convert to ISO C90 formatting.
+	* elf32-gen.c: Convert to ISO C90 formatting.
+	* elf64-gen.c: Convert to ISO C90 formatting.
+	* hash.c: Convert to ISO C90 formatting.
+	* ieee.c: Convert to ISO C90 formatting.
+
+2005-03-22  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Don't fail for
+	unresolved symbols in R_ARM_NONE relocations.
+
+2005-03-22  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Add
+	UNRESOLVED_RELOC_P argument.  Set it appropriately.
+	(elf32_arm_relocate_section): Update call to
+	elf32_arm_final_link_relocate.  Don't clobber RELOCATION; use
+	unresolved_reloc instead.
+
+2005-03-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_link_add_object_symbols): Set SEC_EXCLUDE on
+	.gnu.warning.* sections.
+
+2005-03-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (elf_linker_section_pointers_t): Remove
+	written_address_p.
+	(ppc_elf_create_linker_section): Don't try to reuse existing section.
+	(elf_create_pointer_linker_section): Delete info parm.  Don't make
+	h dynamic.  Don't set written_address_p.
+	(ppc_elf_check_relocs): Adjust ppc_elf_create_linker_section calls.
+	(bfd_put_ptr): Delete.
+	(elf_finish_pointer_linker_section): Remove output_bfd and info parms.
+	Always write section contents.  Assert global sym is def_regular.
+	Use offset bottom bit as a written flag.
+	(ppc_elf_relocate_section): Adjust elf_finish_pointer_linker_section
+	calls.
+
+2005-03-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_set_sdata_syms): New function, extracted from..
+	(ppc_elf_set_sdata_syms): ..here.  Expand comment.  Set .sbss start
+	and end syms.
+
+2005-03-21  Nick Clifton  <nickc@redhat.com>
+
+	* coff-arm.c (coff_link_hash_entry): Only define for non WINCE
+	targets.
+	(t2a1_bx_pc_insn): Likewise.
+	(t2a2_noop_insn): Likewise.
+	(t2a3_b_insn): Likewise.
+	(t2a1_push_insn): Likewise.
+	(t2a2_ldr_insn): Likewise.
+	(t2a3_mov_insn): Likewise.
+	(t2a4_bx_insn): Likewise.
+	(t2a5_pop_insn): Likewise.
+	(t2a6_bx_insn): Likewise.
+	(coff_arm_relocate_section): Only declare the high_address
+	variable for non WINCE targets.
+
+2005-03-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_add_symbol_hook): Make htab->sbss
+	SEC_LINKER_CREATED.  Attach to dynobj.
+	(ppc_elf_size_dynamic_sections): Strip htab->sbss if zero size.
+
+2005-03-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (struct elf_linker_section): Remove sym_hash and
+	sym_offset.  Add name, bss_name, sym_name, sym_val.
+	(struct ppc_elf_link_hash_table): Remove sdata and sdata2 pointers.
+	Add sdata array of elf_linker_section_t.
+	(ppc_elf_link_hash_table_create): Set name, sym_name, and bss_name.
+	(enum elf_linker_section_enum): Delete.
+	(ppc_elf_create_linker_section): Rewrite.  Don't create syms here.
+	(ppc_elf_check_relocs): Delay ppc_elf_create_linker_section until
+	the special sections are needed.  Adjust htab->sdata refs.
+	Ensure dynobj is set in sreloc code.
+	(ppc_elf_size_dynamic_sections): Strip sdata sections.
+	(ppc_elf_set_sdata_syms): New function.
+	(elf_finish_pointer_linker_section): Use 0x8000 for sym_offset.
+	(ppc_elf_relocate_section): Adjust references to htab->sdata.  Use
+	sym_val instead of sym_hash.
+	* elf32-ppc.h (ppc_elf_set_sdata_syms): Declare.
+
+2005-03-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (is_ppc_elf_target): Move to linker part of file.
+	(ppc_elf_merge_private_bfd_data): Likewise.
+
+2005-03-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (struct elf_linker_section): Remove rel_section.
+	(ppc_elf_create_linker_section): Don't create rel_section.
+	(elf_create_pointer_linker_section): Don't size relocs.
+	(elf_finish_pointer_linker_section): Remove relative_reloc parm.
+	Don't generate relocs.
+	(ppc_elf_relocate_section): Adjust calls to
+	elf_finish_pointer_linker_section.
+
+2005-03-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (is_ppc_elf_target): New function.
+	(ppc_elf_merge_private_bfd_data): Use it rather than just testing
+	for bfd_target_elf_flavour.  Do this test before endian check.
+	(ppc_elf_add_symbol_hook): Use is_pcc_elf_target.
+	(ppc_elf_size_dynamic_sections): Likewise.
+
+2005-03-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (elf_backend_data): Add int to
+	elf_backend_section_from_shdr.
+	(bfd_elf_section_data): Update comment for this_idx.
+	(_bfd_elf_make_section_from_shdr): Add int.
+	* elfxx-mips.h (_bfd_mips_elf_section_from_shdr): Likewise.
+
+	* elf.c (_bfd_elf_make_section_from_shdr): Take section index
+	and use it to set this_idx in bfd_elf_section_data.
+	(bfd_section_from_shdr): Pass shindex to
+	_bfd_elf_make_section_from_shdr.
+	(_bfd_elf_section_from_bfd_section): Use this_idx in
+	bfd_elf_section_data to find section index.
+
+	* elf32-arm.c (elf32_arm_section_from_shdr): Take section
+	index and pass it to _bfd_elf_make_section_from_shdr.
+	* elf32-i370.c(i370_elf_section_from_shdr): Likewise.
+	* elf32-ppc.c (ppc_elf_section_from_shdr): Likewise.
+	* elf32-sh64.c (sh64_backend_section_from_shdr): Likewise.
+	* elf32-v850.c (v850_elf_section_from_shdr): Likewise.
+	* elf64-alpha.c (elf64_alpha_section_from_shdr): Likewise.
+	* elf64-hppa.c (elf64_hppa_section_from_shdr): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_section_from_shdr): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_section_from_shdr): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_section_from_shdr): Likewise.
+
+2005-03-19  Danny Smith <dannysmith@users.sourceforge.net>
+	    Ross Ridge  <rridge@csclub.uwaterloo.ca>
+
+	* peicode.h (pe_ILF_build_a_bfd): Strip only one prefix
+	character in IMPORT_NAME_UNDECORATE and IMPORT_NAME_NOPREFIX
+	cases.  Add comment.
+
+2005-03-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (elf_mark_used_section): Remove check for special
+	sections.
+
+2005-03-18  Andreas Schwab  <schwab@suse.de>
+
+	* elfxx-ia64.c (elfNN_ia64_install_value): Change type of insn
+	from bfd_vma to ia64_insn, remove broken cast.
+
+2005-03-18  C Jaiprakash  <cjaiprakash@noida.hcltech.com>
+
+	* elf32-m68k.c (elf_cfv4e_plt0_entry): plt entry for coldfire v4e.
+	(elf_m68k_adjust_dynamic_symbol,elf_m68k_finish_dynamic_symbol,
+	 elf_m68k_finish_dynamic_sections): Use it.
+
+2005-03-17  Paul Brook <paul@codesourcery.com>
+	    Dan Jacobowitz <dan@codesourcery.com>
+	    Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_modify_segment_map): New function.
+	(elf32_arm_additional_program_headers): Likewise.
+	(elf_backend_modify_segment_map): Define.
+	(elf_backend_additional_program_headers): Likewise.
+	(elf32_arm_symbian_modify_segment_map): Use
+	elf32_arm_modify_segment_map.
+
+2005-03-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (elf_mark_used_section): Check bfd_is_const_section
+	for special sections.
+
+2005-03-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (_bfd_elf_link_renumber_dynsyms): Delete.
+	* elflink.c (_bfd_elf_link_renumber_dynsyms): Make static, add
+	section_sym_count param, and return number of section symbols.
+	(bfd_elf_size_dynamic_sections): Clear section symbol area of
+	.dynsym contents.  Don't bother calling swap_symbol_out on the
+	first all-zero dynsym.
+	(elf_mark_used_section): Formatting.  Avoid twiddling flags in
+	special sections like bfd_abs_section.
+	(bfd_elf_gc_sections): Spelling fix.
+
+2005-03-16  Fred Fish  <fnf@specifixinc.com>
+
+	PR binutils/790
+	* dwarf2.c (read_indirect_string): Fix apparent typo, check
+	dwarf_str_buffer allocation, not dwarf_abbrev_buffer.
+
+2005-03-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (elf_mark_used_section): New.
+	(bfd_elf_gc_sections): Call elf_gc_mark_section for
+	non-relocatable link if we don't do GC.
+
+2005-03-16  Nick Clifton  <nickc@redhat.com>
+	    Ben Elliston  <bje@au.ibm.com>
+
+	* configure.in (werror): New switch: Add -Werror to the
+	compiler command line.  Enabled by default.  Disable via
+	--disable-werror.
+	* configure: Regenerate.
+
+2005-03-16  Nick Clifton  <nickc@redhat.com>
+
+	* ecoff.c: Convert to ISO C90 formatting.
+
+2005-03-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c: Divide file into general and linker specific
+	functions.  Sort linker functions into roughly the order in which
+	they are called by the ELF linker code.
+
+2005-03-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_create_linker_section): Set SEC_LINKER_CREATED
+	on section.  Correct comment, and add FIXME.
+	(ppc_elf_additional_program_headers): Don't bump header count for
+	interp.  Test SEC_ALLOC, not SEC_LOAD, and don't test size.
+	(ppc_elf_size_dynamic_sections): Don't strip sdata and sdata2, but
+	do allocate memory if they need it.
+
+2005-03-15  Mikkel Krautz  <krautz@gmail.com>
+
+	* config.bfd (x86_64-elf): Add target.
+
+2005-03-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* po/es.po: Commit new Spanish translation.
+
+2005-03-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Set symbo name
+	for global symbol when reporting overflow.
+
+2005-03-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* libbfd-in.h (_bfd_ar_spacepad): New prototype.
+	* libbfd.h: Rebuilt.
+	* archive.c (_bfd_ar_spacepad): New function.
+	(_bfd_construct_extended_name_table, _bfd_write_archive_contents,
+	bsd_write_armap, _bfd_archive_bsd_update_armap_timestamp,
+	coff_write_armap): Use it.
+	(bfd_ar_hdr_from_filesystem): Likewise.  Fix HP-UX large
+	uid/gid support.
+	* archive64.c (bfd_elf64_archive_write_armap): Use _bfd_ar_spacepad.
+
+2005-03-10  Mark Kettenis  <kettenis@gnu.org>
+
+	* archive.c (_bfd_look_for_bfd_in_cache): Move declaration of
+	has_table to the start of the function.
+
+2005-03-10  Ben Elliston  <bje@au.ibm.com>
+
+	* archive.c: Include hashtab.h.
+	(struct ar_cache): Rename `arelt' to `arbfd' and remove `next'.
+	(_bfd_look_for_bfd_in_cache): Reimplement using htab_find.
+	(hash_file_ptr): New function.
+	(eq_file_ptr): Likewise.
+	(_bfd_add_bfd_to_archive_cache): Reimplement using a hash table.
+	* libbfd-in.h: Include hashtab.h.
+	(struct artdata): Change `cache' member type to htab_t.
+	* libbfd.h: Rebuild.
+
+2005-03-08  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* configure.in: Bump version to 2.16.90.
+	* configure: Regenerated.
+
+2005-03-07  Jakub Jelinek  <jakub@redhat.com>
+
+	* opncls.c (opncls_bread, opncls_bclose): Fix if pread resp.
+	close is a function like macro in system headers.
+
+2005-03-07  Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/778
+	* elf32-hppa.c (elf32_hppa_create_dynamic_sections): Reinstate
+	_GLOBAL_OFFSET_TABLE_ as a normal dynamic symbol.
+
+2005-03-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (elfcore_grok_win32pstatus): Warning fixes.
+
+2005-03-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* po/bfd.pot: Regenerate.
+
+2005-03-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (update_plt_info): Don't mark new ABI call syms
+	with is_func.
+	(func_desc_adjust): Force dot-syms local in executables as well
+	as shared libs.
+
+2005-03-04  David Daney  <ddaney@avtrex.com>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): Handle special
+	'__gnu_local_gp' symbol used by gas -mno-shared.
+
+2005-03-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (elf_backend_data): Add "const char *" to
+	elf_backend_section_from_phdr.
+
+	* elf.c (bfd_section_from_phdr): Pass "proc" to the
+	elf_backend_section_from_phdr hook.
+
+2005-03-02  Daniel Jacobowitz  <dan@codesourcery.com>
+	    Joseph Myers  <joseph@codesourcery.com>
+
+	* elfxx-mips.c (struct mips_got_entry): Add tls_type.
+	(struct mips_got_info): Add tls_gotno, tls_assigned_gotno,
+	and tls_ldm_offset.
+	(struct mips_elf_got_per_bfd_arg): Add global_count.
+	(struct mips_elf_count_tls_arg): New.
+	(struct mips_elf_hash_sort_data): Update comment for min_got_dynindx.
+	(struct mips_elf_link_hash_entry): Add tls_type and tls_got_offset.
+	(GOT_NORMAL, GOT_TLS_GD, GOT_TLS_LDM, GOT_TLS_IE)
+	(GOT_TLS_OFFSET_DONE, GOT_TLS_DONE): Define.
+	(TLS_RELOC_P): Define.
+	(TP_OFFSET, DTP_OFFSET): Define.
+	(dtprel_base, tprel_base): New functions.
+	(mips_elf_link_hash_newfunc): Initialize tls_type.
+	(mips_elf_got_entry_hash, mips_elf_got_entry_eq)
+	(mips_elf_multi_got_entry_hash, mips_elf_multi_got_entry_eq): Handle
+	TLS entries.
+	(mips_tls_got_relocs, mips_elf_count_local_tls_relocs)
+	(mips_elf_count_global_tls_entries, mips_elf_count_global_tls_relocs)
+	(mips_elf_output_dynamic_relocation, mips_elf_initialize_tls_slots)
+	(mips_tls_got_index): New functions.
+	(mips_elf_local_got_index): Add new R_SYMNDX, H, and R_TYPE
+	arguments.  Pass them to mips_elf_create_local_got_entry.  Use
+	mips_tls_got_index.
+	(mips_elf_global_got_index): Add new R_TYPE and INFO arguments.
+	Handle TLS entries.
+	(mips_elf_got_page, mips_elf_got16_entry): Update calls to
+	mips_elf_create_local_got_entry.
+	(mips_elf_create_local_got_entry): Add new R_SYMNDX, H, and R_TYPE
+	arguments.  Handle TLS entries.
+	(mips_elf_sort_hash_table_f): Add non-TLS assertions.
+	(mips_elf_record_local_got_symbol): Add new TLS_FLAG argument.  Handle
+	TLS entries.
+	(mips_elf_record_global_got_symbol): Likewise.
+	(mips_elf_make_got_per_bfd): Initialize new mips_got_info members.
+	Count TLS entries.
+	(mips_elf_merge_gots): Handle TLS entries when merging.
+	(mips_elf_initialize_tls_index): New function.
+	(mips_elf_set_global_got_offset): Handle TLS entries.
+	(mips_elf_adjust_gp): Handle TLS.
+	(mips_elf_multi_got): Remove redundant call to
+	mips_elf_resolve_final_got_entries.  Initialize global_count.
+	Correct a comment.  Initialize new TLS members of mips_got_info.
+	Assign TLS GOT indexes for new GOTs.
+	(mips_elf_create_got_section): Initialize new TLS members of
+	mips_got_info.
+	(mips_elf_calculate_relocation): Handle TLS relocs.
+	(_bfd_mips_elf_check_relocs): Likewise.  Update calls to changed
+	functions.
+	(_bfd_mips_elf_always_size_sections): Handle TLS.
+	(_bfd_mips_elf_size_dynamic_sections): Likewise.
+	(_bfd_mips_elf_finish_dynamic_symbol): Likewise.  Update calls to
+	changed functions.
+	(_bfd_mips_elf_copy_indirect_symbol): Copy tls_type.
+	(_bfd_mips_elf_hide_symbol): Handle TLS.
+	* elfn32-mips.c (elf_mips_howto_table_rel, elf_mips_howto_table_rela)
+	(mips_reloc_map): Add TLS relocs.
+	* elf32-mips.c (elf_mips_howto_table_rel, mips_reloc_map): Likewise.
+	* elf64-mips.c (mips_elf64_howto_table_rel)
+	(mips_elf64_howto_table_rela, mips_reloc_map): Likewise.
+	* reloc.c: Define new MIPS TLS relocations.
+	* libbfd.h, bfd-in2.h: Regenerated.
+
+2005-03-02  Jan Beulich  <jbeulich@novell.com>
+
+	* Makefile.am: Add dependency of cache.o on libiberty.h.
+	* cache.c: Include libiberty.h.
+	(bfd_open_file): Use unlink_if_ordinary instead of unlink.
+
+2005-03-01  Zack Weinberg  <zack@codesourcery.com>
+
+	* elf.c (bfd_section_from_shdr <default case>): Call
+	elf_backend_section_from_shdr hook unconditionally, and return
+	what it returns.
+	(bfd_section_from_phdr): Similarly, for elf_backend_section_from_phdr.
+	* elfxx-target.h (elf_backend_section_from_shdr)
+	(elf_backend_section_from_phdr): Default to
+	_bfd_elf_make_section_from_shdr and _bfd_elf_make_section_from_phdr
+	respectively.
+
+2005-03-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* targets.h: Typo fix.
+	* bfd-in2.h: Regenerate.
+
+	* bout.c (b_out_write_object_contents): Don't use sizeof on host
+	structs to size on-disk structures.
+	(b_out_set_section_contents): Size the external struct, not the
+	internal one for on-disk size.
+	(b_out_sizeof_headers): Likewise.
+
+2005-03-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_size_stubs): Override defined dot-sym
+	entry points with the func descriptor as well as undefweak.
+
+2005-02-28  Ross Ridge  <rridge@csclub.uwaterloo.ca>
+
+	* peicode.h (pe_ILF_build_a_bfd): Do not assume that an @ will be
+	present when IMPORT_NAME_UNDOECRATE is used.
+
+2005-02-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 757
+	* elf-bfd.h (_bfd_elf_merge_symbol): Add a pointer to unsigned
+	int.
+
+	* elf32-sh-symbian.c (sh_symbian_relocate_section): Pass NULL
+	to _bfd_elf_merge_symbol.
+
+	* elflink.c (_bfd_elf_merge_symbol): Use the pointer to
+	unsigned int to return the alignment of the old common symbol
+	in the dynamic object.
+	(_bfd_elf_add_default_symbol): Pass NULL to
+	_bfd_elf_merge_symbol.
+	(elf_link_add_object_symbols): Pass &old_alignment to
+	_bfd_elf_merge_symbol. Get the alignment of the new common
+	symbol in the dynamic object.
+
+2005-02-24  Ben Elliston  <bje@au.ibm.com>
+
+	* coffcode.h (coff_sym_filepos): Remove GNU960 conditional code.
+	* format.c (bfd_check_format_matches): Likewise.
+	* archive.c (BFD_GNU960_ARMAG): Likewise.
+	(bfd_generic_archive_p): Likewise.
+	(_bfd_write_archive_contents): Likewise.
+
+2005-02-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.in: (AM_INIT_AUTOMAKE): Set version to 2.15.95.
+	* configure: Regenerate.
+
+2005-02-24  Julian Brown  <julian@sirius.codesourcery.com>
+
+	* elflink.c (elf_link_add_object_symbols): Force symbols in discarded
+	COMDAT group sections to have default visibility.
+
+2005-02-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* coffcode.h (coff_print_aux): Warning fix.
+	* elf-m10300.c (mn10300_elf_relax_section): Use section->id
+	instead of section pointer to identify.
+	* coff-h8300.c (h8300_reloc16_extra_cases): Likewise.  Allocate
+	the correct size buffer for local sym mangling too.
+	(h8300_bfd_link_add_symbols): Likewise.
+	* elf32-sh-symbian.c (sh_symbian_process_embedded_commands): Fix
+	warning.
+	* elf32-sh64.c (shmedia_prepare_reloc): Use %B and %p in error message
+	* elf32-xtensa.c (literal_value_hash): Warning fix.
+	* versados.c (process_otr): Warning fix.
+	(versados_canonicalize_reloc): Likewise.
+	* vms-gsd.c (_bfd_vms_slurp_gsd): Warning fix.
+	* vms.c (fill_section_ptr): Warning fix.
+
+2005-02-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* coff-tic54x.c (SWAP_OUT_RELOC_EXTRA): Defined.
+	* coff-tic80.c (SWAP_OUT_RELOC_EXTRA): Likewise.
+
+2005-02-23  Nick Clifton  <nickc@redhat.com>
+
+	* elfxx-mips.c (mips_elf_create_dynamic_relocation): Initialise
+	the relvaddr field of the Elf32_crinfo structure.
+
+	* elf32-m68hc1x.c (elf32_m68hc11_relocate_section): Initialise
+	variables that are passed by reference to
+	m68hc11_get_relocation_value in case that function does not
+	initialise them.
+
+	* elf32-cr16c.c (cr16c_elf_final_link_relocate): Remove duplicated
+	return statements and replace with a single return at the end of
+	the function.  This helps pacify the flow analysis code in gcc 4.0.
+
+	* elf.c (_bfd_elf_compute_section_file_positions): Initialise
+	strtab to avoid compile time warning.
+
+2005-02-23  Ben Elliston  <bje@au.ibm.com>
+
+	* opncls.c (bfd_zalloc): Document this function.
+
+2005-02-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* coffcode.h (sec_to_styp_flags): Replaced SEC_CLINK with
+	SEC_TIC54X_CLINK. Replace SEC_BLOCK with SEC_TIC54X_BLOCK.
+	Replace SEC_SHARED with SEC_COFF_SHARED.
+	(styp_to_sec_flags): Likewise.
+
+	* elfxx-target.h (TARGET_BIG_SYM): Remove SEC_ARCH_BIT_0.
+	(TARGET_LITTLE_SYM): Likewise.
+
+	* section.c (SEC_ARCH_BIT_0): Removed.
+	(SEC_LINK_DUPLICATES_SAME_CONTENTS): Defined with
+	SEC_LINK_DUPLICATES_ONE_ONLY and SEC_LINK_DUPLICATES_SAME_SIZE.
+	(SEC_SHARED): Renamed to ...
+	(SEC_COFF_SHARED): This.
+	(SEC_BLOCK): Renamed to ...
+	(SEC_TIC54X_BLOCK): This.
+	(SEC_CLINK): Renamed to ...
+	(SEC_TIC54X_CLINK): This.
+	(SEC_XXX): Rearranged. Move SEC_COFF_SHARED_LIBRARY,
+	SEC_COFF_SHARED, SEC_TIC54X_BLOCK and SEC_TIC54X_CLINK to the
+	end.
+	* bfd-in2.h: Regenerated.
+
+2005-02-21  Fred Fish  <fnf@specifixinc.com>
+
+	* dwarf2.c (find_abstract_instance_name): Call recursively
+	to handle a DW_AT_specification.
+
+2005-02-21  Thiemo Seufer  <seufer@csv.ica.uni-stuttgart.de>
+
+	* elfxx-mips.c (ecoff_swap_rpdr_out, mips_elf_output_extsym,
+	mips_elf_create_dynamic_relocation,
+	_bfd_mips_elf_size_dynamic_sections, _bfd_mips_elf_final_link):
+	Remove #if 0'd code.
+
+2005-02-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am"
+	* Makefile.in: Regenerate.
+
+2005-02-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* coffgen.c (bfd_coff_get_comdat_section): Check that
+	coff_section_data isn't NULL.
+
+2005-02-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd-in.h (bfd_elf_bfd_from_remote_memory): Warning fix.
+	* coff-m68k.c (bfd_m68k_coff_create_embedded_relocs): Likewise.
+	* coff-rs6000.c (xcoff_write_armap_big): Warning fixes.  Remove
+	useless assignments.
+	(xcoff_write_archive_contents_big): Likewise.
+	(_bfd_xcoff_put_ldsymbol_name): Likewise.
+	* coff64-rs6000.c (_bfd_xcoff64_put_ldsymbol_name): Likewise.
+	* coffgen.c (coff_write_symbols): Make "written" a bfd_vma.
+	* cofflink.c (process_embedded_commands): Warning fixes.
+	* cpu-arm.c: Delete unnecessary prototypes.  Convert to C90.
+	Warning fixes.
+	* dwarf2.c: Warning fixes.
+	* elf-bfd.h: Likewise.
+	* elf-eh-frame.c: Likewise.
+	* elf-strtab.c: Likewise.
+	* elf.c: Likewise.
+	* elf32-m68k.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-sh-symbian.c: Likewise.
+	* elf32-sh.c: Delete unnecessary prototypes.  Warning fixes.
+	* elf64-sh64.c: Likewise.
+	* peicode.h: Likewise.
+	* elf64-mmix.c: Warning fixes.
+	* elfcode.h: Likewise.
+	* elfxx-mips.c: Likewise.
+	* libbfd-in.h: Likewise.
+	* libbfd.c: Likewise.
+	* mach-o.c: Likewise.
+	* merge.c: Likewise.
+	* mmo.c: Likewise.
+	* opncls.c: Likewise.
+	* pef.c: Likewise.
+	* srec.c: Likewise.
+	* vms-hdr.c: Likewise.
+	* vms-tir.c: Likewise.
+	* xtensa-isa.c: Likewise.
+	* xtensa-modules.c: Likewise.
+	* xsym.c: Likewise.
+	(pstrcmp): Use correct choice of string lengths.  Fix return value.
+	(bfd_sym_module_name): Correct string length.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2005-02-17  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-frv.c (elf32_frv_relocate_section): Remove warning from
+	uninitialized check_segment[1] in TLSMOFF case.
+	Reported by Alan Modra.
+	(elf32_frv_relocate_section): Improve errors and warnings.
+
+2005-02-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Fix warning.
+
+2005-02-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* coff-arm.c (coff_arm_is_local_label_name): Warning fix.
+	* elf32-frv.c (frvfdpic_relocs_info_hash): Likewise.
+	* pef.c (bfd_pef_scan): Don't ignore return value of
+	bfd_pef_scan_start_address.
+	* mach-o.c (bfd_mach_o_scan): Don't ignore return value of
+	bfd_mach_o_scan_start_address.
+	* elfxx-ia64.c (elfNN_ia64_relax_brl): Rewrite for 32-bit bfd_vma.
+	* elfxx-mips.c: Remove unnecessary prototypes.
+	(sort_dynamic_relocs_64): Abort if not BFD64.
+
+2005-02-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_edit_toc): Skip toc if size is zero.
+	Skip toc reloc adjust if reloc_count is zero.
+
+2005-02-15  Nigel Stephens  <nigel@mips.com>
+	    Maciej W. Rozycki  <macro@mips.com>
+
+	* elf32-mips.c (elf_mips16_howto_table_rel): New array for MIPS16
+	reloc howtos.  Add R_MIPS16_HI16 and R_MIPS16_LO16 relocs and
+	R_MIPS16_GOT16 and R_MIPS16_CALL16 placeholders.
+	(elf_mips16_jump_howto): Move into elf_mips16_howto_table_rel.
+	(elf_mips16_gprel_howto): Likewise.  Redefine src_mask and
+	dst_mask.
+	(mips16_gprel_reloc): Remove bit shuffling; call
+	_bfd_mips16_elf_reloc_unshuffle(), _bfd_mips_elf_gprel16_with_gp()
+	and _bfd_mips16_elf_reloc_shuffle() instead.
+	(mips16_reloc_map): New reloc map for MIPS16 relocs.
+	(bfd_elf32_bfd_reloc_type_lookup): Use mips16_reloc_map for MIPS16
+	relocs.
+	(mips_elf32_rtype_to_howto): Fetch MIPS16 howtos from
+	elf_mips16_howto_table_rel.
+	* elf64-mips.c (mips16_elf64_howto_table_rel): New array for
+	MIPS16 REL reloc howtos.  Add R_MIPS16_HI16 and R_MIPS16_LO16
+	relocs and R_MIPS16_GOT16 and R_MIPS16_CALL16 placeholders.
+	(elf_mips16_jump_howto): Move into mips16_elf64_howto_table_rel.
+	(elf_mips16_gprel_howto): Likewise.  Redefine src_mask and
+	dst_mask.
+	(mips16_elf64_howto_table_rela): New array for MIPS16 RELA
+	reloc howtos.  Add R_MIPS16_26, R_MIPS16_GPREL, R_MIPS16_HI16 and
+	R_MIPS16_LO16 relocs and R_MIPS16_GOT16 and R_MIPS16_CALL16
+	placeholders.
+	(mips16_gprel_reloc): Remove bit shuffling; call
+	_bfd_mips16_elf_reloc_unshuffle(), _bfd_mips_elf_gprel16_with_gp()
+	and _bfd_mips16_elf_reloc_shuffle() instead.
+	(mips16_reloc_map): New reloc map for MIPS16 relocs.
+	(bfd_elf64_bfd_reloc_type_lookup): Use mips16_reloc_map for MIPS16
+	relocs.
+	(mips_elf64_rtype_to_howto): Fetch MIPS16 howtos from
+	mips16_elf64_howto_table_rela or mips16_elf64_howto_table_rel.
+	* elfn32-mips.c (elf_mips16_howto_table_rel): New array for MIPS16
+	REL reloc howtos.  Add R_MIPS16_HI16 and R_MIPS16_LO16 relocs and
+	R_MIPS16_GOT16 and R_MIPS16_CALL16 placeholders.
+	(elf_mips16_jump_howto): Move into elf_mips16_howto_table_rel.
+	(elf_mips16_gprel_howto): Likewise.  Redefine src_mask and
+	dst_mask.
+	(mips16_gprel_reloc): Remove bit shuffling; call
+	_bfd_mips16_elf_reloc_unshuffle(), _bfd_mips_elf_gprel16_with_gp()
+	and _bfd_mips16_elf_reloc_shuffle() instead.
+	(mips16_reloc_map): New reloc map for MIPS16 relocs.
+	(bfd_elf32_bfd_reloc_type_lookup): Use mips16_reloc_map for MIPS16
+	relocs.
+	(mips_elf_n32_rtype_to_howto): Fetch MIPS16 howtos from
+	elf_mips16_howto_table_rela or elf_mips16_howto_table_rel.
+	* elfxx-mips.c (_bfd_mips16_elf_reloc_unshuffle): New function to
+	handle bit shuffling for MIPS16 relocs.
+	(_bfd_mips16_elf_reloc_shuffle): Likewise.
+	(_bfd_mips_elf_lo16_reloc): Use _bfd_mips16_elf_reloc_unshuffle()
+	and _bfd_mips16_elf_reloc_shuffle().
+	(_bfd_mips_elf_generic_reloc): Likewise.
+	(mips_elf_calculate_relocation): Likewise.  Handle R_MIPS16_HI16
+	and R_MIPS16_LO16.
+	(mips_elf_obtain_contents): Remove bit shuffling.
+	(mips_elf_perform_relocation): Likewise; call
+	_bfd_mips16_elf_reloc_unshuffle() and _bfd_mips16_elf_reloc_shuffle()
+	instead.
+	(_bfd_mips_elf_relocate_section): Likewise.  Handle R_MIPS16_HI16
+	and R_MIPS16_LO16.
+	* elfxx-mips.h (_bfd_mips16_elf_reloc_unshuffle): Declare.
+	(_bfd_mips16_elf_reloc_shuffle): Likewise.
+	* reloc.c (BFD_RELOC_MIPS16_HI16): New reloc.
+	(BFD_RELOC_MIPS16_HI16_S): Likewise.
+	(BFD_RELOC_MIPS16_LO16): Likewise.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2005-02-15  Jan Beulich  <jbeulich@novell.com>
+
+	* elfxx-ia64.c (ia64_howto_table): Correct strings for
+	R_IA64_DTPMOD64[LM]SB.
+
+2005-02-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Allow relax
+	backward branch in the same section.
+	(elfNN_ia64_relocate_section): Inform users that the input
+	section is too big to relax br instruction when overflow
+	happens to R_IA64_PCREL21B, R_IA64_PCREL21BI, R_IA64_PCREL21M
+	and R_IA64_PCREL21F.
+
+2005-02-14 Orjan Friberg <orjanf@axis.com>
+
+	* elfcore.h (elf_core_file_p): Move the call to
+	elf_backend_object_p to allow the correct machine to be set before
+	processing the program headers.
+
+2005-02-14  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/716
+	* peicode.h (pe_bfd_copy_private_bfd_data): Copy the large address
+	aware flag from the input bfd to the output bfd.
+
+2005-02-11  Maciej W. Rozycki  <macro@mips.com>
+
+	* elf32-mips.c (_bfd_mips_elf32_gprel16_reloc): Reject
+	R_MIPS_LITERAL relocations for external symbols.
+	* elf64-mips.c (mips_elf64_literal_reloc): Likewise.
+	* elfn32-mips.c (mips_elf_literal_reloc): Likewise.
+
+2005-02-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfd-in2.h: Rebuilt.
+
+2005-02-11  Paul Brook  <paul@codesourcery.com>
+
+	* elf-bfd.h (struct elf_link_hash_table): Add
+	is_relocatable_executable.
+	* elf.c (_bfd_elf_link_hash_table_init): Initialize it.
+	* elflink.c (bfd_elf_link_record_dynamic_symbol): Create local dynamic
+	symbols in relocatable executables.
+	(bfd_elf_record_link_assignment): Create dynamic section symbols in
+	relocatable executables.
+	(_bfd_elf_link_renumber_dynsyms): Ditto.
+	(bfd_elf_final_link): Ditto.
+	* elf32-arm.c (elf32_arm_final_link_relocate): Copy absolute
+	relocations into relocatable executables.
+	(elf32_arm_check_relocs): Crate dynamic sections for relocatable
+	executables.  Also copy absolute relocations.
+	(elf32_arm_adjust_dynamic_symbol): Don't create copy relocations
+	in relocatable executables.
+	(allocate_dynrelocs): Copy relocations for relocatable executables.
+	Output dynamic symbols for symbols defined in linker scripts.
+
+2005-02-11  Nick Clifton  <nickc@redhat.com>
+
+	* libbfd.c (read_signed_leb128): Use an unsigned type for 'shift'
+	to avoid a compile time warning.
+
+	* coff-alpha.c (alpha_adjust_reloc_in): Remove redundant test from
+	BFD_ASSERT.
+
+	* coff-tic4x.c (coff_rtype_to_howto): Move definition before
+	inclusion of coffcode.h so that it is actually picked up.
+
+	* coffcode.h (coff_std_swap_table): Add an unused attribute in
+	case it is not used.
+
+	* elf32-ip2k.c (ip2k_call_opcode, IS_CALL_OPCODE): Remove unused
+	structure and macro.
+
+	* elf32-iq2000.c (iq2000_reloc_map): Remove unused structure and
+	array.
+
+	* elf32-m32r.c (m32r_reloc_map_old): Use #ifdef	USE_M32R_OLD_RELOC
+	to protect the declaration of this array.
+
+	* xsym.c (bfd_sym_parse_contained_variables_table_entry_v32):
+	Avoid call to memcpy with a size of 0.
+
+2005-02-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (toc_adjusting_stub_needed): Return true for
+	old-style branches to undefined dot-symbols which will be
+	satisfied by a plt call.
+
+2005-02-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (move_plt_plist): New function, extracted from..
+	(ppc64_elf_copy_indirect_symbol): ..here.
+	(func_desc_adjust): Use move_plt_plist.
+
+2005-02-10  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Handle R_ARM_THM_PC9.
+
+2005-02-10  Paul Brook  <paul@codesourcery.com>
+
+	* elflink.c (bfd_elf_record_link_assignment): Make hidden and internal
+	symbols local.
+	(elf_link_renumber_hash_table_dynsyms): Ignore local symbols.
+	(elf_link_renumber_local_hash_table_dynsyms): New function.
+	(_bfd_elf_link_renumber_dynsyms): Number local dynamic symbols.
+
+2005-02-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* bfd-in.h (BFD_LINKER_CREATED): Define.
+	* bfd-in2.h: Rebuilt.
+	* elflink.c (bfd_elf_size_dynamic_sections): Disregard
+	BFD_LINKER_CREATED bfds when determining input bfds without
+	.note.GNU-stack section.
+
+2005-02-10  Maciej W. Rozycki  <macro@mips.com>
+
+	* elf64-mips.c (mips16_gprel_reloc): Update a comment.
+	* elfn32-mips.c (mips16_gprel_reloc): Keep R_MIPS16_GPREL
+	relocations against external symbols unchanged.
+
+2005-02-08  Paul Brook  <paul@codesourcery.com>
+
+	* elflink.c (elf_link_input_bfd): Ignore symbols from null input
+	sections.
+
+2005-02-08  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elflink.c (elf_link_add_object_symbols): Don't add "warning: "
+	prefix here.
+
+2005-02-07  Maciej W. Rozycki  <macro@mips.com>
+
+	* elf64-mips.c: Fix formatting throughout.
+
+2005-02-07  Maciej W. Rozycki  <macro@mips.com>
+
+	* elfn32-mips.c (elf_mips_howto_table_rela): Fix a comment typo.
+
+2005-02-07  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-frv.c (FRVFDPIC_SYM_LOCAL): Remove special handling for
+	*ABS*/*UND* sections.
+	(elf32_frv_relocate_section): Move zero-addend-required error...
+	(_frv_emit_got_relocs_plt_entries): ... here.  Report error for
+	missing needed TLS section.
+
+2005-02-07  Hans-Peter Nilsson  <hp@axis.com>
+
+	* aoutx.h (NAME(aout,find_nearest_line)): Correct case for N_SO
+	being the last symbol.
+	(aout_link_add_symbols): Just return TRUE if a warning
+	symbol was last.
+
+2005-02-07  Maciej W. Rozycki  <macro@mips.com>
+
+	* elf32-mips.c (mips_elf_gprel32_reloc): Reject
+	R_MIPS_GPREL32 relocations against external symbols.
+	* elf64-mips.c (mips_elf64_gprel32_reloc): Replace an incorrect
+	comment.
+
+2005-02-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (elf_string_from_elf_strtab): Delete macro.
+	* elf.c (bfd_elf_string_from_elf_section): Expand occurrence of
+	elf_string_from_elf_strtab.
+	(_bfd_elf_setup_group_pointers, bfd_section_from_shdr): Likewise.
+	(bfd_section_from_shdr): For SHT_SYMTAB, load SHT_SYMTAB_SHNDX too
+	if it exists.  Don't do the reverse for SHT_SYMTAB_SHNDX.  For
+	SHT_STRTAB, check whether the strtab is for symtab or dynsymtab by
+	looking at cached symtab info first, before iterating over headers.
+	For SHT_REL and SHT_RELA, load dynsymtab if needed.
+	* elfcode.h (elf_object_p): Don't load section header stringtab
+	specially.
+
+2005-02-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_relocate_section): Disallow R_386_GOTOFF
+	against protected function when building shared library.
+
+	PR 584
+	* elf64-x86-64.c (is_32bit_relative_branch): New.
+	(elf64_x86_64_relocate_section): Alllow R_X86_64_PC32 on a
+	protected function symbol when building shared library for
+	32bit relative branch instruction.
+
+2005-02-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (add_symbol_adjust): Don't create fake descriptor
+	syms when doing a relocatable link.
+	(ppc64_elf_gc_mark_hook): Check that syms are defined before looking
+	at u.def.section.
+	(ppc64_elf_tls_setup): Likewise.
+	(ppc64_elf_edit_opd): Don't use an undefined func desc sym.
+
+2005-02-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (struct ppc_link_hash_entry): Add "fake".
+	(link_hash_newfunc): Clear all locals using memset.
+	(make_fdh): Remove flags param.  Always create fake func desc
+	weak.  Link the descriptor with the code entry sym.
+	(ppc64_elf_archive_symbol_lookup): Don't return fake syms.
+	(add_symbol_adjust): Adjust make_fdh call.
+	(func_desc_adjust): Likewise.  Twiddle any pre-existing fake
+	descriptor to strong undefined if code entry is strong.
+
+2005-02-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (bfd_elf_record_link_assignment): Do "provide" symbol
+	lookup here.  Set to new before calling bfd_link_repair_undef_list.
+	(elf_smash_syms): Check that u.undef.weak isn't the not_needed bfd.
+
+2005-02-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* linker.c (_bfd_link_hash_newfunc): Set all local fields.
+
+2005-02-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* linker.c (_bfd_generic_link_add_one_symbol): Set u.undef.weak.
+	* elflink.c (elf_smash_syms): Restore symbols that were undefweak
+	before the as-needed lib was loaded.  Abort on unexpected refs.
+
+2005-02-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_smash_syms): Expand comments.
+	(elf_link_add_object_symbols): Only call elf_smash_syms for
+	as-needed dynamic objects.
+
+	* elfxx-ia64.c (elfNN_ia64_new_elf_hash_entry): Don't clear
+	everything, just the field specific to ia64.
+	* elf64-hppa.c (elf64_hppa_new_dyn_hash_entry): Likewise.
+
+2005-02-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (func_desc_adjust): Move code creating func desc sym to..
+	(make_fdh): ..here.  New function.  Don't set BSF_OBJECT for
+	undefined syms.
+	(struct add_symbol_adjust_data): New.
+	(add_symbol_adjust): Make an undefweak func desc for old ABI
+	objects to link with --as-needed shared libs.  Return fail status.
+	Don't adjust old ABI func entry sym to weak if func desc syms
+	isn't defined.
+	(ppc64_elf_check_directives): Adjust call to add_symbol_adjust,
+	and return status.
+
+2005-02-01  Hans-Peter Nilsson  <hp@axis.com>
+
+	* cpu-cris.c (get_compatible): Rearrange disabled code and comment
+	for clarity.
+
+2005-02-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_check_directives): Move undefs list fixup..
+	* linker.c (bfd_link_repair_undef_list): ..to new function, but don't
+	remove anything but new and undefweak.
+	* elflink.c (_bfd_elf_link_create_dynamic_sections): Override any
+	existing _DYNAMIC.
+	(_bfd_elf_create_dynamic_sections): Formatting.
+	(bfd_elf_record_link_assignment): Call bfd_link_repair_undef_list.
+	(_bfd_elf_merge_symbol): Don't handle as-needed syms here.
+	(struct elf_smash_data): New.
+	(elf_smash_syms): New function.
+	(elf_link_add_object_symbols): Call elf_smash_syms.  Don't add
+	unneeded dynamic objects to loaded list.
+	(elf_link_output_extsym): Don't handle as-needed here.  Strip
+	bfd_link_hash_new symbols.
+	* elf32-cris.c (elf_cris_discard_excess_program_dynamics): Don't
+	delref when dynindx is already -1.
+	* elf64-alpha.c (elf64_alpha_output_extsym): Strip bfd_link_hash_new
+	symbols.
+	* elfxx-mips.c (mips_elf_output_extsym): Likewise.
+
+2005-02-01  Ben Elliston  <bje@au.ibm.com>
+
+	* elfxx-target.h (bfd_elfNN_bfd_discard_group): Redefine.
+
+2005-02-01  Ben Elliston  <bje@au.ibm.com>
+
+	* aout-arm.c, aout-target.h, aoutx.h, archive.c, armnetbsd.c,
+	bfd-in.h, bfdio.c, coff-alpha.c, coff-arm.c, coff-h8300.c,
+	coff-i860.c, coff-mcore.c, coff-or32.c, coff-ppc.c, coff-sh.c,
+	coff-sparc.c, coffcode.h, coffgen.c, cofflink.c, cpu-cris.c,
+	cpu-h8500.c, cpu-ns32k.c, ecoff.c, ecofflink.c, elf.c,
+	elf32-dlx.c, elf32-fr30.c, elf32-frv.c, elf32-hppa.c,
+	elf32-i860.c, elf32-ip2k.c, elf32-m32r.c, elf32-sh.c,
+	elf32-v850.c, elf64-mips.c, elf64-sparc.c, elflink.c,
+	i386aout.c, i386msdos.c, i386os9k.c, ieee.c, mach-o.c,
+	nlm32-sparc.c, oasys.c, opncls.c, pdp11.c, pe-mips.c, peXXigen.c,
+	pef.c, peicode.h, reloc.c, riscix.c, section.c, simple.c, som.c,
+	sparclynx.c, targets.c, vms-misc.c, vms-tir.c, xsym.c,
+	hosts/delta68.h, hosts/vaxbsd.h: Remove #if 0'd code
+	throughout. Similarly, collapse #if 1'd code.
+
+2005-02-01  Ben Elliston  <bje@au.ibm.com>
+
+	* elf-bfd.h (bfd_elf_discard_group): Remove.
+	* elf.c (bfd_elf_discard_group): Likewise.
+	* elfxx-target.h (bfd_elfNN_bfd_discard_group): Remove macro.
+
+2005-01-31  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elf-bfd.h (elf_backend_data): Add elf_backend_eh_frame_address_size.
+	(_bfd_elf_eh_frame_address_size): Declare.
+	* elfxx-target.h (elf_backend_eh_frame_address_size): Define a default.
+	(elfNN_bed): Initialize elf_backend_eh_frame_address_size.
+	* elfxx-mips.h (_bfd_mips_elf_eh_frame_address_size): Declare.
+	(elf_backend_eh_frame_address_size): Define.
+	* elfxx-mips.c (_bfd_mips_elf_eh_frame_address_size): New function.
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Get the address
+	size from the new backend hook.
+	(_bfd_elf_write_section_eh_frame): Likewise.
+	(_bfd_elf_eh_frame_address_size): New function.
+
+2005-01-31  Andrew Cagney  <cagney@gnu.org>
+
+	* configure: Regenerate to track ../gettext.m4.
+
+2005-01-31  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_symbian_special_sections): Do not set
+	SHF_WRITE for .init_array, .fini_array, and .preinit_array.
+
+2005-01-31  Nick Clifton  <nickc@redhat.com>
+
+	* confg.bfd: Make targets scheduled for obsoletion (m68k-lynxos,
+	sparc-lynxos, vax-vms) be obsolete.
+
+2005-01-28  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf-bfd.h (struct elf_backend_data): Add minpagesize.
+	* elf32-arm.c (ELF_MINPAGESIZE): Define.
+	* elf32-ppc.c (ELF_MINPAGESIZE): Define.
+	* elfcode.h (elf_object_p): Use minpagesize instead of
+	maxpagesize.
+	* elfxx-target.h (ELF_MINPAGESIZE): Default to ELF_MAXPAGESIZE.
+	(elfNN_bed): Include ELF_MINPAGESIZE.
+
+2005-01-28  Julian Brown  <julian@codesourcery.com>
+
+	* bin-in.h (bfd_elf32_arm_set_target_relocs): Update prototype.
+	* bin-in2.h (bfd_elf32_arm_set_target_relocs): Update prototype.
+	* elf32-arm.c (elf32_arm_link_hash_table): Add fix_v4bx flag.
+	(bfd_elf32_arm_set_target_relocs): Add formal parameter fix_v4bx for
+	passing flag value from ld. Set flag value in global hash table entry.
+	(elf32_arm_final_link_relocate): Add code to implement R_ARM_V4BX
+	relocation.
+
+2005-01-27  Andrew Cagney  <cagney@gnu.org>
+
+	* configure: Regenerate to track ../gettext.m4 change.
+
+2005-01-25  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-arm.c (elf_backend_default_use_rela_p): Define to zero for
+	SymbianOS.
+
+2005-01-25  Alexandre Oliva  <aoliva@redhat.com>
+
+	2004-12-10  Alexandre Oliva  <aoliva@redhat.com>
+	* elf32-frv.c (elf32_frv_relocate_section): Force local binding
+	for TLSMOFF.
+	* reloc.c: Add R_FRV_TLSMOFF.
+	* elf32-frv.c (elf32_frv_howto_table): Likewise.
+	(frv_reloc_map, frv_reloc_type_lookup): Map it.
+	(elf32_frv_relocate_section): Handle it.
+	(elf32_frv_check_relocs): Likewise.
+	* libbfd.h, bfd-in2.h: Rebuilt.
+	2004-11-26  Alexandre Oliva  <aoliva@redhat.com>
+	* elf32-frv.c (_frvfdpic_emit_got_relocs_plt_entries): Don't crash
+	when given an undefweak TLS symbol.  Fix constant TLS PLT entries
+	such that they return the constant in gr9.
+	(_frvfdpic_relax_tls_entries): Don't crash for undefweak TLS
+	symbols.
+	(_frvfdpic_size_got_plt): Set _cooked_size of dynamic sections.
+	too, such that they shrink on relaxation.
+	(elf32_frvfdpic_finish_dynamic_sections): Check __ROFIXUP_END__ as
+	marking the position right past the _GLOBAL_OFFSET_TABLE_ value.
+	(_frvfdpic_assign_plt_entries): Shrink constant TLS PLT entries
+	if we can guarantee the use of 16-bit constants.
+	2004-11-10  Alexandre Oliva  <aoliva@redhat.com>
+	Introduce TLS support for FR-V FDPIC.
+	* reloc.c: Add TLS relocations.
+	* elf32-frv.c (elf32_frv_howto_table): Add TLS relocations.
+	(elf32_frv_rel_tlsdesc_value_howto): New.
+	(elf32_frv_rel_tlsoff_howto): New.
+	(frv_reloc_map): Add new mappings.
+	(struct frvfdpic_elf_link_hash_table): Add pointer to summary
+	reloc information.
+	(frvfdpic_dynamic_got_plt_info): New.
+	(frvfdpic_plt_tls_ret_offset): New.
+	(ELF_DYNAMIC_INTERPRETER, DEFAULT_STACK_SIZE): Move earlier.
+	(struct _frvfdpic_dynamic_got_info): Likewise.  Add TLS members.
+	(struct _frvfdpic_dynamic_got_plt_info): Likewise.
+	(FRVFDPIC_SYM_LOCAL): Regard symbols defined in the absolute
+	section as local.
+	(struct frvfdpic_relocs_info): Add TLS fields.
+	(frvfdpic_relocs_info_hash): Warning clean up.
+	(frvfdpic_relocs_info_find): Initialize tlsplt_entry.
+	(frvfdpic_pic_merge_early_relocs_info): Merge TLS fields.
+	(FRVFDPIC_TLS_BIAS): Define.
+	(tls_biased_base): New.
+	(_frvfdpic_emit_got_relocs_plt_entries): Deal with TLS
+	relocations.
+	(frv_reloc_type_lookup): Likewise.
+	(frvfdpic_info_to_howto_rel): Likewise.
+	(elf32_frv_relocate_section): Likewise.
+	(_frv_create_got_section): Create the PLT section here.
+	(elf32_frvfdpic_create_dynamic_sections): Not here.
+	(_frvfdpic_count_nontls_entries): Move out of...
+	(_frvfdpic_count_got_plt_entries): ... here.
+	(_frvfdpic_count_tls_entries): Likewise.  Add TLS support.
+	(_frvfdpic_count_relocs_fixups): Likewise.  Add relaxation
+	support.
+	(_frvfdpic_relax_tls_entries): New.
+	(_frvfdpic_compute_got_alloc_data): Add TLS support.
+	(_frvfdpic_get_tlsdesc_entry): New.
+	(_frvfdpic_assign_got_entries): Add TLS support.
+	(_frvfdpic_assign_plt_entries): Likewise.
+	(_frvfdpic_reset_got_plt_entries): New.
+	(_frvfdpic_size_got_plt): Move out of...
+	(elf32_frvfdpic_size_dynamic_sections): ... here.
+	(_frvfdpic_relax_got_plt_entries): New.
+	(elf32_frvfdpic_relax_section): New.
+	(elf32_frvfdpic_finish_dynamic_sections): Add TLS sanity check.
+	(elf32_frv_check_relocs): Add TLS support.
+	(bfd_elf32_bfd_relax_section): Define for FDPIC.
+	* libbfd.h, bfd-in2.h: Rebuilt.
+
+2005-01-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (_bfd_elf_get_dynamic_reloc_upper_bound): Only include
+	loadable reloc sections.
+	(_bfd_elf_canonicalize_dynamic_reloc): Likewise.
+	(_bfd_elf_get_synthetic_symtab): Return 0 if no dynamic syms.
+
+2005-01-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_link_add_object_symbols): Don't create link dynamic
+	sections immediately when linking shared libs.  Instead, wait until
+	we know a lib is needed.
+	(_bfd_elf_link_create_dynstrtab): Extract from..
+	(_bfd_elf_link_create_dynamic_sections_): ..here.
+	(elf_add_dt_needed_tag): Call _bfd_elf_link_create_dynstrtab and
+	_bfd_elf_link_create_dynamic_sections.  Add abfd param.  Allow
+	for non-existent .dynamic.
+	(elf_link_output_extsym): Don't complain about undefined symbols
+	in as-needed dynamic libs that aren't actually linked.
+
+2005-01-24  Andrew Cagney  <cagney@gnu.org>
+
+	* configure: Regenerate, ../gettext.m4 was updated.
+
+2005-01-21  Ben Elliston  <bje@au.ibm.com>
+
+	* aout-encap.c: Remove unused file.
+
+2005-01-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 679
+	* elflink.c (_bfd_elf_dynamic_symbol_p): Only protected
+	non-function symbols are local.
+	(_bfd_elf_symbol_refs_local_p): Likewise.
+
+2005-01-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd.c (bfd_link_just_syms): Add abfd param.
+	* bfd-in2.h: Regenerate.
+
+2005-01-17  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elf-eh-frame.c (skip_cfa_op, skip_non_nops): New functions.
+	(_bfd_elf_discard_section_eh_frame): Use them to interpret the CFA
+	instructions.  If the amount of padding is known, reduce the size
+	of the CIE or FDE by that amount.
+
+2005-01-17  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elf-bfd.h (struct cie): Use bfd_vmas for code_align, ra_column and
+	augmentation_size.  Use bfd_signed_vmas for data_align.
+	* elf-eh-frame.c (read_uleb128, read_sleb128): Delete in favor of...
+	(read_byte, skip_leb128, read_uleb128, read_sleb128): ...these new
+	functions.  Don't read past the end of the enclosing CIE or FDE.
+	(skip_bytes): New utility function.
+	(_bfd_elf_discard_section_eh_frame): Use new functions, adding more
+	sanity checking.
+	(_bfd_elf_write_section_eh_frame): Use new functions.
+
+2005-01-17  Richard Sandiford  <rsandifo@redhat.com>
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Use an
+	assert-style REQUIRE() macro to handle sanity checks.
+
+2005-01-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* dwarf2.c (dwarf2_debug): Move info_ptr_unit to ...
+	(comp_unit): Here.
+	(read_unsigned_leb128): Removed.
+	(read_signed_leb128): Removed.
+	(find_abstract_instance_name): Updated.
+	(parse_comp_unit): Accept info_ptr_unit.
+	(_bfd_dwarf2_find_nearest_line): Set info_ptr_unit for each
+	comp unit and pass it to parse_comp_unit.
+
+	* elf-eh-frame.c (read_unsigned_leb128): Moved to ...
+	(read_signed_leb128): Moved to ...
+	* libbfd.c: Here.
+
+	* libbfd-in.h (read_unsigned_leb128): New prototype.
+	(read_signed_leb128): Likewise.
+	* libbfd.h: Regenerated.
+
+2005-01-17  Andrew Stubbs  <andrew.stubbs@st.com>
+	    Nick Clifton   <nickc@redhat.com>
+
+	* cpu-sh.c (bfd_to_arch_table): Change arch_sh1_up to arch_sh_up,
+	arch__sh4_nofp_up to arch_sh4_nofpu_up and arch_sh4a_nofp_up to
+	arch_sh4a_nofpu_up in order to match the external names and make the
+	testsuite's job easier.
+	* archuires.c: Rename bfd_mach_sh2a_fake? to more meaningful
+	names.
+	* bfd-in2.h: Regenerate.
+
+2005-01-15  Andrew Cagney  <cagney@gnu.org>
+
+	* bfd.m4: New file.
+	* acinclude.m4: Move BFD_NEED_DECLARATION,
+	BFD_HAVE_SYS_PROCFS_TYPE and BFD_HAVE_SYS_PROCFS_TYPE_MEMBER to
+	the new file bfd.m4.  Include ../bfd/bfd.m4.
+	* configure: Re-generate.
+
+2005-01-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_howto_raw): Delete RELAX32* entries.
+	(ppc_elf_relax_section): Use PLT variants of RELAX32 relocs for
+	reaching PLT.
+	(ppc_elf_relocate_section): Handle R_PPC_RELAX32_PLT and
+	R_PPC_RELAX32PC_PLT.
+
+2005-01-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_gc_sweep_hook): Follow indirect and warning
+	symbols.
+	* elf32-arm.c (elf32_arm_gc_sweep_hook): Likewise.
+	* elf32-cris.c (cris_elf_gc_sweep_hook): Likewise.
+	* elf32-hppa.c (elf32_hppa_gc_sweep_hook): Likewise.
+	* elf32-i386.c (elf_i386_gc_sweep_hook): Likewise.
+	* elf32-m32r.c (m32r_elf_gc_sweep_hook): Likewise.
+	* elf32-m68k.c (elf_m68k_gc_sweep_hook): Likewise.
+	* elf32-ppc.c (ppc_elf_gc_sweep_hook): Likewise.
+	* elf32-s390.c (elf_s390_gc_sweep_hook): Likewise.
+	* elf32-sh.c (sh_elf_gc_sweep_hook): Likewise.
+	* elf32-sparc.c (elf32_sparc_gc_sweep_hook): Likewise.
+	* elf32-vax.c (elf_vax_gc_sweep_hook): Likewise.
+	* elf32-xtensa.c (elf_xtensa_gc_sweep_hook): Likewise.
+	* elf64-s390.c (elf_s390_gc_sweep_hook): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_gc_sweep_hook): Likewise.
+
+2005-01-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_create_dynamic_sections): Correct
+	.dynsbss flags.
+
+2005-01-10  Inderpreet Singh <inderpreetb@noida.hcltech.com>
+
+	* archures.c: Define bfd_mach_maxq10 and bfd_mach_maxq20.
+	* bfd-in2.h:  Regenerate.
+	* coffcode.h (coff_set_arch_mach_hook, coff_set_flags): Add code
+	to support these new machine values.
+	* cpu-maxq.c (bfd_maxq10_arch): New architecture definition for
+	the maxq10.
+	(bfd_maxq_arch): Update values for the maxq20.
+
+2005-01-10  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	* elf64-sparc.c (sparc64_elf_adjust_dynamic_symbol): When linking a
+	non-shared object, do not reserve space in .plt and .rela.plt for
+	regular symbols neither defined nor referenced in shared objects.
+
+2005-01-09  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	* elf32-sparc.c (elf32_sparc_link_hash_table_create): Use bfd_zmalloc
+	to zero the structure.
+	(create_got_section): Use BFD_ASSERT instead of abort.
+	* elf64-sparc.c (struct sparc64_elf_link_hash_table): New 'sgot' and
+	'srelgot' fields.
+	(create_got_section): New function.
+	(sparc64_elf_create_dynamic_sections): Likewise.
+	(sparc64_elf_check_relocs): Invoke create_got_section instead of
+	_bfd_elf_create_got_section.  Use the sgot and srelgot shortcuts.
+	(sparc64_elf_size_dynamic_sections): Use the srelgot shortcut.
+	(sparc64_elf_relocate_section): Use the sgot and srelgot shortcuts.
+	(sparc64_elf_finish_dynamic_symbol): Likewise.
+	(sparc64_elf_finish_dynamic_sections): Use the sgot shortcut.
+	(elf_backend_create_dynamic_sections): Define to
+	sparc64_elf_create_dynamic_sections.
+
+2005-01-09  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	* elf32-sparc.c (elf32_sparc_omit_section_dynsym): New function.
+	(elf_backend_omit_section_dynsym): Define to it.
+	* elf64-sparc.c (sparc64_elf_omit_section_dynsym): New function.
+	(elf_backend_omit_section_dynsym): Define to it.
+
+2005-01-07  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf.c (INCLUDE_SECTION_IN_SEGMENT): Don't put empty sections into
+	PT_DYNAMIC segment, unless .dynamic.
+
+2005-01-06  Paul Brook  <paul@codesourcery.com>
+
+	* config.bfd: Add entry for arm-*-vxworks and arm-*-windiss.
+	* configure.in: Add bfd_elf32_{big,little}arm_vxworks_vec.
+	* configure: Regenerate.
+	* elf32-arm.c: Add VxWorks target bfd.
+	(USE_REL): Remove.
+	(elf32_arm_link_hash_table): Add use_rel.
+	(elf32_arm_link_hash_table_create, elf32_arm_final_link_relocate,
+	elf32_arm_relocate_section): Replace USE_REL with runtime check.
+	Correct offset calculation for RELA case.
+	(elf_backend_may_use_rel_p, elf_backend_may_use_rela_p,
+	elf_backend_default_use_rela_p, elf_backend_rela_normal): Define.
+	(elf32_arm_vxworks_link_hash_table_create): New function.
+	* targets.c (bfd_elf32_bigarm_vxworks_vec): Add declaration.
+	(bfd_elf32_littlearm_vxworks_vec): Ditto.
+	(_bfd_target_vector): Add bfd_elf32_{big,little}arm_vxworks_vec.
+
+2005-01-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (struct ppc_link_hash_table): Add no_multi_toc and
+	multi_toc_needed.
+	(has_toc_reloc, makes_toc_func_call, call_check_in_progress): Define.
+	(ppc64_elf_check_relocs): Update references to has_gp_reloc.
+	(ppc64_elf_setup_section_lists): Add no_multi_toc parm, set htab bit.
+	(ppc64_elf_next_toc_section): Heed no_multi_toc.
+	(ppc64_elf_reinit_toc): Set multi_toc_needed.
+	(toc_adjusting_stub_needed): Rewrite.
+	(ppc64_elf_next_input_section): Use multi_toc_needed to shortcut
+	toc tests.  Adjust for toc_adjusting_stub_needed changes.
+	(ppc64_elf_size_stubs): Update references to has_gp_reloc.
+	* elf64-ppc.h (ppc64_elf_setup_section_lists): Update prototype.
+	* section.c: Expand comment on backend bits.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2005-01-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_size_stubs): When determining need for
+	toc adjusting stub, do not test source section flags.
+
+2005-01-05  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	* elf64-sparc.c (sparc64_elf_relocate_section): Ignore overflows
+	from STABS debugging sections again.
+
+2005-01-05  Fred Fish  <fnf@specifixinc.com>
+
+	* dwarf2.c (struct dwarf2_debug): Add info_ptr_unit member.
+	(find_abstract_instance_name): New function.
+	(scan_unit_for_functions): Handle DW_TAG_inlined_subroutine.
+	(scan_unit_for_functions): Handle DW_AT_abstract_origin.
+	(_bfd_dwarf2_find_nearest_line): Initialize info_ptr_unit.
+
+For older changes see ChangeLog-2004
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-2006 sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-2006
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-2006	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-2006	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3601 @@
+2006-12-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfd.c (bfd_record_phdr): Call bfd_zalloc instead of bfd_alloc
+	to allocate elf_segment_map.
+
+2006-12-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (elf_link_add_object_symbols): Remember the symbol
+	size only if it is defined.
+
+2006-12-25  Kazu Hirata  <kazu@codesourcery.com>
+
+	* archures.c (bfd_mach_cpu32_fido): New.
+	(bfd_mach_mcf_isa_a_nodiv, bfd_mach_mcf_isa_a,
+	bfd_mach_mcf_isa_a_mac, bfd_mach_mcf_isa_a_emac,
+	bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
+	bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_b_nousp,
+	bfd_mach_mcf_isa_b_nousp_mac, bfd_mach_mcf_isa_b_nousp_emac,
+	bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac,
+	bfd_mach_mcf_isa_b_emac, bfd_mach_mcf_isa_b_float,
+	bfd_mach_mcf_isa_b_float_mac, bfd_mach_mcf_isa_b_float_emac):
+	Increment the defined values.
+	* bfd-in2.h: Regenerate.
+	* cpu-m68k.c (arch_info_struct): Add en entry for
+	bfd_mach_cpu32_fido.
+	* elf32-m68k.c (elf32_m68k_object_p): Handle
+	EF_M68K_CPU32_FIDO_A.
+	(elf32_m68k_merge_private_bfd_data): Use EF_M68K_CPU32_MASK.
+	(elf32_m68k_print_private_bfd_data): Handle
+	EF_M68K_CPU32_FIDO_A.
+
+2006-12-25  Mei Ligang  <ligang@sunnorth.com.cn>
+	
+	* elf32-score.c (score_elf_got_lo16_reloc): Change some variables
+	type from unsigned to signed.
+	(score_elf_final_link_relocate): Fix bugs of handling relocation
+	type R_SCORE_GOT15, R_SCORE_GOT_LO16, and R_SCORE_REL32.
+	(_bfd_score_elf_relocate_section): Handle R_SCORE_GOT_LO16
+	specially.
+
+2006-12-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf-bfd.h (struct elf_backend_data): Add as_needed_cleanup hook.
+	* elfxx-target.h (elf_backend_as_needed_cleanup): Define.
+	(elfNN_bed): Add as_needed_cleanup hook.
+	* elflink.c (elf_link_add_object_symbols): Call it when reverting
+	hash table changes for unneeded --as-needed input.
+	* elf64-ppc64.c (elf_backend_as_needed_cleanup): Define.
+	(ppc64_elf_as_needed_cleanup): New function.
+
+2006-12-19  Kazu Hirata  <kazu@codesourcery.com>
+
+	* elf32-m68k.c (elf32_m68k_object_p,
+	elf32_m68k_print_private_bfd_data): Use EF_M68K_ARCH_MASK to
+	extract architecture mask.
+
+2006-12-19  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf.c (assign_file_positions_for_load_sections): Adjust p_vaddr
+	by p_vaddr_offset.  Copy alignment & use if it is valid.
+	(rewrite_elf_program_headers): Cope with leading padding in a
+	segment that does not contain file or program headers.
+	(copy_elf_program_header): Likewise.
+
+2006-12-15  Mark Kettenis  <kettenis@gnu.org>
+
+	* config.bfd: (sh*-*-openbsd*): Add target. 
+	* configure.in (sh*-*-openbsd*): Set COREFILE to netbsd-core.lo.
+	* configure: Regenerate.
+
+2006-12-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* opncls.c (bfd_openr_iovec): Add "stat" parameter.
+	(struct opncls): Add "stat" field.
+	(opncls_bstat): Call vec->stat.
+	* bfd-in2.h: Regenerate.
+	* elf32-spu.c (spu_elf_open_builtin_lib): Adjust.
+
+2006-12-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct bfd_elf_section_data): Clarify sec_group
+	and next_in_group usage.
+
+2006-12-14  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 3704
+	* bfdio.c (bfd_bread): Don't read past end of archive elements.
+
+2006-12-12  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* doc/Makefile.am (bfd_TEXINFOS): Set.
+	(bfd.info bfd.dvi bfd.html): Delete rule.
+	* doc/Makefile.in: Regenerated.
+
+2006-12-11  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* configure.in: Define GENINSRC_NEVER.
+	* doc/Makefile.am (bfd.info): Remove srcdir prefix.
+	(MAINTAINERCLEANFILES): Add info file.
+	(DISTCLEANFILES): Pretend to add info file.
+	* po/Make-in (.po.gmo): Put gmo files in objdir.
+	* configure, Makefile.in, doc/Makefile.in: Regenerated.
+
+2006-12-11  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* elflink.c (bfd_elf_gc_sections): Also search for corresponding
+	sections with .gnu.linkonce.t. prefix.
+
+2006-12-07  Kazu Hirata  <kazu@codesourcery.com>
+
+	* elf32-m68k.c: Update uses of EF_M68K_*.
+
+2006-12-07  H.J. Lu <hjl@gnu.org>
+
+	PR ld/3666
+	* elflink.c (elf_link_add_object_symbols): Keep symbol
+	visibility for symbols from discarded section.
+
+2006-12-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-alpha.c (elf64_alpha_merge_symbol_attribute): New function.
+	(elf_backend_merge_symbol_attribute): Define.
+
+2006-12-04  Jan Beulich  <jbeulich@novell.com>
+
+	* elflink.c (_bfd_elf_link_create_dynamic_sections): Don't create
+	.eh_frame_hdr section from here anymore.
+	(bfd_elf_size_dynamic_sections): Call _bfd_elf_maybe_strip_eh_frame_hdr
+	a little earlier.
+
+2006-12-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/3609
+	* elf.c (rewrite_elf_program_header): Preserve segment physical
+	address in the output segment if the first section in the
+	corresponding input segment is null.
+
+2006-12-01  Nick Clifton  <nickc@redhat.com>
+
+	PR 3609
+	* elf.c (rewrite_elf_program_header): Do not use the first_section
+	pointer if it is null.
+
+2006-11-29  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_to_thumb_export_stub): Assert that output
+	section is present.
+	(allocate_dynrelocs): Only add export stub for symbols defined in
+	this object.
+
+2006-11-29  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_to_thumb_export_stub): Assert that output
+	section is present.
+	(allocate_dynrelocs): Only add export stub for symbols defined in
+	this object.
+
+2006-11-29  Paul Brook  <paul@codesourcery.com>
+	Julian Brown  <julian@codesourcery.com>
+
+	* elf32-arm.c (copy_eabi_attributes): Correct starting offset.
+	(elf32_arm_merge_eabi_attributes): Mark output as initialized.
+	Only set Tag_CPU_name and Tag_ABI_PCS_R9_use if input attribute
+	is present.
+
+2006-11-27  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_xtensa_special_sections): Add .xtensa.info.
+
+2006-11-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (IS_SECTION_IN_INPUT_SEGMENT): New.
+	(INCLUDE_SECTION_IN_SEGMENT): Use IS_SECTION_IN_INPUT_SEGMENT.
+	(rewrite_elf_program_header): Don't preserve segment physical
+	address in the output segment if the first section in the
+	corresponding input segment is removed.
+
+2006-11-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* pef.c (bfd_pef_make_empty_symbol): Delete function.  Define instead.
+	* xsym.c (bfd_sym_make_empty_symbol): Likewise.
+	* xsym.h (bfd_sym_make_empty_symbol): Delete.
+
+2006-11-21  Greg McGary  <greg@mcgary.org>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Fixup D field
+	at proper offset in little-endian mode.
+	* elf64-ppc.c (ppc_elf_relocate_section): Likewise.
+
+2006-11-21  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf-eh-frame.c (struct cie): New type.
+	(cie_compare): Removed.
+	(cie_eq, cie_hash, cie_compute_hash): New functions.
+	(_bfd_elf_discard_section_eh_frame): Rewrite not to rely on FDEs
+	pointing only to last CIE and allow merging of any duplicate CIEs,
+	not just duplicate consecutive CIEs.
+	(_bfd_elf_discard_section_eh_frame_hdr): Delete cies hash table.
+	* elf-bfd.h (struct cie_header, struct cie): Removed.
+	(struct eh_frame_sec_info): Remove alloced field.
+	(struct eh_frame_hdr_info): Remove last_cie, last_cie_sec
+	and last_cie_inf fields.  Add cies field.
+
+2006-11-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd-in.h (struct stat): Don't typedef.
+	* bfdio.c (bfd_get_size): Return a file_ptr.
+	* cisco-core.c (cisco_core_file_validate): Use bfd_size_type for nread.
+	* mmo.c (mmo_scan): Use file_ptr for curpos.
+	* trad-core.c (trad_unix_core): Don't cast statbuf.st_size to
+	unsigned long.
+	* bfd-in2.h: Regenerate.
+
+2006-11-20  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 3532
+	* bfd-in.h (struct bfd_hash_table): Reorganize.  Add "frozen".
+	* hash.c (bfd_hash_table_init_n): Init frozen.
+	(bfd_hash_lookup): Don't grow if frozen.
+	(bfd_hash_traverse): Freeze hash table during traversal.
+	* bfd-in2.h: Regenerate.
+
+2006-11-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (_bfd_elf_check_kept_section): Test for kept group
+	section.  Save result of checks in kept_section.
+	(_bfd_elf_section_already_linked): Tidy.  Correct comments.
+	Ignore all group member sections.  Handle special matching of
+	single-member groups against linkonce sections via their group
+	section.  When such a match is found, set kept_section to the
+	group member section rather than to the group.
+
+2006-11-14  Phil Lello  <phil.lello@homecall.co.uk>
+
+	* peXXigen.c: Updates for PE/COFF V8.0, and clarification
+	(dir_names): Added CLR Runtime Header to dir_names[].
+	(_bfd_XX_print_private_bfd_data_common): Added EFI_ROM and XBOX
+	subsystem names
+	(_bfd_XXi_swap_aouthdr_in, _bfd_XXi_swap_aouthdr_out)
+	(pe_print_idata, pe_print_edata)
+	(_bfd_XX_bfd_copy_private_bfd_data_common)
+	(_bfd_XXi_final_link_postscript): Use #DEFINEs for index into
+	DataDirectory.
+
+2006-11-13  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* bfd-in.h (bfd_elf32_arm_process_before_allocation): Update
+	prototype.
+	(bfd_elf32_arm_set_byteswap_code): New prototype.
+	* bfd-in2.h: Regenerate.
+	* elf32-arm.c (bfd_elf32_arm_process_before_allocation): Don't take
+	byteswap_code as an argument.  Revert 2006-11-01 change.
+	(bfd_elf32_arm_set_byteswap_code): New.
+	(elf32_arm_size_dynamic_sections): Call
+	bfd_elf32_arm_process_before_allocation.
+
+2006-11-10  Thiemo Seufer  <ths@mips.com>
+
+	* config.bfd (mips*el-sde-elf*, mips*-sde-elf*): Drop ECOFF support
+	for SDE configs.
+
+2006-11-10  Nick Clifton  <nickc@redhat.com>
+
+	* config.bfd: Move previously obsoleted targets to the REMOVED
+	list.
+	Add maxq-*-coff to the obsolete list.
+
+2006-11-10  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+	* pe-arm-wince.c (LOCAL_LABEL_PREFIX): Define as ".".
+	* pei-arm-wince.c (LOCAL_LABEL_PREFIX): Likewise.
+	* coff-arm.c (LOCAL_LABEL_PREFIX): Only define if not defined before.
+
+2006-11-07  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (find_thumb_glue): Add ERROR_MESSAGE argument; set it
+	on error.
+	(find_arm_glue): Likewise.
+	(elf32_thumb_to_arm_stub, elf32_arm_create_thumb_stub)
+	(elf32_arm_to_thumb_stub, elf32_arm_final_link_relocate): Add
+	ERROR_MESSAGE argument and pass it through.
+	(elf32_arm_to_thumb_export_stub): Update.
+	(elf32_arm_relocate_section): Use ERROR_MESSAGE and reloc_dangerous.
+
+2006-11-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (enum _ppc64_sec_type): New.
+	(struct _ppc64_elf_section_data): Move "t_symndx" into opd union,
+	and rename fields.  Add sec_type and has_14bit_branch.
+	(struct ppc_link_hash_table): Remove has_14bit_branch.
+	(get_opd_info, get_tls_mask, ppc64_elf_edit_opd): Adjust.
+	(ppc64_elf_relocate_section): Likewise.
+	(ppc64_elf_check_relocs): Likewise.  Set per-section has_14bit_branch.
+	(ppc64_elf_size_stubs): Don't set default group size here.
+	(group_sections): Instead do so here, and group sections using
+	their individual requirements.
+
+2006-11-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (struct ppc64_elf_obj_tdata): Remove "has_dotsym"
+	and union.
+	(struct ppc_link_hash_entry): Add "next_dot_sym".
+	(struct ppc_link_hash_table): Add "dot_syms".
+	(link_hash_newfunc): Make list of syms starting with a dot.
+	(ppc_get_stub_entry, adjust_opd_syms): Adjust.
+	(ppc64_elf_add_symbol_hook): Don't set has_dotsym.
+	(struct add_symbol_adjust_data): Delete.
+	(add_symbol_adjust): Simplify params and return.
+	(ppc64_elf_check_directives): Just process the "dot_syms" lists,
+	not all syms.
+
+2006-11-02  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* libbfd-in.h (_bfd_clear_contents): New prototype.
+	* reloc.c (_bfd_clear_contents): New.
+	* libbfd.h: Regenerated.
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Use
+	_bfd_clear_contents.
+	* elf32-d10v.c (elf32_d10v_relocate_section): Likewise.
+	* elf32-hppa.c (elf32_hppa_relocate_section): Likewise.
+	* elf32-i386.c (elf_i386_relocate_section): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	* elf32-s390.c (elf_s390_relocate_section): Likewise.
+	* elf32-sh.c (sh_elf_relocate_section): Likewise.
+	* elf32-xtensa.c (elf_xtensa_relocate_section): Likewise.
+	* elf64-ppc.c (ppc64_elf_relocate_section): Likewise.
+	* elf64-s390.c (elf_s390_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_relocate_section): Likewise.
+
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Set value to
+	zero for discarded symbols.
+	* elfxx-mips.c (mips_elf_calculate_relocation): Likewise.
+
+2006-11-01  Thiemo Seufer  <ths@mips.com>
+            David Ung  <davidu@mips.com>
+
+	* elf-bfd.h (local_call_stubs): New member.
+	* elfxx-mips.c (FN_STUB_P, CALL_STUB_P, CALL_FP_STUB_P): New macros.
+	(mips_elf_calculate_relocation): Handle local mips16 call stubs.
+	(mips16_stub_section_p): Rename from mips_elf_stub_section_p, use
+	the new stub macros.
+	(_bfd_mips_elf_check_relocs): Handle call stubs for code which
+	mixes mips16 and mips32 functions. Use mips16_stub_section_p. Mark
+	used stubs with SEC_KEEP. Use the new stub macros.
+
+2006-11-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-arm.c (bfd_elf32_arm_process_before_allocation): Correct
+	check for PLT usage.
+
+2006-11-01  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elfxx-mips.c (mips_elf_merge_gots): Always use maxcnt.
+
+2006-10-31  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (elfcore_write_note): Pad note descriptor to 4-byte
+	boundary.  Tidy.  Comment.
+
+2006-10-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/3111
+	* elf-bfd.h (elf_obj_tdata): Add symbuf.
+	(_bfd_elf_section_already_linked): Add struct bfd_link_info *.
+	(_bfd_elf_check_kept_section): Likewise.
+	(bfd_elf_match_symbols_in_sections): Likewise.
+
+	* elf.c (assign_section_numbers): Updated to add
+	struct bfd_link_info *.
+	(bfd_elf_match_symbols_in_sections): Updated. Cache symbol
+	buffer if info->reduce_memory_overheads is false.
+
+	* elflink.c (match_group_member): Updated to add
+	struct bfd_link_info *.
+	(_bfd_elf_check_kept_section): Likewise.
+	(elf_link_input_bfd): Likewise.
+	(_bfd_elf_section_already_linked): Likewise.
+	(bfd_elf_final_link): Free symbol buffer if
+	info->reduce_memory_overheads is false.
+
+	* libbfd-in.h (_bfd_nolink_section_already_linked): Add
+	struct bfd_link_info *.
+	(_bfd_generic_section_already_linked): Likewise.
+	* libbfd.h: Regenerated.
+
+	* linker.c (bfd_section_already_linked): Add
+	struct bfd_link_info *.
+	(_bfd_generic_section_already_linked): Likewise.
+	* targets.c (bfd_target): Add struct bfd_link_info * to
+	_section_already_linked.
+	* bfd-in2.h: Regenerated.
+
+2006-10-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd.c (bfd_error_type): Add bfd_error_on_input.
+	(input_bfd, input_error): New static vars.
+	(bfd_set_error): Handle bfd_error_on_input.
+	(bfd_errmsg): Likewise.
+	(bfd_perror): Simplify.
+	* archive.c (_bfd_write_archive_contents): Report errors on input.
+	* bfd-in2.h: Regenerate.
+
+2006-10-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (elfcore_write_note): Pad to 4-byte boundary.
+
+2006-10-28  Richard Sandiford  <richard@codesourcery.com>
+
+	* elf32-mips.c (elf_mips_howto_table_rel): Add R_MIPS_GLOB_DAT.
+	* elfn32-mips.c (elf_mips_howto_table_rel): Likewise.
+	(elf_mips_howto_table_rela): Likewise.
+	* elf64-mips.c (mips_elf64_howto_table_rel): Likewise.
+	(mips_elf64_howto_table_rela): Likewise.
+
+2006-10-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (_bfd_elf_init_private_section_data): Assert output
+	section ELF type instead of check if it is SHT_NULL.  Copy
+	OS/PROC specific flags from input section to output section.
+
+2006-10-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* section.c (SEC_KEEP): Update comment.
+	* bfd-in2.h: Regenerate.
+	* elflink.c (bfd_elf_gc_sections): Ignore SEC_EXCLUDE sections.
+	* merge.c (_bfd_merge_sections): Set SEC_KEEP on excluded sections.
+	* stabs.c (_bfd_discard_section_stabs): Likewise.
+	(_bfd_link_section_stabs): Likewise.  Simplify abs_section check.
+
+2006-10-26  Ben Elliston  <bje@au.ibm.com>
+
+	* reloc.c (_bfd_relocate_contents): Remove explicit case 0.
+
+	* elf.c (bfd_section_from_shdr): Remove extraneous breaks.
+	* targets.c (find_target): Remove extraneous break.
+
+2006-10-26  Ben Elliston  <bje@au.ibm.com>
+
+	* coff-maxq.c (coff_maxq20_reloc): Remove unused variable `howto'.
+	(struct maxq_reloc_map): Unused; remove.
+	(maxq_reloc_map): Likewise.
+	(maxq_reloc_type_lookup): Remove loop over maxq_reloc_map.
+
+2006-10-26  Ben Elliston  <bje@au.ibm.com>
+
+	* elf.c (bfd_elf_set_dyn_lib_class): Change second argument type
+	from int to enum dynamic_lib_link_class lib_class.
+	* bfd-in.h (bfd_elf_set_dyn_lib_class): Likewise.
+	* bfd-in2.h: Regenerate.
+
+2006-10-25  Alan Modra  <amodra@bigpond.net.au>
+	    Trevor Smigiel  <Trevor_Smigiel@playstation.sony.com>
+	    Yukishige Shibata  <shibata@rd.scei.sony.co.jp>
+	    Nobuhisa Fujinami  <fnami@rd.scei.sony.co.jp>
+	    Takeaki Fukuoka  <fukuoka@rd.scei.sony.co.jp>
+
+	* cpu-spu.c: New file.
+	* elf32-spu.c: New file.
+	* elf32-spu.h: New file.
+	* archures.c: Add SPU support.
+	* config.bfd: Likewise.
+	* configure.in: Likewise.
+	* reloc.c: Likewise.
+	* targets.c: Likewise.
+	* Makefile.am: Likewise.  Run "make dep-am".
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2006-10-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_edit_opd): Clarify comment.
+
+2006-10-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-score.c: Formatting.
+	(elf_backend_omit_section_dynsym): Define.
+	(score_elf_create_dynamic_relocation): Remove code copied from mips.
+	Don't use section syms in dynamic relocs.  Remove unused param.
+	(score_elf_final_link_relocate): Remove unused param.
+
+2006-10-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* linker.c (fix_syms): Choose best of previous and next
+	section based on section flags and vma.
+
+2006-10-21  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* elf32-sh64.c (sh64_elf_merge_symbol_attribute): Do merging
+	only when the non visibility part of st_other is non-zero.
+	* elf64-sh64.c (sh64_elf64_merge_symbol_attribute): Likewise.
+
+2006-10-20  Richard Sandiford  <richard@codesourcery.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_modify_segment_map): Don't extend
+	PT_DYNAMIC on GNU/Linux targets.
+
+2006-10-20  Richard Sandiford  <richard@codesourcery.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_finish_dynamic_sections): Make the
+	size of .rel.dyn reflect the value of DT_RELSZ.
+
+2006-10-20  Richard Sandiford  <richard@codesourcery.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_additional_program_headers): Allocate
+	a PT_NULL header for dynamic objects.
+	(_bfd_mips_elf_modify_segment_map): Add it.
+
+2006-10-19  Mei Ligang  <ligang@sunnorth.com.cn>
+
+	* elf32-score.c (score_elf_rel_dyn_section): Replace
+	bfd_make_section with bfd_make_section_with_flags.
+	(_bfd_score_elf_create_dynamic_sections): Ditto.
+	(score_elf_create_got_section): Ditto.
+	(score_elf_final_link_relocate): Delete referrence to
+	EF_SCORE_HASENTRY.
+
+2006-10-19  Richard Sandiford  <richard@codesourcery.com>
+
+	* elfxx-mips.c (sort_dynamic_relocs): Sort relocations against the
+	same symbol by increasing r_offset.
+	(sort_dynamic_relocs_64): Likewise.  Fix comparisons between very
+	large and very small symbol indexes.
+
+2006-10-19  Richard Sandiford  <richard@codesourcery.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_size_dynamic_sections): Add DT_DEBUG
+	and DT_MIPS_RLD_MAP tags for position-independent executables.
+	Do not add DT_DEBUG to shared libraries for any MIPS target.
+
+2006-10-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/3290
+	* elflink.c (elf_link_add_object_symbols): Hide definitions in
+	debug sections.
+
+2006-10-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-arm.c (bfd_elf32_arm_allocate_interworking_sect): Check,
+	don't set, glue section size.
+	(record_arm_to_thumb_glue): Set glue section size here.
+	(record_thumb_to_arm_glue): Likewise.
+	(bfd_elf32_arm_add_glue_sections_to_bfd): Formatting.
+	(bfd_elf32_arm_process_before_allocation): Ignore exluded sections.
+
+2006-10-18  Roy Marples  <uberlord@gentoo.org>
+
+	* elf64-sparc.c: Add FreeBSD support.
+	(elf64_sparc_fbsd_post_process_headers): New function.
+	* targets.c (_bfd_target_vector): Add bfd_elf64_sparc_freebsd_vec.
+	* config.bfd (sparc64-*-freebsd*): Set targ_defvec to bfd_elf64_sparc_freebsd_vec.
+	* configure.in: Add entry for bfd_elf64_sparc_freebsd_vec.
+	* configure: Regenerate.
+
+2006-10-17  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Add support for
+	R_ARM_MOVW_BREL_NC, R_ARM_MOVW_BREL, R_ARM_MOVT_BREL,
+	R_ARM_THM_MOVW_BREL_NC, R_ARM_THM_MOVW_BREL and
+	R_ARM_THM_MOVT_BREL relocations.
+
+2006-10-17  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_howto_table_1): Change offset for
+	R_THM_CALL to 25 and remove FIXME comment.
+	(using_thumb2): New function.
+	(elf32_arm_final_link_relocate): Cope with Thumb-2 BL encoding.
+
+2006-10-17  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Add cases
+	for R_ARM_ABS32_NOI and R_ARM_REL32_NOI.
+	(elf32_arm_gc_sweep_hook): Likewise.
+	(elf32_arm_check_relocs): Likewise.
+	(allocate_dynrelocs): Likewise.
+
+2006-10-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_link_hash_table): Reorder.  Add
+	text_index_section and data_index_section.
+	(struct elf_backend_data): Add elf_backend_init_index_section.
+	(_bfd_elf_init_1_index_section): Declare.
+	(_bfd_elf_init_2_index_sections): Declare.
+	* elfxx-target.h (elf_backend_init_index_section): Define.
+	(elfNN_bed): Init new field.
+	* elflink.c (_bfd_elf_link_omit_section_dynsym): Keep first tls
+	section and text_index_section plus data_index_section.
+	(_bfd_elf_link_renumber_dynsyms): Clear dynindx on omitted sections.
+	(_bfd_elf_init_1_index_section): New function.
+	(_bfd_elf_init_2_index_sections): New function.
+	(bfd_elf_size_dynsym_hash_dynstr): Call elf_backend_init_index_section.
+	(elf_link_input_bfd): When emitting relocs, use text_index_section
+	and data_index_section for removed sections.
+	* elf-m10300.c (elf_backend_omit_section_dynsym): Define.
+	* elf32-i386.c: Likewise.
+	* elf32-m32r.c: Likewise.
+	* elf32-sh.c: Likewise.
+	* elf32-xstormy16.c: Likewise.
+	* elf32-xtensa.c: Likewise.
+	* elf64-alpha.c: Likewise.
+	* elf64-hppa.c: Likewise.
+	* elf64-mmix.c: Likewise.
+	* elf64-sh64.c: Likewise.
+	* elfxx-ia64.c: Likewise.
+	* elf32-arm.c (elf32_arm_final_link_relocate): Use text_index_section
+	and data_index_section sym for relocs against sections with no dynamic
+	section sym.
+	(elf_backend_init_index_section): Define.
+	* elf32-cris.c: Similarly.
+	* elf32-hppa.c: Similarly.
+	* elf32-i370.c: Similarly.
+	* elf32-m68k.c: Similarly.
+	* elf32-mips.c: Similarly.
+	* elf32-ppc.c: Similarly.
+	* elf32-s390.c: Similarly.
+	* elf32-sparc.c: Similarly.
+	* elf32-vax.c: Similarly.
+	* elf64-mips.c: Similarly.
+	* elf64-ppc.c: Similarly.
+	* elf64-s390.c: Similarly.
+	* elf64-sparc.c: Similarly.
+	* elf64-x86-64.c: Similarly.
+	* elfn32-mips.c: Similarly.
+	* elfxx-mips.c: Similarly.
+	* elfxx-sparc.c: Similarly.
+	* linker.c (fix_syms): Base symbols in removed sections on
+	previous section in preference to using absolute section.
+
+2006-10-16  Andreas Schwab  <schwab@suse.de>
+
+	* elfxx-ia64.c (addend_compare): Properly compute return value.
+
+2006-10-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/3314
+	* elf.c (assign_file_positions_for_non_load_sections): Don't
+	page align empty SHF_ALLOC sections.
+
+2006-10-13  Jakub Jelinek  <jakub@redhat.com>
+
+	* elfxx-sparc.c (_bfd_sparc_elf_finish_dynamic_sections): Set
+	.plt sh_entsize to 0 if plt header size isn't multiple of
+	plt entry size or for 32-bit which adds a nop insn at the
+	end of the .plt section.
+
+2006-10-12  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_xtensa_action_discarded): New.
+	(elf_backend_action_discarded): Define.
+
+2006-10-11  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_xtensa_relocate_section): Return after
+	unresolvable relocation error.
+	(elf_xtensa_finish_dynamic_symbol): Set value of undefined, weak
+	symbols to zero.
+
+2006-10-10  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_xtensa_size_dynamic_sections): Add DT_DEBUG
+	for PIE executables.
+
+2006-10-03  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf-bfd.h (struct eh_cie_fde): Add set_loc pointer.
+	* elf-eh-frame.c (skip_cfa_op): Fix handling of DW_CFA_advance_loc.
+	Handle DW_CFA_{remember,restore}_state, DW_CFA_GNU_window_save,
+	DW_CFA_val_{offset{,_sf},expression}.
+	(skip_non_nops): Record number of DW_CFA_set_loc ops.
+	(_bfd_elf_discard_section_eh_frame): Require skip_non_nops recognizes
+	all ops.  If there are any DW_CFA_set_loc ops and they are pcrel
+	or going to be pcrel, compute set_loc array.
+	(_bfd_elf_eh_frame_section_offset): If make_relative, kill relocations
+	against DW_CFA_set_loc operands.
+	(_bfd_elf_write_section_eh_frame): Handle DW_CFA_set_loc adjusting.
+
+2006-10-02  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elflink.c (_bfd_elf_merge_symbol): Discard references to TLS
+	symbols from the --just-syms file.
+
+2006-10-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_build_stubs): Test glink size for
+	existence of PLT.
+
+2006-09-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/3283
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Don't ignore
+	relocation overflow on branches to undefweaks.
+
+2006-09-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* po/BLD-POTFILES.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2006-09-29  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	PR 3276
+	* pei-i386.c (COFF_SECTION_ALIGNMENT_ENTRIES): Enable 16 byte
+	alignment for .data$, .rdata$ and .text$ sections so that sse
+	and sse2 code will work for linkonce sections too.
+	* pe-i386.c (COFF_SECTION_ALIGNMENT_ENTRIES): Likewise.
+
+2006-09-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (_bfd_elf_gc_mark_hook): New function.
+	* elf-bfd.h (_bfd_elf_gc_mark_hook): Declare.
+	* elfxx-target.h (elf_backend_gc_mark_hook): Default to above.
+	* elf-m10300.c (mn10300_elf_gc_mark_hook): Use _bfd_elf_gc_mark_hook.
+	* elf32-arm.c (elf32_arm_gc_mark_hook): Likewise.
+	* elf32-cris.c (cris_elf_gc_mark_hook): Likewise.
+	* elf32-hppa.c (elf32_hppa_gc_mark_hook): Likewise.
+	* elf32-i386.c (elf_i386_gc_mark_hook): Likewise.
+	* elf32-m32r.c (m32r_elf_gc_mark_hook): Likewise.
+	* elf32-m68k.c (elf_m68k_gc_mark_hook): Likewise.
+	* elf32-mcore.c (mcore_elf_gc_mark_hook): Likewise.
+	* elf32-ppc.c (ppc_elf_gc_mark_hook): Likewise.
+	* elf32-s390.c (elf_s390_gc_mark_hook): Likewise.
+	* elf32-score.c (_bfd_score_elf_gc_mark_hook): Likewise.
+	* elf32-sh.c (sh_elf_gc_mark_hook): Likewise.
+	* elf32-vax.c (elf_vax_gc_mark_hook): Likewise.
+	* elf32-xtensa.c (elf_xtensa_gc_mark_hook): Likewise.
+	* elf64-mmix.c (mmix_elf_gc_mark_hook): Likewise.
+	* elf64-s390.c (elf_s390_gc_mark_hook): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_gc_mark_hook): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_gc_mark_hook): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_gc_mark_hook): Likewise.
+	* elf32-bfin.c (bfin_gc_mark_hook): Likewise.
+	(bfinfdpic_gc_sweep_hook): Delete.
+	(elf_backend_gc_sweep_hook): Don't define for elf32-bfinfdpic.
+	* elf32-d10v.c (elf32_d10v_gc_mark_hook): Use _bfd_elf_gc_mark_hook.
+	(elf32_d10v_gc_sweep_hook): Delete.
+	(elf_backend_gc_sweep_hook): Don't define.
+	* elf32-fr30.c (fr30_elf_gc_mark_hook): Use _bfd_elf_gc_mark_hook.
+	(fr30_elf_gc_sweep_hook): Delete.
+	(elf_backend_gc_sweep_hook): Don't define.
+	* elf32-frv.c (elf32_frv_gc_mark_hook): Use _bfd_elf_gc_mark_hook.
+	(elf32_frv_gc_sweep_hook): Delete.
+	(elf_backend_gc_sweep_hook): Don't define.
+	* elf32-iq2000.c (iq2000_elf_gc_mark_hook): Use _bfd_elf_gc_mark_hook.
+	(iq2000_elf_gc_sweep_hook): Delete.
+	(elf_backend_gc_sweep_hook): Don't define.
+	* elf32-openrisc.c (openrisc_elf_gc_mark_hook): Use
+	_bfd_elf_gc_mark_hook.
+	(openrisc_elf_gc_sweep_hook): Delete.
+	(elf_backend_gc_sweep_hook): Don't define.
+	* elf32-v850.c (v850_elf_gc_mark_hook): Use _bfd_elf_gc_mark_hook.
+	(v850_elf_gc_sweep_hook): Delete.
+	(elf_backend_gc_sweep_hook): Don't define.
+	* elf32-xstormy16.c (xstormy16_elf_gc_mark_hook): Use
+	_bfd_elf_gc_mark_hook.
+	(xstormy16_elf_gc_sweep_hook): Delete.
+	(elf_backend_gc_sweep_hook): Don't define.
+	* elf64-sh64.c (sh_elf64_gc_mark_hook): Use _bfd_elf_gc_mark_hook.
+	(sh_elf64_gc_sweep_hook): Delete.
+	(elf_backend_gc_sweep_hook): Don't define.
+	* elf32-avr.c (elf32_avr_gc_mark_hook): Delete.
+	(elf32_avr_gc_sweep_hook): Delete.
+	(elf_backend_gc_mark_hook, elf_backend_gc_mark_hook): Don't define.
+	* elf32-cr16c.c (elf32_cr16c_gc_mark_hook): Delete.
+	(elf32_cr16c_gc_sweep_hook): Delete.
+	(elf_backend_gc_mark_hook, elf_backend_gc_mark_hook): Don't define.
+	* elf32-crx.c (elf32_crx_gc_mark_hook): Delete.
+	(elf32_crx_gc_sweep_hook): Delete.
+	(elf_backend_gc_mark_hook, elf_backend_gc_mark_hook): Don't define.
+	* elf32-h8300.c (elf32_h8_gc_mark_hook): Delete.
+	(elf32_h8_gc_sweep_hook): Delete.
+	(elf_backend_gc_mark_hook, elf_backend_gc_mark_hook): Don't define.
+	* elf32-ip2k.c (ip2k_elf_gc_mark_hook): Delete.
+	(ip2k_elf_gc_sweep_hook): Delete.
+	(elf_backend_gc_mark_hook, elf_backend_gc_mark_hook): Don't define.
+	* elf32-m32c.c (m32c_elf_gc_mark_hook, m32c_elf_gc_sweep_hook): Delete.
+	(elf_backend_gc_mark_hook, elf_backend_gc_mark_hook): Don't define.
+	* elf32-m68hc11.c (elf_backend_gc_mark_hook): Don't define.
+	(elf_backend_gc_sweep_hook): Don't define.
+	* elf32-m68hc12.c (elf_backend_gc_mark_hook): Don't define.
+	(elf_backend_gc_sweep_hook): Don't define.
+	* elf32-m68hc1x.c (elf32_m68hc11_gc_mark_hook): Delete.
+	(elf32_m68hc11_gc_sweep_hook): Delete.
+	* elf32-m68hc1x.h (elf32_m68hc11_gc_mark_hook): Delete.
+	(elf32_m68hc11_gc_sweep_hook): Delete.
+	* elf32-msp430.c (elf32_msp430_gc_mark_hook): Delete.
+	(elf32_msp430_gc_sweep_hook): Delete.
+	(elf_backend_gc_mark_hook, elf_backend_gc_mark_hook): Don't define.
+	* elf32-mt.c (mt_elf_gc_mark_hook, mt_elf_gc_sweep_hook): Delete.
+	(elf_backend_gc_mark_hook, elf_backend_gc_mark_hook): Don't define.
+
+2006-09-25 Pedro Alves <pedro_alves@portugalmail.pt>
+
+	* bfd-in.h (CONST_STRNCPY) : Delete.
+	(LITSTRCPY) : New.
+	(LITMEMCPY) : New.
+	* bfd-in2.h : Regenerate.
+	* elflink.c  (bfd_elf_gc_sections) : Use LITMEMCPY. Don't manually
+	calculate string lengths.
+	* nlmcode.h (nlm_swap_auxiliary_headers_in) : Use LITMEMCPY.
+
+2006-09-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/3223
+	PR ld/3267
+	* elf.c (assign_file_positions_for_non_load_sections): Don't
+	warn zero size allocated sections.
+
+2006-09-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-score.c (_bfd_score_elf_relocate_section): Move assignment
+	to "name" so that compiler realizes it is never uninitialized.
+	Use bfd_elf_sym_name.
+
+2006-09-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/3262
+	* elf.c (rewrite_elf_program_header): Use bfd_zalloc instead of
+	bfd_alloc to allocate segment map.
+	(copy_elf_program_header): Likewise.
+
+2006-09-26  Mark Shinwell  <shinwell@codesourcery.com>
+	    Joseph Myers  <joseph@codesourcery.com>
+	    Ian Lance Taylor  <ian@wasabisystems.com>
+	    Ben Elliston  <bje@wasabisystems.com>
+
+	* archures.c: Add definition for bfd_mach_arm_iWMMXt2.
+	* cpu-arm.c (processors): Add bfd_mach_arm_iWMMXt2.
+	(arch_info_struct, bfd_arm_update_notes): Likewise.
+	(architectures): Likewise.
+	(bfd_arm_merge_machines): Check for iWMMXt2.
+	* bfd-in2.h: Rebuild.
+
+2006-09-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
+2006-09-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* elfcode.h (elf_swap_symbol_in): Return bfd_boolean.  Don't abort
+	on error.
+	* elf-bfd.h (elf_size_info <swap_symbol_in>): Adjust decl.
+	(bfd_elf32_swap_symbol_in, bfd_elf64_swap_symbol_in): Likewise.
+	* elf.c (bfd_elf_get_elf_syms): Test return of swap_symbol_in,
+	and report error.
+	* elf32-arm.c (elf32_arm_swap_symbol_in): Return bfd_boolean.
+
+2006-09-20  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* elf32-s390.c (elf_s390_relocate_section): Remove check for code
+	section in LD to LE linker relaxation for R_390_TLS_LDO32.
+	* elf64-s390.c (elf_s390_relocate_section): Likewise for
+	R_390_TLS_LDO64.
+
+2006-09-20  Kai Tietz  <Kai.Tietz@onevision.com>
+
+	* configure.in:	Added new target-vectors x86_64coff_vec,
+	x86_64pe_vec, and x86_64pei_vec.
+	* configure: Regenerate.
+	* config.bfd: Adjusted x86_64 target architecture detection.
+	* bfd.c: Add for new target "coff-x86-64"
+	(bfd_get_sign_extend): Add target vector idents for pe-x86-64. and pei-x86-64.
+	* coff-x86_64.c: Add new file for x86_64 (AMD64) coff support.
+	* libpei.h: Adjustments for COFF_WITH_pex64.
+	* coffcode.h: Add for new target machine, architecture, signature, and internal
+	signature handler.
+	* Makefile.am: Add new files to target-all and define make-rule for pex64igen.c
+	* Makefile.in: Regenerate.
+	* pe-x86_64.c: Add for new target "pe-x86-64".
+	* pei-x86_64.c:	Add for new target "pei-x86-64".
+	* peicode.h: Adjusts for new targets.
+	(coff_swap_filehdr_out): Set for this target to
+	_bfd_pex64_only_swap_filehdr_out.
+	(SIZEOF_IDATA4): Define it as 8 byte size for this target.
+	(SIZEOF_IDATA5): Define it as 8 byte size for this target.
+	(jump_table jtab): Add for AMD64MAGIC.
+	(pe_ILF_build_a_bfd): Adjusts for new size of SIZEOF_IDATA4 and SIZE_IDATA5.
+	(pe_ILF_object_p): Add coff image-file signature to internal
+	signature translation.
+	* peXXigen.c: Adjust proper include of target coff-header and
+	introduced target specific code
+	(COFF_WITH_pex64): New macro for this target.
+	(pe_print_idata): New dumping method for import section of PE+ files.
+	* targets.c: Add new target vectors declarations for x86_64 coff targets.
+	* coffcode.h: Support code to support the x86_64 PE magic number.
+	* coff-x86_64.c: New file.
+
+2006-09-17  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf.c (special_sections_s): Revert last STRING_COMMA_LEN change
+	for .stabstr entry, explain why.
+
+2006-09-17  Anton Blanchard  <anton@samba.org>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* dwarf2.c (concat_filename): Apply DW_AT_comp_dir if dir table
+	entry isn't absolute.
+
+2006-09-17  Mei Ligang  <ligang@sunnorth.com.cn>
+
+	* cpu-score.c: New file.
+	* elf32-score.c: New file.
+	* config.bfd: Add Score target.
+	* Makefile.am: Add Score files.
+	* Makefile.in: Regenerate.
+	* archures.c: Add Score architecture.
+	* reloc.c: Add Score relocs.
+	* targets.c: Add Score target vectors.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* configure.in: Add Score target.
+	* configure: Regenerate.
+
+2006-09-16  Nick Clifton  <nickc@redhat.com>
+	    Pedro Alves  <pedro_alves@portugalmail.pt>
+
+	* bfd-in.h (STRING_COMMA_LEN): New macro.  Takes one constant
+	string as its argument and emits the string followed by a comma
+	and then the length of the string.
+	(CONST_STRNEQ): New macro.  Checks to see if a variable string
+	has a constant string as its initial characters.
+	(CONST_STRNCPY): New macro.  Copies a constant string to the start
+	of a variable string.
+	* bfd-in2.h: Regenerate.
+	* archive.c: Make use of the new macros.
+	* archive64.c: Likewise.
+	* bfd.c: Likewise.
+	* coff-ppc.c: Likewise.
+	* coff-stgo32.c: Likewise.
+	* coffcode.h: Likewise.
+	* cofflink.c: Likewise.
+	* cpu-i960.c: Likewise.
+	* dwarf2.c: Likewise.
+	* ecoff.c: Likewise.
+	* elf-m10300.c: Likewise.
+	* elf.c: Likewise.
+	* elf32-arm.c: Likewise.
+	* elf32-bfin.c: Likewise.
+	* elf32-cris.c: Likewise.
+	* elf32-hppa.c: Likewise.
+	* elf32-i370.c: Likewise.
+	* elf32-i386.c: Likewise.
+	* elf32-iq2000.c: Likewise.
+	* elf32-m32r.c: Likewise.
+	* elf32-m68hc11.c: Likewise.
+	* elf32-m68hc12.c: Likewise.
+	* elf32-m68k.c: Likewise.
+	* elf32-mcore.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-s390.c: Likewise.
+	* elf32-sh-symbian.c: Likewise.
+	* elf32-sh.c: Likewise.
+	* elf32-sh64.c: Likewise.
+	* elf32-v850.c: Likewise.
+	* elf32-vax.c: Likewise.
+	* elf32-xtensa.c: Likewise.
+	* elf64-alpha.c: Likewise.
+	* elf64-hppa.c: Likewise.
+	* elf64-mmix.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf64-s390.c: Likewise.
+	* elf64-sh64.c: Likewise.
+	* elf64-x86-64.c: Likewise.
+	* elflink.c: Likewise.
+	* elfxx-ia64.c: Likewise.
+	* elfxx-mips.c: Likewise.
+	* elfxx-sparc.c: Likewise.
+	* hpux-core.c: Likewise.
+	* i386linux.c: Likewise.
+	* ieee.c: Likewise.
+	* libpei.h: Likewise.
+	* linker.c: Likewise.
+	* m68klinux.c: Likewise.
+	* mmo.c: Likewise.
+	* nlmcode.h: Likewise.
+	* osf-core.c: Likewise.
+	* pef.c: Likewise.
+	* som.c: Likewise.
+	* sparclinux.c: Likewise.
+	* vms-hdr.c: Likewise.
+
+2006-09-14  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 3181
+	* elf.c (_bfd_elf_copy_private_header_data): Fix group members
+	that have had their SHT_GROUP section removed.
+
+2006-09-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/3197
+	* elflink.c (elf_link_output_extsym): Compute bucket only if
+	needed.
+
+2006-09-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/3186
+	* elf.c (_bfd_elf_make_section_from_shdr): Correct length of
+	"gnu.linkonce.wi.".
+
+2006-09-08  Vladimir Prus  <vladimir@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_swap_symbol_out): Remove
+	unconditional setting of low bit for Thumb symbol
+	mistakenly left behind after check for external
+	symbols was added.  Fix comment typo.
+
+2006-09-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (elf_link_hash_entry): Add a dynamic field.
+	(bfd_elf_link_mark_dynamic_symbol): New.
+	(SYMBOLIC_BIND): New.
+
+	* elf32-i386.c (elf_i386_check_relocs): Replace info->symbolic
+	with SYMBOLIC_BIND (info, h).
+	(elf_i386_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_check_relocs): Likewise.
+	(elf64_x86_64_relocate_section): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_check_relocs): Likewise.
+
+	* elflink.c (bfd_elf_link_mark_dynamic_symbol): New.
+	(bfd_elf_record_link_assignment): Call
+	bfd_elf_link_mark_dynamic_symbol on new entry.
+	(_bfd_elf_merge_symbol): Likewise.
+	(_bfd_elf_export_symbol): Return if the symbol isn't exported.
+	(_bfd_elf_fix_symbol_flags): Replace info->symbolic with
+	SYMBOLIC_BIND (info, h).
+	(_bfd_elf_dynamic_symbol_p): Likewise.
+	(_bfd_elf_symbol_refs_local_p): Likewise.
+	(bfd_elf_size_dynamic_sections): Updated.
+
+2006-09-05  Bibo Mao  <bibo.mao@intel.com>
+
+	PR binutils/3171
+	* coffcode.h (coff_write_object_contents): Set the optional
+	header magic number to PE32PMAGIC instead of ZMAGIC for ia64.
+
+2006-09-04  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_howto_table_1): Adjust entries for
+	R_ARM_THM_ALU_PREL_11_0 and R_ARM_THM_PC12 relocations.
+	(elf32_arm_final_link_relocate): Handle R_ARM_THM_ALU_PREL_11_0
+	and R_ARM_THM_PC12 relocations.
+
+2006-08-24  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (xtensa_get_property_section_name): Delete.
+	(xtensa_get_property_section): New.
+	(xtensa_read_table_entries): Use xtensa_get_property_section.
+	(relax_property_section, xtensa_get_property_predef_flags): Handle
+	group name suffixes in property section names.
+	(match_section_group): New.
+
+2006-08-23  Frediano Ziglio  <Frediano.Ziglio@vodafone.com>
+
+	* archive.c (hpux_uid_gid_encode): Fix thinko decrementing "cnt"
+	variable.
+
+2006-08-22  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_copy_indirect_symbol): Only copy
+	plt_thumb_refcount from indirect symbols.
+
+2006-08-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Correct GOT and PLT HA
+	reloc handling.
+	* elf64-ppc.c (ppc64_elf_relocate_section): Likewise.
+
+2006-08-21  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_link_hash_table): Correct typo in
+	comment for target1_is_rel.
+
+2006-08-21  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+	* Makefile.am: Add rules to build pe-arm-wince.lo
+	and pei-arm-wince.lo objects.
+	* Makefile.in: Regenerate.
+	* pe-arm-wince.c: New file.
+	* pei-arm-wince.c: New file.
+	* pei-arm.c: Remove ARM_WINCE block.
+	* pe-arm.c: Remove ARM_WINCE block. Rename
+	bfd_arm_pe_allocate_interworking_sections,
+	bfd_arm_pe_get_bfd_for_interworking, and
+	bfd_arm_pe_process_before_allocation to
+	bfd_armpe_allocate_interworking_sections,
+	bfd_armpe_get_bfd_for_interworking, and
+	bfd_armpe_process_before_allocation. Move them before
+	including bfd.h.
+	* bfd.c: ARM wince bfd format names were renamed. Adjust.
+	* coff-arm.c [ARM_WINCE]: Adjust so Windows CE doesn't end up
+	with unexpected/conflicting relocs.
+	* targets.c: The arm-wince-pe target got its own new vector.
+	Adjust.
+	* config.bfd: Likewise.
+	* configure.in: Likewise.
+	* configure: Regenerate.
+
+2006-08-18  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_link_hash_entry): Add export_glue.
+	(elf32_arm_link_hash_newfunc): Initialize export_glue.
+	(record_arm_to_thumb_glue): Return stub symbol.
+	(elf32_arm_create_thumb_stub): New function.
+	(elf32_arm_to_thumb_stub): Use it.
+	(elf32_arm_to_thumb_export_stub): New function.
+	(elf32_arm_begin_write_processing): New function.
+	(allocate_dynrelocs): Allocate Arm stubs.
+	(elf_backend_begin_write_processing): Define.
+	(elf32_arm_symbian_begin_write_processing): Remove ATTRIBUTE_UNUSED.
+	Call elf32_arm_begin_write_processing.
+
+2006-08-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (create_linkage_sections): Align .glink to 8 bytes.
+	(ppc64_elf_build_stubs): Use new lazy linking stub.
+
+2006-08-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_size_stubs): Ignore non-code sections.
+
+2006-08-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/3015
+	* elf.c (get_program_header_size): Add a PT_GNU_RELRO segment
+	only if there is a PT_DYNAMIC segment.
+	(_bfd_elf_map_sections_to_segments): Likewise.
+	(assign_file_positions_for_load_sections): Set PT_GNU_RELRO
+	segment alignment to 1.
+
+2006-08-15  Thiemo Seufer  <ths@mips.com>
+	    Nigel Stephens  <nigel@mips.com>
+
+	* elf32-mips.c, elf64-mips.c, elfn32-mips.c
+	(elf_backend_merge_symbol_attribute): Define.
+	* elflink.c (elf_link_add_object_symbols): Merge only the ELF
+	visibility flags.
+	* elfxx-mips.c (_bfd_mips_elf_merge_symbol_attribute): New function.
+
+2006-08-15  Thiemo Seufer  <ths@mips.com>
+	    Nigel Stephens  <nigel@mips.com>
+	    David Ung  <davidu@mips.com>
+
+	* config.bfd: Add configurations for mips*el-sde-elf* and
+	mips*-sde-elf*.
+
+2006-08-14  DJ Delorie  <dj@redhat.com>
+
+	* elf-m10300.c (elf32_mn10300_link_hash_entry): Add value.
+	(elf32_mn10300_count_hash_table_entries): New.
+	(elf32_mn10300_list_hash_table_entries): New.
+	(sort_by_value): New.
+	(mn10300_elf_relax_section): Don't skip data sections; restrict
+	code-specific tests to code-specific areas so that potential
+	indirect calls can be detected.  Check for multiple local symbols
+	at the same address and merge their flags.
+	(elf32_mn10300_link_hash_newfunc): Initialize value.
+
+2006-08-14  Thiemo Seufer  <ths@mips.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_symbol_processing,
+	_bfd_mips_elf_add_symbol_hook): Don't try to place small common TLS
+	symbols in .scommon.
+
+2006-08-11  Thiemo Seufer  <ths@mips.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_finish_dynamic_sections): Set
+	sh_entsize only when sgot was already initialized.
+
+2006-08-08  DJ Delorie  <dj@redhat.com>
+
+	* elf32-sh.c (sh_elf_relax_section): Allow for branches across
+	non-moving .align directives.  Preserve any DIR32 offset when
+	converting bsr's to jsr's.
+
+2006-08-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_build_stubs): Clear relbrlt reloc_count
+	after stubs have been built.
+
+2006-08-07  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-sh.c (vxworks_object_p): Only check for vxworks target
+	vectors if they are going to be created.
+
+2006-08-07  Nick Clifton  <nickc@redhat.com>
+
+	* configure.in (bfd_elf32_shnbsd_vec): Fix typo.
+	* configure: Regenerate.
+
+2006-08-07  Nick Clifton  <nickc@redhat.com>
+
+	* coff-arm.c (coff_arm_rtype_to_howto): Only check for ARM_SECREL
+	relocation types if the target is ARM_WINCE.
+
+2006-08-05  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+	* bfd.c (bfd_get_sign_extend_vma): Add cases for pe-arm-little
+	and pei-arm-little.
+	* coff-arm.c (coff_arm_rtype_to_howto) [COFF_WITH_PE]: Handle
+	ARM_SECREL.
+	(coff_arm_reloc_type_lookup): Map BFD_RELOC_32_SECREL to
+	ARM_SECREL.
+	* pe-arm.c [COFF_SECTION_ALIGNMENT_ENTRIES]: Define.
+	* pei-arm.c [TARGET_UNDERSCORE]: Define for ARM_WINCE like in
+	pe-arm.c.
+	[COFF_SECTION_ALIGNMENT_ENTRIES]: Define.
+
+2006-08-04  Marcelo Tosatti  <marcelo@kvack.org>
+
+	* elflink.c (elf_gc_sweep): If info.print_gc_sections is true,
+	list removed sections to stderr.
+
+2006-08-04  Richard Sandiford  <richard@codesourcery.com>
+	    Kazu Hirata  <kazu@codesourcery.com>
+	    Phil Edwards  <phil@codesourcery.com>
+	    Nathan Sidwell  <nathan@codesourcery.com>
+
+	* config.bfd (sh-*-vxworks): Use bfd_elf32_shvxworks_vec and
+	bfd_elf32_shlvxworks_vec.
+	* configure.in (bfd_elf32_sh64_vec): Add elf-vxworks.lo.
+	(bfd_elf32_sh64l_vec, bfd_elf32_sh64lin_vec): Likewise.
+	(bfd_elf32_sh64blin_vec, bfd_elf32_sh64lnbsd_vec): Likewise.
+	(bfd_elf32_sh64nbsd_vec, bfd_elf32_sh_vec): Likewise.
+	(bfd_elf32_shblin_vec, bfd_elf32_shl_vec): Likewise.
+	(bfd_elf32_shl_symbian_vec, bfd_elf32_shlin_vec): Likewise.
+	(bfd_elf32_shlnbsd_vec, bfd_elf32_shnbsd_vec): Likewise.
+	(bfd_elf32_shlvxworks_vec, bfd_elf32_shvxworks_vec): New stanzas.
+	* configure: Regenerate.
+	* Makefile.am: Regenerate dependencies.
+	* Makefile.in: Regenerate.
+	* elf-vxworks.c (elf_vxworks_gott_symbol_p): New function.
+	(elf_vxworks_add_symbol_hook): Use it.
+	(elf_vxworks_link_output_symbol_hook): Likewise.  Use the hash
+	table entry to check for weak undefined symbols and to obtain
+	the original bfd.
+	(elf_vxworks_emit_relocs): Use target_index instead of this_idx.
+	* elf32-sh-relocs.h: New file, split from elf32-sh.c.
+	(R_SH_DIR32): Use SH_PARTIAL32 for the partial_inplace field,
+	SH_SRC_MASK32 for the src_mask field, and SH_ELF_RELOC for the
+	special_function field.
+	(R_SH_REL32): Use SH_PARTIAL32 and SH_SRC_MASK32 here too.
+	(R_SH_REL32, R_SH_TLS_GD_32, R_SH_TLS_LD_32): Likewise.
+	(R_SH_TLS_LDO_32, R_SH_TLS_IE_32, R_SH_TLS_LE_32): Likewise.
+	(R_SH_TLS_DTPMOD32, R_SH_TLS_DTPOFF32, R_SH_TLS_TPOFF32): Likewise.
+	(R_SH_GOT32, R_SH_PLT32, R_SH_COPY, R_SH_GLOB_DAT): Likewise.
+	(R_SH_JMP_SLOT, R_SH_RELATIVE, R_SH_GOTOFF, R_SH_GOTPC): Likewise.
+	(SH_PARTIAL32, SH_SRC_MASK32, SH_ELF_RELOC): Undefine at end of file.
+	* elf32-sh.c: Include elf32-vxworks.h.
+	(MINUS_ONE): Define.
+	(sh_elf_howto_table): Include elf32-sh-relocs.h with SH_PARTIAL32
+	set to TRUE, SH_SRC_MASK32 set to 0xffffffff, and SH_ELF_RELOC set
+	to sh_elf_reloc.
+	(sh_vxworks_howto_table): New variable.  Include elf32-sh-relocs.h
+	with SH_PARTIAL32 set to FALSE, SH_SRC_MASK32 set to 0, and
+	SH_ELF_RELOC set to bfd_elf_generic_reloc.
+	(vxworks_object_p, get_howto_table): New functions.
+	(sh_elf_reloc_type_lookup): Fix typo.  Use get_howto_table.
+	(sh_elf_info_to_howto): Use get_howto_table.
+	(sh_elf_relax_section): Honor the partial_inplace field of the
+	R_SH_DIR32 howto.
+	(sh_elf_relax_delete_bytes): Likewise.
+	(elf_sh_plt_info): New structure.
+	(PLT_ENTRY_SIZE): Replace both definitions with...
+	(ELF_PLT_ENTRY_SIZE): ...this new macro, with separate definitions for
+	INCLUDE_SHMEDIA and !INCLUDE_SHMEDIA.
+	(elf_sh_plt0_entry_be): Update sizes of both definitions accordingly.
+	(elf_sh_plt0_entry_le): Likewise.
+	(elf_sh_plt_entry_be, elf_sh_plt_entry_le): Likewise.
+	(elf_sh_pic_plt_entry_be, elf_sh_pic_plt_entry_le): Likewise.
+	(elf_sh_plts): New structure, with separate definitions for
+	INCLUDE_SHMEDIA and !INCLUDE_SHMEDIA.
+	(elf_sh_plt0_entry): Delete both definitions.
+	(elf_sh_plt_entry, elf_sh_pic_plt_entry): Likewise.
+	(elf_sh_sizeof_plt, elf_sh_plt_plt0_offset): Likewise.
+	(elf_sh_plt_temp_offset, elf_sh_plt_symbol_offset): Likewise.
+	(elf_sh_plt_reloc_offset): Likewise.
+	(movi_shori_putval): Delete in favor of...
+	(install_plt_field): ...this new function, with separate definitions
+	for INCLUDE_SHMEDIA and !INCLUDE_SHMEDIA.
+	(get_plt_info): New function, with separate definitions
+	for INCLUDE_SHMEDIA and !INCLUDE_SHMEDIA.
+	(elf_sh_plt0_linker_offset, elf_sh_plt0_gotid_offset): Delete.
+	(VXWORKS_PLT_HEADER_SIZE, VXWORKS_PLT_ENTRY_SIZE): New macros.
+	(vxworks_sh_plt0_entry_be, vxworks_sh_plt0_entry_le): New constants.
+	(vxworks_sh_plt_entry_be, vxworks_sh_plt_entry_le): Likewise.
+	(vxworks_sh_pic_plt_entry_be, vxworks_sh_pic_plt_entry_le): Likewise.
+	(get_plt_index, get_plt_offset): New functions.
+	(elf_sh_link_hash_table): Add srelplt2, plt_info and vxworks_p fields.
+	(sh_elf_link_hash_table_create): Initialize them.
+	(sh_elf_create_dynamic_sections): Call
+	elf_vxworks_create_dynamic_sections for VxWorks.
+	(allocate_dynrelocs): Use htab->plt_info to get the size of PLT
+	entries.  Allocate relocation entries in .rela.plt.unloaded if
+	generating a VxWorks executable.
+	(sh_elf_always_size_sections): New function.
+	(sh_elf_size_dynamic_sections): Extend .rela.plt handling to
+	.rela.plt.unloaded.
+	(sh_elf_relocate_section): Use get_howto_table.  Honor
+	partial_inplace when calculating the addend for dynamic
+	relocations.  Use get_plt_index.
+	(sh_elf_finish_dynamic_symbol): Use get_plt_index, install_plt_field
+	and htab->plt_info.  Fill in the bra .plt offset for VxWorks
+	executables.  Populate .rela.plt.unloaded.  Do not make
+	_GLOBAL_OFFSET_TABLE_ absolute on VxWorks.
+	(sh_elf_finish_dynamic_sections): Use install_plt_field and
+	htab->plt_info.  Handle cases where there is no special PLT header.
+	Populate the first relocation in .rela.plt.unloaded and fix up
+	the remaining entries.
+	(sh_elf_plt_sym_val): Use get_plt_info.
+	(elf_backend_always_size_sections): Define.
+	(TARGET_BIG_SYM, TARGET_BIG_NAME): Override for VxWorks.
+	(TARGET_LITTLE_SYM, TARGET_BIG_SYM): Likewise.
+	(elf32_bed, elf_backend_want_plt_sym): Likewise.
+	(elf_symbol_leading_char, elf_backend_want_got_underscore): Likewise.
+	(elf_backend_grok_prstatus, elf_backend_grok_psinfo): Likewise.
+	(elf_backend_add_symbol_hook): Likewise.
+	(elf_backend_link_output_symbol_hook): Likewise.
+	(elf_backend_emit_relocs): Likewise.
+	(elf_backend_final_write_processing): Likewise.
+	(ELF_MAXPAGESIZE, ELF_COMMONPAGESIZE): Likewise.
+	* targets.c (bfd_elf32_shlvxworks_vec): Declare.
+	(bfd_elf32_shvxworks_vec): Likewise.
+	(_bfd_target_vector): Include bfd_elf32_shlvxworks_vec and
+	bfd_elf32_shvxworks_vec.
+
+2006-08-02  Mark Kettenis  <kettenis@gnu.org>
+
+	* configure.in (arm-*-openbsd*): Set COREFILE to netbsd-core.lo.
+	* configure: Regenerate.
+
+2006-08-02  Petr Salinger  <Petr.Salinger@seznam.cz>
+
+	PR binutils/2983
+	* elf64-x86-64.c: Add FreeBSD support.
+	(elf64_x86_64_fbsd_post_process_headers): New function.
+	* targets.c (_bfd_target_vector): Add bfd_elf64_x86_64_freebsd_vec.
+	* config.bfd (x64_64-*-freebsd*): Add bfd_elf64_x86_64_freebsd_vec
+	to the targ_selvecs.
+	* configure.in: Add entry for bfd_elf64_x86_64_freebsd_vec.
+	* configure: Regenerate.
+
+2006-07-26  Andreas Schwab  <schwab@suse.de>
+
+	* elfxx-ia64.c (elfNN_ia64_choose_gp): Use rawsize if set.
+
+2006-07-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (elf_modify_segment_map): Delete empty PT_LOAD segments.
+	* elf32-xtensa.c (elf_xtensa_modify_segment_map): Delete.
+	(define elf_backend_modify_segment_map): Don't define.
+
+2006-07-25  Thiemo Seufer  <ths@networkno.de>
+
+	* elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Allow
+	linking of objects for compatible machine types.
+
+2006-07-25  Thiemo Seufer  <ths@networkno.de>
+
+	* elfxx-mips.c (mips_elf_next_relocation): Tighten check to test
+	also for same symbol.
+
+2006-07-25  Thiemo Seufer  <ths@mips.com>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): Remove magic constant.
+
+2006-07-24  Michael Wetherell  <mike.wetherell@ntlworld.com>
+
+	* elf.c (bfd_section_from_shdr): Reject unrecognised OS-specific
+	sections only if the SHF_OS_NONCONFORMING flag is present.
+
+2006-07-24  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/2729
+	* peXXigen.c (_bfd_XXi_final_link_postscript): Check for the
+	existance of output sections before putting their entries into the
+	DataDictionary.
+
+2006-07-20  Thiemo Seufer  <ths@mips.com>
+
+	* elf32-mips.c (mips16_jump_reloc): Remove function.
+	(elf_mips16_howto_table_rel): Use _bfd_mips_elf_generic_reloc
+	instead of mips16_jump_reloc.
+	* elf64_mips.c, wlfn32-mips.c (mips16_jump_reloc): Remove function.
+	(elf_mips16_howto_table_rel, elf_mips16_howto_table_rela): Use
+	_bfd_mips_elf_generic_reloc instead of mips16_jump_reloc.
+
+2006-07-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd-in.h (enum notice_asneeded_action): Define.
+	* bfd-in2.h: Regenerate.
+	* elflink.c (elf_link_add_object_symbols): Call linker "notice"
+	function with NULL name for as-needed handling.
+
+2006-07-18  Paul Brook  <paul@codesourcery.com>
+
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* reloc.c: Add BFD_RELOC_ARM_T32_ADD_IMM.
+
+2006-07-18  Nick Clifton  <nickc@redhat.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_common_definition): New function.
+	Consider SHN_MIPS_ACOMMON and SHN_MIPS_SCOMMON as being common
+	sections.
+	* elfxx-mips.h 	(_bfd_mips_elf_common_definition): Prototype.
+
+2006-07-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* elflink.c (bfd_elf_size_dynsym_hash_dynstr): Fix cinfo.shift2 value.
+
+2006-07-14  Mark Kettenis  <kettenis@gnu.org>
+
+	* elflink.c (bfd_elf_size_dynsym_hash_dynstr): Move declarations
+	to the start of a block.
+
+2006-07-13  Nick Clifton  <nickc@redhat.com>
+
+	* coff-sh.c (_bfd_sh_align_load_span): Catch sh_insn_info()
+	returning a NULL value.
+
+2006-07-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/2884
+	* elflink.c (_bfd_elf_merge_symbol): Copy the symbol info from
+	the old versioned dynamic definition to the new one with
+	non-default visibility.  Hide the symbol if it is hidden or
+	internal.
+
+2006-07-12  Matthew R. Dempsky  <mrd@alkemio.org>
+
+	* cpu-m68k.c (bfd_m68k_compatible): Handle CPU32.
+
+2006-07-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf.c (_bfd_elf_print_private_bfd_data): Handle DT_GNU_HASH.
+	(bfd_section_from_shdr, elf_fake_sections, assign_section_numbers):
+	Handle SHT_GNU_HASH.
+	(special_sections_g): Include .gnu.hash section.
+	(bfd_elf_gnu_hash): New function.
+	* elf-bfd.h (bfd_elf_gnu_hash, _bfd_elf_hash_symbol): New prototypes.
+	(struct elf_backend_data): Add elf_hash_symbol method.
+	* elflink.c (_bfd_elf_link_create_dynamic_sections): Create .hash
+	only if info->emit_hash, create .gnu.hash section if
+	info->emit_gnu_hash.
+	(struct collect_gnu_hash_codes): New type.
+	(elf_collect_gnu_hash_codes, elf_renumber_gnu_hash_syms,
+	_bfd_elf_hash_symbol): New functions.
+	(compute_bucket_count): Don't compute HASHCODES array, instead add
+	that and NSYMS as arguments.  Use bed->s->sizeof_hash_entry
+	instead of bed->s->arch_size / 8.  Fix .hash size estimation.
+	When not optimizing, use the number of hashed symbols rather than
+	dynsymcount.
+	(bfd_elf_size_dynamic_sections): Only add DT_HASH if info->emit_hash,
+	and ADD DT_GNU_HASH if info->emit_gnu_hash.
+	(bfd_elf_size_dynsym_hash_dynstr): Size .hash only if info->emit_hash,
+	adjust compute_bucket_count caller.  Create and populate .gnu.hash
+	section if info->emit_gnu_hash.
+	(elf_link_output_extsym): Only populate .hash section if
+	finfo->hash_sec != NULL.
+	(bfd_elf_final_link): Adjust assertion.  Handle DT_GNU_HASH.
+	* elfxx-target.h (elf_backend_hash_symbol): Define if not yet defined.
+	(elfNN_bed): Add elf_backend_hash_symbol.
+	* elf64-x86-64.c (elf64_x86_64_hash_symbol): New function.
+	(elf_backend_hash_symbol): Define.
+	* elf32-i386.c (elf_i386_hash_symbol): New function.
+	(elf_backend_hash_symbol): Define.
+
+2006-07-05  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/2659
+	* cofflink.c (_bfd_coff_link_input_bfd): Fix selection of aux
+	entry when multiple definitions of a symbol are encountered.
+
+2006-06-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_relocate_section): Use xchg %ax,%ax
+	instead of 2 nops.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+	(elf64_x86_64_plt0_entry): Use nopl 0(%rax) instead of 4 nops.
+
+2006-06-29  Jakub Jelinek  <jakub@redhat.com>
+
+	PR ld/2513
+	* elf32-i386.c (GOT_TLS_MASK, GOT_TLS_IE_IE, GOT_TLS_IE_GD,
+	GOT_TLS_IE_MASK, elf_i386_check_relocs, allocate_dynrelocs): Revert
+	2006-04-08 changes.
+	(elf_i386_relocate_section): Likewise.  For GD->IE transition
+	change subl into addl whenever tls_type is GOT_TLS_IE_POS.
+
+2006-06-23  Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/2754
+	* elf.c (bfd_elf_mkobject): Don't alloc if already done.  Set
+	program_header_size to -1.
+	(_bfd_elf_map_sections_to_segments): Adjust program_header_size check.
+	(assign_file_positions_for_load_sections ): Likewise.
+	(_bfd_elf_sizeof_headers): Use saved program_header_size if
+	available.
+	* elf32-arm.c (elf32_arm_mkobject): Call bfd_elf_mkobject, don't
+	alloc if already done.
+	* elf32-i386.c (elf_i386_mkobject): Likewise.
+	* elf32-ppc.c (ppc_elf_mkobject): Likewise.
+	* elf32-s390.c (elf_s390_mkobject): Likewise.
+	* elf32-sh.c (sh_elf_mkobject): Likewise.
+	* elf64-alpha.c (elf64_alpha_mkobject): Likewise.
+	* elf64-ppc.c (ppc64_elf_mkobject): Likewise.
+	* elf64-s390.c (elf_s390_mkobject): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_mkobject): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_mkobject): Likewise.
+
+2006-06-20  Jakub Jelinek  <jakub@redhat.com>
+
+	* elflink.c (elf_link_add_object_symbols): Don't create .tcommon
+	section for relocatable link.
+
+2006-06-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_backend_data): Add
+	elf_backend_modify_program_headers.
+	* elfxx-target.h (elf_backend_modify_program_headers): Define.
+	(elfNN_bed): Init new field.
+	* elf.c (elf_modify_segment_map): Remove comment.
+	(assign_file_positions_for_load_sections): Only call
+	elf_modify_segment_map for objcopy/strip.
+	(assign_file_positions_except_relocs): Call
+	elf_backend_modify_program_headers.
+	* elf32-frv.c (elf32_frvfdpic_always_size_sections): Don't make
+	.stack section.
+	(elf32_frvfdpic_modify_segment_map): Delete.
+	(elf32_frvfdpic_modify_program_headers): New.
+	(elf_backend_modify_segment_map): Don't define.
+	(elf_backend_modify_program_headers): Define.
+	* elf32-bfin.c (elf32_bfinfdpic_always_size_sections): Don't make
+	.stack section.
+	(elf32_bfinfdpic_modify_segment_map): Delete.
+	(elf32_bfinfdpic_modify_program_headers): New.
+	(elf_backend_modify_segment_map): Don't define.
+	(elf_backend_modify_program_headers): Define.
+	* elfxx-ia64.c (elfNN_ia64_modify_program_headers): New function.
+	Split out from..
+	(elfNN_ia64_modify_segment_map): ..here.
+	(elf_backend_modify_program_headers): Define.
+
+2006-06-20  Jakub Jelinek  <jakub@redhat.com>
+
+	* bfd.c (bfd_record_phdr): Clear p_align and p_align_valid fields.
+	* elf.c (_bfd_elf_link_hash_table_init): Clear hplt field.
+
+2006-06-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h: Formatting.
+	(_bfd_elf_map_sections_to_segments): Declare.
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame_hdr): Don't
+	clear program_header_size.
+	* elf.c (get_program_header_size): Move.  Don't use or set saved
+	program_header_size here.
+	(elf_modify_segment_map): New function.  Split out from..
+	(assign_file_positions_for_load_sections): ..here.  Assert
+	header size is correct.  Remove dead code.
+	(_bfd_elf_map_sections_to_segments): Rename from
+	map_sections_to_segments.  Make global.  Use get_program_header_size
+	when we need estimate of header size.  Call elf_modify_segment_map.
+	Set program_header_size.
+	(print_segment_map): Delete.
+	(_bfd_elf_sizeof_headers): If segment_map available, get the
+	actual size.
+	* elf32-arm.c (elf32_arm_symbian_modify_segment_map): Make safe
+	for calling more than once.
+	* elf32-bfin.c (elf32_bfinfdpic_modify_segment_map): Likewise.
+	* elf32-frv.c (elf32_frvfdpic_modify_segment_map): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_modify_segment_map): Likewise.
+	* elf32-i370.c (elf_backend_add_symbol_hook): Delete.
+	(elf_backend_additional_program_headers): Delete.
+	(elf_backend_modify_segment_map): Delete.
+	* elf64-hppa.c (elf64_hppa_modify_segment_map): Convert to ISO C.
+	* elfxx-ia64.c (elfNN_ia64_modify_segment_map): Likewise.
+	* doc/bfdint.texi: Delete SIZEOF_HEADERS difficulties.
+
+2006-06-19  Vladimir Prus  <vladimir@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_swap_symbol_out): Don't set low
+	bit for undefined symbols.
+
+2006-06-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_backend_data): Add bfd_link_info pointer
+	parameter.
+	(_bfd_elf_sizeof_headers): Replace bfd_boolean param with
+	bfd_link_info pointer.
+	* targets.c (struct bfd_target <_bfd_sizeof_headers>): Likewise.
+	* bfd.c (bfd_sizeof_headers): Tweak param name.
+	* aout-adobe.c (aout_adobe_sizeof_headers): Adjust.
+	* aoutx.h (NAME (aout, sizeof_headers)): Adjust.
+	* binary.c (binary_sizeof_headers): Adjust.
+	* bout.c (b_out_sizeof_headers): Adjust.
+	* coff-rs6000.c (_bfd_xcoff_sizeof_headers): Adjust.
+	* coff64-rs6000.c (xcoff64_sizeof_headers): Adjust.
+	* coffgen.c (coff_sizeof_headers): Adjust.
+	* ecoff.c (_bfd_ecoff_sizeof_headers): Adjust.
+	(ecoff_compute_section_file_positions): Adjust.
+	(_bfd_ecoff_write_object_contents): Adjust.
+	* elf.c (get_program_header_size, _bfd_elf_sizeof_headers): Adjust.
+	* elf32-arm.c (elf32_arm_additional_program_headers): Adjust.
+	* elf32-i370.c (elf_backend_additional_program_headers): Adjust.
+	* elf32-ppc.c (ppc_elf_additional_program_headers): Adjust.
+	* elf64-hppa.c (elf64_hppa_additional_program_headers): Adjust.
+	* elf64-x86-64.c (elf64_x86_64_additional_program_headers): Adjust.
+	* elfxx-ia64.c (elfNN_ia64_additional_program_headers): Adjust.
+	* elfxx-mips.c (_bfd_mips_elf_additional_program_headers): Adjust.
+	* elfxx-mips.h (_bfd_mips_elf_additional_program_headers): Adjust.
+	* i386msdos.c: Convert to ISO C.
+	(msdos_sizeof_headers): Adjust.
+	* i386os9k.c: Convert to ISO C.
+	(os9k_sizeof_headers): Adjust.
+	* ieee.c (ieee_sizeof_headers): Adjust.
+	* ihex.c (ihex_sizeof_headers): Adjust.
+	* libaout.h (NAME (aout, sizeof_headers)): Adjust.
+	* libbfd-in.h (_bfd_nolink_sizeof_headers): Adjust.
+	* libcoff-in.h (coff_sizeof_headers): Adjust.
+	* libecoff.h (_bfd_ecoff_sizeof_headers): Adjust.
+	* mach-o.c (bfd_mach_o_sizeof_headers): Adjust.
+	* mmo.c (mmo_sizeof_headers): Adjust.
+	* oasys.c (oasys_sizeof_headers): Adjust.
+	* pdp11.c (NAME (aout, sizeof_headers)): Adjust.
+	* pef.c (bfd_pef_sizeof_headers): Adjust.
+	* ppcboot.c (ppcboot_sizeof_headers): Adjust.
+	* som.c (som_sizeof_headers): Adjust.
+	* srec.c (srec_sizeof_headers): Adjust.
+	* tekhex.c (tekhex_sizeof_headers): Adjust.
+	* versados.c (versados_sizeof_headers): Adjust.
+	* vms.c (vms_sizeof_headers): Adjust.
+	* xcoff-target.h (_bfd_xcoff_sizeof_headers): Adjust.
+	* xsym.c (bfd_sym_sizeof_headers): Adjust.
+	* xsym.h (bfd_sym_sizeof_headers): Adjust.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* libcoff.h: Regenerate.
+
+2006-06-15  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* bfd-in2.h: Regenerate.
+	* elf32-arm.c (R_ARM_ALU_PC_G0_NC, R_ARM_ALU_PC_G0,
+	R_ARM_ALU_PC_G1_NC, R_ARM_ALU_PC_G1, R_ARM_ALU_PC_G2,
+	R_ARM_LDR_PC_G1, R_ARM_LDR_PC_G2, R_ARM_LDRS_PC_G0,
+	R_ARM_LDRS_PC_G1, R_ARM_LDRS_PC_G2, R_ARM_LDC_PC_G0,
+	R_ARM_LDC_PC_G1, R_ARM_LDC_PC_G2, R_ARM_ALU_SB_G0_NC,
+	R_ARM_ALU_SB_G0, R_ARM_ALU_SB_G1_NC, R_ARM_ALU_SB_G1,
+	R_ARM_ALU_SB_G2, R_ARM_LDR_SB_G0, R_ARM_LDR_SB_G1,
+	R_ARM_LDR_SB_G2, R_ARM_LDRS_SB_G0, R_ARM_LDRS_SB_G1,
+	R_ARM_LDRS_SB_G2, R_ARM_LDC_SB_G0, R_ARM_LDC_SB_G1,
+	R_ARM_LDC_SB_G2): New relocation types.
+	(R_ARM_PC13): Rename to AAELF name R_ARM_LDR_PC_G0 and
+	adjust HOWTO entry to be consistent with R_ARM_LDR_PC_G1
+	and friends.
+	(elf32_arm_howto_table_3): Delete; contents merged into
+	elf32_arm_howto_table_2.
+	(elf32_arm_howto_from_type): Adjust correspondingly.
+	(elf32_arm_reloc_map): Extend with the above relocations.
+	(calculate_group_reloc_mask): New function.
+	(identify_add_or_sub): New function.
+	(elf32_arm_final_link_relocate): Support for the above
+	relocations.
+	* reloc.c: Add enumeration entries for BFD_RELOC_ARM_...
+	codes to correspond to the above relocations.
+
+2006-06-14  Richard Sandiford  <richard@codesourcery.com>
+
+	* elf32-m68k.c (elf_m68k_plt_info): New structure.
+	(elf_m68k_plt0_entry): Add R_68K_PC32-style in-place addends.
+	(elf_m68k_plt_entry): Likewise.
+	(elf_m68k_plt_info): New table.
+	(CFV4E_PLT_ENTRY_SIZE): Rename to...
+	(ISAB_PLT_ENTRY_SIZE): ...this.
+	(CFV4E_FLAG): Delete.
+	(elf_cfv4e_plt0_entry): Rename to...
+	(elf_isab_plt0_entry): ...this.  Adjust comments.  Use (-6,%pc,%d0)
+	for the second instruction too.
+	(elf_cfv4e_plt_entry): Rename to...
+	(elf_isab_plt_entry): ...this.  Adjust comments and use (-6,%pc,%d0).
+	(elf_isab_plt_info): New table.
+	(CPU32_FLAG): Delete.
+	(PLT_CPU32_ENTRY_SIZE): Rename to...
+	(CPU32_PLT_ENTRY_SIZE): ...this.
+	(elf_cpu32_plt0_entry): Update bounds accordingly.  Add R_68K_PC32-
+	style in-place addends.
+	(elf_cpu32_plt_entry): Likewise.
+	(elf_cpu32_plt_info): New table.
+	(elf_m68k_link_hash_table): Add a plt_info field.
+	(elf_m68k_link_hash_table_create): Initialize it.
+	(elf_m68k_get_plt_info): New function.
+	(elf_m68k_always_size_sections): Likewise.
+	(elf_m68k_adjust_dynamic_symbol): Use the plt_info hash table field.
+	(elf_m68k_install_pc32): New function.
+	(elf_m68k_finish_dynamic_symbol): Factor code using plt_info and
+	elf_m68k_install_pc32.
+	(elf_m68k_finish_dynamic_sections): Likewise.
+	(elf_m68k_plt_sym_val): Use elf_m68k_get_plt_info.
+	(elf_backend_always_size_sections): Define.
+
+2006-06-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_link_add_object_symbols): Save and restore
+	struct bfd_hash_table table, size and count fields for
+	as-needed libs.
+
+2006-06-12  Thiemo Seufer  <ths@mips.com>
+
+	* elf32-mips.c: Expand comment about ABI-mandated pagesize values.
+	(ELF_MAXPAGESIZE, ELF_COMMONPAGESIZE): define in a more obvious way.
+	* elf64-mips.c, elfn32-mips.c (ELF_MAXPAGESIZE): Fix value for IRIX6.
+	Delete old comments.
+	(ELF_COMMONPAGESIZE): Define in a more obvious way.
+
+2006-06-12  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/2735
+	* elflink.c (elf_link_add_object_symbols): Fix the warning message
+	about mismatched alignments to allow for the case where the common
+	alignment has been deduced from the section alignment.
+	* bfd.c (_bfd_default_error_handler): Update comment to explain
+	why bfd and asection varargs are out of order.  Explicitly catch
+	and abort on NULL bfd and asection arguments.
+
+2006-06-11  Richard Sandiford  <richard@codesourcery.com>
+	    Thiemo Seufer  <ths@mips.com>
+
+	* elfxx-mips.c (mips_elf_link_hash_table): Add function_stub_size.
+	(STUB_ORI): New macro.
+	(STUB_LI16U): Fix formatting.
+	(MIPS_FUNCTION_STUB_SIZE): Delete.
+	(MIPS_FUNCTION_STUB_MAX_SIZE): Likewise.
+	(MIPS_FUNCTION_STUB_NORMAL_SIZE): New macro.
+	(MIPS_FUNCTION_STUB_BIG_SIZE): Likewise.
+	(_bfd_mips_elf_adjust_dynamic_symbol): Use htab->function_stub_size
+	instead of MIPS_FUNCTION_STUB_SIZE.
+	(count_section_dynsyms): New function, split out from
+	_bfd_mips_elf_final_link.
+	(_bfd_mips_elf_always_size_sections): Get a worst-case estimate
+	of the number of dynamic symbols needed and use it to set up
+	function_stub_size.  Use function_stub_size rather than
+	MIPS_FUNCTION_STUB_SIZE to determine the size of the stub section.
+	Use 16-byte stubs for 0x10000 dynamic symbols.
+	(_bfd_mips_elf_size_dynamic_sections): Use htab->function_stub_size
+	instead of MIPS_FUNCTION_STUB_SIZE.  Fix formatting.
+	(_bfd_mips_elf_finish_dynamic_symbol): Likewise.  Change the
+	size of the stub buffer from MIPS_FUNCTION_STUB_MAX_SIZE to
+	MIPS_FUNCTION_STUB_BIG_SIZE.  Tweak the check for unhandled dynindxes.
+	Use MIPS_FUNCTION_STUB_BIG_SIZE rather than a hard-coded 20.
+	Use STUB_ORI rather than STUB_LI16U for big stubs.
+	(_bfd_mips_elf_link_hash_table_create): Initialize function_stub_size.
+	(_bfd_mips_elf_final_link): Use count_section_dynsyms.
+
+2006-06-09  David Ung  <davidu@mips.com>
+
+	* bfd/elfxx-mips.c (mips_elf_calculate_relocation): Fix mode for stub
+	calling relocations.
+
+2006-06-08  David Daney  <ddaney@avtrex.com>
+
+	* elfxx-mips.c (STUB_LI16): Removed.
+	(STUB_LUI): New macro.
+	(STUB_LI16U): Ditto.
+	(STUB_LI16S): Ditto.
+	(MIPS_FUNCTION_STUB_SIZE): Rewrote to take info parameter.
+	(_bfd_mips_elf_adjust_dynamic_symbol): Pass info parameter to
+	MIPS_FUNCTION_STUB_SIZE.
+	(_bfd_mips_elf_always_size_sections): Ditto.
+	(_bfd_mips_elf_size_dynamic_sections): Ditto.
+	(_bfd_mips_elf_finish_dynamic_sections): Ditto.
+	(_bfd_mips_elf_finish_dynamic_symbol): Rewrote stub generation
+	to allow larger symbol table indexes.
+
+2006-06-07  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* po/Make-in (pdf, ps): New dummy targets.
+
+2006-06-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* hash.c (bfd_hash_lookup): Correct stray line.
+
+	* elf.c (_bfd_elf_init_private_section_data): Comment typo.
+	(elfcore_grok_nto_status): Use long instead of pid_t.
+	(elfcore_grok_nto_regs, elfcore_grok_nto_note): Likewise.
+
+2006-06-05  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* po/Make-in (top_builddir): Define.
+
+2006-06-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* config.in: Regenerate.
+
+2006-06-02  Alan Modra  <amodra@bigpond.net.au>
+	    H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/2723
+	* elflink.c (bfd_elf_final_link): Don't output section symbols
+	for special ELF sections.
+
+2006-06-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* stabs.c (_bfd_link_section_stabs): Use bfd_make_section*_with_flags
+	instead of bfd_make_section*.
+	* aix386-core.c: Likewise.
+	* aix5ppc-core.c: Likewise.
+	* aout-adobe.c: Likewise.
+	* aoutf1.h: Likewise.
+	* binary.c: Likewise.
+	* cisco-core.c: Likewise.
+	* coff-arm.c: Likewise.
+	* coff-h8300.c: Likewise.
+	* elf.c: Likewise.
+	* elf32-bfin.c: Likewise.
+	* elf32-m32c.c: Likewise.
+	* hppabsd-core.c: Likewise.
+	* hpux-core.c: Likewise.
+	* i386linux.c: Likewise.
+	* ieee.c: Likewise.
+	* ihex.c: Likewise.
+	* irix-core.c: Likewise.
+	* lynx-core.c: Likewise.
+	* m68klinux.c: Likewise.
+	* mach-o.c: Likewise.
+	* netbsd-core.c: Likewise.
+	* nlmcode.h: Likewise.
+	* opncls.c: Likewise.
+	* osf-core.c: Likewise.
+	* peXXigen.c: Likewise.
+	* ppcboot.c: Likewise.
+	* ptrace-core.c: Likewise.
+	* rs6000-core.c: Likewise.
+	* sco5-core.c: Likewise.
+	* sparclinux.c: Likewise.
+	* srec.c: Likewise.
+	* sunos.c: Likewise.
+	* trad-core.c: Likewise.
+	* xcofflink.c: Likewise.
+	* xsym.c: Likewise.
+
+2006-05-31  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.am (INCLUDES): Use @INCINTL@.
+	* acinclude.m4: Include new gettext macros.
+	* configure.in: Use ZW_GNU_GETTEXT_SISTER_DIR and AM_PO_SUBDIRS.
+	Manually substitute POFILES and GMOFILES.
+	* Makefile.in, aclocal.m4, configure, doc/Makefile.in: Regenerated.
+
+2006-05-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfd.c (bfd_emul_get_maxpagesize): New.
+	(bfd_elf_set_pagesize): Likewise.
+	(bfd_emul_set_maxpagesize): Likewise.
+	(bfd_emul_get_commonpagesize): Likewise.
+	(bfd_emul_set_commonpagesize): Likewise.
+	* bfd-in2.h: Regenerated.
+
+	* elf-bfd.h (elf_backend_data): Add commonpagesize.
+	(xvec_get_elf_backend_data): New.
+	(get_elf_backend_data): Use xvec_get_elf_backend_data.
+
+	* elf32-arm.c (elf32_arm_vxworks_bed): Remove const.
+	* elfxx-target.h (elfNN_bed): Likewise.
+
+	* elf32-arm.c (ELF_COMMONPAGESIZE): Defined.
+	* elf32-mips.c (ELF_COMMONPAGESIZE): Likewise.
+	* elf32-ppc.c (ELF_COMMONPAGESIZE): Likewise.
+	* elf32-sh.c (ELF_COMMONPAGESIZE): Likewise.
+	* elf32-sh64.c (ELF_COMMONPAGESIZE): Likewise.
+	* elf32-sparc.c (ELF_COMMONPAGESIZE): Likewise.
+	* elf64-alpha.c (ELF_COMMONPAGESIZE): Likewise.
+	* elf64-ppc.c (ELF_COMMONPAGESIZE): Likewise.
+	* elf64-sparc.c (ELF_COMMONPAGESIZE): Likewise.
+	* elf64-x86-64.c (ELF_COMMONPAGESIZE): Likewise.
+	* elfn32-mips.c (ELF_COMMONPAGESIZE): Likewise.
+	* elfxx-ia64.c (ELF_COMMONPAGESIZE): Likewise.
+
+	* elfxx-target.h (ELF_COMMONPAGESIZE): Define if not defined.
+	(elfNN_bed): Initialize commonpagesize with ELF_COMMONPAGESIZE.
+
+	* targets.c (bfd_find_target): Support NULL abfd.
+
+2006-05-30  Nick Clifton  <nickc@redhat.com>
+
+	* po/es.po: Updated Spanish translation.
+
+2006-05-27  Alan Modra  <amodra@bigpond.net.au>
+	    H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (assign_file_positions_for_load_sections): Retrieve
+	maxpagesize from m->p_align if it is valid.  Set p_vaddr,
+	p_paddr and p_align earlier.  Revert 2006-05-19 change to p_align.
+	(copy_elf_program_header): Copy p_align.  Set p_align_valid.
+
+2006-05-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (ELF_MINPAGESIZE): Changed to 0x1000.
+
+2006-05-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (ELF_MINPAGESIZE): Set to 0x100000.
+
+2006-05-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (ELF_MAXPAGESIZE): Updated to 0x200000.
+
+2006-05-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (sym_is_global): Return a bfd_boolean.
+	(ignore_section_sym): New function.
+	(elf_map_symbols): Use ignore_section_sym to discard some syms.
+	(_bfd_elf_symbol_from_bfd_symbol): Ensure section belongs to
+	bfd before using elf_section_syms.
+
+2006-05-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config.bfd: (sh-*-linux*): Treat as 64bit target.
+	(sh*l*-*-netbsdelf*): Likewise.
+	(sh-*-netbsdelf*): Likewise.
+	(shl*-*-elf*): Likewise.
+	(sh[1234]l*-*-elf*): Likewise.
+	(sh3el*-*-elf*): Likewise.
+	(shl*-*-kaos*): Likewise.
+	(sh-*-elf*): Likewise.
+	(sh[1234]*-elf*): Likewise.
+	(sh-*-rtems*): Likewise.
+	(sh-*-kaos*): Likewise.
+
+2006-05-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/1485
+	* config.bfd: Set want64 to true if 64bit bfd is used.
+	(sh-*-linux*): Use targ64_selvecs for 64bit targets.
+	(sh*l*-*-netbsdelf*): Likewise.
+	(sh-*-netbsdelf*): Likewise.
+	(shl*-*-elf*): Likewise.
+	(sh[1234]l*-*-elf*): Likewise.
+	(sh3el*-*-elf*): Likewise.
+	(shl*-*-kaos*): Likewise.
+	(sh-*-elf*): Likewise.
+	(sh[1234]*-elf*): Likewise.
+	(sh-*-rtems*): Likewise.
+	(sh-*-kaos*): Likewise.
+
+2006-05-24  Paul Brook  <paul@codesourcery.com>
+
+	* elf-bfd.h (elf_backend_data): Add elf_backend_output_arch_local_syms
+	* elf32-arm.c (output_arch_syminfo): Define.
+	(elf32_arm_ouput_plt_map_sym, elf32_arm_output_plt_map,
+	elf32_arm_output_arch_local_syms): New functions.
+	(elf_backend_output_arch_local_syms): Define.
+	* elflink.c (bfd_elf_final_link): Call
+	elf_backend_output_arch_local_syms.
+	* elfxx-target.h (elf_backend_output_arch_local_syms): Provide default
+	definition.
+	(elfNN_bed): Add elf_backend_output_arch_local_syms.
+
+2006-05-24  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (put_arm_insn, put_thumb_insn): New functions.
+	(elf32_thumb_to_arm_stub, elf32_arm_to_thumb_stub,
+	elf32_arm_finish_dynamic_symbol): Use them.
+
+2006-05-24  Carlos O'Donell  <carlos@systemhalted.org>
+	    Randolph Chung  <tausq@debian.org>
+
+	* elf-hppa.h (reloc_hppa_howto_table): Check bitfield for
+	TPREL21L/TPREL14R relocations. Handle LTOFF_TP14R relocations.
+	Add handling for TLS relocations.
+	(elf_hpp_reloc_final_type): Handle TLS relocs.
+	* elf32-hppa.c: Add authors for cleanup and TLS support.
+	(hppa_elf_local_got_tls_type, hh_name, eh_name): Define.
+	(elf32_hppa_link_hash_entry): Add tls_type.
+	(elf32_hppa_link_hash_table): Add tld_ldm_got.
+	(hppa_link_has_newfunc): Set tls_type.
+	(elf32_hppa_link_hash_table_create): Set tls_ldm_got refcount.
+	(hppa_stub_name): Use hh_name macro.
+	(elf32_hppa_copy_indirect_symbol): Copy TLS information.
+	(elf32_hppa_check_relocs): Call elf32_hppa_optimized_tls_reloc.
+	Handle TLS relocs.
+	(elf32_hppa_gc_sweep_hook): Likewise.
+	(allocate_dynrelocs): Handle TLS relocs.
+	(elf32_hppa_size_dynamic_sections): Count space required by TLS
+	relocs. Use hh_name macro.
+	(dtpoff_base): New function.
+	(tpoff): Likewise.
+	(elf32_hppa_optimized_tls_reloc): Likewise.
+	(final_link_relocate): Handle TLS relocs.
+	(elf32_hppa_relocate_section): Handle TLS relocs. Use eh_name
+	and hh_name macros.
+	(elf32_hppa_finish_dynamic_symbol): Setup TLS got entries. Use
+	hh_name and eh_name macros.
+	(elf32_hppa_reloc_type_clas): Handle TLS relocs.
+
+2006-05-24  Bjoern Haase  <bjoern.m.haase@web.de>
+
+	* archures.c: Add bfd_mach_avr6.
+	* cpu-avr.c: Likewise.
+	* reloc.c (BFD_RELOC_AVR_LO8_LDI_GS, BFD_RELOC_AVR_HI8_LDI_GS):
+	New relocations.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h:Regenerate.
+	* elf32-avr.h: New file.  Protoypes for functions accessed from ld.
+	* elf32-avr.c: Add elf32-avr.h to include list.
+	(elf32_avr_stub_hash_entry): New function.
+	(elf32_avr_link_hash_table): New struct.
+	(avr_link_hash_table): Likewise.
+	(avr_stub_hash_entry): Likewise.
+	(avr_stub_hash_lookup): New function.
+	(stub_hash_newfunc): New function.
+	(elf32_avr_link_hash_table_create): New function.
+	(elf32_avr_link_hash_table_free): New function.
+	(avr_get_stub_addr): New function.
+	(debug_relax, debug_stubs): Add new global variables controlling
+	debugging printout to stdout.
+	(avr_pc_wrap_around): Change the type to bfd_vma.
+	(avr_replace_call_ret_sequences): Add a new variable controling
+	linkrelax optimizations.
+	(avr_stub_is_required_for_16_bit_reloc): New function.
+	(avr_final_link_relocate):
+	Add linker hash table to parameter list. Use stub addr. if necessary.
+	(elf32_avr_relocate_section):
+	Add linker hashtable to parameter list of avr_final_link_relocate.
+	(bfd_elf_avr_final_write_processing): Add support for bfd_mach_avr6.
+	(elf32_avr_object_p): Add support for E_AVR_MACH_AVR6.
+	(elf32_avr_relax_delete_bytes):
+	Iterate over all sections of a bfd when adjusting relocs addends.
+	(elf32_avr_relax_section):
+	Evaluate avr_replace_call_ret_sequences and recalculate the size of
+	stub section.
+	(avr_stub_name): New function.
+	(avr_get_stub_entry): New function.
+	(avr_add_stub): New function.
+	(avr_build_one_stub): New function.
+	(avr_size_one_stub): New function.
+	(elf32_avr_setup_params): New function.
+	(elf32_avr_setup_section_lists): New function.
+	(get_local_syms): New function.
+	(elf32_avr_size_stubs): New function.
+	(bfd_elf32_bfd_link_hash_table_create): New function.
+	(bfd_elf32_bfd_link_hash_table_free): New function.
+
+2006-05-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/2655
+	PR ld/2657
+	* elf-eh-frame.c (_bfd_elf_write_section_eh_frame): Properly
+	update CIE/FDE length.  Don't pad to the section alignment.
+
+2006-05-23  Jie Zhang  <jie.zhang@analog.com>
+
+	* elf32-bfin.c (bfinfdpic_relocate_section): Clear reloc for
+	deteted entries in .eh_frame section.
+
+2006-05-23  Jie Zhang  <jie.zhang@analog.com>
+
+	* elf32-bfin.c (bfin_check_relocs): Use __GLOBAL_OFFSET_TABLE_
+	instead of _GLOBAL_OFFSET_TABLE_.
+	(bfin_relocate_section): Ditto.
+	(_bfin_create_got_section): Ditto.
+	(elf32_bfinfdpic_create_dynamic_sections): Use
+	__PROCEDURE_LINKAGE_TABLE_ instead of _PROCEDURE_LINKAGE_TABLE_.
+	(bfin_finish_dynamic_symbol): Use __DYNAMIC instead of _DYNAMIC.
+
+2006-05-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (compare_symbols): Prefer strong dynamic global
+	function syms over other syms.
+
+2006-05-22  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elflink.c (_bfd_elf_add_dynamic_entry): Remove DT_TEXTREL
+	check.
+	(bfd_elf_final_link): Add a late DT_TEXTREL check.
+	* elfxx-mips.c (MIPS_ELF_READONLY_SECTION): Define.
+	(mips_elf_create_dynamic_relocation): Set DF_TEXTREL.
+	(_bfd_mips_elf_check_relocs): Delete MIPS_READONLY_SECTION.
+	Use MIPS_ELF_READONLY_SECTION.
+	(_bfd_mips_elf_size_dynamic_sections): Clear DF_TEXTREL after
+	creating DT_TEXTREL.
+	(_bfd_mips_elf_finish_dynamic_sections): Clear textrel markers
+	if no text relocations were generated.
+
+2006-05-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (ELF_MAXPAGESIZE): Fix a typo in comment.
+
+2006-05-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (elf_fake_sections): Formatting.
+	(assign_file_positions_for_load_sections): Only add SEC_ALLOC
+	sections to p_memsz.  Remove hack for PT_NOTE sections.  Allow
+	section alignment to increase p_align for PT_LOAD.
+	(assign_file_positions_for_non_load_sections): Remove ARM BPABI
+	hack for PT_DYNAMIC.  Instead, set p_filesz for all segments
+	other than PT_LOAD, and PT_NOTE in core.
+
+2006-05-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (assign_file_positions_for_segments): Split into..
+	(assign_file_positions_for_load_sections): ..this, and..
+	(assign_file_positions_for_non_load_sections): ..this new function,..
+	(assign_file_positions_except_relocs): ..writing program headers here.
+
+2006-05-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_gc_sweep): Don't specially keep non-alloc,
+	non-load sections if they have relocs.
+
+2006-05-15  Paul Brook  <paul@codesourcery.com>
+
+	* cpu-arm.c (bfd_is_arm_mapping_symbol_name): Rename ...
+	(bfd_is_arm_special_symbol_name): ... to this.  Add type argument.
+	Check symbol name is of specified type.
+	* elf32-arm.c (elf32_arm_is_target_special_symbol,
+	arm_elf_find_function, elf32_arm_output_symbol_hook): Use
+	bfd_is_arm_special_symbol_name.
+	* bfd-in.h (BFD_ARM_SPECIAL_SYM_TYPE_MAP,
+	BFD_ARM_SPECIAL_SYM_TYPE_TAG, BFD_ARM_SPECIAL_SYM_TYPE_OTHER,
+	BFD_ARM_SPECIAL_SYM_TYPE_ANY): Define.
+	(bfd_is_arm_mapping_symbol_name): Remove prototype.
+	(bfd_is_arm_special_symbol_name): Add prototype.
+	* bfd-in2.h: Regenerate.
+
+2006-05-15  David Heine  <dlheine@tensilica.com>
+	    Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (check_loop_aligned): Fix reversed check for
+	undefined opcode.  Clean up assertions.
+	(narrow_instruction, widen_instruction): Remove "do_it" parameters.
+	Factor most of the code into separate functions....
+	(can_narrow_instruction, can_widen_instruction): New.
+	(prev_instr_is_a_loop): New.
+	(compute_ebb_proposed_actions): Combine error handling code for
+	decode errors.  Replace call to insn_decode_len with inline code.
+	Use can_narrow_instruction and can_widen_instruction.  Handle errors
+	from call to xtensa_opcode_is_loop.
+	(relax_section): Adjust calls to narrow_instruction and
+	widen_instruction.
+
+2006-05-15  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 2658
+	* elf32-ppc.c (ppc_elf_relax_section): Don't segfault on non-pic
+	-shared link.
+
+2006-05-11  Michael Matz  <matz@suse.de>
+
+	* elflink.c (match_group_member): Correctly iterate group
+	members.
+
+2006-05-11  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_reloc_map): Add MOVW and MOVT relocs.
+	(elf32_arm_final_link_relocate): Handle MOVW and MOVT relocs.
+	(elf32_arm_gc_sweep_hook, elf32_arm_check_relocs): Ditto.
+	* reloc.c: Ditto.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* libcoff.h: Regenerate.
+
+2006-05-11  Mike Bland  <mbland@google.com>
+
+	* elf.c (_bfd_elf_init_private_section_data): Don't change
+	section type if already set.
+
+2006-05-10  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/2607
+	* elfcode.h (valid_section_index_p): New function: Checks for a
+	valid section index.  Allows indicies in the range SHN_LOPROC to
+	SHN_HIOS.
+	(elf_object_p): Use valid_section_index_p.
+
+2006-05-11  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+	* coff-arm.c (ARM_26D, ARM_32, ARM_RVA_32, ARM_SECTION,
+	ARM_SECREL): Mark WinCE versions of these relocs as partial
+	inplace.
+	(coff_arm_relocate_section): Adjust addend for WinCE.
+
+2006-05-10  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 2342
+	* elflink.c (_bfd_elf_default_action_discarded): Revert 2006-02-16.
+
+2006-05-09  Nick Clifton  <nickc@redhat.com>
+
+	* coffcode.h (coff_write_relocs): Produce an error message if a an
+	out-of-range symbol index is detected in a reloc.
+
+2006-05-09  Ben Elliston  <bje@au.ibm.com>
+
+	* elf64-ppc.c (ppc64_elf_finish_dynamic_symbol): Remove unused
+	local variable `dynobj'.
+
+2006-05-05  Bjoern Haase  <bjoern.m.haase@web.de>
+
+	* elf32-avr.c (elf32_avr_relax_delete_bytes): Iterate over all
+	of the bfd's sections for the reloc-addend adjustments.
+
+2006-05-05  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* elf32-s390.c (invalid_tls_insn): Call bfd_set_error.
+	(elf_s390_relocate_section): Add code to do the GD->LE and
+	LD->LE TLS linker optimizations if a brasl instruction is used
+	for the __tls_get_offset function call.
+	* elf64-s390.c (invalid_tls_insn): Call bfd_set_error.
+
+2006-05-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_tls_optimize): Only optimize
+	R_PPC64_TPREL64 and R_PPC64_DTPMOD64 relocs when they are in
+	the .toc and referenced by a TLS code sequence.
+	(ppc64_elf_edit_toc): Cater for the unlikely situation that
+	.toc is the first section in a file.
+
+2006-05-04  Andreas Schwab  <schwab@suse.de>
+
+	* aoutf1.h (struct external_sparc_core): Declare c_regs as struct
+	regs instead of an array of int.
+	(struct external_solaris_bcp_core): Likewise.
+	(swapcore_sun3): Use offsetof instead of computing the offset
+	manually.
+	(swapcore_sparc): Likewise.  Simplify reference to c_regs.
+	(swapcore_solaris_bcp): Likewise.
+
+2006-05-04  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_hide_symbol): Adjust handling
+	for missing GOTs.
+
+2006-05-04  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* cpu-arm.c (bfd_is_arm_mapping_symbol_name): Accept more
+	mapping symbols.
+
+2006-05-04  Ben Elliston  <bje@au.ibm.com>
+
+	* coff-or32.c (bfd_section_from_shdr): Remove unused local
+	variable `ptr'.
+	* cofflink.c (process_embedded_commands): Remove unused local
+	variables `had_read' and `had_shared'.
+	* ecofflink.c (bfd_ecoff_debug_accumulate): Remove unused local
+	variable `fdr_adr'.
+	* ihex.c (ihex_read_section): Remove unused local variable `addr'.
+
+2006-05-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* libbfd-in.h (_bfd_generic_new_section_hook): Declare.
+	* section.c (bfd_abs_symbol, bfd_com_symbol): Delete.
+	(bfd_und_symbol, bfd_ind_symbol): Delete.
+	(BFD_FAKE_SECTION): Remove SYM_PTR param, set symbol_ptr_ptr to
+	&SEC.symbol.
+	(STD_SECTION): Adjust.
+	(_bfd_generic_new_section_hook): New function, extracted from..
+	(bfd_section_init): ..here.
+	(bfd_make_section_old_way): Call new_section_hook for abs, com,
+	und and ind sections.
+	* elf.c (_bfd_elf_large_com_section): Adjust.
+	* aoutx.h (new_section_hook): Call _bfd_generic_new_section_hook.
+	* pdp11.c (new_section_hook): Likewise.
+	* coffcode.h (coff_new_section_hook): Likewise.
+	* ecoff.c (_bfd_ecoff_new_section_hook): Likewise.
+	* elf.c (_bfd_elf_new_section_hook): Likewise.
+	* vms.c (vms_new_section_hook): Likwise.
+	* elf32-arm.c (elf32_arm_new_section_hook): Check used_by_bfd isn't
+	already set.
+	* elf32-sh64.c (sh64_elf_new_section_hook): Likewise.
+	* elf32-xtensa.c (elf_xtensa_new_section_hook): Likewise.
+	* elf64-mmix.c (mmix_elf_new_section_hook): Likewise.
+	* elf64-ppc.c (ppc64_elf_new_section_hook): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_new_section_hook): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_new_section_hook): Likewise.
+	* ieee.c (ieee_new_section_hook): Likewise.  Call
+	_bfd_generic_new_section_hook too.
+	* mmo.c (mmo_new_section_hook): Likewise.
+	* oasys.c (oasys_new_section_hook): Likewise.
+	* som.c (som_new_section_hook): Likewise.
+	* coff-w65.c (reloc_processing): Don't use bfd_abs_symbol.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2006-05-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* hash.c (DEFAULT_SIZE): Revert last change.
+	(higher_prime_number): Correct test for no larger prime.  Don't
+	abort on error, instead return 0.  Depopulate primes[].
+	(bfd_hash_lookup): If we overflow size, refuse to grow table.
+
+2006-05-02  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Set thumb funciton bit
+	for R_ARM_REL32.
+
+2006-05-02  Ben Elliston  <bje@au.ibm.com>
+
+	* archive.c (bfd_generic_archive_p): Remove unused local variable
+	`fail'.
+	* dwarf2.c (decode_line_info): Remove unused local variable
+	`basic_block'.
+	* elfcode.h (elf_slurp_reloc_table_from_section): Remove unused
+	local variable `s'.
+	* tekhex.c (tekhex_write_object_contents): Remove unused local
+	variable `bytes_written'.
+	* aout-ns32k.c (MY_swap_std_reloc_out): Remove unused local
+	variable `r_addend'.
+	* elf32-dlx.c (dlx_rtype_to_howto): Remove breaks after returns.
+	* elfxx-mips.c (_bfd_elf_mips_mach): Remove breaks after returns.
+	(_bfd_ns32k_relocate_contents): Remove break after return.
+	* elf.c (bfd_section_from_shdr): Remove breaks after returns.
+
+2006-05-02  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-sh-symbian.c: Rename local define DEBUG to SYMBIAN_DEBUG
+	in order to avoid conflicts with the global DEBUG define.
+
+2006-05-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* dwarf2.c: Formatting.
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Simplify
+	output section check.
+	* elf32-i370.c: Warning fixes inside #ifdef DEBUG.
+	* elf32-m32c.c: Similarly.
+	* elf32-ppc.c: Similarly.
+	* elf32-v850.c: Similarly.
+	* nlm32-sparc.c: Similarly.
+	* elfcode.h: Similarly.
+	(elf_symbol_flags): Delete.
+	* elflink.c (elf_link_input_bfd): Comment typo.
+
+2006-05-01  DJ Delorie  <dj@redhat.com>
+
+	* bfd-in.h (bfd_hash_table): Add count field.
+	* bfd-in2.h: Regenerate.
+	* hash.c (higher_prime_number): New.
+	(bfd_hash_table_inint_n): Init count field.
+	(bfd_hash_lookup): Grow table as needed.
+
+2006-04-27  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	PR binutils/2584
+	* tekhex.c (getvalue): Change return type to bfd_boolean and
+	add the new parameter.  Return false if the unexpected character
+	is found.
+	(getsym): Likewise.
+	(first_phase): Change return type to bfd_boolean and return
+	false if the unexpected character is found.  Replace abort
+	with returning false.
+	(pass_over): Change return type to bfd_boolean and the type of
+	the second argument to bfd_boolean (*) (bfd *, int, char *).
+	Return false if FUNC returns false.
+	(tekhex_object_p): Return NULL if pass_over fails.
+
+2006-04-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* coff-rs6000.c (xcoff_write_archive_contents_old): Warning fix.
+
+2006-04-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/2593
+	* elf.c (_bfd_elf_new_section_hook): Don't set section ELF type
+	and flags if its BFD flags have been set.
+	(_bfd_elf_init_private_section_data): Don't copy the output ELF
+	section type from input if it has been set to something
+	different.
+
+2006-04-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/2467
+	* elf.c (_bfd_elf_close_and_cleanup): Check elf_tdata (abfd)
+	is NULL first.
+
+	* elf32-arm.c (elf32_arm_close_and_cleanup): Check if
+	abfd->sections is NULL.
+	(elf32_arm_bfd_free_cached_info): New.
+	(bfd_elf32_bfd_free_cached_info): Defined.
+
+	* elfxx-target.h (bfd_elfNN_bfd_free_cached_info): Default it
+	to _bfd_free_cached_info.
+
+	* libbfd-in.h (_bfd_free_cached_info): New.
+	* libbfd: Regenerated.
+
+	* opncls.c (_bfd_delete_bfd): Check if abfd->memory is NULL.
+	(_bfd_free_cached_info): New.
+
+2006-04-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (assign_file_positions_except_relocs): Move code setting
+	file position of non-loaded sections..
+	(assign_file_positions_for_segments): ..to here.
+
+2006-04-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/2537
+	* elf.c (bfd_section_from_shdr): Allow sections reserved for
+	applications. Issue an error on sections we don't know how
+	to handle.
+
+2006-04-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2006-04-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* warning.m4 (--enable-werror): Format help message.
+	(--enable-build-warnings): Likewise.
+	* configure: Regenerate.
+
+2006-04-18  Nick Clifton  <nickc@redhat.com>
+
+	PR 2257
+	* elfcode.h (elf_object_p): Allow files with corrupt e_shstrndx
+	fields to still be handled as ELF files.
+
+2006-04-16  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* po/SRC-POTFILES.in: Regenerated.
+
+2006-04-16  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* configure.in: Update version to 2.17.50.
+	* configure: Regenerated.
+
+2006-04-14  David Heine  <dlheine@tensilica.com>
+
+	* elf32-xtensa.c (build_reloc_opcodes): New.
+	(compute_text_actions): Use it to decode opcodes outside inner loop.
+	(check_section_ebb_pcrels_fit): Add "reloc_opcodes" argument, and if
+	it is set, use it to get the opcodes for relocations.
+	(move_shared_literal): Adjust call to check_section_ebb_pcrels_fit.
+
+2006-04-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/2513
+	* elf32-i386.c (GOT_TLS_MASK): New macro for tls_type.
+	(GOT_TLS_IE_IE): Likewise.
+	(GOT_TLS_IE_GD): Likewise.
+	(GOT_TLS_IE_MASK): Likewise.
+	(elf_i386_check_relocs): For global symbols, set GOT_TLS_IE_GD
+	and GOT_TLS_IE_IE for R_386_TLS_GD and R_386_TLS_IE
+	respectively.
+	(allocate_dynrelocs): If both GOT_TLS_IE_IE and GOT_TLS_IE_GD
+	are set, treat tls_type as GOT_TLS_IE_BOTH.
+	(elf_i386_relocate_section): Likewise.
+
+2006-04-07  Randolph Chung  <tausq@debian.org>
+
+	* elf64-hppa.c (elf64_hppa_grok_prstatus): New function.
+	(elf64_hppa_grok_psinfo): Likewise.
+	(elf_backend_grok_pstatus, elf_backend_grok_psinfo): Define.
+
+2006-04-06  DJ Delorie  <dj@redhat.com>
+
+	* elf32-m32c.c (m32c_elf_relocate_section): Generate a symbol for
+	each plt entry we create.
+
+2006-04-06  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* po/Make-in: Add install-html target.
+	* Makefile.am: Rename docdir to bfddocdir. Add datarootdir, docdir
+	htmldir. Add install-html and install-html-recursive targets.
+	* Makefile.in: Regenerate.
+	* configure.in: AC_SUBST for datarootdir, docdir and htmldir.
+	* configure: Regenerate.
+
+2006-04-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Skip unneeded passes
+	with the skip_relax_pass_0 and skip_relax_pass_1 bits in the
+	section structure.
+
+2006-04-05  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	* elf32-bfin.c (bfinfdpic_relocs_info_hash): Sprinkle casts to
+	eliminate warnings.
+
+2006-04-05  H.J. Lu  <hongjiu.lu@intel.com>
+	    James E Wilson  <wilson@specifixinc.com>
+
+	PR ld/2442
+	* elfxx-ia64.c (elfNN_ia64_dyn_sym_info): Remove next.
+	(elfNN_ia64_local_hash_entry): Add count, sorted_count and
+	size.
+	(elfNN_ia64_link_hash_entry): Likewise.
+	(elfNN_ia64_new_elf_hash_entry): Initialize count, sorted_count
+	and size.
+	(elfNN_ia64_hash_copy_indirect): Updated elfNN_ia64_dyn_sym_info
+	processing.
+	(elfNN_ia64_hash_hide_symbol): Likewise.
+	(elfNN_ia64_global_dyn_sym_thunk): Likewise.
+	(elfNN_ia64_local_dyn_sym_thunk): Likewise.
+	(elfNN_ia64_global_dyn_info_free): New function.
+	(elfNN_ia64_local_dyn_info_free): Likewise.
+	(elfNN_ia64_hash_table_free): Free local and global
+	elfNN_ia64_dyn_sym_info.
+	(addend_compare): New function.
+	(sort_dyn_sym_info): Likewise.
+	(get_dyn_sym_info): Updated to use binary search for addend.
+	(elfNN_ia64_check_relocs): Scan relocations to create dynamic
+	relocation arrays first.
+
+2006-04-05  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	* elf32-bfin.c (_bfin_create_got_section): Don't generate a _gp
+	symbol.
+
+2006-04-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/2411
+	* elflink.c (check_dynsym): New.
+	(elf_link_output_extsym): Use it.
+	(bfd_elf_final_link): Likewise.
+
+2006-04-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/2404
+	* elflink.c (_bfd_elf_merge_symbol): Skip the default indirect
+	symbol from the dynamic definition with the default version if
+	its type and the type of existing regular definition mismatch.
+
+2006-04-05  Richard Sandiford  <richard@codesourcery.com>
+	    Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* config.bfd (sparc-*-vxworks*): New stanza.
+	* configure.in (bfd_elf32_sparc_vxworks_vec): New stanza.
+	(bfd_elf32_sparc_vec, bfd_elf64_sparc_vec): Add elf-vxworks.lo.
+	* configure: Regenerate.
+	* elf32-sparc.c: Include elf-vxworks.h.
+	(elf32_sparc_vxworks_link_hash_table_create: New.
+	(elf32_sparc_vxworks_final_write_processing): New.
+	(TARGET_BIG_SYM): Override for VxWorks.
+	(TARGET_BIG_NAME, ELF_MINPAGESIZE): Likewise.
+	(bfd_elf32_bfd_link_hash_table_create): Likewise.
+	(elf_backend_want_got_plt, elf_backend_plt_readonly): Likewise.
+	(elf_backend_got_header_size, elf_backend_add_symbol_hook): Likewise.
+	(elf_backend_link_output_symbol_hook): Likewise.
+	(elf_backend_emit_relocs): Likewise.
+	(elf_backend_final_write_processing, elf32_bed): Likewise.
+	* elfxx-sparc.c: Include libiberty.h and elf-vxworks.h.
+	(sparc_vxworks_exec_plt0_entry, sparc_vxworks_exec_plt_entry): New.
+	(sparc_vxworks_shared_plt0_entry, sparc_vxworks_shared_plt_entry): New.
+	(_bfd_sparc_elf_link_hash_table_create): Don't initialize
+	build_plt_entry here.
+	(create_got_section): Initialize sgotplt for VxWorks.
+	(_bfd_sparc_elf_create_dynamic_sections): Initialize build_plt_entry,
+	plt_header_size and plt_entry_size, with new VxWorks-specific settings.
+	Call elf_vxworks_create_dynamic_sections for VxWorks.
+	(allocate_dynrelocs): Use plt_header_size and plt_entry_size.
+	Allocate room for .got.plt and .rela.plt.unloaded entries on VxWorks.
+	(_bfd_sparc_elf_size_dynamic_sections): Don't allocate a nop in .plt
+	for VxWorks.  Check for the .got.plt section.
+	(sparc_vxworks_build_plt_entry): New function.
+	(_bfd_sparc_elf_finish_dynamic_symbol): Add handling of VxWorks PLTs.
+	Don't make _GLOBAL_OFFSET_TABLE_ and _PROCEDURE_LINKAGE_TABLE_
+	absolute on VxWorks.
+	(sparc32_finish_dyn): Add special handling for DT_RELASZ
+	and DT_PLTGOT on VxWorks.
+	(sparc_vxworks_finish_exec_plt): New.
+	(sparc_vxworks_finish_shared_plt): New.
+	(_bfd_sparc_elf_finish_dynamic_sections): Call them.
+	Use plt_header_size and plt_entry_size.
+	* elfxx-sparc.h (_bfd_sparc_elf_link_hash_table): Add is_vxworks,
+	srelplt2, sgotplt, plt_header_size and plt_entry_size fields.
+	* Makefile.am (elfxx-sparc.lo): Depend on elf-vxworks.h.
+	(elf32-sparc.lo): Likewise.
+	* Makefile.in: Regenerate.
+	* targets.c (bfd_elf32_sparc_vxworks_vec): Declare.
+	(_bfd_target_vector): Add a pointer to it.
+
+2006-03-30  Ben Elliston  <bje@au.ibm.com>
+
+	PR ld/2267
+	* elflink.c (elf_fixup_link_order): Ensure `elfsec' is not a
+	special section number that exceeds the number of ELF sections
+	(eg. SHN_MIPS_SCOMMON).
+
+2006-03-27  Richard Sandiford  <richard@codesourcery.com>
+
+	* elfxx-mips.c (mips_got_entry): Add more commentary.
+	(mips_elf_local_got_index): Use the hash table entry to record
+	the GOT index of forced-local symbols.
+	(mips_elf_initialize_tls_index): Rearrange code.  Store the index
+	in either the hash table entry or the mips_got_entry, not both.
+	Add more commentary.
+	(mips_elf_multi_got): Make sure the g->next is nonnull when calling
+	mips_elf_initialize_tls_index.
+
+2006-03-25  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	* elf32-bfin.c (bfd_const_reloc, bfd_oper_reloc, bfin_push_reloc,
+	RELOC_STACK_SIZE, reloc_stack, reloc_stack_tos, is_reloc_stack_empty,
+	reloc_stack_push, reloc_stack_pop, reloc_stack_operate,
+	bfin_areloc_howto_table): Delete.  All
+	uses deleted as well.
+	(bfin_reloc_map): Delete all stack relocs.
+	(bfin_info_to_howto, bfin_bfd_reloc_type_lookup,
+	bfin_reloc_type_lookup): Don't support them.
+	(bfin_relocate_section): Don't try to handle them.
+
+	* config.bfd (bfin-*-*): Add bfd_elf32_bfinfdpic_vec.
+	* configure.in: Likewise.
+	* configure: Regenerate.
+	* elf32-bfin.c: Include "elf/dwarf2.h" and "hashtab.h".
+	(BFIN_RELOC_MAX): Now 0x21.
+	(bfin_howto_table, bfin_reloc_map): Add FD-PIC relocs.
+	(bfd_elf32_bfinfdpic_vec): Declare.
+	(IS_FDPIC): New macro.
+	(struct bfinfdpic_elf_link_hash_table): New struct.
+	(bfinfdpic_hash_table, bfinfdpic_got_section,
+	bfinfdpic_gotrel_section, bfinfdpic_gotfixup_section,
+	bfinfdpic_plt_setion, bfinfdpic_pltrel_section,
+	bfinfdpic_relocs_info, bfinfdpic_got_initial_offset,
+	bfinfdpic_plt_initial_offset): Accessor macros for it.
+	(BFINFDPIC_SYM_LOCAL, BFINFDPIC_FUNCDESC_LOCAL): New macros.
+	(struct bfinfdpic_relocs_info): New struct.
+	(LZPLT_RESOLVER_EXTRA, LZPLT_NORMAL_SIZE, LZPLT_ENTRIES,
+	BFINFDPIC_LZPLT_BLOCK_SIZE, BFINFDPIC_LZPLT_RESOLV_LOC,
+	DEFAULT_STACK_SIZE): New macros.
+	(bfinfdpic_elf_link_hash_table_create, bfinfdpic_relocs_info_hash,
+	bfinfdpic_relocs_info_eq, bfinfdpics_relocs_info_find,
+	bfinfdpic_relocs_info_for_global, bfinfdpic_relocs_info_for_local,
+	bfinfdpic_pic_merge_early_relocs_info, _bfinfdpic_add_dyn_reloc,
+	_bfinfdpic_add_rofixup, _bfinfdpic_osec_to_segment,
+	_bfinfdpic_osec_readonly_p, bfinfdpic_relocate_section,
+	bfinfdpic_check_relocs, bfinfdpic_gc_sweep_hook,
+	_bfinfdpic_link_omit_section_dynsym, _bfin_create_got_section,
+	elf32_bfinfdpic_create_dynamic_sections, _bfinfdpic_get_fd_entry,
+	_bfinfdpic_compute_got_alloc_data, _bfinfdpic_get_got_entry,
+	_bfinfdpic_assign_got_entries, _bfinfdpic_assign_plt_entries,
+	_bfinfdpic_resolve_final_relocs_info,
+	elf32_bfinfdpic_size_dynamic_sections,
+	elf32_bfinfdpic_always_size_sections,
+	elf32_bfinfdpic_modify_segment_map,
+	_bfinfdpic_count_got_plt_entries,
+	elf32_bfinfdpic_finish_dynamic_sections,
+	elf32_bfinfdpic_adjust_dynamic_symbol,
+	elf32_bfinfdpic_finish_dynamic_symbol,
+	elf32_bfinfdpic_elf_use_relative_eh_frame,
+	elf32_bfinfdpic_elf_encode_eh_address,
+	elf32_bfin_object_p, bfin_elf_copy_private_bfd_data,
+	elf32_bfinfdpic_copy_private_bfd_data,
+	(struct _bfinfdpic_dynamic_got_info,
+	struct _bfinfdpic_dynamic_got_plt_info): New structs.
+	(elf32_bfin_print_private_bfd_data): Print PIC flags.
+	(elf32_bfin_merge_private_bfd_data): Extend to support FD-PIC.
+	(TARGET_LITTLE_SYM, TARGET_LITTLE_NAME, elf32_bed,
+	elf_backend_got_header_size, bfd_elf32_bfd_link_hash_table_create,
+	elf_backend_always_size_sectinos, elf_backend_modify_segment_map,
+	bfd_elf32_bfd_copy_private_bfd_data,
+	elf_backend_create_dynamic_sections, elf_backend_adjust_dynamic_symbol,
+	elf_backend_size_dynamic_sections, elf_backend_finish_dynamic_symbol,
+	elf_backend_finish_dynamic_sections, elf_backend_relocate_section,
+	elf_backend_can_make_relative_eh_frame, elf_backend_check_relocs,
+	elf_backend_can_make_ldsa_relative_eh_frame, elf_backend_may_use_rel_p,
+	elf_backend_may_use_rela_p, elf_backend_default_use_rela_p,
+	elf_backend_omit_section_dynsym): Redefine these macros and include
+	"elf32-target.h" again to create the elf32-bfinfdpic target.
+	* reloc.c (BFD_RELOC_BFIN_GOT17M4, BFD_RELOC_BFIN_GOTHI,
+	BFD_RELOC_BFIN_GOTLO, BFD_RELOC_BFIN_FUNCDESC,
+	BFD_RELOC_BFIN_FUNCDESC_GOT17M4, BFD_RELOC_BFIN_FUNCDESC_GOTHI,
+	BFD_RELOC_BFIN_FUNCDESC_GOTLO, BFD_RELOC_BFIN_FUNCDESC_VALUE,
+	BFD_RELOC_BFIN_FUNCDESC_GOTOFF17M4, BFD_RELOC_BFIN_FUNCDESC_GOTOFFHI,
+	BFD_RELOC_BFIN_FUNCDESC_GOTOFFLO, BFD_RELOC_BFIN_GOTOFFHI,
+	BFD_RELOC_BFIN_GOTOFFLO): New.
+	* targets.c (bfd_elf32_bfinfdpic_vec): New bfd_target.
+	(_bfd_target_vector): Add it.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2006-03-25  Richard Sandiford  <richard@codesourcery.com>
+
+	* cpu-m68k.c (bfd_m68k_compatible): Treat ISA A+ and ISA B code as
+	incompatible.  Likewise MAC and EMAC code.
+	* elf32-m68k.c (elf32_m68k_merge_private_bfd_data): Use
+	bfd_get_compatible to set the new bfd architecture.  Rely on it
+	to detect incompatibilities.
+
+2006-03-23  Michael Matz  <matz@suse.de>
+
+	* reloc.c: Add BFD_RELOC_X86_64_GOT64, BFD_RELOC_X86_64_GOTPCREL64,
+	BFD_RELOC_X86_64_GOTPC64, BFD_RELOC_X86_64_GOTPLT64,
+	BFD_RELOC_X86_64_PLTOFF64.
+	* bfd-in2.h: Regenerated.
+	* libbfd.h: Regenerated.
+	* elf64-x86-64.c (x86_64_elf_howto_table): Correct comment.
+	Add howtos for above relocs.
+	(x86_64_reloc_map): Add mappings for new relocs.
+	(elf64_x86_64_check_relocs): R_X86_64_GOT64, R_X86_64_GOTPCREL64,
+	R_X86_64_GOTPLT64 need a got entry.  R_X86_64_GOTPLT64 also a PLT
+	entry.  R_X86_64_GOTPC64 needs a .got section.  R_X86_64_PLTOFF64
+	needs a PLT entry.
+	(elf64_x86_64_gc_sweep_hook): Reflect changes from
+	elf64_x86_64_check_relocs for the new relocs.
+	(elf64_x86_64_relocate_section): Handle new relocs.
+
+2006-03-22  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (xtensa_read_table_entries): Remove assertion that
+	rel->r_addend is zero.
+
+2006-03-22  Richard Sandiford  <richard@codesourcery.com>
+
+	* elfxx-mips.c (_bfd_mips_vxworks_finish_dynamic_symbol): Fix type
+	of "loc".
+
+2006-03-22  Richard Sandiford  <richard@codesourcery.com>
+	    Daniel Jacobowitz  <dan@codesourcery.com>
+	    Phil Edwards  <phil@codesourcery.com>
+	    Zack Weinberg  <zack@codesourcery.com>
+	    Mark Mitchell  <mark@codesourcery.com>
+	    Nathan Sidwell  <nathan@codesourcery.com>
+
+	* bfd-in2.h: Regenerate.
+	* config.bfd (mips*-*-vxworks*, mips*el-*-vxworks*): New stanzas.
+	* configure.in (bfd_elf32_bigmips_vxworks_vec): New stanza.
+	(bfd_elf32_littlemips_vxworks_vec): Likewise.
+	(bfd_elf32_bigmips_vec): Add elf-vxworks.lo.
+	(bfd_elf32_littlemips_vec): Likewise.
+	(bfd_elf32_nbigmips_vec): Likewise.
+	(bfd_elf32_nlittlemips_vec): Likewise.
+	(bfd_elf32_ntradbigmips_vec): Likewise.
+	(bfd_elf32_ntradlittlemips_vec): Likewise.
+	(bfd_elf32_tradbigmips_vec): Likewise.
+	(bfd_elf32_tradlittlemips_vec): Likewise.
+	(bfd_elf64_bigmips_vec): Likewise.
+	(bfd_elf64_littlemips_vec): Likewise.
+	(bfd_elf64_tradbigmips_vec): Likewise.
+	(bfd_elf64_tradlittlemips_vec): Likewise.
+	* elf32-mips.c: Include elf-vxworks.h.
+	(mips_info_to_howto_rel): Use elf_backend_mips_rtype_to_howto
+	instead of calling mips_elf32_rtype_to_howto directly.
+	(mips_vxworks_copy_howto_rela): New reloc howto.
+	(mips_vxworks_jump_slot_howto_rela): Likewise.
+	(mips_vxworks_bfd_reloc_type_lookup): New function.
+	(mips_vxworks_rtype_to_howto): Likewise.
+	(mips_vxworks_final_write_processing): Likewise.
+	(TARGET_LITTLE_SYM, TARGET_LITTLE_NAME): Override for VxWorks.
+	(TARGET_BIG_SYM, TARGET_BIG_NAME, elf_bed, ELF_MAXPAGESIZE): Likewise.
+	(elf_backend_want_got_plt): Likewise.
+	(elf_backend_want_plt_sym): Likewise.
+	(elf_backend_got_symbol_offset): Likewise.
+	(elf_backend_want_dynbss): Likewise.
+	(elf_backend_may_use_rel_p): Likewise.
+	(elf_backend_may_use_rela_p): Likewise.
+	(elf_backend_default_use_rela_p): Likewise.
+	(elf_backend_got_header_size: Likewise.
+	(elf_backend_plt_readonly): Likewise.
+	(bfd_elf32_bfd_reloc_type_lookup): Likewise.
+	(elf_backend_mips_rtype_to_howto): Likewise.
+	(elf_backend_adjust_dynamic_symbol): Likewise.
+	(elf_backend_finish_dynamic_symbol): Likewise.
+	(bfd_elf32_bfd_link_hash_table_create): Likewise.
+	(elf_backend_add_symbol_hook): Likewise.
+	(elf_backend_link_output_symbol_hook): Likewise.
+	(elf_backend_emit_relocs): Likewise.
+	(elf_backend_final_write_processing: Likewise.
+	(elf_backend_additional_program_headers): Likewise.
+	(elf_backend_modify_segment_map): Likewise.
+	(elf_backend_symbol_processing): Likewise.
+	* elfxx-mips.c: Include elf-vxworks.h.
+	(mips_elf_link_hash_entry): Add is_relocation_target and
+	is_branch_target fields.
+	(mips_elf_link_hash_table): Add is_vxworks, srelbss, sdynbss, srelplt,
+	srelplt2, sgotplt, splt, plt_header_size and plt_entry_size fields.
+	(MIPS_ELF_RELA_SIZE, MIPS_ELF_REL_DYN_NAME): New macros.
+	(MIPS_RESERVED_GOTNO): Take a mips_elf_link_hash_table argument.
+	Return 3 for VxWorks.
+	(ELF_MIPS_GP_OFFSET): Change the argument from a bfd to a
+	mips_elf_link_hash_table.  Return 0 for VxWorks.
+	(MIPS_ELF_GOT_MAX_SIZE): Change the argument from a bfd to a
+	mips_elf_link_hash_table.  Update the call to ELF_MIPS_GP_OFFSET.
+	(mips_vxworks_exec_plt0_entry): New variable.
+	(mips_vxworks_exec_plt_entry): Likewise.
+	(mips_vxworks_shared_plt0_entry): Likewise.
+	(mips_vxworks_shared_plt_entry): Likewise.
+	(mips_elf_link_hash_newfunc): Initialize the new hash_entry fields.
+	(mips_elf_rel_dyn_section): Change the bfd argument to a
+	mips_elf_link_hash_table.  Use MIPS_ELF_REL_DYN_NAME to get
+	the name of the section.
+	(mips_elf_initialize_tls_slots): Update the call to
+	mips_elf_rel_dyn_section.
+	(mips_elf_gotplt_index): New function.
+	(mips_elf_local_got_index): Add an input_section argument.
+	Update the call to mips_elf_create_local_got_entry.
+	(mips_elf_got_page): Likewise.
+	(mips_elf_got16_entry): Likewise.
+	(mips_elf_create_local_got_entry): Add bfd_link_info and input_section
+	arguments.  Create dynamic relocations for each entry on VxWorks.
+	(mips_elf_merge_gots): Update the use of MIPS_ELF_GOT_MAX_SIZE.
+	(mips_elf_multi_got): Update the uses of MIPS_ELF_GOT_MAX_SIZE
+	and MIPS_RESERVED_GOTNO.
+	(mips_elf_create_got_section): Update the uses of
+	MIPS_ELF_GOT_MAX_SIZE.  Create .got.plt on VxWorks.
+	(is_gott_symbol): New function.
+	(mips_elf_calculate_relocation): Use a dynobj local variable.
+	Update the calls to mips_elf_local_got_index, mips_elf_got16_entry and
+	mips_elf_got_page_entry.  Set G to the .got.plt entry when calculating
+	VxWorks R_MIPS_CALL* relocations.  Calculate and use G for all GOT
+	relocations on VxWorks.  Add dynamic relocations for references
+	to the VxWorks __GOTT_BASE__ and __GOTT_INDEX__ symbols.  Don't
+	create dynamic relocations for R_MIPS_32, R_MIPS_REL32 or R_MIPS_64
+	in VxWorks executables.
+	(mips_elf_allocate_dynamic_relocations): Add a bfd_link_info argument.
+	Use MIPS_ELF_RELA_SIZE to calculate the size of a VxWorks entry.
+	Don't allocate a null entry on VxWorks.
+	(mips_elf_create_dynamic_relocation): Update the call to
+	mips_elf_rel_dyn_section.  Use absolute rather than relative
+	relocations for VxWorks, and make them RELA rather than REL.
+	(_bfd_mips_elf_create_dynamic_sections): Don't make .dynamic
+	read-only on VxWorks.  Update the call to mips_elf_rel_dyn_section.
+	Create the .plt, .rela.plt, .dynbss and .rela.bss sections on
+	VxWorks.  Likewise create the _PROCEDURE_LINKAGE_TABLE symbol.
+	Call elf_vxworks_create_dynamic_sections for VxWorks and
+	initialize the plt_header_size and plt_entry_size fields.
+	(_bfd_mips_elf_check_relocs): Don't allow GOT relocations to be
+	used in VxWorks executables.  Don't allocate dynamic relocations
+	for R_MIPS_32, R_MIPS_REL32 or R_MIPS_64 in VxWorks executables.
+	Set is_relocation_target for each symbol referenced by a relocation.
+	Allocate .rela.dyn entries for relocations against the special
+	VxWorks __GOTT_BASE__ and __GOTT_INDEX__ symbols.  Create GOT
+	entries for all VxWorks R_MIPS_GOT16 relocations.  Don't allocate
+	a global GOT entry for symbols mentioned in VxWorks R_MIPS_CALL*,
+	R_MIPS_32, R_MIPS_REL32 or R_MIPS_64 relocations.  Update the calls
+	to mips_elf_rel_dyn_section and mips_elf_allocate_dynamic_relocations.
+	Set is_branch_target for symbols mentioned in R_MIPS_PC16 or R_MIPS_26
+	relocations.  Don't set no_fn_stub on VxWorks.
+	(_bfd_mips_elf_adjust_dynamic_symbol): Update the call to
+	mips_elf_allocate_dynamic_relocations.
+	(_bfd_mips_vxworks_adjust_dynamic_symbol): New function.
+	(_bfd_mips_elf_always_size_sections): Do not allocate GOT page
+	entries for VxWorks, and do not create multiple GOTs.
+	(_bfd_mips_elf_size_dynamic_sections): Use MIPS_ELF_REL_DYN_NAME.
+	Handle .got specially for VxWorks.  Update the uses of
+	MIPS_RESERVED_GOTNO and mips_elf_allocate_dynamic_relocations.
+	Check for sgotplt and splt.  Allocate the .rel(a).dyn contents last,
+	once its final size is known.  Set DF_TEXTREL for VxWorks.  Add
+	DT_RELA, DT_RELASZ, DT_RELAENT, DT_PLTREL, DT_PLTRELSZ and DT_JMPREL
+	tags on VxWorks.  Do not add the MIPS-specific tags for VxWorks.
+	(_bfd_mips_vxworks_finish_dynamic_symbol): New function.
+	(mips_vxworks_finish_exec_plt): Likewise.
+	(mips_vxworks_finish_shared_plt): Likewise.
+	(_bfd_mips_elf_finish_dynamic_sections): Remove an unncessary call
+	to mips_elf_rel_dyn_section.  Use a VxWorks-specific value of
+	DT_PLTGOT.  Handle DT_RELA, DT_RELASZ, DT_RELAENT, DT_PLTREL,
+	DT_PLTRELSZ and DT_JMPREL.  Update the uses of MIPS_RESERVED_GOTNO
+	and mips_elf_rel_dyn_section.  Use a different GOT header for
+	VxWorks.  Don't sort .rela.dyn on VxWorks.  Finish the PLT on VxWorks.
+	(_bfd_mips_elf_link_hash_table_create): Initialize the new
+	mips_elf_link_hash_table fields.
+	(_bfd_mips_vxworks_link_hash_table_create): New function.
+	(_bfd_mips_elf_final_link): Set the GP value to _GLOBAL_OFFSET_TABLE_
+	on VxWorks.  Update the call to ELF_MIPS_GP_OFFSET.
+	* elfxx-mips.h (_bfd_mips_vxworks_adjust_dynamic_symbol): Declare.
+	(_bfd_mips_vxworks_finish_dynamic_symbol): Likewise.
+	(_bfd_mips_vxworks_link_hash_table_create): Likewise.
+	* libbfd.h: Regenerate.
+	* Makefile.am (elfxx-mips.lo): Depend on elf-vxworks.h.
+	(elf32-mips.lo): Likewise.
+	* Makefile.in: Regenerate.
+	* reloc.c (BFD_RELOC_MIPS_COPY, BFD_RELOC_MIPS_JUMP_SLOT): Declare.
+	* targets.c (bfd_elf32_bigmips_vxworks_vec): Declare.
+	(bfd_elf32_littlemips_vxworks_vec): Likewise.
+	(_bfd_target_vector): Add entries for them.
+
+2006-03-19  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* elf64-hppa.c (elf64_hppa_special_sections): Change flags for .tbss
+	section from SHF_PARISC_WEAKORDER to SHF_HP_TLS.
+	(elf_backend_special_sections): Remove #undef.
+
+2006-03-18  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* elf64-hppa.c (allocate_global_data_opd): Don't create an OPD entry
+	for undefined weak symbols.
+
+2006-03-17  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	PR ld/2462
+	* elflink.c (bfd_elf_final_link): Remove
+	bed->elf_backend_emit_relocs from emit_relocs.
+
+2006-03-17  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Copy addend from
+	first relocation to the second when relaxing TLS GD to LE;
+	zero it out when relaxing to IE.
+
+2006-03-17  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 2434
+	* elflink.c (elf_link_add_object_symbols): Save and restore
+	warning sym's linked sym.
+
+2006-03-16  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 2434
+	* elflink.c (struct elf_smash_syms_data, elf_smash_syms): Delete.
+	(elf_link_add_object_symbols): Delete unnecessary locals.  Rename
+	hash_table -> htab.  Formatting.  Save entire symbol table
+	before loading as-needed syms, and restore afterwards if lib not
+	needed.  Use bfd_hash_allocate rather than bfd_alloc for sym
+	name.  Free some buffers earlier.
+	* bfd-in.h (struct bfd_hash_table): Add entsize.
+	(bfd_hash_table_init, bfd_hash_table_init_n): Adjust prototype.
+	* elf-bfd.h (_bfd_elf_link_hash_table_init): Likewise
+	* hash.c (bfd_hash_table_init_n): Add entsize param, save to
+	hash table.
+	(bfd_hash_table_init): Add param, adjust calls.
+	* aoutx.h: Adjust all hash_table_init functions and calls.
+	* bfd.c: Likewise.
+	* coff-arm.c: Likewise.
+	* coff-h8300.c: Likewise.
+	* coff-ppc.c: Likewise.
+	* cofflink.c: Likewise.
+	* ecoff.c: Likewise.
+	* ecofflink.c: Likewise.
+	* elf-m10300.c: Likewise.
+	* elf-strtab.c: Likewise.
+	* elf.c: Likewise.
+	* elf32-arm.c: Likewise.
+	* elf32-bfin.c: Likewise.
+	* elf32-cris.c: Likewise.
+	* elf32-frv.c: Likewise.
+	* elf32-hppa.c: Likewise.
+	* elf32-i386.c: Likewise.
+	* elf32-m32r.c: Likewise.
+	* elf32-m68hc1x.c: Likewise.
+	* elf32-m68k.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-s390.c: Likewise.
+	* elf32-sh.c: Likewise.
+	* elf32-vax.c: Likewise.
+	* elf64-alpha.c: Likewise.
+	* elf64-hppa.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf64-s390.c: Likewise.
+	* elf64-sh64.c: Likewise.
+	* elf64-x86-64.c: Likewise.
+	* elfxx-ia64.c: Likewise.
+	* elfxx-mips.c: Likewise.
+	* elfxx-sparc.c: Likewise.
+	* i386linux.c: Likewise.
+	* libaout.h: Likewise.
+	* libbfd-in.h: Likewise.
+	* libcoff-in.h: Likewise.
+	* linker.c: Likewise.
+	* m68klinux.c: Likewise.
+	* merge.c: Likewise.
+	* opncls.c: Likewise.
+	* pdp11.c: Likewise.
+	* sparclinux.c: Likewise.
+	* stabs.c: Likewise.
+	* sunos.c: Likewise.
+	* vms.c: Likewise.
+	* xcofflink.c: Likewise.
+	* section.c (struct section_hash_entry): Move to..
+	* libbfd-in.h: ..here.
+	* Makefile.am: Run "make dep-am"
+	* Makefile.in: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* libcoff.h: Regenerate.
+
+2006-03-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_check_relocs): REL24 and REL14 relocs
+	against __GLOBAL_OFFSET_TABLE__ need never be dynamic.  Tweak
+	last change to REL32 relocs so that they are counted as
+	possibly dynamic as per REL24 and REL14.
+
+2006-03-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Don't fall into REL24
+	checks from REL32.
+
+2006-03-15  Ben Elliston  <bje@au.ibm.com>
+
+	* elf32-arm.c (elf32_arm_merge_eabi_attributes): Iterate over all
+	in_list elements, not just the first.
+
+2006-03-14  Richard Sandiford  <richard@codesourcery.com>
+
+	* elf32-mips.c (mips_elf_adjust_addend): New function, mostly split
+	out from...
+	(_bfd_mips_elf_relocate_section): ...here.  Use it to adjust r_addend
+	for final links too.
+
+2006-03-13  Richard Sandiford  <richard@codesourcery.com>
+
+	* elfxx-mips.c (mips_elf_create_got_section): Initialize hgot.
+
+2006-03-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/2443
+	* dwarf2.c (concat_filename): Don't issue an error if file is 0.
+
+2006-03-10  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (INTERWORK_FLAG): Handle EABIv5.
+	(elf32_arm_print_private_bfd_data): Ditto.
+
+2006-03-09  Paul Brook  <paul@codesourcery.com>
+
+	* cpu-arm.c (bfd_is_arm_mapping_symbol_name): Recognise additional
+	mapping symbols.
+
+2006-03-09  Khem Raj  <khem@mvista.com>
+
+	* elf32-arm.c(elf32_arm_finish_dynamic_sections): Use unsigned
+	char type.
+
+2006-03-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_choose_gp): Properly choose gp.
+
+2006-03-07  Richard Sandiford  <richard@codesourcery.com>
+	    Daniel Jacobowitz  <dan@codesourcery.com>
+	    Zack Weinberg  <zack@codesourcery.com>
+	    Nathan Sidwell  <nathan@codesourcery.com>
+	    Paul Brook  <paul@codesourcery.com>
+	    Ricardo Anguiano  <anguiano@codesourcery.com>
+	    Phil Edwards  <phil@codesourcery.com>
+
+	* configure.in (bfd_elf32_bigarm_vec): Include elf-vxworks.lo.
+	(bfd_elf32_bigarm_symbian_vec): Likewise.
+	(bfd_elf32_bigarm_vxworks_vec): Likewise.
+	(bfd_elf32_littlearm_vec): Likewise.
+	(bfd_elf32_littlearm_symbian_vec): Likewise.
+	(bfd_elf32_littlearm_vxworks_vec): Likewise.
+	* configure: Regenerate.
+	* elf32-arm.c: Include libiberty.h and elf-vxworks.h.
+	(RELOC_SECTION, RELOC_SIZE, SWAP_RELOC_IN, SWAP_RELOC_OUT): New macros.
+	(elf32_arm_vxworks_bed): Add forward declaration.
+	(elf32_arm_howto_table_1): Fix the masks for R_ASM_ABS12.
+	(elf32_arm_vxworks_exec_plt0_entry): New table.
+	(elf32_arm_vxworks_exec_plt_entry): Likewise.
+	(elf32_arm_vxworks_shared_plt_entry): Likewise.
+	(elf32_arm_link_hash_table): Add vxworks_p and srelplt2 fields.
+	(reloc_section_p): New function.
+	(create_got_section): Use RELOC_SECTION.
+	(elf32_arm_create_dynamic_sections): Likewise.  Call
+	elf_vxworks_create_dynamic_sections for VxWorks targets.
+	Choose between the two possible values of plt_header_size
+	and plt_entry_size.
+	(elf32_arm_link_hash_table_create): Initialize vxworks_p and srelplt2.
+	(elf32_arm_abs12_reloc): New function.
+	(elf32_arm_final_link_relocate): Call it.  Allow the creation of
+	dynamic R_ARM_ABS12 relocs on VxWorks.  Use reloc_section_p,
+	RELOC_SIZE, SWAP_RELOC_OUT and RELOC_SECTION.  Initialize the
+	r_addend fields of relocs.  On rela targets, skip any code that
+	adjusts in-place addends.  When using _bfd_link_final_relocate
+	to perform a final relocation, pass rel->r_addend as the addend
+	argument.
+	(elf32_arm_merge_private_bfd_data): If one of the bfds is a VxWorks
+	object, ignore flags that are not standard on VxWorks.
+	(elf32_arm_check_relocs): Allow the creation of dynamic R_ARM_ABS12
+	relocs on VxWorks.  Use reloc_section_p.
+	(elf32_arm_adjust_dynamic_symbol): Use RELOC_SECTION and RELOC_SIZE.
+	(allocate_dynrelocs): Use RELOC_SIZE.  Account for the size of
+	.rela.plt.unloaded relocs on VxWorks targets.
+	(elf32_arm_size_dynamic_sections): Use RELOC_SIZE.  Check for
+	.rela.plt.unloaded as well as .rel(a).plt.  Add DT_RELA* tags
+	instead of DT_REL* tags on RELA targets.
+	(elf32_arm_finish_dynamic_symbol): Use RELOC_SECTION, RELOC_SIZE
+	and SWAP_RELOC_OUT.  Initialize r_addend fields.  Handle VxWorks
+	PLT entries.  Do not make _GLOBAL_OFFSET_TABLE_ absolute on VxWorks.
+	(elf32_arm_finish_dynamic_sections): Use RELOC_SECTION, RELOC_SIZE
+	and SWAP_RELOC_OUT.  Initialize r_addend fields.  Handle DT_RELASZ
+	like DT_RELSZ.  Handle the VxWorks form of initial PLT entry.
+	Correct the .rela.plt.unreloaded symbol indexes.
+	(elf32_arm_output_symbol_hook): Call the VxWorks version of this
+	hook on VxWorks targets.
+	(elf32_arm_vxworks_link_hash_table_create): Set vxworks_p to true.
+	Minor formatting tweak.
+	(elf32_arm_vxworks_final_write_processing): New function.
+	(elf_backend_add_symbol_hook): Override for VxWorks and reset
+	for Symbian.
+	(elf_backend_final_write_processing): Likewise.
+	(elf_backend_emit_relocs): Likewise.
+	(elf_backend_want_plt_sym): Likewise.
+	(ELF_MAXPAGESIZE): Likewise.
+	(elf_backend_may_use_rel_p): Minor formatting tweak.
+	(elf_backend_may_use_rela_p): Likewise.
+	(elf_backend_default_use_rela_p): Likewise.
+	(elf_backend_rela_normal): Likewise.
+	* Makefile.in (elf32-arm.lo): Depend on elf-vxworks.h.
+
+2006-03-06  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* archures.c (bfd_mach_mcf_isa_a_nodiv, bfd_mach_mcf_isa_b_nousp):
+	New.  Adjust other variants.
+	(bfd_default_scan): Update.
+	* bfd-in2.h: Rebuilt.
+	* cpu-m68k.c: Adjust.
+	(bfd_m68k_compatible): New. Use it for architectures.
+	* elf32-m68k.c (elf32_m68k_object_p): Adjust.
+	(elf32_m68k_merge_private_bfd_data): Adjust.  Correct isa-a/b
+	mismatch.
+	(elf32_m68k_print_private_bfd_data): Adjust.
+	* ieee.c (ieee_write_processor): Adjust.
+
+2006-03-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* dwarf2.c: Formatting.
+	(add_line_info): Remove outer loop.
+
+2006-03-05  H.J. Lu  <hongjiu.lu@intel.com>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	PR binutils/2338
+	* dwarf2.c (loadable_section): New struct.
+	(dwarf2_debug): Add loadable_section_count and
+	loadable_sections.
+	(new_line_sorts_after): New.
+	(add_line_info): Use new_line_sorts_after to compare line
+	addresses.
+	(check_function_name): Removed.
+	(unset_sections): New.
+	(place_sections): New.
+	(_bfd_dwarf2_find_nearest_line): Updated. Call place_sections
+	and unset_sections on relocatable files.
+	(_bfd_dwarf2_find_line): Likewise.
+
+2006-03-03  Nick Clifton  <nickc@redhat.com>
+
+	* cpu-avr.c: Update to ISO-C90 formatting.
+	* elf32-avr.c: Likewise.
+
+2006-03-03  Bjoern Haase  <bjoern.m.haase@web.de>
+
+	* elf32-avr.c (avr_reloc_map): Insert BFD_RELOC_AVR_MS8_LDI
+	and R_AVR_MS8_LDI
+	(bfd_elf_avr_final_write_processing): Set
+	EF_AVR_LINKRELAX_PREPARED in e_flags field.
+	(elf32_avr_relax_section): New function.
+	(elf32_avr_relax_delete_bytes): New function.
+	(elf32_avr_get_relocated_section_contents): New function.
+	(avr_pc_wrap_around): New function.
+	(avr_relative_distance_considering_wrap_around): New function.
+	(avr_final_link_relocate): Handle negative int8t_t immediate for R_AVR_LDI.
+	* reloc.c: Add BFD_RELOC_AVR_MS8_LDI and BFD_RELOC_AVR_LDI_NEG
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2006-03-02  DJ Delorie  <dj@redhat.com>
+
+	* elf32-m32c.c (m32c_offset_for_reloc): Fix local symbol
+	calculations.
+
+2006-03-02  Richard Sandiford  <richard@codesourcery.com>
+
+	* elf32-ppc.c (is_ppc_elf_target): Return true if the target is
+	bfd_elf32_powerpc_vxworks_vec.
+
+2006-03-02  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-m32c.c (m32c_elf_relax_section): Initialise 'gap'.
+
+2006-03-02  Richard Sandiford  <richard@codesourcery.com>
+
+	* elf32-i386.c (elf_i386_create_dynamic_sections): Use
+	elf_vxworks_create_dynamic_sections.
+	(elf_i386_size_dynamic_sections): Remove VxWorks GOT and PLT
+	symbol handling.
+	* elf32-ppc.c (ppc_elf_create_dynamic_sections): Use
+	elf_vxworks_create_dynamic_sections.
+	(ppc_elf_size_dynamic_sections): Remove VxWorks GOT and PLT
+	symbol handling.
+	* elf-vxworks.c (elf_vxworks_create_dynamic_sections): New function.
+	* elf-vxworks.h (elf_vxworks_create_dynamic_sections): Declare.
+
+2006-03-02  Richard Sandiford  <richard@codesourcery.com>
+
+	* elf32-i386.c (elf_i386_vxworks_link_output_symbol_hook): Delete.
+	(elf_backend_link_output_symbol_hook): Use
+	elf_vxworks_link_output_symbol_hook instead.
+	* elf32-ppc.c (elf_i386_vxworks_link_output_symbol_hook): Delete.
+	(elf_backend_link_output_symbol_hook): Use
+	elf_vxworks_link_output_symbol_hook instead.
+	* elf-vxworks.c (elf_vxworks_link_output_symbol_hook): Provide the
+	same interface as elf_backend_link_output_symbol_hook.
+	* elf-vxworks.h (elf_vxworks_link_output_symbol_hook): Update
+	prototype accordingly.
+
+2006-03-02  Richard Sandiford  <richard@codesourcery.com>
+
+	* elf32-ppc.c (ppc_elf_plt_type): New enumeration.
+	(ppc_elf_link_hash_table): Replace old_got and new_got with
+	plt_type and can_use_new_plt.
+	(ppc_elf_create_dynamic_sections): Add SEC_HAS_CONTENTS,
+	SEC_LOAD and SEC_READONLY to the VxWorks .plt flags.
+	(ppc_elf_check_relocs): Set can_use_new_plt instead of new_plt.
+	Move from plt_type == PLT_UNSET to PLT_OLD instead of setting old_plt.
+	(ppc_elf_select_plt_layout): Move from plt_type == PLT_UNSET to
+	either plt_type == PLT_OLD or plt_type == PLT_NEW.  Assert that
+	this function should not be called for VxWorks targets.
+	(ppc_elf_tls_setup): Use plt_type instead of old_got.
+	(allocate_got): Likewise.  Rearrange so that max_before_header
+	is only used for PLT_OLD and PLT_NEW.
+	(allocate_dynrelocs): Use plt_type instead of old_got and is_vxworks.
+	(ppc_elf_size_dynamic_sections): Likewise.
+	(ppc_elf_relax_section): Likewise.
+	(ppc_elf_relocate_section): Likewise.
+	(ppc_elf_finish_dynamic_symbol): Likewise.
+	(ppc_elf_vxworks_link_hash_table_create): Initialize plt_type.
+
+2006-02-28  Richard Sandiford  <richard@codesourcery.com>
+
+	* elf32-i386.c (elf_i386_link_hash_table): Add next_tls_desc_index.
+	(elf_i386_link_hash_table_create): Initialize it.
+	(elf_i386_compute_jump_table_size): Use it instead of
+	srelplt->reloc_count.
+	(allocate_dynrelocs): Likewise.
+	(elf_i386_size_dynamic_sections): Likewise.
+	(elf_i386_relocate_section): Likewise.
+
+2006-02-27  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Handle S flag.
+	(_bfd_elf_write_section_eh_frame): Likewise.
+
+2006-02-27  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* po/Make-in: Add html target.
+
+2006-02-27  Richard Sandiford  <richard@codesourcery.com>
+
+	* elf-m10300.c (_bfd_mn10300_elf_finish_dynamic_symbol): Use the
+	cached hgot entry to check for _GLOBAL_OFFSET_TABLE_.
+	* elf32-arm.c (elf32_arm_finish_dynamic_symbol): Likewise.
+	* elf32-bfin.c (bfin_finish_dynamic_symbol): Likewise.
+	* elf32-cris.c (elf_cris_finish_dynamic_symbol): Likewise.
+	* elf32-hppa.c (elf32_hppa_finish_dynamic_symbol): Likewise.
+	* elf32-i386.c (elf_i386_finish_dynamic_symbol): Likewise.
+	* elf32-m32r.c (m32r_elf_finish_dynamic_symbol): Likewise.
+	* elf32-m68k.c (elf_m68k_finish_dynamic_symbol): Likewise.
+	* elf32-sh.c (sh_elf_finish_dynamic_symbol): Likewise.
+	* elf32-vax.c (elf_vax_finish_dynamic_symbol): Likewise.
+	* elf32-xtensa.c (elf_xtensa_finish_dynamic_symbol): Likewise.
+	* elf64-sh64.c (sh64_elf64_finish_dynamic_symbol): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_finish_dynamic_symbol): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_finish_dynamic_symbol): Likewise.
+	* elf32-s390.c (elf_s390_finish_dynamic_symbol): Likewise.  Also use
+	the cached hplt entry to check for _PROCEDURE_LINKAGE_TABLE_.
+	* elf64-alpha.c (elf64_alpha_finish_dynamic_symbol): Likewise.
+	* elf64-s390.c (elf_s390_finish_dynamic_symbol): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_finish_dynamic_symbol): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_finish_dynamic_symbol): Likewise.
+
+2006-02-25  Richard Sandiford  <richard@codesourcery.com>
+
+	* elf-bfd.h (elf_link_hash_table): Add hplt field.
+	* elflink.c (_bfd_elf_create_dynamic_sections): Initialize it.
+	* elf-m10300.c (_bfd_mn10300_elf_create_got_section): Likewise.
+	* elf32-frv.c (_frv_create_got_section): Likewise.
+	* elf32-m32r.c (m32r_elf_create_dynamic_sections): Likewise.
+	* elf32-sh.c (sh_elf_create_dynamic_sections): Likewise.
+	* elf64-alpha.c (elf64_alpha_create_dynamic_sections): Likewise.
+	* elf64-sh64.c (sh64_elf64_create_dynamic_sections): Likewise.
+	* elf32-i386.c (elf_i386_link_hash_table): Remove hgot and hplt.
+	(elf_i386_link_hash_table_create): Don't initialize them.
+	(elf_i386_size_dynamic_sections): Use the generic ELF hplt and
+	hgot fields.
+	(elf_i386_finish_dynamic_symbol): Likewise.
+	* elf32-ppc.c (ppc_elf_link_hash_table): Remove hplt.
+	(ppc_elf_size_dynamic_sections): Use the generic ELF hplt fields.
+	(ppc_elf_finish_dynamic_symbol): Likewise.
+
+2006-02-24  DJ Delorie  <dj@redhat.com>
+
+	* elf32-m32c.c (m32c_elf_howto_table): Add relaxation relocs.
+	(m32c_elf_relocate_section): Don't relocate them.
+	(compare_reloc): New.
+	(relax_reloc): Remove.
+	(m32c_offset_for_reloc): New.
+	(m16c_addr_encodings): New.
+	(m16c_jmpaddr_encodings): New.
+	(m32c_addr_encodings): New.
+	(m32c_elf_relax_section): Relax jumps and address displacements.
+	(m32c_elf_relax_delete_bytes): Adjust for internal syms.  Fix up
+	short jumps.
+
+	* reloc.c: Add m32c relax relocs.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2006-02-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/2218
+	* elf-bfd.h (elf_backend_data): Add elf_backend_fixup_symbol.
+	(_bfd_elf_link_hash_fixup_symbol): New.
+
+	* elflink.c (_bfd_elf_link_hash_fixup_symbol): New.
+	(_bfd_elf_fix_symbol_flags): Call elf_backend_fixup_symbol if
+	it isn't NULL.
+
+	* elfxx-ia64.c (elf_backend_fixup_symbol): Defined.
+
+	* elfxx-target.h (elf_backend_fixup_symbol): New.
+	(elfNN_bed): Initialize elf_backend_fixup_symbol.
+
+2006-02-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* cpu-ia64-opc.c (ins_immu5b): New.
+	(ext_immu5b): Likewise.
+	(elf64_ia64_operands): Add IMMU5b.
+
+2006-02-21  Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/2218
+	* elf32-arm.c (allocate_dynrelocs): Ensure undef weak sym in pie
+	is dynamic.
+	* elf32-hppa.c (allocate_dynrelocs): Likewise.
+	* elf32-i386.c (allocate_dynrelocs): Likewise.
+	* elf32-s390.c (allocate_dynrelocs): Likewise.
+	* elf32-sh.c (allocate_dynrelocs): Likewise.
+	* elf64-s390.c (allocate_dynrelocs): Likewise.
+	* elf64-x86-64.c (allocate_dynrelocs): Likewise.
+	* elf32-m32r.c (allocate_dynrelocs): Likewise.  Discard relocs
+	on undef weak with non-default visibility too.
+	* elfxx-sparc.c (allocate_dynrelocs): Ditto.
+
+2006-02-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd.c: (_bfd_default_error_handler): Don't call abort on
+	error, instead call _exit.
+	(_bfd_abort): Call _exit not xexit.
+
+2006-02-17  Kevin Buettner  <kevinb@redhat.com>
+
+	* elf32-frv.c (elf32_frv_grok_prstatus, elf32_frv_grok_psinfo):
+	New functions.
+	* elf_backend_grok_prstatus, elf_backend_grok_psinfo): Define.
+
+2006-02-17  Shrirang Khisti  <shrirangk@kpitcummins.com>
+	    Anil Paranjape  <anilp1@kpitcummins.com>
+	    Shilin Shakti  <shilins@kpitcummins.com>
+
+	* Makefile.am: Add xc16x related entry
+	* Makefile.in: Regenerate
+	* archures.c: Add bfd_xc16x_arch
+	* bfd-in2.h: Regenerate
+	* config.bfd: Add xc16x-*-elf
+	* configure.in: Add bfd_elf32_xc16x_vec
+	* configure: Regenerate.
+	* targets.c: Added xc16x related information
+	* cpu-xc16x.c: New file
+	* reloc.c: Add new relocations specific to xc16x:
+	BFD_RELOC_XC16X_PAG, BFD_RELOC_XC16X_POF, BFD_RELOC_XC16X_SEG,
+	BFD_RELOC_XC16X_SOF
+	* elf32-xc16x.c: New file.
+
+2006-02-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (allocate_dynrelocs): Tweak undef weak handling.
+	* elf64-ppc.c (allocate_dynrelocs): Likewise.
+
+2006-02-17  Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/2218
+	* elf64-ppc.c (allocate_dynrelocs): Ensure undef weak sym is
+	dynamic.
+	(ppc64_elf_relocate_section): Check output reloc section size.
+	* elf32-ppc.c (allocate_dynrelocs): Simplify undef weak test.
+
+2006-02-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/2322
+	* elf.c (get_segment_type): New function.
+	(_bfd_elf_print_private_bfd_data): Use it.
+	(print_segment_map): New function.
+	(assign_file_positions_for_segments): Call print_segment_map
+	when there are not enough room for program headers.
+
+2006-02-16  Nick Hudson  <nick.hudson@dsl.pipex.com>
+
+	* config.bfd (mips*el-*-netbsd*, mips*-*-netbsd*): Use
+	traditional MIPS ELF targets.
+
+2006-02-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/2338
+	* dwarf2.c (check_function_name): New function.
+	(_bfd_dwarf2_find_nearest_line): Use check_function_name to
+	check if function is correct.
+
+2006-02-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (_bfd_elf_default_action_discarded): Return 0 for
+	debug sections.
+	(elf_link_input_bfd): Adjust comments.
+
+2006-02-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (copy_private_bfd_data): Minor update.
+
+2006-02-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/2258
+	* elf.c (copy_private_bfd_data): Renamed to ...
+	(rewrite_elf_program_header): This.
+	(copy_elf_program_header): New function.
+	(copy_private_bfd_data): Likewise.
+
+2006-02-07  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
+	bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
+	bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
+	bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
+	(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
+	bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
+	bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
+	bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
+	bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
+	bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
+	bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
+	bfd_mach_mcf_isa_b_usp_float_emac): New.
+	(bfd_default_scan): Update coldfire mapping.
+	* bfd-in.h (bfd_m68k_mach_to_features,
+	bfd_m68k_features_to_mach): Declare.
+	* bfd-in2.h: Rebuilt.
+	* cpu-m68k.c (arch_info_struct): Add new coldfire machines,
+	adjust legacy names.
+	(m68k_arch_features): New.
+	(bfd_m68k_mach_to_features,
+	bfd_m68k_features_to_mach): Define.
+	* elf32-m68k.c (elf32_m68k_object_p): New.
+	(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
+	(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
+	(elf_backend_object_p): Define.
+	* ieee.c (ieee_write_processor): Update coldfire machines.
+	* libbfd.h: Rebuilt.
+
+2006-02-06  Steve Ellcey  <sje@cup.hp.com>
+
+	* elfxx-ia64.c (elfNN_ia64_fake_sections): Set SHF_IA_64_HP_TLS
+	if SHF_TLS is set.
+
+2006-02-05  Arnold Metselaar  <arnold.metselaar@planet.nl>
+
+	* coff-z80.c (r_imm24): New howto.
+	(rtype2howto): New case R_IMM24.
+	(coff_z80_reloc_type_lookup): New case BFD_RELOC_24.
+	(extra_case): Use bfd_get_8 for R_IMM8, new case R_IMM24.
+
+2006-02-04  Richard Sandiford  <richard@codesourcery.com>
+
+	* elfxx-mips.c (mips_elf_initialize_tls_index): If a TLS symbol
+	has already been assigned a GOT index, copy that index to the
+	current hash table entry.
+
+2006-02-01  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	* elfxx-sparc.c (_bfd_sparc_elf_relocate_section): Reinstate bypass
+	for call-to-undefweak reloc overflow.
+
+2006-01-31  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	* elfxx-sparc.c (_bfd_sparc_elf_relocate_section): Reinstate bypass
+	for 32-bit relocs overflow.
+
+2006-01-27  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_get_symbol_type): Allow STT_TLS thumb
+	objects.
+
+2006-01-18  Alexandre Oliva  <aoliva@redhat.com>
+
+	Introduce TLS descriptors for i386 and x86_64.
+	* reloc.c (BFD_RELOC_386_TLS_GOTDESC, BFD_RELOC_386_TLS_DESC,
+	BFD_RELOC_386_TLS_DESC_CALL, BFD_RELOC_X86_64_GOTPC32_TLSDESC,
+	BFD_RELOC_X86_64_TLSDESC, BFD_RELOC_X86_64_TLSDESC_CALL): New.
+	* libbfd.h, bfd-in2.h: Rebuilt.
+	* elf32-i386.c (elf_howto_table): New relocations.
+	(R_386_tls): Adjust.
+	(elf_i386_reloc_type_lookup): Map new relocations.
+	(GOT_TLS_GDESC, GOT_TLS_GD_BOTH_P): New macros.
+	(GOT_TLS_GD_P, GOT_TLS_GDESC_P, GOT_TLS_GD_ANY_P): New macros.
+	(struct elf_i386_link_hash_entry): Add tlsdesc_got field.
+	(struct elf_i386_obj_tdata): Add local_tlsdesc_gotent field.
+	(elf_i386_local_tlsdesc_gotent): New macro.
+	(struct elf_i386_link_hash_table): Add sgotplt_jump_table_size.
+	(elf_i386_compute_jump_table_size): New macro.
+	(link_hash_newfunc): Initialize tlsdesc_got.
+	(elf_i386_link_hash_table_create): Set sgotplt_jump_table_size.
+	(elf_i386_tls_transition): Handle R_386_TLS_GOTDESC and
+	R_386_TLS_DESC_CALL.
+	(elf_i386_check_relocs): Likewise.  Allocate space for
+	local_tlsdesc_gotent.
+	(elf_i386_gc_sweep_hook): Handle R_386_TLS_GOTDESC and
+	R_386_TLS_DESC_CALL.
+	(allocate_dynrelocs): Count function PLT relocations.  Reserve
+	space for TLS descriptors and relocations.
+	(elf_i386_size_dynamic_sections): Reserve space for TLS
+	descriptors and relocations.  Set up sgotplt_jump_table_size.
+	Don't zero reloc_count in srelplt.
+	(elf_i386_always_size_sections): New.  Set up _TLS_MODULE_BASE_.
+	(elf_i386_relocate_section): Handle R_386_TLS_GOTDESC and
+	R_386_TLS_DESC_CALL.
+	(elf_i386_finish_dynamic_symbol): Use GOT_TLS_GD_ANY_P.
+	(elf_backend_always_size_sections): Define.
+	* elf64-x86-64.c (x86_64_elf_howto): Add R_X86_64_GOTPC32_TLSDESC,
+	R_X86_64_TLSDESC, R_X86_64_TLSDESC_CALL.
+	(R_X86_64_standard): Adjust.
+	(x86_64_reloc_map): Map new relocs.
+	(elf64_x86_64_rtype_to_howto): New, split out of...
+	(elf64_x86_64_info_to_howto): ... this function, and...
+	(elf64_x86_64_reloc_type_lookup): ... use it to map elf_reloc_val.
+	(GOT_TLS_GDESC, GOT_TLS_GD_BOTH_P): New macros.
+	(GOT_TLS_GD_P, GOT_TLS_GDESC_P, GOT_TLS_GD_ANY_P): New macros.
+	(struct elf64_x86_64_link_hash_entry): Add tlsdesc_got field.
+	(struct elf64_x86_64_obj_tdata): Add local_tlsdesc_gotent field.
+	(elf64_x86_64_local_tlsdesc_gotent): New macro.
+	(struct elf64_x86_64_link_hash_table): Add tlsdesc_plt,
+	tlsdesc_got and sgotplt_jump_table_size fields.
+	(elf64_x86_64_compute_jump_table_size): New macro.
+	(link_hash_newfunc): Initialize tlsdesc_got.
+	(elf64_x86_64_link_hash_table_create): Initialize new fields.
+	(elf64_x86_64_tls_transition): Handle R_X86_64_GOTPC32_TLSDESC and
+	R_X86_64_TLSDESC_CALL.
+	(elf64_x86_64_check_relocs): Likewise.  Allocate space for
+	local_tlsdesc_gotent.
+	(elf64_x86_64_gc_sweep_hook): Handle R_X86_64_GOTPC32_TLSDESC and
+	R_X86_64_TLSDESC_CALL.
+	(allocate_dynrelocs): Count function PLT relocations.  Reserve
+	space for TLS descriptors and relocations.
+	(elf64_x86_64_size_dynamic_sections): Reserve space for TLS
+	descriptors and relocations.  Set up sgotplt_jump_table_size,
+	tlsdesc_plt and tlsdesc_got.  Make room for them.  Don't zero
+	reloc_count in srelplt.  Add dynamic entries for DT_TLSDESC_PLT
+	and DT_TLSDESC_GOT.
+	(elf64_x86_64_always_size_sections): New.  Set up
+	_TLS_MODULE_BASE_.
+	(elf64_x86_64_relocate_section): Handle R_386_TLS_GOTDESC and
+	R_386_TLS_DESC_CALL.
+	(elf64_x86_64_finish_dynamic_symbol): Use GOT_TLS_GD_ANY_P.
+	(elf64_x86_64_finish_dynamic_sections): Set DT_TLSDESC_PLT and
+	DT_TLSDESC_GOT.  Set up TLS descriptor lazy resolver PLT entry.
+	(elf_backend_always_size_sections): Define.
+
+2006-01-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/2096
+	* dwarf2.c (comp_unit_contains_address): Update comment.
+	(_bfd_dwarf2_find_nearest_line): Use section's vma, instead of
+	lma.  Return TRUE only if both comp_unit_contains_address and
+	comp_unit_find_nearest_line return TRUE.
+	(_bfd_dwarf2_find_line): Use section's vma, instead of lma.
+
+2006-01-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_backend_data): Add gc_mark_dynamic_ref.
+	(bfd_elf_gc_mark_dynamic_ref_symbol): Declare.
+	* elflink.c (bfd_elf_gc_mark_dynamic_ref_symbol): Rename from
+	elf_gc_mark_dynamic_ref_symbol.  Make global.
+	(bfd_elf_gc_sections): Call bed->gc_mark_dynamic_ref.
+	* elfxx-target.h (elf_backend_gc_mark_dynamic_ref): Define.
+	(elfNN_bed): Init new field.
+	* elf64-ppc.c (elf_backend_gc_mark_dynamic_ref): Define.
+	(ppc64_elf_gc_mark_dynamic_ref): New function.
+
+2006-01-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_gc_mark_hook): Don't hang forever in loop.
+
+2006-01-17  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/2159
+	* elf.c (elfcore_write_pstatus): Add ATTRIBUTE_UNUSED to unused
+	parameters.
+
+2006-01-11  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-arm.c (elf32_arm_output_symbol_hook): Install new entry
+	into the newly (re)allocated map array.
+
+2006-01-09  Alexis Wilke  <alexis_wilke@yahoo.com>
+
+	* peXXigen.c (tbl): Add comma after "HIGH3ADJ".
+
+2006-01-01  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf64-ppc.c (ppc64_elf_action_discarded): Return 0
+	for .toc1 section.
+
+For older changes see ChangeLog-2005
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-2007 sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-2007
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-2007	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-2007	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3561 @@
+2007-12-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/5530
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Call
+	_bfd_elf_find_segment_containing_section with output_bfd,
+	instead of input_bfd.
+
+2007-12-31  Nick Clifton  <nickc@redhat.com>
+
+	* elf-m10300.c (mn10300_elf_relax_section): Use
+	_bfd_merged_section_offset to compute the offset of a symbol in a
+	merged section.
+
+2007-12-31  Nick Clifton  <nickc@redhat.com>
+
+	* elf.c (_bfd_elf_find_segment_containing_section): New function:
+	Scan the segment map looking for the segment containing a
+	specified function.
+	* elf-bfd.h: Prototype the new function.
+	* elf-hppa.h (elf_hppa_osec_to_segment): Delete.
+	(elf_hppa_record_segment_addrs): Use new function.
+	* elf32-bfin.c (_bfdfdpic_osec_to_segment): Use new function.
+	* elf32-frv.c (_frvfdpic_osec_to_segment): Use new function.
+	* elf32-hppa.c (hppa_record_segment_addr): Use new function.
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Use new function.
+	
+2007-12-28  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR binutils/5146
+	* elf64-hppa.c: Declare alloca when __GNUC__ is defined.
+	* som.c: Likewise.
+
+	* elf-hppa.h (elf_hppa_osec_to_segment): New function.
+	(elf_hppa_record_segment_addrs): Use elf_hppa_osec_to_segment.
+	Remove ATTRIBUTE_UNUSED from abfd argument.
+	* elf32-hppa.c (hppa_record_segment_addr): Likewise.
+
+2007-12-28  Nick Hudson  <nick.hudson@dsl.pipex.com>
+
+	* elf32-hppa.c (hppa_record_segment_addr): Locate the segment
+	containing the section using the segment map, rather than guessing
+	based upon the section's vma and file position.
+
+2007-12-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/5488
+	* elf.c (IS_NOTE): New.
+	(IS_COREFILE_NOTE): Use IS_NOTE.
+	(IS_SECTION_IN_INPUT_SEGMENT): Use IS_NOTE instead of
+	IS_COREFILE_NOTE.
+
+2007-12-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/5449
+	* elf.c (rewrite_elf_program_header): Don't adjust p_paddr if
+	p_paddr is set to 0.
+	(copy_private_bfd_data): Call rewrite_elf_program_header if
+	p_paddr is set to 0.
+
+	* elfcode.h (elf_swap_phdr_out): Set p_paddr to 0 if needed.
+
+	* elfxx-ia64.c (ELF_MAXPAGESIZE): Don't redefine it for HPUX.
+
+2007-12-21  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (relax_section): Update DIFF relocations in the
+	same way as other relocations.
+	
+2007-12-18  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* section.c (BFD_FAKE_SECTION): Update.
+	* bfd-in2.h: Regenerate.
+
+2007-12-18  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* bfd-in2.h: Regenerate.
+
+2007-12-17  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+	* config.bfd: Add arm-*-mingw32ce* target.
+
+2007-12-15  Richard Sandiford  <rsandifo@nildram.co.uk>
+
+	* elf-bfd.h (eh_cie_fde): Replace u.cie.merged with a union of
+	a merged field and a sec field.
+	(eh_frame_hdr_info): Remove offsets_adjusted.
+	* elf-eh-frame.c (_bfd_elf_parse_eh_frame): Update accesses to
+	the CIE merged field.
+	(_bfd_elf_gc_mark_fdes): Likewise.
+	(_bfd_elf_discard_section_eh_frame): Likewise.  Set u.cie.u.sec
+	when clearing the removed flag.
+	(_bfd_elf_eh_frame_section_offset): Remove offsets_adjusted handling.
+	(_bfd_elf_write_section_eh_frame): Likewise.  Apply output_offsets
+	where appropriate.  
+
+2007-12-15  Richard Sandiford  <rsandifo@nildram.co.uk>
+
+	* elf-bfd.h (eh_cie_fde): Move add_fde_encoding and
+	per_encoding_relative to u.cie.  Add commentary.
+	* elf-eh-frame.c (cie): Remove make_relative.
+	(extra_augmentation_string_bytes): Update use of add_fde_encoding.
+	(extra_augmentation_data_bytes): Likewise.  Use an FDE's own
+	add_augmentation_size field, rather than referring to the CIE.
+	(_bfd_elf_parse_eh_frame): Don't set the struct cie
+	make_relative field; set the eh_cie_fde field directly.
+	Update setting of add_fde_encoding and per_encoding_relative.
+	Copy make_relative and add_augmentation_size from the CIE
+	to the FDE.
+	(_bfd_elf_discard_section_eh_frame): Use the FDE's own
+	make_relative field.
+	(_bfd_elf_eh_frame_section_offset): Likewise.
+	(_bfd_elf_write_section_eh_frame): Update accesses to
+	add_fde_encoding and per_encoding_relative.  Use the FDE's
+	own make_relative and add_augmentation_size fields.
+
+2007-12-15  Richard Sandiford  <rsandifo@nildram.co.uk>
+
+	* elf-bfd.h (eh_cie_fde): Remove need_lsda_relative.
+	Move make_lsda_relative to u.cie.
+	* elf-eh-frame.c (cie): Rename make_lsda_relative to
+	can_make_lsda_relative.
+	(_bfd_elf_parse_eh_frame): Don't set the old eh_cie_fde
+	make_lsda_relative field.  Update after cie renaming.
+	Set u.cie.make_lsda_relative if can_make_lsda_relative
+	and if we find a relocation against the LSDA.
+	(_bfd_elf_discard_section_eh_frame): Copy make_lsda_relative when
+	changing a CIE's group representative.
+	(_bfd_elf_eh_frame_section_offset): Don't set need_ldsa_relative here.
+	(_bfd_elf_write_section_eh_frame): Check u.cie.make_lsda_relative
+	rather than need_lsda_relative.
+
+2007-12-15  Richard Sandiford  <rsandifo@nildram.co.uk>
+
+	* elf-bfd.h (eh_cie_fde): Add u.fde.next_for_section and
+	u.cie.gc_mark.
+	(bfd_elf_section_data): Add fde_list.
+	(elf_fde_list): New macro.
+	(elf_obj_tdata): Add eh_frame_section.
+	(elf_eh_frame_section): New macro.
+	(_bfd_elf_gc_mark_reloc): Remove last parameter.
+	(_bfd_elf_gc_mark_fdes): Declare.
+	* elf-eh-frame.c (_bfd_elf_get_eh_frame_sec_info): Chain the FDEs
+	for each input section.
+	(mark_entry, _bfd_elf_gc_mark_fdes): New functions.
+	* elflink.c (_bfd_elf_gc_mark_reloc): Remove is_eh parameter.
+	(_bfd_elf_gc_mark): Update call accordingly.  Mark the relocations
+	againts the section's FDEs.  Don't mark the bfd's elf_eh_frame_section.
+	(bfd_elf_gc_sections): Parse each input bfd's .eh_frame before
+	marking any input sections.  Remove the current EH handling.
+	* section.c (bfd_section): Remove gc_mark_from_eh.
+	* ecoff.c (bfd_debug_section): Update initializer accordingly.
+
+2007-12-15  Richard Sandiford  <rsandifo@nildram.co.uk>
+
+	* elf-bfd.h (eh_cie_fde): Add u.cie.  Document how u.fde.cie_inf
+	changes when removed == 0.
+	(eh_frame_hdr_info): Add parsed_eh_frames.
+	(_bfd_elf_begin_eh_frame_parsing): Declare.
+	(_bfd_elf_parse_eh_frame): Declare.
+	(_bfd_elf_end_eh_frame_parsing): Declare.
+	* elf-eh-frame.c (_bfd_elf_begin_eh_frame_parsing): New function.
+	(_bfd_elf_parse_eh_frame): New function, split out from
+	_bfd_elf_discard_section_eh_frame.  Make a first pass through the
+	buffer to calculate the number of entries and CIEs.  Allocate memory
+	for them before the main loop.  Replace current extended cie
+	representation with a pair of pointers, one to the local eh_cie_fde
+	and one to the full struct cie.  Allocate a separate array of struct
+	cies if not merging.  Merge CIEs during the main loop and set up each
+	u.cie.merged field.  Point an FDE's cie_inf field directly at the
+	local CIE.  Initially assume that all entries should be removed.
+	(_bfd_elf_end_eh_frame_parsing): New function.
+	(_bfd_elf_discard_section_eh_frame): Assume that the section has
+	already been parsed.  Use a separate pass to mark entries that
+	need to be kept.  Use the u.cie.merged field to track a CIE's
+	group representative.
+	* elflink.c (bfd_elf_discard_info): Call _bfd_elf_parse_eh_frame
+	before _bfd_elf_discard_section_eh_frame.  Wrap loop with calls to
+	_bfd_elf_begin_eh_frame_parsing and _bfd_elf_end_eh_frame_parsing.
+
+2007-12-15  Richard Sandiford  <rsandifo@nildram.co.uk>
+
+	* elf-bfd.h (eh_cie_fde): Put cie_inf in a union.  Add a reloc_index
+	field.  Use bitfields for fde_encoding, lsda_encoding and lsda_offset.
+	* elf-eh-frame.c (extra_augmentation_data_bytes): Adjust cie_inf
+	accesses after the above change.
+	(_bfd_elf_eh_frame_section_offset): Likewise.
+	(_bfd_elf_write_section_eh_frame): Likewise.
+	(_bfd_elf_discard_section_eh_frame): Likewise.  Set up reloc_index.
+
+2007-12-15  Richard Sandiford  <rsandifo@nildram.co.uk>
+
+	* elf-bfd.h (_bfd_elf_gc_mark_rsec, _bfd_elf_gc_mark_reloc): Declare.
+	(_bfd_elf_gc_mark): Use elf_gc_mark_hook_fn.
+	* elflink.c (init_reloc_cookie, fini_reloc_cookie)
+	(init_reloc_cookie_rels, fini_reloc_cookie_rels): New functions,
+	split out from...
+	(bfd_elf_discard_info): ...here.
+	(init_reloc_cookie_for_section): New function.
+	(fini_reloc_cookie_for_section): Likewise.
+	(_bfd_elf_gc_mark_rsec, _bfd_elf_gc_mark_reloc): New functions,
+	split out from...
+	(_bfd_elf_gc_mark): ...here.  Use init_reloc_cookie_for_section
+	and fini_reloc_cookie_for_section.
+
+2007-12-12  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_xtensa_do_reloc): Update self_address along with
+	address.
+	(print_action_list): Fix name for ta_convert_longcall.
+
+2007-12-11  Catherine Moore  <clm@codesourcery.com>
+
+        * elf.c (_bfd_elf_copy_private_symbol_data): Don't copy shndx if
+        the symbol's section is the undefined section.
+
+2007-12-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (elf_fake_sections): Add "warning:" to "..changed to PROGBITS"
+	message.
+
+2007-12-07  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_howto_table): Add R_XTENSA_32_PCREL.
+	(elf_xtensa_reloc_type_lookup): Handle BFD_RELOC_32_PCREL.
+	(elf_xtensa_check_relocs): Use default case for all relocations that
+	need nothing done here.
+	(elf_xtensa_do_reloc): Compute self_address for all relocation types.
+	Handle R_XTENSA_32_PCREL.
+	(elf_xtensa_relocate_section): Check for R_XTENSA_32_PCREL for dynamic
+	symbols.
+	(check_section_ebb_pcrels_fit): Ignore R_XTENSA_32_PCREL relocations.
+	
+2007-12-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_size_stubs): Do consider branches to
+	non-function symbols for overlay stubs.
+
+2007-12-04  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_xtensa_size_dynamic_sections): Create DT_PLTGOT
+	entry for all dynamic objects.
+
+2007-12-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_size_stubs): Correct section alignment.
+
+2007-11-30  Richard Sandiford  <rsandifo@nildram.co.uk>
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Use the
+	ELF header to choose between 32-bit and 64-bit relocation structures.
+
+2007-11-29  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* archures.c (bfd_mach_mips_loongson_2e): New.
+	(bfd_mach_mips_loongson_2f): New.
+	* bfd-in2.h (bfd_mach_mips_loongson_2e): New.
+	(bfd_mach_mips_loongson_2f): New.
+	* cpu-mips.c: Add I_loongson_2e and I_loongson_2f to
+	anonymous enum.
+	(arch_info_struct): Add Loongson-2E and Loongson-2F entries.
+	* elfxx-mips.c (_bfd_elf_mips_mach): Handle Loongson-2E
+	and Loongson-2F flags.
+	(mips_set_isa_flags): Likewise.
+	(mips_mach_extensions): Add Loongson-2E and Loongson-2F
+	entries. 
+
+2007-11-29  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/5398
+	* elf32-arm.c (bfd_elf32_arm_process_before_allocation): Do not
+	complain if there is no glue bfd, just return.
+
+2007-11-28  Nick Clifton  <nickc@redhat.com>
+
+	* elf-m10300.c (mn10300_elf_relax_section): Extend previous fix to
+	cover forward jumps.
+
+2007-11-21  Nick Clifton  <nickc@redhat.com>
+
+	* elf-m10300.c (mn10300_elf_relax_section): Allow for alignment
+	relocs when computing whether instructions can be relaxed.
+
+2007-11-16  Tristan Gingold  <gingold@adacore.com>
+
+	* elflink.c (elf_link_output_extsym): Weaken assertion: if
+	--gc-section is set, there may be no TLS segment.
+
+2007-11-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (bfd_elf_perform_complex_relocation): Update prototype.
+	* elflink.c (bfd_elf_perform_complex_relocation): Return status.
+	Don't print reloc overflow message.
+	* elf32-mep.c (mep_elf_relocate_section): Handle status from
+	bfd_elf_perform_complex_relocation.
+
+2007-11-17  Thiemo Seufer  <ths@mips.com>
+
+	* elfxx-mips.c (mips_elf_merge_obj_attributes): Handle -mips32r2
+	-mfp64 attribute.
+
+2007-11-16  Nick Clifton  <nickc@redhat.com>
+
+	* elf-m10300.c (mn10300_elf_check_relocs): Fix memory leak and
+	check that bfd_elf_get_elf_syms is only called once.
+
+2007-11-16  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* elf64-ppc.c (ppc64_elf_get_synthetic_symtab): Set udata.p of
+	synthetic symbol to point to the ELF symbol it was derived from.
+
+2007-11-15  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 5328
+	* opncls.c (separate_debug_file_exists): Use fopen/fread
+	rather than open/read and open in binary mode.
+
+2007-11-14  Richard Sandiford  <richard@codesourcery.com>
+
+	* elfxx-mips.c (mips_got_page_range): New structure.
+	(mips_got_page_entry): Likewise.
+	(mips_got_info): Add page_gotno and got_page_entries fields.
+	(mips_elf_got_per_bfd_arg): Add max_pages field.  Delete
+	primary_count and current_count fields.
+	(mips_got_page_entry_hash, mips_got_page_entry_eq): New functions.
+	(mips_elf_pages_for_range, mips_elf_record_got_page_entry): Likewise.
+	(mips_elf_get_got_for_bfd): New function, split out from
+	mips_elf_make_got_per_bfd.  Initialize the page_gotno and
+	got_page_entries fields when creating a new GOT structure.
+	(mips_elf_make_got_pages_per_bfd): New function.
+	(mips_elf_merge_got_with): New function, split out from
+	mips_elf_make_got_per_bfd.  Merge page entries as well as
+	non-page entries.  Use the minimum of max_pages and the sum
+	of the page_gotnos to estimate the number of page entries.
+	(mips_elf_merge_gots): Use the minimum of max_pages and the
+	bfd's page_gotno to estimate the number of page entries.
+	Use the above functions.
+	(mips_elf_multi_got): Add page entries as well as non-page entries
+	to the individual per-bfd GOTs.  Initialize got_per_bfd_arg.max_pages.
+	Initialize the page_gotno and got_page_entries fields when creating
+	a new primary GOT.  Use the minimum of pages and page_gotno when
+	adding the number of pages entries to local_gotno.
+	(mips_elf_create_got_section): Initialize the page_gotno and
+	got_page_entries fields of the GOT structure.
+	(mips_elf_rel_relocation_p, mips_elf_read_rel_addend)
+	(mips_elf_add_lo16_rel_addend, mips_elf_get_section_contents): New
+	functions, split out from...
+	(_bfd_mips_elf_relocate_section): ...here.
+	(_bfd_mips_elf_check_relocs): Record GOT page entries too.
+	(_bfd_mips_relax_section): Use mips_elf_get_section_contents.
+	(_bfd_mips_elf_always_size_sections): Use the smaller of the
+	loadable_size- and page_gotno-derived estimates.
+
+2007-11-14  Thiemo Seufer  <ths@mips.com>
+
+	* elfxx-mips.c (mips_elf_merge_obj_attributes): Prevent
+	unwanted fallthroughs in case statement.
+
+2007-11-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/5307
+	* peXXigen.c (_bfd_XX_bfd_copy_private_bfd_data_common): Don't
+	copy input subsystem if output is different from input.
+
+2007-11-13  Nick Clifton  <nickc@redhat.com>
+
+	* elf-m10300.c (mn10300_elf_final_link_relocate): Prevent the
+	accidental termination of DWARF location list entries.
+	(mn10300_elf_relax_delete_bytes): Stop deletion if an align reloc
+	is encountered that is larger than or not a mutliple of the number
+	of bytes being deleted.
+	When adjusting symbols, any symbols inside the region being
+	deleted must be moved to the end of the region.
+	Move align relocs forward if there is room for them after the
+	deletion of the region.
+
+2007-11-13  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 5233
+	* elf.c (rewrite_elf_program_header): Formatting.  Add
+	first_matching_lma and first_suggested_lma booleans and use
+	instead of testing matching_lma and suggested_lma for zero.
+
+2007-11-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/5299
+	* peicode.h (pe_bfd_object_p): Save and restore previous bfd
+	state when calling coff_object_p.
+
+2007-11-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (_bfd_elf_get_synthetic_symtab): Only bump the symbol
+	pointer when we have a valid symbol.  Init udata.p to NULL.
+
+2007-11-09  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf-vxworks.c (elf_vxworks_emit_relocs): Don't clobber
+	rel_hash.  Move loop inside if test.
+
+2007-11-08  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf-vxworks.h (elf_vxworks_add_dynamic_entries): Declare.
+	(elf_vxworks_finish_dynamic_entry): Declare.
+	* elf-vxworks.c: Include elf/vxworks.h.
+	(elf_vxworks_add_dynamic_entries): New.
+	(elf_vxworks_finish_dynamic_entry): New.
+	* Makefile.am (elf-vxworks.lo): Add dependency.
+	* Makefile.in (elf-vxworks.lo): Add dependency.
+	* elf32-i386.c (elf_i386_size_dynamic_sections,
+	elf_i386_finish_dynamic_sections): Call
+	elf_vxworks_add_dynamic_entries and
+	elf_vxworks_finish_dynamic_entry.
+	* elf32-ppc.c (ppc_elf_size_dynamic_sections,
+	ppc_elf_finish_dynamic_sections): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_size_dynamic_sections,
+	sparc_finish_dyn): Likewise.
+	* elf32-sh.c (sh_elf_size_dynamic_sections,
+	sh_elf_finish_dynamic_sections): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_size_dynamic_sections,
+	_bfd_mips_elf_finish_dynamic_sections): Likewise.
+	* elf32-arm.c (elf32_arm_size_dynamic_sections,
+	elf32_arm_finish_dynamic_sections): Likewise.
+
+2007-11-07  Olivier Hainque  <hainque@adacore.com>
+
+	* bfd/elfxx-mips.c (_bfd_mips_elf_fake_sections): Force
+	SHF_MIPS_NOSTRIP on .debug_frame for Irix.
+
+2007-11-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_check_relocs): Don't refcount tlsld_got here..
+	(ppc64_elf_gc_sweep_hook): ..or here..
+	(ppc64_elf_tls_optimize): ..or here.  Make two passes through the
+	relocs, ensuring that tls_get_addr calls follow gd and ld relocs.
+	(allocate_dynrelocs): Refcount tlsld_got here.
+	(ppc64_elf_size_dynamic_sections): Allocate local got and call
+	allocate_dynrelocs before allocating tlsld_got.
+	(ppc64_elf_relocate_section): Remove check that a tls_get_addr
+	call follows gd and ld relocs.
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Don't refcount tlsld_got here..
+	(ppc_elf_gc_sweep_hook): ..or here..
+	(ppc_elf_tls_optimize): ..or here.  Make two passes through the
+	relocs, ensuring that tls_get_addr calls follow gd and ld relocs.
+	(allocate_dynrelocs): Refcount tlsld_got here.
+	(ppc_elf_size_dynamic_sections): Call allocate_dynrelocs before
+	allocating tlsld_got.
+	(ppc_elf_relocate_section): Remove check that a tls_get_addr
+	call follows gd and ld relocs.
+
+2007-11-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* merge.c (sec_merge_hash_lookup): Revert last change.
+	(record_section): Likewise.
+	(_bfd_merge_sections): Likewise.
+	(_bfd_merged_section_offset): Properly handle NULL secinfo.
+	(_bfd_add_merge_section): Allocate extra space for a zero
+	terminator on SEC_STRINGS sections.
+
+2007-11-05  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* pe-i386.c (COFF_SECTION_ALIGNMENT_ENTRIES): Let .data, .text
+	 and .bss section use the default.
+	* pei-i386.c (COFF_SECTION_ALIGNMENT_ENTRIES): Likewise.
+
+2007-11-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* merge.c (sec_merge_hash_lookup): Add parameter sec_end.  Check
+	for unterminated strings.  All callers changed.
+	(record_section): Add parameter abfd.  Give error message for
+	unterminated strings.
+	(_bfd_merge_sections): Update call to record_section.
+	(_bfd_write_merged_section, _bfd_merged_section_offset): Handle
+	NULL secinfo from merge failures.
+
+2007-10-31  Nick Clifton  <nickc@redhat.com>
+
+	* elf-m10300.c (mn10300_elf_relax_delete_bytes): Do not look for
+	align relocs when there are no relocs attached to the section.
+
+2007-10-31  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (bfd_elf_match_symbols_in_sections): Don't declare.
+	* elflink.c (bfd_elf_match_symbols_in_sections): Make static.
+	Remove section name comparisons.
+
+2007-10-30  Nick Clifton  <nickc@redhat.com>
+
+	* reloc.c (BFD_RELOC_MN10300_ALIGN): Add.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regnerate.
+	* elf-m10300.h: Handle R_MN10300_ALIGN relocs.
+	(mn10300_elf_relax_delete_bytes): Honour R_MN10300_ALIGN relocs.
+	Re-fix off by one error in comparisons.
+  
+2007-10-25  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+	* bfd-in.h (STRING_COMMA_LEN): Don't handle NULL STR case.
+	* bfd-in2.h: Regenerate.
+
+2007-10-25  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-ppc.c (ppc_elf_merge_obj_attributes): Add support for
+	Tag_GNU_Power_ABI_Vector.
+
+2007-10-25  Joseph Myers  <joseph@codesourcery.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_modify_segment_map): Do not add
+	PT_NULL header when not linking.
+
+2007-10-25  Carlos Eduardo Seo  <cseo@linux.vnet.ibm.com>
+
+	* elf.c (elfcore_grok_ppc_vmx): New function.
+	(elfcore_grok_note): Handle NT_PPC_VMX.
+	(elfcore_write_ppc_vmx): New function.
+	* elf-bfd.h (elfcore_write_ppc_vmx): Declare.
+
+2007-10-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2007-10-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc_build_one_stub): Don't duplicate relocs
+	emitted for ".brlt" entries.
+	(toc_adjusting_stub_needed): Don't treat ".fixup" specially here..
+	(ppc64_elf_next_input_section): ..instead do so here.
+
+2007-10-19  Nick Clifton  <nickc@redhat.com>
+
+	* config.bfd: Recognise am34-linux-gnu target.
+	* reloc.c: Add BFD_RELOC_MN10300_SYM_DIFF relocation.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* elf-m10300.c (elf_mn10300_howto): Add R_MN10300_SYM_DIFF.
+	(mn10300_reloc_map): Likewise.
+	(mn10300_elf_check_relocs): Do not create dynamic relocs for
+	symbol differences or relocations against absolute symbols.
+	(mn10300_elf_final_link_relocate): Likewise.
+	Handle R_MN10300_SYM_DIFF relocs. 
+	(mn10300_elf_relocate_section): Fix for creating local copys of
+	dynamic relocs.
+	(mn10300_elf_relax_delete_bytes): Adjust symbols at the end of the
+	region.  Adjust the size of function symbols.
+	(mn10300_elf_relax_section): Ignore symbols that are in discarded
+	sections.
+
+2007-10-19  Nick Clifton  <nickc@redhat.com>
+
+	* elf-m10300.c: Convert to ISO C.
+
+2007-10-18  H.J. Lu  <hongjiu.lu@intel.com>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/4424
+	* config.bfd (targ_selvecs): Add bfd_elf64_alpha_vec for
+	alpha/FreeBSD.  Add bfd_elf64_sparc_vec for sparc64/FreeBSD.
+	Add bfd_elf32_i386_vec and bfd_efi_app_ia32_vec for i386/FreeBSD.
+	(targ64_selvecs): Set for i386/FreeBSD.
+	* elf-bfd.h (elf_backend_data): Add relocs_compatible.
+	(_bfd_elf_default_relocs_compatible): Declare.
+	(_bfd_elf_relocs_compatible): Declare.
+	* elfxx-target.h (elf_backend_relocs_compatible): Define.
+	(elfNN_bed): Init new relocs_compatible field.
+	* elflink.c (_bfd_elf_default_relocs_compatible): New function.
+	(_bfd_elf_relocs_compatible): New function.
+	(elf_link_add_object_symbols): Call bed->relocs_compatible.
+	* elf32-i386.c (elf_backend_relocs_compatible): Define.
+	* elf64-alpha.c: Likewise.
+	* elf64-sparc.c: Likewise.
+	* elf64-x86-64.c: Likewise.
+
+2007-10-16  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (relax_section): Check for a reference to a discarded
+	DWARF section and anticipate its replacement with the kept section.
+	
+2007-10-16  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_xtensa_discard_info_for_section): Remove
+	unnecessary size variables.  Set sec->rawsize.
+	(relax_section, relax_property_section): Likewise.
+	
+2007-10-16  Bob Wilson  <bob.wilson@acm.org>
+
+	* section.c (struct bfd_section): Clarify comment for rawsize field.
+	* bfd-in2.h: Regenerate.
+	
+2007-10-16  Bob Wilson  <bob.wilson@acm.org>
+
+	* elflink.c (_bfd_elf_check_kept_section): Use the section rawsize
+	values if they are set.
+	
+2007-10-16  Nick Clifton  <nickc@redhat.com>
+
+	PR 5146
+	* configure.in (AC_CHECK_HEADERS): Add alloca.h
+	* configure: Regenerate.
+	* config.in: Regenerate.
+	* som.c: Replace alloca-conf.h inclusion with code recommended in
+	autoconf documentation.
+	* elf64-hppa.c: Likewise.
+
+2007-10-16  Nick Clifton  <nickc@redhat.com>
+
+	* configure.in (--enable-elf-stt-common): New configure
+	option.  If enabled then the tools can generate symbols with
+	the ELF STT_COMMON type.
+	* config.in: Regenerate.
+	* configure: Regenerate.
+	* elf.c (swap_out_syms): If USE_STT_COMMON is defined then set
+	the type of emitted common symbols to STT_COMMON.
+	* elfcode.h (elf_slurp_symbol_table): Accept STT_COMMON symbol
+	types.
+	
+2007-10-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* coff-arm.c (arm_emit_base_file_entry): Check fwrite return value.
+	Return status.  Adjust callers.
+	* coff-mcore.c (mcore_emit_base_file_entry): Likewise.
+	* coff-ppc.c (write_base_file_entry): New function.
+	(coff_ppc_relocate_section): Use it.
+	* elf32-arm.c (find_thumb_glue): Check asprintf return status.
+	(find_arm_glue): Likewise.
+	* vms-misc.c (_bfd_vms_output_flush): Check fwrite return value.
+
+2007-10-12  Nick Clifton  <nickc@redhat.com>
+
+	PR 5160
+	* elflink.c (eval_symbol): Remove bufsz variable and use
+	sizeof(symbuf) where necessary.
+
+2007-10-12  M R Swami Reddy <MR.Swami.Reddy@nsc.com>
+
+	* elf32-cr16.c (elf32_cr16_relax_section): Fix condition check typo.
+
+2007-10-12  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elfxx-mips.c (mips_elf_sort_hash_table_f): Handle forced
+	local symbols specially.
+	(mips_elf_set_global_got_offset): Skip forced local symbols.
+
+2007-10-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (elfcore_grok_prxfpreg): Fix comment typo.
+
+2007-10-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (get_program_header_size): Always add a PT_GNU_RELRO
+	segment for -z relro.
+	(_bfd_elf_map_sections_to_segments): Make a PT_GNU_RELRO
+	segment only when needed.
+
+2007-10-05  Bob Wilson  <bob.wilson@acm.org>
+	
+	* elf32-xtensa.c (relax_section): Call pin_internal_relocs when
+	changing a relocation's offset.  Adjust call to translate_reloc.  Do
+	not add a fix record for a DIFF reloc.  For other relocs, only add a
+	fix record if the translated target is in a different object file;
+	otherwise, just update the relocation.  Call pin_internal_relocs when
+	updating a reloc but not when adding a fix record.
+	(translate_reloc): Get the target section from a new argument, not
+	from the relocation.  Change check for relaxable sections to an
+	assertion.  Compute separate offset adjustments for the base symbol
+	and the addend, and set the new relocation's addend correctly.  Return
+	the new target section.
+	
+2007-10-05  Bob Wilson  <bob.wilson@acm.org>
+	
+	* elf32-xtensa.c (elf_xtensa_relocate_section): Remove updates of
+	r_type and howto after calling do_fix_for_relocateable_link and
+	do_fix_for_final_link.
+	
+2007-10-05  Bob Wilson  <bob.wilson@acm.org>
+	
+	* elf32-xtensa.c (removed_by_actions): New.
+	(offset_with_removed_text): Reimplement using removed_by_actions.
+	(offset_with_removed_text_before_fill): Delete.
+	(relax_property_section): Use removed_by_actions.  Rearrange logic.
+	(relax_section_symbols): Likewise.
+	
+2007-10-04  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (reloc_bfd_fix_struct): Delete target_abfd field.
+	(reloc_bfd_fix_init): Remove target_abfd argument.
+	(relax_section, move_literal): Adjust calls to reloc_bfd_fix_init.
+
+2007-10-04  Nick Clifton  <nickc@redhat.com>
+
+	PR linker/5099
+	* elf64-x86-64.c (elf64_x86_64_check_relocs): Add missing
+	apostrophe to error message.
+
+2007-10-01  M R Swami Reddy <MR.Swami.Reddy@nsc.com>
+
+	* elf32-cr16.c: Fixed DISP8, DISP20 and IMM20 relocations at
+	final relocation phase.
+	Added the below relaxations: IMM32 -> IMM20/IM16 -> IMM4.
+	* reloc.c: Added 3 new relocations: R_CR16_SWITCH8,
+	R_CR16_SWITCH16, R_CR16_SWITCH32.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2007-09-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c: Formatting.
+
+2007-09-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (resolve_symbol): Handle symbols in SEC_MERGE
+	sections.  Don't test symbol st_shndx.  Don't bother with
+	bfd_link_hash_common symbols.  Print longs rather than ints
+	in debug messages.
+	(eval_symbol): Replace "sym" and "advanced" params with "symp".
+	Replace "addr" and "section_offset" params with "dot".  Don't
+	cast bfd_vma values to signed, cast them to bfd_signed_vma.
+	(bfd_elf_perform_complex_relocation): Delete "output_bfd", "info",
+	"local_syms" and "local_sections" params.  Add "relocation".
+	Delete code calculating relocation value.
+	(evaluate_complex_relocation_symbols): Delete function.  Fold into..
+	(elf_link_input_bfd): ..existing code examining relocs.
+	* elf-bfd.h (bfd_elf_perform_complex_relocation): Update prototype.
+	* elf32-mep.c (mep_elf_check_relocs): Delete function.
+	(mep_elf_gc_sweep_hook, mep_elf_gc_mark_hook): Likewise.
+	(mep_elf_object_p): Don't set elf_bad_symtab.
+	(elf_backend_check_relocs): Don't define.
+	(elf_backend_gc_mark_hook, elf_backend_gc_sweep_hook): Likewise.
+	(elf_backend_can_gc_sections, USE_RELA): Likwise.
+	(mep_elf_relocate_section): Move bfd_elf_perform_complex_relocation
+	call after we have calculated reloc value.  Delete local sym
+	debug code.  Use RELOC_FOR_GLOBAL_SYMBOL.  Delete addend
+	adjusting code..
+	(elf_backend_rela_normal): ..instead define this.
+
+2007-09-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-m10300.c (mn10300_elf_check_relocs): Delete dead code.
+	* elf32-arm.c (elf32_arm_check_relocs): Likewise.
+	* elf32-avr.c (elf32_avr_check_relocs): Likewise.
+	* elf32-bfin.c (bfinfdpic_check_relocs): Likewise.
+	* elf32-cris.c (cris_elf_check_relocs): Likewise.
+	* elf32-d10v.c (elf32_d10v_check_relocs): Likewise.
+	* elf32-dlx.c (elf32_dlx_check_relocs): Likewise.
+	* elf32-fr30.c (fr30_elf_check_relocs): Likewise.
+	* elf32-frv.c (_frvfdpic_check_discarded_relocs): Likewise.
+	(elf32_frv_check_relocs): Likewise.
+	* elf32-iq2000.c (iq2000_elf_check_relocs): Likewise.
+	* elf32-m32c.c (m32c_elf_check_relocs): Likewise.
+	* elf32-m32r.c (m32r_elf_check_relocs): Likewise.
+	* elf32-m68hc1x.c (elf32_m68hc11_check_relocs): Likewise.
+	* elf32-mcore.c (mcore_elf_check_relocs): Likewise.
+	* elf32-msp430.c (elf32_msp430_check_relocs): Likewise.
+	* elf32-mt.c (mt_elf_check_relocs): Likewise.
+	* elf32-openrisc.c (openrisc_elf_check_relocs): Likewise.
+	* elf32-sh.c (sh_elf_check_relocs): Likewise.
+	* elf64-mmix.c (mmix_elf_check_relocs): Likewise.
+	* elf64-sh64.c (sh_elf64_check_relocs): Likewise.
+	* elf32-score.c (_bfd_score_elf_check_relocs): Likewise.
+	(score_elf_local_relocation_p): Likewise.
+	(_bfd_score_elf_relocate_section): Likewise.
+	(score_elf_final_link_relocate): Likewise.
+
+2007-09-26  Jan Beulich  <jbeulich@novell.com>
+
+	* elf32-i386.c (elf_i386_check_relocs): Revert NULL pointer
+	check for R_386_GNU_VTINHERIT.
+	* elf-m10300.c (mn10300_elf_check_relocs): Check for NULL
+	pointer for R_xxx_GNU_VTENTRY.
+	* elf32-arm.c (elf32_arm_check_relocs): Likewise.
+	* elf32-bfin.c (bfin_check_relocs): Likewise.
+	(bfinfdpic_check_relocs): Likewise.
+	* elf32-cris.c (cris_elf_check_relocs): Likewise.
+	* elf32-d10v.c (elf32_d10v_check_relocs): Likewise.
+	* elf32-dlx.c (elf32_dlx_check_relocs): Likewise.
+	* elf32-fr30.c (fr30_elf_check_relocs): Likewise.
+	* elf32-frv.c (elf32_frv_check_relocs): Likewise.
+	* elf32-hppa.c (elf32_hppa_check_relocs): Likewise.
+	* elf32-iq2000.c (iq2000_elf_check_relocs): Likewise.
+	* elf32-m32r.c (m32r_elf_check_relocs): Likewise.
+	* elf32-m68hc1x.c (elf32_m68hc11_check_relocs): Likewise.
+	* elf32-m68k.c (elf_m68k_check_relocs): Likewise.
+	* elf32-mcore.c (mcore_elf_check_relocs): Likewise.
+	* elf32-openrisc.c (openrisc_elf_check_relocs): Likewise.
+	* elf32-ppc.c (ppc_elf_check_relocs): Likewise.
+	* elf32-s390.c (elf_s390_check_relocs): Likewise.
+	* elf32-score.c (_bfd_score_elf_check_relocs): Likewise.
+	* elf32-sh.c (sh_elf_check_relocs): Likewise.
+	* elf32-v850.c (v850_elf_check_relocs): Likewise.
+	* elf32-vax.c (elf_vax_check_relocs): Likewise.
+	* elf32-xstormy16.c (xstormy16_elf_check_relocs): Likewise.
+	* elf32-xtensa.c (elf_xtensa_check_relocs): Likewise.
+	* elf64-mmix.c (mmix_elf_check_relocs): Likewise.
+	* elf64-ppc.c (ppc64_elf_check_relocs): Likewise.
+	* elf64-s390.c (elf_s390_check_relocs): Likewise.
+	* elf64-sh64.c (sh_elf64_check_relocs): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_check_relocs): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_check_relocs): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_check_relocs): Likewise.
+
+2007-09-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (set_symbol_value): Add isymbuf and locsymcount
+	params.  Change symidx to a size_t.  Don't access past end
+	of symbol buffer.
+	(resolve_symbol): Add isymbuf param and use instead of
+	finfo->internal_syms.
+	(eval_symbol, evaluate_complex_relocation_symbols): Likewise.
+	(elf_link_input_bfd): Don't read symbols specially for
+	evaluate_complex_relocation_symbols.
+
+2007-09-26  Tristan Gingold  <gingold@adacore.com>
+
+	* som.c (som_get_reloc_upper_bound): If there are no relocs return
+	enough space to hold a NULL pointer.
+
+2007-09-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc_build_one_stub): Correct rel_hdr.sh_size.
+
+2007-09-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (struct spu_link_hash_table): Add ovly_load_r_symndx.
+	(spu_elf_size_stubs): Count stub relocs.
+	(write_one_stub): Emit relocs on overlay call stubs.
+
+	* elf32-spu.c (struct spu_link_hash_table): Add "stubs".
+	(spu_elf_link_hash_table_create): Init new field.
+	(spu_elf_size_stubs): Store sorted stub syms in new htab field
+	rather than local var.
+	(spu_elf_build_stubs): Iterate over htab stubs rather than
+	hash traversal.
+	(struct stubarr): Delete.
+	(allocate_spuear_stubs, populate_stubs, write_one_stub): Adjust.
+
+2007-09-24  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf.c (assign_file_positions_for_load_sections): Trust
+	p_align_valid.
+	(copy_elf_program_header): Copy PT_NULL segments.
+
+2007-09-24  Trevor Smigiel  <Trevor_Smigiel@playstation.sony.com>
+
+	* elf32-spu.c (is_indirect_branch): New function.
+	(find_function_stack_adjust): End scan on hitting indirect branch.
+	(sum_stack): Cast %v arg to correct type.
+
+2007-09-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerated.
+
+2007-09-21  Doug Kwan  <dougkwan@google.com>
+
+	* Makefile.am (BFD32_LIBS): Add arange-set.lo.
+	(BFD32_LIBS_CFILES): Add arange-set.c.
+	(SOURCE_HFILES): Add arange-set.h
+	(dwarf2.lo): Add dependency upon arange-set.h.
+	(arange-set.lo): New target.
+	* Makefile.in: Regenerate.
+	* arange-set.c: New file.
+	* arange-set.h: New file.
+	* dwarf2.c: Include arange-set.h.  
+	(struct dwarf2_debug) Add new fields comp_unit_count and
+	comp_unit_arange_set.
+	(struct comp_unit) Replace field arange with a new field arange_set.
+	(dwarf2_arange_set_allocate, dwarf2_arange_set_deallocate,
+	dwarf2_combine_arange_value, dwarf2_arange_set_new,
+	dwarf2_arange_set_with_value_new, dwarf2_comp_unit_arange_add): New
+	functions to utilize arange set in dwarf2.c.
+	(arange_add): Formatting change for a line longer than 80 characters.
+	(decode_line_info): Replace call target arange_add with
+	dwarf2_comp_unit_arange_add.
+	(read_rangelist_insert_arange_list,
+	read_rangelist_comp_unit_arange_add): New functions used as callbacks
+	for read_rangelist.
+	(read_rangelist): Change interface to accept a callback and data to
+	allow caller to select the action peformed on a new range list read.
+	(scan_unit_for_symbols): Use new interface of read_rangelist.
+	(parse_comp_unit): Create an arange set for each new comp unit.
+	Use new interface of read_rangelist.  Replace call to arange_add
+	with that to dwarf2_comp_unit_arange_add.
+	(comp_unit_contains_address): Replace sequential search with a call to
+	arange_set_lookup_address, which can handles large set efficiently.
+	(stash_copy_local_aranges, stash_maybe_enable_arange_set,
+	stash_find_nearest_line_fast): New functions maintaining and using a
+	valued global arange set for all compilation units to speed up
+	bfd_dwarf2_find_nearest_line.
+	(find_line): Use global arange set.  Replace sequential search over all
+	compilation units with a call to stash_find_nearest_line_fast.  Add
+	book keeping to count number of compilation units.  Replace empty
+	arange list test with a call to arange_set_empty_p.
+
+2007-09-21  Olivier Hainque  <hainque@adacore.com>
+	    Tristan Gingold  <gingold@adacore.com>
+	
+	* syms.c (_bfd_stab_section_find_nearest_line): Look at the 
+        specific SOM sections for stabs if the regular ones are not found.
+	* som.h (struct somdata): Add a line_info field, to be used by
+        som_find_nearest_line.
+	* som.c (som_find_nearest_line): Implement using the bfd stabs
+	function above.
+
+2007-09-19  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_finish_dynamic_sections): Make sure .got
+	will be output.
+
+2007-09-19  Alan Modra  <amodra@bigpond.net.au>
+	    Doug Kwan  <dougkwan@google.com>
+
+	* bfd-in.h (bfd_hash_insert): Declare.
+	* bfd-in2.h: Regenerate.
+	* hash.c (bfd_hash_insert): New function.  Split out from..
+	(bfd_hash_lookup): ..here.
+	* merge.c (sec_merge_hash_lookup): Use bfd_hash_insert.
+
+2007-09-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (bfd_section_from_shdr): Check bfd_alloc return.
+	(elfcore_write_note): Check realloc return.
+	* elflink.c (_bfd_elf_link_find_version_dependencies): Check
+	bfd_zalloc return.
+	(_bfd_elf_link_assign_sym_version): Check bfd_malloc return.
+	(elf_link_add_object_symbols): Likewise.
+	(struct hash_codes_info): New.
+	(elf_collect_hash_codes): Return bfd_malloc error.
+	(struct collect_gnu_hash_codes): Add "error".
+	(elf_collect_gnu_hash_codes): Return bfd_malloc error.
+	(bfd_elf_size_dynamic_sections): Check return status of
+	_bfd_elf_link_find_version_dependencies.
+	(bfd_elf_size_dynsym_hash_dynstr): Adjust for elf_collect_hash_codes
+	and elf_collect_gnu_hash_codes changes.
+	(elf_sym_name_compare): Formatting.
+	(elf_fixup_link_order): Use bfd_malloc, not xmalloc.
+
+2007-09-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/3281
+	PR binutils/5037
+	* elf-bfd.h (elf_obj_tdata): Remove relro.
+
+	* elf.c (get_program_header_size): Check info->relro instead
+	of elf_tdata (abfd)->relro.
+	(_bfd_elf_map_sections_to_segments): Likewise.
+	(assign_file_positions_for_load_sections): Don't set
+	PT_GNU_RELRO segment alignment here.
+	(assign_file_positions_for_non_load_sections): Properly set up
+	PT_GNU_RELRO segment for copying executable/shared library.
+	(rewrite_elf_program_header): Remove PT_GNU_RELRO segment.
+	(copy_elf_program_header): Set p_size and p_size_valid fields for
+	PT_GNU_RELRO segment. 
+
+2007-09-17  Nick Clifton  <nickc@redhat.com>
+
+	* po/fi.po: New Finnish translation.
+	* po/es.po: Updated Spanish translation.
+	* configure.in (ALL_LINGUAS): Add fi.
+	* configure: Regenerate.
+	* po/bfd.pot: Regenerate.
+
+2007-09-15  Nick Clifton  <nickc@redhat.com>
+
+	* bfd.c (_bfd_default_error_handler): fflush stdout.
+
+2007-09-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* opncls.c (find_separate_debug_file): Ensure bfd_set_error has
+	been called on all error return paths.
+	(bfd_fill_in_gnu_debuglink_section): Use bfd_malloc, not malloc.
+	Clear padding after filename
+
+2007-09-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* format.c (bfd_check_format_matches): Record matching targets even
+	when "matching" is NULL to allow bfd_associated_vector matches.
+	Consolidate error return code.  Consolidate ok return code.  Always
+	restore original target and format on error.
+
+2007-09-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* configure.in: Delete BFD_HOST_LONG_LONG and bfd checks for
+	long long.  Partly revert 2007-07-12 change, so that
+	BFD_HOST_64BIT_LONG and BFD_HOST_64BIT_LONG_LONG are set
+	independent of "void *" size.
+	* configure: Regenerate.
+	* config.in: Regenerate.
+	* Makefile.in: Regenerate.
+
+2007-09-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_backend_data): Delete elf_backend_sprintf_vma
+	and elf_backend_fprintf_vma.
+	(_bfd_elf_sprintf_vma, _bfd_elf_fprintf_vma): Delete.
+	* elf.c (_bfd_elf_sprintf_vma, _bfd_elf_fprintf_vma): Delete.
+	* elfxx-target.h (elf_backend_sprintf_vma): Don't define.
+	(elf_backend_fprintf_vma): Likewise.
+	(elfNN_bed): Don't init removed fields.
+	* bfd.c (is32bit): New function.
+	(bfd_sprintf_vma, bfd_fprintf_vma): Use the above.
+
+2007-09-11  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* archures.c: Add bfd_mach_mcf_isa_c_nodiv,
+	bfd_mach_mcf_isa_c_nodiv_mac & bfd_mach_mcf_isa_c_nodiv_emac.
+	* ieee.c (ieee_write_processor): Update coldfire architecture
+	list.
+	* bfd-in2.h: Rebuilt.
+	* cpu-m68k.c (arch_info_struct): Add isa_c nodiv architectures.
+	(m68k_arch_features): Likewise.
+	* elf32-m68k.c (elf32_m68k_object_p): Add EF_M68K_CF_ISA_C_NODIV.
+	(elf32_m68k_print_private_bfd_data): Likewise.
+
+2007-09-11  Jan Beulich  <jbeulich@novell.com>
+
+	* elf64-i386.c (elf64_i386_tls_transition): Remove redundant 'const'.
+	* elf64-x86_64.c (elf64_x86_64_tls_transition): Likewise.
+
+2007-09-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (func_desc_adjust): When resolving undefined
+	references to dot-symbols, transfer def_regular and
+	def_dynamic from the descriptor symbol.
+
+2007-09-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* config.bfd: Set want64 for spu-*-elf.
+
+2007-09-08  Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/2864, ld/5006
+	* elf.c (special_sections): Comment typo.
+	(elf_fake_sections): Force SHT_PROGBITS for sections that are
+	SHT_NOBITS if BFD section flags say they have contents.
+
+2007-09-04  Michael Snyder  <msnyder@access-company.com>
+
+	* elf32-bfin.c (howto_table): Cut and paste error?  
+	Name field of reloc is wrong.
+
+2007-09-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (elf_howto_table): Formatting.
+
+2007-09-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/4986
+	* dwarf2.c (new_line_sorts_after): Undo the last change.
+	(add_line_info): Only keep the last entry with the same address
+	and end sequence.
+
+2007-08-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/4986
+	* dwarf2.c (new_line_sorts_after): Also compare line number.
+
+2007-08-31  Jesse Michael  <jmichael@suse.de>
+
+	* mach-o.c (bfd_mach_o_make_bfd_section): Fix test for non
+	zerofill sections.
+
+2007-08-28  David Heine  <dlheine@tensilica.com>
+
+	* elf32-xtensa.c (compute_ebb_actions): Update removed_bytes when
+	narrowing instructions.
+
+2007-08-28  Mark Shinwell  <shinwell@codesourcery.com>
+	    Joseph Myers  <joseph@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_compare_mapping): Compare first on vma,
+	then on type.
+
+2007-08-28  Robert Sebastian Gerus  <arachnist@gmail.com>
+
+	* config.bfd: Add support for i[3-7]86-*-dragonfly*.
+	* configure.in: Likewise.
+	* configure: Regenerate.
+
+2007-08-25  Ulrich Weigand  <uweigand@de.ibm.com>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (elfcore_grok_spu_note): New function.
+	(elf_parse_notes): Call it.
+
+2007-08-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Adjust
+	indentation.
+
+2007-08-24  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+	* elf.c (elfcore_grok_win32pstatus): Remove HAVE_WIN32_PSTATUS_T
+	guard.  Make it host independent.
+	(elfcore_grok_note): Remove HAVE_WIN32_PSTATUS_T guard around
+	NT_WIN32PSTATUS.
+
+2007-08-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elf-bfd.h (struct elf_obj_tdata): New BUILD_ID_SIZE, BUILD_ID.
+	* elf.c (elfcore_read_notes): Split to ...
+	(elf_read_notes) ... here ...
+	(elf_parse_notes): ... and here.  Check `bfd_get_format (abfd)' with
+	the former subfunctions called only for BFD_CORE.
+	Call ELFOBJ_GROK_GNU_NOTE for BFD_OBJECT files with the owner "GNU".
+	(_bfd_elf_make_section_from_shdr): Call ELF_PARSE_NOTES for SHT_NOTEs.
+	(bfd_section_from_phdr): Update the call for renamed ELFCORE_READ_NOTES.
+	(elfobj_grok_gnu_build_id, elfobj_grok_gnu_note): New functions.
+	Code advisory: Roland McGrath
+
+2007-08-24  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf64-mips.c (elf_backend_sign_extend_vma): Define.
+
+2007-08-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* elfxx-ia64.c (elfNN_ia64_add_symbol_hook): Warning fix.
+
+2007-08-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerated.
+
+2007-08-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c: Include "bfd_stdint.h".
+	(elf_i386_rtype_to_howto): New function.
+	(elf_i386_info_to_howto_rel): Use it.
+	(x86_64_opcode16): New union type.
+	(elf_i386_check_tls_transition): New function.
+	(elf_i386_tls_transition): Updated to check transition and
+	issue an error if a transition isn't supported.
+	(elf_i386_check_relocs): Return FALSE if
+	elf_i386_tls_transition returns FALSE.
+	(elf_i386_gc_sweep_hook): Likewise.
+	(elf_i386_relocate_section): Likewise. Remove BFD_ASSERT
+	on TLS transitions.
+
+	* elf64-x86-64.c: Include "bfd_stdint.h".
+	(x86_64_opcode16): New union type.
+	(x86_64_opcode32): Likewise.
+	(elf64_x86_64_check_tls_transition): New function.
+	(elf64_x86_64_tls_transition): Updated to check transition and
+	issue an error if a transition isn't supported.
+	(elf64_x86_64_check_relocs): Return FALSE if
+	elf64_x86_64_tls_transition returns FALSE.
+	(elf64_x86_64_gc_sweep_hook): Likewise.
+	(elf64_x86_64_relocate_section): Likewise. Remove BFD_ASSERT
+	on TLS transitions.
+
+2007-08-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c: Convert to ISO C90 prototypes.
+	(elfNN_hpux_backend_section_from_bfd_section): Make it static.
+
+2007-08-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c: Remove trailing whitespace.
+	* elfxx-ia64.c: Likewise.
+
+2007-08-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_tls_transition): Accept a pointer
+	to ELF hash entry instead of an integer for local test.
+	(elf_i386_check_relocs): Updated.
+	(elf_i386_gc_sweep_hook): Likewise.
+	(elf_i386_relocate_section): Likewise.
+
+	* elf64-x86-64.c  (elf64_x86_64_tls_transition): Accept a
+	pointer to ELF hash entry instead of an integer for local
+	test.
+	(elf64_x86_64_check_relocs): Updated.
+	(elf64_x86_64_gc_sweep_hook): Likewise.
+	(elf64_x86_64_relocate_section): Likewise.
+
+2007-08-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_tls_transition): Break long line.
+	* elf64-x86-64.c (elf64_x86_64_tls_transition): Likewise.
+
+2007-08-20  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elfxx-target.h [ELF_COMMONPAGESIZE && ELF_MAXPAGESIZE]
+	(ELF_MINPAGESIZE): Fixed its size guess.  Sanity checked its size.
+	(ELF_COMMONPAGESIZE, ELF_MAXPAGESIZE): Sanity checked their size.
+
+2007-08-20  Nick Clifton  <nickc@redhat.com>
+
+	* elflink.c (elf_fixup_link_order): Rewrite conversion of
+	s->alignment_power into an offset mask in order to avoid a gcc
+	error message.
+
+2007-08-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* config.bfd: Handle sparcv*-*-linux-* the same as sparc-*-linux-*.
+	Change sparc64-*-linux-* to sparc64*-*-linux-*.
+
+2007-08-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* po/Make-in: Add --msgid-bugs-address to xgettext invocation.
+
+2007-08-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c: Revert last change.
+
+2007-08-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (get_segment_type): Change PT_GNU_STACK to PT_GNU_ATTR.
+	(bfd_section_from_phdr): Likewise.
+	(get_program_header_size): Likewise. Add a PT_GNU_ATTR segment
+	if there is an attribute section.
+	(_bfd_elf_map_sections_to_segments): Likewise.
+	(IS_SECTION_IN_INPUT_SEGMENT): Likewise.
+
+2007-08-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/4918
+	* elf32-i386.c (elf_i386_relocate_section): Allow R_386_PC32
+	on ___tls_get_addr for GD->LE/LD->LE transitions when not
+	building shared library.
+
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Allow
+	R_X86_64_PC32 on __tls_get_addr for GD->LE/LD->LE transitions
+	when not building shared library.
+
+2007-08-14  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elfcode.h (NAME(_bfd_elf,bfd_from_remote_memory)): LOADBASE is now
+	initialized only on the first PT_LOAD.  New variable LOADBASE_SET.
+	Removed PF_R checking for IA-64 vDSOs as redundant now.
+	Code advisory: Roland McGrath
+
+2007-08-13  Richard Sandiford  <richard@codesourcery.com>
+
+	* elfxx-mips.c (mips_elf_link_hash_table): Add computed_got_sizes.
+	(mips_elf_record_global_got_symbol): Increment local_gotno for
+	each forced-local symbol.
+	(_bfd_mips_elf_check_relocs): Pass forced-local call symbols to
+	mips_elf_record_global_got_symbol for VxWorks too.
+	(_bfd_mips_elf_always_size_sections): Set computed_got_sizes
+	to true after computing the GOT size.
+	(_bfd_mips_elf_hide_symbol): Increase local_gotno whenever
+	got.offset == 1.  Only adjust global_gotno if computed_got_sizes.
+	For VxWorks, add a local entry when hiding a symbol that needs a
+	plt but has not been marked as needing a global got entry.
+	(_bfd_mips_elf_link_hash_table_create): Set computed_got_sizes to
+	false.
+
+2007-08-12  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* coffgen.c (coff_get_normalized_symtab): Correct cast.
+
+2007-08-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (elf_modify_segment_map): Add remove_empty_load param.
+	Don't remove empty PT_LOAD header if false.
+	(_bfd_elf_map_sections_to_segments): If user phdrs, pass false
+	to elf_modify_segment_map.
+	(assign_file_positions_for_load_sections): Pass false to
+	elf_modify_segment_map.
+
+2007-08-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ADDI_R12_R12, LD_R11_0R2, LD_R2_0R2): Define.
+	Update stub comments.
+	(build_plt_stub): Build two variants, one without "addis".
+	(ppc_build_one_stub): Build stubs without "addis" if possible.
+	(ppc_size_one_stub): Size new stubs.
+
+2007-08-11  Richard Sandiford  <richard@codesourcery.com>
+
+	* config.bfd (sh-*-vxworks): Define targ_underscore to "yes".
+
+2007-08-09  Michael Snyder  <msnyder@access-company.com>
+
+	* aoutx.h (aout_get_external_symbols): Return if count is zero.
+
+2007-08-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/4909
+	* elf.c (print_segment_map): New function.
+	(assign_file_positions_for_load_sections): Call print_segment_map
+	when a section can't be allocated in segment.
+
+2007-08-09  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* opncls.c (bfd_openr_iovec): Fix the OPEN parameter macro expansion.
+
+2007-08-07  Nick Clifton  <nickc@redhat.com>
+
+	* po/bfd.pot: Updated template.
+	* po/BLD-POTFILES.in: Regenerate.
+
+2007-08-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c: (_bfd_elf_make_section_from_phdr): Properly handle
+	bss segments.
+
+2007-08-06  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.am (BUILD_HFILES): Clean bfd_stdint.h.
+	* Makefile.in: Regenerated.
+
+2007-08-06  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* configure.in: Update version to 2.18.50.
+	* configure: Regenerated.
+
+2007-08-06  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_link_hash_entry): Add
+	plt_maybe_thumb_refcount.
+	(elf32_arm_link_hash_newfunc): Set plt_maybe_thumb_refcount.
+	(elf32_arm_copy_indirect_symbol): Ditto.
+	(elf32_arm_adjust_dynamic_symbol): Ditto.
+	(bfd_elf32_arm_process_before_allocation): Handle R_ARM_THM_JUMP24.
+	(arm_add_to_rel): Ditto.
+	(elf32_arm_final_link_relocate): Merge R_ARM_THM_JUMP24 with
+	R_ARM_THM_CALL.  Handle R_ARM_THM_JUMP19 against a PLT stub.
+	(elf32_arm_gc_sweep_hook): Call check_use_blx.  Update plt counts
+	for R_ARM_THM_JUMP24 and R_ARM_THM_JUMP19.
+	(elf32_arm_check_relocs): Update plt counts for R_ARM_THM_JUMP24
+	and R_ARM_THM_JUMP19.  
+	(allocate_dynrelocs): Use plt_maybe_thumb_refcount.
+	(elf32_arm_finish_dynamic_symbol): Ditto.
+	(elf32_arm_output_plt_map): Ditto.
+
+2007-08-06  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf.c (rewrite_elf_program_header): Handle sections not sorted
+	by address.
+	(copy_elf_program_header): Likewise.
+
+2007-08-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (xvec_get_elf_backend_data): Add const.
+
+	* elfcode.h (elf_object_p): Use xvec_get_elf_backend_data.
+	* elfcore.h (elf_core_file_p): Likewise.
+
+2007-08-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* coffcode.h (ALIGN_SET): Removed.
+	(ELIFALIGN_SET): Likewise.
+	(coff_set_alignment_hook): Handle IMAGE_SCN_ALIGN_128BYTES,
+	IMAGE_SCN_ALIGN_256BYTES, IMAGE_SCN_ALIGN_512BYTES,
+	IMAGE_SCN_ALIGN_1024BYTES, IMAGE_SCN_ALIGN_2048BYTES,
+	IMAGE_SCN_ALIGN_4096BYTES and IMAGE_SCN_ALIGN_8192BYTES.
+
+2007-08-01  Michael Snyder  <msnyder@access-company.com>
+
+	* vms-tir.c (new_section): Fix cut and paste error.
+
+	* aoutx.h (aout_link_add_symbols): Return if count is zero.
+
+	* elf.c (bfd_elf_print_symbol): Macro dereferences pointer, so
+	pointer must be non-null.
+
+2007-08-01  Tristan Gingold  <gingold@adacore.com>
+
+	* coffcode.h (coff_sort_func_alent): New function.
+	(coff_slurp_line_table): Sort line table if not already sorted.
+
+2007-08-01  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf.c (_bfd_elf_map_sections_to_segments): Work around buggy
+	GCC 3.4.x warning.
+
+2007-08-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* aoutx.h (swap_ext_reloc_in): Set howto to NULL for unknown
+	r_type.
+	(swap_std_reloc_in): Likewise.
+	(aout_link_input_section_std): Likewise.  Return with an error
+	on unexpected relocation type.
+	(aout_link_input_section_ext): Likewise.
+
+2007-08-01  Alan Modra  <amodra@bigpond.net.au>
+
+	PR4694
+	* aoutx.h (final_link): Write a zero in first word of
+	stringtab if no symbols rather than corrupting last byte
+	of text/data.
+
+2007-07-31  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf.c (get_program_header_size): Adjacent loadable .note*
+	sections need just one PT_NOTE segment.
+	(_bfd_elf_map_sections_to_segments): Likewise.
+
+2007-07-30  Michael Snyder  <msnyder@access-company.com>
+
+	* coffgen.c (_bfd_coff_read_internal_relocs): Revert change of
+	2007-07-26.  Buffer still in use, can't be freed.
+
+2007-07-27  Michael Snyder  <msnyder@access-company.com>
+
+	* cofflink.c (coff_link_add_symbols): Return if count is zero.
+
+	* coff-i386.c (coff_i386_rtype_to_howto): Off by one error.
+
+	* aoutx.h (slurp_symbol_table): Return if count == 0.
+
+	* coffgen.c (_bfd_coff_read_internal_relocs): Return if count is zero.
+
+	* elf32-i386.c (elf_i386_check_relocs): Check for null pointer.
+
+2007-07-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config.bfd (x86_64-*-mingw*): Don't include x86_64coff_vec.
+
+2007-07-26  Michael Snyder  <msnyder@access-company.com>
+
+	* coff-i386.c (coff_i386_rtype_to_howto): Guard against null.
+
+	* linker.c (bfd_section_already_linked_table_insert): Change 
+	return type from void to boolean.  Return FALSE on failure.
+	(_bfd_generic_section_already_linked): Test return value of
+	bfd_section_already_linked_table_insert, call fatal on error.
+
+	* elflink.c (_bfd_elf_section_already_linked): Test return value
+	of bfd_section_already_linked_table_insert, call fatal on error.
+
+	* libbfd-in.h (bfd_section_already_linked_table_insert): Update
+	return type to bfd_boolean.
+
+	* libbfd.h: Regenerate.
+
+2007-07-26  Adam Nemet  <anemet@caviumnetworks.com>
+
+	* archive.c (do_slurp_bsd_armap, do_slurp_coff_armap,
+	bfd_slurp_armap): Improve function comment.
+
+2007-07-26  Michael Snyder  <msnyder@access-company.com>
+
+	* linker.c (already_linked_newfunc): Check for NULL return from
+	bfd_hash_allocate.
+
+	* coffgen.c (fixup_symbol_value): Guard against null; 
+	bfd_is_com_section will dereference the section pointer.
+
+	* syms.c (bfd_decode_symclass): Guard against NULL, since 
+	bfd_is_com_section dereferences the pointer.
+
+	* srec.c (srec_scan): Check for EOF (critical because return value
+	will be used as array index).
+
+	* coffgen.c (_bfd_coff_read_internal_relocs): If internal_relocs
+	are not to be cached, free the temporary buffer.
+
+	* aoutx.h (slurp_reloc_table): Return TRUE if reloc_size == zero
+	or count == zero.
+
+	* tekhex.c (first_phase): Check return value for null.
+
+	* elf.c (_bfd_elf_get_synthetic_symtab): Remove meaningless 
+	pointer increment.
+
+2007-07-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (_bfd_elf_fix_symbol_flags): Remove unnecessary
+	check on dynobj.  Remove bed shadow.
+
+	* srec.c (srec_get_section_contents): Return immediately on
+	count zero.  Check that offset and count are within section.
+	* libbfd.c (_bfd_generic_get_section_contents): Check that
+	offset + count does not overflow.
+
+	* srec.c (srec_canonicalize_symtab): Don't alloc when symcount
+	is zero.  Correct return value on error.
+	* mmo.c (mmo_canonicalize_symtab): Likewise.
+	* binary.c (binary_canonicalize_symtab) Correct return on error.
+
+2007-07-26  Thiemo Seufer  <ths@mips.com>
+
+	* bfd.c (_bfd_set_gp_value): Use abort instead of BFD_FAIL.
+
+2007-07-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* reloc.c (bfd_generic_get_relocated_section_contents): Avoid
+	bfd_canonicalize_reloc call when bfd_get_reloc_upper_bound
+	says there are no relocs.
+
+2007-07-26  Doug Kwan  <dougkwan@google.com>
+
+	Speed up bfd_dwarf2_find_line.
+	* dwarf2.c (struct dwarf2_debug): Add new fields to support function
+	and variable info hash tables. Add last_comp_unit, info_hash_count,
+	funcinfo_hash_table, varinfo_hash_table, hash_units_head.
+	(struct comp_unit): Add prev_unit, cached.
+	(struct info_list_node, struct info_hash_entry,
+	struct info_hash_table): New.
+	(info_hash_table_newfunc, create_info_hash_table,
+	insert_info_hash_table, lookup_info_hash_table): New functions
+	implementing function and variable info hash tables.
+	(scan_unit_for_symbols): Add checks to make sure hash tables are
+	consistent with compilation units.
+	(comp_unit_maybe_decode_line_info): New function.
+	(comp_unit_find_line): Use comp_unit_maybe_decode_line_info.
+	(reverse_funcinfo_list, reverse_varinfo_list, comp_unit_hash_info,
+	info_hash_lookup_funcinfo, info_hash_lookup_varinfo,
+	stash_maybe_update_info_hash_table, stash_verify_info_hash_table,
+	stash_maybe_enable_info_hash_tables, stash_find_line_fast): New
+	functions. Make use of info hash tables to speed up
+	bfd_dwarf2_find_line.
+	(find_line): Use hash table for faster lookup if it is turned on.
+	Also add code to maintain bi-directional link in comp units.
+
+2007-07-25  Michael Snyder  <msnyder@access-company.com>
+
+	* coffgen.c (_bfd_coff_get_external_symbols): Nothing to be done
+	if size == 0; return and avoid possible null pointer issues.
+
+2007-07-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* linker.c (generic_link_add_symbol_list): Warning fix.
+
+2007-07-24  Michael Snyder  <msnyder@access-company.com>
+
+	* opncls.c (bfd_make_writable): Check return from bfd_malloc.
+
+	* elflink.c (bfd_elf_final_link): Avoid redundant frees -- return
+	on bfd_malloc error rather than goto error_return.
+
+2007-07-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (_bfd_elf_link_just_syms, merge_sections_remove_hook,
+	_bfd_elf_merge_sections, _bfd_elf_link_hash_newfunc,
+	_bfd_elf_link_hash_copy_indirect, _bfd_elf_link_hash_hide_symbol,
+	_bfd_elf_link_hash_table_init, _bfd_elf_link_hash_table_create,
+	bfd_elf_set_dt_needed_name, bfd_elf_get_dyn_lib_class,
+	bfd_elf_set_dyn_lib_class, bfd_elf_get_needed_list,
+	bfd_elf_get_runpath_list, bfd_elf_get_dt_soname,
+	bfd_elf_get_bfd_needed_list, struct elf_symbuf_symbol,
+	struct elf_symbuf_head, struct elf_symbol, elf_sort_elf_symbol,
+	elf_sym_name_compare, elf_create_symbuf,
+	bfd_elf_match_symbols_in_sections,
+	_bfd_elf_match_sections_by_type): Move to here..
+	* elf.c: ..from here.
+
+2007-07-23  Richard Sandiford  <richard@codesourcery.com>
+
+	* elflink.c (_bfd_elf_fix_symbol_flags): Only assert the type
+	of weakdef->root.type if weakdef has no regular definition.
+
+2007-07-22  Adam Nemet  <anemet@caviumnetworks.com>
+
+	* elfxx-mips.c (struct mips_elf_link_hash_table): Add new field
+	small_data_overflow_reported.
+	(_bfd_mips_elf_link_hash_table_create): Initialize it.
+	(_bfd_mips_elf_relocate_section) <bfd_reloc_overflow>: Report
+	small-data section overflow.
+
+2007-07-19  Doug Kwan  <dougkwan@google.com>
+
+	PR binutils/4797
+	* dwarf2.c: (find_line) Do not dereference functionname_ptr if
+	do_line is true.
+
+2007-07-18  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (xtensa_callback_required_dependence): Ignore
+	non-ELF sections.
+
+2007-07-18  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_xtensa_finish_dynamic_sections): Get section
+	vma and size for dynamic tags from the output sections.
+
+2007-07-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct sym_sec_cache): Delete "sec".  Add "shndx".
+	* elf.c (bfd_section_from_r_symndx): Don't cache bfd section of
+	symbol.  Instead cache ELF section index.  Remove redundant
+	checks of st_shndx.
+
+2007-07-15  Mike Frysinger  <vapier@gentoo.org>
+
+	* trad-core.c (NBPG): If not defined, set to getpagesize().
+
+2007-07-13  Roland McGrath  <roland@redhat.com>
+
+	* elf-bfd.h (struct elf_obj_tdata): Revert last change.
+	Add after_write_object_contents, after_write_object_contents_info.
+	* elf.c (_bfd_elf_write_object_contents): Revert last change.
+	Instead, call after_write_object_contents if set.
+
+2007-07-12  Kai Tietz   <kai.tietz@onevision.com>
+
+	* bfd-in.h: (BFD_HOST_64BIT_LONG_LONG): New.
+	(BFD_HOSTPTR_T): Host pointer type for casting a
+	pointer to an integer type.
+	(bfd_hostptr_t): The typedef of BFD_HOSTPTR_T.
+	(sprintf_vma, fprintf_vma): Add support for long long prints.
+	* bfd-in2.h: Regenerate.
+	* configure.in: (BFD_HOST_64BIT_LONG_LONG): New.
+	(BFD_HOSTPTR_T): Host pointer type for casting a
+	pointer to an integer type. Default is "unsigned long".
+	(AC_CHECK_SIZEOF(void *)): New.
+	(host64): Set it if the pointer size is 8.
+	* configure: Regenerate.
+	* config.in: Add macro SIZEOF_VOID_P.
+	* coffcode.h: Replace host ptr type assuming "long" with
+	bfd_hostptr_t type.
+	* coffgen.c: Likewise.
+	* elf-eh-frame.c: Likewise.
+	* peicode.h: Likewise.
+
+2007-07-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.in: Regenerated.
+
+2007-07-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/4756
+	* simple.c (bfd_simple_get_relocated_section_content): Don't
+	apply relocation on executable and shared library.
+
+2007-07-10  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Don't eliminate
+	copy relocs on vxworks.
+
+2007-07-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-arm.c (elf32_arm_size_info): Init checksum_contents field.
+	* elf64-alpha.c (alpha_elf_size_info): Likewise.
+	* elf64-hppa.c (hppa64_elf_size_info): Likewise.
+	* elf64-mips.c (mips_elf64_size_info): Likewise.
+	* elf64-s390.c (s390_elf64_size_info): Likewise.
+	* elf64-sparc.c (elf64_sparc_size_info): Likewise.
+
+2007-07-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (bfd_elf_record_link_assignment): Handle indirect
+	symbol.
+	(_bfd_elf_merge_symbol): Properly update normal symbol when
+	overriding the versioned symbol from a dynamic library.
+
+2007-07-09  Roland McGrath  <roland@redhat.com>
+
+	* elf-bfd.h (struct elf_obj_tdata): Add members
+	emit_note_gnu_build_id and note_gnu_build_id_sec.
+	* elf.c (_bfd_id_note_section_size): New global function.
+	(read_hex, _bfd_elf_write_build_id_section): New static functions.
+	(_bfd_elf_write_object_contents): Call _bfd_elf_write_build_id_section
+	if emit_note_gnu_build_id is set.
+	* Makefile.am (elf.lo): Update dependencies.
+
+	* elf-bfd.h (struct elf_size_info): Add checksum_contents hook.
+	(bfd_elf32_checksum_contents, bfd_elf64_checksum_contents): Declare.
+	* elfcode.h (elf_checksum_contents): New macro and function.
+	(NAME(_bfd_elf,size_info)): Initialize checksum_contents hook.
+
+2007-07-06  Michael Snyder  <msnyder@access-company.com>
+
+	* elflink.c (elf_link_add_object_symbols): Return via
+	error_free_vers on "notice" failure.
+
+2007-07-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* peicode.h (pe_bfd_object_p): Don't check PE vs. EFI target
+	if arch is unknown.
+
+2007-07-04  Nick Clifton  <nickc@redhat.com>
+
+	Import this patch from an internal tree:
+
+	2001-07-17  Richard Henderson  <rth@redhat.com>
+
+	* elf32-mep.c (mep_final_link_relocate) [R_MEP_HI16S]: Correctly
+	compensate for high bit set in R_MEP_LOW16.
+
+2007-07-03  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_merge_eabi_attributes): Copy type from
+	input attributes if value has been copied.
+
+2007-07-03  Nick Clifton  <nickc@redhat.com>
+
+	* COPYING: Replace with GPLv3 text.
+	* aix386-core.c: Update copyright notice to refer to GPLv3.
+	* aix5ppc-core.c, aout0.c, aout32.c, aout64.c, aout-adobe.c,
+	aout-arm.c, aout-cris.c, aoutf1.h, aout-ns32k.c, aout-sparcle.c,
+	aout-target.h, aout-tic30.c, aoutx.h, archive64.c, archive.c,
+	archures.c, armnetbsd.c, bfd.c, bfd-in.h, bfdio.c, bfdwin.c,
+	binary.c, bout.c, cache.c, cf-i386lynx.c, cf-sparclynx.c,
+	cisco-core.c, coff64-rs6000.c, coff-alpha.c, coff-apollo.c,
+	coff-arm.c, coff-aux.c, coffcode.h, coffgen.c, coff-go32.c,
+	coff-h8300.c, coff-h8500.c, coff-i386.c, coff-i860.c, coff-i960.c,
+	coff-ia64.c, cofflink.c, coff-m68k.c, coff-m88k.c, coff-maxq.c,
+	coff-mcore.c, coff-mips.c, coff-or32.c, coff-pmac.c, coff-ppc.c,
+	coff-rs6000.c, coff-sh.c, coff-sparc.c, coff-stgo32.c,
+	coff-svm68k.c, coffswap.h, coff-tic30.c, coff-tic4x.c,
+	coff-tic54x.c, coff-tic80.c, coff-u68k.c, coff-w65.c,
+	coff-we32k.c, coff-x86_64.c, coff-z80.c, coff-z8k.c, corefile.c,
+	cpu-alpha.c, cpu-arc.c, cpu-arm.c, cpu-avr.c, cpu-bfin.c,
+	cpu-cr16.c, cpu-cr16c.c, cpu-cris.c, cpu-crx.c, cpu-d10v.c,
+	cpu-d30v.c, cpu-dlx.c, cpu-fr30.c, cpu-frv.c, cpu-h8300.c,
+	cpu-h8500.c, cpu-hppa.c, cpu-i370.c, cpu-i386.c, cpu-i860.c,
+	cpu-i960.c, cpu-ia64.c, cpu-ia64-opc.c, cpu-ip2k.c, cpu-iq2000.c,
+	cpu-m10200.c, cpu-m10300.c, cpu-m32c.c, cpu-m32r.c, cpu-m68hc11.c,
+	cpu-m68hc12.c, cpu-m68k.c, cpu-m88k.c, cpu-maxq.c, cpu-mcore.c,
+	cpu-mep.c, cpu-mips.c, cpu-mmix.c, cpu-msp430.c, cpu-mt.c,
+	cpu-ns32k.c, cpu-openrisc.c, cpu-or32.c, cpu-pdp11.c, cpu-pj.c,
+	cpu-powerpc.c, cpu-rs6000.c, cpu-s390.c, cpu-score.c, cpu-sh.c,
+	cpu-sparc.c, cpu-spu.c, cpu-tic30.c, cpu-tic4x.c, cpu-tic54x.c,
+	cpu-tic80.c, cpu-v850.c, cpu-vax.c, cpu-w65.c, cpu-we32k.c,
+	cpu-xc16x.c, cpu-xstormy16.c, cpu-xtensa.c, cpu-z80.c, cpu-z8k.c,
+	demo64.c, doc/chew.c, dwarf1.c, dwarf2.c, ecoff.c, ecofflink.c,
+	ecoffswap.h, efi-app-ia32.c, efi-app-ia64.c, efi-app-x86_64.c,
+	elf32-am33lin.c, elf32-arc.c, elf32-arm.c, elf32-avr.c,
+	elf32-avr.h, elf32-bfin.c, elf32.c, elf32-cr16.c, elf32-cr16c.c,
+	elf32-cris.c, elf32-crx.c, elf32-d10v.c, elf32-d30v.c,
+	elf32-dlx.c, elf32-fr30.c, elf32-frv.c, elf32-gen.c,
+	elf32-h8300.c, elf32-hppa.c, elf32-hppa.h, elf32-i370.c,
+	elf32-i386.c, elf32-i860.c, elf32-i960.c, elf32-ip2k.c,
+	elf32-iq2000.c, elf32-m32c.c, elf32-m32r.c, elf32-m68hc11.c,
+	elf32-m68hc12.c, elf32-m68hc1x.c, elf32-m68hc1x.h, elf32-m68k.c,
+	elf32-m88k.c, elf32-mcore.c, elf32-mep.c, elf32-mips.c,
+	elf32-msp430.c, elf32-mt.c, elf32-openrisc.c, elf32-or32.c,
+	elf32-pj.c, elf32-ppc.c, elf32-ppc.h, elf32-s390.c, elf32-score.c,
+	elf32-sh64.c, elf32-sh64-com.c, elf32-sh64.h, elf32-sh.c,
+	elf32-sh-symbian.c, elf32-sparc.c, elf32-spu.c, elf32-spu.h,
+	elf32-v850.c, elf32-vax.c, elf32-xc16x.c, elf32-xstormy16.c,
+	elf32-xtensa.c, elf64-alpha.c, elf64.c, elf64-gen.c, elf64-hppa.c,
+	elf64-hppa.h, elf64-mips.c, elf64-mmix.c, elf64-ppc.c,
+	elf64-ppc.h, elf64-s390.c, elf64-sh64.c, elf64-sparc.c,
+	elf64-x86-64.c, elf-attrs.c, elf-bfd.h, elf.c, elfcode.h,
+	elfcore.h, elf-eh-frame.c, elf-hppa.h, elflink.c, elf-m10200.c,
+	elf-m10300.c, elfn32-mips.c, elf-strtab.c, elf-vxworks.c,
+	elf-vxworks.h, elfxx-ia64.c, elfxx-mips.c, elfxx-mips.h,
+	elfxx-sparc.c, elfxx-sparc.h, elfxx-target.h, epoc-pe-arm.c,
+	epoc-pei-arm.c, format.c, freebsd.h, gen-aout.c, genlink.h,
+	hash.c, host-aout.c, hosts/alphavms.h, hp300bsd.c, hp300hpux.c,
+	hppabsd-core.c, hpux-core.c, i386aout.c, i386bsd.c, i386dynix.c,
+	i386freebsd.c, i386linux.c, i386lynx.c, i386mach3.c, i386msdos.c,
+	i386netbsd.c, i386os9k.c, ieee.c, ihex.c, init.c, irix-core.c,
+	libaout.h, libbfd.c, libbfd-in.h, libcoff-in.h, libecoff.h,
+	libhppa.h, libieee.h, libnlm.h, liboasys.h, libpei.h, libxcoff.h,
+	linker.c, lynx-core.c, m68k4knetbsd.c, m68klinux.c, m68knetbsd.c,
+	m88kmach3.c, m88kopenbsd.c, mach-o.c, mach-o.h, mach-o-target.c,
+	mep-relocs.pl, merge.c, mipsbsd.c, mmo.c, netbsd-core.c, netbsd.h,
+	newsos3.c, nlm32-alpha.c, nlm32.c, nlm32-i386.c, nlm32-ppc.c,
+	nlm32-sparc.c, nlm64.c, nlm.c, nlmcode.h, nlmswap.h, nlm-target.h,
+	ns32k.h, ns32knetbsd.c, oasys.c, opncls.c, osf-core.c,
+	pc532-mach.c, pdp11.c, pe-arm.c, pe-arm-wince.c, pef.c, pef.h,
+	pef-traceback.h, pe-i386.c, pei-arm.c, pei-arm-wince.c, peicode.h,
+	pei-i386.c, pei-mcore.c, pei-mips.c, pei-ppc.c, pei-sh.c,
+	pei-x86_64.c, pe-mcore.c, pe-mips.c, pe-ppc.c, pe-sh.c,
+	pe-x86_64.c, peXXigen.c, ppcboot.c, ptrace-core.c, reloc16.c,
+	reloc.c, riscix.c, rs6000-core.c, sco5-core.c, section.c,
+	simple.c, som.c, som.h, sparclinux.c, sparclynx.c, sparcnetbsd.c,
+	srec.c, stabs.c, stab-syms.c, stamp-h.in, sunos.c, syms.c,
+	sysdep.h, targets.c, targmatch.sed, tekhex.c, ticoff.h,
+	trad-core.c, vax1knetbsd.c, vaxbsd.c, vaxnetbsd.c, versados.c,
+	vms.c, vms-gsd.c, vms.h, vms-hdr.c, vms-misc.c, vms-tir.c,
+	xcofflink.c, xcoff-target.h, xsym.c, xsym.h, xtensa-isa.c,
+	xtensa-modules.c: Likewise.
+	* elf32-sh-relocs.h: Add copyright notice.
+	* hosts/alphalinux.h, hosts/decstation.h, hosts/delta68.h,
+	hosts/dpx2.h, hosts/hp300bsd.h, hosts/i386bsd.h,
+	hosts/i386linux.h, hosts/i386mach3.h, hosts/i386sco.h,
+	hosts/i860mach3.h, hosts/m68kaux.h, hosts/m68klinux.h,
+	hosts/m88kmach3.h, hosts/mipsbsd.h, hosts/mipsmach3.h,
+	hosts/news.h, hosts/news-mips.h, hosts/pc532mach.h,
+	hosts/riscos.h, hosts/symmetry.h, hosts/tahoe.h, hosts/vaxbsd.h,
+	hosts/vaxlinux.h, hosts/vaxult2.h, hosts/vaxult.h: Likewise.
+	* bfd-in2.h, libbfd.h, libcoff.h: Regenerate.
+
+2007-07-02  Joseph Myers  <joseph@codesourcery.com>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): Handle
+	R_MIPS_TLS_DTPREL32 and R_MIPS_TLS_DTPREL64.
+	* elf64-mips.c (mips_elf64_howto_table_rela): Support
+	R_MIPS_TLS_DTPREL64.
+
+2007-07-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* aclocal.m4: Regenerate.
+	* config.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+	* po/bfd.pot: Regenerate.
+
+2007-07-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Tidy
+	symsec != NULL tests.
+
+2007-07-02  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 4712
+	* elf.c (assign_file_positions_for_load_sections): Adjust lma
+	by p_vaddr_offset.
+
+2007-06-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* aclocal.m4: Regenerated.
+	* Makefile.in: Likewise.
+
+2007-06-29  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf32-ppc.c (ppc_elf_merge_obj_attributes): New.
+	(ppc_elf_merge_private_bfd_data): Call it.
+
+2007-06-29  Joseph Myers  <joseph@codesourcery.com>
+
+	* elfxx-mips.c (mips_elf_merge_obj_attributes): New.
+	(_bfd_mips_elf_merge_private_bfd_data): Call it.
+
+2007-06-29  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf-attrs.c: New.
+	* Makefile.am (BFD32_BACKENDS): Add elf-attrs.lo.
+	(BFD32_BACKENDS_CFILES): Add elf-attrs.c.
+	(elf-attrs.lo): Generate dependencies.
+	* Makefile.in: Regenerate.
+	* configure.in (elf): Add elf-attrs.lo.
+	* configure: Regenerate.
+	* elf-bfd.h (struct elf_backend_data): Add entries for object
+	attributes.
+	(NUM_KNOWN_OBJ_ATTRIBUTES, obj_attribute, obj_attribute_list,
+	OBJ_ATTR_PROC, OBJ_ATTR_GNU, OBJ_ATTR_FIRST, OBJ_ATTR_LAST,
+	Tag_NULL, Tag_File, Tag_Section, Tag_Symbol, Tag_compatibility):
+	New.
+	(struct elf_obj_tdata): Add entries for object attributes.
+	(elf_known_obj_attributes, elf_other_obj_attributes,
+	elf_known_obj_attributes_proc, elf_other_obj_attributes_proc):
+	New.
+	(bfd_elf_obj_attr_size, bfd_elf_set_obj_attr_contents,
+	bfd_elf_get_obj_attr_int, bfd_elf_add_obj_attr_int,
+	bfd_elf_add_proc_attr_int, bfd_elf_add_obj_attr_string,
+	bfd_elf_add_proc_attr_string, bfd_elf_add_obj_attr_compat,
+	bfd_elf_add_proc_attr_compat, _bfd_elf_attr_strdup,
+	_bfd_elf_copy_obj_attributes, _bfd_elf_obj_attrs_arg_type,
+	_bfd_elf_parse_attributes, _bfd_elf_merge_object_attributes): New.
+	* elf.c (_bfd_elf_copy_private_bfd_data): Copy object attributes.
+	(bfd_section_from_shdr): Handle attributes sections.
+	* elflink.c (bfd_elf_final_link): Handle attributes sections.
+	* elfxx-target.h (elf_backend_obj_attrs_vendor,
+	elf_backend_obj_attrs_section, elf_backend_obj_attrs_arg_type,
+	elf_backend_obj_attrs_section_type): New.
+	(elfNN_bed): Update.
+	* elf32-arm.c (NUM_KNOWN_ATTRIBUTES, aeabi_attribute,
+	aeabi_attribute_list): Remove.
+	(struct elf32_arm_obj_tdata): Remove object attributes fields.
+	(check_use_blx, bfd_elf32_arm_set_vfp11_fix, using_thumb2,
+	elf32_arm_copy_private_bfd_data, elf32_arm_merge_eabi_attributes):
+	Update for new object attributes interfaces.
+	(uleb128_size, is_default_attr, eabi_attr_size,
+	elf32_arm_eabi_attr_size, write_uleb128, write_eabi_attribute,
+	elf32_arm_set_eabi_attr_contents, elf32_arm_bfd_final_link,
+	elf32_arm_new_eabi_attr, elf32_arm_get_eabi_attr_int,
+	elf32_arm_add_eabi_attr_int, attr_strdup,
+	elf32_arm_add_eabi_attr_string, elf32_arm_add_eabi_attr_compat,
+	copy_eabi_attributes, elf32_arm_parse_attributes): Remove.  Moved
+	to generic code in elf-attrs.c.
+	(elf32_arm_obj_attrs_arg_type): New.
+	(elf32_arm_fake_sections): Do not handle .ARM.attributes.
+	(elf32_arm_section_from_shdr): Do not handle SHT_ARM_ATTRIBUTES.
+	(bfd_elf32_bfd_final_link): Remove.
+	(elf_backend_obj_attrs_vendor, elf_backend_obj_attrs_section,
+	elf_backend_obj_attrs_arg_type,
+	elf_backend_obj_attrs_section_type): New.
+	* elf32-bfin.c (bfin_elf_copy_private_bfd_data): Copy object
+	attributes.
+	* elf32-frv.c (frv_elf_copy_private_bfd_data): Likewise.
+	* elf32-iq2000.c (iq2000_elf_copy_private_bfd_data): Likewise.
+	* elf32-mep.c (mep_elf_copy_private_bfd_data): Likewise.
+	* elf32-mt.c (mt_elf_copy_private_bfd_data): Likewise.
+	* elf32-sh.c (sh_elf_copy_private_data): Likewise.
+	* elf64-sh64.c (sh_elf64_copy_private_data_internal): Likewise.
+
+2007-06-29  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (bfd_elf32_arm_process_before_allocation): Suppress
+	call veneers for call relocations against undefined symbols.
+	(elf32_arm_final_link_relocate): Turn call to undefined symbol
+	into a jump to the next instruction.
+
+2007-06-29  Michael Snyder  <msnyder@access-company.com>
+
+	* bfd.c (bfd_demangle): Plug memory leak (Coverity).
+
+2007-06-29  M R Swami Reddy  <MR.Swami.Reddy@nsc.com>
+
+	* Makefile.am: Add cr16 related entry
+	* Makefile.in: Regenerate
+	* archures.c: Add bfd_cr16_arch
+	* bfd-in2.h: Regenerate
+	* config.bfd: Add cr16-elf
+	* configure.in: Add bfd_elf32_cr16_vec
+	* configure: Regenerate.
+	* targets.c: Added cr16 related information
+	* cpu-cr16.c: New file.
+	* elf32-cr16.c: New file.
+	* reloc.c: Added cr16 relocs.
+
+2007-06-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (_bfd_elf_link_assign_sym_version): Improve error
+	message for undefined version nodes.
+	(elf_gc_sweep): Don't warn when zero size sections are
+	removed.
+
+2007-06-29  Nathan Froyd  <froydnj@codesourcery.com>
+
+	* elf32-ppc.c (ppc_elf_info_to_howto): Check for invalid relocation
+	types.
+
+2007-06-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_fake_sections): New function.
+	(elf_backend_fake_sections): Define.
+
+2007-06-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (assign_file_positions_for_load_sections): Use elf
+	section header sh_size rather than bfd section size, simplifying
+	.tbss handling.
+
+2007-06-29  Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/4701
+	* elf.c (assign_file_positions_for_load_sections): Ensure bss
+	segments meet gABI alignment requirements.  Don't allocate
+	file space for bss sections in a segment also containing file
+	or program headers.
+
+2007-06-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd.c (struct bfd): Rename "next" to "archive_next".
+	* archive.c: Rename uses throughout file.
+	* archive64.c: Likewise.
+	* coff-rs6000.c: Likewise.
+	* ecoff.c: Likewise.
+	* som.c: Likewise.
+	* bfd-in2.h: Regenerate.
+
+	* elf32-ppc.c (ppc_elf_select_plt_layout): Properly iterate over
+	input bfds.
+	* elf32-spu.c (spu_elf_create_sections): Likewise.
+
+2007-06-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* dwarf2.c (find_line): New.  Contains the duplicated code from:
+	(_bfd_dwarf2_find_nearest_line): Use it.
+	(_bfd_dwarf2_find_line): Use it.
+
+2007-06-26  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf32-arm.c (copy_eabi_attributes): Copy type of attributes.
+
+2007-06-25  Richard Sandiford  <richard@codesourcery.com>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): Allow local stubs
+	to be used for calls from MIPS16 code.
+
+2007-06-23  Andreas Schwab  <schwab@suse.de>
+
+	* configure.in (--with-separate-debug-dir): New option.
+	* configure: Regenerate.
+	* Makefile.am (dwarf2.lo): Add rule to pass DEBUGDIR.
+	* Makefile.in: Regenerate.
+	* dwarf2.c (_bfd_dwarf2_find_nearest_line): Pass DEBUGDIR to
+	bfd_follow_gnu_debuglink.
+	(_bfd_dwarf2_find_line): Likewise.
+
+2007-06-22  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf2.c: Add support for reading in debug information via a
+	.gnu_debuglink section:
+	(struct dwarf2_debug): Add bfd field to record the bfd containing
+	the debug info.
+	(parse_comp_unit): Remove ABFD parameter.  Instead use the bfd
+	field in the dwarf2_debug structure.
+	(_bfd_dwarf2_find_nearest_line): If a debug info section could not
+	be found in the current bfd call bfd_follow_gnu_debuglink to see
+	if another file contains the debug information.  If it does, open
+	it and continue.
+	(_bfd_dwarf2_find_line): Likewise.
+
+2007-06-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/4590
+	* elfxx-ia64.c (sort_dyn_sym_info): Keep the valid got_offset
+	when removing duplicated entries.
+	(get_dyn_sym_info): Initialize the got_offset field to -1.
+	Update call to sort_dyn_sym_info.
+	(elfNN_ia64_relocate_section): Call sort_dyn_sym_info to sort
+	array of addend and remove duplicates.
+
+2007-06-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* libpei.h (_bfd_XXi_final_link_postscript): Remove
+	duplication.
+	(bfd_target_pei_p): New.
+	(bfd_target_pei_arch): New
+	(bfd_target_efi_p): Likewise.
+	(bfd_target_efi_arch): New
+	(bfd_pe_executable_p): Use bfd_target_pei_p and
+	bfd_target_efi_p.
+
+	* peicode.h (arch_type): New enum.
+	(pe_arch): New function.
+	(pe_bfd_object_p): Don't match PE/EFI target with EFI/PE file
+	if there is an EFI/PE target.
+
+2007-06-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am (ACLOCAL_AMFLAGS): Add -I . -I ../config.
+
+	* acinclude.m4: Don't include m4 files. Remove libtool
+	kludge.
+
+	* Makefile.in: Regenerated.
+	* aclocal.m4: Likewise.
+	* configure: Likewise.
+
+2007-06-11  Sterling Augustine  <sterling@tensilica.com>
+	    Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (extend_ebb_bounds_forward): Use renamed
+	XTENSA_PROP_NO_TRANSFORM flag instead of XTENSA_PROP_INSN_NO_TRANSFORM.
+	(extend_ebb_bounds_backward, compute_text_actions): Likewise.
+	(compute_ebb_proposed_actions, coalesce_shared_literal): Likewise.
+	(xtensa_get_property_predef_flags): Likewise.
+	(compute_removed_literals): Pass new arguments to is_removable_literal.
+	(is_removable_literal): Add sec, prop_table and ptblsize arguments.
+	Do not remove literal if the NO_TRANSFORM property flag is set.
+
+2007-05-31  Richard Sandiford  <rsandifo@nildram.co.uk>
+
+	* elfxx-mips.c (mips_elf_initialize_tls_index): When processing a
+	type (3) single-GOT entry, read tls_type from the hash table entry
+	rather than the GOT entry.
+
+2007-06-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* simple.c (bfd_simple_get_relocated_section_contents): Init
+	input_bfds_tail.
+
+2007-05-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (elf_fake_sections): Adjust test for SHT_NOBITS sections
+	created by objcopy --only-keep-debug.
+	(_bfd_elf_init_private_section_data): Only change elf_section_type
+	if it is SHT_NULL.
+
+	* elf.c (assign_file_positions_for_load_sections): Correct sh_type
+	to SHT_NOBITS earlier.  Base actions in rest of function on sh_type
+	and sh_flags instead of bfd section flags.  Delete voff and code
+	keeping nobits segments aligned.
+
+2007-05-25  Eric Christopher  <echristo@apple.com>
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame):
+	Check that sym_sec isn't NULL before accessing.
+
+2007-05-24  Steve Ellcey  <sje@cup.hp.com>
+
+	* Makefile.in: Regnerate.
+	* configure: Regenerate.
+	* aclocal.m4: Regenerate.
+	* doc/Makefile.in: Regenerate.
+
+2007-05-22  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (output_arch_syminfo): Replace plt_shndx and plt_offset
+	with sec and sec_shndx.
+	(elf32_arm_ouput_plt_map_sym): Use them.
+	(elf32_arm_output_arch_local_syms): Output mapping symbols for
+	interworking glue.
+
+2007-05-18  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (ARM2THUMB_V5_STATIC_GLUE_SIZE): Define.
+	(a2t1v5_ldr_insn, a2t1v5_ldr_insn): New.
+	(record_arm_to_thumb_glue): Add v5t non-pic glue.
+	(elf32_arm_create_thumb_stub): Ditto.
+
+2007-05-16  H.J. Lu  <hongjiu.lu@intel.com>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (_bfd_elf_adjust_dynamic_copy): Align dynamic bss
+	section to the minimum alignment.
+
+2007-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/4504
+	* elf-bfd.h (_bfd_elf_adjust_dynamic_copy): New.
+	* elflink.c (_bfd_elf_adjust_dynamic_copy): New.
+
+	* elf-m10300.c (_bfd_mn10300_elf_adjust_dynamic_symbol): Call
+	_bfd_elf_adjust_dynamic_copy to adjust for the copy in dynamic
+	bss section.
+	* elf32-arm.c (elf32_arm_adjust_dynamic_symbol): Likewise.
+	* elf32-cris.c (elf_cris_adjust_dynamic_symbol): Likewise.
+	* elf32-hppa.c (elf32_hppa_adjust_dynamic_symbol): Likewise.
+	* elf32-i370.c (i370_elf_adjust_dynamic_symbol): Likewise.
+	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Likewise.
+	* elf32-m32r.c (m32r_elf_adjust_dynamic_symbol): Likewise.
+	* elf32-m68k.c (elf_m68k_adjust_dynamic_symbol): Likewise.
+	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Likewise.
+	* elf32-s390.c (elf_s390_adjust_dynamic_symbol): Likewise.
+	* elf32-sh.c (sh_elf_adjust_dynamic_symbol): Likewise.
+	* elf32-vax.c (elf_vax_adjust_dynamic_symbol): Likewise.
+	* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol): Likewise.
+	* elf64-s390.c (elf_s390_adjust_dynamic_symbol): Likewise.
+	* elf64-sh64.c (sh64_elf64_adjust_dynamic_symbol): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_adjust_dynamic_symbol): Likewise.
+	* elfxx-mips.c (_bfd_mips_vxworks_adjust_dynamic_symbol): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_adjust_dynamic_symbol): Likewise.
+
+2007-05-15  Richard Sandiford  <richard@codesourcery.com>
+
+	* elfxx-mips.c (mips_elf_create_local_got_entry): Remove
+	input_section argument.  Create .rela.dyn relocations against
+	symbol 0 rather than the section symbol.
+	(mips_elf_local_got_index): Remove input_section argument.
+	Update call to mips_elf_create_local_got_entry.
+	(mips_elf_got_page, mips_elf_got16_entry): Likewise.
+	(mips_elf_calculate_relocation): Update calls to
+	mips_elf_local_got_index, mips_elf_got16_entry and mips_elf_got_page.
+
+2007-05-15  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Correctly
+	handle the Thumb-2 JUMP19 relocation.
+
+2007-05-15  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 4479
+	* elf.c (elf_fake_sections): Don't allow backend to change
+	SHT_NOBITS if called for strip/objcopy --only-keep-debug.
+	* elfxx-mips.c (_bfd_mips_elf_fake_sections): Remove similar
+	fix from here.
+
+2007-05-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (bfd_elf_string_from_elf_section): Return NULL on
+	invalid shstrndx.
+	(bfd_elf_get_str_section): Likewise.
+
+2007-05-12  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 4497
+	* elf-eh-frame.c (struct cie): Add "local_personality".  Make
+	"personality" a union.
+	(cie_eq): Compare local_personality too.  Adjust personality
+	comparison.
+	(_bfd_elf_discard_section_eh_frame): Check binding on personality
+	reloc sym to allow for bad symtab.  Use stashed local syms rather
+	than reading personality local sym.  Handle discarded sections.
+
+2007-05-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (elf_howto_table): Add howto for R_SPU_ADDR16X.
+
+2007-05-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.h (ppc_elf_select_plt_layout): Update prototype.
+	(enum ppc_elf_plt_type): Move from..
+	* elf32-ppc.c: ..here.
+	(struct ppc_elf_obj_tdata): Add makes_plt_call and has_rel16.
+	(struct ppc_elf_link_hash_table): Reorder.  Add old_bfd.  Delete
+	can_use_new_plt.  Make is_vxworks a bitfield.
+	(ppc_elf_link_hash_table_create): Don't clear is_vxworks (again).
+	(ppc_elf_check_relocs): Update setting of reloc flags.  Set old_bfd.
+	(ppc_elf_select_plt_layout): Modify parameters.  Use bfd reloc
+	flags to better detect object files needing old bss-style plt.
+	Allow secure plt to be used without rel16 relocs being detected.
+	Warn if secure plt request cannot be allowed.
+
+2007-05-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* reloc.c (BFD_RELOC_SPU_PPU32, BFD_RELOC_SPU_PPU64): Define.
+	* elf-bfd.h (struct elf_backend_data): Change return type of
+	elf_backend_relocate_section to int.
+	* elf32-spu.c (elf_howto_table): Add howtos for R_SPU_PPU32 and
+	R_SPU_PPU64.
+	(spu_elf_bfd_to_reloc_type): Convert new relocs.
+	(spu_elf_count_relocs): New function.
+	(elf_backend_count_relocs): Define.
+	(spu_elf_relocate_section): Arrange to emit R_SPU_PPU32 and
+	R_SPU_PPU64 relocs.
+	* elflink.c (elf_link_input_bfd): Emit relocs if relocate_section
+	returns 2.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2007-05-10  Richard Sandiford  <richard@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_check_relocs): Don't create PLT entries
+	for R_ARM_ABS12 relocs.
+	(elf32_arm_finish_dynamic_symbol): Fix the loop that creates
+	non-shared VxWorks PLT entries.
+
+2007-05-11  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 4454
+	* elf-eh-frame.c (struct cie): Make "personality" a bfd_vma.
+	(_bfd_elf_discard_section_eh_frame): Handle local syms on
+	personality relocation.
+
+2007-05-10  Richard Sandiford  <richard@codesourcery.com>
+
+	* elf.c (assign_file_positions_for_load_sections): Use p_memsz
+	rather than p_filesz to calculate the LMA of the end of a segment.
+
+2007-05-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol): Don't do copyreloc
+	processing if symbol is defined in the executable.
+
+2007-05-10  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-frv.c (_frvfdpic_check_discarded_relocs): New.
+	(frvfdpic_elf_discard_info): New.
+	(elf_backend_discard_info): Define for FDPIC.
+
+2007-05-09  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* elf32-arm.c (bfd_elf32_arm_vfp11_erratum_scan): Don't
+	attempt to scan if the bfd doesn't correspond to an ELF image.
+	(bfd_elf32_arm_vfp11_fix_veneer_locations): Likewise.
+
+2007-05-08  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-frv.c (elf32_frv_relocate_section): Discard dynamic relocs
+	for which _bfd_elf_section_offset returns -1.
+
+2007-05-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_size_stubs): Use "void *" for psyms.
+	(mark_functions_via_relocs): Likewise.
+
+2007-05-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (bfd_elf_final_link): Correct reloc handling for
+	elf_backend_count_relocs.
+	(bfd_elf_discard_info): Print an error if we can't read syms.
+
+2007-05-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_reloc_type_lookup): Return NULL on
+	invalid reloc code.
+	(spu_elf_gc_mark_hook, spu_elf_section_processing): Delete functions.
+	(elf_backend_gc_mark_hook, elf_backend_section_processing): Don't
+	define.
+
+2007-05-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (assign_file_positions_for_load_sections): Don't check
+	core segment.
+
+2007-05-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (elf_link_sort_relocs): Return if both .rela.dyn
+	and .rel.dyn aren't present.
+
+2007-05-04  Nick Clifton  <nickc@redhat.com>
+
+	* elflink.c (elf_link_sort_relocs): If both .rela.dyn and .rel.dyn
+	sections are present examine the indirect sections in an attempt
+	to compute the correct relocation size.  If there is any
+	ambiguity, produce an error and refuse to sort.
+
+2007-05-03  Sandra Loosemore  <sandra@codesourcery.com>
+
+	* elf32-arm.c (allocate_dynrelocs): Fix typo in comment.
+
+2007-05-03  Vincent Riviere  <vincent.riviere@freesbee.fr>
+	    Nick Clifton  <nickc@redhat.com>
+
+	PR gas/3041
+	* aoutx.h (swap_std_reloc_out): Treat relocs against weak symbols
+	in the same way as relocs against external symbols.
+
+2007-05-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (assign_file_positions_for_load_sections): Set sh_offset
+	here.  Set sh_type to SHT_NOBITS if we won't be allocating
+	file space.  Don't bump p_memsz for non-alloc sections.  Adjust
+	section-in-segment check.
+	(assign_file_positions_for_non_load_sections): Don't set sh_offset
+	here for sections that have already been handled above.
+
+2007-04-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (struct spu_link_hash_table): Add stack_analysis
+	and emit_stack_syms bitfields.
+	(get_sym_h): Read all symbols if stack analysis will be done.
+	(spu_elf_create_sections): Add stack_analysis and emit_stack_syms
+	params, and stash in hash table.
+	(is_hint): Split off from..
+	(is_branch): ..here.  Adjust callers.
+	(spu_elf_size_stubs): Add stack_analysis param.  Arrange to read
+	and keep all syms.
+	(write_one_stub): Fix mem leak.
+	(find_function_stack_adjust): New function.
+	(sort_syms_syms, sort_syms_psecs): New vars.
+	(sort_syms): New function.
+	(struct call_info, struct function_info): New.
+	(struct spu_elf_stack_info): New.
+	(alloc_stack_info, maybe_insert_function, func_name): New functions.
+	(is_nop, insns_at_end, check_function_ranges): Likewise.
+	(find_function, insert_callee, mark_functions_via_relocs): Likewise.
+	(pasted_function, interesting_section, discover_functions): Likewise.
+	(mark_non_root, call_graph_traverse, build_call_tree): Likewise.
+	(sum_stack, spu_elf_stack_analysis, spu_elf_final_link): Likewise.
+	(bfd_elf32_bfd_final_link): Define.
+	* elf32-spu.h (struct _spu_elf_section_data): Add stack_info field.
+	(spu_elf_create_sections, spu_elf_size_stubs): Update prototypes.
+
+2007-04-28  Sergey Rogozhkin  <rogozhkin@niisi.msk.ru>
+
+	* elfxx-mips.c (mips_elf_create_dynamic_relocation): Don't access
+	memory which we might not own.
+
+2007-04-27  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_xtensa_make_sym_local): Restore deleted function.
+	(elf_xtensa_hide_symbol, elf_backend_hide_symbol): Likewise.
+	(elf_xtensa_allocate_dynrelocs): Use elf_xtensa_make_sym_local.
+
+2007-04-27  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (xtensa_read_table_entries): Step through table
+	contents and relocs in parallel.
+
+2007-04-27  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (relax_property_section): Remove extra irel increment.
+
+2007-04-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* cpu-rs6000.c: Write Mimi's name in ASCII.
+	* coff-rs6000.c: Likewise.
+	* rs6000-core.c: Likewise.
+
+2007-04-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* sysdep.h: Include config.h first.
+	Many files: Include sysdep.h before bfd.h.
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2007-04-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* sysdep.h: Revert last change.
+
+2007-04-24  Nick Clifton  <nickc@redhat.com>
+
+	* coffcode.h (coff_slurp_reloc_table): Initialise dst.r_offset.
+	* coff-m68k.c (m68kcoff_rtype_to_howto): Initialize relent.howto.
+
+2007-04-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Warn if
+	eh_frame_hdr table won't be created.
+
+2007-04-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* acinclude.m4: Include config/stdint.m4.
+	* configure.in: Invoke GCC_HEADER_STDINT.
+	* sysdep.h: Don't include ansidecl.h here.
+	* configure: Regenerate.
+	* config.in: Regenerate.
+	* Makefile.in: Regenerate.
+
+2007-04-23  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
+	bfd_mach_mcf_isa_c_emac): New.
+	* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
+	elf_isac_plt_entry, elf_isac_plt_info): New.
+	(elf32_m68k_object_p): Add ISA_C.
+	(elf32_m68k_print_private_bfd_data): Print ISA_C.
+	(elf32_m68k_get_plt_info): Detect ISA_C.
+	* cpu-m68k.c (arch_info): Add ISAC.
+	(m68k_arch_features): Likewise,
+	(bfd_m68k_compatible): ISAs B & C are not compatible.
+
+2007-04-21  Nick Clifton  <nickc@redhat.com>
+
+	* ecoff.c (_bfd_ecoff_write_armap): Initialise rehash.
+	(ecoff_link_add_archive_symbols): Likewise.
+	* coff-m68k.c (m68kcoff_common_addend_rtype_to_howto): Initialise
+	relent.howto.
+	* ieee.c (parse_int): Initialise x.
+	(must_parse_int): Initialise result.
+	(ieee_slurp_external_symbols): Initialise value.
+
+2007-04-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* config.bfd (spu-*-elf): Delete targ_selvecs.
+
+2007-04-19  Nick Clifton  <nickc@redhat.com>
+
+	* coffcode.h (coff_rtype_to_howto): Initialise genrel.howto.
+
+2007-04-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd.c (bfd_demangle): New function.
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2007-04-18  Matthias Klose  <doko@ubuntu.com>
+
+	* Makefile.am (libbfd_la_LDFLAGS): Use bfd soversion.
+	(bfdver.h): Use the date in non-release builds for the soversion.
+	* Makefile.in: Regenerate.
+
+2007-04-17  Paul Brook  <paul@codesourcery.com>
+
+	* elf.c (_bfd_elf_is_function_type): New function.
+	* elflink.c (_bfd_elf_merge_symbol): Use bed->is_function_type.
+	(_bfd_elf_dynamic_symbol_p, _bfd_elf_symbol_refs_local_p,
+	is_global_data_symbol_definition, elf_link_add_object_symbols): Ditto.
+	* elf-bfd.h (elf_backend_data): Add is_function_type.
+	(_bfd_elf_is_function_type): Add prototype.
+	* elfxx-target.h (elf_backend_is_function_type): Add default
+	definition.
+	(elfNN_bed): Add elf_backend_is_function_type.
+	* elf32-arm.c (elf32_arm_is_function_type): New function.
+	(elf_backend_is_function_type): Define.
+
+2007-04-17  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_size_dynamic_sections): Put
+	DT_MIPS_RLD_MAP before DT_DEBUG again.
+
+2007-04-14  Steve Ellcey  <sje@cup.hp.com>
+
+	* Makefile.am: Add ACLOCAL_AMFLAGS.
+	* configure.in: Change macro call order.
+	* Makefile.in: Regnerate.
+	* doc/Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2007-04-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* elflink.c (bfd_elf_final_link): Don't free symbuf for
+	non-elf input bfds.
+	(bfd_elf_size_dynamic_sections): Don't access elf_section_data
+	for non-elf input bfds.
+
+2007-04-12  Richard Sandiford  <richard@codesourcery.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_size_dynamic_sections): Don't add
+	DT_MIPS_RTLD_MAP for PIEs.
+
+2007-04-12  Richard Sandiford  <richard@codesourcery.com>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): Set DT_TEXTREL
+	when creating a __GOTT_BASE__ or __GOTT_INDEX__ relocation
+	in a read-only section.
+	(_bfd_mips_elf_check_relocs): Likewise.
+
+2007-04-12  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (xtensa_is_insntable_section): New.
+	(xtensa_is_proptable_section): New.
+	(elf_xtensa_discard_info_for_section): Handle "full" .xt.prop property
+	tables with 12-byte entries, as well as tables with 8-byte entries.
+	Sort the relocations before examining them.
+	(relax_property_section): Use xtensa_is_proptable_section and
+	xtensa_is_littable_section.  Rewrite code for combining table entries
+	to be more robust in case of unexpected relocations.  Do not set offset
+	of unused relocations to less than zero.
+	(xtensa_is_property_section): Use other functions instead of
+	duplicating section name comparisons.
+	(xtensa_is_littable_section): Use CONST_STRNEQ for ".gnu.linkonce.p.".
+	(xtensa_get_property_predef_flags): Use xtensa_is_insntable_section.
+
+2007-04-12  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_xtensa_gc_mark_hook): Don't follow references
+	from Xtensa property sections.
+
+2007-04-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (needs_ovl_stub): Test that spu_elf_section_data
+	is non-NULL before dereferencing.
+
+2007-04-11  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf-vxworks.c (elf_vxworks_emit_relocs): Remap weakdef PLT slot
+	relocs too.
+
+2007-04-10  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (struct alpha_elf_link_hash_table): Add relax_trip.
+	(elf64_alpha_size_got_sections): Remove unused something_changed local.
+	(elf64_alpha_size_plt_section): Return void.
+	(elf64_alpha_size_rela_got_section): Likewise.
+	(elf64_alpha_relax_section): Only regenerate got+plt if the
+	relax_trip counter has changed.
+
+2007-04-09  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.am (bfdver.h): Do not generate doc/bfdver.texi.
+	* doc/Makefile.am (DOCFILES): Add bfdver.texi.
+	(bfdver.texi): New rule.
+	* Makefile.in, doc/Makefile.in: Regenerated.
+
+2007-04-03  Matt Thomas  <matt@netbsd.org>
+
+	* elf32-vax.c (elf_vax_relocate_section): Do not emit a PCREL reloc
+	in a shared object if it is not in a CODE section or if it is against
+	a section symbol.  This allows DWARF2 to use pcrel format.
+
+2007-04-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/4304
+	* elflink.c (bfd_elf_final_link): Call einfo callback in
+	bfd_link_info instead of _bfd_error_handler for DT_TEXTREL
+	warning.
+
+2007-04-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_output_symbol_hook): New function.
+	(elf_backend_link_output_symbol_hook): Define.
+
+2007-04-02  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/4292
+	* bfd.c (bfd_fprintf_vma): Do not print addresses of 32-bit
+	targets as 64-bit values, even if running on a 64-bit host.
+	* coffgen.c (coff_print_symbol): Likewise.
+
+2007-03-29  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/4110
+	* elf.c (IS_VALID_GROUP_SECTION_HEADER): New macro.
+	(setup_group): Use it.  Report corrupt group section headers.
+	(bfd_section_from_shdr): Use new macro.  Replace constant 4 with
+	GRP_ENTRY_SIZE.  Cope with NULLs in the group section table.
+	(elf_fake_section): Replace constant 4 with GRP_ENTRY_SIZE.
+
+2007-03-29  Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/4267
+	* elflink.c (evaluate_complex_relocation_symbols): Use bfd_vma
+	for rel->r_info values.
+	(bfd_elf_perform_complex_relocation): Likewise.
+	* elf32-ppc.c (allocate_dynrelocs): Set plt.offset to -1 for
+	unused entries.  Don't clear plt.plist in loop.
+
+2007-03-28  Richard Sandiford  <richard@codesourcery.com>
+
+	* elfxx-sparc.h (_bfd_sparc_elf_link_hash_table): Remove append_rela.
+	* elfxx-sparc.c (sparc_elf_append_rela_64, sparc_elf_append_rela_32):
+	Merge into...
+	(sparc_elf_append_rela): ...this new function.
+	(SPARC_ELF_APPEND_RELA): Delete.
+	(_bfd_sparc_elf_link_hash_table_create): Don't initialize
+	the deleted append_rela field.
+	(_bfd_sparc_elf_relocate_section): Use sparc_elf_append_rela
+	instead of SPARC_ELF_APPEND_RELA.
+	(_bfd_sparc_elf_finish_dynamic_symbol): Likewise.  Use the
+	elf_size_info structure to find the size of a RELA entry and
+	the associated swap-out function.
+	(sparc64_finish_dyn, sparc64_finish_dyn): Merge into...
+	(sparc_finish_dyn): ...this new function.
+	(_bfd_sparc_elf_finish_dynamic_sections): Update calls accordingly.
+
+2007-03-28  Richard Sandiford  <richard@codesourcery.com>
+	    Phil Edwards  <phil@codesourcery.com>
+
+	* doc/bfd.texinfo: Put the contents after the title page rather
+	than at the end of the document.
+
+2007-03-27  Andreas Schwab  <schwab@suse.de>
+
+	* elfxx-ia64.c (elf_backend_default_execstack): Define to 0.
+
+2007-03-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
+2007-03-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (struct stubarr): Add stub_hash_table and err fields.
+	(allocate_spuear_stubs): New function.
+	(spu_elf_size_stubs): Call allocate_spuear_stubs.
+
+2007-03-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* aout-adobe.c (aout_32_bfd_reloc_name_lookup): Define.
+	* aout-arm.c (MY_bfd_reloc_name_lookup): Define.
+	(MY (bfd_reloc_name_lookup)): New function.
+	* aout-ns32k.c (MY (bfd_reloc_name_lookup)): New function.
+	* aout-target.h (NAME (aout, reloc_name_lookup)): Declare.
+	(MY_bfd_reloc_name_lookup): Define.
+	* aout-tic30.c (tic30_aout_reloc_name_lookup): New function.
+	(MY_bfd_reloc_name_lookup): Define.
+	* aoutx.h (NAME (aout, reloc_type_lookup)): Don't declare.
+	(NAME (aout, reloc_name_lookup)): New function.
+	* bout.c (b_out_bfd_reloc_name_lookup): New function.
+	* coff-alpha.c (alpha_bfd_reloc_name_lookup): New function.
+	(_bfd_ecoff_bfd_reloc_name_lookup): Define.
+	* coff-arm.c (coff_arm_reloc_name_lookup): New function.
+	(coff_bfd_reloc_name_lookup): Define.
+	* coff-i386.c (coff_bfd_reloc_name_lookup): Define.
+	(coff_i386_reloc_name_lookup): New function.
+	* coff-i860.c (coff_i860_reloc_name_lookup): New function.
+	(coff_bfd_reloc_name_lookup): Define.
+	* coff-i960.c (coff_i960_reloc_name_lookup): New function.
+	(coff_bfd_reloc_name_lookup): Define.
+	* coff-m68k.c (m68k_reloc_name_lookup): New function.
+	(coff_bfd_reloc_name_lookup): Define.
+	* coff-maxq.c (maxq_reloc_name_lookup): New function.
+	(coff_bfd_reloc_name_lookup): Define.
+	* coff-mcore.c (mcore_coff_reloc_name_lookup): New function.
+	(coff_bfd_reloc_name_lookup): Define.
+	* coff-mips.c (mips_bfd_reloc_name_lookup): New function.
+	(_bfd_ecoff_bfd_reloc_name_lookup): Define.
+	* coff-ppc.c (ppc_coff_reloc_name_lookup): New function.
+	(coff_bfd_reloc_name_lookup): Define.
+	* coff-rs6000.c (coff_bfd_reloc_name_lookup): Define.
+	(_bfd_xcoff_reloc_name_lookup): New function.
+	(rs6000coff_vec, pmac_xcoff_vec): Init new field.
+	* coff-sh.c (coff_bfd_reloc_name_lookup): Define.
+	(sh_coff_reloc_name_lookup): New function.
+	* coff-sparc.c (coff_sparc_reloc_name_lookup): New function.
+	(coff_bfd_reloc_name_lookup): Define.
+	* coff-tic30.c (coff_bfd_reloc_name_lookup): Define.
+	(tic30_coff_reloc_name_lookup): New function.
+	* coff-tic4x.c (coff_bfd_reloc_name_lookup): Define.
+	(tic4x_coff_reloc_name_lookup): New function.
+	* coff-tic54x.c (coff_bfd_reloc_name_lookup): Define.
+	(tic54x_coff_reloc_name_lookup): New function.
+	* coff-x86_64.c (coff_bfd_reloc_name_lookup): Define.
+	(coff_amd64_reloc_name_lookup): New function.
+	* coff-z80.c (coff_z80_reloc_name_lookup): New function.
+	(coff_bfd_reloc_name_lookup): Define.
+	* coff-z8k.c (coff_z8k_reloc_name_lookup): New function.
+	(coff_bfd_reloc_name_lookup): Define.
+	* coff64-rs6000.c (coff_bfd_reloc_name_lookup): Define.
+	(xcoff64_reloc_name_lookup): New function.
+	(rs6000coff64_vec, aix5coff64_vec): Init new field.
+	* coffcode.h (coff_bfd_reloc_name_lookup): Define.
+	* elf-hppa.h (elf_hppa_reloc_name_lookup): New function.
+	* elf-m10200.c (bfd_elf32_bfd_reloc_name_lookup): New function.
+	* elf-m10300.c (bfd_elf32_bfd_reloc_name_lookup): New function.
+	* elf32-arc.c (bfd_elf32_bfd_reloc_name_lookup): New function.
+	* elf32-arm.c (elf32_arm_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-avr.c (bfd_elf32_bfd_reloc_name_lookup): New function.
+	* elf32-bfin.c (bfin_bfd_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-cr16c.c (elf_cr16c_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-cris.c (cris_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-crx.c (elf_crx_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-d10v.c (bfd_elf32_bfd_reloc_name_lookup): New function.
+	* elf32-d30v.c (bfd_elf32_bfd_reloc_name_lookup): New function.
+	* elf32-dlx.c (elf32_dlx_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-fr30.c (fr30_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-frv.c (frv_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-gen.c (bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-h8300.c (elf32_h8_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-hppa.c (bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-i370.c (i370_elf_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-i386.c (elf_i386_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-i860.c (elf32_i860_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-i960.c (elf32_i960_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-ip2k.c (ip2k_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-iq2000.c (iq2000_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-m32c.c (m32c_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-m32r.c (bfd_elf32_bfd_reloc_name_lookup): New function.
+	* elf32-m68hc11.c (bfd_elf32_bfd_reloc_name_lookup): New function.
+	* elf32-m68hc12.c (bfd_elf32_bfd_reloc_name_lookup): New function.
+	* elf32-m68k.c (reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-m88k.c (bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-mcore.c (mcore_elf_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-mep.c (mep_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-mips.c (bfd_elf32_bfd_reloc_name_lookup): New function.
+	(mips_vxworks_bfd_reloc_name_lookup): Likewise.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-msp430.c (bfd_elf32_bfd_reloc_name_lookup): New function.
+	* elf32-mt.c (mt_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-openrisc.c (openrisc_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-or32.c (bfd_elf32_bfd_reloc_name_lookup): New function.
+	* elf32-pj.c (pj_elf_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-ppc.c (ppc_elf_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-s390.c (elf_s390_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-score.c (elf32_score_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-sh.c (sh_elf_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-sparc.c (bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-spu.c (spu_elf_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-v850.c (v850_elf_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-vax.c (reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-xc16x.c (xc16x_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-xstormy16.c (xstormy16_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf32-xtensa.c (elf_xtensa_reloc_name_lookup): New function.
+	(bfd_elf32_bfd_reloc_name_lookup): Define.
+	* elf64-alpha.c (elf64_alpha_bfd_reloc_name_lookup): New function.
+	(bfd_elf64_bfd_reloc_name_lookup): Define.
+	* elf64-gen.c (bfd_elf64_bfd_reloc_name_lookup): Define.
+	* elf64-hppa.c (bfd_elf64_bfd_reloc_name_lookup): Define.
+	* elf64-mips.c (bfd_elf64_bfd_reloc_name_lookup): New function.
+	* elf64-mmix.c (bfd_elf64_bfd_reloc_name_lookup): New function.
+	* elf64-ppc.c (ppc64_elf_reloc_name_lookup): New function.
+	(bfd_elf64_bfd_reloc_name_lookup): Define.
+	* elf64-s390.c (elf_s390_reloc_name_lookup): New function.
+	(bfd_elf64_bfd_reloc_name_lookup): Define.
+	* elf64-sh64.c (sh_elf64_reloc_name_lookup): New function.
+	(bfd_elf64_bfd_reloc_name_lookup): Define.
+	* elf64-sparc.c (bfd_elf64_bfd_reloc_name_lookup): Define.
+	* elf64-x86-64.c (elf64_x86_64_reloc_name_lookup): New function.
+	(bfd_elf64_bfd_reloc_name_lookup): Define.
+	* elfn32-mips.c (bfd_elf32_bfd_reloc_name_lookup): New function.
+	* elfxx-ia64.c (elfNN_ia64_reloc_name_lookup): New function.
+	(bfd_elfNN_bfd_reloc_name_lookup): Define.
+	* elfxx-sparc.c (_bfd_sparc_elf_reloc_name_lookup): New function.
+	* elfxx-sparc.h (_bfd_sparc_elf_reloc_name_lookup): Declare.
+	* i386msdos.c (msdos_bfd_reloc_name_lookup): Define.
+	* i386os9k.c (aout_32_bfd_reloc_name_lookup): Define.
+	* ieee.c (ieee_bfd_reloc_name_lookup): Define.
+	* libaout.h (NAME (aout, reloc_name_lookup)): Declare.
+	* libbfd-in.h (_bfd_norelocs_bfd_reloc_name_lookup): Declare.
+	* mipsbsd.c (MY_bfd_reloc_name_lookup): Define.
+	(MY(reloc_type_lookup)): Rename from MY(reloc_howto_type_lookup).
+	(MY(reloc_name_lookup)): New function.
+	* nlm-target.h (nlm_bfd_reloc_name_lookup): Define.
+	* oasys.c (oasys_bfd_reloc_name_lookup): Define.
+	* pdp11.c (NAME (aout, reloc_name_lookup)): New function.
+	* pe-mips.c (coff_mips_reloc_name_lookup): New function.
+	(coff_bfd_reloc_name_lookup): Define.
+	* reloc.c (bfd_reloc_name_lookup): New function.
+	* riscix.c (riscix_reloc_name_lookup): New function.
+	(MY_bfd_reloc_name_lookup): Define.
+	* som.c (som_bfd_reloc_name_lookup): New function.
+	* targets.c (struct bfd_target): Add reloc_name_lookup.
+	(BFD_JUMP_TABLE_RELOCS): Add NAME##_bfd_reloc_name_lookup.
+	* versados.c (versados_bfd_reloc_name_lookup): Define.
+	* vms.c (vms_bfd_reloc_name_lookup): New function.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2007-03-26  Thiemo Seufer  <ths@mips.com>
+
+	PR ld/4208
+	* elfxx-mips.c (mips_elf_next_relocation): Don't signal an error if no
+	matching relocation is found.
+	(_bfd_mips_elf_relocate_section): Only warn about missing relocations.
+
+2007-03-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
+2007-03-23  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.in: Use ACX_PKGVERSION and ACX_BUGURL.
+	* configure: Regenerate.
+
+2007-03-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_stub_name): Don't put input section in stub name.
+	Remove input_sec param.  Adjust all calls.
+	(write_one_stub): Adjust stub symbol.
+	(needs_ovl_stub): New function, extracted from..
+	(spu_elf_size_stubs): ..here.
+	(spu_elf_relocate_section): Use needs_ovl_stub.
+
+2007-03-22  Joseph Myers  <joseph@codesourcery.com>
+
+	* Makefile.am (bfdver.h): Only set VERSION_PACKAGE in bfdver.texi
+	if nonempty.
+	* configure.in (REPORT_BUGS_TO): Do not use "URL:" prefix.
+	* Makefile.in, configure, doc/Makefile.in: Regenerate.
+
+2007-03-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/4210
+	* peXXigen.c (_bfd_XXi_swap_aouthdr_out): Use the virtual
+	address and virtual size of the last section for the image
+	size.
+
+2007-03-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/4007
+	* elf.c (assign_file_positions_for_load_sections): Check if
+	all sections are in the segment.
+
+2007-03-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/4208
+	* elfxx-mips.c (_bfd_mips_elf_relocate_section): Report missing
+	matching LO16 relocation for HI16 relocation.
+
+2007-03-20  Paul Brook  <paul@codesourcery.com>
+
+	* bfd-in.h (bfd_elf32_arm_set_target_relocs): Update prototype.
+	* bfd-in2.h: Regenerate.
+	* elf32-arm.c (elf32_arm_link_hash_table): Add pic_veneer.
+	(record_arm_to_thumb_glue): Use globals->pic_veneer.
+	(elf32_arm_create_thumb_stub): Ditto.
+	(bfd_elf32_arm_set_target_relocs): Set globals->pic_veneer.
+
+2007-03-18  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* bfd-in.h (bfd_elf32_arm_set_target_relocs): Add "bfd *"
+	argument and extra last argument.
+	* bfd-in2.h: Regenerate.
+	* elf32-arm.c (elf32_arm_obj_tdata): Add no_enum_size_warning
+	member.
+	(bfd_elf32_arm_set_target_relocs): Add "bfd *" argument and
+	extra last argument.  Set no_enum_size_warning appropriately.
+	(elf32_arm_merge_eabi_attributes): Improve enum sizes
+	diagnostic, suppressing it when no_enum_size_warning dictates.
+
+2007-03-20  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/3535
+	* elf.c (copy_private_bfd_data): Widen the scope of Solaris
+	specific conditions that need the program headers to be
+	rewritten.
+
+2007-03-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* peXXigen.c (_bfd_XXi_swap_aouthdr_in): Store Magic,
+	MajorLinkerVersion, MinorLinkerVersion, SizeOfCode,
+	SizeOfInitializedData, SizeOfUninitializedData,
+	AddressOfEntryPoint, BaseOfCode and BaseOfData in internal
+	extra PE a.out header.
+	(IMAGE_NT_OPTIONAL_HDR_MAGIC): Defined as 0x10b if not defined.
+	(IMAGE_NT_OPTIONAL_HDR64_MAGIC): Defined as 0x20b if not
+	defined.
+	(IMAGE_NT_OPTIONAL_HDRROM_MAGIC): Defined as 0x107 if not
+	defined.
+	(_bfd_XX_print_private_bfd_data_common): Also print Magic,
+	MajorLinkerVersion, MinorLinkerVersion, SizeOfCode,
+	SizeOfInitializedData, SizeOfUninitializedData,
+	AddressOfEntryPoint, BaseOfCode and BaseOfData from internal
+	extra PE a.out header.
+
+2007-03-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* targets.c (_bfd_target_vector): Add bfd_efi_app_x86_64_vec
+	only if BFD64 is defined.
+
+2007-03-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_size_stubs): Always use an overlay stub
+	on setjmp calls.
+
+2007-03-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* doc/Makefile.in: Regenerated.
+
+2007-03-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am (bfdver.h): Substitute report_bugs_to.  Also
+	create doc/bfdver.texi.
+	* Makefile.in: Regenerated.
+
+	* configure.in (--with-bugurl): New option.
+	* configure: Regenerated.
+
+	* version.h (REPORT_BUGS_TO): New.
+
+2007-03-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/3826
+	* elf-bfd.h (elf_backend_data): Add elf_osabi.
+	(_bfd_elf_set_osabi): New.
+
+	* elf.c (_bfd_elf_set_osabi): New.
+
+	* elf32-hppa.c (elf32_hppa_post_process_headers): Removed.
+	(elf_backend_post_process_headers): Defined with
+	_bfd_elf_set_osabi.
+	(ELF_OSABI): Properly defined for each target.
+
+	* elf32-i370.c (i370_elf_post_process_headers): Removed.
+	(ELF_OSABI): Defined.
+	(elf_backend_post_process_headers): Defined with
+	_bfd_elf_set_osabi.
+
+	* elf32-i386.c (ELF_OSABI): Defined to ELFOSABI_FREEBSD for
+	freebsd.
+	(elf_i386_post_process_headers): Set EI_OSABI with elf_osabi.
+
+	* elf32-msp430.c (elf32_msp430_post_process_headers): Removed.
+	(ELF_OSABI): Defined.
+	(elf_backend_post_process_headers): Defined with
+	_bfd_elf_set_osabi.
+
+	* elf64-alpha.c (ELF_OSABI): Defined to ELFOSABI_FREEBSD for
+	freebsd.
+	(elf64_alpha_fbsd_post_process_headers): Set EI_OSABI with
+	elf_osabi.
+
+	* elf64-hppa.c (elf64_hppa_post_process_headers): Set EI_OSABI
+	with elf_osabi.
+	(ELF_OSABI): Properly defined for each target.
+	(elf_backend_post_process_headers): Defined with
+	_bfd_elf_set_osabi for Linux.
+
+	* elf64-sparc.c (elf64_sparc_fbsd_post_process_headers): Removed.
+	(ELF_OSABI): Defined to ELFOSABI_FREEBSD for freebsd.
+	(elf_backend_post_process_headers): Defined with
+	_bfd_elf_set_osabi.
+
+	* elf64-x86-64.c (elf64_x86_64_fbsd_post_process_headers): Removed.
+	(ELF_OSABI): Defined to ELFOSABI_FREEBSD for freebsd.
+	(elf_backend_post_process_headers): Defined with
+	_bfd_elf_set_osabi.
+
+	* elfcode.h (elf_object_p): Match the ELFOSABI_NONE ELF target
+	with any ELF target of the compatible machine for which we do not
+	have a specific backend.
+
+	* elfxx-ia64.c (elfNN_hpux_post_process_headers): Set EI_OSABI
+	with elf_osabi.
+
+	* elfxx-target.h (ELF_OSABI): Default to ELFOSABI_NONE.
+	(elfNN_bed): Initialize elf_osabi with ELF_OSABI.
+
+2007-03-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-v850.c (v850_elf_link_output_symbol_hook): Clean out
+	V850_OTHER_* bits.
+
+2007-03-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (BFD64_BACKENDS): Add efi-app-x86_64.lo.
+	(BFD64_BACKENDS_CFILES): Add efi-app-x86_64.c.
+	Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2007-03-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config.bfd (x86_64-*-freebsd*): Add bfd_efi_app_x86_64_vec.
+	(x86_64-*-kfreebsd*-gnu): Likewise.
+	(x86_64-*-netbsd*): Likewise.
+	(x86_64-*-openbsd*): Likewise.
+	(x86_64-*-linux-*): Likewise.
+
+	* configure.in: Support bfd_efi_app_x86_64_vec.
+	* configure: Regenerated.
+
+	* efi-app-x86_64.c: New file.
+
+	* targets.c (bfd_efi_app_x86_64_vec): New.
+	(_bfd_target_vector): Add bfd_efi_app_x86_64_vec.
+
+2007-03-07  Kai Tietz   <kai.tietz@onevision.com>
+
+	* reloc.c (bfd_generic_get_relocated_section_contents): Remove
+	const for type reloc_howto_type.
+
+2007-03-07  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 3958
+	* elf-bfd.h (RELOC_FOR_GLOBAL_SYMBOL): No error on relocatable link.
+	(elf_discarded_section): Move..
+	* bfd-in.h: ..to here.
+	* bfd-in2.h: Regenerate.
+	* elflink.c (elf_link_input_bfd): Don't zap relocs against symbols
+	from discarded sections before relocate_section has done its job.
+	* reloc.c (bfd_generic_get_relocated_section_contents): Handle
+	relocs against symbols from discarded sections.
+	* elf-hppa.h (elf_hppa_howto_table): Set size.  Set dst_mask on
+	SECREL32.
+	(elf_hppa_relocate_section): Handle relocatable link after setting
+	sec, sym, h etc. for final link.  Squash error messages for
+	relocatable link.  Clear section contents for relocs against
+	symbols in discarded sections, and zero reloc.  Remove existing
+	zero r_symndx code.
+	* elf-m10200.c (mn10200_elf_relocate_section): Likewise.
+	* elf-m10300.c (mn10300_elf_relocate_section): Likewise.
+	* elf32-arm.c (elf32_arm_relocate_section): Likewise.
+	* elf32-avr.c (elf32_avr_relocate_section): Likewise.
+	* elf32-bfin.c (bfinfdpic_relocate_section): Likewise.
+	(bfin_relocate_section): Likewise.
+	* elf32-cr16c.c (elf32_cr16c_relocate_section): Likewise.
+	* elf32-cris.c (cris_elf_relocate_section): Likewise.
+	* elf32-crx.c (elf32_crx_relocate_section): Likewise.
+	* elf32-d10v.c (elf32_d10v_relocate_section): Likewise.
+	* elf32-fr30.c (fr30_elf_relocate_section): Likewise.
+	* elf32-frv.c (elf32_frv_relocate_section): Likewise.
+	* elf32-h8300.c (elf32_h8_relocate_section): Likewise.
+	* elf32-hppa.c (elf32_hppa_relocate_section): Likewise.
+	* elf32-i370.c (i370_elf_relocate_section): Likewise.
+	* elf32-i386.c (elf_i386_relocate_section): Likewise.
+	* elf32-i860.c (elf32_i860_relocate_section): Likewise.
+	* elf32-ip2k.c (ip2k_elf_relocate_section): Likewise.
+	* elf32-iq2000.c (iq2000_elf_relocate_section): Likewise.
+	* elf32-m32c.c (m32c_elf_relocate_section): Likewise.
+	* elf32-m32r.c (m32r_elf_relocate_section): Likewise.
+	* elf32-m68hc1x.c (elf32_m68hc11_check_relocs): Likewise.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-mcore.c (mcore_elf_relocate_section): Likewise.
+	* elf32-mep.c (mep_elf_relocate_section): Likewise.
+	* elf32-msp430.c (elf32_msp430_relocate_section): Likewise.
+	* elf32-mt.c (mt_elf_relocate_section): Likewise.
+	* elf32-openrisc.c (openrisc_elf_relocate_section): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	* elf32-s390.c (elf_s390_relocate_section): Likewise.
+	* elf32-score.c (_bfd_score_elf_relocate_section): Likewise.
+	* elf32-sh.c (sh_elf_relocate_section): Likewise.
+	* elf32-spu.c (spu_elf_relocate_section): Likewise.
+	* elf32-v850.c (v850_elf_relocate_section): Likewise.
+	* elf32-vax.c (elf_vax_relocate_section): Likewise.
+	* elf32-xc16x.c (elf32_xc16x_relocate_section): Likewise.
+	* elf32-xstormy16.c (xstormy16_elf_relocate_section): Likewise.
+	* elf32-xtensa.c (elf_xtensa_relocate_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relocate_section_r): Likewise.
+	(elf64_alpha_relocate_section): Likewise.
+	* elf64-mmix.c (mmix_elf_relocate_section): Likewise.
+	* elf64-ppc.c (ppc64_elf_relocate_section): Likewise.
+	* elf64-s390.c (elf_s390_relocate_section): Likewise.
+	* elf64-sh64.c (sh_elf64_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_relocate_section): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_relocate_section): Likewise.
+
+	* elf32-arm.c (elf32_arm_relocate_section): Always adjust section
+	symbols for relocatable link.  Don't use always-zero st_value.
+	(elf_backend_rela_normal): Don't define.
+	* elf32-bfin.c (bfinfdpic_relocate_section): Use
+	RELOC_FOR_GLOBAL_SYMBOL.
+	* elf32-frv.c (elf32_frv_relocate_section): Likewise.
+	* elf32-d10v.c (elf32_d10v_relocate_section): Combine SEC_MERGE
+	section symbol adjustments with same for relocatable link.
+	* elf32-i386.c (elf_i386_relocate_section): Likewise.
+	* elf32-m68hc1x.c (m68hc11_get_relocation_value): Move..
+	(elf32_m68hc11_check_relocs): ..to here.
+	* elf32-score.c (score_elf_final_link_relocate): Remove zero
+	r_symndx code.
+	* elfxx-mips.c (mips_elf_calculate_relocation): Likewise.
+
+2007-03-07  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 4144
+	* elf.c (assign_file_positions_for_load_sections): Don't
+	adjust p_memsz for !SEC_LOAD section vma modulo page size.
+	Instead, use the same lma based adjustment for SEC_LOAD
+	sections.
+
+2007-03-01  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (analyze_relocations): Zero src_count if not relaxing.
+	(find_relaxable_sections): Do not increment src_count for unknown
+	opcodes.  Decode only once instead of calling is_l32r_relocation.
+	(compute_text_actions): Remove unused no_insn_move flag.  Assert that
+	src_next matches src_count in relax_info.
+
+2007-03-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* Makefile.am (bfdver.h): Use "." not " " between version number
+	and date.
+	* Makefile.in: Regenerate.
+	* configure.in (PKGVERSION): Default to "(GNU Binutils) ".
+	* configure: Regenerate.
+
+2007-02-28  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* config.bfd (sh-*-uclinux, sh[12]-*-uclinux): New stanza.
+
+2007-02-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.h (struct _ovl_stream): Make "start" and "end" const.
+	* elf32-spu.c (ovl_mgr_pread): Add const to casts.
+
+2007-02-23  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* dwarf2.c (_bfd_dwarf2_find_nearest_line): Assume 32-bit
+	DWARF even with 64-bit addresses.
+	(_bfd_dwarf2_find_nearest_line): Likewise.
+
+2007-02-23  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/3535
+	* elf.c (copy_private_bfd_data): Always rewrite the program
+	headers when a Solaris interpreter segment is involved.
+
+2007-02-22  Paul Brook  <paul@codesourcery.com>
+
+	* elflink.c (gc_mark_hook_fn): Remove.
+	(_bfd_elf_gc_mark): Rename gc_mark_hook_fn to elf_gc_mark_hook_fn.
+	(bfd_elf_gc_sections): Ditto.  Call gc_mark_extra_sections.
+	* elf-bfd.h (elf_gc_mark_hook_fn): Define.
+	(elf_backend_data): Add gc_mark_extra_sections.
+	* elfxx-target.h (elf_backend_gc_mark_extra_sections): Provide default
+	definition.
+	(elfNN_bed): Add elf_backend_gc_mark_extra_sections.
+	* elf32-arm.c (elf32_arm_gc_mark_extra_sections): New function.
+	(elf_backend_gc_mark_extra_sections): Define.
+
+2007-02-21  Nick Clifton  <nickc@redhat.com>
+
+	* elf.c (_bfd_elf_map_sections_to_segments): If the
+	override_segment_assignment callback is defined then call it.
+
+2007-02-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_size_stubs): Correct order of warning args.
+
+2007-02-19  Thiemo Seufer  <ths@mips.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_print_private_bfd_data): Remove
+	translation marker from untranslatable strings.
+
+2007-02-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_backend_data): Add default_execstack.
+	* elflink.c (bfd_elf_size_dynamic_sections): Heed default_execstack.
+	* elfxx-target.h (elf_backend_default_execstack): Define to 1.
+	(elfNN_bed): Init new field.
+	* elf64-ppc.c (elf_backend_default_execstack): Define to 0.
+
+2007-02-17  Mark Mitchell  <mark@codesourcery.com>
+            Nathan Sidwell  <nathan@codesourcery.com>
+            Vladimir Prus  <vladimir@codesourcery.com
+            Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.in (--with-pkgversion): New option.
+	* configure: Regenerate.
+	* Makefile.am (bfdver.h): Substitute for @bfd_version_package@.
+	* Makefile.in: Regenerate.
+	* version.h (BFD_VERSION_STRING): Define using
+	@bfd_version_package@.
+
+2007-02-16  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_print_private_bfd_data):
+	Print EF_MIPS_NOREORDER, EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_XGOT
+	and EF_MIPS_UCODE.
+
+2007-02-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* libbfd-in.h (_bfd_norelocs_get_reloc_upper_bound): Don't define,
+	declare.
+	(_bfd_norelocs_canonicalize_reloc): Likewise.
+	* libbfd.h: Regenerate.
+	* libbfd.c (_bfd_norelocs_get_reloc_upper_bound): New function.
+	(_bfd_norelocs_canonicalize_reloc): Likewise.
+	* binary.c (binary_bfd_reloc_type_lookup): Don't define.
+	(binary_get_reloc_upper_bound, binary_canonicalize_reloc): Likewise.
+	(binary_vec): Use _bfd_norelocs in BFD_JUMP_TABLE_RELOCS.
+	* ihex.c: Similarly.
+	* mach-o-target.c: Similarly.
+	* mach-o.c: Similarly.
+	* mmo.c: Similarly.
+	* pef.c: Similarly.
+	* ppcboot.c: Similarly.
+	* srec.c: Similarly.
+	* xsym.c: Similarly.
+
+2007-02-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/3953
+	* elflink.c (_bfd_elf_add_default_symbol): Check warning symbol
+	when adding default symbol.
+
+2007-02-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (create_linkage_sections): Use section ".branch_lt"
+	for branch lookup table.
+
+2007-02-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (create_linkage_sections): Don't create
+	.rela.rodata.brlt for --emit-relocs.
+	(ppc_build_one_stub): Create relocs for brlt --emit-relocs here.
+	(ppc_size_one_stub): Count them.  Simplify test of stub type
+	when counting stub relocs.  Set SEC_RELOC too.
+	(ppc64_elf_size_stubs): Clear reloc_count and SEC_RELOC.
+	(ppc64_elf_finish_dynamic_sections): Output brlt relocs.
+
+2007-02-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (evaluate_complex_relocation_symbols): Ignore relocs
+	with a zero symbol index.
+
+2007-02-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (bfd_elf_discard_info): Tidy setting of "eh".
+
+2007-02-05  Dave Brolley  <brolley@redhat.com>
+            Stan Cox  <scox@redhat.com>
+
+	PR ld/3972
+	* elflink.c (elf_link_input_bfd): Always setup finfo->internal_syms.
+
+2007-02-05  Dave Brolley  <brolley@redhat.com>
+	    Richard Sandiford  <rsandifo@redhat.com>
+	    Stan Cox  <scox@redhat.com>
+	    Nick Clifton  <nickc@redhat.com>
+	    DJ Delorie  <dj@redhat.com>
+	    Frank Ch. Eigler  <fche@redhat.com>
+	    Ben Elliston  <bje@redhat.com>
+	    Richard Henderson  <rth@redhat.com>
+
+	* Makefile.am (ALL_MACHINES): Add cpu-mep.lo.
+	(ALL_MACHINES_CFILES): Add CPU_MEP.c.
+	(BFD32_BACKENDS): Add elf32-mep.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-mep.c.
+	(cpu-mep.lo,elf32-mep.lo): New targets.
+	* archures.c (bfd_arch_mep): New enumerator.
+	(bfd_mach_mep, bfd_mach_mep_h1): New macros.
+	(bfd_mep_arch): New external variable.
+	(bfd_archures_list): Add bfd_mep_arch.
+	* config.bfd: Support mep-*-elf.
+	* configure.in: Support bfd_elf32_mep_vec and bfd_elf32_mep_little_vec.
+	* reloc.c (BFD_RELOC_MEP_*): New relocation numbers.
+	* targets.c (bfd_elf32_mep_vec,bfd_elf32_mep_little_vec): New extern
+	declarations.
+	(_bfd_target_vector): Add bfd_elf32_mep_vec and
+	bfd_elf32_mep_little_vec.
+	* mep-relocs.pl: New file.
+	* cpu-mep.c: New file.
+	* elf32-mep.c: New file.
+	* bfd-in2.h: Regenerate.
+	* po/POTFILES.in: Regenerate.
+	* libbfd.h: Regenerate.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2007-02-05  Dave Brolley  <brolley@redhat.com>
+
+	* elflink.c (evaluate_complex_relocation_symbols): Check for
+	STT_SRELC for global symbols.
+	(perform_complex_relocations): Renamed to
+	perform_complex_relocation and now examines only one relocation.
+	(elf_link_input_bfd): Don't call perform_complex_relocations.
+	* elf-bfd.h (bfd_elf_perform_complex_relocation_: New prototype.
+	* elf32-mep.c (mep_elf_howto_table): Add R_RELC.
+	(OD,OS,OU): #undefs corrected to N, S and U repectively.
+	(mep_reloc_type_lookup): Handle BFD_RELOC_RELC.
+	(complex_reloc_installation_howto): Removed.
+	(mep_info_to_howto_rela): Remove special case for r_type==0xff.
+	(mep_elf_relocate_section): Call bfd_elf_perform_complex_relocation.
+
+2007-02-05  Dave Brolley  <brolley@redhat.com>
+	    Richard Sandiford  <rsandifo@redhat.com>
+	    DJ Delorie  <dj@redhat.com>
+	    Graydon Hoare  <graydon@redhat.com>
+	    Nick Clifton  <nickc@cambridge.redhat.com>
+	    Jeff Holcomb  <jeffh@redhat.com>
+	    Frank Ch. Eigler  <fche@redhat.com>
+
+	* elf-bfd.h (bfd_elf_perform_complex_relocations): New prototype.
+	* elf.c (swap_out_syms): Handle BSF_RELC and BSF_SRELC.
+	* elfcode.h (elf_slurp_symbol_table): Handle STT_RELC and STT_SRELC.
+	* elflink.c (set_symbolValue): New static function.
+	(resolve_symbol): Likewise.
+	(resolve_section): Likewise.
+	(undefined_reference): Likewise.
+	(eval_symbol): Likewise.
+	(evaluate_complex_relocation_symbols): Likewise.
+	(put_value): Likewise.
+	(get_value): Likewise.
+	(decode_complex_addend):
+	(bfd_elf_perform_complex_relocation): New function.
+	(elf_link_input_bfd): Call evaluate_complex_relocation_symbols.
+	* reloc.c (BFD_RELOC_RELC): New relocation number.
+	* syms.c (BSF_RELC,BSF_SRELC): New macros.
+
+2007-02-05  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_xtensa_make_sym_local): Delete.
+	(elf_xtensa_hide_symbol, elf_backend_hide_symbol): Delete.
+	(elf_xtensa_fix_refcounts, elf_xtensa_allocate_plt_size)
+	(elf_xtensa_allocate_got_size): Replace these with...
+	(elf_xtensa_allocate_dynrelocs): ...this new function.
+	(elf_xtensa_size_dynamic_sections): Use it.
+
+2007-02-05  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_howto_table) <R_XTENSA_GLOB_DAT>
+	<R_XTENSA_JMP_SLOT, R_XTENSA_RELATIVE, R_XTENSA_PLT, R_XTENSA_DIFF32>:
+	Set src_mask to zero.
+	<R_XTENSA_DIFF8, R_XTENSA_DIFF16>: Likewise.  Also fix dst_mask.
+	<R_XTENSA_ASM_EXPAND>: Set pcrel_offset to TRUE.
+
+2007-02-02  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (xtensa_elf_dynamic_symbol_p): Renamed to...
+	(elf_xtensa_dynamic_symbol_p): ...this.
+
+2007-02-02  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (plt_reloc_count): Move into link hash table.
+	(struct elf_xtensa_link_hash_table): New.
+	(elf_xtensa_hash_table): New.
+	(elf_xtensa_link_hash_table_create): New.
+	(elf_xtensa_check_relocs): Update plt_reloc_count references.
+	Update arguments to add_extra_plt_sections.
+	(elf_xtensa_create_dynamic_sections): Record new sections in the hash
+	table.  Update for plt_reloc_count and add_extra_plt_sections.
+	(add_extra_plt_sections, elf_xtensa_create_plt_entry): Replace dynobj
+	argument with link info.  Update calls to elf_xtensa_get_plt_section
+	and elf_xtensa_get_gotplt_section.
+	(elf_xtensa_allocate_local_got_size, elf_xtensa_size_dynamic_sections)
+	(elf_xtensa_relocate_section, elf_xtensa_finish_dynamic_sections)
+	(elf_xtensa_discard_info_for_section, shrink_dynamic_reloc_sections)
+	(relax_property_section): Get sections from the hash table and update
+	function calls.
+	(elf_xtensa_get_plt_section, elf_xtensa_get_gotplt_section): Replace
+	dynobj argument with link info.  Get sections for first plt chunk from
+	the hash table.
+	(bfd_elf32_bfd_link_hash_table_create): Define.
+
+2007-02-02  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf-bfd.h (struct elf_obj_tdata): Change symbuf type to void *.
+	* elf.c (struct elf_symbuf_symbol, struct elf_symbuf_head): New types.
+	(struct elf_symbol): Change first member into union.
+	(elf_sort_elf_symbol): Compare pointers to internal syms rather than
+	internal syms.  Only compare st_shndx fields.
+	(elf_create_symbuf): New function.
+	(bfd_elf_match_symbols_in_sections): Use it.  If symbufs are available
+	for bfds, use a binary search, otherwise don't qsort symbols
+	unnecessarily only to select which symbols are for the particular
+	shndx.
+
+2007-02-01  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/3852
+	* elf.c (_bfd_elf_link_hash_table_init): Initialize all the fields
+	in the elf_link_hash_table structure.
+
+2007-02-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_backend_data): Add elf_backend_write_core_note.
+	* elfxx-target.h (elf_backend_write_core_note): Define and use.
+	* elf.c (elfcore_write_prpsinfo): Call the above.  Add support for
+	32-bit core note on 64-bit target.
+	(elfcore_write_prstatus): Likewise.
+	(elfcore_write_lwpstatus): Make note_name const.
+	(elfcore_write_prfpreg): Likewise.
+	(elfcore_write_pstatus): Add support for 32-bit core note on 64-bit
+	target.
+	* elf32-ppc.c (ppc_elf_write_core_note): New function.
+	(elf_backend_write_core_note): Define.
+	* elf64-ppc.c (ppc64_elf_write_core_note): New function.
+	(elf_backend_write_core_note): Define.
+
+2007-01-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-cris.c (INCLUDED_TARGET_FILE): Removed.
+	(elf32_bed): Defined for elf32-us-cris.
+
+	* elf64-sh64.c (elf64_bed): Defined for Linux.
+	(INCLUDED_TARGET_FILE): Removed.
+
+	* elfxx-target.h (elfNN_bed): Always define. Don't check
+	INCLUDED_TARGET_FILE.
+
+2007-01-31  DJ Delorie  <dj@redhat.com>
+
+	* elf-m10300.c (mn10300_elf_relocate_section): Clarify the warning
+	message for dangerous relocs, special case the common user error.
+
+2007-01-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (copy_elf_program_header): Start from the first section
+	in a segment and stop when all sections in a segment are
+	accounted for.
+
+2007-01-29  Julian Brown  <julian@codesourcery.com>
+
+	* bfd-in2.h: Regenerate.
+	* bfd-in.h (bfd_arm_vfp11_fix): New enum. Specify how VFP11
+	instruction scanning should be done.
+	(bfd_elf32_arm_init_maps, bfd_elf32_arm_vfp11_erratum_scan)
+	(bfd_elf32_arm_vfp11_fix_veneer_locations): Add prototypes.
+	(bfd_elf32_arm_set_target_relocs): Add vfp11 fix type argument to
+	prototype.
+	* elf-bfd.h (elf_backend_write_section): Add struct bfd_link_info
+	argument.
+	* elf32-arm.c (VFP11_ERRATUM_VENEER_SECTION_NAME)
+	(VFP11_ERRATUM_VENEER_ENTRY_NAME): Define macros.
+	(elf32_vfp11_erratum_type): New enum.
+	(elf32_vfp11_erratum_list): New struct. List of veneers or jumps to
+	veneers.
+	(_arm_elf_section_data): Add mapsize, erratumcount, erratumlist.
+	(elf32_arm_link_hash_table): Add vfp11_erratum_glue_size,
+	vfp11_fix and num_vfp11_fixes fields.
+	(elf32_arm_link_hash_table_create): Initialise vfp11_fix,
+	vfp11_erratum_glue_size, num_vfp11_fixes fields.
+	(VFP11_ERRATUM_VENEER_SIZE): Define. Size of an (ARM) veneer.
+	(bfd_elf32_arm_allocate_interworking_sections): Initialise erratum
+	glue section.
+	(elf32_arm_section_map_add): Add an code/data mapping symbol entry
+	to a section's map.
+	(record_vfp11_erratum_veneer): Create a single veneer, and its
+	associated symbols.
+	(bfd_elf32_arm_add_glue_sections_to_bfd): Add vfp11 erratum glue.
+	(bfd_elf32_arm_init_maps): Initialise mapping symbol table for input
+	BFDs.
+	(bfd_elf32_arm_set_vfp11_fix): Set the type of erratum workaround
+	required.
+	(bfd_arm_vfp11_pipe): Define VFP11 instruction pipes.
+	(bfd_arm_vfp11_regno): Recode a register number from a VFP11 insn.
+	(bfd_arm_vfp11_write_mask): Update write mask according to coded
+	register number.
+	(bfd_arm_vfp11_antidependency): New function.
+	(bfd_arm_vfp11_insn_decode): Decode a VFP11 insn.
+	(elf32_arm_compare_mapping): Declare.
+	(bfd_elf32_arm_vfp11_erratum_scan): Scan the sections of an input
+	BFD for potential erratum-triggering insns. Record results.
+	(bfd_elf32_arm_vfp11_fix_veneer_locations): Find out where veneers
+	and branches to veneers have been placed in virtual memory after
+	layout.
+	(bfd_elf32_arm_set_target_relocs): Set vfp11_fix field in global
+	hash table.
+	(elf32_arm_output_symbol_hook): Remove.
+	(elf32_arm_write_section): Output veneers, and branches to veneers.
+	Use maps from input sections, not output sections, for code
+	byte-swapping.
+	* elf32-ppc.c (ppc_elf_write_section): Add dummy link_info argument.
+	* elf32-score.c (_bfd_score_elf_write_section): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_write_section): Likewise.
+	* elfxx-mips.h (_bfd_mips_elf_write_section): Likewise.
+
+2007-01-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-hppa.c (elf64_bed): Defined for HPUX and Linux.
+	(INCLUDED_TARGET_FILE): Removed.
+
+2007-01-27  Mike Frysinger  <vapier@gentoo.org>
+
+	* elf32-hppa.c (elf32_bed): Define for hpux, linux and netbsd.
+	(INCLUDED_TARGET_FILE): Remove.
+
+2007-01-25  DJ Delorie  <dj@redhat.com>
+
+	* elf32-m32c.c (m32c_elf_howto_table): Don't complain about
+	R_M32C_16 or R_M32C_24 relocs.
+
+2007-01-25  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/3874
+	* elf32-avr.c (avr_link_hash_table): Check to make sure that the
+	hash table was created by elf32_avr_link_hash_table_create before
+	using it.
+	(elf32_avr_link_hash_newfunc): New function.  Just pass the call
+	through to _bfd_elf_link_hash_newfunc.
+	(elf32_avr_link_hash_table_create): Use
+	elf32_avr_link_hash_newfunc instead of
+	_bfd_elf_link_hash_newfunc.
+	(elf32_avr_relocate_section): Check for the hash table pointer
+	being NULL.
+	(elf32_avr_relax_section, avr_build_one_stub,
+	elf32_avr_setup_params, get_local_syms, elf32_avr_size_stubs,
+	elf32_avr_build_stubs): Likewise.
+
+2007-01-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/3831
+	* elf-bfd.h (bfd_elf_link_mark_dynamic_symbol): Add an
+	argument, Elf_Internal_Sym *.
+
+	* elflink.c (bfd_elf_link_mark_dynamic_symbol): Mark a data
+	symbol dynamic if info->dynamic_data is TRUE.
+	(bfd_elf_record_link_assignment): Updated call to
+	bfd_elf_record_link_assignment.
+	(_bfd_elf_merge_symbol): Likewise.  Always call
+	bfd_elf_link_mark_dynamic_symbol.
+
+2007-01-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am (BFD_LIBS): Removed.
+	* Makefile.in: Regenerated.
+
+2007-01-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/3631
+	* Makefile.am (OFILES): Add @bfd64_libs@.
+	(libbfd_la_SOURCES): Remove $(BFD64_LIBS_CFILES).
+	* Makefile.in: Regenerated.
+
+	* configure.in (bfd_libs): Replaced by ...
+	(bfd64_libs): This.
+	* configure: Regenerated.
+
+2007-01-11  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf.c (assign_file_positions_for_load_sections): We can
+	require fewer phdrs than expected.
+
+2007-01-08  Kazu Hirata  <kazu@codesourcery.com>
+
+	* archures.c (bfd_mach_cpu32_fido): Rename to bfd_mach_fido.
+	* bfd-in2.h: Regenerate.
+	* cpu-m68k.c (arch_info_struct): Use bfd_mach_fido instead of
+	bfd_mach_cpu32_fido.
+	(m68k_arch_features): Use fido_a instead of cpu32.
+	(bfd_m68k_compatible): Reject the combination of Fido and
+	ColdFire.  Accept the combination of CPU32 and Fido with a
+	warning.
+	* elf32-m68k.c (elf32_m68k_object_p,
+	elf32_m68k_merge_private_bfd_data,
+	elf32_m68k_print_private_bfd_data): Treat Fido as an
+	architecture by itself.
+
+2007-01-08  Kai Tietz	<kai.tietz@onevision.com>
+
+	* config.bfd: Renamed target x86_64-*-mingw64 to x86_64-*-mingw*.
+
+2007-01-05  Jakub Jelinek  <jakub@redhat.com>
+
+	* texhex.c (first_phase): Don't fall through into the default
+	case.
+	(pass_over): Replace abort () calls with return FALSE.  Fix
+	buffer overflow.
+
+2007-01-04  Jie Zhang  <jie.zhang@analog.com>
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Don't set
+	SEC_EXCLUDE on zero size .eh_frame.
+
+For older changes see ChangeLog-2006
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-2008 sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-2008
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-2008	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-2008	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3386 @@
+2008-12-29  Arnold Metselaar  <arnold.metselaar@planet.nl>
+
+	* coff-z80.c (r_imm32): Fix copy-paste bug that caused z80-objdump to
+	issue warnings about stabs debugging symbols rather than to show them.
+
+2008-12-23  Jon Beniston <jon@beniston.com>
+
+	* Makefile.am: Add LM32 object files and dependencies.
+	* Makefile.in: Regenerate.
+	* archures.c: Add LM32 architechiture info.
+	* targets.c: Likewise.
+	* reloc.c: Likewise.
+	* bfd-in2.h: Regenerate.
+	* config.bfd: Add LM32 targets.
+	* configure.in: Likewise.
+	* configure: Regenerate.
+	* cpu-lm32.c: New file.
+	* elf32-lm32.c: New file.
+
+2008-12-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/7036
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Assume linker will
+	always insert 32byte between the .plt and .text sections after
+	the the first relaxation pass.
+
+2008-12-23  Nick Clifton  <nickc@redhat.com>
+
+	PR 7093
+	* elf32-arm.c (bfd_elf32_arm_init_maps): Only process ARM ELF
+	object files.
+
+2008-12-23  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_make_bfd_section): Use the standard ELF name
+	.eh_frame for __TEXT.__eh_frame so that it is recognized by gdb.
+	Use shorter sections name for well known sections.
+	(bfd_mach_o_scan_read_dylinker): Only put dylinker name in the
+	section content.
+	(bfd_mach_o_scan_read_segment): Use shorter sections name for
+	well known segments.
+	(bfd_mach_o_scan_read_command): Ignore some new commands.
+	(bfd_mach_o_openr_next_archived_file): Use more descriptive names
+	for members filename.
+	(bfd_mach_o_fat_extract): New function to easily extract members
+	of a fat binary.
+	* mach-o.h (bfd_mach_o_load_command_type): Add new constants.
+	(bfd_mach_o_dylinker_command): Fix comment and reindent.
+	(bfd_mach_o_fat_extract): New prototype.
+
+2008-12-23  Johan Olmutz Nielsen  <jnielsen@ddci.com>
+
+	* coffcode.h (coff_write_object_contents): Always initialise
+	section.s_page.
+
+2008-12-23  Andreas Schwab  <schwab@suse.de>
+
+	* elf32-m68k.c (elf_m68k_discard_copies): Use SYMBOL_CALLS_LOCAL.
+	(elf_m68k_relocate_section): Use SYMBOL_CALLS_LOCAL and
+	SYMBOL_REFERENCES_LOCAL.
+	(elf_m68k_relocate_section): Likewise.
+
+2008-12-23  Nick Clifton  <nickc@redhat.com>
+
+	* elf-bfd.h (struct bfd_elf_section_data): Remove indirect_relocs
+	field.
+	(_bfd_elf_make_ifunc_reloc_section): Remove prototype.
+	* elf.c (swap_out_syms): Remove STT_IFUNC support.
+	(elf_find_function): Likewise.
+	* elf32-arm.c (arm_elf_find_function): Likewise.
+	(elf32_arm_adjust_dynamic_symbol): Likewise.
+	(elf32_arm_swap_symbol_in): Likewise.
+	(elf32_arm_is_function_type): Likewise.
+	* elf32-i386.c (is_indirect_symbol): Delete.
+	(elf_i386_check_relocs): Remove STT_IFUNC support.
+	(allocate_dynrelocs): Likewise.
+	(elf_i386_relocate_section): Likewise.
+	* elf64-x86-64.c (is_indirect_symbol): Delete.
+	(elf64_x86_64_check_relocs): Remove STT_IFUNC support.
+	(allocate_dynrelocs): Likewise.
+	(elf64_x86_64_relocate_section): Likewise.
+	* elfcode.h (elf_slurp_symbol_table): Likewise.
+	* elflink.c (_bfd_elf_adjust_symbol): Likewise.
+	(get_ifunc_reloc_section_name): Delete.
+	(_bfd_elf_make_ifunc_reloc_section): Delete.
+	* syms.c (BSF_INDIRECT_FUNCTION): Delete.
+	(bfd_print_symbol_vandf): Remove STT_IFUNC support.
+	(bfd_decode_symclass): Likewise.
+	* bfd-in2.h: Regenerate.
+
+2008-12-20  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c 	(cris_elf_howto_table): Add entry for R_CRIS_32_IE.
+	(cris_reloc_map): Similarly.
+	(cris_elf_relocate_section, cris_elf_gc_sweep_hook)
+	(cris_elf_check_relocs): Handle R_CRIS_32_IE.
+	* reloc.c (bfd_reloc_code_type): Add entry for R_CRIS_32_IE.
+	* bfd-in2.h, libbfd.h: Regenerate.
+
+2008-12-18  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure: Regenerate.
+
+2008-12-17  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (elf_cris_copy_indirect_symbol): Return without
+	action for symbols other than bfd_link_hash_indirect.
+	(cris_elf_relocate_section) <R_CRIS_8, R_CRIS_16, R_CRIS_32>: Add missing
+	gate h != NULL for h->def_regular test.
+
+2008-12-15  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (elf_cris_copy_indirect_symbol): New function.
+	(elf_backend_copy_indirect_symbol): Define to above.
+
+	* elf32-cris.c (struct elf_cris_pcrel_relocs_copied): New member
+	r_type.  Fix formatting.
+	(cris_elf_relocate_section) <R_CRIS_8_PCREL, R_CRIS_16_PCREL>
+	<R_CRIS_32_PCREL>: Also break early if the symbol doesn't get
+	emitted as a dynamic one.
+	(cris_elf_check_relocs) <R_CRIS_7, R_CRIS_16, R_CRIS_32>: Fork
+	from PCREL relocs code and simplify; don't fall through.
+	<R_CRIS_8_PCREL, R_CRIS_16_PCREL, R_CRIS_32_PCREL>: Simplify for
+	pcrel only.  For non-local or overridable symbols in a DSO, always
+	keep count of relocs, not just when -Bsymbolic.  Don't emit
+	message nor mark as TEXTREL here.
+	(elf_cris_discard_excess_dso_dynamics): Emit warning and mark as
+	TEXTREL here, if there are nondiscarded pcrel relocs.
+
+	* elf32-cris.c (elf_cris_got_elt_size) <symtab_hdr>: Initialize
+	using ibfd, not abfd.
+
+2008-12-11  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 7041
+	* elf64-ppc.c (func_desc_adjust): Correct logic making fake function
+	descriptors.  Similarly correct making function descriptors dynamic.
+
+2008-12-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.h (struct spu_elf_params): Add num_regions.
+	* elf32-spu.c (spu_elf_auto_overlay): Handle multiple overlay regions.
+
+2008-12-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.g (struct spu_elf_params, enum _ovly_flavour): New.
+	(spu_elf_setup): Declare.
+	(spu_elf_create_sections, spu_elf_size_stubs): Update prototype.
+	(spu_elf_build_stubs, spu_elf_check_vma): Likewise.
+	* elf32-spu.c (struct spu_link_hash_table): Add "params". Remove
+	various other fields now in "params".  Adjust code throughout.
+	(struct call_info, struct function_info): Move earlier in file.
+	(struct spu_elf_stack_info): Likewise.
+	(spu_elf_setup): New function.
+	(spu_elf_create_sections): Remove args other than "info".
+	(spu_elf_size_stubs, spu_elf_build_stubs, spu_elf_check_vma): Likewise.
+	(maybe_needs_stubs): Remove "output_bfd" arg.  Adjust all calls.
+	(interesting_section): Similarly with "obfd" arg.
+	(needs_ovl_stub): Adjust output_section test.
+	(allocate_spuear_stubs): Likewise.
+	(OVL_STUB_SIZE): Don't define.
+	(ovl_stub_size): New function, use in place of OVL_STUB_SIZE.
+	(build_stub): Test params->ovly_flavour rather than OVL_STUB_SIZE.
+	(spu_elf_auto_overlay): Remove args other than "info".  Make use
+	of size returned from spu_elf_load_ovl_mgr.
+	(spu_elf_stack_analysis): Remove args other than "info".
+	(spu_elf_relocate_section): Tidy setting of "ea".
+
+2008-12-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (find_function_stack_adjust): Don't limit number
+	of insns scanned.  Correct sp tests.  Handle "fsmbi" and "andbi".
+	(mark_detached_root): New function.
+	(build_call_tree): Call it.
+	(sort_calls): Don't do void* arithmetic.
+	(define_ovtab_symbol): Don't abort on symbols defined in linker scripts.
+	(discover_functions): Consider STT_SECTION symbols too.
+	(collect_lib_sections): Don't cut short call tree traversal
+	when function size is too large.
+
+2008-12-09  Tom Tromey  <tromey@redhat.com>
+
+	* pef.c (bfd_pef_parse_traceback_table): Add parens to placate gcc
+	4.4.
+
+2008-12-09  Tristan Gingold  <gingold@adacore.com>
+
+	* cpu-avr.c (compatible): Makes avr-6 compatible only with itself.
+
+2008-12-04  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* elf64-s390.c (elf_s390_check_relocs): Initialize
+	htab->elf.dynobj if necessary.
+
+2008-12-03  Nick Clifton  <nickc@redhat.com>
+
+	* syms.c (struct bfd_symbol): Add new flag BSF_INDIRECT_FUNCTION.
+	Remove redundant flag BFD_FORT_COMM_DEFAULT_VALUE.  Renumber flags
+	to remove gaps.
+	(bfd_print_symbol_vandf): Return 'i' for BSF_INDIRECT_FUNCTION.
+	(bfd_decode_symclass): Likewise.
+	* elf.c (swap_out_syms): Translate BSF_INDIRECT_FUNCTION into
+	STT_IFUNC.
+	(elf_find_function): Treat STT_IFUNC in the same way as STT_FUNC.
+	(_bfd_elf_is_function_type): Likewise.
+	* elf32-arm.c (arm_elf_find_function): Likewise.
+	(elf32_arm_adjust_dynamic_symbol): Likewise.
+	(elf32_arm_swap_symbol_in): Likewise.
+	(elf32_arm_additional_program_headers): Likewise.
+	* elf32-i386.c (is_indirect_symbol): New function.
+	(elf_i386_check_relocs): Also generate dynamic relocs for
+	relocations against STT_IFUNC symbols.
+	(allocate_dynrelocs): Likewise.
+	(elf_i386_relocate_section): Likewise.
+	* elf64-x86-64.c (is_indirect_symbol): New function.
+	(elf64_x86_64_check_relocs): Also generate dynamic relocs for
+	relocations against STT_IFUNC symbols.
+	(allocate_dynrelocs): Likewise.
+	(elf64_x86_64_relocate_section): Likewise.
+	* elfcode.h (elf_slurp_symbol_table): Translate STT_IFUNC into
+	BSF_INDIRECT_FUNCTION.
+	* elflink.c (_bfd_elf_adjust_dynamic_reloc_section): Add support
+	for STT_IFUNC symbols.
+	(get_ifunc_reloc_section_name): New function.
+	(_bfd_elf_make_ifunc_reloc_section): New function.
+	* elf-bfd.h (struct bfd_elf_section_data): Add indirect_relocs field.
+	* bfd-in2.h: Regenerate.
+
+2008-12-02  Tristan Gingold  <gingold@adacore.com>
+
+	* config.bfd: Add x86_64-*-darwin*
+
+2008-11-28  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* hpux-core.c: Don't include sys/file.h.
+
+2008-11-28  Joshua Kinard  <kumba@gentoo.org>
+
+	* aoutx.h (NAME): Add case statements for bfd_mach_mips14000,
+	bfd_mach_mips16000.
+	* archures.c (bfd_architecture): Add .#defines for bfd_mach_mips14000,
+	bfd_mach_mips16000.
+	* bfd-in2.h: Regenerate.
+	* cpu-mips.c: Add enums I_mips14000, I_mips16000.
+	(arch_info_struct): Add refs to R14000, R16000.
+	* elfxx-mips.c (mips_set_isa_flags): Handle bfd_mach_mips14000,
+	bfd_mach_mips16000.
+	(mips_mach_extensions): Map R14000, R16000 to R10000.
+
+2008-11-27   M R Swami Reddy <MR.Swami.Reddy@nsc.com>
+
+	* Add PIC support for CR16 target.
+	* elf32-cr16.c (R_CR16_GOT_REGREL20, R_CR16_GOTC_REGREL20 and
+	R_CR16_GLOB_DAT): New macros
+	(cr16_elf_howto_table): Add entries for for R_CR16_GOT_REGREL20,
+	R_CR16_GOTC_REGREL20 and R_CR16_GLOB_DAT.
+	(cr16_reloc_map): Ditto
+	(_bfd_cr16_elf_create_got_section): New function to create GOT section.
+	(_bfd_cr16_elf_create_dynamic_sections): New function to create dynamic
+	section.
+	(_bfd_cr16_elf_adjust_dynamic_symbol): New function to adjust symbol
+	defined by dynamic object.
+	(_bfd_cr16_elf_size_dynamic_sections): New function to find the size of
+	dynamic sections.
+	(_bfd_cr16_elf_finish_dynamic_symbol): New function to handle dynamic
+	symbols.
+	(_bfd_cr16_elf_finish_dynamic_symbol): New function to handle dynamic
+	sections.
+	(bfd_cr16_elf32_create_embedded_relocs): New function to create
+	embedded relocs in .emreloc section in memory for .data.rel section.
+	(_bfd_cr16_elf_reloc_type_class): New function for classify reloc types.
+	(cr16_elf_check_relocs): New function for checking reloc types in first
+	phase.
+	(cr16_elf_final_link_relocate): Update for handling the new reloc types
+	R_CR16_GOT_REGREL20 and R_CR16_GOTC_REGREL20.
+	(elf32_cr16_relax_section): Update relax implementation.
+	* reloc.c (bfd_reloc_code_type): Add entries for R_CR16_GOT_REGREL20,
+	R_CR16_GOTC_REGREL20 and R_CR16_GLOB_DAT.
+	* bfd-in.h (bfd_boolean bfd_cr16_elf32_create_embedded_relocs): Declared
+	* libbfd.h, bfd-in2.h: Regenerate.
+
+2008-11-26  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 7047
+	* configure.in: Bump version.
+	* configure: Regenerate.
+	* elflink.c (_bfd_elf_link_assign_sym_version): Continue matching
+	against version nodes when a global match is a wildcard.  Similarly
+	continue matching on local wildcard matches, rather than only
+	continuing for "*".  Have any global wildcard match override a
+	local wildcard match.  Correct logic hiding unversioned symbol.
+	(bfd_elf_size_dynamic_sections): Update for changes to struct
+	bfd_elf_version_expr.
+
+2008-11-25  Joel Brobecker  <brobecker@adacore.com>
+
+	* configure.in: Deactivate large-file support on native x86-solaris
+	as well unless the user explicitly requested it.
+	* configure: Regenerate.
+
+2008-11-25  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Do not turn
+	branches to undefine weak symbols into branches to the next
+	instruction if creating PLT entries for those symbols.
+
+2008-11-25  Nick Clifton  <nickc@redhat.com>
+
+	* elflink.c (is_reloc_section): New function.  Returns true if the
+	given name matches the name of the reloc-containing section
+	associated with the given section.
+	(get_dynamic_reloc_section_name): New function.  Computes the name
+	of the section that contains the dynamic relocs associated with
+	the given section.
+	(_bfd_elf_get_dynamic_reloc_section): New function.  Returns a
+	pointer to the section containing the dynamic relocs associated
+	with the given section.
+	(_bfd_elf_make_dynamic_reloc_section): New function.  Creates a
+	section to contain the dynamic relocs associated with a given
+	section.
+	* elf-bfd.h: Prototype the new functions.
+	* elf-m10300.c (mn10300_elf_check_relocs): Use new functions.
+	(mn10300_elf_final_link_relocs): Likewise.
+	* elf32-arm.c (reloc_section_p): Delete - replaced by new
+	functions.
+	(elf32_arm_final_link_relocate): Use new functions.
+	(elf32_arm_check_relocs): Likewise.
+	* elf32-cris.c (cris_elf_relocate_section): Likewise.
+	(elf_cris_check_relocs): Likewise.
+	* elf32-hppa.c (elf32_hppa_check_relocs): Likewise.
+	* elf32-i370.c (i370_elf_check_relocs): Likewise.
+	(i370_elf_relocate_section): Likewise.
+	* elf32-i386.c (elf_i386_check_relocs): Likewise.
+	* elf32-m32r.c (m32r_elf_relocate_section): Likewise.
+	(m32r_elf_check_relocs): Likewise.
+	* elf32-m68k.c (elf_m68k_check_relocs): Likewise.
+	* elf32_ppc.c (ppc_elf_check_relocs): Likewise.
+	(ppc_elf_relocate_section): Likewise.
+	* elf32-s390.c (elf_s390_check_relocs): Likewise.
+	* elf32-sh.c (sh_elf_relocate_section): Likewise.
+	(sh_elf_check_relocs): Likewise.
+	* elf32-vax.c (elf_vax_check_relocs): Likewise.
+	(elf_vax_relocate_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_check_relocs): Likewise.
+	* elf64-ppc.c (ppc64_elf_check_relocs): Likewise.
+	* elf64-s390.c (elf_s390_check_relocs): Likewise.
+	* elf64-sh64.c (sh_elf64_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_check_relocs): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_check_relocs): Likewise.
+	* elf32-bfin.c (bfin_check_relocs): Remove redundant local
+	variable 'sreloc'.
+	(bfin_relocate_section): Likewise.
+	* elf32-v850.c (v850_elf_check_relocs): Likewise.
+
+2008-11-23  Hans-Peter Nilsson  <hp@axis.com>
+
+	Implement TLS for CRIS.
+	* elf32-cris.c: Include limits.h.
+	(TLSHOWTO16): Redefine in terms of and move contents to...
+	(TLSHOWTO16X): New macro.
+	(TLSHOWTO16S, LGOT_REG_NDX, LGOT_DTP_NDX, LGOT_ALLOC_NELTS_FOR)
+	(elf_cris_hash_entry): New macros.
+	(cris_elf_howto_table): Make R_CRIS_16_DTPREL,
+	R_CRIS_16_GOT_TPREL, R_CRIS_16_TPREL check overflow for signed,
+	not unsigned values.
+	(cris_info_to_howto_rela): Make r_type a enum elf_cris_reloc_type,
+	not unsigned int.
+	(struct elf_cris_link_hash_entry): New members reg_got_refcount,
+	tprel_refcount, and dtp_refcount.
+	(struct elf_cris_link_hash_table): New member dtpmod_refcount.
+	(elf_cris_link_hash_newfunc): Initialize new members.
+	(elf_cris_link_hash_table_create): Similar.
+	(cris_final_link_relocate, elf_cris_reloc_type_class): Use a
+	temporary variable when testing the relocation type.
+	(cris_elf_gc_mark_hook): Ditto.  Add default case where needed.
+	(cris_elf_gc_sweep_hook): Ditto.  Handle reference-counting for
+	the new assembly-generated relocs.  Rewrite refcount handling to
+	set temporary variables to pointers to reloc-specific variables
+	and entry size and common code for the update.
+	(additional_relocation_error_msg_count): New variable.
+	(cris_elf_relocate_section): Use a function-local variable srelgot
+	for the .rela.got section instead of looking it up for every need.
+	Make r_type a enum elf_cris_reloc_type, not int.  Actually set
+	symname for non-local symbols.  Handle new assembly-generated
+	relocs.  For overflow, emit additional messages for the new 16-bit
+	relocs as well as R_CRIS_16_GOTPLT and R_CRIS_16_GOT.
+	(elf_cris_finish_dynamic_symbol): Use elf_cris_finish_dynamic_symbol
+	instead of plain casts.  Check new hash entry member
+	reg_got_refcount when checking whether to emit a GOT entry.
+	(elf_cris_finish_dynamic_sections): Update head comment to warn
+	about emitting relocs here.  Use a temporary variable when testing
+	the relocation type.
+	(elf_cris_discard_excess_program_dynamics)
+	(elf_cris_adjust_gotplt_to_got): Handle reference counting change
+	regarding h->reg_got_refcount.
+	(cris_elf_check_relocs): Rewrite refcount handling to set
+	temporary variables and entry size and common code for the update
+	for local symbols.  Use new macro elf_cris_hash_entry.  Adjust
+	allocation for change in reference counting of GOT entries for
+	local symbols.
+	(elf_cris_size_dynamic_sections): Adjust calculated size of
+	.got.plt and .rela.got if we need a GOT entry for a
+	R_CRIS_DTPMOD relocation.
+	(elf_cris_got_elt_size): New function.
+	(elf_backend_got_elt_size): Define.
+
+2008-11-21  Sterling Augustine  <sterling@tensilica.com>
+
+	* xtensa-isa.c (xtensa_state_is_shared_or): New function.
+
+2008-11-21  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf-bfd.h (struct elf_backend_data): New member got_elt_size.
+	(_bfd_elf_default_got_elt_size): Declare.
+	* elflink.c (struct alloc_got_off_arg): Replace member got_elt_size
+	by new member info.
+	(elf_gc_allocate_got_offsets): Adjust for calling bed->got_elt_size
+	to get the element size instead of using a gofarg entry.
+	(bfd_elf_gc_common_finalize_got_offsets): Similar.
+	(_bfd_elf_default_got_elt_size): New function.
+	* elfxx-target.h: New macro elf_backend_got_elt_size.
+	(elfNN_bed): Use it.
+
+2008-11-20  Tristan Gingold  <gingold@adacore.com>
+
+	* bfdwin.c: Fix comment.
+
+2008-11-20  Tristan Gingold  <gingold@adacore.com>
+
+	* bfd.c (is32bit): Use architecture information for non-ELF
+	targets.
+
+2008-11-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (allocate_dynrelocs): Always use tlsld_got for
+	TLS_LD even when symbol is used with other TLS reloc types.
+	(ppc_elf_relocate_section): Bypass symbol checks when using tlsld_got.
+	Leave addend zero on LD DTPMOD dynamic reloc.
+
+2008-11-19  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-modules.c (sysregs): Add MMID, VECBASE, EPC5, EPC6, EPC7,
+	EXCSAVE5, EXCSAVE6, EXCSAVE7, EPS5, EPS6, EPS7, CPENABLE,
+	SCOMPARE1, and THREADPTR registers.
+	(NUM_SYSREGS, MAX_USER_REG): Update.
+	(states): Change width of INTERRUPT, WindowBase, WindowStart, and
+	INTENABLE.  Add VECBASE, EPC5, EPC6, EPC7, EXCSAVE5, EXCSAVE6,
+	EXCSAVE7, EPS6, EPS6, EPS7, THREADPTR, CPENABLE, and SCOMPARE1 states.
+	(NUM_STATES): Update.
+	(enum xtensa_state_id): Add entries for new states.
+	(enum xtensa_field_id): Add entries for xt_wbr15_imm and xt_wbr18_imm
+	fields, along with functions to extract and set them.
+	(regfiles): Change number of AR registers to 32.
+	(Operand_ar0_encode, Operand_ar4_encode, Operand_ar8_encode,
+	Operand_ar12_encode, Operand_ars_entry_encode): Update register mask.
+	(operands): Add entries for tp7, xt_wbr15_label, xt_wbr18_label,
+	xt_wbr15_imm, and xt_wbr18_imm operands, along with functions to
+	encode and decode them.
+	(enum xtensa_operand_id): Add entries for new operands.
+	(Iclass_xt_iclass_rfi_stateArgs): Add EPC5, EPC6, EPC7, EPS5, EPS6, and
+	EPC7 states.
+	(Iclass_xt_iclass_rfdo_stateArgs): Replace EPC4 and EPS4 by EPC6 and
+	EPS6, respectively.
+	(iclasses): Add entries for rur_threadptr, wur_threadptr,
+	xt_iclass_wsr_176, xt_iclass_rsr_epc5, xt_iclass_wsr_epc5,
+	xt_iclass_xsr_epc5, xt_iclass_rsr_excsave5, xt_iclass_wsr_excsave5,
+	xt_iclass_xsr_excsave5, xt_iclass_rsr_epc6, xt_iclass_wsr_epc6,
+	xt_iclass_xsr_epc6, xt_iclass_rsr_excsave6, xt_iclass_wsr_excsave6,
+	xt_iclass_xsr_excsave6, xt_iclass_rsr_epc7, xt_iclass_wsr_epc7,
+	xt_iclass_xsr_epc7, xt_iclass_rsr_excsave7, xt_iclass_wsr_excsave7,
+	xt_iclass_xsr_excsave7, xt_iclass_rsr_eps5, xt_iclass_wsr_eps5,
+	xt_iclass_xsr_eps5, xt_iclass_rsr_eps6, xt_iclass_wsr_eps6,
+	xt_iclass_xsr_eps6, xt_iclass_rsr_eps7, xt_iclass_wsr_eps7,
+	xt_iclass_xsr_eps7, xt_iclass_rsr_vecbase, xt_iclass_wsr_vecbase,
+	xt_iclass_xsr_vecbase, xt_iclass_mul16, xt_iclass_wsr_mmid,
+	xt_iclass_icache_lock, xt_iclass_dcache_lock, xt_iclass_rsr_cpenable,
+	xt_iclass_wsr_cpenable, xt_iclass_xsr_cpenable, xt_iclass_clamp,
+	xt_iclass_minmax, xt_iclass_sx, xt_iclass_l32ai, xt_iclass_s32ri,
+	xt_iclass_s32c1i, xt_iclass_rsr_scompare1, xt_iclass_wsr_scompare1,
+	xt_iclass_xsr_scompare1, xt_iclass_div, and xt_iclass_mul32, along
+	with corresponding argument and state argument arrays.  Change
+	number of state arguments for xt_iclass_rfi.  Add arguments for
+	xt_iclass_rfdo.
+	(enum xtensa_iclass_id): Add entries for new iclasses.
+	(opcodes): Add entries for RUR_THREADPTR, WUR_THREADPTR, WSR_176,
+	RSR_EPC5, WSR_EPC5, XSR_EPC5, RSR_EXCSAVE5, WSR_EXCSAVE5, XSR_EXCSAVE5,
+	RSR_EPC6, WSR_EPC6, XSR_EPC6, RSR_EXCSAVE6, WSR_EXCSAVE6, XSR_EXCSAVE6,
+	RSR_EPC7, WSR_EPC7, XSR_EPC7, RSR_EXCSAVE7, WSR_EXCSAVE7, XSR_EXCSAVE7,
+	RSR_EPS5, WSR_EPS5, XSR_EPS5, RSR_EPS6, WSR_EPS6, XSR_EPS6, RSR_EPS7,
+	WSR_EPS7, XSR_EPS7, RSR_VECBASE, WSR_VECBASE, XSR_VECBASE, MUL16U,
+	MUL16S, WSR_MMID, IPFL, IHU, IIU, DPFL, DHU, DIU, RSR_CPENABLE,
+	WSR_CPENABLE, XSR_CPENABLE, CLAMPS, MIN, MAX, MINU, MAXU, SEXT, L32AI,
+	S32RI, S32C1I, RSR_SCOMPARE1, WSR_SCOMPARE1, XSR_SCOMPARE1, QUOU, QUOS,
+	REMU, REMS, and MULL opcodes, along with the corresponding functions
+	to encode them.
+	(enum xtensa_opcode_id): Add entries for new opcodes.
+	(Slot_inst_decode): Handle new opcodes.
+	(Slot_inst_get_field_fns, Slot_inst_set_field_fns): Add entries for
+	xt_wbr15_imm and xt_wbr18_imm fields.
+	(Slot_inst16a_get_field_fns, Slot_inst16a_set_field_fns): Likewise.
+	(Slot_inst16b_get_field_fns, Slot_inst16b_set_field_fns): Likewise.
+	(xtensa_modules): Update number of fields, operands, iclasses and
+	opcodes.
+
+2008-11-19  Nix  <nix@esperi.org.uk>
+
+	* elf.c (swap_out_syms) [USE_STT_COMMON]: Fix syntax error.
+
+2008-11-19  Nick Clifton  <nickc@redhat.com>
+
+	PR 7027
+	* elfxx-sparc.c (_bfd_sparc_elf_check_relocs): Treat WPLT30 relocs
+	against local symbols in 64-bit binaries as if they were WDISP30
+	relocs.
+	(_bfd_sparc_elf_relocate_section): Likewise.
+
+2008-11-18  Catherine Moore  <clm@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_merge_eabi_attributes): Merge
+	half-precision attributes.
+	(elf32_arm_copy_one_eabi_other_attribute): New.
+	(elf32_arm_copy_other_attribute_list): New.
+
+2008-11-18  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf2.c (read_section): Fix formatting.
+	(read_n_bytes): Remove unhelpful comment.
+	(read_indirect_string): Pass symbol table to read_section in case
+	the .debug_str section needs relocating.
+
+	PR 7037
+	* elf32-cr16.c (cr16_elf_howto_table): Zero the src_mask field of
+	the reloc descriptions.
+
+2008-11-14  Eric B. Weddington  <eric.weddington@atmel.com>
+
+	PR 7022
+	* elf32-avr.c (bfd_elf_avr_final_write_processing):
+	Add missing break statements.
+
+2008-11-14  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-modules.c (xtensa_state_id): New enum, replacing STATE macros.
+	(xtensa_field_id, xtensa_regfile_id, xtensa_operand_id)
+	(xtensa_iclass_id, xtensa_opcode_id): New enums.
+	Replace hardcoded constants throughout this file with enum values.
+
+2008-11-14  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf.c (assign_file_positions_for_load_sections): Use header_size
+	to avoid moving the load address of file headers.
+	(assign_file_positions_for_load_sections): Set header_size for
+	segments containing the file header.
+
+2008-11-14  Tristan Gingold  <gingold@adacore.com>
+
+	* configure.com: Handle bfd_default_target_size, BFD_HOST_LONG_LONG,
+	BFD_HOST_64BIT_LONG_LONG, BFD_HOSTPTR_T, bfd_file_ptr.
+	Generate bfdver.h.
+	* vms-hdr.c (_bfd_vms_write_hdr): Use strdup/free instead of alloca.
+	* hosts/alphavms.h: Defines macros to bypass i18n.
+	* makefile.vms (OBJS): Update file list.
+	(DEFS): Remove VMS_DEBUG, const, add DEBUGDIR.
+	(CFLAGS): Update flags.
+	* bfdio.c (real_fopen): Add code specific to VMS: extract attributes
+	from modes.
+
+2008-11-13  Joel Brobecker  <brobecker@adacore.com>
+
+	* configure.in: Deactivate large-file support on native 32bit
+	sparc-solaris unless the user explicitly requested it.
+	* configure: Regenerate.
+
+2008-11-13  Hans-Peter Nilsson  <hp@axis.com>
+
+	PR ld/7028
+	* elf.c (assign_file_positions_for_load_sections): Allocate phrds
+	with bfd_zalloc2 instead of bfd_alloc2.  For the amount, use
+	the possibly-preset header-size, not the computed one.
+
+2008-11-13  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 7023
+	* elf.c (bfd_section_from_shdr <SHT_SYMTAB>): Fail on invalid sh_info.
+
+2008-11-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (assign_file_positions_for_non_load_sections): Consolidate
+	PT_GNU_RELRO handling.
+
+2008-11-11  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 7012
+	* dwarf2.c (find_line): Don't keep stale pointers into realloc'd
+	memory.  Return on errors.  Fix memory leak.
+	(_bfd_dwarf2_cleanup_debug_info): Free dwarf_str_buffer.
+
+2008-11-10  Andreas Schwab  <schwab@suse.de>
+
+	PR 7011
+	* elf.c (assign_file_positions_for_non_load_sections): Handle
+	PT_GNU_RELRO specially.
+
+2008-11-06  Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* config.bfd: Add m32c-*-rtems* and m32r-*-rtems*.
+
+2008-11-06  Tom Tromey  <tromey@redhat.com>
+
+	* configure, config.in: Rebuild.
+	* configure.in: Check for fileno.
+	* bfdio.c (close_on_exec): New function.
+	(real_fopen): Use it.
+	(FD_CLOEXEC): New define.
+
+2008-11-06  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.h (BFD_MACH_O_NO_SECT): Add; reorders the macros.
+	(BFD_MACH_O_SYM_NTYPE, BFD_MACH_O_SYM_NSECT,
+	BFD_MACH_O_SYM_NDESC): New macros.
+	(bfd_mach_o_i386_thread_flavour): Define according to the latest
+	definition from system header.
+	(bfd_mach_o_load_command_type): Add BFD_MACH_O_LC_RPATH,
+	BFD_MACH_O_LC_CODE_SIGNATURE.
+	(BFD_MACH_O_SECTION_TYPE_MASK, BFD_MACH_O_SECTION_ATTRIBUTES_MASK,
+	BFD_MACH_O_SECTION_ATTRIBUTES_SYS, BFD_MACH_O_SECTION_ATTRIBUTES_USR,
+	BFD_MACH_O_S_ATTR_LOC_RELOC, BFD_MACH_O_S_ATTR_EXT_RELOC,
+	BFD_MACH_O_S_ATTR_SOME_INSTRUCTIONS, BFD_MACH_O_S_ATTR_DEBUG,
+	BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS): Add.
+	(bfd_mach_o_segment_command): Add room for a nul terminator in
+	segname field.
+	(BFD_MACH_O_PROT_READ, BFD_MACH_O_PROT_WRITE,
+	BFD_MACH_O_PROT_EXECUTE): Add.
+	(INDIRECT_SYMBOL_LOCAL): Renames to BFD_MACH_O_INDIRECT_SYMBOL_LOCAL.
+	(INDIRECT_SYMBOL_ABS): Renames to BFD_MACH_O_INDIRECT_SYMBOL_ABS.
+	(bfd_mach_o_uuid_command): Add the structure.
+	(bfd_mach_o_load_command): Add uuid field.
+	(bfd_get_mach_o_data): New macro.
+	* mach-o.c (bfd_mach_o_bfd_print_private_bfd_data): New function which
+	replaces the macro.
+	(SECTION_TYPE, SECTION_ATTRIBUTES, SECTION_ATTRIBUTES_USR,
+	S_ATTR_PURE_INSTRUCTIONS, SECTION_ATTRIBUTES_SYS,
+	S_ATTR_SOME_INSTRUCTIONS, S_ATTR_EXT_RELOC, S_ATTR_LOC_RELOC): Renamed
+	and moved to mach-o.h.
+	(N_STAB, N_TYPE, N_EXT, N_UNDF, N_ABS, N_TEXT, N_DATA, N_BSS,
+	N_SECT, N_INDR): Removed as they duplicated macros in mach-o.h.
+	(bfd_mach_o_print_symbol): Print much more details.
+	(bfd_mach_o_make_bfd_section): Add prot argument, use canonical
+	dwarf name for dwarf sections.  Precisely set section flags.
+	(bfd_mach_o_scan_read_section_32): Add prot argument.
+	(bfd_mach_o_scan_read_section_64): Ditto.
+	(bfd_mach_o_scan_read_section): Ditto.
+	(bfd_mach_o_scan_read_symtab_symbol): Set section for debugging
+	stabs, set BSF_GLOBAL and LOCAL flags correctly.  Fix section
+	for N_SECT symbols.
+	(bfd_mach_o_i386_flavour_string): Reindent and adjust for new
+	names.
+	(bfd_mach_o_scan_read_symtab): Set HAS_SYMS flags on bfd if there
+	are symbols.
+	(bfd_mach_o_scan_read_uuid): New function.
+	(bfd_mach_o_scan_read_segment): Add a trailing nul.  Segments
+	flags are now simply HAS_CONTENTS.  Pass protection to
+	bfd_mach_o_scan_read_section.
+	(bfd_mach_o_scan_read_command): Decode UUID command.
+	(bfd_mach_o_flatten_sections): Add comments.  Fix flavour names.
+	(bfd_mach_o_scan): Set flags according to file type.
+	(mach_o_fat_archentry): Remove abfd field.
+	(bfd_mach_o_archive_p): Remove initialization of abfd field.
+	(bfd_mach_o_openr_next_archived_file): Find previous archive
+	by position and not by bfd (as former bfds may have been freed).
+	Give architecture name to archived file.
+	* mach-o-target.c (TARGET_NAME): Use generic archive for non fat
+	targets.
+
+2008-10-30  Jay Krell  <jay.krell@cornell.edu>
+
+	* cache.c (cache_bread): Cast void * pointer before performing
+	arithmetic on it.
+
+2008-10-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_process_dot_syms): Renamed from
+	ppc64_elf_check_directives.
+	* elf32-sh-symbian.c (sh_symbian_process_directives): Combine..
+	(sh_symbian_check_directives): ..this
+	(bfd_elf32_sh_symbian_process_directives) ..and this function.
+
+2008-10-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (bfd_elf_final_link): Move code reading relocs to..
+	* elf32-spu.c (spu_elf_count_relocs): ..here.  Adjust params.
+	* elf-bfd.h (struct elf_backend_data): Update elf_backend_count_relocs
+	params.
+
+2008-10-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (bfd_elf_final_link): Use d_ptr rather than d_val
+	where Elf_Internal_Dyn holds an address.
+
+2008-10-10  Nathan Froyd  <froydnj@codesourcery.com>
+
+	* elf32-ppc.c (ppc_elf_merge_obj_attributes): Merge
+	Tag_GNU_Power_ABI_Struct_Return.
+
+2008-10-09  Kai Tietz  <kai.tietz@onevision.com>
+
+	* cofflink.c (_bfd_coff_generic_relocate_section): Dump bfd_vma
+	sized addresses instead of long sized.
+
+2008-10-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_get_synthetic_symtab): Don't attempt to
+	read plt relocs if no dynamic syms.
+
+2008-10-08  Nick Clifton  <nickc@redhat.com>
+
+	* configure.in (ALL_LINGUAS): Add "id".
+	* configure: Regenerate.
+	* po/id.po: New Indonesian translation.
+
+2008-10-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (assign_file_positions_for_load_sections): When checking
+	a segment for contents, don't assume that a non-TLS nobits section
+	must only be followed by nobits sections.
+
+2008-10-04  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (TLSHOWTO32, TLSHOWTO16): New macros.
+	(cris_elf_howto_table): Add entries for R_CRIS_32_GOT_GD,
+	R_CRIS_16_GOT_GD, R_CRIS_32_GD, R_CRIS_DTP, R_CRIS_32_DTPREL,
+	R_CRIS_16_DTPREL, R_CRIS_DTPMOD, R_CRIS_32_GOT_TPREL,
+	R_CRIS_16_GOT_TPREL,  R_CRIS_32_TPREL,  R_CRIS_16_TPREL.
+	(cris_reloc_map): Similarly.
+	* reloc.c (bfd_reloc_code_type): Add entries for
+	BFD_RELOC_CRIS_32_GOT_GD, BFD_RELOC_CRIS_16_GOT_GD,
+	BFD_RELOC_CRIS_32_GD, BFD_RELOC_CRIS_DTP,
+	BFD_RELOC_CRIS_32_DTPREL, BFD_RELOC_CRIS_16_DTPREL,
+	BFD_RELOC_CRIS_DTPMOD, BFD_RELOC_CRIS_32_GOT_TPREL,
+	BFD_RELOC_CRIS_16_GOT_TPREL, BFD_RELOC_CRIS_32_TPREL,
+	BFD_RELOC_CRIS_16_TPREL.
+	* libbfd.h, bfd-in2.h: Regenerate.
+
+2008-10-03  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 6931
+	* elf.c (bfd_elf_set_group_contents): Assign sh_info for ld -r when
+	the signature symbol is global.
+	* elflink.c (elf_link_input_bfd): Ensure group signature symbol
+	is output when ld -r.  Set group sh_info when local.
+	* linker.c (default_indirect_link_order): Handle group sections
+	specially.
+
+2008-09-30  Wesley W. Terpstra  <wesley@terpstra.ca>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* coffgen.c (coff_write_symbols): Check to see if a symbol's flags
+	do not match it class and if necessary update the class.
+	(null_error_handler): New function.  Suppresses the generation of
+	bfd error messages.
+	* coff64-rs6000.c (bfd_xcoff_backend_data): Update comment.
+
+2008-09-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2008-09-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_link_add_object_symbols): Don't ignore returned
+	value of check_directives.
+
+2008-09-29  Peter O'Gorman  <pogma@thewrittenword.com>
+	    Steve Ellcey  <sje@cup.hp.com>
+
+	* configure: Regenerate for new libtool.
+	* aclocal.m4: Ditto.
+	* Makefile.in: Ditto.
+	* doc/Makefile.in: Ditto.
+
+2008-09-29  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 6789
+	* elf.c (assign_file_positions_for_load_sections): Call
+	_bfd_elf_map_sections_to_segments, not elf_modify_segment_map.
+	(get_program_header_size): Protect against NULL info.
+	(_bfd_elf_map_sections_to_segments): Likewise.
+	* elf32-spu.c (spu_elf_additional_program_headers): Likewise.
+
+2008-09-29  Nick Clifton  <nickc@redhat.com>
+
+	* po/vi.po: Updated Vietnamese translation.
+
+2008-09-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (_bfd_elf_init_private_section_data): Tweak union copy.
+	(bfd_section_from_shdr): Don't change SHT_GROUP section name.
+	* elflink.c (section_signature): New function.
+	(_bfd_elf_section_already_linked): Use it.
+
+2008-09-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_finish_dynamic_sections): Handle vxworks
+	_GLOBAL_OFFSET_TABLE_ in .got.plt section.  Add BFD_ASSERTs.
+
+2008-09-17  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (elf_xtensa_check_relocs): Check for negative
+	refcount.
+
+2008-09-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	PR 6893 - Do not consider FDEs for discarded sections as invalid.
+	* elf-eh-frame.c (_bfd_elf_parse_eh_frame): New REQUIRE_CLEARED_RELOCS.
+	Consider FDEs with cleared relocations as valid and ignorable.
+
+2008-09-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/6877
+	* elflink.c (_bfd_elf_merge_symbol): Allow a common symbol to
+	override the function in a shared library.
+
+2008-09-16  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 6844
+	* elf32-ppc.c (SYM_VAL): Define.  Use throughout to find symbol vma.
+	(ppc_elf_relocate_section): Correct GOT offset calculation.
+	(ppc_elf_finish_dynamic_symbol): Use PPC_HA and PPC_LO.
+	(ppc_elf_finish_dynamic_sections): Likewise.  Error if
+	htab->elf.hgot symbol is not defined in htab->got section.
+
+2008-09-16  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 6888
+	* elf32-ppc.c (ppc_elf_relocate_section): Handle NULL symbol section
+	on R_PPC_TOC16, R_PPC_SDAREL16, R_PPC_EMB_SDA2REL, R_PPC_EMB_SDA21,
+	R_PPC_EMB_RELSDA, R_PPC_SECTOFF* relocs.
+
+2008-09-11  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Fix loading large elf64 binaries on 32bit hosts.
+	* configure.in: Call AC_SYS_LARGEFILE.
+	* config.in: Regenerate.
+	* configure: Regenerate.
+
+2008-09-08  Tom Tromey  <tromey@redhat.com>
+
+	* elfxx-mips.c (mips16_stub_symndx) <sec>: Mark argument as
+	unused.
+
+2008-09-08  H.J. Lu  <hongjiu.lu@intel.com>
+	    Daniel Jacobowitz  <dan@codesourcery.com>
+
+	PR ld/3191
+	* dwarf2.c (struct adjusted_section): Renamed from struct
+	loadable_section.
+	(struct dwarf2_debug): Adjust for renaming.  Add version field.
+	(read_attribute_value): Correctly handle DW_FORM_ref_addr for
+	DWARF3.
+	(find_abstract_instance_name): Pass a pointer to
+	attribute instead of offset.  For DW_FORM_ref_addr, get the
+	entry at the offset from the .debug_info section.
+	(scan_unit_for_symbols): Update.
+	(parse_comp_unit): Allow DWARF3.  Save the version.
+	(unset_sections): Update for renaming.
+	(place_sections): Likewise.  Set new VMAs for DWARF sections
+	also.
+
+2008-09-08  Tristan Gingold  <gingold@adacore.com>
+
+	* configure.in: Update version to 2.19.50
+	* configure: Regenerated.
+
+2008-09-05  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* dwarf2.c: Change leading whitespace to tabs.
+
+2008-09-05  Tristan Gingold  <gingold@adacore.com>
+
+	Add MacOSX 64 bits support.
+	* mach-o.h (bfd_mach_o_ppc_thread_flavour): Add
+	BFD_MACH_O_PPC_THREAD_STATE_64.
+	(bfd_mach_o_i386_thread_flavour): Add BFD_MACH_O_x86_THREAD_STATE64,
+	BFD_MACH_O_x86_FLOAT_STATE64, BFD_MACH_O_x86_EXCEPTION_STATE64,
+	BFD_MACH_O_x86_THREAD_STATE, BFD_MACH_O_x86_FLOAT_STATE,
+	BFD_MACH_O_x86_EXCEPTION_STATE.
+	(bfd_mach_o_load_command_type): Add
+	BFD_MACH_O_LC_SEGMENT_64, BFD_MACH_O_LC_ROUTINES_64,
+	BFD_MACH_O_LC_UUID.
+	(BFD_MACH_O_CPU_IS64BIT): Added.
+	(bfd_mach_o_cpu_type): Add BFD_MACH_O_CPU_TYPE_POWERPC_64,
+	BFD_MACH_O_CPU_TYPE_X86_64.
+	(bfd_mach_o_header): Add version field.
+	(bfd_mach_o_section) Add reserved3 field.
+	(bfd_mach_o_segment_command): Add initprot and maxprot fields.
+
+	* mach-o.c (N_TEXT, N_DATA, N_BSS): Added.
+	(bfd_mach_o_version): New function.
+	(bfd_mach_o_valid): Handle 64bits cpus.
+	(bfd_mach_o_write_header): handler 64bits headers.
+	(bfd_mach_o_scan_write_section_32, bfd_mach_o_scan_write_section_64):
+	New functions (from bfd_mach_o_scan_write_section) to handle both
+	flavors.
+	(bfd_mach_o_scan_write_segment): Parameter wide added to support
+	both flavors.
+	(bfd_mach_o_write_contents): Support both flavors.
+	(bfd_mach_o_read_header): Ditto.
+	(bfd_mach_o_scan_read_section_32, bfd_mach_o_scan_read_section_64):
+	New functions (from bfd_mach_o_scan_read_section) to support both
+	flavors.
+	(bfd_mach_o_scan_read_symtab_symbol): Support both flavors.
+	(bfd_mach_o_scan_read_symtab): Ditto.
+	(bfd_mach_o_scan_read_segment): Parameter wide added to support
+	both flavors.
+	(bfd_mach_o_scan_read_segment_32, bfd_mach_o_scan_read_segment_64):
+	New functions to call bfd_mach_o_scan_read_segment.
+	(bfd_mach_o_flatten_sections): Support both flavors.
+	(bfd_mach_o_scan_start_address): Ditto.
+	(bfd_mach_o_scan): Ditto.
+	(bfd_mach_o_lookup_section): Ditto.
+
+2008-08-27  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* elf-hppa.h (elf_hppa_reloc_final_type): Handle R_PARISC_GPREL64,
+	R_PARISC_SEGREL32 and R_PARISC_SEGREL64.
+	* som.c (som_fixup_formats): Add R_DATA_GPREL fixup.
+	(som_hppa_howto_table): Likewise.
+	(hppa_som_gen_reloc_type): In case R_HPPA_GOTOFF, detect R_DATA_GPREL
+	final type.
+	(som_write_fixups): Handle R_DATA_GPREL.
+
+2008-08-26  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-arm.c: Fix up comment describing Thumb to ARM interworking
+	stub.
+
+2008-08-25  Christophe Lyon  <christophe.lyon@st.com>
+
+	* elf32-arm.c (arm_thumb_arm_v4t_short_branch_stub): Define.
+	(elf32_arm_stub_type): Add arm_thumb_arm_v4t_stub_short_branch.
+	(arm_type_of_stub): Handle armv4t short branches. Update
+	prototype.
+	(arm_stub_is_thumb): Handle arm_thumb_arm_v4t_stub_short_branch.
+	(arm_build_one_stub): Likewise.
+	(arm_size_one_stub): Likewise.
+	(elf32_arm_size_stubs): Use new arm_type_of_stub prototype.
+	(arm_map_one_stub): Handle arm_thumb_arm_v4t_stub_short_branch.
+
+2008-08-24  Andreas Schwab  <schwab@suse.de>
+
+	* elf-eh-frame.c (_bfd_elf_write_section_eh_frame): Do proper
+	extension when calculating difference of offsets.
+
+2008-08-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* configure.in: Update a number of obsolete autoconf macros.
+	* aclocal.m4: Regenerate.
+
+2008-08-23  Andreas Schwab  <schwab@suse.de>
+
+	* opncls.c (find_separate_debug_file): Use the canonical
+	absolute name of the bfd object for finding the debug file in
+	the global debugfile directory.
+
+2008-08-22  Jakub Jelinek  <jakub@redhat.com>
+
+	Fix PR ld/3290 regression for cross-files DW_FORM_ref_addr relocations.
+	* elflink.c (elf_link_add_object_symbols): Make debug symbols local
+	now only for non-RELOCATABLE targets.
+
+2008-08-20  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf-bfd.h (elf_object_id): Add XTENSA_ELF_TDATA.
+	* elf32-xtensa.c (elf_howto_table): Add TLS relocations.
+	(elf_xtensa_reloc_type_lookup): Likewise.
+	(TCB_SIZE): Define.
+	(elf_xtensa_link_hash_entry): New.
+	(GOT_UNKNOWN, GOT_NORMAL, GOT_TLS_GD, GOT_TLS_IE, GOT_TLS_ANY): Define.
+	(elf_xtensa_hash_entry): Define.
+	(elf_xtensa_obj_tdata): New.
+	(elf_xtensa_tdata): Define.
+	(elf_xtensa_local_got_tls_type): Define.
+	(elf_xtensa_local_tlsfunc_refcounts): Define.
+	(is_xtensa_elf): Define.
+	(elf_xtensa_mkobject): New.
+	(elf_xtensa_link_hash_table): Add tlsbase field.
+	(elf_xtensa_link_hash_newfunc): New.
+	(elf_xtensa_link_hash_table_create): Use elf_xtensa_link_hash_newfunc.
+	Create an entry for "_TLS_MODULE_BASE_" and save it in tlsbase field.
+	(elf_xtensa_copy_indirect_symbol): New.
+	(elf_xtensa_check_relocs): Rewrite to handle TLS relocations.
+	(elf_xtensa_gc_sweep_hook): Likewise.
+	(elf_xtensa_allocate_dynrelocs): Optimize away GOT entries for
+	TLSDESC_FN relocations when an IE reference is seen.
+	(elf_xtensa_allocate_local_got_size): Likewise.
+	(elf_xtensa_always_size_sections): New.
+	(dtpoff_base, tpoff): New.
+	(elf_xtensa_do_reloc): Handle TLS relocations.
+	(replace_tls_insn): New.
+	(IS_XTENSA_TLS_RELOC): Define.
+	(elf_xtensa_relocate_section): Handle TLS relocations.
+	(get_indirect_call_dest_reg): New.
+	(bfd_elf32_mkobject): Define.
+	(elf_backend_always_size_sections): New.
+	(elf_backend_copy_indirect_symbol): New.
+	* reloc.c (BFD_RELOC_XTENSA_TLSDESC_FN, BFD_RELOC_XTENSA_TLSDESC_ARG)
+	(BFD_RELOC_XTENSA_TLS_DTPOFF, BFD_RELOC_XTENSA_TLS_TPOFF)
+	(BFD_RELOC_XTENSA_TLS_FUNC, BFD_RELOC_XTENSA_TLS_ARG)
+	(BFD_RELOC_XTENSA_TLS_CALL): New.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2008-08-18  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_copy_indirect_symbol): Copy MIPS16
+	stub information.
+
+2008-08-17  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-arm.c: Tidy up the code.
+	(bfd_elf32_arm_allocate_interworking_sections): Move common code
+	into...
+	(arm_allocate_glue_section_space): ... New function.
+	(bfd_elf32_arm_add_glue_sections_to_bfd): Move common code
+	into...
+	(arm_make_glue_section): ... New function.
+
+	* elfxx-mips.c (_bfd_mips_elf_check_relocs): Handle the situation
+	where the sym_hashes are not available.
+
+2008-08-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd.c (struct _bfd): Correct outsymbols comment.
+	* bfd-in2.h: Regenerate.
+	* linker.c (bfd_generic_link_read_symbols): Renamed from..
+	(generic_link_read_symbols): ..this, and made global.
+
+2008-08-15  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 6526
+	* configure.in: Invoke AC_USE_SYSTEM_EXTENSIONS.
+	* Makefile.in: Regenerate.
+	* aclocal.m4: Regenerate.
+	* config.in: Regenerate.
+	* configure: Regenerate.
+
+2008-08-14  Jaka Močnik  <jaka@xlab.si>
+
+	* coffgen.c (coff_find_nearest_line): Correct cached line index.
+
+2008-08-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (allocate_dynrelocs): Ignore dyn_relocs when
+	!dynamic_sections_created.  Don't make symbols with got
+	references dynamic if !dynamic_sections_created.
+	* elf64-ppc.c (allocate_dynrelocs): Likewise.  Alloc dynamic
+	relocs on undefined symbols.
+	(ppc64_elf_relocate_section): Allow dynamic relocs on
+	undefined symbols.
+
+2008-08-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (toc_adjusting_stub_needed): Any call via the plt
+	needs r2 valid, not just those to external syms.
+
+2008-08-09  Pedro Alves  <pedro@codesourcery.com>
+
+	* archive.c (_bfd_archive_bsd_update_armap_timestamp): Cast stat
+	st_mtime to long before comparison.
+
+2008-08-08  Anatoly Sokolov  <aesok@post.ru>
+
+	* archures.c (bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35,
+	bfd_mach_avr51): New.
+	* bfd-in2.h: Regenerate.
+	* cpu-avr.c (arch_info_struct): Add avr25, avr31, avr35, and avr51
+	architectures. Change comments to match architecture comments in GCC.
+	(compatible): Add test for new AVR architectures.
+	* elf32-avr.c (bfd_elf_avr_final_write_processing): Recognize
+	bfd_mach_avr25, bfd_mach_avr31, bfd_mach_avr35 and bfd_mach_avr51.
+	(elf32_avr_object_p): Recognize E_AVR_MACH_AVR25, E_AVR_MACH_AVR31,
+	E_AVR_MACH_AVR35 and E_AVR_MACH_AVR51.
+
+
+2008-08-08  Richard Sandiford  <rdsandiford@googlemail.com>
+	    Daniel Jacobowitz  <dan@codesourcery.com>
+	    Catherine Moore  <clm@codesourcery.com>
+	    Mark Shinwell  <shinwell@codesourcery.com>
+	    Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+	* elf32-mips.c (mips_vxworks_copy_howto_rela): Replace with...
+	(elf_mips_copy_howto): ...this howto.  Clear the size fields.
+	(mips_vxworks_jump_slot_howto_rela): Replace with...
+	(elf_mips_jump_slot_howto): ...this howto.
+	(bfd_elf32_bfd_reloc_type_lookup): Handle BFD_RELOC_MIPS_COPY
+	and BFD_RELOC_MIPS_JUMP_SLOT.
+	(bfd_elf32_bfd_reloc_name_lookup): Handle "R_MIPS_COPY" and
+	"R_MIPS_JUMP_SLOT".
+	(mips_elf32_rtype_to_howto): Handle R_MIPS_COPY and R_MIPS_JUMP_SLOT.
+	(elf_backend_plt_readonly): Define.
+	(elf_backend_plt_sym_val): Define for non-VxWorks targets.
+	(mips_vxworks_bfd_reloc_type_lookup): Delete.
+	(mips_vxworks_bfd_reloc_name_lookup): Likewise.
+	(mips_vxworks_rtype_to_howto): Likewise.
+	(elf_backend_want_dynbss): Don't define for VxWorks.
+	(elf_backend_plt_readonly): Likewise.
+	(bfd_elf32_bfd_reloc_type_lookup): Likewise.
+	(bfd_elf32_bfd_reloc_name_lookup): Likewise.
+	(elf_backend_mips_rtype_to_howto): Likewise.
+	(elf_backend_adjust_dynamic_symbol): Likewise.
+	(elf_backend_got_symbol_offset): Don't define.
+	* elfn32-mips.c (elf_mips_copy_howto, elf_mips_jump_slot_howto): New.
+	(bfd_elf32_bfd_reloc_type_lookup): Handle BFD_RELOC_MIPS_COPY
+	and BFD_RELOC_MIPS_JUMP_SLOT.
+	(bfd_elf32_bfd_reloc_name_lookup): Handle "R_MIPS_COPY" and
+	"R_MIPS_JUMP_SLOT".
+	(mips_elf32_n32_rtype_to_howto): Handle R_MIPS_COPY and
+	R_MIPS_JUMP_SLOT.
+	(elf_backend_rela_plts_and_copies_p, elf_backend_plt_readonly)
+	(elf_backend_plt_sym_val): Define.
+	* elf64-mips.c (elf_mips_copy_howto, elf_mips_jump_slot_howto): New.
+	(bfd_elf64_bfd_reloc_type_lookup): Handle BFD_RELOC_MIPS_COPY
+	and BFD_RELOC_MIPS_JUMP_SLOT.
+	(bfd_elf64_bfd_reloc_name_lookup): Handle "R_MIPS_COPY" and
+	"R_MIPS_JUMP_SLOT".
+	(mips_elf64_rtype_to_howto): Handle R_MIPS_COPY and R_MIPS_JUMP_SLOT.
+	(elf_backend_rela_plts_and_copies_p, elf_backend_plt_readonly)
+	(elf_backend_plt_sym_val): Define.
+	* elfxx-mips.h (_bfd_mips_vxworks_adjust_dynamic_symbol): Delete.
+	(_bfd_mips_elf_use_plts_and_copy_relocs, _bfd_mips_elf_init_stubs)
+	(_bfd_mips_elf_plt_sym_val, _bfd_mips_post_process_headers): Declare.
+	* elfxx-mips.c (mips_elf_la25_stub): New structure.
+	(LA25_LUI, LA25_J, LA25_ADDIU): New macros.
+	(mips_elf_link_hash_entry): Add "la25_stubs", "has_static_relocs"
+	and "has_nonpic_branches" fields.  Remove "is_relocation_target" and
+	"is_branch_target".
+	(mips_elf_link_hash_table): Add blank lines.  Add
+	"use_plts_and_copy_relocs", "reserved_gotno", "strampoline",
+	"la25_stubs" and "add_stub_section" fields.
+	(mips_htab_traverse_info): New structure.
+	(PIC_OBJECT_P, MIPS_ELF_LOAD_WORD): New macros.
+	(MIPS_RESERVED_GOTNO): Delete.
+	(mips_o32_exec_plt0_entry, mips_n32_exec_plt0_entry)
+	(mips_n64_exec_plt0_entry, mips_exec_plt_entry): New tables.
+	(mips_elf_link_hash_newfunc): Update after the changes to
+	mips_elf_link_hash_entry.
+	(mips_elf_check_mips16_stubs): Replace the DATA parameter with
+	an INFO parameter.  Don't look through warnings symbols here;
+	do it in mips_elf_check_symbols instead.
+	(mips_elf_create_stub_symbol): New function.
+	(mips_elf_la25_stub_hash, mips_elf_la25_stub_eq): New functions.
+	(_bfd_mips_elf_init_stubs, mips_elf_local_pic_function_p): Likewise.
+	(mips_elf_add_la25_intro, mips_elf_add_la25_trampoline): Likewise.
+	(mips_elf_add_la25_stub, mips_elf_check_symbols): New functions.
+	(mips_elf_gotplt_index): Check for VxWorks.
+	(mips_elf_output_dynamic_relocation): Take the relocation index
+	as an extra parameter.  Do not increment reloc_count here.
+	(mips_elf_initialize_tls_slots): Update the calls to
+	mips_elf_output_dynamic_relocation accordingly.
+	(mips_elf_multi_got): Use htab->reserved_gotno instead of
+	MIPS_RESERVED_GOTNO.
+	(mips_elf_create_got_section): Don't allocate reserved GOT
+	entries here.  Unconditionally create .got.plt, but don't
+	set its alignment here.
+	(mips_elf_relocation_needs_la25_stub): New function.
+	(mips_elf_calculate_relocation): Redirect branches and jumps to
+	a non-PIC stub if one exists.  Check !h->has_static_relocs instead
+	of !htab->is_vxworks when deciding whether to create dynamic
+	relocations for R_MIPS_32, R_MIPS_REL32 and R_MIPS_64.
+	(_bfd_mips_elf_create_dynamic_sections): Unconditionally call
+	_bfd_elf_create_dynamic_sections.  Unconditionally set up
+	htab->splt and htab->sdynbss.  Set htab->srelplt to ".rel.plt"
+	if !htab->is_vxworks.  Add non-VxWorks values of
+	htab->plt_header_size and htab->plt_entry_size.
+	(_bfd_mips_elf_check_relocs): Set pointer_equality_needed for
+	non-branch static relocations.  Set has_nonpic_branches when an la25
+	stub might be required.  Set can_make_dynamic_p to TRUE if R_MIPS_32,
+	R_MIPS_REL32 and R_MIPS_64 relocations can be made dynamic,
+	rather than duplicating the condition.  Do not make them dynamic
+	for read-only sections in non-PIC executable objects.
+	Do not protect this code with dynobj == NULL || htab->sgot == NULL;
+	handle each group of cases separately.  Add a default case that
+	sets has_static_relocs for non-GOT relocations that cannot be
+	made dynamic.  Don't set is_relocation_target and is_branch_target.
+	Reject non-PIC static relocations in shared objects.
+	(_bfd_mips_vxworks_adjust_dynamic_symbol): Fold into...
+	(_bfd_mips_elf_adjust_dynamic_symbol): ...here, using
+	htab->use_plts_and_copy_relocs instead of htab->is_vxworks
+	to select PLT and copy-reloc handling.  Set the alignment of
+	.plt and .got.plt when allocating the first entry.  Generalize
+	code to handle REL as well as RELA sections and 64-bit as well as
+	32-bit GOT entries.  Complain if we find a static-only reloc
+	against an externally-defined symbol and if we cannot create
+	dynamic relocations for it.  Allocate copy relocs using
+	mips_elf_allocate_dynamic_relocations on non-VxWorks targets.
+	Set possibly_dynamic_relocs to 0 when using PLTs or copy relocs.
+	Skip reserved .got.plt entries.
+	(_bfd_mips_elf_always_size_sections): Use mips_elf_check_symbols
+	instead of mips_elf_check_mips16_stubs to process each symbol.
+	Do the traversal for relocatable objects too.
+	(mips_elf_lay_out_got): Use htab->reserved_gotno instead of
+	MIPS_RESERVED_GOTNO.
+	(_bfd_mips_elf_size_dynamic_sections): Exclude sdynbss if it
+	is empty.  Extend the DT_PLTREL, DT_JMPREL and DT_PLTRELSZ handling
+	to non-VxWorks targets.  Only add DT_REL{,A}, DT_REL{,A}SZ and
+	DT_REL{,A}ENT if .rel.dyn is nonempty.  Create a symbol for the
+	PLT.  Allocate a nop at the end of the PLT.  Allocate DT_MIPS_PLTGOT.
+	(mips_elf_create_la25_stub_info): New function.
+	(_bfd_mips_elf_finish_dynamic_symbol): Write out PLT entries
+	and copy relocs where necessary.  Check pointer_equality_needed.
+	(mips_finish_exec_plt): New function.
+	(_bfd_mips_elf_finish_dynamic_sections): Always set DT_PLTGOT
+	to the beginning of htab->sgot.  Use htab->reserved_gotno instead
+	of MIPS_RESERVED_GOTNO.  Assert htab->use_plts_and_copy_relocs
+	instead of htab->is_vxworks for DT_PLTREL, DT_PLTRELSZ and DT_JMPREL.
+	Set DT_PLTREL to DT_REL instead of DT_RELA on non-VxWorks targets.
+	Use mips_finish_exec_plt to create non-VxWorks PLT headers.  Set
+	DT_MIPS_PLTGOT.
+	(_bfd_mips_elf_copy_indirect_symbol): Copy has_static_relocs
+	from the indirect symbol to the direct symbol.  Also copy
+	has_nonpic_branches for indirect symbols.
+	(_bfd_mips_elf_get_target_dtag): Handle DT_MIPS_PLTGOT and
+	DT_MIPS_RWPLT.
+	(_bfd_mips_elf_link_hash_table_create): Initialize the new
+	mips_elf_link_hash_table fields.
+	(_bfd_mips_vxworks_link_hash_table_create): Set
+	use_plts_and_copy_relocs to TRUE.  Use TRUE rather than 1
+	when setting is_vxworks.
+	(_bfd_mips_elf_use_plts_and_copy_relocs): New function.
+	(_bfd_mips_elf_final_link): Call mips_elf_create_la25_stub for
+	each la25_stub.
+	(_bfd_mips_elf_merge_private_bfd_data): Treat dynamic objects
+	as PIC.  Generalize message about linking PIC and non-PIC.
+	(_bfd_mips_elf_plt_sym_val, _bfd_mips_post_process_headers): New
+	functions.
+	* reloc.c: Update comment near BFD_RELOC_MIPS_JUMP_SLOT.
+	* bfd-in2.h: Regenerated.
+
+2008-08-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (bfd_elf_get_elf_syms): Don't leak memory on error.
+	* elflink.c (_bfd_elf_link_read_relocs): bfd_release on error.
+	(elf_link_add_object_symbols): Don't leak memory on error.
+	(bfd_elf_size_dynsym_hash_dynstr): Likewise.
+	(elf_fixup_link_order): Free sections.
+
+2008-08-07  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elf-bfd.h (elf_backend_data): Add a "rela_plts_and_copies_p" field.
+	* elfxx-target.h (elf_backend_rela_plts_and_copies_p): New macro.
+	(elfNN_bed): Use it.
+	* elf.c (_bfd_elf_get_synthetic_symtab): Use rela_plts_and_copies_p
+	instead of default_use_rela_p to choose between ".rel.plt" and
+	".rela.plt".
+	* elflink.c (_bfd_elf_create_dynamic_sections): Use
+	rela_plts_and_copies_p instead of default_use_rela_p to choose
+	between ".rel.plt" and ".rela.plt", and between ".rel.bss" and
+	".rela.bss".
+
+2008-08-07  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elf-bfd.h (MIPS_ELF_TDATA): New elf_object_id.
+	* elf32-mips.c (bfd_elf32_mkobject): Define.
+	* elf64-mips.c (bfd_elf64_mkobject): Likewise.
+	* elfn32-mips.c (bfd_elf32_mkobject): Likewise.
+	* elfxx-mips.h (_bfd_mips_elf_mkobject): Declare.
+	* elfxx-mips.c (is_mips_elf): New macro.
+	(_bfd_mips_elf_mkobject): New function.
+	(_bfd_mips_elf_final_link): Use is_mips_elf.
+	(_bfd_mips_elf_merge_private_bfd_data): Likewise.
+
+2008-08-07  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elfxx-mips.c (mips_elf_record_relocs): Defer allocation of a
+	global GOT entry when deferring allocation of dynamic relocations.
+	(allocate_dynrelocs): When allocating deferred dynamic relocations,
+	also do the deferred allocation of a GOT entry.
+
+2008-08-07  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elfxx-mips.c (mips_got_info): Add a "reloc_only_gotno" field.
+	(mips_elf_got_section): Delete.
+	(mips_elf_sort_hash_table): Use g->reloc_only_gotno to decide
+	how many reloc-only entries there are.
+	(mips_elf_count_got_symbols): Adjust g->reloc_only_gotno as
+	well as g->global_gotno.
+	(mips_elf_make_got_per_bfd): Initialize reloc_only_gotno.
+	(mips_elf_multi_got): Likewise.  Use gg->reloc_only_gotno
+	rather than gg->assigned_gotno to store the number of
+	reloc-only GOT entries.
+	(mips_elf_create_got_section): Remove the MAYBE_EXCLUDE parameter.
+	Initialize reloc_only_gotno.
+	(mips_elf_calculate_relocation): Check htab->got_info instead of
+	dynobj when deciding whether to call mips_elf_adjust_gp,
+	(_bfd_mips_elf_create_dynamic_sections): Adjust the call
+	to mips_elf_create_got_section.
+	(mips_elf_record_relocs): Likewise.  Remove redundant
+	"dynobj == NULL" code.  Do not use mips_elf_create_got_section
+	or mips_elf_record_global_got_symbol for R_MIPS_32, R_MIPS_REL32
+	and R_MIPS_64; limit global_got_area to GGA_RELOC_ONLY instead.
+	(_bfd_mips_elf_finish_dynamic_symbol): Use htab->sgot instead
+	of mips_elf_got_section.
+	(_bfd_mips_vxworks_finish_dynamic_symbol): Likewise.
+	(_bfd_mips_elf_finish_dynamic_sections): Likewise.
+	Move the initial assignment of G to the block that uses it;
+	it is used for an unrelated purpose later.
+
+2008-08-07  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elfxx-mips.c (count_section_dynsyms): Move before the new first use.
+	(mips_elf_sort_hash_table): Take the output bfd as a parameter.
+	Remove the MAX_LOCAL parameter.  Exit early if there are no
+	dynamic symbols, if there is no dynobj, or if there is no
+	GOT section.  Use count_section_dynsyms instead of MAX_LOCAL.
+	Assert == rather than <= when checking hsd.max_unref_got_dynindx.
+	Also assert that g->global_gotno is right.
+	(mips_elf_count_forced_local_got_symbols): Rename to...
+	(mips_elf_count_got_symbols): ...and count global GOT entries too.
+	Set the global_got_area of a forced-local GGA_RELOC_ONLY symbol
+	to GGA_NONE.
+	(mips_elf_multi_got): Don't sort the symbol table.
+	(mips_elf_lay_out_got): Likewise.  Use mips_elf_count_got_symbols
+	to count the number of global GOT entries.
+	(_bfd_mips_elf_final_link): Unconditionally call
+	mips_elf_sort_hash_table.
+
+2008-08-07  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elfxx-mips.c (GGA_NORMAL, GGA_RELOC_ONLY, GGA_NONE): New macros.
+	(mips_elf_link_hash_entry): Add a "global_got_area" field.
+	(mips_elf_link_hash_newfunc): Initialize it.
+	(mips_elf_sort_hash_table_f): Use h->global_got_area instead of
+	h->root.got.offset.  Do not handle forced_local symbols specially.
+	(mips_elf_record_global_got_symbol): Set h->global_got_area
+	instead of h->root.got.offset.
+	(mips_elf_recreate_got): Assert that h->global_got_area == GGA_NONE
+	for indirect and warning symbols.
+	(mips_elf_count_forced_local_got_symbols): Change the argument
+	from a "elf_link_hash_entry" to "mips_elf_link_hash_entry".
+	Use and set h->global_got_area instead of h->root.got.offset.
+	Set it to GGA_NONE for all forced-local symbols.
+	(mips_elf_set_global_got_offset): Set h->global_got_area
+	instead of h->root.got.offset.  Use g->global_got_area instead
+	of a combination of dynindx, forced_local and tls_type.
+	(mips_elf_multi_got): Remove disabled code.  Pass GGA_* values to
+	mips_elf_set_global_got_offset.
+	(mips_elf_lay_out_got): Use mips_elf_link_hash_traverse instead
+	of elf_link_hash_traverse.
+	(_bfd_mips_elf_copy_indirect_symbol): Copy the indirect symbol's
+	global_got_area to the direct symbol if the latter's value is higher.
+	Set the indirect symbol's area to GGA_NONE.
+
+2008-08-07  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elf32-mips.c (elf_backend_hide_symbol): Delete.
+	* elfn32-mips.c (elf_backend_hide_symbol): Likewise.
+	* elf64-mips.c (elf_backend_hide_symbol): Likewise.
+	* elfxx-mips.h (elf_backend_hide_symbol): Likewise.
+	* elfxx-mips.c (mips_elf_link_hash_entry): Remove "forced_local"
+	and add "needs_lazy_stub".
+	(mips_elf_link_hash_newfunc): Update accordingly.
+	(mips_elf_link_hash_table): Remove "computed_got_sizes" and
+	add "lazy_stub_count".
+	(_bfd_mips_elf_link_hash_table_create): Update accordingly.
+	(mips_elf_output_extsym): Use hd->needs_lazy_stub to detect
+	cases where a lazy stub is being used.
+	(mips_elf_sort_hash_table_f): Use h->root.forced_local instead
+	of h->forced_local.
+	(mips_elf_record_global_got_symbol): Use _bfd_elf_link_hash_hide_symbol
+	instead of _bfd_mips_elf_hide_symbol.  Do not increment local_gotno
+	here.
+	(mips_elf_allocate_dynamic_relocations): Move before new first use.
+	(mips_elf_check_recreate_got, mips_elf_recreate_got): New functions.
+	(mips_elf_resolve_final_got_entries): Move earlier in file.  Make at
+	most two passes over the hash table.  Use mips_elf_check_recreate_got
+	to see if there are any indirect or warning entries and
+	mips_elf_recreate_got to create a new GOT without them.
+	Return a boolean success value.
+	(mips_elf_count_forced_local_got_entries): New function.
+	(mips_elf_make_got_per_bfd): Check h->root.forced_local instead of
+	h->forced_local.
+	(mips_elf_set_global_got_offset): Likewise.
+	(mips_elf_set_no_stub): Replace with...
+	(mips_elf_forbid_lazy_stubs): ...this new function.
+	(mips_elf_resolve_final_got_entry): Delete.
+	(mips_elf_multi_got): Fix formatting.  Use mips_elf_forbid_lazy_stubs
+	instead of mips_elf_set_no_stub.  Move the code that sets
+	global offsets and allocates dynamic relocations from the main
+	_bfd_mips_elf_size_dynamic_sections loop to here.
+	(_bfd_mips_elf_adjust_dynamic_symbol): Do not allocate room in
+	.MIPS.stubs here; just set hmips->needs_lazy_stub and increment
+	htab->lazy_stub_count.
+	(_bfd_mips_elf_always_size_sections): Move the stub-estimation
+	code to mips_elf_estimate_stub_size and the GOT-sizing code to
+	mips_elf_lay_out_got.  Do not call these functions here.
+	(mips_elf_estimate_stub_size): New function, split
+	out from _bfd_mips_elf_always_size_sections.  Call
+	mips_elf_resolve_final_got_entries earlier.  Count the number
+	of forced-local entries.  Do not add stub sizes to loadable_size;
+	after this patch, the stub sizes are already included in the main
+	estimate.  Allocate dynamic relocations here rather than in the
+	main _bfd_mips_elf_size_dynamic_sections loop.
+	(mips_elf_estimate_stub_size): New function, split out from
+	_bfd_mips_elf_always_size_sections.
+	(mips_elf_allocate_lazy_stub): New function.
+	(mips_elf_lay_out_lazy_stubs): Likewise.
+	(_bfd_mips_elf_size_dynamic_sections): Call mips_elf_estimate_stub_size,
+	mips_elf_lay_out_got and mips_elf_lay_out_lazy_stubs.  Do not handle
+	the allocation of sreldyn specially.
+	(_bfd_mips_elf_hide_symbol): Delete.
+
+2008-08-07  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elfxx-mips.c (allocate_dynrelocs): Ignore indirect and warning
+	symbols.
+
+2008-08-06  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elfxx-mips.c (mips_elf_link_hash_entry): Move bfd_boolean
+	fields to the end of the structure and make them single-bit
+	bitfields.
+	(mips_elf_link_hash_newfunc): Make the initialization statements
+	follow the new field order.
+
+2008-08-06  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elfxx-mips.c (_mips_elf_section_data): Remove the "u.got_info" field.
+	(mips_elf_link_hash_table): Add "sgot" and "got_info" fields.
+	(_bfd_mips_elf_link_hash_table_create): Initialize them.
+	(mips_elf_got_section): Always apply the !maybe_excluded behavior.
+	(mips_elf_got_info): Delete.
+	(mips_elf_initialize_tls_slots): Remove the DYNOBJ local variable.
+	Adjust the call to mips_elf_got_section.
+	(mips_elf_local_got_index): Don't call mips_elf_got_info.
+	Update the call to mips_elf_create_local_got_entry.
+	Use htab->got_info.
+	(mips_elf_global_got_index): Don't call mips_elf_got_info;
+	use htab->got_info and htab->sgot instead.
+	(mips_elf_got_page): Don't call mips_elf_got_info.  Update the
+	call to mips_elf_create_local_got_entry.
+	(mips_elf_got16_entry): Likewise.
+	(mips_elf_got_offset_from_index): Replace with DYNOBJ parameter
+	with an INFO parameter.  Don't call mips_elf_got_info; use htab->sgot
+	and htab->got_info instead.
+	(mips_elf_create_local_got_entry): Remove the GG and SGOT parameters.
+	Use htab->sgot and htab->got_info.
+	(mips_elf_sort_hash_table): Remove the DYNOBJ local variable.
+	Don't call mips_elf_got_info; use htab->got_info instead.
+	(mips_elf_record_global_got_symbol): Turn G from a paramter to
+	a local variable and read it from htab->got_info.
+	(mips_elf_record_local_got_symbol): Replace the G parameter with
+	an INFO parameter.  Make G a local variable and read it from
+	htab->got_info instead.
+	(mips_elf_record_got_page_entry): Likewise.
+	(mips_elf_multi_got): Remove the G parameter and make it a local
+	variable instead.  Read it from htab->got_info.
+	(mips_elf_create_got_section): Cache the GOT section in htab->sgot.
+	Store the GOT information in htab->got_info.
+	(mips_elf_calculate_relocation): Don't call mips_elf_got_section
+	and mips_elf_got_info; use htab->sgot and htab->got_info instead.
+	Adjust the calls to mips_elf_got_offset_from_index and
+	mips_elf_adjust_gp.
+	(_bfd_mips_elf_check_relocs): Remove the G and SGOT local variables.
+	Adjust the calls to mips_elf_record_local_got_symbol,
+	mips_elf_record_global_got_symbol and mips_elf_record_got_page_entry.
+	Use htab->sgot.
+	(_bfd_mips_elf_always_size_sections): Remove the DYNOBJ local variable.
+	Don't call mips_elf_got_info; use htab->sgot and htab->got_info instead.
+	Update the call to mips_elf_multi_got.
+	(_bfd_mips_elf_size_dynamic_sections): Don't call mips_elf_got_info;
+	use htab->got_info instead.
+	(_bfd_mips_elf_finish_dynamic_symbol): Update the call to
+	mips_elf_got_section.  Get the got_info from the hash table
+	rather than the GOT section.
+	(_bfd_mips_vxworks_finish_dynamic_symbol): Likewise.
+	(_bfd_mips_elf_finish_dynamic_sections): Likewise.
+	(_bfd_mips_elf_hide_symbol): Don't call mips_elf_got_section;
+	get the got_info from the hash table instead.  Remove the GOT
+	local variable.
+	(_bfd_mips_elf_final_link): Likewise.  Also remove the DYNOBJ
+	local variable.
+
+2008-08-06  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elfxx-mips.c (mips_elf_link_hash_table): Add an "sstubs" field.
+	(_bfd_mips_elf_create_dynamic_sections): Use it to cache the stubs
+	section.  Don't check whether the section already exists.
+	(_bfd_mips_elf_adjust_dynamic_symbol): Use htab->sstubs.
+	(_bfd_mips_elf_finish_dynamic_symbol): Likewise.
+	(_bfd_mips_elf_finish_dynamic_sections): Likewise.
+	(_bfd_mips_elf_size_dynamic_sections): Likewise.  Don't add the
+	dummy stub to an empty section.
+	(_bfd_mips_elf_link_hash_table_create): Initialize the "sstubs" field.
+
+2008-08-06  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* reloc.c (BFD_RELOC_MIPS16_GOT16, BFD_RELOC_MIPS16_CALL16): Declare.
+	* libbfd.h, bfd-in2.h: Regenerate.
+	* elf32-mips.c (elf_mips16_howto_table_rel): Fill in reserved
+	R_MIPS16_GOT16 and R_MIPS16_CALL16 entries.
+	(mips16_reloc_map): Add mappings.
+	* elf64-mips.c (mips16_elf64_howto_table_rel): Fill in reserved
+	R_MIPS16_GOT16 and R_MIPS16_CALL16 entries.
+	(mips16_elf64_howto_table_rela): Likewise.
+	(mips16_reloc_map): Add mappings.
+	* elfn32-mips.c (elf_mips16_howto_table_rel): Fill in reserved
+	R_MIPS16_GOT16 and R_MIPS16_CALL16 entries.
+	(elf_mips16_howto_table_rela): Likewise.
+	(mips16_reloc_map): Add mappings.
+	* elfxx-mips.c (mips_elf_create_shadow_symbol): New function.
+	(section_allows_mips16_refs_p): Likewise.
+	(mips16_stub_symndx): Likewise.
+	(mips_elf_check_mips16_stubs): Treat the data argument as a
+	bfd_link_info.  Mark every dynamic symbol as needing MIPS16 stubs
+	and create a "shadow" symbol for the original MIPS16 definition.
+	(mips16_reloc_p, got16_reloc_p, call16_reloc_p, hi16_reloc_p)
+	(lo16_reloc_p, mips16_call_reloc_p): New functions.
+	(_bfd_mips16_elf_reloc_unshuffle): Use mips16_reloc_p to generalize
+	relocation checks.
+	(_bfd_mips16_elf_reloc_shuffle): Likewise.
+	(_bfd_mips_elf_lo16_reloc): Handle R_MIPS16_GOT16.
+	(mips_elf_got16_entry): Add comment.
+	(mips_elf_calculate_relocation): Use hi16_reloc_p,
+	lo16_reloc_p, mips16_call_reloc_p, call16_reloc_p and got16_reloc_p
+	to generalize relocation checks.  Use section_allows_mips16_refs_p
+	instead of mips16_stub_section_p.   Handle R_MIPS16_CALL16 and
+	R_MIPS16_GOT16, allowing the former to refer directly to a
+	MIPS16 function if its stub is not needed.
+	(mips16_stub_section_p): Delete.
+	(_bfd_mips_elf_symbol_processing): Convert odd-valued function
+	symbols into even MIPS16 symbols.
+	(mips_elf_add_lo16_rel_addend): Use mips16_reloc_p to generalize
+	a relocation check.
+	(_bfd_mips_elf_check_relocs): Calculate "bed" and "rel_end"
+	earlier in the function.  Use mips16_stub_symndx to identify
+	the target function.  Avoid out-of-bounds accesses when the
+	stub has no relocations; report an error instead.  Use
+	section_allows_mips16_refs_p instead of mips16_stub_section_p.
+	Use mips16_call_reloc_p and got16_reloc_p to generalize relocation
+	checks.  Handle R_MIPS16_CALL16 and R_MIPS16_GOT16.  Don't create
+	dynamic relocations for absolute references to __gnu_local_gp.
+	(_bfd_mips_elf_always_size_sections): Pass a bfd_link_info as
+	the argument to mips_elf_check_mips16_stubs.  Generalize comment.
+	(_bfd_mips_elf_relocate_section): Use hi16_reloc_p and got16_reloc_p
+	to generalize relocation checks.
+	(_bfd_mips_elf_finish_dynamic_symbol): If a dynamic MIPS16 function
+	symbol has a non-MIPS16 stub, redirect the symbol to the stub.
+	Fix an overly long line.  Don't give dynamic symbols type STO_MIPS16.
+	(_bfd_mips_elf_gc_sweep_hook): Handle R_MIPS16_CALL16 and
+	R_MIPS16_GOT16.
+
+2008-08-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_relax_section): Clear R_PPC_PLTREL24 addend.
+	(ppc_elf_relocate_section <R_PPC_RELAX32_PLT>): Don't bother here.
+
+2008-08-05  Alan Modra  <amodra@bigpond.net.au>
+	    Jaka Močnik <jaka@xlab.si>
+
+	* coffcode.h (coff_slurp_line_table): bfd_alloc lineno_cache first
+	so that we don't inadvertently free it.  Use bfd_alloc for sort
+	arrays, and memcpy sorted line table.
+
+2008-08-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_auto_overlay): Use the maximum possible
+	if --fixed-space request is too large.
+
+2008-08-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (SRC-POTFILES.in, BLD-POTFILES.in): Set LC_ALL=C.
+	* Makefile.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2008-08-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (mark_overlay_section): Move code calculating
+	max_overlay_size to correct block.
+	(spu_elf_auto_overlay): Don't use %x in einfo error message.
+
+2008-08-01  Alan Modra  <amodra@bigpond.net.au>
+	    Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elfcore.h (elf_core_file_p): Ensure we have a backend match
+	with the correct arch size before rejecting the generic fallback.
+	* elfcode.h (elf_object_p): Likewise.  Ensure arch size matches
+	before accepting a target.
+
+2008-08-01  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 6774
+	* elf.c (rewrite_elf_program_header): Don't wrap p_paddr to
+	include file or program headers.
+
+2008-07-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* coff-ppc.c, coffgen.c, ecoff.c, ecofflink.c, elf.c, elf32-frv.c,
+	elf32-iq2000.c, elf32-m32c.c, elf32-mep.c, elf32-mt.c,
+	elf32-sh-symbian.c, elf64-hppa.c, mach-o.c, peXXigen.c, pef.c,
+	ppcboot.c, vms-misc.c, xsym.c: Silence gcc warnings.
+
+2008-07-28  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): Avoid generating
+	relocations for undefined weak symbols with non-default visibility.
+	(_bfd_mips_elf_check_relocs): Use possibly_dynamic_relocs for
+	global symbols in shared libraries.
+	(allocate_dynrelocs): New function.
+	(_bfd_mips_elf_adjust_dynamic_symbol): Do not handle
+	possibly_dynamic_relocs here.
+	(_bfd_mips_elf_size_dynamic_sections): Call allocate_dynrelocs.
+
+2008-07-28  Alexandre Oliva  <aoliva@redhat.com>
+
+	* elf32-i386.c (struct elf_i386_link_hash_table): Added field
+	tls_module_base.
+	(elf_i386_link_hash_table_create): Initialize it.
+	(elf_i386_always_size_sections): Set it.
+	(set_tls_module_base): New.
+	(elf_i386_relocate_sections): Call it.
+	* elf64-x86-64.c (struct elf64_x86_64_link_hash_table): Added
+	field tls_module_base.
+	(elf64_x86_64_link_hash_table_create): Initialize it.
+	(elf64_x86_64_always_size_sections): Set it.
+	(set_tls_module_base): New.
+	(elf64_x86_64_relocate_sections): Call it.
+	Reported by Cary Coutant <ccoutant@google.com>
+
+2008-07-28  Ineiev  <ineiev@yahoo.co.uk>
+
+	* elf32-arm.c (arm_map_one_stub): Declare variables at beginning
+	of block.
+	* elf32-avr.c (get_local_syms): Likewise.
+
+2008-07-28  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 6769
+	* bfd-in.h (BFD_VMA_FMT): Define.
+	(printf_vma, sprintf_vma): Use the above.
+	(_bfd_int64_low, _bfd_int64_high): Delete.
+	* bfd-in2.h: Regenerate.
+
+2008-07-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (_bfd_elf_make_section_from_shdr): Ignore return from
+	elf_parse_notes.  Use bfd_malloc_and_get_section.
+	(elf_parse_notes): Validate note namesz and descsz.
+
+2008-07-26  Michael Eager <eager@eagercon.com>
+
+	* elf32-ppc.c (ppc_elf_merge_obj_attributes): Check compatibility
+	between single-float, double-float, and soft-float.
+
+2008-07-24  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-mips.c (elf_backend_write_section): Define.
+
+2008-07-24  Nick Clifton  <nickc@redhat.com>
+
+	* elf.c (_bfd_elf_map_sections_to_segments): Catch off by one
+	error assigning sections to segments.
+
+2008-07-22  Nick Clifton  <nickc@redhat.com>
+
+	* elf.c (_bfd_elf_map_sections_to_segments): Allow sections in
+	adjoining pages to be included in the same segment.
+
+2008-07-22  Simon Baldwin  <simonb@google.com>
+
+	* elflink.c (elf_link_output_extsym): Set st_size to zero for
+	symbols from dynamic libraries.
+
+2008-07-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/4424
+	* elflink.c (_bfd_elf_merge_symbol): Call bed->relocs_compatible
+	to check if 2 inputs are compatible.
+
+2008-07-21  Sterling Augustine  <sterling@tensilica.com>
+
+	* elf.c (assign_file_positions_for_load_sections): Print vma in
+	error message about overlapping section vmas.
+
+2008-07-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/6747
+	* elf32-frv.c (elf32_frv_relocate_section): Revert the change
+	for PR ld/6446 checked in by accident on May 21, 2008.
+
+2008-07-21  Nick Clifton  <nickc@redhat.com>
+
+	* coff-sh.c (bfd_pe_print_pdata): Define to NULL for non
+	COFF_WITH_PE based SH ports.
+	* libpei.h (_bfd_XX_print_ce_compressed_pdata): Prototype.
+	* arm-wince-pe.c (bfd_pe_print_pdata): Use
+	_bfd_pe_print_ce_compressed_pdata.
+	(slurp_symcache, cleanup_syms, pe_print_ce_compressed_pdata): Move
+	to...
+	* peXXigen.c: ... here and rename pe_print_ce_compressed_pdata to
+	_bfd_XX_print_ce_compressed_pdata.
+
+2008-07-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Drop
+	unwanted zero terminators.
+
+2008-07-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_relocate_section): Expand
+	RELOC_FOR_GLOBAL_SYMBOL.  Don't warn about undefined symbols for
+	R_SPU_PPU32 and R_SPU_PPU64 relocations.
+
+2008-07-21  Luis Machado  <luisgpm@br.ibm.com>
+
+	* elf-bfd.h: Declare elfcore_write_ppc_vsx.
+	* elf.c (elfcore_grok_ppc_vsx): New function.
+	(elfcore_write_ppc_vsx): New function
+	(elfcore_grok_note): Handle VSX notes.
+	(elfcore_write_register_note): Handle VSX notes.
+
+2008-07-18  Joseph Myers  <joseph@codesourcery.com>
+
+	* bfd-in.h (bfd_elf32_arm_set_target_relocs): Add new parameter.
+	* bfd-in2.h: Regenerate.
+	* elf32-arm.c (struct elf_arm_obj_tdata): Add field
+	no_wchar_size_warning.
+	(bfd_elf32_arm_set_target_relocs): Add new parameter
+	no_wchar_warn.
+	(elf32_arm_merge_eabi_attributes): Give a warning, not an error,
+	for conflicting wchar_t attributes.  Do not warn if
+	--no-wchar-size-warning.  Make diagnostic text more specific.
+
+2008-07-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/6748
+	* elf32-arm.c (elf32_arm_link_hash_table_create): Initialize
+	new fields added for ARM long call support.
+
+2008-07-18  Danny Backx  <dannybackx@users.sourceforge.net>
+
+	* pe-arm-wince.c (pe_print_compressed_pdata): Define new function to
+	print compressed pdata structure as described on MSDN. This only
+	applies to a limited set of architectures (ARM, SH4).
+	(slurp_symtab, my_symbol_for_address): Define static helper
+	functions for pe_print_compressed_pdata.
+	* coffcode.h (bfd_coff_backend_data): Add _bfd_coff_print_pdata field.
+	(bfd_coff_have_print_pdata, bfd_coff_print_pdata): Define.
+	* bfd/peXXigen.c (_bfd_XX_print_private_bfd_data_common): Add check on
+	bfd_coff_backend_data, call the function if non-null.
+	* pei-mcore.c: Add target dependent initialisation for
+	bfd_coff_backend_data.
+	* coff-sh.c: Likewise.
+	* coff64-rs6000.c: Likewise.
+	* coff-rs6000.c: Likewise.
+	* libcoff-in.h: Likewise.
+	* cf-i386lynx.c: Likewise.
+	* coff-alpha.c: Likewise.
+	* coff-apollo.c: Likewise.
+	* coff-arm.c: Likewise.
+	* coff-aux.c: Likewise.
+	* coff-h8300.c: Likewise.
+	* coff-h8500.c: Likewise.
+	* coff-i386.c: Likewise.
+	* coff-i860.c: Likewise.
+	* coff-i960.c: Likewise.
+	* coff-ia64.c: Likewise.
+	* coff-m68k.c: Likewise.
+	* coff-m88k.c: Likewise.
+	* coff-maxq.c: Likewise.
+	* coff-mips.c: Likewise.
+	* coff-or32.c: Likewise.
+	* coff-sparc.c: Likewise.
+	* coff-tic30.c: Likewise.
+	* coff-tic4x.c: Likewise.
+	* coff-tic54x.c: Likewise.
+	* coff-tic80.c: Likewise.
+	* coff-w65.c: Likewise.
+	* coff-we32k.c: Likewise.
+	* coff-x86_64.c: Likewise.
+	* coff-z80.c: Likewise.
+	* coff-z8k.c: Likewise.
+	* pe-mcore.c: Likewise.
+	* pe-mips.c: Likewise.
+	* pe-ppc.c: Likewise.
+	* peXXigen.c: Likewise.
+	* pei-ppc.c: Likewise.
+	* libcoff.h: Regenerate.
+
+2008-07-16  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	* elf32-bfin.c (bfin_check_relocs, bfin_relocate_section,
+	bfin_final_link_relocate, bfin_gc_mark_hook, bfin_gc_sweep_hook,
+	ELF_DYNAMIC_INTERPRETER, DEFAULT_STACK_SIZE,
+	struct _bfinfdpic_dynamic_got_info): Moved around to keep FD-PIC code
+	separate from non-FD-PIC.
+
+2008-07-14  DJ Delorie  <dj@redhat.com>
+
+	* elf-m10300.c (mn10300_elf_final_link_relocate): Correct overflow
+	checks for PCREL8, PCREL16, GOTPC16, GOTOFF16, PLT16, and GOT16
+	relocs.
+	(mn10300_elf_relax_section): Correct jump offset check when target
+	is in a different section.
+
+2008-07-15  Jie Zhang  <jie.zhang@analog.com>
+
+	* elf32-bfin.c (elf32_bfin_special_sections[]): New.
+	(elf_backend_special_sections): Define.
+
+2008-07-13  Craig Silverstein  <csilvers@google.com>
+
+	PR binutils/6743
+	* dwarf2.c (struct dwarf2_debug): New variable info_ptr_memory.
+	(find_line): Use info_ptr_memory instead of sec_info_ptr.
+	(_bfd_dwarf2_cleanup_debug_info): Likewise.
+
+2008-07-12  Jie Zhang  <jie.zhang@analog.com>
+
+	Revert
+	2008-07-12  Jie Zhang  <jie.zhang@analog.com>
+	* elf.c (_bfd_elf_map_sections_to_segments): Don't put
+	executable sections into the same segment with other
+	read only sections if --sep-code.
+	* elf32-bfin.c (elf32_bfin_code_in_l1): New variable.
+	(elf32_bfin_data_in_l1): New variable.
+	(elf32_bfin_final_write_processing): New.
+	(elf32_bfin_special_sections[]): New.
+	(elf_backend_final_write_processing): Define.
+	(elf_backend_special_sections): Define.
+
+2008-07-12  Jie Zhang  <jie.zhang@analog.com>
+
+	* elf.c (_bfd_elf_map_sections_to_segments): Don't put
+	executable sections into the same segment with other
+	read only sections if --sep-code.
+	* elf32-bfin.c (elf32_bfin_code_in_l1): New variable.
+	(elf32_bfin_data_in_l1): New variable.
+	(elf32_bfin_final_write_processing): New.
+	(elf32_bfin_special_sections[]): New.
+	(elf_backend_final_write_processing): Define.
+	(elf_backend_special_sections): Define.
+
+2008-07-11  Andreas Schwab  <schwab@suse.de>
+
+	* dwarf2.c (read_section): Take pointer to bfd_size_type instead
+	of unsigned long as last parameter.
+	(struct dwarf2_debug): Define dwarf_abbrev_size, dwarf_line_size,
+	dwarf_str_size and dwarf_ranges_size as bfd_size_type instead of
+	unsigned long.
+
+2008-07-10  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): Calculate GP and GP0
+	for all relocation types.  Allow any type of relocation to refer to
+	__gnu_local_gp.
+
+2008-07-10  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elfxx-mips.c (mips_elf_check_mips16_stubs): Use ELF_ST_IS_MIPS16.
+	(mips_elf_calculate_relocation): Likewise.
+	(_bfd_mips_elf_add_symbol_hook): Likewise.
+	(_bfd_mips_elf_finish_dynamic_symbol): Likewise.
+	(_bfd_mips_vxworks_finish_dynamic_symbol): Likewise.
+
+2008-07-10  Andreas Schwab  <schwab@suse.de>
+
+	* elfxx-mips.c (_bfd_mips_elf_section_from_shdr): Add missing
+	paren.
+
+2008-07-09  Craig Silverstein  <csilvers@google.com>
+
+	* Makefile.am (BFD32_LIBS): Add compress.lo.
+	(BFD32_LIBS_CFILES): Add compress.c.
+	(BFD_H_FILES): Likewise.
+	* Makefile.in: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* config.in: Add HAVE_ZLIB_H
+	* configure.in: Add test for libz and zlib.h
+	* configure: Regenerate.
+	* dwarf2.c (read_section): New function.
+	(read_indirect_string): Call new function read_section.
+	(read_abbrevs): Likewise.
+	(decode_line_info): Likewise.
+	(read_debug_ranges): Likewise.
+	(find_line): Call new function read_section when just one
+	.zdebug_info section is found, otherwise read and compress
+	multiple sections.
+	(_bfd_dwarf2_cleanup_debug_info): Free sec_info_ptr.
+	* elf.c (_bfd_elf_make_section_from_shdr): Add zdebug prefix.
+	(special_sections_z): New struct.
+	(special_sections): Refer to special_sections_z.
+	* elfxx-mips.c (_bfd_mips_elf_section_from_shdr): Recognize
+	sections named .zdebug_*.
+	(_bfd_mips_elf_fake_sections): Likewise.
+	* compress.c: New file.
+	(bfd_uncompress_section_contents): New function.
+
+2008-07-07  Christophe Lyon  <christophe.lyon@st.com>
+
+	* elf32-arm.c (arm_type_of_stub): Don't crash on local symbols in
+	the presence of a PLT.
+
+2008-07-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd.c (bfd_demangle): Always trim off bfd_get_symbol_leading_char.
+
+2008-07-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (is_pic_glink_stub): New function.
+	(ppc_elf_get_synthetic_symtab): Don't generate symbols when
+	multiple shared/pie stubs per plt entry.
+
+2008-06-30  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elf.c (_bfd_elf_get_synthetic_symtab): Increment p by
+	bed->s->int_rels_per_ext_rel.
+
+2008-06-30  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* syms.c (BSF_SYNTHETIC): New flag.
+	* elf.c (_bfd_elf_get_synthetic_symtab): Set it.
+	* elf32-ppc.c (ppc_elf_get_synthetic_symtab): Likewise.
+	* elf64-ppc.c (ppc64_elf_get_synthetic_symtab): Likewise.
+	* bfd-in.h (bfd_asymbol_flavour): Return bfd_target_unknown_flavour
+	for synthetic symbols.
+	* bfd-in2.h: Regenerate.
+
+2008-06-30  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (record_arm_to_thumb_glue, record_thumb_to_arm_glue):
+	Expand comments.
+	(arm_map_one_stub): Use | 1 when setting the low bit.
+
+2008-06-29  Andreas Schwab  <schwab@suse.de>
+
+	* elf32-m68k.c (elf_m68k_relocate_section): Don't ignore existing
+	addend on _GLOBAL_OFFSET_TABLE_.
+
+2008-06-24  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (STUB_ENTRY_NAME): Define.
+	(arm_thumb_thumb_long_branch_stub): Use bx instead of b.n.
+	(arm_pic_long_branch_stub): Mention R_ARM_REL32 instead of
+	R_ARM_ABS32.
+	(struct elf32_arm_stub_hash_entry): Add output_name.
+	(arm_build_one_stub): Move offsets into the offset argument
+	of _bfd_final_link_relocate.  Correct offset for
+	arm_thumb_arm_v4t_stub_long_branch.
+	(elf32_arm_size_stubs): Set stub_entry->output_name.
+	(elf32_arm_ouput_plt_map_sym): Rename to elf32_arm_output_map_sym.
+	Update all callers.
+	(elf32_arm_output_stub_sym): New.
+	(arm_map_one_stub): Correct formatting.  Use elf32_arm_output_stub_sym.
+
+2008-06-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (needs_ovl_stub): Correctly return nonovl_stub for
+	non-branch insns.
+
+2008-06-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (build_stub): Allow wraparound on stub branches.
+	(allocate_spuear_stubs, build_spuear_stubs): Return value from
+	count_stub/build_stub.
+	(spu_elf_build_stubs): Correct location of stub reloc error message.
+
+2008-06-18  M R Swami Reddy <MR.Swami.Reddy@nsc.com>
+
+	* elf32-cr16.c (ELF_MACHINE_ALT1): Define to EM_CR16_OLD.
+
+2008-06-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure: Regenerate.
+
+2008-06-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (struct spu_link_hash_table): Add extra_stack_space.
+	(spu_elf_check_vma): Add extra_stack_space param, copy to htab.
+	(spu_elf_auto_overlay): Use it.
+	(RECURSE_UNMARK): Define as 0.
+	(unmark_overlay_section): Heed RECURSE_UNMARK.
+	* elf32-spu.h (spu_elf_check_vma): Update prototype.
+
+2008-06-12  DJ Delorie  <dj@redhat.com>
+
+	* elf32-m32c.c (ELF_MACHINE_ALT1): Define as EM_M32C_OLD.
+
+2008-06-09  Paul Brook  <paul@codesourcery.com>
+
+	bfd/
+	* elf32-arm.c (elf32_arm_merge_private_bfd_data): Allow BE8 shared
+	libraries.
+
+2008-06-09  Christophe Lyon  <christophe.lyon@st.com>
+
+	* elf32-arm.c (arm_stub_is_thumb): Define.
+	(elf32_arm_final_link_relocate): Handle near mode switching stubs.
+
+2008-06-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_auto_overlay): Add valid area below sp
+	to stack calculation.
+
+2008-06-06  Paul Brook  <paul@codesourcery.com>
+
+	bfd/
+	* elf32-arm.c (elf32_arm_merge_private_bfd_data): Reject BE8 input.
+
+2008-06-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_auto_overlay): Relax requirement that
+	file names be unique.  Specify archive:path in overlay script.
+
+2008-06-05  Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/6590
+	* elf64-ppc.c (ppc_build_one_stub): Correct reloc offsets.
+
+2008-06-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (ignore_section_sym): Don't test section sym value here.
+	(elf_map_symbols): Instead check zero value here as was done prior
+	to 2006-05-26 change.
+
+2008-06-04  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/6019
+	* elf32-avr.c (elf32_avr_relax_section): Handle the case where
+	there are no local symbols.
+
+2008-06-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (get_sym_h): Don't attempt to read global syms.
+	(process_stubs): Likewise.
+	(discover_functions): Don't used cached symbols.
+	(maybe_insert_function): Correct condition under which function
+	array is realloc'd.
+	(mark_functions_via_relocs): Delete unused variable.
+
+2008-05-30  Frediano Ziglio  <frediano.ziglio@vodafone.com>
+	    Nick Clifton  <nickc@redhat.com>
+
+	PR ld/6511
+	* elf64-hppa.c (allocate_global_data_opd): Default to using the
+	dynamic symbol table for local function names in shared libraries.
+
+2008-05-29  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elf.c (assign_file_positions_for_load_sections): Adjust pre-section
+	gaps based on VMA and P_VADDR instead of LMA and P_PADDR addresses.
+
+2008-05-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_object_p): New function.
+	(elf_backend_object_p): Define.
+	(build_stub): Correct second word of 8 byte overlay stubs.
+	(spu_elf_relocate_section): Formatting.
+
+2008-05-24  Carlos Eduardo Seo  <cseo@linux.vnet.ibm.com>
+
+	* elf.c (elfcore_write_register_note): New function.
+	* elf-bfd.h (elfcore_write_register_note): New prototype.
+
+2008-05-22  Christophe Lyon  <christophe.lyon@st.com>
+
+	* elf32-arm.c (arm_type_of_stub): Ignore STT_SECTION symbols.
+	(elf32_arm_stub_add_mapping_symbol): Remove.
+	(elf32_arm_add_stub): Don't generate mapping symbols. Change
+	prototype.
+	(elf32_arm_size_stubs): Use new elf32_arm_add_stub
+	prototype. Don't generate thumb to arm glue for calls.
+	(arm_map_one_stub): Define.
+	(elf32_arm_output_arch_local_syms): Generate mapping symbols for
+	long calls stubs.
+
+2008-05-21  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-arm.c (group_sections): Reformat comments.
+
+	PR ld/6446
+	* elf32-frv.c (elf32_frv_relocate_section): Set EF_FRV_PIC by
+	default (for FDPIC). Clear it if any inter-segment relocations
+	are found.
+
+	* elf64-hppa.c (elf64_hppa_finalize_opd): Check NULL return
+	from elf_link_hash_lookup.
+
+2008-05-21  Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+	Add multi-GOT support for m68k.
+	* elf32-m68k.c (struct elf_m68k_link_hash_entry: got_entry_key,
+	glist): New fields.
+	(struct elf_m68k_got_entry_key, struct elf_m68k_got_entry,
+	struct elf_m68k_got, struct elf_m68k_bfd2got_entry,
+	struct elf_m68k_multi_got): New data structures.
+	(struct elf_m68k_link_hash_table: local_gp_p, use_neg_got_offsets_p,
+	allow_multigot_p, multi_got_): New fields.
+	(elf_m68k_multi_got): New macro.
+	(elf_m68k_link_hash_newfunc): Initialize new fields of
+	struct elf_m68k_link_hash_entry.
+	(elf_m68k_link_hash_table_create): Initialize new fields of
+	struct elf_m68k_link_hash_table.
+	(elf_m68k_link_hash_table_free): New static function implementing hook.
+	(elf_m68k_init_got, elf_m68k_clear_got, elf_m68k_create_empty_got): New
+	static functions for struct elf_m68k_got.
+	(elf_m68k_init_got_entry_key, elf_m68k_got_entry_hash,
+	elf_m68k_got_entry_eq): New static functions for
+	struct elf_m68k_got_entry.
+	(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT,
+	ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): New macros.
+	(enum elf_m68k_get_entry_howto): New enum.
+	(elf_m68k_get_got_entry, elf_m68k_update_got_entry_type,
+	elf_m68k_remove_got_entry_type): New static functions for
+	struct elf_m68k_got_entry.
+	(elf_m68k_add_entry_to_got): New static function.
+	(elf_m68k_bfd2got_entry_hash, elf_m68k_bfd2got_entry_eq,
+	elf_m68k_bfd2got_entry_del, elf_m68k_get_bfd2got_entry): New static
+	functions for struct elf_m68k_bfd2got_entry.
+	(struct elf_m68k_can_merge_gots_arg, elf_m68k_can_merge_gots_1,
+	elf_m68k_can_merge_gots): New traversal.
+	(struct elf_m68k_merge_gots_arg, elf_m68k_merge_gots_1,
+	elf_m68k_merge_gots): Ditto.
+	(struct elf_m68k_finalize_got_offsets_arg,
+	elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Ditto.
+	(struct elf_m68k_partition_multi_got_arg,
+	elf_m68k_partition_multi_got_1, elf_m68k_init_symndx2h_1,
+	elf_m68k_partition_multi_got): Ditto.
+	(elf_m68k_find_got_entry_ptr, elf_m68k_remove_got_entry): New static
+	functions.
+	(elf_m68k_copy_indirect_symbol): New static function implementing
+	a hook.
+	(elf_m68k_check_relocs): Update to add entries to multi-GOT.
+	(elf_m68k_gc_sweep_hook): Update to remove entries from multi-GOT.
+	(elf_m68k_always_size_sections): Assign BFDs to GOTs.
+	(elf_m68k_relocate_section): Update to properly handle GOT relocations.
+	(elf_m68k_finish_dynamic_symbol): Update to traverse all GOT entries
+	of a global symbol.
+	(bfd_elf_m68k_set_target_options): New function.
+	(bfd_elf32_bfd_link_hash_table_free): Define hook.
+	(bfd_elf32_bfd_final_link): Change expansion to bfd_elf_final_link
+	to skip generic calculation of GOT offsets.
+	(elf_backend_copy_indirect_symbol): Define hook.
+	* bfd-in.h (bfd_elf_m68k_set_target_options): Declare function.
+	* bfd-in2.h: Regenerate.
+
+2008-05-21  André Johansen  <andrejoh@gmail.com>
+
+	PR 868
+	* dwarf2.c (_bfd_dwarf2_cleanup_debug_info): Free memory allocated
+	for filenames in function tables and variable tables.
+
+2008-05-19  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 2995, PR 6473
+	* elf.c (_bfd_elf_make_section_from_shdr): Leave lma equal to
+	vma when all p_paddr fields are zero and there is more than
+	one PT_LOAD header.
+
+2008-05-15  Christophe Lyon  <christophe.lyon@st.com>
+
+	Add long call support for ARM.
+	* elf32-arm.c (THM2_MAX_FWD_BRANCH_OFFSET): Define.
+	(THM2_MAX_BWD_BRANCH_OFFSET): Define.
+	(ARM_MAX_FWD_BRANCH_OFFSET): Define.
+	(ARM_MAX_BWD_BRANCH_OFFSET): Define.
+	(THM_MAX_FWD_BRANCH_OFFSET): Define.
+	(THM_MAX_BWD_BRANCH_OFFSET): Define.
+	(arm_long_branch_stub): Define.
+	(arm_pic_long_branch_stub): Define.
+	(arm_thumb_v4t_long_branch_stub): Define.
+	(arm_thumb_thumb_long_branch_stub): Define.
+	(arm_thumb_arm_v4t_long_branch_stub): Define.
+	(STUB_SUFFIX): Define.
+	(elf32_arm_stub_type): Define.
+	(elf32_arm_stub_hash_entry): Define.
+	(elf32_arm_link_hash_entry): Add stub_cache field.
+	(arm_stub_hash_lookup): Define.
+	(elf32_arm_link_hash_table): Add stub_hash_table, stub_bfd,
+	add_stub_section, layout_sections_again, stub_group, bfd_count,
+	top_index, input_list fields.
+	(elf32_arm_link_hash_newfunc): Init new field.
+	(stub_hash_newfunc): New function.
+	(elf32_arm_link_hash_table_create): Init stub_hash_table.
+	(elf32_arm_hash_table_free): New function.
+	(arm_type_of_stub): New function.
+	(elf32_arm_stub_name): New function.
+	(elf32_arm_get_stub_entry): New function.
+	(elf32_arm_stub_add_mapping_symbol): New function.
+	(elf32_arm_add_stub): New function.
+	(arm_build_one_stub): New function.
+	(arm_size_one_stub): New function.
+	(elf32_arm_setup_section_lists): New function.
+	(elf32_arm_next_input_section): New function.
+	(group_sections): New function.
+	(elf32_arm_size_stubs): New function.
+	(elf32_arm_build_stubs): New function.
+	(bfd_elf32_arm_add_glue_sections_to_bfd): Skip stub sections.
+	(bfd_elf32_arm_process_before_allocation): No longer handle
+	R_ARM_CALL and R_ARM_THM_CALL.
+	(using_thumb_only): New function.
+	(elf32_arm_final_link_relocate): Redirect calls to stub if range
+	exceeds encoding capabilities.
+	(bfd_elf32_bfd_link_hash_table_free): Define.
+	* bfd-in.h (R_ARM_max): Fix value to 130.
+	(elf32_arm_setup_section_lists): Protype.
+	(elf32_arm_next_input_section): Protype.
+	(elf32_arm_size_stubs): Protype.
+	(elf32_arm_build_stubs): Protype.
+	* bfd-in2.h: Regenerate.
+
+2008-05-14  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* elf32-ppc.c (ppc_elf_get_synthetic_symtab): Fix memset calls.
+	* elf64-ppc.c (ppc64_elf_get_synthetic_symtab): Likewise.
+
+2008-05-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2008-05-14  Ulrich Weigand  <uweigand@de.ibm.com>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (section_covers_vma): New function.
+	(ppc_elf_get_synthetic_symtab): New function.
+	(bfd_elf32_get_synthetic_symtab): Define.
+	* elf64-ppc.c (section_covers_vma): New function.
+	(ppc64_elf_get_synthetic_symtab): Generate sym@plt on glink branch
+	table entries, and __glink_PLTresolve on resolver stub.
+	(ppc64_elf_build_stubs): Rename __glink sym to __glink_PLTresolve.
+
+2008-05-12  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 6443
+	* elf32-ppc.c (MUST_BE_DYN_RELOC): Delete.
+	(must_be_dyn_reloc): New function.
+	(ppc_elf_check_relocs): Don't set DF_STATIC_TLS for tprel relocs
+	in pies.
+	(ppc_elf_tls_optimize): Optimise pies.
+	(ppc_elf_relocate_section): Use a section symbol rather than no
+	symbol if possible for LD->IE TLS sequence, but don't error if
+	we must use no symbol.
+	* elf64-ppc.c (MUST_BE_DYN_RELOC): As for elf32-ppc.c.
+	(must_be_dyn_reloc): Likewise.
+	(ppc64_elf_check_relocs): Likewise.
+	(ppc64_elf_tls_optimize): Likewise.
+	(ppc64_elf_relocate_section): Likewise.
+
+2008-05-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_relocate_section): Rename is_ea to is_ea_sym.
+
+2008-05-10  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+	* elfcore.h (elf_core_file_p): Warn about core truncation.
+
+2008-05-07  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa.c (xtensa_property_section_name): New.
+	(xtensa_make_property_section): New.
+	(xtensa_get_property_section): Make static.  Do not create a new
+	section if it does not exist.
+
+2008-05-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_special_sections): Add "._ea".
+	(spu_elf_relocate_section): Handle relocations against symbols
+	defined in ._ea specially.
+
+2008-05-03  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_symbian_link_hash_table_create): Use
+	ARRAY_SIZE.
+	(elf32_arm_symbian_plt_sym_val): New.
+	(elf_backend_plt_sym_val): Define.
+
+2008-05-03  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 2995, PR 6473
+	* elf.c (rewrite_elf_program_header): Rather than clearing
+	p_paddr_valid at end, don't set it in the first place.  Delete
+	comment no longer relevant.  When not p_paddr_valid, don't set
+	paddr from vaddr, and don't set p_vaddr_offset.
+
+2008-05-01  Cary Coutant  <ccoutant@google.com>
+
+	* elf.c (bfd_elf_get_str_section): Fix memory leak caused by
+	corrupt string table.
+
+2008-05-01  Joel Brobecker  <brobecker@adacore.com>
+
+	* cache.c (cache_bread_1): Renames cache_bread.
+	(cache_bread): New function.
+
+2008-05-01  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 2995, PR 6473
+	* elf.c (_bfd_elf_make_section_from_shdr): Always set lma from p_paddr.
+	(assign_file_positions_for_load_sections): Combine nested "if".
+	(copy_elf_program_header): Don't set p_paddr_valid or p_vaddr_offset
+	when all header p_paddr fields are zero.
+
+2008-04-30  Edmar Wienskoski  <edmar@freescale.com>
+
+	* cpu-powerpc.c (bfd_powerpc_archs): Add e500mc entry.
+
+2008-04-29  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf.c (_bfd_elf_get_dynamic_reloc_upper_bound)
+	(_bfd_elf_canonicalize_dynamic_reloc): Find dynamic relocations
+	even if they are not loaded.
+	* elflink.c (_bfd_elf_init_2_index_sections): Set data_index_section
+	first.
+
+2008-04-25  Jay Foad  <jay.foad@gmail.com>
+
+	* reloc16.c (bfd_coff_reloc16_get_value): Add support for
+	undefined weak symbols.
+
+2008-04-25  Nick Clifton  <nickc@redhat.com>
+
+	* po/vi.po: Updated Vietnamese translation.
+
+2008-04-23  Paolo Bonzini  <bonzini@gnu.org>
+
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+
+2008-04-21  Cary Coutant  <ccoutant@google.com>
+
+	* archive.c (_bfd_write_archive_contents): Fix incorrect use of
+	ARFMAG.
+
+2008-04-21  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elfxx-mips.c (_bfd_mips_vxworks_adjust_dynamic_symbol): Don't
+	set the value of undefined symbols in shared objects.
+	(_bfd_mips_vxworks_finish_dynamic_symbol): Clear value for
+	undefined symbols unless pointer equality is needed.
+
+2008-04-18  Dennis Roberts  <dennis.roberts@sunquestinfo.com>
+
+	* aix5ppc-core.c: Define macros for the default architecture and
+	machine for matching core files.
+	(xcoff64_core_p): Set the architecture and machine to the default
+	values defined in the macros mentioned above.
+	* rs6000-core.c: Define macros to determine whether or not the
+	core file header uses the core_dumpxx header format.
+	(rs6000coff_core_p): Don't match core files that use the
+	core_dumpxx header format.
+
+2008-04-16  Pedro Alves  <pedro@codesourcery.com>
+
+	* config.bfd (i[3-7]86-*-dicos*, x86_64-*-dicos*): Add.
+
+2008-04-16  David S. Miller  <davem@davemloft.net>
+
+	* reloc.c (BFD_RELOC_SPARC_GOTDATA_HIX22,
+	BFD_RELOC_SPARC_GOTDATA_LOX10, BFD_RELOC_SPARC_GOTDATA_OP_HIX22,
+	BFD_RELOC_SPARC_GOTDATA_OP_LOX10, BFD_RELOC_SPARC_GOTDATA_OP): New.
+	* libbfd.h: Regnerate.
+	* bfd-in2.h: Regenerate.
+	* elfxx-sparc.c (_bfd_sparc_elf_howto_table): Add entries for
+	GOTDATA relocations.
+	(sparc_reloc_map): Likewise.
+	(_bfd_sparc_elf_check_relocs): Handle R_SPARC_GOTDATA_* like
+	R_SPARC_GOT*.
+	(_bfd_sparc_elf_gc_sweep_hook): Likewise.
+	(_bfd_sparc_elf_relocate_section): Transform R_SPARC_GOTDATA_HIX22,
+	R_SPARC_GOTDATA_LOX10, R_SPARC_GOTDATA_OP_HIX22, and
+	R_SPARC_GOTDATA_OP_LOX10 into the equivalent R_SPARC_GOT* reloc.
+	Simply ignore R_SPARC_GOTDATA_OP relocations.
+
+2008-04-14  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* configure.in: Link with the PIC version of libiberty on
+	Linux/MIPS hosts.
+	* configure: Regenerate.
+
+2008-04-14  Edmar Wienskoski  <edmar@freescale.com>
+
+	* archures.c: Add bfd_mach_ppc_e500mc.
+	* bfd-in2.h: Regenerate.
+
+2008-04-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_build_stubs): Correct error message.
+	(mark_functions_via_relocs): Remove premature init of symtab_hdr.
+	(collect_overlays): Commment typo fix.
+
+2008-04-08  Kees Cook  <kees@canonical.com>
+
+	* elflink.c (bfd_elf_size_dynamic_sections): Ignore GNU-stack note
+	in EXEC_P bfds.
+
+2008-04-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c: Include libiberty.h.
+	(struct spu_link_hash_table): Add local_stire, overlay_fixed, reserved,
+	non_ovly_stub, spu_elf_load_ovl_mgr, spu_elf_open_overlay_script,
+	spu_elf_relink, auto_overlay fields.
+	(AUTO_OVERLAY, AUTO_RELINK, OVERLAY_RODATA): Define.
+	(needs_ovl_stub): Flip test so that call to non-function warning
+	is emitted during relocate_section rather than earlier.
+	(spu_elf_check_vma): Stash --auto-overlay parameters, and clear
+	auto_overlay if no section exceeds local store.
+	(struct call_info): Add count, max_depth, is_pasted fields.
+	(struct function_info): Add rodata, last_caller, call_count,
+	depth, new visit flags.
+	(insert_callee): Increment call count.
+	(copy_callee): New function.
+	(mark_functions_via_relocs): Investigate all reloc types to count
+	possible function pointer stubs for --auto-overlay.  Track
+	last_caller and increment function call_count.
+	(pasted_function): Insert a "call" into call info for pasted section.
+	(remove_cycles): Track max depth of calls.  Don't emit call graph
+	pruning warning for --auto-overlay.
+	(build_call_tree): Don't transfer_calls for --auto-overlay.
+	Adjust remove_cycles call.
+	(sort_calls, sort_lib, sort_bfds): New functions.
+	(struct _mos_param, struct _uos_param, struct _cl_param): New.
+	(mark_overlay_section, unmark_overlay_section): New functions.
+	(collect_lib_sectios, auto_ovl_lib_functions): New functions.
+	(collect_overlays, find_pasted_call): New functions.
+	(sum_stack): Deal with is_pasted "calls".  Exit before printing
+	when --auto-overlay.
+	(spu_elf_auto_overlay): New function.
+	(spu_elf_final_link): Call spu_elf_auto_overlay.
+	* elf32-spu.h (spu_elf_check_vma): Update prototype.
+
+2008-04-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (allocate_spuear_stubs): Ensure _SPUEAR_ symbol
+	is defined in overlay section before creating a stub.
+	(build_spuear_stubs): Likewise.
+	(spu_elf_size_stubs, spu_elf_build_stubs): Adjust calls.
+
+2008-04-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (insert_callee): Reorder call list so most recent
+	call is always first.
+	(interesting_section): Move.
+	(mark_functions_via_relocs): Fold interesting_section and
+	reloc_count tests in callers to here.  Simplify output section
+	owner test.
+	(discover_functions): Set "gaps" when no symbols and some
+	"interesting_section".  Run pasted_function loop for no symbol
+	bfds.
+	(for_each_node, transfer_calls): New functions.
+	(mark_non_root): Adjust to suit for_each_node.
+	(call_graph_traverse): Likewise.  Fix memory leak.  Rename to..
+	(remove_cycles): ..this.
+	(build_call_tree): Use for_each_node and transfer_calls.
+	(struct _sum_stack_param): New.
+	(sum_stack): Adjust to suit for_each_node.  Return error on
+	malloc failure.  Move code to print root node cumulative stack from..
+	(spu_elf_stack_analysis): ..here.  Use for_each_node.
+
+2008-03-31  Cary Coutant  <ccoutant@google.com>
+
+	PR 6006
+	* archive.c (_bfd_slurp_extended_name_table): Change
+	ARFMAG[0] to ARFMAG[1].
+	(_bfd_construct_extended_name_table): Likewise.
+
+2008-03-31  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elfxx-mips.c (mips_elf_record_got_page_entry): Update comment.
+	(_bfd_mips_elf_check_relocs): Update comments.  Always call
+	mips_elf_record_got_page_entry for R_MIPS_GOT_PAGE.
+
+2008-03-27  Cary Coutant  <ccoutant@google.com>
+
+	Add support for thin archives.
+	* archive.c (_bfd_find_nested_archive): New function.
+	(get_extended_arelt_filename): Add origin parameter.
+	(_bfd_generic_read_ar_hdr_mag): Deal with extended name
+	combined with a file offset.
+	(append_relative_path): New function.
+	(_bfd_get_elt_at_filepos): Deal with external members and
+	nested archives.
+	(bfd_generic_openr_next_archived_file): Thin archives.
+	(bfd_generic_archive_p): Recognize new magic string.
+	(adjust_relative_path): New function.
+	(_bfd_construct_extended_name_table): Construct extended
+	names for thin archive members.
+	(_bfd_write_archive_contents): Emit new magic string, skip
+	copying files for thin archives.
+	* bfd-in.h (bfd_is_thin_archive): New macro.
+	* bfd.c (struct bfd): New fields for thin archives.
+	* libbfd-in.h (struct areltdata): New field for thin archives.
+	* opncls.c (bfd_close): Delete BFDs for nested archives.
+
+2008-03-25  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	* elf32-bfin.c (bfin_final_link_relocate): New function, wrapper around
+	_bfd_final_link_relocate that also handles R_pcrel24 relocs.
+	(bfinfdpic_relocate_section, bfin_relocate_section): Use it.
+
+2008-03-25  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Skip dynamic relocs
+	in vxworks tls_vars sections.
+	(allocate_dynrelocs, elf32_arm_size_dynamic_sections): Likewise.
+	* elf32-i386.c (allocate_dynrelocs,
+	elf_i386_size_dynamic_sections, elf_i386_relocate_section): Likewise.
+	* elf32-ppc.c (allocate_dynrelocs, ppc_elf_size_dynamic_sections,
+	ppc_elf_relocate_section): Likewise.
+	* elf32-sh.c (allocate_dynrelocs, sh_elf_size_dynamic_sections,
+	sh_elf_relocate_section): Likewise.
+	* elfxx-sparc.c (allocate_dynrelocs,
+	_bfd_sparc_elf_size_dynamic_sections,
+	_bfd_sparc_elf_relocate_section): Likewise.
+
+2008-03-21  Adam Nemet  <anemet@caviumnetworks.com>
+
+	* elf.c (_bfd_elf_print_private_bfd_data): Use bfd_fprintf_vma to
+	print the values from the dynamic section.
+
+2008-03-20  Richard Sandiford  <rsandifo@nildram.co.uk>
+
+	* elfxx-mips.c (MIPS_ELF_GNU_GOT1_MASK): New macro.
+	(_bfd_mips_elf_finish_dynamic_sections): Use it instead of 0x80000000.
+
+2008-03-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_create_sections): Remove output_bfd parameter.
+	(spu_elf_find_overlays, spu_elf_size_stubs): Likewise
+	(process_stubs, discover_functions, build_call_tree): Likewise.
+	(spu_elf_stack_analysis): Likewise.
+	(spu_elf_check_vma): Likewise.  Move.
+	(struct call_info): Make "is_tail" a bitfield.
+	(insert_callee): Clear fun->start and set fun->is_func if we find
+	a non-tail call.
+	* elf32-spu.h (spu_elf_create_sections): Update prototype.
+	(spu_elf_find_overlays, spu_elf_size_stubs, spu_elf_check_vma): Ditto.
+
+2008-03-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* aclocal.m4: Regenerate.
+	* configure: Likewise.
+	* Makefile.in: Likewise.
+
+2008-03-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/5789
+	PR ld/5943
+	* elf32-i386.c  (elf_i386_relocate_section): Issue an error
+	for R_386_GOTOFF relocaton against undefined hidden/internal
+	symbols when building a shared object.
+
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Issue an
+	error for R_X86_64_PC8/R_X86_64_PC16/R_X86_64_PC32
+	relocaton against undefined hidden/internal symbols when
+	building a shared object.
+	(elf64_x86_64_finish_dynamic_symbol): Return FALSE when symbol
+	is referenced locally, but isn't defined in a regular file.
+
+2008-03-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfd-in.h (BFD_NO_FLAGS, HAS_RELOC, EXEC_P, HAS_LINENO,
+	HAS_DEBUG, HAS_SYMS, HAS_LOCALS, DYNAMIC, WP_TEXT, D_PAGED,
+	BFD_IS_RELAXABLE, BFD_TRADITIONAL_FORMAT, BFD_IN_MEMORY,
+	HAS_LOAD_PAGE, BFD_LINKER_CREATED): Moved to ...
+	* bfd.c: Here.
+
+	* bfd.c (bfd): Change cacheable, target_defaulted, opened_once,
+	mtime_set, no_export, output_has_begun and has_armap to bit
+	field.
+
+	* bfd-in2.h: Regenerated.
+
+2008-03-14  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* cache.c (close_one): Remove mtime hack.
+
+2008-03-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/5913
+	* elfxx-ia64.c (elfNN_ia64_tprel_base): Remove BFD_ASSERT.
+	(elfNN_ia64_dtprel_base): Likewise.
+	(elfNN_ia64_relocate_section): Go to missing_tls_sec if
+	tls_sec is NULL before calling elfNN_ia64_tprel_base or
+	elfNN_ia64_dtprel_base.  Report unsupported TLS relocations.
+
+2008-03-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (process_stubs, spu_elf_relocate_section): Move
+	common code to..
+	(maybe_needs_stub): ..here, a new function that also omits stubs
+	for .eh_frame, and..
+	(needs_ovl_stub): ..here.  Create stubs for labels in code section
+	referenced by switch jump table.
+	(spu_elf_find_overlays): Set htab->ovly_load and htab->ovly_return.
+	(enum _insn_type): Delete.
+	(enum _stub_type): New.
+	(count_stub, build_stub): Adjust.
+	(allocate_spuear_stubs, build_spuear_stubs): Adjust.
+
+2008-03-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (_bfd_elf_make_section_from_shdr): Remove unnecessary cast.
+	(_bfd_elf_assign_file_position_for_section): Simplify align.
+	(_bfd_elf_init_reloc_shdr): Ensure shift expression wide enough
+	for sh_addralign.
+	(elf_fake_sections, swap_out_syms): Likewise.
+	* elflink.c (bfd_elf_final_link): Likewise.
+
+2008-03-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2008-03-12  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	From Jie Zhang <jie.zhang@analog.com>
+	* elf32-bfin.c (struct bfinfdpic_relocs_info): Make got17m4,
+	gothilo, fd, fdgot17m4, fdgothilo, fdgoff17m4, fdgoffhilo,
+	gotoff, call and sym not bitfields.
+	(bfinfdpic_gc_sweep_hook): New function; update the relocation
+	information for the relocations of the section being removed.
+	(bfinfdpic_check_relocs): Accumulate the number of relocations
+	which set got17m4, gothilo, fd, fdgot17m4, fdgothilo, fdgoff17m4,
+	fdgoffhilo, gotoff, call and sym fields.
+	(elf_backend_gc_sweep_hook): Redefine for FD-PIC.
+
+2008-03-12  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 5900
+	* elf-bfd.h: Include elf/internal.h after elf/external.h.
+	* elfcode.h (elf_swap_symbol_in): Map reserved shndx range.
+	(elf_swap_symbol_out): Adjust SHN_XINDEX test.
+	(elf_swap_ehdr_out): Mask SHN_LORESERVE and SHN_XINDEX to values
+	seen in external structs.
+	(valid_section_index_p): Delete.
+	(elf_object_p): Don't increment section numbers over reserved range.
+	Simplify test for valid sh_link, sh_info and e_shstrndx fields.
+	(elf_write_shdrs_and_ehdr): Mask SHN_LORESERVE and SHN_XINDEX to values
+	seen in external structs.  Don't increment section numbers over
+	reserved range.
+	* elf.c (bfd_elf_sym_name): Remove redundant tests on st_shndx.
+	(bfd_section_from_shdr): Likewise.
+	(group_signature): Range check before accessing elf_elfsections.
+	(_bfd_elf_setup_sections): Likewise.
+	(bfd_section_from_shdr): Likewise.
+	(bfd_section_from_shdr): Don't increment section number over
+	reserved sections.
+	(assign_file_positions_for_non_load_sections): Likewise.
+	(assign_file_positions_except_relocs): Likewise.
+	(_bfd_elf_write_object_contents): Likewise.
+	(assign_section_numbers): Likewise.  Adjust for changed SHN_*.
+	(prep_headers): Delete unused variable.
+	* elflink.c (bfd_elf_link_record_local_dynamic_symbol): Adjust
+	for changed SHN_* values.
+	(check_dynsym, elf_link_input_bfd): Likewise.
+	(bfd_elf_final_link): Likewise.  Don't skip over reserved section
+	range.
+	(elf_fixup_link_order): Check that sh_link field is valid.
+	* elf-hppa.h (elf_hppa_add_symbol_hook): Make "index" unsigned.
+	* elf32-arm.c (elf32_arm_gc_mark_extra_sections): Range check before
+	accesssing elf_elfsections.
+	* elf32-avr.c (elf32_avr_size_stubs): Likewise.
+	* elf32-hppa.c (elf32_hppa_size_stubs): Likewise.
+	* elf32-m68hc1x.c (elf32_m68hc11_size_stubs): Likewise.
+	* elf64-hppa.c (elf64_hppa_check_relocs): Adjust for changed
+	SHN_* defines.  Test for SHN_BAD return from
+	_bfd_elf_section_from_bfd_section
+
+2008-03-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (_bfd_elf_section_from_bfd_section): Update prototype.
+	* elf.c (_bfd_elf_section_from_bfd_section): Return unsigned int,
+	SHN_BAD on error.
+	(_bfd_elf_print_private_bfd_data): Test for SHN_BAD result from
+	_bfd_elf_section_from_bfd_section, not -1.
+	(swap_out_syms): Likewise.
+	* elflink.c (elf_link_add_object_symbols): Likewise.
+	(bfd_elf_get_bfd_needed_list): Likewise.
+	(bfd_elf_match_symbols_in_sections): Likewise.
+	(elf_link_add_object_symbols): Don't bother testing for symbols
+	using normal sections before calling bfd_section_from_elf_index.
+	(elf_link_input_bfd, bfd_elf_final_link): Likewise.
+	(bfd_elf_reloc_symbol_deleted_p): Likewise.
+	* elfcode.h (elf_slurp_symbol_table): Likewise.
+	* elf32-spu.c (get_sym_h): Likewise.
+	* elf32-xtensa.c (get_elf_r_symndx_section): Likewise.
+	* elf64-ppc.c (opd_entry_value, get_sym_h, ppc64_elf_edit_toc): Ditto.
+	* elf64-sh64.c (sh_elf64_get_relocated_section_contents): Likewise.
+
+2008-03-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_relocate_section): Test identical conditions
+	to those in process_stubs for overlay symbols.
+
+2008-03-09  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_merge_eabi_attributes): Handle new
+	Tag_VFP_arch values.
+
+2008-03-08  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (insert_thumb_branch): Rewrite.
+	(elf32_thumb_to_arm_stub): Use new insert_thumb_branch.
+
+2008-03-07  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_howto_table_1): Fix bitmasks for MOVW and
+	MOVT relocations.
+	(elf32_arm_final_link_relocate): Fix off by one MOVW/MOVT sign
+	extension.
+	(elf32_arm_relocate_section): Handle MOVW and MOVT
+	relocations.  Improve safety check for other weird relocations.
+	(elf32_arm_check_relocs): Only set h->needs_plt for branch/call
+	relocations.
+
+2008-03-03  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-isa.c (xtensa_isa_num_pipe_stages): Make max_stage static and
+	only compute its value once.
+
+2008-03-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (struct got_entry): Add "addend" field.
+	(count_stub, build_stub): Use a new stub if relocation addend
+	differs from existing stubs for this symbol.
+	(process_stubs): Deal with addends.
+	(spu_elf_relocate_section, spu_elf_output_symbol_hook): Likewise.
+
+2008-03-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/5789
+	* elflink.c (_bfd_elf_symbol_refs_local_p): Always return true
+	for hidden and local symbols.
+
+2008-03-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (allocate_dynrelocs): Discard relocs on
+	undefined symbols with internal or hidden visibility.
+	(ppc_elf_relocate_section): Likewise.  Use SYMBOL_CALLS_LOCAL
+	rather than SYMBOL_REFERENCES_LOCAL on branches.  Don't
+	return immediately on dynamic reloc error.
+
+2008-03-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (build_plt_stub): Add relocs on plt call stubs
+	if emitrelocations.
+	(get_relocs): New function, split out from..
+	(ppc_build_one_stub): ..here.  Add relocs on plt_branch stubs if
+	emitrelocations.  Remove indx temp.
+	(ppc_size_one_stub): Count new stub relocs.
+	(ppc64_elf_size_stubs): Count new glink reloc.
+	(ppc64_elf_build_stubs): Emit glink reloc if emitrelocations.
+	(ppc64_elf_finish_dynamic_sections): Output glink relocs.
+	* elf32-ppc.c (ppc_elf_finish_dynamic_sections): Describe non-pic
+	glink code.
+
+2008-02-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (mark_functions_via_relocs): Don't assume that
+	the "->start" pointer reaches to function origin, so that we
+	can handle functions split over more than two sections.
+	(build_call_tree): Likewise.
+	(pasted_function): Don't attempt to set fun->start back to the
+	function origin, just go back one section.
+
+2008-02-27  Catherine Moore  <clm@codesourcery.com>
+
+	* elf.c ( _bfd_elf_print_private_bfd_data): Call
+	elf_backend_get_target_dtag if defined.
+	* elf32-mips.c (elf_backend_get_target_dtag): Define.
+	* elf64-mips.c: Likewise.
+	* elfn32-mips.c: Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_get_target_dtag): New.
+	* elfxx-mips.h (_bfd_mips_elf_get_target_dtag): Declare.
+	* elf-bfd.h (elf_backend_get_target_dtag): Add prototype.
+	* elfxx-target.h (elf_backend_get_target_dtag): Add default.
+	(elf_backend_data): Add elf_backend_get_target_dtag.
+
+2008-02-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Set pointer_equality_needed
+	for R_PPC_REL32 syms.  Don't set non_got_ref on branch reloc syms,
+	and assume branch relocs are not dynamic when non-shared.
+	(readonly_dynrelocs): New function, split out from..
+	(maybe_set_textrel): ..here, renamed from old readonly_dynrelocs.
+	(ppc_elf_adjust_dynamic_symbol): For symbols generating plt entries,
+	clear non_got_ref..
+	(allocate_dynrelocs): ..and don't set u.def for undefined weak.
+	Do allow dynamic relocs on undefined symbols.
+	(ppc_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
+	(ppc_elf_relocate_section): Mirror dynamic reloc changes in
+	check_relocs.
+	(ppc_elf_finish_dynamic_symbol): Don't give a warning on weak
+	plt symbols needing pointer_equality_needed.
+
+2008-02-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Revert non_got_ref change.
+
+2008-02-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_copy_indirect_symbol): Copy
+	pointer_equality_needed.
+	(ppc_elf_check_relocs): Split out non-branch relocs from others
+	that might emit dynamic relocs.  Set pointer_equality_needed
+	for their symbols.  Don't set non_got_ref on branch reloc symbols.
+	(ppc_elf_hash_symbol): New function.
+	(elf_backend_hash_symbol): Define.
+	(ppc_elf_finish_dynamic_symbol): Handle pointer_equality_needed.
+	Error if pointer_equality_needed on weak plt symbol.
+
+2008-02-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/5788
+	* elflink.c (elf_create_symbuf): Correct buffer size and
+	position.
+
+2008-02-22  Nick Clifton  <nickc@redhat.com>
+
+	PR 868
+	* dwarf2.c: Revert previous patch.  All of the allocate memory is
+	on an obstack which will be freed at some other time.
+
+2008-02-20  Nick Clifton  <nickc@redhat.com>
+
+	PR 868
+	* libbfd.c (bfd_realloc_or_free): New function.  Performs like
+	bfd_realloc, but if the (re)allocation fails, the pointer is
+	freed.
+	* libbfd-in.h: Prototype.
+	* libbfd.h: Regenerate.
+	* bfdio.c (bfd_bwrite): Use the new function.
+	(bfd_seek): Likewise.
+	* bfdwin.c:(bfd_get_file_window): Likewise.
+	* elf-strtab.c (_bfd_elf_strtab_add): Likewise.
+	* elf32-ppc.c (ppc_elf_relax_section): Likewise.
+	* elf32-xtensa.c (vsprintf_msg): Likewise.
+	* mach-o.c (bfd_mach_o_core_fetch_environment): Likewise.
+	* stabs.c (_bfd_link_seciton_stabs): Likewise.
+	* vms-misc.c (_bfd_vms_get_record): Likewise.
+	* vms-tir.c (check_section): Likewise.
+	* vms.c (vms_new_section_hook): Likewise.
+	* elf32-arm.c (elf32_arm_section_map_add): Check that the
+	allocation of sec_data->map succeeded before using it.
+	* elflink.c (elf_link_output_sym): Do not overwrite finfo->
+	symshndxbuf until it is known that the reallocation succeeded.
+
+2008-02-20  Diogo de Carvalho Kraemer  <diogo@kraemer.eng.br>
+	    Nick Clifton  <nickc@redhat.com>
+
+	PR 868
+	* dwarf2.c (read_abbrevs): Free the abbreviation table if we run
+	out of memory.
+	(decode_line_info): Free the line_info_table before returning a
+	failure result.
+	(_bfd_dwarf2_cleanup_debug_info): Free the abbreviation table.
+	Free the line table.  Free the function table.  Free the variable
+	table.
+
+2008-02-17  Mark Kettenis  <kettenis@gnu.org>
+
+	* elf.c (swap_out_syms): Avoid preprocessing directive within
+	macro arg.
+
+2008-02-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elf.c (assign_file_positions_for_load_sections): Set the type of
+	PT_NOTE sections to SHT_NOTE.
+
+2008-02-17  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* simple.c (bfd_simple_get_relocated_section_contents): Set
+	link_info.output_bfd.
+
+2008-02-16  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* dwarf2.c (find_line): Don't trust debug information after an
+	unparseable compilation unit.
+
+2008-02-15  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 5765
+	* section.c (SEC_LINK_DUPLICATES): Correct.  Renumber following flags.
+	* bfd-in2.h: Regenerate.
+
+2008-02-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (enum elf_object_id): Add HPPA_ELF_TDATA.
+	* elf.c (bfd_elf_allocate_object): Don't check for already allocated
+	tdata.
+	* elf32-hppa.c (elf32_hppa_mkobject): New function.
+	(bfd_elf32_mkobject): Define.
+	* elf32-ppc.c (is_ppc_elf_target): Delete.  Replace all uses with..
+	(is_ppc_elf): ..this new macro.
+	* elf64-ppc.c (is_ppc64_elf_target): Delete.  Replace all uses with..
+	(is_ppc64_elf): ..this new macro.
+
+2008-02-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c: Replace all accesses to hash->creator field with
+	output_bfd->xvec.
+	* cofflink.c: Likewise.
+	* coff-h8300.c: Likewise.
+	* ecoff.c: Likewise.
+	* elf32-m68hc1x.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf64-alpha.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf64-sparc.c: Likewise.
+	* elfxx-mips.c: Likewise.
+	* i386linux.c: Likewise.
+	* m68klinux.c: Likewise.
+	* sparclinux.c: Likewise.
+	* sunos.c: Likewise.
+	* xcofflink.c: Likewise.
+	* linker.c: Likewise.
+	(_bfd_link_hash_table_init): Don't store creator.
+
+2008-02-14  Peter Jones  <pjones@redhat.com>
+
+	* efi-rtdrv-ia32.c: New file.
+	* efi-bsdrv-ia32.c: New file.
+	* efi-rtdrv-ia64.c: New file.
+	* efi-bsdrv-ia64.c: New file.
+	* efi-rtdrv-x86_64.c: New file.
+	* efi-bsdrv-x86_64.c: New file.
+	* peicode.h (pe_bfd_object_p): Add support for boot service and
+	runtime service drivers.
+	* libpei.h: Add macros for EFI formats, and rename the efi application
+	format macros to disambiguate.
+	* targets.c: Add bfd_target _vec externs.
+	(_bfd_tar): Add EFI _vec entries.
+	* config.bfd: Add EFI vectors into the selection routines.
+	* configure.in: add EFI _vec entries.
+	* configure: Regenerate.
+	* Makefile.am: Add EFI files.
+	* Makefile.in: Regenerate.
+
+2008-02-14  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* dwarf1.c (struct dwarf1_debug): Add syms member.
+	(alloc_dwarf1_unit, alloc_dwarf1_func): Check for out of memory.
+	(parse_line_table, _bfd_dwarf1_find_nearest_line): Relocate
+	section contents, check for out of memory.
+
+	* dwarf1.c (struct dwarf1_debug): Change data pointers to bfd_byte.
+	(parse_die): Change data pointers to bfd_byte.
+	(parse_line_table, parse_functions_in_unit): Likewise.
+
+2008-02-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (compute_bucket_count): Warning fixes.
+
+2008-02-12  DJ Delorie  <dj@redhat.com>
+
+	* elf32-iq2000.c (iq2000_elf_relocate_section): Adjust addend of
+	relocation pointing to local symbol in merged section.
+
+	* elf32-iq2000.c (iq2000_elf_relocate_offset16): New.
+	(iq2000_elf_relocate_section): Call it.
+
+2008-02-12  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/5692
+	* elf-bfd.h (enum elf_object_id): New enum, used to identify
+	target specific extensions to the elf_obj_tdata structure.
+	(struct elf_obj_tdata): New field 'object_id'.
+	(elf_object_id, elf_program_header_size, elf_symtab_hdr): New
+	macros for accessing fields in the elf_obj_tdata structure.
+	(bfd_elf_mkobject): Rename to bfd_elf_make_generic_object.
+	(bfd_elf_allocate_object): New function.
+	* elf.c (bfd_elf_mkobject): Rename to bfd_elf_make_generic_object
+	and implement by calling bfd_elf_allocate_object.
+	(bfd_elf_allocate_object): New function: Allocates an
+	elf_obj_tdata structure, possibly with a target specific
+	extension.
+	* elfxx-target.h (bfd_elfNN_mkobject): Use
+	bfd_elf_make_generic_object as the default value.
+	* elf32-arm.c (elf32_arm_obj_tdata): Rename to elf_arm_obj_tdata
+	for consistency with other, similar structures.
+	(is_arm_elf): New macro.  Checks a BFD to make sure that is an ARM
+	ELF bfd.
+	(elf32_arm_mkobject): Call bfd_elf_allocate_object.
+	(bfd_elf32_arm_vfp11_erratum_scan): Use is_arm_elf macro to check
+	the bfd being processed.
+	(bfd_elf32_arm_vfp11_fix_veneer_locations): Likewise.
+	(bfd_elf32_arm_set_target_relocs): Likewise.
+	(bfd_elf32_arm_final_link_relocate): Likewise.
+	(bfd_elf32_arm_copy_private_bfd_data): Likewise.
+	(bfd_elf32_arm_merge_eabi_attributes): Likewise.
+	(bfd_elf32_arm_merge_private_bfd_data): Likewise.
+	(bfd_elf32_arm_check_relocs): Likewise.
+	(bfd_elf32_arm_gc_mark_extra_sections): Likewise.
+	(bfd_elf32_arm_size_dynamic_sections): Likewise.
+	(bfd_elf32_arm_process_before_allocation): Use elf_symtab_hdr.
+	(bfd_elf32_arm_init_maps): Likewise.
+	(bfd_elf32_arm_final_link_relocate): Likewise.
+	(bfd_elf32_arm_relocate_section): Likewise.
+	(bfd_elf32_arm_gc_sweep_hook): Likewise.
+	(bfd_elf32_arm_check_relocs): Likewise.
+	(bfd_elf32_arm_size_dynamic_sections): Likewise.
+	* elf32-i386.c (elf_i386_mkobject): Call bfd_elf_allocate_object.
+	(is_i386_elf): New macro.  Checks a BFD to make sure that is an x86
+	ELF bfd.
+	(elf_i386_check_relocs): Use is_i386_elf macro to check    the bfd
+	being processed.
+	(elf_i386_size_dynamic_sections): Likewise.
+	(elf_i386_relocate_section): Likewise.
+	(elf_i386_check_relocs): Use elf_symtab_hdr.
+	(elf_i386_gc_sweep_hook): Likewise.
+	(elf_i386_size_dynamic_sections): Likewise.
+	(elf_i386_relocate_section): Likewise.
+	* elf32-ppc.c (ppc_elf_mkobject): Call bfd_elf_allocate_object.
+	(elf_create_pointer_linker_section): Use is_ppc_elf_target to
+	verify that the bfd before accessing target specific fields.
+	(ppc_elf_check_relocs): Likewise.
+	(elf_finish_pointer_linker_section): Likewise.
+	(elf_create_pointer_linker_section): Use elf_symtab_hdr.
+	(ppc_elf_check_relocs): Likewise.
+	(ppc_elf_gc_sweep_hook): Likewise.
+	(ppc_elf_tls_optimize): Likewise.
+	(ppc_elf_size_dynamic_sections): Likewise.
+	(ppc_elf_relax_section): Likewise.
+	(ppc_elf_relocate_section): Likewise.
+	* elf32-s390.c (struct elf_s390_obj_tdata): Add a comment
+	reminding programmers to keep this structure in sync with the one
+	defined in elf64-s390.c.
+	(elf_s390_mkobject): Call bfd_elf_allocate_object.
+	(is_s390_elf): New macro.  Checks a BFD to make sure that is an s390
+	ELF bfd.
+	(elf_s390_check_relocs): Use is_s390_elf macro to check    the bfd
+	being processed.
+	(elf_s390_size_dynamic_sections): Likewise.
+	(elf_s390_relocate_section): Likewise.
+	(elf_s390_check_relocs): Use elf_symtab_hdr.
+	(elf_s390_gc_sweep_hook): Likewise.
+	(elf_s390_size_dynamic_sections): Likewise.
+	(elf_s390_relocate_section): Likewise.
+	* elf32-sh.c (sh_elf_mkobject): Call bfd_elf_allocate_object.
+	(is_sh_elf): New macro.  Checks a BFD to make sure that is an SH
+	ELF bfd.
+	(sh_elf_size_dynamic_sections): Use is_sh_elf macro to check the
+	bfd being processed.
+	(sh_elf_relocate_section): Likewise.
+	(sh_elf_check_relocs): Likewise.
+	(sh_elf_copy_private_data): Likewise.
+	(sh_elf_relax_section): Use elf_symtab_hdr.
+	(sh_elf_size_dynamic_sections): Likewise.
+	(sh_elf_relocate_section): Likewise.
+	(sh_elf_get_relocated_section_contents): Likewise.
+	(sh_elf_gc_sweep_hook): Likewise.
+	(sh_elf_check_relocs): Likewise.
+	* elf64-alpha.c (elf64_alpha_mkobject): Call bfd_elf_allocate_object.
+	(is_alpha_elf): New macro.  Checks a BFD to make sure that is an
+	Alpha ELF bfd.
+	(elf64_alpha_create_got_section): Use is_alpha_elf macro to check
+	the bfd being processed.
+	(elf64_alpha_create_dynamic_section): Likewise.
+	(elf64_alpha_check_relocs): Likewise.
+	(elf64_alpha_size_got_sections): Likewise.
+	(elf64_alpha_relax_section): Likewise.
+	(elf64_alpha_relocate_section): Likewise.
+	(elf64_alpha_final_link): Likewise.
+	(elf64_alpha_check_relocs): Use elf_symtab_hdr.
+	(elf64_alpha_relax_section): Likewise.
+	(elf64_alpha_relocate_section_r): Likewise.
+	(elf64_alpha_relocate_section): Likewise.
+	* elf64-ppc.c (ppc64_elf_mkobject): Call bfd_elf_allocate_object.
+	(ppc64_elf_check_relocs): Use is_ppc64_elf_target to check the bfd
+	being processed.
+	(opd_entry_value): Likewise.
+	(allocate_dynrelocs): Likewise.
+	(ppc64_elf_relocate_section): Likewise.
+	(ppc64_elf_check_relocs): Use elf_symtab_hdr.
+	(opd_entry_value): Likewise.
+	(ppc64_elf_gc_sweep_hook): Likewise.
+	(get_sym_h): Likewise.
+	(ppc64_elf_edit_opd): Likewise.
+	(ppc64_elf_tls_optimize): Likewise.
+	(ppc64_elf_edit_toc): Likewise.
+	(ppc64_elf_size_dynamic_sections): Likewise.
+	(toc_adjusting_stub_needed): Likewise.
+	(ppc64_elf_size_stubs): Likewise.
+	(ppc64_elf_relocate_section): Likewise.
+	* elf64-s390.c (struct elf_s390_obj_tdata): Add a comment
+	reminding programmers to keep this structure in sync with the one
+	defined in elf32-s390.c.
+	(elf_s390_mkobject): Call bfd_elf_allocate_object.
+	(is_s390_elf): New macro.  Checks a BFD to make sure that is an s390
+	ELF bfd.
+	(elf_s390_check_relocs): Use is_s390_elf macro to check    the bfd
+	being processed.
+	(elf_s390_size_dynamic_sections): Likewise.
+	(elf_s390_relocate_section): Likewise.
+	(elf_s390_check_relocs): Use elf_symtab_hdr.
+	(elf_s390_gc_sweep_hook): Likewise.
+	(elf_s390_size_dynamic_sections): Likewise.
+	(elf_s390_relocate_section): Likewise.
+	* elf64-x86_64.c (elf64_x86_64_mkobject): Call bfd_elf_allocate_object.
+	(is_x86_64_elf): New macro.  Checks a BFD to make sure that is an
+	x86_64 ELF bfd.
+	(elf64_x86_64_check_relocs): Use is_x86_64_elf macro to check the bfd
+	being processed.
+	(elf64_x86_64_size_dynamic_sections): Likewise.
+	(elf64_x86_64_relocate_section): Likewise.
+	(elf64_x86_64_check_relocs): Use elf_symtab_hdr.
+	(elf64_x86_64_gc_sweep_hook): Likewise.
+	(elf64_x86_64_size_dynamic_sections): Likewise.
+	(elf64_x86_64_relocate_section): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_mkobject): Call bfd_elf_allocate_object.
+	(is_sparc_elf): New macro.  Checks a BFD to make sure that is a Sparc
+	ELF bfd.
+	(_bfd_sparc_elf_check_relocs): Use is_sparc_elf macro to check the
+	bfd being processed.
+	(_bfd_sparc_elf_gc_sweep_hook): Likewise.
+	(_bfd_sparc_elf_size_dynamic_sections): Likewise.
+	(_bfd_sparc_elf_check_relocs): Use elf_symtab_hdr.
+	(_bfd_sparc_elf_gc_sweep_hook): Likewise.
+	(_bfd_sparc_elf_size_dynamic_sections): Likewise.
+	(_bfd_sparc_elf_relocate_section): Likewise.
+
+2008-02-12  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 5303, 5755
+	* arange-set.c: Delete.
+	* arange-set.h: Delete.
+	* dwarf2.c: Revert 2007-09-21 changes.
+	* Makefile.am: Likewise.
+	* Makefile.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2008-02-11  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	* elf32-bfin.c (bfin_relocate_section): Set up dynobj before using it
+	if necessary.
+	(elf32_bfin_merge_private_bfd_data): Simplify, and ensure object type
+	mismatches are detected.
+
+	* elf32-bfin.c (bfinfdpic_relocate_section): Take more care not to
+	emit invalid relocs or rofixup entries for deleted .eh_frame entries.
+
+2008-02-11  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* cache.c (cache_bread): Set bfd_error_file_truncated if EOF
+	was reached.
+	* srec.c (srec_scan): Calculate the checksum.  Complain on mismatch.
+
+2008-02-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_size_stubs): Revert 2008-01-28 doubling
+	of _ovly_buf_table size.
+	(spu_elf_build_stubs): Use low bit of .size as "present" bit.
+	Adjust initialisations relating to _ovly_buf_table.
+
+2008-02-04  Bob Wilson  <bob.wilson@acm.org>
+
+	* elf32-xtensa (elf_xtensa_relocate_section): After finding an invalid
+	relocation, do not continue processing it.  Ignore R_XTENSA_ASM_EXPAND
+	relocations against dynamic symbols.
+	(elf_xtensa_finish_dynamic_sections): Do not fail if there is no
+	.xt.lit section.
+
+2008-02-04  Kai Tietz  <kai.tietz@onevision.com>
+	    H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 5715
+	* warning.m4: Enable -Wno-format by default when using gcc on
+	mingw.
+	* configure: Regenerated.
+
+2008-02-04  Adam Nemet  <anemet@caviumnetworks.com>
+
+	* archures.c: Update copyright.
+	(bfd_mach_mips_octeon): New macro.
+	* bfd-in2.h: Regenerate.
+	* elfxx-mips.c (_bfd_elf_mips_mach): Handle Octeon.
+	(mips_set_isa_flags): Likewise.
+	(mips_mach_extensions): Add Octeon.
+	* cpu-mips.c: Update copyright.
+	(I_mipsocteon): New enum constant.
+	(arch_info_struct): Add Octeon.
+
+2008-02-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_relocate_section): Correct return type.
+	Return error status on unexpected relocation errors.
+
+2008-02-04  Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/5692
+	* elf.c (bfd_elf_get_elf_syms): Revert 2008-01-31.  Instead abort
+	on non-ELF input.
+	* elf32-arm.c (elf32_arm_size_dynamic_sections): Skip glue
+	processing on non-ELF input.
+
+2008-01-31  Marc Gauthier  <marc@tensilica.com>
+
+	* config.bfd (xtensa*-*-*): Recognize processor variants.
+
+2008-01-31  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/5692
+	* elf.c (bfd_elf_get_elf_syms): Check the return value of
+	get_elf_backend_data.
+
+2008-01-28  Fabian Groffen  <grobian@gentoo.org>
+
+	* config.bfd (x86_64-*-solaris2): Add support for this target.
+
+2008-01-28  Alan Modra  <amodra@bigpond.net.au>
+
+	Rewrite SPU overlay handling code.  Put overlay calls stubs in the
+	overlays where possible.  Use a faster call stub, or optionally at
+	compile time, a more compact stub.  Double size of _ovly_buf_table
+	so that low bit of _ovly_table.buf can be used as a "present" bit.
+	Reserve an extra _ovly_table entry for index zero.
+	* elf32-spu.c: (struct spu_link_hash_table): Delete a number of fields,
+	add new ones.
+	(struct got_entry): New.
+	(struct spu_stub_hash_entry): Delete.
+	(stub_hash_newfunc, spu_elf_link_hash_table_free): Delete.
+	(spu_elf_link_hash_table_create): Adjust for struct changes.
+	(spu_stub_name): Delete.
+	(spu_elf_find_overlays): Don't track sections from overlay regions.
+	Instead set ovl_buf number in spu elf section data.  Error if
+	overlays in one region don't start at the same address.  Adjust
+	for struct _spu_elf_section_data changes.
+	(SIZEOF_STUB1, SIZEOF_STUB2, ILA_79, ILA_78): Delete.
+	(OVL_STUB_SIZE, BRSL, LNOP, ILA): Define.
+	(needs_ovl_stub): Adjust for struct _spu_elf_section_data changes.
+	(enum _insn_type): New.
+	(count_stub, build_stub): New functions.
+	(allocate_spuear_stubs): Use count_stub.
+	(build_spuear_stubs): Use build_stub.
+	(populate_stubs, sort_stubs): Delete.
+	(process_stubs): New function.
+	(write_one_stub): Delete.
+	(spu_elf_size_stubs, spu_elf_build_stubs): Rewrite.
+	(alloc_stack_info): Adjust for struct _spu_elf_section_data changes.
+	(maybe_insert_function, check_function_ranges): Likewise.
+	(find_function, pasted_function, build_call_tree): Likewise.
+	(spu_elf_stack_analysis, spu_elf_modify_segment_map): Likewise.
+	(spu_elf_modify_program_headers): Likewise.
+	(interesting_section): Detect stub sections differently.  Delete
+	htab param, adjust all callers.
+	(spu_elf_relocate_section): Rewrite stub handling.
+	(spu_elf_output_symbol_hook): Likewise.
+	(bfd_elf32_bfd_link_hash_table_free): Delete.
+	* elf32-spu.h (struct _spu_elf_section_data): Move input-only and
+	output-only fields into a union.  Add ovl_buf.
+	(spu_elf_size_stubs, spu_elf_build_stubs): Update prototypes.
+
+2008-01-25  DJ Delorie  <dj@redhat.com>
+
+	* elf32-m32c.c (_bfd_m32c_elf_eh_frame_address_size): New.
+
+2008-01-25  Kai Tietz  <kai.tietz@onevision.com>
+
+	* bfd-in.h: Add mingw I64 support.
+	* bfd-in2.h: Regenerated.
+	* bfd.c: (bfd_get_sign_extend_vma): Add pe-x86-64 and pei-x86-64.
+
+2008-01-21  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 4453
+	* format.c (bfd_check_format_matches): Don't accept archives as
+	fully matching unless they have a map.
+
+2008-01-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (_bfd_elf_link_output_relocs): Correct error return.
+
+2008-01-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* ecoff.c (_bfd_ecoff_archive_p): Delete.
+	* libecoff.h (_bfd_ecoff_archive_p): Delete.
+	* coff-alpha.c (ecoffalpha_little_vec): Use bfd_generic_archive_p.
+	* coff-mips.c (ecoff_little_vec, ecoff_big_vec): Likewise.
+	(ecoff_biglittle_vec): Likewise.
+
+2008-01-19  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 5646
+	* elf64-ppc.c (ppc64_elf_tls_optimize): Ensure htab->tls_get_addr
+	non-NULL before dereferencing.
+
+2008-01-15  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 5604
+	* elf-bfd.h (struct elf_backend_data): Add gc_keep.  Remove param
+	names from others.
+	(_bfd_elf_gc_keep): Declare.
+	* elfxx-target.h (elf_backend_gc_keep): Define.
+	(elfNN_bed): Init new field.
+	* elflink.c (_bfd_elf_gc_keep): New function.
+	(bfd_elf_gc_sections): Call gc_keep.
+	* elf64-ppc.c (elf_backend_gc_keep): Define.
+	(struct _ppc64_elf_section_data): Move .opd related fields to
+	a struct so they don't occupy the same storage.  Adjust accesses
+	throughout file.
+	(ppc64_elf_gc_keep): New function, split out from..
+	(ppc64_elf_gc_mark_hook): ..here.  Don't call _bfd_elf_gc_mark
+	to mark .opd section, just set gc_mark.
+	(ppc64_elf_edit_opd): Remove no_opd_opt parm.  Don't set opd->adjust
+	unless we are changing .opd.  Test non-NULL opd->adjust at all
+	accesses throughout file.
+	* elf64-ppc.h (ppc64_elf_edit_opd): Update prototype.
+
+2008-01-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd-in.h (BFD_HOST_LONG_LONG): Delete.
+	* bfd-in2.h: Regenerate.
+
+2008-01-11  Tristan Gingold  <gingold@adacore.com>
+	    Eric Botcazou  <ebotcazou@adacore.com>
+
+	* elf32-ppc.c (ppc_elf_gc_sweep_hook): Exit early if generating a
+	relocatable.
+	* elf32-arm.c (elf32_arm_gc_sweep_hook): Likewise.
+	* elf32-cris.c (cris_elf_gc_sweep_hook): Likewise.
+	* elf32-hppa.c (elf32_hppa_gc_sweep_hook): Likewise.
+	* elf32-i386.c (elf_i386_gc_sweep_hook): Likewise.
+	* elf32-m32r.c (m32r_elf_gc_sweep_hook): Likewise.
+	* elf32-m68k.c (elf_m68k_gc_sweep_hook): Likewise.
+	* elf32-s390.c (elf_s390_gc_sweep_hook): Likewise.
+	* elf32-sh.c (sh_elf_gc_sweep_hook): Likewise.
+	* elf32-vax.c (elf_vax_gc_sweep_hook): Likewise.
+	* elf32-xtensa.c (elf_xtensa_gc_sweep_hook): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_gc_sweep_hook): Likewise.
+	* elf64-s390.c (elf_s390_gc_sweep_hook): Likewise.
+	* elf64-ppc.c (ppc64_elf_gc_sweep_hook): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_gc_sweep_hook): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_gc_sweep_hook): Likewise.
+	* elflink.c (bfd_elf_gc_sections): Do not punt on relocatable output
+	or executable output with relocations.
+
+2008-01-09  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/5552
+	* elf32-fr30.c (fr30_elf_howto_table): Set partial_inplace field
+	to FALSE for all relocs.
+
+2008-01-09  Richard Sandiford  <rsandifo@nildram.co.uk>
+
+	PR ld/5526
+	* elf-bfd.h (eh_cie_fde): Add u.cie.u.full_cie and u.cie.merged
+	fields.  Rename u.cie.u.merged to u.cie.u.merged_with.
+	(eh_frame_sec_info): Add a cies field.
+	(eh_frame_hdr_info): Add a merge_cies field.
+	* elf-eh-frame.c (cie): Add a reloc_index member to the personality
+	union.
+	(_bfd_elf_begin_eh_frame_parsing): Set hdr_info->merge_cies instead
+	of hdr_info->cies.
+	(_bfd_elf_parse_eh_frame): Remove tmp_cie.  Ccreate an array of
+	cie structures in all cases and use it instead of extended_cies.
+	If merging, store the cie array in sec_info->cies and point each
+	CIE's eh_fde_cie at the associated element.  Do not try to
+	calculate the value of the personality routine here; record the
+	offset of the relocation instead.  Do not merge CIEs here.
+	(_bfd_elf_end_eh_frame_parsing): Do not free hdr_info->cies here...
+	(_bfd_elf_discard_section_eh_frame_hdr): ...do it here instead.
+	(_bfd_elf_gc_mark_fdes): Mark the original (unmerged) CIE.
+	(find_merged_cie): New function.
+	(_bfd_elf_gc_mark_fdes): Use it.  Free sec_info->cies.
+
+2008-01-07  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/5535
+	* vms.c (vms_close_and_cleanup): Check for the presence of a
+	vms_private_data_struct before examining any of its fields.
+
+2008-01-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/5522
+	* elflink.c (elf_link_input_bfd): Don't write out a section if
+	its output section is marked with SEC_NEVER_LOAD.
+
+For older changes see ChangeLog-2007
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-2009 sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-2009
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-2009	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-2009	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,5154 @@
+2009-12-31  Cary Coutant  <ccoutant@google.com>
+
+	* dwarf2.c (struct line_sequence): New struct.
+	(struct line_info_table): Add num_sequences, remove last_line,
+	add sequences.
+	(add_line_info): Add new sequences as necessary.
+	(compare_sequences): New function.
+	(sort_line_sequences): New function.
+	(decode_line_info): Initialize new fields in line table.
+	Call sort_line_sequences.
+	(lookup_address_in_line_info_table): Binary search for proper
+	sequence.
+
+2009-12-28  Daniel Gutson  <dgutson@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): limits
+	fixed.
+
+2009-12-28  Daniel Gutson  <dgutson@codesourcery.com>
+
+	* elf-attrs.c (_bfd_elf_merge_object_attributes): Error
+	message rephrased.
+
+2009-12-21  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c: Delete my email address.
+
+2009-12-18  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* elf.c (elfcore_grok_s390_high_gprs): New function.
+	(elfcore_grok_note): Handle NT_S390_HIGH_GPRS notes.
+	(elfcore_write_s390_high_gprs): New function.
+	(elfcore_write_register_note): Call it.
+
+2009-12-17  Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/11088
+	* elf32-ppc.c (update_plt_info): Clear sec here when addend is
+	less than 32768..
+	(ppc_elf_check_relocs): ..rather than doing so here.  Ignore new
+	relax relocs.
+	(ppc_elf_gc_sweep_hook): Don't segfault when symbol hiding has
+	removed plt_entry records.
+	(ppc_elf_tls_setup): Handle PIE calls to __tls_get_addr correctly.
+	(ppc_elf_tls_optimize): Likewise.  Also dec __tls_get_addr refcount
+	when optimizing code using new tlsgd and tlsld marker relocs.
+	(ppc_elf_relax_section): Differentiate relaxed PLTREL24 relocs
+	from ADDR24 relocs using plt or glink.  Don't clear the addend
+	for R_PPC_RELAX_PLTREL24.
+	(ppc_elf_relocate_section): Correctly handle addends on relaxed
+	PLTREL24 relocs.
+
+2009-12-17  Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/11088
+	* elf64-ppc.c (ppc64_elf_gc_sweep_hook): Don't abort if symbol
+	hiding has nulled out plt.plist.
+
+2009-12-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* opncls.c (bfd_opnr_iovec): Replace _XXX with XXX_P in
+	parameters.
+
+	* tekhex.c (pass_over): Replace eof with is_eof.
+
+2009-12-15  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.h (bfd_mach_o_uuid_command): Remove section field.
+	* mach-o.c (bfd_mach_o_scan_read_uuid): Do not create a section
+	from this command.
+
+2009-12-15  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (struct mach_o_section_name_xlat): Add flags field.
+	(dwarf_section_names_xlat): Add section flags.
+	(text_section_names_xlat): Ditto.
+	(data_section_names_xlat): Ditto.
+	(bfd_mach_o_convert_section_name_to_bfd): Now return name and section
+	flags by reference.
+	(bfd_mach_o_make_bfd_section): Use section flags when know, otherwise
+	try to guess.
+
+2009-12-14  Doug Kwan  <dougkwan@google.com>
+
+	* opncls.c (bfd_opnr_iovec): Rename parameters to avoid shawdowed
+	variable warnings.
+	* bfd-in2.h: Regnenerate.
+
+2009-12-12  Nick Clifton  <nickc@redhat.com>
+
+	* coff-arm.c (coff_arm_rtype_to_howto): Fix shadowed variable
+	warning.
+
+2009-12-11  Tristan Gingold  <gingold@adacore.com>
+
+	* som.c (bfd_som_set_subsection_attributes)
+	(bfd_section_from_som_symbol, som_reloc_queue_fix): Fix shadowed
+	variable warnings.
+	* cache.c (close_one): Likewise.
+
+2009-12-11  Nick Clifton  <nickc@redhat.com>
+
+	* warning.m4 (GCC_WARN_CFLAGS): Add -Wshadow.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+	* doc/Makefile.in: Regenerate.
+	* aout-arm.c: Fix shadowed variable warnings.
+	* aout-tic30.c: Likewise.
+	* aoutx.h: Likewise.
+	* archive.c: Likewise.
+	* coff-alpha.c: Likewise.
+	* coff-i386.c: Likewise.
+	* coff-x86_64.c: Likewise.
+	* coffgen.c: Likewise.
+	* dwarf2.c: Likewise.
+	* ecoff.c: Likewise.
+	* elf-eh-frame.c: Likewise.
+	* elf-m10300.c: Likewise.
+	* elf.c: Likewise.
+	* elf32-arm.c: Likewise.
+	* elf32-avr.c: Likewise.
+	* elf32-bfin.c: Likewise.
+	* elf32-cr16.c: Likewise.
+	* elf32-i386.c: Likewise.
+	* elf32-ip2k.c: Likewise.
+	* elf32-lm32.c: Likewise.
+	* elf32-m68hc1x.c: Likewise.
+	* elf32-microblaze.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-rx.c: Likewise.
+	* elf32-score.c: Likewise.
+	* elf32-score7.c: Likewise.
+	* elf32-sh.c: Likewise.
+	* elf32-spu.c: Likewise.
+	* elf32-v850.c: Likewise.
+	* elf32-xtensa.c: Likewise.
+	* elf64-hppa.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf64-x86-64.c: Likewise.
+	* elflink.c: Likewise.
+	* elfxx-ia64.c: Likewise.
+	* elfxx-mips.c: Likewise.
+	* elfxx-sparc.c: Likewise.
+	* hash.c: Likewise.
+	* ieee.c: Likewise.
+	* libbfd.c: Likewise.
+	* mach-o.c: Likewise.
+	* merge.c: Likewise.
+	* nlm32-sparc.c: Likewise.
+	* oasys.c: Likewise.
+	* opncls.c: Likewise.
+	* pdp11.c: Likewise.
+	* peXXigen.c: Likewise.
+	* pef.c: Likewise.
+	* versados.c: Likewise.
+	* vms-gsd.c: Likewise.
+	* vms-hdr.c: Likewise.
+	* vms-tir.c: Likewise.
+	* vms.c: Likewise.
+	* xcofflink.c: Likewise.
+	* xsym.c: Likewise.
+	* xtensa-isa.c: Likewise.
+
+2009-12-10  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): Correct handling
+	of undefined symbols.
+
+2009-12-09  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_next_input_section): Skip sections without
+	SEC_CODE.
+
+2009-12-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (write_zeros): New function.
+	(assign_file_positions_for_load_sections): Allocate file space for
+	NOBITS sections that are followed by PROGBITS sections in a segment.
+
+2009-12-03  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_make_bfd_section): Force debug flags for
+	all sections of the __DWARF segment.
+
+2009-12-03  Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/11047
+	* elf32-ppc.c (ppc_elf_relocate_section): Delete __tls_get_addr
+	symbol reference from relocs belonging to calls that are
+	optimized away.
+	* elf64-ppc.c (ppc64_elf_relocate_section): Likewise.
+
+2009-12-02  Jerker Bäck  <jerker.back@gmail.com>
+
+	PR binutils/11017
+	* coff-i386.h (COFF_PAGE_SIZE): Definition moved to coff/i386.h
+
+2009-11-30  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure: Regenerate.
+
+2009-11-26  Per Øyvind Karlsen <peroyvind@mandriva.org>
+
+	* plugin.c (bfd_plugin_bfd_copy_link_hash_symbol_type): Define.
+
+2009-11-24  Joel Brobecker  <brobecker@adacore.com>
+
+	* acinclude.m4: Add include of ../config/zlib.m4.
+	* configure.in: AM_ZLIB to check for zlib support.
+	* configure: Regenerate.
+
+2009-11-23  Paul Brook  <paul@codesourcery.com>
+
+	* libbfd-in.h (_bfd_generic_copy_link_hash_symbol_type): Add
+	prototype.
+	* elf-bfd.h (_bfd_elf_copy_link_hash_symbol_type): Add prototype.
+	* linker.c (_bfd_generic_copy_link_hash_symbol_type): New function.
+	* elflink.c (_bfd_elf_copy_link_hash_symbol_type): New function.
+	* targets.c (BFD_JUMP_TABLE_LINK, struct bfd_target): Add
+	_copy_link_hash_symbol_type.
+	* coff64-rs6000.c (rs6000coff64_vec, aix5coff64_vec): Add
+	_bfd_generic_copy_link_hash_symbol_type.
+	* coff-rs6000.c (rs6000coff_vec, pmac_xcoff_vec): Add
+	_bfd_generic_copy_link_hash_symbol_type.
+	* aout-adobe.c (aout_32_bfd_copy_link_hash_symbol_type): Define.
+	* aout-target.h (MY_bfd_copy_link_hash_symbol_type): Define.
+	* aout-tic30.c (MY_bfd_copy_link_hash_symbol_type): Define.
+	* binary.c (binary_bfd_copy_link_hash_symbol_type): Define.
+	* bout.c (b_out_bfd_copy_link_hash_symbol_type): Define.
+	* coffcode.h (coff_bfd_copy_link_hash_symbol_type): Define.
+	* elfxx-target.h (bfd_elfNN_bfd_copy_link_hash_symbol_type): Define.
+	* i386msdos.c (msdos_bfd_copy_link_hash_symbol_type): Define.
+	* i386os9k.c (os9k_bfd_copy_link_hash_symbol_type): Define.
+	* ieee.c (ieee_bfd_copy_link_hash_symbol_type): Define.
+	* ihex.c (ihex_bfd_copy_link_hash_symbol_type): Define.
+	* libecoff.h (_bfd_ecoff_bfd_copy_link_hash_symbol_type): Define.
+	* mach-o.c (bfd_mach_o_bfd_copy_link_hash_symbol_type): Define.
+	* mmo.c (mmo_bfd_copy_link_hash_symbol_type): Define.
+	* nlm-target.h (nlm_bfd_copy_link_hash_symbol_type): Define.
+	* oasys.c (oasys_bfd_copy_link_hash_symbol_type): Define.
+	* pef.c (bfd_pef_bfd_copy_link_hash_symbol_type): Define.
+	* ppcboot.c (ppcboot_bfd_copy_link_hash_symbol_type): Define.
+	* som.c (som_bfd_copy_link_hash_symbol_type): Define.
+	* srec.c (srec_bfd_copy_link_hash_symbol_type): Define.
+	* tekhex.c (tekhex_bfd_copy_link_hash_symbol_type): Define.
+	* versados.c (versados_bfd_copy_link_hash_symbol_type): Define.
+	* vms.c (vms_bfd_copy_link_hash_symbol_type): Define.
+	* xsym.c (bfd_sym_bfd_copy_link_hash_symbol_type): Define.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2009-11-19  Tristan Gingold  <gingold@adacore.com>
+
+	* coff-rs6000.c (rs6000coff_vec): Use generic routines instead of
+	hard-coded casts.
+	(pmac_xcoff_vec): Ditto.
+	* coff64-rs6000.c (rs6000coff64_vec): Ditto.
+	(aix5coff64_vec): Ditto.
+
+2009-11-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd-in.h (_bfd_elf_ppc_at_tls_transform): Declare.
+	* bfd-in2.h: Regenerate.
+	* elf64-ppc.c (ppc64_elf_relocate_section): Move code for R_PPC64_TLS
+	insn optimisation to..
+	* elf32-ppc.c (_bfd_elf_ppc_at_tls_transform): ..here.  New function.
+	(ppc_elf_relocate_section): Use it.
+
+2009-11-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* targets.c: Don't include alloca-conf.h.
+	(bfd_get_target_info): Don't use alloca.
+
+2009-11-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/10955
+	* elfxx-ia64.c (elfNN_ia64_update_short_info): Also skip ABS
+	sections.
+
+2009-11-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/10955
+	* elfxx-ia64.c (elfNN_ia64_link_hash_table): Update comments.
+	(elfNN_ia64_update_short_info): Remove "->output_section" from
+	ia64_info->max_short_sec and ia64_info->min_short_sec.
+	(elfNN_ia64_choose_gp): Likewise.
+	(elfNN_ia64_relax_section): Pass tsec->output_section to
+	elfNN_ia64_update_short_info.
+
+2009-11-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/10955
+	* elfxx-ia64.c (elfNN_ia64_link_hash_table): Add max_short_sec,
+	max_short_offset, min_short_sec and min_short_offset.
+	(elfNN_ia64_update_short_info): New.
+	(elfNN_ia64_relax_section): Update max_short_sec,
+	max_short_offset, min_short_sec and min_short_offset.
+	(elfNN_ia64_choose_gp): Use min_short_sec/max_short_sec if
+	they are set.
+
+2009-11-17  Paul Brook  <paul@codesourcery.com>
+	    Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (using_thumb_only, arch_has_arm_nop,
+	arch_has_thumb2_nop): Handle TAG_CPU_ARCH_V7E_M.
+	(tag_cpu_arch_combine): Ditto. Correct MAX_TAG_CPU_ARCH test.
+
+2009-11-17  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* elf32-spu.c (struct spu_link_hash_table): Remove overlay_fixed,
+	reserved, and extra_stack_space members.
+	(spu_elf_auto_overlay): Use auto_overlay_fixed, auto_overlay_reserved,
+	and extra_stack_space members of htab->params instead.
+
+2009-11-17  Tristan Gingold  <gingold@adacore.com>
+
+	* targets.c: Include alloca-conf.h
+
+2009-11-16  Kai Tietz  <kai.tietz@onevision.com>
+
+	* targets.c (bfd_get_target_info): New function.
+	(_bfd_find_arch_match): New function.
+	* bfd-in2.h: Regenerated.
+
+2009-11-12  Nick Clifton  <nickc@redhat.com>
+
+	* po/ru.po: Updates Russian translation.
+
+2009-11-11  Nick Clifton  <nickc@redhat.com>
+
+	* po/id.po: Updated Indonesian translation.
+
+2009-11-11  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* configure.in: Call ACX_LARGEFILE.  Stop calling AC_PLUGINS,
+	AC_SYS_LARGEFILE and checking the Solaris largefile exception.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+
+2009-11-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/10911
+	* elflink.c (elf_link_output_extsym): Don't return on
+	STT_GNU_IFUNC symbol when stripping.
+
+2009-11-08  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* elf32-hppa.c (elf32_hppa_final_link): Don't sort unwind information
+	in a relocatable link.
+	* elf64-hppa.c (elf_hppa_final_link): Likewise.
+
+2009-11-05  Nick Clifton  <nickc@redhat.com>
+
+	* elflink.c (elf_link_add_object_symbols): Improve error
+	message generated when a symbol is left unresolved because a
+	--no-add-needed command line option has prevented the
+	inclusion of the DSO defining it.
+
+2009-11-03  Alan Modra  <amodra@bigpond.net.au>
+	    Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* elf32-spu.c (mark_functions_via_relocs): Handle non-branch relocs
+	(jump tables or other references to code labels) as well.
+
+2009-11-02  Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_merge_eabi_attributes): Handle VFPv4
+	attributes.
+
+2009-11-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_link_add_object_symbols): Don't force debug
+	symbols local.
+
+2009-10-29  Johan Kristell  <johankri@axis.com>
+
+	* elf32-cris.c (cris_elf_plt_sym_val): New function.
+	(elf_backend_plt_sym_val): Define.
+
+2009-10-27  Kai Tietz  <kai.tietz@onevision.com>
+
+	* peXXigen.c (bfdver.h): Add include.
+	(LINKER_VERSION): Do calculation based on BFD_VERSION.
+
+2009-10-25  Maciej W. Rozycki  <macro@linux-mips.org>
+
+	* elf32-vax.c (elf_vax_relocate_section): Correct assertion.
+
+2009-10-25  Maciej W. Rozycki  <macro@linux-mips.org>
+
+	* elf32-vax.c (elf_vax_plt_entry): Fix formatting.
+
+2009-10-25  Maciej W. Rozycki  <macro@linux-mips.org>
+
+	* elf32-vax.c (elf_vax_relocate_section): Fix a typo.
+
+2009-10-23  Kai Tietz  <kai.tietz@onevision.com>
+
+	* coff-x86_64.c (coff_amd64_rtype_to_howto): Subtract offset
+	of R_AMD64_PCRLONG_<X> relocations from addend.
+
+2009-10-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* plugin.c: Produce empty object if not BFD_SUPPORTS_PLUGINS.
+
+2009-10-20  Alan Modra  <amodra@bigpond.net.au>
+
+	PR binutils/10802
+	* opncls.c (_maybe_make_executable): Make DYNAMIC files executable.
+
+2009-10-19  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (cris_elf_relocate_section) <case R_CRIS_32_DTPREL>:
+	Don't subtract the size of the TLS block for non-shared objects
+	from the relocation.
+
+2009-10-17  Arnold Metselaar  <arnold.metselaar@planet.nl>
+
+	* coff-z80.c (z80coff_vec): Allow sections to be of type
+	SEC_CODE or SEC_DATA
+
+2009-10-16  Alan Modra  <amodra@bigpond.net.au>
+
+	PR binutils/10785
+	* coff-alpha.c (alpha_ecoff_get_elt_at_filepos): Don't bfd_alloc
+	bim and bim->buffer.  bfd_malloc instead.
+	* peicode.h (pe_ILF_build_a_bfd): Similarly.
+	(ILF_DATA_SIZE): Don't include bim.
+	* opncls.c (bfd_close): Test bim->buffer non-NULL before freeing.
+
+2009-10-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* aoutx.h (aout_link_check_ar_symbols): Typo fix.
+
+2009-10-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/10763
+	* elf32-i386.c (elf_i386_finish_dynamic_symbol): Declare plt
+	earlier.
+
+2009-10-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (_bfd_elf_merge_symbol): Revert previous patch.
+
+2009-10-12  Roland McGrath  <roland@frob.com>
+
+	* elflink.c (elf_link_add_object_symbols, _bfd_elf_merge_symbol):
+	Fix %s that should be %B in several message formats.
+
+2009-10-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* cofflink.c (_bfd_coff_link_input_bfd): Skip section symbols for
+	excluded output sections.
+
+2009-10-09  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_read_command): Handle BFD_MACH_O_LC_RPATH.
+	(bfd_mach_o_bfd_print_private_bfd_data): Ditto.
+
+2009-10-09  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_scan_read_symtab_symbols): Rename to
+	bfd_mach_o_read_symtab_symbols.
+	(bfd_mach_o_scan_write_thread): Rename to bfd_mach_o_write_thread.
+	(bfd_mach_o_scan_write_relocs): Rename to bfd_mach_o_write_relocs.
+	(bfd_mach_o_scan_write_section_32): Rename to
+	bfd_mach_o_write_section_32.
+	(bfd_mach_o_scan_write_section_64): Rename to
+	bfd_mach_o_write_section_64.
+	(bfd_mach_o_scan_write_segment_32): Rename to
+	bfd_mach_o_write_segment_32.
+	(bfd_mach_o_scan_write_segment_64): Rename to
+	bfd_mach_o_write_segment_64.
+	(bfd_mach_o_scan_write_symtab): Rename to bfd_mach_o_write_symtab.
+	(bfd_mach_o_scan_read_section_32): Rename to
+	bfd_mach_o_read_section_32.
+	(bfd_mach_o_scan_read_section_64): Rename to
+	bfd_mach_o_read_section_64.
+	(bfd_mach_o_scan_read_section): Rename to bfd_mach_o_read_section.
+	(bfd_mach_o_scan_read_symtab_strtab): Rename to
+	bfd_mach_o_read_symtab_strtab.
+	(bfd_mach_o_scan_read_symtab_symbol): Rename to
+	bfd_mach_o_read_symtab_symbol.
+	(bfd_mach_o_scan_read_dysymtab_symbol): Rename to
+	bfd_mach_o_read_dysymtab_symbol.
+	(bfd_mach_o_scan_read_dylinker): Rename to bfd_mach_o_read_dylinker.
+	(bfd_mach_o_scan_read_dylib): Rename to bfd_mach_o_read_dylib.
+	(bfd_mach_o_scan_read_prebound_dylib): Rename to
+	bfd_mach_o_read_prebound_dylib.
+	(bfd_mach_o_scan_read_thread): Rename to bfd_mach_o_read_thread.
+	(bfd_mach_o_scan_read_dysymtab): Rename to bfd_mach_o_read_dysymtab.
+	(bfd_mach_o_scan_read_symtab): Rename to bfd_mach_o_read_symtab.
+	(bfd_mach_o_scan_read_uuid): Rename to bfd_mach_o_read_uuid.
+	(bfd_mach_o_scan_read_linkedit): Rename to bfd_mach_o_read_linkedit.
+	(bfd_mach_o_scan_read_str): Rename to bfd_mach_o_read_str.
+	(bfd_mach_o_scan_read_dyld_info): Rename to bfd_mach_o_read_dyld_info.
+	(bfd_mach_o_scan_read_segment): Rename to bfd_mach_o_read_segment.
+	(bfd_mach_o_scan_read_segment_32): Rename to
+	bfd_mach_o_read_segment_32.
+	(bfd_mach_o_scan_read_segment_64): Rename to
+	bfd_mach_o_read_segment_64.
+	(bfd_mach_o_scan_read_command): Rename to bfd_mach_o_read_command.
+	* mach-o.h (bfd_mach_o_scan_read_dysymtab_symbol): Rename to
+	bfd_mach_o_read_dysymtab_symbol.
+
+2009-10-09  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_section_get_entry_size): Moved.
+	(bfd_mach_o_section_get_nbr_indirect): Ditto.
+	(bfd_mach_o_get_synthetic_symtab): New function.
+	(bfd_mach_o_print_private_header): Print the number of commands
+	in decimal.
+	* mach-o.h (bfd_mach_o_get_synthetic_symtab): Add prototype.
+	* mach-o-target.c: Do not defined bfd_mach_o_get_synthetic_symtab.
+
+2009-10-08  Tristan Gingold  <gingold@adacore.com>
+
+	* config.bfd: Add bfd_mach_o_i386_vec in x86_64-darwin targ_selvecs.
+
+2009-10-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfd-in2.h: Regenerated.
+
+2009-10-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* aout-cris.c (N_SHARED_LIB): Don't define.
+	* hp300bsd.c (N_SHARED_LIB): Don't define.
+	* i386bsd.c (N_SHARED_LIB): Don't define.
+	* i386linux.c (N_SHARED_LIB): Don't define.
+	* i386lynx.c (N_SHARED_LIB): Don't define.
+	* m68klinux.c (N_SHARED_LIB): Don't define.
+	* m88kmach3.c (N_SHARED_LIB): Don't define.
+	* mipsbsd.c (N_SHARED_LIB): Don't define.
+	* newsos3.c (N_SHARED_LIB): Don't define.
+	* pc532-mach.c (N_SHARED_LIB): Don't define.
+	* pdp11.c (N_SHARED_LIB): Don't define.
+	* sparclinux.c (N_SHARED_LIB): Don't define.
+	* vaxbsd.c (N_SHARED_LIB): Don't define.
+
+2009-10-01  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* cofflink.c (_bfd_coff_generic_relocate_section): Look for the aux
+	symbol for a weak undef in the auxbfd, not the input bfd.
+
+2009-10-01  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* elf32-spu.c (spu_elf_auto_overlay): Insert icache linker script
+	after .toe instead of before .text section.  Set the LMA of all
+	overlay sections to their icache IA address.
+	(spu_elf_find_overlays): Determine icache set id without reference
+	to the LMA.
+
+2009-09-30  Tristan Gingold  <gingold@adacore.com>
+
+	* configure.com: Use hosts/alphavms.h on both alpha and ia64 VMS.
+
+2009-09-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf64_x86_64_append_rela): New.
+	(elf64_x86_64_relocate_section): Use it.
+	(elf64_x86_64_finish_dynamic_symbol): Likewise.
+
+2009-09-29  DJ Delorie  <dj@redhat.com>
+
+	* Makefile.am (ALL_MACHINES): Add cpu-rx.lo.
+	(ALL_MACHINES_CFILES): Add cpu-rx.c.
+	(BFD32_BACKENDS): Add elf32-rx.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-rx.c.
+	* archures.c (bfd_architecture): Add bfd_arch_rx and bfd_mach_rx.
+	Export bfd_rx_arch.
+	(bfd_archures_list): Add bfd_rx_arch.
+	* config.bfd: Add entry for rx-*-elf.
+	* configure.in: Add entries for bfd_elf32_rx_le_vec and
+	bfd_elf32_rx_be_vec.
+	* reloc.c: Add RX relocations.
+	* targets.c: Add RX target vectors.
+	* Makefile.in: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* configure: Regenerate.
+	* libbfd.h: Regenerate.
+	* cpu-rx.c: New file.
+	* elf32-rx.c: New file.
+
+2009-09-29 M R Swami Reddy <MR.Swami.Reddy@nsc.com>
+
+	* elf32-cr16.c (elf32_cr16_relocate_section): Removed
+	info->relocatable to fix the ld/testsuites/ld-elf/linkonce1 test case.
+
+2009-09-28  Nick Clifton  <nickc@redhat.com>
+
+	PR 10478: Accepting Solaris binaries.
+	* elf.c (bfd_section_from_shdr): Allow SHN_BEFORE and SHN_AFTER
+	section link values in x86 binaries.
+	* elfcode.h (elf_object_p): Likewise.
+
+2009-09-28  Philippe De Muyter  <phdm@macqel.be>
+
+	* elf32-m68k.c (elf_m68k_final_write_processing): New function.
+	(elf_backend_final_write_processing): Macro defined as above function.
+
+2009-09-25  Martin Thuresson  <martint@google.com>
+
+	Update sources to make alpha and arm targets compile cleanly with
+	-Wc++-compat:
+	* ecoff.c: Add casts.
+	* ecofflink.c: Add casts.
+	* elf64-alpha.c: Add casts.
+	(struct alpha_elf_got_entry, struct alpha_elf_reloc_entry): Move
+	to top level.
+	(SKIP_HOWTO): Use enum name.
+	* elf32-arm.c: Add casts.
+	(elf32_arm_vxworks_bed): Update code to avoid multiple
+	declarations.
+	(struct map_stub): Move to top level.
+
+2009-09-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/10630
+	* elflink.c (elf_link_output_extsym): Turn off visibility on
+	local symbol.
+	(bfd_elf_final_link): Turn off visibility on dynamic local
+	symbol.
+
+2009-09-24  Alan Modra  <amodra@bigpond.net.au>
+
+	PR binutils/10654
+	* dwarf2.c (lookup_address_in_line_info_table): Remove workaround
+	for invalid location lists generated by gcc-2.95 and Intel 6.0 C++.
+	Remove "function" parm, adjust caller.
+
+2009-09-23  Matt Rice  <ratmice@gmail.com>
+
+	* bfd-in.h (bfd_elf_size_dynamic_sections): Add audit and depaudit
+	arguments.
+	* elflink.c (bfd_elf_size_dynamic_sections): Generate DT_AUDIT,
+	DT_DEPAUDIT from audit/depaudit arguments.
+	(elf_finalize_dynstr): Finalize DT_AUDIT and DT_DEPAUDIT strtab entries.
+	(elf_link_add_object_symbols): Set dt_audit target data when finding a
+	DT_AUDIT.
+	* bfd-in2.h: Regenerate.
+	* bfd-elf.h: Add dt_audit to elf_obj_tdata, and elf_dt_audit macro.
+
+2009-09-23  Jie Zhang  <jie.zhang@analog.com>
+
+	* elf32-bfin.c (_bfinfdpic_size_got_plt): Make sure empty
+	.rel.plt and .plt sections are removed.
+	(elf32_bfinfdpic_size_dynamic_sections): Remove empty .dynbss
+	section.  Remove the duplicated removing of empty .rel.plt
+	section.
+
+2009-09-21  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elf-eh-frame.c (_bfd_elf_write_section_eh_frame): Extend previous
+	patch to handle the new personality relaxation.
+
+2009-09-21  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elf-eh-frame.c (make_pc_relative): New function.
+	(_bfd_elf_write_section_eh_frame): Use it.
+
+2009-09-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (TLS_GET_ADDR_GLINK_SIZE): Define.
+	(ADD_3_12_2, BEQLR, CMPWI_11_0, LWZ_11_3, LWZ_12_3): Define.
+	(MR_0_3, MR_3_0): Define.
+	(struct ppc_elf_link_hash_table): Add no_tls_get_addr_opt.
+	(ppc_elf_select_plt_layout): Save emit_stub_syms param earlier.
+	(ppc_elf_tls_setup): Add no_tls_get_addr_opt param and save to hash
+	table.  Check for presense of __tls_get_addr_opt
+	(allocate_dynrelocs): Increase glink entry size for __tls_get_addr.
+	(ppc_elf_size_dynamic_sections): Add DT_PPC_TLS_OPT tag.
+	(write_glink_stub): Add param p.
+	(ppc_elf_relocate_section): Adjust write_glink_stub call.
+	(ppc_elf_finish_dynamic_symbol): Emit special glink call stub for
+	__tls_get_addr.
+	* elf32-ppc.h (ppc_elf_tls_setup): Update prototype.
+	* elf64-ppc.c (struct ppc_link_hash_table): Add no_tls_get_addr_opt.
+	(ppc64_elf_tls_setup): Add no_tls_get_addr_opt param and save to hash
+	table.  Check for presense of __tls_get_addr_opt.
+	(ppc64_elf_size_dynamic_sections): Add DT_PPC64_TLS_OPT tag.
+	(LD_R11_0R3, LD_R12_0R3, MR_R0_R3, CMPDI_R11_0, ADD_R3_R12_R13,
+	BEQLR, MR_R3_R0, MFLR_R11, STD_R11_0R1, BCTRL, LD_R11_0R1,
+	LD_R2_0R1, MTLR_R11): Define.
+	(build_tls_get_addr_stub): New function.
+	(ppc_build_one_stub): Call it.
+	(ppc_size_one_stub): Add extra size for __tls_get_addr stub.
+	(ppc64_elf_relocate_section): Don't change nop to ld 2,40(1) for
+	__tls_get_addr plt call.
+	* elf64-ppc.h (ppc64_elf_tls_setup): Update prototype.
+
+2009-09-19  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elf-bfd.h (eh_cie_fde): Add personality_offset and
+	make_per_encoding_relative to the CIE structure.  Add a padding field.
+	* elf-eh-frame.c (_bfd_elf_eh_frame_section_offset): Use 0x70
+	rather than 0xf0 when masking out the base address encoding
+	Record the offset of personality data from the start of the CIE.
+	Remove a repeated elf_backend_can_make_relative_eh_frame check.
+	(find_merged_cie): Take an info argument.  If the personality
+	binds locally, try converting an absolute personality into
+	a local one.
+	(_bfd_elf_discard_section_eh_frame): Use 0x70 rather than 0xf0
+	when masking out the base address encoding.  Update the call to
+	find_merged_cie.
+	(_bfd_elf_eh_frame_section_offset): Discard relocations against
+	the personality data if we are converting into PC-relative form.
+	(_bfd_elf_write_section_eh_frame): Use 0x70 rather than 0xf0
+	when masking out the base address encoding.  Handle
+	make_per_encoding_relative.
+
+2009-09-18  Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/10406
+	* elf32-ppc.c (ppc_elf_howto_raw): Make R_PPC_EMB_SDAI16 and
+	R_PPC_EMB_SDA2I16 complain_overflow_signed.
+	(create_sdata_sym): Pass info rather than htab.
+	Update all callers.  Ensure symbols are hidden.
+	(ppc_elf_check_relocs): Allow SDAREL16 when shared.
+	(ppc_elf_size_dynamic_sections): When shared, equate _SDA_BASE_ to
+	_GLOBAL_OFFSET_TABLE_.
+	(elf_finish_pointer_linker_section): Don't assume that sdata base
+	symbol is always at 0x8000 offset.  Don't subtract the addend here.
+	(is_static_defined): New function.
+	(ppc_elf_relocate_section): Verify symbol base used in SDA relocs
+	is statically defined.  Clear addend for EMB_SDAI16 and EMB_SDA2I16
+	relocs.  Downgrade error on unexpected section for EMB_SDA2REL
+	reloc symbols to a warning.
+
+2009-09-18  Nick Clifton  <nickc@redhat.com>
+
+	* po/es.po: Updated Spanish translation.
+	* po/vi.po: Updated Vietnamese translation.
+
+2009-09-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (follow_link, elf_follow_link, ppc_follow_link): New
+	functions.  Use throughout.
+	(ppc64_elf_copy_indirect_symbol): Set direct symbol "oh" field
+	from indirect symbol.
+	(lookup_fdh): Rename from get_fdh.  Follow indirect sym links.
+	(add_symbol_adjust): Simplify.
+	(defined_code_entry, defined_func_desc): New functions.
+	(ppc64_elf_gc_keep): Follow indirect sym links.  Use defined_code_entry.
+	(ppc64_elf_gc_mark_dynamic_ref): Use defined_func_desc and
+	defined_code_entry to follow indirect sym links.
+	(ppc64_elf_gc_mark_hook, func_desc_adjust): Likewise.
+	(ppc_type_of_stub): Follow indirect sym links.
+	(toc_adjusting_stub_needed): Likewise.
+	(ppc_build_one_stub): Likewise.  Make undefined dot-symbols weak
+	rather than defining them at stub.
+	(ppc64_elf_relocate_section): Rewrite call test to avoid multiple
+	assignments in test.
+
+2009-09-16  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.h (bfd_mach_o_filetype): Add new constants from darwin10.
+	Reindent.
+	* mach-o.c (bfd_mach_o_cpu_name): Reindent.
+	(bfd_mach_o_filetype_name): Complete with new constants.  Reindent.
+	(bfd_mach_o_print_private_header): Use fputs instead of fprintf
+	when possible to avoid warnings.
+	(bfd_mach_o_print_section_map): Ditto.
+	(bfd_mach_o_section_get_entry_size): New function.
+	(bfd_mach_o_section_get_nbr_indirect): Simplify using the newly
+	added function.
+	(bfd_mach_o_print_dysymtab): Print address of indirect symbols.
+
+2009-09-14  Nick Clifton  <nickc@redhat.com>
+
+	* po/fi.po: Updated Finnish translation.
+
+2009-09-11  Nick Clifton  <nickc@redhat.com>
+
+	* po/bfd.pot: Updated by the Translation project.
+
+2009-09-11  Philippe De Muyter  <phdm@macqel.be>
+
+	* binary.c (binary_object_p): Remove bfd_external_binary_architecture
+	hack.  objcopy `-B' (`--binary-architecture') option is now handled
+	in a generic way.
+
+2009-09-11  Nick Clifton  <nickc@redhat.com>
+
+	* rs6000-core.c (read_hdr): Fix typo in recent C++ compatibility
+	changes.
+
+2009-09-11  Jie Zhang  <jie.zhang@analog.com>
+
+	* elf32-bfin.c (bfinfdpic_relocs_info_find): Just return
+	NULL if `ht' is NULL.
+
+2009-09-09  Martin Thuresson  <martin@mtme.org>
+
+	Update sources to compile cleanly with -Wc++-compat:
+	* aoutx.h: Add casts.
+	* archive.c: Add casts.
+	* archive64.c: Add casts.
+	* archures.c: Add casts.
+	* bfd-in2.h: Regenerated.
+	* bfd.c: Add casts. (enum bfd_direction): Move out to top level.
+	* bfdio.c: Add casts.
+	* binary.c: Add casts.
+	* cache.c (cache_bseek,cache_bread_1,cache_bwrite): Updated
+	parameter to use enum value instead of int.
+	* coffcode.h: Add casts.
+	* coffgen.c: Add casts.
+	* cofflink.c: Add casts.
+	* compress.c: Add casts.
+	* dwarf1.c: Add casts.
+	* dwarf2.c: Add casts. (struct dwarf2_debug): Rename member bfd to
+	bfd_ptr. Update code to use new name.
+	* elf-attrs.c: Add casts.
+	* elf-bfd.h (elf_link_virtual_table_entry): Gives name to
+	anonymous struct. (union gotplt_union, struct
+	elf_link_virtual_table_entry): Move to top level.
+	* elf-eh-frame.c: Add casts.
+	* elf-strtab.c: Add casts.
+	* elf.c: Add casts. (_bfd_elm_make_Section_from_phdr): Change
+	argument name from typename to type_name.
+	* elf32-i386.c: Add casts.
+	* elf64-x86-64.c: Add casts.
+	* elfcode.h: Add casts.
+	* elfcore.h: Add casts.
+	* elflink.c: Add casts.
+	* format.c: Add casts.
+	* hash.c: Add casts.
+	* ihex.c: Add casts.
+	* libaout.h (enum aout_subformat, enum aout_magic): Move to top
+	level.
+	* libbfd.c: Add casts.
+	* linker.c: Add casts.
+	* merge.c: Add casts.
+	* opncls.c: Add casts.
+	* peXXigen.c: Add casts.
+	* peicode.h: Add casts.
+	* reloc.c: Add casts.
+	* section.c: Add casts.
+	* simple.c: Add casts.
+	* srec.c: Add casts.
+	* stabs.c: Add casts.
+	* syms.c: Add casts.
+	* targets.c: Add casts.
+	* tekhex.c: Add casts.
+	* verilog.c: Add casts.
+
+2009-09-09  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure: Regenerate.
+
+2009-09-09  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Set sym_flags
+	for the mode of target PLT entries.
+	(allocate_dynrelocs): Only adjust symbol type if setting its
+	value.
+
+2009-09-09  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure: Regenerate.
+
+2009-09-09  Nick Clifton  <nickc@redhat.com>
+
+	PR 10478:
+	* elf.c (bfd_section_from_shdr): Do not reject sparc binaries with
+	section headers containing sh_link values of SHN_BEFORE or
+	SHN_AFTER.
+	* elfcode.h (elf_object_p): Likewise.
+
+2009-09-09  Tristan Gingold  <gingold@adacore.com>
+
+	Handle DYLD_INFO introduced by Darwin10.
+	* mach-o.h (bfd_mach_o_load_command_type): Add
+	BFD_MACH_O_LC_DYLD_INFO.
+	(bfd_mach_o_dyld_info_command): New type.
+	(bfd_mach_o_load_command): Add dyld_info field.
+	* mach-o.c (bfd_mach_o_scan_read_str): Reduce size of buf.
+	(bfd_mach_o_scan_read_dyld_info): New function.
+	(bfd_mach_o_scan_read_command): Handle BFD_MACH_O_LC_DYLD_INFO.
+	(bfd_mach_o_bfd_print_private_bfd_data): Ditto.
+	(bfd_mach_o_load_command_name): AddB FD_MACH_O_LC_DYLD_INFO.
+	(bfd_mach_o_print_dyld_info): New function.
+
+2009-09-09  M R Swami Reddy <MR.Swami.Reddy@nsc.com>
+
+	* elf32-cr16.c (elf32_cr16_relocate_section): Add code to discard the
+	linkonce or linker script discarded section.
+
+2009-09-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-xtensa.c (elf_xtensa_relax_section): Delete -r check.
+
+2009-09-07  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* elf32-m68k.c (rtype_to_howto): If the reloc index is out of
+	range call the bfd error hander and use R_68K_NONE instead.
+
+2009-09-07  Tristan Gingold  <gingold@adacore.com>
+
+	* po/SRC-POTFILES.in: Regenerate.
+	* po/bfd.pot: Regenerate.
+
+	* bfd.m4 (BFD_HAVE_TIME_TYPE_MEMBER,
+	BFD_HAVE_SYS_STAT_TYPE_MEMBER): Moved to gas/acinclude.m4
+	* configure.in: Move tests for tm_gmtoff, st_mtim.tv_sec and
+	st_mtim.tv_nsec to gas/configure.in
+	(bfd_elf64_ia64_vms_vec): Remove vmsutil.lo
+	* configure: Regenerate.
+	* config.in: Regenerate.
+	* vmsutil.c: Moved to gas/config/te-vms.c
+	* vmsutil.h: Removed.
+	* Makefile.am (BFD32_BACKENDS_CFILES): Remove vmsutil.c
+	(BFD32_BACKENDS): Remove vmsutil.lo
+	* Makefile.in: Regenerate.
+
+2009-09-05  Eli Zaretskii  <eliz@gnu.org>
+
+	* coffcode.h: Include libiberty.h.
+
+2009-09-05  Martin Thuresson  <martin@mtme.org>
+
+	* coff-arm.c (coff_arm_relocate_section)
+	(record_thumb_to_arm_glue, bfd_arm_process_before_allocation):
+	Change member name class to symbol_class.
+	* coff-i960.c (coff_i960_relocate_section) Rename variable
+	class to class_val. Change member name class to symbol_class.
+	* coff-rs6000.c (_bfd_xcoff_swap_aux_in)
+	(_bfd_xcoff_swap_aux_out): Rename arguments class to in_class.
+	* coff-stgo32.c (adjust_aux_in_post)
+	(adjust_aux_out_pre, adjust_aux_out_post): Rename arguments class
+	to in_class.
+	* coff64-rs6000.c (_bfd_xcoff64_swap_aux_in)
+	(_bfd_xcoff64_swap_aux_out): Rename arguments class to in_class.
+	* coffcode.h (coff_pointerize_aux_hook): Rename variable class
+	to n_sclass.
+	* coffgen.c (coff_write_symbol, coff_pointerize_aux): Rename
+	variables named class to n_sclass. (coff_write_symbols): Rename
+	variable class to sym_class. (bfd_coff_set_symbol_class): Rename
+	argument class to symbol_class.
+	* cofflink.c (_bfd_coff_link_hash_newfunc)
+	(coff_link_add_symbols, _bfd_coff_link_input_bfd)
+	(_bfd_coff_write_global_sym, _bfd_coff_generic_relocate_section):
+	Update code to use renamed members.
+	* coffswap.h (coff_swap_aux_in, coff_swap_aux_out): Rename
+	argument class to in_class.
+	* libcoff-in.h (struct coff_link_hash_entry, struct
+	coff_debug_merge_type) Renamed members class to symbol_class and
+	type_class.
+	* libcoff.h Regenerated.
+	* peXXigen.c: (_bfd_XXi_swap_aux_in, _bfd_XXi_swap_aux_out):
+	Rename argument class to in_class.
+	* pef.c (bfd_pef_parse_imported_symbol): Update code to use
+	renamed members.
+	* pef.h (struct bfd_pef_imported_symbol): Changed name of
+	member class to symbol_class.
+
+2009-09-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated.
+
+2009-09-04  Tristan Gingold  <gingold@adacore.com>
+
+	* configure.in: Bump version to 2.20.51
+
+2009-09-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_relocate_section): Correct 2009-07-24 logic.
+
+2009-09-04  Jie Zhang  <jie.zhang@analog.com>
+
+	* elf32-bfin.c (elf32_bfinfdpic_create_dynamic_sections): Always
+	create .rela.bss.
+	(elf32_bfinfdpic_size_dynamic_sections): Set SEC_EXCLUDE flag
+	for empty .rela.bss and .rel.plt sections.
+
+2009-09-03  Adam Nemet  <anemet@caviumnetworks.com>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): Don't relocate
+	R_MIPS_JALR unless symbol resolves locally.
+
+2009-09-03  Adam Nemet  <anemet@caviumnetworks.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_check_relocs): Don't set
+	has_static_relocs for R_MIPS_JALR.
+
+2009-09-03  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* elf64-mips.c (mips_elf64_howto_table_rela): Add support for
+	R_MIPS_TLS_DTPMOD64 and R_MIPS_TLS_TPREL64, replacing the
+	respective stubs.
+
+2009-09-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf64_x86_64_finish_dynamic_symbol): Declare
+	plt earlier.
+
+2009-09-01  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms: Ported to Itanium VMS.  Remove useless variable and
+	dependencies.  Reindent.
+	* configure.com: Ported to Itanium VMS.  Now generates a build.com
+	to build without make.  Add messages but make edit silent.
+	* hosts/alphavms.h: Add a prototype for stpcpy.
+	* vms.c: Add a missing include for Alpha VMS.
+	* elfxx-ia64.c (ELF_OSABI): Define for OpenVMS.
+
+2009-08-31  Jan Beulich  <jbeulich@novell.com>
+
+	* elf-bfd.h (bfd_elf_get_default_section_type): Declare.
+	* elf.c (bfd_elf_get_default_section_type): New.
+	(elf_fake_sections): Use bfd_elf_get_default_section_type.
+
+2009-08-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_finish_dynamic_symbol): Revert the
+	accidental checkin.
+	* elf64-x86-64.c (elf64_x86_64_finish_dynamic_symbol): Likwise.
+
+2009-08-30  Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/10569
+	* bfd.c (bfd_emul_get_maxpagesize): Don't abort.
+	(bfd_emul_get_commonpagesize): Likewise.
+
+2009-08-29  Martin Thuresson  <martin@mtme.org>
+
+	* elf32-arm.c (struct stub_def): Rename member template to
+	template_sequence. (arm_build_one_stub,
+	find_stub_size_and_template, arm_size_one_stub, arm_map_one_stub):
+	Rename variable template to template_sequence.
+	* elfxx-ia64.c (elfNN_ia64_relax_br, elfNN_ia64_relax_brl):
+	Rename variable template to template_val.
+	* aoutx.h (NAME (aout, make_empty_symbol)): Rename variable
+	new to new_symbol.
+	* coffgen.c (coff_make_empty_symbol)
+	(coff_bfd_make_debug_symbol): Rename variable new to new_symbol.
+	* cpu-ia64-opc.c (ext_reg, ins_imms_scaled): Rename variable
+	new to new_insn.
+	* ecoff.c (_bfd_ecoff_make_empty_symbol): Rename variable new
+	to new_symbol.
+	* elf32-m68k.c (elf_m68k_get_got_entry_type): Rename argument
+	new to new_reloc.
+	* hash.c (bfd_hash_lookup): Rename variable new to new_string.
+	* ieee.c (ieee_make_empty_symbol): Rename variable new to
+	new_symbol.
+	* linker.c (bfd_new_link_order): Rename variable new to
+	new_lo.
+	* mach-o.c (bfd_mach_o_sizeof_headers): Rename variable new to
+	symbol.
+	* oasys.c (oasys_make_empty_symbol): Rename variable new to
+	new_symbol_type.
+	* pdp11.c (NAME (aout, make_empty_symbol)): Rename variable
+	new to new_symbol_type.
+	* plugin.c (bfd_plugin_make_empty_symbol): Rename variable new
+	to new_symbol.
+	* rs6000-core.c (CoreHdr, VmInfo): Rename union member new to
+	new_dump.
+	(read_hdr, rs6000coff_core_p)
+	(rs6000coff_core_file_matches_executable_p)
+	(rs6000coff_core_file_failing_command)
+	(rs6000coff_core_file_failing_signal): Updated function to use new
+	union member name.
+	* som.c (som_make_empty_symbol): Rename variable new to
+	new_symbol_type.
+	* syms.c (_bfd_generic_make_empty_symbol): Rename variable new
+	to new_symbol.
+	* tekhex.c (first_phase, tekhex_make_empty_symbol): Rename
+	variable new to new_symbol.
+
+2009-08-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* acinclude.m4 (AM_INSTALL_LIBBFD): Call AM_SUBST_NOTMAKE for
+	bfdlibdir and bfdincludedir.
+	* Makefile.am (bfdlibdir, bfdincludedir): Move definition ...
+	[INSTALL_LIBBFD]: ... here, ...
+	[INSTALL_LIBBFD]: ... and empty overrides here.
+	[!INSTALL_LIBBFD]: (rpath_bfdlibdir): New variable.
+	[!INSTALL_LIBBFD] (libbfd_la_LDFLAGS): Use it.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2009-08-26  Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+	* elf32-m68k.c: Rewrite initialization of GOT entries for TLS
+	relocations.  Rewrite output of dynamic TLS relocations.
+	(DTP_OFFSET, TP_OFFSET): New constants.
+	(dtpoff_base): Update.
+	(tpoff): Rename to tpoff_base, update.
+	(elf_m68k_init_got_entry_static, elf_m68k_init_got_entry_local_shared):
+	New functions.  Move code from elf_m68k_relocate_section here.
+	(elf_m68k_relocate_section): Update.
+	(elf_m68k_finish_dynamic_symbol): Fix handling of local TLS symbols.
+
+2009-08-26  Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+	* elf32-m68k.c (elf_m68k_copy_indirect_symbol): Propagate
+	non_got_ref value.
+	(elf_m68k_check_relocs): Handle dynamic TLS relocations.
+	Handle non_got_ref field.
+	(elf_m68k_adjust_dynamic_symbol): Handle non_got_ref field.
+
+2009-08-26  Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/10518
+	* linker.c (bfd_find_version_for_sym): Revert warning.
+
+2009-08-26  Alan Modra  <amodra@bigpond.net.au>
+
+	PR ld/10518
+	* linker.c (bfd_find_version_for_sym): Override a "*" match by any
+	other wildcard match.  Warn on multiple wildcard matches.
+
+2009-08-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.am (libbfd_la_LDFLAGS): Initialize early, to allow
+	appending.
+	[INSTALL_LIBBFD] (bfdlib_LTLIBRARIES, bfdinclude_HEADERS): Set
+	only in this condition.
+	[!INSTALL_LIBBFD] (noinst_LTLIBRARIES, libbfd_la_LDFLAGS): New,
+	to build but not install libbfd.la in this condition.
+	(install-bfdlibLTLIBRARIES, uninstall-bfdlibLTLIBRARIES)
+	(install_libbfd, install_libbfd): Remove.
+	* Makefile.in: Regenerate.
+	* doc/Makefile.am (AM_CPPFLAGS): Renamed from ...
+	(INCLUDES): ... this.
+	($(MKDOC)): Adjust.
+	* doc/Makefile.in: Regenerate.
+
+	* Makefile.am (AUTOMAKE_OPTIONS): Remove cygnus, instead use
+	no-dist and foreign.
+	(EXTRA_libbfd_la_SOURCES): New, list $(CFILES) to allow
+	dependency tracking to work for them.
+	(targets.lo, archures.lo, dwarf.lo): Rewrite to
+	use automake dependency tracking mechanism.
+	(MKDEP, DEP, DEP1, dep.sed, dep, dep-in, dep-am): Remove.
+	(mkdep section): Remove.
+	(BUILT_SOURCES): New, list $(BUILD_HFILES).
+	* Makefile.in: Regenerate.
+	* po/SRC-POTFILES.in, po/bfd.pot: Regenerate.
+
+	* Makefile.am (datarootdir, docdir, htmldor, pdfdir)
+	(install-pdf, install-pdf-recursive, install-html)
+	(install-html-recursive): Remove.
+	* Makefile.in: Regenerate.
+
+	* Makefile.in: Regenerate.
+	* aclocal.m4: Likewise.
+	* config.in: Likewise.
+	* configure: Likewise.
+
+2009-08-21  Daniel Gutson  <dgutson@codesourcery.com>
+
+	* elf32-arm.c (arch_has_thumb2_nop): New function.
+	(arch_has_arm_nop): New function.
+	(elf32_arm_final_link_relocate): NOP opcodes changed.
+
+2009-08-16  Doug Evans  <dje@google.com>
+
+	* opncls.c (bfd_close): Until BFD_IN_MEMORY has an iovec,
+	at least don't leak memory.
+
+2009-08-13  DJ Delorie  <dj@redhat.com>
+
+	* elf32-m32c.c (m32c_elf_relax_delete_bytes): Adjust symbol sizes
+	if needed.
+
+2009-08-12  Nick Clifton  <nickc@redhat.com>
+
+	* po/fi.po: Updated Finnish translation.
+
+2009-08-11  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	Merge some FRV FDPIC changes into the Blackfin code.
+	* elf32-bfin.c (struct bfinfdpic_elf_link_hash_table): Add pointer to
+	summary reloc information.
+	(bfinfdpic_dynamic_got_plt_info): New.
+	(_bfin_create_got_section): Create the PLT section here.
+	(elf32_bfinfdpic_create_dynamic_sections): Not here.
+	(_bfinfdpic_count_nontls_entries): Move out of...
+	(_bfinfdpic_count_got_plt_entries): ... here.
+	(_bfinfdpic_count_relocs_fixups): Likewise.
+	(_bfinfdpic_reset_got_plt_entries): New.
+	(_bfinfdpic_size_got_plt): Move out of...
+	(elf32_bfinfdpic_size_dynamic_sections): ... here.
+	(bfinfdpic_relocate_section): Be careful not to call
+	_bfinfdpic_add_rofixup or _bfinfdpic_add_dyn_reloc for deleted relocs.
+	(bfinfdpic_check_discarded_relocs, bfinfdpic_elf_discard_info):
+	New functions.
+	(elf_backend_discard_info): Define for FD-PIC.
+
+2009-08-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c: Add FIXMEs for some places that require octets_per_byte
+	adjustments.
+	* elf-eh-frame.c: Likewise.
+	* merge.c: Likewise.
+
+2009-08-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* configure.in:  Remove elf-ifunc.lo from common ELF files.  Add
+	to x86 and x86_64 configurations.
+	* configure: Regenerate.
+
+2009-08-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Stop using bfd_usrdata in libbfd.
+	* coff-stgo32.c (bfd_coff_go32stub): Remove.
+	(stub_bytes, comment): Replace STUBSIZE by GO32_STUBSIZE.
+	(adjust_filehdr_in_post): Declare the abfd parameter as unused.
+	Replace STUBSIZE by GO32_STUBSIZE.  Save now the stub in
+	filehdr_dst->u.go32.stub.  New comment with the reason.
+	(adjust_filehdr_out_pre): Replace STUBSIZE by GO32_STUBSIZE.
+	Substitute the removed macro bfd_coff_go32stub.
+	(adjust_filehdr_out_post, adjust_scnhdr_in_post, adjust_scnhdr_out_pre)
+	(adjust_scnhdr_out_post, adjust_aux_in_post, adjust_aux_out_pre)
+	(adjust_aux_out_post): Replace STUBSIZE by GO32_STUBSIZE.
+	(create_go32_stub, go32_stubbed_coff_bfd_copy_private_bfd_data):
+	Replace STUBSIZE by GO32_STUBSIZE.  Substitute the removed macro
+	bfd_coff_go32stub.
+	* coffcode.h (coff_mkobject_hook): Initialize coff->go32stub.
+	* libcoff-in.h (coff_data_type): New field go32stub.
+	* libcoff.h: Regenerated.
+
+2009-08-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Fix go32 stub preservation by objcopy.
+	* coff-stgo32.c (adjust_filehdr_in_post): Use bfd_malloc.
+	(go32_stubbed_coff_bfd_copy_private_bfd_data): Optionally allocate OBFD
+	go32stub.
+
+2009-08-10  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_size_stubs): Don't die on undefined local
+	symbols.
+	(elf32_arm_final_link_relocate): Treat local undefined symbols the
+	same as global undefined symbols.
+	(elf32_arm_relocate_section): Give an error for local undefined
+	non-weak symbols, unless the reloc will not use the symbol.
+
+2009-08-10  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf32-ppc.c (shared_stub_entry, stub_entry): Use r12, not r11.
+	(ppc_elf_relax_section): Use symbol index to distinguish
+	relocatable stubs.
+
+2009-08-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_relax_section): Ignore non-code sections.
+
+2009-08-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (_bfd_elf_adjust_dynamic_symbol): Don't clear plt
+	info for STT_GNU_IFUNC.
+	* elf32-ppc.c (ppc_elf_check_relocs): Count a needed plt entry
+	on got refs in case the symbol turns out to be ifunc.
+	(ppc_elf_gc_sweep_hook): Similarly.
+	(ppc_elf_adjust_dynamic_symbol): Adjust assertion.
+	(allocate_dynrelocs): Don't specially allocate got relocs for ifunc.
+	(ppc_elf_size_dynamic_sections): Likewise.
+	(ppc_elf_relocate_section): Likewise.
+
+2009-08-09  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	From Mike Frysinger <michael.frysinger@analog.com>
+	* elf32-bfin.c (bfin_howto_table, bfin_reloc_map, bfin_check_relocs,
+	bfin_final_link_relocate, bfin_relocate_section, bfin_gc_sweep_hook,
+	_bfinfdpic_emit_got_relocs_plt_entries, bfinfdpic_relocate_section,
+	bfinfdpic_gc_sweep_hook, bfinfdpic_check_relocs,
+	bfin_finish_dynamic_symbol, bfd_bfin_elf32_create_embedded_relocs):
+	Adjust to match the renamed reloc definitions.
+
+2009-08-08  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 10494
+	* elf.c (_bfd_elf_make_section_from_shdr): When setting up section
+	LMAs, use ELF_IS_SECTION_IN_SEGMENT to match sections with headers.
+
+2009-08-07  Tom Tromey  <tromey@redhat.com>
+
+	* elf32-microblaze.c (microblaze_elf_check_relocs): Avoid strict
+	aliasing error.
+
+2009-08-06  Michael Eager <eager@eagercon.com>
+
+	* Makefile.am: Add cpu-microblaze.{lo,c}, elf32-microblaze.{lo,c}.
+	* Makefile.in: Regenerate.
+	* archures.c: Add bfd_arch_microblaze.
+	* bfd-in2.h: Regenerate.
+	* config.bfd: Add microblaze target.
+	* configure.in: Add bfd_elf32_microblaze_vec target.
+	* configure: Regenerate.
+	* cpu-microblaze.c: New.
+	* elf32-microblaze.c: New.
+	* libbfd-in.h: Add prototype _bfd_dwarf2_fixup_section_debug_loc().
+	* libbfd.h: Regenerate.
+	* reloc.c: Add MICROBLAZE relocations.
+	* section.c: Add struct relax_table and relax_count to section.
+	* targets.c: Add bfd_elf32_microblaze_vec.
+
+2009-08-06  Jakub Jelinek  <jakub@redhat.com>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	PR binutils/10492
+	* elf.c (sym_is_global): Return true even for BSF_GNU_UNIQUE
+	symbols.
+	* elf32-mips.c (mips_elf_sym_is_global): Likewise.
+	* elfn32-mips.c (mips_elf_sym_is_global): Likewise.
+
+2009-08-06  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_size_stubs): Call layout_sections_again
+	at least once when fixing cortex-a8.
+
+2009-08-05  Chao-ying Fu  <fu@mips.com>
+
+	* elf32-mips.c (mips_reloc_map): Add BFD_RELOC_MIPS_JALR.
+	* elfxx-mips.c (JAL_TO_BAL_P): New define to transform JAL to BAL
+	for CPUs.  It is true for RM9000.
+	(JALR_TO_BAL_P): New define to transform JALR to BAL.  It is true
+	for all CPUs.
+	(mips_elf_perform_relocation): Use JAL_TO_BAL_P and JALR_TO_BAL_P
+	to guard the transformation.
+
+2009-08-05  Trevor Smigiel  <Trevor_Smigiel@playstation.sony.com>
+
+	* elf32-spu.h (spu_elf_params): Add member emit_fixups.
+	(spu_elf_size_sections): Declare prototype.
+	* elf32-spu.c (spu_link_hash_table): Add member sfixup.
+	(FIXUP_RECORD_SIZE, FIXUP_GET, FIXUP_PUT): New macros.
+	(spu_elf_emit_fixup): New function.
+	(spu_elf_relocate_section): Emit fixup for each SPU_ADDR32.
+	(spu_elf_size_sections): New function.
+
+2009-08-05  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_stub_type): Add arm_stub_a8_veneer_lwm.
+	(arm_build_one_stub): Build a8 veneers as a separate pass.
+	(cortex_a8_erratum_scan): Add prev_num_a8_fixes and stub_changed_p
+	parameters.  Use them to check if we create a different a8 fixup
+	than the previous pass.
+	(elf32_arm_size_stubs): Move scope of stub_changed and
+	prev_num_a8_fixes into main loop.
+	(elf32_arm_build_stubs): Build a8 veneers in a second pass.
+
+2009-08-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_relax_section): Correct conditions under
+	which find_plt_ent is called.  Delete redundant code.
+
+2009-08-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/10363
+	* elf.c (bfd_elf_string_from_elf_section): Return NULL on
+	invalid string offset.
+
+2009-08-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/10433
+	* elf-ifunc.c (_bfd_elf_allocate_ifunc_dyn_relocs): Set got
+	to htab->init_got_offset and plt to htab->init_plt_offset
+	when discarding space for dynamic relocations.
+
+2009-08-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (struct plt_entry): Revise comments.
+	(ppc_elf_check_relocs): Don't create needless plt_entry info
+	for non-pie executables.  Don't test info->pie when info->shared
+	already covers that case.
+	(ppc_elf_gc_sweep_hook): Adjust for above change.
+	(add_stub_sym): Don't test info->pie when info->shared tested.
+	(allocate_dynrelocs, ppc_elf_size_dynamic_sections): Likewise.
+	(write_glink_stub, ppc_elf_finish_dynamic_symbol): Likewise.
+	(ppc_elf_relax_section): Adjust find_plt_ent arguments.
+	(ppc_elf_relocate_section): Likewise.
+
+2009-08-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Always add a plt ref count
+	for local ifunc symbols in non-pie executables, regardless of
+	reloc type.  Don't specially create ifunc dyn relocs.  Tidy ifunc
+	code so that it's obvious that we only do anything special for
+	local ifunc syms.
+	(ppc_elf_gc_sweep_hook): Adjust to suit check_relocs changes.
+	(allocate_dynrelocs): Correct comment for syms defined in plt.
+	Don't specially allocate ifunc dyn relocs.
+	(ppc_elf_relax_section): Relax branches to ifunc plt entries too.
+	(ppc_elf_relocate_section): Set "relocation" value for ifunc
+	syms in non-pie executables.  No specially allocated dyn relocs
+	for ifunc to write.  Allow for local sym on R_PPC_RELAX32_PLT.
+	(ppc_elf_finish_dynamic_symbol): Set value of ifunc symbols in
+	a non-pie executable.
+
+2009-08-02  H.J. Lu  <hongjiu.lu@intel.com>
+	    Jakub Jelinek  <jakub@redhat.com>
+
+	PR ld/6443
+	* elf32-i386.c (elf_i386_tls_transition): Check executable
+	instead of shared for TLS when building PIE.
+	(elf_i386_check_relocs): Likewise.
+	(elf_i386_allocate_dynrelocs): Likewise.
+	(elf_i386_relocate_section): Likewise.
+
+	* elf64-x86-64.c (elf64_x86_64_tls_transition): Check executable
+	instead of shared for TLS when building PIE.
+	(elf64_x86_64_check_relocs): Likewise.
+	(elf64_x86_64_allocate_dynrelocs): Likewise.
+	(elf64_x86_64_relocate_section): Likewise.
+
+2009-07-31  Anthony Green  <green@moxielogic.com>
+
+	* config.bfd (targ_cpu): Add moxie-uclinux support.
+
+2009-07-31  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* linker.c (fix_syms): Consider SEC_LOAD when choosing section.
+
+2009-07-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Always set up sections
+	used by indirect function support.  Count dynamic relocs for
+	ifunc syms.
+	(ppc_elf_adjust_dynamic_symbol): Tweak for ifunc.
+	(allocate_dynrelocs): Allocate all non-dynamic ifunc plt entries
+	in iplt and their relocs in reliplt.  Don't make ifunc syms
+	dynamic.  Allocate got entry relocs for non-dynamic ifunc in
+	reliplt.  Handle other dynamic relocs for ifunc.
+	(ppc_elf_size_dynamic_sections): Alloc dyn relocs for static
+	ifunc in reliplt, likewise relocs for got against local ifunc.
+	Typo fix on reliplt size adjust.
+	(ppc_elf_relocate_section): Don't use plt scheme of allocating
+	relocs 1-1 with entries for iplt, instead just add using
+	reloc_count.  Write got relocs and dyn relocs for ifunc to reliplt.
+	Error on invalid ifunc dyn relocs.
+	(ppc_elf_finish_dynamic_symbol): Adjust for non-dynamic ifunc plt
+	in iplt/reliplt.
+	* elf64-ppc.c (ppc64_elf_howto_raw): Add R_PPC64_JMP_IREL,
+	R_PPC64_REL16, R_PPC64_REL16_LO, R_PPC64_REL16_HI, R_PPC64_REL16_HA.
+	(ppc64_elf_reloc_type_lookup): Handle new relocs.
+	(ppc64_elf_check_relocs): Likewise.  Count dyn relocs for ifunc.
+	(allocate_dynrelocs): As for elf32-ppc.c above.
+	(ppc64_elf_size_dynamic_sections): Likewise.
+	(ppc_build_one_stub): Put non-dynamic ifunc plt call stubs in iplt,
+	and their relocs in reliplt.  Use R_PPC64_JMP_IREL.
+	(ppc_size_one_stub): Similarly.
+	(ppc64_elf_relocate_section): As for elf32-ppc.c above.  Handle new
+	relocs too.
+	(ppc64_elf_finish_dynamic_symbol): As for elf32-ppc.c above.
+
+2009-07-29  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* elf64-mmix.c (mmix_elf_relax_section): Revert 2009-05-27
+	change.  Add note to head comment.
+
+2009-07-28  Jan Beulich  <jbeulich@novell.com>
+
+	* archive.c (get_extended_arelt_filename): Remove redundant
+	range check on index.
+
+2009-07-27  Doug Kwan  <dougkwan@google.com>
+
+	* elf32-arm.c (stub_hash_newfunc): Initialize field output_name.
+
+2009-07-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* archures.c bfd_*_arch): Sorted.
+	(bfd_archures_list): Likewise.
+
+2009-07-27  M R Swami Reddy <MR.Swami.Reddy@nsc.com>
+
+	* elf32-cr16.c (elf_cr16_final_link_relocate): Add code to handle
+	to R_cr16_NUM32 relocation.
+
+2009-07-26  Michael Eager  <eager@eagercon.com>
+
+	* archures.c: Add bfd_mach_ppc_405
+	* bfd-in2.h: Same.
+
+2009-07-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* cpu-i386.c (bfd_x86_64_arch): Fix comment typos.
+	* cpu-l1om.c (bfd_l1om_arch): Likewise.
+
+2009-07-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* archures.c (bfd_architecture): Add bfd_arch_l1om.
+	(bfd_l1om_arch): New.
+	(bfd_archures_list): Add &bfd_l1om_arch.
+	* bfd-in2.h: Regenerated.
+
+	* config.bfd (targ64_selvecs): Add bfd_elf64_l1om_vec if
+	bfd_elf64_x86_64_vec is supported.  Add bfd_elf64_l1om_freebsd_vec
+	if bfd_elf64_x86_64_freebsd_vec is supported.
+	(targ_selvecs): Likewise.
+
+	* configure.in: Support bfd_elf64_l1om_vec and
+	bfd_elf64_l1om_freebsd_vec.
+	* configure: Regenerated.
+
+	* cpu-l1om.c: New.
+
+	* elf64-x86-64.c (elf64_l1om_elf_object_p): New.
+	(bfd_elf64_l1om_vec): Likewise.
+	(bfd_elf64_l1om_freebsd_vec): Likewise.
+
+	* Makefile.am (ALL_MACHINES): Add cpu-l1om.lo.
+	(ALL_MACHINES_CFILES): Add cpu-l1om.c.
+	* Makefile.in: Regenerated.
+
+	* targets.c (bfd_elf64_l1om_vec): New.
+	(bfd_elf64_l1om_freebsd_vec): Likewise.
+	(_bfd_target_vector): Add bfd_elf64_l1om_vec and
+	bfd_elf64_l1om_freebsd_vec.
+
+2009-07-24  Trevor Smigiel  <Trevor_Smigiel@playstation.sony.com>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* reloc.c (BFD_RELOC_SPU_ADD_PIC): Define.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* elf32-spu.c (elf_howto_table): Add entries SPU_ADD_PIC.
+	(spu_elf_bfd_to_reloc_type): Handle SPU_ADD_PIC.
+	(spu_elf_relocate_section): Patch instructions marked by SPU_ADD_PIC.
+
+2009-07-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/10434
+	* elf64-x86-64.c (elf64_x86_64_check_relocs): Check executable
+	instead of shared for R_X86_64_TPOFF32.
+	(elf64_x86_64_relocate_section): Likewise.
+
+2009-07-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* elf-bfd.h (struct elf_link_hash_entry): Add unique_global field.
+	* elf.c (swap_out_syms): Set binding to STB_GNU_UNIQUE for symbols
+	with the BSF_GNU_UNIQUE flag bit set.
+	* elfcode.h (elf_slurp_symbol_table): Set the BSF_GNU_UNIQUE flag
+	for symbols with STB_GNU_UNIQUE binding.
+	* elflink.c (_bfd_elf_merge_symbol): Set unique_global for symbols
+	with the STB_GNU_UNIQUE binding.
+	(elf_link_add_object_symbols): Set the BSF_GNU_UNIQUE flag for
+	symbols with STB_GNU_UNIQUE binding.  Set STB_GNU_UNIQUE for
+	symbols with the unique_global field set.
+	(elf_link_output_extsym): Set unique_global field for symbols with
+	the STB_GNU_UNIQUE binding.
+	* syms.c (struct bfd_symbol): Define BSF_GNU_UNIQUE flag bit.
+	(bfd_print_symbol_vandf): Print a 'u' character for BSF_GNU_UNIQUE
+	symbols.
+	(bfd_decode_symclass): Return a 'u' character for BSF_GNU_UNIQUE
+	symbols.
+	* bfd-in2.h: Regenerate.
+
+2009-07-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (elf_link_output_extsym): Revert the last change.
+
+2009-07-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/10433
+	* elflink.c (elf_link_output_extsym): Special case ifunc syms
+	when ref_regular, not def_regular.
+
+2009-07-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/10426
+	* elflink.c (elf_link_add_object_symbols): Turn an IFUNC symbol
+	from a DSO into a normal FUNC symbol.
+	(elf_link_output_extsym): Turn an undefined IFUNC symbol into
+	a normal FUNC symbol.
+
+2009-07-17  Chao-ying Fu  <fu@mips.com>
+
+	* elfxx-mips.c (LOAD_INTERLOCKS_P): New define.
+	(_bfd_mips_elf_size_dynamic_sections): For CPUs without load
+	interlocking, the last PLT entry needs a nop in the branch delay slot.
+	(_bfd_mips_elf_finish_dynamic_symbol): For CPUs with load itnerlocking,
+	output the last two PLT entries in reverse order.
+
+2009-07-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_relocate_section): Don't get local
+	STT_GNU_IFUNC symbol for relocatable link.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+
+2009-07-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfdio.c (bfd_iovec): Add comments for bmmap.
+	* bfd-in2.h: Regenerated.
+
+2009-07-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerated.
+
+2009-07-10  Doug Kwan  <dougkwan@google.com>
+
+	* elf32-arm.c (stub_hash_newfunc): Initialize fields
+	target_addend and orig_insn.
+
+2009-07-10  Tom Tromey  <tromey@redhat.com>
+
+	* Makefile.am (dwarf2.lo): Use dwarf2.h, not elf/dwarf2.h.
+	(elf-eh-frame.lo): Likewise.
+	(elf32-bfin.lo): Likewise.
+	(elf32-frv.lo): Likewise.
+	(elf32-xc16x.lo): Likewise.
+	* Makefile.in: Rebuild.
+	* dwarf2.c: Included dwarf.h, not elf/dwarf2.h.
+	* elf-eh-frame.c: Likewise.
+	* elf32-bfin.c: Likewise.
+	* elf32-frv.c: Likewise.
+	* elf32-xc16x.c: Likewise.
+
+2009-07-10  Julian Brown  <julian@codesourcery.com>
+
+	* elf32-arm.c (arm_build_one_stub): Use the hash entry of the
+	symbol a stub entry is derived from, not the entry for the stub
+	itself, in call to elf32_arm_final_link_relocate.
+
+2009-07-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (_bfd_elf_get_synthetic_symtab): Remove leading zeros
+	when reporting  addends.
+
+2009-07-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_size_stubs): Do set up soft-icache manager
+	data even when no stubs.
+	(spu_elf_place_overlay_data, spu_elf_build_stubs): Adjust.
+
+2009-07-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_howto_raw): Add R_PPC_IRELATIVE.
+	(ppc_elf_get_synthetic_symtab): Report addend.
+	(PLT_IFUNC): Define.
+	(struct ppc_elf_link_hash_table): Add iplt and reliplt.
+	(ppc_elf_create_glink): New function.
+	(ppc_elf_create_dynamic_sections): Use it.
+	(ppc_elf_add_symbol_hook): Set has_ifunc_symbols.
+	(update_local_sym_info): Allocate space for local_plt array.
+	Don't bump local_got_refcounts for PLT_IFUNC.  Return local_plt
+	entry pointer.
+	(is_branch_reloc): New function.
+	(ppc_elf_check_relocs): Handle STT_GNU_IFUNC symbols.
+	(ppc_elf_gc_sweep_hook): Likewise.
+	(ppc_elf_adjust_dynamic_symbol): Likewise.
+	(allocate_dynrelocs): Likewise.
+	(ppc_elf_size_dynamic_sections): Likewise.
+	(ppc_elf_relocate_section): Likewise.
+	(branch_reloc_hash_match): Use is_branch_reloc.
+	(ppc_elf_tls_optimize): Adjust for local_plt.
+	(write_glink_stub): New function, extracted from..
+	(ppc_elf_finish_dynamic_symbol): ..here.  Handle STT_GNU_IFUNC.
+	(ppc_elf_finish_dynamic_sections): Only write plt resolver and
+	branch table when dynamic.
+	(elf_backend_post_process_headers): Define.
+	* elf64-ppc.c (elf_backend_post_process_headers): Define.
+	(ppc64_elf_howto_raw): Add R_PPC64_IRELATIVE.
+	(ppc64_elf_get_synthetic_symtab): Report addend.
+	(struct ppc_stub_hash_entry): Add plt_ent.
+	(PLT_IFUNC): Define.
+	(struct ppc_link_hash_table): Add iplt and reliplt.
+	(create_linkage_sections): Make .iplt and .rela.iplt sections.
+	(ppc64_elf_add_symbol_hook): Set has_ifunc_symbols.
+	(update_local_sym_info): Allocate space for local_plt array.
+	Don't bump local_got_ents for PLT_IFUNC.  Return local_plt
+	entry pointer.
+	(update_plt_info): Pass pointer to plt_entry rather than sym hash,
+	and don't change hash flags here.
+	(is_branch_reloc): New function.
+	(ppc64_elf_check_relocs): Handle STT_GNU_IFUNC.
+	(ppc64_elf_gc_sweep_hook): Likewise.
+	(ppc64_elf_adjust_dynamic_symbol): Likewise.
+	(allocate_dynrelocs): Likewise.
+	(ppc64_elf_size_dynamic_sections): Likewise.
+	(ppc_build_one_stub, ppc_size_one_stub): Likewise.
+	(ppc64_elf_size_stubs): Likewise.
+	(ppc64_elf_relocate_section): Likewise.
+	(get_sym_h): Adjust for local_plt.
+	(branch_reloc_hash_match): Use is_branch_reloc.
+	(ppc_type_of_stub): Pass plt_entry pointer and handle ifunc.
+	(ppc64_elf_toc): Ignore SEC_EXCLUDE sections.
+
+2009-07-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (_bfd_elf_get_synthetic_symtab): Report addends.
+
+2009-07-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_link_hash_entry): Clarify ref_regular
+	and ref_regular_nonweak comment.
+	* elflink.c (elf_link_output_extsym): Special case ifunc syms
+	when def_regular, not ref_regular.
+	(elf_link_add_object_symbols): Don't set needs_plt on ifunc syms,..
+	* elf32-i386.c (elf_i386_check_relocs): ..set it here instead..
+	* elf64-x86-64.c (elf64_x86_64_check_relocs): ..and here.
+
+2009-07-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (mark_functions_via_relocs): Init broken_cycle field
+	of malloc'd struct call_info.
+	(pasted_function): Likewise, priority too.
+
+2009-07-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_auto_overlay): Take into account section
+	alignment when packing sections into overlays.
+
+2009-07-03  Cary Coutant  <ccoutant@google.com>
+
+	* dwarf2.c (decode_line_info): Ignore DW_LNE_set_discriminator.
+
+2009-07-03  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* coffcode.h (sec_to_styp_flags):  Partially revert (functional
+	changes only) earlier patch:-
+
+2009-06-25  Kai Tietz  <kai.tietz@onevision.com>
+
+	* coffcode.h (sec_to_styp_flags): Set discardable for .reloc and
+	give .debug and .reloc data characteristics.
+	(DOT_RELOC): New define for .reloc section string.
+	(coff_write_object_contents): Use DOT_RELOC instead of string.
+
+2009-07-02  Tom Tromey  <tromey@redhat.com>
+
+	* aoutx.h (aout_get_external_symbols): Declare 'amt' locally.
+	* bfdwin.c (bfd_free_window): Cast to unsigned long.
+
+2009-07-01  Nick Clifton  <nickc@redhat.com>
+
+	* elf-m10300.c: Remove trailing white space.
+	* reloc.c: Likewise.
+
+2009-07-01  Douglas B Rupp  <rupp@gnat.com>
+
+	* bfd.m4 (BFD_HAVE_TIME_TYPE_MEMBER,
+	BFD_HAVE_SYS_STAT_TYPE_MEMBER): New config functions.
+	* configure.in: Use them.
+	* configure: Regenerate.
+	* config.in: Regenerate.
+	* vmsutil.c: Include sysdep.h, remove ansidecl.h.
+	#define _BSD_SOURCE. Add comments.
+	(vms_file_stats_name): Calculate creation date based on available
+	runtime data. Return 1 for version instead of 0.
+
+2009-07-01  Nick Clifton  <nickc@redhat.com>
+
+	PR 10072
+	* elf32-arm.c (elf32_arm_final_link_relocate): Add code to handle
+	to R_ARM_THM_PC8 relocation.
+
+2009-06-29  Nick Clifton  <nickc@redhat.com>
+
+	* elf-m10300.c (mn10300_elf_relax_section): Allow for the
+	different uses of the relocations addend when a symbol is in a
+	merged section.
+
+2009-06-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/10337
+	* elf.c (bfd_section_from_shdr): Don't change sh_link for
+	SHT_REL/SHT_RELA sections on executable nor shared library.
+	Treat SHT_REL/SHT_RELA sections with sh_link set to SHN_UNDEF
+	as a normal section.
+
+2009-06-25  Nick Clifton  <nickc@redhat.com>
+
+	* elf-m10300.c (mn10300_elf_relax_section): Handle non-section
+	symbols with SEC_MERGE flag.
+
+2009-06-25  Kai Tietz  <kai.tietz@onevision.com>
+
+	* coffcode.h (sec_to_styp_flags): Set discardable for .reloc and
+	give .debug and .reloc data characteristics.
+	(DOT_RELOC): New define for .reloc section string.
+	(coff_write_object_contents): Use DOT_RELOC instead of string.
+
+2009-06-25  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o-target.c (bfd_mach_o_get_dynamic_symtab_upper_bound)
+	(bfd_mach_o_canonicalize_dynamic_symtab)
+	(bfd_mach_o_get_synthetic_symtab): Defines.
+	(TARGET_NAME_BACKEND): Add bfd_mach_o_print_thread entry.
+	(TARGET_NAME): Use Mach-O specific functions for dynamic.
+
+	* mach-o-i386.c (bfd_mach_o_i386_swap_reloc_in): Fix howto indexes
+	for scattered relocations.
+	(bfd_mach_o_i386_print_thread): New function.
+	(bfd_mach_o_print_thread): Define.
+
+	* mach-o.c (text_section_names_xlat): Add an entry for __const.
+	(bfd_mach_o_canonicalize_one_reloc, bfd_mach_o_canonicalize_relocs):
+	New functions extracted from ...
+	(bfd_mach_o_canonicalize_reloc): ... This.  Simplified.
+	(bfd_mach_o_get_dynamic_reloc_upper_bound): New function.
+	(bfd_mach_o_canonicalize_dynamic_reloc): New function.
+	(bfd_mach_o_i386_flavour_string): Adjusted after enum renaming.
+	(bfd_mach_o_ppc_flavour_string): Reindentation.  Add 64 bits cases.
+	(bfd_mach_o_scan_read_dylinker): Do not create a section anymore.
+	Set name_str field.
+	(bfd_mach_o_scan_read_dylib): Ditto.
+	(bfd_mach_o_scan_read_thread): Set mdata at declaration.  Add comments,
+	reindent.
+	(bfd_mach_o_scan_read_dysymtab): Set mdata at declaration.  Correctly
+	decode isym and flags on little endian targets.  Set dysymtab field.
+	(bfd_mach_o_scan_start_address): Adjust for enum names.
+	(bfd_mach_o_lookup_section): Do not look for segments anymore.
+	(bfd_mach_o_print_section): Display bfd section name.
+	(bfd_mach_o_print_segment): Display none if no name.
+	(bfd_mach_o_print_dysymtab): Display next index for local, external
+	and undefined symbols.
+	(bfd_mach_o_bfd_print_private_bfd_data): Adjust code by using name_str.
+	Display dylinker name. Display thread and unixthread commands content.
+	(bfd_mach_o_print_thread): New macro.
+
+	* mach-o.h (bfd_mach_o_mach_header_magic): Align numbers.
+	(bfd_mach_o_ppc_thread_flavour): Ditto.
+	(bfd_mach_o_i386_thread_flavour): Ditto.
+	(BFD_MACH_O_PPC_THREAD_STATE_NONE): New enum.
+	(BFD_MACH_O_x86_THREAD_STATE_NONE): Replaces
+	BFD_MACH_O_THREAD_STATE_NONE.
+	(bfd_mach_o_segment_command): Remove segment field.
+	(bfd_mach_o_thread_flavour): Field offset is now unsigned long.
+	(bfd_mach_o_dylinker_command): Remove section field, add name_str.
+	(bfd_mach_o_prebound_dylib_command): Ditto.
+	(bfd_mach_o_dylib_command): Ditto.
+	(bfd_mach_o_prebound_dylib_command): Remove section field.
+	(mach_o_data_struct): Add dysymtab field.
+	(bfd_mach_o_backend_data): Add _bfd_mach_o_print_thread field.
+	(bfd_mach_o_get_reloc_upper_bound, bfd_mach_o_canonicalize_reloc)
+	(bfd_mach_o_build_commands): Remove parameter names and attributes.
+	(bfd_mach_o_get_dynamic_reloc_upper_bound)
+	(bfd_mach_o_canonicalize_dynamic_reloc): New prototypes.
+
+2009-06-25  Rafael Avila de Espindola  <espindola@google.com>
+
+	* plugin.c (load_plugin): Use stat and S_ISREG instead of the d_type
+	field of struct dirent.
+
+2009-06-23  Tristan Gingold  <gingold@adacore.com>
+
+	* vms.c (vms_get_synthetic_symtab): Remove duplicate definition
+	of this macro.  Fix indentation.
+
+2009-06-22  Christophe Lyon  <christophe.lyon@st.com>
+
+	* elf32-arm.c (elf32_arm_size_stubs): Use PLT address as
+	destination for defined dynamic symbols when deciding whether to
+	insert a stub or not.
+	(allocate_dynrelocs): Make sure functions are not marked as Thumb
+	when actually accessed through a PLT, even when generating a
+	shared lib.
+
+2009-06-22  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_canonicalize_reloc): Append a sentinel to
+	the relocs array.
+
+2009-06-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Handle R_PPC_RELAX* in switch.
+	* elf32-v850.c (v850_elf_relocate_section): Warning fix.
+
+2009-06-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_edit_opd): Avoid gcc warning.
+
+2009-06-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (elf_link_add_object_symbols): Avoid warning
+	from -Wjump-misses-init in gcc 4.5.0.
+
+2009-06-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_check_relocs): Properly check local
+	symbol on error.
+	* elf64-x86-64.c (elf64_x86_64_check_relocs): Likewise.
+
+2009-06-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_tls_transition): Add a parameter,
+	r_symndx.  Report local symbol name on error.
+	(elf_i386_check_relocs): Updated.  Report local symbol name on
+	error.
+	(elf_i386_gc_sweep_hook): Updated.
+	(elf_i386_relocate_section): Likewise.
+
+	* elf64-x86-64.c (elf64_x86_64_tls_transition): Add a parameter,
+	r_symndx.  Report local symbol name on error.
+	(elf64_x86_64_check_relocs): Updated.  Report local symbol name
+	on error.
+	(elf64_x86_64_gc_sweep_hook): Updated.
+	(elf64_x86_64_relocate_section): Likewise.
+
+2009-06-19  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_print_private_header): Fix format character.
+
+2009-06-19  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_scan_read_symtab_symbols): Add prototype.
+	(bfd_mach_o_version): Use bfd_mach_o_get_data instead of direct access.
+	(bfd_mach_o_valid): Ditto.
+	(bfd_mach_o_wide_p): Ditto.
+	(bfd_mach_o_canonicalize_reloc): Ditto.
+	(bfd_mach_o_build_commands): Ditto.
+	(bfd_mach_o_scan_read_thread): Ditto.
+	(bfd_mach_o_flatten_sections): Ditto.
+	(bfd_mach_o_scan_start_address): Ditto.
+	(bfd_mach_o_lookup_section): Ditto.
+	(bfd_mach_o_core_fetch_environment): Ditto.
+	(bfd_mach_o_write_contents): Ditto.  Handle reexport_dylib.
+	(bfd_mach_o_scan_write_relocs): Adjust for bfd_mach_o_get_data.
+	(bfd_mach_o_scan_write_symtab): Ditto.
+	Use macros instead of hard-coded values.
+	(bfd_mach_o_scan_read_symtab_symbol): Make the function static.
+	Use bfd_mach_o_get_data instead of direct access.  Use macros
+	instead of hard-coded values.
+	(bfd_mach_o_scan_read_symtab_strtab): Make the function static.
+	Remove sym argument and get section from mdata.
+	Move code into the else branch.
+	(bfd_mach_o_scan_read_symtab_symbols): Make the function static.
+	Remove sym argument and get section from mdata.  Adjust code.
+	(bfd_mach_o_scan_read_dylib): Move assertion into the created
+	switch (which replaces consecutive if statements).
+	(bfd_mach_o_scan_read_dysymtab): Rename seg to cmd.  Load
+	module table, table of content, indirect symbols and external
+	referenced symbols.
+	(bfd_mach_o_scan_read_symtab): Renames seg to symtab.  Set symtab
+	field.
+	(bfd_mach_o_scan_read_linkedit): New function.
+	(bfd_mach_o_scan_read_str): Ditto.
+	(bfd_mach_o_count_symbols): Simplify the code by using the symtab
+	field of mdata.
+	(bfd_mach_o_get_symtab_upper_bound): Remove check as
+	bfd_mach_o_count_symbols never returns an error.
+	(bfd_mach_o_canonicalize_symtab): Simplify the code by using the
+	symtab field (there might be only one symtab).
+	(bfd_mach_o_scan_read_command): Handle reexported dylib.
+	Handle sub frameworks, sub umbrella, sub library and sub client.
+	Read code signature and segment split info commands.
+	(bfd_mach_o_scan): Reindent.
+	(bfd_mach_o_xlat_name): New type.
+	(bfd_mach_o_print_flags): New function.
+	(bfd_mach_o_get_name): Ditto.
+	(bfd_mach_o_cpu_name): New variable.
+	(bfd_mach_o_filetype_name, bfd_mach_o_header_flags_name)
+	(bfd_mach_o_section_type_name)
+	(bfd_mach_o_section_attribute_name)
+	(bfd_mach_o_load_command_name): New variables.
+	(bfd_mach_o_print_private_header): New function.
+	(bfd_mach_o_print_section_map): New function extracted from
+	bfd_mach_o_print_private_bfd_data.
+	(bfd_mach_o_print_section): Ditto.  Print more infos.
+	(bfd_mach_o_print_segment): Ditto.
+	(bfd_mach_o_print_dysymtab): Ditto.
+	(bfd_mach_o_bfd_print_private_bfd_data): Reworked.  Handle
+	load weak dylib, reexport dylib and id dylib.
+	Handle code signature and segment_split info.
+	Handle sub frameworks, sub umbrella, sub library and sub client.
+	(bfd_mach_o_section_get_nbr_indirect): New function.
+
+	* mach-o.h (BFD_MACH_O_REFERENCE_MASK): New macro.  Add comment.
+	(bfd_mach_o_header_flags): New enum to define header flags.
+	(bfd_mach_o_section_attribute): New enum to replace ...
+	(BFD_MACH_O_S_ATTR_LOC_RELOC, BFD_MACH_O_S_ATTR_EXT_RELOC,
+	BFD_MACH_O_S_ATTR_SOME_INSTRUCTIONS, BFD_MACH_O_S_ATTR_DEBUG,
+	BFD_MACH_O_S_SELF_MODIFYING_CODE, BFD_MACH_O_S_ATTR_LIVE_SUPPORT,
+	BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, BFD_MACH_O_S_ATTR_STRIP_STATIC_SYMS,
+	BFD_MACH_O_S_ATTR_NO_TOC, BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS): ...
+	these removed macros.
+	(BFD_MACH_O_NLIST_SIZE, BFD_MACH_O_NLIST_64_SIZE): New macros.
+	(bfd_mach_o_dylib_module): New type.
+	(BFD_MACH_O_DYLIB_MODULE_SIZE, BFD_MACH_O_DYLIB_MODULE_64_SIZE): New
+	macros.
+	(bfd_mach_o_dylib_table_of_content): New type.
+	(BFD_MACH_O_TABLE_OF_CONTENT_SIZE): New macro.
+	(bfd_mach_o_dylib_reference): New type.
+	(BFD_MACH_O_REFERENCE_SIZE): New macro.
+	(bfd_mach_o_dysymtab_command): Add fields for loaded and decoded
+	modules, toc, references and indirect syms.
+	(BFD_MACH_O_INDIRECT_SYMBOL_SIZE): New macro.
+	(bfd_mach_o_dylinker_command): Remove cmd and cmdsize fields (were
+	unused).  Add comment.
+	(bfd_mach_o_dylib_command): Ditto.
+	(bfd_mach_o_prebound_dylib_command): Ditto.
+	(bfd_mach_o_linkedit_command): New type.
+	(bfd_mach_o_str_command): New type.
+	(bfd_mach_o_load_command): Add linkedit and str fields.
+	(mach_o_data_struct): Add symtab field.
+	(bfd_get_mach_o_data): Renamed to ...
+	(bfd_mach_o_get_data): ... this new macro.
+	(bfd_mach_o_scan_read_symtab_symbol,
+	bfd_mach_o_scan_read_symtab_strtab,
+	bfd_mach_o_scan_read_symtab_symbols): Prototypes removed.
+
+	* mach-o-i386.c (bfd_mach_o_i386_mkobject): Use bfd_mach_o_get_data
+	instead of direct access.
+
+2009-06-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Allow local symbols for
+	R_PPC_PLTREL24 relocs.
+	(ppc_elf_relocate_section): Likewise.
+
+2009-06-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (find_plt_ent): Pass pointer to plist rather than
+	pointer to sym hash.  Update all uses.
+	(update_plt_info): Likewise.  Don't check addend here.
+
+2009-06-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_check_relocs): Remove isymbuf and use
+	bfd_sym_from_r_symndx.
+	* elf64-x86-64.c (elf64_x86_64_check_relocs): Likewise.
+
+2009-06-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct sym_sec_cache): Delete.
+	(struct sym_cache): New.
+	(bfd_section_from_r_symndx): Delete prototype.
+	(bfd_sym_from_r_symndx): Define prototype.
+	* elf.c (bfd_section_from_r_symndx): Delete, replace with..
+	(bfd_sym_from_r_symndx): ..new function.
+	* elf32-arm.c: Update all uses of struct sym_sec_cache and
+	bfd_section_from_r_symndx to new struct and function.
+	* elf32-bfin.c: Likewise.
+	* elf32-hppa.c: Likewise.
+	* elf32-i386.c: Likewise.
+	* elf32-m32r.c: Likewise.
+	* elf32-m68hc1x.c: Likewise.
+	* elf32-m68hc1x.h: Likewise.
+	* elf32-m68k.c: Likewise.
+	* elf32-ppc.c: Likewise.
+	* elf32-s390.c: Likewise.
+	* elf32-sh.c: Likewise.
+	* elf64-ppc.c: Likewise.
+	* elf64-s390.c: Likewise.
+	* elf64-x86-64.c: Likewise.
+	* elfxx-sparc.c: Likewise.
+	* elfxx-sparc.h: Likewise.
+
+2009-06-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_check_relocs): Cache or free isymbuf.
+	* elf64-x86-64.c (elf64_x86_64_check_relocs): Likewise.
+
+2009-06-18  Nick Clifton  <nickc@redhat.com>
+
+	* elflink.c (elf_link_sort_relocs): Return early if there are no
+	relocs to sort.
+
+2009-06-18  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	Merge cegcc and mingw32ce target name changes from
+	CeGCC project:
+
+	2007-12-25  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+	* config.bfd: Add arm*-*-cegcc* target.
+
+	2007-12-17  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+	* config.bfd: Add arm-*-mingw32ce* target.
+
+2009-06-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (_bfd_elf_allocate_ifunc_dyn_relocs): New.
+	* elf-ifunc.c (_bfd_elf_allocate_ifunc_dyn_relocs): Likewise.
+	* elf32-i386.c (elf_i386_allocate_dynrelocs): Use it.
+	* elf64-x86-64.c (elf64_x86_64_allocate_dynrelocs): Likewise.
+
+2009-06-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (_bfd_elf_create_ifunc_dyn_reloc): New.
+	* elf-ifunc.c (_bfd_elf_create_ifunc_dyn_reloc): Likewise.
+	* elf32-i386.c (elf_i386_check_relocs): Use it.
+	* elf64-x86-64.c (elf64_x86_64_check_relocs): Likewise.
+
+2009-06-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (elf_dyn_relocs): New.
+
+	* elf32-i386.c (elf_i386_dyn_relocs): Removed.
+	(elf_i386_link_hash_entry): Replace elf_i386_dyn_relocs with
+	elf_dyn_relocs.
+	(elf_i386_copy_indirect_symbol): Likewise.
+	(elf_i386_check_relocs): Likewise.
+	(elf_i386_gc_sweep_hook): Likewise.
+	(elf_i386_allocate_dynrelocs): Likewise.
+	(elf_i386_readonly_dynrelocs): Likewise.
+	(elf_i386_size_dynamic_sections): Likewise.
+
+	* elf64-x86-64.c (elf64_x86_64_dyn_relocs): Removed.
+	(elf64_x86_64_link_hash_entry): Replace elf64_x86_64_dyn_relocs
+	with elf_dyn_relocs.
+	(elf64_x86_64_copy_indirect_symbol): Updated.
+	(elf64_x86_64_check_relocs): Likewise.
+	(elf64_x86_64_gc_sweep_hook): Likewise.
+	(elf64_x86_64_adjust_dynamic_symbol): Likewise.
+	(elf64_x86_64_allocate_dynrelocs): Likewise.
+	(elf64_x86_64_readonly_dynrelocs): Likewise.
+	(elf64_x86_64_size_dynamic_sections): Likewise.
+
+2009-06-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-arm.c (create_got_section): Get existing .rela.got
+	section.
+	* elf32-hppa.c (elf32_hppa_create_dynamic_sections): Likewise.
+	* elf32-lm32.c (create_got_section): Likewise.
+	* elf32-m32r.c (create_got_section): Likewise.
+	* elf32-ppc.c (ppc_elf_create_got): Likewise.
+	* elf32-s390.c (create_got_section): Likewise.
+	* elf32-sh.c (create_got_section): Likewise.
+	* elf32-xtensa.c (elf_xtensa_create_dynamic_sections): Likewise.
+	* elf64-s390.c (create_got_section): Likewise.
+	* elfxx-sparc.c (create_got_section): Likewise.
+
+	* elflink.c (_bfd_elf_create_got_section): Properly initialize
+	the GOT size.
+
+2009-06-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (ELF_LOCAL_SYMBOL_HASH): New.
+
+	* elf32-i386.c (elf_i386_local_hash): Removed.
+	(elf_i386_local_htab_hash): Use ELF_LOCAL_SYMBOL_HASH.
+	(elf_i386_get_local_sym_hash): Likewise.
+
+	* elf64-x86-64.c (elf64_x86_64_local_hash): Removed.
+	(elf64_x86_64_local_htab_hash): Use ELF_LOCAL_SYMBOL_HASH.
+	(elf64_x86_64_get_local_sym_hash): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_local_htab_hash): Likewise.
+	(get_local_sym_hash): Likewise.
+
+2009-06-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_link_hash_table): Remove got_sec,
+	rel_got_sec and plt_sec.
+	(elfNN_ia64_relax_section): Updated.
+	(elfNN_ia64_create_dynamic_sections): Likewise.
+	(get_got): Likewise.
+	(allocate_dynrel_entries): Likewise.
+	(elfNN_ia64_size_dynamic_sections): Likewise.
+	(set_got_entry): Likewise.
+	(elfNN_ia64_choose_gp): Likewise.
+	(elfNN_ia64_relocate_section): Likewise.
+	(elfNN_ia64_finish_dynamic_symbol): Likewise.
+	(elfNN_ia64_finish_dynamic_sections): Likewise.
+
+2009-06-16  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* elf32-spu.c (needs_ovl_stub): Respect .brinfo lrlive bits
+	also for calls.
+
+2009-06-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.in (elf): Add elf-ifunc.lo.
+
+	* configure: Regenerated.
+	* Makefile.in: Likewise.
+
+	* elf-bfd.h (elf_link_hash_table): Add sgot, sgotplt,
+	srelgot, splt, srelplt, igotplt, iplt, irelplt and irelifunc.
+
+	* elf32-i386.c (elf_i386_link_hash_table): Remove sgot,
+	sgotplt, srelgot, splt, srelplt, igotplt, iplt, irelplt and
+	irelifunc.
+	(elf_i386_link_hash_table_create): Likewise.
+	(elf_i386_create_dynamic_sections): Likewise.
+	(elf_i386_check_relocs): Likewise.
+	(elf_i386_allocate_dynrelocs): Likewise.
+	(elf_i386_size_dynamic_sections): Likewise.
+	(elf_i386_relocate_section): Likewise.
+	(elf_i386_finish_dynamic_symbol): Likewise.
+	(elf_i386_finish_dynamic_sections): Likewise.
+	(elf_i386_create_got_section): Removed.
+
+	* elf64-x86-64.c (elf64_x86_64_link_hash_table): Remove sgot,
+	sgotplt, srelgot, splt, srelplt, igotplt, iplt, irelplt and
+	irelifunc.
+	(elf64_x86_64_compute_jump_table_size): Updated.
+	(elf64_x86_64_link_hash_table_create): Likewise.
+	(elf64_x86_64_create_dynamic_sections): Likewise.
+	(elf64_x86_64_check_relocs): Likewise.
+	(elf64_x86_64_allocate_dynrelocs): Likewise.
+	(elf64_x86_64_size_dynamic_sections): Likewise.
+	(elf64_x86_64_relocate_section): Likewise.
+	(elf64_x86_64_finish_dynamic_symbol): Likewise.
+	(elf64_x86_64_finish_dynamic_sections): Likewise.
+	(elf64_x86_64_create_got_section): Removed.
+
+	* elflink.c (_bfd_elf_create_got_section): Use log_file_align
+	for pointer alignment.  Set up section pointers.
+	(_bfd_elf_create_dynamic_sections): Likewise.
+	(_bfd_elf_create_ifunc_sections): Moved to ...
+	* elf-ifunc.c: Here.  New.
+
+	* Makefile.am (BFD32_BACKENDS): Add elf-ifunc.lo.
+	(BFD32_BACKENDS_CFILES): Add elf-ifunc.c.
+	Run "make dep-am".
+
+2009-06-16  Doug Kwan  <dougkwan@google.com>
+
+	* elf32-arm.c (cortex_a8_erratum_scan): Change type of offset
+	to bfd_signed_vma.  Cast constant operands which are used in
+	offset related expressions to bfd_signed_vma type as appropriate.
+
+2009-06-16  Maciej W. Rozycki  <macro@linux-mips.org>
+
+	* elf32-vax.c (elf_vax_plt_sym_val): New function.
+	(elf_backend_plt_sym_val): Define.
+
+2009-06-16  Maciej W. Rozycki  <macro@linux-mips.org>
+
+	* elf32-vax.c (elf_vax_reloc_type_class): New function.
+	(elf_backend_reloc_type_class): Define.
+
+2009-06-16  Maciej W. Rozycki  <macro@linux-mips.org>
+
+	* elf32-vax.c (elf_vax_relocate_section): For symbol references
+	from an executable to a shared library treat R_VAX_PC32
+	relocations as R_VAX_PLT32 ones.
+
+2009-06-16  Maciej W. Rozycki  <macro@linux-mips.org>
+
+	* elf32-vax.c (elf_vax_instantiate_got_entries): Skip local
+	symbols in GOT space calculation.
+	(elf_vax_relocate_section): Adjust accordingly.
+
+2009-06-16  Maciej W. Rozycki  <macro@linux-mips.org>
+
+	* elf32-vax.c (elf_vax_plt_entry): Set the entry mask to
+	include <R11:R2>.
+
+2009-06-16  Maciej W. Rozycki  <macro@linux-mips.org>
+
+	* elf32-vax.c (elf_vax_check_relocs): Handle the visibility
+	attribute.
+	(elf_vax_relocate_section): Likewise.
+
+2009-06-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_allocate_dynrelocs): Update comments.
+	* elf64-x86-64.c (elf64_x86_64_allocate_dynrelocs): Likewise.
+
+2009-06-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_check_relocs): Reformat.
+	* elf64-x86-64.c (elf64_x86_64_check_relocs): Likewise.
+
+2009-06-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerated.
+
+2009-06-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_allocate_dynrelocs): Fix a typo.
+	* elf64-x86-64.c (elf64_x86_64_allocate_dynrelocs): Likewise.
+
+2009-06-15  Nick Clifton  <nickc@redhat.com>
+
+	* po/ru.po: New Russian translation.
+	* configure.in (ALL_LINGUAS): Add ru.
+	* configure: Regenerate.
+
+2009-06-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c: Remove duplicated comments.
+
+2009-06-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/10270
+	* elf32-i386.c (elf_i386_allocate_dynrelocs): Disallow
+	dynamic IFUNC pointer in non-shared object.  Use .got.plt
+	for IFUNC definition in PIE.
+	(elf_i386_allocate_dynrelocs): Resolve IFUNC definition in
+	PIE locally.
+
+	* elf64-x86-64.c (elf64_x86_64_allocate_dynrelocs): Disallow
+	dynamic IFUNC pointer in non-shared object.  Use .got.plt
+	for IFUNC definition in PIE.
+	(elf64_x86_64_relocate_section): Resolve IFUNC definition in
+	PIE locally.
+
+2009-06-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_check_relocs): Properly report
+	local symbol for unhandled relocation against STT_GNU_IFUNC
+	symbol.
+	(elf_i386_relocate_section): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_check_relocs):  Likewise.
+	(elf64_x86_64_relocate_section): Likewise.
+
+2009-06-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/10269
+	* elf32-i386.c: Include "objalloc.h" and "hashtab.h".
+	(elf_i386_link_hash_table): Add loc_hash_table and
+	loc_hash_memory.
+	(elf_i386_local_hash): New.
+	(elf_i386_local_htab_hash): Likewise.
+	(elf_i386_local_htab_eq): Likewise.
+	(elf_i386_get_local_sym_hash): Likewise.
+	(elf_i386_link_hash_table_free): Likewise.
+	(elf_i386_allocate_local_dynrelocs): Likewise.
+	(elf_i386_finish_local_dynamic_symbol): Likewise.
+	(bfd_elf64_bfd_link_hash_table_free): Likewise.
+	(elf_i386_link_hash_table_create): Create loc_hash_table and
+	loc_hash_memory.
+	(elf_i386_check_relocs): Handle local STT_GNU_IFUNC symbols.
+	(elf_i386_size_dynamic_sections): Likewise.
+	(elf_i386_relocate_section): Likewise.
+	(elf_i386_finish_dynamic_sections): Likewise.
+	(elf_i386_finish_dynamic_symbol): Check _DYNAMIC only if sym
+	isn't NULL.
+
+	* elf64-x86-64.c: Include "objalloc.h" and "hashtab.h".
+	(elf64_x86_64_link_hash_table): Add loc_hash_table and
+	loc_hash_memory.
+	(elf64_x86_64_local_hash): New.
+	(elf64_x86_64_local_htab_hash): Likewise.
+	(elf64_x86_64_local_htab_eq): Likewise.
+	(elf64_x86_64_get_local_sym_hash): Likewise.
+	(elf64_x86_64_link_hash_table_free): Likewise.
+	(elf64_x86_64_allocate_local_dynrelocs): Likewise.
+	(elf64_x86_64_finish_local_dynamic_symbol): Likewise.
+	(bfd_elf64_bfd_link_hash_table_free): Likewise.
+	(elf64_x86_64_link_hash_table_create): Create loc_hash_table
+	and loc_hash_memory.
+	(elf64_x86_64_check_relocs): Handle local STT_GNU_IFUNC
+	symbols.
+	(elf64_x86_64_size_dynamic_sections): Likewise.
+	(elf64_x86_64_relocate_section): Likewise.
+	(elf64_x86_64_finish_dynamic_sections): Likewise.
+	(elf64_x86_64_finish_dynamic_symbol): Check _DYNAMIC only if
+	sym isn't NULL.
+
+2009-06-10  Philip Blundell  <philb@gnu.org>
+
+	* elf32-arm.c (elf32_arm_fix_exidx_coverage): Avoid crash if
+	elf_sec->this_hdr == NULL.
+
+2009-06-12  Tristan Gingold  <gingold@adacore.com>
+
+	* reloc.c: Add BFD_RELOC_MACH_O_SECTDIFF and BFD_RELOC_MACH_O_PAIR.
+	* bfd-in2.h: Regenerated.
+	* libbfd.h: Regenerated.
+
+	* mach-o.c (FILE_ALIGN): New macro.
+	(bfd_mach_o_canonicalize_symtab): Adjust for bfd_mach_o_asymbol.
+	(bfd_mach_o_print_symbol): Ditto.
+	(bfd_mach_o_scan_write_thread): Adjust type of variable offset.
+	(bfd_mach_o_get_reloc_upper_bound): New function.
+	(bfd_mach_o_canonicalize_reloc): Ditto.
+	(bfd_mach_o_scan_write_relocs): Ditto.
+	(bfd_mach_o_scan_write_section_32): Remove offset argument.
+	(bfd_mach_o_scan_write_section_64): Ditto.
+	(bfd_mach_o_scan_write_segment_32): Write relocs.  Fix size of data
+	written for load command.  Do not compute section file offset.
+	(bfd_mach_o_scan_write_segment_64): Ditto.
+	(bfd_mach_o_scan_write_symtab): Compute file offset first.
+	Adjust for bfd_mach_o_asymbol.  Move code to convert from BFD to
+	Mach-O to ...
+	(bfd_mach_o_mangle_symbols): ... this new function.
+	(bfd_mach_o_write_contents): Be sure to have load commands built.
+	Call bfd_mach_o_mangle_symbols.
+	(bfd_mach_o_build_commands): Adjust for filelen field.
+	Use FILE_ALIGN macro.  Clear section file offset if section is empty.
+	Do not set symtab file offset anymore here.
+	(bfd_mach_o_make_empty_symbol): Allocate a bfd_mach_o_asymbol.
+	(bfd_mach_o_make_bfd_section): Set SEC_RELOC if has reloc.
+	Set reloc_count and rel_filepos section fields.
+	(bfd_mach_o_scan_read_section_32): Type of argument offset is now
+	unsigned int.
+	(bfd_mach_o_scan_read_section_64): Ditto.
+	(bfd_mach_o_scan_read_section): Ditto.
+	(bfd_mach_o_scan_read_symtab_symbol): Typr of argument s is now
+	bfd_mach_o_asymbol.  Use unsigned int for file offset type.
+	(bfd_mach_o_scan_read_symtab_symbol): Adjust for bfd_mach_o_asymbol.
+	Handle weak-ref symbols.
+	(bfd_mach_o_scan_read_symtab_symbols): Adjust for bfd_mach_o_asymbol.
+	(bfd_mach_o_scan_read_dysymtab_symbol): Ditto.
+	(bfd_mach_o_scan): Remove assignment to removed field.
+	(bfd_mach_o_mkobject_init): Ditto.
+	(bfd_mach_o_bfd_print_private_bfd_data): Adjust printf formatter.
+	(bfd_mach_o_bfd_reloc_type_lookup): New macro.
+	(bfd_mach_o_bfd_reloc_name_lookup): Ditto.
+	(bfd_mach_o_swap_reloc_in): Ditto.
+	(bfd_mach_o_swap_reloc_out): Ditto.
+
+	* mach-o.h (BFD_MACH_O_REFERENCE_FLAG_UNDEFINED_NON_LAZY)
+	(BFD_MACH_O_REFERENCE_FLAG_UNDEFINED_LAZY)
+	(BFD_MACH_O_REFERENCE_FLAG_DEFINED)
+	(BFD_MACH_O_REFERENCE_FLAG_PRIVATE_DEFINED)
+	(BFD_MACH_O_REFERENCE_FLAG_PRIVATE_UNDEFINED_NON_LAZY)
+	(BFD_MACH_O_REFERENCE_FLAG_PRIVATE_UNDEFINED_LAZY)
+	(BFD_MACH_O_REFERENCED_DYNAMICALLY, BFD_MACH_O_N_DESC_DISCARDED)
+	(BFD_MACH_O_N_NO_DEAD_STRIP, BFD_MACH_O_N_WEAK_REF)
+	(BFD_MACH_O_N_WEAK_DEF): New macros.
+	Add comments.
+	(bfd_mach_o_section_type): Add new enumeration values.
+	(BFD_MACH_O_S_SELF_MODIFYING_CODE)
+	(BFD_MACH_O_S_ATTR_LIVE_SUPPORT)
+	(BFD_MACH_O_S_ATTR_NO_DEAD_STRIP)
+	(BFD_MACH_O_S_ATTR_STRIP_STATIC_SYMS, BFD_MACH_O_S_ATTR_NO_TOC): New
+	macros.
+	(BFD_MACH_O_GENERIC_RELOC_VANILLA)
+	(BFD_MACH_O_GENERIC_RELOC_PAIR)
+	(BFD_MACH_O_GENERIC_RELOC_SECTDIFF)
+	(BFD_MACH_O_GENERIC_RELOC_PB_LA_PTR)
+	(BFD_MACH_O_GENERIC_RELOC_LOCAL_SECTDIFF): Ditto.
+	(BFD_MACH_O_RELENT_SIZE): Ditto.
+	(BFD_MACH_O_R_PCREL, BFD_MACH_O_GET_R_LENGTH)
+	(BFD_MACH_O_R_EXTERN, BFD_MACH_O_GET_R_TYPE)
+	(BFD_MACH_O_GET_R_SYMBOLNUM, BFD_MACH_O_SET_R_LENGTH)
+	(BFD_MACH_O_SET_R_TYPE, BFD_MACH_O_SET_R_SYMBOLNUM): Ditto.
+	(BFD_MACH_O_SR_SCATTERED, BFD_MACH_O_SR_PCREL)
+	(BFD_MACH_O_GET_SR_LENGTH, BFD_MACH_O_GET_SR_TYPE)
+	(BFD_MACH_O_GET_SR_ADDRESS, BFD_MACH_O_SET_SR_LENGTH)
+	(BFD_MACH_O_SET_SR_TYPE, BFD_MACH_O_SET_SR_ADDRESS): Ditto.
+	(bfd_mach_o_reloc_info): New struct.
+	(bfd_mach_o_asymbol): New struct.
+	(bfd_mach_o_symtab_command): The symbols field is now of type
+	bfd_mach_o_asymbol.
+	(bfd_mach_o_load_command): The offset and len fields are now of type
+	unsigned int.
+	(mach_o_data_struct): Remove symbols, nsymbols and ibfd fields.
+	Add a filelen field.  Add comments.
+	(bfd_mach_o_backend_data): New struct.
+	(bfd_mach_o_get_backend_data): New macro.
+	(bfd_mach_o_scan_read_symtab_symbol): Parameter symbol now of type
+	bfd_mach_o_asymbol.
+	(bfd_mach_o_scan_read_dysymtab_symbol): Ditto.
+	(bfd_mach_o_get_reloc_upper_bound): New prototype.
+	(bfd_mach_o_canonicalize_reloc): Ditto.
+
+	* mach-o-target.c (bfd_mach_o_bfd_is_local_label_name): Remove
+	duplicated macro.  Now defined to _bfd_generic_is_local_label.
+	(TARGET_NAME_BACKEND): New macro...
+	(TARGET_NAME_BACKEND): ... used to name a new variable.
+	(TARGET_NAME): Define relocs table using bfd_mach_o, reference
+	Mach-O backend data.
+
+	* mach-o-i386.c (i386_howto_table): New variable.
+	(bfd_mach_o_i386_swap_reloc_in): New function.
+	(bfd_mach_o_i386_swap_reloc_out): Ditto.
+	(bfd_mach_o_i386_bfd_reloc_type_lookup): Ditto.
+	(bfd_mach_o_i386_bfd_reloc_name_lookup): Ditto.
+	(bfd_mach_o_swap_reloc_in, bfd_mach_o_swap_reloc_out): New macros.
+	(bfd_mach_o_bfd_reloc_type_lookup)
+	(bfd_mach_o_bfd_reloc_name_lookup): Ditto.
+
+2009-06-11  Eric Paris  <eparis@redhat.com>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* opncls.c (_maybe_make_executable): New function.  Gives execute
+	permission to an executable bfd that was opened for writing
+	provided that it is a regular file.  Replaces common code found in...
+	(bfd_close): here and ...
+	(bfd_close_all_done): here.
+
+2009-06-11  Anthony Green  <green@moxielogic.com>
+
+	* reloc.c: Add BFD_RELOC_MOXIE_10_PCREL.
+	* bfd-in2.h: Rebuilt.
+	* libbfd.h: Rebuilt.
+	* elf32-moxie.c (moxie_elf_howto_table): Add R_MOXIE_PCREL10
+	relocation support.
+	(moxie_reloc_map): Ditto.
+	Clean up copyright notice.
+
+2009-06-10  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+	* bfd-in2.h: bfd_mmap prototype.
+	* bfdio.c (bfd_mmap): New function.
+	* libbfd.h (bfd_iovec): Add bmmap.
+	* cache.c (cache_bmmap): New function.
+	(cache_iovec): Initialize bmmap member.
+	* opencls.c (opncls_bmmap): New function.
+	(opncls_iovec): Initialize bmmap member.
+
+2009-06-09  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.h (bfd_mach_o_symtab_command): Remove stabs_segment
+	and stabstr_segment fields.
+	(mach_o_be_vec, mach_o_le_vec): Removed
+	(bfd_mach_o_version): New prototype.
+
+	* mach-o.c (bfd_mach_o_version): Make this function public.
+	(mach_o_wide_p): New function.
+	(bfd_mach_o_wide_p): Ditto.
+	(bfd_mach_o_convert_section_name_to_bfd): Add prefix only for
+	weird names.
+	(bfd_mach_o_convert_section_name_to_mach_o): Fix typo in comment.
+	Search in the list only if the name starts with a dot.
+	(bfd_mach_o_write_header): Use mach_o_wide_p instead of hard-coded
+	test.  Check bfd_seek status.
+	(bfd_mach_o_scan_write_thread): Check bfd_seek status.
+	(bfd_mach_o_scan_write_section_32): Ditto.
+	(bfd_mach_o_scan_write_section_64): Ditto.
+	(bfd_mach_o_scan_write_section): Removed.
+	(bfd_mach_o_scan_write_segment): Split into ...
+	(bfd_mach_o_scan_write_segment_32): ... this and ...
+	(bfd_mach_o_scan_write_segment_64): ... this.  Check bfd_seek status.
+	(bfd_mach_o_scan_write_symtab_symbols): Moved into ...
+	(bfd_mach_o_scan_write_symtab): ... this.  Write symtab from BFD
+	symbol table.  Now returns a boolean.
+	(bfd_mach_o_write_contents): Set filetype.  Check bfd_seek status.
+	Adjust for status type.
+	(bfd_mach_o_build_commands): Use mach_o_wide_p instead of hard-coded
+	test.  Write symbol table.  Numbers the sections.
+	(bfd_mach_o_read_header): Check bfd_seek status.
+	Use mach_o_wide_p instead of hard-coded test.
+	(bfd_mach_o_scan_read_section_32): Check bfd_seek status.
+	(bfd_mach_o_scan_read_section_64): Ditto.
+	(bfd_mach_o_scan_read_symtab_symbol): Ditto.  Check bfd_seek status.
+	Use BFD_MACH_O_N_TYPE instead of hard-coded value.  Correctly
+	handled common symbols.
+	(bfd_mach_o_scan_read_symtab_strtab): Check bfd_seek status.
+	(bfd_mach_o_scan_read_dysymtab_symbol): Ditto.
+	(bfd_mach_o_scan_read_dylinker): Ditto.
+	(bfd_mach_o_scan_read_dylib): Ditto.
+	(bfd_mach_o_scan_read_thread): Ditto.
+	(bfd_mach_o_scan_read_symtab): Ditto.
+	Do not create a section for the stabs.
+	(bfd_mach_o_scan_read_uuid): Check bfd_seek status.
+	(bfd_mach_o_scan_read_segment): Ditto.
+	(bfd_mach_o_scan_read_command): Ditto.
+	(bfd_mach_o_scan_start_address): Ditto.
+	(bfd_mach_o_scan): Use mach_o_wide_p instead of hard-coded test.
+	(bfd_mach_o_archive_p): Check bfd_seek status.
+	(bfd_mach_o_core_fetch_environment): Ditto.
+
+	* mach-o-i386.c (bfd_mach_o_i386_mkobject): Don't set filetype.
+
+2009-06-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_link_hash_table): Add irelifunc.
+	(elf_i386_link_hash_table_create): Initialize irelifunc.
+	(elf_i386_check_relocs): Updated.  Set up irelifunc for
+	shared objects.
+	(elf_i386_allocate_dynrelocs): Use irelifunc for dynamic
+	relocation for non-GOT reference of STT_GNU_IFUNC symbol in
+	shared objects.
+	(elf_i386_relocate_section): Likewise.
+
+	* elf64-x86-64.c (elf64_x86_64_link_hash_table): Add irelifunc.
+	(elf64_x86_64_link_hash_table_create): Initialize irelifunc.
+	(elf64_x86_64_check_relocs): Updated.  Set up irelifunc for
+	shared objects.
+	(elf64_x86_64_allocate_dynrelocs): Use irelifunc for dynamic
+	relocation for non-GOT reference of STT_GNU_IFUNC symbol in
+	shared objects.
+	(elf64_x86_64_relocate_section): Likewise.
+
+	* elf-bfd.h (_bfd_elf_create_static_ifunc_sections): Renamed to
+	...
+	(_bfd_elf_create_ifunc_sections): This.
+
+	* elflink.c (_bfd_elf_create_static_ifunc_sections): Renamed to
+	...
+	(_bfd_elf_create_ifunc_sections): This.  Create .rel[a].ifunc
+	for shared objects.
+
+2009-06-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_check_relocs): Make room for dynamic
+	relocation for R_386_32 against STT_GNU_IFUNC symbol when
+	building shared object.  Check info->executable instead of
+	!info->shared when setting non_got_ref.
+	(elf_i386_allocate_dynrelocs): Allocate dynamic relocation
+	for non-GOT reference of STT_GNU_IFUNC symbol in shared
+	object. Allocate GOT relocation agsinst STT_GNU_IFUNC
+	symbol if needed.
+	(elf_i386_relocate_section): Output dynamic relocation for
+	R_386_32 against STT_GNU_IFUNC symbol to get the real
+	function address when building shared object.
+	(elf_i386_finish_dynamic_symbol): Output R_386_GLOB_DAT
+	relocation for STT_GNU_IFUNC symbol in shared object.
+
+	* elf64-x86-64.c (elf64_x86_64_check_relocs): Make room for
+	dynamic relocation for R_X86_64_64 against STT_GNU_IFUNC
+	symbol when building shared object.  Check info->executable
+	instead of !info->shared when setting non_got_ref.
+	(elf64_x86_64_allocate_dynrelocs): Allocate dynamic relocation
+	for non-GOT reference of STT_GNU_IFUNC symbol in shared
+	library. Allocate GOT relocation agsinst STT_GNU_IFUNC symbol
+	if needed.
+	(elf64_x86_64_relocate_section): Output dynamic relocation
+	for R_X86_64_64 against STT_GNU_IFUNC symbol to get the real
+	function address when building shared object.
+	(elf64_x86_64_finish_dynamic_symbol): Output R_X86_64_GLOB_DAT
+	relocation for STT_GNU_IFUNC symbol in shared object.
+
+2009-06-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* Makefile.am: Run "make dep-am".
+	(BFD32_BACKENDS): Add mach-o-i386.lo.
+	(BFD32_BACKENDS_CFILES): Add mach-o-i386.c.
+	* Makefile.in: Regenerate.
+
+2009-06-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_relocate_section): Match overlay number
+	when looking for soft-icache stubs.
+
+2009-06-05  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.h: Update copyright year.
+	(bfd_mach_o_mach_header_magic): New enum.
+	(bfd_mach_o_cpu_subtype): Now an enum.
+	(BFD_MACH_O_HEADER_SIZE, BFD_MACH_O_HEADER_64_SIZE): New macros.
+	(BFD_MACH_O_SECTION_SIZE, BFD_MACH_O_SECTION_64_SIZE): Ditto.
+	(BFD_MACH_O_LC_SEGMENT_SIZE, BFD_MACH_O_LC_SEGMENT_64_SIZE): Ditto.
+	(bfd_mach_o_load_command): Field type_required is now a boolean.
+	Reindent prototypes.
+	(bfd_mach_o_object_p, bfd_mach_o_core_p): Remove.
+	(bfd_mach_o_bfd_copy_private_symbol_data): Add a prototype.
+	(bfd_mach_o_bfd_copy_private_section_data): Ditto.
+	(bfd_mach_o_bfd_copy_private_bfd_data): Ditto.
+	(bfd_mach_o_get_symtab_upper_bound): Ditto.
+	(bfd_mach_o_canonicalize_symtab): Ditto.
+	(bfd_mach_o_get_symbol_info): Ditto.
+	(bfd_mach_o_print_symbol): Ditto.
+	(bfd_mach_o_bfd_print_private_bfd_data): Ditto.
+	(bfd_mach_o_make_empty_symbol): Ditto.
+	(bfd_mach_o_write_contents): Ditto.
+
+	* mach-o.c (bfd_mach_o_object_p, bfd_mach_o_core_p,
+	bfd_mach_o_mkobject): Defines.
+	(bfd_mach_o_valid): Returns FALSE/TRUE instead of 0/1.
+	Do not check with target vector but with flavour.
+	(struct mach_o_section_name_xlat): New declaration.
+	(dwarf_section_names_xlat): Ditto.
+	(text_section_names_xlat): Ditto.
+	(data_section_names_xlat): Ditto.
+	(struct mach_o_segment_name_xlat): Ditto.
+	(segsec_names_xlat): Ditto.
+	(bfd_mach_o_convert_section_name_to_bfd): New function.
+	(bfd_mach_o_convert_section_name_to_mach_o): Ditto.
+	(bfd_mach_o_bfd_copy_private_symbol_data): Make it public.
+	(bfd_mach_o_bfd_copy_private_section_data): Ditto.
+	(bfd_mach_o_bfd_copy_private_bfd_data): Ditto.
+	Accept any input and output flavour.  Do not share private data
+	anymore.
+	(bfd_mach_o_count_symbols): Add a comment.
+	(bfd_mach_o_get_symtab_upper_bound): Make it public.
+	(bfd_mach_o_canonicalize_symtab): Ditto.
+	(bfd_mach_o_get_symbol_info): Ditto.
+	(bfd_mach_o_print_symbol): Ditto.
+	(bfd_mach_o_write_header): Now returns a boolean instead of an int.
+	Use constants instead of hard-coded values.
+	(bfd_mach_o_scan_write_section_32): Use constants instead of hard-coded
+	values.
+	(bfd_mach_o_scan_write_section_64): Ditto.
+	(bfd_mach_o_scan_write_segment): Ditto.
+	Do not copy sections anymore.
+	(bfd_mach_o_write_contents): Make it public.
+	Remove dead code.  Rewrite typeflag assignment.
+	(bfd_mach_o_build_commands): New function.
+	(bfd_mach_o_set_section_contents): Ditto.
+	(bfd_mach_o_make_empty_symbol): Make it public.
+	(bfd_mach_o_read_header): Make it static.
+	Convert to bfd_boolean.
+	Use constants instead of hard-coded values.
+	(bfd_mach_o_make_bfd_section): Call
+	bfd_mach_o_convert_section_name_to_bfd to create name.
+	(bfd_mach_o_scan_read_section_32): Use constants instead of hard-coded
+	values.
+	(bfd_mach_o_scan_read_section_64): Ditto.
+	(bfd_mach_o_scan_read_segment): Do not create a bfd section for
+	a segment anymore.  Use constants instead of hard-coded values.
+	(bfd_mach_o_scan_read_command): Fix style.
+	(bfd_mach_o_scan): Use constants instead of hard-coded values.
+	Get rid of BFD_IO_FUNCS.
+	(bfd_mach_o_mkobject_init): Renamed from bfd_mach_o_mkobject.
+	(bfd_mach_o_header_p): Created from bfd_mach_o_object_p.
+	(bfd_mach_o_gen_object_p): New function, replaces bfd_mach_o_object_p.
+	(bfd_mach_o_object_p): Removed.
+	(bfd_mach_o_gen_core_p): New function, replaces ...
+	(bfd_mach_o_core_p): ... deleted.
+	(bfd_mach_o_bfd_print_private_bfd_data): Make it public.
+
+	* mach-o-i386.c: New file.
+	* config.bfd: Use mach_o_i386_vec as targ_defvec for ix86-darwin.
+	* configure.in (TDEFINES): Add mach_o_i386_vec.
+	* configure: Regenerated.
+	* targets.c: Add mach_o_i386_vec.
+
+	* mach-o.c: Update copyright years.
+	(BFD_IO_FUNCS): Remove (was not used).
+	(bfd_mach_o_mkarchive, bfd_mach_o_read_ar_hdr, bfd_mach_o_slurp_armap
+	bfd_mach_o_slurp_extended_name_table,
+	bfd_mach_o_construct_extended_name_table,
+	bfd_mach_o_truncate_arname, bfd_mach_o_write_armap,
+	bfd_mach_o_get_elt_at_index, bfd_mach_o_generic_stat_arch_elt,
+	bfd_mach_o_update_armap_timestamp, bfd_mach_o_close_and_cleanup,
+	bfd_mach_o_bfd_free_cached_info, bfd_mach_o_new_section_hook,
+	bfd_mach_o_get_section_contents_in_window,
+	bfd_mach_o_bfd_is_local_label_name,
+	bfd_mach_o_bfd_is_target_special_symbol,
+	bfd_mach_o_bfd_is_local_label_name, bfd_mach_o_get_lineno,
+	bfd_mach_o_find_nearest_line, bfd_mach_o_find_inliner_info,
+	bfd_mach_o_bfd_make_debug_symbol, bfd_mach_o_read_minisymbols,
+	bfd_mach_o_minisymbol_to_symbol,
+	bfd_mach_o_bfd_get_relocated_section_contents,
+	bfd_mach_o_bfd_relax_section, bfd_mach_o_bfd_link_hash_table_create,
+	bfd_mach_o_bfd_link_hash_table_free, bfd_mach_o_bfd_link_add_symbols,
+	bfd_mach_o_bfd_link_just_syms, bfd_mach_o_bfd_final_link,
+	bfd_mach_o_bfd_link_split_section, bfd_mach_o_set_arch_mach,
+	bfd_mach_o_bfd_merge_private_bfd_data,
+	bfd_mach_o_bfd_set_private_flags, bfd_mach_o_get_section_contents,
+	bfd_mach_o_bfd_gc_sections, bfd_mach_o_bfd_merge_sections,
+	bfd_mach_o_bfd_is_group_section, bfd_mach_o_bfd_discard_group,
+	bfd_mach_o_section_already_linked, bfd_mach_o_bfd_define_common_symbol,
+	bfd_mach_o_bfd_copy_private_header_data,
+	bfd_mach_o_core_file_matches_executable_p): Move these defines ...
+	* mach-o-target.c: ... here.
+	Update copyright years.
+
+2009-06-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* dep-in.sed: Don't use \n in replacement part of s command.
+	* Makefile.am (DEP1): LC_ALL for uniq.
+	Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2009-06-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_allocate_dynrelocs): Remove check of
+	h->plt.refcount > 0 on STT_GNU_IFUNC symbol.
+	* elf64-x86-64.c (elf64_x86_64_allocate_dynrelocs): Likewise.
+
+2009-06-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_allocate_dynrelocs): Allocate
+	GOT entry for STT_GNU_IFUNC symbol with pointer equality.
+	(elf_i386_relocate_section): Adjust R_386_GOT32 relocation
+	against STT_GNU_IFUNC symbols for static executables.
+	(elf_i386_finish_dynamic_symbol): Load GOT entry with
+	PLT entry for STT_GNU_IFUNC symbol with pointer equality.
+
+	* elf64-x86-64.c (elf64_x86_64_allocate_dynrelocs): Allocate
+	GOT entry for STT_GNU_IFUNC symbol with pointer equality.
+	(elf64_x86_64_finish_dynamic_symbol): Load GOT entry with
+	PLT entry for STT_GNU_IFUNC symbol with pointer equality.
+
+2009-06-02  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* coff-rs6000.c (xcoff_ppc_relocate_section): Allow undefined
+	symbols to be left unimported when linking statically.
+	* xcofflink.c (xcoff_link_add_symbols): Ignore global linkage
+	code when linking statically.
+
+2009-06-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_check_relocs): Increment
+	got.refcount for R_386_GOT32/R_386_GOTOFF relocations
+	against STT_GNU_IFUNC symbol.
+	(elf_i386_allocate_dynrelocs): Set got.refcount to 0 if
+	local STT_GNU_IFUNC definition is used.
+	(elf_i386_relocate_section): Handle got.offset != -1 for
+	R_386_GOT32/R_386_GOTOFF relocations against STT_GNU_IFUNC
+	symbol.
+
+	* elf64-x86-64.c (elf64_x86_64_check_relocs): Increment
+	got.refcount for R_X86_64_GOTPCREL/R_X86_64_GOTPCREL64
+	relocations against STT_GNU_IFUNC symbol.
+	(elf64_x86_64_allocate_dynrelocs): Set got.refcount to 0 if
+	local STT_GNU_IFUNC definition is used.
+	(elf64_x86_64_relocate_section): Handle got.offset != -1
+	for R_X86_64_GOTPCREL/R_X86_64_GOTPCREL64 relocations against
+	STT_GNU_IFUNC symbol.
+
+2009-06-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/10205
+	* elf32-i386.c (elf_howto_table): Add R_386_IRELATIVE.
+	(elf_i386_reloc_type_lookup): Likewise.
+	(R_386_tls): Removed.
+	(R_386_irelative): New.
+	(R_386_vt_offset): Updated.
+	(elf_i386_rtype_to_howto): Likewise.
+	(elf_i386_link_hash_table): Add igotplt, iplt and irelplt.
+	(elf_i386_link_hash_table_create): Initialize igotplt,
+	iplt and irelplt.
+	(elf_i386_check_relocs): Handle STT_GNU_IFUNC symbol first.
+	(elf_i386_adjust_dynamic_symbol): Likewise.
+	(elf_i386_allocate_dynrelocs): Likewise.
+	(elf_i386_relocate_section): Likewise.
+	(elf_i386_size_dynamic_sections): Set up .iplt and .igot.plt
+	sections.
+	(elf_i386_finish_dynamic_symbol): When building a static
+	executable, use .iplt, .igot.plt and .rel.iplt sections for
+	STT_GNU_IFUNC symbols.  Generate R_386_IRELATIVE relocation for
+	locally defined STT_GNU_IFUNC symbol.
+
+	* elf64-x86-64.c (x86_64_elf_howto): Add R_X86_64_IRELATIVE.
+	(x86_64_reloc_map): Likewise.
+	(R_X86_64_standard): Updated.
+	(elf64_x86_64_link_hash_table): Add igotplt, iplt and irelplt.
+	(elf64_x86_64_link_hash_table_create): Initialize igotplt,
+	iplt and irelplt.
+	(elf64_x86_64_check_relocs): Handle STT_GNU_IFUNC symbol first.
+	(elf64_x86_64_adjust_dynamic_symbol): Likewise.
+	(elf64_x86_64_allocate_dynrelocs): Likewise.
+	(elf64_x86_64_relocate_section): Likewise.
+	(elf64_x86_64_size_dynamic_sections): Set up .iplt and .igot.plt
+	sections.
+	(elf64_x86_64_finish_dynamic_symbol): When building a static
+	executable, use .iplt, .igot.plt and .rela.iplt sections for
+	STT_GNU_IFUNC symbols.  Generate R_X86_64_IRELATIVE relocation
+	for locally defined STT_GNU_IFUNC symbol.
+
+	* reloc.c (BFD_RELOC_386_IRELATIVE): New.
+	(BFD_RELOC_X86_64_IRELATIVE): Likewise.
+
+	* bfd-in2.h: Regenerated.
+	* libbfd.h: Likewise.
+
+2009-06-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (struct bfd_elf_section_data): Remove indirect_relocs.
+	(_bfd_elf_make_ifunc_reloc_section): Removed.
+	(_bfd_elf_is_ifunc_symbol): Likewise.
+	(_bfd_elf_create_static_ifunc_sections): New.
+
+	* elflink.c (_bfd_elf_adjust_dynamic_symbol): Move STT_GNU_IFUNC
+	symbol check to ...
+	(elf_link_add_object_symbols): Here.
+	(_bfd_elf_link_hash_hide_symbol): Don't clean plt on
+	STT_GNU_IFUNC symbol.
+	(elf_link_output_extsym): Call elf_backend_finish_dynamic_symbol
+	if a STT_GNU_IFUNC symbol is referenced in a non-shared object.
+	(IFUNC_INFIX): Removed.
+	(get_ifunc_reloc_section_name): Likewise.
+	(_bfd_elf_make_ifunc_reloc_section): Likewise.
+	(_bfd_elf_is_ifunc_symbol): Likewise.
+	(_bfd_elf_create_static_ifunc_sections): New.
+
+2009-05-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (link_hash_newfunc): Add elf_i386_ prefix.
+	(create_got_section): Likewise.
+	(allocate_dynrelocs): Likewise.
+	(readonly_dynrelocs): Likewise.
+	(set_tls_module_base): Likewise.
+	(dtpoff_base): Likewise.
+	(tpoff): Likewise.
+	(elf_i386_link_hash_table_create): Updated.
+	(elf_i386_create_dynamic_sections): Likewise.
+	(elf_i386_check_relocs): Likewise.
+	(elf_i386_size_dynamic_sections): Likewise.
+	(elf_i386_relocate_section): Likewise.
+
+	* elf64-x86-64.c (link_hash_newfunc): Add elf64_x86_64_ prefix.
+	(create_got_section): Likewise.
+	(allocate_dynrelocs): Likewise.
+	(readonly_dynrelocs): Likewise.
+	(set_tls_module_base): Likewise.
+	(dtpoff_base): Likewise.
+	(tpoff): Likewise.
+	(elf64_x86_64_link_hash_table_create): Updated.
+	(elf64_x86_64_create_dynamic_sections): Likewise.
+	(elf64_x86_64_check_relocs): Likewise.
+	(elf64_x86_64_size_dynamic_sections): Likewise.
+	(elf64_x86_64_relocate_section): Likewise.
+
+2009-05-28  Nick Clifton  <nickc@redhat.com>
+
+	* targets.c (_bfd_target_vector): Only include plugin target in
+	all-targets build if BFD_SUPPORTS_PLUGINS is non-zero.
+
+2009-05-28  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* elf32-spu.c (struct call_info): New member broken_cycle.
+	(remove_cycle): Instead of physically removing call_info structures
+	to break call graph cycles, mark them using the broken_cycle flag.
+	(mark_overlay_section): Respect broken_cycle flag.
+	(unmark_overlay_section): Likewise.
+	(collect_lib_sections): Likewise.
+	(collect_overlays): Likewise.
+	(sum_stack): Likewise.
+
+2009-05-28  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* elf32-spu.c (insert_callee): Accumulate incoming callee->count.
+	(mark_functions_via_relocs): Initialize callee->count to 1.
+	(pasted_function): Likewise.
+	(spu_elf_auto_overlay): Honor call counts when determining number
+	of stubs required in software i-cache mode.
+
+2009-05-27  Rafael Avila de Espindola  <espindola@google.com>
+
+	* plugin.c (program_name): Remove.
+	(plugin_program_name): New.
+	(bfd_plugin_set_program_name): New.
+	(try_load_plugin): Use plugin_program_name.
+	* plugin.h (bfd_plugin_set_program_name): New.
+
+2009-05-27  Rafael Avila de Espindola  <espindola@google.com>
+
+	* aclocal.m4: Include ../config/plugins.m4.
+	* configure.in: Use AC_PLUGINS.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+	* doc/Makefile.in: Regenerate.
+
+2009-05-27  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf32-ppc.c (ppc_elf_relax_section): Work with a partial
+	link.
+	* bout.c (b_out_bfd_relax_section): Reject relocatable links.
+	* elf32-m10300.c (mn10300_elf_relax_section): Likewise.
+	* elf32-avr.c (elf32_avr_relax_section): Likewise.
+	* elf32-frv.c (elf32_avr_relax_section): Likewise.
+	* elf32-xtensa.c (elf_xtensa_relax_section): Likewise.
+	* elf64-mmix.c (mmix_elf_relax_section): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_relax_section): Likewise.
+	* reloc.c (bfd_generic_relax_section): Likewise.
+	* reloc16.c (bfd_coff_reloc16_relax_section): Likewise.
+	* vms.c (vms_bfd_relax_section): Likewise.
+
+2009-05-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (_bfd_elf_is_ifunc_symbol): New.
+
+	* elf32-i386.c (is_indirect_symbol): Renamed to ...
+	* elflink.c (_bfd_elf_is_ifunc_symbol): This.
+
+	* elf32-i386.c (allocate_dynrelocs): Updated.
+	(elf_i386_relocate_section): Likewise.
+	* elf64-x86-64.c (allocate_dynrelocs): Likewise.
+	(elf64_x86_64_relocate_section): Likewise.
+
+	* elf64-x86-64.c (is_indirect_symbol): Removed.
+
+2009-05-26  Nick Clifton  <nickc@redhat.com>
+
+	* po/id.po: Updated Indonesian translation.
+
+2009-05-26  Rafael Avila de Espindola  <espindola@google.com>
+
+	* Makefile.am: Run "make dep-am".
+	(AM_CPPFLAGS): New.
+	(LIBDL): New.
+	(ALL_MACHINES): Add cpu-plugin.lo.
+	(ALL_MACHINES_CFILES): Add cpu-plugin.c.
+	(BFD32_BACKENDS): Add plugin.lo.
+	(BFD32_BACKENDS_CFILES): Add plugin.c.
+	(libbfd_la_LIBADD): Add LIBDL
+	* archures.c (bfd_architecture): Add bfd_arch_plugin.
+	(bfd_plugin_arch): Declare.
+	* bfd-in.h (BFD_SUPPORTS_PLUGINS): New.
+	* bfd.c (bfd): Add plugin_data.
+	* config.bfd: Handle the plugin target.
+	* configure.in: Check for --enable-plugins.
+	(LT_INIT): Use the dlopen option.
+	* cpu-plugin.c: New.
+	* plugin.c: New.
+	* plugin.h: New.
+	* targets.c (plugin_vec): Declare.
+	(_bfd_target_vector): Add plugin_vec.
+	* Makefile.in: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* configure: Regenerate.
+
+2009-05-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* dep-in.sed: Don't modify .o to .lo here.  Output one filename
+	per line with all lines having continuation backslash.  Prefix
+	first line with "A", following lines with "B".
+	* Makefile.am (DEP): Don't use dep.sed here.
+	(DEP1): Run $MKDEP on single files, modify .o to .lo here.  Use
+	dep.sed here on dependencies, sort and uniq.
+	* Makefile.in: Regenerate.
+
+2009-05-25  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms: Add verilog.obj to object list OBJS.
+
+2009-05-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdio.c (bfd_seek): Formatting.  Ensure newly allocated memory
+	for BFD_IN_MEMORY is cleared.
+	(bfd_bwrite): Zero excess memory allocated.
+
+2009-05-22  Julian Brown  <julian@codesourcery.com>
+
+	* elf32-arm.c (THUMB16_BCOND_INSN, THUMB32_INSN, THUMB32_B_INSN): New
+	macros.
+	(elf32_arm_stub_a8_veneer_b_cond, elf32_arm_stub_a8_veneer_b)
+	(elf32_arm_stub_a8_veneer_blx): New stub sequences.
+	(elf32_arm_stub_type): Add arm_stub_a8_veneer_b_cond,
+	arm_stub_a8_veneer_b and arm_stub_a8_veneer_blx.
+	(elf32_arm_stub_hash_entry): Add target_addend, orig_insn fields.
+	(a8_erratum_fix, a8_erratum_reloc): New structs.
+	(elf32_arm_link_hash_table): Add a8_erratum_fixes,
+	num_a8_erratum_fixes, fix_cortex_a8 fields.
+	(elf32_arm_link_hash_table_create): Zero fix_cortex_a8.
+	(elf32_arm_add_stub): Split into two parts, creating...
+	(elf32_arm_create_or_find_stub_sec): New function.
+	(elf32_arm_final_link_relocate): Add forward declaration.
+	(arm_build_one_stub): Add support for THUMB32_TYPE, Thumb-2
+	relocations, multiple relocations per stub.
+	(find_stub_size_and_template): New (using parts of arm_size_one_stub).
+	(arm_size_one_stub): Use find_stub_size_and_template.
+	(a8_reloc_compare): New.
+	(find_thumb_glue): Add forward declaration.
+	(cortex_a8_erratum_scan): New.
+	(elf32_arm_size_stubs): Add Cortex-A8 erratum workaround support.
+	(bfd_elf32_arm_set_cortex_a8_fix): New.
+	(bfd_elf32_arm_set_target_relocs): Add fix_cortex_a8 argument.
+	(arm_map_one_stub): Add THUMB32_TYPE support.
+	(a8_branch_to_stub_data): New.
+	(make_branch_to_a8_stub): New.
+	(elf32_arm_write_section): Add Cortex-A8 erratum workaround support.
+	* bfd-in.h (bfd_elf32_arm_set_cortex_a8_fix): New.
+	(bfd_elf32_arm_set_target_relocs): Add argument for controlling
+	Cortex-A8 erratum workaround.
+	* bfd-in2.h: Regenerate.
+
+2009-05-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2009-05-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (elf_link_input_bfd): Correct *pindex change in last
+	commit.
+
+2009-05-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_backend_data
+	<elf_backend_link_output_symbol_hook>): Return an int.
+	* elf64-ppc.c (ppc64_elf_output_symbol_hook): Return 2 to drop
+	symbols on deleted .opd entries.
+	* elflink.c (elf_link_output_sym): Return without outputting sym
+	if output_symbol_hook returns 2.
+	(elf_link_output_extsym): Don't assign h->indx when symbol discarded.
+	Abort if we must not discard sym.
+	(elf_link_input_bfd): Similarly, don't set finfo->indices for
+	local syms.
+	(bfd_elf_final_link): Adjust elf_link_output_sym calls.
+	* elf-vxworks.c (elf_vxworks_link_output_symbol_hook): Adjust for
+	elf_backend_link_output_symbol_hook return type change.
+	* elf32-arm.c (output_arch_syminfo): Likewise.
+	(elf32_arm_output_map_sym, elf32_arm_output_stub_sym): Likewise.
+	(elf32_arm_output_arch_local_syms): Likewise.
+	* elf32-cr16c.c (elf32_cr16c_link_output_symbol_hook): Likewise.
+	* elf32-score.c (s3_bfd_score_elf_link_output_symbol_hook): Likewise.
+	(bfd_score_elf_link_output_symbol_hook): Likewise.
+	* elf32-score.h (s7_bfd_score_elf_link_output_symbol_hook): Likewise.
+	* elf32-score7.c (s7_bfd_score_elf_link_output_symbol_hook): Likewise.
+	* elf32-sh64.c (sh64_elf_link_output_symbol_hook): Likewise.
+	* elf32-spu.c (spu_elf_output_symbol_hook): Likewise.
+	* elf32-v850.c (v850_elf_link_output_symbol_hook): Likewise.
+	* elf64-hppa.c (elf64_hppa_link_output_symbol_hook): Likewise.
+	* elf64-mmix.c (mmix_elf_link_output_symbol_hook): Likewise.
+	* elf64-sh64.c (sh64_elf64_link_output_symbol_hook): Likewise.
+	* elf64-sparc.c (elf64_sparc_output_arch_syms): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_link_output_symbol_hook): Likewise.
+	* elfxx-mips.h (_bfd_mips_elf_link_output_symbol_hook): Likewise.
+
+2009-05-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (ppc64_elf_get_synthetic_symtab): Don't segfault on
+	out of range .opd symbols.
+
+2009-05-21  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* coffgen.c (coff_print_symbol):  Use bfd_fprintf_vma, not
+	fprintf_vma directly.
+	* peXXigen.c (pe_print_edata):  Likewise.
+	(pe_print_pdata):  Likewise.
+	(_bfd_XX_print_ce_compressed_pdata):  Likewise.
+	(_bfd_XX_print_private_bfd_data_common):  Likewise.
+
+2009-05-19  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* cofflink.c (process_embedded_commands):  Ignore "-aligncomm".
+
+2009-05-15  Andrew Stubbs  <ams@codesourcery.com>
+	    Paul Brook  <paul@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_fix_exidx_coverage): Don't attempt to
+	fix discarded sections.
+
+2009-05-14  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* elf32-spu.c (mark_overlay_section): Move .init and .fini
+	sections into the software icache.
+
+2009-05-14  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* elf32-spu.c (build_stub): Always build "compact" sofware
+	i-cache stubs.
+
+2009-05-14  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* elf32-spu.c (struct spu_link_hash_table): Add fromelem_size_log2.
+	(spu_elf_setup): Initialize it.
+	(spu_elf_size_stubs): Move .ovtab into .bss for software i-cache.
+	Update to new-sytle cache manager data structures.
+	(spu_elf_build_stubs): Generate new-style cache manager data
+	structures and symbols.
+	(spu_elf_auto_overlay): Update size computation.
+
+2009-05-14  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* elf32-spu.c (spu_elf_modify_segment_map): Move all PF_OVERLAY
+	segments first amongst the program headers.
+
+2009-05-14  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* elf32-spu.c (spu_elf_relocate_section): Only encode overlay index
+	into addresses for relocation types that look at high bits.  Remove
+	special handling of relocation overflow warnings.
+
+2009-05-14  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* elf32-spu.c (mark_functions_via_relocs): Handle cycles in the
+	control flow graph between fragments of a function.
+
+2009-05-14  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* elf32-spu.c (spu_elf_size_stubs): Even in software i-cache mode,
+	generate only a 16-byte .toe section.
+	(spu_elf_build_stubs, spu_elf_auto_overlay): Likewise.
+
+2009-05-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_size_stubs): Split out section placement to..
+	(spu_elf_place_overlay_data): ..here.  New function.
+	* elf32-spu.h (spu_elf_place_overlay_data): Declare.
+
+2009-05-13  Andrew Jenner  <andrew@codesourcery.com>
+
+	* elf32-arm.c: Move sysdep.h to start of file.
+
+2009-05-11  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* elf32-spu.c (spu_elf_find_overlays): Don't use .ovl.init lma as
+	start of overlays.
+	(spu_elf_build_stubs): Don't define __icache_tagbase.  Define
+	__icache_tag_array and __icache_tag_array_size.
+
+2009-05-11  Masaki Muranaka  <monaka@monami-software.com>
+
+	* elf32-bfin.c (bfin_bfd_reloc_type_lookup): Remove unnecessary
+	ATTRIBUTE_UNUSED.
+	(bfinfdpic_link_omit_section_dynsym): Likewise.
+	(elf32_bfinfdpic_finish_dynamic_sections): Likewise.
+
+2009-05-05  Paul Brook  <paul@codesourcery.com>
+
+	* bfd-in.h (elf32_arm_fix_exidx_coverage): Add prototype.
+	* bfd-in2.h: Regenerate.
+	* elf32-arm.c (arm_unwind_edit_type, arm_unwind_table_edit): Define.
+	(_arm_elf_section_data): Add text and exidx fields.
+	(add_unwind_table_edit, get_arm_elf_section_data, adjust_exidx_size,
+	insert_cantunwind_after, elf32_arm_fix_exidx_coverage, offset_prel31,
+	copy_exidx_entry): New functions.
+	(elf32_arm_write_section): Fixup .ARM.exidx contents.
+
+2009-05-05  Christophe lyon  <christophe.lyon@st.com>
+
+	* elf32-arm.c (DEF_STUBS): New helper define.
+	(DEF_STUB): Likewise.
+	(stub_def): New type.
+	(stub_definitions): New array, containing stub template pointers
+	and sizes.
+	(arm_size_one_stub): Make use of stub_definitions.
+
+2009-05-04  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* elflink.c (find_version_for_sym):  Remove from here, ...
+	* linker.c (bfd_find_version_for_sym):  ... rename, replace
+	here, make public and update all callers.
+	* bfd-in2.h:  Regenerate.
+
+2009-04-30  Nick Clifton  <nickc@redhat.com>
+
+	* elf-bfd.h (struct bfd_elf_section_data): Add indirect_relocs
+	section pointer.
+	(struct elf_obj_data): Add has_ifunc_symbols boolean.
+	* elf.c (swap_out_syms): Convert BSF_GNU_INDIRECT_FUNCTION flags
+	into a STT_GNU_IFUNC symbol type.
+	(_bfd_elf_is_function_type): Accept STT_GNU_IFUNC as a function
+	type.
+	(_bfd_elf_set_osabi): Set the osasbi field to ELFOSABI_LINUX if
+	the binary contains ifunc symbols.
+	* elfcode.h (elf_slurp_symbol_table): Translate the STT_GNU_IFUNC
+	symbol type into a BSF_GNU_INDIRECT_FUNCTION flag.
+	* elf32-i386.c (is_indirect_function): New function.
+	(elf_i386_check_relocs): Create an ifunc output section.
+	(allocate_dynrelocs): Create dynamic relocs in the ifunc output
+	section if necessary.
+	(elf_i386_relocate_section): Emit a reloc against an ifunc symbol
+	if necessary.
+	(elf_i386_add_symbol_hook): New function. Set the
+	has_ifunc_symbols field of the elf_obj_data structure if an ifunc
+	symbol is encountered.
+	(elf_backend_post_process_headers): Define.
+	(elf_backend_add_symbol_hook): Define.
+	(elf_i386_post_process_headers): Rename to
+	elf_i388_fbsd_post_process_headers.
+	* elf64-x86_64.c (IS_X86_64_PCREL_TYPE): New macro.
+	(is_indirect_function): New function.
+	(elf64_x86_64_check_relocs): Create an ifunc output section.
+	(allocate_dynrelocs): Create dynamic relocs in the ifunc output
+	section if necessary.
+	(elf64_x86_64_relocate_section): Emit a reloc against an ifunc
+	symbol if necessary.
+	(elf_i386_add_symbol_hook): Set the has_ifunc_symbols field of the
+	elf_obj_data structure if an ifunc symbol is encountered.
+	(elf_backend_post_process_headers): Define.
+	* elflink.c (_bfd_elf_adjust_dynamic_symbol): Always create a PLT
+	if we have ifunc symbols to handle.
+	(get_ifunc_reloc_section_name): New function.  Computes the name
+	for an ifunc section.
+	(_bfd_elf_make_ifunc_reloc_section): New function.  Creates a
+	section to hold ifunc relocs.
+	* syms.c (BSF_GNU_INDIRECT_FUNCTION): Define.
+	(bfd_print_symbol_vandf): Handle ifunc symbols.
+	(bfd_decode_symclass): Likewise.
+	* bfd-in2.h: Regenerate.
+
+2009-04-30  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_check_relocs): Give errors for absolute
+	MOVW and MOVT relocations in a shared library link.
+
+2009-04-27  Anthony Green  <green@moxielogic.com>
+
+	* verilog.c: New file.
+	* Makefile.am (BFD32_LIBS): Add verilog.c.
+	(BFD32_LIBS_CFILES): Add verilog.c.
+	(verilog.lo): New build rule.
+	* Makefile.in: Rebuilt.
+	* targets.c: Add verilog support.
+	* bfd.c (tdata union): Add Verilog private data field.
+	* bfd-in2.h: Regenerate.
+
+2009-04-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* peXXigen.c (_bfd_XX_bfd_copy_private_bfd_data_common): Don't
+	copy pe_opthdr.
+
+2009-04-23  Matthias Klose  <doko@ubuntu.com>
+
+	* peXXigen.c (_bfd_XXi_swap_sym_in): Initialize `name'.
+
+2009-04-22  Christophe Lyon  <christophe.lyon@st.com>
+
+	PR9743
+	* elf32-arm.c (arm_type_of_stub): Handle R_ARM_THM_JUMP24,
+	R_ARM_JUMP24 and R_ARM_PLT32 relocations.
+	(elf32_arm_size_stubs): Likewise.
+	(record_thumb_to_arm_glue): Deleted unused function.
+	(bfd_elf32_arm_process_before_allocation): No longer handle
+	R_ARM_THM_JUMP24, R_ARM_JUMP24 and R_ARM_PLT32 relocations here.
+	(elf32_arm_final_link_relocate): Handle R_ARM_THM_JUMP24,
+	R_ARM_JUMP24 and R_ARM_PLT32 relocations.
+
+2009-04-21  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (INTERWORK_FLAG): Check BFD_LINKER_CREATED.
+	(elf32_arm_write_section): Declare early.
+	(elf32_arm_size_stubs): Skip non-stub sections in the stub BFD.
+	(arm_allocate_glue_section_space): Exclude empty sections.
+	(ARM_GLUE_SECTION_FLAGS): Add SEC_LINKER_CREATED.
+	(bfd_elf32_arm_add_glue_sections_to_bfd): Do not skip the stub
+	BFD.
+	(elf32_arm_output_glue_section, elf32_arm_final_link): New.
+	(elf32_arm_merge_eabi_attributes): Skip the stub BFD.
+	(elf32_arm_size_dynamic_sections): Allocate interworking
+	sections here.
+	(bfd_elf32_bfd_final_link): Define.
+
+2009-04-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* coff-ia64.c (COFF_PAGE_SIZE): Changed to 8K.
+
+	* coffcode.h (coff_compute_section_file_positions): Clear
+	D_PAGED if PE section alignment is smaller than COFF_PAGE_SIZE.
+
+	* libcoff-in.h (pe_tdata): Remove force_minimum_alignment and
+	force_minimum_alignment.
+
+	* libcoff.h: Regenerated.
+
+	* pei-ia64.c (PEI_TARGET_SUBSYSTEM): Removed.
+	(PEI_FORCE_MINIMUM_ALIGNMENT): Likewise.
+
+	* peicode.h (pe_mkobject): Don't set force_minimum_alignment
+	nor target_subsystem.
+
+	* peXXigen.c (_bfd_XXi_swap_aouthdr_out): Don't check
+	force_minimum_alignment nor target_subsystem.
+
+2009-04-21  Kai Tietz  <kai.tietz@onevision.com>
+
+	* coff-x86_64.c (PEI_HEADERS): Protect includes.
+	(bfd_pe_print_pdata): Remove #ifdef PE variation.
+	* pei-x86_64.c (PEI_HEADERS): Define to prevent double
+	include in coff-x86_64.c of headers.
+	(PDATA_ROW_SIZE): New define.
+	(pex_regs[]): New static array.
+	(pex64_get_runtime_function): New static function.
+	(pex64_get_unwind_info): Likewise.
+	(pex64_get_scope_entry): Likewise.
+	(pex64_xdata_print_uwd_codes): Likewise.
+	(pex64_get_section_by_rva): Likewise.
+	(pex64_dump_xdata): Likewise.
+	(pex64_bfd_print_pdata): Likewise.
+	(bfd_pe_print_pdata): Define as pex64_bfd_print_pdata.
+	* peXXigen.c (_bfd_pex64_print_pdata): Removed implementation.
+	* libpei.h (_bfd_pex64_print_pdata): Removed declaration.
+
+2009-04-19  Peter O'Gorman  <binutils@mlists.thewrittenword.com>
+	    Alan Modra  <amodra@bigpond.net.au>
+	    Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* peXXigen.c (_bfd_XXi_swap_sym_in): Fix name handling w.r.t
+	long names and non-NUL-terminated strings.
+
+2009-04-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfd-in2.h: Regenerated.
+
+2009-04-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* peXXigen.c (_bfd_XX_print_private_bfd_data_common): Replace
+	IMAGE_SUBSYSTEM_EFI_ROM with IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER.
+
+2009-04-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/10074
+	* coffcode.h (bfd_pei_p): New.
+
+	* config.bfd: Remove bfd_efi_bsdrv_ia32_vec,
+	bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
+	bfd_efi_rtdrv_x86_64_vec, bfd_efi_bsdrv_ia64_vec and
+	bfd_efi_rtdrv_ia64_vec.  Replace bfd_efi_app_ia32_vec,
+	bfd_efi_app_x86_64_vec and bfd_efi_app_ia64_vec with
+	i386pei_vec, x86_64pei_vec and bfd_pei_ia64_vec, respectively.
+
+	* configure.in: Remove bfd_efi_bsdrv_ia32_vec,
+	bfd_efi_rtdrv_ia32_vec, bfd_efi_bsdrv_x86_64_vec,
+	bfd_efi_rtdrv_x86_64_vec,
+	bfd_efi_bsdrv_ia64_vec and bfd_efi_rtdrv_ia64_vec.  Replace
+	bfd_efi_ia64_vec with bfd_pei_ia64_vec.
+	* targets.c: Likewise.
+
+	* configure: Regenerated.
+	* libcoff.h: Likewise.
+	* Makefile.in: Likewise.
+
+	* efi-app-ia32.c: Removed.
+	* efi-app-x86_64.c: Likewise.
+	* efi-bsdrv-ia32.c: Likewise.
+	* efi-bsdrv-ia64.c: Likewise.
+	* efi-bsdrv-x86_64.c: Likewise.
+	* efi-rtdrv-ia32.c: Likewise.
+	* efi-rtdrv-ia64.c: Likewise.
+	* efi-rtdrv-x86_64.c: Likewise.
+	* efi-rtdrv-ia32.c: Likewise.
+
+	* efi-app-ia64.c: Moved to ...
+	* pei-ia64.c: This.
+	(TARGET_SYM): Set to bfd_pei_ia64_vec.
+	(TARGET_NAME): Set to pei-ia64.
+
+	* libpei.h (bfd_target_pei_p): Removed.
+	(bfd_target_pei_arch): Likewise.
+	(bfd_target_efi_app_p): Likewise.
+	(bfd_target_efi_app_arch): Likewise.
+	(bfd_target_efi_bsdrv_p): Likewise.
+	(bfd_target_efi_bsdrv_arch): Likewise.
+	(bfd_target_efi_rtdrv_p): Likewise.
+	(bfd_target_efi_rtdrv_arch): Likewise.
+	(bfd_pe_executable_p): Likewise.
+
+	* Makefile.am (BFD32_BACKENDS): Remove efi-app-ia32.lo,
+	efi-bsdrv-ia32.lo and efi-rtdrv-ia32.lo.
+	(BFD32_BACKENDS_CFILES): Remove efi-app-ia32.c, efi-bsdrv-ia32.c
+	and efi-rtdrv-ia32.c.
+	(BFD64_BACKENDS): Remove efi-app-ia64.lo, efi-bsdrv-ia64.lo,
+	efi-rtdrv-ia64.lo, efi-app-x86_64.lo, efi-bsdrv-x86_64.lo and
+	efi-rtdrv-x86_64.lo. Add pei-ia64.lo.
+	(BFD64_BACKENDS_CFILES): Remove efi-app-ia64.c, efi-bsdrv-ia64.c,
+	efi-rtdrv-ia64.c, efi-app-x86_64.c, efi-bsdrv-x86_64.c and
+	efi-rtdrv-x86_64.c. Add pei-ia64.c.
+	(efi-app-ia64.lo): Removed.
+	(efi-bsdrv-ia32.lo): Likewise.
+	(efi-rtdrv-ia32.lo): Likewise.
+	(efi-app-ia64.lo): Likewise.
+	(efi-bsdrv-ia64.lo): Likewise.
+	(efi-rtdrv-ia64.lo): Likewise.
+	(efi-app-x86_64.lo): Likewise.
+	(efi-bsdrv-x86_64.lo): Likewise.
+	(efi-rtdrv-x86_64.lo): Likewise.
+	(pei-ia64.lo): New.
+
+	* peicode.h (coff_swap_scnhdr_in): Replace bfd_pe_executable_p
+	with bfd_pei_p.
+	(arch_type): Removed.
+	(pe_arch): Likewise.
+	(pe_bfd_object_p): Just return coff_object_p.
+
+	* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Replace
+	bfd_pe_executable_p with bfd_pei_p.
+
+2009-04-17  Christophe Lyon  <christophe.lyon@st.com>
+
+	* elf32-arm.c (elf32_arm_size_stubs): Handle long branches through
+	PLT entries to an undefined symbol when generating a shared
+	library.
+
+2009-04-17  Nick Clifton  <nickc@redhat.com>
+
+	PR 9909
+	* coffcode.h (handle_COMDAT): Allow for external COMDAT symbols.
+
+2009-04-16  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* aout-adobe.c (aout_32_bfd_define_common_symbol): Define.
+	* aout-target.h (MY_bfd_define_common_symbol): Likewise.
+	* aout-tic30.c (MY_bfd_define_common_symbol): Likewise.
+	* binary.c (binary_bfd_define_common_symbol): Likewise.
+	* bout.c (b_out_bfd_define_common_symbol): Likewise.
+	* coff-alpha.c (_bfd_ecoff_bfd_define_common_symbol): Likewise.
+	* coff-mips.c (_bfd_ecoff_bfd_define_common_symbol): Likewise.
+	* coffcode.h (coff_bfd_define_common_symbol): Likewise.
+	* elfxx-target.h (bfd_elfNN_bfd_define_common_symbol): Likewise.
+	* i386msdos.c (msdos_bfd_define_common_symbol): Likewise.
+	* i386os9k.c (os9k_bfd_define_common_symbol): Likewise.
+	* ieee.c (ieee_bfd_define_common_symbol): Likewise.
+	* ihex.c (ihex_bfd_define_common_symbol): Likewise.
+	* libbfd-in.h (_bfd_nolink_bfd_define_common_symbol): Likewise.
+	* mach-o.c (bfd_mach_o_bfd_define_common_symbol): Likewise.
+	* mmo.c (mmo_bfd_define_common_symbol): Likewise.
+	* nlm-target.h (nlm_bfd_define_common_symbol): Likewise.
+	* oasys.c (oasys_bfd_define_common_symbol): Likewise.
+	* pef.c (bfd_pef_bfd_define_common_symbol): Likewise.
+	* ppcboot.c (ppcboot_bfd_define_common_symbol): Likewise.
+	* som.c (som_bfd_define_common_symbol): Likewise.
+	* srec.c (srec_bfd_define_common_symbol): Likewise.
+	* tekhex.c (tekhex_bfd_define_common_symbol): Likewise.
+	* versados.c (versados_bfd_define_common_symbol): Likewise.
+	* vms.c (vms_bfd_define_common_symbol): Likewise.
+	* xcoff-target.h (_bfd_xcoff_bfd_define_common_symbol): Likewise.
+	* xsym.c (bfd_sym_bfd_define_common_symbol): Likewise.
+	* coff-rs6000.c (rs6000coff_vec): Add _bfd_xcoff_define_common_symbol.
+	(pmac_xcoff_vec): Likewise.
+	* coff64-rs6000.c (rs6000coff64_vec): Likewise.
+	(aix5coff64_vec): Likewise.
+	* linker.c (bfd_generic_define_common_symbol): New function.
+	* targets.c (BFD_JUMP_TABLE_LINK): Add NAME##_bfd_define_common_symbol.
+	(_bfd_define_common_symbol): New field.
+	* libcoff-in.h (_bfd_xcoff_define_common_symbol): Declare.
+	* xcofflink.c (_bfd_xcoff_define_common_symbol): New function.
+	(xcoff_build_ldsyms): Don't set XCOFF_DEF_REGULAR for common
+	symbols here.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Likewise.
+	* libcoff.h: Likewise.
+
+2009-04-15  Anthony Green  <green@moxielogic.com>
+
+	* targets.c: Add moxie support.
+	* Makefile.am: Ditto.
+	* Makefile.in: Rebuilt.
+	* cpu-moxie.c, elf32-moxie.c: New files.
+	* archures.c: Add moxie support.
+	* configure.in: Add moxie support.
+	* configure: Rebuilt.
+	* config.bfd, archures.c: Add moxie support.
+	* bfd-in2.h: Rebuilt.
+
+2009-04-15  Christophe Lyon  <christophe.lyon@st.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate): Don't convert ARM
+	branch to an undef weak symbol into a jump to next instruction if
+	a PLT entry will be created.
+
+2009-04-14  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* coffgen.c (make_a_section_from_file):  Set the backend long
+	section names enable if long section names found on input.
+	* coffcode.h:  Extend long section names documentation to match.
+
+2009-04-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (elf_link_add_object_symbols): Warn alternate ELF
+	machine code.
+
+2009-04-07  DJ Delorie  <dj@redhat.com>
+
+	* archures.c: Add bfd_mach_mep_c5.
+	* bfd-in2.h: Likewise.
+	* cpu-mep.c: Add bfd_c5_arch.
+	* elf32-mep.c: Support it.
+
+2009-04-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (_bfd_elf_section_already_linked): Add `\n' for
+	info->callbacks->einfo.
+	* linker.c (_bfd_generic_section_already_linked): Likewise.
+
+2009-04-06  DJ Delorie  <dj@redhat.com>
+
+	* elf32-h8300.c (elf32_h8_relax_section): Relax MOVA opcodes.
+
+2009-04-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* coff-x86_64.c (bfd_pe_print_pdata): Defined to
+	_bfd_pex64_print_pdata only if PE is defined.
+
+	* libpei.h (_bfd_pep_print_x64_pdata): Renamed to ...
+	(_bfd_pex64_print_pdata): This.
+
+	* peXXigen.c (_bfd_pep_print_x64_pdata): Renamed to ...
+	(_bfd_pex64_print_pdata): This.  Defined only if COFF_WITH_pex64
+	is defined.
+
+2009-04-05  Kai Tietz  <kai.tietz@onevision.com>
+
+	* coff-x86_64.c (bfd_pe_print_pdata): Define as
+	_bfd_pep_print_x64_pdata.
+	* libpei.h (_bfd_pep_print_x64_pdata): Add prototype.
+	* peXXigen.c (_bfd_pep_print_x64_pdata): New.
+
+2009-04-02  Sterling Augustine  <sterling@jaw.hq.tensilica.com>
+
+	* elf32-xtensa.c (relax_property_section): Always set r_offset
+	to zero.
+
+2009-04-02  Christophe Lyon  <christophe.lyon@st.com>
+
+	* elf32-arm.c (elf32_arm_stub_long_branch_v4t_thumb_thumb,
+	elf32_arm_stub_long_branch_v4t_thumb_thumb_pic): Two new long
+	branch stubs.
+	(elf32_arm_stub_type): New enum values for the two new stubs.
+	(arm_type_of_stub): Make use of the two new stubs.
+	(arm_size_one_stub): Handle the two new stubs.
+
+2009-04-01  Matt Thomas  <matt@netbsd.org>
+
+	* elf32-vax.c (elf_vax_check_relocs): Do not put relocations against
+	hidden symbols into the GOT or PLT.GOT.
+	(elf_vax_relocate_section): Do not emit a PCREL reloc
+	into a shared object if it is against a hidden symbol.
+
+2009-04-01  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* xcofflink.c (xcoff_archive_info): Add contains_shared_object_p
+	and know_contains_shared_object_p.
+	(xcoff_archive_contains_shared_object_p): Add an "info" parameter.
+	Cache the result in the archive_info table.
+	(xcoff_auto_export_p): Add an "info" parameter and update the
+	call to xcoff_archive_contains_shared_object_p.
+	(xcoff_mark_auto_exports): Update accordingly.
+	(xcoff_post_gc_symbol): Likewise.
+
+2009-04-01  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* xcofflink.c (bfd_link_input_bfd): Treat __rtinit as C_HIDEXT
+	rather than C_EXT.
+
+2009-04-01  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* coff-rs6000.c (member_layout): New structure.
+	(archive_iterator): Likewise.
+	(member_layout_init): New function.
+	(archive_iterator_begin): Likewise.
+	(archive_iterator_next): Likewise.
+	(xcoff_write_armap_old): Use the new iterator functions.
+	(do_shared_object_padding): Delete.
+	(xcoff_write_armap_big): Use the new iterator functions.  Simplify
+	handling of arch_info.
+	(xcoff_write_archive_contents_old): Allocate arelt_data in the
+	first loop rather than the second.  Allocate a member header if
+	there isn't one, then work out the stat information and length
+	in the first loop too.  Use the new iterators for the second loop.
+	(xcoff_write_archive_contents_big): Likewise.
+
+2009-04-01  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* bfd-in.h (bfd_xcoff_split_import_path): Declare.
+	(bfd_xcoff_set_archive_import_path): Likewise.
+	* bfd-in2.h: Regenerate.
+	* xcofflink.c: Include libiberty.h.
+	(xcoff_archive_info): New structure.
+	(xcoff_archive_info_hash): New function.
+	(xcoff_archive_info_eq): Likewise.
+	(xcoff_get_archive_info): Likewise.
+	(_bfd_xcoff_bfd_link_hash_table_create): Initialize archive_info.
+	(bfd_xcoff_split_import_path): New function.
+	(bfd_xcoff_set_archive_import_path): Likewise.
+	(xcoff_set_import_path): Move earlier in file.
+	(xcoff_link_add_dynamic_symbols): Set the import path of a non-archive
+	object to the the directory part of the bfd's filename.  Get the
+	import path and filename of an archive object from the archive's
+	xcoff_tdata, initializing it if necessary.  Update use of
+	import_file_id.
+	(bfd_link_input_bfd): Update use of import_file_id.
+	(xcoff_write_global_symbol): Likewise.
+
+2009-04-01  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* xcofflink.c (xcoff_link_hash_table): Moved from include/coff/xcoff.h.
+
+2009-04-01  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* xcofflink.c (xcoff_link_create_extra_sections): Don't create
+	a .loader section for relocatable links.
+	(xcoff_need_ldrel_p): New function.
+	(xcoff_mark): Use it.
+	(bfd_xcoff_link_count_reloc): Only count loader relocs if there's
+	a loader section.
+	(xcoff_build_ldsym): New function, split out from...
+	(xcoff_build_ldsyms): ...here.  Rename to...
+	(xcoff_post_gc_symbol): ...this.  Only export symbols, and only
+	call xcoff_build_ldsym, if there's a loader section.
+	(xcoff_build_loader_section): New function, extracted verbatim from...
+	(bfd_xcoff_size_dynamic_sections): ...here.  Only call it if
+	there's a loader section.  Only add an __rtinit loader symbol
+	if there's a loader section.  Update after above name change.
+	(xcoff_symbol_section, xcoff_create_ldrel): New functions.
+	(bfd_link_input_bfd): Use xcoff_need_ldrel_p, xcoff_symbol_section
+	and xcoff_create_ldrel.
+	(xcoff_write_global_symbol): Use xcoff_create_ldrel.
+	(xcoff_reloc_link_order): Likewise, but only call it if there's
+	a loader section.  Use xcoff_symbol_section.
+	(_bfd_xcoff_bfd_final_link): Only use fdinfo.ldrel and fdinfo.ldsym
+	if there's a loader section.
+
+2009-04-01  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* xcofflink.c (bfd_link_input_bfd): Fix buffer overrun.
+
+2009-04-01  Christophe Lyon  <christophe.lyon@st.com>
+
+	* elf32-arm.c (group_sections): Rewrite loops for better
+	readability.
+
+2009-03-30  DJ Delorie  <dj@redhat.com>
+
+	* elflink.c (elf_link_input_bfd): Don't try to resolve complex
+	relocs when doing a relocatable link.
+
+2009-03-28  Mark Mitchell  <mark@codesourcery.com>
+
+	* coff-arm.c (coff_arm_merge_private_bfd_data): Use "error:", not
+	"ERROR:", in error messages.
+	* cpu-arm.c (bfd_arm_merge_machines): Likewise.
+	* elf-attrs.c (_bfd_elf_merge_object_attributes): Likewise.
+	* elf32-arm.c (tag_cpu_arch_combine): Likewise.
+	(elf32_arm_merge_eabi_attributes): Likewise.
+	(elf32_arm_merge_private_bfd_data): Likewise.
+
+2009-03-27  Nick Clifton  <nickc@redhat.com>
+
+	* section.c (bfd_get_section_contents): Detect and handle the case
+	where a section has the SEC_IN_MEMORY flag set but no actual
+	contents allocated.
+
+2009-03-26  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 6494
+	* elf.c (copy_elf_program_header): Do not check that PT_GNU_RELRO
+	p_filesz and p_memsz are equal.  Use p_memsz as the segment size.
+	(assign_file_positions_for_non_load_sections): Zap PT_GNU_RELRO
+	if we don't find matching PT_LOAD when copying.
+
+2009-03-25  M R Swami Reddy <MR.Swami.Reddy@nsc.com>
+
+	* elf32-crx.c (crx_elf_howto_table): Zero the src_mask field of
+	the reloc descriptions.
+
+2009-03-25  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (cris_elf_relocate_section) <case R_CRIS_32_GD>
+	<R_CRIS_16_GOT_GD, case R_CRIS_32_GOT_GD>: Handle COMMON symbols.
+	<case R_CRIS_16_TPREL, R_CRIS_32_TPREL>: Ditto.
+
+2009-03-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* cpu-i386.c (bfd_x86_64_arch_intel_syntax): Make it static.
+	(bfd_i386_arch_intel_syntax): Likewise.
+	(i8086_arch): Likewise.
+	(bfd_x86_64_arch): Likewise.
+
+2009-03-24  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (cris_elf_relocate_section): <case
+	R_CRIS_16_DTPREL, R_CRIS_32_DTPREL>: Allow use of non-local
+	symbols for non-allocated sections.  Don't check whether to
+	generate R_CRIS_DTPMOD for non-allocated sections.
+	(cris_elf_gc_sweep_hook) <case R_CRIS_32_DTPREL>: Don't
+	handle relocation GC:ing if applied to non-allocated section.
+	(cris_elf_check_relocs): Similar.
+
+	* elf32-cris.c (cris_elf_relocate_section) <case R_CRIS_32_GD>
+	<R_CRIS_16_GOT_GD, R_CRIS_32_GOT_GD>: Don't include the TLS size
+	when emitting a known TP offset in the GOT.
+
+2009-03-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (synthetic_opd): Delete.
+	(compare_symbols): Look for .opd name rather than section match.
+	(ppc64_elf_get_synthetic_symtab): Likewise.
+
+2009-03-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-ppc.c (is_pic_glink_stub): Delete.
+	(is_nonpic_glink_stub): New function.
+	(ppc_elf_get_synthetic_symtab): Check for last non-pic stub rather
+	than first pic one.
+	(struct ppc_elf_link_hash_table <glink_pltresolve>): Comment fix.
+
+2009-03-20  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+	    Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* elf32-s390.c (elf_s390_check_relocs): Use the SYMBOL_*
+	macros for visibilty and locality checks.
+	(elf_s390_adjust_dynamic_symbol): Likewise.
+	(allocate_dynrelocs): Likewise.
+	(elf_s390_relocate_section): Likewise.
+	(elf_s390_finish_dynamic_symbol): Likewise.
+	* elf64-s390.c (elf_s390_check_relocs): Likewise.
+	(elf_s390_adjust_dynamic_symbol): Likewise.
+	(allocate_dynrelocs): Likewise.
+	(elf_s390_relocate_section): Likewise.
+	(elf_s390_finish_dynamic_symbol): Likewise.
+
+2009-03-19  Kai Tietz  <kai.tietz@onevision.com>
+
+	* bfd-in2.h: Regenerated.
+	* coffcode.h (sec_to_styp_flags): For pe-coff add SEC_READONLY
+	for debugging sections and map memory read/write dependent on
+	SEC_COFF_NOREAD.
+	(styp_to_sec_flags): Set SEC_COFF_NOREAD for sections
+	without memory read flags set.
+	* section.c: Add SEC_COFF_NOREAD to section flags.
+
+2009-03-19  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* elf32-hppa.c (final_link_relocate): Cast bfd_vma values to long
+	for format string.
+
+2009-03-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_find_overlays): Separate error return from
+	"no overlays" return.  If there are overlays, create overlay
+	manager entry symbols here, so that..
+	(spu_elf_build_stubs): ..we don't need to set them up here.
+	Simplify entry symbol tests.
+	* elf32-spu.h (spu_elf_find_overlays): Update prototype.
+
+2009-03-18  Mark Kettenis  <kettenis@gnu.org>
+
+	* elf.c (elfcore_grok_openbsd_procinfo)
+	(elfcore_grok_openbsd_note): New functions.
+	(elf_parse_notes): Handle notes from OpenBSD ELF core files.
+
+2009-03-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* vms-hdr.c: Don't include alloca.h.
+	* elf32-m68hc1x.c: Include alloca-conf.h.
+	* xsym.c: Likewise.
+	* elf64-hppa.c: Likewise.  Remove existing #if's handling alloca.
+	* som.c: Likewise.
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2009-03-17  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_check_relocs): Correct symbian_p test.
+
+2009-03-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.h (struct spu_elf_params): ovly_flavour now only 1 bit.
+	Add compact_stub.
+	(emum _ovly_flavour): Delete ovly_compact, ovly_none.
+	* elf32-spu.c (struct spu_link_hash_table): Replace ovly_load and
+	ovly_return fields with ovly_entry[2].  Adjust all users.
+	(spu_elf_find_overlays): Set ovly_entry[1] from __icache_call_handler
+	when soft-icache.
+	(spu_elf_build_stubs): Likewise.
+	(ovl_stub_size): Change arg to spu_elf_params pointer.  Adjust for
+	ovly_flavour changes.  Update all callers.
+	(ovl_stub_size_log2): New function.
+	(build_stub): Handle compact icache stubs.  Use different manager
+	entry point for stubs in non-icache area.
+	(spu_elf_size_stubs): Don't allocate space for indirect branch
+	descriptors.
+	(spu_elf_build_stubs): And don't built them.
+
+2009-03-16  Andrew Stubbs  <ams@codesourcery.com>
+
+	* dwarf2.c (read_section): Always use rawsize, if available.
+
+2009-03-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* simple.c (bfd_simple_get_relocated_section_contents): Use larger
+	of rawsize and size for buffer.
+
+2009-03-15  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* elf32-spu.c (spu_elf_check_vma): Do not reset auto_overlay
+	parameter just because fixed sections fit into local store.
+	(spu_elf_auto_overlay): Do not declare as "noreturn".  Skip
+	generating overlays if fixed sections plus reserved stack
+	and heap space fit into local store.
+
+2009-03-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (build_stub): Correct icache set_id.
+	(spu_elf_relocate_section): Likewise.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* xcofflink.c (xcoff_link_check_archive_element): Only free the
+	symbol table if it was created by the current call.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* xcofflink.c (xcoff_build_ldsyms): Give imported descriptors
+	class XMC_DS rather than XMC_UA.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* bfd-in.h (bfd_xcoff_size_dynamic_sections): Replace the
+	bfd_boolean export_defineds parameter with an unsigned int
+	auto_export_flags parameter.
+	* bfd-in2.h: Regenerate.
+	* xcofflink.c (xcoff_archive_contains_shared_object_p): New function,
+	split out from xcoff_build_ldsyms.
+	(xcoff_covered_by_expall_p): New function.
+	(xcoff_auto_export_p): New function, split out from xcoff_build_ldsyms
+	but with extra code to handle -bexpfull and -bexpall.
+	(xcoff_mark_auto_exports): New function.
+	(xcoff_build_ldsyms): Use xcoff_auto_export_p to decide whether
+	a function should be automatically exported.
+	(bfd_xcoff_size_dynamic_sections): Replace the export_defineds
+	parameter with an auto_export_flags parameter.  Update ldinfo
+	accordingly.  Use xcoff_mark_auto_exports to mark all automatically-
+	exported symbols.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* xcofflink.c (xcoff_mark_symbol_by_name): New function.
+	(bfd_xcoff_size_dynamic_sections): Use it to mark the entry,
+	init and fini functions.  Do garbage collection for objects
+	without an entry point too.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* coffcode.h (coff_pointerize_aux_hook): Update CSECT_SYM_P to
+	check whether a symbol has csect information.
+	(coff_print_aux): Likewise.
+	* coff-rs6000.c (_bfd_xcoff_swap_aux_in): Handle auxillary csect
+	information for C_AIX_WEAKEXT too.
+	(_bfd_xcoff_swap_aux_out): Likewise.
+	(xcoff_reloc_type_br): Handle defweak symbols too.
+	* coff64-rs6000.c (_bfd_xcoff64_swap_aux_in): Handle auxillary csect
+	information for C_AIX_WEAKEXT too.
+	(_bfd_xcoff64_swap_aux_out): Likewise.
+	(xcoff64_reloc_type_br): Handle defweak symbols too.
+	* coffgen.c (coff_print_symbol): Handle auxillary function
+	information for C_AIX_WEAKEXT too.
+	* xcofflink.c (_bfd_xcoff_canonicalize_dynamic_symtab): Set BSF_WEAK
+	instead of BSF_GLOBAL if the L_WEAK flag is set.
+	(xcoff_dynamic_definition_p): New function.
+	(xcoff_link_add_dynamic_symbols): Use it to decide whether ldsym
+	defines h.  Don't change h if ldsym isn't the definition.  Otherwise,
+	always take the symbol class from the ldsym.  Use weak bfd symbol
+	types for weak ldsyms.
+	(xcoff_link_add_symbols): Use CSECT_SYM_P and EXTERN_SYM_P.
+	Fix the check for whether a definition is from a shared object.
+	Allow redefinitions of weak symbols.
+	(xcoff_link_check_ar_symbols): Use EXTERN_SYM_P.
+	(xcoff_keep_symbol_p): Likewise.
+	(bfd_xcoff_size_dynamic_sections): Use CSECT_SYM_P.
+	(xcoff_link_input_bfd): Use CSECT_SYM_P and EXTERN_SYM_P.
+	Add .loader entries for C_AIX_WEAKEXT as well as C_EXT symbols,
+	but mark them as L_WEAK.
+	(xcoff_write_global_symbol): Treat weak symbols as C_AIX_WEAKEXT
+	instead of C_EXT if C_AIX_WEAKEXT == C_WEAKEXT.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* xcofflink.c (xcoff_mark): When walking the relocations,
+	only mark the target symbol or the target section, not both.
+	(xcoff_final_definition_p): New function.
+	(xcoff_keep_symbol_p): Use it to check whether an external XCOFF
+	symbol is a valid definition of the associated output symbol.
+	Use XCOFF_ALLOCATED to stop the same hash table entry having
+	two output symbols.
+	(bfd_xcoff_size_dynamic_sections): Set XCOFF_ALLOCATED when
+	keeping a symbol.
+	(xcoff_link_input_bfd): Use xcoff_final_definition_p.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* xcofflink.c (bfd_xcoff_import_symbol): Treat imported absolute
+	symbols as XMC_XO.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* libcoff-in.h (xcoff_tdata): Add a lineno_counts field.
+	* libcoff.h: Regenerate.
+	* xcofflink.c (xcoff_link_add_symbols): Record per-symbol
+	line-number counts in the bfd's lineno_counts field.
+	Don't keep per-csect line-number counts.
+	(xcoff_sweep): Don't update per-csect line-number counts.
+	(bfd_xcoff_size_dynamic_sections): Count the number of line-number
+	entries in each output section.
+	(xcoff_link_input_bfd): Get the number of line numbers from
+	the bfd's lineno_counts field, rather than recalculating it
+	from scratch.  Fix the range check when updating C_BINCL and
+	C_EINCL symbols.
+	(_bfd_xcoff_bfd_final_link): Don't count the output line numbers
+	here.  Don't expect csects to have line-number counts.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* libcoff-in.h (xcoff_tdata): Change debug_indices to a signed long.
+	* libcoff.h: Regenerate.
+	* xcofflink.c (xcoff_keep_symbol_p): New function, using the
+	"skip" logic from xcoff_link_input_bfd.
+	(bfd_xcoff_size_dynamic_sections): Explicitly skip dynamic
+	objects in a dynamic link, rather than checking whether csectpp
+	is null.  Always allocate debug_index for other objects,
+	and always go through the loop.  Update the type of debug_index
+	after the change above.  Read the auxillary csect information
+	and use xcoff_keep_symbol_p to decide whether a symbol should
+	be kept.  Set its debug_index to -2 if not.
+	(xcoff_link_input_bfd): Update the type of debug_index after
+	the change above and always expect it to be nonnull.  Use it to
+	test whether a symbol should be stripped, rather than making the
+	decision here.  Postpone all symbol creation to the second pass.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* xcofflink.c: (xcoff_mark_symbol): Mark the TOC section when
+	creating a descriptor.
+	(xcoff_sweep): Don't mark toc_section unless it's needed.
+	(bfd_xcoff_size_dynamic_sections): Skip the toc_section
+	when marking every bfd.
+	(xcoff_link_input_bfd): Skip all TOC anchors.
+	(xcoff_toc_section_p, xcoff_find_tc0): New functions.
+	(_bfd_xcoff_bfd_final_link): Don't set the output bfd's TOC anchor
+	to -1; call xcoff_find_tc0 instead.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* libcoff-in.h (xcoff_section_tdata): Update commentary.
+	* libcoff.h: Regenerate.
+	* xcofflink.c (xcoff_link_add_symbols): Set the csect of XTY_ER
+	symbols to bfd_und_section_ptr or bfd_abs_section_ptr, rather than
+	the previous symbol's csect.  Treat last_symndx as an inclusive value
+	and simplify its handling.
+	(xcoff_mark): Treat last_symndx as an inclusive value.  Only mark
+	symbols with the right csect.  Don't mark rsec when processing
+	relocations against undefined or absolute sections.
+	(bfd_xcoff_size_dynamic_sections): Don't check the SEC_MARK flag
+	of bfd_und_section_ptr.
+	(xcoff_link_input_bfd): Likewise.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* coff-rs6000.c (xcoff_ppc_relocate_section): Report relocations
+	against undefined symbols if the symbol's XCOFF_WAS_UNDEFINED
+	flag is set.  Assert that all undefined symbols are either
+	imported or defined by a dynamic object.
+	* coff64-rs6000.c (xcoff64_ppc_relocate_section): Likewise.
+	* xcofflink.c (xcoff_link_add_symbols): Extend function-symbol
+	handling to all relocations.  Only set XCOFF_CALLED for function
+	symbols.
+	(xcoff_find_function): New function, split out from...
+	(bfd_xcoff_export_symbol) ...here.
+	(xcoff_set_import_path): New function, split out from...
+	(bfd_xcoff_import_symbol): ...here.  Remove assertion for old
+	meaning of XCOFF_CALLED.
+	(xcoff_mark_symbol): If we mark an undefined and unimported
+	symbol, find some way of defining it.  If the symbol is a function
+	descriptor, fill in its definition automatically.  If the symbol
+	is a function, mark its descriptor and allocate room for global
+	linkage code.  Otherwise mark the symbol as implicitly imported.
+	Move the code for creating function descriptors from...
+	(xcoff_build_ldsyms): ...here.  Use XCOFF_WAS_UNDEFINED to
+	check for symbols that were implicitly defined.
+	(xcoff_mark): Don't count any dynamic relocations against
+	function symbols.
+	(bfd_xcoff_size_dynamic_sections): Save the rtld parameter
+	in the xcoff link info.
+	(xcoff_link_input_bfd): Remove handling of undefined and
+	unexported symbols.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* coff-rs6000.c (xcoff_reloc_type_br): Make the branch absolute
+	if the target is absolute.  Fix comment typo.
+	(xcoff_ppc_relocate_section): Remove FIXME.
+	* coff64-rs6000.c (xcoff64_reloc_type_br): Make the branch absolute
+	if the target is absolute.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* xcofflink.c (xcoff_mark, xcoff_link_input_bfd): Don't copy
+	R_POS and R_NEG relocations against absolute symbols to the
+	.loader section.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* coff64-rs6000.c (xcoff64_write_object_contents): Set the cputype
+	to 2 for bfd_mach_ppc_620.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* config.bfd: Treat AIX 6+ in the same way as AIX 5.
+	* configure.in: Likewise.
+	* configure: Regenerate.
+
+2009-03-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/9945
+	* elf.c (assign_section_numbers): Generate symbol table if there
+	is any relocation in output.
+	(_bfd_elf_compute_section_file_positions): Likewise.
+
+2009-03-13  Nick Clifton  <nickc@redhat.com>
+
+	PR 9934
+	* elf-bfd.h (NUM_SHDR_ENTRIES): Cope with an empty section.
+	* elflink.c (elf_link_read_relocs_from_section): Use
+	NUM_SHDR_ENTRIES.  Gracefully handle the case where there are
+	relocs but no symbol table.
+	* elf32-arm.c (elf32_arm_check_relocs): Likewise.
+
+2009-03-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/9938
+	* elf32-i386.c (elf_i386_check_tls_transition): Use strncmp
+	to check ___tls_get_addr.
+
+	* elf64-x86-64.c (elf64_x86_64_check_tls_transition): Use
+	strncmp to check __tls_get_addr.
+
+2009-03-12  Andrew Stubbs  <ams@codesourcery.com>
+
+	* dwarf2.c (read_section): Always check the offset, even when the
+	section has been read before.
+
+2009-03-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_check_tls_transition): Fix a typo in
+	comments.
+
+2009-03-11  Chris Demetriou  <cgd@google.com>
+
+	* bfd.c (BFD_DETERMINISTIC_OUTPUT): New flag.
+	* bfd-in2.h: Regenerate.
+	* archive.c (bfd_ar_hdr_from_filesystem): If BFD_DETERMINISTIC_OUTPUT
+	flag is set, use 0 for uid, gid, and timestamp, and use 0644 for file
+	mode.
+	(bsd_write_armap): Likewise.
+	(_bfd_archive_bsd_update_armap_timestamp): If BFD_DETERMINISTIC_OUTPUT
+	flag is set, do nothing.
+	(coff_write_armap): If BFD_DETERMINISTIC_OUTPUT flag is set, use 0
+	for timestamp.
+
+2009-03-11  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* elf32-spu.c (find_function_stack_adjust): Handle sf instruction
+	used to update stack pointer.
+
+2009-03-07  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR binutils/9921
+	* som.c (som_bfd_derive_misc_symbol_info): Set symbol type ST_ABSOLUTE
+	for unknown symbols in absolute section.
+
+2009-03-06  Nick Clifton  <nickc@redhat.com>
+
+	* po/es.po: Updated Spanish translation.
+
+2009-03-05  Christophe Lyon  <christophe.lyon@st.com>
+
+	* elf32-arm.c (group_sections): Take next section size into
+	account before accepting to group it.
+
+2009-03-05  Christophe Lyon  <christophe.lyon@st.com>
+
+	* elf32-arm.c (arm_type_of_stub): Handle long branches targetting
+	PLT entries.
+	(elf32_arm_final_link_relocate): Likewise.
+
+2009-03-05  Moritz Kroll  <Moritz.Kroll@gmx.de>
+
+	PR 9923
+	* peXXigen.c (_bfd_XXi_final_link_postscript): Check h->root.type.
+
+2009-03-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* reloc.c (BFD_RELOC_PPC_TLSGD, BFD_RELOC_PPC_TLSLD): New.
+	* section.c (struct bfd_section): Add has_tls_get_addr_call.
+	(BFD_FAKE_SECTION): Init new flag.
+	* ecoff.c (bfd_debug_section): Likewise.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* elf32-ppc.c (ppc_elf_howto_raw): Add R_PPC_TLSGD and R_PPC_TLSLD.
+	(ppc_elf_reloc_type_lookup): Handle new relocs.
+	(ppc_elf_check_relocs): Set has_tls_get_addr_call on finding such
+	without marker relocs.
+	(ppc_elf_tls_optimize): Allow out-of-order __tls_get_addr relocs
+	if section has no old-style calls.
+	(ppc_elf_relocate_section): Set tls_mask for non-tls relocs too.
+	Don't try to optimize new-style __tls_get_addr call when handling
+	arg setup relocs.  Instead do so for R_PPC_TLSGD and R_PPC_TLSLD
+	relocs.
+	* elf64-ppc.c (ppc64_elf_howto_raw): Add R_PPC64_TLSGD, R_PPC64_TLSLD.
+	(ppc64_elf_reloc_type_lookup): Handle new relocs.
+	(ppc64_elf_check_relocs): Set has_tls_get_addr_call on finding such
+	without marker relocs.
+	(ppc64_elf_tls_optimize): Allow out-of-order __tls_get_addr relocs
+	if section has no old-style calls.  Set toc_ref for new relocs as
+	appropriate.
+	(ppc64_elf_relocate_section): Set tls_mask for non-tls relocs too.
+	Don't try to optimize new-style __tls_get_addr call when handling
+	arg setup relocs.  Instead do so for R_PPC_TLSGD and R_PPC_TLSLD
+	relocs.
+
+2009-03-04  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 6768
+	* configure.in: Test for ld --as-needed support.  Link shared
+	libbfd against libm.
+	* configure: Regenerate.
+
+2009-03-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2009-03-02  Qinwei  <qinwei@sunnorth.com.cn>
+
+	* elf32-score7.c: New file.
+	* elf32-score.h: New file.
+	* elf32-score.c: Add code to support score 7.  Set score7 as the
+	default.
+	* cpu-score.c: Add score7 architecure.
+	(compatibile): New function.
+	* Makefile.am: Add rules for building elf32-score7 object.
+	* Makefile.in: Regenerate.
+	* configure.in: Add elf32-score7 object to score vectors.
+	* configure: Regenerate.
+	* reloc.c: Add score7 relocs.
+	* archures.c: Add score3 and score7 machine numbers.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2009-03-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure: Regenerate.
+
+2009-03-01  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* elf32-hppa.c (hppa32_elf_local_refcounts): New function.
+	(elf32_hppa_check_relocs): Use it.
+
+	* elf_hppa_add_symbol_hook (elf_hppa_add_symbol_hook): Move to
+	elf64-hppa.c.
+	(elf_hppa_unmark_useless_dynamic_symbols): Likewise.
+	(elf_hppa_remark_useless_dynamic_symbols): Likewise.
+	(elf_hppa_is_dynamic_loader_symbol): Likewise.
+	(elf_hppa_record_segment_addrs): Likewise.
+	(elf_hppa_final_link): Likewise.
+	(elf_hppa_relocate_insn): Likewise.
+	(elf_hppa_final_link_relocate): Likewise.
+	(elf64_hppa_relocate_section): Likewise.
+	* elf64-hppa.c: Insert above.
+
+2009-02-28  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* elf-hppa.h (elf_hppa_final_link): Use elf_hppa_final_link.
+	(elf_hppa_final_link_relocate ): Rewrite eliminating dynamic hash table.
+	(elf_hppa_relocate_section): Likewise.
+	* elf64-hppa.c (struct elf64_hppa_link_hash_entry): Change to derive
+	from struct elf_link_hash_entry.  Add count field.
+	(struct elf64_hppa_dyn_hash_table): Delete.
+	(struct elf64_hppa_link_hash_table): Delete dyn_hash_table field.
+	(elf64_hppa_hash_table): Rename to hppa_link_hash_table.
+	(hppa_elf_hash_entry, eh_name): Define.
+	(elf64_hppa_new_dyn_hash_entry): Delete.
+	(elf64_hppa_dyn_hash_lookup): Delete.
+	(elf64_hppa_dyn_hash_traverse): Delete.
+	(get_dyn_name): Delete.
+	(elf64_hppa_finalize_opd): Use struct elf_link_hash_entry * instead
+	of struct elf64_hppa_dyn_hash_entry *.
+	(elf64_hppa_finalize_dlt, llocate_global_data_dlt,
+	allocate_global_data_plt, allocate_global_data_stub,
+	allocate_global_data_opd, count_dyn_reloc, allocate_dynrel_entries):
+	Likewise.
+	(hppa64_link_hash_newfunc): New.
+	(elf64_hppa_hash_table_create): Rework.
+	(count_dyn_reloc): Likewise.
+	(hppa64_elf_local_refcounts): New.
+	(elf64_hppa_check_relocs): Rework using standard technique for recording
+	local DLT, PLT and OPD reference counts.
+	(elf64_hppa_dynamic_symbol_p): Revise using "eh" for struct
+	elf_link_hash_entry *.
+	(elf64_hppa_mark_exported_functions, allocate_global_data_dlt,
+	allocate_global_data_plt, allocate_global_data_stub,
+	allocate_global_data_opd, allocate_dynrel_entries,
+	elf64_hppa_adjust_dynamic_symbol,
+	elf64_hppa_mark_milli_and_exported_functions): Likewise.
+	(elf64_hppa_create_dynamic_sections, elf64_hppa_size_dynamic_sections):
+	Use hppa_link_hash_table.  Rework.
+	(elf64_hppa_link_output_symbol_hook): Rework.
+	(elf64_hppa_finish_dynamic_symbol, elf64_hppa_finalize_opd,
+	elf64_hppa_finalize_dlt, elf64_hppa_finalize_dynreloc,
+	elf64_hppa_finish_dynamic_sections): Likewise.
+
+2009-02-26  Christophe Lyon  <christophe.lyon@st.com>
+
+	* elf32-arm.c (stub_reloc_type): Removed.
+	(insn_sequence): Renamed reloc_type field to r_type.
+	(elf32_arm_stub_long_branch_v4t_arm_thumb_pic): New stub.
+	(elf32_arm_stub_long_branch_v4t_thumb_arm_pic): Likewise.
+	(elf32_arm_stub_long_branch_thumb_only_pic): Likewise.
+	(elf32_arm_stub_type): Add new enum entries for the new stubs.
+	(arm_stub_is_thumb): Catch new stubs.
+	(arm_type_of_stub): Handle new stubs.
+	(arm_size_one_stub): Use ARRAY_SIZE. Handle new stubs.
+	(bfd_elf32_arm_process_before_allocation): Remove useless
+	condition.
+
+2009-02-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (elf_find_function): Use is_function_type to check
+	function symbol.
+
+2009-02-24  Sterling Augustine  <sterling@jaw.hq.tensilica.com>
+
+	* xtensa-modules.c: Revert to previous version 1.11 due
+	to inadvertant commit.
+
+2009-02-24  Sterling Augustine  <sterling@tensilica.com>
+
+	* elf32-xtensa.c (text_action_add): Separate test for action
+	type.  Break if saved action is ta_widen_insn at same offset.
+
+2009-02-24  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_stub_long_branch_any_any_pic): Rename
+	to elf32_arm_stub_long_branch_any_arm_pic.
+	(elf32_arm_stub_long_branch_any_thumb_pic): New.
+	(enum elf32_arm_stub_type, arm_type_of_stub)
+	(arm_size_one_stub): Handle any to ARM PIC and any to Thumb PIC
+	separately.
+
+2009-02-24  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf32-arm.c (PREV_SEC): Update comment.
+	(group_sections): Rename argument to stubs_always_after_branch.
+	Reverse the list and place stubs at the end of input sections.
+	Undefine NEXT_SEC.
+	(elf32_arm_size_stubs): Update to use stubs_always_after_branch.
+
+2009-02-23  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (arm_build_one_stub): Initialize stub_reloc_offset.
+	Fix formatting.
+	(arm_size_one_stub): Remove unnecessary break.
+	(arm_map_one_stub): Fix formatting.  Return after BFD_FAIL.
+
+2009-02-23  Christophe Lyon  <christophe.lyon@st.com>
+
+	* elf32-arm.c (stub_insn_type): New type.
+	(stub_reloc_type): Likewise.
+	(insn_sequence): Likewise.
+	(elf32_arm_stub_long_branch_any_any): Encode using insn_sequence.
+	(elf32_arm_stub_long_branch_v4t_arm_thumb): Likewise.
+	(elf32_arm_stub_long_branch_thumb_only): Likewise.
+	(elf32_arm_stub_long_branch_v4t_thumb_arm): Likewise.
+	(elf32_arm_stub_short_branch_v4t_thumb_arm): Likewise.
+	(elf32_arm_stub_long_branch_any_any_pic): Likewise.
+	(elf32_arm_stub_hash_entry): Add new helper fields.
+	(stub_hash_newfunc): Initialize these new fields.
+	(arm_build_one_stub): Encode Arm and Thumb instructions separately
+	to take endianness into account.
+	(arm_size_one_stub): Compute size of stubs using insn_sequence.
+	(arm_map_one_stub): Code is now more generic, thanks to
+	insn_sequence.
+
+2009-02-23  Christophe Lyon  <christophe.lyon@st.com>
+
+	* elf32-arm.c (elf32_arm_stub_long_branch_thumb_only): Fix stub
+	code.
+	(elf32_arm_stub_long_branch_v4t_thumb_arm): Likewise.
+	(arm_type_of_stub): Use Thumb-only long branch stub (non-PIC) when
+	BLX is not available. Fix typo in warning message. Add comments
+	and improve formatting.
+	(arm_build_one_stub): Adjust to new
+	elf32_arm_stub_long_branch_v4t_thumb_arm stub.
+	(arm_map_one_stub): Likewise.
+
+2009-02-23  Tristan Gingold  <gingold@adacore.com>
+	    Eric Botcazou  <ebotcazou@adacore.com>
+	    Douglas B Rupp  <rupp@gnat.com>
+
+	* vms.h: Update copyright year, fix comments, reorder declarations.
+	(_bfd_save_vms_section): Remove the prototype.
+	(EGPS_S_V_NO_SHIFT): New constant.
+	(bfd_vms_set_section_flags): New prototype.
+	(EGPS_S_B_ALIGN, EGPS_S_W_FLAGS, EGPS_S_L_ALLOC, EGPS_S_B_NAMLNG): New
+	constants.
+	(EGSY_S_W_FLAGS): Ditto.
+	(EGSY_S_V_QUAD_VAL): Ditto.
+	(ESDF_S_L_VALUE, ESDF_S_L_PSINDX, ESDF_S_B_NAMLNG): Ditto.
+	(EGST_S_W_FLAGS, EGST_S_Q_LP_1, EGST_S_Q_LP_2, EGST_S_L_PSINDX,
+	EGST_S_B_NAMLNG): Ditto.
+	(ESRF_S_B_NAMLNG): Ditto.
+	(ETIR_S_C_HEADER_SIZE): Ditto.
+	(EGPS_S_V_ALLOC_64BIT): Ditto.
+	(DST_S_C_EPILOG): Ditto.
+	(DST_S_C_SRC_SETLNUM_L, DST_S_C_SRC_SETLNUM_W) : Ditto.
+	(DST_S_C_SRC_INCRLNUM_B): Ditto.
+	(DST_S_B_PCLINE_UNSBYTE, DST_S_W_PCLINE_UNSWORD): Ditto.
+	(DST_S_L_PCLINE_UNSLONG): Ditto.
+	(DST_S_B_MODBEG_NAME, DST_S_L_RTNBEG_ADDRESS) : Ditto
+	(DST_S_B_RTNBEG_NAME, DST_S_L_RTNEND_SIZE): Ditto
+	(DST_S_C_SOURCE_HEADER_SIZE): Ditto.
+	(DST_S_B_SRC_DF_LENGTH, DST_S_W_SRC_DF_FILEID): Ditto.
+	(DST_S_B_SRC_DF_FILENAME, DST_S_B_SRC_UNSBYTE): Ditto.
+	(DST_S_B_SRC_UNSBYTE): Ditto.
+	(DST_S_W_SRC_UNSWORD, DST_S_L_SRC_UNSLONG): Ditto.
+	Add prototypes.
+	(vms_section, vms_reloc): Remove types.
+	(hdr_struc): Replaced by ...
+	(hdr_struct): ... new type.
+	(EMH_S_W_HDRTYP, EMH_S_B_STRLVL, EMH_S_L_ARCH1): New constants.
+	(EMH_S_L_ARCH2, EMH_S_L_RECSIZ, EMH_S_B_NAMLNG): Ditto.
+	(EMH_DATE_LENGTH): Ditto.
+	(eom_struc): Replaced by ...
+	(eom_struct): ... new type.
+	(EEOM_S_L_TOTAL_LPS, EEOM_S_W_COMCOD, EEOM_S_B_TFRFLG): New constants.
+	(EEOM_S_L_PSINDX, EEOM_S_L_TFRADR): Ditto.
+	(EIHD_S_K_MAJORID, EIHD_S_K_MINORID, EIHD_S_K_EXE): Ditto.
+	(EIHD_S_L_SIZE, EIHD_S_L_ISDOFF, EIHD_S_L_SYMDBGOFF): Ditto.
+	(EIHD_S_Q_SYMVVA, EIHD_S_L_IMGTYPE): Ditto.
+	(EISD_S_L_EISDSIZE, EISD_S_L_SECSIZE, EISD_S_Q_VIR_ADDR): Ditto.
+	(EISD_S_L_FLAGS, EISD_S_L_VBN, EISD_S_R_CONTROL): Ditto.
+	(EISD_S_L_IDENT, EISD_S_T_GBLNAM): Ditto.
+	(EISD_S_M_GBL, EISD_S_M_CRF, EISD_S_M_DZRO, EISD_S_M_WRT): Ditto.
+	(EISD_S_M_INITALCODE, EISD_S_M_BASED, EISD_S_M_FIXUPVEC): Ditto.
+	(EISD_S_M_RESIDENT, EISD_S_M_VECTOR, EISD_S_M_PROTECT): Ditto.
+	(EISD_S_M_LASTCLU, EISD_S_M_EXE, EISD_S_M_NONSHRADR): Ditto.
+	(EISD_S_M_QUAD_LENGTH, EISD_S_M_ALLOC_64BIT): Ditto.
+	(EIHS_S_L_DSTVBN, EIHS_S_L_DSTSIZE, EIHS_S_L_GSTVBN): Ditto.
+	(EIHS_S_L_GSTSIZE, EIHS_S_L_DMTVBN, EIHS_S_L_DMTBYTES): Ditto.
+	(DBG_S_L_DMT_MODBEG, DBG_S_L_DST_SIZE): Ditto.
+	(DBG_S_W_DMT_PSECT_COUNT, DBG_S_C_DMT_HEADER_SIZE): Ditto.
+	(DBG_S_L_DMT_PSECT_START, DBG_S_L_DMT_PSECT_LENGTH)
+	(DBG_S_C_DMT_PSECT_SIZE): Ditto.
+	(enum file_type_enum): New type.
+	(struct location_struct): Removed.
+	(struct fileinfo, struct srecinfo, struct lineinfo): New types.
+	(struct funcinfo, struct module): Ditto.
+	(struct vms_private_data_struct): Update fields.
+	(struct vms_section_data_struct): New type.
+
+	* vms.c: Update copyright year, fix comments,
+	Fix includes for DECC, add prototypes.
+	(vms_initialize): Use bfd_alloc instead of bfd_zalloc and remove
+	some initializers.
+	Use flavour to set is_vax, location_stack is removed.
+	(struct pair): Declare.
+	(fill_section_ptr): Initialize variables at declaration.
+	Add guard to set SECTION_SYM flag, handlde und section.
+	(vms_fixup_sections): Use struct pair for fill_section_ptr argument.
+	(_bfd_vms_slurp_object_records): New function, replaces previous
+	vms_object_p.
+	(vms_slurp_module): New function.
+	(vms_slurp_image): Ditto.
+	(vms_object_p): Complete rewrite.
+	(vms_mkobject): Use is_vax field to slect architecture.
+	(free_reloc_stream): New function.
+	(vms_convert_to_var): Ditto.
+	(vms_convert_to_var_1): Ditto.
+	(vms_convert_to_var_unix_filename): Ditto.
+	(vms_close_and_cleanup): Call free_reloc_stream, convert file to
+	VAR format on VMS.
+	(vms_new_section_hook): Set alignment to 0, allocate private data.
+	(vms_get_section_contents): Load content.
+	(vms_get_symbol_info): Handle undefined section.
+	(vms_find_nearest_line): Handle.
+	(alloc_reloc_stream): New function.
+	(vms_slurp_reloc_table): Ditto.
+	(vms_get_reloc_upper_bound): Make it real.
+	(vms_canonicalize_reloc): Do the real work.
+	(alpha_howto_table): Add ALPHA_R_NOP, ALPHA_R_BSR, ALPHA_R_LDA,
+	ALPHA_R_BOH.
+	(vms_bfd_reloc_type_lookup): Handle NOP, BSR, LDA and BOH.
+	(vms_set_arch_mach): Check arch.
+	(vms_set_section_contents): Copy the content after allocation.
+	(vms_alpha_vec): Update object flags.
+
+	* vms-tir.c: Update copyright year, fix comments,
+	add prototypes for new functions.
+	(dst_define_location): New function.
+	(dst_restore_location): New function.
+	(dst_retrieve_location): New function.
+	(dst_check_allocation): New function.
+	(image_dump): Call dst_check_allocation.
+	(image_write_b): Ditto.
+	(image_write_w): Ditto.
+	(image_write_l): Ditto.
+	(image_write_q): Ditto.
+	(cmd_name): Handle STA_LW, STA_QW, STO_OFF, STO_IMM, STO_IMMR, STO_LW,
+	STO_QW, OPR_ADD, CTL_SETRB, STC_LP_PSB, CTL_DFLOC, CTL_STLOC,
+	CTL_STKDL.
+	Call error handler instead of abort if name is not known.
+	(etir_sta): Add quarter_relocs argument and set it.
+	Fix cast.
+	(etir_sto): Ditto.
+	(etir_opr): Ditto, return FALSE in case of error.
+	(etir_ctl): Add quarter_relocs argument and set it, fix cast.
+	Fix CTL_DFLOC, CTL_STLOC, CTL_STKDL.
+	(etir_stc): Add quarter_relocs argument and set it, fix cast.
+	Fix STC_LP, STC_LP_PSB, STC_GBL and STC_CGA.
+	Handle STC_LP_PSB, STC_BSR_GBL, STC_LDA_GBL, STC_BOH_GBL.
+	Move STC_NOP_PS, STC_BSR_PS, STC_LDA_PS, STC_BOH_PS, STC_NBH_PS.
+	Return FALSE in case of error.
+	(tir_sta): Change sign of psect.
+	(tir_ctl): Ditto.
+	(tir_cmd): Fix cast. Makes tir_table static const.
+	(etir_cmd): Add quarter_relocs argument, makes etir_table const,
+	add argument to explain.
+	(analyze_etir): Initialize maxptr, add quarter_relocs
+	declaration, move some declarations into inner scopes.
+	Handle quarter_relocs and STO_IMM.
+	(_bfd_vms_slurp_tir): Use constant instead of hard-coded values.
+	(_bfd_vms_slurp_relocs): New function.
+	(_bfd_vms_decode_relocs): New function.
+	(sto_imm): Rewritten.
+	(start_first_etbt_record): New function.
+	(start_another_etbt_record): Ditto.
+	(etir_output_check): Ditto.
+	(defer_reloc_p): Ditto.
+	(_bfd_vms_write_tir): Remove nextoffset, convert a while-loop to
+	a for-loop.  Correctly deals with contents, deals with .vmsdebug,
+	rewritte relocations handling.
+	(_bfd_vms_write_tbt): Removed.
+	(_bfd_vms_write_dbg): Ditto.
+
+	* vms-misc.c: Update copyright year, Fix comments.
+	(_bfd_vms_get_header_values): Use 'size' instead of 'length'.
+	(maybe_adjust_record_pointer_for_object): New function.
+	(_bfd_vms_get_first_record): New function, replaces ...
+	(_bfd_vms_get_record): ..  removed.
+	(_bfd_vms_get_object_record): New function.
+	(_bfd_vms_get_object_record): New function.
+	(vms_get_remaining_object_record): New function, replaces ...
+	(_bfd_vms_get_next_record): ... removed.
+	(add_new_contents): Removed.
+	(_bfd_save_vms_section): Removed.
+	(_bfd_get_vms_section): Removed.
+	(_bfd_vms_output_flush): Write in VAR format.
+	(new_symbol): Don't make UND section.
+
+	* vms-hdr.c: Update copyright year, update list of record handled.
+	(_bfd_vms_slurp_hdr): rec_length renamed to rec_size.
+	(_bfd_vms_write_hdr): Strip vms and unix patches,
+	add comments, truncate module name at 31 characters,
+	use constants instead of hard-coded value,
+	write BFD version instead of a fixed string.
+	(_bfd_vms_slurp_ihd): New function.
+	(_bfd_vms_slurp_isd): Ditto.
+	(_bfd_vms_slurp_ihs): Ditto.
+	(new_module): Ditto.
+	(parse_module): Ditto
+	(build_module_list): Ditto.
+	(module_find_nearest_line): Ditto.
+	(_bfd_vms_find_nearest_dst_line): Ditto.
+	(vms_slurp_debug): Ditto.
+	(_bfd_vms_slurp_dbg): Ditto.
+	(_bfd_vms_slurp_tbt): Ditto.
+	(_bfd_vms_write_dbg): Ditto.
+	(_bfd_vms_write_tbt): Ditto.
+
+	* vms-gsd.c: Update copyright year, update list of records handled.
+	(EVAX_LITERALS_NAME): New macro.
+	(evax_section_flags): Add an entry for EVAX_LITERALS_NAME.
+	(gpsflagdesc, gsyflagdesc): Moved out of _bfd_vms_slurp_gsd.
+	(register_universal_symbol): New function and prototype.
+	(_bfd_vms_slurp_gsd): Fix indentations and casts,
+	improve debug messages,
+	use constants instead of hard-coded value,
+	fix missing endianness conversion,
+	handle global symbol (SYMG).
+	(bfd_vms_set_section_flags): New function.
+	(_bfd_vms_write_gsd): Don't write .vmsdebug section,
+	handle section literals,
+	fix indentation,
+	handle section bfd and vms flags,
+	don't output LIB$INITIALIZE symbol,
+	fix handling of weak symbols,
+	fix evax vs vax procedure descriptor,
+	handle absolute symbols.
+
+	* reloc.c (BFD_RELOC_ALPHA_NOP, BFD_RELOC_ALPHA_BSR,
+	BFD_RELOC_ALPHA_LDA, BFD_RELOC_ALPHA_BOH): New relocations.
+
+	* makefile.vms (DEFS): Fix flags for VMS.
+
+	* bfdio.c (real_fopen): Handle multiple VMS fopen attributes.
+
+	* bfd-in2.h: Regenerated.
+	* libbfd.h: Regenerated.
+
+2009-02-20  Cary Coutant  <ccoutant@google.com>
+
+	* vmsutil.c (vms_file_stats_name): Fix incorrect use of st_mtime
+	in struct stat.
+
+2009-18-02  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	PR gas/7059
+	* coffcode.h (coff_write_object_contents):  Don't let the string
+	table offset overflow the s_name field when using long section names.
+
+2009-18-02  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* coff-alpha.c (alpha_ecoff_backend_data):  Initialise fields which
+	control long section name handling with ECOFF_NO_LONG_SECTION_NAMES.
+	* coff-mips.c (mips_ecoff_backend_data):  Likewise.
+	* coff-rs6000.c (bfd_xcoff_backend_data):  Initialise fields which
+	control long section name handling with XCOFF_NO_LONG_SECTION_NAMES.
+	(bfd_pmac_xcoff_backend_data):  Likewise.
+	* coff64-rs6000.c (bfd_xcoff_backend_data):  Likewise.
+	(bfd_xcoff_aix5_backend_data):  Likewise.
+	(xcoff64_write_object_contents):  Delete unused long_section_names
+	local variable.
+	* coff-sh.c (bfd_coff_small_swap_table):  Initialise long section
+	name members using COFF_DEFAULT_LONG_SECTION_NAMES and make entire
+	struct non-const.
+	* coffcode.h (documentation):  Update to describe long section names.
+	(COFFLONGSECTIONCATHELPER):  New helper macro.
+	(BLANKOR1TOODD):  Likewise.
+	(COFF_ENABLE_LONG_SECTION_NAMES):  Likewise.
+	(COFF_LONG_SECTION_NAMES_SETTER):  Likewise.
+	(COFF_DEFAULT_LONG_SECTION_NAMES):  Likewise.
+	(bfd_coff_set_long_section_names_allowed):  New function.
+	(bfd_coff_set_long_section_names_disallowed):  Likewise.
+	(struct bfd_coff_backend_data):  Add new backend hook function
+	pointer _bfd_coff_set_long_section_names.
+	(bfd_coff_set_long_section_names):  New backend hook.
+	(coff_write_object_contents):  Only generate long section names if
+	bfd_coff_long_section_names() indicates they are currently enabled.
+	(bfd_coff_std_swap_table):  Make non-const, and initialise long
+	section name fields using COFF_DEFAULT_LONG_SECTION_NAMES.
+	(ticoff0_swap_table):  Likewise to both.
+	(ticoff1_swap_table):  Again, likewise to both.
+	* coffgen.c (make_a_section_from_file):  Allow long section names
+	as inputs even if not currently allowed for outputs.
+	* ecoff.c (_bfd_ecoff_no_long_sections):  New function.
+	* efi-app-ia32.c (COFF_LONG_SECTION_NAMES):  Define to 0, not blank.
+	* efi-app-ia64.c (COFF_LONG_SECTION_NAMES):  Likewise.
+	* efi-app-x86_64.c (COFF_LONG_SECTION_NAMES):  Likewise.
+	* efi-bsdrv-ia32.c (COFF_LONG_SECTION_NAMES):  Likewise.
+	* efi-bsdrv-ia64.c (COFF_LONG_SECTION_NAMES):  Likewise.
+	* efi-bsdrv-x86_64.c (COFF_LONG_SECTION_NAMES):  Likewise.
+	* efi-rtdrv-ia32.c (COFF_LONG_SECTION_NAMES):  Likewise.
+	* efi-rtdrv-ia64.c (COFF_LONG_SECTION_NAMES):  Likewise.
+	* efi-rtdrv-x86_64.c (COFF_LONG_SECTION_NAMES):  Likewise.
+	* pei-arm.c (COFF_LONG_SECTION_NAMES):  Likewise.
+	* pei-i386.c (COFF_LONG_SECTION_NAMES):  Likewise.
+	* pei-mcore.c (COFF_LONG_SECTION_NAMES):  Likewise.
+	* pei-mips.c (COFF_LONG_SECTION_NAMES):  Likewise.
+	* pei-ppc.c (COFF_LONG_SECTION_NAMES):  Likewise.
+	* pei-sh.c (COFF_LONG_SECTION_NAMES):  Likewise.
+	* pei-x86_64.c (COFF_LONG_SECTION_NAMES):  Likewise.
+	* libcoff-in.h:  Update copyright year to cause updated copyright
+	year in generated libcoff.h, and fix typo.
+	* libcoff.h:  Regenerated.
+	* libecoff.h (ECOFF_NO_LONG_SECTION_NAMES):  New macro.
+	(_bfd_ecoff_no_long_sections):  Add prototype.
+	* libxcoff.h (XCOFF_NO_LONG_SECTION_NAMES):  New macro.
+	* pe-mips.c (COFF_LONG_SECTION_NAMES):  Define empty if not already
+	defined by an including .c file.
+	* ticoff.h (ticoff0_swap_table):  Make non-const, and initialise
+	long section name fields using COFF_DEFAULT_LONG_SECTION_NAMES.
+	(ticoff1_swap_table):  Likewise to both.
+
+2009-02-18  Christophe Lyon  <christophe.lyon@st.com>
+
+	* elf32-arm.c (arm_build_one_stub): Fix relocation target for pic
+	stub. Catch default case error.
+	(arm_map_one_stub): Add missing Thumb mapping symbol.
+
+2009-02-18  Bjoern Haase  <bjoern.m.haase@web.de>
+
+	PR 9841
+	* elf32-avr.c: Handle case where no local symbos exist correctly.
+
+2009-02-16  Christophe Lyon  <christophe.lyon@st.com>
+
+	bfd/
+	* elf32-arm.c (arm_long_branch_stub,
+	arm_thumb_v4t_long_branch_stub,
+	arm_thumb_thumb_long_branch_stub,
+	arm_thumb_arm_v4t_long_branch_stub,
+	arm_thumb_arm_v4t_short_branch_stub,
+	arm_pic_long_branch_stub):
+	Renamed to elf32_arm_stub_long_branch_any_any,
+	elf32_arm_stub_long_branch_v4t_arm_thumb,
+	elf32_arm_stub_long_branch_thumb_only,
+	elf32_arm_stub_long_branch_v4t_thumb_arm,
+	elf32_arm_stub_short_branch_v4t_thumb_arm,
+	elf32_arm_stub_long_branch_any_any_pic.
+	(arm_stub_long_branch, arm_thumb_v4t_stub_long_branch,
+	arm_thumb_thumb_stub_long_branch,
+	arm_thumb_arm_v4t_stub_long_branch,
+	arm_thumb_arm_v4t_stub_short_branch, arm_stub_pic_long_branch):
+	Renamed to arm_stub_long_branch_any_any,
+	arm_stub_long_branch_v4t_arm_thumb,
+	arm_stub_long_branch_thumb_only,
+	arm_stub_long_branch_v4t_thumb_arm,
+	arm_stub_short_branch_v4t_thumb_arm,
+	arm_stub_long_branch_any_any_pic.
+
+2009-02-15  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* elf-hppa.h (elf_hppa_final_link_relocate): Correct addend value used
+	in branch offset check.
+
+2009-02-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (struct _ppc64_elf_section_data): Delete t_symndx,
+	add toc.symndx and toc.add.
+	(ppc64_elf_check_relocs): Don't set htab->tls_get_addr here.
+	Set up toc.add.
+	(get_tls_mask): Add toc_addend param, set from toc.add.  Adjust all
+	callers.
+	(ppc64_elf_tls_setup): Set htab->tls_get_addr and tls_get_addr_fd.
+	(branch_reloc_hash_match): New function, extracted from..
+	(ppc64_elf_tls_optimize): ..here.
+	(ppc64_elf_relocate_section): Properly set addends when optimizing
+	tls sequences.  Avoid unnecessary reading and writing of insns.
+	Only redo reloc when symbol changed.  Bypass symbol checks when
+	using tlsld_got.
+	* elf32-ppc.c (ppc_elf_tls_setup): Correct comment.
+	(branch_reloc_hash_match): New function, extracted from..
+	(ppc_elf_tls_optimize): ..here.
+	(ppc_elf_relocate_section): Avoid unnecessary reading of insns.
+	Don't clear addend on zapped __tls_get_addr reloc.
+
+2009-02-12  Nick Clifton  <nickc@redhat.com>
+
+	PR 9827
+	* elflink.c (bfd_elf_final_link): When counting the relocations,
+	if the header size has not been set yet then assume that it will
+	match the output section's reloc type.
+
+2009-02-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf32-mips.c (mips_elf_final_gp): Don't add 0x4000 offset for
+	relocatable link.
+
+2009-02-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_find_overlays): Call bfd_set_error on errors.
+	(find_function): Likewise.
+	(pasted_function): Don't error if no prior function found.
+	(discover_functions): Revert 2008-12-10 change.  Extend first
+	function range to start of section.
+
+2009-02-08  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* elf64-hppa.c: Remove PARAMS macro.  Replace PTR with void *.  Convert
+	functions to C90.
+	* elf64-hppa.h: Likewise.
+
+2009-02-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_section_processing): Remove special
+	.sbss handling.
+
+2009-02-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_build_stubs): Define __icache_neg_log2_linesize.
+	Define __icache_ptr_handler*, not __icache_ptr___icache_bi_handler*.
+
+2009-02-03  Sandip Matte  <sandip@rmicorp.com>
+
+	* aoutx.h (NAME (aout, machine_type)): Handle bfd_mach_mips_xlr.
+	* archures.c (bfd_mach_mips_xlr): Define.
+	* bfd-in2.h: Regenerate.
+	* cpu-mips.c (I_xlr): Define.
+	(arch_info_struct): Add XLR entry.
+	* elfxx-mips.c (_bfd_elf_mips_mach): Handle E_MIPS_MACH_XLR.
+	(mips_set_isa_flags): Handle bfd_mach_mips_xlr
+	(mips_mach_extensions): Add XLR entry.
+
+2009-02-03  Eric B. Weddington  <eric.weddington@atmel.com>
+
+	* elf32-avr.c (avr_final_link_relocate): Allow avr25 to wraparound.
+
+2009-02-03  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* configure.in: AC_SUBST pdfdir.
+	* Makefile.am: Add install-pdf, install-pdf-am
+	and install-pdf-recursive targets. Define pdfdir.
+	* doc/Makefile.am: Define pdf__strip_dir. Add
+	install-pdf and install-pdf-am targets.
+	* po/Make-in: Add install-pdf target.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate
+	* doc/Makefile.in: Regenerate.
+
+2009-02-03  Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+	* bfd-in2.h: Regenerate.
+	* elf32-m68k.c: Handle 2-slot GOT entries.  Rename variables and
+	fields from n_entries to n_slots where appropriate, update comments.
+	(HOWTO): Add TLS relocations.
+	(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
+	(enum elf_m68k_got_offset_size): New enum.
+	(struct elf_m68k_got_entry.type): Move field to ...
+	(struct elf_m68k_got_entry_key): ... here.  Update all uses.
+	(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
+	functions.
+	(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
+	functions.
+	(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
+	fields into n_entries array.  Update comments.
+	(elf_m68k_init_got): Simplify, update all uses.
+	(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
+	(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
+	GOT entries; update name, update all uses.
+	(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
+	(elf_m68k_get_got_entry): Update.
+	(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
+	simplify.
+	(elf_m68k_remove_got_entry_type): Simplify.
+	(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
+	(elf_m68k_can_merge_gots): Update.
+	(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
+	(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
+	GOT entries, simplify.
+	(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
+	(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
+	field, remove obsoleted local_n_entries field.
+	(elf_m68k_partition_multi_got_2): New static function.
+	(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
+	update.
+	(elf_m68k_remove_got_entry_type): Update.
+	(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
+	(elf_m68k_check_relocs): Handle TLS relocations.  Remove unnecessary
+	update of sgot->size and srelgot->size.
+	(elf_m68k_gc_sweep_hook): Update.
+	(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
+	(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
+	TLS relocations.
+	* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
+	* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
+
+2009-02-02  DJ Delorie  <dj@redhat.com>
+
+	* elf32-mep.c (config_names): Regenerate configuration.
+
+2009-02-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (bfd_elf_get_str_section): Don't declare.
+	(bfd_elf_find_section, _sh_elf_set_mach_from_flags): Likewise.
+	* elf.c (bfd_elf_get_str_section): Make static.
+	(bfd_elf_find_section): Delete.
+	* libbfd.h: Regenerate.
+
+2009-02-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elf-eh-frame.c (REQUIRE_CLEARED_RELOCS) Remove.
+	(_bfd_elf_parse_eh_frame): Do not check relocations for removed FDEs.
+
+2009-01-31  Alan Modra  <amodra@bigpond.net.au>
+
+	* elflink.c (on_needed_list): New function.
+	(elf_link_add_object_symbols): Link in --as-needed libs if they
+	satisfy undefined symbols in other libs.
+
+2009-01-30  Julian Brown  <julian@codesourcery.com>
+
+	* elf32-arm.c (bfd_elf32_arm_vfp11_erratum_scan): Skip BFDs with
+	EXEC_P or DYNAMIC flags, and skip sections which are being linked
+	with --just-symbols (-R).
+
+2009-01-29  Adam Nemet  <anemet@caviumnetworks.com>
+
+	* dwarf2.c (read_rangelist): Use read_address to read low_pc and
+	high_pc in order to properly sign-extend VMAs.
+
+2009-01-29  Daniel Jacobowitz  <dan@codesourcery.com>
+	    Mark Shinwell  <shinwell@codesourcery.com>
+	    Catherine Moore  <clm@codesourcery.com>
+
+	* elf-attrs.c, elflink.c, elfxx-mips.c: Correct typos in comments.
+
+2009-01-28  Catherine Moore <clm@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_check_relocs): Set SEC_ALLOC and
+	SEC_LOAD for dynamic relocation sections.
+
+2009-01-27  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (cris_elf_relocate_section): Use elf_hash_table
+	(info)->tls_size, not elf_hash_table (info)->tls_sec->size for
+	the size of local TLS data.
+
+2009-01-27  Andreas Schwab  <schwab@suse.de>
+
+	* mach-o.c (bfd_mach_o_archive_p): Restrict the number of
+	architectures in the archive.
+
+2009-01-27  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (cris_elf_relocate_section) <case R_CRIS_16_DTPREL>
+	<R_CRIS_32_DTPREL>: Correct relocation value.
+
+	* elf32-cris.c (cris_elf_relocate_section) <case R_CRIS_8>
+	<R_CRIS_16, R_CRIS_32>: Don't call BFD_ASSERT for weak undefined
+	symbols with non-default visibility.
+
+2009-01-26  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf32-ppc.c (ppc_elf_relax_section): Add space for relocs
+	describing the trampolines.
+	(ppc_elf_relocate_section): Update relocs to describe the
+	trampolines.
+
+2009-01-25  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* elf-hppa.h (elf_hppa_final_link_relocate): Add check to ensure that
+	branch targets can be reached for R_PARISC_PCREL22F, R_PARISC_PCREL17F
+	and R_PARISC_PCREL12F relocations.
+
+2009-01-24  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 6022
+	* elflink.c (find_version_for_sym): New function split out from,
+	but without export_dynamic test, ..
+	(_bfd_elf_link_assign_sym_version): ..here.
+	(_bfd_elf_export_symbol): Use it.
+
+2009-01-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf-bfd.h (struct elf_assign_sym_version_info): Delete.
+	(struct elf_info_failed, struct elf_find_verdep_info): Move to..
+	* elflink.c: ..here, somewhat modified.
+	* elf-bfd.h (_bfd_elf_add_default_symbol, _bfd_elf_export_symbol,
+	_bfd_elf_link_find_version_dependencies,
+	_bfd_elf_link_assign_sym_version, _bfd_elf_link_size_reloc_section,
+	_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
+	_bfd_elf_link_sec_merge_syms, bfd_elf_link_mark_dynamic_symbol): Don't
+	declare..
+	* elflink.c: ..and make static here.
+	(_bfd_elf_link_find_version_dependencies): Adjust for removal
+	of output_bfd from struct elf_find_verdep_info.
+	(_bfd_elf_link_assign_sym_version): Similarly adjust to use
+	struct elf_info_failed.
+	(bfd_elf_size_dynamic_sections): Adjust.
+
+2009-01-22  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 6832
+	* dwarf2.c (find_line): Don't update stash->sec_info_ptr until
+	after comp_unit_find_line call.
+
+2009-01-21  Nick Clifton  <nickc@redhat.com>
+
+	PR 9769
+	* vmsutil.c (vms_file_stats_name): Remove use of unsupported
+	tm_gmtoff field in struct tm.
+
+2009-01-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.h (struct spu_elf_params): Add non_ia_text.
+	* elf32-spu.c (mark_overlay_section): Only include .text.ia.*
+	sections in soft-icache lines unless non_ia_text.  Don't add
+	rodata if doing so would exceed line size.
+
+2009-01-19  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (elf_cris_copy_indirect_symbol): For other symbol
+	types than bfd_link_hash_indirect, before early return, call
+	_bfd_elf_link_hash_copy_indirect.
+
+2009-01-19  Andrew Stubbs  <ams@codesourcery.com>
+
+	* elf-attrs.c (vendor_set_obj_attr_contents): Support tag ordering.
+	* elf-bfd.h (elf_backend_data): Add obj_attrs_order.
+	* elf32-arm.c (elf32_arm_obj_attrs_order): New function.
+	(elf_backend_obj_attrs_order): New define.
+	* elfxx-target.h (elf_backend_obj_attrs_order): New define.
+	(elfNN_bed): Add elf_backend_obj_attrs_order.
+
+2009-01-19  Andrew Stubbs  <ams@codesourcery.com>
+
+	* elf-attrs.c (is_default_attr): Substitute magic numbers with macros.
+	(obj_attr_size): Likewise.
+	(write_obj_attribute): Likewise.
+	(_bfd_elf_copy_obj_attributes): Likewise.
+	(_bfd_elf_parse_attributes): Likewise.
+	* elf-bfd.h (ATTR_TYPE_FLAG_INT_VAL): New define.
+	(ATTR_TYPE_FLAG_STR_VAL, ATTR_TYPE_FLAG_NO_DEFAULT): New defines.
+	(ATTR_TYPE_HAS_INT_VAL, ATTR_TYPE_HAS_STR_VAL): New defines.
+	(ATTR_TYPE_HAS_NO_DEFAULT): New define.
+	* elf32-arm.c (elf32_arm_obj_attrs_arg_type): Replace magic numbers
+	with macros.
+
+2009-01-19  Andrew Stubbs  <ams@codesourcery.com>
+
+	* elf-attrs.c (is_default_attr): Support defaultless attributes.
+	(bfd_elf_add_obj_attr_int): Get type from _bfd_elf_obj_attrs_arg_type.
+	(bfd_elf_add_obj_attr_string): Likewise.
+	(bfd_elf_add_obj_attr_int_string): Likewise.
+	(_bfd_elf_parse_attributes): Allow for unknown flag bits in type.
+	* elf-bfd.h (struct obj_attribute): Document new flag bit.
+	* elf32-arm.c (elf32_arm_obj_attrs_arg_type): Specify that
+	Tag_nodefaults has no default value.
+	(elf32_arm_merge_eabi_attributes): Modify the Tag_nodefaults
+	comment to reflect the new state.
+
+2009-01-19  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 9695
+	* pdp11.c (N_BADMAG): True for anything but OMAGIC, NMAGIC, ZMAGIC.
+	(some_aout_object_p): Delete dead code handling QMAGIC and BMAGIC.
+	(adjust_z_magix): Delete dead code handling QMAGIC.
+
+2009-01-16  Kai Tietz  <kai.tietz@onevision.com>
+
+	* coffcode.h (styp_to_sec_flags): Correct interpretation of
+	IMAGE_SCN_MEM_DISCARDABLE.
+
+2009-01-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (libbfd_la_LIBADD, libbfd_la_LDFLAGS): Substitute
+	SHARED_LIBADD and SHARED_LDFLAGS rather than WIN32LIBADD, WIN32LDFLAGS.
+	* configure.in (commonbfdlib): Delete.
+	(SHARED_LDFLAGS): Rename from WIN32LDFLAGS/
+	(SHARED_LIBADD): Rename from WIN32LIBADD.  Add pic libiberty if such
+	is available, not just for linux.
+	* po/SRC-POTFILES.in: Regenerate.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2009-01-15  Andrew Stubbs  <ams@codesourcery.com>
+	    Julian Brown   <julian@codesourcery.com>
+
+	* elf-bfd.h (NUM_KNOWN_OBJ_ATTRIBUTES): Set to 71 to include all known
+	ARM attributes in ABI 2.07.
+	* elf32-arm.c (get_secondary_compatible_arch): New function.
+	(set_secondary_compatible_arch): New function.
+	(tag_cpu_arch_combine): New function.
+	(elf32_arm_copy_one_eabi_other_attribute): Delete function.
+	(elf32_arm_copy_eabi_other_attribute_list): Delete function.
+	(elf32_arm_merge_eabi_attributes): Rename order_312 to order_021 to
+	make it fit with order_01243.
+	Add support for Tag_also_compatible_with,
+	Tag_CPU_unaligned_access, Tag_T2EE_use, Tag_Virtualization_use,
+	Tag_MPextension_use, Tag_nodefaults and Tag_conformance.
+	Improve/tidy up support for Tag_CPU_raw_name, Tag_CPU_name,
+	Tag_CPU_arch, Tag_ABI_HardFP_use, Tag_VFP_HP_extension,
+	Tag_ABI_FP_denormal, Tag_ABI_PCS_GOT_use, Tag_ABI_align8_needed,
+	Tag_VFP_arch and Tag_ABI_FP_16bit_format.
+	Rework the way unknown attributes are handled.
+	Defer errors until all attributes have been processed.
+
+2009-01-15  Andrew Stubbs  <ams@codesourcery.com>
+
+	* elf-attrs.c (bfd_elf_add_obj_attr_compat): Rename to
+	bfd_elf_add_obj_attr_int_string.
+	Read Tag_compatibility from its new location in the attribute array,
+	rather than the attribute list.
+	(_bfd_elf_copy_obj_attributes): bfd_elf_add_obj_attr_compat ->
+	bfd_elf_add_obj_attr_int_string.
+	(_bfd_elf_parse_attributes): Likewise.
+	(_bfd_elf_merge_object_attributes): There's now only one
+	Tag_compatibility, and it's in the array, not the list.
+	* elf-bfd.h (NUM_KNOWN_OBJ_ATTRIBUTES): Set to 33 to include
+	Tag_compatibility.
+	(bfd_elf_add_obj_attr_compat): Rename to
+	bfd_elf_add_obj_attr_int_string.
+	(bfd_elf_add_proc_attr_compat): Rename to
+	bfd_elf_add_proc_attr_int_string.
+	* elf32-arm.c (elf32_arm_merge_eabi_attributes): Explicitly don't handle
+	Tag_compatibility.
+
+2009-01-15  Douglas B Rupp  <rupp@gnat.com>
+
+	* Makefile.am (BFD32_BACKENDS): Add new object vmsutil.lo
+	(BFD32_BACKENDS_CFILES): Add new file vmsutil.c
+	(vmsutil.lo): Add dependency rule.
+	* Makefile.in: Regenerate.
+	* config.bfd (ia64*-*-*vms*): Add case.
+	* configure.in (bfd_elf64_ia64_vms_vec): Add case.
+	* configure: Regenerate.
+	* vmsutil.c: New file.
+	* vmsutil.h: New file.
+	* elf-bfd.h (struct bfd_elf_special_section): Change type of
+	attr to bfd_vma.
+	* elfxx-ia64.c (elfNN_vms_post_process_headers,
+	elfNN_vms_section_processing, elfNN_vms_final_write_processing,
+	elfNN_vms_close_and_cleanup, elfNN_vms_section_from_shdr,
+	elfNN_vms_object_p): New functions
+	* targets.c (bfd_elf64_ia64_vms_vec): New target.
+
+2009-01-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/9727
+	* elflink.c (elf_gc_sweep): Exclude the group section if the
+	first member of the section group is excluded.
+
+2009-01-14  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 9735
+	* syms.c (_bfd_stab_section_find_nearest_line): Don't free
+	saved filename, use bfd_alloc rather than bfd_malloc for it.
+
+2009-01-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_build_stubs): Make __icache_base absolute.
+
+2009-01-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (remove_cycles): Always set call->max_depth.
+
+2009-01-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (spu_elf_auto_overlay): Correct vma mask.
+
+2009-01-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-spu.c (struct spu_link_hash_table): Add init, line_size_log2,
+	num_lines_log2.
+	(struct got_entry): Add br_addr.
+	(struct call_info): Add priority.
+	(struct function_info): Add lr_store and sp_adjust.
+	(spu_elf_setup): Init line_size_log2 and num_lines_log2.
+	(spu_elf_find_overlays): For soft-icache, mark any section within cache
+	area as an overlay, and check that no other overlays exist.  Look up
+	icache overlay manager entry sym.
+	(BRA_STUBS, BRA, BRASL): Define.
+	(enum _stub_type): Replace ovl_stub with call_ovl_stub and br*_ovl_stub.
+	(needs_ovl_stub): Adjust for soft-icache.  Return priority encoded
+	in branch insn.
+	(count_stub, build_stub): Support soft-icache.
+	(build_spuear_stubs, process_stubs): Adjust build_stub call.
+	(spu_elf_size_stubs): Size soft-icache stubs.
+	(overlay_index): New function.
+	(spu_elf_build_stubs): Make static.  Support soft-icache.
+	(spu_elf_check_vma): Don't turn off auto_overlay if soft-icache.
+	(find_function_stack_adjust): Save lr store and stack adjust insn
+	offsets.
+	(maybe_insert_function): Adjust find_function_stack_adjust call.
+	(mark_functions_via_relocs): Retrieve priority.
+	(remove_cycles): Only warn about pruned arcs when stack_analysis.
+	(sort_calls): Sort by priority first.
+	(mark_overlay_section): Ignore .ovl.init.
+	(sum_stack): Only print when stack_analysis.
+	(print_one_overlay_section): New function, extracted from..
+	(spu_elf_auto_overlay): ..here.  Support soft-icache overlays.
+	(spu_elf_stack_analysis): Only print when htab->stack_analysis.
+	(spu_elf_final_link): Call spu_elf_stack_analysis for lrlive
+	analysis.  Call spu_elf_build_stubs.
+	(spu_elf_relocate_section): For soft-icache encode overlay index
+	into addresses.
+	(spu_elf_output_symbol_hook): Support soft-icache.
+	(spu_elf_modify_program_headers: Likewise.
+
+	* elf32-spu.h (struct spu_elf_params): Add lrlive_analysis.  Rename
+	num_regions to num_lines.  Add line_size and max_branch.
+	(enum _ovly_flavour): Add ovly_soft_icache.
+	(spu_elf_build_stubs): Delete.
+
+2009-01-11  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elflink.c (_bfd_elf_section_already_linked): Handle g++-3.4
+	relocations in `.gnu.linkonce.r.*' referencing its `.gnu.linkonce.t.*'.
+
+2009-01-07  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (cris_elf_relocate_section) <case R_CRIS_32_GD>
+	<case R_CRIS_16_GOT_GD, R_CRIS_32_GOT_GD>: For a symbol defined in
+	the program, the known offset starts at the negative size of the
+	TLS section.
+	<case R_CRIS_32_IE, R_CRIS_32_GOT_TPREL, R_CRIS_16_GOT_TPREL>:
+	Similar.
+
+2009-01-05  Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* config.bfd: Add lm32-*-rtems*.
+
+2009-01-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* coff-ppc.c: Add 2009 to Copyright.
+	* elf32-cris.c: Likewise.
+	* elflink.c: Likewise.
+
+2009-01-03  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (elf_cris_finish_dynamic_symbol): Rename
+	gotplt_index to rela_plt_index.  Adjust for R_CRIS_DTPMOD entry.
+
+2009-01-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/9679
+	* elflink.c (elf_merge_st_other): New.
+	(_bfd_elf_merge_symbol): Use it on skipped weak definitions and
+	hide them if needed.
+	(elf_link_add_object_symbols): Updated.
+
+2009-01-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/9676
+	* elflink.c (elf_link_add_object_symbols): Update def_dynamic,
+	ref_dynamic and dynamic_def fields when setting def_regular
+	to 1.
+
+2009-01-02  Curtis Mackie  <curtmackevo@gmail.com>
+
+	PR 9682
+	* coff-ppc.c (dump_toc): Fix up calls to fprintf without a string
+	literal.
+
+For older changes see ChangeLog-2008
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-2010 sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-2010
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-2010	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-2010	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3562 @@
+2010-12-31  Robert Millan  <rmh@gnu.org>
+
+	* config.bfd: Recognize mips-freebsd and mips-kfreebsd-gnu.
+	* configure.host: Likewise.
+	* configure.in: Support for `bfd_elf32_ntradbigmips_freebsd_vec',
+	`bfd_elf32_ntradlittlemips_freebsd_vec',
+	`bfd_elf32_tradbigmips_freebsd_vec',
+	`bfd_elf32_tradlittlemips_freebsd_vec',
+	`bfd_elf64_tradbigmips_freebsd_vec' and
+	`bfd_elf64_tradlittlemips_freebsd_vec'.
+	* configure: Regenerate.
+	* elf32-mips.c: New target for FreeBSD support
+	(same as traditional MIPS but overrides ELF_OSABI
+	with ELFOSABI_FREEBSD).
+	* elf64-mips.c: Likewise.
+	* elfn32-mips.c: Likewise.
+	* targets.c (_bfd_target_vector): Add
+	`bfd_elf32_ntradbigmips_freebsd_vec',
+	`bfd_elf32_ntradlittlemips_freebsd_vec',
+	`bfd_elf32_tradbigmips_freebsd_vec',
+	`bfd_elf32_tradlittlemips_freebsd_vec',
+	`bfd_elf64_tradbigmips_freebsd_vec' and
+	`bfd_elf64_tradlittlemips_freebsd_vec'.
+
+2010-12-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfcode.h (NAME(elf,r_info)): New.
+	(NAME(elf,r_sym)): Likewise.
+
+	* elflink.c (elf64_r_info): Removed.
+	(elf32_r_info): Likewise.
+	(elf64_r_sym): Likewise.
+	(elf32_r_sym): Likewise.
+
+2010-12-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_x86_64_relocs_compatible): New.
+	(elf_backend_relocs_compatible): Defined to
+	elf_x86_64_relocs_compatible.
+
+2010-12-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* archures.c (bfd_mach_x64_32): New.
+	(bfd_mach_x64_32_intel_syntax): Likewise.
+	* bfd-in2.h: Regenerated.
+
+	* config.bfd (targ64_selvecs): Add bfd_elf32_x86_64_vec for
+	i[3-7]86-*-linux-*.
+	(targ_selvecs): Add bfd_elf32_x86_64_vec for x86_64-*-linux-*.
+
+	* configure.in: Support bfd_elf32_x86_64_vec.
+	* configure: Regenerated.
+
+	* cpu-i386.c (bfd_x64_32_arch_intel_syntax): New.
+	(bfd_x64_32_arch): Likewise.
+
+	* elf-bfd.h (elf_append_rela): New prototype.
+	(elf_append_rel): Likewise.
+	(elf64_r_info): Likewise.
+	(elf32_r_info): Likewise.
+	(elf64_r_sym): Likewise.
+	(elf32_r_sym): Likewise.
+
+	* elf64-x86-64.c (ABI_64_P): New.
+	(elf_x86_64_info_to_howto): Replace ELF64_R_TYPE with
+	ELF32_R_TYPE.  Replace ELF64_ST_TYPE with ELF_ST_TYPE.
+	(elf_x86_64_check_tls_transition):Likewise.
+	(elf_x86_64_check_relocs): Likewise.
+	(elf_x86_64_gc_mark_hook):Likewise.
+	(elf_x86_64_gc_sweep_hook): Likewise.
+	(elf_x86_64_relocate_section): Likewise.
+	(elf_x86_64_reloc_type_class): Likewise.
+	(ELF_DYNAMIC_INTERPRETER): Renamed to ...
+	(ELF64_DYNAMIC_INTERPRETER): This.
+	(ELF32_DYNAMIC_INTERPRETER): New.
+	(elf_x86_64_link_hash_table): Add r_info, r_sym, swap_reloca_out,
+	dynamic_interpreter and dynamic_interpreter_size.
+	(elf_x86_64_get_local_sym_hash): Replace ELF64_R_SYM with
+	htab->r_sym.  Replace ELF64_R_INFO with htab->r_info.
+	(elf_x86_64_get_local_sym_hash): Likewise.
+	(elf_x86_64_check_tls_transition):Likewise.
+	(elf_x86_64_check_relocs): Likewise.
+	(elf_x86_64_gc_mark_hook):Likewise.
+	(elf_x86_64_gc_sweep_hook): Likewise.
+	(elf_x86_64_relocate_section): Likewise.
+	(elf_x86_64_finish_dynamic_symbol): Likewise.
+	(elf_x86_64_finish_local_dynamic_symbol): Likewise.
+	(elf_x86_64_link_hash_table_create): Initialize r_info, r_sym,
+	swap_reloca_out, dynamic_interpreter and dynamic_interpreter_size.
+	(elf_x86_64_check_relocs): Check ABI_64_P when requesting for
+	PIC.
+	(elf_x86_64_relocate_section): Likewise.
+	(elf64_x86_64_adjust_dynamic_symbol): Replace sizeof
+	(Elf64_External_Rela) with bed->s->sizeof_rela.
+	(elf64_x86_64_allocate_dynrelocs): Likewise.
+	(elf64_x86_64_size_dynamic_sections): Likewise.
+	(elf64_x86_64_finish_dynamic_symbol): Likewise.
+	(elf64_x86_64_append_rela): Removed.
+	(elf32_x86_64_elf_object_p): New.
+	Add bfd_elf32_x86_64_vec.
+
+	* elf64-x86-64.c (elf64_x86_64_xxx): Renamed to ...
+	(elf_x86_64_xxx): This.
+
+	* elflink.c (bfd_elf_final_link): Check ELF file class on error.
+	(elf_append_rela): New.
+	(elf_append_rel): Likewise.
+	(elf64_r_info): Likewise.
+	(elf32_r_info): Likewise.
+	(elf64_r_sym): Likewise.
+	(elf32_r_sym): Likewise.
+
+	* targets.c (bfd_elf32_x86_64_vec): New.
+	(_bfd_target_vector): Add bfd_elf32_x86_64_vec.
+
+2010-12-24  Alan Modra  <amodra@gmail.com>
+
+	* compress.c (decompress_contents): Style.
+	(bfd_get_full_section_contents): Do not decompress directly into
+	caller buffer or directly return cached section contents.
+	Check malloc return for compressed_buffer.
+
+2010-12-21  Kai Tietz  <kai.tietz@onevision.com>
+
+	* peXXigen.c (_bfd_XXi_final_link_postscript): Use
+	bfd_get_symbol_leading_char to determine "_tls_used" name.
+
+2010-12-21  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	* peXXigen.c (_bfd_XXi_final_link_postscript): Use correct size
+	for windows 64-bit TLS table size.
+
+2010-12-16  DJ Delorie  <dj@redhat.com>
+
+	* reloc.c (BFD_RELOC_RX_ABS16_REV): Add.
+	(BFD_RELOC_RX_ABS32_REV): Add.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* elf32-rx.c (rx_reloc_map): Add them.
+
+2010-12-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (_bfd_elf_new_section_hook): Special handling for
+	.init_array/.fini_array output sections.
+
+2010-12-13  Alan Modra  <amodra@gmail.com>
+
+	* aoutx.h (aout_link_check_ar_symbols): Formatting.
+	* cofflink.c (coff_link_check_ar_symbols): Likewise.
+	* elflink.c (elf_link_add_archive_symbols): Likewise.
+	* pdp11.c (aout_link_check_ar_symbols): Likewise.
+	* xcofflink.c (xcoff_link_check_dynamic_ar_symbols,
+	xcoff_link_check_dynamic_ar_symbols): Likewise.
+
+	* aoutx.h (aout_link_check_archive_element): Simplify code dealing
+	with add_archive_element substitute BFD.
+	* cofflink.c (coff_link_check_archive_element): Likewise.
+	* ecoff.c (ecoff_link_check_archive_element): Likewise.
+	(ecoff_link_add_archive_symbols): Likewise.
+	* linker.c (generic_link_check_archive_element): Likewise.
+	* pdp11.c (aout_link_check_archive_element): Likewise.
+	* vms-alpha.c (alpha_vms_link_add_archive_symbols): Likewise.
+	* xcofflink.c (xcoff_link_check_archive_element): Likewise.
+
+	* aoutx.h (aout_link_check_archive_element): Free symbols from old
+	bfd if !keep_memory.
+	* cofflink.c (coff_link_check_archive_element): Likewise.
+	* pdp11.c (aout_link_check_archive_element): Likewise.
+	* xcofflink.c (xcoff_link_check_archive_element): Likewise.
+
+2010-12-13  Alan Modra  <amodra@gmail.com>
+
+	* plugin.c (bfd_plugin_mkobject): Delete.
+	(plugin_vec): Use bfd_false instead.
+
+2010-12-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (elf_link_add_archive_symbols): Remove subsbfd.
+
+2010-12-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf.c (special_sections_g): Add ".gnu.lto_".
+
+2010-12-10  Alan Modra  <amodra@gmail.com>
+
+	* config.bfd: Configure rs6000-*-aix* as for powerpc-*-aix*.
+	Add aix5coff64_vec to powerpc ELF entries.
+
+2010-12-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* .gitignore: New file.
+
+2010-12-06  Dmitry Gorbachev  <d.g.gorbachev@gmail.com>
+
+	PR ld/12288
+	* plugin.c (message): Add putchar for the trailing `\n'.
+
+2010-12-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.am (!INSTALL_LIBBFD/bfdinclude_HEADERS): Set to nothing.
+	(PLUGINS/bfdinclude_HEADERS): Append plugin-api.h.
+	* Makefile.in: Regenerated.
+
+2010-12-04  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12277
+	* elflink.c (elf_link_output_extsym): Set bfd_error on symbol
+	and section errors.  Allow better translation of error messages.
+
+2010-12-02  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf32-arm.c (elf32_arm_link_hash_table): Remove sgot, sgotplt,
+	srelgot, splt, srelplt.
+	(create_got_section, elf32_arm_link_hash_table_create): Don't set them.
+	(elf32_arm_create_dynamic_sections): Likewise.  Use htab->root
+	fields instead.
+	(arm_type_of_stub): Use the root fields instead of the removed ones.
+	(cortex_a8_erratum_scan, elf32_arm_size_stubs): Likewise.
+	(bfd_elf32_arm_process_before_allocation): Likewise.
+	(elf32_arm_check_relocs, allocate_dynrelocs): Likewise.
+	(elf32_arm_size_dynamic_sections): Likewise.
+	(elf32_arm_output_arch_local_syms): Likewise.
+	(elf32_arm_final_link_relocate): Set sgot, splt and srelgot from the
+	htab fields instead of looking them up by name.  Consistently use
+	these local variables instead of htab fields.
+	(elf32_arm_finish_dynamic_symbol): Likewise sgot, splt and srel.
+	Use srelbss instead of looking it up by name.
+	(elf32_arm_finish_dynamic_sections): Use sgotplt, splt and srelplt
+	instead of looking up the symbols by name.  Use the root fields
+	instead of the removed ones.
+
+2010-12-02  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf32-arm.c (elf32_arm_relocs_copied): Delete.
+	(elf32_arm_link_hash_entry): Replace relocs_copied with dyn_relocs.
+	(elf32_arm_link_hash_newfunc): Update accordingly.
+	(elf32_arm_copy_indirect_symbol, elf32_arm_gc_sweep_hook): Likewise.
+	(elf32_arm_check_relocs, allocate_dynrelocs): Likewise.
+	(elf32_arm_readonly_dynrelocs): Likewise.
+	(elf32_arm_size_dynamic_sections): Likewise.
+
+2010-12-02  Paul Koning  <ni1d@arrl.net>
+
+	* pdp11.c (aout_link_add_symbols): Ignore debug symbols.
+
+2010-11-30  Joel Sherrill  <joel.sherrill@oarcorp.com>
+
+	* config.bfd: Add sparc64-rtems.
+
+2010-11-25  Alan Modra  <amodra@gmail.com>
+
+	* po/es.po: Update.
+	* po/fi.po: Update.
+	* po/fr.po: Update.
+	* po/ja.po: Update.
+	* po/zh_CN.po: Update.
+
+2010-11-24  Joel Brobecker  <brobecker@adacore.com>
+
+	* Makefile.am (OPTIONAL_BACKENDS): Add rs6000-core.lo.
+	(OPTIONAL_BACKENDS_CFILES): Add rs6000-core.c.
+	* Makefile.in: Regenerate.
+
+2010-11-24  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12253
+	* elf-eh-frame.c (_bfd_elf_write_section_eh_frame): Correct
+	DW_EH_PE_datarel handling.  Truncate .eh_frame_hdr address to
+	ptr_size.
+
+2010-11-23  Mingming Sun  <mingm.sun@gmail.com>
+
+	* elfxx-mips.c (mips_set_isa_flags): Move bfd_mach_loongson_3a
+	after bfd_mach_mips_sb1.
+
+2010-11-17  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-lib.c (vms_write_index): Add comments.
+	Partially revert previous patch.  Free blocks later.
+
+2010-11-17  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/12161
+	* elf32-avr.c (elf32_avr_check_relocs): Delete.
+	(elf_backend_check_relocs): Delete.
+
+2010-11-16  Jie Zhang  <jie.zhang@analog.com>
+
+	* elf32-bfin.c (elf32_bfin_code_in_l1): New variable.
+	(elf32_bfin_data_in_l1): New variable.
+	(elf32_bfin_final_write_processing): New.
+	(elf_backend_final_write_processing): Define.
+
+2010-11-15  Mike Frysinger  <vapier@gentoo.org>
+
+	PR binutils/12177
+	* elf32-bfin.c (_bfin_create_got_section): Drop unused flags code.
+
+2010-11-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* archive.c (_bfd_get_elt_at_filepos): Copy BFD_COMPRESS and
+	BFD_DECOMPRESS.
+	(bfd_openr_next_archived_file): Revert the last change.
+
+2010-11-11  Mingming Sun  <mingm.sun@gmail.com>
+
+	* archures.c (bfd_mach_mips_loongson_3a): Defined.
+	* bfd-in2.h (bfd_mach_mips_loongson_3a): Defined.
+	* cpu-mips.c (I_loongson_3a): New add.
+	(arch_info_struct): Add loongson_3a.
+	* elfxx-mips.c (_bfd_elf_mips_mach): Add loongson_3a.
+	(mips_set_isa_flags): Add loongson_3a.
+	(mips_mach_extensions): Add loongson_3a in MIPS64 extensions.
+
+2010-11-10  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* elf32-arm.c (elf32_arm_merge_eabi_attributes): Remove unused
+	variables.
+
+2010-11-10  Nick Clifton  <nickc@redhat.com>
+
+	* po/ja.po: Updated Japanese translation.
+	* po/ru.po: Updated Russian translation.
+
+2010-11-08  Nick Clifton  <nickc@redhat.com>
+
+	* po/ja.po: Updated Japanese translation.
+
+2010-11-08  Alan Modra  <amodra@gmail.com>
+
+	* hash.c (bfd_hash_hash): Extract from..
+	(bfd_hash_lookup): ..here.
+	(bfd_hash_rename): New function.
+	* section.c (bfd_rename_section): New function.
+	* bfd-in.h (bfd_hash_rename): Declare.
+	* bfd-in2.h: Regenerate.
+	* elf.c (_bfd_elf_make_section_from_shdr): Rename input sections
+	when compressing or decompressing.  Don't assert name match.
+	* elf64-hppa.c (get_reloc_section): Don't assert name match.
+	* elfxx-ia64.c (get_reloc_section): Likewise.
+
+2010-11-05  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf32-tic6x.c (elf32_tic6x_obj_attrs_handle_unknown): New.
+	(elf32_tic6x_merge_attributes): Use
+	_bfd_elf_merge_unknown_attribute_low and
+	_bfd_elf_merge_unknown_attribute_list.
+	(elf_backend_obj_attrs_handle_unknown): Define.
+
+2010-11-05  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf-attrs.c (_bfd_elf_merge_unknown_attribute_low,
+	_bfd_elf_merge_unknown_attribute_list): Correct test for matching
+	string attributes.
+
+2010-11-05  Tristan Gingold  <gingold@adacore.com>
+
+	* po/bfd.pot: Regenerate
+
+2010-11-05  Tristan Gingold  <gingold@adacore.com>
+
+	* configure.in: Bump version to 2.21.51
+	* configure: Regenerate.
+
+2010-11-04  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	PR ld/10144
+	* elfxx-mips.c (_bfd_mips_elf_check_relocs)
+	[R_MIPS_32, R_MIPS_REL32, R_MIPS_64]: Ignore relocs from
+	SEC_DEBUGGING sections.
+
+2010-11-04  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-lib.c (vms_write_index): Fix thinko: reverse the loop.
+	Use bfd_zmalloc instead of bfd_malloc.  Fix comment.
+
+2010-11-04  Kai Tietz  <kai.tietz@onevision.com>
+
+	* coffcode.h (GNU_LINKONCE_WT): New.
+	(sec_to_styp_flags): Add handling of new debug
+	section.
+	(styp_to_sec_flags): Likewise.
+
+2010-11-04  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms (CFLAGS): Make badalias warnings informational.
+	* vms-lib.c (vms_lib_bread): Avoid arithmetic on void pointer.
+
+2010-11-04  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf-attrs.c (_bfd_elf_merge_unknown_attribute_low,
+	_bfd_elf_merge_unknown_attribute_list): New.
+	* elf-bfd.h (struct elf_backend_data): Add
+	obj_attrs_handle_unknown.
+	(_bfd_elf_merge_unknown_attribute_low,
+	_bfd_elf_merge_unknown_attribute_list): Declare.
+	* elf32-arm.c (elf32_arm_obj_attrs_handle_unknown): New.  Split
+	out from elf32_arm_merge_eabi_attributes.
+	(elf32_arm_merge_eabi_attributes): Use
+	_bfd_elf_merge_unknown_attribute_low and
+	_bfd_elf_merge_unknown_attribute_list.
+	(elf_backend_obj_attrs_handle_unknown): Define.
+	* elfxx-target.h (elf_backend_obj_attrs_handle_unknown): Define.
+	(elfNN_bed): Update initializer.
+
+2010-11-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfd.c (BFD_FLAGS_FOR_BFD_USE_MASK): New.
+	* bfd-in2.h: Regenerated.
+
+2010-11-02  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf32-tic6x.c (elf32_tic6x_obj_attrs_arg_type): Except for
+	Tag_ABI_compatibility, treat odd tags as strings and even ones as
+	integers.
+	(elf32_tic6x_obj_attrs_order, elf32_tic6x_tag_to_array_alignment,
+	elf32_tic6x_array_alignment_to_tag): New.
+	(elf32_tic6x_merge_attributes): Handle more attributes.  Set type
+	for merged attributes.
+	(elf_backend_obj_attrs_order): Define.
+
+2010-10-29  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* elfxx-mips.c (mips_elf_calculate_relocation): Fix a typo.
+
+2010-10-29  Pawel Sikora  <pluto@pld-linux.org>
+
+	PR binutils/12075
+	* compress.c (bfd_compress_section_contents): Use uLong on
+	compressed_size.
+
+2010-10-29  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf32-tic6x.c (elf32_tic6x_obj_attrs_arg_type): Check
+	Tag_ABI_compatibility not Tag_compatibility.
+	(elf32_tic6x_merge_attributes): Update compatibility attribute
+	name in comment.  Return FALSE if merging common attributes fails.
+
+2010-10-29  Nick Clifton  <nickc@redhat.com>
+
+	PR bintils/6962
+	* coffcode.h (handle_COMDAT): Only check the base type when
+	looking for a section symbol.
+
+2010-10-29  H.J. Lu  <hongjiu.lu@intel.com>
+	    Cary Coutant  <ccoutant@google.com>
+
+	* archive.c (bfd_openr_next_archived_file): Copy BFD_COMPRESS
+	and BFD_DECOMPRESS.
+
+	* bfd.c (BFD_COMPRESS): New.
+	(BFD_DECOMPRESS): Likewise.
+	(BFD_FLAGS_SAVED): Likewise.
+	(bfd_preserve_save): Replace BFD_IN_MEMORY with BFD_FLAGS_SAVED.
+
+	* compress.c (bfd_uncompress_section_contents): Removed.
+	(get_uncompressed_size): New.
+	(decompress_contents): Likewise.
+	(bfd_compress_section_contents): Likewise.
+	(bfd_get_full_section_contents): Likewise.
+	(bfd_is_section_compressed): Likewise.
+	(bfd_init_section_decompress_status): Likewise.
+	(bfd_init_section_compress_status): Likewise.
+
+	* dwarf2.c (dwarf_debug_sections): New.
+	(dwarf_debug_section_enum): Likewise.
+	(read_section): Remove section_name and compressed_section_name.
+	Add dwarf_debug_section_enum.  Try compressed debug section.
+	(read_indirect_string): Updated.
+	(read_abbrevs): Likewise.
+	(decode_line_info): Likewise.
+	(read_debug_ranges): Likewise.
+	(find_line): Updated.
+
+	* ecoff.c (bfd_debug_section): Add compress_status and
+	compressed_size.
+
+	* elf.c (_bfd_elf_make_section_from_shdr): Call
+	bfd_is_section_compressed to check if a DWARF debug section is
+	compressed.  Call bfd_init_section_compress_status or
+	bfd_init_section_decompress_status if needed.
+
+	* elflink.c (elf_link_input_bfd): Replace bfd_get_section_contents
+	with bfd_get_full_section_contents.
+	* merge.c (_bfd_add_merge_section): Likewise.
+	* reloc.c (bfd_generic_get_relocated_section_contents): Likewise.
+	* simple.c (bfd_simple_get_relocated_section_contents): Likewise.
+
+	* elfxx-target.h (TARGET_BIG_SYM): Allow BFD_COMPRESS and
+	BFD_DECOMPRESS.
+	(TARGET_LITTLE_SYM): Likewise.
+
+	* libbfd-in.h (dwarf_debug_section): New.
+	(dwarf_debug_sections): Likewise.
+
+	* libbfd.c (_bfd_generic_get_section_contents): Issue an error
+	when getting contents on compressed/decompressed section.
+
+	* section.c (COMPRESS_SECTION_NONE): New.
+	(COMPRESS_SECTION_DONE): Likewise.
+	(DECOMPRESS_SECTION_SIZED): Likewise.
+	(BFD_FAKE_SECTION): Add compress_status and compressed_size.
+	(bfd_malloc_and_get_section): Replace bfd_get_section_contents
+	with bfd_get_full_section_contents.
+
+	* bfd-in2.h: Regenerated.
+	* libbfd.h: Likewise.
+
+2010-10-29  Bernd Schmidt  <bernds@codesourcery.com>
+	    Joseph Myers  <joseph@codesourcery.com>
+
+	* elf32-tic6x.c (elf32_tic6x_merge_attributes): Check for mismatch
+	of DSBT attributes.
+
+2010-10-25  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf-bfd.h (RELOC_AGAINST_DISCARDED_SECTION): Always call
+	_bfd_clear_contents.  Pass it the input section.
+	* libbfd-in.h (_bfd_clear_contents): Add input_section argument.
+	* libbfd.h: Regenerate.
+	* reloc.c (_bfd_clear_contents): Take input_section argument.
+	Use non-zero for .debug_ranges.
+	(bfd_generic_get_relocated_section_conten): Update _bfd_clear_contents
+	call.
+
+	* elf32-arm.c (elf32_arm_relocate_section): Use
+	RELOC_AGAINST_DISCARDED_SECTION.
+	* elf-m10200.c (mn10200_elf_relocate_section): Likewise.
+	* elf-m10300.c (mn10300_elf_relocate_section): Likewise.
+	* elf32-arm.c (elf32_arm_relocate_section): Likewise.
+	* elf32-avr.c (elf32_avr_relocate_section): Likewise.
+	* elf32-bfin.c (bfin_relocate_section): Likewise.
+	(bfinfdpic_relocate_section): Likewise.
+	* elf32-cr16.c (elf32_cr16_relocate_section): Likewise.
+	* elf32-cr16c.c (elf32_cr16c_relocate_section): Likewise.
+	* elf32-cris.c (cris_elf_relocate_section): Likewise.
+	* elf32-crx.c (elf32_crx_relocate_section): Likewise.
+	* elf32-d10v.c (elf32_d10v_relocate_section): Likewise.
+	* elf32-fr30.c (fr30_elf_relocate_section): Likewise.
+	* elf32-frv.c (elf32_frv_relocate_section): Likewise.
+	* elf32-h8300.c (elf32_h8_relocate_section): Likewise.
+	* elf32-hppa.c (elf32_hppa_relocate_section): Likewise.
+	* elf32-i370.c (i370_elf_relocate_section): Likewise.
+	* elf32-i860.c (elf32_i860_relocate_section): Likewise.
+	* elf32-ip2k.c (ip2k_elf_relocate_section): Likewise.
+	* elf32-iq2000.c (iq2000_elf_relocate_section): Likewise.
+	* elf32-lm32.c (lm32_elf_relocate_section): Likewise.
+	* elf32-m32c.c (m32c_elf_relocate_section): Likewise.
+	* elf32-m32r.c (m32r_elf_relocate_section): Likewise.
+	* elf32-m68hc1x.c (elf32_m68hc11_relocate_section): Likewise.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-mcore.c (mcore_elf_relocate_section): Likewise.
+	* elf32-mep.c (mep_elf_relocate_section): Likewise.
+	* elf32-moxie.c (moxie_elf_relocate_section): Likewise.
+	* elf32-msp430.c (elf32_msp430_relocate_section): Likewise.
+	* elf32-mt.c (mt_elf_relocate_section): Likewise.
+	* elf32-openrisc.c (openrisc_elf_relocate_section): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	* elf32-rx.c (rx_elf_relocate_section): Likewise.
+	* elf32-s390.c (elf_s390_relocate_section): Likewise.
+	* elf32-score.c (s3_bfd_score_elf_relocate_section): Likewise.
+	* elf32-score7.c (s7_bfd_score_elf_relocate_section): Likewise.
+	* elf32-sh.c (sh_elf_relocate_section): Likewise.
+	* elf32-spu.c (spu_elf_relocate_section): Likewise.
+	* elf32-tic6x.c (elf32_tic6x_relocate_section): Likewise.
+	* elf32-v850.c (v850_elf_relocate_section): Likewise.
+	* elf32-vax.c (elf_vax_relocate_section): Likewise.
+	* elf32-xc16x.c (elf32_xc16x_relocate_section): Likewise.
+	* elf32-xstormy16.c (xstormy16_elf_relocate_section): Likewise.
+	* elf32-xtensa.c (elf_xtensa_relocate_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relocate_section_r): Likewise.
+	(elf64_alpha_relocate_section): Likewise.
+	* elf64-hppa.c (elf64_hppa_relocate_section): Likewise.
+	* elf64-mmix.c (mmix_elf_relocate_section): Likewise.
+	* elf64-ppc.c (ppc64_elf_relocate_section): Likewise.
+	* elf64-s390.c (elf_s390_relocate_section): Likewise.
+	* elf64-sh64.c (sh_elf64_relocate_section): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_relocate_section): Likewise.
+	* elfxx-mips.c (_bfd_mips_elf_relocate_section): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_relocate_section): Likewise.
+
+2010-10-25  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf32-tic6x.c: Add attribution.
+
+2010-10-25  Alan Modra  <amodra@gmail.com>
+
+	* elf32-arm.c (find_stub_size_and_template): Avoid uninitialized
+	var warning at -O3.
+
+2010-10-25  Alan Modra  <amodra@gmail.com>
+
+	* opncls.c (bfd_alloc, bfd_zalloc): Don't mark internal.
+	* libbfd-in.h (bfd_alloc, bfd_zalloc): Don't declare here.
+	* libbfd.h: Regenerate
+	* bfd-in2.h: Regenerate.
+
+2010-10-25  Alan Modra  <amodra@gmail.com>
+
+	* opncls.c (_bfd_id_counter): Rename to bfd_id_counter.
+	(bfd_reserved_id_counter, bfd_use_reserved_id): New vars.
+	(_bfd_new_bfd): Use negative id when bfd_use_reserved_id.
+	(bfd_create): Doc fix.
+	* bfd-in2.h: Regenerate.
+
+2010-10-22  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* elfxx-sparc.c (tpoff): Define bed, static_tls_size.
+	Consider static_tls_alignment.
+
+	* elf32-sparc.c (TARGET_BIG_SYM): Redefine to
+	bfd_elf32_sparc_sol2_vec.
+	(TARGET_BIG_NAME): Redefine to elf32-sparc-sol2.
+	(elf32_bed): Redefine to elf32_sparc_sol2_bed.
+	(elf_backend_static_tls_alignment): Redefine to 8.
+	Include elf32-target.h.
+	(elf_backend_static_tls_alignment): Undef again for VxWorks.
+
+	* elf64-sparc.c (TARGET_BIG_SYM): Redefine to
+	bfd_elf64_sparc_sol2_vec.
+	(TARGET_BIG_NAME): Redefine to elf64-sparc-sol2.
+	(ELF_OSABI): Undef.
+	(elf64_bed): Redefine to elf64_sparc_sol2_bed.
+	(elf_backend_static_tls_alignment): Redefine to 16.
+	Include elf64-target.h.
+
+	* config.bfd (sparc-*-solaris2.[0-6]): Split from sparc-*-elf*.
+	Set targ_defvec to bfd_elf32_sparc_sol2_vec.
+	[BFD64] (sparc-*-solaris2*): Set targ_defvec to
+	bfd_elf32_sparc_sol2_vec.
+	Replace bfd_elf64_sparc_vec by bfd_elf64_sparc_sol2_vec in
+	targ_selvecs.
+
+	* configure.in: Handle bfd_elf32_sparc_sol2_vec,
+	bfd_elf64_sparc_sol2_vec.
+	* configure: Regenerate.
+
+	* targets.c (bfd_elf32_sparc_sol2_vec): Declare.
+	(bfd_elf64_sparc_sol2_vec): Declare.
+	(_bfd_target_vector): Add bfd_elf32_sparc_sol2_vec,
+	bfd_elf64_sparc_sol2_vec.
+
+2010-10-21  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf32-tic6x.c (elf32_tic6x_merge_arch_attributes): Update for
+	attribute renaming.
+	(elf_backend_obj_attrs_section): Change to ".c6xabi.attributes".
+
+2010-10-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* elf-bfd.h (struct elf_backend_data): New member
+	static_tls_alignment.
+	* elfxx-target.h (elf_backend_static_tls_alignment): Provide
+	default.
+	(elfNN_bed): Initialize static_tls_alignment.
+	* elflink.c (bfd_elf_final_link): Don't round end of TLS section
+	if static TLS has special alignment requirements.
+	* elf32-i386.c (elf_i386_tpoff): Define bed, static_tls_size.
+	Consider static_tls_alignment.
+	(elf_backend_static_tls_alignment): Redefine for Solaris 2.
+	Undef again for VxWorks.
+	* elf64-x86-64.c (elf64_x86_64_tpoff):  Define bed,
+	static_tls_size.
+	Consider static_tls_alignment.
+	(elf_backend_static_tls_alignment): Redefine for Solaris 2.
+	Undef again for Intel L1OM.
+
+2010-10-14  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	Apply LD plugin patch series (part 6/6).
+	* aoutx.h (aout_link_check_ar_symbols): Take new "subsbfd" reference
+	parameter and pass it when invoking add_archive_element callback.
+	(aout_link_check_archive_element): Handle substitute bfd if it
+	was set during add_archive_element callback in the above.
+	* cofflink.c (coff_link_check_ar_symbols): Take new "subsbfd" reference
+	parameter and pass it when invoking add_archive_element callback.
+	(coff_link_check_archive_element): Handle substitute bfd if it
+	was set during add_archive_element callback in the above.
+	* ecoff.c (read_ext_syms_and_strs): New function holds symbol-reading
+	code factored-out from ecoff_link_check_archive_element.
+	(reread_ext_syms_and_strs): Clear old symbols and call it.
+	(ecoff_link_check_archive_element):  Use the above.  Handle substitute
+	BFD if one is set by add_archive_element callback.
+	(ecoff_link_add_archive_symbols): Likewise allow bfd substitution.
+	* elflink.c (elf_link_add_archive_symbols): Likewise.
+	* linker.c (generic_link_check_archive_element): Likewise.
+	* pdp11.c (aout_link_check_ar_symbols): Take new "subsbfd" reference
+	parameter and pass it when invoking add_archive_element callback.
+	(aout_link_check_archive_element): Handle substitute bfd if it was
+	set during add_archive_element callback in the above.
+	* vms-alpha.c (alpha_vms_link_add_archive_symbols): Handle substitute
+	BFD if one is set by add_archive_element callback.
+	* xcofflink.c (xcoff_link_check_dynamic_ar_symbols): Take new "subsbfd"
+	reference parameter and pass it when invoking add_archive_element
+	callback.
+	(xcoff_link_check_ar_symbols): Likewise.
+	(xcoff_link_check_archive_element): Handle bfd substitution if it was
+	set by callback in the above.
+
+2010-10-11  Alan Modra  <amodra@gmail.com>
+
+	* elf32-frv.c (elf32_frv_relocate_section): Set "name" for global syms.
+	(elf32_frvfdpic_finish_dynamic_sections): Don't crash on
+	__ROFIXUP_END__ defined in shared lib.
+
+2010-10-11  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate)
+	(elf32_arm_relocate_section): Handle relocations against STN_UNDEF.
+
+2010-10-11  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* elflink.c (_bfd_elf_link_output_relocs): Delete unused variable
+	"output_rel_hdr".
+
+2010-10-09  John Tytgat  <john@bass-software.com>
+
+	* reloc.c (BFD_RELOC_ARM_HVC): Add.
+	* libbfd.h: Regenerate.
+
+2010-10-08  Kai Tietz  <kai.tietz@onevision.com>
+
+	* pei-x86_64.c (find_next_xdata_or_end): Removed.
+	(pex64_dump_xdata): Remove arguments stop, onaline,
+	and pdata. New argument endx.  Print term "none"
+	instead of misleading "CFA".
+	(sort_xdata_arr): New function.
+	(pex64_bfd_print_pdata): Use binary search/sort for unwind-RVAs
+	instead of searching quadratic.
+
+2010-10-08  Pierre Muller  <muller@ics.u-strasbg.fr>
+	    Alan Modra  <amodra@gmail.com>
+
+	Fix build with -DDEBUG=7
+	* elf.c (_bfd_elf_symbol_from_bfd_symbol): Remove call
+	to deleted function elf_symbol_flags.  Add typecast to avoid warning.
+	* elf32-rx.c (dump_symbol) : Rename to..
+	(rx_dump_symbol): ..this to avoid link errors.
+	* elflink.c (elf_link_input_bfd): Add typecast to avoid warnings.
+	(bfd_elf_perform_complex_relocation): Likewise.
+	* elf32-xtensa.c (print_action_list): Likewise.
+
+2010-10-06  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_stub_long_branch_any_arm_pic,
+	elf32_arm_stub_long_branch_any_arm_pic): Use a consistent name for
+	ip/r12.
+	(arm_type_of_stub): Remove superfluous braces.
+
+2010-10-04  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* elf-bfd.h (struct bfd_elf_section_reloc_data): New structure.
+	(struct bfd_elf_section_data): New members REL and RELA; delete
+	members REL_HDR, REL_HDR2, REL_COUNT, REL_COUNT2, REL_IDX,
+	REL_IDX2, REL_HASHES.
+	(_bfd_elf_init_reloc_shdr): Adjust declaration.
+	(_bfd_elf_single_rel_hdr): Declare.
+	(RELOC_AGAINST_DISCARDED_SECTION): Use it.
+	* elf.c (bfd_section_from_shdr): Adjusted to match changes in
+	data structures.
+	(_bfd_elf_init_reloc_shdr): New arg RELDATA.  Remove arg REL_HDR.
+	All callers changed.  Allocate memory for the Elf_Internal_Shdr
+	structure.
+	(_bfd_elf_single_rel_hdr): New function.
+	(struct fake_section_arg): New structure.
+	(elf_fake_section): Expect to see a pointer to it in the third
+	argument.  If doing a relocatable link, allocate both REL and RELA
+	sections as needed.
+	(assign_section_numbers): Adjusted to match changes in
+	data structures.
+	(_bfd_elf_compute_section_file_positions): Call elf_fake_sections
+	with a struct fake_section_args argument.
+	* elfcode.h (elf_write_relocs): Adjusted to match changes in
+	data structures.
+	(elf_slurp_reloc_table): Likewise.
+	* elflink.c (_bfd_elf_link_read_relocs): Likewise.
+	(_bfd_elf_link_size_reloc_section): Remove arg REL_HDR, replace with
+	RELDATA.  Remove argument O.  All callers changed.  Remove code to
+	discover the right rel_hdr and count.
+	(_bfd_elf_link_output_relocs): Adjusted to match changes in
+	data structures.
+	(elf_link_adjust_relocs): Remove args REL_HDR, COUNT and REL_HASH;
+	replace with RELDATA.  All callers changed.
+	(elf_link_input_bfd): Correctly generate rel_hash data when both
+	REL and RELA sections are present.
+	(elf_reloc_link_order): Adjusted to match changes in
+	data structures.
+	(bfd_elf_final_link): Simplify code to count relocs.  Free the
+	hashes array for both REL and RELA.
+	(get_dynamic_reloc_section_name): Use _bfd_elf_single_reloc_hdr
+	* elf32-m32r.c (m32r_elf_fake_sections, elf_backend_fake_sections):
+	Delete.
+	* elf32-tic6x.c (elf32_tic6x_fake_sections, elf_backend_fake_sections):
+	Delete.
+	(elf32_tic6x_rel_relocation_p): Adjusted to match changes in
+	data structures.
+	* elf32-microblaze.c (microblaze_elf_check_relocs): Use
+	_bfd_elf_single_rel_hdr.
+	* elf32-ppc.c (ppc_elf_relax_section): Likewise.
+	* elf32-spu.c (spu_elf_relocate_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relocate_section): Likewise.
+	* elf64-hppa.c (get_reloc_section): Likewise.
+	* elf64-mips.c (mips_elf64_slurp_reloc_table): Adjusted to match
+	changes in data structures.
+	(mips_elf64_write_relocs): Use _bfd_elf_single_rel_hdr.
+	* elf64-ppc.c (ppc64_elf_edit_opd): Likewise.
+	(ppc64_elf_edit_toc): Likewise.
+	(get_relocs): Adjusted to match changes in data structures.
+	Allocate an Elf_Internal_Shdr structure if necessary.
+	(ppc64_elf_finish_dynamic_sections): Use _bfd_elf_single_rel_hdr.
+	* elf64-sparc.c (elf64_sparc_slurp_reloc_table): Adjusted to match
+	changes in data structures.
+	* elfxx-ia64.c (get_reloc_section): Use _bfd_elf_single_rel_hdr.
+	* elfxx-mips.c (MIPS_RELOC_RELA_P): Remove macro.
+	(mips_elf_rel_relocation_p): Adjusted to match changes in data
+	structures.
+	(_bfd_mips_elf_relocate_section): Use mips_elf_rel_relocation_p rather
+	than MIPS_RELOC_RELOCA_P.
+	* elfxx-sparc.c (_bfd_sparc_elf_check_relocs): Use
+	_bfd_elf_single_rel_hdr.
+	(_bfd_sparc_elf_relocate_section): Likewise.
+
+2010-10-01  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_size_stubs): Don't choke on local symbols in
+	SHN_UNDEF, SHN_ABS, SHN_COMMON.
+
+2010-09-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/11812
+	* elf32-i386.c (elf_i386_size_dynamic_sections): Don't
+	 allocate .got.plt section if there are no GOT nor PLT
+	 entries and there is no refeence to _GLOBAL_OFFSET_TABLE_.
+	 * elf64-x86-64.c (elf64_x86_64_size_dynamic_sections): Li.kewise.
+
+	* elflink.c (_bfd_elf_define_linkage_sym): Clear non_elf.
+
+2010-09-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure: Regenerate.
+
+2010-09-24  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* elf32-arm.c, elf32-cris.c, elf32-hppa.c, elf32-i370.c, elf32-m32r.c,
+	elf32-m68k.c, elf32-microblaze.c, elf32-ppc.c, elf32-score.c,
+	elf32-score7.c, elf32-sh.c, elf32-vax.c, elf32-xtensa.c, elf64-alpha.c,
+	elf64-hppa.c, elf64-mips.c, elf64-ppc.c, elf64-sparc.c, elfcode.h,
+	elflink.c, elfxx-ia64.c, elfxx-mips.c: Use STN_UNDEF when referring to
+	the zero symbol index.
+
+	* elflink.c (bfd_elf_reloc_symbol_deleted_p): Compare the symbol index
+	to STN_UNDEF, not SHN_UNDEF.
+
+2010-09-23  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* elf32-tic6x.c (elf32_tic6x_fake_sections): New function.
+	(elf_backend_fake_sections): Define.
+
+2010-09-23  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+	* bfd-in2.h (BFD_RELOC_ARM_HVC): New enum value.
+
+2010-09-23  Alan Modra  <amodra@gmail.com>
+
+	* cpu-d10v.c: Make bits_per_address 18 for all arch_info entries.
+
+2010-09-23  Alan Modra  <amodra@gmail.com>
+
+	* elf.c (_bfd_elf_init_private_section_data): Allow for SEC_RELOC
+	difference between input and output section.
+
+2010-09-22  Kai Tietz  <kai.tietz@onevision.com>
+
+	* coffcode.h (sec_to_styp_flags): Adjust debug
+	sections to be conform to pe-coff specification
+	and avoid marking them as excluded.
+	(styp_to_sec_flags): Doing reverse mapping.
+
+	* peXXigen.c (_bfd_XXi_final_link_postscript): Add handling for
+	setting IAT directory entry.
+
+2010-09-20  Richard Henderson  <rth@redhat.com>
+
+	* elf64-alpha.c (elf64_alpha_howto_table): Use bfd_elf_generic_reloc.
+
+2010-09-19  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elfxx-mips.c (mips_elf_link_hash_entry): Add got_only_for_calls.
+	(mips_elf_link_hash_newfunc): Initialize it.
+	(mips_elf_record_global_got_symbol): Add a for_call parameter.
+	(mips_elf_count_got_symbols): Check SYMBOL_CALLS_LOCAL rather
+	than SYMBOL_REFERENCES_LOCAL if the GOT entry is only used for calls.
+	Try to remove .got entries in favour of .got.plt entries on VxWorks.
+	(_bfd_mips_elf_check_relocs): Do not try to avoid allocating
+	a global GOT entry for VxWorks calls.  Update uses of
+	mips_elf_record_global_got_symbol.
+	(allocate_dynrelocs): Set got_only_for_calls to false if the GOT
+	entry is used for dynamic relocations.
+
+2010-09-19  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elfxx-mips.c (mips_got_entry): Adjust commentary.
+	(mips_elf_create_local_got_entry): If given a symbol, check that it
+	has been assigned to the local part of the GOT.
+	(mips_elf_count_got_symbols): Take the bfd_link_info as argument
+	instead of the master GOT.  Put all locally-binding symbols in
+	the local area.
+	(mips_elf_make_got_per_bfd): Use global_got_area to decide whether
+	a symbol lives in the local or global area.
+	(mips_elf_local_relocation_p): Remove check_forced argument and
+	retain only the !check_forced behavior.
+	(mips_elf_calculate_relocation): Adjust call accordingly.
+	Use global_got_area to decide whether an output relocation
+	should be local or global.  Explicitly decay R_MIPS_GOT_PAGE
+	into R_MIPS_GOT_DISP where appropriate.  Fix selection of
+	local vs. global semantics for R_MIPS*_26.  Remove redundant
+	reevaluation of what is stored in was_local_p.
+	(mips_elf_create_dynamic_relocation): Use global_got_area to decide
+	whether the relocation should be against a global or local symbol.
+	(mips_elf_lay_out_got): Update the GOT traversal after the above
+	change to mips_elf_count_got_symbols.
+	(mips_elf_adjust_addend): Adjust call to mips_elf_local_relocation_p.
+	(_bfd_mips_elf_relocate_section): Likewise.
+	(_bfd_mips_elf_finish_dynamic_symbol): Use global_got_area to decide
+	whether the symbol has a global got entry.
+	(_bfd_mips_vxworks_finish_dynamic_symbol): Likewise.
+
+2010-09-19  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elfxx-mips.c (allocate_dynrelocs): Don't add relocation symbols
+	to the global GOT on VxWorks.
+
+2010-09-19  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_check_relocs): On VxWorks,
+	exclude __GOTT_BASE__ and __GOTT_INDEX__ from the warning
+	about HI/LO relocations in shared objects.
+
+2010-09-16  Alan Modra  <amodra@gmail.com>
+
+	* elf32-spu.c (spu_elf_size_sections): Omit fixups for non-alloc
+	sections.
+	(spu_elf_create_sections): Mark .fixup with SEC_LINKER_CREATED and
+	set dynobj.
+	(spu_elf_finish_dynamic_sections): New function.
+	(elf_backend_finish_dynamic_sections): Define.
+
+2010-09-16  Alan Modra  <amodra@gmail.com>
+
+	* elf.c (bfd_elf_get_default_section_type): Don't test SEC_NEVER_LOAD.
+	* elflink.c (elf_link_input_bfd): Likewise.
+
+2010-09-15  Kai Tietz  <kai.tietz@onevision.com>
+
+	* pei-x86_64.c (pex64_get_unwind_info): Reorgnized.
+	(pex64_get_scope_entry): Removed.
+	(find_next_xdata_or_end): New helper.
+	(pex64_dump_xdata): Reworked.
+	(pex64_bfd_print_pdata): Add checking for
+	valid pdata sorting and values. Reworked
+	output.
+
+2010-09-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/12004
+	* plugin.c (bfd_plugin_object_p): Handle NULL iostream.
+
+2010-09-14  Kai Tietz  <kai.tietz@onevision.com>
+
+	* pe-x86_64.c (COFF_SECTION_ALIGNMENT_ENTRIES): Make
+	.rdata, .data, and .text partial matched section names.
+	* pei-x86_64.c: Likewise.
+
+	* peXXigen.c (sort_x64_pdata): New helper.
+	(_bfd_XXi_final_link_postscript): Do pdata sorting.
+
+2010-09-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/11998
+	* elf.c (assign_file_positions_for_load_sections): Don't warn
+	zero LMA adjustment.
+
+2010-09-09  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* elflink.c (bfd_elf_final_link): Correct calculation of
+	max_external_reloc_size.
+
+2010-09-07  Alan Modra  <amodra@gmail.com>
+	    Marcus Brinkmann  <marcus.brinkmann@ruhr-uni-bochum.de>
+
+	* peXXigen.c: Whitespace.
+	(pe_print_idata): Correct section limit calculations.  Tidy array
+	indexing.
+	(_bfd_XX_print_ce_compressed_pdata): Don't leak memory.
+
+2010-09-02  Richard Henderson  <rth@redhat.com>
+
+	* config.bfd (x86_64-*-mingw*): Select 32-bit pei vectors too.
+
+2010-09-01  Pedro Alves  <pedro@codesourcery.com>
+
+	* netbsd-core.c (netbsd_core_core_file_pid): Renamed to ...
+	(netbsd_core_file_pid): ... this.
+
+2010-09-01  Tristan Gingold  <gingold@adacore.com>
+
+	* coffcode.h (coff_slurp_line_table): Add a cast.
+	(coff_slurp_reloc_table): Ditto.
+
+2010-08-30  Gunther Nikl  <gnikl@users.sourceforge.net>
+
+	* cisco-core.c (cisco_core_file_pid): Define.
+
+2010-08-30  Alan Modra  <amodra@gmail.com>
+
+	PR binutils/11953
+	* elf.c (copy_elf_program_header): Calculate map->header_size
+	from lowest_section, not first_section.  Validate program
+	header p_paddr against section lma.  Find lowest_section in
+	second loop over headers.
+
+2010-08-28  Alan Modra  <amodra@gmail.com>
+
+	* elflink.c (_bfd_elf_dynamic_symbol_p): Rename param.  Make
+	common syms local.
+	(_bfd_elf_symbol_refs_local_p): Expand comment.
+	(elf_link_output_extsym): Fix style nit.
+
+2010-08-26  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_final_link): Process stub sections
+	exactly once.
+
+2010-08-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/11939
+	* elflink.c (elf_link_add_object_symbols): Don't set
+	unique_global for non-ELF hash link table.
+
+2010-08-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/11944
+	* elf-bfd.h (elf_backend_data): Add target_id.
+	(bfd_elf_make_generic_object): Renamed to ...
+	(bfd_elf_make_object): This.
+
+	* elf.c (bfd_elf_make_generic_object): Removed.
+	(bfd_elf_make_object): New.
+	(bfd_elf_mkcorefile): Really treat it as an object file.
+
+	* elf-m10300.c (ELF_TARGET_ID): New.
+	* elf32-arm.c (ELF_TARGET_ID): Likewise.
+	* elf32-bfin.c (ELF_TARGET_ID): Likewise.
+	* elf32-cris.c (ELF_TARGET_ID): Likewise.
+	* elf32-frv.c (ELF_TARGET_ID): Likewise.
+	* elf32-i386.c (ELF_TARGET_ID): Likewise.
+	* elf32-lm32.c (ELF_TARGET_ID): Likewise.
+	* elf32-m32r.c (ELF_TARGET_ID): Likewise.
+	* elf32-m68hc11.c (ELF_TARGET_ID): Likewise.
+	* elf32-m68hc12.c (ELF_TARGET_ID): Likewise.
+	* elf32-m68k.c (ELF_TARGET_ID): Likewise.
+	* elf32-microblaze.c (ELF_TARGET_ID): Likewise.
+	* elf32-ppc.c (ELF_TARGET_ID): Likewise.
+	* elf32-s390.c (ELF_TARGET_ID): Likewise.
+	* elf32-sh.c (ELF_TARGET_ID): Likewise.
+	* elf32-sparc.c (ELF_TARGET_ID): Likewise.
+	* elf32-spu.c (ELF_TARGET_ID): Likewise.
+	* elf32-tic6x.c (ELF_TARGET_ID): Likewise.
+	* elf32-xtensa.c (ELF_TARGET_ID): Likewise.
+	* elf64-alpha.c (ELF_TARGET_ID): Likewise.
+	* elf64-hppa.c (ELF_TARGET_ID): Likewise.
+	* elf64-ppc.c (ELF_TARGET_ID): Likewise.
+	* elf64-s390.c (ELF_TARGET_ID): Likewise.
+	* elf64-x86-64.c (ELF_TARGET_ID): Likewise.
+	* elfxx-ia64.c (ELF_TARGET_ID): Likewise.
+
+	* elf32-hppa.c (elf32_hppa_mkobject): Removed.
+	(bfd_elf32_mkobject): Likewise.
+	(ELF_TARGET_ID): New.
+
+	* elf32-mips.c (ELF_TARGET_ID): New.
+	(bfd_elf32_mkobject): Removed.
+
+	* elf64-mips.c (ELF_TARGET_ID): New.
+	(bfd_elf64_mkobject): Removed.
+
+	* elfn32-mips.c (ELF_TARGET_ID): New.
+	(bfd_elf32_mkobject): Removed.
+
+	* elfxx-mips.c (_bfd_mips_elf_mkobject): Removed.
+	* elfxx-mips.h (_bfd_mips_elf_mkobject): Likewise.
+
+	* elfxx-target.h (bfd_elfNN_mkobject): Default to
+	bfd_elf_make_object.
+	(ELF_TARGET_ID): New.  Default to GENERIC_ELF_DATA.
+	(elfNN_bed): Initialize target_id.
+
+2010-08-25  Julian Brown  <julian@codesourcery.com>
+
+	* elf32-arm.c (arm_stub_required_alignment): New.
+	(arm_build_one_stub): Use above to partition stubs.
+	(make_branch_to_a8_stub): Use arm_stub_a8_veneer_lwm not
+	arm_stub_a8_veneer_b_cond.
+
+2010-08-25  Alan Modra  <amodra@gmail.com>
+
+	* aout-arm.c (MY(bfd_reloc_type_lookup)): Use bfd_arch_bits_per_address.
+	* aout-ns32k.c (MY(bfd_reloc_type_lookup)): Likewise.
+	* aoutx.h (NAME(aout,reloc_type_lookup)): Likewise.
+	* coff-arm.c (coff_arm_reloc_type_lookup): Likewise.
+	* elf-hppa.h (elf_hppa_reloc_final_type): Likewise.
+	* reloc.c (bfd_default_reloc_type_lookup): Likewise.
+	* riscix.c (riscix_reloc_type_lookup): Likewise.
+
+2010-08-25  Alan Modra  <amodra@gmail.com>
+
+	* elf.c (_bfd_elf_map_sections_to_segments): Don't load program
+	headers if any loaded section wraps the address space.  Simplify
+	~(m-1) to -m.  Use lma rather than vma when determining whether
+	note sections are adjacent.
+
+2010-08-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/11933
+	* elflink.c (elf_link_add_object_symbols): Don't check relocation
+	if input ELF object ID doesn't match output.
+
+2010-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure: Regenerate.
+
+2010-08-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* merge.c (sec_merge_emit): Revert the last checkin.
+
+2010-08-20  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* elf32-sh.c (sh_elf_relocate_section): Handle non-ELF output
+	BFD.
+
+2010-08-20  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* elf32-m68k.c (bfd_elf_m68k_set_target_options): Don't set GOT
+	options unless an m68k hash table has been found.
+
+2010-08-20  Nick Clifton  <nickc@redhat.com>
+
+	* merge.c (sec_merge_emit): Do not zero pad sections that do not
+	have an alignment.
+
+2010-08-18  Pedro Alves  <pedro@codesourcery.com>
+
+	PR corefile/8210
+
+	* bfd-in2.h: Regenerate.
+	* corefile.c (bfd_core_file_pid): New.
+
+	* targets.c (BFD_JUMP_TABLE_CORE): Add NAME##_core_file_pid.
+	(struct bfd_target) <_core_file_pid>: New.
+
+	* libbfd-in.h (_bfd_nocore_core_file_pid): Declare.
+	* libbfd.c (_bfd_nocore_core_file_pid): New.
+
+	* elf-bfd.h (bfd_elf32_core_file_pid, bfd_elf64_core_file_pid):
+	Declare.
+	* elfcode.h (elf_core_file_pid): New define.
+	* elfcore.h (elf_core_file_pid): New function.
+
+	* elf.c (elfcore_make_pid): Rewrite.
+	(elfcore_grok_prstatus): Only set core_pid if not set yet.
+	(elfcore_grok_prstatus) [!HAVE_PRSTATUS_T_PR_WHO]: Fallback to
+	getting the lwpid from prstat.pr_pid.
+
+	* elf64-x86-64.c (elf64_x86_64_grok_prstatus): Write the LWPID to
+	elf_tdata's core_lwpid instead of to core_pid.
+	(elf64_x86_64_grok_psinfo): Extract the the main process's PID,
+	and store it in elf_tdata's core_pid field.
+	* elf32-i386.c (elf_i386_grok_prstatus): Write the LWPID to
+	elf_tdata's core_lwpid instead of to core_pid.
+	(elf_i386_grok_psinfo): Extract the the main process's PID, and
+	store it in elf_tdata's core_pid field.
+
+	* elf32-am33lin.c (elf32_am33lin_grok_prstatus): Write the LWPID
+	to elf_tdata's core_lwpid instead of to core_pid.
+	* elf32-arm.c (elf32_arm_nabi_grok_prstatus): Write the LWPID to
+	elf_tdata's core_lwpid instead of to core_pid.
+	* elf32-cris.c (cris_elf_grok_prstatus): Write the LWPID to
+	elf_tdata's core_lwpid instead of to core_pid.
+	* elf32-frv.c (elf32_frv_grok_prstatus): Write the LWPID to
+	elf_tdata's core_lwpid instead of to core_pid.
+	* elf32-hppa.c (elf32_hppa_grok_prstatus): Write the LWPID to
+	elf_tdata's core_lwpid instead of to core_pid.
+	* elf32-mips.c (elf32_mips_grok_prstatus): Write the LWPID to
+	elf_tdata's core_lwpid instead of to core_pid.
+	* elf32-ppc.c (ppc_elf_grok_prstatus): Write the LWPID to
+	elf_tdata's core_lwpid instead of to core_pid.
+	* elf32-s390.c (elf_s390_grok_prstatus): Write the LWPID to
+	elf_tdata's core_lwpid instead of to core_pid.
+	* elf32-score.c (s3_bfd_score_elf_grok_prstatus): Write the LWPID
+	to elf_tdata's core_lwpid instead of to core_pid.
+	* elf32-score7.c (s7_bfd_score_elf_grok_prstatus): Write the LWPID
+	to elf_tdata's core_lwpid instead of to core_pid.
+	* elf32-sh.c (elf32_shlin_grok_prstatus): Write the LWPID to
+	elf_tdata's core_lwpid instead of to core_pid.
+	* elf32-xtensa.c (elf_xtensa_grok_prstatus): Write the LWPID to
+	elf_tdata's core_lwpid instead of to core_pid.
+	* elf64-hppa.c (elf64_hppa_grok_prstatus): Write the LWPID to
+	elf_tdata's core_lwpid instead of to core_pid.
+	* elf64-mips.c (elf64_mips_grok_prstatus): Write the LWPID to
+	elf_tdata's core_lwpid instead of to core_pid.
+	* elf64-ppc.c (ppc64_elf_grok_prstatus): Write the LWPID to
+	elf_tdata's core_lwpid instead of to core_pid.
+	* elfn32-mips.c (elf32_mips_grok_prstatus): Write the LWPID to
+	elf_tdata's core_lwpid instead of to core_pid.
+
+	* plugin.c (bfd_plugin_core_file_pid): New function.
+	* aout-target.h (MY_core_file_pid): Define.
+	* aout-tic30.c (MY_core_file_pid, MY_core_file_p): New defines.
+	* coff-rs6000.c (coff_core_file_pid): New define.
+	(rs6000coff_vec, pmac_xcoff_vec): Use BFD_JUMP_TABLE_CORE.
+	* coff64-rs6000.c (coff_core_file_pid): New define.
+	(rs6000coff64_vec): Use BFD_JUMP_TABLE_CORE.
+	(xcoff64_core_file_pid): New define.
+	(aix5coff64_vec): Use BFD_JUMP_TABLE_CORE.
+	* mach-o-target.c (bfd_mach_o_core_file_pid): New define.
+	* aix386-core.c (aix386_core_file_pid): New define.
+	* hppabsd-core.c (hppabsd_core_core_file_pid): New define.
+	* hpux-core.c (hpux_core_core_file_pid): New define.
+	* irix-core.c (irix_core_core_file_pid): New define.
+	* lynx-core.c (lynx_core_file_pid): New define.
+	* osf-core.c (osf_core_core_file_pid): New define.
+	* ptrace-core.c (ptrace_unix_core_file_pid): New define.
+	* sco5-core.c (sco5_core_file_pid): New define.
+	* xcoff-target.h (coff_core_file_pid): New define.
+	* netbsd-core.c (netbsd_core_core_file_pid): New define.
+
+2010-08-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/11913
+	* elf32-i386.c (elf_i386_finish_dynamic_sections): Check if
+	 .got.plt section is discarded.
+	 * elf64-x86-64.c (elf64_x86_64_finish_dynamic_sections): Likewise.
+
+2010-08-13  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf32-m69k.c (elf32_m68k_print_private_bfd_data): Detect EMAC_B
+	variant.
+
+2010-08-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/11909
+	* Makefile.am (coff-tic4x.lo): New.  Disable -Werror.
+	(coff-tic54x.lo): Likewise.
+	* Makefile.in: Regenerated.
+
+2010-08-12  Todd Veldhuizen  <todd.veldhuizen@logicblox.com>
+
+	PR ld/11843
+	* elflink.c (compute_bucket_count): Avoid futile long searches for
+	the best bucket size.
+
+2010-08-09  Richard Henderson  <rth@redhat.com>
+
+	PR ld/11891
+	* elf64-alpha.c (elf64_alpha_relax_tls_get_addr): Disallow relaxing
+	to tlshi/lo until pos0 and pos1 are adjacent.  Use the destination
+	register from the tldgd insn.
+
+2010-08-09  Catherine Moore  <clm@codesourcery.com>
+
+	* elfxx-mips.c (mips_elf_perform_relocation): Improve
+	interlinking error message.
+
+2010-08-06  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (ha_reloc_match): Allow matches to other than r2.
+	(ppc64_elf_relocate_section): Nop out high part insn of large toc
+	code sequence when the high part of offset is zero.
+
+2010-08-04  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (alpha_vms_build_fixups): Write the EICP.
+	(alpha_vms_bfd_final_link): Explicitly forbid relocatable links.
+	Clear the SEC_RELOC flag.
+
+2010-08-04  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (alpha_vms_create_eisd_for_section): Make writable
+	sections with relocs.
+	(alpha_vms_add_fixup_lp): Set SEC_RELOC flag.
+	(alpha_vms_add_fixup_ca): Ditto.
+	(alpha_vms_add_fixup_qr): Ditto.
+	Add comments.
+
+2010-08-04  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (alpha_vms_create_eisd_for_section): Do not make
+	CODE sections writable.
+
+2010-08-04  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (alpha_vms_add_lw_fixup): Renamed to ...
+	(alpha_vms_add_fixup_lr): ... this for consistency.
+	(alpha_vms_add_qw_fixup): Removed.
+	Fix some comments.
+	(vms_get_symbol_info): Adjust type for unknown sections.
+
+2010-08-04  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (_bfd_vms_slurp_egsd): Use the canonical absolute
+	section for any absolute section.  Remove some debugging code.
+
+2010-08-03  DJ Delorie  <dj@redhat.com>
+
+	* elf32-m32c.c (ELF_MAXPAGESIZE): Change page size to 256 bytes.
+
+2010-08-03  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-misc.c (vms_convert_to_var): Make it static.
+	(_bfd_vms_convert_to_var_unix_filename): Make it public.
+
+2010-08-03  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms (OBJS): Update list.
+
+2010-08-03  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (_bfd_vms_slurp_egsd): Do not set SEC_HAS_CONTENTS
+	nor SEC_RELOC for empty sections.
+
+2010-08-03  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (evax_section_flags): Fix flags for absolute
+	section.  Remove useless parenthesis.
+
+2010-08-03  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-lib.c (vms_lib_bread_raw): Change type of BUF argument.
+	(vms_lib_bread, vms_lib_bopen): Adjust.
+
+2010-08-02  Alan Modra  <amodra@gmail.com>
+
+	PR 11866
+	* elf.c (assign_file_positions_for_load_sections): Use p_vaddr to
+	calculate off_adjust rather than first section vma.
+
+2010-07-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elflink.c (compute_bucket_count): Add ATTRIBUTE_UNUSED to info.
+
+2010-07-30  Anthony Green  <green@moxielogic.com>
+
+	* config.bfd (targ_cpu): Add moxie-*-rtems support.
+
+2010-07-29  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (ppc64_elf_edit_toc): Always adjust local syms in
+	.toc section, even when none are used in relocs.
+
+2010-07-27  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* elfxx-mips.h: Include "elf/mips.h".
+	(gprel16_reloc_p): New static inline function.
+	* elfxx-mips.c (_bfd_mips_elf_check_relocs)
+	[R_MIPS16_GOT16, R_MIPS_GOT16, R_MIPS_GOT_HI16, R_MIPS_GOT_LO16]:
+	Use got16_reloc_p.
+	(_bfd_mips_elf_relocate_section)[bfd_reloc_overflow]: Use
+	gprel16_reloc_p.
+	* elf32-mips.c (mips_info_to_howto_rel): Likewise.
+	* elfn32-mips.c (mips_info_to_howto_rel): Likewise.
+
+2010-07-27  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* elf64-mips.c (mips_elf64_howto_table_rela)
+	[R_MIPS_TLS_DTPMOD64]: Clear partial_inplace.
+	[R_MIPS_TLS_DTPREL64, R_MIPS_TLS_GD, R_MIPS_TLS_LDM]: Likewise.
+	[R_MIPS_TLS_DTPREL_HI16, R_MIPS_TLS_DTPREL_LO16]: Likewise.
+	[R_MIPS_TLS_GOTTPREL, R_MIPS_TLS_TPREL64]: Likewise.
+	[R_MIPS_TLS_TPREL_HI16, R_MIPS_TLS_TPREL_LO16]: Likewise.
+	* elfn32-mips.c (elf_mips_howto_table_rela)
+	[R_MIPS_TLS_DTPMOD32]: Likewise.
+	[R_MIPS_TLS_DTPREL32, R_MIPS_TLS_GD, R_MIPS_TLS_LDM]: Likewise.
+	[R_MIPS_TLS_DTPREL_HI16, R_MIPS_TLS_DTPREL_LO16]: Likewise.
+	[R_MIPS_TLS_GOTTPREL, R_MIPS_TLS_TPREL32]: Likewise.
+	[R_MIPS_TLS_TPREL_HI16, R_MIPS_TLS_TPREL_LO16]: Likewise.
+
+2010-07-23  Naveen.H.S  <naveen.S@kpitcummins.com>
+	    Ina Pandit  <ina.pandit@kpitcummins.com>
+
+	* archures.c (DESCRIPTION): Define bfd_mach_v850e2 and
+	bfd_mach_v850e2v3.
+	* reloc.c (bfd_architecture): Define bfd_mach_v850e2 and
+	bfd_mach_v850e2v3.
+	(BFD_RELOC_V850_16_PCREL, BFD_RELOC_V850_17_PCREL,
+	BFD_RELOC_V850_22_PCREL, BFD_RELOC_V850_23,
+	BFD_RELOC_V850_32_PCREL, BFD_RELOC_V850_32_ABS,
+	BFD_RELOC_V850_16_SPLIT_OFFSET, BFD_RELOC_V850_16_S1,
+	BFD_RELOC_V850_LO16_SPLIT_OFFSET, BFD_RELOC_V850_SDA_15_16_OFFSET,
+	BFD_RELOC_V850_ZDA_16_16_OFFSET, BFD_RELOC_V850_CALLT_15_16_OFFSET,
+	BFD_RELOC_V850_32_GOTPCREL, BFD_RELOC_V850_16_GOT,
+	BFD_RELOC_V850_32_GOT, BFD_RELOC_V850_22_PLT_PCREL,
+	BFD_RELOC_V850_32_PLT_PCREL, BFD_RELOC_V850_COPY,
+	BFD_RELOC_V850_GLOB_DAT, BFD_RELOC_V850_JMP_SLOT,
+	BFD_RELOC_V850_RELATIVE, BFD_RELOC_V850_16_GOTOFF,
+	BFD_RELOC_V850_32_GOTOFF, BFD_RELOC_V850_CODE,
+	BFD_RELOC_V850_DATA): New relocations for V850 target.
+	* config.bfd: Match all v850 targets.
+	* cpu-v850.c (arch_info_struct): Define V850e2 and V850e2v3.
+	* elf32-v850.c (v850_elf_check_relocs): Check the newly added
+	relocations.
+	(v850_elf_perform_relocation ): Update the newly added
+	relocations.
+	(v850_elf_howto_t): Update the specifications of added
+	relocations.
+	(v850_elf_reloc_map): Update the relocation mappings.
+	(v850_elf_final_link_relocate): Maps added relocation into the
+	appropriate howto structure.
+	(v850_elf_object_p): Add support for V850E2 and V850E2V3.
+	(v850_elf_final_write_processing): Likewise.
+	(v850_elf_merge_private_bfd_data): Likewise.
+	(v850_elf_print_private_bfd_data): Likewise.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
+2010-07-23  Alan Modra  <amodra@gmail.com>
+
+	* archive.c (_bfd_archive_bsd44_construct_extended_name_table):
+	Correct format specifier.
+
+2010-07-22  Alan Modra  <amodra@gmail.com>
+
+	* ecoff.c: Don't include aout/ranlib.h.
+	(_bfd_ecoff_slurp_armap): Use correct struct for ardata->symdefs.
+	(_bfd_ecoff_write_armap): Output ar_date and ar_size using
+	_bfd_ar_spacepad.
+
+2010-07-22  Alan Modra  <amodra@gmail.com>
+
+	* aoutx.h (some_aout_object_p): Don't set EXEC_P for files with
+	relocs.
+
+2010-07-20  Alan Modra  <amodra@gmail.com>
+
+	* elf.c (assign_file_positions_for_load_sections): Check that
+	zero size sections are allocated in segments too.
+	(assign_file_positions_for_non_load_sections): Warn if zero
+	size alloc sections are found here.
+	(copy_elf_program_header): Don't drop zero size sections from
+	segment map.
+	(copy_private_bfd_data): Check for changes in zero size sections.
+
+2010-07-17  Alan Modra  <amodra@gmail.com>
+
+	* elf.c (_bfd_elf_map_sections_to_segments): Force new segment
+	for sections with overlapping LMAs.
+	(assign_file_positions_for_load_sections): Catch overlap for
+	sections that wrap around the address space.  Replace a
+	warning that duplicates ld's --check-sections error with a
+	warning that lma has been adjusted for overlapping sections.
+
+2010-07-14  Cary Coutant  <ccoutant@google.com>
+
+	PR ld/11817
+	* dwarf2.c (read_section): Revert patch for compressed debug sections.
+	(find_line): Likewise.
+	(read_and_uncompress_section): Remove.
+
+2010-07-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/11812
+	* elf32-i386.c (elf_i386_size_dynamic_sections): Don't
+	 allocate .got.plt section if there are no GOT nor PLT
+	 entries.
+	 * elf64-x86-64.c (elf64_x86_64_size_dynamic_sections): Likewise.
+
+2010-07-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/11791
+	* elf-ifunc.c (_bfd_elf_allocate_ifunc_dyn_relocs): Support
+	garbage collection against STT_GNU_IFUNC symbols.
+
+	* elf32-i386.c (elf_i386_get_local_sym_hash): Don't set
+	elf.plt.offset/elf.got.offset to -1.
+	(elf_i386_tls_transition): Skip TLS transition for functions.
+	(elf_i386_gc_sweep_hook): Support STT_GNU_IFUNC symbols.
+
+	* elf64-x86-64.c (elf64_x86_64_get_local_sym_hash): Don't set
+	elf.plt.offset/elf.got.offset to -1.
+	(elf64_x86_64_tls_transition): Skip TLS transition for functions.
+	(elf64_x86_64_gc_sweep_hook): Support STT_GNU_IFUNC symbols.
+
+2010-07-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_check_relocs): Re-indent.
+	(elf_i386_relocate_section): Likewise.
+
+2010-07-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* dwarf2.c (add_line_info): Initialize prev_line.
+
+2010-07-06  Alan Modra  <amodra@gmail.com>
+
+	* elf32-ppc.c (ppc_elf_relax_section): Insert branch around
+	trampolines only for .init and .fini sections.
+
+2010-07-05  Alan Modra  <amodra@gmail.com>
+
+	* elf32-ppc.c: Formatting.
+	(ppc_elf_finish_dynamic_sections): Don't make plt_entry var static.
+
+2010-07-03  Cary Coutant  <ccoutant@google.com>
+
+	* compress.c (bfd_uncompress_section_contents): Add ATTRIBUTE_UNUSED.
+	* dwarf2.c (read_and_uncompress_section): New function.
+	(read_section): Call it.
+	(find_line): Likewise.
+
+2010-07-01  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (ppc64_elf_edit_toc): Use SYMBOL_CALLS_LOCAL rather
+	than SYMBOL_REFERENCES_LOCAL.
+	(ppc64_elf_relocate_section): Likewise.
+
+2010-07-01  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (ppc64_elf_edit_toc): Keep toc entries for ifuncs.
+
+2010-06-29  Alan Modra  <amodra@gmail.com>
+
+	* cpu-maxq.c: Delete file.
+	* coff-maxq.c: Delete file.
+	* Makefile.am: Remove references to maxq.
+	* archures.c: Likewise.
+	* coffcode.h: Likewise.
+	* configure.in: Likewise.
+	* targets.c: Likewise.
+	* config.bfd: Move maxq from obsolete to removed.
+	* Makefile.in: Regenerate.
+	* bfd-in2.h: Regenerate.
+	* configure: Regenerate.
+	* libbfd.h: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
+2010-06-28  Alan Modra  <amodra@gmail.com>
+
+	* compress.c (bfd_uncompress_section_contents): Use ATTRIBUTE_UNUSED
+	to silence gcc warning.
+
+2010-06-27  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (get_tls_mask): Don't segfault on NULL elf_section_data.
+	(group_sections): Likewise.
+
+2010-06-27  Alan Modra  <amodra@gmail.com>
+
+	* bout.c (aligncode): Delete set but unused variables.
+	* coff-mcore.c (coff_mcore_relocate_section): Likewise.
+	* coff-ppc.c (ppc_record_toc_entry): Likewise.
+	(coff_ppc_relocate_section): Likewise.
+	* coff-rs6000.c (xcoff_complain_overflow_bitfield_func): Likewise.
+	* elf-m10200.c (mn10200_elf_relax_delete_bytes): Likewise.
+	* elf-m10300.c (mn10300_elf_final_link_relocate): Likewise.
+	(mn10300_elf_relax_section): Likewise.
+	* elf32-arm.c (arm_build_one_stub, arm_size_one_stub): Likewise.
+	(record_vfp11_erratum_veneer): Likewise.
+	(bfd_elf32_arm_vfp11_erratum_scan): Likewise.
+	(elf32_arm_final_link_relocate): Likewise.
+	(elf32_arm_check_relocs, arm_map_one_stub): Likewise.
+	* elf32-avr.c (elf32_avr_relax_delete_bytes): Likewise.
+	(elf32_avr_relax_section): Likewise.
+	(avr_mark_stub_not_to_be_necessary): Likewise.
+	* elf32-bfin.c (_bfin_create_got_section): Likewise.
+	* elf32-cr16.c (cr16_elf_final_link_relocate): Likewise.
+	(elf32_cr16_relax_delete_bytes): Likewise.
+	* elf32-cr16c.c (cr16c_elf_final_link_relocate): Likewise.
+	* elf32-cris.c (elf_cris_finish_dynamic_symbol): Likewise.
+	* elf32-crx.c (elf32_crx_relax_delete_bytes): Likewise.
+	* elf32-h8300.c (elf32_h8_relax_section): Likewise.
+	(elf32_h8_relax_delete_bytes): Likewise.
+	* elf32-hppa.c (elf32_hppa_check_relocs): Likewise.
+	* elf32-i370.c (i370_elf_check_relocs): Likewise.
+	(elf_relocate_section): Likewise.
+	* elf32-ip2k.c (adjust_all_relocations): Likewise.
+	(ip2k_elf_relax_section): Likewise.
+	* elf32-lm32.c (lm32_elf_relocate_section): Likewise.
+	(lm32_elf_check_relocs): Likewise.
+	(lm32_elf_finish_dynamic_sections): Likewise.
+	(lm32_elf_finish_dynamic_symbol): Likewise.
+	* elf32-m32c.c (m32c_offset_for_reloc): Likewise.
+	(m32c_elf_relax_delete_bytes): Likewise.
+	* elf32-m32r.c (m32r_elf_finish_dynamic_symbol): Likewise.
+	(m32r_elf_finish_dynamic_sections): Likewise.
+	(m32r_elf_check_relocs, m32r_elf_fake_sections): Likewise.
+	* elf32-m68hc11.c (m68hc11_elf_relax_section): Likewise.
+	* elf32-m68hc1x.c (elf32_m68hc11_relocate_section): Likewise.
+	* elf32-m68k.c (elf_m68k_gc_sweep_hook): Likewise.
+	* elf32-microblaze.c (microblaze_elf_relocate_section): Likewise.
+	(microblaze_elf_check_relocs): Likewise.
+	(microblaze_elf_finish_dynamic_symbol): Likewise.
+	* elf32-msp430.c (msp430_elf_relax_delete_bytes): Likewise.
+	* elf32-ppc.c (ppc_elf_tls_optimize): Likewise.
+	* elf32-rx.c (rx_elf_relocate_section): Likewise.
+	(elf32_rx_relax_delete_bytes, rx_offset_for_reloc): Likewise.
+	(elf32_rx_relax_section): Likewise.
+	* elf32-score.c (score_elf_got_offset_from_index): Likewise.
+	(score_elf_final_link_relocate): Likewise.
+	(s3_bfd_score_elf_relocate_section): Likewise.
+	* elf32-score7.c (score_elf_got_offset_from_index): Likewise.
+	(s7_bfd_score_elf_relocate_section): Likewise.
+	* elf32-sh.c (sh_elf_check_relocs): Likewise.
+	* elf32-spu.c (spu_elf_relocate_section): Likewise.
+	* elf32-v850.c (v850_elf_check_relocs): Likewise.
+	(find_remembered_hi16s_reloc): Likewise.
+	* elf32-vax.c (elf32_vax_merge_private_bfd_data): Likewise.
+	(elf_vax_relocate_section): Likewise.
+	* elf32-xc16x.c (elf32_xc16x_relocate_section): Likewise.
+	* elf32-xtensa.c (xlate_offset_with_removed_text): Likewise.
+	(move_literal): Likewise.
+	* elf64-hppa.c (elf64_hppa_section_from_shdr): Likewise.
+	(elf64_hppa_check_relocs): Likewise.
+	(elf64_hppa_finish_dynamic_symbol): Likewise.
+	(elf64_hppa_relocate_section): Likewise.
+	* elf64-mmix.c (mmix_elf_reloc, mmix_elf_relax_section): Likewise.
+	* elf64-ppc.c (ppc64_elf_check_relocs): Likewise.
+	(ppc64_elf_edit_opd, ppc64_elf_edit_toc): Likewise.
+	* elfxx-ia64.c (elfNN_ia64_section_from_shdr): Likewise.
+	(elfNN_vms_section_from_shdr): Likewise.
+	* elfxx-sparc.c (_bfd_sparc_elf_check_relocs): Likewise.
+	(_bfd_sparc_elf_relocate_section): Likewise.
+	* hp300hpux.c (slurp_symbol_table): Likewise.
+	* i386lynx.c (swap_std_reloc_out, swap_std_reloc_in): Likewise.
+	* mach-o.c (bfd_mach_o_write_thread): Likewise.
+	* mmo.c (mmo_scan, mmo_write_symbols_and_terminator): Likewise.
+	* nlm32-sparc.c (nlm_sparc_read_reloc): Likewise.
+	* pdp11.c (pdp11_aout_link_input_section): Likewise.
+	(aout_link_input_section, aout_link_input_bfd): Likewise.
+	* pe-mips.c (mips_swap_reloc_out): Likewise.
+	(coff_pe_mips_relocate_section): Likewise.
+	* som.c (som_bfd_ar_write_symbol_stuff): Likewise.
+	* vms-alpha.c (_bfd_vms_slurp_egsd): Likewise.
+	* xsym.c (bfd_sym_fetch_type_information_table_ent): Likewise.
+
+	* coff-i860.c (i860_reloc_processing): Avoid set but unused warning.
+	* coffcode.h (coff_compute_section_file_positions): Likewise.
+	(coff_slurp_reloc_table): Likewise.
+	* cpu-arm.c (arm_check_note): Likewise.
+	* elf-bfd.h (RELOC_FOR_GLOBAL_SYMBOL): Likewise.
+	* elf32-avr.c (elf32_avr_relocate_section): Likewise.
+	* elf32-bfin.c (elf32_bfin_merge_private_bfd_data): Likewise.
+	* elf32-ip2k.c (ip2k_elf_relocate_section): Likewise.
+	* elf32-moxie.c (moxie_elf_relocate_section): Likewise.
+	* elf32-msp430.c (elf32_msp430_relocate_section): Likewise.
+	* elf32-sh64.c (_bfd_sh_align_load_span): Likewise.
+	* ieee.c (parse_expression): Likewise.
+	(ieee_slurp_external_symbols, drop_int): Likewise.
+	* peXXigen.c (pe_print_pdata): Likewise.
+	* versados.c (process_esd): Likewise.
+
+2010-06-25  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (_bfd_vms_write_egsd): Check absolute section with
+	its flags.  Create an absolute section if needed.
+
+2010-06-25  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (_bfd_vms_write_egsd): Set target_index field of
+	sections.  Mark .vmsdebug section as SEC_DEBUGGING.  Do not create
+	dummy psect anymore.  Adjust.
+	(_bfd_vms_write_eeom): Adjust (use target_index instead of index)
+	(_bfd_vms_write_etir): Ditto.
+	(start_etir_or_etbt_record): Test for SEC_DEBUGGING instead of
+	section name.  Adjust.
+
+2010-06-25  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (alpha_vms_write_exec): Set linktime field.
+
+2010-06-25  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (toc_skip_enum): Define.
+	(ppc64_elf_edit_toc): Use two low bits of skip array as markers.
+	Optimize largetoc sequences.
+	(adjust_toc_syms): Update for skip array change.
+	(ppc64_elf_relocate_section): Handle R_PPC64_LO_DS_OPT.
+
+2010-06-25  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (is_static_defined): New function.
+	(get_tls_mask, ppc_type_of_stub): Use it here.
+	(ppc64_elf_edit_opd): Ensure we only attempt to edit ppc64 input.
+	(ppc64_elf_tls_setup): Typo fix.
+	(adjust_toc_syms): Correctly handle symbols defined past the end
+	of the toc.  Move syms on removed entries to next entry rather
+	than to start of toc.
+	(ppc64_elf_edit_toc): Likewise.  Ensure we only attempt to
+	edit ppc64 input.  Allocate one extra word in skip array.
+	Honour info->keep_memory when reading relocs if we can.
+	Adjust toc relocs after adjusting symbols.
+
+2010-06-23  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* archive64.c (bfd_elf64_archive_write_armap): Fix buffer overrun
+	when scaning map.
+
+2010-06-17  Tristan Gingold  <gingold@adacore.com>
+
+	* Makefile.am (BFD32_BACKENDS_CFILES): Move vms-alpha.c to ...
+	(BFD64_BACKENDS_CFILES): ... here.
+	(BFD32_BACKENDS): Move vms-alpha.lo to ...
+	(BFD64_BACKENDS): ... here.
+	* Makefile.in: Regenerate.
+
+2010-06-15  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf-bfd.h (LEAST_KNOWN_OBJ_ATTRIBUTE): Decrease to 2.
+	* elf32-tic6x.c (elf32_tic6x_obj_attrs_arg_type,
+	elf32_tic6x_merge_arch_attributes, elf32_tic6x_merge_attributes,
+	elf32_tic6x_merge_private_bfd_data): New.
+	(bfd_elf32_bfd_merge_private_bfd_data,
+	elf_backend_obj_attrs_arg_type, elf_backend_obj_attrs_section,
+	elf_backend_obj_attrs_section_type, elf_backend_obj_attrs_vendor):
+	Define.
+	* elf32-tic6x.h (elf32_tic6x_merge_arch_attributes): Declare.
+
+2010-06-15  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf-bfd.h (LEAST_KNOWN_OBJ_ATTRIBUTE): Define.
+	(struct elf_backend_data): Update comment on obj_attrs_order.
+	* elf-attrs.c (vendor_obj_attr_size, vendor_set_obj_attr_contents,
+	_bfd_elf_copy_obj_attributes): Use LEAST_KNOWN_OBJ_ATTRIBUTE
+	instead of hardcoded 4.
+	* elf32-arm.c (elf32_arm_obj_attrs_order): Use
+	LEAST_KNOWN_OBJ_ATTRIBUTE and LEAST_KNOWN_OBJ_ATTRIBUTE + 1
+	instead of hardcoded 4 and 5.
+	(elf32_arm_merge_eabi_attributes): Use LEAST_KNOWN_OBJ_ATTRIBUTE
+	instead of hardcoded 4.
+
+2010-06-14  Kevin Buettner  <kevinb@redhat.com>
+
+	* elf32-h8300.c (elf_symbol_leading_char): Define.
+
+2010-06-11  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* vms-alpha.c (_bfd_vms_write_egsd): Make sname const.
+
+2010-06-11  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (_bfd_vms_slurp_egsd): Always set vma of absolute
+	sections to 0.
+
+2010-06-11  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (evax_bfd_print_etir): Handle ETIR__C_STO_GBL_LW.
+
+2010-06-11  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-misc.c (_bfd_vms_output_counted): Make VALUE argument const.
+	Adjust cast.
+	(_bfd_vms_output_dump): Make DATA argument const, adjust cast.
+	* vms.h (_bfd_vms_output_counted, _bfd_vms_output_dump): Adjust.
+	* vms-alpha.c (evax_section_flags): Make it const.
+	(vms_secflag_by_name): Remove unused ABFD argument.
+	Make SECTION_FLAGS and NAME arguments const. Clarify comment.
+	(vms_esecflag_by_name): Make SECTION_FLAGS and NAME arguments const.
+	(_bfd_vms_slurp_egsd): Adjust call to vms_secflag_by_name.
+	(_bfd_vms_write_egsd): Remove useless cast.
+
+2010-06-10  Tristan Gingold  <gingold@adacore.com>
+
+	* config.bfd: Remove #if/#endif so that som can be compiled on any
+	host.
+	* targets.c (_bfd_target_vector): Remove #if/#endif so that som
+	can be used on any host.
+
+2010-06-10  Tristan Gingold  <gingold@adacore.com>
+
+	* som.c: Can now be compiled on any host.
+	Include bfd headers instead of system one.
+	(som_compute_checksum): Parameter is now a pointer to a
+	som_external_header structure.  Adjust.
+	(struct section_to_type): Field section is now const.
+	(R_DLT_REL, R_AUX_UNWIND, R_SEC_STMT): Removed conditional
+	definition.
+	(R_LONG_PCREL_MODE, R_N0SEL, R_N1SEL, R_LINETAB): Ditto.
+	(R_LINETAB_ESC, R_LTP_OVERRIDE, R_COMMENT): Ditto.
+	(som_swap_clock_in, som_swap_clock_out): New functions.
+	(som_swap_header_in, som_swap_header_out): Likewise.
+	(som_swap_space_dictionary_in): Likewise.
+	(som_swap_space_dictionary_out): Likewise.
+	(som_swap_subspace_dictionary_in): Likewise.
+	(som_swap_subspace_dictionary_record_out): Likewise.
+	(som_swap_aux_id_in, som_swap_aux_id_out): Likewise.
+	(som_swap_string_auxhdr_out): Likewise.
+	(som_swap_compilation_unit_out): Likewise.
+	(som_swap_exec_auxhdr_in): Likewise.
+	(som_swap_exec_auxhdr_out): Likewise.
+	(som_swap_lst_header_in): Likewise.
+	(som_object_setup): Adjust parameter type using bfd types.
+	(setup_sections): Likewise.  Ditto for object file types.
+	Use intermediate variables for external representation and use the
+	swap functions to convert.
+	(som_object_p): Ditto.  Remove #ifdef/#endif on always defined
+	macros.
+	(som_prep_headers): Likewise.
+	(som_write_symbol_strings): Likewise.
+	(som_begin_writing): Likewise.
+	(som_finish_writing): Likewise.
+	(som_build_and_write_symbol_table): Likewise.
+	(bfd_section_from_som_symbol): Likewise.
+	(som_slurp_symbol_table): Likewise.
+	(som_bfd_print_private_bfd_data): Likewise.
+	(bfd_som_attach_aux_hdr): Likewise.  Clear the padding.
+	(bfd_som_attach_compilation_unit): Likewise.
+	(som_bfd_count_ar_symbols): Likewise.
+	(som_bfd_fill_in_ar_symbols): Likewise.
+	(som_slurp_armap): Likewise.
+	(som_bfd_ar_write_symbol_stuff): Likewise.
+	(som_write_armap): Likewise.  Use _bfd_ar_spacepad instead of
+	sprintf to write header fields.
+	* som.h: Include bfd headers instead of system one.
+	(FILE_HDR_SIZE, AUX_HDR_SIZE): Removed.
+	(struct somdata): Use bfd structures instead of system ones.
+	(struct som_section_data_struct): Likewise.
+	(struct som_subspace_dictionary_record): Removed (now in
+	include/som/internal.h)
+
+2010-06-10  Tristan Gingold  <gingold@adacore.com>
+
+	* targets.c (bfd_target_list): Remove hp/ux compiler work-around
+	as bfd requires an ANSI-C compiler.
+
+2010-06-09 Tristan Gingold  <gingold@adacore.com>
+
+	* bfdio.c (bfd_bread): Fix the code to prevent reading past the
+	end of archive members.
+
+2010-06-08  Tristan Gingold  <gingold@adacore.com>
+
+	* som.c (som_bfd_free_cached_info): Do not free relocations as
+	they were allocated with bfd_zalloc.
+
+2010-06-08  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-lib.c (_bfd_vms_lib_write_archive_contents): Increment
+	for the first block.
+
+2010-06-08  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-lib.c (_bfd_vms_lib_ia64_mkarchive): New function.
+	* libbfd-in.h (_bfd_vms_lib_ia64_mkarchive): Declare.
+	* libbfd.h: Regenerate.
+	* elfxx-ia64.c (bfd_elfNN_write_archive_contents): Redefine for VMS.
+	(bfd_elfNN_mkarchive): Ditto.
+
+2010-06-02  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (alpha_vms_bfd_final_link): Fix 64bit constant.
+
+2010-06-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure: Regenerate.
+
+2010-06-01  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (struct vms_private_data_struct): Add
+	transfer_address field.  Remove unused dst_info field.
+	(alpha_vms_write_exec): Use transfer_address.
+	(_bfd_vms_write_egsd): Add a comment about LIB$INITIALIZE.
+	(alpha_vms_bfd_final_link): Set transfer_address.
+
+2010-05-31  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-lib.c (credat_lo, credat_hi): New fields.
+	(vms_read_block): Adjust comments.
+	(vms_write_block): New function.
+	(_bfd_vms_lib_archive_p): Decode majorid once.  Replace some
+	hard-coded values with constants.  Set credat_lo and credat_hi.
+	(_bfd_vms_lib_mkarchive): Add argument kind.
+	Set ver, mhd_size and type according to kind.
+	(_bfd_vms_lib_alpha_mkarchive): New function.
+	(struct lib_index): Renamed from struct vms_index
+	(lib_index_cmp): Renamed from vms_index_cmp.  Adjusted.
+	(get_idxlen): Type of idx argument adjusted.  Add is_elfidx
+	argument and handle it.
+	(vms_write_index): Adjust argument idx.  Handle elf indexes.
+	(_bfd_vms_lib_build_map): Adjust type of arguments modules and res.
+	(_bfd_vms_lib_write_archive_contents): Add is_elfidx variable and
+	use it.  Handle elf indexes.  Set credat.
+	* libbfd-in.h (_bfd_vms_lib_mkarchive): Renamed to ...
+	(_bfd_vms_lib_alpha_mkarchive): ... this.
+	* libbfd.h: Regenerated.
+	* vms-alpha.c (vms_alpha_vec): Adjust after previous renaming.
+
+2010-05-28  Sterling Augustine  <sterling@tensilica.com>
+
+	* elf32-xtensa.c (elf_xtensa_relocate_section): Add a large amount
+	of code to change the bits in the instructions to match the changes
+	in the relocations.  Declare dest_addr and sym_sec to help.
+
+2010-05-28  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Workaround GCC PR middle-end/4210.
+	* vms-misc.c (vms_time_t_to_vms_time): Use ternary operator for val[2]
+	and val[3].
+
+2010-05-27  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-misc.c: Define __NEW_STARLET.  Remove trailing spaces.
+	(VMS_TIME_FACTOR, VMS_TIME_OFFSET): New macros.
+	(vms_time_to_time_t): Use them instead of local const.
+	(vms_time_t_to_vms_time): New function.
+	(vms_get_time): Likewise.
+	(vms_raw_get_time): Likewise.
+	* vms.h	(vms_time_t_to_vms_time): New declaration.
+	(vms_get_time): Likewise.
+	(vms_raw_get_time): Likewise.
+
+2010-05-26  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c: Update comments.
+	(alpha_vms_write_exec): Set lnkflags.  Write the GST.
+	(alpha_vms_link_output_symbol): New function.
+	(alpha_vms_bfd_final_link): Generate the VMS symbol table.
+	Set dst_section private field.
+	(alpha_vms_bfd_final_link): Remove code that set dst_section.
+
+2010-05-26  Tristan Gingold  <gingold@adacore.com>
+
+	* bfdio.c: Declare and define _bfd_memory_iovec.
+	(bfd_bread): Move code for BFD_IN_MEMORY...
+	(bfd_bwrite): ... Ditto ...
+	(bfd_tell): ... Ditto ...
+	(bfd_flush): ... Ditto ...
+	(bfd_stat): ... Ditto ...
+	(bfd_seek): ... Ditto ...
+	(bfd_get_size): ... Ditto ...
+	(bfd_mmap): ... Ditto ...
+	(memory_bread): ... to these new functions.
+	(memory_bwrite): Ditto.
+	(memory_btell): Ditto.
+	(memory_bseek): Ditto.
+	(memory_bflush): Ditto.
+	(memory_bstat): Ditto.
+	(memory_bmmap): Ditto.
+	(memory_bclose): New function.
+	* peicode.h (pe_ILF_build_a_bfd): Use BFD_IN_MEMORY.
+	* xcofflink.c (bfd_xcoff_link_generate_rtinit): Ditto.
+	* opncls.c (bfd_close): Do not handle BFD_IN_MEMORY case.
+	(bfd_make_writable): Use _bfd_memory_iovec.
+	* elfcode.h (bfd_from_remote_memory): Use _bfd_memory_iovec.
+	* coff-alpha.c (alpha_ecoff_get_elt_at_filepos): Use
+	_bfd_memory_iovec.
+	(alpha_ecoff_openr_next_archived_file): Use proxy_origin
+	instead of origin.
+	* libbfd.h: Regenerate.
+
+2010-05-25  Daniel Jacobowitz  <dan@codesourcery.com>
+	    Joseph Myers  <joseph@codesourcery.com>
+	    Andrew Stubbs  <ams@codesourcery.com>
+
+	* config.bfd (sh-*-uclinux* | sh[12]-*-uclinux*): Add
+	bfd_elf32_shl_vec, and FDPIC vectors to targ_selvecs.
+	* configure.in: Handle FDPIC vectors.
+	* elf32-sh-relocs.h: Add FDPIC and movi20 relocations.
+	* elf32-sh.c (DEFAULT_STACK_SIZE): Define.
+	(SYMBOL_FUNCDESC_LOCAL): Define.  Use it instead of
+	SYMBOL_REFERENCES_LOCAL for function descriptors.
+	(fdpic_object_p): New.
+	(sh_reloc_map): Add FDPIC and movi20 relocations.
+	(sh_elf_info_to_howto, sh_elf_relocate_section): Handle new invalid
+	range.
+	(struct elf_sh_plt_info): Add got20 and short_plt.  Update all
+	definitions.
+	(FDPIC_PLT_ENTRY_SIZE, FDPIC_PLT_LAZY_OFFSET): Define.
+	(fdpic_sh_plt_entry_be, fdpic_sh_plt_entry_le, fdpic_sh_plts): New.
+	(FDPIC_SH2A_PLT_ENTRY_SIZE, FDPIC_SH2A_PLT_LAZY_OFFSET): Define.
+	(fdpic_sh2a_plt_entry_be, fdpic_sh2a_plt_entry_le)
+	(fdpic_sh2a_short_plt_be, fdpic_sh2a_short_plt_le, fdpic_sh2a_plts):
+	New.
+	(get_plt_info): Handle FDPIC.
+	(MAX_SHORT_PLT): Define.
+	(get_plt_index, get_plt_offset): Handle short_plt.
+	(union gotref): New.
+	(struct elf_sh_link_hash_entry): Add funcdesc, rename tls_type to
+	got_type and adjust all uses.  Add GOT_FUNCDESC.
+	(struct sh_elf_obj_tdata): Add local_funcdesc.	Rename
+	local_got_tls_type to local_got_type.
+	(sh_elf_local_got_type): Renamed from sh_elf_local_got_tls_type.  All
+	users changed.
+	(sh_elf_local_funcdesc): Define.
+	(struct elf_sh_link_hash_table): Add sfuncdesc, srelfuncdesc, fdpic_p,
+	and srofixup.
+	(sh_elf_link_hash_newfunc): Initialize new fields.
+	(sh_elf_link_hash_table_create): Set fdpic_p.
+	(sh_elf_omit_section_dynsym): New.
+	(create_got_section): Create .got.funcdesc, .rela.got.funcdesc
+	and .rofixup.
+	(allocate_dynrelocs): Allocate local function descriptors and space
+	for R_SH_FUNCDESC-related relocations, and for rofixups.
+	Handle GOT_FUNCDESC.  Create fixups.  Handle GOT entries which
+	require function descriptors.
+	(sh_elf_always_size_sections): Handle PT_GNU_STACK and __stacksize.
+	(sh_elf_modify_program_headers): New.
+	(sh_elf_size_dynamic_sections): Allocate function descriptors for
+	local symbols.  Allocate .got.funcdesc contents.  Allocate rofixups.
+	Handle local GOT entries of type GOT_FUNCDESC.	Create fixups for
+	local GOT entries.  Ensure that FDPIC libraries always have a PLTGOT
+	entry in the .dynamic section.
+	(sh_elf_add_dyn_reloc, sh_elf_got_offset, sh_elf_initialize_funcdesc)
+	(sh_elf_add_rofixup, sh_elf_osec_to_segment)
+	(sh_elf_osec_readonly_p, install_movi20_field): New functions.
+	(sh_elf_relocate_section): Handle new relocations, R_SH_FUNCDESC,
+	R_SH_GOTFUNCDESC and R_SH_GOTOFFFUNCDESC.  Use sh_elf_got_offset
+	and .got.plt throughout to find _GLOBAL_OFFSET_TABLE_.	Add rofixup
+	read-only section warnings.  Handle undefined weak symbols.  Generate
+	fixups for R_SH_DIR32 and GOT entries.	Check for cross-segment
+	relocations and clear EF_SH_PIC.  Handle 20-bit relocations.
+	Always generate R_SH_DIR32 for FDPIC instead of R_SH_RELATIVE.
+	(sh_elf_gc_sweep_hook): Handle R_SH_FUNCDESC, R_SH_GOTOFF20,
+	R_SH_GOTFUNCDESC, R_SH_GOTFUNCDESC20, and R_SH_GOTOFFFUNCDESC.
+	Handle 20-bit relocations.
+	(sh_elf_copy_indirect_symbol): Copy function descriptor reference
+	counts.
+	(sh_elf_check_relocs): Handle new relocations.  Make symbols
+	dynamic for FDPIC relocs.  Account for rofixups.  Error for FDPIC
+	symbol mismatches.  Allocate a GOT for R_SH_DIR32. Allocate fixups
+	for R_SH_DIR32.
+	(sh_elf_copy_private_data): Copy PT_GNU_STACK size.
+	(sh_elf_merge_private_data): Copy initial flags.  Do not clobber
+	non-mach flags.  Set EF_SH_PIC for FDPIC.  Reject FDPIC mismatches.
+	(sh_elf_finish_dynamic_symbol): Do not handle got_funcdesc entries
+	here.  Rename sgot to sgotplt and srel to srelplt.  Handle short_plt,
+	FDPIC descriptors, and got20.  Create R_SH_FUNCDESC_VALUE for FDPIC.
+	Use install_movi20_field.  Rename srel to srelgot.  Always generate
+	R_SH_DIR32 for FDPIC instead of R_SH_RELATIVE.
+	(sh_elf_finish_dynamic_sections): Fill in the GOT pointer in rofixup.
+	Do not fill in reserved GOT entries for FDPIC.	Correct DT_PLTGOT.
+	Rename sgot to sgotplt.  Assert that the right number of rofixups
+	and dynamic relocations were allocated.
+	(sh_elf_use_relative_eh_frame, sh_elf_encode_eh_address): New.
+	(elf_backend_omit_section_dynsym): Use sh_elf_omit_section_dynsym.
+	(elf_backend_can_make_relative_eh_frame)
+	(elf_backend_can_make_lsda_relative_eh_frame)
+	(elf_backend_encode_eh_address): Define.
+	(TARGET_BIG_SYM, TARGET_BIG_NAME, TARGET_LITTLE_SYM)
+	(TARGET_LITTLE_NAME, elf_backend_modify_program_headers, elf32_bed):
+	Redefine for FDPIC vector.
+	* reloc.c: Add SH FDPIC and movi20 relocations.
+	* targets.c (_bfd_target_vector): Add FDPIC vectors.
+	* configure, bfd-in2.h, libbfd.h: Regenerated.
+
+2010-05-25  Jay Krell  <jay.krell@cornell.edu>
+
+	PR ld/11624
+	* archive.c (_bfd_calloc_wrapper): New function.
+	(_bfd_add_bfd_to_archive_cache): Use it.
+
+	* configure.in: Add alpha*-*-*vms* to list of natives.
+	* configure: Regenerate.
+
+	* vms-misc.c: Define globalref if necessary.
+	(vms_convert_to_var_unix_filename): Rename to
+	_bfd_vms_convert_to_var_unix_filename and export.
+	* vms.h: Add prototype for _bfd_vms_convert_to_var_unix_filename.
+	* vms-alpha.c (vms_close_and_cleanup): Update invocation of
+	vms_convert_to_var_unix_filename.
+
+2010-05-24  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (add_symbol_entry): New function extrated from ...
+	(add_symbol): ... adjusted.
+
+2010-05-24  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (_bfd_vms_slurp_egsd): Fix indentation.
+	(alpha_vms_write_exec): Add a comment.
+	(_bfd_vms_write_egsd): Ditto.
+	(alpha_vms_convert_symbol): Remove a blank line.
+
+2010-05-21  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (_bfd_vms_slurp_eihs): Do not create a bfd section
+	for the GST.
+
+2010-05-21  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (_bfd_vms_slurp_eisd): Set SEC_HAS_CONTENTS and
+	SEC_LOAD if isect has data.
+	(vms_get_symbol_info): Refine the condition for 'T' type.
+
+2010-05-18  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (_bfd_vms_write_emh): New function.
+	(_bfd_vms_write_lmn): New function.
+	(_bfd_vms_write_eeom): Moved.
+	(hash_string): Likewise.
+	(_bfd_vms_length_hash_symbol): Likewise.
+	(_bfd_vms_write_ehdr): Code moved to _bfd_vms_write_emh
+	and _bfd_vms_write_lmn, and call these functions.
+
+2010-05-18  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (evax_bfd_print_dst): Handle INCR_LINUM_L.
+	Add details in the messages.
+	(evax_bfd_print_image): Change message.
+
+2010-05-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gas/11600
+	* elf.c (_bfd_elf_make_section_from_shdr): Handle SHF_EXCLUDE
+	(elf_fake_sections): Likewise.
+
+	* elf32-i370.c (i370_elf_section_from_shdr): Don't handle
+	SHF_EXCLUDE here.
+	* elf32-ppc.c (ppc_elf_fake_sections): Likewise.
+
+2010-05-17  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c: Include esgps.h and eidc.h.
+	(_bfd_vms_slurp_egsd): Ignore SPSC and IDC sub-records.
+	(evax_bfd_print_egsd_flags): New function, extracted from ...
+	(evax_bfd_print_egsd): ..., calls evax_bfd_print_egsd_flags.  Handles
+	EGSD__C_SPSC and EGSD__C_IDC.
+
+2010-05-14  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (alpha_vms_object_p): Accept header size of 0.
+	(_bfd_vms_get_object_record): Handle align byte only in the
+	foreign case.
+
+2010-05-14  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-lib.c (_bfd_vms_lib_ia64_archive_p): New function.
+	* libbfd-in.h (_bfd_vms_lib_ia64_archive_p): Add prototype.
+	* libbfd.h: Regenerate.
+	* configure.in (havevecs): Define HAVE_all_vecs when
+	--enable-targets=all is set.  Use AC_SUBST on it.
+	(tdefaults): Do not add havevecs.
+	(bfd_elf64_ia64_vms_vec): Add vms-lib.lo and vms-misc.lo
+	* configure: Regenerate.
+	* Makefile.am (HAVEVECS): New variable.
+	(INCLUDES): Add HAVEVECS.
+	* Makefile.in: Regenerate.
+	* elfxx-ia64.c (INCLUDE_IA64_VMS): New macro, defined if vms
+	target is selected.  Add #ifdef/#endif around vms specific code.
+	(bfd_elfNN_archive_p, bfd_elfNN_archive_slurp_armap,
+	bfd_elfNN_archive_slurp_extended_name_table,
+	bfd_elfNN_archive_construct_extended_name_table,
+	bfd_elfNN_archive_truncate_arname,
+	bfd_elfNN_archive_write_armap,
+	bfd_elfNN_archive_read_ar_hdr,
+	bfd_elfNN_archive_write_ar_hdr,
+	bfd_elfNN_archive_openr_next_archived_file,
+	bfd_elfNN_archive_get_elt_at_index,
+	bfd_elfNN_archive_generic_stat_arch_elt,
+	bfd_elfNN_archive_update_armap_timestamp): Define to use vms archives.
+
+2010-05-11  Jie Zhang  <jie@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_merge_eabi_attributes): Merge
+	Tag_ABI_HardFP_use correctly.
+
+2010-05-11  Alan Modra  <amodra@gmail.com>
+
+	* coffcode.h (coff_write_object_contents): Enclose all occurrences
+	of hasdebug and is_reloc_section in #ifdef COFF_IMAGE_WITH_PE.
+
+2010-05-07  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (struct a8_erratum_reloc): Add hash member.  Move
+	sym_name to improve packing.
+	(cortex_a8_erratum_scan): Check for PLT entries.
+	(elf32_arm_size_stubs): Save the target symbol for a8 relocs.
+
+2010-05-07  Tristan Gingold  <gingold@adacore.com>
+
+	* Makefile.in: Regenerate with automake 1.11.1.
+	* aclocal.m4: Ditto.
+
+2010-05-05  Nick Clifton  <nickc@redhat.com>
+
+	* po/es.po: Updated Spanish translation.
+
+2010-05-03  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-lib.c (vms_lib_bopen): Fix the size threshold to read
+	selective_search flag.
+	Add comments.
+	* vms-alpha.c (alpha_vms_bfd_final_link): Create the DMT section
+	before output_has_begun is set.
+
+2010-05-03  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c: Add comments.
+	(struct vms_private_data_struct): Remove image_autoextend field.
+	(dst_check_allocation): Removed.
+	(image_write): Remove call to dst_check_allocation.
+	(vms_slurp_debug): Do not set image_autoextend.  Adjust section
+	size.
+	(_bfd_vms_slurp_object_records): Remove useless new_type variable.
+	(alpha_vms_write_exec): Use dst_section to get the dst section.
+	Write the dmt section.
+	(evax_bfd_print_image): Also print the dst size in hexa.  Fix typo.
+	(alpha_vms_read_sections_content): Do not set image_autoextend.
+	(alpha_vms_bfd_final_link): Generate the dst.
+
+2010-05-03  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-lib.c (_bfd_vms_lib_archive_p): Adjust for a possible empty
+	next array.
+	(vms_lib_dcx): Adjust for the above change.
+
+2010-04-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/11542
+	* elf-bfd.h (RELOC_AGAINST_DISCARDED_SECTION): New.
+
+	* elf32-i386.c (elf_i386_relocate_section): Use it.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
+
+2010-04-30  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-lib.c (vms_read_block): New function.
+	(vms_traverse_index): Use vms_read_block.  Handle long key names.
+
+2010-04-30  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-lib.c (struct lib_tdata): Field artdata added, fields nbr_syms
+	and syms removed.
+	(struct carsym_mem): New structure.
+	(vms_add_index): New function.
+	(vms_add_indexes_from_list): New function.
+	(vms_traverse_index): Parameter carsym changed to carsym_mem.
+	Code adjusted to handle elfidx.
+	(vms_lib_read_index): Adjusted for vms_traverse_index changes.
+	Parameter NBREL is now a pointer.
+	(_bfd_vms_lib_archive_p): Adjust for above change.  Handle ia64
+	archives.
+	(_bfd_vms_lib_mkarchive): Adjusted for changes in struct lib_tdata.
+	(_bfd_vms_lib_find_symbol): Ditto.
+	(vms_lib_bopen): Fix two typos: return FALSE in case of error,
+	check MHD id.
+	(_bfd_vms_lib_get_module): New function.
+	(_bfd_vms_lib_get_elt_at_index): Rewritten using the above
+	function.
+	(_bfd_vms_lib_openr_next_archived_file): Use _bfd_vms_lib_get_module.
+	(_bfd_vms_lib_generic_stat_arch_elt): Handle ia64 archives.
+	(vms_write_index): Adjust for structure renamed.
+	* vms-alpha.c (alpha_vms_link_add_archive_symbols): Adjust for
+	changes of _bfd_vms_lib_find_symbol.
+
+2010-04-28  Kai Tietz  <kai.tietz@onevision.com>
+
+	* config.bfd: Correct accidential reverted patch
+	about vax*-*-*vms*.
+
+2010-04-27  Kai Tietz  <kai.tietz@onevision.com>
+
+	* pe-x86_64.c (TARGET_UNDERSCORE): Set value dependent
+	to USE_MINGW64_LEADING_UNDERSCORES.
+	* pei-x86_64.c (TARGET_UNDERSCORE): Likewise.
+	* config.bfd: Change underscoring default for x64 mingw
+	to false.
+	* coffcode.h (coff_write_relocs): Add check that dereferenced
+	sym_ptr_ptr isn't NULL.
+	* config.in (USE_MINGW64_LEADING_UNDERSCORES): New.
+	* configure: Regenerated.
+	* configure.in: Add option '--enable-leading-mingw64-underscores'
+	and define config.in variable USE_MINGW64_LEADING_UNDERSCORES.
+
+2010-04-27  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/11512
+	* coffgen.c (coff_find_nearest_line): Incldue the section address
+	of function name symbols in address comparisons.
+
+2010-04-27  Nick Clifton  <nickc@redhat.com>
+
+	* po/fr.po: Updated French translation.
+
+2010-04-23  Alan Modra  <amodra@gmail.com>
+
+	* elf.c: Replace use of ELF_IS_SECTION_IN_SEGMENT and
+	ELF_IS_SECTION_IN_SEGMENT_FILE with ELF_SECTION_IN_SEGMENT
+	throughout file.
+	(assign_file_positions_for_load_sections): Modify section in
+	segment warning to ignore overlay vmas.
+	* elf32-spu.c (spu_elf_object_p): Replace use of
+	ELF_IS_SECTION_IN_SEGMENT_MEMORY with ELF_SECTION_IN_SEGMENT.
+
+2010-04-22  Nick Clifton  <nickc@redhat.com>
+
+	* po/bfd.pot: Updated by the Translation project.
+	* po/vi.po: Updated Vietnamese translation.
+
+2010-04-22  Alan Modra  <amodra@gmail.com>
+
+	* elf.c (assign_file_positions_for_load_sections): Revert 2008-05-29
+	change.  Tidy.  Don't error on sections not allocated in segment.
+
+2010-04-15  Andrew Haley  <aph@redhat.com>
+
+	* bfd-in.h (elf32_arm_fix_exidx_coverage): Add new flag:
+	merge_exidx_entries.
+	* bfd-in2.h: Likewise.
+	* elf32-arm.c (elf32_arm_fix_exidx_coverage): Likewise.  Use it to
+	control merging of exidx entries.
+
+2010-04-20  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf32-tic6x.h: New.
+	* elf-bfd.h (enum elf_target_id): Define TIC6X_ELF_DATA.
+	* elf32-tic6x.c (struct elf32_tic6x_obj_tdata, elf32_tic6x_tdata,
+	elf32_tic6x_howto_table_rel, elf32_tic6x_info_to_howto_rel,
+	elf32_tic6x_set_use_rela_p, elf32_tic6x_mkobject,
+	elf32_tic6x_new_section_hook, elf32_tic6x_rel_relocation_p,
+	bfd_elf32_mkobject, bfd_elf32_new_section_hook): New.
+	(elf32_tic6x_reloc_type_lookup, elf32_tic6x_reloc_name_lookup,
+	elf32_tic6x_relocate_section): Handle REL relocations.
+	(elf_info_to_howto_rel): Define to elf32_tic6x_info_to_howto_rel.
+
+2010-04-20  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf2.c (find_abstract_instance_name, scan_unit_for_symbols): Treat
+	DW_AT_linkage_name the same as DW_AT_MIPS_linkage_name.
+
+2010-04-19  Nick Clifton  <nickc@redhat.com>
+
+	* archive64.c (bfd_elf64_archive_slurp_armap): Remove unused
+	arhdrpos variable.
+	* elf64-x86-64.c (elf64_x86_64_relocate_section): Add unused
+	attribute to warned variable.  Remove unused val, type and type2
+	variables.
+
+2010-04-16  Andreas Schwab  <schwab@redhat.com>
+
+	* vms-alpha.c (alpha_vms_link_add_object_symbols): Avoid breaking
+	strict-aliasing rules.
+
+2010-04-16  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-alpha.c (_bfd_vms_slurp_eihd): Fix typo.
+	(_bfd_vms_get_object_record): Always assume there is a pad byte
+	for alignment.
+
+	* vms-lib.c: Add a few comments.
+
+2010-04-15  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+	* elf32-arm.c (elf32_arm_merge_eabi_attributes): Support additions to
+	attributes in v2.08 of the ABI.
+
+2010-04-15  Alan Modra  <amodra@gmail.com>
+
+	* config.bfd (vax*-*-*vms*): Delete.
+
+2010-04-14  Tristan Gingold  <gingold@adacore.com>
+
+	* Makefile.am (BFD32_BACKENDS): Remove vms-gsd.lo, vms-hdr.lo,
+	vms-tir.lo, vms.lo and add vms-alpha.lo
+	(BFD32_BACKENDS_CFILES): Remove vms-gsd.c, vms-hdr.c,
+	vms-tir.c, vms.c and add vms-alpha.c
+	* Makefile.in: Regenerate.
+	* configure.in (TDEFINES): Adjust file list for vms_alpha_vec.
+	Remove vms_vax_vec.
+	* configure: Regenerate.
+	* targets.c (vms_vax_vec): Remove the declaration.
+	(_bfd_target_vector): Remove vms_vax_vec.
+	* vms-alpha.c: New file.
+	* vms-gsd.c: Removed, rewritten in vms-alpha.c
+	* vms-hdr.c: Ditto.
+	* vms-tir.c: Ditto.
+	* vms.c: Ditto.
+	* vms-misc.c: Fix indentation and comments.  Replace most of
+	#if VMS_DEBUG/vms_debug with vms_debug2.
+	(_bfd_vms_hash_newfunc): Moved to vms-alpha.c
+	(hash_string): Ditto.
+	(_bfd_vms_length_hash_symbol): Ditto.
+	(maybe_adjust_record_pointer_for_object): Ditto.
+	(_bfd_vms_get_object_record): Ditto.
+	(vms_get_remaining_object_record): Ditto.
+	(_bfd_vms_push): Ditto.
+	(_bfd_vms_pop): Ditto.
+	(_bfd_vms_get_header_values): Removed.
+	(_bfd_vms_get_first_record): Removed.
+	(vms_get_remaining_image_record): Removed.
+	(new_symbol): Removed.
+	(_bfd_vms_enter_symbol): Removed.
+	(_bfd_vms_save_sized_string): Use memcpy instead of strncpy.
+	(_bfd_vms_output_begin): Remove rechead parameter.  Replace bfd
+	parameter with struct vms_rec_wr.
+	(_bfd_vms_output_push): Removed and replaced by ...
+	(_bfd_vms_output_begin_subrec): ... new function.
+	(_bfd_vms_output_alignment): Replace bfd parameter with
+	struct vms_rec_wr, and adjust.
+	(_bfd_vms_output_check): Ditto
+	(_bfd_vms_output_byte): Ditto.
+	(_bfd_vms_output_short): Ditto.
+	(_bfd_vms_output_long): Ditto.
+	(_bfd_vms_output_quad): Ditto.
+	(_bfd_vms_output_counted): Ditto.
+	(_bfd_vms_output_dump): Ditto.
+	(_bfd_vms_output_fill): Ditto.
+	(_bfd_vms_output_pop): Removed and replaced by ...
+	(_bfd_vms_output_end_subrec): ... new function.
+	(_bfd_vms_output_flush): Removed.
+	(_bfd_vms_output_align): New function.
+	(_bfd_vms_output_end): Add recwr parameter.  Adjust for this new
+	parameter.
+	(vms_convert_to_var): New function imported from vms.c
+	(vms_convert_to_var_1): Ditto.
+	(vms_convert_to_var_unix_filename): Ditto.
+	(vms_get_module_name): Ditto.
+	(get_vms_time_string): Ditto.
+	(vms_time_to_time_t): Ditto.
+	(vms_rawtime_to_time_t): Ditto.
+	* vms.h: All macros for the VMS file format are now in include/vms.
+	Prototypes for vms.c, vms-gsd.c, vms-misc.c, vms-hdr.c, vms-tir.c
+	have been removed.
+	(struct vms_symbol_struct, struct stack_struct): Moved to vms-alpha.c
+	(struct fileinfo, struct srecinfo, struct lineinfo): Ditto.
+	(struct funcinfo, struct vms_private_data_struct): Ditto.
+	(struct vms_section_data_struct): Ditto.
+	(struct vms_rec_rd, stryct vms_rec_wr): New declarations.
+	(vms_get_module_name, get_vms_time_string): New declarations.
+	(vms_time_to_time_t, vms_rawtime_to_time_t): Ditto.
+	(_bfd_vms_output_begin_subrec, _bfd_vms_output_end_subrec): Ditto.
+	(_bfd_vms_save_sized_string, _bfd_vms_save_counted_string): Adjusted.
+	(_bfd_vms_output_begin, _bfd_vms_output_alignment): Ditto.
+	(_bfd_vms_output_end,_bfd_vms_output_check): Ditto.
+	(_bfd_vms_output_byte, _bfd_vms_output_short): Ditto.
+	(_bfd_vms_output_long, _bfd_vms_output_quad): Ditto.
+	(_bfd_vms_output_counted, _bfd_vms_output_dump): Ditto.
+	(_bfd_vms_output_fill): Ditto.
+	(bfd_vms_set_section_flags): Ditto.
+
+2010-04-14  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+	* elflink.c (_bfd_elf_merge_symbol): Tighten up the test for early
+	exit due to merging the same weak symbol to test that the symbols are
+	actually weak.
+
+2010-04-13  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (ppc64_elf_relocate_section): Correct NOP location
+	when optimizing high got_tlsgd/ld insns.
+
+2010-04-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* hosts/x86-64linux.h (HAVE_PRPSINFO32_T): Undefine before
+	define.
+	(HAVE_PRSTATUS32_T): Likewise.
+
+2010-04-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR corefiles/11467
+	* configure.in (CORE_HEADER): New. Set to hosts/x86-64linux.h
+	for x86_64-*-linux*.
+	* config.in: Regenerated.
+	* configure: Likewise.
+
+	* elf.c: Include CORE_HEADER if it is defined.
+
+2010-04-10  H.J. Lu  <hongjiu.lu@intel.com>
+	    Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* hosts/x86-64linux.h: New.
+
+2010-04-09  Nick Clifton  <nickc@redhat.com>
+
+	* aoutx.h (aout_link_input_bfd): Remove unused variable sym_count.
+	* elf-eh-frame.c (_bfd_elf_eh_frame_section_offset): Remove unused
+	variables htab and hdr_info and mark info parameter as unused.
+	* elf.c (prep_headers): Remove unused variable i_phdrp.
+	(_bfd_elf_write_object_contents): Remove unused variable i_ehdrp.
+	* elf32-i386.c (elf_i386_relocate_section): Mark variabled warned
+	as unused.
+	* peXXigen.c (pe_print_reloc): Remove unused variable datasize.
+	* verilog.c (verilog_write_section): Remove unused variable
+	address.
+
+2010-04-07  Alan Modra  <amodra@gmail.com>
+
+	* warning.m4 (GCC_WARN_CFLAGS): Only add -Wshadow for gcc-4 and above.
+	* configure: Regenerate.
+
+2010-04-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/11434
+	* elf-bfd.h (SYMBOLIC_BIND): Don't bind unique symbol locally.
+
+2010-04-06  Tristan Gingold  <gingold@adacore.com>
+
+	* vms-lib.c (_bfd_vms_lib_write_archive_contents): Fix idd flags.
+
+2010-04-05  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf-eh-frame.c (_bfd_elf_parse_eh_frame): Handle CIE version 4
+	provided that it has the expected address size and zero segment
+	length.
+
+	* dwarf2.c (struct line_head): Add maximum_ops_per_insn field.
+	(struct line_info): Add op_index field, change end_sequence type to
+	unsigned char.
+	(new_line_sorts_after): For the same address compare op_index.
+	(add_line_info): Add op_index argument, store it into the structure.
+	(decode_line_info): Complain about unknown versions of .debug_line.
+	Initialize maximum_ops_per_insn.  Add op_index state register and
+	track it.
+
+2010-04-01  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf32-ppc.c (apuinfo_set): New static var.
+	(ppc_elf_begin_write_processing): Set it here, always create an
+	APUinfo section if there were any in the inputs.
+	(ppc_elf_write_section): Check apuinfo_set.
+	(ppc_elf_final_write_processing): Likewise.
+
+2010-04-01  Tristan Gingold  <gingold@adacore.com>
+
+	* vms.h: Include time.h. Add prototypes for vms_get_module_name,
+	vms_time_to_time_t and vms_rawtime_to_time_t.
+	* vms.c (vms_alpha_vec): Add archives support.
+	* vms-misc.c: Include safe-ctype.h
+	(vms_get_module_name): New function.
+	(vms_time_to_time_t, vms_rawtime_to_time_t): Ditto.
+	* vms-hdr.c (_bfd_vms_write_hdr): Put module name creation to the
+	vms_get_module_name function.  Use this function.
+	* targets.c: Declare vms_lib_txt_vec.  Add it to _bfd_target_vector.
+	* libbfd-in.h: Add prototype for _bfd_append_relative_path.
+	Add prototypes for vms-lib.c
+	* libbfd.h: Regenerate.
+	* configure.in (TDEFINES): Add an entry for vms_lib_txt_vec.  Add
+	vms-lib.lo to vms_alpha_vec.
+	* config.bfd (targ_cpu): Add targ_selvecs for alpha*-*-*vms*.
+	* configure: Regenerate.
+	* bfd.c: Add selective_search field.
+	* bfd-in2.h: Regenerate.
+	* archive.c (append_relative_path): Rename to
+	_bfd_append_relative_path and make it public.
+	(_bfd_get_elt_at_filepos): Adjust for above renaming.
+	* Makefile.am (BFD32_BACKENDS): Add vms-lib.lo
+	(BFD32_BACKENDS_CFILES): Add vms-lib.c
+	* Makefile.in: Regenerate.
+
+2010-04-01  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf2.c (read_attribute_value): Handle CU version 4
+	for DW_FORM_ref_addr, handle DW_FORM_sec_offset, DW_FORM_exprloc
+	and DW_FORM_flag_present.  For unknown form value return NULL.
+	(scan_unit_for_symbols): For DW_AT_location handle DW_FORM_exprloc
+	like DW_FORM_block.
+	(parse_comp_unit): Allow CU version 4.
+
+2010-04-01  Hans-Peter Nilsson  <hp@axis.com>
+
+	* elf32-cris.c (cris_elf_relocate_section): Correct first argument
+	to _bfd_elf_get_dynamic_reloc_section.
+	(elf_cris_discard_excess_dso_dynamics): Ditto.
+
+2010-03-31  Kai Tietz  <kai.tietz@onevision.com>
+
+	* coff-i386.c (in_reloc_p): Check also for R_SECREL32.
+	* coff-x86_64.c (in_reloc_p): Check also for R_AMD64_SECREL.
+
+2010-03-31  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (ppc64_elf_relocate_section): Nop out optimized
+	TPREL16_HI and TPREL16_HA insns.
+
+2010-03-31  Hans-Peter Nilsson  <hp@axis.com>
+
+	PR ld/11458
+	* elf32-cris.c (elf_cris_copy_indirect_symbol): Remove invalid
+	assert of empty pcrel_relocs_copied on the direct symbol.  Instead
+	of moving the list from the indirect symbol to the direct symbol,
+	merge into any existing list.
+	(cris_elf_check_relocs): Store the original section in the
+	pcrel_relocs_copied list, not the relocation section.
+	(elf_cris_discard_excess_dso_dynamics): Adjust accordingly to find
+	the relocation section, for reducing its size.  Change the
+	BFD_ASSERT into a check for the section being read-only, and only
+	emit warnings and TEXTREL marker when there's an entry for a
+	read-only section.
+
+2010-03-29  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (using_thumb_only): Handle v6-M.
+
+2010-03-26  Alan Modra  <amodra@gmail.com>
+
+	* elf32-ppc.c (ppc_elf_howto_raw <R_PPC_EMB_RELSDA>): Not pc-relative.
+	* bfd-in.h (elf_discarded_section): Clarify comment.
+	* reloc.c (struct reloc_howto_struct <pc_relative>): Likewise.
+	* bfd-in2.h: Regenerate.
+
+2010-03-26  Matt Rice  <ratmice@gmail.com>
+
+	* archive.c (_bfd_compute_and_write_armap): Allow symbols flagged
+	as unique in the armap.
+
+2010-03-26  Alan Modra  <amodra@gmail.com>
+
+	PR ld/11375
+	* elf64-ppc.c (ppc64_elf_relocate_section): Always look up a
+	possible stub on branches.
+
+2010-03-25  Joseph Myers  <joseph@codesourcery.com>
+
+	* Makefile.am (ALL_MACHINES): Add cpu-tic6x.lo.
+	(ALL_MACHINES_CFILES): Add cpu-tic6x.c.
+	(BFD32_BACKENDS): Add elf32-tic6x.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-tic6x.c.
+	* Makefile.in: Regenerate.
+	* archures.c (bfd_arch_tic6x, bfd_tic6x_arch): New.
+	(bfd_archures_list): Update.
+	* config.bfd (tic6x-*-elf): New.
+	* configure.in (bfd_elf32_tic6x_be_vec, bfd_elf32_tic6x_le_vec):
+	New.
+	* configure: Regenerate.
+	* cpu-tic6x.c, elf32-tic6x.c: New.
+	* reloc.c (BFD_RELOC_C6000_PCR_S21, BFD_RELOC_C6000_PCR_S12,
+	BFD_RELOC_C6000_PCR_S10, BFD_RELOC_C6000_PCR_S7,
+	BFD_RELOC_C6000_ABS_S16, BFD_RELOC_C6000_ABS_L16,
+	BFD_RELOC_C6000_ABS_H16, BFD_RELOC_C6000_SBR_U15_B,
+	BFD_RELOC_C6000_SBR_U15_H, BFD_RELOC_C6000_SBR_U15_W,
+	BFD_RELOC_C6000_SBR_S16, BFD_RELOC_C6000_SBR_L16_B,
+	BFD_RELOC_C6000_SBR_L16_H, BFD_RELOC_C6000_SBR_L16_W,
+	BFD_RELOC_C6000_SBR_H16_B, BFD_RELOC_C6000_SBR_H16_H,
+	BFD_RELOC_C6000_SBR_H16_W, BFD_RELOC_C6000_SBR_GOT_U15_W,
+	BFD_RELOC_C6000_SBR_GOT_L16_W, BFD_RELOC_C6000_SBR_GOT_H16_W,
+	BFD_RELOC_C6000_DSBT_INDEX, BFD_RELOC_C6000_PREL31,
+	BFD_RELOC_C6000_COPY, BFD_RELOC_C6000_ALIGN,
+	BFD_RELOC_C6000_FPHEAD, BFD_RELOC_C6000_NOCMP): New.
+	* targets.c (bfd_elf32_tic6x_be_vec, bfd_elf32_tic6x_le_vec): New.
+	(_bfd_target_vector): Update.
+	* bfd-in2.h, libbfd.h: Regenerate.
+
+2010-03-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* aout-target.h: Update copyright year.
+	* aout-tic30.c: Likewise.
+	* coff-alpha.c: Likewise.
+	* coff-rs6000.c: Likewise.
+	* coff64-rs6000.c: Likewise.
+	* elf64-mips.c: Likewise.
+	* ieee.c: Likewise.
+	* libecoff.h: Likewise.
+	* mach-o-target.c: Likewise.
+	* mach-o.c: Likewise.
+	* oasys.c: Likewise.
+	* targets.c: Likewise.
+
+2010-03-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* libbfd-in.h: Update copyright year.
+
+2010-03-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/11413
+	* elflink.c (_bfd_elf_add_default_symbol): Check !executable
+	instead of shared.
+
+2010-03-19  Jie Zhang  <jie@codesourcery.com>
+
+	* elf32-arm.c (struct section_list): Remove.
+	(section_list): Remove typedef.
+	(record_section_with_arm_elf_section_data): Remove.
+	(find_arm_elf_section_entry): Remove.
+	(get_arm_elf_section_data): Use is_arm_elf.
+	(unrecord_section_with_arm_elf_section_data): Remove.
+	(elf32_arm_new_section_hook): Don't call
+	record_section_with_arm_elf_section_data.
+	(elf32_arm_write_section): Set mapcount to -1 when
+	the map has been used. Don't call
+	unrecord_section_with_arm_elf_section_data.
+	(unrecord_section_via_map_over_sections): Remove.
+	(elf32_arm_close_and_cleanup): Remove.
+	(elf32_arm_bfd_free_cached_info): Remove.
+	(bfd_elf32_close_and_cleanup): Don't define.
+	(bfd_elf32_bfd_free_cached_info): Don't define.
+
+2010-03-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/11396
+	* libcoff-in.h (pe_tdata): Add dont_strip_reloc.
+	* libcoff.h: Regenerated.
+
+	* peXXigen.c (_bfd_XXi_only_swap_filehdr_out): Clear F_RELFLG
+	if dont_strip_reloc is set.
+	(_bfd_XX_bfd_copy_private_bfd_data_common): Set
+	dont_strip_reloc on output if there is no .reloc and
+	IMAGE_FILE_RELOCS_STRIPPED isn't set in input.
+
+2010-03-18  Wei Guozhi  <carrot@google.com>
+
+	PR gas/11323
+	* elf32-arm.c (elf32_arm_reloc_map): Map BFD_RELOC_ARM_GOT_PREL to
+	R_ARM_GOT_PREL.
+	* reloc.c (BFD_RELOC_ARM_GOT_PREL): New ARM relocation.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2010-03-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* reloc.c (BFD_RELOC_SPU_PIC18): Removed.
+	(BFD_RELOC_SPU_STUB): Likewise.
+
+2010-03-17  Jie Zhang  <jie@codesourcery.com>
+
+	* elf.c (assign_file_positions_for_load_sections): Avoid
+	overflow.
+
+2010-03-17  Alan Modra  <amodra@gmail.com>
+
+	PR binutils/11382
+	* plugin.c (bfd_plugin_object_p): Pass iostream to fileno using
+	proper type.
+
+2010-03-17  Alan Modra  <amodra@gmail.com>
+
+	* elf32-arm.c (cortex_a8_erratum_scan): Warning fix.
+
+2010-03-16  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (struct ppc_link_hash_table): Add do_toc_opt.
+	(ppc64_elf_edit_toc): Set it here.
+	(ha_reloc_match): New function.
+	(ppc64_elf_relocate_section): Optimize bigtoc insn sequences.
+
+2010-03-15  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (ppc64_elf_has_small_toc_reloc): New function.
+	* elf64-ppc.h (ppc64_elf_has_small_toc_reloc): Declare.
+
+2010-03-14  Alan Modra  <amodra@gmail.com>
+
+	PR ld/11378
+	* elf64-ppc.h (ppc64_elf_check_init_fini): Declare.
+	* elf64-ppc.c (call_check_done): Define.
+	(ppc64_elf_add_symbol_hook): Substitute bfd_get_section_name macro.
+	(ppc64_elf_check_relocs, ppc64_elf_size_dynamic_sections): Likewise.
+	(ppc64_elf_finish_multitoc_partition): Remove unnecessary check.
+	(toc_adjusting_stub_needed): Use call_check_done rather than toc_off.
+	Simplify return logic.  Iterate over all .init and .fini fragments
+	by recursion.  Set makes_toc_func_call here..
+	(ppc64_elf_next_input_section): ..rather than here.
+	(check_pasted_section, ppc64_elf_check_init_fini): New functions.
+
+2010-03-13  Alan Modra  <amodra@gmail.com>
+
+	PR ld/11375
+	* elf64-ppc.c (ppc_type_of_stub): Always set *hash to the
+	function descriptor symbol if there is one, not just for plt stubs.
+	(ppc64_elf_relocate_section): Use fdh on all ppc_get_stub_entry calls.
+
+2010-03-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* elflink.c (bfd_elf_size_dynamic_sections): Don't emit base
+	version twice.
+	Skip it when constructing def.vd_next.
+
+	* elf32-i386.c (TARGET_LITTLE_SYM): Redefine to
+	bfd_elf32_i386_sol2_vec.
+	(TARGET_LITTLE_NAME): Redefine to elf32-i386-sol2.
+	(elf32_bed): Redefine to elf32_i386_sol2_bed.
+	(elf_backend_want_plt_sym): Redefine to 1.
+
+	* elf64-x86-64.c (TARGET_LITTLE_SYM): Redefine to
+	bfd_elf64_x86_64_sol2_vec.
+	(TARGET_LITTLE_NAME): Redefine to elf64-x86-64-sol2.
+	(elf64_bed): Redefine to elf64_x86_64_sol2_bed.
+	(elf_backend_want_plt_sym): Redefine to 1.
+
+	* config.bfd (i[3-7]86-*-solaris2*): Set targ_defvec to
+	bfd_elf32_i386_sol2_vec.
+	Replace bfd_elf64_x86_64_vec by bfd_elf64_x86_64_sol2_vec in
+	targ64_selvecs.
+	(x86_64-*-solaris2*): Set targ_defvec to bfd_elf32_i386_sol2_vec.
+	Replace bfd_elf64_x86_64_vec by bfd_elf64_x86_64_sol2_vec in
+	targ_selvecs.
+
+	* configure.in: Handle bfd_elf32_i386_sol2_vec,
+	bfd_elf64_x86_64_sol2_vec.
+	* configure: Regenerate.
+
+	* targets.c (bfd_elf32_i386_sol2_vec): Declare.
+	(bfd_elf64_x86_64_sol2_vec): Declare.
+	(_bfd_target_vector): Add bfd_elf32_i386_sol2_vec,
+	bfd_elf64_x86_64_sol2_vec.
+
+2010-03-04  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_output_arch_local_syms): Skip non-program
+	sections.
+
+2010-03-04  Alan Modra  <amodra@gmail.com>
+
+	PR 11302
+	* dwarf2.c (read_abbrevs): Return NULL on alloc failures.
+	(read_attribute_value, decode_line_info): Likewise.
+	(add_line_info, read_rangelist): Return FALSE on alloc failures.
+	(arange_add, sort_line_sequences): Likewise.
+	(find_abstract_instance_name): Handle failures from called funcs.
+	(scan_unit_for_symbols, parse_comp_unit, decode_line_info): Likewise.
+	(find_line): Realloc to a temp, and handle alloc fail.
+
+2010-03-03  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_output_arch_local_syms): Do not add
+	a mapping symbol to an empty section.
+
+2010-03-02  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+	* elf32-arm.c (elf32_arm_merge_eabi_attributes): Add a check of the
+	return value from the call to _bfd_elf_merge_object_attributes.
+
+2010-03-02  Christophe Lyon  <christophe.lyon@st.com>
+	Alan Modra  <amodra@gmail.com>
+
+	* elf32-arm.c (a8_erratum_fix): Add st_type field to record the
+	destination mode of the a8 stub.
+	(elf32_arm_link_hash_table): Add top_id field.
+	(elf32_arm_link_hash_table_create): Initialize top_id.
+	(arm_type_of_stub): Update prototype, st_type can now be updated
+	by this function. Actual destination address in case of PLT is
+	computed here, to help factorizing code.
+	(elf32_arm_stub_name): Update prototype, use stub_type additional
+	parameter to build stub name.
+	(elf32_arm_get_stub_entry): Update prototype, use stub_type
+	additional parameter to build stub entry.
+	(arm_build_one_stub): Use bfd_put_16/bfd_put_32 instead of
+	put_thumb_insn/put_arm_insn as BE8 encoding is now handled later.
+	Call elf32_arm_final_link_relocate to process all in-stub
+	relocations.
+	(elf32_arm_setup_section_lists): Update top_id.
+	(cortex_a8_erratum_scan): Record stub destination mode.
+	(elf32_arm_size_stubs): Update call to arm_type_of_stub according
+	to new prototype.
+	(elf32_arm_final_link_relocate): Enable processing of in-stub
+	REL32 relocations. Rely on arm_type_of_stub to detect if a stub is
+	needed, enabling code factorization.
+	(elf32_arm_final_link): Process stub sections.
+	(elf32_arm_output_map_sym): Add entry to code/data map.
+
+2010-03-01  David S. Miller  <davem@davemloft.net>
+
+	* elfxx-sparc.c (_bfd_sparc_elf_check_relocs): When STT_GNU_IFUNC and
+	h->def_regular, set h->ref_regular.
+	(allocate_dynrelocs): Only force output of STT_GNU_IFUNC plt entries
+	and dynamic relocations if h->ref_regular.
+
+	* elfxx-sparc.c (struct elf_reloc_map): Delete.
+	(sparc_reloc_map): Delete.
+	(_bfd_sparc_elf_reloc_type_lookup): Explicitly handle each
+	relocation type in switch statements.
+
+2010-02-25  Alan Modra  <amodra@gmail.com>
+
+	PR ld/11304
+	* elf.c (_bfd_elf_init_private_section_data): Rename need_group
+	to final_link and invert.  For final link allow some flags to
+	differ.  Don't specially allow flags to be all zero.
+
+2010-02-24  Alan Modra  <amodra@gmail.com>
+
+	PR binutils/10858
+	* elfxx-mips.c (mips_elf_create_dynamic_relocation): Ise
+	SYMBOL_REFERENCES_LOCAL to exclude entries from the dynamic symbol
+	table.
+
+2010-02-23  Andrew Zabolotny  <anpaza@mail.ru>
+
+	PR binutils/11297
+	* elf32-avr.c (elf_avr_howto_table): Add R_AVR_8.
+	(avr_reloc_map): Map BFD_RELOC_8 to R_AVR_8.
+
+2010-02-22  Alan Modra  <amodra@gmail.com>
+
+	* reloc.c (bfd_check_overflow): When forming addrmask, shift
+	fieldmask left by rightshift.
+	(_bfd_relocate_contents): Likewise.  Use rightshift addrmask in all
+	overflow checks.
+
+2010-02-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf64_x86_64_add_symbol_hook): Don't check
+	STT_GNU_IFUNC on large common symbol.
+
+2010-02-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_add_symbol_hook): Don't set
+	has_ifunc_symbols if the symbol comes from a shared library.
+	* elf32-ppc.c (ppc_elf_add_symbol_hook): Likewise.
+	* elf32-sparc.c (elf32_sparc_add_symbol_hook): Likewise.
+	* elf64-ppc.c (ppc64_elf_add_symbol_hook): Likewise.
+	* elf64-sparc.c (elf64_sparc_add_symbol_hook): Likewise.
+	* elf64-x86-64.c (elf64_x86_64_add_symbol_hook): Likewise.
+
+2010-02-19  Alan Modra  <amodra@gmail.com>
+
+	* elf.c (_bfd_elf_fixup_group_sections): New function, split out from..
+	(_bfd_elf_copy_private_header_data): ..here.
+	* elflink.c (_bfd_elf_size_group_sections): New function.
+	(bfd_elf_size_dynamic_sections): Call it.
+	* elf-bfd.h (_bfd_elf_size_group_sections): Declare.
+	(_bfd_elf_fixup_group_sections): Declare.
+
+2010-02-18  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+	* elf32-arm.c (elf32_arm_merge_eabi_attributes): Add support for
+	merging Tag_DIV_use, Tag_MPextension_use, and
+	Tag_MPextension_use_legacy tags.
+
+2010-02-18  Alan Modra  <amodra@gmail.com>
+
+	* elf.c (bfd_elf_set_group_contents): Revert accidental 2009-01-15
+	commit.  Don't write zeros for removed group members.
+	(_bfd_elf_copy_private_header_data): Adjust size of group section
+	when group members are removed by objcopy.
+
+2010-02-15  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	PR binutils/11280
+	* configure.host (*-*-solaris2.11):  Add host define to select
+	valid default code page for windres/windmc on solaris.
+
+2010-02-15  Nick Clifton  <nickc@redhat.com>
+
+	* po/vi.po: Updated Vietnamese translation.
+
+2010-02-12  Daniel Gutson  <dgutson@codesourcery.com>
+
+	* elf32-arm.c (elf32_arm_output_arch_local_syms): add
+	missing mapping symbol to data only sections.
+
+2010-02-11  David S. Miller  <davem@davemloft.net>
+
+	* elfxx-sparc.c (_bfd_sparc_elf_check_relocs): For R_SPARC_GOTDATA_OP_HIX22
+	and R_SPARC_GOTDATA_OP_LOX10, only bump the GOT refcount for global
+	symbols.
+	(_bfd_sparc_elf_gc_sweep_hook): Likewise only decrement the GOT count for
+	these relocs on global symbols.
+	(gdopoff): New.
+	(_bfd_sparc_elf_relocate_section): Perform GOTDATA optimizations on
+	local symbol references which are not STT_GNU_IFUNC.  Handle
+	relocation of them like R_SPARC_HIX22 and R_SPARC_LOX10 respectively,
+	and deal with negative vs. non-negative values properly.
+
+2010-02-09  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_canonicalize_one_reloc): Adjust addend for
+	non-external relocation.
+
+2010-02-09  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (merge_got_entries): Move earlier in file.
+	(allocate_dynrelocs): Merge got entries here if not doing multi-toc.
+	(ppc64_elf_size_dynamic_sections): Similarly merge tlsld_got.
+	(ppc64_elf_layout_multitoc): Don't resize if we have already
+	merged got entries.
+
+2010-02-09  Michael Holzheu  <holzheu@de.ibm.com>
+
+	* elf-bfd.h (elfcore_write_s390_timer, elfcore_write_s390_todcmp,
+	elfcore_write_s390_todpreg, elfcore_write_s390_ctrs,
+	elfcore_write_s390_prefix): New.
+	* elf.c (elfcore_write_s390_timer, elfcore_write_s390_todcmp,
+	elfcore_write_s390_todpreg, elfcore_write_s390_ctrs,
+	elfcore_write_s390_prefix): New.
+	(elfcore_grok_note): Handle NT_S390_TIMER, NT_S390_TODCMP,
+	NT_S390_TODPREG, NT_S390_CTRS and NT_S390_PREFIX.
+	(elfcore_write_register_note): Handle .reg-s390-timer,
+	.reg-s390-todcmp, .reg-s390-todpreg, .reg-s390-ctrs,
+	.reg-s390-prefix section.
+
+2010-02-09  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (struct got_entry): Make tls_type and is_indirect
+	unsigned char.  Update variables and code using them throughout file.
+	(struct ppc_link_hash_entry): Likewise for tls_mask.
+
+	* elf64-ppc.c (ppc64_elf_layout_multitoc): Don't merge local got ents.
+
+	* elf64-ppc.c (has_small_toc_reloc): Don't define.
+	(makes_toc_func_call, call_check_in_progress): Shuffle flags.
+	(struct ppc64_elf_obj_tdata): Add has_small_toc_reloc.  Update
+	code setting the flag.
+	(ppc64_elf_next_toc_section): Group big-toc sections in
+	0x80008000 chunks.
+
+2010-02-08  David S. Miller  <davem@davemloft.net>
+
+	* elfxx-sparc.h (struct _bfd_sparc_elf_link_hash_table): Remove sgot,
+	srelgot, splt, srelplt, and sgotplt members in favor of generic copies.
+
+	* elfxx-sparc.c (create_got_section): Delete.
+	(_bfd_sparc_elf_create_dynamic_sections): Don't call, the dynamic
+	section creator does that work for us.  Use ->elf.foo instead of
+	->foo where applicable.
+	(_bfd_sparc_elf_check_relocs): Use ->elf.foo instead of ->foo
+	where applicable.
+	(allocate_dynrelocs): Likewise.
+	(_bfd_sparc_elf_size_dynamic_sections): Likewise.
+	(_bfd_sparc_elf_relocate_section): Likewise.
+	(sparc_vxworks_build_plt_entry): Likewise.
+	(_bfd_sparc_elf_finish_dynamic_symbol): Likewise.
+	(sparc_finish_dyn): Likewise.
+	(sparc_vxworks_finish_exec_plt): Likewise.
+	(sparc_vxworks_finish_shared_plt): Likewise.
+	(_bfd_sparc_elf_finish_dynamic_sections): Likewise.
+
+	* elfxx-sparc.c (_bfd_sparc_elf_check_relocs): Use the SYMBOL_*
+	macros for visibilty and locality checks.
+	(_bfd_sparc_elf_adjust_dynamic_symbol): Likewise.
+	(allocate_dynrelocs): Likewise.
+	(_bfd_sparc_elf_relocate_section): Likewise.
+	(_bfd_sparc_elf_finish_dynamic_symbol):Likewise.
+
+	* elfxx-sparc.c (_bfd_sparc_elf_finish_dynamic_symbol): Remove set
+	but never used local var 'dynobj'.
+
+	* elfxx-sparc.c (_bfd_sparc_elf_adjust_dynamic_symbol): Handle
+	nocopyreloc.
+
+	* reloc.c (BFD_RELOC_SPARC_JMP_IREL): New.
+	(BFD_RELOC_SPARC_IRELATIVE): Likewise.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+	* elfxx-sparc.h (_bfd_sparc_elf_link_hash_table): Add loc_hash_table
+	and loc_hash_memory.
+	(_bfd_sparc_elf_link_hash_table_free): Declare.
+	* elf32-sparc.c (elf32_sparc_add_symbol_hook): New.
+	(elf_backend_add_symbol_hook, elf_backend_post_process_headers,
+	bfd_elf32_bfd_link_hash_table_free): Define.
+	* elf64-sparc.c (elf64_sparc_add_symbol_hook): Set
+	has_ifunc_symbols if STT_GNU_IFUNC.
+	(bfd_elf64_bfd_link_hash_table_free): Define.
+	(elf_backend_post_process_headers): Define always.
+	* elfxx-sparc.c (sparc_jmp_irel_howto, sparc_irelative_howto): New.
+	(sparc_reloc_map): Add entries for new IFUNC relocs.
+	(_bfd_sparc_elf_reloc_type_lookup): Handle new IFUNC relocs.
+	(_bfd_sparc_elf_info_to_howto_ptr): Likewise.
+	(elf_sparc_local_htab_hash, elf_sparc_local_htab_eq,
+	elf_sparc_get_local_sym_hash): New.
+	(_bfd_sparc_elf_create_dynamic_sections): Move PLT ops initialization
+	from here...
+	(_bfd_sparc_elf_link_hash_table_create): ... to here.  Allocate
+	local hash table.
+	(_bfd_sparc_elf_link_hash_table_free): New.
+	(create_ifunc_sections): New.
+	(_bfd_sparc_elf_check_relocs): Unconditionally assign htab->elf.dynobj
+	and call create_ifunc_sections().  For local STT_GNU_IFUNC symbols
+	cons up a fake local hash table entry for it.  Unconditionally add
+	a PLT refcount for STT_GNU_IFUNC symbols when h->def_regular.  Count
+	dyn relocs for ifunc.
+	(_bfd_sparc_elf_adjust_dynamic_symbol): Handle ifunc.
+	(allocate_dynrelocs):  Unconditionally emit a PLT entry when
+	STT_GNU_IFUNC and h->def_regular.  Count GOT dyn relocs for ifunc.
+	(allocate_local_dynrelocs): New function.
+	(_bfd_sparc_elf_size_dynamic_sections): Invoke it over the local hash
+	table.  Emit dynamic relocs to irelplt when not shared.  Treat iplt
+	like splt.
+	(_bfd_sparc_elf_relocate_section): Handle ifunc relocations by hand.
+	(_bfd_sparc_elf_finish_dynamic_symbol): Adjust for non-dynamic ifunc
+	plt in iplt/irelplt.
+
+2010-02-08  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* xcofflink.c (_bfd_xcoff_bfd_final_link): When calculating
+	max_contents_size, only consider sections whose contents must
+	be swapped in.
+
+2010-02-09  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (allocate_dynrelocs): Remove unused got structs here..
+	(ppc64_elf_size_dynamic_sections): ..and here..
+	(merge_got_entries): ..rather than here.
+
+2010-02-09  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (struct ppc_link_hash_table): Add do_multi_toc.
+	(has_small_toc_reloc): Define.
+	(ppc64_elf_check_relocs): Set the above flags.
+	(ppc64_elf_edit_opd): Delete obfd param.
+	(ppc64_elf_tls_optimize): Likewise.
+	(ppc64_elf_edit_toc): Likewise.
+	(ppc64_elf_tls_setup): Likewise.  Add no_multi_toc param.
+	* elf64-ppc.h: Update prototypes.
+
+2010-02-08  Alan Modra  <amodra@gmail.com>
+
+	* section.c (struct bfd_section): Delete has_tls_reloc,
+	has_tls_get_addr_call, has_gp_reloc, need_finalize_relax, reloc_done.
+	Add sec_flg0 thru sec_flg5.
+	(BFD_FAKE_SECTION): Update for changed flags.
+	* ecoff.c (bfd_debug_section): Likewise.
+	* elf32-ppc.c (has_tls_reloc, has_tls_get_addr_call): Define.
+	* elf64-ppc.c (has_tls_reloc, has_tls_get_addr_call): Define.
+	(has_toc_reloc, makes_toc_func_call, call_check_in_progress): Update.
+	* elf32-xtensa.c (reloc_done): Define.
+	* elfxx-ia64.c (skip_relax_pass_0, skip_relax_pass_1): Update.
+	* bfd-in2.h: Regenerate.
+
+2010-02-08  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_canonicalize_one_reloc): Set reloc.r_extern
+	for non-scattered relocations.
+
+2010-02-08  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* elf32-ppc.c (ppc_elf_begin_write_processing): Allow empty
+	apuinfo sections, only scan input sections once and reuse the
+	buffer.
+
+2010-02-08  Philipp Tomsich  <philipp.tomsich@theobroma-systems.com>
+
+	* archures.c (bfd_mach_ppc_titan): Define.
+	* bfd-in2.h: Regenerate.
+	* cpu-powerpc.c (bfd_powerpc_archs): Add titan entry.
+
+2010-02-08  Alan Modra  <amodra@gmail.com>
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Remove dead ifunc code.
+
+2010-02-05  Sterling Augustine  <sterling@tensilica.com>
+
+	* elf.c (assign_file_positions_for_load_sections) Update lma of
+	section	if necessary.  Fixes Bugzilla 11219.
+
+2010-02-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c: Remove trailing white spaces.
+	* elf64-x86-64.c: Likewise.
+
+2010-02-03  Nick Clifton  <nickc@redhat.com>
+
+	* elf-bfd.h (emum elf_object_id): Rename to elf_target_id.  Add
+	entries for other architectures.
+	(struct elf_link_hash_table): Add hash_table_id field.
+	(elf_hash_table_id): New accessor macro.
+	* elflink.c (_bfd_elf_link_hash_table_init): Add target_id
+	parameter.
+	* elf-m10300.c (elf32_mn10300_hash_table): Check table id before
+	returning cast pointer.
+	(elf32_mn10300_link_hash_table_create): Identify new table as
+	containing MN10300 extensions.
+	(mn10300_elf_relax_section): Check pointer returned by
+	elf32_mn10300_hash_table.
+	* elf32-arm.c: Likewise, except using ARM extensions.
+	* elf32-avr.c: Likewise, except using AVR extensions.
+	* elf32-bfin.c: Likewise, except using BFIN extensions.
+	* elf32-cris.c: Likewise, except using CRIS extensions.
+	* elf32-frv.c: Likewise, except using FRV extensions.
+	* elf32-hppa.c: Likewise, except using HPPA32 extensions.
+	* elf32-i386.c: Likewise, except using I386 extensions.
+	* elf32-lm32.c: Likewise, except using LM32 extensions.
+	* elf32-m32r.c: Likewise, except using M32RM extensions.
+	* elf32-m68hc11.c: Likewise, except using M68HC11 extensions.
+	* elf32-m68hc1x.c: Likewise, except using M68HC11 extensions.
+	* elf32-m68hc1x.h: Likewise, except using M68HC11 extensions.
+	* elf32-m68k.c: Likewise, except using M68K extensions.
+	* elf32-microblaze.c: Likewise, except using MICROBLAZE extensions.
+	* elf32-ppc.c: Likewise, except using PPC32 extensions.
+	* elf32-s390.c: Likewise, except using S390 extensions.
+	* elf32-sh.c: Likewise, except using SH extensions.
+	* elf32-spu.c: Likewise, except using SPU extensions.
+	* elf32-xtensa.c: Likewise, except using XTENSA extensions.
+	* elf64-alpha.c: Likewise, except using ALPHA extensions.
+	* elf64-hppa.c: Likewise, except using HPPA64 extensions.
+	* elf64-ppc.c: Likewise, except using PPC64 extensions.
+	* elf64-s390.c: Likewise, except using S390 extensions.
+	* elf64-x86-64.c: Likewise, except using X86_64 extensions.
+	* elfxx-ia64.c: Likewise, except using IA64 extensions.
+	* elfxx-mips.c: Likewise, except using MIPS extensions.
+	* elfxx-sparc.c: Likewise, except using SPARC extensions.
+	* elfxx-sparc.h: Likewise, except using SPARC extensions.
+	* elf32-cr16.c (struct elf32_cr16_link_hash_table): Delete
+	redundant structure.
+	(elf32_cr16_hash_table): Delete unused macro.
+	(elf32_cr16_link_hash_traverse): Delete unused macro.
+	* elf32-score.c: Likewise.
+	* elf32-score7.c: Likewise.
+	* elf32-vax.c: Likewise.
+	* elf64-sh64.c: Likewise.
+
+2010-02-03  Alan Modra  <amodra@gmail.com>
+
+	* elf64-ppc.c (struct plt_entry): Move earlier in file.
+	(struct got_entry): Likewise.  Add is_indirect and got.ent fields.
+	(struct ppc64_elf_obj_tdata): Change tlsld_got to be a struct got_entry.
+	Update all uses.
+	(struct ppc_link_hash_table): Add got_reli_size and second_toc_pass.
+	Remove no_multi_toc.
+	(update_local_sym_info, ppc64_elf_check_relocs): Clear is_indirect
+	when allocating a new struct got_entry.
+	(allocate_got): New function, extracted from..
+	(allocate_dynrelocs): ..here.  Abort on got entry in non-ppc64 bfd.
+	(ppc64_elf_size_dynamic_sections): Track got relocs allocated in
+	.reliplt by got_reli_size.  Set owner on ppc64_tlsld_got entries.
+	(ppc64_elf_setup_section_lists): Remove output_bfd param and
+	no_multi_toc, add add_stub_section and layout_sections_again.  Stash
+	new params in htab.  Extract some code to..
+	(ppc64_elf_start_multitoc_partition): ..here.  New function.
+	(ppc64_elf_next_toc_section): Check for linker script errors.  Handle
+	second pass toc scan.
+	(merge_got_entries, merge_global_got, reallocate_got): New functions.
+	(ppc64_elf_reinit_toc): Rename to..
+	(ppc64_elf_finish_multitoc_partition): ..this.
+	(ppc64_elf_layout_multitoc): New function.
+	(ppc64_elf_size_stubs): Delete output_bfd, add_stub_section and
+	layout_sections_again params.
+	(ppc64_elf_relocate_section): Handle indirect got entries.
+	* elf64-ppc.h: Update prototypes.  Declare new functions.
+
+2010-02-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-bfd.h (elfcore_write_xstatereg): New.
+
+	* elf.c (elfcore_grok_xstatereg): New.
+	(elfcore_write_xstatereg): Likewise.
+	(elfcore_grok_note): Handle NT_X86_XSTATE.
+	(elfcore_write_register_note): Handle .reg-xstate section.
+
+2010-02-01  Tristan Gingold  <gingold@adacore.com>
+
+	* som.c (som_write_ar_hdr): Define this macro.
+
+2010-01-30  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* elf32-hppa.c (final_link_relocate): Convert R_PARISC_TLS_GD21L,
+	R_PARISC_TLS_LDM21L and R_PARISC_TLS_IE21L relocations that use the
+	linkage table pointer to use the global table pointer if not doing
+	a shared link.
+
+2010-01-29  Joel Brobecker  <brobecker@adacore.com>
+
+	* elf.c (elfcore_grok_lwpstatus): Do not overwrite the core signal
+	if it has already been set.
+
+2010-01-27  Tristan Gingold  <gingold@adacore.com>
+
+	* vms.h: Remove trailing spaces.
+	(struct hdr_struct): Remove unused hdr_c_cpr field.
+	(enum file_format_enum): Add comments.
+	* vms.c (vms_bfd_print_private_bfd_data): New function that
+	replaces the macro.
+	Remove trailing spaces.
+	* vms-misc.c: Improve comments.
+	(_bfd_vms_get_object_record): Also handle files without pads.
+	* vms-hdr.c (_bfd_vms_write_dbg): Fix format string.
+	* vms-gsd.c (struct flagdescstruct): Make name field const.
+	(gsyflagdesc): Fix typo.
+
+2010-01-27  Alan Modra  <amodra@gmail.com>
+
+	PR ld/11217
+	* elf64-ppc.c (struct ppc_link_hash_table): Add toc_bfd, toc_first_sec.
+	(ppc64_elf_setup_section_lists): Init them.
+	(ppc64_elf_next_toc_section): Don't partition multi-toc between .got
+	and .toc on the same input file.
+	(ppc64_elf_relocate_section): Correct GOT entry offset.
+
+2010-01-26  Tristan Gingold  <gingold@adacore.com>
+
+	* targets.c (BFD_JUMP_TABLE_ARCHIVE): Add initializer for write_ar_hdr.
+	(bfd_target): Add _bfd_write_ar_hdr_fn field.
+	* archive.c (is_bsd44_extended_name): New macro.
+	(_bfd_generic_read_ar_hdr_mag): Use it.  Add extra_size.
+	(bfd_slurp_armap): Also check for "__.SYMDEF" as a BSD4.4 extended
+	name.
+	(_bfd_archive_bsd44_construct_extended_name_table): New function.
+	(_bfd_generic_write_ar_hdr): Ditto.
+	(_bfd_bsd44_write_ar_hdr): Ditto.
+	(_bfd_write_archive_contents): Call _bfd_write_ar_hdr.
+	(bsd_write_armap): Adjust firstreal computation.
+	* libbfd-in.h (struct areltdata): Add extra_size field.
+	(_bfd_generic_write_ar_hdr): Add prototype.
+	(_bfd_bsd44_write_ar_hdr): Ditto.
+	(_bfd_write_ar_hdr): Define.
+	(_bfd_noarchive_write_ar_hdr): Ditto.
+	(_bfd_archive_bsd_write_ar_hdr): Ditto.
+	(_bfd_archive_coff_write_ar_hdr): Ditto.
+	(_bfd_archive_bsd44_slurp_armap): Ditto.
+	(_bfd_archive_bsd44_slurp_extended_name_table): Ditto.
+	(_bfd_archive_bsd44_construct_extended_name_table): New prototype.
+	(_bfd_archive_bsd44_truncate_arname): Ditto.
+	(_bfd_archive_bsd44_write_armap): Ditto.
+	(_bfd_archive_bsd44_read_ar_hdr): Ditto.
+	(_bfd_archive_bsd44_write_ar_hdr): Ditto.
+	(_bfd_archive_bsd44_openr_next_archived_file): Ditto.
+	(_bfd_archive_bsd44_get_elt_at_index): Ditto.
+	(_bfd_archive_bsd44_generic_stat_arch_elt): Ditto.
+	(_bfd_archive_bsd44_update_armap_timestamp): Ditto.
+	* libbfd.h: Regenerate.
+	* oasys.c (oasys_write_ar_hdr): Define.
+	* libecoff.h (_bfd_ecoff_write_ar_hdr): Define.
+	* ieee.c (ieee_write_ar_hdr): Define.
+	* elf64-mips.c (bfd_elf64_archive_write_ar_hdr): Define.
+	* coff-rs6000.c (rs6000coff_vec): Adjust for write_ar_hdr field.
+	(bfd_pmac_xcoff_backend_data): Ditto.
+	* coff64-rs6000.c (rs6000coff64_vec): Ditto.
+	(bfd_xcoff_aix5_backend_data): Ditto.
+	* coff-alpha.c (alpha_ecoff_write_ar_hdr): Define.
+	* aout-target.h (MY_write_ar_hdr): Define it if not defined.
+	* aout-tic30.c (MY_write_ar_hdr): Ditto.
+	* mach-o-target.c (TARGET_NAME): Use _bfd_archive_bsd44 archive.
+	(bfd_mach_o_mkarchive, bfd_mach_o_read_ar_hdr)
+	(bfd_mach_o_slurp_armap, bfd_mach_o_slurp_extended_name_table)
+	(bfd_mach_o_construct_extended_name_table)
+	(bfd_mach_o_truncate_arname, bfd_mach_o_write_armap)
+	(bfd_mach_o_get_elt_at_index, bfd_mach_o_generic_stat_arch_elt)
+	(bfd_mach_o_update_armap_timestamp): Moved to mach-o.c
+	* mach-o.c (bfd_mach_o_mkarchive, bfd_mach_o_read_ar_hdr)
+	(bfd_mach_o_slurp_armap, bfd_mach_o_slurp_extended_name_table)
+	(bfd_mach_o_construct_extended_name_table)
+	(bfd_mach_o_truncate_arname, bfd_mach_o_write_armap)
+	(bfd_mach_o_get_elt_at_index, bfd_mach_o_generic_stat_arch_elt)
+	(bfd_mach_o_update_armap_timestamp): Moved from mach-o-target.c
+	* bfd-in2.h: Regenerate.
+
+2010-01-26  Alan Modra  <amodra@gmail.com>
+	    H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/11218
+	* elflink.c (elf_link_output_extsym): Do not ignore undefined
+	symbols with ref_regular set when gc_sections is active.
+
+2010-01-25  Alan Modra  <amodra@gmail.com>
+
+	PR ld/11217
+	* elf64-ppc.c (ppc64_elf_tls_optimize): Optimize tls sequences
+	with relocations against undefined weak symbols.
+	(ppc64_elf_relocate_section): Don't optimize calls to undefined
+	weak functions if the symbol is dynamic.
+	(ppc64_elf_relocate_section): Edit tprel tls sequences.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	(_bfd_elf_ppc_at_tprel_transform): New function.
+	* bfd-in.h (_bfd_elf_ppc_at_tprel_transform): Declare.
+	* bfd-in2.h: Regenerate.
+
+2010-01-23  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* coff-rs6000.c (xcoff_howto_table): Change size to 0 and bitsize to 1.
+	(_bfd_xcoff_reloc_type_lookup): Handle BFD_RELOC_NONE.
+	* coff64-rs6000.c (xcoff64_howto_table): Change size to 0 and
+	bitsize to 1.
+	(xcoff64_reloc_type_lookup): Handle BFD_RELOC_NONE.
+
+2010-01-21  Nick Clifton  <nickc@redhat.com>
+
+	* elflink.c (elf_link_add_object_symbols): Look up name of
+	undefined symbol both before and after versioning has been
+	applied.  Do not bother with symbols that are weakly undefined.
+
+2010-01-21  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* elf32-s390.c (elf32_s390_merge_private_bfd_data): New function.
+	(bfd_elf32_bfd_merge_private_bfd_data): New macro definition.
+
+2010-01-19  Cary Coutant  <ccoutant@google.com>
+
+	* dwarf2.c (read_attribute_value): Add DW_FORM_ref_sig8.
+
+2010-01-19  Daisuke Hatayama  <d.hatayama@jp.fujitsu.com>
+	    Alan Modra <amodra@gmail.com>
+
+	* elfcode.h (elf_swap_ehdr_out): Handle e_phnum > 0xffff.
+	(elf_object_p): Read e_phnum extension.
+	(elf_write_shdrs_and_ehdr): Write e_phnum extension.
+	* elfcore.h (elf_core_file_p): Read e_phnum extension.  Sanity check
+	that we can read last program header.
+
+2010-01-19  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+	* elf32-arm.c (elf32_arm_howto_table_1): Correct bitsize of
+	R_ARM_THM_CALL entry.
+	(elf32_arm_final_link_relocate): Correct calculation of
+	reloc_signed_max when doing a R_ARM_THM_CALL, R_ARM_THM_XPC22,
+	or R_ARM_THM_JUMP24 relocation.
+
+2010-01-18  Alan Modra  <amodra@gmail.com>
+
+	PR 11168
+	* coffcode.h (coff_compute_section_file_positions): Move Rs6000COFF_C
+	block past vars in COFF_IMAGE_WITH_PE block.  Report error on more
+	than 32k sections.
+
+2010-01-15  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Fix compilation warning on gcc-3.4.
+	* vms-tir.c (start_etir_record, sto_imm): Rename the prototype
+	parameter index to sec_index according to the function definition.
+
+2010-01-13  Chao-ying Fu  <fu@mips.com>
+
+	* elfxx-mips.c (JR_TO_B_P): New define to transform JR to B.
+	It is true for all CPUs.
+	(jal_reloc_p): New function.
+	(mips_elf_calculate_relocation): Rename require_jalxp to
+	cross_mode_jump_p.
+	Update comment for CROSS_MODE_JUMP_P.
+	Set up cross_mode_jump_p based on the mode change.
+	(mips_elf_perform_relocation): Rename require_jalx to cross_mode_jump_p.
+	Update comment for CROSS_MODE_JUMP_P.
+	Test cross_mode_jump_p and jal_reloc_p to turn jal to jalx.
+	Use !cross_mode_jump_p to guard conversion.
+	Convert "jr t9" to "b", if possible.
+	(_bfd_mips_elf_relocate_section): Rename require_jalx to
+	cross_mode_jump_p.
+	Pass &cross_mode_jump_p to call mips_elf_calculate_relocation.
+	Pass cross_mode_jump_p to call mips_elf_perform_relocation.
+
+2010-01-13  Nick Clifton  <nickc@redhat.com>
+
+	* cpu-m32c.c (m32c_scan): New function.  Ensures that a scan for
+	"m32c" returns the m32c arch_info_struct and not the m16c
+	arch_info_struct.
+	(arch_info_struct): Use the new scan function.
+	(bfd_m32c_arch): Likewise.
+
+2010-01-13  Tristan Gingold  <gingold@adacore.com>
+
+	* config.bfd: Remove duplicated target vector for i386-*-darwin.
+	Appends new arch instead of overriding.
+	Use mach_o_x86_64_vec for x86_64-*-darwin.
+	* configure.in: Add mach_o_x86_64_vec.
+	* configure: Regenerate.
+	* targets.c: Declare mach_o_x86_64_vec, add it to _bfd_target_vector.
+	* Makefile.am (BFD64_BACKENDS): Add mach-o-x86-64.lo
+	(BFD64_BACKENDS_CFILES): Add mach-o-x86-64.c
+	* Makefile.in: Regenerate.
+	* mach-o-x86-64.c: New file.
+
+2010-01-13  Tristan Gingold  <gingold@adacore.com>
+
+	* reloc.c: Add MACH_O_X86_64 relocations.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+2010-01-13  Tristan Gingold  <gingold@adacore.com>
+
+	* archive.c (normalize): Use lbasename.
+	(bfd_bsd_truncate_arname): Ditto.
+	(bfd_gnu_truncate_arname): Ditto.
+
+2010-01-12  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms (CFLAGS): Turns warnings into informational messages.
+
+2010-01-11  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.h: Add x86-64 relocation types.
+
+2010-01-11  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.h (bfd_mach_o_backend_data): Add arch field.
+	(bfd_mach_o_set_arch_mach): New prototype.
+	* mach-o.c (bfd_mach_o_mkobject): Define with bfd_mach_o_gen_mkobject.
+	(bfd_mach_o_set_arch_mach): New function.
+	(bfd_mach_o_gen_mkobject): New function.
+	Set TARGET_ARCHITECTURE for the generic back-ends.
+	* mach-o-target.c (bfd_mach_o_set_arch_mach): Remove define.
+	Check that TARGET_ARCHITECTURE is defined.
+	Add TARGET_ARCHITECTURE in TARGET_NAME_BACKEND structure.
+	* mach-o-i386.c (TARGET_ARCHITECTURE): Define.
+
+2010-01-11  Tristan Gingold  <gingold@adacore.com>
+
+	* archive.c (bfd_slurp_armap): Also check for Mach-O sorted armap.
+
+2010-01-11  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-v850.c (v850_elf_perform_relocation): Fix overflow
+	handling of R_V850_HI16_S relocation.
+
+2010-01-11  Alan Modra  <amodra@gmail.com>
+
+	PR 11103
+	* dwarf1.c (parse_die): Correct FORM_STRING data pointer increment.
+
+2010-01-11  Alan Modra  <amodra@gmail.com>
+
+	PR 6832
+	* dwarf2.c (struct comp_unit): Add sec_info_ptr.
+	(find_abstract_instance_name): Use it.
+	(parse_comp_unit): Set it.
+
+2010-01-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2010-01-08  Tristan Gingold  <gingold@adacore.com>
+
+	* archive.c: Remove bfd_special_undocumented_glue.
+
+2010-01-08  Alan Modra  <amodra@gmail.com>
+
+	PR ld/11133
+	* elf32-cr16.c (elf32_cr16_gc_mark_hook): Call _bfd_elf_gc_mark_hook.
+	* elf32-microblaze.c (microblaze_elf_gc_mark_hook): Likewise.
+	* elf64-ppc.c (ppc64_elf_gc_mark_hook): Likewise.
+
+2010-01-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/11138
+	* elflink.c (elf_link_check_versioned_symbol): Don't abort if
+	a symbol referenced by DSO is is defined in a non-shared object
+	and forced local.
+
+2010-01-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/11133
+	* elflink.c (_bfd_elf_gc_mark_hook): Check section XXX for
+	undefined __start_XXX/__stop_XXX in all input files and set
+	SEC_KEEP.
+
+2010-01-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/11143
+	* elflink.c (elf_gc_sweep): Keep SHT_NOTE section.
+
+2010-01-04  Daniel Gutson  <dgutson@codesourcery.com>
+
+	* bfd.m4 (BFD_HAVE_SYS_PROCFS_TYPE): Define _STRUCTURE_PROC
+	before including procfs.h.
+	(BFD_HAVE_SYS_PROCFS_TYPE_MEMBER): Likewise.
+	* configure.in: Added autoconf probe for the pr_fpreg member.
+	* configure: Regenerated.
+	* config.in: Regenerated.
+	* elf.c: Define _STRUCTURE_PROC before including procfs.h.
+
+2010-01-04  Joel Brobecker  <brobecker@adacore.com>
+
+	Fix -Wshadow warnings in dwarf2.c (seen on alpha-tru64).
+	* dwarf2.c (concat_filename): Rename dirname with dir_name
+	to void shadowing the dirname function.
+	Rename subdirname with subdir_name to stay consistent with
+	the new dir_name variable name.
+
+2010-01-04  Edmar Wienskoski  <edmar@freescale.com>
+
+	* archures.c: Add bfd_mach_ppc_e500mc64.
+	* bfd-in2.h: Regenerate.
+	* cpu-powerpc.c (bfd_powerpc_archs): Add entry for
+	bfd_mach_ppc_e500mc64.
+
+2010-01-01  Joel Brobecker  <brobecker@adacore.com>
+
+	Fix -Wshadow warnings (seen on ppc-aix)
+	* xcofflink.c: Replace finfo by flinfo throughout.
+
+For older changes see ChangeLog-2009
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-9193 sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-9193
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-9193	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-9193	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,7848 @@
+Fri Dec 31 16:23:43 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Minor cleanups suggested by CodeCenter.
+	* aoutx.h, coffgen.c, ecoff.c, ecofflink.c, elf.c, libbfd.c,
+	linker.c, reloc.c, section.c, srec.c: Added /*ARGSUSED*/ as
+	appropriate.
+	* aoutx.h (struct external_exec): Removed unnecessary declaration.
+	(NAME(aout,some_aout_object_p)): Set some tdata pointers to NULL.
+	(adjust_z_magic): Removed useless variable data_vma.
+	(stringtab_init): Initialize hash_zero.
+	(add_to_stringtab): Removed unused fourth argument.
+	(NAME(aout,swap_std_reloc_out)): Removed useless variable
+	r_addend.
+	(aout_link_input_section): Added some casts.
+	* archive.c (get_extended_arelt_filename, do_slurp_coff_armap,
+	bfd_ar_hdr_from_filesystem, bsd_write_armap, coff_write_armap):
+	Minor code rewriting to make it more C like.
+	(do_slurp_bsd_armap): Added some casts.
+	* ecoff.c (ecoff_write_object_contents): Removed useless variable
+	scn_base.
+	(ecoff_write_armap): Added some casts.  Use "" rather than "\0".
+	* ecofflink.c (bfd_ecoff_write_debug): Added a cast.
+	* libaout.h (struct internal_exec): Removed unnecessary
+	declaration.
+	* linker.c (_bfd_generic_indirect_link_order): Added a cast.
+	* opncls.c (new_bfd): Removed a cast.
+	* reloc.c (bfd_generic_get_relocated_section_contents): Added
+	some casts.
+	* srec.c (internal_srec_write_object_contents): Removed useless
+	variable bytes_written.
+
+Fri Dec 31 11:46:13 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* i386mach3.c (N_TXTADDR): Don't define after all.
+	(TEXT_START_ADDR): Don't include exec header size in value.
+
+Thu Dec 30 15:47:54 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* i386mach3.c (N_TXTADDR): Define.
+
+Thu Dec 30 13:37:24 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Extensive changes to move the bulk of the linker into BFD so that
+	more efficient backend code can be written for specific object
+	files.  Only existing efficient backend is a.out.
+	* seclet.c, seclet.h: Removed.
+	* hash.c, linker.c, genlink.h: New files.
+	* bfd-in.h: Removed bfd_error_vector.  Declared hash table
+	structures and functions.
+	(JUMP_TABLE): Removed bfd_seclet_link, added
+	bfd_link_hash_table_create, bfd_link_add_symbols and
+	bfd_final_link.
+	* All backends: Changed accordingly.
+	* bfd-in2.h: Rebuilt.
+	* bfd.c (struct _bfd): Added link_next and archive_pass fields.
+	Removed ld_symbols field.
+	(bfd_nonrepresentable_section, bfd_undefined_symbol,
+	bfd_reloc_value_truncated, bfd_reloc_is_dangerous,
+	bfd_error_vector): Removed.
+	(bfd_default_error_trap, bfd_error_trap,
+	bfd_error_nonrepresentabltrap): Removed.
+	(bfd_get_relocated_section_contents): Pass link_info.  Pass
+	link_order instead of seclet.  Pass symbols.
+	(bfd_relax_section): Pass link_info.
+	(bfd_seclet_link): Removed.
+	(bfd_link_hash_table_create, bfd_link_add_symbols,
+	bfd_final_link): New macros.
+	* libbfd-in.h: If __GNUC__ is defined and alloca is not, define
+	alloca as __builtin_alloca.  Declare internal linking functions.
+	* libbfd.h: Rebuilt.
+	* libbfd.c (bfd_seek): Comment out fseek assertion.  It's worked
+	for months.
+	* reloc.c (reloc_howto_type): Added error_message argument to
+	special_function field.  Changed all callers and all definitions.
+	(bfd_get_reloc_size): Make argument a const pointer.
+	(bfd_perform_relocation): Add error_message argument to hold
+	string set if return value if bfd_reloc_dangerous.  Changed all
+	callers.
+	(_bfd_final_link_relocate, _bfd_relocate_contents): New functions.
+	* section.c (asection): Renamed seclets_head and seclets_tail to
+	link_order_head and link_order_tail.
+	* targets.c (bfd_target): Replaced seclet argument with link_info
+	and link_order and symbols arguments in
+	bfd_get_relocated_section_contents.  Added symbols argument to
+	bfd_relax_section.  Removed bfd_seclet_link.  Added
+	bfd_link_hash_table_create, bfd_link_add_symbols and
+	bfd_final_link.
+	* libaout.h (struct aoutdata): Added external_syms,
+	external_sym_count, external_strings, sym_hashes fields.
+	(obj_aout_external_syms, obj_aout_external_sym_count,
+	obj_aout_external_strings, obj_aout_sym_hashes): New accessor
+	macros.
+	(WRITE_HEADERS): Only output symbols if outsymbols is not NULL.
+	* aoutx.h: Wrote new back end linker routines.
+	(translate_to_native_sym_flags): Return boolean value.  Don't use
+	bfd_error_vector.
+	(NAME(aout,write_syms)): Return boolean value.  Check return value
+	of translate_to_native_sym_flags and bfd_write.
+	* aout-target.h (final_link_callback): New function.
+	(MY_bfd_final_link): New function.
+	* aout-adobe.c (aout_adobe_write_object_contents): Check return
+	value of aout_32_write_syms.
+	* hp300hpux.c (MY(write_object_contents)): Likewise.
+	* i386lynx.c (WRITE_HEADERS): Likewise.
+	* libaout.h (WRITE_HEADERS): Likewise.
+	* bout.c: Changed functions to use link_info->callbacks rather
+	than bfd_error_vector, and link_orders rather than seclets.
+	* coff-alpha.c: Likewise.
+	* coff-h8300.c: Likewise.
+	* coff-h8500.c: Likewise.
+	* coff-sh.c: Likewise.
+	* coff-z8k.c: Likewise.
+	* elf32-hppa.c: Likewise.
+	* reloc16.c: Likewise.
+	* coff-alpha.c (alpha_ecoff_get_relocated_section_contents): Look
+	up _gp in the hash table rather than in outsymbols.
+	* coff-a29k.c (a29k_reloc): Pass errors back in new error_message
+	argument rather than printing them.
+	* coffcode.h (bfd_coff_reloc16_extra_cases): Take link_info and
+	link_order arguments rather than seclet.  Changed all uses and
+	definitions.
+	(bfd_coff_reloc16_estimate): Pass link_info arguments.  Changed
+	all uses and definitions.
+	* libcoff.h: Rebuilt.
+	* ecoff.c (ecoff_get_extr): If symbol is defined by linker, but
+	not by ECOFF, make it scAbs.
+	(ecoff_bfd_final_link): Renamed from ecoff_bfd_seclet_link and
+	rewritten.
+	* elf32-mips.c (mips_elf_final_link): Renamed from
+	mips_elf_seclet_link and rewritten.
+	* elf32-hppa.c (elf32_hppa_stub_description): Added link_info
+	field.
+	(new_stub, add_stub_by_name, hppa_elf_build_arg_reloc_stub,
+	hppa_elf_build_long_branch_stub, hppa_look_for_stubs_in_section):
+	Added link_info arguments.  Changed all callers.
+	* elfcode.h (elf_slurp_symbol_table): Don't quit if outsymbols is
+	not NULL.
+	* oasys.c (oasys_write_sections): Return boolean value rather than
+	using bfd_error_vector.
+	(oasys_write_object_contents): Check return value of
+	oasys_write_sections.
+	* hosts/std-host.h: Don't declare qsort or strtol.
+	* Makefile.in: Rebuild dependencies.
+	(BFD_LIBS): Removed seclet.o.  Added hash.o and linker.o.
+	(CFILES): Removed seclet.c.  Added hash.c and linker.c.
+	(HFILES): Removed seclet.h.  Added genlink.h.
+
+Thu Dec 30 07:41:36 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* section.c (bfd_get_section_contents):  Return zero filled buffer
+	if section has no contents.
+
+Tue Dec 28 12:43:54 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elf.c (bfd_elf_generic_reloc): If this is not an inplace reloc,
+	then skip bfd_perform_relocation even if the addend is non-zero.
+
+Tue Dec 21 09:22:19 1993  Ken Raeburn  (raeburn@rtl.cygnus.com)
+
+	* coffcode.h (coff_write_relocs) [SWAP_OUT_RELOC_OFFSET]: Copy
+	addend to r_offset field.
+
+	* Makefile.in (CFILES): Added coff-sparc.c.  Rebuild dependencies.
+
+	* coff-sparc.c (SWAP_IN_RELOC_OFFSET, SWAP_OUT_RELOC_OFFSET,
+	CALC_ADDEND): Define.
+
+	* aix386-core.c (aix386_core_file_p): Use cd_regs[0] for computing
+	the offsetof because AIX /bin/cc does not like to take the address
+	of an array.  (From Minh Tran-Le.)
+
+Thu Dec 16 13:06:32 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* Thu Dec 16 15:41:06 1993  Peter Hoogenboom  (hoogen@cs.utah.edu)
+
+	* elf32-hppa.c (hppa_elf_build_arg_reloc_stub): Make sure to copy
+	the return pointer into %r2 if no jump-in-call-delay-slot
+	optimization was done.
+
+	* hosts/hp300bsd.h: Correctly identify 4.3BSD vs 4.4BSD.
+
+Wed Dec 15 08:04:16 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* hosts/std-host.h: (time): Don't declare; conflicts on Mach3.
+
+	* hosts/i386mach3.h (HOST_PAGE_SIZE): Set to 1 to avoid padding.
+	(HOST_SEGMENT_SIZE): Set to 0 for same reason.
+
+	* i386mach3.c (PAGE_SIZE, SEGMENT_SIZE): Same changes as above.
+	(TEXT_START_ADDR): Correct.
+	(MY_backend_data): Define.
+
+	* aoutx.h (adjust_o_magic, adjust_z_magic, adjust_n_magic):
+	New functions; code moved from aout_<size>_adjust_sizes_and_vmas.
+
+Tue Dec 14 21:48:33 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+        * som.c (som_begin_writing): Fix thinkos in auxiliary header
+	support.
+	(bfd_som_attach_aux_hdr): Likewise.
+
+Mon Dec 13 23:34:48 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* elf32-hppa.c (hppa_elf_gen_reloc_type): Handle 'T' field
+	selectors for PIC code.
+
+	* som.c (hppa_som_gen_reloc_type): Handle 'T' field selectors.
+	(som_write_fixups): Handle R_DLT_REL, R_FSEL, R_RSEL, R_LSEL
+	relocations needed by PIC.
+
+Tue Dec  7 15:47:51 1993  Stu Grossman  (grossman at cygnus.com)
+
+	* nlmcode.h:  Fixes to avoid compiler warnings...
+
+Tue Dec  7 15:10:54 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* libnlm.h (nlm_backend_data): Removed macro definition.
+	(nlm_alpha_backend_data): Adjusted accordingly.
+
+Sun Dec  5 19:32:08 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_begin_writing): Flesh out code for handling simple
+	auxiliary headers.
+	(bfd_som_attach_aux_hdr): New function.
+
+	* som.h (struct somdata): Add fields for attaching version and
+	copyright headers.  Add accessor macros.
+
+	* som.c (R_DLT_REL, R_AUX_UNWIND, R_SEC_STMT): Add protected
+	definitions for old versions of HPUX which fail to define them.
+	(som_hppa_howto_talbe): Add R_DLT_REL, R_AUX_UNWIND, and R_SEC_STMT
+	now that they're safe.  Delete bogus R_STATEMENT relocations.
+
+	* som.c (som_hppa_howto_table): Add missing R_END_TRY.  Delete 
+	extra R_DATA_OVERRIDE.
+	(hppa_som_gen_reloc_type): Generate a relocation for the rounding
+	mode selector if needed.
+	(som_write_fixups): Handle requests for a change in the default
+	rounding mode.  Rounding modes do not consume input bytes, but
+	are just markers much like R_ENTRY and R_EXIT.
+
+Sat Dec  4 19:40:32 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	Fri Dec  3 09:55:17 1993  Pete Hoogenboom  (hoogen@cs.utah.edu)
+
+	* elf32-hppa.c: (hppa_elf_reloc):  Do not do code reordering when
+	the branch instruction as originally been nullified.
+	hppa_elf_reloc):  Avoid useless call to bfd_put_32 () in the
+	case of no code reordering due to an LDO instruction in the
+	delay slot of the branch.  Make sure to relocate the correct
+	instruction.  Do not perform instruction reordering for millicode
+	calls.
+	(hppa_elf_build_arg_reloc_stub):  Change the relocation type
+	to R_HPPA_STUB_CALL_17 when special processing might be needed.
+	(hppa_elf_build_long_branch_stub): Prevent code reordering on
+	a call from a linker stub to another linker stub and for millicode
+	calls.  Do not trash the return register for calls from one linker
+	stub to a second linker stub.
+
+	* elf32-hppa.c: (elf_hppa_howto_table):  PLABEL and DLT
+	relocations are not pc-relative.
+
+	* hppa_stubs.h: (BLE_N_XXX_0_31):  New instruction used in
+	linker stub code. 
+	(COPY_2_31):  Likewise.
+
+Fri Dec  3 18:40:58 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* config/solaris2.mh (HDEFINES): Remove -Dconst=
+	* hosts/solaris.h: If not __GNUC__, define const as empty.
+
+Thu Dec  2 15:43:32 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.c: Added various casts for 32/64 bit cross targeting.
+	(ecoff_mkobject_hook): Set SEC_SHARED_LIBRARY for the .reginfo
+	section so that the linker ignores it.
+	* ecofflink.c: Added various casts for 32/64 bit cross targeting.
+	(ecoff_add_bytes): Changed need argument to size_t.
+	(bfd_ecoff_debug_link_other): Check return value of
+	ecoff_add_string.
+
+	* libbfd-in.h (new_bfd): Use void rather than an empty parameter
+	list.
+	* libbfd.h: Rebuilt.
+
+	* libnlm.h (struct nlm_obj_tdata): New field backend_data.
+	(nlm_backend_data, nlm_alpha_backend_data): New accessor macros.
+	(struct nlm_backend_data): New field no_uninitialized_data.
+	(nlm_no_uninitialized_data): New accessor macro.
+	* nlmcode.h (nlm_compute_section_file_positions): Handle
+	no_uninitialized_data.
+	(nlm_external_reloc_compare): Sort relocs by address for a
+	particular symbol, to make the sort more stable.
+	(nlm_write_object_contents): Cast the arguments to qsort.  Get the
+	value of a debugging symbol the same way we get the value of a
+	normal symbol.
+	* nlm32-alpha.c: Various changes.  Write out GP and .lita relocs.
+	Set no_uninitialized_data to true.
+	* nlm32-i386.c (nlm32_i386_backend), nlm32-sparc.c
+	(nlm32_sparc_backend): Set no_uninitialized_data field false.
+	* nlmswap.h (nlm_swap_fixed_header_out): Zero out destination
+	before filling it in.
+
+Wed Dec  1 21:47:58 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_section_type, som_decode_symcalss): New functions.
+	(som_get_symbol_info): Use them.
+	(som_slurp_symbol_table): Set the section of common and undefined
+	symbols correctly.
+
+Wed Dec  1 14:15:10 1993  Ken Raeburn  (raeburn@cygnus.com)
+
+	* elfcode.h (write_relocs): Initialize local var LAST_SYM_IDX, to
+	make gcc happy.
+
+	* mipsbsd.c: Changes from Ralph Campbell:
+	(mips_howto_table_ext): MIPS_RELOC_LO16 should use
+	complain_overflow_dont.
+	(aout_mips_*_vec): Make name use "a.out" instead of "aout", to
+	make gdb happy.
+
+	* bfd.c (bfd_errmsgs): Reword invalid-target message.
+
+	* config.bfd: For sparc*-*-coff, use sparc-coff.
+	* configure.in: Handle sparccoff_vec.
+	* targets.c (sparccoff_vec): Declare.
+
+	* reloc.c (bfd_get_reloc_size): New function.
+	(struct reloc_howto_type): Update documentation of size field.
+
+Wed Dec  1 14:39:05 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlm32-alpha.c: New file; preliminary Alpha NetWare support.
+	* config.bfd (alpha-*-netware*): New target; use alpha-nlm.
+	* config/alpha-nlm.mt: New file.
+	* configure.in (nlm32_alpha_vec): New vector; use nlm32-alpha.o,
+	nlm32.o, and nlm.o.
+	* Makefile.in (BFD32_BACKENDS): Added nlm32-alpha.o.
+	(CFILES): Added nlm32-alpha.c.
+	Rebuilt dependencies.
+	* targets.c (nlm32_alpha_vec): Declare.
+
+	* libnlm.h (struct nlm_backend_data): New fields
+	optional_prefix_size, nlm_backend_object_p, nlm_write_prefix,
+	nlm_set_public_section, nlm_get_public_offset.  Removed unused
+	nlm_write_reloc field.  Changed nlm_write_import to remove
+	unnecessary symbol argument.  Renamed nlm_write_externals to
+	nlm_write_external, and changed cound argument from bfd_vma to
+	bfd_size_type.
+	(nlm_optional_prefix_size, nlm_backend_object_p_func,
+	nlm_write_prefix_func, nlm_set_public_section_func,
+	nlm_get_public_offset_func): New accessor macros.
+	(nlm_write_reloc_func): Removed.
+	(nlm_write_external_func): Adjusted for field renaming.
+	* nlm32-i386.c (nlm_i386_write_import): Renamed from
+	nlm_i386_write_reloc.  Removed old nlm_i386_write_import which
+	just called old nlm_i386_write_reloc.
+	(nlm_i386_write_external): Renamed from nlm_i386_write_externals.
+	Declared.  Changed second argument from bfd_vma to bfd_size_type.
+	(nlm32_i386_backend): Adjusted for changes to fields and names.
+	* nlm32-sparc.c (nlm_sparc_mangle_relocs): Removed unused,
+	ifdeffed out code.
+	(nlm_sparc_write_import): Removed second argument.
+	(nlm_sparc_write_external): Renamed from
+	nlm_sparc_write_externals.  Changed second argument from bfd_vma
+	to bfd_size_type.
+	(nlm32_sparc_backend): Adjusted for changes to fields and names.
+	* nlmcode.h: Removed some unused code.
+	(nlm_object_p): Don't destroy tdata pointer.  Call
+	backend_object_p function if it exists.
+	(nlm_slurp_symbol_table): Removed unused variable rcount.  Call
+	set_public_section_func if it exists instead of checking
+	NLM_HIBIT.
+	(nlm_compute_section_file_positions): Account for
+	optional_prefix_size.
+	(nlm_write_object_contents): Account for optional_prefix_size.
+	Removed useless variable write_reloc_func.  Changed declaration
+	and call of write_import_func.  Call write_prefix_func if it
+	exists.  Removed unused variables len and temp.  Call
+	get_public_offset_func if it exists rather than setting NLM_HIBIT.
+	* nlmswap.h: Declare functions.
+
+	* bfd-in.h (uint64_typeLOW, uint64_typeHIGH): Fully parenthesize
+	for clarity.
+	(fprintf_vma, sprintf_vma): Use %lx, not %x.
+	* bfd-in2.h: Rebuilt.
+	* hosts/alphaosf.h (uint64_typeLOW, uint64_typeHIGH): Cast results
+	to unsigned long.
+
+	* config.bfd: Don't set target64 here, as the setting is ignored.
+	* configure.in (ecoffalpha_little_vec): Set target64.
+
+	* config/alphaosf.mt (TDEFINES): Removed; setting host parameters
+	in TDEFINES is wrong.
+
+	* coff-alpha.c (alpha_ecoff_get_relocated_section_contents):
+	Remove unused variable output_section.
+
+Tue Nov 30 16:45:23 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* irix-core.c: New file for Irix 4 and Irix 5 core support.
+	Functions taken out of coff-mips.c.  Handle vmap type VMAPFILE.
+	* coff-mips.c: Irix 4 core file support moved to irix-core.c.
+	* targets.c: If IRIX_CORE defined, include irix_core_vec in
+	target_vector.
+	* config/irix4.mh (HDEFINES): Add -DIRIX_CORE.
+	(HDEPFILES): Define to be irix-core.o.
+	* config/irix5.mh (HDEFINES): Define to be -DIRIX_CORE.
+	(HDEPFILES): Define to be irix-core.o.
+	* Makefile.in (OPTIONAL_BACKENDS): Added irix-core.o.  Removed
+	sco5-core.o, which no longer exists.
+	(CFILES): Added all *-core.c files.
+	Rebuilt dependencies.
+
+Wed Nov 24 02:02:41 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elfcode.h (map_program_segments): Restore check of file_size !=
+	mem_size, but only if SHT_PROGBITS.
+
+	* ecofflink.c: New file to hold ECOFF debug information linking
+	routines.
+	* ecoff.c (ecoff_clear_output_flags, ecoff_rel, ecoff_dump_seclet,
+	ecoff_add_string, ecoff_get_debug): Removed.  Functionality now in
+	ecofflink.c.
+	(ecoff_get_extr, ecoff_set_index): New functions.
+	(ecoff_slurp_symbolic_info): Don't save raw_size.
+	(ecoff_bfd_seclet_link): Rewrote to use ecofflink.c functions.
+	(ecoff_compute_section_file_positions): Don't set EXEC_P just
+	because there is a start address.
+	(ecoff_write_object_contents): Handle external symbols here.  Use
+	ecofflink.c functions to write out debugging information.
+	* elf32-mips.c (mips_elf_read_ecoff_info, mips_elf_get_extr,
+	mips_elf_set_index): New functions.
+	(mips_elf_seclet_link): Discard empty sections, the .options
+	section and .gptab sections.  Handle linking .mdebug section.
+	* libecoff.h (ecoff_data_type): Removed raw_size and ifdbase.
+	* libelf.h (elf_symbol_type): Added mips_extr to tc_data union.
+	* bfd-in.h: Added prototypes for routines in ecofflink.c (some are
+	called by gas, so they are public).
+	* bfd-in2.h: Rebuilt.
+	* Makefile.in (BFD_LIBS): Added ecofflink.o.
+	(CFILES): Added ecofflink.c.
+	(ecofflink.o): New target.  Rebuilt dependencies.
+
+Mon Nov 22 22:26:42 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (hppa_object_p): Also recognize SHARED_MAGIC_CNX as
+	a valid magic number if it's been defined.
+
+Mon Nov 22 14:17:36 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.c (ecoff_mkobject): Don't create .scommon section; linker
+	no longer requires it.
+	(ecoff_bfd_seclet_link, ecoff_sizeof_headers,
+	ecoff_write_object_contents): Don't treat .scommon section
+	specially.
+
+Mon Nov 22 10:54:27 1993  Fred Fish  (fnf@cygnus.com)
+
+	Merged changes from kev@spuds.geg.mot.com (Kevin A. Buettner):
+	* config/delta88.mh (HDEFINES): Define this to be -DPTRACE_CORE.
+	* config/delta88.mh (HDEPFILES): Defined to be ptrace-core.o.
+	* ptrace-core.c:  New file for dealing with core files with
+	start with the ptrace_user structure found on BCS compliant systems.
+	* targets.c (ptrace_core_vec):  New vector.
+
+Mon Nov 22 02:33:12 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* Minimal support for reading SOM fixup streams.  Allows
+	objdump -r to do something reasonable.
+	* som.c (som_get_reloc_upper_bound): Implement.
+	(som_canonicalize_reloc): Implement.
+	(som_set_reloc_info, som_slurp_reloc_table): New functions.
+
+Sun Nov 21 13:46:55 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* hosts/lynx.h (FPRINTF_ALREADY_DECLARED): Define.
+	* hosts/sparclynx.h: Include lynx.h instead of duplicating it.
+
+Fri Nov 19 14:34:04 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* coff-a29k.c (a29k_reloc): For R_IREL, don't left shift
+	signed_value before sign extending it.  Don't subtract out
+	reloc_entry->address.  This makes it compatible with what gas is
+	generating.
+
+	* elfcode.h (elf_fake_sections): Accept .sbss as the name for a
+	SHT_NOBITS sections.
+	(map_program_segments): Don't leave the loop after the first
+	SHT_NOBITS section.
+	(assign_file_positions_except_relocs): Only force sh_offset and
+	sh_addr to match modulo maxpagesize for a section which is not
+	SHT_NOBITS.  Changed the method used to force page alignment after
+	a SHT_NOBITS section to only do it for the last such consecutive
+	section, and to really force page alignment.
+
+Fri Nov 19 04:02:01 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* coffcode.h (coff_slurp_symbol_table): Print more verbose message
+	in the case of an unknown (or unhandled) storage class.
+
+	* config/i386-lynx.mt (TDEFINES): FPRINTF_ALREADY_DECLARED should
+	not be defined here, since it is a host attribute, not a target
+	one.
+	* config/m68k-lynx.mt, config/sparc-lynx.mt: Ditto.
+
+	* coffcode.h (coff_bfd_reloc_type_lookup): Don't define if already
+	defined.
+
+	* coff-sparc.c: Define some relocations, based on ELF relocations.
+	(enum reloc_type, bfd_coff_generic_reloc, coff_sparc_howto_table,
+	struct coff_reloc_map, sparc_reloc_map,
+	coff_sparc_reloc_type_lookup): Borrowed from elf32-sparc.c and
+	elf.c, renamed.
+	(coff_bfd_reloc_type_lookup): Define to be coff_sparc_reloc_....
+	(rtype2howto): Index into coff_sparc_howto_table using
+	dst->r_type.
+
+Thu Nov 18 11:45:39 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* config.bfd (mips*-*-irix5*): New target; use mipsbelf.
+	* configure.host (mips-sgi-irix5*) New host; use irix5 (no
+	hosts/irix5.h created; just use std-host.h).
+	* config/irix5.mh: New file; like irix4.mh, but don't use -G or
+	-lmalloc.
+	* Makefile.in: Rebuilt dependencies.
+
+	* ecoffswap.h: Changed type of internal pointers for swap out
+	functions to const *.
+
+	* elf32-mips.c (mips_elf_got16_reloc): New function.  Handle GOT16
+	correctly for assembler, but linker support not implemented.
+	(elf_mips_howto_table): Use mips_elf_got16_reloc for GOT16.
+	(mips_elf_sym_is_global): New function; at least on Irix 5, all
+	non section symbols are considered global.
+	(elf_backend_sym_is_global): Define.
+	(mips_elf_final_write_processing): New function.  Set the MIPS
+	architecture level correctly.
+	(elf_backend_final_write_processing): Define.
+	(mips_elf_section_from_shdr): Handle SHT_MIPS_OPTIONS.
+	(mips_elf_fake_sections): Set entsize of .mdebug or .reginfo
+	section to 1.  Handle .options section.
+	(mips_elf_acom_section, mips_elf_acom_symbol,
+	mips_elf_acom_symbol_ptr): New static variables, used to build a
+	generic .acommon section to hold SHN_MIPS_ACOMMON symbols.
+	(mips_elf_symbol_processing): Handle SHN_MIPS_ACOMMON symbols by
+	putting them all in a global .acommon section.
+
+	* elfcode.h (bfd_section_from_shdr): Don't dump core if target
+	section has no ELF section data.
+	(elf_make_sections): Set addralign of reloc section to 4.
+	(elf_fake_sections): Likewise.
+	(map_program_segments):	Don't consider section 0.
+	(assign_file_positions_except_relocs): Don't consider section 0.
+	In the main loop, skip the symtab and strtab sections, since their
+	positions are set elsewhere.
+	(swap_out_syms): Set addralign of symtab section to 4.  Set
+	addralign of strtab sections to 1.
+	(assign_file_positions_for_relocs): Don't consider section 0.
+	(write_object_contents): Don't write out section 0.
+
+	* libelf.h (struct elf_backend_data): Added fields
+	elf_backend_sym_is_global and elf_backend_final_write_processing.
+	* elf32-target.h (elf32_bed): Added corresponding initializers.
+	* elf64-target.h (elf64_bed): Likewise.
+	* elfcode.h (sym_is_global): Take abfd argument.  Call
+	elf_backend_sym_is_global if it is not NULL.
+	(elf_map_symbols): Pass abfd to sym_is_global.
+	(write_object_contents): Call elf_backend_final_write_processing
+	if it is defined.
+
+Wed Nov 17 18:43:28 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* libecoff.h: Include coff/ecoff.h.
+	(struct ecoff_backend_data): Move external debugging information
+	fields into a single field pointing to an ecoff_debug_swap
+	structure.
+	(ecoff_data_type): Move debugging information fields into a single
+	field pointing to an ecoff_debug_info structure.
+	* coff-alpha.c, coff-mips.c, ecoff.c: Corresponding changes.
+
+Wed Nov 17 17:38:58 1993  Sean Eric Fagan  (sef@cygnus.com)
+
+	* nlmswap.h: New file to swap fixed header.  Included by NLM
+	backends.
+	* libnlm.h (struct reloc_and_sec): Define.
+	(struct nlm_backend_data): Add fields fixed_header_size,
+	nlm_read_import, nlm_write_import, nlm_swap_fhdr_in,
+	nlm_swap_fhdr_out.
+	(nlm_fixed_header_size, nlm_read_import_func,
+	nlm_write_import_func, nlm_swap_fixed_header_in_func,
+	nlm_swap_fixed_header_out_func, nlm_write_external_func): New
+	accessor macros.
+	* nlmcode.h: Use new functions.
+	* nlm32-i386.c: Provide new functions.
+	* nlm32-sparc.c: New file; SPARC NLM backend.
+
+Wed Nov 17 13:56:10 1993  Stan Shebs  (shebs@rtl.cygnus.com)
+
+	* i386lynx.c (swap_std_reloc_in, swap_ext_reloc_in): Ignore
+	garbage bits appearing in the upper end of symbolnums.
+
+	* config/sparc-lynx.mt (TDEFINES): Add -DFPRINTF_ALREADY_DECLARED.
+
+Tue Nov 16 17:03:41 1993  Stu Grossman  (grossman at cygnus.com)
+
+	* lynx-core.c (lynx_core_file_p):  Change bfd_zalloc to bfd_alloc.
+	* m68klynx.c:  Define core file macros.
+	* hosts/i386lynx.h, hosts/m68klynx.h, hosts/lynx.h:  Move all
+	non-architecture specific stuff into lynx.h.
+
+Tue Nov 16 15:45:54 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* i386linux.c: Define new macro ZMAGIC_DISK_BLOCK_SIZE to 1024, and
+	change PAGE_SIZE to 4096.
+
+Mon Nov 15 11:48:08 1993  Ken Raeburn  (raeburn@rtl.cygnus.com)
+
+	* Makefile.in (diststuff): New target.
+
+	* VERSION: Updated.
+
+Sun Nov 14 23:33:01 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_object_setup): Do not create dummy ".text", ".data",
+	and ".bss" sections.
+	(setup_sections): Do not set SEC_HAS_CONTENTS if a section's size
+	is zero.  Recognize BSS type sections and turn off SEC_LOAD and
+	SEC_DATA (so binutils/size works).  Set the correct value for
+	a section's _raw_size.
+	(som_slurp_symbol_table): Program entry points, and millicode are
+	also functions.  Mark them as such.  Also mark L$* symbols as
+	debugging symbols.
+
+	* bfd-in2.h: Rebuilt.
+
+Sat Nov 13 15:27:15 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_bfd_reloc_type_lookup): Add missing prototype.  Returns
+	a pointer to constant data.  Delete bogus #define which made the 
+	function useless.
+
+	* som.c (som_prep_for_fixups): New function.
+	(som_write_fixups): New function.
+	(som_write_space_strings): New function.
+	(som_write_symbol_strings): New function.
+	(som_begin_writing): New function.
+
+Fri Nov 12 15:29:36 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_write_object_contents): Do not abort.  Flesh out.
+	(som_set_section_contents): Do not abort.  Flesh out.
+
+	* som.c (som_write_headers): New function.
+	(som_prep_headers): New function.
+	(som_build_and_write_symbol_table): New function.
+
+	* som.c (som_sizeof_headers): Add missing prototype.
+	(som_set_arch_mach): Do not abort.
+
+	* som.c (som_count_spaces): New function.
+	(som_count_subspaces): New function.
+	(compare_syms): New function.
+	(som_compute_checksum): New function.
+
+	* som.c (hppa_som_gen_reloc_type): New function.
+	(som_bfd_reloc_type_lookup): New function.
+
+	* som.c (try_prev_fixup): New function.
+	(som_reloc_skip): New function.
+	(som_reloc_addend): New function.
+	(som_reloc_call): New function.
+
+	* som.c (som_initialize_reloc_queue): New function.
+	(som_reloc_queue_insert): Likewise.
+	(som_reloc_queue_fix): Likewise.
+	(som_reloc_queue_find): Likewise.
+
+	* som.c (som_hppa_howto_table): SOM howto relocation table.
+	(hppa_som_reloc): New function.
+
+	* som.c (struct reloc_queue): New structure to keep track of
+	the last four multibyte relocations emitted.
+	(enum pa_symbol_type): Type to fully describe the symbol types
+	associated with .import/.export assembler directives.
+
+	* som.c: Include libhppa.h
+
+	* som.c (bfd_som_set_section_attributes): New function.
+	(bfd_som_set_subsection_attributes): Likewise.
+	(bfd_som_set_symboL_type): Likewise.
+	(bfd_som_attach_unwind_info): Likewise.
+	* som.h: Declare new exported functions.
+
+	* som.h (struct som_symbol): Add new fields to hold additional
+	information needed to build/write symbol tables and fixup streams.
+	(struct som_section_data_struct): Add new fields to hold additional
+	information needed to build/write space and subspace headers.
+	(som_symbol_data): New accessor macro for SOM symbol information.
+	(R_HPPA_*): Basic relocation types to be used by the assembler.
+
+Fri Nov 12 11:00:28 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* trad-core.c (trad_unix_core_file_p): If new hook
+	TRAD_CORE_ALLOW_ANY_EXTRA_SIZE defined, then skip the check for the
+	corefile being too big.
+	* hosts/i386sco.h: Define it.
+
+Thu Nov 11 15:16:28 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* bfd.c (struct _bfd): Add hppabsd_core_data.
+	* targets.c (target_vector): Add hppabsd_core_vec.
+	* hpux-core.c (hpux_core_core_file_p): Fail if an unknown core
+	section is encountered during core section scanning.
+	* hppabsd-core.c: New file.
+	* config/hppabsd.mh: Enable HPPA BSD core files.
+
+	* elf32-hppa.c (hppa_elf_reloc): Remove DEFUN crud.  Remove code
+	which is either commented out or ifdef'd out.  Add, update and
+	clean comments.  Fix various indention and spacing problems.  Handle
+	problems related to using "ble" to jump to a stub rather than "bl"
+	(%r31 is trashed by "ble", but not by "bl").
+	(NEW_INSTRUCTION): Put inside curly braces.
+	(CURRENT_STUB_OFFSET): Fix indention problems.
+	(hppa_elf_build_arg_reloc_stub): Fix indention and spacing problems.
+	Add, update and clean comments.  Handle "ble" %r31 lossage problems.
+	(hppa_elf_build_long_branch_stub): Likewise.
+	(hppa_look_for_stubs_in_section): Likewise.
+	(hppa_elf_stub_check): Remove obsolete function.
+
+	* hppa_stubs.h: Add new instructions to deal with %r31 lossage
+	problems.  Delete unused instructions.
+	
+Tue Nov  9 11:40:27 1993  Stan Shebs  (shebs@rtl.cygnus.com)
+
+	* m68klynx.c (TARGET_IS_BIG_ENDIAN_P): Define.
+
+Tue Nov  9 11:26:05 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elfcode.h (elf_object_p): Rather than looking through an array
+	of architectures, get the ELF EM_xxx code from the backend
+	information.  Let the generic ELF target match any EM_xxx code not
+	matched by another ELF target.  Call elf_backend_object_p to let
+	the backend do more checks and set global information.
+	* libelf.h (struct elf_backend_data): Added elf_machine_code and
+	elf_backend_object_p fields.
+	(struct bfd_elf_arch_map): Removed.
+	(bfd_elf_arch_map, bfd_elf_arch_map_size): Don't declare.
+	* elf32-target.h, elf64-target.h: Initialize elf_machine_code
+	field with ELF_MACHINE_CODE.  Initialize elf_backend_object_p
+	field with elf_backend_object_p (if it is defined).
+	* elf32-gen.c, elf32-hppa.c, elf32-i386.c, elf32-i860.c,
+	elf32-m68k.c, elf32-m88k.c, elf32-mips.c, elf32-sparc.c,
+	elf64-gen.c (ELF_MACHINE_CODE): Defined.
+	* elf32-mips.c: Include ecoffswap.h to get ECOFF swapping
+	routines.
+	(mips_elf_object_p): Set the right machine number.
+	(mips_elf_ecoff_debug_swap): Defined.
+	(elf_backend_object_p): Defined to be mips_elf_object_p.
+	(elf_backend_ecoff_debug_swap): Defined to be
+	mips_elf_ecoff_debug_swap.
+	* elf.c (bfd_elf_arch_map, bfd_elf_arch_map_size): Removed.
+
+	* libbfd-in.h (target_vector, default_vector): Declare.
+	* libbfd.h: Rebuilt.
+	* format.c (target_vector, default_vector): Don't declare.
+
+	* elf32-mips.c (elf_mips_howto_table): Don't complain on overflow
+	for R_MIPS_26.  Correct overflow detection requires matching the
+	upper four bits of the destination against the PC.  From Ted Lemon
+	<mellon@pepper.ncd.com>.
+
+	* bout.c (b_out_reloc_type_lookup): Return type should point to
+	const data.
+	* coff-i960.c (coff_i960_reloc_type_lookup): Likewise.
+	* elf32-hppa.c (elf_hppa_reloc_type_lookup): Likewise.
+	* mipsbsd.c (MY(reloc_howto_type_lookup)): Likewise.
+	* coff-i386.c (coff_i386_reloc): Made howto const.
+	* oasys.c (oasys_write_data): Made how const.
+
+	* libelf.h: Added some comments.
+	(struct elf_backend_data): Added elf_backend_ecoff_debug_swap
+	field.  Removed unused write_relocs field.
+	* elf32-target.h: Adjusted elf_backend_data initialization
+	accordingly.
+	* elf64-target.h: Corrected elf_backend_data initialization to
+	fill in all fields and to set elf_64_p to 1.
+
+Mon Nov  8 18:13:14 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elfcode.h (bfd_section_from_shdr): Remove duplicate assignment
+	to filepos in SHT_STRTAB case.
+	(assign_file_position_for_section): Set BFD section filepos as
+	well as ELF section sh_offset.
+
+	* reloc.c: Use const instead of CONST.
+	(bfd_perform_relocation): Make variable howto a const pointer.
+	* bfd-in2.h, libbfd.h: Rebuilt.
+
+Mon Nov  8 12:19:15 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* Makefile.in (realclean): Don't remove generated headers.  Reverts
+	change of 2 Jul 1993.
+
+Mon Nov  8 06:08:31 1993  D. V. Henkel-Wallace  (gumby@cirdan.cygnus.com)
+
+	* configure.bfd: make unixware equivalent to sysv4.
+
+	* config/i386-nlm.mt: bring in elf config; make it the default.
+
+Sun Nov  7 20:21:38 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* libbfd.c (bfd_put_8): Add parens around reference to "val"
+	argument.
+
+Fri Nov  5 21:45:09 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* hosts/i386mach3.h (HOST_SEGMENT_SIZE),
+	i386mach3.c (SEGMENT_SIZE, TEXT_START_ADDR): Correct values (?).
+
+Fri Nov  5 15:17:57 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* coffcode.h (coff_write_object_contents): Zero out internal_a.
+
+Fri Nov  5 10:41:07 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* aoutx.h, archive.c, archures.c, bfd.c, cache.c, coffcode.h,
+	core.c, ctor.c, format.c, init.c, libbfd.c, opncls.c, reloc.c,
+	section.c, syms.c, targets.c:
+	Doc cleanup (spelling, punctuation, grammar, formatting).
+	* bfd-in2.h, libbfd.h: Rebuild.
+
+Thu Nov  4 14:46:14 1993  John Gilmore  (gnu@rtl.cygnus.com)
+
+	* bfd-in.h (bfd_get_cacheable, bfd_set_cacheable):  New accessors.
+	* bfd.c, opncls.c:  Improve comments on file descriptor cacheing.
+
+Thu Nov  4 08:54:30 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* From Pete Hoogenboom (hoogen@cs.utah.edu)
+	* elf32-hppa.c (hppa_elf_get_section_contents): Fix logic error
+	in last change.  Always rebuild symbol extension section the first
+	time though if output sections exist (fixes ld -r problems).
+
+Thu Nov 04 08:08:46 1993  Jeffrey Wheat  (cassidy@cygnus.com)
+
+	* Makefile.in: Add .PHONY for check and installcheck rules.
+
+Tue Nov  2 14:42:27 1993  Bill Cox (bill@tarkas.cygnus.com)
+
+	* libbfd-in.h (artdata): Use long, not time_t for portability, at
+	  least to HPUX.  File below is a derived file.
+
+Tue Nov  2 14:42:27 1993  Bill Cox (bill@tarkas.cygnus.com)
+
+	* libbfd.h (artdata): Use long, not time_t for portability, at
+	  least to HPUX.
+
+Tue Nov  2 09:32:25 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config.bfd: Use bigmips for mips*-*-bsd*.
+
+Mon Nov  1 14:30:09 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elfcode.h (elf_slurp_reloca_table, elf_slurp_reloc_table):
+	Handle symbol number of zero.
+
+	* reloc.c (enum bfd_reloc_code_real): Added
+	BFD_RELOC_MIPS_LITERAL, BFD_RELOC_MIPS_GOT16,
+	BFD_RELOC_MIPS_CALL16, BFD_RELOC_MIPS_GPREL32.
+	* bfd-in2.h: Rebuilt.
+	* coff-mips.c (mips_bfd_reloc_type_lookup): Handle
+	BFD_RELOC_MIPS_LITERAL.
+	* elf32-mips.c (mips_reloc_map): Handle new relocs.
+	(mips_elf_hi16_reloc, mips_elf_lo16_reloc): Rearrange _gp_disp
+	checks slightly.
+
+	* aout-target.h (MY_bfd_debug_info_start, MY_bfd_debug_info_end,
+	MY_bfd_debug_info_accumulat [sic]): Remove unused definitions.
+	(MY_bfd_get_relocated_section_contents, MY_bfd_relax_section,
+	MY_bfd_seclet_link): Define.
+	(MY_bfd_reloc_type_lookup): Rename from
+	MY_reloc_howto_type_lookup.
+	(MY_bfd_make_debug_symbol): Rename from MY_make_debug_symbol.
+	(MY(vec)): Use JUMP_TABLE rather than listing functions.
+	* hp300hpux.c (MY_get_symtab, MY_get_symtab_upper_bound,
+	MY_canonicalize_reloc, MY_write_object_contents): Don't define in
+	terms of MY, because that causes a recusive invocation of CAT when
+	expanded within JUMP_TABLE, and ANSI compilers don't expand
+	recursive macros.
+	* mipsbsd.c (MY_bfd_reloc_type_lookup): Rename from
+	MY_reloc_howto_type_lookup, and don't define in terms of MY.
+	(MY_canonicalize_reloc): Don't define in terms of MY.
+	(aout_mips_little_vec, aout_mips_big_vec): Use JUMP_TABLE rather
+	than listing functions.
+
+Mon Nov  1 09:12:25 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config.bfd: Use m68k-elf for m68*-*-sysv4*.
+
+Sun Oct 31 09:35:49 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* targets.c: Move enum target_flavour outside of struct and change
+	the name to enum bfd_flavour.  This means bfd clients can use it.
+	* bfd-in.h: Add macro bfd_get_flavour.
+	* bfd-in2.h: Rebuilt.
+
+	* som.c: Add comment about how abort() on corrupt executable is evil.
+
+Sat Oct 30 12:27:09 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* aoutx.h (aout,slurp_reloc_table): Avoid a goto.
+
+Fri Oct 29 16:04:33 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* gen-aout.c, libbfd.c: exit(1) instead of exit(-1).
+
+Fri Oct 29 13:17:21 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* bfd-in.h: Added commands for object file flag values.
+	* bfd-in2.h: Rebuilt.
+	* elfcode.h (elf_object_p): If type is ET_DYN, set DYNAMIC flag,
+	not EXEC_P.
+	* bout.c, coff-h8300.c, coff-sh.c: Add BFD_IS_RELAXABLE to
+	object_flags field for target vector.
+	* aix386-core.c, aout-adobe.c, aout-target.h, bout.c, coff-a29k.c,
+	coff-alpha.c, coff-apollo.c, coff-h8300.c, coff-h8500.c,
+	coff-i386.c, coff-i960.c, coff-m68k.c, coff-m88k.c, coff-mips.c,
+	coff-rs6000.c, coff-sh.c, coff-we32k.c, coff-z8k.c, hpux-core.c,
+	ieee.c, mipsbsd.c, nlm-target.h, oasys.c, osf-core.c, som.c,
+	srec.c, tekhex.c, trad-core.c:	Remove DYNAMIC from object_flags
+	field for target vector.
+
+Thu Oct 28 20:02:31 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* hosts/std-host.h: Don't declare time; causes error on mach3.
+	* configure.in (i386mach3_vec): Require aout32.o stab-syms.o.
+
+Thu Oct 28 16:33:26 1993  Stan Shebs  (shebs@rtl.cygnus.com)
+
+	LynxOS and Sparc LynxOS changes:
+	* config.bfd: Recognize sparc-*-lynxos*.
+	* configure.host: Recognize sparc-*-lynxos*.
+	* configure.in: Recognize Sparc Lynx vectors.
+	* targets.c (sparclynx_aout_vec): Declare.
+	(sparclynx_coff_vec): Declare.
+	(target_vector): Add them.
+	* cf-i386lynx.c: New file, renamed from i386lynx-cf.c.
+	* cf-m68klynx.c: New file, renamed from m68klynx-cf.c.
+	* cf-sparclynx.c: New file, support for coff in Sparc LynxOS.
+	* coff-sparc.c: New file, basic Sparc coff support.
+	* sparclynx.c: New file, support for a.out in Sparc LynxOS.
+	* Makefile.in: Change filenames appropriately, add Sparc rules.
+	* coffcode.h (coff_set_arch_mach_hook): Recognize Sparc magic
+	number.
+	(coff_set_flags): Use LynxOS magic number for i386, m68k, and
+	Sparc LynxOS, set Sparc magic number for Sparcs.
+	* config/m68k-lynx.mt (SELECT_VECS): Remove redundant vector.
+	* config/sparc-lynx.mt: New file.
+	* hosts/i386lynx.h: Cosmetic improvements.
+	* hosts/m68klynx.h: Add ifdefs, #define of cfree.
+	* hosts/sparclynx.h: New file.
+
+Thu Oct 28 16:23:40 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	gcc -Wall lint:
+	* coff-h8300.c (h8300_reloc16_estimate): Declare return type.
+	Remove useless statement probably left by code copy.
+	* cpu-i960.c (compatible): Fully bracket matrix initializer.
+	* elf32-hppa.c (hppa_elf_build_arg_reloc_stub): Use bfd_xmalloc
+	rather than xmalloc.  Use realloc and check the return value
+	rather than xrealloc.
+	(hppa_elf_get_section_contents): Add some casts.
+	* elf32-i386.c (elf_i386_reloc_type_lookup): Remove unused
+	variable.  Add default case to switch.
+	* hp300hpux.c: Declare aout_32_write_syms.
+	* i386bsd.c, i386linux.c, netbsd386.c (N_SHARED_LIB): Define as 0
+	(definition from aout/aout64.h is always 0 anyhow).
+	* i386lynx.c (swap_std_reloc_in): Remove unused variable.
+	* ieee.c (ieee_write_id): length can never be negative.
+	(read_id): Likewise.
+	(ieee_archive_p): Remove unused variable.
+	* libcoff-in.h (bfd_perform_slip): Declare.
+	* libcoff.h: Rebuilt.
+	* oasys.c (oasys_write_sections): Remove zero initialization of
+	static structure.
+	* reloc16.c: Indentation change.
+
+Wed Oct 27 16:51:29 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* configure.in, config/i386-mach3.mt: Update for new configuration
+	(--with-targets	and so on).
+	* hosts/i386mach3.h: Declare errno.
+	* targets.c: Declare i386mach3_vec.
+
+Wed Oct 27 12:18:07 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlmcode.h (nlm_swap_auxiliary_headers_in,
+	nlm_swap_auxiliary_headers_out): Handle sharedDebugRecordOffset
+	and sharedDebugRecordCount fields.
+
+Tue Oct 26 16:21:12 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* targets.c (target_vector): Remove SCO_CORE.  On Sep 11 1993,
+	we started using trad-core.c for SCO instead.
+
+	* targets.c (target_vector): Re-enable generic ELF and NLM targets.
+
+Tue Oct 26 16:53:12 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elfcode.h (assign_file_position_for_section): Align sh_offset to
+	sh_addralign (this is what UnixWare does, and it shouldn't hurt).
+
+Tue Oct 26 10:16:54 1993  Ken Raeburn  (raeburn@cygnus.com)
+
+	From Jeff Law and Pete Hoogenboom at Utah:
+
+	* elf32-hppa.h (hppa_elf_stub_finish): Add prototype.
+	(ELF32_HPPA_R_ARG_RELOC): Renamed without the ELF32 prefix
+	and moved into libhppa.h.  All references changed.
+	(ELF32_HPPA_R_CONSTANT, ELF32_HPPA_R_ADDEND): Likewise.
+	(get_opcode and opcode defines): Move into libhppa.h
+	* elf32-hppa.c (hppa_elf_insn2fmt): Rename and move info
+	libhppa.h.
+	* libhppa.h (HPPA_R_*): Moved here.  Reformatted slightly to make
+	for easier reading.
+	(get_opcode): Moved here.  FIXME! this really should be a C function
+	inside the opcode library!
+	(bfd_hppa_insn2fmt): Likewise.
+
+	* targets.c (target_vector): Enable elf32-hppa vector.
+
+	* elf32-hppa.c (hppa_elf_get_section_contents): Add new comments
+	and clarify existing comments.  Do not use DEFUN to declare this
+	function.  Fix numerous indention problems.  Correctly handle cases
+	where symbol extension section may need to be read from disk, 
+	read from memory, or built then read from memory.
+
+	* elf32-hppa.h: Reformat with gnu-indent and hand fix numerous
+	formatting and indention problems gnu-indent can not handle.
+	Clarify some comments about relocation types.  Comment basic
+	relocation "classes".  Group PARAM declarations together.
+	(HPPA_SXT_{NULL, SYMNDX, RG_RELOC}): Make members of a new 
+	enumerated type rather than #defines.
+
+Tue Oct 26 02:40:46 1993  Stu Grossman  (grossman at cygnus.com)
+
+	* som.c (hppa_object_setup):  Set SEC_CODE for .text section so
+	that GDB can figure out text_start and text_end.
+
+Mon Oct 25 16:05:23 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Fix up warnings from gcc -Wall:
+	* coffgen.c (coff_print_symbol): Use %lx and cast n_value to
+	unsigned long.  Use %ld for tagndx.  Use %lx for offset + vma and
+	cast it to unsigned long.
+	* ecoff.c (ecoff_emit_aggregate): Use %ld.	
+	(ecoff_print_symbol): Use %ld, and cast indx and sym_base to long.
+	* coffcode.h (dummy_reloc16_estimate): Specify return type.
+
+	* libbfd.c (bfd_write): If not everything is written out, set
+	bfd_error to system_call_error.  If the return value is
+	non-negative, set errno to ENOSPC (if ENOSPC is defined).
+	(bfd_seek): If the seek fails, set bfd_error to system_call_error.
+	(bfd_generic_set_section_contents): For a bad offset + count, set
+	bfd_error to bad_value.
+	* seclet.c (rel): Don't abort.  Instead, return false.
+
+Mon Oct 25 09:59:37 1993  Ken Raeburn  (raeburn@cygnus.com)
+
+	* aoutx.h (reloc_type_lookup): Handle BFD_RELOC_SPARC_WDISP22.
+
+Fri Oct 22 20:35:54 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* config.bfd: handle mips*-* instead of mips-*, use mips*el
+	  instead of mips-*-*l
+
+Fri Oct 22 14:03:33 1993  Mark Eichin  (eichin@cygnus.com)
+
+	* m68k-lynx.mt, i386-lynx.mt (TDEFINES): set
+	FPRINTF_ALREADY_DECLARED because the objdump.c declaration of
+	fprintf collides with the native one.
+
+Fri Oct 22 11:50:25 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* targets.c (target_vector): Enable MIPS ELF vectors.
+
+Fri Oct 22 07:51:51 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config.bfd: Use bigmips for mips-sony-bsd*.
+
+	* configure.host, config.bfd: Add * to end of all OS names.
+
+Thu Oct 21 12:16:26 1993  Ken Raeburn  (raeburn@cygnus.com)
+
+	* elfcode.h (FILE_ALIGN): Renamed from EALIGN, to avoid conflict
+	with Ultrix header files.
+
+	* som.h (struct som_section_data_struct): Renamed from
+	som_section_data to avoid conflict with macro by that name.
+
+	Changes from Jeff Law and Peter Hoogenboom at Utah:
+
+	* elf32-hppa.c (hppa_elf_reloc):  Target register for a 'jump
+	in delay slot' optimization in combination with a long call
+	stub should always be r31.
+
+	* elf32-hppa.c: (hppa_elf_relocate_insn): To be consistent
+	across all relocation types, retrieve instruction addends from
+	the relocation entry rather than from the instruction itself.
+
+	* elf32-hppa.c: (hppa_elf_relocate_insn): Fix a relocation
+	error that only occurred when the addend of an 'addil' or
+	'ldil' was larger than 21 bits and very close to a 2K byte
+	boundary.
+
+	* elf32-hppa.c: (hppa_elf_reloc):  Handle the optimization in
+	which a jump is placed in the delay slot of a function call.
+	The jump was being accomplished via an adjustment to the
+	return pointer.  This optimization would break the long call
+	stub code, if there was any.
+
+	* elf32-hppa.c: (hppa_elf_build_long_branch_stub): Corrections
+	to long branch stubs to avoid use of general register 2.
+
+	* hppa_stubs.h: New stub instructions.
+
+	* elfcode.h: Declare bfd_elf_find_section.
+
+	* som.h (som_section_data): Add new "subspace_index" field.
+
+	* som.c (setup_sections): Save the original SOM subspace index
+	in the BFD section associated with that subspace.  
+	(som_get_symtab_upper_bound): Implement.
+	(som_get_symtab): Implement.
+	(som_print_symbol): Implement.
+	(som_slurp_string_table): New function to read a string table
+	from a SOM object file.
+	(som_section_from_subspace_index): New function to return the
+	section which corresponds to a SOM subspace index.
+	(som_slurp_symbol_table): New function to read the symbol
+	table from a SOM object file.
+	(som_make_empty_symbol): Check for errors from bfd_zalloc.
+	(som_new_section_hook): Initialize subspace_index field to
+	-1 instead of 0.
+
+	* som.c (som_object_setup): Fix polarity of test to set HAS_RELOC.
+	Set EXEC_P for executables.
+	(setup_sections): Correctly identify when a section has
+	relocations.
+	(log2): New function.
+	(setup_sections): Correctly convert between SOM alignments and BFD
+	alignments.
+
+	* som.c (setup_sections): Do not set SEC_ALLOC or SEC_LOAD
+	for sections which correspond to SOM spaces, doing so confuses
+	many utilities.  Set assorted SEC_* flags for SOM subspaces
+	which correspond to BFD sections.
+
+	* elf32-hppa.c: (elf32_hppa_backend_fake_sections): The stab
+	string table should have sh_type == SHT_STRTAB.  Add
+	processing to make it so.
+
+	* elfcode.h: (bfd_section_from_shdr): String tables (other
+	than .strtab) were not getting the file offsets recorded, so
+	they could not be read from disk.
+
+	* elfcode.h: (elf_make_sections):  Leave the sh_addr field of
+	the section header and the vma field of a section at 0 if the
+	section is not part of the program execution image. (e.g.,
+	.stab)
+
+	* som.[hc]: Change target vector prefix from "hppa" to "som".
+	Consistently use obj_som prefix to access fields in backend data
+	structures.  Fix all callers/references.
+
+	* som.h: Do not include files only needed for core file reading here.
+	Include a.out for both HOST_HPPAHPUX and HOST_HPPABSD.  Delete
+	forward structure declarations, they are unnecessary.
+	(struct somdata): Delete aux_hdr, and hp_symbol_entry_size fields.
+	Change "symbols" to "symtab".  Add "stringtab" and "reloc_filepos"
+	fields for future use.  Change obj_som_* macros as appropriate.
+	(som_section_data): New structure to keep SOM specific information
+	about BFD sections (for future use).
+
+	* som.c: Provide PARAMS declarations for all functions currently
+	in this file.
+	(struct container): Delete unwanted structure definition.
+	(som_object_setup): Add comments.  Use som_mkobject to allocate
+	SOM specific information in the BFD; use information from the
+	file and (possibly empty) auxiliary headers to initialize this
+	information.  Delete redundant bfd_get_symcount (abfd) "calls".
+	(setup_sections): Return type is now boolean, fix return statements.
+	"Fix" handling of BSS like subspaces in the computation of the
+	containing space's size.  If the subspace has relocations, set the
+	appropriate BFD section flags and record the index into and the
+	size of the fixup stream.  Always return a value.
+	(som_object_p): Set bfd_error appropriately if errors are detected
+	from bfd_{read,seek} functions.  Handle EXECLIBMAGIC type files.
+	Do not try to read a non-existant auxiliary header.
+	(som_mkobject): Flesh out.
+	(som_section_hook): Allocate space to hold SOM specific information
+	about sections.
+
+Thu Oct 21 12:41:34 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	gcc -Wall lint:
+	* coff-h8300.c, coffcode.h: Change shrink parameter
+	in *_reloc16_estimate to unsigned to match prototype.
+	* archive.c: Avoid "/*" in comment.
+
+Thu Oct 21 13:05:16 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* dep-in.sed: Create our own line breaks for a more aesthetic
+	Makefile.
+	* Makefile.in: Rebuilt dependencies.
+
+	* elf32-mips.c: Include "seclet.h".
+	(mips_elf_fake_sections): Force size of .reginfo section to sizeof
+	Elf32_External_RegInfo.
+	(mips_elf_seclet_link): New function.  Link the .reginfo section
+	specially, and pass everything else to the generic routine.
+	(bfd_elf32_bfd_seclet_link): Define macro.
+	* elf32-target.h: If bfd_elf32_bfd_seclet_link is already defined,
+	don't override it.
+
+Wed Oct 20 12:22:37 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* libnlm.h (nlm_backend_data): Added signature field.
+	(nlm_signature): New macro.
+	* nlmcode.h (nlm_object_p, nlm_write_object_contents): Use the NLM
+	signature from the backend rather than the constant NLM_SIGNATURE.
+	* nlm32-i386.c (nlm32_i386_backend): Initialize signature field.
+
+	* aoutf1.h (MACHTYPE_OK): Accept M_UNKNOWN.
+	(NAME(sunos,set_arch_mach)): Treat M_UNKNOWN as 68000, not 68020.
+
+Wed Oct 20 10:28:27 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* hosts/i386bsd.h [__bsdi__]: Define HOST_DATA_START_ADDR.
+
+Wed Oct 20 10:10:07 1993  Ken Raeburn  (raeburn@cygnus.com)
+
+	* Makefile.in (HFILES): New variable, for use in "make dep".
+	(.dep): Depend on $(CFILES) and $(HFILES).  Delete .dep1 and
+	remake it, so that "$?" is complete.
+	(.dep1): Don't need to remove .dep1 first.
+	(dep.sed): Depend on config.status, not Makefile.
+	(CFILES): Add nlm.c.
+
+Tue Oct 19 15:26:26 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* coff-alpha.c: Implemented reloc handling for the linker, made
+	various other related changes.
+	* libecoff.h (ecoff_backend_data): Added rdata_in_text field.
+	Renamed finish_reloc to adjust_reloc_in.  Added adjust_reloc_out
+	field.
+	(ecoff_bfd_get_relocated_section_contents): Don't define.
+	* ecoff.c (ecoff_sec_to_styp_flags, ecoff_styp_to_sec_flags):
+	Handle .lita section.
+	(ecoff_slurp_reloc_table): Handle RELOC_SECTION_FINI.
+	finish_reloc backend field renamed to adjust_reloc_in.
+	(ecoff_bfd_seclet_link): Adjust number of aux entries to
+	debug_align boundary.
+	(ecoff_compute_section_file_positions): If rdata_in_text put
+	.rdata section in text segment, not data segment.  Put .pdata
+	section in text segment.
+	(ecoff_write_object_contents): Likewise.  Also, call
+	adjust_reloc_out, and handle .lita, .xdata, .pdata, .fini and
+	absolute sections when writing out relocs.
+	* coffswap.h (coff_swap_aouthdr_out): For ALPHAECOFF, output 2 for
+	bldrev field, as on Alpha OSF/1.  Padding field is now 2 bytes.
+	* coff-mips.c (mips_ecoff_swap_reloc_out): Added assertion.
+	(mips_adjust_reloc_in): Renamed from mips_finish_reloc.
+	(mips_adjust_reloc_out): New function (does nothing).
+	(mips_ecoff_backend_data): Initialize new fields.
+	(ecoff_bfd_get_relocation_section_contents): Define to be
+	bfd_generic_get_relocated_section_contents.
+
+	* reloc.c (bfd_perform_relocation): Added casts to avoid Alpha
+	OSF/1 cc bug.
+
+Thu Oct 14 01:10:35 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* reloc.c (bfd_perform_relocation): Add comments attempting to
+	explain PC relative relocations.
+
+	* coffcode.h (styp_to_sec_flags): Don't set SEC_DEBUGGING until it
+	is made to work.
+	(coff_compute_section_file_positions): Remove check for
+	USE_DISCARDED_SECTIONS_COUNT.
+	* coff-i386.c: Don't define USE_DISCARDED_SECTIONS_COUNT.  Basing
+	it on host defines is wrong.
+
+	* ecoff.c (ecoff_bfd_seclet_link): Don't link a .reginfo section.
+	(ecoff_write_object_contents): Don't require the .reginfo section
+	to be a particular size.
+
+Wed Oct 13 18:39:03 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* Makefile.in (dep-in): New rule, for editing dependencies into
+	Makefile.in in $(srcdir).  Use move-if-change.
+	(.dep1, dep): Use move-if-change.
+	(CFILES): Add coff-apollo.c.
+
+	Sun Oct 10 18:02:56 1993  Troy Rollo (troy@cbme.unsw.EDU.AU)
+
+	* Makefile.in: Recognise new file, coff-apollo.o
+
+	* coff-apollo.c: New file
+
+	* coffcode.h: Recognise apollo magic numbers and writable text
+
+	* coffswap.h: Swap Apollo optional header entries
+
+	* config.bfd: Add line for Apollo
+
+	* configure.host: Replace apollo68b and apollo68v with Apollo
+
+	* configure.in: Recognise apollocoff_vec
+
+	* targets.c: Likewise
+
+	* config/apollo.mh, config/apollo.mt: New files
+
+	* hosts/apollo68.h: Remove inclusion of strings.h
+
+Wed Oct 13 14:28:17 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* coff-i386.c (i3coff_object_p): Now static.
+
+	* Makefile.in: Updated dependencies.
+	(.dep, .dep1, dep.sed): New targets, to make "make dep" work
+	better.
+	* dep-in.sed: New file.
+
+	* m68klynx-cf.c (ONLY_DECLARE_RELOCS): Define, to avoid name
+	conflicts when "--with-targets=all".
+	* coff-m68k.c (m68kcoff_howto_table, m68k_rtype2howto,
+	m68k_howto2rtype): Rename via macros to keep namespace clean.
+	* configure.in: For m68klynx_coff_vec, include coff-m68k.o for
+	now.
+
+Tue Oct 12 17:03:27 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elf32-mips.c: Extensive additions to do relocations and to
+	handle MIPS specific sections.
+	* libelf.h (elf_backend_data): Pass fourth argument to
+	elf_backend_section_from_bfd_section to permit it to control the
+	section index to use.
+	(elf_obj_tdata): Add gp and gp_size fields.
+	(elf_gp, elf_gp_size): New accessor macros.
+	* elfcode.h: Removed a number of unused local variables.
+	(elf_fake_sections): Clear section header before calling
+	elf_backend_fake_sections, not after.
+	(prep_headers): Return true at end.
+	(elf_section_from_bfd_section): Pass retval argument to
+	elf_backend_section_from_bfd_section.
+	* elf32-hppa.c (elf32_hppa_backend_section_from_bfd_section):
+	Accept and ignore new retval argument.
+	* bfd.c: Include libelf.h.
+	(bfd_set_gp_size): Handle ELF targets.
+	* Makefile.in (bfd.o): Depends upon libelf.h.
+	(elf32-mips.o): Depends upon $(INCDIR)/elf/mips.h.
+
+Mon Oct 11 17:25:18 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.c (ecoff_mkobject): Check bfd_make_section return value.
+	(ecoff_mkobject_hook): New function.
+	(ecoff_new_section_hook, ecoff_sizeof_headers,
+	ecoff_compute_section_file_positions, ecoff_set_section_contents,
+	ecoff_write_object_contents): Handle dummy REGINFO section.
+	(ecoff_get_section_contents): New function to handle reading
+	REGINFO section.
+	* libecoff.h (ecoff_get_section_contents): Change from macro
+	definition to function prototype.
+	(ecoff_mkobject_hook): New prototype.
+	* coff-alpha.c (alpha_ecoff_mkobject_hook): Removed.
+	(alpha_ecoff_backend_data): Use ecoff_mkobject_hook.
+	* coff-mips.c (mips_ecoff_mkobject_hook): Removed.
+	(mips_ecoff_backend_data): Use ecoff_mkobject_hook.
+
+Fri Oct  8 15:25:33 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* libbfd.c (bfd_get*32, bfd_get*64):  Prevent ANSI sign extension
+	by casting the most significant byte to bfd_vma.
+
+Fri Oct  8 02:34:21 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* configure.in:  Do not define SELECT_VECS, SELECT_ARCHITECTURES
+	if configuring --with-targets=all.
+
+Thu Oct  7 17:34:07 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* aoutx.h (howto_table_std): Correct the "size" field in some
+	entries.
+
+	* reloc.c (reloc_howto_type): Change documentation to dispel any
+	notion that the "size" field is a power-of-two indicator.
+
+Thu Oct  7 10:50:38 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
+
+       * coffswap.h: (bfd_swap_reloc_in): a symndx is signed.
+
+	Make support for relaxing more generic.
+	* reloc16.c: Add new target entry - bfd_coff_reloc16_estimate,
+	fix bit rot.
+	* libcoff.h, libcoff-in.h: declarations. Prototypes
+	* coffcode.h (bfd_coff_std_swap_table): Add calls to
+	coff_reloc_16_extra_cases and coff_reloc16_estimate.
+	(dummy_reloc16_estimate): New function.
+	* coff-h8300.c (h8300_reloc16_estimate): New function
+
+Thu Oct  7 14:24:13 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* elfcode.h (EALIGN): Define, dependent on ARCH_SIZE.
+	(align_file_position): New function.
+	(elf_locate_sh): Disabled function deleted.
+	(assign_file_positions_for_symtab_and_strtabs): Align position,
+	then place symtab, then do other sections.
+	(map_program_segments): Align program header.
+	(assign_file_positions_except_relocs): Align section headers.
+	(assign_file_positions_for_relocs): Align relocation sections.
+
+Tue Oct  5 10:44:32 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* configure.host: Recognize hppa*-*-hiux* (currently synonym for hpux).
+	Change other hppa entries to use -*- not -hp-.
+	* config.bfd: Recognize hppa*-*-hiux* (currently synonym for hpux).
+
+	* coff-rs6000.c, cpu-rs6000.c, rs6000-core.c: Change non-ASCII
+	characters in comment to octal escapes.
+
+Sun Oct  3 12:35:15 1993  Stan Shebs  (shebs@rtl.cygnus.com)
+
+	* coff-i386lynx.c: Removed, name too long.
+	* i386lynx-cf.c: New file, was coff-i386lynx.c.
+	* configure.in: Reflect file name changes.
+	* Makefile.in: Mention Lynx-related files.
+
+	* i386lynx.c (lynx_32_swap_ext_reloc_in): get reloc bits in i386
+	Lynx-specific way.
+
+	* m68klynx-cf.c: New file, defines coff format for M68K LynxOS.
+	* m68klynx.c: Remove coff vector definition, now in m68klynx-cf.c.
+
+	* coffcode.h (sec_to_styp_flags): Set section flag to STYP_INFO
+	for .stab, .stabstr and .debug sections, and set SEC_DEBUGGING for
+	sections of type STYP_INFO.  (from Minh Tran-Le)
+	(coff_compute_section_file_positions): Add discarded_sections_count
+	to abfd->section_count, which helps `strip' keep the size
+	of the executable header constant.
+	* coff-i386.c (discarded_sections_count): New variable, initialized
+	to zero.  For use by `strip'.  Currently being used only in aix386
+	coff, but may be useful for other coff systems.  (from Minh Tran-Le)
+
+	* coffswap.h (coff_swap_filehdr_out): Added a missing cast.
+
+	* archive.c: Cosmetic improvements.
+	* opncls.c: Cosmetic improvements.
+	(new_bfd): Removed redundant structure slot init.
+
+Sat Oct  2 18:48:17 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config/news-mips.mh, hosts/news-mips.h: New files.
+	* configure.host: Use news-mips for mips-sony-bsd*.
+
+Fri Oct  1 13:14:17 1993  Stan Shebs  (shebs@rtl.cygnus.com)
+
+	* configure.in: i386lynx_coff_vec requires coff-i386lynx.o.
+	* coff-i386lynx.c: New file, defines Lynx target vector and name,
+	includes coff-i386.c.
+	* coff-i386.c (i386coff_vec): Allow redefinition of target vector
+	symbol and name, if TARGET_SYM and/or TARGET_NAME are defined.
+	* i386lynx.c: Remove coff vector definition entirely.
+	(lynx_32_swap_ext_reloc_in): Define.
+	(lynx_32_swap_std_reloc_in): Define, get reloc bits in i386
+	Lynx-specific way.
+	(lynx_32_swap_ext_reloc_out): Define.
+	(lynx_32_swap_std_reloc_out): Define.
+	(lynx_32_slurp_reloc_table): Define, call Lynx swapping fns.
+	(lynx_32_squirt_out_relocs): Define, call Lynx swapping fns.
+	(lynx_32_canonicalize_reloc): Define, call Lynx swapping fns.
+	(WRITE_HEADERS): Define, call Lynx swapping fns.
+
+	* config/i386-lynx.mt (SELECT_VECS): Remove redundant vector.
+
+Thu Sep 30 17:50:52 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* reloc.c (bfd_reloc_code_type): Add linkage-table relative
+	relocations of size 8, 16, 32.  Sort generic relocs by type rather
+	than size.  Added a little documentation too.
+
+	* aoutx.h (howto_table_std): Add BASE16 and BASE32 relocs.
+	(TABLE_SIZE): New macro.
+	(reloc_type_lookup): Handle BFD_RELOC_{16,32}_BASEREL for std
+	relocs.
+	(swap_std_reloc_out): Write baserel relocs correctly.
+	(swap_std_reloc_in): Handle r_baserel field.  Assert that
+	r_jmptable and r_relative fields are clear, and that the computed
+	index does refer to a defined entry of the howto table.
+
+Tue Sep 28 14:47:46 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* section.c (bfd_make_section_anyway): New function.
+	* section.c: Change comments to say several sections can have
+	the same name.
+	* bfd-in2.h: Re-generate to reflect above change.
+	* coffgen.c (make_a_section_from_file): Call bfd_make_section_anyway
+	if still no section after the bfd_coff_make_section_hook.
+	* coffcode.h: Add comment about TWO_DATA_SECS.
+
+Tue Sep 28 03:22:24 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* ecoff.c (ecoff_slurp_symbolic_info):  Always determine raw_size
+	explicitly.
+	* ecoff.c (ecoff_sec_to_styp_flags, ecoff_styp_to_sec_flags):  Handle
+	.fini section.
+
+Mon Sep 27 18:29:18 1993  Stan Shebs  (shebs@rtl.cygnus.com)
+
+	* config.bfd configure.host: Match on *-lynxos* for LynxOS,
+	add m68*-*-lynxos*.
+	* configure.in : Replaced i386lynx_vec with i386lynx_aout_vec
+	and i386lynx_coff_vec.
+	Added m68klynx_aout_vec and m68klynx_coff_vec.
+	* targets.c (target_vector): Removed i386lynx_vec, added
+	{i386,m68k}lynx_{aout,coff}_vec.
+	* i386lynx.c: Added copy of i386coff.c, renamed bfd target to
+	i386lynx_coff_vec.
+	* m68klynx.c: New file.
+	* config/i386-lynx.mt: Replaced i386lynx_vec with i386lynx_aout_vec
+	and i386lynx_coff_vec.
+	* config/m68k-lynx.mt: New file.
+	* hosts/i386lynx.h: Added definition of cfree as free (from Eichin).
+	* hosts/m68klynx.h: New file.
+
+Mon Sep 27 18:00:41 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* archive.c: Define offsetof here.
+	* hosts/*.h: Don't define it here.
+
+Mon Sep 27 19:09:27 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elfcode.h (bfd_section_from_shdr): Set filepos for SHT_STRTAB
+	section.
+
+Fri Sep 24 15:47:40 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* hpux-core.c: Add comment about hpux version 7.
+
+Fri Sep 24 16:50:26 1993  Stu Grossman  (grossman at cygnus.com)
+
+	* lynx-core.c (lynx_core_file_p):  Change per-thread register
+	section names from .regXXX to .reg/XXX to avoid parsing ambiguity
+	in gdb/corelow.c.  Create alias .reg section for the currently
+	running thread.
+
+Fri Sep 24 13:22:32 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* libecoff.h (ecoff_backend_data): Removed big_magic and
+	little_magic fields.
+	* coff-alpha.c (alpha_ecoff_backend_data): Removed initialization
+	of big_magic and little_magic.
+	* coff-mips.c (mips_ecoff_bad_format_hook): Make sure magic number
+	matches endianess of bfd.
+	(mips_ecoff_backend_data): Removed initialization of big_magic and
+	little_magic.
+	* ecoff.c (ecoff_set_arch_mach_hook): Set MIPS machine number
+	based on magic number.  Support r4000 magic numbers.
+	(ecoff_get_magic): New function.
+	(ecoff_write_object_contents): Use ecoff_get_magic, not fields in
+	the backend structure.
+	* cpu-mips.c (arch_info_struct): Added case for r6000.
+
+	For MIPS configurations put both big and little endian versions in
+	the list of targets; the code is getting compiled in anyhow.
+	* bigmips.mt (SELECT_VECS): Define to be ecoff_little_vec.
+	* decstation.mt (SELECT_VECS): Define to be ecoff_big_vec.
+	* mipsbelf.mt (SELECT_VECS): Define to be bfd_elf32_littlemips_vec.
+	* mipslelf.mt (SELECT_VECS): Define to be bfd_elf32_bitmips_vec.
+	* riscos.mt (SELECT_VECS): Define to be ecoff_little_vec.
+
+Fri Sep 24 00:42:23 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* osf-core.c:  New file for OSF/1 core file support.
+	* config/alphaosf.mh (HDEFINES):  Add -DOSF_CORE.
+	(HDEPFILES):  Set to osf-core.o.
+	* bfd-in2.h (union tdata):  Add osf_core_data member.
+	* targets.c:  If OSF_CORE is defined, add osf_core_vec to target list.
+	* Makefile.in (OPTIONAL_BACKENDS):  Add osf-core.o.
+	(osf-core.o):  New dependency.
+
+Thu Sep 23 21:04:53 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* TODO: Remove note about making --with-bfd-targets use canonical
+	target configuration name (already done); reword item about
+	separating reading and writing stuff to not refer to a
+	non-existent item.
+
+	* ecoff.h (ecoff_set_arch_mach_hook): Accept MIPS_MAGIC_LITTLE2
+	and MIPS_MAGIC_BIG2.
+
+Thu Sep 23 11:06:34 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* gen-aout.c (main): Output newline after end of comment, not
+	before.  (Reported by Jonathan Stone,
+	jonathan@oscar.stanford.edu).
+
+Thu Sep 23 10:48:27 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* archive.c (compute_and_write_armap): Put weak symbols in the
+	armap.
+
+	* elfcode.h (fix_up_strtabs): Set sh_entsize for the .stab
+	section, not the .stabstr section.  Set the type of the .stabstr
+	section to SHT_STRTAB.
+	(elf_section_from_bfd_section): Handle SHT_STRTAB sections.
+
+	* section.c (SEC_DEBUGGING): New section flag.
+	* elfcode.h (bfd_section_from_shdr): If section is SHT_PROGBITS,
+	and the name starts with .debug, .line or .stab, set
+	SEC_DEBUGGING.  If SHT_STRTAB, check for .debug and .stab.
+	* elf32-target.h (TARGET_BIG_SYM, TARGET_LITTLE_SYM): Added
+	SEC_DEBUGGING to section_flags.
+	* elf64-target.h (TARGET_BIG_SYM, TARGET_LITTLE_SYM): Added
+	SEC_DEBUGGING and SEC_CODE to section_flags.
+	* bfd-in2.h: Updated.
+
+Wed Sep 22 16:34:14 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* bfd.c (tdata): Add lynx_core_data.
+
+	* ecoff.c (ecoff_compute_section_file_positions): Set filepos for
+	sections with SEC_LOAD set, even if SEC_HAS_CONTENTS is clear.
+	(ecoff_write_object_contents): Don't set scnptr to zero just
+	because size of section is zero.  Needed for Irix 4.0.5F.
+
+Wed Sep 22 09:49:32 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config.bfd: Use i960-bout, not i960-coff for i960-*-nindy*.
+
+Wed Sep 22 07:34:09 1993  Stu Grossman  (grossman at cygnus.com)
+
+	* Makefile.in (OPTIONAL_BACKENDS):  Add lynx-core.o.
+	* bfd-in2.h (tdata):  Add lynx_core_data;
+	* config.bfd configure.host:  Get rid of superfluous netbsd and
+	lynxos entries.
+	* configure.in:  Add lynx-core.o to Lynx config.
+	* i386lynx.c:  Add defs for core file support.
+	* lynx-core.c:  New file with Lynx core file support.
+	* hosts/i386lynx.h:  Move lots of host specific includes to here.
+	Add def of HOST_LYNX.  Remove unnecessary defs.
+
+Mon Sep 20 19:18:10 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elfcode.h (bfd_section_from_shdr): Only set SEC_DATA for a
+	SHF_PROGBITS or SHT_STRTAB section if SEC_ALLOC is set.  Never set
+	SEC_DATA for a SHF_NOBITS section.
+
+	* nlm32-i386.c (nlm_i386_mangle_relocs): Check SEC_LOAD rather
+	than SEC_CODE | SEC_DATA.  Add some casts to avoid warnings.
+	* nlmcode.h: Add some casts to avoid warnings.
+	(nlm_write_object_contents): Ignore relocs for sections that are
+	neither code nor data.  Just use the symbol value for debugging
+	symbols; don't offset by the section vma.
+
+Fri Sep 17 18:08:55 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* reloc.c (bfd_perform_relocation): Don't return an error when
+	performing a reloc against an undefined weak symbol.
+	* syms.c (bfd_print_symbol_vandf): Show value of BSF_WEAK rather
+	than obsolete BSF_EXPORT.
+
+Fri Sep 17 02:04:31 1993  John Gilmore  (gnu@cygnus.com)
+
+	* hosts/{alphaosf.h, amix.h, apollo68.h, apollov68.h,
+	decstation.h, delta88.h, dgux.h, dose.h, go32.h, harris.h,
+	hp300.h, hp300bsd.h, hppabsd.h, hppahpux.h, i386aix.h, i386bsd.h,
+	i386linux.h, i386lynx.h, i386v.h, i386v4.h, irix3.h, irix4.h,
+	mipsbsd.h, ncr3000.h, rs6000.h, rtbsd.h, solaris2.h, sparc-ll.h,
+	std-host.h, stratus.h, sun3.h, sysv4.h, tahoe.h, ultra3.h,
+	vaxult.h, vaxult2.h, we32k.h}:  Make sure that "offsetof" is
+	defined on all hosts, now that archive.c uses it.
+
+Thu Sep 16 18:20:30 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elfcode.h (elf_map_symbols): Create section symbols for all
+	sections, not just allocated sections; debugging sections can have
+	relocs.
+	(elf_symbol_from_bfd_symbol): If there is an output section, use
+	the section index from that rather than the input section.
+
+Thu Sep 16 12:20:50 1993  Ken Raeburn  (raeburn@cygnus.com)
+
+	* libbfd-in.h (bfd_flush, bfd_stat): Reflect John's changes to
+	libbfd.h, which is regenerated from this file.
+
+	* bfd-in.h (symtype): Deleted typedef.
+
+Wed Sep 15 11:48:37 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* libbfd.c (COERCExx): Cast x to bfd_signed_vma before doing the
+	xor and subtract.  Otherwise it will not sign extend if the type
+	of bfd_vma is larger than int.
+
+	* ecoffswap.h (ecoff_swap_pdr_in): Get regoffset, iopt, fregoffset
+	and frameoffset as signed numbers.  From Peter Schauer.
+
+Tue Sep 14 18:20:36 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elf32-i386.c (elf_howto_table): Add bfd_elf_generic_reloc
+	special function for all reloc entries.
+	* elf32-target.h (TARGET_LITTLE_SYM): Add SEC_CODE to
+	section_flags.
+	* libelf.h (elf_symbol_type): Remove desc, type and other fields.
+	* Makefile.in (elf32-*.o): These depend upon elf32-target.h.
+
+Tue Sep 14 14:34:45 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
+
+	* libbfd-in.h (struct artdata):  Add armap_timestamp and
+	armap_datepos here too.
+
+Mon Sep 13 21:03:18 1993  John Gilmore  (gnu@cacophony.cygnus.com)
+
+	Improve timestamp support in BSD archive files to avoid linker
+	warnings.
+
+	* libbfd.h (struct artdata):  Add armap_timestamp and armap_datepos.
+	(bfd_flush, bfd_stat):  Add prototypes.
+	* libbfd.c (bfd_flush):  Add, does fflush on a BFD.
+	(bfd_stat):  Add, does fstat on a BFD.
+
+	* archive.c (_bfd_write_archive_contents): At end of file writing,
+	verify and possibly update the timestamp in the armap, if a BSD
+	archive.  FIXME!  Kludge recognizes BSD archive, rather than
+	vectoring properly.  Should add to xvec.
+	(compute_and_write_armap):  Move prototype to top, avoid PROTO.
+	(bsd_write_armap): Save timestamp and file location thereof, when
+	writing the armap in a BSD file.
+	(bsd_update_armap_timestamp):  New function to check and
+	rewrite the timestamp.
+
+	* hosts/std-host.h (offsetof):  Define, if not already, for archive.c.
+
+Sat Sep 11 18:13:42 1993  Jim Kingdon  (kingdon@poseidon.cygnus.com)
+
+	* hosts/i386sco.h: Define a bunch of stuff for core files.
+	* sco-core.c: Remove, replace by trad-core.c.
+	* trad-core.c: If HOST_STACK_START_ADDR is defined, use it.
+	* config/i386sco.mh: Use trad-core not sco-core.
+	* hosts/i386isc.h, config/i386isc.mh: Remove.
+	* configure.host: Use i386sco for isc.
+	* config/i386-sco.mt: Remove, identical to i386-coff.mt.
+	* config.bfd: Use i386-coff not i386-sco.
+
+	* config.bfd: Recognize i[34]86-*-solaris2* specifically rather
+	than using *-*-solaris2* (i486-unknown-solaris2 is i386-elf, not
+	i486-elf which doesn't exist).
+
+Fri Sep 10 12:56:36 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* coffswap.h (coff_swap_aouthdr_out): For ALPHAECOFF, force
+	padding field to zero.
+
+	* config.bfd (i[34]86-*-netbsd*): New target; use i386-netbsd.
+	* configure.in: Remove bogus netbsd386 handling.
+
+	* coff-mips.c: Don't warn about overflow for MIPS_R_JMPADDR reloc.
+	Correct overflow detection requires matching the upper four bits
+	of the destination against the PC.
+
+Thu Sep  9 16:57:46 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* configure.in: Make 64-bit stuff work with "--with-targets=all".
+
+Tue Sep  7 14:17:02 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* libbfd-in.h: Removed swapping routines declarations.
+	* bfd-in.h: Added swapping routine declarations, and renamed them
+	from _do_* to bfd_*.
+	* libbfd.c: Renamed swapping routines from _do_* to _bfd_*.
+	* Changed all callers.
+	* libbfd.h, bfd-in2.h: Rebuilt.
+
+Mon Sep  6 15:28:07 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elf32-i386.c (elf_howto_table): Set pcrel_offset to true for
+	R_386_PC32.
+
+Fri Sep  3 13:06:12 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* configure.in: Reorganized setting of makefile variables so
+	64-bit stuff works again.
+
+	* libbfd-in.h (_do_get*, _do_put*): Renamed via macros to clean up
+	namespace.
+
+	* libelf.h (elf32_symbol_type, elf64_symbol_type): Deleted
+	"native_elf_sym" field, merged to make new type "elf_symbol_type".
+	(struct elf_obj_tdata): Field symbols is now elf_symbol_type*.
+	Deleted field raw_syms.
+	(obj_symbols): Remove cast.
+	(obj_raw_syms): Deleted.
+	* elfcode.h (elf_slurp_symbol_table): Don't set raw_syms or
+	native_elf_sym fields.
+	* elf32-hppa.c: Changed uses of elf32_symbol_type to
+	elf_symbol_type.
+
+	From Pete Hoogenboom and Jeff Law:
+
+	* elf32-hppa.c (ELF_MAXPAGESIZE): Define.
+
+	* elf32-hppa.c (elf_hppa_tc_symbol): If the argument relocation
+	bits are zero (e.g., they specify no relocations), then do not
+	even bother adding their entries to the symextn section.
+
+	* elf32-hppa.c (elf_hppa_tc_symbol): Any function, regardless
+	of scope can have an argument relocation stub.
+
+	* elf32-hppa.c: (Elf32_hppa_Stub_description):  Rename this
+	structure and type to elf32_hppa_stub_description.  This makes
+	it consistent with the GNU coding conventions.
+	(elf32_hppa_stub_description): Added a 'next' field to allow
+	linking of stub description structures.
+	(elf32_hppa_stub_description): Added a 'stub_listP' field to
+	keep track of individual stubs.
+	(Elf32_hppa_Stub_list, Elf32_hppa_Stub_list_struct):  Removed.
+	Combined with the elf32_hppa_stub_description structure.
+	(elf32_hppa_stub_name_list):  New type to keep track of
+	individual stubs.
+	(add_stub):  Removed.
+	(add_stub_by_name): New function.
+	(find_stub_by_name): New function.
+	(hppa_elf_build_arg_reloc_stub): Allow reusing stubs that
+	already exist.
+	(hppa_elf_build_long_branch_stub): Allow reusing stubs that
+	already exist.
+
+	* elf32-hppa.c: (retval_mismatches):  The direction of argument
+	relocation was reversed.
+	(hppa_elf_build_arg_reloc_stub): Return address was not being
+	restored.
+	(hppa_elf_arg_reloc_needed_p): Add argument containing caller
+	argument relocation bits so this function can be used in the check
+	for plabel stubs.
+	(hppa_elf_stub_check): Pass caller argument relocation bits into
+	hppa_elf_arg_reloc_needed_p().
+	(hppa_look_for_stubs_in_section): Add check for plabel stubs and
+	pass caller argument relocation bits into
+	hppa_elf_arg_reloc_needed_p().
+
+Thu Sep  2 00:59:55 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* libhppa.h (hppa_field_adjust): Remove unused `init_value' variable.
+
+	* hosts/delta88v4.h: New for SVR4.
+	* configure.host: Use it.
+
+Wed Sep  1 14:23:32 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* libaout.h, netbsd386.c: Change M_I386 to M_386_NETBSD.  M_I386
+	is an SCO pre-define.
+
+Tue Aug 31 12:50:19 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlmcode.h (nlm_object_p): Set HAS_SYMS if there are external
+	references.
+	(nlm_swap_auxiliary_headers_{in,out}): The copyright length is
+	only one byte.
+	(nlm_get_symtab_upper_bound): Include debugging symbols in symbol
+	count.
+	(nlm_slurp_symbol_table): Make symlength unsigned.  Read debugging
+	symbols as BFD local symbols.
+	(nlm_write_object_contents): Don't bother writing out exported
+	symbols more than once; they now appear in the symbol table more
+	than once (with and without a prefix) if necessary.  Set offset
+	values to be non-zero as NLMLINK does.
+
+Tue Aug 31 12:07:43 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* libhppa.h: Restore #undefs of e_fsel and other e_* symbols.
+
+Fri Aug 27 16:43:35 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* section.c (struct sec): Move position of user_set_vma, and
+	document it.
+	(SEC_BALIGN): Disable for now.  I don't think it's currently used.
+
+	* elf32-hppa.c (elf_hppa_howto_table): Now static.
+	(symext_rootP, symext_lastP, global_value, GOT_value,
+	global_symbol, global_sym_defined, symextn_contents,
+	symextn_contents_real_size, elf_hppa_stub_rootP,
+	elf32_hppa_symextn_map, elf32_hppa_symextn_map_size): Rely on
+	default initialization.
+	(hppa_elf_gen_reloc_type): Macro "UNDEFINED" doesn't need a
+	trailing semicolon.
+	(hppa_look_for_stubs_in_section): Introduce temporaries to make
+	code more readable in 80 columns.
+
+	* libhppa.h (all functions): Now inline under GNU C.
+
+	More patches from Jeff Law:
+
+	* elf32-hppa.c (AR_WARN): Give argument which caused the
+	invalid argument relocation.
+	(AR_UNIMP): Delete unused macro.
+	(hppa_elf_set_section_contents): Always return a value.
+	(elf32_hppa_backend_table_processing): Likewise.
+	(elf32_hppa_backend_section_processing: Likewise.
+
+	* som.c: New file containing SOM specific code extracted
+	from hppa.c
+
+	* som.h: New file containing SOM specific code extracted
+	from libhppa.h
+
+	* hppa.c: Deleted.
+
+	* libhppa.h: Delete SOM specific code.  Add generic PA
+	code which can be shared by both SOM and ELF backends.
+
+	* Makefile.in: Replace hppa.c with som.c.  elf32-hppa.o
+	depends on libhppa.h now.
+
+	* configure.in (hppa_vec): Needs som.o module instead of
+	hppa.o.
+
+	* elf32-hppa.c: Include libhppa.h.  Do not define
+	BYTES_IN_WORD.
+
+	* elf32-hppa.h (hppa_reloc_field_selector_type): Delete
+	now lives in libhppa.h.
+	(hppa_reloc_field_selector_type_alt): Likewise.
+
+	* hosts/hppabsd.h: Include <stdlib.h> and <unistd.h>.  Do not
+	define malloc or free.
+
+	* config/hppa-elf.mt (SELECT_ARCHITECTURES): Don't define
+	SELECT_VECS.
+
+	* elf32-hppa.c (hppa_elf_relocate_unwind_table): Delete unused
+	variables.
+	(elf_hppa_reloc_type_lookup): Likewise.
+	(elf_hppa_tc_make_sections): Likewise.
+	(hppa_elf_arg_reloc_needed_p): Likewise.
+	(hppa_elf_build_long_branch_stub): Likewise.
+	(elf_reloc_map): Delete, no longer used.
+	(elf_hppa_reloc_map): Likewise.
+	(elf32_hppa_symextn_map_max_size): Likewise.
+	(elf32_hppa_get_sym_extn): Abort if type is bogus.
+
+	* elf32-hppa.c (elf32_hppa_backend_fake_sections): Add processing
+	of the .hppa_unwind section.
+
+Wed Aug 25 16:13:49 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
+
+	* config.bfd: recognize m88110.
+
+Tue Aug 24 16:32:35 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	Merged changes from Jeff Law and Pete Hoogenboom at Utah:
+
+	* elfcode.h (elf_section_from_bfd_section): Add detection of
+	SHT_NOTE sections.
+
+	* elf32-hppa.c:
+	(hppa_elf_build_long_branch_stub,hppa_elf_long_branch_needed_p):
+	New functions for support of long branch stubs.
+	(hppa_elf_stub_check,hppa_look_for_stubs_in_section):  Add
+	check for long branch stubs.
+	(hppa_look_for_stubs):  Unused function.  Removed.
+	(hppa_elf_set_section_contents): Implement a PA/ELF-specific
+	version of bfd_set_section_contents.
+	(hppa_elf_long_branch_needed_p): Only output debugging diagnostics
+	when BFD is configured for debugging.
+
+	* elf32-hppa.c: (elf32_hppa_get_symextn_chain):  New function
+	to return a list of symbols that have non-zero argument
+	relocation bits.
+	(hppa_elf_stub_finish): Make sure stub generation is done only
+	once.
+
+	* elf32-hppa.c: (hppa_elf_stub_reloc):  New function for
+	generation relocation entries within a stub.
+	(hppa_elf_build_arg_reloc_stub): Corrections to argument
+	relocation stubs.
+
+	* elf32-hppa.c: New #define's for argument relocation types.
+	(mismatches, retval_mismatches): Updated to reflect new
+	argument relocation types.
+	(CURRENT_STUB_OFFSET): New macro.
+
+	* elfcode.h (map_program_segments): Set the PF_X bit for data
+	segments.
+
+	* elf32-hppa.c: (elf_hppa_howto_table): Add
+	R_HPPA_STUB_CALL_17 for support of linker stub generation.
+	(hppa_elf_reloc): Add support of R_HPPA_STUB_CALL_17
+	relocation type.
+
+	* elf32-hppa.h: (elf32_hppa_reloc_type): Add
+	R_HPPA_STUB_CALL_17 for support of linker stub generation.
+
+	* hppa_stubs.h: Add new instructions that are used in linker
+	stub generation.
+
+	* elf32-hppa.c (hppa_elf_relocate_unwind_table): The offsets in an
+	unwind descriptor were incorrect.
+
+	* libelf.h (bfd_elf_find_section): Declare.
+
+	* elf32-hppa.c: (elf32_hppa_backend_symbol_processing):  New
+	function in place of global_sym field in elf_backend_data
+	structure.
+	(elf32_hppa_backend_symbol_table_processing,
+	elf32_hppa_backend_section_processing,
+	elf32_hppa_backend_fake_sections,
+	elf32_hppa_backend_section_from_shdr,
+	elf32_hppa_backend_section_from_bfd_section):  New functions to
+	provide support of symbol extension sections and argument
+	relocation stubs.
+	(elf_info_to_howto):  Remove call to abort().
+
+	* elf32-target.h:  Support for special processing by the backend.
+	(struct elf_backend_data):  Added elf_backend_symbol_processing,
+	elf_backend_symbol_table_processing,
+	elf_backend_section_processing, elf_backend_section_from_shdr,
+	elf_backend_fake_sections, and
+	elf_backend_section_from_bfd_section fields.
+	* elfcode.h: (bfd_section_from_shdr): Add a check for
+	processor-specific section types.
+	(elf_fake_sections):  Add a check for processor-specific
+	section types.
+	(bfd_elf32_write_object_contents):  Add a check to see if
+	there is any final section processing to be done by the
+	backend.
+	(elf_section_from_bfd_section):  Add a check for
+	processor-specific section types.
+	(elf_slurp_symbol_table):  Remove reference to global_sym in the
+	elf_backend_data structure.  Replace it with a call to
+	elf_backend_symbol_processing.
+	* libelf.h: Remove global_sym field in the elf_backend_data
+	structure.  Replace it with a series of backend-specific
+	functions.
+
+	* elf32-hppa.c (hppa_elf_stub_branch_reloc): The formal argument
+	stub_sym should be called target_sym.
+	(hppa_elf_build_arg_reloc_stub): Refer to the stub bfd (abfd)
+	rather than the output bfd (output_bfd).
+	(hppa_elf_reloc): Get rid of references to the global_sym field in
+	the elf_backend_data structure.
+
+	* elfcode.h (elf_fake_sections): Check the correct condition for
+	.bss.  Also, detect the existence of a .note section.
+
+	* elf32-hppa.c (hppa_elf_relocate_insn): r_format argument should
+	have been r_field.
+
+	* hosts/hppabsd.h (HOST_MACHINE_ARCH): Reference to bfd_arch_m68k
+	should be a reference to bfd_arch_hppa.
+
+	* hppa.c (hppa_vec): Replace bfd_false with _bfd_dummy_target in
+	the bfd_check_format structure to avoid a type mismatch.
+
+Mon Aug 23 1993  Sean Fagan  (sef@cygnus.com)
+		 and Jim Kingdon  (kingdon@cygnus.com)
+
+	Add NetBSD support:
+	* netbsd386.c: New file.
+	* aoutx.h: Make sym_is_debugger_info true for N_FN.
+	* Makefile.in, aout-target.h, config.bfd, configure.host, configure.in,
+	libaout.h, targets.c: Other changes.
+
+Fri Aug 20 17:04:59 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config/m88k-elf.mt: New file.
+	* config.bfd: Use it for m88*-*-sysv4*.
+
+Fri Aug 20 15:16:58 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* elfcode.h (elf_build_phdrs): Unused function deleted.
+	(bfd_shdr_from_section): Ditto.
+	(write_relocs): Don't change section contents for addend.
+	(elf_locate_sh): Return type is now always elf_internal_shdr,
+	since the other types were really aliases for this type anyways.
+	Don't compile this function, since it is static and doesn't appear
+	to be used in this file.
+	(sym_is_global): Return non-zero for weak symbols.  Abort if
+	section pointer is null.
+	(swap_out_syms): Reorder tests so function symbols can be weak.
+	(elf_slurp_symbol_table): Don't use BSF_EXPORT.
+	(elf_slurp_reloca_table): Make RELOC_PROCESSING section smaller by
+	extracting out some common code.  Abort if BFD section symbol has
+	null name.
+	(elf_slurp_reloc_table): Translate ELF section symbols into BFD
+	section symbols.  Don't read section contents to fill in addend
+	field.
+
+	* elf32-i386.c (elf_howto_table): All partial_inplace fields
+	should be "true".
+
+	* Merged from OSF:
+
+	Tue Jun 15 14:38:32 1993  Michael Meissner  (meissner@osf.org)
+
+	* libelf.h (struct Elf_Sym_Extra): New structure to contain ELF
+	specific information for a symbol.  Put in elf_sym_num, which
+	gives the external symbol number in the elf object file, since
+	local symbols must come before global symbols.
+	(elf_sym_extra): New macro.
+	(elf_symtab_map): Delete, in favor of using Elf_Sym_Extra.
+	* elfcode.h (elf_map_symbols): Use Elf_Sym_Extra to map internal
+	symbol number to external number.  Store the address of the
+	Elf_Sym_Extra field for the symbol in the udata field.
+	(elf_write_object_contents): Use Elf_Sym_Extra to map out symbols.
+
+	Sun Jun 20 16:30:11 1993  Michael Meissner  (meissner@osf.org)
+
+	* elfcode.h (elf_obj_tdata): Add field to count the size of the
+	array of pointers to section symbols.
+	(elf_map_symbols): Bump the max index of the section symbols so
+	that we don't overwrite memory.  Store the max index into the
+	elf_obj_tdata field.
+
+	Sat Jun 19 10:12:27 1993  Michael Meissner  (meissner@osf.org)
+
+	* elfcode.h (elf_obj_tdata): Add pointer to an array of pointers
+	to the section symbols we created.  Remove unused field
+	internal_syms.
+	(elf_map_symbols): Fill in array of pointers to section symbols.
+	Only create section symbols for sections that have SEC_ALLOC set,
+	and have non-zero size.
+	(elf_symbol_from_bfd_symbol): If udata is NULL, and this is a
+	section symbol, look up the section in the list of section
+	symbols, and set the udata pointer appropriately.  Otherwise, if
+	udata is still NULL, fail an assertion, and use 0, instead of
+	dropping core.
+
+Fri Aug 20 12:18:05 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* config.bfd (mips-*-elfl*, mips-*-elf*): New targets, using
+	mipslelf and mipsbelf respectively.
+	* config/mipslelf.mt, config/mipsbelf.mt: New files.
+	* elf32-mips.c: Added some reloc information.
+	* configure.in: Fixed error message.
+
+	* ecoff.c (ECOFF_LONG_SIZE): Removed.  Just use constants.
+
+Thu Aug 19 09:45:51 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* Makefile.in (BFD_LIBS, ALL_MACHINES, BFD32_BACKENDS, BFD64_BACKENDS,
+	OPTIONAL_BACKENDS): Alphabetize entries and add a few missing ones.
+	* archures.c: Alphabetize decls.
+
+	* configure.in, targets.c: Add missing vectors to the tables.
+	* targets.c (target_vector) [!SELECT_VECS]: Add DEFAULT_VECTOR.
+	Remove hp300bsd_vec due to clash with sunos_big_vec.
+
+Tue Aug 17 18:12:32 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* hosts/i386{mach3,osf1mk}.h: New files, for Mach hosting.
+	* hosts/i386mach.h: removed, replaced by i386osf1mk.h.
+	* config/i386mach3.mt, i386mach3.c: New files, for Mach a.out format.
+	* Makefile.in, configure.host, config.bfd: Corresponding changes.
+	* hosts/decstation.h: Include <sys/param.h> not <machine/param.h>.
+
+Tue Aug 17 15:19:41 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* coffgen.c (coff_section_symbol): If section's output_section is
+	not yet set, point to itself.  This is needed because this is
+	called on the output file, not the input file.
+
+	* coff-rs6000.c (dummy_reloc, RTYPE2HOWTO): Set howto field to a
+	dummy value, rather than leaving it NULL.
+
+	* archures.c (bfd_default_set_arch_mach): Set bfd_error on
+	failure.
+	* aoutx.h (NAME(aout,set_arch_mach)): Check return value of
+	bfd_default_set_arch_mach.
+
+Tue Aug 17 09:42:16 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* config.bfd (cpu): Extract from canonical name with sed.
+	* configure.in: Don't pass it.
+
+Sun Aug 15 20:45:45 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* bfd-in.h: Remove {BYTE,WORD,LONG}_SIZE; they are pointless and
+	BYTE_SIZE conflicts with a Mach header.
+	* ecoff.c: Change LONG_SIZE to ECOFF_LONG_SIZE and define it.
+
+	* configure.host: Make sure all OS fields end in *.
+
+Fri Aug 13 16:33:33 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.c (ecoff_slurp_reloc_table): Use bfd_abs_section for
+	RELOC_SECTION_NONE and RELOC_SECTION_ABS.  If a reloc section
+	doesn't exist, don't try to create it.
+
+	* nlmcode.h (nlm_write_object_contents): procedure offsets are
+	from start of code segment, not start of file.
+	* config/i386-nlm.mt (DEFAULT_VECTOR): It's nlm32_i386_vec, not
+	bfd_nlm32_i386_vec.
+	* configure.in (SELECT_VECS switch): Likewise.
+
+Thu Aug 12 10:32:47 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* format.c (bfd_check_format): If the target matches the default
+	target, set match_count to 1, to ignore any previous matches.
+
+	* Makefile.in (BFD32_BACKENDS): Remove srec.o, add reloc16.o.
+
+	* configure.in: Add reloc16.o when we add
+	coff-h8300.o, coff-h8500.o, coff-sh.o, coff-z8k.o.
+	Makefile.in (BFD_LIBS): Remove reloc16.o.
+
+	* config/u68k-coff.mt: Fix typo, DEFAULT_TARGET for
+	DEFAULT_VECTOR.
+
+	* config/h8300-coff.mt, h8500-coff.mt, sh-coff.mt, st2000.mt,
+	z8k-coff.mt (DEFAULT_VECTOR): Define.  Don't explicitly add
+	S-records via SELECT_VECS.
+
+	* targets.c (target_vector), Makefile.in (BFD_LIBS): Always
+	support S-records, for convenience.
+
+Thu Aug 12 08:30:05 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coff-alpha.c (alpha_howto_table, alpha_finish_reloc,
+	alpha_ecoff_swap_reloc_{in,out}, alpha_bfd_reloc_type_lookup):
+	Read and write Alpha relocs.  Can't process them yet.
+	* ecoff.c (ecoff_slurp_reloc_table): Recognize new reloc sections.
+	If the section does not already exist, create it.
+
+	* ecoffswap.h (ecoff_swap_pdr_{in,out}): Handle new fields defined
+	on the Alpha.
+
+	* libecoff.h (ecoff_backend_data): Added constructor_reloc and
+	finish_reloc fields.
+	* ecoff.c: Move MIPS reloc support from here...
+	* coff-mips.c: to here.
+	* ecoff.c (ecoff_set_symbol_info): Get constructor reloc howto
+	from backend.
+	(ecoff_slurp_reloc_table): Removed MIPS specific stuff.  Call
+	finish_reloc backend function.
+	(ecoff_write_object_contents): Removed MIPS specific assertions.
+	* coff-mips.c (mips_finish_reloc): New function.
+	(mips_ecoff_backend_data): Fill in new fields.
+	* coff-alpha.c (alpha_ecoff_backend_data): Use NULL for new
+	fields.
+	* targets.c: Added extern for ecoffalpha_little_vec.
+
+	* bfd.c (_bfd_host_big_endian): Removed.
+	* bfd-in.h (HOST_BYTE_ORDER_BIG_P, bfd_header_twiddle_required):
+	Removed.
+	* bfd-in2.h: Regenerated.
+
+Wed Aug 11 12:11:23 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* config.bfd: New file, broken out of configure.in.
+	* configure.in: Use it, and use standard target names for
+	--with-targets, replacing --with-bfd-targets.
+
+	* archures.c (archures_init_table): Add bfd_sh_arch.
+
+	* configure.in: Include coff-m68k.o for m68kcoffun_vec.
+	Include nlm32.o and nlm.o for bfd_nlm32_i386_vec.
+	Fix error in error message.
+
+	* oasys.c: Make bfd_error_vector extern.
+
+	* configure.in: Include stab-syms.o for a.out/b.out targets
+	and hp300{bsd,hpux}.
+
+Wed Aug 11 06:40:51 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* nlmcode.h (nlm_compute_section_file_positions): Add the .bss
+	section before setting output_has_begun.
+	(nlm_set_section_contents): Remove argument names from
+	mangle_relocs_func prototype.
+	(nlm_write_object_contents): Remove shadowing local variable.
+	Don't write out debugging symbols if debugInfoOffset is -1.  Add
+	the codeImageOffset to the start, exit, and check procedure
+	offsets.
+	* nlm32-i386.c (nlm_i386_write_reloc, nlm_i386_mangle_relocs):
+	Don't check partial_inplace field; its value is irrelevant.
+
+	* Base use of sco-core on host, not target.
+	* configure.host (i[34]86-*-sco*): Use i386sco rather than i386v.
+	* config/i386-sco.mt (TDEFINES): Removed.
+	* config/i386sco.mh: New file to use sco-core.
+	* hosts/i386sco.h: New file; just includes hosts/i386v.h.
+
+	* ecoffswap.h (ecoff_swap_{hdr,ext}_{in,out}): Use signed
+	conversions for some fields.
+
+Tue Aug 10 13:32:23 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.c (ecoff_gprel_reloc): If _gp is not defined, give an
+	error rather than aborting.
+
+	* libnlm.h (struct nlm_backend_data): Added mach field.
+	(nlm_machine): New accessor macro.
+	* nlm.c (nlm_mkobject): Set architecture and machine from backend
+	information.
+	* nlm32-i386.c (nlm32_i386_backend): Initialize new mach field.
+
+Tue Aug 10 09:31:18 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* configure.in: Replace calls to sort with shell code
+	to uniq the lists.
+
+Tue Aug 10 06:23:16 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* configure.in: Include aout32.o for any a.out/b.out formats.
+
+Mon Aug  9 09:37:18 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* config/i386-linux.mt (SELECT_VECS): Support bfd_elf32_i386_vec.
+	* config/m68k-elf.mt (SELECT_VECS): Support m68kcoff_vec.
+	* config/i386-elf.mt (SELECT_VECS): Support i386coff_vec.
+	* config/hppa-elf.mt (SELECT_VECS): Support hppa_vec.
+	* config/sparc-elf.mt (SELECT_VECS): Support sunos_big_vec.
+	* config/i386-sco.mt (SELECT_VECS): Don't define; Ian says it was
+	just a hack.
+
+Mon Aug  9 13:15:00 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
+
+	* config/m88k-coff.mt (DEFAULT_VEC -> DEFAULT_VECTOR): renamed.
+
+Mon Aug  9 14:26:45 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* syms.c (BSF_EXPORT): Now same as BSF_GLOBAL.
+
+	* bfd.c (bfd_scan_vma): New function.
+
+Mon Aug  9 11:29:53 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* bfd-in.h (bfd_get_architecture, bfd_get_machine): Removed
+	obsolete macros.
+	* bfd-in2.h: Updated.
+
+	* ecoff.c (ecoff_slurp_armap): Correct bug in initialization of
+	stringbase.
+
+Sun Aug  8 12:21:13 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* configure.in: Remove unneeded test.
+
+Sun Aug  8 12:41:22 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* Makefile.in ({dist,real}clean): Use $(MAKE), not make.
+
+Sat Aug  7 09:14:21 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* config/st2000.mt (TDEFINES): Don't define MRI; not used.
+
+	* PORTING, TODO, config/README: Update to reflect below changes.
+
+	* configure.in: Replace MINIMIZE and --with-minimal-bfd with
+	--with-bfd-targets="target1,target2,..." and the special target
+	"all" to get the previous default behavior.
+	Figure out which architecture and backend .o files are needed from
+	DEFAULT_VECTOR, SELECT_VECS, and SELECT_ARCHITECTURES as set in
+	the .mt files.  Define TDEFAULTS based on them, also.
+
+	* Makefile.in: Remove references to MINIMIZE.
+	* archures.c, targets.c: Ditto.
+
+	* config/*.mt: Define DEFAULT_VECTOR, SELECT_VECS, and
+	SELECT_ARCHITECTURES as variables rather than as -D arguments to
+	TDEFAULTS.
+
+	* config/a29k-coff.mt,alphaosf.mt, i386-sco.mt, i960-bout.mt,
+	i960-coff.mt (TDEFAULTS): Don't put the default vector in
+	SELECT_VECS manually; it's automatic now.
+
+	* config/i386-sco.mt (TDEFAULTS): Don't put &sco_core_vec in
+	SELECT_VECS manually; -DSCO_CORE does it automatically now.
+
+	* config/h8300-coff.mt, config/h8500-coff.mt, config/sh-coff.mt,
+	config/st2000.mt, config/z8k-coff.mt (TDEFAULTS): Don't define
+	BFD; not used.
+
+	* config/hppaosf.mh (HDEFINES): Don't define SELECT_ARCHITECTURES;
+	this is a host, not a target.
+
+Sat Aug  7 05:28:03 1993  Fred Fish  (fnf@deneb.cygnus.com)
+
+	* elfcode.h (elf_object_p):  Add comment about what this function
+	does and to watch out for side effects.  Add FIXME for memory leaks.
+	Fix comment about checking for matching byte order.  Preserve
+	pointer to old tdata (if any), and restore it if we don't match
+	file with target vector.  If we are going to use goto's, use them
+	consistently and maintainably.
+	* nlmcode.h (nlm_object_p):  Expand comments about leaked memory
+	to note that the problem is even more serious than just leaked
+	memory.  Replace goto with more traditional return.
+
+Fri Aug  6 12:00:03 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	Fix incorrect or useless makefile variable definitions:
+	* config/news.mt, config/u68k-coff.mt (TDEFAULTS): Use this to
+	define DEFAULT_VECTOR, instead of TDEFINES.
+	* config/i386aix.mh (MINIMIZE): Don't define.
+	* config/hppaosf.mh (MINIMIZE): Don't conditionalize.
+	* config/rs6000.mh (ALLOCA),
+	* config/i386v.mh (ALLOCA),
+	* config/i386linux.mh (ALLOCA),
+	* config/i386isc.mh (ALLOCA),
+	* config/go32.mh (EXTRALIBS): Don't define; not used.
+	* config/solaris2.mh (HDEFINES): Renamed from H_DEFINES.
+	* config/alphaosf.mt (TDEFINES): Set it, not HDEFINES.
+	* config/z8k-coff.mt (CC): Don't define.  It's a target, not a host.
+
+	* config/README: New file, explaining the variables.
+
+	* targets.c (target_vector): Add hp300_bsd_vec.
+	* Makefile.in (BFD32_BACKENDS, CFILES): Add hp300bsd.
+	(hp300bsd.o): New rule.
+
+Fri Aug  6 15:13:22 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* libelf.h (NAME): Provide a default definition, that's neither
+	for 32 bits nor for 64.
+
+	Tue Jun 15 14:38:32 1993  Michael Meissner  (meissner@osf.org)
+
+	* libelf.h (elf_hash): Change declaration to bfd_elf_hash, since
+	that is what is in elf.c.
+
+Fri Aug  6 12:28:38 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.c (ecoff_set_symbol_info): Removed special handling for
+	scBss and scSBss symbols, since it was wrong.
+
+	* Makefile.in (coff-mips.o, coff-alpha.o): Don't depend on
+	coffcode.h.
+
+	* coffcode.h (sec_to_styp_flags): Inspired by mb@tti.COM (Michael
+	Bloom): Only set STYP_BSS for SEC_ALLOC sections.
+
+	* ecoff.c (ecoff_slurp_armap): From Arne Henrik Juul
+	<arnej@kari.fm.unit.no>: Handle a COFF style armap.
+
+Fri Aug  6 09:59:45 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* hpux-core.c: Cast return value from bfd_zalloc.
+
+Thu Aug  5 13:22:44 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* aoutx.h (log2): Delete i387-specific code.
+
+	* Makefile.in (BFD_LIBS): Always include elf.o.
+	(BFD32_BACKENDS): Don't include elf.o here.
+	(ofiles): Delete references to ofiles2 and ofiles3.
+	(do_clean): Delete ofiles.
+	(BFDIN_H): Changed references to $(srcdir)/bfd-in2.h.
+	(stmp-bfd.h): Use bfd.h-new as temporary name, not bfd.h2.
+	(headers): Use bfd-in2.h-new as temporary name, not bfd.h-new.
+
+	* bfd-in.h: Reworded comment to make it clear that bfd-in2.h is a
+	generated file.
+
+	* reloc.c (enum bfd_reloc_code_real): Added i386-elf reloc types
+	(from Meissner's additions to bfd-in2.h).
+
+	* elf32-i386.c (ELF_MAXPAGESIZE): Define.
+
+	Merged:
+
+	Wed Jun 23 06:05:58 1993  Michael Meissner  (meissner@osf.org)
+
+	* elfcode.h (elf_write_object_contents): Don't drop core if
+	elf_symbol_from returns a NULL pointer when processing a non-elf
+	symbol, use a 0 size instead.
+
+	Tue Jun 15 14:38:32 1993  Michael Meissner  (meissner@osf.org)
+
+	* elfcode.h (elf_hash): Delete macro mapping elf_hash to
+	bfd_elf32_hash, since the hash table is independent of the 32/64
+	bit system.
+
+	* libelf.h (elf_hash): Change declaration to bfd_elf_hash, since
+	that is what is in elf.c.
+
+	Sat Jun 19 10:12:27 1993  Michael Meissner  (meissner@osf.org)
+
+	* elf32-i386.h (reloc_type): Reformat spacing.
+	(elf_howto_table): Add the rest of the 386/ELF relocations.
+	(elf_i386_reloc_type_lookup): Ditto.
+	(elf_i386_info_to_howto): Ditto.
+	(elf_i386_info_to_howto_rel): Ditto.
+
+Thu Aug  5 10:07:43 1993  Fred Fish  (fnf@cygnus.com)
+
+	* nlmcode.h (nlm_get_reloc_upper_bound):  Test return value
+	of nlm_slurp_symbol_table as boolean, not pointer.
+	* nlmcode.h (nlm_canonicalize_reloc):  Test return value
+	of nlm_slurp_reloc_fixups as boolean, not pointer.
+
+Wed Aug  4 16:22:55 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* config/go32.mh: remove HDEFINES; since __MSDOS__ and __GO32__
+	are now predefined by GCC
+
+Wed Aug  4 16:06:29 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* coffgen.c (coff_print_symbol): Add the section offset to the
+	line number address, so it's printed the same way as the function
+	address.  Only showed up for line numbers that aren't in the first
+	section (.text).
+
+Wed Aug  4 08:33:55 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* libnlm.h (nlm_backend_data): Added nlm_mangle_relocs.
+	(nlm_mangle_relocs_func): New macro.
+	* nlm32-i386.c (nlm_i386_write_reloc): Rewrote correctly.
+	(nlm_i386_mangle_relocs): New function.
+	* nlmcode.h (nlm_compute_section_file_positions): Move all common
+	symbols into the .bss section.
+	(nlm_set_section_contents): Call the mangle_relocs function.
+	(nlm_write_object_contents): Treat a reloc against any defined
+	symbol as an internal reloc.  Fix bug in external reloc counting.
+	Get the offset and debugging type right for .bss symbols.  Only
+	output debugging symbols for defined symbols.
+
+	* coff-h8500.c (rtype2howto): Do an fprintf to stderr rather than
+	using printf.
+	* coff-z8k.c (rtype2howto): Likewise.
+	* coffcode.h (dummy_reloc16_extra_cases): Likewise.
+	* elf32-i386.c (TRACE): Likewise.
+	* hp300hpux.c (convert_sym_type, swap_std_reloc_in): Likewise.
+	* rs6000-core.c (rs6000coff_get_section_contents): Likewise.
+	* coffgen.c (coff_print_symbol): Do an fprintf to the file
+	argument rather than using printf.
+
+Tue Aug  3 18:17:25 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coffswap.h: Added macros used when accessing several fields;
+	default is the same as before.
+	(coff_swap_aouthdr_{in,out}): Handle the Alpha ECOFF fields.
+	* coff-alpha.c: Defined macros to use the right sizes in
+	coffswap.h.
+	* libecoff.h: Backend information is now in target vector, not
+	BFD.  Start of backend information is COFF backend information.
+	* coff-alpha.c, coff-mips.c: Changed accordingly.
+	* ecoff.c (ecoff_mkobject): New function.
+	(ARMAP_START): Changed into backend information, since Alpha uses
+	a different name.
+	(ecoff_slurp_armap): Don't overlay archive header.
+	* bfd.c: Include libcoff.h.
+
+Tue Aug  3 16:33:11 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* Makefile.in (install): Fix sh syntax error.
+
+	* aoutf1.h: Make bfd_error_trap extern; it's defined in bfd.c.
+
+Tue Aug  3 15:19:09 1993  Fred Fish  (fnf@deneb.cygnus.com)
+
+	* nlmcode.h (nlm_slurp_symbol_table): Don't use '&' on arrays.
+
+Tue Aug  3 11:06:28 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* ecoff.c: New file for generic ECOFF functions.
+	* ecoffswap.h: New file for ECOFF swapping functions which differ
+	only slightly for different targets.
+	* libecoff.h: Added prototypes for ecoff.c functions.
+	(ecoff_backend_data): New structure.
+	(ecoff_tdata): Added backend_data field.  Changed external data
+	pointers to be PTR rather than to a particular struct.
+	(ecoff_symbol_struct): Moved in from coff-mips.c.
+	* coff-alpha.c, coff-mips.c: Moved common functions into ecoff.c.
+	Added ECOFF backend structures.  Include ecoffswap.h.
+	* coff-msym.c: Removed; superseded by ecoffswap.h.
+	* bfd.c: Include coff/internal.h.
+	* Makefile.in (BFD_LIBS): Removed coff-mips.o and coff-msym.o.
+	Added ecoff.o.
+	(BFD64_BACKENDS): Added coff-alpha.o.
+	(CFILES): Removed coff-msym.c.  Added ecoff.c.
+	(bfd.o): Added dependency on $(INCDIR)/coff/sym.h.
+	(coff-mips.o): Added dependency on ecoffswap.h and coff/ecoff.h.
+	(ecoff.o, coff-alpha.o): New targets.
+	(coff-msym.o): Removed target.
+
+Mon Aug  2 23:33:38 1993  John Gilmore  (gnu@cygnus.com)
+
+	* elf32-hppa.h, hosts/*:  Remove (one more time) all occurrances
+	of EXFUN in the BFD sources.  Heave ho!
+
+Mon Aug  2 16:45:57 1993  Stu Grossman  (grossman at cygnus.com)
+
+	* coffcode.h (coff_set_arch_mach_hook):  Add check for I386LYNXMAGIC.
+
+Mon Aug  2 12:18:03 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* hosts/sun3.h: remove some more conflicting decls
+
+Mon Aug  2 11:48:23 1993  Stu Grossman  (grossman at cygnus.com)
+
+	* i386lynx.c:  Remove unnecessary def of N_HEADER_IN_TEXT,
+	redefine TEXT_START_ADDR to be 0.
+
+Sun Aug  1 22:54:08 1993  Stu Grossman  (grossman at cygnus.com)
+
+	* configure.host, configure.in, hosts/i386lynx.h:  Lynx/386
+	host and target info.
+
+Fri Jul 30 18:08:27 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlm32-i386.c: New file.  First cut at i386 NLM code.
+	* libnlm.h: Added some more prototypes.
+	(struct nlm_relent): New structure.
+	(nlmNAME(symbol_type)): Added rcnt and relocs fields.
+	(struct nlm_obj_tdata): Added new fields: nlm_symbols,
+	nlm_text_low, nlm_data_low, nlm_reloc_fixups,
+	nlm_reloc_fixup_secs.
+	(struct nlm_backend_data): New structure, with accessor macros.
+	* nlmcode.h: Use NLM_HIBIT rather than MSB.
+	(nlm_object_p): Set SEC_RELOC for .text and .data.  Don't set
+	SEC_DATA for .bss.  Set HAS_RELOC and HAS_SYMS for abfd.  Set the
+	architecture.
+	(nlm_swap_fixed_header_out, nlm_swap_variable_header_out,
+	find_nonzero, nlm_swap_auxiliary_headers_out): New outbound
+	swapping functions.
+	(nlm_get_symtab_upper_bound, nlm_slurp_symbol_table): Include
+	external references in symbol table as undefined symbols.
+	(nlm_get_symtab, nlm_slurp_symbol_table): Fill in alocation
+	argument in get_symtab rather than in slurp_symbol_table.
+	(nlm_slurp_symbol_table): Save symbol information in tdata.
+	(nlm_print_symbol): New function.
+	(nlm_slurp_reloc_fixups, nlm_get_reloc_upper_bound,
+	nlm_canonicalize_reloc): New functions to read relocs.
+	(nlm_compute_section_file_positions, nlm_set_section_contents,
+	nlm_external_reloc_compare, nlm_write_object_contents): New
+	functions to create NLM files.
+	* nlm-target.h: Define all the nlm functions here either as
+	default values or in terms of nlmNAME.  Use JUMP_TABLE(nlm).  Set
+	the backend_data field to TARGET_BACKEND_DATA.
+	* nlm32-gen.c, nlm64-gen.c: Don't define function macros here;
+	they are now in nlm-target.h.
+	(TARGET_BACKEND_DATA): Define as NULL.
+	* nlm.c (nlm_mkobject): Do allocate the tdata field.
+	(nlm_set_arch_mach): New function.
+	* targets.c: Added nlm32_i386_vec.
+	* Makefile.in (BFD32_BACKENDS): Added nlm32-i386.o.
+	(CFILES): Added nlm32-i386.c.
+	(nlm32-gen.o, nlm64-gen.o): Depend on nlm-target.h.
+	(nlm32-i386.o): New target.
+
+Thu Jul 29 20:20:39 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* hosts/sun3.h: remove some function decls that conflict w/ ANSI
+	C, and aren't needed anyway (return int)
+
+Wed Jul 28 15:46:38 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* elfcode.h: Use casts with bfd_alloc and alloca.
+
+Tue Jul 27 12:51:43 1993  Fred Fish  (fnf@deneb.cygnus.com)
+
+	* nlm{32,64}-gen.c (JUMP_TABLE_PREFIX):  Delete.
+	* nlm{32,64}-gen.c (JUMP_TABLE_INIT):  New macro that works with
+	older cpp's, that don't do additional replacement on the JUMP_TABLE
+	macro's argument.
+	* nlm-target.h (JUMP_TABLE_INIT):  Use new macro in place of
+	JUMP_TABLE macro.
+
+Mon Jul 26 17:39:01 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	Yet another trad-core variant:
+	* config/esix.mh, hosts/esix.h: New files.
+	* configure.host: Use them.
+
+Mon Jul 26 13:22:15 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* reloc.c (bfd_perform_relocation): Handle the case of
+	complain_overflow_bitfield, rightshift > bitpos, and a negative
+	number.
+
+Mon Jul 26 14:40:10 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* elfcode.h: Reimplement segment writing.
+	(elf_write_phdrs): Use precomputed e_phoff rather than making
+	assumptions.
+	(elf_build_phdrs): Disabled, for now.
+	(assign_file_position_for_section): Don't change file offset for
+	SHT_NOBITS.
+	(assign_file_positions_for_symtab_and_strtabs): New function.
+	(struct seg_info): New type.
+	(map_program_segments): New function.
+	(assign_file_positions_except_relocs): For executables, leave
+	section headers &c for last, and properly align all sections with
+	flag SHF_ALLOC set.
+	(prep_headers): No longer abort when EXEC_P is set.
+	(write_shdrs_and_ehdr): Deleted all code relating to program
+	segments.
+
+	* elfcode.h (various): Deleted some unused code, and debugging
+	"malloc(0)" calls.
+	(write_relocs): Cache value of last symbol looked up, to save
+	time if the symbol is referred to repeatedly.
+	(elf_fake_sections): Check only SEC_RELOC flag, not number of
+	relocs.
+	(assign_section_numbers): Likewise.
+
+	* Makefile.in (ofiles): Stars in wildcards belong outside quotes.
+
+	* libelf.h (struct elf_backend_data): New field, maxpagesize.
+	(struct elf_obj_tdata): New field, phdr.
+	* elf32-target.h (elf32_bed): Initialize maxpagesize from
+	ELF_MAXPAGESIZE.
+	(ELF_MAXPAGESIZE): Default to 1.
+	* elf64-target.h (elf64_bed, ELF_MAXPAGESIZE): Likewise.
+	* elf32-sparc.c (ELF_MAXPAGESIZE): Define.
+	(elf_sparc_howto_table): All relocs should have pcrel_offset=true.
+	Most should have length field of `2'.
+
+	* reloc.c (bfd_perform_relocation): Handle 64-bit relocs.
+
+	* config/sparc-aout.mt (TARGET_BACKENDS): Define.
+
+Mon Jul 26 08:56:16 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* configure.in: Don't look in ${srcdir} for ${target_makefile_frag};
+	the top level script has already adjusted for it.
+
+Mon Jul 26 08:09:19 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
+
+	* srec.c (srec_write_symbols):  Get CR LF in the right order.
+
+Mon Jul 26 02:08:41 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* hosts/vaxbsd.h: Include std-host.h.  Don't include <machine/param.h>.
+
+Sat Jul 24 16:13:01 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* reloc.c (bfd_perform_relocation): Handle case of rightshift !=
+	bitpos when overflow checking.
+
+Fri Jul 23 10:20:27 1993  Doug Evans  (dje@canuck.cygnus.com)
+
+	* bfd.c (bfd_nonrepresentable_section, bfd_undefined_symbol,
+	bfd_reloc_value_truncated, bfd_reloc_is_dangerous, bfd_assert):
+	Send error messages to stderr.
+
+Thu Jul 22 15:57:29 1993  Fred Fish  (fnf@deneb.cygnus.com)
+
+	* nlm{32,64}-target.h:  Remove.
+	* nlm-target.h:  New file, merged from nlm{32,64}-target.h
+	* libnlm.h (NLM_ARCH_SIZE):  Define to ARCH_SIZE.
+	* nlm.c (ARCH_SIZE):  Remove define to zero.
+	* nlm32-gen.c (ARCH_SIZE):  Define to 32.
+	* nlm32-gen.c (JUMP_TABLE_PREFIX):  Define to nlm32.
+	* nlm{32,64}-gen.c (nlm-target.h):  Include.
+	* targets.c, libnlm.h, nlm.c, nlm{32,64}-gen.c, nlm{32,64}.c,
+	nlmcode.h:  Convert prefixes from bfd_nlm<size> to just
+	nlm<size>, and use macros select size.
+
+Thu Jul 22 15:40:14 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
+
+	* Makefile.in (Makefile): add configure.in, drop redundant
+	  $(srcdir), drop redundant ./
+
+Thu Jul 22 13:34:57 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* hpux-core.c: New file; backend for HP/UX style core files.
+	* bfd.c (struct _bfd): Renamed hppa_core_data field to
+	hpux_core_data.
+	* bfd-in2.h: Updated.
+	* hppa.c (make_bfd_asection, hppa_core_file_p,
+	hppa_core_file_failing_command, hppa_core_file_failing_signal,
+	hppa_core_file_matches_executable_p): Moved into hpux-core.c.
+	Removed from target vector.
+	* libhppa.h (struct hppa_core_struct and accessor macros): Moved
+	into hpux-core.c.
+	* targets.c: If HPUX_CORE is defined, add hpux_core_vec to
+	target list.
+	* config/hp300.mh (HDEFINES): Set to -DHPUX_CORE.
+	(HDEPFILES): Set to hpux-core.o.
+	* config/hppabsd.mh, config/hppahpux.mh: Likewise.
+	* hosts/hp300.h (HOST_HP300HPUX): Define.
+	* Makefile.in (OPTIONAL_BACKENDS): Added sco-core.o,
+	aix386-core.o, hpux-core.o.
+	(sco-core.o, aix386-core.o, hpux-core.o): New dependencies.
+
+	* reloc.c (enum complain_overflow): New enumeration with the
+	various flavours of overflow checking.
+	(srtuct reloc_howto_struct): Changed complain_on_overflow field
+	from boolean to emum complain_overflow.  Removed obsolete absolute
+	field.
+	(HOWTO): Removed absolute argument.
+	(bfd_perform_relocation): Do overflow checking on all types of
+	fields.
+	* bfd-in2.h: Updated accordingly.
+	* all targets: Updated initialization of reloc howto tables.
+
+Wed Jul 21 20:34:34 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* opncls.c (bfd_create): Don't use C++ keyword "template" as a C
+	variable name.
+
+Tue Jul 20 15:02:23 1993  Fred Fish  (fnf@deneb.cygnus.com)
+
+	* coff-m68k.c (m68k_howto2rtype):  Make arg CONST to match callers.
+
+	* elfcode.h:  Fix several illegal pointer combination warnings for
+	usages of bfd_alloc and alloca.
+
+	* libnlm.h (nlm_obj_tdata):  Rename hidden struct members to avoid
+	apparent Sun C preprocessor recursion.  Fix access macros.
+	* nlmcode.h:  Remove spurious '&' before several array references.
+
+Tue Jul 20 14:36:27 1993  Jim Kingdon  (kingdon@deneb.cygnus.com)
+
+	* Rename for DOS uniqueness: coff-m68k-un.c -> coff-u68k.c
+	config/m68k-coffun.mt -> u68k-coff.mt.
+	* Makefile.in, configure.in: Corresponding changes.
+
+Tue Jul 20 16:21:52 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* elf32-sparc.c (elf_sparc_howto_table): Don't use "&" before
+	function name; it's valid without, and some compilers give
+	warnings with it there.
+
+Tue Jul 20 08:21:15 1993  Fred Fish  (fnf@deneb.cygnus.com)
+
+	* bfd-in.h:  Apply some of the changes that were made to bfd-in2.h.
+	* bfd.c (union tdata):  Add nlm_obj_data;
+	* targets.c (enum target_flavour):  Add bfd_target_nlm_flavour.
+
+Mon Jul 19 20:46:18 1993  Fred Fish  (fnf@deneb.cygnus.com)
+
+	* configure.in (*-*-netware, i[34]86-*-netware):  New configs.
+	* Makefile.in (BFD32_BACKENDS):  Add nlm.o, nlm32.o, nlm32-gen.o.
+	* Makefile.in (BFD64_BACKENDS):  Add nlm64.o, nlm64-gen.o.
+	* Makefile.in (CFILES):  Add nlm{32,64}.c, nlm{32,64}-gen.c.
+	* Makefile.in (nlm.o, nlm{32,64}.o, nlm{32,64}-gen.o:  New targets.
+	* bfd-in2.h (INLINE):  Defines moved here.
+	* {aoutx.h, elf.c, elfcode.h}:  Move INLINE defines to bfd-in2.h.
+	* libelf.h (CAT4):  Move define to bfd-in2.h.
+	* bfd-in2.h (CAT4):  Merge CAT4 macro with other CAT macros.
+	* bfd-in2.h (union tdata):  Add nlm_obj_data.
+	* bfd-in2.h (enum target_flavour):  Add bfd_target_nlm_flavour.
+	* targets.c (bfd_nlm{32,64}_{big,little}_vec):  Add prototypes.
+	* targets.c (target_vector):  Add bfd_nlm{32,64}_{big,little}_vec.
+	* (libnlm.h, nlm.c, nlmcode.h, nlm{32,64}-gen.c,
+	nlm{32,64}-target.h, nlm{32,64}.c, config/i386-nlm.mt):  New files
+	for NLM support.
+
+Mon Jul 19 15:09:01 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* configure.{hosts,in}: add i[34]86-*-lynxos* support
+
+Mon Jul 19 14:53:30 1993  Ken Raeburn  (raeburn@rtl.cygnus.com)
+
+	* elf.c, elfcode.h, libelf.h: Serious reorganization.
+	Deleted `thunk' structure, merged into tdata, duplicate data
+	eliminated.
+	Rearranged functions, grouping by functionality.
+	Broke up many functions in elfcode.h, re-ordered many parts of
+	file writing to handle unpredictable state of section relocation
+	table as provided by various applications.
+	Still needs cleanup: Merge functions back together, split out
+	data structure with only data that is used only when writing out
+	object file.
+
+	* elf.c (bfd_elf_generic_reloc): New function, taken from
+	coff-mips.c.
+	* elf32-sparc.c (elf_sparc_howto_table): Use it, to work around
+	bfd_perform_relocation lossage.
+
+	* Makefile.in (BFD_LIBS): Include coff-mips.o and coff-msym.o, so
+	that gdb will link.
+	(ofiles): Don't use sort or uniq; do it with sh constructs.
+
+Sun Jul 18 19:42:14 1993  Jim Kingdon  (kingdon@rtl.cygnus.com)
+
+	* coffcode.h: Recognize I386PTXMAGIC.
+	* aoutf1.h, libaout.h: Add M_386_DYNIX.
+	* trad-core.c (TRAD_CORE_USER_OFFSET, TRAD_CORE_STACK_FILEPOS):
+	New macros; use it if defined.
+	* config/symmetry.mh, hosts/symmetry.h: New files.
+
+Fri Jul 16 14:56:31 1993  Jim Kingdon  (kingdon@rtl.cygnus.com)
+
+	* Rename elf{32,64}-generic.c to *-gen.c for 14 char filenames.
+	* Makefile.in: Change accordingly.
+	(CFILES): Add elf64-gen.c.
+
+Fri Jul 16 09:53:23 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coff-mips.c: Use MIPS_AOUT_{OZ}MAGIC rather than {OZ}MAGIC.
+
+Thu Jul 15 16:02:07 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* coff-m88k.c (howto_table): Corrected bitsize for R_PCR26L from
+	16 to 26.
+
+Wed Jul 14 15:29:56 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* hppa.c [HOST_HPPABSD]: Use hpux-style core files.
+	* libhppa.h [HOST_HPPABSD]: Include hpux version of core.h
+
+Wed Jul 14 09:30:48 1993  Doug Evans  (dje@canuck.cygnus.com)
+
+	* configure.in: Recognize h8300h-*-*.
+
+Tue Jul 13 12:03:00 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
+
+	* coff-h8500.c (reloc_processing, rtype2howto): New relocation
+	type R_H8500_HIGH_16.
+	* coff-sh.c (r_imm32): Get the width of the reloc right.
+
+Tue Jul 13 16:48:56 1993  Frederic Pierresteguy (F.Pierresteguy@frcl.bull.fr)
+
+	* configure.in: Add new target m68k-coffun to the dpx/2.
+	* config/m68k-coffun.mt: New file, renamed from config/dpx2.mt.
+
+Mon Jul 12 10:42:49 1993  Ken Raeburn  (raeburn@deneb.cygnus.com)
+
+	* reloc.c (enum bfd_reloc_code_real): Move SPARC_BASE13 reloc into
+	sparc-aout-specific list.
+
+	* libelf.h (struct elf_obj_tdata): Add field `thunk'.
+
+	* config/sparc-elf.mt (TARGET_BACKENDS): New make variable.
+
+Thu Jul  1 14:52:47 1993  Frederic Pierresteguy (F.Pierresteguy@frcl.bull.fr)
+			  and Jim Kingdon (kingdon@cygnus.com)
+
+	* elfcode.h: Use memset not bzero.
+	* trad-core.c: Don't include <sys/file.h>.
+	* i386linux.h: Include <sys/file.h>.
+	* coff-m68k-un.c: new file to handle names with underscores on
+	svr3 machines.
+	* coff-m68k.c (m68k_rtype2howto): added #ifdef ONLY_DECLARE_RELOCS
+	to not duplicate the function in the executable.
+	(TARGET_SYM, TARGET_NAME, NAMES_HAVE_UNDERSCORE): new macros needed
+	by coff-m68k-un.c.
+	* coffcode.h (MC68KBCSMAGIC): case added.
+	* targets.c: Add m68kcoffun_vec.
+	* configure.host: added support for Bull dpx/2.
+	* config/dpx2.mh, hosts/dpx2.h: new files.
+	* Makefile.in: added target coff-m68k-un.
+
+Fri Jul  9 00:43:06 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* aoutf1.h: Add definition of MACHTYPE_OK.
+
+Thu Jul  8 14:37:44 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* reloc.c (bfd_perform_relocation): Don't subtract the addend
+	again for coff.
+
+	* syms.c, bfd-in2.h: Doc fix.
+
+	* coffcode.h (CALC_ADDEND): Check for common section using the
+	section flag as well as the symbol flag.
+
+Thu Jul  8 13:43:52 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* hosts/i386bsd.h: Conditionalize HOST_STACK_END_ADDR on __bsdi__.
+	i386bsd.c: Remove defines of N_TXT*; the versions in aout64.h should
+	be sufficient.  Define TEXT_START_ADDR.
+
+Wed Jul  7 10:56:21 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* aoutx.h (translate_from_native_sym_flags): Removed statep
+	argument.  Just let an indirect symbol point to the next symbol
+	without forcing the next symbol to be undefined.  Changed all
+	callers.
+	* hp300hpux.c (slurp_symbol_table): Changed call to
+	translate_from_native_sym_flags.
+	* targets.c: Added hp300hpux_vec.
+	* Makefile.in (hp300hpux.o): Added dependencies.
+
+Tue Jul  6 13:24:55 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* reloc.c (enum bfd_reloc_code_real): Put simple power-of-two
+	relocs together, and add 64-bit versions.
+	(bfd_generic_get_relocated_section_contents): Argument to alloca
+	is size_t.
+
+	* libbfd.c (bfd_xmalloc_by_size_t): New function.
+	* opncls.c (bfd_cache_init, bfd_open_file): Add prototypes to
+	declarations.
+	(obstack_chunk_alloc): Use bfd_xmalloc_by_size_t.
+	(new_bfd): Prototype-style definition, using DEFUN.
+	(bfd_alloc_grow, bfd_alloc, bfd_zalloc, bfd_realloc): Size
+	argument is type size_t, not bfd_size_type.
+	* ieee.c (obstack_chunk_alloc): Use bfd_xmalloc_by_size_t.
+	* bfd.c (bfd_default_error_trap, bfd_error_trap,
+	bfd_error_nonrepresentabltrap): Prototypes.
+	* libbfd-in.h (bfd_alloc, bfd_zalloc, bfd_realloc,
+	bfd_alloc_grow): Adjusted prototypes for arg type change.
+	* archive.c (get_elt_at_filepos, do_slurp_bsd_armap, normalize,
+	do_slurp_coff_armap, bfd_construct_extended_name_table):
+	Prototypes.
+	* elfcode.h (elf_string_from_elf_strtab): Prototypes.
+	* libelf.h (elf_string_from_elf_section, elf_get_str_section):
+	Prototypes.
+
+	* Makefile.in (ALL_MACHINES): Renamed from BFD_MACHINES.
+	(ofiles): New target.  Build a list of unique file names, in case
+	any got duplicated.
+	(TARGETLIB): Use list of files from ofiles.
+	* configure.in: Set BFD_MACHINES and BFD_BACKENDS depending on
+	minimal-bfd flag and target makefile frag contents.
+
+	* elfcode.h (elf_read): Delete static declaration, since function
+	has moved.
+	(elf_map_symbols): Write out section symbols for all sections, for
+	now.
+	(elf_symbol_from_bfd_symbol): Allow match if both symbols are
+	section symbols for the same section.
+	(elf_find_nearest_line): Don't print message, just return false.
+
+	* libelf.h (bfd_elf_locate_sh): Declaration deleted.
+
+Mon Jul  5 16:48:11 1993  Doug Evans  (dje@canuck.cygnus.com)
+
+	* cpu-h8300.c (h8300_scan): Fix parsing of architecture string.
+
+Fri Jul  2 18:27:00 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* Makefile.in (clean): Remove bfd.h and stmp-bfd.h.
+	(realclean): Remove generated headers.
+
+Fri Jul  2 14:51:51 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* section.c (bfd_set_section_content):  Deny if file is not opened with
+	the proper mode, set output_has_begun if file is openened for update.
+	* aoutx.h (aout_*_set_section_content):  Remove checks that are now
+	done in bfd_set_section_content.
+
+Fri Jul  2 09:25:20 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* hosts/std-host.h: Removed declarations of printf, fprintf,
+	fcntl, fread and fwrite.  They are all error prone for one reason
+	or another.  Changed declaration of memchr from char * to PTR.
+
+	* configure.in (mips-*-riscos*): New target; use riscos.
+	* configure.host (mips-*-riscos*): New host; use riscos.
+	* config/riscos.mh (HDEFINES): Add -G 4.
+
+	* libaout.h (GET_SWORD): Use the bfd_h_get_signed entry points
+	rather than casting the result of bfd_h_get.
+
+Fri Jul  2 10:13:48 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* configure.in, hosts/delta68.h, config/delta68.mh: Add stuff for
+	Motorola Delta 68.
+
+Wed Jun 30 06:02:43 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* targets.c (bfd_elf64_{big,little}_generic_vec): Declare, and
+	include in search list if BFD64 is defined.
+
+	* libelf.h (CAT4): Added a version for Saber-C, ANSI mode.
+	(bfd_elf64_*): Declarations for 64-bit versions of many routines.
+
+Tue Jun 29 22:50:59 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* elf64-target.h, elf64-generic.c: New files.
+	* Makefile.in (BFD64_BACKENDS): Include elf64-generic.o.
+	(elf64-generic.o): List dependencies.
+
+	* Makefile.in: List target `all' explicitly before host/target
+	makefile fragments are included, in case they define any new
+	targets.
+
+	* elfcode.h (ELF_R_INFO, ELF_R_SYM): Define as 32- or 64-bit
+	versions as appropriate.  Uses updated.
+	(elf_debug_section): Declare before use.
+	(elf_debug_file): New function.
+	(bfd_section_from_shdr, bfd_shdr_from_section, elf_fake_sections):
+	Alignment value in section header is n_bytes, not log2.
+	(new_section_hook): Do nothing for now.
+	(bfd_section_from_shdr): Use Elf_External_Rel[a], not 32-bit
+	version explicitly.
+	(elf_core_file_p): Simplify check for correct class (word size).
+	(elf_make_sections, elf_fake_sections, elf_write_object_contents):
+	Initialize all fields when creating data structures.
+	(elf_locate_sh): Renamed from bfd_elfXX_locate_sh, made static.
+	(elf_compute_section_file_positions): Set correct class in output
+	file.
+	(elf_write_object_contents): Section symbols have empty names in
+	output file.
+
+	* libbfd.c (bfd_xmalloc, zalloc): Be sure to cast malloc, memset
+	args to size_t before call.
+	(bfd_add_to_string_table): Cast zalloc arg to bfd_size_type.
+
+Tue Jun 29 10:49:42 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coff-mips.c (ecoff_find_nearest_line): If procedure has no line
+	number information, return 0 for line number.
+
+Mon Jun 28 10:45:02 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* aoutx.h (some_aout_object_p): If *oldrawptr is non-NULL, copy it
+	into *rawptr.
+
+Sun Jun 27 09:05:19 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* hosts/riscos.h: Define NBPG and UPAGES.
+
+Sun Jun 27 16:28:26 1993  Ken Raeburn  (raeburn@cygnus.com)
+
+	* elfcode.h (elf_slurp_symbol_table): Don't use obj_raw_syms as
+	lvalue; it contains a cast.
+
+Fri Jun 25 17:09:55 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* aoutx.h (hash, compare, struct stringtab_entry, add_to_stringtab):
+	Use unsigned hash values for better hashing.
+	(hash): Hash in the string length for long strings.
+
+Thu Jun 24 15:47:51 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* aoutx.h (compare): Replace 3 if's with a subtraction.
+	(translate_to_native_sym_flags, add_to_stringtab): Reorder tests
+	in decreasing order of success, as an optimization.
+	(hash): Take a length arg; ignore chars after #25, for speed.
+	(add_to_stringtab): Pass length to hash.
+
+Thu Jun 24 17:25:51 1993  Ken Raeburn  (raeburn@poseidon.cygnus.com)
+
+	* elf32-sparc.c (sparc_reloc_map): Add SPARC_WDISP22 reloc.
+
+	* elfcode.h (elf_new_section_hook): Do nothing for now.
+	(elf_write_object_contents): Output common symbols the way ELF
+	wants them.
+
+Wed Jun 23 16:20:07 1993  Ken Raeburn  (raeburn@poseidon.cygnus.com)
+
+	* libelf.h (struct elf_obj_tdata and associated macros): Moved
+	here from elfcode.h.  A couple of size-specific structure pointers
+	were changed to PTR; uses fixed appropriately.
+	(elf32_symbol_type, elf64_symbol_type): Separated definitions.
+	(bfd_elf_mkobject): Renamed from bfd_elf32_mkobject.
+	(bfd_elf32_mkobject, bfd_elf64_mkobject, elf_mkobject): New
+	temporary macros to ease name change.
+	* elf.c (elf_read, elf_mkobject, elf_get_str_section,
+	elf_string_from_elf_section, bfd_elf_find_section): Moved here
+	from elfcode.h.
+	* doc/Makefile.in (libbfd.h): Process elf.c too.
+	* Makefile.in (elf.o): Note new dependencies.
+
+	* elfcode.h: Lots of stuff moved elsewhere.  Deleted some unused
+	code, tweaked some debug hooks.
+	(elf_slurp_reloca_table): Translate ELF section symbols into BFD
+	section symbols.
+
+Wed Jun 23 11:34:21 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* hosts/riscos.h: New file.
+
+Tue Jun 22 14:35:20 1993  Ken Raeburn  (raeburn@poseidon.cygnus.com)
+
+	* elfcode.h (bfd_section_from_shdr, case SHT_PROGBITS): Even if
+	section already exists, use its pointer to fill in rawdata slot.
+
+Tue Jun 22 16:36:51 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* hosts/std-host.h: Return value of puts and fputs is int not void.
+
+Tue Jun 22 14:25:58 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* aoutx.h (howto_table_ext): Comment the field names.
+	* reloc.c (bfd_perform_relocation): Fix max and min values.
+
+Mon Jun 21 18:19:14 1993  Ken Raeburn  (raeburn@poseidon.cygnus.com)
+
+	* elf32-target.h, elf32-hppa.c, elfcode.h: Use new
+	size-independent elf internal data structures.
+	* elfcode.h (put_word, get_word): Define as appropriate for
+	architecture word size.  Structure swapping functions changed to
+	use them as appropriate.
+
+	* configure.in: If compiling 64-bit back ends, do them before
+	32-bit ones.
+
+	* libelf.h: Use new size-independent versions of elf internal data
+	structures.
+	(symbol_type): Reordered to put any fields dependent on target
+	size at the end.
+	(elf_backend_data): Renamed from elf##_backend_data and made
+	size-independent.
+	(elf_sect_thunk): Now size-independent.
+
+	* libbfd.c (bfd_log2): Now returns unsigned int.
+
+Mon Jun 21 12:30:47 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* Rename config/m88k-aout.mt to config/noop.mt.
+	configure.in: Use it for mips-*-bsd*.
+
+Sun Jun 20 20:32:19 1993  Ken Raeburn  (raeburn@poseidon.cygnus.com)
+
+	* cpu-m68k.c (arch_info_struct): Eliminate "partially bracketed
+	initializer" warning from gcc.
+	* cpu-h8500.c (arch_info_struct): Likewise.
+	* cpu-sh.c (arch_info_struct): Likewise.
+
+	* cpu-h8300.c (local_bfd_reloc_type_lookup, howto*_callback,
+	howto_*): Unused functions and variables commented out.
+	* cpu-z8k.c (local_bfd_reloc_type_lookup, howto*_callback,
+	howto_*): Likewise.
+	* cpu-h8500.c (compatible): Likewise.
+	* cpu-sh.c (compatible): Likewise.
+
+	* hp300hpux.c (swap_std_reloc_in): Delete unused variables.
+	Always set a valid length value, even for invalid input.
+
+	* srec.c (srec_write_symbols): Use sprintf_vma.
+
+	* bfd-in.h (uint64_typeLOW, uint64_typeHIGH, int64_type,
+	uint64_type): Provide default definitions.
+	* hosts/std-host.h (int64 stuff): Remove them from here.
+
+	* bfd-in.h (sprintf_vma): Define parallel to fprintf_vma.
+
+	* elf32-i386.c (elf_i386_reloc_type_lookup): Delete unused
+	variable.  Added default case to switch.
+
+	* aoutx.h (translate_from_native_sym_flags): Before casting
+	pointers to integers, make sure the integer type is wide enough.
+	* coff-mips.c (ecoff_set_symbol_info): Ditto.
+
+	* section.c (bfd_get_section_contents): Since `count' is unsigned,
+	don't bother comparing for less-than-zero.
+	(bfd_set_section_contents): Ditto.
+
+	* elfcode.h (bfd_add_to_strtab): Now static.
+	(sym_is_global): New function.
+	(elf_map_symbols): Call it.  Now returns void.  Removed unused
+	local variable.
+	(bfd_section_from_shdr): Mark string tables other than for section
+	and symbol names as normal sections having contents.
+	(fix_up_strtabs): New function; fixes up ELF header fields for
+	stab sections with string tables associated.
+	(elf_write_object_contents): Map fix_up_strtabs over all BFD
+	sections.  Reordered condition tests for symbol flags; default to
+	local-object value instead of global-object.
+	(elf_symbol_from_bfd_symbol): Hid conditionally-used variable
+	inside condition test.
+	(elf_print_symbol): Use fprintf_vma.
+	(elf_idx_of_sym, bfd_shdr_from_section): Unused functions
+	commented out.
+
+	* bfd-in.h (int64_type, uint64_type): Define these if we fall
+	back to "long long" for HOST_64_BIT.
+
+	* libelf.h (elfNAME, ElfNAME): New versions to get desired results
+	without using invalid ANSI C preprocessing tokens.
+
+	* elf32-target.h (bfd_elf32_new_section_hook): Delete macro.
+	* libelf.h (bfd_elf32_new_section_hook): Declare.
+	* elfcode.h (new_section_hook): Define here.
+
+	* hosts/sparc.h, hosts/std-host.h, hosts/i386bsd.h: Protect
+	against multiple inclusions.
+
+	* hosts/news.h: Include hosts/std-host.h, not plain std-host.h.
+
+	* Makefile.in (bfd.h): Generate into current directory by grabbing
+	64-bit definition (if any) from sysdep.h.
+	* bfd-in.h: Put in marker for sysdep.h inclusion.
+
+Fri Jun 18 19:57:23 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* reloc.c (bfd_perform_relocation): Check for overflow on
+	pc-relative relocations if the howto asked for it.
+
+Fri Jun 18 16:00:20 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* Makefile.in (stmp-bfd.h): Ignore nonzero exit status from grep.
+
+Fri Jun 18 16:54:29 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config/riscos.m{h,t}: New files.
+	* configure.{host,in}: Use them.
+
+Fri Jun 18 12:55:10 1993  K. Richard Pixley  (rich@cygnus.com)
+
+	* elf32-mips.c: comment change.  This is a mips file, not 88k.
+
+Mon Jun 14 14:02:41 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* cache.c (bfd_cache_init): Increment open_files and call close_one
+	if necessary.
+	(bfd_open_file): Don't increment open_files here.
+
+Fri Jun 18 10:00:14 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config/delta88.mh: Don't set CC.
+
+	* Makefile.in: Add elf32-{mips,m88k,generic}.
+	elf32-{mips,m88k,generic}.c: New files.
+	targets.c (target_vector): Include bfd_elf32_{mips,m88k,generic}_vec.
+	elfcode.h (elf_object_p): Match elf32-generic for all machines which
+	don't match a different target.
+
+Fri Jun 18 03:12:12 1993  John Gilmore  (gnu@cygnus.com)
+
+	Eliminate "int8_type", "int16_type", "int32_type", and their
+	variants from the BFD universe.  Leave the 64-bit types for now,
+	since they are in flux.
+
+	* aoutx.h, hp300hpux.c:  Eliminate needless (int32_type) casts.
+	* libaout.h (GET_SWORD):  Convert (int32_type) to (int).
+	* ieee.c:  Convert uint8e_type => unsigned char.
+	* oasys.c:  Extensive changes to eliminate obsolete types.
+	These depend on changes in ../include/oasys.h as well.
+	* hosts/*.h:  Remove declarations of all these types.
+
+Mon Jun 14 14:02:41 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* hosts/delta88.h: #if 0 out some declarations which conflict with
+	system headers.
+
+Mon Jun 14 17:08:18 1993  david d `zoo' zuhn  (zoo at rtl.cygnus.com)
+
+	* Makefile.in (install): remove parentdir cruft
+
+Mon Jun 14 19:04:09 1993  Stu Grossman  (grossman@cygnus.com)
+
+	* hppa.c (hppa_get_symbol_info):  Remove redundant copy.
+	* Expurgate random DEFUNs that have crept in.
+
+Mon Jun 14 10:23:53 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coff-mips.c (ecoff_set_symbol_info): Constructor sections should
+	only be aligned to a 4 byte boundary.
+
+Sat Jun 12 16:13:17 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* hosts/std-host.h (struct int64e_struct): Remove needless typedef
+	keyword.
+
+Fri Jun 11 14:25:34 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
+
+	* aoutf1.h (sunos4_write_object_contents): set flags to 1, breaking
+	1927 but fixing some other important things.
+
+Thu Jun 10 20:36:22 1993  Doug Evans  (dje@canuck.cygnus.com)
+
+	* hosts/std-host.h (int64e_type): Fix definition.
+
+Thu Jun 10 11:48:28 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coff-mips.c (ecoff_sec_to_styp_flags): Use STYP_MIPS_INIT for
+	section named _INIT.  Don't set STYP_TEXT unless SEC_CODE is set.
+	(ecoff_styp_to_sec_flags): Treat a STYP_MIPS_INIT section like
+	a STYP_TEXT section.
+
+Wed Jun  9 16:48:13 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in (install, headers): don't put comments after a tab
+	in the actions section of a rule
+
+Wed Jun  9 15:00:01 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coff-mips.c (ecoff_mkobject_hook): Mark ZMAGIC files as D_PAGED.
+	(ecoff_write_object_contents): If not D_PAGED, don't add the
+	section headers to text_size.  If not D_PAGED, set the magic
+	number to OMAGIC rather than ZMAGIC.  If creating a D_PAGED
+	executable, the executable must fully occupy an even number of
+	pages.
+	(ecoff_set_symbol_info, make_bfd_asection, ecoff_little_vec,
+	ecoff_big_vec): Consistently set section alignment power to 4,
+	since ECOFF sections should be multiples of 16 bytes.
+	(ecoff_little_vec, ecoff_big_vec): Added D_PAGED to object_flags.
+	Made ar_pad_char and ar_max_namelen agree for both.
+
+Tue Jun  8 20:28:02 1993  Mark Eichin  (eichin at tweedledumber)
+
+	* elfcode.h (elf_slurp_symbol_table): subtract section vma from
+	symbol value, since bfd symbols are section relative, but ELF
+	symbols aren't.
+
+Tue Jun  8 12:08:27 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
+
+	* cpu-i960.c, cpu-h8300.c (compatible): Make static.
+
+Tue Jun  8 14:27:56 1993  Jim Kingdon  (kingdon@rtl.cygnus.com)
+
+	* hosts/news.h, config/news.mh: New files.
+
+Tue Jun  8 12:08:27 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
+
+	* bfd-in2.h, archures.c (bfd_mach_h8300[h]): new defines.
+	* coff-h8300.c: More addressing modes.
+	* coffcode.h (coff_set_arch_mach_hook): Cope with H8300 magic
+	number.
+	* cpu-h8300.c: Removed disassemble stuff. (h8300_scan): Recognise
+	H8/300H name. (compatible): New function.
+	* reloc16.c (bfd_coff_reloc16_get_relocated_sec): Cope with more
+	addressing modes.
+
+Tue Jun  8 10:30:13 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coff-mips.c (ecoff_compute_section_file_positions,
+	ecoff_write_object_contents): Only round to page boundaries if
+	D_PAGED flag is set for the output BFD.
+
+Fri Jun  4 15:47:52 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
+
+	* coffcode.h (get_index, coff_slurp_symbol_table): Fix pointer
+	casts to work on machine where sizeof(long) != sizeof(int) !=
+	sizeof(char *).
+        * coffgen.c (coff_get_normalized_symtab): Ditto.
+	* cpu-h8300.c coff-h8300.c: Support for H8/300-H.
+
+Fri Jun  4 15:24:27 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* coffgen.c (coff_write_symbols): For empty string table, write
+	out 4 in correct byte order.  (from minyard@bnr.ca)
+
+	* elf32-hppa.c: Don't include libhppa.h for now; define
+	BYTES_IN_WORD instead, until Utah sends a better fix.
+	(hppa_elf_build_arg_reloc_stub): Use xmalloc and xrealloc instead
+	of malloc and realloc.
+
+Fri Jun  4 07:49:01 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* configure.in (mips-*-ecoffl*): New target; use decstation.
+	(mips-*-ecoff*): Added trailing '*'.
+
+	* coff-mips.c (ecoff_get_debug): Get the offset from the first PDR
+	for the FDR, not from the first PDR in the file.
+
+Thu Jun  3 16:41:10 1993  Stu Grossman  (grossman@cygnus.com)
+
+	* hppa.c (hppa_get_symbol_info):  New func needed for JUMP_TABLE.
+
+Thu Jun  3 15:33:57 1993  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+	* hppa.c (hppa_get_symbol_info): New function.
+
+Thu Jun  3 13:07:42 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* elfcode.h (elf_map_symbols): Don't crash if no symbols have been
+	allocated yet.
+
+	From Peter Hoogenboom (hoogen@schafer.cs.utah.edu):
+	* libhppa.h (MAXCOMLEN): Define unconditionally.
+	(_PA_RISC_ID): Only define if not already defined.
+	* elf32-hppa.c: Include libhppa.h.
+
+	From Ralph Campbell:
+	* hosts/mipsbsd.h (HOST_DATA_START_ADDR): Delete definition.
+
+	* elf32-hppa.h (symext_rootP, symext_lastP): Delete decls.
+
+Thu Jun  3 00:23:53 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* config/go32.mh: define EXTRALIBES to -lm (for binutils), also
+	remove defines of __MSDOS__ and __GO32__ (these are in the
+	compiler now).
+
+Wed Jun  2 17:57:13 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	From Utah:
+	* hosts/hppabsd.h: Eliminate use of obsolete EXFUN.
+	* config/hppabsd.mh: Don't use ranlib.
+
+Tue Jun  1 04:15:57 1993  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+	* elf.c: New file, for word-size independent code.
+	* elfcode.h (elf_hash): Moved to there, renamed bfd_elf_hash.
+	* Makefile.in: Include elf.o in standard objects.
+
+	* bfd-in.h (CAT3): Define here.
+	* libaout.h, libelf.h: Not here.
+
+	* libelf.h (struct strtab): Define here.
+	(bfd_elf_locate_sh): Declare here.
+	* elfcode.h (struct strtab): Definition deleted.
+
+	* reloc.c (enum bfd_reloc_code_real): Added HPPA_PCREL_CALL_12.
+
+	* Makefile.in: Make "all", not "bfd.h", be the default target.
+	(stmp-bfd.h): New target; prevents rebuilding world if bfd.h
+	hasn't really changed.
+
+	Tue May 25 12:15:15 1993  Michael Meissner  (meissner@osf.org)
+
+	* elfcode.h (elf_hash): Provide elf standard hash function.
+	(various): Key off of the machines use_rela_p field to determine
+	whether to use REL or RELA relocations.
+	(elf_swap_reloc_out, elf_swap_reloc_in): New functions.
+	(elf_make_sections): Allocate a pointer to hold all data for a
+	given section, and copy each fragment into the data region.
+	Update the section's pointer with the REL implicit addends if the
+	machine uses REL relocation.
+
+	* elf32-i386.c (elf_bfd_reloc_type_lookup): Rename to
+	elf_i386_bfd_reloc_type_lookup, and use cpp to map the name back
+	into was elf32-target.h expects.
+	(elf_info_to_howto): Rename to elf_i386_info_to_howto.
+	(elf_i386_bfd_reloc_type_lookup): Add relocation support.
+	(elf_i386_info_to_howto): Add minimal relocation support.
+
+	* libelf.h (elf_backend_data): Add use_rela_p, elf_64_p,
+	elf_info_to_howto_rel fields.
+
+	* elf32-target.h (elf_bed): Add support for new fields in
+	elf_backend_data.
+
+	Sun May 30 16:38:24 1993  Peter Hoogenboom  (hoogen@fast.cs.utah.edu)
+
+	* elf32-hppa.c: Add symbol extension section support, fix
+	relocation howto table, add stub generation support.
+
+	* elf32-hppa.h: Add symbol extension section support, fix
+	relocation howto table, add stub generation support.
+
+	* elfcode.h (bfd_elf_locate_sh): New function to locate ELF
+	section header.
+
+	* elfcode.h (bfd_add_to_strtab): Made non-static due to a call
+	from elf32-hppa.c.
+
+	* elfcode.h (elf_idx_of_sym): Return STN_UNDEF instead of 0 when
+	the symbol is not found.
+
+	* elfcode.h (elf_compute_section_file_positions): Not all section
+	file positions were computed.
+
+	* elfcode.h (elf_get_sect_thunk): New function.
+
+	* hppa.c (sign_ext): Reimplement.
+
+	* hppa.c (round_down,round,round_up,L,R,LS,RS,LD,RD,LR,RR): Make
+	these functions static.
+
+Tue Jun  1 14:40:41 1993  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Makefile.in (bfd.h):  Move closer to headers - and after 'all'!
+
+	* aoutx.h (translate_from_native_sym_flags):  Don't set
+	BSF_DEBUGGING for constructor symbols, only BSF_CONSTRUCTOR.
+	* aoutx.h (translate_to_native_sym_flags):  Translate
+	constructor symbols properly.
+
+Thu May 27 16:09:04 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
+
+	* archures.c (bfd_default_arch_struct): use 4 byte alignment as a
+	minimum.
+	* aout-target.h (minimum_alignment): 8 byte alignment is right.
+	(fix ld/2680)
+
+Thu May 27 13:38:47 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* configure.in, Makefile.in: Build bfd-in2.h in source directory,
+	from bfd-in.h and .c files.  Build bfd.h in build directory,
+	substituting in requested target word size.  Insert word size into
+	makefile, and maybe enable 64-bit targets.
+
+	* bfd-in.h, libbfd.c, demo64.c, targets.c: Define BFD64 if 64 bits
+	are available.  Conditionalize on this.  Assume HOST_64_BIT
+	will be defined if needed, so 64-bit targets are conditionalized
+	only in the Makefile.
+
+Tue May 25 14:03:56 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* libbfd.c (COERCE64): Rewrite to avoid out-of-range values.
+
+	* coff-sh.c (rtype2howto): Put error message on stderr.
+	(extra_case): Delete unused variable.
+
+	* coff-mips.c (ecoff_print_symbol): Cast bfd_vma values to long
+	before calling printf.
+
+	* elfcode.h: New file, almost completely derived from old elf32.c.
+	* elf32.c: Now just define ARCH_SIZE and include elfcode.h.
+	* Makefile.in (elf64.o): List dependencies, don't build by
+	default.
+	(elf64.c): Add to list of sources.
+	(elf32.o): Update dependencies.
+	* elf32-*.c: Updated type/macro/structure names.  Cleaned up
+	namespace pollution; rename vectors.
+	* targets.c, config/*-elf.mt: Updated.
+	* All uses of 32-bit versions of structures, routines, and macros
+	renamed.
+
+	* Makefile.in (archures.o, targets.o): Depend on Makefile.
+
+Mon May 24 15:53:13 1993  Ken Raeburn  (raeburn@cygnus.com)
+
+	* elf32-i386.c (enum reloc_type): No comma after last enumerator.
+
+	* elf32.c (elf_string_from_elf_section): Handle index of zero
+	specially.
+	(bfd_section_from_shdr, elf_slurp_symbol_table): Don't need to do
+	so here.
+	(elf_write_object_contents): Deleted one unused variable and
+	initialized another to avoid gcc warnings.
+	(elf_set_section_contents): Delete unused variable.
+
+Fri May 21 19:04:21 1993  Stu Grossman  (grossman@cygnus.com)
+
+	* i386lynx.c:  New module for Lynx variant of a.out.
+	* Makefile.in (BFD_BACKENDS CFILES depends):  Add i386lynx.c.
+	* gen-aout.c:  Get rid of defunct endian stuff, print out true
+	pagesize.
+	* targets.c (target_vector):  Add i386lynx_vec.
+
+Fri May 21 17:02:22 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* configure.in: Use i386-sco.mt for i[36]86-*-isc*.
+
+Fri May 21 13:44:18 1993  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+	* aix386-core.c, aout-target.h, aoutx.h, coff-alpha.c,
+	coff-mips.c, coffgen.c, elf32.c, ieee.c, libaout.h, libcoff-in.h,
+	libelf.h, mipsbsd.c, oasys.c, sco-core.c, srec.c, tekhex.c,
+	trad-core.c: Define a TARGET_get_symbol_info function or macro.
+	Remove the bfd_print_symbol_nm case from TARGET_print_symbol.
+
+	* bfd-in.h: Don't define bfd_print_symbol_nm.
+	Define symbol_info type.
+	(JUMP_TABLE): Set _get_symbol_info element.
+
+	* syms.c (coff_section_type, bfd_symbol_info): New functions.
+	(bfd_decode_symclass): Use coff_section_type.
+
+	* targets.c: Add bfd_get_symbol_info call.
+
+Wed May 19 15:30:52 1993  Stu Grossman  (grossman@cygnus.com)
+
+	* coff-i386.c (coff_i386_reloc):  Use unsigned char to avoid
+	complaints from ancient gcc's.
+
+Wed May 19 15:51:19 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* trad-core.c:  Check macro TRAD_CORE_EXTRA_SIZE_ALLOWED.
+	hosts/i386linux.h:  Define it.
+
+Mon May 17 15:00:33 1993  Ken Raeburn  (raeburn@deneb.cygnus.com)
+
+	* VERSION, bfd-in.h: Bump version number to 2.2.
+
+	* hppa.c (assemble_3, dis_assemble_3, assemble_12,
+	dis_assemble_12, assemble_17, dis_assemble_17, assemble_21,
+	dis_assemble_21, sign_ext, ones, sign_unext, low_sign_ext,
+	low_sign_unext, round_down, round, round_up, L, R, LS, RS, LD, RD,
+	LR, RR, hppa_field_adjust): New functions.
+
+Mon May 17 10:04:16 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coff-mips.c (ecoff_set_symbol_info): Added support for indirect
+	stabs symbols, including new indirect_ptr_ptr argument.
+	(ecoff_slurp_symbol_table): Pass new argument in calls to
+	ecoff_set_symbol_info.
+
+Fri May 14 00:05:06 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* configure.in: For m68k sysv systems, use m68k-coff.
+
+	* config/hppa-elf.mt (TDEFINES): Don't define DEFAULT_VECTOR here.
+	(TDEFAULTS): Define it here.  Use the new name.
+
+	* elf32-hppa.c (elf_hppa_backend_data): Delete; rely on default
+	values instead.
+
+	* reloc.c (bfd_reloc_code_real_type): Add some HPPA reloc types.
+
+	* aix386-core.c (NO_GETS): Fix PROTO invocation to have correct
+	number of arguments.
+	(aix386_core_file_p): Initialize core_size to correct value.
+
+Wed May 12 14:39:59 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (CC_FOR_BUILD): New variable, set to $(CC).
+	(FLAGS_TO_PASS): Pass down CC_FOR_BUILD.
+
+	* bout.c (aout32_slurp_extended_name_table): Define to be
+	_bfd_slurp_extended_name_table rather than bfd_true.
+
+	* coff-mips.c: Include libaout.h and aout/aout64.h to get
+	definitions for N_SET[ATDB].
+	(ecoff_howto_table): Moved near top of file.
+	(ecoff_set_symbol_info): If a STABS symbol of type N_SET[ATDB] is
+	seen, cook up a constructor section of the same name and put in a
+	reloc pointing to the symbol.  This lets the GNU linker build
+	global constructors and destructors without using collect.
+
+Tue May 11 00:33:31 1993  John Gilmore  (gnu@cygnus.com)
+
+	* coff-m88k.c (m88kbcs_vec):  Symbols have underbars.
+
+Mon May 10 05:55:45 1993  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+	* hosts/miniframe.h: New file.
+	* configure.host: Use it.
+
+Sun May  9 16:36:59 1993  Fred Fish  (fnf@cygnus.com)
+
+	* configure.in (hppa*-*-bsd):  Change to hppa*-*-bsd*
+	* configure.in (hppa*-*-hpux):  Change to hppa*-*-hpux*
+	* configure.in (m68*-hp-bsd):  Change to m68*-hp-bsd*
+	* configure.in (m68*-*-hpux):  Change to m68*-*-hpux*
+	* configure.in (*-*-bsd):  Change to *-*-bsd*
+
+Wed May  5 16:08:32 1993  Per Bothner  (bothner@cygnus.com)
+
+	* elf32-hppa.c (elf_hppa_reloc_type_lookup):  Cast enums to
+	int, for the sake of the old Portable C Compiler.
+
+Mon May  3 14:37:01 1993  Stu Grossman  (grossman@cygnus.com)
+
+	* Makefile.in (CFILES):  Add cpu-sh.c and coff-sh.c.
+
+Mon May  3 14:03:21 1993  Ken Raeburn  (raeburn@deneb.cygnus.com)
+
+	* configure.in: Get target name right for m68*-*-hpux.
+
+Sun May  2 11:39:44 1993  Fred Fish  (fnf@cygnus.com)
+
+	* trad-core.c (NO_SIGNED_GET):  New macro.
+	* trad-core.c (trad_core_vec):  Use new NO_SIGNED_GET instead of
+	signed NO_GET, where appropriate.
+
+	* configure.in (i[34]86-*-linux*):  Add; bfd_target = i386-linux.
+	* configure.in (*-*-linux*):  Remove until linux port for a
+	non-i386/i486 system is actually available.
+
+Fri Apr 30 20:04:10 1993  Stu Grossman  (grossman@cygnus.com)
+
+	* libhppa.h:  #undef e_* symbols which come from <machine/som.h>
+	when compiling under HPUX.
+
+Fri Apr 30 17:25:23 1993  Stu Grossman  (grossman@cygnus.com)
+
+	* The following patches are from Jeffrey Law <law@cs.utah.edu>.
+	* hppa.c (hppa_core_file_p): Provide a temporary dummy routine
+	for HOST_HPPABSD.
+	* hosts/hppabsd.h: Fix declarations of malloc and free.
+	* libhppa.h: Include sysdep here.  Conditionalize
+	includes based on HOST_HPPAHPUX or HOST_HPPABSD.
+	Provide definitions for MAXCOMLEN and _PA_RISC_ID suitable
+	for BSD.
+
+Fri Apr 30 17:34:11 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* elf32-hppa.c: Don't include a.out.h.  Apparently not even the
+	GNU version is needed.
+
+Fri Apr 30 09:38:59 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* coffcode.h: use dummy_reloc16_extra_cases rather than casting abort.
+
+Thu Apr 29 11:30:32 1993  Ken Raeburn  (raeburn@deneb.cygnus.com)
+
+	* Makefile.in: Build elf32-hppa.o.
+
+	* syms.c (BSF_FUNCTION): New symbol flag.
+
+	* elf32-hppa.c: Fixed to work with elf32-target.h.
+
+	* hp300hpux.c (NAME, NAME_swap_exec_header_in): Fix for
+	traditional C.
+	* libaout.h (NAME): Don't define if already defined.
+
+	* libelf.h: Protect against multiple inclusions.
+	(elf_symbol_type): Moved here, added new fields.
+	(struct elf_backend_data): New field `global_sym'; I suspect this
+	may be misplaced.
+	* elf32.c (elf_symbol_type): Deleted from here.
+	(struct elf_obj_tdata): New fields raw_syms and internal_syms, to
+	point to backend versions of symbols.
+	(obj_symbols, obj_raw_syms, obj_internal_syms): New macros.
+	(elf_swap_phdr_out, elf_build_phdrs, elf_write_phdrs): New
+	functions.
+	(elf_write_object_contents): Write program headers if appropriate.
+	(bfd_section_from_shdr): Unnamed sections get empty string for
+	name, not "unnamed".  Handle SHT_NOBITS separately from
+	SHT_PROGBITS, and set some different flags.
+	(elf_file_p): New routine.
+	(elf_object_p, elf_core_file_p): Call it.
+	(elf_object_p): Handle EM_HPPA.
+	(elf_symbol_from, elf_idx_of_sym): New functions.
+	(elf_make_sections): Get symbol number right for relocations.  Set
+	SHF_ALLOC, SHF_WRITE, SHF_EXECINSTR when appropriate.
+	(elf_fake_sections): BSS section should be SHT_NOBITS, not
+	SHT_PROGBITS.  Always generate symtab and strtab, not only if
+	relocations are needed.  Set SHF_* flags as appropriate.
+	(elf_compute_section_file_positions): Handle bfd_arch_hppa.
+	(elf_write_object_contents): Fix off-by-one error in symbol count.
+	Store a correct value for the symbol; write the size field
+	properly; make some guesses about the type field.  Set section
+	type correctly for string tables.
+	(section_from_elf_index): Check for absolute and common sections
+	first.
+	(elf_section_from_bfd_section): Ditto.
+	(elf_slurp_symbol_table): Use elf_symbol_type instead of asymbol.
+	Use empty string instead of "unnamed" for nameless symbols.
+	Handle STTY_FUNC type, and weirdness with "$global$" symbol for
+	HPPA (only?).  Don't free raw symbols; keep the pointer around for
+	later.
+	(elf_set_arch_mach): Handle bfd_arch_hppa.
+	(elf_find_nearest_line): Just return false.
+	(elf_write_object_contents, elf_set_section_contents): Set
+	output_has_begun field after computing file positions.
+	(elf_set_section_contents): Write section contents immediately,
+	rather than caching the whole file and writing it at close time.
+
+	* libhppa.h (enum hppa_reloc_field_selector_type, enum
+	hppa_reloc_field_selector_typ_alt, enum hppa_reloc_expr_type, enum
+	hppa_reloc_expr_type_alt): New enumerator types.
+
+	* config/hppa-elf.mt,. config/hppaosf.mh: HP PA/OSF support.
+	* configure.in, configure.host: Use them.
+
+Wed Apr 28 23:21:01 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* elf32-target.h: Allow overrides of armap defaults.
+
+	* elf32-hppa.c, elf32-hppa.h: New files.
+
+	* config/hp300hpux.mt: New file.
+
+Tue Apr 27 05:39:40 1993  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+	* aix386-core.c (NO_GETS): New macro; NO_GET for signed values.
+	(aix386_core_vec): Update for new fields.
+
+	* archive.c (bfd_generic_archive_p): Call target-specific
+	slurp_armap code, instead of bfd_slurp_armap.
+	(bfd_slurp_bsd_armap_f2): New function.
+	* libbfd-in.h (bfd_slurp_bsd_armap_f2): Declare it.
+	* aout-target.h (AR_PAD_CHAR): Define it if not already defined.
+	(vec): Use it.
+	* libaout.h (struct aoutdata): New field for subformat, for
+	differentiating between highly similar a.out formats.
+	* aoutx.h (NAME_swap_exec_header_in): New macro, defaults to local
+	version of function.
+	(swap_exec_header_in): Don't define if NAME_swap_exec_header_in is
+	already defined.
+	* hp300hpux.c: New file.
+	* Makefile.in: Include it.
+
+Mon Apr 26 13:24:43 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* Makefile.in, archures.c, coffcode.h, targets.c: Support for
+	Hitachi SH.
+
+Mon Apr 26 13:55:42 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* trad-core.c (trad_unix_core_file_p): Check the file size.
+
+Mon Apr 26 13:24:43 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* coff-alpha.c: Remove duplicate function and add warnings.
+
+Mon Apr 26 11:25:58 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* sco-core.c (sco_core_vec): Add initializers for new target
+	fields.
+
+Sat Apr 24 21:33:45 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* coffcode.h [_LIT]: Recognize .lit section.
+
+Fri Apr 23 19:00:36 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* coff-alpha.c, cpu-alpha.c, config/alphaosf.mt,
+	config/alphaosf.mt, hosts/alphaosf.h:  New files.
+
+Fri Apr 23 16:48:46 1993  Stu Grossman  (grossman@cygnus.com)
+
+	* Merge in HPPA/BSD changes from Utah.
+	* hppa.c:  Use this for both HPUX & BSD.
+	* targets.c:  Enable hppa_vec for both HPUX & BSD.
+	* config/hppabsd.mt:  TDEFINES => TDEFAULTS.
+	* hosts/hppabsd.h:  #define HOST_HPPABSD.
+
+Wed Apr 21 01:50:10 1993  John Gilmore  (gnu@cygnus.com)
+
+	* libbfd.c:  Whitespace changes around byteswap macros.
+	* libbfd-in.h:  Whitespace changes around byteswap declarations.
+
+Tue Apr 20 15:59:07 1993  Stu Grossman  (grossman@cygnus.com)
+
+	* aoutf1.h (sunos4_core_file_p):  Don't default bfd_error to
+	system_error anymore.  It confuses bfd_check_format().
+
+Mon Apr 19 23:03:08 1993  Stu Grossman  (grossman@cygnus.com)
+
+	* bfd.c:  Add sgi_core_data to tdata union.
+	* coff-mips.c:  Add Irix 4.x core file support.
+	* hosts/irix4.h:  #define HOST_IRIX4.
+
+Mon Apr 19 18:52:52 1993  Ken Raeburn  (raeburn@deneb.cygnus.com)
+
+	* aoutx.h (translate_from_native_sym_flags): Check that the
+	symbol's section does get set.
+	(slurp_symbol_table): Zero index means null-string name.
+
+	* aoutx.h (struct stringtab_entry, struct stringtab_data): New
+	data structures.
+	(hash, stringtab_init, add_to_stringtab, emit_strtab, compare):
+	New functions.
+	(write_syms): Use them, to reduce string table size.
+
+Mon Apr 19 16:45:12 1993  Fred Fish  (fnf@cygnus.com)
+
+	* trad-core.c (trad_core_vec):  Add 6 new initializers to match
+	  new signed get/put fields.  Minor reformatting to label
+	  some fields.
+
+Mon Apr 19 06:09:41 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* bfd-in.h: Insert comment about SVR3 compiler warnings.
+
+	* hosts/{hp300,i386isc,i386v}.h: Remove unused #defines of {r,}index
+	(bfd uses strchr and the broken SVR3.2 cpp loses with the defines).
+
+	* libbfd.c: bfd_put*: Remove casts to bfd_vma.
+
+Fri Apr 16 17:49:27 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* aoutf1.h (internal_sunos_core): Make c_stacktop a bfd_vma.
+	(swapcore_sparc): Make sp a bfd_vma.
+
+Thu Apr 15 09:09:18 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* libbfd.c: Add signed versions of bfd_{h_,}{get,put}_signed_<size>.
+	libbfd.c, libbfd-in.h: Add _do*signed*.
+	targets.c, all targets: Add bfd*signed*.
+	bfd-in.h: Add bfd_signed_vma.  Add comments.
+
+	* bfd-in.h (bfd_error), bfd.c (bfd_errmsgs): Add file_truncated.
+
+	* format.c (bfd_check_error): Check error return from
+	_bfd_check_format routines.
+
+Wed Apr 14 23:48:25 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* rs6000-core.c (rs6000coff_core_p): Improve error checking and
+	recognize .data section if present.
+
+Thu Apr 15 01:00:29 1993  John Gilmore  (gnu@cygnus.com)
+
+	* aoutx.h (aout_*_adjust_sizes_and_vmas):  Avoid `sanity'
+	check for the case where the user sets the address of the BSS
+	section (and the file header can't specify this).  Let the user
+	set it wherever they want, regardless of what goes in the header.
+
+	* ieee.c (ieee_slurp_sections):  Pass all ieee section names
+	straight through into BFD sections.  Add comments.
+
+Wed Apr 14 20:34:54 1993  John Gilmore  (gnu@cygnus.com)
+
+	Cleanup in preparation for better 64-bit host support.
+
+	* bfd-in.h (bfd_64_type):  Remove.
+	* libbfd.c (_do_getb64, _do_putb64):  Use bfd_vma, not bfd_64_type.
+
+	* bfd-in.h (bfd_size):  Remove.
+
+	* bfd-in.h (bfd_offset):  Remove, after fixing ld/ldlang.[ch].
+
+	* bfd-in.h (bfd_word):  Remove.
+	* reloc.c (reloc_howto_type):  Replace bfd_word with bfd_vma.
+
+	* bfd-in.h (rawdata_offset):  Remove.
+	* reloc.c (arelent):  Replace rawdata_offset with bfd_size_type.
+	(bfd_perform_relocation):  Lint.
+	(enum bfd_reloc_status):  Comment cleanup.
+
+	* aout-adobe.c, cpu-h8300.c, mipsbsd.c, srec.c: lint -Wall.
+
+Tue Apr 13 11:19:52 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* aoutf1.h (swapcore_sparc): Guess the right value of USRSTACK.
+
+Mon Apr 12 14:18:00 1993  John Gilmore  (gnu@cygnus.com)
+
+	* elf32.c:  Clean up old comments.
+
+Fri Apr  9 10:43:20 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* config/sun3.h: String argument to fprintf is const.
+
+	* coff-mips.c: Renamed PAGE_SIZE to ROUND_SIZE, to avoid confusion
+	on systems which define PAGE_SIZE in <limits.h>.
+
+Thu Apr  8 10:28:00 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* trad-core.c (trad_unix_core_file_failing_signal): Use new macro
+	TRAD_UNIX_CORE_FILE_FAILING_SIGNAL to allow host files to specify
+	the core file failing signal.
+	* hosts/decstation.h (TRAD_UNIX_CORE_FILE_FAILING_SIGNAL): Define
+	to supply the core file failing signal.
+
+Thu Apr  8 09:17:35 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coffcode.h (styp_to_sec_flags): Only set SEC_SHARED_LIBRARY for
+	a STYP_NOLOAD | STYP_BSS section if BSS_NOLOAD_IS_SHARED_LIBRARY
+	is defined.  On many COFF targets STYP_BSS is always STYP_NOLOAD.
+	* coff-i386.h (BSS_NOLOAD_IS_SHARED_LIBRARY): Define.
+
+Wed Apr  7 11:33:06 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coff-mips.c (PAGESIZE): Correct value.
+
+Tue Apr  6 12:05:44 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coff-mips.c (ecoff_find_nearest_line): Address of first PDR is
+	an offset (patch from Jean-Daniel Fekete <jdf@lri.lri.fr>).
+
+Mon Apr  5 12:07:12 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coffcode.h (styp_to_sec_flags): Set SEC_SHARED_LIBRARY for a
+	STYP_NOLOAD | STYP_BSS section.  Don't set SEC_NEVER_LOAD for a
+	STYP_INFO section.
+	(coff_compute_section_file_positions): Force vma and lma of _LIB
+	section to be zero.
+	(coff_set_section_contents): Count number of entries in new lma
+	field, not in vma.
+	* coffgen.c (make_a_section_from_file): Force lineno_count of
+	SEC_SHARED_LIBRARY section to be zero, since it is non-zero on the
+	SCO 3.2v4 shared library.
+	* seclet.c (rel): Copy over any section with contents, not just
+	loadable sections.
+
+	* coff-mips.c (ecoff_make_empty_symbol): Zero out newly allocated
+	symbol.
+
+	* coff-i386.c (coff_i386_reloc): New function, to generate
+	relocateable output correctly.
+	(howto_table): Use coff_i386_reloc for all reloc types.
+	(CALC_ADDEND): Use a more efficient hack to get the correct addend
+	for a common symbol.
+	(i386comm_value): Removed; no longer needed.
+
+Sun Apr  4 15:08:48 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* coffcode.h (coff_set_section_contents): Don't write out
+	sections without a filepos.
+
+Fri Apr  2 14:35:05 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* seclet.c (seclet_dump_seclet): Correct SEC_HAS_CONTENTS test.
+
+Wed Mar 31 17:41:05 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* reloc.c (bfd_reloc_code_real_type): Added BFD_RELOC_MIPS_GPREL.
+	* libecoff.h (ecoff_data_type): Added gp_size field.
+	* coff-mips.c (ecoff_mkobject_hook): Initialize gp_size to 8.
+	(ecoff_set_symbol_info): Compare against gp_size, not hardcoded 8.
+	Set flags to 0 for large common symbols.
+	(ecoff_gprel_reloc): Handle non-zero addend for external symbols,
+	which can occur for gas-generated relocs.
+	(ecoff_bfd_reloc_type_lookup): Added BFD_RELOC_MIPS_GPREL case.
+	* bfd.c (bfd_get_gp_size, bfd_set_gp_size): New functions.
+	* Makefile.in (bfd.o): Now depends on coff/sym.h and libecoff.h.
+
+Tue Mar 30 09:33:16 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* srec.c (srec_set_section_contents): Use lma field for load
+	address.
+	* section.c: Add declaration of lma field to section structure.
+	* coffcode.h (coff_write_object_contents): Use lma field for load
+	address.
+	* bfd-in.h (bfd_set_section_vma): Set lma along with vma.
+
+	* aoutx.h (translate_from_native_sym_flags): Now handles indirect
+	symbols in a better way. (translate_to_native_sym_flag): Set the
+	N_INDR bit when necessary. (aout<>slurp_symbol_table): Maintain
+	indirect state.
+	* section.c: Added BFD_IND_SECTION_NAME and bfd_ind_section.
+	(bfd_make_section): Cope with new builtin section.
+	* syms.c (bfd_decode_symclass): Can now print indirect section
+	info.
+
+Wed Mar 24 13:36:33 1993  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* aout-target.h (MY(object_p)):  Fail if MACHTYPE_OK is
+	defined, and yields false.
+	* aout-mipsbsd.c, i386bsd.c:  Define MACHTYPE_OK appropriately.
+
+	* archive.c (snarf_ar_hdr):  Add support for reading (only,
+	so far) BSD-4.4-style extended headers.
+	* archive.c:  Some more comments.
+
+Wed Mar 24 02:05:10 1993  david d `zoo' zuhn  (zoo at poseidon.cygnus.com)
+
+	* Makefile.in: fix rule for dvi and info, so that the recursive
+	makes does the right thing, instead of always info
+
+Wed Mar 24 02:56:44 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* libbfd.c (bfd_seek): Disable optimized handling for archives and
+	archive members; they need more special reatment.  For now, verify
+	that computed and actual file positions correspond.
+
+Tue Mar 23 08:45:33 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* mipsbsd.c: Renamed from aout-mipsbsd.c.
+	(set_arch_mach): Delete non-MIPS code.
+	(reloc_howto_type_lookup): Ditto.
+	* Makefile.in: Adjusted.
+
+	* libbfd.c (bfd_tell): Update `where' field.
+	(bfd_seek): Don't do anything if we're not changing the file
+	position.  If FILE_OFFSET_IS_CHAR_INDEX is defined, check `where'
+	field against a SEEK_SET request.  Call bfd_tell to re-update
+	`where' field when done.
+	(bfd_read, bfd_write) [FILE_OFFSET_IS_CHAR_INDEX]: Maintain
+	`where' field.
+	* hosts/sparc.h: Define FILE_OFFSET_IS_CHAR_INDEX.
+
+Mon Mar 22 23:18:10 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: added installcheck target
+
+Mon Mar 22 14:57:18 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coff-mips.c (ecoff_set_symbol_info): Relocate encapsulated stabs
+	if the type is not stNil.
+
+Tue Mar 16 10:35:27 1993  Ken Raeburn  (raeburn@cygnus.com)
+
+	* elf32.c (elf_little_vec, elf_big_vec): Delete now-invalid
+	forward declarations.
+
+	* elf32-sparc.c (elf_sparc_howto_table): Don't use CONST here,
+	it's implied by the type.
+
+Fri Mar 12 18:58:08 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.host: recognize sparc-sun-solaris2* instead of sparc-sun-solaris*
+
+Tue Mar  9 09:23:12 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* rs6000-core.c: Add .ldinfo section.
+
+Fri Mar 12 11:57:52 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (MAKEOVERRIDES): Define to be empty.
+
+Fri Mar 12 08:32:11 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* section.c (bfd_set_section_contents): whitespace
+	* seclet.c (seclet_dump_seclet): Don't try and fill sections with
+	no contents.
+
+Thu Mar 11 19:26:15 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* hosts/go32.h: don't define POSIX_UTIME
+
+Tue Mar  9 10:52:01 1993  Fred Fish  (fnf@cygnus.com)
+
+	* elf32.c (elf_object_p):  Use ELF_ARCH stored in xvec to match
+	against machine architecture stored in the ELF header, to resolve
+	ambiguities.
+	* elf32.c (bfd_section_from_shdr):  Bfd_make_section can return
+	NULL, so only use results when non-NULL.
+	* targets.c (elf32_m68k_vec, elf32_i860_vec):  Add extern decls
+	and add to vector of targets.
+
+Mon Mar  8 15:13:44 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coff-mips.c (ecoff_set_symbol_info): Encapsulated STABS symbols
+	are always just debugging symbols.
+
+	* coff-mips.c (ecoff_[gs]et_sym_index): Moved macros from here...
+	libecoff.h (ecoff_[gs]et_sym_index): ...to here.
+
+Mon Mar  8 14:55:13 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* hppa.c (_PA_RISC_ID): Defined if not already defined (e.g., for
+	hpux 7).  Patch from friedman@gnu.ai.mit.edu.
+	(hppa_object_p): Only check for DL_MAGIC and SHL_MAGIC if they're
+	defined, which they aren't in hpux 7.0.
+
+	* aix386-core.c: Include uinfo.h and coredump.h.  Patch from Minh
+	Tran-Le, tranle@intellicorp.com.
+
+Fri Mar  5 14:54:21 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coff-mips.c (ecoff_generic_reloc): If the addend is non-zero, go
+	ahead and do the relocation.
+	(ecoff_refhi_reloc): Don't to the relocation here, just remember
+	what needs to be done.
+	(ecoff_reflo_reloc): Do the REFHI relocation here.
+
+Thu Mar  4 14:44:01 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coff-mips.c (ecoff_bfd_reloc_type_lookup): New function.
+	(ecoff_write_object_contents): Added BFD_ASSERT calls to ensure
+	relocs are reasonable.
+	* coff-msym.c: Eliminated uses of DEFUN.
+	(ecoff_swap_tir_out): New function.
+
+Tue Mar  2 17:52:58 1993  Fred Fish  (fnf@cygnus.com)
+
+	(Ultrix 2.2 support from Michael Rendell <michael@mercury.cs.mun.ca>)
+	* configure.host (vax-*-ultrix2*):  Add triplet.
+	* hosts/vaxult2.h:  New file.
+	* config/vaxult2.mh:  New file.
+
+	* aoutx.h (string.h):  Include for strchr and friends.
+	* archive.c (string.h):  Include for memchr and friends.
+	* elf32.c (string.h):  Include for strrchr and friends.
+
+Sat Feb 27 00:44:24 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* aoutf1.c (sunos4_reloc_type_lookup): Unused; deleted.
+	(MY_set_sizes): Use sunos4_set_sizes.
+
+	* elf32.c: Renamed from elf.c.  Several CPU-specific functions
+	deleted, as well as elf-big and elf-little targets.
+	* libelf.h: New file.
+	* elf32-sparc.c, elf32-i386.c, elf32-i860.c, elf32-m68k.c: New
+	files, new targets.
+	* Makefile.in, config/*-elf.mt, targets.c: Adjusted.
+
+	* i386linux.c (TARGETNAME): Use hyphens instead of parentheses.
+
+	* coffcode.h (coff_compute_section_file_positions): Don't need
+	variable "old_sofar" if compiling for i960.
+
+	* reloc.c (bfd_default_reloc_type_lookup): First argument is now a
+	bfd pointer.
+	* libbfd.h: Updated.
+
+	* ieee.c (exten, envi): "static" belongs first in declaration.
+
+Fri Feb 26 17:37:34 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* srec.c: add support for symbolsrec, srecords with symbols in
+	them.
+
+Thu Feb 25 11:43:30 1993  John Gilmore  (gnu@cacophony.cygnus.com)
+
+	* ieee.c:  cast all arguments of ieee_write_byte to bfd_byte
+	to avoid lint complaints.
+
+Thu Feb 25 02:15:52 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* elf.c (elf_write_object_contents): Section ".shstrtab" should be
+	type SHT_STRTAB.  Don't alter file offset for section 0.
+	(reloc_type_names): Now an array instead of a macro.  Still inside
+	"#if 0", since it's used only in debugging code also in "#if 0".
+	(struct elf_reloc_map_elt, struct elf_reloc_map): New types.
+	(sort_reloc_map): New function.
+	(sparc_reloc_map): New variable.
+	(elf_bfd_reloc_type_lookup): New function.
+
+Tue Feb 23 12:17:16 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* bfd-in.h (JUMP_TABLE): Added bfd_reloc_type_lookup and
+	bfd_make_debug_symbol; they were already in the target structure.
+	* Adjusted all uses of JUMP_TABLE.
+	* coffgen.c, libcoff-in.h (coff_bfd_make_debug_symbol): Renamed
+	from coff_make_debug_symbol.
+	* libcoff.h: Updated accordingly.
+
+	* Minor cleanups provoked by gcc warnings:
+	* aoutx.h (NAME(aout, reloc_type_lookup)),
+	cpu-h8300.c (local_bfd_reloc_type_lookup),
+	cpu-z8k.c (local_bfd_reloc_type_lookup): Added default case to
+	switches.
+	* archive.c (do_slurp_bsd_armap, do_slurp_coff_armap),
+	ieee.c (ieee_slurp_section_data),
+	elf.c (elf_make_sections, elf_fake_sections,
+	elf_compute_section_file_positions, elf_write_object_contents):
+	Removed unused variables.
+	* archures.c: Removed /* from within comment.
+	* bout.c (b_out_squirt_out_relocs): Initialize r_extern.
+	* oasys.c (oasys_write_data): Initialize i.
+
+Mon Feb 22 18:40:06 1993  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* libcoff.h (obj_raw_syment_coun):  New macro.
+	* coffgen.c (coff_get_normalized_symtab):  Initialize
+	raw_syment_count.
+	* coffgen.c (coff_find_nearest_line):  Numerous little fixes.
+
+Mon Feb 22 15:03:07 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coff-mips.c (ecoff_set_symbol_info): stBlock symbols are always
+	debugging symbols.
+	(ecoff_get_debug): Offset the fdr adr by the adr of the first pdr,
+	for compatibility with tools from MIPS.
+
+	* config/bigmips.mt: New file; default vector is ecoff_big_vec.
+	* config/irix3.mt, config/irix4.mt: Removed.
+	* configure.in (mips-*-ecoff): New target; uses bigmips.mt.
+	(mips-sgi-*, mips-big-*): Use bigmips rather than irix3.
+
+Wed Feb 17 23:40:41 1993  John Gilmore  (gnu@cygnus.com)
+
+	* hosts/hp300bsd.h:  Add gross hack to determine whether we
+	are running on BSD 4.3 or BSD 4.4, and use appropriate include
+	files (and set other parameters) to match.
+
+Wed Feb 17 12:28:13 1993  K. Richard Pixley  (rich@cygnus.com)
+
+	* trad-core.c (trad_unix_make_empty_symbol): wrap PARAMS around an
+	  ansi definition which otherwise confuses non-ansi compilers.
+
+	* aout-adobe.c (aout_adobe_object_p): eliminate a warning from vax
+	  ultrix cc by forward declaring getenv as is done in
+	  bfd_find_target.
+
+Tue Feb 16 17:56:58 1993  K. Richard Pixley  (rich@cygnus.com)
+
+	* elf.c (elf_info_to_howto): cast an enum into unsigned char
+	  avoiding a fatal error in vax ultrix 4.2 cc.
+
+Tue Feb 16 00:44:54 1993  John Gilmore  (gnu@cygnus.com)
+
+	* bfd-in.h, VERSION:  Roll to version 2.1.
+
+Mon Feb 15 20:43:51 1993  John Gilmore  (gnu@cygnus.com)
+
+	* oasys.c (oasys_write_object_contents):  Lint.
+	* srec.c:  Whitespace cleanup.
+
+Fri Feb 12 14:23:07 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coffgen.c (coff_print_symbol): Print correct tagndx value;
+	cleaned up output formatting a bit.
+
+Fri Feb 12 08:28:56 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* coffcode.h (coff_set_arch_mach_hook): *FIXME* the H8/300 is always
+	relaxable.  Should be moved somewhere else.
+
+Thu Feb 11 14:09:42 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* aout-mipsbsd.c: Eliminated uses of DEFUN.
+	(aout_mips_*_vec): Added seclet_link element.
+
+	* Makefile.in (BFD_BACKENDS, CFILES, aout-mipsbsd.o): Added
+	support for aout-mipsbsd target.
+
+	* bout.c (get_value): Don't truncate 32-bit addend to 16 bits.
+
+Fri Feb  5 08:08:43 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* cpu-h8500.c (scan_mach): return false if it's not an H8/500
+
+Thu Feb  4 12:52:40 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	Add support for the H8/500
+
+	* coff-h8500.c, cpu-h8500.c, archures.c, coffcode.h, targets.c
+
+Thu Feb  4 12:35:02 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* libecoff.h: New file.  Defines ECOFF backend data for gdb.
+	* coff-mips.c: Now includes libecoff.h.
+	(ecoff_data_type): Moved to libecoff.h.
+	(ecoff_slurp_symbolic_info): Made globally visible so that gdb can
+	call it.  If there is ever another ECOFF target, this and the
+	swapping functions should be accessed via an ECOFF specific target
+	vector.
+	* Makefile.in (coff-mips.o): Depends on libecoff.h.
+
+Wed Feb  3 09:14:36 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coffcode.h: Removed MIPS specific information, since coff-mips.c
+	no longer includes this file.
+
+	* coff-msym.c (ecoff_swap_fdr_in, ecoff_swap_ext_in): Set reserved
+	bits to 0 to make comparison test useful.
+
+	* config/irix3.mh, config/irix4.mh (HDEFINES): Set to -G 4 to
+	avoid overflowing GP accessible sections in binutils/objdump.
+
+Tue Feb  2 15:36:55 1993  Per Bothner  (bothner@cygnus.com)
+
+	* aoutx.h (NAME(aout,slurp_symbol_table)):  Made symbol
+	reading more robust:  Fail if string index is out of string
+	table range.
+
+Tue Feb  2 11:43:25 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* bout.c (b_out_get_relocated_section_contents, cases PCREL24 and
+	PCREL13): Don't take dst_address into account; the input file has
+	already taken care of that.
+
+Tue Feb  2 11:41:06 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coff-mips.c: Completed support for linker and binutils.
+
+Mon Feb  1 14:45:38 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* bout.c (b_out_get_relocated_section_contents, case ABS32): Keep
+	original addend from section contents.
+
+Thu Jan 28 21:01:37 1993  John Gilmore  (gnu@cygnus.com)
+
+	Fix minor bugs reported by Carl Greco, <cgreco@parrot.creighton.edu>:
+	* hosts/delta88.h (strtol):  Fix prototype.
+	* config/m88k-coff.mt (SELECT_ARCHITECTURES):  Fix name.
+
+Wed Jan 27 17:16:51 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* elf.c: Get rid of "#ifdef sparc".
+	(RELOC_TYPE_NAMES): Never used (currently), so don't include it.
+	(elf_sparc_howto_table): Renamed from elf_howto_table, and always
+	used.
+	(elf_info_to_howto): Use runtime conditionals on CPU type, not
+	compile type conditionals on host CPU.
+	(elf_little_vec, elf_big_vec): Use bfd_default_reloc_type_lookup,
+	not null pointer.
+	(reloc_type, RELOC_TYPE_NAMES): Include i386 values.
+
+Tue Jan 26 11:43:14 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* section.c (SEC_IS_COMMON): New section flag, needed for MIPS
+	ECOFF which has two common sections.
+	(bfd_com_section): Set SEC_IS_COMMON flag.
+	* bfd-in.h (bfd_is_com_section): New macro to test SEC_IS_COMMON.
+	* aoutx.h, archive.c, bout.c, coff-a29k.c, coff-m88k.c,
+	coff-mips.c, coffgen.c, ieee.c, oasys.c, reloc.c, syms.c: Use
+	bfd_is_com_section macro rather than checking for equality to
+	bfd_com_section.
+
+Mon Jan 25 15:27:36 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coffcode.h (_bfd_coff_mkobject_hook): Pass aouthdr argument.
+	(coff_mkobject_hook): Accept aouthdr argument.
+	* coffgen.c (coff_real_object_p): Pass aouthdr to mkobject_hook.
+	Handle NULL aouthdr argument.
+	(coff_object_p): If there is no aouthdr, pass it as NULL to
+	coff_real_object_p.
+	* libcoff.h: Rebuilt for mkobject_hook changes.
+
+	* coffswap.h (coff_swap_aouthdr_in, coff_swap_aouthdr_in): Swap
+	additional MIPS ECOFF fields.
+
+Sat Jan 23 18:36:20 PST 1993  Ralph Campbell  (ralphc@pyramid.com)
+
+	* configure.host: added mips-dec-bsd*
+	* configure.in: added mips-dec-bsd*
+	* aout-mipsbsd.c: new file for mips-dec-bsd*
+	* aout-target.h: don't define '' if 'MY_BFD_TARGET' is defined.
+	* aoutx.h: added mips support.
+	* archures.c: added mips support to bfd_default_scan().
+	* cpu-mips.c: added support for R4000 (untested).
+	* libaout.h: added MIPS1 & MIPS2 magic numbers.
+	* reloc.c: fix typo's in comments. Added BFD_RELOC entries which I
+		hope will make it into include/bfd.h.
+	* targets.c: added aout_mips_*_vec.
+
+Wed Jan 20 17:15:52 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* config/decstation.mt: Set DEFAULT_VECTOR to ecoff_little_vec.
+
+Tue Jan 19 09:06:14 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* bfd-in.h (bfd_asymbol_value): Add needed parentheses.
+
+	* libcoff-in.h: Update prototype for coff_count_linenumbers.
+
+Fri Jan 15 18:13:17 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* coff-msym.c (ecoff_swap_hdr_out, ecoff_swap_fdr_out,
+	ecoff_swap_pdr_out, ecoff_swap_sym_out, ecoff_swap_ext_out,
+	ecoff_swap_rndx_out, ecoff_swap_rfd_out, ecoff_swap_opt_in,
+	ecoff_swap_opt_out, ecoff_swap_dnr_in, ecoff_swap_dnr_out): New
+	functions.
+	* coffswap.h: If NO_COFF_RELOCS is defined, don't define
+	bfd_swap_reloc_in or coff_swap_reloc_out.
+	* coff-mips.c: Added code to link and write out symbolic debugging
+	information, and to swap relocs in and out.
+
+Thu Jan 14 15:51:58 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* libcoff.h, coffgen.c (coff_count_linenumbers), coffcode.h
+	(coff_write_object_contents): coff_count_linenumbers returns the
+	number of line number records it found.
+
+	* coffgen.c (coff_write_linenumbers): only write out line numbers
+	in the section they belong to.
+
+Mon Jan 11 18:32:22 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* targets.c (bfd_target): Added relocateable argument to
+	_bfd_get_relocated_section_contents.  Added _bfd_seclet_link
+	target vector for linker use.
+	* bfd.c (bfd_seclet_link): New macro.
+	* bfd-in.h (JUMP_TABLE): Added _bfd_seclet_link.
+	* seclet.c (rel, seclet_dump_seclet): Added relocateable argument
+	and boolean return value.  Made static.
+	(bfd_generic_seclet_link): Renamed from seclet_dump.  Added
+	relocateable argument.
+	* reloc.c (bfd_generic_get_relocated_section_contents): Added
+	relocateable argument (if relocateable, saves relocs).
+	* bout.c (b_out_get_relocated_section_contents),
+	reloc16.c (bfd_coff_reloc16_get_relocated_section_contents): Added
+	relocateable argument (if relocateable, just calls
+	bfd_generic_get_relocated_section_contents).
+	* libcoff-in.h (bfd_coff_reloc16_get_value): Added relocateable
+	argument to prototype.
+	* All targets: Set new _bfd_seclet_link vector to
+	bfd_generic_seclet_link.
+
+Sat Jan  9 21:29:32 1993  Stu Grossman  (grossman at cygnus.com)
+
+	* coffgen.c:  #include seclet.h.
+
+Sat Jan  9 19:48:14 1993  Stu Grossman  (grossman at cygnus.com)
+
+	* hppa.c (hppa_object_setup):  Get rid of all knowledge of stabs
+	debug info.  Setup info about linker symbols only, and use
+	standard bfd fields to hold the info.
+	* (hppa_object_p):  Remove unneeded decls.
+	* (hppa_new_section_hook):  Get rid of most of this.
+	* libhppa.h (struct hppadata):  Remove ten pounds of useless ugly
+	fat.  Remove all knowledge of stabs, remove redundant knowledge of
+	linker symbols.
+	* Remove macros for accessing fields which are now gone.
+
+Fri Jan  8 15:20:00 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* coffcode.h (sec_to_styp_flags): allow SEC_NEVER_LOAD to turn on
+	STYP_NOLOAD bit.
+	* coff-z8k.c: delete unused reloc functions
+
+Fri Jan  8 15:47:53 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* bfd.c (struct _bfd): Added ecoff_tdata to tdata union.
+	* targets.c (enum target_flavour): Added bfd_target_ecoff_flavour.
+	* coff-msym.c: Use DEFUN for function definitons.
+	* coff-mips.c: Added code to read and print symbols, and to find
+	line numbers.
+
+	* coffcode.h: Moved many generic functions into coffgen.c.  Moved
+	swapping functions into coffswap.h for ECOFF use.  Moved
+	relocation functions, only used by h8300 and z8k, into reloc16.c.
+	Added hooks for coffgen.c functions to backend data structure, and
+	added hook functions.  Still more could be done.
+	* coffswap.h: New file to hold COFF swapping routines.
+	* coffgen.c: New file to hold generic COFF functions.
+	* reloc16.c: New file to hold h8300 and z8k specific relocation
+	functions.
+	* libcoff-in.h: Added declarations for functions in coffgen.c.
+	* libcoff.h: Rebuilt to incorporate changes.
+	* coff-h8300.c: Function name changes.
+	* coff-z8k.c: Function name changes.  Use coff_reloc16_extra_cases
+	hook rather than defining EXTRA_CASES.
+	* Makefile.in: Build new files coffgen and reloc16.  Added
+	dependencies of coff-*.o on coffswap.h and seclet.h.
+
+Thu Jan  7 16:16:26 1993  Per Bothner  (bothner@cygnus.com)
+
+	* ieee.c (ieee_slurp_sections):  Add cast to avoid warning
+	about discarding const.
+
+Wed Jan  6 00:16:49 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* archive.c, seclet.c, elf.c use bfd_xmalloc instead of malloc
+
+Tue Jan  5 09:35:57 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* configure.in (post-target): If --with-minimal-bfd is specified,
+	set MINIMIZE=1.
+
+Mon Jan  4 07:20:01 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* srec.c (srec_write_records): one of my boards wants a CR between
+	records.
+
+Wed Dec 30 12:46:30 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* archive.c (do_slurp_coff_armap): set symdef_count correctly
+	(it broke a couple of weeks ago).
+
+Tue Dec 29 21:41:05 1992  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* elf.c (bfd_elf_find_section): Switch back to "struct ..." for
+	return type, so libbfd.h doesn't reference undefined typedefnames.
+
+Tue Dec 29 13:54:35 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coffcode.h (coff_real_object_p): use name I386AIXMAGIC rather
+	than I386SVMAGIC.
+	(coff_pointerize_aux): don't pointerize a negative tagndx
+	(sometimes generated by SCO 3.2v4 cc).
+
+	* bout.c (calljx_callback, callj_callback,
+	b_out_get_relocated_section_contents): warn if relocating against
+	an undefined symbol.
+
+Mon Dec 28 14:30:55 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* hppa.c:  Get rid of DEFUN, use more conventional prolog stuff.
+	Make a bunch more routines be static.
+	* hppa.c (fill_spaces):  Get rid of this, replace with much better
+	written setup_sections().
+	* (setup_sections):  New routine to create BFD sections for each
+	space and subspace in SOM files.
+	* (hppa_object_setup):  Use BFD sections created by
+	setup_sections() to locate GDB symbol table info.
+	* (make_unique_section):  New routine to create a BFD section.  It
+	ensures that the given name is unique, and will generate a unique
+	one if necessary.
+	* (hppa_object_p):  Become much more paranoid about file header.
+	* (make_bfd_asection):  Call bfd_make_section to do the dirty
+	work.  Simplify code somewhat.
+	* (hppa_core_file_p):  Use proper name for stack section.
+	* libhppa.h:  Remove millicode_start, millicode_end decls.
+
+Mon Dec 28 11:03:22 1992  Ken Raeburn  (raeburn@cygnus.com)
+
+	* Makefile.in (coff-we32k.o, coff-z8k.o): Note dependencies.
+
+	* reloc.c (bfd_perform_relocation): For normal 2- or 4-byte
+	relocs, don't bother doing the adjustment if the value to add is
+	zero.
+
+Sun Dec 27 17:45:05 1992  Fred Fish  (fnf@cygnus.com)
+
+	* bfd.c (bfd_get_size):  New function that gets an upper bound
+	on the possible size of any object in a bfd.
+	* elf.c (bfd_elf_find_section, elf_get_str_section,
+	elf_get_symtab_upper_bound):  Rewrite to avoid NULL pointer
+	dereferences.
+	* elf.c (elf_big_vec, elf_little_vec):  Document last three
+	members initialized to NULL.
+
+Thu Dec 24 17:49:09 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* hppa.c: change a 'const' to 'CONST', or else HP C compiler dies
+
+Mon Dec 21 16:33:34 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* hosts/std-host.h:  New file.  Attempt at a generic/default
+	set of definitions, to discourage porting to new hosts by copying.
+	* hosts/news.h:  Removed.
+	* hosts/sparc.h:  Use std-host.h.
+	* bfd-in.h:  New macros bfd_asymbol_bfd and bfd_asymbol_flavour;
+	perhaps we can later remove the the_bfd field from each symbol.
+	* syms.c (struct symbol_cache_entry):  Remove unused field
+	app_data.  Add comment noting that the_bfd is almost redundant,
+	but not quite.
+	* aoutx.h, coff-a29k.c, coff-i386.c, coff-i960.c, coffcode.h:
+	Use new macros bfd_asymbol_bfd and bfd_asymbol_flavour.
+	* hppa.c (fill_spaces):  Make slightly more rebust.
+	* configure.in:  Allow std-host as the "default" host.
+
+Mon Dec 21 17:24:13 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* bfd.c:  Add struct hppa_core_data to tdata union.
+	* hppa.c:  Conditionalize on HOST_HPPAHPUX instead of hp9000s800.
+	Get rid of HPPA/BSD specific code.  That will go somewhere else
+	someday.
+	* (fill_spaces):  Don't spin forever and die if you don't find
+	$MILLICODE$ subspace.
+	* (hppa_object_p):  Make sure that we have a real honest-to-cthulu
+	exec file!
+	* (hppa_core_file_failing_signal, hppa_core_file_failing_command):
+	Make these work for HPUX.
+	* (make_bfd_asection):  New routine to make section creation a
+	little easier.
+	* (hppa_core_file_p):  Completely rewrite, leave out bugs.
+	* libhppa.h:  #include the right system files.  Redefine all of
+	the structs/macros for hacking core files to use more sensible
+	HPUX core file structures.
+	* targets.c (target_vector):  Conditionalize hppa_vec on
+	HOST_HPPAHPUX, not hp9000s800.
+	* hosts/hppahpux.h:  #include stdlib.h to get correct decls for
+	malloc and realloc.  #define HOST_HPPAHPUX.
+
+Mon Dec 21 12:40:10 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Patches from Minh Tran-le <mtranle@paris.intellicorp.com>.
+	* configure.in (i386-*-isc*, i386-*-aix*): New targets.
+	* configure.host (i386-*-isc*, i386-*-aix*): New hosts.
+	* hosts/i386isc.h, config/i386isc.mh: New files for Interactive
+	Unix.
+	* hosts/i386aix.h, config/i386aix.mh: New files for AIX on PS/2.
+	* aix386-core.c: New file for handling core files on AIX on PS/2.
+	* targets.c: if AIX386_CORE, use aix386_core_vec.
+	* coffcode.h (coff_real_object_p): check for I386SVMAGIC as well
+	as I386MAGIC.
+
+Fri Dec 18 10:20:27 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* aoutf1.h (sunos4_write_object_contents): set flags to 0, fixing
+	1927.
+
+Thu Dec 17 19:35:32 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: added dvi target
+
+Thu Dec 17 00:36:24 1992  John Gilmore  (gnu@cygnus.com)
+
+	* bfd.c:  Use right name for tekhex tdata struct.
+	* tekhex.c:  Insert leading_char (0) into bfd_target struct.  Style.
+	* libcoff.h:  Updated to get spacing change from coffcode.h.
+	* trad-core.c:  leading_char is 0 (no symbols!), not '_'.
+
+Tue Dec 15 15:40:30 1992  Per Bothner  (bothner@cygnus.com)
+
+	* archive.c (do_slurp_bsd_armap, do_slurp_coff_armap):  New
+	functions, with the "guts" of the old bfd_slurp_bsd_armap
+	and bfd_slurp_coff_armap, but assuming we've already checked
+	if the armap is present or not.
+	Also, rewrite a bit to avoid keeping around obstack data
+	that we don't need.
+	* archive.c (snarf_ar_header, _bfd_slurp_extended_name_table):
+	Various fixes to correctly handle COFF_style archives names.
+	(Note that because these have a trailing '/', the names can
+	have embedded spaces.)
+	* archive.c (bfd_slurp_armap):  New function, replaces old
+	bfd_slurp_bsd_armap and bfd_slurp_coff_armap.  Recognizes
+	_either_ format, and calls do_slurp_bsd_armap or
+	do_slurp_coff_armap if either form of map is seen.
+	* libbfd-in.h:  Changed bfd_slurp_bsd_armap and
+	bfd_slurp_coff_armap into macro synonyms for bfd_slurp_armap.
+	* elf.c (elf_slurp_armap, elf_write_armap):  Fix.
+	* Makefile.in (AR_FLAGS):  Use rc instead of non-standard qc.
+
+Mon Dec 14 17:08:08 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* hppa.c:  #include "sysdep.h", not <sysdep.h>.
+	* libhppa.h:  Make millicode_start and millicode_end be unsigned
+	int to be same type as CORE_ADDR in GDB.  Why are these here?
+
+Sat Dec 12 15:54:36 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coff-i386.c (CALC_ADDEND): if reloc is PC relative, add the
+	vaddr of the section to the addend.
+	* targets.c: if MINIMIZE is 1, and SCO_CORE is defined, add
+	SCO_CORE to SELECT_VECS.
+	(target_vector): add sco_core_vec.
+	* sco-core.c (sco_core_vec): add leading underscore initializer.
+	* configure.in (i[34]86-*-sco*): use target i386-sco.
+	* config/i386-sco.mt: new file; define SCO_CORE.
+
+Thu Dec 10 02:13:15 1992  John Gilmore  (gnu@cygnus.com)
+
+	* aout-adobe.c (aout_adobe_object_p):  Fix !strcmp thinko.
+
+Fri Dec  4 14:02:49 1992  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* coffcode.h (bfd_coff_std_swap_table): Now static and const.
+
+Thu Dec  3 16:54:58 1992  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* hosts/i386linux.h: Include unistd.h.
+
+	* aoutx.h (print_symbol): aout_stab_name returns a constant
+	string.
+	* libaout.h (aout_stab_name): Fix prototype.
+	* stab-syms.c (aout_stab_names): Array is now const.
+	(aout_stab_name): Return value is now pointer to const.
+
+	* aoutx.h, archive.c, archures.c, coffcode.h, ctor.c, reloc.c,
+	syms.c: Doc fixes.
+
+	* syms.c (asymbol): Added new field "app_data", for data
+	particular to the application.  Some of the linker flags ought to
+	get moved to this field someday.
+
+	* archures.c (bfd_default_scan): Recognize a few more numbers:
+	80486, 80960, and 960.
+
+	* bfd-in.h (COFF_SWAP_TABLE): New is just address of
+	bfd_coff_std_swap_table, cast to PTR.
+	* bfd.c (bfd_coff_swap_*): Deleted macros.
+	* targets.c (struct bfd_target): Deleted COFF-specific swapping
+	routine pointers.
+	* coffcode.h (type bfd_coff_backend_data): New structure type,
+	contains pointers to the COFF-specific swapping routines.
+	(bfd_coff_std_swap_table): New data structure, to be used when
+	NO_COFF_SYMBOLS and NO_COFF_LINENOS are not defined.
+	(bfd_coff_swap_*): New macros.
+	* coff-mips.c (mips_coff_swap_table): New data structure.
+	(ecoff_big_vec): Use it.
+	* All COFF targets: Moved COFF_SWAP_TABLE to target-specific data.
+	* All other targets: Deleted coff-specific vector entries.
+
+	* trad-core.c: Fixed some `PARAMS' uses that were missing
+	parentheses.
+
+Sun Nov 29 08:37:13 1992  Fred Fish  (fnf@cygnus.com)
+
+	* aoutx.h (some_aout_object_p):  Protect arg prototype in
+	callback_to_real_object_p with PARAMS macro for non-ANSI compilers.
+
+Sat Nov 28 04:01:21 1992  John Gilmore  (gnu@cygnus.com)
+
+	* aout-target.h, aoutf1.h, trad-core.c, coffcode.h, libaout.h,
+	libbfd-in.h, bfd-in.h: Eliminate all PROTO calls, replace with
+	PARAMS for readability.
+
+	* aoutx.h:  Add type to callback parameter.
+	* coff-mips.c:  Don't call trad-core.h, not needed.
+	* trad-core.c:  Incorporate trad-core.h declarations.  Fix comments.
+	* trad-core.h:  Eliminate, unused.
+
+Wed Nov 18 13:16:17 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* format.c (bfd_check_format): if default target isn't found
+	then look through the entire list rather than return early.
+
+Mon Nov 16 14:33:03 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* config/i960-coff.mt: reorder vec to match bfd_check_format (from Per)
+
+Thu Nov 12 17:01:41 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: pass down prefix and exec_prefix in FLAGS_TO_PASS
+
+Thu Nov 12 09:46:47 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* coff-z8k.c: checkpoint, more addressing modes handled
+	* coffcode.h (get_value): don't truncate reloc->addend field, it's
+	a long now.
+
+Wed Nov 11 23:57:55 1992  Brendan Kehoe  (brendan@cygnus.com)
+
+	* we32k.mt (TDEFAULTS): Use we32kcoff_vec, not i386coff_vec.
+
+Tue Nov 10 14:04:38 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: minor tweaks to make $(CC) command lines more consistent
+
+Mon Nov  9 23:58:17 1992  John Gilmore  (gnu@cygnus.com)
+
+	* opncls.c (bfd_fdopenr, bfd_close):  Add doc about cacheing
+	and about when file descriptors are closed.
+
+Sat Nov  7 00:42:20 1992  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* bout.c (b_out_squirt_out_relocs): Make sure alignment relocs get
+	written out correctly.
+
+Thu Nov  5 15:34:19 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* section.c: New section bit SEC_SHARED_LIBRARY.
+	coffcode.h (styp_to_sec_flags): if STYP_NOLOAD && (STYP_TEXT ||
+	STYP_DATA), set SEC_SHARED_LIBRARY.  This seems to be correct for
+	i386-sysv.
+
+Thu Nov  5 04:43:09 1992  John Gilmore  (gnu@cygnus.com)
+
+	* targets.c (struct bfd_target):  Eliminate the SDEF and SDEF_FMT
+	macros; use PARAMS to declare the function pointers involved.
+
+	* bfd-in.h, bfd.c, libbfd.h, reloc.c, seclet.h, section.c,
+	targets.c: Rename struct bfd_seclet_struct to struct bfd_seclet.
+
+Thu Nov  5 02:59:09 1992  John Gilmore  (gnu@cygnus.com)
+
+	Cleanup:  Replace all uses of EXFUN in the BFD sources, with PARAMS.
+
+	* archures.c, reloc.c, section.c, tekhex.c:  Use PARAMS in
+	declaring pointers to functions.
+	* cache.c, elf.c:  Move static function decls to top, use PARAMS.
+	* seclet.h:  Declare external function with PARAMS.
+
+	* doc/chew.c (exfunstuff):  Eliminate.
+	(paramstuff):  Replace exfunstuff with function to generate PARAMS.
+	* doc/proto.str:  Use paramstuff rather than exfunstuff.
+
+	* libbfd.h:  Update, based on changes in source code and chew.
+
+Wed Nov  4 22:47:29 1992  John Gilmore  (gnu@cygnus.com)
+
+	* libieee.h:  Add FIXME about removing limit on number of sections.
+	* bfd-in.h:  Improve comments to make it clear that bfd.h is
+	the wrong place to edit this file.
+	* Makefile.in (install):  Install ansidecl.h and obstack.h in the
+	same places where we install bfd.h.
+
+Wed Nov  4 13:40:23 1992  Sean Eric Fagan  (sef@cygnus.com)
+
+	* coffcode.h (coff_swap_aux_out, coff_swap_aux_in):  check for
+	symbol type before blindly modifying the auxent.  Specifically,
+	only modify the endndx fields for types that need it, and don't
+	set the array information for non-arrays.
+
+Wed Nov  4 09:30:50 1992  Ken Raeburn  (raeburn@cygnus.com)
+
+	* aoutx.h (some_aout_object_p): Section list should be set up
+	correctly anyways; don't have to set up "next" pointers manually.
+
+Mon Nov  2 12:36:14 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* config/delta88.mh, config/hp300.mh, config/hppahpux.mh,
+	config/i386v.mh: removed -DUSG from HDEFINES.
+	hosts/delta88.h, hosts/hp300.h, hosts/hppahpux.h, hosts/i386v.h:
+	defined USE_UTIME.
+	hosts/i386v.h: don't define POSIX_UTIME.
+
+Fri Oct 30 16:13:52 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* ieee.c (ieee_slurp_sections): make a private copy of the
+	section's name before truncating it.
+
+Thu Oct 29 08:30:50 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* hppa.c: add symbol_leading_char entry in transfer vec
+
+,Wed Oct 28 16:11:57 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* ieee.c (get_symbol): can now cope when two symbols of a
+	different class, but the same index number occur consecutively.
+	(get_section_entry): nicer name for sections being forward
+	referenced. (ieee_archive_p): don't free the filename string,
+	since it was never malloced.
+
+Wed Oct 28 13:42:09 1992  John Gilmore  (gnu@cygnus.com)
+
+	* coffcode.h (coff_write_object_contents):  Zero timestamp field.
+
+Tue Oct 27 12:24:34 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coffcode.h (coff_swap_aux_out): set the fcnary info before
+	optionally setting the dimen info, since they are in the same
+	memory locations.  Also zero out external auxent.
+	(coff_write_symbol): don't zero external auxent; now done in
+	coff_swap_aux_out.
+
+Fri Oct 23 13:55:35 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Check fclose return value for errors.
+	libbfd.h: bfd_cache_close now returns a boolean.
+	cache.c (bfd_cache_delete): return fclose success value.
+	(bfd_cache_close): return bfd_cache_delete return value.
+	opncls.c (bfd_close, bfd_close_all_done): return result of
+	bfd_cache_close.
+
+Fri Oct 23 10:32:36 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* seclet.c (rel): don't load sections without the SEC_LOAD bit.
+
+Thu Oct 15 10:16:35 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* coff-m68k.c (m68k_howto2type, SELECT_RELOC): new function to
+	work out a coff relocation type from a howto's attributes rather
+	than using the input r_type field. This fixes PR1677 and allows
+	conversion of a.out relocs to coff relocs.
+
+	* coffcode.h (coff_write_relocs): if supplied a relocation
+	relative to an absolute symbol, use the right symbol index.
+
+	* reloc.c (bfd_perform_relocation): do a partial link for coff
+	relocs right.
+
+Fri Oct 23 08:15:56 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* changes to support i386-sysv with shared libraries:
+	* coffcode.h (sec_to_styp_flags): if TWO_DATA_SECS is defined,
+	check for .data2; if _LIB is defined, check for it; map
+	SEC_NEVER_LOAD to STYP_NOLOAD.
+	(styp_to_sec_flags): map STYP_NOLOAD to SEC_NEVER_LOAD.
+	(make_a_section_from_file): if TWO_DATA_SECS, accept .data2.
+	(coff_write_object_contents): force vaddr of .lib to 0; set scnptr
+	if section has contents, not just if it is loadable; if
+	TWO_DATA_SECS, check for .data2
+	(coff_set_section_contents): set vma of .lib section to number of
+	.lib sections.
+	* coff-i386.c: define TWO_DATA_SECS; use a special CALC_ADDEND;
+	don't define coff_write_armap to bsd_write_armap.
+	* hosts/i386v.h: don't include <utime.h>, since it is not provided
+	by SVR3.2.
+
+Thu Oct 22 22:40:20 1992  Brendan Kehoe  (brendan@lisa.cygnus.com)
+
+	* solaris2.h: Get the definition of alloca from alloca.h if we
+	aren't using gcc.
+
+Thu Oct 22 03:07:28 1992  John Gilmore  (gnu@cygnus.com)
+
+	* configure.in (i960-*-{aout,bout}):  Support these.
+
+Wed Oct 21 03:46:34 1992  John Gilmore  (gnu@cygnus.com)
+
+	* config/a29k-aout.mt (DEFAULT_TARGET):  Set to one that exists.
+
+Thu Oct 15 15:05:39 1992  Per Bothner  (bothner@cygnus.com)
+
+	* apollo68.h, apollov68.h, hp300.h, i386v.h, irix3.h: Remove
+	no-longer-used definitions of L_SET and L_INCR.
+	* i386linux.h:  Tweaks to smooth Linux build.
+
+Thu Oct 15 01:32:22 1992  John Gilmore  (gnu@cygnus.com)
+
+	* seclet.h:  Add enum tag to bfd_seclet_enum_type.
+
+	* bfd-in.h (file_ptr):  Update comments, make FIXME re off_t.
+
+	* aout-adobe.c, aoutf1.h, archive.c, bout.c, coff-rs6000.c,
+	coffcode.h, elf.c, ieee.c, libaout.h, libbfd.c, oasys.c,
+	sco-core.c:  Lint:  Second argument of bfd_seek is always file_ptr.
+	Third argument is SEEK_SET or SEEK_CUR.  Result is always 0 or -1.
+
+	* aout-adobe.c, aoutf1.h, aoutx.h, bout.c coff-m68k.c, coff-z8k.c,
+	coffcode.h, elf.c, libaout.h, libbfd-in.h, srec.c:  Lint.
+
+Fri Oct  9 03:46:37 1992  John Gilmore  (gnu@cygnus.com)
+
+	* configure.host:  New file, contains mapping of host configs
+	to host support file names for bfd, binutils, opcodes.
+	* configure.in:  Use it.
+	* i386aout.c:  Cleanup, dump TARGET_IS_LITTLE_ENDIAN_P.
+	* i386bsd.c:  Cleanup, reformat.
+	* config/i386-bsd.mt:  Comment changes.
+	* config/i386bsd.mh:  New file for core file support.
+	* hosts/i386bsd.h:  Merge changes from Peter Schauer.
+	* bout.c (ALIGN):  Rename to ALIGNER, since system header files
+	on BSD 4.4 define ALIGN (sigh!).
+
+Thu Oct  8 22:18:10 1992  Mark Eichin  (eichin at tweedledumber.cygnus.com)
+
+	* libaout.h (aout_backend_data): added exec_header_not_counted
+	field. For ZMAGIC files only, when text_includes_header is set, by
+	default the length of the exec header is counted in the text
+	section size. For go32, exec header is mapped in but does *not*
+	contribute to the size of section.
+	* aoutx.h (aout_adjust_sizes_and_vmas): if exec_header_not_counted
+	is not set, but ztih is, add the size of the exec header to the
+	recorded size of the text section.
+	* aoutf1.h (sunos4_aout_backend): clear exec_header_not_counted.
+	* i386aout.c (i386aout_backend_data): set exec_header_not_counted.
+	Also set text_includes_header.
+	* aout-target.h (*_backend_data): cleare exec_header_not_counted
+	by default in MY(backend_data).
+
+Thu Oct  8 18:12:49 1992  Ken Raeburn  (raeburn@cygnus.com)
+
+	* aout-target.h (callback): Don't define this function if it won't be
+	used.
+
+	* aoutx.h (some_aout_object_p): Restore old aout_data value if this
+	type doesn't match.  Don't lose if file sections have already been
+	created.
+	(set_arch_mach): Set reloc_entry_size.
+	(slurp_symbol_table): Use bfd_h_get_{16,8} for reaeding symbol data.
+
+	* hosts/i386bsd.h: New file.
+	* configure.in: Recognize i[34]86-*-bsd host.
+
+	* aout-target.h (callback, write_object_contents): Delete unused
+	variables.
+
+	* aoutx.h (reloc_type_lookup): New function.
+	* aout-target.h (MY_reloc_howto_type_lookup): Use it as default.
+	* aoutf1.h (sunos4_reloc_type_lookup): Deleted.
+	(MY_reloc_howto_type_lookup): Don't define it.
+
+	* aoutx.h (adjust_sizes_and_vmas): Don't bother with padding for
+	OMAGIC files.
+	(slurp_symbol_table): Use header byte order, not target byte
+	order, for reading symbol data.
+
+Thu Oct  8 17:33:39 1992  John Gilmore  (gnu@cygnus.com)
+
+	* configure.in:  Undo some brain damage in the host section.
+	* configure.in:  Reformat the target section, test many configs.
+	* Makefile.in (make):  Remove obsolete `make make'.
+	* aoutx.h (some_aout_object_p):  Make defines line up.
+
+Thu Oct  8 08:52:48 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	Now a bfd knows whether underscores are normally prepended
+	to symbols in its file format.
+
+	* aout-adobe.c, aout-target.h, bout.c, coff-a29k.c, coff-h8300.c,
+	coff-z8k.c: targets set so they have leading underscore
+	* coff-i386.c, coff-i960.c, coff-m68k.c, coff-mips.c, coff-m88k.c,
+	coff-rs6000.c, coff-we32k.c, elf.c, ieee.c, srec.c: targets set
+	without leading underscore flag
+	* targets.c: add symbol leading char to xvec description
+	* bfd-in.h (bfd_get_symbol_leading_char): new macro.
+
+Mon Oct  5 14:32:55 1992  Per Bothner  (bothner@cygnus.com)
+
+	* archive.c:  Make errno global.
+	* archive.c (_bfd_write_archive_contents):  If read fails (and
+	errno!=0) set bfd_error to malformed_archive (since this probably
+	indicates a truncated archive), rather than system_call_error.
+
+Mon Oct  5 03:33:39 1992  Mark Eichin  (eichin at tweedledumber.cygnus.com)
+
+	* Makefile.in: added rules for i386bsd.c
+	* i386bsd.c: new file, supporting 386bsd.
+	* configure.in: recognize i386-*-bsd target.
+	* config/i386-bsd.mt: new file - 386bsd target configuration.
+
+Thu Oct  1 17:51:07 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: re-arrange host section to use *-*-* notation,
+	clean up some of the target section as well
+
+	* seclet.c: cast result of bfd_get_relocated_section_contents to
+	avoid compiler warnings
+
+Tue Sep 29 13:24:09 1992  Ken Raeburn  (raeburn@cygnus.com)
+
+	* coffcode.h (coff_section_symbol): Create section if it doesn't
+	already exist.
+
+	* bout.c: Removed some unused variables.
+
+Tue Sep 29 08:30:21 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Portability fixes from p3:
+	coffcode.h (coff_write_relocs): removed sanity check until it
+	works on all targets (per advice from sac).
+	config/hp9000.mh: new file to define USG.
+	hppa.c: #undef hppa before the JUMP_TABLE.
+	hosts/hppahpux.h: #define NATIVE_HPPAHPUX_COMPILER if not
+	__STDC__.
+	targets.c (bfd_target_list): if NATIVE_HPPAHPUX_COMPILER, make
+	local variable target volatile to avoid mysterious bug in
+	HP9000/700 cc.
+
+Sat Sep 26 03:58:49 1992  John Gilmore  (gnu@cygnus.com)
+
+	* config/hppabsd.mh, config.hppahpux.mh:  Remove various bogosity.
+	* hosts/hppahpux.h:  Remove bcopy and index circumventions.
+
+Fri Sep 25 22:36:52 1992  John Gilmore  (gnu@cygnus.com)
+
+	* coff-z8k.c (func_da, func_jr):  Lint.
+	* coffcode.h:  Use memset rather than bzero.
+	* elf.c:  Use memcpy rather than bcopy.
+	* tekhex.c:  Use memset rather than bzero.
+
+Fri Sep 25 19:14:48 1992  John Gilmore  (gnu@cygnus.com)
+
+	Add Adobe a.out support.
+
+	* aout-adobe.c:  New file.  So far, only reads a.out.adobe.  FIXME.
+	* config/adobe.mt:  Add.
+	* configure.in (*-adobe-* target):  Add.
+	* targets.c (a_out_adobe_vec):  Add.
+	* Makefile.in:  add aout-adobe.c.
+
+	* configure.in:  Put two dashes in all entries to be matched.
+	Add comments to remind people to do this.
+	Reorder all entries that match manufacturer names, to occur
+	last, so they will only be matched if no more specific match
+	occurs.  Remove manufacturers `aout', `bout', `coff', and `elf'.
+
+Fri Sep 25 15:03:22 1992  Brendan Kehoe  (brendan@rtl.cygnus.com)
+
+	* elf.c (section_from_elf_index): Return bfd_abs_section, not 0,
+	since we should never have a NULL section.
+	(elf_slurp_symbol_table): If st_shndx doesn't match any of our
+	tests, set the section to bfd_abs_section.
+
+Fri Sep 25 11:11:57 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* coff-z8k.c: getting closer
+	* coffcode.h (coff_get_relocated_section_contents): allow
+	EXTRA_CASES hooks for different arches to provide different reloc
+	types.
+	* seclet.h: #ifndef around it to allow multiple inclusion
+	* srec.c: minor doc fix
+
+Mon Sep 21 14:33:58 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* hosts/hp9000.h, hosts/irix3.h: changes from WRS.
+
+Sun Sep 20 08:48:25 1992  Fred Fish  (fnf@cygnus.com)
+
+	* configure.in:  Use i386-elf for all i386/i486 sysv4 hosts, not
+	just ncr.
+
+Thu Sep 17 06:40:46 1992  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* bout.c (b_out_slurp_reloc_table): Clear howto field before
+	filling in reloc, in case immediately following code doesn't set
+	it.
+
+Fri Sep 11 15:37:06 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coffcode.h (coff_renumber_symbols): set the last renumbered
+	symbol pointer to NULL, as expected by coff_write_linenumbers.
+	(coff_write_relocs): apparently a non-zero addend is OK for reloc
+	type R_IHCONST used on the 29k.
+
+Thu Sep 10 13:28:24 1992  John Gilmore  (gnu@cygnus.com)
+
+	* opncls.c (bfd_fdopenr):  Determine whether to fdopen for
+	update, based on how the underlying file was opened.  Obsoletes
+	FASCIST_FDOPEN.
+	* hosts/rs6000.h, hosts/tahoe.h, hosts/vaxbsd.h:  Remove
+	all FASCIST_FDOPEN config defines.
+
+Tue Sep  8 21:37:58 1992  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* sparc-opc.c: Moved to opcodes library, now that we have one.
+	* Makefile: Don't compile it.
+
+Tue Sep  8 10:10:34 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* aoutx.h: adjust_sizes_and_vmas did not return anything.
+
+Thu Sep  3 19:29:04 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* section.c (bfd_set_section_flags):  Remove a sanity check.
+	It is unfortunately broken, and prevents strip from working.
+
+Thu Sep  3 16:14:40 1992  Jim Wilson  (wilson@sphagnum.cygnus.com)
+
+	* sparc-opc.c (condr): Remove extraneous, but harmless, backlash
+	created by last change.
+
+Thu Sep  3 13:52:38 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* reloc.c (reloc_howto_struct):  Make size field be unsigned.
+	* bfd-in.h:  Bump to version 2.0.
+
+Thu Sep  3 09:05:37 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* bout.c, cpu-z8k.c:  Use enums when initializing structs to keep
+	braindamaged HP/Apollo compiler happy.
+
+Wed Sep  2 02:53:29 1992  John Gilmore  (gnu@cygnus.com)
+
+	* format.c:  Fix description of search for matching target.
+	* aoutx.h (some_aout_object_p):  Set SEC_CODE and SEC_DATA.
+	* targets.c:  Update description of search for matching target.
+	* Makefile.in (do_clean, clean):  Fix infant mortality typo.
+	(docdir):  Set to ./doc, not ${srcdir}/doc, which has no makefile.
+	(z8k and we32k files):  `*.o: *.c': avoid Sun Make bug.
+
+Wed Sep  2 00:26:32 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Makefile.in:  Added mostlyclean/clean/distclean rules.
+
+Tue Sep  1 13:38:40 1992  Per Bothner  (bothner@cygnus.com)
+
+	* targets.c (target_vector):  Take out oasys (unless that is
+	the default):  Because there is no magic number in archives,
+	there can be annoying target mis-matches.
+
+Mon Aug 31 10:11:37 1992  Jim Wilson  (wilson@sphagnum.cygnus.com)
+
+	* sparc-opc.c: Rigorously updated to match architecture manual.
+
+Mon Aug 31 08:07:58 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* aoutx.h (aout<n>swap_ext_reloc_out), bout.c
+	(b_out_squirt_out_relocs): fix bug 1506 where abs symbols attached
+	to the built-in abs_section were not written out correctly.
+
+Fri Aug 28 16:29:15 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* archive.c (bfd_slurp_bsd_armap): if the symdef_count is too
+	large, assume we're using a swapped byte order and fail with
+	wrong_format rather than dumping core.
+
+Thu Aug 27 13:05:28 1992  Brendan Kehoe  (brendan@cygnus.com)
+
+	Add preliminary support for the we32k:
+
+	* Makefile.in, archures.c, coffocode.h, configure.in, targets.c:
+	Minor edits.
+	* coff-we32k.c, cpu-we32k.c, config/we32k.mt, hosts/we32k.h: New files.
+
+Wed Aug 26 14:20:16 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* bout.c: added support for relaxable alignment relocs.
+
+	* seclet.c (rel, seclet_dump_seclet, seclet_dump): get the app to
+	pass down pointer to play area rather than use alloca
+
+	* cpu-z8k.c (compatible): made static to reduce name space
+	polution.
+
+Tue Aug 25 08:39:10 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+        Add basic support for the z8k:
+
+	* Makefile.in, archures.c, coffcode.h, configure.in, reloc.c,
+	section.c, targets.c,
+
+	* syms.c: move mis-inserted patch.
+
+Fri Aug 14 15:39:29 PDT 1992  Howard Chu  (hyc@hanauma.jpl.nasa.gov)
+
+	Documentation fixes:
+	* ctor.c, format.c, section.c, reloc.c: append " -" to item tags.
+	* reloc.c, section.c, syms.c, targets.c: add DOCDD before @node
+		comments.
+	* reloc.c: break out addend item from surrounding text.
+
+	* doc.str (DOCDD): Defined. Adds text to output.
+	(bodytext): Put bulletize before kill_bogus_lines.
+	* chew.c (bulletize): End itemization after a blank line, to
+	prevent following text from being swallowed up in an item.
+
+Mon Aug 24 20:50:22 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* configure.in:  Add sparclite as a target.
+
+Mon Aug 24 12:06:31 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* ieee.c (ieee_get_symtab): always null terminate the symbol list,
+	lint.
+
+	* coffcode.h (coff_add_missing_symbols): if symbols don't come
+	from a coff file (csym is null), dont deref them
+
+	* ieee.c (parse_expression): get the answer right when adding an
+	abs+(sec+off), (ieee_generic_stat_arch_elt): call ieee_object_p
+	on elts so that filename is filled in.
+
+Thu Aug 20 19:05:48 1992  Ken Raeburn  (raeburn@cygnus.com)
+
+	* bout.c (howto_align_table): New set of relocs, with enough
+	data for "objdump -r" to work.
+	(b_out_reloc_type_lookup): Recognize alignment relocs.
+
+Tue Aug 18 12:57:45 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+ 	* Makefile.in: added FLAGS_TO_PASS, and used it for all recursive
+	invocations of make.  Also, always create installation
+	directories.
+
+	* config/apollov68.mh: removed -g from CC definition.
+
+Mon Aug 17 13:40:08 1992  Ken Raeburn  (raeburn@cygnus.com)
+
+	* config/decstation.mh (HDEFINES): Specify "-G 4" to avoid
+	overflowing gp-offset range.
+
+Mon Aug 17 11:44:28 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* srec.c (srec_set_section_contents): don't write out sections
+	without the LOAD and ALLOC attributes
+
+Mon Aug 17 11:55:07 1992  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* archures.c, cpu-m68k.c, cpu-sparc.c: Undo 16 June changes.
+	* libaout.h (struct aout_backend_data): New callback "set_sizes".
+	* aout-target.h (callback): Don't set page/seg sizes.
+	(mkobject): Ditto.
+	(set_sizes): New routine.
+	(backend_data): Point to it.
+	* aoutf1.h (sunos4_set_sizes): Heed architecture when setting sizes.
+	(sunos4_aout_backend): Point to it.
+	* aoutx.h (set_arch_mach): Call set_sizes callback.
+
+Fri Aug 14 19:22:18 1992  Per Bothner  (bothner@cygnus.com)
+
+	* aout-target.h:  Make _bfd_slurp_extended_name_table be
+	the default.  Given that we *write* the suckers (for long
+	archive member names), we really ought to be able to read them!
+	* trad-core.c:  Don't include <machine/reg.h>.  It doesn't
+	seem to be needed, and many machines don't have it.
+
+Thu Aug 13 09:53:39 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* coff-m68k.c (vector): read and write archives in coff format.
+
+Tue Aug 11 12:19:42 1992  Ken Raeburn  (raeburn@cygnus.com)
+
+	* opc-sparc.c: New file.
+
+Sat Aug  8 23:15:35 1992  Fred Fish  (fnf@cygnus.com)
+
+	* bout.c (bfd_reloc_status_type, callj_callback):  Cast void*
+	pointers to bfd_byte* before performing arithmetic on them.  Such
+	use with bare void* pointers is a gcc extension.
+	* cache.c (bfd_cache_delete):  Forward decl with prototype form.
+	* archive.c (normalize):  Add to CONST to match actual usages with
+	CONST.
+
+Mon Aug  3 00:35:29 1992  Fred Fish  (fnf@cygnus.com)
+
+	* configure.in:  Recognize i486 host cpu, and use i386-elf
+	for i486-ncr-sysv4.
+
+Sat Aug  1 13:49:59 1992  Fred Fish  (fnf@cygnus.com)
+
+	* config/stratus.mt (CC):  Remove definition.
+	* elf.c (bfd_section_from_shdr):  Test for the possibility that
+	section_from_elf_index returns NULL and don't dereference it.
+
+Mon Jul 20 02:46:09 1992  D. V. Henkel-Wallace  (gumby@cygnus.com)
+
+	* add hppa_data to bfd tdata (indirectly via sef).
+
+	* config/hppahpux.mh: hpux is -DUSG (patch by sef)
+
+Sat Jul 18 15:50:11 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: error messages to stderr, not stdout
+
+Fri Jul 17 18:32:46 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* bfd.c, cache.c, coff-a29k.c, coff-i386.c, coff-i960.c,
+	  coff-m68k.c, coff-m88k.c, demo64.c, libaout.h, libbfd.c,
+	  oasys.c, opncls.c, sunos.c, targets.c: removed rcsid's.
+
+Fri Jul 17 17:06:56 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: recognize hppa* instead of hppa
+
+Thu Jul 16 16:39:25 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* coff-m68k.c: added R_RELLONG_NEG reloc type, and changed
+	RTYPE2HOWTO to cope with same.
+	* reloc.c (bfd_perform_relocation): added support for size of -2
+	(subtract a word reloc type). Updated doc.
+
+Thu Jul 16 16:28:09 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* Makefile.in: merged changes from progressive, removed rcsid.
+
+	* archures.c, archive.c, Makefile.dos: removed rcsid.
+
+Thu Jul 16 08:08:25 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* bfd-in.h : add BFD_IS_RELAXABLE flag
+	* bout.c (bout_swap_exec_header_[in_out]): new field in exec
+	header e_relaxable, major hackery in callbacks
+	* libaout.h : add space for a_relaxable.
+	* seclet.c (rel): don't relax empty sections
+
+
+Wed Jul 15 07:57:46 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* section.c (STD_SECTION): add some casts to the initializers for
+	dumb compilers
+
+Tue Jul 14 14:06:28 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* rs6000-core.c (rs6000coff_core_p):  Greatly simplify expression,
+	and add appropriate casts to keep (picayune) aix-cc happy.
+
+Mon Jul 13 05:06:51 1992  John Gilmore  (gnu at cygnus.com)
+
+	* elf.c (elf_slurp_symbol_table):  Now 2nd arg is where to write
+	symbol pointers.  Punt expensive & useless bfd_realloc.  Use
+	malloc for raw symbols, and free it before returning.
+	(bfd_section_from_shdr):  Do not slurp symbol table until politely
+	asked. 	Do not even slurp string tables.
+	(elf_get_symtab_upper_bound):  Count 'em without reading them.
+	(elf_get_symtab):  This is how to politely ask.  Schlurp!
+	This should probably just *become* elf_slurp_symbol_table, FIXME.
+
+Wed Jul  8 16:24:33 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* archive.c (bsd_write_armap): write the timestamp of the
+	archive header to be just a little bit later than the timestamp of
+	the file, otherwise the linker will complain that the index is
+	out of date.
+
+Tue Jul  7 00:23:23 1992  Fred Fish  (fnf@cygnus.com)
+
+	* configure.in: Add m68k-ericsson-*.
+
+Sat Jul  4 03:29:41 1992  John Gilmore  (gnu at cygnus.com)
+
+	* syms.c:  Define BSF_FILE, update BSF_SECTION_SYM desc.
+	* elf.c:  Remove unconditional debug printf's.
+	(elf_write_object_contents, elf_slurp_symbol_table):  Handle
+	BSF_SECTION_SYM <=> STT_SECTION, BSF_FILE <=> STT_FILE.
+	(elf_slurp_symbol_table):  Hand out symbols in forward, not
+	reverse order.  Simplify duplicate code.
+
+Fri Jul  3 20:23:34 1992  Fred Fish  (fnf@cygnus.com)
+
+	* elf.c:  Remove "(void)" casts from function calls where the
+	return value is ignored, in accordance with GNU coding standards.
+
+Tue Jun 30 16:49:12 1992  Fred Fish  (fnf@cygnus.com)
+
+	* hppa.c:  Apply John's standard fix to avoid "empty translation
+	unit" warnings from some ANSI-C compilers.
+
+Thu Jun 25 04:39:25 1992  John Gilmore  (gnu at cygnus.com)
+
+	* hosts/solaris2.h:  Configure same as sysv4.
+
+Tue Jun 23 21:54:44 1992  Fred Fish  (fnf@cygnus.com)
+
+	* libbfd.h, libbfd-in.h (bfd_seek):  Make prototype match definition.
+	* reloc.c (bfd_default_reloc_type_lookup):  Make cast on return
+	type match actual return type.
+	* section.c (elf_print_symbol):  Make CONST.
+
+Mon Jun 22 17:35:24 1992  Per Bothner  (bothner@cygnus.com)
+
+	* i386linux.c, hosts/i386linux.h, config/i386-linux.mt:
+	New files, for Linux (a free Unix clone for 386 machines).
+	* Makefile.in, configure.in, targets.c:  Update accordingly.
+
+Fri Jun 19 20:23:21 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+	Lints for bfd_reloc_code_type->bfd_reloc_code_real_type, and
+	correct calling of howto special functions and fixes from Raeburn
+	for gas<>bfdness
+	* archures.c: nuke bfd_reloc_code_type
+	* bout.c, cpu-h8300.c, coff-i960.c, coff-m88k.c: special function lint
+	* coffcode.h (styp_to_sec_flags): STYP_INFO is marked as
+	SEC_NEVER_LOAD, various other bfdgas newness
+	* reloc.c->libbfd.h: change protype of bfd_default_reloc_type_lookup
+	* targets.c: change jump table vector to above
+
+
+Fri Jun 19 19:00:45 1992  John Gilmore  (gnu at cygnus.com)
+
+	* elf.c (bfd_elf_find_section):  Mark as INTERNAL_FUNCTION so
+	its prototype will be included in libbfd.h.  Change result type
+	to struct * (rather than equivalent typedef) so it can be used in
+	the prototype, where they typedef won't be known.
+	* libbfd.h:  Updated version.
+
+Fri Jun 19 15:21:56 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* Makefile.in, archures.c, configure.in, cpu-hppa.c, hppa.c, libhppa.h,
+	targets.c:  HPPA merge.
+
+Fri Jun 19 12:21:38 1992  John Gilmore  (gnu at cygnus.com)
+
+	* configure.in:  Separate Solaris2 from SYSV4 on SPARC.
+	* config/solaris2.mh:  Kludge around Sun compiler bug.
+
+Wed Jun 17 14:02:46 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* libaout.h (aout_backend_data):  Change defs of two bitfields to
+	be unsigned chars instead to get around rs6000 compiler problem.
+
+Wed Jun 17 13:55:31 1992  Fred Fish  (fnf@cygnus.com)
+
+	* elf.c (bfd_section_from_shdr, elf_slurp_symbol_table):
+	Correct misconception that there can be only one symbol table.
+	Only call elf_slurp_symbol_table on the full symbol table, not
+	the dynamic one which is only a subset of the full one.
+
+Wed Jun 17 15:54:57 1992  Ken Raeburn  (Raeburn@Cygnus.COM)
+
+	* coffcode.h (coff_compute_section_file_positions): For I960,
+	don't align sections in file.
+
+Tue Jun 16 06:28:21 1992  Ken Raeburn  (Raeburn@Cygnus.COM)
+
+	* targets.c (struct bfd_target): Added field for target-specific
+	(but not file-specific) data, for distinguishing minor
+	characteristics between (e.g.) a.out formats.
+
+	* section.c (struct sec): New field user_set_vma indicates vma
+	field should be heeded, not assumed to be unset.
+	(STD_SECTION): Initialize that field of standard sections to zero.
+	* bfd-in.h (bfd_set_section_vma): Set user_set_vma to true.
+
+	* coffcode.h (coff_write_relocs): Write out swapped reloc, not
+	pre-swapped version.
+
+	* archures.c (struct bfd_arch_info): Fixed order of comment and
+	field decl.  New fields indicate size of page and segment for
+	architecture.
+	* cpu-m68k.c (N): Fill in values.
+	* cpu-sparc.c (arch_info_struct): Ditto.
+
+	* libaout.h (struct aout_backend_data): Various bits of data (not
+	all used currently) with characteristics of a.out implementation.
+	Important field for now is text_includes_header, indicating that
+	the text section starts immediately after the file header, which
+	gets mapped in with it.
+	(struct aout_data): New fields indicate whether vma has been
+	adjusted yet (not yet used), and what magic number will be used in
+	the output file (should go away in favor of vma_adjusted).
+	(WRITE_HEADERS): Code for dealing with section sizes and related
+	header fields replaced with call to adjust_sizes_and_vmas.
+	* aoutx.h (some_aout_object_p): Fill in magic number field.
+	Set WP_TEXT flag for ZMAGIC as well as NMAGIC files.
+	(set_arch_mach): Set page size and segment size once CPU
+	type is known.
+	(adjust_sizes_and_vmas): New function; has much code moved
+	from set_section_contents and WRITE_HEADERS.  Sets or adjusts vma
+	and size parameters, as well as many header fields, after deciding
+	on magic number for output file.  Checks to ensure that this
+	adjustment has only been done once.
+	(set_section_contents): Call adjust_sizes_and_vmas instead of
+	doing much of the work here.
+
+	* aout-target.h (MY_make_debug_symbol, MY_backend_data): Provide
+	default (null) values of these fields.
+	* aoutf1.h (sunos4_write_object_contents): Don't override a_text
+	value in exec header.
+	(sunos4_aout_backend, MY_backend_data): Define backend data
+	indicating file header is included in text section.
+
+	* aoutf1.h (MY_reloc_howto_type_lookup): Fix typo.
+
+	* hosts/sparc.h (abort, exit): Hide these names if compiling with
+	gcc version 2, to avoid warnings.
+
+Mon Jun 15 12:26:56 1992  Fred Fish  (fnf@cygnus.com)
+
+	* config/ncr3000.mh (INSTALL, RANLIB):  Don't use /usr/ucb/install,
+	it's broken on ncr 3000's.  Use simple "true" for RANLIB.
+
+Sat Jun 13 09:16:43 1992  Michael Tiemann  (tiemann@rtl.cygnus.com)
+
+	* configure.in (m680[01234]0-wrs-*): Fix typo in match pattern.
+
+Fri Jun 12 19:48:34 1992  John Gilmore  (gnu at cygnus.com)
+
+	* section.c (STD_SECTION):  Remove extra semicolon in declarations.
+	* configure.in:  Rewrite target parsing to use simple format.
+	Handle sparc-sun-solaris2 configuration.
+	* aout64.h:  Avoid ANSI C brain death warning.
+	* elf.c:  Avoid trigraph (???) or /* in comments.
+
+Fri Jun 12 14:51:14 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* config/sysv4.mh: new file, RANLIB=echo
+
+	* configure.in: handle Solaris2 as -sysv4 or -solaris2
+
+Thu Jun 11 00:52:03 1992  John Gilmore  (gnu at cygnus.com)
+
+	* elf.c (elf_obj_tdata):  Merge elf_obj_tdata_struct and
+	elf_core_tdata_struct into a single common struct.  Core files
+	wouldn't have worked at all without this.
+	(bfd_elf_find_section):  New function for GDB's undercover use
+	to find string sections that BFD hides from it.
+	(elf_get_str_section):  Avoid multiple alloc&reads for same data;
+	lint.
+	(elf_object_p, elf_core_file_p):  Allocate internal file header
+	storage dynamically.
+	* bfd.c (union {...} tdata):  Remove elf_core_tdata_struct.
+	* demo64.c:  Prevent "empty translation unit" warnings from idiots.
+
+Tue Jun  9 17:15:26 1992  Fred Fish  (fnf at cygnus.com)
+
+	* config/{i386v4.mh, ncr3000.mh}:  Update RANLIB, add INSTALL.
+
+Sat Jun  6 17:02:51 1992  John Gilmore  (gnu at cygnus.com)
+
+	* configure.in:  Handle Solaris2 as *-sun-sysv4 or as *-sun-sunos5.
+
+Sun May 31 05:45:00 1992  david d `zoo' zuhn (zoo@cygnus.com)
+
+	* configure.in: handle m680[01234]0 as aliases for m68k
+
+Tue May 26 16:50:59 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* coff-a29k.c: do byte relocs correctly
+	* coffcode.h (styp_to_sec_flags): never load INFO sections
+	* seclet.c (rel): don't relocate INFO sections
+
+Wed May 20 08:18:18 1992  Ken Raeburn  (Raeburn@Cygnus.COM)
+
+	* section.c (bfd_*_symbol, bfd_*_section): Initialize statically.
+	Make the symbols unmodifiable.
+	(bfd_section_init): Deleted.
+	* init.c (bfd_init): Don't call bfd_section_init.
+
+	* section.c (bfd_set_section_contents): Ensure that range to be
+	written is within section boundaries.
+	(bfd_get_section_contents): Likewise.  Don't bother dispatching if
+	size is zero.
+
+	* libbfd.c (bfd_xmalloc): Text of error message should be const.
+
+	* coff-i960.c (howto_table): Deleted.
+	(howto_rellong, howto_iprmed, howto_optcall): New vars;
+	interesting entries from old howto_table.
+	(RTYPE2HOWTO): Adjusted to use switch.
+	(coff_i960_reloc_type_lookup): New function.
+
+	* coffcode.h (coff_new_section_hook): Allocate storage for aux
+	records for section symbol.
+	(make_abs_section): Unused; deleted.
+	(renumber_symbols): Re-order symbols so undefined symbols come
+	last, as COFF format desires.
+	(coff_write_symbol): Put C_FILE symbols in debug section always.
+	(coff_section_symbol): New function; creates a symbol with the
+	same name as a section, and sets up aux records for it.
+	(coff_add_missing_symbols): New function; adds section symbols to
+	symbol table if they aren't there already.  Should someday also
+	add a dummy C_FILE symbol if none is present.
+	(coff_write_object_contents): Add missing symbols before preparing
+	symbol table to be written.
+	(coff_slurp_reloc_table): Verify that symbol indices read in are
+	in a reasonable range.
+	* libcoff-in.h (struct coff_tdata): New field conv_table_size.
+	(obj_conv_table_size): Accessor macro.
+
+	* bout.c (b_out_reloc_type_lookup): New function.  Handles three
+	reloc types on i960.
+
+	* bfd-in.h (bfd_get_section_name): New macro.  Like
+	bfd_section_name, but returns rvalue, not lvalue.
+	(bfd_get_section_vma, bfd_get_section_alignment): Similar.
+	(bfd_get_section_flags): Now returns rvalue.
+
+	* reloc.c (enum bfd_reloc_code_real): Add several new values, some
+	general, some specific to sparc or i960.
+
+	* aoutx.h (set_section_contents): Set VMA for each section based
+	on previous section.  If text section VMA doesn't appear to have
+	been set, make a best guess from the type of file.
+
+	* aout-target.h (MY_reloc_howto_type_lookup): Define as zero if
+	not defined.
+	(MY(vec)): Initialize reloc_type_lookup field.
+
+	* aoutx.h (howto_table_*): Export as aout_#_*_howto_table.
+	(bfd_error_trap, bfd_error_vector): Extern, not common.
+
+	* aoutf1.h (sunos4_reloc_type_lookup): New function.  Handles a
+	few types of relocs for sparc; will need enhancement.
+
+	* bout.c (callj_callback): Use DEFUN macro in definition.
+	* coff-i960.c (optcall_callback): Likewise.
+
+	* targets.c (bfd_target): Added fields reloc_type_lookup and
+	_bfd_make_debug_symbol.  Also minor comment changes.
+	* syms.c (bfd_make_debug_symbol): New dispatching macro.
+	* reloc.c (bfd_reloc_type_lookup): Take a BFD ptr as arg rather
+	than arch info, and dispatch with BFD_SEND.  Callers changed.
+	* archures.c (struct bfd_arch_info): Deleted field
+	reloc_type_lookup.
+	* cpu-*.c: Don't initialize that field.
+
+	* bfd-in.h (enum bfd_error): Add new value "bad_value".
+	* bfd.c (bfd_errmsgs): Now const; added entry for bad_value.
+	(bfd_errmsg): Now returns ptr to const.
+	* bfd-in.h (bfd_errmsg): Fix prototype.
+
+	* cache.c (BFD_CACHE_MAX_OPEN): Fix typo in doc.
+	* reloc.c (bfd_generic_relax_section): Ditto.
+
+	* section.c (Section Output doc): Improve description of use of
+	output_section and output_offset.
+
+Tue May 19 23:42:10 1992  D. V. Henkel-Wallace  (gumby@cygnus.com)
+
+	* sco-core.c: new file from net.
+	* aoutx.h (translate_to_native_sym_flags): bugfix from net:
+	  Now we have the hairy linker, it's possible to move symbols from
+	  one section into another.  Actually make that work!
+
+Sat May 16 17:57:59 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* hosts/sun3.h: fix declaration of free.
+
+Tue May 12 14:08:59 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* coff-a29k.c (perform_reloc): fix bug in jmp/call evaluation
+	* coff-h8300.c (reloc_processing): all relocs are relative to
+	section start.
+	* opncls.c: don't use fdopen on DOS systems
+
+	short patches from Glenn Kasten (glenn@ready.com)
+	* targets.c: enabled oasys support
+	* oasys.c:  Insert . when UNDERSCORE_HACK is enabled,
+	fix problem where a relocation which crossed a modification byte
+	boundary did not work. Fix problem where a relocation near the end
+	of a data record did not work.
+
+
+Tue May  5 18:11:25 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* archive.c (bfd_slurp_coff_armap): old versions of BFD wrote
+	archvie header string counts the endian way, this heuristic sees
+	how big an archive string to read by trying it one way and if the
+	string table is unreasonably big, trying it the other. *FIXME*.
+	* opncls.c (bfd_fdopenr): can't do fdopens on VMS
+
+Tue May  5 14:18:24 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* bfd-in.h:  Increase version number to 1.97, for consistency
+	with ../binutils.
+	* Makefile.in:  docdir is ./doc, not ${srcdir}/doc.
+
+Mon May  4 11:49:15 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+        * bfd-in.h: bump version to 1.96
+         Major change; changed calling convention for
+	 bfd_get_relocated_section_contents so that caller allocates
+	 memory for section data.
+	* coffcode.h (bfd_coff_get_relocated_section_contents), reloc.c,
+	seclet.c, targets.c, bfd.c: reflect new convention.
+	* coffcode.h (styp_to_sec_flags): if styp_flags is not a special
+	case, then use reasonable default values for SEC_* flags.
+
+Fri May  1 12:58:34 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* coffcode.h (coff_write_object_contents): use RELSZ to work out
+	size of output reloc struct.
+	* targets.c, Makefile.in: comment out tekhex for the moment.
+	* ieee.c: if some places where null pointers were used instead of &bfd_abs_section.
+	* configure.in: tandem target is st2000
+	* coff-m68k.c: rename static howto_table to global
+	m68kcoff_howto_table.
+	* bout.c: remove unnecessary abort
+	* coff-a29k.c: various changes to the way relocations work to cope
+	with the "new order" and latent bugs.
+	* coffcode.h: lint
+
+Wed Apr 29 12:37:07 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* aoutx.h (aout_swap_ext_reloc_out, aout_swap_std_reloc_out)
+	bout.c (b_out_squirt_out_relocs): treat abs sumbols the right way.
+	* reloc.c (bfd_perform-relocation): don't relocate refs to
+	absolute symbols if doing a partial link.
+
+Fri Apr 24 07:35:26 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* configure.in:  Add a29k-amd-udi.
+
+Thu Apr 23 18:37:55 1992  Fred Fish  (fnf@cygnus.com)
+
+	* aoutx.h (aout_<bits>_swap_exec_header_in):  Zero out the
+	internal_exec structure before initializing the fields that
+	are used, so that the unused fields are in a known state.
+
+Wed Apr 22 09:36:08 1992  Fred Fish  (fnf@cygnus.com)
+
+	* tekhex.c (struct data_struct):  Convert from typedef that
+	typedefs nothing to a normal structure declaration.
+	* tekhex.c (pass_over):  Prototype args for function that
+	second arg points to.
+
+Mon Apr 20 22:22:51 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* Makefile.in: remove old style staging.  Do not print recursion
+	  lines.
+
+	* Makefile.in: rework CFLAGS so that CFLAGS can be passed from the
+	  Makefile command line.  Remove MINUS_G.  Default CFLAGS to -g.
+	  Pass CFLAGS.
+
+Fri Apr 17 09:15:31 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* bfd.c, Makefile.in: added tekhex
+	* aoutx.h (set_section_contents): pages should be padded to the
+	size of a page, not the size of a segment.
+	* configure.in: added go32 host and i386-aout target.
+	* i386aout.c, libaout.h: now works for go32 target
+	* ieee.c: fix bit rot.
+	* seclet.c: support for padding seclet type.
+
+Wed Apr 15 18:11:58 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* Makefile.in: added .NOEXPORT:
+
+Tue Apr 14 14:34:42 1992  Fred Fish  (fnf@cygnus.com)
+
+	* elf.c (bfd_add_strtab, bfd_add_2_to_strtab):  CONST spreads
+	like ooze.
+	* elf.c (elf_compute_section_file_positions,
+	elf_write_object_contents):  Return boolean, not NULL (which
+	can be void *).
+	* elf.c (bfd_section_from_shdr):  Ifdef-out debugging code.
+	Also ifdef-out code that aborts on unhandled section types.
+
+Fri Apr 10 22:29:18 1992  Fred Fish  (fnf@cygnus.com)
+
+	* configure.in:  Recognize ncr3000 config
+	* Makefile.in (MINUS_G):  Pass on to recursive makes.
+	* hosts/ncr3000.h, config/ncr3000.mh:  Add host config files.
+
+Thu Apr  2 17:42:45 1992  John Gilmore  (gnu at cygnus.com)
+
+	* Makefile.in:  Now that we have sym.h and symconst.h, compile
+	coff-msym.c on all systems.
+	* config/{decstation.mh, irix3.mh, irix4.mh}:  Remove coff-msym.o dep.
+	* coff-msym.c:  Update include files and comments; add weakext bit.
+
+Wed Apr  1 23:16:38 1992  John Gilmore  (gnu at cygnus.com)
+
+	* archive.c, bfd.c, bout.c, coffcode.h, init.c, reloc.c,
+	section.c, srec.c, syms.c, coff-h8300.c:  Lint.
+
+Sun Mar 29 09:37:59 1992  John Gilmore  (gnu at cygnus.com)
+
+	* bout.c, coff-a29k.c, coff-i960.c:  Lint.
+	* configure.in:  Add new host and target configs.
+	* elf.c (bfd_prstatus, bfd_fpregset):  Avoid typename of register
+	structs, which vary; just use member name.
+	(elf_object_p, elf_core_file_p):  Lint, fix comments.
+	* config/sparc-elf.mt, hosts/sysv4.h:  New config files.
+
+Sat Mar 28 13:07:02 1992  Fred Fish  (fnf@cygnus.com)
+
+	* elf.c (elf_object_p, elf_core_file_p):  Fix to use only a single
+	local, disposable, copy of the external form of section header
+	table and program header table entries.
+
+Thu Mar 26 16:59:58 1992  John Gilmore  (gnu at cygnus.com)
+
+	* Makefile.in:  Set MINIMIZE back to 0 for a real release.
+
+Tue Mar 24 15:57:03 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* configure.in: config/irix4.m[ht], hosts/irix4.h: add support for
+	  irix4.
+
+Mon Mar 23 22:37:34 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* coff-msym.c (ecoff_swap_rfd_in):  remove & for array ref.
+
+Tue Mar 17 14:12:25 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* bout.c (b_out_slurp_reloc_table):  Use BFD_ASSERT macro,
+	not internal bfd_assert function (twice).
+
+Tue Mar 17 10:45:12 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* aout-target.h: change ar_max_namelen to 15 (the right value)
+	* coff-a29k.c, coffcode.h: more hangovers from the bfd_abs_section
+	change
+
+Mon Mar 16 14:57:22 1992  Steve Chamberlain  (sac@rtl.cygnus.com)
+
+	* archive.c (bfd_generic_archive_p): check for bout archives too.
+	* bout.c: make it work again.
+
+Sat Mar 14 17:30:40 1992  Fred Fish  (fnf@cygnus.com)
+
+	* elf.c (elf_corefile_note):  Call bfd_xmalloc() instead of bare
+	malloc().
+	* reloc.c (bfd_generic_get_relocated_section_contents):  Call
+	bfd_xmalloc() instead of bare malloc().
+
+Fri Mar 13 15:44:37 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in: pass down MAKEINFO on info.
+
+Fri Mar 13 07:41:13 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* config/mt-<foo> now <foo>.mt, config/mh-<foo> now <foo>.mh.
+	host/h-<foo> now just <foo>.
+	* configure.in: reflect changes
+
+Thu Mar 12 11:15:02 1992  Per Bothner  (bothner@cygnus.com)
+
+	* libbfd-in.h (set_tdata):  Make change of Feb 27 in the
+	actual source file, not just the generated libbfd.h.
+
+Sat Mar  7 10:33:41 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* coff-i960.c (icoff_little_vec): add COFF_SWAP_TABLE so we can run
+	gdb on little-endian 960 code.
+	* archive.c (compute_and_write_armap): indirect symbols should go
+	into the archive header too.
+
+Fri Mar  6 21:55:16 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in: added check target.
+
+Thu Mar  5 23:51:42 1992  John Gilmore  (gnu at cygnus.com)
+
+	* coff-msym.c:  Move this file from gdb/ecoff.c.  It
+	handles byte-swapping for ECOFF (MIPS symbol) files.
+	* config/mh-decstation, config/mh-irix3:  Add coff-msym.o
+	to the files built on MIPS-based hosts.
+	* Makefile.in:  Add rule for coff-msym.
+
+Thu Mar  5 21:36:05 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in: added clean-info target.  MINIMIZE=1.
+
+Sun Mar  1 22:32:58 1992  Per Bothner  (bothner@cygnus.com)
+
+	* coff-rs6000.c:  Move core file functions into separate
+	new file rs6000-core.c.  This is needed because reading
+	core files depends on native include files that conflict
+	with ../include/coff/rs6000.h.
+	* config/mh-rs6000:  Add rs6000-core.o to HDEPFILES.
+
+Thu Feb 27 22:19:55 1992  Per Bothner  (bothner@cygnus.com)
+
+	* aoutx.h (NAME(aout,print_symbol)): Don't print
+	symbol addresss for undefined symbols.
+	* coff-rs6000.c:  Various updates (due to target-
+	independent changes).
+	* libbfd.h:  Ditto (tdata field is now a union).
+	* hosts/h-sparc.h:  Removed prototype for bogus function
+	'emset' (presumably should have been 'memset' - which is there).
+
+Thu Feb 27 11:46:33 1992  John Gilmore  (gnu at cygnus.com)
+
+	* configure.in (mips-big-* target):  Same is Iris.
+
+Thu Feb 27 09:24:56 1992  Steve Chamberlain  (sac at thepub.cygnus.com)
+
+	* aoutx.h (translate_from_native_sym_flags): when creating an
+	alias symbol, fill in the section as undefined, rather than
+	leaving it blank. If an output section can't be found for a
+	symbol, then don't core dump.
+
+Wed Feb 26 18:04:40 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in, configure.in: removed traces of namesubdir,
+	  -subdirs, $(subdir), $(unsubdir), some rcs triggers.  Forced
+	  copyrights to '92, changed some from Cygnus to FSF.
+
+Wed Feb 26 19:40:59 1992  Steve Chamberlain  (sac at thepub.cygnus.com)
+
+	* bfd.c: lint
+	* coff-h8300.c: fix stupid reloc subtraction bug
+	* coffcode.h (coff_swap_aux_out): only swap a tvndx by 2 bytes,
+	since that's how wide it is. (coff_slurp_symbol_table): always zero out
+	the symbol.flags and done_lineno fields.
+
+Tue Feb 25 14:29:24 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* coffcode.h (coff_write_symbol): write out the correct number of
+	auxents.
+	* cpu-h8300.c: fix disassembly bug
+
+Fri Feb 21 21:39:56 1992  John Gilmore  (gnu at cygnus.com)
+
+	* bfd-in.h (bfd_errmsg), coffcode.h (coff_swap_aux_in,
+	section_from_bfd_index), cpu-h8300.c (howto*_callback),
+	reloc.c, section.c (bfd_map_over_sections), targets.c
+	(bfd_target_list):  Protolint.
+	* libbfd.h:  Update to match a libbfd-in.h from a month ago.
+
+Fri Feb 21 10:57:54 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* coffcode.h (coff_swap_aux_in): lint, (coff_print_symbol): prints
+	out tagndx too.
+	* aoutx.h (swap_std_reloc_out, swap_ext_reloc_out): use the output
+	section of a symbol rather than the section of a reffed symbol to
+	determine the r_index of an emmitted reloc.
+
+Thu Feb 20 18:10:34 1992  Per Bothner  (bothner at cygnus.com)
+
+	* PORTING: New (preliminary) porting guide.
+
+Wed Feb 19 21:39:37 1992  John Gilmore  (gnu at cygnus.com)
+
+	* bout.c (callj_callback), coff-a29k.c (a29k_reloc), coff-m88k.c
+	(howto_hvrt16):  lint.
+
+Mon Feb 17 12:02:17 1992  Per Bothner  (bothner at cygnus.com)
+
+	* hp300bsd.c (new), config/mt-hp300bsd:  Make hp300bsd
+	a full configuration (with possible cross-development),
+	instead of using host-aout.c.
+
+Sun Feb 16 13:01:49 1992  Per Bothner  (bothner at cygnus.com)
+
+	* aout-target.h (MY(write_object_contents):
+	Set obj_reloc_entry_size (abfd).
+	* gen-aout.c:  Change to emit a .c files, not a .h file.
+
+Thu Feb 13 20:11:47 1992  Fred Fish  (fnf at cygnus.com)
+
+	* elf.c (elf_slurp_symbol_table):  Remove obsolete use of
+	BSF_ABSOLUTE and replace with bfd_abs_section reference.
+
+Thu Feb 13 17:22:44 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* coffcode.h (get_normalized_symtab): fixed bug where symbols
+	with more than one auxent can cause nasty core dumps.
+
+	* coffcode.h, libcoff.c: added new fielded to coff_symbol_struct
+	"done_lineno" so that a symbol which appears twice in the symbol
+	table only gets it's linenumbers relocated once. Modifed
+	(coff_write_native_symbol) and (coff_make_empty_symbol) to make
+	use of it.
+
+Tue Feb  4 15:39:55 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* aoutx.h: (translate_from_native_sym_flags): fix constructor
+	stuff to use the New Order.
+
+Fri Jan 31 01:34:45 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* ieee.c:  Change type of envi[] to unsigned char.
+
+	* configure.in:  fix vax ultrix configuration.
+
+	* elf.c (bfd_section_from_shdr):  Deal with null return from
+	bfd_make_section().  (elf_object_p):  Select endianess properly.
+
+Fri Jan 31 01:19:55 1992  John Gilmore  (gnu at cygnus.com)
+
+	* hosts/h-tahoe.h, h-vaxbsd.h:  Fix stack in core files.
+
+Thu Jan 30 23:51:07 1992  John Gilmore  (gnu at cygnus.com)
+
+	* Makefile.in:  host-aout.c doesn't depend on aout-params.h.
+	* aout-target.h:  Use TARGET_BIG_ENDIAN_P to set up vector.
+	* host-aout.c:  Don't use aout-params.h; configure these systems
+	in their xm files, not in a randomly generated file.
+	* hosts/h-hp300bsd.h, h-tahoe.h, h-vaxbsd.h, h-vaxult.h:
+	Specify byte order.
+	* hosts/h-vaxbsd.h:  Define the form of exec and core files.
+
+Thu Jan 30 13:02:41 1992  Per Bothner  (bothner at cygnus.com)
+
+	* config/mt-tahoe, config/mt-vax:  Change DEFAULT_VECTOR to
+	host_aout_vec here as well.
+
+Thu Jan 30 11:41:45 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* host-aout.c:  Change TARGETNAME to "a.out" to be compatible with
+	gdb.  config/mt-hp300bsd:  Change DEFAULT_VECTOR to host_aout_vec
+	to prevent undefined symbol.
+
+Thu Jan 30 07:26:53 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	Various lints found on PersSony
+	* aoutx.h: cast an enum
+	* coff-a29k.c: many ints in reloc structure turned to enum
+	* coffcode.h: more enums
+	* cpu-h8300.c: more enums
+	* opncls.c: more enums
+
+Thu Jan 30 01:19:56 1992  John Gilmore  (gnu at cygnus.com)
+
+	* configure.in:  Make Tahoe configuration work again.
+	* bfd-in.h:  Remove trailing comma from enum declaration.
+	* ieee.c:  Can't put byte values >0x7F into a signed char.
+
+Tue Jan 28 21:10:51 1992  Fred Fish  (fnf at cygnus.com)
+
+	* Makefile.in:  Add dependencies for various coff-*.o files.
+
+	* elf.c:  Remove extraneous paren from core_prpsinfo and
+	core_prpstatus macros, rename core_prpstatus to core_prstatus.
+	Replace references to old section "size" member with new
+	"_raw_size" member.  Implement elf_make_empty_symbol, which
+	is now used.
+
+Tue Jan 28 14:51:40 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* trad-core.c, bfd.c, ../include/bfd.h:  Various fixes for PMAX
+	core reading.
+
+Tue Jan 28 10:46:32 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* coffcode.h (bfd_coff_relax_section): now static.
+	(bfd_coff_get_relocated_section_contents): various type lints.
+
+Mon Jan 27 19:44:08 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	New entry point in the transfer vector - bfd_relax_section.
+
+	* aout-target.h: add to vector, call generic_relax
+	* bfd-in.h: add to vector
+	* bfd.c: add #define for vector
+	* bout.c: add to vector, call generic_relax
+	* coffcode.h: add to vector, also now has coff specific relax code
+	for the relaxable H8/300 relocs. Also clean up abs section cruft.
+	* elf.c: call generic_relax
+	* ieee.c: call new vector, clean up some bugs due to the creation
+	of bfd_abs_section
+	* libbfd.h: add bfd_generic_relax_section EXFUN
+	* oasys.c: call generic_relax
+	* reloc.c: implement generic_relax
+	* seclet.c: moved much of this into coffcode.h
+	* srec.c: call generic_relax
+	* targets.c: define new transfer vector
+
+Fri Jan 24 14:40:17 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* everything: now modified to use smaller reloc type. Self hosts
+	on sun3 & sun4.
+
+Sat Jan 18 17:00:16 1992  Fred Fish  (fnf at cygnus.com)
+
+	* config/mh-stratus, config/mt-i860-elf, hosts/h-stratus:
+	New files for stratus.
+
+	* configure.in:  Add configuration fragments for stratus.
+
+Wed Jan 15 10:02:43 1992  Fred Fish  (fnf at cygnus.com)
+
+	* aoutx.h (NAME(aout,find_nearest_line)): Declare various filename
+	variables as CONST since they are set to point to a const char
+	string.  Fixes compiler complaints.
+
+Fri Jan 10 17:44:53 1992  Fred Fish  (fnf at cygnus.com)
+
+	* hosts/h-amix.h hosts/h-i386v4.h:  Change abort() to a function
+	returning void.
+
+Fri Jan 10 14:33:32 1992  Per Bothner  (bothner at cygnus.com)
+
+	* aoutx.h (NAME(aout,find_nearest_line)):  Recognize N_SOL
+	symbols, so that we can emit the correct file name even
+	if it's an include file.
+
+Thu Jan  2 16:43:34 1992  John Gilmore  (gnu at cygnus.com)
+
+	* coff-i960.c:  Add COFF_SWAP_TABLE to little_vec as well as big_vec.
+	(Reported by john@labtam.labtam.oz.au (John Carey)).
+
+Wed Jan  1 04:23:06 1992  Fred Fish  (fnf at cygnus.com)
+
+	* elf.c:  Change all '#if HAVE_PROCFS' to '#ifdef HAVE_PROCFS'.
+
+	* config/mh-amix, config/mh-i386v4:  Remove HDEFINES that was
+	being used to -DHAVE_PROCFS.
+
+	* hosts/h-amix, hosts/h-i386v4:  Add '#define HAVE_PROCFS'.  Move
+	'#include "fopen-same.h"' to end of file to match other h-* files.
+
+Fri Dec 20 12:06:17 1991  Fred Fish  (fnf at cygnus.com)
+
+	* configure.in:  Change svr4 references to sysv4.  Add case
+	"unknown" for target vendor and infer some targets based
+	on the specified operating system.
+
+Wed Dec 18 17:17:59 1991  Stu Grossman  (grossman at cygnus.com)
+
+	* bfd-in.h, libaout.h:  ANSIfy enums.
+
+Wed Dec 18 16:12:25 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* archive.c (normalize): created version for VMS which removes the
+	VMS directory crap from the front and end of a filename, eg turn
+	[-.foo]bar.obj;123 into bar.obj
+	(bfd_construct_extended_name_table): now writes index into an
+	extended name table in decimal - the same base used to read an
+	extended name table.
+
+Wed Dec 18 14:40:39 1991  Per Bothner  (bothner at cygnus.com)
+
+	* aout-encap.c:  Fix to use aout-target.h.
+	* aoutf1.h:  Use standard MY_object_p and MY_callback
+	in aout-target.h.  Remove target-specific versions.
+	* host-aout.c:  Re-write to use aout-target.h.
+	* gen-aout.c:  New files use with host-aout.c to generate
+	host-specific a.out-related parameters.
+	* Makefile.in:  host-aout.o depends on aout-params.h, which is
+	generated by gen-aout.
+	* aout-target.h:  Make a little more flexible.
+	* libaout.h, aout-target.h:  Removed WORK_OUT_FILE_POSTIONS
+	macro.  Instead, inline it in aout-target.h.
+	* newsos3.c:  Define N_SHARED_LIB(x) as 0 to avoid
+	a gcc -Wall warning.
+	* archive.c:  Add missing commas in DEFUN macro (2 places).
+	* elf.c, coffcode.h, aoutf1.h:  Use ANSI functions instead of
+	Berkeley ones, now that libiberty has them:
+	bcopy->memcpy, bzero->memset, bcmp->memcmp.
+	* aoutx.h:  Various touch-ups:  Re-formatting, fix a cast,
+	remove unused variable.
+
+Tue Dec 17 19:48:59 1991  Fred Fish  (fnf at cygnus.com)
+
+	* elf.c (elf_core_file_matches_executable_p):  Enclose corename
+	and execname inside HAVE_PROCFS ifdef since they are unused
+	when it is not defined.
+
+Mon Dec 16 12:00:10 1991  Fred Fish  (fnf at cygnus.com)
+
+	* elf.c:  Flag all sections as either code or data.  We can't
+	be sure what they are anyway, since ELF doesn't fit the
+	traditional model of text+data+bss very well.  Add new local
+	function elf_read() to simplify code.  Record entry point in
+	the bfd structure.
+
+Thu Dec 12 21:01:22 1991  John Gilmore  (gnu at cygnus.com)
+
+	* hosts/h-*.h:  Configure fopen using ../include/fopen-*.h
+	rather than N copies of the same lines.
+
+Wed Dec 11 16:39:45 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* cpu-h8300.c: disassemble branch displacements correctly
+	* coff-h8300.c: put reloc offsets out in 32bits
+
+	* makefile.dos, configdj.bat: New files from DJ
+	* cache.c: fopen with new macros is needed for DOS.
+	* ieee.c: environ renamed to envi to stop an include file
+	conflict.
+	* opncls.c, coff-rs6000.c: more fopens with macros.
+
+Tue Dec 10 04:07:24 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* Makefile.in: infodir belongs in datadir.
+
+Sat Dec  7 16:39:23 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	 * Makefile.in: fix where docdir lives
+
+	 * aoutx.h, archive.c, archures.c, bfd.c, cache.c, coff-m88k.c,
+	 coffcode.h, core.c, ctor.c, elf.c, format.c, ieee.c, init.c,
+	 libbfd.c, libbfd.h, libcoff.h, opncls.c, reloc.c, section.c,
+	 srec.c, syms.c, targets.c : all new documentation and lint
+	 removal.
+
+
+Sat Dec  7 07:22:09 1991  John Gilmore  (gnu at cygnus.com)
+
+	* coffcode.h, srec.c:  Lint.
+
+Fri Dec  6 22:58:48 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* Makefile.in: install using INSTALL_DATA, added standards.text
+	  support.
+
+	* configure.in: mark directory as target dependent.  configure
+	  nows works in objdir always so make file existence checks
+	  against ${srcdir}.
+
+Thu Dec  5 22:46:19 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* Makefile.in: idestdir and ddestdir go away.  Added copyrights
+	  and shift gpl to v2.  Added ChangeLog if it didn't exist. docdir
+	  and mandir now keyed off datadir by default.
+
+Wed Dec  4 10:14:17 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* aoutf1.h (sunos_<size>_object_p, sunos4_callback): moved the
+	computation of arch and machine type so it's worked out before
+	some_aout_object_p is called.
+	* aoutx.h: (some_aout_object_p): don't set arch and mach to
+	unknown.
+	* archures.c: add extra field 'section_align_power' to hold
+	default section alignment in object files.
+	* cpu-a29k.c, cpu-h8300.c, cpu-i386.c, cpu-i960.c, cpu-m68k.c,
+	cpu-m88k.c, cpu-mips.c, cpu-rs6000.c, cpu-sparc.c, cpu-vax.c:
+	initialize the new field.
+	* bout.c (b_out_callback): replace the text size, since aout
+	fries them.
+	* aoutx.h: Documentation in the new style
+
+Wed Dec  4 02:00:30 1991  John Gilmore  (gnu at cygnus.com)
+
+	* bfd.c (bfd_get_mtime):  Don't cache mtime any more; only
+	use the saved value if mtime_set is already set (intended
+	for archive files, though apparently not used yet).
+
+Tue Dec  3 22:54:50 1991  John Gilmore  (gnu at cygnus.com)
+
+	* targets.c:  Revise comments about how to configure the target
+	vector, to match reality.  Remove mention of obsolete methods.
+	Remove long lists of capitalized macros that turn into the same
+	thing in lowercase.  Normal vector simply lists all known
+	lowercase xvec names; all other cases are handled by SELECT_VECS.
+
+	* config/mt-i386-coff:  Set DEFAULT_VECTOR to real identifier,
+	not macro name.
+
+	* config/mt-i960-{coff,bout}:  Use SELECT_VECS to make a short
+	list of supported targets.
+
+Tue Dec  3 14:06:15 1991  Per Bothner  (bothner at cygnus.com)
+
+	* archive.c (bsd_write_armap):  The pad byte sometimes added to
+	the string table in a __.SYMDEF member is now
+	counted as part of the size of the string table.
+	This is compatible with the old ranlib, as well as Sun's.
+
+Tue Dec  3 10:53:30 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* srec.c: Rewrote to fix many bugs; now gets the record type
+	right, doesn't choke on input, sets the start address in an S9 and
+	fills in the filename on an S0.
+
+Sat Nov 30 21:19:15 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* cpu-h8300.c: Add support for MEMIND addressing mode
+
+	* coff-a29k.c: defined RELOC_PROCESSING to take the #ifdef out of
+	coffcode.h
+	* coffcode.h: use the new macro if available
+
+	* elf.c (elf_corefile_note): cast malloc to avoid warning.
+	* Makefile.in: Fixed dependencies due to file rename
+
+	* aout-encap.c, aoutf1.h, aoutx.h, archive.c, bout.c, coff-a29k.c,
+	coff-h8300.c, coff-i386.c, coff-i960.c, coff-m68k.c, coff-m88k.c,
+	coff-mips.c, coff-rs6000.c, cpu-h300.c, elf.c, i386aout.c,
+	newsos3.c, stab-syms.c, syms.c: All these files have had their
+	#includes altered to point to the new places.
+
+Fri Nov 29 20:04:49 1991  Fred Fish  (fnf at cygnus.com)
+
+	* config/mh-i386v4, config/mh-i386-elf, hosts/h-i386v4.h:  New files.
+
+	* configure.in:  Add vendor "ncr" as supported per-target vendor.
+	Add svr4 case for i386 per-host case.
+
+	* elf.c (elf_object_p, elf_core_file_p):  Add missing "break" to
+	ELFDATA2LSB cases.
+
+Fri Nov 29 12:16:51 1991  Per Bothner  (bothner at cygnus.com)
+
+	* syms.c (bfd_decode_symclass):  Return 'A'
+	for symbols that are both absolute and global.
+	* archive.c (bfd_special_undocumented_glue):  Return NULL
+	if bfd_ar_hdr_from_filesystem returns NULL.
+
+Tue Nov 26 09:10:55 1991  Steve Chamberlain  (sac at cygnus.com)
+
+	* Makefile.in: added coff-h8300
+	* configure.in: now h8 is a coff target
+	* cpu-h8300.c: fix various disassembly problems
+	* libcoff.h: took out some code which has been #0ed for a long
+	time.
+	* targets.c: added h8 coff
+	* coff-a29k.c, coff-i386.c, coff-i960.c, coff-m68k.c, coff-m88k.c
+	added new macro RTYPE2HOWTO to take a load of #ifdefs out of
+	coffcode.h
+	* coffcode.h: Started to change the way machine dependencies are
+	handled, from the nest of #ifdefs to macros defined in the
+	including coff-<foo>.c
+
+Fri Nov 22 08:11:42 1991  John Gilmore  (gnu at cygnus.com)
+
+	* aoutx.h (some_aout_object_p):  Set the `executable' bit
+	if the entry point is contained in the text segment, even if the
+	text segment is at location 0.
+
+	* coff-mips.c, coffcode.h:  Peter Schauer's patch to kludge in
+	nonstandard MIPS sections (.rdata, .sdata, etc).
+
+	* aoutx.h, bfd.c, coffcode.h, ieee.c, oasys.c, targets.c: CONST lint.
+	* libbfd-in.h, libbfd.h, aoutx.h, coffcode.h, elf.c, libaout.h:
+	Rename ALIGN to BFD_ALIGN to avoid conflict with BSD <sys/param.h>.
+	* libbfd.c:  Lint.
+	* host-aout.c, trad-core.c:  Fix write_armap prototypes.  Lint.
+
+Thu Nov 21 19:56:40 1991  Per Bothner  (bothner at cygnus.com)
+
+	* stab-syms.c, syms.c:  Moved bfd_stab_name() and bfd_stab_names[]
+	from syms.c to new file stab-syms.c.  Also, since GNU extended
+	type codes such as N_SETT are no longer in ../include/stab.def,
+	include them manually.
+	* stab-syms.c, aoutx.h: Renamed bfd_stab_name() and
+	bfd_stab_names[] to aout_stab_name() and aout_stab_names[].
+	* libaout.h: Added prototype for aout_stab_name().
+	* Makefile.in:  Update Makefile for new stab-syms.[co].
+
+Thu Nov 21 11:50:49 1991  John Gilmore  (gnu at cygnus.com)
+
+	* libaout.h (WORK_OUT_FILE_POSITIONS):  One more try at this
+	rather complicated seeming problem.  Eliminate LOGICAL_ versions,
+	just make N_XXX work by excluding the header from the text segment.
+	* aoutx.h:  Fix comments to match.
+
+Tue Nov 19 18:49:01 1991  Per Bothner  (bothner at cygnus.com)
+
+	* libaout.h (WORK_OUT_FILE_POSITIONS):  Use new LOGICAL_TXTADDR,
+	LOGICAL_TXTOFF, LOGICAL_TXTSIZE macros to figure out numbers
+	for the "logical" text segment (i.e. never consider the exec
+	header to be part of the text segment).  This change is
+	needed for consistency with various other parts of bfd and ld.
+	* aoutx.h (NAME(aout,soe_aout_object_p)):  Fix comment,
+	and move calculation of obj_textsec(abfd)->size to libaout.h.
+	* bfd-in.h:  Removed bogus ';'.
+
+	* Makefile.in:  Add MINIMIZE flag to select lean
+	or bloated target_vector.
+	* targets.c:  Use new MINIMIZE macro, and add trad_core if needed.
+	* newsos3.c:  Fixes to ../include/aout64.h remove need
+	for special N_TXTOFF macro, but require N_HEADER_IN_TEXT.
+
+Mon Nov 18 12:00:59 1991  Per Bothner  (bothner at cygnus.com)
+
+	* aout-target.h, aoutf1.h, newsos3.c:  Make aout-target.h
+	handle both little and big-endian targets, with little
+	the default unless TARGET_IS_BIG_ENDIAN_P is defined.
+	* host-aout.c:  Add FIXME note.
+
+Sun Nov 17 13:29:39 1991  Per Bothner  (bothner at cygnus.com)
+
+	* targets.c:  Make the default target_vector contain
+	just &DEFAULT_VECTOR.  This makes executables a lot smaller.
+	Old behavior can be gotten by defining ALL_TARGETS.
+	* aoutf1.h, demo64.c, i386aout.c, newsos3.c, sunos.c:
+	Factored out common code into new file aout-target.h.
+	Saves a lot of duplicate code for a.out variants.
+
+Fri Nov 15 13:00:43 1991  Per Bothner  (bothner at cygnus.com)
+
+	Get 'make headers' to work when configured with +subdirs.
+	* Makefile.in: Add $(subdir) to docdir path.
+	* doc/Makefile.in (protos): Add $(srcdir) prefix
+	to name of sed scripts.
+
+Thu Nov 14 19:49:10 1991  Per Bothner  (bothner at cygnus.com)
+
+	* aoutx.h (NAME(aout,print_symbol)):  Fix thinko.
+	* syms.c (bfd_stab_names):  Turn on new GNU_EXTRA_STABS macro
+	to include names of N_SETT etc.
+
+Thu Nov 14 19:11:13 1991  Fred Fish  (fnf at cygnus.com)
+
+    	* elf.c:  Add minimal support for ELF symbol tables.  Generates
+	canonical bfd symbol tables from ELF symbol tables.  Change the
+	name of some functions from bfd_<name> to elf_<name>.
+
+	* syms.c:  Trivial fix to comment to remove a redundant "to".
+
+Wed Nov 13 17:02:01 1991  John Gilmore  (gnu at cygnus.com)
+
+	* coff-{i386,m68k,m88k}.c:  Change name of file format to standard
+	form that GDB recognizes as COFF.
+
+Wed Nov 13 09:09:41 1991  Steve Chamberlain  (sac at cygnus.com)
+
+	* ieee.c (ieee_object_p):  cast NULL correctly.
+	* configure.in: added harris host
+
+	* coff-a29k.c: Lots of changes, most from David Wood.
+
+Tue Nov 12 07:21:41 1991  John Gilmore  (gnu at cygnus.com)
+
+	* coff-m88k.c (coff_write_armap):  Just #undef it.
+
+Mon Nov 11 20:30:18 1991  Steve Chamberlain  (sac at cygnus.com)
+
+	* Makefile.in: standardize on MINUS_G to disable debugging
+	* coff-m88k.c: create coff armaps instead of bsd ones.
+	* opncls.c (bfd_close_all_done), (bfd_close): Mask out random bits
+	when calling chmod.
+
+Mon Nov 11 19:07:32 1991  Fred Fish  (fnf at cygnus.com)
+
+	* elf.c:  Additions to support ELF format core files.
+	* config/mh-amix:  Add -DHAVE_PROCFS to HDEFINES, since host
+	has support for /proc (all the include files in particular).
+
+Mon Nov 11 18:36:47 1991  Per Bothner  (bothner at cygnus.com)
+
+	* aoutx.h (NAME(aout,find_nearest_line)):  Handle the case
+	of two N_SO stabs, one for directory, and one for filename.
+
+	* bfd-in.h (print_vma):  Factor out duplicate definition.
+
+	Exit a little more gracefully when malloc returns NULL.
+	* libbfd.c: New function bfd_xmalloc (malloc wrapper).
+	* opncls.c, syms.c, bout.c, aoutx.h:  Replace malloc by bfd_xmalloc.
+	* libbfd.h: Rre-generated due to libbfd.c update.
+
+Sat Nov  9 13:45:01 1991  Fred Fish  (fnf at cygnus.com)
+
+	* config/mt-m68k-elf:  Define DEFAULT_VECTOR as elf_big_vec.
+
+	* elf.c (elf_object_p):  Don't try to create a bfd section for
+	the first ELF section header.  It is just a placeholder.
+
+Sat Nov  9 03:04:26 1991  John Gilmore  (gnu at cygnus.com)
+
+	* coff-rs6000.c, config/mh-rs6000:  Make it work on archive and
+	core files, when compiling native.
+	* hosts/h-rs6000.h:  Define FASCIST_FDOPEN for bfd_fdopenr.
+
+	FIXME:  The aoutf1.h change below needs to be reversed back
+	to the way it was.
+
+Thu Nov  7 11:03:55 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* coffcode.h: Defined new macros [PUT|GET]LINENO_LNNO for
+	manipulation of lnno fields in lineno structs in a coff-<f>.h
+	independent way. Override it in coff-<f>.h to your favourite
+	number if you don't have a 16bit lnno field. (coff_swap_lineno_in)
+	(coff_swap_lineno_out): modified to use the new macros.
+
+Mon Nov  4 11:38:33 1991  Steve Chamberlain  (sac at cygnus.com)
+
+	* aoutf1.h (sunos4_callback): Now defaults to 68020 rather than
+	unknown arch when the magic number doesn't specify the
+	architecture, since some OSs (eg old sun3s) don't set the number, and
+	020 is probably the right answer anyway.
+
+Sun Nov  3 12:07:08 1991  Per Bothner  (bothner at cygnus.com)
+
+	* hosts/h-news.h, hosts/h-rtbsd.h:
+	Get rid of MISSING_VFPRINTF, since libiberty provides one.
+	* bfd-in.h (bfd_print_symbol_type_hopw enum):   Add new option
+	bfd_print_symbol_nm, for use by nm.
+	* aoutx.h (NAME(aout,print_symbol)):  Add code for new
+	bfd_print_symbol_nm option, to print in nm format.
+	* coffcode.h (coff_print_symbol), ieee.c (ieee_print_symbol)
+	oasys.c (oasys_print_symbol):  Provide stub implementations
+	for bfd_print_symbol_nm.
+	* syms.c:  New function bfd_decode_symclass, used by nm printer.
+	New function bfd_stab_name to look up string name of stab code.
+
+Sat Nov  2 14:26:03 1991  Steve Chamberlain  (steve at cygnus.com)
+
+	* Makefile.in: Added ctor.c
+	* archures.c (bfd_default_arch_struct) added
+	bfd_default_reloc_type_lookup.
+	* coffcode.h: removed a load of #if 0ed code.
+	(coff_compute_file_section_positions): now works out the section
+	alignment and size correctly in all cases.
+	(coff_get_symtab): looks for constructor symbols and calls the
+	right function when they're found. (coff_canonicalize_reloc):
+	knows when a section is full of constructors and does the right
+	thing.
+	* cpu-m88k.c: Added default_reloc_type lookup to the architecture
+	description.
+	* libbfd-in.h: (bfd_default_reloc_type_lookup) defun  added.
+	* libcoff.h: removed #if 0ed code
+	* reloc.c: (bfd_reloc_code_real_type) added BFD_RELOC_CTOR for
+	arch independent constructor relocation type.
+	(bfd_reloc_type_lookup): removed the comment "this will go away"
+	since it won't. (bfd_howto_32): stolen from 88k, this is a 32bit
+	reloc which is used when BFD_RELOC_CTOR falls through to give a
+	default 32bit reloc for constructors.
+	(bfd_default_reloc_type_lookup): added.
+	* aoutf1.h: fixed SEGMENT_SIZE typo.
+
+Thu Oct 31 18:23:06 1991  John Gilmore  (gnu at cygnus.com)
+
+	* coff-rs6000.c:  Change name to "aixcoff-rs6000", to avoid
+	matching prefix "coff".
+	* coffcode.h (coff_swap_aux_in, coff_swap_aux_out):  Handle
+	rs/6000 csect records.
+
+Sun Oct 27 16:56:58 1991  Steve Chamberlain  (steve at cygnus.com)
+
+	* coff-m88k.c, targets.c: change name of m88k_bcs to m88kbcs
+	* configure.in: add motorola delta88 cases
+	* libbfd.h, libbfd-in.h, archive.c, ieee.c, elf.c, srec.c: fix
+	write_armap prototype
+	* libbfd.c: add doc on bfd_write_bigendian_4byte_int
+
+Fri Oct 25 02:48:19 1991  John Gilmore  (gnu at cygnus.com)
+
+	* Rename COFF-related files in `coff-ARCH.c' form.
+	coff-a29k.c, coff-i386.c, coff-i960.c, coff-m68k.c, coff-m88k.c,
+	coff-mips.c, coff-rs6000.c to be exact.
+
+	* Makefile.in:  Only supply TARGET_DEFAULTS to targets.c, reducing
+	make output clutter.
+	* config/mt-*:  Ditto.
+
+Thu Oct 24 22:40:07 1991  John Gilmore  (gnu at cygnus.com)
+
+	RS/6000 support, by Metin G. Ozisik, Mimi Ph��ng-Th�o V�, and
+	John Gilmore.  Archive support from Damon A. Permezel.
+
+	* Makefile.in:  Add cpu-rs6000.c and rs6000coff.c.
+	* configure.in:  Add rs6000 case.
+	* targets.c:  Add rs6000 vector.
+	* archures.c:  Add rs6000, fix comment on romp.
+	* bfd-in.h (enum bfd_error):  Add no_debug_section error.
+	* libcoff-in.h (struct coff_tdata):  Remove unused string_table.
+	* bfd.c (bfd_errmsgs):  Add no_debug_section error message.
+	* section.c (bfd_make_section):  Return NULL on attempt to create
+	a section twice.
+	* coffcode.h (bfd_swap_reloc_in):  Handle r_type and r_size.
+	(bfd_swap_aouthdr_in):  Handle lots more members.
+	(make_a_section_from_file):  If section has already been seen,
+	just return false rather than overwriting it.
+	(coff_real_object_p):  Understand incoming magic numbers.
+	(coff_set_flags):  Understand outgoing magic numbers.
+	(coff_compute_section_file_positions):  outgoing aouthdr magic #.
+	(build_debug_section):  Add fn for reading debug string section.
+	(get_normalized_symtab):  Handle symbol names in debug string section.
+	Remove unused obj_string_table.
+	(coff_slurp_symbol_table):  Handle rs6000-specific storage classes.
+	* aoutx.h (translate_from_native_sym_flags, N_SET*):  Check for
+	existing section before making one.
+	* cpu-rs6000.c:  New file.
+	* rs6000coff.c:  New file.
+
+Thu Oct 24 02:03:24 1991  Fred Fish  (fnf at cygnus.com)
+
+	* elf.c: Add partial support for ELF format corefiles. Still needs
+	support for extracting registers from corefiles.
+
+	* config/t-m68k-elf:  Set DEFAULT_VECTOR to elf_big_vec.
+
+	* config/{h-amix,h-dgux,h-irix3,h-ultra3}: For systems where
+	RANLIB is defined as echo, send the output to /dev/null to help
+	reduce clutter in the output from doing a make.
+
+Mon Oct 21 17:48:48 1991  John Gilmore  (gnu at cygnus.com)
+
+	* hosts/h-vaxult.h:  Remove malloc/free decls covered in stdlib.h.
+	Fix HOST_PAGE_SIZE and HOST_SEGMENT_SIZE.  From David Taylor.
+
+Mon Oct 21 09:34:11 1991  Steve Chamberlain  (steve at rtl.cygnus.com)
+
+	* coffcode.h (coff_compute_section_file_positions): make it pad
+	section size out if there are alignment restrictions so that the
+	image will be ok on a system where section positions are worked
+	out by accumulating sizes rather than from the section headers.
+	* targets.c (proto write_armap). Changed orl_count to unsigned.
+	* opncls.c (bfd_close_all_done). Added so that generative
+	programs like gas can close a bfd without causing bfd confusion.
+	* libbfd.h (changed becuase of protos)
+	* amdcoff.c: messed with the way that jmp displacements are
+	calcualated. This may not yet be totally correct.
+	* archive.c (coff_write_armap): rewrote the way that ranlibs are
+	written out.
+	* coffcode.h (fixup_symbol_value): now doesn't core dump if a non
+	abs symbol has no section (like a register symbol).
+	(coff_write_symbol) now zeros auxent before filling it up to help
+	with sensitive applications.
+	* libbfd.c (bfd_write_bigendian_4byte_int): added.
+
+Wed Oct 16 22:58:45 1991  John Gilmore  (gnu at cygnus.com)
+
+	* bfd.c:  Make sure we don't get a macro strerror().
+	* opncls.c (bfd_fdopenr):  If FASCIST_FDOPEN, use "r", not "r+".
+	* trad-core.c (trad_unix_core_file_failing_command):  Suppress
+	attempt to recover command, ifdef NO_CORE_COMMAND.
+	* hosts/h-tahoe.h:  Add FASCIST_FDOPEN and NO_CORE_COMMAND;
+	revamp HOST_*, etc.
+	* hosts/h-i386v.h:  Use <utime.h>, not <sys/utime.h>, unlike POSIX.
+
+Wed Oct 16 12:43:49 1991  Per Bothner  (bothner at cygnus.com)
+
+	* archive.c (bsd_write_argmap): The size of the ranlib structures
+	should not include the size field itself.
+	* aoutx.h, libaout.h (NAME(aout, sizeof_headers)):  Use
+	adata(abfd)->exec_bytes_size field instead of constant macro,
+	because aoutx.h compiles to a simple .o file shared by
+	all 32-bits a.out targets.
+
+Wed Oct 16 11:11:05 1991  John Gilmore  (gnu at cygnus.com)
+
+	* configure.in:  Allow i386-sco-sysv.
+	* bout.c:  Remove unused i960_align; lint dummy core file handlers.
+	* cpu-h8300.c:  lint.
+
+	* host-aout.c:  New strategy.  We use common code, include files,
+	and data structures to handle the file, but set a few parameters
+	from the host's config file (page size, text start addr, etc).
+	* libaout.h:  Define HP BSD machine types.
+	* aoutf1.h:  Handle reading a.outs with these types.
+
+	* trad-core.c:  Pass the u.u_ar0 value as the negative of the
+	virtual-memory-address of the .reg section.  We can't just make a
+	section for "all the regs and nothing else" because only GDB knows
+	exactly where the regs are (scattered around the upage and stack).
+	Clean up memory allocation.  Remove big- and little-endian
+	vectors, replace with single vector; this only runs on the host,
+	in host byte order.  Replace byteswap routines with aborts in case
+	anyone calls them.
+	* targets.c:  There's only one trad_core_vec now.
+	* aoutf1.h (sunos_core_file_p):  VMA of .reg* now needs to be 0.
+
+Tue Oct 15 08:29:03 1991  John Gilmore  (gnu at cygnus.com)
+
+	* hosts/h-amix.h (free):  Fix prototype.
+
+	* aoutx.h:  Don't use NULL as an integer, for braindead systems
+	that declare it as (void *)0.  (From Peter Schauer.)
+
+Mon Oct 14 17:20:47 1991  Per Bothner  (bothner at cygnus.com)
+
+	* opncls.c (bfd_fdopenr):  Add parentheses to avoid reported
+	problem with bad Ultrix system headers.
+	* aoutx.h (NAME(aout,set_section_contents)):  Try to handle the
+	various kinds of alignments for the various kinds of
+	magic numbers.
+
+Mon Oct 14 14:23:10 1991  John Gilmore  (gnu at cygnus.com)
+
+	* doc/Makefile:  Don't assume . is on the path (from James Clark).
+
+Fri Oct 11 22:45:14 1991  John Gilmore  (gnu at cygnus.com)
+
+	* Makefile.in:  Avoid Sun Make VPATH bugs.
+	* targets.c:  Declare trad_core vectors extern.
+
+Fri Oct 11 13:03:02 1991  Per Bothner  (bothner at cygnus.com)
+
+	* coffcode.h: Moved ALIGN macro to libbfd.h. Removed i960_align.
+	* libbfd.h: Moved ALIGN macro here.
+	* bout.c (b_out_callback): Replace i960_align by align_power.
+
+	* libaout.h (struct aoutdata):  Added fields page_size,
+	segment_size and exec_bytes_size.  These help generic code
+	(in aoutx.h and libaout.h) to figure out where to align
+	the various segments in a demand paged file.
+	* libaout.h (WRITE_HEADER):  Use new (struct aoutdata) fields
+	to decide if the exec header counts in a_text (text segment size).
+	Also, assume D_PAGED flag is set; don't set it here.
+	* bout.c (b_out_callback): Add initialization of
+	adata fields page_size, segment_size, and exec_bytes_size.
+	* host-aout.c (NAME(host_aout, callback) and
+	NAME(host_aout,mkobject): Ditto.
+	* i386aout.c (aout386_callback) and new aout386_mkobject): Ditto.
+	* newsos3.c (newsos3_callback) and new newsos_mkobject): Ditto.
+	* aoutf1.c (sunos4_callback) and new sunos_mkobject): Ditto.
+	* aoutx.h (NAME(aout,some_aout_object_p)): Don't subtract
+	EXEC_BYTES_SIZE from the a_test size; this is only appropriate
+	for some systems (mainly sunos), so do it in the callback instead.
+	Same routine: Add stuff to the THIS_IS_ONLY_DOCUMENTATION comment.
+	* aoutx.h (NAME(aout,set_section_contents): Change the way
+	filepos and size of sections are carried out to support
+	older styles of demand paged executables.
+
+
+Fri Oct 11 12:33:36 1991  Steve Chamberlain  (steve at cygnus.com)
+
+	* bfd-in.h: Added more macros to COFF_SWAP_TABLE.
+	* bfd.c: Added macros to enable gas to swap coff records.
+	* coffcode.h: Make the coff_swap_*_out routines return the number
+	of bytes swapped, and cleaned up their prototypes.
+	* configure.in: Added ebmon/coff support
+	* ecoff.c: Changed null definitions of coff_swap_*_out to conform
+	to new prototypes
+	* targets.c: Added new entry points for coff swapping
+
+Fri Oct 11 03:01:52 1991  John Gilmore  (gnu at cygnus.com)
+
+	Restructure configuration scheme for bfd, binutils, ld.
+
+	* include/sys/h-*.h:  Move to bfd/hosts/h-*.h.
+	* configure.in:  Revise to symlink sysdep.h to hosts/h-xxx.h.
+	Change some config names to match other dirs.
+	* *.c:  Include bfd.h before sysdep.h, so ansidecl and PROTO()
+	get defined first.
+	* Makefile.in:  Use -I. to get sysdep.h.  Remove refs to
+	../include/sysdep.h.
+	* cpu-i960.c:  Strncmp needed a length arg.
+	* ecoff.c:  Don't ever call trad_unix_core_file_p from here.
+	* i386aout.c:  Remove dead N_TXTOFF override.
+	* trad-core.c:  Don't disable the whole file if SUN4_SYS.
+	* config/:  Rename some config files to match up h-*.h names.
+	Remove all the HOST_SYS definitions from the config files.
+	* hosts/h-amix.h, h-i386v.h:  Define POSIX_UTIME, not USG.
+	* hosts/h-hp9000.h:  Remove USG comment.
+	* hosts/h-rs6000.h:  Include <stdlib.h> for malloc.
+	* hosts/h-news.h, h-sparc-64.h:  New config files that had
+	previously been kludged in the <sysdep.h> file.
+
+Thu Oct 10 17:54:08 1991  John Gilmore  (gnu at cygnus.com)
+
+	* config/*:  trad-core support is HOST dependent, not target
+	dependent.  Target config files only set DEFAULT_VECTOR and/or
+	other vector elements.  Exception:  when host-aout.c is in use,
+	in which case we're forced to assume we're native (hp, vax,
+	tahoe).  Rename XDEPFILES to HDEPFILES.
+	* Makefile.in:  Rename XDEPFILES.
+	* config/h-sun*:  Don't force static linking.
+	* trad-core.c:  Document how to use it nowadays.
+	* i386aout.c, newsos3.c:  Clean up.
+	* i386coff.c:  Allow 386 coff files to be used as core files too
+	(for reading core files from embedded systems).
+
+Tue Oct  8 15:30:39 1991  John Gilmore  (gnu at cygnus.com)
+
+	* Add i386aout.c for a.out support on the i386.
+
+Tue Oct  8 12:18:54 1991  Roland H. Pesch  (pesch at cygnus.com)
+
+	* reloc.c, section.c, syms.c, targets.c: correct info-node
+	structure in *doc* comments.
+	doc/Makefile: stop hiding complaints from makeinfo.
+
+Sun Oct  6 19:10:06 1991  John Gilmore  (gnu at cygnus.com)
+
+	* aoutx.h (...some_aout_object_p):  Take a third parameter,
+	the internal_exec struct, and avoid ever looking at an
+	external_exec.  All callers changed to read the entire
+	external_exec struct, swap and check its magic number,
+	swap in the whole structure, and pass the swapped-in version to
+	some_aout_object_p.
+	* bout.c:  Bring into modern era.  Use single _object_p routine
+	for big- aand little-endian.  Provide internal and external
+	exec header structs.  Use separate swap-in and swap-out routines.
+
+	* libaout.h:  Move struct internal_exec from ../include/aout64.h
+	to here.  Add obj_symbol_entry_size to struct aoutdata.
+	* aoutx.h (...some_aout_object_p):  Set obj_symbol_entry_size.
+
+	* ../include/aout64.h:  Change EXTERNAL_LIST_SIZE to
+	EXTERNAL_NLIST_SIZE.  Callers changed.
+
+Fri Oct  4 18:18:46 1991  John Gilmore  (gnu at cygnus.com)
+
+	* bfd.c:  Remove strerror() to libiberty.
+
+	* elf.c:  Remove elf_set_section_contents, use generic one.  Lint.
+	* libbfd-in.h, libbfd.c:  Add bfd_generic_set_section_contents.
+	* libbfd.c (bfd_generic_{get,set}_section_contents):  Check that
+	last byte of transfer, not first byte, is within the section.
+
+	* host-aout.c:  Remove `BSD' archive support.  Lint.
+
+	* archures.c: Rename `struct bfd_arch_info_struct' to `struct
+	bfd_arch_info'.  Rename `typedef bfd_arch_info_struct_type' to
+	`bfd_arch_info_type'.  All uses changed.
+	* reloc.c:  Rename `bfd_reloc_status_enum_type' to
+	`bfd_reloc_status_type'.  Rename `bfd_reloc_code_enum_real_type'
+	to `bfd_reloc_code_real_type'.  (This seems to be a misnomer,
+	it needs a better name.)  All uses changed.
+	* targets.c:  Rename `enum target_flavour_enum' to `enum
+	target_flavour', and remove the `_enum' from all of the enum
+	values themselves.  All uses changed.
+
+	* configure.in, config/h-i386mach:  i386 mach host.
+	* config/t-i386-aout:  Use host-aout.c.
+
+	* trad-core.c:  Give it its own xvec's to make it independent
+	of other file formats.
+	* ecoff.c, host-aout.c:  Remove refs to trad-core.
+	* config/t-dec3100, t-hp300bsd, t-tahoe, t-vax:  Define TRAD_CORE.
+	* targets.c:  #ifdef TRAD_CORE, include it in the vector.
+
+Fri Oct  4 17:38:03 1991  Steve Chamberlain  (steve at cygnus.com)
+
+	* reloc.c: Extended NEWHOWTO macro
+	* ieee.c: Changed the way 8bit pcrel is done
+	* cpu-h8300.c: got the registers in the right order
+
+Thu Oct  3 19:39:55 1991  John Gilmore  (gnu at cygnus.com)
+
+	* bfd-in.h:  enum boolean => enum bfd_boolean for SVR4.  Gumby's
+	prediction is vindicated!
+
+	* bfd-in.h, libbfd-in.h, doc/Makefile, doc/tolibbfd, doc/intobfd:
+	Remove refs to howto.c, since Steve forgot.
+
+Thu Oct  3 07:49:21 1991  Steve Chamberlain  (steve at cygnus.com)
+
+	* elf.c: took the abort out of set_arch_mach so that objdump -i will
+	still work. Now allows any architecture/machine to be set.
+
+Wed Oct  2 13:50:35 1991  Steve Chamberlain  (steve at cygnus.com)
+
+	* howto.c deleted and moved code to reloc.c
+
+	* libbfd.h, libbfd-in.h removed $id stuff for real
+
+	* cpu-h8300.c Made it match various different spellings of h8300.
+
+	* archures.c: Took out the first char filter which made it only
+	look for a cpu/arch match when the first chars of supplied and
+	tested names were the same.
+
+	* targets.c removed oasys stuff, pending someone to fix the bugs
+	in it.
+
+
+Tue Oct  1 12:29:44 1991  John Gilmore  (gnu at cygnus.com)
+
+	* Makefile.in, configure.in, targets.c, elf.c:  Add preliminary
+	ELF support good enough for GDB.
+	* configure.in, config/h-amix, config/t-m68k-elf:  Handle
+	m68k-cbm-svr4 host and target.
+	* config/t-m68k-coff, t-m88k-coff, t-m88k-aout:  Make files nonempty
+	so `diff' and `patch' can cope.
+
+Tue Oct  1 11:24:31 1991  Steve Chamberlain  (steve at cygnus.com)
+
+	* archures.c: removed texinfo error
+
+	* init.c: added texinfo hooks, and removed initialization error
+	message.
+
+	* libcoff-in.h, libbfd-in.h removed $id field so cvs can merge
+	without complaints.
+
+Tue Oct  1 05:02:53 1991  John Gilmore  (gnu at cygnus.com)
+
+	* cpu-i960.c:  Avoid numerical count of initializers.
+
+	Vax Ultrix changes from David Taylor <taylor@think.com>:
+	* host-aout.c:  Make little-endian vector really little-endian.
+	* configure.in:  Separate vax and tahoe cases, handle ultrix.
+	* config/t-vax:  Add trad-core.o.
+	* config/h-vaxult:  New host system.
+
+Mon Sep 30 15:13:46 1991  Steve Chamberlain  (steve at cygnus.com)
+
+	* bfd-in.h VERSION, change version number to 0.18, this makes a
+	gap, but now is the same as the linker version number.
+
+	* cpu-a29k.c, cpu-i386.c, cpu-m68k.c, cpu-mips.c, cpu-vax.c,
+	cpu-h8300.c, cpu-i960.c, cpu-m88k.c, cpu-sparc.c: added. These
+	files will eventually contain processor specific bits for bfd,
+	like strange relocation information and dis/assembly.  So far only
+	the H8 has been even partially done.  This work also ties in with
+	the change in handling architectures.
+
+	* amdcoff.c: (a29k_reloc) fix error message.
+
+	* aout-f1.h: (choose_reloc_size) now calls bfd_get_arch to
+	discover the architecture of the bfd. (sunos4_callback) calls the
+	function bfd_set_arch_mach rather than stuffing stuff directly
+	into the bfd. (sunos4_write_object_contents), changed names of
+	accessor functions.
+
+	* aoutx.h: (set_arch_mach) now calls bfd_default_set_arch_mach to
+	setup the environment.
+
+	* archive.c: (bfd_slurp_coff_armap) coff archives always have the
+	headers in big endian format, regardless of the endianess of the
+	host or target.
+
+	* archures.c: totally changed. Now an architecture is represented
+	with a pointer to an info structure rather than an enumerated type
+	and a long. The old info is available as two elements in the
+	structure.  Future enhancements to architecure support will
+	involve pointers to methods being placed into the info structure.
+
+	* bfd.c: changed the definition of the bfd structure for the new
+	architecture stuff.
+
+	* bout.c: (b_out_set_arch_mach) changed to use the new
+	architecture mechanism.
+
+	* coffcode.h: (coff_set_arch_mach, coff_set_flags) changed to use
+	the new architecture mechanism.
+
+	* configure.in: added h8 stuff.
+
+	* ieee.c: too many changes to note.  Now ieee files written with
+	bfd gas and ld can be read by gld and ieee only linkers and
+	simulators.
+
+	* libbfd.c, libbfd.h: changed prototype of bfd_write.
+
+	* newsos3.c: (newos3_callback) now calls bfd_set_arch_mach rather
+	than fixing the structure directly.
+
+	* oasys.c: (oasys_object_p) now calls bfd_default_set_arch_mach rather
+	than fixing the structure directly.
+
+	* opncls.c: (new_bfd) makes sure that bfd_init has been called
+	before opening a bfd.
+
+	* srec.c: (srec_set_arch_mach) now calls bfd_default_set_arch_mach
+	rather than fixing the structure directly.
+
+	* targets.c: (target_vector) now by defining SELECT_VECS (perhaps
+	in the t/hmake file) a user can select which backends they want
+	linked with bfd without changing the source.
+
+	* init.c: new, looks after initializing modules.
+
+	* howto.c: for future use, will allow an application to work out
+	what cookie to use as a handle on a relcoatio howto.
+
+Mon Sep 30 13:31:15 1991  John Gilmore  (gnu at cygnus.com)
+
+	* srec.c:  Better error checking, partly from Peter Schauer.
+	(srec_object_p):  Avoid assuming any file that starts with 'S' is
+	an S-record file!  (Check for 3 uppercase-hex digits after it.)
+	(ISHEX):  Define new macro for checking supposedly hex characters.
+	(pass_over):  Treat as EOF any S-record line that:
+	    *  doesn't have hex in either size character
+	    *  produces a size larger than 0x7F
+	    *  has an unrecognized type number
+
+Thu Sep 26 15:27:29 1991  John Gilmore  (gnu at cygnus.com)
+
+	* aoutf1.h, aoutx.h, bout.c, coffcode.h, host-aout.c, oasys.c,
+	opncls.c:  Lint (saber actually).
+
+Thu Sep 26 11:24:24 1991  Per Bothner  (bothner at cygnus.com)
+
+	* libaout.h (WRITE_HEADERS): Set header's a_text field always.
+	* newsos3.c: Fixed two types: newos3 -> newsos3.
+	* reloc.c (bfd_perform_relocation): Fix pc-relative relocation
+	to use correct segment.
+
+Mon Sep 23 18:24:34 1991  Per Bothner  (bothner at cygnus.com)
+
+	* aoutx.h (print_symbol):  Handle missing symbol->name.
+
+Fri Sep 20 12:26:01 1991  Stu Grossman  (grossman at cygnus.com)
+
+	* aoutf1.h (swapcore_sparc):  Change name of USRSTACK, fix comment
+	at top of routine.
+
+Tue Sep 17 17:23:49 1991  Stu Grossman  (grossman at cygnus.com)
+
+	* oasys.c, configure.in, config/h-irix3, config/t-irix3:
+	add sgi/irix support.
+
+Thu Sep 12 14:29:09 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	Changes for the AMD 29000 Ultracomputer port from David Wood.
+	(wood@nyu.edu).
+
+	* opncls.c (bfd_fdopenr):  Handle NO_FCNTL.
+
+	* Makefile.in:  Make subdirs work by using $(INCDIR) in the
+	crude dependencies.
+
+	* coffcode.h (coff_real_object_p):  Pass information about the
+	current file's coff symbol format to BFD via the coff_data struct.
+	(coff_find_nearest_line):  obj_icof => coff_data.
+	(coff_swap_sym_{in,out}):  Check that SYMNMLEN == E_SYMNMLEN.
+	(coff_swap_aux_{in,out}):  Check that FILNMLEN == E_FILNMLEN
+	and DIMNUM == E_DIMNUM.
+	* configure.in:  Handle a29k-*-* hosts, and targets
+	a29k-*-coff, a29k-*-aout, and a29k-*-sym1.
+	* libcoff-in.h:  Add local_n_btmask, local_n_btshft,
+	local_n_tmask, local_n_tshift, local_symesz, local_auxesz,
+	local_linesz to `coff_data' (tdata) struct.
+	(coff_data, coff_data_type, coff_tdata):  Rename struct icofdata.
+	* config/h-ultra3:  Handle a29k-*-* hosts as Ultracomputers.
+
+Thu Sep 12 14:07:22 1991  Roland H. Pesch  (pesch at cygint.cygnus.com)
+
+	* Makefile.in: $(MAKE) for make, $(docdir) for doc
+	* doc/Makefile: redundant dependencies for Sun-make VPATH bug
+
+Tue Sep 10 20:34:12 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	* aoutf1.h (sunos4_core_file_p):  Release the right storage in
+	error case.
+	(sunos4_core_file_matches_executable_p):  Fix header comparison.
+	* aoutx.h:  Avoid shifts of 32 bits, undefined in C.  Lint.
+	* bout.c, icoff.c, ieee.c, libbfd.c, oasys.c:  gcc -O -W lint.
+
+Wed Sep  4 00:44:52 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	Allow GDB to patch object files.
+
+	* aoutf1.h (sunos_core_file_p):  Set SEC_HAS_CONTENTS on all sections.
+	* trad-core.h (trad_unix_core_file_p):  Ditto.
+	* aoutx.h (aout_set_section_contents):  On first output, check
+	abfd->direction and complain if erroneous.
+
+	* Makefile.in:  Add crude dependencies.
+
+Tue Sep  3 13:46:19 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+	* config/* aoutx.h configure* shortened all the h/tmake-xxxx
+	to h/t-xxxx files so that everything will work on System V.
+
+Fri Aug 23 13:51:06 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	* aoutx.h:  Add information on host-aout.c and how to configure
+	to use it, to the manual.
+	* configure.in:  Tix typo.
+	* ecoff.c:  If compiling for DEC3100, use trad_unix core files,
+	else dummy out the core file support.
+	* trad-core.c (trad_unix_core_file_p):  If HOST_DATA_START_ADDR is
+	specified, use it to locate the data section.
+	* coffcode.h (coff_write_symbols):  Declare buffer as bfd_bytes
+	rather than as chars (lint).
+
+Thu Aug 22 22:20:19 1991  Stu Grossman  (grossman at cygint.cygnus.com)
+
+	* aoutx.h, coffcode.h:  saberized.
+
+Thu Aug 22 11:27:06 1991  Roland H. Pesch  (pesch at cygint.cygnus.com)
+
+	* bfd.texinfo: some cleanup, reincorporated more intro matter from
+	bfd.doc
+	bfd.c, targets.c: minor rewording of doc segments
+
+
+Wed Aug 21 19:13:22 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	* trad-core.c (trad_unix_core_file_p):  Use HOST_TEXT_START_ADDR,
+	etc, rather than TEXT_START_ADDR.
+	* host-aout.c:  Remove #if 0 around whole thing.
+	Update to modern (32/64-bit) a.out naming conventions.
+	Include a large chunk of ../include/a.out.gnu.h to get macros that
+	are not defined by the system include files.
+	(host_aout_{32,64}_write_object_contents):  Use the WRITE_HEADERS
+	macro used by the other a.out implementations.
+	* Makefile.in:  Give dependencies to OPTIONAL_BACKENDS.
+
+Wed Aug 21 14:33:06 1991  Roland H. Pesch  (pesch at cygint.cygnus.com)
+
+	* Makefile.in: use targets "bfd.dvi" and "bfd.ps" instead of
+	texdoc and psdoc; make these depend on generated .texi's
+
+	* scanit, (new) unPROTO: turn PROTO macros into ANSI declarations in
+	doc
+
+	* bfd.c, reloc.c, syms.c: minor spelling/wording fixes in doc
+	portions
+
+	* Makefile.in, awkscan-ip, awkscan-p, doc/intobfd,
+	libbfd.h, libcoff.h, tolibcoff; new bfd-in.h, libbfd-in.h,
+	libcoff-in.h: (a) use separate files for invariant parts of bfd.h,
+	libbfd.h, and libcoff.h; (b) in generated parts of same, use less
+	obtrusive marks indicating .c origins.
+
+	* bfd.texinfo: generalize most references to linker
+
+Tue Aug 20 15:18:02 1991  Roland H. Pesch  (pesch at cygint.cygnus.com)
+
+	* Makefile.in: include core.p in PROTOS (building better bfd.h)
+	* archures.c: remove empty foo() definition (crept in at vn1.9)
+
+Mon Aug 19 13:48:22 1991  Roland H. Pesch  (pesch at cygint.cygnus.com)
+
+	* bfd.texinfo: use @setchapternewpage on instead of lots of
+	@page's; minor rephrasing in Introduction.
+
+	* aoutx.h, archive.c, archures.c, bfd.c, bfd.texinfo, cache.c,
+	coffcode.h, core.c, format.c, ieee.c, libbfd.c, libbfd.h, libcoff.h,
+	oasys.c, opncls.c, reloc.c, section.c, syms.c, targets.c (documentation
+	segments): used BFD (caps) more consistently as a name in
+	discourse, fixed a few other minor typos and uses of fonts
+
+
+Thu Aug  8 16:47:43 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+	* coffcode.h: fixed bug where string table size wasn't being swapped.
+
+Thu Aug  1 16:35:28 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+	* section.c: added SEC_CONSTRUCTOR_TEXT|DATA|BSS flags
+
+	* syms.c: added BSF_CONSTRUCTOR, BSF_WARNING and BSF_INDIRECT
+	flags. (bfd_print_symbol_vandf) now knows what to do with the
+	above flags.
+
+	* aoutx.h: made translate_from_native_sym_flags and
+	translate_to_native_sym_flags produce the above flags.
+
+
+Wed Jul 31 09:53:52 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	* all files:  update copyright notices for GPL version 2.
+	Install header comments and attribute most modules to their
+	authors.  BFD's name is now officially "Binary File Descriptor",
+	so remove any conflicting pejoratives.
+	archures.h:  Consists solely of comments; remove it.
+
+Fri Jul 26 18:11:34 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+	* Makefile.in, bfd.c: Made it compile again.
+
+Fri Jul 19 08:17:09 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+	* newsos3.c, targets.c, coffcode.h: new patches from David Wood
+
+
+Mon Jul 15 16:27:42 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+	* aoutf1.h archive.c bfd.c coffcode.h core.c ecoff.c ieee.c
+	bfd.texinfo oasys.c opncls.c reloc.c srec.c: More documentation on
+	lint fixes.
+
+	* amdcoff.c bfd.texinfo Makefile.in : Folded in changes for amd
+	29k coff by David Wood (wood@lab.ultra.nyu.edu).
+
+Thu Jul  4 09:53:16 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+	* core.c: New file.
+	* format.c: New file.
+	* reloc.c: New file.
+	* section.c: New file.
+	* syms.c: New filew.
+	Cleaned up the rest of the files a bit, and added some
+	documentation.
+
+Mon Jul  1 13:29:47 1991  David Wood (wood at david.ultra.nya.edu)
+
+	* opncls.c, ../include/sys/h-sun3.h ../include/sys/h-sun4.h: fcntl
+	really takes 3 arguments, patched code and ammended prototypes.
+
+Fri Jun 14 13:19:40 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+	* ../include/bfd.h (struct bfd_target): Added new field
+	"align_power_min" which contains the minimum alignment for a
+	section. This is used in coff_new_section_hook. The field
+	insertion necessitates an update of all backends..
+
+	* aoutf1.h jump table field inserted
+
+	* archive.c(snarf_ar_hdr)(bfd_slurp_coff_armap) can now parse dgux style extended
+	filenames too.
+
+	* bout.c(b_out_squirt_out_relocs) fix to assertion tests. Jump
+	table field inserted.
+
+	* coffcode.h(just about everything) Now patches up symbol tables
+	using a different mechanism. The Intel major bug has been fixed,
+	and the linker can self host on the Aviion and be debugged with
+	gdb.
+
+	* ecoff.c: new include and jump table patch, i386coff.c: new
+	include and jump table patch,  icoff.c: new include and jump table
+	patch, ieee.c: can now read archives containing ieee modules.,
+	libcoff.h: added (combined_entry_type), libieee.h: uped max
+	sections to 20, m68kcoff.c: new include and jump table patch,
+	m88kbcs.c: new include and jump table patch, oasys.c: various bugs
+	fixed. opncls.c: added bfd_alloc_grow and bfd_alloc_finish.
+	srec.c: jump table patch. trad-code.c fixed #IF typeo
+
+Fri Jun  7 12:35:46 1991  Sean Fagan  (sef at cygint.cygnus.com)
+
+ 	* coffcode.h (coff_swap_aux_in): added else case to deal with
+ 	filenames less than 9 characters.
+
+
+Thu Jun  6 18:27:38 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+	* oasys.c (oasys_archive_p): fixed so it works
+
+	* srec.c: now allows any number of sections to be created in a
+	file. Outputs addresses of the right length.
+
+Thu May 30 15:30:10 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+	* bfd.c (bfd_check_format): Fixed problem where when a defaulted
+	target didn't match, the format got set to the attempted match,
+	breaking a future test.
+
+        *../include/i386coff.h : fixed typo in type field with size
+
+	* i386coff.c icoff.c m88k-bcs.c ecoff.c ../include/bfd.h : Added
+	support in the jump table for the swapping routines exported to
+	gdb. Now gdb works with the 386.
+
+Tue May 28 17:21:43 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	* Merge in changes from gdb-3.95 release.
+	Makefile.in:  Allow hmake and tmake files to add OFILES.
+	aoutf1.h:
+	bfd.c:  support specific targets as well as searching.  When
+	searching, take default target in preference to others.
+	bfd.doc:  typos
+	ieee.c, oasys.c:  Avoid using the "tdata" macros left of assignment.
+	liba.out.h:  Don't hard-code file offsets; use N_ macros for them.
+	libbfd.h:  Support specific targets as well as searching.
+	opncls.c:  Support specific targets as well as searching.
+	targets.c:  Search is short-circuited if default target matches.
+	liboasys.c, libieee.c:  Undo bothner changes that make macros
+	work to the left of assignment, but which depend on the
+	representations of different pointer types being the same.
+
+Fri May 24 18:56:52 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+	* i386coff.c: created.
+	* coffcode.h: added support for 386.
+	* Makefile.in: added support for 386.
+	* ../include/i386coff.h: created
+
+Wed May 22 07:26:38 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+	* coffcode.h: removed all put_x_<sizes>
+	* libbfd.c: Changed #ifdef __GNUC__ to #ifdef HOST_64_BIT, Added
+	DEFUNS
+
+
+Tue May 21 08:58:58 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+	(bothner)
+	* opncls.c: Changed obstack_chunk_alloc use xmalloc
+
+Mon May 20 17:12:17 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+	* everything: Removed sysdep.h from bfd.h and put back into files
+	from which it was split out. Now 64 bit version is built with a
+	-DHOST_64_BIT="long long" on the compile line.
+
+Fri May 17 19:35:26 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+	Changed all the [get|put][name] routines to use  [get|put]_[size
+	in bytes].
+
+	Put in support for 64 bit work. Now two versions of bfd may be
+	generated, according to the state of TARGET_64_BIT, one which is
+	32 bit only, and one which is 64/32 bits.
+	Created new back end 'demo64' to test 64 bit functionality.
+
+	Renamed some files to work on DOS.
+
+	* archive.c: lint * bfd.c: prototypes and lint. * ecoff.c: added
+	64bit transfer 	* icoff.c: added 64bit transfer * ieee.c: name
+	chage, 64 bit transfer. * liba.out.h: Split out common code from
+	sunos and newsos into liba.out. Name changes and prototype mods. *
+	libbfd.c: lint and prototypes, extra 64bit swaps. * libbfd.h:
+	prototypes for new functions. * libcoff.h: lint * libieee.h: make
+	work on DOS * liboasys.h: make work on DOS * m88k-bcs.c: Name
+	change and 64bit stuff.* newsos3.c: common code removed, new jump
+	table. * oasys.c: Name change * opncls.c: Portability fixes *
+	srec.c: Name changes * sunos.c: Removed comon code. * targets.c:
+	Added demo * aout32, aout64.c include  aoutx.h * bout.c: used to
+	be called b.out.c * coffcode.h: used to be called coff-code.h, now
+	64bit ized. * demo64.c: 64 bit a.out back end
+
+Thu May 16 16:02:07 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+	from bothner
+ 	* libieee.h: Make ieee_data and ieee_ar_data macros usable
+	on LHS of assignment, even when using old compilers.
+	* liboasys.h: Ditto for oasys_data and oasys_ar_data.
+	* m68kcoff.c: Add enum-to-int casts to accomodate old compilers.
+	* newsos3.c: Fix definitions of SEGMENT_SIZE and TEXT_START_ADDR.
+	* opncls.c: Define S_IXUSR, S_IXGRP, S_IXOTH if undefined.
+	* targets.c: Add declaration of newsos3_vec.
+
+Mon May 13 10:03:29 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+	* aout.c: fixxed some of the problems with filepos calculation.
+	(swap_ext_reloc): fixed problem with creation of relocs.
+	(aout_set_section_contents): fixed filepos problem
+
+	* coff-code.h: (swap_filehdr_in, swap_filehdr_out) add.
+	(swap_filehdr) delete. Changed all the usage of bfd_h_put_x.
+	(swap_aouthdr_in, swap_aouthdr_out) add. (swap_aouthdr) delete.
+	(coff_real_object_p) cleaned up, added MIPS. (coff_object_p)
+	cleaned up. (coff_write_object_contents) cleaned up.
+
+	* ecoff.c: Totally different. Now supports ecoff fully.
+
+	* icoff.c: fixed problems in relocation callout.
+
+	* libcoff.h: (struct icofdata) removed hdr structure from tdata.
+
+	* m68kcoff.c: updated target vector.
+
+	* sunos.c: (choose_reloc_size) added: (sunos4_callback) calls
+	choose_reloc_size. (sunos4_write_object_contents) now calls
+	choose_reloc_size so outputs relocs correctly, also calculates the
+	size of the sections correctly.
+
+
+
+Fri May 10 16:58:53 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	Merge Per Bothner's changes to modularize BFD a.out a bit.
+
+	* libbfd.h, libbfd.c (bfd_generic_get_section_contents):  Add.
+	* ieee.c:  Cast enums to int before comparing them, for brain-
+	dead compilers.
+	* coff-code.h:  Remove coff_get_section_contents, and use the
+	generic one instead.
+
+	* aout.c:  Derive new module from sunos.c, containing generic
+	support code for all kinds of a.out files.
+
+	* sunos.c: Remove all code that goes in aout.c.  Split out
+	machine dependent followup in sunos4_object_p into
+	sunos4_callback.  Use JUMP_TABLE(aout) for the transver vector,
+	and redefine only the names we CHANGE, not all the names.  Drop
+	the little-endian vector, and rename the vector as sunos4 rather
+	than generic.
+
+	* b.out.c:  Use aout.c routines for most of the work.  Slight
+	changes for the new regime.  Remove close_and_cleanup and
+	get_section_contents in favor of generics.  New transfer vector
+	regime.
+
+	* newsos3.c:  New support for Sony NEWS, another a.out format.
+
+	* ecoff.c:  Remove close_and_cleanup.  New tvec regime.
+	* icoff.c, m88k-bcs.c:  Add write_contents to tvec.
+	* ieee.c, oasys.c:  Remove close_and_cleanup, add write_contents
+	to tvec.
+	* opncls.c (bfd_close):  Call format-dependent write_contents
+	routine, if writing, before calling target-dependent
+	close_and_cleanup routine (which is now always generic, I think).
+	* srec.c:  Use bfd_alloc instead of malloc.  Remove
+	close_and_cleanup and move code from it to
+	srec_write_object_contents.  Add write_contents to tvec.
+	* targets.c:  Remove a.out little vector, replace a.out big
+	vector with SunOS vector.  FIXME:  Need Vax support again now.
+
+	* libbfd.h:  Add write_contents format-dependent-vector to the
+	bfd_target vector.  Supply a generic close_and_cleanup routine.
+	* liba.out.h:  Handle the new aout.c split.  Add prototypes for
+	all routines defined in aout.c.  Rename "sunos" things to "aout"
+	things.  Add a few fields where needed for various formats.
+	* Makefile.in:  Add aout.c and newsos3.c.
+
+	* archive.c, ieee.c, oasys.c:  Lint.
+
+Fri May 10 12:34:48 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+	* ../include/bfd.h
+	changed forward declaration struct stat; to reduce warnings. Changed
+	comment on bfd_h_<x>_x.
+
+	* ../include/m68kcoff.h, ../include/intel-coff.h,
+	../include/m88k-bcs.h
+	Now there are two incarnations of relocs, linenos and syments. One for
+	internal digestion, and one full of char arrays for I/O. The original
+	names have gone to detect errors.
+
+	* Makefile.in, m68kcoff.c, targets.c
+	Test new structure code with a 68k coff implementaion
+
+	* coff-code.h, icoff.c, coffswap.c, libcoff.h
+	Fixed all the places where there were problems with the size and
+	alignments of structures on disk and structures in memory. #ifed out
+	all the code in coffswap.c, since it should be done using the target
+	swap routines now.
+
+Thu May  9 11:00:45 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+	* ieee.c (do_one, ieee_slurp_section_data): now supports the load
+	multiple reloc command.
+
+	* sunos.c (sunos4_set_section_contents): Made it so that sections
+	are always padded to their alignment size.
+
+Sat May  4 15:49:43 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	* archive.c, bfd.c, coff-code.h, opncls.c, sunos.c, trad-core.c:
+	Clean up types and such (saber C problems).
+	* ecoff.c:  Clean up types and such.  Remove routines that are
+	not used.  Fix up reading and swapping of shorts from files.
+
+   Notes on bfd-0.5.2-patch1a, from Per Bothner:
+
+	* a.out.vax.c: Remove two bogus "static" from prototypes.
+
+	* ecoff.c: Got rid of lots of non-working junk (that had
+	been copied directly from coff-code.h).
+	Updated to be consistent with updates to icoff.c and coff-code.h.
+
+	* libbfd.h: Added definitions for S_IXUSR, S_IXGRP, and S_IXOTH
+	if they're missing (as they are in (BDS-4.3-based) NewsOS-3).
+
+	* sunos.c (n_txtoff): (Re-)Add support for sony. This is a kludge,
+	but until the target_vector is automatically generated,
+	it's as good as any. Note that the text offset is the only
+	difference between NewsOS and SunOs (including magic numbers).
+	(Most of the sunos_* routines should to renamed bsd_*
+	and move to a bsd.c file. Then (and when the target_vector
+	is automatically generated) it might make sense to create
+	a separate Sony target.)
+
+	* sysdep.h: Don't declare fread and fwrite. Causes trouble
+	on some systems, and doesn't help on others.
+	Similarly, only define X_OK if not already defined.
+
+	* trad-core.c: Don't include sys/stat.h - at least
+	on NewsOS 3, it has already been included.
+
+Tue Mar  5 01:47:57 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	* coff-code.h (bfd_coff_swap_sym, bfd_coff_swap_aux,
+	bfd_coff_swap_lineno):  Export the routines that byte-swap COFF
+	symbol tables if necessary when reading them in, so gdb can use
+	them.  Add "bfd_coff_" to the names so they won't conflict with
+	names in calling programs.  FIXME-soon:  if coff-code.h is
+	included in two BFD modules, this will cause duplicate
+	definitions; the routines should be exported to a separate,
+	common, module (probably along with a mess of other ones).
+
+Sat Mar  2 12:11:26 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	Improve modtime support.
+
+	* bfd.h:  Add boolean mtime_set, and declare bfd_get_mtime.
+	Remove #define for bfd_get_mtime.  Remove gratuitous comment.
+	* bfd.c (bfd_get_mtime):  New fn, caches mtime, gets if not cached.
+	BUG:  archive members still do not get correct mod times.
+
+	Improve floating point support for core files.
+
+	* sunos.c (struct core):  Change void *fpa_dummy to double fp_stuff.
+	(sunos4_core_file_p):  Create a second registers section in the
+	core file, called ".reg2", for the float registers.
+
+Thu Feb 14 15:49:06 1991  Gumby Vinayak Wallace  (gumby at cygint.cygnus.com)
+
+	* many changes to improve archive handling; found a logic flaw in
+	  bfd_check_format which only just happened to work by cooncidence.
+
+Thu Feb 14 07:53:16 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+	* bfd.c (bfd_perform_relocation): fixed to use output_offsets
+	correctly.
+
+	* bfd.h: changed type of udata in asymbol to void *, like it
+	should be. Added bfd_reloc_dangerous enum member.
+
+	* coff-code.h: Fixed it so that internally generated symbols get
+	their values relocated correctly in all cases. Removed calls to
+	xmalloc.
+
+	* icoff.c: Not understanding the destination symbol of a reloc is
+	not a failure any more, just 'dangerous'. This allows linking of
+	b.out and coff images.
+
+	* sunos.c: Cleaned up the way that ZMAGIC section sizes are
+	calculated.
+
+
+Tue Feb 12 13:25:46 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+	* sunos.c (translate_to_native_sym_flags): fixed
+	sym_pointer->n_value so that symbols on the way out get their
+	section relative values calculated correctly.
+
+	* coff-code.h (mangle_symbols): fixed problem where tags were not
+	being relocated for structs, enums, unions. Also various lints.
+
+Mon Feb 11 19:52:26 1991  Gumby Vinayak Wallace  (gumby at cygint.cygnus.com)
+
+	* archive.c (get_elt_at_filepos): system_call_error returned
+	  incorrectly.
+
+Sun Feb 10 23:18:40 1991  Gumby Vinayak Wallace  (gumby at cygint.cygnus.com)
+
+	* Resolve the use of no_error and system_call_error.
+	  The bfd library itself now will never set bfd_error to
+	  no_error.
+
+	  The code still needs to be combed to make sure all the error
+	  codes are correct.  I suspect they are not always set correctly.
+
+	* The names of all the messages have _ prepended because the sun
+	  bundled compiler can't distinguish from a macro which takes an
+	  argument and the same identifier in a non-macro context.
+
+	* The reason for the above being that entry points which used to
+	  be trampoline functions are now just macros which expand to a
+	  direct call through the bfd's xfer vector.
+
+	* (../include/intel-coff.h) F_AR32WR: fix this constant.  Why
+	  must gas have its own version of everything (the gas version
+	  had the correct value)
+
+Tue Feb  5 11:46:53 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+	* b.out.c: Added patches supplied by chrisb@mipon2.intel.com to
+	properly support i960 architecture and output correct reloc stuff.
+
+	* bfd.h: added prototype for bfd_printable_arch_mach, added
+	BFD_FAIL
+
+	* coff-code.h: Applied patches from chrisb to support i960
+	architecture, zero relocs and swap them correcly and conditionally
+	compiled the timestamp.
+
+	* sunos.c: Made the default section alignment 2^3 so that doubles
+	are done properly. Fixed the same reloc bug that was in b.out.c
+
+	* sysdep.h: Now compiles on a Posix box
+
+Wed Jan 30 21:36:26 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	* icoff.c:  Fix comment on big-endian version.
+	* coff-code.h:  Make HAS_RELOC really work (it's backwards from
+	F_RELFLG).  Set F_AR32WR in output files if little endian
+	architecture.
+
+Tue Jan 29 20:56:10 PST 1991 steve@cygnus.com
+
+	* archures.c fixed =/== typo
+
+	* sunos.c added architecture stuff for output. Fixed
+	bug where files where vma(data) != size(text)
+	were processed wrong.
+
+	* coff-code.h added a lint cast
+
+	* (../include/a.out.sun4.h) fixed it so zmagic
+	worked
+
+Mon Jan 28 19:15:29 PST 1991 steve@cygnus.com
+
+	* archive.c removed loads of includes, and fixed bug where string
+	table didn't have a null at the end.
+
+	* bfd.c fixed includes, added symbols argument to
+	canonicalize_reloc entry point.
+
+	* libbfd.c fixed includes and added some lint patches.
+
+	* targets.c added both sorts of intel coff.
+
+	* b.out.c fixed included, changed was the canonical
+	relocs were done.
+
+	* icoff.c added support for callj and big and little
+	enidian tables.
+
+	* opncls.c added chmod+xing for files with EXEC_P set.
+
+	* sunos.c fixed includes. Changed default section
+	alignement to words. Fixed relocation stuff to work with
+	new scheme
+
+	* bfd.h various new types added, prototype for new
+	reloc calls, changed bfd->iostream to a void *
+	to including files don't need stdio.h.
+
+	* libcoff.h added conversion table to tie relocs to
+	canonical symbols
+
+	* sysdep.h created
+
+	* coff-code.h fixed includes. Added code to support
+	big and little endian formats. Various lints. Better
+	processing of symbols. Changed reloc stuff to new
+	order
+
+	* libbfd.h fixed includes
+
+
+Mon Jan 21 11:53:51 PST 1991 steve@cygnus.com
+
+	* bfd.h: changed name of alignment entry in sec_struct to
+	alignment_power, because of conflicting uses within bfd.
+	Now it should be obvious that it's a 2**n alignment
+	specifier. Removed start_pad, end_alignment, block, minsize,
+	output_file_alignment, subsection_alignment and original_vma fields.
+	Added align_power() macro. Fixed bfd_section_alignment
+	acessor macros. Added bfd_symbol_same_target macro.
+
+	* b.out.c (b_out_write_object_contents): fixed to use
+	new alignment member. Fixed (callj_callback) to use section
+	relative symbols properly.
+
+	* sunos.c (sunos4_object_p): fixed to use new alignment_power.
+	Fixed (translate_from_native_sym_flags) to correctly make
+	symbols section relative.
+
+	* bfd.c (bfd_errmsg): fixed various enum cast problems.
+	(bfd_make_section): took out initialization of obsolete members.
+	(bfd_print_symbol_vandf): added
+
+	* opncls.c (bfd_create): created.
+
+	* coff-code.h (coff_new_section_hook): took away refs
+	to obsolete members. (make_a_section_from_file) added
+	conversion between alignment types. (coff_symbol_from)
+	added. (coff_count_linenumbers) only counts linenumbers
+	if symbol is of coff-type. (coff_mangle_symbols) only
+	heavily mangles symbols if symbol is coff-type.
+	(coff_write_symbols) various lints. (coff_write_object_contents)
+	various lints and modification for alignment conversion.
+	(coff_slurp_relocs) fixed for use with new asection shape.
+
+Sat Jan 19 16:10:42 PST 1991 steve@cygnus.com
+
+	* archive.c> lots of lint.
+
+	* b.out.c: added callj relocation support, upgrated reloc howto.
+	Fixed so that asymbol and reloc records are output
+	correctly.
+
+	* bfd.c: lots of lint, support for new bfd entry point
+	bfd_print_symbol.
+
+	* bfd.h: changed definition of asymbol to contain pointer to
+	owning bfd, removed target dependencies.
+
+	* cache.c: took out print statements, put in BFD_ASSERT calls.
+
+	* coff-code.h: various lints, corrected linenumber output
+	functionality. Added support for new style asymbols and
+	bfd_print_symbol. Fixed so that asymbol and
+	reloc records are handled correctly. Added timestamp.
+
+	* icoff.c: Added support for new howto shape.
+
+	* liba.out.h: Added support for new asymbol shape
+
+	* libbfd.c: various lints
+
+	* libbfd.h: various lints
+
+	* libcoff.h: added support for new asymbol shape.
+
+	* sunos.c: various lints. Added support for new asymbol shape
+	and bfd_print_symbol.
+
+Wed Jan 16 21:38:09 PST 1991 steve@cygnus.com
+
+	* b.out.c removed prototype of sunos4_ennativate_symtab, lots of
+	pointer lint. Added support for callj relocation. Fixed bug where
+	the last 32 bytes of the text section were overwritten by data. Fixed bug
+	where archives of b.out didn't work due bfd_slurp_extended_name_table
+	returning false.
+
+	* sunos.c added support for n_other field. Braced the howto table so
+	that it won't be affected by any lengthing of the howto struct typedef.
+	Various lints
+
+	* bfd.h added support for n_other field, added special_function
+	reloc type, modified bfd_perform_relocation prototype. Added bfd_h_get_x
+	macros.
+
+	* bfd.c upgraded bfd_perform_relocation, various lints.
+
+Wed Jan 16 01:55:53 1991  John Gilmore  (gnu at rtl)
+
+	* ChangeLog:  Started ChangeLog for BFD.
+	* TODO:  Create file for suggestions.
+
+	* Makefile:  Support easy loading into Saber C.
+	Add dependencies for icoff.o and bcs88kcoff.o.
+	Rename coff.c to coff-code.h.  Change callers.
+
+	* bfd.c (bfd_check_format):  Allow the check_format routines
+	to return the desired target vector, rather than just a Boolean.
+	bfd.h (bfd_check_format):  Change function pointer return type.
+	archive.c (bfd_generic_archive_p):  change callee.
+	b.out.c (b_out_little_object_p, b_out_big_object_p,
+	b_out_real_object_p):  change callee.
+	libbfd.c (_bfd_dummy_target):  Dummy routine replacing bfd_false
+	in check_format transfer vectors that need a filler.
+	libbfd.h (bfd_generic_archive_p, _bfd_dummy_target):  Fix decls.
+	bcs88kcoff.c:  change callee.
+	coff-code.h (coff_real_object_p, coff_big_object_p):  change callee.
+	icoff.c:  change callee.
+	sunos.c (sunos4_object_p, sunos4_core_file_p):  change callee.
+
+	* libbfd.c (zalloc):  It should actually zero the storage!
+	This was commented out for some reason.
+
+	* libbfd.h:  Add malloc, xmalloc, memcpy, and fatal decls.
+	This is so callers can avoid <stdlib.h> which doesn't exist
+	on older systems.
+
+	* bfd.c (map_over_sections):  Add debugging code, since I
+	noticed the section count for sunos core files was bad, but only
+	GDB had detected the problem.
+	(bfd_set_section_lineno_size, bfd_set_section_linenos,
+	bfd_get_section_linenos):  Remove obsolete functions.
+	(bfd_apply_relocations):  Use longs, not ints, for the math.
+
+	* bfd.h:  Declare enum boolean and struct bfd_target as well
+	as typedefs for them.  Remove obsolete
+	bfd_get_section_lineno_size.
+
+	* cache.c:  Make the "fdopen" support work.  Keep better track
+	of how many files are open.  Centralize the opening of files
+	and be sure bfd_open[rw] actually try to open the file.  Evade
+	linked list initialization problems.
+
+	* b.out.c, coff-code.h, opncls.c, sunos.c:  lint.
+
+	* coff-code.h (coff_slurp_symbol_table):  Null-terminate symtab names.
+
+	* cplus-dem.c:  Delete file, since it is not part of BFD.
+
+	* opncls.c (bfd_openr):  Eliminate misplaced #if 0 code.
+	(bfd_openr, bfd_openw):  Actually open the file, give error now.
+
+	* sunos.c (sunos4_core_file_p):  Set section count.
+	(sunos4_set_section_linenos, stab_names, fprint_name):  Eliminiate
+	obsolete definitions.
+	(_write_symbol_table):  Initialize <idx> counter.
+	(foop):  Eliminate debugging code.
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-9495 sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-9495
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-9495	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-9495	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,10043 @@
+Thu Dec 21 12:43:49 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_howto_raw): Add a phony reloc to handle the
+	old style TOC16 references without using R_PPC_GOT.
+	(ppc_reloc_type): Ditto.
+	(ppc_elf_reloc_type_lookup): Add support for TOC16.
+	(ppc_elf_toc16_inner): Renamed from ppc_elf_got16_inner.
+	(ppc_elf_toc16_reloc): Renamed from ppc_elf_toc16_reloc.
+	(ppc_elf_got16_{inner,reloc}): Stubs for real GOT support.
+	(ppc_elf_check_relocs): New function for GOT/PLT support that is
+	work in progress.
+	(ppc_elf_adjust_dynamic_symbol): Ditto.
+	(ppc_elf_adjust_dynindx): Ditto.
+	(ppc_elf_size_dynamic_sections): Ditto.
+	(ppc_elf_finish_dynamic_symbol): Ditto.
+	(ppc_elf_finish_dynamic_sections): Ditto.
+	(ELF_DYNAMIC_INTERPRETER): Define.
+
+Wed Dec 20 19:14:18 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* elf.c (copy_private_bfd_data): When attaching sections to
+	segments ignore sections that won't be allocated.  Patch from
+	Andreas Schwab.
+
+Tue Dec 19 20:01:43 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* config.bfd: Match on m68k-cbm-* only if OS doesn't match
+	anything else.
+
+Tue Dec 19 16:38:59 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-i960.c (CALC_ADDEND): Define.
+	(coff_i960_relocate_section): Add the input section VMA to the
+	addend for PC relative relocs.
+
+Sun Dec 17 20:11:55 1995  Kim Knuttila  <krk@cygnus.com>
+
+	* peicode.h (pe_print_pdata): Must test the entire entry for zero
+	to correctly terminate.
+
+Fri Dec 15 12:05:57 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* targets.c (enum bfd_endian): Define.
+	(bfd_target): Rename byteorder_big_p to byteorder, and change it
+	from boolean to enum bfd_endian.  Change header_byteorder_big_p
+	correspondingly.
+	* bfd-in.h (bfd_big_endian, bfd_little_endian): New macros.
+	(bfd_header_big_endian, bfd_header_little_endian): New macros.
+	* bfd-in2.h: Rebuild.
+	* All targets: Change initialization of byteorder and
+	header_byteorder to use enum bfd_endian values rather than
+	booleans.
+	* All files: Change all references to byteorder_big_p and
+	header_byteorder_big_p to use new bfd_*_endian macros.
+
+	* coffgen.c (make_a_section_from_file): Set lma to s_paddr, not
+	s_vaddr.
+	* coffcode.h (coff_write_object_contents): Set s_paddr to lma, not
+	vma.
+	* ecoff.c (_bfd_ecoff_write_object_contents): Likewise.
+
+Fri Dec 15 07:32:09 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* pe[i]-i386.c (TARGET_UNDERSCORE): Define to '_'.
+
+Thu Dec 14 13:45:37 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c: Lots of minor cleanups.  Make many functions return
+	errors rather than calling abort.  Also:
+	(ieee_write_twobyte): Remove; change callers to call existing
+	ieee_write_2bytes function.
+	(ieee_write_expression): Don't output the section twice when
+	outputting a local symbol.  Don't emit an extraneous zero if there
+	is only one term.
+	(ieee_slurp_sections): Set the lma as well as the vma.
+	(ieee_archive_p): Use bfd_alloc_grow rather than an obstack.
+
+	* ihex.c (ihex_set_arch_mach): Don't accept any architecture, just
+	a recognized one or bfd_arch_unknown.
+	(ihex_get_symtab_upper_bound): Define as bfd_0l, to permit objcopy
+	to succeed.
+	(ihex_get_symtab): Likewise.
+
+Wed Dec 13 15:44:06 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutx.h: Include <ctype.h>.
+	(struct aout_link_includes_table): Define.
+	(struct aout_link_includes_totals): Define.
+	(struct aout_link_includes_entry): Define.
+	(aout_link_includes_lookup): Define macro.
+	(struct aout_final_link_info): Add includes field.
+	(aout_link_includes_newfunc): New static function.
+	(NAME(aout,final_link)): Initialize includes hash table.
+	(aout_link_write_symbols): Eliminate duplicate N_BINCL entries.
+
+Wed Dec 13 10:52:14 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-config.in: Match on mips-*-* instead of mips-idt-ecoff.
+
+Wed Dec 13 11:07:45 1995  Kim Knuttila  <krk@cygnus.com>
+
+	* coff-ppc.c (coff_ppc_relocate_section): removed debugging code.
+
+Tue Dec 12 17:42:06 1995  Kim Knuttila  <krk@cygnus.com>
+
+	* peicode.h (pe_print_reloc): New function to dump the .reloc section.
+	(pe_print_private_bfd_data): call pe_print_reloc.
+	* coffcode.h (coff_set_alignment_hook): .reloc section alignment.
+	* coff-ppc.c (in_reloc_p): Added missing non-eligible relocs. Spiffed
+	up some debugging as well.
+
+Tue Dec 12 11:34:23 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.bfd: Handle sparc-*-elf*.  From Ronald F. Guilmette
+	<rfg@monkeys.com>.
+
+Fri Dec  8 17:47:07 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_add_object_symbols): Set section_count to 0
+	when setting sections to NULL.
+
+Wed Dec  6 17:05:37 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (struct xcoff_loader_info): Add export_defineds
+	field.
+	(bfd_xcoff_size_dynamic_sections): Add export_defineds parameter.
+	(xcoff_build_ldsyms): If export_defineds is set, set XCOFF_EXPORT
+	for all symbols.
+	* bfd-in.h (bfd_xcoff_size_dynamic_sections): Update declaration.
+	* bfd-in2.h: Rebuild.
+
+Mon Dec  4 16:40:47 1995  Kim Knuttila  <krk@cygnus.com>
+
+	* coffcode.h (coff_set_alignment_hook): Removed some debugging printf's
+
+Mon Dec  4 11:25:39 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ihex.c (ihex_scan): Handle record types 4 and 5.
+	(ihex_object_p): Permit types 4 and 5.
+	(ihex_set_section_contents): Remove check for out of range
+	addresses.
+	(ihex_write_object_contents): Generate types 4 and 5.
+
+	* elflink.h (elf_link_output_extsym): Just ignore warning and
+	indirect references to symbols which don't really exist.
+
+Sun Dec  3 19:00:27 1995  Kim Knuttila  <krk@cygnus.com>
+
+	* peicode.h (pe_print_idata): Minor format fixes
+	(pe_print_edata): New function. Under private printing, this formats
+	the edata section of a PE file.
+	(pe_print_private_bfd_data): Added call to pe_print_edata.
+
+Sun Dec  3 16:46:54 1995  Richard Earnshaw (rearnsha@armltd.co.uk)
+
+	* aout-arm.c (MY_swap_std_reloc_out): Use KEEPIT to get the symbol
+	index, don't call stoi.
+
+Fri Dec  1 14:46:51 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* srec.c (srec_scan): Set lma as well as vma.
+
+	* ihex.c: New file; support for Intel Hex format.
+	* targets.c (enum bfd_flavour): Add bfd_target_ihex_flavour.
+	(ihex_vec): Declare.
+	(bfd_target_vector): Always include ihex_vec.
+	* bfd.c (struct _bfd): Add ihex_data field to tdata union.
+	* Makefile.in: Rebuild dependencies.
+	(BFD_LIBS): Add ihex.o
+	(BFD_LIBS_CFILES): Add ihex.c.
+	* bfd-in2.h: Rebuild.
+
+	* elf.c (assign_file_positions_for_segments): Sort the sections in
+	each segment.
+	(get_program_header_size): Return the right size if segment_map is
+	not NULL.
+	(copy_private_bfd_data): Don't bother to sort the sections.
+
+	* bfd.c (bfd_record_phdr): New function.
+	* bfd-in.h (bfd_record_phdr): Declare.
+	* bfd-in2.h: Rebuild.
+
+	* elf32-sparc.c (elf32_sparc_relocate_section): Remove bogus
+	BFD_ASSERT.
+
+	* libbfd.c (bfd_malloc, bfd_realloc): New functions.
+	(bfd_zmalloc): Return PTR, not char *.  Take size_t, not
+	bfd_size_type.
+	* libbfd-in.h (bfd_malloc, bfd_realloc): Declare.
+	(bfd_zmalloc): Change declaration.
+	* libbfd.h: Rebuild.
+	* Many files: Use bfd_malloc and bfd_realloc rather than malloc
+	and realloc.  Don't set bfd_error_no_memory if they fail.
+
+Thu Nov 30 19:32:26 1995  Kim Knuttila  <krk@cygnus.com>
+
+	* coff-ppc.c: Added macros to tidy up toc cell treatment. Numerous
+	uses as well. Added a new howto to deal with TOCREL16 relocs that
+	are TOCDEFN as well.
+	(coff_ppc_relocate_section): Expanded treatment of ADDR32NB relocs
+	to handle RVA relocs from dlltool.
+	(ppc_coff_rtype2howto): TOCDEFN reloc addition.
+	(coff_ppc_rtype_to_howto): TOCDEFN reloc addition.
+	(ppc_coff_reloc_type_lookup): TOCDEFN reloc addition.
+
+	* coffcode.h (coff_set_alignment_hook): check idata$X sections
+	to get the right section alignment.
+
+Thu Nov 30 16:48:18 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (_bfd_elf_make_section_from_shdr): Don't set lma based on
+	p_paddr if p_paddr is zero.
+	(make_mapping): Set includes_filehdr and includes_phdrs for first
+	PT_LOAD segment.
+	(map_sections_to_segments): Set includes_phdrs for PT_PHDR
+	segment.
+	(assign_file_positions_for_segments): Handle includes_filehdr and
+	includes_phdrs.  Remove special handling of PT_PHDR and first
+	PT_LOAD segments.
+	(copy_private_bfd_data): Set includes_filehdr and includes_phdr
+	when appropriate.  Remove special handling of PT_PHDR segment.
+	Use a more complex condition for when a section is included in a
+	segment to handle Solaris linker oddities.
+
+Thu Nov 30 11:17:33 1995  Manfred Hollstein KS/EF4A 60/1F/110 #40283  <manfred@lts.sel.alcatel.de>
+
+	* coff-m88k.c (howto_table): Reformatted for easier reading;
+	special_function now points to new function m88k_special_reloc.
+	(howto_hvrt16): Function previously used for handling HVRT16 relocs
+	removed.
+	(rtype2howto): Do not add reloc's r_offset to the addend, this will
+	be done correctly by m88k_special_reloc.
+	(reloc_processing): New function to be used by RELOC_PROCESSING.
+	(RELOC_PROCESSING): Define to call reloc_processing.
+
+Wed Nov 29 12:42:36 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* peicode.h (pe_print_idata): Call malloc rather than xmalloc.
+	(pe_print_pdata): Likewise.
+
+	* opncls.c (bfd_alloc_by_size_t): Set bfd_error_no_memory if
+	obstack_alloc fails.
+	(bfd_alloc_finish): Set bfd_error_no_memory if obstack_finish
+	fails.
+	* libbfd.c (bfd_zmalloc): Set bfd_error_no_memory if malloc fails.
+	* Many files: don't set bfd_error_no_memory if one of the above
+	routines fails.
+
+	* elf.c (assign_file_positions_for_segments): Don't adjust p_paddr
+	if p_paddr_valid is set.
+	(copy_private_bfd_data): New static function.
+	(_bfd_elf_copy_private_section_data): Call copy_private_bfd_data.
+
+	* elf.c (assign_file_positions_for_segments): Fix case where extra
+	program headers were allocated.
+
+	* elf.c (_bfd_elf_print_private_bfd_data): New function.
+	* elf-bfd.h (_bfd_elf_print_private_bfd_data): Declare.
+	* elfxx-target.h (bfd_elfNN_bfd_print_private_bfd_data): Define to
+	_bfd_elf_print_private_bfd_data.
+
+	* coff-alpha.c (alpha_ecoff_swap_reloc_in): Don't abort if
+	r_symndx is RELOC_SECTION_NONE for an ALPHA_R_IGNORE reloc.
+	Change a RELOC_SECTION_LITA symndx to RELOC_SECTION_ABS.
+	(alpha_ecoff_swap_reloc_out): Change RELOC_SECTION_ABS to
+	RELOC_SECTION_LITA for ALPHA_R_IGNORE.
+	(alpha_adjust_reloc_out): For ALPHA_R_IGNORE, don't change
+	RELOC_SECTION_ABS to RELOC_SECTION_NONE.
+
+Tue Nov 28 16:59:50 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf-bfd.h (struct elf_obj_tdata): Add segment_map field.
+	* elf.c (make_mapping): New static function.
+	(map_sections_to_segments): New static function.
+	(elf_sort_sections): New static function.
+	(assign_file_positions_for_segments): New static function.
+	(map_program_segments): Remove.
+	(get_program_header_size): Remove sorted_hdrs, count, and
+	maxpagesize parameters.  Simplify.
+	(assign_file_positions_except_relocs): When generating an
+	executable, use assign_file_positions_for_segments.
+	(elf_sort_hdrs): Remove.
+	(_bfd_elf_sizeof_headers): Remove eliminated parameters from call
+	to get_program_header_size.
+
+Mon Nov 27 12:27:46 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* hp300hpux.c (MY(callback)): Set lma as well as vma.
+
+	* configure, config.in: Regenerate with autoconf 2.7.
+
+	* elf32-i386.c (elf_backend_plt_readonly): Set correctly, to 1.
+	* elf32-sparc.c (elf_backend_plt_readonly): Set correctly, to 0.
+
+Wed Nov 22 12:02:09 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ecoff.c (_bfd_ecoff_new_section_hook): Handle .rconst section.
+	(ecoff_sec_to_styp_flags): Likewise.
+	(_bfd_ecoff_styp_to_sec_flags): Handle STYP_RCONST.
+	(ecoff_set_symbol_info): Handle scRConst.
+	(ecoff_slurp_reloc_table): Handle RELOC_SECTION_RCONST.
+	(ecoff_compute_section_file_positions): Handle .rconst section.
+	(_bfd_ecoff_write_object_contents): Likewise.
+	(ecoff_link_check_archive_element): Handle scRConst.
+	(ecoff_link_add_externals): Likewise.
+	(ecoff_link_write_external): Handle .rconst section.
+	(ecoff_reloc_link_order): Likewise.
+	* ecofflink.c (bfd_ecoff_debug_accumulate): Handle scRConst.
+	* coff-alpha.c (alpha_convert_external_reloc): Handle .rconst
+	section.
+	(alpha_relocate_section): Handle RELOC_SECTION_RCONST.
+
+	* sunos.c (sunos_scan_dynamic_symbol): Only set written if the
+	DEF_DYNAMIC flag is set.
+
+Tue Nov 21 13:25:29 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* host-aout.c: If TRAD_HEADER is defined, include it.
+
+Tue Nov 21 13:03:57 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aclocal.m4 (AC_PROG_CC): Remove local definition.
+	(BFD_BINARY_FOPEN): Require AC_CANONICAL_SYSTEM.
+	(BFD_NEED_DECLARATION): New function.
+	* configure.in: Use BFD_NEED_DECLARATION.
+	* acconfig.h: Put NEED_DECLARATION_* in @TOP@ section.
+	* configure, config.in: Rebuild with autoconf 2.6.
+
+	* xcofflink.c (bfd_xcoff_size_dynamic_sections): Clear
+	special_sections before returning when called with a non XCOFF
+	BFD.
+
+	* coffgen.c (coff_renumber_symbols): Sort common symbols with
+	global symbols.
+
+	* coffcode.h (coff_compute_section_file_positions): Only pad the
+	previous section to force file alignment when creating an
+	executable.
+
+Mon Nov 20 14:54:09 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffcode.h (coff_compute_section_file_positions): If
+	RS6000COFF_C, set up the .debug section.
+
+	* xcofflink.c (xcoff_link_input_bfd): Adjust the TOC anchor value
+	if it is not large enough to accomodate the entire TOC area with
+	signed 16 bit offsets.
+	(xcoff_write_global_symbol): Handle negative TOC offsets in global
+	linkage code.
+	(_bfd_ppc_xcoff_relocate_section): Adjust relocations against a
+	TOC anchor to use the TOC value used in the output file.
+
+Sat Nov 18 18:01:41 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffgen.c (_bfd_coff_get_external_symbols): Cast malloc return.
+	(_bfd_coff_read_string_table): Likewise.
+
+Sat Nov 18 19:43:04 1995  Richard Earnshaw (rearnsha@armltd.co.uk)
+
+	* pe-arm.c: Fix typos.
+	* coff-arm.c: Likewise.
+
+Fri Nov 17 16:22:04 1995  Kim Knuttila  <krk@cygnus.com>
+
+	* coff-ppc.c (list_ele): Added "cat"egory member.
+	(record_toc): New category parameter (priv or pub).
+	(ppc_record_toc_entry): Check to see if toc bounds exceeded.
+	(ppc_process_before_allocation): Removed embrionic data-in-toc from
+	the mainline. It addes extra toc cells in error.
+	(ppc_coff_swap_sym_in_hook): Added some documentation.
+	(dump_toc): Can now diagnose "virtual toc" chicanery.
+
+Fri Nov 17 10:41:25 1995  Philippe De Muyter  <phdm@info.ucl.ac.be>
+
+	* elf-bfd.h (struct elf_link_hash_table): Change type of
+	dynsymcount and bucketcount fields from size_t to bfd_size_type.
+
+Fri Nov 17 10:02:58 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffcode.h (coff_pointerize_aux_hook): I960 version: don't
+	pointerize C_LEAFSTAT or C_LEAFEXT entries.
+
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Only create
+	DT_INIT and DT_FINI entries if the _init or _fini symbol is
+	defined or mentioned in a regular file.
+
+Thu Nov 16 15:16:42 1995  Kim Knuttila  <krk@cygnus.com>
+
+	* coff-ppc.c (ppc_record_data_in_toc_entry): new function
+	(coff_ppc_relocate_section): Handle TOCDEFN attribute
+	(coff_ppc_relocate_section): Correct REL24 handling
+	(ppc_process_before_allocation): Correct TOCDEFN handling
+
+	* peicode.h (dir_names): Added name descriptions
+
+Thu Nov 16 03:38:03 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* VERSION: Updated to cygnus-2.6.
+
+Wed Nov 15 19:30:07 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* targets.c (m68k4knetbsd_vec): Declare.
+
+Wed Nov 15 18:05:52 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* targets.c (bfd_target): Change type of second argument to
+	_bfd_print_private_bfd_data from void * to PTR.
+	* libbfd-in.h (_bfd_generic_bfd_print_private_bfd_data): Cast
+	using PTR rather than void *.
+	* bfd-in2.h, libbfd.h: Rebuild.
+	* peicode.h (pe_print_private_bfd_data): Change vfile from void *
+	to PTR.
+	* elfxx-target.h (bfd_elfNN_bfd_print_private_bfd_data): Define as
+	_bfd_generic_bfd_print_private_bfd_data rather than casting
+	bfd_true.
+
+Wed Nov 15 04:09:14 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* Makefile.in (.dep1): Fix stupid typo in last change.  Remove any
+	"DO NOT DELETE" lines or blank lines that mkdep writes on some
+	systems.
+	(BFD_LIBS_CFILES, ALL_MACHINES_CFILES, BFD32_BACKENDS_CFILES,
+	BFD64_BACKENDS_CFILES): New variables.
+	(CFILES): Use them.
+
+Tue Nov 14 11:52:23 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* peicode.h (coff_swap_aouthdr_out): For PPC PE, start isize at 0,
+	not at the file position of the first section.
+	* coffcode.h (coff_compute_section_file_positions): Avoid using
+	unportable #elif.
+	(coff_write_object_contents): When generating a PPC PE executable
+	with no symbols, round up the file size to a COFF_PAGE_SIZE
+	boundary.
+	* cofflink.c (_bfd_coff_final_link): If there are no symbols,
+	don't write out a string table.
+
+	* elf.c (bfd_section_from_shdr): When using a different section
+	header, pass the new one to _bfd_elf_make_section_from_shdr.
+	(elf_fake_sections): Don't set sh_info and sh_entsize fields.
+	(elf_map_symbols): Add section VMA to symbol value when comparing
+	against 0.
+	(_bfd_elf_compute_section_file_positions): Only build symbol table
+	if there are some symbols.  Set file offset of symtab and strtab
+	sections.
+	(assign_file_positions_except_relocs): Remove dosyms parameter.
+	Change all callers.  Never set file offset of symtab and strtab
+	sections.
+	(_bfd_elf_copy_private_section_data): New function.
+	(MAP_ONESYMTAB, MAP_DYNSYMTAB, MAP_STRTAB, MAP_SHSTRTAB): Define.
+	(_bfd_elf_copy_private_symbol_data): New function.
+	(swap_out_syms): Check for special mapping of st_shndx created by
+	copy_private_symbol_data.
+	* elfxx-target.h: Use new copy routines.
+	* elf-bfd.h (_bfd_elf_copy_private_symbol_data): Declare.
+	(_bfd_elf_copy_private_section_data): Declare.
+
+	* config.bfd (sh-*-*): Set targ_defvec to shcoff_vec.
+
+	* coffcode.h (coff_slurp_symbol_table): If COFF_WITH_PE, handle
+	C_NT_WEAK.
+
+	* coff-sh.c (shlcoff_vec): Use _bfd_generic_archive_p, not
+	_bfd_dummy_target, matching the recent change to archive
+	recognition.
+
+Mon Nov 13 13:24:38 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libbfd.c (bfd_get_file_window): Use casts to avoid doing
+	arithmetic on PTR types.
+
+	* aout-target.h (MY(callback)): Set the lma of the sections.
+
+	* ecoff.c (ecoff_reloc_link_order): Turn a reloc against a defined
+	symbol into a reloc against the section.
+
+Mon Nov 13 07:31:35 1995  Kim Knuttila  <krk@cygnus.com>
+
+	* coff-ppc.c (ppc_coff_link_hash_entry): added support for inline
+	glue for the relocs: IMGLUE and IFGLUE.
+	(record_toc): new function - tracks toc contents
+	(ppc_mark_symbol_as_glue): new function - supports the IMGLUE reloc
+	(coff_ppc_relocate_section): Added support and fixes for IMGLUE/IFGLUE
+	(ppc_coff_rtype2howto): removed invalid IMGLUE hack
+	(coff_ppc_rtype_to_howto): removed invalid IMGLUE hack
+	(ppc_record_toc_entry): Removed a debug define (duh)
+
+	* peicode.h (coff_swap_scnhdr_out): Fixed invalid strcmp for ".reldata"
+	(pe_print_idata): New function - formats the idata section data
+	(pe_print_pdata): New function - formats the pdata section data
+	(pe_print_private_bfd_data): calls to above
+
+Sun Nov 12 12:23:24 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* Makefile.in (bfd_libs_here, etc): Provide empty definitions.
+	* coff-rs6000.c (rs6000coff_vec): Add conditional defines
+	TARGET_SYM and TARGET_NAME for vector and BFD name.
+	* coff-pmac.c (pmac_xcoff_vec): Remove.
+	(TARGET_SYM, TARGET_NAME): Define.
+	* coffcode.h (coff_set_arch_mach_hook) [POWERMAC]: Set the
+	machine to 0, not all PowerMacs are 601s.
+
+Fri Nov 10 12:10:14 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elfcode.h (elf_object_p): Read in any program headers.
+	* elf.c (_bfd_elf_make_section_from_shdr): Adjust section lma
+	based on the program headers, if any.
+	(elf_fake_sections): Set sh_addr from the vma, not the lma.
+	(map_program_segments): Set p_paddr of program headers based on
+	the lma.
+
+Thu Nov  9 13:01:31 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* archive.c (bfd_generic_archive_p): Preserve tdata in case of
+	failure.
+
+	* aoutx.h (NAME(aout,final_link)): Report a reasonable error when
+	trying to do a relocateable link with a non-a.out object file.
+
+	* archive.c (bfd_generic_archive_p): Check the first object file
+	in an archive even if target_defaulted is set.  If the object file
+	has the wrong xvec, reject it.
+
+	* aoutx.h (NAME(aout,set_section_contents)): If a section can not
+	be represented, report the name via _bfd_error_handler.
+	(translate_to_native_sym_flags): Likewise.
+	* elf32-mips.c (mips_elf_final_link): Likewise.
+	* oasys.c (oasys_write_sections): Likewise.
+
+	* coffcode.h (coff_set_alignment_hook): Write RS6000COFF_C version
+	which checks for STYP_OVRFLO sections.
+	(coff_compute_section_file_positions): If RS6000COFF_C, handle
+	reloc and lineno count overflows.
+	(coff_write_object_contents): Call coff_count_linenumbers before
+	coff_compute_section_file_positions.  If RS6000COFF_C, handle
+	reloc and lineno count overflows.
+	* xcofflink.c (_bfd_xcoff_bfd_final_link): Count line numbers and
+	relocs before dealing with .pad sections.  Count overflow section
+	headers when handling .pad sections.
+
+	* coffcode.h (coff_write_object_contents): Set a.out vstamp to 1
+	if RS6000COFF_C.
+
+	* xcofflink.c (XCOFF_DESCRIPTOR): Define.
+	(struct xcoff_link_hash_table): Add descriptor_section and
+	special_sections fields.
+	(_bfd_xcoff_bfd_link_hash_table_create): Initialize new fields.
+	(xcoff_link_add_symbols): Set linkage section alignment.  Create
+	descriptor section.  Check for magic symbol names (_text, etc.),
+	and record them in special_sections if found.  Set
+	XCOFF_DESCRIPTOR flag for a function descriptor, and set its
+	descriptor field to point back to the function code symbol.
+	(xcoff_sweep): Always mark the special descriptor_section.
+	(bfd_xcoff_export_symbol): Check whether the symbol might be a
+	function descriptor, and mark it if it is.
+	(bfd_xcoff_size_dynamic_sections): Add new special_sections
+	parameter, and fill it in.  Allocate space for the descriptor
+	section.
+	(xcoff_build_ldsyms): Set XCOFF_DEF_REGULAR flag when defining
+	global linkage code.  If an undefined function descriptor is
+	exported, arrange to define it.  Warn about any other undefined
+	exported symbol.
+	(_bfd_xcoff_bfd_final_link): Write out the descriptor section.
+	(xcoff_write_global_symbol): Create a function descriptor when
+	necessary.
+	* bfd-in.h (bfd_xcoff_size_dynamic_sections): Update declaration.
+	* bfd-in2.h: Rebuild.
+
+Thu Nov  9 08:40:23 1995  Kim Knuttila  <krk@cygnus.com>
+
+	* coff-ppc.c (ppc_coff_link_hash_entry): new types for hashing
+	(ppc_coff_link_hash_table): new types for hashing
+	(ppc_coff_link_hash_newfunc): hash entry constructor
+	(ppc_coff_link_hash_table_init): hash table initializer
+	(ppc_coff_link_hash_table_create): hash table constructor
+	(ppc_record_toc_entry): changed references to hash table
+	(coff_ppc_relocate_section): changed references to hash table
+
+	* libcoff-in.h (coff_link_hash_entry): removed toc_offset
+	* libcoff.h: Rebuild
+
+	* cofflink.c (_bfd_coff_link_hash_newfunc): removed toc_offset init
+	(coff_link_add_symbols): removed toc_offset init
+
+Thu Nov  9 04:00:38 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* Makefile.in (.dep1): Make sure the file mkdep is to write exists
+	first.
+
+	* configure.in: Added new option --with[out]-mmap.  Set USE_MMAP
+	if it is given and mmep is available.
+	* acconfig.h: Undef USE_MMAP.
+	* configure, config.in: Regenerated.
+	* aoutx.h: If USE_MMAP is not defined, do all symbol and string
+	table handling the old way.
+	(aout_get_external_symbols): Don't complain if last byte of string
+	table is nonzero.
+	* libbfd.c [HAVE_MADVISE]: Include sys/types.h and sys/mman.h.
+	(bfd_free_window) [! USE_MMAP]: Don't define.
+	(bfd_get_file_window,
+	_bfd_generic_get_section_contents_in_window) [! USE_MMAP]: Abort.
+
+Wed Nov  8 20:03:44 1995  Eric Freudenthal <freudenthal@nyu.edu>
+
+	* coff-a29k.c (SIGN_EXTEND_HWORD): Use ~0xffff rather than
+	0xffff0000.
+
+Wed Nov  8 11:31:11 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-a29k.c (a29k_reloc): Change handling of R_IREL reloc to be
+	compatible with AMD generated COFF files.  Try to support both AMD
+	and GNU formats simultaneously.
+	(coff_a29k_relocate_section): Likewise.
+
+	* libbfd.c (bfd_get_file_window): Change writable parameter from
+	int to boolean; update all callers.  Pass MAP_SHARED if not
+	writable--it's required on Solaris.  Cast fprintf argument to
+	avoid warning.
+	* bfd-in.h (bfd_get_file_window): Update declaration.
+	* bfd-in2.h: Rebuild.
+	* aoutx.h: Update calls to bfd_get_file_window.
+
+	* xcofflink.c (XCOFF_DEF_DYNAMIC): Rename from XCOFF_REF_DYNAMIC.
+	Change all uses.
+	(xcoff_swap_ldhdr_in): New static function.
+	(xcoff_swap_ldsym_in): New static function.
+	(xcoff_find_reloc): Handle the case of a single reloc correctly.
+	(xcoff_link_add_symbols): If we just created a descriptor, pass it
+	to _bfd_generic_link_add_one_symbol, to save a hash lookup.
+	Handle XTY_ER/XMC_XO symbols correctly.
+	(xcoff_link_add_dynamic_symbols): Rewrite to read .loader symbols
+	rather than normal symbol table.
+	(bfd_xcoff_import_symbol): It's not an error if the symbol is
+	already defined with the same absolute value.
+	(xcoff_mark): When considering called symbols, check whether the
+	descriptor is from a dynamic object, rather than the symbol
+	itself.
+	(xcoff_build_ldsyms): Likewise.
+
+	* libbfd.c (bfd_get_file_window): Change return type to boolean.
+	Cast realloc and malloc return values.  If malloc or realloc fail,
+	set bfd_error_no_memory.
+	* bfd-in.h (bfd_get_file_window): Change type to boolean.
+	* bfd-in2.h: Rebuild.
+
+Tue Nov  7 11:53:48 1995  Kim Knuttila  <krk@cygnus.com>
+
+	* coff-ppc.c (ppc_record_toc_entry): new function.
+	(in_reloc_p): changed return value.
+	(coff_ppc_relocate_section): much rework.
+	(ppc_allocate_toc_section): new function.
+	(ppc_process_before_allocation): new function.
+	(ppc_coff_swap_sym_in_hook): new function.
+
+	* cofflink.c (_bfd_coff_link_hash_newfunc): initialize toc_offset.
+	(coff_link_add_symbols): initialize toc_offset.
+
+	* peicode.h (coff_swap_sym_in): Added coff_swap_sym_in_hook
+	(coff_swap_aouthdr_out): Added more sections to the data
+	dictionary for the pe file header. Also changed linker version
+	number on the ppc side.
+	(dir_names): small improvements to the dictionary printing.
+	(pe_mkobject_hook): save the file level flags.
+
+	* libcoff-in.h (coff_link_hash_entry): added toc_offset field
+	(pe_tdata): added real_flags field
+	(coff_tdata): added local_toc_sym_map and access macro
+
+	* libcoff.h (coff_link_hash_entry): added toc_offset field
+	(pe_tdata): added real_flags field
+	(coff_tdata): added local_toc_sym_map and access macro
+
+	* coffcode.h (coff_set_alignment_hook): added hook for PE.
+	(coff_mkobject): init for local_toc_sym_map
+	(coff_write_object_contents): set the internal_a.magic to
+        IMAGE_NT_OPTIONAL_HDR_MAGIC which appears to be what other
+	ppc compilers use.
+
+Tue Nov  7 13:48:58 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ecofflink.c (_bfd_ecoff_locate_line): Keep looking through stabs
+	entries until both the line number address and the function name
+	address are too large.
+
+	* configure.in: Call AC_CHECK_PROG to find and cache AR.
+	* configure: Rebuilt.
+
+	* aclocal.m4 (BFD_CC_FOR_BUILD): Don't define CC_FOR_BUILD if it
+	is defined in the environment.
+
+Tue Nov  7 10:57:24 1995  Jeffrey A Law  (law@cygnus.com)
+
+	* som.c (som_get_section_contents_in_window): Define to use
+	generic version.
+
+Mon Nov  6 17:13:15 1995  Harry Dolan  <dolan@ssd.intel.com>
+
+	* coff-i860.c: New file, based on coff-i386.c.
+	* cpu-i860.c: New file, based on cpu-i386.c.
+	* hosts/i860mach3.h: New file, based on hosts/i386mach3.h.
+	* config.bfd (i860-*-mach3*, i860-*-osf1*, i860-*-coff*): New
+	targets, using i860coff_vec.
+	* configure.in (i860-*-mach3*, i860-*-osf1*): New hosts, using
+	trad-core.o and hosts/i860mach3.h.
+	(i860coff_vec): Use coff-i860.o and cofflink.o.
+	* configure: Rebuild.
+	* Makefile.in: Rebuild dependencies.
+	(ALL_MACHINES): Add cpu-i860.o.
+	(BFD32_BACKENDS): Add coff-i860.o.
+	(CFILES): Add cpu-i860.c and coff-i860.c.
+	* targets.c (i860coff_vec): Declare.
+	(bfd_target_vector): Add &i860coff_vec.
+	* archures.c (bfd_i860_arch): Declare.
+	(bfd_archures_list): Add &bfd_i860_arch.
+	* coffcode.h (coff_set_arch_mach_hook): Handle I860 magic number.
+	(coff_set_flags): Handle bfd_arch_i860.
+	(coff_write_object_contents): Handle I860 a.out magic number.
+
+Mon Nov  6 14:34:07 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (xcoff_link_add_symbols): Set the alignment power of
+	the created .tc section to 2.
+	(xcoff_mark): Don't keep a .loader reloc for a call to an
+	undefined symbol when creating a shared library.
+	(xcoff_build_ldsyms): When creating a shared library, generate
+	global linkage code for a call to an undefined symbol.
+
+Sun Nov  5 21:44:13 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* Makefile.in (CFILES): Rebuild list from BFD_LIBS, ALL_MACHINES,
+	BFD32_BACKENDS, BFD64_BACKENDS.
+	(.dep1): Put mkdep output in a separate file.
+	Rebuilt dependencies.
+
+	* ecoff.c (_bfd_ecoff_slurp_armap): Cast _bfd_read_ar_hdr return
+	value.
+
+	Permit use of mmap when available:
+
+	* configure.in: Check for mmap, madvise, mprotect.
+	* config.in, configure: Regenerated.
+
+	* libbfd.c (struct _bfd_window_internal): Define type.
+	(bfd_init_window, bfd_free_window, bfd_get_file_window): New
+	functions.
+	(ok_to_map): New static variable for debugging.
+	(_bfd_generic_get_section_contents_in_window): New function.
+	* bfd-in.h (bfd_window_internal): Declare type.
+	(bfd_window): Define type.
+	(bfd_init_window, bfd_free_window, bfd_get_file_window): Declare.
+	* libbfd-in.h (_bfd_generic_get_section_contents_in_window):
+	Declare.
+
+	* libaout.h (struct aoutdata): Add two window fields.
+	(obj_aout_sym_window, obj_aout_string_window): New macros.
+	* aoutx.h (some_aout_object_p): Initialize windows.
+	(aout_get_external_symbols): Get symbol data and strings in
+	windows instead of explicitly allocated buffers.
+	(slurp_symbol_table): Free window instead of memory.
+	(bfd_free_cached_info): Release windows instead of freeing storage
+	directly.
+	(aout_link_free_symbols): Ditto.
+
+	* targets.c (bfd_target): Add new field for
+	get_section_contents_in_window.
+	(BFD_JUMP_TABLE_GENERIC): Updated.
+	* aout-adobe.c, aout-target.h, binary.c, bout.c, coff-alpha.c,
+	coff-mips.c, elfxx-target.h, i386msdos.c, i386os9k.c, ieee.c,
+	libcoff-in.h, oasys.c, srec.c, tekhex.c, versados.c: Added new
+	macros for get_section_contents_in_window field.
+
+Sat Nov  4 12:23:26 1995  Fred Fish  <fnf@cygnus.com>
+
+	* core.c: Renamed to corefile.c
+	* makefile.dos (OBJS): Change core.o to corefile.o
+	* Makefile.in (CFILES, BFD_LIBS): Use corefile.c instead of core.c
+
+Fri Nov  3 15:54:59 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (xcoff_link_add_symbols): Rename local variable sub
+	to o.  Clobber and restore the list of new csects around the call
+	to _bfd_generic_link_add_one_symbol, in case it wants to report a
+	linker error and the linker wants to read the symbol table.  Reset
+	the line number count of a real section even if it has no relocs.
+	(_bfd_xcoff_bfd_final_link): If shared, set the DYNAMIC flag.
+
+	* coffgen.c (_bfd_coff_read_string_table): Warn if the string size
+	is too small.
+
+Thu Nov  2 23:16:39 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (_bfd_ppc_xcoff_relocate_section): Don't warn about
+	an undefined symbol in a shared link.
+
+	* linker.c (_bfd_generic_link_add_one_symbol): Correct type of
+	oldtype from bfd_link_order_type to bfd_link_hash_type.  From
+	phdm@info.ucl.ac.be (Philippe De Muyter).
+
+Wed Nov  1 14:26:02 1995  Manfred Hollstein KS/EF4A 60/1F/110 #40283  <manfred@lts.sel.alcatel.de>
+
+	* coff-m88k.c (rtype2howto): New static function.
+	(RTYPE2HOWTO): Use it rather than a macro definition.
+
+	* coffcode.h (coff_write_object_contents): set internal_a.magic
+	to PAGEMAGICPEXECPAGED #if defined (M68) && !defined (LYNXOS).
+
+	* configure.in: m68*-motorola-sysv* does not use ptrace-core.o;
+	define TRAD_HEADER to new file hosts/delta68.h.
+	m88*-motorola-sysv*, however, does use ptrace-core.o.
+	* hosts/delta68.h: New file.
+
+	* ptrace-core.c (ptrace_unix_core_file_p): change bfd_zmalloc to
+	bfd_zalloc; provide proper parm abfd to calls to bfd_zalloc.
+
+Wed Nov  1 13:51:54 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* i386linux.c (MY(vec)): Declare before use.
+
+Wed Nov  1 11:45:07 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* reloc16.c (bfd_coff_reloc16_get_relocated_section_contents):
+	Pass input_bfd, not in_bfd, to bfd_coff_reloc16_extra_cases.
+
+	* elf.c (bfd_elf_set_dt_needed_name): Don't do anything if the
+	BFD is not of the right type.
+	(bfd_elf_get_needed_list): Likewise.
+	* i386linux.c (bfd_linux_size_dynamic_sections): Likewise.
+	* sunos.c (bfd_sunos_get_needed_list): Likewise.
+	* xcofflink.c (XCOFF_XVECP): Define.
+	(bfd_xcoff_link_record_set): Don't do anything if the BFD is not
+	of the right type.
+	(bfd_xcoff_import_symbol): Likewise.
+	(bfd_xcoff_export_symbol): Likewise.
+	(bfd_xcoff_link_count_reloc): Likewise.
+	(bfd_xcoff_record_link_assignment): Likewise.
+	(bfd_xcoff_size_dynamic_sections): Likewise.
+
+	* sunos.c (sunos_scan_ext_relocs): Only check the reloc symbol
+	table index against the number of symbols for a base relative
+	reloc.
+
+	* coff-rs6000.c (_bfd_xcoff_sizeof_headers): Change from macro to
+	static function.
+	* xcofflink.c (_bfd_xcoff_bfd_link_hash_table_create): Set
+	full_aouthdr flag here...
+	(_bfd_xcoff_bfd_final_link): ...not here.
+
+Tue Oct 31 12:52:02 1995  Fred Fish  <fnf@cygnus.com>
+
+	* libelf.h:  Rename to elf-bfd.h to avoid conflict with
+	systems that have a system <libelf.h>.
+	* Makefile.in: Globally replace libelf.h with elf-bfd.h.
+	* bfd.c, elf.c, elf32-arc.c, elf32-gen.c, elf32-hppa.c,
+	elf32-hppa.h, elf32-i386.c, elf32-i860.c, elf32-m68k.c,
+	elf32-m88k.c, elf32-mips.c, elf32-ppc.c, elf32-sparc.c,
+	elf64-gen.c, elf64-sparc.c, elfcode.h, elflink.c,
+	elfxx-target.h: Include elf-bfd.h rather than libelf.h.
+	* elfxx-target.h: Change libelf.h reference to elf-bfd.h.
+
+Tue Oct 31 15:30:07 1995  David Mosberger-Tang  <davidm@azstarnet.com>
+
+	* ecoff.c (ecoff_set_symbol_info): Add new parameter weak.  If
+	set, set BSF_WEAK in symbol.  Change all callers.
+	(ecoff_get_extr): Set weakext based on BSF_WEAK.
+	(ecoff_link_add_externals): If weakext is set, pass BSF_WEAK to
+	_bfd_generic_link_add_one_symbol.
+	(ecoff_indirect_link_order): Check that the section tdata relocs
+	are not NULL before using them.
+
+	* configure.in (alpha*-*-linux*): Set COREFILE to trad-core.o and
+	define TRAD_HEADER as hosts/alphalinux.h.
+	* configure: Rebuild.
+	* hosts/alphalinux.h: New file.
+	* trad-core.c (trad_unix_core_file_p): Cast u.u_ar0 to bfd_vma,
+	not int.
+
+Tue Oct 31 12:34:11 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffcode.h (coff_slurp_symbol_table): Accept C_BCOMM and
+	C_ECOMM storage classes.
+
+	* xcofflink.c (xcoff_mark_symbol): New static function, broken out
+	of xcoff_mark.
+	(xcoff_mark): Call xcoff_mark_symbol.
+	(bfd_xcoff_export_symbol): Call xcoff_mark_symbol.
+	(bfd_xcoff_link_count_reloc): Call xcoff_mark_symbol rather than
+	doing it by hand.
+	(xcoff_build_ldsyms): Build a .loader symbol for an export symbol.
+
+Mon Oct 30 14:53:48 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (struct xcoff_final_link_info): Add new line_filepos
+	field.
+	(xcoff_find_reloc): New static function.
+	(xcoff_link_add_symbols): Use it.
+	(_bfd_xcoff_bfd_final_link): Set finfo.line_filepos.
+	(xcoff_link_input_bfd): Handle C_BINCL and C_EINCL.  Don't
+	relocate the value of C_DECL.
+
+	* elf.c (elf_fake_sections): Remove bogus BFD_ASSERT.
+
+Sat Oct 28 01:25:34 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* cofflink.c (_bfd_coff_generic_relocate_section): Make
+	callback decide what goes in .relocs.
+	* pe[i]-i386.c (TARGET_UNDERSCORE): Define.
+	* peicode.h (pe_mkobject_hook): Only copy aouthdr if
+	there is one.
+
+Sat Oct 28 01:51:02 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (xcoff_link_add_symbols): Handle csects in the
+	absolute section.
+
+Fri Oct 27 18:14:39 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c: More improvements, mostly to fix handling of
+	constructors and a few other special cases.
+	* coff-rs6000.c (rs6000coff_vec): Set symbol_leading_char back to
+	zero, reverting yesterday's change.
+	* bfd-in.h (bfd_xcoff_link_record_set): Declare.
+	(bfd_xcoff_link_count_reloc): Declare.
+	(bfd_xcoff_record_link_assignment): Declare.
+	* bfd-in2.h: Rebuild.
+
+Fri Oct 27 14:42:15 1995  Niklas Hallqvist  <niklas@appli.se>
+
+	* PORTING, aout-arm.c, aout-encap.c, aout-target.h,
+	aoutx.h, gen-aout.c, host-aout.c, hp300bsd.c, i386aout.c
+	i386bsd.c, i386dynix.c, i386linux.c, i386lynx.c, i386mach3.c,
+	i386netbsd.c, m68klynx.c, m88kmach3.c, mipsbsd.c, newsos3.c,
+	ns32knetbsd.c, pc532-mach.c, riscix.c, sparclynx.c, sparcnetbsd.c:
+	Change PAGE_SIZE to TARGET_PAGE_SIZE.
+
+	* m68knetbsd.c: Ditto as well as add support for the m68k4k object
+	format.
+
+	* netbsd.h: Double ditto (incl. m68k4k support).  NetBSD's text
+	segments includes the a.out header.  See to that the magic number
+	*always* is big-endian.
+
+	* config.bfd: Add m68*-hp*-netbsd* case.  Cross-pollinate m68k and
+	m68k4k NetBSD configurations.
+
+	* configure.in, configure: Separate i386 & mips NetBSD
+	configurations from other BSD ones.  Don't assume DEC is the only
+	thing NetBSD/mips run on.  Add {m68k,ns32k,sparc}-*-netbsd*
+	configurations.  Add support for m68k4k NetBSD object format.
+
+	* libaout.h: Added M_68K4K_NETBSD magic.
+
+	* m68k4knetbsd.c: New file.
+
+	* hosts/{m68k,sparc}nbsd.h: Don't define HOST_BIG_ENDIAN_P.
+
+	* hosts/nbsd.h: Define HOST_BIG_ENDIAN_P according to
+	<machine/endian.h>.
+
+	* hosts/mipsnbsd.h: New file.
+
+Thu Oct 26 14:16:47 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c: Numerous changes to get closer to a working XCOFF
+	linker.
+	* libcoff-in.h (struct xcoff_tdata): Add full_aouthdr,
+	toc_section, and entry_section fields.
+	(struct xcoff_section_tdata): Remove ldrel_count field.
+	* libcoff.h: Rebuild.
+	* coffcode.h (coff_mkobject_hook): Initialize new xcoff_data
+	fields.
+	(coff_compute_section_file_positions): If RS6000COFF_C, generate
+	full a.out header if full_aouthdr is set in xcoff_data.
+	(coff_write_object_contents): Likewise.  Set o_snentry and o_sntoc
+	based on sections stored in xcoff_data.
+	* coff-rs6000.c (xcoff_copy_private_bfd_data): Copy new xcoff_data
+	fields.
+	(xcoff_reloc_type_lookup): Handle BFD_RELOC_CTOR.
+	(rs6000coff_vec): Set symbol_leading_char to '.'.
+	* coffgen.c (coff_get_symbol_info): If fix_value is set, fix the
+	value stored in ret rather than returning a pointer value.
+
+Wed Oct 25 23:10:39 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* config.bfd (powerpc{,le}-{elf,sysv4,eabi,solaris2}): Remove MAC
+	format for now.
+
+Wed Oct 25 16:19:27 1995  Jeffrey A Law  (law@cygnus.com)
+
+	* som.c (som_slurp_string_table): Allocate the strings with malloc
+	since they're free'd by free_cached_info.
+	(som_slurp_symbol_table): Similarly for the symbol table.
+
+Wed Oct 25 14:59:22 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* Makefile.in (diststuff):  Don't make headers.
+
+Wed Oct 25 11:32:54 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in: Rebuild dependencies.
+
+	* sunos.c (bfd_sunos_record_link_assignment): Don't do anything if
+	output_bfd is not SunOS.
+	(bfd_sunos_size_dynamic_sections): Likewise.  Don't scan relocs of
+	non-SunOS input files.
+
+	* xcofflink.c: Extensive changes to support linking shared objects
+	and generating a .loader section.
+	* libcoff-in.h (struct xcoff_tdata): Add import_file_id field.
+	(struct xcoff_section_tdata): Add lineno_count, first_symndx,
+	last_symndx, and ldrel_count fields.
+	* libcoff.h: Rebuild.
+	* coff-rs6000.c (xcoff_howto_table): Correct reloc names.
+	* coffcode.h (styp_to_sec_flags): Don't set any flags if STYP_PAD
+	is set.
+	* bfd-in.h (bfd_xcoff_import_symbol): Declare.
+	(bfd_xcoff_export_symbol): Declare.
+	(bfd_xcoff_size_dynamic_sections): Declare.
+	* bfd-in2.h: Rebuild.
+
+Tue Oct 24 17:44:20 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* configure.in: Add xcofflink.o to pmac_xcoff_vec.
+	* configure: Rebuild.
+	* mpw-config.in: Add xcofflink.c.o to powerpc-apple-macos.
+	* coff-pmac.c: Include coff-rs6000.c instead of duplicating its
+	contents.
+	(pmac_xcoff_vec): Update to use new xcoff support.
+	* coff-rs6000.c (xcoff_generic_stat_arch_elt): Make static.
+	(xcoff_write_armap): Declare buf as unsigned char.
+	* xcofflink.c (xcoff_link_add_symbols): Declare a local as PTR.
+
+	* mpw-make.sed: Generalize subdir_do edit.
+
+Tue Oct 24 10:25:01 1995  Jeffrey A Law  (law@cygnus.com)
+
+	* hppabsd-core.c (make_bfd_asection): Initialize asect->filepos
+	correctly.  Don't initialize asect->vma.
+
+Fri Oct 20 13:23:48 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* opncls.c (_bfd_new_bfd): If _bfd_chunksize wasn't preset, use
+	something a little less than the page size.
+
+Thu Oct 19 13:06:09 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-i960.c (coff_i960_adjust_symndx): Clear *adjustedp.
+
+Wed Oct 18 16:20:08 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* coff-i386.c (coff_i386_reloc_type_lookup): New.
+	* coffcode.h (coff_write_object_contents): If .bss is before
+	.data us that as data_start.
+	* cofflink.c (_bfd_coff_generic_relocate_section): Get reloc
+	calc correct.
+	* peicode.h (add_data_entry): Use _cooked_size of data directory.
+	(coff_swap_outhdr_out): Hardwire in version number.
+
+Wed Oct 18 16:50:54 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* sunos.c (sunos_add_dynamic_symbols): Rename local variables
+	major and minor to *_vno, since the former are also macros in
+	SunOS header files.  Cast result of bfd_alloc to appropriate
+	type.
+
+	* coffgen.c (coff_find_nearest_line): Cast used_by_bfd value
+	before assigning to sec_data.
+
+Wed Oct 18 13:25:17 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ecoff.c (_bfd_ecoff_find_nearest_line): The offset argument is
+	now relative to the section, not absolute.
+	* ecofflink.c (_bfd_ecoff_locate_line): Use the right symbol to
+	get the file name when there is a N_SO directory name.  When
+	handling stabs, remember that section->vma was added to the
+	offset.
+
+Tue Oct 17 18:24:54 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* sunos.c (struct sunos_link_hash_table): Add needed field.
+	(sunos_link_hash_table_create): Call bfd_release, not free.
+	(sunos_link_hash_table_create): Initialize needed field.
+	(sunos_add_dynamic_symbols): Record needed objects.
+	(bfd_sunos_get_needed_list): New function.
+	* bfd-in.h (bfd_sunos_get_needed_list): Declare.
+	* bfd-in2.h: Rebuild.
+
+Mon Oct 16 14:43:59 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* libcoff-in.h (pe_data_type.in_reloc_p): New.
+
+Mon Oct 16 10:52:50 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfd-in.h (struct bfd_link_needed_list): Rename from
+	bfd_elf_link_needed_list.
+	* bfd-in2.h: Rebuild.
+	* elf.c, elflink.h, libelf.h: Corresponding changes.
+
+	Add start at AIX linker support; no shared libraries yet.
+	* xcofflink.c: New file.
+	* configure.in (rs600coff_vec): Use xcofflink.o.
+	* configure: Rebuild.
+	* libcoff-in.h (struct xcoff_tdata): Add csects and debug_indices
+	fields.
+	(struct xcoff_section_tdata): Define.
+	(xcoff_section_data): Define macro.
+	(_bfd_xcoff_bfd_link_hash_table_create): Declare.
+	(_bfd_xcoff_bfd_link_add_symbols): Declare.
+	(_bfd_xcoff_bfd_final_link): Declare.
+	(_bfd_ppc_xcoff_relocate_section): Declare.
+	* libcoff.h: Rebuild.
+	* coff-rs6000.c: Clean up a bit.
+	(xcoff_mkobject): Default modtype to 1L, not RE.  Initialize
+	cputype, csects, and debug_indices.
+	(xcoff_copy_private_bfd_data): Copy cputype.
+	(xcoff_howto_table): Rename from rs6000coff_howto_table.
+	(xcoff_rtype2howto): Rename from rs6000coff_rtype2howto.
+	(xcoff_reloc_type_lookup): Rename from
+	rs6000coff_reloc_type_lookup.
+	(coff_relocate_section): Define.
+	(_bfd_xcoff_sizeof_headers): Define.
+	(_bfd_xcoff_bfd_get_relocated_section_contents): Define.
+	(_bfd_xcoff_bfd_relax_section): Define.
+	(_bfd_xcoff_bfd_link_split_section): Define.
+	(rs6000coff_vec): For BFD_JUMP_TABLE_LINK, use _bfd_xcoff, not
+	coff.
+	* coffcode.h (coff_compute_section_file_positions): If AIX,
+	increment sofar by SMALL_AOUTSZ if not executable.
+	(coff_write_object_contents): If AIX, always output an a.out
+	header; if not executable, header size of SMALL_AOUTSZ.
+	* hash.c (struct bfd_strtab_hash): Add xcoff field.
+	(_bfd_stringtab_init): Initialize xcoff field.
+	(_bfd_xcoff_stringtab_init): New function.
+	(_bfd_stringtab_add): In XCOFF mode, leave two bytes for length.
+	(_bfd_stringtab_emit): In XCOFF mode, write out length.
+	* libbfd-in.h (_bfd_xcoff_stringtab_init): Declare.
+	* libbfd.h: Rebuild.
+	* Makefile.in: Rebuild dependencies.
+	(BFD32_BACKENDS): Add xcofflink.o.
+	(CFILES): Add xcofflink.c.
+
+	* elf32-mips.c (mips_elf_symbol_processing): Set SEC_ALLOC, not
+	SEC_NO_FLAGS, for .acommon section.  From Peter Schauer
+	<Peter.Schauer@Regent.E-Technik.TU-Muenchen.DE>.
+
+Sat Oct 14 21:36:02 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* coff-ppc.c (in_reloc_p): Add, clone from coff-i386.c.
+
+Fri Oct 13 17:48:43 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* acconfig.h (HAVE_SYS_PROCFS_H): Undef, with comment.
+	* config.in: Regenerated.
+
+	* opncls.c (getpagesize) [!HAVE_GETPAGESIZE]: Define as 2048.
+	(_bfd_chunksize): New variable.
+	(_bfd_new_bfd): Set it to getpagesize() if negative, and use it
+	for obstack chunk size.
+	* configure.in: Check for getpagesize.
+	* configure: Regenerated.
+
+	Mon Sep 25 22:49:32 1995  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* trad-core.c (rawptr): Make it a local variable of
+ 	ptrace_unix_core_file_p.
+
+Fri Oct 13 11:22:01 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* coff-arm.c (in_reloc_p): New.
+	* coff-i386.c (in_reloc_p): New.
+	* coffcode.h: Allways include peicode.h if COFF_WITH_PE.
+	(coff_write_object_contents): Only set has_reloc_section
+	if PE_IMAGE.
+	* cofflink.c (_bfd_coff_generic_relocate_section): Call
+	in_reloc_p to decide if reloc should be emitted.
+	* libcoff.h (pe_data_type.in_reloc_p): New.
+	* peicode.h (pe_mkobject): Initialize in_reloc_p.
+
+Wed Oct 11 00:49:29 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cofflink.c (_bfd_coff_internal_syment_name): Move to coffgen.c.
+	(_bfd_coff_read_internal_relocs): Likewise.
+	* coffgen.c (_bfd_coff_internal_syment_name): Copy from coffgen.c.
+	(_bfd_coff_read_internal_relocs): Likewise.
+
+	* elflink.h (elf_link_add_object_symbols): Correct conditions
+	under which type and size change warnings are issued.
+
+Tue Oct 10 18:32:46 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffgen.c (coff_count_linenumbers): Don't count line numbers for
+	a symbol which is not in a real section.
+	(coff_write_native_symbol): Corresponding change.
+
+	* cofflink.c (_bfd_coff_link_hash_newfunc): Rename from
+	coff_link_hash_newfunc and make non-static.
+	(_bfd_coff_link_hash_table_init): New function, broken out of
+	_bfd_coff_link_hash_table_create.
+	(_bfd_coff_link_hash_table_create): Use it.
+	(process_embedded_commands): Make static.
+	* libcoff-in.h ((_bfd_coff_link_hash_newfunc): Declare.
+	(_bfd_coff_link_hash_table_init): Declare.
+	* libcoff.h: Rebuild.
+
+	* coffcode.h (coff_mkobject_hook): If RS6000COFF_C, set cputype
+	field in XCOFF tdata.
+	(coff_set_arch_mach_hook): Check ifdef RS6000COFF_C, not ifdef
+	U802ROMAGIC, for clarity.  Try to set arch and machine correctly
+	based on cputype stored in a.out header, or in n_type of initial
+	.file symbol.
+	(coff_write_object_contents): Set cputype correctly in a.out
+	header.
+	(coff_slurp_symbol_table): Add casts to file_ptr to avoid
+	warnings.
+	* coffswap.h (coff_swap_aouthdr_in): Swap in cputype field.
+	(coff_swap_aouthdr_out): Swap out cputype field.  Don't clear
+	old resv1 field.
+	* libcoff-in.h (struct xcoff_tdata): Add cputype field.
+	* libcoff.h: Rebuild.
+
+	* cpu-rs6000.c (rs6000_compatible): New static function.
+	(bfd_rs6000_arch): Use it.
+	* cpu-powerpc.c (powerpc_compatible): New static function.
+	(arch_info_struct): Define various flavours of PowerPC.
+	(bfd_powerpc_arch): Use powerpc_compatible.  Point at
+	arch_info_struct.
+
+Tue Oct 10 10:50:46 1995  Fred Fish  <fnf@cygnus.com>
+
+	* Makefile.in (FLAGS_TO_PASS):  Remove BISON.
+
+Tue Oct 10 01:28:29 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_add_object_symbols): Don't warn about
+	changing the size or type if the old definition was weak.
+
+Mon Oct  9 11:24:08 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffcode.h (combined_entry_type): Add fix_line field.
+	(coff_slurp_line_table): Warn if we try to set the lineno field of
+	a symbol twice.
+	(coff_slurp_symbol_table): If RS6000COFF_C, handle C_BINCL and
+	C_EINCL by setting fix_line.  Fix C_BSTAT symbol value.
+	* coffgen.c (coff_mangle_symbols): Handle fix_line.
+	(coff_write_symbol): Only use N_DEBUG if the symbol is in the
+	absolute section.
+	(coff_print_symbol): Print fix_value symbols in a useful fashion.
+	* libcoff.h: Rebuild.
+
+	* libcoff-in.h (struct xcoff_tdata): Define.
+	(xcoff_data): Define.
+	* bfd.c (struct _bfd): Add xcoff_obj_data field to tdata union.
+	* bfd-in2.h, libcoff.h: Rebuild.
+	* coff-rs6000.c (xcoff_mkobject): New static function.
+	(coff_mkobject): Define.
+	(xcoff_copy_private_bfd_data): New static function.
+	(coff_bfd_copy_private_bfd_data): Define.
+	(rs6000coff_howto_table): Change R_TOC complain_on_overflow from
+	signed to bitfield.
+	(rs6000coff_vec): Add DYNAMIC to object_flags.
+	* coffcode.h (sec_to_styp_flags): If RS6000COFF_C, handle .pad and
+	.loader sections specially.
+	(coff_new_section_hook): If RS6000COFF_C, get the .text and .data
+	section alignment from the XCOFF tdata information.
+	(coff_mkobject_hook): If RS6000COFF_C, set DYNAMIC based on
+	F_SHROBJ, and copy the extra a.out header information into the
+	XCOFF tdata structure.
+	(coff_write_object_contents): If RS6000COFF_C, set F_SHROBJ,
+	F_DYNLOAD and the extra a.out header information.
+	(coff_slurp_symbol_table): Set BSF_NOT_AT_END for a C_EXT or
+	C_HIDEXT symbol with attached csect information.
+	* coffswap.h (coff_swap_aouthdr_in): If RS6000COFF_C, swap
+	in the o_maxdata field.
+	(coff_swap_aouthdr_out): If RS6000COFF_C, swap extra XCOFF fields.
+	* coffgen.c (coff_renumber_symbols): Don't move any symbol to the
+	end if BSF_NOT_AT_END is set.
+
+	* targets.c (bfd_target): Rename _bfd_read_ar_hdr field to
+	_bfd_read_ar_hdr_fn.
+	* libbfd-in.h (_bfd_read_ar_hdr): Update accordingly.
+	* bfd-in2.h, libbfd.h: Rebuild.
+	* archive.c (_bfd_get_elt_at_filepos): Cast _bfd_read_ar_hdr
+	return value.
+	(do_slurp_bsd_armap, do_slurp_coff_armap): Likewise.
+	(bfd_slurp_bsd_armap_f2): Likewise.
+	(_bfd_slurp_extended_name_table): Likewise.
+
+Fri Oct  6 16:18:35 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	Mon Sep 25 22:49:32 1995  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* archive.c (bfd_get_next_mapent): Return BFD_NO_MORE_SYMBOLS
+	when the symbol table is empty.
+
+	* elf32-m68k.c (elf_m68k_size_dynamic_sections): Don't reserve
+	space for section symbols, since we don't output them either.
+	(elf_m68k_adjust_dynindx): Removed.
+
+	* ptrace-core.c (rawptr): Make it a local variable of
+ 	ptrace_unix_core_file_p.
+
+Fri Oct  6 12:24:47 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* coff-rs6000.c (xcoff_write_archive_contents): Return false, not
+	NULL.
+
+	* config.bfd (powerpc{,le}-{elf,sysv4,eabi,solaris2}): Add NT, and
+	Mac object file formats.
+
+Fri Oct  6 12:04:02 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffgen.c (coff_fix_symbol_name): Don't try to set up file
+	auxent if there isn't one.
+	(coff_write_symbols): If there is no file auxent, use SYMNMLEN
+	rather than FILNMLEN as the maximum name length.
+
+	* coffcode.h (bfd_coff_backend_data): Add new field
+	_bfd_coff_print_aux.
+	(bfd_coff_print_aux): New static function.
+	(coff_pointerize_aux_hook (RS6000COFF_C version)): Pointerize the
+	scnlen field of an XTY_LD csect aux entry.
+	(coff_print_aux): New static function.
+	(coff_slurp_symbol_table): Don't pointerize scnlen field; now done
+	in coff_pointerize_aux_hook.
+	(bfd_coff_std_swap_table): Initialize new field.
+	* coffgen.c (coff_print_symbol): Call bfd_coff_print_aux.
+	* libcoff.h: Rebuild.
+	* coff-alpha.c (alpha_ecoff_backend_data): Initialize new field.
+	* coff-mips.c (mips_ecoff_backend_data): Likewise.
+
+	* coffcode.h (coff_write_object_contents): On AIX, clear F_RELFLG
+	if there are symbols, for native AIX ld compatibility.
+
+	* coffcode.h (bfd_coff_backend_data): Add new field
+	_bfd_coff_pointerize_aux_hook.
+	(coff_pointerize_aux_hook): Define as a function if RS6000COFF_C
+	or I960, and as 0 otherwise.
+	(bfd_coff_std_swap_table): Initialize new field.
+	* libcoff.h: Rebuild.
+	* coffgen.c (coff_pointerize_aux): Change parameters  to take
+	symbol pointer instead of type and class, and to take aux index.
+	Call _bfd_coff_pointerize_aux_hook if it is defined.
+	(coff_get_normalized_symtab): Always call coff_pointerize_aux.
+	* coff-alpha.c (alpha_ecoff_backend_data): Initialize all fields.
+	* coff-mips.c (mips_ecoff_backend_data): Likewise.
+
+	* coff-rs6000.c: Add full support for AIX archives.  Rewrite old
+	read-only/host-only support.
+
+	* coffcode.h (coff_slurp_symbol_table): Set C_HIDEXT symbols to be
+	BSF_LOCAL.
+	(OTHER_GLOBAL_CLASS): Do not define to be C_HIDEXT if
+	RS6000COFF_C.
+
+	* targets.c (bfd_target): Add _bfd_read_ar_hdr field.  Modify
+	BFD_JUMP_TABLE_ARCHIVE accordingly.
+	* libbfd-in.h (_bfd_snarf_ar_hdr): Don't declare.
+	(_bfd_compute_and_write_armap): Declare.
+	(_bfd_generic_read_ar_hdr): Declare.
+	(_bfd_read_ar_hdr): Define.
+	(_bfd_noarchive_read_ar_hdr): Define.
+	(_bfd_archive_bsd_read_ar_hdr): Define.
+	(_bfd_archive_coff_read_ar_hdr): Define.
+	* archive.c: Change all callers of _bfd_snarf_ar_hdr to call
+	_bfd_read_ar_hdr instead.
+	(_bfd_generic_read_ar_hdr): Rename from _bfd_snarf_ar_hdr.
+	(_bfd_compute_and_write_armap): Rename from
+	compute_and_write_armap.  Make non-static.  Change all callers.
+	* ecoff.c (_bfd_ecoff_slurp_armap): Call _bfd_read_ar_hdr rather
+	than _bfd_snarf_ar_hdr.
+	* aout-target.h (MY_read_ar_hdr): Define if not defined.
+	* ieee.c (ieee_read_ar_hdr): Define.
+	* libecoff.h (_bfd_ecoff_read_ar_hdr): Define.
+	* oasys.c (oasys_read_ar_hdr): Define.
+	* som.c (som_read_ar_hdr): Define.
+	* bfd-in2.h, libbfd.h: Rebuild.
+
+Thu Oct  5 14:04:07 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* peicode.c (coff_swap_filehdr_in): If symptr is
+	zero, there aren't any symbols, even if nsyms is set.
+
+Thu Oct  5 11:45:02 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libecoff.h (struct ecoff_backend_data): Add adjust_headers
+	field.
+	* ecoff.c (ecoff_sec_to_styp_flags): Check for various Alpha
+	sections, and set styp correctly for them: .got, .hash, .dynamic,
+	.liblist, .rel.dyn, .conflic, .dynstr, .dynsym, .comment.
+	(_bfd_ecoff_styp_to_sec_flags): Check for various Alpha section
+	types.
+	(ecoff_sort_hdrs): New static function.
+	(ecoff_compute_section_file_positions): Return boolean, not void.
+	Sort the sections by VMA before looking through them.  Put the
+	first non SEC_ALLOC section on a new page.  Put every SEC_ALLOC
+	section on an appropriate boundary within the page.
+	(ecoff_compute_reloc_file_positions): Check return value of
+	ecoff_compute_section_file_positions.
+	(_bfd_ecoff_set_section_contents): Likewise.
+	(_bfd_ecoff_write_object_contents): Check for various Alpha
+	section types when incrementing text_size and data_size.  Call
+	adjust_headers backend function if it exists.
+	* coff-alpha.c (alpha_adjust_headers): New static function.
+	(alpha_ecoff_backend_data): Initialize adjust_headers field.
+	* coff-mips.c (mips_ecoff_backend_data): Likewise.
+
+	* hosts/i386bsd.h: Restore file incorrectly deleted on Sep 6.
+
+Wed Oct  4 18:15:02 1995  Jeff Law  (law@hurl.cygnus.com)
+
+	* rs6000-core.c (CORE_VERSION_1): Use CORE_VERSION_1 instead
+	of ALTERNATE_AIX_CORE_FORMAT.
+	* configure.in (aix4): No longer need CORE_FLAGS.
+	* configure: Updated.
+
+Wed Oct  4 15:36:36 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	NS32k changes from Ian Dall:
+	* aoutx.h (MY_final_link_relocate, MY_relocate_contents): New
+	macros.
+	(aout_link_input_section_std, aout_link_input_section_ext,
+	aout_link_reloc_link_order): Call them instead of _bfd_*
+	versions.
+	* aout-target.h (MY_exec_header_not_counted): New macro, defaults
+	to zero.
+	(backend_data): Use it instead of hardcoded zero.
+
+	* aout-ns32k.c (CTOR_TABLE_RELOC_HOWTO): New macro.
+	(MY_swap_std_reloc_out): Use udata.i for KEEPIT, don't call stoi.
+
+	* ns32knetbsd.c: Include bfd.h.
+	(MY_text_includes_header, MY_bfd_reloc_type_lookup): New macros.
+	(MY_bfd_reloc_type_lookup): Declare function too.
+	* pc532-mach.c (set_sizes): Don't declare.
+	(MY_text_includes_header, MY_exec_header_not_counted): Define.
+	(backend_data, MY_backend_data): Don't define.
+
+	* config.bfd: Treat ns32k-pc532-ux* like ns32k-pc532-mach*, and
+	ns32k-*-lites* like ns32k-*-netbsd*.
+
+	* hosts/nbsd.h: Swap order of sys/vmparam.h and sys/param.h, to
+	compile on lites.
+
+Wed Oct  4 14:15:52 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffcode.h (coff_write_object_contents): Restore setting
+	f_timdat to 0, deleted on August 22.
+
+Tue Oct  3 16:28:32 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* coffcode.h (coff_bfd_copy_private_symbol_data,
+	coff_bfd_copy_private_section_data,
+	coff_bfd_copy_private_bfd_data): ifdef to allow overrides.
+	* peicode.h (coff_bfd_copy_private_bfd_data): New
+	(pe_bfd_copy_private_bfd_data): New.
+	(coff_swap_scnhdr_in): Swap bss size into the right place.
+	(pe_print_private_bfd_data): Add some newlines.
+
+Tue Oct  3 11:53:04 1995  Jeff Law  (law@hurl.cygnus.com)
+
+	* som.c (setup_sections): Don't die if a space has no subspaces.
+
+Mon Oct  2 14:08:55 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_add_object_symbols): Don't let a weak
+	dynamic symbol override a common symbol.  Don't change the size or
+	type if they have been set and the new symbol is not a definition.
+	Warn if the size or type changes.
+
+Sun Oct  1 01:34:41 1995  Jeff Law  (law@hurl.cygnus.com)
+
+        * som.c (som_begin_writing): Don't write the symbol table or
+	symbol	strings.
+	(som_finish_writing): Write them here.  Place them after the
+	subspace data, but before the relocs.
+
+Fri Sep 29 11:01:55 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* sunos.c (sunos_add_one_symbol): Just pass false, not
+	info->shared_library, to sunos_create_dynamic_sections.
+	(sunos_scan_ext_relocs): Don't warn about a reloc in the .text
+	section.
+	(sunos_check_dynamic_reloc): Remove .text section assertion.
+
+Thu Sep 28 18:48:47 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* config.bfd: Add powerpc-*-macos*, powerpc-*-mpw*.
+	* configure, configure.in: Add pmac_xcoff_vec case.
+	* Makefile.in (BFD32_BACKENDS): Add coff-pmac.o.
+	* coff-pmac.c: New file, PowerMac XCOFF support.
+	* coffcode.h (coff_set_arch_mach_hook): Add PowerMac case.
+	* targets.c (pmac_xcoff_vec): Declare.
+
+	* mpw-config.in: Various changes to be compatible with the
+	autoconf-based configury.
+	* mpw-make.sed: New file, sed commands to translate Unix
+	makefile into MPW syntax.
+	* mpw-make.in: Remove.
+	* hosts/mpw.h: Remove.
+	* bfd-in.h, bfd-in2.h: If MPW, include the file that defines
+	true and false as enums, then define TRUE_FALSE_ALREADY_DEFINED.
+
+Thu Sep 28 17:06:23 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* binary.c (binary_get_symtab): Return an empty string on error.
+	* opncls.c (bfd_fdpenr): Change WIN32 restriction to WINGDB.
+
+Thu Sep 28 15:30:44 1995  Kim Knuttila  <krk@nellie>
+
+	* coff-ppc.c: Reformatted according to gnu conventions
+	              Removed irrelevant "if 0" code
+
+Thu Sep 28 11:19:53 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* hp300hpux.c (convert_sym_type): Treat secondary symbols as weak
+	symbols rather than as indirect symbols.
+	(MY(slurp_symbol_table)): Don't do anything special about
+	secondary symbols.
+
+	* coffcode.h (coff_new_section_hook): Make sure that the alignment
+	of .ctors and .dtors sections is no larger than 2.
+
+	* sunos.c (sunos_add_one_symbol): Don't change
+	bfd_link_hash_common to bfd_link_hash_new, since it may be on the
+	undef list.
+	(bfd_sunos_record_link_assignment): Don't put __DYNAMIC in the
+	dynamic symbols when creating a shared library.
+	(sunos_scan_ext_relocs): Handle relocs correctly when creating a
+	shared library.
+	(sunos_scan_dynamic_symbol): Don't mark the __DYNAMIC symbol as
+	written even if it is not defined in a regular object.
+	(sunos_write_dynamic_symbol): Use plt_offset for the address of
+	the jump table reloc.  Add an assertion.  Use RELOC_JMP_SLOT
+	rather than the constant 22.
+	(sunos_check_dynamic_reloc): Handle creating a shared library.
+	(sunos_finish_dynamic_link): Set the first entry in the GOT to
+	zero when creating a shared library.
+	* aoutx.h (NAME(aout,final_link)): If there is a symbol __DYNAMIC,
+	write it out at the start of the symbol table.
+
+	* Makefile.in (BFD32_BACKENDS): Add coff-arm.o.
+
+Thu Sep 28 00:58:05 1995  Doug Evans  <dje@deneb.cygnus.com>
+
+	* config.bfd: Add arm-*-coff.
+	* configure.in, configure: Add armcoff_{little,big}_vec.
+	* targets.c (armcoff_{little,big}_vec): Declare.
+	(bfd_target_vector): Add armcoff_{little,big}_vec.
+	* coff-arm.c (armcoff_{little,big}_vec): Always define.
+
+Wed Sep 27 10:37:14 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* targets.c (bfd_find_target): Remove debugging code.
+
+Wed Sep 27 07:23:39 1995  Kim Knuttila  <krk@nellie>
+
+	* coff-ppc.c, pe-ppc.c, pei-ppc.c: Initial bfd for coff/PE
+        support on powerpc.
+	* Makefile.in: added *-ppc files
+	* coffcode.h: ppc MAGIC, and use peicode.h rather than coffswap.h to
+        allow pe based .o's to be shared with other tools on ppc/NT
+	* config.bfd: added powerpc[le]-[pe|winnt] config support
+	* configure, configure.in: added bfd_powerpc[le]_pe[i]_vec
+	* peicode.h: Added more section flags for PE on ppc
+	             Added coff_swap_filehdr_out to allow peicode.h to be
+		     used for non-image PE files on ppc.
+		     Check for image, or not, before copying pe_opthdr
+	* targets.c: Added new bfd's
+	* targets.c: Removed two inactive bfds that shouldn't have made it this
+                     far.
+
+Tue Sep 26 14:06:41 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_reloc_type): Rename from reloc_type, and use
+	explicit values to initialize all relocs.  Change all users.
+	(ppc_elf_brtaken_inner): New function to handle branch predicition
+	relocs.
+	(ppc_elf_brtaken_reloc): Ditto.
+	(ppc_elf_howto_raw): Use new functions.  Make sure all unsupported
+	relocs use ppc_elf_unsupported_reloc.
+	(ppc_elf_merge_private_bfd_data): Keep track of whether an error
+	needs to be reported.
+	(ppc_elf_relocate_section): Support branch prediction relocs.
+
+Tue Sep 26 12:48:05 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfd.c (bfd_assert): Remove \n from string passed to
+        _bfd_error_handler.
+
+	* coff-i386.c: (TWO_DATA_SECS): Don't define.
+	* coffcode.h (bfd_coff_backend_data): Remove _bfd_make_section_hook.
+	(bfd_coff_make_section_hook): Don't define.
+	(coff_make_section_hook): Remove.
+	(sec_to_styp_flags): Remove TWO_DATA_SECS case.
+	(styp_to_sec_flags): Likewise.
+	(coff_write_object_contents): Likewise.
+	(bfd_coff_std_swap_table): Don't initialize make_section_hook
+	field.
+	* libcoff.h: Rebuild.
+	* coffgen.c (make_a_section_from_file): Just call
+	bfd_make_section_anyway, not bfd_make_section or
+	bfd_coff_make_section_hook.
+	* ecoff.c (_bfd_ecoff_make_section_hook): Remove.
+	* libecoff.h (_bfd_ecoff_make_section_hook): Don't declare.
+	* coff-alpha.c (alpha_ecoff_backend_data): Don't initialize
+	make_section_hook field.
+	* coff-mips.c (mips_ecoff_backend_data): Likewise.
+
+	* aoutx.h (translate_from_native_sym_flags): Don't try to stuff
+	pointers into value field for warning and indirect symbols; just
+	leave the value field alone.
+	* linker.c (generic_link_add_symbol_list): Use next symbol for
+	warning and indirect symbols, rather than looking in symbol value.
+	* ecoff.c (ecoff_set_symbol_info): Remove indirect_ptr_ptr
+	parameter.  Change all callers.  Remove support for indirect
+	symbols; it didn't work anyhow.
+	(_bfd_ecoff_slurp_symbol_table): Remove indirect_ptr variable.
+	* syms.c: Change comments about BSF_WARNING and BSF_INDIRECT.
+	* bfd-in2.h: Rebuild.
+
+Mon Sep 25 16:04:09 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_howto_raw): For all 14-bit branch relocs,
+	go back to telling the tools this reloc operates on 32 bits.
+
+Mon Sep 25 11:48:02 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aout-adobe.c (aout_adobe_callback): Use _bfd_error_handler
+	rather than a direct fprintf.
+	* archive.c (_bfd_write_archive_contents): Likewise.
+	* coffcode.h (coff_slurp_symbol_table): Likewise.
+	* elf32-ppc.c (ppc_elf_merge_private_bfd_data): Likewise.
+	(ppc_elf_unsupported_reloc): Likewise.
+	(ppc_elf_relocate_section): Likewise.
+	* i386linux.c (linux_tally_symbols): Likewise.
+	(linux_finish_dynamic_link): Likewise.
+	* osf-core.c (osf_core_core_file_p): Likewise.
+	* rs6000-core.c (rs6000coff_get_section_contents): Likewise.
+	* som.c (som_sizeof_headers): Likewise.
+	* srec.c (srec_bad_byte): Likewise.
+	* bfd.c (bfd_assert): Likewise.  Also change file to be const.
+	* libbfd-in.h (bfd_assert): Declare first parameter const.
+	* libbfd.h: Rebuild.
+	* coff-a29k.c (a29k_reloc): Don't bother to fprintf; returning
+	bfd_reloc_overflow is enough.
+	* coff-h8300.c (rtype2howto): Don't bother to fprintf; just abort.
+	* coff-h8500.c (rtype2howto): Likewise.
+	* coff-z8k.c (rtype2howto): Likewise.
+	* coffcode.h (dummy_reloc16_extra_cases): Likewise.
+	* elf.c (_bfd_elf_get_lineno): Likewise.
+	(_bfd_elf_no_info_to_howto): Likewise.
+	(_bfd_elf_no_info_to_howto_rel): Likewise.
+	* hp300hpux.c (convert_sym_type): Likewise.
+	(MY(swap_std_reloc_in)): Likewise.
+	* elf.c (bfd_section_from_shdr): Remove #if 0 sections.
+
+	* libaout.h (struct aoutdata): Add line_buf field.
+	* aoutx.h (NAME(aout,find_nearest_line)): Remove statics buffer
+	and filename_buffer.  Instead, use a malloc buffer stored in the
+	new line_buf field.  Remove length restrictions.
+
+	* coffgen.c (string_size): Remove static variable.
+	(debug_string_size, debug_string_section): Likewise.
+	(coff_fix_symbol_name): Add string_size_p, debug_string_section_p,
+	and debug_string_size_p parameters.  Use them instead of the
+	global variables.  Change all callers.
+	(coff_write_symbol): Likewise.
+	(coff_write_alien_symbol, coff_write_native_symbol): Likewise.
+	(coff_write_symbols): Add local variables to replace removed
+	global variables.
+
+	* libcoff-in.h (struct coff_section_tdata): Add offset, i,
+	function, and line_base fields.
+	* libcoff.h: Rebuild.
+	* coffgen.c (coff_find_nearest_line): Use section tdata to cache
+	information, rather than using static variables.
+
+	* sunos.c (sunos_read_dynamic_info): Adjust offsets in an NMAGIC
+	file.  From Peter DeWolf <pld@amt.tay1.dec.com>.
+
+	* init.c (initialized): Remove static variable.
+	(bfd_init): Don't bother setting initialized.
+	(bfd_check_init): Remove.
+	* opncls.c (_bfd_new_bfd): Don't call bfd_check_init.
+	* libbfd.h: Rebuild.
+
+Sat Sep 23 01:22:23 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* rs6000-core.c (rs6000coff_core_p):  Don't check the core file
+	size for full core dumps. Copy core file header to private data.
+	(rs6000coff_core_file_failing_command,
+	rs6000coff_core_file_failing_signal):  New functions to extract
+	the file name and terminating signal from the core file.
+	* coff-rs6000.c:  Use them.
+
+Fri Sep 22 17:44:47 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	Change arch info to be const, initialized at compile time.
+	* archures.c: Reindent many functions.  Change CONST to const.
+	(bfd_arch_info_type): Make arch_name const.  Remove disassemble;
+	nothing set it anyhow.  Make next const.
+	(bfd_arch_info_list): Remove.
+	(bfd_archures_list): Rename from archures_init_table.  Change from
+	a table of function pointers to a table of bfd_arch_info_type
+	structure addresses.
+	(bfd_scan_arch): Rewrite accordingly.  Return a const pointer.
+	(bfd_lookup_arch): Likewise.
+	(bfd_set_arch_info): Rewrite accordingly.  Change argument to be a
+	const pointer.
+	(bfd_default_arch_struct): Make const.
+	(bfd_arch_init, bfd_arch_linkin): Remove.
+	(bfd_get_arch_info): Return a const pointer.
+	* init.c (bfd_init): Don't call bfd_arch_init.
+	* bfd.c (struct _bfd): Make arch_info const.
+	* bfd-in2.h: Rebuild.
+	* libbfd.h: Rebuild.
+	* configure.in: Put & before everything in $selarchs.
+	* configure: Rebuild.
+	* cpu-*.c: Change bfd_*_arch from a function which calls
+	bfd_arch_linkin to a const structure.
+	* ieee.c (ieee_object_p): Make arch const.
+
+Fri Sep 22 16:23:18 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* reloc.c (bfd_reloc_code_type): Add relocations to support all of
+	PowerPC V.4.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+	* elf32-ppc.c (reloc_type): Update names to match current draft.
+	(ppc_elf_howto_raw): Mark 14 bit relocs as short sized and PC
+	relative.  Update names to current V.4 draft.
+	(ppc_elf_reloc_type_lookup): Add support for more relocations.
+	(ppc_elf_relocate_section): Rename relocations to match draft.
+
+Thu Sep 21 21:53:18 1995  Michael Meissner  <meissner@cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_merge_private_bfd_data): Allow modules
+	compiled with -mrelocatable-lib to be linked with either normal
+	modules or -mrelocatable modules.
+
+Wed Sep 20 12:03:26 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffcode.h (coff_write_object_contents): Clear the vstamp field
+	in the a.out header.
+
+	* aoutx.h (NAME(aout,swap_ext_reloc_out)): Don't set r_extern for
+	a reloc against a local symbol, even if it's not a section.
+
+Tue Sep 19 17:02:26 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* targets.c (bfd_target): Remove unused align_power_min field.
+	* bfd-in2.h: Rebuild.
+	* All backends: Remove initialization of align_power_min.
+
+Tue Sep 19 14:02:21 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* peicode.h (coff_swap_scnhdr_out): Get sizes for BSS right.
+
+Mon Sep 18 14:35:01 1995  Arne H. Juul  <arnej@pvv.unit.no>
+
+	* config.bfd (mips-dec-netbsd*): New target.
+	* configure.host (mips-dec-netbsd*): New host.
+	* configure.in (mips-dec-netbsd*): New native.
+	* configure: Rebuild.
+
+Fri Sep 15 10:24:36 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	Make the COFF backend linker merge common types:
+	* cofflink.c (struct coff_debug_merge_element): Define.
+	(struct coff_debug_merge_type): Define.
+	(struct coff_debug_merge_hash_entry): Define.
+	(struct coff_debug_merge_hash_table): Define.
+	(coff_debug_merge_hash_table_init): Define.
+	(coff_debug_merge_hash_table_free): Define.
+	(coff_debug_merge_hash_lookup): Define.
+	(struct coff_final_link_info): Add debug_merge field.
+	(coff_debug_merge_hash_newfunc): New static function.
+	(_bfd_coff_final_link): Allocate and free debug_merge table.
+	(coff_link_input_bfd): Merge identical enum, struct and union
+	types.
+
+Thu Sep 14 14:53:58 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	Convert i960 COFF to use COFF backend linker.
+	* coff-i960.c (coff_i960_relocate): Use a coff_section_data
+	structure to store the symbol being used.
+	(coff_i960_start_final_link): New static function.
+	(coff_i960_relocate_section): New static function.
+	(coff_i960_adjust_symndx): New static function.
+	(coff_start_final_link): Define.
+	(coff_relocate_section): Define.
+	(coff_adjust_symndx): Define.
+	* coffcode.h (bfd_coff_backend_data): Add new callback function
+	_bfd_coff_start_final_link.
+	(bfd_coff_start_final_link): Define.
+	(coff_start_final_link): Define if not defined.
+	(bfd_coff_std_swap_table): Add coff_start_final_link.
+	* cofflink.c (_bfd_coff_internal_syment_name): Make globally
+	visible.
+	(_bfd_coff_final_link): Call bfd_coff_start_final_link if the
+	function callback is not NULL.
+	* libcoff-in.h (struct coff_section_tdata): Add tdata field.
+	(_bfd_coff_internal_syment_name): Declare.
+	* libcoff.h: Rebuild.
+	* configure.in (icoff_big_vec): Add cofflink.o.
+	(icoff_little_vec): Likewise.
+	* configure: Rebuild.
+
+Wed Sep 13 17:38:23 1995  Fred Fish  <fnf@rtl.cygnus.com>
+
+	* Makefile.in (clean-info): Remove extraneous tab from line
+	following action.
+
+Wed Sep 13 13:27:53 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cofflink.c (coff_link_input_bfd): Fail if a section with no
+	contents has relocs.
+
+Thu Sep 12 12:45:34 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* coffcode.h (coff_compute_section_file_positions): Keep the
+	raw size safe.
+	(coff_write_object_contents): Remember if it's a relocatable
+	file.
+	* libcoff-in.h (pe_data_type): New member 'has_reloc_section'
+	* peicode.h (coff_swap_filehdr_out): Clear not-reloc flag
+	if relocatable file. Swap out saved raw size.
+
+Tue Sep 12 12:14:33 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (do_maintainer_clean): Rename from do_realclean.
+	(maintainer-clean): Rename from realclean, passing
+	maintainer-clean down to subdirectories, but leave realclean as a
+	synonym.
+
+	* linker.c (_bfd_generic_link_add_one_symbol): Pass symbol name to
+	warning callback.
+
+	* dep-in.sed: Remove config.h from generated dependencies.
+
+	* sunos.c (sunos_slurp_dynamic_symtab): New static function,
+	broken out of sunos_canonicalize_dynamic_symtab.
+	(sunos_canonicalize_dynamic_symtab): Call new function
+	sunos_slurp_dynamic_symtab.
+	(sunos_add_dynamic_symbols): Add three new parameters.  Return the
+	dynamic symbol table to the caller.
+	* aoutx.h (aout_link_add_symbols): Permit add_dynamic_symbols
+	callback to override the symbols being read.
+	* libaout.h (struct aout_backend_data): Add three new parameters
+	to add_dynamic_symbols callback.
+
+	Extensive minor changes to avoid various gcc warnings.  Also:
+	* Makefile.in (BFD32_BACKENDS): Remove coff-arm.o.
+	* archures.c (bfd_arch_info_type): Change mach field from long to
+	unsigned long.
+	(bfd_lookup_arch): Change machine parameter from long to unsigned
+	long.
+
+Mon Sep 11 10:55:47 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* sunos.c (sunos_scan_std_relocs): Fix BFD_ASSERT: it's OK to find
+	a symbol with a non-zero plt_offset.
+
+Fri Sep  8 11:47:24 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elfcode.h (align_file_position): Remove; not used.
+
+	* configure.in: Only check for <sys/procfs.h> on a native system,
+	and make sure it defines prstatus_t.
+	* configure: Rebuild.
+
+Thu Sep  7 12:48:01 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* sunos.c (sunos_write_dynamic_symbol): Correct m68k abort test.
+
+	* config.in: Rename from config.h.in.
+	* configure.in: Call AC_CONFIG_HEADER with config.h:config.in.
+	Check for config.h:config.in when creating stamp-h.
+	* configure: Rebuild.
+	* Makefile.in (stamp-h): Depend upon config.in rather than
+	config.h.in.  Set CONFIG_HEADERS to config.h:config.in when
+	calling config.status.
+
+	* Makefile.in (do_distclean): Remove config.h and stamp-h.
+	(Makefile): Just rebuild Makefile.
+	(config.h, stamp-h): New targets.
+	* configure.in: Create stamp-h when rebuilding config.h.
+	* configure: Rebuild.
+
+Wed Sep  6 15:00:33 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Call AC_CONFIG_HEADER.  Substitute
+	HOST_64BIT_LONG.  Check that various header files exist.  Check
+	that fcntl exists.  Call BFD_BINARY_FOPEN.  Check whether malloc
+	and/or free need to be declared.  Don't make a link to sysdep.h.
+	Define TRAD_HEADER for various hosts.
+	* configure: Rebuild.
+	* configure.host: Don't set my_host.  Add definitions taken from
+	host header files for various entries.  Remove entries which now
+	do nothing.
+	* acconfig.h: New file.
+	* config.h.in: New file, built by autoheader.
+	* sysdep.h: New file.
+	* Makefile.in (do_distclean): Don't remove sysdep.h.
+	(RECONFIG): Remove.
+	(LOCAL_H_DEPS): New variable.
+	($(BFD_LIBS)): Use $(LOCAL_H_DEPS) rather than libbfd.h and
+	$(RECONFIG).
+	($(BFD_MACHINES), $(BFD_BACKENDS)): Likewise.
+	($(OPTIONAL_BACKENDS)): Likewise.
+	(stmp-bfd.h): Just substitute for BFD_HOST_64BIT_LONG, rather than
+	looking through sysdep.h.
+	* bfd-in.h (BFD_HOST_64BIT_LONG): Define; set by Makefile.
+	(BFD_HOST_64_BIT): Define based on BFD_HOST_64BIT_LONG.
+	(fprintf_vma, sprintf_vma): Likewise.
+	(int64_type, uint64_type): Don't define.
+	* bfd-in2.h: Rebuild.
+	* archures.c, bfd.c, srec.c: Include <ctype.h>.
+	* elfcore.h: Check HAVE_SYS_PROCFS_H rather than HAVE_PROCFS.
+	* lynx-core.c: Include stuff from old hosts/lynx.h.
+	* opncls.c (bfd_fdopenr): Check HAVE_FNCTL and defined (F_GETFL),
+	rather than NO_FCNTL.
+	* targets.c (bfd_target_list): Check HOST_HPPAHPUX and ! __STDC__
+	rather than NATIVE_HPPAHPUX_COMPILER.
+	* trad-core.c: Don't include <errno.h>.  Include TRAD_HEADER if it
+	is defined.
+	* hosts/*.h: Remove all header files which merely include,
+	declare, and define things.  Leave header files which define
+	information needed by trad-core.c.
+
+	* aclocal.m4 (BFD_BINARY_FOPEN): Define.
+	(BFD_CC_FOR_BUILD): Define.
+	* configure.in: Use BFD_CC_FOR_BUILD.
+	* configure: Rebuild.
+
+Tue Sep  5 19:35:28 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aclocal.m4: Don't try to grep ../Makefile if it doesn't exist.
+	* configure: Rebuild.
+
+	* coff-sparc.c (CALC_ADDEND): Don't set the addend to the value of
+	a global symbol.
+
+Tue Sep  5 12:48:26 1995  Jason Molenda   (crash@phydeaux.cygnus.com)
+
+	* config.bfd: i386pe_ve -> i386pe_vec.
+
+Mon Sep  4 14:02:43 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.host: Incorporate host Makefile fragments by setting
+	shell variables.
+	* configure.in: Call AC_PROG_CC.  Substitute CFLAGS, HDEFINES and
+	AR.  Call AC_PROG_INSTALL.  Substitute CC_FOR_BUILD, choosing a
+	value based on whether the code is being compiled by a cross
+	compiler.  Don't substitute host_makefile_frag or frags.
+	* aclocal.m4: New file to define local AC_PROG_CC.
+	* configure: Rebuild.
+	* Makefile.in (INSTALL): Set to @INSTALL@.
+	(INSTALL_PROGRAM): Set to @INSTALL_PROGRAM@.
+	(INSTALL_DATA): Set to @INSTALL_DATA@.
+	(AR): Set to @AR@.
+	(CC): Define as @CC@.
+	(CFLAGS): Set to @CFLAGS@.
+	(CC_FOR_BUILD): Set to @CC_FOR_BUILD@.
+	(@host_makefile_frag@): Remove.
+	(ALL_CFLAGS): Change $(HDEFINES) to @HDEFINES@.  Move $(CFLAGS)
+	after other options.
+	(config.status): Remove dependency upon @frags@.
+	* config/*.mh, config/README: Remove.
+
+	* config.bfd: Rewrite to incorporate the contents of the Makefile
+	fragments by setting shell variables, rather than merely returning
+	the name of a Makefile fragment.
+	* configure.in: Use shell variables set by config.bfd rather than
+	looking at the target Makefile fragment files.  Don't substitute
+	target_makefile_frag.  Do substitute TDEFINES.
+	* configure: Rebuild.
+	* Makefile.in (@target_makefile_frag@): Remove.
+	(ALL_CFLAGS): Change $(TDEFINES) to @TDEFINES@.
+	* config/*.mt: Remove.
+
+Mon Sep  4 03:13:28 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* configure.in: Put changequote lines around "i[345]86" patterns
+	section of core file support.
+
+Sun Sep  3 11:31:58 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_bfd_print_private_bfd_data): Define to use the
+	generic version.
+
+Fri Sep  1 17:08:40 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* peicode.h (coff_swap_aouthdr_in): Add ImageBase to
+	entry, text_start and data_start.
+
+Fri Sep  1 18:06:28 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (OFILES): Remove $(TDEPFILES).
+	* config/apollo.mt (TDEPFILES): Remove.
+	* config/README: Update.
+
+	* configure.in: For a native configuration, set COREFILE and
+	COREFLAG based on the canonical host name.
+	* configure: Rebuild.
+	* Makefile.in: Rebuild dependencies.
+	(ALL_CFLAGS): Add @COREFLAG@.
+	(OFILES): Replace $(HDEPFILES) with @COREFILE@.
+	* coff-rs6000.c: Check AIX_CORE rather than HOST_AIX for core file
+	support routines.  Check LYNX_CORE rather than HOST_LYNX.
+	* lynx-core.c: Check LYNX_CORE rather than HOST_LYNX.
+	* i386lynx.c: Likewise.
+	* m68klynx.c: Likewise.
+	* sparclynx.c: Likewise.
+	* rs6000-core.c: Check AIX_CORE rather than HOST_AIX.
+	* *-core.c: Comment changes.
+	* config/decstation.mh (HDEPFILES): Remove.
+	(HDEFINES): Remove -DTRAD_CORE.
+	* config/irix3.mh (RANLIB): Remove.
+	* config/irix4.mh (HDEPFILES, RANLIB): Remove.
+	(HDEFINES): Remove -DIRIX_CORE.
+	* config/riscos.mh (RANLIB, HDEPFILES): Remove.
+	(HDEFINES): Remove -DTRAD_CORE.
+	* config/ncr3000.mh (AR_FLAGS, RANLIB): Remove.
+	* config/ultra3.mh (RANLIB): Remove.
+	* config/aix4.mh, config/alphaosf.mh, config/amix.mh: Remove.
+	* config/apollo.mh, config/delta68.mh, config/delta88.mh: Remove.
+	* config/dpx2.mh, config/esix.mh, config/harris.mh: Remove.
+	* config/hp300.mh, config/hp300bsd.mh, config/hppabsd.mh: Remove.
+	* config/hppahpux.mh, config/hppaosf.mh: Remove.
+	* config/i386aix.mh, config/i386bsd.mh: Remove.
+	* config/i386linux.mh, config/i386mach3.mh: Remove.
+	* config/i386sco.mh, config/i386v.mh, config/i386v4.mh: Remove.
+	* config/irix5.mh, config/m88kmach3.mh, config/mipsbsd.mh: Remove.
+	* config/mipsmach3.mh, config/news-mips.mh: Remove.
+	* config/news.mh, config/pc532mach.mh, config/riscix.mh: Remove.
+	* config/rs600.mh, config/rs6000lynx.mh: Remove.
+	* config/solaris2.mh, config/stratus.mh: Remove.
+	* config/symmetry.mh, config/sysv4.mh, config/tahoe.mh: Remove.
+	* config/vaxbsd.mh, config/vaxult.mh, config/vaxult2.mh: Remove.
+
+Fri Sep  1 15:18:50 1995  Kazumoto Kojima  <kkojima@info.kanagawa-u.ac.jp>
+
+	* elflink.h (elf_bfd_final_link): Don't change a DT_INIT or
+	DT_FINI entry if the appropriate symbol is not in the hash table.
+
+	* libelf.h (struct elf_backend_data): Add create_program_headers
+	and want_hdr_in_seg fields.
+	* elfxx-target.h (elf_backend_want_hdr_in_seg): Define if not
+	defined.
+	(elf_backend_create_program_headers): Likewise.
+	(elfNN_bed): Initialize create_program_headers and
+	want_hdr_in_seg.
+	* elf.c (get_program_header_size): Call create_program_headers
+	backend routine.
+	(map_program_segments): Check want_hdr_in_seg backend field.  Call
+	create_program_headers backend routine.
+
+	* elf.c (assign_file_positions_except_relocs): Align non allocated
+	sections when creating an executable.
+
+	* elfcode.h (elf_swap_phdr_in): Make non static.
+	(elf_swap_phdr_out): Make non static.
+	* libelf.h (bfd_elf32_swap_phdr_in): Declare.
+	(bfd_elf32_swap_phdr_out): Declare.
+	(bfd_elf64_swap_phdr_in): Declare.
+	(bfd_elf64_swap_phdr_out): Declare.
+
+	* ecofflink.c (ecoff_collect_shuffle): New static function.
+	(_bfd_ecoff_get_accumulated_pdr): New function.
+	(_bfd_ecoff_get_accumulated_sym): New function.
+	(_bfd_ecoff_get_accumulated_ss): New function.
+	* libbfd-in.h (_bfd_ecoff_get_accumulated_pdr): Declare.
+	(_bfd_ecoff_get_accumulated_sym): Declare.
+	(_bfd_ecoff_get_accumulated_ss): Declare.
+	* libbfd.h: Rebuild.
+
+Fri Sep  1 13:20:25 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libecoff.h (_bfd_ecoff_bfd_print_private_bfd_data): Fix typo.
+
+	* elflink.h (elf_link_add_object_symbols): Handle indirect and
+	warning symbols.  If any section is named .gnu.warning.XXX, treat
+	the contents as a warning to be issued if the symbol XXX is
+	referenced.
+	(elf_link_output_extsym): For an indirect or warning symbol, just
+	output the symbol it points to.
+
+	* linker.c (_bfd_link_hash_newfunc): Don't bother to set bfd_error
+	if bfd_hash_allocate fails, since it will already be set.
+	(generic_link_hash_newfunc): Likewise.
+	(archive_hash_newfunc): Likewise.
+	(hash_entry_bfd): New static function.
+	(_bfd_generic_link_add_one_symbol): Pass new arguments to warning
+	callback.  Allocate a new warning using the hash table newfunc.
+	Use bfd_hash_replace to update the entry in the hash table, rather
+	than assuming we can copy the fields with structure assignment.
+
+	* hash.c (bfd_hash_replace): New function.
+	* bfd-in.h (bfd_hash_replace): Declare.
+	* bfd-in2.h: Rebuild.
+
+Fri Sep  1 08:12:50 1995  James G. Smith  <jsmith@beauty.cygnus.com>
+
+	* config.bfd: Add mips*vr4300-*-elf* target.
+	* config/mipsbvr4300.mt: Added.
+
+Thu Aug 31 16:00:53 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* Makefile.in: Update dependencies.
+	* aout-target.h (MY_bfd_print_private_bfd_data): New.
+	* bfd-in.h (PE STUFF): Deleted.
+	* bfd.c (tdata->pe_obj_data): New.
+	(bfd_print_private_bfd_data): New.
+	* coff-i386.c, coff-arm.c (coff_*-rtype_to_howto): Get image base from
+	new place.
+	* libcoff.h, libbfd.h, bfd-in2.h: Rebuilt.
+	* coffcode.h (pe_value): Delete
+	(coff_mkobject, coff_mkobject_hook): Conditionally build.
+	(coff_compute_section_file_positions): Look in new place.
+	(add_data_entry, fill_pe_header_info): Deleted.
+	(coff_write_object_contents): Remove PE stuff.
+	(coff_bfd_print_private_bfd_data): New.
+	* coffswap.h: Remove PE stuff.
+	* elfxx-target.h (bfd_elfNN_bfd_print_private_bfd_data): New.
+	* libbfd-in.h (_bfd_generic_bfd_print_private_bfd_data): New.
+	* libcoff-in.h (pe_data_type): New.
+	* libecoff.h (_bfd_ecoff_bfd_print_private_bfd_data): New.
+	* targets.c (_bfd_print_private_bfd_data): New.
+	* peicode.h: New file.
+
+Thu Aug 31 11:49:21 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfd-in.h: Add extern "C" if __cplusplus.
+	* bfd-in2.h: Rebuild.
+
+	* coff-mips.c (mips_relocate_section): Don't convert a reloc
+	against an absolute symbol into a reloc against a section.
+
+Thu Aug 31 08:00:14 1995  steve chamberlain  <sac@slash.cygnus.com>
+	
+	* coff-arm.c (coff_arm_reloc): Fix common size problem.
+	(i3coff_object_p): Delete.
+
+Wed Aug 30 20:41:27 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* coff-arm.c (deletemeacoff_arm_reloc): Deleted.
+	(arm26): Not partial inplace.
+	* coffcode.h (coff_compute_section_file_positions): Don't
+	do page aligning if COFF_PAGE_SIZE isn't defined.
+	* coffswap.h (coff_swap_scnhdr_in): Update image base correctly.
+
+Tue Aug 29 13:50:21 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* coffcode.h (coff_compute_section_file_positions):
+	Compile even if COFF_PAGE_SIZE isn't defined.
+	* cofflink.c (_bfd_coff_generate_reloc_section): Write
+	base file info as rvas.
+	* coff-arm.c (coff_rtype_to_howto): Deal with reloc 11.
+	* coffcode.h (coff_write_object_contents): Remove #if0ed code
+	Only remove empty sections in PE inmage files.
+	* libbfd.h, bfd-in2.h: regenerated.
+	* coff-arm.c (aoutarm_std_relo): New entry at 11.
+	(arm_reloc_type_lookup) : Understand type 11.
+	* coff-i386.c (howto_table): fix name of rva type.
+	(coff-i386_rtype_to_howto): Understand R_IMAGEBASE type.
+	* coffcode.h (sec_to_styp_flags): .edata is data.
+	(coff_compute_section_file_positions): Get page size right for PE.
+	Pagesize info is only valid in PE image files.
+	(fill_pe_header_info): Fix fields.
+	(coff_write_object_contents): Remove end_of_image calc.
+	(_bfd_coff_generate_reloc_section): Remove orphaned comment.
+	* coffswap.h (coff_swap_scnhdr_in): Don't always add IMAGE_BASE.
+	Swap in PE header.
+	(coff_swap_scnhdr_out): Setup PE flags correctly.
+	* reloc.c (BFD_RELOC_RVA): New field.
+
+Thu Aug 24 17:49:59 1995  Ian Lance Taylor  (ian@cygnus.com)
+
+	* cofflink.c (coff_link_input_bfd): Don't include line numbers for
+	a section if its output section has no contents.
+
+Wed Aug 23 16:48:52 1995  Ian Lance Taylor  (ian@cygnus.com)
+
+	* ecoff.c (_bfd_ecoff_slurp_symbolic_info): Add parentheses to FIX
+	expression to avoid compiler bug on HP-UX 9.01.
+
+Wed Aug 23 09:49:39 1995  Steve Chamberlain  <sac@rtl.cygnus.com>
+
+	* coffcode.h (pe_value): Unansify.
+
+Mon Aug 21 17:49:28 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* bfd-in.h (bfd_link_subsystem): Turn enum into #defines.
+	(bfd_link_pe_info_dval): New
+	(bfd_link_stack_heap): Renamed and massaged into bfd_link_pe_info.
+	* bfd-in2.h: rebuilt.
+	* bfd.c (NT_subsystem, NT_stack_heap): Deleted.
+	* coffcode.h (pe_value): New function.
+	(fill_pe_header_info): New function.
+	(coff_write_object_contents): Use new function.
+	(coff_write_object_contents): Initialze link_data if not set.
+	* cofflink.c (coff_final_link_info): Remove pe randomness.
+	(dores_com): Update info in bfd_link_pe_info_dval.
+	(process_embedded_commands): Use the bfd_link_pe_info_dval.
+	(_bfd_coff_final_link): Remove PE stuff, initialize
+	coff_data->link_info.
+	* coffswap.h (coff_swap_[aout|filehdr]_out): Use indirect PE pointer.
+	(coff_swap_scnhdr_out): Use real imagebase.
+	* libcoff-in.h (coff_data_type.link_info): New field.
+
+Mon Aug 21 11:10:32 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* linker.c (link_action): If an undefined reference follows an
+	undefined weak reference, change the type to undefined.
+	* elflink.h (elf_link_add_archive_symbols): Don't record an
+	undefined weak reference as defined, in case it turns into a real
+	undefined reference later in the same archive.
+
+Thu Aug 17 16:29:09 1995  Ken Raeburn  <raeburn@kr-laptop.cygnus.com>
+
+	* coff-sh.c (sh_relax_section): Cast value for used_by_bfd field
+	to PTR, not coff_section_tdata pointer, since PTR is the real type
+	of the field.
+	* cofflink.c (_bfd_coff_read_internal_relocs): Ditto.
+
+Thu Aug 17 14:44:26 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	Add support for linking SPARC SunOS PIC compiled code.
+	* sunos.c (SPARC_PLT_PIC_WORD0): Define.
+	(SPARC_PLT_PIC_WORD1, SPARC_PLT_PIC_WORD2): Define.
+	(struct sunos_link_hash_entry): Add got_offset and plt_offset
+	fields.
+	(struct sunos_link_hash_table): Add dynamic_sections_created and
+	dynamic_sections_needed fields.
+	(sunos_link_hash_newfunc): Initialize new fields.
+	(sunos_link_hash_table_create): Initialize new fields.
+	(sunos_create_dynamic_sections): New static function, broken out
+	of sunos_add_dynamic_symbols.
+	(sunos_add_dynamic_symbols): Call sunos_create_dynamic_sections.
+	(sunos_add_one_symbol): Call sunos_create_dynamic_sections.
+	(bfd_sunos_size_dynamic_sections): Call sunos_scan_relocs before
+	checking whether we need to set up the dynamic link information.
+	Define __GLOBAL_OFFSET_TABLE if anything referred to it.
+	(sunos_scan_std_relocs): Call sunos_create_dynamic_sections.  Use
+	plt_offset field; only put symbol in .plt if it is not defined by
+	a regular object.
+	(sunos_scan_ext_relocs): Likewise.  Handle base relative relocs.
+	(sunos_scan_dynamic_symbol): Store dynobj in local variable.
+	(sunos_write_dynamic_symbol): Check plt_offset rather than
+	checking whether symbol is in .plt section.  If symbol is defined
+	in a regular object file, use SPARC_PLT_PIC_WORD[012], and don't
+	add a JMP_TBL reloc.
+	(sunos_check_dynamic_reloc): Add contents and relocationp fields.
+	If plt_offset is set, redirect relocation to PLT.  If this is a
+	base relative reloc, redirect relocation to GOT.  Check
+	dynamic_sections_needed field rather than whether dynobj is set.
+	(sunos_finish_dynamic_link): Check dynamic_sections_needed field
+	rather than whether dynobj is set.  Don't die if .need and .rules
+	sections were not created.
+	* aoutx.h (howto_table_ext): Mark PC10, PC22, and JMP_TBL entries
+	PC relative.  Mark PC10 complain_overflow_dont.  Mark PC22 and
+	JMP_TBL complain_overflow_signed.
+	(NAME(aout,final_link)): If info->shared is set, set DYNAMIC.
+	(aout_link_input_section_std): Call check_dynamic_reloc for all
+	relocs.  Pass contents and &relocation.  Don't warn about an
+	undefined symbol until check_dynamic_reloc has been called.  Don't
+	warn about an undefined symbol for a base relative reloc.
+	(aout_link_input_section_ext): Likewise.  For a base relative
+	reloc, always treat r_index as an index into the symbol table.
+	* libaout.h (struct aout_backend_data): Add contents and
+	relocation argument to check_dynamic_reloc entry point.
+	(struct aoutdata): Add local_got_offsets field.
+
+Wed Aug 16 01:03:07 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-i386.c (elf_i386_check_relocs): Fix bug in last change.
+
+Mon Aug 14 11:39:24 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutx.h (NAME(aout,machine_type)): Handle a machine of
+	bfd_mach_sparc or bfd_mach_sparc64.
+
+	* elflink.h (elf_link_add_object_symbols): If a symbol is a weak
+	definition, add it to the dynamic symbol table if any dynamic
+	object mentions it.  If we do add it, make sure we add the
+	corresponding real symbol.
+	(elf_adjust_dynamic_symbol): Adjust a weak defined symbol which we
+	put in the dynamic symbol table, even if no regular object refers
+	to it.
+	* elf32-i386.c (elf_i386_check_relocs): When creating a shared
+	library, don't allocate space for a PC relative reloc against a
+	local symbol.
+	* elf32-m68k.c (elf_m68k_check_relocs): Likewise.
+	* elf32-sparc.c (elf32_sparc_check_relocs): Likewise.
+	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Change assertion
+	to accept symbol with weakdef set.
+	* elf32-m68k.c (elf_m68k_adjust_dynamic_symbol): Likewise.
+	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Likewise.
+	* elf32-m68k.c (elf_m68k_relocate_section): When creating a shared
+	libary, don't copy over a PC relative reloc against a local
+	symbol.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+
+Sun Aug 13 00:40:58 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.h (R_HPPA_BEGIN_BRTAB): Define.
+	(R_HPPA_END_BRTAB): Likewise.
+	* som.c (som_write_fixups): Handle R_BEGIN_BRTAB and R_END_BRTAB.
+
+Thu Aug 10 15:53:29 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffswap.h (coff_swap_aux_in): Swap the array dimensions
+	whenever x_fcnary is not being used for something else, rather
+	than only for an array.
+	(coff_swap_aux_out): Likewise.
+
+Tue Aug  8 16:34:57 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* cofflink.c (_bfd_coff_generic_relocate_section): Remove most
+	of special case stuff for PE.  Now handled by relocs.
+	* coff-i386.c (coff_i386_reloc): Special case of PE type 7s.
+	(howto_table): Type 7 is dir32-rva.
+
+Tue Aug  8 10:15:43 1995  Jeffrey A. Law  <law@rtl.cygnus.com>
+
+	* configure.host: Recognize aix4 explicitly.
+	* rs6000-core.c (CORE_DATA_SIZE_FIELD): New macro to get a the size
+	of a core dump's data section.  Provide alternate definition for aix4.
+	(SAVE_FIELD): Similarly for save state field (register info).
+	(STACK_END_ADDR): Provide definition suitable for aix4.
+	* config/{aix4.mh,aix4.mt}: New configuration files.
+	* hosts/aix4.h: Likewise.
+
+Mon Aug  7 23:03:21 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* som.c (som_bfd_copy_private_symbol_data): Cast initializations
+	to avoid warnings.
+
+Mon Aug  7 14:51:08 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_decode_symclass): Handle absolute symbols by checking
+	the SOM type (since they will rarely if ever be in the absolute
+	section).
+
+Wed Aug  6 09:12:50 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* archures.c (bfd_mach_sparc, bfd_mach_sparc64): Define.
+	* bfd-in2.h: Regenerated.
+	* cpu-sparc.c (sparc_arch_info): Renamed from arch_info_struct.
+	(sparc64_arch_info): New static variable.
+	(bfd_sparc_arch): Link in sparc64_arch_info.
+	* elf64-sparc.c (sparc64_elf_xxx): Renamed from elf64_xxx.
+	(sparc64_elf_object_p): New static function.
+	(elf_backend_object_p): Define.
+	* config/sparc64-elf.mt (SELECT_VECS): Add bfd_elf32_sparc_vec.
+
+Sat Aug  5 00:04:08 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_get_reloc_upper_bound): Return -1 on error.  Compute
+	return value with sizeof (arelent *), not sizeof (arelent).
+
+Wed Aug  2 12:32:21 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (bfd_section_from_shdr): If the section pointed to by the
+	sh_link field of a reloc section is not a symbol table, and the
+	file contains a single symbol table, clobber the sh_link field of
+	the reloc section to point to the symbol table.
+
+Tue Aug  1 10:09:01 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* coff-arm.c (howto reloc ARM26): Change size from 3 to 2.
+	(howto reloc ARM26D): Likewise.
+
+Mon Jul 24 14:17:50 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutx.h (NAME(aout,find_nearest_line)): Use the line just before
+	the offset, not the one just after.  Break out of the loop after
+	finding a function past the offset, not merely when finding a
+	function with a line defined.
+
+	* ecofflink.c (_bfd_ecoff_locate_line): When handling stabs:
+	correct setting of sym_ptr_end to consider symbols skipped when
+	setting sym_ptr; don't leave loop early unless an N_FUN is found
+	with a larger value.
+
+	* coff-sh.c (sh_coff_howtos): Mark R_SH_PCDISP8BY2 and R_SH_PCDISP
+	as PC relative.  Describe R_SH_IMM16.  Add entries for
+	R_SH_SWITCH16, R_SH_SWITCH32, R_SH_USES, R_SH_COUNT, and
+	R_SH_ALIGN.
+	(SWAP_IN_RELOC_OFFSET): Define.
+	(SWAP_OUT_RELOC_OFFSET): Define.
+	(CALC_ADDEND): Define.
+	(sh_reloc): Change sym_value and addr to type bfd_vma.  Skip reloc
+	types other than R_SH_IMM32 and R_SH_PCDISP on an external symbol.
+	(coff_bfd_relax_section): Define.
+	(coff_bfd_get_relocated_section_contents): Define.
+	(sh_relax_section): New static function.
+	(sh_relax_delete_bytes): New static function.
+	(sh_relocate_section): Handle R_SH_PCDISP on an external symbol.
+	(sh_coff_get_relocated_section_contents): New static function.
+
+	* cofflink.c (coff_link_add_object_symbols): Call
+	_bfd_coff_get_external_symbols, not coff_link_get_symbols.  Call
+	_bfd_coff_free_symbols, not coff_link_free_symbols.  Call
+	_bfd_coff_read_string_table, not coff_read_string_table.
+	(coff_link_check_archive_element): Likewise.
+	(coff_link_input_bfd): Likewise.
+	(coff_link_get_symbols): Move to coffgen.c.
+	(coff_read_string_table): Likewise.
+	(coff_link_free_symbols): Likewise.
+	(_bfd_coff_internal_syment_name): New static function.
+	(coff_link_check_ar_symbols): Use _bfd_coff_internal_syment_name.
+	(coff_link_add_symbols): Likewise.
+	(coff_link_input_bfd): Likewise.
+	(_bfd_coff_generic_relocate_section): Likewise.
+	(_bfd_coff_read_internal_relocs): New function.
+	(coff_link_input_bfd): Use cached section contents if available.
+	Use _bfd_coff_read_internal_relocs.
+	* coffcode.h (coff_slurp_symbol_table): Don't call bfd_seek.
+	(coff_bfd_get_relocated_section_contents): Only define if not
+	already defined.
+	(coff_bfd_relax_section): Likewise.
+	* coffgen.c (build_string_table): Remove.
+	(_bfd_coff_get_external_symbols): New function, moved in from old
+	coff_link_get_symbols in cofflink.c.
+	(_bfd_coff_read_string_table): New function, moved in from old
+	coff_read_string_table in cofflink.c.
+	(_bfd_coff_free_symbols): New function, moved in frmo old
+	coff_link_free_symbols in cofflink.c.
+	(coff_get_normalized_symtab): Use _bfd_coff_get_external_symbols
+	rather than reading the symbols directly.  To free them, call
+	_bfd_coff_free_symbols.  Use _bfd_coff_read_string_table rather
+	than build_string_table.
+	* libcoff-in.h (obj_coff_keep_syms): Define.
+	(obj_coff_keep_strings): Define.
+	(coff_data_type): Add fields keep_syms and keep_strings.
+	(coff_section_tdata): Define new structure.
+	(coff_section_data): Define.
+	(_bfd_coff_get_external_symbols): Declare.
+	(_bfd_coff_read_string_table): Declare.
+	(_bfd_coff_free_symbols): Declare.
+	(_bfd_coff_read_internal_relocs): Declare.
+	* libcoff.h: Rebuild.
+
+Fri Jul 21 22:32:54 1995  Michael Meissner  <meissner@cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_howto_raw): Add support for R_PPC_SDAREL
+	relocation.
+	(ppc_elf_reloc_type_lookup): Ditto.
+	(ppc_elf_got16_inner): Ditto.
+	(ppc_elf_relocate_section): Ditto.
+
+Thu Jul 20 19:19:06 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* elf32-hppa.c (hppa_elf_gen_reloc_type): Add new (ignored)
+	argument.
+	* elf32-hppa.h: Corresponding change.
+
+Thu Jul 20 19:01:07 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* libaout.h (set_aout_section_data): New macro.
+	* sunos.c (sunos_scan_relocs): Use it.
+
+	* aout-ns32k.c (MY_swap_std_reloc_out): Undef KEEPIT before
+	defining it.
+
+Thu Jul 20 13:48:00 1995  Fred Fish  <fnf@cygnus.com>
+
+	* hosts/i386v4.h (getgid, getuid):  Change prototypes to be
+	compatible with Unixware 1.x and Unixware 2.x, and probably other
+	i386 svr4 versions as well.
+
+Thu Jul 20 13:41:21 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* targets.c (bfd_target_vector): Since armpe and armpei have been
+	split into big- and little-endian variants, list all of them,
+	instead of the now-nonexistant armpe[i]_vec.
+
+Thu Jul 20 00:06:39 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (bfd_section_from_phdr): Set lma based on p_paddr.
+	(elf_fake_sections): Set sh_addr based on lma, not vma.
+
+Wed Jul 19 15:52:01 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* coff-arm.c (TARGET_LITTLE_SYM, TARGET_BIG_SYM): Replaces TARGET_SYM.
+	* configure.in (armpe_vec, armpei_vec): Add bi-endian support.
+	* configure: "regenerated".
+	* pe-arm.c (TARGET_LITTLE_SYM, TARGET_BIG_SYM): Replaces TARGET_SYM.
+	(TARGET_LITTLE_NAME, TARGET_BIG_NAME): Replaces TARGET_NAME.
+	* pei-arm.c (TARGET_LITTLE_SYM, TARGET_BIG_SYM): Replaces TARGET_SYM.
+	(TARGET_LITTLE_NAME, TARGET_BIG_NAME): Replaces TARGET_NAME.
+	* targets.c (armpe_vec, armpei_vec): Deleted.
+	(armpe_little_vec, armpe_big_vec, armpei_little_vec, armpei_big_vec):
+	Added.
+	* config/arm-pe.mt (DEFAULT_VECTOR): Default is armpe_little_vec.
+	(SELECT_VECS): Add bi-endian support.
+
+Wed Jul 19 10:47:25 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-sh.c: Clean up and comment.
+	(r_imm32): Remove.
+	(sh_coff_howtos): New static array.
+	(SH_COFF_HOWTO_COUNT): Define.
+	(get_symbol_value): Make relocation bfd_vma rather than long.
+	(RTYPE2HOWTO): Rewrite to use sh_coff_howtos.
+	(coff_relocate_section): Define to sh_relocate_section.
+	(sh_relocate_section): New static function.
+
+Sat Jul 15 01:02:53 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* configure.host:  Add support for generic m68k SVR4 host.
+
+Fri Jul 14 13:13:55 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutx.h (KEEPIT): Change definition to udata.i.
+	(KEEPITTYPE): Remove.
+	(NAME(aout,reloc_type_lookup)): Add cases to the
+	extended reloc type switch: SPARC_GOT10, SPARC_GOT13, SPARC_GOT22,
+	SPARC_PC10, SPARC_PC22, SPARC_WPLT30.
+	(NAME(aout,swap_std_reloc_out)): Don't bother to use stoi when
+	retrieving KEEPIT value.
+	(NAME(aout,swap_ext_reloc_out)): Likewise.  Also, only add in
+	output section VMA for section symbols, and check BSF_SECTION_SYM
+	to control whether to set r_extern to 1.
+
+	* syms.c: Fix comments so that `make info' works.
+
+	* elf32-mips.c (mips_elf_find_nearest_line): Set SEC_HAS_CONTENTS
+	in .mdebug section, in case backend linker has cleared it.
+
+Fri Jul 14 11:58:34 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_addr16_ha_inner): Rewrite to take just one
+	argument, the final relocated address.
+	(ppc_elf_addr16_ha_inner): Adjust ppc_elf_addr16_ha_inner caller.
+	(ppc_elf_relocate_section): Ditto.
+
+Thu Jul 13 17:22:03 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (hppa_som_gen_reloc_type): Choose a reasonable field
+	selector relocation for the difference of two symbols.
+
+Thu Jul 13 10:33:25 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutx.h (NAME(aout,slurp_reloc_table)): Cast argument to size_t
+	for malloc.
+	* coff-mips.c (mips_relocate_section): Likewise, for memmove.
+	(mips_relax_section): Likewise, for malloc.
+	* cofflink.c (process_embedded_commands): Likewise.
+	(_bfd_coff_final_link): Likewise.
+	* ecoff.c (_bfd_ecoff_write_object_contents): Likewise.
+	(ecoff_final_link_debug_accumulate): Likewise.
+	(ecoff_indirect_link_order): Likewise, for memcpy and malloc.
+	(ecoff_reloc_link_order): Likewise, for malloc.
+	* ecofflink.c (ecoff_align_debug): Likewise, for memset.
+	(ecoff_write_symhdr): Likewise, for malloc.
+	* elf32-hppa.c (elf32_hppa_read_symext_info): Likewise.
+	* elf.c (assign_file_positions_except_relocs): Likewise, for
+	qsort.
+	* elf32-mips.c (mips_elf_read_ecoff_info): Likewise, for malloc.
+	* elfcode.h (elf_slurp_reloc_table): Likewise.
+	* elfcore.h (elf_corefile_note): Likewise.
+	* elflink.h (elf_link_add_object_symbols): Likewise.
+	(elf_link_read_relocs): Likewise.
+	(NAME(bfd_elf,size_dynamic_sections)): Likewise, for memset.
+	* i386linux.c (bfd_linux_size_dynamic_sections): Likewise.
+	* ieee.c (do_with_relocs): Likewise.
+	* linker.c (default_indirect_link_order): Likewise, for malloc.
+	* nlmcode.h (nlm_object_p): Likewise.
+	(nlm_write_object_contents): Likewise.
+	* oasys.c (oasys_set_section_contents): Likewise, for memcpy.
+	* reloc.c (bfd_generic_get_relocated_section_contents): Likewise,
+	for malloc.
+	* section.c (bfd_get_section_contents): Likewise, for memcpy.
+	* srec.c (srec_get_section_contents): Likewise.
+	(srec_set_section_contents): Likewise.
+	* sunos.c (bfd_sunos_size_dynamic_sections): Likewise, for
+	realloc and memset.
+	(sunos_scan_relocs): Likewise, for malloc.
+	(sunos_scan_dynamic_symbol): Likewise, for realloc.
+	* syms.c (_bfd_generic_read_minisymbols): Likewise, for malloc.
+	* versados.c (versados_get_section_contents): Likewise, for
+	memcpy.
+
+	* libbfd.c (real_read): Add prototype.  Change argument types from
+	int to size_t.
+	(bfd_read): Cast real_read argument to size_t, not int.
+	(bfd_write): Cast fwrite argument to size_t, not int.
+
+	* elf64-gen.c (elf_info_to_howto): Fix definition for recent elf.c
+	changes.
+
+	* configure.in: Fix typo: change {$enableval} to ${enableval}.
+	* configure: Rebuild.
+
+	* Makefile.in (BFD32_BACKENDS): Add elflink.o.
+
+	* targets.c (bfd_target): Add fields _read_minisymbols and
+	_minisymbol_to_symbol.
+	(BFD_JUMP_TABLE_SYMBOLS): Add _read_minisymbols and
+	_minisymbol_to_symbol.
+	(bfd_read_minisymbols): Define.
+	(bfd_minisymbol_to_symbol): Define.
+	* syms.c (_bfd_generic_read_minisymbols): Define.
+	(_bfd_generic_minisymbol_to_symbol): Define.
+	* libbfd-in.h (_bfd_nosymbols_read_minisymbols): Define.
+	(_bfd_nosymbols_minisymbol_to_symbol): Define.
+	(_bfd_generic_read_minisymbols): Declare.
+	(_bfd_generic_minisymbol_to_symbol): Declare.
+	* bfd-in2.h: Rebuild.
+	* libbfd.h: Rebuild.
+	* aoutx.h (MINISYM_THRESHOLD): Define.
+	(NAME(aout,read_minisymbols)): New function.
+	(NAME(aout,minisymbol_to_symbol)): New function.
+	* libaout.h (NAME(aout,read_minisymbols)): Declare.
+	(NAME(aout,minisymbol_to_symbol)): Declare.
+	* aout-target.h (MY_read_minisymbols): Define.
+	(MY_minisymbol_to_symbol): Define.
+	* All targets: Define read_minisymbols and minisymbol_to_symbol.
+
+Wed Jul 12 17:55:55 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* elflink.h (elf_link_add_object_symbols): Cast return value from
+	bfd_alloc.
+
+	* elfcode.h (size_info): Don't use "&" before function names.
+
+Wed Jul 12 00:16:48 1995  Ken Raeburn  <raeburn@kr-pc.cygnus.com>
+
+	* libelf.h (elf_backend_data): Use unsigned, not unsigned char,
+	for bitfields.
+
+Tue Jul 11 15:19:53 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (bfd_section_from_shdr): In case SHT_REL[A], only get the
+        BFD section for the sh_link section if it is a SYMTAB section.
+
+	* aoutx.h (NAME(aout,link_add_symbols)): Don't bother to check
+	that archives hold a.out objects.
+	* cf-i386lynx.c (coff_bfd_link_add_symbols): Don't define.
+	(lynx_link_add_symbols): Remove.
+	* cf-m68klynx.c (coff_bfd_link_add_symbols): Don't define.
+	(lynx_link_add_symbols): Remove.
+	* elflink.h (elf_bfd_link_add_symbols): Don't bother to check that
+	archives hold ELF objects.
+
+	* archive.c (bfd_generic_archive_p): If the archive has a map, and
+	the target was defaulted, but the first object in the archive can
+	not be matched with that target, then return a bad format error.
+
+	* elf64-sparc.c (elf_sparc_howto_table): Set howto for WDISP16 to
+	elf64_wdisp16_reloc.
+	(elf64_wdisp16_reloc): New static function.
+	(elf64_sparc_relocate_section): New static function.
+	(elf_backend_relocate_section): Define.
+
+	* libelf.h (struct elf_size_info): Change type of last argument to
+	swap_symbol_out from char * to PTR.
+	(bfd_elf32_swap_symbol_out): Update declaration.
+	(bfd_elf64_swap_symbol_out): Likewise.
+	* elfcode.h (elf_swap_symbol_out): Change type of cdst from char *
+	to PTR.
+	* elf.c (swap_out_syms): Cast to PTR, not char *, when calling
+	swap_symbol_out routine.
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Likewise.
+	(elf_link_output_sym): Likewise.
+	(elf_link_output_extsym): Likewise.
+	* elf32-sparc.c (elf32_sparc_finish_dynamic_sections): Likewise.
+
+Tue Jul 11 12:29:49 1995  Rick Sladkey  <jrs@world.std.com>
+
+	* elf.c (_bfd_elf_find_nearest_line): Handle the simple case where
+	there is no debugging information.
+
+Mon Jul 10 11:45:55 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* makefile.dos (OBJS): Add binary.o and tekhex.o.  From DJ
+	Delorie.
+
+Mon Jul 10 11:09:58 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* linker.c (set_symbol_from_hash): bfd_link_hash_new case: Don't
+	abort; it can happen for constructor symbols when not building
+	constructors.
+
+	* coff-i960.c (coff_i960_relocate): Correct typo: use ! on strcmp,
+	not on string.
+	* cofflink.c (_bfd_coff_generic_relocate_section): Remove unused
+	local i.
+	* coff-arm.c (coff_arm_rtype_to_howto): Don't declare.
+	(PCRELOFFSET): Define if not already defined.
+	* Makefile.in: Rebuild dependencies.
+	(BFD32_BACKENDS): Add coff-arm.o
+	(CFILES): Add coff-arm.c, pe-arm.c, pei-arm.c.
+
+	* aoutx.h (NAME(aout,link_hash_table_create)): Allocate hash table
+	using bfd_alloc, not malloc.
+	* cofflink.c (_bfd_coff_link_hash_table_create): Likewise.
+	* ecoff.c (_bfd_ecoff_bfd_link_hash_table_create): Likewise.
+	* i386linux.c (linux_link_hash_table_create): Likewise.
+	* linker.c (_bfd_generic_link_hash_table_create): Likewise.
+	* sunos.c (sunos_link_hash_table_create): Likewise.
+
+	Based on patches from Eric Youngdale <eric@aib.com>:
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): If -Bsymbolic,
+	output a DT_SYMBOLIC dynamic entry.
+	(elf_adjust_dynamic_symbol): If -Bsymbolic, don't require a PLT
+	entry for a locally defined symbol.
+	* elf32-i386.c (elf_i386_relocate_section): If -Bsymbolic, do warn
+	about undefined symbols, and fill in the GOT entry for a symbol
+	defined in a regular object file.
+	(elf_i386_finish_dynamic_symbol): If -Bsymbolic, output a RELATIVE
+	reloc rather than a GLOB_DAT reloc for a symbol defined in a
+	regular object file.
+	* elf32-m68k.c (elf_m68k_relocate_section): If -Bsymbolic, do warn
+	about undefined symbols, and fill in the GOT entry for a symbol
+	defined in a regular object file.
+	(elf_m68k_finish_dynamic_symbol): If -Bsymbolic, output a RELATIVE
+	reloc rather than a GLOB_DAT reloc for a symbol defined in a
+	regular object file.
+	* elf32-sparc.c (elf32_sparc_relocate_section): If -Bsymbolic, do
+	warn about undefined symbols, and fill in the GOT entry for a
+	symbol defined in a regular object file.
+	(elf32_sparc_finish_dynamic_symbol): If -Bsymbolic, output a
+	RELATIVE reloc rather than a GLOB_DAT reloc for a symbol defined
+	in a regular object file.
+
+	* config/m68k-coff.mt (SELECT_VECS): Rename from SELECT_VECTORS.
+	Correct elements to be actual BFD vector names.
+
+	* Makefile.in (Makefile): Don't depend upon @frags@.
+	(config.status): Depend upon @frags@.
+
+Fri Jul  7 17:36:44 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffgen.c (coff_renumber_symbols): Sort defined symbols that are
+	neither BSF_FUNCTION not BSF_NOT_AT_END just before undefined
+	symbols.
+	* coffcode.h (coff_slurp_symbol_table): Set BSF_FUNCTION as well
+	as BSF_NOT_AT_END.
+
+Fri Jul  7 17:16:15 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* Makefile.in (do_mostlyclean): Remove config.log.
+	(do_distclean): Remove config.cache.
+
+Thu Jul  6 14:37:43 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-i386.c (elf_i386_relocate_section): Revert May 24 patch.
+        Don't copy PC32 reloc against section into shared object.
+
+	* Makefile.in: Rebuild dependencies.
+	(CFILES): Added elflink.c.
+	(Makefile): Depend upon config.status, not configure.in.
+	(config.status): New target; depend upon configure configure.host
+	and config.bfd.
+
+Wed Jul  5 20:17:14 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* elfcore.h, elflink.h, elfcode.h, elf.c, elflink.c: Moved some
+ 	primarily size-independent code from elfcode.h to elf.c and new
+ 	file elflink.c; moved out other core- or linker-related routines
+ 	into other new .h files for clarity.  Renamed many routines to
+ 	start with bfd_elf or _bfd_elf.  Added a structure of
+ 	size-dependent but target-independent info to elfcode.h.
+	* Makefile.in: Build elflink.o.  Update dependencies.
+	* libelf.h: Updated some declarations.  Added a definition for the
+	new structure in elfcode.h.  Added more fields to elf backend data
+	structure.
+	* elfxx-target.h: Refer to the appropriate size-dependent info.
+	* elf32-*.c: Changed some function names.  Moved common
+	create_dynamic_sections code from m68k, sparc, and i386 support
+	into elflink.c.  Define some new macros to fill in new fields of
+	back end data.  Also clean up some "gcc -Wall" warnings regarding
+	unused or uninitialized variables.
+
+	* Makefile.in (BFD_LIBS): No, don't put elflink.o here.
+	* configure.in: Include it here whenever elf.o is specified.
+
+Wed Jul  5 10:31:47 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-mips.c (mips_elf_object_p): Unconditionally set
+	elf_bad_symtab, since sometimes the symbol table is messed up and
+	the last symbol is global.
+
+	* ecoff.c (_bfd_ecoff_bfd_is_local_label): New function.
+	* libecoff.h (_bfd_ecoff_bfd_is_local_label): Declare.
+	* elf32-mips.c (mips_elf_is_local_label): New static function.
+	(bfd_elf32_bfd_is_local_label): Define.
+
+	* configure.in: Use $ac_config_sub, not $configsub.
+	* configure: Likewise.
+
+	Permit --enable-targets=ieee:
+	* config.bfd (*-*-ieee*): New target.
+	* config/ieee.mt: New file.
+
+Wed Jul  5 04:16:35 1995  Ken Raeburn  <raeburn@kr-pc.cygnus.com>
+
+	* config/i386aix.mh (HDEFINES): Remove -DFASCIST_FDOPEN.
+
+	Autoconfiscation:
+	* configure.in, Makefile.in, doc/Makefile.in: Switch from Cygnus
+	configure to autoconf ways of processing --enable arguments,
+	setting up symlinks, incorporating makefile fragments, printing
+	messages at configuration time, setting variables in Makefile.
+	Deleted some unused variables.  Check for ranlib via autoconf.
+	For now, configure script removes doc/config.status.
+	* configure: New file.
+	* dep-in.sed: Use @SRCDIR@ instead of @srcdir@, so Makefile.in
+	line doesn't get broken by configure.
+	* doc/configure.in: Removed.
+
+Tue Jul  4 12:22:21 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* archive.c (_bfd_construct_extended_name_table): If
+	BFD_TRADITIONAL_FORMAT is set, limit the length of all file names
+	to ar_max_namelen.
+	(bfd_dont_truncate_arname): If BFD_TRADITIONAL_FORMAT is set, call
+	bfd_bsd_truncate_arname.
+	(_bfd_write_archive_contents): Revert June 1 change.
+
+	* elfcode.h (NAME(bfd_elf,record_link_assignment)): Add provide
+	argument.
+	* bfd-in.h (bfd_elf32_record_link_assignment): Update prototype.
+	(bfd_elf64_record_link_assignment): Likewise.
+	* bfd-in2.h: Rebuild.
+
+	* libelf.h (struct elf_link_hash_table): Add needed field.  Remove
+	saw_needed field.
+	* elfcode.h (elf_link_add_object_symbols): If elf_dt_needed_name
+	is an empty string, don't make a DT_NEEDED entry in the output
+	file.  Record all DT_NEEDED entries found in input dynamic
+	objects.
+	(elf_link_output_extsym): Don't check saw_needed when issuing
+	warnings.
+	* elf.c (_bfd_elf_link_hash_table_init): Initialize needed, not
+	saw_needed.
+	(bfd_elf_get_needed_list): New function.
+	* bfd-in.h (struct bfd_elf_link_needed_list): Define.
+	(bfd_elf_get_needed_list): Define.
+	* bfd-in2.h: Rebuild.
+
+	* ecoff.c (_bfd_ecoff_find_nearest_line): Also initialize
+	find_buffer and fdrtab_len fields of newly allocated
+	find_line_info structure.
+
+Mon Jul  3 17:03:52 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (hppa_som_gen_reloc_type): New argument "sym_diff",
+	nonzero when we're generating relocations for an expression
+	using the difference of two symbols.  All callers changed.
+	Handle difference of symbols for both R_HPPA and R_COMPLEX
+	cases.
+	(som_write_fixups): Handle R_COMP1, R_COMP2 and R_CODE_EXPR
+	fixups.
+
+Mon Jul  3 13:55:18 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* config.bfd (win32): New configuration.
+	* configure.host (pe): Changed to i386win32.
+	* config/i386pe.mh: Deleted.
+	* config/i386win32.mh: New file.
+
+Mon Jul  3 11:30:45 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ecoff.c (_bfd_ecoff_find_nearest_line): If we allocate
+	find_line_info, clear the fdrtab field.
+
+	* targets.c (enum bfd_flavour): Add bfd_target_msdos_flavour here,
+	rather than in bfd-in2.h.
+
+	* bfd.c (enum bfd_error): Define bfd_error_no_armap.
+	(bfd_errmsgs): Add string for bfd_error_no_armap.
+	* bfd-in2.h: Rebuild.
+	* ecoff.c (ecoff_link_add_archive_symbols): If an archive has no
+	armap, set bfd_error_no_armap rather than bfd_error_no_symbols.
+	* elfcode.h (elf_link_add_archive_symbols): Likewise.
+	* linker.c (_bfd_generic_link_add_archive_symbols): Likewise.
+
+	* elfcode.h (elf_link_add_object_symbols): Permit common and
+	indirect symbols in weakdefs BFD_ASSERT.
+	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Simplify
+	BFD_ASSERT to permit some legal, but odd, cases.
+	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Likewise.
+	* elf32-m68k.c (elf_m68k_adjust_dynamic_symbol): Likewise.
+
+	* Makefile.in: Rebuild dependencies.
+	(BFD32_BACKENDS): Add versados.o.
+	(CFILES): Add pe-i386.c, pei-i386.c, and versados.c.
+
+Sun Jul  2 17:49:32 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cofflink.c (_bfd_coff_generic_relocate_section): Cast base_file
+	to FILE * before using it.
+	* stab-syms.c: Revert yesterday's patch.
+
+Sat Jul  1 12:10:42 1995  Fred Fish  <fnf@cygnus.com>
+
+	* stab-syms.c (stdio.h):  Include prior to libaout.h, which
+	includes bfdlink.h, which now uses FILE.
+
+Sat Jul  1 00:11:08 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* elfxx-target.h: New file.
+
+	* libelf.h (struct elf_backend_data): Remove elf_64_p field.
+	* elfxx-target.h (elfNN_bed): Don't set it.
+
+	* elf32-target.h, elf64-target.h: Deleted.
+	* Makefile.in (elf32-target.h, elf64-target.h): Build them from
+	elfxx-target.h.
+
+Fri Jun 30 16:07:18 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* cofflink.c (_bfd_coff_generic_relocate_section): Compare
+	the full text of .reloc or .edata section names.
+
+Fri Jun 30 15:47:37 1995  Fred Fish  <fnf@cygnus.com>
+
+	* cofflink.c (_bfd_coff_generic_relocate_section):
+	Remove extra '+'.
+
+Thu Jun 29 17:24:52 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* coff-h8300.c (COFF_LONG_FILENAMES): Define.
+
+Wed Jun 28 18:04:42 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* Makefile.in: versados.o is now conditionally built.
+	* coffcode.h (add_data_entry): New function.
+	(coff_write_object_contents): Clean up. Calculate
+	data entries.
+	* cofflink.c (_bfd_coff_generic_relocate_section):
+	.reloc and .edata sections are IMAGE_BASED too.
+	If there's a base_file then write out base information.
+	* configure.host (i386-*-pe): New.
+	* syms.c (coff_section_type): Only scan prefixes.
+	* targets.c (bfd_target_vector): Versados is now conditionally
+	built.
+	* config/m68k-coff.mt: Build versados.o
+	* hosts/i386pe.h: New file.
+
+Mon Jun 26 13:53:49 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* elf32-hpa.c (elf32_hppa_relocate_section): Close comment before
+	R_PARISC_DPREL21L handling.
+
+Thu Jun 22 19:28:36 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	Sun May  7 11:53:41 MDT 1995  Bryan Ford  <baford@cs.utah.edu>
+
+	* config/i386-moss.mt: created.
+
+Thu Jun 22 08:56:10 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* reloc.c (bfd_perform_relocation): Add case for -ve words.
+
+Wed Jun 21 13:13:49 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* elf32-hppa.c (elf32_hppa_relocate_section): Don't try to apply a
+	relocation against an undefined symbols.
+
+Wed Jun 21 10:16:10 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* versados.c: Second pass/rewrite.
+
+Mon Jun 19 08:40:45 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* syms.c (coff_section_type): Compare only the front part
+	of a section name.
+
+Sat Jun 17 09:40:44 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* elf32-hppa.c (elf32_hppa_size_stubs): Set the size of the stub
+	section if we get an error.
+
+	* elf32-hppa.c (elf32_hppa_bfd_final_link_relocate): Don't mess
+	with the operands of an R_PARISC_DPREL21L relocation if the insn
+	is not "addil <symbol>,%r27".
+
+Fri Jun 16 15:04:47 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* bfd-in.h (NT_subsystem, NT_stack_heap): Declare but don't
+	define.
+	* bfd-in2.h: Rebuilt.
+	* bfd.c (NT_subsystem, NT_stack_heap): Define.
+
+Fri Jun 16 00:07:25 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* elf32-hppa.c (elf32_hppa_bfd_link_link_relocate): Use the right
+	type field (there are two!) when checking to see if $global$ is
+	defined.
+
+Thu Jun 15 14:03:47 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* bfd-in.h, bfd-in2.h (bfd_boolean): Rename bfd_true, bfd_false
+	to bfd_tttrue, bfd_fffalse so as not to conflict with functions.
+	* coffswap.h (coff_swap_scnhdr_out): Remove version that was
+	hacked for MPW C.
+	* mpw-config.in: Set shell vars instead of pasting to makefile
+	for each configuration, edit coffswap.h to make MPW C not choke.
+	(i386-unknown-coff, sh-hitachi-hms): Recognize.
+	* mpw-make.in (BFD_LIBS): Add versados.c.o.
+
+	* versados.c (versados_scan): Properly cast results from bfd_alloc.
+
+Wed Jun 14 15:27:32 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* cofflink.c (process_embedded_commands): New function
+	reads and handles .drectve sections for PE.
+	(coff_link_input_bfd): Call new function if PE.
+
+Mon Jun 12 12:09:39 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* bfd-in.h (bfd_set_section_vma): Case true to a boolean.
+	(bfd_set_cacheable): Likewise.
+	* bfd-in2.h: Rebuilt.
+
+Fri Jun  9 12:20:28 1995  Steve Chamberlain  <sac@rtl.cygnus.com>
+
+	* elfcode.h (elf_sort_hdrs): Rewrite to be symmetrical.
+
+Fri Jun  9 12:49:00 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* targets.c: Add copy_private_symbol_data and link_split_section
+	to the target vector.
+	* libbfd-in.h (_bfd_generic_bfd_copy_private_symbol_data): Define.
+	(_bfd_nolink_bfd_link_split_section): Likewise.
+	(bfd_generic_link_split_section): Declare.
+	* syms.c (bfd_copy_private_symbol_data): Define.
+	* linker.c (bf_link_split_section): Likewise.
+	* som.c (som_bfd_copy_private_symbol_data): New function
+	(som_bfd_link_split_section): Likewise.
+	* All other targets updated with default versions of new routines.
+
+	* Take out my braindamaged bfd_true/bfd_false changes from earlier
+	today.  Replace with just:
+	* bfd-in.h: (TRUE_FALSE_ALREADY_DEFINED): Define this if
+	compiling with g++-2.6 or later.
+	* bfd-in2.h: Rebuilt.
+
+Fri Jun  9 07:54:29 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* versados.c (struct esd, get_4): Lint; use unsigned chars.
+
+	* coff-i960.c (coff_i960_relocate):  Compare output section names
+	when converting for vxworks.
+
+Wed Jun  7 19:01:30 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* elfcode.h (elf_fake_sections): Permit .scommon or COMMON
+	sections as random SHT_NOBITS sections, in case a linker script is
+	strange.
+
+Tue Jun  6 17:29:32 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* bfd-in.h (NT_subsystem, NT_stack_heap): Moved from pe.h
+	* coff-i386.c (coff_i386_rtype_to_howto): Get PE relocs right.
+	* coffcode.h (coff_mkobject): Set pe tdata bit when using PE.
+	* cofflink.c (COFF_WITH_PE code): Test on obj_pe bit rather
+	than conditional compile.
+	* configure.in: Fix PE dependencies.
+	* libcoff-in.h (obj_pe): New.
+	(coff_tdata): Added pe entry.
+	* libcoff.h: Regenerated.
+
+Mon Jun  5 09:07:13 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* coff-a29k.c (coff_a29k_adjust_symndx): Completely parenthesize
+	macro.
+
+Mon Jun  5 02:15:20 1995  Ken Raeburn  <raeburn@kr-laptop.cygnus.com>
+
+	Linker support for m68k-elf from Andreas Schwab
+	<schwab@issan.informatik.uni-dortmund.de>:
+	* elfcode.h (elf_link_add_object_symbols): Check for NULL when
+	looping through the symbol hashes.
+	(elf_bfd_final_link): When looking for _init and _fini don't use
+	the symbol if it is imported from another object.
+	* elf32-m68k.c: Relocation type changed from REL to RELA.  Regular
+	and dynamic linking support functions added, similar to other elf
+	targets.
+
+	* config.bfd (i[345]86-*-gnu*): Use ELF configuration.
+
+Fri Jun  2 18:54:59 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* versados.c: New file.
+	* bfd-in2.h (struct _bfd): New field.
+	* bfd.c (struct _bfd): New field.
+	* configure.in (versados_vec): New field.
+	* targets.c (bfd_flavor): Added versados.
+
+Thu Jun  1 13:51:49 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* coffcode.h (sec_to_styp_flags, styp_to_sec_flags, 
+	coff_new_section_hook):  Any section that starts ".stab"
+	is now marked as debugging.
+
+Thu Jun  1 16:15:16 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* archive.c (_bfd_write_archive_contents): Disable extended name
+	table until it can be made optional, so that native AR has half a
+	chance on SunOS and HP/UX.
+
+	* linker.c (_bfd_generic_link_output_symbols, case
+	bfd_link_hash_indirect): Add cast to correct pointer types.
+
+Sat May 27 21:37:31 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* config.bfd (m68k-bull-sysv*): Added strip_underscore=yes.
+	  (m68k-est-coff): Removed.  target does not effect object format.
+
+Wed May 24 10:52:01 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* linker.c (_bfd_generic_link_output_symbols): Cope with
+	indirect symbols.
+
+	* elf32-i386.c (elf_i386_relocate_section): Give error
+	message when linking to a shared reloc which isn't there.
+
+Wed May 24 10:40:00 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	Support for ARM-PE.
+
+	* Makefile.in, coffcode.h, config.bfd, configure.in, pe-arm.c,
+	 pei-arm.c, coff-arm.c, reloc.c, targets.c, config/arm-pe.mt:
+	 Support for ARM COFF/PE.
+
+Tue May 23 19:24:58 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* bfd.c (bfd_get_relocated_section_contents): Now a function,
+	tries calling routine from input bfd target vector for
+	bfd_indirect_link_order.  Put a declaration into the header file.
+	* bfd-in2.h: Regenerated.
+	* elf32-mips.c (gprel16_with_gp): New function, split out from
+	mips_elf_gprel16_reloc.
+	(mips_elf_gprel16_reloc): Call it.  If output bfd target vector
+	isn't elf flavoured, abort, since it's assumed to be elf in some
+	of this code, including the code that looks up the gp value.
+	(elf32_mips_get_relocated_section_contents): New function,
+	modified from bfd_generic_get_relocated_section_contents to deal
+	with passing gp to gprel16_with_gp.
+	(bfd_elf32_bfd_get_relocated_section_contents): New macro.
+	* elf32-target.h (bfd_elf32_bfd_get_relocated_section_contents):
+	Don't define if already defined.
+
+Tue May 23 15:58:15 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* Makefile.in: Install bfdlink.h too.
+
+Sun May 21 22:25:09 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* elf32-hppa.c (elf32_hppa_relocate_section): Handle undefined and
+	notsupported return codes from final_link_relocate (used when
+	$global$ is undefined or nonexistant).
+	(elf32_hppa_bfd_link_link_relocate): If $global$ exists, but is
+	not defined,then return bfd_reloc_undefined.
+
+Fri May 19 10:00:14 1995  Steve Chamberlain  <sac@rtl.cygnus.com>
+
+	* coffswap.h: (IMAGE_BASE): Define to 0 if not.
+
+Thu May 18 04:24:01 1995  Ken Raeburn  <raeburn@kr-laptop.cygnus.com>
+
+	Wed May 10 14:28:16 1995 Richard Earnshaw (rearnsha@armltd.co.uk)
+
+	* aoutx.h (aout_link_input_section_standard): If defined, call
+	MY_relocatable_reloc before doing a partial relocation.
+
+	* aout-arm.c: (WRITE_HEADERS): Delete.
+	(NAME): Define version to override default in aoutx.h
+	(MY(howto_table)): Reformat.  Alter some entries slightly.
+	(RELOC_ARM_BITS_NEG_{BIG,LITTLE}): Define.
+	(MY(reloc_howto), MY(put_reloc), MY(relocatable_reloc)): New functions.
+	(MY_reloc_howto, MY_put_reloc, MY_relocatable_reloc): Define.
+	(MY(fix_pcrel_26)): Renamed from aoutarm_fix_pcrel_26, return
+	bfd_reloc_ok not bfd_reloc_continue.
+	(MY(fix_pcrel_26_done)): Likewise.
+	(MY(bfd_reloc_type_lookup)): Renamed from aoutarm_reloc_type_lookup.
+	(MY_bfd_link_hash_table_create, MY_bfd_link_add_symbols,
+	MY_bfd_final_link): Delete.
+	(MY_swap_std_reloc_in, MY_swap_std_reloc_out, MY_get_section_contents):
+	Define.
+	(aoutx.h): Include it.
+	(MY(swap_std_reloc_{in,out})): New functions.
+	Use RELOC_ARM_BITS_NEG_{BIG,LITTLE} to extract negative reloc bit.
+	(aoutarm_squirt_out_relocs): Delete.
+ 
+	From: David Taylor (dtaylor@armltd.co.uk)
+	* config/arm[lb]-aout.mt: New files.
+	* aout-arm.c: New file.
+	* config.bfd: Handle arm{,e[lb]}-*-aout
+	* configure.in: Add vetor for aout_arm_{big,little}_vec.
+	* reloc.c: New relocation types for the ARM.
+	* targets.c (aout_arm_{big,little}_vec): declare.
+
+Tue May 16 10:29:51 1995  Jim Kingdon  <kingdon@deneb.cygnus.com>
+
+	* libbfd.c (bfd_stat): If bfd_cache_lookup returns an error,
+	return an error to the caller.  Call bfd_set_error on errors.
+
+Tue May 16 14:44:45 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* libcoff-in.h (coff_renumber_symbols): Modified prototypes in
+	accordance with 11 May libcoff.h change.
+
+Thu May 11 16:43:14 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	tekhex.c (first_phase): Understand type 0 symbols.
+	(tekhex_write_object_contents): Fix typo in final record.
+
+Thu May 11 16:43:14 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* coff-i960.c (optcall_callback): don't try and optimize
+	undefined refs. 
+	(coff_write_relocs): Search for broken relocs on the way
+	out and fix them up.
+	(coff_renumber_symbols): Calculate and return index of
+	first undefined symbol.
+	(coff_write_object_contents): Call coff_renumber_symbols 
+	and coff_write_relocs with the new args.
+	* libcoff.h: (coff_renumber_symbols, coff_renumber_symbols):
+	Modified prototypes.
+
+Thu May 11 16:43:14 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+			  Tom Griest <griest@cs.yale.edu>
+
+	Initial support for PE format. 
+	
+	* Makefile.in, targets.c, configure.in, config.bfd:
+	Add support for i386-*-winnt and i386-*-pe.
+	* archive.c (do_slurp_coff_armap):  Understand NTPE format
+	archives.
+	(_bfd_slurp_extended_name_table): Turn \ in a filename
+	into /.
+	* bfd-in.h (bfd_link_subsystem, _bfd_link_stack_heap): New.
+	* coff-i386.c  (howto_table): Conditionalize PCRELOFFSET.
+	* coffcode.h (IMAGE_BASE): New.
+	(coff_compute_section_file_positions): Throw away .junk
+	sections for PE, align symbols.
+	(coff_write_object_contents): Throw away .junk sections
+	for PE. Remember info on .idata and .rsrc sections.
+	Fill in the PE header.
+	(coff_slurp_symbol_table): PE uses C_SECTION class.
+	* cofflink.c (_bfd_coff_final_link): Keep PE info up to date.
+	(_bfd_coff_generic_relocate_section): Cope with PE relocs.
+	* coffswap.h (coff_swap_{aout/file/scn/sym}hdr_{in/out}): 
+	New code for PE headers.
+
+Tue May  9 17:01:38 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* config.bfd: Add little endian PowerPC support.
+	* configure.in: Ditto.
+	* targets.c: Ditto.
+	* config/ppcle-elf.mt: New file, for little endian PowerPC
+	support.
+	* config/ppc-elf.mt: Add little endian powerpc to the BFD
+	selection vectors.
+	* elf32-ppc.c (ppc_elf_merge_private_bfd_data): Complain if
+	linking a different endian object than we expect.
+	(TARGET_LITTLE_SYM, TARGET_LITTLE_NAME): Define, to provide little
+	endian support.
+
+Tue May  2 16:32:24 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* config.bfd (hppa*-*-lites*): Treat just like hppa*-*-*elf*.
+
+Tue Apr 25 19:38:43 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* coffgen.c (make_a_section_from_file): Initialize lma same as
+	vma.
+
+Tue Apr 25 11:03:21 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
+
+	* hosts/std-host.h: #include ansidecl.h 'cause PTR is used in
+	std-host.h.
+
+Mon Apr 24 23:56:44 1995  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+	* hosts/i386linux.h (HAVE_PROCFS): Don't define it.  Added lengthy
+	comment explaining why.
+
+Mon Apr 24 10:34:02 1995  Michael Meissner  <meissner@cygnus.com>
+
+	* hosts/i386linux.h (HAVE_PROCFS): If NO_PROCFS is defined, don't
+	define HAVE_PROCFS.
+
+Mon Apr 24 08:33:12 1995  Michael Meissner  <meissner@cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Do not continue
+	processing unknown symbols to prevent a cascade of errors.
+
+Fri Apr 21 12:48:48 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	Patches from H.J. Lu for Linux ELF core file support.
+	* elfcode.h (elf_core_file_matches_executable_p) [HAVE_PROCFS]:
+	Use prpsinfo_t instead of struct prpsinfo, for consistency.
+	* hosts/i386linux.h (HAVE_PROCFS): Define.
+
+Thu Apr 20 09:07:39 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* linker.c (link_action): Do the right thing when a undefined
+	strong symbol appears after an undefined weak symbol.
+
+Fri Apr 14 16:51:17 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): New function to relocate
+	a whole section for the linker, bypassing bfd_perform_relocation.
+	(ppc_elf_reloc_type_lookup): New function to map the BFD
+	enumeration code into a howto structure.
+	(ppc_elf_howto_raw): Rename from ppc_elf_howto_table.
+	(ppc_elf_howto_table): New array that maps PowerPC relocation
+	numbers to howto structures without a linear search.  Change from
+	using bfd_elf_generic_reloc to use ppc_elf_std_reloc.
+	(ppc_elf_howto_init): Initialize ppc_elf_howto_table from
+	ppc_elf_howto_raw.
+	(ppc_elf_reloc_type_lookup): Use a case statement instead of a
+	loop.
+	(ppc_elf_std_reloc): Replacement for bfd_elf_generic_reloc.
+	(ppc_elf_unsupported_reloc): Print a real error message, instead
+	of calling abort.
+	(ppc_elf_addr16_ha_inner): Abstract getting adjustment from
+	ppc_elf_addr16_ha_reloc, so ppc_elf_relocate_section can use it
+	too.
+	(ppc_elf_addr16_ha_reloc): Call it.
+	(ppc_elf_got16_inner): Abstract getting adjustment from
+	ppc_elf_got16_reloc, so ppc_elf_relocate_section can use it too.
+	(ppc_elf_got16_reloc): Call it.
+	(ppc_elf_info_to_howto): Rename from powerpc_info_to_howto.
+
+	* elfcode.h (elf_symbol_from_bfd_symbol): Omit space in debugging
+	output.
+	(elf_symbol_flags): Add debug function to decode flags so that
+	defining DEBUG to be 4 will compile again.
+	(elf_debug_section): Fix typo in debug output.
+
+Fri Apr 14 16:03:04 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* config.bfd: Add m68*-*-elf*.
+	* elf32-m68k.c: Filled out implementation, except for dynamic
+	linking support.
+	* reloc.c (enum bfd_reloc_code_real): Added *_GOT_PCREL, *_GOTOFF,
+	*_PLT_PCREL, *_PLTOFF, *_68K_* relocations for ELF.
+	* libbfd.h, bfd-in2.h: Regenerated.
+
+Thu Apr 13 14:28:04 1995  Torbjorn Granlund  <tege@adder.cygnus.com>
+
+	* coff-m68k.c (COFF_DEFAULT_SECTION_ALIGNMENT_POWER): Change from
+	1 to 2.
+	(bfd_target): Change minimum section alignment from 1 to 2.
+
+Wed Apr 12 12:40:04 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* aoutx.h (machine_type, case bfd_arch_mips): Treat R8000 like
+	R6000 and R4000 for now.
+
+Tue Apr  4 12:28:25 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-config.in: New file, MPW version of configure.in.
+	* mpw-make.in: New file, MPW version of Makefile.in.
+	* hosts/mpw.h: New file, MPW host definitions.
+	* ecoffswap.h (ecoff_swap_pdr_in, ecoff_swap_pdr_in) [MPW_C]:
+	Alternate versions without ECOFF_64 that chokes MPW C.
+	* coffswap.h (coff_swap_scnhdr_out): Add alternative version with
+	partly-expanded macros.
+
+Thu Mar 30 14:56:21 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* reloc.c (bfd_perform_relocation): Don't bother to check for
+	overflow if the symbol is undefined.
+
+Thu Mar 30 14:32:26 1995  H.J. Lu (hjl@nynexst.com)
+
+	* config.bfd: Change linux to default to elf.  Using
+	i[345]86-*-linuxaout will build a library which defaults to a.out.
+	* config/i386-laout.mt: Rename from old config/i386-linux.mt.
+	* config/i386-linux.mt: Rename from old config/i386-lelf.mt.
+	Comment out EXTRALIBS.
+	* config/i386-lelf.mt: Remove.
+
+Wed Mar 29 12:01:30 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-i960.c (coff_i960_relocate): Cache the section symbol in
+	the used_by_bfd field of the section, to avoid looping for each
+	reloc.
+
+	* cpu-h8500.c (arch_info_struct): Change name from "H8/300" to
+	"h8300" for consistency with other cpu-* files.
+
+Tue Mar 28 15:14:11 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bout.c (b_out_canonicalize_reloc): Handle SEC_CONSTRUCTOR
+	sections.
+	(b_out_get_reloc_upper_bound): Likewise.
+
+	* linker.c (generic_link_add_symbol_list): Skip constructor
+	symbols which the main linker code did not do anything with.
+	(_bfd_generic_link_output_symbols): Use udata.p if it is set,
+	rather than looking the symbol up in the hash table.  Just pass
+	through constructor symbols for which udata.p is not set.  If the
+	linker defined the symbol, clear the constructor flag.
+
+Tue Mar 21 10:50:32 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_set_reloc_info): Sign extend constants from
+	R_DATA_OVERRIDE fixups.
+	* libhppa.h (sign_extend): Renamed from sign_ext.  Fix.
+	(low_sign_extend): Likewise.
+
+Mon Mar 20 22:39:10 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_slurp_symbol_table): Tighten test to determine
+	what symbols are section symbols.
+
+Sat Mar 18 01:54:45 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elfcode.h (elf_bfd_link_add_symbols): An empty archive is OK.
+
+Fri Mar 17 16:29:02 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_bfd_copy_private_section_data): Just return true when
+	either the input or output section isn't attached to a SOM BFD.
+	(som_bfd_copy_private_bfd_data): Similarly for BFD private data.
+
+Fri Mar 17 11:50:34 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elfcode.h (elf_link_add_object_symbols): Check whether a dynamic
+	object has already been included, and ignore it the second time.
+
+Wed Mar 15 11:56:40 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-sparc.c (elf_sparc_howto_table): Change R_SPARC_GOT13 from
+	complain_overflow_bitfield to complain_overflow_signed.
+
+	* libelf.h (bfd_elf32__write_relocs): Don't declare.
+	(bfd_elf64__write_relocs): Don't declare.
+
+Tue Mar 14 05:54:33 1995  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+	* stab-syms.c (aout_stab_name): Moved aout_stab_names to be local
+	to this function.  Recoded function to stop using table, to
+	improve performance (on i486-netbsd host).  Left old version
+	intact under "#if 0" for further performance testing.
+
+Mon Mar 13 13:48:49 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elfcode.h (write_relocs): Make static.  Use PTR argument as a
+	pointer to a boolean variable set to true if something fails.
+	Cast to PTR rather than void *.
+	(sym_is_global): Rewrite for clarity.
+	(map_program_segments): If the program header size is too small,
+	call _bfd_error_handler and return failure rather than aborting.
+	(NAME(bfd_elf,write_object_contents)): Pass boolean variable when
+	calling write_relocs.
+	(elf_symbol_from_bfd_symbol): Use BFD_ASSERT rather than abort.
+	(struct elf_info_failed): Define.
+	(NAME(bfd_elf,size_dynamic_sections)): Declare variables in inner
+	blocks.  Pass elf_info_failed structure when calling
+	elf_export_symbol and elf_adjust_dynamic_symbol.
+	(elf_export_symbol): Treat data argument as elf_info_failed rather
+	than bfd_link_info.  Set failed field on error.
+	(elf_adjust_dynamic_symbol): Likewise.
+	(struct elf_finfo_failed): Define.
+	(elf_bfd_final_link): Pass elf_finfo_failed structure when calling
+	elf_link_output_extsym.  Use BFD_ASSERT rather than abort.
+	(elf_link_output_extsym): Treat data argument as elf_finfo_failed
+	rather than elf_final_link_info.  Set failed field on error.
+	(elf_link_input_bfd): Use BFD_ASSERT rather than abort.
+	(elf_reloc_link_order): Likewise.
+
+	* elf32-sparc.c (elf32_sparc_size_dynamic_sections): Only write
+	out PLTRELSZ, PLTREL and JMPREL relocs if there is a .rela.plt
+	section.  Solaris 2.4 apparently does not handle empty reloc
+	information correctly.
+
+	* archive.c (bsd_write_armap): Cast getuid and getgid results to
+	long, and print with %ld.
+
+Fri Mar 10 16:41:05 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutx.h (translate_to_native_sym_flags): Always use the output
+	section if it is not NULL.
+
+Thu Mar  9 15:06:25 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffswap.h (coff_swap_scnhdr_out): If the line number count or
+	the reloc count does not fit, print an error and return 0.
+	* coffcode.h (coff_write_object_contents): Check return value of
+	coff_swap_scnhdr_out.
+	* ecoff.c (_bfd_ecoff_write_object_contents): Check return value
+	of bfd_coff_swap_scnhdr_out.
+
+	* bfd.c: Include <stdarg.h> or <varargs.h>, depending upon
+	ANSI_PROTOTYPES.
+	(bfd_error_handler_type): New global type.
+	(_bfd_error_program_name): New static variable.
+	(_bfd_default_error_handler): New static function.
+	(_bfd_error_handler): New BFD private global variable.
+	(bfd_set_error_handler): New globally visible function.
+	(bfd_set_error_program_name): New globally visible function.
+	* libbfd-in.h (_bfd_error_handler): Declare.
+	* bfd-in2.h, libbfd.h: Rebuild.
+
+	* aoutx.h (NAME(aout,swap_ext_reloc_in)): Add symcount parameter,
+	and use it instead of bfd_get_symcount.  Check r_index after
+	setting r_extern based on whether this is a base relative reloc.
+	(NAME(aout,swap_std_reloc_IN)): Add symcount parameter, and use it
+	instead of bfd_get_symcount.
+	(NAME(aout,slurp_reloc_table)): Pass bfd_get_symcount to reloc
+	swap routines.
+	* libaout.h (NAME(aout,swap_ext_reloc_in)): Add symcount parameter
+	to declaration.
+	(NAME(aout,swap_std_reloc_in)): Likewise.
+	* sunos.c (sunos_canonicalize_dynamic_reloc): Pass
+	info->dynsym_count to reloc swap routines.
+	* aout-ns32k.c (MY_swap_std_reloc_in): Add symcount parameter.
+	* hp300hpux.c (MY(swap_std_reloc_in)): Likewise.
+	(MY(slurp_reloc_table)): Pass bfd_get_symcount to reloc swap
+	routine.
+	* i386lynx.c (NAME(lynx,swap_ext_reloc_in)): Add symcount
+	parameter.
+	(NAME(lynx,swap_std_reloc_in)): Likewise.
+	(NAME(lynx,slurp_reloc_table)): Pass bfd_get_symcount to reloc
+	swap routines.
+
+Thu Mar  9 12:04:05 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* bfd.c (bfd_merge_private_bfd_data): New function vector to be
+	called by the linker to merge any private bfd data of the input
+	files and the output file.  Used by the PowerPC ELF support to
+	check whether -mrelocatable is used for all modules.
+	(bfd_set_private_flags): New function vector to be called by the
+	assembler to set private flags.  Used by the PowerPC ELF support
+	to set that a particular object file was assembled with the
+	-mrelocatable option.
+
+	* targets.c (BFD_JUMP_TABLE_COPY): Add intiialization of the
+	bfd_merge_private_bfd_data and bfd_set_private_flags function
+	vectors.
+
+	* bfd-in2.h, libbfd-in.h: Rebuild with bfd.c and targets.c
+	changes.
+
+	* elf32-ppc.c (ppc_elf_set_private_flags): New function to set the
+	ELF e_flags field.
+	(ppc_elf_copy_private_bfd_data): Copy the e_flags field from the
+	input file to the output file.
+	(ppc_elf_merge_private_bfd_data): Check for a mismatch between the
+	e_flags field of all of the linker input files.
+
+	* libelf.h (elf_obj_tdata): Add ppc_flags_init field so that the
+	PowerPC support can check if compataible e_flags are present.
+
+	* aout-target.h: Add NOP for the bfd_merge_private_bfd_data
+	and bfd_set_private_flags function vectors.
+	* coffcode.h: Ditto.
+	* elf32-target.h: Ditto.
+	* elf64-target.h: Ditto.
+	* libbfd.h: Ditto.
+	* libecoff.h: Ditto.
+	* som.c: Ditto.
+
+Wed Mar  8 00:53:54 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cpu-mips.c (arch_info_struct): Add mips:8000 entry.
+
+	* elfcode.h (swap_out_syms): Mark an undefined BSF_WEAK symbol as
+	STB_WEAK rather than STB_GLOBAL.
+
+Tue Mar  7 12:23:47 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffcode.h (bfd_coff_backend_data): Add new field
+	_bfd_coff_adjust_symndx.
+	(bfd_coff_adjust_symndx): Define.
+	(coff_adjust_symndx): Define as NULL if not already defined.
+	(bfd_coff_std_swap_table): Initialize new field to
+	coff_adjust_symndx.
+	* cofflink.c (coff_link_input_bfd): Call coff_adjust_symndx if it
+	is defined.
+	* coff-a29k.c (coff_a29k_adjust_symndx): New static function.
+	(coff_adjust_symndx): Define before including coffcode.h.
+	* libcoff.h: Rebuild.
+
+	* format.c (bfd_check_format_matches): Skip binary_vec when
+	searching through bfd_target_vector.
+
+	* elfcode.h (elf_sort_hdrs): Check SHT_NOBITS before checking
+	sh_size.
+
+Mon Mar  6 23:31:36 1995  Doug Evans  <dje@chestnut.cygnus.com>
+
+	* elfcode.h (elf_sort_hdrs): Keep SHT_NOBITS sections after
+	!SHT_NOBITS ones.
+
+Mon Mar  6 09:53:08 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* cpu-hppa.c (arch_info_struct): Support both PA1.0 and PA1.1
+	machine types.
+	(bfd_hppa_arch): Link in both PA1.0 and PA1.1 architecture info
+	structures.
+	* libhppa.h (enum pa_arch): New enumeration to describe the
+	different variants of the PA architecture.
+	* som.c (som_object_setup): Use new enumeration to set machine
+	type.
+	(som_finish_writing): If the machine type is PA1.1, then use the
+	PA1.1 machine identifier in the output file.
+
+Thu Mar  2 15:58:24 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutx.h (NAME(aout,swap_ext_reloc_in)): Treat the index of a
+        base relative reloc as an index into the symbol table, regardless
+        of the setting of r_extern.
+	(NAME(aout,swap_std_reloc_in)): Likewise.
+
+	* aoutx.h (NAME(aout,set_section_contents)): Double check that the
+	caller is writing to a valid section.
+
+Thu Mar  2 14:37:57 1995  Bryan Ford  <baford@cs.utah.edu>
+
+	* binary.c: Add support for reading binary files.  Loads the raw
+	contents of the file into a data section and wraps some symbols
+	around it.  The symbols `_binary_<filename>_start' and
+	`_binary_<filename>_end' indicate the start and end of the data,
+	while `_binary_<filename>_size' is an absolute symbol whose value
+	is the size of the data.  <filename> is the name of the binary
+	input file, with all non-alphanumeric characters converted to
+	underscores.
+
+	* archures.c (bfd_arch_get_compatible): Assume users knows what
+	they're doing if one of the architectures is bfd_arch_unknown.
+
+Wed Mar  1 17:30:46 1995  Michael Meissner  <meissner@cygnus.com>
+
+	* elf32-ppc.c (elf_powerpc_howto_table): For relocation
+	R_PPC_GOT16, change complain_on_overflow to be
+	complain_overflow_signed.
+
+Wed Mar  1 11:52:55 1995  Jason Molenda  <crash@phydeaux.cygnus.com>
+
+	* configure.host: Recognize powerpc-*-aix*.
+
+Wed Mar  1 11:57:39 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-i960.c (COFF_PAGE_SIZE): Define.
+
+	* configure.in: Rewrite output of TDEFAULTS to avoid relying on
+	semantics of single quotes in parameter substitution.
+
+Tue Feb 28 12:53:09 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elfcode.h (elf_sort_hdrs): Sort empty sections before non-empty
+	sections, if they have the same VMA.
+
+	* config.bfd (i[345]86-*-linuxelf*): New target.  Use i386-lelf.
+	(i[345]86-*-gnuelf*): New target.  Use i386-gelf.
+	* config/i386-lelf.mt: New file.
+	* config/i386-gelf.mt: New file.
+
+Mon Feb 27 12:58:25 1995  Kung Hsu  <kung@mexican.cygnus.com>
+
+	* config.bfd: add a29k-*-vxworks configuration.
+
+Wed Feb 22 14:40:26 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libaout.h (NAME(aout,slurp_reloc_table)): Change declaration to
+	use reloc_howto_type rather than const struct reloc_howto_struct.
+
+Tue Feb 21 18:19:22 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bout.c (b_out_slurp_reloc_table): Don't return an error if asked
+	for relocations for the .bss section.
+
+Tue Feb 21 15:13:05 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_bfd_ar_write_symbol_stuff): Handle objects with odd
+	lengths.
+
+Fri Feb 17 12:34:36 1995  Michael Meissner  <meissner@cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_got16_reloc): Make GOT style relocs add
+	32768, so the GOT pointer can point to 16384 pointers, instead of
+	8192.
+
+Fri Feb 17 11:45:38 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* hosts/sysv4.h: Include <unistd.h>, <stdlib.h>, and <time.h>.
+	Only define SEEK_SET and SEEK_CUR if they are not already defined.
+	Remove all external function declarations.
+
+	* syms.c (bfd_decode_symclass): Return 'W' for a weak symbol.
+
+	* coffgen.c (coff_real_object_p): Set start address and flags
+	before calling coff_mkobject_hook.  Restore them on failure.
+	* ecoff.c (_bfd_ecoff_mkobject_hook): If not ECOFF_AOUT_ZMAGIC,
+	clear D_PAGED.
+
+	* coffgen.c: Reindented.
+
+Thu Feb 16 14:37:23 1995  Doug Evans  <dje@cygnus.com>
+
+	* reloc.c (bfd_perform_relocation): Don't use bitpos in overflow
+	calculations.
+	(bfd_install_relocation): Likewise.
+
+Thu Feb 16 13:22:29 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* hosts/std-host.h: Remove all function declarations which return
+	int or void, except the one for free.
+
+Wed Feb 15 14:54:18 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (elf_powerpc_howto_table): Use a destination mask of
+	0xffffffff for R_PPC_REL32, not 0.
+	(powerpc_reloc_map): Add low 16 bit, high 16 bit, and high 16 bit
+	adjusted relocations.
+
+Tue Feb 14 17:47:17 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-mips.c (struct mips_elf_find_line): Define.
+	(mips_elf_find_nearest_line): New static function.
+	(bfd_elf32_find_nearest_line): Define.
+	* libelf.h (struct elf_obj_tdata): Add find_line_info field.
+
+	* ecoff.c (_bfd_ecoff_swap_tir_in): Move to ecofflink.c.
+	(_bfd_ecoff_swap_tir_out): Likewise.
+	(_bfd_ecoff_swap_rndx_in): Likewise.
+	(_bfd_ecoff_swap_rndx_out): Likewise.
+	(cmp_fdrtab_entry): Likewise.
+	(mk_fdrtab): Likewise.
+	(lookup): Likewise.
+	(_bfd_ecoff_find_nearest_line): Just call _bfd_ecoff_locate_line
+	to do most of the work.  Allocate find_line_info if necessary.
+	* ecofflink.c: Include "aout/stab_gnu.h".
+	(_bfd_ecoff_swap_tir_in): Move in from ecoff.c.
+	(_bfd_ecoff_swap_tir_out): Likewise.
+	(_bfd_ecoff_swap_rndx_in): Likewise.
+	(_bfd_ecoff_swap_rndx_out): Likewise.
+	(cmp_fdrtab_entry): Likewise.  Use PTR instead of void *.
+	(mk_fdrtab): Move in from ecoff.c.  Add debug_info, debug_swap,
+	and line_info arguments, and use them instead of ecoff_data.
+	(fdrtab_lookup): Move in from lookup in ecoff.c.  Remove abfd
+	argument, add line_info argument.  Use it instead of ecoff_data.
+	(_bfd_ecoff_locate_line): New function, mostly from the old
+	_bfd_ecoff_find_nearest_line in ecoff.c.
+	* libecoff.h (ecoff_data_type): Remove find_buffer, fdrtab_len and
+	fdrtab fields, replacing them find_line_info field.
+	(_bfd_ecoff_swap_tir_in): Declare.
+	(_bfd_ecoff_swap_tir_out): Declare.
+	(_bfd_ecoff_swap_rndx_in): Declare.
+	(_bfd_ecoff_swap_rndx_out): Declare.
+	* libbfd-in.h (_bfd_ecoff_locate_line): Declare.
+	* libbfd.h: Rebuild.
+	* configure.in: Don't use ecoff.o for bfd_elf32_bigmips_vec or
+	bfd_elf32_littlemips_vec.
+	* Makefile.in: Rebuild dependencies.
+
+Tue Feb 14 14:04:22 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* libelf.h (elf_backend_data): Add fields elf_machine_alt1 and
+	elf_machine_alt2 which provide alternate versions of the machine
+	code.
+
+	* elf32-ppc.c (ELF_MACHINE_ALT1, ELF_MACHINE_ALT2): Define to
+	recognize old versions of the PowerPC machine code.
+
+	* elf32-target.h (elf32_bed): Initialize alternate machine code
+	fields defined by ELF_MACHINE_ALT1 and ELF_MACHINE_ALT2.
+
+	* elf64-target.h (elf64_bed): Initialize alternate machine code
+	fields defined by ELF_MACHINE_ALT1 and ELF_MACHINE_ALT2.
+
+	* elfcode.h (elf_object_p, elf_core_file_p): In addition to the
+	main machine code field, check the two alternate machine code
+	fields.
+
+Tue Feb 14 12:46:48 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutf1.h (MACHTYPE_OK): Don't define if already defined.  Don't
+	accept M_SPARC if bfd_arch_sparc is not in the list of supported
+	architectures, and don't accept a 680x0 machine type if
+	bfd_arch_m68k is not in the list of supported architectures.
+	* aout0.c (MACHTYPE_OK): Define.
+
+Mon Feb 13 23:25:38 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutx.h (NAME(aout,swap_ext_reloc_in)): Don't return a pointer
+	to garbage if the symbol index is out of range.
+	(NAME(aout,swap_std_reloc_in)): Likewise.
+
+Thu Feb  9 18:36:52 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* Makefile.in (BFD32_BACKENDS): Add i386msdos.o.
+
+Thu Feb  9 12:02:35 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* i386linux.c (NEEDS_SHRLIB): Define.
+	(linux_tally_symbols): Crash if a NEEDS_SHRLIB symbol is
+	undefined.  From hjl@nynexst.com (H.J. Lu).
+
+Wed Feb  8 17:26:00 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* linker.c (generic_link_check_archive_element): Allocate common
+	symbol information structure.  Don't bother to check for common
+	symbol size overflow.
+	(_bfd_generic_link_add_one_symbol): Likewise.
+	* aoutx.h (aout_link_check_ar_symbols): Likewise.
+	* linker.c (generic_link_check_archive_element): Adjust references
+	to common symbol information for new structure.
+	(_bfd_generic_link_add_one_symbol): Likewise.
+	* aoutx.h (aout_link_check_ar_symbols): Likewise.
+	(aout_link_add_symbols): Likewise.
+	* ecoff.c (ecoff_link_add_externals): Likewise.
+	* elfcode.h (elf_link_add_object_symbols): Likewise.
+	(elf_link_output_extsym): Likewise.
+	* sunos.c (sunos_add_one_symbol): Likewise.
+
+Wed Feb  8 09:53:42 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* elfcode.h (elf_sort_hdrs): Put SHT_NOBITS sections after !SHT_NOBITS.
+
+Tue Feb  7 16:27:33 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_bfd_find_nearest_line): Just return false, don't
+	abort.
+
+Tue Feb  7 14:43:33 1995  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+	* ecoff.c: Reformatted some comments and brace constructs in
+	recent changes to GNU style.
+	(cmp_fdrtab_entry, mk_fdrtab, lookup): Use old-style function
+	definitions.
+
+Tue Feb  7 14:21:28 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ecoffswap.h (ecoff_swap_pdr_in): Zero out intern before setting
+	any of the fields.
+
+Mon Feb  6 20:01:24 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	Sat Feb  4 14:20:24 1995  David Mosberger-Tang  <davidm@piston.cs.arizona.edu>
+
+	* ecoffswap.h (ecoff_swap_pdr_in, ecoff_swap_pdr_out): added
+	internalizing/externalizing new "prof" field.
+
+	* libecoff.h (ecoff_tdata): added fdrtab.
+
+	* ecoff.c (_bfd_ecoff_find_nearest_line): Fixed.
+
+Mon Feb  6 14:25:24 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libelf.h (struct elf_link_hash_table): Add saw_needed field.
+	* elfcode.h (elf_link_add_object_symbols): Set saw_needed if
+	DT_NEEDED seen in .dynamic section.
+	(elf_link_output_extsym): Warn if an undefined symbol is
+	only referenced from a dynamic object, and not making a shared
+	object, and saw_needed is false.
+	* elf.c (_bfd_elf_link_hash_table_init): Initialize saw_needed.
+
+	* libelf.h (ELF_LINK_HASH_DEFINED_WEAK): Don't define.
+	* elfcode.h (elf_link_add_object_symbols): Don't clear or set
+	ELF_LINK_HASH_DEFINED_WEAK.
+	(elf_link_output_extsym): Don't check ELF_LINK_HASH_DEFINED_WEAK.
+
+	Distinguish a weak defined symbol from a regular defined symbol.
+	* linker.c (enum link_action): Add DEFW.
+	(link_action): Add bfd_link_hash_defweak column.
+	(_bfd_generic_link_add_one_symbol): Add DEFW case.  Handle
+	bfd_link_hash_defweak in a few other cases.
+	* Many files (bfd_link_hash_undefweak): Renamed from
+	bfd_link_hash_weak.
+	* aoutx.h (aout_link_write_symbols): Handle bfd_link_hash_defweak.
+	(aout_link_write_other_symbol): Likewise.
+	(aout_link_input_section_std): Likewise.
+	(aout_link_input_section_ext): Likewise.
+	* bout.c (get_value): Likewise.
+	* coff-a29k.c (coff_a29k_relocate_section): Likewise.
+	* coff-alpha.c (alpha_convert_external_reloc): Likewise.
+	(alpha_relocate_section): Likewise.
+	* coff-mips.c (mips_relocate_section): Likewise.
+	(mips_relax_section): Likewise.
+	(bfd_mips_ecoff_create_embedded_relocs): Likewise.
+	* cofflink.c (coff_write_global_sym): Likewise.
+	(_bfd_coff_generic_relocate_section): Likewise.
+	* ecoff.c (ecoff_link_add_externals): Likewise.
+	(ecoff_link_write_external): LIkewise.
+	* elf32-hppa.c (elf32_hppa_relocate_section): Likewise.
+	(elf32_hppa_size_stubs): Likewise.
+	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Likewise.
+	(elf_i386_relocate_section): Likewise.
+	(elf_i386_finish_dynamic_symbol): Likewise.
+	* elf32-mips.c (mips_elf_output_extsym): Likewise.
+	(mips_elf_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Likewise.
+	(elf32_sparc_relocate_section): Likewise.
+	* elfcode.h (elf_link_add_object_symbols): Likewise.
+	(elf_adjust_dynamic_symbol): Likewise.
+	(elf_bfd_final_link): Likewise.
+	(elf_link_output_extsym): Likewise.
+	* i386linux.c (linux_add_one_symbol): Likewise.
+	(linux_tally_symbols): Likewise.
+	(linux_finish_dynamic_link): Likewise.
+	* linker.c (_bfd_generic_link_output_symbols): Likewise.
+	(set_symbol_from_hash): Likewise.
+	* reloc16.c (bfd_coff_reloc16_get_value): Likewise.
+	(bfd_perform_slip): Likewise.
+	* sunos.c (sunos_add_one_symbol): Likewise.
+	(sunos_scan_std_relocs): Likewise.
+	(sunos_scan_ext_relocs): Likewise.
+	(sunos_scan_dynamic_symbol): Likewise.
+	(sunos_write_dynamic_symbol): Likewise.
+
+Mon Feb  6 03:20:17 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	Changes from Bryan Ford, baford@schirf.cs.utah.edu:
+	* config.bfd (i[345]86-*-msdos*): New target.
+	* configure.in (i386msdos_vec): Handle it.
+	* i386msdos.c: New file.
+	* config/i386-msdos.mt: New file.
+	* bfd.c (enum bfd_error): Added new value bfd_error_file_too_big.
+	(bfd_errmsgs): Added string to table.
+	* libaout.h (reloc_type-lookup): Declare it.
+	* targets.c (enum bfd_flavour): Added bfd_target_msdos_flavour.
+	(i386msdos_vec): Declare.
+	(bfd_target_vector): Add it to the list.
+	* bfd-in2.h: Regenerated.
+
+Wed Feb  1 01:32:14 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_set_reloc_info, case R_DATA_ONE_SYMBOL): If there's
+	nothing in R_DATA_OVERRIDE, then try to find the addend in the
+	section's contents.
+	(som_write_fixups): Ignore the addend in a R_DATA_ONE_SYMBOL fixup.
+
+	* som.c (som_object_setup): More heruistics to detect the
+	braindamaged HP OSF1 linker. 
+	(setup_sections): Don't forget to free subspace_sections if we get
+	an error.
+	(som_slurp_string_table): Allocate strings on this bfd's obstack
+	rather than directly out of the heap.
+	(som_slurp_symbol_table): Likewise for the saved copy of the
+	canonical symbols.
+	(som_slurp_reloc_table): Likewise for the saved copy of the
+	canonical relocations.  Free the native relocations when we're
+	done with them.
+
+Tue Jan 31 21:53:28 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* libelf.h (struct elf_obj_tdata): New member program_header_size.
+	* elfcode.h (get_program_header_size): New parameters sorted_hdrs,
+	count, and maxpagesize.  All callers updated.
+	If sorted_hdrs is non-NULL, use it to compute the number of segments.
+	Save result in case called again.
+	(assign_file_positions_except_relocs): Sort headers before calling
+	get_program_header_size.
+
+Tue Jan 31 15:27:53 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elfcode.h (map_program_segments): Add sorted_hdrs parameter.
+	Search through it rather than through unsorted section headers.
+	(assign_file_positions_except_relocs): Pass sorted_hdrs to
+	map_program_segments.
+
+Mon Jan 30 22:04:53 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* ecoff.c (_bfd_ecoff_find_nearest_line): Fix problems in range
+	checking.  Expect argument OFFSET to be section-relative.  From
+	David Mosberger-Tang, davidm@piston.cs.arizona.edu.
+
+Mon Jan 30 11:22:11 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elfcode.h (NAME(bfd_elf,record_link_assignment)): Don't do
+	anything if we are not linking an ELF file.
+	(NAME(bfd_elf,size_dynamic_sections)): Likewise.
+
+Sat Jan 28 12:48:57 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (compare_subspaces): New function to sort subspaces by
+	their location in the object file.
+	(setup_sections): When computing the index for each subspace,
+	handle case where setup_sections reads the subspaces in a
+	different order that they appear in the object file.
+	(som_is_space): Also examine the output section for the containing
+	section.
+	(som_is_subspace, som_is_container): Likewise.
+	(som_begin_writing): Don't prepare or write fixups here.  When
+	writing the symbol strings, use the unsorted symbol table.
+	(som_write_object_contents): Don't write the symbol table here.
+	(som_finish_writing): Prepare and write the fixups here.  Likewise
+	for the symbol table.
+	(som_bfd_derive_misc_symbol_info): Undefined symbols always have
+	type SS_UNSAT regardless of BSF_EXPORT.
+	(som_set_reloc_info): Unpack and attach argument location
+	information for R_PCREL_CALL and R_ABS_CALL relocations.
+
+	* som.c (som_object_setup): New heuristic to determine if the
+	entry and flags fields are switched in the exec header.
+
+Sat Jan 28 00:16:01 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elfcode.h (elf_link_add_object_symbols): Use *sym_hash instead
+	of h if we might not be doing an ELF link.
+
+Fri Jan 27 16:13:42 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-mips.c (mips_elf_final_link): If the size of an input
+	.reginfo section is zero, force it to the correct size, since the
+	linker emulation code may have clobbered it.
+
+	* elfcode.h (elf_sort_hdrs): Correct SHF_ALLOC test.
+	(assign_file_positions_except_relocs): Free sorted_hdrs.
+
+Thu Jan 26 09:00:12 1995  Steve Chamberlain  <sac@splat>
+
+	* srec.c (srec_set_section_contents): Fix off by
+	one end address calculation.
+
+	* config.bfd: (m68*-est-coff): New configuration.
+
+Thu Jan 26 11:39:21 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elfcode.h (elf_link_add_object_symbols): Only examine weakdef if
+	we are using an ELF hash table.
+
+	* aoutx.h (NAME(aout,some_aout_object_p)): Always set EXEC_P if
+	the start address is in the .text section, even if STAT_FOR_EXEC
+	is set.  Just use STAT_FOR_EXEC as an additional test.
+
+Thu Jan 26 11:12:54 1995  Michael Meissner  <meissner@cygnus.com>
+
+	* elfcode.h (prep_headers): Use EM_PPC instead of
+	EM_CYGNUS_POWERPC.
+
+	* elf32-ppc.c (reloc_type): Add all System V.4 and eABI
+	relocations currently defined.
+	(powerpc_reloc_map): Adjust to new relocation names.
+	(elf_powerpc_howto_table): Add most of the new relocations.
+	(ELF_MACHINE_CODE): Use EM_PPC instead of EM_CYGNUS_POWERPC.
+
+	* config.bfd: Add support for powerpc-*-eabi.
+
+	* config/ppc-elf.mt: Add rs6000 architecture support to the
+	PowerPC.  Also add XCOFF support.
+
+Wed Jan 25 23:26:13 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-sh.c (CALC_ADDEND): Don't define.
+	(coff_sh_relocate_section): Remove.
+	(coff_relocate_section): Use _bfd_coff_generic_relocate_section.
+
+Tue Jan 24 14:22:47 1995  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* elf32-mips.c (mips_elf_output_extsym): Set the value of the
+	ECOFF symbol from the hash table entry.
+
+Mon Jan 23 14:53:35 1995  Steve Chamberlain  <sac@splat>
+
+	* coff-sh.c (coff_sh_relocate_section):  Don't subtract
+	vma twice.
+
+Mon Jan 23 13:33:18 1995  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* coff-sh.c (sh_reloc): Don't ignore the previous contents of an
+	R_SH_IMM32 reloc.
+
+	* config.bfd (i[345]86-*-gnu*): Set bfd_name to i386-gnu.
+	* config/i386-gnu.mt: New file.  Include ELF support.
+
+	* opncls.c (bfd_openstreamr): Call bfd_cache_init.
+
+Fri Jan 20 11:44:45 1995  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* sunos.c (sunos_add_one_symbol): Only set the sunos specific
+	fields if we are doing a sunos link.
+
+Wed Jan 18 12:28:17 1995  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* cpu-h8300.c (h8300_info_struct): Change name from "H8/300" to
+	"h8300" for consistency with other cpu-* files.
+	(h8300h_info_struct): Change name from "H8/300H" to "h8300h".
+	* coff-h8300.c (special): Remove unused variable diff.
+
+Tue Jan 17 10:52:32 1995  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* bfd-in.h (bfd_byte, reloc_howto_type): Define here, not...
+	* reloc.c (bfd_byte, reloc_howto_type): here.
+	* Changed all occurrences of ``const struct reloc_howto_struct''
+	to be ``reloc_howto_type'' instead.
+	* bfd-in2.h, libbfd.h, libcoff.h: Rebuilt.
+
+	* opncls.c (bfd_openstreamr): New function.
+	* bfd-in2.h: Rebuilt.
+
+	* elf32-mips.c (enum reloc_type): Define new relocs used on Irix.
+	(elf_mips_howto_table): Add entries for new relocs.
+	(mips_elf_section_from_shdr): Handle SHT_MIPS_MSYM,
+	SHT_MIPS_DWARF, and SHT_MIPS_EVENTS.
+	(mips_elf_fake_sections): Handle sections named .msym, .debug_*
+	and .MIPS.events.*.
+
+	* srec.c (srec_init): Remove unused local variable i.
+
+Sat Jan 14 19:09:48 1995  Steve Chamberlain  <sac@jonny>
+
+	* archures.c, Makefile.in, targets.c, bfd-in2.h, coffcode.h,
+	config.bfd, configure.in, config/w65.mt: Initial support for the W65.
+
+Sun Jan 15 13:57:45 1995  Steve Chamberlain  <sac@splat>
+
+	* opncls.c (bfd_fdopenr): Configure for WIN32.
+
+Thu Jan 12 16:30:47 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* Makefile.in (diststuff): Include `headers'.
+
+	* sunos.c (m68k_plt_first_entry, sparc_plt_first_entry): Now
+	const.
+	* tekhex.c (digs): Ditto.
+	* elf32-i386.c (elf_i386_plt0_entry, elf_i386_plt_entry): Ditto.
+
+	* srec.c, tekhex.c: Include libiberty.h.  Delete static array
+	hex_value and replace references to it with references to
+	hex_init, hex_p, and hex_value.
+	* Makefile.in: Updated dependencies.
+
+	* archures.c (archures_init_table): Now const.
+	(bfd_arch_init): Adjusted type of local var `ptable'.
+
+Thu Jan 12 09:33:24 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* hosts/symmetry.h:  Redefine `shared' to enable compilation
+	with the native Dynix cc compiler.
+	* i386dynix.c:  Include aoutx.h instead of using routines
+	from aout32.c.
+
+Wed Jan 11 21:31:41 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* reloc.c (reloc_howto_type): Make typedef include `const'.
+	* aout-ns32k.c, aoutx.h, bout.c, cf-m68klynx.c, coff-i386.c,
+	coff-i960.c, coff-m68k.c, cofflink.c, cpu-ns32k.c, ecoff.c,
+	elf32-hppa.c, elf32-i386.c, elf32-mips.c, elf32-sparc.c,
+	elfcode.h, libbfd-in.h, linker.c, mipsbsd.c, nlm32-ppc.c, oasys.c,
+	reloc.c, som.c: Don't use `const' in combination with
+	`reloc_howto_type'.
+	* bfd-in2.h, libbfd.h: Regenerated.
+
+	* ecoff.c (ecoff_type_to_string): Local variable `buffer1' doesn't
+	need to be static.
+
+Wed Jan 11 14:36:41 1995  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* sunos.c (sunos_add_one_symbol): Don't core dump if a multiple
+	definition of an absolute symbol is encountered.
+
+	* linker.c (_bfd_generic_link_add_one_symbol): Ignore
+	redefinitions of an absolute symbol to the same value.
+
+Mon Jan  9 15:51:32 1995  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* elfcode.h (elf_link_add_object_symbols): It's reasonable for no
+	flags to be set, so don't insist otherwise.
+
+Fri Jan  6 16:39:40 1995  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* elfcode.h (elf_slurp_symbol_table): Don't set BSF_GLOBAL for an
+	undefined or common symbol.
+	(elf_link_add_object_symbols): Likewise.
+
+Wed Jan  4 14:14:05 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (bfd_section_from_som_symbol): Only return sections which
+	correspond to subspaces.
+
+	* som.c (som_begin_writing): Don't forget to bump the
+	total_subspaces when writing the unloadable subspaces.
+
+Wed Dec 28 20:54:47 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_write_fixups): Use SEC_HAS_CONTENTS to identify
+	bss-like sections.
+	(som_get_section_contents): Likewise.
+	(som_set_section_contents): Likewise.
+
+Tue Dec 27 14:03:47 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (setup_sections): Turn off SEC_HAS_CONTENTS for bss-like
+	sections.
+
+Tue Dec 20 15:30:12 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* coffgen.c (bfd_debug_section): Deleted.
+	(coff_section_from_bfd_index): Return absolute section for debug
+	symbol.
+	(coff_write_symbol): Set BSF_DEBUGGING for C_FILE symbols.  If
+	BSF_DEBUGGING is set, set section to N_DEBUG.
+	(coff_bfd_make_debug_symbol): Use absolute section.
+
+	* elfcode.h (assign_file_positions_except_relocs): In assertion,
+	force all values to the same type.
+
+Tue Dec 20 11:11:58 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
+
+	* coff-h8300.c (howto_table): All relocs get a special function.
+	(special): Never do anything when linking -r.
+
+Tue Dec 20 13:58:01 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* i386linux.c (linux_add_one_symbol): Don't do anything Linux
+	specific if this is not a Linux hash table.  From Eric Youngdale
+	<eric@aib.com>.
+
+	Patches from kkojima@mix.or.jp (Kazumoto Kojima):
+	* mipsbsd.c (mips_howto_table_ext): Change sizes of memory relocs
+	apply to from two bytes to four bytes.
+	* MY(reloc_howto_type_lookup): Handle BFD_RELOC_CTOR.
+
+	* elf32-i386.c (elf_i386_relocate_section): Correct and expand the
+	list of cases for which relocation need not be computed.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+
+Mon Dec 19 23:09:16 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* elf32-hppa.c (elf32_hppa_read_symext_info): Delete do_locals and
+	do_globals arguments, always read symbol extension information for
+	globals and locals.  All callers changed.
+	(elf32_hppa_size_stubs): Rework to only read symbol extension
+	information once for each input bfd.  10% improvement in linker
+	performance.
+
+Fri Dec 16 12:28:46 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* elfcode.h (elf_section_from_bfd_section): Check
+	bfd_is_abs_section, etc., only after checking for the section in
+	the BFD and after calling the backend routine.
+
+Wed Dec 14 20:21:58 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* elfcode.h (elf_map_symbols): Only use section symbols whose
+	value is the start of the section, checking output_offset when
+	using output_section.  When creating a new symbol, set the value
+	to 0, since BFD symbol values are section relative.
+
+Tue Dec 13 13:31:06 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* cpu-z8k.c (arch_info_struct): Make z8002 the default
+	architecture.
+
+Fri Dec  9 12:43:05 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* elfcode.h (elf_bfd_link_add_symbols): If the first object in the
+	archive is not an ELF object, pass the archive to the add_symbols
+	entry point appropriate for the first object.  From Eric Youngdale
+	<eric@aib.com>.
+	* aoutx.h (NAME(aout,link_add_symbols)): Similar change if the
+	first object is not an a.out object.
+
+	* elf32-i386.c (elf_i386_relocate_section): Don't compute
+	relocation in cases where we won't use it.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+
+Thu Dec  8 14:19:41 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* pc532-mach.c (NAME): Define to use ns32kaout prefix.
+	* ns32knetbsd.c (NAME): Ditto.
+	(ns32kaout_32_get_section_contents): Define to standard aout-32
+	version.
+
+Fri Dec  2 13:56:49 1994  Ian Lance Taylor  <ian@rtl.cygnus.com>
+
+	* coff-mips.c (mips_read_relocs): New static function, broken out
+	of mips_relax_section.
+	(mips_relax_section): Call mips_read_relocs.
+	(bfd_mips_ecoff_create_embedded_relocs): New function.
+	* bfd-in.h (bfd_mnips_ecoff_create_embedded_relocs): Declare.
+	* bfd-in2.h: Rebuild.
+
+Wed Nov 30 14:12:55 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* coff-sh.c: Use _bfd_dummy_target instead of no_archive.
+
+Tue Nov 29 14:00:19 1994  J.T. Conklin  <jtc@.rtl.cygnus.com>
+
+	* config.bfd (i[345]86-*-freebsd*): Use i386-bsd as bfd_name.
+	* configure.host (i[345]86-*-freebsd*): Use i386bsd as my_host.
+
+Mon Nov 28 15:36:04 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
+
+	* config/m68k-nbsd.mt (DEFAULT_VECTOR): set to m68knetbsd_vec.
+	* Makefile.in: Rebuilt dependancies.
+	  (CFILES): Added m68knetbsd.c.
+	  (HFILES): Added netbsd.h.
+
+Wed Nov 23 19:21:41 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
+
+	* coff-sh.c (shlcoff_vec): New target vector.
+	(no_archive): New function.
+	* coffcode.h (coff_set_arch_mach_hook, coff_set_flags): Handle
+	little endian SH.
+	* configure.in: Handle shl.
+	* targets.c (bfd_target_vector): Add shlcoff_vec.
+	* config/sh-coff.mt (SELECT_VECS): Handle shl_coff_vec.
+
+Wed Nov 23 10:50:13 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* elfcode.h (write_relocs): Do not subtract the section's vma from
+	the reloc's offset when writing .o's.  Instead add the section's
+	vma to the reloc's offset when writing an executable or shared
+	library.
+
+Tue Nov 22 23:34:37 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* elf32-hppa.c (elf32_hppa_bfd_final_link_relocate): Do not add
+	input_section->vma to the relocation's offset.
+
+Mon Nov 21 12:37:25 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* srec.c (srec_get_reloc_upper_bound): Define.
+	(srec_canonicalize_reloc): Define.
+	(srec_bfd_reloc_type_lookup): Define.
+	(srec_vec, symbolsrec_vec): Use BFD_JUMP_TABLE_RELOCS (srec).
+
+Sat Nov 19 03:10:51 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* configure.host (i[345]86-*-solaris*):  Use solaris2 to
+	enable extraction of procfs info from core file for GDB.
+
+Thu Nov 17 17:37:39 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* reloc.c (bfd_reloc_code_type): Add new value BFD_RELOC_12_PCREL.
+	* bfd-in2.h, libbfd.h: Rebuilt.
+
+Thu Nov 17 13:12:08 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* elf32-hppa.c (elf32_hppa_bfd_final_link_relocated): Use the
+	vma from the output_section containing $global$ when computing
+	global_vlaue.
+
+Thu Nov 17 14:29:13 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* archive.c (_bfd_write_archive_contents): Round up the archive
+	header size of the extended name table to an even number.
+
+Wed Nov 16 16:08:06 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* coff-sh.c: Deleted some code that was commented out or inside
+	"#if 0".
+	(COFF_LONG_FILENAMES): Define.
+
+	* cpu-sh.c (arch_info_struct): Convert name to lowercase, for
+	consistency with other architectures.
+
+Sat Nov 12 23:50:10 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elfcode.h (elf_export_symbol): Also export symbols which are
+	referenced by a regular file.
+
+Fri Nov 11 14:29:31 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* elfcode.h (NAME(bfd_elf,size_dynamic_sections)): Add
+	export_dynamic argument, and handle it.
+	(elf_export_symbol): New function.
+	* bfd-in.h (bfd_elf32_size_dynamic_sections): Update declaration.
+	(bfd_elf64_size_dynamic_sections): Update declaration.
+	* bfd-in2.h: Rebuild.
+
+Fri Nov 11 10:35:33 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* hpux-core.c (hpux_core_struct): Delete handles for the
+	data, reg and stack sections.  They're never used.  Delete
+	accessor macros.
+	(make_bfd_asection): Use bfd_make_section_anyway since debugging
+	cores from dynamic executables may have several sections with the
+	same logical name.
+	(hpux_core_core_file_p): Don't save handles to data, reg and
+	stack sections.  Handle CORE_TEXT, CORE_MMF and CORE_SHM.
+
+Tue Nov  8 13:03:30 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* bout.c (callj_callback): Add new argument shrinking.  Change all
+	callers.  Handle relocs against section symbols correctly.  If not
+	shrinking, don't subtract out dstidx; the subtraction is already
+	in the object file.
+
+Sun Nov  6 12:52:00 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.h: Conditionally include <shl.h> and <dl.h>.
+
+Thu Nov  3 18:19:13 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* Makefile.in (ALL_MACHINES): Include m68knetbsd.o.
+
+	* config/i386linux.mh (EXTRALIBS): Include -lm.
+
+	Patches from DJ Delorie:
+	* coff-go32.c: Replacement file, uses coff-i386.c with minor
+	changes.
+	* coff-i386.c (TARGET_UNDERSCORE): allow other files to override
+	underscore also
+	* makefile.dos: del ctor.o, add cofflink.o and elf32.o
+
+	* aoutx.h (adjust_o_magic): If user set data section vma, use it
+	to determine the default bss vma.  Patch from Takada Hiroaki,
+	hiro@is.s.u-tokyo.ac.jp.
+	(machine_type, case bfd_arch_vax): Set *unknown to false.  Patch
+	from John David Anglin <dave@hiauly1.hia.nrc.ca>.
+
+	* configure.in (tb): Rename ns32knetbsd_vec to pc532netbsd_vec,
+	since that's what it's called.
+
+Wed Nov  2 15:24:51 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* archive.c (normalize): Change to take a BFD as an argument.
+	Change VMS version to use bfd_alloc rather than malloc, so that we
+	don't lose the memory forever.
+	(_bfd_construct_extended_name_table): Check the name of an archive
+	entry which is not being extended, and correct it if it is wrong.
+	This is necessary in case the archive was constructed by another
+	program which put an entry in the extended name table which we
+	don't plan to put in ourselves.  From jjc@jclark.com (James
+	Clark).
+	(bfd_dont_truncate_arname): Check return value of normalize.
+
+Mon Oct 31 14:19:08 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* elf32-hppa.c (ELF32_PARISC_SX_SIZE): Define.
+	(ELF32_PARISC_SX_GET, ELF32_PARISC_SX_PUT): Define.
+	(symextn_entry): Don't define.
+	(symext_chain_size): Change type to bfd_size_type.
+	(symextn_contents): Change type to bfd_byte *.
+	(elf32_hppa_backend_begin_write_processing): Use
+	ELF32_PARISC_SX_SIZE instead of sizeof (symext_entryS).
+	(elf32_hppa_size_symext): Likewise.  Also, change type of sizep to
+	bfd_size_type *.
+	(elf_hppa_tc_make_sections): Cast symextn_contents assignment to
+	bfd_byte *.  Use ELF32_PARISC_SX_PUT instead of direct assignment.
+	(elf32_hppa_backend_symbol_table_processing): Use
+	ELF32_PARISC_SX_SIZE instead of sizeof (symext_entryS).  Use
+	ELF32_PARISC_SX_GET insetad of direct assignment.
+	(elf32_hppa_read_symext_info): Change type of contents, and its
+	assignment cast, to bfd_byte *.  Use ELF32_PARISC_SX_SIZE instead
+	of sizeof (symextn_entry).  Use symext_entryS instead of
+	symextn_entry.  Use ELF32_PARISC_SX_GET instead of direct
+	assignment.
+
+	* archive.c (bfd_dont_truncate_arname): Add the ar padding
+	character, if there is room for it, even if the name is the
+	maximum length.
+
+	* elfcode.h (assign_file_positions_except_relocs): Sort the ELF
+	headers by section address when assigning file positions.
+	(elf_sort_hdrs): New static function.
+
+Sun Oct 30 18:56:58 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* elfcode.h (NAME(bfd_elf,size_dynamic_sections)): Create DT_INIT
+	and DT_FINI dynamic entries based on the existence of _init and
+	_fini symbols, not on the .init and .fini sections.  This is
+	compatible with some SVR4 linkers.
+	(elf_bfd_final_link): Corresponding change.
+
+Sat Oct 29 12:18:10 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Don't move a
+	symbol with a PLT entry into the .plt section if it is defined in
+	a regular file.
+	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Likewise.
+
+	* linker.c (_bfd_generic_link_add_archive_symbols): It's not an
+	error if an empty archive has no symbol table.
+	* ecoff.c (ecoff_link_add_archive_symbols): Likewise.
+	* elfcode.h (elf_link_add_archive_symbols): Likewise.
+
+Fri Oct 28 10:08:41 1994  J.T. Conklin  (jtc@rtl.cygnus.com)
+
+        NetBSD/m68k support, based on work by mikeb@snow.datametrics.com: 
+	* config.bfd (m68*-*-netbsd*): Use m68k-nbsd as bfd_name.
+	* configure.in (m68knetbsd_vec): Added.
+	* targets.c (bfd_m68knetbsd_vec): Added.
+	* hosts/m68knbsd.h, config/m68k-nbsd.mt, m68knetbsd.c: New files.
+	* Makefile.in (BFD32_BACKENDS, CFILES): Add m68knetbsd.c.
+
+	miscellaneous cleanup required by all netbsd targets, based on work 
+	by Andrew Cagney <cagney@highland.com.au>:
+	* netbsd.h (N_MAGIC, N_SET_MAGIC, N_GETMAGIC, N_GETMAGIC2, N_TXTADDR,
+	  N_TXTOFF, N_ALIGN, N_DATADDR, N_DATOFF): Removed.  Generic a.out
+	  definitions work.
+	* i386nbsd.c, ns32knbsd.c, sparcnbsd.c (__LDPGSZ): Removed.
+	  (MY(write_object_contents)): Use NetBSD's magic numbers
+
+Thu Oct 27 16:59:52 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* libelf.h (struct bfd_elf_section_data): Add field dynindx.
+	* elfcode.h (NAME(bfd_elf,size_dynamic_sections)): Don't finalize
+	the .dynsym, .dynstr or .hash sections until after the backend
+	size_dynamic_sections routine, so that it can add dynamic symbols
+	if it wants to.
+	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Don't define the
+	symbol to be in the .plt section when generating a shared library
+	if it is a defined symbol.
+	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Likewise.
+	(elf32_sparc_size_dynamic_sections): When generating a shared
+	library, allocate space for a dynamic symbol for each output
+	section, storing the index in the dynindx field of the ELF section
+	data.  Adjust the other dynindx fields to account for this.
+	(elf32_sparc_adjust_dynindx): New static function.
+	(elf32_sparc_relocate_section): When copying a reloc into a shared
+	library, use the original addend as appropriate.  Convert an
+	R_SPARC_32 reloc into an R_SPARC_RELATIVE reloc.  Use the dynamic
+	symbol index of the output section, not the normal symbol index.
+	(elf32_sparc_finish_dynamic_sections): Don't die if a section does
+	not exist when setting the value of the dynamic tags.  Write out
+	a dynamic symbol for each output section.
+
+Wed Oct 26 01:15:51 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* aoutx.h (aout_link_input_section): Don't bother to read or write
+	the relocs if there aren't any.
+
+Tue Oct 25 11:44:38 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* Makefile.in (ALL_MACHINES): Add tekhex.o.
+	* targets.c (bfd_target_vector): If SELECT_VECS is not defined,
+	include tekhex_vec.
+	* tekhex.c (NIBBLE, ISHEX): Cast array arguments to unsigned char.
+	(getvalue, getsym, out): Likewise.
+	(find_chunk): Remove unused variable s.
+	(first_phase): Remove unused variable s.
+	(pass_over): Remove unused variable address.
+	(tekhex_object_p): Remove unused variable section.
+	(move_section_contents): Change return type from boolean to void.
+	(tekhex_write_object_contents): Remove unused variables tdata and
+	list.
+
+	* linker.c (enum link_action): Add CIND.
+	(link_action): Change COMMON_ROW\indr from MDEF to CREF.  Change
+	INDR_ROW\common from MDEF to CIND.
+	(_bfd_generic_link_add_one_symbol): In CREF case, handle an
+	existing symbol which is indirect rather than defined.  Add new
+	CIND case.
+
+Mon Oct 24 15:33:16 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	Change S-record backend to use multiple sections to handle gaps in
+	file.
+	* srec.c (srec_data_list_struct): Move field next from last place
+	to first.  Change type of data to bfd_byte *.
+	(struct srec_symbol): Define.
+	(tdata_type): Remove done_symbol_read, count, strings, symbol_idx,
+	string_size, string_idx.  Change type of symbols to struct
+	srec_symbol *.  Add symtail and csymbols.
+	(low, high): Remove.
+	(size_symbols, fillup_symbols, size_srec, fillup): Remove.
+	(white, skipwhite, pass_over, object_p): Remove.
+	(srec_mkobject): Call srec_init.  Adjust tdata initialization for
+	field changes.
+	(srec_get_byte, srec_bad_byte): New static functions.
+	(srec_new_symbol, srec_scan): New static functions.
+	(srec_object_p): Change type of b to bfd_byte.  Explicitly set
+	wrong_format error.  Call srec_mkobject and srec_scan instead of
+	object_p.
+	(symbolsrec_object_p): Likewise.  Also, change b to be only two
+	bytes.
+	(srec_read_section): New static function.
+	(srec_get_section_contents): Call srec_read_section rather than
+	pass_over.  Handle zero length section correctly.
+	(set_set_arch_mach): Change from function to macro.
+	(srec_set_section_contents): Change data to bfd_byte *.
+	(srec_write_record): Change data, end and src to bfd_byte *.
+	(srec_write_header): Change buffer and dst to bfd_byte *.
+	(srec_write_section): Change location to bfd_byte *.
+	(srec_write_terminator): Change buffer to bfd_byte *.
+	(srec_get_symtab_upper_bound): Don't call
+	srec_get_section_contents.
+	(srec_get_symtab): Rewrite.
+
+	* ecoff.c (ecoff_set_symbol_info): Set udata.i to 0, not NULL.
+
+Fri Oct 21 16:43:13 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
+
+	* libaout.h (machine_type): added M_68K_NETBSD and M_SPARC_NETBSD.
+	* i386netbsd.c, ns32knetbsd.c, sparcnetbsd.c: removed RCS Id's.
+	  changed how PAGE_SIZE and SEGMENT_SIZE are defined so they are
+	  consistant with each other.
+	* netbsd.h (N_HEADER_IN_TEXT, TEXT_START_ADDR): NetBSD fits its
+	  header into the start of its text segment.
+
+Fri Oct 21 17:13:07 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* targets.c (BFD_JUMP_TABLE_ARCHIVE): Add case for
+	_construct_extended_name_table.
+	(bfd_target): Add _bfd_construct_extended_name_table.
+	* archive.c (_bfd_archive_bsd_construct_extended_name_table): New
+	function.
+	(_bfd_archive_coff_construct_extended_name_table): New function.
+	(_bfd_construct_extended_name_table): Renamed by adding a leading
+	underscore, and made externally visible.  Added trailing_slash
+	argument, and used it instead of elf_style.  Changed type of
+	tablen to bfd_size_type *.
+	(_bfd_write_archive_contents): Use BFD_SEND to call
+	construct_extended_name_table.  Use the returned name.
+	* libbfd-in.h (_bfd_construct_extended_name_table): Declare.
+	(_bfd_noarchive_construct_extended_name_table): Define.
+	(_bfd_archive_bsd_construct_extended_name_table): Declare.
+	(_bfd_archive_coff_construct_extended_name_table): Declare.
+	* bfd-in2.h: Rebuild.
+	* libbfd.h: Rebuild.
+	* som.c (som_construct_extended_name_table): New static function.
+	* aout-target.h (MY_construct_extended_name_table): Define.
+	* coff-rs6000.c (rs6000coff_construct_extended_name_table):
+	Define.
+	* ieee.c (ieee_construct_extended_name_table): Define.
+	* libecoff.h (_bfd_ecoff_construct_extended_name_table): Define.
+	* oasys.c (oasys_construct_extended_name_table): Define.
+
+	Fix the ELF linker to not require an interpreter if no dynamic
+	objects were seen, even when linking PIC code.
+	* libelf.h (ELF_LINK_HASH_NEEDS_PLT): Define.
+	(struct elf_link_hash_table): Add field dynamic_sections_created.
+	* elfcode.h (elf_link_record_dynamic_symbol): Create dynstr if it
+	doesn't already exist.
+	(elf_link_add_object_symbols): Create dynamic sections based on
+	dynamic_sections_created field, not dynobj field.  Don't bother to
+	set dynobj.
+	(elf_link_create_dynamic_sections): If dynamic sections were
+	already created, don't do anything.  If dynobj is already set, use
+	it; otherwise, set it to the bfd argument.  Don't initialize
+	dynsymcount.  Only create dynstr if it does not exist.  Set
+	dynamic_sections_created to true.
+	(NAME(bfd_elf,size_dynamic_sections)): Skip most of this function
+	if no dynamic objects were seen.
+	(elf_adjust_dynamic_symbol): If a symbol has the
+	ELF_LINK_HASH_NEEDS_PLT flag set, let the backend adjust it.
+	(elf_bfd_final_link): Change most decisions based on dynobj to
+	check dynamic_sections_created instead.
+	(elf_link_output_extsym): Only handle dynamic symbols if a dynamic
+	object was seen.
+	* elf.c (_bfd_elf_link_hash_table_init): Initialize new field
+	dynamic_sections_created.  Set dynsymcount to 1, not 0.
+	* elf32-i386.c (elf_i386_create_dynamic_sections): Call
+	elf_i386_create_got_section rather than creating the .got and
+	.got.plt sections.
+	(elf_i386_create_got_section): New static function.
+	(elf_i386_check_relocs): Just call elf_i386_create_got_section if
+	a GOT table is needed, not bfd_elf32_link_create_dynamic_sections.
+	Only create the .rel.got section, and only make space for a reloc,
+	for a global symbol or when generating a shared object.  For a
+	R_386_PLT32 reloc, just set the	ELF_LINK_HASH_NEEDS_PLT flag.
+	(elf_i386_adjust_dynamic_symbol): Rework initial assertion to
+	permit ELF_LINK_HASH_NEEDS_PLT non dynamic symbols.  Create a
+	procedure linkage table entry for such symbols.  But, if no
+	dynamic objects were seen, never create a PLT entry.
+	(elf_i386_size_dynamic_sections): If no dynamic objects were seen,
+	skip most of this function, and force the size of the .rel.got
+	section to zero.
+	(elf_i386_relocate_section): For a R_386_GOT32 reloc against a global
+	symbol when no dynamic object was seen, initialize the contents of
+	the .got section.  For a R_386_GOT32 against a local symbol, only
+	create a R_386_RELATIVE reloc when generating a shared object.
+	Treat a R_386_PLT32 reloc against a symbol for which we did not
+	create a PLT entry as a R_386_PC32 reloc.
+	(elf_i386_finish_dynamic_sections): Only fiddle with the dynamic
+	entries and the PLT if we saw a dynamic object.
+	* elf32-sparc.c (elf_sparc_howto_table): Fix R_SPARC_PC22 by
+	setting rightshift to 10.  Fix R_SPARC_WPLT20 by setting
+	rightshift to 2, size to 2, bitsize to 30, and dst_mask to
+	0x3fffffff.
+	(elf32_sparc_create_dynamic_sections): Don't set the size of the
+	.plt section.  Call elf32_sparc_create_got_section rather than
+	creating the .got section.
+	(elf32_sparc_check_relocs): Call elf32_sparc_create_got_section if
+	a GOT table is needed, not bfd_elf32_link_create_dynamic_sections.
+	Only create the .rela.got section, and only make space for a
+	reloc, for a global symbol or when generating a shared object.
+	Set the alignment of the .rela.got section to 2.  For a
+	R_SPARC_WPLT30 reloc, just set the ELF_LINK_HASH_NEEDS_PLT flag.
+	(elf32_sparc_adjust_dynamic_symbol): Rework initial assertion to
+	permit ELF_LINK_HASH_NEDS_PLT non dynamic symbols.  Create a
+	procedure linkage table for such symbols.  But, if no dynamic
+	objects were seen, never create a PLT entry.  Initialize the size
+	of the .plt section.
+	(elf32_sparc_size_dynamic_sections): If no dynamic objects were
+	seen, skip most of this function, and force the size of the
+	.rela.got section to zero.  Strip empty reloc sections, and strip
+	an empty .plt section.
+	(elf32_sparc_relocate_section): For a GOT reloc against a global
+	symbol when no dynamic object was seen, initialize the contents of
+	the .got section.  For a GOT reloc against a local symbol, only
+	create a R_SPARC_RELATIVE reloc when generating a shared object.
+	Treat a R_SPARC_WPLT30 reloc against a symbol for which we did not
+	create a PLT entry as a R_SPARC_WDISP30 reloc.
+	(elf32_sparc_finish_dynamic_sections): Only fiddle with the
+	dynamic entries and the PLT if we saw a dynamic object.
+
+Thu Oct 20 13:28:45 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elfcode.h (elf_map_symbols): Don't worry about section symbols
+	in a section not owned by any BFD.
+	(elf_section_from_bfd_section): Separate out loop which calls
+	backend routine.  Check bfd_section and call the backend routine
+	even for a section not owned by any BFD.
+	* elf32-mips.c (mips_elf_section_from_bfd_section): Handle
+	.acommon section.
+
+Wed Oct 19 13:28:29 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* coffgen.c (coff_print_symbol): Make names for section number and
+	storage class slightly more verbose.  It's not clear how many
+	characters I can justify using up, but before this change they
+	both were abbreviated "sc" which is (IMHO) clearly unacceptable.
+
+Wed Oct 19 01:26:39 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* binary.c (binary_set_section_contents): Set the base file
+	position from the lowest section VMA, not the start address.
+
+	* aoutx.h (NAME(aout,slurp_symbol_table)): Don't return an error
+	if there are no symbols.
+	* coffgen.c (coff_get_normalized_symtab): Likewise.
+	* hp300hpux.c (MY(slurp_symbol_table)): Likewise.
+
+Tue Oct 18 12:56:43 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* aout-target.h (MY_bfd_copy_private_section_data): Only copy
+	subformat to another bfd_target_aout_flavour file.
+
+	* binary.c: New file for raw binary output format.
+	* Makefile.in (BFD_LIBS): Add binary.o.
+	(CFILES): Add binary.c.
+	* targets.c (binary_vec): Declare.
+	(bfd_target_vector): Include binary_vec.
+
+	* srec.c (tdata_type): Add field tail.
+	(srec_mkobject): Initialize tail.
+	(srec_set_section_contents): Sort S record list by address.
+
+Mon Oct 17 11:38:16 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* elfcode.h (elf_map_symbols): Sort the symbols into a new array,
+	rather than messing with Elf_Sym_Extra.  Store the symbol index in
+	the udata.i field.
+	(swap_out_syms): Use outbound_syms as a pointer rather than as an
+	array.  Don't worry about elf_sym_num.
+	* libelf.h (struct elf_sym_extra): Don't define.
+	(Elf_Sym_Extra): Don't define.
+	(struct elf_obj_tdata): Remove sym_extra field.
+	(elf_sym_extra): Don't define.
+	* elf32-hppa.c (elf32_hppa_backend_final_write_processing): Use
+	udata.i rather than elf_sym_extra array.
+
+	* syms.c (asymbol): Change udata field into a union.
+	* bfd-in2.h: Rebuild.
+	* aoutx.h (NAME(aout,translate_symbol_table)): Use udata.p rather
+	than just udata.
+	* bout.c (perform_slip): Likewise.
+	* hp300hpux.c (MY(slurp_symbol_table)): Likewise.
+	* ieee.c (ieee_slurp_external_symbols): Likewise.
+	* linker.c (generic_link_add_symbol_list): Likewise.
+	(default_indirect_link_order): Likewise.
+	* oasys.c (oasys_slurp_symbol_table): Likewise.
+	* reloc16.c (bfd_perform_slip): Likewise.
+	* srec.c (fillup_symbols): Likewise.
+	* coffcode.h (get_index): Use udata.i rather than just udata.
+	(coff_slurp_symbol_table): Likewise.
+	* coffgen.c (set_index): Likewise.
+	* ecoff.c (ecoff_set_symbol_info): Likewise.
+	* elfcode.h (elf_symbol_from_bfd_symbol): Likewise.
+	* libecoff.h (ecoff_get_sym_index, ecoff_set_sym_index): Likewise.
+	* som.c (compare_syms): Likewise.
+	(som_prep_for_fixups): Likewise.
+	(som_write_fixups): Likewise.
+
+	Use a hash table when writing out ELF symbol names.
+	* elfcode.h (elf_stringtab_init): New static function.
+	(bfd_new_strtab, bfd_add_to_strtab, bfd_add_2_to_strtab): Remove.
+	Change all callers to use elf_stringtab_init or
+	_bfd_stringtab_add, and get stringtab lengths using
+	_bfd_stringtab_size.
+	(elf_fake_sections): Change ignored argument to pointer to
+	boolean, and set the boolean to true if an error occurs.  If an
+	error has already occurred, don't do anything.
+	(assign_section_numbers): Just set sh_size, not contents.
+	(elf_compute_section_file_positions): Pass the address of a
+	boolean to elf_fake_sections.  Pass the address of a
+	bfd_strtab_hash to swap_out_syms.  Write out the .strtab section.
+	(prep_headers): Change shstrtab to bfd_strtab_hash.
+	(swap_out_syms): Take a pointer to a bfd_strtab_hash as an
+	argument.  Set it to the symbol names.
+	(NAME(bfd_elf,write_object_contents)): Write out the section
+	header names using _bfd_stringtab_emit.
+	(elf_debug_section): Remove first argument; get the section name
+	via the bfd_section pointer.  Change caller.
+	(elf_bfd_final_link): Write out the symbol names using
+	_bfd_stringtab_emit.  Likewise for the .dynstr section contents.
+	Free the symbol names at the end of the function.
+	(elf_link_input_bfd): Remove the last argument, output_names,
+	from relocate_section.  Save the old symbol contents before
+	calling elf_link_output_sym, and restore them afterward.
+	* libelf.h (struct elf_link_hash_table): Change dynstr field to
+	struct bfd_strtab_hash.
+	(struct elf_backend_data): Remove last argument, output_names,
+	from elf_backend_relocate_section field.
+	(struct strtab): Don't define.
+	(struct elf_obj_tdata): Change strtab_ptr field to struct
+	bfd_strtab_hash.
+	* elf32-hppa.c (elf32_hppa_relocate_section): Remove last
+	argument, output_names.
+	* elf32-i386.c (elf_i386_relocate_section): Likewise.
+	* elf32-mips.c (mips_elf_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+
+	* libbfd-in.h (DEFAULT_STRING_SPACE_SIZE): Don't define.
+	(bfd_add_to_string_table): Don't declare.
+	* libbfd.h: Rebuild.
+	* libbfd.c (bfd_add_to_string_table): Remove.
+
+	* elfcode.h (elf_swap_shdr_in): Use bfd_section, not rawdata.
+	Clear contents field.
+	(bfd_section_from_shdr): In SHT_STRTAB case, check bfd_section,
+	not rawdata.  Don't set rawdata if e_shstrndx.  Use bfd_section
+	rather than rawdata in commented out code.  In SHT_REL[A] case,
+	don't bother to check elf_section_data of section returned by
+	section_from_elf_index.
+	(elf_fake_sections): Set bfd_section, not rawdata.  Don't set
+	size.
+	(elf_map_symbols): Don't set elf_num_section_syms.  Don't create
+	section symbols that already exist.
+	(assign_file_position_for_section): Use bfd_section, not rawdata.
+	(section_from_elf_index): Just check bfd_section field.
+	(elf_section_from_bfd_section): Likewise.
+	(elf_debug_section): Don't print rawdata, contents, or size.
+	(elf_link_add_object_symbols): Don't error out if
+	section_from_elf_index returns NULL.
+	(elf_bfd_final_link): Check return value from
+	section_from_elf_index against NULL, not bfd_is_abs_section.
+	(elf_link_input_bfd): Don't check section_from_elf_index return
+	value.
+	* libelf.h (struct elf_obj_tdata): Remove num_section_syms field.
+	(elf_num_section_syms): Don't define.
+	* elf.c (elf_get_str_section): Store section contents in contents
+	field rather than rawdata field.
+	(elf_string_from_elf_section): Likewise.
+	(_bfd_elf_make_section_from_shdr): Store BFD section pointer in
+	bfd_section field rather than rawdata field.
+	* elf32-hppa.c (elf32_hppa_read_symext_info): Use bfd_section
+	rather than rawdata.
+	(elf32_hppa_size_stubs): Likewise.
+	(elf32_hppa_backend_symbol_table_processing): Don't set
+	symextn_hdr->size; just use sh_size.
+	* elf32-mips.c (mips_elf_final_write_processing): Use bfd_section
+	rathern than rawdata.
+	(mips_elf_section_from_shdr): Likewise.
+	(mips_elf_section_processing): Likewise.
+	(mips_elf_section_from_bfd_section): Remove rawdata check.
+
+	* srec.c (pass_over): Set the start address for S7, S8 or S9.
+
+Fri Oct 14 19:15:46 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* VERSION: Updated to 2.5.
+
+Fri Oct 14 11:07:50 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* bfd.c (bfd_scan_vma): Cast end to be non const before passing it
+	to strtoul.
+
+Thu Oct 13 14:40:41 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* bfd.c (bfd_scan_vma): Pass end argument on to strtoul.
+
+Wed Oct 12 16:46:43 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* opncls.c (bfd_realloc): Deleted, since it's broken and fixing it
+	would make it slow.  Besides, it isn't used much.
+	* elfcode.h (elf_map_symbols): Always allocate new storage for the
+	symbol table.
+
+Wed Oct 12 11:54:37 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* ecoff.c (ecoff_set_symbol_info): Mark local stProc, stLabel or
+	stabs symbols as BSF_DEBUGGING.
+
+	* rs6000-core.c (rs6000coff_core_file_matches_executable_p): Make
+	str1 and str2 const pointers.
+
+	* Makefile.in (INSTALL): Use top level install.sh script.
+	* config/README (INSTALL): Remove.
+	* config/delta88.mh (INSTALL): Remove.
+	* config/i386v4.mh (INSTALL): Remove.
+	* config/irix4.mh (INSTALL): Remove.
+	* config/irix5.mh (INSTALL): Remove.
+	* config/ncrt3000.mh (INSTALL): Remove.
+
+Tue Oct 11 13:57:56 1994  Eric Youngdale  (eric@andante.aib.com)
+
+	* elf32-i386.c (elf_i386_check_relocs): Make sure that a symbol
+	with a global offset table entry or a procedure linkage table
+	entry is added to the dynamic symbol table.
+	* elf32-sparc.c (elf32_sparc_check_relocs): Likewise.
+	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): If a symbol has
+	already gotten a procedure linkage table entry, change the
+	definition to the PLT entry.
+	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Likewise.
+
+Tue Oct 11 17:12:00 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* lynx-core.c (lynx_core_file_p): SPARC Lynx appears to start
+	dumping the .data section in a core file at a page boundary.
+
+Mon Oct 10 16:24:44 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* cofflink.c (_bfd_coff_final_link): Cast argument to bfd_h_put_32
+	to correct type.
+	(coff_read_string_table): Cast argument to bfd_h_get_32 to correct
+	type.
+	* elfcode.h (elf_link_output_extsym): Cast argument to
+	bfd_elf_hash to correct type.
+
+	* elf32-sparc.c (elf_sparc_howto_table): The PC10, PC22, and
+	WPLT30 relocations are PC-relative.
+
+Thu Oct  6 12:57:26 1994  Richard Earnshaw (rwe@pegasus.esprit.ec.org)
+
+	* aoutx.h (adjust_o_magic): Correctly initialize vma if the vma of
+	the text section was user-defined.
+
+Wed Oct  5 14:42:12 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* archive.c (bfd_construct_extended_name_table): SVR4 uses slash
+	newline at the end of the file name, not just newline.
+
+Tue Oct  4 11:23:12 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* ecoff.c (_bfd_ecoff_new_section_hook): Default section alignment
+	power to 4, rather than using align_power_min.
+
+	* coffcode.h (coff_new_section_hook): Don't use align_power_min;
+	use COFF_DEFAULT_SECTION_ALIGNMENT_POWER instead.  Force the .stab
+	and .stabstr sections to be aligned to no more than 2.  Remove
+	COFF_SPARC special cases.
+	* coff-a29k.c: Define COFF_DEFAULT_SECTION_ALIGNMENT_POWER.
+	* coff-apollo.c, coff-go32.c, coff-h8300.c: Likewise.
+	* coff-h8500.c, coff-i386.c, coff-i960.c, coff-m68k.c: Likewise.
+	* coff-m88k.c, coff-rs6000.c, coff-sh.c, coff-sparc.c: Likewise.
+	* coff-we32k.c, coff-z8k.c: Likewise.
+
+	* configure.in: Use ${config_shell} when running config.bfd.
+
+	* cofflink.c (coff_link_input_bfd): Don't try to convert a long
+	filename if the offset field is zero.
+
+	* elfcode.h (swap_out_syms): If the alignment of a common symbol
+	was not set, use a sensible default rather than zero.
+
+Mon Oct  3 16:04:29 1994  H.J. Lu (hjl@nynexst.com)
+
+	* opncls.c (bfd_close): Honor umask when setting execution bits.
+	(bfd_close_all_done): Likewise.
+
+Mon Oct  3 04:41:49 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* rs6000-core.c (rs6000coff_core_p):  Set SEC_HAS_CONTENTS flag
+	for .stack and .ldinfo sections. Cast coredata.c_tab to a
+	file_ptr to avoid warnings from gcc.
+
+Fri Sep 30 13:11:38 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* elfcode.h (elf_bfd_final_link): Remove assertion when a non
+        SEC_IN_MEMORY section is found in dynobj.  This can happen when
+	linking PIC compiled code.
+
+Thu Sep 29 15:21:44 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* reloc.c (bfd_install_relocation): Change type of "data" to
+	bfd_byte *, to go along with yesterday's change.
+
+	* elf.c (bfd_elf_print_symbol): Moved here from elf_print_symbol
+	in elfcode.h.  (case bfd_print_symbol_all): Print symbol's size
+	field, except for common symbols; print their alignment.
+	* elfcode.h (elf_print_symbol): Deleted.
+	* libelf.h (bfd_elf_print_symbol): Declare.
+	(bfd_elf{32,64}_print_symbol): Replace declarations with macros.
+
+	* syms.c (bfd_print_symbol_vandf): Show BSF_LOCAL and BSF_GLOBAL
+	in one column.  Use the column freed up to show BSF_FUNCTION and
+	BSF_FILE.
+
+Thu Sep 29 12:29:01 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* syms.c (stt): Add .rdata and .rodata.
+
+Wed Sep 28 13:35:05 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* reloc.c (bfd_install_relocation): Cast data_start to bfd_byte *
+	before trying to add values to it.
+
+Tue Sep 27 16:47:58 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* elf32-hppa.c (elf32_hppa_backend_final_write_processing): Cast
+	return value from elf_sym_extra.
+	(elf32_hppa_build_stubs): Cast return value from bfd_zalloc.
+	(elf32_hppa_size_stubs): Cast return value from malloc.
+
+	* gen-aout.c (main): Declare and initialize "arch".
+
+	* cofflink.c (coff_link_add_symbols): Cast return value of
+	bfd_hash_allocate.
+
+	* riscix.c (riscix_callback): Use PARAMS macro in prototype.
+
+	* reloc.c (bfd_install_relocation): New function, mostly copied
+	from bfd_perform_relocation, adjusted for the assembler's needs.
+	* bfd-in2.h: Regenerated.
+
+Mon Sep 26 11:00:14 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* elfcode.h (assign_file_positions_except_relocs): Align the
+	section VMA and the file position even if D_PAGED is not set.
+
+	* bfd-in.h (bfd_seek): Change declaration to not mark fp const.
+	* bfd-in2.h: Rebuild.
+	* libbfd.c (bfd_seek): Don't mark parameters const, to avoid
+	conflicts with declaration.
+
+Fri Sep 23 15:15:31 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* elfcode.h (map_program_segments): Don't abort if we allocated
+	too much space for the program header, only if we allocated too
+	little.
+	(assign_file_positions_except_relocs): Similar change.
+
+Tue Sep 20 13:17:07 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
+
+	* libaout.h: Fix comment.
+	* ns32knbsd.h: Changed M_NS32K_NETBSD to M_532_NETBSD to match
+	  libaout.h.
+
+Tue Sep 20 15:23:21 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* Makefile.in: Rebuilt dependencies.
+	(BFD32_BACKENDS): Add sparcnetbsd.o.
+	(CFILES): Add ns32knetbsd.c and sparcnetbsd.c.
+	* targets.c: ns32knetbsd_vec was renamed to pc532netbsd_vec.
+
+	* coff-sh.c (rtype2howto): Remove; unused.
+	(coff_sh_relocate_section): Remove unused local variable rstat.
+	(reloc_processing): Comment out; unused.
+
+Fri Sep 16 12:12:27 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* aoutx.h (aout_link_write_other_symbol): If h->indx is -2, then
+	always write it out even if it would normally be stripped.
+	(aout_link_input_section_std): If we find a reloc against a
+	stripped global symbol, force it to be written out rather than
+	merely calling unattached_reloc.
+	(aout_link_input_section_ext): Likewise.
+	(aout_link_reloc_link_order): Likewise.
+
+Wed Sep 14 15:37:19 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.h (struct somdata): New field sorted_syms.
+	(obj_som_sorted_syms): Accessor macro.
+	* som.c (som_object_setup): Initialize sorted_syms to NULL.
+	(som_prep_for_fixups): Sort a copy of the BFD's symbol table;
+	store the sorted symbol table in sorted_syms.
+	(som_write_fixups): Initalize tmp_reloc to NULL to make GCC happy.
+	(som_begin_writing): Similarly for exec_header.  Pass the sorted
+	symbol table to som_write_symbol_strings.
+	(som_build_and_write_symbol_table): Use the sorted symbols rather
+	than the canonical symbol table.
+
+	* som.h (som_symbol_type): Add "stringtab_offset" field.
+	* som.c (som_write_symbol_strings): Use "stringtab_offset"
+	rather than destroying the "name" field in the BFD symbol.
+	(som_build_and_write_symbol_table): Likewise.
+
+Wed Sep 14 15:06:55 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* aoutx.h (aout_link_write_symbols): Rename skip_indirect to
+	skip_next.  If we find an N_WARNING symbol which has already been
+	written out, set skip_next.
+
+	* libecoff.h (struct ecoff_tdata): Add field find_buffer.
+	* ecoff.c: Include aout/stab_gnu.h.
+	(ecoff_find_nearest_line): Handle stabs debugging information.
+
+	* elfcode.h (elf_link_output_extsym): Keep a symbol marked as weak
+	even if it is referenced by another object.
+
+Tue Sep 13 17:57:00 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_fixup_formats): Case R_ENTRY (0xb3), set both
+	'T' and 'U' to grab all the unwind information.
+	(som_set_reloc_info): Make 'U' unwind bits persist across
+	multiple SOM relocations.  Set the addend field of an R_ENTRY
+	relocation to the value in 'T'; set the addend field on an
+	R_EXIT relocation to the value in 'U'.
+
+	* som.h (som_symbol_type): Delete unwind field.
+
+	* som.c (som_write_fixups): For R_ENTRY fixups, get 32bits of
+	unwind information from the addend field of the R_ENTRY, get the
+	other 32bits from the addend field of the R_EXIT.
+	(bfd_som_attach_unwind_info): Delete function and all references.
+
+	* som.h (som_symbol_type): Delete unused a.out-related fields.
+
+	* som.c (bfd_section_from_som_symbol): Use bfd_abs_section_ptr
+	instead of &bfd_abs_section.
+
+	* som.c (som_object_setup): Handle exec_entry and exec_flags being
+	switched in executables created by the OSF1 linker.
+	(som_write_fixups): Handle R_EXIT just like the R_{F,L,R}SEL
+	fixups.  Support R_ALT_ENTRY (handle just like R_EXIT).
+
+Tue Sep 13 16:04:07 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
+
+	* cofflink.c (coff_link_input_bfd): syment_base is unsigned
+	so can't compare -ve numbers with it.
+
+Mon Sep 12 20:31:17 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
+
+	* configure.in (shcoff_vec): Use cofflink.o now.
+	* coff-sh.c: Rewritten to use new fast coff backend.
+
+Tue Sep 13 16:23:57 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* aoutx.h (NAME(aout,final_link)): Don't assume that all the input
+        files are a.out.
+
+Tue Sep 13 11:09:39 1994  J.T. Conklin  (jtc@rtl.cygnus.com)
+
+	* configure.host (sparc-*-netbsd): use sparcnbsd.
+	  (ns32k-*-netbsd): use ns32knbsd.
+
+	* hosts/{nbsd,i386nbsd,ns32knbsd,sparcnbsd}.h: New files, NetBSD
+	  host support.
+
+	* sparcnetbsd.c: New file, adds support for NetBSD/sparc.
+	* config/sparc-nbsd.mt: Likewise.
+
+	* netbsd.h: New file, definitions common to all netbsd ports.
+	* i386netbsd.c: Use it.
+        * ns32knetbsd.c: Use it.
+
+	* Makefile.in, configure.in, targets.c, config/i386-nbsd.mt,
+	  config/ns32k-nbsd.mt: canonicalize netbsd targets to conform to
+	  file/variable naming conventions.
+	* i386netbsd.c: New file, renamed from netbsd386.c.
+	* ns32knetbsd.c: New file, renamed from netbsd532.c.
+	
+Mon Sep 12 21:56:20 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_reloc_skip): Correct off-by-one error for 4-byte
+	R_NO_RELOCATION fixups.
+	(bfd_section_from_som_symbol): Return the absolute section if the
+	symbol isn't contained in any section in the output file.
+	(som_slurp_symbol_table): ST_PRI_PROG and ST_SEC_PROG symbols are
+	not function symbols (they are magic code labels which *can* be the
+	targets of cross space branches).  $START$ is not a section symbol.
+
+Mon Sep 12 11:43:08 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* coff-alpha.c (ecoffalpha_little_vec): Add SEC_CODE and SEC_DATA
+	to section_flags.
+	* coff-mips.c (ecoff_little_vec, ecoff_big_vec): Likewise.
+
+	* elfcode.h (swap_out_syms): Set the type of an undefined symbol
+	to STT_FUNC if the BSF_FUNCTION flag is set.
+
+	* cofflink.c (coff_link_input_bfd): If r_symndx is -1, don't
+	change it.
+	(_bfd_coff_generic_relocate_section): If r_symndx is -1, it is an
+	absolute reloc.  Don't dump core using r_symndx as an array index.
+	* cf-m68klynx.c (coff_bfd_link_add_symbols): Define.
+	(lynx_link_add_symbols): New static function (copy of function in
+	coff-i386.c).
+	(coff_m68k_lynxrtype_to_howto): sym argument may be NULL.
+	* coff-i386.c (coff_i386_rtype_to_howto): Likewise.
+	* coff-a29k.c (coff_a29k_relocate_section): Handle an r_symndx
+	value of -1, meaning an absolute reloc.
+
+	* ctor.c: Remove; obsolete.
+	* Makefile.in: Rebuild dependencies.
+	(BFD_LIBS): Remove ctor.o.
+	(CFILES): Remove ctor.c.
+	* libbfd.h: Rebuild.
+
+Mon Sep 12 01:58:47 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* elf32-hppa.c (elf32_hppa_relocate_section): If there was a link
+	error of some sort (for example, undefined symbols), then do not
+	apply any relocs, just notify the user of the errors.
+	(elf32_hppa_backend_begin_write_processing): Do not build a symbol
+	extension section for an executable (it's useless).
+	(elf32_hppa_link_output_symbol_hook): Do nothing if there was a
+	link error of some sort (for example, undefined symbols).
+	(elf32_hppa_read_symext_info): Kludge.  Turn off SEC_HAS_CONTENTS
+	for all the input symbol extension sections to keep the generic
+	BFD code happy.  Temporarily turn it on to read the contents of
+	the symbol extension section.
+
+Sun Sep 11 21:58:59 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* config/hppaosf.mh (RANLIB): Do not set.
+	* config/hppabsd.mh (RANLIB): Likewise.
+
+Sun Sep 11 22:50:49 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* cf-i386lynx.c: Remove #if 0 code.
+	(i386_lynxos_coff_object_p): Remove unused function.
+	(coff_bfd_link_add_symbols): Define.
+	(lynx_link_add_symbols): New static function.
+	* coffcode.h (coff_bfd_link_hash_table_create): If
+	coff_relocate_section is defined, only define this if not already
+	defined.
+	(coff_bfd_link_add_symbols, coff_bfd_final_link): Likewise.
+
+	* linker.c (_bfd_generic_final_link): Handle
+	bfd_indirect_link_order explicitly, rather than via
+	_bfd_default_link_order.
+	(set_symbol_from_hash): New static function, broken out of
+	_bfd_generic_link_write_global_symbol.
+	(_bfd_generic_link_write_global_symbol): Symbol setting code moved
+	to set_symbol_from_hash; call it.
+	(default_indirect_link_order): Add generic_linker argument.
+	Change all callers.  If false, set the generic symbols based on
+	the hash table entries.
+
+Fri Sep  9 11:51:49 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* coffgen.c (coff_get_symtab): Reindented.  Removed commented out
+	call to bfd_constructor_entry.
+
+	Convert m68k COFF to use new COFF backend linker.
+	* coff-m68k.c (coff_relocate_section): Define.
+	* cf-m68klynx.c (coff_rtype_to_howto): Define.
+	(coff_m68k_lynx_rtype_to_howto): New static function.
+	* configure.in (m68kcoff_vec): Build cofflink.o.
+	(m68kcoffun_vec, m68klynx_coff_vec): Likewise.
+
+Thu Sep  8 16:20:38 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
+
+	* coff-h8300.c (h8300_reloc16_extra_cases, case RELBYTE): Flag
+	overflows correctly.
+
+Wed Sep  7 19:01:42 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* libelf.h (struct elf_backend_data): Change second argument of
+	elf_backend_final_write_processing hook to boolean.
+	(struct elf_obj_tdata): Add linker field.
+	* elfcode.h (NAME(bfd_elf,write_object_contents)): Pass value of
+	tdata linker field to final_write_processing, rather than NULL.
+	(elf_bfd_final_link): Don't call final_write_processing hook.  Set
+	tdata linker field to true.
+	* elf32-mips.c (mips_elf_final_write_processing): Change type of
+	second argument to boolean.
+	* elf32-hppa.c (elf32_hppa_backend_final_write_processing):
+	Likewise.
+
+	* coff-go32.c (RTYPE2HOWTO): Fully parenthesize arguments.
+	* coff-i960.c (RTYPE2HOWTO): Likewise.
+	* coff-m88k.c (RTYPE2HOWTO): Likewise.
+	* coff-we32k.c (RTYPE2HOWTO): Likewise.
+
+	Make i386 COFF use new COFF backend linker.
+	* coff-i386.c (RTYPE2HOWTO): Fully parenthesize arguments.
+	(coff_relocate_section): Define.
+	(coff_i386_rtype_to_howto): New function.
+	* configure.in (i386coff_vec): Use cofflink.o.
+	(i386lynx_coff_vec): Likewise.
+
+	* coffcode.h (bfd_coff_backend_data): Add new field
+	_bfd_coff_rtype_to_howto.
+	(bfd_coff_rtype_to_howto): Define.
+	(coff_rtype_to_howto): Define to use RTYPE2HOWTO, if not already
+	defined.
+	(bfd_coff_std_swap_table): Initialize new field.
+	* cofflink.c (_bfd_coff_final_link): Allocate section_count + 1
+	section_info structures, since the target_index is 1 based.
+	(coff_link_input_bfd): Set *secpp to bfd_com_section_ptr for a
+	common symbol.  Adjust rel_hash by the output reloc count.
+	(_bfd_coff_generic_relocate_section): New function.
+	* libcoff-in.h (_bfd_coff_generic_relocate_section): Declare.
+	* libcoff.h: Rebuild.
+	* coff-alpha.c (alpha_ecoff_backend_data): Initialize new field.
+	* coff-mips.c (mips_ecoff_backend_data): Likewise.
+
+Tue Sep  6 23:28:52 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_bfd_derive_misc_symbol_info): Treat undefined code
+	symbols and undefined symbols which no type in the same manner
+	if the associated BFD symbol has BSF_FUNCTION set.  For a defined
+	symbol which no type, select a SOM type based on the flags of the
+	section containing the symbol.
+	(som_slurp_symbol_type): Set BSF_FUNCTION for undefined ST_STUB
+	or ST_CODE symbols (importing a non-function code symbol is
+	meaningless in SOM).
+	(som_set_reloc_info): Don't set "offset" to the section's vma; it
+	should always start at zero.
+
+Tue Sep  6 14:51:11 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	Add new style linker support to COFF backend.  a29k only for now.
+	* cofflink.c: New file.
+	* libcoff-in.h: Include bfdlink.h.
+	(obj_coff_external_syms, obj_coff_strings): Define accessor macro.
+	(obj_coff_sym_hashes): Define accessor macro.
+	(struct coff_tdata): Add fields external_syms, strings, and
+	sym_hashes.
+	(struct coff_link_hash_entry): Define.
+	(struct coff_link_hash_table): Define.
+	(coff_link_hash_lookup, coff_link_hash_traverse): Define.
+	(coff_hash_table): Define.
+	(_bfd_coff_link_hash_table_create): Declare.
+	(_bfd_coff_link_add_symbols, _bfd_coff_final_link): Declare.
+	* coffcode.h (bfd_coff_backend_data): Add fields _bfd_relsz,
+	_bfd_coff_swap_reloc_in, _bfd_coff_sym_is_global,
+	_bfd_coff_compute_section_file_positions,
+	_bfd_coff_relocate_section.
+	(bfd_coff_relsz, bfd_coff_swap_reloc_in): Define.
+	(bfd_coff_sym_is_global): Define.
+	(bfd_coff_compute_section_file_positions): Define.
+	(bfd_coff_relocate_section): Define.
+	(coff_mkobject_hook): Initialize obj_raw_syment_count and
+	obj_conv_table_size.
+	(coff_compute_section_file_positions): Set target_index of all
+	sections.  Set output_has_begun field.
+	(coff_write_object_contents): Don't set target_index; now done by
+	coff_compute_section_file_positions.  Remove obsolete handling of
+	scn_base and data_base.  Don't bother to check that target_index
+	is positive, since it always is.  Remove use of pad, which is
+	always zero.  Check obj_raw_syment_count, not bfd_get_symcount,
+	for the number of symbols, but only write them out if
+	bfd_get_symcount is non-zero.  Don't check obj_raw_syment_count
+	until after coff_write_symbols is called.
+	(coff_slurp_symbol_table): Use obj_raw_syment_count, not
+	bfd_get_symcount for the number of symbols.  Don't set
+	obj_conv_table_size.
+	(coff_sym_is_global): New static function or macro.
+	(coff_slurp_reloc_table): Call coff_swap_reloc_in, not
+	bfd_swap_reloc_in.
+	(coff_bfd_link_hash_table_create): If coff_relocate_section is
+	defined, define as _bfd_coff_link_hash_table_create.
+	(coff_bfd_link_add_symbols): Similar change.
+	(coff_bfd_final_link): Similar change.
+	(coff_relocate_section): Define as NULL if not defined.
+	(bfd_coff_std_swap_table): Initialize new fields.
+	* coffgen.c (coff_real_object_p): Don't set obj_raw_syment_count
+	and obj_conv_table_size here.
+	(coff_count_linenumbers): Reindent.  If bfd_get_symcount is zero,
+	add up the line numbers from the sections.
+	(coff_write_symbols): Set obj_raw_syment_count, not
+	bfd_get_symcount.
+	(coff_pointerize_aux): Don't pointerize a nonpositive x_endndx
+	field.
+	(coff_get_normalized_symtab): Use obj_raw_syment_count, not
+	bfd_get_symcount.
+	(coff_print_symbol): If auxp->fix_end, print x_endndx value.
+	* coffswap.h (coff_swap_reloc_in): Rename from bfd_swap_reloc_in.
+	Reindent.  Change argument type to  PTR.
+	* coff-a29k.c (coff_a29k_relocate_section): New static function.
+	(coff_relocate_section): Define.
+	* configure.in (a29kcoff_big_vec): Compile cofflink.o.
+	* coff-alpha.c (alpha_ecoff_backend_data): Initialize new fields.
+	* coff-mips.c (mips_ecoff_backend_data): Likewise.
+	* libcoff.h: Rebuilt.
+	* Makefile.in: Rebuilt dependencies.
+	(BFD32_BACKENDS): Add cofflink.o.
+	(CFILES): Add cofflink.c.
+
+Tue Sep  6 14:00:45 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* coffgen.c (coff_print_symbol, case bfd_symbol_print_all): Check
+	for section symbol, and print its aux fields with appropriate
+	labels.
+
+	* Makefile.in (ALL_MACHINES): Added cpu-arm.o.
+
+Sun Sep 04 17:58:10 1994  Richard Earnshaw (rwe@pegasus.esprit.ec.org)
+
+	* aoutx.h (NAME(aout,machine_type)): Recognize the ARM processor.
+	* archures.c, config.bfd, configure.host, libaout.h, reloc.c,
+	targets.c: Add support for the ARM.
+	* cpu-arm.c, riscix.c, config/riscix.mh, config/riscix.mt: New files.
+
+	* aoutx.h (add_to_stringtable): Check that str isn't a NULL pointer.
+
+Fri Sep  2 14:10:30 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* reloc.c (enum bfd_reloc_code_real): Rewrote definition to use
+	new "chew" commands for simultaneous definition of enumerator and
+	enumerator name table.
+	(bfd_get_reloc_code_name): New function, for retrieving a symbolic
+	name associated with an enumerator.
+	* libbfd.h, bfd-in2.h: Regenerated.
+
+Tue Aug 30 21:24:54 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_write_fixups, case R_ENTRY): Handle case where no
+	unwind descriptor information is available.
+
+Tue Aug 30 11:43:30 1994  Eric Youngdale  (ericy@cais.cais.com)
+
+	* elfcode.h (NAME(bfd_elf,size_dynamic_sections)): Add soname
+	argument, and use it to set DT_SONAME dynamic entry.
+	* bfd-in.h (bfd_elf32_size_dynamic_sections): Update prototype.
+	(bfd_elf64_size_dynamic_sections): Update prototype.
+	* bfd-in2.h: Rebuilt.
+
+Fri Aug 26 15:47:57 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* coffgen.c (coff_real_object_p): Set obj_raw_syment_count.
+	(coff_get_normalized_symtab): Verify obj_raw_syment_count, rather
+	than setting it.
+
+Thu Aug 25 10:44:53 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* archive.c (bsd_write_armap): Remove host dependencies.
+
+	* aoutx.h (add_to_stringtab): Check for _bfd_stringtab_add error
+	before adding BYTES_IN_WORD.
+
+	* coffgen.c (coff_find_nearest_line): Look for the best C_FILE,
+	not merely the first.
+
+	* coffgen.c (coff_write_alien_symbol): If we are not using the
+	symbol, clear the name so that it is not put in the string table.
+	From Antti.Miettinen@ntc.nokia.com.
+
+Wed Aug 24 11:49:19 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* coffgen.c (coff_print_symbol): Cast pointer different to long
+	and use %ld to print it.
+	* osf-core.c (osf_core_core_file_p): Remove unused variable
+	dseccnt.
+	* ecoffswap.h (ecoff_swap_ext_out): If ECOFF_64, clear remaining
+	bytes in bits2.
+
+	* configure.host, config.bfd: Change i[34]86 to i[345]86.
+	* coffgen.c (coff_real_object_p): Set obj_conv_table_size here,
+	rather than waiting until coff_slurp_symbol_table.
+	(coff_write_alien_symbol): Just ignore BSF_DEBUGGING symbols.
+	From Antti.Miettinen@ntc.nokia.com.
+
+	* section.c (bfd_make_section_anyway): Fix failure check of
+	bfd_make_empty_symbol.  From Antti.Miettinen@ntc.nokia.com.
+
+	* aoutx.h (translate_to_native_sym_flags): Use the output_section
+	(and output_offset) if there is one.
+
+	* aoutx.h (aout_link_check_archive_element): Discard the symbols
+	if the archive element was not needed.
+
+	* aoutx.h (aout_get_external_symbols): Ensure that a zero string
+	index yields an empty string.
+	(aout_link_write_symbols): If info->keep_memory is false, use name
+	from original hash table entry, not from entry in *sym_hash.
+
+	* aoutx.h (struct aout_final_link_info): Add fields contents,
+	relocs, symbol_map and output_syms.
+	(NAME(aout,final_link)): Work out the largest section size, reloc
+	size, and number of symbols.  Use them to preallocate buffers that
+	are large enough for all cases.
+	(aout_link_input_bfd): Use preallocated symbol_map.
+	(aout_link_write_symbols): Remove symbol_map argument; use
+	preallocated symbol_map instead.  Change all callers.  Use
+	preallocated output_syms.
+	(aout_link_input_section): Remove symbol_map argument.  Change all
+	callers.  Use preallocated contents and relocs.
+	(aout_link_input_section_std): Remove symbol_map argument; use
+	preallocated symbol_map instead.  Change all callers.
+	(aout_link_input_section_ext): Likewise.
+
+Tue Aug 23 10:51:09 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* archive.c (_bfd_write_archive_contents): Don't update the
+	symbol map timestamp if there is no symbol map.  From
+	schwab@issan.informatik.uni-dortmund.de (Andreas Schwab).
+
+Mon Aug 22 12:26:42 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* targets.c (BFD_JUMP_TABLE_ARCHIVE): Add _update_armap_timestamp.
+	(bfd_target): Add field _bfd_update_armap_timestamp.
+	* bfd.c (bfd_update_armap_timestamp): Define.
+	* bfd-in2.h: Rebuilt.
+	* libbfd-in.h (_bfd_noarchive_update_armap_timestamp): Define.
+	(_bfd_archive_bsd_update_armap_timestamp): Declare.
+	(_bfd_archive_coff_update_armap_timestamp): Define.
+	* libbfd.h: Rebuilt.
+	* archive.c (_bfd_write_archive_contents): Call
+	bfd_update_armap_timestamp instead of checking for a BSD archive
+	and calling bsd_update_armap_timestamp.
+	(_bfd_archive_bsd_update_armap_timestamp): Rename from
+	_bsd_update_armap_timestamp.  Don't assume that armap_datepos is
+	already set.
+	* aout-target.h (MY_update_armap_timestamp): Define if not already
+	defined.
+	* coff-rs6000.c (rs6000coff_update_armap_timestamp): Define.
+	* ieee.c (ieee_update_armap_timestamp): Define.
+	* libecoff.h (_bfd_ecoff_update_armap_timestamp): Define.
+	* oasys.c (oasys_update_armap_timestamp): Define.
+	* som.c (som_update_armap_timestamp): Define.
+
+	* hash.c: Copy string hash functions from aoutx.h.
+	* aoutx.h: String hash functions moved to hash.c.  Retain
+	simplified versions of add_to_stringtab and emit_stringtab.
+	Change all callers to use new function and structure names.
+	* libbfd-in.h (_bfd_stringtab_init, _bfd_stringtab_free): Declare.
+	(_bfd_stringtab_size, _bfd_stringtab_add): Declare.
+	(_bfd_stringtab_emit): Declare.
+	* libbfd.h: Rebuilt.
+
+Mon Aug 22 10:49:37 1994  Eric Youngdale  (ericy@cais.cais.com)
+
+	* i386linux.c (linux_add_one_symbol): Create a fixup for any
+	defined absolute symbol, not just GOT or PLT symbols.
+	(linux_tally_symbols): Correct handling of references to defined
+	symbols.
+
+Thu Aug 18 16:29:57 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	Get ld -x -r to handle a.out set symbols correctly.
+	* aoutx.h (adjust_o_magic): If the .bss VMA was set outside of
+	BFD, pad the .data section up to the VMA of the .bss section.
+	(aout_link_add_symbols): If a set symbol does not get modified,
+	treat it as a local symbol.
+	(aout_link_write_symbols): Set the value of set symbols
+	correctly.  Don't discard set symbols even if discarding local
+	symbols.
+	(aout_link_write_other_symbol): Don't abort on bfd_link_hash_new,
+	since it can now happen for set symbols.
+
+	* elfcode.h (elf_fake_sections): Just check for ".rela" and
+	".rel", not ".rela." and ".rel."; make this work by checking
+	use_rela_p.
+	* elf32-i386.c (elf_i386_check_relocs): Just check for ".rel", not
+	".rel."
+	(elf_i386_size_dynamic_sections): Likewise.
+	(elf_i386_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_check_relocs): Just check for
+	".rela", not ".rela."
+	(elf32_sparc_size_dynamic_sections): Likewise.
+	(elf32_sparc_relocate_section): Likewise.
+
+Wed Aug 17 16:54:18 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* linker.c (_bfd_generic_link_add_archive_symbols): Initialize
+	PASS to the old value + 1.
+
+	* coffgen.c (coff_get_normalized_symtab): If a C_FILE symbol has
+	no aux entries, use the symbol name as the file name.
+	(coff_find_nearest_line): Look for the right C_FILE symbol, rather
+	than always using the first one.  If there is a debugging symbol
+	after a function symbol, skip it.  Add the section VMA to the line
+	offset, since it was subtracted out in coff_slurp_line_table.
+
+Tue Aug 16 16:53:00 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_prep_headers): If writing some form of an executable,
+	allocate and attach an exec header to the BFD private data.
+	(som_begin_writing): Don't fill fields of the exec header based
+	on BFD private data here (like the exec flags).  Do not write
+	the exec header here.
+	(som_write_headers): Instead do it here.
+	* som.h (struct somdata): New field "exec_hdr" for the executable
+	file header.
+	(obj_som_exec_hdr): New accessor macro.
+
+Tue Aug 16 00:12:31 1994  Eric Youngdale  (ericy@cais.cais.com)
+
+	* i386linux.c (linux_link_create_dynamic_sections): Create section
+	named .linux-dynamic, not .dynamic.
+	(linux_add_one_symbol): Use .linux-dynamic, not .dynamic.
+	(bfd_linux_size_dynamic_sections): Likewise.
+	(linux_finish_dynamic_link): Likewise.
+
+Mon Aug 15 12:16:56 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* coffgen.c (STRING_SIZE_SIZE): Define.
+	(coff_fix_symbol_name): Use STRING_SIZE_SIZE, not 4.
+	(coff_write_symbols, build_string_table): Likewise.
+	(coff_get_normalized_symtab): Likewise.
+
+	* libcoff-in.h (obj_symbol_slew): Don't define.
+	(struct coff_tdata): Remove unused fields index_slew, raw_linenos,
+	and flags.
+	* libcoff.h: Rebuilt.
+	* coffcode.h (coff_mkobject): Don't initialize raw_linenos.
+	(coff_mkobject_hook): Don't initialize flags.
+
+	* aout-target.h (MY_zmagic_contiguous): Define as 0 if not already
+	defined.
+	(MY(backend_data)): Use MY_zmagic_contiguous, not hardcoded 0.
+	* i386linux.c (MY_zmagic_contiguous): Define.
+
+	* elfcode.h (bfd_section_from_shdr): If a SHT_SYMTAB section in a
+	shared object has SHF_ALLOC set, create a BFD section for it.
+	(elf_section_from_bfd_section): There may be a BFD section for a
+	SHT_SYMTAB section.
+
+	* coffcode.h (styp_to_sec_flags): Add name argument.  If no flags
+	are recognized, chose section flags based on the name.
+	(bfd_coff_backend_data): _bfd_styp_to_sec_flags_hook field: Add
+	name argument.
+	(bfd_coff_styp_to_sec_flags_hook): Add name argument.
+	(coff_compute_section_file_positions): Don't adjust the section
+	position by COFF_PAGE_SIZE unless SEC_ALLOC is set.
+	* libcoff.h: Rebuilt.
+	* coffgen.c (make_a_section_from_file): Pass section name to
+	bfd_coff_styp_to_sec_flags_hook.
+	* ecoff.c (_bfd_ecoff_styp_to_sec_flags): Add unused name
+	argument.
+	* libecoff.h (_bfd_ecoff_styp_to_sec_flags): Add name argument to
+	prototype.
+
+Fri Aug 12 11:22:40 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* elfcode.h (section_from_elf_index): Correct check for invalid
+	section index.
+
+	* elfcode.h (elf_link_add_object_symbols): If there is no symbol
+	table, try using the dynamic symbol table.  From Eric Youngdale
+	<ericy@cais.cais.com>.
+
+	* configure.host (sparc-*-solaris2*): Use solaris2, not sysv4.
+	The linker depends upon configuring for solaris2.
+	* hosts/solaris2.h: New file; include hosts/sysv4.h.
+	* config/solaris2.mh: New file; copy of config/sysv4.mh.
+
+Wed Aug 10 13:09:38 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* aoutx.h (adjust_z_magic): Make sure data section is padded to
+	page boundary when the VMA is set by the calling program.  From
+	Eric Youngdale <ericy@cais.cais.com>.
+
+Mon Aug  8 17:18:49 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	Update to ns32k support, from Ian Dall (dall@hfrd.dsto.gov.au).
+	* aout-ns32k.c: Add declarations that were in aout-ns32k.h, change
+	declarations to traditional form.
+	(MY_reloc_howto, MY_put_reloc): Change from macro to function.
+	(ns32k_relocate_contents): New function.
+	* aout-ns32k.h: Remove.
+	* cpu-ns32k.c: Add declarations that were in aout-ns32k.h, change
+	declarations to traditional form.
+	(ns32k_final_link_relocate): Call ns32k_relocate_contents.
+	* netbsd532.c: Reformat to standards, add copyright notice.
+	(ARCH): Don't define.
+	(aout-ns32k.h): Don't include.
+	* pc532-mach.c: Ditto.
+
+Mon Aug  8 17:55:52 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* coff-i960.c (coff_i960_relocate): Don't try to convert relocs
+	against common symbols.
+
+Sat Aug  6 22:27:30 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* irix-core.c (irix_core_core_file_p):  Ignore sections that
+	are not contained in the core file.
+
+Thu Aug  4 11:32:23 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* coff-m68k.c (m68k_reloc_type_lookup): New function.
+	(coff_bfd_reloc_type_lookup): Define.
+	* cf-m68klynx.c (_bfd_m68kcoff_reloc_type_lookup): Define.
+
+	* elfcode.h (elf_bfd_final_link): Force the vma of sections which
+	do not have SEC_ALLOC set to be 0.  This is needed to handle
+	relocs against debugging sections.
+
+Wed Aug  3 16:45:41 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* coff-i960.c (coff_i960_relocate): Rewrote to change relocs
+	against locally defined symbols into relocs against section
+	symbols, for VxWorks 5.1.
+
+Wed Aug  3 10:34:37 1994  Eric Youngdale  (ericy@cais.cais.com)
+
+	* i386linux.c (linux_add_one_symbol): Only handle
+	SHARABLE_CONFLICTS specially if BSF_CONSTRUCTOR is set.  Set hashp
+	for a GOT or PLT symbol.  Set jump field of fixup for a PLT symbol.
+	(linux_tally_symbols): Check section of real symbol.  When looking
+	for a builtin fixup, check builtin and jump flags.  Create no more
+	than one fixup, and always create one if the real symbol is in the
+	absolute section.  Only strip absolute symbols.
+
+Wed Aug  3 05:08:24 1994  D. V. Henkel-Wallace  (gumby@cygnus.com)
+
+	* coffcode.h (coff_write_object_contents): set internal_a.magic to
+	LYNXCOFFMAGIC whenever 68k, SPARC or i386 LynxOS
+	(yes, they have the same magic number!)
+
+Tue Aug  2 10:43:21 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* hp300hpux.c (BMAGIC): Define as HPUX_DOT_O_MAGIC, to make test
+	in aoutx.h work correctly.
+
+	* coff-i960.c (coff_i960_relocate): New function.
+	(howto_rellong, howto_iprmed): Use it as special_function.
+
+	* libbfd-in.h: Move declarations of bfd_read, bfd_write, bfd_seek,
+	bfd_tell, bfd_flush, and bfd_stat from here...
+	* bfd-in.h: ...to here, to make them visible to programs which
+	know more about the object file format than BFD does.
+	* libbfd.h, bfd-in2.h: Rebuilt.
+
+Mon Aug  1 17:55:53 1994  Fred Fish  (fnf@cygnus.com)
+
+	* ptrace-core.c (ptrace_unix_core_file_p):  Convert zalloc usage
+	to bfd_zalloc.
+
+Mon Aug  1 12:04:40 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* elf64-sparc.c (ELF_MAXPAGESIZE): Define.
+
+	ELF linker patches from Eric Youngdale <ericy@cais.cais.com>.
+	* elfcode.h (elf_link_create_dynamic_sections): Set type of
+	_DYNAMIC to STT_OBJECT.
+	(NAME(bfd_elf,record_link_assignment)): Always create hash table
+	entry.  Set type to STT_OBJECT.
+	(elf_link_output_extsym): Don't set type of weak defined symbol to
+	STB_WEAK if symbol was referenced.
+	(map_program_segments): Check DYNAMIC as well as EXEC_P.
+	(assign_file_positions_except_relocs): Likewise.
+	* elf32-i386.c (elf_i386_create_dynamic_sections): Set type of
+	_GLOBAL_OFFSET_TABLE to STT_OBJECT.
+	(elf_i386_check_relocs): Ignore local PLT32 relocs.
+	(elf_i386_relocate_section): Treat local PLT32 relocs as PC32.
+
+	* elfcode.h (elf_adjust_dynamic_symbol): Correct weak symbol
+	handling again.
+
+	* elfcode.h (elf_slurp_reloc_table): Don't try to read the relocs
+	if there aren't any.
+
+	* configure.host (sparc-*-solaris2*): Use sysv4, not solaris2.
+	* hosts/solaris2.h: Remove.
+	* config/solaris2.mh: Remove.
+
+Sun Jul 31 14:27:04 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* elf32-hppa.c, elf32-hppa.h: Update comment reflecting which
+	HPPA ELF spec the code implements.
+
+Tue Jul 26 17:38:01 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* cpu-i960.c (MAX_ARCH): New macro.
+	(compatible): Use it in computing array bounds.  Put comma after
+	last entry in array, for regularity.
+	(arch_info_struct): Adjust spacing for easier reading.
+
+	* coff-i960.c (howto_rellong, howto_iprmed, howto_optcall): Use
+	HOWTO macro.
+
+	* cpu-i960.c (JX): Define as bfd_mach_i960_jx.
+	(scan_960_mach): Recognize jx machine.
+	(MAX_ARCH): Define to be JX.
+	(compatible): Add JX row to array.
+	(arch_info_struct): Add JX entry.
+
+	* archures.c (bfd_mach_i960_jx): New macro.
+	* bfd-in2.h: Regenerated.
+
+	* coffcode.h (coff_set_arch_mach_hook): For F_I960JX, set machine
+	to bfd_mach_i960_jx.
+	(coff_set_flags): For bfd_mach_i960_jx, set F_I960JX.
+
+Tue Jul 26 11:04:00 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* elfcode.h (elf_adjust_dynamic_symbol): When handling a weak
+	symbol, correct check to see whether the equivalent normal symbol
+	was referenced.
+
+	Add support for creating shared libraries under i386 ELF and SPARC
+	ELF.  Based on patches by Eric Youngdale <ericy@cais.cais.com>.
+	* libelf.h (struct elf_link_hash_entry): Remove copy_offset field.
+	Add got_offset and plt_offset fields.
+	(ELF_LINK_HASH_REF_DYNAMIC_MULTIPLE): Don't define.
+	(ELF_LINK_HASH_DEF_DYNAMIC_MULTIPLE): Don't define.
+	(ELF_LINK_HASH_NEEDS_COPY): Define.
+	(struct elf_backend_data): Add check_relocs field.
+	(struct bfd_elf_section_data): Change relocs from PTR to
+	Elf_Internal_Rela *.
+	(struct elf_obj_tdata): Add local_got_offsets field.
+	(elf_local_got_offsets): Define accessor macro.
+	(bfd_elf32_link_create_dynamic_sections): Declare.
+	(bfd_elf32_link_record_dynamic_symbol): Declare.
+	(bfd_elf64_link_create_dynamic_sections): Declare.
+	(bfd_elf64_link_record_dynamic_symbol): Declare.
+	* elfcode.h (elf_slurp_reloc_table): Don't use the section data
+	relocs field.
+	(elf_link_record_dynamic_symbol): Make globally visible.  Use
+	macro to rename to NAME(bfd_elf,link_record_dynamic_symbol).
+	(elf_link_add_object_symbols): If creating a shared library, put
+	make all local symbols dynamic.  Don't bother with the
+	DYNAMIC_MULTIPLE flags.  Call the check_relocs backend function if
+	it is defined.
+	(elf_link_create_dynamic_sections): Make globally visible.  Use
+	macro to rename to NAME(bfd_elf,link_create_dynamic_sections).  If
+	creating a shared library, make sure that _DYNAMIC is added as a
+	dynamic symbol.
+	(elf_link_read_relocs): New function.
+	(NAME(bfd_elf,record_link_assignment)): If creating a shared
+	library, always create symbols, and always make them dynamic.
+	(elf_bfd_final_link): Permit creation of shared libraries.
+	(elf_link_input_bfd): Use elf_link_read_relocs to get the relocs.
+	* elf.c (_bfd_elf_link_hash_newfunc): Don't initialize
+	copy_offset.  Initialize got_offset and plt_offset.
+	* elf32-target.h (elf_backend_check_relocs): Define as 0 if not
+	defined.
+	(elf32_bed): Initialize check_relocs field.
+	* elf64-target.h (elf_backend_check_relocs): Define as 0 if not
+	defined.
+	(elf64_bed): Initialize check_relocs field.
+	* elf32-i386.c (elf_howto_table): Change R_386_PLT32 and
+	R_386_GOTPC to be pc_relative and pcrel_offset.
+	(elf_i386_pic_plt0_entry): Define.
+	(elf_i386_pic_plt_entry): Define.
+	(elf_i386_create_dynamic_sections): Create a .got.plt section, and
+	define _GLOBAL_OFFSET_TABLE_ at the start of it.  If creating a
+	shared library, make sure that _GLOBAL_OFFSET_TABLE_ is added as a
+	dynamic symbol.  Don't create .rel.bss if creating a shared
+	library.
+	(elf_i386_check_relocs): New function.
+	(elf_i386_adjust_dynamic_symbol): Don't make a PLT entry if the
+	symbol already has one.  When making a PLT entry, set plt_offset.
+	Don't create a copy reloc when creating a shared library.  Don't
+	set copy_offset, just set ELF_LINK_HASH_NEEDS_COPY.
+	(elf_i386_allocate_dynamic_section): Remove.
+	(elf_i386_size_dynamic_sections): Look through all the sections
+	rather than assuming we know their names.  Remove any empty reloc
+	or plt sections.  Only add a DT_DEBUG entry if not creating a
+	shared library.  Only add a DT_PLTGOT entry if there is a PLT.
+	Add a DT_TEXTREL entry if required.
+	(elf_i386_relocate_section): Permit undefined symbols when
+	creating a shared library.  Handle the special relocation types
+	specially.
+	(elf_i386_finish_dynamic_symbol): Create a PLT entry if plt_offset
+	is set.  If creating a shared library, produce a PIC PLT entry.
+	Only mark a PLT symbol as undefined if it was not defined by a
+	regular object file.  Create a GOT entry if got_offset is set.
+	Create a copy reloc if ELF_LINK_HASH_NEEDS_COPY is set.
+	(elf_i386_finish_dynamic_sections): Change the handling of
+	DT_RELSZ to simply subtract out the size of .rel.plt.  If creating
+	a shared library, produce PIC PLT code.
+	(elf_backend_check_relocs): Define.
+	* elf32-sparc.c (elf_sparc_howto_table): Change R_SPARC_GOT10,
+	R_SPARC_GOT22, and R_SPARC_PC10 to not warn about reloc overflow.
+	(elf32_sparc_create_dynamic_sections): If creating a shared
+	library, make sure that _GLOBAL_OFFSET_TABLE_ is added as a
+        dynamic symbol, and set the type to STT_OBJECT.  Likewise for
+        _PROCEDURE_LINKAGE_TABLE_.  Don't create .rel.bss if creating a
+        shared library.
+	(elf32_sparc_check_relocs): New function.
+	(elf32_sparc_adjust_dynamic_symbol): Don't make a PLT entry if the
+	symbol already has one.  When making a PLT entry, set plt_offset.
+	Don't create a copy reloc when creating a shared library.  Don't
+	set copy_offset, just set ELF_LINK_HASH_NEEDS_COPY.
+	(elf32_sparc_allocate_dynamic_section): Remove.
+	(elf32_sparc_size_dynamic_sections): Look through all the sections
+	rather than assuming we know their names.  Only add a DT_DEBUG
+	entry if not creating a shared library.  Add a DT_TEXTREL entry if
+	required.
+	(elf32_sparc_relocate_section): Permit undefined symbols when
+	creating a shared library.  Handle the special relocation types
+	specially.
+	(elf32_sparc_finish_dynamic_symbol): Create a PLT entry if plt_offset
+	is set.  Only mark a PLT symbol as undefined if it was not defined
+	by a regular object file.  Create a GOT entry if got_offset is
+	set.  Create a copy reloc if ELF_LINK_HASH_NEEDS_COPY is set.
+	(elf32_sparc_finish_dynamic_sections): Store dynobj in a local
+	variable.
+	(elf_backend_check_relocs): Define.
+
+Mon Jul 25 12:21:07 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* configure.in (pc532mach_vec): Change to pc532machaout_vec.
+	* config.bfd (ns32k-*-netbsd*): Use ns32k-nbsd as bfd_name.
+	* Makefile.in (ALL_MACHINES): Add cpu-ns32k.o.
+	(BFD32_BACKENDS): Add aout-ns32k.o, netbsd532.o, m88kmach3.o,
+	pc532-mach.o.
+	* targets.c (pc532machaout_vec): Use instead of pc532mach_vec.
+	* config/pc532-mach.mt (DEFAULT_VECTOR): Ditto.
+	(SELECT_VECS): Remove.
+	* config/ns32k-nbsd.mt: New file, was ns32k-netbsd.mt.
+	* config/ns32k-netbsd.mt: Remove, name too long.
+
+Fri Jul 22 11:07:14 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* linker.c (generic_link_check_archive_element): When changing a
+	symbol to common, set the alignment.
+	(_bfd_generic_link_add_one_symbol): When creating a common symbol,
+	set the alignment.
+	* aoutx.h (aout_link_check_ar_symbols): When changing a symbol to
+	common, set the alignment.
+	(aout_link_add_symbols): Restrict the alignment of a common symbol
+	to the alignment power given by the architecture.
+	* libelf.h (struct elf_link_hash_entry): Remove align field.  Add
+	copy_offset field.
+	* elfcode.h (elf_link_add_object_symbols): Store alignment in
+	new bfd_link_hash_entry field, not in elf_link_hash_entry field.
+	(elf_link_output_extsym): Similar change when getting alignment.
+	* elf.c (_bfd_elf_link_hash_newfunc): Don't initialize align.  Do
+	initialize copy_offset.
+	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Use copy_offset
+	field rather than align field.  Get alignment using bfd_log2
+	rather than switch.
+	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Likewise.
+	* elf32-i386.c (elf_i386_finish_dynamic_symbol): Use copy_offset,
+	not align.
+	* elf32-sparc.c (elf32_sparc_finish_dynamic_symbol): Likewise.
+
+	* aoutx.h (NAME(aout,some_aout_object_p)): Just check
+	STAT_FOR_EXEC, don't check MACH.
+	* m88kmach3.c (MACH): Don't define.
+	* config/i386-mach3.mt (TDEFINES): Define STAT_FOR_EXEC.
+	* config/m88k-mach3.mt (TDEFINES): Likewise.
+	* config/mips-mach3.mt (TDEFINES): Likewise.
+
+Thu Jul 21 17:24:31 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* i386mach3.c: Reverted to version from before Jul 5 1994 changes.
+
+Thu Jul 21 12:26:01 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* reloc.c (struct reloc_howto_struct): Remove special_function1.
+	It's the wrong way to do things.
+	(HOWTO): Change accordingly.
+	(HOWTO2): Remove.
+	(_bfd_final_link_relocate): Remove references to
+	special_function1.
+	* bfd-in2.h: Rebuilt.
+	* aoutx.h (aout_link_input_section_std): Remove references to
+	special_function1.
+	(aout_link_reloc_link_order): Likewise.
+
+Wed Jul 20 15:46:44 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* elfcode.h (NAME(bfd_elf,size_dynamic_sections)): Add rpath
+	argument.  If it is not NULL, use it to set DT_RPATH.
+	* bfd-in.h (bfd_elf32_size_dynamic_sections): Update prototype.
+	(bfd_elf64_size_dynamic_sections): Likewise.
+	* bfd-in2.h: Rebuilt.
+
+Sat Jul 16 21:10:39 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* elfcode.h (elf_get_dynamic_symtab_upper_bound): If there is no
+	dynamic symtab, return error.
+
+	* libelf.h (ELF_LINK_HASH_DEFINED_WEAK): Define.
+	* elfcode.h (elf_link_add_object_symbols): If symbol is defined as
+	weak, set ELF_LINK_HASH_DEFINED_WEAK.
+	(elf_link_output_extsym): If symbol is defined as weak, mark it
+	STB_WEAK.
+
+	* libelf.h (struct bfd_elf_section_data): Add relocs field.
+	(shdr_name): Remove; unused.
+	* elfcode.h (elf_slurp_reloc_table): Rewrote to handle both REL
+	and RELA relocs.  Free up the unswapped relocs.  Permit the relocs
+	to be cached in the section_data.  Correct the reloc address.
+	(elf_slurp_reloca_table): Remove.
+	(elf_canonicalize_reloc): Rewrote.
+	(elf_link_input_bfd): Permit the relocs to be cached in the
+	section data.
+
+Sat Jul 16 13:55:38 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* config.bfd (m88*-harris-cxux*): Recognize.
+	* hosts/harris.h (POSIX_UTIME, HAVE_PROCFS): Define.
+
+	* configure.host (m68*-atari-sysv4*): New host.
+	(m68*-cbm-sysv4*): Use m68kv4 instead of amix.
+	* hosts/amix.h: Remove.
+	* hosts/m68kv4.h: New file, was amix.h.
+
+Thu Jul 14 15:12:24 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* reloc.c (enum bfd_reloc_code_real, bfd_type, struct
+	reloc_howto_struct, reloc_howto_type, HOWTO, HOWTO2): Copied
+	changes over from bfd-in2.h so they get generated properly next
+	time someone runs "make headers".
+	* bfd-in2.h: Rebuilt.
+
+	* targets.c (netbsd532_vec, pc532mach_vec): Declare const.
+	(m88kmach3_vec): Restore deleted declaration.
+
+	* configure.in: Alphabetize target vector names.
+
+	* config/pc532mach.mh: New file.
+	(HDEPFILES, HDEFINES): Define here.
+	* config/pc532-mach.mt (HDEPFILES, HDEFINES): Deleted.
+	* config/ns32k-netbsd.mt (HDEPFILES, HDEFINES): Deleted.
+
+	Sun Jul 10 00:04:20 1994  Ian Dall  (dall@hfrd.dsto.gov.au)
+
+	* pc532-mach.c: New File. pc532-mach a.out format.
+
+	* netbsd532.c: New file. pc532-netbsd532 a.out format.
+
+	* hosts/pc532mach.h: New file. pc532-mach host support.
+
+	* cpu-ns32k.c: New file. ns32k support cpu specific code rather
+	than format specific code.
+
+	* config/pc532-mach.mt: New file. Support for pc532-mach target.
+
+	* config/ns32k-netbsd.mt: New file. Support for netbsd532 target.
+
+	* aout-ns32k.c, aout-ns32k.h: New files supporting aout format for
+	ns32k series. 
+
+	* targets.c: Add netbsd532_vec and pc532machaout_vec into
+	bfd_target_vector array. Move netbsd386_vec to alphabetic order
+	location.
+
+	* reloc.c (_bfd_final_link_relocate) Add support for
+	special_function1 in howto.
+
+	* libaout.h: add M_NS32032, M_NS32532, M_532_NETBSD entries in
+	machine_type enum.
+
+	* configure.in: add pc532mach_vec and netbsd532_vec entries.
+
+	* config.bfd: add pc532mach host entries. Use for both
+	ns32k-pc532-mach and ns32k-pc532-netbsd.
+
+	* config.bfd: it doesn't work to use i386-mach3 for ns32k*-*-mach.
+	add ns32k-pc532-mach* and ns32k-*-netbsd* entries.
+
+	* bfd-in2.h: Add ns32k specific relocations to bfd_reloc_code_real
+	enum.
+
+	* bfd-in2.h: Add special_function1 to struct howto. Change HOWTO
+	and NEWHOWTO macros to make special_function1 NULL. Neww HOWTO2
+	macro.
+
+	* bfd-in2.h: Split definition of struct reloc_howto_struct
+	and corresponding typedef into two statements.
+
+	* bfd-in2.h: Add entry bfd_arch_ns32k to bfd_architecture enum.
+
+	* archures.c: Add bfd_ns32k_arch prototype, and entry in
+	archures_init_table. 
+
+	* aoutx.h (aout_link_reloc_link_order): Allow for target dependent
+	MY_put_reloc macro. Allow for target dependent special_function1
+	to apply the relocation. 
+
+	* aoutx.h (aout_link_input_section_std): Allow for target
+	dependent determination of reloc howto. Allow for target dependent
+	special_function1 to apply the relocation.
+
+	* aoutx.h (get_reloc_upper_bound): Detect bss and return 0.
+
+	* aoutx.h (slurp_reloc_table): Detect bss and succesfully read
+	zero reloc entries.
+
+	* aoutx.h (machine_type): Add bfd_arch_ns32k case.
+
+	* aoutx.h: Stat to determine executable status if STAT_FOR_EXEC
+	is defined (not just MACH). Use fstat instead of stat and check
+	for fstat error.
+
+	* aoutx.h: Allow target dependent swap_std_reloc_{in,out}.
+
+	* aoutx.h: Allow CTORS reloc info to be in target dependent reloc
+	table.
+
+	* aout-target.h: Apply SWAP_MAGIC (if defined) after
+	swap_exec_header_in, otherwise we have magic in the wrong order.
+
+Thu Jul 14 11:47:27 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* coff-sparc.c (sparccoff_vec): Have leading underscores.
+
+Tue Jul 12 12:08:10 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* aix386-core.c, aoutf1.h, cisco-core.c, elfcode.h, hppabsd-core.c,
+	hpux-core.c, irix-core.c, lynx-core.c, osf-core.c, ptrace-core.c,
+	rs6000-core.c, trad-core.c:  Remove SEC_ALLOC flag from .reg
+	sections, .reg sections are not allocated and contain debug
+	information only.
+	* osf-core.c (make_bfd_asection, osf_core_core_file_p):  Use
+	bfd_make_section_anyway instead of building unique section names.
+
+Tue Jul 12 11:41:22 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* libelf.h (bfd_elf32_swap_symbol_in): Declare.
+	(bfd_elf32_swap_symbol_out): Declare.
+	(bfd_elf64_swap_symbol_in, bfd_elf64_swap_symbol_out): Declare.
+	* elf32-hppa.c (elf32_hppa_args_hash_table_init): Correct cast.
+
+	* aout-encap.c (ARCH): Don't define.  Obsolete.
+	* aout0.c, aoutx.h, gen-aout.c, hp300bsd.c, hp300hpux.c: Likewise.
+	* i386aout.c, i386bsd.c, i386dynix.c, i386linux.c: Likewise.
+	* i386lynx.c, m68klynx.c, mipsbsd.c, netbsd386.c: Likewise.
+	* newsos3.c, sparclynx.c, sunos.c: Likewise.
+
+Mon Jul 11 20:08:23 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* section.c (STD_SECTION): Make the sixth argument boolean, not
+	the seventh.  From gary@tuva.pacsemi.oz.au (gary kopff).
+
+Sun Jul 10 09:12:02 1994  D. V. Henkel-Wallace  (gumby@cygnus.com)
+
+	* aoutx.h (bfd_free_cached_info): Change name of FREE to BFCI_FREE
+	in order not to collide with LynxOS's definition of FREE in
+	/usr/include/sys/proc.h
+
+Thu Jul  7 14:18:06 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* reloc.c (bfd_perform_relocation): Don't clobber the relocation
+	value for coff-Intel-little or coff-Intel-big.  Hack upon hack.
+
+Thu Jul  7 10:10:34 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* aoutx.h (howto_table_std):  Add entry for GOT relocations
+	which are present in sun3 shared libraries, to avoid assertions
+	when reading the dynamic relocations.
+
+Thu Jul  7 10:19:20 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.h (R_HPPA_COMPLEX): Fix dumb typo. 
+
+Wed Jul  6 19:21:57 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* hosts/sysv4.h (qsort, strtol): Don't declare.
+
+	* elfcode.h (elf_link_output_sym): Don't call output_symbol_hook
+	if it is NULL.
+
+	* elf32-mips.c (mips_elf_final_write_processing): Add ignored info
+	argument to correspond to recent libelf.h change.
+
+Wed Jul  6 00:48:57 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* coff-alpha.c (alpha_ecoff_mkobject_hook):  New hook to
+	additionally copy object type information from the alpha file
+	header to the BFD flags.
+	(alpha_ecoff_backend_data):  Use it.
+	(ecoffalpha_little_vec):  Add DYNAMIC to object_flags.
+	* aout64.c:  Fix typo in conditional QMAGIC definition.
+
+Wed Jul  6 00:13:17 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* hppabsd-core.c (hppabsd_core_core_file_p): Sanity check the
+	value of clicksz to help weed out non HPPA BSD core files.
+
+Tue Jul  5 13:26:02 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	Mach 3 support.
+	* config.bfd (m88*-*-mach3*, mips*-dec-mach3*, mips*-*-mach3*):
+	New targets.
+	* configure.host (i[34]86-*-mach3*, ns32k-*-mach3*): Recognize
+	"mach3" instead of "mach".
+	(m88*-*-mach3*, mips*-dec-mach3*, mips*-*-mach3*): New hosts.
+	* targets.c (m88kmach3_vec): New target vector.
+	(bfd_target_vector): Add i386mach3_vec and m88kmach3_vec, but
+	inside #if 0.
+	* aoutx.h (some_aout_object_p) [MACH]: Recognize executables by
+	checking for execute permission, instead of looking at entry
+	point.
+	* i386mach3.c: Update, define MACH, N_TXTOFF, N_TXTADDR,
+	N_SHARED_LIB, don't include aout/*.h files, etc.
+	* m88kmach3.c: New file, m88k Mach 3 target.
+	* config/m88k-mach3.mt,	config/mips-mach3.mt: New files, target
+	makefile fragments.
+	* config/i386mach3.mh, config/m88kmach3.mh, config/mipsmach3.mh:
+	New files, host	makefile fragments.
+	* hosts/m88kmach3.h, hosts/mipsmach3.h: New files, host definitions.
+
+Tue Jul  5 13:56:52 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* elfcode.h (swap_out_syms): Get alignment of common symbol from
+	st_value field of saved ELF symbol information, if there is any.
+
+Mon Jul  4 19:13:32 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.h (R_HPPA_COMPLEX): Define.
+	* elf32-hppa.h (R_HPPA_COMPLEX): Define.
+	(elf32_hppa_reloc_type): Delete R_PARISC_STUB_CALL_17.
+
+Fri Jul  1 12:07:41 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* Support code for enabling the new style linker for PA ELF.
+	* elfcode.h (swap_symbol_in, swap_symbol_out): Externalize.
+	(elf_compute_section_file_positions): Pass link_info to
+	the begin_write_processing hook.
+	(bfd_elf_write_object_contents): Pass NULL for new link_info
+	argument to final_write_processing hook.
+	(elf_link_output_sym): Accept new "input_section" argument for
+	the symbols's input section.  All callers changed.  Call the
+	link_output_symbol_hook if it's defined.
+	(elf_bfd_final_link): Call the final_write_processing hook if
+	it's defined.
+	* libelf.h (elf_backend_link_output_symbol_hook): Declare.
+	(elf_backend_begin_write_processing): Add new "info" argument.
+	(elf_backend_final_write_processing): Likewise.
+	* elf32-target.h (elf_backend_link_output_symbol_hook): Provide
+	a default definition.
+	(elf32_bed): Add elf_backend_link_output_symbol_hook.
+	* elf64-target.h: Likewise.
+	
+	* Major rework of the PA ELF code.  Uses the new style BFD
+	linker, major cleanups.
+	* hppa_stubs.h: Rewrite from scratch.  Much smaller and simpler.
+	* elf32-hppa.h: Delete all symbol extension related code.
+	(hppa_look_for_stubs_in_section): Delete decl.
+	(elf32_hppa_size_stubs, elf32_hppa_build_stubs): New decls.
+	* elf32-hppa.c: Symbol extension stuff moved form elf32-hppa.h
+	into elf32-hppa.c.  Do not include aout64.h.
+	(typdef hppa_stub_type): Delete.
+	(elf32_hppa_stub_name_list_struct): Delete.
+	(elf32_hppa_stub_description_struct): Delete.
+	(arg_reloc_type): Use simpler enumerations.  All references changed.
+	(arg_location, arg_reloc_relocation): Likewise.
+	(elf32_hppa_symextn_map_struct): Delete.
+	(get_symbol_value): Delete.
+	(elf32_hppa_get_sym_extn): Delete.
+	(find_stubs, new_stubs, type_of_mismatch): Delete.
+	(find_stub_by_name, add_stub_by_name): Delete.
+	(hppa_elf_stub_finish, hppa_elf_stub_reloc): Delete.
+	(hppa_elf_arg_reloc_needed): Renamed.  Simplify.
+	(hppa_elf_build_linker_stub, hppa_elf_create_stub_sec): Delete.
+	(hppa_elf_long_branch_needed_p): Delete.
+	(hppa_look_for_stubs_in_section): Delete.
+	(hppa_elf_get_section_contents): Delete.
+	(elf32_hppa_backend_symbol_processing): Delete.
+	(elf32_hppa_backend_section_processing): Delete.
+	(elf32_hppa_backend_section_from_shdr): Delete.
+	(elf32_hppa_backend_fake_sections): Delete.
+	(elf32_hppa_backend_section_from_bfd_section): Delete.
+	(NEW_INSTRUCTION): Delete.
+	(CURRENT_STUB_OFFSET): Delete.
+	(elf32_hppa_relocate_section): New function.
+	(elf32_hppa_bfd_final_link_relocate): New function.
+	(elf32_hppa_size_symext): New function.
+	(elf32_hppa_link_output_symbol_hook): New function.
+	(elf32_hppa_read_symext_info): New function.
+	(elf32_hppa_add_symbol_hook): New function.
+	(elf32_hppa_name_of_stub): New function.
+	(elf32_hppa_size_of_stub): New function.
+	(elf32_hppa_build_one_sub): New function.
+	(elf32_hppa_build_stubs): New function.
+	(elf32_hppa_size_stubs): New function.
+	(linker, stub and argument hash tables): Add appropriate
+	structures, definitions and functions to implement all three
+	hash tables.
+	(hppa_elf_relocate_insn): Don't need argument location information
+	in this function.
+	(add_entry_to_symext_chain): Accept a symbol's argument location
+	information rather than the symbol itself.  All callers changed.
+	(hppa_elf_gen_reloc_type): Simplify.
+	(hppa_elf_set_section_contents): Stub section is no longer special.
+	(hppa_elf_reloc): Greatly simplify.
+	(elf32_hppa_begin_write_processing): Accept link_info argument.
+	Handle being called from the BFD backend linker.
+	(elf32_hppa_final_write_processing): Likewise.
+	(elf_hppa_tc_make_sections): No longer call stub_finish.
+	
+Mon Jun 27 18:07:06 1994  Steve Chamberlain  (sac@cirdan.cygnus.com)
+
+	* section.c (bfd_get_section_contents): Put in parens to get
+	precedence right.
+
+Sun Jun 26 18:08:29 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* libelf.h (relocate_section): New argument "output_names" added
+	to prototype.
+	* elfcode.h (elf_link_input_bfd): New argument "output_names"
+	added to prototype of relocate_section.  Pass the output symbol
+	names to relocate_section.
+	* elf32-i386.c (elf_i386_relocate_section): Use "output_names" to
+	determine the name of a local symbol.
+	* elf32-mips.c (mips_elf_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+
+Fri Jun 24 08:15:42 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	Add Solaris BCP (the part of Solaris which allows it to run
+	SunOS4 a.out files) core file handling.
+	* aoutf1.h (external_solaris_bcp_core, swapcore_solaris_bcp):
+	New structure and its swap in function.
+	(internal_sunos_core):  New member c_data_addr, to receive the
+	start address of the data section in the core file.
+	(swapcore_sun3, swapcore_sparc, sunos4_core_file_p):  Use it.
+	(sunos4_core_file_p):  Recognize Solaris BCP core file.
+	(sunos4_core_file_matches_executable_p):  Always indicate match
+	for Solaris BCP core files.
+
+Thu Jun 23 15:31:28 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	Preliminary support for generating shared libraries, from Eric
+	Youngdale <ericy@cais.cais.com>.
+	* elfcode.h (prep_headers): If DYNAMIC, set e_type to ET_DYN.
+	(elf_link_add_object_symbols): If generating a shared library,
+	create dynamic sections for first input BFD with the right format.
+	(elf_link_create_dynamic_sections): Don't create .interp section
+	if creating a shared library.
+	(elf_link_input_bfd): Skip dynamic sections in input file.
+	(elf_bfd_final_link): If creating a shared library, it's OK for
+	dynobj to have sections which are not SEC_IN_MEMORY.
+	* elf32-i386.c (elf_i386_size_dynamic_sections): Only set .interp
+	section if not creating a shared library.
+	* elf32-sparc.c (elf_sparc_size_dynamic_sections): Likewise.
+
+	* elfcode.h (elf_object_p): Don't set DYNAMIC just because there
+	is an SHT_DYNAMIC section.
+
+	* cf-i386lynx.c (i386coff_vec): Don't include DYNAMIC in
+	object_flags.
+	* coff-sparc.c (sparccoff_vec): Likewise.
+	* hppabsd-core.c (hppabsd_core_vec): Likewise.
+
+	* aoutx.h (NAME(aout,some_aout_object_p)): Don't set SEC_RELOC
+	just because DYNAMIC is set.
+
+Thu Jun 23 12:53:41 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+	* configure.in: Change --with-targets to --enable-targets and
+	--with-64-bit-bfd to --enable-64-bit-bfd.
+	* Makefile.in, mpw-make.in, targets.c: Change comments.
+
+Wed Jun 22 17:59:59 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* config.bfd (powerpc-*-elf*): New target, just like
+	powerpc-*-sysv4*.
+
+	* linker.c (FAIL): Undefine macro before defining as enum.
+
+Wed Jun 22 10:52:47 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* linker.c (_bfd_generic_link_add_archive_symbols): Initialize
+	pass from abfd->archive_pass, and save it there as well.
+
+	* hash.c (bfd_hash_allocate): Don't call bfd_set_error if
+	obstack_alloc returns NULL unless the size is non-zero.
+
+	* linker.c (archive_hash_allocate): Define.
+	(_bfd_generic_link_add_archive_symbols): Use archive_hash_allocate
+	rather than obstack_alloc, for clarity.
+
+	* elfcode.h (elf_get_reloc_upper_bound): Correct.
+
+	* aout64.c (BMAGIC, QMAGIC): Define if not already defined.  From
+	Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
+
+	Linux ZMAGIC support from Eric Youngdale <ericy@cais.cais.com>.
+	* libaout.h (struct aoutdata): Add field zmagic_disk_block_size.
+	* aout-target.h (MY(callback)): Only set alignment according to
+	architecture if the section sizes are aligned to that alignment,
+	for backward compatibility.
+	(MY(set_sizes)): Initialize zmagic_disk_block_size field.
+	* aoutx.h (adjust_z_magic): Set ztih if using q_magic_format.  Set
+	text section filepos to zmagic_disk_block_size if not ztih.  Use a
+	different padding algorithm if not ztih.
+	* i386linux.c (MY_text_includes_header): Don't define.
+
+	* aoutx.h (aout_link_check_ar_symbols): Just skip N_STAB and N_FN
+        symbols; don't look them up in the hash table.  From
+        ralphc@pyramid.com (Ralph Campbell).
+
+Tue Jun 21 11:47:20 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* coff-go32.c (go32coff_archive_p): Remove unused function.
+
+	* section.c (bfd_abs_section): Make const.
+	(bfd_abs_section_ptr, bfd_is_abs_section): Define.
+	(bfd_und_section): Make const.
+	(bfd_und_section_ptr, bfd_is_und_section): Define.
+	(bfd_com_section): Make const.
+	(bfd_com_section_ptr): Define.
+	(bfd_ind_section): Make const.
+	(bfd_ind_section_ptr, bfd_is_ind_section): Define.
+	(bfd_abs_symbol, bfd_com_symbol): Make const.
+	(bfd_und_symbol, bfd_ind_symbol): Likewise.
+	(global_syms): Cast initialization of section field.
+	(STD_SECTION): Define as const, and cast initializations.
+	* bfd-in2.h: Rebuilt.
+	* Many files: Change uses of bfd_abs_section, etc., to use
+	bfd_abs_section_ptr or bfd_is_abs_section, etc.
+
+Mon Jun 20 11:06:27 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* Many files: change all bfd_target vectors to be const.  Change
+	all uses of bfd_target * to be const bfd_target *.  Change
+	bfd_target_vector and bfd_default_vector arrays to be const
+	bfd_target * const *.
+
+	* ecoff.c, libecoff.h, ecoffswap.h, coff-alpha.c, coff-mips.c,
+	elf32-mips.c: Renamed all externally visible ECOFF routines which
+	are local to BFD to start with _bfd_ecoff instead of just ecoff.
+
+	* ecoff.c (ecoff_swap_tir_in): Change input argument to const.
+	(ecoff_swap_tir_out): Likewise.
+	(ecoff_swap_rndx_in, ecoff_swap_rndx_out): Likewise.
+	(ecoff_slurp_symbolic_info): Add new arguments to correspond to
+	read_debug_info entry point in ecoff_debug_swap structure.
+	Change all calls.
+	* libecoff.h (ecoff_slurp_symbolic_info): Change declaration.
+	* ecoffswap.h (ecoff_swap_tir_in, ecoff_swap_tir_out): Declare.
+	(ecoff_swap_rndx_in, ecoff_swap_rndx_out): Declare.
+	* coff-alpha.c (alpha_ecoff_backend_data): Initialize new
+	ecoff_debug_swap fields.
+	* coff-mips.c (mips_ecoff_backend_data): Likewise.
+	* elf32-mips.c (mips_elf_read_ecoff_info): Undefine READ.
+	(mips_elf_ecoff_debug_swap): Initialize new ecoff_debug_swap
+	fields.
+	* configure.in (bfd_elf32_bigmips_vec): Use ecoff.o and
+	ecofflink.o.
+	(bfd_elf32_littlemips_vec): Likewise.
+	(ecoff_big_vec, ecoff_little_vec): Likewise.
+	(ecoffalpha_little_vec): Likewise.
+	* Makefile.in (BFD_LIBS): Remove ecoff.o and ecofflink.o.
+	(BFD32_BACKENDS): Add ecoff.o and ecofflink.o.
+
+	* aoutx.h (NAME(aout,final_link)): Check flavour of sub, not abfd,
+	when computing reloc sizes.  From Eric Youngdale
+	<ericy@cais.cais.com>.
+	* elfcode.h (elf_bfd_final_link): Don't try to compute maximum
+	reloc count or size for a non-ELF file.
+
+	* mipsbsd.c (MY_final_link_callback): Define to avoid warning.
+
+	* hp300hpux.c (MY_final_link_callback): Define to avoid warning.
+	(BMAGIC, QMAGIC): Define; used by aoutx.h.
+	(MY(slurp_symbol_table)): Change translate_from_native_sym_flags
+	calls to use new parameters.
+
+Fri Jun 17 14:45:32 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* aout-target.h (MY(callback)): Set the alignments of the text,
+	data and bss sections after determining the architecture.
+
+	* sunos.c (sunos_add_one_symbol): Treat a common symbol from a
+	dynamic object as being in the .bss section of the object, rather
+	than as being undefined.
+
+Fri Jun 17 11:16:50 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* libhppa.h (bfd_hppa_insn2fmt, hppa_rebuild_insn): Make INLINE.
+
+	* elf32-hppa.h (elf_hppa_final_processing): Delete decl.
+
+Thu Jun 16 23:36:23 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* elfcode.h (elf_link_input_bfd): Don't try to read local symbols
+	if there aren't any in the input file.
+
+Thu Jun 16 14:25:22 1994  Eric Youngdale  (ericy@cais.cais.com)
+
+	* i386linux.c: Many new functions and definitions for linker
+	support for Linux shared libraries.
+	* bfd-in.h (bfd_linux_size_dynamic_sections): Declare.
+	* bfd-in2.h: Rebuild.
+
+Thu Jun 16 14:23:46 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* config.bfd: If second argument is ``_'', then, instead of
+	echoing config file name, echo whether target uses leading
+	underscores on symbol names.  Add appropriate settings to
+	different cases.  Used by binutils/configure.in to set default for
+	c++filt.
+
+	* elfcode.h (elf_bfd_final_link): If trying to generate a shared
+	object, warn and return false.
+
+	* aoutx.h (NAME(aout,some_aout_object_p)): Accept BMAGIC objects
+	and treat them as OMAGIC.
+
+Wed Jun 15 18:02:21 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	Enable sparc v9 support for release.  Note that this is still a
+	work in progress, pending release of an ABI specification.
+	* config.bfd, configure.in: Include sparc v9 elf config.
+	* elfcode.h (prep_headers): Handle sparc v9 (64 bit).
+	* reloc.c (bfd_reloc_code_real): New reloc types.
+	* elf64-sparc.c: Implement elf64-sparc target.
+	* Makefile.in, targets.c: Updated.
+
+Wed Jun 15 01:34:07 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* libelf.h (struct elf_obj_tdata): New field dt_needed_name.
+	(elf_dt_needed_name): New accessor macro.
+	* elfcode.h (elf_link_add_object_symbols): If elf_dt_needed_name
+	is set, use that instead of the filename for the DT_NEEDED dynamic
+	entry.
+	* elf.c (bfd_elf_set_dt_needed_name): New function.
+	* bfd-in.h (bfd_elf_set_dt_needed_name): Declare.
+	* bfd-in2.h: Rebuilt.
+
+	* elfcode.h (NAME(bfd_elf,size_dynamic_sections)): Add sinterpptr
+	argument, and set it to the .interp section.
+	* bfd-in.h (bfd_elf32_size_dynamic_sections): Update prototype.
+	(bfd_elf64_size_dynamic_sections): Likewise.
+	* bfd-in2.h: Rebuilt.
+
+	* coff-sparc.c (SWAP_OUT_RELOC_EXTRA): Define to clear the r_spare
+	field of the reloc rather than letting it be garbage.
+
+	* archive.c (bfd_slurp_armap): Recognize __.SYMDEF/ as well as
+	__.SYMDEF; the former was used in old Linux archives.  From
+	jrs@world.std.com (Rick Sladkey).
+
+	* i386linux.c (i386linux_write_object_contents): Define; like
+	MY(write_object_contents) in aout-target.h, but set MACHTYPE to
+	M_386.  From jrs@world.std.com (Rick Sladkey).
+	(MY_write_object_contents): Define.
+
+	* aoutx.h (translate_from_native_sym_flags): Treat N_SETV symbols
+	as N_DATA symbols.
+	(aout_link_add_symbols): Likewise.
+
+	* aoutx.h: Rewrite symbol duplicate elimination to use BFD hash
+	tables.
+	(struct stringtab_entry, struct stringtab_data): Remove.
+	(HASHMAXLEN, HASH_CHAR, hash, compare, log2, emit_strtab): Remove.
+	(struct strtab_hash_entry, struct strtab_hash): Define.
+	(strtab_hash_newfunc, strtab_hash_lookup): Define.
+	(stringtab_free, emit_stringtab): Define.
+	(stringtab_init, add_to_stringtab): Rewrite.
+	(NAME(aout,write_syms)): Use new stringtab code.
+	(struct aout_final_link_info, NAME(aout,final_link)): Likewise.
+	(aout_link_write_symbols, aout_link_write_other_symbol): Likewise.
+
+	* bfd-in.h (BFD_TRADITIONAL_FORMAT): Define new BFD flag to
+	request BFD to write object in the traditional format, whatever
+	that means for the particular backend.
+	* bfd-in2.h: Rebuilt.
+
+	* hash.c (bfd_hash_allocate): If obstack_alloc fails, set
+	bfd_error_no_memory.
+
+Tue Jun 14 13:00:04 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* libaout.h (struct aoutdata): Add q_magic_format to subformat
+	enum.
+	* aout-target.h (MY_bfd_copy_private_bfd_data): Define as function
+	if not already defined.  Copy subformat information.
+	(MY_text_includes_header): Define as 0 if not already defined.
+	(MY(backend_data)): Use MY_text_includes_header rather than 0.
+	(MY_final_link_callback): Rename from final_link_callback, and
+	define only if MY_final_link_callback is not already defined.
+	(MY_bfd_final_link): Rename use of final_link_callback to
+	MY_final_link_callback.
+	* aoutx.h (NAME(aout,some_aout_object_p)): Handle QMAGIC like
+	ZMAGIC, but set the subformat to q_magic_format.  Abort if the
+	magic number if not recognized.
+	(adjust_z_magic): Use QMAGIC if q_magic_format.
+	* i386linux.c (MY_text_includes_header): Define as 1.
+	(i386linux_bfd_final_link): New static function.
+	(MY_bfd_final_link): Define as i386linux_bfd_final_link.
+
+	* aoutx.h (translate_to_native_sym_flags): Check both section and
+	output_section against sections of abfd.
+
+	* libecoff.h (struct ecoff_link_hash_entry): Change type of
+	written from boolean to char.  Add new field small.
+	* ecoff.c (ecoff_link_hash_newfunc): Initialize written to 0
+	rather than false.  Initialize small to 0.
+	(ecoff_link_add_externals): If ECOFF type is scSUndefined, set
+	small.  If small is set, and hash table type is common, force the
+	symbol into a section named SCOMMON and change the ECOFF type from
+	scCommon to scSCommon.
+	(ecoff_link_write_external): Set written to 1 rather than true.
+	* coff-mips.c (mips_relocate_section): Correct JMPADDR reloc
+	overflow check to consider section VMA of input file.
+
+Mon Jun 13 14:20:07 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* aoutf1.h (aout_32_sunos4_write_object_contents): Handle a
+	machine type of 68000.
+	* aoutx.h (NAME(aout,machine_type)): Add new argument unknown.
+	Set *unknown to true if machine type is really unknown, as opposed
+	to M_UNKNOWN for the 68000.
+	(NAME(aout,set_arch_mach)): Change NAME(aout,machine_type) call
+	accordingly.
+	* libaout.h (NAME(aout,machine_type)): Add new argument to
+	prototype.
+
+Sun Jun 12 20:21:03 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (EXEC_AUX_ID): Define based on availablity of HPUX_AUX_ID
+	or HIUX_AUX_ID.
+	(som_begin_writing): Use EXEC_AUX_ID instead of HPUX_AUX_ID.
+	(som_write_armap): Use CPU_PA_RISC1_0 as the magic number.  Note
+	som.c is careful to always define CPU_PA_RISC1_0.
+
+Sat Jun 11 16:32:30 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Add weak symbols as an extension to a.out.
+	* aoutx.h (sym_in_text_section): Don't define.
+	(sym_in_data_section, sym_in_bss_section): Likewise.
+	(sym_is_undefined, sym_is_global_defn): Likewise.
+	(sym_is_debugger_info, sym_is_fortrancommon): Likewise.
+	(sym_is_absolute, sym_is_indirect): Likewise.
+	(translate_from_native_sym_flags): Rewrite for clarity.  Rearrange
+	arguments and change caller.  Handle weak symbols.
+	(translate_to_native_sym_flags): Likewise.
+	(aout_link_check_ar_symbols): Don't ignore weak symbols.  Pull
+	object in from archive if a weak defintion is found for an
+	existing undefined symbol.
+	(aout_link_add_symbols): Put all cases in switch.  Set flags of an
+	undefined symbol to 0.  Handle weak symbols.
+	(aout_link_write_symbols): Handle weak symbols.
+	(aout_link_write_other_symbol): Likewise.
+	(aout_link_input_section_std): Likewise.
+	(aout_link_input_section_ext): Likewise.
+	* sunos.c (sunos_write_dynamic_symbol): Likewise.
+
+Fri Jun 10 13:25:13 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* aoutx.h (NAME(aout,canonicalize_reloc)): Handle .bss section.
+	(NAME(aout,get_reloc_upper_bound)): Likewise.
+
+	* coff-i960.c (coff_i960_reloc_type_lookup): Add BFD_RELOC_CTOR.
+	* linker.c (_bfd_generic_link_write_global_symbol): Don't assume
+	the section of a common symbol is not NULL.
+
+Wed Jun  8 23:15:53 1994  Stu Grossman  (grossman@cygnus.com)
+
+	* nlmcode.h (nlm_object_p):  Set EXEC_P and start address for GDB.
+
+Wed Jun  8 23:57:34 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* aoutx.h (aout_get_external_symbols): Don't try to read the
+	strings if there are no symbols.
+	(aout_link_write_other_symbol): Use the output section when
+	working out the type.
+
+Tue Jun  7 13:25:08 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elfcode.h (assign_section_numbers): Put shstrtab, symtab and
+	strtab sections at end of file.  Avoids bug in some versions of
+	SVR4 strip.  From Eric Youngdale <eric@tantalus.nrl.navy.mil>.
+
+	* coffcode.h (styp_to_sec_flags): If COFF_PAGE_SIZE is defined,
+	set SEC_DEBUGGING for STYP_INFO sections.
+	(coff_compute_section_file_positions): If COFF_PAGE_SIZE is
+	defined, and D_PAGED is set, set the file position equal to the
+	section VMA modulo COFF_PAGE_SIZE.
+	* coffgen.c (coff_real_object_p): If F_EXEC is set, set D_PAGED.
+	* coff-i386.c: Set D_PAGED in BFD target.
+	(COFF_PAGE_SIZE): Define.
+	* coff-m68k.c, coff-sparc.c: Likewise.
+
+Mon Jun  6 10:57:28 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elfcode.h (bfd_section_from_shdr): Don't turn a reloc section
+	into a BFD section just because SHF_ALLOC is set; require that it
+	not use the normal symbol table.
+	(elf_section_from_bfd_section): Corresponding change.
+
+	Better indirect and warning symbol handling inspired by Stuart
+	Quick <stuck@cs.man.ac.uk>.
+	* linker.c (enum link_action): Add REF, MIND, CWARN, REFC.
+	(link_action): Change UNDEF_ROW/def and UNDEFW_ROW/def from NOACT
+	to REF.  Change UNDEF_ROW/indr and UNDEFW_ROW/indr from CYCLE to
+	REFC.  Change DEF_ROW/indr and COMMON_ROW/indr from CYCLE to MDEF.
+	Change DEFW_ROW/indr from CYCLE to NOACT.  Change INDR_ROW/indr
+	from MDEF to MIND.  Change INDR_ROW/warn from WARNC to CYCLE.
+	Change WARN_ROW/def and WARN_ROW/indr from MWARN to CWARN.  Change
+	WARN_ROW/com from MWARN to WARN.  Change WARN_ROW/warn from NOACT
+	to CYCLE.  Change SET_ROW/warn from WARNC to CYCLE>
+	(_bfd_generic_link_add_one_symbol): Handle REF, MIND, CWARN and
+	REFC.  If a new indirect symbol has been referenced, push the
+	reference down to the symbol it points to.  FIx handling of WARN.
+	* aoutx.h (translate_from_native_sym_flags): If N_WARNING, don't
+	clobber e_type of next symbol.
+	(translate_to_native_sym_flags): Likewise.
+	(aout_link_write_symbols): Loop on bfd_link_hash_warning as well
+	as bfd_link_hash_indirect.
+
+	* libaout.h (struct aout_link_hash_entry): New field written.
+	* aoutx.h (NAME(aout,link_hash_newfunc)): Initialize written.
+	(aout_link_write_symbols): Use written, not root.written.
+	(aout_link_write_other_symbol): Likewise.
+	* sunos.c (sunos_scan_dynamic_symbol): Likewise.
+	* libecoff.h (struct ecoff_link_hash_entry): New field written.
+	* ecoff.c (ecoff_link_hash_newfunc): Initialize written.
+	(ecoff_link_write_external): use written, not root.written.
+	* genlink.h (struct generic_link_hash_entry): New field written.
+	* linker.c (_bfd_link_hash_newfunc): Don't initialize written.
+	(generic_link_hash_newfunc): Initialize written.
+	(_bfd_generic_link_output_symbols): Use written, not root.written.
+	(_bfd_generic_link_write_global_symbol): Likewise.
+	(_bfd_generic_reloc_link_order): Likewise.
+
+	* libecoff.h (ecoff_data_type): Add linker field.
+	* ecoff.c (ecoff_write_object_contents): Check new tdata linker
+	field, rather than outsymbols being non-NULL, to decide whether to
+	output the symbols and relocs.
+	(ecoff_bfd_final_link): Set new tdata linker field to true.
+
+	* ecoff.c (ecoff_bfd_copy_private_bfd_data): Don't try to copy
+	data to a non-ECOFF file.
+
+	* libbfd-in.h: Add warning that libbfd.h is a generated file.
+	* libbfd.h: Rebuilt.
+
+Sun Jun  5 15:02:30 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Changes to support ELF strip and objcopy on dynamically linked
+	files.
+	* elfcode.h (elf_fake_sections): Add prototype.
+	(bfd_section_from_shdr): Make a BFD section from an SHT_HASH
+	section, and from an SHT_DYNSYM section, and from the dynamic
+	string table section.
+	(elf_object_p): Set D_PAGED if there is a program header.
+	(elf_make_sections): Remove.
+	(fix_up_strtabs): Remove.
+	(elf_fake_sections): Rewrite.  Now sets sh_entsize.
+	(assign_section_numbers): Rewrite.  Now sets sh_link and sh_info
+	for all sections.
+	(elf_compute_section_file_positions):  Don't call obsolete
+	functions elf_make_sections or fix_up_strtabs.
+	(swap_out_syms): Set sh_addralign to FILE_ALIGN rather than 4.
+	(NAME(bfd_elf,write_object_contents)): Permit writing DYNAMIC
+	objects.
+	(elf_section_from_bfd_section): Treat SHT_DYNSYM like other normal
+	sections.  If an SHT_REL or SHT_RELA section is allocated or uses
+	an unusual symbol table, permit a BFD section to map to it.
+	Permit most SHT_STRTAB sections to have a BFD section mapped to
+	them.
+	(elf_bfd_final_link): Don't set sh_link, sh_info or sh_entsize
+	fields of dynamic sections here; do it in assign_section_numbers.
+	* elf32-target.h, elf64-target.h: Add D_PAGED to permitted object
+	flags.
+
+	* elf.c (_bfd_elf_make_section_from_shdr): Only set SEC_DATA if
+	SEC_LOAD is set, rather than checking SEC_ALLOC.
+
+	* libbfd-in.h (bfd_realloc): Change last arg to "size_t size".
+
+Fri Jun  3 10:58:02 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_write_object_contents): Don't compute the file header's
+	checksum here.
+	(som_write_headers): Instead do it here.
+
+	* libbfd.h (bfd_realloc): Change last arg to "size_t size".
+
+Thu Jun  2 17:39:22 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* hosts/sun3.h: Include <stdlib.h>.  Don't declare free, exit or
+	getenv.
+
+	Add linker support for SunOS shared libraries.
+	* sunos.c: Include bfdlink.h.  Add many new functions and
+	definitions for SunOS shared library support.
+	* bfd-in.h (bfd_sunos_record_link_assignment): Declare.
+	(bfd_sunos_size_dynamic_sections): Declare.
+	* bfd-in2.h: Rebuilt.
+	* aoutx.h (struct aout_link_hash_entry): Move to libaout.h.
+	(struct aout_link_hash_table): Likewise.
+	(aout_link_hash_lookup, aout_link_hash_traverse): Likewise.
+	(aout_hash_table): Likewise.
+	(NAME(aout,link_hash_newfunc)): Rename from aout_link_hash_newfunc
+	and make externally visible.
+	(NAME(aout,link_hash_table_init)): New function.
+	(NAME(aout,link_hash_table_create)): Call
+	NAME(aout,link_hash_table_init), not _bfd_link_hash_table_init.
+	(aout_link_add_symbols): Don't fail if no symbols.  If it exists,
+	call add_dynamic_symbols backend entry point for dynamic objects.
+	Use add_one_symbol backend entry point if it exists.
+	(NAME(aout,final_link)): Call finish_dynamic_link backend entry
+	point, if it exists.
+	(aout_link_input_bfd): For a dynamic object, call
+	link_dynamic_object backend entry point, if it exists.
+	(aout_link_write_other_symbol): Call write_dynamic_symbol backend
+	entry point, if it exists.
+	(aout_link_input_section): Don't read the relocs if they have
+	already been read.
+	(aout_link_input_section_std): When doing a final link, for a
+	reloc against an external symbol, call check_dynamic_reloc backend
+	entry point, if it exists.
+	(aout_link_input_section_ext): Likewise.
+	* libaout.h: Protect against multiple inclusion.  Include
+	bfdlink.h.
+	(struct aout_link_hash_entry): Move in from aoutx.h.
+	(struct aout_link_hash_table): Likewise.
+	(aout_link_hash_lookup, aout_link_hash_traverse): Likewise.
+	(aout_hash_table): Likewise.
+	(struct aout_backend_data): Add fields add_dynamic_symbols,
+	add_one_symbol, link_dynamic_object, write_dynamic_symbol,
+	check_dynamic_reloc, and finish_dynamic_link.
+	(struct aout_section_data_struct): Define new structure.
+	(aout_section_data): Define new accessor macro.
+	(NAME(aout,link_hash_newfunc)): Declare.
+	(NAME(aout,link_hash_table_init)): Declare.
+	* aoutf1.h (sunos4_aout_backend): Initialize new aout_backend_data
+	fields.
+	* aout-target.h (MY(backend_data)): Likewise.
+	* i386aout.c (MY(backend_data)): Likewise.
+	* i386mach3.c (MY(backend_data)): Likewise.
+	* mipsbsd.c (MY(backend_data)): Likewise.
+	* sparclynx.c (sparclynx_aout_backend): Likewise.
+
+	* aoutx.h (NAME(aout,slurp_symbol_table)): Don't zero out cached
+	until we know it is non-NULL.
+	(aout_link_write_symbols): Don't skip a warning symbol even if it
+	has already been written out.  If skipping an indirect symbol,
+	skip the next symbol as well.
+
+Wed Jun  1 14:37:50 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* hosts/sun3.h: Don't declare qsort, malloc or realloc.
+
+Thu May 26 13:56:03 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* nlmcode.h (nlm_swap_auxiliary_headers_in): Cast bfd_byte pointer
+	to char pointer to avoid compiler warnings.
+
+	* dep-in.sed: Remove spaces before colons.
+
+	Merged changes back in from FSF gas release 2.3:
+
+	* Makefile.in (stmp-bfd.h): Wrap `if' block around grep
+	invocation, to avoid a bug in BSD 4.4 make.
+
+	From Ralph Campbell:
+	* mipsbsd.c (mips_fix_jmp_addr): If symbol is undefined, return an
+	error.
+	(mips_fix_hi16_s): Ditto.
+
+	Fri May 13 21:21:00 1994  DJ Delorie (dj@ctron.com)
+
+	* makefile.dos: define a default target, or archives won't work
+	  due to multiple matches.
+
+	Wed May 11 22:32:00 1994  DJ Delorie (dj@ctron.com)
+
+	* configure.bat: update for latest files
+	* makefile.dos: update for correct targets and sources
+	* coff-go32.c: [new] go32's COFF format (i386coff with underscores)
+	* targets.c: add go32coff target
+	* makefile.in: add coff-go32.c support
+
+Thu May 26 10:10:21 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_prep_headers): Do not set the system_id here, private
+	bfd data has not been copied yet.
+	(som_write_headers): Instead do it here.
+
+Tue May 24 16:17:18 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Make MIPS ELF use new ELF backend linker.  No shared library
+	support yet.
+	* elf32-mips.c (bfd_mips_elf32_swap_gptab_in): New function.
+	(bfd_mips_elf32_swap_gptab_out): New function.
+	(mips_elf_object_p): If last symbol is LOCAL, set elf_bad_symtab.
+	(mips_elf_final_write_processing): Set sh_info field for .gptab.*
+	sections.
+	(mips_elf_fake_sections): Set sh_entsize for .gptab.* sections.
+	(mips_elf_read_ecoff_info): Read and free external symbols last,
+	not first, for clarity.
+	(struct mips_elf_link_hash_entry): Define new structure.
+	(struct mips_elf_link_hash_table): Define new structure.
+	(mips_elf_link_hash_lookup): Define new macro.
+	(mips_elf_link_hash_traverse): Define new macro.
+	(mips_elf_hash_table): Define new macro.
+	(mips_elf_link_hash_newfunc): New static function.
+	(mips_elf_link_hash_table_create): New static function.
+	(mips_elf_add_symbol_hook): New static function.
+	(struct extsym_info): Define new structure.
+	(mips_elf_get_extr, mips_elf_set_index): Remove.
+	(mips_elf_output_extsym): New static function.
+	(gptab_compare): New static function.
+	(mips_elf_final_link): Rewrite to use ELF backend linker, and to
+	merge gptab information in input files.
+	(mips_elf_relocate_hi16): New static function.
+	(mips_elf_relocate_section): New static function.
+	(bfd_elf32_bfd_link_hash_table_create): Define as macro before
+	including elf32-target.h.
+	(elf_backend_relocate_section): Likewise.
+	(elf_backend_add_symbol_hook): Likewise.
+	* elf.c (_bfd_elf_link_hash_newfunc): Rename from
+	elf_link_hash_newfunc and make globally visible.  Change caller.
+	(_bfd_elf_link_hash_table_init): New function, broken out of
+	_bfd_elf_link_hash_table_create.
+	(_bfd_elf_link_hash_table_create): Use
+	_bfd_elf_link_hash_table_init.
+	* libelf.h (struct elf_obj_tdata): Add new field bad_symtab.
+	(elf_bad_symtab): Define new accessor macro.
+	(_bfd_elf_link_hash_newfunc): Declare.
+	(_bfd_elf_link_hash_table_init): Declare.
+	* elfcode.h (elf_object_p): Call backend object_p hook after
+	swapping in all the section headers.
+	(map_program_segments): Correct typo: Internal for External.
+	(elf_link_add_object_symbols): If elf_bad_symtab is set, read all
+	the symbols.  Skip STB_LOCAL symbols rather than giving an error.
+	(elf_bfd_final_link): If elf_bad_symtab is set, allocate space for
+	all symbols, not just locals.
+	(elf_link_output_extsym): Only skip a symbol not mentioned by a
+	regular file if it is mentioned by a dynamic object.
+	(elf_link_input_bfd): If elf_bad_symtab is set, read all the
+	symbols.
+
+Fri May 20 13:38:23 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_set_reloc_info): Do not set any relocation info
+	for SOM fixups which are never passed to BFD.
+
+Fri May 20 11:57:05 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* coff-mips.c (mips_relocate_section): Add MIPS_R_JMPADDR overflow
+	checking.
+
+	* elf32-i386.c (elf_i386_size_dynamic_sections): Add DT_DEBUG to
+	the dynamic linking information for the benefit of the debugger.
+	From Peter Schauer.
+	* elf32-sparc.c (elf32_sparc_size_dynamic_sections): Likewise.
+
+	* elf.c (_bfd_elf_make_section_from_shdr): New function, based on
+	code repeated three times in bfd_section_from_shdr in elfcode.h.
+	* libelf.h (_bfd_elf_make_section_from_shdr): Declare.
+	* elfcode.h (bfd_section_from_shdr): Use new function
+	_bfd_elf_make_section_from_shdr to create BFD sections.  If a
+	reloc section does not use the main symbol table, or it is part of
+	the process image, treat it as a normal section, not relocs.
+	* elf32-mips.c (mips_elf_section_from_shdr): Use new function
+	_bfd_elf_make_section_from_shdr.
+
+Thu May 19 11:37:11 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elf32-target.h, elf64-target.h: Change ar_max_namelen value from
+	15 to 14 to match SVR4 ar.
+
+	Add support for ELF shared libraries.  Loosely based on work by
+	Eric Youngdale <ericy@cais.com>.
+	* libelf.h (struct elf_backend_data): Add new fields for dynamic
+	linking: elf_backend_create_dynamic_sections,
+	elf_backend_adjust_dynamic_symbol,
+	elf_backend_size_dynamic_sections,
+	elf_backend_finish_dynamic_symbol,
+	elf_backend_finish_dynamic_sections.
+	(struct elf_link_hash_entry): Change type of align field to
+	bfd_size_type.  Add fields dynindx, dynstr_index, weakdef,
+	elf_link_hash_flags.
+	(struct elf_link_hash_table): Add fields dynobj, dynsymcount,
+	dynstr, bucketcount.
+	(bfd_elf32_swap_reloc_in, bfd_elf32_swap_reloc_out): Declare.
+	(bfd_elf32_swap_reloca_in, bfd_elf32_swap_reloca_out): Declare.
+	(bfd_elf32_swap_dyn_in, bfd_elf32_swap_dyn_out): Declare.
+	(bfd_elf32_add_dynamic_entry): Declare.
+	(bfd_elf64_swap_reloc_in, bfd_elf64_swap_reloc_out): Declare.
+	(bfd_elf64_swap_reloca_in, bfd_elf64_swap_reloca_out): Declare.
+	(bfd_elf64_swap_dyn_in, bfd_elf64_swap_dyn_out): Declare.
+	(bfd_elf64_add_dynamic_entry): Declare.
+	* elfcode.h (Elf_External_Dyn): Define.
+	(elf_swap_reloc_in): Define as macro using NAME.  Make externally
+	visible.
+	(elf_swap_reloc_out): Likewise.
+	(elf_swap_reloca_in, elf_swap_reloca_out): Likewise.
+	(elf_swap_dyn_in, elf_swap_dyn_out): Define as macro using NAME
+	and as new externally visible function.
+	(elf_fake_sections): Set section type of dynamic sections based on
+	section names.
+	(elf_write_phdrs): Remove.
+	(assign_file_position_for_section): Add new align argument.
+	Change all callers.
+	(get_program_header_size): New static function.
+	(struct seg_info): Remove.
+	(map_program_segments): Completely rewrite.
+	(assign_file_positions_except_relocs): Completely rewrite.
+	(assign_file_positions_for_relocs): Don't set a file position for
+	sections which already have one.  Don't bother to align the file
+	position here.
+	(section_from_elf_index): Handle SHT_HASH and SHT_DYNAMIC
+	section types.
+	(elf_section_from_bfd_section): Likewise.
+	(elf_slurp_symbol_table): If section_from_elf_index fails, just
+	use bfd_abs_section rather than returning an error.
+	(elf_sizeof_headers): Make useful.
+	(elf_link_record_dynamic_symbol): New static function.
+	(elf_link_add_object_symbols): Handle dynamic objects.
+	(elf_link_create_dynamic_sections): New static function.
+	(elf_add_dynamic_entry): Define as macro using NAME and as new
+	externally visible function.
+	(NAME(bfd_elf,record_link_assignment)): New function.
+	(elf_buckets): New static variable.
+	(NAME(bfd_elf,size_dynamic_sections)): New function.
+	(struct elf_final_link_info): Add dynsym_sec and hash_sec fields.
+	(elf_bfd_final_link): Handle dynamic linking.  Create a section
+	symbol for all ELF sections, not all BFD sections.  Store section
+	symbol index in target_index field, not index field.  Traverse
+	over global symbols even if stripping.
+	(elf_link_output_extsym): Output dynamic symbols.  Mark symbols
+	defined by dynamic objects as undefined.
+	(elf_link_input_bfd): Ignore dynamic objects.  Use target_index
+	field for section relocs, and make sure it is set.
+	(elf_reloc_link_order): Use target_index field for section relocs,
+	and make sure it is set.
+	* elf.c (elf_link_hash_newfunc): Initialize dynindx, dynstr_index,
+	weakdef and elf_link_hash_flags fields.
+	(_bfd_elf_link_hash_table_create): Initialize dynobj, dynsymcount,
+	dynstr and bucketcount fields.
+	* elf32-target.h: Initialize new dynamic linking fields.
+	* elf64-target.h: Likewise.  
+	* elf32-i386.c: New functions for dynamic linking support.
+	* elf32-sparc.c: Likewise.
+	* bfd-in.h (bfd_elf32_record_link_assignment): Declare.
+	(bfd_elf64_record_link_assignment): Declare.
+	(bfd_elf32_size_dynamic_sections): Declare.
+	(bfd_elf64_size_dynamic_sections): Declare.
+	* bfd-in2.h: Rebuilt.
+
+Wed May 18 08:29:04 1994  Ian Lance Taylor  (ian@cygnus.com)
+
+	* som.c: Don't include <sys/dir.h> or <sys/user.h>.
+	(som_reloc_queue_find): Call memcmp instead of bcmp.
+	(som_bfd_reloc_type_lookup): Change first argument to bfd *.
+	(compare_syms): Change types of arguments to const void *.
+	(bfd_section_from_som_symbol): Removed unused local found.
+	(som_write_armap): Add elength, map, orl_count and int arguments.
+	(som_write_armap): Use %ld and cast to long for getuid result.
+
+Wed May 18 09:09:32 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* elf32-hppa.h (R_HPPA_ABS_CALL): Define.
+	* elf32-hppa.c (hppa_elf_gen_reloc_type): Handle absolute calls.
+
+	* som.h (R_HPPA_ABS_CALL): Define.
+	* som.c (hppa_som_gen_reloc_type): Delete complex relocation types.
+
+Tue May 17 19:33:12 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* coff-i960.c (icoff_little_vec, icoff_big_vec): Indicate leading
+	underscore, for compatibility with Intel tool chain (gnu960v2).
+
+Mon May 16 10:09:22 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* bfd-in2.h: Rebuilt.
+
+	* elf32-hppa.c: Change .hppa_linker_stubs to .PARISC.stubs,
+	likewise for other PA specific sections.
+	(hppa_elf_relocate_unwind_table): Delete unused
+	function.
+	(elf_hppa_howto_table): Completely new table based on 94-02-02
+	draft PA ELF spec.  Change relocation tags appropriately
+	throughout elf32-hppa.c
+	(hppa_elf_gen_reloc_type): Rewrite and simplify based on 94-02-02
+	spec.
+	(hppa_elf_reloc): Likewise.
+	(hppa_look_for_stubs_in_section): Likewise
+	(ELF_MACHINE_CODE): Change to EM_PARISC.
+	* elf32-hppa.h: Include "elf/hppa.h".  Change relocation tags 
+	appropriately throughout elf32-hppa.h.
+	(elf32_hppa_reloc_type): New table based on 94-02-02 draft PA ELF
+	spec.
+	(R_HPPA_ABS_CALL, R_HPPA_COMPLEX*, R_HPPA_UNWIND): Delete definitions.
+	* elfcode.h (prep_headers): Use EM_PARISC instead of EM_HPPA.
+	* reloc.c (bfd_reloc_code_real): Delete unused HPPA relocations.
+	* som.h (R_HPPA_ABS_CALL, R_HPPA_COMPLEX): Delete definitions.
+
+	* libhppa.h (hppa_field_adjust): Avoid adding constant_value into
+	the final value twice for LR and RR field selectors.
+
+Sat May 14 09:09:19 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* aoutx.h (add_to_stringtab): Use BFD_ASSERT not assert.  This
+	avoids __eprintf troubles.
+
+Fri May 13 10:51:21 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* bout.c (b_out_bfd_reloc_type_lookup): Handle BFD_RELOC_CTOR.
+
+	* config/mipsbelf.mt (SELECT_VECS): Add ecoff_big_vec and
+	ecoff_little_vec since Irix 5 supports ECOFF executables.
+
+Wed May 11 00:31:57 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.c (ecoff_find_nearest_line): Handle fdr.adr != pdr.adr
+	correctly.
+
+	* Makefile.in (stmp-bfd.h): Use || instead of ; to force SunOS
+	make to invoke the shell.
+
+Tue May 10 14:23:43 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* section.c (SEC_COFF_SHARED_LIBRARY): Renamed from
+	SEC_SHARED_LIBRARY for clarity.  Changed all uses.
+	* bfd-in2.h: Rebuilt.
+	* coffcode.h (sec_to_styp_flags): If SEC_COFF_SHARED_LIBRARY is
+	set, set STYP_NOLOAD.
+	* coffgen.c (coff_section_from_bfd_index): Don't get an assertion
+	failure because of a bad shared library.
+
+Mon May  9 18:53:40 1994  Bill Cox  (bill@rtl.cygnus.com)
+
+	* linker.c: Add missing comment terminator.
+
+Mon May  9 11:53:54 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* linker.c (_bfd_generic_link_add_one_symbol): If hashp and *hashp
+	are not NULL, assume the caller has already looked up the symbol
+	in the hash table and has stored the entry in *hashp.
+	(generic_link_add_symbol_list): Set h to NULL before calling
+	_bfd_generic_link_add_one_symbol.
+	* ecoff.c (ecoff_link_add_externals): Likewise.
+
+	* elfcode.h (assign_file_positions_except_relocs): Don't require
+	page shared between .data and .bss segments to contain zeroes.
+
+	* elfcode.h: Include bfdlink.h.  Added several new functions to do
+	linking.
+	(ELF_R_TYPE): Define.
+	(bfd_add_to_strtab): Return unsigned long.  Change check for
+	realloc failure.
+	(elf_fake_sections): Check return value of bfd_add_to_strtab.
+	(elf_compute_section_file_positions): Add link_info argument.
+	Call elf_backend_begin_write_processing hook and prep_headers
+	here.  Only call swap_out_syms if link_info is NULL.  Set up
+	.shstrtab section here.  Pass dosyms argument to
+	assign_file_positions_except_relocs.  Set output_has_begun flag.
+	(assign_file_positions_for_symtab_and_strtabs): Add dosyms
+	argument, and use it to control setting .symtab and .strtab file
+	positions.
+	(assign_file_positions_except_relocs): Add dosyms argument, and
+	pass it on.
+	(prep_headers): Check return value of bfd_add_to_strtab.
+	(swap_out_syms): Likewise.  Also, don't set up .shstrtab here.
+	(NAME(bfd_elf,write_object_contents)): Some calls moved into
+	elf_compute_section_file_positions.
+	(elf_set_section_contents): Likewise.
+	(elf_slurp_symbol_table): SHN_LORESERV corrected to SHN_LORESERVE.
+	* libelf.h: Include bfdlink.h.
+	(struct elf_backend_data): Add fields collect,
+	elf_add_symbol_hook, elf_backend_relocate_section.
+	(struct bfd_elf_section_data): Add field rel_hashes.
+	(struct elf_obj_tdata): Remove fields internal_syms and symbols.
+	Add field sym_hashes.
+	(obj_symbols, obj_internal_syms): Remove definitions.
+	(elf_sym_hashes): Define.
+	(struct elf_link_hash_entry): Define.
+	(struct elf_link_hash_table): Define.
+	(elf_link_hash_lookup): Define.
+	(elf_link_hash_traverse): Define.
+	(elf_hash_table): Define.
+	(_bfd_elf_link_hash_table_create): Declare.
+	(bfd_elf32_bfd_link_add_symbols): Declare.
+	(bfd_elf32_bfd_final_link): Declare.
+	(bfd_elf64_bfd_link_add_symbols): Declare.
+	(bfd_elf64_bfd_final_link): Declare.
+	* elf.c: Include bfdlink.h.
+	(elf_link_hash_newfunc): New function.
+	(_bfd_elf_link_hash_table_create): New function.
+	* elf32-target.h (elf_backend_relocate_section): If not defined,
+	define as 0 and use generic linker.  Otherwise, use ELF backend
+	linker.
+	(elf_backend_collect): If not defined, define as false.
+	(elf_backend_add_symbol_hook): If not defined, define as 0.
+	(elf32_bed): Initialize new fields.
+	* elf64-target.h: Same changes as elf32-target.h.
+	* elf32-i386.c: Include bfdlink.h.
+	(elf_i386_relocate_section): New function.
+	(elf_backend_relocate_section): Define.
+	* elf32-sparc.c: Include bfdlink.h.
+	(elf_info_to_howto): Change type of dst from Elf32_Internal_Rela
+	to Elf_Internal_Rela (they're the same type anyhow).
+	(elf_sparc_relocate_section): New function.
+	(elf_backend_relocate_section): Define.
+	* elf32-mips.c (elf_backend_collect): Define.
+
+	* Makefile.in (stmp-bfd.h): Avoid useless make error message in a
+	different way; touch takes a numeric argument on some systems.
+
+Fri May  6 13:34:14 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlmcode.h (nlm_swap_auxiliary_headers_in): Rework custom header
+	handling for latest suggested format.
+	(nlm_swap_auxiliary_headers_out): Likewise.
+	(nlm_compute_section_file_positions): Likewise.
+
+Fri May  6 11:11:50 1994  D. V. Henkel-Wallace  (gumby@rtl.cygnus.com)
+
+	* config.bfd: handle erricsson config (for OSE).
+
+Thu May  5 15:40:47 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	Patches from Ralph Campbell:
+	* mipsbsd.c (mips_fix_jmp_addr): New function.
+	(mips_fix_hi16_s): Use bfd_is_com_section.
+	(mips_howto_table_ext): Call mips_fix_jmp_addr for MIPS_RELOC_JMP.
+
+Fri May  6 11:48:55 1994  Steve Chamberlain  (sac@cygnus.com)
+
+	* config/go32.mh: XX support.
+
+	From bill
+	* Makefile.in: Build sysdep.h without causing worrying but
+	harmless error message.
+
+Wed May  4 11:09:53 1994  Ian Lance Taylor  (ian@cygnus.com)
+
+	Changed m68k-aout to set flags to 0; m68k-sunos still uses 1.
+	* aout0.c: New file.
+	* targets.c (aout0_big_vec): Declare.
+	(bfd_target_vector): Add aout0_big_vec.
+	* config.bfd (m68*-*-aout*): Use m68k-0aout, not m68k-aout.
+	* config/m68k-aout.mt (SELECT_VECS): Removed.
+	* config/m68k-0aout.mt: New file.
+	* configure.in (aout0_big_vec): New target vector: use aout0.o,
+	aout32.o and stab-syms.o.
+	* Makefile.in: Rebuilt dependencies.
+	(BFD32_BACKENDS): Add aout0.o.
+	(CFILES): Add aout0.c.
+
+	* libaout.h (struct aout_backend_data): Add field exec_hdr_flags.
+	* aout-target.h (MY_exec_hdr_flags): If not defined, define as 0.
+	MY(backend_data): Initialize exec_hdr_flags field.
+	* aoutf1.h (sunos_32_set_arch_mach): Make static.
+	(aout32_sunos4_write_object_contents): Set flags from backend
+	info.
+	(MY_exec_hdr_flags): If not defined, define as 1.
+	(sunos4_aout_backend): Initialize exec_hdr_flags field.
+	* aout-encap.c (encap_write_object_contents): Set flags from
+	backend info.
+	(MY_exec_hdr_flags): Define as N_FLAGS_COFF_ENCAPSULATE.
+	* hp300hpux.c (MY_exec_hdr_flags): Define as 0x2.
+	(MY(write_object_contents)): Set flags from backend info.
+	* i386aout.c (MY(backend_data)): Initialize exec_hdr_flags field.
+	* i386mach3.c (MY(backend_data)): Likewise.
+	* mipsbsd.c (MY(backend_data)): Likewise.
+	* sparclynx.c (NAME(aout,sparclynx_write_object_contents)): Set
+	flags from backend info.
+	(sparclynx_aout_backend): Initialize exec_hdr_flags field.
+
+Wed May  4 02:56:00 1994  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+	* config.bfd (i386-*-gnu*): Treat like i386-*-mach*.
+	(m68*-apollo-*): Treat all Apollo configs the same, don't handle
+	BSD specially.
+
+Tue May  3 19:43:21 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* cache.c: Rewrote to work correctly.
+	* libbfd.h: Rebuilt.
+	* opncls.c (bfd_cache_init, bfd_open_file): Don't declare.
+	(bfd_fdopenr): Check return value of bfd_cache_init.
+
+Fri Apr 29 15:08:23 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* cf-m68klynx.c (CALC_ADDEND): Check for PC relative relocs by
+	enumerating them, since the reloc type can not serve as an index
+	into the m68k COFF howto_table.
+
+Fri Apr 29 09:42:39 1994  Steve Chamberlain  (sac@cygnus.com)
+
+        * config.bfd (*-go32): Changed to coff.
+	* coff-h8300.c (JMPL1): Get HOWTO right for 24bit branches.
+	* srec.c (srec_write_symbols): Write out the correct number of
+	symbols and don't stick in extra nulls.
+
+Tue Apr 26 15:07:24 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* cf-sparclynx.c (LYNXOS, COFF_LONG_FILENAMES): Define.
+	* coff-sparc.c (BADMAG): Recognize LYNXCOFFMAGIC.
+	(COFF_SPARC): Define.
+	* coffcode.h (coff_new_section_hook): If COFF_SPARC, set alignment
+	power of data and bss sections to 3.
+	* hosts/lynx.h (__LYNXOS): Define.
+
+Tue Apr 26 15:04:26 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* elf32-hppa.c (hppa_elf_reloc): Adjust the addend of relocations
+	against section symbols to avoid losing during ld -r.
+
+Tue Apr 26 12:16:41 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elfcode.h (shstrtab_length_fixed): Remove useless static
+	variable.
+	(struct elf_sect_data): Remove unused structure.
+	(elf_object_p): Free memory if error occurs.  Check return value
+	of bfd_default_set_arch_mach.  If elf_get_str_section fails,
+	preserve error code rather than setting wrong_format.
+	(null_shdr): Remove static variable.
+	(assign_section_numbers): Remove shstrtab_length_fixed assignment.
+	Allocate first section header on BFD obstack rather than using
+	null_shdr.
+	(bfd_prpsinfo): Remove unused local variable newsect.
+
+Mon Apr 25 15:31:04 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elfcode.h (write_relocs): Undo patch of Apr 10; breaks Solaris.
+
+	* elfcode.h (bfd_section_from_shdr): Use bfd_make_section_anyway
+	to create sections.  Check return value of recursive calls.
+	(bfd_section_from_phdr): Check return value of bfd_make_section.
+	(elf_symbol_from_bfd_symbol): Likewise.
+	(elf_object_p): Check return value of bfd_section_from_shdr.
+	(section_from_elf_index): Likewise.
+	(elf_slurp_symbol_table): Check return value of
+	section_from_elf_index.
+	(bfd_prstatus): Return boolean value.  Check return value of
+	bfd_make_section.
+	(bfd_fpregset): Likewise.
+	(bfd_prpsinfo): Return boolean value.
+	(elf_corefile_note): Check return values of bfd_prstatus,
+	bfd_fpregset, and bfd_prpsinfo.
+	(elf_core_file_p): Check return value of elf_corefile_note.
+
+Fri Apr 22 11:08:38 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Get rid of the ECOFF .reginfo section hack.
+	* ecoff.c (ecoff_mkobject_hook): Don't create a .reginfo section.
+	(ecoff_new_section_hook): Don't handle the .reginfo section.
+	(ecoff_sizeof_headers): Likewise.
+	(ecoff_get_section_contents): Likewise.
+	(ecoff_compute_section_file_positions): Likewise.
+	(ecoff_compute_reloc_file_positions): Likewise.
+	(ecoff_set_section_contents): Likewise.
+	(ecoff_write_object_contents): Likewise.
+	(ecoff_bfd_final_link): Likewise.
+	(ecoff_bfd_copy_private_bfd_data): Copy the GP value and the
+	register masks.
+	(bfd_ecoff_get_gp_value): New function.
+	(bfd_ecoff_set_gp_value): New function.
+	(bfd_ecoff_set_regmasks): New function.
+	* bfd-in.h (bfd_ecoff_get_gp_value): Declare.
+	(bfd_ecoff_set_gp_value): Declare.
+	(bfd_ecoff_set_regmasks): Declare.
+	* bfd-in2.h: Rebuilt.
+
+	Fix ECOFF objcopy to actually copy debugging information.
+	* ecoff.c (ecoff_bfd_copy_private_bfd_data): New function.
+	(ecoff_get_extr): Assume that any ECOFF symbol with local clear is
+	an external symbol, rather than checking the symbol flags.  Only
+	check the flags for non-ECOFF symbols.
+	* ecofflink.c (bfd_ecoff_debug_externals): Don't crash if the
+	output_section field of the symbol section is NULL.
+	* libecoff.h (ecoff_bfd_copy_private_bfd_data): Declare as
+	function rather than defining as macro.
+
+	* ieee.c (ieee_object_p): Set bfd_error_got_wrong_format if
+	appropriate.
+
+	* targets.c (bfd_target_vector): Add bfd_elf32_powerpc_vec.
+
+	* aout-adobe.c (aout_adobe_set_arch_mach): Check return value of
+	bfd_default_set_arch_mach.  Accept bfd_arch_m68k as well as
+	bfd_arch_unknown.
+	* coffcode.h (coff_set_arch_mach): Check return value of
+	bfd_default_set_arch_mach.
+	* elfcode.h (elf_set_arch_mach): Don't check a list of ELF
+	architectures, just see if the desired architecture matches what
+	the ELF backend permits.
+
+	* coffcode.h (coff_set_arch_mach_hook): Rename SHMAGIC to
+	SH_ARCH_MAGIC to match change in coff/sh.h.
+	(coff_set_flags): Likewise.
+
+	Follow convention in which each NLM header has an 8 byte stamp
+	followed by a four byte length.
+	* libnlm.h (struct nlm_obj_tdata): Rename nlm_cygnus_section_hdr
+	to nlm_cygnus_ext_header, and change type to
+	Nlm_Internal_Cygnus_Ext_Header.
+	(nlm_cygnus_ext_header): Rename from nlm_cygnus_section_header.
+	* nlmcode.h (nlm_swap_auxiliary_headers_in): Use CyGnUsEx instead
+	of CyGnUsSeCs.  Rename from cygnus_section to cygnus_ext.  Require
+	length word to be 8.
+	(nlm_swap_auxiliary_headers_out): Rename from cygnus_section to
+	cygnus_ext.  Set length word to 8.
+	(nlm_compute_section_file_positions): Rename from cygnus_section
+	to cygnus_ext.
+
+Thu Apr 21 22:54:22 1994  Stu Grossman  (grossman at cygnus.com)
+
+	* nlmcode.h (nlm_swap_auxiliary_headers_in):  Keep section table
+	(from CyGnUsSeCs) in more permanent memory to keep section names
+	from getting trashed.
+
+Thu Apr 21 09:29:37 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* libelf.h (elf_obj_tdata):  Add members for dynamic symbol table
+	handling.
+	* elfcode.h (bfd_section_from_shdr):  Handle dynamic symbol table.
+	* elfcode.h (elf_slurp_symbol_table):  Take additional parameter
+	to select static or dynamic symbol table and return number of
+	symbols slurped or -1 on error.
+	* elfcode.h (elf_get_symtab):  Set bfd symcount from
+	elf_slurp_symbol_table result.
+	* elfcode.h (elf_get_dynamic_symtab_upper_bound,
+	elf_canonicalize_dynamic_symtab):  New functions to handle dynamic
+	symbol table.
+	* elf32-target.h, elf64-target.h (BFD_JUMP_TABLE_DYNAMIC):
+	Change to handle dynamic symbol table, provide default definitions
+	for dynamic relocs.
+	* aoutx.h (howto_table_std, NAME(aout,swap_std_reloc_out),
+	NAME(aout,swap_std_reloc_in), aout_link_input_section_std,
+	aout_link_reloc_link_order):  Handle r_jmptable and r_relative
+	relocations.
+
+Thu Apr 21 11:58:19 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Clean up uses of _bfd_dummy_target (from Peter Schauer).
+	* libbfd.c (_bfd_dummy_target): Set bfd_error_wrong_format.
+	* nlm-target.h (nlm_core_file_p): Define as _bfd_dummy_target, not
+	NULL.
+	* srec.c (srec_vec): Use _bfd_dummy_target, not NULL, in
+	_bfd_check_format.
+	(symbolsrec_vec): Likewise.
+	* tekhex.c (tekhex_vec): Likewise.
+
+	* libnlm.h (struct nlm_obj_tdata): Add nlm_cygnus_section_hdr
+	field.
+	(nlm_cygnus_section_header): New accessor macro.
+	* nlmcode.h (nlm_object_p): Free new tdata structure if failure.
+	Add fixed sections before swapping in auxiliary headers.  After
+	adding sections, treat errors as real, not as wrong format.
+	(nlm_swap_auxiliary_headers_in): Swap in the sections header; add
+	sections to the BFD for each section it describes.
+	(nlm_swap_auxiliary_headers_out): Swap out the sections header.
+	(nlm_compute_section_file_positions): Account for the size of the
+	sections header.
+
+Wed Apr 20 16:45:51 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* coff-sparc.c (sparccoff_vec): Change minimum alignment power to
+	2, so that stab sections can be multiples of 4 bytes only.
+
+	* hosts/i386aix.h: Changes to avoid prototypes conflicts with the
+	ones defined in stdlib.h.  (From Minh Tran-Le.)
+
+Wed Apr 20 14:15:21 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlm32-ppc.c: Complete rewrite for new version of PowerPC
+	NetWare.  Old code still present, but ifdeffed out.
+
+	* nlmcode.h (nlm_swap_auxiliary_headers_in): Don't assume a
+	particular format for the customer header.  Allocate a block of
+	memory and read it into that.
+	(nlm_swap_auxiliary_headers_out): Write out the block of memory.
+	(nlm_compute_section_file_positions): Include length of customer
+	header when computing its size.
+
+Mon Apr 18 14:27:17 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_prep_headers): Get the space's number from the
+	backend private section data rather than target_index.
+	(bfd_som_set_section_attributes): Store the space's number
+	in the backend private section data rather than target_index.
+
+	* som.h (som_copyable_section_data_struct): Add space_number.
+
+Fri Apr 15 12:22:07 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* coff-a29k.c (reloc_processing): Always set the address of a
+	R_IHCONST reloc to that of the immediately preceding R_IHIHALF.
+	gas does this anyhow, but some other assemblers seem to leave
+	garbage in the R_IHCONST address field.
+
+	* archive.c: Consistently use ARFMAG; from
+	schwab@issan.informatik.uni-dortmund.de (Andreas Schwab).
+	(_bfd_write_archive_contents): Use ARFMAG rather than '`' and
+	'\012'.
+	(bsd_write_armap): Likewise.
+	(coff_write_armap): Likewise.
+
+	* coff-mips.c (mips_relocate_section): When relaxing, adjust local
+	relocs against the .text section as required.
+	* ecofflink.c (bfd_ecoff_debug_accumulate): When relaxing, adjust
+	PDR addresses as required.
+
+	* ecoff.c (ecoff_emit_aggregate): Take fdr argument.  Map fdr
+	index through rfd map if it exists.  Check for a couple of cases
+	which gdb handles specially.  Change all callers.
+	(ecoff_type_to_string): Take fdr argument rather than aux_ptr and
+	bigendian argument.  Change all callers.
+	(ecoff_print_symbol): Handle stStruct, stUnion and stEnum.
+
+Thu Apr 14 13:05:10 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* coff-mips.c (mips_howto_table): Add dummy entries to account for
+	numbering changes in include/coff/mips.h.  Add entries for
+	MIPS_R_RELHI and MIPS_R_RELLO.
+	(mips_ecoff_swap_reloc_in): Handle an extra bit for the reloc type
+	when little endian.  Treat internal MIPS_R_RELLO or MIPS_R_RELHI
+	relocs like MIPS_R_SWITCH, and convert r_offset from 24 to 32
+	bits.
+	(mips_ecoff_swap_reloc_out): Likewise.
+	(mips_adjust_reloc_in): Handle internal MIPS_R_RELLO or
+	MIPS_R_RELHI relocs like MIPS_R_SWITCH.
+	(mips_adjust_reloc_out): Likewise.
+	(mips_relhi_addr, mips_relhi_addend): New static variables.
+	(mips_relhi_reloc, mips_rello_reloc): New functions.
+	(mips_bfd_reloc_type_lookup): Turn BFD_RELOC_PCREL_HI16_S into
+	MIPS_R_RELHI and turn BFD_RELOC_PCREL_LO16 into MIPS_R_RELLO.
+	(mips_relocate_hi): Rename from mips_relocate_refhi, and add pcrel
+	argument.  Changed all callers.
+	(mips_relocate_section): Rename got_reflo to got_lo and
+	reflo_int_rel to lo_int_rel.  Handle MIPS_R_RELLO and MIPS_R_RELHI
+	relocs.
+	(mips_relax_section): Adjust MIPS_R_RELHI/MIPS_R_RELLO pairs when
+	expanding a PC relative call.
+
+	* reloc.c (bfd_reloc_code_real_type): Add BFD_RELOC_PCREL_HI16_S
+	and BFD_RELOC_PCREL_LO16.
+	* bfd-in2.h: Rebuilt.
+
+Wed Apr 13 11:50:07 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* coff-sparc.c (sparccoff_vec): Set minimum alignment power to 3.
+
+Tue Apr 12 13:36:20 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_write_fixups): Always emit at least
+        one relocation for any non-bss section.
+
+Mon Apr 11 14:41:44 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elfcode.h (assign_file_positions_except_relocs): Don't require
+	the file alignment to correspond to the page size when linking
+	with -N.
+
+Sun Apr 10 01:02:24 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* elfcode.h (write_relocs): For rela relocations, adjust the
+	addend for relocations involving section symbols to account
+	for the lossage of 1:1 mapping from input section symbols to
+	output section symbols.
+
+Fri Apr  8 12:22:02 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* aoutx.h (NAME(aout,make_sections)): New function.
+	(NAME(aout,some_aout_object_p)): Call NAME(aout,make_sections)
+	rather than making sections inline.
+	(NAME(aout,mkobject)): Don't make any sections.
+	(NAME(aout,adjust_sizes_and_vmas)): Call NAME(aout,make_sections).
+	(NAME(aout,final_link)): Don't dereference obj_textsec (abfd) or
+	obj_datasec (abfd) if they are NULL.
+	* libaout.h (NAME(aout,make_sections)): Declare.
+	* bout.c (b_out_mkobject): Don't make any sections.
+	(b_out_write_object_contents): Call aout_32_make_sections.
+	(b_out_set_section_contents): Likewise.
+	* i386os9k.c (os9k_mkobject): Don't make any sections.
+	(os9k_write_object_contents): Call aout_32_make_sections.
+	(os9k_set_section_contents): Likewise.
+
+	* aoutx.h (NAME(aout,new_section_hook)): Don't set N_EXT in target
+	index.
+
+Wed Apr  6 20:44:56 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* config.bfd, configure.host:  Add mips-*-sysv4* support.
+
+Thu Apr  7 14:23:05 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* coff-mips.c (mips_howto_table): Add entry for MIPS_R_SWITCH.
+	(mips_ecoff_swap_reloc_in): For MIPS_R_SWTICH, copy r_symndx into
+	r_offset and set r_symndx to RELOC_SECTION_TEXT.
+	(mips_ecoff_swap_reloc_out): For MIPS_R_SWITCH, get the r_symndx
+	value from the r_offset field.
+	(mips_adjust_reloc_in): Maximum r_type value is now MIPS_R_SWITCH.
+	For MIPS_R_SWITCH, copy the r_offset field into the addend field.
+	(mips_adjust_reloc_out): For MIPS_R_SWITCH, copy the addend field
+	into the r_offset field.
+	(mips_switch_reloc): New function.
+	(mips_bfd_reloc_type_lookup): Translate BFD_RELOC_GPREL32 into
+	MIPS_R_SWITCH.
+	(mips_relocate_section): Handle MIPS_R_SWITCH.
+	(mips_relax_section): Adjust MIPS_R_SWITCH offset if necessary.
+
+Thu Apr  7 11:10:51 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* elfcode.h (elf_set_section_contents): Support calling the backend
+	function elf_backend_begin_write_processing when just beginning to
+	write an object file.
+
+	* libelf.h (elf_backend_begin_write_processing): Declare.
+
+	* elf{32,64}-target.h (elf_backend_begin_write_processing): Provide
+	a default definition.
+	(elf{32,64}_bed): Add elf_backend_begin_write_processing.
+	
+	* elf32-hppa.h (elf_hppa_tc_symbol): Delete extern declaration.
+	(elf_hppa_tc_make_sections): Likewise.
+
+	* elf32-hppa.c (symext_chain_built): Delete.
+	(symext_chain_size): Renamed from symextn_contents_real_size.
+	(elf32_hppa_backend_{begin,final}_write_processing): New functions.
+	(add_entry_to_symext_chain): New function.
+	(hppa_elf_set_section_contents): Ignore writes to the symbol extension
+	section until it's been rebuilt internally.
+	(hppa_elf_get_section_contents): Symbol extension section is no
+	longer special.
+	(elf_backend_{begin,final}_write_processing): Define.
+	(elf_hppa_tc_make_sections): Simplify now that much code has
+	migrated into elf32_hppa_backend_{being,final}_write_processing.
+
+Wed Apr  6 17:24:14 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Add new target vectors to read the dynamic symbols and dynamic
+	relocs.  Change a.out to use these rather than reading the dynamic
+	symbols and relocs along with the normal symbols and relocs.
+	* targets.c (bfd_target): Add fields
+	_bfd_get_dynamic_symtab_upper_bound,
+	_bfd_canonicalize_dynamic_symtab,
+	_bfd_get_dynamic_reloc_upper_bound,
+	_bfd_canonicalize_dynamic_reloc.
+	(BFD_JUMP_TABLE_DYNAMIC): Define.
+	* libbfd-in.h (_bfd_nodynamic_get_dynamic_symtab_upper_bound):
+	Define.
+	(_bfd_nodynamic_canonicalize_dynamic_symtab): Define.
+	(_bfd_nodynamic_get_dynamic_reloc_upper_bound): Define.
+	(_bfd_nodynamic_canonicalize_dynamic_reloc): Define.
+	* bfd.c (bfd_get_dynamic_symtab_upper_bound): Define.
+	(bfd_canonicalize_dynamic_symtab): Define.
+	(bfd_get_dynamic_reloc_upper_bound): Define.
+	(bfd_canonicalize_dynamic_reloc): Define.
+	* sunos.c (MY_read_dynamic_symbols): Don't define.
+	(MY_read_dynamic_relocs): Don't define.
+	(MY_get_dynamic_symtab_upper_bound): Define.
+	(MY_canonicalize_dynamic_symtab): Define.
+	(MY_get_dynamic_reloc_upper_bound): Define.
+	(MY_canonicalize_dynamic_reloc): Define.
+	(struct sunos_dynamic_info): Change type of dynsym_count and
+	dynrel_count to long.  Add fields canonical_dynsym and
+	canonical_dynrel.
+	(sunos_read_dynamic_info): Check that BFD had DYNAMIC flag set.
+	Clear info->canonical_dynsym and info->canonical_dynrel.
+	(MY(read_dynamic_symbols)): Removed.
+	(MY(read_dynamic_relocs)): Removed.
+	(sunos_get_dynamic_symtab_upper_bound): New function.
+	(sunos_canonicalize_dynamic_symtab): New function.
+	(sunos_get_dynamic_reloc_upper_bound): New function.
+	(sunos_canonicalize_dynamic_reloc): New function.
+	* libaout.h: Declare struct reloc_ext_external and
+	reloc_std_external to avoid prototype problems.
+	(struct aout_backend_data): Remove fields read_dynamic_symbols and
+	read_dynamic_relocs.
+	(NAME(aout,translate_symbol_table)): Declare.
+	(NAME(aout,swap_ext_reloc_in)): Declare.
+	(NAME(aout,swap_std_reloc_in)): Declare.
+	* aoutx.h (NAME(aout,translate_symbol_table)): Renamed from
+	translate_symbol_table and made non-static.  Changed all callers.
+	(NAME(aout,slurp_symbol_table)): Don't read dynamic symbols.
+	(NAME(aout,slurp_reloc_table)): Don't read dynamic relocs.
+	(NAME(aout,get_reloc_upper_bound)): Don't count dynamic relocs.
+	* aoutf1.h (aout_32_sunos4_write_object_contents): Don't bother to
+	remove dynamic symbols and relocs.  They will no longer be
+	present.
+	(MY_read_dynamic_symbols): Don't define.
+	(MY_read_dynamic_relocs): Don't define.
+	(sunos4_aout_backend): Don't initialize dynamic entry points.
+	* aout-target.h (MY_read_dynamic_symbols): Don't define.
+	(MY_read_dynamic_relocs): Don't define.
+	(MY(backend_data)): Don't initialize dynamic entry points.
+	(MY_get_dynamic_symtab_upper_bound): If not defined, define to
+	_bfd_nodynamic version.
+	(MY_canonicalize_dynamic_symtab): Likewise.
+	(MY_get_dynamic_reloc_upper_bound): Likewise.
+	(MY_canonicalize_dynamic_reloc): Likewise.
+	* All backends: Added BFD_JUMP_TABLE_DYNAMIC to target vector.
+	* bfd-in2.h: Rebuilt.
+	* libbfd.h: Rebuilt.
+
+	* cf-m68klynx.c: Include sysdep.h.
+
+	* hp300hpux.c: Removed some spaces in uses of NAME to avoid
+	problems with traditional C compilers.
+
+	* targets.c (bfd_target): Rearranged fields in target vector.
+	Removed _bfd_debug_info_start, _bfd_debug_info_end and
+	_bfd_debug_info_accumulate, which were never used.
+	(BFD_JUMP_TABLE_GENERIC, BFD_JUMP_TABLE_COPY): Defined.
+	(BFD_JUMP_TABLE_CORE, BFD_JUMP_TABLE_ARCHIVE): Defined.
+	(BFD_JUMP_TABLE_SYMBOLS, BFD_JUMP_TABLE_RELOCS): Defined.
+	(BFD_JUMP_TABLE_WRITE, BFD_JUMP_TABLE_LINK): Defined.
+	* All backends: Changed to use the new BFD_JUMP_TABLE_* macros
+	rather than the single JUMP_TABLE macro.  Removed many of the
+	weird macro definitions needed to support the monolithic
+	JUMP_TABLE.
+	* bfd-in.h (JUMP_TABLE): Removed.
+	* libbfd-in.h: Define a bunch of macros, and declare a few
+	functions, for use with the new BFD_JUMP_TABLE_* macros.
+	* libbfd.c (_bfd_dummy_new_section_hook): Removed.
+	(bfd_false): Set bfd_error_invalid_operation.
+	(bfd_nullvoidptr): Likewise.
+	(bfd_n1): New function.
+	(_bfd_nocore_core_file_matches_executable_p): Renamed from
+	_bfd_dummy_core_file_matches_executable_p.
+	(_bfd_nocore_core_file_failing_command): Similar rename.  Set
+	bfd_error_invalid_operation.
+	(_bfd_nocore_core_file_failing_signal): Likewise.
+	(_bfd_generic_get_section_contents): Renamed from
+	bfd_generic_get_section_contents.  Changed all callers.
+	(_bfd_generic_set_section_contents): Similar rename.
+	* ieee.c: #if 0 out ieee_bfd_debug_info_start,
+	ieee_bfd_debug_info_end, ieee_bfd_debug_info_accumulate.  They
+	were never called.
+	* bfd-in2.h: Rebuilt.
+	* libbfd.h: Rebuilt.
+
+Tue Apr  5 22:10:04 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* Crude support for examining dynamic libraries.
+	* som.c (som_object_setup): Set DYNAMIC flag for SHL_MAGIC and
+	DL_MAGIC objects.
+	(som_prep_headers): Preserve the system_id for DYNAMIC objects.
+	Use SHL_MAGIC as the magic number of the DYNAMIC flag is set.
+	Write exec headers for DYNAMIC objects.
+	(som_begin_writing): DYNAMIC objects have the same alignment
+	restrictions as D_PAGED objects.
+	(bfd_section_from_som_symbol): Treat DYNAMIC objects like EXEC_P
+	objects.
+	(object_flags): Add DYNAMIC.
+
+Tue Apr  5 17:48:52 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* i386lynx.c, sparclynx.c (NAME): Remove embedded whitespace in
+	macro uses, confuses some non-ANSI compilers.
+
+Tue Apr  5 15:50:01 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_bfd_free_cached_info): Add missing PARAMS decl.
+	Don't free anything if we don't have a bfd_object.
+	(som_close_and_cleanup): Call som_bfd_free_cached_info.
+
+Tue Apr  5 11:22:38 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elf32-mips.c (mips_elf_final_link): Don't remove empty sections.
+	It turns out not to be required on Irix 5, and it causes problems
+	if the sections happen to contain symbols.
+
+	* elfcode.h (write_shdrs_and_ehdr): Correct bfd_write check.
+
+	* aoutx.h (NAME(aout,canonicalize_reloc)): Don't error out if
+	section->relocation is NULL; malloc might have returned NULL when
+	given a zero size if there were no relocations.
+	* bout.c (b_out_canonicalize_reloc): Likewise.
+	* coffcode.h (coff_canonicalize_reloc): Likewise.
+	* ecoff.c (ecoff_canonicalize_reloc): Likewise.
+	* elfcode.h (elf_canonicalize_reloc): Likewise.
+	* mipsbsd.c (MY(canonicalize_reloc)): Likewise.
+	* i386lynx.c (NAME(lynx,canonicalize_reloc)): Likewise.
+	* nlmcode.h (nlm_canonicalize_reloc): Likewise.
+	* som.c (som_canonicalize_reloc): Likewise.
+	* hp300hpux.c (MY(slurp_reloc_table)): Likewise.  Also, if malloc
+	returns NULL, don't report an error if we asked for zero bytes.
+	* i386lynx.c (NAME(lynx,slurp_reloc_table)): If malloc returns
+	NULL, don't report an error if we asked for zero bytes.
+	* nlmcode.h (nlm_slurp_reloc_fixups): Likewise.
+
+Mon Apr  4 15:30:49 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* aoutx.h (NAME(aout,bfd_free_cached_info)): Don't free anything
+	if we don't have a bfd_object.
+
+	Made sure that every call to bfd_read, bfd_write, and bfd_seek
+	checks the return value and handled bfd_error correctly.  These
+	changes are not itemised.  Also:
+	* aoutx.h (emit_strtab): Change return type to boolean, and return
+	errors.
+	(NAME(aout,write_syms)): Check emit_strtab return value.
+	(NAME(aout,final_link)): Likewise.
+	* coffcode.h (coff_write_relocs): Change return type to boolean,
+	and return errors.
+	(coff_write_object_contents): Check coff_write_relocs return
+	value.
+	* i386os9k.c (os9k_swap_exec_header_in): Change return type to
+	boolean.
+	(os9k_object_p): Check os9k_swap_exec_header_in return value.
+	* oasys.c (oasys_read_record): Change return type to boolean.
+	(oasys_slurp_symbol_table: Check oasys_read_record return value.
+	(oasys_object_p, oasys_slurp_section_data): Likewise.
+	(oasys_write_record): Change return type to boolean.
+	(oasys_write_syms): Likewise.  Also, check oasys_write_record
+	return value.
+	(oasys_write_sections): Check oasys_write_record return value.
+	(oasys_write_header): Change return type to boolean.  Check
+	oasys_write_record return value.
+	(oasys_write_end, oasys_write_data): Likewise.
+	(oasys_write_object_contents): Check return values of
+	oasys_write_header, oasys_write_syms, oasys_write_data, and
+	oasys_write_end.
+	* srec.c (srec_write_record): Change return type to boolean.
+	(srec_write_header): Likewise.  Also, check srec_write_record
+	return value.
+	(srec_write_section, srec_write_terminator): Likewise.
+	(srec_write_symbols): Change return type to boolean.
+	(internal_srec_write_object_contents): Check return value of
+	srec_write_symbols, srec_write_header, srec_write_section, and
+	srec_write_terminator.
+
+	* Makefile.in: Rebuilt dependencies.
+
+Mon Apr  4 10:56:45 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* aix386-core.c (aix386_bfd_is_local_label):  Correct cast from
+	asection to asymbol.
+	* ptrace-core.c (ptrace_unix_bfd_is_local_label):  Correct cast from
+	bfd to asymbol.
+	* trad-core.c (trad_unix_bfd_is_local_label):  Correct cast from
+	asection to asymbol.
+
+Sun Apr  3 18:27:29 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_slurp_string_table): Use malloc to allocate space
+	for the cached copy of the native string table.
+	(som_slurp_symbol_table): Likewise for the native symbol table.
+	(som_slurp_reloc_table): Likewise for the native and generic
+	relocation tables.
+	(som_bfd_free_cached_info): Free the cached native strings,
+	symbols, and relocations.  Also free the canonical cached
+	relocations.
+
+Fri Apr  1 12:40:58 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* aoutx.h (aout_link_write_symbols): If keep_memory is false, make
+	sure the symbol name is stored in permanent memory before adding
+	it to the string table.
+
+	* archive.c (_bfd_write_archive_contents): Once we've found an
+	object, don't bother to look for more when deciding whether to
+	build a map.
+	(compute_and_write_armap): After adding the symbols for a BFD,
+	call bfd_free_cached_info on it.
+
+	Add bfd_free_cached_info support to a.out backends.
+	* aoutx.h (aout_get_external_symbols): Renamed from
+	aout_link_get_symbols.  Read strings even if symbols have been
+	read.  Store string size in obj_aout_string_size.
+	(NAME(aout,slurp_symbol_table)): Call aout_get_external_symbols to
+	read the symbols.  Allocate the cached symbols with malloc, not
+	bfd_alloc.
+	(NAME(aout,slurp_reloc_table)): Allocate the cached relocs with
+	malloc, not bfd_alloc.
+	(NAME(aout,bfd_free_cached_info)): New function; free cached
+	symbols and relocs.
+	* libaout.h (struct aoutdata): Add external_string_size field.
+	(obj_aout_external_string_size): New accessor macro.
+	(NAME(aout,close_and_cleanup)): Don't declare.
+	(NAME(aout,bfd_free_cached_info)): Declare.
+	(aout_32_close_and_cleanup): Don't define.
+	(aout_64_close_and_cleanup): Don't define.
+	* aout-target.h (MY_bfd_free_cached_info): If not already defined,
+	define as NAME(aout,free_cached_info).
+	(MY_close_and_cleanup): If not already defined, define as
+	MY_bfd_free_cached_info.
+	* aout-adobe.c (aout_32_close_and_cleanup): Define.
+	(aout_32_bfd_free_cached_info): Don't define.
+	* bout.c (aout_32_close_and_cleanup): Define.
+	(aout_32_bfd_free_cached_info): Don't define.
+	* hp300hpux.c (MY_bfd_free_cached_info): Define as bfd_true.
+	(MY_close_and_cleanup): Don't define.
+	* i386lynx.c (NAME(lynx,slurp_reloc_table)): Allocate the cached
+	relocs with malloc, not bfd_alloc.
+	* i386os9k.c (aout_32_close_and_cleanup): Define.
+	(aout_32_bfd_free_cached_info): Don't define.
+
+	Add a new entry point to free memory cached by a BFD.
+	* targets.c (bfd_target): Add _bfd_free_cached_info field.
+	* bfd.c (bfd_free_cached_info): Define.
+	* bfd-in.h (JUMP_TABLE): Add _bfd_free_cached_info.
+	* bfd-in2.h: Rebuilt.
+	* All backends: Initialize bfd_free_cached_info entry point to
+	bfd_true.
+
+	* elf32-hppa.c (elf_hppa_reloc_type_lookup): Correct type of
+	first, unused, argument.
+	(hppa_elf_is_local_label): Declare instead of
+	som_bfd_is_local_label.
+
+	* coff-a29k.c (a29k_reloc): Add reloc_entry->address to value of
+	absolute R_IREL reloc.
+
+Thu Mar 31 11:52:15 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Added some support for Irix 4 shared libraries.
+	* ecoff.c (ecoff_new_section_hook): Set SEC_SHARED_LIBRARY for a
+	.lib section.
+	(ecoff_sec_to_styp_flags): Set SEC_SHARED_LIBRARY if
+	STYP_ECOFF_LIB bit is set.
+	(ecoff_compute_section_file_positions): Round the contents of a
+	.lib section up to the next page boundary.
+	(ecoff_set_section_contents): If we see a .lib section, increment
+	the vma by one to count the number of shared libraries we have.
+	(ecoff_write_object_contents): Don't crash if we see a
+	STYP_ECOFF_LIB section, and don't adjust text_start or data_start
+	or bss_size either.
+
+	* coffcode.h (CALC_ADDEND): Change to fetch original symbol value
+	from original BFD, rather than using value of current BFD symbol.
+	Needed for new linker.
+	* coff-sparc.c (CALC_ADDEND): Likewise.
+
+	* ecoff.c (ecoff_write_object_contents): Set the text_start and
+	data_start entries in the optional header correctly even if a text
+	or data section starts at location zero.
+
+	* reloc.c (bfd_reloc_code_real_type): Added BFD_RELOC_26 (from sef
+	and raeburn).
+	* bfd-in2.h: Rebuilt.
+
+	* nlm32-i386.c (nlm_i386_read_import): Null terminate the symbol
+	name.
+	* nlm32-alpha.c (nlm_alpha_read_import): Likewise.
+	* nlm32-sparc.c (nlm_sparc_read_import): Likewise.
+
+	* coffgen.c (coff_write_symbol): Reindented.  Changed to return
+	boolean, and changed written to unsigned int *.  Check error
+	returns from called functions.
+	(coff_write_alien_symbol): Likewise.
+	(coff_write_native_symbol): Likewise.
+	(coff_write_symbols): Likewise.  Reworked checks on whether to
+	write symbol name to string table for clarity and to avoid core
+	dumping when given a non COFF symbol.
+	* libcoff-in.h (coff_write_symbols): Declare as returning boolean.
+	* libcoff.h: Rebuilt.
+	* coffcode.h (coff_write_object_contents): Check return value of
+	coff_write_symbols.
+
+Wed Mar 30 16:25:41 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Changes to let BFD return an error indication from
+	get_symtab_upper_bound, bfd_canonicalize_symtab,
+	bfd_get_reloc_upper_bound, and bfd_canonicalize_reloc.  They now
+	return long instead of unsigned int, and use -1 to indicate an
+	error.  Along the way, rename get_symtab_upper_bound to
+	bfd_get_symtab_upper_bound.
+	* bfd.c (bfd_get_reloc_upper_bound): Return long, and -1 on
+	errors.
+	(bfd_canonicalize_reloc): Likewise.
+	* syms.c (bfd_get_symtab_upper_bound): Renamed from
+	get_symtab_upper_bound.
+	* targets.c (bfd_target): Renamed _get_symtab_upper_bound to
+	_bfd_get_symtab_upper_bound, and changed it and
+	_bfd_canonicalize_symtab and _get_reloc_upper_bound and
+	_bfd_canonicalize_reloc to all return long.
+	* aoutx.h (NAME(aout,get_symtab)): Return long, and -1 on errors.
+	(NAME(aout,canonicalize_reloc)): Likewise.
+	(NAME(aout,get_reloc_upper_bound)): Likewise.
+	(NAME(aout,get_symtab_upper_bound)): Likewise.
+	* bout.c (b_out_canonicalize_reloc): Likewise.
+	(b_out_get_reloc_upper_bound): Likewise.
+	* coffcode.h (coff_canonicalize_reloc): Likewise.
+	* coffgen.c (coff_get_symtab_upper_bound): Likewise.
+	(coff_get_symtab): Likewise.
+	(coff_get_reloc_upper_bound): Likewise.
+	* ecoff.c (ecoff_get_symtab_upper_bound): Likewise.
+	(ecoff_get_symtab): Likewise.
+	(ecoff_canonicalize_reloc): Likewise.
+	* elfcode.h (elf_get_symtab_upper_bound): Likewise.
+	(elf_get_reloc_upper_bound): Likewise.
+	(elf_canonicalize_reloc): Likewise.
+	(elf_get_symtab): Likewise.
+	* hp300hpux.c (MY(get_symtab)): Likewise.
+	(MY(get_symtab_upper_bound)): Likewise.
+	(MY(canonicalize_reloc)): Likewise.
+	* i386lynx.c (NAME(lynx,canonicalize_reloc)): Likewise.
+	* ieee.c (ieee_slurp_external_symbols): Change return type to
+	boolean.  Check for errors from get_symbol.
+	(ieee_slurp_symbol_table): Change return type to boolean.  Check
+	for errors from ieee_slurp_external_symbols.
+	(ieee_get_symtab_upper_bound): Return long, and -1 on errors.
+	(ieee_get_symtab): Likewise.
+	(ieee_get_reloc_upper_bound): Likewise.
+	(ieee_canonicalize_reloc): Likewise.
+	* mipsbsd.c (MY(canonicalize_reloc)): Likewise.
+	* nlmcode.h (nlm_get_symtab_upper_bound): Likewise.
+	(nlm_get_symtab): Likewise.
+	(nlm_get_reloc_upper_bound): Likewise.
+	(nlm_canonicalize_reloc): Likewise.
+	* oasys.c (oasys_get_symtab_upper_bound): Likewise.
+	(oasys_get_symtab): Likewise.
+	(oasys_get_reloc_upper_bound): Likewise.
+	(oasys_canonicalize_reloc): Likewise.
+	* som.c (som_get_symtab_upper_bound): Likewise.
+	(som_get_symtab): Likewise.
+	(som_get_reloc_upper_bound): Likewise.
+	(som_canonicalize_reloc): Likewise.
+	* srec.c (srec_get_symtab_upper_bound): Likewise.
+	(srec_get_symtab): Likewise.
+	(srec_get_reloc_upper_bound): Define as bfd_0l.
+	(srec_canonicalize_reloc): Likewise.
+	* tekhex.c (tekhex_get_symtab): Return long, and -1 on errors.
+	(tekhex_get_symtab_upper_bound): Likewise.
+	(tekhex_get_reloc_upper_bound): Define as bfd_0l.
+	(tekhex_canonicalize_reloc): Likewise.
+	* libaout.h (NAME(aout,get_symtab_upper_bound)): Change
+	declaration to return long.
+	(NAME(aout,get_symtab)): Likewise.
+	(NAME(aout,canonicalize_reloc)): Likewise.
+	(NAME(aout,get_reloc_upper_bound)): Likewise.
+	* libcoff-in.h (coff_get_symtab_upper_bound): Likewise.
+	(coff_get_symtab): Likewise.
+	(coff_get_reloc_upper_bound): Likewise.
+	* libecoff.h (ecoff_get_symtab_upper_bound): Likewise.
+	(ecoff_get_symtab): Likewise.
+	(ecoff_canonicalize_reloc): Likewise.
+	* libelf.h (bfd_elf32_get_symtab_upper_bound): Likewise.
+	(bfd_elf32_get_symtab): Likewise.
+	(bfd_elf32_get_reloc_upper_bound): Likewise.
+	(bfd_elf32_canonicalize_reloc): Likewise.
+	(bfd_elf64_get_symtab_upper_bound): Likewise.
+	(bfd_elf64_get_symtab): Likewise.
+	(bfd_elf64_get_reloc_upper_bound): Likewise.
+	(bfd_elf64_canonicalize_reloc): Likewise.
+	* libnlm.h (nlmNAME(get_symtab_upper_bound)): Likewise.
+	(nlmNAME(get_symtab)): Likewise.
+	(nlmNAME(get_reloc_upper_bound)): Likewise.
+	(nlmNAME(canonicalize_reloc)): Likewise.
+	* archive.c (compute_and_write_armap): Use error_return and
+	no_memory_return labels rather than freeing information in various
+	places.  Change storage, symcount and src_count to long.  Check
+	errors from bfd_get_symtab_upper_bound and
+	bfd_canonicalize_symtab.
+	* bout.c (b_out_relax_section): Change reloc_size to long.  Check
+	for errors from bfd_get_reloc_upper_bound and
+	bfd_canonicalize_reloc.
+	(b_out_get_relocated_section_contents): Likewise.
+	* coff-alpha.c (alpha_ecoff_get_relocated_section_contents):
+	Likewise.
+	* elf32-mips.c: Likewise.
+	* elf32-hppa.c (hppa_elf_stub_finish): Likewise.
+	(hppa_look_for_stubs_in_section): Check for errors from
+	bfd_get_symtab_upper_bound, bfd_canonicalize_symtab, and
+	bfd_canonicalize_reloc.
+	* ecofflink.c (bfd_ecoff_debug_accumulate_other): Check for errors
+	from bfd_get_symtab_upper_bound and bfd_canonicalize_symtab.
+	* linker.c (generic_link_read_symbols): Likewise.
+	(_bfd_generic_final_link): Check for errors from
+	bfd_get_reloc_upper_bound and bfd_canonicalize_reloc.
+	* reloc.c (bfd_generic_get_relocated_section_contents): Likewise.
+	* reloc16.c (bfd_coff_reloc16_relax_section): Likewise.
+	(bfd_coff_reloc16_get_relocated_section_contents): Likewise.
+	* libbfd.c (bfd_0l): New function.
+	* libbfd-in.h (bfd_0l): Declare.
+	* aix386-core.c: Change get_symtab_upper_bound, get_symtab,
+	get_reloc_upper_bound, and canonicalize_reloc to use bfd_0l rather
+	than bfd_0u.
+	* cisco-core.c, hppabsd-core.c, hpux-core.c: Likewise.
+	* irix-core.c, osf-core.c, ptrace-core.c, trad-core.c: Likewise.
+	* bfd-in2.h: Rebuilt.
+	* libbfd.h: Rebuilt.
+	* libcoff.h: Rebuilt.
+
+	* nlm32-sparc.c (nlm_sparc_read_reloc): Remove unused variables
+	temp and name.
+
+Wed Mar 30 08:33:04 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* hosts/dpx2.h: Define POSIX_UTIME.
+
+Wed Mar 30 00:31:49 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* i386dynix.c, config/i386-dynix.mt:  New files, handling Dynix
+	variant of a.out.
+	* configure.in, config.bfd:  Use them for Dynix.
+	* Makefile.in:  Add dependencies for i386dynix.o. 
+	* targets.c:  Add definition for i386dynix_vec.
+	* hosts/symmetry.h:  Do not define TRAD_CORE_USER_OFFSET for Dynix.
+	Define HOST_DATA_START_ADDR and TRAD_UNIX_CORE_FILE_FAILING_SIGNAL
+	for Dynix. Remove inclusion of dynix3.h, Dynix bfd is now handled by
+	i386dynix.c
+
+Mon Mar 28 12:53:27 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* Makefile.in (BFD32_BACKENDS): Add coff-sparc.o.
+
+	* coffcode.h (coff_set_flags): Handle bfd_arch_powerpc like
+	bfd_arch_rs6000.
+
+	* config.bfd (powerpc-*-aix*): New target; use rs6000.mt.
+	* config/rs6000.mt (SELECT_ARCHITECTURES): Add bfd_powerpc_arch.
+
+	* aoutx.h (translate_from_native_sym_flags): Set SEC_RELOC flag
+	for generated constructor section.
+
+Sun Mar 27 16:25:22 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_begin_writing): New approach at dealing with holes
+	in executables left by the HP linker.  Does not rely on subspace
+	alignments as subspaces are *NOT* guaranteed to be properly
+	aligned in an executable (can you believe that!).
+
+Sat Mar 26 10:25:43 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_get_section_contents): New function.  Do not try
+	to actually read data from a section that doesn't have either
+	SEC_LOAD or SEC_DEBUGGING set (eg $BSS$) just return true.
+
+        * libbfd.c (bfd_read): Set bfd_error as appropriate for a short
+	read. (bfd_error_system_call or bfd_error_file_truncated).
+
+	* som.c: Do not blindly set bfd_error_system_call after a
+	failing bfd_read, bfd_write, or bfd_seek.  In a few places
+	(like som_object_p) override the error status set by bfd_read.
+
+	* aix386-core.c, aout-encap,c archive.c, bout.c: Likewise.
+	* coff-rs6000.c, coffgen.c ecoff.c, elf.c: Likewise.
+	* elf32-hppa.c, elfcode.h, hp300hpux.c, i386lynx.c: Likewise.
+	* nlm32-alpha.c, nlm32-i386.c, nlm32-sparc.c: Likewise.
+
+	* som.c: Check return values from several bfd_{seek,read,write}
+	calls that we just assumed were not failing.
+
+Fri Mar 25 11:44:06 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* hosts/sysv4.h (HAVE_PROCFS): Add comments about ptx4.
+	* config/sysv4.mh: Add comment.
+	* config/symmetry.mh: Change comment.
+	* configure.host: Use sysv4, not symmetry, for i[34]86-sequent-sysv4*.
+
+Fri Mar 25 17:10:45 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Changes to support linker relaxing of embedded MIPS PIC code to
+	use a five instruction sequence for function calls which are out of
+	range of the bal instruction.
+	* libecoff.h (struct ecoff_section_tdata): Define.
+	(ecoff_section_data): Define.
+	(ecoff_bfd_relax_section): Don't define.
+	* ecoff.c (ecoff_final_link_debug_accumulate): Don't read or free
+	the debugging information if it has already been read.
+	(ecoff_indirect_link_order): Handle _cooked_size being different
+	from _raw_size.  Don't reread the contents or the relocs if they
+	have already been read in.
+	* coff-mips.c (mips_howto_table): Change bitsize of PCREL16 from
+	18 to 16.
+	(PCREL16_EXPANSION_ADJUSTMENT): Define.
+	(mips_relocate_refhi): Take adjust argument.
+	(mips_relocate_section): Handle reloc offsets stored in section
+	used_by_bfd field.  Call mips_relax_pcrel16 to handle details of
+	expanding an out of range PCREL16.  Keep trace of adjustments
+	required by expansions.  Set s and unset h when converting a reloc
+	from undefined to section.  Change handling of PC relative relocs:
+	if against a section, they are correct in the object file, if
+	against an external symbol they are pcrel_offset.
+	(mips_relax_section): New function.
+	(mips_relax_pcrel16): New function.
+	(ecoff_bfd_relax_section): Define.
+	* coff-alpha.c (ecoff_bfd_relax_section): Define.
+	* ecofflink.c (bfd_ecoff_debug_accumulate): Handle adjustments
+	built by mips_relax_section when writing out addresses.
+	* elf32-mips.c (mips_elf_read_ecoff_info): Clear adjust field.
+
+	* aoutx.h (NAME(aout,find_nearest_line)): The caller expects
+	functionname_ptr to be set to a symbol name, so prepend
+	symbol_leading_char.
+
+Thu Mar 24 11:33:46 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
+
+	* coff-h8300.c (h8300_reloc16_extra_cases): Add relaxing info
+	for 16bit relative branches.
+	* coff-h8500.c (r_high8, r_low16, r_high16): Don't complain on
+	overflow.
+
+Thu Mar 24 09:21:13 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_bfd_prep_for_ar_write): Ignore non-SOM objects.
+	(som_bfd_ar_write_symbol_stuff, som_write_armap): Likewise.
+
+Wed Mar 23 14:29:31 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+	* netbsd386.c (N_SET_FLAGS): Delete the old definition.
+
+Wed Mar 23 14:58:44 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Clean up the relaxing code for the new linker.
+	* targets.c (_bfd_relax_section): Take boolean *again argument
+	rather than asymbol list.
+	* bfd.c (bfd_relax_section): Change name of fourth argument from
+	symbols to again.
+	* reloc.c (bfd_generic_relax_section): Take boolean *again
+	argument rather than asymbol list.  Always return true.
+	* bout.c: Include genlink.h.
+	(aligncode, perform_slip): Declare.
+	(perform_slip): Take BFD argument rather than asymbol list.
+	Changed all callers.  Get the symbols from the BFD.  Change the
+	hash table entry value as well as the symbol value.
+	(abs32code): Take BFD argument rather than asymbol list.  Changed
+	all callers.
+	(aligncode): Likewise.
+	(b_out_relax_section): Take boolean *again argument rather than
+	asymbol list.  Only return false if an error occurred.  Set *again
+	to false.  Get symbols from BFD.
+	* reloc16.c: Include genlink.h.
+	(bfd_perform_slip): Take BFD argument rather than asymbol list.
+	Get the symbols from the BFD.  Change the hash table entry value
+	as well as the symbol value.
+	(bfd_coff_reloc16_relax_section): Take boolean *again argument
+	rather than asymbol list.  Only return false if an error occurred.
+	Set *again to false.  Get symbols from BFD.
+	* coffcode.h (bfd_coff_backend_data): Change
+	_bfd_coff_reloc16_estimate to take BFD argument rather than
+	asymbol list.
+	(bfd_coff_reloc16_estimate): Corresponding change.
+	(dummy_reloc16_estimate): Corresponding change.
+	* libcoff-in.h (bfd_coff_reloc16_relax_section): Change
+	declaration to take boolean * rather than asymbol list.
+	(bfd_perform_slip): Change declaration to take BFD rather than
+	asymbol list.
+	* coff-h8300.c (h300_reloc16_estimate): Take BFD argument rather
+	than asymbol list.  Changed calls to bfd_perform_slip.
+	* bfd-in2.h: Rebuilt.
+	* libbfd.h: Rebuilt.
+	* libcoff.h: Rebuilt.
+	* Makefile.in: Rebuilt dependencies.
+
+	* genlink.h (_bfd_generic_link_get_symbols): Define.
+	(_bfd_generic_link_get_symcount): Define.
+	* linker.c (generic_link_read_symbols): New function.
+	(generic_link_add_object_symbols): Use it.  Use
+	_bfd_generic_link_get_symbols and _bfd_generic_link_get_symcount
+	to get the symbols from the BFD.
+	(generic_link_check_archive_element): Likewise.
+	(_bfd_generic_final_link): Likewise.
+	(_bfd_generic_link_output_symbols): Likewise.
+	(default_indirect_link_order): Likewise.
+	(generic_link_add_symbol_list): Store pointer to hash table entry
+	in asymbol udata field.
+
+Tue Mar 22 13:09:44 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* coff-mips.c (mips_howto_table): Add entry for new MIPS_R_PCREL16
+	reloc, used in embedded PIC code.
+	(mips_adjust_reloc_in): Change sanity check to permit new reloc.
+	(mips_bfd_reloc_type_lookup): Turn BFD_RELOC_16_PCREL_S2 into
+	MIPS_R_PCREL16.
+
+	* elf32-mips.c (mips_elf_final_link): Account for link_order
+	relocs when allocating space for relocations.  Set SEC_RELOC flag
+	for any section which has relocs.  Handle link_order relocs in
+	link_order loop.  Use _bfd_generic_link_add_symbols_collect for
+	add_symbls entry point.
+
+	* linker.c (_bfd_generic_final_link): Set reloc_count to 0 before
+	counting relocs.  Set SEC_RELOC flag for any section which has
+	relocs.
+
+	* linker.c (_bfd_default_link_order): Handle bfd_data_link_order.
+
+	* linker.c (_bfd_generic_link_add_symbols): Just call
+	generic_link_add_symbols.
+	(_bfd_generic_link_add_symbols_collect): New function, like
+	_bfd_generic_link_add_symbols but also collect constructors and
+	destructors by name as collect2 does.
+	(generic_link_add_symbols): New function, like old
+	_bfd_generic_link_add_symbols but with collect argument.
+	(generic_link_add_object_symbols): Take collect argument.
+	(generic_link_check_archive_element_no_collect): New function.
+	(generic_link_check_archive_element_collect): New function.
+	(generic_link_check_archive_element): Take collect argument.
+	(generic_link_add_symbol_list): Take collect argument.
+	(_bfd_generic_link_add_one_symbol): Rename constructor argument to
+	collect.
+	* libbfd-in.h (_bfd_generic_link_add_symbols_collect): Declare.
+	* libbfd.h: Rebuilt.
+
+Tue Mar 22 10:04:00 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* archive.c (bfd_construct_extended_name_table): Use ar_padchar
+	for first character in an extended name.
+	(_bfd_write_archive_contents): If ar_padchar == '/', then use
+	"//" as the name of the special archive member holding the
+	extended name table.
+
+Mon Mar 21 12:28:19 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Support for link_order types which generate relocs in order to
+	support -Ur in the linker.
+	* linker.c (generic_link_add_symbol_list): Remove bitsize argument
+	from call to _bfd_generic_link_add_one_symbol.
+	(_bfd_generic_link_add_one_symbol): Remove bitsize argument.
+	Don't pass bitsize to constructor call back.  Pass BFD_RELOC_CTOR
+	instead of bitsize to add_to_set call back.
+	(_bfd_generic_final_link): Account for link_order relocs when
+	allocating space for relocations.  Handle them in link_order loop.
+	(_bfd_generic_reloc_link_order): New function.
+	(_bfd_default_link_order): If a reloc_link_order is seen here,
+	abort.
+	(_bfd_count_link_order_relocs): New function.
+	* libbfd-in.h (_bfd_generic_link_add_one_symbol): Remove bitsize
+	argument from declaration.
+	(_bfd_generic_reloc_link_order): Declare.
+	(_bfd_count_link_order_relocs): Declare.
+	* libbfd.h: Rebuilt.
+	* aoutx.h (aout_link_add_symbols): Remove bitsize argument from
+	call to _bfd_generic_link_add_one_symbol.
+	(NAME(aout,final_link)): Account for link_order relocs when
+	allocating space for relocations.  Handle them after handling all
+	input BFDs.
+	(aout_link_reloc_link_order): New function.
+	* ecoff.c (ecoff_link_add_externals): Remove bitsize argument from
+	call to _bfd_generic_link_add_one_symbol.
+	(ecoff_bfd_final_link): Account for link_order relocs when
+	allocating space for relocations.  Handle them in link_order loop.
+	(ecoff_link_write_external): Set the storage class of a defined
+	linker created symbol based on the section it is in.  Correct
+	bfd_link_hash_weak case to use .sc rather than .st.
+	(ecoff_reloc_link_order): New function.
+	* coff-alpha.c (alpha_bfd_reloc_type_lookup): Handle
+	BFD_RELOC_CTOR.
+	* coff-mips.c (mips_bfd_reloc_type_lookup): Likewise.
+
+	* sunos.c (sunos_read_dynamic_info): Remove unused locals dynsym
+	and buf.
+
+	* cisco-core.c (cisco_core_file_p): Only pass one argument to
+	bfd_zmalloc.  Free a pointer, not a union.
+	(cisco_bfd_is_local_label): Correct cast from asection to asymbol.
+
+Sun Mar 20 09:24:36 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_begin_writing): Fix thinko (off by one error).
+
+	* som.c (bfd_section_from_som_symbol): Only to do the value
+	comparison for function symbols within executables.
+
+	* som.c (bfd_section_from_som_symbol): Renamed from
+	som_section_from_subspace_index.  Pass in a native SOM symbol.
+	For executables, iterate through the sections to find out
+	which contains the symbol's address rather than using the
+	symbol_info field.  (symbol_info has a different meaning for
+	dynamicly linked executables.)
+
+	* trad-core.c (trad_unix_core_file_p): Don't pass abfd to
+	bfd_zmalloc.
+
+	* som.c (som_begin_writing): Fix braino (one call to align
+	space/subspace data was done unconditionally rather than
+	just for executables.)
+
+	* som.c (som_begin_writing): Align text in all executables to
+	make HPUX kernel happy.  Fixes strip/objcopy for shared
+	executables.
+
+Sat Mar 19 07:06:59 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_begin_writing): Account for alignment needs of
+	subspaces too when writing executables.  Never request a negative
+	bss size.  Fixes some problems with demand paged executables,
+	still having problems with pure executables and shared executables.
+
+Fri Mar 18 19:12:47 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* trad-core.c (trad_unix_core_file_p): Call bfd_zmalloc not
+	bfd_zalloc for rawptr, because later on we may call free, not
+	bfd_release, on it.
+
+	* bfd.c (struct _bfd): Add cisco_core_struct to tdata union.
+	* libbfd.c (bfd_read, bfd_seek): Add comments regarding errors.
+	* cisco-core.c: New file.
+	* Makefile.in: Change accordingly.
+	* configure.in: Recognize cisco_core_vec.
+	* config/m68k-aout.mt (SELECT_VECS): Add cisco_core_vec.
+	* targets.c: Add cisco_core_vec.
+	* bfd-in2.h: Rebuilt.
+
+Fri Mar 18 18:13:49 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.h (som_copyable_section_data_struct): New structure
+	containing all the private section information which needs
+	to be copied from input section to output section during
+	objcopy or strip.
+	(som_section_data_struct): Remove several fields now in
+	som_copyable_section_data_struct.  Make the space and 
+	subspace dictionaries be pointers (to save space when
+	only reading objects).
+
+	* som.c (bfd_som_set_section_attributes): Now returns a boolean;
+	some references changed.  Allocate a copyable data stucture if
+	none exists.  Store info into the copyable data structure.
+	(bfd_som_set_subsection_attributes): Likewise.
+	(som_is_space, som_is_subspace, som_is_container): New functions.
+	Use these instead of directly accessing private data.
+	(som_prep_headers): Allocate space and subspace headers here.
+	Fill in some fields in the space/subspace headers from the
+	copyable data.
+	(som_bfd_copy_private_section_data): Only copy the stuff
+	that we really need to make objcopy and strip work.  Allocate
+	the copy_data structure for the output bfd before copying.
+
+	* som.h (struct som_exec_data): New structure to hold exec
+	info that must be preserved when running objcopy/strip.
+	(struct somdata): Add new "exec_data" field and accessor
+	macro.  Add some comments on how the various fields are used.
+	(som_section_data_struct): Make is_space and is_subspace bitfields.
+	Delete unused subspace_index.  All references now use the
+	target_index field within the section structure itself.
+
+	* som.c (make_unique_section): Delete unused declaration.
+	(som_bfd_copy_private_bfd_data): New function.
+	(som_object_setup): Allocate space for and save exec information
+	that needs to be copied during objcopy/strip.
+	(som_mkobject): Do not allocate space for a file header here.
+	It is not used when only reading SOM objects.
+	(som_prep_headers): Allocate space for and attach a file header
+	to the output bfd.  For executables, use the saved system_id
+	value rather than trying to guess the right value.  Do not abort
+	wwhen setting file_hdr->entry* for executables.
+	(som_begin_writing): For executables, set the exec_entry and
+	exec_flags fields.
+	(som_copy_private_backend_section_data): Always return a value.
+
+	* libhppa.h (PA_PAGESIZE): Define.
+
+	* som.c (SOM_ALIGN): Define.
+	(som_begin_writing): If writing an executable, initialize all
+	fields in the exec header to zero.  Update fields in the exec
+	header as sizes of loadable subspaces are computed.  Carefully
+	preserve alignments when building executables.  Actually write the
+	exec after all the fields are filled in.
+
+        * Better long-filename handling.  Reads SOM ABI compliant extended
+	names, but doesn't quite write compliant extended names yet.
+	* som.c (som_slurp_extended_name_table): Delete function.  The
+	generic code will handle things correctly.
+	(som_slurp_armap): Seek to the beginning of the next member.
+	(normalize): New function.
+	(som_bfd_ar_write_symbol_stuff): Take the size of the extended
+	name table into account when computing the file offsets in the
+	SOM dictionary.  Make sure to align to an even boundary.
+	(som_write_armap): Initialize the checksum to zero.
+	(ar_maxchars): Fix.  Opps.
+
+Fri Mar 18 20:35:24 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* aoutx.h (reloc_type_lookup): Handle BFD_RELOC_CTOR on a 64-bit
+	machine.  Handle BFD_RELOC_SPARC13 and BFD_RELOC_SPARC_BASE13.
+
+Thu Mar 17 18:26:46 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* bfd-in.h (BFD_VERSION): Use @VERSION@.
+	* Makefile.in (bfd.h): Replace it with contents of VERSION file.
+	* bfd-in2.h: Regenerated.
+
+	* trad-core.c (trad_unix_bfd_is_local_label): Fixed typo where
+	this was also named trad_unix_bfd_copy_private_bfd_data.
+
+Thu Mar 17 10:37:07 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* aoutx.h, elfcode.h, coff-alpha.c, bout.c, ecoff.c, ecofflink.c,
+	elf32-hppa.c, elf32-mips.c, linker.c, som.c, sunos.c: If malloc(0)
+	returns NULL, it is not an error.  It's possible that some of
+	these checks are not necessary (because the size can never be
+	zero), but putting in the checks is the conservative thing to do
+	in light of the fact that some of these malloc calls replaced
+	unchecked alloca calls, in which a zero argument would work fine.
+
+Thu Mar 17 11:44:45 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* osf-core.c (osf_core_bfd_copy_private_bfd_data): Remove
+	duplicate definition.
+	(osf_core_bfd_is_local_label): Define.
+
+	* reloc.c (bfd_generic_get_relocated_section_contents): Don't fail
+	if malloc (0) fails.  bfd_canonicalize_reloc returning 0 is not a
+	failure indication, it merely means there are no relocs.
+
+	* elfcode.h (NAME(bfd_elf,write_object_contents)): Don't use space
+	after NAME, since SunOS /bin/cc can't handle it.
+
+Wed Mar 16 16:43:33 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* netbsd386.c (N_SET_FLAGS): Don't nuke the machine id field.
+	From sukes@glue.umd.edu (Tasuki Hirata).
+
+Wed Mar 16 07:55:54 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* aoutf1.h (4 places): Use a simple #if on ARCH_SIZE, rather than
+	all that convoluted stuff with NAME, CAT3, etc.  The convoluted
+	stuff broke for SunOS4 /bin/cc (due to DEFUN elimination, I guess).
+
+Wed Mar 16 00:02:05 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_prep_for_fixups): Detect section symbols based
+	on either the lack of private data or the symbol flags.  Do not
+	munge section symbol names anymore -- they no longer confuse GDB.
+	(som_begin_writing): Leave space for an exec header if writing
+	an executable.
+	(som_slurp_symbol_table): Recognize both forms of section symbol
+	names "L$0\002" and "$<FOO>$".  Change the name of "L$0\002"
+	section symbols to be the name of the section they represent.
+	Debugging  symbols begin with "L$0\001", not just "L$".
+
+Tue Mar 15 22:58:28 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* bfd-in2.h, libbfd.h, libcoff.h: Rebuilt.
+
+	* bfd-in.h (JUMP_TABLE): Add new entries to the jump table
+	for bfd_copy_private_section_data, bfd_copy_private_bfd_data,
+	and bfd_is_local_label.
+
+	* targets.c: Add new entries to the bfd_target structure.
+	
+	* bfd.c (bfd_copy_private_bfd_data): New definition.
+
+	* section.c (bfd_copy_private_section_data): New definition.
+
+	* syms.c (bfd_is_local_label): New definition.
+
+	* libbfd-in.h (bfd_generic_is_local_label): Declare.
+
+	* libbfd.c (bfd_generic_is_local_label): New function.
+
+	* *-core.c: Provide default definitions for new functions in
+	the target vector which all point to bfd_false.
+
+	* aout-target.h, coffcode.h, elf32-target.h elf64-target.h, ieee.c
+	libaout.h, libecoff.h, nlm-target.h, oasys.c, srec.c, tekhex.c
+	Default new vectors for copying private backend data to bfd_true.
+	Default new vector for determining if a symbol is a local label
+	to bfd_generic_is_local_label.
+
+	* som.c (som_bfd_copy_private_section_data): New function.
+	(som_bfd_is_local_label): New function.
+	(som_bfd_copy_private_bfd_data): For now default to bfd_true.
+
+	* elf32-hppa.c (hppa_elf_is_local_label): New function.
+
+Tue Mar 15 23:55:47 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* cf-m68klynx.c (CALC_ADDEND): Use _bfd_m68klynx_howto_table.
+
+Tue Mar 15 04:41:13 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+	* Most files:
+	Replace DEFUN and DEFUN_VOID with K&R-style function definition.
+	Indent some of them to GNU standards.
+
+	* aout32.c, archures.c, core.c, cpu-h8300.c, cpu-i960.c,
+	cpu-m68k.c, cpu-m88k.c, cpu-mips.c, cpu-vax.c, ctor.c, demo64.c,
+	elf32-hppa.h, gen-aout.c, host-aout.c, init.c, libhppa.h,
+	libieee.h, liboasys.h, newsos3.c, som.h, stab-syms.c, sunos.c:
+	Update copyright years.
+
+Mon Mar 14 11:41:23 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_prep_for_fixups): A relocation involving the section
+	symbol for the *ABS* section is really a relocation involving
+	no symbol.
+	(som_slurp_symbol_table): Do not set BSF_GLOBAL or BSF_EXPORT for
+	undefined symbols.  Correctly distinguish between debugger symbols
+	and section symbols.
+
+	* som.c (setup_sections): Set SEC_DEBUGGING and the section attributes
+	for spaces and subspaces.
+
+	* som.c (som_bfd_count_ar_symbols): Fix typo.
+
+	* som.c (som_object_setup): Set EXEC_P, D_PAGED, WP_TEXT, and
+	HAS_RELOC based on the object's magic number.
+	(make_unique_section): Delete function.  BFD and its users are
+	prepared to handle multiple sections with the same name.
+	(setup_sections): Allocate space on the BFD's obstack to hold
+	section names.  Use bfd_make_setion_anyway rather than the
+	obsolete make_unique_section.
+	(som_prep_headers): Choose the correct SOM magic number based
+	on the BFD's flags.
+	(som_bfd_fill_in_ar_symbols): Return false, not NULL on error.
+
+Sat Mar 12 09:46:09 1994  Ian Lance Taylor  (ian@cygnus.com)
+
+	* elf32-ppc.c: Renamed from elf32-powerpc.c.
+	* nlm32-ppc.c: Renamed from nlm32-powerpc.c.
+	* Makefile.in, configure.in: Corresponding changes.
+
+Fri Mar 11 22:27:19 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elf32-powerpc.c: Extensive changes to update to preliminary ABI.
+
+Fri Mar 11 00:34:59 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* sunos.c (sunos_read_dynamic_info):  Assume that dynamic info
+	is always located at the start of the data section to allow
+	recovery of the dynamic info from a stripped executable.
+	* ecoff.c (ecoff_styp_to_sec_flags):  Handle STYP_PDATA, STYP_XDATA
+	and STYP_COMMENT.
+
+Wed Mar  9 17:17:53 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* libbfd-in.h: Remove alloca cruft.  It was missing some necessary
+	cruft (like the #pragma alloca for AIX).
+	In addition to that problem, the C alloca calls xmalloc, which
+	means checking for being out of memory can't work right.  The
+	following changes remove all uses of alloca from BFD.
+	* hosts/solaris2.h: Remove alloca cruft.
+	* som.c: Replace alloca with a fixed size auto array.
+	* aoutx.h, elfcode.h, nlmcode.h, bout.c, coff-alpha.c, ecoff.c,
+	ecofflink.c, elf32-hppa.c, elf32-mips.c, linker.c, reloc.c, som.c,
+	sunos.c: Replace alloca with malloc and appropriate error checking and
+	freeing.
+	* linker.c: Replace alloca with obstack_alloc.
+	* libbfd.h: Rebuilt.
+
+Tue Mar  8 12:10:38 1994  Ian Lance Taylor  (ian@cygnus.com)
+
+	* coff-mips.c (mips_relocate_section): Handle MIPS_R_LITERAL like
+	MIPS_R_GPREL.
+
+Sat Mar  5 14:08:54 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* elf32-hppa.h, elfcode.h:  Replace uses of Elf*_Half, Elf*_Word,
+	Elf*_Off typedefs by their expansion, the typedefs have been
+	removed from include/elf/internal.h.
+	* elfcode.h (bfd_section_from_shdr):  Handle SHT_DYNAMIC section like
+	SHT_PROGBITS section.
+
+Thu Mar  3 20:03:39 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.h (_PA_RISC_ID): Treat HOST_HPPAOSF just like HOST_HPPABSD.
+
+Wed Mar  2 13:28:06 1994  Jim Kingdon  (kingdon@deneb.cygnus.com)
+
+	* configure.host: Recognize i[34]86-sequent-*.
+
+	* trad-core.c (trad_unix_core_file_p): A non-zero, not zero,
+	return from bfd_seek indicates an error.
+	New macro TRAD_CORE_DSIZE_INCLUDES_TSIZE to replace
+	TRAD_CORE_STACK_OFFSET.
+	* hosts/symmetry.h: Define TRAD_CORE_DSIZE_INCLUDES_TSIZE and
+	TRAD_CORE_USER_OFFSET but not HOST_STACK_OFFSET.
+
+Wed Mar  2 11:57:03 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.[ch]: Do not include libhppa.h in som.c, instead include
+	it in som.h.
+
+	* elf32-hppa.[ch]: Do not include libhppa.h in elf32-hppa.c, instead
+	include it in elf32-hppa.h.
+
+	* som.c (log2): Return -1 on error rather than aborting.
+	(setup_sections): Bubble up an error from log2.
+
+	* Changes to make HP C compiler happy in both traditional
+	and ANSI mode.
+	* som.c (hppa_som_gen_reloc_type): Use correct enum type for
+	field parameter.
+	(bfd_som_set_section_attributes): Use unsigned int rather than
+	unsigned char to avoid GNU-C extensions.
+	(bfd_som_attach_aux_hdr): Return a boolean to indicate success
+	or failure rather than aborting on failure.
+
+	* som.h (bfd_som_set_section_attributes): Fix prototype to match
+	som.c changes.
+	(bfd_som_attach_aux_hdr): Add prototype.
+	(hppa_som-gen_reloc_type): Likewise.
+
+	* elf32-hppa.c: Add a couple casts to make HP compiler happy.
+	(hppa_look_for_stubs_in_section): Do not return false on failure
+	until rest of code is ready to handle it.  Abort for now.
+
+Tue Mar  1 18:33:59 1994  Jim Kingdon  (kingdon@deneb.cygnus.com)
+
+	* bfd-in2.h: Rebuilt.
+
+Tue Mar  1 13:06:53 1994  Kung Hsu  (kung@mexican.cygnus.com)
+
+	* i386os9k.c: use new functions bfd_set_error and bfd_get_error.
+	* Makefile.in: delete an extra blank.
+	* configure.in : Add i396os9k_vec.
+
+Mon Feb 28 15:41:01 1994  Kung Hsu  (kung@mexican.cygnus.com)
+
+	* config.bfd : Add i386-os9k.
+	* config/i386-os9k.mt : Newly add os9k target makefile.
+
+	* i386os9k.c : new file to handle os9k format bfd.
+	* Makefile.in : Handle new file i386os9k.c
+	* targets.c : Add bfd_target_os9k_flavour and i386os9k_vec.
+	* cache.c : Initialize cache_sentinel to 0.
+
+Sun Feb 27 16:30:55 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* elf32-hppa.c (mismatches, retval_mismatches): Fix mismatch
+	action in case where caller specified no argument relocation.
+	(hppa_elf_build_linker_stub): Try again to get the sym_ptr_ptr
+	right in the original relocation and the stub's relocation.
+
+        * elf32-hppa.h (hppa_look_for_stub_in_section): Fix typo.  Delete
+	unused symbols argument.
+
+	* elf32-hppa.c (hppa_elf_stub_reloc): Accept asymbol ** rather
+	than asymbol * for original target symbol.  All callers changed.
+	Set reloc->sym_ptr_ptr appropriately.
+	(hppa_elf_build_linker_stub): Set reloc->sym_ptr_ptr correctly.
+	(hppa_elf_look_for_stubs_in_section): No longer need symbols
+	argument.  Use the output symbols when canonicalizing the relocs,
+	creating them if necessary.
+
+	* linker.c (_bfd_generic_link_output_symbols): Do not
+	rebuild/clobber the output symbols if they already exist.
+
+Sun Feb 27 15:22:36 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* targets.c (BFD_SEND, BFD_SEND_FMT): Add debugging versions that
+	check all the pointer dereferences.  Enabled via DEBUG_BFD_SEND.
+	* bfd-in2.h: Rebuilt.
+
+	* srec.c (hex_value): Always set to a size of 256 bytes.
+	(srec_init): Cosmetic changes.
+
+Sun Feb 27 11:18:47 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* elf32-hppa.c: Second half of major cleanup.  More comments,
+	PARAMize and staticize rest of functions.  Delete unused
+	functions.  Delete unused/unnecessary arguments to some functions.
+	Group static vars together.  Abort for bad errors until we have
+	error code propogation working.  Work on spacing and indention.
+	Add FIXMEs for unresolved problems.  Use enums rather than
+	#defines for lots of things.  Merge two functions which build
+	linker stubs into a single function (so they can easily share a
+	ton of common code).
+
+Sat Feb 26 10:00:45 1994  Ian Lance Taylor  (ian@cygnus.com)
+
+	* reloc.c (_bfd_relocate_contents): Adjust handling of overflow to
+	avoid depending upon right shifts of signed numbers, and to
+	correct handling of src_mask with lower bits zero.
+
+	* aoutx.h, archive.c: Add casts to avoid warnings from SVR4 cc.
+	* ecoff.c, ecofflink.c, ecoffswap.h, srec.c: Likewise.
+	* elf32-i386.c: Likewise.
+	* elfcode.h (bfd_section_from_shdr): Make i unsigned; remove old
+	#if 0 code.
+	(elf_write_phdrs): Make i unsigned.
+	(map_program_segments): Make i and n_left unsigned.
+	(assign_file_positions_except_relocs): Make i unsigned.
+	(write_shdrs_and_ehdr): Make count unsigned.
+	(assign_file_positions_for_relocs): Make i unsigned.
+	(NAME(bfd,elf_write_object_contents)): Make count unsigned.
+	(section_from_elf_index): Make index argument unsigned.
+
+Fri Feb 25 21:34:58 1994  Ian Lance Taylor  (ian@cygnus.com)
+
+	* elfcode.h: Don't include assert.h.
+	(swap_out_syms): Use BFD_ASSERT rather than assert.
+
+	* linker.c (_bfd_generic_link_write_global_symbol): Add missing
+	break in switch.
+
+	* hosts/i386v4.h (qsort, strtol): Remove incorrect and useless
+	declarations.
+
+Fri Feb 25 16:35:57 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* libhppa.h (hppa_rebuild_insn): Moved here from elf32-hppa.c.
+
+	* elf32-hppa.h (elf_hppa_tc_symbol): Add new arguments.
+	(elf_hppa_tc_make_sections): Likewise.
+	(elf_hppa_final_processing): Add extern decl.
+
+	* elf32-hppa.c: First half of major cleanup.  Add/cleanup lots of
+	comments.  PARAMize some static functions.  Delete unused functions.
+	Delete unused/unnecessary arguments to many functions.  Group
+	static vars together.  Collapse common case statements together
+	in many places.  Use default case when possible instead of listing
+	each case separately.  Abort for bad errors until we get error
+	code propogation working.  Work on spacing and indention problems.
+	Add FIXMEs for some unresolved problems.  Delete hopelessly broken 
+	COMPLEX relocation support (it's never used anyway).
+	(hppa_elf_rebuild_insn): Delete.  Moved into libhppa.h.
+	(elf_hppa_tc_symbol): Accept and use new arguments (symext chains).
+	(elf_hppa_tc_make_sections): Likewise.
+
+	* format.c (bfd_check_format_matches): Initialize matching_vector
+	to keep gcc -Wall quiet.
+
+	* elfcode.h (elf_slurp_reloca_table): Fix typo.
+
+	* som.c (som_get_symtab_upper_bound): Use "sizeof (asymbol *)"
+	not "sizeof (som_symbol_type *)".
+
+	* elfcode.h (elf_get_symtab_upper_bound): Use "sizeof (asymbol *)"
+	not "sizeof (asymbol").  Opps.
+
+Fri Feb 25 13:19:04 1994  Ted Lemon  (mellon@pepper.ncd.com)
+
+	* bfd.c (bfd_get_gp_size): Can't return gp value on an archive.
+	(bfd_set_gp_size):  Can't set gp value on an archive.
+
+Fri Feb 25 12:57:00 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
+
+	* srec.c (pass_over): Don't skip too many characters when
+	end of line seen.
+
+Fri Feb 25 11:41:57 1994  Ian Lance Taylor  (ian@cygnus.com)
+
+	* ecoff.c (ecoff_sizeof_headers): Align result to 16 byte
+	boundary.
+
+Thu Feb 24 07:13:22 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_bfd_derive_misc_symbol_info): Derive symbol_info
+	field for absolute symbols in the same manner as undefined
+	and common symbols.
+
+Thu Feb 24 04:29:19 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* elfcode.h (elf_core_file_p):  Check for core file e_machine match
+	like in elf_object_p.
+
+Wed Feb 23 18:28:37 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* elfcode.h (alloca): Delete declaration.
+
+	* som.c (som_prep_headers): Use CPU_PA_RISC1_0 for magic
+	number rather than HP9000S800_ID.  Note som.c is careful
+	to make sure CPU_PA_RISC1_0 is always defined.
+
+Mon Feb 21 10:12:02 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* Makefile.in (targets.o, archures.o): Use ALL_CFLAGS to supply
+	flags to explicit compile actions.
+
+Mon Feb 21 09:50:06 1994  Ian Lance Taylor  (ian@lisa.cygnus.com)
+
+	* ecofflink.c (ecoff_write_symhdr): Set symhdr->magic here.
+	* ecoff.c (ecoff_write_object_contents): Make sure .bss section
+	ends on a page boundary if there is no symbol table.
+	(ecoff_bfd_final_link): Don't set symhdr->magic here.
+
+	* hosts/hp300.h: Include <stdlib.h>; don't declare free.
+
+	* som.c (som_bfd_count_ar_symbols): Use a pointer and alloca
+	rather than an array of variable size.
+	(som_bfd_fill_in_ar_symbols): Likewise.
+	(som_bfd_ar_write_symbol_stuff): Likewise.
+
+	* coff-alpha.c (alpha_relocate_section): Rewrite mask and shift
+	operation to avoid OSF 1.3 cc bug.
+	* ecoff.c (ecoff_write_object_contents): Make text_size, data_size
+	and bss_size bfd_size_type instead of unsigned long.  Make
+	text_start and data_start bfd_vma instead of unsigned long.
+	* ecofflink.c (ecoff_add_string): Remove incorrect cast of return
+	value.
+
+Sun Feb 20 16:06:54 1994  Ian Lance Taylor  (ian@lisa.cygnus.com)
+
+	* linker.c (_bfd_generic_link_add_archive_symbols): Consider
+	symbols in the order they appear in the archive map.
+
+Sat Feb 19 03:17:32 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* coff-alpha.c (reloc_nil):  Add forward declaration, add missing
+	error_message argument.
+	* coff-sparc.c (bfd_coff_generic_reloc):  Add forward declaration,
+	add missing error_message argument.
+	* mipsbsd.c (mips_fix_hi16_s):  Add forward declaration, add missing
+	error_message argument.
+
+Fri Feb 18 11:41:58 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Support for PowerPC NetWare.
+	* nlm32-powerpc.c: New file.
+	* config.bfd (powerpc-*-netware*): New target; use ppc-nlm.
+	* config/ppc-nlm.mt: New file.
+	* configure.in (nlm32_powerpc_vec): New target vector; use
+	nlm32-powerpc.o, nlm32.o, nlm.o.
+	* targets.c (nlm32_powerpc_vec): Declare.
+	* Makefile.in (BFD32_BACKENDS): Add nlm32-powerpc.o.
+	(CFILES): Add nlm32-powerpc.c.
+
+	Initial support for PowerPC ELF.  Done without an ABI, and
+	probably to be changed when I get an ABI.
+	* config.bfd (powerpc-*-sysv4*): New target; use ppc-elf.
+	* config/ppc-elf.mt: New file.
+	* configure.in (bfd_elf32_powerpc_vec): New target vector; use
+	elf32-powerpc.o, elf32.o, elf.o.
+	* elf32-powerpc.c: New file.
+	* elfcode.h (prep_headers): Add bfd_arch_powerpc case.
+	(elf_set_arch_mach): Likewise.
+	* targets.c (bfd_elf32_powerpc_vec): Declare.
+	* Makefile.in (BFD32_BACKENDS): Add elf32-powerpc.o.
+	(CFILES): Add elf32-powerpc.c.
+	Rebuilt dependencies.
+
+Thu Feb 17 15:29:55 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* coffgen.c (coff_write_linenumbers): Always return a value.
+
+	* elfcode.h (elf_slurp_symbol_table): Handle zero symbols
+	reasonably.  Allocate x_symp using alloca.
+
+	* elfcode.h (map_program_segments): ELF program header entries
+	must be sorted by load address.  This used to generate the entries
+	in reverse order.
+
+	* section.c (SEC_IN_MEMORY): Define.
+	(asection): Rename unused field otheruserdata to contents, and
+	make it char *.
+	(bfd_make_section_anyway): Initialize contents field to NULL.
+	(bfd_get_section_contents): If SEC_IN_MEMORY is set, get section
+	contents from contents field rather than from file.
+	* bfd-in2.h: Rebuilt.
+
+Thu Feb 17 08:30:53 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* bfd.c (bfd_get_error, bfd_set_error): New functions.
+	(bfd_error): Make static.
+	(bfd_error_type): Renamed from bfd_ec.  Prepend "bfd_error_" to
+	all values.
+	* bfd-in2.h: Regenerated.
+	* aix386-core.c, aout-adobe.c, aout-encap.c, aout-target.h, 
+	aoutf1.h, aoutx.h, archive.c, archures.c, 
+	bfd.c, bout.c, cache.c, coff-alpha.c, coff-mips.c, 
+	coff-rs6000.c, coffcode.h, coffgen.c, core.c, ctor.c, 
+	ecoff.c, ecofflink.c, elf.c, elf32-hppa.c, elf32-mips.c, 
+	elfcode.h, format.c, hash.c, hp300hpux.c, hppabsd-core.c, 
+	i386lynx.c, ieee.c, libbfd.c, libelf.h, linker.c, 
+	lynx-core.c, nlm.c, nlm32-alpha.c, nlm32-i386.c, 
+	nlm32-sparc.c, nlmcode.h, oasys.c, opncls.c, osf-core.c, 
+	ptrace-core.c, reloc16.c, rs6000-core.c, section.c, som.c, 
+	srec.c, sunos.c, syms.c, targets.c, tekhex.c, 
+	trad-core.c: Change callers.
+
+Tue Feb 15 22:27:27 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c: Remove FIXMEs for things which have been dealt with.
+
+Tue Feb 15 19:39:24 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* section.c (bfd_get_section_contents): Since this function reads
+	unrelocated contents, the section's raw size is always the one to
+	use for bounds checking.
+
+	* linker.c (default_indirect_link_order): In assertion, compare
+	link_order size field against cooked size, not raw size, of input
+	section.
+
+	* bout.c (b_out_get_reloc_upper_bound): For BSS section, just
+	return 0.
+	(aligncode): When shrinking, the addend should be set to the
+	current offset in the section plus the number of bytes of padding
+	that will actually be retained.
+	(b_out_relax_section): If a section contains no relocations, don't
+	bother processing them.
+	(b_out_get_relocated_section_contents): Set reloc_done.  Assert
+	that bfd_get_section_contents returns true.  Check that relocs are
+	properly ordered.
+	(b_out_get_relocated_section_contents, case ALIGNDONE): Assert
+	that reloc->addend falls between the current source offset and the
+	raw size of the input section.
+
+	* config.bfd: Support i960 vxworks versions > 5.0 with coff, not
+	bout.  Default with no version number is still bout.  Support
+	explicit i960-coff target too.
+
+	* bout.c: Changed some indentation, deleted trailing whitespace,
+	fixed some comments, removed some "#if 1" lines.
+	(output_addr): New macro.
+	(calljx_callback, callj_callback, get_value, abs32code, aligncode,
+	b_out_get_relocated_section_contents): Use it for readability.
+
+Tue Feb 15 09:00:16 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_bfd_prep_for_ar_write): Iterate through the SOM
+	symbols, not the BFD symbols.
+	(som_bfd_ar_write_symbol_stuff): Likewise.
+
+Mon Feb 14 22:55:20 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_slurp_symbol_table): Do not die if a BFD doesn't
+	have any symbols.
+
+	* Finish basic read-write support for SOM archive libraries.  Bugs
+	surely remain as this hasn't been tested all that much.
+	* som.c (SOM_LST_HASH_SIZE, SOM_LST_MODULE_LIMIT): Define.
+	(struct som_misc_symbol_info): New structure to hold info necessary
+	to build both normal and library symbol tables.
+	(som_derive_misc_symbol_info): New function to derive info necessary
+	to build both normal and library symbol tables.
+	(som_build_and_write_symbol_table): Use new function to derive misc
+	symbol information.
+	(som_slurp_symbol_table): Update backend private data for symbols
+	appropriately.
+	(som_bfd_prep_for_ar_write): New function.
+	(som_bfd_ar_symbol_hash): New function.
+	(som_bfd_ar_write_symbol_stuff): New function.
+	(som_write_armap): Flesh out.
+	(som_vec): Fix ar padding character.
+
+	* som.c: Consistently use memset rather than bzero.
+
+Mon Feb 14 17:02:28 1994  Stu Grossman  (grossman at cygnus.com)
+
+	* coff-rs6000.c:  Add Lynx core file support, use HOST_AIX, where
+	appropriate.
+	* rs6000-core.c:  Use HOST_AIX instead of COREFILES_PLEASE.
+	* config/rs6000.mh:  Remove defs of ARCHIVES_PLEASE and
+	COREFILES_PLEASE.
+	* config/rs6000lynx.mh:  Turn on Lynx core file support.
+	* hosts/rs6000.h:  #define HOST_AIX.
+	* hosts/rs6000lynx.h:  Create this to enable Lynx host support.
+
+Sun Feb 13 14:30:00 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.h (som_symbol_data): Safely access backend private data
+	for BFD symbols.  All callers changed.
+
+	* Read-only SOM archive support.
+	* som.c (som_bfd_count_ar_symbols): New helper function.
+	(som_bfd_fill_in_ar_symbols): New helper function.
+	(som_slurp_armap): New function to read a SOM LST.
+
+	* som.h: Include <lst.h> and <ar.h>.
+
+Sat Feb 12 22:34:14 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* elfcode.h (elf_map_symbols): Fix typo.
+	(write_object_contents): Check return values from prep_headers and
+	elf_compute_section_file_positions.
+	(set_section_contents): Likewise.
+
+Fri Feb 11 16:56:50 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* archive.c (normalize) [VMS]: Call malloc, not bfd_xmalloc.
+	(bfd_construct_extended_name_table): Check result of normalize.
+
+Tue Feb  8 08:57:31 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	Make all callers of malloc or realloc (including via obstacks)
+	check the result for NULL.  Most set bfd_error to no_memory and
+	return in that case; a few are harder to fix, and are marked
+	with "FIXME <return type>".
+
+	* elf32-hppa.c (hppa_elf_build_arg_reloc_stub
+	hppa_elf_build_long_branch_stub):  Check bfd_make_empty_symbol return.
+	* linker.c (_bfd_generic_link_output_symbols
+	_bfd_generic_link_write_global_symbol): Ditto
+	* section.c (bfd_make_section_anyway): Ditto.
+
+	* tekhex.c (find_chunk tekhex_mkobject): Check bfd_alloc.
+	(first_phase): Ditto.  FIXME void
+	(tekhex_make_empty_symbol): Check bfd_zalloc.
+
+	* sunos.c (sunos_read_dynamic_info): Check bfd_zalloc.
+	(MY(read_dynamic_symbols) MY(read_dynamic_relocs)): Check bfd_alloc.
+
+	* stringhash.c (_bfd_stringtab_hash_newfunc): Check bfd_hash_allocate.
+
+	* srec.c: Indent.
+	(fillup_symbols): Check bfd_alloc.  FIXME void
+	(srec_mkobject srec_get_section_contents
+	srec_set_section_contents): Check bfd_alloc. 
+	(srec_make_empty_symbol): Check bfd_zalloc.
+
+	* som.c (hppa_som_gen_reloc_type): Check bfd_alloc_by_size_t.
+	(make_unique_section): Check bfd_alloc.
+	(som_new_section_hook): Check bfd_zalloc.
+	(bfd_som_attach_aux_hdr): Ditto.  FIXME void
+
+	* rs6000-core.c (rs6000coff_core_p): Check bfd_zalloc.
+
+	* osf-core.c (osf_core_make_empty_symbol): Check bfd_zalloc.
+	(osf_core_core_file_p): Check bfd_alloc.
+
+	* oasys.c (oasys_slurp_symbol_table oasys_archive_p
+	oasys_mkobject oasys_object_p oasys_new_section_hook
+	oasys_set_section_contents): Check bfd_alloc.
+	(oasys_slurp_section_data): Check bfd_zalloc and bfd_alloc.
+	(oasys_make_empty_symbol): Check bfd_zalloc.
+
+	* nlmcode.h (nlm_make_empty_symbol): Check bfd_zalloc.
+	(nlm_slurp_symbol_table): Check bfd_zalloc and bfd_alloc.
+
+	* nlm32-sparc.c (nlm_sparc_read_import): Check bfd_alloc.
+
+	* nlm32-i386.c (nlm_i386_read_import): Check bfd_alloc.
+
+	* nlm32-alpha.c (nlm_alpha_read_import): Check bfd_alloc.
+
+	* linker.c (_bfd_link_hash_newfunc
+	(generic_link_hash_newfunc
+	(archive_hash_newfunc
+	(_bfd_generic_link_add_one_symbol): Check bfd_hash_allocate.
+	(_bfd_generic_final_link
+	(_bfd_generic_link_output_symbols
+	(default_indirect_link_order): Check bfd_alloc.
+	(bfd_new_link_order): Check bfd_alloc_by_size_t.
+
+	* irix-core.c (irix_core_make_empty_symbol): Check bfd_zalloc.
+
+	* ieee.c: Indent.
+	(read_id get_symbol get_section_entry ieee_archive_p ieee_object_p
+	ieee_slurp_section_data ieee_new_section_hook): Check bfd_alloc.
+	(do_one): Check bfd_alloc.  Return a boolean.
+	(ieee_slurp_section_data): Check it.
+	(init_for_output): Check bfd_alloc.  Return a boolean.
+	(ieee_set_section_contents): Check it.
+	(do_with_relocs):  Check bfd_alloc.  Return a boolean.
+	(ieee_bfd_debug_info_accumulate): Ditto.  FIXME void.
+	(ieee_mkobject): Check bfd_zalloc.
+	(ieee_make_empty_symbol): Check bfd_zmalloc.
+
+	* hpux-core.c (hpux_core_make_empty_symbol): Check
+	bfd_zalloc.
+
+	* hppabsd-core.c (hppabsd_core_make_empty_symbol): Check
+	bfd_zalloc.
+	(hppabsd_core_core_file_p): Check bfd_zalloc.
+
+	* hp300hpux.c (MY(slurp_symbol_table)): Check bfd_alloc.
+
+	* elfcode.h (elf_new_section_hook): Check bfd_alloc.
+	(bfd_section_from_phdr): Ditto.
+	(write_relocs): Ditto.  FIXME void
+	(elf_map_symbols assign_section_numbers map_program_segments):
+	Ditto.  Return a boolean. 
+	(swap_out_syms): Ditto.  Check elf_map_symbols.
+	(elf_slurp_symbol_table): Check bfd_zalloc.
+	(elf_slurp_reloca_table): Check bfd_alloc.
+	(elf_slurp_reloc_table): Ditto.
+	(elf_compute_section_file_positions): Check assign_section_numbers.
+	(assign_file_positions_except_relocs): Return a boolean.
+	Check map_program_segments.
+	(elf_compute_section_file_positions): Check it.
+
+	* elf32-mips.c (mips_elf_final_link): Check bfd_alloc.
+
+	* elf32-hppa.c (hppa_elf_stub_branch_reloc): Check bfd_zmalloc and
+	realloc. 
+	(hppa_elf_stub_reloc): Ditto.
+	(hppa_elf_build_arg_reloc_stub): Check bfd_zalloc.
+	(hppa_elf_build_long_branch_stub): Ditto.
+	(elf32_hppa_backend_symbol_table_processing): Ditto.
+
+	* ecoff.c (ecoff_set_symbol_info): Check bfd_alloc.  Return a boolean.
+	(ecoff_slurp_symbol_table): Check it.
+	(ecoff_slurp_armap): Check bfd_alloc.
+	(ecoff_write_armap): Check bfd_zalloc.
+	(ecoff_link_hash_newfunc): Check bfd_hash_allocate and
+	_bfd_link_hash_newfunc. 
+	(ecoff_link_add_externals): Check bfd_alloc.
+
+	* ctor.c (bfd_constructor_entry): Check bfd_alloc.
+
+	* coffgen.c (coff_real_object_p): Check bfd_alloc.
+	(coff_renumber_symbols): Check bfd_alloc_by_size_t.  Return a boolean.
+	(coff_write_symbol): Check bfd_alloc.  FIXME int
+	(coff_write_linenumbers): Check bfd_alloc.  Return a boolean.
+	(coff_section_symbol): Check bfd_alloc_by_size_t.
+	(coff_get_normalized_symtab): Check bfd_alloc.
+	(coff_bfd_make_debug_symbol): Check bfd_zalloc.
+	* libcoff-in.h: Change decls of coff_renumber_symbols,
+	coff_write_linenumbers.
+	* libcoff.h: Rebuilt.
+	* coffcode.h (coff_write_object_contents): Check
+	coff_renumber_symbols, coff_write_linenumbers.
+
+	* coffcode.h: Indent.
+	(coff_add_missing_symbols): Check bfd_alloc_by_size_t.  Return a
+	boolean. 
+	(coff_write_object_contents): Check it.
+
+	* coff-alpha.c (alpha_relocate_section): Check bfd_alloc.
+	* coff-mips.c (mips_relocate_section): Ditto.
+
+	* archive.c (bfd_slurp_bsd_armap_f2): Check bfd_alloc value.
+	(do_slurp_bsd_armap): Ditto.
+	(compute_and_write_armap): Check bfd_realloc value.
+
+	* aoutx.h (translate_from_native_sym_flags): Check bfd_alloc
+	return value.  Return boolean value.
+	(NAME(aout,make_empty_symbol)): Check bfd_zalloc return value.
+	(NAME(aout,slurp_symbol_table)): Check bf_alloc and bfd_zalloc
+	return value.
+	(add_to_stringtab): Ditto.  FIXME void
+	(aout_link_hash_newfunc): Check bfd_hash_allocate return value.
+	(aout_link_add_symbols): Check bfd_alloc value.
+	(translate_symbol_table): Check translate_from_native_sym_flags.
+	* hp300hpux.c (MY(slurp_symbol_table)): Ditto.
+	* aoutx.h (aout_link_hash_newfunc): Check _bfd_link_hash_newfunc.
+
+	* opncls.c (bfd_zalloc bfd_realloc): Check result of bfd_alloc.
+
+	* opncls.c (obstack_chunk_alloc): Define as malloc, not
+	bfd_xmalloc_by_size_t. 
+	(_bfd_new_bfd): Check obstack_begin for 0 return.
+
+	* ieee.c (obstack_chunk_alloc): Define as malloc, not
+	bfd_xmalloc_by_size_t. 
+	(ieee_archive_p): Check obstack_begin for 0 return and
+	obstack_finish for NULL return.
+
+	* hash.c (obstack_chunk_alloc): Define as malloc, not
+	bfd_xmalloc_by_size_t. 
+	(bfd_hash_table_init_n): Check obstack_begin for 0 return and
+	obstack_finish for NULL return.
+	(bfd_hash_lookup): Check obstack_alloc for NULL return.
+
+	* ecofflink.c (obstack_chunk_alloc): Define as malloc, not
+	bfd_xmalloc_by_size_t. 
+	bfd_ecoff_debug_accumulate
+	bfd_ecoff_debug_accumulate_other): Check obstack_alloc.
+	(add_file_shuffle add_memory_shuffle): Check obstack_alloc for
+	NULL return.  Return boolean, not void.
+	(bfd_ecoff_debug_init): Check obstack_begin for 0 return.
+	(bfd_ecoff_debug_accumulate): Check add_file_shuffle
+	and add_memory_shuffle return. 
+	(string_hash_newfunc): Check bfd_hash_allocate and bfd_hash_newfunc.
+	(bfd_ecoff_debug_accumulate): Check bfd_alloc.
+	(ecoff_add_string): Check add_memory_shuffle return.
+
+	* libbfd-in.h (xmalloc, bfd_xmalloc, bfd_xmalloc_by_size_t):
+	Remove decls. 
+	* libbfd.h: Rebuilt.
+
+Fri Feb 11 15:35:32 1994  Stu Grossman  (grossman at cygnus.com)
+
+	* configure.host:  Add Lynx/rs6000 support.
+	* config/i386-nlm.mt:  Enable a.out file support.
+	* config/rs6000lynx.mh:  Lynx/rs6000 host support.
+
+Fri Feb 11 17:25:58 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* archive.c (compute_and_write_armap): Rewrite somewhat to improve
+	memory usage.
+
+Fri Feb 11 13:10:42 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* archive.c: Change all references to '\n' in archive magic
+	to '\012', for greater portability.
+	* ecoff.c (ecoff_write_armap): Ditto.
+
+Thu Feb 10 12:58:48 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* aoutx.h (aout_link_write_other_symbol): Check strip settings to
+	see whether symbol should be output.
+	* genlink.h (struct generic_write_global_symbol_info): Added info
+	field.
+	* linker.c (_bfd_generic_final_link): Initialize wginfo.info.
+	(_bfd_generic_link_write_global_symbol): Check strip settings to
+	see whether symbol should be output.
+	* elf32-mips.c (mips_elf_final_link): Initialize wginfo.info.
+
+Wed Feb  9 21:34:58 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_reloc_queue_find): Do not examine a NULL queue entry.
+
+	* som.c: Cast return values from BFD memory allocation routines to
+	avoid warnings from the HP compiler.
+
+Wed Feb  9 12:55:02 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* coff-alpha.c (alpha_relocate_section): Accept a LITERAL
+	reloc on an "ldl" instruction too.
+
+	* archive.c (bfd_ar_hdr_from_filesystem): Cast status elements
+	when passing them to sprintf.  Use %ld instead of %d.
+
+	* coff-rs6000.c (rs6000coff_mkarchive): Return false.
+	(rs6000_coff_snarf_ar_hdr): Don't declare errno; it's not used.
+	Also removed unused variable namelen.
+	(rs6000coff_write_armap): Declare orl_count and stridx parameters.
+
+Tue Feb  8 18:00:34 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* libbfd-in.h (xmalloc): Don't declare parameter type, to avoid
+	conflicts.
+	* libbfd.h: Rebuilt.
+
+Tue Feb  8 15:55:50 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* coff-alpha.c (reloc_nil): New function.
+	(alpha_howto_table): Use it as special_function to prevent certain
+	relocs from being adjusted by bfd_perform_relocation.  IGNORE
+	reloc should be partial_inplace.
+	(alpha_ecoff_get_relocated_section_contents): Accept a LITERAL
+	reloc on an "ldl" instruction too.
+
+Tue Feb  8 00:32:28 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* elf32-hppa.c (CURRENT_STUB_OFFSET, hppa_elf_build_arg_reloc_stub,
+	hppa_elf_build_long_branch_stub):  Cast to char * instead of int
+	before performing pointer arithmetic.
+
+Mon Feb  7 20:56:27 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* config.bfd (hppa*-*-osf*): Use bfd_name hppaosf for this
+	configuration.
+	(hppa*-*-*elf*): This configuration used hppa-elf now.
+
+	* som.c: This file is also used for HOST_HPPAOSF.
+
+	* targets.c (bfd_target_vector): Enable som_vec for HOST_HPPAOSF.
+
+	* hosts/hppaosf.h: New host configuration file.
+
+	* config/hppabsd.mt (SELECT_VECS): Add bfd_elf32_hppa_vec as
+	BSD handles both SOM and ELF object files.
+
+	* config/hppaosf.mh (HDEFINES): Delete.  No longer needed.
+	(RANLIB): Doesn't do anything, define it to be "echo".
+
+	* config/hppaosf.mt: New target makefile fragment for a PA running
+	OSF1.
+
+Mon Feb  7 15:02:06 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* archures.c (enum bfd_architecture): Added bfd_arch_powerpc.
+	(archures_init_table): If SELECT_ARCHITECTURES is not defined,
+	added bfd_powerpc_arch.
+	* bfd-in2.h: Rebuilt.
+	* cpu-powerpc.c: New file.
+	* Makefile.in (ALL_MACHINES, CFILES): Added cpu-powerpc.c.
+	Rebuilt dependencies.
+
+	* elfcode.h (bfd_section_from_shdr): Get vma and alignment_power
+	of an SHT_STRTAB section from sh_addr and sh_addralign, rather
+	than just setting them to zero.
+
+Sun Feb  6 20:04:10 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* elfcode.h (prep_headers, swap_out_syms): Check for NULL return
+	from bfd_new_strtab. 
+	(elf_compute_section_file_positions): Check for false return from
+	swap_out_syms. 
+
+	* linker.c (default_indirect_link_order): Check for NULL return
+	from bfd_get_relocated_section_contents.
+
+	* syms.c: Make example application in doc call xmalloc, not
+	bfd_xmalloc. 
+
+	* aoutx.h (NAME(aout,slurp_symbol_table),
+	aout_link_get_symbols, NAME(aout,link_hash_table_create)):
+	* bout.c (b_out_slurp_reloc_table, b_out_squirt_out_relocs):
+	* ecoff.c (ecoff_bfd_link_hash_table_create): 
+	* ecofflink.c (bfd_ecoff_debug_init): 
+	* format.c (bfd_check_format_matches): 
+	* linker.c (_bfd_generic_link_hash_table_create): 
+	(_bfd_generic_final_link): 
+	* reloc16.c (bfd_coff_reloc16_relax_section): 
+	(bfd_coff_reloc16_get_relocated_section_contents): 
+	* elf32-hppa.c (hppa_elf_build_arg_reloc_stub): 
+	* elf32-mips.c (mips_elf_final_link): 
+	* elfcode.h (bfd_new_strtab): 
+	(bfd_add_2_to_strtab): 
+	(elf_slurp_symbol_table): 
+	(elf_corefile_note): 
+	* libbfd.c (bfd_zmalloc): 
+	Use malloc and check the result, instead of bfd_xmalloc.
+
+Sat Feb  5 12:39:28 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config.bfd: Put m68*-*-sysv* line after m68*-*-sysv4*.
+
+Sat Feb  5 05:32:44 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* srec.c (srec_write_record):  Put CONST keyword for "src" before
+	"unsigned", some compilers don't like it after "unsigned".
+	* libcoff.h, libcoff-in.h (bfd_perform_slip):  Rename "value" to
+	"val" in prototype declaration because some compilers don't like
+	arguments whose names are the same as types.
+
+Sat Feb  5 01:14:38 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* aoutx.h (aout_link_check_ar_symbols): Correct test for whether
+	object file defines symbol.  Also, if skipping a symbol, skip the
+	second symbol of a N_WARNING or N_INDR symbol as well.
+
+Fri Feb  4 23:55:44 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Add basic support for writing RS/6000 XCOFF files.
+	* coff-rs6000.c (dummy_reloc): Removed.
+	(rs6000coff_howto_table): Defined XCOFF relocs.
+	(RTYPE2HOWTO): Defined to use rs6000coff_rtype2howto.
+	(rs6000coff_rtype2howto): New function.
+	(coff_bfd_reloc_type_lookup): Defined to use
+	rs6000coff_reloc_type_lookup. 
+	(rs6000coff_reloc_type_lookup): New function.
+	(SELECT_RELOC): Defined to set r_type and r_size fields.
+	(COFF_LONG_FILENAMES): Defined.
+	* coffcode.h (combined_entry_type): Changed fix_tag and fix_end
+	fields to bitfields.  Added fields fix_value and fix_scnlen.
+	(sec_to_styp_flags): If STYP_DEBUG is defined, use it rather than
+	STYP_INFO for the type of a section named .debug.
+	(coff_add_missing_symbols): Don't define if RS6000COFF_C.
+	(coff_write_object_contents): If RS6000COFF_C, don't call
+	coff_add_missing_symbols.
+	(coff_slurp_symbol_table): If RS6000COFF_C, then if the last aux
+	entry has type STY_LD change the x_scnlen into a pointer to a
+	symbol and set fix_scnlen.  Also, for a C_BSTAT symbol, change the
+	value into a pointer to a symbol and set fix_value.
+	* libcoff.h: Rebuilt.
+	* coffgen.c (coff_mangle_symbols): Reindent.  If fix_value is set,
+	get the symbol offset. Likewise for fix_scnlen.
+	(string_size): Change type to bfd_size_type.
+	(debug_string_size, debug_string_section): New static variables.
+	(coff_fix_symbol_name): If bfd_coff_symname_in_debug returns true,
+	write the symbol name into the .debug section; assume that the
+	section has already been created with the right size.
+	(coff_write_symbols): Initialize debug_string_size to 0.  If
+	bfd_coff_symname_in_debug returns true, don't put symbol name in
+	usual string table.  After writing out all symbols, if
+	debug_string_size is not 0, check that it matches the size of the
+	.debug section.
+	(coff_get_normalized_symtab): Clear new fix_value and fix_scnlen
+	fields.  If the string offset is 0, always use an empty string as
+	the name.
+	(coff_make_empty_symbol): Zero out the symbol structure.
+	* reloc.c (bfd_perform_relocation): Work around one gross hack
+	with another: actually look at the target name to avoid the broken
+	COFF check.
+	(bfd_reloc_code_real_type): Add BFD_RELOC_PPC_B26,
+	BFD_RELOC_PPC_BA26 and BFD_RELOC_PPC_TOC16.
+	* bfd-in2.h: Rebuilt.
+
+Fri Feb  4 17:28:32 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* libbfd.c (bfd_zmalloc): Call bfd_xmalloc instead of malloc.
+	(bfd_xmalloc, bfd_xmalloc_by_size_t): Functions deleted.
+	* libbfd-in.h: Define them as macros calling xmalloc and declare
+	xmalloc. 
+	* libbfd.h: Rebuilt.
+
+Thu Feb  3 16:49:35 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecofflink.c (bfd_ecoff_debug_externals): If a small undefined
+	symbol has a value in the ECOFF symbol but not in the BFD symbol,
+	keep the value in the ECOFF symbol.  This helps gas.
+
+	* linker.c (_bfd_generic_link_output_symbols,
+	_bfd_generic_link_write_global_symbol): Don't require that all
+	references to a common symbol be themselves common symbols.
+
+	* aoutx.h (aout_reloc_index_to_section): Handle N_UNDF.
+
+Wed Feb  2 20:37:19 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* libbfd.c, bfd-in.h, hosts/alphaosf.h, hosts/sparc-ll.h, aoutf1.h,
+	sparclynx.c, Makefile.in: Change HOST_64_BIT to BFD_HOST_64_BIT.
+	* bfd-in2.h: Rebuilt.
+
+Wed Feb  2 12:30:13 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* coffswap.h (coff_swap_reloc_out): If RS6000COFF_C, handle type
+	and size correctly.
+	(coff_swap_aux_in): If RS6000COFF_C, change x_csect.x_scnlen to
+	x_csect.x_scnlen.l to match change in coff/internal.h.
+	(coff_swap_aux_out): Likewise.
+
+	* coff-mips.c (mips_ecoff_backend_data), coff-alpha.c
+	(alpha_ecoff_backend_data): Change casts of aux_in and aux_out
+	fields to match yesterday's changes.
+
+	* coffcode.h (coff_write_relocs): If SELECT_RELOC is defined, pass
+	in the internal_reloc itself, not the type.
+	* coff-apollo.c, coff-h8300.c, coff-h8500.c, coff-i386.c,
+	coff-m68k.c, coff-sh.c, coff-we32k.c, coff-z8k.c: Changed
+	definition of SELECT_RELOC accordingly.
+
+Tue Feb  1 12:05:44 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* coffcode.h (bfd_coff_backend_data): Added new arguments to
+	_bfd_coff_swap_aux_in and _bfd_coff_swap_aux_out: aux index number
+	and number of aux entries.
+	(bfd_coff_swap_aux_in, bfd_coff_swap_aux_out): Changed
+	accordingly.
+	* libcoff.h: Rebuilt.
+	* coffswap.h (coff_swap_aux_in, coff_swap_aux_out): Accept new
+	arguments.  If RS6000COFF_C, only treat C_EXT and C_HIDEXT
+	specially if this is the last aux entry.
+	* coffgen.c (coff_write_symbol, coff_get_normalized_symtab): Pass
+	new arguments to swap_aux functions.
+
+Sun Jan 30 15:14:36 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* gen-aout.c (main): Set DEFAULT_ARCH based on preprocessor macros
+	(only testing for m68k and vax at the moment); do verify that the
+	preprocessor didn't trash the arch name inside the string version.
+	Don't print out "pagesize =" line that prevents output from
+	compiling.  Derive BYTES_IN_WORD and ARCH values from sizeof
+	results.
+	* Makefile.in (aout-params.h): Pass gen-aout a dummy target name.
+	(check, installcheck): Identify directory in "no testsuites"
+	message.
+
+Sun Jan 30 13:25:28 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* aoutx.h (aout_link_write_symbols): Write out correct value for
+	object file symbol.
+
+Fri Jan 28 18:34:05 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* hosts/vaxbsd.h (HOST_STACK_END_ADDR): Vax BSD doesn't define
+	KERNBASE, so hard-code 0x80000000 instead.
+
+Thu Jan 27 13:54:08 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* linker.c (generic_link_add_symbol_list): If symbol is common,
+	set the BSF_OLD_COMMON flag.
+
+Wed Jan 26 13:47:15 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* format.c (bfd_check_format_matches): Put the new entry in the
+	correct element of matching_vector.
+
+Tue Jan 25 11:43:28 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* som.c, som.h (bfd_som_set_section_attributes,
+	bfd_som_set_subsection_attributes): Change parameters from char
+	to int.  Following a prototype with an old-style function definition
+	in the presence of widened parameters is a GCC-ism not supported
+	by the HP compiler in ANSI mode.
+
+Tue Jan 25 11:46:46 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* reloc.c (bfd_get_reloc_size): Size of type -2 is 4 bytes, not 2.
+
+	* hp300hpux.c (MY(write_object_contents)): Write out the symbols
+	before writing out the relocs, so that the right symbol indices
+	are used.
+
+	* archive.c (do_slurp_bsd_armap, bfd_slurp_bsd_armap_f2): Do not
+	try to overlay the internal carsyms on the external symdefs.  That
+	can not work if the size of a host pointer is larger than 4 bytes.
+
+	* format.c (bfd_check_format_matches): Cast result of
+	bfd_xmalloc_by_size_t.
+	* opncls.c (_bfd_new_bfd): Avoid ANSI C prototype.
+
+	* archive.c: Reindented to GNU standards.
+
+Mon Jan 24 14:41:23 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* opncls.c (_bfd_new_bfd, _bfd_new_bfd_contained_in): Add
+	"_bfd_" to function names.
+	* archive.c (_bfd_create_empty_archive_element_shell),
+	libbfd-in.h: Change callers.
+
+	* libbfd.c (bfd_zmalloc): Renamed from zalloc.
+	* libbfd.c (bfd_add_to_string_table),
+	trad-core.c (trad_unix_core_file_p),
+	targets.c (bfd_target_list),
+	ptrace-core.c (ptrace_unix_core_file_p),
+	opncls.c (new_bfd), libbfd-in.h,
+	ieee.c (ieee_make_empty_symbol),
+	elf32-hppa.c (hppa_elf_stub_branch_reloc),
+	(hppa_elf_stub_reloc): Change callers.
+	* libbfd.h: Regenerated.
+
+	* archive.c (_bfd_look_for_bfd_in_cache): Add "_bfd_" to name.
+	(_bfd_get_elt_at_filepos), 
+	coff-rs6000.c (rs6000coff_get_elt_at_filepos), libbfd-in.h:
+	Change callers.
+
+	* format.c (bfd_check_format_matches), libbfd-in.h, targets.c,
+	elfcode.h (elf_object_p): Rename target_vector to bfd_target_vector
+	and default_vector to bfd_default_vector.
+	* libbfd.h: Regenerated.
+
+	* format.c (bfd_check_format_matches): New function.
+	(bfd_check_format): Call it.
+	(bfd_matching_formats): Function removed.
+	* targets.c: Replace the vector added on Jan 21 with a count of
+	entries in default_vector.
+	* bfd-in2.h: Regenerated.
+
+Mon Jan 24 12:38:54 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* coff-alpha.c (alpha_ecoff_object_p): New function.  Set size of
+	.pdata section based on lnnoptr field, not section header.
+	(alpha_relocate_section): Don't bother to check if r_symndx >= 0,
+	since it is unsigned.
+	(ecoffalpha_little_vec): Use alpha_ecoff_object_p rather than
+	coff_object_p.
+	* ecoff.c (ecoff_new_section_hook): Set alignment_power field of
+	.pdata section to 3.
+	(ecoff_compute_section_file_positions): Save the size of the
+	.pdata section in the line_filepos field, and actually align the
+	.pdata section to an alignment power of 4.
+	(ecoff_compute_reloc_file_positions): Set output_has_begun after
+	calling ecoff_compute_section_file_positions.
+	(ecoff_write_object_contents): Set s_lnnoptr for the .pdata
+	section from the line_filepos field.  Set vstamp for the optional
+	header from the vstamp of the symbolic header.
+	(ecoff_bfd_final_link): Set vstamp of the symbolic header to the
+	vstamp used by the first object file in the link.
+
+	* ecofflink.c (ecoff_align_debug): Align RFDs to debug_align.
+
+	* linker.c (generic_link_check_achive_element): Set SEC_ALLOC flag
+	for a created common section.
+	(_bfd_generic_link_add_one_symbol): Likewise.
+
+	* elfcode.h (swap_out_syms): Use elf_section_from_bfd_section to
+	get the index of a common section, rather than always using
+	SHN_COMMON (MIPS has multiple common sections).
+
+	* elf32-hppa.c (hppa_elf_gen_reloc_type): Typo (== for =).
+
+	* aoutx.h (aout_link_input_section_std,
+	aout_link_input_section_ext): Pass additional arguments to
+	reloc_overflow callback.
+	* coff-alpha.c (alpha_ecoff_get_relocated_section_contents,
+	alpha_relocat_section): Likewise.
+	* coff-h8300.c (h8300_reloc16_extra_cases): Likewise.
+	* coff-h8500.c (extra_case): Likewise.
+	* coff-mips.c (mips_relocate_section): Likewise.
+	* coff-z8k.c (extra_case): Likewise.
+	* elf32-hppa.c (hppa_elf_stub_finish): Likewise.
+	* reloc.c (bfd_generic_get_relocated_section_contents): Likewise.
+
+	* bout.c (calljx_callback, callj_callback): Use get_value to get
+	the symbol value and check for undefined symbols.
+	(get_value): If the symbol is undefined, look it up in the linker
+	hash table.
+	(b_out_get_relocated_section_contents): For PCREL24 and PCREL13
+	use get_value to get the symbol value and check for undefined
+	symbols.
+	* reloc16.c (bfd_coff_reloc16_get_value): If the symbol is
+	undefined, look it up in the linker hash table.
+
+	* aoutx.h (translate_symbol_table): The string index 0 has a
+	special meaning for normal symbols, but not for dynamic symbols.
+
+Sat Jan 22 12:26:01 1994  Stu Grossman  (grossman at cygnus.com)
+
+	* sparclynx.c:  Setup appropriate macros to enable core file
+	support.
+
+Fri Jan 21 16:25:35 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* targets.c: Add a vector of matching format names.
+	* format.c (bfd_matching_formats): New function to return it.
+	(bfd_check_format): Set it.
+	* bfd-in2.h: Regenerated.
+
+	* bfd-in.h: Remove decls of bfd_ec type and error printing functions.
+	Remove decl of type symclass; wasn't used.
+	* bfd.c: Document error handling, including code fragments
+	containing the error decls that were in bfd-in.h.
+	Remove DEFUNs.
+	* bfd-in2.h: Regenerated.
+
+Fri Jan 21 14:11:16 1994  Sean Fagan  (sef@cygnus.com)
+
+	* nlmcode.h, liblnm.h, nlm32-alpha.c nlm32-i386.c nlm32-sparc.c:
+	The sparc (and possibly other?) NLM format requires a different
+	way to write exports, so add a write_export field to the backend
+	data (and set it to NULL for everything but the sparc).
+
+Fri Jan 21 14:11:16 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* sunos.c (MY(read_dynamic_relocs)): Compare info->dynrel with NULL,
+	not (struct external_nlist *) NULL.  info->dynrel is a PTR, not
+	a struct external_nlist *.
+
+Fri Jan 21 09:29:01 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* bfd.c: Remove error strings for errors removed below.
+	* aoutx.h (translate_to_native_sym_flags), bfd-in.h (bfd_ec),
+	oasys.c (oasys_write_sections): Rename
+	bfd_error_nonrepresentable_section to nonrepresentable_section.
+	None of the other bfd error names start with "bfd_error".
+	Remove errors symbol_not_found and no_relocation_info, which seem
+	to be unused.
+	* bfd-in2.h: Regenerated.
+
+Fri Jan 21 01:11:55 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* bfd.c (bfd_get_gp_size): Added support for ELF.
+
+	* syms.c (BSF_DYNAMIC): New symbol flag.
+	(bfd_print_symbol_vandf): Print it.
+	* bfd-in2.h: Rebuilt.
+	* libaout.h (struct aout_backend_data): New read_dynamic_symbols
+	and read_dynamic_relocs fields.
+	(struct aoutdata): New dynamic_info field.
+	(obj_aout_dynamic_info): New accessor macro.
+	* sunos.c (struct sunos_dynamic_info): New structure.
+	(sunos_read_dynamic_info, MY(read_dynamic_symbols),
+	MY(read_dynamic_relocs)): New functions to read dynamic symbols
+	and relocs.
+	* aoutx.h (NAME(aout,some_aout_object_p)): If the object is
+	dynamically linked, set SEC_RELOC for both the .text and .data
+	sections.
+	(translate_from_native_sym_flags): Don't set BSF_LOCAL for an
+	undefined symbol.
+	(translate_symbol_table): New function, split out of
+	slurp_symbol_table; set the BSF_DYNAMIC flag appropriately.
+	(NAME(aout,slurp_symbol_table)): Read dynamic symbols, if any.
+	(NAME(aout,slurp_reloc_table)): Read dynamic relocs, if any.
+	(NAME(aout,get_reloc_upper_bound)): Include dynamic reloc count in
+	return value.
+	* aoutf1.h (NAME(aout,sunos4_write_object_contents)): Don't write
+	out dynamic symbols or relocs against reloc symbols, since they
+	are already in the .text section and we wouldn't know where to
+	write them anyhow.
+	(sunos4_aout_backend): Initialize read_dynamic_symbols and
+	read_dynamic_relocs fields.
+	* aout-target.h (MY(backend_data)): Initialize
+	read_dynamic_symbols and read_dynamic_relocs fields.
+
+Thu Jan 20 20:57:27 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* hosts/alphaosf.h (uint64e_type, uint64_type, int64_type): Delete
+	typedefs, since HOST_64_BIT will take care of defining them in
+	bfd.h.
+
+Wed Jan 19 17:28:59 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* config/alphaosf.mh (HDEFINES): Don't define HOST_64_BIT here;
+	that's dealt with elsewhere.
+	* hosts/alphaosf.h (sprintf_vma, fprintf_vma): New macros.
+	(uint64_typeHIGH, uint64_typeLOW): Comment with HOST_64_BIT so
+	they get copied to bfd.h.
+
+	* reloc.c (enum bfd_reloc_code_real): Add some Alpha relocation
+	types.  Reorganized some of the existing ones.
+	* coff-alpha.c (alpha_howto_table): Construct 64-bit negative one
+	values in case of compilation on a 32-bit machine.  Fix pcrel
+	fields of some reloc types.
+	(alpha_bfd_reloc_type_lookup): Handle more relocation types.
+
+	* bfd-in.h (uint64_typeHIGH, uint64_typeLOW): Supply default
+	definitions when not defined, regardless of whether uint64_type is
+	a defined macro or not.
+	(fprintf_vma, sprintf_vma): Define only if fprintf_vma is not
+	already defined.
+
+Wed Jan 19 00:02:54 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* aoutx.h (translate_to_native_sym_flags): Set the type of a
+	BSF_WARNING symbol to N_WARNING.
+
+Tue Jan 18 16:43:19 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* aoutx.h (aout_link_add_symbols): Increment sym_hash as well as p
+	for an indirect or warning symbol.
+	(aout_link_write_symbols): Update sym_hash with the target of an
+	indirect or warning symbol.  If an indirect symbol is defined,
+	output the calculated value and don't output the target symbol.
+
+Tue Jan 18 03:54:59 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* aoutx.h (translate_from_native_sym_flags): Give warning symbols
+	an (unused) nonzero section value, needed for check below.
+
+Mon Jan 17 15:12:07 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* aoutx.h (translate_from_native_sym_flags,
+	aout_link_add_symbols): Treat N_SET[ABDT] | N_EXT like
+	N_SET[ABDT].
+
+Fri Jan 14 16:45:43 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elfcode.h (elf_object_p): If there is a SHT_DYNAMIC section, set
+	the DYNAMIC flag for the BFD.
+	(NAME(bfd_elf,write_object_contents)): Don't try to write out a
+	BFD with the DYNAMIC flag set, since we don't generate the program
+	header table correctly.
+
+Fri Jan 14 01:04:36 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* elfcode.h (elf_slurp_symbol_table):  Free x_symp at the end
+	of the function to avoid storage leak.
+
+Thu Jan 13 23:07:32 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.c (ecoff_link_write_external): An ifd can be -1.
+
+Thu Jan 13 12:33:27 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (som_set_reloc_info): Provide a default symbol for
+	relocations which don't actually have an associated symbol.
+
+	* som.c (hppa_som_reloc): Add new "error message" argument.
+
+Wed Jan 12 13:36:43 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	Enable gdb to write to core files on more core file readers.
+	* libbfd.c (bfd_generic_set_section_contents):  Remove range check
+	for section size, it is already done in bfd_set_section_contents
+	with bfd_get_section_size_now.
+	* aix386-core.c, hppabsd-core.c, hpux-core.c, irix-core.c,
+	osf-core.c, ptrace-core.c, trad-core.c (*_set_section_contents):
+	Use bfd_generic_set_section_contents instead of bfd_false.
+
+Wed Jan 12 15:31:57 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* linker.c: Added initial documentation.
+
+	* linker.c (default_indirect_link_order): Don't expect space for
+	output relocations if there aren't any input relocations.
+
+Tue Jan 11 14:37:12 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* aoutx.h (NAME(aout,final_link)): Set a_entry before computing
+	file offsets.
+
+	* elfcode.h (swap_out_syms): A common symbol is STT_OBJECT, not
+	STT_NOTYPE.
+
+Tue Jan 11 09:10:56 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config.bfd: Use ELF, not COFF for m88*-*-dgux*.
+	Combine m88k-*-* and m88110-*-* cases into m88*-*-*.
+
+Tue Jan 11 00:07:19 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecofflink.c: Extensive changes to compress and merge debugging
+	information, and to write some of out directly rather than saving
+	it in memory.  Several new functions and structures, and new
+	arguments to existing functions.
+	* ecoff.c (ecoff_compute_reloc_file_positions): Compute
+	sym_filepos as well.
+	(ecoff_get_extr): Use ifdmap instead of ifdbase.
+	(ecoff_write_object_contents): Don't compute sym_filepos here.
+	Only output symbols if outsymbols is not NULL.
+	(ecoff_bfd_final_link): Adjust for changes in ecoff_debug_info and
+	bfd_ecoff_debug functions.  Write out debugging information here.
+	(ecoff_final_link_debug_accumulate): Adjust for changes in
+	bfd_ecoff_debug functions.
+	(ecoff_link_write_external): Use ifdmap rather than ifdbase.
+	* elf32-mips.c (mips_elf_read_ecoff_info): Read external symbols
+	first, to put them in the first memory buffer.  Clear fdr field.
+	(mips_elf_get_extr): Use pointer to unswapped external symbol.
+	(mips_elf_final_link): Adjust for changes in bfd_ecoff functions.
+	Preserve .text, .data and .bss even if they are empty.  Save
+	pointer to unswapped external symbol rather than copying it.
+	Don't free up the external symbols.
+	* libelf.h (elf_symbol_type): Change mips_extr to PTR.
+	* bfd-in.h (bfd_ecoff_debug_init, bfd_ecoff_debug_free): Declare.
+	(bfd_ecoff_debug_accumulate): Update declaration.
+	(bfd_ecoff_debug_accumulate_other): Rename declaration from
+	bfd_ecoff_debug_link_other and update.
+	(bfd_ecoff_write_accumulated_debug): Declare.
+	* bfd-in2.h: Rebuilt.
+	* Makefile.in: Rebuilt dependencies.
+
+Mon Jan 10 20:46:53 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* Makefile.in (install): Remove "@" which follows a backslash.  In
+	this position it just causes errors, not suppresses echoes.
+
+Mon Jan 10 09:06:21 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* som.c (hppa_som_gen_reloc_type): Fix handling of LT and RT
+	field selectors.
+
+Sun Jan  9 04:32:25 1994  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+	* config/i386-netbsd.mt (SELECT_VECS): Include i386bsd_vec.
+
+Fri Jan  7 10:27:27 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+	* aoutx.h (adjust_z_magic): Don't merge the start of bss with the
+	end of data if they are not contiguous.
+
+	* aoutf1.h (sunos4_aout_backend): Comment the fields' meanings.
+
+Fri Jan  7 15:40:16 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.c (ecoff_mkobject_hook): Don't set SEC_SHARED_LIBRARY flag
+	for .reginfo section here.
+	(ecoff_new_section_hook): Set it here instead.
+
+Fri Jan  7 10:29:27 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+    	* bfd-in.h: (bfd_boolean): Add workaround for systems that also
+	define true and false as enums.
+	(ALMOST_STDC): Add as alternative to __STDC__.
+	* bfd-in2.h: Rebuilt.
+	* syms.c (bfd_print_symbol_vandf): Convert a PTR to FILE*.
+
+Thu Jan  6 14:24:44 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* aoutx.h (translate_to_native_sym_flags): Catch the case where
+	there is no output section.
+
+Thu Jan  6 14:37:42 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlmcode.h (nlm_object_p): If we can't read the fixed header,
+	count it as a wrong format error, not a system call error, since
+	the object file might simply be too small.
+
+	* targets.c (target_vector): Added nlm32_alpha_vec inside #ifdef
+	BFD64.
+	* Makefile.in (BFD32_BACKENDS): Remove nlm32-alpha.o.
+	(BFD64_BACKENDS): Add nlm32-alpha.o.  It depends on 64 bit
+	support, even though it is for an Alpha in 32 bit mode.
+	* configure.in (nlm32_alpha_vec): Set target64 to true.
+
+	* nlm32-gen.c, nlm64-gen.c: Removed.  All nlm targets are
+	different, so there is no point to providing a generic one.
+	* libnlm.h: Don't bother to check for nlm_backend(bfd) being NULL
+	in the backend accessor macros; that should no longer be possible.
+	* targets.c (target_vector): Removed nlm32_big_generic_vec,
+	nlm64_big_generic_vec, nlm64_little_generic_vec.
+	* configure.in (nlm32_big_generic_vec, nlm32_little_generic_vec,
+	nlm64_big_generic_vec, nlm64_little_generic_vec): Removed.
+	* Makefile.in: Rebuilt dependencies, and
+	(BFD32_BACKENDS): Removed nlm32-gen.o.
+	(BFD64_BACKENDS): Removed nlm64-gen.o.
+	(CFILES): Removed nlm32-gen.c and nlm64-gen.c.
+
+	* hp300hpux.c (ARCH_SIZE): Define before including aoutx.h.
+
+	* linker.c (_bfd_generic_link_add_one_symbol): Add constructor and
+	bitsize arguments.  Changed all callers (aoutx.h).
+	* libbfd-in.h (_bfd_generic_link_add_one_symbol): Add constructor
+	and bitsize arguments to declaration.
+	* libbfd.h: Rebuilt.
+
+	* ecoff.c: First cut at new style of linker backend for
+	ECOFF--added a bunch of functions.  Also:
+	(ecoff_sec_to_styp_flags): Set flags for .pdata and .xdata.
+	(ecoff_slurp_symbolic_header): New function.
+	(ecoff_slurp_symbolic_info): Call ecoff_slurp_symbolic_header.
+	(ecoff_compute_reloc_file_positions): New function.
+	(ecoff_set_section_contents): Get out quickly if count is zero.
+	Check errors better.
+	(ecoff_write_object_contents): Put .xdata section in data segment.
+	Call ecoff_compute_reloc_file_positions.  Don't output relocs or
+	external symbols if outsymbols is NULL.
+	(ecoff_bfd_final_link): Completely rewritten.
+	* libecoff.h: Include bfdlink.h.
+	(struct ecoff_backend_data): Add relocate_section field.
+	(ecoff_data_type): Add sym_hashes and symndx_to_section fields.
+	(struct ecoff_link_hash_entry): Define.
+	(struct ecoff_link_hash_table): Define.
+	(ecoff_bfd_link_add_symbols): Declare as function, not macro.
+	(ecoff_bfd_link_hash_table_create): Likewise.
+	* ecofflink.c (bfd_ecoff_debug_one_external): New function.
+	(bfd_ecoff_debug_externals): Call bfd_ecoff_debug_one_external.
+	* bfd-in.h (bfd_ecoff_debug_one_external): Declare.
+	* bfd-in2.h: Rebuilt.
+	* coff-alpha.c (alpha_howto_table): Mark BRADDR as
+	partial_inplace, and set the src_mask to 0x1fffff.
+	(alpha_ecoff_get_relocated_section_contents): Remove unused
+	variable gp_warned.
+	(alpha_convert_external_reloc): New static function.
+	(alpha_relocate_section): New static function.
+	(alpha_ecoff_backend_data): Initialize relocate_section field.
+	* coff-mips.c (mips_relocate_refhi): New static function.
+	(mips_relocate_section): New static function.
+	(mips_ecoff_backend_data): Initialize relocate_section field.
+
+	* reloc.c (_bfd_relocate_contents): Corrected signed overflow
+	checking when there is an addend.
+
+	* aoutx.h (NAME(aout,final_link)): Don't abort when trying to link
+	a non a.out file, just pass it to _bfd_default_link_order.
+	(aout_link_input_section_std): When doing a final PC relative link
+	against a section symbol, subtract the VMA of the input section.
+	(aout_link_input_section_ext): Likewise.
+
+	* linker.c (default_indirect_link_order): Renamed from
+	_bfd_generic_indirect_link_order and made static.
+	(_bfd_generic_final_link): Don't switch on link_order type, just
+	call _bfd_default_link_order.
+	(_bfd_default_link_order): Handle bfd_indirect_link_order type.
+	* genlink.h: Removed declaration of
+	_bfd_generic_indirect_link_order.
+	* elf32-mips.c (mips_elf_final_link): Don't switch on link_order
+	type, just call _bfd_default_link_order.
+
+Tue Jan  4 21:23:37 1994  Ian Lance Taylor  (ian@cygnus.com)
+
+	* linker.c (generic_link_check_archive_element): Base the name of
+	the created common section on the name of the section the symbol
+	came from.
+	(_bfd_generic_link_add_one_symbol): (case BIG): A common symbol
+	must have a section, so don't bother to create one.
+
+Mon Jan  3 15:32:16 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* aout-target.h (MY(vec)): Add DYNAMIC to mask of object flags.
+	* aoutf1.h (NAME(aout,sunos4_write_object_contents)):
+	If the DYNAMIC flag is set, set it in the exec header.
+	* aoutx.h (NAME(aout,some_aout_object_p)): If the object is
+	dynamically linked, set the DYNAMIC flag in the BFD.
+	* libaout.h (N_SET_DYNAMIC): New macro.
+	(N_DYNAMIC): Add missing 0 in mask.
+
+Mon Jan  3 11:41:45 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.c (ecoff_get_extr): Don't output section symbols as
+	external symbols.
+
+	* bfd-in.h, hash.c: Change bfd_hash_allocate argument from size_t
+	to unsigned int, because size_t may not be defined in bfd.h.
+	* bfd-in2.h: Rebuilt.
+
+	* bfd-in.h (bfd_get{b,l}[_signed_]{16,32,64}): Declare argument to
+	be a const pointer.
+	* bfd-in2.h: Rebuilt.
+	* libbfd.c (bfd_get{b,l}[_signed_]{16,32,64}): Declare argument to
+	be a const pointer.
+	* targets.c (bfd_target): Change swap function pointers
+	accordingly.
+	* archive.c (do_slurp_coff_armap): Change swap accordingly.
+	* aix386-core.c: Change NO_GET and NO_GETS accordingly.
+	* hppabsd-core.c, hpux-core.c, irix-core.c, osf-core.c,
+	ptrace-core.c, trad-core.c: Change NO_GET and NO_SIGNED_GET
+	accordingly.
+
+	* libbfd-in.h (struct artdata): Added tdata field.
+	(_bfd_add_bfd_to_archive_cache): Declare.
+	(_bfd_get_elt_at_filepos): Declare.
+	(_bfd_snarf_ar_hdr): Renamed from snarf_ar_hdr.
+	* libbfd.h: Rebuilt.
+	* archive.c: Cleaned up some more.
+	(_bfd_generic_mkarchive, bfd_generic_archive_p): Initialize
+	pointer elements of artdata.
+	(_bfd_add_bfd_to_archive_cache): Renamed from add_bfd_to_cache.
+	(_bfd_snarf_ar_hdr): Renamed from snarf_ar_hdr.
+	(_bfd_get_elt_at_filepos): Renamed from get_elt_at_filepos.
+	(get_extended_arelt_filename, bfd_construct_extended_name_table,
+	bfd_ar_hdr_from_filesystem, compute_and_write_armap): Made static.
+	* ecoff.c: Some comment changes.
+	(ecoff_slurp_armap): Handle rename of snarf_ar_hdr.  Set
+	ardata->tdata to raw_armap.
+	(ecoff_archive_p): Initialize pointer elements of artdata.
+	* coff-rs6000.c (rs6000coff_get_elt_at_filepos): Handle rename of
+	add_bfd_to_cache.
+
+	* hash.c: Added some documentation.
+
+Mon Jan  3 11:09:28 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* aout-target.h, netbsd386.c: Replace NO_SWAP_MAGIC with SWAP_MAGIC,
+	and do the swapping here rather than calling ntohl from the N_*
+	macros.  This cleans up assumptions about the size of a host long,
+	the existence to ntohl, etc.
+
+Sat Jan  1 13:50:05 1994  Rob Savoye  (rob@darkstar.cygnus.com)
+
+	* config.bfd: Add support for VSTa micro-kernel. It currently uses
+	i386-aout.
+
+Sat Jan  1 10:18:54 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* hosts/i386mach3.h (HOST_SEGMENT_SIZE): Fix value.
+	* i386mach3.c (SEGMENT_SIZE): Fix value.
+
+For older changes see ChangeLog-9193
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-9697 sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-9697
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-9697	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-9697	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,6729 @@
+Tue Dec 30 12:45:18 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-sparc.c (elf32_sparc_check_relocs): If -Bsymbolic, don't
+	allocate space for a PC relative reloc against a symbol which is
+	defined in a regular file.
+	(elf32_sparc_relocate_section): If -Bsymbolic, don't copy a PC
+	relative reloc against a symbol which is defined in a regular
+	file.
+
+Mon Dec 29 18:02:28 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	From Jonathan Stone <jonathan@DSG.Stanford.EDU>:
+	* config.bfd (mips-dec-netbsd*): Add ECOFF vectors to
+	targ_selvecs.
+	(mips*el-*-netbsd*): Like mips-dec-netbsd*.
+	(mips*-*-netbsd*): New target.
+
+Mon Dec 29 17:13:28 1997  H.J. Lu  (hjl@gnu.org)
+
+	* elflink.h (elf_link_assign_sym_version): Change error message
+	from "undefined version name" to "undefined versioned symbol
+	name".
+
+Mon Dec 29 11:41:16 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c (coff_arm_relocate_section): Fix typo from previous
+	delta.
+
+Tue Dec 23 17:01:10 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libbfd-in.h (_bfd_dwarf2_find_nearest_line): Declare.
+	* libbfd.h: Rebuild.
+
+	* peicode.h (coff_swap_scnhdr_out): Set .reloc section to be
+	shared.  Set stab* sections to be shared and read.  Set .rsrc
+	section to be read and shared.
+
+Mon Dec 22 13:20:57 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am: Rebuild dependencies.
+ 	(ALL_MACHINES_CFILES): Add dwarf2.lo.
+	(ALL_MACHINES_CFILES): Add dwarf2.c.
+	* Makefile.in: Rebuild.
+
+	* coff-arm.c: Don't include obstack.h.
+
+Mon Dec 22 13:04:33 1997  Joel Sherrill  <joel@oarcorp.com>
+
+        * config.bfd (i[3456]86*-go32-rtems*): Fix to be the same as
+	i[3456]86-go32.
+
+Thu Dec 18 16:01:25 1997  Doug Evans  <devans@canuck.cygnus.com>
+
+	* configure: Regenerate to get @SHELL@ substituted.
+
+Wed Dec 17 09:45:09 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c (coff_arm_relocate_section): Only look at section
+	owner if there is one.
+
+	* elf.c (assign_file_positions_for_segments): Fail if there is not
+	enough room for the program headers.
+
+Tue Dec 16 08:09:56 1997  Gavin Koch  <gavin@cygnus.com>
+
+	* elf.c (_bfd_elf_find_nearest_line): Call
+	_bfd_dwarf2_find_nearest_line first.
+	* elf32-mips.c (_bfd_mips_elf_find_nearest_line): Same.
+	* dwarf2.c: New file; implement _bfd_dwarf2_find_nearest_line.
+
+Mon Dec 15 16:08:52 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* archures.c: Add bfd_mach_m32r.
+
+Mon Dec 15 16:11:22 1997  Fred Fish  <fnf@cygnus.com>
+
+	* coffcode.h (ALIGN_SECTIONS_IN_FILE): Define if I960 not defined.
+	(coff_compute_section_file_positions): Use ALIGN_SECTIONS_IN_FILE
+	to decide when to align the file sections for paging.
+	* coffcode.h (ALIGN_SECTIONS_IN_FILE): Undefine for TIC80COFF.
+
+Mon Dec 15 15:01:15 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-m32r.c (m32r_elf_object_p): New Function.
+	(m32r_elf_final_write_processing):  New Function.
+	(m32r_elf_set_private_flags):  New Function.
+	(m32r_elf_copy_private_bfd_data):  New Function.
+	(m32r_elf_merge_private_bfd_data):  New Function.
+	(m32r_elf_print_private_bfd_data):  New Function.
+	(elf_backend_object_p): Point to m32r_object_p.
+	(elf_backend_final_write_processing): Point to
+	m32r_elf_final_write_processing.
+	(bfd_elf32_bfd_copy_private_bfd_data): Point to
+	m32r_elf_copy_private_bfd_data.
+	(bfd_elf32_bfd_merge_private_bfd_data): Point to
+	m32r_elf_merge_private_bfd_data.
+	(bfd_elf32_bfd_set_private_flags): Point to
+	m32r_elf_set_private_bfd_data.
+	(bfd_elf32_bfd_print_private_bfd_data): Point to
+	m32r_elf_print_private_bfd_data.
+
+
+	* bfd-in2.h (bfd_mach_m32r): Add identifier for M32R architecture
+	machines.
+
+Fri Dec 12 11:30:28 1997  Brendan Kehoe  <brendan@canuck.cygnus.com>
+
+	* configure: Only build libbfd shared if --enable-shared's value
+	was `yes', or was set to `*bfd*'.
+	* aclocal.m4: Likewise.
+	* NOTE: this really needs to be fixed in libtool/libtool.m4, the
+	original source of this bit of code.  It's not clear what the best fix
+	would be, though.
+
+Thu Dec 11 17:48:11 1997  Richard Henderson  <rth@cygnus.com>
+
+	* linker.c (generic_link_add_symbol_list): Always init udata.p so
+	that the generic relaxation code can function when input and output
+	file formats are mismatched.
+
+Thu Dec 11 01:02:18 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-sh.c (bfd_coff_small_swap_table): Initialize new fields.
+
+	* elf.c (assign_file_positions_for_segments): For a loadable
+	section, make sure that the load address is correct relative to
+	the load address of the segment plus the size of the segment so
+	far.
+
+	* coffcode.h (_coff_link_output_has_begun): Make static.
+	(_coff_final_link_postscript): Likewise.
+
+Wed Dec 10 23:37:11 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_input_bfd): Handle a relocateable link in
+	which a relocation refers to an indirect or warning symbol.
+
+Wed Dec 10 11:15:55 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c (bfd_arm_coff_final_link): Function deleted.
+	(coff_arm_final_link_postscript): New function.
+	(coff_arm_link_output_has_begun): New function.
+
+	* libcoff.h (struct bfd_coff_backend_data): Add new fields:
+	_bfd_coff_link_output_has_begun and
+	_bfd_coff_final_link_postscript.  Add new macros:
+	bfd_coff_link_output_has_begun() and
+	bfd_coff_final_link_postscript().
+
+	* cofflink.c (_bfd_coff_final_link): Insert calls to
+	bfd_coff_link_output_has_begun() and
+	bfd_coff_final_link_postscript().
+
+	* coffcode.h: Add two new fields to bfd_coff_backend_data
+	structure: _bfd_coff_link_output_has_begun and
+	_bfd_coff_final_link_postscript.  Add default initialisers for
+	these fields.  Add overridable aliases for the coff swap functions
+	in the backend data structure.
+
+	* elf32-v850.c: Update with patches from the branch to fix
+	HI16_S/LO16 reloc pairs.
+
+Wed Dec 10 14:06:48 1997  Michael Meissner  <meissner@cygnus.com>
+
+	* elf32-d30v.c (d30v_info_to_howto_rela): New function to support
+	RELA relocations.
+	(USE_REL): Don't define any more, switch to using RELA
+	relocations.
+	(elf_info_to_howto): Define as d30v_info_to_howto_rela.
+
+Tue Dec  9 11:37:53 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* archures.c (bfd_mach_mips*): Define.
+	(bfd_default_scan): For 3000 and 4000 replace magic constant with
+ 	macro.
+
+	* cpu-mips.c (N): Define.
+	(bfd_mips_arch, arch_info_struct): Re-write using macro N, replace
+ 	numbers with bfd_mach_mips* macros.
+
+Fri Dec  5 11:13:46 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_reloc, v850_elf_store_addend_in_insn,
+	v850_elf_relocate_section): Fix reloc addend handling.
+	(v850_elf_section_from_bfd_section, v850_elf_symbol_processing,
+	v850_elf_add_symbol_hook, v850_elf_link_output_symbol_hook,
+	v850_elf_section_from_shdr, v850_elf_fake_sections): New functions
+	to create and handle special common sections.
+	(v850_elf_final_link_relocate): Fix HI16 and HI16_S relocations
+	which have data stored in the instructions.
+
+Tue Dec  2 10:26:16 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c (TARGET_UNDERSCORE): Revert back to '_'
+	(USER_LABEL_PREFIX): Revert back to '_'
+
+	* config.bfd (targ_cpu): Add support for Thumb target.
+
+Mon Dec  1 20:24:18 1997  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+	* coff-sh.c (sh_coff_howtos): Add R_SH_SWITCH8 entry.
+	(get_symbol_value): Handle R_SH_SWITCH8.
+	(sh_relax_delete_bytes): Likewise.
+
+Wed Nov 26 14:13:34 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c (TARGET_UNDERSCORE): Changed to match definition in
+	gcc/config/arm/semi.h
+
+	* coffcode.h (coff_slurp_symbol_table): Add ARM and Thumb symbol
+	classes.
+
+Sun Nov 23 16:02:58 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* freebsd.h (SWAP_MAGIC): Read magic number little and not big
+ 	endian.
+
+Wed Nov 26 09:30:37 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* coffcode.h (coff_mkobject_hook): Only set private flags for non
+	PE ARM ports.
+
+Tue Nov 25 15:33:23 1997  Richard Henderson  <rth@cygnus.com>
+
+	* binary.c (binary_set_section_contents): Also ignore NEVER_LOAD
+	sections.
+
+Tue Nov 25 10:55:36 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c (coff_arm_bfd_merge_private_bfd_data): Do not
+	complain if inout and output formats differ.
+
+Tue Nov 25 11:26:27 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (BFD32_BACKENDS): Remove tekhex.lo.
+	(BFD32_BACKENDS_CFILES): Remove tekhex.c.
+	* Makefile.in: Rebuild.
+	* aclocal.m4, configure, Makefile.in: Rebuild with current
+	automake and autoconf.
+
+	* coff-arm.c (arm_allocate_interworking_sections): Fix typo
+	(COFF_WITH_PR to COFF_WITH_PE).
+
+Mon Nov 24 15:47:49 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c: Make variables and some functions static, so that
+	this file can be included in multiple object files.
+	(coff_arm_bfd_final_link): Fix minor bug.
+
+Sat Nov 22 15:16:00 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c: Add support for PIC and APCS-FLOAT type binaries.
+
+	* coffcode.h: Add support for PIC and APCS-FLOAT type binaries.
+
+Sat Nov 22 16:06:56 1997  Klaus Kaempf  <kkaempf@progis.de>
+
+	* evax-emh.c (_bfd_evax_write_emh): Use alloca instead of strdup.
+
+Sat Nov 22 12:29:30 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* sunos.c (sunos_add_one_symbol): When overriding a defined
+	symbol, set it to undefined, not new.
+
+	* elf32-sh.c (sh_elf_relax_delete_bytes): Don't kill LABEL
+	relocs.
+
+Fri Nov 21 14:14:22 1997  Richard Henderson  <rth@cygnus.com>
+
+	* coff-sh.c (sh_relax_section): Force sign extention of USES r_offset.
+	(sh_relax_delete_bytes): Don't kill LABEL relocs.
+
+Mon Nov 17 15:08:38 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-m10300.c (elf32_mn10300_finish_hash_table_entry): Fix typo.
+	(mn10300_elf_relax_section): Likewise.
+
+Sat Nov 15 15:36:07 1997  Fred Fish  <fnf@cygnus.com>
+
+	* peicode.h (coff_swap_aouthdr_in): Cast second arg of
+	bfd_h_get_* calls to "bfd_byte *".
+
+Tue Nov 11 10:37:23 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-m10300.c (elf32_mn10300_link_hash_entry): Add new field
+	"movm_stack_size".
+	(mn10300_elf_relax_section): Include stack space for register saves
+	in the imm8 field of a "call" instruction.
+	(compute_function_info): Determine how much stack is allocated by
+	the movm instruction.  Fix typo.
+	(elf32_mn10300_link_hash_newfunc): Initialize movm_stack_size.
+
+Mon Nov 10 14:32:40 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Don't crash if
+	a version dependency could not be found.
+
+Tue Nov  4 12:05:56 1997  Klaus K"ampf  <kkaempf@progis.de>
+
+	* configure.com: Get version info from configure.in
+
+Fri Oct 24 11:15:58 1997  Jakub Jelinek  <jj@sunsite.mff.cuni.cz>
+
+	* elf64-sparc.c (sparc64_elf_merge_private_bfd_data):
+	New function. Avoid mixing US1 and HAL R1 code.
+	Set resulting memory ordering to the strongest one used.
+	(sparc64_elf_object_p): Set bfd_mach correctly.
+
+Thu Oct 23 14:09:33 1997  Richard Henderson  <rth@cygnus.com>
+
+	* elf64-sparc.c (sparc64_elf_howto_table): Add UA64 & UA16.
+	(sparc64_elf_check_relocs): Handle them.
+	(sparc64_elf_relocate_section): Likewise.  Before emitting a dyn reloc,
+	check alignment and transmute R_SPARC_x<->R_SPARC_UAx.
+
+Thu Oct 23 00:53:14 1997  Richard Henderson  <rth@dot.cygnus.com>
+
+	* configure.in (sparc*-*-linux*): Use trad-core and ...
+	* hosts/sparclinux.h: New file.
+
+Thu Oct 23 00:25:29 1997  Richard Henderson  <rth@dot.cygnus.com>
+
+	* config.bfd (sparc64-*-linux*): New target.
+
+	* elf-bfd.h (struct elf_backend_data): Add plt_alignment member.
+	* elflink.c (_bfd_elf_create_got_section): Set .got alignment based
+	on arch_size.
+	(_bfd_elf_create_dynamic_sections): Likewise for .rel* sections.
+	Set .plt alignment from new plt_alignment.
+	* elflink.h (elf_link_create_dynamic_sections): Set version section
+	alignment to LOG_FILE_ALIGN.
+	* elfxx-target.h (elf_backend_plt_alignment): Provide default.
+	(elfXX_bed): Init plt_alignment.
+
+	* elf64-sparc.c (sparc64_elf_check_relocs,
+	sparc64_elf_adjust_dynamic_symbol, sparc64_elf_size_dynamic_sections,
+	sparc64_elf_adjust_dynindx, sparc64_elf_finish_dynamic_symbol,
+	sparc64_elf_finish_dynamic_sections): New functions.
+	(sparc64_elf_howto_table): Fix a few name strings.
+	(ELF_DYNAMIC_INTERPRETER): New definition.
+	(sparc64_elf_relocate_section): Handle shared libraries.
+
+	* elf64-sparc.c (struct plt_template, plt_*_header, plt_*_entry,
+	sparc64_elf_build_plt_entry, sparc64_elf_finish_dynamic_symbol):
+	PLT definitions sparc64-linux originally choose.  These will go
+	away soon in favour of the official abi definitions.
+
+Wed Oct 22 16:08:45 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-sh.c (coff_small_object_p): New static function.
+	(coff_small_new_section_hook): New static function.
+	(bfd_coff_small_swap_table): New static const structure.
+	(coff_small_close_and_cleanup): Define.
+	(coff_small_bfd_free_cached_info): Define.
+	(coff_small_get_section_contents): Define.
+	(coff_small_get_section_contents_in_window): Define.
+	(shcoff_small_vec): New static structure.
+	(shlcoff_small_vec): New static structure.
+	* targets.c (bfd_target_vector): Add shcoff_small_vec and
+	shlcoff_small_vec.
+	* config.bfd (sh-*-elf*): Add shcoff_small_vec and
+	shlcoff_small_vec to targ_selvecs.
+	(sh-*-*): Likewise.
+	* configure.in: Add shcoff_small_vec and shlcoff_small_vec cases.
+	* configure: Rebuild.
+
+Mon Oct 20 15:01:27 1997  Klaus K"ampf  <kkaempf@progis.de>
+
+	* evax-egsd.c: Weak symbols are global.
+
+	* evax-emh.c: Use proper casts.
+
+	* evax-egsd.c (_bfd_evax_write_egsd): Remove unneeded uname.
+
+	* evax-egsd.c: Section names and symbols have different
+	length restrictions. Add length parameter to
+	_bfd_evax_length_hash_symbol.
+	* evax-etir.c: Likewise.
+	* evax-misc.c (_bfd_evax_length_hash_symbol): Add length
+	parameter.
+	* evax.h (EOBJ_S_C_SECSIZ): Define.
+
+	* evax-alpha.c: Remove duplicate test.
+
+	* evax-emh.c: SYS$ functions are upper-case.
+
+	* evax-egsd.c: Create separate sections for common symbols.
+	* evax-etir.c: Don't output common section.
+	* evax.h: Bump up section count.
+
+	* configure.com: Use 64bit integers with DEC C.
+
+	* evax-egsd.c: Make section flags dec c compatible.
+
+Mon Oct 20 09:38:31 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* som.c (normalize): Delete function.
+	(som_bfd_ar_write_symbol_stuff): New parameter elength.  All callers
+	changed.  Use passed in elength to determine size of the extended
+	name table instead of computing it again.
+
+Sun Oct 19 23:36:21 1997  Jim Wilson  <wilson@cygnus.com>
+
+	* peicode.h (coff_swap_scnhdr_out): Use |= not = to set
+	IMAGE_SCN_MEM_READ for an unrecognized section.
+
+Sun Oct 19 21:04:56 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* som.c (som_bfd_ar_write_symbol_stuff): Account for trailing
+	'/' in the extended name table.
+
+Fri Oct 17 00:04:13 1997  Richard Henderson  <rth@cygnus.com>
+
+	* elflink.h (elf_link_assign_sym_version): For explicitly versioned
+	symbols, check globals list before matching on locals.
+
+Thu Oct 16 08:17:06 1997  Michael Meissner  <meissner@cygnus.com>
+
+	* peicode.h (coff_swap_scnhdr_out,pe_print_idata): Fix mangled
+	patch.
+
+Wed Oct 15 13:45:10 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* peicode.h (pe_mkobject_hook): Set DLL flag.
+	(pe_bfd_copy_private_bfd_data): Copy DLL flag.
+
+	* peicode.h (coff_swap_scnhdr_out): Set IMAGE_SCN_MEM_DISCARDABLE
+	for .stab* sections.  Replace strlen of constant strings with
+	number.
+
+Tue Oct 14 15:42:45 1997  Richard Henderson  <rth@cygnus.com>
+
+	* elf64-alpha.c (elf64_alpha_merge_ind_symbols): New function to
+	merge got and reloc entries from ind syms to their target.
+	(elf64_alpha_always_size_sections): Call it.
+	(elf64_alpha_check_relocs): Operate on the target of indirect symbols.
+	(elf64_alpha_can_merge_gots): Likewise.
+	(elf64_alpha_merge_gots): Likewise.
+
+	* elf64-alpha.c (elf64_alpha_relocate_section): Back out HJ's change,
+	as it is insufficient to handle the relocation changes as well.
+
+Mon Oct 13 23:10:08 1997  Richard Henderson  <rth@cygnus.com>
+
+	* elf64-alpha.c (elf64_alpha_calc_dynrel_sizes): Allow for RELATIVE
+	relocs for symbols in shlibs that have been forced local.
+	(elf64_alpha_relocate_section): Output RELATIVEs in .got for same.
+
+Mon Oct 13 21:24:04 1997  Richard Henderson  <rth@cygnus.com>
+
+	* elf64-alpha.c (elf64_alpha_relocate_section): Use the
+	got_enties of the default symbol for the default versioned
+	symbol.  Patch from hjl@gnu.ai.mit.edu, modified not to use
+	alloca in the loop.
+
+Mon Oct 13 17:37:37 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_final_link_relocate): Only use the bottom
+	24 bits of the PC when computing a PC relative relocation.
+
+Fri Oct 10 16:01:30 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_reloc, v850_elf_final_link_relocate):
+	Correct value for maximum positive 22 bit PC relative relocation.
+	(v850_elf_final_link_relocate):  Prevent overflow from HI16_S and
+	HI_16 relocations.  Correct bit adjustment in TDA offsets.
+
+Thu Oct  9 16:43:39 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* elf64-sparc.c (sparc_elf_{hix22,lox10}_reloc): New functions.
+	(sparc64_elf_howto_table): Use them for HIX22,LOX10 relocs.
+
+Wed Oct  8 11:38:45 1997  Richard Henderson  <rth@cygnus.com>
+
+	* elfcore.h (bfd_prstatus): Pedanticly, alignment_power should
+	be LOG_FILE_ALIGN.
+
+Wed Oct  8 11:36:00 1997  Richard Henderson  <rth@cygnus.com>
+
+	* config.bfd: Missed one alpha* change.
+
+Tue Oct  7 13:00:17 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* elf32-sparc.c (_bfd_sparc_elf_howto_table): Remove BFD64 support.
+	* elf64-sparc.c (SPARC64_OLD_RELOCS): Undef.
+	(MINUS_ONE): New macro.
+	(sparc_elf_notsup_reloc): New function.
+	(sparc64_elf_howto_table): Add entries for DISP64,PLT64,HIX22,LOX10,
+	H44,M44,L44,REGISTER.
+	(sparc_reloc_map): Likewise.  Map BFD_RELOC_CTOR to R_SPARC_64.
+	(init_insn_reloc): New function.
+	(sparc_elf_wdisp16_reloc): Use it.
+	(sparc64_elf_relocate_section): Add entries for OLO10,HIX22,LOX10.
+
+Tue Oct  7 11:40:37 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* som.c (som_construct_extended_name_table): Remove static
+	function, and define as macro instead.
+
+Fri Oct  3 14:02:17 1997  Richard Henderson  <rth@cygnus.com>
+
+	* config.bfd: Change alpha-*-* to alpha*-*-*; config.guess now
+	recognizes alphaev5 etc.
+	* configure.host: Likewise.
+
+Fri Oct  3 11:23:47 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	Make ld -s work on AIX:
+	* xcofflink.c (xcoff_link_add_symbols): Don't create the .debug
+	section if we are stripping.
+	(bfd_xcoff_size_dynamic_sections): Don't set the .debug section
+	size if we are stripping.
+	(_bfd_xcoff_bfd_final_link): Don't set SEC_RELOC or rel_filepos,
+	and don't write out relocs, if we are stripping.
+	(xcoff_link_input_bfd): Don't set up reloc if we are stripping.
+	(xcoff_write_global_symbol): Don't write out symbol or reloc if we
+	are stripping.
+
+	* configure.in: Don't include elf.lo again for ELF targets; it's
+	always in the library anyhow.
+	* configure: Rebuild.
+
+	* bfd-in2.h: Rebuild.
+
+	* elf32-sparc.c (sparc_elf_wdisp16_reloc): Cast to bfd_byte *, not
+	char *, when calling bfd_get_32 and bfd_put_32.
+	* sunos.c (sunos_scan_dynamic_symbol): Cast contents to char *
+	when calling strcpy.
+
+Thu Oct  2 16:15:50 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* reloc.c (bfd_check_overflow): New function.
+	(bfd_perform_relocation, bfd_install_relocation): Use it.
+	(BFD_RELOC_SPARC_{DISP64,PLT64}): New relocs.
+	(BFD_RELOC_SPARC_{HIX22,LOX10,H44,M44,L44,REGISTER}): New relocs.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+Thu Oct  2 13:17:18 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* peicode.h (coff_swap_scnhdr_out): Set IMAGE_SCN_MEM_READ for an
+	unrecognized section.  From Jon Thackray <jont@harlequin.co.uk>.
+
+Wed Oct  1 14:03:44 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am ($(BFD_H)): Change stmp-bfd.h to stmp-bfd-h.
+ 	(stmp-bfd-h): Rename from stmp-bfd.h.
+ 	(BFD_H_FILES, LIBBFD_H_FILES, LIBCOFF_H_FILES): New variables.
+	($(srcdir)/bfd-in2.h): Just depend upon stmp-bin2-h.
+	(stmp-bin2-h): New target.
+	($(srcdir)/libbfd.h): Just depend upon stmp-lbfd-h.
+	(stmp-lbfd-h): New target.
+	($(srcdir)/libcoff.h): Just depend upon stmp-lcoff-h.
+	(stmp-lcoff-h): New target.
+	(CLEANFILES): Change stmp-bfd.h to stmp-bfd-h.  Add stmp-bin2.h,
+	stmp-lbfd-h, and stmp-lcoff-h.
+	* Makefile.in: Rebuild.
+
+	* configure.in: Use a diversion to set enable_shared before the
+	arguments are parsed.
+	* configure: Rebuild.
+
+Tue Sep 30 14:18:32 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* elf32-sparc.c (_bfd_sparc_elf_howto_table): R_SPARC_GLOB_JMP
+	renamed to R_SPARC_UNUSED_42.
+	(sparc_reloc_map): Delete R_SPARC_GLOB_JMP entry.
+	* elf64-sparc.c (_bfd_sparc_elf_howto_table): R_SPARC_GLOB_JMP
+	renamed to R_SPARC_UNUSED_42.
+	(sparc_reloc_map): Delete R_SPARC_GLOB_JMP entry.
+	* reloc.c (BFD_RELOC_SPARC_GLOB_JMP): Delete.
+	* bfd-in2.h: Regenerated.
+	* libbfd.h: Regenerated.
+
+Thu Sep 25 12:15:02 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_merge_symbol): Don't check the hash creator until
+	after we have set *sym_hash.
+
+Wed Sep 24 16:52:28 1997  Joel Sherrill  <joel@oarcorp.com>
+
+        * config.bfd (sh*-*-rtems*): New target, like sh-*-*elf*.
+
+Wed Sep 24 11:27:23 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (libbfd_a_SOURCES): Define.
+	* Makefile.in: Rebuild.
+
+	* configure.in: Call AC_CHECK_TOOL before AM_PROG_LIBTOOL.
+	* aclocal.m4: Rebuild with new libtool.
+	* configure: Rebuild.
+
+Tue Sep 23 19:03:13 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (map_sections_to_segments): Even if we are not demand
+	paged, don't put a loadable section after a nonloadable section.
+	(assign_file_positions_for_segments): Increment the file offset
+	for a section with contents, even if it is not loadable.
+
+Sun Sep 21 11:03:24 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_final_link_relocate): Add return code
+	indicating that __ctbp could not be found.
+
+Thu Sep 18 15:04:57 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_check_relocs): Improve error message.
+
+Wed Sep 17 09:54:51 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_final_link_relocate, v850_elf_reloc,
+	v850_elf_check_relocs, v850_elf_reloc_map, v850_elf_howto_table):
+	Add support for the CALLT relocs.
+
+	* reloc.c (COMMENT): Add BFD_RELOC_V850_CALLT_6_7_OFFSET and
+	BFD_RELOC_V850_CALLT_16_16_OFFSET.
+
+	* elf32-v850.c (v850_elf_final_link_relocate): Add checks to catch
+	relocations against non-existant symbols.
+
+Tue Sep 16 14:20:27 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* reloc.c: Add BFR_RELOC_V850_TDA_16_16_OFFSET.
+
+	* elf32-v850.c (v850_elf_reloc, v850_elf_final_link_relocate,
+	v850_elf_howto_table, v850_elf_reloc_map): Add support for a 16
+	bit reloc in the tiny data area.
+
+Mon Sep 15 11:27:36 1997  Ken Raeburn  <raeburn@cygnus.com>
+
+	Merged changes from Martin Hunt:
+
+	* elf32-d30v.c (bfd_elf_d30v_reloc): Change pc-relative relocs
+	over 2^32 bytes to be absolute.  Needed because D30V PC doesn't
+	necessarily wrap.
+
+	* reloc.c, elf32-d30v.c (BFD_RELOC_D30V_9_PCREL,
+	BFD_RELOC_D30V_9_PCREL_R): New relocs.
+
+	* elf32-d30v.c (bfd_elf_d30v_reloc_21): New function.
+	Do 15 and 21 bit pc-relative relocations.
+	* reloc.c (BFD_RELOC_D30V_15_PCREL_R, BFD_RELOC_D30V_21_PCREL_R):
+	New relocations.
+
+	* elf32-d30v.c (bfd_elf_d30v_reloc): Addend needs to be
+	added to the relocation, not or'd.
+
+Wed Sep 10 15:17:25 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_reloc): Remove spurious error message.
+
+Wed Sep 10 11:17:50 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* archures.c (bfd_default_scan): Use strcasecmp.
+	(bfd_default_scan): Test for match with arch_name + ":" +
+ 	printable_name.
+	(bfd_default_scan): Test for match with printable_name - ":".
+	(bfd_default_scan): Delete w65, h8300, h8500, z8k, i960 special
+ 	cases.  Each implements their own scan function.
+	(bfd_default_scan): Delete 386, 2900, 860, mips 2000, mips 4400
+ 	special cases.  Since info->mach == 0.  The test mach == number
+ 	fails.
+	(bfd_arch_list): New function, return name of all the supported
+ 	architectures.
+
+Tue Sep  9 10:21:56 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_print_private_bfd_data): Break after
+	decoding architecture.
+	(v850_elf_reloc): Do not complain if a R_V850_LO16 reloc has bit
+	15 set.
+
+Sun Sep  7 12:25:22 1997  H.J. Lu  (hjl@gnu.ai.mit.edu)
+
+	* elf64-alpha.c (reloc_howto_type): Fix the howto table.
+
+Thu Sep  4 09:44:10 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am: Rebuild dependencies.
+ 	(ALL_MACHINES_CFILES): Add cpu-v850.c.
+	(ALL_MACHINES_CFILES): Add elf32-v850.c.
+	* Makefile.in: Rebuild.
+
+	* reloc.c: Remove extraneous commas from relocation entries.
+	Remove BFD_RELOC_V850_16_PCREL.
+	* bfd-in2.h: Rebuild.
+
+	* xcofflink.c (xcoff_link_add_symbols): Put XTY_CM/XMC_TD symbols
+	in sections named .tocbss rather than .bss.
+
+Wed Sep  3 11:23:23 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* libbfd.h, bfd-in2.h, elf32-v850.c: Removed
+	BFD_RELOC_V850_16_PCREL.
+
+Tue Sep  2 20:44:10 1997  Fred Fish  <fnf@cygnus.com>
+
+	* cofflink.c (coff_link_check_ar_symbols): Handle C_SYSTEM syms
+	the same as C_EXT syms.
+	(coff_link_add_symbols): Ditto.
+	(_bfd_coff_link_input_bfd): Ditto.
+	(_bfd_coff_write_task_globals): Add save_global_to_static.  Use
+	it to preserve and restore state of global_to_static flag.
+
+Tue Sep  2 17:45:22 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_object_p): Set machine number based on
+	bits in e_flags field rather than magic numbers.
+	(v850_elf_final_write_processing, v850_elf_set_private_flags,
+	v850_elf_copy_private_bfd_data, v850_elf_merge_private_bfd_data,
+	v850_elf_print_private_bfd_data): New functions.
+
+Tue Sep  2 17:43:49 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* elf.c (prep_headers): Remove V850E magic number.
+	* elf.c (prep_headers): Remove V850EA magic number.
+
+Tue Sep  2 17:35:05 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* cpu-arc.c (arc_get_mach): Properly scan defined mach entries.
+
+Tue Sep  2 18:29:37 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-m10200.c (mn10200_elf_final_link_relocate): PC relative
+	instructions are relative to the next instruction, not the
+	current instruction.
+	(mn10200_elf_relax_section): Similarly.
+
+Tue Sep  2 15:45:45 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* cpu-v850.c: Use a macro to construct bfd_arch_info_type
+	entries.
+
+	* reloc.c, libbfd.h, bfd-in2.h, elf32-v850.c: Replace
+	BFD_RELOC_V850_{SDA/TDA/ZDA}_OFFSET relocs with new bit pattern
+	specific versions: BFD_RELOC_V850_{area}_{bits}_OFFSET.
+
+Thu Aug 28 17:01:09 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* cpu-v850.c: Remove "plain" from v850 printable name.
+	(scan): Use strcasecmp.
+
+	* archures.c (bfd_mach_v850): Define.
+
+	* cpu-sh.c (scan_mach): Compare with table instead of hardwired to
+ 	just sh/SH, use strcasecmp.
+	(arch_info_struct): Add entries for sh3 et.al.
+
+	* archures.c (bfd_mach_sh, ...): Define.
+
+Wed Aug 27 17:33:07 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* archures.c (bfd_archures_list): Always NULL terminate the list.
+
+Tue Aug 26 17:26:51 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am: Rebuild dependencies.
+	(ALL_MACHINES_CFILES): Add cpu-arc.c.
+	(ALL_MACHINES_CFILES): Add elf32-arc.c.
+	(elf32-arc.lo): Remove explicit dependency.
+	* Makefile.in: Rebuild.
+
+	* acinclude.m4 (BFD_CC_FOR_BUILD): Set EXEEXT_FOR_BUILD.
+	* doc/Makefile.am (MKDOC): Use EXEEXT_FOR_BUILD, not EXEEXT.
+	* aclocal.m4: Rebuild.
+	* configure: Rebuild.
+	* Makefile.in: Rebuild.
+	* doc/Makefile.in: Rebuild.
+
+Mon Aug 25 16:14:34 1997  Christopher Provenzano  <proven@cygnus.com>
+
+	* configure: Rebuild with latest devo autoconf for NT support
+
+Mon Aug 25 16:11:04 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* cpu-arm.c (compatible): If B is a default type, return A.
+
+Mon Aug 25 15:35:46 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* cpu-v850.c (scan): New function.
+	(arch_info_struct): New structure.
+	(bfd_v850_arch): Add link into arch_info_structure.
+
+	* config.bfd (targ_cpu): All v850 variants use the bfd_arch_v850
+	architecture.
+
+	* elf32-v850.c (v850_elf_object_p): New function.
+
+	* archures.c (bfd_mach_v850e): Machine value for v850e.
+
+	* bfd-in2.h (bfd_mach_v850e): Machine value for v850e.
+
+	* elf32-v850.c (ELF_MACHINE_CODE): Default to v850e machine
+	number.
+
+	* elf.c (prep_headers): Add support for v850e machine number.
+
+	* archures.c (bfd_mach_v850ea): Machine value for v850ea.
+
+	* bfd-in2.h (bfd_mach_v850ea): Machine value for v850ea.
+
+	* elf32-v850.c (ELF_MACHINE_CODE): Default to v850ea machine
+	number.
+
+	* elf.c (prep_headers): Add support for v850ea machine number.
+
+Mon Aug 25 14:07:33 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* syms.c (_bfd_stab_section_find_nearest_line): Clear the
+ 	cached_stab field if the offset prevents us from using the cache.
+
+Mon Aug 25 12:08:13 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aout-target.h (MY(vec)): Add SEC_CODE and SEC_DATA to section
+	flags.
+	* aout-arm.c (aout_arm_little_vec): Likewise.
+	(aout_arm_big_vec): Likewise.
+	* bout.c (b_out_vec_big_host): Likewise.
+	(b_out_vec_little_host): Likewise.
+	* mipsbsd.c (aout_mips_little_vec): Likewise.
+	(aout_mips_big_vec): Likewise.
+
+Tue Aug 19 10:09:10 1997  Fred Fish  <fnf@cygnus.com>
+
+	* coff-tic80.c (COFF_ALIGN_IN_SFLAGS): Define to 1.
+	* coffcode.h (styp_to_sec_flags): Ignore incoming STYP_INFO
+	bit in s_flags if COFF_ALIGN_IN_S_FLAGS is defined.
+
+Tue Aug 19 08:47:17 1997  Fred Fish  <fnf@cygnus.com>
+
+	* coff-i960.c (COFF_ALIGN_IN_SECTION_HEADER): Define to 1.
+	(GET_SCNHDR_ALIGN, PUT_SCNHDR_ALIGN): Define.
+	* coff-m88k.c (GET_SCNHDR_NRELOC, GET_SCNHDR_NLNNO): Define.
+	* coffcode.h (coff_set_alignment_hook): Conditionally compile in if
+	COFF_ALIGN_IN_SECTION_HEADER is defined.  Convert alignment to power
+	of two for I960 only.
+	* coffswap.h (GET_SCNHDR_NRELOC, PUT_SCNHDR_NRELOC, GET_SCNDHR_NLNNO,
+	PUT_SCNHDR_NLNNO, GET_SCNHDR_FLAGS, PUT_SCNHDR_FLAGS): Provide
+	default definitions.
+	(coff_swap_scnhdr_in): Use GET_SCNHDR_FLAGS, GET_SCNHDR_NRELOC,
+	GET_SCNHDR_NLNNO, and GET_SCNHDR_ALIGN.
+	(coff_swap_scnhdr_out): Use PUT_SCNHDR_FLAGS, PUT_SCNHDR_ALIGN.
+	* Makefile.in (coff-tic80.o): Depends upon coffswap.h.
+	* coff-tic80.c (COFF_ALIGN_IN_SECTION_HEADER): Define to 1.
+	(GET_SCNHDR_FLAGS, PUT_SCNHDR_FLAGS): Define
+	* coffcode.h (coff_write_object_contents): Set alignment field in
+ 	section header for TIC80COFF files.
+
+Mon Aug 18 11:36:19 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_howto_table, v850_elf_reloc_map,
+	v850_elf_check_relocs, v850_elf_reloc,
+	v850_elf_final_link_relocate):  Add support for
+	BFD_RELOC_V850_16_PCREL relocation.
+
+	* reloc.c (COMMENT): Add suuport for BFD_RELOC_V850_16_PCREL
+	relocation.
+
+	* libbfd.h: Add support for BFD_RELOC_V850_16_PCREL relocation.
+
+	* bfd-in2.h: Add support for BFD_RELOC_V850_16_PCREL relocation.
+
+Mon Aug 18 11:33:56 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* cpu-v850e: New file.
+
+	* elf.c (prep_headers): Add support for v850e target.
+
+	* bfd-in2.h (bfd_architecture): Add support for v850e target.
+
+	* config.bfd: Add support for v850e target.
+
+	* archures.c: Add support for v850e target.
+
+Mon Aug 18 11:33:56 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* cpu-v850ea: New file.
+
+	* elf.c (prep_headers): Add support for v850ea target.
+
+	* bfd-in2.h (bfd_architecture): Add support for v850ea target.
+
+	* config.bfd: Add support for v850ea target.
+
+	* archures.c: Add support for v850ea target.
+
+Fri Aug 15 12:01:28 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffgen.c (coff_find_nearest_line): Correctly handle the offset
+	argument as section relative, rather than an absolute address.
+	From Jan Hoogenraad <hoogenrd@natlab.research.philips.com>.
+
+Fri Aug 15 04:58:02 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* config.bfd (arc-*-elf*): Add.
+	* configure.in (bfd_elf32_{little,big}arc_vec): Add.
+	* configure: Rebuild.
+	* Makefile.am (ALL_MACHINES): Add cpu-arc.lo.
+	(BFD32_BACKENDS): Add elf32-arc.lo.
+	(cpu-arc.lo,elf32-arc.lo): Add rules for.
+	* Makefile.in: Rebuild.
+	* archures.c (architecture list): Add bfd_arch_arc.
+	(bfd_archures_list): Add bfd_arc_arch.
+	(bfd_mach_arc_base): Define.
+	* reloc.c (BFD_RELOC_ARC_B22_PCREL,BFD_RELOC_ARC_B26): Add.
+	* targets.c (bfd_elf32_{little,big}arc_vec): Declare.
+	(bfd_target_vect): Add them.
+	* bfd-in2.h, libbfd.h: Rebuild.
+	* cpu-arc.c, elf32-arc.c: New files.
+	* elf.c (pre_headers): Recognize bfd_arch_arc.
+
+Tue Aug 12 11:45:18 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutx.h (NAME(aout,final_link)): If no symbols, make sure the
+	data section is correctly rounded to a page in the file.
+
+Mon Aug 11 12:45:43 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutx.h (NAME(aout,final_link)): Don't emit the string table if
+	there are no symbols.
+
+Sun Aug 10 14:45:56 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-stgo32.c: Rename from coff-stubgo32.c to avoid old System V
+	file system 14 character limit.
+	* Makefile.am: Corresponding changes.
+	* configure.in: Corresponding changes.
+	* Makefile.in: Rebuild.
+	* configure: Rebuild.
+
+Fri Aug  8 18:34:36 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am: (ALL_MACHINES_CFILES): Add elf32-d10v.c.
+	Rebuild dependencies.
+	* Makefile.in: Rebuild.
+
+Wed Aug  6 18:56:51 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (docdir): Define.
+	* Makefile.in: Rebuild.
+
+Tue Aug  5 23:05:03 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Rebuild with autoconf 2.12.1.
+
+Mon Aug  4 12:00:35 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aclocal.m4, configure: Rebuild with new automake patches.
+
+Sun Aug  3 08:15:12 1997  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* rs6000-core.c (make_bfd_asection):  New function to add a section
+	to the core file bfd.
+	(rs6000coff_core_p):  Use make_bfd_asection to add the core file
+	sections.
+	Use BFD routines to seek, read and stat the core file.
+	Handle .data sections from loaded objects and anonymously mmapped
+	regions, these are available in AIX 4 core files.
+
+Fri Aug  1 12:58:32 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Set enable_shared before AM_PROG_LIBTOOL.
+	* acinclude.m4: Move acmacros.m4 in here.  Remove AM_PROG_LIBTOOL
+	copy; use a patches libtool instead.
+	* acmacros.m4: Remove.
+	* Makefile.in: Rebuild.
+	* aclocal.m4: Rebuild.
+	* configure: Rebuild.
+
+Thu Jul 31 19:55:36 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am: New file, based on old Makefile.in.
+	* acmacros.m4: New file, copied from old aclocal.m4.
+	* acinclude.m4: New file.
+	* configure.in: Call AM_PROG_LIBTOOL.  Remove shared library
+	handling; now handled by libtool.  Replace AC_CONFIG_HEADER with
+	AM_CONFIG_HEADER.  Replace AC_PROG_INSTALL with AM_PROG_INSTALL.
+	Call AM_MAINTAINER_MODE, AM_CYGWIN32, and AM_EXEEXT.  Change all
+	.o files to .lo.  Remove stamp-h handling in AC_OUTPUT.
+	* acconfig.h: Mention PACKAGE and VERSION.
+	* stamp-h.in: New file.
+	* dep-in.sed: Change .o to .lo.
+	* Makefile.in: Now built with automake.
+	* aclocal.m4: Now built with aclocal.
+	* config.in, configure: Rebuild.
+	* VERSION: Remove.
+
+Thu Jul 31 12:09:20 1997  Geoff Keating  <geoffk@ozemail.com.au>
+
+	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Don't set TEXTREL
+ 	if there is only a relocation to a read-only but not allocatable
+ 	section (like .stab).
+	* elf32-sparc.c (elf32_sparc_size_dynamic_sections): Likewise.
+	* elf32-i386.c (elf_i386_size_dynamic_sections): Likewise.
+	* elf32-m68k.c (elf_m68k_size_dynamic_sections): Likewise.
+	* elf32-mips.c (mips_elf_size_dynamic_sections): Likewise.
+	* elf64-alpha.c (elf64_alpha_size_dynamic_sections): Likewise.
+
+	* elf32-ppc.c (ppc_elf_howto_raw): Correct various comments.
+	(ppc_elf_create_linker_section): These sections are not
+	created by the linker (that is, they are created by the user
+	putting data in them). In particular, they can be the source
+	and target of relocations.
+	(ppc_elf_adjust_dynamic_symbol): Check postcondition of
+ 	bfd_elf32_link_record_dynamic_symbol.  Align 16-byte common
+ 	objects (for instance, 'long double') to 16-byte boundaries.
+	(ppc_elf_size_dynamic_sections): Make the code that generates
+	section symbols exactly the same as for sparc, reducing the
+	number of section symbols output.
+	(ppc_elf_check_relocs): Check postcondition of
+	bfd_elf32_link_record_dynamic_symbol.  Make default case the
+	same as corresponding code for sparc, fixing bug involving
+	.rela.stabs.
+	(ppc_elf_finish_dynamic_symbol): Fix case involving GOT symbols
+ 	forced to be local because of versioning (by replicating
+ 	corresponding change in sparc).  Treat R_PPC_RELATIVE RELA relocs
+ 	as usual in ELF, not as pseudo-REL relocs (as the sparc linker
+ 	does).
+	(ppc_elf_relocate_section): Add handy debugging code for when
+ 	assertion fails.  Add some more 'symbol made local because of
+ 	versioning' cases.
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Cope with addend when
+	processing a GOT relocation as required by ABI.
+
+Wed Jul 30 21:30:35 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* elflink.h (NAME(bfd_elf,record_link_assignment)): Remove any
+	version info if this symbol came from a dynamic object.
+	(elf_link_add_object_symbols): Set the version info of a symbol
+	only if the object actually contains version definitions and
+	defines this symbol.
+
+Mon Jul 28 18:07:43 1997  Rob Savoye  <rob@chinadoll.cygnus.com>
+
+	* aclocal.m4: Add CYGWIN and EXEEXT autoconf macros.
+        * configure.in: Use CYGWIN and EXEEXT autoconf macro to look for
+        win32 dependencies.
+        * configure: Regenerated with autoconf 2.12.
+        * doc/Makefile.in: Add $(EXEEXT) to chew executable.
+
+Mon Jul 28 02:50:29 1997  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* rs6000-core.c (rs6000coff_core_p):  If CORE_TRUNC is set, print
+	a warning rather than returning an error.
+
+Sun Jul 27 19:54:14 1997  Felix Lee  <flee@cygnus.com>
+
+	* coffswap.h (coff_swap_aux_in): add semicolon to make MSVC happy.
+
+Fri Jul 25 14:50:08 1997  Felix Lee  <flee@cygnus.com>
+
+	* cisco-core.c: define signals for wingdb.
+
+Fri Jul 25 16:27:07 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ecofflink.c (bfd_ecoff_debug_accumulate): Only merge files with
+	the same number of aux entries.
+
+Fri Jul 25 08:22:15 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* som.c (hppa_som_gen_reloc_type): Use R_DATA_EXPR for the
+	difference of two symbols if the relocation size is 32 bits.
+	(som_write_fixups): Handle R_DATA_EXPR.
+
+Wed Jul 23 16:08:02 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-i386.c (coff_i386_reloc): Don't offset a common symbol by
+	its value if COFF_WITH_PE is defined.
+
+Tue Jul 22 17:19:45 1997  Robert Hoehne <robert.hoehne@Mathematik.TU-Chemnitz.DE>
+
+	* coff-stubgo32.c: New file.
+	* go32stub.h: New file.
+	* coff-i386.c: If COFF_GO32_EXE, include coff/go32exe.h.
+	* coffswap.h (coff_swap_filehdr_in): Invoke
+	COFF_ADJUST_FILEHDR_IN_PRE and COFF_ADJUST_FILEHDR_IN_POST if they
+	are defined.
+	(coff_swap_filehdr_out): Invoke COFF_ADJUST_FILEHDR_OUT_PRE and
+	COFF_ADJUST_FILEHDR_OUT_POST if they are defined.
+	(coff_swap_aux_in): Invoke COFF_ADJUST_AUX_IN_PRE and
+	COFF_ADJUST_AUX_IN_POST if they are defined.
+	(coff_swap_aux_out): Invoke COFF_ADJUST_AUX_OUT_PRE and
+	COFF_ADJUST_AUX_OUT_POST if they are defined.
+	(coff_swap_scnhdr_in): Invoke COFF_ADJUST_SCNHDR_IN_PRE and
+	COFF_ADJUST_SCNHDR_IN_POST if they are defined.
+	(coff_swap_scnhdr_out): Invoke COFF_ADJUST_SCNHDR_OUT_PRE and
+	COFF_ADJUST_SCNHDR_OUT_POST if they are defined.
+	* targets.c (go32stubbedcoff_vec): Declare.
+	(bfd_target_vector): Add go32stubbedcoff_vec.
+	* configure.in (go32coff_vec): New target vector.
+	(go32stubbedcoff_vec): Likewise.
+	* config.bfd (i[3456]86-*-msdosdjgpp*): New target.
+	(i[3456]86-*-go32*): Change to be like new msdosdjgpp*.
+	* Makefile.in: Rebuild dependencies.
+ 	(BFD32_BACKENDS): Add coff-stubgo32.o.
+	(BFD32_BACKENDS_CFILES): Add coff-stubgo32.c.
+	(HFILES): Add go32stub.h.
+
+Tue Jul 22 15:09:12 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Check for fdopen.
+	* configure, config.in: Rebuild.
+	* opncls.c (bfd_fdopenr): Check HAVE_FDOPEN rather than VMS or
+	__GO32__.  Reindent a bit.
+
+Sun Jul 20 20:05:20 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* sunos.c (sunos_create_dynamic_sections): Set SEC_LINKER_CREATED
+	flag for newly created sections.
+	(sunos_add_dynamic_symbols): Don't discard newly created sections
+	if shared library is dynobj.
+
+Mon Jul 14 15:33:55 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (map_sections_to_segments): When checking whether
+	including a section in a segment would force us to skip a page,
+	align the address of the next segment to avoid wraparound
+	problems.
+
+Tue Jul  8 12:11:29 1997  Fred Fish  <fnf@cygnus.com>
+
+	* coffcode.h (coff_write_object_contents): Initialize
+ 	target id field to TIC80_TARGET_ID.
+	* coffswap.h (coff_swap_filehdr_out): Swap out target id field
+ 	if used.
+	(coff_swap_filehdr_in): Swap in target id field if used.
+
+Mon Jul  7 16:41:20 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-i386.c (coff_i386_is_local_label_name): New static function
+	if TARGET_UNDERSCORE.
+	(coff_bfd_is_local_label_name): Define if TARGET_UNDERSCORE.
+	(i386coff_vec): Add SEC_CODE and SEC_DATA to section_flags.
+
+Mon Jun 30 14:29:26 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-m68k.c (howto_table): Use complain_overflow_bitfield, not
+	complain_overflow_signed, for 32 bit PC relative relocations.
+
+Thu Jun 26 01:26:31 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_add_object_symbols): When a version
+	indirection symbol is overridden, make the original symbol point
+	at the real overriding symbol.
+
+	* elf.c (bfd_elf_string_from_elf_section): Check for an invalid
+	string index.
+
+	* elflink.h (elf_link_output_extsym): Use the right section for a
+	common symbol.
+	* elf32-mips.c (mips_elf_link_output_symbol_hook): If a common
+	symbol was in .scommon, mark it as SHN_MIPS_SCOMMON.
+
+Wed Jun 25 12:43:10 1997  H.J. Lu  <hjl@gnu.ai.mit.edu>
+
+	* elflink.h (elf_merge_symbols): Resolve indirect and warning
+	symbols before checking for new symbols.
+
+	* elfcore.h (elf_corefile_note): Move out of HAVE_SYS_PROCFS_H.
+
+Tue Jun 24 11:20:43 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffgen.c (coff_object_p): Read the f_opthdr bytes from the
+	file, not aoutsz bytes (they are different in XCOFF .o files).
+
+	* xcofflink.c (xcoff_link_add_symbols): Permit symbols to be
+	redefined by objects included from archives.
+
+Mon Jun 23 18:03:27 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_merge_symbol): In the case of a new defined
+	symbol overriding an old defined symbol, return the hash table
+	entry which we modify, even if it is the target of an
+	indirection.
+	(elf_link_add_object_symbols): If the real name of the symbol gets
+	overridden, convert the versioned symbol into an indirect symbol
+	to the real symbol.
+
+	* elflink.h (elf_merge_symbol): New static function, broken out of
+	elf_link_add_object_symbols.
+	(elf_link_add_object_symbols): Call it.
+
+Sun Jun 22 19:40:57 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-i386.c (i3coff_object_p): If COFF_IMAGE_WITH_PE, hack to
+	handle case where COFF filehdr does not immediately follow PE
+	header.
+	* coffgen.c (coff_object_p): Remove useless seek to current
+	location.
+
+Wed Jun 18 19:03:38 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* linker.c (link_action): Change COMMON_ROW/indr to from CREF to
+	REFC.
+
+Tue Jun 17 11:55:02 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cofflink.c (_bfd_coff_link_input_bfd): If stripping debugging
+	symbols, skip N_ABS symbols with debugging storage classes.
+
+Mon Jun 16 18:56:27 1997  Geoff Keating  <geoffk@ozemail.com.au>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Don't emit R_PPC_REL*
+	relocs in shared libraries which refer to local symbols.  Cope
+	with addend when processing a GOT relocation.
+
+	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Only create symbols
+	for sections that the linker didn't create.
+	(ppc_elf_finish_dynamic_sections): Only try to write out a section
+	symbol if it was created in ppc_elf_size_dynamic_sections.
+	(ppc_elf_relocate_section): Complain if we have to generate a reloc
+	relative to a section for which we didn't output a symbol.
+
+	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Clean up.  PLT
+	relocs are 'rela' relocs, like everything else.  .rela.plt is not
+	a read-only section, so we don't have to special-case it.
+
+	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Entries in the
+	.rela.bss section are (of course) 'rela' relocs not 'rel' relocs.
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Initialise srelgot.
+	(ppc_elf_relocate_section): @got offsets are 4 from start of the
+	actual .got section.
+	* elflink.c (_bfd_elf_create_got_section): The three reserved
+	words start from the symbol '_GLOBAL_OFFSET_TABLE_'.
+
+	* elf32-ppc.c (ppc_elf_size_dynamic_sections): '.rela' is 5
+	characters, not 4.
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Use
+	_bfd_elf_create_got_section to create the GOT rather than
+	ppc_elf_create_linker_section. Create the '.rela.got' section
+	ourselves.
+	(ppc_elf_finish_dynamic_symbol): Set up GOT relocations when a
+	symbol has a GOT entry.
+	(ppc_elf_relocate_section): Record when a symbol is used through
+	the GOT, and allocate space in the GOT for each such symbol.
+	(ppc_elf_adjust_dynamic_symbol): Delete unused .got.plt stuff.
+	(ppc_elf_create_linker_section): Delete unused LINKER_SECTION_GOT
+	stuff.
+
+	* elf32-ppc.c (ppc_elf_howto_raw): GOT16_HA relocs should be
+	treated in a similar way to ADDR16_HA relocs.
+	(ppc_elf_relocate_section): PLTREL24 relocs do not get copied into
+	shared objects; the linker must deal with them.
+	(ppc_elf_create_linker_section): Stop setting
+	_GLOBAL_OFFSET_TABLE_ to the wrong value; delete unused
+	LINKER_SECTION_PLT stuff.
+	(ppc_elf_check_relocs): Delete unused LINKER_SECTION_PLT stuff.
+	(ppc_elf_finish_dynamic_sections): Use BFD calls to get GOT
+	section, not ELF-specific calls.
+	(elf_backend_plt_not_loaded): Set to 1.
+	(elf_backend_got_symbol_offset): Set to 4.
+	* elf-bfd.h (elf_backend_data): Add 'plt_not_loaded' member
+	for when ld.so fills in the PLT; and 'got_symbol_offset' member.
+	* elflink.c (_bfd_elf_create_dynamic_sections): Apply
+	plt_not_loaded member.
+	(_bfd_elf_create_got_section): Apply got_symbol_offset.
+	* elfxx-target.h (elf_backend_plt_not_loaded): Set default to
+	'loaded'.
+	(elf_backend_G_O_T_offset): Set default to 0.
+	(elfNN_bed): Set added fields.
+
+	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Was setting
+	DT_RELENT in shared objects; should be DT_RELAENT.
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Propagate
+	R_PPC_ADDR16_HA relocs to shared objects. Cope with case where
+	such a reloc (in a non-shared object) refers to a symbol that's
+	not defined.
+
+Mon Jun 16 14:42:14 1997  H.J. Lu  <hjl@gnu.ai.mit.edu>
+
+	* elfcode.h (put_signed_word): Define.
+	(get_signed_word): Define.
+	(elf_swap_reloca_in): Use get_signed_word for the r_addend field.
+	(elf_swap_reloca_out): Use put_signed_word for the r_addend
+	field.
+	* elf32-m68k.c (elf_m68k_finish_dynamic_symbol): Use
+	bfd_get_signed_32 to set the r_addend field.
+	* elf64-mips.c (mips_elf64_swap_reloca_in): Use
+	bfd_h_get_signed_64 to set the r_addend field.
+
+Mon Jun 16 12:31:29 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-i386.c (elf_i386_relocate_section): When generating a
+	shared library, do the relocation if the input section is not
+	allocated in memory.
+
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Call
+	elf_link_assign_sym_version before elf_adjust_dynamic_symbol.
+	(elf_fix_symbol_flags): New static function, broken out of
+	elf_adjust_dynamic_symbol.
+	(elf_adjust_dynamic_symbol): Call elf_fix_symbol_flags.
+	(elf_link_assign_sym_version): Likewise.  Permit a symbol to be
+	forced local even if NEEDS_PLT is set.  When forcing a symbol to
+	be local, clear NEEDS_PLT.
+	(elf_link_output_extsym): Remove unused local bed.
+
+Wed Jun 11 22:44:20 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-mn10300.c (elf32_mn10300_link_hash_entry): New structure
+	for derived elf linker hash table entries.  References to
+	elf_link_hash_entry changed appropriately.
+	(elf32_mn10300_link_hash_table): New structure for derived elf
+	linker hash table.
+	(elf32_mn10300_hash_table): Define.
+	(elf32_mn10300_link_hash_traverse): Likewise.
+	(elf32_mn10300_link_hash_newfunc): New function.
+	(elf32_mn10300_link_hash_table_create): Likewise.
+	(elf32_mn10300_finish_hash_table_entry): Likewise.
+	(mn10300_elf_relax_section): Handle "call" -> "calls", removal
+	of prologue code, and call:32->call:16 relaxing.
+	(compute_function_info: New function.
+	(bfd_elf32_bfd_ilink_hash_table_create): Define.
+
+Wed Jun 11 00:00:07 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_output_extsym): Call finish_dynamic_symbol
+	for a symbol which is being forced to be local.
+	* elf32-i386.c (elf_i386_relocate_section): Write out the
+	relocation value for a GOT reloc for a symbol which is turning
+	into a local symbol.
+	(elf_i386_finish_dynamic_symbol): If a symbol is turning into a
+	local symbol, write out a RELATIVE reloc rather than a GLOB_DAT
+	reloc.
+	* elf32-m68k.c, elf32-sparc.c: Corresponding changes.
+
+	* elf32-i386.c (elf_i386_relocate_section): Get the relocation
+	value if the symbol is turning into a local symbol.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+
+1997-06-10 22:58  Ulrich Drepper  <drepper@cygnus.com>
+
+	* elflink.h (elf_link_add_object_symbols): Also read verneed
+	information by calling `_bfd_elf_slurp_version_tables'.
+	(elf_link_add_object_symbols): For undefined symbols look for
+	version information in the verneed records.
+	(elf_link_add_object_symbols): Use soname of shared object
+	for verneed record if it is available.
+
+Tue Jun 10 11:13:03 1997  H.J. Lu  <hjl@gnu.ai.mit.edu>
+
+	* cpu-arm.c: Add prototypes for compatible and scan.
+	* cofflink.c: Add prototype for mark_relocs.
+
+	* archive.c (bfd_special_undocumented_glue): Change filename to
+	const pointer.  Add prototype.
+
+Mon Jun  9 12:34:21 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* elflink.h (elf_link_add_object_symbols): Ignore relocations of
+	sections that will be discarded.
+
+1997-06-06 22:58  Ulrich Drepper  <drepper@cygnus.com>
+
+	* elflink.h (elf_link_find_version_dependencies): When searching
+	for known version symbol skip non-matching verdef records, not
+	matching records.
+
+Thu Jun  5 15:52:45 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cofflink.c (_bfd_coff_generic_relocate_section): Write a long,
+	not a bfd_vma, to the base file, to match how dlltool reads it.
+
+Tue Jun  3 16:57:45 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* reloc.c: Add thumb relocations.
+
+	* bfd-in2.h: Add Thumb relocations.
+
+	* libbfd.h: Add Thumb relocations.
+
+Mon Jun  2 10:41:52 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* cpu-m68k.c (arch_info_struct): Fix 68060 cpu name.
+
+Fri May 30 12:46:27 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-sparc.c (elf32_sparc_size_dynamic_sections): Set dynindx
+	for a section even if it is not loaded.
+
+	* cofflink.c (coff_link_add_symbols): If PE file, don't subtract
+	section VMA.
+	(_bfd_coff_link_input_bfd): Separate section VMA handling for
+	input and output files.
+	(_bfd_coff_generic_relocate_section): Check whether input file,
+	not output file, is a PE file.
+
+Wed May 28 15:48:43 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c: (coff_arm_bfd_set_private_flags): Make static.
+
+Wed May 28 16:16:04 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-i386.c (coff_i386_reloc): Don't just exit if we see an
+	R_IMAGEBASE reloc.
+
+Wed May 28 09:48:43 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* cpu-arm.c (compatible): Add test for supersets of ARM
+	architectures.
+
+Tue May 27 19:42:03 1997  Bob Manson  <manson@charmed.cygnus.com>
+
+	* cofflink.c (_bfd_coff_final_link): Initialize global_to_static
+	member.
+
+Tue May 27 14:34:08 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c (coff_arm_bfd_set_private_flags): Make global.  It is
+	called directly by gas/config/tc-arm.c.
+
+Tue May 27 15:58:53 1997  Richard Henderson  <rth@tamu.edu>
+
+	* elf64-alpha.c (PLT_ENTRY_*): Use a new thread-safe format.
+	(elf64_alpha_finish_dynamic_symbol): Fill it in properly.
+
+Mon May 26 14:05:13 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-ppc.c (coff_ppc_relocate_section): If PE file, don't add
+	section VMA.
+
+Mon May 26 10:57:48 1997  Fred Fish  <fnf@cygnus.com>
+
+	* peicode.h (coff_bfd_print_private_bfd_data): #undef before #define.
+	(coff_bfd_copy_private_bfd_data): Ditto.
+	* coff-arm.c (coff_arm_bfd_merge_private_bfd_data): Make static.
+	(coff_arm_bfd_print_private_bfd_data): Ditto.
+	(coff_arm_bfd_set_private_flags): Ditto.
+	(coff_arm_bfd_copy_private_bfd_data): Ditto.
+
+Fri May 23 15:14:58 1997  Fred Fish  <fnf@cygnus.com>
+
+	* libcoff-in.h (struct coff_final_link_info): Add boolean
+	global_to_static member for support of task linking.
+	(_bfd_coff_write_task_globals): Add prototype.
+	* libcoff.h: Regenerate.
+	* coffcode.h (coff_write_object_contents): Use #ifdef to
+	check RS6000COFF_C, to be consistent with all other uses
+	in this file.
+	* cofflink.c (_bfd_coff_final_link): If doing task linking,
+	call _bfd_coff_write_task_globals.
+	(_bfd_coff_link_input_bfd): If doing task linking, convert
+	global functions to static.
+	(_bfd_coff_write_global_sym): If doing task linking, convert
+	global variables to static.
+	(_bfd_coff_write_task_globals): New function.
+	* coff-tic80.c (TIC80COFF): Define this instead of just TIC80.
+	(C_AUTOARG): #undef since it clashes with C_UEXT.
+	(C_LASTENT): #undef since it clashes with C_STATLAB.
+	* coffcode.h (coff_write_object_contents): Use TIC80COFF
+	rather than TIC80.
+	(coff_slurp_symbol_table): Use C_SYSTEM.  Hide C_AUTOARG use
+	when TIC80COFF defined (clashes with C_UEXT).  Explicitly
+	recognize C_UEXT, C_STATLAB, and C_EXTLAB as unsupported.
+
+Fri May 23 12:38:24 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-tic80.c (tic80_howto_table): Change overflow check for most
+	PP relocations to complain_overflow_dont.
+
+Thu May 22 20:22:14 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-tic80.c (tic80_howto_table): Add PP relocations.  Change
+	name of R_RELLONG to "RELLONG".  Set rightshift and complain for
+	M_PPCR.
+	(ppbase_reloc, glob15_reloc): New static functions.
+	(glob16_reloc, local16_reloc): New static functions.
+	(rtype2howto): Handle all relocation types.
+	(coff_tic80_relocate_section): New static function.
+	(coff_relocate_section): Define to coff_tic80_relocate_section.
+	* Makefile.in (coff-tic80.o): Depends upon include/coff/tic80.h.
+
+Wed May 21 17:15:50 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffcode.h (coff_slurp_symbol_table): If COFF_WITH_PE or
+	COFF_IMAGE_WITH_PE, don't subtract the section VMA from the symbol
+	value.
+	* coffgen.c (fixup_symbol_value): Add abfd parameter.  Change all
+	callers.  If PE file, don't add section VMA.
+	(coff_write_alien_symbol): If PE file, don't add section VMA.
+	* cofflink.c (_bfd_coff_link_input_bfd): Likewise.
+	(_bfd_coff_write_global_sym): Likewise.
+	(_bfd_coff_generic_relocate_section): Likewise.
+
+	* peicode.h: Add & 0xffffffff when using ImageBase in case bfd_vma
+	is 64 bits.
+
+Wed May 21 09:58:10 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* cofflink.c (mark_relocs): Add new function to mark symbols which
+	are used by relocations.
+	(_bfd_coff_link_input_bfd): Add call to mark_relocs() and code to
+	suppress the skipping of symbols that have thus been marked.
+
+Tue May 20 18:45:26 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-sh.c (sh_merge_private_data): New static function.
+	(coff_bfd_merge_private_bfd_data): Define.
+
+Mon May 19 14:46:00 1997  Mark Alexander  <marka@cygnus.com>
+
+	* coff-tic80.c: Remove unnecessary #ifdefs.
+	* config.bfd: Set targ_underscore to yes for tic80.
+
+Mon May 19 14:26:36 1997  Mark Alexander  <marka@cygnus.com>
+
+	* coff-tic80.c (NAMES_HAVE_UNDERSCORE): Define (fixes problem
+	with unresolved external symbols in GDB).
+
+Fri May 16 10:23:03 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-m10300.c (elf32_mn10300_relax_section): Read in all
+	the symbols associated with each BFD.
+	(mn10300_elf_relax_delete_bytes): Don't adjust the same symbol
+	more than once.
+	* elf-m10200.c: Likewise.
+	* elf32-m32r.c: Likewise.
+	* elf32-sh.c: Likewise.
+
+Fri May 16 12:10:52 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_add_object_symbols): Don't decrease the
+	alignment of a common symbol.  If two symbols that look like
+	common symbols are found in two shared libraries, and the size is
+	different, use the larger size, and warn if --warn-common.  If a
+	common symbol overrides a definition in a shared library, set the
+	size to the larger size, and warn if --warn-common.
+
+Thu May 15 14:31:28 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* cpu-arm.c (compatible):  Allow default machine to be polymorphed
+	into any other machine type.
+
+	* coffcode.h (coff_set_flags):  Initialise flags variable to 0.
+
+	* coff-arm.c (coff_arm_bfd_merge_private_bfd_data):  When merging
+	data into an unitialised destination set its machine type as well.
+
+Thu May 15 16:40:20 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_add_object_symbols): Force ELF symbol size
+	to common symbol size.  Consistently treat uninitialized symbols
+	in shared objects as common symbols.
+
+Fri May  9 10:15:27 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* archures.c (constants):  Added new constants to identify the
+	type of the ARM architecture: bfd_mach_arm_2, bfd_mach_arm_2a,
+	bfd_mach_arm_3,	bfd_mach_arm_3M, bfd_mach_arm_4 and bfd_mach_arm_4T.
+
+	* bfd-in2.h (constants):   Added new constants to identify
+	the type of the ARM architecture: bfd_mach_arm_2, bfd_mach_arm_2a,
+	bfd_mach_arm_3, bfd_mach_arm_3M, bfd_mach_arm_4 and
+	bfd_mach_arm_4T.  This file is auto-magically generated from the
+	archures.c file.  This update is just to save work.
+
+	* coff-arm.c (coff_arm_bfd_merge_private_bfd_data,
+	coff_arm_bfd_print_private_bfd_data,
+	coff_arm_bfd_set_private_flags,
+	coff_arm_bfd_copy_private_bfd_data): Added these new functions.
+	(global): Macro redefinitions set up to use these new functions.
+
+	* coffcode.h (coff_mkobject_hook): Added call to
+	coff_arm_bfd_set_private_flags().
+	(coff_set_arch_mach_hook): Added code to set machine type based on
+	bits stored in internal flags.
+  	(coff_set_flags): Added code to set the new bits in the flags
+	field based on the machine number.
+	(function definition macros): Made all function definition macros
+	conditional so that they can be overridden by target specific
+	files.
+
+	* cpu-arm.c (compatible): Added this function.  (arch_info_struct):
+	Structure extended to include new types, one each for ARMv2,
+	ARMv2a, ARMv3, ARMv3M, ARMv4 and ARMv4T.
+
+	* libcoff-in.h (struct coff_tdata):  Added flags field.
+
+Fri May  9 17:40:02 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.bfd (i[3456]86-*-gnu*): Don't include Mach support.
+
+	* config.bfd: Change #if 0 around uses of host_aout_vec to #if
+	HAVE_host_aout_vec.
+
+Mon May  5 13:57:32 1997  Mike Meissner  <meissner@cygnus.com>
+
+	* coffgen.c (coff_find_nearest_line): If there are no syments,
+	just return false.
+
+Mon May  5 18:18:45 1997  Philip Blundell  <pjb27@cam.ac.uk>
+
+	* config.bfd: cope with '*-*-linux-gnuaout' targets.
+
+Thu May  1 11:31:12 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* targmatch.sed: Add explicit \n characters to work around bug in
+	HP/UX 10.20 sed program.
+
+Wed Apr 30 12:27:03 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (copy_private_bfd_data): Cast csecs to avoid sign
+	extension problems.
+
+Tue Apr 22 12:06:08 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (do_maintainer_clean): Don't remove bfd-in2.h.
+
+Mon Apr 21 11:21:31 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* elf32-m68k.c: Follow the last changes in elf32-i386.c:
+	(struct elf_m68k_pcrel_relocs_copied, struct
+	elf_m68k_link_hash_entry, struct elf_m68k_link_hash_table,
+	elf_m68k_link_hash_traverse, elf_m68k_hash_table,
+	elf_m68k_link_hash_newfunc, elf_m68k_link_hash_table_create,
+	elf_m68k_discard_copies, bfd_elf32_bfd_link_hash_table_create):
+	New definitions.
+	(elf_m68k_check_relocs): If linking with -Bsymbolic, don't copy
+	PC relative relocs for a global symbol defined in a regular
+	object, and count the number of PC relative relocs copied for any
+	global symbol.
+	(elf_m68k_size_dynamic_sections): If linking with -Bsymbolic,
+	traverse with elf_m68k_discard_copies.
+
+Sat Apr 19 22:50:14 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-i386.c (elf_i386_check_relocs): Only count PC relative
+	relocs.  From Jamie Lokier <jamie@rebellion.co.uk>.
+
+	* coffcode.h (coff_compute_section_file_positions): Force the
+	potential last byte in the file to be written out when
+	COFF_IMAGE_WITH_PE.
+
+Thu Apr 17 13:46:56 1997  Per Fogelstrom  <pefo@openbsd.org>
+
+	* configure.host (mips*-*-openbsd*): New host.
+
+Thu Apr 17 11:10:54 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_add_object_symbols): Only subtract the
+	section VMA from the symbol value if this is a fully linked file.
+
+	* elf32-i386.c (struct elf_i386_pcrel_relocs_copied): Define.
+	(struct elf_i386_link_hash_entry): Define.
+	(struct elf_i386_link_hash_table): Define.
+	(elf_i386_link_hash_traverse): Define.
+	(elf_i386_hash_table): Define.
+	(elf_i386_link_hash_newfunc): New static function.
+	(elf_i386_link_hash_table_create): New static function.
+	(elf_i386_check_relocs): If linking with -Bsymbolic, don't copy
+	PC relative relocs for a global symbol defined in a regular
+	object, and count the number of PC relative relocs copied for any
+	global symbol.
+	(elf_i386_size_dynamic_sections): If linking with -Bsymbolic,
+	traverse with elf_i386_discard_copies.
+	(elf_i386_discard_copies): New static function.
+	(bfd_elf32_bfd_link_hash_table_create): Define.
+
+	From Gordon W. Ross <gwr@mc.com>:
+	* aoutf1.h (MY_entry_is_text_address): Define if not defined.
+	(sunos4_aout_backend): Use MY_entry_is_text_address.
+
+Wed Apr 16 12:43:32 1997  Martin Hunt  <hunt@cygnus.com>
+
+	* elf32-d30v.c (elf_d30v_howto_table): Changed size of
+	R_D30V_32_NORMAL to 2 (4 bytes).
+
+Wed Apr 16 14:02:29 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	From Gordon W. Ross <gwr@mc.com>:
+	* netbsd.h (N_SHARED_LIB): Define.
+	(SEGMENT_SIZE): Don't define.
+	* m68knetbsd.c (SEGMENT_SIZE): Don't define (revert change of
+	April 11).
+	* sparcnetbsd.c (TARGET_PAGE_SIZE): Define as 0x2000.
+	(SEGMENT_SIZE): Don't define.
+
+	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Set .rela.bss size
+	to sizeof Rela structure, not sizeof Rel structure.  From Gary
+	Thomas <g.thomas@opengroup.org>.
+
+Tue Apr 15 11:50:37 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aout-target.h (MY(callback)): If entry_is_text_address, adjust
+	whenever entry is larger than text address, but only by whole
+	pages.  From Gordon W. Ross <gwr@mc.com>.
+
+	* Makefile.in (install): Depend upon installdirs.  Use
+	mkinstalldirs to build $(oldincludedir).
+	(installdirs): New target.
+
+	* elflink.h (elf_link_add_object_symbols): Don't call check_relocs
+	if this is a debugging section which we are stripping.
+
+Mon Apr 14 12:39:30 1997  Richard Henderson  <rth@tamu.edu>
+
+	* elf64-alpha.c (elf64_alpha_object_p): Allocate the
+	alpha-specific target data struct.
+
+Mon Apr 14 11:45:46 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	From Thomas Graichen <graichen@rzpd.de>:
+	* Makefile.in: Always use $(SHELL) when running move-if-change.
+	* configure.in: Use ${CONFIG_SHELL} when running $ac_config_sub.
+	* configure: Rebuild.
+
+Fri Apr 11 15:43:24 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elfcode.h (elf_slurp_symbol_table): Only subtract the section
+	VMA if this is an executable file or a shared object.
+
+	* targets.c (netbsd_core_vec): Declare.  From Gordon W. Ross
+	<gwr@mc.com>.
+
+	* libaout.h (struct aout_backend_data): Add entry_is_text_address
+	field.
+	* aout-target.h (SEGMENT_SIZE): Define to TARGET_PAGE_SIZE at the
+	start of the file.  Remove uses later on which switch using
+	ifdef.
+	(MY(callback)): Handle entry_is_text_address.
+	(MY_entry_is_text_address): Define if not defined.
+	(MY(backend_data)): Initialize new field.
+	* aoutf1.h (sunos4_aout_backend): Likewise.
+	* i386aout.c (MY(backend_data)): Likewise.
+	* i386mach3.c (MY(backend_data)): Likewise.
+	* mipsbsd.c (MY(backend_data)): Likewise.
+	* sparclynx.c (sparclynx_aout_backend): Likewise.
+	* netbsd.h (SEGMENT_SIZE): Define if not defined.
+	(MY_entry_is_text_address): Define.
+	* m68knetbsd.c (SEGMENT_SIZE): Define as 0x20000.
+
+	* xcofflink.c (bfd_xcoff_import_symbol): Handle importing a symbol
+	whose name starts with `.'.
+
+Fri Apr 11 11:57:15 1997  Niklas Hallqvist  <niklas@appli.se>
+
+	* config.bfd: (i[3456]86-*-openbsd*, m68*-*-openbsd*,
+	mips*el*-*-openbsd*, mips*-*-openbsd*, ns32k-*-openbsd*,
+	powerpc-*-*bsd*, sparc-*-openbsd*): New targets.
+	* configure.in (i[3456]86-*-openbsd*, mips*-*-openbsd*,
+	m68*-*-openbsd*, ns32k-*-openbsd*, powerpc-*-*bsd*,
+	sparc-*-openbsd*): New targets.
+	* configure: Rebuild.
+
+Tue Apr  8 18:09:29 1997  Jamie Lokier  <jamie@rebellion.co.uk>
+
+	* stabs.c (struct stab_section_info): New field
+	`cumulative_skips'.
+	(_bfd_link_section_stabs): Fill the above array.
+	(_bfd_stab_section_offset): Use `cumulative_skips' to
+	speed up offset calculation.
+
+Tue Apr  8 00:01:31 1997  Jeffrey A Law  (law@cygnus.com)
+
+        * elf-mn10300.c (mn10300_elf_relax_section): Don't forget the
+        addend for non pc-relative relocations.
+
+	* elf-m10300.c (bfd_elf32_mn10300_reloc): Remove prototype
+	for non-existent function.
+
+	* elf-m10300.c (mn10300_elf_relax_section): New function.
+	(mn10300_elf_relax_delete_bytes): Likewise.
+	(mn10300_elf_symbol_address_p): Likewise.
+	(mn10300_elf_get_relocated_section_contents): Likewise.
+	(bfd_elf32_bfd_relax_section): Define.
+	(bfd_elf32_bfd_get_relocated_section_contents): Likewise.
+
+Mon Apr  7 16:47:09 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.host: Set SHLIB_LIBS.
+	* configure.in: Substitute SHLIB_LIBS.
+	* configure: Rebuild.
+	* Makefile.in (SHLIB_LIBS): New variable.
+	($(SHLIB)): Use $(SHLIB_LIBS).
+
+Mon Apr  7 10:53:52 1997  Michael Snyder  <msnyder@cleaver.cygnus.com>
+
+	* bfd-in.h bfd-in2.h: add bfd_section_lma macro to correspond
+	with bfd_section_vma.
+
+Fri Apr  4 11:37:15 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Update file names for bfd_elf32_mn10[23]00_vec.
+	Correct CPU file names for mn10[23]00.
+	* configure: Rebuild.
+
+	* bfd.c (bfd_record_phdr): Cast count to size_t before
+	subtraction.
+
+	* coff-ppc.c (dump_toc): Add cast to avoid warning from SunOS cc.
+	* coff-rs6000.c (xcoff_read_ar_hdr): Likewise.
+	(xcoff_write_archive_contents): LIkewise.
+	* elf32-mips.c (_bfd_mips_elf_set_section_contents): Likewise.
+	(mips_elf_create_procedure_table): Likewise.
+	* peicode.h (pe_print_idata): Likewise.
+	(pe_print_edata, pe_print_pdata, pe_print_reloc): Likewise.
+	* xcofflink.c (xcoff_get_section_contents): Likewise.
+	(_bfd_xcoff_canonicalize_dynamic_symtab): Likewise.
+	(xcoff_link_add_symbols): Likewise.
+	(xcoff_link_add_symbols): Likewise.
+
+	* ppcboot.c (ppcboot_set_arch_mach): Make static.
+	(ppcboot_bfd_print_private_bfd_data): Likewise.
+
+	* elf32-mips.c (elf_mips_ctor64_howto): Set complain_on_overflow
+	to complain_overflow_signed.
+
+Thu Apr  3 11:51:54 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* VERSION: Set to 2.8.1.
+
+	* Branched binutils 2.8.
+
+	* elf32-ppc.c (ppc_elf_check_relocs):  Don't check SEC_ALLOC when
+	deciding whether to copy a reloc into a shared object.
+	(ppc_elf_relocate_section): Likewise.  Relocate R_PPC_RELATIVE
+	relocs in unallocated sections.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Relocate
+	R_SPARC_RELATIVE relocs in unallocated sections.
+
+Wed Apr  2 16:19:41 1997  Mike Meissner  <meissner@cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Undo March 26 change and
+	always create got section so that the _GLOBAL_OFFSET_TABLE_ label
+	is always created.
+
+Wed Apr  2 10:49:07 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_add_object_symbols): Let a common symbol
+	override an uninitialized symbol from a shared library with a
+	smaller size.
+
+	* elf-m10200.c: Rename from elf32-mn10200.c.
+	* elf-m10300.c: Rename from elf32-mn10300.c.
+	* cpu-m10200.c: Rename from cpu-mn10200.c
+	* cpu-m10300.c: Rename from cpu-mn10300.c
+	* Makefile.in: Update accordingly.
+
+	* elf32-mips.c (elf_mips_ctor64_howto): New static variable.
+	(elf_mips_isa): Move to earlier in file.
+	(mips_reloc_map): Remove BFD_RELOC_CTOR entry.
+	(bfd_elf32_bfd_reloc_type_lookup): Handle BFD_RELOC_CTOR
+	specially.
+
+	* elf32-mips.c (mips16_jump_reloc): Print a warning rather than
+	calling abort.
+
+Tue Apr  1 16:18:05 1997  Klaus Kaempf  <kkaempf@progis.de>
+
+	* configure.com: New file.
+	* config.h-vms: Remove file.
+	* makefile.vms: Update for new configure scheme.
+
+Mon Mar 31 23:28:39 1997  H.J. Lu  <hjl@gnu.ai.mit.edu>
+
+	* libcoff-in.h (ppc_allocate_toc_section): Declare.
+	(ppc_process_before_allocation): Declare.
+	* libcoff.h: Rebuild.
+
+	* coffcode.h (coff_mkobject_hook): Declare if not a macro.
+
+Mon Mar 31 16:29:50 1997  Joel Sherrill  <joel@oarcorp.com>
+
+        * config.bfd (hppa*-*-rtems*): New target, like hppa-*-*elf*.
+
+Mon Mar 31 16:11:35 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-a29k.c (coff_a29k_relocate_section): Don't use symndx as a
+	symbol index for a R_IHCONST reloc.
+
+Mon Mar 31 15:40:59 1997  Philippe De Muyter  <phdm@info.ucl.ac.be>
+
+	* targmatch.sed: Do not use \(\) recursively.
+
+Fri Mar 28 14:44:08 1997  H.J. Lu  <hjl@gnu.ai.mit.edu>
+
+	* m68klinux.c (MACHTYPE_OK): Define.
+	* i386linux.c (MACHTYPE_OK): Define.
+
+Fri Mar 28 11:56:15 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	From David S. Miller <davem@caip.rutgers.edu> and H.J. Lu
+	<hjl@gnu.ai.mit.edu>:
+	* sparclinux.c: New file.
+	* bfd-in.h (bfd_sparclinux_size_dynamic_sections): Declare.
+	* bfd-in2.h: Rebuild.
+	* config.bfd (sparc-*-linuxaout*, sparc-*-linux*): New targets.
+	* configure.in (sparclinux_vec): Add to list of vectors.
+	* configure: Rebuild.
+	* targets.c (sparclinux_vec): Declare.
+	(bfd_target_vector): Add sparclinux_vec.
+	* Makefile.in: Rebuild dependencies.
+	(BFD32_BACKENDS): Add sparclinux.o.
+	(BFD32_BACKENDS_CFILES): Add sparclinux.c.
+
+	* coff-mips.c (mips_ecoff_backend_data): Initialize new
+	bfd_coff_backend_data field.
+	* coff-alpha.c (alpha_ecoff_backend_data): Likewise.
+
+	* config.bfd: Add bfd_elf64_{big,little}mips_vec to targ_selvecs
+	for mips*el*-*-linux* and mips*-*-linux*.  From H.J. Lu
+	<hjl@lucon.org> and Ralf Baechle <ralf@gnu.ai.mit.edu>.
+
+	* bfd.c: Include "libiberty.h".
+	(strerror): Don't declare.
+	(bfd_errmsg): Call xstrerror rather than strerror.
+
+Thu Mar 27 12:55:42 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Generate a COPY
+	reloc even if the symbol is in the .bss section.
+	* elf32-m68k.c (elf_m68k_adjust_dynamic_symbol): Likewise.
+	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Likewise.
+	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Likewise.
+
+	* coffcode.h (bfd_coff_backend_data): Add new field
+	_bfd_coff_default_section_alignment_power.
+	(bfd_coff_default_section_alignment_power): Define.
+	(bfd_coff_std_swap_table): Initialize new field.
+	* libcoff.h: Rebuild.
+	* cofflink.c (coff_link_add_symbols): Limit alignment of a common
+	symbol to the default section alignment.
+
+	* COPYING: Update FSF address.
+
+Thu Mar 27 00:45:57 1997  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* elf32-d30v.c (elf_d30v_howto_table): Fix a typo in the
+	21-bit absolute that made it act as a relative.
+
+Wed Mar 26 14:50:20 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.c (_bfd_elf_create_linker_section): Don't set
+	bss_section and rel_section from existing sections.
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Only create the got section
+	if it is needed.
+
+Tue Mar 25 22:26:56 1997  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* aoutx.h (some_aout_object_p):  Change executable test to fix
+	problems with embedded a.out systems.
+
+Tue Mar 25 14:35:37 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* stabs.c (_bfd_stab_section_offset): New function.
+	* libbfd-in.h (_bfd_stab_section_offset): Declare.
+	* libbfd.h: Rebuild.
+	* elf32-i386.c (elf_i386_relocate_section): Adjust the offset of a
+	stab reloc.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-mips.c (mips_elf_relocate_section): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relocate_section): Likewise.
+
+	* stabs.c (_bfd_link_section_stabs): Copy over the first header
+	symbol.  Check for memory allocation failure of *psinfo.
+	(_bfd_write_section_stabs): Add psinfo parameter.  Change all
+	callers.  Set the value of the header symbol.
+	* libbfd-in.h (_bfd_write_section_stabs): Update declaration.
+	* libbfd.h: Rebuild.
+
+Mon Mar 24 20:07:29 1997  Fred Fish  <fnf@cygnus.com>
+
+	* coff-tic80.c (tic80_howto_table): Add R_ABS entry.
+	(rtype2howto): Handle R_ABS reloc type.  Also abort on unhandled
+	reloc types, rather than silently failing to generate an output file.
+
+Mon Mar 24 13:41:00 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* targmatch.sed: Use the hold space to put the #ifdef around the
+	the string constant.
+	* targets.c (UNSUPPORTED_TARGET): Don't define.
+	(find_target): Don't check for UNSUPPORTED_TARGET.
+	(bfd_set_default_target): Don't try to optimize by checking for
+	default.
+
+	* Makefile.in: Rebuild dependencies.
+ 	(ALL_MACHINES_CFILES): Add cpu-m32r.c.
+	(BFD32_BACKENDS_CFILES): Add elf32-m32r.c.
+	(elf32-m32r.o): Remove explicit target.
+
+	* config.bfd: Don't set targ_underscore for i[3456]86-*-gnu* or
+	i[3456]86-*-linux*.
+
+	* elf32-sparc.c (elf32_sparc_size_dynamic_sections): Don't
+	count section symbols for sections that were created by the
+	linker, or are not allocatable or not loadable.
+	(elf32_sparc_finish_dynamic_sections): Output output section
+	symbols for section for which we made space for them.
+
+Fri Mar 21 13:08:26 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-sparc.c (elf32_sparc_size_dynamic_sections): If there is
+	no .rela.plt section, don't output a DT_PLTGOT dynamic entry.
+
+Fri Mar 21 12:36:46 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* elf32-m32r.c (m32r_elf_howto_table): Use special function for LO16.
+	(m32r_hi16_list): New static local.
+	(m32r_elf_hi16_reloc): Don't perform reloc, just queue it up.
+	(m32r_elf_do_hi16_reloc): Delete.
+	(m32r_elf_relocate_hi16): New function.
+	(m32r_elf_lo16_reloc): New function.
+	(m32r_elf_relocate_section): For HI16 relocs, scan for corresponding
+	LO16 reloc.
+
+	Mon Mar 10 16:03:31 1997  Doug Evans  <dje@seba.cygnus.com>
+
+	* elf32-m32r.c (m32r_elf_create_linker_section): Delete.
+	(m32r_elf_add_symbol_hook): Rewrite _SDA_BASE_ support.
+	(m32r_elf_final_sda_base): New function.
+	(m32r_elf_relocate_section): Rewrite sdata support.
+	(m32r_elf_finish_dynamic_sections): Delete.
+
+Thu Mar 20 12:39:02 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	Based on patches from Philippe De Muyter <phdm@info.ucl.ac.be>.
+	* coff-svm68k.c: New file.  Just defines some macros and includes
+	coff-m68k.c.
+	* coff-m68k.c: Add functions to handle common addends, moved in
+	from cf-m68klynx.c.  Control them using COFF_COMMON_ADDEND macro.
+	Control whether relocs are visible using STATIC_RELOCS.
+	* cf-m68klynx.c: Simplify greatly: just define macros to control
+	coff-m68k.c.
+	* coff-aux.c: Likewise.  Just leave add_one_symbol routine.
+	* targets.c (m68ksysvcoff_vec): Declare.
+	(bfd_target_vector): Add m68ksysvcoff_vec.
+	* config.bfd (m68*-motorola-sysv*): New target.
+	* configure.in (m68ksysvcoff_vec): New vector.
+	* configure: Rebuild.
+	* Makefile.in: Rebuild dependencies.
+ 	(BFD32_BACKENDS): Add coff-svm68k.o.
+	(BFD32_BACKENDS_CFILES): Add coff-svm68k.c.
+
+	* binary.c (binary_set_section_contents): Don't get misled if the
+ 	first section is not loadable.  From Matthew L. Martin
+ 	<mlm@xedia.com>.
+
+	* elflink.h (elf_bfd_final_link): Set the value of a section
+	symbol to the section address unless doing a relocateable link.
+
+Tue Mar 18 23:03:17 1997  Richard Henderson  <rth@tamu.edu>
+
+	* elf64-alpha.c (elf64_alpha_adjust_dynamic_symbol): Don't create
+	.plt entry if we've taken the function's address.
+	(elf64_alpha_merge_gots): Merge collected flags info as well.
+
+Tue Mar 18 22:40:09 1997  H.J. Lu  <hjl@lucon.org>
+
+	* Many files: Add function prototypes.
+	* cpu-m68k.c (bfd_default_scan_num_mach): Don't declare.
+	* ecofflink.c: Include "libcoff.h" and "libecoff.h".
+	* elf32-ppc.c (ppc_elf_fake_sections): Make static.
+	* opncls.c (bfd_openstreamr): Change stream parameter to PTR.
+	* peicode.h: Change several void * parameters to PTR.
+	* srec.c (srec_get_symbol_info): Make static.
+	* syms.c (bfd_symbol_is_absolute): Remove.
+	* Makefile.in: Rebuild dependencies.
+
+Tue Mar 18 12:58:08 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-m32r.c (m32r_elf_is_local_label_name): Remove.
+	(bfd_elf32_bfd_is_local_label): Don't define.
+
+	* xcofflink.c (_bfd_xcoff_bfd_final_link): Call bfd_malloc rather
+	than malloc.
+
+Mon Mar 17 11:32:53 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfd-in.h: Don't include obstack.h.
+	(struct bfd_hash_table): Change memory field to PTR.
+	* bfd.c (struct _bfd): Change memory field to PTR.
+	* bfd-in2.h: Rebuild.
+	* libbfd-in.h (bfd_release): Declare as function, don't define as
+	macro.
+	* libbfd.h: Rebuild.
+	* opncls.c: Include "objalloc.h" rather than "obstack.h".  Use
+	objalloc routines rather than obstack routines.
+	(obstack_chunk_alloc, obstack_chunk_free): Don't define.
+	(getpagesize): Don't define.
+	(_bfd_new_bfd): Don't set _bfd_chunksize.
+	(bfd_openr): Free new bfd and objalloc on failure.
+	(bfd_fdopenr, bfd_openstreamr, bfd_openw): Likewise.
+	(bfd_alloc_size): Remove.
+	(bfd_release): New function.
+	* hash.c: Include "objalloc.h" rather than "obstack.h".  Use
+	objalloc routines rather than obstack routines.
+	(obstack_chunk_alloc, obstack_chunk_free): Don't define.
+	* ecofflink.c: Include "objalloc.h" rather than "obstack.h".  Use
+	objalloc routines rather than obstack routines.
+	(obstack_chunk_alloc, obstack_chunk_free): Don't define.
+	(struct accumulate): Change memory to struct objalloc *.
+	* liboasys.h (oasys_data_type): Remove oasys_obstack field.
+	* dep-in.sed: Don't remove obstack.h from dependency list.
+	* Makefile.in: Rebuild dependencies.
+	(BFD_H_DEPS): Remove obstack.h.
+	(install): Don't install obstack.h.
+	* Many files: Don't include "obstack.h".
+	* VERSION: Bump.
+
+	* opncls.c (bfd_alloc_grow, bfd_alloc_finish): Remove.
+	* libbfd-in.h (bfd_alloc_grow, bfd_alloc_finish): Don't declare.
+	* libbfd.h: Rebuild.
+	* ieee.c (ieee_archive_p): Rewrite to not use bfd_alloc_grow.
+	* sunos.c (sunos_add_dynamic_symbols): Likewise.
+	* srec.c (srec_scan): Rewrite to not use obstack_1grow.
+
+	* opncls.c (bfd_alloc): Rename from bfd_alloc_by_size_t.  Remove
+	old version of bfd_alloc.
+	* libbfd-in.h (bfd_alloc_by_size_t): Don't declare.
+	* libbfd.h: Rebuild.
+	* Several files: Call bfd_alloc rather than bfd_alloc_by_size_t.
+
+Sat Mar 15 15:24:18 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-mips.c (mips_elf_is_local_label_name): Accept the generic
+	ELF local label syntax as well.
+
+Sat Mar 15 10:16:42 1997  Fred Fish  <fnf@cygnus.com>
+
+	* config.bfd (powerpc-*-beos*): New target.
+	* configure.in (powerpc-*-beos*): Add case that explicitly
+	does not set COREFILE for now.  A future BeOS version is
+	expected to support core files.
+	* configure: Regenerate with autoconf.
+
+Fri Mar 14 16:43:22 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-mips.c (mips_elf_check_relocs): Give an error if CALL16 is
+ 	seen with a local symbol, rather than crashing.
+
+	* elfcode.h (elf_slurp_symbol_table): Don't try to read the
+	version symbols if there aren't any.
+
+Thu Mar 13 16:38:30 1997  Fred Fish  <fnf@cygnus.com>
+
+	* coff-tic80.c (coff_rtype_to_howto): Define
+	(coff_tic80_rtype_to_howto): Clone generic coff version and
+	add code to handle the funky TI "internal relocations".
+
+Thu Mar 13 14:08:53 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_add_object_symbols): Don't warn about type
+	or size changes because of a weak symbol.
+
+	* cisco-core.c (SIGEMT): Define if not defined.
+
+Wed Mar 12 21:36:05 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_add_object_symbols): Use extsymoff when
+	setting ever.  Sanity check the version number.  Sort out copying
+	flags and other information when adding an indirect symbol.
+	(NAME(bfd_elf,size_dynamic_sections)): Preserve any dynamic
+	symbols added by the backend.  Clear the entire contents of the
+	versym section.
+	(elf_export_symbol): Ignore indirect symbols.
+	(elf_link_output_extsym): Accept a section without an owner in an
+	assert.
+	* elfcode.h (elf_slurp_symbol_table): Add a sanity check on the
+	version count.  Correct the allocation of x_versymp.
+
+	* elf32-mips.c (mips_elf_add_symbol_hook): Don't set the owner of
+	the magic sections used for SHN_MIPS_TEXT and SHN_MIPS_DATA.
+	Don't return bfd_und_section_ptr when info->shared.
+	(mips_elf_final_link): Set the alignment of .rtproc to 4, not 12.
+	(mips_elf_create_dynamic_sections): Correct type: ^= for &=.
+	(mips_elf_check_relocs): Resolve an indirect symbol in
+	sym_hashes.
+	(mips_elf_finish_dynamic_symbol): Don't change SHN_ABS into
+	SHN_MIPS_TEXT or SHN_MIPS_DATA.
+
+	* elf.c (bfd_elf_print_symbol): Tweak version output slightly.
+
+Tue Mar 11 01:38:36 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	From Eric Youngdale <eric@andante.jic.com>:
+	* elf-bfd.h (ELF_LINK_FORCED_LOCAL): Define.
+	* elf.c (bfd_elf_print_symbol): Correct errors in last change.
+	* elflink.h (elf_link_add_object_symbols): Handle cases in which a
+	versioned symbol appears in both a regular and a shared object.
+	(elf_link_assign_sym_version): Set ELF_LINK_FORCED_LOCAL when
+	appropriate.  Improve error message.
+	(struct elf_outext_info): Rename from elf_finfo_failed.  Change
+	all uses.  Add localsyms field.
+	(elf_bfd_final_link): When generating a shared library, call
+	elf_link_output_extsym to output all local symbols.
+	(elf_link_output_extsym): Handle symbols which were forced to
+	become local.
+
+Sun Mar  9 23:08:49 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	From Eric Youngdale <eric@andante.jic.com>:
+	* elf-bfd.h (elf_symbol_type): Add version field.
+	* elfcode.h (elf_slurp_symbol_table): Set version field.
+	* elflink.h (elf_link_add_object_symbols): When creating an
+ 	indirect symbol for a default version symbol, set DEF_DYNAMIC if
+ 	appropriate.  Set up an indirection from the nondefault version of
+	the symbol as well.
+	(NAME(bfd_elf,size_dynamic_sections)): Call
+	elf_link_assign_sym_version before checking whether there are any
+	versions.  Always record the version name as a dynamic symbol.
+	Initialize counters.
+	(elf_link_assign_sym_version): After finding a version, see if a
+	symbol should be forced to local scope.  Create a new version
+	definition if appropriate.
+	(elf_link_output_extsym): Correct indirect symbol handling.
+	* elf.c (bfd_elf_print_symbol): Print version information.
+	(bfd_section_from_shdr): Turn version sections into BFD sections.
+	(elf_fake_sections): Only copy cverdefs and cverrefs into sh_info
+	if sh_info is not already set.
+	(_bfd_elf_copy_private_section_data): Copy sh_info for version
+	sections.
+	* elflink.c (_bfd_elf_link_record_dynamic_symbol): Tell
+	_bfd_stringtab_add to copy the name into permanent memory if
+	appropriate.
+
+Fri Mar  7 11:55:31 1997  H.J. Lu  <hjl@gnu.ai.mit.edu>
+
+	* elf64-alpha.c (alpha_elf_dynamic_symbol_p): Fully parenthesize.
+
+Fri Mar  7 10:37:30 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffcode.h (bfd_coff_backend_data): Change
+	_bfd_coff_compute_section_file_positions to return a boolean
+	value.  Change all callers.
+	(coff_compute_section_file_positions): Change return type to
+	boolean.  If the size of the last section changed, then output a
+	zero byte at the end of the file.
+	* libcoff.h: Rebuild.
+
+	* xcofflink.c (_bfd_xcoff_bfd_final_link): Always allocate space
+	for at least 6 output symbols.
+	(xcoff_write_global_symbol): When emitting TOC entry relocs, also
+	emit a TC csect to represent the space they take up.  For an XO
+	symbol, just emit a reference, not a csect.
+
+	* Makefile.in ($(SHLINK)): Just use ln -s, not ln -sf, since
+	Solaris doesn't like the combined options, and the -f is
+	unnecessary.
+	(stamp-tshlink, install): Likewise.
+
+	* elf32-mips.c (mips_elf_relocate_section): Correct R_MIPS16_26
+	handling when little endian.
+
+Thu Mar  6 13:51:51 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-mn10300.c (mn10300_elf_final_link_relocate): New function.
+	(mn10300_elf_relocate_section): Likewise.
+	(elf_backend_relocate_section): Define.
+
+	* elf32-mn10300.c (reloc_type): Remove PCREL{8,16,32}_{1,2}BYTE
+	relocs.  Replace them with generic PCREL_{8,16,32} relocs.
+	(elf32_mn10300_howto_table): Likewise.
+	(elf32_mn10300_reloc_map): Likewise.
+	(bfd_elf32_mn10300_reloc): Delete unused function.
+
+Thu Mar  6 12:19:59 1997  Fred Fish  <fnf@cygnus.com>
+
+	* coff-tic80.c (rtype2howto): If passed a relocation type we don't
+	understand, just set the howto field to NULL, and the caller will
+	print an appropriate error message.
+	* coffcode.h (coff_slurp_reloc_table): Pull duplicate declarations and
+	code fragment out of both legs of #ifdef RELOC_PROCESSING ... #endif
+	block.  Use NULL for initializations of "ptr" rather than bare 0.
+	* coff-h8300.c: Fix typo in comment.
+	* coff-h8500.c: Ditto.
+	* coff-w65.c: Ditto
+	* coff-z8k.c: Ditto.
+
+Wed Mar  5 13:59:09 1997  Doug Evans  <dje@seba.cygnus.com>
+
+	* elf32-m32r.c (m32r_elf_do_10_pcrel_reloc): Fix overflow calc.
+	(m32r_elf_relax_section, m32r_elf_relax_delete_bytes,
+	m32r_elf_get_relocated_section_contents): First pass at relax support.
+
+Mon Mar  3 13:27:09 1997  Ulrich Drepper  <drepper@rtl.cygnus.com>
+
+	* elflink.h (elf_link_add_object_symbols): Use correct sh_size
+	entry for reading verdef records.
+	Use correct braces for computing increments of extverdaux and
+	exteverdef record pointers.
+
+Sun Mar  2 22:47:54 1997  Fred Fish  <fnf@cygnus.com>
+
+	* coff-tic80.c (COFF_DEFAULT_SECTION_ALIGNMENT_POWER): Set this to 2
+	instead of 4.
+
+Sun Mar  2 16:25:35 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_find_version_dependencies): Check that
+	DEF_REGULAR is not set as well as checking that DEF_DYNAMIC is
+	set.
+
+Fri Feb 28 16:52:40 1997  Fred Fish  <fnf@cygnus.com>
+
+	* coffcode.h (coff_set_flags): Add case for TIC80_ARCH_MAGIC.
+
+Fri Feb 28 15:06:45 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* targets.c (bfd_default_vector): Make non-const.
+	(find_target): New static function, broken out of
+	bfd_find_target.
+	(bfd_set_default_target): New function.
+	(bfd_find_target): Call find_target.  When defaulting, use
+	bfd_default_vector[0] if it is not NULL.
+	* libbfd-in.h (bfd_default_vector): Adjust declaration.
+	* bfd-in2.h, libbfd.h: Rebuild.
+
+	* syms.c (bfd_is_local_label): Return false if the symbol has no
+	name.
+	* coff-i960.c (coff_i960_is_local_label_name): New function.
+	(coff_bfd_is_local_label_name): Define.
+	* coff-m68k.c (m68k_coff_is_local_label_name): New function.
+	(coff_bfd_is_local_label_name): Define.
+	* coff-rs6000.c (xcoff_is_local_label_name): New function.
+	(coff_bfd_is_local_label_name): Define.
+	* elf.c (_bfd_elf_is_local_label_name): Treat symbols beginning
+	with .. or _.L_ as local.
+	* elf32-i386.c (elf_i386_is_local_label_name): New function.
+	(bfd_elf32_bfd_is_local_label_name): Define.
+	* evax-alpha.c (evax_bfd_is_local_label_name): Treat symbols
+	beginning with $ as local.
+
+Thu Feb 27 18:36:23 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutx.h (aout_link_write_symbols): Use bfd_is_local_label_name
+	rather than comparing against info->lprefix.
+	* cofflink.c (_bfd_coff_link_input_bfd): Likewise.
+	* elflink.h (elf_link_input_bfd): Likewise.
+	* linker.c (_bfd_generic_link_output_symbols): Likewise.
+	* xcofflink.c (xcoff_link_input_bfd): Likewise.
+
+	* elfxx-target.h (bfd_elfNN_bfd_is_local_label_name): Define as
+	_bfd_elf_is_local_label_name if not already defined.
+	* elf.c (_bfd_elf_is_local_label_name): New function.
+	* elf-bfd.h (_bfd_elf_is_local_label_name): Declare.
+
+	* coff-m88k.c (coff_bfd_is_local_label_name): Define.
+	(m88k_is_local_label_name): New static function.
+
+	* coffcode.h (coff_bfd_is_local_label_name): Define as
+	_bfd_coff_is_local_label_name if not already defined.
+	* coffgen.c (_bfd_coff_is_local_label_name): New function.
+	* libcoff-in.h (_bfd_coff_is_local_label_name): Declare.
+	* libcoff.h: Rebuild.
+
+	* targets.c (BFD_JUMP_TABLE_SYMBOLS): Change _bfd_is_local_label
+	to _bfd_is_local_label_name.
+	(bfd_target): Likewise.
+	* syms.c (bfd_is_local_label): Define as function, not macro.
+	(bfd_is_local_name): Define.
+	* libbfd.c (bfd_generic_is_local_label_name): Rename from
+	bfd_generic_is_local_label, and take a string rather than a
+	symbol.
+	* libbfd-in.h (_bfd_nosymbols_bfd_is_local_label): Don't define.
+	(_bfd_nosymbols_bfd_is_local_label_name): Define.
+ 	(bfd_generic_is_local_label): Don't declare.
+	(bfd_generic_is_local_label_name): Declare.
+	* bfd-in2.h, libbfd.h: Rebuild.
+	* All backends: Change local_label to local_label_name.
+
+	* elf32-mips.c (struct mips_got_info): Add assigned_gotno field.
+	(mips_elf_relocate_got_local): Change return type to boolean.
+	Don't assume that the first zero entry is unassigned; instead, use
+	assigned_gotno.
+	(mips_elf_relocate_section): Check return value of
+	mips_elf_relocate_got_local.
+	(mips_elf_create_got_section): Initialize assigned_gotno field.
+
+Wed Feb 26 15:19:51 1997  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* elf32-d30v.c (bfd_elf_d30v_reloc): Add code to do 32-bit
+	relocations.
+
+Wed Feb 26 13:33:03 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_input_bfd): Don't skip symbols from sections
+	that have no contents merely because linker_mark is not set.
+
+Tue Feb 25 18:51:35 1997  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* config.bfd (mips*-*-lnews*): New target.
+	* coff-mips.c (mips_relocate_section): Make assert compare
+	content byteorder instead of header byteorder.
+	(ecoff_biglittle_vec): New BFD, big-endian headers, little-endian
+	data.
+	* targets.c (bfd_target_vector): Add ecoff_biglittle_vec.
+	* configure.in (ecoff_biglittle_vec): Add case.
+	* configure: Update.
+
+Tue Feb 25 00:32:49 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (elf_fake_sections): Use SHT_NOTE for any section whose
+	name begins with ".note".
+	(map_sections_to_segments): Add a PT_NOTE segment for any loadable
+	section whose name begins with ".note".
+	(get_program_header_size): Corresponding change.
+
+	* elf32-mips.c (mips_elf_relocate_section): Check for misaligned
+	jal and for jal overflow.
+
+Mon Feb 24 17:53:14 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	From Eric Youngdale <eric@andante.jic.com>:
+	* elflink.h (elf_link_add_archive_symbols): If a default symbol is
+	not found, try looking it up again without the version name.
+	(elf_link_add_object_symbols): Always link against the dynamic
+	symbol table of a dynamic object.  When linking against a dynamic
+	object, include version strings in symbol names, and set up
+	version information.  Add indirect symbols for default versions.
+	(elf_link_create_dynamic_sections): Add special version sections.
+	(struct elf_assign_sym_version_info): Define.
+	(struct elf_find_verdep_info): Define.
+	(NAME(bfd_elf,size_dynamic_sections)): Add verdefs parameter.  Set
+	up version sections.
+	(elf_adjust_dynamic_symbol): Ignore indirect symbols.
+	(elf_link_find_version_dependencies): New static function.
+	(elf_link_assign_sym_version): New static function.
+	(elf_link_renumber_dynsyms): New static function.
+	(struct elf_final_link_info): Add symver_sec field.
+	(elf_bfd_final_link): Initialize finfo.symver_sec.  Don't count
+	local symbols of a dynamic object.  Handle DT_VER* constants.
+	(elf_link_output_extsym): Simplify BFD_ASSERT checking for a
+	dynamic object.  Skip indirect symbols from ELF objects.  Remove
+	the version name before choosing a hash bucket.  Write out the
+	version information if appropriate.
+	(elf_link_input_bfd): Check for DYNAMIC, not ET_DYN.
+	* bfd-in.h (bfd_elf32_size_dynamic_sections): Update declaration.
+	(bfd_elf64_size_dynamic_sections): Likewise.
+	* bfd-in2.h: Rebuild.
+	* elf-bfd.h (struct elf_link_hash_entry): Add verinfo field.
+	Change elf_link_hash_flags to unsigned short.
+	(ELF_LINK_HIDDEN): Define.
+	(struct elf_obj_tdata): Add fields dynversym_hdr, dynverref_hdr,
+	dynverdef_hdr, dynversym_section, dynverdef_section,
+	dynverref_section, cverdefs, cverrefs, verdef, verref.
+	(elf_dynversym, elf_dynverdef, elf_dynverref): Define.
+	(_bfd_elf_swap_verdef_in, _bfd_elf_swap_verdef_out): Declare.
+	(_bfd_elf_swap_verdaux_in, _bfd_elf_swap_verdaux_out): Declare.
+	(_bfd_elf_swap_verneed_in, _bfd_elf_swap_verneed_out): Declare.
+	(_bfd_elf_swap_vernaux_in, _bfd_elf_swap_vernaux_out): Declare.
+	(_bfd_elf_swap_versym_in, _bfd_elf_swap_versym_out): Declare.
+	(_bfd_elf_slurp_version_tables): Declare.
+	* elf.c (_bfd_elf_swap_verdef_in): New function.
+	(_bfd_elf_swap_verdef_out): Likewise.
+	(_bfd_elf_swap_verdaux_in, _bfd_elf_swap_verdaux_out): Likewise.
+	(_bfd_elf_swap_verneed_in, _bfd_elf_swap_verneed_out): Likewise.
+	(_bfd_elf_swap_vernaux_in, _bfd_elf_swap_vernaux_out): Likewise.
+	(_bfd_elf_swap_versym_in, _bfd_elf_swap_versym_out): Likewise.
+	(_bfd_elf_print_private_bfd_data): Add DT_VER* constants.  Print
+	version information if there is any.
+	(_bfd_elf_link_hash_newfunc): Initialize verinfo field.
+	(bfd_section_from_shdr): Handle SHT_GNU_ver* section types.
+	(elf_fake_sections): Handle .gnu.version* section names.
+	(assign_section_numbers): Handle SHT_GNU_ver* section types.
+	(_bfd_elf_slurp_version_tables): New function.
+	* elflink.c (_bfd_elf_link_record_dynamic_symbol): Don't include
+	version name in string entered in dynamic hash table.
+	* elfcode.h: Include fnmatch.h.
+	* elf32-i386.c (elf_i386_relocate_section): Handle a dynamic
+	symbol which was forced to become local.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+	* elf64-alpha.c (alpha_elf_dynamic_symbol_p): Likewise.
+
+Fri Feb 21 16:15:18 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-mn10200.c (mn10200_elf_final_link_relocate): Simplify
+	somewhat.
+	(mn10200_elf_relax_section): Correctly compute a symbol's value
+	when the symbol is local, but not in the same section as we are
+	relaxing.  Implement abs24 -> abs16, imm24 -> imm16 and d24 -> d16
+	relaxing.
+
+Fri Feb 21 13:55:14 1997  Doug Evans  <dje@seba.cygnus.com>
+
+	* elf32-m32r.c: Rewrite to use ELF backend linker.
+	Store lower 16 bits of addend in R_M32R_HI16_[SU]LO insns.
+	Add small data area support (R_M32R_SDA16).
+	* reloc.c: Document BFD_RELOC_M32R_SDA16.
+	* bfd-in2.h, libbfd.h: Regenerated.
+
+Thu Feb 20 23:50:31 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-mn10200.c (mn10200_elf_relax_section): New function.
+	(mn10200_elf_relax_delete_bytes): Likewise.
+	(mn10200_elf_symbol_address_p): Likewise.
+	(mn10200_elf_get_relocated_section_contents): Likewise.
+	(bfd_elf32_bfd_relax_section): Define.
+	(bfd_elf32_bfd_get_relocated_section_contents): Likewise.
+
+	* elf32-mn10200.c (mn10200_elf_final_link_relocate): New function.
+	(mn10200_elf_relocate_section): Likewise.
+	(elf_backend_relocate_section): Define.
+
+Tue Feb 18 17:22:59 1997  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* Makefile.in: New target, elf-*-D30V.
+	* archures.c: New target, elf-*-D30V.
+	* config.bfd: New target, elf-*-D30V.
+	* configure.in: New target, elf-*-D30V.
+	* elf.c: New target, elf-*-D30V.
+	* reloc.c: New target, elf-*-D30V.
+	* targets.c: New target, elf-*-D30V.
+	* bfd-in2.h: Rebuilt.
+	* configure: Rebuilt.
+	* libbfd.h: Rebuilt.
+	* cpu-d30v.c: New files.
+	* elf32-d30v.c: New files.
+
+Tue Feb 18 15:31:48 1997  Fred Fish  <fnf@cygnus.com>
+
+	* reloc.c (struct reloc_howto_struct): Fix typo in comment.
+	* bfd-in2.h: Regenerated.
+	* coff-tic80.c (RTYPE2HOWTO): Replace abort with real function.
+	(rtype2howto): Add function.
+	(tic80_howto_table): Add.
+
+Tue Feb 18 11:41:00 1997  Dawn Perchik  <dawn@cygnus.com>
+
+	* sysdep.h: Don't define errno in MSVC if error.h is included.
+
+Tue Feb 18 10:04:13 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-v850.c (v850_elf_relocate_section): Make sure r_symndx
+	is initialized before it is used.
+
+Mon Feb 17 11:28:40 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* hp300hpux.c (convert_sym_type): Don't convert a secondary common
+	symbol into a weak undefined symbol; leave it as a common symbol.
+
+Fri Feb 14 19:08:03 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_add_object_symbols): Don't issue a warning
+	about a symbol defined in a dynamic object if it has already been
+	defined in a regular object.
+
+Thu Feb 13 20:53:22 1997  Klaus Kaempf  (kkaempf@progis.de)
+
+	* makefile.vms: Add gcc flags to allow compiling with current gcc
+	snapshot
+	(targmatch.h): New dependency.
+
+	* reloc.c (BFD_RELOC_ALPHA_CODEADDR): New relocation for
+	openVMS/Alpha.
+	* evax.h (ALPHA_R_CODEADDR): New relocation.
+	* evax-alpha.c (ALPHA_R_CODEADDR): 64 bit procedure relocation for
+	openVMS/Alpha.
+	* evax-etir.c (ALPHA_R_CODEADDR): Output object code for this
+	relocation.
+	* bfd-in2.h, libbfd.h: Rebuild.
+
+	Restrict symbol length to 64 bytes, case preserving:
+	* evax-emh.c (_bfd_evax_write_emh): Remove case hacking.
+	* evax-misc.c (_bfd_evax_case_hack_symbol): Remove.
+	(_bfd_evax_length_hash_symbol): Added.
+	* evax-etir.c (_bfd_evax_write_etir): Call
+	_bfd_evax_length_hash_symbol before output of symbol.
+	* evax-egsd.c (_bfd_evax_write_egsd): Likewise.
+	* evax.h (flag_hash_long_names, flag_show_after_trunc): Remove.
+
+	* evax-emh.c: Output filename to object file without path.
+
+	* evax-egsd.c: New sections for local and global commons.
+
+	* evax-alpha.c, evax-emh.c, evax-egsd.c, evax-etir.c,
+	evax-misc.c, evax.h: Remove 8 bit characters from copyright
+	notices.  Replace AXP with Alpha.
+
+Wed Feb 12 18:10:30 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* sunos.c (sunos_create_dynamic_sections): We need the dynamic
+	sections if we are creating a shared library.
+
+Tue Feb 11 15:45:43 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* configure.host (i386-windows): Don't set host64=true.
+
+Tue Feb 11 15:27:32 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-mips.c (reloc_type): Add R_MIPS16_GPREL.
+	(elf_mips16_gprel_howto): New static variable.
+	(mips16_gprel_reloc): New static function.
+	(bfd_elf32_bfd_reloc_type_lookup): Handle BFD_RELOC_MIPS16_GPREL.
+	(mips_info_to_howto_rel): Handle R_MIPS16_GPREL.
+	(mips_elf_relocate_section): Handle R_MIPS16_GPREL.
+	* reloc.c (BFD_RELOC_MIPS16_GPREL): Define.
+	* bfd-in2.h, libbfd.h: Rebuild.
+
+Mon Feb 10 23:25:00 1997  Doug Evans  <dje@seba.cygnus.com>
+
+	* elf32-m32r.c (elf_m32r_howto_table): Change partial_inplace to true
+	for R_M32R_{16,32,24,HI16_ULO,HI16_SLO,LO16}.
+
+Fri Feb  7 12:39:11 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_input_bfd): If we've discarded a section,
+	the output section will be the absolute section; don't print an
+	assertion message for that case when doing a relocateable link.
+
+Thu Feb  6 16:55:43 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-mips.c (FN_STUB, CALL_STUB, CALL_FP_STUB): Define.
+	(struct mips_elf_link_hash_entry): Add new fields fn_stub,
+	need_fn_sub, call_stub, and call_fp_stub.
+	(struct mips_elf_link_hash_table): Add field mips16_stubs_seen.
+	(mips_elf_link_hash_newfunc): Initialize new fields.
+	(mips_elf_link_hash_table_create): Likewise.
+	(mips_elf_relocate_section): Redirect relocations to use mips16
+	stubs when appropriate.
+	(mips_elf_check_relocs): Attach stub sections to the appropriate
+	symbol.  Set need_fn_stub when appropriate.
+	(mips_elf_always_size_sections): New static function.
+	(mips_elf_check_mips16_stubs): New static function.
+	(elf_backend_always_size_sections): Define.
+	* elf-bfd.h (struct elf_obj_tdata): Add local_stubs field.
+
+	* elflink.h (elf_link_input_bfd): Discard local symbols that are
+	attached to sections which are not being included in the link.
+
+Wed Feb  5 13:20:17 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cofflink.c (_bfd_coff_generic_relocate_section): Ignore the
+	symbol value when computing the addend for a pc_relative
+	pcrel_offset reloc.
+
+Mon Feb  3 11:54:06 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cofflink.c (_bfd_coff_generic_relocate_section): If doing a
+	relocateable link, just skip pc_relative pcrel_offset relocs.
+	* coff-arm.c (coff_arm_rtype_to_howto): Return a different howto
+	structure for an ARM26 reloc which can be resolved.
+	(coff_arm_adjust_symndx): Only convert ARM26 to ARM26D if the
+	reloc can be resolved.
+
+	* coff-h8300.c (h8300_reloc16_extra_cases): Correct off by one
+	error in overflow check for R_RELBYTE.
+
+Fri Jan 31 14:07:27 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c (ieee_slurp_section_data): Pick up the start address.
+	From Mark Rasin <mark.rasin@telrad.co.il>.
+
+	* aoutx.h (aout_link_write_symbols): Don't apply discard_l to
+	debugging symbols.
+
+Wed Jan 29 00:00:49 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-mn10200.c (reloc_type): Add 16bit pc-relative reloc.
+	(elf_mn10200_howto_table): Likewise.
+	(mn10200_reloc_map): Likewise.
+
+Mon Jan 27 12:07:35 1997  Doug Evans  <dje@seba.cygnus.com>
+
+	* reloc.c: Add relocs BFD_RELOC_M32R_{HI16_[US]LO,LO16}.
+	* bfd-in2.h, libbfd.h: Regenerated.
+	* elf32-m32r.c: Add support for them.
+
+Mon Jan 27 12:25:02 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aout-arm.c (MY_swap_std_reloc_in): Remove unused r_length.
+	* elf32-ppc.c (ppc_elf_check_relocs): Remove unused plt.
+	* elf32-v850.c (v850_elf_final_link_relocate): Remove used
+	r_format and r_pcrel.  Always return a value.
+	* riscix.c (MY_final_link_callback): Define to dummy value.
+
+	* elf32-i386.c (elf_i386_size_dynamic_sections): When checking for
+	relocations against the text segment, look up the output name of
+	the reloc section.
+	* elf32-m68k.c (elf_m68k_size_dynamic_sections): Likewise.
+	* elf32-mips.c (mips_elf_size_dynamic_sections): Likewise.
+	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Likewise.
+	* elf32-sparc.c (elf32_sparc_size_dynamic_sections): Likewise.
+	* elf64-alpha.c (elf64_alpha_size_dynamic_sections): Likewise.
+
+Wed Jan 22 15:40:28 1997  Fred Fish  <fnf@cygnus.com>
+
+	* coff-tic80.c (tic80coff_vec): Use correct data put/get
+	routines for little endian data.
+	* coffcode.h (coff_write_object_contents): Set magic to
+ 	TIC80_ARCH_MAGIC for TIc80.
+
+Tue Jan 21 12:32:43 1997  Fred Fish  <fnf@cygnus.com>
+
+	* coff-tic80.c (tic80coff_vec): Change to little endian data
+	as the default.
+
+Thu Jan 16 17:45:57 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Change type of
+	auxiliary_filters parameter to be const char * const *.  Accept a
+	NULL terminated array.
+	* bfd-in.h (bfd_elf32_size_dynamic_sections): Update declaration.
+	(bfd_elf32_size_dynamic_sections): Update declaration.
+	* bfd-in2.h: Rebuild.
+
+Wed Jan 15 11:21:32 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Treat a
+	NOTYPE symbol in a text section as a FUNC symbol.
+
+	* coffcode.h (coff_compute_section_file_positions): Force
+	relocbase to be aligned to COFF_DEFAULT_SECTION_ALIGNMENT_POWER.
+
+Tue Jan 14 08:46:33 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* libaout.h (machine_type): Reserve several values for sparclet.
+
+Mon Jan 13 22:39:08 1997  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* config.bfd (tic80-*-*): Don't require 'coff'.
+
+Mon Jan 13 19:36:25 1997  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-v850.c (v850_elf_howto_table): Set the special_function
+	table to v850_elf_reloc for all non-standard relocations.
+	(v850_elf_check_relocs): Add check for h being non-null.
+	(v850_elf_reloc): Add  R_V850_ZDA_OFFSET support.  Use switch
+	statement instead of multiple ifs.
+	(v850_elf_relocate_section): Fix up error message, don't just call
+	abort.
+
+Mon Jan  6 13:28:35 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-mn10200.c (elf_mn10200_howto): Don't ever set partial-inplace.
+	Use bfd_elf_generic_reloc as special function for all relocs.
+	(bfd_elf32_mn10200_reloc): Remove unnecessary function.
+
+	* elf32-mn10200.c (elf_mn10200_howto): Set pcrel_offset for
+	24bit pc-relative reloc.
+
+Fri Jan  3 16:33:00 1997  Fred Fish  <fnf@cygnus.com>
+
+	* Makefile.in (coff-tic80.o): Add coffcode.h to dependency list.
+	* coff-tic80.c (tic80coff_vec): Data byte order is big endian and
+	header byte order is little endian.  Use correct bfd_get and
+	bfd_put routines for little endian headers.
+	* coffcode.h (coff_set_arch_mach_hook): Set arch to
+	bfd_arch_tic80 for TIC80_ARCH_MAGIC number.
+
+Fri Jan  3 16:54:08 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* reloc.c: Add BFD_RELOC_24.
+	* elf32-mn10200.c (enum reloc_type): Add 24bit and pcrel relocs.
+	(elf_mn10200_howto, mn10200_reloc_map): Corresponding changes.
+	* bfd-in2.h, libbfd.h: Rebuilt.
+
+Fri Jan  3 16:58:31 1997  Richard Henderson  <rth@tamu.edu>
+
+	elf64-alpha multiple .got rewrite:
+
+	* elf-bfd.h (struct elf_backend_data): Add always_size_sections entry.
+	(bfd_elf*_mkobject): Don't define here ...
+	* elfxx-target.h: ... but rather here.  Default always_size_sections
+	hook to NULL.
+	* elf.c (elf_mkobject): Rename to bfd_elf_mkobject, since that was
+	what the #defines in elf-bfd.h transmuted it to anyway.
+
+	* section.c: Add SEC_LINKER_CREATED flag.
+	* bfd-in2.h: Rebuild.
+	* elf32-i386.c (elf_i386_check_relocs): Add SEC_LINKER_CREATED to
+	relocation section flags.
+	(elf_i386_size_dynamic_sections): Use SEC_LINKER_CREATED instead of
+	SEC_IN_MEMORY to recognize generated bits.
+	* elf32-m68k.c (elf_m68k_check_relocs, elf_m68k_size_dynamic_sections):
+	Likewise.
+	* elf32-mips.c (mips_elf_final_link, mips_elf_create_dynamic_sections,
+	mips_elf_create_compact_rel_section, mips_elf_create_got_section,
+	mips_elf_check_relocs, mips_elf_size_dynamic_sections): Likewise.
+	* elf32-ppc.c (ppc_elf_create_linker_section,
+	ppc_elf_size_dynamic_sections): Likewise.
+	* elf32-sparc.c (elf32_sparc_check_relocs,
+	elf32_sparc_size_dynamic_sections): Likewise.
+	* elflink.c (_bfd_elf_create_got_section): Add SEC_LINKER_CREATED to
+	section flags.
+	(_bfd_elf_create_dynamic_sections): Likewise.
+	(_bfd_elf_make_linker_section_rela): Likewise.
+	* elflink.h (elf_link_create_dynamic_sections): Likewise.
+	(bfd_elf,size_dynamic_sections): Call the always_size_sections hook.
+	(elf_bfd_final_link): Use SEC_LINKER_CREATED instead of SEC_IN_MEMORY
+	to identify generated bits.
+	(elf_link_input_bfd): Likewise.
+
+	* elf64-alpha.c: Rewrite everything touching relocations.
+
+Fri Jan  3 11:42:53 1997  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-v850.c (all functions and static variables): Go through
+	and regularize names to be of the form v850_elf_<xxx>.
+	(toplevel): Include <elf/v850.h>.
+	(enum reloc_type): Move to include/elf/v850.h.
+	(v850_elf_check_relocs): For common variables, if the variable is
+	referenced by a R_V850_{SDA,ZDA,TDA} relocation, put the variable
+	into the appropriate section.
+	(elf_backend_check_relocs): Define.
+
+Tue Dec 31 15:15:28 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-v850.c (elf_v850_howto_table): Fix some spacing.
+
+Tue Dec 31 14:44:50 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.bfd (mips*el-*-linux*): New target.
+	(mips*-*-linux*): New target.
+
+	* elf32-mips.c (_bfd_mips_elf_merge_private_bfd_data): Clean up.
+	Return a useful value.
+
+	* Makefile.in (ALL_CFLAGS): Add -D_GNU_SOURCE.
+
+	* configure.in: Check ac_cv_func_mmap_fixed_mapped, not
+	ac_cv_func_mmap.
+	* configure: Rebuild.
+	* configure.host: Use ac_cv_func_mmap_fixed_mapped instead of
+	ac_cv_func_mmap in bfd/configure.host.
+
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Add
+	filter_shlib and auxiliary_filter_shlib parameters.
+	* elf.c (_bfd_elf_print_private_bfd_data): Handle DT_AUXILIARY and
+	DT_FILTER.
+	* bfd-in.h (bfd_elf32_size_dynamic_sections): Update declaration.
+	(bfd_elf64_size_dynamic_sections): Likewise.
+	* bfd-in2.h: Rebuild.
+
+Mon Dec 30 18:48:52 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (xcoff_build_ldsyms): When exporting all defined
+	symbols, don't export a symbol which is defined by an object in an
+	archive which contains shared objects.
+
+Mon Dec 30 16:12:58 1996  Fred Fish  <fnf@cygnus.com>
+
+	* archures.c (enum bfd_architecture): Add bfd_arch_tic80
+	for TI TMS320c80 (MVP).
+	(bfd_archures_list): Add bfd_tic80_arch.
+	* bfd-in2.h: Regenerate by running "make headers".
+
+Sun Dec 29 16:18:52 1996  Fred Fish  <fnf@cygnus.com>
+
+	* cpu-tic80.c (bfd_tic80_arch): Add struct.
+	* configure.in (case $vec): Correct typo, "tb" not "tp".
+	Also add cofflink.o for tic80coff_vec.
+	* configure: Regenerate with autoconf.
+
+Mon Dec 30 11:54:56 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libbfd.c: Patch up the mmap code so that it is only built if BFD
+	is configured with --with-mmap.
+
+Sun Dec 29 10:48:57 1996  Fred Fish  <fnf@cygnus.com>
+
+	* Makefile.in (BFD32_BACKENDS): Add coff-tic80.o
+	(ALL_MACHINES): Add cpu-tic80.o
+	(cpu-tic80.o, coff-tic80.o): Add dependencies.
+	* coff-tic80.c: Add skeleton, cloned from another coff config.
+	* coffcode.h (coff_write_object_contents): Set magic to TIC80MAGIC
+ 	for TIc80.
+
+Fri Dec 27 20:56:41 1996  Fred Fish  <fnf@cygnus.com>
+
+	* TODO: Correct a misspelling.
+	* coff-tic80.c: New file for TI TMS320C80 (MVP).
+	* cpu-tic80.c: New file for TI TMS320C80 (MVP).
+	* configure.in (case $vec): Add tic80coff_vec entry.
+	* configure: Regenerate with autoconf.
+	* archures.c (bfd_tic80_arch): Declare.
+	* bfd-in2.h (enum bfd_architecture): Add bfd_arch_tic80.
+	* config.bfd (case ${targ}): Add tic80*-*-coff* target.
+	* targets.c (tic80coff_vec): Add decl as extern bfd_target.
+	(bfd_target_vector): Add tic80coff_vec entry.
+
+Fri Dec 27 11:48:12 1996  H.J. Lu  <hjl@lucon.org>
+
+	* elflink.h (elf_buckets): Add some more values for larger
+	binaries.
+
+Thu Dec 26 18:36:54 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (install): Move subdir_do out of conditional. From
+	Fred Fish <fnf@cygnus.com>.
+
+Wed Dec 18 10:04:30 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-mn10200.c (enum reloc_type): Enable basic 8, 16, and
+	32 bit relocs.
+	(elf_mn10200_howto_table): Likewise.
+	(mn10200_reloc_map): Likewise.
+
+Tue Dec 17 11:09:36 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-mips.c (mips_elf_add_symbol_hook): Add 1 to the value of a
+	mips16 symbol during the link.
+	(mips_elf_finish_dynamic_symbol): Subtract 1 from the value of a
+	mips16 symbol.
+	(mips_elf_link_output_symbol_hook): New static function.
+	(elf_backend_link_output_symbol_hook): Define.
+
+	* elf.c (bfd_elf_print_symbol): Print the st_other field if it is
+	not zero.
+
+Mon Dec 16 14:38:39 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (bfd_section_from_shdr): Don't check for reloc sections
+	against SEC_DEBUGGING sections here (revert patch of December 5).
+	* elfcode.h (elf_object_p): Check for them here, instead.
+
+Sun Dec 15 14:46:06 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elfcode.h (elf_slurp_reloc_table): Add dynamic parameter.
+	* elf.c (_bfd_elf_canonicalize_reloc): Pass new argument to
+	slurp_reloc_table.
+	(_bfd_elf_get_dynamic_reloc_upper_bound): New function.
+	(_bfd_elf_canonicalize_dynamic_reloc): New function.
+	* elf-bfd.h (struct elf_size_info): Update declaration of
+	slurp_reloc_table.
+	(_bfd_elf_get_dynamic_reloc_upper_bound): Declare.
+	(_bfd_elf_canonicalize_dynamic_reloc): Declare.
+	* elfxx-target.h: Use new dynamic reloc routines by default.
+	* elf64-mips.c (mips_elf64_slurp_reloc_table): Add dynamic
+	parameter.
+
+Fri Dec 13 13:18:49 1996  Dan Wilder  <dan@gasboy.com>
+
+	* coffcode.h (coff_set_flags): Use MC68KBCSMAGIC for bfd_arch_m68k
+	if NAMES_HAVE_UNDERSCORE is defined.
+
+Fri Dec 13 11:13:23 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* libaout.h (enum machine_type): Change M_SPARCLET from 142 to 131.
+
+Thu Dec 12 15:07:20 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Move R_PPC_PLTREL24 into the
+	supported relocs.
+
+Thu Dec 12 14:55:41 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_add_object_symbols): Only add a weak
+	symbol if the real definition is in the dynamic symbol table.
+	After finding the real definition, then, if it is dynamic, add the
+	weak symbol to the dynamic symbol table.
+
+	* coff-aux.c (coff_m68k_aux_link_add_one_symbol): Make static.
+
+	* ppcboot.c (ppcboot_set_arch_mach): Don't define; it's a
+	function.
+	(ppcboot_bfd_print_private_bfd_data): Don't take the address of an
+	array.
+
+Tue Dec 10 23:23:52 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-mn10300.c (reloc_type): Remove big endian mn10300 reloc
+	variants.
+	(elf32_mn10300_howto_table, mn10300_reloc_map): Likewise.
+	(bfd_elf32_mn10300_reloc): Write data in little endian format.
+	* reloc.c: Remove mn10300 big endian relocs.
+	* bfd-in2.h, libbfd.h: Rebuilt.
+
+	* elf32-mn10200.c: Update from elf32-mn10300.c.
+
+Fri Dec  6 15:18:05 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-mn10300.c (elf_symbol_leading_char): Define.
+
+	* elf32-mn10300.c: Add some comments.
+
+Fri Dec  6 17:16:43 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ihex.c (ihex_scan): Always initialize buf before jumping to
+	error_return.
+	(ihex_read_section): Likewise.
+
+Thu Dec  5 22:29:18 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-mn10300.c (elf_mn10300_howto_table): Don't set partial-
+	inplace for most relocs.
+
+Thu Dec  5 13:24:46 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_add_object_symbols): Calling check_relocs
+	even if SEC_ALLOC is not set.
+	* elf32-i386.c (elf_i386_check_relocs): Don't check SEC_ALLOC
+	when deciding whether to copy a reloc into a shared object.
+	(elf_i386_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_check_relocs): Likewise.
+	(elf32_sparc_relocate_section): Likewise.
+	* elf32-i386.c (elf_i386_check_relocs): Don't set SEC_ALLOC in a
+	reloc section if it is not set in the source section.
+	* elf32-sparc.c (elf32_sparc_check_relocs): Likewise.
+	* elf.c (bfd_section_from_shdr): Mark a reloc section associated
+	with a SEC_DEBUGGING section as SEC_DEBUGGING.
+
+Wed Dec  4 14:18:13 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): #if 0 code that
+	expects a .got.plt until we actually create it.
+
+Mon Dec  2 12:13:51 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cofflink.c (_bfd_coff_generic_relocate_section): Print an error
+	message for bfd_reloc_outofrange, rather than aborting.  From
+	Philippe De Muyter <phdm@info.ucl.ac.be>.
+
+	* cofflink.c (_bfd_coff_final_link): If there aren't any relocs in
+	a relocateable link, don't try to process them.  From Heinz Wrobel
+	<wrobel@lpr.e-technik.tu-muenchen.de>.
+
+Mon Dec  2 00:39:24 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-mn10300.c (mn10300_info_howto): Renamed from
+	mn10300_info_howto_rel.  Tweak reloc argument to be an
+	Elf32_Internal_Rela.
+	(USE_RELA): Define instead of USE_REL.
+	(elf_info_to_howto, elf_info_howto_rel): Corresponding changes.
+
+Sun Dec  1 00:18:59 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* configure.in, configure:  Handle mips*-sgi-irix6*.
+	* irix-core.c (irix_core_core_file_p):  Accept CORE_MAGICN32
+	core files.
+
+Wed Nov 27 12:10:25 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-i386.c (elf_i386_relocate_section): Warn about a
+	relocation against a symbol defined in a section with no output
+	section.
+
+Tue Nov 26 11:07:31 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aclocal.m4 (BFD_CC_FOR_BUILD): Don't require AC_C_CROSS.
+	* configure, config.in: Rebuild with autoconf 2.12.
+
+	* elf-bfd.h (struct elf_link_hash_entry): Add other field.
+	* elf.c (_bfd_elf_link_hash_newfunc): Initialize other field.
+	(swap_out_syms): Set st_other from existing st_other field.
+	* elflink.h (elf_link_add_object_symbols): Store st_other in hash
+	table other field.
+	(elf_link_output_extsym): Set the other field from the global hash
+	table entry.
+	* elf32-mips.c (enum reloc_type): Add R_MIPS16_26.
+	(elf_mips16_jump_howto): New static variable.
+	(mips16_jump_reloc): New static function.
+	(bfd_elf32_bfd_reloc_type_lookup): Handle BFD_RELOC_MIPS16_JMP.
+	(mips_info_to_howto_rel): Handle R_MIPS16_26.
+	(mips_elf_relocate_section): Handle R_MIPS16_26.  Handle R_MIPS_26
+	to a mips16 symbol.
+	* reloc.c (BFD_RELOC_MIPS16_JMP): Add to list of relocs.
+	* bfd-in2.h, libbfd.h: Rebuild.
+	* cpu-mips.c (arch_info_struct): Add mips:16 entry.
+
+Mon Nov 25 11:23:32 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.host: Use long long for mips-sgi-irix6*.
+
+	* coffswap.h (coff_swap_scnhdr_out): Make line number overflow
+	only a warning.  From Philippe De Muyter <phdemuyt@ulb.ac.be>.
+
+Mon Nov 25 08:52:29 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-mn10300.c (bfd_elf32_mn10300_reloc): New function.
+	(enum reloc_type): Add more reloc types.
+	(elf32_mn10300_howto_table): Update for new reloc types.
+	(elf32_mn10300_reloc_map): Update for new reloc types.
+	* reloc.c: Add some new relocs for the mn10300 series.
+	* bfd-in2.h, libbfd.h: Rebuilt.
+
+Sat Nov 23 13:26:18 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* som.c (setup_sections): Don't lose for a space which has
+	no data, but some symbols.
+
+Fri Nov 22 11:32:13 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* sunos.c (struct sunos_link_hash_table): Add got_needed field.
+	(sunos_link_hash_table_create): Initialize got_needed.
+	(sunos_create_dynamic_sections): Only set .got section size if it
+	is not already set.  Set got_needed.
+	(bfd_sunos_size_dynamic_sections): Check got_needed.  Only set
+	sdynptr, and only handle dynamic sections, if dynamic sections are
+	needed.
+	(sunos_scan_std_relocs): Pass false to create_dynamic_sections.
+	Initialize .got section.
+	(sunos_scan_ext_relocs): Likewise.
+	(sunos_write_dynamic_symbol): Set up PLT entry even if this is not
+	a dynamic symbol.
+	(sunos_finish_dynamic_link): Check got_needed.  Only set up
+	dynamic linking information if needed.
+
+Thu Nov 21 10:31:31 1996  Rob Savoye  (rob@cygnus.com)
+
+	* config.bfd: Added VersaDOS format to the Ericsson configuration.
+
+Wed Nov 20 16:31:31 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-mn10300.c: Rough cut at relocs for the mn10300.
+
+Wed Nov 13 08:12:38 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (elf32-d10v.o): Don't depend on elf/d10v.h
+	anymore.
+
+Tue Nov 12 13:30:00 1996  Dawn Perchik  <dawn@cygnus.com>
+
+	* filemode.c: Include sysdep.h.
+	* ihex.c: Add casts to eliminate compiler warnings.
+	* sunos.c: Add casts to eliminate compiler warnings.
+
+Mon Nov 11 10:37:02 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Create .got.plt
+	section.
+	(ppc_elf_check_relocs): Add support for R_PPC_LOCAL24PC.  Make
+	appropriate relocations in the .so file if shared.
+	(ppc_elf_relocate_section): Ditto.
+
+Tue Oct 29 15:03:02 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* elf32-m32r.c (elf_m32r_howto_table, R_M32R_24): Use
+	complain_overflow_unsigned.
+
+Tue Oct 29 12:53:46 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* elf32-d10v.c (elf_d10v_howto_table): Don't complain on
+	overflows for R_D10V_16 and R_D10V_18.
+
+Tue Oct 29 13:23:53 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c (ieee_write_section_part): Use LMA rather than VMA.
+	(do_with_relocs): Likewise.
+	(do_as_repeat): Likewise.
+	(copy_expression): Likewise.
+
+Fri Oct 25 16:56:40 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c (ieee_write_external_part): Correctly record whether
+	there is an external part.
+
+Thu Oct 24 14:32:52 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-v850.c (elf32_v850_bfd_final_link_relocate): Correctly
+	handle tda offsets for sld.w and sst.w instructions.
+	Fix alignment check in sld.w and sst.w tda reloc handling.
+
+Thu Oct 24 09:08:47 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* aclocal.m4, configure:  Set USE_BINARY_FOPEN for *-*-windows.
+
+Wed Oct 23 00:53:16 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-v850.c: Add comments about assumptions about
+	char, short & long sizes.
+	(elf32_v850_bfd_final_link_relocate): Fix sign extension
+	problems for several relocs.
+
+	* elf32-v850.c (elf32_v850_howto_table): Fix typo in
+	R_V850_SDA_OFFSET entry.
+
+Wed Oct 23 00:20:34 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (bfd_xcoff_import_symbol): Don't allocate ldsym.
+	Store import file index in ldindx.
+	(xcoff_build_ldsyms): Assume that ldsym was not previously
+	allocated.  For an imported symbol, copy ldindx into l_ifile.
+
+Tue Oct 22 19:20:38 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-v850.c (elf_v850_howto_table): Fix ordering of
+	R_V850_ZDA_OFFSET and R_V850_TDA_OFFSET.  Fix various
+	fields in R_V850_TDA_OFFSET.
+	(elf32_v850_bfd_final_link_relocate): Tweak pc-relative
+	relocs to work more like other relocs.  Handle R_V850_TDA_OFFSET
+	relocations.
+
+	* elf32-v850.c: Include bfdlink.h.
+	(bfd_elf32_v850_reloc): Return an error if we get a reloc
+	we can't handle.
+	(elf32_v850_bfd_final_link_relocate): New function.
+	(v850_elf_relocation_section): Likewise.
+	(elf_backend_relocate_section): Define.
+
+Tue Oct 22 17:22:43 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* binary.c (binary_set_section_contents): Ignore sections which
+	don't have SEC_LOAD and SEC_ALLOC set.
+
+Mon Oct 21 12:13:05 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* linker.c (_bfd_generic_final_link): Avoid losing static
+	symbols in the .bss section.
+
+Mon Oct 21 10:54:58 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-mips.c (elf_mips_howto_table): Describe R_MIPS_64.
+	(mips32_64bit_reloc): New static function.
+	(mips_reloc_map): Add entry for BFD_RELOC_64.
+	(mips_elf_relocate_section): Handle R_MIPS_64.
+
+	* linker.c (default_indirect_link_order): Print an error message
+	when attempting to do a relocateable link with different object
+	file formats, rather than calling abort.
+
+Thu Oct 17 10:43:29 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* reloc.c (m32r relocs): Rename them.
+	* bfd-in2.h, libbfd.h: Regenerated.
+	* elf32-m32r.c: Update.
+	(m32r_elf_10_pcrel_reloc): New function.
+	(elf_m32r_howto_table, R_M32R_10_PCREL entry): Use it.
+	(elf_m32r_howto_table, R_M32R_24 entry): Fix {src,dst}_masks.
+
+Wed Oct 16 11:24:35 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* linker.c (_bfd_generic_final_link): Set "linker_mark" for
+	all sections that will be included in the output file.
+	(_bfd_generic_link_output_symbols): Discard symbols in sections
+	which are being discarded.
+	* elf32-v850.c (enum reloc_type): Add R_V850_SDA_OFFSET,
+	R_V850_TDA_OFFSET and R_V850_ZDA_OFFSET.
+	(elf_v850_howto_table): Corresponding changes.
+	(elf_v850_reloc_map): Corresponding changes.
+	* reloc.c: Add additional V850 relocations.
+	* bfd-in2.h, libbfd.h: Rebuilt.
+
+	* elf32-v850.c (bfd_elf32_v850_reloc): Mask out bits we
+	no longer want in pc-relative relocs.
+
+Tue Oct 15 22:17:37 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-v850.c (bfd_elf32_v850_reloc): Don't silently
+	accept a reloc against an undefined sybmol!
+
+Tue Oct 15 16:17:28 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* elf32-v850.c:  Define elf_symbol_leading_char to be '_'.
+
+Tue Oct 15 12:40:41 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* VERSION: Bump for new relocation.
+
+	* hosts/i386bsd.h: If NBPG is not defined, define it as
+	PAGE_SIZE, for recent versions of FreeBSD.
+
+Mon Oct 14 12:37:26 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.host: Use `long long' as the 64 bit type on a Solaris
+	host, since both gcc and the SunPRO compilers support it.
+
+Mon Oct 14 11:17:24 1996  Richard Henderson  <rth@tamu.edu>
+
+	* reloc.c: Create a new BFD_RELOC_ALPHA_ELF_LITERAL.  It was a
+	mistake to have reused the ECOFF LITERAL for ELF since they have
+	different semantics.
+	* elf64-alpha.c (elf_reloc_map): Map from ELF_LITERAL.
+	* bfd-in2.h, libbfd.h: Rebuild.
+
+	* elf64-alpha.c (elf64_alpha_size_dynamic_sections): Trap .got
+	section overflow.
+
+	* elf64-alpha.c (elf64_alpha_relocate_section): Do not emit a
+	dynamic relocation for an undefweak symbol when we are building
+	a static executable.
+
+Thu Oct 10 11:15:06 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-make.sed (config.bfd, targmatch.sed): Edit references to
+	point explicitly to srcdir.
+	(targmatch.h): Edit references to point explicitly to objdir.
+
+Thu Oct 10 14:14:23 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.bfd: When setting targ_cpu, don't get confused by
+	linux-gnu.
+
+Tue Oct  8 08:51:19 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* configure.host:  Add support for windows host (a build done
+	under the Microsoft build environment).
+
+Tue Oct  8 11:40:16 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_add_object_symbols): If a symbol is a weak
+	definition in a dynamic object, add it to the dynamic symbol table
+	if any dynamic object mentions it.  Reverts part of last patch.
+
+	* sunos.c (struct sunos_link_hash_table): Add got_base field.
+	(sunos_link_hash_table_create): Initialize got_base.
+	(bfd_sunos_size_dynamic_sections): If the .got section is more
+	than 0x1000 bytes, set __GLOBAL_OFFSET_TABLE_ and got_base to
+	0x1000.
+	(sunos_check_dynamic_reloc): Subtract got_base from a base
+	relative relocation.
+
+	* elf32-mips.c (elf_mips_isa): New static function.
+	(_bfd_mips_elf_merge_private_bfd_data): Don't warn about linking
+	-mips1 and -mips2 code together, or -mips3 and -mips4 code.
+
+Mon Oct  7 11:44:17 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* archive.c (do_slurp_coff_armap): Only treat archive as little
+	endian for i960 COFF.
+
+Fri Oct  4 13:49:01 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffcode.h (coff_compute_section_file_positions): Adjust sofar
+ 	by the change in size of the section when EXEC_P is not set.
+
+	* coff-m68k.c (coff_rtype_to_howto): Define if not defined.
+	(m68kcoff_rtype_to_howto): New static function.
+	* cf-m68klynx.c (coff_m68k_lynx_rtype_to_howto): Add the section
+	VMA to the addend for a PC relative reloc.
+
+	* dep-in.sed: Rework backslash loop a bit to avoid bug in sed on
+	HP/UX 10.20.
+	* Makefile.in: Rebuild dependencies.
+
+	* dep-in.sed: Remove ../bfd/sysdep.h, since it will appear when
+	som.h is included.
+
+Fri Oct  4 11:41:39 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in: Remove explicit dependencies for mn10200 and
+	mn10300 files.
+	(ALL_MACHINE_CFILES): Add cpu-mn10200.c and cpu-mn10300.c.
+	(BFD32_BACKENDS_CFILES): Add elf32-mn10200.c and elf32-mn10300.c
+	(dependencies): Rebuilt.
+
+Thu Oct  3 16:57:51 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cofflink.c (coff_link_add_symbols): Set obj_coff_keep_syms
+	during this function.
+
+	* elflink.c (_bfd_elf_create_linker_section): Only use an existing
+	section if the flags are compatible.
+
+	* configure.in: Add havevecs, and put it in tdefaults.
+	* mpw-config.in: Likewise.
+	* configure: Rebuild.
+	* targmatch.sed: New file; a sed script to build targmatch.h from
+	config.bfd.
+	* config.bfd: Add #if, #endif, and comments for targmatch.h.
+	* targets.c: Include "fnmatch.h".
+	(struct targmatch): Define.
+	(bfd_target_match): Define by including targmatch.h.
+	(bfd_find_target): If the target is not found by name, search for
+	it as a configuration triplet.
+	* Makefile.in: Rebuild dependencies.
+ 	(BFD32_BACKENDS): Add aout-arm.o, aout-sparcle.o, hp300bsd.o,
+	i386dynix.o, m68k4knetbsd.o, and riscix.o.
+	(BFD32_BACKENDS_CFILES): Add aout-arm.c, aout-sparcle.c,
+	hp300bsd.c, i386dynix.c, m68k4knetbsd.c, and riscix.c.
+	(HFILES): Add targmatch.h.  Also, alphabetize and reindent.
+	(CFILES): Remove i386dynix.c and hp300bsd.c.
+	(targmatch.h): New target.
+	(do_clean): Remove targmatch.h.
+
+	* configure.in: Add BFD_NEED_DECLARATION(getenv).
+	* acconfig.h: Add NEED_DECLARATION_GETENV.
+	* configure, config.in: Rebuild.
+	* sysdep.h: If NEED_DECLARATION_GETENV, declare getenv.
+	* aout-adobe.c (aout_adobe_object_p): Don't declare getenv.
+
+Thu Oct  3 09:29:09 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* cpu-mn10x00.c, elf32-mn10x00: Removed.
+	* cpu-mn10200.c, cpu-mn10300.c: New files.
+	* elf32-mn10200.c, elf32-mn10300.c: New files.
+	* Makefile.in: Break mn10x00 support into two separate
+	configurations, mn10200 and mn10300.
+	* archures.c, config.bfd, configure.in, elf.c, targets.c: Likewise.
+	* bfd-in2.h, configure: Rebuilt.
+
+Thu Oct  3 15:38:19 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
+
+	* Makefile.in (do_clean): Move config.log to do_distclean.
+
+Wed Oct  2 21:40:55 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* cpu-mn10x00.c, elf32-mn10x00.c: New files.
+	* Makefile.in (ALL_MACHINES): Add cpu-mn10x00.o.
+	(BFD32_BACKENDS): Similarly for elf32-mn10x00.o.
+	(elf32-mn10x00.o): Add dependencies.
+	* archures.c (enum bfd_architecture): Add bfd_arch_mn10x00.
+	(bfd_mn10x00_arch): Declare.
+	(bfd_archures_list): Add bfd_mn10x00_arch.
+	* config.bfd: Add mn10x00-*-*.
+	* configure.in: Add bfd_elf32_mn10x00_vec.
+	* elf.c (prep_headers): Handle bfd_arch_mn10x00.
+	* targets.c (bfd_elf32_mn10x00_vec): Declare.
+	(bfd_target_vector): Add bfd_elf32_mn10x00_vec.
+	* bfd-in2.h, configure: Rebuilt.
+
+Wed Oct  2 15:46:45 1996  Klaus Kaempf  <kkaempf@progis.de>
+
+	openVMS/Alpha: Provide filename and case_hack flags via
+	symbol table from gas.
+	Add case_hack code for symbol output from vax/vms.
+	* evax-alpha.c (evax_initialize): Remove filename handling,
+	filename is provided via symbol table.
+	(evax_get_symtab): Use local symbol count when setting up table.
+	* evax-egsd.c (_bfd_evax_slurp_egsd): Print correct name when
+	debugging.
+	(_bfd_evax_write_egsd): Skip file name symbol.
+	* evax-emh.c (get_vms_time_string): Local function now.
+	(_bfd_evax_write_emh): Extract source filename and case_hack flags
+	from symbol table.
+	(_bfd_evax_write_etir): Pass all symbol names through
+	_bfd_evax_case_hack_symbol.
+	* evax-misc.c (hash_string, _bfd_evax_case_hack_symbol): New
+	functions.
+	(_bfd_evax_basename): Removed.
+	(_bfd_get_vms_time_string): Moved to evax-emh.c.
+	* evax.h (evax_private_data_struct): Remove filename.
+	(flag_hash_long_names, flag_show_after_trunc,
+	flag_no_hash_mixed_case, vms_name_mapping): New flags for
+	vms_case_hack.
+
+Wed Oct  2 12:02:02 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* freebsd.h (N_GET_MAGIC_NET): Don't use ntohl.
+	(N_GETMID_NET, N_GETFLAG_NET): Likewise.
+	(NO_SWAP_MAGIC): Don't define.
+	(SWAP_MAGIC): Define.
+
+	* cofflink.c (_bfd_coff_link_input_bfd): Don't crash if there is
+	no hash table entry for a global symbol.
+
+Tue Oct  1 16:14:22 1996  Joel Sherrill  <joel@oarcorp.com>
+
+	* config.bfd (mips*-*-rtems*): New target, like mips*-*-elf*.
+
+Tue Oct  1 12:31:39 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cofflink.c (coff_link_add_symbols): Don't override a meaningful
+	symbol type with T_NULL.  Warn if symbol type changes.  Based on
+	patch from Philippe De Muyter <phdm@info.ucl.ac.be>.
+
+	* elflink.h (elf_link_add_object_symbols): Only put a symbol from
+	a dynamic object in the dynamic symbol table if it is referenced
+	or defined by a regular object.
+
+Fri Sep 27 18:41:07 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* elf32-v850.c (bfd_elf32_v850_is_local_label):  New function to
+	remove dwarf local labels.  Shrinks binaries by a factor of 3!
+
+Mon Sep 23 13:33:00 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_add_symbol_hook): Create the .sbss section
+	by hand, rather than by calling bfd_make_section.
+
+Mon Sep 23 09:23:41 1996  Doug Evans  <dje@seba.cygnus.com>
+
+	* reloc.c: Rename m32r relocs.
+	* bfd-in2.h, libbfd.h: Rebuilt.
+	* elf32-m32r.c: Update.
+
+Fri Sep 20 11:43:43 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutx.h (aout_link_input_section_ext): When doing a relocateable
+	link, adjust the symbol index of a base relative reloc.  Don't
+	change the addend of a PC relative reloc if pcrel_offset is set.
+	* sunos.c (bfd_sunos_size_dynamic_sections): Don't do anything for
+	a relocateable link.
+
+	* reloc.c (bfd_perform_relocation): Apply the relocation even if
+	it is zero, in case src_mask matters.
+	(bfd_install_relocation): Likewise.
+
+Thu Sep 19 11:03:06 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (xcoff_link_add_symbols): Always initialize
+	keep_syms.
+ 	(_bfd_xcoff_bfd_final_link): Don't set target_index
+	to an uninitialized value.
+
+Tue Sep 17 14:18:31 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffcode.h (coff_slurp_line_table): Warn about illegal symbol
+	indices, rather than crashing.
+	(coff_slurp_reloc_table): Likewise.  Check whether the howto field
+	is NULL.
+	* coff-sh.c (sh_relocate_section): Check for an illegal symbol
+	index.
+
+Mon Sep 16 12:39:36 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-arm.c (aoutarm_std_reloc_howto): Change dst_mask for ARM26D
+ 	reloc to 0.
+	(coff_arm_adjust_symndx): New static function.
+	(coff_adjust_symndx): Define.
+
+	* srec.c (srec_scan): Accept multiple symbols on a single line.
+	From Pascal Martin <pmartin@alsys.com>.
+
+	* README: New file.
+
+Fri Sep 13 14:32:42 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* aoutf1.h (MY_bfd_merge_private_bfd_data): Define.
+	(sunos_merge_private_bfd_data): New function.
+
+Fri Sep 13 15:50:57 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfd.c (bfd_copy_private_bfd_data): Switch on output BFD rather
+	than input BFD.
+	(bfd_merge_private_bfd_data): Likewise.
+	* section.c (bfd_copy_private_section_data): Likewise.
+	* syms.c (bfd_copy_private_symbol_data): Likewise.
+	* bfd-in2.h: Rebuild.
+	* aout-target.h (MY_bfd_copy_private_section_data): Check that
+	both BFD's are the right flavour.
+	* ecoff.c (_bfd_ecoff_bfd_copy_private_bfd_data): Likewise.
+	* elf.c (_bfd_elf_copy_private_symbol_data): Likewise.
+	* elf32-mips.c (_bfd_mips_elf_copy_private_bfd_data): Likewise.
+	(_bfd_mips_elf_merge_private_bfd_data): Likewise.
+	* elf32-ppc.c (ppc_elf_copy_private_bfd_data): Likewise.
+	(ppc_elf_merge_private_bfd_data): Likewise.
+	* elf32-sparc.c (elf32_sparc_merge_private_bfd_data): Likewise.
+	* peicode.h (pe_bfd_copy_private_section_data): Likewise.
+
+	* elf32-hppa.c (elf_hppa_howto_table): Fill in some fields for
+	R_PARISC_DIR32, so that _bfd_stab_section_find_nearest_line passes
+	its sanity check.
+
+Thu Sep 12 11:45:57 1996  Doug Evans  <dje@seba.cygnus.com>
+
+	* reloc.c: Add m32r relocs.
+	* bfd-in2.h, libbfd.h: Rebuilt.
+	* cpu-m32r.c, elf32-m32r.c: New files.
+
+Thu Sep 12 11:10:05 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c (ieee_vec): Set symbol_leading_char field to '_'.
+
+Wed Sep 11 11:57:56 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* tekhex.c (first_phase): Change type parameter from char to int.
+	(out): Likewise.
+	(pass_over): Change func to expect int, not char.
+
+	* elf.c (assign_file_positions_for_segments): Test SEC_ALLOC
+	rather than SEC_LOAD when aligning the file offset for the first
+	section in a segment.
+
+Tue Sep 10 16:18:30 1996  Fred Fish  <fnf@cygnus.com>
+
+	* syms.c (coff_section_type): Make arg const.
+	* irix-core.c (irix_core_core_file_p): Remove extraneous extra arg
+	to make_bfd_asection().
+	* elf-bfd.h (bfd_section_from_phdr): Add prototype.
+	* elfcode.h (bfd_section_from_phdr): Remove prototype.
+	(_bfd_elf_stringtab_init): Remove prototype.
+
+	* netbsd-core.c (swap_abort): Add prototype.
+	* aix386-core.c (swap_abort): Ditto & make static
+	* hpux-core.c (swap_abort): Ditto & make static.
+	* irix-core.c (swap_abort): Ditto & make static.
+	* ptrace-core.c (swap_abort): Ditto & make static.
+	* trad-core.c (swap_abort): Ditto & make static.
+	* coffswap.h (coff_swap_reloc_in): Ditto.
+	(coff_swap_reloc_out): Ditto.
+	(coff_swap_filehdr_in): Ditto.
+	(coff_swap_filehdr_out): Ditto.
+	(coff_swap_sym_in): Ditto.
+	(coff_swap_sym_out): Ditto.
+	(coff_swap_aux_in): Ditto.
+	(coff_swap_aux_out): Ditto.
+	(coff_swap_lineno_in): Ditto.
+	(coff_swap_lineno_out): Ditto.
+	(coff_swap_aouthdr_in): Ditto.
+	(coff_swap_aouthdr_out): Ditto.
+	(coff_swap_scnhdr_in): Ditto.
+	(coff_swap_scnhdr_out): Ditto.
+	* ihex.c (ihex_sizeof_headers): Ditto.
+	* tekhex.c (getsym): Ditto.
+	(find_chunk): Ditto & make static.
+	(insert_byte): Ditto.
+	(first_phase): Ditto.
+	(pass_over): Ditto.
+	(tekhex_get_symtab): Ditto & make static.
+	(tekhex_get_symtab_upper_bound): Ditto & make static.
+	(tekhex_mkobject): Ditto.
+	(tekhex_object_p): Ditto.
+	(move_section_contents): Ditto.
+	(tekhex_get_section_contents): Ditto.
+	(tekhex_set_arch_mach): Ditto & make static.
+	(tekhex_set_section_contents): Ditto.
+	(writevalue): Ditto.
+	(writesym): Ditto.
+	(out): Ditto.
+	(tekhex_write_object_contents): Ditto.
+	(tekhex_sizeof_headers): Ditto.
+	(tekhex_make_empty_symbol): Ditto.
+	(tekhex_get_symbol_info): Ditto.
+	(tekhex_print_symbol): Ditto.
+	* irix-core.c (make_bfd_asection): Ditto.
+	(irix_core_core_file_p): Ditto.
+	(irix_core_core_file_failing_command): Ditto.
+	(irix_core_core_file_failing_signal): Ditto.
+	(irix_core_core_file_matches_executable_p): Ditto.
+	(irix_core_make_empty_symbol): Ditto.
+	* coff-mips.c (mips_bfd_reloc_type_lookup): Ditto.
+	* srec.c (srec_new_symbol): Ditto.
+	(srec_get_section_contents): Ditto.
+	(srec_set_arch_mach): Ditto.
+	(srec_set_section_contents): Ditto.
+	(internal_srec_write_object_contents): Ditto.
+	(srec_write_object_contents): Ditto.
+	(symbolsrec_write_object_contents): Ditto.
+	(srec_sizeof_headers): Ditto.
+	(srec_make_empty_symbol): Ditto.
+	(srec_get_symtab_upper_bound): Ditto.
+	(srec_get_symtab): Ditto.
+	(srec_print_symbol): Ditto and make static.
+	* elf.c (elf_read): Ditto
+	(assign_section_numbers): Ditto.
+	(elf_fake_sections): Ditto.
+	(sym_is_global): Ditto.
+	(elf_map_symbols): Ditto.
+	(get_program_header_size): Ditto.
+	* coffgen.c (make_a_section_from_file): Ditto.
+	(coff_real_object_p): Ditto.
+	(fixup_symbol_value): Ditto.
+	(build_debug_section): Ditto.
+	(copy_name): Ditto.
+	* syms.c (coff_section_type): Ditto.
+
+Mon Sep  9 22:36:01 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* bfd-in2.h: Rebuilt after m32r changes.
+
+Mon Sep  9 12:31:22 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* config.bfd: Add m32r support.
+	* configure.in: Likewise.
+	* configure: Likewise.
+	* Makefile.in: Likewise.
+	* archures.c: Likewise.
+	* elf.c: Likewise.
+	* targets.c: Likewise.
+	* config.bfd: Keep target list alphabetically sorted.
+
+Mon Sep  9 11:48:41 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-v850.c (bfd_elf32_v850_reloc, case R_V850_HI16): Don't forget
+	to add in the constant part found in the instruction itself.
+	(case R_V850_HI16_S): Likewise.
+
+Fri Sep  6 17:04:39 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* elf32-d10v.c (elf_d10v_howto_table): Modify the size of R_D10V_16
+	and R_D10V_18 to be 1 (word).
+
+Thu Sep  5 15:23:08 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* stabs.c (_bfd_link_section_stabs): If the output_section field
+	of either section is bfd_abs_section, then the linker is
+	discarding the section and we should not optimize it.
+
+Tue Sep  3 12:16:20 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* Makefile.in (aout-sparcle.o): New target.
+	* aoutf1.h (TARGET_IS_BIG_ENDIAN_P): Don't define if little endian.
+	* config.bfd (sparclet-*-aout*): Add case.
+	* configure.in (sparcle_aout_vec): Add case.
+	* configure: Regenerated.
+	* targets.c (sparcle_aout_vec): Declare.
+	(bfd_target_vector): Add sparcle_aout_vec.
+	* aout-sparcle.c: New file.
+
+Tue Sep  3 00:57:02 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-v850.c (bfd_elf32_v850_reloc): Fix handling of
+	low order sign bit propogation for R_V850_HI16_S.
+
+	* elf32-v850.c (bfd_elf32_v850_reloc): New function for
+	handling V850 specific relocs.
+	(elf_v850_howto_table): Use the new function for some
+	relocations.  Twiddle masks & shifts for some relocs.
+	Set partial_inplace where needed.
+
+Mon Sep  2 12:12:34 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cpu-mips.c: Add an explicit mips:3000 entry, and change the
+	default architecture to a machine number of 0.
+	* elf32-mips.c (_bfd_mips_elf_object_p): Set the machine number
+	for E_MIPS_ARCH_1.
+	(_bfd_mips_elf_merge_private_bfd_data): If the machine number of
+	the output BFD is the default, set it from the first input BFD.
+
+Sun Sep  1 18:38:01 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-v850.c (elf_v850_howto_table): All the 16bit relocs
+	insert at bitpos zero.  The HI16 relocs are shifted right
+	by 16 bits.  Fix src_mask for all relocs.
+	(TARGET_LITTLE_SYM, TARGET_LITTLE_NAME): Define.  The V850 is
+	little endian!
+	(TARGET_BIG_SYM, TARGET_BIG_NAME): Remove.  The V850 is little
+	endian!
+
+Sun Sep  1 15:41:08 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* rs6000-core.c (rs6000coff_core_file_matches_executable_p):
+	Rewrite to use BFD file read routines and to avoid using a fixed
+	length for the file name.
+
+Sat Aug 31 10:22:25 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-v850.c (enum reloc_type): Add R_V850_{32,16,8}.
+	(elf_v850_howto_table): Add support for R_V850_{32,16,8}.
+	(v850_reloc_map): Add translation from BFD_RELOC_{32,16,8}
+	to R_V850_{32,16,8}.
+
+Fri Aug 30 18:06:04 1996  J.T. Conklin  <jtc@hippo.cygnus.com>
+
+	* elf32-v850.c (reloc_type): Add R_V850_HI16_S.
+	(elf_v850_howto_table): Add info for HI16_S reloc.
+	(v850_reloc_map): Add HI_16_S reloc.
+	* reloc.c: Define BFD_RELOC_V850_* relocs.
+
+Fri Aug 30 11:49:19 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	Add SH ELF support.
+	* elf32-sh.c: New file.
+	* elf.c (prep_headers): Handle bfd_arch_sh.
+	* elfcode.h (write_relocs): Handle absolute symbol.
+	* elf-bfd.h (_bfd_elf32_link_read_relocs): Declare.
+	(_bfd_elf64_link_read_relocs): Declare.
+	* elflink.h (NAME(_bfd_elf,link_read_relocs)): Rename from
+	elf_link_read_relocs.  Make globally visible.  Change all
+	callers.
+	(elf_link_input_bfd): Get external symbols from cache in
+	symtab_hdr->contents.  Get contents from cache in
+	elf_section_data.
+	* elfxx-target.h (bfD_elfNN_bfd_relax_section): Only define if not
+	already defined.
+	* reloc.c: Define BFD_RELOC_SH_* relocs.
+	* libbfd-in.h (_bfd_sh_align_load_span): Declare.
+	* coff-sh.c (sh_insns_conflict): Fix a return value.
+	(_bfd_sh_align_load_span): New globally visible function, broken
+	out of sh_align_load.
+	(sh_align_load): Call _bfd_sh_align_load_span.
+	(sh_swap_insns): Change relocs parameter to PTR.
+	* bfd-in2.h, libbfd.h: Rebuild.
+	* targets.c (bfd_elf32_sh_vec): Declare.
+	(bfd_elf32_shl_vec): Declare.
+	* config.bfd (sh-*-elf*): New target.
+	* configure.in (bfd_elf32_sh_vec): New target vector.
+	(bfd_elf32_shl_vec): New target vector.
+	* configure: Rebuild.
+	* Makefile.in: Rebuild dependencies.
+ 	(BFD32_BACKENDS): Add elf32-sh.o.
+	(BFD32_BACKENDS_CFILES): Add elf32-sh.c.
+
+	* elf.c (map_sections_to_segments): Check that LMA does not skip a
+	page before checking D_PAGED.
+
+	* ihex.c (ihex_scan): Removed unnecessary extbase variable.
+	(ihex_write_object_contents): Remove extbase; always use segbase
+	instead.
+
+Thu Aug 29 16:52:17 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* configure.in (i[345]86-*-*): Recognize i686 for pentium pro.
+	* configure.host (i[345]86-*-*): Ditto.
+	* config.bfd (i[345]86-*-*): Ditto.
+	* configure: Regenerate.
+
+	* config.bfd (i[3456]86-*-dgux*): Recognize as a synonym for x86
+	elf.
+
+Tue Aug 27 09:18:18 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-hppa.c (hppa_elf_gen_reloc_type): Add new argument.
+	* elf32-hppa.h (hppa_elf_gen_reloc_type): Update prototype.
+	* som.c (hppa_som_gen_reloc_type): Add new argument.  If
+	we encounter an R_DATA_ONE_SYMBOL reloc against a symbol that
+	will have an ST_CODE type, change the symbol's type to ST_DATA.
+	* som.c (hppa_som_gen_reloc_type): Update prototype.
+
+Tue Aug 27 00:12:22 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-mips.c (mips_elf_check_relocs): Set dynobj if needed for
+	R_MIPS_32 and R_MIPS_REL32.  Set sgot and g as soon as possible.
+	(mips_elf_size_dynamic_sections): Don't require .got to exist.
+	(mips_elf_finish_dynamic_sections): Likewise.
+
+Thu Aug 22 10:54:38 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.host (HLDENV): New variable to set.  Set it for
+	*-*-sysv4*, since those linkers may not support -R but they always
+	support LD_RUN_PATH.
+
+	* libieee.h (NSECTIONS): Don't define.
+	(ieee_data_struct): Change section_table to asection **.  Add
+	section_table_size.
+	* ieee.c (get_section_entry): If the table isn't big enough, make
+	it bigger.
+	(ieee_slurp_sections): Remove assertion about number of sections.
+	(ieee_object_p): Adjust initialization of ieee to match changes to
+	the structure.
+
+	* xcofflink.c (xcoff_mark): Don't copy relocs for undefined
+	symbols merely because we are generating a shared library.
+	(xcoff_build_ldsyms): Don't set up global linkage code for an
+	undefined symbol merely because we are generating a shared
+	library.
+
+Tue Aug 20 15:06:05 1996  J.T. Conklin  <jtc@hippo.cygnus.com>
+
+	* Makefile.in (ALL_MACHINES): Add cpu-v850.o.
+	(BFD32_BACKENDS) Add elf32-v850.o.
+	* archures.c: Add bfd_v850_arch.
+	* bfd-in2.h: Add bfd_v850_arch.
+	* config.bfd (v850-*-*): New target.
+	* configure: (bfd_elf32_v850_vec) New vector.
+	* configure.in: (bfd_elf32_v850_vec) New vector.
+	* cpu-v850.c: New file.
+	* elf.c (prep_headers): Added case bfd_arch_v850.
+	* elf32-v850.c: New file.
+	* targets.c (bfd_elf32_v850_vec): New vector.
+
+Fri Aug 16 16:25:35 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (xcoff_link_add_dynamic_symbols): Create and define
+ 	a function code symbol for an XMC_XO symbol.
+
+Thu Aug 15 12:33:29 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-config.in: Update editing of autoconf vars to reflect
+	Jul 18 configure.in change.
+	* mpw-make.sed: Update editing of include pathnames to be
+	more general, add @DASH_C_FLAG@ to explicit compile rule edit.
+
+Thu Aug 15 10:35:13 1996  Richard Henderson  <rth@tamu.edu>
+
+	* elf64-alpha.c (elf64_alpha_output_extsym): The section from
+	which to offset to get the .plt entry address is ".plt".
+
+Thu Aug 15 16:40:30 1996  James G. Smith  <jsmith@cygnus.co.uk>
+
+	* reloc.c: (BFD_RELOC_ARM_THUMB_ADD, BFD_RELOC_ARM_THUMB_IMM,
+	BFD_RELOC_ARM_THUMB_SHIFT, BFD_RELOC_ARM_THUMB_OFFSET):
+ 	Added, for internal use by the ARM gas.
+	* libbfd.h: Rebuilt
+	* bfd-in2.h: Rebuilt
+
+Wed Aug 14 17:02:09 1996  Richard Henderson  <rth@tamu.edu>
+
+	* elf64-alpha.c (elf64_alpha_size_dynamic_sections): Correct typo
+	in section dynidx start.
+
+Tue Aug 13 14:35:38 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (_bfd_elf_make_section_from_shdr): Treat sections whose
+	name begins with .gnu.linkonce as SEC_LINK_ONCE.  This is an
+	optimization for g++.
+
+Tue Aug 13 17:04:40 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_merge_private_bfd_data): If one module has
+	the -mrelocatable-lib bit set and the other doesn't, clear the
+	-mrelocatable-lib bit in the header.
+
+Sat Aug 10 22:59:17 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_add_object_symbols): Do not resolve a common
+	symbol against a STT_FUNC symbol in a shared library.
+
+Fri Aug  9 12:44:57 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (xcoff_link_add_dynamic_symbols): If a descriptor
+ 	symbol is found, automatically define the corresponding function
+ 	code.
+
+	* cofflink.c (coff_link_add_symbols): Only set (*sym_hash)->numaux
+	if sym.n_numaux is not zero.
+	(_bfd_coff_link_input_bfd): Permit the symbol and the hash table
+	entry to disagree about the number of aux entries if the symbol
+	has zero.
+
+	* elf32-mips.c (mips_elf_check_relocs): Create the .rel.dyn
+	section if it might be needed, not just if info->shared.
+	(mips_elf_adjust_dynamic_symbol): Make room for a null element at
+	the start of .rel.dyn if we are going to use it.
+	(mips_elf_finish_dynamic_sections): Only clear the first element
+	of .rel.dyn if the size is greater than zero.
+
+Thu Aug  8 16:24:55 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (xcoff_link_input_bfd): If we already called the
+	undefined_symbol callback for a symbol, then don't issue any more
+	warnings about loader relocs.
+	(_bfd_ppc_xcoff_relocate_section): Don't do any further processing
+	after calling the undefined_symbol callback.
+
+	* xcofflink.c (XCOFF_MULTIPLY_DEFINED): Define.
+	(xcoff_link_add_symbols): Permit multiple definitions of a symbol
+	as the AIX linker seems to do.
+
+Thu Aug  8 12:21:56 1996  Klaus Kaempf  <kkaempf@progis.de>
+
+	* evax-alpha.c (evax_alpha_vec): Corrected flags, cleanup.
+	(evax_initialize): Remove evax_reloc_table.
+	(evax_close_and_cleanup): Ditto.
+	(reloc_nil): Ditto.
+	(alpha_howto_table): Remove ALPHA_R_SWREL32 and ALPHA_R_SWREL64
+	entries.
+	(evax_bfd_reloc_type_lookup): Ditto.
+	* evax-egsd.c (_bfd_evax_slurp_egsd): Add a few casts; set
+	cooked_size == raw_size.
+	* evax-emh.c (_bfd_evax_register_filename): Remove.
+	* evax-etir.c (etir_stc): Allow ETIR_S_C_STC_xx commands.
+	* evax-misc.c (add_new_contents): Malloc section at full size.
+	(_bfd_save_evax_section): Memcpy section contents directly.
+	* evax.h (ALPHA_R_SWREL32, ALPHA_R_SWREL64): Remove.
+	(evax_reloc_table): Remove.
+
+	* hosts/alphavms.h (O_ACCMODE): Define if needed.
+
+	* makefile.vms: Add better support for DEC C compilation
+	Add evax.h dependencies
+
+	* reloc.c (bfd_get_reloc_size): Add case for 16 byte reloc.
+	(BFD_RELOC_SWREL32,BFD_RELOC_SWREL64): Remove.
+	(BFD_RELOC_ALPHA_BASEREG): Remove.
+	* bfd-in2.h, libbfd.h: Rebuild.
+
+Thu Aug  8 08:17:32 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* archive.c (bsd_write_armap):  Ifdef around calls to getuid and
+	getgid if _WIN32 is defined.
+	* opncls.c (bfd_fdopenr):  Remove unnecessary WINGDB ifdef.
+
+Wed Aug  7 23:19:00 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* aoutx.h bfd-in.h bfd-in2.h opncls.c riscix.c som.c targets.c:
+	Change NO_FLAGS to BFD_NO_FLAGS to avoid conflict with an HPUX
+	include file.
+	* libbfd.c:  Create dummy getpagesize() macro if HAVE_GETPAGESIZE
+	isn't defined.
+
+Wed Aug  7 14:11:44 1996  Philippe De Muyter  <phdm@info.ucl.ac.be>
+
+	* configure.in: Call BFD_NEEDED_DECLARATION on strstr and
+	realloc.
+	* acconfig.h (NEED_DECLARATION_STRSTR): New macro.
+	(NEED_DECLARATION_REALLOC): New macro.
+	* configure, config.in: Rebuild.
+	* sysdep.h (strstr): Declare if NEED_DECLARATION_STRSTR.
+	(realloc): Declare if NEED_DECLARATION_REALLOC.
+
+	* aclocal.m4 (BFD_NEED_DECLARATION): Include <string.h> or
+	<strings.h> if they exist.
+
+	* ieee.c (ieee_set_section_contents): Cast bfd_alloc return.
+
+Wed Aug  7 12:12:03 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cpu-i386.c (i8086_arch): Architecture info for the i8086.
+
+	Based on patches from Eric Valette <valette@crf.canon.fr>:
+	* elf32-i386.c (enum reloc_type): Add FIRST_INVALID_RELOC,
+	LAST_INVALID_RELOC, R_386_16, R_386_PC16, R_386_8, R_386_PC8.
+	(elf_howto_table): Add entries for new relocs.
+	(elf_i386_reloc_type_lookup): Handle new relocs.
+	(elf_i386_info_to_howto): Just call abort.
+	(elf_i386_info_to_howto_rel): Check that the reloc type is valid.
+	(elf_i386_relocate_section): Likewise.
+
+Tue Aug  6 12:54:56 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* elf32-d10v.c (elf_d10v_howto_table): Added R_D10V_32.
+
+Mon Aug  5 13:42:41 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (_bfd_elf_make_section_from_shdr): For a loadable section,
+	only get the LMA from the phdr if they are in the same part of the
+	file.
+
+	* elf.c (map_sections_to_segments): Rewrite tests for starting a
+	new segment to make them more comprehensible.  If the relationship
+	between the LMA and the VMA changed, start a new segment.  Don't
+	check dynsec when deciding whether to start a new segment for a
+	writeable section; -N will now handle this.
+
+Thu Aug  1 22:43:08 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* libhppa.h: Remove "esel" changes.  Not the right approach.
+	* som.c: Corresponding changes.
+	(som_bfd_derive_misc_symbol_info): Use ST_DATA for symbols
+	which don't have a SOM symbol type associated with them.
+	Reverses a 1994 change.
+
+Wed Jul 31 15:50:55 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	Make ld -N more reasonable for ELF:
+	* elf.c (map_sections_to_segments): If D_PAGED is not set, set
+	phdr_in_section to false, and always use a single load segment.
+	(elf_sort_sections): Sort sections by LMA after VMA.
+	(assign_file_positions_for_segments): If D_PAGED is not set, don't
+	align to maxpagesize.
+	(assign_file_positions_except_relocs): Likewise.
+	* elfcode.h (elf_object_p): If a section is loaded but not page
+	aligned, clear D_PAGED.
+
+Wed Jul 31 15:00:12 1996  James G. Smith  <jsmith@cygnus.co.uk>
+
+	* reloc.c: (BFD_RELOC_ARM_OFFSETIMM8, BFD_RELOC_ARM_HWLITERAL):
+ 	Added, for internal use by the ARM gas.
+	* libbfd.h: Rebuilt
+	* bfd-in2.h: Rebuilt
+
+Tue Jul 30 14:14:57 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* libhppa.h (R_HPPA_ESEL): New field selector.
+	(e_esel): Similarly.
+	* som.c (hppa_som_gen_reloc_type): If we encounter an e_esel,
+	then generate R_COMP2 (PUSH_SYM), R_DATA_EXPR fixup stream.
+	(som_write_fixups): Handle R_DATA_EXPR just like R_CODE_EXPR.
+
+Tue Jul 30 13:31:27 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (_bfd_xcoff_bfd_link_add_symbols): Do the regular
+	archive search before looking for stripped dynamic objects.
+
+Fri Jul 26 17:51:39 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (xcoff_build_ldsyms): Make exporting an undefined
+	symbol a warning rather than an error.
+
+Wed Jul 24 12:02:53 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (assign_file_positions_for_segments): Track the virtual
+	memory position separately from the file position, and use it to
+	compute the alignment adjustment.
+
+Tue Jul 23 10:43:31 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* elf32-d10v.c (elf_d10v_howto_table): Changed all relocs to "long"
+ 	and fixed mask on R_D10V_10_PCREL_L.
+
+Mon Jul 22 15:30:30 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf64-mips.c: Include "aout/ar.h".
+	(mips_elf64_slurp_armap): New static function.
+	(mips_elf64_write_armap): New static function.
+	(bfd_elf64_archive_*): Define.
+	* elfxx-target.h (bfd_elfNN_archive_p): Define if not defined.
+	Use instead of bfd_generic_archive_p.
+	(bfd_elfNN_write_archive_contents): Define if not defined.  Use
+	instead of _bfd_write_archive_contents.
+	(bfd_elfNN_mkdarchive): Define if not defined.  Use instead of
+	_bfd_generic_mkarchive.
+	(TARGET_BIG_SYM): If bfd_elfNN_archive_functions is defined, use
+	bfd_elfNN_archive in BFD_JUMP_TABLE_ARCHIVE rather than
+	_bfd_archive_coff.
+	(TARGET_LITTLE_SYM): Likewise.
+	* archive.c (bfd_slurp_armap): Check for and reject an archive map
+	name of /SYM64/.
+	* Makefile.in: Rebuild dependencies.
+
+	* elf32-mips.c (_bfd_mips_elf_final_write_processing): Handle
+	SHT_MIPS_LIBLIST, SHT_MIPS_CONTENT, SHT_MIPS_SYMBOL_LIB, and
+	SHT_MIPS_EVENTS sections.
+	(_bfd_mips_elf_section_from_shdr): Handle SHT_MIPS_IFACE,
+	SHT_MIPS_CONTENT, SHT_MIPS_SYMBOL_LIB, and SHT_MIPS_EVENTS
+	sections.
+	(_bfd_mips_elf_fake_sections): Likewise.
+
+	* libecoff.h (ecoff_data_type): Add rdata_in_text field.
+	* ecoff.c (ecoff_compute_section_file_positions): Copy
+	rdata_in_text from backend info to tdata.  Clear it if any data
+	section comes before .rdata.
+	(_bfd_ecoff_write_object_contents): Use rdata_in_text field in
+	tdata rather than backend info.
+
+Fri Jul 19 18:15:51 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Fix test for whether a compiler has a 64 bit
+	type.  From Jim Wilson <wilson@cygnus.com>.
+
+Thu Jul 18 15:39:10 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.host (mips-sgi-irix6*): New host.
+
+	* configure.in: Set and substitute VERSION, BFD_HOST_64BIT_LONG
+	(replacing HOST_64BITLONG), BFD_HOST_64_BIT_DEFINED,
+	BFD_HOST_64_BIT, and BFD_HOST_U_64_BIT.  Add bfd-in2.h:bfd-in2.h
+	to AC_OUTPUT call.
+	* configure: Rebuild.
+	* bfd-in.h (BFD_ARCH_SIZE): Define as @wordsize@, not @WORDSIZE@.
+	(BFD_HOST_64_BIT): Define conditionally.
+	(BFD_HOST_U_64_BIT): Define when BFD_HOST_64_BIT is defined.
+	(bfd_vma): Typedef as BFD_HOST_U_64_BIT.
+	(symvalue, bfd_size_type): Likewise.
+	* bfd-in2.h: Rebuild.
+	* Makefile.in (do_clean): Remove bfd-tmp.h.
+	(do_distclean): Remove bfd-in3.h.
+	(stmp-bfd.h): Just do copy-if-change bfd-in3.h bfd.h.
+	(bfd-in3.h): New target.
+
+	* config.bfd (sparc-*-sysv4*): Don't build sunos_big_vec.  From
+	Andrew Gierth <ANDREWG@microlise.co.uk>.
+
+	* configure.host: Set INSTALL_SHLIB.
+	* configure.in: Call AC_SUBST (INSTALL_SHLIB).
+	* configure: Rebuild.
+	* Makefile.in (install): Use @INSTALL_SHLIB@.
+
+	* config.bfd (mips*-*-irix6*): New target.
+	* configure.host: Handle Irix 6 shared library like Irix 5.
+
+	* xcofflink.c (xcoff_link_add_symbols): Don't check an XMC_TD
+	symbol for a magic name.
+	(xcoff_link_input_bfd): Don't change the reloc symbol for an
+	XMC_TD symbol.
+	(_bfd_ppc_xcoff_relocate_section): Don't get the TOC offset for an
+	XMC_TD symbol.
+
+Thu Jul 18 11:36:31 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-config.in: Add ELF support to mips config, create the
+	elf32-target.h file in the object dir.
+	* mpw-make.sed: Edit elfXX-target.h refs at beginnings of lines.
+
+Wed Jul 17 18:02:32 1996  Kim Knuttila  <krk@cygnus.com>
+
+	* coff-ppc.c: Redid debug scheme - numerous fprintf's gone.
+	Also removed most abort calls, in favor of using bfd reporting.
+
+Wed Jul 17 14:51:52 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* Makefile.in (ALL_MACHINES): Add cpu-d10v.o.
+	(BFD32_BACKENDS) Add elf32-d10v.o.
+	* archures.c: Add bfd_d10v_arch.
+	* bfd-in2.h: Add bfd_d10v_arch.
+	* config.bfd (d10v-*-*): New target.
+	* configure: (bfd_elf32_d10v_vec) New vector.
+	* configure.in: (bfd_elf32_d10v_vec) New vector.
+	* cpu-d10v.c: New file.
+	* elf.c (prep_headers): Added case bfd_arch_d10v.
+	* elf32-d10v.c: New file.
+	* libbfd.h: Rebuild.
+	* reloc.c (BFD_RELOC_D10V_10_PCREL_R, BFD_RELOC_D10V_10_PCREL_L,
+ 	BFD_RELOC_D10V_18, BFD_RELOC_D10V_18_PCREL): Define.
+	* targets.c (bfd_elf32_d10v_vec): New vector.
+
+Wed Jul 17 10:58:55 1996  Kim Knuttila  <krk@cygnus.com>
+
+	* coff-ppc.c (coff_ppc_relocate_section): Removed bogus fprintf
+
+Tue Jul 16 23:49:02 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* archures.c bfd-in2.h:  Add bfd_mach_i386_i386 and
+	bfd_mach_i386_i8086 machine types.
+
+Wed Jul 10 12:42:56 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ecoff.c (_bfd_ecoff_new_section_hook): Set SEC_CODE for _INIT
+	and _FINI sections.
+
+Wed Jul 10 11:18:21 1996  Richard Henderson  <rth@tamu.edu>
+
+	* coffcode.h (coff_set_section_contents): A/UX does not require
+	special handling of the _LIB section.
+
+Tue Jul  9 15:52:20 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* coff-h8300.c (h8300_reloc16_extra_cases): Use the correct
+	value for R_RELBYTE.
+
+	* reloc16.c (bfd_coff_reloc16_relax_section): Only "shrinks"
+	array if one was allocated.
+
+Tue Jul  9 12:21:54 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	From Kazumoto Kojima <kkojima@kk.info.kanagawa-u.ac.jp>:
+	* elf32-mips.c (struct mips_elf_link_hash_table): Add new fields
+	use_rld_obj_head and rld_value.
+	(mips_elf_link_hash_table_create): Initialize new fields.
+	(mips_elf_add_symbol_hook): Mark __rld_obj_head symbol as
+	dynamic.
+	(mips_elf_create_dynamic_sections): Create .rld_map section.  If
+	__rld_obj_head symbol not seen, create an __rld_map symbol.
+	(mips_elf_size_dynamic_sections): Make space in .rld_map section.
+	Create a DT_MIPS_RLD_MAP entry rather than a DT_DEBUG entry.
+	(mips_elf_finish_dynamic_symbol): Save value of __rld_map or
+	__rld_obj_head symbol.
+	(mips_elf_finish_dynamic_sections): Handle DT_MIPS_RLD_MAP.
+
+Mon Jul  8 16:18:03 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-mips.c (mips_reloc_map): Remove BFD_RELOC_32_PCREL entry.
+
+	* elf32-ppc.c (ppc_elf_howto_raw): For R_PPC_ADDR16_HA, use
+	ppc_elf_addr16_ha_reloc.
+	(ppc_elf_addr16_ha_reloc): New static function.
+
+	* coff-mips.c (struct mips_hi): Define.
+	(mips_refhi_list): New static variable.
+ 	(mips_refhi_addr, mips_refhi_addend): Remove.
+	(mips_refhi_reloc): Maintain a list of unmatched REFHI relocs.
+	(mips_reflo_reloc): Process mips_refhi_list.
+	(mips_relhi_list): New static variable.
+	(mips_relhi_addr, mips_relhi_addend): Remove.
+	(mips_relhi_reloc): Maintain a list of unmatched RELHI relocs.
+	(mips_rello_reloc): Process mips_relhi_list.
+	(mips_relocate_section): Permit an arbitrary number of REFHI or
+	RELHI relocs before the associated REFLO or RELLO reloc.
+
+Fri Jul  5 19:27:49 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aout-target.h (MY(callback)): Set reloc_count fields.
+
+Thu Jul  4 12:00:37 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* sunos.c (sunos_add_dynamic_symbols): Don't create dynamic
+	sections unless this is a SunOS link.
+
+	* VERSION: Set to 2.7.1.
+
+	* Released binutils 2.7.
+
+Wed Jul  3 14:59:47 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* i386aout.c: Include "aout/aout64.h".
+ 	(i386aout_write_object_contents): New static function.
+	(MY_write_object_contents): Define.
+
+	* netbsd.h (MY(write_object_contents)): Make sure that
+	adjust_sizes_and_vmas is called before fiddling with the magic
+	number.
+
+Tue Jul  2 23:30:39 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* stabs.c (_bfd_link_section_stabs): Fix casts of psinfo.
+
+Sun Jun 30 13:34:33 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libbfd-in.h (itos, stoi): Don't define.
+	* libbfd.h: Rebuild.
+	* i386lynx.c (KEEPIT): Define as udata.i.
+	(NAME(lynx,swap_std_reloc_out)): Don't use stoi.
+	(NAME(lynx,swap_ext_reloc_out)): Likewise.
+	* riscix.c (riscix_swap_std_reloc_out): Use udata.i rather than
+	flags.  Don't use stoi.
+
+	* elf32-mips.c (ELF_MAGPAGESIZE): Change definition to 0x1000.
+
+	* elf.c (map_sections_to_segments): Don't start a new segment for
+ 	a writable section if it's on the same page as the previous
+ 	segment.  Reset the writable variable for a readonly section.
+
+Sat Jun 29 16:18:51 1996  Kim Knuttila  <krk@cygnus.com>
+
+	* peicode.h (coff_swap_aouthdr_in): Missing initializations of
+	first_thunk_address, thunk_size, and import_table_size.
+	* peicode.h: Improved some diagnostics regarding edata sections.
+
+	* coff-ppc.c (coff_ppc_relocate_section): Earlier error check
+	on IMGLUE relocs.
+	(coff_ppc_relocate_section): Improved diagnostic for large TOCDEFN's.
+	(TARGET_LITTLE_SYM): Added missing D_PAGED.
+
+Fri Jun 28 13:48:45 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (xcoff_link_check_ar_symbols): An undefined symbol
+	with XCOFF_DEF_DYNAMIC set is really defined.
+	(xcoff_link_check_dynamic_ar_symbols): Likewise.
+	(xcoff_link_add_symbols): Only create special sections if using an
+	XCOFF hash table.
+
+	* reloc.c (bfd_perform_relocation): Handle xcoff-powermac like
+	aixcoff-rs6000.
+	(bfd_install_relocation): Likewise.
+
+Fri Jun 28 11:17:00 1996  Richard Henderson  <rth@tamu.edu>
+
+	* elf64-alpha.c (struct alpha_elf_link_hash_entry): Add flags
+	field.
+	(ALPHA_ELF_LINK_HASH_LU_ADDR): Define.
+	(ALPHA_ELF_LINK_HASH_LU_MEM): Define.
+	(ALPHA_ELF_LINK_HASH_LU_FUNC): Define.
+	(elf64_alpha_link_hash_newfunc): Initialize flags field.
+	(elf64_alpha_check_relocs): Record types of LITUSE entries that
+	are found for LITERAL relocs.
+	(elf64_alpha_adjust_dynamic_symbol): If a symbol has its address
+	taken, we cannot generate a .plt entry for the symbol.
+
+Thu Jun 27 11:24:29 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Add AC_ISC_POSIX, and check for setitimer and
+	sysconf functions (for gprof).
+	* configure, config.in: Rebuild.
+
+Wed Jun 26 16:29:02 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ecoff.c (_bfd_ecoff_archive_p): Check the first object file in
+	an archive if it has a map.  If the object file has the wrong
+	xvec, reject it.
+
+	* coff-alpha.c (alpha_adjust_reloc_in): Set the addend for a
+	BRADDR, SREL16, SREL32, or SREL64 reloc against an external
+	symbol.
+	(alpha_relocate_section): Likewise.
+
+	* coffswap.h (coff_swap_reloc_out): Use RELSZ, not sizeof.
+	(coff_swap_filehdr_out): Use FILHSZ, not sizeof.
+	(coff_swap_sym_out): Use SYMESZ, not sizeof.
+	(coff_swap_aux_out): Use AUXESZ, not sizeof.
+	(coff_swap_lineno_out): Use LINESZ, not sizeof.
+	(coff_swap_aouthdr_out): Use AOUTSZ, not sizeof.
+	(coff_swap_scnhdr_out): Use SCNHSZ, not sizeof.
+	* peicode.h: Corresponding changes.
+
+Tue Jun 25 15:28:34 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elflink.h (elf_create_pointer_linker_section): Comment out code
+	dealing with making GOT pointers negative of the GOT symbol for
+	now.
+
+Tue Jun 25 11:41:24 1996  Richard Henderson  <rth@tamu.edu>
+
+	* elf64-alpha.c (elf64_alpha_adjust_dynamic_symbol): Don't
+	increment the .rela.plt size until after we're done creating the
+	.plt entry.
+	(elf64_alpha_finish_dynamic_symbol): Change .plt entry to load the
+	.rela.plt offset directly rather than calculating it.
+
+Mon Jun 24 17:15:10 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
+
+        * Makefile.in (bindir, libdir, datadir, mandir, infodir, includedir):
+	Use autoconf-set values.
+        * doc/Makefile.in (bindir, libdir, datadir, mandir, infodir,
+	includedir, INSTALL, INSTALL_PROGRAM, INSTALL_DATA): Use autoconf-set
+	values.
+        (docdir): Deleted.
+        * configure.in (AC_PREREQ): autoconf v2.5 or higher.
+        * configure: Rebuilt.
+
+Mon Jun 24 22:50:35 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* som.c (som_write_fixups): Fix typo in R_END_TRY for exception
+	handling code > 1k away.
+
+Mon Jun 24 18:41:06 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elflink.h (elf_create_pointer_linker_section): If DEBUG is
+	defined, output whenever the symbol is updated.
+
+Mon Jun 24 17:58:12 1996  Jouke Numan  <jnuman@bazis.nl>
+
+	* elf.c (elf_fake_sections): Don't set sh_addr of a non SEC_ALLOC
+	section to 0 if user_set_vma is set.
+	* elflink.h (elf_bfd_final_link): Likewise.
+
+Sun Jun 23 20:42:51 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	Partially undo patch of Jun 20.
+	* coffcode.h (coff_set_alignment_hook): Use COFF_IMAGE_WITH_PE.
+	(coff_compute_section_file_positions): Likewise.
+	(coff_write_object_contents): Likewise.  Re-add deleted code, but
+	use #ifdef COFF_WITH_PE, not COFF_OBJ_WITH_PE.
+	* peicode.h (pe_bfd_copy_private_bfd_data): Re-add #ifdef.
+
+Fri Jun 21 17:38:15 1996  Joel Sherrill  <joel@merlin.gcs.redstone.army.mil>
+
+	* config.bfd: Add support for *-*-rtems* configurations.
+
+Fri Jun 21 15:19:59 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (prep_headers): Add bfd_arch_alpha case.
+
+Fri Jun 21 12:35:27 1996  Richard Henderson  <rth@tamu.edu>
+
+	* elf64-alpha.c: New file.
+	* config.bfd (alpha-*-linuxecoff*): New target.
+	(alpha-*-linux*, alpha-*-elf*): New targets.
+	* configure.in (bfd_elf64_alpha_vec): New vector.
+	* configure: Rebuild.
+	* targets.c (bfd_elf64_alpha_vec): Declare.
+	(bfd_target_vector): Add bfd_elf64_alpha_vec if BFD64.
+	* reloc.c (BFD_RELOC_ALPHA_GPDISP): Define.
+	* bfd-in2.h, libbfd.h: Rebuild.
+	* Makefile.in: Rebuild dependencies.
+ 	(BFD64_BACKENDS): Add elf64-alpha.o.
+	(BFD64_BACKENDS_CFILES): Add elf64-alpha.c.
+
+Thu Jun 20 18:14:25 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ecoff.c (ecoff_armap_hash): If hlog is 0, just return 0, rather
+	than relying on a right shift of 32.
+
+Thu Jun 20 11:00:57 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* coffcode.h (coff_set_alignment_hook): Change COFF_IMAGE_WITH_PE
+	ifdef to COFF_WITH_PE.
+	(coff_compute_section_file_positions): Likewise.
+	(coff_write_object_contents): Likewise.  Delete COFF_OBJ_WITH_PE.
+	* pe-{arm,i386,ppc}.c (COFF_OBJ_WITH_PE): Delete.
+	* peicode.h (pe_bfd_copy_private_bfd_data): Delete ifdef
+	COFF_IMAGE_WITH_PE, always include.
+
+	* peicode.h (coff_swap_scnhdr_out): ".drectve" doesn't have trailing 0.
+
+Wed Jun 19 11:37:52 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (map_sections_to_segments): Fix up the test for -Ttext to
+	approximate the correct answer if SIZEOF_HEADERS was not used.
+
+	* binary.c (binary_set_section_contents): Set section file
+	position based on LMA rather than VMA.
+
+Wed Jun 19 11:19:25 1996  Manfred Hollstein KS/EIC5 60/3/142 #40283  <manfred@lts.sel.alcatel.de>
+
+	* linker.c (_bfd_generic_link_output_symbols): Don't output any
+	symbols if info->strip == strip_all.
+
+Tue Jun 18 15:17:36 1996  Jeffrey A. Law  <law@rtl.cygnus.com>
+
+	* coff-h8300.c: Remove #if 0 code.
+	(compatable): Don't allow mixing/matching of different architectures.
+
+	* archures.c (bfd_mach_h8300s): Add.
+	* bfd-in2.h: Rebuilt.
+	* coff-h8300.c (funcvec_hash_newfunc): Handle H8/S too.
+	(BADMAG): Likewise.
+	(h8300_reloc16_estimate): Likewise.
+	(h8300_reloc16_extra_cases): Likewise.
+	(h8300_bfd_link_add_symbols): Likewise.
+	* coffcode.h (coff_set_arch_mach_hook): Likewise.
+	(coff_set_flags): Likewise.
+	* cpu-h8300.c (h8300_scan): Likewise.
+	Add H8/S to bfd_h8300_arch list.
+
+Tue Jun 18 14:42:58 1996  Klaus Kaempf  <kkaempf@progis.de>
+
+	Added support for Alpha OpenVMS:
+	* evax.h, evax-alpha.c, evax-egsd.c, evax-emh.c: New files.
+	* evax-etir.c, evax-misc.c, hosts/alphavms.h: New files.
+	* config.h-vms, makefile.vms: New files.
+	* config.bfd (alpha-*-*vms*): New target.
+	* configure.in (evax_alpha_vec): New target vector.
+	* configure: Rebuild.
+	* reloc.c (BFD_RELOC_SWREL32, BFD_RELOC_SWREL64): Define.
+	(BFD_RELOC_ALPHA_LINKAGE, BFD_RELOC_ALPHA_BASEREG): Define.
+	* targets.c (bfd_target_evax_flavour): Define.
+	(evax_alpha_vec): Declare.
+	(bfd_target_vector): Add ecoffalpha_little_vec and evax_alpha_vec
+	if BFD64 is defined.
+	* bfd-in2.h, libbfd.h: Rebuild.
+	* Makefile.in: Rebuild dependencies.
+	(BFD64_BACKENDS): Add evax-alpha.o, evax-egsd.o, evax-etir.o,
+	evax-emh.o, and evax-misc.o.
+	(BFD64_BACKENDS_CFILES): Add evax-alpha.c, evax-egsd.c,
+	evax-etir.c, evax-emh.c, and evax-misc.c.
+	(HFILES): Add evax.h.
+
+Tue Jun 18 13:54:18 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-h8300.c (h8300_reloc16_extra_cases): Make name a const
+	pointer.
+	(h8300_bfd_link_add_symbols): Likewise.
+
+Mon Jun 17 10:06:50 1996  Jeffrey A. Law  <law@rtl.cygnus.com>
+
+	* som.h (R_HPPA_BEGIN_TRY, R_HPPA_END_TRY): Define.
+	* som.c (som_write_fixups): Handle R_BEGIN_TRY and R_END_TRY.
+
+Mon Jun 17 12:49:11 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-mips.c (mips_elf_relocate_section): Don't create a reloc
+	for R_MIPS_REL32 and R_MIPS_32 relocs if no dynamic sections were
+	created.
+	(mips_elf_check_relocs): Only create .rel.dyn for R_MIPS_REL32 and
+	R_MIPS_32 relocs if creating a shared library.
+
+Thu Jun 13 20:14:51 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* peicode.h (add_data_entry): Use pei_section_data rather than
+	_cooked_size.  Corresponds to May 13 change in coffcode.h.
+
+Thu Jun 13 10:23:40 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cofflink.c (_bfd_coff_final_link): Handle long section names.
+	* coffcode.h (coff_write_object_contents): If there are long
+	section names, always set the f_symptr field, even if there are no
+	symbols.
+	* peicode.h (coff_swap_filehdr_in): Don't clear the f_symptr field
+	if there are no symbols.
+
+	* coffgen.c (make_a_section_from_file): Check return value of
+	_bfd_coff_read_string_table.
+	(coff_real_object_p): Check return value of
+	make_a_section_from_file.
+	(_bfd_coff_read_string_table): Check that there are some symbols
+	before trying to read the string table size.
+
+Wed Jun 12 11:16:37 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (xcoff_link_add_symbols): When considering whether
+	to replace a symbol in a dynamic object with a symbol from another
+	dynamic object, do the replacement if the existing symbol is
+	global linkage code.
+
+	* xcofflink.c (_bfd_ppc_xcoff_relocate_section): Check explicitly
+	for _ptrgl, and treat it as global linkage code.
+
+	* aoutx.h (NAME(aout,find_nearest_line)): Notice if we find a
+	filename or N_SO symbol past the offset, and use it to indicate
+	that there is no line number or function when appropriate.
+
+Tue Jun 11 15:24:48 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (xcoff_build_ldsyms): Set XCOFF_DEF_REGULAR for a
+	common symbol defined by the linker.  Don't export function code
+	even if export_defineds is set.
+
+Mon Jun 10 11:57:27 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* coff-h8300.c (howto_table): Add new entries for R_BCC_INV
+	and R_JMP_DEL.
+	(rtype2howto): Handle R_BCC_INV and R_JMP_DEL.
+	(h8300_symbol_address_p): New function.
+	(h8300_reloc16_estimate): Eliminate jumps made unnecessary by
+	relaxing.
+
+Sun Jun  9 16:30:20 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* coff-h8300.c (h8300_reloc16_estimate): Fix many minor spacing
+	problems.
+	(h8300_reloc16_estimate, cases R_JMP1, R_JMP2): Adjust "dot"
+	correctly for the two variants.  Allow relaxing if the target
+	is 128 bytes away since after relaxation it'll be 126 bytes away.
+	(h8300_reloc16_estimate, case R_PCRWORD): Correctly adjust
+	"dot" and "value".  Allow relaxing if the target is 128 bytes
+	away since after relaxation it'll be 126 bytes away.
+	* reloc16.c (bfd_coff_reloc16_relax_section): Keep relaxing
+	the given section until nothing changes.
+
+Thu Jun  6 15:24:45 1996  Richard Henderson  <rth@tamu.edu>
+
+	* ecoff.c (_bfd_ecoff_new_section_hook): Remove the _PDATA
+ 	alignment hack--we can get the lnnoptr info another way without
+ 	suddenly increasing the alignment requirements.  Set the flags for
+	the _PDATA section.
+	(ecoff_compute_section_file_positions): Do so.
+
+Thu Jun  6 11:24:37 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c (ieee_write_object_contents): Put a timestamp in the file
+	to keep the HP emulator database happy.
+
+	* config.bfd: Recognize powerpc-*-linux* and powerpcle-*-linux*.
+	From Kevin Buettner <kev@primenet.com>.
+
+Wed Jun  5 15:16:04 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutx.h (translate_to_native_sym_flags): Don't try to print the
+	name of a NULL section.
+
+Tue Jun  4 18:53:58 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* linker.c (_bfd_generic_link_add_one_symbol): If notice_all is
+	set, always call the notice callback.
+
+	* VERSION: Increment for bfdlink.h change.
+
+Mon Jun  3 11:01:53 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-sh.c (COFF_DEFAULT_SECTION_ALIGNMENT_POWER): Set to 4.
+	(sh_relax_delete_bytes): Correct handling of differently sized
+	trailing alignment reloc.
+
+	* bfd-in.h: Use #error if BFD_HOST_64_BIT can not be defined.
+	* bfd-in2.h: Rebuild.
+	* configure.in: Warn if there is no known 64 bit type.
+	* configure: Rebuild.
+
+	* Makefile.in: Rebuild dependencies.
+ 	(BFD32_BACKENDS): Add ppcboot.o.
+	(BFD32_BACKENDS_CFILES): Add ppcboot.c.
+
+	* elf32-mips.c (mips_elf_size_dynamic_sections): Initialize c.
+	From Per Fogelstrom <per.fogelstrom@mailbox200.swipnet.se>.
+
+Sat Jun  1 21:49:58 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf64-mips.c (bfd_mips_elf64_swap_reginfo_in)
+	(bfd_mips_elf64_swap_reginfo_out): Move from here...
+	* elf32-mips.c (bfd_mips_elf64_swap_reginfo_in)
+	(bfd_mips_elf64_swap_reginfo_out): ...to here.
+
+Fri May 31 13:51:28 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf64-mips.c: Improve reloc special_functions and handling of
+	SHT_MIPS_OPTIONS section.
+	* elf32-mips.c (_bfd_mips_elf_hi16_reloc): Rename from
+	mips_elf_hi16_reloc and make globally visible.
+	(_bfd_mips_elf_lo16_reloc): Rename from mips_elf_lo16_reloc and
+	make globally visible.
+	(_bfd_mips_elf_got16_reloc): Rename from mips_elf_got16_reloc and
+	make globally visible.
+	(_bfd_mips_elf_gprel16_reloc): Rename from mips_elf_gprel16_reloc
+	and make globally visible.
+	(gprel16_with_gp): Check howto->src_mask before using value in
+	insn.
+	(_bfd_mips_elf_gprel32_reloc): Rename from mips_elf_gprel32_reloc
+	and make globally visible.
+	(gprel32_with_gp): Check howto->src_mask before fetching value.
+	(bfd_mips_elf_swap_options_in): New function.
+	(bfd_mips_elf_swap_options_out): New function.
+	(_bfd_mips_elf_set_private_flags): Rename from
+	mips_elf_set_private_flags and make globally visible.
+	(_bfd_mips_elf_copy_private_bfd_data): Rename from
+	mips_elf_copy_private_bfd_data and make globally visible.
+	(_bfd_mips_elf_merge_private_bfd_data): Rename from
+	mips_elf_merge_private_bfd_data and make globally visible.
+	(_bfd_mips_elf_section_from_shdr): Accept .MIPS.options as a name
+	for a SHT_MIPS_OPTIONS section.
+	(mips_elf32_section_from_shdr): Handle SHT_MIPS_OPTIONS section.
+	(_bfd_mips_elf_fake_sections): Consider .MIPS.options to be the
+	name of a SHT_MIPS_OPTIONS section.
+	(_bfd_mips_elf_set_section_contents): New function.
+	(mips_elf32_section_processing): Set the GP value in a
+	SHT_MIPS_OPTIONS section.
+	(_bfd_mips_elf_find_nearest_line): Rename from
+	mips_elf_find_nearest_line and make globally visible.
+	(bfd_elf32_set_section_contents): Define.
+	* elf-bfd.h (_bfd_mips_elf_hi16_reloc): Declare.
+	(_bfd_mips_elf_lo16_reloc): Declare.
+	(_bfd_mips_elf_gprel16_reloc): Declare.
+	(_bfd_mips_elf_got16_reloc): Declare.
+	(_bfd_mips_elf_gprel32_reloc): Declare.
+	(_bfd_mips_elf_set_private_flags): Declare.
+	(_bfd_mips_elf_copy_private_bfd_data): Declare.
+	(_bfd_mips_elf_merge_private_bfd_data): Declare.
+	(_bfd_mips_elf_find_nearest_line): Declare.
+	(_bfd_mips_elf_set_section_contents): Declare.
+
+	* elf32-hppa.c (elf32_hppa_info_to_howto): Rename from
+	elf_info_to_howto.
+	(elf_info_to_howto): Define.
+	* elf32-sparc.c (elf32_sparc_info_to_howto): Rename from
+	elf_info_to_howto.
+	(elf_info_to_howto): Define.
+	* elf64-sparc.c (sparc64_elf_info_to_howto): Rename from
+	elf_info_to_howto.
+	(elf_info_to_howto): Define.
+
+	* coff-w65.c (h8300_reloc16_estimate): Rename R_MOVB[12] to
+	R_MOV16B[12], to match change in coff/internal.h.
+
+Thu May 30 12:38:49 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf64-mips.c: Extensive additions to provide better support for
+	writing files and for gas.
+	* elf32-mips.c (_bfd_mips_elf_object_p): New function, broken out
+	of mips_elf_object_p.
+	(mips_elf32_object_p): Rename from mips_elf_object_p; call
+	_bfd_mips_elf_object_p.
+	(_bfd_mips_elf_final_write_processing): Rename from
+	mips_elf_final_write_processing and make globally visible.
+	(_bfd_mips_elf_fake_sections): Rename from
+	mips_elf_fake_sections and make globally visible.
+	(_bfd_mips_elf_section_from_bfd_section): Rename from
+	mips_elf_section_from_bfd_section and make globally visible.
+	(_bfd_mips_elf_section_processing): New function, broken out of
+	mips_elf_section_processing.
+	(mips_elf32_section_processing): Rename from
+	mips_elf_section_processing; call
+	_bfd_mips_elf_section_processing.
+	(_bfd_mips_elf_symbol_processing): Rename from
+	mips_elf_symbol_processing and make globally visible.
+	(_bfd_mips_elf_read_ecoff_info): Rename from
+	mips_elf_read_ecoff_info and make globally visible.
+	(mips_elf32_ecoff_debug_swap): Rename from
+	mips_elf_ecoff_debug_swap.
+	* elf.c (_bfd_elf_symbol_from_bfd_symbol): Use asymbol rather than
+	struct symbol_cache_entry.
+	(_bfd_elf_validate_reloc): New function, moved in from
+	elfcode.h:validate_reloc.
+	* elfcode.h (validate_reloc): Remove; moved into elf.c and renamed
+	to _bfd_elf_validate_reloc.  Change all callers.
+	* elf-bfd.h (bfd_section_from_shdr): Declare.
+	(_bfd_elf_symbol_from_bfd_symbol): Declare.
+	(_bfd_elf_validate_reloc): Declare.
+	(_bfd_mips_elf_object_p): Declare.
+	(_bfd_mips_elf_fake_sections): Declare.
+	(_bfd_mips_elf_section_from_bfd_section): Declare.
+	(_bfd_mips_elf_section_processing): Declare.
+	(_bfd_mips_elf_symbol_processing): Declare.
+	(_bfd_mips_elf_read_ecoff_info): Declare.
+	(_bfd_mips_elf_final_write_processing): Declare.
+	* elfxx-target.h (bfd_elfNN_get_reloc_upper_bound): Don't define
+	if already defined.
+
+	* elf32-mips.c (mips_elf_object_p): Handle E_MIPS_ARCH_4.
+	(mips_elf_final_write_processing): Likewise.
+
+Wed May 29 16:15:29 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	64-bit MIPS ELF ABI objdump support:
+	* elf64-mips.c: New file.
+	* Makefile.in: Rebuild dependencies.
+ 	(BFD64_BACKENDS): Add elf64-mips.o.
+	(BFD64_BACKENDS_CFILES): Add elf64-mips.c.
+	* config.bfd (mips*el-*-elf*) Add bfd_elf64_bigmips_vec and
+	bfd_elf64_littlemips_vec to targ_selvecs.
+	(mips*-*-elf*): Likewise.
+	* configure.in: Add bfd_elf64_bigmips_vec and
+	bfd_elf64_littlemips_vec to vector switch.
+	* configure: Rebuild.
+	* elf32-mips.c (_bfd_mips_elf_section_from_shdr): New function,
+	broken out of mips_elf_section_from_shdr.
+	(mips_elf32_section_from_shdr): Rename from
+	mips_elf_section_from_shdr.  Call new function.
+	(elf_backend_section_from_shdr): Update name of renamed function.
+	* elf-bfd.h (struct elf_size_info): Change second parameter of
+	write_out_phdrs to be const.  Likewise for second parameter of
+	swap_symbol_out.
+	(struct bfd_elf_section_data): Add rel_hdr2 field.
+	(bfd_elf32_swap_symbol_in): Change second parameter to be const.
+	(bfd_elf32_swap_symbol_out): Likewise.
+	(bfd_elf32_swap_reloc_in): Likewise.
+	(bfd_elf32_swap_reloc_out): Likewise.
+	(bfd_elf32_swap_reloca_in): Likewise.
+	(bfd_elf32_swap_reloca_out): Likewise.
+	(bfd_elf32_swap_phdr_in): Likewise.
+	(bfd_elf32_swap_phdr_out): Likewise.
+	(bfd_elf32_swap_dyn_in): Likewise.
+	(bfd_elf32_swap_dyn_out): Likewise.
+	(bfd_elf32_slurp_symbol_table): Declare.
+	(bfd_elf32_write_shdrs_and_ehdr): Declare.
+	(bfd_elf32_write_out_phdrs): Declare.
+	(bfd_elf64_swap_symbol_in): Change second parameter to be const.
+	(bfd_elf64_swap_symbol_out): Likewise.
+	(bfd_elf64_swap_reloc_in): Likewise.
+	(bfd_elf64_swap_reloc_out): Likewise.
+	(bfd_elf64_swap_reloca_in): Likewise.
+	(bfd_elf64_swap_reloca_out): Likewise.
+	(bfd_elf64_swap_phdr_in): Likewise.
+	(bfd_elf64_swap_phdr_out): Likewise.
+	(bfd_elf64_swap_dyn_in): Likewise.
+	(bfd_elf64_swap_dyn_out): Likewise.
+	(bfd_elf64_slurp_symbol_table): Declare.
+	(bfd_elf64_write_shdrs_and_ehdr): Declare.
+	(bfd_elf64_write_out_phdrs): Declare.
+	(_bfd_mips_elf_section_from_shdr): Declare.
+	* elf.c (bfd_section_from_shdr): Remove assertion requiring
+	SHT_REL/SHT_RELA to match use_rela_p.  If there is already a reloc
+	section for the section, add the new one to rel_hdr2.  Increment
+	reloc_count rather than setting it.
+	* elfcode.h (elf_slurp_symbol_table): Define name as macro.
+	Remove static declaration.
+	(elf_write_shdrs_and_ehdr): Define name as macro.
+	(elf_write_out_phdrs): Likewise.
+	(elf_swap_ehdr_in, elf_swap_ehdr_out): Declare.
+	(elf_swap_shdr_in, elf_swap_shdr_out): Declare.
+	(elf_swap_symbol_in): Change second parameter to be const.
+	(elf_swap_symbol_out): Likewise.
+	(elf_swap_ehdr_in, elf_swap_ehdr_out): Likewise.
+	(elf_swap_shdr_in, elf_swap_shdr_out): Likewise.
+	(elf_swap_phdr_in, elf_swap_phdr_out): Likewise.
+	(elf_swap_reloc_in, elf_swap_reloc_out): Likewise.
+	(elf_swap_reloca_in, elf_swap_reloca_out): Likewise.
+	(elf_write_out_phdrs): Rename from write_out_phdrs.  Change second
+	parameter to be const.  Make non-static.
+	(elf_write_shdrs_and_ehdr): Rename from write_shdrs_and_ehdr.
+	Make non-static.
+	(elf_slurp_symbol_table): Make non-static.
+	(NAME(_bfd_elf,size_info)): Update names of renamed functions.
+	* elfxx-target.h (elf_info_to_howto): Define if not defined.
+	(elf_backend_size_info): Likewise.
+	(elfNN_bed): Use elf_backend_size_info.
+	* targets.c (bfd_elf64_bigmips_vec): Declare.
+	(bfd_elf64_littlemips_vec): Declare.
+	(bfd_target_vector): Add bfd_elf64_bigmips_vec and
+	bfd_elf64_littlemips_vec if BFD64 is defined.
+
+	* libbfd.c (bfd_get_file_window): Add cast to fprintf argument.
+
+Tue May 28 11:42:08 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-sh.c (sh_relax_delete_bytes): Insert nop instructions, not
+	zeroes, in alignment holes.
+
+	* configure: Rebuild with autoconf 2.10.
+
+	* aoutx.h (NAME(aout,find_nearest_line)): Make room for the
+	potential leading underscore in the allocated buffer.
+
+Fri May 24 14:28:38 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_add_symbol_hook): Do not put small common
+	symbols into .sbss if this is a relocatable link.
+
+Thu May 23 12:26:24 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (_bfd_ppc_xcoff_relocate_section): Warn about
+	undefined symbols when creating a shared library.
+
+Fri May 17 13:54:15 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-sh.c: Add a bunch of new code and static const arrays to
+	support aligning loads and stores on four byte memory boundaries.
+	Also:
+	(sh_coff_howtos): Add entries for R_SH_CODE, R_SH_DATA and
+	R_SH_LABEL.
+	(sh_relax_section): Look for R_SH_CODE relocs.  If we find one,
+	call sh_align_loads.
+	(sh_relax_delete_bytes): Don't mark R_SH_CODE or R_SH_DATA relocs
+	as unused.
+
+Thu May 16 16:34:13 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cache.c (bfd_open_file): Unlink the file before opening it for
+	write.  From Marty Leisner <leisner@sdsp.mc.xerox.com>.
+
+	* opncls.c (bfd_fdopenr): Set opened_once.
+
+Tue May 14 12:35:32 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* som.c (som_slurp_reloc_table): Clear external_relocs cache after
+	freeing it.
+
+	* libbfd.c: Remove #ifdef FILE_OFFSET_IS_CHAR_INDEX, and compile
+	the code unconditionally.
+
+Mon May 13 19:51:37 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libcoff-in.h (struct pei_section_tdata): Define structure.
+	(pei_section_data): Define macro.
+	* libcoff.h: Rebuild.
+	* coffcode.h (coff_set_alignment_hook): If COFF_IMAGE_WITH_PE,
+	store s_paddr field in pei_section_data.
+	(coff_compute_section_file_positions): Use pei_section_data rather
+	than _cooked_size, and don't overwrite an existing value.
+	(coff_write_object_contents): If COFF_OBJ_WITH_PE, set s_paddr to
+	0.  If COFF_IMAGE_WITH_PE, set s_paddr to pei_section_data.
+	* peicode.h (coff_bfd_copy_private_section_data): Define if
+	COFF_IMAGE_WITH_PE.
+ 	(pe_bfd_copy_private_section_data): New static function if
+	COFF_IMAGE_WITH_PE.
+
+Wed May  8 16:10:38 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* srec.c (srec_set_arch_mach): Write as a function rather than a
+	macro definition.
+
+	* xcofflink.c (_bfd_xcoff_bfd_link_add_symbols): If an archive has
+	no map, just check each member in turn to see whether it is
+	required.
+
+Wed May  8 09:17:34 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* ppcboot.c (ppcboot_object_p): Check for type 0x41 in partition
+	table.  Call BFD_ASSERT to validate header size, instead of
+	calling fatal.
+	(ppcboot_bfd_print_private_bfd_data): Put quotes around partition
+	name.
+
+Tue May  7 16:10:19 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* ppcboot.c: New target for looking at PPCbug boot records.
+
+	* config{ure.in,.bfd}: Add support for ppcboot target.
+	* targets.c: Ditto.
+	* configure: Regenerate.
+
+Tue May  7 11:15:19 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* coff-h8300.c (howto_table): Update names to match recent
+	changes to include/coff/internal.h.  Fix minor errors in the
+	existing relocs.  Add R_MOVL1 and R_MOVL2.
+	(rtype2howto): Similarly.
+	(h8300_reloc16_estimate): Rewrite to simplify, fix bugs in the
+	existing relaxing code  and peform more relaxing.
+	(h8300_reloc16_extra_cases): Likewise.
+
+Mon May  6 18:24:09 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* reloc16.c (bfd_coff_reloc16_get_value): Handle common
+	symbols correctly.
+
+Sat May  4 05:08:45 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* elfcode.h (elf_object_p):  Reject generic ELF target if
+	e_machine matches an alternate machine code in a specific backend.
+
+	* netbsd-core.c (netbsd_core_vec):  Remove initializer for
+	obsolete align_power_min field.
+
+Fri May  3 13:07:35 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* coff-h8300.c (reloc_howto_type): Add howto entry for
+	R_PCRWORD_B.
+	(rtype2howto): Handle R_PCRWORD_B.
+	(h8300_reloc16_extra_cases): Handle R_PCRWORD_B.
+	(h8300_reloc_16_estimate): Likewise.  Try to turn a 16bit
+	pc-relative branch (R_PCRWORD) into an 8bit pc-relative
+	branch (R_PCWORD_B).
+
+Fri May  3 10:47:41 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutx.h (translate_from_native_sym_flags): Set the section for
+	BSF_CONSTRUCTOR symbols.
+
+	* cofflink.c (_bfd_coff_link_input_bfd): Correct setting of
+	last_bf_index.
+
+Wed May  1 18:39:32 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* coffcode.h (coff_write_object_contents): In comdat section lookup,
+	stop looking when section is found.
+
+Wed May  1 14:17:57 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffcode.h (STRING_SIZE_SIZE): Define.
+	(styp_to_sec_flags): Handle long symbol names when looking for the
+	section symbol.
+	(bfd_coff_backend_data): Add _bfd_coff_long_section_names field.
+	(bfd_coff_long_section_names): Define.
+	(coff_write_object_contents): Handle long section names.
+	(bfd_coff_std_swap_table): Initialize new field.
+	* libcoff.h: Rebuild.
+	* coffgen.c (make_a_section_from_file): Handle long section
+	names.
+	(coff_write_symbols): Handle long section names.
+	* coff-alpha.c (alpha_ecoff_backend_data): Initialize new field.
+	* coff-mips.c (mips_ecoff_backend_data): Likewise.
+	* pe-arm.c (COFF_LONG_SECTION_NAMES): Define.
+	* pei-arm.c (COFF_LONG_SECTION_NAMES): Define.
+	* pe-i386.c (COFF_LONG_SECTION_NAMES): Define.
+	* pei-i386.c (COFF_LONG_SECTION_NAMES): Define.
+	* pe-ppc.c (COFF_LONG_SECTION_NAMES): Define.
+	* pei-ppc.c (COFF_LONG_SECTION_NAMES): Define.
+
+	* bout.c (b_out_callback): Set lma of sections.
+	(b_out_bfd_get_relocated_section_contents): Rename in_abfd
+	parameter to output_bfd.  Used input_bfd instead of output_bfd in
+	several places.
+
+Tue Apr 30 17:56:39 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutx.h (translate_from_native_sym_flags): Don't create
+	SEC_CONSTRUCTOR sections.
+	* ecoff.c (ecoff_set_symbol_info): Likewise.
+
+	* elf32-mips.c (mips_elf_copy_private_bfd_data): Copy elf_gp.
+	From Don Bowman <bowman@waterloo.hp.com>.
+
+Tue Apr 30 17:06:32 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* coff-arm.c (armcoff_little_vec): If COFF_WITH_PE is defined, add
+	SEC_LINK_ONCE and SEC_LINK_DUPLICATES to section_flags.
+
+Mon Apr 29 13:15:17 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-mips.c (struct mips_elf_link_hash_entry): Add
+	mips_32_relocs field.
+	(mips_elf_link_hash_newfunc): Initialize mips_32_relocs field.
+	(mips_elf_relocate_section): Copy R_MIPS_REL32 and R_MIPS_32
+	relocs against a global symbol which is not defined in a regular
+	file.
+	(mips_elf_check_relocs): For a R_MIPS_REL32 or R_MIPS_32 reloc
+	against a global symbol, increment mips_32_relocs.
+	(mips_elf_adjust_dynamic_symbol): If mips_32_relocs is set, and
+	the symbol is not defined in a regular file, make room in the
+	.rel.dyn section.
+
+Fri Apr 26 18:00:37 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ecoff.c (ecoff_compute_section_file_positions): Track the real
+	file position and the virtual file position separately.  Set
+	filepos information bsaed on the real file position.
+	(_bfd_ecoff_set_section_contents): Handle .lib sections like the
+	Jan 23 change to coffcode.h.
+
+	* som.c (som_slurp_symbol_table): Set the symbol count to the
+	number of BFD symbols created.
+
+Fri Apr 26 12:34:29 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Forward relocations to the
+	output file if linking shared objects.  Loop to check all relocs,
+	rather than returning false on first error.
+
+Thu Apr 25 13:25:12 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_create_linker_section): Add PLT case.
+	(ppc_elf_additional_program_headers): If .interp section, bump #
+	of program headers by 1.
+	(ppc_elf_adjust_dynamic_symbol): Flesh out support.
+	(ppc_elf_size_dynamic_sections): Add support for .plt section.
+	(ppc_elf_check_relocs): Print out filename in debug code.  Enable
+	PLT support.
+	(ppc_elf_finish_dynamic_symbol): Add support for PLT's, beef up
+	debug output.
+	(ppc_elf_relocate_section): If the output section isn't defined,
+	don't abort, just give an error message.
+
+	* elflink.c (_bfd_elf_create_dynamic_sections): If the section
+	being created is .sdata or .sdata2, don't make the symbol dynamic.
+
+Wed Apr 24 14:04:07 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (_bfd_xcoff_bfd_link_add_symbols): Look through the
+	members of an archive for dynamic objects with no symbols, and
+	pass them directly to check_archive_element.
+	(xcoff_link_check_ar_symbols): Pass dynamic objects to
+	xcoff_link_check_dynamic_ar_symbols.
+	(xcoff_link_check_dynamic_ar_symbols): New static function.
+
+	* coff-rs6000.c (rs6000coff_vec): Change BFD_JUMP_TABLE_DYNAMIC
+	from _bfd_nodynamic to _bfd_xcoff.
+	* libcoff-in.h (_bfd_xcoff_get_dynamic_symtab_upper_bound):
+	Declare.
+	(_bfd_xcoff_canonicalize_dynamic_symtab): Declare.
+	(_bfd_xcoff_get_dynamic_reloc_upper_bound): Declare.
+	(_bfd_xcoff_canonicalize_dynamic_reloc): Declare.
+	* libcoff.h: Rebuild.
+	* xcofflink.c (xcoff_swap_ldrel_in): New static function.
+	(xcoff_get_section_contents): New static function.
+	(_bfd_xcoff_get_dynamic_symtab_upper_bound): New function.
+	(_bfd_xcoff_canonicalize_dynamic_symtab): New function.
+	(_bfd_xcoff_get_dynamic_reloc_upper_bound): New function.
+	(xcoff_dynamic_reloc): New static variable.
+	(_bfd_xcoff_canonicalize_dynamic_reloc): New function.
+	(xcoff_link_add_dynamic_symbols): Use xcoff_get_section_contents.
+
+Tue Apr 23 12:48:42 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-sparc.c (bfd_coff_generic_reloc): Return bfd_reloc_ok even
+	if reloc_entry->addend is not 0.
+	(CALC_ADDEND): Just set the addend to reloc.r_offset.
+
+Mon Apr 22 18:29:01 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* elf32-sparc.c (_bfd_sparc_elf_howto_table): Fix spelling of
+	R_SPARC_GLOB_JMP.
+	* elf64-sparc.c (sparc64_elf_howto_table): Likewise.
+	Add entries for R_SPARC_[56].
+	(sparc_reloc_map): Add entries for R_SPARC_[56].
+
+Mon Apr 22 15:07:24 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	Optimize linking of stabs in sections as used in ELF and COFF.
+	* stabs.c: New file.
+	* libbfd-in.h (_bfd_link_section_stabs): Declare.
+	(_bfd_write_section_stabs): Declare.
+	(_bfd_write_stab_strings): Declare.
+	* libbfd.h: Rebuild.
+	* libcoff-in.h (struct coff_section_tdata): Add stab_info field.
+	(struct coff_link_hash_table): Add stab_info field.
+	* libcoff.h: Rebuild.
+	* cofflink.c (_bfd_coff_link_hash_table_init): Initialize
+	stab_info field.
+	(coff_link_add_symbols): Call _bfd_link_section_stabs if
+	appropriate.
+	(_bfd_coff_final_link): Write out stab strings hash table.
+	(_bfd_coff_link_input_bfd): Handle optimized stabs sections.
+	* coff-ppc.c (ppc_bfd_coff_final_link): Write out stab strings
+	hash table.
+	* elf-bfd.h (struct elf_link_hash_table): Add stab_info field.
+	(struct bfd_elf_section_data): Add stab_info field.
+	* elf.c (_bfd_elf_link_hash_table_init): Initialize stab_info
+	field.
+	* elflink.h (elf_link_add_object_symbols): If appropriate, call
+	_bfd_link_section_stabs.
+	(elf_bfd_final_link): Write out stab strings hash table.
+	(elf_link_input_bfd): Handle optimized stabs sections.
+	* reloc.c (_bfd_final_link_relocate): Check address against
+	_raw_size rather than _cooked_size.
+	* Makefile.in: Rebuild dependencies.
+	(BFD_LIBS): Add stabs.o
+	(BFD_LIBS_CFILES): Add stabs.c.
+
+	* VERSION: Increment for bfdlink.h change.
+
+	* coffgen.c (coff_renumber_symbols): Correct handling of
+	BSF_NOT_AT_END common symbols.
+
+Fri Apr 19 19:21:56 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-ppc.c (record_toc): Add cast to avoid warning.
+	(ppc_allocate_toc_section): Likewise.
+	(coff_ppc_relocate_section): Remove ANSI C string concatenation.
+	(ppc_coff_reloc_type_lookup): Remove unreached code.
+	* coffcode.h (coff_write_object_contents): Don't take the address
+	of an array.
+	* peicode.h (pe_print_idata): Add casts to avoid warning.
+	(pe_print_edata): Likewise.
+	(pe_print_reloc): Remove ANSI C string concatenation.
+
+Thu Apr 18 18:51:18 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libcoff-in.h (struct coff_final_link_info): Add last_bf_index
+	and last_bf fields.
+	* libcoff.h: Rebuild.
+	* coffswap.h (coff_swap_aux_in): Swap endndx field for C_FCN
+	symbols.
+	(coff_swap_aux_out): Likewise.
+	* peicode.h (coff_swap_aux_in): Likewise.
+	(coff_swap_aux_out): Likewise.
+	* coffgen.c (coff_pointerize_aux): Check endndx field for C_FCN
+	symbols.
+	* cofflink.c (_bfd_coff_final_link): Initialize last_bf_index
+	field.
+	(_bfd_coff_link_input_bfd): Check endndx field for C_FCN symbols.
+	Fix up .bf endndx link fields.
+	* coff-ppc.c (ppc_bfd_coff_final_link): Initialize last_bf_index
+	field.
+	* xcofflink.c (xcoff_link_input_bfd): Check endndx field for C_FCN
+	symbols.
+
+Wed Apr 17 12:08:24 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* pe{,i}-ppc.c (PPC_PE): Define instead of PPC, so that compiling
+	on Solaris PowerPC systems doesn't get confused.
+
+	* coffcode.h (coff_write_object_contents): Use #ifdef PPC_PE, not
+	#ifdef PPC.
+
+	* elfcore.h (bfd_prstatus, bfd_fpregset): Add thread argument.
+	(elf_corefile_note): If HAVE_SYS_PROCFS_H is not defined, don't
+	update did_reg and did_reg2.
+
+Wed Apr 17 13:07:37 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (xcoff_link_input_bfd): Check for TOC overflow.
+
+	* linker.c (_bfd_generic_link_add_one_symbol): When calling the
+	callback routines, pass h->root.string rather than name, in case
+	copy is true and name is transient.
+
+Tue Apr 16 16:36:38 1996  Stu Grossman  (grossman@lisa.cygnus.com)
+
+	* elfcore.h:  Add support for core files with multiple threads.
+	(Primarily for Solaris.)
+
+Tue Apr 16 13:44:08 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutx.h (NAME(aout,squirt_out_relocs)): Don't do anything if
+	section->orelocation is NULL.
+
+	* coffgen.c (bfd_coff_get_syment): New function.
+	(bfd_coff_get_auxent): New function.
+	* bfd-in.h (bfd_coff_get_syment): Declare.
+	(bfd_coff_get_auxent): Declare.
+	* bfd-in2.h: Rebuild.
+
+Mon Apr 15 19:06:59 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-mips.c (struct mips_hi16): Define.
+	(mips_hi16_addr, mips_hi16_addend): Remove.
+	(mips_hi16_list): New static variable.
+	(mips_elf_hi16_reloc): Maintain a list of unmatched HI16 relocs.
+	(mips_elf_lo16_reloc): Process mips_hi16_list.
+	(mips_elf_relocate_section): Permit an arbitrary number of HI16
+	relocs before the associated LO16 reloc.
+
+Wed Apr 10 00:23:53 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* versados.c (versados_scan): Check bfd_alloc return value.
+	(versados_object_p): Check all bfd_read return values.  Require
+	that lang field be less than 10, to avoid confusion with Intel Hex
+	files.
+
+	* libaout.h (WRITE_HEADERS): Write out the relocs even if there
+	aren't any symbols.
+	* aoutx.h (NAME(aout,swap_std_reloc_out)): Set r_index to N_ABS,
+	not 0, for an absolute symbol.
+	(NAME(aout,swap_ext_reloc_out)): Likewise.
+
+	* ihex.c (ihex_scan): Accept a length of 4 for record type 5.
+	(ihex_write_object_contents): For a large start address, output
+	the full 32 bit address in record type 5.
+
+	* ieee.c (ieee_write_byte): Change second parameter from bfd_byte
+	to int to avoid promotion problems in prototype.
+
+Tue Apr  9 11:44:21 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.host: Use ${srcdir} when looking for picfrag.
+
+	* configure.host: Switch on ${libdir}, not $(libdir).  From
+	alan@spri.levels.unisa.edu.au (Alan Modra).
+
+	* aoutx.h (aout_link_add_symbols): Always call add_dynamic_symbols
+	entry point, not just for DYNAMIC objects.
+	* sunos.c (sunos_add_dynamic_symbols): Always call
+	sunos_create_dynamic_sections.  If called with a non DYNAMIC
+	object, don't do anything else.
+	(sunos_add_one_symbol): Don't call sunos_create_dynamic_sections.
+
+Mon Apr  8 12:09:36 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Permit --enable-shared to specify a list of
+	directories.
+	* configure: Rebuild.
+
+	* configure.host: Set HLDFLAGS and SHLIB_CFLAGS for *-dec-osf*
+	host when configuring with --enable-shard.
+
+Fri Apr  5 12:24:13 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.bfd: Add i[345]86-*-freebsdelf* target; from John Polstra
+	<jdp@polstra.com>.
+
+	* linker.c (link_action): For WARN_ROW/warn, use MWARN, not CYCLE,
+	to avoid crashing in bfd_hash_replace.
+
+	* sysdep.h: Use #ifdef, not #if.
+
+Thu Apr  4 23:32:23 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.in: Rebuild.
+
+Thu Apr  4 18:49:09 1996  Fred Fish  <fnf@cygnus.com>
+
+	* configure.in (mips-sony-bsd*): Fix typo in AC_DEFINE.
+	(AC_CHECK_HEADERS): Check for sys/time.h
+	(AC_HEADER_TIME): Add macro.
+	* configure: Rebuild.
+	* sysdep.h: Use TIME_WITH_SYS_TIME and HAVE_SYS_TIME_H
+	to control what combination of <time> and <sys/time.h>
+	get included.
+
+Tue Apr  2 13:11:53 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* aoutf1.h (sunos_32_set_arch_mach): Handle M_SPARCLET.
+	(aout_32_sunos4_write_object_contents): Likewise.
+	* aoutx.h (NAME(aout,machine_type)): Handle
+	bfd_mach_sparc_{sparclet,sparclite}.
+	* archures.c (bfd_mach_sparc_{sparclet,sparclite}): Define.
+	(bfd_mach_sparc_v9_p): Update.
+	* cpu-sparc.c (arch_info_struct): Add entries for sparclet,sparclite.
+	* libaout.h (enum machine_type): Add M_SPARCLET.
+	* sunos.c (MACHTYPE_OK): Define.
+	* bfd-in2.h: Regenerated.
+
+Tue Apr  2 00:33:18 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf-bfd.h (struct elf_link_hash_table): Add hgot field.
+	* elf.c (_bfd_elf_link_hash_table_init): Initialize hgot field.
+	* elflink.c (_bfd_elf_create_got_section): Store the
+	_GLOBAL_OFFSET_TABLE_ hash table entry in the hgot field.
+	* elf32-sparc.c (elf32_sparc_check_relocs): If the size of the
+	global offset table goes over 0x1000, set the value of
+	_GLOBAL_OFFSET_TABLE_ to 0x1000 into the section.
+	(elf32_sparc_relocate_section): Subtract the offset of
+	_GLOBAL_OFFSET_TABLE_ when handling GOT relocations.
+
+	* elfcode.h: Don't include <string.h>.
+
+Mon Apr  1 10:39:24 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* linker.c (_bfd_generic_link_hash_newfunc): Renamed from
+	generic_link_hash_newfunc.  All references changed.
+	* genlink.h (_bfd_generic_link_hash_newfunc): Declaration
+	moved here from libbfd-in.h.
+	* libbfd-in.h: Corresponding changes.
+	* libbfd.h: Regenerated.
+
+Mon Apr  1 12:35:36 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutx.h (aout_link_input_section_std): When reporting an
+	overflow error, use the name of the symbol in the hash table if
+	available.
+	(aout_link_input_section_ext): Likewise.
+
+	* elflink.h (elf_adjust_dynamic_symbol): If a common symbol got
+	defined in a regular file, set ELF_LINK_HASH_DEF_REGULAR.
+
+Sun Mar 31 01:58:41 1996  steve chamberlain  <sac@slash.cygnus.com>
+
+	* peicode.h (coff_swap_aouthdr_out): Delete test for .junk.
+	* coffcode.h (coff_compute_section_file_positions): Likewise.
+	(coff_write_object_contents): Likewise.
+
+Fri Mar 29 12:44:36 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* section.c (SEC_LINK_ONCE): Define.
+	(SEC_LINK_DUPLICATES): Define.
+	(SEC_LINK_DUPLICATES_DISCARD): Define.
+	(SEC_LINK_DUPLICATES_ONE_ONLY): Define.
+	(SEC_LINK_DUPLICATES_SAME_SIZE): Define.
+	(SEC_LINK_DUPLICATES_SAME_CONTENTS): Define.
+	* bfd-in2.h: Rebuild.
+	* coffcode.h (sec_to_styp_flags): If COFF_WITH_PE, turn
+	SEC_LINK_ONCE into IMAGE_SCN_LNK_COMDAT.
+	(styp_to_sec_flags): If COFF_WITH_PE, turn IMAGE_SCN_LNK_REMOVE
+	into SEC_EXCLUDE.  If IMAGE_SCN_LNK_COMDAT is set, set
+	SEC_LINK_ONCE, and look through the symbol table for the setting
+	for SEC_LINK_DUPLICATES.
+	(coff_write_object_contents): If COFF_WITH_PE, if SEC_LINK_ONCE is
+	set for a section, find the section symbol in the symbol table,
+	and set the aux entry based on SEC_LINK_DUPLICATES.
+	* coffgen.c (coff_print_symbol): Add a space before "checksum".
+	* coff-arm.c (armcoff_big_vec): If COFF_WITH_PE is defined, add
+	SEC_LINK_ONCE and SEC_LINK_DUPLICATES to section_flags.
+	* coff-i386.c (i386coff_vec): Likewise.
+	* coff-ppc.c (TARGET_LITTLE_SYM, TARGET_BIG_SYM): Likewise.
+
+	* VERSION: Bump to 2.6.1.
+	* Makefile.in (stamp-h): Depend upon VERSION.
+
+Thu Mar 28 23:48:49 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* libbfd-in.h (generic_link_hash_newfunc): Add declaration.
+	* libbfd.h: Rebuilt.
+	* linker.c (generic_link_hash_newfunc): No longer static.
+	* coffcode.h (coff_bfd_link_hash_create): Allow specific targets
+	to override.
+	* coff-h8300.c: Add two derived hash tables and their associated
+	funtions and #defines for use by the h8300 linker.
+	(h8300_reloc16_extra_cases, case R_MEM_INDIRECT): Create entries in
+	the function vector as needed.  Place the address of the function
+	vector entry in the location specified by the R_MEM_INDIRECT reloc.
+	Rewrite the vectors section contents as necessary.
+	(h8300_bfd_link_add_symbols): New function for the h8300 linker.
+	(coff_bfd_link_add_symbols): Define to use h8300 specific version.
+	(coff_bfd_link_hash_table_create): Likewise.
+
+Thu Mar 28 17:44:08 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libhppa.h: If gcc 2.7 or higher, declare all the functions with
+	__attribute__ ((__unused__)) so that -Wall doesn't warn about
+	them.
+	(hppa_rebuild_insn): Pass pointer to correct type to
+	low_sign_unext and dis_assemble_21.
+
+Thu Mar 28 11:00:36 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* config.bfd (sparc64-{sysv4*,solaris2*}): Delete.
+	Stick with sparc-*-{sysv4*,solaris2*}.
+
+Wed Mar 27 10:43:34 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* peicode.h (coff_swap_aux_in): Swap in extra PE x_scn fields.
+	(coff_swap_aux_out): Swap out extra PE x_scn fields.
+	* coffswap.h (coff_swap_aux_in): Zero out extra PE x_scn fields.
+	* coffgen.c (coff_print_symbol): If any of the extra PE x_scn
+	fields is non-zero, print them.
+
+	* coff-ppc.c (ppc_record_toc_entry): Put inside COFF_IMAGE_WITH_PE
+	ifdef.  Remove unused variables.
+	(ppc_record_data_in_toc_entry): Ifdef out.  Removed unused
+	variables.
+	(ppc_mark_symbol_as_glue): Put inside COFF_IMAGE_WITH_PE ifdef.
+	(get_symbol_value): Ifdef out.
+	(pe_ppc_reloc): Ifdef out.  Remove unused variables.
+	(coff_ppc_relocate_section): Remove unused variables.  Make
+	fprintf strings and argument types correspond.  Put before_addr in
+	DEBUG_RELOC ifdef.
+	(dump_toc): Make fprintf strings and argument types correspond.
+	(ppc_process_before_allocation): Remove unused variables.  Always
+	return a value.
+	(ppc_reflo_reloc): Ifdef out.
+	(ppc_addr32nb_reloc): Ifdef out.
+	(ppc_coff_rtype2howto): Make fprintf strings and argument types
+	correspond.
+	(coff_ppc_rtype_to_howto): Likewise.
+	(ppc_coff_swap_sym_in_hook): Remove unused variables.
+
+	* peicode.h (pe_print_idata): Move otherwise unused variables into
+	the #ifdef where they are used.  Always return a value.
+	(pe_print_edata): Make fprintf strings and argument types
+	correspond.  Always return a value.
+	(pe_print_pdata): Removed unused variable addr_value.  Always
+	return a value.
+	(pe_print_reloc): Remove unused variable onaline.  Make fprintf
+	strings and argument types correspond.  Always return a value.
+
+	* elf32-ppc.c (ppc_elf_fake_sections): Return true.
+	(ppc_elf_finish_dynamic_symbol): Move definition of unused
+	variable rela inside #if 0 section where it is used.
+
+	* ns32k.h: New file.
+	* cpu-ns32k.h: Include ns32k.h.  Rename externally visible
+	functions to start with _bfd_.
+	* aout-ns32k.c: Include ns32k.h.  Change references to renamed
+	functions in cpu-ns32k.h.
+	* Makefile.in: Rebuild dependencies.
+	(HFILES): Add ns32k.h.
+
+	* section.c (struct sec): Add linker_mark field.  Change
+	user_set_vma and reloc_done to be single bit fields.
+	(STD_SECTION): Update accordingly.
+	* bfd-in2.h: Rebuild.
+	* aoutx.h (NAME(aout,final_link)): Mark sections included in the
+	link.
+	(aout_link_input_bfd): Don't link unmarked sections.
+	* cofflink.c (_bfd_coff_final_link): Mark sections included in the
+	link.
+	(_bfd_coff_link_input_bfd): Don't link unmarked sections.
+	* coff-ppc.c (ppc_bfd_coff_final_link): Mark sections included in
+	the link.
+	* elflink.h (elf_bfd_final_link): Mark sections included in the
+	link.
+	(elf_link_input_bfd): Don't link unmarked sections.
+	* xcofflink.c (_bfd_xcoff_bfd_final_link): Mark sections included
+	in the link.
+	(xcoff_link_input_bfd): Don't link unmarked sections.
+
+	* coffswap.h (coff_swap_scnhdr_out): Include section name in
+	overflow error messages.
+
+Tue Mar 26 15:46:18 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfd.c (_bfd_default_error_handler): If _bfd_error_program_name
+	is not set, print "BFD: " before the error message.
+
+	* configure.in: Use AC_CHECK_TOOL to find ar and ranlib.  From
+	Miles Bader <miles@gnu.ai.mit.edu>.
+	* configure: Rebuild.
+
+Fri Mar 22 12:17:00 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (xcoff_link_input_bfd): Fix scan for C_BINCL/C_EINCL
+	symbols.
+
+	* config.bfd: Add ieee_vec to targ_selvecs for i960 targets and
+	m68k-aout, m68k-coff, and m68k-elf targets.
+
+Fri Mar 22 11:33:44 1996  Martin Anantharaman  <martin@goofy.imech.uni-duisburg.de>
+
+	* ieee.c: Changed #ifdef KEEPMINUSPCININST to #if KEEPMINUSPCININST.
+	(ieee_generic_stat_arch_elt): Restructured to prevent
+	ieee_object_p from being called repeatedly.
+
+Thu Mar 21 11:00:47 1996  steve chamberlain  <sac@slash.cygnus.com>
+
+	* coffcode.h (coff_write_object_contents):  Allocate
+	buffers large enough for any FILEHDR or AOUTHDR.
+
+Thu Mar 21 16:28:17 1996  David Mosberger-Tang  <davidm@azstarnet.com>
+
+	* ecofflink.c (lookup_line): New static function, renamed and
+	slighly changed from old _bfd_ecoff_locate_line.
+	(_bfd_ecoff_locate_line): Cache line number information.  Use
+	lookup_line for actual lookup.
+
+Thu Mar 21 14:59:11 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* peicode.h (pe_print_pdata): Warn if the .pdata section is not a
+	multiple of 20 bytes.
+
+Thu Mar 21 13:54:40 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ecoff.c (_bfd_ecoff_find_nearest_line): Use bfd_zalloc to
+	allocate ecoff_find_line, and don't initialize by hand.
+	* elf32-mips.c (mips_elf_find_nearest_line): Use bfd_zalloc for
+	mips_elf_find_line, and don't call memset.
+
+	* coffcode.h (coff_compute_section_file_positions): If not
+	producing a final executable, don't consider sofar when aligning
+	the section to the correct size.
+
+Wed Mar 20 16:53:12 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffcode.h (coff_add_missing_symbols): Ifdef out.
+	(coff_write_object_contents): Don't call coff_add_missing_symbols.
+	* coffgen.c (coff_section_symbol): Ifdef out.
+
+Mon Mar 18 12:54:41 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-mips.c (mips_elf_gprel32_reloc): Initialize gp if
+	output_bfd is not NULL.
+
+Thu Mar 14 17:12:06 1996  Doug Evans  <dje@charmed.cygnus.com>
+
+	* coffgen.c (coff_get_normalized_symtab): Call bfd_zalloc instead
+	of bfd_alloc (fixes fix_line not being initialized).
+	Delete zeroing of fix_{value,tag,end,scnlen} fields.
+
+Thu Mar 14 16:06:06 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* coffcode.h: Allow specific backends to override the
+	bfd_link_add_symbols routine.
+
+	* coff-h8300.c: Include genlink.h.
+	(howto_table): Add R_MEM_INDIRECT.
+	(rtype2howto): Support R_MEM_INDIRECT.
+	(h8300_reloc16_extra_cases): Handle R_MEM_INDIRECT like R_RELBYTE
+	for now.
+
+Tue Mar 12 12:41:17 1996  David Mosberger-Tang  <davidm@koala.azstarnet.com>
+
+	* coff-alpha.c (alpha_relocate_section): Use
+	info->callbacks_warning, rather than _bfd_error_handler, for
+	"multiple gp" warning.
+
+Tue Mar 12 12:10:55 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* linker.c (bfd_wrapped_link_hash_lookup): New function.
+	(_bfd_generic_link_add_one_symbol): Remove BFD_ASSERT on hash
+	table string.  Use bfd_wrapped_link_hash_lookup.
+	(_bfd_generic_link_write_global_symbol): Remove BFD_ASSERT on hash
+	table string.
+	* aoutx.h (aout_link_write_symbols): Use the name from the hash
+	table, if any, when writing out symbols.
+	(aout_link_input_section_std): Use the name from the hash table,
+	if any, when reporting undefined symbols.
+	(aout_link_input_section_ext): Likewise.
+	(aout_link_reloc_link_order): Use bfd_wrapped_link_hash_lookup.
+	* bout.c (get_value): Likewise.
+	* cofflink.c (_bfd_coff_reloc_link_order): Likewise.
+	* ecoff.c (ecoff_reloc_link_order): Likewise.
+	* elflink.h (elf_link_add_object_symbols): Likewise.
+	(elf_reloc_link_order): Likewise.
+	* linker.c (_bfd_generic_link_output_symbols): Likewise.
+	(_bfd_generic_reloc_link_order): Likewise.
+	(default_indirect_link_order): Likewise.
+	* reloc16.c (bfd_coff_reloc16_get_value): Likewise.
+	* sunos.c (sunos_add_one_symbol): Likewise.
+	* xcofflink.c (xcoff_link_add_symbols): Likewise.
+	(bfd_xcoff_link_count_reloc): Likewise.
+	(xcoff_reloc_link_order): Likewise.
+
+	* ecoffswap.h (ecoff_swap_fdr_in): If ECOFF_64, turn 0xffffffff
+	into -1 for intern->rss.
+
+	* configure: Rebuild with autoconf 2.8.
+
+Mon Mar 11 12:28:31 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* stab-syms.c (__define_stab_duplicate): Define.
+	(bfd_get_stab_name): Rename from aout_stab_name.  Rewrite to use a
+	switch.
+	* bfd-in.h (bfd_get_stab_name): Declare.
+	* bfd-in2.h: Rebuild.
+	* Makefile.in: Rebuild dependencies.
+	(BFD_LIBS): Add stab-syms.o.
+	(BFD_LIBS_CFILES): Add stab-syms.c.
+	(BFD32_BACKENDS): Remove stab-syms.o.
+	(BFD32_BACKENDS_CFILES): Remove stab-syms.c.
+	* configure.in: Don't list stab-syms.o in bfd_backends.
+	* configure: Rebuild.
+	* libaout.h (aout_stab_name): Don't declare.
+	* aoutx.h (NAME(aout,get_symbol_info)): Call bfd_get_stab_name,
+	not aout_stab_name.
+
+Fri Mar  8 11:26:20 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (assign_file_positions_for_segments): Adjust file offset
+	for section alignment even if SEC_LOAD is not set.
+
+Tue Mar  5 12:02:23 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Don't set SHLIB or SHLINK to an empty string,
+	since they appear as targets in Makefile.in.
+	* configure: Rebuild.
+
+	* sunos.c (sunos_scan_ext_relocs): If not making a shared library,
+	don't fiddle with a symbol which is not defined anywhere.
+
+Mon Mar  4 12:49:16 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (xcoff_mark): Treat undefined imported symbols as
+	though they are defined in a shared library.
+	(xcoff_build_ldsyms): Likewise.
+
+	* coffgen.c (coff_find_nearest_line): Don't look at the line
+	numbers for the section if section->lineno is NULL.
+
+	* elf.c (_bfd_elf_symbol_from_bfd_symbol): Print a useful error
+	message rather than calling BFD_ASSERT.
+	* elfcode.h (write_relocs): Check return value of
+	_bfd_elf_symbol_from_bfd_symbol.
+
+Fri Mar  1 09:42:59 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_add_symbol_hook): Don't set SEC_LOAD flag
+	for .sbss section.
+
+Wed Feb 28 11:25:47 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* libhppa.h (hppa_reloc_field_selector_type): Add R_HPPA_NLSEL
+	and R_HPPA_NLRSEL.
+	(e_nsel, e_nlsel, e_nlrsel): Undefine.  Add to
+	hppa_reloc_field_selector_type_alt.
+	(hppa_field_adjust): Handle e_nlsel, e_nlrsel.  Fix e_nsel handling.
+	* som.c (hppa_som_gen_reloc_type): Handle N', NL' NLR' field
+	selectors.
+	(som_write_fixups): Finish handling of R_N0SEL and R_N1SEL.
+
+Wed Feb 28 11:00:24 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (assign_file_positions_for_segments): Adjust the segment
+	memory size for the alignment of a SEC_ALLOC section, not just a
+	SEC_LOAD section.
+
+Tue Feb 27 14:17:31 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* m68klinux.c: New file.
+	* hosts/m68klinux.h: New file.
+	* config.bfd (m68*-*-linuxaout*, m68*-*-linux*): New targets.
+	* configure.in (m68*-*-linux*): New native host.
+	(m68klinux_vec): New vector.
+	* configure: Rebuild.
+	* targets.c (m68klinux_vec): Declare.
+	* i386linux.c (bfd_i386linux_size_dynamic_sections): Renamed from
+	bfd_linux_size_dynmic_sections to avoid clash with m68klinux.c.
+	* bfd-in.h (bfd_i386linux_size_dynamic_sections): Rename
+	declaration from bfd_linux_size_dynamic_sections.
+	(bfd_m68klinux_size_dynamic_sections): Declare.
+	* bfd-in2.h: Rebuild.
+	* Makefile.in: Rebuild dependencies.
+	(BFD32_BACKENDS): Add m68klinux.o.
+	(BFD32_BACKENDS_CFILES): Add m68klinux.c.
+
+Tue Feb 27 11:31:34 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* libhppa.h (pa_arch): Add pa20.
+	(hppa_reloc_field_selector_type): Add R_HPPA_NSEL.
+	(e_nsel): Undefine.  Add to hppa_reloc_field_selector_type_alt.
+	(hppa_field_adjust): Handle e_nsel.
+	* som.c: Provide default definitions for many new relocs found only
+	in hpux10 include files.
+	(som_fixup_formats): Add several new relocs from hpux10.
+	(som_hppa_howto_table): Add hpux10 relocs.
+	(som_write_fixups): Handle R_N0SEL and R_N1SEL hpux10 relocs.
+
+Mon Feb 26 12:52:48 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-make.sed: Edit out recent shared library support, and
+	rules to rebuild .h files using doc/chew.
+
+Mon Feb 26 14:48:39 1996  David Mosberger-Tang  <davidm@AZStarNet.com>
+
+	* ecoff.c (ecoff_compute_section_file_positions): Adjust the file
+	size even of sections with no contents.
+
+Mon Feb 26 14:01:13 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cofflink.c (_bfd_coff_link_input_bfd): When merging, skip names
+	starting with '$' the way we skip names starting with '.'.  When
+	updating x_endndx, don't be fooled by an index which has been
+	merged.
+
+	* cofflink.c (_bfd_coff_link_input_bfd): Don't try to optimize a
+	struct/union/enum type with no elements.
+
+Sat Feb 24 11:38:58 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfd.c (bfd_errmsg): Handle a NULL return from strerror.
+
+	* archive.c (bfd_generic_archive_p): If the first file in the
+	archive can not be recognized as an object, don't assume that this
+	is the wrong format.
+
+	* elf.c (bfd_elf_set_dt_needed_name): Don't do anything if the
+	format is not bfd_object.
+	(bfd_elf_get_dt_soname): Likewise.
+
+Wed Feb 21 13:58:04 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-sh.c (sh_relax_delete_bytes): Correct range of R_SH_USES
+	reloc.
+
+Tue Feb 20 16:22:44 1996  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* bfd.c (tdata): Add netbsd_core_data.
+	* bfd-in2.h: Regenerated.
+
+Tue Feb 20 16:50:02 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* sunos.c (SUNOS_CONSTRUCTOR): Define.
+	(sunos_add_one_symbol): Don't let a symbol from a dynamic object
+	override a constructor symbol.  Set SUNOS_CONSTRUCTOR when
+	appropriate.
+
+	* bout.c (b_out_squirt_out_relocs): Use udata.i rather than flags
+	to get the symbol index, matching 14 Jul 95 change.
+
+Tue Feb 20 08:26:27 1996  Fred Fish  <fnf@phydeaux.cygnus.com>
+
+	* coff-alpha.c (alpha_ecoff_get_relocated_section_contents):
+	Remove duplicate definition of gp.
+
+Mon Feb 19 12:37:41 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-alpha.c (alpha_ecoff_get_relocated_section_contents): Don't
+	assume that we can set the GP value and then get the same value,
+	since it won't be true if the output file is neither ELF nor
+	ECOFF.
+	* coff-mips.c (mips_adjust_reloc_in): Don't bother to use
+	_bfd_get_gp_value here.
+	(mips_gprel_reloc): Don't assume we can set and get the GP value.
+	* elf32-mips.c (mips_elf_hi16_reloc): Get gp value from
+	mips_elf_final_gp.
+	(mips_elf_lo16_reloc): Likewise.
+	(mips_elf_final_gp): Add pgp parameter.  Set it to the GP value.
+	Don't require that the BFD be ELF.
+	(mips_elf_gprel16_reloc): Get gp value from mips_elf_final_gp.
+	(mips_elf_gprel32_reloc): Likewise.
+	(mips_elf_relocate_section): Don't assume we can set and get the
+	GP value.
+	(mips_elf_finish_dynamic_symbol): Don't bother to use
+	_bfd_get_gp_value here.
+
+	* elf32-mips.c (mips_elf_create_procedure_table): Initialize sv.
+	Don't change epdr between malloc and free.  Be careful not to free
+	NULL pointers.  Zero out the first RPDR.
+
+	* configure.host: On Linux, only pass -rpath option if $(libdir)
+	is neither /lib nor /usr/lib.  From Alan Modra
+	<alan@mullet.Levels.UniSA.Edu.Au>.
+
+	* elf-bfd.h (struct elf_obj_tdata): Rename dt_needed_name to
+	dt_name.
+	(elf_dt_name): Rename from elf_dt_needed_name.
+	* elf.c (bfd_elf_set_dt_needed_name): Use elf_dt_name, not
+	elf_dt_needed_name.
+	(bfd_elf_get_dt_soname): New function.
+	* elflink.h (elf_link_add_object_symbols): Use elf_dt_name, not
+	elf_dt_needed_name.  Save the SONAME back in elf_dt_name.
+	* bfd-in.h (bfd_elf_get_dt_soname): Declare.
+	* bfd-in2.h: Rebuild.
+
+Mon Feb 19 02:50:23 1996  Doug Evans  <dje@charmed.cygnus.com>
+
+	* elf32-sparc.c (elf32_sparc_reloc_type_lookup): Renamed from
+	_bfd_sparc_elf_reloc_type_lookup.
+	(bfd_elf32_bfd_reloc_type_lookup): Update.
+	* elf64-sparc.c (SPARC64_OLD_RELOCS): Define.
+	(sparc64_elf_howto_table): Define.
+	(sparc_reloc_map): Define.
+	(sparc64_elf_reloc_type_lookup): New function.
+	(sparc_elf_wdisp16_reloc): New function.
+	(elf_info_to_howto): Use sparc64_elf_howto_table.
+	(sparc64_elf_relocate_section): Likewise.
+	(bfd_elf64_bfd_reloc_type_lookup): Update.
+
+Sun Feb 18 15:02:25 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.host: Check for 'do not mix' from native linker before
+	trying to use -rpath.
+
+Fri Feb 16 12:46:18 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfd.c (_bfd_get_gp_value): New function.
+	(_bfd_set_gp_value): New function.
+	* libbfd-in.h (_bfd_get_gp_value): Declare.
+	(_bfd_set_gp_value): Declare.
+	* libbfd.h: Rebuild.
+	* coff-alpha.c (alpha_ecoff_get_relocated_section_contents): Use
+	_bfd_get_gp_value and _bfd_set_gp_value rather than referring
+	directly to the fields in the tdata information.
+	(alpha_relocate_section): Likewise.
+	* coff-mips.c (mips_adjust_reloc_in): Likewise.
+	(mips_gprel_reloc): Likewise.
+	(mips_relocate_section): Likewise.
+	* elf32-mips.c (mips_elf_hi16_reloc): Likewise.
+	(mips_elf_lo16_reloc): Likewise.
+	(mips_elf_final_gp): Likewise.
+	(mips_elf_gprel16_reloc): Likewise.
+	(mips_elf_gprel32_reloc): Likewise.
+	(mips_elf_relocate_section): Likewise.
+	(mips_elf_finish_dynamic_symbol): Likewise.
+
+	* bout.c (b_out_set_arch_mach): Recognize bfd_mach_i960_jx.
+
+Thu Feb 15 11:29:13 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Call AC_PROG_CC before configure.host.
+	* configure: Rebuild.
+	* configure.host: Don't set information which autoconf should
+	figure out, namely CC, CFLAGS, LDFLAGS, AR, and RANLIB.
+
+	* configure.host: Remove go32 and win32 host information, since it
+	should no longer be needed.
+
+	* elf.c (map_sections_to_segments): If we have a .dynamic section,
+	then start a new segment rather than put a writable section in a
+	readonly segment.
+
+	* configure.host: Set RPATH_ENVVAR.
+
+	* Makefile.in: Rebuild dependencies.
+
+	* elflink.c (_bfd_elf_create_linker_section): Remove unused
+	zero_section variable.
+
+Thu Feb 15 10:39:17 1996  H.J. Lu  <hjl@zoom.com>
+
+	* Makefile.in ($(srcdir)/bfd-in2.h): Rename target from bfd-in2.h.
+	($(srcdir)/libbfd.h): Rename from libbfd.h.
+	($(srcdir)/libcoff.h): Rename from libcoff.h.
+
+Wed Feb 14 16:29:07 1996  Martin Anantharaman  <martin@mail.imech.uni-duisburg.de>
+
+	* ieee.c (ieee_write_expression): Only use an R variable for a
+	local symbol.  Don't output a zero offset.  Handle a zero address.
+	(SRC_MASK, PCREL_OFFSET): Define based on KEEPMINUSPCININST.
+	(rel32_howto, rel16_howto, rel8_howto): Use SRC_MASK and
+	PCREL_OFFSET.
+	(parse_expression): Don't try to handle multiple occurrences of a
+	P variable.  Handle I variables differently from X variables.  Fix
+	the order of minus expressions.
+	(ieee_slurp_external_symbols): Generate an I variable for an NN
+	record.  Fix handling of ATI and ATX records.
+	(ieee_slurp_sections): Only set minimal section attributes.
+	Adjust them later, based on the section contents.
+	(ieee_object_p): Read in the file until just after the ME record.
+	Call ieee_slurp_section_data to set the section flags.
+	(do_one): Add iterations parameter.  Only repeat the first load
+	item.  Set the section and file reloc flags.
+	(ieee_slurp_section_data): Set section flags.  Pass iterations to
+	do_one.
+	(ieee_canonicalize_reloc): Handle I variables.
+	(do_with_relocs): Only emit relocation size when necessary.
+	Increase MAXRUN to 127.  Change ov to be assigned, and take
+	src_mask and pcrel_offset into account.
+	(ieee_write_data_part): Skip sections that are not loaded.
+	(ieee_write_external_part): Don't output optional last entry of WX
+	records.
+	(ieee_write_me_part): Make setting of me_record neater.
+	(ieee_generic_stat_arch_elt): Get the size of an archive element.
+
+	* syms.c (stt): Add entries for zerovars, vars, and code.
+
+	* elfcode.h (validate_reloc): New static function.
+	(write_relocs): Call validate_reloc for non ELF relocs.
+
+	* elfxx-target.h (elf_symbol_leading_char): Define if not defined.
+	(TARGET_BIG_SYM): Use elf_symbol_leading_char.
+	(TARGET_LITTLE_SYM): Likewise.
+
+	* config.bfd (m68*-*-psos*): New target.
+
+Tue Feb 13 15:56:22 1996  Bryan Ford  <baford@snake.cs.utah.edu>
+
+	* i386msdos.c: Remove some #if 0 code.
+	(msdos_write_object_contents): Don't include empty sections in the
+	size computation, regardless of their address.
+
+Tue Feb 13 15:36:37 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Don't segfault if dynboj
+	is NULL, ie, the -r switch is used.
+
+Tue Feb 13 14:35:15 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* reloc.c (BFD_RELOC_MIPS_GOT_HI16): Define.
+	(BFD_RELOC_MIPS_GOT_LO16): Define.
+	(BFD_RELOC_MIPS_CALL_HI16, BFD_RELOC_MIPS_CALL_LO16): Define.
+	* bfd-in2.h, libbfd.h: Rebuild.
+	* elf32-mips.c (mips_reloc_map): Map new relocs.
+
+	* configure.host: Set HDLFLAGS for *-*-hpux with --enable-shared.
+
+	* Makefile.in ($(SHLINK)): Check ts against $(SHLIB), not
+	$(SHLINK).
+
+	* ieee.c (get_symbol): Set the section to bfd_abs_section.
+	(do_with_relocs): If EXEC_P is set and there are no relocs, use a
+	simple number for the section address, rather than an expression.
+	Limit the number of bytes between relocs to MAXRUN.
+	(ieee_write_me_part): Set me_record to the file offset after the
+	start address.
+	(ieee_write_processor): New static function.
+	(ieee_write_object_contents): Use ieee_write_processor.
+
+Fri Feb  9 10:53:00 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.host: Use ${CC-gcc} when testing for -rpath on SunOS.
+
+	* coff-aux.c: Change include of aux.h to aux-coff.h.
+
+Thu Feb  8 14:01:03 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* elf32-m68k.c (elf_m68k_relocate_section): For a R_68K_RELATIVE
+	relocation put the addend both in the reloc entry and the data.
+	(elf_m68k_finish_dynamic_symbol): Likewise.  Mask out marker in
+	GOT offset value.
+
+	* elf32-m68k.c (elf_m68k_relocate_section): If -Bsymbolic, resolve
+	a R_68K_PCxx reloc against a defined global symbol directly.
+	(elf_m68k_check_relocs): Don't count such a reloc.
+
+	* elf32-m68k.c (elf_m68k_check_relocs): Don't record a symbol with
+	a PLTxx reloc as dynamic.  Disallow PLTxxO reloc against a local
+	symbol for now, otherwise always record the symbol as dynamic.
+	(elf_m68k_adjust_dynamic_symbol): If a symbol with a PLTxx reloc
+	is not referenced by a dynamic object, and we are not making a
+	shared object, then don't make a PLT entry.  If we do make a PLT
+	entry, make sure the symbol has been recorded as dynamic.
+
+Wed Feb  7 13:56:06 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.host: When making a shared library, set HLDFLAGS to
+	pass an appropriate -rpath option.  Use the make variable SONAME
+	as the shared library soname, rather than computing it here.  On
+	SunOS, build stamp-tshlink in place of $(SHLINK).
+	* Makefile.in (SONAME): New variable.
+	($(SHLINK)): Make a link to the transformed name, as well.
+	(stamp-tshlink): New target.
+	(install): Skip stamp-tshlink during install.
+
+Wed Feb  7 13:37:39 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_add_symbol_hook): Do not assume that the
+	linker sections have been set up yet.
+
+	* elf.c (make_mapping): Add an additional argument to suppress
+	making the first section include the program headers.
+	(map_sections_to_segments): If the user used -Ttext such that the
+	program headers are on a different page, do not set the flags
+	saying that this section includes the program headers.
+
+Tue Feb  6 14:04:49 1996  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* configure.in (*-*-netbsd*): Set COREFILE to netbsd-core.c.
+	don't define TRAD_HEADER.
+	* configure: Rebuild.
+
+	* netbsd-core.c: New file, support for NetBSD core files.
+	* hosts/*nbsd.h: Removed.
+
+Tue Feb  6 11:47:49 1996  Doug Evans  <dje@charmed.cygnus.com>
+
+	* reloc.c (BFD_RELOC_SPARC_[567]): New reloc types.
+	(BFD_RELOC_SPARC_LO7 reloc type): Deleted.
+	* libbfd.h, bfd-in2.h: Regenerated.
+	* elf32-sparc.c (_bfd_sparc_elf_reloc_type_lookup): Renamed from
+	bfd_elf32_bfd_reloc_type_lookup.
+	(reloc_type{,_names}): Deleted.
+	(_bfd_sparc_elf_howto_table): Renamed from elf_sparc_howto_table.
+	Add sparc64 relocs.
+	(sparc_reloc_map): Add sparc64 relocs.
+	(sparc_elf_notsupported_reloc): New static function.
+	(sparc_elf_wdisp16_reloc): New static function.
+	(elf32_sparc_check_relocs): Handle R_SPARC_WDISP{16,19}.
+	(elf32_sparc_relocate_section): Likewise.
+	(bfd_elf32_bfd_reloc_type_lookup): Define.
+	* elf64-sparc.c (sparc64_elf_wdisp16_reloc): Deleted.
+	(reloc_type{,_names}): Deleted.
+	(elf_sparc_howto_table): Deleted.
+	(sparc_reloc_map): Deleted.
+	(_bfd_sparc_elf_howto_table): Renamed from elf_sparc_howto_table.
+	(bfd_elf64_bfd_reloc_type_lookup): Change from function to #define.
+
+Tue Feb  6 12:12:22 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.host: Make SHLIB_CFLAGS include $(PICFLAG) on a
+	*-*-hpux* host.
+
+	* Makefile.in (program_transform_name): New variable.
+	(install): Transform library name before installing it.
+
+Mon Feb  5 10:38:27 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* archures.c (bfd_mach_i960_hx): Define.
+	* bfd-in2.h: Rebuild.
+	* cpu-i960.c (scan_960_mach): Accept machine "hx".
+	(MATRIX): Expand entries for HX.
+	(arch_info_struct): Add i960:hx entry.
+	* bout.c (b_out_set_arch_mach): Handle bfd_mach_i960_hx.
+	* coffcode.h (coff_set_arch_mach_hook): Handle F_I960HX.
+	(coff_set_flags): Handle bfd_mach_i960_hx.
+
+	Support for building as a shared library, based on patches from
+	Alan Modra <alan@spri.levels.unisa.edu.au>:
+	* configure.in: Add AC_ARG_ENABLE for shared and commonbfdlib.
+	New substitutions: ALLLIBS, PICFLAG, SHLIB, SHLIB_CC,
+	SHLIB_CFLAGS, COMMON_SHLIB, PICLIST, SHLINK.
+	* configure: Rebuild.
+	* configure.host: If --enable-shared, adjust shared library stuff
+	based on the host.  If the host is SunOS, and the linker supports
+	-rpath, set HLDFLAGS to use it.
+	* Makefile.in (ALLLIBS): New variable.
+	(PICFLAG, SHLIB, SHLIB_CC, SHLIB_CFLAGS): New variables.
+	(COMMON_SHLIB, SHLINK): New variables.
+	(.c.o): If PICFLAG is set, compile twice, once PIC, once normal.
+	(STAGESTUFF): Remove variable.
+	(all): Depend upon $(ALLLIBS) and @PICLIST@ rather than
+	$(TARGETLIB).
+	(stamp-ofiles): New target, like old ofiles target, but build
+	using a temporary file and move-if-change, and touch stamp-ofiles
+	when done.
+	(ofiles): Just depend upon stamp-ofiles.
+	(stamp-piclist, piclist): New targets.
+	($(SHLIB), $(SHLINK)): New targets.
+	(targets.o, archures.o): Build twice if PICFLAG is set.
+	(do_mostlyclean): Remove pic/*.o.
+	(do_clean): Remove stamp-ofiles, $(SHLIB), $(SHLINK), piclist, and
+	stamp-piclist.
+	(do_distclean): Remove pic and stamp-picdir.
+	(install): Install shared libraries.
+	($(OFILES)): Depend upon stamp-picdir.
+	(stamp-picdir): New target.
+
+	* libcoff-in.h: Add comment reminding people that libcoff.h is a
+	generated file.
+	* libcoff.h: Rebuild.
+
+	* elflink.h (elf_adjust_dynamic_symbol): Don't try to get the
+	flavour of a section with no owner.
+
+	* elf32-mips.c (mips_elf_create_dynamic_sections): Clear
+	ELF_LINK_NON_ELF flag.
+	(mips_elf_create_got_section): Likewise.
+
+	* elf.c: Revert last change, since it breaks dynamic linking.
+	* elf-bfd.h (struct elf_backend_data): Remove want_hdr_in_seg
+	field.
+	* elf32-mips.c (elf_backend_want_hdr_in_seg): Don't define.
+	* elfxx-target.h (elf_backend_want_hdr_in_seg): Don't define.
+	(elfNN_bed): Don't initialize want_hdr_in_seg field.
+
+Sun Feb  4 20:45:13 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf.c (assign_file_positions_for_segments): If the backend does
+	not want the elf header or the program headers in the address
+	space, do not include them in the calculations.
+
+	* elf32-ppc.c (ppc_elf_additional_program_headers): New hook
+	function to determine if we need additional program headers.
+	(ppc_elf_modify_segment_map): Define as a NOP function for now.
+	(ppc_elf_create_linker_section): .sdata2 is a read-only section.
+
+Sat Feb  3 23:00:03 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffcode.h: Move today's libcoff.h change into coffcode.h.
+
+Sat Feb  3 15:43:44 1996  Fred Fish  <fnf@cygnus.com>
+
+	* libcoff.h (bfd_coff_link_add_one_symbol): Combine macro args
+	back into one line.  Some compilers (sunos 4.1.3 for example)
+	won't accept args split across more than one line.
+
+Fri Feb  2 11:42:15 1996  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* aclocal.m4 (BFD_BINARY_FOPEN): Understand cygwin32.
+	* configure: Regenerate.
+
+Fri Feb  2 12:12:16 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-hppa.c (elf32_hppa_backend_symbol_table_processing): Don't
+	try to do arithmetic on a void *, cast it to a unsigned char * first.
+
+Thu Feb  1 16:04:06 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf-bfd.h (ELF_LINK_NON_ELF): Define.
+	* elf.c (_bfd_elf_link_hash_newfunc): Set elf_link_hash_flags to
+	ELF_LINK_NON_ELF.
+	* elflink.h (elf_link_add_object_symbols): Reset ELF_LINK_NON_ELF
+	flag for a newly defined symbol.
+	(NAME(bfd_elf,record_link_assignment)): Likewise.
+	(elf_adjust_dynamic_symbol): If ELF_LINK_NON_ELF is set, try to
+	set the DEF or REF_REGULAR flags correctly.
+
+	* Makefile.in (bfd-in2.h): Make bfd.h, not protos, in docdir.
+	(libbfd.h, libcoff.h): Corresponding change.
+
+	* elf32-i386.c (elf_i386_check_relocs): Don't record a symbol with
+	a PLT32 reloc as dynamic.
+	(elf_i386_adjust_dynamic_symbol): If a symbol with a PLT32 reloc
+	is not referenced by a dynamic object, and we are not making a
+	shared object, then don't make a PLT entry.  If we do make a PLT
+	entry, make sure the symbol has been recorded as dynamic.
+
+Wed Jan 31 17:23:32 1996  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* coff-i386.c (coff_i386_reloc_type_lookup): Add BFD_RELOC_32_PCREL.
+	* config.bfd (i[345]86-*-win32): Becomes i[345]86-*-cygwin32.
+	(powerpcle-*-cygwin32): New.
+	* peicode.h (add_data_entry): Get address from vma.
+
+Wed Jan 31 16:23:57 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elflink.c (_bfd_elf_create_linker_section): If the symbol
+	attached to the section has already been created as an undefined
+	symbol, treat it as if it hasn't been created yet.
+
+Wed Jan 31 16:16:53 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_bfd_final_link): Don't output initial dummy
+	symbol or section symbols if stripping all symbols and this is not
+	a relocateable link.  Don't output the symbol string table if
+	there are no symbols.
+	(elf_link_flush_output_syms): Don't do anything if there are no
+	symbols to flush.
+
+Wed Jan 31 12:55:49 1996  Richard Henderson  <rth@tamu.edu>
+
+	* coff-aux.c: New file.
+	* hosts/m68kaux.h: New file.
+	* config.bfd (m68*-apple-aux*): New target.
+	* configure.in (m68*-apple-aux*): New native host.
+	(m68kaux_coff_vec): New vector.
+	* configure: Rebuild.
+	* targets.c (m68kaux_coff_vec): Declare.
+	* coffcode.h (bfd_coff_backend_data): Add field
+	_bfd_coff_link_add_one_symbol.
+	(bfd_coff_link_add_one_symbol): Define.
+	(compare_arelent_ptr): New static function if TARG_AUX.
+	(coff_write_relocs): If TARG_AUX, sort the relocs.
+	(coff_write_object_contents): Set A/UX aouthdr magic number.
+	(coff_link_add_one_symbol): Define if not defined.
+	(bfd_coff_std_swap_table): Initialize new field.
+	* libcoff.h: Rebuild.
+	* cofflink.c (coff_link_add_symbols): Call
+	bfd_coff_link_add_one_symbol rather than
+	_bfd_generic_link_add_one_symbol.
+	* coff-m68k.c (COFF_PAGE_SIZE): Don't define if already defined.
+	* coff-alpha.c (alpha_ecoff_backend_data): Initialize new field.
+	* coff-mips.c (mips_ecoff_backend_data): Likewise.
+	* Makefile.in: Rebuild dependencies.
+	(BFD32_BACKENDS): Add coff-aux.o.
+	(BFD32_BACKENDS_CFILES): Add coff-aux.c.
+
+Wed Jan 31 11:37:46 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* elf32-m68k.c (elf_m68k_relocate_section): Fix R_68K_GOT*
+	relocation; ignore addend with R_68K_{GOT,PLT}*O relocation.
+
+Tue Jan 30 12:09:04 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (do_maintainer_clean): Remove $(srcdir)/bfd-in2.h,
+	$(srcdir)/libbfd.h and $(srcdir)/libcoff.h.
+	(maintainer-clean): Warn about deleting special files.
+	(bfd-in2.h, libbfd.h, libcoff.h): New targets.
+
+	* elf32-hppa.c (elf32_hppa_relocate_section): Handle indirect and
+	warning symbols correctly.
+	* elf32-i386.c (elf_i386_relocate_section): Likewise.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-mips.c (mips_elf_relocate_section): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+
+	* syms.c (_bfd_stab_section_find_nearest_line): Add casts to avoid
+	warnings.
+
+Mon Jan 29 14:27:24 1996  Kim Knuttila  <krk@cygnus.com>
+
+	* libcoff-in.h: aligned newly exported names with bfd naming
+	conventions. Removed an erroneous define of POWERPC_LE_PE.
+ 	* libcoff.h: Rebuild.
+	* cofflink.c, coff-ppc.c: the above function name changes
+
+Mon Jan 29 13:06:28 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	From Basim Kadhim <kadhim@spock.cs.colorado.edu>:
+	* ecoff.c (struct extsym_info): Define.
+	(_bfd_ecoff_bfd_final_link): Pass a pointer to struct extsym_info
+	to ecoff_link_write_external.
+	(ecoff_link_write_external): Accept a struct extsym_info pointer.
+	Strip symbols when appropriate.
+
+	Based on patches from Ronald F. Guilmette <rfg@monkeys.com>:
+	* syms.c (BSF_OBJECT): Define.
+	(bfd_print_symbol_vandf): Print 'O' for BSF_OBJECT.
+	* bfd-in2.h: Rebuild.
+	* elfcode.h (elf_slurp_symbol_table): Set BSF_OBJECT for an
+	STT_OBJECT symbol.
+	* elf.c (swap_out_syms): Only set type to STT_OBJECT if BSF_OBJECT
+	is set.
+
+	* elf32-i386.c (elf_i386_relocate_section): If -Bsymbolic, when
+	copying relocs into a shared object, treat a defined global symbol
+	as a local symbol.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-mips.c (mips_elf_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+
+	* elflink.h (elf_link_add_object_symbols): Only set weakdef to a
+	real defined symbol, not to a weak defined symbol.
+
+Mon Jan 29 11:34:36 1996  Kim Knuttila  <krk@cygnus.com>
+
+	* cofflink.c: removed the POWERPC_LE_PE hack, promoted some types
+	and made a few static functions externs.
+
+	* coff-ppc.c (ppc_bfd_coff_final_link): new function, replaces the
+	POWERPC_LE_PE hack in cofflink.
+
+	* libcoff-in.h: promoted the following from cofflink.c to allow
+	_bfd_coff_final_link to be overridden -  STRING_SIZE_SIZE,
+	coff_debug_merge_element, struct coff_debug_merge_type,
+	coff_debug_merge_hash_entry, coff_debug_merge_hash_table,
+	coff_debug_merge_hash_table_init,  coff_debug_merge_hash_table_free,
+	coff_debug_merge_hash_lookup, coff_link_section_info,
+	coff_final_link_info, coff_debug_merge_hash_newfunc,
+	coff_write_global_sym, coff_link_input_bfd, coff_reloc_link_order.
+
+	* libcoff.h: re-gen'd
+
+Fri Jan 26 18:33:35 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* syms.c: Include "bfdlink.h".
+	(struct stab_find_info): Define.
+	(_bfd_stab_section_find_nearest_line): New function.
+	* libbfd-in.h (_bfd_stab_section_find_nearest_line): Declare.
+	* libbfd.h: Rebuild.
+	* elf-bfd.h (struct elf_obj_tdata): Add line_info field.
+	* elf.c (_bfd_elf_find_nearest_line): Try calling
+	_bfd_stab_section_find_nearest_line before searching the ELF
+	symbol table.  Find the closest STT_FUNC symbol, not the last one.
+	* libcoff-in.h (coff_data_type): Add line_info field.
+ 	* libcoff.h: Rebuild.
+	* coffgen.c (coff_find_nearest_line): Try calling
+	_bfd_stab_section_find_nearest_line before searching the COFF
+	symbol table.
+	* Makefile.in: Rebuild dependencies.
+
+Fri Jan 26 16:11:19 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (R_PPC_EMB_SDA21 relocations): Make relocation size
+	4 bytes, so we get the correct value when updating the register
+	field in little endian mode.
+
+Thu Jan 25 12:14:16 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libcoff-in.h (struct xcoff_tdata): Remove toc_section and
+	entry_section fields.  Add sntoc and snentry fields.
+	* libcoff.h: Rebuild.
+	* coffcode.h (coff_mkobject_hook): Initialize sntoc and snentry,
+	not toc_section and entry_section (the COFF file does not have any
+	sections at this point).
+	(coff_write_object_contents): Set o_snentry and o_sntoc from
+	snentry and sntoc rather than entry_section and toc_section.
+	* coff-rs6000.c (xcoff_copy_private_bfd_data): Copy sntoc and
+	snentry, not toc_section and entry_section.
+	* xcofflink.c (bfd_xcoff_size_dynamic_sections): Don't set
+	entry_section from hentry.
+	(xcoff_link_input_bfd): If a defined symbol has XCOFF_ENTRY set,
+	set snenty.
+	(xcoff_link_input_bfd): Set sntoc, not toc_section.
+	(xcoff_write_global_symbol): Get toc_section from sntoc, rather
+	than using toc_section directly.
+
+	* archures.c: Add missing `.' in enum bfd_architecture.
+	* bfd-in2.h: Rebuild.
+
+	* config.bfd (i[345]86-*-sco*elf*): Use bfd_elf32_i386_vec.  From
+	Robert Lipe <robertl@arnet.com>.
+
+Thu Jan 25 12:08:51 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Add .rela.sdata{,2}
+	to sections we allocate.  Use bfd_zalloc to allocate initialial
+	sections, not bfd_alloc.
+	(ppc_elf_check_relocs): Remove BFD_ASSERTs for !shared from
+	SDA{,2}I16 relocations.
+	(ppc_elf_add_symbol_hook): Use the value of -G nn to determine
+	whether to put something in .sbss or not.
+	(ppc_elf_relocate_section): Add support for more relocations.  Add
+	in sec->output_offset where appropriate.  Make error messages
+	include the symbol name.
+
+	* elflink.c (_bfd_elf_create_linker_section): Lookup symbol before
+	trying to add it to the symbol table, so _GLOBAL_OFFSET_TABLE_
+	doesn't get redefined messages if -shared.
+
+	* elflink.h (elf_create_pointer_linker_section) Only bump RELA
+	section if the rel_section field has been set up.
+
+Wed Jan 24 20:40:26 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Fix typo in eabi
+	relocations.
+
+Wed Jan 24 10:38:34 1996  Doug Evans  <dje@charmed.cygnus.com>
+
+	* elf32-sparc.c (elf32_sparc_merge_private_bfd_data): Delete checking
+	of flags, only flags used are controlled by mach number.  Bump up
+	output file mach number to highest of input file mach numbers.
+	(elf32_sparc_object_p): Watch for EF_SPARC_SUN_US1.
+	(elf32_sparc_final_write_processing): Set EF_SPARC_SUN_US1 if v8plusa.
+
+	* config.bfd (sparc64-*-{sysv4*,solaris2*}): Comment out
+	bfd_elf64_sparc_vec support.
+
+Tue Jan 23 14:33:05 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_copy_private_bfd_data): Don't complain if
+	the embedded bit is set on some objects and not on others.  Just
+	or it together.
+	(ppc_elf_relocate_section): Implement R_PPC_EMB_{SDA21,RELSDA}
+	relocations.
+
+Tue Jan 23 14:22:45 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffcode.h (coff_new_section_hook): Don't try to align the
+	.stabstr section.
+
+	* coffcode.h (coff_set_section_contents): Fix the handling of the
+	.lib section to work even if the entire section contents are
+	written at once.  From Gvran Uddeborg <gvran@uddeborg.pp.se> and
+	Robert Lipe <robertl@arnet.com>.
+
+Mon Jan 22 18:45:51 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elflink.h (elf_finish_pointer_linker_section): Don't allocate
+	memory here for contents.
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Bump up _SDA_BASE_ and
+	_SDA2_BASE_ by 32768.
+	(ppc_elf_size_dynamic_sections): #if out PLT code which we haven't
+	started using.  Allocate contents for .sdata and .sdata2 sections
+	also.
+	(ppc_elf_check_relocs): Use bfd_get_section_name in debug message,
+	rather than _name.
+	(ppc_elf_finish_dynamic_symbol): Remove code that attempted to
+	size _SDA{,2}_BASE_.
+	(ppc_elf_relocate_section): Change how sdata{,2} relocations are
+	done.
+
+Mon Jan 22 08:52:04 1996  Doug Evans  <dje@charmed.cygnus.com>
+
+	* elflink.h (elf_finish_pointer_linker_section): Fix typo.
+
+	* archures.c (bfd_mach_sparc_v9): Renamed from bfd_mach_sparc64.
+	(bfd_mach_sparc_{v8plus,v8plusa}): Define.
+	(bfd_mach_sparc_v9a): Define.
+	(bfd_mach_sparc_v9_p): Define.
+	* bfd-in2.h: Regenerated.
+	* aoutx.h (aout,machine_type): bfd_mach_sparc64 renamed to
+	bfd_mach_sparc_v9.
+	* elf64-sparc.c (sparc64_elf_object_p): Likewise.
+	* config.bfd (sparc64-*-sysv4*,sparc64-*-solaris2*): Set targ_defvec
+	to bfd_elf32_sparc_vec.
+	* cpu-sparc.c (arch_info_struct): Renamed from sparc_arch_info.
+	Add v8plus{,a} support.
+	Add v9a support.
+	(sparc_compatible): New function.
+	* elf32-sparc.h: #include "elf/sparc.h".
+	(elf32_sparc_merge_private_bfd_data, elf32_sparc_object_p,
+	elf32_sparc_final_write_processing): New functions.
+	(bfd_elf32_bfd_merge_private_bfd_data, elf_backend_object_p,
+	elf_backend_final_write_processing): Define.
+
+Mon Jan 22 11:21:51 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf-bfd.h (struct elf_link_hash_entry): Add
+	linker_section_pointer field.
+	(enum elf_linker_section_enum): Enumeration for new way of
+	creating linker dynamic sections and symbols.
+	(elf_linker_section{,_pointers}): New structures for creating
+	dynamic sections and symbols.
+	(elf_obj_tdata): Add linker_section_pointers and linker_section
+	fields.
+	(elf_local_ptr_offsets,elf_linker_section): New accessor macros.
+	(_bfd_elf_create_linker_section): New declarations.
+	(_bfd_elf_find_pointer_linker_section): Ditto.
+	(bfd_elf{32,64}_{create,finish}_pointer_linker_section): Ditto.
+	(_bfd_elf_make_linker_section_rela): Ditto.
+
+	* elf.c (_bfd_elf_link_hash_newfunc): Initialize new fields.
+
+	* elf32-ppc.c (ppc_elf_create_dynamic_sections): Delete.
+	(ppc_elf_create_linker_section): New function to create the
+	sections .got, .sdata, and .sdata2.
+	(ppc_elf_size_dynamic_sections): Zap .rela.{sdata,sdata2} if
+	needed.
+	(ppc_elf_check_relocs): Support more of the eabi relocations.
+	(ppc_elf_relocate_section): Ditto.
+	(ppc_elf_finish_dynamic_symbols): Adjust _SDA{,2}_BASE_ by 32768
+	if the .sdata{,2} + .sbss{,2} section size is > 32k.
+
+	* elflink.h (elf_create_pointer_linker_section): New function to
+	create initialized pointers in dynamic linker sections.
+	(elf_finish_pointer_linker_section): Actually intialize the
+	pointers created above.
+
+	* elfcode.h (bfd_elf{32,64}_create_pointer_linker_section): New
+	macros to provide both 32 and 64 bit versions of
+	elf_create_pointer_linker_section.
+	(bfd_elf{32,64}_finish_pointer_linker_section): New macros to
+	provide both 32 and 64 bit versions of
+	elf_finish_pointer_linker_section.
+
+	* elflink.c (_bfd_elf_create_linker_section): New function to
+	create a linker section.
+	(_bfd_elf_find_pointer_linker_section): Find a unique pointer to a
+	given address in the linker pointer offsets created for a given
+	symbol.
+	(_bfd_elf_make_linker_section_rela): Make a RELA section
+	corresponding to the generated linker section.
+
+Sat Jan 20 08:36:10 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* elf32-sparc.c (ELF_MACHINE_ALT1): Define.
+
+Thu Jan 18 18:25:34 1996  Kim Knuttila  <krk@cygnus.com>
+
+	* coff-ppc.c (coff_ppc_relocate_section): changed TOCDEFN relocs.
+	(coff_ppc_relocate_section): Handle special values for gcc built dlls.
+	(dump_toc): fix diagnosing code to identify out-of-toc-bounds entries.
+	Also begin the toc at 4 as an eye catcher ('31313131' marks the first
+	toc entry in an objdump) for now.
+	(ppc_do_last, ppc_get_last): New function - needed to save processing
+	the toc owner to the end.
+	(ppc_coff_swap_sym_in_hook): Removed an incorrect hack for doing the
+	toc owner last.
+
+	* cofflink.c (_bfd_coff_final_link): Added a new hack to keep the
+	toc owner from being done till last. Must define POWERPC_LE_PC
+	to enable it.
+
+	* coffcode.h (coff_set_alignment_hook): alignment setting for .stab
+
+	* peicode.h (coff_swap_scnhdr_out): set section flags for stab/str
+	to INFO.
+	(coff_swap_aouthdr_out): Removed a non-working hack for computing the
+	SizeOfImage for PowerPC. Ignore the size of the .junk section.
+
+Thu Jan 18 17:42:12 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elfcore.h: Include <signal.h> before <sys/procfs.h>.
+
+Wed Jan 17 12:40:14 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cpu-powerpc.c (arch_info_struct): Change last entry to not point
+	back to first.
+	(bfd_powerpc_arch): Point at first entry in arch_info_struct.
+
+Tue Jan 16 15:10:49 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (assign_file_positions_for_segments): Don't increment file
+	offset for a segment which contains no loadable sections.
+
+Mon Jan 15 17:46:27 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* reloc.c: Add new PowerPC relocations.
+	* {bfd-in2,libbfd}.h: Regenerate.
+
+	* elf32-ppc.c (ppc_elf_howto_raw): Add more PPC relocations.
+	(ppc_elf_reloc_type_lookup): Lookup new relocations.
+
+Mon Jan 15 14:29:44 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutx.h (howto_table_ext): Fix RELOC_BASE10 and RELOC_BASE22
+	entries.
+
+	* sunos.c (sunos_scan_ext_relocs): Don't fail assert if
+        info->shared.
+
+	* coffgen.c (coff_find_nearest_line): Don't try to cache
+	information in sections that are not owned by a BFD.  From Richard
+	Henderson <richard@atheist.tamu.edu>.
+
+	* elf32-mips.c: Numerous changes to dynamic linking code, mostly
+	from Kazumoto Kojima <kkojima@info.kanagawa-u.ac.jp>.
+	* elflink.h (elf_link_output_extsym): Remove special check for
+	_rld_new_interface.
+
+	* ecoffswap.h: Add prototypes for static functions.
+
+Sun Jan 14 21:36:08 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_{unsupported,std}_reloc): Remove functions.
+	(ppc_elf_howto_raw): Remove ppc_elf_{unsupported,std}_reloc
+	references.
+	(ppc_elf_relocate_section):  No longer allow .sdata/.sbss sections
+	to satisfy a TOC16 relocation. 	Rewrite unsupported relocation
+	support.  Begin support for R_PPC_SDA{2,}REL.
+
+Sat Jan 13 09:36:52 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_create_dynamic_sections): New function to
+	create the .got and .got.neg sections.
+	(ppc_elf_size_dynamic_sections): Call it.
+	(ppc_elf_check_relocs): Call it.
+	(ppc_elf_size_dynamic_sections): Support .got.neg, just like .got.
+	(ppc_elf_check_relocs): Add error messages for relocations we
+	don't yet support.  Do not include R_PPC_SDAREL16 like a GOT
+	relocation.
+
+Fri Jan 12 15:27:59 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_fake_sections): Define, and handle the new
+	section flags for V.4 and eabi.
+
+Fri Jan 12 13:59:16 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (assign_file_positions_for_segments): If a segment
+	contains no sections, don't mark it as readable.
+
+	* elf-bfd.h (_bfd_elf_section_from_bfd_section): Declare.
+	* elfcode.h (_bfd_elf_section_from_bfd_section): Don't declare.
+
+	* elf.c (_bfd_elf_print_private_bfd_data): Dump contents of
+	dynamic section, if there is one.
+	* elf-bfd.h (struct elf_size_info): Add swap_dyn_in field.
+	(bfd_elf32_swap_dyn_in): Change type of second parameter to PTR.
+	(bfd_elf64_swap_dyn_in): Likewise.
+	* elfcode.h (elf_swap_dyn_in): Change type of second parameter to
+	PTR.
+	(NAME(_bfd_elf,size_info)): Initialize swap_dyn_in field.
+
+	* elf32-i386.c (elf_i386_size_dynamic_sections): Don't create a
+	DT_TEXTREL entry because of .rel.plt.  From Martin Pirker
+	<pirker@eiunix.tuwien.ac.at>.
+
+Thu Jan 11 17:06:14 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* section.c (SEC_{EXCLUDE,SORT_ENTRIES}): New section flags for
+	PowerPC V.4 and eabi.
+ 	* bfd-in2.h: Regenerate.
+	* libfd.h: Regenerate.
+
+	* elfxx-target.h (TARGET_{BIG,LITTLE}_SYM): Add new flags.
+
+	* elf32-ppc.c (ppc_elf_section_from_shdr): Support SHT_ORDERED
+	section type and SHF_EXCLUDE section flag, turning them into the
+	appropriate bfd section flag.
+
+Thu Jan 11 11:23:30 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xcofflink.c (xcoff_link_add_symbols): Create the special
+	sections if we see a DYNAMIC object, in case that is the only
+	XCOFF input object we see.
+
+	* elf32-mips.c: Extensive changes for a start at dynamic linking
+	support, from Kazumoto Kojima <kkojima@info.kanagawa-u.ac.jp>.
+
+	* elf-bfd.h (struct elf_backend_data): Add type_change_ok field.
+	(struct elf_backend_data): Remove
+	elf_backend_create_program_headers field.  Add
+	elf_backend_additional_program_headers and
+	elf_backend_modify_segment_map fields.
+	* elfxx-target.h (elf_backend_type_change_ok): Define if not
+	defined.
+	(elf_backend_additional_program_headers): Likewise.
+	(elf_backend_modify_segment_map): Likewise.
+	(elf_backend_create_program_headers): Don't define.
+	(elfNN_bed): Change to account for field changes.
+	* elf.c (assign_file_positions_for_segments): Call new
+	modify_segment_map backend function.  Don't call old
+	create_program_headers backend function.
+	(get_program_header_size): Call additional_program_headers rather
+	than create_program_headers.
+	* elflink.h (elf_link_add_object_symbols): Initialize
+	type_change_ok from new backend field.
+	(elf_link_output_extsym): Don't warn if _rld_new_interface is
+	defined.
+	(elf_reloc_link_order): Treat a reloc against a defined symbol as
+	a reloc against the appropriate section.
+
+	* elf-bfd.h (struct bfd_elf_section_data): Add tdata field.
+	(struct elf_obj_tdata): Rename ppc_flags_init field to flags_init.
+	(elf_flags_init): Rename from elf_ppc_flags_init.
+	* elf32-ppc.c (ppc_elf_set_private_flags): Use elf_flags_init, not
+	elf_ppc_flags_init.
+	(ppc_elf_copy_private_bfd_data): Likewise.
+	(ppc_elf_merge_private_bfd_data): Likewise.
+
+	* elf32-m68k.c (howto_table): Change src_mask to 0 for all
+	relocation entries.
+
+Tue Jan  9 15:22:53 1996  David Mosberger-Tang  <davidm@azstarnet.com>
+
+	* coff-alpha.c (alpha_relocate_section): During final link, allow
+ 	output .lita section to be bigger than 64k by adjusting gp value
+ 	on a per-input section basis.
+	* libecoff.h (struct ecoff_tdata): Add issued_multiple_gp_warning
+	field.
+	(struct ecoff_section_tdata): Add gp field.
+
+Tue Jan  9 12:00:36 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	Handle Alpha ECOFF changes in OSF/1 3.2.
+	* libecoff.h (struct ecoff_backend_data): Add get_elt_at_filepos
+	field.
+	* coff-alpha.c: Include "aout/ar.h".
+	(alpha_ecoff_get_relocated_section_contents): Don't require an
+	ALPHA_R_IGNORE reloc after an ALPHA_R_GPDISP reloc, since OSF/1
+	3.2 doesn't generate one.
+	(alpha_relocate_section): Likewise.
+	(alpha_ecoff_slurp_armap): Define.
+	(alpha_ecoff_slurp_extended_name_table): Define.
+	(alpha_ecoff_construct_extended_name_table): Define.
+	(alpha_ecoff_truncate_arname): Define.
+	(alpha_ecoff_write_armap): Define.
+	(alpha_ecoff_generic_stat_arch_elt): Define.
+	(alpha_ecoff_update_armap_timestamp): Define.
+	(ARFZMAG): Define.
+	(alpha_ecoff_read_ar_hdr): New static function.
+	(alpha_ecoff_get_elt_at_filepos): New static function.
+	(alpha_ecoff_openr_next_archived_file): New static function.
+	(alpha_ecoff_get_elt_at_index): New static function.
+	(alpha_ecoff_backend_data): Initialize get_elt_at_filepos field.
+	(ecoffalpha_little_vec): Change BFD_JUMP_TABLE_ARCHIVE from
+	_bfd_ecoff to alpha_ecoff.
+	* ecoff.c (ecoff_link_add_archive_symbols): Use get_elt_at_filepos
+	field from backend structure, rather than always calling
+	_bfd_get_elt_at_filepos.
+	* coff-mips.c (mips_ecoff_backend_data): Initialize
+	get_elt_at_filepos field.
+	* archive.c (_bfd_generic_read_ar_hdr_mag): New function, copied
+	from _bfd_generic_read_ar_hdr with minor changes.
+	(_bfd_generic_read_ar_hdr): Use _bfd_generic_read_ar_hdr_mag.
+	* libbfd-in.h (_bfd_generic_read_ar_hdr_mag): Declare.
+	* libbfd.h: Rebuild.
+
+	* bfd-in.h (BFD_IN_MEMORY): Define.
+	* libbfd-in.h (struct bfd_in_memory): Define.
+	* libbfd.c (bfd_read): Handle BFD_IN_MEMORY flag.
+	(bfd_get_file_window): Don't try to map a BFD_IN_MEMORY file.
+	(bfd_write, bfd_stat): Abort if BFD_IN_MEMORY is set.
+	(bfd_tell, bfd_flush, bfd_seek): Handle BFD_IN_MEMORY flag.
+	* bfd.c (struct _bfd): Change iostream field from char * to PTR.
+	(bfd_get_size): Handle BFD_IN_MEMORY flag.
+	* cache.c (bfd_cache_close): Ignore BFD_IN_MEMORY files.
+	(bfd_open_file): Cast to PTR, not char *, when setting iostream.
+	(bfd_cache_lookup_worker): Abort if BFD_IN_MEMORY is set.
+	* opncls.c (bfd_fdopenr): Cast to PTR, not char *, when setting
+	iostream.
+	(bfd_openstreamr): Likewise.
+	* aoutx.h (NAME(aout,some_aout_object_p)): Only fstat iostream if
+	BFD_IN_MEMORY is not set.
+	* riscix.c (riscix_some_aout_object_p): Likewise.
+	* bfd-in2.h, libbfd.h: Rebuild.
+
+	* targets.c (bfd_target): Add _bfd_get_elt_at_index field.
+	(BFD_JUMP_TABLE_ARCHIVE): Add _get_elt_at_index.
+	(bfd_get_elt_at_index): Define.
+	* archive.c (_bfd_generic_get_elt_at_index): Rename from
+	bfd_get_elt_at_index.  Change index parameter from int to
+	symindex.
+	* libbfd-in.h (_bfd_generic_get_elt_at_index): Declare.
+	(_bfd_noarchive_get_elt_at_index): Define.
+	(_bfd_archive_bsd_get_elt_at_index): Define.
+	(_bfd_archive_coff_get_elt_at_index): Define.
+	* bfd-in2.h, libbfd.h: Rebuild.
+	* aout-target.h (MY_get_elt_at_index): Define if not defined.
+	* coff-rs6000.c (xcoff_get_elt_at_index): Define.
+	* ieee.c (ieee_get_elt_at_index): Define.
+	* libecoff.h (_bfd_ecoff_get_elt_at_index): Define.
+	* oasys.c (oasys_get_elt_at_index): Define.
+	* som.c (som_get_elt_at_index): Define.
+
+	* ecoff.c (_bfd_ecoff_find_nearest_line): Don't restrict line
+	numbers to the .text section.
+
+Mon Jan  8 17:00:57 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c (ieee_write_debug_part): Change return type to boolean.
+	If there is a SEC_DEBUGGING section, get the contents of the debug
+	information part from it.
+	(ieee_set_section_contents): Store the contents of a SEC_DEBUGGING
+	section in memory.
+	(ieee_write_object_contents): Check ieee_write_debug_part return.
+
+Thu Jan  4 17:12:37 1996  Fred Fish  <fnf@cygnus.com>
+
+	* config.bfd (i[345]86-*-freebsd*): Add target.
+	* configure.in (i386freebsd_vec): Add vec.
+	* configure: Regenerate.
+	* Makefile.in (BFD32_BACKENDS): Add i386freebsd.o.
+	(BFD32_BACKENDS_CFILES): Add i386freebsd.c.
+	Rebuild dependencies..
+	* freebsd.h: New file.
+	* i386freebsd.c: New file.
+	* targets.c (i386freebsd_vec): Declare.
+	(bfd_target_vector): Add i386freebsd_vec.
+	* i386linux.c (SEGMENT_SIZE): Define as TARGET_PAGE_SIZE
+	* i386netbsd.c (SEGMENT_SIZE):  Define as TARGET_PAGE_SIZE
+
+Thu Jan  4 16:27:46 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c (ieee_slurp_debug): New static function.
+	(ieee_object_p): Call it.
+	(ieee_slurp_section_data): Skip debugging sections.
+	(ieee_get_reloc_upper_bound): Likewise.
+	(ieee_get_section_contents): Likewise.
+	(ieee_canonicalize_reloc): Likewise.
+	(ieee_write_section_part): Likewise.
+	(ieee_write_debug_part): Likewise.
+	(ieee_write_data_part): Likewise.
+	(init_for_output): Likewise.
+
+Wed Jan  3 19:42:47 1996  Michael Meissner  <meissner@wogglebug.tiac.net>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Make @GOT relocations
+	work.
+	(ppc_elf_howto_raw): Just use bfd_elf_generic_reloc for all howto
+	relocs, since ppc_elf_relocate_section handles the linker case.
+	(ppc_elf_{addr16_ha,got16,toc16,brtaken}_reloc): Delete, no longer
+	used.
+	(ppc_elf_{addr16_ha,got16,toc16,brtaken}_inner): Merge these into
+	ppc_elf_relocate_section since that is now the only caller.
+	(ppc_elf_relocate_section): Ditto.
+
+Wed Jan  3 15:11:30 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffcode.h (coff_write_object_contents): If we don't know the
+	section of the entry point for an XCOFF executable, always set the
+	entry address to -1.
+
+Tue Jan  2 14:17:15 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* elf.c (bfd_section_from_shdr): Add support for note sections.
+
+Tue Jan  2 13:10:25 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfd-in.h (struct _symbol_info): Add stab_type field.
+	* bfd-in2.h: Rebuild.
+	* aoutx.h (NAME(aout,get_symbol_info)): Set stab_type.
+
+	* elf32-ppc.c: Remove trailing newline from calls to
+        _bfd_error_handler.
+	(ppc_elf_merge_private_bfd_data): Only warn about endianness
+	difference if target endianness is known.
+
+For older changes see ChangeLog-9495
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-9899 sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-9899
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ChangeLog-9899	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ChangeLog-9899	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,5599 @@
+1999-12-29  Richard Henderson  <rth@cygnus.com>
+
+	* elflink.h (bfd_elf,size_dynamic_sections): Don't export all
+	if no dynamic sections created.
+
+1999-12-27  Nick Clifton  <nickc@cygnus.com>
+
+	* peicode.h (pe_bfd_object_p): Only define for PE format
+	targets.
+
+1999-12-17  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-i386.c (i3coff_object_p): Delete.
+	(i386coff_vec): Replace reference to i3coff_object_p with a
+	reference to coff_object_p.
+
+	* coff-mcore.c (pe_object_p): Delete.
+
+	* peicode.h (pe_bfd_object_p): New function: Detect the
+	presence of a PE format COFF object file.  Also detect and
+	warn about the presence of LINK6 format Image Library Format
+	object files.
+
+1999-12-16  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c (NUM_ELEM): New macro.
+	(NUM_RELOCS): New macro: The number of known ARM relocs.
+	(RTYPE2HOWTO): Return NULL if the reloc type is out of range.
+	(coff_arm_rtype_to_howto):  Return NULL if the reloc type is out
+	of range.
+	(bfd_arm_process_before_allocation): Produce a warning message if
+	an out of range symbol index is encountered.
+
+1999-12-14  Nick Clifton  <nickc@cygnus.com>
+
+	* elflink.h (is_global_symbol_definition): New Function: Return
+	true iff the symbol is being given a global definition in this
+	bfd.
+	(elf_link_is_defined_archive_symbol): Do not bother processing
+	symbols for an archive element that has already been included
+	in the link.
+	Use is_global_symbol_definition().
+
+1999-12-09  Andrew Cagney  <cagney@cygnus.com>
+
+	* config.bfd: Add support for sparc-*-netbsdelf* and
+	sparc-*-netbsdaout*.
+
+1999-12-13  Nick Clifton  <nickc@cygnus.com>
+
+	* elflink.h (elf_link_is_defined_archive_symbol): Check to see
+	if the symbol is in the common section.
+
+1999-12-10  Nick Clifton  <nickc@cygnus.com>
+
+	* elflink.h (elf_link_is_defined_archive_symbol): New
+	function: Decide if a symbol, in an archive map is there
+	because it is defined in the archive element, or because it is
+	just another common declaration of it.
+	(elf_link_add_archive_symbols): Use
+	elf_link_is_defined_archive_symbol to decide if an archive
+	element contain a reference to a common symbol should be
+	linked in or not.
+
+1999-12-10  Nick Clifton  <nickc@cygnus.com>
+
+	* elflink.h: Revert previous patch.
+	* targets.c: Revert previous patch.
+	* libbfd-in2.h: Revert previous patch.
+	* libbfd.h: Revert previous patch.
+	* elfxx-target.h: Revert previous patch.
+	* archive.c: Revert previous patch.
+	* aout-target.h: Revert previous patch.
+	* aout-tic30.h: Revert previous patch.
+	* bfd.c: Revert previous patch.
+	* coff-alpha.c: Revert previous patch.
+	* coff-rs6000.c: Revert previous patch.
+	* elf64-mips.c: Revert previous patch.
+	* ieee.c: Revert previous patch.
+	* libecoff.h: Revert previous patch.
+	* oasys.c: Revert previous patch.
+	* som.c: Revert previous patch.
+	* vms.c: Revert previous patch.
+
+1999-12-09  Nick Clifton  <nickc@cygnus.com>
+
+	* elflink.h (elf_link_add_archive_symbols): Add an archive
+	element even if contains a symbol which is currently only
+	considered to be a common.
+
+	* targets.c (struct bfd_target): Add new field
+	_bfd_allow_commons_in_armap.
+	* bfd-in2.h:Regenerate.
+
+	* libbfd-in2.h (_bfd_noarchive_allow_commons_in_armap):
+	Define.
+	 (_bfd_archive_bsd_allow_commons_in_armap): Define.
+	* libbfd.h: Regenerate.
+
+	* elfxx-target.h: If using COFF archive map, override
+	definition of allow_commons_in_armap and replace with
+	bfd_false.
+
+	* archive.c (bfd_compute_and_write_armap): Do not place common
+	symbols into the archive map unless _bfd_allow_commons_in_armap
+	returns true.
+
+	* aout-target.h (MY_allow_commons_in_armap): Define.
+	* aout-tic30.h (MY_allow_commons_in_armap): Define.
+	* bfd.c (bfd_allow_commons_in_armap): Define.
+	* coff-alpha.h (alpha_ecoff_allow_commons_in_armap): Define.
+	* coff-rs6000.h (xcoff_allow_commons_in_armap): Define.
+	* elf64-mips.c (bfd_elf64_allow_commons_in_armap): Define.
+	* ieee.c (ieee_ecoff_allow_commons_in_armap): Define.
+	* libecoff.h (_bfd_ecoff_allow_commons_in_armap): Define.
+	* oasys.c (oasys_allow_commons_in_armap): Define.
+	* som.c (som_allow_commons_in_armap): Define.
+	* vms.c (vms_allow_commons_in_armap): Define.
+
+1999-12-07  Jim Blandy  <jimb@cygnus.com>
+
+	Add support for SSE registers in ELF core files.
+	* elf.c (elfcore_make_note_pseudosection): New function.
+	(elfcore_grok_prfpreg): Use it.
+	(elfcore_grok_prxfpreg): New function.
+	(elfcore_grok_note): Recognize Linux NT_PRXFPREG notes.
+
+1999-12-03  Ian Lance Taylor  <ian@zembu.com>
+
+	* elf32-mips.c (mips_elf_calculate_relocation): Divide R_MIPS_PC16
+	value by 4 before storing it back in the field.  From
+	Koundinya. K <kk@ddeorg.soft.net>.
+
+Tue Nov 30 22:41:14 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* archures.c (bfd_mach_am33): Define.
+	* bfd-in2.h: Rebuilt.
+	* cpu-m10300.c (bfd_am33_arch): Add to the mn103 architecture list
+	* elf-m10300.c (mn10300_elf_relax_section): Handle am33 instructions.
+	(compute_function_info): Handle additional registers saved by
+	movm on the am33.
+	(elf_mn10300_mach): Handle E_MN10300_MACH_AM33.
+	(_bfd_mn10300_elf_final_write_processing): Handle bfd_mach_am33.
+
+1999-11-29  Jim Blandy  <jimb@cygnus.com>
+
+	* elf.c (bfd_get_elf_phdrs, bfd_get_elf_phdr_upper_bound): New
+	functions.
+	* bfd-in2.h (bfd_get_elf_phdrs, bfd_get_elf_phdr_upper_bound): New
+	declarations.
+
+1999-11-27  Michael Meissner  <meissner@cygnus.com>
+
+	* reloc.c (BFD_RELOC_ALPHA_USER_LITERAL): New relocation for
+	internal use within gas for alpha explicit relocations.
+	(BFD_RELOC_ALPHA_USER_LITUSE_BASE): Ditto.
+	(BFD_RELOC_ALPHA_USER_LITUSE_BYTOFF): Ditto.
+	(BFD_RELOC_ALPHA_USER_LITUSE_JSR): Ditto.
+	(BFD_RELOC_ALPHA_USER_GPDISP): Ditto.
+	(BFD_RELOC_ALPHA_USER_GPRELHIGH): Ditto.
+	(BFD_RELOC_ALPHA_USER_GPRELLOW): Ditto.
+
+	* elf64-alpha.c (elf64_alpha_reloc_map): Add mappings for
+	BFD_RELOC_ALPHA_USER_*.
+
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+
+1999-11-26  Fred Fish  <fnf@cygnus.com>
+
+	* elf.c (elfcore_read_notes): Add prototype for static function.
+	(_bfd_elf_make_section_from_phdr): Renamed from bfd_section_from_phdr.
+	(bfd_section_from_phdr): Replacement function that calls
+	_bfd_elf_make_section_from_phdr for generic segment types and
+	backend fucntion pointed to by elf_backend_section_from_phdr for
+	backend specific segment types.
+	(_bfd_elfcore_section_from_phdr): Remove call to elfcore_read_notes,
+	now called by _bfd_elf_make_section_from_phdr.  Note that this func
+	is now just a stub between the caller and bfd_section_from_phdr.
+
+	* elf-bfd.h (struct elf_backend_data): Add new function pointer
+	elf_backend_section_from_phdr.
+	(elf_backend_section_from_phdr): Add prototype.
+
+	* elfxx-target.h (elf_backend_section_from_phdr): Define default.
+	(elfNN_bed): Add elf_backend_section_from_phdr.
+
+1999-11-25  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c (bfd_arm_get_bfd_for_interworking):  Add
+	SEC_CODE and SEC_READONLY flags to glue sections.
+
+	* elf32-arm.h (bfd_elf32_arm_get_bfd_for_interworking): Add
+	SEC_CODE and SEC_READONLY flags to glue sections.
+
+1999-11-20  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-mcore.c (coff_mcore_relocate_section): Fix typo in previous
+	delta.
+
+1999-11-19  Catherine Moore  <clm@cygnus.com>
+
+	* elf32-m68k.c (elf_cpu32_plt0_entry): Fix encoding.
+	(elf_cpu32_plt_entry): Likewise.
+
+1999-11-18  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-mcore.c (coff_mcore_rtype_to_howto): Special case handling
+	for RVA relocs.
+	(coff_mcore_relocate_section): Initialise addend to 0.
+	Special case processing of RVA reloc.
+
+1999-11-17  Richard Henderson  <rth@cygnus.com>
+
+	* elf-bfd.h (struct elf_backend_data): Reorder collect and
+	type_change_ok; add sign_extend_vma.
+	* elf32-mips.c (elf_backend_sign_extend_vma): Define.
+	* elfcode.h (elf_swap_symbol_in): Mind be->sign_extend_vma.
+	(elf_swap_shdr_in, elf_swap_phdr_in): Likewise.
+	* elfxx-target.h (elf_backend_sign_extend_vma): Default.
+	(elfNN_bed): Follow struture changes.
+
+1999-11-09  Ian Lance Taylor  <ian@zembu.com>
+
+	* libbfd.c (bfd_read): Check result of read against desired result
+	using !=, not <.
+	(_bfd_generic_get_section_contents): Set bfd_error if the seek is
+	invalid compared to the section size.
+
+	* ieee.c (ieee_slurp_debug): Get the length of the debug
+	information right if there is no data part.
+
+Tue Nov  2 01:44:41 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* som.c (som_fixup_formats): Improve handling of R_AUX_UNWIND,
+	R_LINETAB, R_LINETAB_ESC, and R_COMMENT.
+
+1999-10-28  Ian Lance Taylor  <ian@zembu.com>
+
+	* elflink.h (elf_bfd_final_link): Make last_local signed.
+
+1999-10-27  Ian Lance Taylor  <ian@zembu.com>
+
+	* stabs.c (_bfd_link_section_stabs): Make sure .stabstr section
+	starts with a zero.
+
+Sat Oct 23 17:36:12 1999  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* archures.c: Add definitions bfd_mach_d10v, bfd_mach_d10v_ts2 and
+	bfd_mach_d10v_ts3.
+	* cpu-d10v.c (d10v_ts3_info, d10v_ts2_info): Add.
+	* bfd-in2.h: Regenerate.
+
+1999-10-15  Andrew Haley  <aph@cygnus.com>
+
+	* dwarf1.c (parse_die): Fail to parse a die if its length is zero.
+
+Sun Oct 17 17:19:00 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* libhppa.h (bfd_hppa_insn2fmt): Change to return an int.
+
+1999-10-08  Ian Lance Taylor  <ian@zembu.com>
+
+	* elflink.h (elf_merge_symbol): When overriding a weak symbol with
+	a defined symbol in a shared library, clear the DEF_DYNAMIC flag
+	too.
+
+Fri Oct  8 13:03:45 1999  Geoffrey Keating  <geoffk@cygnus.com>
+
+	* elf32-mips.c (mips_elf_calculate_relocation): R_MIPS_LITERAL
+	relocs also need the GP value.
+	(_bfd_mips_elf_relocate_section): Handle unpaired LO16 relocs
+	properly.  Handle sign-extension for R_MIPS_64 correctly.  Correct
+	the GP value for R_MIPS_LITERAL relocs too.  Handle
+	R_MIPS_64 relocs properly on big-endian MIPS.
+	(mips_elf_sign_extend): Behave properly with 'long long'.
+	(mips_elf_highest): Correct typo.
+
+Mon Oct  4 17:49:45 1999  Nick Clifton  <nickc@cygnus.com>
+
+	* cpu-m32r.c (arch_info_struct): New static global.
+	(bfd_m32r_arch): Refer to it.
+	* elf32-m32r.c (m32r_elf_object_p): Recognize E_M32RX_ARCH.
+	(m32r_elf_print_private_bfd_data): Ditto.
+	(m32r_elf_final_write_processing): Handle bfd_mach_m32rx.
+	* archures.c (bfd_mach_m32rx): Define it.
+	* bfd-in2.h: Rebuild.
+
+1999-09-28  Fred Fish  <fnf@cygnus.com>
+
+	* targets.c (cisco_core_vec): Replaced with two new vecs ...
+	(cisco_core_big_vec): Add new bigendian vec.
+	(cisco_core_little_vec): Add new little endian vec.
+
+	* cisco-core.c (CRASH_INFO): Fixed offset replaced with ...
+	(crash_info_locs): Add array of possible offsets.
+	(MASK_ADDR): Mask to apply to crash info offset.
+	(crashinfo_external): Add textbase, database, bssbase and
+	turn into a typedef.
+	(cisco_core_file_validate): Renamed from cisco_core_file_p.
+	Many small changes to account for additional hardware versions.
+	Pick a reasonable size for ".reg" section.  Add a ".crash"
+	section to allow access to crashinfo_external struct.
+	(cisco_core_file_p): New version of this function that
+	iterates over crash_info_locs, calling cisco_core_file_validate.
+	(cisco_core_vec): Old big endian only vec replaced with ...
+	(cisco_core_big_vec): Add big endian version.
+	(cisco_core_little_vec): Add little endian version.
+
+	* configure.in (cisco_core_vec): Split to two new vectors ...
+	(cisco_core_big_vec): New target vector.
+	(cisco_core_little_vec): New target vector.
+	* configure: Regenerate.
+	* config.bfd (targ): For m68*-*-aout* targ, change cisco_core_vec
+	to cisco_core_big_vec in targ_selvecs.
+
+1999-09-28  Geoffrey Keating  <geoffk@cygnus.com>
+
+	* elf32-mips.c (mips_elf_relocate_hi16): Unused, delete.
+	(mips_elf_relocate_got_local): Unused, delete.
+	(mips_elf_relocate_global_got): Unused, delete.
+
+1999-09-24  Fred Fish  <fnf@cygnus.com>
+
+	* elf.c (bfd_section_from_phdr): Add typename variable.  Use p_type
+	to initialize it to something meaningful.  Then use it to generate
+	more useful segment names.
+
+Sun Sep 19 12:16:47 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* som.c (NO_PCREL_MODES): Define if the system does not define
+	R_SHORT_PCREL_MODE.
+	(hppa_som_gen_reloc_type): Handle both short and long pcrel branches.
+	(som_write_fixups): Eliminate redundant pcrel mode relocs.  Handle
+	R_LONG_PCREL_MODE and R_SHORT_PCREL_MODE
+	* libhppa.h (dis_assemble_22): New function.
+	(bfd_hppa_insn2fmt): Handle long branch.
+
+	* libhppa.h (bfd_hppa_insn2fmt): Decode and handle formats found
+	in PA2.0.
+
+1999-09-17  Alan Modra  <alan@spri.levels.unisa.edu.au>
+
+	* coff-i386.c (coff_i386_reloc_type_lookup): Support BFD_RELOC_16,
+	BFD_RELOC_16_PCREL, BFD_RELOC_8, BFD_RELOC_8_PCREL relocs.
+	(reloc_howto_type howto_table): Tidy comments and whitespace.
+
+1999-09-17  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-arm.h (bfd_elf32_arm_get_bfd_for_interworking): Undo
+	previous delta.  Set sec->gc_mark instead.
+
+Thu Sep 16 11:21:13 1999  Catherine Moore  <clm@cygnus.com>
+
+	* elf32-m68k.c (elf_cpu32_plt0_entry): Use a1 instead of a0.
+	(elf_cpu32_plt_entry): Likewise.
+
+Thu Sep 16 10:48:17 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-hppa.h (elf_hppa_final_write_processing): Turn on TRAPNIL.
+
+	* elf-hppa.h (elf_hppa_final_link): If unable to find __gp in the
+	symbol table, then just compute a suitable value (but do not
+	create a __gp symbol).
+
+	* elf-hppa.h (elf_hppa_relocate_section): Allow undefined
+	symbols when building shared libraries.
+	(elf_hppa_final_link_relocate): Correct handling of PCREL
+	relocations against undefined symbols.
+
+1999-09-16  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-arm.h (bfd_elf32_arm_get_bfd_for_interworking): Mark
+	interworking sections as linker created so that they will not
+	be removed by garbage collection.
+
+Wed Sep 15 02:31:57 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-hppa.h (elf_hppa_final_link): Revamp __gp handling.
+	(elf_hppa_final_link_relocate): Consistently create an absolute
+	address, then subtract out the value of __gp.
+
+1999-09-14  Michael Meissner  <meissner@cygnus.com>
+
+	* configure.in (Canonicalization of target names): Remove adding
+	${CONFIG_SHELL} in front of $ac_config_sub, since autoconfig 2.14
+	generates $ac_config_sub with a ${CONFIG_SHELL} already.
+	* configure: Regenerate.
+
+1999-09-14  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-m32r.c (ELF_MAXPAGESIZE): Change to 0x1 (at request of
+	Mitsubishi).
+
+Mon Sep 13 20:01:47 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-hppa.h (elf_hppa_record_segment_addrs): New function.
+	(elf_hppa_final_link): Initialize text_segment_base and
+	data_segment_base.
+	(elf_hppa_final_link_relocate): Handle SEGREL relocations.
+
+	* elf-hppa.h (elf_hppa_final_link): Remove unused variables.
+	(elf_hppa_final_link_relocate): Likewise.
+	(elf_hppa_relocate_insn): Likewise.
+	(elf_hppa_relocate_section): Initialize HOWTO.
+
+1999-09-13  Donn Terry  <donn@interix.com>
+
+	* coffcode.h (styp_to_sec_flags): Further refinement of COMDAT
+	handling to support both GNU and MS objects.
+
+	* coffcode.h (coff_write_object_contents): Don't check reloc_count
+	when determining whether to set F_RELFLG.
+
+1999-09-13  Philip Blundell  <pb@nexus.co.uk>
+
+	* elf32-arm.h (elf32_arm_final_link_relocate): Don't range-check
+	PC24 relocs if the target is an undefined weak symbol.
+	(arm_add_to_rel): Fix compiler warning.
+	(elf32_arm_plt0_entry): Correct comments.
+
+1999-09-13  Alan Modra  <alan@spri.levels.unisa.edu.au>
+
+	* elfcode.h (write_relocs): Check for the_bfd NULL when handling
+	an absolute symbol in REL relocs.
+
+Sun Sep 12 23:47:58 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-hppa.h (elf_hppa_final_link_relocate): Handle SECREL32.
+	Stub SEGREL32.  Return an error for any relocation not handled.
+
+1999-09-12  Ian Lance Taylor  <ian@zembu.com>
+
+	* cofflink.c (coff_link_add_symbols): Look for special MSVC string
+	constant symbols, and avoid multiple definition errors on them.
+
+1999-09-12  Donn Terry  <donn@interix.com>
+
+	* libbfd.c (bfd_log2): Rewrite to avoid infinite loop if most
+	significant bit is set.
+
+1999-09-11  Ian Lance Taylor  <ian@zembu.com>
+
+	* coff-ppc.c (COFF_SECTION_ALIGNMENT_ENTRIES): Define.
+
+	* elfcode.h (write_relocs): Handle an absolute symbol in REL
+	relocs as we do for RELA relocs.
+
+1999-09-11  Donn Terry  <donn@interix.com>
+
+	* libpei.h (_bfd_pei_final_link_postscript): Declare.
+	(coff_final_link_postscript): Define.
+	* peigen.c (_bfd_pei_swap_aouthdr_out): Don't set value for data
+	directory entries here.
+	(_bfd_pei_final_link_postscript): New function.
+
+	* peigen.c (_bfd_pei_swap_scnhdr_out): Remove code which sets
+	section flags based on the section name.
+
+	* peicode.h (coff_swap_scnhdr_in): If COFF_IMAGE_WITH_PE, the
+	get the overflow of the s_nlnno field from the s_nreloc field.
+	* peigen.c (_bfd_pei_swap_scnhdr_out): If doing a final link, swap
+	the s_nlnno overflow of the .text section into the s_nreloc
+	field.
+
+	* peigen.c (add_data_entry): Declare.
+	(pei_swap_aouthdr_out): Get image size right.  Set linker version
+	more intuitively.
+	(pei_swap_scnhdr_out): Test for UNINIT section, not .bss.
+	(pe_print_idata): Code cleanup, print more info, get rid of (now)
+	extraneous ImageBase.
+	(pe_print_edata): Likewise.
+	(pe_print_pdata): Likewise.  Print exception entries.
+	(pe_print_reloc): Likewise.  Print MIPS_JMPADDR.
+	(tbl): Make const, add "UNKNOWN".
+	(_bfd_pe_print_private_bfd_data_common): Print timestamp.
+	(_bfd_pe_bfd_copy_private_bfd_data_common): Don't copy deleted
+	section data directory.
+	(_bfd_pe_bfd_copy_private_section_data): Copy pe_flags.
+
+	* libpei.h (_bfd_pe_bfd_get_symbol_info): Declare.
+	* peigen.c (_bfd_pe_bfd_get_symbol_info): New function.
+	* peicode.h (coff_get_symbol_info): Define.
+
+	* config.bfd (i[3456]86-*-interix*): Set targ_cflags to
+	-DSTRICT_PE_FORMAT.
+	* coffcode.h (styp_to_sec_flags): Check STRICT_PE_FORMAT rather
+	than __INTERIX.
+	(coff_classify_symbol): Re-revert 1999-08-08 patch if
+	STRICT_PE_FORMAT.
+
+	* libpei.h: New file, broken out of peicode.h.
+	* peigen.c: New file, broken out of peicode.h.
+	* peicode.h: A bunch of code moved out to libpei.h and peigen.c.
+	* configure.in: Add peigen.lo to list of files required for each
+	PE target.
+	* Makefile.am: Rebuild dependencies.
+	(BFD32_BACKENDS): Add peigen.lo.
+	(BFD32_BACKENDS_CFILES): Add peigen.c.
+	(SOURCE_HFILES): Add libpei.h.
+	* configure, Makefile.in: Rebuild.
+
+	* peicode.h (coff_swap_scnhdr_in): Don't check for a special
+	section name of _BSS; check IMAGE_SCN_CNT_UNINITIALIZED_DATA
+	instead.  Don't clear the s_paddr field for an uninitialized data
+	section.
+
+	* coffcode.h (coff_mkobject_hook): Set timestamp field in
+	coff_data_type to f_timdat.
+	* peicode.h (pe_mkobject_hook): Likewise.
+
+	* peicode.h (coff_swap_filehdr_in): Check the NT executable magic
+	number if COFF_IMAGE_WITH_PE.
+
+	* coffcode.h (coff_mkobject_hook): If COFF_WITH_PE, set HAS_DEBUG
+	to the reverse of IMAGE_FILE_DEBUG_STRIPPED.
+	(coff_write_object_contents): Set IMAGE_FILE_DEBUG_STRIPPED if
+	there is no SEC_DEBUGGING section.
+	* peicode.h (pe_mkobject_hook): Set HAS_DEBUG to the reverse of
+	IMAGE_FILE_DEBUG_STRIPPED.
+
+	* pe-i386.c (COFF_LONG_FILENAMES): Define.
+	(COFF_SECTION_ALIGNMENT_ENTRIES): Define.
+	* pei-i386.c (COFF_LONG_FILENAMES): Define.
+	(COFF_SECTION_ALIGNMENT_ENTRIES): Define.
+
+	* coffswap.h (IMAGE_BASE): Don't define.
+	* pei-arm.c (IMAGE_BASE): Don't define.
+	* pei-i386.c (IMAGE_BASE): Don't define.
+	* pei-mcore.c (IMAGE_BASE): Don't define.
+	* pei-ppc.c (IMAGE_BASE): Don't define.
+
+	* cofflink.c (_bfd_coff_link_input_bfd): When writing out a
+	symbol, switch on the class when determining whether to modify the
+	value.  For PE, don't modify the value of a C_FCN symbol not named
+	.bf.
+
+	* libbfd-in.h (_bfd_abort): Declare.
+	(abort): Define.
+	* bfd.c (_bfd_abort): New function.
+	* libbfd.h: Rebuild.
+
+	* coffcode.h (coff_set_alignment_hook): Delete POWERPC_LE_PE
+	special handling.
+
+	* cofflink.c (_bfd_coff_link_input_bfd): If a symbol is stripped,
+	don't write out the associated line numbers.
+
+	* cofflink.c (_bfd_coff_write_global_sym): Handle section symbol
+	aux entries.
+
+	* cofflink.c (coff_link_add_symbols): Don't warn about symbol type
+	changes when the base type is unknown.
+
+	* coffgen.c (coff_print_symbol): Fix printing of aux record for
+	function symbols.
+
+	* syms.c (BSF_DEBUGGING_RELOC): Define.
+	* coffcode.h (coff_slurp_symbol_table): If PE, set BSF_DEBUGGING
+	for C_FCN/C_EFCN symbols, and set BSF_DEBUGGING_RELOC for such
+	symbols named .bf.
+	* coffgen.c (fixup_symbol_value): Relocate a symbol which has
+	BSF_DEBUGGING_RELOC set.
+	* bfd-in2.h: Rebuild.
+
+1999-09-10  Ian Lance Taylor  <ian@zembu.com>
+
+	* ecoff.c (bfd_debug_section): Update initialization for new
+	comdat_info field.
+	(_bfd_ecoff_styp_to_sec_flags): Add section parameter.
+	* libecoff.h (_bfd_ecoff_styp_to_sec_flags): Update declaration.
+
+1999-09-10  H.J. Lu  <hjl@gnu.org>
+
+	* coff-alpha.c (alpha_ecoff_backend_data): Initialize the new
+	_bfd_filnmlen field.
+	* coff-mips.c (mips_ecoff_backend_data): Likewise.
+
+Fri Sep 10 00:35:14 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-hppa.h (elf_hppa_final_link_relocate): Create .opd entries
+	for FPTR relocs involving local symbols.
+
+	* elf-hppa.h (elf_hppa_final_link_relocate): Get the right
+	value for the stub address in a call through a stub.
+	Install the value for a local symbol directly into the DLT
+	instead of generating a reloc.  Correctly handle FPTR64 relocs.
+
+	* elf-hppa.h (elf_hppa_unmark_useless_dynamic_symbols): New function.
+	(elf_hppa_remark_useless_dynamic_symbols): Similarly.
+	(elf_hppa_final_link): Call them.
+
+1999-09-10  Ian Lance Taylor  <ian@zembu.com>
+
+	* elflink.h (elf_fix_symbol_flags): Move weakdef handling here...
+	(elf_adjust_dynamic_symbol): ...from here.
+
+Wed Sep  8 17:56:11 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-hppa.h (elf_hppa_howto_table); There is no DIR64WR, DIR64DR
+	relocation, remove them.  SECREL64->LTOFF16WF.
+	(elf_hppa_final_link_relocate): Handle LTOFF* relocations.  Handle
+	DIR* relocations.
+	(elf_hppa_relocate_insn): Similarly.
+
+	* elf-hppa.h (elf_hppa_final_link_relocate): Handle PLTOFF* relocs.
+	(elf_hppa_relocate_insn): Similarly.
+
+	* elf-hppa.h (elf_hppa_final_link_relocate): Handle DPREL* and
+	GPREL* relocations.
+	(elf_hppa_relocate_insn): Similarly.
+
+	* elf-hppa.h (elf_hppa_link_final_relocate): Fix typos.
+	Handle LTOFF_TP* relocs.
+	(elf_hppa_relocate_insn): Similarly.
+
+	* elf-hppa.h (elf_hppa_final_link_relocate): Handle PCREL* relocs.
+	Consistently deal with addends.  Handle DLTIND14F and DLTREL14F.
+	(elf_hppa_relocate_insn): Handle PCREL* relocs.
+
+	* elf-hppa.h (elf_hppa_final_link_relocate): Handle LT_OFF_FPTR*,
+	DIR32, DIR64 and FPTR64 relocations.
+	(elf_hppa_relocate_insn): Similarly.
+
+	* elf-hppa.h (elf_hppa_final_link): Set the value of __gp to the
+	address of the .PARISC.global section.
+	(elf_hppa_relocate_section): Lookup and pass the PA64 hash
+	table entry elf_hppa_final_link_relocate.  Do not give a warning
+	for a reloc against an external symbol if it has a PA64 hash
+	table entry.
+	(elf_hppa_final_link_relocate): Significantly rework.  Handle
+	DLTIND relocations.  Compute the final value of the relocation
+	before passing the value of elf_hppa_relocate_insn.
+	(elf_hppa_relocate_insn): Revamp to handle just bit tiwiddling
+	relocation support.  Handle DLTIND relocation requests just like
+	DLTREL relocation requests.  Simplify branch handling.
+
+1999-09-08  Ulrich Drepper  <drepper@cygnus.com>
+
+	* elf-hppa.h (elf_hppa_relocate_section): Catch problems with
+	non-allocated section as done in i386 version.
+	(elf_hppa_final_link_relocate): Uncomment R_PARISC_14F in switch
+	statement since this is no know relocation.
+
+Tue Sep  7 17:25:12 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-hppa.h (elf_hppa_final_link_relocate): Handle DLTREL14F
+	relocs.
+	(elf_hppa_relocate_insn): Similarly.
+
+	* elf-hppa.h (elf_hppa_final_link_relocate): Handle DLTREL14WR and
+	DLTREL14WD relocs.
+	(elf_hppa_relocate_insn): Similarly.
+
+	* elf-hppa.h (elf_hppa_final_link_relocate): Handle DLTREL14R and
+	DLTREL21L relocs.  Pass the output bfd to elf_hppa_relocate_insn.
+	Pass the relocate type rather than the insn format to
+	elf_hppa_relocate_insn.
+	(elf_hppa_relocate_insn): Make switch dependent on relocation type
+	rather than the opcode.  Handle DLTREL21L and DLTREL14R relocs.
+
+1999-09-07  Ian Lance Taylor  <ian@zembu.com>
+
+	* coffcode.h (bfd_coff_backend_data): Add _bfd_filnmlen field.
+	(bfd_coff_filnmlen): Define.
+	(bfd_coff_std_swap_table): Initialize new field.
+	* coffgen.c (coff_fix_symbol_name): Use bfd_coff_filnmlen rather
+	than FILNMLEN.
+	(coff_write_symbols): Likewise.
+	(coff_get_normalized_symtab): Likewise.
+	* coff-sh.c (bfd_coff_small_swap_table): Initialize new field.
+	* libcoff.h: Rebuild.
+
+1999-09-06  Donn Terry  <donn@interix.com>
+
+	* coffcode.h (sort_by_secaddr): New static function if
+	COFF_IMAGE_WITH_PE.
+	(coff_compute_section_file_positions): If COFF_IMAGE_WITH_PE, sort
+	sections by VMA when assigning target_index values.  Always set
+	virt_size.
+
+	* libcoff-in.h (struct pei_section_tdata): Add pe_flags field.
+	* coffcode.h (coff_set_alignment_hook) [COFF_WITH_PE version]: Set
+	pe_flags field.
+	* libcoff.h: Rebuild.
+
+	* coffcode.h (coff_set_custom_section_alignment): Add const to
+	declaration to match definition.
+	(coff_write_object_contents): Don't set F_AR32W(R)? if
+	COFF_WITH_PE.
+
+	* coff-i386.c (in_reloc_p): Add declaration.
+	(i386coff_vec): Simplify initialization of
+	application_section_flags.
+
+	* coffcode.h (sec_to_styp_flags): Write separate COFF_WITH_PE
+	version.  Move COFF_WITH_PE specific code to new version.
+	(stype_to_sec_flags): Likewise.  Add section parameter.
+	* coffgen.c (make_a_section_from_file): Set target_index before
+	calling styp_to_sec_flags.  Pass section to styp_to_sec_flags.
+	* libcoff.h: Rebuild.
+
+	* syms.c (stt): Add some PE/PEI section names.
+	(bfd_decode_symclass): Return 'w', not 'U', for a weak undefined
+	symbol.
+	(bfd_symbol_info): Check for 'w'.
+
+	* section.c (struct bfd_comdat_info): Define.
+	(asection): Add comdat field.
+	(STD_SECTION): Initialize comdat field.
+	(bfd_make_section_anyway): Likewise.
+	* bfd-in2.h: Rebuild.
+
+1999-09-06  Andreas Schwab  <schwab@suse.de>
+
+	* elflink.h (elf_link_add_object_symbols): Copy NON_GOT_REF flag
+	to version symbols.
+
+1999-09-06  Nick Clifton  <nickc@cygnus.com>
+
+	* elflink.h (elf_gc_record_vtentry): Use bfd_zmalloc and
+	bfd_realloc instead of calloc and realloc.
+
+1999-09-04  Steve Chamberlain  <sac@pobox.com>
+
+	* cpu-pj.c: New file.
+	* elf32-pj.c: New file.
+	* config.bfd (pj*): New cpu.
+	(pj-*-*, pjl-*-*): New targets.
+	* configure.in (bfd_elf32_pj_vec): New target vector.
+	(bfd_elf32_pjl_vec): New target vector.
+	* archures.c (bfd_arch_pj): Define.
+	* elf.c (prep_headers): Handle bfd_arch_pj.
+	* reloc.c: Define BFD_RELOC_PJ_* relocations.
+	* targets.c (bfd_elf32_pj_vec, bfd_elf32_pjl_vec): Declare and add
+	to target vector list.
+	* Makefile.am: Rebuild dependencies.
+	(ALL_MACHINES): Add cpu-pj.lo.
+	(ALL_MACHINES_CFILES): Add cpu-pj.c.
+	(BFD32_BACKENDS): Add elf32-pj.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-pj.c.
+	* configure, Makefile.in, bfd-in2.h, libbfd.h: Rebuild.
+
+1999-09-04  Ian Lance Taylor  <ian@zembu.com>
+
+	* elf-bfd.h (ELF_LINK_NON_GOT_REF): Define.
+	* elflink.h (elf_adjust_dynamic_symbol): Copy REF_REGULAR_NONWEAK
+	and NON_GOT_REF from weak defined symbol to real symbol.
+	* elf32-i386.c (elf_i386_check_relocs): Set NON_GOT_REF.
+	(elf_i386_adjust_dynamic_symbol): If NON_GOT_REF is not set, don't
+	create a COPY reloc.
+	* elf32-sparc.c (elf32_sparc_check_relocs): Set NON_GOT_REF.
+	(elf32_sparc_adjust_dynamic_symbol): If NON_GOT_REF is not set,
+	don't create a COPY reloc.
+
+1999-09-03  Ian Lance Taylor  <ian@zembu.com>
+
+	* elflink.h (elf_bfd_final_link): When counting relocations, don't
+	count those in sections we are not including in the link.
+
+Thu Sep  2 17:41:20 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* elflink.h (elf_link_add_object_symbols): Work around bogus SH_LINK
+	field in hpux11 shared libraries.
+
+1999-09-02  Nick Clifton  <nickc@cygnus.com>
+
+	* elflink.h (elf_gc_record_vtentry): Fix memory leak.
+
+Wed Sep  1 13:34:29 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-hppa.h (elf_hppa_add_symbol_hook): New function.
+	(elf_hppa_final_link, elf_hppa_relocate_section): Likewise.
+	(elf_hppa_final_link_relocate, elf_hppa_relocate_insn): Likewise.
+
+1999-08-31  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+	* elflink.h (record_link_assignment): When possible, keep the
+	original type of the symbol.
+
+Mon Aug 30 15:26:48 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-hppa.h (_bfd_elf_hppa_gen_reloc_type): Allow both
+	R_PARISC_DIR32 and R_PARISC_DIR64 regardless of how the
+	tools were configured.
+	* elf32-hppa.h (_bfd_elf32_hppa_gen_reloc_type): Declare.
+
+1999-08-26  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (_bfd_mips_elf_check_relocs): Don't allocate local
+	GOT entries for GOT16 relocations; they're not required.
+
+1999-08-24  Nick Clifton  <nickc@cygnus.com>
+
+	From a patch submitted by Roland McGrath  <roland@baalperazim.frob.com>
+
+	* config.bfd (arm-*-netbsd*): New target.
+	* configure.in (armnetbsd_vec): New target vector.
+	* configure: Regenerate
+	* targets.c (bfd_target_vector): Add &armnetbsd_vec.
+
+	* Makefile.am (BFD32_BACKENDS): Add armnetbsd.lo.
+	(ALL_MACHINES_CFILES): Add armnetbsd.c.
+	(armnetbsd.lo): New rule with deps.
+	* Makefile.in: Regenerate.
+
+	* armnetbsd.c: New file:  Definitions specific to arm-netbsd
+	target.
+
+Tue Aug 24 00:25:58 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* som.c (som_slurp_symbol_table): Fix typo in comment.
+
+Fri Aug 20 17:01:23 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-hppa.h (elf_hppa_fake_sections): Compute section indices
+	here instead of using elf_section_data...
+
+1999-08-19  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-mcore.c (mcore_emit_base_file_entry): New function:  Emit
+	relocations into the base file.
+	(coff_mcore_relocate_section): Call mcore_emit_base_file_entry if
+	we are building a base file.
+
+1999-08-19  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-arm.h (arm_add_to_rel): New function.  Add a value to
+	a REL style reloc.
+	(elf32_arm_relocate_section): Use arm_add_to_rel to increment
+	REL relocs when performing a partial relocation.
+
+1999-08-18  Donn Terry  <donn@interix.com>
+
+	* cofflink.c: Move definitions of N_TMASK, et. al., out of
+	_bfd_coff_link_input_bfd into top level.
+
+	* coff-i386.c (coff_i386_reloc): Handle R_IMAGEBASE.
+	(RTYPE2HOWTO): Return NULL if reloc type is out of range.
+	(coff_i386_rtype_to_howto): Likewise.
+	* coffcode.h (coff_slurp_symbol_table): Change a -2 to N_DEBUG.
+	Completely ignore symbols which are all zero.
+	(dummy_reloc16_estimate): Add return 0.
+	* cofflink.c (_bfd_coff_link_input_bfd): Rename inner scope
+	variable copy to name_copy to avoid shadowing outer scope
+	variable.
+	* libcoff-in.h (coff_data_type): Change raw_syment_count field
+	from unsigned int to unsigned long.  Add timestamp field.
+	* libcoff.h: Rebuild.
+
+1999-08-17  H.J. Lu  <hjl@gnu.org>
+
+	* elf32-hppa.c (bfd_elf32_bfd_is_local_label_name): Fix typo in
+	macro definition.
+
+1999-08-17  Ian Lance Taylor  <ian@zembu.com>
+
+	* elf32-mips.c (_bfd_mips_elf_add_symbol_hook): Set BSF_DYNAMIC
+	for special section symbols.
+	* elflink.h (elf_merge_symbol): If we have no old BFD, check
+	BSF_DYNAMIC on the section symbol to see whether the old BFD is
+	dynamic.
+
+1999-08-15  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (mips_elf_calculate_relocation): Fix unfortunate
+	coincidence of variable names between old and new code.
+
+1999-08-12  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-arm.h (elf32_arm_to_thumb_stub):  Make 'offset' parameter
+	into a bfd_vma and 'addend' parameter a 'bfd_signed_vma'.
+	(elf32_thumb_to_arm_stub):  Make 'offset' parameter into a bfd_vma
+	and 'addend' parameter a 'bfd_signed_vma'.
+	(elf32_arm_final_link_relocate): Do not involve stubs in
+	R_ARM_THM_PC22 relocs relative to section symbols, they are long
+	jumps, not function calls.
+
+1999-08-11  Robin Farine <advanc@dial.eunet.ch>
+
+	* elf32-arm.h (elf32_arm_final_link_relocate): Check for overflow
+	in R_ARM_PC24 relocs.
+
+Tue Aug 10 12:48:09 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-hppa.h (elf_hppa_fake_sections): New function.
+	* elf32-hppa.c (elf_backend_fake_sections): Define.
+
+	* elf-hppa.h (elf_hppa_final_write_processing): Update for
+	recent changes to the arch_info structure.
+
+	* elf-hppa.h (_bfd_elf_hppa_gen_reloc_type): Handle
+	R_HPPA_SEGBASE and R_HPPA_SEGREL32.
+	* cpu-hppa.c (bfd_hppa20w_arch): New entry in architecture info
+	list.
+
+Tue Aug 10 00:34:29 1999  Mark P. Mitchell  <mark@codesourcery.com>
+	                  Ralf Baechle <ralf@uni-koblenz.de>
+
+	* elf32-mips.c (_bfd_mips_elf_size_dynamic_sections): Always
+	output DT_MIPS_GOTSYM.
+	(_bfd_mips_elf_finish_dynamic_sections): Use the same value as
+	DT_MIPS_SYMTABNO if there are no global GOT symbols.
+
+Tue Aug 10 00:21:08 1999  Mark P. Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (mips_elf_create_dynamic_relocation): Change
+	prototype.  Handle local symbols.  Add commentary.
+	(mips_elf_calculate_relocation): Adjust accordingly.
+	(_bfd_mips_elf_check_relocs): Handle local symbols in R_MIPS_32
+	relocations.
+
+	* elflink.h (elf_bfd_final_link): Tweak last change.
+
+1999-08-09  Mark Mitchell  <mark@codesourcery.com>
+
+	* elflink.h (elf_link_size_reloc_section): Use the counts in the
+	elf-section data to allocate just the right amount of relocation
+	space.  Don't allocate the hash space twice.
+	(elf_bfd_final_link): Calculate the amount of space to allocate in
+	each relocation section.
+
+Mon Aug  9 17:37:30 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-hppa.h (_bfd_elf_hppa_gen_reloc_type, case 32): When in
+	64bit mode, generate a section relative relocation for a 32bit
+	wide relocation.
+	(elf_hppa_is_local_label_name): New function.
+	* elf32-hppa.c (elf_hppa_is_local_label_name): Deleted.  To be
+	shared between 32bit and 64bit port.
+
+1999-08-09  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (elf_mips_howto_table): Fix src_mask for
+	R_MIPS_GOT16 and R_MIPS_CALL16.
+	(mips_elf_got16_entry): Use mips_elf_high to calculate the value
+	to use when looking for a preexisting GOT entry.
+
+1999-08-09  Jakub Jelinek  <jj@ultra.linux.cz>
+
+	* elf64-sparc.c (sparc64_elf_relocate_section): Back out part of
+	the Sep. 4th, 1998 change.  glibc 2.0.x dynamic linker had bug,
+	not binutils.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+
+1999-08-09  Geoff Keating  <geoffk@cygnus.com>
+
+	* elflink.h (elf_link_output_extsym): Don't output a weak
+	reference to an undefined symbol just because it was defined weak
+	in a shared object.
+
+1999-08-09  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* coffgen.c (coff_find_nearest_line): When looking for file, use
+	last best match rather than first.  If address is beyond last line
+	number record, don't return the last line as the correct value.
+
+1999-08-08  Ian Lance Taylor  <ian@zembu.com>
+
+	* section.c (SEC_SMALL_DATA): Rename from SEC_SHORT.
+	* bfd-in2.h: Rebuild.
+
+1999-08-08  Mark Elbrecht  <snowball3@bigfoot.com>
+
+	* libcoff-in.h (struct coff_section_alignment_entry): Define.
+	* coffcode.h (coff_set_custom_section_alignment): New static
+	function.
+	(coff_section_alignment_table): New static array.
+	(coff_new_section_hook): Use coff_set_customer_section_alignment.
+	* coff-go32.c (COFF_SECTION_ALIGNMENT_ENTRIES): Define.
+	* coff-stgo32.c (COFF_SECTION_ALIGNMENT_ENTRIES): Define.
+	* libcoff.h: Rebuild.
+
+1999-08-08  Ian Lance Taylor  <ian@zembu.com>
+
+	* Makefile.am: Rename .dep* files to DEP*.  Change DEP variable to
+	MKDEP.
+	* Makefile.in: Rebuild.
+
+1999-08-08  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* section.c (SEC_SHARED): Define.
+	* coffcode.h (sec_to_styp_flags): Handle SEC_SHARED.
+	(styp_to_sec_flags): Likewise.
+	* peicode.h (coff_swap_scnhdr_out): Likewise.
+	* bfd-in2.h: Rebuild.
+
+1999-08-08  Ian Lance Taylor  <ian@zembu.com>
+
+	* coffcode.h (coff_classify_symbol): Comment out part of
+	1999-08-05 change which breaks cygwin DLLs.
+
+	* acinclude.m4 (BFD_BINARY_FOPEN): Change -windows to -windows*.
+	* aclocal.m4, configure: Rebuild.
+
+1999-08-06  Ian Lance Taylor  <ian@zembu.com>
+
+	* section.c (global_syms): Only initialize union field if
+	__STDC__.
+
+1999-08-04  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (mips_elf_got16_entry): Don't multiply GOT index by
+	the size of a GOT entry here.
+	(mips_elf_calculate_relocation): Don't create a local GOT entry
+	for the symbol in a GOT16 relocation; just for it's high-order bit
+	(_bfd_mips_elf_relocate_section): Fix thinko.
+
+1999-08-05  Ian Lance Taylor  <ian@zembu.com>
+
+	Based on patches from Donn Terry <donn@interix.com>:
+	* coffcode.h (enum coff_symbol_classification): Define.
+	(bfd_coff_backend_data): Rename _bfd_coff_sym_is_global to
+	_bfd_coff_classify_symbol.  Change return type.
+	(bfd_coff_classify_symbol): Rename from bfd_coff_sym_is_global.
+	(coff_slurp_symbol_table): Use coff_classify_symbol.
+	(coff_classify_symbol): New static function.
+	(coff_sym_is_global): Never define.
+	(bfd_coff_std_swap_table): Initialize with coff_classify_symbol.
+	* cofflink.c (coff_link_check_ar_symbols): Use
+	bfd_coff_classify_symbol rather than bfd_coff_sym_is_global.
+	(coff_link_add_symbols): Likewise.
+	(_bfd_coff_link_input_bfd): Likewise.
+	* coff-sh.c (bfd_coff_small_swap_table): Initialize with
+	coff_classify_symbol.
+	* libcoff.h: Rebuild.
+
+Wed Aug  4 18:08:07 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* libhppa.h (R_HPPA_LTPSEL, R_HPPA_RTPSEL): New field selectors
+	(e_ltpsel, e_rtpsel): Similarly.
+
+	* elf-hppa.h (_bfd_elf_hppa_gen_reloc_type): Handle 21bit e_ltpsel
+	and 14bit ertpsel.  Handle 64bit psel.
+
+1999-08-04  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (_bfd_mips_elf_relocate_section): Tweak HI16/LO16
+	handling for REL relocations.  And only left-shift R_MIPS26
+	relocation addends where necessary.
+
+1999-08-03  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (mips_elf_next_lo16_addend): Rename to ...
+	(mips_elf_next_lo16_relocation): Don't compute the addend here.
+	Just return the relocation found.
+	(mips_elf_relocate_section): Pull the LO16 addend out of the
+	section itself when using REL relocations.
+
+	* elf32-mips.c (mips_elf_calculate_relocation): Restore
+	_DYNAMIC_LINK handling and handling of undefined symbols in shared
+	libraries.
+
+1999-08-03  Ian Lance Taylor  <ian@zembu.com>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Don't use the relocation
+	value of a symbol in a SEC_DEBUGGING section.  Warn when doing a
+	relocation against a symbol in an input section with no output
+	section.  From Daniel Jacobowitz <drow@false.org>.
+
+	* coff-stgo32.c (go32_stubbed_coff_object_p): Remove; not used.
+
+	* acinclude.m4 (BFD_CC_FOR_BUILD): Change to use conftest, and to
+	look for generated file correctly.
+	* aclocal.m4, configure: Rebuild.
+
+1999-08-02  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (_bfd_mips_elf_relocate_section): Handle R_MIPS_26
+	and R_MIPS16_26 relocations correctly when relocating.
+	(_bfd_mips_elf_check_relocs): Don't assume that R_MIPS_CALL_HI16
+	and R_MIPS_CALL_LO16 are for global symbols.
+
+1999-08-02  Jakub Jelinek  <jj@ultra.linux.cz>
+
+	* elflink.h (elf_bfd_final_link): Copy the whole isym, not just
+	some fields.
+	* elf64-sparc.c (sparc64_elf_output_arch_syms): Declare used
+	variables and initialize them.
+
+1999-08-01  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (_bfd_mips_elf_final_link): Handle the case where
+	there are no global symbols requiring GOT entries.
+	(_bfd_mips_elf_size_dynamic_sections): Likewise.
+	(_bfd_mips_elf_finish_dynamic_symbol): Likewise.
+	(_bfd_mips_elf_finish_dynamic_sections): Likewise.
+
+	* elf32-mips.c (mips_elf_calculate_relocation): Undefined weak
+	symbols are considered to have the value zero.
+	(_bfd_mips_elf_relocate_section): Don't try to perform a
+	relocation for an undefined symbol.
+	(_bfd_mips_elf_check_relocs): Allocate locate GOT space for local
+	GOT16 relocations.
+
+1999-07-30  Jakub Jelinek  <jj@ultra.linux.cz>
+
+	* elf64-sparc.c (sparc64_elf_build_plt): Cosmetic change - ABI
+	wants ba,a,pt %xcc instead of %icc.
+	Emit correct .PLT0-(.PLTN+4) initial value into the pointer slots
+	of large PLT entries.
+	(sparc64_elf_plt_ptr_offset): Fix calculation.
+	(sparc64_elf_finish_dynamic_symbol): Negative value of R_SPARC_JMP_SLOT
+	addend should be relative to load address, not .plt section start.
+	(sparc64_elf_size_info): Sparc64 uses 32bit .hash entries.
+
+1999-07-30  Jakub Jelinek  <jj@ultra.linux.cz>
+
+	* elf-bfd.h (struct elf_backend_data): Add
+	print_symbol_all and output_arch_syms backend methods.
+	* elfxx-target.h: Likewise.
+	* elf64-sparc.c (sparc64_elf_bfd_link_hash_table_create,
+	sparc64_elf_add_symbol_hook, sparc64_elf_output_arch_syms,
+	sparc64_elf_get_symbol_type, sparc64_elf_symbol_processing): New
+	functions.
+	(sparc64_elf_size_dynamic_sections): Leave space for STT_REGISTER
+	symbols in .dynsym, add their names into .dynstr. Put those symbols
+	into dynlocal.
+	(sparc64_elf_finish_dynamic_sections): Fix up DT_SPARC_REGISTER
+	pointers to STT_REGISTER symbols in dynsym section.
+	(sparc64_elf_print_symbol_all): New function.
+	* elf.c (bfd_elf_print_symbol): Allow special backend symbol
+	printing using the print_symbol_all hook.
+
+1999-07-30  Catherine Moore  <clm@cygnus.com>
+
+	* elf32-arm.h (elf32_arm_check_relocs):  Use r_offset for
+	R_ARM_GNU_VTENTRY.
+
+1999-07-29  Richard Henderson  <rth@cygnus.com>
+
+	* elf32-mips.c (_bfd_mips_elf_final_link): Only re-sort dynsyms if
+	dynamic_sections_created.
+
+1999-07-29  Richard Henderson  <rth@cygnus.com>
+
+	* elf32-mips.c (mips_info_to_howto_rel): Split out switch to ...
+	(mips_rtype_to_howto): ... new function.
+	(_bfd_mips_elf_relocate_section): Use it.
+
+1999-07-28  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (_bfd_mips_elf_relocate_section): Fix typo.
+
+1999-07-27  Nick Clifton  <nickc@cygnus.com>
+
+	Patch generated by Bernd Schmidt. <bernds@cygnus.co.uk>
+
+	* coff-arm.c (coff_arm_is_local_label_name): Change to strip
+	out only symbols that start with LOCAL_LABEL_PREFIX followed by 'L'.
+
+1999-07-23  Donn Terry  <donn@interix.com>
+
+	* libcoff-in.h (coff_link_hash_entry): Add coff_link_hash_flags
+	field, and define COFF_LINK_HASH_PE_SECTION_SYMBOL.
+	* cofflink.c (coff_link_add_symbols): If PE, handle section
+	symbols specially.
+	* libcoff.h: Rebuild.
+
+	* config.bfd (i[3456]86-*-interix*): New target.
+
+1999-07-21  Mark Elbrecht  <snowball3@bigfoot.com>
+
+	* coffcode.h (styp_to_sec_flags): If COFF_LONG_SECTION_NAMES and
+	COFF_SUPPORT_GNU_LINKONCE, mark sections whose names begin with
+	.gnu.linkonce with SEC_LINKONCE and SEC_LINK_DUPLICATES_DISCARD.
+	* coff-go32.c: (COFF_LONG_SECTION_NAMES): Define.
+	(COFF_SUPPORT_GNU_LINKONCE): Define.
+	* coff-stgo32.c: (COFF_LONG_SECTION_NAMES): Define.
+	(COFF_SUPPORT_GNU_LINKONCE): Define.
+
+1999-07-21  Ian Lance Taylor  <ian@zembu.com>
+
+	From Mark Elbrecht:
+	* makefile.dos: Remove; obsolete.
+	* configure.bat: Remove; obsolete.
+
+1999-07-21  H.J. Lu  <hjl@gnu.org>
+
+	* config.bfd (i[3456]86-*-vxworks*): Add targ_underscore=yes.
+
+1999-07-21  Philippe De Muyter  <phdm@macqel.be>
+
+	* cofflink.c (_bfd_coff_generic_relocate_section): Issue an error
+	message	and fail if a symbol index is out of range.
+
+1999-07-21  Ian Lance Taylor  <ian@zembu.com>
+
+	* elf32-mips.c (mips_elf_calculate_relocation): Get the GP value
+	when looking at a R_MIPS_GOT16 relocation.
+
+1999-07-20  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-m88k.c: Use CREATE_BIG_COFF_TARGET_VEC.
+
+Mon Jul 19 14:03:44 1999  Mark P. Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (_bfd_mips_elf_final_link): Restore setting of GP
+	removed in previous change.
+	(_bfd_mips_elf_relocate_section): Adjust GP relative relocations
+	in relocateable output.
+
+1999-07-19  Ian Lance Taylor  <ian@zembu.com>
+
+	* coff-m88k.c (m88kbcs_vec): Initialize new field of bfd_target
+	structure.
+
+	* elflink.h (elf_merge_symbol): Do merge symbols from the same BFD
+	if they appear to be specially created by the linker.
+
+1999-07-19  Nick Clifton  <nickc@cygnus.com>
+
+	* targets.c (alternative_target): New field in bfd_target
+	structure.
+	(bfd_search_for_target): New function:  Find a target that
+	satisifies a search function.
+	* bfd-in2.h: Regenerate.
+
+	* elfxx-target.h: Initialise the alternative_target field of
+	the bfd_target structures to point to the other target (if
+	defined).
+	* nlm-target.h: Initialise the alternative_target field of
+	the bfd_target structures to point to the other target (if
+	defined).
+
+	* coffcode.h (CREATE_BIG_COFF_TARGET_VEC): New macro.
+	(CREATE_LITTLE_COFF_TARGET_VEC): New macro.
+
+	* aix386-core.c: Initialise new field of bfd_target structure.
+	* aout-adobe.c: Initialise new field of bfd_target structure.
+	* aout-arm.c: Initialise new field of bfd_target structure.
+	* aout-target.h: Initialise new field of bfd_target structure.
+	* aout-tic30.c: Initialise new field of bfd_target structure.
+	* binary.c: Initialise new field of bfd_target structure.
+	* bout.c: Initialise new field of bfd_target structure.
+	* cisco-core.c: Initialise new field of bfd_target structure.
+	* coff-a29k.c: Use CREATE_BIG_COFF_TARGET_VEC.
+	* coff-alpha.c: Initialise new field of bfd_target structure.
+	* coff-apollo.c: Use CREATE_BIG_COFF_TARGET_VEC.
+	* coff-arm.c: Use CREATE_{BIG|LITTLE}_COFF_TARGET_VEC.
+	* coff-h8300.c: Use CREATE_BIG_COFF_TARGET_VEC.
+	* coff-h8500.c: Use CREATE_BIG_COFF_TARGET_VEC.
+	* coff-i386.c: Initialise new field of bfd_target structure.
+	* coff-i860.c: Initialise new field of bfd_target structure.
+	* coff-i960.c: Use CREATE_LITTLE_COFF_TARGET_VEC.
+	* coff-m68k.c: Use CREATE_BIG_COFF_TARGET_VEC.
+	* coff-mcore.c: Use CREATE_{BIG|LITTLE}_COFF_TARGET_VEC.
+	* coff-mips.c: Initialise new field of bfd_target structure.
+	* coff-ppc.c: Initialise new field of bfd_target structure.
+	* coff-rs6000.c: Initialise new field of bfd_target structure.
+	* coff-sh.c:  Use CREATE_{BIG|LITTLE}_COFF_TARGET_VEC.
+	* coff-sparc.c: Use CREATE_BIG_COFF_TARGET_VEC.
+	* coff-tic30.c: Initialise new field of bfd_target structure.
+	* coff-tic80.c: Use CREATE_LITTLE_COFF_TARGET_VEC.
+	* coff-w65.c:   Use CREATE_LITTLE_COFF_TARGET_VEC.
+	* coff-we32k.c: Use CREATE_BIG_COFF_TARGET_VEC.
+	* coff-z8k.c:   Use CREATE_BIG_COFF_TARGET_VEC.
+	* hppabsd-core.c: Initialise new field of bfd_target structure.
+	* hpux-core.c: Initialise new field of bfd_target structure.
+	* i386msdos.c: Initialise new field of bfd_target structure.
+	* i386os9k.c: Initialise new field of bfd_target structure.
+	* ieee.c: Initialise new field of bfd_target structure.
+	* ihex.c: Initialise new field of bfd_target structure.
+	* irix-core.c: Initialise new field of bfd_target structure.
+	* mipsbsd.c: Initialise new field of bfd_target structure.
+	* netbsd-core.c: Initialise new field of bfd_target structure.
+	* oasys.c: Initialise new field of bfd_target structure.
+	* osf-core.c: Initialise new field of bfd_target structure.
+	* ppcboot.c: Initialise new field of bfd_target structure.
+	* ptrace-core.c: Initialise new field of bfd_target structure.
+	* sco5-core.c: Initialise new field of bfd_target structure.
+	* som.c: Initialise new field of bfd_target structure.
+	* srec.c: Initialise new field of bfd_target structure.
+	* tekhex.c: Initialise new field of bfd_target structure.
+	* trad-core.c: Initialise new field of bfd_target structure.
+	* versados.c: Initialise new field of bfd_target structure.
+	* vms.c: Initialise new field of bfd_target structure.
+
+1999-07-19  Andreas Schwab  <schwab@suse.de>
+
+	* elflink.h (elf_bfd_final_link): Remove unused variables rel_hash
+	and rel_hdr.
+
+Sat Jul 17 02:28:28 1999  Mark P. Mitchell  <mark@codesourcery.com>
+
+	* elflink.h (elf_link_adjust_relocs): New function.
+	(elf_bfd_final_link): Use it.
+	(elf_link_input_bfd): Deal with the fact that there can be
+	two relocation sections for a single section.
+	(elf_reloc_link_order): Likewise.
+
+	* elf32-mips.c (_bfd_mips_elf_final_link): Don't set GP for
+	a relocateable object.
+	(_bfd_mips_elf_relocate_section): Handle relocateable links.
+
+1999-07-16  Jakub Jelinek  <jj@ultra.linux.cz>
+
+	* elf64-sparc.c (sparc64_elf_info_to_howto): Use ELF64_R_TYPE_ID.
+	(sparc64_elf_get_reloc_upper_bound,
+	sparc64_elf_get_dynamic_reloc_upper_bound,
+	sparc64_elf_slurp_one_reloc_table, sparc64_elf_slurp_reloc_table,
+	sparc64_elf_canonicalize_dynamic_reloc, sparc64_elf_write_relocs):
+	New functions.
+	(sparc64_elf_check_relocs, sparc64_elf_relocate_section): Use
+	ELF64_R_TYPE_ID/DATA where appropriate.
+
+1999-07-16  Jakub Jelinek  <jj@ultra.linux.cz>
+
+	* elf64-sparc.c (sparc64_elf_size_dynamic_sections): Remove
+	DT_SPARC_PLTFMT.
+
+1999-07-16  Ian Lance Taylor  <ian@zembu.com>
+
+	* elf32-mips.c (mips_elf_local_relocation_p): New static
+	function.
+	(mips_elf_next_lo16_addend): Call bfd_set_error on failure.
+	(mips_elf_calculate_relocation): Use mips_elf_local_relocation_p.
+	Always set *require_jalxp.
+	(mips_elf_stub_section_p): Mark abfd parameter as unused.
+	(_bfd_mips_elf_relocate_section): Only look for LO16 following
+	GOT16 if the GOT16 is against a local symbol.  Don't return false
+	for an undefined symbol.  If there is an overflow, assert that we
+	have a name.
+
+1999-07-16  Andreas Schwab  <schwab@suse.de>
+
+	* elflink.h (elf_link_record_local_dynamic_symbol): Remove unused
+	variables `link' and `elfsec'.
+	(elf_bfd_final_link): Remove unused variable `os'.
+
+Thu Jul 15 17:55:31 1999  Mark P. Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (_bfd_mips_elf_modify_segment_map): Don't require
+	a PT_PHDR program headers.
+	(_bfd_mips_elf_final_link): Don't assume there are going to be
+	section symbols when we're not building a shared object.
+	(_bfd_mips_elf_check_relocs): Make sure we have a GOT when
+	we need one.
+
+1999-07-15  J.T. Conklin  <jtc@redback.com>
+
+	* config.bfd (i[3456]86-*-vxworks*): New target.
+
+1999-07-15  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (mips_elf_stub_section_p): New function.
+	(mips_elf_calculate_relocation): Handle MIPS16 stub functions.
+	(mips_elf_relocate_section): Adjust calling sequence for
+	mips_elf_calculate_relocation and mips_elf_perform_relocation.
+	(mips_elf_perform_relocation): Turn `jal' into `jalx' where
+	required.
+
+1999-07-15  Ian Lance Taylor  <ian@zembu.com>
+
+	* configure.in: Bump version number to 2.9.5.
+	* configure: Rebuild.
+
+Thu Jul 15 02:56:15 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-hppa.h (_bfd_elf_hppa_gen_reloc_type, case R_HPPA): Handle
+	64bit format.
+	(_bfd_elf_hppa_gen_reloc_type, case R_GOTOFF): Use base reloc type
+	to derive final type instead of hardwiring a selection.
+
+1999-07-14  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (mips_elf_obtain_contents): Swap 16-bit halves of
+	things relocated by R_MIPS16_GPREL.
+	(mips_elf_perform_relocation): Likewise.
+
+Wed Jul 14 15:23:19 1999  Jim Wilson  <wilson@cygnus.com>
+
+	* elfxx-target.h (elfNN_bed): Add elf_backend_want_dynbss.
+
+1999-07-14  Richard Henderson  <rth@cygnus.com>
+
+	* elf32-mips.c (struct mips_got_info): Add global_gotno.
+	(_bfd_mips_elf_size_dynamic_sections): Set it.
+	(_bfd_mips_elf_final_link): Re-sort; verify the got did not grow.
+	(mips_elf_sort_hash_table): Set max_non_got_dynindex based off
+	new argument max_local.
+
+1999-07-14  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (mips_elf_obtain_contents): Swap the 16-bit
+	subwords when handling an R_MIPS16_26 relocation.
+	(mips_elf_perform_relocation): Don't be paranoid abour right-shift
+	semantics.
+
+	* elf32-mips.c (elf_mips16_gprel_howto): Adjust src_mask and
+	dst_mask to match reality.
+	(_bfd_mips_elf_calculate_relocation): Handle R_MIPS16_GPREL.
+	(mips_elf_obtain_contents): Use bfd_get.
+	(mips_elf_perform_relocation): Handle R_MIPS16_GPREL.
+	(mips_elf_relocate_section): Likewise.
+
+1999-07-13  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (mips_elf_calculate_relocation): Handle R_MIPS16_26.
+	(mips_elf_relocate_section): Adjust calling sequence for
+	mips_elf_perform_relocation.
+	(mips_elf_perform_relocation): Take additional argument.  Handle
+	R_MIPS16_26.  Use bfd_put for convenience.
+
+1999-07-13  Richard Henderson  <rth@cygnus.com>
+
+	* elf.c (assign_file_positions_for_segments): Thinko last change.
+	Always overwrite p_flags.
+
+1999-07-13  Richard Henderson  <rth@cygnus.com>
+
+	* elf-bfd.h (struct elf_backend_data): Add want_dynbss.
+	* elflink.c (_bfd_elf_create_dynamic_sections): Only create
+	.dynbss and .rel[a].bss if want_dynbss.
+	* elfxx-target.h (elf_backend_want_dynbss): Provide default.
+
+1999-07-13  Richard Henderson  <rth@cygnus.com>
+
+	* elf.c (assign_file_positions_for_segments): Don't overwrite p_flags.
+
+1999-07-13  Richard Henderson  <rth@cygnus.com>
+
+	* elf-bfd.h (struct elf_link_local_dynamic_entry): New.
+	(struct elf_link_hash_table): Add dynlocal.
+	(_bfd_elf_link_lookup_local_dynindx): Prototype.
+	(_bfd_elf_link_adjust_dynindx): Delete.
+	(_bfd_elf_link_renumber_dynsyms): Prototype.
+	(_bfd_elf,link_record_local_dynamic_symbol): Prototype.
+	* elfcode.h (elf_link_record_local_dynamic_symbol): New alias.
+	* elflink.c (_bfd_elf_link_adjust_dynindx): Delete.
+	(_bfd_elf_link_lookup_local_dynindx): New function.
+	(elf_link_renumber_hash_table_dynsyms): New function.
+	(_bfd_elf_link_renumber_dynsyms): New function.
+	* elflink.h (elf_link_record_local_dynamic_symbol): New function.
+	(struct elf_assign_sym_version_info): Delete removed_dynamic.
+	(bfd_elf,size_dynamic_sections): Use _bfd_strip_section_from_output
+	instead of elf_link_remove_section_and_adjust_dynindices.
+	Remove removed_dynamic code.  Use _bfd_elf_link_renumber_dynsyms.
+	(elf_link_assign_sym_version): Remove removed_dynamic code.
+	(elf_link_renumber_dynsyms): Delete.
+	(elf_bfd_final_link): Install section and local symbols into .dynsym.
+
+	* elf32-m68k.c (elf_m68k_adjust_dynindx): Delete.
+	(elf_m68k_size_dynamic_sections): Don't set section dynindicies.
+	(elf_m68k_finish_dynamic_sections): Don't write section dynsyms.
+	* elf32-mips.c: Similarly.
+	* elf32-ppc.c: Similarly.
+	* elf32-sparc.c: Similarly.
+	* elf64-alpha.c: Similarly.
+	* elf64-sparc.c: Similarly.
+
+1999-07-13  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (mips_elf_calculate_relocation): Do not complain
+	when _gp_disp is undefined.  Do not check R_MIPS_LO16 for overflow
+	when the relocation is against _gp_disp.
+
+1999-07-12  Mark Mitchell  <mark@codesourcery.com>
+
+	* dwarf2.c (read_attribute): Support DW_FORM_ref8.
+	* elf32-mips.c (mips_elf_link_hash_entry): Change mips_32_relocs
+	to possibly_dynamic_relocs.  Adjust usage throughout code.
+	(elf_mips_howto_table): Handle R_MIPS_64 correctly.
+	(elf_mips_ctor64_howto): Likewise.
+	(mips_elf_calculate_relocation): Handle R_MIPS_64 like R_MIPS_32.
+	Adjust indentation.
+	(mips_elf_relocate_section): Handle R_MIPS_64 in 32-bit mode.
+	(_bfd_mips_elf_check_relocs): Handle R_MIPS_64 like R_MIPS_32.
+	Use MIPS_ELF_GOT_SIZE to calculate the size of GOT entries.
+	* elf64-mips.c (elf_backend_may_use_rel_p): Define.
+
+1999-07-12  Ian Lance Taylor  <ian@zembu.com>
+
+	* Makefile.am: Rebuild dependencies.
+	* Makefile.in: Rebuild.
+
+	* bfd-in.h: Remove tests of COFF_IMAGE_WITH_PE.
+	* bfd-in2.h: Rebuild.
+
+	* Many files: Changes to avoid gcc warnings: Add ATTRIBUTE_UNUSED
+	as appropriate.  Use EMPTY_HOWTO as appropriate.  Fill in
+	structure initializations.  Add casts.
+	* reloc.c (EMPTY_HOWTO): Define.
+	* bfd-in2.h: Rebuild.
+	* coff-h8300.c (h8300_reloc16_extra_cases): Remove useless
+	comparisons against 0.
+	* elf32-sparc.c (elf32_sparc_merge_private_bfd_data): Change
+	previous_ibfd_e_flags to unsigned long.
+	* vms.h (struct vms_private_data_struct): Change section_count to
+	unsigned.
+	* vms-gsd.c (_bfd_vms_slurp_gsd): Change psect_idx to unsigned.
+	(_bfd_vms_write_gsd): Change symnum to unsigned.
+	* vms-hdr.c (_bfd_vms_write_hdr): Change symnum to unsigned.
+	* vms-tir.c (etir_sta): Change psect to unsigned.
+	(alloc_section): Change idx to unsigned.
+	(tir_sta, tir_ctl): Change psect to unsigned.
+	(_bfd_vms_write_tir): Change len and before to bfd_size_type.
+	* vms.c (priv_section_count): Change to unsigned.
+
+1999-07-12  Andreas Schwab  <schwab@suse.de>
+
+	* elf32-m68k.c: Add some ATTRIBUTE_UNUSED.
+	* m68klinux.c: Likewise.
+
+1999-07-12  Ian Lance Taylor  <ian@zembu.com>
+
+	* Many files: Changes to avoid gcc warnings: Remove unused local
+	variables.  Add default case to enum switches.
+	* coff-arm.c (bfd_arm_allocate_interworking_sections): Only
+	compile if not COFF_IMAGE_WITH_PE.
+	(record_arm_to_thumb_glue, record_thumb_to_arm_glue): Likewise.
+	(bfd_arm_get_bfd_for_interworking): Likewise.
+	(bfd_arm_process_before_allocation): Likewise.
+	* epoc-pei-arm.c: Don't rename bfd_arm functions.
+	* pei-arm.c: Likewise.
+	* elf32-mips.c (mips_elf_link_hash_table_create): Don't declare.
+	(MIPS_ELF_ADD_DYNAMIC_ENTRY): Correct last change.
+	(mips_elf_got16_entry): Put parens around & in body of ==.
+	(mips_elf_calculate_relocation): Correct test for empty string.
+	* vms-gsd.c: Use _bfd_error_handler rather than fprintf to
+	stderr.
+	* vms-misc.c (_bfd_vms_length_hash_symbol): Correct sprintf
+	format.
+
+1999-07-11  Ian Lance Taylor  <ian@zembu.com>
+
+	* Many files: Changes to avoid gcc warnings: Add ATTRIBUTE_UNUSED
+	as appropriate.  Fill in structure initializations.  Add variable
+	initializations.  Add casts.
+	* dwarf1.c (parse_line_table): Change eachLine to unsigned long.
+	(dwarf1_unit_find_nearest_line): Change i to unsigned long.
+
+	* elf.c (bfd_elf_hash): Change parameter from unsigned char * to
+	char *.
+	* elf-bfd.h (bfd_elf_hash): Update declaration.
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Remove casts
+	when calling bfd_elf_hash.
+
+1999-07-11  Mark Mitchell  <mark@codesourcery.com>
+
+	* libbfd.c (bfd_put_8): Make it of type `void'.
+	* bfd-in2.h: Regenerated.
+	* elf32-mips.c (MIPS_ELF_ADD_DYNAMIC_ENTRY): Conditionalize
+	for 32-bit hosts.
+	(_bfd_mips_elf_final_link): Likewise.
+
+	* elflink.h (elf_link_read_relocs_from_section): Be type-correct.
+
+Thu Jul  8 12:32:23 1999  John David Anglin <dave@hiauly1.hia.nrc.ca>
+
+	* config.bfd (hppa*-*-linux-gnu*): New target
+
+1999-07-07  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf-bfd.h (_bfd_mips_elf_section_from_shdr): Constify.
+	(_bfd_mips_elf_create_dynamic_sections): New function.
+	(_bfd_mips_elf_add_symbol_hook): Likewise.
+	(_bfd_mips_elf_adjust_dynamic_symbol): Likewise.
+	(_bfd_mips_elf_finish_dynamic_symbol): Likewise.
+	(_bfd_mips_elf_finish_dynamic_sections): Likewise.
+	(_bfd_mips_elf_gc_mark_hook): Likewise.
+	(_bfd_mips_elf_gc_sweep_hook): Likewise.
+	(_bfd_mips_elf_always_size_sections): Likewise.
+	(_bfd_mips_elf_size_dynamic_sections): Likewise.
+	(_bfd_mips_elf_check_relocs): Likewise.
+	(_bfd_mips_elf_link_hash_table_create): Likewise.
+	(_bfd_mips_elf_print_private_data): Likewise.
+	(_bfd_mips_elf_link_output_symbol_hook): Likewise.
+	(_bfd_mips_elf_final_link): Likewise.
+	(_bfd_mips_elf_additional_program_headers): Likewise.
+	(_bfd_mips_elf_modify_segment_map): Likewise.
+	(_bfd_mips_elf_relocate_section): Likewise.
+	* elf32-mips.c (mips_elf32_object_p): Move contents into
+	_bfd_mips_elf_object_p.
+	(mips_elf_additional_program_headers): Rename to
+	_bfd_mips_elf_additional_program_headers.
+	(mips_elf_modify_segment_map): Rename to
+	_bfd_mips_elf_modify_segment_map.
+	(elf_mips_abi_name): Change prototype.
+	(mips_elf32_section_from_shdr): Merge into
+	_bfd_mips_elf_section_from_shdr.
+	(mips_elf32_section_processing): Merge into
+	_bfd_mips_elf_section_processing.
+	(mips_elf_final_link): Rename to _bfd_mips_elf_final_link.  Invoke
+	the right back-end ELF linker.
+	(mips_elf_relocate_section): Rename to
+	_bfd_mips_elf_relocate_section.  Clean up.  Adjust for 64-bit code.
+	(mips_elf_link_output_symbol_hook): Rename to
+	_bfd_mips_elf_link_output_symbol_hook.
+	(mips_elf_create_dynamic_section): Rename to
+	_bfd_mips_elf_create_dynamic_section.
+	(mips_elf_check_relocs): Rename to _bfd_mips_elf_check_relocs.
+	Adjust for 64-bit code.  Use mips_elf_got_section.
+	(mips_elf_adjust_dynamic_symbol): Rename to
+	_bfd_mips_elf_adjust_dynamic_symbol.  Use
+	mips_elf_allocate_dynamic_relocations.
+	(mips_elf_finish_dynamic_symbol): Rename to
+	_bfd_mips_elf_finish_dynamic_symbol.  Use mips_elf_got_section.
+	Adjust for 64-bit code.
+	(mips_elf_finish_dynamic_sections): Rename to
+	_bfd_mips_elf_finish_dynamic_sections.  Adjust for 64-bit code.
+	(mips_elf_always_size_sections): Rename to
+	_bfd_mips_elf_always_size_sections.
+	(mips_elf_add_symbol_hook): Rename to
+	_bfd_mips_elf_add_symbol_hook.
+	(mips_elf_next_lo16_addend): Constify.
+	(mips_elf_calculate_relocation): Likewise.
+	(mips_elf_obtain_contents): Likewise.
+	(mips_elf_perform_relocation): Likewise.
+	(mips_elf_create_dynamic_relocation): Likewise.
+	(mips_elf_allocate_dynamic_relocations): New function.
+	(MIPS_ELF_REL_DYN_SECTION_NAME): New macro.
+	(MIPS_ELF_REL_SIZE): Likewise.
+	(MIPS_ELF_DYN_SIZE): Likewise.
+	(MIPS_ELF_GOT_SIZE): Likewise.
+	(MIPS_ELF_SYM_SIZE): Likewise.
+	(MIPS_ELF_LOG_FILE_ALIGN): Likewise.
+	(MIPS_ELF_GET_WORD): Likewise.
+	(MIPS_ELF_PUT_WORD): Likewise.
+	(MIPS_ELF_ADD_DYNAMIC_ENTRY): Likewise.
+	(STUB_LW): Conditionalize for 64-bit value.
+	(elf_mips_howto_table): Add R_MIPS_HIGHER and R_MIPS_HIGHEST
+	entries.
+	(_bfd_mips_elf_merge_private_bfd_data): Merge e_ident[EI_CLASS].
+	Check it for inconsistency.
+	(_bfd_mips_elf_print_private_bfd_data): Print ABI=64 for 64-bit
+	ABI.
+	(_bfd_mips_elf_fake_sections): Remove duplicate handling of
+	.msym.
+	(mips_elf_global_got_index): Use MIPS_ELF_GOT_SIZE.
+	(mips_elf_got_offset_from_index): Use misp_elf_got_section.
+	(mips_elf_create_local_got_entry): Use MIPS_ELF_GOT_SIZE.
+	(mips_elf_local_got_index): Likewise.
+	(mips_elf_got_page): Likewise.
+	(mips_elf_got_info): Likewise.
+	(mips_elf_create_dynamic_relocation): Handle 32-bit/64-bit split.
+	(ELF_DYNAMIC_INTERPRETER): Handle 64-bit code.
+	(mips_elf_create_dynamic_sections): Use MIPS_ELF_LOG_FILE_ALIGN,
+	instead of constant `2'.
+	(mips_elf_create_got_section): Tidy.  Use MIPS_ELF_GOT_SIZE.
+	(mips_elf_create_msym_section): Use MIPS_ELF_LOG_FILE_ALIGN.
+	(mips_elf_size_dynamic_sections): Use
+	MIPS_ELF_REL_DYN_SECTION_NAME, MIPS_ELF_GOT_SIZE,
+	MIPS_ELF_ADD_DYNAMIC_ENTRY.  Remove #if 0'd code.
+	Adjust all releveant entries in elf backend table.
+	* elf64-mips.c (mips_elf64_section_from_shdr): Remove.
+	(mips_elf64_section_processing): Likewise.
+	Adjust elf backend entries to use _bfd_mips_elf variants now
+	publicly available.
+
+	* elflink.h (elf_link_create_dynamic_sections): Handle non-standard
+	hash-entry sizes.
+	(size_dynamic_sections): Likewise.
+	(elf_link_output_extsym): Likewise.
+	* elf.c: (elf_fake_sections): Likewise.
+	* libbfd.c (bfd_get): New macro.
+	(bfd_put): Likewise.
+	* bfd-in2.h: Regenerated.
+
+1999-07-07  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf-bfd.h (elf_size_info): Add hash_entry_size,
+	int_rels_per_ext_rel, swap_dyn_out, swap_reloc_in, swap_reloc_out,
+	wap_reloca_in, and swap_reloca_out.
+	* elflink.h (elf_link_read_relocs_from_section): Adjust to handle
+	multiple internal relocations per external relocation.
+	(link_read_relocs): Likewise.
+	(elf_bfd_final_link): Likewise.
+	(elf_link_input_bfd): Likewise.
+	(elf_gc_mark): Likewise.
+	(elf_gc_smash_unused_vtentry_relocs): Likewise.
+	* elfcode.h (elf_swap_dyn_out): Adjust type to match
+	elf_swap_dyn_in.
+	(size_info): Add entries for new fields.
+	* elf64-mips.c (mips_elf64_swap_reloc_out): Enable.
+	(mips_elf64_be_swap_reloc_in): New function.
+	(mips_elf64_be_swap_reloc_out): Likewise.
+	(mips_elf64_be_swap_reloca_in): Likewise.
+	(mips_elf64_be_swap_reloca_out): Likewise.
+	(mips_elf64_size_info): Add entries for new fields.
+
+1999-07-07  Ian Lance Taylor  <ian@zembu.com>
+
+	* elflink.h (elf_bfd_final_link): Assert that section reloc_count
+	field equals the new rel_count field.
+	(elf_link_input_bfd): When doing a relocateable link, use the new
+	rel_count field rather than the reloc_count field.
+	(elf_reloc_link_order): Likewise.
+	(elf_finish_pointer_linker_section): Likewise.
+
+	Based on patch from H.J. Lu <hjl@gnu.org>:
+	* elflink.h (elf_merge_symbol): Permit a non-weak definition in a
+	shared library to override a weak definition in a regular object.
+
+Tue Jul  6 10:23:39 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* libhppa.h: Revert July 2, 1999 patch.
+
+	* elf-hppa.h (_bfd_elf_hppa_gen_reloc_type): T mode selectors
+	need to generate DLTIND relocations, not DLTREL relocations.
+
+1999-07-05  Nick Clifton  <nickc@cygnus.com>
+
+	* coffcode.h (coff_set_arch_mach_hook): Recognise arm 5
+	architectures.
+	(coff_set_flags): Recognise arm 5 architectures.
+
+	* cpu-arm.c: Add support for strongarm and arm9 cpus.
+	Add support for armv5 architecture.
+
+	* archures.c: Add bfd_mach_arm_5 and bfd_mach_arm_5T.
+
+	* reloc.c: Add new, assembler only, ARM reloc:
+	BFD_RELOC_ARM_ADRL_IMMEDIATE.
+
+	* bfd-in2.h: Regenerate.
+
+1999-07-02  Mark Mitchell  <mark@codesourcery.com>
+
+	* dwarf2.c (parse_comp_unit): Add ABBREV_LENGTH parameter.
+	(_bfd_dwarf2_find_nearest_line): Add ADDR_SIZE parameter.
+	* elf.c (_bfd_elf_find_nearest_line): Pass it.
+	* elf32-arm.h (elf32_arm_find_nearest_line): Likewise.
+	* elf32-mips.c (ABI_64_P): New macro.
+	(IRIX_COMPAT): We are IRIX6-compatible if ABI_64_P.
+	(_bfd_mips_elf_find_nearest_line): Adjust call to
+	_bfd_dwarf2_find_nearest_line.
+	* libbfd-in.h (_bfd_dwarf2_find_nearest_line): Update prototype.
+	* libbfd.h: Regenerated.
+
+1999-07-02  Ian Lance Taylor  <ian@zembu.com>
+
+	* config.bfd: Add * at the end of i[3456]86-*-unixware.
+
+Fri Jul  2 12:21:10 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* libhppa.h (HPPA_R_ARG_RELOC): Delete.
+	(HPPA_R_CONSTANT, HPPA_R_ADDEND): Likewise.
+
+1999-07-01  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf-bfd.h (bfd_elf_section_data): Add rel_count and rel_count2
+	fields.
+	(_bfd_elf_init_reloc_shdr): New function.
+	* elf.c (_bfd_elf_new_section_hook): Use bfd_zalloc, rather than
+	bfd_alloc followed by memset.
+	(_bfd_elf_init_reloc_shdr): New function, split out from ...
+	(elf_fake_sections): Here.
+	(assign_section_numbers): Assign section numbers for the second
+	relocation section, if required.
+	* elflink.h (elf_link_output_relocs): New function.
+	(elf_link_size_reloc_section): Likewise.
+	(elf_bfd_final_link): Use elf_link_size_reloc_section.
+	(elf_link_input_bfd): Use elf_link_output_relocs.
+
+	* elf32-mips.c (_bfd_mips_elf_fake_sections): Use
+	_bfd_elf_init_reloc_shdr to initialize rel_hdr2.
+
+Thu Jul  1 13:58:48 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-hppa.h (_bfd_elf_hppa_gen_reloc_type): Handle R_PCREL_CALL
+	with 22bit format.
+
+1999-06-28  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (mips_elf_got_info): Move declaration before
+	prototypes.  Change global_gotsym to be a pointer to a hash entry,
+	rather than a number index.
+	(mips_elf_link_hash_entry): Move declaration before prototypes.
+	(mips_elf_irix6_finish_dynamic_symbol): New function.
+	(mips_elf_sign_extend): Likewise.
+	(mips_elf_high): Likewise.
+	(mips_elf_higher): Likewise.
+	(mips_elf_highest): Likewise.
+	(mips_elf_global_got_index): Likewise.
+	(mips_elf_local_got_index): Likewise.
+	(mips_elf_got_offset_from_index): Likeiwse.
+	(mips_elf_record_global_got_symbol): Likewise.
+	(mips_elf_got_page): Likewise.
+	(mips_elf_next_lo16_addend): Likewise.
+	(mips_elf_calculate_relocation): Likewise.
+	(mips_elf_obtain_contents): Likewise.
+	(mips_elf_perform_relocation): Likewise.
+	(mips_elf_assign_gp): Likewise.
+	(mips_elf_sort_hash_table_f): Likewise.
+	(mips_elf_sort_hash_table): Likewise.
+	(mips_elf_got_section): Likewise.
+	(mips_elf_got_info): Likewise.
+	(mips_elf_create_local_got_entry): Likewise.
+	(mips_elf_got16_entry): Likewise.
+	(mips_elf_create_dynamic_relocation): Likewise.
+	(elf_mips_howto_table): Add description of R_MIPS_SCN_DISP.
+	(mips_elf_final_gp): Use mips_elf_assign_gp.
+	(_bfd_mips_elf_symbol_processing): Don't move SHN_COMMON symbols
+	into SHN_SCOMMON automatically on IRIX6.
+	(mips_elf_add_symbol_hook): Likewise.
+	(mips_elf_relocate_section): Rewrite, using
+	mips_elf_calculate_relocation and mips_elf_perform_relocation.
+	(mips_elf_create_dynamic_section): Use MIPS_ELF_STUB_SECTION_NAME.
+	Don't deal with .rld_map on IRIX6.
+	(mips_elf_create_got_section): Adjust use of global_gotsym.  Set
+	section flags appropriately for .got.
+	(mips_elf_check_relocs): Handle IRIX6 relocations making use of
+	the got.  Call mips_elf_record_global_got_symbol and allocate
+	local got space appropriately.
+	(mips_elf_size_dynamic_sections): Use bfd_byte *, not unsigned
+	char *.  Rework calculation of GOT size.  Sort dynamic symbol
+	table entries so entries that do not require GOT entries appear at
+	the beginning.  Don't use DT_MIPS_HIPAGENO on IRIX6.  Remove dead
+	code dealing with DT_INIT and DT_FINI.  Remove fiddling with
+	global_gotsym.
+	(mips_elf_finish_dynamic_symbol): Adjust creation of global GOT
+	entries.
+	(mips_elf_finish_dynamic_symbol): Use
+	mips_elf_irix6_finish_dynamic_symbol.
+	(mips_elf_finish_dynamic_sections): Correct off-by-one error
+	setting DT_MIPS_UNREFEXTNO.  Adjust setting of DT_MIPS_GOTSYM for
+	change to global_gotsym.  Set DT_MIPS_OPTIONS on IRIX6.
+
+1999-06-30  Ian Lance Taylor  <ian@zembu.com>
+
+	* elf32-mips.c (mips_elf_final_link): Don't set CPIC when doing a
+	relocateable link.  From Ralf Baechle <ralf@uni-koblenz.de>.
+
+1999-06-04  Philip Blundell  <philb@gnu.org>
+
+	* elf32-arm.h (elf_backend_got_header_size): Define.
+	(elf_backend_plt_header_size): Likewise.
+
+1999-06-28  Jim Pick  <jim@jimpick.com>
+
+	* elf32-arm.h (elf32_arm_relocate_section): Mind no_undefined
+
+Tue Jun 29 02:25:03 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-hppa.c (elf_hppa_howto_table): Use bfd_elf_generic_reloc as
+	relocation function.
+	* elf32-hppa.c (hppa_elf_reloc): Kill unused/unwanted function.
+
+1999-06-27  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (MIPS_ELF_SRDATA_SECTION_NAME): New macro.
+	(MIPS_ELF_OPTIONS_SECTION_NAME): Likewise.
+	(MIPS_ELF_STUB_SECTION_NAME): Likewise.
+	(_bfd_mips_elf_section_from_shdr): Use them.
+	(_bfd_mips_elf_fake_sections): Likewise.  Add .srdata to the list
+	of GP-relative sections.
+	(_bfd_mips_elf_set_section_contents): Use them.
+	(_bfd_mips_elf_section_processing): Share code between .sdata and
+	.lit4/.lit8 sections.  Set appropriate flags for .srdata.
+	(mips_elf_additional_program_headers): Add handling for
+	PT_MIPS_OPTIONS segment on IRIX6.
+	(mips_elf_modify_segment_map): Likeiwse.
+	(mips_elf_final_link): Set EF_MIPS_CPIC when required by the ABI.
+	Include the options sections on IRIX6.  Don't look for GP-relative
+	sections by name; use SHF_MIPS_GPREL instead.
+	(ELF_DYNAMIC_INTERPRETER): Adjust to use /usr/lib32/libc.so.1 for
+	the N32 ABI.
+	(mips_elf_create_dynamic_sections): Don't muck about with section
+	alignments and such on IRIX6.
+	(mips_elf_adjust_dynamic_symbol): Use MIPS_ELF_STUB_SECTION_NAME.
+	(mips_elf_size_dynamic_sections): Likewise. Adjust to handle the
+	fact that ELF_DYNAMIC_INTERPRETER is no longer a constant.  Use
+	bfd_zalloc rather than bfd_alloc and memset.
+	(mips_elf_finish_dynamic_symbol): Use MIPS_ELF_STUB_SECTION_NAME.
+	Don't assert the existence of .rld_map on IRIX6.
+	(mips_elf_finish_dynamic_sections): Use MIPS_ELF_STUB_SECTION_NAME.
+
+	* elf32-mips.c (mips_elf_adjust_dynindx): Remove.
+	(mips_elf_size_dynamic_sections): Use _bfd_elf_link_adjust_dynindx
+	instead.
+
+1999-06-26  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (mips_elf_swap_msym_in): New function.
+	(mips_elf_swap_msym_out): New function.
+	(mips_elf_create_msym_section): Likewise.
+	(MIPS_ELF_MSYM_SECTION_NAME): New macro.
+	(_bfd_mips_elf_final_write_processing): Set sh_link for .msym.
+	(_bfd_mips_elf_section_from_shdr): Reject an SHT_MIPS_MSYM
+	section not named .msym.
+	(_bfd_mips_elf_fake_sections): Use MIPS_ELF_MSYM_SECTION_NAME, not
+	.msym directly.  Set appropriate attributes for the .msym
+	section.
+	(mips_elf_link_hash_entry): Add min_dyn_reloc_index field.
+	(mips_elf_link_hash_newfunc): Clear it.
+	(mips_elf_create_dynamic_sections): Create the .msym section
+	on IRIX6.
+	(mips_elf_size_dynamic_sections):  Allocate space for the
+	.msym section.  Add a DT_MIPS_MSYM entry.
+	(mips_elf_finish_dynamic_symbol): Write out a .msym entry for
+	the symbol.
+	(mips_elf_finish_dynamic_sections): Assign a value for
+	DT_MIPS_MSYM.  Add .msym entries for the section symbols as well.
+
+	* elf32-mips.c (irix_compat_t): New enumeration.
+	(ABI_N32_P): New macro.
+	(IRIX_COMPAT): Likewise.
+	(SGI_COMPAT): Implement in terms of IRIX_COMPAT.
+	(mips_elf_relocate_section): Fix typo.
+
+1999-06-26  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* peicode.h (coff_swap_scnhdr_out): Mark non readonly BFD sections
+	as writable PE sections.
+
+1999-06-26  David Mosberger  <davidm@hpl.hp.com>
+
+	* dwarf2.c (struct arange): New type.
+	(struct comp_unit): Replace LOW and HIGH by member ARANGE.
+	(arange_add): New function.
+	(decode_line_info): Keep track of address ranges that a compilation
+	unit covers.
+	(comp_unit_contains_address): Return true if address is contained
+	in _any_ of the address ranges associated with a compilation unit.
+	(_bfd_dwarf2_find_nearest_line): Call comp_unit_find_nearest_line
+	on the first comp_unit that contains the address.
+
+1999-06-26  David Mosberger  <davidm@hpl.hp.com>
+
+	* dwarf2.c (struct dwarf2_debug): Add member dwarf_line_buffer.
+	(decode_line_info): Add variable STASH and initialize it to point
+	to the per-bfd dwarf2_debug info.  Remove static variable
+	dwarf_line_buffer and use stash->dwarf_line_buffer in its place.
+
+1999-06-26  Ian Lance Taylor  <ian@zembu.com>
+
+	* elflink.h (elf_link_output_extsym): It's OK for a -Bsymbolic
+	shared library to have an undefined symbol.
+
+	From Franz Sirl <Franz.Sirl-kernel@lauterbach.com>:
+	* elf32-ppc.c (ppc_elf_relocate_section): Fix last patch.
+
+Thu Jun 24 20:59:11 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-hppa.c (elf_hppa_final_write_processing): New function.
+	* elf32-hppa.c: Remove everything related to symbol extension
+	sections & records.  Use the common elf_hppa_final_write_processing.
+
+1999-06-22  Mark Mitchell  <mark@codesourcery.com>
+
+	* elflink.h (size_dynamic_sections): Use user-specified init/fini
+	functions instead of _init/_fini if requested.
+
+1999-06-23  Ian Lance Taylor  <ian@zembu.com>
+
+	* elf.c (bfd_section_from_shdr): Avoid crashing on a bogus sh_link
+	field.
+
+1999-06-22  Ian Lance Taylor  <ian@zembu.com>
+
+	From Franz Sirl <Franz.Sirl-kernel@lauterbach.com>:
+	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Set unused dynindx
+	field to 0, not -1.
+	(ppc_elf_finish_dynamic_sections): Check for positive section
+	dynindx field, rather than comparing against -1.
+	(ppc_elf_relocate_section): Only return false if undefined_symbol
+	or reloc_overflow fail, not always upon encountering an error.
+
+1999-06-22  Mark Mitchell  <mark@codesourcery.com>
+
+	* elflink.h (link_read_relocs): Explicitly cast external_relocs to
+	bfd_byte * before performing pointer arithmetic.
+
+Tue Jun 22 13:06:25 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-hppa.h: New file.  Common stuff for elf32 and elf64 PA
+	support.
+	* elf32-hppa.c: Include elf-hppa.h.
+	(ARCH_SIZE): Define.
+	(elf_hppa_reloc_type_lookup): Delete.  Found in the common code
+	now.
+	(elf32_hppa_info_to_howto): Similarly.
+	(elf_hppa_howto_table): Similarly.
+	(elf_hppa_reloc_type_lookup): Similarly.
+	(hppa_elf_gen_reloc_type): Similarly.
+	* elf32-hppa.h (ELF_HOWTO_TALBE, N_PARISC_RELOCS): Delete.
+
+1999-06-22  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_final_link_relocate): Catch overflow
+	handling R_V850_22_PCREL relocation.
+
+1999-06-21  Ian Lance Taylor  <ian@zembu.com>
+
+	* coff-arm.c (arm_emit_base_file_entry): Explicitly declare return
+	type.
+
+Sun Jun 20 14:13:57 1999  Richard Henderson  <rth@cygnus.com>
+
+	* section.c (_bfd_strip_section_from_output): Ignore sections
+	DISCARDed by the link script.
+
+1999-06-19  Ian Lance Taylor  <ian@zembu.com>
+
+	* elflink.h (elf_link_remove_section_and_adjust_dynindices):
+	Remove unused local variable spp.
+
+	* xcofflink.c (bfd_xcoff_size_dynamic_sections): Don't crash if
+	the entry symbol is not set.
+
+Fri Jun 18 04:24:57 1999  Richard Henderson  <rth@cygnus.com>
+
+	* elf64-alpha.c (elf64_alpha_relocate_section): Don't adjust
+	GPDISP or LITUSE in a relocatable link.
+
+Thu Jun 17 21:24:43 1999  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+	* dwarf1.c (alloc_dwarf1_unit): Allocate using bfd_zalloc.
+	* (alloc_dwarf1_func): Likewise.
+
+Wed Jun 16 03:09:57 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* libhppa.h: Fix various formatting errors.
+	(assemble_3); Rewrite using CATENATE.
+	(assemble_17): Fix various bugs.
+
+1999-06-16  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-mcore.c (R_MCORE_RAW): Fix definition.
+
+1999-06-15  Richard Henderson  <rth@cygnus.com>
+
+	* section.c (SEC_SHORT): Define.
+	* bfd-in2.h: Rebuild.
+
+1999-06-13  Mark Mitchell  <mark@codesourcery.com>
+
+	* elflink.h (elf_link_remove_section_and_adjust_dynindices):
+	Remove abfd parameter.  Use _bfd_strip_section_from_output.
+	(bfd_elf_size_dynamic_sections): Adjust callers accordingly.
+
+	* elf-bfd.h (_bfd_elf_link_adjust_dynindx): New function.
+	* elflink.c (_bfd_elf_link_adjust_dynindx): Define it.
+	* elflink.h (elf_link_remove_section_and_adjust_dynindices): New
+	function.
+	(bfd_elf_size_dynamic_sections): Use it.
+
+1999-06-13  Alan Modra  <alan@spri.levels.unisa.edu.au>
+
+	* elf32-i386.c (elf_howto_table): Change R_386_PC8 from
+	complain_overflow_bitfield to complain_overflow_signed.
+
+1999-06-13  Mark Mitchell  <mark@codesourcery.com>
+
+	* elflink.h (elf_link_read_relocs_from_section): New function,
+	split out from ...
+	(elf_link_read_relocs): Here.  Use it for both relocation
+	sections.
+
+1999-06-12  Mark Mitchell  <mark@codesourcery.com>
+
+	* elfcode.h (elf_slurp_reloc_table_from_section): Don't assume
+	asect->reloc_count is valid.
+
+1999-06-12  Ian Lance Taylor  <ian@zembu.com>
+
+	* elf32-mips.c (mips_elf32_section_processing): Permit a
+	SHT_MIPS_REGINFO section to have a size of 0.
+
+1999-06-12  David O'Brien  <obrien@freebsd.org>
+
+	* config.bfd (alpha*-*-freebsd*): New target.
+	(i[3456]86-*-freebsd*): Now defaults to ELF.
+
+1999-06-11  Ian Lance Taylor  <ian@zembu.com>
+
+	* reloc.c (_bfd_relocate_contents): Permit bitfield relocations to
+	wrap if the relocation covers the high bit of an address.
+
+	* dwarf2.c (decode_line_info): Remove unused variable first_time.
+
+1999-06-10  Jakub Jelinek  <jj@ultra.linux.cz>
+
+	* elf64-sparc.c (sparc64_elf_relocate_section): Use R_SPARC_max_std
+	instead of R_SPARC_max.
+	(sparc64_elf_info_to_howto): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+	(elf32_sparc_info_to_howto): Likewise; handle vtable relocations.
+
+1999-06-07  Richard Henderson  <rth@cygnus.com>
+
+	* section.c (_bfd_strip_section_from_output): Remove output
+	sections with no initial link_order.
+
+1999-06-07  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-m88k.c (ELF_MAXPAGESIZE): Define.
+
+Mon Jun  7 11:49:43 1999  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* Makefile.am (SOURCE_HFILES): Add missing headers.
+	* Makefile.in: Regenerated.
+
+1999-06-06  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf32-mips.c (_bfd_mips_elf_print_private_data): Recognize
+	the N32 ABI.
+
+1999-06-04  Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Don't barf on out of
+	range undefweak symbols.
+	* hash.c: Add missing comma after @xref{}
+	* linker.c: Likewise.
+
+1999-06-04  Nick Clifton  <nickc@cygnus.com>
+
+	* elfxx-target.h (ELF_MAXPAGESIZE): Produce an error message
+	if not defined.
+	* elf32-gen.c (ELF_MAXPAGESIZE): Define.
+	* elf32-i860.c (ELF_MAXPAGESIZE): Define.
+	* elf32-i960.c (ELF_MAXPAGESIZE): Define.
+	* elf64-gen.c (ELF_MAXPAGESIZE): Define.
+
+1999-06-04  Ian Lance Taylor  <ian@zembu.com>
+
+	* Makefile.am: Rebuild dependencies.
+	(BFD32_BACKENDS): Add dwarf1.lo.
+	(BFD32_BACKENDS_CFILES): Add dwarf1.c.
+	* Makefile.in: Rebuild.
+
+1999-06-04  Nick Clifton  <nickc@cygnus.com>
+
+	* Makefile.am: Add epoc-arm-pe target.
+	* Makefile.in: Regenerate.
+	* pe-arm.c: Only redefine interworking function names if they have
+	not already been redefined.
+	* pei-arm.c: Only redefine interworking function names if they have
+	not already been redefined.
+	* epoc-pe-arm.c: Redefine interworking function names to avoid a
+	name space clash.
+	* epoc-pei-arm.c: Redefine interworking function names to avoid a
+	name space clash.
+
+1999-06-03  Nick Clifton  <nickc@cygnus.com>
+
+	* elfxx-target.h (ELF_MAXPAGESIZE): Default to 0x1000 not 1.
+
+Fri Jun  4 10:05:11 1999  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* elf.c (elf_fake_sections): Undo change of 1999-05-10.
+
+Fri Jun  4 03:10:49 1999  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+	* elf32-sh.c (sh_elf_relax_delete_bytes): Fix setting of
+	start / stop for recalculating of r_addend of R_SH_SWITCH*.
+
+Fri Jun  4 02:53:13 1999  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+	* elf32-sh.c (sh_elf_relax_delete_bytes): Handle R_SH_SWITCH32
+	in other text sections.
+
+Fri Jun  4 02:29:34 1999  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+	* libbfd.c (_bfd_generic_verify_endian_match): New function.
+	* libbfd-in.h (_bfd_generic_verify_endian_match): Declare.
+	* libbfd.h: Regenerate.
+	* coff-sh.c (sh_merge_private_data): Delete.
+	(coff_bfd_merge_private_bfd_data): Change to
+	_bfd_generic_verify_endian_match.
+	(elf32-sh.c): bfd_elf32_bfd_merge_private_bfd_data: Define.
+
+1999-06-03  Ulrich Drepper  <drepper@cygnus.com>
+
+	* elf32-arm.h: Fix typo: change ELF_MAXPAGE_SIZE to ELF_MAXPAGESIZE.
+
+1999-06-03  Ian Lance Taylor  <ian@zembu.com>
+
+	* bfd-in.h (bfd_elf32_arm_allocate_interworking_sections): Correct
+	prototype.
+	(bfd_elf32_arm_process_before_allocation): Likewise.
+	* bfd-in2.h: Rebuild.
+
+1999-06-03  David Mosberger  <davidm@hpl.hp.com>
+
+	* dwarf2.c (struct line_info): Add member END_SEQUENCE to keep
+	track of end_sequence markers.
+	(add_line_info): Add END_SEQUENCE arg.
+	(decode_line_info): Don't try to infer lo_pc and hi_pc from the
+	debug-line info---it doesn't work right if a compilation unit
+	consists of multiple discontiguous code-sequences.  It would be
+	worthwhile to optimize for the common case where a compilation
+	unit results in a contiguous set of code sequences, but this is
+	quite tricky to get right for arbitrary DWARF2 files.
+	(lookup_address_in_line_info_table): Don't use the last line entry
+	for a compilation unit for anything with an address higher than
+	this line entry.  Also, check for end_sequence markers to
+	correctly handle discontinuities.
+	(_bfd_dwarf2_find_nearest_line): When checking previously loaded
+	compilation units, check all compilation units with each->high==0
+	just like when reading compilation units.
+
+	* dwarf2.c (decode_line_info): Initialize table->files and
+	table->last_line to NULL to avoid segfaults due to random
+	values in these members.
+	(concat_filename): Check for out-of-range file number before
+	indexing filename table.  Segfaults suck.
+
+	* dwarf2.c (decode_line_info): Don't truncate address to least
+	significant 32 bits (breaks 64 bit targets).
+	(lookup_address_in_function_table): Ditto.
+	(comp_unit_contains_address): Ditto.
+
+1999-06-02  Mark Mitchell  <Mark Mitchell <mark@codesourcery.com>>
+
+	* elf32-mips.c (elf_mips_howto_table): Add R_MIPS_JALR.
+	* elf64-mips.c (mips_elf64_howto_table_rel): Likewise.
+	(mips_elf64_howto_table_rela): Likewise.
+
+	* elfcode.h (elf_slurp_reloc_table_from_section): New function,
+	split out from ...
+	(elf_slurp_reloc_table): Here.  Use it to handle the case where a
+	single section has two associated relocation sections.
+
+1999-06-02  Mark Salter  <msalter@cygnus.com>
+
+	* coffcode.h (coff_set_alignment_hook): Set lma from s_vaddr if
+	COFF_WITH_PE defined.
+
+1999-06-02  Nick Clifton  <nickc@cygnus.com>
+
+	* pe-arm.c: Rename global arm interworking functions to avoid name
+	collision when all targets BFD is built.
+	* pei-arm.c: Ditto.
+
+1999-05-31  Mark Mitchell  <mark@codesourcery.com>
+
+	* elf-bfd.h (elf_backend_data): Remove use_rela_p.  Add
+	may_use_rel_p, may_use_rela_p, default_use_rela_p.
+	(bfd_elf_section_data): Add use_rela_p.
+	* elf.c (bfd_section_from_shdr): Set use_rela_p appropriately.
+	(_bfd_elf_new_section_hook): Likewise.
+	(elf_fake_sections): Use may_use_rela_p, etc., instead of
+	use_rela_p.
+	(_bfd_elf_copy_private_section_data): Copy use_rela_p.
+	* elfcode.h (write_relocs): Determine whether or not use rela
+	relocs based on the relocation section header.
+	* elflink.c (_bfd_elf_create_dynamic_sections): Use default_use_rela_p
+	instead of use_rela_p.
+	* elfxx-target.h (elf_backend_may_use_relp): New macro.
+	(elf_backend_may_use_rela_p): Likewise.
+	(elf_backend_default_use_rela_p): Likewise.
+	(elfNN_bed): Use them.
+
+Wed Jun  2 12:38:49 1999  Miodrag Vallat <miodrag@multimania.com>
+
+	* hosts/alphalinux.h (TRAD_CORE_EXTRA_SIZE_ALLOWED): Expand to 4096.
+
+Tue Jun  1 17:57:58 1999  Mark P. Mitchell  <mitchell@n02.acl.lanl.gov>
+
+	* reloc.c (BFD_RELOC_MIPS_SUB): New relocation.
+	(BFD_RELOC_MIPS_GOT_PAGE): Likewise.
+	(BFD_RELOC_MIPS_GOT_OFST): Likewise.
+	(BFD_RELOC_MIPS_GOT_DISP): Likewise.
+	* bfd-in2.h: Regenerated.
+	* libbfd.h: Likewise.
+	* elf32-mips.c (mips_info_to_howto_rela): New function.
+	(USE_REL): Adjust for new conventions.
+	(MINUS_ONE): New macro.
+	(elf_mips_howto_table): Add R_MIPS_SUB.
+	(mips_r): Add entries for MIPS_SUB, MIPS_GOT_PAGE, MIPS_GOT_OFST,
+	and MIPS_GOT_DISP.
+	(mips_elf_final_write_processing): Set sh_link, not sh_info, for a
+	.MIPS.content section.
+	(_bfd_mips_elf_fake_sections): Treat all sections that begin
+	with .MIPS.content as .MIPS.content sections.  Set
+	SHF_MNIPS_NOSTRIP for such section.
+	(elf_info_to_howto): Define to mips_info_to_howto_rela.
+	* elf64-mips.c (mips_r):  Add entries for MIPS_SUB, MIPS_GOT_PAGE,
+	MIPS_GOT_OFST, and MIPS_GOT_DISP.
+
+Wed Jun  2 11:51:12 1999  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* vms-misc.c (_bfd_vms_hash_newfunc): Fix use of uninitialized
+	variable.
+
+	* elf32-m68k.c (elf_m68k_adjust_dynamic_symbol): Avoid ambigous
+	`else'.
+
+1999-05-30  Philip Blundell  <philb@gnu.org>
+
+	* elf32-arm.h (elf32_arm_relocate_section): Reinstate change of
+	1993-03-25 (!!).  Take into account the bitmasks for the reloc so
+	the addend does not overflow into the rest of the word.
+
+1999-05-29  Nick Clifton  <nickc@cygnus.com>
+
+	* bfd-in.h: Amend prototype for
+	bfd_elf32_arm_process_before_allocation .
+	* bfd-in.h: Regenerate.
+
+	* elfarm-oabi.c (NUM_ELEM): New macro: Compute the number of
+	elements in a fixed sized array.
+	(ARM_ELF_ABI_VERSION): Define.
+	(ARM_ELF_OS_ABI_VERSION): Define.
+	(R_ARM_THM_ABS5): Fix rightshift and size.
+	(R_ARM_THM_PC22): Fix size.
+	(R_ARM_PLT32): Define Howto.
+	(find_howto): New function: Locate a howto based on a reloc
+	number.
+	(elf32_arm_info_to_howto): Use find_howto if necessary.
+	(elf32_arm_reloc_map): Change type of field bfd_reloc_val to
+	bfd_reloc_code_real_type.
+	(elf32_arm_reloc_map[]): Add entries for BFD_RELOC_VTABLE_INHERIT
+	and BFD_RELOC_VTABLE_ENTRY.
+	(elf32_arm_reloc_type_lookup): Use find_howto if necessary.
+
+	* elfarm-nabi.c (NUM_ELEM): New macro: Compute the number of
+	elements in a fixed sized array.
+	(ARM_ELF_ABI_VERSION): Define.
+	(ARM_ELF_OS_ABI_VERSION): Define.
+	(R_ARM_THM_ABS5): Fix rightshift and size.
+	(R_ARM_THM_PC22): Fix size.
+	(elf32_arm_info_to_howto_rel): Rename to elf32_arm_info_to_howto.
+	(elf32_arm_reloc_map): Change type of field bfd_reloc_val to
+	bfd_reloc_code_real_type.
+
+	* elf32-arm.h (struct elf32_arm_link_hash_table): Add new field:
+	no_pipeline_knowledge.
+	(elf32_arm_link_hash_create): Initialise new field to zero.
+	(bfd_elf32_arm_process_before_allocation): Add new paraemter:
+	no_pipeline_knowledge.  Use this parameter to initialise the field
+	in the globals data structure.
+	(elf32_arm_final_link_relocate): Only add in pipeline offset if
+	no_pipeline_knowledge is false and the binary is from an old
+	toolchain.
+	(elf32_arm_merge_private_data): Generate an error if an attempt is
+	made to link together big endian and little endian code.
+	(elf32_arm_post_process_headers): New function:  Initialise the
+	EI_OSABI and EI_ABIVERSION fields of the newly created ELF program
+	header.
+	(elf_backend_post_process_headers): Define.
+
+1999-05-28  Nick Clifton  <nickc@cygnus.com>
+
+	* elf-bfd.h (struct elf_backend_data): Add new field:
+	elf_backend_post_process_headers.
+
+	* elfxx-target.h (elf_backend_post_process_headers): Define to
+	NULL if not already defined.
+	(elfNN_bed): Initialise elf_backend_post_process_headers field.
+
+	* elf.c (prep_headers): Set the EI_OSABI and EI_ABIVERSION fields
+	to zero.
+	(_bfd_elf_compute_section_file_positions): Call
+	elf_backend_post_process_headers if defined.
+
+1999-05-28  Ian Lance Taylor  <ian@zembu.com>
+
+	* configure.in: Check whether getuid and getgid exist.
+	* archive.c: Define getuid and getgid as macros if HAVE_GETUID or
+	HAVE_GETGID are not defined, respectively.
+	(bfd_write_armap): Don't special case on _WIN32 for getuid and
+	getgid.
+	* configure.host: Set ac_cv_func_get{ug}id for *-*-windows*.
+	* configure, config.in: Rebuild.
+
+1999-05-28  Martin Dorey  <mdorey@madge.com>
+
+	* elf32-i960.c: New file.
+	* elf.c (prep_headers): Handle bfd_arch_i960.
+	* targets.c (bfd_target_vector): Add &bfd_elf32_i960_vec.
+	* config.bfd (i960-*-elf*): New target.
+	* configure.in (bfd_elf32_i960_vec): New target vector.
+	* Makefile.am (BFD32_BACKENDS): Add elf32-i960.lo.
+	(BFD32_BACKENDS_CFILES): Add elf32-i960.c.
+	* Makefile.in, aclocal.m4, configure: Rebuild.
+
+1999-05-27  Nick Clifton  <nickc@cygnus.com>
+
+	* elfarm-oabi.c (elf32_arm_howto_table): Add entry for
+	R_ARM_PLT32.
+	(find_howto): New function: Find entries in the
+	elf32_arm_howto_table.
+	(elf32_arm_info_to_howto): Use find_howto if the entry cannot be
+	computed simply.
+	(elf32_arm_reloc_type_lookup): Add lookup for
+	BFD_RELOC_ARM_PLT32.
+
+1999-05-25  Philip Blundell  <pb@nexus.co.uk>
+
+	* elf32-arm.h (elf32_arm_link_hash_newfunc): New function.
+	(elf32_arm_link_hash_table_create): Use above function as the
+	constructor for hash table entries.
+	(elf32_arm_relocate_section): Avoid crash when there is no output
+	section.
+	(elf32_arm_final_link_relocate): New parameter h.
+	(elf32_arm_relocate_section): Pass symbol hash entry to above
+	routine.
+	(elf32_arm_gc_sweep_hook, elf32_arm_check relocs): Correct
+	comments.
+
+1999-05-25  Catherine Moore  <clm@cygnus.com>
+
+	* coff-arm.c (coff_arm_relocate_section): Don't emit
+	base file entries for pc-relative values.
+
+1999-05-25  DJ Delorie  <dj@cygnus.com>
+
+	* peicode.h (coff_swap_sym_in): When we create the actual section
+	to reflect the not-there section C_SECTION symbols refer to,
+	change the symbol class to C_STAT as the section is now really
+	there.
+
+1999-05-24  Philip Blundell  <pb@nexus.co.uk>
+
+	* elf32-arm.h (elf32_arm_relocate_section): Undo change of
+	1999-03-25.
+
+Mon May 17 13:35:35 1999  Stan Cox  <scox@cygnus.com>
+
+	* coff-arm.c (_bfd_coff_arm_set_private_flags): Changed
+	F_PIC_INT to F_PIC.
+	* coffcode.h (coff_set_arch_mach_hook): Added F_ARM_2a, and
+	F_ARM_3M labels.  Changed F_PIC_INT to F_PIC.
+
+1999-05-16  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-mcore.c (in_reloc_p): Reinstate.
+
+1999-05-15  Nick Clifton  <nickc@cygnus.com>
+
+	* reloc.c (BFD_RELOC_MCORE_RVA): Define.
+	* bfd-in2.h: Regenerate.
+	* coff-mcore.c (in_reloc_p): Remove defintion.
+	(mcore_coff_howto): Add IMAGE_REL_MCORE_RVA.
+	(mcore_coff_reloc_type_lookup): Map BFD_RELOC_RVA to
+	IMAGE_REL_MCORE_RVA.
+	(coff_mcore_rtype_to_howto): Add special processing for
+	IMAGE_REL_MCORE_RVA.
+	(coff_mcore_relocate_section): Add support for
+	IMAGE_REL_MCORE_RVA.
+	* elf32-mcore.c (mcore_elf_howto_): Add R_MCORE_RELATIVE.
+	(mcore_elf_reloc_type_lookup): Map BFD_RELOC_RVA to
+	R_MCORE_RELATIVE.
+	(mcore_elf_relocate_section): Delete redundant case labels.
+
+Fri May 14 10:59:55 1999  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* elf32-arm.h (elf32_arm_relocate_section): Fix operator
+	precedence between bit-and and comparison.
+
+Thu May 13 09:45:23 1999  Joel Sherrill (joel@OARcorp.com)
+
+	* config.bfd (i[3456]86*-*-rtems*, m68k*-*-rtems*): Added to
+	list of target formats (targ_selvecs).
+	(i[3456]86*-*-rtemself*, mips*el-*-rtems*): New targets.
+	(powerpcle*-*rtems*, sh-*-rtemself*): New targets.
+
+1999-05-10  DJ Delorie  <dj@cygnus.com>
+
+	* ecoff.c (_bfd_ecoff_write_armap): give the symtab element a
+	reasonable mode until "ar x" is smart enough to skip it (fixes
+	gcc/libgcc.a builds on mips-ecoff targets
+
+	* coffcode.h (styp_to_sec_flags): Explain how COMDATs are supposed
+	to work.  Hack to support MS import libraries, which use different
+	COMDAT types than GNU.
+	(coff_slurp_symbol_table): C_SECTION symbols are local; they refer
+	to implied zero-length sections (see peicode below)
+	* coffgen.c (coff_get_normalized_symtab): Properly read long MS
+	filename symbols, which use one *or more* auxents.
+	* coffswap.h (coff_swap_aux_in): ditto
+	* peicode.h (coff_swap_sym_in): Build the implied zero-length
+	sections
+
+Tue May 11 15:51:58 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-v850.c (v850_elf_howto_table): Make partial_inplace false
+	for all relocations.
+
+1999-05-10  Catherine Moore  <clm@cygnus.com>
+
+	* bfd-in.h (bfd_arm_allocate_interworking_sections):  Static
+	if COFF_IMAGE_WITH_PE.
+	(bfd_arm_process_before_allocation): Likewise.
+	(bfd_arm_get_bfd_for_interworking): Likewise.
+	* coff-arm.c: Likewise.
+	* bfd-in2.h: Regenerate.
+	* configure.in (armpe_little_vec): Remove coff-arm.lo.
+	(armpe_big_vec): Likewise.
+	* configure: Rebuild.
+
+1999-05-10  Nick Clifton  <nickc@cygnus.com>
+
+	* elf.c (elf_fake_sections): Check for .rel. as start of rel
+	section, not just .rel.  Same for .rela.
+
+1999-05-07  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-mcore.c (coff_mcore_relocate_section): Replace assert about
+	endianism with an error message.
+
+Thu May  6 17:09:09 1999  Fred Fish  <fnf@be.com>
+
+	* dwarf2.c (read_abbrevs): Change cast of dwarf_abbrev_buffer
+	assignment from "unsigned char *" to "char *".
+	(decode_line_info): Likewise for dwarf_line_buffer assignment.
+
+1999-05-05  Catherine Moore  <clm@cygnus.com>
+
+	* coff-arm.c (coff_arm_relocate_section):  Add one to
+	address of ARM_RVA32 thumb functions.
+
+1999-05-05  Catherine Moore  <clm@cygnus.com>
+
+	* elf32-m68k.c (elf32_m68k_set_private_flags): New.
+	(elf32_m68k_copy_private_bfd_data): New.
+	(elf32_m68k_merge_private_bfd_data): New.
+	(elf32_m68k_print_private_bfd_data): New.
+	(CPU32_FLAG): Define.
+	(PLT_CPU32_ENTRY_SIZE): Define.
+	(elf_cpu32_plt0_entry): Declare.
+	(elf_cpu32_plt_entry): Declare.
+	(elf_m68k_adjust_dynamic_symbol): Generate cpu32 plt entries.
+	(elf_m68k_finish_dynamic_symbol): Likewise.
+	(elf_m68k_finish_dynamic_sections): Likewise.
+	(elf_backend_plt_header_size): Remove definition.
+	(bfd_elf32_bfd_copy_private_bfd_data): Define.
+	(bfd_elf32_bfd_merge_private_bfd_data): Define.
+	(bfd_elf32_bfd_set_private_flags): Define.
+	(bfd_elf32_bfd_print_private_bfd_data): Define.
+
+Mon May  3 09:24:49 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* som.c (som_fixup_formats): Fix comments for R_SHORT_PCREL_MODE
+	and R_LONG_PCREL_MODE.
+
+1999-04-29  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-mcore.c (coff_mcore_relocate_section): Fix typos.
+
+Fri Apr 28 16:36:19 1999  Stan Cox  <scox@cygnus.com>
+
+	* elf32-sh.c (sh_elf_relocate_section): Include relocation addend
+	in relocation calculation.
+
+1999-04-26  Tom Tromey  <tromey@cygnus.com>
+
+	* aclocal.m4, configure: Updated for new version of libtool.
+
+1999-04-21  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-mcore.c: Add support for mcore relocs.
+
+1999-04-20  Gavin Romig-Koch  <gavin@cygnus.com>
+
+	* elf32-mips.c (_bfd_mips_elf_print_private_bfd_data): Scrap the
+	incorrect use EF_MIPS_xxBITPTRS.
+
+1999-04-18  Ian Lance Taylor  <ian@zembu.com>
+
+	* elf64-alpha.c (elf64_alpha_relax_section): Remove unused local
+	variable insn.
+
+	* bfd-in2.h: Rebuild.
+	* libbfd.h: Rebuild.
+
+Sat Apr 17 20:55:15 1999  Catherine Moore  <clm@cygnus.com>
+
+	* coff-arm.c (coff_arm_rtype_to_howto): Remove ARM26D transform.
+	(coff_arm_relocate_section):  Add ARM26D transform.  Only
+	change to ARM26D for relocateable links.
+
+1999-04-16  Gavin Romig-Koch  <gavin@cygnus.com>
+
+	* elf32-mips.c (_bfd_mips_elf_print_private_bfd_data): New.
+	(bfd_elf32_bfd_print_private_bfd_data): New.
+
+1999-04-15  Doug Evans  <devans@casey.cygnus.com>
+
+	* elf32-arm.h (elf32_arm_final_link_relocate):  For R_ARM_THM_ABS5,
+	refetch addend if USE_REL, add many comments regarding current state.
+	For R_ARM_THM_PC22, refetch addend if USE_REL, simplify.
+	* elfarm-nabi.c (elf32_arm_howto_table): For R_ARM_THM_ABS5, fix
+	size and rightshift.  For R_ARM_THM_PC22, fix bitsize.
+	* elfarm-oabi.c (elf32_arm_howto_table): Ditto.
+
+Wed Apr 14 14:33:08 1999  Richard Henderson  <rth@cygnus.com>
+
+	* elf32-mips.c (_bfd_mips_elf_read_ecoff_info): Zero `debug'.
+	* elf64-alpha.c (elf64_alpha_read_ecoff_info): Likewise.
+
+1999-04-13  David Mosberger  <davidm@hpl.hp.com>
+
+	* dwarf2.c (decode_line_info): Don't truncate address to least
+	significant 32 bits (breaks 64 bit targets).
+	(lookup_address_in_function_table): Ditto.
+	(comp_unit_contains_address): Ditto.
+
+Tue Apr 13 21:27:19 1999  Catherine Moore  <clm@cygnus.com>
+
+	* coff-arm.c (arm_emit_base_file_entry): New routine.
+	(A2T3_OFFSET): Define.
+	(T2A3_OFFSET): Define.
+	(coff_arm_relocate_section):  Emit base file entries for interworking
+	stubs.
+
+1999-04-13  Philip Blundell  <philb@gnu.org>
+
+	* elfarm-nabi.c (elf32_arm_howto_table): Add dummy entries for
+	relocs 17 through 19.
+
+Sun Apr 11 01:25:17 1999  Richard Henderson  <rth@cygnus.com>
+
+	* elfcode.h: Remove fnmatch.h.
+	* elflink.h (elf_link_assign_sym_version): Call back to ld
+	instead of calling fnmatch.
+
+	* config.bfd (i?86-*-beoself): Include pe vecs.
+
+Sun Apr 11 01:14:06 1999  Richard Henderson  <rth@cygnus.com>
+
+	* elf32-i386.c (elf_i386_finish_dynamic_sections): Allow .plt
+	to go missing.
+
+1999-04-10  Richard Henderson  <rth@cygnus.com>
+
+	* elf32-i386.c (elf_i386_relocate_section): Mind no_undefined
+	when trying to resolve dynamic symbol references.
+	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
+	* elf32-mips.c (mips_elf_relocate_section): Likewise.
+	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
+	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
+	* elf64-alpha.c (elf64_alpha_relocate_section): Likewise.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+	* elflink.h (elf_link_output_extsym): Likewise.
+
+Sat Apr 10 15:12:09 1999  Richard Henderson  <rth@cygnus.com>
+
+	* section.c (_bfd_strip_section_from_output): New function moved from
+	* elf64-alpha.c (elf64_alpha_strip_section_from_output): ... here.
+	* elf32-i386.c (elf_i386_size_dynamic_sections): Use it.
+	* elf32-m68k.c (elf_m68k_size_dynamic_sections): Likewise.
+	* elf32-mips.c (mips_elf_size_dynamic_sections): Likewise.
+	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Likewise.
+	* elf32-sparc.c (elf32_sparc_size_dynamic_sections): Likewise.
+	* elf64-sparc.c (sparc64_elf_size_dynamic_sections): Likewise.
+	* bfd-in2.h: Update.
+
+1999-04-09  Ian Lance Taylor  <ian@zembu.com>
+
+	* elf64-sparc.c: Fix incorrect calls to bfd_check_overflow.
+
+1999-04-08  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-mcore.c: New File: Support for mcore-pe targets.
+	* cpu-mcore.c: New File: Support for mcore targets.
+	* elf32-mcore.c: New File: Support for mcore-elf target.
+	* pe-mcore.c: New File: Definitions for mcore-pe target.
+	* pei-mcore.c: New File: Definitions for mcore-pei target.
+	* Makefile.am: Add support for MCore targets.
+	* Makefile.in: Regenerate.
+	* config.bfd: Add support for MCore targets.
+	* configure.in: Add support for MCore targets.
+	* configure: Regenerate.
+	* archures.c: Add support for MCore architecture.
+	* bfd-in2.h: Regenerate.
+	* coffcode.h: Add support for mcore-pe targets.
+	* elf.c: Add support for mcore-elf target.
+	* reloc.c: Add support for MCore relocs.
+	* targets.c: Add support for MCore targets.
+
+1999-04-07  Nick Clifton  <nickc@cygnus.com>
+
+	* elfarm-nabi.c (elf32_arm_howto_table): Add entries for
+	R_ARM_XPC25 and R_ARM_THM_XPC22.
+	(elf32_arm_reloc_map): Remove redundant entries.
+
+1999-04-06  Ian Lance Taylor  <ian@zembu.com>
+
+	* sysdep.h (LC_MESSAGES): Never define.
+
+1999-04-06  Chris Torek  <torek@bsdi.com>
+
+	* reloc.c (bfd_check_overflow): Add addrsize parameter.  Change
+	all callers.  Rewrite completely.
+	(_bfd_relocate_contents): Rewrite overflow checking.
+	* bfd-in2.h: Rebuild.
+
+1999-04-05  Ian Lance Taylor  <ian@zembu.com>
+
+	From Gabriel Paubert <paubert@iram.es>:
+	* elf32-ppc.c (ppc_elf_howto_raw): Set R_PPC_GOT16_LO,
+	R_PPC_PLT16_LO and R_PPC_SECTOFF_LO to be complain_overflow_dont.
+	Set R_PPC_PLT16_HA, R_PPC_SECTOFF_HA and R_PPC_EMB_NADDR16_HA to
+	have a rightshift of 16 and use ppc_elf_addr16_ha_reloc.
+	* ppcboot.c (ppcboot_vec): Use little endian routines for
+	headers.
+
+	* elf.c (elfcore_strndup): Only define if it will be used.
+	* elf32-ppc.c (ppc_elf_relax_section): Remove unused locals irel
+	and irelend.
+	(ppc_elf_check_relocs): Remove unused local i.
+	(ppc_elf_gc_mark_hook): Add default case to switch.
+
+	From Bernd Nitzler <nitzler@kagcpd01.ag01.kodak.COM>:
+	* srec.c (srec_scan): Accept \r in symbol definitions.
+	(srec_object_p): Set HAS_SYMS if we saw any symbols.
+	(symbolsrec_object_p): Likewise.
+
+1999-04-04  Don Bowman <don@pixsci.com>
+
+	* config.bfd: Add mips*el-*-vxworks* and mips*-*-vxworks*.
+
+1999-04-04  Ian Lance Taylor  <ian@zembu.com>
+
+	* dwarf1.c (parse_line_table): Remove unused locals last_pc and
+	last_line.
+	* elf-bfd.h (_bfd_elfcore_section_from_phdr): Declare.
+	* elf32-i386.c (elf_i386_gc_mark_hook): Add default case to
+	switch.
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Remove unused
+	local i.
+	* syms.c (_bfd_stab_section_find_nearest_line): Remove unused
+	local val.
+
+1999-03-31  Nick Clifton  <nickc@cygnus.com>
+
+	* config.bfd: Add support for arm-epoc-pe target.
+	* configure.in: Add support for arm-epoc-pe target.
+	* configure: Regenerate.
+	* targets.c: Add support for arm-epoc-pe target.
+	* coff-arm.c: Allow header files to override definition of
+	TARGET_UNDERSCORE and USER_LABEL_PREFIX.
+	* pe-arm.c: Allow previous header files to override definition of
+	TARGET_LITTLE_SYM and TARGET_BIG_SYM.
+	* pei-arm.c: Allow previous header files to override definition of
+	TARGET_LITTLE_SYM and TARGET_BIG_SYM.
+	* epoc-pe-arm.c: New file.  Support arm-epoc-pe target.
+	* epoc-pei-arm.c: New file.  Support arm-epoc-pei target.
+
+1999-03-30  Nick Clifton  <nickc@cygnus.com>
+
+	* elf.c (elf_map_symbols): Handle the case where section
+	symbols are generated for content-less sections which are
+	not mapped to the output file.
+
+	* linker.c: Replace direct references to fields in BFD structure
+	with accessor macros.
+
+	* elflink.h: Replace direct references to fields in BFD structure
+	with accessor macros.
+
+1999-03-25  Philip Blundell  <pb@nexus.co.uk>
+
+	* config.bfd: Eliminate redundancy in checks for Linux/ARM.
+
+	* elf32-arm.h (elf32_arm_relocate_section): Take the rightshift into
+	account when adjusting section symbols during a partial link.
+
+1999-03-24  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-sparc.c (struct coff_reloc_map): Change type of field
+	  'bfd_reloc_val' to bfd_reloc_code_real_type.
+	* elf-m10200.c (struct mn10200_reloc_map): Ditto.
+	* elf-m10300.c (struct mn10300_reloc_map): Ditto.
+	* elf32-arc.c (struct arc_reloc_map): Ditto.
+	* elf32-d10v.c (struct d10v_reloc_map): Ditto.
+	* elf32-d30v.c (struct d30v_reloc_map): Ditto.
+	* elf32-fr30.c (struct fr30_reloc_map): Ditto.
+	* elf32-m32r.c (struct m32r_reloc_map): Ditto.
+	* elf32-sh.c (struct elf_reloc_map): Ditto.
+	* elf32-sparc.c (struct elf_reloc_map): Ditto.
+	* elf32-v850.c (struct v850_reloc_map): Ditto.
+	* elf64-sparc.c (struct elf_reloc_map): Ditto.
+	* elfarm-nabi.c (struct elf32_arm_reloc_map): Ditto.
+	* elfarm-oabi.c (struct elf32_arm_reloc_map): Ditto.
+
+1999-03-17  Martin Hunt  <hunt@cygnus.com>
+
+	* syms.c (_bfd_stab_section_find_nearest_line): Changed this
+	function so source-level assembly works.  If multiple N_SOs
+	are seen without and N_FUNs, create an indextable entry with
+	a NULL function name.
+
+1999-03-16  Gavin Romig-Koch  <gavin@cygnus.com>
+
+	* elf32-mips.c (_bfd_mips_elf_merge_private_bfd_data) Allow merging
+	of certian similar cpus.
+
+1999-03-16  Gavin Romig-Koch  <gavin@cygnus.com>
+
+	* elf32-mips.c (_bfd_mips_elf_final_write_processing):
+	Add the 5000.  Change the architecture for the 5400 to mips4.
+	(elf_mips_mach): Add r5000.
+
+1999-03-11  Doug Evans  <devans@casey.cygnus.com>
+
+	* cpu-i960.c (scan_i960_mach): Recognize i960:ka_sa and i960:kb_sb.
+
+1999-03-11  Nick Clifton  <nickc@cygnus.com>
+
+	* binary.c (binary_set_section_contents): Generate warning about
+	huge file offsets for any section that will occupy file space, not
+	just those that are loadable.
+
+1999-02-24  Jim Blandy  <jimb@zwingli.cygnus.com>
+
+	* libbfd.h: Regenerate after Nick Clifton's Feb 17 changes.
+
+1999-02-22  Jim Lemke  <jlemke@cygnus.com>
+
+	* elf32-ppc.c: Add ppc_elf_relax_section() for the ld option mpc860c0.
+
+Mon Feb 22 18:26:51 1999  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf-bfd.h (ELF_LINK_HASH_REF_REGULAR_NONWEAK): Define.
+	* elflink.h: Revert all changes since Feb 16.  Instead:
+	(elf_link_add_object_symbols): Set REF_REGULAR_NONWEAK flag if
+	appropriate.  Copy it to version symbols.
+	(elf_fix_symbol_flags): Set REF_REGULAR_NONWEAK for non ELF
+	symbols if appropriate.
+	(elf_adjust_dynamic_symbol): Set REF_REGULAR_NONWEAK for weakdef
+	symbol if appropriate.
+	(elf_link_output_extsym): If symbol is marked as undefined, and
+	has no nonweak references, mark it as weak undefined.
+
+Fri Feb 19 16:01:12 1999  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_merge_symbol): When overriding a dynamic
+	definition with a weak undefined symbol, set NEEDS_PLT if it is a
+	function.
+	(elf_link_add_object_symbols): Don't copy the other field if we
+	are overridding.
+
+Thu Feb 18 18:07:43 1999  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_merge_symbol): Do not merge any symbol from a
+	shared object with a weak undefined symbol.
+
+1999-02-18  Nick Clifton  <nickc@cygnus.com>
+
+	* elfarm-nabi.c: Set partial_inplace back to false.
+
+1999-02-17  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c (TARGET_UNDERSCORE): Re-enable.
+	(USER_LABEL_PREFIX): Set to "_".
+
+	The following patches are from: Scott Bambrough
+	<scottb@corelcomputer.com>
+
+	* libaout.h (M_ARM6_NETBSD): Set to 143.
+
+	* reloc.c: Add ARM PIC relocs:   BFD_RELOC_ARM_GOT12,
+	BFD_RELOC_ARM_GOT32, BFD_RELOC_ARM_JUMP_SLOT, BFD_RELOC_ARM_COPY,
+	BFD_RELOC_ARM_GLOB_DAT, BFD_RELOC_ARM_PLT32,
+	BFD_RELOC_ARM_RELATIVE, BFD_RELOC_ARM_GOTOFF, BFD_RELOC_ARM_GOTPC.
+	* bfd-in2.h: Regenerate.
+
+	* elfarm-nabi.c (elf32_arm_howto_table): Set partial_inplace to
+	'true' as REL relocs are now being used.  Add new PIC relocs:
+	R_ARM_COPY, R_ARM_GLOB_DAT, R_ARM_JUMP_SLOT, R_ARM_RELATIVE,
+	R_ARM_GOTOFF, R_ARM_GOTPC, R_ARM_GOT32, R_ARM_PLT32.
+
+	* elf32-arm.h (elf32_arm_merge_private_bfd_data): Check byte order
+	of targets.
+	(elf32_arm_final_link_relocate): Change parameters so that entire
+	reloc is passed.  Add support for PIC relocs.
+	(elf32_arm_relocate_section): Pass entire reloc to
+	elf32_arm_final_link_relocate.
+	(elf32_arm_check_relocs): Handle new PIC relocs.
+	(elf32_arm_adjust_dynamic_symbol): New function.
+	(elf32_arm_size_dynamic_sections): New function.
+	(elf32_arm_discard_copies): New function.
+	(elf32_arm_finish_dynamic_symbol): New function.
+	(elf32_arm_finish_dynamic_sections): New function.
+	(ELF_MAXPAGE_SIZE): Define.
+	(bfd_elf32_bfd_reloc_type_lookup): Define.
+	(elf_backend_relocate_section): Define.
+	(elf_backend_adjust_dynamic_symbol): Define.
+	(elf_backend_create_dynamic_sections): Define.
+	(elf_backend_finish_dynamic_symbol): Define.
+	(elf_backend_finish_dynamic_sections): Define.
+	(elf_backend_size_dynamic_sections): Define.
+	(elf_backend_plt_readonly): Define.
+	(elf_backend_want_got_plt): Define.
+	(elf_backend_want_plt_sym): Define.
+
+Wed Feb 17 12:02:26 1999  Stan Cox  <scox@cygnus.com>
+
+	* elf32-mips.c (_bfd_mips_elf_section_from_shdr): Make reginfo
+	sections SEC_LINK_ONCE and SEC_LINK_DUPLICATES_SAME_SIZE.
+	(_bfd_mips_elf_fake_sections): Likewise.
+
+Wed Feb 17 12:07:23 1999  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* elfarm-oabi.c (bfd_elf32_arm_allocate_interworking_sections,
+	bfd_elf32_arm_get_bfd_for_interworking,
+	bfd_elf32_arm_process_before_allocation): Define to avoid clash
+	with elfarm-nabi.c.
+
+	* elf32-arm.h: Don't declare elf32_arm_info_to_howto.
+	(elf32_thumb_to_arm_stub, elf32_arm_to_thumb_stub,
+	elf32_arm_find_nearest_line): Make them static.
+
+Tue Feb 16 22:44:37 1999  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_merge_symbol): Add pflags parameter.  Change all
+	callers.  Do not merge a definition from a shared object with a
+	weak undefined symbol.
+	(elf_link_add_object_symbols): Do not change the symbol type or
+	size if the old symbol overrides the new one.
+
+1999-02-08  Nick Clifton  <nickc@cygnus.com>
+
+	* config.bfd: Add support for strongarm target.
+
+Mon Feb  8 11:18:14 1999  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* elf32-m68k.c (reloc_map): Use the correct types for the struct
+	fields instead of unsigned char.
+
+Fri Feb  5 00:22:36 1999  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am: Rebuild dependencies.
+	* Makefile.in: Rebuild.
+
+Thu Feb  4 22:30:13 1999  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Change AC_PREREQ to 2.13.  Remove AM_CYGWIN32.
+	Change AM_EXEEXT to AC_EXEEXT and AM_PROG_INSTALL to
+	AC_PROG_INSTALL.  Add comments to uses of AC_DEFINE.
+	* acinclude.m4: Add comments to uses of AC_DEFINE.
+	* acconfig.h: Remove.
+	* configure: Rebuild with current autoconf/automake.
+	* aclocal.m4: Likewise.
+	* config.in: Likewise.
+	* Makefile.in: Likewise.
+
+1999-02-04  DJ Delorie  <dj@cygnus.com>
+
+	* libbfd.c (real_read): don't call fread for zero bytes.  This
+	covers up a bug (or misuse of bfd) that's exposed by Solaris.
+
+Thu Feb  4 12:38:10 1999  Stan Cox  <scox@cygnus.com>
+
+	* elf32-mips.c (mips_elf_relocate_section): Insure that the target
+	of a jump is in the current 256 MB region.
+
+Thu Feb  4 12:15:38 1999  Ian Lance Taylor  <ian@cygnus.com>
+
+	* format.c (bfd_check_format_matches): Change last patch to only
+	take effect for the binary target.
+
+Wed Feb  3 19:40:12 1999  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-i386.c (elf_i386_reloc_type_lookup): Add BFD_RELOC_CTOR.
+
+Wed Feb  3 15:02:44 1999  Catherine Moore  <clm@cygnus.com>
+
+	* elf32-fr30.c (fr30_elf_check_relocs):  New routine.
+
+Tue Feb  2 21:38:28 1999  Ian Lance Taylor  <ian@cygnus.com>
+
+	* format.c (bfd_check_format_matches): If the target was
+	previously specified, don't check other targets when checking for
+	an archive file.
+
+Tue Feb  2 18:16:43 1999  Catherine Moore  <clm@cygnus.com>
+
+	* elf32-arm.h (elf32_arm_reloc_map):  Removed.
+	(elf32_arm_reloc_type_lookup):  Removed
+	* elfarm-nabi.c (elf32_arm_reloc_map):  New.
+	(elf32_arm_reloc_type_lookup):  New.
+	* elfarm-oabi.c (elf32_arm_reloc_map):  New.
+	(elf32_arm_reloc_type_lookup):  New.
+
+Mon Feb  1 19:49:21 1999  Catherine Moore  <clm@cygnus.com>
+
+	* elfarm-nabi.c:  Renamed from elf32-arm-newabi.c.
+	* elfarm-oabi.c:  Renamed from elf32-arm-oldabi.c
+	* Makefile.am:  Use new files.
+	* Makefile.in:  Regenerate.
+	* configure.in:  Use new files.
+	* configure:  Regenerate.
+
+1999-02-01  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-fr30.c (fr30_elf_gc_mark_hook): New function.
+	(fr30_elf_gc_sweep_hook): New function.
+	(elf_backend_can_gc_sections): Define.
+
+Mon Feb  1 12:21:47 1999  Catherine Moore  <clm@cygnus.com>
+
+	* targets.c (bfd_target_vector):  Add bfd_elf32_littlearm_oabi_vec
+	and bfd_elf32_bigarm_oabi_vec.
+
+Mon Feb  1 11:46:31 1999  Catherine Moore  <clm@cygnus.com>
+
+	* Makefile.am (elf32-arm-oldabi.lo):  New.
+	(elf32-arm-newabi.lo):  New.
+	* Makefile.in:  Regenerate.
+	* config.bfd (thumb-*-elf):  Remove definition of targ_underscore.
+	(arm-*-elf):  Likewise.
+	(arm-*-oabi):  New.
+	(thumb-*-oabi):  New.
+	* configure:  Regenerate.
+	* configure.in (bfd_elf32_littlearm_oabi_vec):  New.
+	(bfd_elf32_bigarm_oabi_vec):  New.
+	* elf32-arm-newabi.c:  New.
+	* elf32-arm-oldabi.c:  New.
+	* elf32-arm.c:  Removed.
+	* elf32-arm.h:  New.
+
+Mon Feb  1 11:52:12 1999  Frank Ch. Eigler  <fche@cygnus.com>
+
+	* binary.c (binary_set_section_contents): Omit warnings for
+	unloadable sections.
+
+1999-01-31  Michael Meissner  <meissner@cygnus.com>
+
+	* config.bfd (powerpc{,le}-*-vxworks*): Add aliases to
+	powerpc{,le}-*-eabi.
+
+1999-01-29  Nick Clifton  <nickc@cygnus.com>
+
+	* dwarf2.c (read_unsigned_leb128): Remove unused variables.
+	* dwarf2.c (read_signed_leb128): Remove unused variables.
+
+Fri Jan 29 00:47:21 1999  H.J. Lu  <hjl@gnu.org>
+
+	* elf.c (assign_file_positions_for_segments): Only adjust
+	p_align when needed.
+
+Thu Jan 28 20:05:22 1999  Ian Lance Taylor  <ian@cygnus.com>
+
+	* binary.c (binary_set_section_contents): Don't return early for a
+	non-loadable section, in case the first section is non-loadable.
+	Don't set the low lma for a SEC_NEVER_LOAD section.  From Maciej
+	W. Rozycki <macro@ds2.pg.gda.pl>.
+
+1999-01-28  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-fr30.c (fr30_reloc_map): Add R_FR30_GNU_VTINHERIT and
+	R_FR30_GNU_VTENTRY relocs.
+
+Thu Jan 28 11:08:16 1999  Catherine Moore  <clm@cygnus.com>
+
+	* elflink.h (elf_link_output_sym):  Zero syms which are
+	part of sections which have been excluded.
+
+Wed Jan 27 13:35:35 1999  Stan Cox  <scox@cygnus.com>
+
+	* coff-arm.c (_bfd_coff_arm_set_private_flags): Changed F_PIC
+	to F_PIC_INT.
+	* coffcode.h (coff_set_arch_mach_hook): Removed F_ARM_2a and
+	F_ARM_3M labels.  Changed F_PIC to F_PIC_INT.
+
+1999-01-27  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-fr30.c (fr30_elf_howto_table): Fix name of R_FR30_48
+	relocation.
+	(fr30_final_link_relocate): Use computed value as result of
+	relocation.
+
+1999-01-26  Frank Ch. Eigler  <fche@cygnus.com>
+
+	* binary.c (binary_set_section_contents): Emit warning for
+	huge file offsets due to widely-dispersed section LMAs.
+
+Mon Jan 18 03:35:35 1999  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (assign_file_positions_for_segments): If not D_PAGED,
+	align first section to largest section alignment, not first
+	section alignment.
+
+1999-01-04  Jason Molenda  (jsm@bugshack.cygnus.com)
+
+	* configure.in: Require autoconf 2.12.1 or higher.
+
+Tue Dec 22 15:21:41 1998  Catherine Moore  <clm@cygnus.com>
+
+	* archures.c (bfd_mach_i386_i386_intel_syntax):  Define.
+	* bfd-in2.h:  Likewise.
+	* cpu-i386.c (bfd_i386_arch_intel_syntax):  New.
+
+1998-12-16  Gavin Romig-Koch  <gavin@cygnus.com>
+
+	* archures.c (bfd_mach_mips4111): New.
+	* bfd-in2.h: Regenerate.
+	* cpu-mips.c: Add support for and independent 4111.
+	* elf32-mips.c (elf_mips_mach): E_MIPS_MACH_4111 -> bfd_mach_mips4111.
+	(_bfd_mips_elf_final_write_processing):
+	bfd_mach_mips4111 -> E_MIPS_ARCH_3 | E_MIPS_MACH_4111.
+
+1998-12-15  Gavin Romig-Koch  <gavin@cygnus.com>
+
+	* elf32-mips.c (elf_mips_abi_name): New.
+	(_bfd_mips_elf_merge_private_bfd_data): Compare EF_MIPS_ABI flags.
+
+1998-12-12  Gavin Romig-Koch  <gavin@cygnus.com>
+
+	* elf32-mips.c (_bfd_mips_elf_final_write_processing):
+	Handle bfd_mach_mips4300.
+
+1998-12-11  Ulrich Drepper  <drepper@cygnus.com>
+
+	* elf32-i386.c: Remove leaked development code from patch
+	1998-12-10 by Richard Henderson.
+
+1998-12-10  Richard Henderson  <rth@cygnus.com>
+
+	* elf32-i386.c (elf_i386_relocate_section): Don't fail relocations
+	in debug sections for symbol defined externally.
+
+Thu Dec 10 10:58:38 1998  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* targets.c (bfd_target_vector): Remove duplicate entry for
+	tekhex_vec.
+
+1998-12-09  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-fr30.c (fr30_elf_howto_table): Set src_mask fields to 0
+	since we are using RELAs.
+
+Tue Dec  8 22:15:48 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	SCO Open Server Release 5 core file support, from Jouke Numan
+	<jnuman@hiscom.nl>:
+	* sco5-core.c: New file.
+	* configure.in (i[3456]86-*-sco3.2v5*): Use sco5-core.lo.
+	(sco5-core.lo): Define SCO5_CORE in COREFLAG.
+	* Makefile.am: Rebuild dependencies.
+	(OPTIONAL_BACKENDS): Add sco5-core.lo.
+	(OPTIONAL_BACKENDS_CFILES): Add sco5-core.c.
+	* bfd.c (struct _bfd): Add sco5_core_data field to tdata.
+	* targets.c (sco5_core_vec): Add to target list if SCO5_CORE.
+	* bfd-in2.h, configure, Makefile.in: Rebuild.
+
+Tue Dec  8 19:38:42 1998  Mark Klein  <mklein@dis.com>
+
+	* config.bfd (hppa*-*-mpeix*): New target.
+	* configure.in: Add AC_HEADER_DIRENT.
+	(hppa*-*-mpeix*): New target.
+	* configure.host (hppa*-*-mpeix*): New host.
+	* hpux-core.c: Check HOST_HPPAMPEIX.  Use HAVE_DIRENT_H and
+	friends rather than just including <sys/dir.h>.
+	* som.h (struct som_symbol): Add hppa_priv_level and apto
+	tc_data.  Change all users.
+	(struct somdata): Add comp_unit field.
+	(obj_som_compilation_unit): Define.
+	(bfd_som_attach_compilation_unix): Declare.
+	* som.c: Check HOST_HPPAMPEIX.
+	(struct som_misc_symbol_info): Add new field priv_level.
+	(som_object_setup): Add current_offset parameter.  Change all
+	callers.
+	(setup_sections): Likewise.
+	(som_object_p): For EXECLIBMAGIC, read the lst header.
+	(som_write_symbol_strings): Add compilation_unit parameter.
+	Change all callers.
+	(som_finish_writing): Write out compilation_unit.
+	(som_bfd_derive_misc_symbol_info): Set priv_level.
+	(som_build_and_write_symbol_table): Set xleast field to 3.
+	(som_slurp_symbol_table): Set symbol priv_level.
+	(bfd_som_attach_compilation_unit): New function.
+	(som_bfd_ar_write_symbol_stuff): Set xleast field to 3.  Set
+	priv_level into symbol_value.
+	* configure, config.in: Rebuild.
+
+Tue Dec  8 16:21:35 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* hpux-core.c (hpux_core_core_file_p): Change call to nonexistent
+	warning function to call _bfd_error_handler instead.
+
+	* libbfd.c (COERCE32): Cast through unsigned long and long to
+	avoid bug in old version of gcc.
+
+	* elf64-alpha.c (elf64_alpha_additional_program_headers): Remove.
+	(elf_backend_additional_program_headers): Don't define.
+
+1998-12-08  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-fr30.c (fr30_final_link_relocate): Fix PC relative
+	relocations to include offset of 2 included in the insns, and the
+	offset of the relocs within the section.
+
+Wed Dec  2 15:03:59 1998  David Taylor  <taylor@texas.cygnus.com>
+
+	The following changes were made by David Taylor
+	<taylor@texas.cygnus.com>, Edith Epstein
+	<eepstein@sophia.cygnus.com>, Jim Blandy
+	<jimb@zwingli.cygnus.com>, and Elena Zannoni
+	<ezannoni@kwikemart.cygnus.com> as part of the project to merge in
+	changes originally made by HP; HP did not create ChangeLog
+	entries.
+
+	* aclocal.m4, configure, Makefile.in: Rebuilt using latest
+	automake macro library.
+
+	* hpux-core.c (hpux_core_core_file_p): this function now
+	understands HPUX 10.30 thread info. Yes, the thread stacks can be
+	found in the corefile! Also, in hpux_core_core_file_p, if we
+	encounter a section with an unknown type, don't punt.  Instead,
+	just skip it.  Also, count the number of sections of known type
+	that we encounter.  If we encounter at least one good one, then
+	we'll declare that the file is a core file.  If we encounter any
+	unknown ones but some known ones, then we'll issue a warning (but
+	still declare it to be a core file). Also, correctly decide when a
+	file is not a core.
+	(PROC_INFO_HAS_THREAD_ID): define if CORE_ANON_SHMEM defined.
+	(CORE_ANON_SHMEM): define if not defined.
+	(hpux_core_struct): add members lwpid and user_tid.
+	(core_kernel_thread_id, core_user_thread_id): new macros.
+	(make_bfd_asection): use bfd_alloc to allocate room for a copy of
+	the name before storing it in the bfd.
+	(hpux_core_core_file_p): handle threads.
+
+	* libhppa.h (GET_FIELD): protect against redefinition.
+	(HPPA_WIDE): define.
+	(GET_FIELD): define.
+	(GET_BIT): define.
+	(MASK): define.
+	(CATENATE): define.
+	(ELEVEN): define.
+	(sign_extend): redefine.
+	(assemble_6): define.
+	(assemble_12): rewrite.
+	(assemble_16): define.
+	(assemble_16a): define.
+	(assemble_17): rewrite.
+	(assemble_22): define.
+
+1998-12-07  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-fr30.c (fr30_final_link_relocate): Using signed
+	relocations for signed values.
+
+Sun Dec  6 16:30:33 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* mipsbsd.c (MY(set_arch_mach)): Make static.
+	* aoutx.h (NAME(aout,machine_type)): For bfd_arch_mips, use
+	bfd_mach_mips* macros rather than simple numbers.
+
+	COFF weak symbol support, based on patches from Mark Elbrecht
+	<snowball3@usa.net>:
+	* coffcode.h (coff_slurp_symbol_table): Handle C_WEAKEXT.
+	* coffgen.c (coff_renumber_symbols): Handle weak symbols.
+	(coff_write_alien_symbol): Likewise.
+	* cofflink.c (coff_link_check_ar_symbols): Likewise.
+	(coff_link_add_symbols): Likewise.
+	(_bfd_coff_link_input_bfd): Likewise.
+	(_bfd_coff_write_global_sym): Likewise.
+
+	* elf.c (copy_private_bfd_data): Always initialize the
+	includes_phdrs field.
+
+	* elflink.h (elf_fix_symbol_flags): Check for case where a non-ELF
+	file defines a symbol first mentioned in an ELF file.
+
+	* bfd-in.h: Always define BFD_HOST_64_BIT and BFD_HOST_U_64_BIT if
+	possible, rather than only if BFD64.
+	* elflink.h (compute_bucket_count): Just check BFD_HOST_U_64_BIT,
+	not __GNUC__.
+	* bfd-in2.h: Rebuild.
+
+	* srec.c (srec_set_section_contents): Correct test to avoid
+	switching to 4 byte addresses after seeing a second section which
+	requires 3 byte addresses.  From Joel Schantz
+	<joel.schantz@argosys.boeing.com>.
+
+	* config.bfd (m68*-*-gnu*): New target.  From Aymeric Vincent
+	<aymeric.vincent@emi.u-bordeaux.fr>.
+
+1998-12-04  Jim Blandy  <jimb@zwingli.cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_merge_private_bfd_data): Fix logic to
+	decide whether the output file is -mrelocatable-lib,
+	-mrelocatable, or neither.  (gdb.base/nodebug.exp)
+
+1998-12-03  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-fr30.c: Add support for R_FR30_48 reloc.
+	* reloc.c: Add BFD_RELOC_FR30_48 relocation.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate
+
+Wed Dec  2 00:58:37 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_adjust_dynamic_symbol): Warn on an attempt to
+	link against a dynamic symbol with no type or size.
+
+1998-12-01  Ulrich Drepper  <drepper@cygnus.com>
+
+	* elf32-i386.c (i386_check_relocs) [R_386_32]: Don't emit
+	relocation for section which does not get loaded.
+	(elf_i386_relocate_section) [R_386_32]: Likewise.
+
+Tue Dec  1 11:33:33 1998  Jim Wilson  <wilson@cygnus.com>
+
+	* coff-h8300.c (h8300_bfd_link_add_symbols): Make reloc_size,
+	reloc_count and i long instead of unsigned long.  Handle error
+	return from bfd_canonicalize_reloc.
+
+1998-12-01  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_relocate_section): Detect the absence of
+	a hash table.
+
+Mon Nov 30 15:28:09 1998  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+	* elf32-sh.c (elf/sh.h): Include.
+	sh_reloc_type: Delete.  Changed all references to elf_sh_reloc_type.
+	(sh_elf_howto_tab): Add HOWTO for R_SH_SWITCH8.
+	(sh_reloc_map): Map BFD_RELOC_8_PCREL to R_SH_SWITCH8.
+	(sh_elf_relax_delete_bytes): Handle R_SH_SWITCH8.
+	* Makefile.in: Add dependency of elf32-sh.lo on $(INCDIR)/elf/sh.h.
+
+Fri Nov 27 17:51:38 1998  Geoff Keating  <geoffk@ozemail.com.au>
+
+	* elflink.h (compute_bucket_count): Don't allow minsize==0, it
+	causes division by zero later on.
+
+Thu Nov 26 11:19:35 1998  Dave Brolley  <brolley@cygnus.com>
+
+	* elf32-fr30.c (fr30_elf_pc9_reloc,fr30_elf_pc12_reloc): Not
+	needed.
+
+1998-11-25  DJ Delorie  <dj@cygnus.com>
+
+	* coff-i386.c (i3coff_object_p): Remove hack.  Use new emulation
+	hook now.
+
+Tue Nov 24 10:25:27 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-fr30.c (fr30_elf_relocate_section): Call
+	fr30_final_link_relocate.
+	(fr30_final_link_relocate): New function: Handle I20 and I32
+	relocs.
+	(fr30_elf_i32_reloc): New function: Handle I32 relocs.
+	(fr30_elf_pc9_reloc): New function: Handle 9_PCREL relocs.
+	(fr30_elf_pc12_reloc): New function: Handle 12_PCREL relocs.
+
+	* elf32-v850.c (v850_elf_relocate_section): Reset hi16s reloc
+	chain to empty.
+
+	The following changes are based on a patch submitted by Gianluca
+	Moro <glctr@abc.it>:
+
+	(v850_elf_perform_relocation): Only update a hi16s reloc if it has
+	not already been updated.
+	(find_remembered_hi16s_reloc): New parameter 'already_found'
+	returns state of remembered hi16s reloc.
+	(remember_hi16s_reloc): Set 'found' field to false.
+	(hi16s_location): Add 'found' field.
+
+1998-11-23  DJ Delorie  <dj@cygnus.com>
+
+	* coff-i386.c (bfd_pe_dll_not_recognized_hack): the linker wants
+	to see .DLL files as unrecognized.
+	(i3coff_object_p): Sorry, had to hack it to not recognize these
+	files (pei-i386) on request.
+
+1998-11-23  DJ Delorie  <dj@cygnus.com>
+
+	* opncls.c (bfd_make_readable): need more cleanup for symbols and
+	relents.  Call bfd_check_format to reinitialize.
+
+Fri Nov 20 14:21:36 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-fr30.c (fr30_elf_relocate_section): Remove spurious
+	warnings.
+
+Thu Nov 19 14:42:15 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* aclocal.m4: regenerate
+	* configure: regenerate
+
+Tue Nov 17 20:23:35 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf-bfd.h (struct elf_link_hash_entry): Add vtable_entries_size.
+	* elf.c (_bfd_elf_link_hash_newfunc): Clear it.
+	* elflink.h (elf_gc_propagate_vtable_entries_used): Copy it, and
+	respect it as an upper bound on what memory to reference.
+	(elf_gc_smash_unused_vtentry_relocs): Likewise.
+	(elf_gc_record_vtentry): Handle as-yet undefined vtables.  Set and
+	update vtable_entries_size appropriately.
+
+Tue Nov 17 15:28:31 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-fr30.c (fr30_reloc_type_lookup): Used integers to hold
+	reloc number.
+
+Mon Nov 16 22:19:21 1998  DJ Delorie  <dj@cygnus.com>
+
+	* archive.c (bfd_ar_hdr_from_filesystem): support BFD_IN_MEMORY
+	bfds; they have no "file" so we fake it.
+	* bfd-in2.h: add bfd_make_writable and bfd_make_readable (regen)
+	* libbfd.c (bfd_write): Allow writing to BFD_IN_MEMORY bfds by
+	resizing the memory buffer.
+	* opncls.c (bfd_make_writable): New function; lets you write a
+	bfd_create'd bfd to an in-memory buffer.
+	(bfd_make_readable): New function; lets you read back that buffer
+	as if it were from bfd_openr.  Used to build generated archive
+	members (winsup's ld's dlltool)
+
+Mon Nov 16 19:15:19 1998  Dave Brolley  <brolley@cygnus.com>
+
+	* po/bfd.pot: Regenerated.
+
+Mon Nov 16 10:57:06 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (hi16s_location): Replaced fixed size array with
+	linked list.
+
+Sun Nov 15 20:28:25 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf64-alpha.c (elf64_alpha_relax_section): Search for the proper
+	element of the gotentry list for local symbols too.
+	(elf64_alpha_relocate_section): Unify local and global handling.
+	Assert that gotent->use_count > 0.
+
+Sat Nov 14 15:16:01 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in (vms_alpha_vec): Rename from evax_alpha_vec, and
+	update for file name changes of July 2, 1998.
+	(vms_vax_vec): New.
+	* configure: Rebuild.
+
+Thu Nov 12 19:19:54 1998  Dave Brolley  <brolley@cygnus.com>
+
+	* po/bfd.pot: Regenerated.
+
+Tue Nov 10 16:17:06 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* acinclude.m4, config.bfd: detect cygwin* instead of cygwin32*.
+	* aclocal.m4, configure: regenerate
+
+Tue Nov 10 15:13:59 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf.c (prep_headers): Add support for bfd_arch_fr30.
+
+Tue Nov 10 13:37:36 1998  Felix Lee  <flee@cygnus.com>
+
+	* acinclude.m4 (BFD_HAVE_SYS_PROCFS_TYPE,
+	BFD_HAVE_SYS_PROCFS_TYPE_MEMBER): didn't define macro when value
+	was cached.
+	* aclocal.m4, configure: regenerated.
+
+Tue Nov 10 14:31:01 1998  Catherine Moore  <clm@cygnus.com>
+
+	* elf32-d10v.c (reloc_type):  Add R_D10V_GNU_VTINHERIT and
+	R_D10V_GNU_VTENTRY relocs.
+	(elf_d10v_howto_table):  Likewise.
+	(d10v_reloc_map d10v_reloc_map):  Likewise.
+	(elf32_d10v_gc_mark_hook):  New.
+	(elf32_d10v_gc_sweep_hook):  New.
+	(elf32_d10v_check_relocs):  New.
+	(elf32_d10v_relocate_section):  New.
+	(elf_backend_relocate_section):  Define.
+	(elf_backend_can_gc_sections):  Define.
+
+Sat Nov  7 18:07:51 1998  Peter Schauer  <peter.schauer@regent.e-technik.tu-muenchen.de>
+
+	* Makefile.am (BFD32_BACKENDS): Move vms files here...
+	(BFD64_BACKENDS): ...from here.
+	(BFD32_BACKENDS_CFILES): Move vms files here...
+	(BFD64_BACKENDS_CFILES): ...from here.
+	* Makefile.in: Rebuild.
+
+Wed Nov  4 15:58:48 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* Makefile.am: Add FR30 target.
+	* Makefile.in: Add FR30 target.
+	* archures.c: Add support for FR30.
+	* config.bfd: Add support for FR30.
+	* configure.in: Add support for FR30.
+	* reloc.c: Add support for FR30 relocations.
+	* targets.c: Add support for FR30 relocations.
+	* bfd-in2.h: Regenerate.
+	* configure: Regenerate.
+	* libbfd.h:  Regenerate.
+	* cpu-fr30.c: New file.
+	* elf32-fr30.c: New file.
+
+Mon Nov  2 14:59:33 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* configure.in: detect cygwin* instead of cygwin32*
+	* configure: regenerate
+
+Sun Nov  1 19:32:28 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-m10300.c (mn10300_elf_relax_section): Do not use alloca,
+	use bfd_malloc and free instead and check return value from bfd_malloc.
+
+Sun Nov  1 16:20:35 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libbfd-in.h (_bfd_dwarf1_find_nearest_line): Declare.
+	* libbfd.h: Rebuild.
+
+	* elf32-mips.c (mips_elf_dynsym_sec_names): Comment out.
+	(SIZEOF_MIPS_DYNSYM_SECNAMES): Likewise.
+	(MIPS_TEXT_DYNSYM_SECN): Likewise.
+	(_bfd_mips_elf_fake_sections): Don't set sh_info field of a .hash
+	section.
+	(struct mips_elf_link_hash_table): Remove dynsym_sec_strindex
+	field.
+	(mips_elf_link_hash_table_create): Don't initialize
+	dynsym_sec_strindex.
+	(mips_elf_gc_mark_hook): Add default case to avoid warning.
+	(mips_elf_size_dynamic_sections): Generate a section symbol for
+	every output section.
+	(mips_elf_finish_dynamic_sections): Count all sections for
+	DT_MIPS_UNREFEXTNO.
+	(mips_elf_finish_dynamic_sections): Use dynamic symbols for all
+	output sections.
+
+Sun Nov  1 12:46:53 1998  Geoff Keating  <geoffk@ozemail.com.au>
+
+	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Allocate two slots
+	for later PLT entries in large PLTs.
+	(ppc_elf_finish_dynamic_symbol): Allow for the extra slots.
+
+Sat Oct 31 20:10:09 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-ppc.c (ppc_elf_reload_section): Fix typo.
+
+1998-10-26 15:58  Ulrich Drepper  <drepper@cygnus.com>
+
+	* elf-bfd.h (struct elf_link_hash_entry): Add new field elf_hash_value.
+	* elflink.h (elf_collect_hash_codes): New function.  This function is
+	called for each exported symbol and we compute the ELF hash value for
+	it.
+	(compute_bucket_value): New function.  It is called from
+	size_dynamic_sections to determine the hash table size.  When we are
+	optimizing a better, but slower, algorithm is used.
+	(size_dynamic_sections): Call compute_bucket_value.
+
+	* elf.c (bfd_elf_hash): Optimize the hash function a bit.
+
+Mon Oct 19 20:03:21 1998  Catherine Moore  <clm@cygnus.com>
+
+	* elf32-sh.c:  Add HOWTO entries for R_SH_GNU_VTINHERIT and
+	R_SH_GNU_VTENTRY.
+	(sh_elf_gc_mark_hook):  New.
+	(sh_elf_gc_sweep_hook):  New.
+	(sh_elf_check_relocs):  New.
+	(elf_backend_can_gc_sections):  Define.
+
+Mon Oct 19 16:57:05 1998  Felix Lee  <flee@cygnus.com>
+
+	* acinclude.m4: undo previous gettext change
+	* aclocal.m4: rebuild with right version of aclocal.
+
+Mon Oct 19 01:47:21 1998  Felix Lee  <flee@cygnus.com>
+
+	* acinclude.m4, aclocal.m4: move gettext-related fragments from
+	aclocal.m4 to acinclude.m4, so they don't get lost.
+
+	* elfcore.h: rewrite for better corefile support.
+	* elf.c (elfcore_*): new functions.
+	* elf-bfd.h (elf_obj_tdata): new structure members.
+	* acconfig.h, acinclude.m4, configure.in: add feature-tests for
+	flavor of procfs.
+	* aclocal.m4, config.in, configure, Makefile.in: regenerated.
+
+Fri Oct 16 14:07:45 1998  Catherine Moore  <clm@cygnus.com>
+
+	* elf32-m32r.c:  Add HOWTO entries for R_M32R_GNU_VTINHERIT
+	and R_M32R_GNU_VTENTRY.
+	(elf_backend_can_gc_sections):  Define.
+	(m32r_elf_check_relocs):  New.
+	(m32r_elf_gc_mark_hook):  New.
+	(m32r_elf_gc_sweep_hook):  New.
+	(m32r_elf_relocate_section):  Handle VT relocs.
+
+Mon Oct 12 14:18:40 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c (arm_relocate_section): Remove redundant test.
+
+	* bfd-in2.h (struct reloc_howto_struct): Improve comment to make
+	cleat that the 'bitsize' field is the size of the bitfield AFTER
+	relocation not before.
+
+	* elf32-m32r.c (R_M32R_18_PCREL): Fix size of bitfield.
+
+	* coff-mips.c (mips_relocate_hi): Cope with missing refhi or reflo
+	relocs.
+
+Tue Oct  6 09:20:44 1998  Catherine Moore  <clm@cygnus.com>
+
+	* elf32-sparc.c:  Add HOWTO entries for R_SPARC_GNU_VTINHERIT and
+	R_SPARC_GNU_VTENTRY.
+	(elf32_sparc_check_relocs):  Handle them.
+	(elf32_sparc_reloc_type_lookup):  Likewise.
+	(elf32_sparc_relocate_section):  Likewise.
+	(elf32_sparc_gc_mark_hook):  New.
+	(elf32_sparc_gc_sweep_hook):  New.
+
+Mon Oct  5 14:55:30 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* som.c (som_finish_writing): Perform some sanity checks when
+	writing an executable or shared library.
+
+Mon Oct  5 12:02:31 1998  Gavin Romig-Koch  <gavin@cygnus.com>
+
+	* dwarf1.c : New file.  Adds _bfd_dwarf1_find_nearest_line.
+	* configure.in (elf): Add dwarf1.lo.
+	* elf-bfd.h (elf_ob_tdata): Add dwarf1_find_line_info.
+	* elf.c (_bfd_elf_find_nearest_line): Add call to
+	_bfd_dwarf1_find_nearest_line.
+	* elf32-mips.c (_bfd_mips_elf_find_nearest_line):
+	Add call to _bfd_dwarf1_find_nearest_line.
+	* configure: Rebuilt.
+
+Mon Oct  5 10:06:22 1998  Catherine Moore  <clm@cygnus.com>
+
+	* elflink.h (elf_gc_sections):  Do not allow garbage
+	collection if dynamic sections have been created.
+
+Mon Oct  5 09:07:37 1998  Catherine Moore  <clm@cygnus.com>
+
+	* elf32-v850.c: Add HOWTO entries for R_V850_GNU_VTINHERIT and
+	R_V850_GNU_VTENTRY.
+	(v850_elf_check_relocs):  Handle VTINHERIT and VTENTRY relocs.
+	(v850_elf_perform_relocation):  Likewise.
+	(v850_elf_final_link_relocate):  Likewise.
+	(v850_elf_relocate_section):  Likewise.
+	(v850_elf_gc_sweep_hook):  New routine.
+	(v850_elf_gc_mark_hook):  New routine.
+	(elf_backend_can_gc_sections):  Define.
+
+Mon Oct  5 09:04:25 1998  Catherine Moore  <clm@cygnus.com>
+
+	* elf32-m68k.c (elf_m68k_gc_sweep_hook):  Don't assume
+	that dynobj exists.
+
+Sun Oct  4 23:29:34 1998  David Edelsohn  <edelsohn@mhpcc.edu>
+
+	* rs6000-core.c (rs6000coff_core_file_matches_executable_p):
+	Declare size as bfd_size_type.
+	(rs6000coff_get_section_contents): Declare count as bfd_size_type.
+
+Sun Oct  4 20:38:29 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* cpu-hppa.c (bfd_hppa20_arch): Define.  Link it into the bfd_hppa_arch
+	structure.
+	* som.c (CPU_PA_RISC2_0): Define.
+	(_PA_RISC2_0_ID): Likewise.
+	(som_finish_writing): Use CPU_PA_RISC2_0 for the system_id as needed.
+
+Sun Oct  4 21:19:09 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_link_add_object_symbols): When a versioned symbol
+	has a base which is already defined, only add the referenced
+	symbol to the dynamic symbol table if it is defined or referenced
+	by a regular file.
+
+	* elf32-i386.c (elf_i386_info_to_howto_rel): Handle vtable relocs
+	correctly.
+
+1998-09-27  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* elflink.h (elf_link_add_object_symbols): Undo last change.
+
+Wed Sep 23 16:09:31 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elflink.h (elf_link_add_object_symbols): Don't record a dynamic
+	symbol for the indirect alias to a versioned symbol.
+
+Mon Sep 21 12:15:22 1998  Catherine Moore  <clm@cygnus.com>
+
+	* elf32-i386.c (elf32_i386_vtinherit_howto): New.
+	(elf32_i386_vtentry_howto): New.
+	(elf_i386_reloc_type_lookup):  Return elf32_i386_vtentry_howto
+	or elf32_i386_vtinherit_howto  on lookup.
+
+Sun Sep 20 00:48:07 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* elf32-m68k.c: Include "elf/m68k.h".  Remove definition of enum
+	reloc_type.  Rename R_68K__max to R_68K_max.
+	(howto_table): Use _bfd_elf_rel_vtable_reloc_fn for a VTENTRY
+	reloc.
+
+Sun Sep 20 00:09:25 1998  Chris Torek  <torek@bsdi.com>
+
+	* libbfd.c (bfd_getb32): Rewrite expression to get better code.
+	(bfd_getl32, bfd_getb_signed_32, bfd_getl_signed_32): Likewise.
+
+	* libbfd.c (bfd_log2): Cast to bfd_vma before shifting, not
+	after.
+
+Sat Sep 19 22:42:23 1998  Doug Rabson  <dfr@nlsystems.com>
+
+	* elflink.h (elf_link_add_object_symbols): Ensure that the warning
+	message has a null byte terminator.
+
+Fri Sep 18 14:35:29 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_perform_relocation): Ignore contents of
+	word subject to R_V850_32 relocation.
+
+Thu Sep 17 17:20:36 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* dwarf2.c: Add comment describing problem computing line numbers
+	for undefined symbols at link time.
+
+Thu Sep 17 16:03:28 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf64-alpha.c (elf64_alpha_adjust_dynamic_symbol): Don't
+	transform a defweak into a plt entry.
+	(elf64_alpha_calc_dynrel_sizes): Allow room for secondary
+	plt entry references to receive a RELATIVE reloc.
+	(elf64_alpha_finish_dynamic_symbol): Fill them in.
+	(elf64_alpha_relocate_section): Assert we don't overrun
+	the allocated relocation space.
+
+Wed Sep 16 18:03:13 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf.c (swap_out_syms): Always treat section symbols as
+	special, even if they are attached to a common section.
+
+Wed Sep 16 10:34:13 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_symbol_processing): Move symbols in
+	sections with v850 common section attributes into named v850
+	common sections.
+	(v850_elf_add_symbol_hook): Move symbols in sections with v850
+	common section attributes into named v850 common sections.
+
+Wed Sep 16 11:26:49 CDT 1998  Catherine Moore  <clm@cygnus.com>
+
+	* elf32-arm.c (elf32_arm_gc_mark_hook):  Remove print
+	statement.
+
+1998-09-15  Geoff Keating  <geoffk@ozemail.com.au>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Reverse output_offset
+	part of Vladimir's change of 1998-08-19.  Make a R_PPC_SDAREL16
+	reloc to the wrong section a warning, not an error.  .dynsbss
+	is not an output section, so there is no need to check for it.
+
+Tue Sep 15 12:40:05 1998  Catherine Moore  <clm@cygnus.com>
+
+	* elf-bfd.h:  Add argument to elf_backend_get_symbol_type.
+
+Tue Sep 15 08:34:40 1998  Catherine Moore  <clm@cygnus.com>
+
+	* elf.c (swap_out_syms):  Pass type to elf_backend_get_symbol_type.
+	* elf32-arm.c:  Add HOWTO entries for R_ARM_GNU_VTINHERIT and
+	R_ARM_GNU_VTENTRY.
+	(elf32_arm_gc_mark_hook): New.
+	(elf32_arm_gc_sweep_hook): New.
+	(elf32_arm_check_relocs): New.
+	(elf32_arm_final_link_relocate):  Handle VTINHERIT and VTENTRY
+	relocations.
+	(elf32_arm_relocate_section): Handle VTINHERIT and VTENTRY
+	relocations.
+
+1998-09-10  Geoff Keating  <geoffk@ozemail.com.au>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): If dynobj is NULL,
+	assume there is no PLT or GOT.
+
+Wed Sep  9 14:24:12 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-arm.c (elf32_arm_find_nearest_line): New function:  just
+	like _elf_bfd_find_nearest_line() except that STT_ARM_TFUNC is
+	also accepted as a function symbol type.
+
+Mon Sep  7 13:24:03 1998  Peter Schauer  <pes@regent.e-technik.tu-muenchen.de>
+
+	* rs6000-core.c (_LONG_LONG):  Define for AIX 4.x only.
+
+Sat Sep  5 20:40:18 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libbfd-in.h (_bfd_nolink_bfd_gc_sections): Correct definition to
+	match definition of _bfd_gc_sections field.
+	* libbfd.h: Rebuild.
+
+Fri Sep  4 13:54:23 1998  David Miller  <davem@dm.cobaltmicro.com>
+
+	* elf32-sparc.c (elf32_sparc_relocate_section): Properly adjust
+	the addend of a dynamic relocation referencing a section.
+	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
+	(sparc64_elf_finish_dynamic_symbol): Fix the PLT relocation offset.
+
+Thu Sep  3 17:28:50 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elflink.h (bfd_elfNN_size_dynamic_sections): Verify that the
+	bed has a size_dynamic_sections routine before trying to use it.
+
+Mon Aug 31 14:49:22 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf32-mips.c (elf_mips_gnu_vtentry_howto): Use
+	_bfd_elf_rel_vtable_reloc_fn.
+
+Mon Aug 31 10:23:40 1998  Catherine Moore  <clm@cygnus.com>
+
+	* Makefile.am:  Add elf32-arm.c.
+	* Makefile.in:  Rebuild.
+	* elf-bfd.h:  Add elf_backend_get_symbol_type.
+	* elf.c (swap_out_syms):  If defined, call
+	elf_backend_get_symbol_type.
+	* elf32-arm.c: Define elf_backend_get_symbol_type.
+	(elf32_arm_get_symbol-type):  New routine.
+	(record_thumb_to_arm_glue):  Change to use STT_ARM_TFUNC.
+	(bfd_elf32_arm_process_before_allocation):  Change to
+	check for STT_ARM_TFUNC.
+	(elf32_arm_final_link_relocate):  Likewise.
+	* elfxx-target.h:  Add elf_backend_get_symbol_type.
+
+Fri Aug 28 19:44:07 1998  Richard Henderson  <rth@cygnus.com>
+
+	* archures.c (bfd_mach_alpha_ev[456]): New.
+	* cpu-alpha.c: Rework to match these types.
+	* bfd-in2.h: Rebuild.
+
+Fri Aug 28 19:38:53 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf-bfd.h (_bfd_elf_rel_vtable_reloc_fn): Declare.
+	* elf.c (_bfd_elf_rel_vtable_reloc_fn): New.
+
+	* elf32-i386.c (elf_howto_table): Add vtable relocs.
+	(elf_i386_reloc_type_lookup): Recognize them.
+	(elf_i386_check_relocs): Pass them off to generic code.
+	(elf_i386_relocate_section): Ignore them.
+	(elf_i386_gc_mark_hook, elf_i386_gc_sweep_hook): New.
+	(elf_backend_can_gc_sections): True.
+
+Thu Aug 20 15:03:45 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-arm.c (elf32_thumb_to_arm_stub): Check sym_sec is not NULL
+	before looking at owner field.
+	(elf32_arm_to_thumb_stub): Ditto.
+	(elf32_arm_relocate_section): Compute name before calling
+	elf32_arm_final_link_relocate().
+
+Thu Aug 20 11:30:17 1998  Michael Snyder  <msnyder@cleaver.cygnus.com>
+
+	* elf.c: comment and formatting cleanups.
+	* elfcore.h: ditto.
+
+Wed Aug 19 15:43:26 1998  Michael Snyder  <msnyder@cleaver.cygnus.com>
+
+	* elfcode.h (elf_object_p): Reject files of header type ET_CORE
+	(core files are treated differently than object files).
+	* elf-bfd.h (_bfd_elf_write_corefile_contents,
+	bfd_elf_mkcorefile): declare.
+	* elfxx-target.h (_bfd_elf_write_corefile_contents,
+	bfd_elf_mkcorefile): add to bfd_target vector.
+	* elfcore.h (elf_core_file_p): save the program header table,
+	and set the bfd architecture from the elf file header.
+	* elf.c (bfd_elf_mkcorefile): new function.
+	(_bfd_elf_write_corefile_contents): new function.
+	(assign_file_positions_for_segments): add cases for handling
+	PT_NOTE segments.  (assign_file_positions_except_relocs):
+	core files should be handled the same as exec files.
+	(prep_headers): identify core files as type ET_CORE.
+	(copy_private_bfd_data): identify the sections belonging to
+	the PT_NOTE segment.
+
+	* elf32-sparc.c (elf32_sparc_final_write_processing):
+	add break statement to default case.
+
+1998-08-19  Vladimir N. Makarov  <vmakarov@cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): Check that output
+	section (not input) will be in sections ".sbss", ".sbss2",
+	".sdata", and ".sdata" for R_PPC_SDAREL16, R_PPC_EMB_SDA2REL,
+	R_PPC_EMB_SDA21, R_PPC_EMB_RELSDA.  In all these cases also ignore
+	output_offset for correct evaluation of addend.
+
+Tue Aug 18 11:48:12 1998  Catherine Moore  <clm@cygnus.com>
+
+	* elf32-arm.c: Add prefix bfd_ to elf32_arm_get_bfd_for_interworking,
+	elf32_arm_allocate_interworking_sections and
+	elf32_arm_process_before_allocation.
+
+Tue Aug 18 11:46:00 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* bfd-in.h: Ammend prototype for
+	elf32_arm_process_before_allocation to remove surplus third
+	argument.
+
+	* bfd-in2.h: Regenerate.
+
+Sat Aug 15 20:55:08 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf64-alpha.c (elf64_alpha_relax_section): Handle indirect symbols.
+
+Fri Aug 14 09:12:28 1998  Stan Cox  <scox@cygnus.com>
+
+	* aoutx.h (aout_link_input_section_ext): Use the relocation already
+	calculated for RELOC_SPARC_REV32 case.
+
+Thu Aug 13 14:02:02 1998  Catherine Moore  <clm@cygnus.com>
+
+	* bfd-in.h:  Add prototypes for elf32_arm_get_bfd_for_interworking,
+	elf32_arm_allocate_interworking_sections and
+	elf32_arm_process_before_allocation.
+	* bfd-in2.h:  Regenerated.
+	* elf32-arm.c Define elf32_arm_link_hash_table.
+	(insert_thumb_branch): New routine.
+	(find_thumb_glue): New routine.
+	(find_arm_glue): New routine.
+	(record_arm_to_thumb_glue): New routine.
+	(record_thumb_to_arm_glue): New routine.
+	(elf32_arm_link_hash_table_create): New routine.
+	(elf32_arm_get_bfd_for_interworking): New routine.
+	(elf32_arm_allocate_interworking_sections) New routine.
+	(elf32_arm_process_before_allocation) New routine.
+	(elf32_thumb_to_arm_stub): New routine.
+	(elf32_arm_to_thumb_stub): New routine.
+	(elf32_print_private_bfd_data): Fix typo.
+	(elf32_arm_final_link_relocate):  Add argument sym_sec.
+	Check for branches to thumb symbols in case R_ARM_PC24.
+	Check for branches to arm symbols in case R_ARM_THM_PC22.
+	(elf32_arm_relocate_section):  Pass symbol section to
+	elf32_arm_final_link_relocate.
+
+Wed Aug 12 19:00:39 1998  Geoff Keating  <geoffk@ozemail.com.au>
+
+	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Generate PLT
+	entries unless the symbol is defined in the executable; in
+	particular, undefined weak symbols get a PLT entry.
+
+Wed Aug 12 14:48:33 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libaout.h: Remove nested comment to avoid warning.
+
+Wed Aug 12 08:10:11 1998 Catherine Moore  <clm@cygnus.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate):  Rework
+	R_ARM_PC24 relocation.
+
+Tue Aug 11 14:42:26 1998  Catherine Moore  <clm@cygnus.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate):  Remove unused
+	argument is_local.  Add argument sym_flags.  Check sym_flags
+	in R_ARM_ABS32 case.  Include addend for R_ARM_THM_PC22 case.
+	(elf32_arm_relocate_section):  Don't pass local sym and pass
+	sym_flags to elf32_arm_final_link_relocate.
+
+Mon Aug 10 20:38:39 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf64-alpha.c (elf64_alpha_calc_dynrel_sizes): Correct last change
+	to not count too few relocs for dynamicly linked executables.
+
+Mon Aug 10 15:35:34 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf64-alpha.c (alpha_elf_dynamic_symbol_p): Never consider
+	symbols without a dynamic index dynamic.  Consider all weak
+	symbols dynamic.
+	(elf64_alpha_strip_section_from_output): Don't assume 1-1
+	correspondance between input and output sections.
+
+Mon Aug 10 15:31:39 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* elflink.h (elf_gc_common_finalize_got_offsets): For backends
+	that use a .got.plt section start the got offset at zero.
+
+Mon Aug 10 17:31:21 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c (ieee_write_processor): Correct the processor ID written
+	out for bfd_arch_m68k, accommodating change of March 25.
+
+Sun Aug  9 20:55:44 1998  Catherine Moore  <clm@cygnus.com>
+
+	* elf32-arm.c (elf32_arm_final_link_relocate):  Rework
+	R_ARM_THM_RPC22 relocations.
+
+Sat Aug  8 15:15:30 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf64-alpha.c (alpha_elf_dynamic_symbol_p): Undef weak symbols
+	are always dynamic.
+	(elf64_alpha_calc_dynrel_sizes): Allow enough room for RELATIVE
+	.got relocs in -Bsymbolic shared objects.
+
+Wed Aug  5 15:48:08 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-arm.c: Add private flags to ELF header.
+	(elf32_arm_print_private_bfd_data): New Function.
+	(elf32_arm_set_private_flags): New Function.
+	(elf32_arm_copy_private_flags): New Function.
+	(elf32_arm_merge_private_bfd_data): New Function.
+
+Mon Aug  3 17:10:15 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-sparc.c (elf32_sparc_check_relocs): Permit WPLT30 against
+	a local symbol.
+	(elf32_sparc_relocate_section): Likewise.
+
+Sun Aug  2 03:19:23 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Init sgot to NULL.  Create the
+	.got if any relocation referrs to _GLOBAL_OFFSET_TABLE_.
+	(ppc_elf_relocate_section): Pull sgot and splt search to the start
+	of the function.  Recognize no .plt as static linking.
+
+1998-08-01  Ulrich Drepper  <drepper@cygnus.com>
+
+	* elf32-mips.c (_bfd_mips_elf_section_from_shdr): Don't pass
+	".liblist" string through gettext.
+
+Fri Jul 31 16:38:14 1998  Catherine Moore  <clm@cygnus.com>
+
+	* Makefile.am: Add support for elf32-arm.lo.
+	* Makefile.in: Rebuild.
+	* config.bfd (arm-*-elf):  Define targ_defvec and targ_selvecs.
+	(thumb-*-elf): Define targ_defvec and targ_selvecs.
+	* configure.in:  Handle bfd_elf32_littlearm_vec and bfd_elf32_bigarm_vec.
+	* configure: Regenerate.
+	* elf.c: (prep_headers):  Support arch_type of EM_ARM.
+	* targets.c:  Support new targets bfd_elf32_bigarm_vec and
+	bfd_target bfd_elf32_littlearm_vec.
+	* elf32-arm.c:  New file.
+
+Tue Jun 28 19:05:28 1998  Stan Cox  <scox@cygnus.com>
+
+	* libaout.h (M_SPARCLITE_LE): New machine.
+	* sunos.c (MACHTYPE_OK): Add machine M_SPARCLITE_LE.
+	* aoutf1.h (sunos_set_arch_mach): Add machine M_SPARCLITE_LE.
+	(sunos_write_object_contents): Add machine bfd_mach_sparc_sparclite_le
+	* aoutx.h (howto_table_ext): Add relocation R_SPARC_REV32.
+	(NAME(aout,machine_type)) Add machine bfd_mach_sparc_sparclite_le
+	(aout_link_input_section_ext): Add RELOC_SPARC_REV32 support.
+	* elf32-sparc.c (_bfd_sparc_elf_howto_table, sparc_reloc_map,
+	elf32_sparc_relocate_section): Rename R_SPARC_32LE to be R_SPARC_REV32
+	* libbfd.h (bfd_reloc_code_real_names): Rename BFD_RELOC_SPARC_32LE to
+	be BFD_RELOC_SPARC_REV32.
+	* reloc.c: Ditto.
+	* config.bfd (sparc86x-*-aout): New
+
+Fri Jul 24 13:54:19 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* linker.c (_bfd_generic_final_link): Allocate NULL symbol before
+	actually mapping the output sections.
+
+Fri Jul 24 11:24:29 1998  Jeffrey A Law  (law@cygnus.com)
+
+
+	* elf-m10300.c (mn10300_elf_howto): Add R_MN10300_24 entry.
+	(mn10300_elf_reloc_map): Similarly.
+	(mn10300_elf_final_link_relocate): Handle R_MN10300_24.
+
+Fri Jul 24 12:36:04 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-mips.c (elf_mips_howto_table): Add reloc types used on
+	Irix 6.
+	(bfd_elf32_bfd_reloc_type_lookup): Add default case.
+	* elf64-mips.c: Replace all uses of mips_elf64_reloc_type with
+	elf_mips_reloc_type defined in elf/mips.h.
+
+1998-07-24  Ulrich Drepper  <drepper@cygnus.com>
+
+	* elf64-mips.c: Remove reloc_type definition completely.  It's now
+	in elf/mips.h.
+
+Thu Jul 23 13:33:19 1998  Doug Evans  <devans@canuck.cygnus.com>
+
+	* elf64-mips.c (mips_elf64_reloc_type): #if 0 out more relocations
+	as they are defined in elf/mips.h now.
+
+Thu Jul 23 11:29:43 1998  Jeffrey A Law  (law@cygnus.com)
+
+
+	* Re-add lost change:
+	* elf-m10300.c (elf32_mn10300_link_hash_entry): Add new field
+	"movm_stack_size".
+	(mn10300_elf_relax_section): Include stack space for register saves
+	in the imm8 field of a "call" instruction.
+	(compute_function_info): Determine how much stack is allocated by
+	the movm instruction.  Fix typo.
+	(elf32_mn10300_link_hash_newfunc): Initialize movm_stack_size.
+
+Thu Jul 23 11:38:05 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-sparc.c (elf_backend_got_header_size): Define as 4.
+	* elf64-sparc.c (elf_backend_got_header_size): Define as 8.
+
+1998-07-22  Ulrich Drepper  <drepper@cygnus.com>
+
+	* elf32-ppc.c: Change use of pp_reloc_type to elf_ppc_reloc_type.
+
+Wed Jul 22 16:27:18 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-hppa.h: Let ELF header define the enum containing the
+	external reloc numbers.
+	* elf32-i386.h: Likewise.
+
+1998-07-22 14:57  Ulrich Drepper  <drepper@cygnus.com>
+
+	* elf-m10300.c: Let ELF header now define the macros to get the enum.
+	* elf32-mips.c: Likewise.
+	* elf32-ppc.c: Likewise.
+
+Wed Jul 22 13:53:52 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* bfd-in2.h: Change type of 'class' parameter to 'unsigned int' in
+	bfd_coff_set_symbol_class(), in order to avoid K&R compatability
+	prblems.
+	* bfd-in.h: Regenerate.
+	* coffgen.c (bfd_coff_set_symbol_class): Change type of 'class'
+	parameter to 'unsigned int' to avoid K&R compatability problems.
+
+Wed Jul 22 16:43:24 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c (ieee_find_nearest_line): Change filename_ptr and
+	functionname_ptr to be const.  Change line_ptr to be unsigned.
+
+	* coffcode.h (coff_link_output_has_begun): Simplify handling when
+	macro is not defined.  Change second parameter from bfd_link_info
+	to coff_final_link_info.  Add prototype.
+	(coff_final_link_postscript): Simplify handling when macro is not
+	defined.  Add prototype.
+
+1998-07-22 13:08  Ulrich Drepper  <drepper@cygnus.com>
+
+	* elf-mn10300.c: Before include system specific ELF header define
+	START_RELOC_NUMBERS, RELOC_NUMBER, and END_RELOC_NUMBERS.
+	* elf32-mips.c: Likewise.
+	* elf32-ppc.c: Likewise.
+
+Wed Jul 22 13:46:51 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf64-mips.c (mips_elf64_reloc_type): Copy Ulrich's elf32-mips.c
+	temporary patch over to elf64-mips.c as well.
+
+1998-07-21  Ulrich Drepper  <drepper@cygnus.com>
+
+	* elf32-mips.c (reloc_type): Temporarily disable definition of
+	standard relocation since they are now defined in elf/mips.h.
+
+Tue Jul 21 09:47:00 1998  Catherine Moore  <clm@cygnus.com>
+
+	* elf-m10200.c (mn10200_elf_final_link_relocate):
+	Modify range test for case R_MN10200_8.
+
+	* elf-m10300.c (mn10300_elf_final_link_relocate):
+	Modify range test for case R_MN10300_8.
+
+Mon Jul 20 18:50:54 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf-bfd.h (struct elf_backend_data): Add got_ & plt_header_size.
+	* elf32-i386.c (elf_backend_got_header_size): Define.
+	(elf_backend_plt_header_size): Define.
+	* elf32-m68k.c, elf32-mips.c, elf32-ppc.c: Likewise.
+	* elf32-sparc.c, elf64-alpha.c, elf64-sparc.c: Likewise.
+	* elfxx-target.h: Provide a default of zero.
+	* elflink.c (_bfd_elf_create_got_section): Use got_header_size.
+	* elflink.h (elf_gc_common_finalize_got_offsets): Likewise.
+
+	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Don't remove a PLT
+	entry from an executable, even if the plt refcount goes to 0.
+
+Mon Jul 20 12:47:26 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* aoutx.h (NAME(aout,find_nearest_line)): Also remember the
+	directory name at the line number.
+
+	* elf.c (_bfd_elf_find_nearest_line): Also consider symbols
+	with an unspecified type.
+
+Wed Jul 15 11:20:01 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* sunos.c: Add undef of valid to avoid problem on SunOS.
+
+Tue Jul 14 15:30:59 1998  Richard Henderson  <rth@cygnus.com>
+
+	* config.bfd (i?86-pc-beos{pe,elf,}*): Recognize.
+
+Tue Jul 14 11:22:21 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* elf32-m68k.c (elf_m68k_check_relocs): Also reference count
+	R_68K_PCxx and R_68K_xx relocations.  Make sure that
+	ELF_LINK_HASH_NEEDS_PLT is always set for a PLT reloc reference.
+	(elf_m68k_gc_sweep_hook): Also reference count R_68K_PCxx and
+	R_68K_xx relocations.
+	(elf_m68k_adjust_dynamic_symbol): Reset the plt offset of a symbol
+	that has no plt entry.
+	(elf_m68k_relocate_section): Ignore the plt offset in a static
+	link.
+	* elflink.h (elf_adjust_dynamic_symbol): Reset the plt offset for
+	an ignored symbol.
+	(elf_gc_common_finalize_got_offsets): Set the got offsets also in
+	a static link.
+
+	* elf32-m68k.c (R_68K_GNU_VTINHERIT, R_68K_GNU_VTENTRY): New reloc
+	types.
+	(howto_table, reloc_map): Add entries for them.
+	(elf_m68k_check_relocs): Handle them.  Implement reference
+	counting for got and plt entries.
+	(elf_m68k_gc_mark_hook, elf_m68k_gc_sweep_hook): New functions.
+	(elf_m68k_adjust_dynamic_symbol): Handle unreferenced plt
+	symbols.
+	(rtype_to_howto_rel, elf_info_to_howto_rel): Delete.
+	(elf_m68k_relocate_section): Handle the new reloc types.
+	(bfd_elf32_bfd_final_link, elf_backend_gc_mark_hook,
+	elf_backend_gc_sweep_hook, elf_backend_can_gc_sections): Define.
+	* elflink.h (elf_link_add_object_symbols): When creating an
+	indirect reference for symbol versioning also copy the plt
+	offset.
+	(elf_fix_symbol_flags): When clearing the ELF_LINK_HASH_NEEDS_PLT
+	flag also reset the plt offset.
+	(elf_link_assign_sym_version): Likewise.
+	(elf_gc_common_finalize_got_offsets): Increment the got offset by
+	the size of the entry in bytes.
+	(elf_gc_allocate_got_offsets): Likewise.
+
+Tue Jul 14 11:18:14 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_gc_sections): Return true rather than falling off
+	the bottom.
+
+	* coffgen.c (bfd_coff_set_symbol_class): Call bfd_alloc, not
+	xmalloc.
+
+Mon Jul 13 11:06:31 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c: Supress definition of TARGET_UNDERSCORE and add a
+	comment describing when it should be enabled.
+	Changed definition of USER_LABEL_PREFIX to "", to fall into line
+	with GCC sources.
+
+Mon Jul 13 13:06:54 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c (ieee_slurp_external_symbols): Handle call optimization
+	information ATN records.
+
+Fri Jul 10 16:31:06 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c (ieee_slurp_external_symbols): Select an appropriate
+	section for an absolute symbol in a fully linked file.  Based on
+	patch from Christian Holland <CHolland@de.lucent.com>.
+
+Wed Jul  8 11:29:56 1998  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* coff-m88k.c (m88k_special_reloc): Don't lose the information
+	that a symbol is undefined.
+
+Tue Jul  7 21:47:02 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* som.c (som_bfd_gc_sections): Define.
+
+Mon Jul  6 11:35:50 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c (aoutarm_std_reloc_howto): Do not complain about
+	overflows in ARM_26D patches, since they have already been
+	implmented.  Patch submitted by Dr. R.J. Black <rjb@dcs.gla.ac.uk>
+
+Sat Jul  4 12:25:36 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffcode.h (coff_write_object_contents): If we have any long
+	section names, call coff_write_symbols even if there are no
+	symbols.
+
+Fri Jul  3 13:11:35 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (copy_private_bfd_data): Only set phdr_included once for a
+	PT_LOAD segment, rather than only setting it once for the entire
+	file.
+
+	* elf.c (_bfd_elf_make_section_from_shdr): When setting the LMA,
+	rather than ignoring every phdr with a p_paddr of 0, ignore all
+	the phdrs if they all have a p_paddr of 0.
+
+	* stabs.c (_bfd_write_stab_strings): Check whether the .stabstr
+	section was discarded from the link.
+
+Fri Jul  3 14:39:05 1998  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+	* coff-sh.c (sh_insn_uses_freg): Ignore lowest bit of register number.
+
+Fri Jul  3 14:35:48 1998  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+	* coff-sh.c (sh_insns_conflict): Load of fpscr conflicts with
+	floating point operations.
+
+Thu Jul  2 18:37:25 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cofflink.c (_bfd_coff_link_input_bfd): Skip undefined global
+	function symbols.
+
+Thu Jul  2 14:59:42 1998  Klaus Kaempf  <kkaempf@rmi.de>
+
+	Merge of vax/vms (read-only) support
+	* configure.com: Support Vax target.
+	* makefile.vms: Support Vax target.
+	* vms.h: Renamed from evax.h, merged vax/vms (read-only) support.
+	* vms.c: Renamed from evax-alpha.c, merged vax/vms (read-only)
+	support.
+	* vms-hdr.c: Renamed from evax-emh.c, merged vax/vms (read-only)
+	support.
+	* vms-gsd.c: Renamed from evax-egsd.c, merged vax/vms (read-only)
+	support.
+	* vms-tir.c: Renamed from evax-etir.c, merged vax/vms (read-only)
+	support.
+	* vms-misc.c: Renamed from evax-misc.c, merged vax/vms (read-only)
+	support.
+	* libbfd.c (real_read): Use unbuffered read on VMS/Vax.
+	* targets.c (bfd_target_ovax_flavour): New flavour.
+	(vms_alpha_vec): Renamed from evax_alpha_vec.
+	(vms_vax_vec): New.
+	(target_vector): Update accordingly.
+	* config.bfd (alpha*-*-*vms*): Use vms_alpha_vec, not
+	evax_alpha_vec.
+	(vax*-*-*vms*): New target.
+	* Makefile.am: Update for renamed files.  Rebuild dependencies.
+	* bfd-in2.h: Rebuild.
+	* configure.in, Makefile.in, aclocal.m4: Rebuild.
+
+Thu Jul  2 13:31:55 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	Based on patch from Matt Semersky <matts@scd.hp.com>:
+	* linker.c (_bfd_generic_final_link): Force a trailing NULL
+	pointer on abfd->outsymbols.
+	(generic_add_output_symbol): Handle NULL sym parameter.
+
+Wed Jul  1 17:05:53 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf.c (copy_private_bfd_data): Add support for changing VMA or
+	LMA of sections.
+
+Wed Jul  1 16:58:50 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-sh.c (sh_relax_delete_bytes): Correct address comparisons
+	when handling 32 bit immediate relocs.
+	* elf32-sh.c (sh_elf_relax_delete_bytes): Likewise.
+
+Tue Jun 30 09:55:03 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* section.c (STD_SECTION): Account for recently added gc_mark
+	field in struct asection.
+
+	* elf-m10300.c (bfd_mn10300_elf_merge_private_bfd_data): New function.
+	(bfd_elf32_bfd_merge_private_bfd_data): Define.
+
+Thu Jun 25 18:31:41 1998  Richard Henderson  <rth@cygnus.com>
+
+	ELF Section-level Garbage Collection:
+	* bfd.c (bfd_gc_sections): New.
+	* aout-adobe.c: Hook to default implementation.
+	* aout-target.h, aout-tic30.c, binary.c, bout.c: Likewise.
+	* coff-alpha.c, coff-mips.c, coff-rs6000.c, coffcode.h: Likewise.
+	* evax-alpha.c: Likewise.
+	* i386msdos.c: Likewise.
+	* i386os9k.c: Likewise.
+	* ieee.c: Likewise.
+	* ihex.c, nlm-target.h, oasys.c, ppcboot.c, srec.c: Likewise.
+	* tekhex.c, versados.c: Likewise.
+	* libbfd-in.h (_bfd_nolink_bfd_gc_sections): New.
+	* targets.c (BFD_JUMP_TABLE_LINK): Add _bfd_gc_sections.
+
+	* reloc.c (BFD_RELOC_VTABLE_INHERIT, BFD_RELOC_VTABLE_ENTRY): New.
+	(bfd_generic_gc_sections): New.
+	* section.c (SEC_KEEP): New.
+	(asection): Add gc_mark member.
+
+	* elfcode.h (elf_gc*): New name remappings.
+	* elflink.h (elf_link_input_bfd): Don't set contents on stabs
+	sections to be excluded.
+	(elf_gc_mark, elf_gc_sweep, elf_gc_sweep_symbol): New.
+	(elf_gc_propogate_vtable_entries_used): New.
+	(elf_gc_smash_unused_vtentry_relocs): New.
+	(elf_gc_sections, elf_gc_record_vtinherit, elf_gc_record_vtentry): New.
+	(elf_gc_common_finalize_got_offsets): New.
+	(elf_gc_allocate_got_offsets, elf_gc_common_final_link): New.
+	* elfxx-target.h: Add and default gc hooks.
+
+	* elf-bfd.h (struct elf_link_hash_entry): Swap got_offset/plt_offset
+	for unions.
+	(struct elf_obj_tdata): Likewise for local_got_offsets.
+	* elf.c, elf-i386.c, elf32-m68k.c, elf32-mips.c: Update all uses.
+	* elf32-ppc.c, elf32-sparc.c, elf64-alpha.c: Likewise.
+	* elf64-sparc.c, elflink.h: Likewise.
+
+	* elf-bfd.h (struct elf_link_hash_entry): Add vtable members.
+	(ELF_LINK_HASH_MARK): Define.
+	(struct elf_backend_data): Add GC hooks.
+	* elf.c (_bfd_elf_link_hash_newfunc): Zero vtable members.
+
+	* elf-m10300.c (mn10300_elf_check_relocs): New.
+	(mn10300_elf_gc_mark_hook): New.
+	(R_MN10300_GNU_VTINHERIT, R_MN10300_GNU_VTENTRY): New.
+	(elf_mn10300_howto, mn10300_reloc_map): Handle them.
+	(mn10300_elf_final_link_relocate): Likewise.
+	(mn10300_elf_relocate_section): Likewise.
+	(elf_backend_can_gc_sections): Define.
+	* elf32-mips.c (R_MIPS_GNU_VTINHERIT, R_MIPS_GNU_VTENTRY): New.
+	(elf_mips_gnu_vtinherit_howto, elf_mips_gnu_vtentry_howto): New.
+	(bfd_elf32_bfd_reloc_type_lookup): Handle them.
+	(mips_info_to_howto_rel): Likewise.
+	(mips_elf_relocate_section): Likewise.
+	(mips_elf_check_relocs): Likewise.
+	(mips_elf_gc_mark_hook, mips_elf_gc_sweep_hook): New.
+	(elf_backend_can_gc_sections): Define.
+	* elf32-ppc.c (R_PPC_GNU_VTINHERIT, R_PPC_GNU_VTENTRY): New.
+	(ppc_elf_howto_raw): Handle them.
+	(ppc_elf_reloc_type_lookup): Likewise.
+	(ppc_elf_relocate_section): Likewise.
+	(ppc_elf_check_relocs): Reference count .got and .plt entries.
+	Handle new vtable relocs.
+	(ppc_elf_adjust_dynamic_symbol): Recognize unused .plt entries.
+	(ppc_elf_gc_mark_hook, ppc_elf_gc_sweep_hook): New.
+	(elf_backend_can_gc_sections): Define.
+
+Fri Jun 26 10:48:23 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* archures.c (bfd_mach_mn10300): Define.
+	* elf-m10300.c: Include elf/mn10300.h
+	(elf_mn10300_mach): New function.
+	(_bfd_mn10300_elf_final_write_processing): Likewise.
+	(_bfd_mn10300_elf_object_p): Likewise.
+	(elf_backendfinal_write_processing): Define.
+	(elf_backend_object_p): Likewise.
+
+Thu Jun 25 18:31:08 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_perform_relocation): Fix HI16_S
+	relocation.
+
+Wed Jun 24 17:17:57 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_bfd_final_link): Loop over input_bfds using the
+	link_next field, not the next field.
+
+Sun Jun 21 19:38:39 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (map_sections_to_segments): Check the section address
+	against the phdr size both with and without a modulo of
+	maxpagesize.
+
+Fri Jun 19 17:08:18 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-mips.c (mips_elf_size_dynamic_sections): Only strip a
+	linker created empty input section if the output section has the
+	same name.
+
+	* elflink.h (elf_link_output_extsym): Print an error message if
+	_bfd_elf_section_from_bfd_section fails.
+
+	* elf.c (_bfd_elf_section_from_bfd_section): Call bfd_set_error on
+	failure.
+
+Tue Jun 16 11:55:55 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (copy_private_bfd_data): Improve handling of Solaris
+	native linker output.  Avoid putting an empty section in more than
+	one segment.
+
+Fri Jun 12 13:30:17 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* po/Make-in (all-yes): If maintainer mode, depend on .pot file.
+	($(PACKAGE).pot): Unconditionally depend on POTFILES.
+
+Fri Jun 12 13:34:02 1998  Doug Evans  <devans@canuck.cygnus.com>
+
+	* elf.c (swap_out_syms): New arg relocatable_p.
+	Don't add section VMA to symbols for relocatable output.
+	(_bfd_elf_compute_section_file_positions): Update call to
+	swap_out_syms.
+
+Mon Jun  8 15:20:57 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_perform_relocation): Make comparisons
+	against 'addend' be signed rather than unsigned.
+
+Sat Jun  6 00:31:21 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-m32r.c: Add prototyps for static functions.
+
+	* coff-arm.c: Add prototypes for static functions.
+
+Fri Jun  5 17:21:51 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf.c (elf_sort_sections): Sort by LMA first then VMA, since the
+	LMA is used to order sections in a segment.
+
+	* elf32-v850.c: Add prototypes for static functions.
+	Change type of addend parameter to bfd_vma in various functions.
+
+Fri Jun  5 18:09:58 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutx.h (howto_table_ext): Change RELOC_BASE13 to use
+	complain_overflow_signed instead of complain_overflow_bitfield.
+
+Fri Jun  5 15:11:11 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* elf.c (elf_map_symbols): Don't add section VMA to symbol value
+	when comparing against 0.
+
+Wed Jun  3 17:52:49 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (config.status): New target.
+	* Makefile.in: Rebuild.
+
+Wed Jun  3 12:18:24 1998  Stan Cox  <scox@equinox.cygnus.com>
+
+	* elf32-sparc.c (elf32_sparc_merge_private_bfd_data): Give an
+	error if previous object endianness doesn't match current object.
+
+Tue Jun  2 17:50:59 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_print_private_bfd_data): Call
+	_bfd_elf_print_private)bfd_data ().
+
+Tue Jun  2 15:29:35 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elflink.h (elf_merge_symbol): Don't always set type_change_ok
+	and size_change_ok.
+	(elf_link_add_object_symbols): Set type_change_ok and
+	size_change_ok before calling elf_merge_symbol.
+
+	* elf32-mips.c (mips_elf_relocate_section): If we issue an
+	undefined symbol error, don't also issue an overflow error.
+
+Tue Jun  2 13:51:00 1998  Geoff Keating  <geoffk@ozemail.com.au>
+
+	* elf32-ppc.c (ppc_elf_relocate_section): The target of an
+	R_PPC_LOCAL24PC relocation should be local; if not, print an error
+	message instead of crashing.
+
+Mon Jun  1 18:23:12 1998  Yuli Barcohen  <yuli.barcohen@telrad.co.il>
+
+	* archures.c (bfd_mach_cpu32): Define.
+	(bfd_default_scan): Add case for 68060.  Fix 68332 case to use
+	bfd_mach_cpu32.
+	* cpu-m68k.c (arch_info_struct): Add m68k:cpu32.
+	* ieee.c: Include <ctype.h>.
+	(ieee_object_p): Parse out process ID string to make it more
+	likely to be acceptable for bfd_scan_arch.
+	* bfd-in2.h: Rebuild.
+
+Mon Jun  1 11:12:02 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-m32r.c (m32r_elf_print_private_bfd_data): Also call
+	_bfd_elf_print_private_bfd_data() so that the program header will
+	be displayed.
+
+Mon Jun  1 12:14:28 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* peicode.h (coff_swap_sym_in): Check for C_SECTION rather than
+	0x68.  Reindent.  Add some comments.
+
+Fri May 29 09:58:08 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf.c (copy_private_bfd_data): Adjust physical address of
+	segment in output BFD to contain LMAs of its sections.
+
+Tue May 26 19:37:47 1998  Stan Cox  <scox@equinox.cygnus.com>
+
+	* elf32-sparc.c (_bfd_sparc_elf_howto_table, sparc_reloc_map,
+	elf32_sparc_relocate_section): Added R_SPARC_32LE for little
+	endian data 32 bit relocations.
+	(elf32_sparc_merge_private_bfd_data): Check if linking little
+	endian objects with big endian objects.
+	(elf32_sparc_object_p): Set bfd_mach_sparc_sparclite_le.
+	(elf32_sparc_final_write_processing): Set EF_SPARC_LEDATA in e_flags.
+	* libbfd.h (bfd_reloc_code_real_names): Added BFD_RELOC_SPARC_32LE.
+	* reloc.c: Same.
+	* cpu-sparc.c (arch_info_struct): Added sparc:sparclite_le
+	* archures.c (bfd_mach_sparc_sparclite_le): New.
+	* bfd-in2.h (BFD_RELOC_SPARC_32LE, bfd_mach_sparc_sparclite_le): New.
+
+Thu May 21 16:59:28 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* peicode.h (add_data_entry): Fix precedence of operators in if ()
+	statement.
+
+Tue May 19 18:41:19 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfd-in.h: Move over patch to bfd-in2.h.
+
+	* reloc.c (bfd_check_overflow): Add casts before shifts which may
+	not fit in 32 bits.
+	(_bfd_relocate_contents): Likewise.
+
+Mon May 18 14:44:15 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* peicode.h (add_data_entry): If the section has no private data
+	then do not create a Data Dictionary entry for it.
+
+Mon May 18 00:09:28 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf64-alpha.c (elf64_alpha_relax_section): Set again on changes.
+	(elf64_alpha_can_merge_gots, elf64_alpha_merge_gots,
+	elf64_alpha_size_got_sections): Rewrite, handling multiple got
+	subsections during relaxation more correctly.
+
+Thu May 14 14:22:58 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* bfd-in2.h: Add new prototype: bfd_coff_set_symbol_class ().
+	Add extra argument to bfd_arm_process_before_allocation ().
+	* bfd-in.h: Reflect changes made in bfd-in2.h.
+	* coffgen.c (bfd_coff_set_symbol_class): New function.  Set the
+	coff class of a BFD symbol.
+	* coff-arm.c: Add support for interworking between Thumb code and
+	non-interworking aware ARM code.
+
+Sun May 10 22:33:59 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* po/Make-in (install-info): New target.
+
+Thu May  7 17:40:56 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* filemode.c: Remove; not used.
+
+	If sysdep.h includes a header file, don't include it again:
+	* aix386-core.c: Don't include <stdio.h>, <stddef.h>, or
+	<errno.h>.
+	* aoutx.h: Don't include <string.h>.  Use "sysdep.h" rather than
+	<sysdep.h>.
+	* archive.c: Don't include <string.h> or <errno.h>.
+	* evax-alpha.c: Don't include <stdio.h>.
+	* evax-egsd.c: Likewise.
+	* evax-etir.c: Likewise.
+	* evax-misc.c: Likewise.
+	* evax-emh.c: Likewise.  Also, don't include <sys/types.h>.
+	* hppabsd-core.c: Don't include <stdio.h>, <sys/types.h>, or
+	<errno.h>.
+	* hpux-core.c: Likewise.
+	* netbsd-core.c: Likewise.
+	* som.c: Likewise.
+	* libbfd.c: Don't include <sys/types.h>.
+	* nlmcode.h: Don't include <string.h>.
+	* osf-core.c: Don't include <string.h> or <stdio.h>.
+	* ptrace-core.c: Don't include <stdio.h>, <sys/types.h>,
+	<errno.h>, or <unistd.h>.
+	* trad-core.c: Don't include <stdio.h> or <sys/types.h>.
+
+Thu May  7 13:12:50 1998  Klaus Kaempf  <kkaempf@progis.de>
+
+	* configure.com: If the version number can not be found in
+	configure.in, set it to "unknown" rather than "2.8.1".
+
+Wed May  6 09:46:05 1998  Gavin Koch  <gavin@cygnus.com>
+
+	* elf32-mips.c (elf_mips_mach): New.
+	(_bfd_mips_elf_object_p): Use elf_mips_mach.
+	(_bfd_mips_elf_final_write_processing): Use the names
+	of machines, rather than the numbers.  Set both the ARCH
+	and MACH in e_flags.  Handle a few more specific machines.
+	(_bfd_mips_elf_merge_private_bfd_data): Merge both
+	EF_MIPS_ARCH and EF_MIPS_MACH.
+
+Tue May  5 21:01:53 1998  Richard Henderson  <rth@cygnus.com>
+
+	* syms.c (bfd_is_local_label): Revert last change.
+	* srec.c (srec_write_symbols): Discard debugging symbols.
+
+Tue May  5 23:36:06 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* som.c: Include <ctype.h>.
+	* som.h: Don't include sysdep.h.
+
+Tue May  5 18:29:24 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* libbfd.h: Rebuilt.
+	* libbfd-in.h: Removed gettext includes and defines.
+	* sysdep.h: Moved gettext-related includes and defines here.
+
+Tue May  5 16:47:54 1998  Richard Henderson  <rth@cygnus.com>
+
+	* srec.c (srec_write_symbols): Use bfd_is_local_label rather than
+	an ad-hoc test.  Kill bogus #if 0 code.
+	* syms.c (bfd_is_local_label): Consider BSF_DEBUGGING symbols local.
+
+Mon May  4 16:10:33 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* sunos.c (sunos_check_dynamic_reloc): Don't use the PLT address
+	when generating a normal executable for a symbol defined in a
+	regular file.  When copying a reloc into the output file, adjust
+	the addend for a PC relative reloc against a global symbol.
+
+Mon May  4 10:08:18 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* libbfd.h: Rebuilt.
+	* libbfd-in.h (_): Define as dgettext.
+
+Mon May  4 11:02:23 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-arm.c (coff_arm_relocate_section): Cast to bfd_signed_vma,
+	not signed.
+	* peicode.h (pe_saved_coff_bfd_print_private_bfd_data): Use PARAMS
+	when declaring parameter types.
+	(pe_saved_coff_bfd_copy_private_bfd_data): Likewise.
+
+Wed Apr 29 15:35:03 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.bfd: If we include any ELF targets in targ_defvec and/or
+	targ_selvecs, then add the generic ELF targets to targ_selvecs.
+	* elf32-gen.c (dummy): New static const variable.
+	(elf_generic_info_to_howto): New static function.
+	(elf_generic_info_to_howto_rel): New static function.
+	(elf_info_to_howto): Define as elf_generic_info_to_howto.
+	(elf_info_to_howto_rel): Define as elf_generic_info_to_howto_rel.
+	* elf64-gen.c: Same changes as elf32-gen.c.
+	* elfcode.h (elf_object_p): For the generic target, ignore a
+	failure of bfd_default_set_arch_mach.  Fix indentation a bit.
+
+Tue Apr 28 20:05:52 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in (WIN32LIBADD): Add -lintl on cygwin32.
+	* configure: Rebuild.
+
+Tue Apr 28 12:16:57 1998  Jason Molenda  (crash@bugshack.cygnus.com)
+
+	* config.bfd:  Update OSR5/Unixware patterns.
+
+Mon Apr 27 18:02:24 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf.c (assign_file_positions_for_segments): Allow for holes
+	between sections added by a link script.
+
+Mon Apr 27 11:49:55 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Change version number to 2.9.4
+	* configure: Rebuild.
+
+	Based on patch from H.J. Lu <hjl@gnu.org>:
+	* elf.c (bfd_elf_get_bfd_needed_list): New function.
+	* bfd-in.h (bfd_elf_get_bfd_needed_list): Declare.
+	* bfd-in2.h: Rebuild.
+
+Sat Apr 25 20:07:53 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf64-alpha.c (struct alpha_relax_info): Replace elfsym with other.
+	Change all users.
+
+Sat Apr 25 18:29:07 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf64-alpha.c (struct alpha_relax_info): Add tsec & elfsym members.
+	(elf64_alpha_relax_section): Fill them in.
+	(elf64_alpha_relax_opt_call): Implement more than a stub.
+	(elf64_alpha_add_symbol_hook): Don't set SEC_LOAD or default
+	alignment on .scommon.
+	(elf64_alpha_merge_gots): Merge use counts as well.
+
+Sat Apr 25 14:07:29 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf64-alpha.c (elf64_alpha_relax_section): Use the proper section
+	for calculating a local symbol's address.
+	(elf64_alpha_calc_got_offsets): Skip entries with 0 use count.
+	Set the .got's cooked size as well as the raw size.
+
+Fri Apr 24 09:16:00 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_print_private_bfd_data): Add
+	internationalisation of printed information.
+
+	* coff-arm.c (coff_arm_print_private_bfd_data): Add
+	internationalisation of printed information.
+
+Fri Apr 24 12:09:18 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* syms.c (struct indexentry): Change directory_name, file_name,
+	and function_name fields to char *.
+	(struct stab_find_info): Change cached_file_name field to char *.
+
+Thu Apr 23 08:13:04 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* peicode.h (dir_names): Add missing N_() macros to dir_names array.
+
+Wed Apr 22 13:06:15 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* po/Make-in (MKINSTALLDIRS): Don't look in $(top_srcdir).
+
+Wed Apr 22 17:48:48 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (install-data-local): Make $(includedir).
+	* Makefile.in: Rebuild.
+
+Wed Apr 22 13:06:15 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* libbfd-in.h: Use `gettext' and not `dgettext' for now.
+
+Wed Apr 22 12:53:40 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (INCLUDES): Add -I$(srcdir)/../intl -I../intl.
+	* Makefile.in: Rebuild.
+
+	* bfd-in2.h: Rebuild for Nick's changes.
+
+Tue Apr 21 23:11:51 1998  Richard Henderson  <rth@cygnus.com>
+
+	* archive.c (_bfd_generic_read_ar_hdr_mag): Fix lossage in last
+	change wrt length == max_namelen.
+
+Tue Apr 21 21:19:36 1998  Tom Tromey  <tromey@scribbles.cygnus.com>
+
+	* Many files: Added gettext invocations around user-visible
+	strings.
+	* libbfd-in.h: Added gettext includes and defines.
+	* acconfig.h (ENABLE_NLS, HAVE_CATGETS, HAVE_GETTEXT, HAVE_STPCPY,
+	HAVE_LC_MESSAGES): Define.
+	* configure.in: Call CY_GNU_GETTEXT.  Create po/Makefile.in and
+	po/Makefile.
+	* Makefile.am (SUBDIRS): Added po.
+	(POTFILES): New macro.
+	(po/POTFILES.in): New target.
+	(SOURCE_HFILES): New macro.
+	(HFILES): Use it.
+	* po/Make-in, po/POTFILES.in, po/bfd.pot: New files.
+
+Tue Apr 21 13:38:18 1998 Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* elfcore.h (bfd_prstatus):  Copy core_prstatus from the first
+	NT_PRSTATUS note section encountered, it contains the status of
+	the currently executing thread when the core file was written.
+
+Tue Apr 21 10:00:12 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* libcoff.h: Add extra parameter to
+	bfd_coff_link_output_has_begun overrideable function.
+	* cofflink.c: Pass extra parameter to
+	bfd_coff_link_output_has_begun function.
+	* bfd-in.h: Add prototypes for exported ARM interworking
+	functions.
+	* peicode.h: ARM specific code reorganised to conform to BFD
+	coding conventions.
+	* coffcode.h: ARM specific code reorganised to conform to BFD
+	coding conventions.
+	* coff-arm.c: Code reorganised to conform to the BFD coding
+	conventions.  Global variables have been moved into an ARM
+	specific hash table structure and a new function:
+	bfd_arm_get_bfd_for_interworking() has been created which is
+	called from the linker scripts.
+
+Tue Apr 21 00:11:51 1998  Richard Henderson  <rth@cygnus.com>
+
+	* archive.c (_bfd_generic_read_ar_hdr_mag): Simplify end-of-name test.
+
+	* elf64-alpha.c (elf64_alpha_find_reloc_at_ofs): Renamed from
+	elf64_alpha_relax_find_reloc_ofs.  Changed all callers.
+	(elf64_alpha_add_symbol_hook): Put small commons in .scommon not .sbss.
+	(elf64_alpha_size_got_sections): Don't merge .got sections twice.
+
+Sat Apr 18 01:21:04 1998  Stan Cox  <scox@cygnus.com>
+
+	* config.bfd: Added sparc86x support.
+
+Fri Apr 17 22:29:04 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf32-mips.c (mips_elf_relocate_section): Do not complain about
+	an out of range pc-relative jump/call to an undefined weak symbol.
+
+Thu Apr 16 13:49:00 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf64-alpha.c (elf64_alpha_do_reloc_gpdisp): Do all gpdisp
+	comparisons signed.
+
+Thu Apr 16 11:43:33 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* archive.c (bfd_generic_archive_p): If a slurp subroutine returns
+	an error other than bfd_error_system_call, set the error to
+	bfd_error_wrong_format.
+
+	* targets.c (bfd_target_vector) [SELECT_VECS not defined]: Add
+	bfd_elf32_powerpcle_vec.
+
+	* elf.c (copy_private_bfd_data): If all the p_paddr fields in the
+	program segments are zero, don't set p_paddr_valid.
+
+Wed Apr 15 22:15:16 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf64-alpha.c: Initial implementation of relaxation --
+	(struct alpha_elf_link_hash_entry): Add use_count member.
+	(elf64_alpha_check_relocs): Initialize and increment it.
+	(elf64_alpha_can_merge_gots): Check it when considering merging.
+	(elf64_alpha_merge_gots): Drop entries with zero use.
+	(elf64_alpha_calc_got_offsets_for_symbol): Likewise.
+	(elf64_alpha_always_size_sections): Split out got sizing ...
+	(elf64_alpha_size_got_sections): ... here.  New function.
+	(elf64_alpha_relax_find_reloc_ofs): New function.
+	(elf64_alpha_relax_with_lituse): Likewise.
+	(elf64_alpha_relax_without_lituse): Likewise.
+	(elf64_alpha_relax_opt_call): Likewise.
+	(elf64_alpha_relax_section): Likewise.
+	(elf64_alpha_add_symbol_hook): Likewise.
+	(elf64_alpha_howto_table): Implement GPRELHIGH/LOW & IMMED_GP_16.
+	(elf64_alpha_relocate_section): Likewise.
+	(bfd_elf64_bfd_relax_section): Define.
+	(elf_backend_add_symbol_hook): Likewise.
+
+Wed Apr 15 16:08:46 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf.c (prep_headers): Use new EM_SPARCV9 symbol.
+	* elf64-sparc.c (ELF_MACHINE_CODE): Likewise.
+	(ELF_MACHINE_ALT1): New.  Set to EM_OLD_SPARC64.
+
+Wed Apr 15 11:34:33 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Add -lkernel32 to WIN32LIBADD on cygwin32.
+	* configure: Rebuild.
+
+Mon Apr 13 16:46:27 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (libbfd_la_LIBADD): Add @WIN32LIBADD@.
+	(libbfd_la_LDFLAGS): Add @WIN32LDFLAGS@.
+	* configure.in: Define and substitute WIN32LDFLAGS and
+	WIN32LIBADD.
+	* aclocal.m4: Rebuild with new libtool.
+	* configure, Makefile.in: Rebuild.
+
+Fri Apr 10 13:44:27 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffcode.h (coff_write_object_contents): Move a PE COMDAT symbol
+	before any other symbols in the same section.
+
+Wed Apr  8 14:50:23 1998  Michael Meissner  <meissner@cygnus.com>
+
+	* config.bfd (powerpc*-*-*): Remove PowerPC NT support from ELF
+	systems.
+
+Tue Apr  7 16:25:31 1998  Gavin Romig-Koch  <gavin@cygnus.com>
+
+	* dwarf2.c (comp_unit): Move it earlier in the source. Add
+	addr_size.
+	(read_address): Replace 'bdf*' argument with 'comp_unit*' argument.
+	Use addr_size for address size, rather than sizeof(bfd_vma).
+	(read_attribute): Replace bdf* argument with 'comp_unit*' argument.
+	Fix call to read_address.
+	(decode_line_info): Replace bdf* argument with 'comp_unit*' argument.
+	Scrap other unneeded arguments.  Fix call to read_address.
+	(scan_unit_for_functions): Fix call to read_attribute.
+	(parse_comp_unit): We now handle more values for addr_size.
+	Set addr_size in unit.  Fix call to read_attribute and
+	decode_line_info.
+
+Tue Apr  7 15:44:47 1998  Gavin Romig-Koch <gavin@cygnus.com>
+
+	* dwarf2.c (parse_comp_unit): Drop use of unit->name when it is null.
+
+Tue Apr  7 12:35:18 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* archures.c (bfd_default_scan): Add m68k cases back to default
+	switch, reverting patch of March 25, since IEEE support depends
+	upon them.
+
+Mon Apr  6 14:06:40 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (diststuff): New target.
+	* Makefile.in: Rebuild.
+
+Sun Apr  5 16:21:44 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* som.c (som_bfd_ar_write_symbol_stuff): Fix computation of
+	som_offset when we have an extended name table.
+
+Sun Apr  5 16:04:39 1998  H.J. Lu  <hjl@gnu.org>
+
+	* Makefile.am (stamp-lib): Check that .libs/libbfd.a exists before
+	trying to copy it.
+	* Makefile.in: Rebuild.
+
+Fri Apr  3 11:09:42 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* elf32-m68k.c (elf_m68k_size_dynamic_sections): Generate section
+	symbols when creating a shared library.
+	(elf_m68k_adjust_dynindx): New function, used by above code.
+	(elf_m68k_finish_dynamic_sections): Initialize the section
+	symbols.
+	(elf_m68k_relocate_section): Change abort to BFD_ASSERT.
+
+Wed Apr  1 16:04:02 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c (in_reloc_p): Use ARM_RVA32 in place of constant
+	value 11.
+
+Wed Apr  1 13:36:58 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* elf32-m68k.c (elf_m68k_relocate_section, case R_68K_PLT*O): Fix
+	assertion.
+
+Tue Mar 31 00:12:12 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* elf-m10300.c (mn10300_elf_relax_section): Correctly handle
+	absolute symbols.
+
+Mon Mar 30 12:46:15 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Set version to 2.9.1.
+	* configure: Rebuild.
+
+	* Branched binutils 2.9.
+
+Mon Mar 30 12:20:50 1998  Brent Baccala  <baccala@freesoft.org>
+
+	* syms.c (ENABLE_CACHING): Define.
+	(struct indexentry): Define.
+	(struct stab_cache): Remove.
+	(cmpindexentry): New static function.
+	(struct stab_find_info): Add new fields: indextable,
+	indextablesize, cached_indexentry, cached_offset, cached_stab, and
+	cached_file_name.  Remove fields: file_cache, function_cache, and
+	line_cache.
+	(_bfd_stab_section_find_nearest_line): Rewrite to build a sorted
+	index table and search it.
+
+Mon Mar 30 10:39:34 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (_bfd_elf_copy_private_section_data): Call
+	copy_private_bfd_data once we've seen the last SEC_ALLOC section.
+
+	* cpu-mips.c: Remove trailing comma at end of enumeration list.
+
+Sat Mar 28 16:33:02 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-arm.c: Define all globally visible variables and functions
+	only when COFF_WITH_PE is not defined.
+	* configure.in (armpe_little_vec, armpe_big_vec): Add
+	coff-arm.lo.
+	* configure: Rebuild.
+
+Fri Mar 27 16:06:02 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	Fix some gcc -Wall warnings:
+	* aout-arm.c (MY(fix_pcrel_26)): Add casts to avoid warnings.
+	* archive.c (_bfd_generic_read_ar_hdr_mag): Likewise.
+	* archures.c (bfd_default_scan): Likewise.
+	* bfd.c (bfd_scan_vma): Likewise.
+	* binary.c (mangle_name): Likewise
+	* coff-arm.c (aoutarm_fix_pcrel_26): Likewise.
+	* coff-sh.c (sh_relocate_section): Likewise.
+	* coff-stgo32.c (create_go32_stub): Likewise.
+	* coffcode.h (coff_slurp_line_table): Likewise.
+	* ecoff.c (_bfd_ecoff_write_armap): Likewise.
+	* elf.c (_bfd_elf_make_section_from_shdr): Likewise.
+	(assign_file_positions_for_segments): Likewise.
+	* elf32-mips.c (mips_elf_relocate_section): Likewise.
+	* elf32-ppc.c (ppc_elf_add_symbol_hook): Likewise.
+	* oasys.c (oasys_write_sections): Likewise.
+	* ppcboot.c (ppcboot_object_p): Likewise.
+	(mangle_name): Likewise.
+	* riscix.c (riscix_fix_pcrel_26): Likewise.
+	* srec.c (srec_scan): Likewise.
+	* stabs.c (_bfd_write_section_stabs): Likewise.
+	* sunos.c (sunos_add_dynamic_symbols): Likewise.
+	* aout-ns32k.c (_bfd_ns32k_relocate_contents): Add default case to
+	switch.  Declare parameters for function pointers.
+	* archures.c (bfd_default_scan): Add braces to avoid ambiguous if
+	warning.
+	* elf.c (elf_sort_sections): Likewise.
+	* coff-arm.c (coff_thumb_pcrel_common): Initialize relocation.
+	Add default cases to switches.
+	(coff_arm_relocate_section): Remove unused local variables.
+	Always set rstat.
+	(coff_arm_bfd_set_private_flags): Change flag variable to type
+	flagword.
+	* coff-mips.c (mips_relocate_section): Initialize use_lo.
+	* coff-ppc.c (ppc_record_toc_entry): Change i to unsigned int.
+	(dump_toc): Change cat to const, and initialize it.
+	* coff-sh.c (sh_relax_delete_bytes): Initialize start and voff.
+	* elf32-sh.c (sh_elf_relax_delete_bytes): Likewise.
+	(sh_elf_relocate_section): Initialize r_symndx.
+	* coffcode.h (coff_compute_section_file_positions): Only declare
+	old_sofar if ALIGN_SECTIONS_IN_FILE.
+	(coff_write_object_contents): Initialize csym.
+	* coffgen.c (coff_pointerize_aux): Make type and class unsigned.
+	* cpu-ns32k.c (_bfd_ns32k_get_displacement): Add default case to
+	switch.
+	* dwarf2.c: Include libiberty.h.
+	(read_2_signed_bytes, read_4_signed_bytes): Comment out.
+	(decode_line_info): Remove unused local variables.
+	* elf32-m32r.c (m32r_elf_sda16_reloc): Likewise.
+	(m32r_elf_relocate_section): Likewise.
+	* elf32-v850.c (v850_elf_store_addend_in_insn): Likewise.
+	(v850_elf_reloc): Likewise.
+	* elf-bfd.h (elf_linker_section_t): Make alignment unsigned.
+	(struct elf_obj_tdata): Make cverdefs and cverrefs unsigned.
+	* elf.c (assign_file_positions_for_segments): Always set adjust.
+	* elf32-d30v.c (bfd_elf_d30v_reloc): Initialize tmp_addr.  Fully
+	parenthesize expression.
+	* elf32-m32r.c (m32r_elf_relocate_section): Always initialize h.
+	(m32r_elf_object_p): Return a value.
+	(m32r_elf_print_private_bfd_data): Change fprintf format string.
+	* elf32-mips.c (mips_elf_final_link): Initialize last.
+	(mips_elf_finish_dynamic_sections): Initialize last and dindx.
+	* elf32-v850.c (v850_elf_object_p): Return a value.
+	(v850_elf_print_private_bfd_data): Change fprintf format string.
+	* elfcode.h (elf_slurp_symbol_table): Change symcount and i to
+	unsigned long.
+	* elflink.h (elf_link_add_object_symbols): Change vernum to
+	unsigned int, and initialize it.  Change fprintf format string.
+	(NAME(bfd_elf,size_dynamic_sections)): Cast -1 to bfd_size_type
+	when setting or comparing to soname_indx.
+	(elf_create_pointer_linker_section): Change num_symbols to
+	unsigned int.
+	* libcoff-in.h (coff_data_type): Change flags to flagword.
+	* peicode.h (pe_print_idata): Initialize idx.  Change j to
+	bfd_size_type.  Initialize hint_member.  Remove useless test to
+	time_stamp.
+	(pe_print_edata): Change num_functions and num_names in struct
+	EDT_type to unsigned long.  Remove cast.  Change fprintf format
+	string.
+	* ppcboot.c (ppcboot_object_p): Change i to size_t.
+	* reloc.c (bfd_get_reloc_size): Change return type to unsigned
+	int.
+	* reloc16.c (bfd_coff_reloc16_relax_section): Change shrinks to
+	int *.  Update uses.  Change j to long.
+	* bfd-in2.h, libcoff.h: Rebuild.
+
+Fri Mar 27 10:10:46 1998  Catherine Moore <clm@cygnus.com>
+
+	* elf32-v850.c Remove definition of USE_REL.
+	(v850_elf_info_to_howto_rela): New function.
+	(v850_elf_perform_relocation):  Renamed from
+	v850_elf_store_addend_in_insn.  Removed replace argument.
+	(v850_elf_reloc): store the relocation in the addend field instead
+	of the insn.
+	(v850_elf_final_link_relocate):  Now calls
+	v850_elf_perform_relocation.
+	(v850_elf_relocate_section):  Remove code to generate REL
+	relocations.
+
+Thu Mar 26 13:32:17 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffcode.h (coff_new_section_hook): Set the type and storage
+	class in the native symbol information allocated for a new section
+	symbol.
+
+Thu Mar 26 10:13:41 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* peicode.h: Chain together calls to
+	coff_bfd_copy_private_bfd_data and
+	coff_bfd_print_private_bfd_data.
+
+	* coff-arm.c: Add prototypes for
+	coff_arm_bfd_print_private_bfd_data and
+	coff_arm_bfd_copy_private_bfd_data.
+
+Wed Mar 25 15:45:55 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* coffcode.h (coff_mkobject_hook): Set private falgs even for a PE
+	build.
+
+	* peicode.h: Call arm-coff private data functions after handling
+	pe private data.
+
+	* coff-arm.c: Turn statics into globals so that they can be shared
+	both pe and pei backends.
+
+Wed Mar 25 15:19:38 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aoutf1.h (sunos_set_arch_mach): Use bfd_mach_m68* rather than
+	plain numbers.
+	(sunos_write_object_contents): Likewise.
+	* aoutx.h (NAME(aout,machine_type)): Likewise.
+	* coffcode.h (coff_set_arch_mach_hook): Likewise.
+
+Wed Mar 25 13:59:24 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* archures.c (bfd_mach_m68*): Add definitions for various m68k
+	variants.
+	(bfd_default_scan): Remove m68k special cases.
+	* bfd-in2.h: Rebuild.
+	* mipsbsd.c (MY(write_object_contents)): Use bfd_mach_m68* rather
+	than plain numbers.
+	* sparclynx.c (NAME(lynx,set_arch_mach)): Likewise.
+	* cpu-m68k.c (arch_info_struct): Likewise.  Add entry for
+	m68k:68000.
+	(bfd_m68k_arch): Set mach field to zero to signal no explicit
+	selection, change printable_name to just "m68k" and make that the
+	default instead of m68k:68020.
+
+	* aout-tic30.c (NAME): Define this to avoid multiple definitions
+	from aoutx.h.
+	(MY_get_section_contents): Define as aout_32_get_section_contents
+	rather than NAME(aout,get_section_contents).
+
+	* elf-m10300.c (elf32_mn10300_link_hash_table_create): Fix cast.
+
+	* evax-alpha.c (evax_set_arch_mach): Only accept bfd_arch_alpha
+	and call bfd_default_set_arch_mach to do the real work.
+
+Wed Mar 25 10:41:35 1998  Richard Henderson  <rth@cygnus.com>
+
+	* bout.c (BALX): Include return register g14 as part of the insn.
+	(BALX_MASK): New.
+	(calljx_callback): Use it.
+
+Wed Mar 25 11:19:28 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libbfd-in.h (BFD_ALIGN): Cast this parameter to bfd_vma.
+	* libbfd.h: Rebuild.
+
+	* elf-m10300.c (elf32_mn10300_finish_hash_table_entry): Change
+	byte_count to unsigned int.
+	(mn10300_elf_relax_section): Initialize internal_relocs.  Remove
+	unused local variables.
+
+	* evax-alpha.c (evax_close_and_cleanup): Remove unused local
+	variables er and er1.
+
+	* cpu-v850.c: Include <ctype.h>.
+	(scan): Case isdigit argument to unsigned char.
+
+	From Yan Meroth <YAN.MEROTH@st.com>:
+	* ihex.c (ihex_scan): Add extbase variable so that getting an
+	extended linear address record does not ignore any previous
+	extended address.
+	(ihex_write_object_contents): When writing out an extended linear
+	address record, zero out any previous extended address.
+
+Tue Mar 24 16:09:43 1998  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* ieee.c (do_one): Check section before dereferencing it.
+	(ieee_canonicalize_reloc): Likewise with src->relent.sym_ptr_ptr.
+	(ieee_generic_stat_arch_elt): Likewise with abfd->my_archive.
+
+Mon Mar 23 18:51:47 1998  Joel Sherrill  <joel@OARcorp.com>
+
+	* config.bfd: (sh*-*-rtems*): Switched from ELF to COFF.
+
+Mon Mar 23 14:23:36 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c: Add interworking functions to pe backends.
+
+Fri Mar 20 18:47:20 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Use AM_DISABLE_SHARED.
+	* aclocal.m4, configure: Rebuild with libtool 1.2.
+
+Fri Mar 20 11:25:41 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c (coff_arm_relocate_section): Better error messages
+	when interowrking conflucts occur.  Courtesy of Jonathan Walton
+	and Tony Thompson.
+	(aoutarm_std_reloc_howto): Fixed bitsize fields of rightshifted
+	relocations.  Patch courtesy of Jonathan Walton and Tony
+	Thompson.
+
+Fri Mar 20 02:26:43 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Revert
+	part of Feb 22 change controling when to override the existing
+	symbol with the .plt entry.
+
+Wed Mar 18 09:26:25 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* config.bfd (targ_cpu): Add thumb-pe target.
+
+	* coffcode.h (OTHER_GLOBAL_CLASS): Support thumb external
+	functions in PE build.
+
+Sun Mar  8 23:37:26 1998  Stan Cox  <scox@equinox.cygnus.com>
+
+	* config.bfd (sparclite-*-elf*): Added.
+
+Mon Feb 23 19:31:19 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Add elf.lo to elf shell variable.
+	* Makefile.am (BFD_LIBS): Remove elf.lo.
+	(BFD_LIBS_CFILES): Remove elf.c.
+	(BFD32_BACKENDS): Add elf.lo.
+	(BFD32_BACKENDS_CFILES): Add elf.c.
+	* configure, Makefile.in: Rebuild.
+
+1998-02-23 15:53  Richard Henderson  <rth@cygnus.com>
+
+	* elf32-i386.c (elf_i386_relocate_section): A pc-relative
+	relocation against a non-local symbol should not have a dynamic
+	relocation.
+
+Mon Feb 23 16:17:08 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* peicode.h (coff_swap_filehdr_in): Don't set BFD flag HAS_SYMS in
+	COFF filehdr flags.
+	(pe_print_private_bfd_data): Print PE flags.  From Mikey
+	<jeffdb@netzone.com>.
+
+Sun Feb 22 20:39:00 1998  Richard Henderson  <rth@cygnus.com>
+
+	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Don't create
+	a plt entry when we can determine that we authoritatively define
+	the symbol.
+
+Sun Feb 22 20:33:05 1998  Richard Henderson  <rth@cygnus.com>
+
+	* configure.in (COREFILE selection): Remove sparc-*-linux*.  They
+	don't actually use trad-core, but a SunOS-style core file handled
+	by gdb directly.
+	* hosts/sparclinux.h: Remove.
+
+Wed Feb 18 15:31:06 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* peicode.h (pe_print_idata): If there is no .idata section, look
+	for the import tables in some other section.  Make the initial
+	label line up better with the data.  Print the import address
+	table even if there is no import name table.  If the import
+	address table holds actual addresses, print them.
+
+Tue Feb 17 12:58:34 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libbfd.c (bfd_seek): If fseek fails, save errno around call to
+	bfd_tell.  If errno is EINVAL, set bfd_error_file_truncated, not
+	bfd_error_system_call.
+
+Fri Feb 13 13:11:33 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (AUTOMAKE_OPTIONS): Define.
+	* configure, Makefile.in, aclocal.m4: Rebuild with automake 1.2e.
+
+	From H.J. Lu <hjl@gnu.org>:
+	* Makefile.am (libbfd_la_LDFLAGS): Define.
+	* Makefile.in: Rebuild.
+
+Thu Feb 12 17:31:11 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	NetBSD patches from Gordon W. Ross <gwr@mc.com>:
+	* netbsd.h (MACHTYPE_OK): Define.
+	(MY(write_object_contents)): Use DEFAULT_ARCH and DEFAULT_MID when
+	calling N_SET_MACHTYPE, rather than having a switch.
+	* libaout.h (enum machine_type): Add M_PMAX_NETBSD, M_VAX_NETBSD,
+	and M_ALPHA_NETBSD.
+	* i386netbsd.c (MACHTYPE_OK): Don't define.
+	(DEFAULT_MID): Define.
+	* m68k4knetbsd.c (SEGMENT_SIZE): Don't define.
+	(MACHTYPE_OK): Don't define.
+	(DEFAULT_MID): Define.
+	* m68knetbsd.c: (MACHTYPE_OK): Don't define.
+	(DEFAULT_MID): Define.
+	* ns32knetbsd.c (MACHTYPE_OK): Don't define.
+	(DEFAULT_MID): Define.
+	* sparcnetbsd.c (MACHTYPE_OK): Don't define.
+	(DEFAULT_MID): Define.
+
+	NetBSD patches from Gordon W. Ross <gwr@mc.com>:
+	* vaxnetbsd.c: New file.
+	* netbsd-core.c: Clean up.  Remove unused macros.  Use netbsd
+	rather than netbsd_core.
+	* targets.c (vaxnetbsd_vec): Declare.
+	(bfd_target_vector): Add vaxnetbsd_vec.  If NETBSD_CORE is
+	defined, add netbsd_core_vec.
+	* configure.in: Set COREFILE for alpha*-*-netbsd* and
+	powerpc-*-netbsd* to netbsd-core.lo.  If COREFILE is
+	netbsd-core.lo, set COREFLAG to -DNETBSD_CORE.
+	* config.bfd (alpha*-*-netbsd*): New target.
+	* Makefile.am: Rebuild dependencies.
+	(BFD32_BACKENDS): Add vaxnetbsd.lo.
+	(BFD32_BACKENDS_CFILES): Add vaxnetbsd.c.
+	* configure, Makefile.in: Rebuild.
+
+	* configure.host: Remove the old shared library build stuff.  We
+	now use libtool instead.
+
+Wed Feb 11 17:13:09 1998  Richard Henderson  <rth@cygnus.com>
+
+	* tekhex.c (tekhex_write_object_contents): Call tekhex_init.
+
+Tue Feb 10 19:23:28 1998  H.J. Lu  <hjl@gnu.org>
+
+	* configure.in: Take stab-syms.lo out of sparclinux_vec list.
+	* configure: Rebuild.
+
+Tue Feb 10 15:16:38 1998  Nick Clifton  <nickc@cygnus.com>
+	* elf32-v850.c (remember_hi16s_reloc): New function.
+	(find_remembered_hi16s_reloc): New function.
+	(v850_elf_store_addend_in_insn): Use the above new functions to
+	match up HI6S relocs with LO16 relocs.
+
+Tue Feb 10 15:01:39 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Change -linux* to -linux-gnu*.
+	* config.bfd, configure.host: Likewise.
+	* configure: Rebuild.
+
+Mon Feb  9 19:40:59 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_store_addend_in_insn): Fix another
+	LO16/HI16S bug and improve comments about what is going on.
+
+Sat Feb  7 15:27:03 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure, aclocal.m4: Rebuild with new libtool.
+
+Fri Feb  6 14:48:20 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_merge_private_bfd_data): Do not complain
+	when merging v850 code into v850e/v850ea code.  Do not initialise
+	output flags if the input is the default architecture.
+
+Fri Feb  6 11:50:22 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* elf32-mips.c (bfd_elf32_bfd_reloc_type_lookup): For BFD_RELOC_CTOR
+	get the size from bfd_arch_bits_per_address instead of directly
+	from the isa.
+
+Thu Feb  5 14:21:34 1998  Michael Meissner  <meissner@cygnus.com>
+
+	* libbfd-in.h (BFD_ALIGN): If rounding up would cause the address
+	to wrap, just return all 1's bits instead.
+	* libbfd.h: Regenerate.
+
+Thu Feb  5 11:51:05 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-i386.c (coff_pe_i386_relocate_section): New static function
+	if COFF_WITH_PE.
+	(coff_relocate_section): If COFF_WITH_PE, define as
+	coff_pe_i386_relocate_section.
+	* coffcode.h (coff_write_object_contents): If COFF_IMAGE_WITH_PE,
+	skip empty sections, to match coff_write_object_contents.
+
+	* elf64-mips.c (mips_elf64_swap_reloca_out): Swap out r_addend,
+	rather than swapping out r_offset twice.  From Luke Deller
+	<luked@cse.unsw.edu.au>.
+
+Wed Feb  4 19:11:28 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Set libtool_enable_shared rather than
+	libtool_shared.  Remove diversion hack.
+	* configure, Makefile.in, doc/Makefile.in, aclocal.m4: Rebuild
+	with new libtool.
+
+Wed Feb  4 16:10:21 1998  Brent Baccala  <baccala@freesoft.org>
+
+	* syms.c (struct stab_cache): Define.
+	(struct stab_find_info): Remove cached_offset, cached_stab,
+	cached_str, and cached_stroff fields.  Add file_cache,
+	function_cache, and line_cache fields.
+	(_bfd_stab_section_find_nearest_line): Use extensive caching to
+	speed up searches.
+
+Wed Feb  4 13:34:22 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* peicode.h (pe_print_idata): Check for import of ordinal rather
+	than name.
+	(pe_print_edata): If there is no .edata section, look for the
+	export data in some other section.
+
+Mon Feb  2 20:05:42 1998  Jason Molenda  (crash@bugshack.cygnus.com)
+
+	* configure.in: Change version to 2.8.4.
+	* configure: Regenerated.
+
+Mon Feb  2 17:39:39 1998  Steve Haworth  <steve@pm.cse.rmit.EDU.AU>
+
+	Add tms320c30 support:
+	* cpu-tic30.c: New file.
+	* aout-tic30.c: New file.
+	* coff-tic30.c: New file.
+	* archures.c (bfd_arch_tic30): Define.
+	(bfd_tic30_arch): Declare.
+	(bfd_archures_list): Add bfd_tic30_arch.
+	* targets.c (bfd_target_vector): Add tic30_aout_vec and
+	tic30_coff_vec.
+	* reloc.c (BFD_RELOC_TIC30_LDP): Define.
+	* coffcode.h (coff_set_arch_mach_hook): Add tic30 case.
+	(coff_set_flags): Likewise.
+	* config.bfd (tic30-*-*aout*, tic30-*-*coff*): New targets.
+	* configure.in (tic30_aout_vec, tic30_coff_vec): New vectors.
+	* Makefile.am: Rebuild dependencies.
+	(ALL_MACHINES): Add cpu-tic30.lo.
+	(ALL_MACHINES_CFILES): Add cpu-tic30.c.
+	(BFD32_BACKENDS): Add aout-tic30.lo and coff-tic30.lo.
+	(BFD32_BACKENDS_CFILES): Add aout-tic30.c and coff-tic30.c.
+	* configure, Makefile.in, bfd-in2.h, libbfd.h: Rebuild.
+
+Mon Feb  2 12:25:12 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_store_addend_in_insn): Allow HI16_S reloc
+	to lag behind LO16 reloc by a couple of instructions.
+
+Mon Feb  2 14:09:46 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am ($(srcdir)/bfd-in2.h): Add dummy command to force
+	make to reexamine the file timestamp.
+	($(srcdir)/libbfd.h, $(srcddir)/libcoff.h): Likewise.
+
+	* elf64-alpha.c (ELF_MAXPAGESIZE): Change to 0x10000 from
+	0x100000.
+
+Fri Jan 30 19:07:07 1998  Geoff Keating  <geoffk@ozemail.com.au>
+
+	* elf32-ppc.c (ppc_elf_create_dynamic_sections): New procedure
+	to create .dynsbss and .rela.sbss sections.
+	(ppc_elf_adjust_dynamic_symbol): Put space for small data to be
+	copied from dynamic objects into .sbss.
+	(ppc_elf_size_dynamic_sections): Strip .rela.sbss if we don't
+	use it.  Correct typo of .rela.sdata2.
+	(ppc_elf_finish_dynamic_symbol): Generate reloc to where we
+	put the data, which may now be in .sbss.
+	(ppc_elf_relocate_section): A SDAREL16 reloc can be in dynsbss.
+	(elf_backend_create_dynamic_sections): Define as
+	ppc_elf_create_dynamic_sections.
+
+	* elf32-ppc.c (ppc_elf_check_relocs): Don't emit R_PPC_REL* relocs
+	against _GLOBAL_OFFSET_TABLE_.
+	(ppc_elf_relocate_section): Don't emit R_PPC_REL32 relocs in
+	shared libraries which refer to local symbols.  Make sure that the
+	test for allocating space for a reloc in a shared object is the
+	same as the test for emitting a reloc.
+
+Thu Jan 29 15:55:35 1998  J.J. van der Heijden  <J.J.vanderHeijden@student.utwente.nl>
+
+	* config.bfd (i[3456]-*-mingw32*): New target.
+	* acinclude.m4 (BFD_BINARY_OPEN): Check for mingw32.
+	* aclocal.m4, configure: Rebuild.
+
+Wed Jan 28 13:41:26 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (_bfd_elf_close_and_cleanup): Only check the strtab if we
+	have a bfd_object.
+
+Tue Jan 27 21:43:55 1998  Richard Henderson  <rth@cygnus.com>
+
+	Sparc v9 ABI compliant PLT:
+	* elf64-sparc.c (PLT_HEADER_SIZE): V9 ABI uses 4 entries.
+	(plt_templates, sparc64_elf_build_plt_entry): Delete.
+	(LARGE_PLT_THRESHOLD): New define.
+	(GOT_RESERVED_ENTRIES): V9 ABI only uses 1.
+	(sparc64_elf_build_plt): New function.
+	(sparc64_elf_plt_entry_offset): Likewise.
+	(sparc64_elf_plt_ptr_offset): Likewise.
+	(sparc64_elf_adjust_dynamic_symbol): Change h->plt_offset to
+	contain the index for convenience.  Skip the initial entries
+	in .rela.plt.
+	(sparc64_elf_size_dynamic_sections): Zero the allocated contents
+	memory for the benefit of .rela.plt.
+	(sparc64_elf_relocate_section): Call sparc64_elf_plt_entry_offset.
+	(sparc64_elf_finish_dynamic_symbol): Kill template stuff.  Use
+	sparc64_elf_plt_entry_offset & sparc64_elf_plt_ptr_offset for reloc.
+	(sparc64_elf_finish_dynamic_sections): DT_PLTGOT points to .plt.
+	Call sparc64_elf_build_plt.
+	(elf_backend_want_got_plt): No.
+	(elf_backend_plt_readonly): No.
+	(elf_backend_plt_alignment): 8.
+
+	* elf.c (_bfd_elf_close_and_cleanup): New function; free the shstrtab.
+	* elf-bfd.h (_bfd_elf_close_and_cleanup): Declare it.
+	* elfxx-target.h (bfd_elfNN_close_and_cleanup): Arrange for it
+	to be called.
+
+Tue Jan 27 21:45:15 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* archures.c (bfd_mach_mips*): Add definitions for various MIPS
+	processors.
+	* cpu-mips.c (arch_info_struct): Add mips variants.
+	* bfd-in2.h: Rebuilt.
+
+Tue Jan 27 15:06:04 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-arm.c (coff_arm_relocate_section): Preserve the contents of
+	t2a3_b_insn.
+
+Tue Jan 27 12:47:27 1998  Robert Lipe  <robertl@dgii.com>
+
+	* config.bfd (i[3456]86-sco3.2v5*): ELF now the default.
+	(i[3456]86sco3.2v5*coff): New target.
+
+Mon Jan 26 15:41:30 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfd-in2.h: Rebuild with changes to chew--tab expansion.
+
+Thu Jan 22 21:26:48 1998  Richard Henderson  <rth@cygnus.com>
+
+	* bfd.c (bfd_get_error_handler): Add orthogonal function.
+	* bfd-in2.h: Regenerate.
+
+Thu Jan 22 21:13:39 1998  Richard Henderson  <rth@cygnus.com>
+
+	* tekhex.c (tekhex_write_object_contents): Check for no symbols.
+
+Wed Jan 21 21:19:03 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coff-i386.c (coff_i386_rtype_to_howto): If COFF_WITH_PE, don't
+	adjust addend for an output common symbol (from Jimmy Blair
+	<jimmyb@wrs.com>).  If COFF_WITH_PE, adjust addend for PC relative
+	defined symbol to counteract adjustment made in generic relocation
+	code.
+
+	* dwarf2.c: Include sysdep.h, not stdio.h and stdlib.h.
+
+Wed Jan 21 21:16:06 1998  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* coff-m88k.c (GET_SCNDHR_NRELOC): Fix typo in macro name.
+	(GET_SCNDHR_NLNNO): Likewise.
+
+Mon Jan 19 12:49:52 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cpu-sh.c (arch_info_struct): Correct next field of sh3e.
+
+Wed Jan 14 17:23:27 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-m32r.c: Add macros to handle NOP insertion.
+
+Wed Jan 14 16:15:22 1998  Richard Henderson  <rth@cygnus.com>
+
+	* xcofflink.c (xcoff_mark_symbol): Don't mark the absolute section.
+	(xcoff_mark): Likewise.
+	(xcoff_build_ldsyms): Mark absolute symbols.
+
+Wed Jan 14 16:03:11 1998  Richard Henderson  <rth@cygnus.com>
+
+	* bout.c (b_out_write_object_contents): Sort symbols before output
+	to keep {CALL,BAL}NAME symbols adjacent.
+	(b_out_symbol_cmp): New function.
+
+For older changes see ChangeLog-9697
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/MAINTAINERS sdcc-3.2.0+dfsg/support/sdbinutils/bfd/MAINTAINERS
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/MAINTAINERS	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/MAINTAINERS	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1 @@
+See ../binutils/MAINTAINERS
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/Makefile.am sdcc-3.2.0+dfsg/support/sdbinutils/bfd/Makefile.am
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/Makefile.am	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/Makefile.am	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,999 @@
+## Process this file with automake to generate Makefile.in
+
+AUTOMAKE_OPTIONS = 1.11 no-dist foreign
+ACLOCAL_AMFLAGS = -I . -I .. -I ../config
+
+# Uncomment the following line when doing a release.
+RELEASE=y
+
+INCDIR = $(srcdir)/../include
+CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
+
+####SUBDIRS = doc po
+SUBDIRS = doc
+
+bfddocdir = doc
+
+libbfd_la_LDFLAGS =
+if INSTALL_LIBBFD
+bfdlibdir = @bfdlibdir@
+bfdincludedir = @bfdincludedir@
+bfdlib_LTLIBRARIES = libbfd.la
+bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h
+else !INSTALL_LIBBFD
+# Empty these so that the respective installation directories will not be created.
+bfdlibdir =
+bfdincludedir =
+bfdinclude_HEADERS =
+rpath_bfdlibdir = @bfdlibdir@
+noinst_LTLIBRARIES = libbfd.la
+libbfd_la_LDFLAGS += -rpath $(rpath_bfdlibdir)
+endif
+
+WARN_CFLAGS = @WARN_CFLAGS@
+NO_WERROR = @NO_WERROR@
+AM_CFLAGS = $(WARN_CFLAGS)
+AM_CPPFLAGS = -DBINDIR='"$(bindir)"'
+if PLUGINS
+bfdinclude_HEADERS += $(INCDIR)/plugin-api.h
+LIBDL = -ldl
+endif
+
+# bfd.h goes here, for now
+BFD_H = bfd.h
+
+# Jim Kingdon notes:
+# Writing S-records should be included in all (or at least most)
+# *-*-coff, *-*-aout, etc., configurations, because people will want to
+# be able to use objcopy to create S-records.  (S-records are not useful
+# for the debugger, so if you are downloading things as S-records you
+# need two copies of the executable, one to download and one for the
+# debugger).
+BFD32_LIBS = \
+	archive.lo archures.lo asxxxx.lo bfd.lo bfdio.lo bfdwin.lo \
+	cache.lo coffgen.lo corefile.lo \
+	format.lo init.lo libbfd.lo opncls.lo reloc.lo \
+	section.lo syms.lo targets.lo hash.lo linker.lo \
+	srec.lo binary.lo tekhex.lo ihex.lo stabs.lo stab-syms.lo \
+	merge.lo dwarf2.lo simple.lo compress.lo verilog.lo
+
+BFD64_LIBS = archive64.lo
+
+BFD32_LIBS_CFILES = \
+	archive.c archures.c asxxxx.c bfd.c bfdio.c bfdwin.c \
+	cache.c coffgen.c corefile.c \
+	format.c init.c libbfd.c opncls.c reloc.c \
+	section.c syms.c targets.c hash.c linker.c \
+	srec.c binary.c tekhex.c ihex.c stabs.c stab-syms.c \
+	merge.c dwarf2.c simple.c compress.c verilog.c
+
+BFD64_LIBS_CFILES = archive64.c
+
+# This list is alphabetized to make it easier to keep in sync
+# with the decls and initializer in archures.c.
+ALL_MACHINES = \
+	cpu-alpha.lo \
+	cpu-arc.lo \
+	cpu-arm.lo \
+	cpu-avr.lo \
+	cpu-bfin.lo \
+	cpu-cr16.lo \
+	cpu-cr16c.lo \
+	cpu-cris.lo \
+	cpu-crx.lo \
+	cpu-d10v.lo \
+	cpu-d30v.lo \
+	cpu-dlx.lo \
+	cpu-fr30.lo \
+	cpu-frv.lo \
+	cpu-h8300.lo \
+	cpu-h8500.lo \
+	cpu-hppa.lo \
+	cpu-i370.lo \
+	cpu-i386.lo \
+	cpu-l1om.lo \
+	cpu-k1om.lo \
+	cpu-i860.lo \
+	cpu-i960.lo \
+	cpu-ia64.lo \
+	cpu-ip2k.lo \
+	cpu-iq2000.lo \
+	cpu-lm32.lo \
+	cpu-m10200.lo \
+	cpu-m10300.lo \
+	cpu-m32c.lo \
+	cpu-m32r.lo \
+	cpu-m68hc11.lo \
+	cpu-m68hc12.lo \
+	cpu-m68k.lo \
+	cpu-m88k.lo \
+	cpu-mcore.lo \
+	cpu-mep.lo \
+	cpu-microblaze.lo \
+	cpu-mips.lo \
+	cpu-mmix.lo \
+	cpu-moxie.lo \
+	cpu-msp430.lo \
+	cpu-mt.lo \
+	cpu-ns32k.lo \
+	cpu-openrisc.lo \
+	cpu-or32.lo \
+	cpu-pdp11.lo \
+	cpu-pj.lo \
+	cpu-plugin.lo \
+	cpu-powerpc.lo \
+	cpu-rs6000.lo \
+	cpu-rx.lo \
+	cpu-s390.lo \
+	cpu-score.lo \
+	cpu-sh.lo \
+	cpu-sparc.lo \
+	cpu-spu.lo \
+	cpu-tic30.lo \
+	cpu-tic4x.lo \
+	cpu-tic54x.lo \
+	cpu-tic6x.lo \
+	cpu-tic80.lo \
+	cpu-tilegx.lo \
+	cpu-tilepro.lo \
+	cpu-v850.lo \
+	cpu-vax.lo \
+	cpu-w65.lo \
+	cpu-we32k.lo \
+	cpu-xc16x.lo \
+	cpu-xstormy16.lo \
+	cpu-xtensa.lo \
+	cpu-z80.lo \
+	cpu-z8k.lo
+
+ALL_MACHINES_CFILES = \
+	cpu-alpha.c \
+	cpu-arc.c \
+	cpu-arm.c \
+	cpu-avr.c \
+	cpu-bfin.c \
+	cpu-cr16.c \
+	cpu-cr16c.c \
+	cpu-cris.c \
+	cpu-crx.c \
+	cpu-d10v.c \
+	cpu-d30v.c \
+	cpu-dlx.c \
+	cpu-fr30.c \
+	cpu-frv.c \
+	cpu-h8300.c \
+	cpu-h8500.c \
+	cpu-hppa.c \
+	cpu-i370.c \
+	cpu-i386.c \
+	cpu-l1om.c \
+	cpu-k1om.c \
+	cpu-i860.c \
+	cpu-i960.c \
+	cpu-ia64.c \
+	cpu-ip2k.c \
+	cpu-iq2000.c \
+	cpu-lm32.c \
+	cpu-m10200.c \
+	cpu-m10300.c \
+	cpu-m32c.c \
+	cpu-m32r.c \
+	cpu-m68hc11.c \
+	cpu-m68hc12.c \
+	cpu-m68k.c \
+	cpu-m88k.c \
+	cpu-mcore.c \
+	cpu-mep.c \
+	cpu-microblaze.c \
+	cpu-mips.c \
+	cpu-mmix.c \
+	cpu-moxie.c \
+	cpu-msp430.c \
+	cpu-mt.c \
+	cpu-ns32k.c \
+	cpu-openrisc.c \
+	cpu-or32.c \
+	cpu-pdp11.c \
+	cpu-pj.c \
+	cpu-plugin.c \
+	cpu-powerpc.c \
+	cpu-rs6000.c \
+	cpu-rx.c \
+	cpu-s390.c \
+	cpu-score.c \
+	cpu-sh.c \
+	cpu-sparc.c \
+	cpu-spu.c \
+	cpu-tic30.c \
+	cpu-tic4x.c \
+	cpu-tic54x.c \
+	cpu-tic6x.c \
+	cpu-tic80.c \
+	cpu-tilegx.c \
+	cpu-tilepro.c \
+	cpu-v850.c \
+	cpu-vax.c \
+	cpu-w65.c \
+	cpu-we32k.c \
+	cpu-xc16x.c \
+	cpu-xstormy16.c \
+	cpu-xtensa.c \
+	cpu-z80.c \
+	cpu-z8k.c
+
+# The .o files needed by all of the 32 bit vectors that are configured into
+# target_vector in targets.c if configured with --enable-targets=all.
+BFD32_BACKENDS = \
+	aout-adobe.lo \
+	aout-arm.lo \
+	aout-cris.lo \
+	aout-ns32k.lo \
+	aout-sparcle.lo \
+	aout-tic30.lo \
+	aout0.lo \
+	aout32.lo \
+	armnetbsd.lo \
+	bout.lo \
+	cf-i386lynx.lo \
+	cf-sparclynx.lo \
+	coff-apollo.lo \
+	coff-arm.lo \
+	coff-aux.lo \
+	coff-go32.lo \
+	coff-h8300.lo \
+	coff-h8500.lo \
+	coff-i386.lo \
+	coff-i860.lo \
+	coff-i960.lo \
+	coff-m68k.lo \
+	coff-m88k.lo \
+	coff-mips.lo \
+	coff-or32.lo \
+	coff-rs6000.lo \
+	coff-sh.lo \
+	coff-sparc.lo \
+	coff-stgo32.lo \
+	coff-svm68k.lo \
+	coff-tic30.lo \
+	coff-tic4x.lo \
+	coff-tic54x.lo \
+	coff-tic80.lo \
+	coff-u68k.lo \
+	coff-w65.lo \
+	coff-we32k.lo \
+	coff-z80.lo \
+	coff-z8k.lo \
+	cofflink.lo \
+	dwarf1.lo \
+	ecoff.lo \
+	ecofflink.lo \
+	elf-attrs.lo \
+	elf-eh-frame.lo \
+	elf-ifunc.lo \
+	elf-m10200.lo \
+	elf-m10300.lo \
+	elf-strtab.lo \
+	elf-vxworks.lo \
+	elf.lo \
+	elf32-am33lin.lo \
+	elf32-arc.lo \
+	elf32-arm.lo \
+	elf32-avr.lo \
+	elf32-bfin.lo \
+	elf32-cr16.lo \
+	elf32-cr16c.lo \
+	elf32-cris.lo \
+	elf32-crx.lo \
+	elf32-d10v.lo \
+	elf32-d30v.lo \
+	elf32-dlx.lo \
+	elf32-fr30.lo \
+	elf32-frv.lo \
+	elf32-gen.lo \
+	elf32-h8300.lo \
+	elf32-hppa.lo \
+	elf32-i370.lo \
+	elf32-i386.lo \
+	elf32-i860.lo \
+	elf32-i960.lo \
+	elf32-ip2k.lo \
+	elf32-iq2000.lo \
+	elf32-lm32.lo \
+	elf32-m32c.lo \
+	elf32-m32r.lo \
+	elf32-m68hc11.lo \
+	elf32-m68hc12.lo \
+	elf32-m68hc1x.lo \
+	elf32-m68k.lo \
+	elf32-m88k.lo \
+	elf32-mcore.lo \
+	elf32-mep.lo \
+	elf32-microblaze.lo \
+	elf32-mips.lo \
+	elf32-moxie.lo \
+	elf32-msp430.lo \
+	elf32-mt.lo \
+	elf32-openrisc.lo \
+	elf32-or32.lo \
+	elf32-pj.lo \
+	elf32-ppc.lo \
+	elf32-rx.lo \
+	elf32-s390.lo \
+	elf32-sh-symbian.lo \
+	elf32-sh.lo \
+	elf32-sh64-com.lo \
+	elf32-sh64.lo \
+	elf32-sparc.lo \
+	elf32-spu.lo \
+	elf32-tic6x.lo \
+	elf32-tilegx.lo \
+	elf32-tilepro.lo \
+	elf32-v850.lo \
+	elf32-vax.lo \
+	elf32-xc16x.lo \
+	elf32-xstormy16.lo \
+	elf32-xtensa.lo \
+	elf32.lo \
+	elflink.lo \
+	elfxx-mips.lo \
+	elfxx-sparc.lo \
+	elfxx-tilegx.lo \
+	epoc-pe-arm.lo \
+	epoc-pei-arm.lo \
+	hp300bsd.lo \
+	hp300hpux.lo \
+	i386aout.lo \
+	i386bsd.lo \
+	i386dynix.lo \
+	i386freebsd.lo \
+	i386linux.lo \
+	i386lynx.lo \
+	i386mach3.lo \
+	i386msdos.lo \
+	i386netbsd.lo \
+	i386os9k.lo \
+	ieee.lo \
+	m68k4knetbsd.lo \
+	m68klinux.lo \
+	m68knetbsd.lo \
+	m88kmach3.lo \
+	m88kopenbsd.lo \
+	mach-o.lo \
+	mach-o-i386.lo \
+	mipsbsd.lo \
+	newsos3.lo \
+	nlm.lo \
+	nlm32-i386.lo \
+	nlm32-ppc.lo \
+	nlm32-sparc.lo \
+	nlm32.lo \
+	ns32knetbsd.lo \
+	oasys.lo \
+	pc532-mach.lo \
+	pdp11.lo \
+	pe-arm-wince.lo \
+	pe-arm.lo \
+	pe-i386.lo \
+	pe-mcore.lo \
+	pe-mips.lo \
+	pe-ppc.lo \
+	pe-sh.lo \
+	pef.lo \
+	pei-arm-wince.lo \
+	pei-arm.lo \
+	pei-i386.lo \
+	pei-mcore.lo \
+	pei-mips.lo \
+	pei-ppc.lo \
+	pei-sh.lo \
+	peigen.lo \
+	plugin.lo \
+	ppcboot.lo \
+	reloc16.lo \
+	riscix.lo \
+	som.lo \
+	sparclinux.lo \
+	sparclynx.lo \
+	sparcnetbsd.lo \
+	sunos.lo \
+	vax1knetbsd.lo \
+	vaxbsd.lo \
+	vaxnetbsd.lo \
+	versados.lo \
+	vms-lib.lo \
+	vms-misc.lo \
+	xcofflink.lo \
+	xsym.lo \
+	xtensa-isa.lo \
+	xtensa-modules.lo
+
+BFD32_BACKENDS_CFILES = \
+	aout-adobe.c \
+	aout-arm.c \
+	aout-cris.c \
+	aout-ns32k.c \
+	aout-sparcle.c \
+	aout-tic30.c \
+	aout0.c \
+	aout32.c \
+	armnetbsd.c \
+	bout.c \
+	cf-i386lynx.c \
+	cf-sparclynx.c \
+	coff-apollo.c \
+	coff-arm.c \
+	coff-aux.c \
+	coff-go32.c \
+	coff-h8300.c \
+	coff-h8500.c \
+	coff-i386.c \
+	coff-i860.c \
+	coff-i960.c \
+	coff-m68k.c \
+	coff-m88k.c \
+	coff-mips.c \
+	coff-or32.c \
+	coff-rs6000.c \
+	coff-sh.c \
+	coff-sparc.c \
+	coff-stgo32.c \
+	coff-svm68k.c \
+	coff-tic30.c \
+	coff-tic4x.c \
+	coff-tic54x.c \
+	coff-tic80.c \
+	coff-u68k.c \
+	coff-w65.c \
+	coff-we32k.c \
+	coff-z80.c \
+	coff-z8k.c \
+	cofflink.c \
+	dwarf1.c \
+	ecoff.c \
+	ecofflink.c \
+	elf-attrs.c \
+	elf-eh-frame.c \
+	elf-ifunc.c \
+	elf-m10200.c \
+	elf-m10300.c \
+	elf-strtab.c \
+	elf-vxworks.c \
+	elf.c \
+	elf32-am33lin.c \
+	elf32-arc.c \
+	elf32-arm.c \
+	elf32-avr.c \
+	elf32-bfin.c \
+	elf32-cr16.c \
+	elf32-cr16c.c \
+	elf32-cris.c \
+	elf32-crx.c \
+	elf32-d10v.c \
+	elf32-d30v.c \
+	elf32-dlx.c \
+	elf32-fr30.c \
+	elf32-frv.c \
+	elf32-gen.c \
+	elf32-h8300.c \
+	elf32-hppa.c \
+	elf32-i370.c \
+	elf32-i386.c \
+	elf32-i860.c \
+	elf32-i960.c \
+	elf32-ip2k.c \
+	elf32-iq2000.c \
+	elf32-lm32.c \
+	elf32-m32c.c \
+	elf32-m32r.c \
+	elf32-m68hc11.c \
+	elf32-m68hc12.c \
+	elf32-m68hc1x.c \
+	elf32-m68k.c \
+	elf32-m88k.c \
+	elf32-mcore.c \
+	elf32-mep.c \
+	elf32-microblaze.c \
+	elf32-mips.c \
+	elf32-moxie.c \
+	elf32-msp430.c \
+	elf32-mt.c \
+	elf32-openrisc.c \
+	elf32-or32.c \
+	elf32-pj.c \
+	elf32-ppc.c \
+	elf32-rx.c \
+	elf32-s390.c \
+	elf32-sh-symbian.c \
+	elf32-sh.c \
+	elf32-sh64-com.c \
+	elf32-sh64.c \
+	elf32-sparc.c \
+	elf32-spu.c \
+	elf32-tic6x.c \
+	elf32-tilegx.c \
+	elf32-tilepro.c \
+	elf32-v850.c \
+	elf32-vax.c \
+	elf32-xc16x.c \
+	elf32-xstormy16.c \
+	elf32-xtensa.c \
+	elf32.c \
+	elflink.c \
+	elfxx-mips.c \
+	elfxx-sparc.c \
+	elfxx-tilegx.c \
+	epoc-pe-arm.c \
+	epoc-pei-arm.c \
+	hp300bsd.c \
+	hp300hpux.c \
+	i386aout.c \
+	i386bsd.c \
+	i386dynix.c \
+	i386freebsd.c \
+	i386linux.c \
+	i386lynx.c \
+	i386mach3.c \
+	i386msdos.c \
+	i386netbsd.c \
+	i386os9k.c \
+	ieee.c \
+	m68k4knetbsd.c \
+	m68klinux.c \
+	m68knetbsd.c \
+	m88kmach3.c \
+	m88kopenbsd.c \
+	mach-o.c \
+	mach-o-i386.c \
+	mipsbsd.c \
+	newsos3.c \
+	nlm.c \
+	nlm32-i386.c \
+	nlm32-ppc.c \
+	nlm32-sparc.c \
+	nlm32.c \
+	ns32knetbsd.c \
+	oasys.c \
+	pc532-mach.c \
+	pdp11.c \
+	pe-arm-wince.c \
+	pe-arm.c \
+	pe-i386.c \
+	pe-mcore.c \
+	pe-mips.c \
+	pe-ppc.c \
+	pe-sh.c \
+	pef.c \
+	pei-arm-wince.c \
+	pei-arm.c \
+	pei-i386.c \
+	pei-mcore.c \
+	pei-mips.c \
+	pei-ppc.c \
+	pei-sh.c \
+	plugin.c \
+	ppcboot.c \
+	reloc16.c \
+	riscix.c \
+	som.c \
+	sparclinux.c \
+	sparclynx.c \
+	sparcnetbsd.c \
+	sunos.c \
+	vax1knetbsd.c \
+	vaxbsd.c \
+	vaxnetbsd.c \
+	versados.c \
+	vms-lib.c \
+	vms-misc.c \
+	xcofflink.c \
+	xsym.c \
+	xtensa-isa.c \
+	xtensa-modules.c
+
+# The .o files needed by all of the 64 bit vectors that are configured into
+# target_vector in targets.c if configured with --enable-targets=all
+# and --enable-64-bit-bfd.
+# elf32-ia64.c requires a 64-bit bfd_vma, and hence can not be put in
+# BFD32_BACKENDS.
+BFD64_BACKENDS = \
+	aix5ppc-core.lo \
+	aout64.lo \
+	coff-alpha.lo \
+	coff-x86_64.lo \
+	coff64-rs6000.lo \
+	demo64.lo \
+	elf32-ia64.lo \
+	elf32-score.lo \
+	elf32-score7.lo \
+	elf64-alpha.lo \
+	elf64-gen.lo \
+	elf64-hppa.lo \
+	elf64-ia64.lo \
+	elf64-mips.lo \
+	elf64-mmix.lo \
+	elf64-ppc.lo \
+	elf64-s390.lo \
+	elf64-sh64.lo \
+	elf64-sparc.lo \
+	elf64-tilegx.lo \
+	elf64-x86-64.lo \
+	elf64.lo \
+	elfn32-mips.lo \
+	elfxx-ia64.lo \
+	mach-o-x86-64.lo \
+	mmo.lo \
+	nlm32-alpha.lo \
+	nlm64.lo \
+	pe-x86_64.lo \
+	pei-ia64.lo \
+	pei-x86_64.lo \
+	pepigen.lo \
+	pex64igen.lo \
+	vms-alpha.lo
+
+BFD64_BACKENDS_CFILES = \
+	aix5ppc-core.c \
+	aout64.c \
+	coff-alpha.c \
+	coff-x86_64.c \
+	coff64-rs6000.c \
+	demo64.c \
+	elf32-score.c \
+	elf32-score7.c \
+	elf64-alpha.c \
+	elf64-gen.c \
+	elf64-hppa.c \
+	elf64-mips.c \
+	elf64-mmix.c \
+	elf64-ppc.c \
+	elf64-s390.c \
+	elf64-sh64.c \
+	elf64-sparc.c \
+	elf64-tilegx.c \
+	elf64-x86-64.c \
+	elf64.c \
+	elfn32-mips.c \
+	elfxx-ia64.c \
+	mach-o-x86-64.c \
+	mmo.c \
+	nlm32-alpha.c \
+	nlm64.c \
+	pe-x86_64.c \
+	pei-ia64.c \
+	pei-x86_64.c \
+	vms-alpha.c
+
+OPTIONAL_BACKENDS = \
+	aix386-core.lo \
+	cisco-core.lo \
+	hpux-core.lo \
+	irix-core.lo \
+	lynx-core.lo \
+	osf-core.lo \
+	rs6000-core.lo \
+	sco5-core.lo \
+	trad-core.lo
+
+OPTIONAL_BACKENDS_CFILES = \
+	aix386-core.c \
+	cisco-core.c \
+	hpux-core.c \
+	irix-core.c \
+	lynx-core.c \
+	osf-core.c \
+	rs6000-core.c \
+	sco5-core.c \
+	trad-core.c
+
+# We want to rerun configure if configure.in, config.bfd or
+# configure.host change. configure.in is needed since the version
+# number in Makefile comes from configure.in.
+CONFIG_STATUS_DEPENDENCIES = \
+	$(srcdir)/configure.in \
+	$(srcdir)/config.bfd \
+	$(srcdir)/configure.host
+
+# These are defined by configure.in:
+WORDSIZE = @wordsize@
+ALL_BACKENDS = @all_backends@
+BFD_BACKENDS = @bfd_backends@
+BFD_MACHINES = @bfd_machines@
+TDEFAULTS = @tdefaults@
+HAVEVECS = @havevecs@
+
+INCLUDES = @HDEFINES@ @COREFLAG@ @TDEFINES@ $(CSEARCH) $(CSWITCHES) \
+	$(HAVEVECS) @INCINTL@
+
+# C source files that correspond to .o's.
+SOURCE_CFILES = \
+	$(BFD32_LIBS_CFILES) \
+	$(BFD64_LIBS_CFILES) \
+	$(ALL_MACHINES_CFILES) \
+	$(BFD32_BACKENDS_CFILES) \
+	$(BFD64_BACKENDS_CFILES) \
+	$(OPTIONAL_BACKENDS_CFILES)
+
+BUILD_CFILES = \
+	elf32-ia64.c elf64-ia64.c peigen.c pepigen.c pex64igen.c
+
+CFILES = $(SOURCE_CFILES) $(BUILD_CFILES)
+
+## This is a list of all .h files which are in the source tree.
+SOURCE_HFILES = \
+	aout-target.h aoutf1.h aoutx.h coffcode.h coffswap.h ecoffswap.h \
+	elf-bfd.h elf-hppa.h elf32-hppa.h \
+	elf64-hppa.h elfcode.h elfcore.h \
+	freebsd.h genlink.h go32stub.h \
+	libaout.h libbfd.h libcoff.h libecoff.h libhppa.h libieee.h \
+	libnlm.h liboasys.h libpei.h libxcoff.h mach-o.h \
+	netbsd.h nlm-target.h nlmcode.h nlmswap.h ns32k.h \
+	pef.h pef-traceback.h peicode.h som.h version.h \
+	vms.h xsym.h
+
+## ... and all .h files which are in the build tree.
+BUILD_HFILES = \
+	bfdver.h elf32-target.h elf64-target.h targmatch.h bfd_stdint.h
+
+# Ensure they are built early:
+BUILT_SOURCES = $(BUILD_HFILES)
+
+HFILES = $(SOURCE_HFILES) $(BUILD_HFILES)
+
+####SRC_POTFILES = $(SOURCE_CFILES) $(SOURCE_HFILES)
+####BLD_POTFILES = $(BUILD_CFILES) $(BUILD_HFILES)
+
+####po/SRC-POTFILES.in: @MAINT@ Makefile $(SRC_POTFILES)
+####	for file in $(SRC_POTFILES); do echo $$file; done \
+####	  | LC_ALL=C sort > tmp.src \
+####	  && mv tmp.src $(srcdir)/po/SRC-POTFILES.in
+
+####po/BLD-POTFILES.in: @MAINT@ Makefile $(BLD_POTFILES)
+####	for file in $(BLD_POTFILES); do echo $$file; done \
+####	  | LC_ALL=C sort > tmp.bld \
+####	  && mv tmp.bld $(srcdir)/po/BLD-POTFILES.in
+
+all diststuff: info
+
+# Various kinds of .o files to put in libbfd.a:
+# BFD_BACKENDS	Routines the configured targets need.
+# BFD_MACHINES	Architecture-specific routines the configured targets need.
+# COREFILE	Core file routines for a native configuration
+# bfd64_libs	Routines for 64bit support
+OFILES = $(BFD_BACKENDS) $(BFD_MACHINES) @COREFILE@ @bfd64_libs@
+
+stamp-ofiles: Makefile
+	rm -f tofiles
+	f=""; \
+	for i in $(OFILES) ; do \
+	  case " $$f " in \
+	    *" $$i "*) ;; \
+	    *) f="$$f $$i" ;; \
+	  esac ; \
+	done ; \
+	echo $$f > tofiles
+	$(SHELL) $(srcdir)/../move-if-change tofiles ofiles
+	touch stamp-ofiles
+
+ofiles: stamp-ofiles ; @true
+
+# Since BFD64_LIBS is optional and we can't have substitution in
+# libbfd_la_SOURCES, we put BFD64_LIBS in OFILES instead.
+# However, list all sources in EXTRA_libbfd_la_SOURCES so the
+# dependency tracking fragments are picked up in the Makefile.
+libbfd_la_SOURCES = $(BFD32_LIBS_CFILES)
+EXTRA_libbfd_la_SOURCES = $(CFILES)
+libbfd_la_DEPENDENCIES = $(OFILES) ofiles
+libbfd_la_LIBADD = `cat ofiles` @SHARED_LIBADD@ $(LIBDL)
+libbfd_la_LDFLAGS += -release `cat libtool-soversion` @SHARED_LDFLAGS@
+
+# libtool will build .libs/libbfd.a.  We create libbfd.a in the build
+# directory so that we don't have to convert all the programs that use
+# libbfd.a simultaneously.  This is a hack which should be removed if
+# everything else starts using libtool.  FIXME.
+
+noinst_LIBRARIES = libbfd.a
+libbfd_a_SOURCES =
+
+stamp-lib: libbfd.la
+	libtooldir=`$(LIBTOOL) --config | sed -n -e 's/^objdir=//p'`; \
+	if [ -f $$libtooldir/libbfd.a ]; then \
+	  cp $$libtooldir/libbfd.a libbfd.tmp; \
+	  $(RANLIB) libbfd.tmp; \
+	  $(SHELL) $(srcdir)/../move-if-change libbfd.tmp libbfd.a; \
+	else true; fi
+	touch stamp-lib
+
+libbfd.a: stamp-lib ; @true
+
+# This file holds an array associating configuration triplets and
+# vector names.  It is built from config.bfd.  It is not compiled by
+# itself, but is included by targets.c.
+targmatch.h: config.bfd targmatch.sed
+	rm -f targmatch.h
+	sed -f $(srcdir)/targmatch.sed < $(srcdir)/config.bfd > targmatch.new
+	mv -f targmatch.new targmatch.h
+
+# When compiling archures.c and targets.c, supply the default target
+# info from configure.
+
+targets.lo: targets.c Makefile
+if am__fastdepCC
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $(TDEFAULTS) $(srcdir)/targets.c
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+else
+if AMDEP
+	source='targets.c' object='$@' libtool=yes @AMDEPBACKSLASH@
+	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif
+	$(LTCOMPILE) -c -o $@ $(TDEFAULTS) $(srcdir)/targets.c
+endif
+
+archures.lo: archures.c Makefile
+if am__fastdepCC
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $(TDEFAULTS) $(srcdir)/archures.c
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+else
+if AMDEP
+	source='archures.c' object='$@' libtool=yes @AMDEPBACKSLASH@
+	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif
+	$(LTCOMPILE) -c -o $@ $(TDEFAULTS) $(srcdir)/archures.c
+endif
+
+dwarf2.lo: dwarf2.c Makefile
+if am__fastdepCC
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ -DDEBUGDIR=\"$(DEBUGDIR)\" $(srcdir)/dwarf2.c
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+else
+if AMDEP
+	source='dwarf2.c' object='$@' libtool=yes @AMDEPBACKSLASH@
+	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif
+	$(LTCOMPILE) -c -o $@ -DDEBUGDIR=\"$(DEBUGDIR)\" $(srcdir)/dwarf2.c
+endif
+
+elf32-target.h : elfxx-target.h
+	rm -f elf32-target.h
+	sed -e s/NN/32/g < $(srcdir)/elfxx-target.h > elf32-target.new
+	mv -f elf32-target.new elf32-target.h
+
+elf64-target.h : elfxx-target.h
+	rm -f elf64-target.h
+	sed -e s/NN/64/g < $(srcdir)/elfxx-target.h > elf64-target.new
+	mv -f elf64-target.new elf64-target.h
+
+elf32-ia64.c : elfnn-ia64.c
+	rm -f elf32-ia64.c
+	sed -e s/NN/32/g < $(srcdir)/elfnn-ia64.c > elf32-ia64.new
+	mv -f elf32-ia64.new elf32-ia64.c
+
+elf64-ia64.c : elfnn-ia64.c
+	rm -f elf64-ia64.c
+	sed -e s/NN/64/g < $(srcdir)/elfnn-ia64.c > elf64-ia64.new
+	mv -f elf64-ia64.new elf64-ia64.c
+
+peigen.c : peXXigen.c
+	rm -f peigen.c
+	sed -e s/XX/pe/g < $(srcdir)/peXXigen.c > peigen.new
+	mv -f peigen.new peigen.c
+
+pepigen.c : peXXigen.c
+	rm -f pepigen.c
+	sed -e s/XX/pep/g < $(srcdir)/peXXigen.c > pepigen.new
+	mv -f pepigen.new pepigen.c
+
+pex64igen.c: peXXigen.c
+	rm -f pex64igen.c
+	sed -e s/XX/pex64/g < $(srcdir)/peXXigen.c > pex64igen.new
+	mv -f pex64igen.new pex64igen.c
+
+BFD_H_DEPS= $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h
+LOCAL_H_DEPS= libbfd.h sysdep.h config.h
+$(BFD32_LIBS) \
+ $(BFD64_LIBS) \
+ $(ALL_MACHINES) \
+ $(BFD32_BACKENDS) \
+ $(BFD64_BACKENDS) \
+ $(OPTIONAL_BACKENDS): $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS)
+
+host-aout.lo: Makefile
+
+# The following program can be used to generate a simple config file
+# which can be folded into an h-XXX file for a new host, with some editing.
+aout-params.h: gen-aout
+	./gen-aout host > aout-params.h
+gen-aout: $(srcdir)/gen-aout.c Makefile
+	$(CC) -o gen-aout $(CFLAGS) $(LFLAGS) $(srcdir)/gen-aout.c
+
+$(BFD_H): stmp-bfd-h ; @true
+
+stmp-bfd-h: bfd-in3.h
+	rm -f bfd-tmp.h
+	cp bfd-in3.h bfd-tmp.h
+	$(SHELL) $(srcdir)/../move-if-change bfd-tmp.h $(BFD_H)
+	rm -f bfd-tmp.h
+	touch stmp-bfd-h
+
+BFD_H_FILES = bfd-in.h init.c opncls.c libbfd.c section.c archures.c \
+	reloc.c syms.c bfd.c bfdio.c bfdwin.c \
+	archive.c corefile.c targets.c format.c compress.c
+BFD64_H_FILES = archive64.c
+LIBBFD_H_FILES = libbfd-in.h init.c libbfd.c bfdio.c bfdwin.c \
+	cache.c reloc.c archures.c elf.c
+LIBCOFF_H_FILES = libcoff-in.h coffcode.h
+
+# Could really use a "copy-if-change"...
+headers:
+	(cd $(bfddocdir); $(MAKE) protos $(FLAGS_TO_PASS))
+	cp $(bfddocdir)/bfd.h bfd-in2.h-new
+	$(SHELL) $(srcdir)/../move-if-change bfd-in2.h-new $(srcdir)/bfd-in2.h
+	cp $(bfddocdir)/libbfd.h libbfd.h-new
+	$(SHELL) $(srcdir)/../move-if-change libbfd.h-new $(srcdir)/libbfd.h
+	cp $(bfddocdir)/libcoff.h libcoff.h-new
+	$(SHELL) $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h
+
+# We only rebuild the header files automatically if we have been
+# configured with --enable-maintainer-mode.
+
+$(srcdir)/bfd-in2.h: @MAINT@ stmp-bin2-h ; @true
+stmp-bin2-h: $(BFD_H_FILES) $(BFD64_H_FILES)
+	(cd $(bfddocdir); $(MAKE) $(FLAGS_TO_PASS) bfd.h)
+	cp $(bfddocdir)/bfd.h bfd-in2.h-new
+	$(SHELL) $(srcdir)/../move-if-change bfd-in2.h-new $(srcdir)/bfd-in2.h
+	touch stmp-bin2-h
+
+$(srcdir)/libbfd.h: @MAINT@ stmp-lbfd-h ; @true
+stmp-lbfd-h: $(LIBBFD_H_FILES)
+	(cd $(bfddocdir); $(MAKE) $(FLAGS_TO_PASS) libbfd.h)
+	cp $(bfddocdir)/libbfd.h libbfd.h-new
+	$(SHELL) $(srcdir)/../move-if-change libbfd.h-new $(srcdir)/libbfd.h
+	touch stmp-lbfd-h
+
+$(srcdir)/libcoff.h: @MAINT@ stmp-lcoff-h ; @true
+stmp-lcoff-h: $(LIBCOFF_H_FILES)
+	(cd $(bfddocdir); $(MAKE) $(FLAGS_TO_PASS) libcoff.h)
+	cp $(bfddocdir)/libcoff.h libcoff.h-new
+	$(SHELL) $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h
+	touch stmp-lcoff-h
+
+MOSTLYCLEANFILES = ofiles stamp-ofiles
+
+CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib \
+	stmp-bin2-h stmp-lbfd-h stmp-lcoff-h
+
+DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES) libtool-soversion
+
+bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in
+	@echo "creating $@"
+	@bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
+	bfd_version_string="\"$(VERSION)\"" ;\
+	bfd_soversion="$(VERSION)" ;\
+	bfd_version_package="\"$(PKGVERSION)\"" ;\
+	report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
+	if test "x$(RELEASE)" = x ; then \
+	  bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
+	  bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
+	  bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
+	fi ;\
+	sed -e "s,@bfd_version@,$$bfd_version," \
+	    -e "s,@bfd_version_string@,$$bfd_version_string," \
+	    -e "s,@bfd_version_package@,$$bfd_version_package," \
+	    -e "s,@report_bugs_to@,$$report_bugs_to," \
+	    < $(srcdir)/version.h > $@; \
+	echo "$${bfd_soversion}" > libtool-soversion
+
+# Disable -Werror, if it has been enabled, since coffswap.h won't
+# compile with gcc 4.5 and above.
+coff-tic4x.lo: coff-tic4x.c
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< $(NO_WERROR)
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $< $(NO_WERROR)
+
+coff-tic54x.lo: coff-tic54x.c
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< $(NO_WERROR)
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $< $(NO_WERROR)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/Makefile.in sdcc-3.2.0+dfsg/support/sdbinutils/bfd/Makefile.in
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/Makefile.in	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2043 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+@INSTALL_LIBBFD_FALSE@am__append_1 = -rpath $(rpath_bfdlibdir)
+@PLUGINS_TRUE@am__append_2 = $(INCDIR)/plugin-api.h
+subdir = .
+DIST_COMMON = README ChangeLog $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(srcdir)/config.in \
+	$(srcdir)/../mkinstalldirs $(srcdir)/bfd-in2.h \
+	$(srcdir)/../depcomp $(am__bfdinclude_HEADERS_DIST)
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
+	$(top_srcdir)/../config/depstand.m4 \
+	$(top_srcdir)/../config/gettext-sister.m4 \
+	$(top_srcdir)/../config/largefile.m4 \
+	$(top_srcdir)/../config/lead-dot.m4 \
+	$(top_srcdir)/../config/nls.m4 \
+	$(top_srcdir)/../config/override.m4 \
+	$(top_srcdir)/../config/plugins.m4 \
+	$(top_srcdir)/../config/po.m4 \
+	$(top_srcdir)/../config/progtest.m4 \
+	$(top_srcdir)/../config/stdint.m4 $(top_srcdir)/../libtool.m4 \
+	$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
+	$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
+	$(top_srcdir)/bfd.m4 $(top_srcdir)/warning.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/../config/zlib.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES = bfd-in3.h
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libbfd_a_AR = $(AR) $(ARFLAGS)
+libbfd_a_LIBADD =
+am_libbfd_a_OBJECTS =
+libbfd_a_OBJECTS = $(am_libbfd_a_OBJECTS)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(bfdlibdir)" \
+	"$(DESTDIR)$(bfdincludedir)"
+LTLIBRARIES = $(bfdlib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+am__objects_1 = archive.lo archures.lo asxxxx.lo bfd.lo bfdio.lo \
+	bfdwin.lo cache.lo coffgen.lo corefile.lo format.lo init.lo \
+	libbfd.lo opncls.lo reloc.lo section.lo syms.lo targets.lo \
+	hash.lo linker.lo srec.lo binary.lo tekhex.lo ihex.lo stabs.lo \
+	stab-syms.lo merge.lo dwarf2.lo simple.lo compress.lo \
+	verilog.lo
+am_libbfd_la_OBJECTS = $(am__objects_1)
+libbfd_la_OBJECTS = $(am_libbfd_la_OBJECTS)
+libbfd_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libbfd_la_LDFLAGS) $(LDFLAGS) -o $@
+@INSTALL_LIBBFD_FALSE@am_libbfd_la_rpath =
+@INSTALL_LIBBFD_TRUE@am_libbfd_la_rpath = -rpath $(bfdlibdir)
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/../depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libbfd_a_SOURCES) $(libbfd_la_SOURCES) \
+	$(EXTRA_libbfd_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+am__bfdinclude_HEADERS_DIST = $(INCDIR)/plugin-api.h bfd.h \
+	$(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h
+HEADERS = $(bfdinclude_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BFD_HOSTPTR_T = @BFD_HOSTPTR_T@
+BFD_HOST_64BIT_LONG = @BFD_HOST_64BIT_LONG@
+BFD_HOST_64BIT_LONG_LONG = @BFD_HOST_64BIT_LONG_LONG@
+BFD_HOST_64_BIT = @BFD_HOST_64_BIT@
+BFD_HOST_64_BIT_DEFINED = @BFD_HOST_64_BIT_DEFINED@
+BFD_HOST_U_64_BIT = @BFD_HOST_U_64_BIT@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+COREFILE = @COREFILE@
+COREFLAG = @COREFLAG@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEBUGDIR = @DEBUGDIR@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
+FGREP = @FGREP@
+GENCAT = @GENCAT@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HDEFINES = @HDEFINES@
+INCINTL = @INCINTL@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBINTL = @LIBINTL@
+LIBINTL_DEP = @LIBINTL_DEP@
+LIBM = @LIBM@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NO_WERROR = @NO_WERROR@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKGVERSION = @PKGVERSION@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+REPORT_BUGS_TEXI = @REPORT_BUGS_TEXI@
+REPORT_BUGS_TO = @REPORT_BUGS_TO@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHARED_LDFLAGS = @SHARED_LDFLAGS@
+SHARED_LIBADD = @SHARED_LIBADD@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TDEFINES = @TDEFINES@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+all_backends = @all_backends@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bfd64_libs = @bfd64_libs@
+bfd_backends = @bfd_backends@
+bfd_default_target_size = @bfd_default_target_size@
+bfd_file_ptr = @bfd_file_ptr@
+bfd_machines = @bfd_machines@
+bfd_ufile_ptr = @bfd_ufile_ptr@
+@INSTALL_LIBBFD_FALSE@bfdincludedir = 
+@INSTALL_LIBBFD_TRUE@bfdincludedir = @bfdincludedir@
+# Empty these so that the respective installation directories will not be created.
+@INSTALL_LIBBFD_FALSE@bfdlibdir = 
+@INSTALL_LIBBFD_TRUE@bfdlibdir = @bfdlibdir@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+havevecs = @havevecs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_noncanonical = @host_noncanonical@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+supports_plugins = @supports_plugins@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_noncanonical = @target_noncanonical@
+target_os = @target_os@
+target_vendor = @target_vendor@
+tdefaults = @tdefaults@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+wordsize = @wordsize@
+AUTOMAKE_OPTIONS = 1.11 no-dist foreign
+ACLOCAL_AMFLAGS = -I . -I .. -I ../config
+
+# Uncomment the following line when doing a release.
+RELEASE = y
+INCDIR = $(srcdir)/../include
+CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
+
+####SUBDIRS = doc po
+SUBDIRS = doc
+bfddocdir = doc
+libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \
+	@SHARED_LDFLAGS@ $(am__empty)
+@INSTALL_LIBBFD_TRUE@bfdlib_LTLIBRARIES = libbfd.la
+@INSTALL_LIBBFD_FALSE@bfdinclude_HEADERS = $(am__append_2)
+@INSTALL_LIBBFD_TRUE@bfdinclude_HEADERS = $(BFD_H) \
+@INSTALL_LIBBFD_TRUE@	$(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
+@INSTALL_LIBBFD_TRUE@	$(INCDIR)/bfdlink.h $(am__append_2)
+@INSTALL_LIBBFD_FALSE@rpath_bfdlibdir = @bfdlibdir@
+@INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libbfd.la
+AM_CFLAGS = $(WARN_CFLAGS)
+AM_CPPFLAGS = -DBINDIR='"$(bindir)"'
+@PLUGINS_TRUE@LIBDL = -ldl
+
+# bfd.h goes here, for now
+BFD_H = bfd.h
+
+# Jim Kingdon notes:
+# Writing S-records should be included in all (or at least most)
+# *-*-coff, *-*-aout, etc., configurations, because people will want to
+# be able to use objcopy to create S-records.  (S-records are not useful
+# for the debugger, so if you are downloading things as S-records you
+# need two copies of the executable, one to download and one for the
+# debugger).
+BFD32_LIBS = \
+	archive.lo archures.lo asxxxx.lo bfd.lo bfdio.lo bfdwin.lo \
+	cache.lo coffgen.lo corefile.lo \
+	format.lo init.lo libbfd.lo opncls.lo reloc.lo \
+	section.lo syms.lo targets.lo hash.lo linker.lo \
+	srec.lo binary.lo tekhex.lo ihex.lo stabs.lo stab-syms.lo \
+	merge.lo dwarf2.lo simple.lo compress.lo verilog.lo
+
+BFD64_LIBS = archive64.lo
+BFD32_LIBS_CFILES = \
+	archive.c archures.c asxxxx.c bfd.c bfdio.c bfdwin.c \
+	cache.c coffgen.c corefile.c \
+	format.c init.c libbfd.c opncls.c reloc.c \
+	section.c syms.c targets.c hash.c linker.c \
+	srec.c binary.c tekhex.c ihex.c stabs.c stab-syms.c \
+	merge.c dwarf2.c simple.c compress.c verilog.c
+
+BFD64_LIBS_CFILES = archive64.c
+
+# This list is alphabetized to make it easier to keep in sync
+# with the decls and initializer in archures.c.
+ALL_MACHINES = \
+	cpu-alpha.lo \
+	cpu-arc.lo \
+	cpu-arm.lo \
+	cpu-avr.lo \
+	cpu-bfin.lo \
+	cpu-cr16.lo \
+	cpu-cr16c.lo \
+	cpu-cris.lo \
+	cpu-crx.lo \
+	cpu-d10v.lo \
+	cpu-d30v.lo \
+	cpu-dlx.lo \
+	cpu-fr30.lo \
+	cpu-frv.lo \
+	cpu-h8300.lo \
+	cpu-h8500.lo \
+	cpu-hppa.lo \
+	cpu-i370.lo \
+	cpu-i386.lo \
+	cpu-l1om.lo \
+	cpu-k1om.lo \
+	cpu-i860.lo \
+	cpu-i960.lo \
+	cpu-ia64.lo \
+	cpu-ip2k.lo \
+	cpu-iq2000.lo \
+	cpu-lm32.lo \
+	cpu-m10200.lo \
+	cpu-m10300.lo \
+	cpu-m32c.lo \
+	cpu-m32r.lo \
+	cpu-m68hc11.lo \
+	cpu-m68hc12.lo \
+	cpu-m68k.lo \
+	cpu-m88k.lo \
+	cpu-mcore.lo \
+	cpu-mep.lo \
+	cpu-microblaze.lo \
+	cpu-mips.lo \
+	cpu-mmix.lo \
+	cpu-moxie.lo \
+	cpu-msp430.lo \
+	cpu-mt.lo \
+	cpu-ns32k.lo \
+	cpu-openrisc.lo \
+	cpu-or32.lo \
+	cpu-pdp11.lo \
+	cpu-pj.lo \
+	cpu-plugin.lo \
+	cpu-powerpc.lo \
+	cpu-rs6000.lo \
+	cpu-rx.lo \
+	cpu-s390.lo \
+	cpu-score.lo \
+	cpu-sh.lo \
+	cpu-sparc.lo \
+	cpu-spu.lo \
+	cpu-tic30.lo \
+	cpu-tic4x.lo \
+	cpu-tic54x.lo \
+	cpu-tic6x.lo \
+	cpu-tic80.lo \
+	cpu-tilegx.lo \
+	cpu-tilepro.lo \
+	cpu-v850.lo \
+	cpu-vax.lo \
+	cpu-w65.lo \
+	cpu-we32k.lo \
+	cpu-xc16x.lo \
+	cpu-xstormy16.lo \
+	cpu-xtensa.lo \
+	cpu-z80.lo \
+	cpu-z8k.lo
+
+ALL_MACHINES_CFILES = \
+	cpu-alpha.c \
+	cpu-arc.c \
+	cpu-arm.c \
+	cpu-avr.c \
+	cpu-bfin.c \
+	cpu-cr16.c \
+	cpu-cr16c.c \
+	cpu-cris.c \
+	cpu-crx.c \
+	cpu-d10v.c \
+	cpu-d30v.c \
+	cpu-dlx.c \
+	cpu-fr30.c \
+	cpu-frv.c \
+	cpu-h8300.c \
+	cpu-h8500.c \
+	cpu-hppa.c \
+	cpu-i370.c \
+	cpu-i386.c \
+	cpu-l1om.c \
+	cpu-k1om.c \
+	cpu-i860.c \
+	cpu-i960.c \
+	cpu-ia64.c \
+	cpu-ip2k.c \
+	cpu-iq2000.c \
+	cpu-lm32.c \
+	cpu-m10200.c \
+	cpu-m10300.c \
+	cpu-m32c.c \
+	cpu-m32r.c \
+	cpu-m68hc11.c \
+	cpu-m68hc12.c \
+	cpu-m68k.c \
+	cpu-m88k.c \
+	cpu-mcore.c \
+	cpu-mep.c \
+	cpu-microblaze.c \
+	cpu-mips.c \
+	cpu-mmix.c \
+	cpu-moxie.c \
+	cpu-msp430.c \
+	cpu-mt.c \
+	cpu-ns32k.c \
+	cpu-openrisc.c \
+	cpu-or32.c \
+	cpu-pdp11.c \
+	cpu-pj.c \
+	cpu-plugin.c \
+	cpu-powerpc.c \
+	cpu-rs6000.c \
+	cpu-rx.c \
+	cpu-s390.c \
+	cpu-score.c \
+	cpu-sh.c \
+	cpu-sparc.c \
+	cpu-spu.c \
+	cpu-tic30.c \
+	cpu-tic4x.c \
+	cpu-tic54x.c \
+	cpu-tic6x.c \
+	cpu-tic80.c \
+	cpu-tilegx.c \
+	cpu-tilepro.c \
+	cpu-v850.c \
+	cpu-vax.c \
+	cpu-w65.c \
+	cpu-we32k.c \
+	cpu-xc16x.c \
+	cpu-xstormy16.c \
+	cpu-xtensa.c \
+	cpu-z80.c \
+	cpu-z8k.c
+
+
+# The .o files needed by all of the 32 bit vectors that are configured into
+# target_vector in targets.c if configured with --enable-targets=all.
+BFD32_BACKENDS = \
+	aout-adobe.lo \
+	aout-arm.lo \
+	aout-cris.lo \
+	aout-ns32k.lo \
+	aout-sparcle.lo \
+	aout-tic30.lo \
+	aout0.lo \
+	aout32.lo \
+	armnetbsd.lo \
+	bout.lo \
+	cf-i386lynx.lo \
+	cf-sparclynx.lo \
+	coff-apollo.lo \
+	coff-arm.lo \
+	coff-aux.lo \
+	coff-go32.lo \
+	coff-h8300.lo \
+	coff-h8500.lo \
+	coff-i386.lo \
+	coff-i860.lo \
+	coff-i960.lo \
+	coff-m68k.lo \
+	coff-m88k.lo \
+	coff-mips.lo \
+	coff-or32.lo \
+	coff-rs6000.lo \
+	coff-sh.lo \
+	coff-sparc.lo \
+	coff-stgo32.lo \
+	coff-svm68k.lo \
+	coff-tic30.lo \
+	coff-tic4x.lo \
+	coff-tic54x.lo \
+	coff-tic80.lo \
+	coff-u68k.lo \
+	coff-w65.lo \
+	coff-we32k.lo \
+	coff-z80.lo \
+	coff-z8k.lo \
+	cofflink.lo \
+	dwarf1.lo \
+	ecoff.lo \
+	ecofflink.lo \
+	elf-attrs.lo \
+	elf-eh-frame.lo \
+	elf-ifunc.lo \
+	elf-m10200.lo \
+	elf-m10300.lo \
+	elf-strtab.lo \
+	elf-vxworks.lo \
+	elf.lo \
+	elf32-am33lin.lo \
+	elf32-arc.lo \
+	elf32-arm.lo \
+	elf32-avr.lo \
+	elf32-bfin.lo \
+	elf32-cr16.lo \
+	elf32-cr16c.lo \
+	elf32-cris.lo \
+	elf32-crx.lo \
+	elf32-d10v.lo \
+	elf32-d30v.lo \
+	elf32-dlx.lo \
+	elf32-fr30.lo \
+	elf32-frv.lo \
+	elf32-gen.lo \
+	elf32-h8300.lo \
+	elf32-hppa.lo \
+	elf32-i370.lo \
+	elf32-i386.lo \
+	elf32-i860.lo \
+	elf32-i960.lo \
+	elf32-ip2k.lo \
+	elf32-iq2000.lo \
+	elf32-lm32.lo \
+	elf32-m32c.lo \
+	elf32-m32r.lo \
+	elf32-m68hc11.lo \
+	elf32-m68hc12.lo \
+	elf32-m68hc1x.lo \
+	elf32-m68k.lo \
+	elf32-m88k.lo \
+	elf32-mcore.lo \
+	elf32-mep.lo \
+	elf32-microblaze.lo \
+	elf32-mips.lo \
+	elf32-moxie.lo \
+	elf32-msp430.lo \
+	elf32-mt.lo \
+	elf32-openrisc.lo \
+	elf32-or32.lo \
+	elf32-pj.lo \
+	elf32-ppc.lo \
+	elf32-rx.lo \
+	elf32-s390.lo \
+	elf32-sh-symbian.lo \
+	elf32-sh.lo \
+	elf32-sh64-com.lo \
+	elf32-sh64.lo \
+	elf32-sparc.lo \
+	elf32-spu.lo \
+	elf32-tic6x.lo \
+	elf32-tilegx.lo \
+	elf32-tilepro.lo \
+	elf32-v850.lo \
+	elf32-vax.lo \
+	elf32-xc16x.lo \
+	elf32-xstormy16.lo \
+	elf32-xtensa.lo \
+	elf32.lo \
+	elflink.lo \
+	elfxx-mips.lo \
+	elfxx-sparc.lo \
+	elfxx-tilegx.lo \
+	epoc-pe-arm.lo \
+	epoc-pei-arm.lo \
+	hp300bsd.lo \
+	hp300hpux.lo \
+	i386aout.lo \
+	i386bsd.lo \
+	i386dynix.lo \
+	i386freebsd.lo \
+	i386linux.lo \
+	i386lynx.lo \
+	i386mach3.lo \
+	i386msdos.lo \
+	i386netbsd.lo \
+	i386os9k.lo \
+	ieee.lo \
+	m68k4knetbsd.lo \
+	m68klinux.lo \
+	m68knetbsd.lo \
+	m88kmach3.lo \
+	m88kopenbsd.lo \
+	mach-o.lo \
+	mach-o-i386.lo \
+	mipsbsd.lo \
+	newsos3.lo \
+	nlm.lo \
+	nlm32-i386.lo \
+	nlm32-ppc.lo \
+	nlm32-sparc.lo \
+	nlm32.lo \
+	ns32knetbsd.lo \
+	oasys.lo \
+	pc532-mach.lo \
+	pdp11.lo \
+	pe-arm-wince.lo \
+	pe-arm.lo \
+	pe-i386.lo \
+	pe-mcore.lo \
+	pe-mips.lo \
+	pe-ppc.lo \
+	pe-sh.lo \
+	pef.lo \
+	pei-arm-wince.lo \
+	pei-arm.lo \
+	pei-i386.lo \
+	pei-mcore.lo \
+	pei-mips.lo \
+	pei-ppc.lo \
+	pei-sh.lo \
+	peigen.lo \
+	plugin.lo \
+	ppcboot.lo \
+	reloc16.lo \
+	riscix.lo \
+	som.lo \
+	sparclinux.lo \
+	sparclynx.lo \
+	sparcnetbsd.lo \
+	sunos.lo \
+	vax1knetbsd.lo \
+	vaxbsd.lo \
+	vaxnetbsd.lo \
+	versados.lo \
+	vms-lib.lo \
+	vms-misc.lo \
+	xcofflink.lo \
+	xsym.lo \
+	xtensa-isa.lo \
+	xtensa-modules.lo
+
+BFD32_BACKENDS_CFILES = \
+	aout-adobe.c \
+	aout-arm.c \
+	aout-cris.c \
+	aout-ns32k.c \
+	aout-sparcle.c \
+	aout-tic30.c \
+	aout0.c \
+	aout32.c \
+	armnetbsd.c \
+	bout.c \
+	cf-i386lynx.c \
+	cf-sparclynx.c \
+	coff-apollo.c \
+	coff-arm.c \
+	coff-aux.c \
+	coff-go32.c \
+	coff-h8300.c \
+	coff-h8500.c \
+	coff-i386.c \
+	coff-i860.c \
+	coff-i960.c \
+	coff-m68k.c \
+	coff-m88k.c \
+	coff-mips.c \
+	coff-or32.c \
+	coff-rs6000.c \
+	coff-sh.c \
+	coff-sparc.c \
+	coff-stgo32.c \
+	coff-svm68k.c \
+	coff-tic30.c \
+	coff-tic4x.c \
+	coff-tic54x.c \
+	coff-tic80.c \
+	coff-u68k.c \
+	coff-w65.c \
+	coff-we32k.c \
+	coff-z80.c \
+	coff-z8k.c \
+	cofflink.c \
+	dwarf1.c \
+	ecoff.c \
+	ecofflink.c \
+	elf-attrs.c \
+	elf-eh-frame.c \
+	elf-ifunc.c \
+	elf-m10200.c \
+	elf-m10300.c \
+	elf-strtab.c \
+	elf-vxworks.c \
+	elf.c \
+	elf32-am33lin.c \
+	elf32-arc.c \
+	elf32-arm.c \
+	elf32-avr.c \
+	elf32-bfin.c \
+	elf32-cr16.c \
+	elf32-cr16c.c \
+	elf32-cris.c \
+	elf32-crx.c \
+	elf32-d10v.c \
+	elf32-d30v.c \
+	elf32-dlx.c \
+	elf32-fr30.c \
+	elf32-frv.c \
+	elf32-gen.c \
+	elf32-h8300.c \
+	elf32-hppa.c \
+	elf32-i370.c \
+	elf32-i386.c \
+	elf32-i860.c \
+	elf32-i960.c \
+	elf32-ip2k.c \
+	elf32-iq2000.c \
+	elf32-lm32.c \
+	elf32-m32c.c \
+	elf32-m32r.c \
+	elf32-m68hc11.c \
+	elf32-m68hc12.c \
+	elf32-m68hc1x.c \
+	elf32-m68k.c \
+	elf32-m88k.c \
+	elf32-mcore.c \
+	elf32-mep.c \
+	elf32-microblaze.c \
+	elf32-mips.c \
+	elf32-moxie.c \
+	elf32-msp430.c \
+	elf32-mt.c \
+	elf32-openrisc.c \
+	elf32-or32.c \
+	elf32-pj.c \
+	elf32-ppc.c \
+	elf32-rx.c \
+	elf32-s390.c \
+	elf32-sh-symbian.c \
+	elf32-sh.c \
+	elf32-sh64-com.c \
+	elf32-sh64.c \
+	elf32-sparc.c \
+	elf32-spu.c \
+	elf32-tic6x.c \
+	elf32-tilegx.c \
+	elf32-tilepro.c \
+	elf32-v850.c \
+	elf32-vax.c \
+	elf32-xc16x.c \
+	elf32-xstormy16.c \
+	elf32-xtensa.c \
+	elf32.c \
+	elflink.c \
+	elfxx-mips.c \
+	elfxx-sparc.c \
+	elfxx-tilegx.c \
+	epoc-pe-arm.c \
+	epoc-pei-arm.c \
+	hp300bsd.c \
+	hp300hpux.c \
+	i386aout.c \
+	i386bsd.c \
+	i386dynix.c \
+	i386freebsd.c \
+	i386linux.c \
+	i386lynx.c \
+	i386mach3.c \
+	i386msdos.c \
+	i386netbsd.c \
+	i386os9k.c \
+	ieee.c \
+	m68k4knetbsd.c \
+	m68klinux.c \
+	m68knetbsd.c \
+	m88kmach3.c \
+	m88kopenbsd.c \
+	mach-o.c \
+	mach-o-i386.c \
+	mipsbsd.c \
+	newsos3.c \
+	nlm.c \
+	nlm32-i386.c \
+	nlm32-ppc.c \
+	nlm32-sparc.c \
+	nlm32.c \
+	ns32knetbsd.c \
+	oasys.c \
+	pc532-mach.c \
+	pdp11.c \
+	pe-arm-wince.c \
+	pe-arm.c \
+	pe-i386.c \
+	pe-mcore.c \
+	pe-mips.c \
+	pe-ppc.c \
+	pe-sh.c \
+	pef.c \
+	pei-arm-wince.c \
+	pei-arm.c \
+	pei-i386.c \
+	pei-mcore.c \
+	pei-mips.c \
+	pei-ppc.c \
+	pei-sh.c \
+	plugin.c \
+	ppcboot.c \
+	reloc16.c \
+	riscix.c \
+	som.c \
+	sparclinux.c \
+	sparclynx.c \
+	sparcnetbsd.c \
+	sunos.c \
+	vax1knetbsd.c \
+	vaxbsd.c \
+	vaxnetbsd.c \
+	versados.c \
+	vms-lib.c \
+	vms-misc.c \
+	xcofflink.c \
+	xsym.c \
+	xtensa-isa.c \
+	xtensa-modules.c
+
+
+# The .o files needed by all of the 64 bit vectors that are configured into
+# target_vector in targets.c if configured with --enable-targets=all
+# and --enable-64-bit-bfd.
+# elf32-ia64.c requires a 64-bit bfd_vma, and hence can not be put in
+# BFD32_BACKENDS.
+BFD64_BACKENDS = \
+	aix5ppc-core.lo \
+	aout64.lo \
+	coff-alpha.lo \
+	coff-x86_64.lo \
+	coff64-rs6000.lo \
+	demo64.lo \
+	elf32-ia64.lo \
+	elf32-score.lo \
+	elf32-score7.lo \
+	elf64-alpha.lo \
+	elf64-gen.lo \
+	elf64-hppa.lo \
+	elf64-ia64.lo \
+	elf64-mips.lo \
+	elf64-mmix.lo \
+	elf64-ppc.lo \
+	elf64-s390.lo \
+	elf64-sh64.lo \
+	elf64-sparc.lo \
+	elf64-tilegx.lo \
+	elf64-x86-64.lo \
+	elf64.lo \
+	elfn32-mips.lo \
+	elfxx-ia64.lo \
+	mach-o-x86-64.lo \
+	mmo.lo \
+	nlm32-alpha.lo \
+	nlm64.lo \
+	pe-x86_64.lo \
+	pei-ia64.lo \
+	pei-x86_64.lo \
+	pepigen.lo \
+	pex64igen.lo \
+	vms-alpha.lo
+
+BFD64_BACKENDS_CFILES = \
+	aix5ppc-core.c \
+	aout64.c \
+	coff-alpha.c \
+	coff-x86_64.c \
+	coff64-rs6000.c \
+	demo64.c \
+	elf32-score.c \
+	elf32-score7.c \
+	elf64-alpha.c \
+	elf64-gen.c \
+	elf64-hppa.c \
+	elf64-mips.c \
+	elf64-mmix.c \
+	elf64-ppc.c \
+	elf64-s390.c \
+	elf64-sh64.c \
+	elf64-sparc.c \
+	elf64-tilegx.c \
+	elf64-x86-64.c \
+	elf64.c \
+	elfn32-mips.c \
+	elfxx-ia64.c \
+	mach-o-x86-64.c \
+	mmo.c \
+	nlm32-alpha.c \
+	nlm64.c \
+	pe-x86_64.c \
+	pei-ia64.c \
+	pei-x86_64.c \
+	vms-alpha.c
+
+OPTIONAL_BACKENDS = \
+	aix386-core.lo \
+	cisco-core.lo \
+	hpux-core.lo \
+	irix-core.lo \
+	lynx-core.lo \
+	osf-core.lo \
+	rs6000-core.lo \
+	sco5-core.lo \
+	trad-core.lo
+
+OPTIONAL_BACKENDS_CFILES = \
+	aix386-core.c \
+	cisco-core.c \
+	hpux-core.c \
+	irix-core.c \
+	lynx-core.c \
+	osf-core.c \
+	rs6000-core.c \
+	sco5-core.c \
+	trad-core.c
+
+
+# We want to rerun configure if configure.in, config.bfd or
+# configure.host change. configure.in is needed since the version
+# number in Makefile comes from configure.in.
+CONFIG_STATUS_DEPENDENCIES = \
+	$(srcdir)/configure.in \
+	$(srcdir)/config.bfd \
+	$(srcdir)/configure.host
+
+
+# These are defined by configure.in:
+WORDSIZE = @wordsize@
+ALL_BACKENDS = @all_backends@
+BFD_BACKENDS = @bfd_backends@
+BFD_MACHINES = @bfd_machines@
+TDEFAULTS = @tdefaults@
+HAVEVECS = @havevecs@
+INCLUDES = @HDEFINES@ @COREFLAG@ @TDEFINES@ $(CSEARCH) $(CSWITCHES) \
+	$(HAVEVECS) @INCINTL@
+
+
+# C source files that correspond to .o's.
+SOURCE_CFILES = \
+	$(BFD32_LIBS_CFILES) \
+	$(BFD64_LIBS_CFILES) \
+	$(ALL_MACHINES_CFILES) \
+	$(BFD32_BACKENDS_CFILES) \
+	$(BFD64_BACKENDS_CFILES) \
+	$(OPTIONAL_BACKENDS_CFILES)
+
+BUILD_CFILES = \
+	elf32-ia64.c elf64-ia64.c peigen.c pepigen.c pex64igen.c
+
+CFILES = $(SOURCE_CFILES) $(BUILD_CFILES)
+SOURCE_HFILES = \
+	aout-target.h aoutf1.h aoutx.h coffcode.h coffswap.h ecoffswap.h \
+	elf-bfd.h elf-hppa.h elf32-hppa.h \
+	elf64-hppa.h elfcode.h elfcore.h \
+	freebsd.h genlink.h go32stub.h \
+	libaout.h libbfd.h libcoff.h libecoff.h libhppa.h libieee.h \
+	libnlm.h liboasys.h libpei.h libxcoff.h mach-o.h \
+	netbsd.h nlm-target.h nlmcode.h nlmswap.h ns32k.h \
+	pef.h pef-traceback.h peicode.h som.h version.h \
+	vms.h xsym.h
+
+BUILD_HFILES = \
+	bfdver.h elf32-target.h elf64-target.h targmatch.h bfd_stdint.h
+
+
+# Ensure they are built early:
+BUILT_SOURCES = $(BUILD_HFILES)
+HFILES = $(SOURCE_HFILES) $(BUILD_HFILES)
+
+# Various kinds of .o files to put in libbfd.a:
+# BFD_BACKENDS	Routines the configured targets need.
+# BFD_MACHINES	Architecture-specific routines the configured targets need.
+# COREFILE	Core file routines for a native configuration
+# bfd64_libs	Routines for 64bit support
+OFILES = $(BFD_BACKENDS) $(BFD_MACHINES) @COREFILE@ @bfd64_libs@
+
+# Since BFD64_LIBS is optional and we can't have substitution in
+# libbfd_la_SOURCES, we put BFD64_LIBS in OFILES instead.
+# However, list all sources in EXTRA_libbfd_la_SOURCES so the
+# dependency tracking fragments are picked up in the Makefile.
+libbfd_la_SOURCES = $(BFD32_LIBS_CFILES)
+EXTRA_libbfd_la_SOURCES = $(CFILES)
+libbfd_la_DEPENDENCIES = $(OFILES) ofiles
+libbfd_la_LIBADD = `cat ofiles` @SHARED_LIBADD@ $(LIBDL)
+
+# libtool will build .libs/libbfd.a.  We create libbfd.a in the build
+# directory so that we don't have to convert all the programs that use
+# libbfd.a simultaneously.  This is a hack which should be removed if
+# everything else starts using libtool.  FIXME.
+noinst_LIBRARIES = libbfd.a
+libbfd_a_SOURCES = 
+BFD_H_DEPS = $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h
+LOCAL_H_DEPS = libbfd.h sysdep.h config.h
+BFD_H_FILES = bfd-in.h init.c opncls.c libbfd.c section.c archures.c \
+	reloc.c syms.c bfd.c bfdio.c bfdwin.c \
+	archive.c corefile.c targets.c format.c compress.c
+
+BFD64_H_FILES = archive64.c
+LIBBFD_H_FILES = libbfd-in.h init.c libbfd.c bfdio.c bfdwin.c \
+	cache.c reloc.c archures.c elf.c
+
+LIBCOFF_H_FILES = libcoff-in.h coffcode.h
+MOSTLYCLEANFILES = ofiles stamp-ofiles
+CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib \
+	stmp-bin2-h stmp-lbfd-h stmp-lcoff-h
+
+DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES) libtool-soversion
+all: $(BUILT_SOURCES) config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+am--refresh:
+	@:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+
+config.h: stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+	else :; fi
+
+stamp-h1: $(srcdir)/config.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+bfd-in3.h: $(top_builddir)/config.status $(srcdir)/bfd-in2.h
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+install-bfdlibLTLIBRARIES: $(bfdlib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(bfdlibdir)" || $(MKDIR_P) "$(DESTDIR)$(bfdlibdir)"
+	@list='$(bfdlib_LTLIBRARIES)'; test -n "$(bfdlibdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(bfdlibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(bfdlibdir)"; \
+	}
+
+uninstall-bfdlibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bfdlib_LTLIBRARIES)'; test -n "$(bfdlibdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(bfdlibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(bfdlibdir)/$$f"; \
+	done
+
+clean-bfdlibLTLIBRARIES:
+	-test -z "$(bfdlib_LTLIBRARIES)" || rm -f $(bfdlib_LTLIBRARIES)
+	@list='$(bfdlib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libbfd.la: $(libbfd_la_OBJECTS) $(libbfd_la_DEPENDENCIES) 
+	$(libbfd_la_LINK) $(am_libbfd_la_rpath) $(libbfd_la_OBJECTS) $(libbfd_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aix386-core.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aix5ppc-core.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aout-adobe.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aout-arm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aout-cris.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aout-ns32k.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aout-sparcle.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aout-tic30.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aout0.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aout32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aout64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/archive.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/archive64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/archures.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/armnetbsd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asxxxx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bfd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bfdio.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bfdwin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binary.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bout.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cf-i386lynx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cf-sparclynx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cisco-core.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-alpha.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-apollo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-arm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-aux.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-go32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-h8300.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-h8500.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-i386.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-i860.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-i960.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-m68k.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-m88k.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-mips.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-or32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-rs6000.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-sh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-sparc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-stgo32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-svm68k.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-tic30.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-tic4x.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-tic54x.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-tic80.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-u68k.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-w65.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-we32k.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-x86_64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-z80.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-z8k.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff64-rs6000.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coffgen.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cofflink.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/corefile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-alpha.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-arc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-arm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-avr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-bfin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-cr16.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-cr16c.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-cris.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-crx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-d10v.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-d30v.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-dlx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-fr30.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-frv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-h8300.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-h8500.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-hppa.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-i370.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-i386.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-i860.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-i960.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-ia64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-ip2k.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-iq2000.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-k1om.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-l1om.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-lm32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-m10200.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-m10300.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-m32c.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-m32r.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-m68hc11.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-m68hc12.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-m68k.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-m88k.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-mcore.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-mep.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-microblaze.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-mips.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-mmix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-moxie.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-msp430.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-mt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-ns32k.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-openrisc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-or32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-pdp11.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-pj.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-powerpc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-rs6000.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-rx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-s390.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-score.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-sh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-sparc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-spu.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-tic30.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-tic4x.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-tic54x.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-tic6x.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-tic80.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-tilegx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-tilepro.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-v850.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-vax.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-w65.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-we32k.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-xc16x.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-xstormy16.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-xtensa.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-z80.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-z8k.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demo64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dwarf1.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dwarf2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecoff.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecofflink.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-attrs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-eh-frame.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-ifunc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-m10200.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-m10300.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-strtab.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-vxworks.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-am33lin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-arc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-arm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-avr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-bfin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-cr16.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-cr16c.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-cris.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-crx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-d10v.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-d30v.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-dlx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-fr30.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-frv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-gen.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-h8300.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-hppa.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-i370.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-i386.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-i860.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-i960.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-ia64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-ip2k.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-iq2000.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-lm32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-m32c.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-m32r.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-m68hc11.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-m68hc12.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-m68hc1x.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-m68k.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-m88k.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-mcore.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-mep.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-microblaze.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-mips.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-moxie.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-msp430.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-mt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-openrisc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-or32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-pj.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-ppc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-rx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-s390.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-score.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-score7.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-sh-symbian.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-sh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-sh64-com.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-sh64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-sparc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-spu.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-tic6x.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-tilegx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-tilepro.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-v850.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-vax.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-xc16x.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-xstormy16.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-xtensa.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-alpha.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-gen.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-hppa.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-ia64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-mips.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-mmix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-ppc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-s390.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-sh64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-sparc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-tilegx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64-x86-64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elflink.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elfn32-mips.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elfxx-ia64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elfxx-mips.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elfxx-sparc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elfxx-tilegx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epoc-pe-arm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epoc-pei-arm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/format.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hp300bsd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hp300hpux.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hpux-core.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386aout.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386bsd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386dynix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386freebsd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386linux.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386lynx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386mach3.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386msdos.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386netbsd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386os9k.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ieee.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ihex.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/irix-core.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbfd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linker.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lynx-core.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68k4knetbsd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68klinux.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68knetbsd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m88kmach3.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m88kopenbsd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mach-o-i386.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mach-o-x86-64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mach-o.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/merge.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mipsbsd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mmo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newsos3.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nlm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nlm32-alpha.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nlm32-i386.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nlm32-ppc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nlm32-sparc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nlm32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nlm64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ns32knetbsd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oasys.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opncls.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osf-core.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pc532-mach.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdp11.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe-arm-wince.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe-arm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe-i386.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe-mcore.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe-mips.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe-ppc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe-sh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe-x86_64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pef.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-arm-wince.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-arm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-i386.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-ia64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-mcore.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-mips.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-ppc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-sh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-x86_64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peigen.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pepigen.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pex64igen.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppcboot.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reloc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reloc16.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/riscix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rs6000-core.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sco5-core.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/section.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/som.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sparclinux.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sparclynx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sparcnetbsd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/srec.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stab-syms.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stabs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sunos.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/syms.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/targets.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tekhex.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trad-core.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vax1knetbsd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vaxbsd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vaxnetbsd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/verilog.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/versados.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vms-alpha.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vms-lib.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vms-misc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcofflink.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsym.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xtensa-isa.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xtensa-modules.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool config.lt
+install-bfdincludeHEADERS: $(bfdinclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bfdincludedir)" || $(MKDIR_P) "$(DESTDIR)$(bfdincludedir)"
+	@list='$(bfdinclude_HEADERS)'; test -n "$(bfdincludedir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(bfdincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(bfdincludedir)" || exit $$?; \
+	done
+
+uninstall-bfdincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bfdinclude_HEADERS)'; test -n "$(bfdincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bfdincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bfdincludedir)" && rm -f $$files
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-recursive
+all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) config.h
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(bfdlibdir)" "$(DESTDIR)$(bfdincludedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-recursive
+
+clean-am: clean-bfdlibLTLIBRARIES clean-generic clean-libtool \
+	clean-noinstLIBRARIES clean-noinstLTLIBRARIES mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-bfdincludeHEADERS install-bfdlibLTLIBRARIES
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-bfdincludeHEADERS uninstall-bfdlibLTLIBRARIES
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
+	ctags-recursive install install-am install-strip \
+	tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean \
+	clean-bfdlibLTLIBRARIES clean-generic clean-libtool \
+	clean-noinstLIBRARIES clean-noinstLTLIBRARIES ctags \
+	ctags-recursive distclean distclean-compile distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags dvi dvi-am html \
+	html-am info info-am install install-am \
+	install-bfdincludeHEADERS install-bfdlibLTLIBRARIES \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-bfdincludeHEADERS uninstall-bfdlibLTLIBRARIES
+
+
+####SRC_POTFILES = $(SOURCE_CFILES) $(SOURCE_HFILES)
+####BLD_POTFILES = $(BUILD_CFILES) $(BUILD_HFILES)
+
+####po/SRC-POTFILES.in: @MAINT@ Makefile $(SRC_POTFILES)
+####	for file in $(SRC_POTFILES); do echo $$file; done \
+####	  | LC_ALL=C sort > tmp.src \
+####	  && mv tmp.src $(srcdir)/po/SRC-POTFILES.in
+
+####po/BLD-POTFILES.in: @MAINT@ Makefile $(BLD_POTFILES)
+####	for file in $(BLD_POTFILES); do echo $$file; done \
+####	  | LC_ALL=C sort > tmp.bld \
+####	  && mv tmp.bld $(srcdir)/po/BLD-POTFILES.in
+
+all diststuff: info
+
+stamp-ofiles: Makefile
+	rm -f tofiles
+	f=""; \
+	for i in $(OFILES) ; do \
+	  case " $$f " in \
+	    *" $$i "*) ;; \
+	    *) f="$$f $$i" ;; \
+	  esac ; \
+	done ; \
+	echo $$f > tofiles
+	$(SHELL) $(srcdir)/../move-if-change tofiles ofiles
+	touch stamp-ofiles
+
+ofiles: stamp-ofiles ; @true
+
+stamp-lib: libbfd.la
+	libtooldir=`$(LIBTOOL) --config | sed -n -e 's/^objdir=//p'`; \
+	if [ -f $$libtooldir/libbfd.a ]; then \
+	  cp $$libtooldir/libbfd.a libbfd.tmp; \
+	  $(RANLIB) libbfd.tmp; \
+	  $(SHELL) $(srcdir)/../move-if-change libbfd.tmp libbfd.a; \
+	else true; fi
+	touch stamp-lib
+
+libbfd.a: stamp-lib ; @true
+
+# This file holds an array associating configuration triplets and
+# vector names.  It is built from config.bfd.  It is not compiled by
+# itself, but is included by targets.c.
+targmatch.h: config.bfd targmatch.sed
+	rm -f targmatch.h
+	sed -f $(srcdir)/targmatch.sed < $(srcdir)/config.bfd > targmatch.new
+	mv -f targmatch.new targmatch.h
+
+# When compiling archures.c and targets.c, supply the default target
+# info from configure.
+
+targets.lo: targets.c Makefile
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $(TDEFAULTS) $(srcdir)/targets.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='targets.c' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $(TDEFAULTS) $(srcdir)/targets.c
+
+archures.lo: archures.c Makefile
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $(TDEFAULTS) $(srcdir)/archures.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='archures.c' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $(TDEFAULTS) $(srcdir)/archures.c
+
+dwarf2.lo: dwarf2.c Makefile
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ -DDEBUGDIR=\"$(DEBUGDIR)\" $(srcdir)/dwarf2.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dwarf2.c' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ -DDEBUGDIR=\"$(DEBUGDIR)\" $(srcdir)/dwarf2.c
+
+elf32-target.h : elfxx-target.h
+	rm -f elf32-target.h
+	sed -e s/NN/32/g < $(srcdir)/elfxx-target.h > elf32-target.new
+	mv -f elf32-target.new elf32-target.h
+
+elf64-target.h : elfxx-target.h
+	rm -f elf64-target.h
+	sed -e s/NN/64/g < $(srcdir)/elfxx-target.h > elf64-target.new
+	mv -f elf64-target.new elf64-target.h
+
+elf32-ia64.c : elfnn-ia64.c
+	rm -f elf32-ia64.c
+	sed -e s/NN/32/g < $(srcdir)/elfnn-ia64.c > elf32-ia64.new
+	mv -f elf32-ia64.new elf32-ia64.c
+
+elf64-ia64.c : elfnn-ia64.c
+	rm -f elf64-ia64.c
+	sed -e s/NN/64/g < $(srcdir)/elfnn-ia64.c > elf64-ia64.new
+	mv -f elf64-ia64.new elf64-ia64.c
+
+peigen.c : peXXigen.c
+	rm -f peigen.c
+	sed -e s/XX/pe/g < $(srcdir)/peXXigen.c > peigen.new
+	mv -f peigen.new peigen.c
+
+pepigen.c : peXXigen.c
+	rm -f pepigen.c
+	sed -e s/XX/pep/g < $(srcdir)/peXXigen.c > pepigen.new
+	mv -f pepigen.new pepigen.c
+
+pex64igen.c: peXXigen.c
+	rm -f pex64igen.c
+	sed -e s/XX/pex64/g < $(srcdir)/peXXigen.c > pex64igen.new
+	mv -f pex64igen.new pex64igen.c
+$(BFD32_LIBS) \
+ $(BFD64_LIBS) \
+ $(ALL_MACHINES) \
+ $(BFD32_BACKENDS) \
+ $(BFD64_BACKENDS) \
+ $(OPTIONAL_BACKENDS): $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS)
+
+host-aout.lo: Makefile
+
+# The following program can be used to generate a simple config file
+# which can be folded into an h-XXX file for a new host, with some editing.
+aout-params.h: gen-aout
+	./gen-aout host > aout-params.h
+gen-aout: $(srcdir)/gen-aout.c Makefile
+	$(CC) -o gen-aout $(CFLAGS) $(LFLAGS) $(srcdir)/gen-aout.c
+
+$(BFD_H): stmp-bfd-h ; @true
+
+stmp-bfd-h: bfd-in3.h
+	rm -f bfd-tmp.h
+	cp bfd-in3.h bfd-tmp.h
+	$(SHELL) $(srcdir)/../move-if-change bfd-tmp.h $(BFD_H)
+	rm -f bfd-tmp.h
+	touch stmp-bfd-h
+
+# Could really use a "copy-if-change"...
+headers:
+	(cd $(bfddocdir); $(MAKE) protos $(FLAGS_TO_PASS))
+	cp $(bfddocdir)/bfd.h bfd-in2.h-new
+	$(SHELL) $(srcdir)/../move-if-change bfd-in2.h-new $(srcdir)/bfd-in2.h
+	cp $(bfddocdir)/libbfd.h libbfd.h-new
+	$(SHELL) $(srcdir)/../move-if-change libbfd.h-new $(srcdir)/libbfd.h
+	cp $(bfddocdir)/libcoff.h libcoff.h-new
+	$(SHELL) $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h
+
+# We only rebuild the header files automatically if we have been
+# configured with --enable-maintainer-mode.
+
+$(srcdir)/bfd-in2.h: @MAINT@ stmp-bin2-h ; @true
+stmp-bin2-h: $(BFD_H_FILES) $(BFD64_H_FILES)
+	(cd $(bfddocdir); $(MAKE) $(FLAGS_TO_PASS) bfd.h)
+	cp $(bfddocdir)/bfd.h bfd-in2.h-new
+	$(SHELL) $(srcdir)/../move-if-change bfd-in2.h-new $(srcdir)/bfd-in2.h
+	touch stmp-bin2-h
+
+$(srcdir)/libbfd.h: @MAINT@ stmp-lbfd-h ; @true
+stmp-lbfd-h: $(LIBBFD_H_FILES)
+	(cd $(bfddocdir); $(MAKE) $(FLAGS_TO_PASS) libbfd.h)
+	cp $(bfddocdir)/libbfd.h libbfd.h-new
+	$(SHELL) $(srcdir)/../move-if-change libbfd.h-new $(srcdir)/libbfd.h
+	touch stmp-lbfd-h
+
+$(srcdir)/libcoff.h: @MAINT@ stmp-lcoff-h ; @true
+stmp-lcoff-h: $(LIBCOFF_H_FILES)
+	(cd $(bfddocdir); $(MAKE) $(FLAGS_TO_PASS) libcoff.h)
+	cp $(bfddocdir)/libcoff.h libcoff.h-new
+	$(SHELL) $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h
+	touch stmp-lcoff-h
+
+bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in
+	@echo "creating $@"
+	@bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
+	bfd_version_string="\"$(VERSION)\"" ;\
+	bfd_soversion="$(VERSION)" ;\
+	bfd_version_package="\"$(PKGVERSION)\"" ;\
+	report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
+	if test "x$(RELEASE)" = x ; then \
+	  bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
+	  bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
+	  bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
+	fi ;\
+	sed -e "s,@bfd_version@,$$bfd_version," \
+	    -e "s,@bfd_version_string@,$$bfd_version_string," \
+	    -e "s,@bfd_version_package@,$$bfd_version_package," \
+	    -e "s,@report_bugs_to@,$$report_bugs_to," \
+	    < $(srcdir)/version.h > $@; \
+	echo "$${bfd_soversion}" > libtool-soversion
+
+# Disable -Werror, if it has been enabled, since coffswap.h won't
+# compile with gcc 4.5 and above.
+coff-tic4x.lo: coff-tic4x.c
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< $(NO_WERROR)
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $< $(NO_WERROR)
+
+coff-tic54x.lo: coff-tic54x.c
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< $(NO_WERROR)
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $< $(NO_WERROR)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/PORTING sdcc-3.2.0+dfsg/support/sdbinutils/bfd/PORTING
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/PORTING	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/PORTING	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,83 @@
+	Preliminary Notes on Porting BFD
+	--------------------------------
+
+The 'host' is the system a tool runs *on*.
+The 'target' is the system a tool runs *for*, i.e.
+a tool can read/write the binaries of the target.
+
+Porting to a new host
+---------------------
+Pick a name for your host. Call that <host>.
+(<host> might be sun4, ...)
+Create a file hosts/<host>.mh.
+
+Porting to a new target
+-----------------------
+Pick a name for your target. Call that <target>.
+Call the name for your CPU architecture <cpu>.
+You need to create <target>.c and config/<target>.mt,
+and add a case for it to a case statements in bfd/configure.host and
+bfd/config.bfd, which associates each canonical host type with a BFD
+host type (used as the base of the makefile fragment names), and to the
+table in bfd/configure.in which associates each target vector with
+the .o files it uses.
+
+config/<target>.mt is a Makefile fragment.
+The following is usually enough:
+DEFAULT_VECTOR=<target>_vec
+SELECT_ARCHITECTURES=bfd_<cpu>_arch
+
+See the list of cpu types in archures.c, or "ls cpu-*.c".
+If your architecture is new, you need to add it to the tables
+in bfd/archures.c, opcodes/configure.in, and binutils/objdump.c.
+
+For more information about .mt and .mh files, see config/README.
+
+The file <target>.c is the hard part.  It implements the
+bfd_target <target>_vec, which includes pointers to
+functions that do the actual <target>-specific methods.
+
+Porting to a <target> that uses the a.out binary format
+-------------------------------------------------------
+
+In this case, the include file aout-target.h probaby does most
+of what you need. The program gen-aout generates <target>.c for
+you automatically for many a.out systems.  Do:
+	make gen-aout
+	./gen-aout <target> > <target>.c
+(This only works if you are building on the target ("native").
+If you must make a cross-port from scratch, copy the most
+similar existing file that includes aout-target.h, and fix what is wrong.)
+
+Check the parameters in <target>.c, and fix anything that is wrong.
+(Also let us know about it; perhaps we can improve gen-aout.c.)
+
+TARGET_IS_BIG_ENDIAN_P
+	Should be defined if <target> is big-endian.
+
+N_HEADER_IN_TEXT(x)
+	See discussion in ../include/aout/aout64.h.
+
+BYTES_IN_WORD
+	Number of bytes per word. (Usually 4 but can be 8.)
+
+ARCH
+	Number of bits per word.  (Usually 32, but can be 64.)
+
+ENTRY_CAN_BE_ZERO
+	Define if the extry point (start address of an
+	executable program) can be 0x0.
+
+TEXT_START_ADDR
+	The address of the start of the text segemnt in
+	virtual memory.  Normally, the same as the entry point.
+
+TARGET_PAGE_SIZE
+
+SEGMENT_SIZE
+        Usually, the same as the TARGET_PAGE_SIZE.
+        Alignment needed for the data segment.
+
+TARGETNAME
+	The name of the target, for run-time lookups.
+	Usually "a.out-<target>"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/README sdcc-3.2.0+dfsg/support/sdbinutils/bfd/README
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/README	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/README	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,49 @@
+BFD is an object file library.  It permits applications to use the
+same routines to process object files regardless of their format.
+
+BFD is used by the GNU debugger, assembler, linker, and the binary
+utilities.
+
+The documentation on using BFD is scanty and may be occasionally
+incorrect.  Pointers to documentation problems, or an entirely
+rewritten manual, would be appreciated.
+
+There is some BFD internals documentation in doc/bfdint.texi which may
+help programmers who want to modify BFD.
+
+BFD is normally built as part of another package.  See the build
+instructions for that package, probably in a README file in the
+appropriate directory.
+
+BFD supports the following configure options:
+
+  --target=TARGET
+	The default target for which to build the library.  TARGET is
+	a configuration target triplet, such as sparc-sun-solaris.
+  --enable-targets=TARGET,TARGET,TARGET...
+	Additional targets the library should support.  To include
+	support for all known targets, use --enable-targets=all.
+  --enable-64-bit-bfd
+	Include support for 64 bit targets.  This is automatically
+	turned on if you explicitly request a 64 bit target, but not
+	for --enable-targets=all.  This requires a compiler with a 64
+	bit integer type, such as gcc.
+  --enable-shared
+	Build BFD as a shared library.
+  --with-mmap
+	Use mmap when accessing files.  This is faster on some hosts,
+	but slower on others.  It may not work on all hosts.
+
+Report bugs with BFD to bug-binutils@gnu.org.
+
+Patches are encouraged.  When sending patches, always send the output
+of diff -u or diff -c from the original file to the new file.  Do not
+send default diff output.  Do not make the diff from the new file to
+the original file.  Remember that any patch must not break other
+systems.  Remember that BFD must support cross compilation from any
+host to any target, so patches which use ``#ifdef HOST'' are not
+acceptable.  Please also read the ``Reporting Bugs'' section of the
+gcc manual.
+
+Bug reports without patches will be remembered, but they may never get
+fixed until somebody volunteers to fix them.
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/TODO sdcc-3.2.0+dfsg/support/sdbinutils/bfd/TODO
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/TODO	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/TODO	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,25 @@
+Things that still need to be done: -*- Text -*-
+
+ o - A source of space lossage is that all the target-dependent code
+     is in a single bfd_target structure.  Hence all the code for
+     *writing* object files is still pulled into all the applications
+     that only care about *reading* (gdb, nm, objdump), while gas has
+     to carry along all the unneeded baggage for reading objects.  And
+     so on.  This would be a substantial change, and the payoff would
+     not all that great (essentially none if bfd is used as a shared
+     library).
+
+ o - The storage needed by BFD data structures is also larger than strictly
+     needed.  This may be difficult to do much about.
+
+ o - implement bfd_abort, which should close the bfd but not alter the
+     filesystem.
+
+ o - update the bfd doc; write a how-to-write-a-backend doc, take out
+     the stupid quips and fill in all the blanks.
+
+ o - upgrade the reloc handling as per Steve's suggestion.
+
+
+
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/acinclude.m4 sdcc-3.2.0+dfsg/support/sdbinutils/bfd/acinclude.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/acinclude.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/acinclude.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,73 @@
+sinclude([../config/zlib.m4])
+
+dnl See whether we need to use fopen-bin.h rather than fopen-same.h.
+AC_DEFUN([BFD_BINARY_FOPEN],
+[AC_REQUIRE([AC_CANONICAL_TARGET])
+case "${host}" in
+changequote(,)dnl
+*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
+changequote([,])dnl
+  AC_DEFINE(USE_BINARY_FOPEN, 1, [Use b modifier when opening binary files?]) ;;
+esac])dnl
+
+dnl Get a default for CC_FOR_BUILD to put into Makefile.
+AC_DEFUN([BFD_CC_FOR_BUILD],
+[# Put a plausible default for CC_FOR_BUILD in Makefile.
+if test -z "$CC_FOR_BUILD"; then
+  if test "x$cross_compiling" = "xno"; then
+    CC_FOR_BUILD='$(CC)'
+  else
+    CC_FOR_BUILD=gcc
+  fi
+fi
+AC_SUBST(CC_FOR_BUILD)
+# Also set EXEEXT_FOR_BUILD.
+if test "x$cross_compiling" = "xno"; then
+  EXEEXT_FOR_BUILD='$(EXEEXT)'
+else
+  AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext,
+    [rm -f conftest*
+     echo 'int main () { return 0; }' > conftest.c
+     bfd_cv_build_exeext=
+     ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5
+     for file in conftest.*; do
+       case $file in
+       *.c | *.o | *.obj | *.ilk | *.pdb) ;;
+       *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;;
+       esac
+     done
+     rm -f conftest*
+     test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no])
+  EXEEXT_FOR_BUILD=""
+  test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
+fi
+AC_SUBST(EXEEXT_FOR_BUILD)])dnl
+
+AC_DEFUN([AM_INSTALL_LIBBFD],
+[AC_MSG_CHECKING([whether to install libbfd])
+  AC_ARG_ENABLE(install-libbfd,
+[  --enable-install-libbfd controls installation of libbfd and related headers],
+      install_libbfd_p=$enableval,
+      if test "${host}" = "${target}" || test "$enable_shared" = "yes"; then
+        install_libbfd_p=yes
+      else
+        install_libbfd_p=no
+      fi)
+  AC_MSG_RESULT($install_libbfd_p)
+  AM_CONDITIONAL(INSTALL_LIBBFD, test $install_libbfd_p = yes)
+  # Need _noncanonical variables for this.
+  ACX_NONCANONICAL_HOST
+  ACX_NONCANONICAL_TARGET
+  # libbfd.a is a host library containing target dependent code
+  bfdlibdir='$(libdir)'
+  bfdincludedir='$(includedir)'
+  if test "${host}" != "${target}"; then
+    bfdlibdir='$(exec_prefix)/$(host_noncanonical)/$(target_noncanonical)/lib'
+    bfdincludedir='$(exec_prefix)/$(host_noncanonical)/$(target_noncanonical)/include'
+  fi
+  AC_SUBST(bfdlibdir)
+  AM_SUBST_NOTMAKE(bfdlibdir)
+  AC_SUBST(bfdincludedir)
+  AM_SUBST_NOTMAKE(bfdincludedir)
+]
+)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aclocal.m4 sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aclocal.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aclocal.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aclocal.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,989 @@
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
+[m4_warning([this file was generated for autoconf 2.64.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.11'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.11.1], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 9
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 10
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+#serial 5
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[{
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 16
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.62])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+		  [_AM_DEPENDENCIES(CC)],
+		  [define([AC_PROG_CC],
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+		  [_AM_DEPENDENCIES(CXX)],
+		  [define([AC_PROG_CXX],
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+		  [_AM_DEPENDENCIES(OBJC)],
+		  [define([AC_PROG_OBJC],
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
+
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+AC_SUBST(install_sh)])
+
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 5
+
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
+# ----------------------------------
+# Control maintainer-specific portions of Makefiles.
+# Default is to disable them, unless `enable' is passed literally.
+# For symmetry, `disable' may be passed as well.  Anyway, the user
+# can override the default with the --enable/--disable switch.
+AC_DEFUN([AM_MAINTAINER_MODE],
+[m4_case(m4_default([$1], [disable]),
+       [enable], [m4_define([am_maintainer_other], [disable])],
+       [disable], [m4_define([am_maintainer_other], [enable])],
+       [m4_define([am_maintainer_other], [enable])
+        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+  AC_ARG_ENABLE([maintainer-mode],
+[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer],
+      [USE_MAINTAINER_MODE=$enableval],
+      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST([MAINT])dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 6
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 5
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
+m4_include([../config/acx.m4])
+m4_include([../config/depstand.m4])
+m4_include([../config/gettext-sister.m4])
+m4_include([../config/largefile.m4])
+m4_include([../config/lead-dot.m4])
+m4_include([../config/nls.m4])
+m4_include([../config/override.m4])
+m4_include([../config/plugins.m4])
+m4_include([../config/po.m4])
+m4_include([../config/progtest.m4])
+m4_include([../config/stdint.m4])
+m4_include([../libtool.m4])
+m4_include([../ltoptions.m4])
+m4_include([../ltsugar.m4])
+m4_include([../ltversion.m4])
+m4_include([../lt~obsolete.m4])
+m4_include([bfd.m4])
+m4_include([warning.m4])
+m4_include([acinclude.m4])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aix386-core.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aix386-core.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aix386-core.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aix386-core.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,273 @@
+/* BFD back-end for AIX on PS/2 core files.
+   This was based on trad-core.c, which was written by John Gilmore of
+        Cygnus Support.
+   Copyright 1988, 1989, 1991, 1992, 1993, 1994, 1996, 1998, 1999, 2000,
+   2001, 2002, 2004, 2005, 2006, 2007, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Minh Tran-Le <TRANLE@INTELLICORP.COM>.
+   Converted to back end form by Ian Lance Taylor <ian@cygnus.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "coff/i386.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+
+#include <signal.h>
+
+#if defined (_AIX) && defined (_I386)
+#define NOCHECKS		/* This is for coredump.h.  */
+#define _h_USER			/* Avoid including user.h from coredump.h.  */
+#include <uinfo.h>
+#include <sys/i386/coredump.h>
+#endif /* _AIX && _I386 */
+
+/* Maybe this could work on some other i386 but I have not tried it
+ * mtranle@paris - Tue Sep 24 12:49:35 1991
+ */
+
+#ifndef COR_MAGIC
+# define COR_MAGIC "core"
+#endif
+
+/* Need this cast because ptr is really void *.  */
+#define core_hdr(bfd) \
+    (((bfd->tdata.trad_core_data))->hdr)
+#define core_section(bfd,n) \
+    (((bfd)->tdata.trad_core_data)->sections[n])
+#define core_regsec(bfd) \
+    (((bfd)->tdata.trad_core_data)->reg_section)
+#define core_reg2sec(bfd) \
+    (((bfd)->tdata.trad_core_data)->reg2_section)
+
+/* These are stored in the bfd's tdata.  */
+struct trad_core_struct {
+  struct corehdr *hdr;		/* core file header */
+  asection *reg_section;
+  asection *reg2_section;
+  asection *sections[MAX_CORE_SEGS];
+};
+
+static void swap_abort PARAMS ((void));
+
+static const bfd_target *
+aix386_core_file_p (abfd)
+     bfd *abfd;
+{
+  int i, n;
+  unsigned char longbuf[4];	/* Raw bytes of various header fields */
+  bfd_size_type core_size = sizeof (struct corehdr);
+  bfd_size_type amt;
+  struct corehdr *core;
+  struct mergem {
+    struct trad_core_struct coredata;
+    struct corehdr internal_core;
+  } *mergem;
+  flagword flags;
+
+  amt = sizeof (longbuf);
+  if (bfd_bread ((PTR) longbuf, amt, abfd) != amt)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return 0;
+    }
+
+  if (strncmp (longbuf, COR_MAGIC, 4))
+    return 0;
+
+  if (bfd_seek (abfd, (file_ptr) 0, 0) != 0)
+    return 0;
+
+  amt = sizeof (struct mergem);
+  mergem = (struct mergem *) bfd_zalloc (abfd, amt);
+  if (mergem == NULL)
+    return 0;
+
+  core = &mergem->internal_core;
+
+  if ((bfd_bread ((PTR) core, core_size, abfd)) != core_size)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+    loser:
+      bfd_release (abfd, (char *) mergem);
+      abfd->tdata.any = NULL;
+      bfd_section_list_clear (abfd);
+      return 0;
+    }
+
+  set_tdata (abfd, &mergem->coredata);
+  core_hdr (abfd) = core;
+
+  /* Create the sections.  */
+  flags = SEC_HAS_CONTENTS;
+  core_regsec (abfd) = bfd_make_section_anyway_with_flags (abfd, ".reg",
+							   flags);
+  if (core_regsec (abfd) == NULL)
+    goto loser;
+
+  core_regsec (abfd)->size = sizeof (core->cd_regs);
+  core_regsec (abfd)->vma = (bfd_vma) -1;
+
+  /* We'll access the regs afresh in the core file, like any section.  */
+  core_regsec (abfd)->filepos =
+    (file_ptr) offsetof (struct corehdr, cd_regs[0]);
+
+  flags = SEC_HAS_CONTENTS;
+  core_reg2sec (abfd) = bfd_make_section_anyway_with_flags (abfd, ".reg2",
+							    flags);
+  if (core_reg2sec (abfd) == NULL)
+    /* bfd_release frees everything allocated after it's arg.  */
+    goto loser;
+
+  core_reg2sec (abfd)->size = sizeof (core->cd_fpregs);
+  core_reg2sec (abfd)->vma = (bfd_vma) -1;
+  core_reg2sec (abfd)->filepos =
+    (file_ptr) offsetof (struct corehdr, cd_fpregs);
+
+  for (i = 0, n = 0; (i < MAX_CORE_SEGS) && (core->cd_segs[i].cs_type); i++)
+    {
+      const char *sname;
+      flagword flags;
+
+      if (core->cd_segs[i].cs_offset == 0)
+	continue;
+
+      switch (core->cd_segs[i].cs_type)
+	{
+	case COR_TYPE_DATA:
+	  sname = ".data";
+	  flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
+	  break;
+	case COR_TYPE_STACK:
+	  sname = ".stack";
+	  flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
+	  break;
+	case COR_TYPE_LIBDATA:
+	  sname = ".libdata";
+	  flags = SEC_ALLOC + SEC_HAS_CONTENTS;
+	  break;
+	case COR_TYPE_WRITE:
+	  sname = ".writeable";
+	  flags = SEC_ALLOC + SEC_HAS_CONTENTS;
+	  break;
+	case COR_TYPE_MSC:
+	  sname = ".misc";
+	  flags = SEC_ALLOC + SEC_HAS_CONTENTS;
+	  break;
+	default:
+	  sname = ".unknown";
+	  flags = SEC_ALLOC + SEC_HAS_CONTENTS;
+	  break;
+	}
+      core_section (abfd, n) = bfd_make_section_anyway_with_flags (abfd,
+								   sname,
+								   flags);
+      if (core_section (abfd, n) == NULL)
+	goto loser;
+
+      core_section (abfd, n)->size = core->cd_segs[i].cs_len;
+      core_section (abfd, n)->vma       = core->cd_segs[i].cs_address;
+      core_section (abfd, n)->filepos   = core->cd_segs[i].cs_offset;
+      core_section (abfd, n)->alignment_power = 2;
+      n++;
+    }
+
+  return abfd->xvec;
+}
+
+static char *
+aix386_core_file_failing_command (abfd)
+     bfd *abfd;
+{
+  return core_hdr (abfd)->cd_comm;
+}
+
+static int
+aix386_core_file_failing_signal (abfd)
+     bfd *abfd;
+{
+  return core_hdr (abfd)->cd_cursig;
+}
+
+#define aix386_core_file_matches_executable_p generic_core_file_matches_executable_p
+
+#define aix386_core_file_pid _bfd_nocore_core_file_pid
+
+/* If somebody calls any byte-swapping routines, shoot them.  */
+
+static void
+swap_abort ()
+{
+  /* This way doesn't require any declaration for ANSI to fuck up.  */
+  abort ();
+}
+
+#define	NO_GET ((bfd_vma (*) (const void *)) swap_abort)
+#define	NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
+#define	NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
+#define	NO_GET64 ((bfd_uint64_t (*) (const void *)) swap_abort)
+#define	NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
+#define	NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
+
+const bfd_target aix386_core_vec = {
+  "aix386-core",
+  bfd_target_unknown_flavour,
+  BFD_ENDIAN_BIG,		/* target byte order */
+  BFD_ENDIAN_BIG,		/* target headers byte order */
+  (HAS_RELOC | EXEC_P |		/* object flags */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT),
+
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+  0,				/* leading underscore */
+  ' ',				/* ar_pad_char */
+  16,				/* ar_max_namelen */
+  0,				/* match priority.  */
+  NO_GET64, NO_GETS64, NO_PUT64,
+  NO_GET, NO_GETS, NO_PUT,
+  NO_GET, NO_GETS, NO_PUT,	/* data */
+  NO_GET64, NO_GETS64, NO_PUT64,
+  NO_GET, NO_GETS, NO_PUT,
+  NO_GET, NO_GETS, NO_PUT,	/* hdrs */
+
+  {_bfd_dummy_target, _bfd_dummy_target,
+   _bfd_dummy_target, aix386_core_file_p},
+  {bfd_false, bfd_false,	/* bfd_create_object */
+   bfd_false, bfd_false},
+  {bfd_false, bfd_false,	/* bfd_write_contents */
+   bfd_false, bfd_false},
+
+  BFD_JUMP_TABLE_GENERIC (_bfd_generic),
+  BFD_JUMP_TABLE_COPY (_bfd_generic),
+  BFD_JUMP_TABLE_CORE (aix386),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+  BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
+  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+  BFD_JUMP_TABLE_WRITE (_bfd_generic),
+  BFD_JUMP_TABLE_LINK (_bfd_nolink),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  (PTR) 0
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aix5ppc-core.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aix5ppc-core.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aix5ppc-core.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aix5ppc-core.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,358 @@
+/* IBM RS/6000 "XCOFF" back-end for BFD.
+   Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+   Free Software Foundation, Inc.
+   Written by Tom Rix
+   Contributed by Red Hat Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+
+const bfd_target *xcoff64_core_p (bfd *);
+bfd_boolean xcoff64_core_file_matches_executable_p (bfd *, bfd *);
+char *xcoff64_core_file_failing_command (bfd *);
+int xcoff64_core_file_failing_signal (bfd *);
+
+#ifdef AIX_5_CORE
+
+#include "libbfd.h"
+
+/* Aix 5.1 system include file.  */
+
+/* Need to define this macro so struct ld_info64 get included.  */
+#define __LDINFO_PTRACE64__
+#include <sys/ldr.h>
+#include <core.h>
+
+/* The default architecture and machine for matching core files.  */
+#define DEFAULT_ARCHITECTURE	bfd_arch_powerpc
+#define DEFAULT_MACHINE		bfd_mach_ppc_620
+
+#define	core_hdr(abfd)		((struct core_dumpxx *) abfd->tdata.any)
+
+#define CHECK_FILE_OFFSET(s, v) \
+  ((bfd_signed_vma)(v) < 0 || (bfd_signed_vma)(v) > (bfd_signed_vma)(s).st_size)
+
+const bfd_target *
+xcoff64_core_p (bfd *abfd)
+{
+  enum bfd_architecture arch;
+  unsigned long mach;
+  struct core_dumpxx core, *new_core_hdr;
+  struct stat statbuf;
+  asection *sec;
+  struct __ld_info64 ldinfo;
+  bfd_vma ld_offset;
+  bfd_size_type i;
+  struct vm_infox vminfo;
+  const bfd_target *return_value = NULL;
+  flagword flags;
+
+  /* Get the header.  */
+  if (bfd_seek (abfd, 0, SEEK_SET) != 0)
+    goto xcoff64_core_p_error;
+
+  if (sizeof (struct core_dumpxx)
+      != bfd_bread (&core, sizeof (struct core_dumpxx), abfd))
+    goto xcoff64_core_p_error;
+
+  if (bfd_stat (abfd, &statbuf) < 0)
+    goto xcoff64_core_p_error;
+
+  /* Sanity checks
+     c_flag has CORE_VERSION_1, Aix 4+
+     c_entries = 0 for Aix 4.3+
+     IS_PROC64 is a macro defined in procinfo.h, test for 64 bit process.
+
+     We will still be confused if a Aix 4.3 64 bit core file is
+     copied over to a Aix 5 machine.
+
+     Check file header offsets
+
+     See rs6000-core.c for comment on size of core
+     If there isn't enough of a real core file, bail.  */
+
+  if ((CORE_VERSION_1 != (core.c_flag & CORE_VERSION_1))
+      || (0 != core.c_entries)
+      || (! (IS_PROC64 (&core.c_u.U_proc)))
+      || ((CHECK_FILE_OFFSET (statbuf, core.c_fdsinfox)))
+      || ((CHECK_FILE_OFFSET (statbuf, core.c_loader)))
+      || ((CHECK_FILE_OFFSET (statbuf, core.c_loader + core.c_lsize)))
+      || ((CHECK_FILE_OFFSET (statbuf, core.c_thr)))
+      || ((CHECK_FILE_OFFSET (statbuf, core.c_segregion)))
+      || ((CHECK_FILE_OFFSET (statbuf, core.c_stack)))
+      || ((CHECK_FILE_OFFSET (statbuf, core.c_stack + core.c_size)))
+      || ((CHECK_FILE_OFFSET (statbuf, core.c_data)))
+      || ((CHECK_FILE_OFFSET (statbuf, core.c_data + core.c_datasize)))
+      || (! (core.c_flag & UBLOCK_VALID))
+      || (! (core.c_flag & LE_VALID)))
+    goto xcoff64_core_p_error;
+
+  /* Check for truncated stack or general truncating.  */
+  if ((! (core.c_flag & USTACK_VALID))
+      || (core.c_flag & CORE_TRUNC))
+    {
+      bfd_set_error (bfd_error_file_truncated);
+
+      return return_value;
+    }
+
+  new_core_hdr = bfd_zalloc (abfd, sizeof (struct core_dumpxx));
+  if (NULL == new_core_hdr)
+    return return_value;
+
+  memcpy (new_core_hdr, &core, sizeof (struct core_dumpxx));
+  /* The core_hdr() macro is no longer used here because it would
+     expand to code relying on gcc's cast-as-lvalue extension,
+     which was removed in gcc 4.0.  */
+  abfd->tdata.any = new_core_hdr;
+
+  /* .stack section.  */
+  flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;
+  sec = bfd_make_section_anyway_with_flags (abfd, ".stack", flags);
+  if (NULL == sec)
+    return return_value;
+
+  sec->size = core.c_size;
+  sec->vma = core.c_stackorg;
+  sec->filepos = core.c_stack;
+
+  /* .reg section for all registers.  */
+  flags = SEC_HAS_CONTENTS | SEC_IN_MEMORY;
+  sec = bfd_make_section_anyway_with_flags (abfd, ".reg", flags);
+  if (NULL == sec)
+    return return_value;
+
+  sec->size = sizeof (struct __context64);
+  sec->vma = 0;
+  sec->filepos = 0;
+  sec->contents = (bfd_byte *)&new_core_hdr->c_flt.r64;
+
+  /* .ldinfo section.
+     To actually find out how long this section is in this particular
+     core dump would require going down the whole list of struct
+     ld_info's.   See if we can just fake it.  */
+  flags = SEC_HAS_CONTENTS;
+  sec = bfd_make_section_anyway_with_flags (abfd, ".ldinfo", flags);
+  if (NULL == sec)
+    return return_value;
+
+  sec->size = core.c_lsize;
+  sec->vma = 0;
+  sec->filepos = core.c_loader;
+
+  /* AIX 4 adds data sections from loaded objects to the core file,
+     which can be found by examining ldinfo, and anonymously mmapped
+     regions.  */
+
+  /* .data section from executable.  */
+  flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;
+  sec = bfd_make_section_anyway_with_flags (abfd, ".data", flags);
+  if (NULL == sec)
+    return return_value;
+
+  sec->size = core.c_datasize;
+  sec->vma = core.c_dataorg;
+  sec->filepos = core.c_data;
+
+  /* .data sections from loaded objects.  */
+  ld_offset = core.c_loader;
+
+  while (1)
+    {
+      if (bfd_seek (abfd, ld_offset, SEEK_SET) != 0)
+	return return_value;
+
+      if (sizeof (struct __ld_info64) !=
+	  bfd_bread (&ldinfo, sizeof (struct __ld_info64), abfd))
+	return return_value;
+
+      if (ldinfo.ldinfo_core)
+	{
+	  flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;
+	  sec = bfd_make_section_anyway_with_flags (abfd, ".data", flags);
+	  if (NULL == sec)
+	    return return_value;
+
+	  sec->size = ldinfo.ldinfo_datasize;
+	  sec->vma = ldinfo.ldinfo_dataorg;
+	  sec->filepos = ldinfo.ldinfo_core;
+	}
+
+      if (0 == ldinfo.ldinfo_next)
+	break;
+      ld_offset += ldinfo.ldinfo_next;
+    }
+
+  /* .vmdata sections from anonymously mmapped regions.  */
+  if (core.c_vmregions)
+    {
+      if (bfd_seek (abfd, core.c_vmm, SEEK_SET) != 0)
+	return return_value;
+
+      for (i = 0; i < core.c_vmregions; i++)
+	if (sizeof (struct vm_infox) !=
+	    bfd_bread (&vminfo, sizeof (struct vm_infox), abfd))
+	  return return_value;
+
+      if (vminfo.vminfo_offset)
+	{
+	  flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;
+	  sec = bfd_make_section_anyway_with_flags (abfd, ".vmdata", flags);
+	  if (NULL == sec)
+	    return return_value;
+
+	  sec->size = vminfo.vminfo_size;
+	  sec->vma = vminfo.vminfo_addr;
+	  sec->filepos = vminfo.vminfo_offset;
+	}
+    }
+
+  /* Set the architecture and machine.  */
+  arch = DEFAULT_ARCHITECTURE;
+  mach = DEFAULT_MACHINE;
+  bfd_default_set_arch_mach (abfd, arch, mach);
+
+  return_value = (bfd_target *) abfd->xvec;	/* This is garbage for now.  */
+
+ xcoff64_core_p_error:
+  if (bfd_get_error () != bfd_error_system_call)
+    bfd_set_error (bfd_error_wrong_format);
+
+  return return_value;
+}
+
+/* Return `TRUE' if given core is from the given executable.  */
+
+bfd_boolean
+xcoff64_core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)
+{
+  struct core_dumpxx core;
+  char *path, *s;
+  size_t alloc;
+  const char *str1, *str2;
+  bfd_boolean return_value = FALSE;
+
+  /* Get the header.  */
+  if (bfd_seek (core_bfd, 0, SEEK_SET) != 0)
+    return return_value;
+
+  if (sizeof (struct core_dumpxx) !=
+      bfd_bread (&core, sizeof (struct core_dumpxx), core_bfd))
+    return return_value;
+
+  if (bfd_seek (core_bfd, core.c_loader, SEEK_SET) != 0)
+    return return_value;
+
+  alloc = 100;
+  path = bfd_malloc (alloc);
+  if (path == NULL)
+    return return_value;
+
+  s = path;
+
+  while (1)
+    {
+      if (bfd_bread (s, 1, core_bfd) != 1)
+	goto xcoff64_core_file_matches_executable_p_end_1;
+
+      if (*s == '\0')
+	break;
+      ++s;
+      if (s == path + alloc)
+	{
+	  char *n;
+
+	  alloc *= 2;
+	  n = bfd_realloc (path, alloc);
+	  if (n == NULL)
+	    goto xcoff64_core_file_matches_executable_p_end_1;
+
+	  s = n + (path - s);
+	  path = n;
+	}
+    }
+
+  str1 = strrchr (path, '/');
+  str2 = strrchr (exec_bfd->filename, '/');
+
+  /* Step over character '/'.  */
+  str1 = str1 != NULL ? str1 + 1 : path;
+  str2 = str2 != NULL ? str2 + 1 : exec_bfd->filename;
+
+  if (strcmp (str1, str2) == 0)
+    return_value = TRUE;
+
+ xcoff64_core_file_matches_executable_p_end_1:
+  free (path);
+  return return_value;
+}
+
+char *
+xcoff64_core_file_failing_command (bfd *abfd)
+{
+  struct core_dumpxx *c = core_hdr (abfd);
+  char *return_value = 0;
+
+  if (NULL != c)
+    return_value = c->c_u.U_proc.pi_comm;
+
+  return return_value;
+}
+
+int
+xcoff64_core_file_failing_signal (bfd *abfd)
+{
+  struct core_dumpxx *c = core_hdr (abfd);
+  int return_value = 0;
+
+  if (NULL != c)
+    return_value = c->c_signo;
+
+  return return_value;
+}
+
+#else /* AIX_5_CORE */
+
+const bfd_target *
+xcoff64_core_p (bfd *abfd ATTRIBUTE_UNUSED)
+{
+  bfd_set_error (bfd_error_wrong_format);
+  return 0;
+}
+
+bfd_boolean
+xcoff64_core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)
+{
+  return generic_core_file_matches_executable_p (core_bfd, exec_bfd);
+}
+
+char *
+xcoff64_core_file_failing_command (bfd *abfd ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+int
+xcoff64_core_file_failing_signal (bfd *abfd ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+#endif /* AIX_5_CORE */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aout-adobe.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aout-adobe.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aout-adobe.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aout-adobe.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,520 @@
+/* BFD back-end for a.out.adobe binaries.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2011
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.  Based on bout.c.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "aout/adobe.h"
+#include "aout/stab_gnu.h"
+#include "libaout.h"		/* BFD a.out internal data structures.  */
+
+/* Forward decl.  */
+extern const bfd_target a_out_adobe_vec;
+
+/* Swaps the information in an executable header taken from a raw byte
+   stream memory image, into the internal exec_header structure.  */
+
+static void
+aout_adobe_swap_exec_header_in (bfd *abfd,
+				struct external_exec *bytes,
+				struct internal_exec *execp)
+{
+  /* Now fill in fields in the execp, from the bytes in the raw data.  */
+  execp->a_info   = H_GET_32 (abfd, bytes->e_info);
+  execp->a_text   = GET_WORD (abfd, bytes->e_text);
+  execp->a_data   = GET_WORD (abfd, bytes->e_data);
+  execp->a_bss    = GET_WORD (abfd, bytes->e_bss);
+  execp->a_syms   = GET_WORD (abfd, bytes->e_syms);
+  execp->a_entry  = GET_WORD (abfd, bytes->e_entry);
+  execp->a_trsize = GET_WORD (abfd, bytes->e_trsize);
+  execp->a_drsize = GET_WORD (abfd, bytes->e_drsize);
+}
+
+/* Swaps the information in an internal exec header structure into the
+   supplied buffer ready for writing to disk.  */
+
+static void
+aout_adobe_swap_exec_header_out (bfd *abfd,
+				 struct internal_exec *execp,
+				 struct external_exec *bytes)
+{
+  /* Now fill in fields in the raw data, from the fields in the exec
+     struct.  */
+  H_PUT_32 (abfd, execp->a_info  , bytes->e_info);
+  PUT_WORD (abfd, execp->a_text  , bytes->e_text);
+  PUT_WORD (abfd, execp->a_data  , bytes->e_data);
+  PUT_WORD (abfd, execp->a_bss   , bytes->e_bss);
+  PUT_WORD (abfd, execp->a_syms  , bytes->e_syms);
+  PUT_WORD (abfd, execp->a_entry , bytes->e_entry);
+  PUT_WORD (abfd, execp->a_trsize, bytes->e_trsize);
+  PUT_WORD (abfd, execp->a_drsize, bytes->e_drsize);
+}
+
+/* Finish up the opening of a b.out file for reading.  Fill in all the
+   fields that are not handled by common code.  */
+
+static const bfd_target *
+aout_adobe_callback (bfd *abfd)
+{
+  struct internal_exec *execp = exec_hdr (abfd);
+  asection *sect;
+  struct external_segdesc ext[1];
+  char *section_name;
+  char try_again[30];	/* Name and number.  */
+  char *newname;
+  int trynum;
+  flagword flags;
+
+  /* Architecture and machine type -- unknown in this format.  */
+  bfd_set_arch_mach (abfd, bfd_arch_unknown, 0L);
+
+  /* The positions of the string table and symbol table.  */
+  obj_str_filepos (abfd) = N_STROFF (*execp);
+  obj_sym_filepos (abfd) = N_SYMOFF (*execp);
+
+  /* Suck up the section information from the file, one section at a time.  */
+  for (;;)
+    {
+      bfd_size_type amt = sizeof (*ext);
+      if (bfd_bread ( ext, amt, abfd) != amt)
+	{
+	  if (bfd_get_error () != bfd_error_system_call)
+	    bfd_set_error (bfd_error_wrong_format);
+
+	  return NULL;
+	}
+      switch (ext->e_type[0])
+	{
+	case N_TEXT:
+	  section_name = ".text";
+	  flags = SEC_CODE | SEC_LOAD | SEC_ALLOC | SEC_HAS_CONTENTS;
+	  break;
+
+	case N_DATA:
+	  section_name = ".data";
+	  flags = SEC_DATA | SEC_LOAD | SEC_ALLOC | SEC_HAS_CONTENTS;
+	  break;
+
+	case N_BSS:
+	  section_name = ".bss";
+	  flags = SEC_DATA | SEC_HAS_CONTENTS;
+	  break;
+
+	case 0:
+	  goto no_more_sections;
+
+	default:
+	  (*_bfd_error_handler)
+	    (_("%B: Unknown section type in a.out.adobe file: %x\n"),
+	     abfd, ext->e_type[0]);
+	  goto no_more_sections;
+	}
+
+      /* First one is called ".text" or whatever; subsequent ones are
+	 ".text1", ".text2", ...  */
+      bfd_set_error (bfd_error_no_error);
+      sect = bfd_make_section_with_flags (abfd, section_name, flags);
+      trynum = 0;
+
+      while (!sect)
+	{
+	  if (bfd_get_error () != bfd_error_no_error)
+	    /* Some other error -- slide into the sunset.  */
+	    return NULL;
+	  sprintf (try_again, "%s%d", section_name, ++trynum);
+	  sect = bfd_make_section_with_flags (abfd, try_again, flags);
+	}
+
+      /* Fix the name, if it is a sprintf'd name.  */
+      if (sect->name == try_again)
+	{
+	  amt = strlen (sect->name);
+	  newname = bfd_zalloc (abfd, amt);
+	  if (newname == NULL)
+	    return NULL;
+	  strcpy (newname, sect->name);
+	  sect->name = newname;
+	}
+
+      /* Assumed big-endian.  */
+      sect->size = ((ext->e_size[0] << 8)
+		    | ext->e_size[1] << 8
+		    | ext->e_size[2]);
+      sect->vma = H_GET_32 (abfd, ext->e_virtbase);
+      sect->filepos = H_GET_32 (abfd, ext->e_filebase);
+      /* FIXME XXX alignment?  */
+
+      /* Set relocation information for first section of each type.  */
+      if (trynum == 0)
+	switch (ext->e_type[0])
+	  {
+	  case N_TEXT:
+	    sect->rel_filepos = N_TRELOFF (*execp);
+	    sect->reloc_count = execp->a_trsize;
+	    break;
+
+	  case N_DATA:
+	    sect->rel_filepos = N_DRELOFF (*execp);
+	    sect->reloc_count = execp->a_drsize;
+	    break;
+
+	  default:
+	    break;
+	  }
+    }
+ no_more_sections:
+
+  adata (abfd).reloc_entry_size = sizeof (struct reloc_std_external);
+  adata (abfd).symbol_entry_size = sizeof (struct external_nlist);
+  adata (abfd).page_size = 1; /* Not applicable.  */
+  adata (abfd).segment_size = 1; /* Not applicable.  */
+  adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
+
+  return abfd->xvec;
+}
+
+static const bfd_target *
+aout_adobe_object_p (bfd *abfd)
+{
+  struct internal_exec anexec;
+  struct external_exec exec_bytes;
+  char *targ;
+  bfd_size_type amt = EXEC_BYTES_SIZE;
+
+  if (bfd_bread (& exec_bytes, amt, abfd) != amt)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  anexec.a_info = H_GET_32 (abfd, exec_bytes.e_info);
+
+  /* Normally we just compare for the magic number.
+     However, a bunch of Adobe tools aren't fixed up yet; they generate
+     files using ZMAGIC(!).
+     If the environment variable GNUTARGET is set to "a.out.adobe", we will
+     take just about any a.out file as an Adobe a.out file.  FIXME!  */
+
+  if (N_BADMAG (anexec))
+    {
+      targ = getenv ("GNUTARGET");
+      if (targ && !strcmp (targ, a_out_adobe_vec.name))
+	/* Just continue anyway, if specifically set to this format.  */
+	;
+      else
+	{
+	  bfd_set_error (bfd_error_wrong_format);
+	  return NULL;
+	}
+    }
+
+  aout_adobe_swap_exec_header_in (abfd, &exec_bytes, &anexec);
+  return aout_32_some_aout_object_p (abfd, &anexec, aout_adobe_callback);
+}
+
+struct bout_data_struct
+{
+  struct aoutdata a;
+  struct internal_exec e;
+};
+
+static bfd_boolean
+aout_adobe_mkobject (bfd *abfd)
+{
+  struct bout_data_struct *rawptr;
+  bfd_size_type amt = sizeof (struct bout_data_struct);
+
+  rawptr = bfd_zalloc (abfd, amt);
+  if (rawptr == NULL)
+    return FALSE;
+
+  abfd->tdata.bout_data = rawptr;
+  exec_hdr (abfd) = &rawptr->e;
+
+  adata (abfd).reloc_entry_size = sizeof (struct reloc_std_external);
+  adata (abfd).symbol_entry_size = sizeof (struct external_nlist);
+  adata (abfd).page_size = 1; /* Not applicable.  */
+  adata (abfd).segment_size = 1; /* Not applicable.  */
+  adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
+
+  return TRUE;
+}
+
+static void
+aout_adobe_write_section (bfd *abfd ATTRIBUTE_UNUSED,
+			  sec_ptr sect ATTRIBUTE_UNUSED)
+{
+  /* FIXME XXX.  */
+}
+
+static bfd_boolean
+aout_adobe_write_object_contents (bfd *abfd)
+{
+  struct external_exec swapped_hdr;
+  static struct external_segdesc sentinel[1];	/* Initialized to zero.  */
+  asection *sect;
+  bfd_size_type amt;
+
+  exec_hdr (abfd)->a_info = ZMAGIC;
+
+  /* Calculate text size as total of text sections, etc.  */
+  exec_hdr (abfd)->a_text = 0;
+  exec_hdr (abfd)->a_data = 0;
+  exec_hdr (abfd)->a_bss  = 0;
+  exec_hdr (abfd)->a_trsize = 0;
+  exec_hdr (abfd)->a_drsize = 0;
+
+  for (sect = abfd->sections; sect; sect = sect->next)
+    {
+      if (sect->flags & SEC_CODE)
+	{
+	  exec_hdr (abfd)->a_text += sect->size;
+	  exec_hdr (abfd)->a_trsize += sect->reloc_count *
+	    sizeof (struct reloc_std_external);
+	}
+      else if (sect->flags & SEC_DATA)
+	{
+	  exec_hdr (abfd)->a_data += sect->size;
+	  exec_hdr (abfd)->a_drsize += sect->reloc_count *
+	    sizeof (struct reloc_std_external);
+	}
+      else if (sect->flags & SEC_ALLOC && !(sect->flags & SEC_LOAD))
+	exec_hdr (abfd)->a_bss += sect->size;
+    }
+
+  exec_hdr (abfd)->a_syms = bfd_get_symcount (abfd)
+    * sizeof (struct external_nlist);
+  exec_hdr (abfd)->a_entry = bfd_get_start_address (abfd);
+
+  aout_adobe_swap_exec_header_out (abfd, exec_hdr (abfd), &swapped_hdr);
+
+  amt = EXEC_BYTES_SIZE;
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
+      || bfd_bwrite (& swapped_hdr, amt, abfd) != amt)
+    return FALSE;
+
+  /* Now write out the section information.  Text first, data next, rest
+     afterward.  */
+  for (sect = abfd->sections; sect; sect = sect->next)
+    if (sect->flags & SEC_CODE)
+      aout_adobe_write_section (abfd, sect);
+
+  for (sect = abfd->sections; sect; sect = sect->next)
+    if (sect->flags & SEC_DATA)
+      aout_adobe_write_section (abfd, sect);
+
+  for (sect = abfd->sections; sect; sect = sect->next)
+    if (!(sect->flags & (SEC_CODE | SEC_DATA)))
+      aout_adobe_write_section (abfd, sect);
+
+  /* Write final `sentinel` section header (with type of 0).  */
+  amt = sizeof (*sentinel);
+  if (bfd_bwrite (sentinel, amt, abfd) != amt)
+    return FALSE;
+
+  /* Now write out reloc info, followed by syms and strings.  */
+  if (bfd_get_symcount (abfd) != 0)
+    {
+      if (bfd_seek (abfd, (file_ptr) (N_SYMOFF (*exec_hdr (abfd))), SEEK_SET)
+	  != 0)
+	return FALSE;
+
+      if (! aout_32_write_syms (abfd))
+	return FALSE;
+
+      if (bfd_seek (abfd, (file_ptr) (N_TRELOFF (*exec_hdr (abfd))), SEEK_SET)
+	  != 0)
+	return FALSE;
+
+      for (sect = abfd->sections; sect; sect = sect->next)
+	if (sect->flags & SEC_CODE)
+	  if (!aout_32_squirt_out_relocs (abfd, sect))
+	    return FALSE;
+
+      if (bfd_seek (abfd, (file_ptr) (N_DRELOFF (*exec_hdr (abfd))), SEEK_SET)
+	  != 0)
+	return FALSE;
+
+      for (sect = abfd->sections; sect; sect = sect->next)
+	if (sect->flags & SEC_DATA)
+	  if (!aout_32_squirt_out_relocs (abfd, sect))
+	    return FALSE;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+aout_adobe_set_section_contents (bfd *abfd,
+				 asection *section,
+				 const void * location,
+				 file_ptr offset,
+				 bfd_size_type count)
+{
+  file_ptr section_start;
+  sec_ptr sect;
+
+  /* Set by bfd.c handler.  */
+  if (! abfd->output_has_begun)
+    {
+      /* Assign file offsets to sections.  Text sections are first, and
+	 are contiguous.  Then data sections.  Everything else at the end.  */
+      section_start = N_TXTOFF (ignore<-->me);
+
+      for (sect = abfd->sections; sect; sect = sect->next)
+	{
+	  if (sect->flags & SEC_CODE)
+	    {
+	      sect->filepos = section_start;
+	      /* FIXME:  Round to alignment.  */
+	      section_start += sect->size;
+	    }
+	}
+
+      for (sect = abfd->sections; sect; sect = sect->next)
+	{
+	  if (sect->flags & SEC_DATA)
+	    {
+	      sect->filepos = section_start;
+	      /* FIXME:  Round to alignment.  */
+	      section_start += sect->size;
+	    }
+	}
+
+      for (sect = abfd->sections; sect; sect = sect->next)
+	{
+	  if (sect->flags & SEC_HAS_CONTENTS &&
+	      !(sect->flags & (SEC_CODE | SEC_DATA)))
+	    {
+	      sect->filepos = section_start;
+	      /* FIXME:  Round to alignment.  */
+	      section_start += sect->size;
+	    }
+	}
+    }
+
+  /* Regardless, once we know what we're doing, we might as well get
+     going.  */
+  if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0)
+    return FALSE;
+
+  if (count == 0)
+    return TRUE;
+
+  return bfd_bwrite (location, count, abfd) == count;
+}
+
+static bfd_boolean
+aout_adobe_set_arch_mach (bfd *abfd,
+			  enum bfd_architecture arch,
+			  unsigned long machine)
+{
+  if (! bfd_default_set_arch_mach (abfd, arch, machine))
+    return FALSE;
+
+  if (arch == bfd_arch_unknown
+      || arch == bfd_arch_m68k)
+    return TRUE;
+
+  return FALSE;
+}
+
+static int
+aout_adobe_sizeof_headers (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+			   struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return sizeof (struct internal_exec);
+}
+
+/* Build the transfer vector for Adobe A.Out files.  */
+
+#define aout_32_bfd_make_debug_symbol ((asymbol *(*) (bfd *, void *, unsigned long)) bfd_nullvoidptr)
+#define aout_32_bfd_reloc_type_lookup ((reloc_howto_type *(*) (bfd *, bfd_reloc_code_real_type)) bfd_nullvoidptr)
+#define aout_32_bfd_reloc_name_lookup ((reloc_howto_type *(*) (bfd *, const char *)) bfd_nullvoidptr)
+#define aout_32_close_and_cleanup                   aout_32_bfd_free_cached_info
+#define	aout_32_set_arch_mach		            aout_adobe_set_arch_mach
+#define	aout_32_set_section_contents	            aout_adobe_set_section_contents
+#define	aout_32_sizeof_headers		            aout_adobe_sizeof_headers
+#define aout_32_bfd_get_relocated_section_contents  bfd_generic_get_relocated_section_contents
+#define aout_32_get_section_contents_in_window      _bfd_generic_get_section_contents_in_window
+#define aout_32_bfd_relax_section                   bfd_generic_relax_section
+#define aout_32_bfd_gc_sections                     bfd_generic_gc_sections
+#define aout_32_bfd_lookup_section_flags	    bfd_generic_lookup_section_flags
+#define aout_32_bfd_merge_sections	            bfd_generic_merge_sections
+#define aout_32_bfd_is_group_section	            bfd_generic_is_group_section
+#define aout_32_bfd_discard_group	            bfd_generic_discard_group
+#define aout_32_section_already_linked              _bfd_generic_section_already_linked
+#define aout_32_bfd_define_common_symbol            bfd_generic_define_common_symbol
+#define aout_32_bfd_link_hash_table_create          _bfd_generic_link_hash_table_create
+#define aout_32_bfd_link_hash_table_free            _bfd_generic_link_hash_table_free
+#define aout_32_bfd_link_add_symbols	            _bfd_generic_link_add_symbols
+#define aout_32_bfd_link_just_syms	            _bfd_generic_link_just_syms
+#define aout_32_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define aout_32_bfd_final_link		            _bfd_generic_final_link
+#define aout_32_bfd_link_split_section	            _bfd_generic_link_split_section
+
+const bfd_target a_out_adobe_vec =
+{
+  "a.out.adobe",		/* Name.  */
+  bfd_target_aout_flavour,
+  BFD_ENDIAN_BIG,		/* Data byte order is unknown (big assumed).  */
+  BFD_ENDIAN_BIG,		/* Header byte order is big.  */
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT ),
+  /* section flags */
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_DATA | SEC_RELOC),
+  '_',				/* Symbol leading char.  */
+  ' ',				/* AR_pad_char.  */
+  16,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
+
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Data.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Headers.  */
+
+  {_bfd_dummy_target, aout_adobe_object_p,	/* bfd_check_format.  */
+   bfd_generic_archive_p, _bfd_dummy_target},
+  {bfd_false, aout_adobe_mkobject,		/* bfd_set_format.  */
+   _bfd_generic_mkarchive, bfd_false},
+  {bfd_false, aout_adobe_write_object_contents,/* bfd_write_contents.  */
+   _bfd_write_archive_contents, bfd_false},
+
+  BFD_JUMP_TABLE_GENERIC (aout_32),
+  BFD_JUMP_TABLE_COPY (_bfd_generic),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd),
+  BFD_JUMP_TABLE_SYMBOLS (aout_32),
+  BFD_JUMP_TABLE_RELOCS (aout_32),
+  BFD_JUMP_TABLE_WRITE (aout_32),
+  BFD_JUMP_TABLE_LINK (aout_32),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  NULL
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aout-arm.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aout-arm.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aout-arm.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aout-arm.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,549 @@
+/* BFD back-end for raw ARM a.out binaries.
+   Copyright 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005,
+   2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+
+/* Avoid multiple definitions from aoutx if supporting standard a.out
+   as well as our own.  */
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define NAME(x,y) CONCAT3 (aoutarm,_32_,y)
+
+#define N_TXTADDR(x)						\
+  ((N_MAGIC (x) == NMAGIC)					\
+   ? (bfd_vma) 0x8000						\
+   : ((N_MAGIC (x) != ZMAGIC)					\
+      ? (bfd_vma) 0						\
+      : ((N_SHARED_LIB (x))					\
+	 ? ((x).a_entry & ~(bfd_vma) (TARGET_PAGE_SIZE - 1))	\
+	 : (bfd_vma) TEXT_START_ADDR)))
+
+#define TEXT_START_ADDR 0x8000
+#define TARGET_PAGE_SIZE 0x8000
+#define SEGMENT_SIZE TARGET_PAGE_SIZE
+#define DEFAULT_ARCH bfd_arch_arm
+
+#define MY(OP) CONCAT2 (aoutarm_,OP)
+#define N_BADMAG(x) ((((x).a_info & ~007200) != ZMAGIC) && \
+                     (((x).a_info & ~006000) != OMAGIC) && \
+                     ((x).a_info != NMAGIC))
+#define N_MAGIC(x) ((x).a_info & ~07200)
+
+#define MY_bfd_reloc_type_lookup aoutarm_bfd_reloc_type_lookup
+#define MY_bfd_reloc_name_lookup aoutarm_bfd_reloc_name_lookup
+
+#include "libaout.h"
+#include "aout/aout64.h"
+
+
+static bfd_reloc_status_type
+  MY (fix_pcrel_26) (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type
+  MY (fix_pcrel_26_done) (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+
+reloc_howto_type MY (howto_table)[] =
+{
+  /* Type rs size bsz pcrel bitpos ovrf sf name part_inpl
+     readmask setmask pcdone.  */
+  HOWTO (0, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, 0, "8", TRUE,
+	 0x000000ff, 0x000000ff, FALSE),
+  HOWTO (1, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, 0, "16", TRUE,
+	 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (2, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, 0, "32", TRUE,
+	 0xffffffff, 0xffffffff, FALSE),
+  HOWTO (3, 2, 2, 26, TRUE, 0, complain_overflow_signed, MY (fix_pcrel_26),
+	 "ARM26", TRUE, 0x00ffffff, 0x00ffffff, TRUE),
+  HOWTO (4, 0, 0, 8, TRUE, 0, complain_overflow_signed, 0, "DISP8", TRUE,
+	 0x000000ff, 0x000000ff, TRUE),
+  HOWTO (5, 0, 1, 16, TRUE, 0, complain_overflow_signed, 0, "DISP16", TRUE,
+	 0x0000ffff, 0x0000ffff, TRUE),
+  HOWTO (6, 0, 2, 32, TRUE, 0, complain_overflow_signed, 0, "DISP32", TRUE,
+	 0xffffffff, 0xffffffff, TRUE),
+  HOWTO (7, 2, 2, 26, FALSE, 0, complain_overflow_signed,
+	 MY (fix_pcrel_26_done), "ARM26D", TRUE, 0x0, 0x0,
+	 FALSE),
+  EMPTY_HOWTO (-1),
+  HOWTO (9, 0, -1, 16, FALSE, 0, complain_overflow_bitfield, 0, "NEG16", TRUE,
+	 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (10, 0, -2, 32, FALSE, 0, complain_overflow_bitfield, 0, "NEG32", TRUE,
+	 0xffffffff, 0xffffffff, FALSE)
+};
+
+#define RELOC_ARM_BITS_NEG_BIG      ((unsigned int) 0x08)
+#define RELOC_ARM_BITS_NEG_LITTLE   ((unsigned int) 0x10)
+
+static reloc_howto_type *
+MY (reloc_howto) (bfd *abfd,
+		  struct reloc_std_external *rel,
+		  int *r_index,
+		  int *r_extern,
+		  int *r_pcrel)
+{
+  unsigned int r_length;
+  unsigned int r_pcrel_done;
+  unsigned int r_neg;
+  int howto_index;
+
+  *r_pcrel = 0;
+  if (bfd_header_big_endian (abfd))
+    {
+      *r_index     =  ((rel->r_index[0] << 16)
+		       | (rel->r_index[1] << 8)
+		       | rel->r_index[2]);
+      *r_extern    = (0 != (rel->r_type[0] & RELOC_STD_BITS_EXTERN_BIG));
+      r_pcrel_done = (0 != (rel->r_type[0] & RELOC_STD_BITS_PCREL_BIG));
+      r_neg 	   = (0 != (rel->r_type[0] & RELOC_ARM_BITS_NEG_BIG));
+      r_length     = ((rel->r_type[0] & RELOC_STD_BITS_LENGTH_BIG)
+		      >> RELOC_STD_BITS_LENGTH_SH_BIG);
+    }
+  else
+    {
+      *r_index     = ((rel->r_index[2] << 16)
+		      | (rel->r_index[1] << 8)
+		      | rel->r_index[0]);
+      *r_extern    = (0 != (rel->r_type[0] & RELOC_STD_BITS_EXTERN_LITTLE));
+      r_pcrel_done = (0 != (rel->r_type[0] & RELOC_STD_BITS_PCREL_LITTLE));
+      r_neg 	   = (0 != (rel->r_type[0] & RELOC_ARM_BITS_NEG_LITTLE));
+      r_length     = ((rel->r_type[0] & RELOC_STD_BITS_LENGTH_LITTLE)
+		      >> RELOC_STD_BITS_LENGTH_SH_LITTLE);
+    }
+  howto_index = r_length + 4 * r_pcrel_done + 8 * r_neg;
+  if (howto_index == 3)
+    *r_pcrel = 1;
+
+  return MY (howto_table) + howto_index;
+}
+
+#define MY_reloc_howto(BFD, REL, IN, EX, PC) \
+	MY (reloc_howto) (BFD, REL, &IN, &EX, &PC)
+
+static void
+MY (put_reloc) (bfd *abfd,
+		int r_extern,
+		int r_index,
+		bfd_vma value,
+		reloc_howto_type *howto,
+		struct reloc_std_external *reloc)
+{
+  unsigned int r_length;
+  int r_pcrel;
+  int r_neg;
+
+  PUT_WORD (abfd, value, reloc->r_address);
+  /* Size as a power of two.  */
+  r_length = howto->size;
+
+  /* Special case for branch relocations.  */
+  if (howto->type == 3 || howto->type == 7)
+    r_length = 3;
+
+  r_pcrel  = howto->type & 4; 	/* PC Relative done?  */
+  r_neg = howto->type & 8;	/* Negative relocation.  */
+
+  if (bfd_header_big_endian (abfd))
+    {
+      reloc->r_index[0] = r_index >> 16;
+      reloc->r_index[1] = r_index >> 8;
+      reloc->r_index[2] = r_index;
+      reloc->r_type[0] =
+	((r_extern ?     RELOC_STD_BITS_EXTERN_BIG : 0)
+	 | (r_pcrel ?    RELOC_STD_BITS_PCREL_BIG : 0)
+	 | (r_neg ?	 RELOC_ARM_BITS_NEG_BIG : 0)
+	 | (r_length <<  RELOC_STD_BITS_LENGTH_SH_BIG));
+    }
+  else
+    {
+      reloc->r_index[2] = r_index >> 16;
+      reloc->r_index[1] = r_index >> 8;
+      reloc->r_index[0] = r_index;
+      reloc->r_type[0] =
+	((r_extern ?     RELOC_STD_BITS_EXTERN_LITTLE : 0)
+	 | (r_pcrel ?    RELOC_STD_BITS_PCREL_LITTLE : 0)
+	 | (r_neg ?	 RELOC_ARM_BITS_NEG_LITTLE : 0)
+	 | (r_length <<  RELOC_STD_BITS_LENGTH_SH_LITTLE));
+    }
+}
+
+#define MY_put_reloc(BFD, EXT, IDX, VAL, HOWTO, RELOC) \
+  MY (put_reloc) (BFD, EXT, IDX, VAL, HOWTO, RELOC)
+
+static void
+MY (relocatable_reloc) (reloc_howto_type *howto,
+			bfd *abfd,
+			struct reloc_std_external *reloc,
+			bfd_vma *amount,
+			bfd_vma r_addr)
+{
+  if (howto->type == 3)
+    {
+      if (reloc->r_type[0]
+	  & (bfd_header_big_endian (abfd)
+	     ? RELOC_STD_BITS_EXTERN_BIG : RELOC_STD_BITS_EXTERN_LITTLE))
+	/* The reloc is still external, so don't modify anything.  */
+	*amount = 0;
+      else
+	{
+	  *amount -= r_addr;
+	  /* Change the r_pcrel value -- on the ARM, this bit is set once the
+	     relocation is done.  */
+	  if (bfd_header_big_endian (abfd))
+	    reloc->r_type[0] |= RELOC_STD_BITS_PCREL_BIG;
+	  else
+	    reloc->r_type[0] |= RELOC_STD_BITS_PCREL_LITTLE;
+	}
+    }
+  else if (howto->type == 7)
+    *amount = 0;
+}
+
+#define MY_relocatable_reloc(HOW, BFD, REL, AMOUNT, ADDR) \
+  MY (relocatable_reloc) (HOW, BFD, REL, &(AMOUNT), ADDR)
+
+static bfd_reloc_status_type
+MY (fix_pcrel_26_done) (bfd *abfd ATTRIBUTE_UNUSED,
+			arelent *reloc_entry ATTRIBUTE_UNUSED,
+			asymbol *symbol ATTRIBUTE_UNUSED,
+			void * data ATTRIBUTE_UNUSED,
+			asection *input_section ATTRIBUTE_UNUSED,
+			bfd *output_bfd ATTRIBUTE_UNUSED,
+			char **error_message ATTRIBUTE_UNUSED)
+{
+  /* This is dead simple at present.  */
+  return bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type
+MY (fix_pcrel_26) (bfd *abfd,
+		   arelent *reloc_entry,
+		   asymbol *symbol,
+		   void * data,
+		   asection *input_section,
+		   bfd *output_bfd,
+		   char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma relocation;
+  bfd_size_type addr = reloc_entry->address;
+  bfd_vma target = bfd_get_32 (abfd, (bfd_byte *) data + addr);
+  bfd_reloc_status_type flag = bfd_reloc_ok;
+
+  /* If this is an undefined symbol, return error.  */
+  if (symbol->section == &bfd_und_section
+      && (symbol->flags & BSF_WEAK) == 0)
+    return output_bfd ? bfd_reloc_ok : bfd_reloc_undefined;
+
+  /* If the sections are different, and we are doing a partial relocation,
+     just ignore it for now.  */
+  if (symbol->section->name != input_section->name
+      && output_bfd != NULL)
+    return bfd_reloc_ok;
+
+  relocation = (target & 0x00ffffff) << 2;
+  relocation = (relocation ^ 0x02000000) - 0x02000000; /* Sign extend.  */
+  relocation += symbol->value;
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  relocation += reloc_entry->addend;
+  relocation -= input_section->output_section->vma;
+  relocation -= input_section->output_offset;
+  relocation -= addr;
+  if (relocation & 3)
+    return bfd_reloc_overflow;
+
+  /* Check for overflow.  */
+  if (relocation & 0x02000000)
+    {
+      if ((relocation & ~ (bfd_vma) 0x03ffffff) != ~ (bfd_vma) 0x03ffffff)
+	flag = bfd_reloc_overflow;
+    }
+  else if (relocation & ~ (bfd_vma) 0x03ffffff)
+    flag = bfd_reloc_overflow;
+
+  target &= ~ (bfd_vma) 0x00ffffff;
+  target |= (relocation >> 2) & 0x00ffffff;
+  bfd_put_32 (abfd, target, (bfd_byte *) data + addr);
+
+  /* Now the ARM magic... Change the reloc type so that it is marked as done.
+     Strictly this is only necessary if we are doing a partial relocation.  */
+  reloc_entry->howto = &MY (howto_table)[7];
+
+  return flag;
+}
+
+static reloc_howto_type *
+MY (bfd_reloc_type_lookup) (bfd *abfd,
+			    bfd_reloc_code_real_type code)
+{
+#define ASTD(i,j)       case i: return & MY (howto_table)[j]
+
+  if (code == BFD_RELOC_CTOR)
+    switch (bfd_arch_bits_per_address (abfd))
+      {
+      case 32:
+        code = BFD_RELOC_32;
+        break;
+      default:
+	return NULL;
+      }
+
+  switch (code)
+    {
+      ASTD (BFD_RELOC_16, 1);
+      ASTD (BFD_RELOC_32, 2);
+      ASTD (BFD_RELOC_ARM_PCREL_BRANCH, 3);
+      ASTD (BFD_RELOC_8_PCREL, 4);
+      ASTD (BFD_RELOC_16_PCREL, 5);
+      ASTD (BFD_RELOC_32_PCREL, 6);
+    default:
+      return NULL;
+    }
+}
+
+static reloc_howto_type *
+MY (bfd_reloc_name_lookup) (bfd *abfd ATTRIBUTE_UNUSED,
+			    const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (MY (howto_table)) / sizeof (MY (howto_table)[0]);
+       i++)
+    if (MY (howto_table)[i].name != NULL
+	&& strcasecmp (MY (howto_table)[i].name, r_name) == 0)
+      return &MY (howto_table)[i];
+
+  return NULL;
+}
+
+#define MY_swap_std_reloc_in     MY (swap_std_reloc_in)
+#define MY_swap_std_reloc_out    MY (swap_std_reloc_out)
+#define MY_get_section_contents  _bfd_generic_get_section_contents
+
+void MY_swap_std_reloc_in (bfd *, struct reloc_std_external *, arelent *, asymbol **, bfd_size_type);
+void MY_swap_std_reloc_out (bfd *, arelent *, struct reloc_std_external *);
+
+#include "aoutx.h"
+
+void
+MY_swap_std_reloc_in (bfd *abfd,
+		      struct reloc_std_external *bytes,
+		      arelent *cache_ptr,
+		      asymbol **symbols,
+		      bfd_size_type symcount ATTRIBUTE_UNUSED)
+{
+  int r_index;
+  int r_extern;
+  int r_pcrel;
+  struct aoutdata *su = &(abfd->tdata.aout_data->a);
+
+  cache_ptr->address = H_GET_32 (abfd, bytes->r_address);
+
+  cache_ptr->howto = MY_reloc_howto (abfd, bytes, r_index, r_extern, r_pcrel);
+
+  MOVE_ADDRESS (0);
+}
+
+void
+MY_swap_std_reloc_out (bfd *abfd,
+		       arelent *g,
+		       struct reloc_std_external *natptr)
+{
+  int r_index;
+  asymbol *sym = *(g->sym_ptr_ptr);
+  int r_extern;
+  int r_length;
+  int r_pcrel;
+  int r_neg = 0;	/* Negative relocs use the BASEREL bit.  */
+  asection *output_section = sym->section->output_section;
+
+  PUT_WORD (abfd, g->address, natptr->r_address);
+
+  r_length = g->howto->size ;   /* Size as a power of two.  */
+  if (r_length < 0)
+    {
+      r_length = -r_length;
+      r_neg = 1;
+    }
+
+  r_pcrel  = (int) g->howto->pc_relative; /* Relative to PC?  */
+
+  /* For RISC iX, in pc-relative relocs the r_pcrel bit means that the
+     relocation has been done already (Only for the 26-bit one I think).  */
+  if (g->howto->type == 3)
+    {
+      r_length = 3;
+      r_pcrel = 0;
+    }
+  else if (g->howto->type == 7)
+    {
+      r_length = 3;
+      r_pcrel = 1;
+    }
+
+  /* Name was clobbered by aout_write_syms to be symbol index.  */
+
+  /* If this relocation is relative to a symbol then set the
+     r_index to the symbols index, and the r_extern bit.
+
+     Absolute symbols can come in in two ways, either as an offset
+     from the abs section, or as a symbol which has an abs value.
+     check for that here.  */
+
+  if (bfd_is_com_section (output_section)
+      || output_section == &bfd_abs_section
+      || output_section == &bfd_und_section)
+    {
+      if (bfd_abs_section.symbol == sym)
+	{
+	  /* Whoops, looked like an abs symbol, but is really an offset
+	     from the abs section.  */
+	  r_index = 0;
+	  r_extern = 0;
+	}
+      else
+	{
+	  /* Fill in symbol.  */
+	  r_extern = 1;
+	  r_index = (*(g->sym_ptr_ptr))->KEEPIT;
+	}
+    }
+  else
+    {
+      /* Just an ordinary section.  */
+      r_extern = 0;
+      r_index  = output_section->target_index;
+    }
+
+  /* Now the fun stuff.  */
+  if (bfd_header_big_endian (abfd))
+    {
+      natptr->r_index[0] = r_index >> 16;
+      natptr->r_index[1] = r_index >> 8;
+      natptr->r_index[2] = r_index;
+      natptr->r_type[0] =
+	(  (r_extern ?   RELOC_STD_BITS_EXTERN_BIG: 0)
+	 | (r_pcrel  ?   RELOC_STD_BITS_PCREL_BIG: 0)
+	 | (r_neg    ?   RELOC_ARM_BITS_NEG_BIG: 0)
+	 | (r_length <<  RELOC_STD_BITS_LENGTH_SH_BIG));
+    }
+  else
+    {
+      natptr->r_index[2] = r_index >> 16;
+      natptr->r_index[1] = r_index >> 8;
+      natptr->r_index[0] = r_index;
+      natptr->r_type[0] =
+	(  (r_extern ?   RELOC_STD_BITS_EXTERN_LITTLE: 0)
+	 | (r_pcrel  ?   RELOC_STD_BITS_PCREL_LITTLE: 0)
+	 | (r_neg    ?   RELOC_ARM_BITS_NEG_LITTLE: 0)
+	 | (r_length <<  RELOC_STD_BITS_LENGTH_SH_LITTLE));
+    }
+}
+
+#define MY_BFD_TARGET
+
+#include "aout-target.h"
+
+extern const bfd_target aout_arm_big_vec;
+
+const bfd_target aout_arm_little_vec =
+{
+  "a.out-arm-little",           /* Name.  */
+  bfd_target_aout_flavour,
+  BFD_ENDIAN_LITTLE,            /* Target byte order (little).  */
+  BFD_ENDIAN_LITTLE,            /* Target headers byte order (little).  */
+  (HAS_RELOC | EXEC_P |         /* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED),
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
+  MY_symbol_leading_char,
+  AR_PAD_CHAR,                  /* AR_pad_char.  */
+  15,                           /* AR_max_namelen.  */
+  0,				/* match priority.  */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* Data.  */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* Headers.  */
+  {_bfd_dummy_target, MY_object_p,		/* bfd_check_format.  */
+   bfd_generic_archive_p, MY_core_file_p},
+  {bfd_false, MY_mkobject,			/* bfd_set_format.  */
+   _bfd_generic_mkarchive, bfd_false},
+  {bfd_false, MY_write_object_contents,		/* bfd_write_contents.  */
+   _bfd_write_archive_contents, bfd_false},
+
+  BFD_JUMP_TABLE_GENERIC (MY),
+  BFD_JUMP_TABLE_COPY (MY),
+  BFD_JUMP_TABLE_CORE (MY),
+  BFD_JUMP_TABLE_ARCHIVE (MY),
+  BFD_JUMP_TABLE_SYMBOLS (MY),
+  BFD_JUMP_TABLE_RELOCS (MY),
+  BFD_JUMP_TABLE_WRITE (MY),
+  BFD_JUMP_TABLE_LINK (MY),
+  BFD_JUMP_TABLE_DYNAMIC (MY),
+
+  & aout_arm_big_vec,
+
+  (void *) MY_backend_data,
+};
+
+const bfd_target aout_arm_big_vec =
+{
+  "a.out-arm-big",              /* Name.  */
+  bfd_target_aout_flavour,
+  BFD_ENDIAN_BIG,               /* Target byte order (big).  */
+  BFD_ENDIAN_BIG,               /* Target headers byte order (big).  */
+  (HAS_RELOC | EXEC_P |         /* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED),
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
+  MY_symbol_leading_char,
+  AR_PAD_CHAR,			/* AR_pad_char.  */
+  15,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Data.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Headers.  */
+  {_bfd_dummy_target, MY_object_p,		/* bfd_check_format.  */
+   bfd_generic_archive_p, MY_core_file_p},
+  {bfd_false, MY_mkobject,			/* bfd_set_format.  */
+   _bfd_generic_mkarchive, bfd_false},
+  {bfd_false, MY_write_object_contents,		/* bfd_write_contents.  */
+   _bfd_write_archive_contents, bfd_false},
+
+  BFD_JUMP_TABLE_GENERIC (MY),
+  BFD_JUMP_TABLE_COPY (MY),
+  BFD_JUMP_TABLE_CORE (MY),
+  BFD_JUMP_TABLE_ARCHIVE (MY),
+  BFD_JUMP_TABLE_SYMBOLS (MY),
+  BFD_JUMP_TABLE_RELOCS (MY),
+  BFD_JUMP_TABLE_WRITE (MY),
+  BFD_JUMP_TABLE_LINK (MY),
+  BFD_JUMP_TABLE_DYNAMIC (MY),
+
+  & aout_arm_little_vec,
+
+  (void *) MY_backend_data,
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aout-cris.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aout-cris.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aout-cris.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aout-cris.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,289 @@
+/* BFD backend for CRIS a.out binaries.
+   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009
+   Free Software Foundation, Inc.
+   Contributed by Axis Communications AB.
+   Written by Hans-Peter Nilsson.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* See info in the file PORTING for documentation of these macros and
+   functions.  Beware; some of the information there is outdated.  */
+
+#define N_HEADER_IN_TEXT(x) 0
+#define N_TXTOFF(x)         32
+#define ENTRY_CAN_BE_ZERO
+#define TEXT_START_ADDR     0
+
+/* Without reading symbols to get the text start symbol, there is no way
+   to know where the text segment starts in an a.out file.  Defaulting to
+   anything as constant as TEXT_START_ADDR is bad.  But we can guess from
+   the entry point, which is usually within the first 64k of the text
+   segment.  We also assume here that the text segment is 64k-aligned.
+   FIXME: It is also wrong to assume that data and bss follow immediately
+   after text, but with those, we don't have any choice besides reading
+   symbol info, and luckily there's no pressing need for correctness for
+   those vma:s at this time.  */
+#define N_TXTADDR(x) ((x).a_entry & ~(bfd_vma) 0xffff)
+
+/* If you change this to 4, you can not link to an address N*4+2.  */
+#define SEGMENT_SIZE 2
+
+/* For some reason, if the a.out file has Z_MAGIC, then
+   adata(abfd).exec_bytes_size is not used, but rather
+   adata(abfd).zmagic_disk_block_size, even though the exec_header is
+   *not* included in the text segment.  A simple workaround is to
+   #define ZMAGIC_DISK_BLOCK_SIZE, which is used if defined; otherwise
+   TARGET_PAGE_SIZE is used.  */
+#define ZMAGIC_DISK_BLOCK_SIZE     N_TXTOFF (0)
+
+/* It seems odd at first to set a page-size this low, but gives greater
+   freedom in where things can be linked.  The drawback is that you have
+   to set alignment and padding in linker scripts.  */
+#define TARGET_PAGE_SIZE SEGMENT_SIZE
+#define TARGETNAME "a.out-cris"
+
+/* The definition here seems not used; just provided as a convention.  */
+#define DEFAULT_ARCH bfd_arch_cris
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (cris_aout_,OP)
+#define NAME(x, y) CONCAT3 (cris_aout,_32_,y)
+
+#include "bfd.h"
+
+/* Version 1 of the header.  */
+#define MY_exec_hdr_flags 1
+
+#define MY_write_object_contents MY (write_object_contents)
+static bfd_boolean MY (write_object_contents) (bfd *);
+
+/* Forward this, so we can use a pointer to it in PARAMS.  */
+struct reloc_ext_external;
+
+#define MY_swap_ext_reloc_out MY (swap_ext_reloc_out)
+static void MY (swap_ext_reloc_out) (bfd *, arelent *, struct reloc_ext_external *);
+
+#define MY_swap_ext_reloc_in MY (swap_ext_reloc_in)
+static void MY (swap_ext_reloc_in) (bfd *, struct reloc_ext_external *,
+				    arelent *, asymbol **, bfd_size_type);
+
+#define MY_set_sizes MY (set_sizes)
+static bfd_boolean MY (set_sizes) (bfd *);
+
+/* To set back reloc_size to ext, we make MY (set_sizes) be called
+   through this construct.  Note that MY_set_arch_mach is only called
+   through SET_ARCH_MACH.  The default bfd_default_set_arch_mach will
+   not call set_sizes.  */
+
+#define MY_set_arch_mach NAME (aout, set_arch_mach)
+#define SET_ARCH_MACH(BFD, EXEC) \
+ MY_set_arch_mach (BFD, DEFAULT_ARCH, N_MACHTYPE (EXEC))
+
+/* These macros describe the binary layout of the reloc information we
+   use in a file.  */
+#define RELOC_EXT_BITS_EXTERN_LITTLE  0x80
+#define RELOC_EXT_BITS_TYPE_LITTLE    3
+#define RELOC_EXT_BITS_TYPE_SH_LITTLE 0
+
+#ifndef MY_get_section_contents
+#define MY_get_section_contents aout_32_get_section_contents
+#endif
+
+#define MACHTYPE_OK(mtype) ((mtype) == M_CRIS)
+
+/* Include generic functions (some are overridden above).  */
+#include "aout32.c"
+#include "aout-target.h"
+
+/* We need our own version to set header flags.  */
+
+static bfd_boolean
+MY (write_object_contents) (bfd *abfd)
+{
+  struct external_exec exec_bytes;
+  struct internal_exec *execp = exec_hdr (abfd);
+
+  /* We set the reloc type to RELOC_EXT_SIZE, although setting it at all
+     seems unnecessary when inspecting as and ld behavior (not an
+     exhaustive inspection).  The default write_object_contents
+     definition sets RELOC_EXT_SIZE, so we follow suite and set it too.  */
+  obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;
+
+  /* Setting N_SET_MACHTYPE and using N_SET_FLAGS is not performed by
+     the default definition.  */
+  if (bfd_get_arch (abfd) == bfd_arch_cris)
+    N_SET_MACHTYPE (*execp, M_CRIS);
+
+  N_SET_FLAGS (*execp, aout_backend_info (abfd)->exec_hdr_flags);
+
+  WRITE_HEADERS (abfd, execp);
+
+  return TRUE;
+}
+
+/* We need our own for these reasons:
+   - Assert that a normal 8, 16 or 32 reloc is output.
+   - Fix what seems to be a weak-bug (perhaps there for valid reasons).  */
+
+static void
+MY (swap_ext_reloc_out) (bfd *abfd,
+			 arelent *g,
+			 struct reloc_ext_external *natptr)
+{
+  int r_index;
+  int r_extern;
+  unsigned int r_type;
+  bfd_vma r_addend;
+  asymbol *sym = *(g->sym_ptr_ptr);
+  asection *output_section = sym->section->output_section;
+
+  PUT_WORD (abfd, g->address, natptr->r_address);
+
+  r_type = (unsigned int) g->howto->type;
+
+  r_addend = g->addend;
+  if ((sym->flags & BSF_SECTION_SYM) != 0)
+    r_addend += (*(g->sym_ptr_ptr))->section->output_section->vma;
+
+  /* If this relocation is relative to a symbol then set the
+     r_index to the symbols index, and the r_extern bit.
+
+     Absolute symbols can come in in two ways, either as an offset
+     from the abs section, or as a symbol which has an abs value.
+     check for that here.  */
+
+  if (bfd_is_abs_section (bfd_get_section (sym)))
+    {
+      r_extern = 0;
+      r_index = N_ABS;
+    }
+  else if ((sym->flags & BSF_SECTION_SYM) == 0)
+    {
+      if (bfd_is_und_section (bfd_get_section (sym))
+	  /* Remember to check for weak symbols; they count as global.  */
+	  || (sym->flags & (BSF_GLOBAL | BSF_WEAK)) != 0)
+	r_extern = 1;
+      else
+	r_extern = 0;
+      r_index = (*(g->sym_ptr_ptr))->KEEPIT;
+    }
+  else
+    {
+      /* Just an ordinary section.  */
+      r_extern = 0;
+      r_index = output_section->target_index;
+    }
+
+  /* The relocation type is the same as the canonical ones, but only
+     the first 3 are used: RELOC_8, RELOC_16, RELOC_32.
+     We may change this later, but assert this for the moment.  */
+  if (r_type > 2)
+    {
+      (*_bfd_error_handler) (_("%s: Invalid relocation type exported: %d"),
+			     bfd_get_filename (abfd), r_type);
+
+      bfd_set_error (bfd_error_wrong_format);
+    }
+
+  /* Now the fun stuff.  */
+  natptr->r_index[2] = r_index >> 16;
+  natptr->r_index[1] = r_index >> 8;
+  natptr->r_index[0] = r_index;
+  natptr->r_type[0] =
+     (r_extern ? RELOC_EXT_BITS_EXTERN_LITTLE : 0)
+      | (r_type << RELOC_EXT_BITS_TYPE_SH_LITTLE);
+
+  PUT_WORD (abfd, r_addend, natptr->r_addend);
+}
+
+/* We need our own to assert that a normal 8, 16 or 32 reloc is input.  */
+
+static void
+MY (swap_ext_reloc_in) (bfd *abfd,
+			struct reloc_ext_external *bytes,
+			arelent *cache_ptr,
+			asymbol **symbols,
+			bfd_size_type symcount)
+{
+  unsigned int r_index;
+  int r_extern;
+  unsigned int r_type;
+  struct aoutdata *su = &(abfd->tdata.aout_data->a);
+
+  cache_ptr->address = (GET_SWORD (abfd, bytes->r_address));
+
+  /* Now the fun stuff.  */
+  r_index =  (bytes->r_index[2] << 16)
+    | (bytes->r_index[1] << 8)
+    |  bytes->r_index[0];
+  r_extern = (0 != (bytes->r_type[0] & RELOC_EXT_BITS_EXTERN_LITTLE));
+  r_type = ((bytes->r_type[0]) >> RELOC_EXT_BITS_TYPE_SH_LITTLE)
+    & RELOC_EXT_BITS_TYPE_LITTLE;
+
+  if (r_type > 2)
+    {
+      (*_bfd_error_handler) (_("%B: Invalid relocation type imported: %d"),
+			     abfd, r_type);
+
+      bfd_set_error (bfd_error_wrong_format);
+    }
+
+  cache_ptr->howto =  howto_table_ext + r_type;
+
+  if (r_extern && r_index > symcount)
+    {
+      (*_bfd_error_handler)
+        (_("%B: Bad relocation record imported: %d"), abfd, r_index);
+
+      bfd_set_error (bfd_error_wrong_format);
+
+      /* We continue, so we can catch further errors.  */
+      r_extern = 0;
+      r_index = N_ABS;
+    }
+
+  /* Magically uses r_extern, symbols etc.  Ugly, but it's what's in the
+     default.  */
+  MOVE_ADDRESS (GET_SWORD (abfd, bytes->r_addend));
+}
+
+/* We use the same as the default, except that we also set
+   "obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;", to avoid changing
+   NAME (aout, set_arch_mach) in aoutx.  */
+
+static bfd_boolean
+MY (set_sizes) (bfd *abfd)
+{
+  /* Just as the default in aout-target.h (with some #ifdefs folded)...  */
+
+  adata (abfd).page_size = TARGET_PAGE_SIZE;
+  adata (abfd).segment_size = SEGMENT_SIZE;
+  adata (abfd).zmagic_disk_block_size = ZMAGIC_DISK_BLOCK_SIZE;
+  adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
+
+  /* ... except for that we have the extended reloc.  The alternative
+     would be to add a check on bfd_arch_cris in NAME (aout,
+     set_arch_mach) in aoutx.h, but I don't want to do that since
+     target-specific things should not be added there.  */
+
+  obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;
+
+  return TRUE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aout-ns32k.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aout-ns32k.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aout-ns32k.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aout-ns32k.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,364 @@
+/* BFD back-end for ns32k a.out-ish binaries.
+   Copyright 1990, 1991, 1992, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+   2002, 2003, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
+   Contributed by Ian Dall (idall@eleceng.adelaide.edu.au).
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "bfd.h"
+#include "aout/aout64.h"
+#include "ns32k.h"
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MYNS(OP) CONCAT2 (ns32kaout_,OP)
+
+reloc_howto_type * MYNS (bfd_reloc_type_lookup) (bfd *, bfd_reloc_code_real_type);
+reloc_howto_type * MYNS (bfd_reloc_name_lookup) (bfd *, const char *);
+bfd_boolean        MYNS (write_object_contents) (bfd *);
+
+/* Avoid multiple definitions from aoutx if supporting
+   standard a.out format(s) as well as this one.  */
+#define NAME(x,y) CONCAT3 (ns32kaout,_32_,y)
+
+void bfd_ns32k_arch (void);
+
+#include "libaout.h"
+
+#define MY(OP) MYNS (OP)
+
+#define MY_swap_std_reloc_in   MY (swap_std_reloc_in)
+#define MY_swap_std_reloc_out  MY (swap_std_reloc_out)
+
+/* The ns32k series is ah, unusual, when it comes to relocation.
+   There are three storage methods for relocatable objects.  There
+   are displacements, immediate operands and ordinary twos complement
+   data. Of these, only the last fits into the standard relocation
+   scheme.  Immediate operands are stored huffman encoded and
+   immediate operands are stored big endian (where as the natural byte
+   order is little endian for this architecture).
+
+   Note that the ns32k displacement storage method is orthogonal to
+   whether the relocation is pc relative or not. The "displacement"
+   storage scheme is used for essentially all address constants. The
+   displacement can be relative to zero (absolute displacement),
+   relative to the pc (pc relative), the stack pointer, the frame
+   pointer, the static base register and general purpose register etc.
+
+   For example:
+
+   sym1: .long .	 # pc relative 2's complement
+   sym1: .long foo	 # 2's complement not pc relative
+
+   self:  movd @self, r0 # pc relative displacement
+          movd foo, r0   # non pc relative displacement
+
+   self:  movd self, r0  # pc relative immediate
+          movd foo, r0   # non pc relative immediate
+
+   In addition, for historical reasons the encoding of the relocation types
+   in the a.out format relocation entries is such that even the relocation
+   methods which are standard are not encoded the standard way.  */
+
+reloc_howto_type MY (howto_table)[] =
+{
+  /* ns32k immediate operands.  */
+  HOWTO (BFD_RELOC_NS32K_IMM_8, 0, 0, 8, FALSE, 0, complain_overflow_signed,
+	 _bfd_ns32k_reloc_imm, "NS32K_IMM_8",
+	 TRUE, 0x000000ff,0x000000ff, FALSE),
+  HOWTO (BFD_RELOC_NS32K_IMM_16, 0, 1, 16, FALSE, 0, complain_overflow_signed,
+	 _bfd_ns32k_reloc_imm,  "NS32K_IMM_16",
+	 TRUE, 0x0000ffff,0x0000ffff, FALSE),
+  HOWTO (BFD_RELOC_NS32K_IMM_32, 0, 2, 32, FALSE, 0, complain_overflow_signed,
+	 _bfd_ns32k_reloc_imm, "NS32K_IMM_32",
+	 TRUE, 0xffffffff,0xffffffff, FALSE),
+  HOWTO (BFD_RELOC_NS32K_IMM_8_PCREL, 0, 0, 8, TRUE, 0, complain_overflow_signed,
+	 _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_8",
+	 TRUE, 0x000000ff, 0x000000ff, FALSE),
+  HOWTO (BFD_RELOC_NS32K_IMM_16_PCREL, 0, 1, 16, TRUE, 0, complain_overflow_signed,
+	 _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_16",
+	 TRUE, 0x0000ffff,0x0000ffff, FALSE),
+  HOWTO (BFD_RELOC_NS32K_IMM_32_PCREL, 0, 2, 32, TRUE, 0, complain_overflow_signed,
+	 _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_32",
+	 TRUE, 0xffffffff,0xffffffff, FALSE),
+
+  /* ns32k displacements.  */
+  HOWTO (BFD_RELOC_NS32K_DISP_8, 0, 0, 7, FALSE, 0, complain_overflow_signed,
+	 _bfd_ns32k_reloc_disp, "NS32K_DISP_8",
+	 TRUE, 0x000000ff,0x000000ff, FALSE),
+  HOWTO (BFD_RELOC_NS32K_DISP_16, 0, 1, 14, FALSE, 0, complain_overflow_signed,
+	 _bfd_ns32k_reloc_disp, "NS32K_DISP_16",
+	 TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (BFD_RELOC_NS32K_DISP_32, 0, 2, 30, FALSE, 0, complain_overflow_signed,
+	 _bfd_ns32k_reloc_disp, "NS32K_DISP_32",
+	 TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO (BFD_RELOC_NS32K_DISP_8_PCREL, 0, 0, 7, TRUE, 0, complain_overflow_signed,
+	   _bfd_ns32k_reloc_disp, "PCREL_NS32K_DISP_8",
+	 TRUE, 0x000000ff,0x000000ff, FALSE),
+  HOWTO (BFD_RELOC_NS32K_DISP_16_PCREL, 0, 1, 14, TRUE, 0, complain_overflow_signed,
+	 _bfd_ns32k_reloc_disp, "PCREL_NS32K_DISP_16",
+	 TRUE, 0x0000ffff,0x0000ffff, FALSE),
+  HOWTO (BFD_RELOC_NS32K_DISP_32_PCREL, 0, 2, 30, TRUE, 0, complain_overflow_signed,
+	 _bfd_ns32k_reloc_disp, "PCREL_NS32K_DISP_32",
+	 TRUE, 0xffffffff,0xffffffff, FALSE),
+
+  /* Normal 2's complement.  */
+  HOWTO (BFD_RELOC_8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield,0,
+	 "8", TRUE, 0x000000ff,0x000000ff, FALSE),
+  HOWTO (BFD_RELOC_16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield,0,
+	 "16", TRUE, 0x0000ffff,0x0000ffff, FALSE),
+  HOWTO (BFD_RELOC_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,0,
+	 "32", TRUE, 0xffffffff,0xffffffff, FALSE),
+  HOWTO (BFD_RELOC_8_PCREL, 0, 0, 8, TRUE, 0, complain_overflow_signed, 0,
+	 "PCREL_8", TRUE, 0x000000ff,0x000000ff, FALSE),
+  HOWTO (BFD_RELOC_16_PCREL, 0, 1, 16, TRUE, 0, complain_overflow_signed, 0,
+	 "PCREL_16", TRUE, 0x0000ffff,0x0000ffff, FALSE),
+  HOWTO (BFD_RELOC_32_PCREL, 0, 2, 32, TRUE, 0, complain_overflow_signed, 0,
+	 "PCREL_32", TRUE, 0xffffffff,0xffffffff, FALSE),
+};
+
+#define CTOR_TABLE_RELOC_HOWTO(BFD) (MY (howto_table) + 14)
+
+#define RELOC_STD_BITS_NS32K_TYPE_BIG 		0x06
+#define RELOC_STD_BITS_NS32K_TYPE_LITTLE 	0x60
+#define RELOC_STD_BITS_NS32K_TYPE_SH_BIG 	1
+#define RELOC_STD_BITS_NS32K_TYPE_SH_LITTLE 	5
+
+static reloc_howto_type *
+MY (reloc_howto) (bfd *abfd ATTRIBUTE_UNUSED,
+		  struct reloc_std_external *rel,
+		  int *r_index,
+		  int *r_extern,
+		  int *r_pcrel)
+{
+  unsigned int r_length;
+  int r_ns32k_type;
+
+  *r_index =  ((rel->r_index[2] << 16)
+	       | (rel->r_index[1] << 8)
+	       |  rel->r_index[0] );
+  *r_extern  = (0 != (rel->r_type[0] & RELOC_STD_BITS_EXTERN_LITTLE));
+  *r_pcrel   = (0 != (rel->r_type[0] & RELOC_STD_BITS_PCREL_LITTLE));
+  r_length  =  ((rel->r_type[0] & RELOC_STD_BITS_LENGTH_LITTLE)
+		>> RELOC_STD_BITS_LENGTH_SH_LITTLE);
+  r_ns32k_type  =  ((rel->r_type[0] & RELOC_STD_BITS_NS32K_TYPE_LITTLE)
+		    >> RELOC_STD_BITS_NS32K_TYPE_SH_LITTLE);
+  return (MY (howto_table) + r_length + 3 * (*r_pcrel) + 6 * r_ns32k_type);
+}
+
+#define MY_reloc_howto(BFD, REL, IN, EX, PC) \
+  MY (reloc_howto) (BFD, REL, &IN, &EX, &PC)
+
+static void
+MY (put_reloc) (bfd *abfd,
+		int r_extern,
+		int r_index,
+		bfd_vma value,
+		reloc_howto_type *howto,
+		struct reloc_std_external *reloc)
+{
+  unsigned int r_length;
+  int r_pcrel;
+  int r_ns32k_type;
+
+  PUT_WORD (abfd, value, reloc->r_address);
+  r_length = howto->size ;	/* Size as a power of two.  */
+  r_pcrel  = (int) howto->pc_relative; /* Relative to PC?  */
+  r_ns32k_type = (howto - MY (howto_table) )/6;
+
+  reloc->r_index[2] = r_index >> 16;
+  reloc->r_index[1] = r_index >> 8;
+  reloc->r_index[0] = r_index;
+  reloc->r_type[0] =
+    (r_extern?    RELOC_STD_BITS_EXTERN_LITTLE: 0)
+      | (r_pcrel?     RELOC_STD_BITS_PCREL_LITTLE: 0)
+	| (r_length <<  RELOC_STD_BITS_LENGTH_SH_LITTLE)
+	  | (r_ns32k_type <<  RELOC_STD_BITS_NS32K_TYPE_SH_LITTLE);
+}
+
+#define MY_put_reloc(BFD, EXT, IDX, VAL, HOWTO, RELOC) \
+  MY (put_reloc) (BFD, EXT, IDX, VAL, HOWTO, RELOC)
+
+#define STAT_FOR_EXEC
+
+#define MY_final_link_relocate _bfd_ns32k_final_link_relocate
+#define MY_relocate_contents   _bfd_ns32k_relocate_contents
+
+static void MY_swap_std_reloc_in (bfd *, struct reloc_std_external *, arelent *, asymbol **, bfd_size_type);
+static void MY_swap_std_reloc_out (bfd *, arelent *, struct reloc_std_external *);
+
+#include "aoutx.h"
+
+reloc_howto_type *
+MY (bfd_reloc_type_lookup) (bfd *abfd, bfd_reloc_code_real_type code)
+{
+#define ENTRY(i,j)	case i: return &MY (howto_table)[j]
+
+  int ext = obj_reloc_entry_size (abfd) == RELOC_EXT_SIZE;
+
+  BFD_ASSERT (ext == 0);
+  if (code == BFD_RELOC_CTOR)
+    switch (bfd_arch_bits_per_address (abfd))
+      {
+      case 32:
+	code = BFD_RELOC_32;
+	break;
+      default:
+	break;
+      }
+  switch (code)
+    {
+      ENTRY (BFD_RELOC_NS32K_IMM_8, 0);
+      ENTRY (BFD_RELOC_NS32K_IMM_16, 1);
+      ENTRY (BFD_RELOC_NS32K_IMM_32, 2);
+      ENTRY (BFD_RELOC_NS32K_IMM_8_PCREL, 3);
+      ENTRY (BFD_RELOC_NS32K_IMM_16_PCREL, 4);
+      ENTRY (BFD_RELOC_NS32K_IMM_32_PCREL, 5);
+      ENTRY (BFD_RELOC_NS32K_DISP_8, 6);
+      ENTRY (BFD_RELOC_NS32K_DISP_16, 7);
+      ENTRY (BFD_RELOC_NS32K_DISP_32, 8);
+      ENTRY (BFD_RELOC_NS32K_DISP_8_PCREL, 9);
+      ENTRY (BFD_RELOC_NS32K_DISP_16_PCREL, 10);
+      ENTRY (BFD_RELOC_NS32K_DISP_32_PCREL, 11);
+      ENTRY (BFD_RELOC_8, 12);
+      ENTRY (BFD_RELOC_16, 13);
+      ENTRY (BFD_RELOC_32, 14);
+      ENTRY (BFD_RELOC_8_PCREL, 15);
+      ENTRY (BFD_RELOC_16_PCREL, 16);
+      ENTRY (BFD_RELOC_32_PCREL, 17);
+    default:
+      return NULL;
+    }
+#undef ENTRY
+}
+
+reloc_howto_type *
+MY (bfd_reloc_name_lookup) (bfd *abfd ATTRIBUTE_UNUSED,
+			    const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (MY (howto_table)) / sizeof (MY (howto_table)[0]);
+       i++)
+    if (MY (howto_table)[i].name != NULL
+	&& strcasecmp (MY (howto_table)[i].name, r_name) == 0)
+      return &MY (howto_table)[i];
+
+  return NULL;
+}
+
+static void
+MY_swap_std_reloc_in (bfd *abfd,
+		      struct reloc_std_external *bytes,
+		      arelent *cache_ptr,
+		      asymbol **symbols,
+		      bfd_size_type symcount ATTRIBUTE_UNUSED)
+{
+  int r_index;
+  int r_extern;
+  int r_pcrel;
+  struct aoutdata  *su = &(abfd->tdata.aout_data->a);
+
+  cache_ptr->address = H_GET_32 (abfd, bytes->r_address);
+
+  /* Now the fun stuff.  */
+  cache_ptr->howto = MY_reloc_howto (abfd, bytes, r_index, r_extern, r_pcrel);
+
+  MOVE_ADDRESS (0);
+}
+
+static void
+MY_swap_std_reloc_out (bfd *abfd,
+		       arelent *g,
+		       struct reloc_std_external *natptr)
+{
+  int r_index;
+  asymbol *sym = *(g->sym_ptr_ptr);
+  int r_extern;
+  asection *output_section = sym->section->output_section;
+
+  /* Name was clobbered by aout_write_syms to be symbol index.  */
+
+  /* If this relocation is relative to a symbol then set the
+     r_index to the symbols index, and the r_extern bit.
+
+     Absolute symbols can come in in two ways, either as an offset
+     from the abs section, or as a symbol which has an abs value.
+     Check for that here.  */
+  if (bfd_is_com_section (output_section)
+      || output_section == &bfd_abs_section
+      || output_section == &bfd_und_section)
+    {
+      if (bfd_abs_section.symbol == sym)
+	{
+	  /* Whoops, looked like an abs symbol, but is really an offset
+	     from the abs section.  */
+	  r_index = 0;
+	  r_extern = 0;
+	}
+      else
+	{
+	  /* Fill in symbol.  */
+	  r_extern = 1;
+#undef KEEPIT
+#define KEEPIT udata.i
+	  r_index =  (*(g->sym_ptr_ptr))->KEEPIT;
+#undef KEEPIT
+	}
+    }
+  else
+    {
+      /* Just an ordinary section.  */
+      r_extern = 0;
+      r_index  = output_section->target_index;
+    }
+
+  MY_put_reloc (abfd, r_extern, r_index, g->address, g->howto, natptr);
+}
+
+bfd_reloc_status_type
+_bfd_ns32k_relocate_contents (reloc_howto_type *howto,
+			      bfd *input_bfd,
+			      bfd_vma relocation,
+			      bfd_byte *location)
+{
+  int r_ns32k_type = (howto - MY (howto_table)) / 6;
+  bfd_vma (*get_data) (bfd_byte *, int);
+  void (*put_data) (bfd_vma, bfd_byte *, int);
+
+  switch (r_ns32k_type)
+    {
+    case 0:
+      get_data = _bfd_ns32k_get_immediate;
+      put_data = _bfd_ns32k_put_immediate;
+      break;
+    case 1:
+      get_data = _bfd_ns32k_get_displacement;
+      put_data = _bfd_ns32k_put_displacement;
+      break;
+    case 2:
+      return _bfd_relocate_contents (howto, input_bfd, relocation,
+				    location);
+    default:
+      return bfd_reloc_notsupported;
+    }
+  return _bfd_do_ns32k_reloc_contents (howto, input_bfd, relocation,
+				       location, get_data, put_data);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aout-sparcle.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aout-sparcle.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aout-sparcle.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aout-sparcle.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,36 @@
+/* BFD backend for sparc little-endian aout binaries.
+   Copyright 1996, 2001, 2005, 2007 Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#define TARGETNAME "a.out-sparc-little"
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (sparcle_aout_,OP)
+
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libaout.h"
+
+#define MACHTYPE_OK(mtype) ((mtype) == M_SPARC || (mtype) == M_SPARCLET)
+
+/* Include the usual a.out support.  */
+#define TARGET_IS_LITTLE_ENDIAN_P
+#include "aoutf1.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aout-target.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aout-target.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aout-target.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aout-target.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,671 @@
+/* Define a target vector and some small routines for a variant of a.out.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "aout/aout64.h"
+#include "aout/stab_gnu.h"
+#include "aout/ar.h"
+/*#include "libaout.h"*/
+
+#ifndef SEGMENT_SIZE
+#define SEGMENT_SIZE TARGET_PAGE_SIZE
+#endif
+
+extern reloc_howto_type * NAME (aout, reloc_type_lookup) (bfd *, bfd_reloc_code_real_type);
+extern reloc_howto_type * NAME (aout, reloc_name_lookup) (bfd *, const char *);
+
+/* Set parameters about this a.out file that are machine-dependent.
+   This routine is called from some_aout_object_p just before it returns.  */
+#ifndef MY_callback
+
+static const bfd_target *
+MY (callback) (bfd *abfd)
+{
+  struct internal_exec *execp = exec_hdr (abfd);
+  unsigned int arch_align_power;
+  unsigned long arch_align;
+
+  /* Calculate the file positions of the parts of a newly read aout header.  */
+  obj_textsec (abfd)->size = N_TXTSIZE (*execp);
+
+  /* The virtual memory addresses of the sections.  */
+  obj_textsec (abfd)->vma = N_TXTADDR (*execp);
+  obj_datasec (abfd)->vma = N_DATADDR (*execp);
+  obj_bsssec  (abfd)->vma = N_BSSADDR (*execp);
+
+  /* For some targets, if the entry point is not in the same page
+     as the start of the text, then adjust the VMA so that it is.
+     FIXME: Do this with a macro like SET_ARCH_MACH instead?  */
+  if (aout_backend_info (abfd)->entry_is_text_address
+      && execp->a_entry > obj_textsec (abfd)->vma)
+    {
+      bfd_vma adjust;
+
+      adjust = execp->a_entry - obj_textsec (abfd)->vma;
+      /* Adjust only by whole pages.  */
+      adjust &= ~(TARGET_PAGE_SIZE - 1);
+      obj_textsec (abfd)->vma += adjust;
+      obj_datasec (abfd)->vma += adjust;
+      obj_bsssec (abfd)->vma += adjust;
+    }
+
+  /* Set the load addresses to be the same as the virtual addresses.  */
+  obj_textsec (abfd)->lma = obj_textsec (abfd)->vma;
+  obj_datasec (abfd)->lma = obj_datasec (abfd)->vma;
+  obj_bsssec (abfd)->lma = obj_bsssec (abfd)->vma;
+
+  /* The file offsets of the sections.  */
+  obj_textsec (abfd)->filepos = N_TXTOFF (*execp);
+  obj_datasec (abfd)->filepos = N_DATOFF (*execp);
+
+  /* The file offsets of the relocation info.  */
+  obj_textsec (abfd)->rel_filepos = N_TRELOFF (*execp);
+  obj_datasec (abfd)->rel_filepos = N_DRELOFF (*execp);
+
+  /* The file offsets of the string table and symbol table.  */
+  obj_sym_filepos (abfd) = N_SYMOFF (*execp);
+  obj_str_filepos (abfd) = N_STROFF (*execp);
+
+  /* Determine the architecture and machine type of the object file.  */
+#ifdef SET_ARCH_MACH
+  SET_ARCH_MACH (abfd, *execp);
+#else
+  bfd_default_set_arch_mach (abfd, DEFAULT_ARCH, 0);
+#endif
+
+  /* The number of relocation records.  This must be called after
+     SET_ARCH_MACH.  It assumes that SET_ARCH_MACH will set
+     obj_reloc_entry_size correctly, if the reloc size is not
+     RELOC_STD_SIZE.  */
+  obj_textsec (abfd)->reloc_count =
+    execp->a_trsize / obj_reloc_entry_size (abfd);
+  obj_datasec (abfd)->reloc_count =
+    execp->a_drsize / obj_reloc_entry_size (abfd);
+
+  /* Now that we know the architecture, set the alignments of the
+     sections.  This is normally done by NAME (aout,new_section_hook),
+     but when the initial sections were created the architecture had
+     not yet been set.  However, for backward compatibility, we don't
+     set the alignment power any higher than as required by the size
+     of the section.  */
+  arch_align_power = bfd_get_arch_info (abfd)->section_align_power;
+  arch_align = 1 << arch_align_power;
+  if ((BFD_ALIGN (obj_textsec (abfd)->size, arch_align)
+       == obj_textsec (abfd)->size)
+      && (BFD_ALIGN (obj_datasec (abfd)->size, arch_align)
+	  == obj_datasec (abfd)->size)
+      && (BFD_ALIGN (obj_bsssec (abfd)->size, arch_align)
+	  == obj_bsssec (abfd)->size))
+    {
+      obj_textsec (abfd)->alignment_power = arch_align_power;
+      obj_datasec (abfd)->alignment_power = arch_align_power;
+      obj_bsssec (abfd)->alignment_power = arch_align_power;
+    }
+
+  /* Don't set sizes now -- can't be sure until we know arch & mach.
+     Sizes get set in set_sizes callback, later.  */
+
+  return abfd->xvec;
+}
+#endif
+
+#ifndef MY_object_p
+/* Finish up the reading of an a.out file header.  */
+
+static const bfd_target *
+MY (object_p) (bfd *abfd)
+{
+  struct external_exec exec_bytes;	/* Raw exec header from file.  */
+  struct internal_exec exec;		/* Cleaned-up exec header.  */
+  const bfd_target *target;
+  bfd_size_type amt = EXEC_BYTES_SIZE;
+
+  if (bfd_bread ((void *) &exec_bytes, amt, abfd) != amt)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return 0;
+    }
+
+#ifdef SWAP_MAGIC
+  exec.a_info = SWAP_MAGIC (exec_bytes.e_info);
+#else
+  exec.a_info = GET_MAGIC (abfd, exec_bytes.e_info);
+#endif
+
+  if (N_BADMAG (exec))
+    return 0;
+
+#ifdef MACHTYPE_OK
+  if (!(MACHTYPE_OK (N_MACHTYPE (exec))))
+    return 0;
+#endif
+
+  NAME (aout, swap_exec_header_in) (abfd, &exec_bytes, &exec);
+
+#ifdef SWAP_MAGIC
+  /* Swap_exec_header_in read in a_info with the wrong byte order.  */
+  exec.a_info = SWAP_MAGIC (exec_bytes.e_info);
+#endif
+
+  target = NAME (aout, some_aout_object_p) (abfd, &exec, MY (callback));
+
+#ifdef ENTRY_CAN_BE_ZERO
+  /* The NEWSOS3 entry-point is/was 0, which (amongst other lossage)
+     means that it isn't obvious if EXEC_P should be set.
+     All of the following must be true for an executable:
+     There must be no relocations, the bfd can be neither an
+     archive nor an archive element, and the file must be executable.  */
+
+  if (exec.a_trsize + exec.a_drsize == 0
+      && bfd_get_format(abfd) == bfd_object && abfd->my_archive == NULL)
+    {
+      struct stat buf;
+#ifndef S_IXUSR
+#define S_IXUSR 0100	/* Execute by owner.  */
+#endif
+      if (stat(abfd->filename, &buf) == 0 && (buf.st_mode & S_IXUSR))
+	abfd->flags |= EXEC_P;
+    }
+#endif /* ENTRY_CAN_BE_ZERO */
+
+  return target;
+}
+#define MY_object_p MY (object_p)
+#endif
+
+#ifndef MY_mkobject
+
+static bfd_boolean
+MY (mkobject) (bfd *abfd)
+{
+  return NAME (aout, mkobject (abfd));
+}
+
+#define MY_mkobject MY (mkobject)
+#endif
+
+#ifndef MY_bfd_copy_private_section_data
+
+/* Copy private section data.  This actually does nothing with the
+   sections.  It copies the subformat field.  We copy it here, because
+   we need to know whether this is a QMAGIC file before we set the
+   section contents, and copy_private_bfd_data is not called until
+   after the section contents have been set.  */
+
+static bfd_boolean
+MY_bfd_copy_private_section_data (bfd *ibfd,
+				  asection *isec ATTRIBUTE_UNUSED,
+				  bfd *obfd,
+				  asection *osec ATTRIBUTE_UNUSED)
+{
+  if (bfd_get_flavour (ibfd) == bfd_target_aout_flavour
+      && bfd_get_flavour (obfd) == bfd_target_aout_flavour)
+    obj_aout_subformat (obfd) = obj_aout_subformat (ibfd);
+  return TRUE;
+}
+
+#endif
+
+/* Write an object file.
+   Section contents have already been written.  We write the
+   file header, symbols, and relocation.  */
+
+#ifndef MY_write_object_contents
+
+static bfd_boolean
+MY (write_object_contents) (bfd *abfd)
+{
+  struct external_exec exec_bytes;
+  struct internal_exec *execp = exec_hdr (abfd);
+
+  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+
+  WRITE_HEADERS (abfd, execp);
+
+  return TRUE;
+}
+#define MY_write_object_contents MY (write_object_contents)
+#endif
+
+#ifndef MY_set_sizes
+
+static bfd_boolean
+MY (set_sizes) (bfd *abfd)
+{
+  adata(abfd).page_size = TARGET_PAGE_SIZE;
+  adata(abfd).segment_size = SEGMENT_SIZE;
+
+#ifdef ZMAGIC_DISK_BLOCK_SIZE
+  adata(abfd).zmagic_disk_block_size = ZMAGIC_DISK_BLOCK_SIZE;
+#else
+  adata(abfd).zmagic_disk_block_size = TARGET_PAGE_SIZE;
+#endif
+
+  adata(abfd).exec_bytes_size = EXEC_BYTES_SIZE;
+  return TRUE;
+}
+#define MY_set_sizes MY (set_sizes)
+#endif
+
+#ifndef MY_exec_hdr_flags
+#define MY_exec_hdr_flags 0
+#endif
+
+#ifndef MY_backend_data
+
+#ifndef MY_zmagic_contiguous
+#define MY_zmagic_contiguous 0
+#endif
+#ifndef MY_text_includes_header
+#define MY_text_includes_header 0
+#endif
+#ifndef MY_entry_is_text_address
+#define MY_entry_is_text_address 0
+#endif
+#ifndef MY_exec_header_not_counted
+#define MY_exec_header_not_counted 0
+#endif
+#ifndef MY_add_dynamic_symbols
+#define MY_add_dynamic_symbols 0
+#endif
+#ifndef MY_add_one_symbol
+#define MY_add_one_symbol 0
+#endif
+#ifndef MY_link_dynamic_object
+#define MY_link_dynamic_object 0
+#endif
+#ifndef MY_write_dynamic_symbol
+#define MY_write_dynamic_symbol 0
+#endif
+#ifndef MY_check_dynamic_reloc
+#define MY_check_dynamic_reloc 0
+#endif
+#ifndef MY_finish_dynamic_link
+#define MY_finish_dynamic_link 0
+#endif
+
+static const struct aout_backend_data MY (backend_data) =
+{
+  MY_zmagic_contiguous,
+  MY_text_includes_header,
+  MY_entry_is_text_address,
+  MY_exec_hdr_flags,
+  0,				/* Text vma?  */
+  MY_set_sizes,
+  MY_exec_header_not_counted,
+  MY_add_dynamic_symbols,
+  MY_add_one_symbol,
+  MY_link_dynamic_object,
+  MY_write_dynamic_symbol,
+  MY_check_dynamic_reloc,
+  MY_finish_dynamic_link
+};
+#define MY_backend_data &MY (backend_data)
+#endif
+
+#ifndef MY_final_link_callback
+
+/* Callback for the final_link routine to set the section offsets.  */
+
+static void
+MY_final_link_callback (bfd *abfd,
+			file_ptr *ptreloff,
+			file_ptr *pdreloff,
+			file_ptr *psymoff)
+{
+  struct internal_exec *execp = exec_hdr (abfd);
+
+  *ptreloff = N_TRELOFF (*execp);
+  *pdreloff = N_DRELOFF (*execp);
+  *psymoff = N_SYMOFF (*execp);
+}
+
+#endif
+
+#ifndef MY_bfd_final_link
+
+/* Final link routine.  We need to use a call back to get the correct
+   offsets in the output file.  */
+
+static bfd_boolean
+MY_bfd_final_link (bfd *abfd, struct bfd_link_info *info)
+{
+  return NAME (aout, final_link) (abfd, info, MY_final_link_callback);
+}
+
+#endif
+
+/* We assume BFD generic archive files.  */
+#ifndef	MY_openr_next_archived_file
+#define	MY_openr_next_archived_file	bfd_generic_openr_next_archived_file
+#endif
+#ifndef MY_get_elt_at_index
+#define MY_get_elt_at_index		_bfd_generic_get_elt_at_index
+#endif
+#ifndef	MY_generic_stat_arch_elt
+#define	MY_generic_stat_arch_elt	bfd_generic_stat_arch_elt
+#endif
+#ifndef	MY_slurp_armap
+#define	MY_slurp_armap			bfd_slurp_bsd_armap
+#endif
+#ifndef	MY_slurp_extended_name_table
+#define	MY_slurp_extended_name_table	_bfd_slurp_extended_name_table
+#endif
+#ifndef MY_construct_extended_name_table
+#define MY_construct_extended_name_table \
+  _bfd_archive_bsd_construct_extended_name_table
+#endif
+#ifndef	MY_write_armap
+#define	MY_write_armap		bsd_write_armap
+#endif
+#ifndef MY_read_ar_hdr
+#define MY_read_ar_hdr		_bfd_generic_read_ar_hdr
+#endif
+#ifndef MY_write_ar_hdr
+#define MY_write_ar_hdr		_bfd_generic_write_ar_hdr
+#endif
+#ifndef	MY_truncate_arname
+#define	MY_truncate_arname		bfd_bsd_truncate_arname
+#endif
+#ifndef MY_update_armap_timestamp
+#define MY_update_armap_timestamp _bfd_archive_bsd_update_armap_timestamp
+#endif
+
+/* No core file defined here -- configure in trad-core.c separately.  */
+#ifndef	MY_core_file_failing_command
+#define	MY_core_file_failing_command _bfd_nocore_core_file_failing_command
+#endif
+#ifndef	MY_core_file_failing_signal
+#define	MY_core_file_failing_signal	_bfd_nocore_core_file_failing_signal
+#endif
+#ifndef	MY_core_file_matches_executable_p
+#define	MY_core_file_matches_executable_p	\
+				_bfd_nocore_core_file_matches_executable_p
+#endif
+#ifndef	MY_core_file_pid
+#define	MY_core_file_pid _bfd_nocore_core_file_pid
+#endif
+#ifndef	MY_core_file_p
+#define	MY_core_file_p		_bfd_dummy_target
+#endif
+
+#ifndef MY_bfd_debug_info_start
+#define MY_bfd_debug_info_start		bfd_void
+#endif
+#ifndef MY_bfd_debug_info_end
+#define MY_bfd_debug_info_end		bfd_void
+#endif
+#ifndef MY_bfd_debug_info_accumulate
+#define MY_bfd_debug_info_accumulate	\
+		(void (*) (bfd *, struct bfd_section *)) bfd_void
+#endif
+
+#ifndef MY_core_file_failing_command
+#define MY_core_file_failing_command NAME (aout, core_file_failing_command)
+#endif
+#ifndef MY_core_file_failing_signal
+#define MY_core_file_failing_signal NAME (aout, core_file_failing_signal)
+#endif
+#ifndef MY_core_file_matches_executable_p
+#define MY_core_file_matches_executable_p NAME (aout, core_file_matches_executable_p)
+#endif
+#ifndef MY_set_section_contents
+#define MY_set_section_contents NAME (aout, set_section_contents)
+#endif
+#ifndef MY_get_section_contents
+#define MY_get_section_contents NAME (aout, get_section_contents)
+#endif
+#ifndef MY_get_section_contents_in_window
+#define MY_get_section_contents_in_window _bfd_generic_get_section_contents_in_window
+#endif
+#ifndef MY_new_section_hook
+#define MY_new_section_hook NAME (aout, new_section_hook)
+#endif
+#ifndef MY_get_symtab_upper_bound
+#define MY_get_symtab_upper_bound NAME (aout, get_symtab_upper_bound)
+#endif
+#ifndef MY_canonicalize_symtab
+#define MY_canonicalize_symtab NAME (aout, canonicalize_symtab)
+#endif
+#ifndef MY_get_reloc_upper_bound
+#define MY_get_reloc_upper_bound NAME (aout,get_reloc_upper_bound)
+#endif
+#ifndef MY_canonicalize_reloc
+#define MY_canonicalize_reloc NAME (aout, canonicalize_reloc)
+#endif
+#ifndef MY_make_empty_symbol
+#define MY_make_empty_symbol NAME (aout, make_empty_symbol)
+#endif
+#ifndef MY_print_symbol
+#define MY_print_symbol NAME (aout, print_symbol)
+#endif
+#ifndef MY_get_symbol_info
+#define MY_get_symbol_info NAME (aout, get_symbol_info)
+#endif
+#ifndef MY_get_lineno
+#define MY_get_lineno NAME (aout, get_lineno)
+#endif
+#ifndef MY_set_arch_mach
+#define MY_set_arch_mach NAME (aout, set_arch_mach)
+#endif
+#ifndef MY_find_nearest_line
+#define MY_find_nearest_line NAME (aout, find_nearest_line)
+#endif
+#ifndef MY_find_inliner_info
+#define MY_find_inliner_info _bfd_nosymbols_find_inliner_info
+#endif
+#ifndef MY_sizeof_headers
+#define MY_sizeof_headers NAME (aout, sizeof_headers)
+#endif
+#ifndef MY_bfd_get_relocated_section_contents
+#define MY_bfd_get_relocated_section_contents \
+			bfd_generic_get_relocated_section_contents
+#endif
+#ifndef MY_bfd_relax_section
+#define MY_bfd_relax_section bfd_generic_relax_section
+#endif
+#ifndef MY_bfd_gc_sections
+#define MY_bfd_gc_sections bfd_generic_gc_sections
+#endif
+#ifndef MY_bfd_lookup_section_flags
+#define MY_bfd_lookup_section_flags bfd_generic_lookup_section_flags
+#endif
+#ifndef MY_bfd_merge_sections
+#define MY_bfd_merge_sections bfd_generic_merge_sections
+#endif
+#ifndef MY_bfd_is_group_section
+#define MY_bfd_is_group_section bfd_generic_is_group_section
+#endif
+#ifndef MY_bfd_discard_group
+#define MY_bfd_discard_group bfd_generic_discard_group
+#endif
+#ifndef MY_section_already_linked
+#define MY_section_already_linked \
+  _bfd_generic_section_already_linked
+#endif
+#ifndef MY_bfd_define_common_symbol
+#define MY_bfd_define_common_symbol bfd_generic_define_common_symbol
+#endif
+#ifndef MY_bfd_reloc_type_lookup
+#define MY_bfd_reloc_type_lookup NAME (aout, reloc_type_lookup)
+#endif
+#ifndef MY_bfd_reloc_name_lookup
+#define MY_bfd_reloc_name_lookup NAME (aout, reloc_name_lookup)
+#endif
+#ifndef MY_bfd_make_debug_symbol
+#define MY_bfd_make_debug_symbol 0
+#endif
+#ifndef MY_read_minisymbols
+#define MY_read_minisymbols NAME (aout, read_minisymbols)
+#endif
+#ifndef MY_minisymbol_to_symbol
+#define MY_minisymbol_to_symbol NAME (aout, minisymbol_to_symbol)
+#endif
+#ifndef MY_bfd_link_hash_table_create
+#define MY_bfd_link_hash_table_create NAME (aout, link_hash_table_create)
+#endif
+#ifndef MY_bfd_link_hash_table_free
+#define MY_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
+#endif
+#ifndef MY_bfd_link_add_symbols
+#define MY_bfd_link_add_symbols NAME (aout, link_add_symbols)
+#endif
+#ifndef MY_bfd_link_just_syms
+#define MY_bfd_link_just_syms _bfd_generic_link_just_syms
+#endif
+#ifndef MY_bfd_copy_link_hash_symbol_type
+#define MY_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#endif
+#ifndef MY_bfd_link_split_section
+#define MY_bfd_link_split_section  _bfd_generic_link_split_section
+#endif
+
+#ifndef MY_bfd_copy_private_bfd_data
+#define MY_bfd_copy_private_bfd_data _bfd_generic_bfd_copy_private_bfd_data
+#endif
+
+#ifndef MY_bfd_merge_private_bfd_data
+#define MY_bfd_merge_private_bfd_data _bfd_generic_bfd_merge_private_bfd_data
+#endif
+
+#ifndef MY_bfd_copy_private_symbol_data
+#define MY_bfd_copy_private_symbol_data _bfd_generic_bfd_copy_private_symbol_data
+#endif
+
+#ifndef MY_bfd_copy_private_header_data
+#define MY_bfd_copy_private_header_data _bfd_generic_bfd_copy_private_header_data
+#endif
+
+#ifndef MY_bfd_print_private_bfd_data
+#define MY_bfd_print_private_bfd_data _bfd_generic_bfd_print_private_bfd_data
+#endif
+
+#ifndef MY_bfd_set_private_flags
+#define MY_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
+#endif
+
+#ifndef MY_bfd_is_local_label_name
+#define MY_bfd_is_local_label_name bfd_generic_is_local_label_name
+#endif
+
+#ifndef MY_bfd_is_target_special_symbol
+#define MY_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#endif
+
+#ifndef MY_bfd_free_cached_info
+#define MY_bfd_free_cached_info NAME (aout, bfd_free_cached_info)
+#endif
+
+#ifndef MY_close_and_cleanup
+#define MY_close_and_cleanup MY_bfd_free_cached_info
+#endif
+
+#ifndef MY_get_dynamic_symtab_upper_bound
+#define MY_get_dynamic_symtab_upper_bound \
+  _bfd_nodynamic_get_dynamic_symtab_upper_bound
+#endif
+#ifndef MY_canonicalize_dynamic_symtab
+#define MY_canonicalize_dynamic_symtab \
+  _bfd_nodynamic_canonicalize_dynamic_symtab
+#endif
+#ifndef MY_get_synthetic_symtab
+#define MY_get_synthetic_symtab \
+  _bfd_nodynamic_get_synthetic_symtab
+#endif
+#ifndef MY_get_dynamic_reloc_upper_bound
+#define MY_get_dynamic_reloc_upper_bound \
+  _bfd_nodynamic_get_dynamic_reloc_upper_bound
+#endif
+#ifndef MY_canonicalize_dynamic_reloc
+#define MY_canonicalize_dynamic_reloc \
+  _bfd_nodynamic_canonicalize_dynamic_reloc
+#endif
+
+/* Aout symbols normally have leading underscores.  */
+#ifndef MY_symbol_leading_char
+#define MY_symbol_leading_char '_'
+#endif
+
+/* Aout archives normally use spaces for padding.  */
+#ifndef AR_PAD_CHAR
+#define AR_PAD_CHAR ' '
+#endif
+
+#ifndef MY_BFD_TARGET
+const bfd_target MY (vec) =
+{
+  TARGETNAME,			/* Name.  */
+  bfd_target_aout_flavour,
+#ifdef TARGET_IS_BIG_ENDIAN_P
+  BFD_ENDIAN_BIG,		/* Target byte order (big).  */
+  BFD_ENDIAN_BIG,		/* Target headers byte order (big).  */
+#else
+  BFD_ENDIAN_LITTLE,		/* Target byte order (little).  */
+  BFD_ENDIAN_LITTLE,		/* Target headers byte order (little).  */
+#endif
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED),
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
+  MY_symbol_leading_char,
+  AR_PAD_CHAR,			/* AR_pad_char.  */
+  15,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
+#ifdef TARGET_IS_BIG_ENDIAN_P
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* Data.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* Headers.  */
+#else
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Data.  */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Headers.  */
+#endif
+    {_bfd_dummy_target, MY_object_p, 		/* bfd_check_format.  */
+       bfd_generic_archive_p, MY_core_file_p},
+    {bfd_false, MY_mkobject,			/* bfd_set_format.  */
+       _bfd_generic_mkarchive, bfd_false},
+    {bfd_false, MY_write_object_contents, 	/* bfd_write_contents.  */
+       _bfd_write_archive_contents, bfd_false},
+
+     BFD_JUMP_TABLE_GENERIC (MY),
+     BFD_JUMP_TABLE_COPY (MY),
+     BFD_JUMP_TABLE_CORE (MY),
+     BFD_JUMP_TABLE_ARCHIVE (MY),
+     BFD_JUMP_TABLE_SYMBOLS (MY),
+     BFD_JUMP_TABLE_RELOCS (MY),
+     BFD_JUMP_TABLE_WRITE (MY),
+     BFD_JUMP_TABLE_LINK (MY),
+     BFD_JUMP_TABLE_DYNAMIC (MY),
+
+  /* Alternative_target.  */
+  NULL,
+
+  MY_backend_data
+};
+#endif /* MY_BFD_TARGET */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aout-tic30.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aout-tic30.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aout-tic30.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aout-tic30.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1114 @@
+/* BFD back-end for TMS320C30 a.out binaries.
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009,
+   2010, 2011
+   Free Software Foundation, Inc.
+   Contributed by Steven Haworth (steve@pm.cse.rmit.edu.au)
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#define TARGET_IS_BIG_ENDIAN_P
+#define N_HEADER_IN_TEXT(x)	1
+#define TEXT_START_ADDR 	1024
+#define TARGET_PAGE_SIZE 	128
+#define SEGMENT_SIZE   		TARGET_PAGE_SIZE
+#define DEFAULT_ARCH 		bfd_arch_tic30
+#define ARCH_SIZE 32
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (tic30_aout_,OP)
+#define TARGETNAME "a.out-tic30"
+#define NAME(x,y) CONCAT3 (tic30_aout,_32_,y)
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libaout.h"
+#include "aout/aout64.h"
+#include "aout/stab_gnu.h"
+#include "aout/ar.h"
+
+#define MY_reloc_howto(BFD, REL, IN, EX, PC)   tic30_aout_reloc_howto (BFD, REL, & IN, & EX, & PC)
+
+#define MY_final_link_relocate    tic30_aout_final_link_relocate
+#define MY_object_p               tic30_aout_object_p
+#define MY_mkobject               NAME (aout,mkobject)
+#define MY_write_object_contents  tic30_aout_write_object_contents
+#define MY_set_sizes              tic30_aout_set_sizes
+
+#ifndef MY_exec_hdr_flags
+#define MY_exec_hdr_flags 1
+#endif
+
+#ifndef MY_backend_data
+
+#ifndef MY_zmagic_contiguous
+#define MY_zmagic_contiguous 0
+#endif
+#ifndef MY_text_includes_header
+#define MY_text_includes_header 0
+#endif
+#ifndef MY_entry_is_text_address
+#define MY_entry_is_text_address 0
+#endif
+#ifndef MY_exec_header_not_counted
+#define MY_exec_header_not_counted 1
+#endif
+#ifndef MY_add_dynamic_symbols
+#define MY_add_dynamic_symbols 0
+#endif
+#ifndef MY_add_one_symbol
+#define MY_add_one_symbol 0
+#endif
+#ifndef MY_link_dynamic_object
+#define MY_link_dynamic_object 0
+#endif
+#ifndef MY_write_dynamic_symbol
+#define MY_write_dynamic_symbol 0
+#endif
+#ifndef MY_check_dynamic_reloc
+#define MY_check_dynamic_reloc 0
+#endif
+#ifndef MY_finish_dynamic_link
+#define MY_finish_dynamic_link 0
+#endif
+
+static bfd_boolean
+tic30_aout_set_sizes (bfd *abfd)
+{
+  adata (abfd).page_size = TARGET_PAGE_SIZE;
+
+#ifdef SEGMENT_SIZE
+  adata (abfd).segment_size = SEGMENT_SIZE;
+#else
+  adata (abfd).segment_size = TARGET_PAGE_SIZE;
+#endif
+
+#ifdef ZMAGIC_DISK_BLOCK_SIZE
+  adata (abfd).zmagic_disk_block_size = ZMAGIC_DISK_BLOCK_SIZE;
+#else
+  adata (abfd).zmagic_disk_block_size = TARGET_PAGE_SIZE;
+#endif
+
+  adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
+
+  return TRUE;
+}
+
+static const struct aout_backend_data tic30_aout_backend_data =
+{
+  MY_zmagic_contiguous,
+  MY_text_includes_header,
+  MY_entry_is_text_address,
+  MY_exec_hdr_flags,
+  0,				/* Text vma?  */
+  MY_set_sizes,
+  MY_exec_header_not_counted,
+  MY_add_dynamic_symbols,
+  MY_add_one_symbol,
+  MY_link_dynamic_object,
+  MY_write_dynamic_symbol,
+  MY_check_dynamic_reloc,
+  MY_finish_dynamic_link
+};
+#define MY_backend_data &tic30_aout_backend_data
+#endif
+
+static reloc_howto_type *
+  tic30_aout_reloc_howto (bfd *, struct reloc_std_external *, int *, int *, int *);
+static bfd_reloc_status_type
+  tic30_aout_final_link_relocate
+    (reloc_howto_type *, bfd *, asection *, bfd_byte *, bfd_vma, bfd_vma, bfd_vma);
+
+/* FIXME: This is wrong.  aoutx.h should really only be included by
+   aout32.c.  */
+
+#include "aoutx.h"
+
+/* This function is used to work out pc-relative offsets for the
+   TMS320C30.  The data already placed by md_pcrel_from within gas is
+   useless for a relocation, so we just get the offset value and place
+   a version of this within the object code.
+   tic30_aout_final_link_relocate will then calculate the required
+   relocation to add on to the value in the object code.  */
+
+static bfd_reloc_status_type
+tic30_aout_fix_pcrel_16 (bfd *abfd,
+			 arelent *reloc_entry,
+			 asymbol *symbol ATTRIBUTE_UNUSED,
+			 void * data,
+			 asection *input_section ATTRIBUTE_UNUSED,
+			 bfd *output_bfd ATTRIBUTE_UNUSED,
+			 char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma relocation = 1;
+  bfd_byte offset_data = bfd_get_8 (abfd, (bfd_byte *) data + reloc_entry->address - 1);
+
+  /* The byte before the location of the fix contains bits 23-16 of
+     the pcrel instruction.  Bit 21 is set for a delayed instruction
+     which requires on offset of 3 instead of 1.  */
+  if (offset_data & 0x20)
+    relocation -= 3;
+  else
+    relocation -= 1;
+  bfd_put_16 (abfd, relocation, (bfd_byte *) data + reloc_entry->address);
+  return bfd_reloc_ok;
+}
+
+/* This function is used as a callback for 16-bit relocs.  This is
+   required for relocations between segments.  A line in aoutx.h
+   requires that any relocations for the data section should point to
+   the end of the aligned text section, plus an offset.  By default,
+   this does not happen, therefore this function takes care of
+   that.  */
+
+static bfd_reloc_status_type
+tic30_aout_fix_16 (bfd *abfd,
+		   arelent *reloc_entry,
+		   asymbol *symbol,
+		   void * data,
+		   asection *input_section ATTRIBUTE_UNUSED,
+		   bfd *output_bfd,
+		   char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma relocation;
+
+  /* Make sure that the symbol's section is defined.  */
+  if (symbol->section == &bfd_und_section && (symbol->flags & BSF_WEAK) == 0)
+    return output_bfd ? bfd_reloc_ok : bfd_reloc_undefined;
+  /* Get the size of the input section and turn it into the TMS320C30
+     32-bit address format.  */
+  relocation = (symbol->section->vma >> 2);
+  relocation += bfd_get_16 (abfd, (bfd_byte *) data + reloc_entry->address);
+  bfd_put_16 (abfd, relocation, (bfd_byte *) data + reloc_entry->address);
+  return bfd_reloc_ok;
+}
+
+/* This function does the same thing as tic30_aout_fix_16 except for 32
+   bit relocations.  */
+
+static bfd_reloc_status_type
+tic30_aout_fix_32 (bfd *abfd,
+		   arelent *reloc_entry,
+		   asymbol *symbol,
+		   void * data,
+		   asection *input_section ATTRIBUTE_UNUSED,
+		   bfd *output_bfd,
+		   char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma relocation;
+
+  /* Make sure that the symbol's section is defined.  */
+  if (symbol->section == &bfd_und_section && (symbol->flags & BSF_WEAK) == 0)
+    return output_bfd ? bfd_reloc_ok : bfd_reloc_undefined;
+  /* Get the size of the input section and turn it into the TMS320C30
+     32-bit address format.  */
+  relocation = (symbol->section->vma >> 2);
+  relocation += bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
+  bfd_put_32 (abfd, relocation, (bfd_byte *) data + reloc_entry->address);
+  return bfd_reloc_ok;
+}
+
+/* This table lists the relocation types for the TMS320C30.  There are
+   only a few relocations required, and all must be divided by 4 (>>
+   2) to get the 32-bit addresses in the format the TMS320C30 likes
+   it.  */
+reloc_howto_type tic30_aout_howto_table[] =
+{
+  EMPTY_HOWTO (-1),
+  HOWTO (1, 2, 1, 16, FALSE, 0, 0, tic30_aout_fix_16,
+	 "16", FALSE, 0x0000FFFF, 0x0000FFFF, FALSE),
+  HOWTO (2, 2, 2, 24, FALSE, 0, complain_overflow_bitfield, NULL,
+	 "24", FALSE, 0x00FFFFFF, 0x00FFFFFF, FALSE),
+  HOWTO (3, 18, 3, 24, FALSE, 0, complain_overflow_bitfield, NULL,
+	 "LDP", FALSE, 0x00FF0000, 0x000000FF, FALSE),
+  HOWTO (4, 2, 4, 32, FALSE, 0, complain_overflow_bitfield, tic30_aout_fix_32,
+	 "32", FALSE, 0xFFFFFFFF, 0xFFFFFFFF, FALSE),
+  HOWTO (5, 2, 1, 16, TRUE, 0, complain_overflow_signed,
+	 tic30_aout_fix_pcrel_16, "PCREL", TRUE, 0x0000FFFF, 0x0000FFFF, TRUE),
+  EMPTY_HOWTO (-1),
+  EMPTY_HOWTO (-1),
+  EMPTY_HOWTO (-1),
+  EMPTY_HOWTO (-1),
+  EMPTY_HOWTO (-1)
+};
+
+
+static reloc_howto_type *
+tic30_aout_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			      bfd_reloc_code_real_type code)
+{
+  switch (code)
+    {
+    case BFD_RELOC_8:
+    case BFD_RELOC_TIC30_LDP:
+      return &tic30_aout_howto_table[3];
+    case BFD_RELOC_16:
+      return &tic30_aout_howto_table[1];
+    case BFD_RELOC_24:
+      return &tic30_aout_howto_table[2];
+    case BFD_RELOC_16_PCREL:
+      return &tic30_aout_howto_table[5];
+    case BFD_RELOC_32:
+      return &tic30_aout_howto_table[4];
+    default:
+      return NULL;
+    }
+}
+
+static reloc_howto_type *
+tic30_aout_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			      const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (tic30_aout_howto_table)
+	    / sizeof (tic30_aout_howto_table[0]));
+       i++)
+    if (tic30_aout_howto_table[i].name != NULL
+	&& strcasecmp (tic30_aout_howto_table[i].name, r_name) == 0)
+      return &tic30_aout_howto_table[i];
+
+  return NULL;
+}
+
+static reloc_howto_type *
+tic30_aout_reloc_howto (bfd *abfd,
+			struct reloc_std_external *relocs,
+			int *r_index,
+			int *r_extern,
+			int *r_pcrel)
+{
+  unsigned int r_length;
+  unsigned int r_pcrel_done;
+  int howto_index;
+
+  *r_pcrel = 0;
+  if (bfd_header_big_endian (abfd))
+    {
+      *r_index = ((relocs->r_index[0] << 16) | (relocs->r_index[1] << 8) | relocs->r_index[2]);
+      *r_extern = (0 != (relocs->r_type[0] & RELOC_STD_BITS_EXTERN_BIG));
+      r_pcrel_done = (0 != (relocs->r_type[0] & RELOC_STD_BITS_PCREL_BIG));
+      r_length = ((relocs->r_type[0] & RELOC_STD_BITS_LENGTH_BIG) >> RELOC_STD_BITS_LENGTH_SH_BIG);
+    }
+  else
+    {
+      *r_index = ((relocs->r_index[2] << 16) | (relocs->r_index[1] << 8) | relocs->r_index[0]);
+      *r_extern = (0 != (relocs->r_type[0] & RELOC_STD_BITS_EXTERN_LITTLE));
+      r_pcrel_done = (0 != (relocs->r_type[0] & RELOC_STD_BITS_PCREL_LITTLE));
+      r_length = ((relocs->r_type[0] & RELOC_STD_BITS_LENGTH_LITTLE) >> RELOC_STD_BITS_LENGTH_SH_LITTLE);
+    }
+  howto_index = r_length + 4 * r_pcrel_done;
+  return tic30_aout_howto_table + howto_index;
+}
+
+/* These macros will get 24-bit values from the bfd definition.
+   Big-endian only.  */
+#define bfd_getb_24(BFD,ADDR)			\
+ (bfd_get_8 (BFD, ADDR    ) << 16) |		\
+ (bfd_get_8 (BFD, ADDR + 1) <<  8) |		\
+ (bfd_get_8 (BFD, ADDR + 2)      )
+
+#define bfd_putb_24(BFD,DATA,ADDR)				\
+ bfd_put_8 (BFD, (bfd_byte) ((DATA >> 16) & 0xFF), ADDR    );	\
+ bfd_put_8 (BFD, (bfd_byte) ((DATA >>  8) & 0xFF), ADDR + 1);	\
+ bfd_put_8 (BFD, (bfd_byte) ( DATA        & 0xFF), ADDR + 2)
+
+/* Set parameters about this a.out file that are machine-dependent.
+   This routine is called from some_aout_object_p just before it returns.  */
+
+static const bfd_target *
+tic30_aout_callback (bfd *abfd)
+{
+  struct internal_exec *execp = exec_hdr (abfd);
+  unsigned int arch_align_power;
+  unsigned long arch_align;
+
+  /* Calculate the file positions of the parts of a newly read aout header.  */
+  obj_textsec (abfd)->size = N_TXTSIZE (*execp);
+
+  /* The virtual memory addresses of the sections.  */
+  obj_textsec (abfd)->vma = N_TXTADDR (*execp);
+  obj_datasec (abfd)->vma = N_DATADDR (*execp);
+  obj_bsssec (abfd)->vma = N_BSSADDR (*execp);
+
+  obj_textsec (abfd)->lma = obj_textsec (abfd)->vma;
+  obj_datasec (abfd)->lma = obj_datasec (abfd)->vma;
+  obj_bsssec (abfd)->lma = obj_bsssec (abfd)->vma;
+
+  /* The file offsets of the sections.  */
+  obj_textsec (abfd)->filepos = N_TXTOFF (*execp);
+  obj_datasec (abfd)->filepos = N_DATOFF (*execp);
+
+  /* The file offsets of the relocation info.  */
+  obj_textsec (abfd)->rel_filepos = N_TRELOFF (*execp);
+  obj_datasec (abfd)->rel_filepos = N_DRELOFF (*execp);
+
+  /* The file offsets of the string table and symbol table.  */
+  obj_sym_filepos (abfd) = N_SYMOFF (*execp);
+  obj_str_filepos (abfd) = N_STROFF (*execp);
+
+  /* Determine the architecture and machine type of the object file.  */
+#ifdef SET_ARCH_MACH
+  SET_ARCH_MACH (abfd, *execp);
+#else
+  bfd_default_set_arch_mach (abfd, DEFAULT_ARCH, 0L);
+#endif
+
+  /* Now that we know the architecture, set the alignments of the
+     sections.  This is normally done by NAME (aout,new_section_hook),
+     but when the initial sections were created the architecture had
+     not yet been set.  However, for backward compatibility, we don't
+     set the alignment power any higher than as required by the size
+     of the section.  */
+  arch_align_power = bfd_get_arch_info (abfd)->section_align_power;
+  arch_align = 1 << arch_align_power;
+  if ((BFD_ALIGN (obj_textsec (abfd)->size, arch_align)
+       == obj_textsec (abfd)->size)
+      && (BFD_ALIGN (obj_datasec (abfd)->size, arch_align)
+	  == obj_datasec (abfd)->size)
+      && (BFD_ALIGN (obj_bsssec (abfd)->size, arch_align)
+	  == obj_bsssec (abfd)->size))
+    {
+      obj_textsec (abfd)->alignment_power = arch_align_power;
+      obj_datasec (abfd)->alignment_power = arch_align_power;
+      obj_bsssec (abfd)->alignment_power = arch_align_power;
+    }
+  return abfd->xvec;
+}
+
+static bfd_reloc_status_type
+tic30_aout_relocate_contents (reloc_howto_type *howto,
+			      bfd *input_bfd,
+			      bfd_vma relocation,
+			      bfd_byte *location)
+{
+  bfd_vma x;
+  bfd_boolean overflow;
+
+  if (howto->size < 0)
+    relocation = -relocation;
+
+  switch (howto->size)
+    {
+    default:
+    case 0:
+      abort ();
+      break;
+    case 1:
+      x = bfd_get_16 (input_bfd, location);
+      break;
+    case 2:
+      x = bfd_getb_24 (input_bfd, location);
+      break;
+    case 3:
+      x = bfd_get_8 (input_bfd, location);
+      break;
+    case 4:
+      x = bfd_get_32 (input_bfd, location);
+      break;
+    }
+
+  overflow = FALSE;
+
+  if (howto->complain_on_overflow != complain_overflow_dont)
+    {
+      bfd_vma check;
+      bfd_signed_vma signed_check;
+      bfd_vma add;
+      bfd_signed_vma signed_add;
+
+      if (howto->rightshift == 0)
+	{
+	  check = relocation;
+	  signed_check = (bfd_signed_vma) relocation;
+	}
+      else
+	{
+	  check = relocation >> howto->rightshift;
+	  if ((bfd_signed_vma) relocation >= 0)
+	    signed_check = check;
+	  else
+	    signed_check = (check | ((bfd_vma) - 1 & ~((bfd_vma) - 1 >> howto->rightshift)));
+	}
+      add = x & howto->src_mask;
+      signed_add = add;
+      if ((add & (((~howto->src_mask) >> 1) & howto->src_mask)) != 0)
+	signed_add -= (((~howto->src_mask) >> 1) & howto->src_mask) << 1;
+      if (howto->bitpos == 0)
+	{
+	  check += add;
+	  signed_check += signed_add;
+	}
+      else
+	{
+	  check += add >> howto->bitpos;
+	  if (signed_add >= 0)
+	    signed_check += add >> howto->bitpos;
+	  else
+	    signed_check += ((add >> howto->bitpos) | ((bfd_vma) - 1 & ~((bfd_vma) - 1 >> howto->bitpos)));
+	}
+      switch (howto->complain_on_overflow)
+	{
+	case complain_overflow_signed:
+	  {
+	    bfd_signed_vma reloc_signed_max = (1 << (howto->bitsize - 1)) - 1;
+	    bfd_signed_vma reloc_signed_min = ~reloc_signed_max;
+
+	    if (signed_check > reloc_signed_max || signed_check < reloc_signed_min)
+	      overflow = TRUE;
+	  }
+	  break;
+	case complain_overflow_unsigned:
+	  {
+	    bfd_vma reloc_unsigned_max = (((1 << (howto->bitsize - 1)) - 1) << 1) | 1;
+
+	    if (check > reloc_unsigned_max)
+	      overflow = TRUE;
+	  }
+	  break;
+	case complain_overflow_bitfield:
+	  {
+	    bfd_vma reloc_bits = (((1 << (howto->bitsize - 1)) - 1) << 1) | 1;
+
+	    if ((check & ~reloc_bits) != 0
+		&& (((bfd_vma) signed_check & ~reloc_bits)
+		    != ((bfd_vma) -1 & ~reloc_bits)))
+	      overflow = TRUE;
+	  }
+	  break;
+	default:
+	  abort ();
+	}
+    }
+  relocation >>= (bfd_vma) howto->rightshift;
+  relocation <<= (bfd_vma) howto->bitpos;
+  x = ((x & ~howto->dst_mask) | (((x & howto->src_mask) + relocation) & howto->dst_mask));
+  switch (howto->size)
+    {
+    default:
+    case 0:
+      abort ();
+      break;
+    case 1:
+      bfd_put_16 (input_bfd, x, location);
+      break;
+    case 2:
+      bfd_putb_24 (input_bfd, x, location);
+      break;
+    case 3:
+      bfd_put_8 (input_bfd, x, location);
+      break;
+    case 4:
+      bfd_put_32 (input_bfd, x, location);
+      break;
+    }
+  return overflow ? bfd_reloc_overflow : bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type
+tic30_aout_final_link_relocate (reloc_howto_type *howto,
+				bfd *input_bfd,
+				asection *input_section,
+				bfd_byte *contents,
+				bfd_vma address,
+				bfd_vma value,
+				bfd_vma addend)
+{
+  bfd_vma relocation;
+
+  if (address > bfd_get_section_limit (input_bfd, input_section))
+    return bfd_reloc_outofrange;
+
+  relocation = value + addend;
+  if (howto->pc_relative)
+    {
+      relocation -= (input_section->output_section->vma + input_section->output_offset);
+      if (howto->pcrel_offset)
+	relocation -= address;
+    }
+  return tic30_aout_relocate_contents (howto, input_bfd, relocation,
+				       contents + address);
+}
+
+/* Finish up the reading of an a.out file header.  */
+
+static const bfd_target *
+tic30_aout_object_p (bfd *abfd)
+{
+  struct external_exec exec_bytes;	/* Raw exec header from file.  */
+  struct internal_exec exec;		/* Cleaned-up exec header.  */
+  const bfd_target *target;
+  bfd_size_type amt = EXEC_BYTES_SIZE;
+
+  if (bfd_bread (& exec_bytes, amt, abfd) != amt)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return 0;
+    }
+
+#ifdef SWAP_MAGIC
+  exec.a_info = SWAP_MAGIC (exec_bytes.e_info);
+#else
+  exec.a_info = H_GET_32 (abfd, exec_bytes.e_info);
+#endif /* SWAP_MAGIC */
+
+  if (N_BADMAG (exec))
+    return 0;
+#ifdef MACHTYPE_OK
+  if (!(MACHTYPE_OK (N_MACHTYPE (exec))))
+    return 0;
+#endif
+
+  NAME (aout, swap_exec_header_in) (abfd, &exec_bytes, &exec);
+
+#ifdef SWAP_MAGIC
+  /* Swap_exec_header_in read in a_info with the wrong byte order.  */
+  exec.a_info = SWAP_MAGIC (exec_bytes.e_info);
+#endif
+
+  target = NAME (aout, some_aout_object_p) (abfd, &exec, tic30_aout_callback);
+
+#ifdef ENTRY_CAN_BE_ZERO
+  /* The NEWSOS3 entry-point is/was 0, which (amongst other lossage)
+     means that it isn't obvious if EXEC_P should be set.
+     All of the following must be true for an executable:
+     There must be no relocations, the bfd can be neither an
+     archive nor an archive element, and the file must be executable.  */
+
+  if (exec.a_trsize + exec.a_drsize == 0
+      && bfd_get_format (abfd) == bfd_object && abfd->my_archive == NULL)
+    {
+      struct stat buf;
+#ifndef S_IXUSR
+#define S_IXUSR 0100		/* Execute by owner.  */
+#endif
+      if (stat (abfd->filename, &buf) == 0 && (buf.st_mode & S_IXUSR))
+	abfd->flags |= EXEC_P;
+    }
+#endif
+
+  return target;
+}
+
+/* Copy private section data.  This actually does nothing with the
+   sections.  It copies the subformat field.  We copy it here, because
+   we need to know whether this is a QMAGIC file before we set the
+   section contents, and copy_private_bfd_data is not called until
+   after the section contents have been set.  */
+
+static bfd_boolean
+MY_bfd_copy_private_section_data (bfd *ibfd,
+				  asection *isec ATTRIBUTE_UNUSED,
+				  bfd *obfd,
+				  asection *osec ATTRIBUTE_UNUSED)
+{
+  if (bfd_get_flavour (obfd) == bfd_target_aout_flavour)
+    obj_aout_subformat (obfd) = obj_aout_subformat (ibfd);
+  return TRUE;
+}
+
+/* Write an object file.
+   Section contents have already been written.  We write the
+   file header, symbols, and relocation.  */
+
+static bfd_boolean
+tic30_aout_write_object_contents (bfd *abfd)
+{
+  struct external_exec exec_bytes;
+  struct internal_exec *execp = exec_hdr (abfd);
+
+  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+
+  {
+    bfd_size_type text_size;	/* Dummy vars.  */
+    file_ptr text_end;
+
+    if (adata (abfd).magic == undecided_magic)
+      NAME (aout, adjust_sizes_and_vmas) (abfd, &text_size, &text_end);
+
+    execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE;
+    execp->a_entry = bfd_get_start_address (abfd);
+
+    execp->a_trsize = ((obj_textsec (abfd)->reloc_count) * obj_reloc_entry_size (abfd));
+    execp->a_drsize = ((obj_datasec (abfd)->reloc_count) * obj_reloc_entry_size (abfd));
+    NAME (aout, swap_exec_header_out) (abfd, execp, &exec_bytes);
+
+    if (adata (abfd).exec_bytes_size > 0)
+      {
+	bfd_size_type amt;
+
+	if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+	  return FALSE;
+	amt = adata (abfd).exec_bytes_size;
+	if (bfd_bwrite (& exec_bytes, amt, abfd) != amt)
+	  return FALSE;
+      }
+
+    /* Now write out reloc info, followed by syms and strings.  */
+    if (bfd_get_outsymbols (abfd) != (asymbol **) NULL
+	&& bfd_get_symcount (abfd) != 0)
+      {
+	if (bfd_seek (abfd, (file_ptr) (N_SYMOFF (*execp)), SEEK_SET) != 0)
+	  return FALSE;
+
+	if (!NAME (aout, write_syms) (abfd))
+	  return FALSE;
+      }
+
+    if (bfd_seek (abfd, (file_ptr) (N_TRELOFF (*execp)), SEEK_SET) != 0)
+      return FALSE;
+    if (!NAME (aout, squirt_out_relocs) (abfd, obj_textsec (abfd)))
+      return FALSE;
+
+    if (bfd_seek (abfd, (file_ptr) (N_DRELOFF (*execp)), SEEK_SET) != 0)
+      return FALSE;
+    if (!NAME (aout, squirt_out_relocs) (abfd, obj_datasec (abfd)))
+      return FALSE;
+  }
+
+  return TRUE;
+}
+
+#ifndef MY_final_link_callback
+
+/* Callback for the final_link routine to set the section offsets.  */
+
+static void
+MY_final_link_callback (bfd *abfd,
+			file_ptr *ptreloff,
+			file_ptr *pdreloff,
+			file_ptr *psymoff)
+{
+  struct internal_exec *execp = exec_hdr (abfd);
+
+  *ptreloff = obj_datasec (abfd)->filepos + execp->a_data;
+  *pdreloff = *ptreloff + execp->a_trsize;
+  *psymoff = *pdreloff + execp->a_drsize;;
+}
+
+#endif
+
+#ifndef MY_bfd_final_link
+
+/* Final link routine.  We need to use a call back to get the correct
+   offsets in the output file.  */
+
+static bfd_boolean
+MY_bfd_final_link (bfd *abfd, struct bfd_link_info *info)
+{
+  struct internal_exec *execp = exec_hdr (abfd);
+  file_ptr pos;
+  bfd_vma vma = 0;
+  int pad;
+
+  /* Set the executable header size to 0, as we don't want one for an
+     output.  */
+  adata (abfd).exec_bytes_size = 0;
+  pos = adata (abfd).exec_bytes_size;
+  /* Text.  */
+  vma = info->create_object_symbols_section->vma;
+  pos += vma;
+  obj_textsec (abfd)->filepos = pos;
+  obj_textsec (abfd)->vma = vma;
+  obj_textsec (abfd)->user_set_vma = 1;
+  pos += obj_textsec (abfd)->size;
+  vma += obj_textsec (abfd)->size;
+
+  /* Data.  */
+  if (abfd->flags & D_PAGED)
+    {
+      if (info->create_object_symbols_section->next->vma > 0)
+	obj_datasec (abfd)->vma = info->create_object_symbols_section->next->vma;
+      else
+	obj_datasec (abfd)->vma = BFD_ALIGN (vma, adata (abfd).segment_size);
+    }
+  else
+    obj_datasec (abfd)->vma = BFD_ALIGN (vma, 4);
+
+  if (obj_datasec (abfd)->vma < vma)
+    obj_datasec (abfd)->vma = BFD_ALIGN (vma, 4);
+
+  obj_datasec (abfd)->user_set_vma = 1;
+  vma = obj_datasec (abfd)->vma;
+  obj_datasec (abfd)->filepos = vma + adata (abfd).exec_bytes_size;
+  execp->a_text = vma - obj_textsec (abfd)->vma;
+  obj_textsec (abfd)->size = execp->a_text;
+
+  /* Since BSS follows data immediately, see if it needs alignment.  */
+  vma += obj_datasec (abfd)->size;
+  pad = align_power (vma, obj_bsssec (abfd)->alignment_power) - vma;
+  obj_datasec (abfd)->size += pad;
+  pos += obj_datasec (abfd)->size;
+  execp->a_data = obj_datasec (abfd)->size;
+
+  /* BSS.  */
+  obj_bsssec (abfd)->vma = vma;
+  obj_bsssec (abfd)->user_set_vma = 1;
+
+  /* We are fully resized, so don't readjust in final_link.  */
+  adata (abfd).magic = z_magic;
+
+  return NAME (aout, final_link) (abfd, info, MY_final_link_callback);
+}
+
+#endif
+
+static enum machine_type
+tic30_aout_machine_type (enum bfd_architecture arch,
+			 unsigned long machine ATTRIBUTE_UNUSED,
+			 bfd_boolean *unknown)
+{
+  enum machine_type arch_flags;
+
+  arch_flags = M_UNKNOWN;
+  *unknown = TRUE;
+
+  switch (arch)
+    {
+    case bfd_arch_tic30:
+      *unknown = FALSE;
+      break;
+    default:
+      arch_flags = M_UNKNOWN;
+    }
+  if (arch_flags != M_UNKNOWN)
+    *unknown = FALSE;
+  return arch_flags;
+}
+
+static bfd_boolean
+tic30_aout_set_arch_mach (bfd *abfd,
+			  enum bfd_architecture arch,
+			  unsigned long machine)
+{
+  if (!bfd_default_set_arch_mach (abfd, arch, machine))
+    return FALSE;
+  if (arch != bfd_arch_unknown)
+    {
+      bfd_boolean unknown;
+      tic30_aout_machine_type (arch, machine, &unknown);
+      if (unknown)
+	return FALSE;
+    }
+  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+  return (*aout_backend_info (abfd)->set_sizes) (abfd);
+}
+
+/* We assume BFD generic archive files.  */
+#ifndef	MY_openr_next_archived_file
+#define	MY_openr_next_archived_file	bfd_generic_openr_next_archived_file
+#endif
+#ifndef MY_get_elt_at_index
+#define MY_get_elt_at_index		_bfd_generic_get_elt_at_index
+#endif
+#ifndef	MY_generic_stat_arch_elt
+#define	MY_generic_stat_arch_elt	bfd_generic_stat_arch_elt
+#endif
+#ifndef	MY_slurp_armap
+#define	MY_slurp_armap			bfd_slurp_bsd_armap
+#endif
+#ifndef	MY_slurp_extended_name_table
+#define	MY_slurp_extended_name_table	_bfd_slurp_extended_name_table
+#endif
+#ifndef MY_construct_extended_name_table
+#define MY_construct_extended_name_table \
+  _bfd_archive_bsd_construct_extended_name_table
+#endif
+#ifndef	MY_write_armap
+#define	MY_write_armap			bsd_write_armap
+#endif
+#ifndef MY_read_ar_hdr
+#define MY_read_ar_hdr			_bfd_generic_read_ar_hdr
+#endif
+#ifndef MY_write_ar_hdr
+#define MY_write_ar_hdr			_bfd_generic_write_ar_hdr
+#endif
+#ifndef	MY_truncate_arname
+#define	MY_truncate_arname		bfd_bsd_truncate_arname
+#endif
+#ifndef MY_update_armap_timestamp
+#define MY_update_armap_timestamp 	_bfd_archive_bsd_update_armap_timestamp
+#endif
+
+/* No core file defined here -- configure in trad-core.c separately.  */
+#ifndef	MY_core_file_failing_command
+#define	MY_core_file_failing_command 	_bfd_nocore_core_file_failing_command
+#endif
+#ifndef	MY_core_file_failing_signal
+#define	MY_core_file_failing_signal	_bfd_nocore_core_file_failing_signal
+#endif
+#ifndef	MY_core_file_matches_executable_p
+#define	MY_core_file_matches_executable_p	\
+				_bfd_nocore_core_file_matches_executable_p
+#endif
+#ifndef	MY_core_file_pid
+#define	MY_core_file_pid  		_bfd_nocore_core_file_pid
+#endif
+#ifndef	MY_core_file_p
+#define	MY_core_file_p			_bfd_dummy_target
+#endif
+
+#ifndef MY_bfd_debug_info_start
+#define MY_bfd_debug_info_start		bfd_void
+#endif
+#ifndef MY_bfd_debug_info_end
+#define MY_bfd_debug_info_end		bfd_void
+#endif
+#ifndef MY_bfd_debug_info_accumulate
+#define MY_bfd_debug_info_accumulate	\
+		(void (*) (bfd*, struct bfd_section *)) bfd_void
+#endif
+
+#ifndef MY_core_file_failing_command
+#define MY_core_file_failing_command NAME (aout, core_file_failing_command)
+#endif
+#ifndef MY_core_file_failing_signal
+#define MY_core_file_failing_signal NAME (aout, core_file_failing_signal)
+#endif
+#ifndef MY_core_file_matches_executable_p
+#define MY_core_file_matches_executable_p NAME (aout, core_file_matches_executable_p)
+#endif
+#ifndef MY_set_section_contents
+#define MY_set_section_contents NAME (aout, set_section_contents)
+#endif
+#ifndef MY_get_section_contents
+#define MY_get_section_contents aout_32_get_section_contents
+#endif
+#ifndef MY_get_section_contents_in_window
+#define MY_get_section_contents_in_window _bfd_generic_get_section_contents_in_window
+#endif
+#ifndef MY_new_section_hook
+#define MY_new_section_hook NAME (aout, new_section_hook)
+#endif
+#ifndef MY_get_symtab_upper_bound
+#define MY_get_symtab_upper_bound NAME (aout, get_symtab_upper_bound)
+#endif
+#ifndef MY_canonicalize_symtab
+#define MY_canonicalize_symtab NAME (aout, canonicalize_symtab)
+#endif
+#ifndef MY_get_reloc_upper_bound
+#define MY_get_reloc_upper_bound NAME (aout, get_reloc_upper_bound)
+#endif
+#ifndef MY_canonicalize_reloc
+#define MY_canonicalize_reloc NAME (aout, canonicalize_reloc)
+#endif
+#ifndef MY_make_empty_symbol
+#define MY_make_empty_symbol NAME (aout, make_empty_symbol)
+#endif
+#ifndef MY_print_symbol
+#define MY_print_symbol NAME (aout, print_symbol)
+#endif
+#ifndef MY_get_symbol_info
+#define MY_get_symbol_info NAME (aout, get_symbol_info)
+#endif
+#ifndef MY_get_lineno
+#define MY_get_lineno NAME (aout, get_lineno)
+#endif
+#ifndef MY_set_arch_mach
+#define MY_set_arch_mach tic30_aout_set_arch_mach
+#endif
+#ifndef MY_find_nearest_line
+#define MY_find_nearest_line NAME (aout, find_nearest_line)
+#endif
+#ifndef MY_find_inliner_info
+#define MY_find_inliner_info _bfd_nosymbols_find_inliner_info
+#endif
+#ifndef MY_sizeof_headers
+#define MY_sizeof_headers NAME (aout, sizeof_headers)
+#endif
+#ifndef MY_bfd_get_relocated_section_contents
+#define MY_bfd_get_relocated_section_contents \
+			bfd_generic_get_relocated_section_contents
+#endif
+#ifndef MY_bfd_relax_section
+#define MY_bfd_relax_section bfd_generic_relax_section
+#endif
+#ifndef MY_bfd_gc_sections
+#define MY_bfd_gc_sections bfd_generic_gc_sections
+#endif
+#ifndef MY_bfd_lookup_section_flags
+#define MY_bfd_lookup_section_flags bfd_generic_lookup_section_flags
+#endif
+#ifndef MY_bfd_merge_sections
+#define MY_bfd_merge_sections bfd_generic_merge_sections
+#endif
+#ifndef MY_bfd_is_group_section
+#define MY_bfd_is_group_section bfd_generic_is_group_section
+#endif
+#ifndef MY_bfd_discard_group
+#define MY_bfd_discard_group bfd_generic_discard_group
+#endif
+#ifndef MY_section_already_linked
+#define MY_section_already_linked \
+  _bfd_generic_section_already_linked
+#endif
+#ifndef MY_bfd_define_common_symbol
+#define MY_bfd_define_common_symbol bfd_generic_define_common_symbol
+#endif
+#ifndef MY_bfd_reloc_type_lookup
+#define MY_bfd_reloc_type_lookup tic30_aout_reloc_type_lookup
+#endif
+#ifndef MY_bfd_reloc_name_lookup
+#define MY_bfd_reloc_name_lookup tic30_aout_reloc_name_lookup
+#endif
+#ifndef MY_bfd_make_debug_symbol
+#define MY_bfd_make_debug_symbol 0
+#endif
+#ifndef MY_read_minisymbols
+#define MY_read_minisymbols NAME (aout, read_minisymbols)
+#endif
+#ifndef MY_minisymbol_to_symbol
+#define MY_minisymbol_to_symbol NAME (aout, minisymbol_to_symbol)
+#endif
+#ifndef MY_bfd_link_hash_table_create
+#define MY_bfd_link_hash_table_create NAME (aout, link_hash_table_create)
+#endif
+#ifndef MY_bfd_link_hash_table_free
+#define MY_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
+#endif
+#ifndef MY_bfd_link_add_symbols
+#define MY_bfd_link_add_symbols NAME (aout, link_add_symbols)
+#endif
+#ifndef MY_bfd_link_just_syms
+#define MY_bfd_link_just_syms _bfd_generic_link_just_syms
+#endif
+#ifndef MY_bfd_copy_link_hash_symbol_type
+#define MY_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#endif
+#ifndef MY_bfd_link_split_section
+#define MY_bfd_link_split_section  _bfd_generic_link_split_section
+#endif
+
+#ifndef MY_bfd_copy_private_bfd_data
+#define MY_bfd_copy_private_bfd_data _bfd_generic_bfd_copy_private_bfd_data
+#endif
+
+#ifndef MY_bfd_merge_private_bfd_data
+#define MY_bfd_merge_private_bfd_data _bfd_generic_bfd_merge_private_bfd_data
+#endif
+
+#ifndef MY_bfd_copy_private_symbol_data
+#define MY_bfd_copy_private_symbol_data _bfd_generic_bfd_copy_private_symbol_data
+#endif
+
+#ifndef MY_bfd_copy_private_header_data
+#define MY_bfd_copy_private_header_data _bfd_generic_bfd_copy_private_header_data
+#endif
+
+#ifndef MY_bfd_print_private_bfd_data
+#define MY_bfd_print_private_bfd_data _bfd_generic_bfd_print_private_bfd_data
+#endif
+
+#ifndef MY_bfd_set_private_flags
+#define MY_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
+#endif
+
+#ifndef MY_bfd_is_local_label_name
+#define MY_bfd_is_local_label_name bfd_generic_is_local_label_name
+#endif
+
+#ifndef MY_bfd_is_target_special_symbol
+#define MY_bfd_is_target_special_symbol  \
+  ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#endif
+
+#ifndef MY_bfd_free_cached_info
+#define MY_bfd_free_cached_info NAME (aout, bfd_free_cached_info)
+#endif
+
+#ifndef MY_close_and_cleanup
+#define MY_close_and_cleanup MY_bfd_free_cached_info
+#endif
+
+#ifndef MY_get_dynamic_symtab_upper_bound
+#define MY_get_dynamic_symtab_upper_bound \
+  _bfd_nodynamic_get_dynamic_symtab_upper_bound
+#endif
+#ifndef MY_canonicalize_dynamic_symtab
+#define MY_canonicalize_dynamic_symtab \
+  _bfd_nodynamic_canonicalize_dynamic_symtab
+#endif
+#ifndef MY_get_synthetic_symtab
+#define MY_get_synthetic_symtab \
+  _bfd_nodynamic_get_synthetic_symtab
+#endif
+#ifndef MY_get_dynamic_reloc_upper_bound
+#define MY_get_dynamic_reloc_upper_bound \
+  _bfd_nodynamic_get_dynamic_reloc_upper_bound
+#endif
+#ifndef MY_canonicalize_dynamic_reloc
+#define MY_canonicalize_dynamic_reloc \
+  _bfd_nodynamic_canonicalize_dynamic_reloc
+#endif
+
+/* Aout symbols normally have leading underscores.  */
+#ifndef MY_symbol_leading_char
+#define MY_symbol_leading_char '_'
+#endif
+
+/* Aout archives normally use spaces for padding.  */
+#ifndef AR_PAD_CHAR
+#define AR_PAD_CHAR ' '
+#endif
+
+#ifndef MY_BFD_TARGET
+const bfd_target tic30_aout_vec =
+{
+  TARGETNAME,			/* Name.  */
+  bfd_target_aout_flavour,
+  BFD_ENDIAN_BIG,		/* Target byte order (big).  */
+  BFD_ENDIAN_BIG,		/* Target headers byte order (big).  */
+  (HAS_RELOC |			/* Object flags.  */
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* Section flags.  */
+  MY_symbol_leading_char,
+  AR_PAD_CHAR,			/* AR_pad_char.  */
+  15,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Data.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Headers.  */
+  {_bfd_dummy_target, MY_object_p,		/* bfd_check_format.  */
+   bfd_generic_archive_p, MY_core_file_p},
+  {bfd_false, MY_mkobject,			/* bfd_set_format.  */
+   _bfd_generic_mkarchive, bfd_false},
+  {bfd_false, MY_write_object_contents,		/* bfd_write_contents.  */
+   _bfd_write_archive_contents, bfd_false},
+
+  BFD_JUMP_TABLE_GENERIC (MY),
+  BFD_JUMP_TABLE_COPY (MY),
+  BFD_JUMP_TABLE_CORE (MY),
+  BFD_JUMP_TABLE_ARCHIVE (MY),
+  BFD_JUMP_TABLE_SYMBOLS (MY),
+  BFD_JUMP_TABLE_RELOCS (MY),
+  BFD_JUMP_TABLE_WRITE (MY),
+  BFD_JUMP_TABLE_LINK (MY),
+  BFD_JUMP_TABLE_DYNAMIC (MY),
+
+  NULL,
+
+  MY_backend_data
+};
+#endif /* MY_BFD_TARGET */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aout0.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aout0.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aout0.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aout0.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,38 @@
+/* BFD backend for SunOS style a.out with flags set to 0
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 2001, 2005, 2007
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define TARGETNAME "a.out-zero-big"
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (aout0_big_,OP)
+
+#include "bfd.h"
+
+#define MY_exec_hdr_flags 0
+
+#define MACHTYPE_OK(mtype) \
+  ((mtype) == M_UNKNOWN || (mtype) == M_68010 || (mtype) == M_68020)
+
+/* Include the usual a.out support.  */
+#include "aoutf1.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aout32.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aout32.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aout32.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aout32.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,25 @@
+/* BFD back-end for 32-bit a.out files.
+   Copyright 1990, 1991, 1992, 1993, 1994, 2005, 2007
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define ARCH_SIZE 32
+
+#include "aoutx.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aout64.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aout64.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aout64.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aout64.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,33 @@
+/* BFD back-end for 64-bit a.out files.
+   Copyright 1990, 1991, 1992, 1994, 2005, 2007
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define ARCH_SIZE 64
+
+/* aoutx.h requires definitions for BMAGIC and QMAGIC.  */
+#ifndef BMAGIC
+#define BMAGIC 0
+#endif
+#ifndef QMAGIC
+#define QMAGIC 0
+#endif
+
+#include "aoutx.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aoutf1.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aoutf1.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aoutf1.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aoutf1.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,794 @@
+/* A.out "format 1" file handling code for BFD.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
+   2001, 2002, 2003, 2004, 2005, 2006, 2007
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#include "aout/sun4.h"
+#include "libaout.h"		/* BFD a.out internal data structures.  */
+
+#include "aout/aout64.h"
+#include "aout/stab_gnu.h"
+#include "aout/ar.h"
+
+/* This is needed to reject a NewsOS file, e.g. in
+   gdb/testsuite/gdb.t10/crossload.exp. <kingdon@cygnus.com>
+   I needed to add M_UNKNOWN to recognize a 68000 object, so this will
+   probably no longer reject a NewsOS object.  <ian@cygnus.com>.  */
+#ifndef MACHTYPE_OK
+#define MACHTYPE_OK(mtype) \
+  (((mtype) == M_SPARC && bfd_lookup_arch (bfd_arch_sparc, 0) != NULL) \
+   || (((mtype) == M_UNKNOWN || (mtype) == M_68010 || (mtype) == M_68020) \
+       && bfd_lookup_arch (bfd_arch_m68k, 0) != NULL))
+#endif
+
+/* The file @code{aoutf1.h} contains the code for BFD's
+   a.out back end.  Control over the generated back end is given by these
+   two preprocessor names:
+   @table @code
+   @item ARCH_SIZE
+   This value should be either 32 or 64, depending upon the size of an
+   int in the target format. It changes the sizes of the structs which
+   perform the memory/disk mapping of structures.
+
+   The 64 bit backend may only be used if the host compiler supports 64
+   ints (eg long long with gcc), by defining the name @code{BFD_HOST_64_BIT} in @code{bfd.h}.
+   With this name defined, @emph{all} bfd operations are performed with 64bit
+   arithmetic, not just those to a 64bit target.
+
+   @item TARGETNAME
+   The name put into the target vector.
+   @item
+   @end table.  */
+
+#if ARCH_SIZE == 64
+#define sunos_set_arch_mach sunos_64_set_arch_mach
+#define sunos_write_object_contents aout_64_sunos4_write_object_contents
+#else
+#define sunos_set_arch_mach sunos_32_set_arch_mach
+#define sunos_write_object_contents aout_32_sunos4_write_object_contents
+#endif
+
+/* Merge backend data into the output file.
+   This is necessary on sparclet-aout where we want the resultant machine
+   number to be M_SPARCLET if any input file is M_SPARCLET.  */
+
+#define MY_bfd_merge_private_bfd_data sunos_merge_private_bfd_data
+
+static bfd_boolean
+sunos_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  if (bfd_get_flavour (ibfd) != bfd_target_aout_flavour
+      || bfd_get_flavour (obfd) != bfd_target_aout_flavour)
+    return TRUE;
+
+  if (bfd_get_arch (obfd) == bfd_arch_sparc)
+    {
+      if (bfd_get_mach (obfd) < bfd_get_mach (ibfd))
+	bfd_set_arch_mach (obfd, bfd_arch_sparc, bfd_get_mach (ibfd));
+    }
+
+  return TRUE;
+}
+
+/* This is either sunos_32_set_arch_mach or sunos_64_set_arch_mach,
+   depending upon ARCH_SIZE.  */
+
+static void
+sunos_set_arch_mach (bfd *abfd, enum machine_type machtype)
+{
+  /* Determine the architecture and machine type of the object file.  */
+  enum bfd_architecture arch;
+  unsigned long machine;
+
+  switch (machtype)
+    {
+    case M_UNKNOWN:
+      /* Some Sun3s make magic numbers without cpu types in them, so
+	 we'll default to the 68000.  */
+      arch = bfd_arch_m68k;
+      machine = bfd_mach_m68000;
+      break;
+
+    case M_68010:
+    case M_HP200:
+      arch = bfd_arch_m68k;
+      machine = bfd_mach_m68010;
+      break;
+
+    case M_68020:
+    case M_HP300:
+      arch = bfd_arch_m68k;
+      machine = bfd_mach_m68020;
+      break;
+
+    case M_SPARC:
+      arch = bfd_arch_sparc;
+      machine = 0;
+      break;
+
+    case M_SPARCLET:
+      arch = bfd_arch_sparc;
+      machine = bfd_mach_sparc_sparclet;
+      break;
+
+    case M_SPARCLITE_LE:
+      arch = bfd_arch_sparc;
+      machine = bfd_mach_sparc_sparclite_le;
+      break;
+
+    case M_386:
+    case M_386_DYNIX:
+      arch = bfd_arch_i386;
+      machine = 0;
+      break;
+
+    case M_HPUX:
+      arch = bfd_arch_m68k;
+      machine = 0;
+      break;
+
+    default:
+      arch = bfd_arch_obscure;
+      machine = 0;
+      break;
+    }
+  bfd_set_arch_mach (abfd, arch, machine);
+}
+
+#define SET_ARCH_MACH(ABFD, EXEC) \
+  NAME(sunos,set_arch_mach) (ABFD, N_MACHTYPE (EXEC)); \
+  choose_reloc_size(ABFD);
+
+/* Determine the size of a relocation entry, based on the architecture.  */
+
+static void
+choose_reloc_size (bfd *abfd)
+{
+  switch (bfd_get_arch (abfd))
+    {
+    case bfd_arch_sparc:
+      obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;
+      break;
+    default:
+      obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+      break;
+    }
+}
+
+/* Write an object file in SunOS format.  Section contents have
+   already been written.  We write the file header, symbols, and
+   relocation.  The real name of this function is either
+   aout_64_sunos4_write_object_contents or
+   aout_32_sunos4_write_object_contents, depending upon ARCH_SIZE.  */
+
+static bfd_boolean
+sunos_write_object_contents (bfd *abfd)
+{
+  struct external_exec exec_bytes;
+  struct internal_exec *execp = exec_hdr (abfd);
+
+  /* Magic number, maestro, please!  */
+  switch (bfd_get_arch (abfd))
+    {
+    case bfd_arch_m68k:
+      switch (bfd_get_mach (abfd))
+	{
+	case bfd_mach_m68000:
+	  N_SET_MACHTYPE (*execp, M_UNKNOWN);
+	  break;
+	case bfd_mach_m68010:
+	  N_SET_MACHTYPE (*execp, M_68010);
+	  break;
+	default:
+	case bfd_mach_m68020:
+	  N_SET_MACHTYPE (*execp, M_68020);
+	  break;
+	}
+      break;
+    case bfd_arch_sparc:
+      switch (bfd_get_mach (abfd))
+	{
+	case bfd_mach_sparc_sparclet:
+	  N_SET_MACHTYPE (*execp, M_SPARCLET);
+	  break;
+	case bfd_mach_sparc_sparclite_le:
+	  N_SET_MACHTYPE (*execp, M_SPARCLITE_LE);
+	  break;
+	default:
+	  N_SET_MACHTYPE (*execp, M_SPARC);
+	  break;
+	}
+      break;
+    case bfd_arch_i386:
+      N_SET_MACHTYPE (*execp, M_386);
+      break;
+    default:
+      N_SET_MACHTYPE (*execp, M_UNKNOWN);
+    }
+
+  choose_reloc_size (abfd);
+
+  N_SET_FLAGS (*execp, aout_backend_info (abfd)->exec_hdr_flags);
+
+  N_SET_DYNAMIC (*execp, (long)(bfd_get_file_flags (abfd) & DYNAMIC));
+
+  WRITE_HEADERS (abfd, execp);
+
+  return TRUE;
+}
+
+/* Core files.  */
+
+#define CORE_MAGIC   0x080456
+#define CORE_NAMELEN 16
+
+/* The core structure is taken from the Sun documentation.
+  Unfortunately, they don't document the FPA structure, or at least I
+  can't find it easily.  Fortunately the core header contains its own
+  length.  So this shouldn't cause problems, except for c_ucode, which
+  so far we don't use but is easy to find with a little arithmetic.  */
+
+/* But the reg structure can be gotten from the SPARC processor handbook.
+  This really should be in a GNU include file though so that gdb can use
+  the same info.  */
+struct regs
+{
+  int r_psr;
+  int r_pc;
+  int r_npc;
+  int r_y;
+  int r_g1;
+  int r_g2;
+  int r_g3;
+  int r_g4;
+  int r_g5;
+  int r_g6;
+  int r_g7;
+  int r_o0;
+  int r_o1;
+  int r_o2;
+  int r_o3;
+  int r_o4;
+  int r_o5;
+  int r_o6;
+  int r_o7;
+};
+
+/* Taken from Sun documentation: */
+
+/* FIXME:  It's worse than we expect.  This struct contains TWO substructs
+  neither of whose size we know, WITH STUFF IN BETWEEN THEM!  We can't
+  even portably access the stuff in between!  */
+
+struct external_sparc_core
+{
+  int c_magic;				/* Corefile magic number.  */
+  int c_len;				/* Sizeof (struct core).  */
+#define	SPARC_CORE_LEN	432
+  struct regs c_regs;			/* General purpose registers -- MACHDEP SIZE.  */
+  struct external_exec c_aouthdr;	/* A.out header.  */
+  int c_signo;				/* Killing signal, if any.  */
+  int c_tsize;				/* Text size (bytes).  */
+  int c_dsize;				/* Data size (bytes).  */
+  int c_ssize;				/* Stack size (bytes).  */
+  char c_cmdname[CORE_NAMELEN + 1];	/* Command name.  */
+  double fp_stuff[1];			/* External FPU state (size unknown by us).  */
+  /* The type "double" is critical here, for alignment.
+     SunOS declares a struct here, but the struct's
+     alignment is double since it contains doubles.  */
+  int c_ucode;				/* Exception no. from u_code.  */
+  /* This member is not accessible by name since
+     we don't portably know the size of fp_stuff.  */
+};
+
+/* Core files generated by the BCP (the part of Solaris which allows
+   it to run SunOS4 a.out files).  */
+struct external_solaris_bcp_core
+{
+  int c_magic;				/* Corefile magic number.  */
+  int c_len;				/* Sizeof (struct core).  */
+#define	SOLARIS_BCP_CORE_LEN	456
+  struct regs c_regs;			/* General purpose registers -- MACHDEP SIZE.  */
+  int c_exdata_vp;			/* Exdata structure.  */
+  int c_exdata_tsize;
+  int c_exdata_dsize;
+  int c_exdata_bsize;
+  int c_exdata_lsize;
+  int c_exdata_nshlibs;
+  short c_exdata_mach;
+  short c_exdata_mag;
+  int c_exdata_toffset;
+  int c_exdata_doffset;
+  int c_exdata_loffset;
+  int c_exdata_txtorg;
+  int c_exdata_datorg;
+  int c_exdata_entloc;
+  int c_signo;				/* Killing signal, if any.  */
+  int c_tsize;				/* Text size (bytes).  */
+  int c_dsize;				/* Data size (bytes).  */
+  int c_ssize;				/* Stack size (bytes).  */
+  char c_cmdname[CORE_NAMELEN + 1];	/* Command name.  */
+  double fp_stuff[1];			/* External FPU state (size unknown by us).  */
+  /* The type "double" is critical here, for alignment.
+     SunOS declares a struct here, but the struct's
+     alignment is double since it contains doubles.  */
+  int c_ucode;				/* Exception no. from u_code.  */
+  /* This member is not accessible by name since
+     we don't portably know the size of fp_stuff.  */
+};
+
+struct external_sun3_core
+{
+  int c_magic;				/* Corefile magic number.  */
+  int c_len;				/* Sizeof (struct core).  */
+#define	SUN3_CORE_LEN	826		/* As of SunOS 4.1.1.  */
+  int c_regs[18];			/* General purpose registers -- MACHDEP SIZE.  */
+  struct external_exec c_aouthdr;	/* A.out header.  */
+  int c_signo;				/* Killing signal, if any.  */
+  int c_tsize;				/* Text size (bytes).  */
+  int c_dsize;				/* Data size (bytes).  */
+  int c_ssize;				/* Stack size (bytes).  */
+  char c_cmdname[CORE_NAMELEN + 1];	/* Command name.  */
+  double fp_stuff[1];			/* External FPU state (size unknown by us).  */
+  /* The type "double" is critical here, for alignment.
+     SunOS declares a struct here, but the struct's
+     alignment is double since it contains doubles.  */
+  int c_ucode;				/* Exception no. from u_code.  */
+  /* This member is not accessible by name since
+     we don't portably know the size of fp_stuff.  */
+};
+
+struct internal_sunos_core
+{
+  int c_magic;				/* Corefile magic number.  */
+  int c_len;				/* Sizeof (struct core).  */
+  long c_regs_pos;			/* File offset of General purpose registers.  */
+  int c_regs_size;			/* Size of General purpose registers.  */
+  struct internal_exec c_aouthdr;	/* A.out header.  */
+  int c_signo;				/* Killing signal, if any.  */
+  int c_tsize;				/* Text size (bytes).  */
+  int c_dsize;				/* Data size (bytes).  */
+  bfd_vma c_data_addr;			/* Data start (address).  */
+  int c_ssize;				/* Stack size (bytes).  */
+  bfd_vma c_stacktop;			/* Stack top (address).  */
+  char c_cmdname[CORE_NAMELEN + 1];	/* Command name.  */
+  long fp_stuff_pos;			/* File offset of external FPU state (regs).  */
+  int fp_stuff_size;			/* Size of it.  */
+  int c_ucode;				/* Exception no. from u_code.  */
+};
+
+/* Byte-swap in the Sun-3 core structure.  */
+
+static void
+swapcore_sun3 (bfd *abfd, char *ext, struct internal_sunos_core *intcore)
+{
+  struct external_sun3_core *extcore = (struct external_sun3_core *) ext;
+
+  intcore->c_magic = H_GET_32 (abfd, &extcore->c_magic);
+  intcore->c_len = H_GET_32 (abfd, &extcore->c_len);
+  intcore->c_regs_pos = offsetof (struct external_sun3_core, c_regs);
+  intcore->c_regs_size = sizeof (extcore->c_regs);
+#if ARCH_SIZE == 64
+  aout_64_swap_exec_header_in
+#else
+  aout_32_swap_exec_header_in
+#endif
+    (abfd, &extcore->c_aouthdr, &intcore->c_aouthdr);
+  intcore->c_signo = H_GET_32 (abfd, &extcore->c_signo);
+  intcore->c_tsize = H_GET_32 (abfd, &extcore->c_tsize);
+  intcore->c_dsize = H_GET_32 (abfd, &extcore->c_dsize);
+  intcore->c_data_addr = N_DATADDR (intcore->c_aouthdr);
+  intcore->c_ssize = H_GET_32 (abfd, &extcore->c_ssize);
+  memcpy (intcore->c_cmdname, extcore->c_cmdname, sizeof (intcore->c_cmdname));
+  intcore->fp_stuff_pos = offsetof (struct external_sun3_core, fp_stuff);
+  /* FP stuff takes up whole rest of struct, except c_ucode.  */
+  intcore->fp_stuff_size = intcore->c_len - (sizeof extcore->c_ucode) -
+    offsetof (struct external_sun3_core, fp_stuff);
+  /* Ucode is the last thing in the struct -- just before the end.  */
+  intcore->c_ucode = H_GET_32 (abfd,
+			       (intcore->c_len
+				- sizeof (extcore->c_ucode)
+				+ (unsigned char *) extcore));
+  intcore->c_stacktop = 0x0E000000;	/* By experimentation.  */
+}
+
+/* Byte-swap in the Sparc core structure.  */
+
+static void
+swapcore_sparc (bfd *abfd, char *ext, struct internal_sunos_core *intcore)
+{
+  struct external_sparc_core *extcore = (struct external_sparc_core *) ext;
+
+  intcore->c_magic = H_GET_32 (abfd, &extcore->c_magic);
+  intcore->c_len = H_GET_32 (abfd, &extcore->c_len);
+  intcore->c_regs_pos = offsetof (struct external_sparc_core, c_regs);
+  intcore->c_regs_size = sizeof (extcore->c_regs);
+#if ARCH_SIZE == 64
+  aout_64_swap_exec_header_in
+#else
+  aout_32_swap_exec_header_in
+#endif
+    (abfd, &extcore->c_aouthdr, &intcore->c_aouthdr);
+  intcore->c_signo = H_GET_32 (abfd, &extcore->c_signo);
+  intcore->c_tsize = H_GET_32 (abfd, &extcore->c_tsize);
+  intcore->c_dsize = H_GET_32 (abfd, &extcore->c_dsize);
+  intcore->c_data_addr = N_DATADDR (intcore->c_aouthdr);
+  intcore->c_ssize = H_GET_32 (abfd, &extcore->c_ssize);
+  memcpy (intcore->c_cmdname, extcore->c_cmdname, sizeof (intcore->c_cmdname));
+  intcore->fp_stuff_pos = offsetof (struct external_sparc_core, fp_stuff);
+  /* FP stuff takes up whole rest of struct, except c_ucode.  */
+  intcore->fp_stuff_size = intcore->c_len - (sizeof extcore->c_ucode) -
+    offsetof (struct external_sparc_core, fp_stuff);
+  /* Ucode is the last thing in the struct -- just before the end.  */
+  intcore->c_ucode = H_GET_32 (abfd,
+			       (intcore->c_len
+				- sizeof (extcore->c_ucode)
+				+ (unsigned char *) extcore));
+
+  /* Supposedly the user stack grows downward from the bottom of kernel memory.
+     Presuming that this remains true, this definition will work.  */
+  /* Now sun has provided us with another challenge.  The value is different
+     for sparc2 and sparc10 (both running SunOS 4.1.3).  We pick one or
+     the other based on the current value of the stack pointer.  This
+     loses (a) if the stack pointer has been clobbered, or (b) if the stack
+     is larger than 128 megabytes.
+
+     It's times like these you're glad they're switching to ELF.
+
+     Note that using include files or nlist on /vmunix would be wrong,
+     because we want the value for this core file, no matter what kind of
+     machine we were compiled on or are running on.  */
+#define SPARC_USRSTACK_SPARC2 ((bfd_vma)0xf8000000)
+#define SPARC_USRSTACK_SPARC10 ((bfd_vma)0xf0000000)
+  {
+    bfd_vma sp = H_GET_32 (abfd, &extcore->c_regs.r_o6);
+    if (sp < SPARC_USRSTACK_SPARC10)
+      intcore->c_stacktop = SPARC_USRSTACK_SPARC10;
+    else
+      intcore->c_stacktop = SPARC_USRSTACK_SPARC2;
+  }
+}
+
+/* Byte-swap in the Solaris BCP core structure.  */
+
+static void
+swapcore_solaris_bcp (bfd *abfd, char *ext, struct internal_sunos_core *intcore)
+{
+  struct external_solaris_bcp_core *extcore =
+    (struct external_solaris_bcp_core *) ext;
+
+  intcore->c_magic = H_GET_32 (abfd, &extcore->c_magic);
+  intcore->c_len = H_GET_32 (abfd, &extcore->c_len);
+  intcore->c_regs_pos = offsetof (struct external_solaris_bcp_core, c_regs);
+  intcore->c_regs_size = sizeof (extcore->c_regs);
+
+  /* The Solaris BCP exdata structure does not contain an a_syms field,
+     so we are unable to synthesize an internal exec header.
+     Luckily we are able to figure out the start address of the data section,
+     which is the only thing needed from the internal exec header,
+     from the exdata structure.
+
+     As of Solaris 2.3, BCP core files for statically linked executables
+     are buggy. The exdata structure is not properly filled in, and
+     the data section is written from address zero instead of the data
+     start address.  */
+  memset ((void *) &intcore->c_aouthdr, 0, sizeof (struct internal_exec));
+  intcore->c_data_addr = H_GET_32 (abfd, &extcore->c_exdata_datorg);
+  intcore->c_signo = H_GET_32 (abfd, &extcore->c_signo);
+  intcore->c_tsize = H_GET_32 (abfd, &extcore->c_tsize);
+  intcore->c_dsize = H_GET_32 (abfd, &extcore->c_dsize);
+  intcore->c_ssize = H_GET_32 (abfd, &extcore->c_ssize);
+  memcpy (intcore->c_cmdname, extcore->c_cmdname, sizeof (intcore->c_cmdname));
+  intcore->fp_stuff_pos =
+    offsetof (struct external_solaris_bcp_core, fp_stuff);
+  /* FP stuff takes up whole rest of struct, except c_ucode.  */
+  intcore->fp_stuff_size = intcore->c_len - (sizeof extcore->c_ucode) -
+    offsetof (struct external_solaris_bcp_core, fp_stuff);
+  /* Ucode is the last thing in the struct -- just before the end */
+  intcore->c_ucode = H_GET_32 (abfd,
+			       (intcore->c_len
+				- sizeof (extcore->c_ucode)
+				+ (unsigned char *) extcore));
+
+  /* Supposedly the user stack grows downward from the bottom of kernel memory.
+     Presuming that this remains true, this definition will work.  */
+  /* Now sun has provided us with another challenge.  The value is different
+     for sparc2 and sparc10 (both running SunOS 4.1.3).  We pick one or
+     the other based on the current value of the stack pointer.  This
+     loses (a) if the stack pointer has been clobbered, or (b) if the stack
+     is larger than 128 megabytes.
+
+     It's times like these you're glad they're switching to ELF.
+
+     Note that using include files or nlist on /vmunix would be wrong,
+     because we want the value for this core file, no matter what kind of
+     machine we were compiled on or are running on.  */
+#define SPARC_USRSTACK_SPARC2 ((bfd_vma)0xf8000000)
+#define SPARC_USRSTACK_SPARC10 ((bfd_vma)0xf0000000)
+  {
+    bfd_vma sp = H_GET_32 (abfd, &extcore->c_regs.r_o6);
+    if (sp < SPARC_USRSTACK_SPARC10)
+      intcore->c_stacktop = SPARC_USRSTACK_SPARC10;
+    else
+      intcore->c_stacktop = SPARC_USRSTACK_SPARC2;
+  }
+}
+
+/* Need this cast because ptr is really void *.  */
+#define core_hdr(bfd)      ((bfd)->tdata.sun_core_data)
+#define core_datasec(bfd)  (core_hdr (bfd)->data_section)
+#define core_stacksec(bfd) (core_hdr (bfd)->stack_section)
+#define core_regsec(bfd)   (core_hdr (bfd)->reg_section)
+#define core_reg2sec(bfd)  (core_hdr (bfd)->reg2_section)
+
+/* These are stored in the bfd's tdata.  */
+struct sun_core_struct
+{
+  struct internal_sunos_core *hdr;	/* Core file header.  */
+  asection *data_section;
+  asection *stack_section;
+  asection *reg_section;
+  asection *reg2_section;
+};
+
+static const bfd_target *
+sunos4_core_file_p (bfd *abfd)
+{
+  unsigned char longbuf[4];	/* Raw bytes of various header fields.  */
+  bfd_size_type core_size, amt;
+  unsigned long core_mag;
+  struct internal_sunos_core *core;
+  char *extcore;
+  struct mergem
+    {
+      struct sun_core_struct suncoredata;
+      struct internal_sunos_core internal_sunos_core;
+      char external_core[1];
+    } *mergem;
+  flagword flags;
+
+  if (bfd_bread ((void *) longbuf, (bfd_size_type) sizeof (longbuf), abfd)
+      != sizeof (longbuf))
+    return NULL;
+  core_mag = H_GET_32 (abfd, longbuf);
+
+  if (core_mag != CORE_MAGIC)
+    return NULL;
+
+  /* SunOS core headers can vary in length; second word is size; */
+  if (bfd_bread ((void *) longbuf, (bfd_size_type) sizeof (longbuf), abfd)
+      != sizeof (longbuf))
+    return NULL;
+  core_size = H_GET_32 (abfd, longbuf);
+  /* Sanity check.  */
+  if (core_size > 20000)
+    return NULL;
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    return NULL;
+
+  amt = core_size + sizeof (struct mergem);
+  mergem = bfd_zalloc (abfd, amt);
+  if (mergem == NULL)
+    return NULL;
+
+  extcore = mergem->external_core;
+
+  if ((bfd_bread ((void *) extcore, core_size, abfd)) != core_size)
+    {
+    loser:
+      bfd_release (abfd, (char *) mergem);
+      abfd->tdata.any = NULL;
+      bfd_section_list_clear (abfd);
+      return NULL;
+    }
+
+  /* Validate that it's a core file we know how to handle, due to sun
+     botching the positioning of registers and other fields in a machine
+     dependent way.  */
+  core = &mergem->internal_sunos_core;
+  switch (core_size)
+    {
+    case SPARC_CORE_LEN:
+      swapcore_sparc (abfd, extcore, core);
+      break;
+    case SUN3_CORE_LEN:
+      swapcore_sun3 (abfd, extcore, core);
+      break;
+    case SOLARIS_BCP_CORE_LEN:
+      swapcore_solaris_bcp (abfd, extcore, core);
+      break;
+    default:
+      bfd_set_error (bfd_error_system_call);	/* FIXME.  */
+      goto loser;
+    }
+
+  abfd->tdata.sun_core_data = &mergem->suncoredata;
+  abfd->tdata.sun_core_data->hdr = core;
+
+  /* Create the sections.  */
+  flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
+  core_stacksec (abfd) = bfd_make_section_anyway_with_flags (abfd, ".stack",
+							     flags);
+  if (core_stacksec (abfd) == NULL)
+    /* bfd_release frees everything allocated after it's arg.  */
+    goto loser;
+
+  flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
+  core_datasec (abfd) = bfd_make_section_anyway_with_flags (abfd, ".data",
+							    flags);
+  if (core_datasec (abfd) == NULL)
+    goto loser;
+
+  flags = SEC_HAS_CONTENTS;
+  core_regsec (abfd) = bfd_make_section_anyway_with_flags (abfd, ".reg",
+							   flags);
+  if (core_regsec (abfd) == NULL)
+    goto loser;
+
+  flags = SEC_HAS_CONTENTS;
+  core_reg2sec (abfd) = bfd_make_section_anyway_with_flags (abfd, ".reg2",
+							    flags);
+  if (core_reg2sec (abfd) == NULL)
+    goto loser;
+
+  core_stacksec (abfd)->size = core->c_ssize;
+  core_datasec (abfd)->size = core->c_dsize;
+  core_regsec (abfd)->size = core->c_regs_size;
+  core_reg2sec (abfd)->size = core->fp_stuff_size;
+
+  core_stacksec (abfd)->vma = (core->c_stacktop - core->c_ssize);
+  core_datasec (abfd)->vma = core->c_data_addr;
+  core_regsec (abfd)->vma = 0;
+  core_reg2sec (abfd)->vma = 0;
+
+  core_stacksec (abfd)->filepos = core->c_len + core->c_dsize;
+  core_datasec (abfd)->filepos = core->c_len;
+  /* We'll access the regs afresh in the core file, like any section:  */
+  core_regsec (abfd)->filepos = (file_ptr) core->c_regs_pos;
+  core_reg2sec (abfd)->filepos = (file_ptr) core->fp_stuff_pos;
+
+  /* Align to word at least.  */
+  core_stacksec (abfd)->alignment_power = 2;
+  core_datasec (abfd)->alignment_power = 2;
+  core_regsec (abfd)->alignment_power = 2;
+  core_reg2sec (abfd)->alignment_power = 2;
+
+  return abfd->xvec;
+}
+
+static char *
+sunos4_core_file_failing_command (bfd *abfd)
+{
+  return core_hdr (abfd)->hdr->c_cmdname;
+}
+
+static int
+sunos4_core_file_failing_signal (bfd *abfd)
+{
+  return core_hdr (abfd)->hdr->c_signo;
+}
+
+static bfd_boolean
+sunos4_core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)
+{
+  if (core_bfd->xvec != exec_bfd->xvec)
+    {
+      bfd_set_error (bfd_error_system_call);
+      return FALSE;
+    }
+
+  /* Solaris core files do not include an aouthdr.  */
+  if ((core_hdr (core_bfd)->hdr)->c_len == SOLARIS_BCP_CORE_LEN)
+    return TRUE;
+
+  return memcmp ((char *) &((core_hdr (core_bfd)->hdr)->c_aouthdr),
+		 (char *) exec_hdr (exec_bfd),
+		 sizeof (struct internal_exec)) == 0;
+}
+
+#define MY_set_sizes sunos4_set_sizes
+
+static bfd_boolean
+sunos4_set_sizes (bfd *abfd)
+{
+  switch (bfd_get_arch (abfd))
+    {
+    default:
+      return FALSE;
+    case bfd_arch_sparc:
+      adata (abfd).page_size = 0x2000;
+      adata (abfd).segment_size = 0x2000;
+      adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
+      return TRUE;
+    case bfd_arch_m68k:
+      adata (abfd).page_size = 0x2000;
+      adata (abfd).segment_size = 0x20000;
+      adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
+      return TRUE;
+    }
+}
+
+/* We default to setting the toolversion field to 1, as is required by
+   SunOS.  */
+#ifndef MY_exec_hdr_flags
+#define MY_exec_hdr_flags 1
+#endif
+
+#ifndef MY_entry_is_text_address
+#define MY_entry_is_text_address 0
+#endif
+#ifndef MY_add_dynamic_symbols
+#define MY_add_dynamic_symbols 0
+#endif
+#ifndef MY_add_one_symbol
+#define MY_add_one_symbol 0
+#endif
+#ifndef MY_link_dynamic_object
+#define MY_link_dynamic_object 0
+#endif
+#ifndef MY_write_dynamic_symbol
+#define MY_write_dynamic_symbol 0
+#endif
+#ifndef MY_check_dynamic_reloc
+#define MY_check_dynamic_reloc 0
+#endif
+#ifndef MY_finish_dynamic_link
+#define MY_finish_dynamic_link 0
+#endif
+
+static const struct aout_backend_data sunos4_aout_backend =
+{
+  0,				/* Zmagic files are not contiguous.  */
+  1,				/* Text includes header.  */
+  MY_entry_is_text_address,
+  MY_exec_hdr_flags,
+  0,				/* Default text vma.  */
+  sunos4_set_sizes,
+  0,				/* Header is counted in zmagic text.  */
+  MY_add_dynamic_symbols,
+  MY_add_one_symbol,
+  MY_link_dynamic_object,
+  MY_write_dynamic_symbol,
+  MY_check_dynamic_reloc,
+  MY_finish_dynamic_link
+};
+
+#define	MY_core_file_failing_command 	sunos4_core_file_failing_command
+#define	MY_core_file_failing_signal	sunos4_core_file_failing_signal
+#define	MY_core_file_matches_executable_p sunos4_core_file_matches_executable_p
+
+#define MY_bfd_debug_info_start		bfd_void
+#define MY_bfd_debug_info_end		bfd_void
+#define MY_bfd_debug_info_accumulate	(void (*) (bfd *, struct bfd_section *)) bfd_void
+#define MY_core_file_p			sunos4_core_file_p
+#define MY_write_object_contents	NAME(aout, sunos4_write_object_contents)
+#define MY_backend_data			& sunos4_aout_backend
+
+#ifndef TARGET_IS_LITTLE_ENDIAN_P
+#define TARGET_IS_BIG_ENDIAN_P
+#endif
+
+#include "aout-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aoutx.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aoutx.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/aoutx.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/aoutx.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,5645 @@
+/* BFD semi-generic back-end for a.out binaries.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/*
+SECTION
+	a.out backends
+
+DESCRIPTION
+
+	BFD supports a number of different flavours of a.out format,
+	though the major differences are only the sizes of the
+	structures on disk, and the shape of the relocation
+	information.
+
+	The support is split into a basic support file @file{aoutx.h}
+	and other files which derive functions from the base. One
+	derivation file is @file{aoutf1.h} (for a.out flavour 1), and
+	adds to the basic a.out functions support for sun3, sun4, 386
+	and 29k a.out files, to create a target jump vector for a
+	specific target.
+
+	This information is further split out into more specific files
+	for each machine, including @file{sunos.c} for sun3 and sun4,
+	@file{newsos3.c} for the Sony NEWS, and @file{demo64.c} for a
+	demonstration of a 64 bit a.out format.
+
+	The base file @file{aoutx.h} defines general mechanisms for
+	reading and writing records to and from disk and various
+	other methods which BFD requires. It is included by
+	@file{aout32.c} and @file{aout64.c} to form the names
+	<<aout_32_swap_exec_header_in>>, <<aout_64_swap_exec_header_in>>, etc.
+
+	As an example, this is what goes on to make the back end for a
+	sun4, from @file{aout32.c}:
+
+|	#define ARCH_SIZE 32
+|	#include "aoutx.h"
+
+	Which exports names:
+
+|	...
+|	aout_32_canonicalize_reloc
+|	aout_32_find_nearest_line
+|	aout_32_get_lineno
+|	aout_32_get_reloc_upper_bound
+|	...
+
+	from @file{sunos.c}:
+
+|	#define TARGET_NAME "a.out-sunos-big"
+|	#define VECNAME    sunos_big_vec
+|	#include "aoutf1.h"
+
+	requires all the names from @file{aout32.c}, and produces the jump vector
+
+|	sunos_big_vec
+
+	The file @file{host-aout.c} is a special case.  It is for a large set
+	of hosts that use ``more or less standard'' a.out files, and
+	for which cross-debugging is not interesting.  It uses the
+	standard 32-bit a.out support routines, but determines the
+	file offsets and addresses of the text, data, and BSS
+	sections, the machine architecture and machine type, and the
+	entry point address, in a host-dependent manner.  Once these
+	values have been determined, generic code is used to handle
+	the  object file.
+
+	When porting it to run on a new system, you must supply:
+
+|        HOST_PAGE_SIZE
+|        HOST_SEGMENT_SIZE
+|        HOST_MACHINE_ARCH       (optional)
+|        HOST_MACHINE_MACHINE    (optional)
+|        HOST_TEXT_START_ADDR
+|        HOST_STACK_END_ADDR
+
+	in the file @file{../include/sys/h-@var{XXX}.h} (for your host).  These
+	values, plus the structures and macros defined in @file{a.out.h} on
+	your host system, will produce a BFD target that will access
+	ordinary a.out files on your host. To configure a new machine
+	to use @file{host-aout.c}, specify:
+
+|	TDEFAULTS = -DDEFAULT_VECTOR=host_aout_big_vec
+|	TDEPFILES= host-aout.o trad-core.o
+
+	in the @file{config/@var{XXX}.mt} file, and modify @file{configure.in}
+	to use the
+	@file{@var{XXX}.mt} file (by setting "<<bfd_target=XXX>>") when your
+	configuration is selected.  */
+
+/* Some assumptions:
+   * Any BFD with D_PAGED set is ZMAGIC, and vice versa.
+     Doesn't matter what the setting of WP_TEXT is on output, but it'll
+     get set on input.
+   * Any BFD with D_PAGED clear and WP_TEXT set is NMAGIC.
+   * Any BFD with both flags clear is OMAGIC.
+   (Just want to make these explicit, so the conditions tested in this
+   file make sense if you're more familiar with a.out than with BFD.)  */
+
+#define KEEPIT udata.i
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "safe-ctype.h"
+#include "bfdlink.h"
+
+#include "libaout.h"
+#include "libbfd.h"
+#include "aout/aout64.h"
+#include "aout/stab_gnu.h"
+#include "aout/ar.h"
+
+/*
+SUBSECTION
+	Relocations
+
+DESCRIPTION
+	The file @file{aoutx.h} provides for both the @emph{standard}
+	and @emph{extended} forms of a.out relocation records.
+
+	The standard records contain only an
+	address, a symbol index, and a type field. The extended records
+	(used on 29ks and sparcs) also have a full integer for an
+	addend.  */
+
+#ifndef CTOR_TABLE_RELOC_HOWTO
+#define CTOR_TABLE_RELOC_IDX 2
+#define CTOR_TABLE_RELOC_HOWTO(BFD)					\
+  ((obj_reloc_entry_size (BFD) == RELOC_EXT_SIZE			\
+    ? howto_table_ext : howto_table_std)				\
+   + CTOR_TABLE_RELOC_IDX)
+#endif
+
+#ifndef MY_swap_std_reloc_in
+#define MY_swap_std_reloc_in NAME (aout, swap_std_reloc_in)
+#endif
+
+#ifndef MY_swap_ext_reloc_in
+#define MY_swap_ext_reloc_in NAME (aout, swap_ext_reloc_in)
+#endif
+
+#ifndef MY_swap_std_reloc_out
+#define MY_swap_std_reloc_out NAME (aout, swap_std_reloc_out)
+#endif
+
+#ifndef MY_swap_ext_reloc_out
+#define MY_swap_ext_reloc_out NAME (aout, swap_ext_reloc_out)
+#endif
+
+#ifndef MY_final_link_relocate
+#define MY_final_link_relocate _bfd_final_link_relocate
+#endif
+
+#ifndef MY_relocate_contents
+#define MY_relocate_contents _bfd_relocate_contents
+#endif
+
+#define howto_table_ext NAME (aout, ext_howto_table)
+#define howto_table_std NAME (aout, std_howto_table)
+
+reloc_howto_type howto_table_ext[] =
+{
+  /*     Type         rs   size bsz  pcrel bitpos ovrf                  sf name          part_inpl readmask setmask pcdone.  */
+  HOWTO (RELOC_8,       0,  0,  8,  FALSE, 0, complain_overflow_bitfield, 0, "8",           FALSE, 0, 0x000000ff, FALSE),
+  HOWTO (RELOC_16,      0,  1, 	16, FALSE, 0, complain_overflow_bitfield, 0, "16",          FALSE, 0, 0x0000ffff, FALSE),
+  HOWTO (RELOC_32,      0,  2, 	32, FALSE, 0, complain_overflow_bitfield, 0, "32",          FALSE, 0, 0xffffffff, FALSE),
+  HOWTO (RELOC_DISP8,   0,  0, 	8,  TRUE,  0, complain_overflow_signed,   0, "DISP8", 	    FALSE, 0, 0x000000ff, FALSE),
+  HOWTO (RELOC_DISP16,  0,  1, 	16, TRUE,  0, complain_overflow_signed,   0, "DISP16", 	    FALSE, 0, 0x0000ffff, FALSE),
+  HOWTO (RELOC_DISP32,  0,  2, 	32, TRUE,  0, complain_overflow_signed,   0, "DISP32", 	    FALSE, 0, 0xffffffff, FALSE),
+  HOWTO (RELOC_WDISP30, 2,  2, 	30, TRUE,  0, complain_overflow_signed,   0, "WDISP30",     FALSE, 0, 0x3fffffff, FALSE),
+  HOWTO (RELOC_WDISP22, 2,  2, 	22, TRUE,  0, complain_overflow_signed,   0, "WDISP22",     FALSE, 0, 0x003fffff, FALSE),
+  HOWTO (RELOC_HI22,   10,  2, 	22, FALSE, 0, complain_overflow_bitfield, 0, "HI22",	    FALSE, 0, 0x003fffff, FALSE),
+  HOWTO (RELOC_22,      0,  2, 	22, FALSE, 0, complain_overflow_bitfield, 0, "22",          FALSE, 0, 0x003fffff, FALSE),
+  HOWTO (RELOC_13,      0,  2, 	13, FALSE, 0, complain_overflow_bitfield, 0, "13",          FALSE, 0, 0x00001fff, FALSE),
+  HOWTO (RELOC_LO10,    0,  2, 	10, FALSE, 0, complain_overflow_dont,     0, "LO10",        FALSE, 0, 0x000003ff, FALSE),
+  HOWTO (RELOC_SFA_BASE,0,  2, 	32, FALSE, 0, complain_overflow_bitfield, 0, "SFA_BASE",    FALSE, 0, 0xffffffff, FALSE),
+  HOWTO (RELOC_SFA_OFF13,0, 2, 	32, FALSE, 0, complain_overflow_bitfield, 0, "SFA_OFF13",   FALSE, 0, 0xffffffff, FALSE),
+  HOWTO (RELOC_BASE10,  0,  2, 	10, FALSE, 0, complain_overflow_dont,     0, "BASE10",      FALSE, 0, 0x000003ff, FALSE),
+  HOWTO (RELOC_BASE13,  0,  2,	13, FALSE, 0, complain_overflow_signed,   0, "BASE13",      FALSE, 0, 0x00001fff, FALSE),
+  HOWTO (RELOC_BASE22, 10,  2,	22, FALSE, 0, complain_overflow_bitfield, 0, "BASE22",      FALSE, 0, 0x003fffff, FALSE),
+  HOWTO (RELOC_PC10,    0,  2,	10, TRUE,  0, complain_overflow_dont,     0, "PC10",	    FALSE, 0, 0x000003ff, TRUE),
+  HOWTO (RELOC_PC22,   10,  2,	22, TRUE,  0, complain_overflow_signed,   0, "PC22",  	    FALSE, 0, 0x003fffff, TRUE),
+  HOWTO (RELOC_JMP_TBL, 2,  2, 	30, TRUE,  0, complain_overflow_signed,   0, "JMP_TBL",     FALSE, 0, 0x3fffffff, FALSE),
+  HOWTO (RELOC_SEGOFF16,0,  2,	0,  FALSE, 0, complain_overflow_bitfield, 0, "SEGOFF16",    FALSE, 0, 0x00000000, FALSE),
+  HOWTO (RELOC_GLOB_DAT,0,  2,	0,  FALSE, 0, complain_overflow_bitfield, 0, "GLOB_DAT",    FALSE, 0, 0x00000000, FALSE),
+  HOWTO (RELOC_JMP_SLOT,0,  2,	0,  FALSE, 0, complain_overflow_bitfield, 0, "JMP_SLOT",    FALSE, 0, 0x00000000, FALSE),
+  HOWTO (RELOC_RELATIVE,0,  2,	0,  FALSE, 0, complain_overflow_bitfield, 0, "RELATIVE",    FALSE, 0, 0x00000000, FALSE),
+  HOWTO (0,             0,  0,  0,  FALSE, 0, complain_overflow_dont,     0, "R_SPARC_NONE",FALSE, 0, 0x00000000, TRUE),
+  HOWTO (0,             0,  0,  0,  FALSE, 0, complain_overflow_dont,     0, "R_SPARC_NONE",FALSE, 0, 0x00000000, TRUE),
+#define RELOC_SPARC_REV32 RELOC_WDISP19
+  HOWTO (RELOC_SPARC_REV32, 0, 2, 32, FALSE, 0, complain_overflow_dont,   0,"R_SPARC_REV32",FALSE, 0, 0xffffffff, FALSE),
+};
+
+/* Convert standard reloc records to "arelent" format (incl byte swap).  */
+
+reloc_howto_type howto_table_std[] =
+{
+  /* type              rs size bsz  pcrel bitpos ovrf                     sf name     part_inpl readmask  setmask    pcdone.  */
+HOWTO ( 0,	       0,  0,  	8,  FALSE, 0, complain_overflow_bitfield,0,"8",		TRUE, 0x000000ff,0x000000ff, FALSE),
+HOWTO ( 1,	       0,  1, 	16, FALSE, 0, complain_overflow_bitfield,0,"16",	TRUE, 0x0000ffff,0x0000ffff, FALSE),
+HOWTO ( 2,	       0,  2, 	32, FALSE, 0, complain_overflow_bitfield,0,"32",	TRUE, 0xffffffff,0xffffffff, FALSE),
+HOWTO ( 3,	       0,  4, 	64, FALSE, 0, complain_overflow_bitfield,0,"64",	TRUE, 0xdeaddead,0xdeaddead, FALSE),
+HOWTO ( 4,	       0,  0, 	8,  TRUE,  0, complain_overflow_signed,  0,"DISP8",	TRUE, 0x000000ff,0x000000ff, FALSE),
+HOWTO ( 5,	       0,  1, 	16, TRUE,  0, complain_overflow_signed,  0,"DISP16",	TRUE, 0x0000ffff,0x0000ffff, FALSE),
+HOWTO ( 6,	       0,  2, 	32, TRUE,  0, complain_overflow_signed,  0,"DISP32",	TRUE, 0xffffffff,0xffffffff, FALSE),
+HOWTO ( 7,	       0,  4, 	64, TRUE,  0, complain_overflow_signed,  0,"DISP64",	TRUE, 0xfeedface,0xfeedface, FALSE),
+HOWTO ( 8,	       0,  2,    0, FALSE, 0, complain_overflow_bitfield,0,"GOT_REL",	FALSE,         0,0x00000000, FALSE),
+HOWTO ( 9,	       0,  1,   16, FALSE, 0, complain_overflow_bitfield,0,"BASE16",	FALSE,0xffffffff,0xffffffff, FALSE),
+HOWTO (10,	       0,  2,   32, FALSE, 0, complain_overflow_bitfield,0,"BASE32",	FALSE,0xffffffff,0xffffffff, FALSE),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+  HOWTO (16,	       0,  2,	 0, FALSE, 0, complain_overflow_bitfield,0,"JMP_TABLE", FALSE,         0,0x00000000, FALSE),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+  HOWTO (32,	       0,  2,	 0, FALSE, 0, complain_overflow_bitfield,0,"RELATIVE",  FALSE,         0,0x00000000, FALSE),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+  HOWTO (40,	       0,  2,	 0, FALSE, 0, complain_overflow_bitfield,0,"BASEREL",   FALSE,         0,0x00000000, FALSE),
+};
+
+#define TABLE_SIZE(TABLE)	(sizeof (TABLE) / sizeof (TABLE[0]))
+
+reloc_howto_type *
+NAME (aout, reloc_type_lookup) (bfd *abfd, bfd_reloc_code_real_type code)
+{
+#define EXT(i, j)	case i: return & howto_table_ext [j]
+#define STD(i, j)	case i: return & howto_table_std [j]
+  int ext = obj_reloc_entry_size (abfd) == RELOC_EXT_SIZE;
+
+  if (code == BFD_RELOC_CTOR)
+    switch (bfd_arch_bits_per_address (abfd))
+      {
+      case 32:
+	code = BFD_RELOC_32;
+	break;
+      case 64:
+	code = BFD_RELOC_64;
+	break;
+      }
+
+  if (ext)
+    switch (code)
+      {
+	EXT (BFD_RELOC_8, 0);
+	EXT (BFD_RELOC_16, 1);
+	EXT (BFD_RELOC_32, 2);
+	EXT (BFD_RELOC_HI22, 8);
+	EXT (BFD_RELOC_LO10, 11);
+	EXT (BFD_RELOC_32_PCREL_S2, 6);
+	EXT (BFD_RELOC_SPARC_WDISP22, 7);
+	EXT (BFD_RELOC_SPARC13, 10);
+	EXT (BFD_RELOC_SPARC_GOT10, 14);
+	EXT (BFD_RELOC_SPARC_BASE13, 15);
+	EXT (BFD_RELOC_SPARC_GOT13, 15);
+	EXT (BFD_RELOC_SPARC_GOT22, 16);
+	EXT (BFD_RELOC_SPARC_PC10, 17);
+	EXT (BFD_RELOC_SPARC_PC22, 18);
+	EXT (BFD_RELOC_SPARC_WPLT30, 19);
+	EXT (BFD_RELOC_SPARC_REV32, 26);
+      default:
+	return NULL;
+      }
+  else
+    /* std relocs.  */
+    switch (code)
+      {
+	STD (BFD_RELOC_8, 0);
+	STD (BFD_RELOC_16, 1);
+	STD (BFD_RELOC_32, 2);
+	STD (BFD_RELOC_8_PCREL, 4);
+	STD (BFD_RELOC_16_PCREL, 5);
+	STD (BFD_RELOC_32_PCREL, 6);
+	STD (BFD_RELOC_16_BASEREL, 9);
+	STD (BFD_RELOC_32_BASEREL, 10);
+      default:
+	return NULL;
+      }
+}
+
+reloc_howto_type *
+NAME (aout, reloc_name_lookup) (bfd *abfd, const char *r_name)
+{
+  unsigned int i, size;
+  reloc_howto_type *howto_table;
+
+  if (obj_reloc_entry_size (abfd) == RELOC_EXT_SIZE)
+    {
+      howto_table = howto_table_ext;
+      size = sizeof (howto_table_ext) / sizeof (howto_table_ext[0]);
+    }
+  else
+    {
+      howto_table = howto_table_std;
+      size = sizeof (howto_table_std) / sizeof (howto_table_std[0]);
+    }
+
+  for (i = 0; i < size; i++)
+    if (howto_table[i].name != NULL
+	&& strcasecmp (howto_table[i].name, r_name) == 0)
+      return &howto_table[i];
+
+  return NULL;
+}
+
+/*
+SUBSECTION
+	Internal entry points
+
+DESCRIPTION
+	@file{aoutx.h} exports several routines for accessing the
+	contents of an a.out file, which are gathered and exported in
+	turn by various format specific files (eg sunos.c).
+*/
+
+/*
+FUNCTION
+	 aout_@var{size}_swap_exec_header_in
+
+SYNOPSIS
+	void aout_@var{size}_swap_exec_header_in,
+           (bfd *abfd,
+            struct external_exec *bytes,
+            struct internal_exec *execp);
+
+DESCRIPTION
+	Swap the information in an executable header @var{raw_bytes} taken
+	from a raw byte stream memory image into the internal exec header
+	structure @var{execp}.
+*/
+
+#ifndef NAME_swap_exec_header_in
+void
+NAME (aout, swap_exec_header_in) (bfd *abfd,
+				  struct external_exec *bytes,
+				  struct internal_exec *execp)
+{
+  /* The internal_exec structure has some fields that are unused in this
+     configuration (IE for i960), so ensure that all such uninitialized
+     fields are zero'd out.  There are places where two of these structs
+     are memcmp'd, and thus the contents do matter.  */
+  memset ((void *) execp, 0, sizeof (struct internal_exec));
+  /* Now fill in fields in the execp, from the bytes in the raw data.  */
+  execp->a_info   = H_GET_32 (abfd, bytes->e_info);
+  execp->a_text   = GET_WORD (abfd, bytes->e_text);
+  execp->a_data   = GET_WORD (abfd, bytes->e_data);
+  execp->a_bss    = GET_WORD (abfd, bytes->e_bss);
+  execp->a_syms   = GET_WORD (abfd, bytes->e_syms);
+  execp->a_entry  = GET_WORD (abfd, bytes->e_entry);
+  execp->a_trsize = GET_WORD (abfd, bytes->e_trsize);
+  execp->a_drsize = GET_WORD (abfd, bytes->e_drsize);
+}
+#define NAME_swap_exec_header_in NAME (aout, swap_exec_header_in)
+#endif
+
+/*
+FUNCTION
+	aout_@var{size}_swap_exec_header_out
+
+SYNOPSIS
+	void aout_@var{size}_swap_exec_header_out
+	  (bfd *abfd,
+	   struct internal_exec *execp,
+	   struct external_exec *raw_bytes);
+
+DESCRIPTION
+	Swap the information in an internal exec header structure
+	@var{execp} into the buffer @var{raw_bytes} ready for writing to disk.
+*/
+void
+NAME (aout, swap_exec_header_out) (bfd *abfd,
+				   struct internal_exec *execp,
+				   struct external_exec *bytes)
+{
+  /* Now fill in fields in the raw data, from the fields in the exec struct.  */
+  H_PUT_32 (abfd, execp->a_info  , bytes->e_info);
+  PUT_WORD (abfd, execp->a_text  , bytes->e_text);
+  PUT_WORD (abfd, execp->a_data  , bytes->e_data);
+  PUT_WORD (abfd, execp->a_bss   , bytes->e_bss);
+  PUT_WORD (abfd, execp->a_syms  , bytes->e_syms);
+  PUT_WORD (abfd, execp->a_entry , bytes->e_entry);
+  PUT_WORD (abfd, execp->a_trsize, bytes->e_trsize);
+  PUT_WORD (abfd, execp->a_drsize, bytes->e_drsize);
+}
+
+/* Make all the section for an a.out file.  */
+
+bfd_boolean
+NAME (aout, make_sections) (bfd *abfd)
+{
+  if (obj_textsec (abfd) == NULL && bfd_make_section (abfd, ".text") == NULL)
+    return FALSE;
+  if (obj_datasec (abfd) == NULL && bfd_make_section (abfd, ".data") == NULL)
+    return FALSE;
+  if (obj_bsssec (abfd) == NULL && bfd_make_section (abfd, ".bss") == NULL)
+    return FALSE;
+  return TRUE;
+}
+
+/*
+FUNCTION
+	aout_@var{size}_some_aout_object_p
+
+SYNOPSIS
+	const bfd_target *aout_@var{size}_some_aout_object_p
+	 (bfd *abfd,
+          struct internal_exec *execp,
+	  const bfd_target *(*callback_to_real_object_p) (bfd *));
+
+DESCRIPTION
+	Some a.out variant thinks that the file open in @var{abfd}
+	checking is an a.out file.  Do some more checking, and set up
+	for access if it really is.  Call back to the calling
+	environment's "finish up" function just before returning, to
+	handle any last-minute setup.
+*/
+
+const bfd_target *
+NAME (aout, some_aout_object_p) (bfd *abfd,
+				 struct internal_exec *execp,
+				 const bfd_target *(*callback_to_real_object_p) (bfd *))
+{
+  struct aout_data_struct *rawptr, *oldrawptr;
+  const bfd_target *result;
+  bfd_size_type amt = sizeof (* rawptr);
+
+  rawptr = (struct aout_data_struct *) bfd_zalloc (abfd, amt);
+  if (rawptr == NULL)
+    return NULL;
+
+  oldrawptr = abfd->tdata.aout_data;
+  abfd->tdata.aout_data = rawptr;
+
+  /* Copy the contents of the old tdata struct.
+     In particular, we want the subformat, since for hpux it was set in
+     hp300hpux.c:swap_exec_header_in and will be used in
+     hp300hpux.c:callback.  */
+  if (oldrawptr != NULL)
+    *abfd->tdata.aout_data = *oldrawptr;
+
+  abfd->tdata.aout_data->a.hdr = &rawptr->e;
+  /* Copy in the internal_exec struct.  */
+  *(abfd->tdata.aout_data->a.hdr) = *execp;
+  execp = abfd->tdata.aout_data->a.hdr;
+
+  /* Set the file flags.  */
+  abfd->flags = BFD_NO_FLAGS;
+  if (execp->a_drsize || execp->a_trsize)
+    abfd->flags |= HAS_RELOC;
+  /* Setting of EXEC_P has been deferred to the bottom of this function.  */
+  if (execp->a_syms)
+    abfd->flags |= HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS;
+  if (N_DYNAMIC (*execp))
+    abfd->flags |= DYNAMIC;
+
+  if (N_MAGIC (*execp) == ZMAGIC)
+    {
+      abfd->flags |= D_PAGED | WP_TEXT;
+      adata (abfd).magic = z_magic;
+    }
+  else if (N_MAGIC (*execp) == QMAGIC)
+    {
+      abfd->flags |= D_PAGED | WP_TEXT;
+      adata (abfd).magic = z_magic;
+      adata (abfd).subformat = q_magic_format;
+    }
+  else if (N_MAGIC (*execp) == NMAGIC)
+    {
+      abfd->flags |= WP_TEXT;
+      adata (abfd).magic = n_magic;
+    }
+  else if (N_MAGIC (*execp) == OMAGIC
+	   || N_MAGIC (*execp) == BMAGIC)
+    adata (abfd).magic = o_magic;
+  else
+    /* Should have been checked with N_BADMAG before this routine
+       was called.  */
+    abort ();
+
+  bfd_get_start_address (abfd) = execp->a_entry;
+
+  obj_aout_symbols (abfd) = NULL;
+  bfd_get_symcount (abfd) = execp->a_syms / sizeof (struct external_nlist);
+
+  /* The default relocation entry size is that of traditional V7 Unix.  */
+  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+
+  /* The default symbol entry size is that of traditional Unix.  */
+  obj_symbol_entry_size (abfd) = EXTERNAL_NLIST_SIZE;
+
+#ifdef USE_MMAP
+  bfd_init_window (&obj_aout_sym_window (abfd));
+  bfd_init_window (&obj_aout_string_window (abfd));
+#endif
+  obj_aout_external_syms (abfd) = NULL;
+  obj_aout_external_strings (abfd) = NULL;
+  obj_aout_sym_hashes (abfd) = NULL;
+
+  if (! NAME (aout, make_sections) (abfd))
+    goto error_ret;
+
+  obj_datasec (abfd)->size = execp->a_data;
+  obj_bsssec (abfd)->size = execp->a_bss;
+
+  obj_textsec (abfd)->flags =
+    (execp->a_trsize != 0
+     ? (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS | SEC_RELOC)
+     : (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS));
+  obj_datasec (abfd)->flags =
+    (execp->a_drsize != 0
+     ? (SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_HAS_CONTENTS | SEC_RELOC)
+     : (SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_HAS_CONTENTS));
+  obj_bsssec (abfd)->flags = SEC_ALLOC;
+
+#ifdef THIS_IS_ONLY_DOCUMENTATION
+  /* The common code can't fill in these things because they depend
+     on either the start address of the text segment, the rounding
+     up of virtual addresses between segments, or the starting file
+     position of the text segment -- all of which varies among different
+     versions of a.out.  */
+
+  /* Call back to the format-dependent code to fill in the rest of the
+     fields and do any further cleanup.  Things that should be filled
+     in by the callback:  */
+
+  struct exec *execp = exec_hdr (abfd);
+
+  obj_textsec (abfd)->size = N_TXTSIZE (*execp);
+  /* Data and bss are already filled in since they're so standard.  */
+
+  /* The virtual memory addresses of the sections.  */
+  obj_textsec (abfd)->vma = N_TXTADDR (*execp);
+  obj_datasec (abfd)->vma = N_DATADDR (*execp);
+  obj_bsssec  (abfd)->vma = N_BSSADDR (*execp);
+
+  /* The file offsets of the sections.  */
+  obj_textsec (abfd)->filepos = N_TXTOFF (*execp);
+  obj_datasec (abfd)->filepos = N_DATOFF (*execp);
+
+  /* The file offsets of the relocation info.  */
+  obj_textsec (abfd)->rel_filepos = N_TRELOFF (*execp);
+  obj_datasec (abfd)->rel_filepos = N_DRELOFF (*execp);
+
+  /* The file offsets of the string table and symbol table.  */
+  obj_str_filepos (abfd) = N_STROFF (*execp);
+  obj_sym_filepos (abfd) = N_SYMOFF (*execp);
+
+  /* Determine the architecture and machine type of the object file.  */
+  switch (N_MACHTYPE (*exec_hdr (abfd)))
+    {
+    default:
+      abfd->obj_arch = bfd_arch_obscure;
+      break;
+    }
+
+  adata (abfd)->page_size = TARGET_PAGE_SIZE;
+  adata (abfd)->segment_size = SEGMENT_SIZE;
+  adata (abfd)->exec_bytes_size = EXEC_BYTES_SIZE;
+
+  return abfd->xvec;
+
+  /* The architecture is encoded in various ways in various a.out variants,
+     or is not encoded at all in some of them.  The relocation size depends
+     on the architecture and the a.out variant.  Finally, the return value
+     is the bfd_target vector in use.  If an error occurs, return zero and
+     set bfd_error to the appropriate error code.
+
+     Formats such as b.out, which have additional fields in the a.out
+     header, should cope with them in this callback as well.  */
+#endif				/* DOCUMENTATION */
+
+  result = (*callback_to_real_object_p) (abfd);
+
+  /* Now that the segment addresses have been worked out, take a better
+     guess at whether the file is executable.  If the entry point
+     is within the text segment, assume it is.  (This makes files
+     executable even if their entry point address is 0, as long as
+     their text starts at zero.).
+
+     This test had to be changed to deal with systems where the text segment
+     runs at a different location than the default.  The problem is that the
+     entry address can appear to be outside the text segment, thus causing an
+     erroneous conclusion that the file isn't executable.
+
+     To fix this, we now accept any non-zero entry point as an indication of
+     executability.  This will work most of the time, since only the linker
+     sets the entry point, and that is likely to be non-zero for most systems.  */
+
+  if (execp->a_entry != 0
+      || (execp->a_entry >= obj_textsec (abfd)->vma
+	  && execp->a_entry < (obj_textsec (abfd)->vma
+			       + obj_textsec (abfd)->size)
+	  && execp->a_trsize == 0
+	  && execp->a_drsize == 0))
+    abfd->flags |= EXEC_P;
+#ifdef STAT_FOR_EXEC
+  else
+    {
+      struct stat stat_buf;
+
+      /* The original heuristic doesn't work in some important cases.
+        The a.out file has no information about the text start
+        address.  For files (like kernels) linked to non-standard
+        addresses (ld -Ttext nnn) the entry point may not be between
+        the default text start (obj_textsec(abfd)->vma) and
+        (obj_textsec(abfd)->vma) + text size.  This is not just a mach
+        issue.  Many kernels are loaded at non standard addresses.  */
+      if (abfd->iostream != NULL
+	  && (abfd->flags & BFD_IN_MEMORY) == 0
+	  && (fstat (fileno ((FILE *) (abfd->iostream)), &stat_buf) == 0)
+	  && ((stat_buf.st_mode & 0111) != 0))
+	abfd->flags |= EXEC_P;
+    }
+#endif /* STAT_FOR_EXEC */
+
+  if (result)
+    return result;
+
+ error_ret:
+  bfd_release (abfd, rawptr);
+  abfd->tdata.aout_data = oldrawptr;
+  return NULL;
+}
+
+/*
+FUNCTION
+	aout_@var{size}_mkobject
+
+SYNOPSIS
+	bfd_boolean aout_@var{size}_mkobject, (bfd *abfd);
+
+DESCRIPTION
+	Initialize BFD @var{abfd} for use with a.out files.
+*/
+
+bfd_boolean
+NAME (aout, mkobject) (bfd *abfd)
+{
+  struct aout_data_struct *rawptr;
+  bfd_size_type amt = sizeof (* rawptr);
+
+  bfd_set_error (bfd_error_system_call);
+
+  rawptr = (struct aout_data_struct *) bfd_zalloc (abfd, amt);
+  if (rawptr == NULL)
+    return FALSE;
+
+  abfd->tdata.aout_data = rawptr;
+  exec_hdr (abfd) = &(rawptr->e);
+
+  obj_textsec (abfd) = NULL;
+  obj_datasec (abfd) = NULL;
+  obj_bsssec (abfd) = NULL;
+
+  return TRUE;
+}
+
+/*
+FUNCTION
+	aout_@var{size}_machine_type
+
+SYNOPSIS
+	enum machine_type  aout_@var{size}_machine_type
+	 (enum bfd_architecture arch,
+	  unsigned long machine,
+          bfd_boolean *unknown);
+
+DESCRIPTION
+	Keep track of machine architecture and machine type for
+	a.out's. Return the <<machine_type>> for a particular
+	architecture and machine, or <<M_UNKNOWN>> if that exact architecture
+	and machine can't be represented in a.out format.
+
+	If the architecture is understood, machine type 0 (default)
+	is always understood.
+*/
+
+enum machine_type
+NAME (aout, machine_type) (enum bfd_architecture arch,
+			   unsigned long machine,
+			   bfd_boolean *unknown)
+{
+  enum machine_type arch_flags;
+
+  arch_flags = M_UNKNOWN;
+  *unknown = TRUE;
+
+  switch (arch)
+    {
+    case bfd_arch_sparc:
+      if (machine == 0
+	  || machine == bfd_mach_sparc
+	  || machine == bfd_mach_sparc_sparclite
+	  || machine == bfd_mach_sparc_sparclite_le
+	  || machine == bfd_mach_sparc_v8plus
+	  || machine == bfd_mach_sparc_v8plusa
+	  || machine == bfd_mach_sparc_v8plusb
+	  || machine == bfd_mach_sparc_v9
+	  || machine == bfd_mach_sparc_v9a
+	  || machine == bfd_mach_sparc_v9b)
+	arch_flags = M_SPARC;
+      else if (machine == bfd_mach_sparc_sparclet)
+	arch_flags = M_SPARCLET;
+      break;
+
+    case bfd_arch_m68k:
+      switch (machine)
+	{
+	case 0:		      arch_flags = M_68010; break;
+	case bfd_mach_m68000: arch_flags = M_UNKNOWN; *unknown = FALSE; break;
+	case bfd_mach_m68010: arch_flags = M_68010; break;
+	case bfd_mach_m68020: arch_flags = M_68020; break;
+	default:	      arch_flags = M_UNKNOWN; break;
+	}
+      break;
+
+    case bfd_arch_i386:
+      if (machine == 0
+	  || machine == bfd_mach_i386_i386
+	  || machine == bfd_mach_i386_i386_intel_syntax)
+	arch_flags = M_386;
+      break;
+
+    case bfd_arch_arm:
+      if (machine == 0)
+	arch_flags = M_ARM;
+      break;
+
+    case bfd_arch_mips:
+      switch (machine)
+	{
+	case 0:
+	case bfd_mach_mips3000:
+	case bfd_mach_mips3900:
+	  arch_flags = M_MIPS1;
+	  break;
+	case bfd_mach_mips6000:
+	  arch_flags = M_MIPS2;
+	  break;
+	case bfd_mach_mips4000:
+	case bfd_mach_mips4010:
+	case bfd_mach_mips4100:
+	case bfd_mach_mips4300:
+	case bfd_mach_mips4400:
+	case bfd_mach_mips4600:
+	case bfd_mach_mips4650:
+	case bfd_mach_mips8000:
+	case bfd_mach_mips9000:
+	case bfd_mach_mips10000:
+	case bfd_mach_mips12000:
+	case bfd_mach_mips14000:
+	case bfd_mach_mips16000:
+	case bfd_mach_mips16:
+	case bfd_mach_mipsisa32:
+	case bfd_mach_mipsisa32r2:
+	case bfd_mach_mips5:
+	case bfd_mach_mipsisa64:
+	case bfd_mach_mipsisa64r2:
+	case bfd_mach_mips_sb1:
+	case bfd_mach_mips_xlr:
+	  /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc.  */
+	  arch_flags = M_MIPS2;
+	  break;
+	default:
+	  arch_flags = M_UNKNOWN;
+	  break;
+	}
+      break;
+
+    case bfd_arch_ns32k:
+      switch (machine)
+	{
+	case 0:    	arch_flags = M_NS32532; break;
+	case 32032:	arch_flags = M_NS32032; break;
+	case 32532:	arch_flags = M_NS32532; break;
+	default:	arch_flags = M_UNKNOWN; break;
+	}
+      break;
+
+    case bfd_arch_vax:
+      *unknown = FALSE;
+      break;
+
+    case bfd_arch_cris:
+      if (machine == 0 || machine == 255)
+	arch_flags = M_CRIS;
+      break;
+
+    case bfd_arch_m88k:
+      *unknown = FALSE;
+      break;
+
+    default:
+      arch_flags = M_UNKNOWN;
+    }
+
+  if (arch_flags != M_UNKNOWN)
+    *unknown = FALSE;
+
+  return arch_flags;
+}
+
+/*
+FUNCTION
+	aout_@var{size}_set_arch_mach
+
+SYNOPSIS
+	bfd_boolean aout_@var{size}_set_arch_mach,
+	 (bfd *,
+	  enum bfd_architecture arch,
+	  unsigned long machine);
+
+DESCRIPTION
+	Set the architecture and the machine of the BFD @var{abfd} to the
+	values @var{arch} and @var{machine}.  Verify that @var{abfd}'s format
+	can support the architecture required.
+*/
+
+bfd_boolean
+NAME (aout, set_arch_mach) (bfd *abfd,
+			    enum bfd_architecture arch,
+			    unsigned long machine)
+{
+  if (! bfd_default_set_arch_mach (abfd, arch, machine))
+    return FALSE;
+
+  if (arch != bfd_arch_unknown)
+    {
+      bfd_boolean unknown;
+
+      NAME (aout, machine_type) (arch, machine, &unknown);
+      if (unknown)
+	return FALSE;
+    }
+
+  /* Determine the size of a relocation entry.  */
+  switch (arch)
+    {
+    case bfd_arch_sparc:
+    case bfd_arch_mips:
+      obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;
+      break;
+    default:
+      obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+      break;
+    }
+
+  return (*aout_backend_info (abfd)->set_sizes) (abfd);
+}
+
+static void
+adjust_o_magic (bfd *abfd, struct internal_exec *execp)
+{
+  file_ptr pos = adata (abfd).exec_bytes_size;
+  bfd_vma vma = 0;
+  int pad = 0;
+
+  /* Text.  */
+  obj_textsec (abfd)->filepos = pos;
+  if (!obj_textsec (abfd)->user_set_vma)
+    obj_textsec (abfd)->vma = vma;
+  else
+    vma = obj_textsec (abfd)->vma;
+
+  pos += obj_textsec (abfd)->size;
+  vma += obj_textsec (abfd)->size;
+
+  /* Data.  */
+  if (!obj_datasec (abfd)->user_set_vma)
+    {
+      obj_textsec (abfd)->size += pad;
+      pos += pad;
+      vma += pad;
+      obj_datasec (abfd)->vma = vma;
+    }
+  else
+    vma = obj_datasec (abfd)->vma;
+  obj_datasec (abfd)->filepos = pos;
+  pos += obj_datasec (abfd)->size;
+  vma += obj_datasec (abfd)->size;
+
+  /* BSS.  */
+  if (!obj_bsssec (abfd)->user_set_vma)
+    {
+      obj_datasec (abfd)->size += pad;
+      pos += pad;
+      vma += pad;
+      obj_bsssec (abfd)->vma = vma;
+    }
+  else
+    {
+      /* The VMA of the .bss section is set by the VMA of the
+         .data section plus the size of the .data section.  We may
+         need to add padding bytes to make this true.  */
+      pad = obj_bsssec (abfd)->vma - vma;
+      if (pad > 0)
+	{
+	  obj_datasec (abfd)->size += pad;
+	  pos += pad;
+	}
+    }
+  obj_bsssec (abfd)->filepos = pos;
+
+  /* Fix up the exec header.  */
+  execp->a_text = obj_textsec (abfd)->size;
+  execp->a_data = obj_datasec (abfd)->size;
+  execp->a_bss = obj_bsssec (abfd)->size;
+  N_SET_MAGIC (*execp, OMAGIC);
+}
+
+static void
+adjust_z_magic (bfd *abfd, struct internal_exec *execp)
+{
+  bfd_size_type data_pad, text_pad;
+  file_ptr text_end;
+  const struct aout_backend_data *abdp;
+  /* TRUE if text includes exec header.  */
+  bfd_boolean ztih;
+
+  abdp = aout_backend_info (abfd);
+
+  /* Text.  */
+  ztih = (abdp != NULL
+	  && (abdp->text_includes_header
+	      || obj_aout_subformat (abfd) == q_magic_format));
+  obj_textsec (abfd)->filepos = (ztih
+				 ? adata (abfd).exec_bytes_size
+				 : adata (abfd).zmagic_disk_block_size);
+  if (! obj_textsec (abfd)->user_set_vma)
+    {
+      /* ?? Do we really need to check for relocs here?  */
+      obj_textsec (abfd)->vma = ((abfd->flags & HAS_RELOC)
+				 ? 0
+				 : (ztih
+				    ? (abdp->default_text_vma
+				       + adata (abfd).exec_bytes_size)
+				    : abdp->default_text_vma));
+      text_pad = 0;
+    }
+  else
+    {
+      /* The .text section is being loaded at an unusual address.  We
+         may need to pad it such that the .data section starts at a page
+         boundary.  */
+      if (ztih)
+	text_pad = ((obj_textsec (abfd)->filepos - obj_textsec (abfd)->vma)
+		    & (adata (abfd).page_size - 1));
+      else
+	text_pad = ((- obj_textsec (abfd)->vma)
+		    & (adata (abfd).page_size - 1));
+    }
+
+  /* Find start of data.  */
+  if (ztih)
+    {
+      text_end = obj_textsec (abfd)->filepos + obj_textsec (abfd)->size;
+      text_pad += BFD_ALIGN (text_end, adata (abfd).page_size) - text_end;
+    }
+  else
+    {
+      /* Note that if page_size == zmagic_disk_block_size, then
+	 filepos == page_size, and this case is the same as the ztih
+	 case.  */
+      text_end = obj_textsec (abfd)->size;
+      text_pad += BFD_ALIGN (text_end, adata (abfd).page_size) - text_end;
+      text_end += obj_textsec (abfd)->filepos;
+    }
+  obj_textsec (abfd)->size += text_pad;
+  text_end += text_pad;
+
+  /* Data.  */
+  if (!obj_datasec (abfd)->user_set_vma)
+    {
+      bfd_vma vma;
+      vma = obj_textsec (abfd)->vma + obj_textsec (abfd)->size;
+      obj_datasec (abfd)->vma = BFD_ALIGN (vma, adata (abfd).segment_size);
+    }
+  if (abdp && abdp->zmagic_mapped_contiguous)
+    {
+      asection * text = obj_textsec (abfd);
+      asection * data = obj_datasec (abfd);
+
+      text_pad = data->vma - (text->vma + text->size);
+      /* Only pad the text section if the data
+	 section is going to be placed after it.  */
+      if (text_pad > 0)
+	text->size += text_pad;
+    }
+  obj_datasec (abfd)->filepos = (obj_textsec (abfd)->filepos
+				 + obj_textsec (abfd)->size);
+
+  /* Fix up exec header while we're at it.  */
+  execp->a_text = obj_textsec (abfd)->size;
+  if (ztih && (!abdp || (abdp && !abdp->exec_header_not_counted)))
+    execp->a_text += adata (abfd).exec_bytes_size;
+  if (obj_aout_subformat (abfd) == q_magic_format)
+    N_SET_MAGIC (*execp, QMAGIC);
+  else
+    N_SET_MAGIC (*execp, ZMAGIC);
+
+  /* Spec says data section should be rounded up to page boundary.  */
+  obj_datasec (abfd)->size
+    = align_power (obj_datasec (abfd)->size,
+		   obj_bsssec (abfd)->alignment_power);
+  execp->a_data = BFD_ALIGN (obj_datasec (abfd)->size,
+			     adata (abfd).page_size);
+  data_pad = execp->a_data - obj_datasec (abfd)->size;
+
+  /* BSS.  */
+  if (!obj_bsssec (abfd)->user_set_vma)
+    obj_bsssec (abfd)->vma = (obj_datasec (abfd)->vma
+			      + obj_datasec (abfd)->size);
+  /* If the BSS immediately follows the data section and extra space
+     in the page is left after the data section, fudge data
+     in the header so that the bss section looks smaller by that
+     amount.  We'll start the bss section there, and lie to the OS.
+     (Note that a linker script, as well as the above assignment,
+     could have explicitly set the BSS vma to immediately follow
+     the data section.)  */
+  if (align_power (obj_bsssec (abfd)->vma, obj_bsssec (abfd)->alignment_power)
+      == obj_datasec (abfd)->vma + obj_datasec (abfd)->size)
+    execp->a_bss = (data_pad > obj_bsssec (abfd)->size
+		    ? 0 : obj_bsssec (abfd)->size - data_pad);
+  else
+    execp->a_bss = obj_bsssec (abfd)->size;
+}
+
+static void
+adjust_n_magic (bfd *abfd, struct internal_exec *execp)
+{
+  file_ptr pos = adata (abfd).exec_bytes_size;
+  bfd_vma vma = 0;
+  int pad;
+
+  /* Text.  */
+  obj_textsec (abfd)->filepos = pos;
+  if (!obj_textsec (abfd)->user_set_vma)
+    obj_textsec (abfd)->vma = vma;
+  else
+    vma = obj_textsec (abfd)->vma;
+  pos += obj_textsec (abfd)->size;
+  vma += obj_textsec (abfd)->size;
+
+  /* Data.  */
+  obj_datasec (abfd)->filepos = pos;
+  if (!obj_datasec (abfd)->user_set_vma)
+    obj_datasec (abfd)->vma = BFD_ALIGN (vma, adata (abfd).segment_size);
+  vma = obj_datasec (abfd)->vma;
+
+  /* Since BSS follows data immediately, see if it needs alignment.  */
+  vma += obj_datasec (abfd)->size;
+  pad = align_power (vma, obj_bsssec (abfd)->alignment_power) - vma;
+  obj_datasec (abfd)->size += pad;
+  pos += obj_datasec (abfd)->size;
+
+  /* BSS.  */
+  if (!obj_bsssec (abfd)->user_set_vma)
+    obj_bsssec (abfd)->vma = vma;
+  else
+    vma = obj_bsssec (abfd)->vma;
+
+  /* Fix up exec header.  */
+  execp->a_text = obj_textsec (abfd)->size;
+  execp->a_data = obj_datasec (abfd)->size;
+  execp->a_bss = obj_bsssec (abfd)->size;
+  N_SET_MAGIC (*execp, NMAGIC);
+}
+
+bfd_boolean
+NAME (aout, adjust_sizes_and_vmas) (bfd *abfd,
+				    bfd_size_type *text_size,
+				    file_ptr *text_end ATTRIBUTE_UNUSED)
+{
+  struct internal_exec *execp = exec_hdr (abfd);
+
+  if (! NAME (aout, make_sections) (abfd))
+    return FALSE;
+
+  if (adata (abfd).magic != undecided_magic)
+    return TRUE;
+
+  obj_textsec (abfd)->size =
+    align_power (obj_textsec (abfd)->size,
+		 obj_textsec (abfd)->alignment_power);
+
+  *text_size = obj_textsec (abfd)->size;
+  /* Rule (heuristic) for when to pad to a new page.  Note that there
+     are (at least) two ways demand-paged (ZMAGIC) files have been
+     handled.  Most Berkeley-based systems start the text segment at
+     (TARGET_PAGE_SIZE).  However, newer versions of SUNOS start the text
+     segment right after the exec header; the latter is counted in the
+     text segment size, and is paged in by the kernel with the rest of
+     the text.  */
+
+  /* This perhaps isn't the right way to do this, but made it simpler for me
+     to understand enough to implement it.  Better would probably be to go
+     right from BFD flags to alignment/positioning characteristics.  But the
+     old code was sloppy enough about handling the flags, and had enough
+     other magic, that it was a little hard for me to understand.  I think
+     I understand it better now, but I haven't time to do the cleanup this
+     minute.  */
+
+  if (abfd->flags & D_PAGED)
+    /* Whether or not WP_TEXT is set -- let D_PAGED override.  */
+    adata (abfd).magic = z_magic;
+  else if (abfd->flags & WP_TEXT)
+    adata (abfd).magic = n_magic;
+  else
+    adata (abfd).magic = o_magic;
+
+#ifdef BFD_AOUT_DEBUG /* requires gcc2 */
+#if __GNUC__ >= 2
+  fprintf (stderr, "%s text=<%x,%x,%x> data=<%x,%x,%x> bss=<%x,%x,%x>\n",
+	   ({ char *str;
+	      switch (adata (abfd).magic)
+		{
+		case n_magic: str = "NMAGIC"; break;
+		case o_magic: str = "OMAGIC"; break;
+		case z_magic: str = "ZMAGIC"; break;
+		default: abort ();
+		}
+	      str;
+	    }),
+	   obj_textsec (abfd)->vma, obj_textsec (abfd)->size,
+	   	obj_textsec (abfd)->alignment_power,
+	   obj_datasec (abfd)->vma, obj_datasec (abfd)->size,
+	   	obj_datasec (abfd)->alignment_power,
+	   obj_bsssec (abfd)->vma, obj_bsssec (abfd)->size,
+	   	obj_bsssec (abfd)->alignment_power);
+#endif
+#endif
+
+  switch (adata (abfd).magic)
+    {
+    case o_magic:
+      adjust_o_magic (abfd, execp);
+      break;
+    case z_magic:
+      adjust_z_magic (abfd, execp);
+      break;
+    case n_magic:
+      adjust_n_magic (abfd, execp);
+      break;
+    default:
+      abort ();
+    }
+
+#ifdef BFD_AOUT_DEBUG
+  fprintf (stderr, "       text=<%x,%x,%x> data=<%x,%x,%x> bss=<%x,%x>\n",
+	   obj_textsec (abfd)->vma, obj_textsec (abfd)->size,
+	   	obj_textsec (abfd)->filepos,
+	   obj_datasec (abfd)->vma, obj_datasec (abfd)->size,
+	   	obj_datasec (abfd)->filepos,
+	   obj_bsssec (abfd)->vma, obj_bsssec (abfd)->size);
+#endif
+
+  return TRUE;
+}
+
+/*
+FUNCTION
+	aout_@var{size}_new_section_hook
+
+SYNOPSIS
+        bfd_boolean aout_@var{size}_new_section_hook,
+	   (bfd *abfd,
+	    asection *newsect);
+
+DESCRIPTION
+	Called by the BFD in response to a @code{bfd_make_section}
+	request.
+*/
+bfd_boolean
+NAME (aout, new_section_hook) (bfd *abfd, asection *newsect)
+{
+  /* Align to double at least.  */
+  newsect->alignment_power = bfd_get_arch_info (abfd)->section_align_power;
+
+  if (bfd_get_format (abfd) == bfd_object)
+    {
+      if (obj_textsec (abfd) == NULL && !strcmp (newsect->name, ".text"))
+	{
+	  obj_textsec (abfd)= newsect;
+	  newsect->target_index = N_TEXT;
+	}
+      else if (obj_datasec (abfd) == NULL && !strcmp (newsect->name, ".data"))
+	{
+	  obj_datasec (abfd) = newsect;
+	  newsect->target_index = N_DATA;
+	}
+      else if (obj_bsssec (abfd) == NULL && !strcmp (newsect->name, ".bss"))
+	{
+	  obj_bsssec (abfd) = newsect;
+	  newsect->target_index = N_BSS;
+	}
+    }
+
+  /* We allow more than three sections internally.  */
+  return _bfd_generic_new_section_hook (abfd, newsect);
+}
+
+bfd_boolean
+NAME (aout, set_section_contents) (bfd *abfd,
+				   sec_ptr section,
+				   const void * location,
+				   file_ptr offset,
+				   bfd_size_type count)
+{
+  file_ptr text_end;
+  bfd_size_type text_size;
+
+  if (! abfd->output_has_begun)
+    {
+      if (! NAME (aout, adjust_sizes_and_vmas) (abfd, &text_size, &text_end))
+	return FALSE;
+    }
+
+  if (section == obj_bsssec (abfd))
+    {
+      bfd_set_error (bfd_error_no_contents);
+      return FALSE;
+    }
+
+  if (section != obj_textsec (abfd)
+      && section != obj_datasec (abfd))
+    {
+      if (aout_section_merge_with_text_p (abfd, section))
+	section->filepos = obj_textsec (abfd)->filepos +
+			   (section->vma - obj_textsec (abfd)->vma);
+      else
+	{
+          (*_bfd_error_handler)
+	   (_("%s: can not represent section `%s' in a.out object file format"),
+	     bfd_get_filename (abfd), bfd_get_section_name (abfd, section));
+          bfd_set_error (bfd_error_nonrepresentable_section);
+          return FALSE;
+	}
+    }
+
+  if (count != 0)
+    {
+      if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0
+	  || bfd_bwrite (location, count, abfd) != count)
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Read the external symbols from an a.out file.  */
+
+static bfd_boolean
+aout_get_external_symbols (bfd *abfd)
+{
+  if (obj_aout_external_syms (abfd) == NULL)
+    {
+      bfd_size_type count;
+      struct external_nlist *syms;
+
+      count = exec_hdr (abfd)->a_syms / EXTERNAL_NLIST_SIZE;
+      if (count == 0)
+	return TRUE;		/* Nothing to do.  */
+
+#ifdef USE_MMAP
+      if (! bfd_get_file_window (abfd, obj_sym_filepos (abfd),
+				 exec_hdr (abfd)->a_syms,
+				 &obj_aout_sym_window (abfd), TRUE))
+	return FALSE;
+      syms = (struct external_nlist *) obj_aout_sym_window (abfd).data;
+#else
+      /* We allocate using malloc to make the values easy to free
+	 later on.  If we put them on the objalloc it might not be
+	 possible to free them.  */
+      syms = (struct external_nlist *) bfd_malloc (count * EXTERNAL_NLIST_SIZE);
+      if (syms == NULL)
+	return FALSE;
+
+      {
+	bfd_size_type amt;
+	amt = exec_hdr (abfd)->a_syms;
+	if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0
+	    || bfd_bread (syms, amt, abfd) != amt)
+	  {
+	    free (syms);
+	    return FALSE;
+	  }
+      }
+#endif
+
+      obj_aout_external_syms (abfd) = syms;
+      obj_aout_external_sym_count (abfd) = count;
+    }
+
+  if (obj_aout_external_strings (abfd) == NULL
+      && exec_hdr (abfd)->a_syms != 0)
+    {
+      unsigned char string_chars[BYTES_IN_WORD];
+      bfd_size_type stringsize;
+      char *strings;
+      bfd_size_type amt = BYTES_IN_WORD;
+
+      /* Get the size of the strings.  */
+      if (bfd_seek (abfd, obj_str_filepos (abfd), SEEK_SET) != 0
+	  || bfd_bread ((void *) string_chars, amt, abfd) != amt)
+	return FALSE;
+      stringsize = GET_WORD (abfd, string_chars);
+
+#ifdef USE_MMAP
+      if (! bfd_get_file_window (abfd, obj_str_filepos (abfd), stringsize,
+				 &obj_aout_string_window (abfd), TRUE))
+	return FALSE;
+      strings = (char *) obj_aout_string_window (abfd).data;
+#else
+      strings = (char *) bfd_malloc (stringsize + 1);
+      if (strings == NULL)
+	return FALSE;
+
+      /* Skip space for the string count in the buffer for convenience
+	 when using indexes.  */
+      amt = stringsize - BYTES_IN_WORD;
+      if (bfd_bread (strings + BYTES_IN_WORD, amt, abfd) != amt)
+	{
+	  free (strings);
+	  return FALSE;
+	}
+#endif
+
+      /* Ensure that a zero index yields an empty string.  */
+      strings[0] = '\0';
+
+      strings[stringsize - 1] = 0;
+
+      obj_aout_external_strings (abfd) = strings;
+      obj_aout_external_string_size (abfd) = stringsize;
+    }
+
+  return TRUE;
+}
+
+/* Translate an a.out symbol into a BFD symbol.  The desc, other, type
+   and symbol->value fields of CACHE_PTR will be set from the a.out
+   nlist structure.  This function is responsible for setting
+   symbol->flags and symbol->section, and adjusting symbol->value.  */
+
+static bfd_boolean
+translate_from_native_sym_flags (bfd *abfd, aout_symbol_type *cache_ptr)
+{
+  flagword visible;
+
+  if ((cache_ptr->type & N_STAB) != 0
+      || cache_ptr->type == N_FN)
+    {
+      asection *sec;
+
+      /* This is a debugging symbol.  */
+      cache_ptr->symbol.flags = BSF_DEBUGGING;
+
+      /* Work out the symbol section.  */
+      switch (cache_ptr->type & N_TYPE)
+	{
+	case N_TEXT:
+	case N_FN:
+	  sec = obj_textsec (abfd);
+	  break;
+	case N_DATA:
+	  sec = obj_datasec (abfd);
+	  break;
+	case N_BSS:
+	  sec = obj_bsssec (abfd);
+	  break;
+	default:
+	case N_ABS:
+	  sec = bfd_abs_section_ptr;
+	  break;
+	}
+
+      cache_ptr->symbol.section = sec;
+      cache_ptr->symbol.value -= sec->vma;
+
+      return TRUE;
+    }
+
+  /* Get the default visibility.  This does not apply to all types, so
+     we just hold it in a local variable to use if wanted.  */
+  if ((cache_ptr->type & N_EXT) == 0)
+    visible = BSF_LOCAL;
+  else
+    visible = BSF_GLOBAL;
+
+  switch (cache_ptr->type)
+    {
+    default:
+    case N_ABS: case N_ABS | N_EXT:
+      cache_ptr->symbol.section = bfd_abs_section_ptr;
+      cache_ptr->symbol.flags = visible;
+      break;
+
+    case N_UNDF | N_EXT:
+      if (cache_ptr->symbol.value != 0)
+	{
+	  /* This is a common symbol.  */
+	  cache_ptr->symbol.flags = BSF_GLOBAL;
+	  cache_ptr->symbol.section = bfd_com_section_ptr;
+	}
+      else
+	{
+	  cache_ptr->symbol.flags = 0;
+	  cache_ptr->symbol.section = bfd_und_section_ptr;
+	}
+      break;
+
+    case N_TEXT: case N_TEXT | N_EXT:
+      cache_ptr->symbol.section = obj_textsec (abfd);
+      cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
+      cache_ptr->symbol.flags = visible;
+      break;
+
+      /* N_SETV symbols used to represent set vectors placed in the
+	 data section.  They are no longer generated.  Theoretically,
+	 it was possible to extract the entries and combine them with
+	 new ones, although I don't know if that was ever actually
+	 done.  Unless that feature is restored, treat them as data
+	 symbols.  */
+    case N_SETV: case N_SETV | N_EXT:
+    case N_DATA: case N_DATA | N_EXT:
+      cache_ptr->symbol.section = obj_datasec (abfd);
+      cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
+      cache_ptr->symbol.flags = visible;
+      break;
+
+    case N_BSS: case N_BSS | N_EXT:
+      cache_ptr->symbol.section = obj_bsssec (abfd);
+      cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
+      cache_ptr->symbol.flags = visible;
+      break;
+
+    case N_SETA: case N_SETA | N_EXT:
+    case N_SETT: case N_SETT | N_EXT:
+    case N_SETD: case N_SETD | N_EXT:
+    case N_SETB: case N_SETB | N_EXT:
+      {
+	/* This code is no longer needed.  It used to be used to make
+           the linker handle set symbols, but they are now handled in
+           the add_symbols routine instead.  */
+	switch (cache_ptr->type & N_TYPE)
+	  {
+	  case N_SETA:
+	    cache_ptr->symbol.section = bfd_abs_section_ptr;
+	    break;
+	  case N_SETT:
+	    cache_ptr->symbol.section = obj_textsec (abfd);
+	    break;
+	  case N_SETD:
+	    cache_ptr->symbol.section = obj_datasec (abfd);
+	    break;
+	  case N_SETB:
+	    cache_ptr->symbol.section = obj_bsssec (abfd);
+	    break;
+	  }
+
+	cache_ptr->symbol.flags |= BSF_CONSTRUCTOR;
+      }
+      break;
+
+    case N_WARNING:
+      /* This symbol is the text of a warning message.  The next
+	 symbol is the symbol to associate the warning with.  If a
+	 reference is made to that symbol, a warning is issued.  */
+      cache_ptr->symbol.flags = BSF_DEBUGGING | BSF_WARNING;
+      cache_ptr->symbol.section = bfd_abs_section_ptr;
+      break;
+
+    case N_INDR: case N_INDR | N_EXT:
+      /* An indirect symbol.  This consists of two symbols in a row.
+	 The first symbol is the name of the indirection.  The second
+	 symbol is the name of the target.  A reference to the first
+	 symbol becomes a reference to the second.  */
+      cache_ptr->symbol.flags = BSF_DEBUGGING | BSF_INDIRECT | visible;
+      cache_ptr->symbol.section = bfd_ind_section_ptr;
+      break;
+
+    case N_WEAKU:
+      cache_ptr->symbol.section = bfd_und_section_ptr;
+      cache_ptr->symbol.flags = BSF_WEAK;
+      break;
+
+    case N_WEAKA:
+      cache_ptr->symbol.section = bfd_abs_section_ptr;
+      cache_ptr->symbol.flags = BSF_WEAK;
+      break;
+
+    case N_WEAKT:
+      cache_ptr->symbol.section = obj_textsec (abfd);
+      cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
+      cache_ptr->symbol.flags = BSF_WEAK;
+      break;
+
+    case N_WEAKD:
+      cache_ptr->symbol.section = obj_datasec (abfd);
+      cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
+      cache_ptr->symbol.flags = BSF_WEAK;
+      break;
+
+    case N_WEAKB:
+      cache_ptr->symbol.section = obj_bsssec (abfd);
+      cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
+      cache_ptr->symbol.flags = BSF_WEAK;
+      break;
+    }
+
+  return TRUE;
+}
+
+/* Set the fields of SYM_POINTER according to CACHE_PTR.  */
+
+static bfd_boolean
+translate_to_native_sym_flags (bfd *abfd,
+			       asymbol *cache_ptr,
+			       struct external_nlist *sym_pointer)
+{
+  bfd_vma value = cache_ptr->value;
+  asection *sec;
+  bfd_vma off;
+
+  /* Mask out any existing type bits in case copying from one section
+     to another.  */
+  sym_pointer->e_type[0] &= ~N_TYPE;
+
+  sec = bfd_get_section (cache_ptr);
+  off = 0;
+
+  if (sec == NULL)
+    {
+      /* This case occurs, e.g., for the *DEBUG* section of a COFF
+	 file.  */
+      (*_bfd_error_handler)
+	(_("%s: can not represent section for symbol `%s' in a.out object file format"),
+	 bfd_get_filename (abfd),
+	 cache_ptr->name != NULL ? cache_ptr->name : _("*unknown*"));
+      bfd_set_error (bfd_error_nonrepresentable_section);
+      return FALSE;
+    }
+
+  if (sec->output_section != NULL)
+    {
+      off = sec->output_offset;
+      sec = sec->output_section;
+    }
+
+  if (bfd_is_abs_section (sec))
+    sym_pointer->e_type[0] |= N_ABS;
+  else if (sec == obj_textsec (abfd))
+    sym_pointer->e_type[0] |= N_TEXT;
+  else if (sec == obj_datasec (abfd))
+    sym_pointer->e_type[0] |= N_DATA;
+  else if (sec == obj_bsssec (abfd))
+    sym_pointer->e_type[0] |= N_BSS;
+  else if (bfd_is_und_section (sec))
+    sym_pointer->e_type[0] = N_UNDF | N_EXT;
+  else if (bfd_is_ind_section (sec))
+    sym_pointer->e_type[0] = N_INDR;
+  else if (bfd_is_com_section (sec))
+    sym_pointer->e_type[0] = N_UNDF | N_EXT;
+  else
+    {
+      if (aout_section_merge_with_text_p (abfd, sec))
+	sym_pointer->e_type[0] |= N_TEXT;
+      else
+	{
+          (*_bfd_error_handler)
+	   (_("%s: can not represent section `%s' in a.out object file format"),
+	     bfd_get_filename (abfd), bfd_get_section_name (abfd, sec));
+          bfd_set_error (bfd_error_nonrepresentable_section);
+          return FALSE;
+	}
+    }
+
+  /* Turn the symbol from section relative to absolute again.  */
+  value += sec->vma + off;
+
+  if ((cache_ptr->flags & BSF_WARNING) != 0)
+    sym_pointer->e_type[0] = N_WARNING;
+
+  if ((cache_ptr->flags & BSF_DEBUGGING) != 0)
+    sym_pointer->e_type[0] = ((aout_symbol_type *) cache_ptr)->type;
+  else if ((cache_ptr->flags & BSF_GLOBAL) != 0)
+    sym_pointer->e_type[0] |= N_EXT;
+  else if ((cache_ptr->flags & BSF_LOCAL) != 0)
+    sym_pointer->e_type[0] &= ~N_EXT;
+
+  if ((cache_ptr->flags & BSF_CONSTRUCTOR) != 0)
+    {
+      int type = ((aout_symbol_type *) cache_ptr)->type;
+
+      switch (type)
+	{
+	case N_ABS:	type = N_SETA; break;
+	case N_TEXT:	type = N_SETT; break;
+	case N_DATA:	type = N_SETD; break;
+	case N_BSS:	type = N_SETB; break;
+	}
+      sym_pointer->e_type[0] = type;
+    }
+
+  if ((cache_ptr->flags & BSF_WEAK) != 0)
+    {
+      int type;
+
+      switch (sym_pointer->e_type[0] & N_TYPE)
+	{
+	default:
+	case N_ABS:	type = N_WEAKA; break;
+	case N_TEXT:	type = N_WEAKT; break;
+	case N_DATA:	type = N_WEAKD; break;
+	case N_BSS:	type = N_WEAKB; break;
+	case N_UNDF:	type = N_WEAKU; break;
+	}
+      sym_pointer->e_type[0] = type;
+    }
+
+  PUT_WORD (abfd, value, sym_pointer->e_value);
+
+  return TRUE;
+}
+
+/* Native-level interface to symbols.  */
+
+asymbol *
+NAME (aout, make_empty_symbol) (bfd *abfd)
+{
+  bfd_size_type amt = sizeof (aout_symbol_type);
+
+  aout_symbol_type *new_symbol = (aout_symbol_type *) bfd_zalloc (abfd, amt);
+  if (!new_symbol)
+    return NULL;
+  new_symbol->symbol.the_bfd = abfd;
+
+  return &new_symbol->symbol;
+}
+
+/* Translate a set of internal symbols into external symbols.  */
+
+bfd_boolean
+NAME (aout, translate_symbol_table) (bfd *abfd,
+				     aout_symbol_type *in,
+				     struct external_nlist *ext,
+				     bfd_size_type count,
+				     char *str,
+				     bfd_size_type strsize,
+				     bfd_boolean dynamic)
+{
+  struct external_nlist *ext_end;
+
+  ext_end = ext + count;
+  for (; ext < ext_end; ext++, in++)
+    {
+      bfd_vma x;
+
+      x = GET_WORD (abfd, ext->e_strx);
+      in->symbol.the_bfd = abfd;
+
+      /* For the normal symbols, the zero index points at the number
+	 of bytes in the string table but is to be interpreted as the
+	 null string.  For the dynamic symbols, the number of bytes in
+	 the string table is stored in the __DYNAMIC structure and the
+	 zero index points at an actual string.  */
+      if (x == 0 && ! dynamic)
+	in->symbol.name = "";
+      else if (x < strsize)
+	in->symbol.name = str + x;
+      else
+	return FALSE;
+
+      in->symbol.value = GET_SWORD (abfd,  ext->e_value);
+      in->desc = H_GET_16 (abfd, ext->e_desc);
+      in->other = H_GET_8 (abfd, ext->e_other);
+      in->type = H_GET_8 (abfd,  ext->e_type);
+      in->symbol.udata.p = NULL;
+
+      if (! translate_from_native_sym_flags (abfd, in))
+	return FALSE;
+
+      if (dynamic)
+	in->symbol.flags |= BSF_DYNAMIC;
+    }
+
+  return TRUE;
+}
+
+/* We read the symbols into a buffer, which is discarded when this
+   function exits.  We read the strings into a buffer large enough to
+   hold them all plus all the cached symbol entries.  */
+
+bfd_boolean
+NAME (aout, slurp_symbol_table) (bfd *abfd)
+{
+  struct external_nlist *old_external_syms;
+  aout_symbol_type *cached;
+  bfd_size_type cached_size;
+
+  /* If there's no work to be done, don't do any.  */
+  if (obj_aout_symbols (abfd) != NULL)
+    return TRUE;
+
+  old_external_syms = obj_aout_external_syms (abfd);
+
+  if (! aout_get_external_symbols (abfd))
+    return FALSE;
+
+  cached_size = obj_aout_external_sym_count (abfd);
+  if (cached_size == 0)
+    return TRUE;		/* Nothing to do.  */
+
+  cached_size *= sizeof (aout_symbol_type);
+  cached = (aout_symbol_type *) bfd_zmalloc (cached_size);
+  if (cached == NULL)
+    return FALSE;
+
+  /* Convert from external symbol information to internal.  */
+  if (! (NAME (aout, translate_symbol_table)
+	 (abfd, cached,
+	  obj_aout_external_syms (abfd),
+	  obj_aout_external_sym_count (abfd),
+	  obj_aout_external_strings (abfd),
+	  obj_aout_external_string_size (abfd),
+	  FALSE)))
+    {
+      free (cached);
+      return FALSE;
+    }
+
+  bfd_get_symcount (abfd) = obj_aout_external_sym_count (abfd);
+
+  obj_aout_symbols (abfd) = cached;
+
+  /* It is very likely that anybody who calls this function will not
+     want the external symbol information, so if it was allocated
+     because of our call to aout_get_external_symbols, we free it up
+     right away to save space.  */
+  if (old_external_syms == NULL
+      && obj_aout_external_syms (abfd) != NULL)
+    {
+#ifdef USE_MMAP
+      bfd_free_window (&obj_aout_sym_window (abfd));
+#else
+      free (obj_aout_external_syms (abfd));
+#endif
+      obj_aout_external_syms (abfd) = NULL;
+    }
+
+  return TRUE;
+}
+
+/* We use a hash table when writing out symbols so that we only write
+   out a particular string once.  This helps particularly when the
+   linker writes out stabs debugging entries, because each different
+   contributing object file tends to have many duplicate stabs
+   strings.
+
+   This hash table code breaks dbx on SunOS 4.1.3, so we don't do it
+   if BFD_TRADITIONAL_FORMAT is set.  */
+
+/* Get the index of a string in a strtab, adding it if it is not
+   already present.  */
+
+static inline bfd_size_type
+add_to_stringtab (bfd *abfd,
+		  struct bfd_strtab_hash *tab,
+		  const char *str,
+		  bfd_boolean copy)
+{
+  bfd_boolean hash;
+  bfd_size_type str_index;
+
+  /* An index of 0 always means the empty string.  */
+  if (str == 0 || *str == '\0')
+    return 0;
+
+  /* Don't hash if BFD_TRADITIONAL_FORMAT is set, because SunOS dbx
+     doesn't understand a hashed string table.  */
+  hash = TRUE;
+  if ((abfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
+    hash = FALSE;
+
+  str_index = _bfd_stringtab_add (tab, str, hash, copy);
+
+  if (str_index != (bfd_size_type) -1)
+    /* Add BYTES_IN_WORD to the return value to account for the
+       space taken up by the string table size.  */
+    str_index += BYTES_IN_WORD;
+
+  return str_index;
+}
+
+/* Write out a strtab.  ABFD is already at the right location in the
+   file.  */
+
+static bfd_boolean
+emit_stringtab (bfd *abfd, struct bfd_strtab_hash *tab)
+{
+  bfd_byte buffer[BYTES_IN_WORD];
+  bfd_size_type amt = BYTES_IN_WORD;
+
+  /* The string table starts with the size.  */
+  PUT_WORD (abfd, _bfd_stringtab_size (tab) + BYTES_IN_WORD, buffer);
+  if (bfd_bwrite ((void *) buffer, amt, abfd) != amt)
+    return FALSE;
+
+  return _bfd_stringtab_emit (abfd, tab);
+}
+
+bfd_boolean
+NAME (aout, write_syms) (bfd *abfd)
+{
+  unsigned int count ;
+  asymbol **generic = bfd_get_outsymbols (abfd);
+  struct bfd_strtab_hash *strtab;
+
+  strtab = _bfd_stringtab_init ();
+  if (strtab == NULL)
+    return FALSE;
+
+  for (count = 0; count < bfd_get_symcount (abfd); count++)
+    {
+      asymbol *g = generic[count];
+      bfd_size_type indx;
+      struct external_nlist nsp;
+      bfd_size_type amt;
+
+      indx = add_to_stringtab (abfd, strtab, g->name, FALSE);
+      if (indx == (bfd_size_type) -1)
+	goto error_return;
+      PUT_WORD (abfd, indx, (bfd_byte *) nsp.e_strx);
+
+      if (bfd_asymbol_flavour (g) == abfd->xvec->flavour)
+	{
+	  H_PUT_16 (abfd, aout_symbol (g)->desc,  nsp.e_desc);
+	  H_PUT_8  (abfd, aout_symbol (g)->other, nsp.e_other);
+	  H_PUT_8  (abfd, aout_symbol (g)->type,  nsp.e_type);
+	}
+      else
+	{
+	  H_PUT_16 (abfd, 0, nsp.e_desc);
+	  H_PUT_8  (abfd, 0, nsp.e_other);
+	  H_PUT_8  (abfd, 0, nsp.e_type);
+	}
+
+      if (! translate_to_native_sym_flags (abfd, g, &nsp))
+	goto error_return;
+
+      amt = EXTERNAL_NLIST_SIZE;
+      if (bfd_bwrite ((void *) &nsp, amt, abfd) != amt)
+	goto error_return;
+
+      /* NB: `KEEPIT' currently overlays `udata.p', so set this only
+	 here, at the end.  */
+      g->KEEPIT = count;
+    }
+
+  if (! emit_stringtab (abfd, strtab))
+    goto error_return;
+
+  _bfd_stringtab_free (strtab);
+
+  return TRUE;
+
+error_return:
+  _bfd_stringtab_free (strtab);
+  return FALSE;
+}
+
+long
+NAME (aout, canonicalize_symtab) (bfd *abfd, asymbol **location)
+{
+  unsigned int counter = 0;
+  aout_symbol_type *symbase;
+
+  if (!NAME (aout, slurp_symbol_table) (abfd))
+    return -1;
+
+  for (symbase = obj_aout_symbols (abfd);
+       counter++ < bfd_get_symcount (abfd);
+       )
+    *(location++) = (asymbol *) (symbase++);
+  *location++ =0;
+  return bfd_get_symcount (abfd);
+}
+
+/* Standard reloc stuff.  */
+/* Output standard relocation information to a file in target byte order.  */
+
+extern void  NAME (aout, swap_std_reloc_out)
+  (bfd *, arelent *, struct reloc_std_external *);
+
+void
+NAME (aout, swap_std_reloc_out) (bfd *abfd,
+				 arelent *g,
+				 struct reloc_std_external *natptr)
+{
+  int r_index;
+  asymbol *sym = *(g->sym_ptr_ptr);
+  int r_extern;
+  unsigned int r_length;
+  int r_pcrel;
+  int r_baserel, r_jmptable, r_relative;
+  asection *output_section = sym->section->output_section;
+
+  PUT_WORD (abfd, g->address, natptr->r_address);
+
+  r_length = g->howto->size ;	/* Size as a power of two.  */
+  r_pcrel  = (int) g->howto->pc_relative; /* Relative to PC?  */
+  /* XXX This relies on relocs coming from a.out files.  */
+  r_baserel = (g->howto->type & 8) != 0;
+  r_jmptable = (g->howto->type & 16) != 0;
+  r_relative = (g->howto->type & 32) != 0;
+
+  /* Name was clobbered by aout_write_syms to be symbol index.  */
+
+  /* If this relocation is relative to a symbol then set the
+     r_index to the symbols index, and the r_extern bit.
+
+     Absolute symbols can come in in two ways, either as an offset
+     from the abs section, or as a symbol which has an abs value.
+     check for that here.  */
+
+  if (bfd_is_com_section (output_section)
+      || bfd_is_abs_section (output_section)
+      || bfd_is_und_section (output_section)
+      /* PR gas/3041  a.out relocs against weak symbols
+	 must be treated as if they were against externs.  */
+      || (sym->flags & BSF_WEAK))
+    {
+      if (bfd_abs_section_ptr->symbol == sym)
+	{
+	  /* Whoops, looked like an abs symbol, but is
+	     really an offset from the abs section.  */
+	  r_index = N_ABS;
+	  r_extern = 0;
+	}
+      else
+	{
+	  /* Fill in symbol.  */
+	  r_extern = 1;
+	  r_index = (*(g->sym_ptr_ptr))->KEEPIT;
+	}
+    }
+  else
+    {
+      /* Just an ordinary section.  */
+      r_extern = 0;
+      r_index  = output_section->target_index;
+    }
+
+  /* Now the fun stuff.  */
+  if (bfd_header_big_endian (abfd))
+    {
+      natptr->r_index[0] = r_index >> 16;
+      natptr->r_index[1] = r_index >> 8;
+      natptr->r_index[2] = r_index;
+      natptr->r_type[0] = ((r_extern ? RELOC_STD_BITS_EXTERN_BIG : 0)
+			   | (r_pcrel ? RELOC_STD_BITS_PCREL_BIG : 0)
+			   | (r_baserel ? RELOC_STD_BITS_BASEREL_BIG : 0)
+			   | (r_jmptable ? RELOC_STD_BITS_JMPTABLE_BIG : 0)
+			   | (r_relative ? RELOC_STD_BITS_RELATIVE_BIG : 0)
+			   | (r_length << RELOC_STD_BITS_LENGTH_SH_BIG));
+    }
+  else
+    {
+      natptr->r_index[2] = r_index >> 16;
+      natptr->r_index[1] = r_index >> 8;
+      natptr->r_index[0] = r_index;
+      natptr->r_type[0] = ((r_extern ? RELOC_STD_BITS_EXTERN_LITTLE : 0)
+			   | (r_pcrel ? RELOC_STD_BITS_PCREL_LITTLE : 0)
+			   | (r_baserel ? RELOC_STD_BITS_BASEREL_LITTLE : 0)
+			   | (r_jmptable ? RELOC_STD_BITS_JMPTABLE_LITTLE : 0)
+			   | (r_relative ? RELOC_STD_BITS_RELATIVE_LITTLE : 0)
+			   | (r_length << RELOC_STD_BITS_LENGTH_SH_LITTLE));
+    }
+}
+
+/* Extended stuff.  */
+/* Output extended relocation information to a file in target byte order.  */
+
+extern void NAME (aout, swap_ext_reloc_out)
+  (bfd *, arelent *, struct reloc_ext_external *);
+
+void
+NAME (aout, swap_ext_reloc_out) (bfd *abfd,
+				 arelent *g,
+				 struct reloc_ext_external *natptr)
+{
+  int r_index;
+  int r_extern;
+  unsigned int r_type;
+  bfd_vma r_addend;
+  asymbol *sym = *(g->sym_ptr_ptr);
+  asection *output_section = sym->section->output_section;
+
+  PUT_WORD (abfd, g->address, natptr->r_address);
+
+  r_type = (unsigned int) g->howto->type;
+
+  r_addend = g->addend;
+  if ((sym->flags & BSF_SECTION_SYM) != 0)
+    r_addend += (*(g->sym_ptr_ptr))->section->output_section->vma;
+
+  /* If this relocation is relative to a symbol then set the
+     r_index to the symbols index, and the r_extern bit.
+
+     Absolute symbols can come in in two ways, either as an offset
+     from the abs section, or as a symbol which has an abs value.
+     check for that here.  */
+  if (bfd_is_abs_section (bfd_get_section (sym)))
+    {
+      r_extern = 0;
+      r_index = N_ABS;
+    }
+  else if ((sym->flags & BSF_SECTION_SYM) == 0)
+    {
+      if (bfd_is_und_section (bfd_get_section (sym))
+	  || (sym->flags & BSF_GLOBAL) != 0)
+	r_extern = 1;
+      else
+	r_extern = 0;
+      r_index = (*(g->sym_ptr_ptr))->KEEPIT;
+    }
+  else
+    {
+      /* Just an ordinary section.  */
+      r_extern = 0;
+      r_index = output_section->target_index;
+    }
+
+  /* Now the fun stuff.  */
+  if (bfd_header_big_endian (abfd))
+    {
+      natptr->r_index[0] = r_index >> 16;
+      natptr->r_index[1] = r_index >> 8;
+      natptr->r_index[2] = r_index;
+      natptr->r_type[0] = ((r_extern ? RELOC_EXT_BITS_EXTERN_BIG : 0)
+			   | (r_type << RELOC_EXT_BITS_TYPE_SH_BIG));
+    }
+  else
+    {
+      natptr->r_index[2] = r_index >> 16;
+      natptr->r_index[1] = r_index >> 8;
+      natptr->r_index[0] = r_index;
+      natptr->r_type[0] = ((r_extern ? RELOC_EXT_BITS_EXTERN_LITTLE : 0)
+			   | (r_type << RELOC_EXT_BITS_TYPE_SH_LITTLE));
+    }
+
+  PUT_WORD (abfd, r_addend, natptr->r_addend);
+}
+
+/* BFD deals internally with all things based from the section they're
+   in. so, something in 10 bytes into a text section  with a base of
+   50 would have a symbol (.text+10) and know .text vma was 50.
+
+   Aout keeps all it's symbols based from zero, so the symbol would
+   contain 60. This macro subs the base of each section from the value
+   to give the true offset from the section.  */
+
+#define MOVE_ADDRESS(ad)						\
+  if (r_extern)								\
+    {									\
+      /* Undefined symbol.  */						\
+      cache_ptr->sym_ptr_ptr = symbols + r_index;			\
+      cache_ptr->addend = ad;						\
+    }									\
+   else									\
+    {									\
+      /* Defined, section relative.  Replace symbol with pointer to	\
+	 symbol which points to section.  */				\
+      switch (r_index)							\
+	{								\
+	case N_TEXT:							\
+	case N_TEXT | N_EXT:						\
+	  cache_ptr->sym_ptr_ptr = obj_textsec (abfd)->symbol_ptr_ptr;	\
+	  cache_ptr->addend = ad - su->textsec->vma;			\
+	  break;							\
+	case N_DATA:							\
+	case N_DATA | N_EXT:						\
+	  cache_ptr->sym_ptr_ptr = obj_datasec (abfd)->symbol_ptr_ptr;	\
+	  cache_ptr->addend = ad - su->datasec->vma;			\
+	  break;							\
+	case N_BSS:							\
+	case N_BSS | N_EXT:						\
+	  cache_ptr->sym_ptr_ptr = obj_bsssec (abfd)->symbol_ptr_ptr;	\
+	  cache_ptr->addend = ad - su->bsssec->vma;			\
+	  break;							\
+	default:							\
+	case N_ABS:							\
+	case N_ABS | N_EXT:						\
+	  cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;	\
+	  cache_ptr->addend = ad;					\
+	  break;							\
+	}								\
+    }
+
+void
+NAME (aout, swap_ext_reloc_in) (bfd *abfd,
+				struct reloc_ext_external *bytes,
+				arelent *cache_ptr,
+				asymbol **symbols,
+				bfd_size_type symcount)
+{
+  unsigned int r_index;
+  int r_extern;
+  unsigned int r_type;
+  struct aoutdata *su = &(abfd->tdata.aout_data->a);
+
+  cache_ptr->address = (GET_SWORD (abfd, bytes->r_address));
+
+  /* Now the fun stuff.  */
+  if (bfd_header_big_endian (abfd))
+    {
+      r_index = (((unsigned int) bytes->r_index[0] << 16)
+		 | ((unsigned int) bytes->r_index[1] << 8)
+		 | bytes->r_index[2]);
+      r_extern = (0 != (bytes->r_type[0] & RELOC_EXT_BITS_EXTERN_BIG));
+      r_type = ((bytes->r_type[0] & RELOC_EXT_BITS_TYPE_BIG)
+		>> RELOC_EXT_BITS_TYPE_SH_BIG);
+    }
+  else
+    {
+      r_index =  (((unsigned int) bytes->r_index[2] << 16)
+		  | ((unsigned int) bytes->r_index[1] << 8)
+		  | bytes->r_index[0]);
+      r_extern = (0 != (bytes->r_type[0] & RELOC_EXT_BITS_EXTERN_LITTLE));
+      r_type = ((bytes->r_type[0] & RELOC_EXT_BITS_TYPE_LITTLE)
+		>> RELOC_EXT_BITS_TYPE_SH_LITTLE);
+    }
+
+  if (r_type < TABLE_SIZE (howto_table_ext))
+    cache_ptr->howto = howto_table_ext + r_type;
+  else
+    cache_ptr->howto = NULL;
+
+  /* Base relative relocs are always against the symbol table,
+     regardless of the setting of r_extern.  r_extern just reflects
+     whether the symbol the reloc is against is local or global.  */
+  if (r_type == (unsigned int) RELOC_BASE10
+      || r_type == (unsigned int) RELOC_BASE13
+      || r_type == (unsigned int) RELOC_BASE22)
+    r_extern = 1;
+
+  if (r_extern && r_index > symcount)
+    {
+      /* We could arrange to return an error, but it might be useful
+         to see the file even if it is bad.  */
+      r_extern = 0;
+      r_index = N_ABS;
+    }
+
+  MOVE_ADDRESS (GET_SWORD (abfd, bytes->r_addend));
+}
+
+void
+NAME (aout, swap_std_reloc_in) (bfd *abfd,
+				struct reloc_std_external *bytes,
+				arelent *cache_ptr,
+				asymbol **symbols,
+				bfd_size_type symcount)
+{
+  unsigned int r_index;
+  int r_extern;
+  unsigned int r_length;
+  int r_pcrel;
+  int r_baserel, r_jmptable, r_relative;
+  struct aoutdata  *su = &(abfd->tdata.aout_data->a);
+  unsigned int howto_idx;
+
+  cache_ptr->address = H_GET_32 (abfd, bytes->r_address);
+
+  /* Now the fun stuff.  */
+  if (bfd_header_big_endian (abfd))
+    {
+      r_index = (((unsigned int) bytes->r_index[0] << 16)
+		 | ((unsigned int) bytes->r_index[1] << 8)
+		 | bytes->r_index[2]);
+      r_extern  = (0 != (bytes->r_type[0] & RELOC_STD_BITS_EXTERN_BIG));
+      r_pcrel   = (0 != (bytes->r_type[0] & RELOC_STD_BITS_PCREL_BIG));
+      r_baserel = (0 != (bytes->r_type[0] & RELOC_STD_BITS_BASEREL_BIG));
+      r_jmptable= (0 != (bytes->r_type[0] & RELOC_STD_BITS_JMPTABLE_BIG));
+      r_relative= (0 != (bytes->r_type[0] & RELOC_STD_BITS_RELATIVE_BIG));
+      r_length  = ((bytes->r_type[0] & RELOC_STD_BITS_LENGTH_BIG)
+		   >> RELOC_STD_BITS_LENGTH_SH_BIG);
+    }
+  else
+    {
+      r_index = (((unsigned int) bytes->r_index[2] << 16)
+		 | ((unsigned int) bytes->r_index[1] << 8)
+		 | bytes->r_index[0]);
+      r_extern  = (0 != (bytes->r_type[0] & RELOC_STD_BITS_EXTERN_LITTLE));
+      r_pcrel   = (0 != (bytes->r_type[0] & RELOC_STD_BITS_PCREL_LITTLE));
+      r_baserel = (0 != (bytes->r_type[0] & RELOC_STD_BITS_BASEREL_LITTLE));
+      r_jmptable= (0 != (bytes->r_type[0] & RELOC_STD_BITS_JMPTABLE_LITTLE));
+      r_relative= (0 != (bytes->r_type[0] & RELOC_STD_BITS_RELATIVE_LITTLE));
+      r_length  = ((bytes->r_type[0] & RELOC_STD_BITS_LENGTH_LITTLE)
+		   >> RELOC_STD_BITS_LENGTH_SH_LITTLE);
+    }
+
+  howto_idx = (r_length + 4 * r_pcrel + 8 * r_baserel
+	       + 16 * r_jmptable + 32 * r_relative);
+  if (howto_idx < TABLE_SIZE (howto_table_std))
+    {
+      cache_ptr->howto = howto_table_std + howto_idx;
+      if (cache_ptr->howto->type == (unsigned int) -1)
+	cache_ptr->howto = NULL;
+    }
+  else
+    cache_ptr->howto = NULL;
+
+  /* Base relative relocs are always against the symbol table,
+     regardless of the setting of r_extern.  r_extern just reflects
+     whether the symbol the reloc is against is local or global.  */
+  if (r_baserel)
+    r_extern = 1;
+
+  if (r_extern && r_index > symcount)
+    {
+      /* We could arrange to return an error, but it might be useful
+         to see the file even if it is bad.  */
+      r_extern = 0;
+      r_index = N_ABS;
+    }
+
+  MOVE_ADDRESS (0);
+}
+
+/* Read and swap the relocs for a section.  */
+
+bfd_boolean
+NAME (aout, slurp_reloc_table) (bfd *abfd, sec_ptr asect, asymbol **symbols)
+{
+  bfd_size_type count;
+  bfd_size_type reloc_size;
+  void * relocs;
+  arelent *reloc_cache;
+  size_t each_size;
+  unsigned int counter = 0;
+  arelent *cache_ptr;
+  bfd_size_type amt;
+
+  if (asect->relocation)
+    return TRUE;
+
+  if (asect->flags & SEC_CONSTRUCTOR)
+    return TRUE;
+
+  if (asect == obj_datasec (abfd))
+    reloc_size = exec_hdr (abfd)->a_drsize;
+  else if (asect == obj_textsec (abfd))
+    reloc_size = exec_hdr (abfd)->a_trsize;
+  else if (asect == obj_bsssec (abfd))
+    reloc_size = 0;
+  else
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  if (reloc_size == 0)
+    return TRUE;		/* Nothing to be done.  */
+
+  if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0)
+    return FALSE;
+
+  each_size = obj_reloc_entry_size (abfd);
+
+  count = reloc_size / each_size;
+  if (count == 0)
+    return TRUE;		/* Nothing to be done.  */
+
+  amt = count * sizeof (arelent);
+  reloc_cache = (arelent *) bfd_zmalloc (amt);
+  if (reloc_cache == NULL)
+    return FALSE;
+
+  relocs = bfd_malloc (reloc_size);
+  if (relocs == NULL)
+    {
+      free (reloc_cache);
+      return FALSE;
+    }
+
+  if (bfd_bread (relocs, reloc_size, abfd) != reloc_size)
+    {
+      free (relocs);
+      free (reloc_cache);
+      return FALSE;
+    }
+
+  cache_ptr = reloc_cache;
+  if (each_size == RELOC_EXT_SIZE)
+    {
+      struct reloc_ext_external *rptr = (struct reloc_ext_external *) relocs;
+
+      for (; counter < count; counter++, rptr++, cache_ptr++)
+	MY_swap_ext_reloc_in (abfd, rptr, cache_ptr, symbols,
+			      (bfd_size_type) bfd_get_symcount (abfd));
+    }
+  else
+    {
+      struct reloc_std_external *rptr = (struct reloc_std_external *) relocs;
+
+      for (; counter < count; counter++, rptr++, cache_ptr++)
+	MY_swap_std_reloc_in (abfd, rptr, cache_ptr, symbols,
+			      (bfd_size_type) bfd_get_symcount (abfd));
+    }
+
+  free (relocs);
+
+  asect->relocation = reloc_cache;
+  asect->reloc_count = cache_ptr - reloc_cache;
+
+  return TRUE;
+}
+
+/* Write out a relocation section into an object file.  */
+
+bfd_boolean
+NAME (aout, squirt_out_relocs) (bfd *abfd, asection *section)
+{
+  arelent **generic;
+  unsigned char *native, *natptr;
+  size_t each_size;
+
+  unsigned int count = section->reloc_count;
+  bfd_size_type natsize;
+
+  if (count == 0 || section->orelocation == NULL)
+    return TRUE;
+
+  each_size = obj_reloc_entry_size (abfd);
+  natsize = (bfd_size_type) each_size * count;
+  native = (unsigned char *) bfd_zalloc (abfd, natsize);
+  if (!native)
+    return FALSE;
+
+  generic = section->orelocation;
+
+  if (each_size == RELOC_EXT_SIZE)
+    {
+      for (natptr = native;
+	   count != 0;
+	   --count, natptr += each_size, ++generic)
+	MY_swap_ext_reloc_out (abfd, *generic,
+			       (struct reloc_ext_external *) natptr);
+    }
+  else
+    {
+      for (natptr = native;
+	   count != 0;
+	   --count, natptr += each_size, ++generic)
+	MY_swap_std_reloc_out (abfd, *generic,
+			       (struct reloc_std_external *) natptr);
+    }
+
+  if (bfd_bwrite ((void *) native, natsize, abfd) != natsize)
+    {
+      bfd_release (abfd, native);
+      return FALSE;
+    }
+  bfd_release (abfd, native);
+
+  return TRUE;
+}
+
+/* This is stupid.  This function should be a boolean predicate.  */
+
+long
+NAME (aout, canonicalize_reloc) (bfd *abfd,
+				 sec_ptr section,
+				 arelent **relptr,
+				 asymbol **symbols)
+{
+  arelent *tblptr = section->relocation;
+  unsigned int count;
+
+  if (section == obj_bsssec (abfd))
+    {
+      *relptr = NULL;
+      return 0;
+    }
+
+  if (!(tblptr || NAME (aout, slurp_reloc_table) (abfd, section, symbols)))
+    return -1;
+
+  if (section->flags & SEC_CONSTRUCTOR)
+    {
+      arelent_chain *chain = section->constructor_chain;
+      for (count = 0; count < section->reloc_count; count ++)
+	{
+	  *relptr ++ = &chain->relent;
+	  chain = chain->next;
+	}
+    }
+  else
+    {
+      tblptr = section->relocation;
+
+      for (count = 0; count++ < section->reloc_count; )
+	{
+	  *relptr++ = tblptr++;
+	}
+    }
+  *relptr = 0;
+
+  return section->reloc_count;
+}
+
+long
+NAME (aout, get_reloc_upper_bound) (bfd *abfd, sec_ptr asect)
+{
+  if (bfd_get_format (abfd) != bfd_object)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return -1;
+    }
+
+  if (asect->flags & SEC_CONSTRUCTOR)
+    return sizeof (arelent *) * (asect->reloc_count + 1);
+
+  if (asect == obj_datasec (abfd))
+    return sizeof (arelent *)
+      * ((exec_hdr (abfd)->a_drsize / obj_reloc_entry_size (abfd))
+	 + 1);
+
+  if (asect == obj_textsec (abfd))
+    return sizeof (arelent *)
+      * ((exec_hdr (abfd)->a_trsize / obj_reloc_entry_size (abfd))
+	 + 1);
+
+  if (asect == obj_bsssec (abfd))
+    return sizeof (arelent *);
+
+  if (asect == obj_bsssec (abfd))
+    return 0;
+
+  bfd_set_error (bfd_error_invalid_operation);
+  return -1;
+}
+
+long
+NAME (aout, get_symtab_upper_bound) (bfd *abfd)
+{
+  if (!NAME (aout, slurp_symbol_table) (abfd))
+    return -1;
+
+  return (bfd_get_symcount (abfd)+1) * (sizeof (aout_symbol_type *));
+}
+
+alent *
+NAME (aout, get_lineno) (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+			 asymbol *ignore_symbol ATTRIBUTE_UNUSED)
+{
+  return NULL;
+}
+
+void
+NAME (aout, get_symbol_info) (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+			      asymbol *symbol,
+			      symbol_info *ret)
+{
+  bfd_symbol_info (symbol, ret);
+
+  if (ret->type == '?')
+    {
+      int type_code = aout_symbol (symbol)->type & 0xff;
+      const char *stab_name = bfd_get_stab_name (type_code);
+      static char buf[10];
+
+      if (stab_name == NULL)
+	{
+	  sprintf (buf, "(%d)", type_code);
+	  stab_name = buf;
+	}
+      ret->type = '-';
+      ret->stab_type = type_code;
+      ret->stab_other = (unsigned) (aout_symbol (symbol)->other & 0xff);
+      ret->stab_desc = (unsigned) (aout_symbol (symbol)->desc & 0xffff);
+      ret->stab_name = stab_name;
+    }
+}
+
+void
+NAME (aout, print_symbol) (bfd *abfd,
+			   void * afile,
+			   asymbol *symbol,
+			   bfd_print_symbol_type how)
+{
+  FILE *file = (FILE *)afile;
+
+  switch (how)
+    {
+    case bfd_print_symbol_name:
+      if (symbol->name)
+	fprintf (file,"%s", symbol->name);
+      break;
+    case bfd_print_symbol_more:
+      fprintf (file,"%4x %2x %2x",
+	       (unsigned) (aout_symbol (symbol)->desc & 0xffff),
+	       (unsigned) (aout_symbol (symbol)->other & 0xff),
+	       (unsigned) (aout_symbol (symbol)->type));
+      break;
+    case bfd_print_symbol_all:
+      {
+	const char *section_name = symbol->section->name;
+
+	bfd_print_symbol_vandf (abfd, (void *)file, symbol);
+
+	fprintf (file," %-5s %04x %02x %02x",
+		 section_name,
+		 (unsigned) (aout_symbol (symbol)->desc & 0xffff),
+		 (unsigned) (aout_symbol (symbol)->other & 0xff),
+		 (unsigned) (aout_symbol (symbol)->type & 0xff));
+	if (symbol->name)
+	  fprintf (file," %s", symbol->name);
+      }
+      break;
+    }
+}
+
+/* If we don't have to allocate more than 1MB to hold the generic
+   symbols, we use the generic minisymbol methord: it's faster, since
+   it only translates the symbols once, not multiple times.  */
+#define MINISYM_THRESHOLD (1000000 / sizeof (asymbol))
+
+/* Read minisymbols.  For minisymbols, we use the unmodified a.out
+   symbols.  The minisymbol_to_symbol function translates these into
+   BFD asymbol structures.  */
+
+long
+NAME (aout, read_minisymbols) (bfd *abfd,
+			       bfd_boolean dynamic,
+			       void * *minisymsp,
+			       unsigned int *sizep)
+{
+  if (dynamic)
+    /* We could handle the dynamic symbols here as well, but it's
+       easier to hand them off.  */
+    return _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep);
+
+  if (! aout_get_external_symbols (abfd))
+    return -1;
+
+  if (obj_aout_external_sym_count (abfd) < MINISYM_THRESHOLD)
+    return _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep);
+
+  *minisymsp = (void *) obj_aout_external_syms (abfd);
+
+  /* By passing the external symbols back from this routine, we are
+     giving up control over the memory block.  Clear
+     obj_aout_external_syms, so that we do not try to free it
+     ourselves.  */
+  obj_aout_external_syms (abfd) = NULL;
+
+  *sizep = EXTERNAL_NLIST_SIZE;
+  return obj_aout_external_sym_count (abfd);
+}
+
+/* Convert a minisymbol to a BFD asymbol.  A minisymbol is just an
+   unmodified a.out symbol.  The SYM argument is a structure returned
+   by bfd_make_empty_symbol, which we fill in here.  */
+
+asymbol *
+NAME (aout, minisymbol_to_symbol) (bfd *abfd,
+				   bfd_boolean dynamic,
+				   const void * minisym,
+				   asymbol *sym)
+{
+  if (dynamic
+      || obj_aout_external_sym_count (abfd) < MINISYM_THRESHOLD)
+    return _bfd_generic_minisymbol_to_symbol (abfd, dynamic, minisym, sym);
+
+  memset (sym, 0, sizeof (aout_symbol_type));
+
+  /* We call translate_symbol_table to translate a single symbol.  */
+  if (! (NAME (aout, translate_symbol_table)
+	 (abfd,
+	  (aout_symbol_type *) sym,
+	  (struct external_nlist *) minisym,
+	  (bfd_size_type) 1,
+	  obj_aout_external_strings (abfd),
+	  obj_aout_external_string_size (abfd),
+	  FALSE)))
+    return NULL;
+
+  return sym;
+}
+
+/* Provided a BFD, a section and an offset into the section, calculate
+   and return the name of the source file and the line nearest to the
+   wanted location.  */
+
+bfd_boolean
+NAME (aout, find_nearest_line) (bfd *abfd,
+				asection *section,
+				asymbol **symbols,
+				bfd_vma offset,
+				const char **filename_ptr,
+				const char **functionname_ptr,
+				unsigned int *line_ptr)
+{
+  /* Run down the file looking for the filename, function and linenumber.  */
+  asymbol **p;
+  const char *directory_name = NULL;
+  const char *main_file_name = NULL;
+  const char *current_file_name = NULL;
+  const char *line_file_name = NULL;      /* Value of current_file_name at line number.  */
+  const char *line_directory_name = NULL; /* Value of directory_name at line number.  */
+  bfd_vma low_line_vma = 0;
+  bfd_vma low_func_vma = 0;
+  asymbol *func = 0;
+  bfd_size_type filelen, funclen;
+  char *buf;
+
+  *filename_ptr = abfd->filename;
+  *functionname_ptr = 0;
+  *line_ptr = 0;
+
+  if (symbols != NULL)
+    {
+      for (p = symbols; *p; p++)
+	{
+	  aout_symbol_type  *q = (aout_symbol_type *) (*p);
+	next:
+	  switch (q->type)
+	    {
+	    case N_TEXT:
+	      /* If this looks like a file name symbol, and it comes after
+		 the line number we have found so far, but before the
+		 offset, then we have probably not found the right line
+		 number.  */
+	      if (q->symbol.value <= offset
+		  && ((q->symbol.value > low_line_vma
+		       && (line_file_name != NULL
+			   || *line_ptr != 0))
+		      || (q->symbol.value > low_func_vma
+			  && func != NULL)))
+		{
+		  const char *symname;
+
+		  symname = q->symbol.name;
+		  if (strcmp (symname + strlen (symname) - 2, ".o") == 0)
+		    {
+		      if (q->symbol.value > low_line_vma)
+			{
+			  *line_ptr = 0;
+			  line_file_name = NULL;
+			}
+		      if (q->symbol.value > low_func_vma)
+			func = NULL;
+		    }
+		}
+	      break;
+
+	    case N_SO:
+	      /* If this symbol is less than the offset, but greater than
+		 the line number we have found so far, then we have not
+		 found the right line number.  */
+	      if (q->symbol.value <= offset)
+		{
+		  if (q->symbol.value > low_line_vma)
+		    {
+		      *line_ptr = 0;
+		      line_file_name = NULL;
+		    }
+		  if (q->symbol.value > low_func_vma)
+		    func = NULL;
+		}
+
+	      main_file_name = current_file_name = q->symbol.name;
+	      /* Look ahead to next symbol to check if that too is an N_SO.  */
+	      p++;
+	      if (*p == NULL)
+		goto done;
+	      q = (aout_symbol_type *) (*p);
+	      if (q->type != (int)N_SO)
+		goto next;
+
+	      /* Found a second N_SO  First is directory; second is filename.  */
+	      directory_name = current_file_name;
+	      main_file_name = current_file_name = q->symbol.name;
+	      if (obj_textsec (abfd) != section)
+		goto done;
+	      break;
+	    case N_SOL:
+	      current_file_name = q->symbol.name;
+	      break;
+
+	    case N_SLINE:
+
+	    case N_DSLINE:
+	    case N_BSLINE:
+	      /* We'll keep this if it resolves nearer than the one we have
+		 already.  */
+	      if (q->symbol.value >= low_line_vma
+		  && q->symbol.value <= offset)
+		{
+		  *line_ptr = q->desc;
+		  low_line_vma = q->symbol.value;
+		  line_file_name = current_file_name;
+		  line_directory_name = directory_name;
+		}
+	      break;
+	    case N_FUN:
+	      {
+		/* We'll keep this if it is nearer than the one we have already.  */
+		if (q->symbol.value >= low_func_vma &&
+		    q->symbol.value <= offset)
+		  {
+		    low_func_vma = q->symbol.value;
+		    func = (asymbol *)q;
+		  }
+		else if (q->symbol.value > offset)
+		  goto done;
+	      }
+	      break;
+	    }
+	}
+    }
+
+ done:
+  if (*line_ptr != 0)
+    {
+      main_file_name = line_file_name;
+      directory_name = line_directory_name;
+    }
+
+  if (main_file_name == NULL
+      || IS_ABSOLUTE_PATH (main_file_name)
+      || directory_name == NULL)
+    filelen = 0;
+  else
+    filelen = strlen (directory_name) + strlen (main_file_name);
+
+  if (func == NULL)
+    funclen = 0;
+  else
+    funclen = strlen (bfd_asymbol_name (func));
+
+  if (adata (abfd).line_buf != NULL)
+    free (adata (abfd).line_buf);
+
+  if (filelen + funclen == 0)
+    adata (abfd).line_buf = buf = NULL;
+  else
+    {
+      buf = (char *) bfd_malloc (filelen + funclen + 3);
+      adata (abfd).line_buf = buf;
+      if (buf == NULL)
+	return FALSE;
+    }
+
+  if (main_file_name != NULL)
+    {
+      if (IS_ABSOLUTE_PATH (main_file_name) || directory_name == NULL)
+	*filename_ptr = main_file_name;
+      else
+	{
+	  sprintf (buf, "%s%s", directory_name, main_file_name);
+	  *filename_ptr = buf;
+	  buf += filelen + 1;
+	}
+    }
+
+  if (func)
+    {
+      const char *function = func->name;
+      char *colon;
+
+      /* The caller expects a symbol name.  We actually have a
+	 function name, without the leading underscore.  Put the
+	 underscore back in, so that the caller gets a symbol name.  */
+      if (bfd_get_symbol_leading_char (abfd) == '\0')
+	strcpy (buf, function);
+      else
+	{
+	  buf[0] = bfd_get_symbol_leading_char (abfd);
+	  strcpy (buf + 1, function);
+	}
+      /* Have to remove : stuff.  */
+      colon = strchr (buf, ':');
+      if (colon != NULL)
+	*colon = '\0';
+      *functionname_ptr = buf;
+    }
+
+  return TRUE;
+}
+
+int
+NAME (aout, sizeof_headers) (bfd *abfd,
+			     struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return adata (abfd).exec_bytes_size;
+}
+
+/* Free all information we have cached for this BFD.  We can always
+   read it again later if we need it.  */
+
+bfd_boolean
+NAME (aout, bfd_free_cached_info) (bfd *abfd)
+{
+  asection *o;
+
+  if (bfd_get_format (abfd) != bfd_object
+      || abfd->tdata.aout_data == NULL)
+    return TRUE;
+
+#define BFCI_FREE(x) if (x != NULL) { free (x); x = NULL; }
+  BFCI_FREE (obj_aout_symbols (abfd));
+#ifdef USE_MMAP
+  obj_aout_external_syms (abfd) = 0;
+  bfd_free_window (&obj_aout_sym_window (abfd));
+  bfd_free_window (&obj_aout_string_window (abfd));
+  obj_aout_external_strings (abfd) = 0;
+#else
+  BFCI_FREE (obj_aout_external_syms (abfd));
+  BFCI_FREE (obj_aout_external_strings (abfd));
+#endif
+  for (o = abfd->sections; o != NULL; o = o->next)
+    BFCI_FREE (o->relocation);
+#undef BFCI_FREE
+
+  return TRUE;
+}
+
+/* a.out link code.  */
+
+/* Routine to create an entry in an a.out link hash table.  */
+
+struct bfd_hash_entry *
+NAME (aout, link_hash_newfunc) (struct bfd_hash_entry *entry,
+				struct bfd_hash_table *table,
+				const char *string)
+{
+  struct aout_link_hash_entry *ret = (struct aout_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = (struct aout_link_hash_entry *) bfd_hash_allocate (table,
+                                                             sizeof (* ret));
+  if (ret == NULL)
+    return NULL;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct aout_link_hash_entry *)
+	 _bfd_link_hash_newfunc ((struct bfd_hash_entry *) ret,
+				 table, string));
+  if (ret)
+    {
+      /* Set local fields.  */
+      ret->written = FALSE;
+      ret->indx = -1;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Initialize an a.out link hash table.  */
+
+bfd_boolean
+NAME (aout, link_hash_table_init) (struct aout_link_hash_table *table,
+				   bfd *abfd,
+				   struct bfd_hash_entry *(*newfunc)
+				   (struct bfd_hash_entry *, struct bfd_hash_table *,
+				    const char *),
+				   unsigned int entsize)
+{
+  return _bfd_link_hash_table_init (&table->root, abfd, newfunc, entsize);
+}
+
+/* Create an a.out link hash table.  */
+
+struct bfd_link_hash_table *
+NAME (aout, link_hash_table_create) (bfd *abfd)
+{
+  struct aout_link_hash_table *ret;
+  bfd_size_type amt = sizeof (* ret);
+
+  ret = (struct aout_link_hash_table *) bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!NAME (aout, link_hash_table_init) (ret, abfd,
+					  NAME (aout, link_hash_newfunc),
+					  sizeof (struct aout_link_hash_entry)))
+    {
+      free (ret);
+      return NULL;
+    }
+  return &ret->root;
+}
+
+/* Add all symbols from an object file to the hash table.  */
+
+static bfd_boolean
+aout_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  bfd_boolean (*add_one_symbol)
+    (struct bfd_link_info *, bfd *, const char *, flagword, asection *,
+	     bfd_vma, const char *, bfd_boolean, bfd_boolean,
+	     struct bfd_link_hash_entry **);
+  struct external_nlist *syms;
+  bfd_size_type sym_count;
+  char *strings;
+  bfd_boolean copy;
+  struct aout_link_hash_entry **sym_hash;
+  struct external_nlist *p;
+  struct external_nlist *pend;
+  bfd_size_type amt;
+
+  syms = obj_aout_external_syms (abfd);
+  sym_count = obj_aout_external_sym_count (abfd);
+  strings = obj_aout_external_strings (abfd);
+  if (info->keep_memory)
+    copy = FALSE;
+  else
+    copy = TRUE;
+
+  if (aout_backend_info (abfd)->add_dynamic_symbols != NULL)
+    {
+      if (! ((*aout_backend_info (abfd)->add_dynamic_symbols)
+	     (abfd, info, &syms, &sym_count, &strings)))
+	return FALSE;
+    }
+
+  if (sym_count == 0)
+    return TRUE;		/* Nothing to do.  */
+
+  /* We keep a list of the linker hash table entries that correspond
+     to particular symbols.  We could just look them up in the hash
+     table, but keeping the list is more efficient.  Perhaps this
+     should be conditional on info->keep_memory.  */
+  amt = sym_count * sizeof (struct aout_link_hash_entry *);
+  sym_hash = (struct aout_link_hash_entry **) bfd_alloc (abfd, amt);
+  if (sym_hash == NULL)
+    return FALSE;
+  obj_aout_sym_hashes (abfd) = sym_hash;
+
+  add_one_symbol = aout_backend_info (abfd)->add_one_symbol;
+  if (add_one_symbol == NULL)
+    add_one_symbol = _bfd_generic_link_add_one_symbol;
+
+  p = syms;
+  pend = p + sym_count;
+  for (; p < pend; p++, sym_hash++)
+    {
+      int type;
+      const char *name;
+      bfd_vma value;
+      asection *section;
+      flagword flags;
+      const char *string;
+
+      *sym_hash = NULL;
+
+      type = H_GET_8 (abfd, p->e_type);
+
+      /* Ignore debugging symbols.  */
+      if ((type & N_STAB) != 0)
+	continue;
+
+      name = strings + GET_WORD (abfd, p->e_strx);
+      value = GET_WORD (abfd, p->e_value);
+      flags = BSF_GLOBAL;
+      string = NULL;
+      switch (type)
+	{
+	default:
+	  abort ();
+
+	case N_UNDF:
+	case N_ABS:
+	case N_TEXT:
+	case N_DATA:
+	case N_BSS:
+	case N_FN_SEQ:
+	case N_COMM:
+	case N_SETV:
+	case N_FN:
+	  /* Ignore symbols that are not externally visible.  */
+	  continue;
+	case N_INDR:
+	  /* Ignore local indirect symbol.  */
+	  ++p;
+	  ++sym_hash;
+	  continue;
+
+	case N_UNDF | N_EXT:
+	  if (value == 0)
+	    {
+	      section = bfd_und_section_ptr;
+	      flags = 0;
+	    }
+	  else
+	    section = bfd_com_section_ptr;
+	  break;
+	case N_ABS | N_EXT:
+	  section = bfd_abs_section_ptr;
+	  break;
+	case N_TEXT | N_EXT:
+	  section = obj_textsec (abfd);
+	  value -= bfd_get_section_vma (abfd, section);
+	  break;
+	case N_DATA | N_EXT:
+	case N_SETV | N_EXT:
+	  /* Treat N_SETV symbols as N_DATA symbol; see comment in
+	     translate_from_native_sym_flags.  */
+	  section = obj_datasec (abfd);
+	  value -= bfd_get_section_vma (abfd, section);
+	  break;
+	case N_BSS | N_EXT:
+	  section = obj_bsssec (abfd);
+	  value -= bfd_get_section_vma (abfd, section);
+	  break;
+	case N_INDR | N_EXT:
+	  /* An indirect symbol.  The next symbol is the symbol
+	     which this one really is.  */
+	  BFD_ASSERT (p + 1 < pend);
+	  ++p;
+	  string = strings + GET_WORD (abfd, p->e_strx);
+	  section = bfd_ind_section_ptr;
+	  flags |= BSF_INDIRECT;
+	  break;
+	case N_COMM | N_EXT:
+	  section = bfd_com_section_ptr;
+	  break;
+	case N_SETA: case N_SETA | N_EXT:
+	  section = bfd_abs_section_ptr;
+	  flags |= BSF_CONSTRUCTOR;
+	  break;
+	case N_SETT: case N_SETT | N_EXT:
+	  section = obj_textsec (abfd);
+	  flags |= BSF_CONSTRUCTOR;
+	  value -= bfd_get_section_vma (abfd, section);
+	  break;
+	case N_SETD: case N_SETD | N_EXT:
+	  section = obj_datasec (abfd);
+	  flags |= BSF_CONSTRUCTOR;
+	  value -= bfd_get_section_vma (abfd, section);
+	  break;
+	case N_SETB: case N_SETB | N_EXT:
+	  section = obj_bsssec (abfd);
+	  flags |= BSF_CONSTRUCTOR;
+	  value -= bfd_get_section_vma (abfd, section);
+	  break;
+	case N_WARNING:
+	  /* A warning symbol.  The next symbol is the one to warn
+	     about.  If there is no next symbol, just look away.  */
+	  if (p + 1 >= pend)
+	    return TRUE;
+	  ++p;
+	  string = name;
+	  name = strings + GET_WORD (abfd, p->e_strx);
+	  section = bfd_und_section_ptr;
+	  flags |= BSF_WARNING;
+	  break;
+	case N_WEAKU:
+	  section = bfd_und_section_ptr;
+	  flags = BSF_WEAK;
+	  break;
+	case N_WEAKA:
+	  section = bfd_abs_section_ptr;
+	  flags = BSF_WEAK;
+	  break;
+	case N_WEAKT:
+	  section = obj_textsec (abfd);
+	  value -= bfd_get_section_vma (abfd, section);
+	  flags = BSF_WEAK;
+	  break;
+	case N_WEAKD:
+	  section = obj_datasec (abfd);
+	  value -= bfd_get_section_vma (abfd, section);
+	  flags = BSF_WEAK;
+	  break;
+	case N_WEAKB:
+	  section = obj_bsssec (abfd);
+	  value -= bfd_get_section_vma (abfd, section);
+	  flags = BSF_WEAK;
+	  break;
+	}
+
+      if (! ((*add_one_symbol)
+	     (info, abfd, name, flags, section, value, string, copy, FALSE,
+	      (struct bfd_link_hash_entry **) sym_hash)))
+	return FALSE;
+
+      /* Restrict the maximum alignment of a common symbol based on
+	 the architecture, since a.out has no way to represent
+	 alignment requirements of a section in a .o file.  FIXME:
+	 This isn't quite right: it should use the architecture of the
+	 output file, not the input files.  */
+      if ((*sym_hash)->root.type == bfd_link_hash_common
+	  && ((*sym_hash)->root.u.c.p->alignment_power >
+	      bfd_get_arch_info (abfd)->section_align_power))
+	(*sym_hash)->root.u.c.p->alignment_power =
+	  bfd_get_arch_info (abfd)->section_align_power;
+
+      /* If this is a set symbol, and we are not building sets, then
+	 it is possible for the hash entry to not have been set.  In
+	 such a case, treat the symbol as not globally defined.  */
+      if ((*sym_hash)->root.type == bfd_link_hash_new)
+	{
+	  BFD_ASSERT ((flags & BSF_CONSTRUCTOR) != 0);
+	  *sym_hash = NULL;
+	}
+
+      if (type == (N_INDR | N_EXT) || type == N_WARNING)
+	++sym_hash;
+    }
+
+  return TRUE;
+}
+
+/* Free up the internal symbols read from an a.out file.  */
+
+static bfd_boolean
+aout_link_free_symbols (bfd *abfd)
+{
+  if (obj_aout_external_syms (abfd) != NULL)
+    {
+#ifdef USE_MMAP
+      bfd_free_window (&obj_aout_sym_window (abfd));
+#else
+      free ((void *) obj_aout_external_syms (abfd));
+#endif
+      obj_aout_external_syms (abfd) = NULL;
+    }
+  if (obj_aout_external_strings (abfd) != NULL)
+    {
+#ifdef USE_MMAP
+      bfd_free_window (&obj_aout_string_window (abfd));
+#else
+      free ((void *) obj_aout_external_strings (abfd));
+#endif
+      obj_aout_external_strings (abfd) = NULL;
+    }
+  return TRUE;
+}
+
+/* Add symbols from an a.out object file.  */
+
+static bfd_boolean
+aout_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  if (! aout_get_external_symbols (abfd))
+    return FALSE;
+  if (! aout_link_add_symbols (abfd, info))
+    return FALSE;
+  if (! info->keep_memory)
+    {
+      if (! aout_link_free_symbols (abfd))
+	return FALSE;
+    }
+  return TRUE;
+}
+
+/* Look through the internal symbols to see if this object file should
+   be included in the link.  We should include this object file if it
+   defines any symbols which are currently undefined.  If this object
+   file defines a common symbol, then we may adjust the size of the
+   known symbol but we do not include the object file in the link
+   (unless there is some other reason to include it).  */
+
+static bfd_boolean
+aout_link_check_ar_symbols (bfd *abfd,
+			    struct bfd_link_info *info,
+			    bfd_boolean *pneeded,
+			    bfd **subsbfd)
+{
+  struct external_nlist *p;
+  struct external_nlist *pend;
+  char *strings;
+
+  *pneeded = FALSE;
+
+  /* Look through all the symbols.  */
+  p = obj_aout_external_syms (abfd);
+  pend = p + obj_aout_external_sym_count (abfd);
+  strings = obj_aout_external_strings (abfd);
+  for (; p < pend; p++)
+    {
+      int type = H_GET_8 (abfd, p->e_type);
+      const char *name;
+      struct bfd_link_hash_entry *h;
+
+      /* Ignore symbols that are not externally visible.  This is an
+	 optimization only, as we check the type more thoroughly
+	 below.  */
+      if (((type & N_EXT) == 0
+	   || (type & N_STAB) != 0
+	   || type == N_FN)
+	  && type != N_WEAKA
+	  && type != N_WEAKT
+	  && type != N_WEAKD
+	  && type != N_WEAKB)
+	{
+	  if (type == N_WARNING
+	      || type == N_INDR)
+	    ++p;
+	  continue;
+	}
+
+      name = strings + GET_WORD (abfd, p->e_strx);
+      h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE);
+
+      /* We are only interested in symbols that are currently
+	 undefined or common.  */
+      if (h == NULL
+	  || (h->type != bfd_link_hash_undefined
+	      && h->type != bfd_link_hash_common))
+	{
+	  if (type == (N_INDR | N_EXT))
+	    ++p;
+	  continue;
+	}
+
+      if (type == (N_TEXT | N_EXT)
+	  || type == (N_DATA | N_EXT)
+	  || type == (N_BSS | N_EXT)
+	  || type == (N_ABS | N_EXT)
+	  || type == (N_INDR | N_EXT))
+	{
+	  /* This object file defines this symbol.  We must link it
+	     in.  This is true regardless of whether the current
+	     definition of the symbol is undefined or common.
+
+             If the current definition is common, we have a case in
+	     which we have already seen an object file including:
+	         int a;
+	     and this object file from the archive includes:
+	         int a = 5;
+	     In such a case, whether to include this object is target
+             dependant for backward compatibility.
+
+	     FIXME: The SunOS 4.1.3 linker will pull in the archive
+	     element if the symbol is defined in the .data section,
+	     but not if it is defined in the .text section.  That
+	     seems a bit crazy to me, and it has not been implemented
+	     yet.  However, it might be correct.  */
+	  if (h->type == bfd_link_hash_common)
+	    {
+	      int skip = 0;
+
+	      switch (info->common_skip_ar_symbols)
+		{
+		case bfd_link_common_skip_text:
+		  skip = (type == (N_TEXT | N_EXT));
+		  break;
+		case bfd_link_common_skip_data:
+		  skip = (type == (N_DATA | N_EXT));
+		  break;
+		default:
+		case bfd_link_common_skip_all:
+		  skip = 1;
+		  break;
+		}
+
+	      if (skip)
+		continue;
+	    }
+
+	  if (!(*info->callbacks
+		->add_archive_element) (info, abfd, name, subsbfd))
+	    return FALSE;
+	  *pneeded = TRUE;
+	  return TRUE;
+	}
+
+      if (type == (N_UNDF | N_EXT))
+	{
+	  bfd_vma value;
+
+	  value = GET_WORD (abfd, p->e_value);
+	  if (value != 0)
+	    {
+	      /* This symbol is common in the object from the archive
+		 file.  */
+	      if (h->type == bfd_link_hash_undefined)
+		{
+		  bfd *symbfd;
+		  unsigned int power;
+
+		  symbfd = h->u.undef.abfd;
+		  if (symbfd == NULL)
+		    {
+		      /* This symbol was created as undefined from
+			 outside BFD.  We assume that we should link
+			 in the object file.  This is done for the -u
+			 option in the linker.  */
+		      if (!(*info->callbacks
+			    ->add_archive_element) (info, abfd, name, subsbfd))
+			return FALSE;
+		      *pneeded = TRUE;
+		      return TRUE;
+		    }
+		  /* Turn the current link symbol into a common
+		     symbol.  It is already on the undefs list.  */
+		  h->type = bfd_link_hash_common;
+		  h->u.c.p = (struct bfd_link_hash_common_entry *)
+		    bfd_hash_allocate (&info->hash->table,
+				       sizeof (struct bfd_link_hash_common_entry));
+		  if (h->u.c.p == NULL)
+		    return FALSE;
+
+		  h->u.c.size = value;
+
+		  /* FIXME: This isn't quite right.  The maximum
+		     alignment of a common symbol should be set by the
+		     architecture of the output file, not of the input
+		     file.  */
+		  power = bfd_log2 (value);
+		  if (power > bfd_get_arch_info (abfd)->section_align_power)
+		    power = bfd_get_arch_info (abfd)->section_align_power;
+		  h->u.c.p->alignment_power = power;
+
+		  h->u.c.p->section = bfd_make_section_old_way (symbfd,
+								"COMMON");
+		}
+	      else
+		{
+		  /* Adjust the size of the common symbol if
+		     necessary.  */
+		  if (value > h->u.c.size)
+		    h->u.c.size = value;
+		}
+	    }
+	}
+
+      if (type == N_WEAKA
+	  || type == N_WEAKT
+	  || type == N_WEAKD
+	  || type == N_WEAKB)
+	{
+	  /* This symbol is weak but defined.  We must pull it in if
+	     the current link symbol is undefined, but we don't want
+	     it if the current link symbol is common.  */
+	  if (h->type == bfd_link_hash_undefined)
+	    {
+	      if (!(*info->callbacks
+		    ->add_archive_element) (info, abfd, name, subsbfd))
+		return FALSE;
+	      *pneeded = TRUE;
+	      return TRUE;
+	    }
+	}
+    }
+
+  /* We do not need this object file.  */
+  return TRUE;
+}
+/* Check a single archive element to see if we need to include it in
+   the link.  *PNEEDED is set according to whether this element is
+   needed in the link or not.  This is called from
+   _bfd_generic_link_add_archive_symbols.  */
+
+static bfd_boolean
+aout_link_check_archive_element (bfd *abfd,
+				 struct bfd_link_info *info,
+				 bfd_boolean *pneeded)
+{
+  bfd *oldbfd;
+  bfd_boolean needed;
+
+  if (!aout_get_external_symbols (abfd))
+    return FALSE;
+
+  oldbfd = abfd;
+  if (!aout_link_check_ar_symbols (abfd, info, pneeded, &abfd))
+    return FALSE;
+
+  needed = *pneeded;
+  if (needed)
+    {
+      /* Potentially, the add_archive_element hook may have set a
+	 substitute BFD for us.  */
+      if (abfd != oldbfd)
+	{
+	  if (!info->keep_memory
+	      && !aout_link_free_symbols (oldbfd))
+	    return FALSE;
+	  if (!aout_get_external_symbols (abfd))
+	    return FALSE;
+	}
+      if (!aout_link_add_symbols (abfd, info))
+	return FALSE;
+    }
+
+  if (!info->keep_memory || !needed)
+    {
+      if (!aout_link_free_symbols (abfd))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Given an a.out BFD, add symbols to the global hash table as
+   appropriate.  */
+
+bfd_boolean
+NAME (aout, link_add_symbols) (bfd *abfd, struct bfd_link_info *info)
+{
+  switch (bfd_get_format (abfd))
+    {
+    case bfd_object:
+      return aout_link_add_object_symbols (abfd, info);
+    case bfd_archive:
+      return _bfd_generic_link_add_archive_symbols
+	(abfd, info, aout_link_check_archive_element);
+    default:
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+}
+
+/* A hash table used for header files with N_BINCL entries.  */
+
+struct aout_link_includes_table
+{
+  struct bfd_hash_table root;
+};
+
+/* A linked list of totals that we have found for a particular header
+   file.  */
+
+struct aout_link_includes_totals
+{
+  struct aout_link_includes_totals *next;
+  bfd_vma total;
+};
+
+/* An entry in the header file hash table.  */
+
+struct aout_link_includes_entry
+{
+  struct bfd_hash_entry root;
+  /* List of totals we have found for this file.  */
+  struct aout_link_includes_totals *totals;
+};
+
+/* Look up an entry in an the header file hash table.  */
+
+#define aout_link_includes_lookup(table, string, create, copy)		\
+  ((struct aout_link_includes_entry *)					\
+   bfd_hash_lookup (&(table)->root, (string), (create), (copy)))
+
+/* During the final link step we need to pass around a bunch of
+   information, so we do it in an instance of this structure.  */
+
+struct aout_final_link_info
+{
+  /* General link information.  */
+  struct bfd_link_info *info;
+  /* Output bfd.  */
+  bfd *output_bfd;
+  /* Reloc file positions.  */
+  file_ptr treloff, dreloff;
+  /* File position of symbols.  */
+  file_ptr symoff;
+  /* String table.  */
+  struct bfd_strtab_hash *strtab;
+  /* Header file hash table.  */
+  struct aout_link_includes_table includes;
+  /* A buffer large enough to hold the contents of any section.  */
+  bfd_byte *contents;
+  /* A buffer large enough to hold the relocs of any section.  */
+  void * relocs;
+  /* A buffer large enough to hold the symbol map of any input BFD.  */
+  int *symbol_map;
+  /* A buffer large enough to hold output symbols of any input BFD.  */
+  struct external_nlist *output_syms;
+};
+
+/* The function to create a new entry in the header file hash table.  */
+
+static struct bfd_hash_entry *
+aout_link_includes_newfunc (struct bfd_hash_entry *entry,
+			    struct bfd_hash_table *table,
+			    const char *string)
+{
+  struct aout_link_includes_entry *ret =
+    (struct aout_link_includes_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = (struct aout_link_includes_entry *)
+        bfd_hash_allocate (table, sizeof (* ret));
+  if (ret == NULL)
+    return NULL;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct aout_link_includes_entry *)
+	 bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
+  if (ret)
+    {
+      /* Set local fields.  */
+      ret->totals = NULL;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Write out a symbol that was not associated with an a.out input
+   object.  */
+
+static bfd_boolean
+aout_link_write_other_symbol (struct bfd_hash_entry *bh, void *data)
+{
+  struct aout_link_hash_entry *h = (struct aout_link_hash_entry *) bh;
+  struct aout_final_link_info *finfo = (struct aout_final_link_info *) data;
+  bfd *output_bfd;
+  int type;
+  bfd_vma val;
+  struct external_nlist outsym;
+  bfd_size_type indx;
+  bfd_size_type amt;
+
+  if (h->root.type == bfd_link_hash_warning)
+    {
+      h = (struct aout_link_hash_entry *) h->root.u.i.link;
+      if (h->root.type == bfd_link_hash_new)
+	return TRUE;
+    }
+
+  output_bfd = finfo->output_bfd;
+
+  if (aout_backend_info (output_bfd)->write_dynamic_symbol != NULL)
+    {
+      if (! ((*aout_backend_info (output_bfd)->write_dynamic_symbol)
+	     (output_bfd, finfo->info, h)))
+	{
+	  /* FIXME: No way to handle errors.  */
+	  abort ();
+	}
+    }
+
+  if (h->written)
+    return TRUE;
+
+  h->written = TRUE;
+
+  /* An indx of -2 means the symbol must be written.  */
+  if (h->indx != -2
+      && (finfo->info->strip == strip_all
+	  || (finfo->info->strip == strip_some
+	      && bfd_hash_lookup (finfo->info->keep_hash, h->root.root.string,
+				  FALSE, FALSE) == NULL)))
+    return TRUE;
+
+  switch (h->root.type)
+    {
+    default:
+    case bfd_link_hash_warning:
+      abort ();
+      /* Avoid variable not initialized warnings.  */
+      return TRUE;
+    case bfd_link_hash_new:
+      /* This can happen for set symbols when sets are not being
+         built.  */
+      return TRUE;
+    case bfd_link_hash_undefined:
+      type = N_UNDF | N_EXT;
+      val = 0;
+      break;
+    case bfd_link_hash_defined:
+    case bfd_link_hash_defweak:
+      {
+	asection *sec;
+
+	sec = h->root.u.def.section->output_section;
+	BFD_ASSERT (bfd_is_abs_section (sec)
+		    || sec->owner == output_bfd);
+	if (sec == obj_textsec (output_bfd))
+	  type = h->root.type == bfd_link_hash_defined ? N_TEXT : N_WEAKT;
+	else if (sec == obj_datasec (output_bfd))
+	  type = h->root.type == bfd_link_hash_defined ? N_DATA : N_WEAKD;
+	else if (sec == obj_bsssec (output_bfd))
+	  type = h->root.type == bfd_link_hash_defined ? N_BSS : N_WEAKB;
+	else
+	  type = h->root.type == bfd_link_hash_defined ? N_ABS : N_WEAKA;
+	type |= N_EXT;
+	val = (h->root.u.def.value
+	       + sec->vma
+	       + h->root.u.def.section->output_offset);
+      }
+      break;
+    case bfd_link_hash_common:
+      type = N_UNDF | N_EXT;
+      val = h->root.u.c.size;
+      break;
+    case bfd_link_hash_undefweak:
+      type = N_WEAKU;
+      val = 0;
+      break;
+    case bfd_link_hash_indirect:
+      /* We ignore these symbols, since the indirected symbol is
+	 already in the hash table.  */
+      return TRUE;
+    }
+
+  H_PUT_8 (output_bfd, type, outsym.e_type);
+  H_PUT_8 (output_bfd, 0, outsym.e_other);
+  H_PUT_16 (output_bfd, 0, outsym.e_desc);
+  indx = add_to_stringtab (output_bfd, finfo->strtab, h->root.root.string,
+			   FALSE);
+  if (indx == - (bfd_size_type) 1)
+    /* FIXME: No way to handle errors.  */
+    abort ();
+
+  PUT_WORD (output_bfd, indx, outsym.e_strx);
+  PUT_WORD (output_bfd, val, outsym.e_value);
+
+  amt = EXTERNAL_NLIST_SIZE;
+  if (bfd_seek (output_bfd, finfo->symoff, SEEK_SET) != 0
+      || bfd_bwrite ((void *) &outsym, amt, output_bfd) != amt)
+    /* FIXME: No way to handle errors.  */
+    abort ();
+
+  finfo->symoff += EXTERNAL_NLIST_SIZE;
+  h->indx = obj_aout_external_sym_count (output_bfd);
+  ++obj_aout_external_sym_count (output_bfd);
+
+  return TRUE;
+}
+
+/* Handle a link order which is supposed to generate a reloc.  */
+
+static bfd_boolean
+aout_link_reloc_link_order (struct aout_final_link_info *finfo,
+			    asection *o,
+			    struct bfd_link_order *p)
+{
+  struct bfd_link_order_reloc *pr;
+  int r_index;
+  int r_extern;
+  reloc_howto_type *howto;
+  file_ptr *reloff_ptr = NULL;
+  struct reloc_std_external srel;
+  struct reloc_ext_external erel;
+  void * rel_ptr;
+  bfd_size_type amt;
+
+  pr = p->u.reloc.p;
+
+  if (p->type == bfd_section_reloc_link_order)
+    {
+      r_extern = 0;
+      if (bfd_is_abs_section (pr->u.section))
+	r_index = N_ABS | N_EXT;
+      else
+	{
+	  BFD_ASSERT (pr->u.section->owner == finfo->output_bfd);
+	  r_index = pr->u.section->target_index;
+	}
+    }
+  else
+    {
+      struct aout_link_hash_entry *h;
+
+      BFD_ASSERT (p->type == bfd_symbol_reloc_link_order);
+      r_extern = 1;
+      h = ((struct aout_link_hash_entry *)
+	   bfd_wrapped_link_hash_lookup (finfo->output_bfd, finfo->info,
+					 pr->u.name, FALSE, FALSE, TRUE));
+      if (h != NULL
+	  && h->indx >= 0)
+	r_index = h->indx;
+      else if (h != NULL)
+	{
+	  /* We decided to strip this symbol, but it turns out that we
+	     can't.  Note that we lose the other and desc information
+	     here.  I don't think that will ever matter for a global
+	     symbol.  */
+	  h->indx = -2;
+	  h->written = FALSE;
+	  if (!aout_link_write_other_symbol (&h->root.root, finfo))
+	    return FALSE;
+	  r_index = h->indx;
+	}
+      else
+	{
+	  if (! ((*finfo->info->callbacks->unattached_reloc)
+		 (finfo->info, pr->u.name, NULL, NULL, (bfd_vma) 0)))
+	    return FALSE;
+	  r_index = 0;
+	}
+    }
+
+  howto = bfd_reloc_type_lookup (finfo->output_bfd, pr->reloc);
+  if (howto == 0)
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  if (o == obj_textsec (finfo->output_bfd))
+    reloff_ptr = &finfo->treloff;
+  else if (o == obj_datasec (finfo->output_bfd))
+    reloff_ptr = &finfo->dreloff;
+  else
+    abort ();
+
+  if (obj_reloc_entry_size (finfo->output_bfd) == RELOC_STD_SIZE)
+    {
+#ifdef MY_put_reloc
+      MY_put_reloc (finfo->output_bfd, r_extern, r_index, p->offset, howto,
+		    &srel);
+#else
+      {
+	int r_pcrel;
+	int r_baserel;
+	int r_jmptable;
+	int r_relative;
+	int r_length;
+
+	r_pcrel = (int) howto->pc_relative;
+	r_baserel = (howto->type & 8) != 0;
+	r_jmptable = (howto->type & 16) != 0;
+	r_relative = (howto->type & 32) != 0;
+	r_length = howto->size;
+
+	PUT_WORD (finfo->output_bfd, p->offset, srel.r_address);
+	if (bfd_header_big_endian (finfo->output_bfd))
+	  {
+	    srel.r_index[0] = r_index >> 16;
+	    srel.r_index[1] = r_index >> 8;
+	    srel.r_index[2] = r_index;
+	    srel.r_type[0] =
+	      ((r_extern ?     RELOC_STD_BITS_EXTERN_BIG : 0)
+	       | (r_pcrel ?    RELOC_STD_BITS_PCREL_BIG : 0)
+	       | (r_baserel ?  RELOC_STD_BITS_BASEREL_BIG : 0)
+	       | (r_jmptable ? RELOC_STD_BITS_JMPTABLE_BIG : 0)
+	       | (r_relative ? RELOC_STD_BITS_RELATIVE_BIG : 0)
+	       | (r_length <<  RELOC_STD_BITS_LENGTH_SH_BIG));
+	  }
+	else
+	  {
+	    srel.r_index[2] = r_index >> 16;
+	    srel.r_index[1] = r_index >> 8;
+	    srel.r_index[0] = r_index;
+	    srel.r_type[0] =
+	      ((r_extern ?     RELOC_STD_BITS_EXTERN_LITTLE : 0)
+	       | (r_pcrel ?    RELOC_STD_BITS_PCREL_LITTLE : 0)
+	       | (r_baserel ?  RELOC_STD_BITS_BASEREL_LITTLE : 0)
+	       | (r_jmptable ? RELOC_STD_BITS_JMPTABLE_LITTLE : 0)
+	       | (r_relative ? RELOC_STD_BITS_RELATIVE_LITTLE : 0)
+	       | (r_length <<  RELOC_STD_BITS_LENGTH_SH_LITTLE));
+	  }
+      }
+#endif
+      rel_ptr = (void *) &srel;
+
+      /* We have to write the addend into the object file, since
+	 standard a.out relocs are in place.  It would be more
+	 reliable if we had the current contents of the file here,
+	 rather than assuming zeroes, but we can't read the file since
+	 it was opened using bfd_openw.  */
+      if (pr->addend != 0)
+	{
+	  bfd_size_type size;
+	  bfd_reloc_status_type r;
+	  bfd_byte *buf;
+	  bfd_boolean ok;
+
+	  size = bfd_get_reloc_size (howto);
+	  buf = (bfd_byte *) bfd_zmalloc (size);
+	  if (buf == NULL)
+	    return FALSE;
+	  r = MY_relocate_contents (howto, finfo->output_bfd,
+				    (bfd_vma) pr->addend, buf);
+	  switch (r)
+	    {
+	    case bfd_reloc_ok:
+	      break;
+	    default:
+	    case bfd_reloc_outofrange:
+	      abort ();
+	    case bfd_reloc_overflow:
+	      if (! ((*finfo->info->callbacks->reloc_overflow)
+		     (finfo->info, NULL,
+		      (p->type == bfd_section_reloc_link_order
+		       ? bfd_section_name (finfo->output_bfd,
+					   pr->u.section)
+		       : pr->u.name),
+		      howto->name, pr->addend, NULL, NULL, (bfd_vma) 0)))
+		{
+		  free (buf);
+		  return FALSE;
+		}
+	      break;
+	    }
+	  ok = bfd_set_section_contents (finfo->output_bfd, o, (void *) buf,
+					 (file_ptr) p->offset, size);
+	  free (buf);
+	  if (! ok)
+	    return FALSE;
+	}
+    }
+  else
+    {
+#ifdef MY_put_ext_reloc
+      MY_put_ext_reloc (finfo->output_bfd, r_extern, r_index, p->offset,
+			howto, &erel, pr->addend);
+#else
+      PUT_WORD (finfo->output_bfd, p->offset, erel.r_address);
+
+      if (bfd_header_big_endian (finfo->output_bfd))
+	{
+	  erel.r_index[0] = r_index >> 16;
+	  erel.r_index[1] = r_index >> 8;
+	  erel.r_index[2] = r_index;
+	  erel.r_type[0] =
+	    ((r_extern ? RELOC_EXT_BITS_EXTERN_BIG : 0)
+	     | (howto->type << RELOC_EXT_BITS_TYPE_SH_BIG));
+	}
+      else
+	{
+	  erel.r_index[2] = r_index >> 16;
+	  erel.r_index[1] = r_index >> 8;
+	  erel.r_index[0] = r_index;
+	  erel.r_type[0] =
+	    (r_extern ? RELOC_EXT_BITS_EXTERN_LITTLE : 0)
+	      | (howto->type << RELOC_EXT_BITS_TYPE_SH_LITTLE);
+	}
+
+      PUT_WORD (finfo->output_bfd, (bfd_vma) pr->addend, erel.r_addend);
+#endif /* MY_put_ext_reloc */
+
+      rel_ptr = (void *) &erel;
+    }
+
+  amt = obj_reloc_entry_size (finfo->output_bfd);
+  if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0
+      || bfd_bwrite (rel_ptr, amt, finfo->output_bfd) != amt)
+    return FALSE;
+
+  *reloff_ptr += obj_reloc_entry_size (finfo->output_bfd);
+
+  /* Assert that the relocs have not run into the symbols, and that n
+     the text relocs have not run into the data relocs.  */
+  BFD_ASSERT (*reloff_ptr <= obj_sym_filepos (finfo->output_bfd)
+	      && (reloff_ptr != &finfo->treloff
+		  || (*reloff_ptr
+		      <= obj_datasec (finfo->output_bfd)->rel_filepos)));
+
+  return TRUE;
+}
+
+/* Get the section corresponding to a reloc index.  */
+
+static INLINE asection *
+aout_reloc_index_to_section (bfd *abfd, int indx)
+{
+  switch (indx & N_TYPE)
+    {
+    case N_TEXT:   return obj_textsec (abfd);
+    case N_DATA:   return obj_datasec (abfd);
+    case N_BSS:    return obj_bsssec (abfd);
+    case N_ABS:
+    case N_UNDF:   return bfd_abs_section_ptr;
+    default:       abort ();
+    }
+  return NULL;
+}
+
+/* Relocate an a.out section using standard a.out relocs.  */
+
+static bfd_boolean
+aout_link_input_section_std (struct aout_final_link_info *finfo,
+			     bfd *input_bfd,
+			     asection *input_section,
+			     struct reloc_std_external *relocs,
+			     bfd_size_type rel_size,
+			     bfd_byte *contents)
+{
+  bfd_boolean (*check_dynamic_reloc)
+    (struct bfd_link_info *, bfd *, asection *,
+	     struct aout_link_hash_entry *, void *, bfd_byte *, bfd_boolean *,
+	     bfd_vma *);
+  bfd *output_bfd;
+  bfd_boolean relocatable;
+  struct external_nlist *syms;
+  char *strings;
+  struct aout_link_hash_entry **sym_hashes;
+  int *symbol_map;
+  bfd_size_type reloc_count;
+  struct reloc_std_external *rel;
+  struct reloc_std_external *rel_end;
+
+  output_bfd = finfo->output_bfd;
+  check_dynamic_reloc = aout_backend_info (output_bfd)->check_dynamic_reloc;
+
+  BFD_ASSERT (obj_reloc_entry_size (input_bfd) == RELOC_STD_SIZE);
+  BFD_ASSERT (input_bfd->xvec->header_byteorder
+	      == output_bfd->xvec->header_byteorder);
+
+  relocatable = finfo->info->relocatable;
+  syms = obj_aout_external_syms (input_bfd);
+  strings = obj_aout_external_strings (input_bfd);
+  sym_hashes = obj_aout_sym_hashes (input_bfd);
+  symbol_map = finfo->symbol_map;
+
+  reloc_count = rel_size / RELOC_STD_SIZE;
+  rel = relocs;
+  rel_end = rel + reloc_count;
+  for (; rel < rel_end; rel++)
+    {
+      bfd_vma r_addr;
+      int r_index;
+      int r_extern;
+      int r_pcrel;
+      int r_baserel = 0;
+      reloc_howto_type *howto;
+      struct aout_link_hash_entry *h = NULL;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+
+      r_addr = GET_SWORD (input_bfd, rel->r_address);
+
+#ifdef MY_reloc_howto
+      howto = MY_reloc_howto (input_bfd, rel, r_index, r_extern, r_pcrel);
+#else
+      {
+	int r_jmptable;
+	int r_relative;
+	int r_length;
+	unsigned int howto_idx;
+
+	if (bfd_header_big_endian (input_bfd))
+	  {
+	    r_index   =  (((unsigned int) rel->r_index[0] << 16)
+			  | ((unsigned int) rel->r_index[1] << 8)
+			  | rel->r_index[2]);
+	    r_extern  = (0 != (rel->r_type[0] & RELOC_STD_BITS_EXTERN_BIG));
+	    r_pcrel   = (0 != (rel->r_type[0] & RELOC_STD_BITS_PCREL_BIG));
+	    r_baserel = (0 != (rel->r_type[0] & RELOC_STD_BITS_BASEREL_BIG));
+	    r_jmptable= (0 != (rel->r_type[0] & RELOC_STD_BITS_JMPTABLE_BIG));
+	    r_relative= (0 != (rel->r_type[0] & RELOC_STD_BITS_RELATIVE_BIG));
+	    r_length  = ((rel->r_type[0] & RELOC_STD_BITS_LENGTH_BIG)
+			 >> RELOC_STD_BITS_LENGTH_SH_BIG);
+	  }
+	else
+	  {
+	    r_index   = (((unsigned int) rel->r_index[2] << 16)
+			 | ((unsigned int) rel->r_index[1] << 8)
+			 | rel->r_index[0]);
+	    r_extern  = (0 != (rel->r_type[0] & RELOC_STD_BITS_EXTERN_LITTLE));
+	    r_pcrel   = (0 != (rel->r_type[0] & RELOC_STD_BITS_PCREL_LITTLE));
+	    r_baserel = (0 != (rel->r_type[0]
+			       & RELOC_STD_BITS_BASEREL_LITTLE));
+	    r_jmptable= (0 != (rel->r_type[0]
+			       & RELOC_STD_BITS_JMPTABLE_LITTLE));
+	    r_relative= (0 != (rel->r_type[0]
+			       & RELOC_STD_BITS_RELATIVE_LITTLE));
+	    r_length  = ((rel->r_type[0] & RELOC_STD_BITS_LENGTH_LITTLE)
+			 >> RELOC_STD_BITS_LENGTH_SH_LITTLE);
+	  }
+
+	howto_idx = (r_length + 4 * r_pcrel + 8 * r_baserel
+		     + 16 * r_jmptable + 32 * r_relative);
+	if (howto_idx < TABLE_SIZE (howto_table_std))
+	  howto = howto_table_std + howto_idx;
+	else
+	  howto = NULL;
+      }
+#endif
+
+      if (howto == NULL)
+	{
+	  (*finfo->info->callbacks->einfo)
+	    (_("%P: %B: unexpected relocation type\n"), input_bfd);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      if (relocatable)
+	{
+	  /* We are generating a relocatable output file, and must
+	     modify the reloc accordingly.  */
+	  if (r_extern)
+	    {
+	      /* If we know the symbol this relocation is against,
+		 convert it into a relocation against a section.  This
+		 is what the native linker does.  */
+	      h = sym_hashes[r_index];
+	      if (h != NULL
+		  && (h->root.type == bfd_link_hash_defined
+		      || h->root.type == bfd_link_hash_defweak))
+		{
+		  asection *output_section;
+
+		  /* Change the r_extern value.  */
+		  if (bfd_header_big_endian (output_bfd))
+		    rel->r_type[0] &=~ RELOC_STD_BITS_EXTERN_BIG;
+		  else
+		    rel->r_type[0] &=~ RELOC_STD_BITS_EXTERN_LITTLE;
+
+		  /* Compute a new r_index.  */
+		  output_section = h->root.u.def.section->output_section;
+		  if (output_section == obj_textsec (output_bfd))
+		    r_index = N_TEXT;
+		  else if (output_section == obj_datasec (output_bfd))
+		    r_index = N_DATA;
+		  else if (output_section == obj_bsssec (output_bfd))
+		    r_index = N_BSS;
+		  else
+		    r_index = N_ABS;
+
+		  /* Add the symbol value and the section VMA to the
+		     addend stored in the contents.  */
+		  relocation = (h->root.u.def.value
+				+ output_section->vma
+				+ h->root.u.def.section->output_offset);
+		}
+	      else
+		{
+		  /* We must change r_index according to the symbol
+		     map.  */
+		  r_index = symbol_map[r_index];
+
+		  if (r_index == -1)
+		    {
+		      if (h != NULL)
+			{
+			  /* We decided to strip this symbol, but it
+                             turns out that we can't.  Note that we
+                             lose the other and desc information here.
+                             I don't think that will ever matter for a
+                             global symbol.  */
+			  if (h->indx < 0)
+			    {
+			      h->indx = -2;
+			      h->written = FALSE;
+			      if (!aout_link_write_other_symbol (&h->root.root,
+								 finfo))
+				return FALSE;
+			    }
+			  r_index = h->indx;
+			}
+		      else
+			{
+			  const char *name;
+
+			  name = strings + GET_WORD (input_bfd,
+						     syms[r_index].e_strx);
+			  if (! ((*finfo->info->callbacks->unattached_reloc)
+				 (finfo->info, name, input_bfd, input_section,
+				  r_addr)))
+			    return FALSE;
+			  r_index = 0;
+			}
+		    }
+
+		  relocation = 0;
+		}
+
+	      /* Write out the new r_index value.  */
+	      if (bfd_header_big_endian (output_bfd))
+		{
+		  rel->r_index[0] = r_index >> 16;
+		  rel->r_index[1] = r_index >> 8;
+		  rel->r_index[2] = r_index;
+		}
+	      else
+		{
+		  rel->r_index[2] = r_index >> 16;
+		  rel->r_index[1] = r_index >> 8;
+		  rel->r_index[0] = r_index;
+		}
+	    }
+	  else
+	    {
+	      asection *section;
+
+	      /* This is a relocation against a section.  We must
+		 adjust by the amount that the section moved.  */
+	      section = aout_reloc_index_to_section (input_bfd, r_index);
+	      relocation = (section->output_section->vma
+			    + section->output_offset
+			    - section->vma);
+	    }
+
+	  /* Change the address of the relocation.  */
+	  PUT_WORD (output_bfd,
+		    r_addr + input_section->output_offset,
+		    rel->r_address);
+
+	  /* Adjust a PC relative relocation by removing the reference
+	     to the original address in the section and including the
+	     reference to the new address.  */
+	  if (r_pcrel)
+	    relocation -= (input_section->output_section->vma
+			   + input_section->output_offset
+			   - input_section->vma);
+
+#ifdef MY_relocatable_reloc
+	  MY_relocatable_reloc (howto, output_bfd, rel, relocation, r_addr);
+#endif
+
+	  if (relocation == 0)
+	    r = bfd_reloc_ok;
+	  else
+	    r = MY_relocate_contents (howto,
+					input_bfd, relocation,
+					contents + r_addr);
+	}
+      else
+	{
+	  bfd_boolean hundef;
+
+	  /* We are generating an executable, and must do a full
+	     relocation.  */
+	  hundef = FALSE;
+
+	  if (r_extern)
+	    {
+	      h = sym_hashes[r_index];
+
+	      if (h != NULL
+		  && (h->root.type == bfd_link_hash_defined
+		      || h->root.type == bfd_link_hash_defweak))
+		{
+		  relocation = (h->root.u.def.value
+				+ h->root.u.def.section->output_section->vma
+				+ h->root.u.def.section->output_offset);
+		}
+	      else if (h != NULL
+		       && h->root.type == bfd_link_hash_undefweak)
+		relocation = 0;
+	      else
+		{
+		  hundef = TRUE;
+		  relocation = 0;
+		}
+	    }
+	  else
+	    {
+	      asection *section;
+
+	      section = aout_reloc_index_to_section (input_bfd, r_index);
+	      relocation = (section->output_section->vma
+			    + section->output_offset
+			    - section->vma);
+	      if (r_pcrel)
+		relocation += input_section->vma;
+	    }
+
+	  if (check_dynamic_reloc != NULL)
+	    {
+	      bfd_boolean skip;
+
+	      if (! ((*check_dynamic_reloc)
+		     (finfo->info, input_bfd, input_section, h,
+		      (void *) rel, contents, &skip, &relocation)))
+		return FALSE;
+	      if (skip)
+		continue;
+	    }
+
+	  /* Now warn if a global symbol is undefined.  We could not
+             do this earlier, because check_dynamic_reloc might want
+             to skip this reloc.  */
+	  if (hundef && ! finfo->info->shared && ! r_baserel)
+	    {
+	      const char *name;
+
+	      if (h != NULL)
+		name = h->root.root.string;
+	      else
+		name = strings + GET_WORD (input_bfd, syms[r_index].e_strx);
+	      if (! ((*finfo->info->callbacks->undefined_symbol)
+		     (finfo->info, name, input_bfd, input_section,
+		     r_addr, TRUE)))
+		return FALSE;
+	    }
+
+	  r = MY_final_link_relocate (howto,
+				      input_bfd, input_section,
+				      contents, r_addr, relocation,
+				      (bfd_vma) 0);
+	}
+
+      if (r != bfd_reloc_ok)
+	{
+	  switch (r)
+	    {
+	    default:
+	    case bfd_reloc_outofrange:
+	      abort ();
+	    case bfd_reloc_overflow:
+	      {
+		const char *name;
+
+		if (h != NULL)
+		  name = NULL;
+		else if (r_extern)
+		  name = strings + GET_WORD (input_bfd,
+					     syms[r_index].e_strx);
+		else
+		  {
+		    asection *s;
+
+		    s = aout_reloc_index_to_section (input_bfd, r_index);
+		    name = bfd_section_name (input_bfd, s);
+		  }
+		if (! ((*finfo->info->callbacks->reloc_overflow)
+		       (finfo->info, (h ? &h->root : NULL), name,
+			howto->name, (bfd_vma) 0, input_bfd,
+			input_section, r_addr)))
+		  return FALSE;
+	      }
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Relocate an a.out section using extended a.out relocs.  */
+
+static bfd_boolean
+aout_link_input_section_ext (struct aout_final_link_info *finfo,
+			     bfd *input_bfd,
+			     asection *input_section,
+			     struct reloc_ext_external *relocs,
+			     bfd_size_type rel_size,
+			     bfd_byte *contents)
+{
+  bfd_boolean (*check_dynamic_reloc)
+    (struct bfd_link_info *, bfd *, asection *,
+	     struct aout_link_hash_entry *, void *, bfd_byte *, bfd_boolean *,
+	     bfd_vma *);
+  bfd *output_bfd;
+  bfd_boolean relocatable;
+  struct external_nlist *syms;
+  char *strings;
+  struct aout_link_hash_entry **sym_hashes;
+  int *symbol_map;
+  bfd_size_type reloc_count;
+  struct reloc_ext_external *rel;
+  struct reloc_ext_external *rel_end;
+
+  output_bfd = finfo->output_bfd;
+  check_dynamic_reloc = aout_backend_info (output_bfd)->check_dynamic_reloc;
+
+  BFD_ASSERT (obj_reloc_entry_size (input_bfd) == RELOC_EXT_SIZE);
+  BFD_ASSERT (input_bfd->xvec->header_byteorder
+	      == output_bfd->xvec->header_byteorder);
+
+  relocatable = finfo->info->relocatable;
+  syms = obj_aout_external_syms (input_bfd);
+  strings = obj_aout_external_strings (input_bfd);
+  sym_hashes = obj_aout_sym_hashes (input_bfd);
+  symbol_map = finfo->symbol_map;
+
+  reloc_count = rel_size / RELOC_EXT_SIZE;
+  rel = relocs;
+  rel_end = rel + reloc_count;
+  for (; rel < rel_end; rel++)
+    {
+      bfd_vma r_addr;
+      int r_index;
+      int r_extern;
+      unsigned int r_type;
+      bfd_vma r_addend;
+      struct aout_link_hash_entry *h = NULL;
+      asection *r_section = NULL;
+      bfd_vma relocation;
+
+      r_addr = GET_SWORD (input_bfd, rel->r_address);
+
+      if (bfd_header_big_endian (input_bfd))
+	{
+	  r_index  = (((unsigned int) rel->r_index[0] << 16)
+		      | ((unsigned int) rel->r_index[1] << 8)
+		      | rel->r_index[2]);
+	  r_extern = (0 != (rel->r_type[0] & RELOC_EXT_BITS_EXTERN_BIG));
+	  r_type   = ((rel->r_type[0] & RELOC_EXT_BITS_TYPE_BIG)
+		      >> RELOC_EXT_BITS_TYPE_SH_BIG);
+	}
+      else
+	{
+	  r_index  = (((unsigned int) rel->r_index[2] << 16)
+		      | ((unsigned int) rel->r_index[1] << 8)
+		      | rel->r_index[0]);
+	  r_extern = (0 != (rel->r_type[0] & RELOC_EXT_BITS_EXTERN_LITTLE));
+	  r_type   = ((rel->r_type[0] & RELOC_EXT_BITS_TYPE_LITTLE)
+		      >> RELOC_EXT_BITS_TYPE_SH_LITTLE);
+	}
+
+      r_addend = GET_SWORD (input_bfd, rel->r_addend);
+
+      if (r_type >= TABLE_SIZE (howto_table_ext))
+	{
+	  (*finfo->info->callbacks->einfo)
+	    (_("%P: %B: unexpected relocation type\n"), input_bfd);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      if (relocatable)
+	{
+	  /* We are generating a relocatable output file, and must
+	     modify the reloc accordingly.  */
+	  if (r_extern
+	      || r_type == (unsigned int) RELOC_BASE10
+	      || r_type == (unsigned int) RELOC_BASE13
+	      || r_type == (unsigned int) RELOC_BASE22)
+	    {
+	      /* If we know the symbol this relocation is against,
+		 convert it into a relocation against a section.  This
+		 is what the native linker does.  */
+	      if (r_type == (unsigned int) RELOC_BASE10
+		  || r_type == (unsigned int) RELOC_BASE13
+		  || r_type == (unsigned int) RELOC_BASE22)
+		h = NULL;
+	      else
+		h = sym_hashes[r_index];
+	      if (h != NULL
+		  && (h->root.type == bfd_link_hash_defined
+		      || h->root.type == bfd_link_hash_defweak))
+		{
+		  asection *output_section;
+
+		  /* Change the r_extern value.  */
+		  if (bfd_header_big_endian (output_bfd))
+		    rel->r_type[0] &=~ RELOC_EXT_BITS_EXTERN_BIG;
+		  else
+		    rel->r_type[0] &=~ RELOC_EXT_BITS_EXTERN_LITTLE;
+
+		  /* Compute a new r_index.  */
+		  output_section = h->root.u.def.section->output_section;
+		  if (output_section == obj_textsec (output_bfd))
+		    r_index = N_TEXT;
+		  else if (output_section == obj_datasec (output_bfd))
+		    r_index = N_DATA;
+		  else if (output_section == obj_bsssec (output_bfd))
+		    r_index = N_BSS;
+		  else
+		    r_index = N_ABS;
+
+		  /* Add the symbol value and the section VMA to the
+		     addend.  */
+		  relocation = (h->root.u.def.value
+				+ output_section->vma
+				+ h->root.u.def.section->output_offset);
+
+		  /* Now RELOCATION is the VMA of the final
+		     destination.  If this is a PC relative reloc,
+		     then ADDEND is the negative of the source VMA.
+		     We want to set ADDEND to the difference between
+		     the destination VMA and the source VMA, which
+		     means we must adjust RELOCATION by the change in
+		     the source VMA.  This is done below.  */
+		}
+	      else
+		{
+		  /* We must change r_index according to the symbol
+		     map.  */
+		  r_index = symbol_map[r_index];
+
+		  if (r_index == -1)
+		    {
+		      if (h != NULL)
+			{
+			  /* We decided to strip this symbol, but it
+                             turns out that we can't.  Note that we
+                             lose the other and desc information here.
+                             I don't think that will ever matter for a
+                             global symbol.  */
+			  if (h->indx < 0)
+			    {
+			      h->indx = -2;
+			      h->written = FALSE;
+			      if (!aout_link_write_other_symbol (&h->root.root,
+								 finfo))
+				return FALSE;
+			    }
+			  r_index = h->indx;
+			}
+		      else
+			{
+			  const char *name;
+
+			  name = strings + GET_WORD (input_bfd,
+						     syms[r_index].e_strx);
+			  if (! ((*finfo->info->callbacks->unattached_reloc)
+				 (finfo->info, name, input_bfd, input_section,
+				  r_addr)))
+			    return FALSE;
+			  r_index = 0;
+			}
+		    }
+
+		  relocation = 0;
+
+		  /* If this is a PC relative reloc, then the addend
+		     is the negative of the source VMA.  We must
+		     adjust it by the change in the source VMA.  This
+		     is done below.  */
+		}
+
+	      /* Write out the new r_index value.  */
+	      if (bfd_header_big_endian (output_bfd))
+		{
+		  rel->r_index[0] = r_index >> 16;
+		  rel->r_index[1] = r_index >> 8;
+		  rel->r_index[2] = r_index;
+		}
+	      else
+		{
+		  rel->r_index[2] = r_index >> 16;
+		  rel->r_index[1] = r_index >> 8;
+		  rel->r_index[0] = r_index;
+		}
+	    }
+	  else
+	    {
+	      /* This is a relocation against a section.  We must
+		 adjust by the amount that the section moved.  */
+	      r_section = aout_reloc_index_to_section (input_bfd, r_index);
+	      relocation = (r_section->output_section->vma
+			    + r_section->output_offset
+			    - r_section->vma);
+
+	      /* If this is a PC relative reloc, then the addend is
+		 the difference in VMA between the destination and the
+		 source.  We have just adjusted for the change in VMA
+		 of the destination, so we must also adjust by the
+		 change in VMA of the source.  This is done below.  */
+	    }
+
+	  /* As described above, we must always adjust a PC relative
+	     reloc by the change in VMA of the source.  However, if
+	     pcrel_offset is set, then the addend does not include the
+	     location within the section, in which case we don't need
+	     to adjust anything.  */
+	  if (howto_table_ext[r_type].pc_relative
+	      && ! howto_table_ext[r_type].pcrel_offset)
+	    relocation -= (input_section->output_section->vma
+			   + input_section->output_offset
+			   - input_section->vma);
+
+	  /* Change the addend if necessary.  */
+	  if (relocation != 0)
+	    PUT_WORD (output_bfd, r_addend + relocation, rel->r_addend);
+
+	  /* Change the address of the relocation.  */
+	  PUT_WORD (output_bfd,
+		    r_addr + input_section->output_offset,
+		    rel->r_address);
+	}
+      else
+	{
+	  bfd_boolean hundef;
+	  bfd_reloc_status_type r;
+
+	  /* We are generating an executable, and must do a full
+	     relocation.  */
+	  hundef = FALSE;
+
+	  if (r_extern)
+	    {
+	      h = sym_hashes[r_index];
+
+	      if (h != NULL
+		  && (h->root.type == bfd_link_hash_defined
+		      || h->root.type == bfd_link_hash_defweak))
+		{
+		  relocation = (h->root.u.def.value
+				+ h->root.u.def.section->output_section->vma
+				+ h->root.u.def.section->output_offset);
+		}
+	      else if (h != NULL
+		       && h->root.type == bfd_link_hash_undefweak)
+		relocation = 0;
+	      else
+		{
+		  hundef = TRUE;
+		  relocation = 0;
+		}
+	    }
+	  else if (r_type == (unsigned int) RELOC_BASE10
+		   || r_type == (unsigned int) RELOC_BASE13
+		   || r_type == (unsigned int) RELOC_BASE22)
+	    {
+	      struct external_nlist *sym;
+	      int type;
+
+	      /* For base relative relocs, r_index is always an index
+                 into the symbol table, even if r_extern is 0.  */
+	      sym = syms + r_index;
+	      type = H_GET_8 (input_bfd, sym->e_type);
+	      if ((type & N_TYPE) == N_TEXT
+		  || type == N_WEAKT)
+		r_section = obj_textsec (input_bfd);
+	      else if ((type & N_TYPE) == N_DATA
+		       || type == N_WEAKD)
+		r_section = obj_datasec (input_bfd);
+	      else if ((type & N_TYPE) == N_BSS
+		       || type == N_WEAKB)
+		r_section = obj_bsssec (input_bfd);
+	      else if ((type & N_TYPE) == N_ABS
+		       || type == N_WEAKA)
+		r_section = bfd_abs_section_ptr;
+	      else
+		abort ();
+	      relocation = (r_section->output_section->vma
+			    + r_section->output_offset
+			    + (GET_WORD (input_bfd, sym->e_value)
+			       - r_section->vma));
+	    }
+	  else
+	    {
+	      r_section = aout_reloc_index_to_section (input_bfd, r_index);
+
+	      /* If this is a PC relative reloc, then R_ADDEND is the
+		 difference between the two vmas, or
+		   old_dest_sec + old_dest_off - (old_src_sec + old_src_off)
+		 where
+		   old_dest_sec == section->vma
+		 and
+		   old_src_sec == input_section->vma
+		 and
+		   old_src_off == r_addr
+
+		 _bfd_final_link_relocate expects RELOCATION +
+		 R_ADDEND to be the VMA of the destination minus
+		 r_addr (the minus r_addr is because this relocation
+		 is not pcrel_offset, which is a bit confusing and
+		 should, perhaps, be changed), or
+		   new_dest_sec
+		 where
+		   new_dest_sec == output_section->vma + output_offset
+		 We arrange for this to happen by setting RELOCATION to
+		   new_dest_sec + old_src_sec - old_dest_sec
+
+		 If this is not a PC relative reloc, then R_ADDEND is
+		 simply the VMA of the destination, so we set
+		 RELOCATION to the change in the destination VMA, or
+		   new_dest_sec - old_dest_sec
+		 */
+	      relocation = (r_section->output_section->vma
+			    + r_section->output_offset
+			    - r_section->vma);
+	      if (howto_table_ext[r_type].pc_relative)
+		relocation += input_section->vma;
+	    }
+
+	  if (check_dynamic_reloc != NULL)
+	    {
+	      bfd_boolean skip;
+
+	      if (! ((*check_dynamic_reloc)
+		     (finfo->info, input_bfd, input_section, h,
+		      (void *) rel, contents, &skip, &relocation)))
+		return FALSE;
+	      if (skip)
+		continue;
+	    }
+
+	  /* Now warn if a global symbol is undefined.  We could not
+             do this earlier, because check_dynamic_reloc might want
+             to skip this reloc.  */
+	  if (hundef
+	      && ! finfo->info->shared
+	      && r_type != (unsigned int) RELOC_BASE10
+	      && r_type != (unsigned int) RELOC_BASE13
+	      && r_type != (unsigned int) RELOC_BASE22)
+	    {
+	      const char *name;
+
+	      if (h != NULL)
+		name = h->root.root.string;
+	      else
+		name = strings + GET_WORD (input_bfd, syms[r_index].e_strx);
+	      if (! ((*finfo->info->callbacks->undefined_symbol)
+		     (finfo->info, name, input_bfd, input_section,
+		     r_addr, TRUE)))
+		return FALSE;
+	    }
+
+	  if (r_type != (unsigned int) RELOC_SPARC_REV32)
+	    r = MY_final_link_relocate (howto_table_ext + r_type,
+					input_bfd, input_section,
+					contents, r_addr, relocation,
+					r_addend);
+	  else
+	    {
+	      bfd_vma x;
+
+	      x = bfd_get_32 (input_bfd, contents + r_addr);
+	      x = x + relocation + r_addend;
+	      bfd_putl32 (/*input_bfd,*/ x, contents + r_addr);
+	      r = bfd_reloc_ok;
+	    }
+
+	  if (r != bfd_reloc_ok)
+	    {
+	      switch (r)
+		{
+		default:
+		case bfd_reloc_outofrange:
+		  abort ();
+		case bfd_reloc_overflow:
+		  {
+		    const char *name;
+
+		    if (h != NULL)
+		      name = NULL;
+		    else if (r_extern
+			     || r_type == (unsigned int) RELOC_BASE10
+			     || r_type == (unsigned int) RELOC_BASE13
+			     || r_type == (unsigned int) RELOC_BASE22)
+		      name = strings + GET_WORD (input_bfd,
+						 syms[r_index].e_strx);
+		    else
+		      {
+			asection *s;
+
+			s = aout_reloc_index_to_section (input_bfd, r_index);
+			name = bfd_section_name (input_bfd, s);
+		      }
+		    if (! ((*finfo->info->callbacks->reloc_overflow)
+			   (finfo->info, (h ? &h->root : NULL), name,
+			    howto_table_ext[r_type].name,
+			    r_addend, input_bfd, input_section, r_addr)))
+		      return FALSE;
+		  }
+		  break;
+		}
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Link an a.out section into the output file.  */
+
+static bfd_boolean
+aout_link_input_section (struct aout_final_link_info *finfo,
+			 bfd *input_bfd,
+			 asection *input_section,
+			 file_ptr *reloff_ptr,
+			 bfd_size_type rel_size)
+{
+  bfd_size_type input_size;
+  void * relocs;
+
+  /* Get the section contents.  */
+  input_size = input_section->size;
+  if (! bfd_get_section_contents (input_bfd, input_section,
+				  (void *) finfo->contents,
+				  (file_ptr) 0, input_size))
+    return FALSE;
+
+  /* Read in the relocs if we haven't already done it.  */
+  if (aout_section_data (input_section) != NULL
+      && aout_section_data (input_section)->relocs != NULL)
+    relocs = aout_section_data (input_section)->relocs;
+  else
+    {
+      relocs = finfo->relocs;
+      if (rel_size > 0)
+	{
+	  if (bfd_seek (input_bfd, input_section->rel_filepos, SEEK_SET) != 0
+	      || bfd_bread (relocs, rel_size, input_bfd) != rel_size)
+	    return FALSE;
+	}
+    }
+
+  /* Relocate the section contents.  */
+  if (obj_reloc_entry_size (input_bfd) == RELOC_STD_SIZE)
+    {
+      if (! aout_link_input_section_std (finfo, input_bfd, input_section,
+					 (struct reloc_std_external *) relocs,
+					 rel_size, finfo->contents))
+	return FALSE;
+    }
+  else
+    {
+      if (! aout_link_input_section_ext (finfo, input_bfd, input_section,
+					 (struct reloc_ext_external *) relocs,
+					 rel_size, finfo->contents))
+	return FALSE;
+    }
+
+  /* Write out the section contents.  */
+  if (! bfd_set_section_contents (finfo->output_bfd,
+				  input_section->output_section,
+				  (void *) finfo->contents,
+				  (file_ptr) input_section->output_offset,
+				  input_size))
+    return FALSE;
+
+  /* If we are producing relocatable output, the relocs were
+     modified, and we now write them out.  */
+  if (finfo->info->relocatable && rel_size > 0)
+    {
+      if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0)
+	return FALSE;
+      if (bfd_bwrite (relocs, rel_size, finfo->output_bfd) != rel_size)
+	return FALSE;
+      *reloff_ptr += rel_size;
+
+      /* Assert that the relocs have not run into the symbols, and
+	 that if these are the text relocs they have not run into the
+	 data relocs.  */
+      BFD_ASSERT (*reloff_ptr <= obj_sym_filepos (finfo->output_bfd)
+		  && (reloff_ptr != &finfo->treloff
+		      || (*reloff_ptr
+			  <= obj_datasec (finfo->output_bfd)->rel_filepos)));
+    }
+
+  return TRUE;
+}
+
+/* Adjust and write out the symbols for an a.out file.  Set the new
+   symbol indices into a symbol_map.  */
+
+static bfd_boolean
+aout_link_write_symbols (struct aout_final_link_info *finfo, bfd *input_bfd)
+{
+  bfd *output_bfd;
+  bfd_size_type sym_count;
+  char *strings;
+  enum bfd_link_strip strip;
+  enum bfd_link_discard discard;
+  struct external_nlist *outsym;
+  bfd_size_type strtab_index;
+  struct external_nlist *sym;
+  struct external_nlist *sym_end;
+  struct aout_link_hash_entry **sym_hash;
+  int *symbol_map;
+  bfd_boolean pass;
+  bfd_boolean skip_next;
+
+  output_bfd = finfo->output_bfd;
+  sym_count = obj_aout_external_sym_count (input_bfd);
+  strings = obj_aout_external_strings (input_bfd);
+  strip = finfo->info->strip;
+  discard = finfo->info->discard;
+  outsym = finfo->output_syms;
+
+  /* First write out a symbol for this object file, unless we are
+     discarding such symbols.  */
+  if (strip != strip_all
+      && (strip != strip_some
+	  || bfd_hash_lookup (finfo->info->keep_hash, input_bfd->filename,
+			      FALSE, FALSE) != NULL)
+      && discard != discard_all)
+    {
+      H_PUT_8 (output_bfd, N_TEXT, outsym->e_type);
+      H_PUT_8 (output_bfd, 0, outsym->e_other);
+      H_PUT_16 (output_bfd, 0, outsym->e_desc);
+      strtab_index = add_to_stringtab (output_bfd, finfo->strtab,
+				       input_bfd->filename, FALSE);
+      if (strtab_index == (bfd_size_type) -1)
+	return FALSE;
+      PUT_WORD (output_bfd, strtab_index, outsym->e_strx);
+      PUT_WORD (output_bfd,
+		(bfd_get_section_vma (output_bfd,
+				      obj_textsec (input_bfd)->output_section)
+		 + obj_textsec (input_bfd)->output_offset),
+		outsym->e_value);
+      ++obj_aout_external_sym_count (output_bfd);
+      ++outsym;
+    }
+
+  pass = FALSE;
+  skip_next = FALSE;
+  sym = obj_aout_external_syms (input_bfd);
+  sym_end = sym + sym_count;
+  sym_hash = obj_aout_sym_hashes (input_bfd);
+  symbol_map = finfo->symbol_map;
+  memset (symbol_map, 0, (size_t) sym_count * sizeof *symbol_map);
+  for (; sym < sym_end; sym++, sym_hash++, symbol_map++)
+    {
+      const char *name;
+      int type;
+      struct aout_link_hash_entry *h;
+      bfd_boolean skip;
+      asection *symsec;
+      bfd_vma val = 0;
+      bfd_boolean copy;
+
+      /* We set *symbol_map to 0 above for all symbols.  If it has
+         already been set to -1 for this symbol, it means that we are
+         discarding it because it appears in a duplicate header file.
+         See the N_BINCL code below.  */
+      if (*symbol_map == -1)
+	continue;
+
+      /* Initialize *symbol_map to -1, which means that the symbol was
+         not copied into the output file.  We will change it later if
+         we do copy the symbol over.  */
+      *symbol_map = -1;
+
+      type = H_GET_8 (input_bfd, sym->e_type);
+      name = strings + GET_WORD (input_bfd, sym->e_strx);
+
+      h = NULL;
+
+      if (pass)
+	{
+	  /* Pass this symbol through.  It is the target of an
+	     indirect or warning symbol.  */
+	  val = GET_WORD (input_bfd, sym->e_value);
+	  pass = FALSE;
+	}
+      else if (skip_next)
+	{
+	  /* Skip this symbol, which is the target of an indirect
+	     symbol that we have changed to no longer be an indirect
+	     symbol.  */
+	  skip_next = FALSE;
+	  continue;
+	}
+      else
+	{
+	  struct aout_link_hash_entry *hresolve;
+
+	  /* We have saved the hash table entry for this symbol, if
+	     there is one.  Note that we could just look it up again
+	     in the hash table, provided we first check that it is an
+	     external symbol.  */
+	  h = *sym_hash;
+
+	  /* Use the name from the hash table, in case the symbol was
+             wrapped.  */
+	  if (h != NULL
+	      && h->root.type != bfd_link_hash_warning)
+	    name = h->root.root.string;
+
+	  /* If this is an indirect or warning symbol, then change
+	     hresolve to the base symbol.  We also change *sym_hash so
+	     that the relocation routines relocate against the real
+	     symbol.  */
+	  hresolve = h;
+	  if (h != (struct aout_link_hash_entry *) NULL
+	      && (h->root.type == bfd_link_hash_indirect
+		  || h->root.type == bfd_link_hash_warning))
+	    {
+	      hresolve = (struct aout_link_hash_entry *) h->root.u.i.link;
+	      while (hresolve->root.type == bfd_link_hash_indirect
+		     || hresolve->root.type == bfd_link_hash_warning)
+		hresolve = ((struct aout_link_hash_entry *)
+			    hresolve->root.u.i.link);
+	      *sym_hash = hresolve;
+	    }
+
+	  /* If the symbol has already been written out, skip it.  */
+	  if (h != NULL
+	      && h->written)
+	    {
+	      if ((type & N_TYPE) == N_INDR
+		  || type == N_WARNING)
+		skip_next = TRUE;
+	      *symbol_map = h->indx;
+	      continue;
+	    }
+
+	  /* See if we are stripping this symbol.  */
+	  skip = FALSE;
+	  switch (strip)
+	    {
+	    case strip_none:
+	      break;
+	    case strip_debugger:
+	      if ((type & N_STAB) != 0)
+		skip = TRUE;
+	      break;
+	    case strip_some:
+	      if (bfd_hash_lookup (finfo->info->keep_hash, name, FALSE, FALSE)
+		  == NULL)
+		skip = TRUE;
+	      break;
+	    case strip_all:
+	      skip = TRUE;
+	      break;
+	    }
+	  if (skip)
+	    {
+	      if (h != NULL)
+		h->written = TRUE;
+	      continue;
+	    }
+
+	  /* Get the value of the symbol.  */
+	  if ((type & N_TYPE) == N_TEXT
+	      || type == N_WEAKT)
+	    symsec = obj_textsec (input_bfd);
+	  else if ((type & N_TYPE) == N_DATA
+		   || type == N_WEAKD)
+	    symsec = obj_datasec (input_bfd);
+	  else if ((type & N_TYPE) == N_BSS
+		   || type == N_WEAKB)
+	    symsec = obj_bsssec (input_bfd);
+	  else if ((type & N_TYPE) == N_ABS
+		   || type == N_WEAKA)
+	    symsec = bfd_abs_section_ptr;
+	  else if (((type & N_TYPE) == N_INDR
+		    && (hresolve == NULL
+			|| (hresolve->root.type != bfd_link_hash_defined
+			    && hresolve->root.type != bfd_link_hash_defweak
+			    && hresolve->root.type != bfd_link_hash_common)))
+		   || type == N_WARNING)
+	    {
+	      /* Pass the next symbol through unchanged.  The
+		 condition above for indirect symbols is so that if
+		 the indirect symbol was defined, we output it with
+		 the correct definition so the debugger will
+		 understand it.  */
+	      pass = TRUE;
+	      val = GET_WORD (input_bfd, sym->e_value);
+	      symsec = NULL;
+	    }
+	  else if ((type & N_STAB) != 0)
+	    {
+	      val = GET_WORD (input_bfd, sym->e_value);
+	      symsec = NULL;
+	    }
+	  else
+	    {
+	      /* If we get here with an indirect symbol, it means that
+		 we are outputting it with a real definition.  In such
+		 a case we do not want to output the next symbol,
+		 which is the target of the indirection.  */
+	      if ((type & N_TYPE) == N_INDR)
+		skip_next = TRUE;
+
+	      symsec = NULL;
+
+	      /* We need to get the value from the hash table.  We use
+		 hresolve so that if we have defined an indirect
+		 symbol we output the final definition.  */
+	      if (h == NULL)
+		{
+		  switch (type & N_TYPE)
+		    {
+		    case N_SETT:
+		      symsec = obj_textsec (input_bfd);
+		      break;
+		    case N_SETD:
+		      symsec = obj_datasec (input_bfd);
+		      break;
+		    case N_SETB:
+		      symsec = obj_bsssec (input_bfd);
+		      break;
+		    case N_SETA:
+		      symsec = bfd_abs_section_ptr;
+		      break;
+		    default:
+		      val = 0;
+		      break;
+		    }
+		}
+	      else if (hresolve->root.type == bfd_link_hash_defined
+		       || hresolve->root.type == bfd_link_hash_defweak)
+		{
+		  asection *input_section;
+		  asection *output_section;
+
+		  /* This case usually means a common symbol which was
+		     turned into a defined symbol.  */
+		  input_section = hresolve->root.u.def.section;
+		  output_section = input_section->output_section;
+		  BFD_ASSERT (bfd_is_abs_section (output_section)
+			      || output_section->owner == output_bfd);
+		  val = (hresolve->root.u.def.value
+			 + bfd_get_section_vma (output_bfd, output_section)
+			 + input_section->output_offset);
+
+		  /* Get the correct type based on the section.  If
+		     this is a constructed set, force it to be
+		     globally visible.  */
+		  if (type == N_SETT
+		      || type == N_SETD
+		      || type == N_SETB
+		      || type == N_SETA)
+		    type |= N_EXT;
+
+		  type &=~ N_TYPE;
+
+		  if (output_section == obj_textsec (output_bfd))
+		    type |= (hresolve->root.type == bfd_link_hash_defined
+			     ? N_TEXT
+			     : N_WEAKT);
+		  else if (output_section == obj_datasec (output_bfd))
+		    type |= (hresolve->root.type == bfd_link_hash_defined
+			     ? N_DATA
+			     : N_WEAKD);
+		  else if (output_section == obj_bsssec (output_bfd))
+		    type |= (hresolve->root.type == bfd_link_hash_defined
+			     ? N_BSS
+			     : N_WEAKB);
+		  else
+		    type |= (hresolve->root.type == bfd_link_hash_defined
+			     ? N_ABS
+			     : N_WEAKA);
+		}
+	      else if (hresolve->root.type == bfd_link_hash_common)
+		val = hresolve->root.u.c.size;
+	      else if (hresolve->root.type == bfd_link_hash_undefweak)
+		{
+		  val = 0;
+		  type = N_WEAKU;
+		}
+	      else
+		val = 0;
+	    }
+	  if (symsec != NULL)
+	    val = (symsec->output_section->vma
+		   + symsec->output_offset
+		   + (GET_WORD (input_bfd, sym->e_value)
+		      - symsec->vma));
+
+	  /* If this is a global symbol set the written flag, and if
+	     it is a local symbol see if we should discard it.  */
+	  if (h != NULL)
+	    {
+	      h->written = TRUE;
+	      h->indx = obj_aout_external_sym_count (output_bfd);
+	    }
+	  else if ((type & N_TYPE) != N_SETT
+		   && (type & N_TYPE) != N_SETD
+		   && (type & N_TYPE) != N_SETB
+		   && (type & N_TYPE) != N_SETA)
+	    {
+	      switch (discard)
+		{
+		case discard_none:
+		case discard_sec_merge:
+		  break;
+		case discard_l:
+		  if ((type & N_STAB) == 0
+		      && bfd_is_local_label_name (input_bfd, name))
+		    skip = TRUE;
+		  break;
+		case discard_all:
+		  skip = TRUE;
+		  break;
+		}
+	      if (skip)
+		{
+		  pass = FALSE;
+		  continue;
+		}
+	    }
+
+	  /* An N_BINCL symbol indicates the start of the stabs
+	     entries for a header file.  We need to scan ahead to the
+	     next N_EINCL symbol, ignoring nesting, adding up all the
+	     characters in the symbol names, not including the file
+	     numbers in types (the first number after an open
+	     parenthesis).  */
+	  if (type == (int) N_BINCL)
+	    {
+	      struct external_nlist *incl_sym;
+	      int nest;
+	      struct aout_link_includes_entry *incl_entry;
+	      struct aout_link_includes_totals *t;
+
+	      val = 0;
+	      nest = 0;
+	      for (incl_sym = sym + 1; incl_sym < sym_end; incl_sym++)
+		{
+		  int incl_type;
+
+		  incl_type = H_GET_8 (input_bfd, incl_sym->e_type);
+		  if (incl_type == (int) N_EINCL)
+		    {
+		      if (nest == 0)
+			break;
+		      --nest;
+		    }
+		  else if (incl_type == (int) N_BINCL)
+		    ++nest;
+		  else if (nest == 0)
+		    {
+		      const char *s;
+
+		      s = strings + GET_WORD (input_bfd, incl_sym->e_strx);
+		      for (; *s != '\0'; s++)
+			{
+			  val += *s;
+			  if (*s == '(')
+			    {
+			      /* Skip the file number.  */
+			      ++s;
+			      while (ISDIGIT (*s))
+				++s;
+			      --s;
+			    }
+			}
+		    }
+		}
+
+	      /* If we have already included a header file with the
+                 same value, then replace this one with an N_EXCL
+                 symbol.  */
+	      copy = (bfd_boolean) (! finfo->info->keep_memory);
+	      incl_entry = aout_link_includes_lookup (&finfo->includes,
+						      name, TRUE, copy);
+	      if (incl_entry == NULL)
+		return FALSE;
+	      for (t = incl_entry->totals; t != NULL; t = t->next)
+		if (t->total == val)
+		  break;
+	      if (t == NULL)
+		{
+		  /* This is the first time we have seen this header
+                     file with this set of stabs strings.  */
+		  t = (struct aout_link_includes_totals *)
+                      bfd_hash_allocate (&finfo->includes.root,
+					 sizeof *t);
+		  if (t == NULL)
+		    return FALSE;
+		  t->total = val;
+		  t->next = incl_entry->totals;
+		  incl_entry->totals = t;
+		}
+	      else
+		{
+		  int *incl_map;
+
+		  /* This is a duplicate header file.  We must change
+                     it to be an N_EXCL entry, and mark all the
+                     included symbols to prevent outputting them.  */
+		  type = (int) N_EXCL;
+
+		  nest = 0;
+		  for (incl_sym = sym + 1, incl_map = symbol_map + 1;
+		       incl_sym < sym_end;
+		       incl_sym++, incl_map++)
+		    {
+		      int incl_type;
+
+		      incl_type = H_GET_8 (input_bfd, incl_sym->e_type);
+		      if (incl_type == (int) N_EINCL)
+			{
+			  if (nest == 0)
+			    {
+			      *incl_map = -1;
+			      break;
+			    }
+			  --nest;
+			}
+		      else if (incl_type == (int) N_BINCL)
+			++nest;
+		      else if (nest == 0)
+			*incl_map = -1;
+		    }
+		}
+	    }
+	}
+
+      /* Copy this symbol into the list of symbols we are going to
+	 write out.  */
+      H_PUT_8 (output_bfd, type, outsym->e_type);
+      H_PUT_8 (output_bfd, H_GET_8 (input_bfd, sym->e_other), outsym->e_other);
+      H_PUT_16 (output_bfd, H_GET_16 (input_bfd, sym->e_desc), outsym->e_desc);
+      copy = FALSE;
+      if (! finfo->info->keep_memory)
+	{
+	  /* name points into a string table which we are going to
+	     free.  If there is a hash table entry, use that string.
+	     Otherwise, copy name into memory.  */
+	  if (h != NULL)
+	    name = h->root.root.string;
+	  else
+	    copy = TRUE;
+	}
+      strtab_index = add_to_stringtab (output_bfd, finfo->strtab,
+				       name, copy);
+      if (strtab_index == (bfd_size_type) -1)
+	return FALSE;
+      PUT_WORD (output_bfd, strtab_index, outsym->e_strx);
+      PUT_WORD (output_bfd, val, outsym->e_value);
+      *symbol_map = obj_aout_external_sym_count (output_bfd);
+      ++obj_aout_external_sym_count (output_bfd);
+      ++outsym;
+    }
+
+  /* Write out the output symbols we have just constructed.  */
+  if (outsym > finfo->output_syms)
+    {
+      bfd_size_type outsym_size;
+
+      if (bfd_seek (output_bfd, finfo->symoff, SEEK_SET) != 0)
+	return FALSE;
+      outsym_size = outsym - finfo->output_syms;
+      outsym_size *= EXTERNAL_NLIST_SIZE;
+      if (bfd_bwrite ((void *) finfo->output_syms, outsym_size, output_bfd)
+	  != outsym_size)
+	return FALSE;
+      finfo->symoff += outsym_size;
+    }
+
+  return TRUE;
+}
+
+/* Link an a.out input BFD into the output file.  */
+
+static bfd_boolean
+aout_link_input_bfd (struct aout_final_link_info *finfo, bfd *input_bfd)
+{
+  BFD_ASSERT (bfd_get_format (input_bfd) == bfd_object);
+
+  /* If this is a dynamic object, it may need special handling.  */
+  if ((input_bfd->flags & DYNAMIC) != 0
+      && aout_backend_info (input_bfd)->link_dynamic_object != NULL)
+    return ((*aout_backend_info (input_bfd)->link_dynamic_object)
+	    (finfo->info, input_bfd));
+
+  /* Get the symbols.  We probably have them already, unless
+     finfo->info->keep_memory is FALSE.  */
+  if (! aout_get_external_symbols (input_bfd))
+    return FALSE;
+
+  /* Write out the symbols and get a map of the new indices.  The map
+     is placed into finfo->symbol_map.  */
+  if (! aout_link_write_symbols (finfo, input_bfd))
+    return FALSE;
+
+  /* Relocate and write out the sections.  These functions use the
+     symbol map created by aout_link_write_symbols.  The linker_mark
+     field will be set if these sections are to be included in the
+     link, which will normally be the case.  */
+  if (obj_textsec (input_bfd)->linker_mark)
+    {
+      if (! aout_link_input_section (finfo, input_bfd,
+				     obj_textsec (input_bfd),
+				     &finfo->treloff,
+				     exec_hdr (input_bfd)->a_trsize))
+	return FALSE;
+    }
+  if (obj_datasec (input_bfd)->linker_mark)
+    {
+      if (! aout_link_input_section (finfo, input_bfd,
+				     obj_datasec (input_bfd),
+				     &finfo->dreloff,
+				     exec_hdr (input_bfd)->a_drsize))
+	return FALSE;
+    }
+
+  /* If we are not keeping memory, we don't need the symbols any
+     longer.  We still need them if we are keeping memory, because the
+     strings in the hash table point into them.  */
+  if (! finfo->info->keep_memory)
+    {
+      if (! aout_link_free_symbols (input_bfd))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Do the final link step.  This is called on the output BFD.  The
+   INFO structure should point to a list of BFDs linked through the
+   link_next field which can be used to find each BFD which takes part
+   in the output.  Also, each section in ABFD should point to a list
+   of bfd_link_order structures which list all the input sections for
+   the output section.  */
+
+bfd_boolean
+NAME (aout, final_link) (bfd *abfd,
+			 struct bfd_link_info *info,
+			 void (*callback) (bfd *, file_ptr *, file_ptr *, file_ptr *))
+{
+  struct aout_final_link_info aout_info;
+  bfd_boolean includes_hash_initialized = FALSE;
+  bfd *sub;
+  bfd_size_type trsize, drsize;
+  bfd_size_type max_contents_size;
+  bfd_size_type max_relocs_size;
+  bfd_size_type max_sym_count;
+  bfd_size_type text_size;
+  file_ptr text_end;
+  struct bfd_link_order *p;
+  asection *o;
+  bfd_boolean have_link_order_relocs;
+
+  if (info->shared)
+    abfd->flags |= DYNAMIC;
+
+  aout_info.info = info;
+  aout_info.output_bfd = abfd;
+  aout_info.contents = NULL;
+  aout_info.relocs = NULL;
+  aout_info.symbol_map = NULL;
+  aout_info.output_syms = NULL;
+
+  if (!bfd_hash_table_init_n (&aout_info.includes.root,
+			      aout_link_includes_newfunc,
+			      sizeof (struct aout_link_includes_entry),
+			      251))
+    goto error_return;
+  includes_hash_initialized = TRUE;
+
+  /* Figure out the largest section size.  Also, if generating
+     relocatable output, count the relocs.  */
+  trsize = 0;
+  drsize = 0;
+  max_contents_size = 0;
+  max_relocs_size = 0;
+  max_sym_count = 0;
+  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+    {
+      bfd_size_type sz;
+
+      if (info->relocatable)
+	{
+	  if (bfd_get_flavour (sub) == bfd_target_aout_flavour)
+	    {
+	      trsize += exec_hdr (sub)->a_trsize;
+	      drsize += exec_hdr (sub)->a_drsize;
+	    }
+	  else
+	    {
+	      /* FIXME: We need to identify the .text and .data sections
+		 and call get_reloc_upper_bound and canonicalize_reloc to
+		 work out the number of relocs needed, and then multiply
+		 by the reloc size.  */
+	      (*_bfd_error_handler)
+		(_("%s: relocatable link from %s to %s not supported"),
+		 bfd_get_filename (abfd),
+		 sub->xvec->name, abfd->xvec->name);
+	      bfd_set_error (bfd_error_invalid_operation);
+	      goto error_return;
+	    }
+	}
+
+      if (bfd_get_flavour (sub) == bfd_target_aout_flavour)
+	{
+	  sz = obj_textsec (sub)->size;
+	  if (sz > max_contents_size)
+	    max_contents_size = sz;
+	  sz = obj_datasec (sub)->size;
+	  if (sz > max_contents_size)
+	    max_contents_size = sz;
+
+	  sz = exec_hdr (sub)->a_trsize;
+	  if (sz > max_relocs_size)
+	    max_relocs_size = sz;
+	  sz = exec_hdr (sub)->a_drsize;
+	  if (sz > max_relocs_size)
+	    max_relocs_size = sz;
+
+	  sz = obj_aout_external_sym_count (sub);
+	  if (sz > max_sym_count)
+	    max_sym_count = sz;
+	}
+    }
+
+  if (info->relocatable)
+    {
+      if (obj_textsec (abfd) != NULL)
+	trsize += (_bfd_count_link_order_relocs (obj_textsec (abfd)
+						 ->map_head.link_order)
+		   * obj_reloc_entry_size (abfd));
+      if (obj_datasec (abfd) != NULL)
+	drsize += (_bfd_count_link_order_relocs (obj_datasec (abfd)
+						 ->map_head.link_order)
+		   * obj_reloc_entry_size (abfd));
+    }
+
+  exec_hdr (abfd)->a_trsize = trsize;
+  exec_hdr (abfd)->a_drsize = drsize;
+
+  exec_hdr (abfd)->a_entry = bfd_get_start_address (abfd);
+
+  /* Adjust the section sizes and vmas according to the magic number.
+     This sets a_text, a_data and a_bss in the exec_hdr and sets the
+     filepos for each section.  */
+  if (! NAME (aout, adjust_sizes_and_vmas) (abfd, &text_size, &text_end))
+    goto error_return;
+
+  /* The relocation and symbol file positions differ among a.out
+     targets.  We are passed a callback routine from the backend
+     specific code to handle this.
+     FIXME: At this point we do not know how much space the symbol
+     table will require.  This will not work for any (nonstandard)
+     a.out target that needs to know the symbol table size before it
+     can compute the relocation file positions.  This may or may not
+     be the case for the hp300hpux target, for example.  */
+  (*callback) (abfd, &aout_info.treloff, &aout_info.dreloff,
+	       &aout_info.symoff);
+  obj_textsec (abfd)->rel_filepos = aout_info.treloff;
+  obj_datasec (abfd)->rel_filepos = aout_info.dreloff;
+  obj_sym_filepos (abfd) = aout_info.symoff;
+
+  /* We keep a count of the symbols as we output them.  */
+  obj_aout_external_sym_count (abfd) = 0;
+
+  /* We accumulate the string table as we write out the symbols.  */
+  aout_info.strtab = _bfd_stringtab_init ();
+  if (aout_info.strtab == NULL)
+    goto error_return;
+
+  /* Allocate buffers to hold section contents and relocs.  */
+  aout_info.contents = (bfd_byte *) bfd_malloc (max_contents_size);
+  aout_info.relocs = bfd_malloc (max_relocs_size);
+  aout_info.symbol_map = (int *) bfd_malloc (max_sym_count * sizeof (int));
+  aout_info.output_syms = (struct external_nlist *)
+      bfd_malloc ((max_sym_count + 1) * sizeof (struct external_nlist));
+  if ((aout_info.contents == NULL && max_contents_size != 0)
+      || (aout_info.relocs == NULL && max_relocs_size != 0)
+      || (aout_info.symbol_map == NULL && max_sym_count != 0)
+      || aout_info.output_syms == NULL)
+    goto error_return;
+
+  /* If we have a symbol named __DYNAMIC, force it out now.  This is
+     required by SunOS.  Doing this here rather than in sunos.c is a
+     hack, but it's easier than exporting everything which would be
+     needed.  */
+  {
+    struct aout_link_hash_entry *h;
+
+    h = aout_link_hash_lookup (aout_hash_table (info), "__DYNAMIC",
+			       FALSE, FALSE, FALSE);
+    if (h != NULL)
+      aout_link_write_other_symbol (&h->root.root, &aout_info);
+  }
+
+  /* The most time efficient way to do the link would be to read all
+     the input object files into memory and then sort out the
+     information into the output file.  Unfortunately, that will
+     probably use too much memory.  Another method would be to step
+     through everything that composes the text section and write it
+     out, and then everything that composes the data section and write
+     it out, and then write out the relocs, and then write out the
+     symbols.  Unfortunately, that requires reading stuff from each
+     input file several times, and we will not be able to keep all the
+     input files open simultaneously, and reopening them will be slow.
+
+     What we do is basically process one input file at a time.  We do
+     everything we need to do with an input file once--copy over the
+     section contents, handle the relocation information, and write
+     out the symbols--and then we throw away the information we read
+     from it.  This approach requires a lot of lseeks of the output
+     file, which is unfortunate but still faster than reopening a lot
+     of files.
+
+     We use the output_has_begun field of the input BFDs to see
+     whether we have already handled it.  */
+  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+    sub->output_has_begun = FALSE;
+
+  /* Mark all sections which are to be included in the link.  This
+     will normally be every section.  We need to do this so that we
+     can identify any sections which the linker has decided to not
+     include.  */
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      for (p = o->map_head.link_order; p != NULL; p = p->next)
+	if (p->type == bfd_indirect_link_order)
+	  p->u.indirect.section->linker_mark = TRUE;
+    }
+
+  have_link_order_relocs = FALSE;
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      for (p = o->map_head.link_order;
+	   p != NULL;
+	   p = p->next)
+	{
+	  if (p->type == bfd_indirect_link_order
+	      && (bfd_get_flavour (p->u.indirect.section->owner)
+		  == bfd_target_aout_flavour))
+	    {
+	      bfd *input_bfd;
+
+	      input_bfd = p->u.indirect.section->owner;
+	      if (! input_bfd->output_has_begun)
+		{
+		  if (! aout_link_input_bfd (&aout_info, input_bfd))
+		    goto error_return;
+		  input_bfd->output_has_begun = TRUE;
+		}
+	    }
+	  else if (p->type == bfd_section_reloc_link_order
+		   || p->type == bfd_symbol_reloc_link_order)
+	    {
+	      /* These are handled below.  */
+	      have_link_order_relocs = TRUE;
+	    }
+	  else
+	    {
+	      if (! _bfd_default_link_order (abfd, info, o, p))
+		goto error_return;
+	    }
+	}
+    }
+
+  /* Write out any symbols that we have not already written out.  */
+  bfd_hash_traverse (&info->hash->table,
+		     aout_link_write_other_symbol,
+		     &aout_info);
+
+  /* Now handle any relocs we were asked to create by the linker.
+     These did not come from any input file.  We must do these after
+     we have written out all the symbols, so that we know the symbol
+     indices to use.  */
+  if (have_link_order_relocs)
+    {
+      for (o = abfd->sections; o != NULL; o = o->next)
+	{
+	  for (p = o->map_head.link_order;
+	       p != NULL;
+	       p = p->next)
+	    {
+	      if (p->type == bfd_section_reloc_link_order
+		  || p->type == bfd_symbol_reloc_link_order)
+		{
+		  if (! aout_link_reloc_link_order (&aout_info, o, p))
+		    goto error_return;
+		}
+	    }
+	}
+    }
+
+  if (aout_info.contents != NULL)
+    {
+      free (aout_info.contents);
+      aout_info.contents = NULL;
+    }
+  if (aout_info.relocs != NULL)
+    {
+      free (aout_info.relocs);
+      aout_info.relocs = NULL;
+    }
+  if (aout_info.symbol_map != NULL)
+    {
+      free (aout_info.symbol_map);
+      aout_info.symbol_map = NULL;
+    }
+  if (aout_info.output_syms != NULL)
+    {
+      free (aout_info.output_syms);
+      aout_info.output_syms = NULL;
+    }
+  if (includes_hash_initialized)
+    {
+      bfd_hash_table_free (&aout_info.includes.root);
+      includes_hash_initialized = FALSE;
+    }
+
+  /* Finish up any dynamic linking we may be doing.  */
+  if (aout_backend_info (abfd)->finish_dynamic_link != NULL)
+    {
+      if (! (*aout_backend_info (abfd)->finish_dynamic_link) (abfd, info))
+	goto error_return;
+    }
+
+  /* Update the header information.  */
+  abfd->symcount = obj_aout_external_sym_count (abfd);
+  exec_hdr (abfd)->a_syms = abfd->symcount * EXTERNAL_NLIST_SIZE;
+  obj_str_filepos (abfd) = obj_sym_filepos (abfd) + exec_hdr (abfd)->a_syms;
+  obj_textsec (abfd)->reloc_count =
+    exec_hdr (abfd)->a_trsize / obj_reloc_entry_size (abfd);
+  obj_datasec (abfd)->reloc_count =
+    exec_hdr (abfd)->a_drsize / obj_reloc_entry_size (abfd);
+
+  /* Write out the string table, unless there are no symbols.  */
+  if (bfd_seek (abfd, obj_str_filepos (abfd), SEEK_SET) != 0)
+    goto error_return;
+  if (abfd->symcount > 0)
+    {
+      if (!emit_stringtab (abfd, aout_info.strtab))
+	goto error_return;
+    }
+  else
+    {
+      bfd_byte b[BYTES_IN_WORD];
+
+      memset (b, 0, BYTES_IN_WORD);
+      if (bfd_bwrite (b, (bfd_size_type) BYTES_IN_WORD, abfd) != BYTES_IN_WORD)
+	goto error_return;
+    }
+
+  return TRUE;
+
+ error_return:
+  if (aout_info.contents != NULL)
+    free (aout_info.contents);
+  if (aout_info.relocs != NULL)
+    free (aout_info.relocs);
+  if (aout_info.symbol_map != NULL)
+    free (aout_info.symbol_map);
+  if (aout_info.output_syms != NULL)
+    free (aout_info.output_syms);
+  if (includes_hash_initialized)
+    bfd_hash_table_free (&aout_info.includes.root);
+  return FALSE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/archive.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/archive.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/archive.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/archive.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2634 @@
+/* BFD back-end for archive files (libraries).
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.  Mostly Gumby Henkel-Wallace's fault.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/*
+@setfilename archive-info
+SECTION
+	Archives
+
+DESCRIPTION
+	An archive (or library) is just another BFD.  It has a symbol
+	table, although there's not much a user program will do with it.
+
+	The big difference between an archive BFD and an ordinary BFD
+	is that the archive doesn't have sections.  Instead it has a
+	chain of BFDs that are considered its contents.  These BFDs can
+	be manipulated like any other.  The BFDs contained in an
+	archive opened for reading will all be opened for reading.  You
+	may put either input or output BFDs into an archive opened for
+	output; they will be handled correctly when the archive is closed.
+
+	Use <<bfd_openr_next_archived_file>> to step through
+	the contents of an archive opened for input.  You don't
+	have to read the entire archive if you don't want
+	to!  Read it until you find what you want.
+
+	Archive contents of output BFDs are chained through the
+	<<next>> pointer in a BFD.  The first one is findable through
+	the <<archive_head>> slot of the archive.  Set it with
+	<<bfd_set_archive_head>> (q.v.).  A given BFD may be in only one
+	open output archive at a time.
+
+	As expected, the BFD archive code is more general than the
+	archive code of any given environment.  BFD archives may
+	contain files of different formats (e.g., a.out and coff) and
+	even different architectures.  You may even place archives
+	recursively into archives!
+
+	This can cause unexpected confusion, since some archive
+	formats are more expressive than others.  For instance, Intel
+	COFF archives can preserve long filenames; SunOS a.out archives
+	cannot.  If you move a file from the first to the second
+	format and back again, the filename may be truncated.
+	Likewise, different a.out environments have different
+	conventions as to how they truncate filenames, whether they
+	preserve directory names in filenames, etc.  When
+	interoperating with native tools, be sure your files are
+	homogeneous.
+
+	Beware: most of these formats do not react well to the
+	presence of spaces in filenames.  We do the best we can, but
+	can't always handle this case due to restrictions in the format of
+	archives.  Many Unix utilities are braindead in regards to
+	spaces and such in filenames anyway, so this shouldn't be much
+	of a restriction.
+
+	Archives are supported in BFD in <<archive.c>>.
+
+SUBSECTION
+	Archive functions
+*/
+
+/* Assumes:
+   o - all archive elements start on an even boundary, newline padded;
+   o - all arch headers are char *;
+   o - all arch headers are the same size (across architectures).
+*/
+
+/* Some formats provide a way to cram a long filename into the short
+   (16 chars) space provided by a BSD archive.  The trick is: make a
+   special "file" in the front of the archive, sort of like the SYMDEF
+   entry.  If the filename is too long to fit, put it in the extended
+   name table, and use its index as the filename.  To prevent
+   confusion prepend the index with a space.  This means you can't
+   have filenames that start with a space, but then again, many Unix
+   utilities can't handle that anyway.
+
+   This scheme unfortunately requires that you stand on your head in
+   order to write an archive since you need to put a magic file at the
+   front, and need to touch every entry to do so.  C'est la vie.
+
+   We support two variants of this idea:
+   The SVR4 format (extended name table is named "//"),
+   and an extended pseudo-BSD variant (extended name table is named
+   "ARFILENAMES/").  The origin of the latter format is uncertain.
+
+   BSD 4.4 uses a third scheme:  It writes a long filename
+   directly after the header.  This allows 'ar q' to work.
+*/
+
+/* Summary of archive member names:
+
+ Symbol table (must be first):
+ "__.SYMDEF       " - Symbol table, Berkeley style, produced by ranlib.
+ "/               " - Symbol table, system 5 style.
+
+ Long name table (must be before regular file members):
+ "//              " - Long name table, System 5 R4 style.
+ "ARFILENAMES/    " - Long name table, non-standard extended BSD (not BSD 4.4).
+
+ Regular file members with short names:
+ "filename.o/     " - Regular file, System 5 style (embedded spaces ok).
+ "filename.o      " - Regular file, Berkeley style (no embedded spaces).
+
+ Regular files with long names (or embedded spaces, for BSD variants):
+ "/18             " - SVR4 style, name at offset 18 in name table.
+ "#1/23           " - Long name (or embedded spaces) 23 characters long,
+		      BSD 4.4 style, full name follows header.
+ " 18             " - Long name 18 characters long, extended pseudo-BSD.
+ */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libiberty.h"
+#include "libbfd.h"
+#include "aout/ar.h"
+#include "aout/ranlib.h"
+#include "safe-ctype.h"
+#include "hashtab.h"
+#include "filenames.h"
+
+#ifndef errno
+extern int errno;
+#endif
+
+/* We keep a cache of archive filepointers to archive elements to
+   speed up searching the archive by filepos.  We only add an entry to
+   the cache when we actually read one.  We also don't sort the cache;
+   it's generally short enough to search linearly.
+   Note that the pointers here point to the front of the ar_hdr, not
+   to the front of the contents!  */
+struct ar_cache {
+  file_ptr ptr;
+  bfd *arbfd;
+};
+
+#define ar_padchar(abfd) ((abfd)->xvec->ar_pad_char)
+#define ar_maxnamelen(abfd) ((abfd)->xvec->ar_max_namelen)
+
+#define arch_eltdata(bfd) ((struct areltdata *) ((bfd)->arelt_data))
+#define arch_hdr(bfd) ((struct ar_hdr *) arch_eltdata (bfd)->arch_header)
+
+/* True iff NAME designated a BSD 4.4 extended name.  */
+
+#define is_bsd44_extended_name(NAME) \
+  (NAME[0] == '#'  && NAME[1] == '1' && NAME[2] == '/' && ISDIGIT (NAME[3]))
+
+void
+_bfd_ar_spacepad (char *p, size_t n, const char *fmt, long val)
+{
+  static char buf[20];
+  size_t len;
+  snprintf (buf, sizeof (buf), fmt, val);
+  len = strlen (buf);
+  if (len < n)
+    {
+      memcpy (p, buf, len);
+      memset (p + len, ' ', n - len);
+    }
+  else
+    memcpy (p, buf, n);
+}
+
+bfd_boolean
+_bfd_generic_mkarchive (bfd *abfd)
+{
+  bfd_size_type amt = sizeof (struct artdata);
+
+  abfd->tdata.aout_ar_data = (struct artdata *) bfd_zalloc (abfd, amt);
+  if (bfd_ardata (abfd) == NULL)
+    return FALSE;
+
+  /* Already cleared by bfd_zalloc above.
+     bfd_ardata (abfd)->cache = NULL;
+     bfd_ardata (abfd)->archive_head = NULL;
+     bfd_ardata (abfd)->symdefs = NULL;
+     bfd_ardata (abfd)->extended_names = NULL;
+     bfd_ardata (abfd)->extended_names_size = 0;
+     bfd_ardata (abfd)->tdata = NULL;  */
+
+  return TRUE;
+}
+
+/*
+FUNCTION
+	bfd_get_next_mapent
+
+SYNOPSIS
+	symindex bfd_get_next_mapent
+	  (bfd *abfd, symindex previous, carsym **sym);
+
+DESCRIPTION
+	Step through archive @var{abfd}'s symbol table (if it
+	has one).  Successively update @var{sym} with the next symbol's
+	information, returning that symbol's (internal) index into the
+	symbol table.
+
+	Supply <<BFD_NO_MORE_SYMBOLS>> as the @var{previous} entry to get
+	the first one; returns <<BFD_NO_MORE_SYMBOLS>> when you've already
+	got the last one.
+
+	A <<carsym>> is a canonical archive symbol.  The only
+	user-visible element is its name, a null-terminated string.
+*/
+
+symindex
+bfd_get_next_mapent (bfd *abfd, symindex prev, carsym **entry)
+{
+  if (!bfd_has_map (abfd))
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return BFD_NO_MORE_SYMBOLS;
+    }
+
+  if (prev == BFD_NO_MORE_SYMBOLS)
+    prev = 0;
+  else
+    ++prev;
+  if (prev >= bfd_ardata (abfd)->symdef_count)
+    return BFD_NO_MORE_SYMBOLS;
+
+  *entry = (bfd_ardata (abfd)->symdefs + prev);
+  return prev;
+}
+
+/* To be called by backends only.  */
+
+bfd *
+_bfd_create_empty_archive_element_shell (bfd *obfd)
+{
+  return _bfd_new_bfd_contained_in (obfd);
+}
+
+/*
+FUNCTION
+	bfd_set_archive_head
+
+SYNOPSIS
+	bfd_boolean bfd_set_archive_head (bfd *output, bfd *new_head);
+
+DESCRIPTION
+	Set the head of the chain of
+	BFDs contained in the archive @var{output} to @var{new_head}.
+*/
+
+bfd_boolean
+bfd_set_archive_head (bfd *output_archive, bfd *new_head)
+{
+  output_archive->archive_head = new_head;
+  return TRUE;
+}
+
+bfd *
+_bfd_look_for_bfd_in_cache (bfd *arch_bfd, file_ptr filepos)
+{
+  htab_t hash_table = bfd_ardata (arch_bfd)->cache;
+  struct ar_cache m;
+  m.ptr = filepos;
+
+  if (hash_table)
+    {
+      struct ar_cache *entry = (struct ar_cache *) htab_find (hash_table, &m);
+      if (!entry)
+	return NULL;
+      else
+	return entry->arbfd;
+    }
+  else
+    return NULL;
+}
+
+static hashval_t
+hash_file_ptr (const PTR p)
+{
+  return (hashval_t) (((struct ar_cache *) p)->ptr);
+}
+
+/* Returns non-zero if P1 and P2 are equal.  */
+
+static int
+eq_file_ptr (const PTR p1, const PTR p2)
+{
+  struct ar_cache *arc1 = (struct ar_cache *) p1;
+  struct ar_cache *arc2 = (struct ar_cache *) p2;
+  return arc1->ptr == arc2->ptr;
+}
+
+/* The calloc function doesn't always take size_t (e.g. on VMS)
+   so wrap it to avoid a compile time warning.   */
+
+static void *
+_bfd_calloc_wrapper (size_t a, size_t b)
+{
+  return calloc (a, b);
+}
+
+/* Kind of stupid to call cons for each one, but we don't do too many.  */
+
+bfd_boolean
+_bfd_add_bfd_to_archive_cache (bfd *arch_bfd, file_ptr filepos, bfd *new_elt)
+{
+  struct ar_cache *cache;
+  htab_t hash_table = bfd_ardata (arch_bfd)->cache;
+
+  /* If the hash table hasn't been created, create it.  */
+  if (hash_table == NULL)
+    {
+      hash_table = htab_create_alloc (16, hash_file_ptr, eq_file_ptr,
+				      NULL, _bfd_calloc_wrapper, free);
+      if (hash_table == NULL)
+	return FALSE;
+      bfd_ardata (arch_bfd)->cache = hash_table;
+    }
+
+  /* Insert new_elt into the hash table by filepos.  */
+  cache = (struct ar_cache *) bfd_zalloc (arch_bfd, sizeof (struct ar_cache));
+  cache->ptr = filepos;
+  cache->arbfd = new_elt;
+  *htab_find_slot (hash_table, (const void *) cache, INSERT) = cache;
+
+  return TRUE;
+}
+
+static bfd *
+_bfd_find_nested_archive (bfd *arch_bfd, const char *filename)
+{
+  bfd *abfd;
+  const char *target;
+
+  for (abfd = arch_bfd->nested_archives;
+       abfd != NULL;
+       abfd = abfd->archive_next)
+    {
+      if (filename_cmp (filename, abfd->filename) == 0)
+        return abfd;
+    }
+  target = NULL;
+  if (!arch_bfd->target_defaulted)
+    target = arch_bfd->xvec->name;
+  abfd = bfd_openr (filename, target);
+  if (abfd)
+    {
+      abfd->archive_next = arch_bfd->nested_archives;
+      arch_bfd->nested_archives = abfd;
+    }
+  return abfd;
+}
+
+/* The name begins with space.  Hence the rest of the name is an index into
+   the string table.  */
+
+static char *
+get_extended_arelt_filename (bfd *arch, const char *name, file_ptr *originp)
+{
+  unsigned long table_index = 0;
+  const char *endp;
+
+  /* Should extract string so that I can guarantee not to overflow into
+     the next region, but I'm too lazy.  */
+  errno = 0;
+  /* Skip first char, which is '/' in SVR4 or ' ' in some other variants.  */
+  table_index = strtol (name + 1, (char **) &endp, 10);
+  if (errno != 0 || table_index >= bfd_ardata (arch)->extended_names_size)
+    {
+      bfd_set_error (bfd_error_malformed_archive);
+      return NULL;
+    }
+  /* In a thin archive, a member of an archive-within-an-archive
+     will have the offset in the inner archive encoded here.  */
+  if (bfd_is_thin_archive (arch) && endp != NULL && *endp == ':')
+    {
+      file_ptr origin = strtol (endp + 1, NULL, 10);
+
+      if (errno != 0)
+        {
+          bfd_set_error (bfd_error_malformed_archive);
+          return NULL;
+        }
+      *originp = origin;
+    }
+  else
+    *originp = 0;
+
+  return bfd_ardata (arch)->extended_names + table_index;
+}
+
+/* This functions reads an arch header and returns an areltdata pointer, or
+   NULL on error.
+
+   Presumes the file pointer is already in the right place (ie pointing
+   to the ar_hdr in the file).   Moves the file pointer; on success it
+   should be pointing to the front of the file contents; on failure it
+   could have been moved arbitrarily.  */
+
+void *
+_bfd_generic_read_ar_hdr (bfd *abfd)
+{
+  return _bfd_generic_read_ar_hdr_mag (abfd, NULL);
+}
+
+/* Alpha ECOFF uses an optional different ARFMAG value, so we have a
+   variant of _bfd_generic_read_ar_hdr which accepts a magic string.  */
+
+void *
+_bfd_generic_read_ar_hdr_mag (bfd *abfd, const char *mag)
+{
+  struct ar_hdr hdr;
+  char *hdrp = (char *) &hdr;
+  size_t parsed_size;
+  struct areltdata *ared;
+  char *filename = NULL;
+  bfd_size_type namelen = 0;
+  bfd_size_type allocsize = sizeof (struct areltdata) + sizeof (struct ar_hdr);
+  char *allocptr = 0;
+  file_ptr origin = 0;
+  unsigned int extra_size = 0;
+
+  if (bfd_bread (hdrp, sizeof (struct ar_hdr), abfd) != sizeof (struct ar_hdr))
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_no_more_archived_files);
+      return NULL;
+    }
+  if (strncmp (hdr.ar_fmag, ARFMAG, 2) != 0
+      && (mag == NULL
+	  || strncmp (hdr.ar_fmag, mag, 2) != 0))
+    {
+      bfd_set_error (bfd_error_malformed_archive);
+      return NULL;
+    }
+
+  errno = 0;
+  parsed_size = strtol (hdr.ar_size, NULL, 10);
+  if (errno != 0)
+    {
+      bfd_set_error (bfd_error_malformed_archive);
+      return NULL;
+    }
+
+  /* Extract the filename from the archive - there are two ways to
+     specify an extended name table, either the first char of the
+     name is a space, or it's a slash.  */
+  if ((hdr.ar_name[0] == '/'
+       || (hdr.ar_name[0] == ' '
+	   && memchr (hdr.ar_name, '/', ar_maxnamelen (abfd)) == NULL))
+      && bfd_ardata (abfd)->extended_names != NULL)
+    {
+      filename = get_extended_arelt_filename (abfd, hdr.ar_name, &origin);
+      if (filename == NULL)
+	return NULL;
+    }
+  /* BSD4.4-style long filename.  */
+  else if (is_bsd44_extended_name (hdr.ar_name))
+    {
+      /* BSD-4.4 extended name */
+      namelen = atoi (&hdr.ar_name[3]);
+      allocsize += namelen + 1;
+      parsed_size -= namelen;
+      extra_size = namelen;
+
+      allocptr = (char *) bfd_zalloc (abfd, allocsize);
+      if (allocptr == NULL)
+	return NULL;
+      filename = (allocptr
+		  + sizeof (struct areltdata)
+		  + sizeof (struct ar_hdr));
+      if (bfd_bread (filename, namelen, abfd) != namelen)
+	{
+	  if (bfd_get_error () != bfd_error_system_call)
+	    bfd_set_error (bfd_error_no_more_archived_files);
+	  return NULL;
+	}
+      filename[namelen] = '\0';
+    }
+  else
+    {
+      /* We judge the end of the name by looking for '/' or ' '.
+	 Note:  The SYSV format (terminated by '/') allows embedded
+	 spaces, so only look for ' ' if we don't find '/'.  */
+
+      char *e;
+      e = (char *) memchr (hdr.ar_name, '\0', ar_maxnamelen (abfd));
+      if (e == NULL)
+	{
+	  e = (char *) memchr (hdr.ar_name, '/', ar_maxnamelen (abfd));
+	  if (e == NULL)
+	    e = (char *) memchr (hdr.ar_name, ' ', ar_maxnamelen (abfd));
+	}
+
+      if (e != NULL)
+	namelen = e - hdr.ar_name;
+      else
+	{
+	  /* If we didn't find a termination character, then the name
+	     must be the entire field.  */
+	  namelen = ar_maxnamelen (abfd);
+	}
+
+      allocsize += namelen + 1;
+    }
+
+  if (!allocptr)
+    {
+      allocptr = (char *) bfd_zalloc (abfd, allocsize);
+      if (allocptr == NULL)
+	return NULL;
+    }
+
+  ared = (struct areltdata *) allocptr;
+
+  ared->arch_header = allocptr + sizeof (struct areltdata);
+  memcpy (ared->arch_header, &hdr, sizeof (struct ar_hdr));
+  ared->parsed_size = parsed_size;
+  ared->extra_size = extra_size;
+  ared->origin = origin;
+
+  if (filename != NULL)
+    ared->filename = filename;
+  else
+    {
+      ared->filename = allocptr + (sizeof (struct areltdata) +
+				   sizeof (struct ar_hdr));
+      if (namelen)
+	memcpy (ared->filename, hdr.ar_name, namelen);
+      ared->filename[namelen] = '\0';
+    }
+
+  return ared;
+}
+
+/* Append the relative pathname for a member of the thin archive
+   to the pathname of the directory containing the archive.  */
+
+char *
+_bfd_append_relative_path (bfd *arch, char *elt_name)
+{
+  const char *arch_name = arch->filename;
+  const char *base_name = lbasename (arch_name);
+  size_t prefix_len;
+  char *filename;
+
+  if (base_name == arch_name)
+    return elt_name;
+
+  prefix_len = base_name - arch_name;
+  filename = (char *) bfd_alloc (arch, prefix_len + strlen (elt_name) + 1);
+  if (filename == NULL)
+    return NULL;
+
+  strncpy (filename, arch_name, prefix_len);
+  strcpy (filename + prefix_len, elt_name);
+  return filename;
+}
+
+/* This is an internal function; it's mainly used when indexing
+   through the archive symbol table, but also used to get the next
+   element, since it handles the bookkeeping so nicely for us.  */
+
+bfd *
+_bfd_get_elt_at_filepos (bfd *archive, file_ptr filepos)
+{
+  struct areltdata *new_areldata;
+  bfd *n_nfd;
+  char *filename;
+
+  if (archive->my_archive)
+    {
+      filepos += archive->origin;
+      archive = archive->my_archive;
+    }
+
+  n_nfd = _bfd_look_for_bfd_in_cache (archive, filepos);
+  if (n_nfd)
+    return n_nfd;
+
+  if (0 > bfd_seek (archive, filepos, SEEK_SET))
+    return NULL;
+
+  if ((new_areldata = (struct areltdata *) _bfd_read_ar_hdr (archive)) == NULL)
+    return NULL;
+
+  filename = new_areldata->filename;
+
+  if (bfd_is_thin_archive (archive))
+    {
+      const char *target;
+
+      /* This is a proxy entry for an external file.  */
+      if (! IS_ABSOLUTE_PATH (filename))
+        {
+          filename = _bfd_append_relative_path (archive, filename);
+          if (filename == NULL)
+            return NULL;
+        }
+
+      if (new_areldata->origin > 0)
+        {
+          /* This proxy entry refers to an element of a nested archive.
+             Locate the member of that archive and return a bfd for it.  */
+          bfd *ext_arch = _bfd_find_nested_archive (archive, filename);
+
+          if (ext_arch == NULL
+              || ! bfd_check_format (ext_arch, bfd_archive))
+            {
+              bfd_release (archive, new_areldata);
+              return NULL;
+            }
+          n_nfd = _bfd_get_elt_at_filepos (ext_arch, new_areldata->origin);
+          if (n_nfd == NULL)
+            {
+              bfd_release (archive, new_areldata);
+              return NULL;
+            }
+          n_nfd->proxy_origin = bfd_tell (archive);
+          return n_nfd;
+        }
+      /* It's not an element of a nested archive;
+         open the external file as a bfd.  */
+      target = NULL;
+      if (!archive->target_defaulted)
+	target = archive->xvec->name;
+      n_nfd = bfd_openr (filename, target);
+      if (n_nfd == NULL)
+	bfd_set_error (bfd_error_malformed_archive);
+    }
+  else
+    {
+      n_nfd = _bfd_create_empty_archive_element_shell (archive);
+    }
+
+  if (n_nfd == NULL)
+    {
+      bfd_release (archive, new_areldata);
+      return NULL;
+    }
+
+  n_nfd->proxy_origin = bfd_tell (archive);
+
+  if (bfd_is_thin_archive (archive))
+    {
+      n_nfd->origin = 0;
+    }
+  else
+    {
+      n_nfd->origin = n_nfd->proxy_origin;
+      n_nfd->filename = filename;
+    }
+
+  n_nfd->arelt_data = new_areldata;
+
+  /* Copy BFD_COMPRESS and BFD_DECOMPRESS flags.  */
+  n_nfd->flags |= archive->flags & (BFD_COMPRESS | BFD_DECOMPRESS);
+
+  if (_bfd_add_bfd_to_archive_cache (archive, filepos, n_nfd))
+    return n_nfd;
+
+  bfd_release (archive, new_areldata);
+  return NULL;
+}
+
+/* Return the BFD which is referenced by the symbol in ABFD indexed by
+   SYM_INDEX.  SYM_INDEX should have been returned by bfd_get_next_mapent.  */
+
+bfd *
+_bfd_generic_get_elt_at_index (bfd *abfd, symindex sym_index)
+{
+  carsym *entry;
+
+  entry = bfd_ardata (abfd)->symdefs + sym_index;
+  return _bfd_get_elt_at_filepos (abfd, entry->file_offset);
+}
+
+/*
+FUNCTION
+	bfd_openr_next_archived_file
+
+SYNOPSIS
+	bfd *bfd_openr_next_archived_file (bfd *archive, bfd *previous);
+
+DESCRIPTION
+	Provided a BFD, @var{archive}, containing an archive and NULL, open
+	an input BFD on the first contained element and returns that.
+	Subsequent calls should pass
+	the archive and the previous return value to return a created
+	BFD to the next contained element. NULL is returned when there
+	are no more.
+*/
+
+bfd *
+bfd_openr_next_archived_file (bfd *archive, bfd *last_file)
+{
+  if ((bfd_get_format (archive) != bfd_archive)
+      || (archive->direction == write_direction))
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return NULL;
+    }
+
+  return BFD_SEND (archive,
+		   openr_next_archived_file, (archive, last_file));
+}
+
+bfd *
+bfd_generic_openr_next_archived_file (bfd *archive, bfd *last_file)
+{
+  file_ptr filestart;
+
+  if (!last_file)
+    filestart = bfd_ardata (archive)->first_file_filepos;
+  else
+    {
+      unsigned int size = arelt_size (last_file);
+
+      filestart = last_file->proxy_origin;
+      if (! bfd_is_thin_archive (archive))
+        filestart += size;
+      if (archive->my_archive)
+	filestart -= archive->origin;
+      /* Pad to an even boundary...
+	 Note that last_file->origin can be odd in the case of
+	 BSD-4.4-style element with a long odd size.  */
+      filestart += filestart % 2;
+    }
+
+  return _bfd_get_elt_at_filepos (archive, filestart);
+}
+
+const bfd_target *
+bfd_generic_archive_p (bfd *abfd)
+{
+  struct artdata *tdata_hold;
+  char armag[SARMAG + 1];
+  bfd_size_type amt;
+
+  if (bfd_bread (armag, SARMAG, abfd) != SARMAG)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  bfd_is_thin_archive (abfd) = (strncmp (armag, ARMAGT, SARMAG) == 0);
+
+  if (strncmp (armag, ARMAG, SARMAG) != 0
+      && strncmp (armag, ARMAGB, SARMAG) != 0
+      && ! bfd_is_thin_archive (abfd))
+    return NULL;
+
+  tdata_hold = bfd_ardata (abfd);
+
+  amt = sizeof (struct artdata);
+  bfd_ardata (abfd) = (struct artdata *) bfd_zalloc (abfd, amt);
+  if (bfd_ardata (abfd) == NULL)
+    {
+      bfd_ardata (abfd) = tdata_hold;
+      return NULL;
+    }
+
+  bfd_ardata (abfd)->first_file_filepos = SARMAG;
+  /* Cleared by bfd_zalloc above.
+     bfd_ardata (abfd)->cache = NULL;
+     bfd_ardata (abfd)->archive_head = NULL;
+     bfd_ardata (abfd)->symdefs = NULL;
+     bfd_ardata (abfd)->extended_names = NULL;
+     bfd_ardata (abfd)->extended_names_size = 0;
+     bfd_ardata (abfd)->tdata = NULL;  */
+
+  if (!BFD_SEND (abfd, _bfd_slurp_armap, (abfd))
+      || !BFD_SEND (abfd, _bfd_slurp_extended_name_table, (abfd)))
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      bfd_release (abfd, bfd_ardata (abfd));
+      bfd_ardata (abfd) = tdata_hold;
+      return NULL;
+    }
+
+  if (abfd->target_defaulted && bfd_has_map (abfd))
+    {
+      bfd *first;
+
+      /* This archive has a map, so we may presume that the contents
+	 are object files.  Make sure that if the first file in the
+	 archive can be recognized as an object file, it is for this
+	 target.  If not, assume that this is the wrong format.  If
+	 the first file is not an object file, somebody is doing
+	 something weird, and we permit it so that ar -t will work.
+
+	 This is done because any normal format will recognize any
+	 normal archive, regardless of the format of the object files.
+	 We do accept an empty archive.  */
+
+      first = bfd_openr_next_archived_file (abfd, NULL);
+      if (first != NULL)
+	{
+	  first->target_defaulted = FALSE;
+	  if (bfd_check_format (first, bfd_object)
+	      && first->xvec != abfd->xvec)
+	    {
+	      bfd_set_error (bfd_error_wrong_object_format);
+	      bfd_ardata (abfd) = tdata_hold;
+	      return NULL;
+	    }
+	  /* And we ought to close `first' here too.  */
+	}
+    }
+
+  return abfd->xvec;
+}
+
+/* Some constants for a 32 bit BSD archive structure.  We do not
+   support 64 bit archives presently; so far as I know, none actually
+   exist.  Supporting them would require changing these constants, and
+   changing some H_GET_32 to H_GET_64.  */
+
+/* The size of an external symdef structure.  */
+#define BSD_SYMDEF_SIZE 8
+
+/* The offset from the start of a symdef structure to the file offset.  */
+#define BSD_SYMDEF_OFFSET_SIZE 4
+
+/* The size of the symdef count.  */
+#define BSD_SYMDEF_COUNT_SIZE 4
+
+/* The size of the string count.  */
+#define BSD_STRING_COUNT_SIZE 4
+
+/* Read a BSD-style archive symbol table.  Returns FALSE on error,
+   TRUE otherwise.  */
+
+static bfd_boolean
+do_slurp_bsd_armap (bfd *abfd)
+{
+  struct areltdata *mapdata;
+  unsigned int counter;
+  bfd_byte *raw_armap, *rbase;
+  struct artdata *ardata = bfd_ardata (abfd);
+  char *stringbase;
+  bfd_size_type parsed_size, amt;
+  carsym *set;
+
+  mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
+  if (mapdata == NULL)
+    return FALSE;
+  parsed_size = mapdata->parsed_size;
+  bfd_release (abfd, mapdata);	/* Don't need it any more.  */
+
+  raw_armap = (bfd_byte *) bfd_zalloc (abfd, parsed_size);
+  if (raw_armap == NULL)
+    return FALSE;
+
+  if (bfd_bread (raw_armap, parsed_size, abfd) != parsed_size)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_malformed_archive);
+    byebye:
+      bfd_release (abfd, raw_armap);
+      return FALSE;
+    }
+
+  ardata->symdef_count = H_GET_32 (abfd, raw_armap) / BSD_SYMDEF_SIZE;
+
+  if (ardata->symdef_count * BSD_SYMDEF_SIZE >
+      parsed_size - BSD_SYMDEF_COUNT_SIZE)
+    {
+      /* Probably we're using the wrong byte ordering.  */
+      bfd_set_error (bfd_error_wrong_format);
+      goto byebye;
+    }
+
+  ardata->cache = 0;
+  rbase = raw_armap + BSD_SYMDEF_COUNT_SIZE;
+  stringbase = ((char *) rbase
+		+ ardata->symdef_count * BSD_SYMDEF_SIZE
+		+ BSD_STRING_COUNT_SIZE);
+  amt = ardata->symdef_count * sizeof (carsym);
+  ardata->symdefs = (struct carsym *) bfd_alloc (abfd, amt);
+  if (!ardata->symdefs)
+    return FALSE;
+
+  for (counter = 0, set = ardata->symdefs;
+       counter < ardata->symdef_count;
+       counter++, set++, rbase += BSD_SYMDEF_SIZE)
+    {
+      set->name = H_GET_32 (abfd, rbase) + stringbase;
+      set->file_offset = H_GET_32 (abfd, rbase + BSD_SYMDEF_OFFSET_SIZE);
+    }
+
+  ardata->first_file_filepos = bfd_tell (abfd);
+  /* Pad to an even boundary if you have to.  */
+  ardata->first_file_filepos += (ardata->first_file_filepos) % 2;
+  /* FIXME, we should provide some way to free raw_ardata when
+     we are done using the strings from it.  For now, it seems
+     to be allocated on an objalloc anyway...  */
+  bfd_has_map (abfd) = TRUE;
+  return TRUE;
+}
+
+/* Read a COFF archive symbol table.  Returns FALSE on error, TRUE
+   otherwise.  */
+
+static bfd_boolean
+do_slurp_coff_armap (bfd *abfd)
+{
+  struct areltdata *mapdata;
+  int *raw_armap, *rawptr;
+  struct artdata *ardata = bfd_ardata (abfd);
+  char *stringbase;
+  bfd_size_type stringsize;
+  unsigned int parsed_size;
+  carsym *carsyms;
+  bfd_size_type nsymz;		/* Number of symbols in armap.  */
+  bfd_vma (*swap) (const void *);
+  char int_buf[sizeof (long)];
+  bfd_size_type carsym_size, ptrsize;
+  unsigned int i;
+
+  mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
+  if (mapdata == NULL)
+    return FALSE;
+  parsed_size = mapdata->parsed_size;
+  bfd_release (abfd, mapdata);	/* Don't need it any more.  */
+
+  if (bfd_bread (int_buf, 4, abfd) != 4)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_malformed_archive);
+      return FALSE;
+    }
+  /* It seems that all numeric information in a coff archive is always
+     in big endian format, nomatter the host or target.  */
+  swap = bfd_getb32;
+  nsymz = bfd_getb32 (int_buf);
+  stringsize = parsed_size - (4 * nsymz) - 4;
+
+  /* ... except that some archive formats are broken, and it may be our
+     fault - the i960 little endian coff sometimes has big and sometimes
+     little, because our tools changed.  Here's a horrible hack to clean
+     up the crap.  */
+
+  if (stringsize > 0xfffff
+      && bfd_get_arch (abfd) == bfd_arch_i960
+      && bfd_get_flavour (abfd) == bfd_target_coff_flavour)
+    {
+      /* This looks dangerous, let's do it the other way around.  */
+      nsymz = bfd_getl32 (int_buf);
+      stringsize = parsed_size - (4 * nsymz) - 4;
+      swap = bfd_getl32;
+    }
+
+  /* The coff armap must be read sequentially.  So we construct a
+     bsd-style one in core all at once, for simplicity.  */
+
+  if (nsymz > ~ (bfd_size_type) 0 / sizeof (carsym))
+    return FALSE;
+
+  carsym_size = (nsymz * sizeof (carsym));
+  ptrsize = (4 * nsymz);
+
+  if (carsym_size + stringsize + 1 <= carsym_size)
+    return FALSE;
+
+  ardata->symdefs = (struct carsym *) bfd_zalloc (abfd,
+                                                  carsym_size + stringsize + 1);
+  if (ardata->symdefs == NULL)
+    return FALSE;
+  carsyms = ardata->symdefs;
+  stringbase = ((char *) ardata->symdefs) + carsym_size;
+
+  /* Allocate and read in the raw offsets.  */
+  raw_armap = (int *) bfd_alloc (abfd, ptrsize);
+  if (raw_armap == NULL)
+    goto release_symdefs;
+  if (bfd_bread (raw_armap, ptrsize, abfd) != ptrsize
+      || (bfd_bread (stringbase, stringsize, abfd) != stringsize))
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_malformed_archive);
+      goto release_raw_armap;
+    }
+
+  /* OK, build the carsyms.  */
+  for (i = 0; i < nsymz; i++)
+    {
+      rawptr = raw_armap + i;
+      carsyms->file_offset = swap ((bfd_byte *) rawptr);
+      carsyms->name = stringbase;
+      stringbase += strlen (stringbase) + 1;
+      carsyms++;
+    }
+  *stringbase = 0;
+
+  ardata->symdef_count = nsymz;
+  ardata->first_file_filepos = bfd_tell (abfd);
+  /* Pad to an even boundary if you have to.  */
+  ardata->first_file_filepos += (ardata->first_file_filepos) % 2;
+
+  bfd_has_map (abfd) = TRUE;
+  bfd_release (abfd, raw_armap);
+
+  /* Check for a second archive header (as used by PE).  */
+  {
+    struct areltdata *tmp;
+
+    bfd_seek (abfd, ardata->first_file_filepos, SEEK_SET);
+    tmp = (struct areltdata *) _bfd_read_ar_hdr (abfd);
+    if (tmp != NULL)
+      {
+	if (tmp->arch_header[0] == '/'
+	    && tmp->arch_header[1] == ' ')
+	  {
+	    ardata->first_file_filepos +=
+	      (tmp->parsed_size + sizeof (struct ar_hdr) + 1) & ~(unsigned) 1;
+	  }
+	bfd_release (abfd, tmp);
+      }
+  }
+
+  return TRUE;
+
+release_raw_armap:
+  bfd_release (abfd, raw_armap);
+release_symdefs:
+  bfd_release (abfd, (ardata)->symdefs);
+  return FALSE;
+}
+
+/* This routine can handle either coff-style or bsd-style armaps
+   (archive symbol table).  Returns FALSE on error, TRUE otherwise */
+
+bfd_boolean
+bfd_slurp_armap (bfd *abfd)
+{
+  char nextname[17];
+  int i = bfd_bread (nextname, 16, abfd);
+
+  if (i == 0)
+    return TRUE;
+  if (i != 16)
+    return FALSE;
+
+  if (bfd_seek (abfd, (file_ptr) -16, SEEK_CUR) != 0)
+    return FALSE;
+
+  if (CONST_STRNEQ (nextname, "__.SYMDEF       ")
+      || CONST_STRNEQ (nextname, "__.SYMDEF/      ")) /* Old Linux archives.  */
+    return do_slurp_bsd_armap (abfd);
+  else if (CONST_STRNEQ (nextname, "/               "))
+    return do_slurp_coff_armap (abfd);
+  else if (CONST_STRNEQ (nextname, "/SYM64/         "))
+    {
+      /* 64bit ELF (Irix 6) archive.  */
+#ifdef BFD64
+      extern bfd_boolean bfd_elf64_archive_slurp_armap (bfd *);
+      return bfd_elf64_archive_slurp_armap (abfd);
+#else
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+#endif
+    }
+  else if (CONST_STRNEQ (nextname, "#1/20           "))
+    {
+      /* Mach-O has a special name for armap when the map is sorted by name.
+         However because this name has a space it is slightly more difficult
+         to check it.  */
+      struct ar_hdr hdr;
+      char extname[21];
+
+      if (bfd_bread (&hdr, sizeof (hdr), abfd) != sizeof (hdr))
+        return FALSE;
+      /* Read the extended name.  We know its length.  */
+      if (bfd_bread (extname, 20, abfd) != 20)
+        return FALSE;
+      if (bfd_seek (abfd, (file_ptr) -(sizeof (hdr) + 20), SEEK_CUR) != 0)
+        return FALSE;
+      if (CONST_STRNEQ (extname, "__.SYMDEF SORTED")
+          || CONST_STRNEQ (extname, "__.SYMDEF"))
+        return do_slurp_bsd_armap (abfd);
+    }
+
+  bfd_has_map (abfd) = FALSE;
+  return TRUE;
+}
+
+/* Returns FALSE on error, TRUE otherwise.  */
+/* Flavor 2 of a bsd armap, similar to bfd_slurp_bsd_armap except the
+   header is in a slightly different order and the map name is '/'.
+   This flavour is used by hp300hpux.  */
+
+#define HPUX_SYMDEF_COUNT_SIZE 2
+
+bfd_boolean
+bfd_slurp_bsd_armap_f2 (bfd *abfd)
+{
+  struct areltdata *mapdata;
+  char nextname[17];
+  unsigned int counter;
+  bfd_byte *raw_armap, *rbase;
+  struct artdata *ardata = bfd_ardata (abfd);
+  char *stringbase;
+  unsigned int stringsize;
+  unsigned int left;
+  bfd_size_type amt;
+  carsym *set;
+  int i = bfd_bread (nextname, 16, abfd);
+
+  if (i == 0)
+    return TRUE;
+  if (i != 16)
+    return FALSE;
+
+  /* The archive has at least 16 bytes in it.  */
+  if (bfd_seek (abfd, (file_ptr) -16, SEEK_CUR) != 0)
+    return FALSE;
+
+  if (CONST_STRNEQ (nextname, "__.SYMDEF       ")
+      || CONST_STRNEQ (nextname, "__.SYMDEF/      ")) /* Old Linux archives.  */
+    return do_slurp_bsd_armap (abfd);
+
+  if (! CONST_STRNEQ (nextname, "/               "))
+    {
+      bfd_has_map (abfd) = FALSE;
+      return TRUE;
+    }
+
+  mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
+  if (mapdata == NULL)
+    return FALSE;
+
+  if (mapdata->parsed_size < HPUX_SYMDEF_COUNT_SIZE + BSD_STRING_COUNT_SIZE)
+    {
+    wrong_format:
+      bfd_set_error (bfd_error_wrong_format);
+    byebye:
+      bfd_release (abfd, mapdata);
+      return FALSE;
+    }
+  left = mapdata->parsed_size - HPUX_SYMDEF_COUNT_SIZE - BSD_STRING_COUNT_SIZE;
+
+  amt = mapdata->parsed_size;
+  raw_armap = (bfd_byte *) bfd_zalloc (abfd, amt);
+  if (raw_armap == NULL)
+    goto byebye;
+
+  if (bfd_bread (raw_armap, amt, abfd) != amt)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_malformed_archive);
+      goto byebye;
+    }
+
+  ardata->symdef_count = H_GET_16 (abfd, raw_armap);
+
+  ardata->cache = 0;
+
+  stringsize = H_GET_32 (abfd, raw_armap + HPUX_SYMDEF_COUNT_SIZE);
+  if (stringsize > left)
+    goto wrong_format;
+  left -= stringsize;
+
+  /* Skip sym count and string sz.  */
+  stringbase = ((char *) raw_armap
+		+ HPUX_SYMDEF_COUNT_SIZE
+		+ BSD_STRING_COUNT_SIZE);
+  rbase = (bfd_byte *) stringbase + stringsize;
+  amt = ardata->symdef_count * BSD_SYMDEF_SIZE;
+  if (amt > left)
+    goto wrong_format;
+
+  ardata->symdefs = (struct carsym *) bfd_alloc (abfd, amt);
+  if (!ardata->symdefs)
+    return FALSE;
+
+  for (counter = 0, set = ardata->symdefs;
+       counter < ardata->symdef_count;
+       counter++, set++, rbase += BSD_SYMDEF_SIZE)
+    {
+      set->name = H_GET_32 (abfd, rbase) + stringbase;
+      set->file_offset = H_GET_32 (abfd, rbase + BSD_SYMDEF_OFFSET_SIZE);
+    }
+
+  ardata->first_file_filepos = bfd_tell (abfd);
+  /* Pad to an even boundary if you have to.  */
+  ardata->first_file_filepos += (ardata->first_file_filepos) % 2;
+  /* FIXME, we should provide some way to free raw_ardata when
+     we are done using the strings from it.  For now, it seems
+     to be allocated on an objalloc anyway...  */
+  bfd_has_map (abfd) = TRUE;
+  return TRUE;
+}
+
+/** Extended name table.
+
+  Normally archives support only 14-character filenames.
+
+  Intel has extended the format: longer names are stored in a special
+  element (the first in the archive, or second if there is an armap);
+  the name in the ar_hdr is replaced by <space><index into filename
+  element>.  Index is the P.R. of an int (decimal).  Data General have
+  extended the format by using the prefix // for the special element.  */
+
+/* Returns FALSE on error, TRUE otherwise.  */
+
+bfd_boolean
+_bfd_slurp_extended_name_table (bfd *abfd)
+{
+  char nextname[17];
+  struct areltdata *namedata;
+  bfd_size_type amt;
+
+  /* FIXME:  Formatting sucks here, and in case of failure of BFD_READ,
+     we probably don't want to return TRUE.  */
+  if (bfd_seek (abfd, bfd_ardata (abfd)->first_file_filepos, SEEK_SET) != 0)
+    return FALSE;
+
+  if (bfd_bread (nextname, 16, abfd) == 16)
+    {
+      if (bfd_seek (abfd, (file_ptr) -16, SEEK_CUR) != 0)
+	return FALSE;
+
+      if (! CONST_STRNEQ (nextname, "ARFILENAMES/    ")
+	  && ! CONST_STRNEQ (nextname, "//              "))
+	{
+	  bfd_ardata (abfd)->extended_names = NULL;
+	  bfd_ardata (abfd)->extended_names_size = 0;
+	  return TRUE;
+	}
+
+      namedata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
+      if (namedata == NULL)
+	return FALSE;
+
+      amt = namedata->parsed_size;
+      if (amt + 1 == 0)
+        goto byebye;
+
+      bfd_ardata (abfd)->extended_names_size = amt;
+      bfd_ardata (abfd)->extended_names = (char *) bfd_zalloc (abfd, amt + 1);
+      if (bfd_ardata (abfd)->extended_names == NULL)
+	{
+	byebye:
+	  bfd_release (abfd, namedata);
+	  return FALSE;
+	}
+
+      if (bfd_bread (bfd_ardata (abfd)->extended_names, amt, abfd) != amt)
+	{
+	  if (bfd_get_error () != bfd_error_system_call)
+	    bfd_set_error (bfd_error_malformed_archive);
+	  bfd_release (abfd, (bfd_ardata (abfd)->extended_names));
+	  bfd_ardata (abfd)->extended_names = NULL;
+	  goto byebye;
+	}
+
+      /* Since the archive is supposed to be printable if it contains
+	 text, the entries in the list are newline-padded, not null
+	 padded. In SVR4-style archives, the names also have a
+	 trailing '/'.  DOS/NT created archive often have \ in them
+	 We'll fix all problems here..  */
+      {
+        char *ext_names = bfd_ardata (abfd)->extended_names;
+	char *temp = ext_names;
+	char *limit = temp + namedata->parsed_size;
+	for (; temp < limit; ++temp)
+	  {
+	    if (*temp == ARFMAG[1])
+	      temp[temp > ext_names && temp[-1] == '/' ? -1 : 0] = '\0';
+	    if (*temp == '\\')
+	      *temp = '/';
+	  }
+	*limit = '\0';
+      }
+
+      /* Pad to an even boundary if you have to.  */
+      bfd_ardata (abfd)->first_file_filepos = bfd_tell (abfd);
+      bfd_ardata (abfd)->first_file_filepos +=
+	(bfd_ardata (abfd)->first_file_filepos) % 2;
+
+      /* FIXME, we can't release namedata here because it was allocated
+	 below extended_names on the objalloc...  */
+    }
+  return TRUE;
+}
+
+#ifdef VMS
+
+/* Return a copy of the stuff in the filename between any :]> and a
+   semicolon.  */
+
+static const char *
+normalize (bfd *abfd, const char *file)
+{
+  const char *first;
+  const char *last;
+  char *copy;
+
+  first = file + strlen (file) - 1;
+  last = first + 1;
+
+  while (first != file)
+    {
+      if (*first == ';')
+	last = first;
+      if (*first == ':' || *first == ']' || *first == '>')
+	{
+	  first++;
+	  break;
+	}
+      first--;
+    }
+
+  copy = bfd_alloc (abfd, last - first + 1);
+  if (copy == NULL)
+    return NULL;
+
+  memcpy (copy, first, last - first);
+  copy[last - first] = 0;
+
+  return copy;
+}
+
+#else
+static const char *
+normalize (bfd *abfd ATTRIBUTE_UNUSED, const char *file)
+{
+  return lbasename (file);
+}
+#endif
+
+/* Adjust a relative path name based on the reference path.
+   For example:
+
+     Relative path  Reference path  Result
+     -------------  --------------  ------
+     bar.o          lib.a           bar.o
+     foo/bar.o      lib.a           foo/bar.o
+     bar.o          foo/lib.a       ../bar.o
+     foo/bar.o      baz/lib.a       ../foo/bar.o
+     bar.o          ../lib.a        <parent of current dir>/bar.o
+   ; ../bar.o       ../lib.a        bar.o
+   ; ../bar.o       lib.a           ../bar.o
+     foo/bar.o      ../lib.a        <parent of current dir>/foo/bar.o
+     bar.o          ../../lib.a     <grandparent>/<parent>/bar.o
+     bar.o          foo/baz/lib.a   ../../bar.o
+
+   Note - the semicolons above are there to prevent the BFD chew
+   utility from interpreting those lines as prototypes to put into
+   the autogenerated bfd.h header...
+
+   Note - the string is returned in a static buffer.  */
+   
+static const char *
+adjust_relative_path (const char * path, const char * ref_path)
+{
+  static char *pathbuf = NULL;
+  static unsigned int pathbuf_len = 0;
+  const char *pathp;
+  const char *refp;
+  char * lpath;
+  char * rpath;
+  unsigned int len;
+  unsigned int dir_up = 0;
+  unsigned int dir_down = 0;
+  char *newp;
+  char * pwd = getpwd ();
+  const char * down;
+
+  /* Remove symlinks, '.' and '..' from the paths, if possible.  */
+  lpath = lrealpath (path);
+  pathp = lpath == NULL ? path : lpath;
+
+  rpath = lrealpath (ref_path);
+  refp = rpath == NULL ? ref_path : rpath;
+ 
+  /* Remove common leading path elements.  */
+  for (;;)
+    {
+      const char *e1 = pathp;
+      const char *e2 = refp;
+
+      while (*e1 && ! IS_DIR_SEPARATOR (*e1))
+	++e1;
+      while (*e2 && ! IS_DIR_SEPARATOR (*e2))
+	++e2;
+      if (*e1 == '\0' || *e2 == '\0' || e1 - pathp != e2 - refp
+	  || filename_ncmp (pathp, refp, e1 - pathp) != 0)
+	break;
+      pathp = e1 + 1;
+      refp = e2 + 1;
+    }
+
+  len = strlen (pathp) + 1;
+  /* For each leading path element in the reference path,
+     insert "../" into the path.  */
+  for (; *refp; ++refp)
+    if (IS_DIR_SEPARATOR (*refp))
+      {
+	/* PR 12710:  If the path element is "../" then instead of
+	   inserting "../" we need to insert the name of the directory
+	   at the current level.  */	
+	if (refp > ref_path + 1
+	    && refp[-1] == '.'
+	    && refp[-2] == '.')
+	  dir_down ++;
+	else
+	  dir_up ++;
+      }
+
+  /* If the lrealpath calls above succeeded then we should never
+     see dir_up and dir_down both being non-zero.  */
+  
+  len += 3 * dir_up;
+
+  if (dir_down)
+    {
+      down = pwd + strlen (pwd) - 1;
+
+      while (dir_down && down > pwd)
+	{
+	  if (IS_DIR_SEPARATOR (*down))
+	    --dir_down;
+	}
+      BFD_ASSERT (dir_down == 0);
+      len += strlen (down) + 1;
+    }
+  else
+    down = NULL;
+
+  if (len > pathbuf_len)
+    {
+      if (pathbuf != NULL)
+	free (pathbuf);
+      pathbuf_len = 0;
+      pathbuf = (char *) bfd_malloc (len);
+      if (pathbuf == NULL)
+	goto out;
+      pathbuf_len = len;
+    }
+
+  newp = pathbuf;
+  while (dir_up-- > 0)
+    {
+      /* FIXME: Support Windows style path separators as well.  */
+      strcpy (newp, "../");
+      newp += 3;
+    }
+
+  if (down)
+    sprintf (newp, "%s/%s", down, pathp);
+  else
+    strcpy (newp, pathp);
+
+ out:
+  free (lpath);
+  free (rpath);
+  return pathbuf;
+}
+
+/* Build a BFD style extended name table.  */
+
+bfd_boolean
+_bfd_archive_bsd_construct_extended_name_table (bfd *abfd,
+						char **tabloc,
+						bfd_size_type *tablen,
+						const char **name)
+{
+  *name = "ARFILENAMES/";
+  return _bfd_construct_extended_name_table (abfd, FALSE, tabloc, tablen);
+}
+
+/* Build an SVR4 style extended name table.  */
+
+bfd_boolean
+_bfd_archive_coff_construct_extended_name_table (bfd *abfd,
+						 char **tabloc,
+						 bfd_size_type *tablen,
+						 const char **name)
+{
+  *name = "//";
+  return _bfd_construct_extended_name_table (abfd, TRUE, tabloc, tablen);
+}
+
+/* Follows archive_head and produces an extended name table if
+   necessary.  Returns (in tabloc) a pointer to an extended name
+   table, and in tablen the length of the table.  If it makes an entry
+   it clobbers the filename so that the element may be written without
+   further massage.  Returns TRUE if it ran successfully, FALSE if
+   something went wrong.  A successful return may still involve a
+   zero-length tablen!  */
+
+bfd_boolean
+_bfd_construct_extended_name_table (bfd *abfd,
+				    bfd_boolean trailing_slash,
+				    char **tabloc,
+				    bfd_size_type *tablen)
+{
+  unsigned int maxname = ar_maxnamelen (abfd);
+  bfd_size_type total_namelen = 0;
+  bfd *current;
+  char *strptr;
+  const char *last_filename;
+  long last_stroff;
+
+  *tablen = 0;
+  last_filename = NULL;
+
+  /* Figure out how long the table should be.  */
+  for (current = abfd->archive_head;
+       current != NULL;
+       current = current->archive_next)
+    {
+      const char *normal;
+      unsigned int thislen;
+
+      if (bfd_is_thin_archive (abfd))
+        {
+          const char *filename = current->filename;
+
+          /* If the element being added is a member of another archive
+             (i.e., we are flattening), use the containing archive's name.  */
+          if (current->my_archive
+              && ! bfd_is_thin_archive (current->my_archive))
+            filename = current->my_archive->filename;
+
+          /* If the path is the same as the previous path seen,
+             reuse it.  This can happen when flattening a thin
+             archive that contains other archives.  */
+          if (last_filename && filename_cmp (last_filename, filename) == 0)
+            continue;
+
+          last_filename = filename;
+
+          /* If the path is relative, adjust it relative to
+             the containing archive. */
+          if (! IS_ABSOLUTE_PATH (filename)
+              && ! IS_ABSOLUTE_PATH (abfd->filename))
+            normal = adjust_relative_path (filename, abfd->filename);
+          else
+            normal = filename;
+
+          /* In a thin archive, always store the full pathname
+             in the extended name table.  */
+          total_namelen += strlen (normal) + 1;
+	  if (trailing_slash)
+	    /* Leave room for trailing slash.  */
+	    ++total_namelen;
+
+          continue;
+        }
+
+      normal = normalize (current, current->filename);
+      if (normal == NULL)
+	return FALSE;
+
+      thislen = strlen (normal);
+
+      if (thislen > maxname
+	  && (bfd_get_file_flags (abfd) & BFD_TRADITIONAL_FORMAT) != 0)
+	thislen = maxname;
+
+      if (thislen > maxname)
+	{
+	  /* Add one to leave room for \n.  */
+	  total_namelen += thislen + 1;
+	  if (trailing_slash)
+	    {
+	      /* Leave room for trailing slash.  */
+	      ++total_namelen;
+	    }
+	}
+      else
+	{
+	  struct ar_hdr *hdr = arch_hdr (current);
+	  if (filename_ncmp (normal, hdr->ar_name, thislen) != 0
+	      || (thislen < sizeof hdr->ar_name
+		  && hdr->ar_name[thislen] != ar_padchar (current)))
+	    {
+	      /* Must have been using extended format even though it
+	         didn't need to.  Fix it to use normal format.  */
+	      memcpy (hdr->ar_name, normal, thislen);
+	      if (thislen < maxname
+		  || (thislen == maxname && thislen < sizeof hdr->ar_name))
+		hdr->ar_name[thislen] = ar_padchar (current);
+	    }
+	}
+    }
+
+  if (total_namelen == 0)
+    return TRUE;
+
+  *tabloc = (char *) bfd_zalloc (abfd, total_namelen);
+  if (*tabloc == NULL)
+    return FALSE;
+
+  *tablen = total_namelen;
+  strptr = *tabloc;
+
+  last_filename = NULL;
+  last_stroff = 0;
+
+  for (current = abfd->archive_head;
+       current != NULL;
+       current = current->archive_next)
+    {
+      const char *normal;
+      unsigned int thislen;
+      long stroff;
+      const char *filename = current->filename;
+
+      if (bfd_is_thin_archive (abfd))
+        {
+          /* If the element being added is a member of another archive
+             (i.e., we are flattening), use the containing archive's name.  */
+          if (current->my_archive
+              && ! bfd_is_thin_archive (current->my_archive))
+            filename = current->my_archive->filename;
+          /* If the path is the same as the previous path seen,
+             reuse it.  This can happen when flattening a thin
+             archive that contains other archives.
+             If the path is relative, adjust it relative to
+             the containing archive.  */
+          if (last_filename && filename_cmp (last_filename, filename) == 0)
+            normal = last_filename;
+          else if (! IS_ABSOLUTE_PATH (filename)
+                   && ! IS_ABSOLUTE_PATH (abfd->filename))
+            normal = adjust_relative_path (filename, abfd->filename);
+          else
+            normal = filename;
+        }
+      else
+        {
+          normal = normalize (current, filename);
+          if (normal == NULL)
+            return FALSE;
+        }
+
+      thislen = strlen (normal);
+      if (thislen > maxname || bfd_is_thin_archive (abfd))
+	{
+	  /* Works for now; may need to be re-engineered if we
+	     encounter an oddball archive format and want to
+	     generalise this hack.  */
+	  struct ar_hdr *hdr = arch_hdr (current);
+	  if (normal == last_filename)
+	    stroff = last_stroff;
+          else
+            {
+	      strcpy (strptr, normal);
+	      if (! trailing_slash)
+	        strptr[thislen] = ARFMAG[1];
+	      else
+	        {
+	          strptr[thislen] = '/';
+	          strptr[thislen + 1] = ARFMAG[1];
+	        }
+	      stroff = strptr - *tabloc;
+	      last_stroff = stroff;
+	    }
+	  hdr->ar_name[0] = ar_padchar (current);
+	  if (bfd_is_thin_archive (abfd) && current->origin > 0)
+	    {
+	      int len = snprintf (hdr->ar_name + 1, maxname - 1, "%-ld:",
+	                          stroff);
+	      _bfd_ar_spacepad (hdr->ar_name + 1 + len, maxname - 1 - len,
+                                "%-ld",
+                                current->origin - sizeof (struct ar_hdr));
+	    }
+	  else
+            _bfd_ar_spacepad (hdr->ar_name + 1, maxname - 1, "%-ld", stroff);
+          if (normal != last_filename)
+            {
+	      strptr += thislen + 1;
+	      if (trailing_slash)
+	        ++strptr;
+              last_filename = filename;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Do not construct an extended name table but transforms name field into
+   its extended form.  */
+
+bfd_boolean
+_bfd_archive_bsd44_construct_extended_name_table (bfd *abfd,
+                                                  char **tabloc,
+                                                  bfd_size_type *tablen,
+                                                  const char **name)
+{
+  unsigned int maxname = ar_maxnamelen (abfd);
+  bfd *current;
+
+  *tablen = 0;
+  *tabloc = NULL;
+  *name = NULL;
+
+  for (current = abfd->archive_head;
+       current != NULL;
+       current = current->archive_next)
+    {
+      const char *normal = normalize (current, current->filename);
+      int has_space = 0;
+      unsigned int len;
+
+      if (normal == NULL)
+	return FALSE;
+
+      for (len = 0; normal[len]; len++)
+        if (normal[len] == ' ')
+          has_space = 1;
+
+      if (len > maxname || has_space)
+	{
+          struct ar_hdr *hdr = arch_hdr (current);
+
+          len = (len + 3) & ~3;
+          arch_eltdata (current)->extra_size = len;
+          _bfd_ar_spacepad (hdr->ar_name, maxname, "#1/%lu", len);
+	}
+    }
+
+  return TRUE;
+}
+
+/* Write an archive header.  */
+
+bfd_boolean
+_bfd_generic_write_ar_hdr (bfd *archive, bfd *abfd)
+{
+  struct ar_hdr *hdr = arch_hdr (abfd);
+
+  if (bfd_bwrite (hdr, sizeof (*hdr), archive) != sizeof (*hdr))
+    return FALSE;
+  return TRUE;
+}
+
+/* Write an archive header using BSD4.4 convention.  */
+
+bfd_boolean
+_bfd_bsd44_write_ar_hdr (bfd *archive, bfd *abfd)
+{
+  struct ar_hdr *hdr = arch_hdr (abfd);
+
+  if (is_bsd44_extended_name (hdr->ar_name))
+    {
+      /* This is a BSD 4.4 extended name.  */
+      const char *fullname = normalize (abfd, abfd->filename);
+      unsigned int len = strlen (fullname);
+      unsigned int padded_len = (len + 3) & ~3;
+
+      BFD_ASSERT (padded_len == arch_eltdata (abfd)->extra_size);
+
+      _bfd_ar_spacepad (hdr->ar_size, sizeof (hdr->ar_size), "%-10ld",
+                        arch_eltdata (abfd)->parsed_size + padded_len);
+
+      if (bfd_bwrite (hdr, sizeof (*hdr), archive) != sizeof (*hdr))
+        return FALSE;
+
+      if (bfd_bwrite (fullname, len, archive) != len)
+        return FALSE;
+      if (len & 3)
+        {
+          static const char pad[3] = { 0, 0, 0 };
+
+          len = 4 - (len & 3);
+          if (bfd_bwrite (pad, len, archive) != len)
+            return FALSE;
+        }
+    }
+  else
+    {
+      if (bfd_bwrite (hdr, sizeof (*hdr), archive) != sizeof (*hdr))
+        return FALSE;
+    }
+  return TRUE;
+}
+
+/* A couple of functions for creating ar_hdrs.  */
+
+#ifdef HPUX_LARGE_AR_IDS
+/* Function to encode large UID/GID values according to HP.  */
+
+static void
+hpux_uid_gid_encode (char str[6], long int id)
+{
+  int cnt;
+
+  str[5] = '@' + (id & 3);
+  id >>= 2;
+
+  for (cnt = 4; cnt >= 0; --cnt, id >>= 6)
+    str[cnt] = ' ' + (id & 0x3f);
+}
+#endif	/* HPUX_LARGE_AR_IDS */
+
+#ifndef HAVE_GETUID
+#define getuid() 0
+#endif
+
+#ifndef HAVE_GETGID
+#define getgid() 0
+#endif
+
+/* Takes a filename, returns an arelt_data for it, or NULL if it can't
+   make one.  The filename must refer to a filename in the filesystem.
+   The filename field of the ar_hdr will NOT be initialized.  If member
+   is set, and it's an in-memory bfd, we fake it.  */
+
+static struct areltdata *
+bfd_ar_hdr_from_filesystem (bfd *abfd, const char *filename, bfd *member)
+{
+  struct stat status;
+  struct areltdata *ared;
+  struct ar_hdr *hdr;
+  bfd_size_type amt;
+
+  if (member && (member->flags & BFD_IN_MEMORY) != 0)
+    {
+      /* Assume we just "made" the member, and fake it.  */
+      struct bfd_in_memory *bim = (struct bfd_in_memory *) member->iostream;
+      time (&status.st_mtime);
+      status.st_uid = getuid ();
+      status.st_gid = getgid ();
+      status.st_mode = 0644;
+      status.st_size = bim->size;
+    }
+  else if (stat (filename, &status) != 0)
+    {
+      bfd_set_error (bfd_error_system_call);
+      return NULL;
+    }
+
+  /* If the caller requested that the BFD generate deterministic output,
+     fake values for modification time, UID, GID, and file mode.  */
+  if ((abfd->flags & BFD_DETERMINISTIC_OUTPUT) != 0)
+    {
+      status.st_mtime = 0;
+      status.st_uid = 0;
+      status.st_gid = 0;
+      status.st_mode = 0644;
+    }
+
+  amt = sizeof (struct ar_hdr) + sizeof (struct areltdata);
+  ared = (struct areltdata *) bfd_zalloc (abfd, amt);
+  if (ared == NULL)
+    return NULL;
+  hdr = (struct ar_hdr *) (((char *) ared) + sizeof (struct areltdata));
+
+  /* ar headers are space padded, not null padded!  */
+  memset (hdr, ' ', sizeof (struct ar_hdr));
+
+  _bfd_ar_spacepad (hdr->ar_date, sizeof (hdr->ar_date), "%-12ld",
+                    status.st_mtime);
+#ifdef HPUX_LARGE_AR_IDS
+  /* HP has a very "special" way to handle UID/GID's with numeric values
+     > 99999.  */
+  if (status.st_uid > 99999)
+    hpux_uid_gid_encode (hdr->ar_uid, (long) status.st_uid);
+  else
+#endif
+    _bfd_ar_spacepad (hdr->ar_uid, sizeof (hdr->ar_uid), "%ld",
+                      status.st_uid);
+#ifdef HPUX_LARGE_AR_IDS
+  /* HP has a very "special" way to handle UID/GID's with numeric values
+     > 99999.  */
+  if (status.st_gid > 99999)
+    hpux_uid_gid_encode (hdr->ar_gid, (long) status.st_gid);
+  else
+#endif
+    _bfd_ar_spacepad (hdr->ar_gid, sizeof (hdr->ar_gid), "%ld",
+                      status.st_gid);
+  _bfd_ar_spacepad (hdr->ar_mode, sizeof (hdr->ar_mode), "%-8lo",
+                    status.st_mode);
+  _bfd_ar_spacepad (hdr->ar_size, sizeof (hdr->ar_size), "%-10ld",
+                    status.st_size);
+  memcpy (hdr->ar_fmag, ARFMAG, 2);
+  ared->parsed_size = status.st_size;
+  ared->arch_header = (char *) hdr;
+
+  return ared;
+}
+
+/* Analogous to stat call.  */
+
+int
+bfd_generic_stat_arch_elt (bfd *abfd, struct stat *buf)
+{
+  struct ar_hdr *hdr;
+  char *aloser;
+
+  if (abfd->arelt_data == NULL)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return -1;
+    }
+
+  hdr = arch_hdr (abfd);
+
+#define foo(arelt, stelt, size)				\
+  buf->stelt = strtol (hdr->arelt, &aloser, size);	\
+  if (aloser == hdr->arelt)	      			\
+    return -1;
+
+  /* Some platforms support special notations for large IDs.  */
+#ifdef HPUX_LARGE_AR_IDS
+# define foo2(arelt, stelt, size)					\
+  if (hdr->arelt[5] == ' ')						\
+    {									\
+      foo (arelt, stelt, size);						\
+    }									\
+  else									\
+    {									\
+      int cnt;								\
+      for (buf->stelt = cnt = 0; cnt < 5; ++cnt)			\
+	{								\
+	  if (hdr->arelt[cnt] < ' ' || hdr->arelt[cnt] > ' ' + 0x3f)	\
+	    return -1;							\
+	  buf->stelt <<= 6;						\
+	  buf->stelt += hdr->arelt[cnt] - ' ';				\
+	}								\
+      if (hdr->arelt[5] < '@' || hdr->arelt[5] > '@' + 3)		\
+	return -1;							\
+      buf->stelt <<= 2;							\
+      buf->stelt += hdr->arelt[5] - '@';				\
+    }
+#else
+# define foo2(arelt, stelt, size) foo (arelt, stelt, size)
+#endif
+
+  foo (ar_date, st_mtime, 10);
+  foo2 (ar_uid, st_uid, 10);
+  foo2 (ar_gid, st_gid, 10);
+  foo (ar_mode, st_mode, 8);
+
+  buf->st_size = arch_eltdata (abfd)->parsed_size;
+
+  return 0;
+}
+
+void
+bfd_dont_truncate_arname (bfd *abfd, const char *pathname, char *arhdr)
+{
+  /* FIXME: This interacts unpleasantly with ar's quick-append option.
+     Fortunately ic960 users will never use that option.  Fixing this
+     is very hard; fortunately I know how to do it and will do so once
+     intel's release is out the door.  */
+
+  struct ar_hdr *hdr = (struct ar_hdr *) arhdr;
+  size_t length;
+  const char *filename;
+  size_t maxlen = ar_maxnamelen (abfd);
+
+  if ((bfd_get_file_flags (abfd) & BFD_TRADITIONAL_FORMAT) != 0)
+    {
+      bfd_bsd_truncate_arname (abfd, pathname, arhdr);
+      return;
+    }
+
+  filename = normalize (abfd, pathname);
+  if (filename == NULL)
+    {
+      /* FIXME */
+      abort ();
+    }
+
+  length = strlen (filename);
+
+  if (length <= maxlen)
+    memcpy (hdr->ar_name, filename, length);
+
+  /* Add the padding character if there is room for it.  */
+  if (length < maxlen
+      || (length == maxlen && length < sizeof hdr->ar_name))
+    (hdr->ar_name)[length] = ar_padchar (abfd);
+}
+
+void
+bfd_bsd_truncate_arname (bfd *abfd, const char *pathname, char *arhdr)
+{
+  struct ar_hdr *hdr = (struct ar_hdr *) arhdr;
+  size_t length;
+  const char *filename = lbasename (pathname);
+  size_t maxlen = ar_maxnamelen (abfd);
+
+  length = strlen (filename);
+
+  if (length <= maxlen)
+    memcpy (hdr->ar_name, filename, length);
+  else
+    {
+      /* pathname: meet procrustes */
+      memcpy (hdr->ar_name, filename, maxlen);
+      length = maxlen;
+    }
+
+  if (length < maxlen)
+    (hdr->ar_name)[length] = ar_padchar (abfd);
+}
+
+/* Store name into ar header.  Truncates the name to fit.
+   1> strip pathname to be just the basename.
+   2> if it's short enuf to fit, stuff it in.
+   3> If it doesn't end with .o, truncate it to fit
+   4> truncate it before the .o, append .o, stuff THAT in.  */
+
+/* This is what gnu ar does.  It's better but incompatible with the
+   bsd ar.  */
+
+void
+bfd_gnu_truncate_arname (bfd *abfd, const char *pathname, char *arhdr)
+{
+  struct ar_hdr *hdr = (struct ar_hdr *) arhdr;
+  size_t length;
+  const char *filename = lbasename (pathname);
+  size_t maxlen = ar_maxnamelen (abfd);
+
+  length = strlen (filename);
+
+  if (length <= maxlen)
+    memcpy (hdr->ar_name, filename, length);
+  else
+    {
+      /* pathname: meet procrustes.  */
+      memcpy (hdr->ar_name, filename, maxlen);
+      if ((filename[length - 2] == '.') && (filename[length - 1] == 'o'))
+	{
+	  hdr->ar_name[maxlen - 2] = '.';
+	  hdr->ar_name[maxlen - 1] = 'o';
+	}
+      length = maxlen;
+    }
+
+  if (length < 16)
+    (hdr->ar_name)[length] = ar_padchar (abfd);
+}
+
+/* The BFD is open for write and has its format set to bfd_archive.  */
+
+bfd_boolean
+_bfd_write_archive_contents (bfd *arch)
+{
+  bfd *current;
+  char *etable = NULL;
+  bfd_size_type elength = 0;
+  const char *ename = NULL;
+  bfd_boolean makemap = bfd_has_map (arch);
+  /* If no .o's, don't bother to make a map.  */
+  bfd_boolean hasobjects = FALSE;
+  bfd_size_type wrote;
+  int tries;
+  char *armag;
+
+  /* Verify the viability of all entries; if any of them live in the
+     filesystem (as opposed to living in an archive open for input)
+     then construct a fresh ar_hdr for them.  */
+  for (current = arch->archive_head;
+       current != NULL;
+       current = current->archive_next)
+    {
+      /* This check is checking the bfds for the objects we're reading
+	 from (which are usually either an object file or archive on
+	 disk), not the archive entries we're writing to.  We don't
+	 actually create bfds for the archive members, we just copy
+	 them byte-wise when we write out the archive.  */
+      if (bfd_write_p (current))
+	{
+	  bfd_set_error (bfd_error_invalid_operation);
+	  goto input_err;
+	}
+      if (!current->arelt_data)
+	{
+	  current->arelt_data =
+	    bfd_ar_hdr_from_filesystem (arch, current->filename, current);
+	  if (!current->arelt_data)
+	    goto input_err;
+
+	  /* Put in the file name.  */
+	  BFD_SEND (arch, _bfd_truncate_arname,
+		    (arch, current->filename, (char *) arch_hdr (current)));
+	}
+
+      if (makemap && ! hasobjects)
+	{			/* Don't bother if we won't make a map!  */
+	  if ((bfd_check_format (current, bfd_object)))
+	    hasobjects = TRUE;
+	}
+    }
+
+  if (!BFD_SEND (arch, _bfd_construct_extended_name_table,
+		 (arch, &etable, &elength, &ename)))
+    return FALSE;
+
+  if (bfd_seek (arch, (file_ptr) 0, SEEK_SET) != 0)
+    return FALSE;
+  armag = ARMAG;
+  if (bfd_is_thin_archive (arch))
+    armag = ARMAGT;
+  wrote = bfd_bwrite (armag, SARMAG, arch);
+  if (wrote != SARMAG)
+    return FALSE;
+
+  if (makemap && hasobjects)
+    {
+      if (! _bfd_compute_and_write_armap (arch, (unsigned int) elength))
+	return FALSE;
+    }
+
+  if (elength != 0)
+    {
+      struct ar_hdr hdr;
+
+      memset (&hdr, ' ', sizeof (struct ar_hdr));
+      memcpy (hdr.ar_name, ename, strlen (ename));
+      /* Round size up to even number in archive header.  */
+      _bfd_ar_spacepad (hdr.ar_size, sizeof (hdr.ar_size), "%-10ld",
+                        (elength + 1) & ~(bfd_size_type) 1);
+      memcpy (hdr.ar_fmag, ARFMAG, 2);
+      if ((bfd_bwrite (&hdr, sizeof (struct ar_hdr), arch)
+	   != sizeof (struct ar_hdr))
+	  || bfd_bwrite (etable, elength, arch) != elength)
+	return FALSE;
+      if ((elength % 2) == 1)
+	{
+	  if (bfd_bwrite (&ARFMAG[1], 1, arch) != 1)
+	    return FALSE;
+	}
+    }
+
+  for (current = arch->archive_head;
+       current != NULL;
+       current = current->archive_next)
+    {
+      char buffer[DEFAULT_BUFFERSIZE];
+      unsigned int remaining = arelt_size (current);
+
+      /* Write ar header.  */
+      if (!_bfd_write_ar_hdr (arch, current))
+        return FALSE;
+      if (bfd_is_thin_archive (arch))
+        continue;
+      if (bfd_seek (current, (file_ptr) 0, SEEK_SET) != 0)
+	goto input_err;
+
+      while (remaining)
+	{
+	  unsigned int amt = DEFAULT_BUFFERSIZE;
+
+	  if (amt > remaining)
+	    amt = remaining;
+	  errno = 0;
+	  if (bfd_bread (buffer, amt, current) != amt)
+	    {
+	      if (bfd_get_error () != bfd_error_system_call)
+		bfd_set_error (bfd_error_file_truncated);
+	      goto input_err;
+	    }
+	  if (bfd_bwrite (buffer, amt, arch) != amt)
+	    return FALSE;
+	  remaining -= amt;
+	}
+
+      if ((arelt_size (current) % 2) == 1)
+	{
+	  if (bfd_bwrite (&ARFMAG[1], 1, arch) != 1)
+	    return FALSE;
+	}
+    }
+
+  if (makemap && hasobjects)
+    {
+      /* Verify the timestamp in the archive file.  If it would not be
+	 accepted by the linker, rewrite it until it would be.  If
+	 anything odd happens, break out and just return.  (The
+	 Berkeley linker checks the timestamp and refuses to read the
+	 table-of-contents if it is >60 seconds less than the file's
+	 modified-time.  That painful hack requires this painful hack.  */
+      tries = 1;
+      do
+	{
+	  if (bfd_update_armap_timestamp (arch))
+	    break;
+	  (*_bfd_error_handler)
+	    (_("Warning: writing archive was slow: rewriting timestamp\n"));
+	}
+      while (++tries < 6);
+    }
+
+  return TRUE;
+
+ input_err:
+  bfd_set_error (bfd_error_on_input, current, bfd_get_error ());
+  return FALSE;
+}
+
+/* Note that the namidx for the first symbol is 0.  */
+
+bfd_boolean
+_bfd_compute_and_write_armap (bfd *arch, unsigned int elength)
+{
+  char *first_name = NULL;
+  bfd *current;
+  file_ptr elt_no = 0;
+  struct orl *map = NULL;
+  unsigned int orl_max = 1024;		/* Fine initial default.  */
+  unsigned int orl_count = 0;
+  int stridx = 0;
+  asymbol **syms = NULL;
+  long syms_max = 0;
+  bfd_boolean ret;
+  bfd_size_type amt;
+
+  /* Dunno if this is the best place for this info...  */
+  if (elength != 0)
+    elength += sizeof (struct ar_hdr);
+  elength += elength % 2;
+
+  amt = orl_max * sizeof (struct orl);
+  map = (struct orl *) bfd_malloc (amt);
+  if (map == NULL)
+    goto error_return;
+
+  /* We put the symbol names on the arch objalloc, and then discard
+     them when done.  */
+  first_name = (char *) bfd_alloc (arch, 1);
+  if (first_name == NULL)
+    goto error_return;
+
+  /* Drop all the files called __.SYMDEF, we're going to make our own.  */
+  while (arch->archive_head
+	 && strcmp (arch->archive_head->filename, "__.SYMDEF") == 0)
+    arch->archive_head = arch->archive_head->archive_next;
+
+  /* Map over each element.  */
+  for (current = arch->archive_head;
+       current != NULL;
+       current = current->archive_next, elt_no++)
+    {
+      if (bfd_check_format (current, bfd_object)
+	  && (bfd_get_file_flags (current) & HAS_SYMS) != 0)
+	{
+	  long storage;
+	  long symcount;
+	  long src_count;
+
+	  storage = bfd_get_symtab_upper_bound (current);
+	  if (storage < 0)
+	    goto error_return;
+
+	  if (storage != 0)
+	    {
+	      if (storage > syms_max)
+		{
+		  if (syms_max > 0)
+		    free (syms);
+		  syms_max = storage;
+		  syms = (asymbol **) bfd_malloc (syms_max);
+		  if (syms == NULL)
+		    goto error_return;
+		}
+	      symcount = bfd_canonicalize_symtab (current, syms);
+	      if (symcount < 0)
+		goto error_return;
+
+	      /* Now map over all the symbols, picking out the ones we
+                 want.  */
+	      for (src_count = 0; src_count < symcount; src_count++)
+		{
+		  flagword flags = (syms[src_count])->flags;
+		  asection *sec = syms[src_count]->section;
+
+		  if ((flags & BSF_GLOBAL
+		       || flags & BSF_WEAK
+		       || flags & BSF_INDIRECT
+		       || flags & BSF_GNU_UNIQUE
+		       || bfd_is_com_section (sec))
+		      && ! bfd_is_und_section (sec))
+		    {
+		      bfd_size_type namelen;
+		      struct orl *new_map;
+
+		      /* This symbol will go into the archive header.  */
+		      if (orl_count == orl_max)
+			{
+			  orl_max *= 2;
+			  amt = orl_max * sizeof (struct orl);
+			  new_map = (struct orl *) bfd_realloc (map, amt);
+			  if (new_map == NULL)
+			    goto error_return;
+
+			  map = new_map;
+			}
+
+		      namelen = strlen (syms[src_count]->name);
+		      amt = sizeof (char *);
+		      map[orl_count].name = (char **) bfd_alloc (arch, amt);
+		      if (map[orl_count].name == NULL)
+			goto error_return;
+		      *(map[orl_count].name) = (char *) bfd_alloc (arch,
+                                                                   namelen + 1);
+		      if (*(map[orl_count].name) == NULL)
+			goto error_return;
+		      strcpy (*(map[orl_count].name), syms[src_count]->name);
+		      map[orl_count].u.abfd = current;
+		      map[orl_count].namidx = stridx;
+
+		      stridx += namelen + 1;
+		      ++orl_count;
+		    }
+		}
+	    }
+
+	  /* Now ask the BFD to free up any cached information, so we
+	     don't fill all of memory with symbol tables.  */
+	  if (! bfd_free_cached_info (current))
+	    goto error_return;
+	}
+    }
+
+  /* OK, now we have collected all the data, let's write them out.  */
+  ret = BFD_SEND (arch, write_armap,
+		  (arch, elength, map, orl_count, stridx));
+
+  if (syms_max > 0)
+    free (syms);
+  if (map != NULL)
+    free (map);
+  if (first_name != NULL)
+    bfd_release (arch, first_name);
+
+  return ret;
+
+ error_return:
+  if (syms_max > 0)
+    free (syms);
+  if (map != NULL)
+    free (map);
+  if (first_name != NULL)
+    bfd_release (arch, first_name);
+
+  return FALSE;
+}
+
+bfd_boolean
+bsd_write_armap (bfd *arch,
+		 unsigned int elength,
+		 struct orl *map,
+		 unsigned int orl_count,
+		 int stridx)
+{
+  int padit = stridx & 1;
+  unsigned int ranlibsize = orl_count * BSD_SYMDEF_SIZE;
+  unsigned int stringsize = stridx + padit;
+  /* Include 8 bytes to store ranlibsize and stringsize in output.  */
+  unsigned int mapsize = ranlibsize + stringsize + 8;
+  file_ptr firstreal;
+  bfd *current = arch->archive_head;
+  bfd *last_elt = current;	/* Last element arch seen.  */
+  bfd_byte temp[4];
+  unsigned int count;
+  struct ar_hdr hdr;
+  long uid, gid;
+
+  firstreal = mapsize + elength + sizeof (struct ar_hdr) + SARMAG;
+
+  /* If deterministic, we use 0 as the timestamp in the map.
+     Some linkers may require that the archive filesystem modification
+     time is less than (or near to) the archive map timestamp.  Those
+     linkers should not be used with deterministic mode.  (GNU ld and
+     Gold do not have this restriction.)  */
+  bfd_ardata (arch)->armap_timestamp = 0;
+  uid = 0;
+  gid = 0;
+  if ((arch->flags & BFD_DETERMINISTIC_OUTPUT) == 0)
+    {
+      struct stat statbuf;
+
+      if (stat (arch->filename, &statbuf) == 0)
+	bfd_ardata (arch)->armap_timestamp = (statbuf.st_mtime
+					      + ARMAP_TIME_OFFSET);
+      uid = getuid();
+      gid = getgid();
+    }
+
+  memset (&hdr, ' ', sizeof (struct ar_hdr));
+  memcpy (hdr.ar_name, RANLIBMAG, strlen (RANLIBMAG));
+  bfd_ardata (arch)->armap_datepos = (SARMAG
+				      + offsetof (struct ar_hdr, ar_date[0]));
+  _bfd_ar_spacepad (hdr.ar_date, sizeof (hdr.ar_date), "%ld",
+                    bfd_ardata (arch)->armap_timestamp);
+  _bfd_ar_spacepad (hdr.ar_uid, sizeof (hdr.ar_uid), "%ld", uid);
+  _bfd_ar_spacepad (hdr.ar_gid, sizeof (hdr.ar_gid), "%ld", gid);
+  _bfd_ar_spacepad (hdr.ar_size, sizeof (hdr.ar_size), "%-10ld", mapsize);
+  memcpy (hdr.ar_fmag, ARFMAG, 2);
+  if (bfd_bwrite (&hdr, sizeof (struct ar_hdr), arch)
+      != sizeof (struct ar_hdr))
+    return FALSE;
+  H_PUT_32 (arch, ranlibsize, temp);
+  if (bfd_bwrite (temp, sizeof (temp), arch) != sizeof (temp))
+    return FALSE;
+
+  for (count = 0; count < orl_count; count++)
+    {
+      bfd_byte buf[BSD_SYMDEF_SIZE];
+
+      if (map[count].u.abfd != last_elt)
+	{
+	  do
+	    {
+              struct areltdata *ared = arch_eltdata (current);
+
+	      firstreal += (ared->parsed_size + ared->extra_size
+                            + sizeof (struct ar_hdr));
+	      firstreal += firstreal % 2;
+	      current = current->archive_next;
+	    }
+	  while (current != map[count].u.abfd);
+	}
+
+      last_elt = current;
+      H_PUT_32 (arch, map[count].namidx, buf);
+      H_PUT_32 (arch, firstreal, buf + BSD_SYMDEF_OFFSET_SIZE);
+      if (bfd_bwrite (buf, BSD_SYMDEF_SIZE, arch)
+	  != BSD_SYMDEF_SIZE)
+	return FALSE;
+    }
+
+  /* Now write the strings themselves.  */
+  H_PUT_32 (arch, stringsize, temp);
+  if (bfd_bwrite (temp, sizeof (temp), arch) != sizeof (temp))
+    return FALSE;
+  for (count = 0; count < orl_count; count++)
+    {
+      size_t len = strlen (*map[count].name) + 1;
+
+      if (bfd_bwrite (*map[count].name, len, arch) != len)
+	return FALSE;
+    }
+
+  /* The spec sez this should be a newline.  But in order to be
+     bug-compatible for sun's ar we use a null.  */
+  if (padit)
+    {
+      if (bfd_bwrite ("", 1, arch) != 1)
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* At the end of archive file handling, update the timestamp in the
+   file, so the linker will accept it.
+
+   Return TRUE if the timestamp was OK, or an unusual problem happened.
+   Return FALSE if we updated the timestamp.  */
+
+bfd_boolean
+_bfd_archive_bsd_update_armap_timestamp (bfd *arch)
+{
+  struct stat archstat;
+  struct ar_hdr hdr;
+
+  /* If creating deterministic archives, just leave the timestamp as-is.  */
+  if ((arch->flags & BFD_DETERMINISTIC_OUTPUT) != 0)
+    return TRUE;
+
+  /* Flush writes, get last-write timestamp from file, and compare it
+     to the timestamp IN the file.  */
+  bfd_flush (arch);
+  if (bfd_stat (arch, &archstat) == -1)
+    {
+      bfd_perror (_("Reading archive file mod timestamp"));
+
+      /* Can't read mod time for some reason.  */
+      return TRUE;
+    }
+  if (((long) archstat.st_mtime) <= bfd_ardata (arch)->armap_timestamp)
+    /* OK by the linker's rules.  */
+    return TRUE;
+
+  /* Update the timestamp.  */
+  bfd_ardata (arch)->armap_timestamp = archstat.st_mtime + ARMAP_TIME_OFFSET;
+
+  /* Prepare an ASCII version suitable for writing.  */
+  memset (hdr.ar_date, ' ', sizeof (hdr.ar_date));
+  _bfd_ar_spacepad (hdr.ar_date, sizeof (hdr.ar_date), "%ld",
+                    bfd_ardata (arch)->armap_timestamp);
+
+  /* Write it into the file.  */
+  bfd_ardata (arch)->armap_datepos = (SARMAG
+				      + offsetof (struct ar_hdr, ar_date[0]));
+  if (bfd_seek (arch, bfd_ardata (arch)->armap_datepos, SEEK_SET) != 0
+      || (bfd_bwrite (hdr.ar_date, sizeof (hdr.ar_date), arch)
+	  != sizeof (hdr.ar_date)))
+    {
+      bfd_perror (_("Writing updated armap timestamp"));
+
+      /* Some error while writing.  */
+      return TRUE;
+    }
+
+  /* We updated the timestamp successfully.  */
+  return FALSE;
+}
+
+/* A coff armap looks like :
+   lARMAG
+   struct ar_hdr with name = '/'
+   number of symbols
+   offset of file for symbol 0
+   offset of file for symbol 1
+
+   offset of file for symbol n-1
+   symbol name 0
+   symbol name 1
+
+   symbol name n-1  */
+
+bfd_boolean
+coff_write_armap (bfd *arch,
+		  unsigned int elength,
+		  struct orl *map,
+		  unsigned int symbol_count,
+		  int stridx)
+{
+  /* The size of the ranlib is the number of exported symbols in the
+     archive * the number of bytes in an int, + an int for the count.  */
+  unsigned int ranlibsize = (symbol_count * 4) + 4;
+  unsigned int stringsize = stridx;
+  unsigned int mapsize = stringsize + ranlibsize;
+  unsigned int archive_member_file_ptr;
+  bfd *current = arch->archive_head;
+  unsigned int count;
+  struct ar_hdr hdr;
+  int padit = mapsize & 1;
+
+  if (padit)
+    mapsize++;
+
+  /* Work out where the first object file will go in the archive.  */
+  archive_member_file_ptr = (mapsize
+			     + elength
+			     + sizeof (struct ar_hdr)
+			     + SARMAG);
+
+  memset (&hdr, ' ', sizeof (struct ar_hdr));
+  hdr.ar_name[0] = '/';
+  _bfd_ar_spacepad (hdr.ar_size, sizeof (hdr.ar_size), "%-10ld",
+                    mapsize);
+  _bfd_ar_spacepad (hdr.ar_date, sizeof (hdr.ar_date), "%ld",
+                    ((arch->flags & BFD_DETERMINISTIC_OUTPUT) == 0
+                     ? time (NULL) : 0));
+  /* This, at least, is what Intel coff sets the values to.  */
+  _bfd_ar_spacepad (hdr.ar_uid, sizeof (hdr.ar_uid), "%ld", 0);
+  _bfd_ar_spacepad (hdr.ar_gid, sizeof (hdr.ar_gid), "%ld", 0);
+  _bfd_ar_spacepad (hdr.ar_mode, sizeof (hdr.ar_mode), "%-7lo", 0);
+  memcpy (hdr.ar_fmag, ARFMAG, 2);
+
+  /* Write the ar header for this item and the number of symbols.  */
+  if (bfd_bwrite (&hdr, sizeof (struct ar_hdr), arch)
+      != sizeof (struct ar_hdr))
+    return FALSE;
+
+  if (!bfd_write_bigendian_4byte_int (arch, symbol_count))
+    return FALSE;
+
+  /* Two passes, first write the file offsets for each symbol -
+     remembering that each offset is on a two byte boundary.  */
+
+  /* Write out the file offset for the file associated with each
+     symbol, and remember to keep the offsets padded out.  */
+
+  current = arch->archive_head;
+  count = 0;
+  while (current != NULL && count < symbol_count)
+    {
+      /* For each symbol which is used defined in this object, write
+	 out the object file's address in the archive.  */
+
+      while (count < symbol_count && map[count].u.abfd == current)
+	{
+	  if (!bfd_write_bigendian_4byte_int (arch, archive_member_file_ptr))
+	    return FALSE;
+	  count++;
+	}
+      archive_member_file_ptr += sizeof (struct ar_hdr);
+      if (! bfd_is_thin_archive (arch))
+        {
+          /* Add size of this archive entry.  */
+          archive_member_file_ptr += arelt_size (current);
+          /* Remember about the even alignment.  */
+          archive_member_file_ptr += archive_member_file_ptr % 2;
+        }
+      current = current->archive_next;
+    }
+
+  /* Now write the strings themselves.  */
+  for (count = 0; count < symbol_count; count++)
+    {
+      size_t len = strlen (*map[count].name) + 1;
+
+      if (bfd_bwrite (*map[count].name, len, arch) != len)
+	return FALSE;
+    }
+
+  /* The spec sez this should be a newline.  But in order to be
+     bug-compatible for arc960 we use a null.  */
+  if (padit)
+    {
+      if (bfd_bwrite ("", 1, arch) != 1)
+	return FALSE;
+    }
+
+  return TRUE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/archive64.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/archive64.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/archive64.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/archive64.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,239 @@
+/* MIPS-specific support for 64-bit ELF
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007,
+   2010  Free Software Foundation, Inc.
+   Ian Lance Taylor, Cygnus Support
+   Linker support added by Mark Mitchell, CodeSourcery, LLC.
+   <mark@codesourcery.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file supports the 64-bit (MIPS) ELF archives.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "aout/ar.h"
+
+/* Irix 6 defines a 64bit archive map format, so that they can
+   have archives more than 4 GB in size.  */
+
+bfd_boolean bfd_elf64_archive_slurp_armap (bfd *);
+bfd_boolean bfd_elf64_archive_write_armap
+  (bfd *, unsigned int, struct orl *, unsigned int, int);
+
+/* Read an Irix 6 armap.  */
+
+bfd_boolean
+bfd_elf64_archive_slurp_armap (bfd *abfd)
+{
+  struct artdata *ardata = bfd_ardata (abfd);
+  char nextname[17];
+  bfd_size_type i, parsed_size, nsymz, stringsize, carsym_size, ptrsize;
+  struct areltdata *mapdata;
+  bfd_byte int_buf[8];
+  char *stringbase;
+  bfd_byte *raw_armap = NULL;
+  carsym *carsyms;
+  bfd_size_type amt;
+
+  ardata->symdefs = NULL;
+
+  /* Get the name of the first element.  */
+  i = bfd_bread (nextname, 16, abfd);
+  if (i == 0)
+    return TRUE;
+  if (i != 16)
+    return FALSE;
+
+  if (bfd_seek (abfd, (file_ptr) - 16, SEEK_CUR) != 0)
+    return FALSE;
+
+  /* Archives with traditional armaps are still permitted.  */
+  if (CONST_STRNEQ (nextname, "/               "))
+    return bfd_slurp_armap (abfd);
+
+  if (! CONST_STRNEQ (nextname, "/SYM64/         "))
+    {
+      bfd_has_map (abfd) = FALSE;
+      return TRUE;
+    }
+
+  mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
+  if (mapdata == NULL)
+    return FALSE;
+  parsed_size = mapdata->parsed_size;
+  bfd_release (abfd, mapdata);
+
+  if (bfd_bread (int_buf, 8, abfd) != 8)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_malformed_archive);
+      return FALSE;
+    }
+
+  nsymz = bfd_getb64 (int_buf);
+  stringsize = parsed_size - 8 * nsymz - 8;
+
+  carsym_size = nsymz * sizeof (carsym);
+  ptrsize = 8 * nsymz;
+
+  amt = carsym_size + stringsize + 1;
+  ardata->symdefs = (struct carsym *) bfd_zalloc (abfd, amt);
+  if (ardata->symdefs == NULL)
+    return FALSE;
+  carsyms = ardata->symdefs;
+  stringbase = ((char *) ardata->symdefs) + carsym_size;
+
+  raw_armap = (bfd_byte *) bfd_alloc (abfd, ptrsize);
+  if (raw_armap == NULL)
+    goto release_symdefs;
+
+  if (bfd_bread (raw_armap, ptrsize, abfd) != ptrsize
+      || bfd_bread (stringbase, stringsize, abfd) != stringsize)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_malformed_archive);
+      goto release_raw_armap;
+    }
+
+  for (i = 0; i < nsymz; i++)
+    {
+      carsyms->file_offset = bfd_getb64 (raw_armap + i * 8);
+      carsyms->name = stringbase;
+      stringbase += strlen (stringbase) + 1;
+      ++carsyms;
+    }
+  *stringbase = '\0';
+
+  ardata->symdef_count = nsymz;
+  ardata->first_file_filepos = bfd_tell (abfd);
+  /* Pad to an even boundary if you have to.  */
+  ardata->first_file_filepos += (ardata->first_file_filepos) % 2;
+
+  bfd_has_map (abfd) = TRUE;
+  bfd_release (abfd, raw_armap);
+
+  return TRUE;
+
+release_raw_armap:
+  bfd_release (abfd, raw_armap);
+release_symdefs:
+  bfd_release (abfd, ardata->symdefs);
+  return FALSE;
+}
+
+/* Write out an Irix 6 armap.  The Irix 6 tools are supposed to be
+   able to handle ordinary ELF armaps, but at least on Irix 6.2 the
+   linker crashes.  */
+
+bfd_boolean
+bfd_elf64_archive_write_armap (bfd *arch,
+			       unsigned int elength,
+			       struct orl *map,
+			       unsigned int symbol_count,
+			       int stridx)
+{
+  unsigned int ranlibsize = (symbol_count * 8) + 8;
+  unsigned int stringsize = stridx;
+  unsigned int mapsize = stringsize + ranlibsize;
+  file_ptr archive_member_file_ptr;
+  bfd *current = arch->archive_head;
+  unsigned int count;
+  struct ar_hdr hdr;
+  int padding;
+  bfd_byte buf[8];
+
+  padding = BFD_ALIGN (mapsize, 8) - mapsize;
+  mapsize += padding;
+
+  /* work out where the first object file will go in the archive */
+  archive_member_file_ptr = (mapsize
+			     + elength
+			     + sizeof (struct ar_hdr)
+			     + SARMAG);
+
+  memset (&hdr, ' ', sizeof (struct ar_hdr));
+  memcpy (hdr.ar_name, "/SYM64/", strlen ("/SYM64/"));
+  _bfd_ar_spacepad (hdr.ar_size, sizeof (hdr.ar_size), "%-10ld",
+                    mapsize);
+  _bfd_ar_spacepad (hdr.ar_date, sizeof (hdr.ar_date), "%ld",
+                    time (NULL));
+  /* This, at least, is what Intel coff sets the values to.: */
+  _bfd_ar_spacepad (hdr.ar_uid, sizeof (hdr.ar_uid), "%ld", 0);
+  _bfd_ar_spacepad (hdr.ar_gid, sizeof (hdr.ar_gid), "%ld", 0);
+  _bfd_ar_spacepad (hdr.ar_mode, sizeof (hdr.ar_mode), "%-7lo", 0);
+  memcpy (hdr.ar_fmag, ARFMAG, 2);
+
+  /* Write the ar header for this item and the number of symbols */
+
+  if (bfd_bwrite (&hdr, sizeof (struct ar_hdr), arch)
+      != sizeof (struct ar_hdr))
+    return FALSE;
+
+  bfd_putb64 ((bfd_vma) symbol_count, buf);
+  if (bfd_bwrite (buf, 8, arch) != 8)
+    return FALSE;
+
+  /* Two passes, first write the file offsets for each symbol -
+     remembering that each offset is on a two byte boundary.  */
+
+  /* Write out the file offset for the file associated with each
+     symbol, and remember to keep the offsets padded out.  */
+  count = 0;
+  for (current = arch->archive_head;
+       current != NULL && count < symbol_count;
+       current = current->archive_next)
+    {
+      /* For each symbol which is used defined in this object, write out
+	 the object file's address in the archive */
+
+      for (;
+	   count < symbol_count && map[count].u.abfd == current;
+	   count++)
+	{
+	  bfd_putb64 ((bfd_vma) archive_member_file_ptr, buf);
+	  if (bfd_bwrite (buf, 8, arch) != 8)
+	    return FALSE;
+	}
+      /* Add size of this archive entry */
+      archive_member_file_ptr += (arelt_size (current)
+				  + sizeof (struct ar_hdr));
+      /* remember about the even alignment */
+      archive_member_file_ptr += archive_member_file_ptr % 2;
+    }
+
+  /* now write the strings themselves */
+  for (count = 0; count < symbol_count; count++)
+    {
+      size_t len = strlen (*map[count].name) + 1;
+
+      if (bfd_bwrite (*map[count].name, len, arch) != len)
+	return FALSE;
+    }
+
+  /* The spec says that this should be padded to an 8 byte boundary.
+     However, the Irix 6.2 tools do not appear to do this.  */
+  while (padding != 0)
+    {
+      if (bfd_bwrite ("", 1, arch) != 1)
+	return FALSE;
+      --padding;
+    }
+
+  return TRUE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/archures.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/archures.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/archures.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/archures.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1300 @@
+/* BFD library support routines for architectures.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Hacked by John Gilmore and Steve Chamberlain of Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "safe-ctype.h"
+
+/*
+
+SECTION
+	Architectures
+
+	BFD keeps one atom in a BFD describing the
+	architecture of the data attached to the BFD: a pointer to a
+	<<bfd_arch_info_type>>.
+
+	Pointers to structures can be requested independently of a BFD
+	so that an architecture's information can be interrogated
+	without access to an open BFD.
+
+	The architecture information is provided by each architecture package.
+	The set of default architectures is selected by the macro
+	<<SELECT_ARCHITECTURES>>.  This is normally set up in the
+	@file{config/@var{target}.mt} file of your choice.  If the name is not
+	defined, then all the architectures supported are included.
+
+	When BFD starts up, all the architectures are called with an
+	initialize method.  It is up to the architecture back end to
+	insert as many items into the list of architectures as it wants to;
+	generally this would be one for each machine and one for the
+	default case (an item with a machine field of 0).
+
+	BFD's idea of an architecture is implemented in	@file{archures.c}.
+*/
+
+/*
+
+SUBSECTION
+	bfd_architecture
+
+DESCRIPTION
+	This enum gives the object file's CPU architecture, in a
+	global sense---i.e., what processor family does it belong to?
+	Another field indicates which processor within
+	the family is in use.  The machine gives a number which
+	distinguishes different versions of the architecture,
+	containing, for example, 2 and 3 for Intel i960 KA and i960 KB,
+	and 68020 and 68030 for Motorola 68020 and 68030.
+
+.enum bfd_architecture
+.{
+.  bfd_arch_unknown,   {* File arch not known.  *}
+.  bfd_arch_obscure,   {* Arch known, not one of these.  *}
+.  bfd_arch_m68k,      {* Motorola 68xxx *}
+.#define bfd_mach_m68000 1
+.#define bfd_mach_m68008 2
+.#define bfd_mach_m68010 3
+.#define bfd_mach_m68020 4
+.#define bfd_mach_m68030 5
+.#define bfd_mach_m68040 6
+.#define bfd_mach_m68060 7
+.#define bfd_mach_cpu32  8
+.#define bfd_mach_fido   9
+.#define bfd_mach_mcf_isa_a_nodiv 10
+.#define bfd_mach_mcf_isa_a 11
+.#define bfd_mach_mcf_isa_a_mac 12
+.#define bfd_mach_mcf_isa_a_emac 13
+.#define bfd_mach_mcf_isa_aplus 14
+.#define bfd_mach_mcf_isa_aplus_mac 15
+.#define bfd_mach_mcf_isa_aplus_emac 16
+.#define bfd_mach_mcf_isa_b_nousp 17
+.#define bfd_mach_mcf_isa_b_nousp_mac 18
+.#define bfd_mach_mcf_isa_b_nousp_emac 19
+.#define bfd_mach_mcf_isa_b 20
+.#define bfd_mach_mcf_isa_b_mac 21
+.#define bfd_mach_mcf_isa_b_emac 22
+.#define bfd_mach_mcf_isa_b_float 23
+.#define bfd_mach_mcf_isa_b_float_mac 24
+.#define bfd_mach_mcf_isa_b_float_emac 25
+.#define bfd_mach_mcf_isa_c 26
+.#define bfd_mach_mcf_isa_c_mac 27
+.#define bfd_mach_mcf_isa_c_emac 28
+.#define bfd_mach_mcf_isa_c_nodiv 29
+.#define bfd_mach_mcf_isa_c_nodiv_mac 30
+.#define bfd_mach_mcf_isa_c_nodiv_emac 31
+.  bfd_arch_vax,       {* DEC Vax *}
+.  bfd_arch_i960,      {* Intel 960 *}
+.    {* The order of the following is important.
+.       lower number indicates a machine type that
+.       only accepts a subset of the instructions
+.       available to machines with higher numbers.
+.       The exception is the "ca", which is
+.       incompatible with all other machines except
+.       "core".  *}
+.
+.#define bfd_mach_i960_core      1
+.#define bfd_mach_i960_ka_sa     2
+.#define bfd_mach_i960_kb_sb     3
+.#define bfd_mach_i960_mc        4
+.#define bfd_mach_i960_xa        5
+.#define bfd_mach_i960_ca        6
+.#define bfd_mach_i960_jx	 7
+.#define bfd_mach_i960_hx        8
+.
+.  bfd_arch_or32,      {* OpenRISC 32 *}
+.
+.  bfd_arch_sparc,     {* SPARC *}
+.#define bfd_mach_sparc			1
+.{* The difference between v8plus and v9 is that v9 is a true 64 bit env.  *}
+.#define bfd_mach_sparc_sparclet	2
+.#define bfd_mach_sparc_sparclite	3
+.#define bfd_mach_sparc_v8plus		4
+.#define bfd_mach_sparc_v8plusa		5 {* with ultrasparc add'ns.  *}
+.#define bfd_mach_sparc_sparclite_le	6
+.#define bfd_mach_sparc_v9		7
+.#define bfd_mach_sparc_v9a		8 {* with ultrasparc add'ns.  *}
+.#define bfd_mach_sparc_v8plusb		9 {* with cheetah add'ns.  *}
+.#define bfd_mach_sparc_v9b		10 {* with cheetah add'ns.  *}
+.{* Nonzero if MACH has the v9 instruction set.  *}
+.#define bfd_mach_sparc_v9_p(mach) \
+.  ((mach) >= bfd_mach_sparc_v8plus && (mach) <= bfd_mach_sparc_v9b \
+.   && (mach) != bfd_mach_sparc_sparclite_le)
+.{* Nonzero if MACH is a 64 bit sparc architecture.  *}
+.#define bfd_mach_sparc_64bit_p(mach) \
+.  ((mach) >= bfd_mach_sparc_v9 && (mach) != bfd_mach_sparc_v8plusb)
+.  bfd_arch_spu,       {* PowerPC SPU *}
+.#define bfd_mach_spu		256 
+.  bfd_arch_mips,      {* MIPS Rxxxx *}
+.#define bfd_mach_mips3000		3000
+.#define bfd_mach_mips3900		3900
+.#define bfd_mach_mips4000		4000
+.#define bfd_mach_mips4010		4010
+.#define bfd_mach_mips4100		4100
+.#define bfd_mach_mips4111		4111
+.#define bfd_mach_mips4120		4120
+.#define bfd_mach_mips4300		4300
+.#define bfd_mach_mips4400		4400
+.#define bfd_mach_mips4600		4600
+.#define bfd_mach_mips4650		4650
+.#define bfd_mach_mips5000		5000
+.#define bfd_mach_mips5400		5400
+.#define bfd_mach_mips5500		5500
+.#define bfd_mach_mips6000		6000
+.#define bfd_mach_mips7000		7000
+.#define bfd_mach_mips8000		8000
+.#define bfd_mach_mips9000		9000
+.#define bfd_mach_mips10000		10000
+.#define bfd_mach_mips12000		12000
+.#define bfd_mach_mips14000		14000
+.#define bfd_mach_mips16000		16000
+.#define bfd_mach_mips16		16
+.#define bfd_mach_mips5                 5
+.#define bfd_mach_mips_loongson_2e      3001
+.#define bfd_mach_mips_loongson_2f      3002
+.#define bfd_mach_mips_loongson_3a      3003
+.#define bfd_mach_mips_sb1              12310201 {* octal 'SB', 01 *}
+.#define bfd_mach_mips_octeon		6501
+.#define bfd_mach_mips_xlr              887682   {* decimal 'XLR'  *}
+.#define bfd_mach_mipsisa32             32
+.#define bfd_mach_mipsisa32r2           33
+.#define bfd_mach_mipsisa64             64
+.#define bfd_mach_mipsisa64r2           65
+.#define bfd_mach_mips_micromips        96
+.  bfd_arch_i386,      {* Intel 386 *}
+.#define bfd_mach_i386_intel_syntax	(1 << 0)
+.#define bfd_mach_i386_i8086		(1 << 1)
+.#define bfd_mach_i386_i386		(1 << 2)
+.#define bfd_mach_x86_64		(1 << 3)
+.#define bfd_mach_x64_32		(1 << 4)
+.#define bfd_mach_i386_i386_intel_syntax (bfd_mach_i386_i386 | bfd_mach_i386_intel_syntax)
+.#define bfd_mach_x86_64_intel_syntax	(bfd_mach_x86_64 | bfd_mach_i386_intel_syntax)
+.#define bfd_mach_x64_32_intel_syntax	(bfd_mach_x64_32 | bfd_mach_i386_intel_syntax)
+.  bfd_arch_l1om,   {* Intel L1OM *}
+.#define bfd_mach_l1om			(1 << 5)
+.#define bfd_mach_l1om_intel_syntax	(bfd_mach_l1om | bfd_mach_i386_intel_syntax)
+.  bfd_arch_k1om,   {* Intel K1OM *}
+.#define bfd_mach_k1om			(1 << 6)
+.#define bfd_mach_k1om_intel_syntax	(bfd_mach_k1om | bfd_mach_i386_intel_syntax)
+.  bfd_arch_we32k,     {* AT&T WE32xxx *}
+.  bfd_arch_tahoe,     {* CCI/Harris Tahoe *}
+.  bfd_arch_i860,      {* Intel 860 *}
+.  bfd_arch_i370,      {* IBM 360/370 Mainframes *}
+.  bfd_arch_romp,      {* IBM ROMP PC/RT *}
+.  bfd_arch_convex,    {* Convex *}
+.  bfd_arch_m88k,      {* Motorola 88xxx *}
+.  bfd_arch_m98k,      {* Motorola 98xxx *}
+.  bfd_arch_pyramid,   {* Pyramid Technology *}
+.  bfd_arch_h8300,     {* Renesas H8/300 (formerly Hitachi H8/300) *}
+.#define bfd_mach_h8300    1
+.#define bfd_mach_h8300h   2
+.#define bfd_mach_h8300s   3
+.#define bfd_mach_h8300hn  4
+.#define bfd_mach_h8300sn  5
+.#define bfd_mach_h8300sx  6
+.#define bfd_mach_h8300sxn 7
+.  bfd_arch_pdp11,     {* DEC PDP-11 *}
+.  bfd_arch_plugin,
+.  bfd_arch_powerpc,   {* PowerPC *}
+.#define bfd_mach_ppc		32
+.#define bfd_mach_ppc64		64
+.#define bfd_mach_ppc_403	403
+.#define bfd_mach_ppc_403gc	4030
+.#define bfd_mach_ppc_405	405
+.#define bfd_mach_ppc_505	505
+.#define bfd_mach_ppc_601	601
+.#define bfd_mach_ppc_602	602
+.#define bfd_mach_ppc_603	603
+.#define bfd_mach_ppc_ec603e	6031
+.#define bfd_mach_ppc_604	604
+.#define bfd_mach_ppc_620	620
+.#define bfd_mach_ppc_630	630
+.#define bfd_mach_ppc_750	750
+.#define bfd_mach_ppc_860	860
+.#define bfd_mach_ppc_a35	35
+.#define bfd_mach_ppc_rs64ii	642
+.#define bfd_mach_ppc_rs64iii	643
+.#define bfd_mach_ppc_7400	7400
+.#define bfd_mach_ppc_e500      500
+.#define bfd_mach_ppc_e500mc    5001
+.#define bfd_mach_ppc_e500mc64  5005
+.#define bfd_mach_ppc_titan     83
+.  bfd_arch_rs6000,    {* IBM RS/6000 *}
+.#define bfd_mach_rs6k		6000
+.#define bfd_mach_rs6k_rs1	6001
+.#define bfd_mach_rs6k_rsc	6003
+.#define bfd_mach_rs6k_rs2	6002
+.  bfd_arch_hppa,      {* HP PA RISC *}
+.#define bfd_mach_hppa10	10
+.#define bfd_mach_hppa11	11
+.#define bfd_mach_hppa20	20
+.#define bfd_mach_hppa20w	25
+.  bfd_arch_d10v,      {* Mitsubishi D10V *}
+.#define bfd_mach_d10v		1
+.#define bfd_mach_d10v_ts2	2
+.#define bfd_mach_d10v_ts3	3
+.  bfd_arch_d30v,      {* Mitsubishi D30V *}
+.  bfd_arch_dlx,       {* DLX *}
+.  bfd_arch_m68hc11,   {* Motorola 68HC11 *}
+.  bfd_arch_m68hc12,   {* Motorola 68HC12 *}
+.#define bfd_mach_m6812_default 0
+.#define bfd_mach_m6812         1
+.#define bfd_mach_m6812s        2
+.  bfd_arch_z8k,       {* Zilog Z8000 *}
+.#define bfd_mach_z8001		1
+.#define bfd_mach_z8002		2
+.  bfd_arch_h8500,     {* Renesas H8/500 (formerly Hitachi H8/500) *}
+.  bfd_arch_sh,        {* Renesas / SuperH SH (formerly Hitachi SH) *}
+.#define bfd_mach_sh            1
+.#define bfd_mach_sh2        0x20
+.#define bfd_mach_sh_dsp     0x2d
+.#define bfd_mach_sh2a       0x2a
+.#define bfd_mach_sh2a_nofpu 0x2b
+.#define bfd_mach_sh2a_nofpu_or_sh4_nommu_nofpu 0x2a1
+.#define bfd_mach_sh2a_nofpu_or_sh3_nommu 0x2a2
+.#define bfd_mach_sh2a_or_sh4  0x2a3
+.#define bfd_mach_sh2a_or_sh3e 0x2a4
+.#define bfd_mach_sh2e       0x2e
+.#define bfd_mach_sh3        0x30
+.#define bfd_mach_sh3_nommu  0x31
+.#define bfd_mach_sh3_dsp    0x3d
+.#define bfd_mach_sh3e       0x3e
+.#define bfd_mach_sh4        0x40
+.#define bfd_mach_sh4_nofpu  0x41
+.#define bfd_mach_sh4_nommu_nofpu  0x42
+.#define bfd_mach_sh4a       0x4a
+.#define bfd_mach_sh4a_nofpu 0x4b
+.#define bfd_mach_sh4al_dsp  0x4d
+.#define bfd_mach_sh5        0x50
+.  bfd_arch_alpha,     {* Dec Alpha *}
+.#define bfd_mach_alpha_ev4  0x10
+.#define bfd_mach_alpha_ev5  0x20
+.#define bfd_mach_alpha_ev6  0x30
+.  bfd_arch_arm,       {* Advanced Risc Machines ARM.  *}
+.#define bfd_mach_arm_unknown	0
+.#define bfd_mach_arm_2		1
+.#define bfd_mach_arm_2a	2
+.#define bfd_mach_arm_3		3
+.#define bfd_mach_arm_3M 	4
+.#define bfd_mach_arm_4 	5
+.#define bfd_mach_arm_4T 	6
+.#define bfd_mach_arm_5 	7
+.#define bfd_mach_arm_5T	8
+.#define bfd_mach_arm_5TE	9
+.#define bfd_mach_arm_XScale	10
+.#define bfd_mach_arm_ep9312	11
+.#define bfd_mach_arm_iWMMXt	12
+.#define bfd_mach_arm_iWMMXt2	13
+.  bfd_arch_ns32k,     {* National Semiconductors ns32000 *}
+.  bfd_arch_w65,       {* WDC 65816 *}
+.  bfd_arch_tic30,     {* Texas Instruments TMS320C30 *}
+.  bfd_arch_tic4x,     {* Texas Instruments TMS320C3X/4X *}
+.#define bfd_mach_tic3x         30
+.#define bfd_mach_tic4x         40
+.  bfd_arch_tic54x,    {* Texas Instruments TMS320C54X *}
+.  bfd_arch_tic6x,     {* Texas Instruments TMS320C6X *}
+.  bfd_arch_tic80,     {* TI TMS320c80 (MVP) *}
+.  bfd_arch_v850,      {* NEC V850 *}
+.#define bfd_mach_v850          1
+.#define bfd_mach_v850e 	'E'
+.#define bfd_mach_v850e1        '1'
+.#define bfd_mach_v850e2        0x4532
+.#define bfd_mach_v850e2v3      0x45325633
+.  bfd_arch_arc,       {* ARC Cores *}
+.#define bfd_mach_arc_5         5
+.#define bfd_mach_arc_6         6
+.#define bfd_mach_arc_7         7
+.#define bfd_mach_arc_8         8
+. bfd_arch_m32c,     {* Renesas M16C/M32C.  *}
+.#define bfd_mach_m16c        0x75
+.#define bfd_mach_m32c        0x78
+.  bfd_arch_m32r,      {* Renesas M32R (formerly Mitsubishi M32R/D) *}
+.#define bfd_mach_m32r		1 {* For backwards compatibility.  *}
+.#define bfd_mach_m32rx		'x'
+.#define bfd_mach_m32r2		'2'
+.  bfd_arch_mn10200,   {* Matsushita MN10200 *}
+.  bfd_arch_mn10300,   {* Matsushita MN10300 *}
+.#define bfd_mach_mn10300		300
+.#define bfd_mach_am33		330
+.#define bfd_mach_am33_2	332
+.  bfd_arch_fr30,
+.#define bfd_mach_fr30		0x46523330
+.  bfd_arch_frv,
+.#define bfd_mach_frv		1
+.#define bfd_mach_frvsimple	2
+.#define bfd_mach_fr300		300
+.#define bfd_mach_fr400		400
+.#define bfd_mach_fr450		450
+.#define bfd_mach_frvtomcat	499	{* fr500 prototype *}
+.#define bfd_mach_fr500		500
+.#define bfd_mach_fr550		550
+.  bfd_arch_moxie,       {* The moxie processor *}
+.#define bfd_mach_moxie		1
+.  bfd_arch_mcore,
+.  bfd_arch_mep,
+.#define bfd_mach_mep		1
+.#define bfd_mach_mep_h1	0x6831
+.#define bfd_mach_mep_c5	0x6335
+.  bfd_arch_ia64,      {* HP/Intel ia64 *}
+.#define bfd_mach_ia64_elf64	64
+.#define bfd_mach_ia64_elf32	32
+.  bfd_arch_ip2k,      {* Ubicom IP2K microcontrollers. *}
+.#define bfd_mach_ip2022	1
+.#define bfd_mach_ip2022ext	2
+. bfd_arch_iq2000,     {* Vitesse IQ2000.  *}
+.#define bfd_mach_iq2000        1
+.#define bfd_mach_iq10          2
+.  bfd_arch_mt,
+.#define bfd_mach_ms1           1
+.#define bfd_mach_mrisc2        2
+.#define bfd_mach_ms2           3
+.  bfd_arch_pj,
+.  bfd_arch_avr,       {* Atmel AVR microcontrollers.  *}
+.#define bfd_mach_avr1		1
+.#define bfd_mach_avr2		2
+.#define bfd_mach_avr25		25
+.#define bfd_mach_avr3		3
+.#define bfd_mach_avr31		31
+.#define bfd_mach_avr35		35
+.#define bfd_mach_avr4		4
+.#define bfd_mach_avr5		5
+.#define bfd_mach_avr51		51
+.#define bfd_mach_avr6		6
+.#define bfd_mach_avrxmega1 101
+.#define bfd_mach_avrxmega2 102
+.#define bfd_mach_avrxmega3 103
+.#define bfd_mach_avrxmega4 104
+.#define bfd_mach_avrxmega5 105
+.#define bfd_mach_avrxmega6 106
+.#define bfd_mach_avrxmega7 107
+.  bfd_arch_bfin,        {* ADI Blackfin *}
+.#define bfd_mach_bfin          1
+.  bfd_arch_cr16,       {* National Semiconductor CompactRISC (ie CR16). *}
+.#define bfd_mach_cr16		1
+.  bfd_arch_cr16c,       {* National Semiconductor CompactRISC. *}
+.#define bfd_mach_cr16c		1
+.  bfd_arch_crx,       {*  National Semiconductor CRX.  *}
+.#define bfd_mach_crx		1
+.  bfd_arch_cris,      {* Axis CRIS *}
+.#define bfd_mach_cris_v0_v10	255
+.#define bfd_mach_cris_v32	32
+.#define bfd_mach_cris_v10_v32	1032
+.  bfd_arch_rx,        {* Renesas RX.  *}
+.#define bfd_mach_rx            0x75
+.  bfd_arch_s390,      {* IBM s390 *}
+.#define bfd_mach_s390_31       31
+.#define bfd_mach_s390_64       64
+.  bfd_arch_score,     {* Sunplus score *} 
+.#define bfd_mach_score3         3
+.#define bfd_mach_score7         7
+.  bfd_arch_openrisc,  {* OpenRISC *}
+.  bfd_arch_mmix,      {* Donald Knuth's educational processor.  *}
+.  bfd_arch_xstormy16,
+.#define bfd_mach_xstormy16	1
+.  bfd_arch_msp430,    {* Texas Instruments MSP430 architecture.  *}
+.#define bfd_mach_msp11          11
+.#define bfd_mach_msp110         110
+.#define bfd_mach_msp12          12
+.#define bfd_mach_msp13          13
+.#define bfd_mach_msp14          14
+.#define bfd_mach_msp15          15
+.#define bfd_mach_msp16          16
+.#define bfd_mach_msp21          21
+.#define bfd_mach_msp31          31
+.#define bfd_mach_msp32          32
+.#define bfd_mach_msp33          33
+.#define bfd_mach_msp41          41
+.#define bfd_mach_msp42          42
+.#define bfd_mach_msp43          43
+.#define bfd_mach_msp44          44
+.  bfd_arch_xc16x,     {* Infineon's XC16X Series.               *}
+.#define bfd_mach_xc16x         1
+.#define bfd_mach_xc16xl        2
+.#define bfd_mach_xc16xs         3
+.  bfd_arch_xtensa,    {* Tensilica's Xtensa cores.  *}
+.#define bfd_mach_xtensa	1
+.  bfd_arch_z80,
+.#define bfd_mach_z80strict      1 {* No undocumented opcodes.  *}
+.#define bfd_mach_z80            3 {* With ixl, ixh, iyl, and iyh.  *}
+.#define bfd_mach_z80full        7 {* All undocumented instructions.  *}
+.#define bfd_mach_r800           11 {* R800: successor with multiplication.  *}
+.  bfd_arch_lm32,      {* Lattice Mico32 *}
+.#define bfd_mach_lm32      1
+.  bfd_arch_microblaze,{* Xilinx MicroBlaze. *}
+.  bfd_arch_tilepro,   {* Tilera TILEPro *}
+.  bfd_arch_tilegx, {* Tilera TILE-Gx *}
+.#define bfd_mach_tilepro   1
+.#define bfd_mach_tilegx    1
+.  bfd_arch_last
+.  };
+*/
+
+/*
+SUBSECTION
+	bfd_arch_info
+
+DESCRIPTION
+	This structure contains information on architectures for use
+	within BFD.
+
+.
+.typedef struct bfd_arch_info
+.{
+.  int bits_per_word;
+.  int bits_per_address;
+.  int bits_per_byte;
+.  enum bfd_architecture arch;
+.  unsigned long mach;
+.  const char *arch_name;
+.  const char *printable_name;
+.  unsigned int section_align_power;
+.  {* TRUE if this is the default machine for the architecture.
+.     The default arch should be the first entry for an arch so that
+.     all the entries for that arch can be accessed via <<next>>.  *}
+.  bfd_boolean the_default;
+.  const struct bfd_arch_info * (*compatible)
+.    (const struct bfd_arch_info *a, const struct bfd_arch_info *b);
+.
+.  bfd_boolean (*scan) (const struct bfd_arch_info *, const char *);
+.
+.  const struct bfd_arch_info *next;
+.}
+.bfd_arch_info_type;
+.
+*/
+
+extern const bfd_arch_info_type bfd_alpha_arch;
+extern const bfd_arch_info_type bfd_arc_arch;
+extern const bfd_arch_info_type bfd_arm_arch;
+extern const bfd_arch_info_type bfd_avr_arch;
+extern const bfd_arch_info_type bfd_bfin_arch;
+extern const bfd_arch_info_type bfd_cr16_arch;
+extern const bfd_arch_info_type bfd_cr16c_arch;
+extern const bfd_arch_info_type bfd_cris_arch;
+extern const bfd_arch_info_type bfd_crx_arch;
+extern const bfd_arch_info_type bfd_d10v_arch;
+extern const bfd_arch_info_type bfd_d30v_arch;
+extern const bfd_arch_info_type bfd_dlx_arch;
+extern const bfd_arch_info_type bfd_fr30_arch;
+extern const bfd_arch_info_type bfd_frv_arch;
+extern const bfd_arch_info_type bfd_h8300_arch;
+extern const bfd_arch_info_type bfd_h8500_arch;
+extern const bfd_arch_info_type bfd_hppa_arch;
+extern const bfd_arch_info_type bfd_i370_arch;
+extern const bfd_arch_info_type bfd_i386_arch;
+extern const bfd_arch_info_type bfd_i860_arch;
+extern const bfd_arch_info_type bfd_i960_arch;
+extern const bfd_arch_info_type bfd_ia64_arch;
+extern const bfd_arch_info_type bfd_ip2k_arch;
+extern const bfd_arch_info_type bfd_iq2000_arch;
+extern const bfd_arch_info_type bfd_k1om_arch;
+extern const bfd_arch_info_type bfd_l1om_arch;
+extern const bfd_arch_info_type bfd_lm32_arch;
+extern const bfd_arch_info_type bfd_m32c_arch;
+extern const bfd_arch_info_type bfd_m32r_arch;
+extern const bfd_arch_info_type bfd_m68hc11_arch;
+extern const bfd_arch_info_type bfd_m68hc12_arch;
+extern const bfd_arch_info_type bfd_m68k_arch;
+extern const bfd_arch_info_type bfd_m88k_arch;
+extern const bfd_arch_info_type bfd_mcore_arch;
+extern const bfd_arch_info_type bfd_mep_arch;
+extern const bfd_arch_info_type bfd_mips_arch;
+extern const bfd_arch_info_type bfd_microblaze_arch;
+extern const bfd_arch_info_type bfd_mmix_arch;
+extern const bfd_arch_info_type bfd_mn10200_arch;
+extern const bfd_arch_info_type bfd_mn10300_arch;
+extern const bfd_arch_info_type bfd_moxie_arch;
+extern const bfd_arch_info_type bfd_msp430_arch;
+extern const bfd_arch_info_type bfd_mt_arch;
+extern const bfd_arch_info_type bfd_ns32k_arch;
+extern const bfd_arch_info_type bfd_openrisc_arch;
+extern const bfd_arch_info_type bfd_or32_arch;
+extern const bfd_arch_info_type bfd_pdp11_arch;
+extern const bfd_arch_info_type bfd_pj_arch;
+extern const bfd_arch_info_type bfd_plugin_arch;
+extern const bfd_arch_info_type bfd_powerpc_archs[];
+#define bfd_powerpc_arch bfd_powerpc_archs[0]
+extern const bfd_arch_info_type bfd_rs6000_arch;
+extern const bfd_arch_info_type bfd_rx_arch;
+extern const bfd_arch_info_type bfd_s390_arch;
+extern const bfd_arch_info_type bfd_score_arch;
+extern const bfd_arch_info_type bfd_sh_arch;
+extern const bfd_arch_info_type bfd_sparc_arch;
+extern const bfd_arch_info_type bfd_spu_arch;
+extern const bfd_arch_info_type bfd_tic30_arch;
+extern const bfd_arch_info_type bfd_tic4x_arch;
+extern const bfd_arch_info_type bfd_tic54x_arch;
+extern const bfd_arch_info_type bfd_tic6x_arch;
+extern const bfd_arch_info_type bfd_tic80_arch;
+extern const bfd_arch_info_type bfd_tilegx_arch;
+extern const bfd_arch_info_type bfd_tilepro_arch;
+extern const bfd_arch_info_type bfd_v850_arch;
+extern const bfd_arch_info_type bfd_vax_arch;
+extern const bfd_arch_info_type bfd_w65_arch;
+extern const bfd_arch_info_type bfd_we32k_arch;
+extern const bfd_arch_info_type bfd_xstormy16_arch;
+extern const bfd_arch_info_type bfd_xtensa_arch;
+extern const bfd_arch_info_type bfd_xc16x_arch;
+extern const bfd_arch_info_type bfd_z80_arch;
+extern const bfd_arch_info_type bfd_z8k_arch;
+
+static const bfd_arch_info_type * const bfd_archures_list[] =
+  {
+#ifdef SELECT_ARCHITECTURES
+    SELECT_ARCHITECTURES,
+#else
+    &bfd_alpha_arch,
+    &bfd_arc_arch,
+    &bfd_arm_arch,
+    &bfd_avr_arch,
+    &bfd_bfin_arch,
+    &bfd_cr16_arch,
+    &bfd_cr16c_arch,
+    &bfd_cris_arch,
+    &bfd_crx_arch,
+    &bfd_d10v_arch,
+    &bfd_d30v_arch,
+    &bfd_dlx_arch,
+    &bfd_fr30_arch,
+    &bfd_frv_arch,
+    &bfd_h8300_arch,
+    &bfd_h8500_arch,
+    &bfd_hppa_arch,
+    &bfd_i370_arch,
+    &bfd_i386_arch,
+    &bfd_i860_arch,
+    &bfd_i960_arch,
+    &bfd_ia64_arch,
+    &bfd_ip2k_arch,
+    &bfd_iq2000_arch,
+    &bfd_k1om_arch,
+    &bfd_l1om_arch,
+    &bfd_lm32_arch,
+    &bfd_m32c_arch,
+    &bfd_m32r_arch,
+    &bfd_m68hc11_arch,
+    &bfd_m68hc12_arch,
+    &bfd_m68k_arch,
+    &bfd_m88k_arch,
+    &bfd_mcore_arch,
+    &bfd_mep_arch,
+    &bfd_microblaze_arch,
+    &bfd_mips_arch,
+    &bfd_mmix_arch,
+    &bfd_mn10200_arch,
+    &bfd_mn10300_arch,
+    &bfd_moxie_arch,
+    &bfd_msp430_arch,
+    &bfd_mt_arch,
+    &bfd_ns32k_arch,
+    &bfd_openrisc_arch,
+    &bfd_or32_arch,
+    &bfd_pdp11_arch,
+    &bfd_powerpc_arch,
+    &bfd_rs6000_arch,
+    &bfd_rx_arch,
+    &bfd_s390_arch,
+    &bfd_score_arch,
+    &bfd_sh_arch,
+    &bfd_sparc_arch,
+    &bfd_spu_arch,
+    &bfd_tic30_arch,
+    &bfd_tic4x_arch,
+    &bfd_tic54x_arch,
+    &bfd_tic6x_arch,
+    &bfd_tic80_arch,
+    &bfd_tilegx_arch,
+    &bfd_tilepro_arch,
+    &bfd_v850_arch,
+    &bfd_vax_arch,
+    &bfd_w65_arch,
+    &bfd_we32k_arch,
+    &bfd_xstormy16_arch,
+    &bfd_xtensa_arch,
+    &bfd_xc16x_arch,
+    &bfd_z80_arch,
+    &bfd_z8k_arch,
+#endif
+  0
+};
+
+/*
+FUNCTION
+	bfd_printable_name
+
+SYNOPSIS
+	const char *bfd_printable_name (bfd *abfd);
+
+DESCRIPTION
+	Return a printable string representing the architecture and machine
+	from the pointer to the architecture info structure.
+
+*/
+
+const char *
+bfd_printable_name (bfd *abfd)
+{
+  return abfd->arch_info->printable_name;
+}
+
+/*
+FUNCTION
+	bfd_scan_arch
+
+SYNOPSIS
+	const bfd_arch_info_type *bfd_scan_arch (const char *string);
+
+DESCRIPTION
+	Figure out if BFD supports any cpu which could be described with
+	the name @var{string}.  Return a pointer to an <<arch_info>>
+	structure if a machine is found, otherwise NULL.
+*/
+
+const bfd_arch_info_type *
+bfd_scan_arch (const char *string)
+{
+  const bfd_arch_info_type * const *app, *ap;
+
+  /* Look through all the installed architectures.  */
+  for (app = bfd_archures_list; *app != NULL; app++)
+    {
+      for (ap = *app; ap != NULL; ap = ap->next)
+	{
+	  if (ap->scan (ap, string))
+	    return ap;
+	}
+    }
+
+  return NULL;
+}
+
+/*
+FUNCTION
+	bfd_arch_list
+
+SYNOPSIS
+	const char **bfd_arch_list (void);
+
+DESCRIPTION
+	Return a freshly malloced NULL-terminated vector of the names
+	of all the valid BFD architectures.  Do not modify the names.
+*/
+
+const char **
+bfd_arch_list (void)
+{
+  int vec_length = 0;
+  const char **name_ptr;
+  const char **name_list;
+  const bfd_arch_info_type * const *app;
+  bfd_size_type amt;
+
+  /* Determine the number of architectures.  */
+  vec_length = 0;
+  for (app = bfd_archures_list; *app != NULL; app++)
+    {
+      const bfd_arch_info_type *ap;
+      for (ap = *app; ap != NULL; ap = ap->next)
+	{
+	  vec_length++;
+	}
+    }
+
+  amt = (vec_length + 1) * sizeof (char **);
+  name_list = (const char **) bfd_malloc (amt);
+  if (name_list == NULL)
+    return NULL;
+
+  /* Point the list at each of the names.  */
+  name_ptr = name_list;
+  for (app = bfd_archures_list; *app != NULL; app++)
+    {
+      const bfd_arch_info_type *ap;
+      for (ap = *app; ap != NULL; ap = ap->next)
+	{
+	  *name_ptr = ap->printable_name;
+	  name_ptr++;
+	}
+    }
+  *name_ptr = NULL;
+
+  return name_list;
+}
+
+/*
+FUNCTION
+	bfd_arch_get_compatible
+
+SYNOPSIS
+	const bfd_arch_info_type *bfd_arch_get_compatible
+	  (const bfd *abfd, const bfd *bbfd, bfd_boolean accept_unknowns);
+
+DESCRIPTION
+	Determine whether two BFDs' architectures and machine types
+	are compatible.  Calculates the lowest common denominator
+	between the two architectures and machine types implied by
+	the BFDs and returns a pointer to an <<arch_info>> structure
+	describing the compatible machine.
+*/
+
+const bfd_arch_info_type *
+bfd_arch_get_compatible (const bfd *abfd,
+			 const bfd *bbfd,
+			 bfd_boolean accept_unknowns)
+{
+  const bfd *ubfd, *kbfd;
+
+  /* Look for an unknown architecture.  */
+  if (abfd->arch_info->arch == bfd_arch_unknown)
+    ubfd = abfd, kbfd = bbfd;
+  else if (bbfd->arch_info->arch == bfd_arch_unknown)
+    ubfd = bbfd, kbfd = abfd;
+  else
+    /* Otherwise architecture-specific code has to decide.  */
+    return abfd->arch_info->compatible (abfd->arch_info, bbfd->arch_info);
+
+  /* We can allow an unknown architecture if accept_unknowns
+     is true, or if the target is the "binary" format, which
+     has an unknown architecture.  Since the binary format can
+     only be set by explicit request from the user, it is safe
+     to assume that they know what they are doing.  */
+  if (accept_unknowns
+      || strcmp (bfd_get_target (ubfd), "binary") == 0)
+    return kbfd->arch_info;
+  return NULL;
+}
+
+/*
+INTERNAL_DEFINITION
+	bfd_default_arch_struct
+
+DESCRIPTION
+	The <<bfd_default_arch_struct>> is an item of
+	<<bfd_arch_info_type>> which has been initialized to a fairly
+	generic state.  A BFD starts life by pointing to this
+	structure, until the correct back end has determined the real
+	architecture of the file.
+
+.extern const bfd_arch_info_type bfd_default_arch_struct;
+*/
+
+const bfd_arch_info_type bfd_default_arch_struct = {
+  32, 32, 8, bfd_arch_unknown, 0, "unknown", "unknown", 2, TRUE,
+  bfd_default_compatible,
+  bfd_default_scan,
+  0,
+};
+
+/*
+FUNCTION
+	bfd_set_arch_info
+
+SYNOPSIS
+	void bfd_set_arch_info (bfd *abfd, const bfd_arch_info_type *arg);
+
+DESCRIPTION
+	Set the architecture info of @var{abfd} to @var{arg}.
+*/
+
+void
+bfd_set_arch_info (bfd *abfd, const bfd_arch_info_type *arg)
+{
+  abfd->arch_info = arg;
+}
+
+/*
+INTERNAL_FUNCTION
+	bfd_default_set_arch_mach
+
+SYNOPSIS
+	bfd_boolean bfd_default_set_arch_mach
+	  (bfd *abfd, enum bfd_architecture arch, unsigned long mach);
+
+DESCRIPTION
+	Set the architecture and machine type in BFD @var{abfd}
+	to @var{arch} and @var{mach}.  Find the correct
+	pointer to a structure and insert it into the <<arch_info>>
+	pointer.
+*/
+
+bfd_boolean
+bfd_default_set_arch_mach (bfd *abfd,
+			   enum bfd_architecture arch,
+			   unsigned long mach)
+{
+  abfd->arch_info = bfd_lookup_arch (arch, mach);
+  if (abfd->arch_info != NULL)
+    return TRUE;
+
+  abfd->arch_info = &bfd_default_arch_struct;
+  bfd_set_error (bfd_error_bad_value);
+  return FALSE;
+}
+
+/*
+FUNCTION
+	bfd_get_arch
+
+SYNOPSIS
+	enum bfd_architecture bfd_get_arch (bfd *abfd);
+
+DESCRIPTION
+	Return the enumerated type which describes the BFD @var{abfd}'s
+	architecture.
+*/
+
+enum bfd_architecture
+bfd_get_arch (bfd *abfd)
+{
+  return abfd->arch_info->arch;
+}
+
+/*
+FUNCTION
+	bfd_get_mach
+
+SYNOPSIS
+	unsigned long bfd_get_mach (bfd *abfd);
+
+DESCRIPTION
+	Return the long type which describes the BFD @var{abfd}'s
+	machine.
+*/
+
+unsigned long
+bfd_get_mach (bfd *abfd)
+{
+  return abfd->arch_info->mach;
+}
+
+/*
+FUNCTION
+	bfd_arch_bits_per_byte
+
+SYNOPSIS
+	unsigned int bfd_arch_bits_per_byte (bfd *abfd);
+
+DESCRIPTION
+	Return the number of bits in one of the BFD @var{abfd}'s
+	architecture's bytes.
+*/
+
+unsigned int
+bfd_arch_bits_per_byte (bfd *abfd)
+{
+  return abfd->arch_info->bits_per_byte;
+}
+
+/*
+FUNCTION
+	bfd_arch_bits_per_address
+
+SYNOPSIS
+	unsigned int bfd_arch_bits_per_address (bfd *abfd);
+
+DESCRIPTION
+	Return the number of bits in one of the BFD @var{abfd}'s
+	architecture's addresses.
+*/
+
+unsigned int
+bfd_arch_bits_per_address (bfd *abfd)
+{
+  return abfd->arch_info->bits_per_address;
+}
+
+/*
+INTERNAL_FUNCTION
+	bfd_default_compatible
+
+SYNOPSIS
+	const bfd_arch_info_type *bfd_default_compatible
+	  (const bfd_arch_info_type *a, const bfd_arch_info_type *b);
+
+DESCRIPTION
+	The default function for testing for compatibility.
+*/
+
+const bfd_arch_info_type *
+bfd_default_compatible (const bfd_arch_info_type *a,
+			const bfd_arch_info_type *b)
+{
+  if (a->arch != b->arch)
+    return NULL;
+
+  if (a->bits_per_word != b->bits_per_word)
+    return NULL;
+
+  if (a->mach > b->mach)
+    return a;
+
+  if (b->mach > a->mach)
+    return b;
+
+  return a;
+}
+
+/*
+INTERNAL_FUNCTION
+	bfd_default_scan
+
+SYNOPSIS
+	bfd_boolean bfd_default_scan
+	  (const struct bfd_arch_info *info, const char *string);
+
+DESCRIPTION
+	The default function for working out whether this is an
+	architecture hit and a machine hit.
+*/
+
+bfd_boolean
+bfd_default_scan (const bfd_arch_info_type *info, const char *string)
+{
+  const char *ptr_src;
+  const char *ptr_tst;
+  unsigned long number;
+  enum bfd_architecture arch;
+  const char *printable_name_colon;
+
+  /* Exact match of the architecture name (ARCH_NAME) and also the
+     default architecture?  */
+  if (strcasecmp (string, info->arch_name) == 0
+      && info->the_default)
+    return TRUE;
+
+  /* Exact match of the machine name (PRINTABLE_NAME)?  */
+  if (strcasecmp (string, info->printable_name) == 0)
+    return TRUE;
+
+  /* Given that printable_name contains no colon, attempt to match:
+     ARCH_NAME [ ":" ] PRINTABLE_NAME?  */
+  printable_name_colon = strchr (info->printable_name, ':');
+  if (printable_name_colon == NULL)
+    {
+      size_t strlen_arch_name = strlen (info->arch_name);
+      if (strncasecmp (string, info->arch_name, strlen_arch_name) == 0)
+	{
+	  if (string[strlen_arch_name] == ':')
+	    {
+	      if (strcasecmp (string + strlen_arch_name + 1,
+			      info->printable_name) == 0)
+		return TRUE;
+	    }
+	  else
+	    {
+	      if (strcasecmp (string + strlen_arch_name,
+			      info->printable_name) == 0)
+		return TRUE;
+	    }
+	}
+    }
+
+  /* Given that PRINTABLE_NAME has the form: <arch> ":" <mach>;
+     Attempt to match: <arch> <mach>?  */
+  if (printable_name_colon != NULL)
+    {
+      size_t colon_index = printable_name_colon - info->printable_name;
+      if (strncasecmp (string, info->printable_name, colon_index) == 0
+	  && strcasecmp (string + colon_index,
+			 info->printable_name + colon_index + 1) == 0)
+	return TRUE;
+    }
+
+  /* Given that PRINTABLE_NAME has the form: <arch> ":" <mach>; Do not
+     attempt to match just <mach>, it could be ambiguous.  This test
+     is left until later.  */
+
+  /* NOTE: The below is retained for compatibility only.  Please do
+     not add to this code.  */
+
+  /* See how much of the supplied string matches with the
+     architecture, eg the string m68k:68020 would match the 68k entry
+     up to the :, then we get left with the machine number.  */
+
+  for (ptr_src = string, ptr_tst = info->arch_name;
+       *ptr_src && *ptr_tst;
+       ptr_src++, ptr_tst++)
+    {
+      if (*ptr_src != *ptr_tst)
+	break;
+    }
+
+  /* Chewed up as much of the architecture as will match, skip any
+     colons.  */
+  if (*ptr_src == ':')
+    ptr_src++;
+
+  if (*ptr_src == 0)
+    {
+      /* Nothing more, then only keep this one if it is the default
+	 machine for this architecture.  */
+      return info->the_default;
+    }
+
+  number = 0;
+  while (ISDIGIT (*ptr_src))
+    {
+      number = number * 10 + *ptr_src - '0';
+      ptr_src++;
+    }
+
+  /* NOTE: The below is retained for compatibility only.
+     PLEASE DO NOT ADD TO THIS CODE.  */
+
+  switch (number)
+    {
+      /* FIXME: These are needed to parse IEEE objects.  */
+      /* The following seven case's are here only for compatibility with
+	 older binutils (at least IEEE objects from binutils 2.9.1 require
+	 them).  */
+    case bfd_mach_m68000:
+    case bfd_mach_m68010:
+    case bfd_mach_m68020:
+    case bfd_mach_m68030:
+    case bfd_mach_m68040:
+    case bfd_mach_m68060:
+    case bfd_mach_cpu32:
+      arch = bfd_arch_m68k;
+      break;
+    case 68000:
+      arch = bfd_arch_m68k;
+      number = bfd_mach_m68000;
+      break;
+    case 68010:
+      arch = bfd_arch_m68k;
+      number = bfd_mach_m68010;
+      break;
+    case 68020:
+      arch = bfd_arch_m68k;
+      number = bfd_mach_m68020;
+      break;
+    case 68030:
+      arch = bfd_arch_m68k;
+      number = bfd_mach_m68030;
+      break;
+    case 68040:
+      arch = bfd_arch_m68k;
+      number = bfd_mach_m68040;
+      break;
+    case 68060:
+      arch = bfd_arch_m68k;
+      number = bfd_mach_m68060;
+      break;
+    case 68332:
+      arch = bfd_arch_m68k;
+      number = bfd_mach_cpu32;
+      break;
+    case 5200:
+      arch = bfd_arch_m68k;
+      number = bfd_mach_mcf_isa_a_nodiv;
+      break;
+    case 5206:
+      arch = bfd_arch_m68k;
+      number = bfd_mach_mcf_isa_a_mac;
+      break;
+    case 5307:
+      arch = bfd_arch_m68k;
+      number = bfd_mach_mcf_isa_a_mac;
+      break;
+    case 5407:
+      arch = bfd_arch_m68k;
+      number = bfd_mach_mcf_isa_b_nousp_mac;
+      break;
+    case 5282:
+      arch = bfd_arch_m68k;
+      number = bfd_mach_mcf_isa_aplus_emac;
+      break;
+
+    case 32000:
+      arch = bfd_arch_we32k;
+      break;
+
+    case 3000:
+      arch = bfd_arch_mips;
+      number = bfd_mach_mips3000;
+      break;
+
+    case 4000:
+      arch = bfd_arch_mips;
+      number = bfd_mach_mips4000;
+      break;
+
+    case 6000:
+      arch = bfd_arch_rs6000;
+      break;
+
+    case 7410:
+      arch = bfd_arch_sh;
+      number = bfd_mach_sh_dsp;
+      break;
+
+    case 7708:
+      arch = bfd_arch_sh;
+      number = bfd_mach_sh3;
+      break;
+
+    case 7729:
+      arch = bfd_arch_sh;
+      number = bfd_mach_sh3_dsp;
+      break;
+
+    case 7750:
+      arch = bfd_arch_sh;
+      number = bfd_mach_sh4;
+      break;
+
+    default:
+      return FALSE;
+    }
+
+  if (arch != info->arch)
+    return FALSE;
+
+  if (number != info->mach)
+    return FALSE;
+
+  return TRUE;
+}
+
+/*
+FUNCTION
+	bfd_get_arch_info
+
+SYNOPSIS
+	const bfd_arch_info_type *bfd_get_arch_info (bfd *abfd);
+
+DESCRIPTION
+	Return the architecture info struct in @var{abfd}.
+*/
+
+const bfd_arch_info_type *
+bfd_get_arch_info (bfd *abfd)
+{
+  return abfd->arch_info;
+}
+
+/*
+FUNCTION
+	bfd_lookup_arch
+
+SYNOPSIS
+	const bfd_arch_info_type *bfd_lookup_arch
+	  (enum bfd_architecture arch, unsigned long machine);
+
+DESCRIPTION
+	Look for the architecture info structure which matches the
+	arguments @var{arch} and @var{machine}. A machine of 0 matches the
+	machine/architecture structure which marks itself as the
+	default.
+*/
+
+const bfd_arch_info_type *
+bfd_lookup_arch (enum bfd_architecture arch, unsigned long machine)
+{
+  const bfd_arch_info_type * const *app, *ap;
+
+  for (app = bfd_archures_list; *app != NULL; app++)
+    {
+      for (ap = *app; ap != NULL; ap = ap->next)
+	{
+	  if (ap->arch == arch
+	      && (ap->mach == machine
+		  || (machine == 0 && ap->the_default)))
+	    return ap;
+	}
+    }
+
+  return NULL;
+}
+
+/*
+FUNCTION
+	bfd_printable_arch_mach
+
+SYNOPSIS
+	const char *bfd_printable_arch_mach
+	  (enum bfd_architecture arch, unsigned long machine);
+
+DESCRIPTION
+	Return a printable string representing the architecture and
+	machine type.
+
+	This routine is depreciated.
+*/
+
+const char *
+bfd_printable_arch_mach (enum bfd_architecture arch, unsigned long machine)
+{
+  const bfd_arch_info_type *ap = bfd_lookup_arch (arch, machine);
+
+  if (ap)
+    return ap->printable_name;
+  return "UNKNOWN!";
+}
+
+/*
+FUNCTION
+	bfd_octets_per_byte
+
+SYNOPSIS
+	unsigned int bfd_octets_per_byte (bfd *abfd);
+
+DESCRIPTION
+	Return the number of octets (8-bit quantities) per target byte
+        (minimum addressable unit).  In most cases, this will be one, but some
+        DSP targets have 16, 32, or even 48 bits per byte.
+*/
+
+unsigned int
+bfd_octets_per_byte (bfd *abfd)
+{
+  return bfd_arch_mach_octets_per_byte (bfd_get_arch (abfd),
+					bfd_get_mach (abfd));
+}
+
+/*
+FUNCTION
+	bfd_arch_mach_octets_per_byte
+
+SYNOPSIS
+	unsigned int bfd_arch_mach_octets_per_byte
+	  (enum bfd_architecture arch, unsigned long machine);
+
+DESCRIPTION
+	See bfd_octets_per_byte.
+
+        This routine is provided for those cases where a bfd * is not
+        available
+*/
+
+unsigned int
+bfd_arch_mach_octets_per_byte (enum bfd_architecture arch,
+			       unsigned long mach)
+{
+  const bfd_arch_info_type *ap = bfd_lookup_arch (arch, mach);
+
+  if (ap)
+    return ap->bits_per_byte / 8;
+  return 1;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/armnetbsd.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/armnetbsd.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/armnetbsd.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/armnetbsd.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,40 @@
+/* BFD back-end for NetBSD/ARM a.out-ish binaries.
+   Copyright 1999, 2000, 2001, 2002, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define	BYTES_IN_WORD		4
+#undef TARGET_IS_BIG_ENDIAN_P
+
+#define	TARGET_PAGE_SIZE	4096
+#define	SEGMENT_SIZE		TARGET_PAGE_SIZE
+
+#define	DEFAULT_ARCH		bfd_arch_arm
+#define	DEFAULT_MID 		M_ARM6_NETBSD
+/*#define MACHTYPE_OK(mtype) ((mtype) == M_ARM6_NETBSD)*/
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) 			CONCAT2 (armnetbsd_, OP)
+
+/* This needs to start with a.out so GDB knows it is an a.out variant.  */
+#define TARGETNAME 		"a.out-arm-netbsd"
+
+#include "netbsd.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/asxxxx.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/asxxxx.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/asxxxx.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/asxxxx.c	2012-03-06 19:53:17.000000000 +0000
@@ -0,0 +1,1150 @@
+/* BFD back-end for asxxxx .rel objects.
+   Copyright 2011
+   Borut Razem (Free Software Foundation, Inc.)
+   Written by Borut Razem <borut.razem@gmail.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* SUBSECTION
+        The object module contains the following designators:  
+
+                [XDQ][HL][234]
+                        X       Hexidecimal radix
+                        D       Decimal radix
+                        Q       Octal radix
+        
+                        H       Most significant byte first
+                        L       Least significant byte first
+        
+                        2       16-Bit Addressing
+                        3       24-Bit Addressing
+                        4       32-Bit Addressing
+        
+                H       Header 
+                M       Module
+                G       Merge Mode
+                B       Bank
+                A       Area
+                S       Symbol
+                T       Object code
+                R       Relocation information
+                P       Paging information
+
+        3.5.1  Object Module Format
+                [XDQ][HL][234]
+
+        3.5.2  Header Line 
+                H aa areas gg global symbols 
+
+        3.5.3  Module Line 
+                M name 
+
+        3.5.4  Merge Mode Line 
+                G nn ii 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 
+
+        3.5.5  Bank Line 
+                B name base nn size nn map nn flags nn fsfx string 
+
+        3.5.6  Area Line 
+                A label size ss flags ff 
+
+        3.5.7  Symbol Line 
+                S name Defnnnn 
+                        or 
+                S name Refnnnn 
+
+        3.5.8  T Line 
+                T xx xx nn nn nn nn nn ...  
+
+        3.5.9  R Line 
+                R 0 0 nn nn n1 n2 xx xx ...  
+
+        3.5.10  P Line 
+                P 0 0 nn nn n1 n2 xx xx 
+ */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libiberty.h"
+#include "safe-ctype.h"
+
+#define NELEM(x) (sizeof (x) / sizeof (x)[0])
+
+/* ******************* from asld aslink.h ******************* */
+/*
+ *      ASLINK - Version 3 Definitions
+ */
+
+/*
+ *      The "A3_" area constants define values used in
+ *      generating the assembler area output data.
+ *
+ * Area flags
+ *
+ *         8      7     6     5     4     3     2     1     0
+ *         A_     A_    A_    A_   A3_   A3_   A3_
+ *      +-----++-----+-----+-----+-----+-----+-----+-----+-----+
+ *      |LOAD || BIT |XDATA|CODE | PAG | ABS | OVR |     |     |
+ *      +-----++-----+-----+-----+-----+-----+-----+-----+-----+
+ */
+
+#define A3_CON    000           /* concatenate */
+#define A3_OVR    004           /* overlay */
+#define A3_REL    000           /* relocatable */
+#define A3_ABS    010           /* absolute */
+#define A3_NOPAG  000           /* non-paged */
+#define A3_PAG    020           /* paged */
+
+/* sdld specific */
+/* Additional flags for 8051 address spaces */
+#define A_DATA    0000          /* data space (default)*/
+#define A_CODE    0040          /* code space */
+#define A_XDATA   0100          /* external data space */
+#define A_BIT     0200          /* bit addressable space */
+
+/* Additional flags for hc08 */
+#define A_NOLOAD  0400          /* nonloadable */
+#define A_LOAD    0000          /* loadable (default) */
+/* end sdld specific */
+
+/*
+ *      ASLINK - Version 4 Definitions
+ */
+
+/*
+ *      The "A4_" area constants define values used in
+ *      generating the assembler area output data.
+ *
+ * Area flags
+ *
+ *         7     6     5     4     3     2     1     0
+ *      +-----+-----+-----+-----+-----+-----+-----+-----+
+ *      | BNK | SEG |     | PAG | ABS | OVR | WL1 | WL0 |
+ *      +-----+-----+-----+-----+-----+-----+-----+-----+
+ */
+
+#define A4_BYTE         0x0000          /*  8 bit */
+#define A4_WORD         0x0001          /* 16 bit */
+
+#define A4_1BYTE        0x0000          /* 1 Byte Word Length */
+#define A4_2BYTE        0x0001          /* 2 Byte Word Length */
+#define A4_3BYTE        0x0002          /* 3 Byte Word Length */
+#define A4_4BYTE        0x0003          /* 4 Byte Word Length */
+#define A4_WLMSK        0x0003          /* Word Length Mask */
+
+#define A4_CON          0x0400          /* Concatenating */
+#define A4_OVR          0x0404          /* Overlaying */
+#define A4_REL          0x0800          /* Relocatable */
+#define A4_ABS          0x0808          /* absolute */
+#define A4_NOPAG        0x1000          /* Non-Paged */
+#define A4_PAG          0x1010          /* Paged */
+
+#define A4_CSEG         0x4000          /* CSEG */
+#define A4_DSEG         0x4040          /* DSEG */
+#define A4_NOBNK        0x8000          /* Non-Banked */
+#define A4_BNK          0x8080          /* Banked */
+
+#define A4_OUT          0x0100          /* Output Code Flag */
+/* ********************************************************** */
+
+/* Macros for converting between hex and binary.  */
+
+static const char digs[] = "0123456789ABCDEF";
+
+#define NIBBLE(x)    hex_value(x)
+#define HEX(buffer) ((NIBBLE ((buffer)[0])<<4) + NIBBLE ((buffer)[1]))
+#define TOHEX(d, x, ch) \
+        d[1] = digs[(x) & 0xf]; \
+        d[0] = digs[((x)>>4)&0xf]; \
+        ch += ((x) & 0xff);
+#define ISHEX(x)    hex_p(x)
+
+/* When scanning the asxxxx .rel file, a linked list of asxxxx_symbol
+   structures is built to represent the symbol table (if there is
+   one).  */
+
+struct asxxxx_symbol
+{
+  struct asxxxx_symbol *next;
+  const char *name;
+  symvalue val;
+  flagword flags;
+  struct bfd_section *section;
+};
+
+/* The asxxxx .rel tdata information.  */
+
+enum asxxxx_cpu_type_e
+  {
+    CPU_UNKNOWN = 0,
+    CPU_MCS51,
+    CPU_DS390,
+    CPU_DS400,
+    CPU_HC08,
+    CPU_Z80,
+    CPU_GBZ80,
+    CPU_R2K,
+  };
+
+enum asxxxx_rel_version_e
+  {
+    REL_VER_3 = 0,
+    REL_VER_4,
+  };
+
+enum asxxxx_radix_e
+  {
+    RADIX_OCT = 8,
+    RADIX_DEC = 10,
+    RADIX_HEX = 16,
+  };
+
+enum asxxxx_endian_e
+  {
+    ENDIAN_LITTLE = 0,
+    ENDIAN_BIG,
+  };
+
+enum asxxxx_address_size_e
+  {
+    ADDR_SIZE_2 = 2,
+    ADDR_SIZE_3 = 3,
+    ADDR_SIZE_4 = 4,
+  };
+
+typedef struct asxxxx_data_struct
+  {
+    struct asxxxx_symbol *symbols;
+    struct asxxxx_symbol *symtail;
+    asymbol *csymbols;
+    asection *sections;
+    asection *secttail;
+#define CURRENT_SECT(abfd) ((abfd)->tdata.asxxxx_data->secttail)
+
+    unsigned int sect_id;
+#define NEXT_SECT_ID(abfd) (++(abfd)->tdata.asxxxx_data->sect_id)
+
+    enum asxxxx_cpu_type_e cpu_type;
+#define SET_CPU_TYPE(abfd, type) ((abfd)->tdata.asxxxx_data->cpu_type = (type))
+#define GET_CPU_TYPE(abfd) ((abfd)->tdata.asxxxx_data->cpu_type)
+
+    enum asxxxx_rel_version_e rel_version;
+#define SET_REL_VERSION(abfd, version) ((abfd)->tdata.asxxxx_data->rel_version = (version))
+#define GET_REL_VERSION(abfd) ((abfd)->tdata.asxxxx_data->rel_version)
+
+    enum asxxxx_radix_e radix;
+#define SET_RADIX(abfd, r) ((abfd)->tdata.asxxxx_data->radix = (r))
+#define GET_RADIX(abfd) ((abfd)->tdata.asxxxx_data->radix)
+
+    enum asxxxx_endian_e endian;
+#define SET_ENDIAN(abfd, e) ((abfd)->tdata.asxxxx_data->endian = (e))
+#define GET_ENDIAN(abfd) ((abfd)->tdata.asxxxx_data->endian)
+
+    enum asxxxx_address_size_e address_size;
+#define SET_ADDRESS_SIZE(abfd, as) ((abfd)->tdata.asxxxx_data->address_size = (as))
+#define GET_ADDRESS_SIZE(abfd) ((abfd)->tdata.asxxxx_data->address_size)
+  }
+tdata_type;
+
+/* Initialize by filling in the hex conversion array.  */
+
+static void
+asxxxx_init (void)
+{
+  static bfd_boolean inited = FALSE;
+
+  if (! inited)
+    {
+      inited = TRUE;
+      hex_init ();
+    }
+}
+
+/* Set up the asxxxx .rel tdata information.  */
+
+static bfd_boolean
+asxxxx_mkobject (bfd *abfd)
+{
+  tdata_type *tdata;
+
+  asxxxx_init ();
+
+  tdata = (tdata_type *) bfd_zalloc (abfd, sizeof (tdata_type));
+  if (tdata == NULL)
+    return FALSE;
+
+  abfd->tdata.asxxxx_data = tdata;
+
+  return TRUE;
+}
+
+/* Read a byte from an asxxxx .rel file.  Set *ERRORPTR if an error
+   occurred.  Return EOF on error or end of file.  */
+
+static int
+asxxxx_get_byte (bfd *abfd, bfd_boolean *errorptr)
+{
+  bfd_byte c;
+
+  if (bfd_bread (&c, (bfd_size_type) 1, abfd) != 1)
+    {
+      if (bfd_get_error () != bfd_error_file_truncated)
+        *errorptr = TRUE;
+      return EOF;
+    }
+
+  return (int) (c & 0xff);
+}
+
+/* Report a problem in an asxxxx .rel file.  FIXME: This probably should
+   not call fprintf, but we really do need some mechanism for printing
+   error messages.  */
+
+static void
+asxxxx_bad_byte (bfd *abfd,
+               int c,
+               unsigned int lineno,
+               bfd_boolean error)
+{
+  if (c == EOF)
+    {
+      if (! error)
+        bfd_set_error (bfd_error_file_truncated);
+    }
+  else
+    {
+      char buf[10];
+
+      if (! ISPRINT (c))
+        sprintf (buf, "\\%03o", (unsigned int) c);
+      else
+        {
+          buf[0] = c;
+          buf[1] = '\0';
+        }
+      (*_bfd_error_handler)
+        (_("%B:%d: Unexpected character `%s' in asxxxx .rel file\n"),
+         abfd, lineno, buf);
+      bfd_set_error (bfd_error_bad_value);
+    }
+}
+
+/* Add a new symbol found in an asxxxx .rel file.  */
+
+static bfd_boolean
+asxxxx_new_symbol (bfd *abfd, const char *name, symvalue val, flagword flags, struct bfd_section *section)
+{
+  struct asxxxx_symbol *n;
+
+  n = (struct asxxxx_symbol *) bfd_alloc (abfd, sizeof (* n));
+  if (n == NULL)
+    return FALSE;
+
+  n->name = name;
+  n->val = val;
+  n->flags = flags;
+  n->section = section;
+
+  if (abfd->tdata.asxxxx_data->symbols == NULL)
+    abfd->tdata.asxxxx_data->symbols = n;
+  else
+    abfd->tdata.asxxxx_data->symtail->next = n;
+  abfd->tdata.asxxxx_data->symtail = n;
+  n->next = NULL;
+
+  ++abfd->symcount;
+
+  return TRUE;
+}
+
+/* Add a new section found in an asxxxx .rel file.  */
+
+static flagword
+asxxxx_to_asection_flags(bfd *abfd, unsigned int flags, unsigned int sect_size)
+{
+  flagword sect_flags = SEC_NO_FLAGS;
+
+  if (sect_size)
+     sect_flags |= SEC_HAS_CONTENTS;
+
+  if (GET_REL_VERSION (abfd) == REL_VER_3)
+    {
+      /*
+       *         8      7     6     5     4     3     2     1     0
+       *         A_     A_    A_    A_   A3_   A3_   A3_
+       *      +-----++-----+-----+-----+-----+-----+-----+-----+-----+
+       *      |LOAD || BIT |XDATA|CODE | PAG | ABS | OVR |     |     |
+       *      +-----++-----+-----+-----+-----+-----+-----+-----+-----+
+       */
+
+      if (!(flags & A3_ABS))
+        sect_flags |= SEC_RELOC;
+
+      switch (GET_CPU_TYPE (abfd))
+        {
+        case CPU_MCS51:
+          sect_flags |= SEC_LOAD;
+          if (flags & A_CODE)
+            sect_flags |= (SEC_CODE | SEC_ROM | SEC_READONLY);
+          if (flags & (A_XDATA | A_BIT) || !(flags & (A_CODE | A_XDATA | A_BIT)))
+            sect_flags |= SEC_DATA;
+          break;
+
+        case CPU_HC08:
+          sect_flags |= SEC_CODE;
+          sect_flags |= (flags & A_LOAD) ? SEC_LOAD : SEC_NEVER_LOAD;
+          break;
+
+        default:
+          sect_flags |= SEC_CODE;
+          sect_flags |= SEC_LOAD;
+          break;
+        }
+    }
+  else
+    {
+      /*
+       *         7     6     5     4     3     2     1     0
+       *      +-----+-----+-----+-----+-----+-----+-----+-----+
+       *      | BNK | SEG |     | PAG | ABS | OVR | WL1 | WL0 |
+       *      +-----+-----+-----+-----+-----+-----+-----+-----+
+       */
+
+      if (!(flags & A4_ABS))
+        sect_flags |= SEC_RELOC;
+
+      sect_flags |= (flags & A4_DSEG) ? SEC_DATA : SEC_CODE;
+      sect_flags |= SEC_LOAD;
+    }
+
+  return sect_flags;
+}
+
+static bfd_boolean
+asxxxx_new_section (bfd *abfd, const char *sect_name, unsigned int sect_size, unsigned int sect_flags, unsigned int sect_addr)
+{
+  asection *sect;
+
+  if ((sect = (asection *) bfd_zalloc (abfd, sizeof (*sect))) == NULL)
+    return FALSE;
+
+  sect->name = sect_name;
+  sect->id = sect->index = NEXT_SECT_ID(abfd);
+  sect->flags = asxxxx_to_asection_flags(abfd, sect_flags, sect_size);
+  sect->size = sect->rawsize = sect_size;
+  sect->vma = sect->lma = sect_addr;
+
+  if (abfd->tdata.asxxxx_data->sections == NULL)
+    abfd->tdata.asxxxx_data->sections = sect;
+  else
+    {
+      sect->prev = abfd->tdata.asxxxx_data->secttail;
+      abfd->tdata.asxxxx_data->secttail->next = sect;
+    }
+  abfd->tdata.asxxxx_data->secttail = sect;
+
+  return TRUE;
+}
+
+/* Read the asxxxx .rel file and turn it into sections.  We create a new
+   section for each contiguous set of bytes.  */
+
+static bfd_boolean
+asxxxx_skip_spaces (bfd *abfd, int *p_c, unsigned int lineno, bfd_boolean *errorptr)
+{
+  if (! ISSPACE (*p_c))
+    {
+      asxxxx_bad_byte (abfd, *p_c, lineno, *errorptr);
+      return FALSE;
+    }
+
+  while (ISSPACE (*p_c = asxxxx_get_byte (abfd, errorptr)))
+    ;
+
+  return TRUE;
+}
+
+static bfd_boolean
+asxxxx_skip_word (bfd *abfd, char *word, int *p_c, unsigned int lineno, bfd_boolean *errorptr)
+{
+  char *p;
+
+  for (p = word; *p != '\0'; ++p)
+    {
+      if (*p_c == *p)
+        {
+          *p_c = asxxxx_get_byte (abfd, errorptr);
+        }
+      else
+        {
+          asxxxx_bad_byte (abfd, *p_c, lineno, *errorptr);
+          return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+asxxxx_get_word (bfd *abfd, char **p_word, int *p_c, unsigned int lineno, bfd_boolean *errorptr)
+{
+  bfd_size_type alc;
+  char *p, *symname;
+  char *symbuf;
+
+  alc = 10;
+  symbuf = (char *) bfd_malloc (alc + 1);
+  if (symbuf == NULL)
+    goto error_return;
+
+  p = symbuf;
+
+  *p++ = *p_c;
+  while (! ISSPACE (*p_c = asxxxx_get_byte (abfd, errorptr)) && *p_c != EOF)
+    {
+      if ((bfd_size_type) (p - symbuf) >= alc)
+        {
+          char *n;
+
+          alc *= 2;
+          n = (char *) bfd_realloc (symbuf, alc + 1);
+          if (n == NULL)
+            goto error_return;
+          p = n + (p - symbuf);
+          symbuf = n;
+        }
+
+      *p++ = *p_c;
+    }
+
+  if (*p_c == EOF)
+   {
+     asxxxx_bad_byte (abfd, *p_c, lineno, *errorptr);
+     goto error_return;
+   }
+
+   *p++ = '\0';
+
+  symname = (char *) bfd_alloc (abfd, (bfd_size_type) (p - symbuf));
+  if (symname == NULL)
+    goto error_return;
+
+  strcpy (symname, symbuf);
+  free (symbuf);
+
+  *p_word = symname;
+
+  return TRUE;
+
+error_return:
+  if (symbuf != NULL)
+    free (symbuf);
+
+  *p_word = NULL;
+
+  return FALSE;
+}
+
+static bfd_boolean
+asxxxx_get_hex (bfd *abfd, unsigned int *p_val, int *p_c, unsigned int lineno, bfd_boolean *errorptr)
+{
+  *p_val = 0;
+  while (ISHEX (*p_c))
+    {
+      *p_val = (*p_val << 4) + NIBBLE (*p_c);
+      *p_c = asxxxx_get_byte (abfd, errorptr);
+    }
+
+  if (*p_c == EOF)
+   {
+     asxxxx_bad_byte (abfd, *p_c, lineno, *errorptr);
+     return FALSE;
+   }
+
+  return TRUE;
+}
+
+static bfd_boolean
+asxxxx_get_eol (bfd *abfd, int *p_c, unsigned int *p_lineno, bfd_boolean *errorptr)
+{
+  if (*p_c == '\n')
+    {
+      ++*p_lineno;
+      return TRUE;
+    }
+  else if (*p_c != '\r')
+    {
+      asxxxx_bad_byte (abfd, *p_c, *p_lineno, *errorptr);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+asxxxx_skip_line (bfd *abfd, int *p_c, unsigned int *p_lineno, bfd_boolean *errorptr)
+{
+  while ((*p_c = asxxxx_get_byte (abfd, errorptr)) != EOF && *p_c != '\n' && *p_c != '\r')
+    ;
+
+  return asxxxx_get_eol (abfd, p_c, p_lineno, errorptr);
+}
+
+static void
+asxxxx_set_cpu_type(bfd *abfd, const char *cpu_type)
+{
+  struct cpu
+    {
+      const char *name;
+      enum asxxxx_cpu_type_e type;
+    }
+  cpus[] =
+    {
+      { "-mmcs51", CPU_MCS51 },
+      { "-mds390", CPU_DS390 },
+      { "-mds400", CPU_DS400 },
+      { "-mhc08",  CPU_HC08  },
+      { "-mz80",   CPU_Z80   },
+      { "-mgbz80", CPU_GBZ80 },
+      { "-mr2K",   CPU_R2K   },
+    };
+  size_t i;
+
+  for (i = 0; i < NELEM (cpus); ++i)
+    {
+      if (! strcmp (cpu_type, cpus[i].name))
+        {
+          SET_CPU_TYPE (abfd, cpus[i].type);
+          return;
+        }
+    }
+
+  SET_CPU_TYPE (abfd, CPU_UNKNOWN);
+}
+
+static bfd_boolean
+asxxxx_scan (bfd *abfd, unsigned int *p_lineno)
+{
+  int c;
+  bfd_boolean error = FALSE;
+
+  bfd_set_error (bfd_error_file_truncated);
+
+  while ((c = asxxxx_get_byte (abfd, &error)) != EOF)
+    {
+      switch (c)
+        {
+        default:
+          /* unknown line */
+          asxxxx_bad_byte (abfd, c, *p_lineno, error);
+          goto error_return;
+          break;
+
+        case '\n':
+          ++p_lineno;
+          break;
+
+        case '\r':
+          break;
+
+        case 'A':
+          /* A CSEG size 12E2 flags 20 addr 0 */
+          {
+            char *sect_name;
+            unsigned int sect_size, sect_flags, sect_addr;
+
+            /* Starting a symbol definition.  */
+            c = asxxxx_get_byte (abfd, &error);
+
+            if (! asxxxx_skip_spaces (abfd, &c, *p_lineno, &error))
+              goto error_return;
+
+            if (! asxxxx_get_word (abfd, &sect_name, &c, *p_lineno, &error))
+              goto error_return;
+
+            if (! asxxxx_skip_spaces (abfd, &c, *p_lineno, &error))
+              goto error_return;
+ 
+            if (! asxxxx_skip_word (abfd, "size", &c, *p_lineno, &error))
+              goto error_return;
+ 
+            if (! asxxxx_skip_spaces (abfd, &c, *p_lineno, &error))
+              goto error_return;
+
+            if (! asxxxx_get_hex (abfd, &sect_size, &c, *p_lineno, &error))
+              goto error_return;
+
+            if (! asxxxx_skip_spaces (abfd, &c, *p_lineno, &error))
+              goto error_return;
+
+            if (! asxxxx_skip_word (abfd, "flags", &c, *p_lineno, &error))
+              goto error_return;
+
+            if (! asxxxx_skip_spaces (abfd, &c, *p_lineno, &error))
+              goto error_return;
+
+            if (! asxxxx_get_hex (abfd, &sect_flags, &c, *p_lineno, &error))
+              goto error_return;
+
+            if (! asxxxx_skip_spaces (abfd, &c, *p_lineno, &error))
+              goto error_return;
+
+            if (! asxxxx_skip_word (abfd, "addr", &c, *p_lineno, &error))
+              goto error_return;
+
+            if (! asxxxx_skip_spaces (abfd, &c, *p_lineno, &error))
+              goto error_return;
+
+            if (! asxxxx_get_hex (abfd, &sect_addr, &c, *p_lineno, &error))
+              goto error_return;
+
+            if (! asxxxx_get_eol (abfd, &c, p_lineno, &error))
+              goto error_return;
+
+            if (! asxxxx_new_section (abfd, sect_name, sect_size, sect_flags, sect_addr))
+              goto error_return;
+          }
+          break;
+        case 'O':
+          /*
+           * O -mds390 --model-flat24
+           * O -mds400 --model-flat24
+           * O -mhc08
+           * O -mmcs51 --model-huge
+           * O -mmcs51 --model-large
+           * O -mmcs51 --model-medium
+           * O -mmcs51 --model-small
+           * O -mmcs51 --model-small --xstack
+           */
+          {
+            char *cpu_type;
+
+            /* check if the next character is space */
+            c = asxxxx_get_byte (abfd, &error);
+
+            if (! asxxxx_skip_spaces (abfd, &c, *p_lineno, &error))
+              goto error_return;
+
+            if (! asxxxx_get_word (abfd, &cpu_type, &c, *p_lineno, &error))
+              goto error_return;
+
+            /* eat the rest of line */
+            if (! asxxxx_skip_line (abfd, &c, p_lineno, &error))
+              goto error_return;
+
+            asxxxx_set_cpu_type(abfd, cpu_type);
+          }
+          break;
+        case 'G': /* V 4.XX+ */
+        case 'B': /* V 4.XX+ */
+          SET_REL_VERSION (abfd, REL_VER_4);
+          /* fall through */
+        case 'H':
+        case 'M':
+        case 'T':
+        case 'R':
+        case 'P':
+          /* check if the next character is space */
+          c = asxxxx_get_byte (abfd, &error);
+
+          if (! asxxxx_skip_spaces (abfd, &c, *p_lineno, &error))
+            goto error_return;
+
+          /* eat the rest of line */
+          if (! asxxxx_skip_line (abfd, &c, p_lineno, &error))
+            goto error_return;
+          break;
+
+        case 'S':
+          /* S __ret3 Def0001 */
+          {
+            char *symname = NULL;
+            unsigned int symval;
+            bfd_boolean is_def;
+
+            /* Starting a symbol definition.  */
+            c = asxxxx_get_byte (abfd, &error);
+
+            if (! asxxxx_skip_spaces (abfd, &c, *p_lineno, &error))
+              goto error_return;
+
+            if (! asxxxx_get_word (abfd, &symname, &c, *p_lineno, &error))
+              goto error_return;
+
+            if (! asxxxx_skip_spaces (abfd, &c, *p_lineno, &error))
+              goto error_return;
+
+            if (c != 'D' && c != 'R')
+              {
+                asxxxx_bad_byte (abfd, c, *p_lineno, error);
+                goto error_return;
+              }
+
+            is_def = (c == 'D');
+
+            c = asxxxx_get_byte (abfd, &error);
+            if (! asxxxx_skip_word (abfd, "ef", &c, *p_lineno, &error))
+              goto error_return;
+
+            if (! asxxxx_get_hex(abfd, &symval, &c, *p_lineno, &error))
+              goto error_return;
+
+            if (! asxxxx_get_eol (abfd, &c, p_lineno, &error))
+              goto error_return;
+
+            if (! asxxxx_new_symbol (abfd, symname, symval, BSF_GLOBAL, CURRENT_SECT(abfd) ? CURRENT_SECT(abfd) : (is_def ? bfd_abs_section_ptr : bfd_und_section_ptr)))
+              goto error_return;
+          }
+          break;
+        }
+    }
+
+  if (error)
+    goto error_return;
+
+  return TRUE;
+
+error_return:
+  return FALSE;
+}
+
+/* Check whether an existing file is an asxxxx .rel file.  */
+
+static bfd_boolean
+asxxxx_is_rel (bfd *abfd, unsigned int *p_lineno)
+{
+  int c;
+  bfd_boolean error = FALSE;
+
+  /* [XDQ][HL][234] */
+  switch (c = asxxxx_get_byte (abfd, &error))
+    {
+    default:
+      /* unknown line */
+      asxxxx_bad_byte (abfd, c, *p_lineno, error);
+      return FALSE;
+      break;
+
+    case ';':
+      c = asxxxx_get_byte (abfd, &error);
+
+      if (! asxxxx_skip_word (abfd, "!FILE ", &c, *p_lineno, &error))
+        {
+          return FALSE;
+        }
+      /* eat the rest of line */
+      if (! asxxxx_skip_line (abfd, &c, p_lineno, &error))
+        return FALSE;
+      break;
+
+    case 'X':
+      SET_RADIX (abfd, RADIX_HEX);
+      goto get_endian;
+    case 'D':
+      SET_RADIX (abfd, RADIX_DEC);
+      goto get_endian;
+    case 'Q':
+      SET_RADIX (abfd, RADIX_OCT);
+    get_endian:
+      switch (c = asxxxx_get_byte (abfd, &error))
+        {
+        default:
+          asxxxx_bad_byte (abfd, c, *p_lineno, error);
+          return FALSE;
+          break;
+
+        case 'H':
+          SET_ENDIAN (abfd, ENDIAN_BIG);
+          goto get_addr_size;
+        case 'L':
+          SET_ENDIAN (abfd, ENDIAN_LITTLE);
+        get_addr_size:
+          switch (c = asxxxx_get_byte (abfd, &error))
+            {
+            default:
+              asxxxx_bad_byte (abfd, c, *p_lineno, error);
+              return FALSE;
+              break;
+
+            case '\n':
+              ++*p_lineno;
+              /* fall through */
+            case '\r':
+              SET_ADDRESS_SIZE (abfd, ADDR_SIZE_2);
+              break;
+
+            case '2':
+              SET_ADDRESS_SIZE (abfd, ADDR_SIZE_2);
+              goto get_eol;
+            case '3':
+              SET_ADDRESS_SIZE (abfd, ADDR_SIZE_3);
+              goto get_eol;
+            case '4':
+              SET_ADDRESS_SIZE (abfd, ADDR_SIZE_4);
+            get_eol:
+              if (! asxxxx_get_eol (abfd, &c, p_lineno, &error))
+                return FALSE;
+              break;
+
+              break;
+           }
+          break;
+        }
+    }
+
+  return error ? FALSE : TRUE;
+}
+
+static const bfd_target *
+asxxxx_object_p (bfd *abfd)
+{
+  void * tdata_save;
+  unsigned int lineno = 1;
+
+  asxxxx_init ();
+
+  if (! asxxxx_mkobject (abfd) || ! asxxxx_is_rel (abfd, &lineno))
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  tdata_save = abfd->tdata.any;
+  if (! asxxxx_scan (abfd, &lineno))
+    {
+      if (abfd->tdata.any != tdata_save && abfd->tdata.any != NULL)
+        bfd_release (abfd, abfd->tdata.any);
+      abfd->tdata.any = tdata_save;
+      return NULL;
+    }
+
+  if (abfd->symcount > 0)
+    abfd->flags |= HAS_SYMS;
+
+  return abfd->xvec;
+}
+
+/* Get the contents of a section.  */
+
+static bfd_boolean
+asxxxx_get_section_contents (bfd *abfd ATTRIBUTE_UNUSED,
+                           asection *section ATTRIBUTE_UNUSED,
+                           void * location ATTRIBUTE_UNUSED,
+                           file_ptr offset ATTRIBUTE_UNUSED,
+                           bfd_size_type count ATTRIBUTE_UNUSED)
+{
+  return FALSE;
+}
+
+/* Set the architecture.  We accept an unknown architecture here.  */
+
+static bfd_boolean
+asxxxx_set_arch_mach (bfd *abfd, enum bfd_architecture arch, unsigned long mach)
+{
+  if (arch != bfd_arch_unknown)
+    return bfd_default_set_arch_mach (abfd, arch, mach);
+
+  abfd->arch_info = & bfd_default_arch_struct;
+  return TRUE;
+}
+
+/* Set the contents of a section.  */
+
+static bfd_boolean
+asxxxx_set_section_contents (bfd *abfd ATTRIBUTE_UNUSED,
+                           sec_ptr section ATTRIBUTE_UNUSED,
+                           const void * location ATTRIBUTE_UNUSED,
+                           file_ptr offset ATTRIBUTE_UNUSED,
+                           bfd_size_type bytes_to_do ATTRIBUTE_UNUSED)
+{
+  return FALSE;
+}
+
+static int
+asxxxx_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+                     struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+/* Return the amount of memory needed to read the symbol table.  */
+
+static long
+asxxxx_get_symtab_upper_bound (bfd *abfd)
+{
+  return (bfd_get_symcount (abfd) + 1) * sizeof (asymbol *);
+}
+
+/* Return the symbol table.  */
+
+static long
+asxxxx_canonicalize_symtab (bfd *abfd, asymbol **alocation)
+{
+  bfd_size_type symcount = bfd_get_symcount (abfd);
+  asymbol *csymbols;
+  unsigned int i;
+
+  csymbols = abfd->tdata.asxxxx_data->csymbols;
+  if (csymbols == NULL && symcount != 0)
+    {
+      asymbol *c;
+      struct asxxxx_symbol *s;
+
+      csymbols = (asymbol *) bfd_alloc (abfd, symcount * sizeof (asymbol));
+      if (csymbols == NULL)
+        return -1;
+      abfd->tdata.asxxxx_data->csymbols = csymbols;
+
+      for (s = abfd->tdata.asxxxx_data->symbols, c = csymbols;
+           s != NULL;
+           s = s->next, ++c)
+        {
+          c->the_bfd = abfd;
+          c->name = s->name;
+          c->value = s->val;
+          c->flags = s->flags;
+          c->section = s->section;
+          c->udata.p = NULL;
+        }
+    }
+
+  for (i = 0; i < symcount; i++)
+    *alocation++ = csymbols++;
+  *alocation = NULL;
+
+  return symcount;
+}
+
+static void
+asxxxx_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+                      asymbol *symbol,
+                      symbol_info *ret)
+{
+  bfd_symbol_info (symbol, ret);
+}
+
+static void
+asxxxx_print_symbol (bfd *abfd,
+                   void * afile,
+                   asymbol *symbol,
+                   bfd_print_symbol_type how)
+{
+  FILE *file = (FILE *) afile;
+
+  switch (how)
+    {
+    case bfd_print_symbol_name:
+      fprintf (file, "%s", symbol->name);
+      break;
+    default:
+      bfd_print_symbol_vandf (abfd, (void *) file, symbol);
+      fprintf (file, " %-5s %s",
+               symbol->section->name,
+               symbol->name);
+    }
+}
+
+#define asxxxx_close_and_cleanup                    _bfd_generic_close_and_cleanup
+#define asxxxx_bfd_free_cached_info                 _bfd_generic_bfd_free_cached_info
+#define asxxxx_new_section_hook                     _bfd_generic_new_section_hook
+#define asxxxx_bfd_is_target_special_symbol         ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define asxxxx_bfd_is_local_label_name              bfd_generic_is_local_label_name
+#define asxxxx_get_lineno                           _bfd_nosymbols_get_lineno
+#define asxxxx_find_nearest_line                    _bfd_nosymbols_find_nearest_line
+#define asxxxx_find_inliner_info                    _bfd_nosymbols_find_inliner_info
+#define asxxxx_make_empty_symbol                    _bfd_generic_make_empty_symbol
+#define asxxxx_bfd_make_debug_symbol                _bfd_nosymbols_bfd_make_debug_symbol
+#define asxxxx_read_minisymbols                     _bfd_generic_read_minisymbols
+#define asxxxx_minisymbol_to_symbol                 _bfd_generic_minisymbol_to_symbol
+#define asxxxx_get_section_contents_in_window       _bfd_generic_get_section_contents_in_window
+#define asxxxx_bfd_get_relocated_section_contents   bfd_generic_get_relocated_section_contents
+#define asxxxx_bfd_relax_section                    bfd_generic_relax_section
+#define asxxxx_bfd_gc_sections                      bfd_generic_gc_sections
+#define asxxxx_bfd_lookup_section_flags             bfd_generic_lookup_section_flags
+#define asxxxx_bfd_merge_sections                   bfd_generic_merge_sections
+#define asxxxx_bfd_is_group_section                 bfd_generic_is_group_section
+#define asxxxx_bfd_discard_group                    bfd_generic_discard_group
+#define asxxxx_section_already_linked               _bfd_generic_section_already_linked
+#define asxxxx_bfd_define_common_symbol             bfd_generic_define_common_symbol
+#define asxxxx_bfd_link_hash_table_create           _bfd_generic_link_hash_table_create
+#define asxxxx_bfd_link_hash_table_free             _bfd_generic_link_hash_table_free
+#define asxxxx_bfd_link_add_symbols                 _bfd_generic_link_add_symbols
+#define asxxxx_bfd_link_just_syms                   _bfd_generic_link_just_syms
+#define asxxxx_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define asxxxx_bfd_final_link                       _bfd_generic_final_link
+#define asxxxx_bfd_link_split_section               _bfd_generic_link_split_section
+
+const bfd_target asxxxx_vec =
+{
+  "asxxxx",                     /* Name.  */
+  bfd_target_asxxxx_flavour,
+  BFD_ENDIAN_UNKNOWN,           /* Target byte order.  */
+  BFD_ENDIAN_UNKNOWN,           /* Target headers byte order.  */
+  (HAS_RELOC | EXEC_P |         /* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+  (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
+   | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* Section flags.  */
+  0,                            /* Leading underscore.  */
+  '/',                          /* AR_pad_char.  */
+  15,                           /* AR_max_namelen.  */
+  1,                            /* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,   /* Data.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,   /* Hdrs.  */
+
+  {     /* Check the format of a file being read.  Return a <<bfd_target *>> or zero.  */
+
+    _bfd_dummy_target,
+    asxxxx_object_p,            /* object */
+    bfd_generic_archive_p,      /* archive */
+    _bfd_dummy_target,          /* core */
+  },
+  {     /* Set the format of a file being written.  */
+    bfd_false,
+    asxxxx_mkobject,            /* object */
+    _bfd_generic_mkarchive,     /* archive */
+    bfd_false,                  /* core */
+  },
+  {     /* Write cached information into a file being written, at <<bfd_close>>.  */
+    bfd_false,
+    bfd_false, //    asxxxx_write_object_contents, /* object */
+    _bfd_write_archive_contents,  /* archive */
+    bfd_false,                    /* core */
+  },
+
+  BFD_JUMP_TABLE_GENERIC (asxxxx),
+  BFD_JUMP_TABLE_COPY (_bfd_generic),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+  BFD_JUMP_TABLE_SYMBOLS (asxxxx),
+  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+  BFD_JUMP_TABLE_WRITE (asxxxx),
+  BFD_JUMP_TABLE_LINK (asxxxx),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  NULL
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/bfd-in.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/bfd-in.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/bfd-in.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/bfd-in.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,967 @@
+/* Main header file for the bfd library -- portable access to object files.
+
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   Contributed by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef __BFD_H_SEEN__
+#define __BFD_H_SEEN__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "ansidecl.h"
+#include "symcat.h"
+#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
+#ifndef SABER
+/* This hack is to avoid a problem with some strict ANSI C preprocessors.
+   The problem is, "32_" is not a valid preprocessing token, and we don't
+   want extra underscores (e.g., "nlm_32_").  The XCONCAT2 macro will
+   cause the inner CONCAT2 macros to be evaluated first, producing
+   still-valid pp-tokens.  Then the final concatenation can be done.  */
+#undef CONCAT4
+#define CONCAT4(a,b,c,d) XCONCAT2(CONCAT2(a,b),CONCAT2(c,d))
+#endif
+#endif
+
+/* This is a utility macro to handle the situation where the code
+   wants to place a constant string into the code, followed by a
+   comma and then the length of the string.  Doing this by hand
+   is error prone, so using this macro is safer.  */
+#define STRING_COMMA_LEN(STR) (STR), (sizeof (STR) - 1)
+/* Unfortunately it is not possible to use the STRING_COMMA_LEN macro
+   to create the arguments to another macro, since the preprocessor
+   will mis-count the number of arguments to the outer macro (by not
+   evaluating STRING_COMMA_LEN and so missing the comma).  This is a
+   problem for example when trying to use STRING_COMMA_LEN to build
+   the arguments to the strncmp() macro.  Hence this alternative
+   definition of strncmp is provided here.
+   
+   Note - these macros do NOT work if STR2 is not a constant string.  */
+#define CONST_STRNEQ(STR1,STR2) (strncmp ((STR1), (STR2), sizeof (STR2) - 1) == 0)
+  /* strcpy() can have a similar problem, but since we know we are
+     copying a constant string, we can use memcpy which will be faster
+     since there is no need to check for a NUL byte inside STR.  We
+     can also save time if we do not need to copy the terminating NUL.  */
+#define LITMEMCPY(DEST,STR2) memcpy ((DEST), (STR2), sizeof (STR2) - 1)
+#define LITSTRCPY(DEST,STR2) memcpy ((DEST), (STR2), sizeof (STR2))
+
+
+#define BFD_SUPPORTS_PLUGINS @supports_plugins@
+
+/* The word size used by BFD on the host.  This may be 64 with a 32
+   bit target if the host is 64 bit, or if other 64 bit targets have
+   been selected with --enable-targets, or if --enable-64-bit-bfd.  */
+#define BFD_ARCH_SIZE @wordsize@
+
+/* The word size of the default bfd target.  */
+#define BFD_DEFAULT_TARGET_SIZE @bfd_default_target_size@
+
+#define BFD_HOST_64BIT_LONG @BFD_HOST_64BIT_LONG@
+#define BFD_HOST_64BIT_LONG_LONG @BFD_HOST_64BIT_LONG_LONG@
+#if @BFD_HOST_64_BIT_DEFINED@
+#define BFD_HOST_64_BIT @BFD_HOST_64_BIT@
+#define BFD_HOST_U_64_BIT @BFD_HOST_U_64_BIT@
+typedef BFD_HOST_64_BIT bfd_int64_t;
+typedef BFD_HOST_U_64_BIT bfd_uint64_t;
+#endif
+
+#if BFD_ARCH_SIZE >= 64
+#define BFD64
+#endif
+
+#ifndef INLINE
+#if __GNUC__ >= 2
+#define INLINE __inline__
+#else
+#define INLINE
+#endif
+#endif
+
+/* Declaring a type wide enough to hold a host long and a host pointer.  */
+#define BFD_HOSTPTR_T	@BFD_HOSTPTR_T@
+typedef BFD_HOSTPTR_T bfd_hostptr_t;
+
+/* Forward declaration.  */
+typedef struct bfd bfd;
+
+/* Boolean type used in bfd.  Too many systems define their own
+   versions of "boolean" for us to safely typedef a "boolean" of
+   our own.  Using an enum for "bfd_boolean" has its own set of
+   problems, with strange looking casts required to avoid warnings
+   on some older compilers.  Thus we just use an int.
+
+   General rule: Functions which are bfd_boolean return TRUE on
+   success and FALSE on failure (unless they're a predicate).  */
+
+typedef int bfd_boolean;
+#undef FALSE
+#undef TRUE
+#define FALSE 0
+#define TRUE 1
+
+#ifdef BFD64
+
+#ifndef BFD_HOST_64_BIT
+ #error No 64 bit integer type available
+#endif /* ! defined (BFD_HOST_64_BIT) */
+
+typedef BFD_HOST_U_64_BIT bfd_vma;
+typedef BFD_HOST_64_BIT bfd_signed_vma;
+typedef BFD_HOST_U_64_BIT bfd_size_type;
+typedef BFD_HOST_U_64_BIT symvalue;
+
+#if BFD_HOST_64BIT_LONG
+#define BFD_VMA_FMT "l"
+#elif defined (__MSVCRT__)
+#define BFD_VMA_FMT "I64"
+#else
+#define BFD_VMA_FMT "ll"
+#endif
+
+#ifndef fprintf_vma
+#define sprintf_vma(s,x) sprintf (s, "%016" BFD_VMA_FMT "x", x)
+#define fprintf_vma(f,x) fprintf (f, "%016" BFD_VMA_FMT "x", x)
+#endif
+
+#else /* not BFD64  */
+
+/* Represent a target address.  Also used as a generic unsigned type
+   which is guaranteed to be big enough to hold any arithmetic types
+   we need to deal with.  */
+typedef unsigned long bfd_vma;
+
+/* A generic signed type which is guaranteed to be big enough to hold any
+   arithmetic types we need to deal with.  Can be assumed to be compatible
+   with bfd_vma in the same way that signed and unsigned ints are compatible
+   (as parameters, in assignment, etc).  */
+typedef long bfd_signed_vma;
+
+typedef unsigned long symvalue;
+typedef unsigned long bfd_size_type;
+
+/* Print a bfd_vma x on stream s.  */
+#define BFD_VMA_FMT "l"
+#define fprintf_vma(s,x) fprintf (s, "%08" BFD_VMA_FMT "x", x)
+#define sprintf_vma(s,x) sprintf (s, "%08" BFD_VMA_FMT "x", x)
+
+#endif /* not BFD64  */
+
+#define HALF_BFD_SIZE_TYPE \
+  (((bfd_size_type) 1) << (8 * sizeof (bfd_size_type) / 2))
+
+#ifndef BFD_HOST_64_BIT
+/* Fall back on a 32 bit type.  The idea is to make these types always
+   available for function return types, but in the case that
+   BFD_HOST_64_BIT is undefined such a function should abort or
+   otherwise signal an error.  */
+typedef bfd_signed_vma bfd_int64_t;
+typedef bfd_vma bfd_uint64_t;
+#endif
+
+/* An offset into a file.  BFD always uses the largest possible offset
+   based on the build time availability of fseek, fseeko, or fseeko64.  */
+typedef @bfd_file_ptr@ file_ptr;
+typedef unsigned @bfd_file_ptr@ ufile_ptr;
+
+extern void bfd_sprintf_vma (bfd *, char *, bfd_vma);
+extern void bfd_fprintf_vma (bfd *, void *, bfd_vma);
+
+#define printf_vma(x) fprintf_vma(stdout,x)
+#define bfd_printf_vma(abfd,x) bfd_fprintf_vma (abfd,stdout,x)
+
+typedef unsigned int flagword;	/* 32 bits of flags */
+typedef unsigned char bfd_byte;
+
+/* File formats.  */
+
+typedef enum bfd_format
+{
+  bfd_unknown = 0,	/* File format is unknown.  */
+  bfd_object,		/* Linker/assembler/compiler output.  */
+  bfd_archive,		/* Object archive file.  */
+  bfd_core,		/* Core dump.  */
+  bfd_type_end		/* Marks the end; don't use it!  */
+}
+bfd_format;
+
+/* Symbols and relocation.  */
+
+/* A count of carsyms (canonical archive symbols).  */
+typedef unsigned long symindex;
+
+/* How to perform a relocation.  */
+typedef const struct reloc_howto_struct reloc_howto_type;
+
+#define BFD_NO_MORE_SYMBOLS ((symindex) ~0)
+
+/* General purpose part of a symbol X;
+   target specific parts are in libcoff.h, libaout.h, etc.  */
+
+#define bfd_get_section(x) ((x)->section)
+#define bfd_get_output_section(x) ((x)->section->output_section)
+#define bfd_set_section(x,y) ((x)->section) = (y)
+#define bfd_asymbol_base(x) ((x)->section->vma)
+#define bfd_asymbol_value(x) (bfd_asymbol_base(x) + (x)->value)
+#define bfd_asymbol_name(x) ((x)->name)
+/*Perhaps future: #define bfd_asymbol_bfd(x) ((x)->section->owner)*/
+#define bfd_asymbol_bfd(x) ((x)->the_bfd)
+#define bfd_asymbol_flavour(x)			\
+  (((x)->flags & BSF_SYNTHETIC) != 0		\
+   ? bfd_target_unknown_flavour			\
+   : bfd_asymbol_bfd (x)->xvec->flavour)
+
+/* A canonical archive symbol.  */
+/* This is a type pun with struct ranlib on purpose!  */
+typedef struct carsym
+{
+  char *name;
+  file_ptr file_offset;	/* Look here to find the file.  */
+}
+carsym;			/* To make these you call a carsymogen.  */
+
+/* Used in generating armaps (archive tables of contents).
+   Perhaps just a forward definition would do?  */
+struct orl 			/* Output ranlib.  */
+{
+  char **name;		/* Symbol name.  */
+  union
+  {
+    file_ptr pos;
+    bfd *abfd;
+  } u;			/* bfd* or file position.  */
+  int namidx;		/* Index into string table.  */
+};
+
+/* Linenumber stuff.  */
+typedef struct lineno_cache_entry
+{
+  unsigned int line_number;	/* Linenumber from start of function.  */
+  union
+  {
+    struct bfd_symbol *sym;	/* Function name.  */
+    bfd_vma offset;	    		/* Offset into section.  */
+  } u;
+}
+alent;
+
+/* Object and core file sections.  */
+
+#define	align_power(addr, align)	\
+  (((addr) + ((bfd_vma) 1 << (align)) - 1) & ((bfd_vma) -1 << (align)))
+
+typedef struct bfd_section *sec_ptr;
+
+#define bfd_get_section_name(bfd, ptr) ((ptr)->name + 0)
+#define bfd_get_section_vma(bfd, ptr) ((ptr)->vma + 0)
+#define bfd_get_section_lma(bfd, ptr) ((ptr)->lma + 0)
+#define bfd_get_section_alignment(bfd, ptr) ((ptr)->alignment_power + 0)
+#define bfd_section_name(bfd, ptr) ((ptr)->name)
+#define bfd_section_size(bfd, ptr) ((ptr)->size)
+#define bfd_get_section_size(ptr) ((ptr)->size)
+#define bfd_section_vma(bfd, ptr) ((ptr)->vma)
+#define bfd_section_lma(bfd, ptr) ((ptr)->lma)
+#define bfd_section_alignment(bfd, ptr) ((ptr)->alignment_power)
+#define bfd_get_section_flags(bfd, ptr) ((ptr)->flags + 0)
+#define bfd_get_section_userdata(bfd, ptr) ((ptr)->userdata)
+
+#define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0)
+
+#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE)
+#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE)
+#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE)
+/* Find the address one past the end of SEC.  */
+#define bfd_get_section_limit(bfd, sec) \
+  (((bfd)->direction != write_direction && (sec)->rawsize != 0	\
+    ? (sec)->rawsize : (sec)->size) / bfd_octets_per_byte (bfd))
+
+/* Return TRUE if input section SEC has been discarded.  */
+#define elf_discarded_section(sec)				\
+  (!bfd_is_abs_section (sec)					\
+   && bfd_is_abs_section ((sec)->output_section)		\
+   && (sec)->sec_info_type != ELF_INFO_TYPE_MERGE		\
+   && (sec)->sec_info_type != ELF_INFO_TYPE_JUST_SYMS)
+
+/* Forward define.  */
+struct stat;
+
+typedef enum bfd_print_symbol
+{
+  bfd_print_symbol_name,
+  bfd_print_symbol_more,
+  bfd_print_symbol_all
+} bfd_print_symbol_type;
+
+/* Information about a symbol that nm needs.  */
+
+typedef struct _symbol_info
+{
+  symvalue value;
+  char type;
+  const char *name;            /* Symbol name.  */
+  unsigned char stab_type;     /* Stab type.  */
+  char stab_other;             /* Stab other.  */
+  short stab_desc;             /* Stab desc.  */
+  const char *stab_name;       /* String for stab type.  */
+} symbol_info;
+
+/* Get the name of a stabs type code.  */
+
+extern const char *bfd_get_stab_name (int);
+
+/* Hash table routines.  There is no way to free up a hash table.  */
+
+/* An element in the hash table.  Most uses will actually use a larger
+   structure, and an instance of this will be the first field.  */
+
+struct bfd_hash_entry
+{
+  /* Next entry for this hash code.  */
+  struct bfd_hash_entry *next;
+  /* String being hashed.  */
+  const char *string;
+  /* Hash code.  This is the full hash code, not the index into the
+     table.  */
+  unsigned long hash;
+};
+
+/* A hash table.  */
+
+struct bfd_hash_table
+{
+  /* The hash array.  */
+  struct bfd_hash_entry **table;
+  /* A function used to create new elements in the hash table.  The
+     first entry is itself a pointer to an element.  When this
+     function is first invoked, this pointer will be NULL.  However,
+     having the pointer permits a hierarchy of method functions to be
+     built each of which calls the function in the superclass.  Thus
+     each function should be written to allocate a new block of memory
+     only if the argument is NULL.  */
+  struct bfd_hash_entry *(*newfunc)
+    (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
+   /* An objalloc for this hash table.  This is a struct objalloc *,
+     but we use void * to avoid requiring the inclusion of objalloc.h.  */
+  void *memory;
+  /* The number of slots in the hash table.  */
+  unsigned int size;
+  /* The number of entries in the hash table.  */
+  unsigned int count;
+  /* The size of elements.  */
+  unsigned int entsize;
+  /* If non-zero, don't grow the hash table.  */
+  unsigned int frozen:1;
+};
+
+/* Initialize a hash table.  */
+extern bfd_boolean bfd_hash_table_init
+  (struct bfd_hash_table *,
+   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
+			       struct bfd_hash_table *,
+			       const char *),
+   unsigned int);
+
+/* Initialize a hash table specifying a size.  */
+extern bfd_boolean bfd_hash_table_init_n
+  (struct bfd_hash_table *,
+   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
+			       struct bfd_hash_table *,
+			       const char *),
+   unsigned int, unsigned int);
+
+/* Free up a hash table.  */
+extern void bfd_hash_table_free
+  (struct bfd_hash_table *);
+
+/* Look up a string in a hash table.  If CREATE is TRUE, a new entry
+   will be created for this string if one does not already exist.  The
+   COPY argument must be TRUE if this routine should copy the string
+   into newly allocated memory when adding an entry.  */
+extern struct bfd_hash_entry *bfd_hash_lookup
+  (struct bfd_hash_table *, const char *, bfd_boolean create,
+   bfd_boolean copy);
+
+/* Insert an entry in a hash table.  */
+extern struct bfd_hash_entry *bfd_hash_insert
+  (struct bfd_hash_table *, const char *, unsigned long);
+
+/* Rename an entry in a hash table.  */
+extern void bfd_hash_rename
+  (struct bfd_hash_table *, const char *, struct bfd_hash_entry *);
+
+/* Replace an entry in a hash table.  */
+extern void bfd_hash_replace
+  (struct bfd_hash_table *, struct bfd_hash_entry *old,
+   struct bfd_hash_entry *nw);
+
+/* Base method for creating a hash table entry.  */
+extern struct bfd_hash_entry *bfd_hash_newfunc
+  (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
+
+/* Grab some space for a hash table entry.  */
+extern void *bfd_hash_allocate
+  (struct bfd_hash_table *, unsigned int);
+
+/* Traverse a hash table in a random order, calling a function on each
+   element.  If the function returns FALSE, the traversal stops.  The
+   INFO argument is passed to the function.  */
+extern void bfd_hash_traverse
+  (struct bfd_hash_table *,
+   bfd_boolean (*) (struct bfd_hash_entry *, void *),
+   void *info);
+
+/* Allows the default size of a hash table to be configured. New hash
+   tables allocated using bfd_hash_table_init will be created with
+   this size.  */
+extern unsigned long bfd_hash_set_default_size (unsigned long);
+
+/* This structure is used to keep track of stabs in sections
+   information while linking.  */
+
+struct stab_info
+{
+  /* A hash table used to hold stabs strings.  */
+  struct bfd_strtab_hash *strings;
+  /* The header file hash table.  */
+  struct bfd_hash_table includes;
+  /* The first .stabstr section.  */
+  struct bfd_section *stabstr;
+};
+
+#define COFF_SWAP_TABLE (void *) &bfd_coff_std_swap_table
+
+/* User program access to BFD facilities.  */
+
+/* Direct I/O routines, for programs which know more about the object
+   file than BFD does.  Use higher level routines if possible.  */
+
+extern bfd_size_type bfd_bread (void *, bfd_size_type, bfd *);
+extern bfd_size_type bfd_bwrite (const void *, bfd_size_type, bfd *);
+extern int bfd_seek (bfd *, file_ptr, int);
+extern file_ptr bfd_tell (bfd *);
+extern int bfd_flush (bfd *);
+extern int bfd_stat (bfd *, struct stat *);
+
+/* Deprecated old routines.  */
+#if __GNUC__
+#define bfd_read(BUF, ELTSIZE, NITEMS, ABFD)				\
+  (warn_deprecated ("bfd_read", __FILE__, __LINE__, __FUNCTION__),	\
+   bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
+#define bfd_write(BUF, ELTSIZE, NITEMS, ABFD)				\
+  (warn_deprecated ("bfd_write", __FILE__, __LINE__, __FUNCTION__),	\
+   bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
+#else
+#define bfd_read(BUF, ELTSIZE, NITEMS, ABFD)				\
+  (warn_deprecated ("bfd_read", (const char *) 0, 0, (const char *) 0), \
+   bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
+#define bfd_write(BUF, ELTSIZE, NITEMS, ABFD)				\
+  (warn_deprecated ("bfd_write", (const char *) 0, 0, (const char *) 0),\
+   bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
+#endif
+extern void warn_deprecated (const char *, const char *, int, const char *);
+
+/* Cast from const char * to char * so that caller can assign to
+   a char * without a warning.  */
+#define bfd_get_filename(abfd) ((char *) (abfd)->filename)
+#define bfd_get_cacheable(abfd) ((abfd)->cacheable)
+#define bfd_get_format(abfd) ((abfd)->format)
+#define bfd_get_target(abfd) ((abfd)->xvec->name)
+#define bfd_get_flavour(abfd) ((abfd)->xvec->flavour)
+#define bfd_family_coff(abfd) \
+  (bfd_get_flavour (abfd) == bfd_target_coff_flavour || \
+   bfd_get_flavour (abfd) == bfd_target_xcoff_flavour)
+#define bfd_big_endian(abfd) ((abfd)->xvec->byteorder == BFD_ENDIAN_BIG)
+#define bfd_little_endian(abfd) ((abfd)->xvec->byteorder == BFD_ENDIAN_LITTLE)
+#define bfd_header_big_endian(abfd) \
+  ((abfd)->xvec->header_byteorder == BFD_ENDIAN_BIG)
+#define bfd_header_little_endian(abfd) \
+  ((abfd)->xvec->header_byteorder == BFD_ENDIAN_LITTLE)
+#define bfd_get_file_flags(abfd) ((abfd)->flags)
+#define bfd_applicable_file_flags(abfd) ((abfd)->xvec->object_flags)
+#define bfd_applicable_section_flags(abfd) ((abfd)->xvec->section_flags)
+#define bfd_my_archive(abfd) ((abfd)->my_archive)
+#define bfd_has_map(abfd) ((abfd)->has_armap)
+#define bfd_is_thin_archive(abfd) ((abfd)->is_thin_archive)
+
+#define bfd_valid_reloc_types(abfd) ((abfd)->xvec->valid_reloc_types)
+#define bfd_usrdata(abfd) ((abfd)->usrdata)
+
+#define bfd_get_start_address(abfd) ((abfd)->start_address)
+#define bfd_get_symcount(abfd) ((abfd)->symcount)
+#define bfd_get_outsymbols(abfd) ((abfd)->outsymbols)
+#define bfd_count_sections(abfd) ((abfd)->section_count)
+
+#define bfd_get_dynamic_symcount(abfd) ((abfd)->dynsymcount)
+
+#define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char)
+
+#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE)
+
+extern bfd_boolean bfd_cache_close
+  (bfd *abfd);
+/* NB: This declaration should match the autogenerated one in libbfd.h.  */
+
+extern bfd_boolean bfd_cache_close_all (void);
+
+extern bfd_boolean bfd_record_phdr
+  (bfd *, unsigned long, bfd_boolean, flagword, bfd_boolean, bfd_vma,
+   bfd_boolean, bfd_boolean, unsigned int, struct bfd_section **);
+
+/* Byte swapping routines.  */
+
+bfd_uint64_t bfd_getb64 (const void *);
+bfd_uint64_t bfd_getl64 (const void *);
+bfd_int64_t bfd_getb_signed_64 (const void *);
+bfd_int64_t bfd_getl_signed_64 (const void *);
+bfd_vma bfd_getb32 (const void *);
+bfd_vma bfd_getl32 (const void *);
+bfd_signed_vma bfd_getb_signed_32 (const void *);
+bfd_signed_vma bfd_getl_signed_32 (const void *);
+bfd_vma bfd_getb16 (const void *);
+bfd_vma bfd_getl16 (const void *);
+bfd_signed_vma bfd_getb_signed_16 (const void *);
+bfd_signed_vma bfd_getl_signed_16 (const void *);
+void bfd_putb64 (bfd_uint64_t, void *);
+void bfd_putl64 (bfd_uint64_t, void *);
+void bfd_putb32 (bfd_vma, void *);
+void bfd_putl32 (bfd_vma, void *);
+void bfd_putb16 (bfd_vma, void *);
+void bfd_putl16 (bfd_vma, void *);
+
+/* Byte swapping routines which take size and endiannes as arguments.  */
+
+bfd_uint64_t bfd_get_bits (const void *, int, bfd_boolean);
+void bfd_put_bits (bfd_uint64_t, void *, int, bfd_boolean);
+
+#if defined(__STDC__) || defined(ALMOST_STDC)
+struct ecoff_debug_info;
+struct ecoff_debug_swap;
+struct ecoff_extr;
+struct bfd_symbol;
+struct bfd_link_info;
+struct bfd_link_hash_entry;
+struct bfd_section_already_linked;
+struct bfd_elf_version_tree;
+#endif
+
+extern bfd_boolean bfd_section_already_linked_table_init (void);
+extern void bfd_section_already_linked_table_free (void);
+extern bfd_boolean _bfd_handle_already_linked
+  (struct bfd_section *, struct bfd_section_already_linked *,
+   struct bfd_link_info *);
+
+/* Externally visible ECOFF routines.  */
+
+extern bfd_vma bfd_ecoff_get_gp_value
+  (bfd * abfd);
+extern bfd_boolean bfd_ecoff_set_gp_value
+  (bfd *abfd, bfd_vma gp_value);
+extern bfd_boolean bfd_ecoff_set_regmasks
+  (bfd *abfd, unsigned long gprmask, unsigned long fprmask,
+   unsigned long *cprmask);
+extern void *bfd_ecoff_debug_init
+  (bfd *output_bfd, struct ecoff_debug_info *output_debug,
+   const struct ecoff_debug_swap *output_swap, struct bfd_link_info *);
+extern void bfd_ecoff_debug_free
+  (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
+   const struct ecoff_debug_swap *output_swap, struct bfd_link_info *);
+extern bfd_boolean bfd_ecoff_debug_accumulate
+  (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
+   const struct ecoff_debug_swap *output_swap, bfd *input_bfd,
+   struct ecoff_debug_info *input_debug,
+   const struct ecoff_debug_swap *input_swap, struct bfd_link_info *);
+extern bfd_boolean bfd_ecoff_debug_accumulate_other
+  (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
+   const struct ecoff_debug_swap *output_swap, bfd *input_bfd,
+   struct bfd_link_info *);
+extern bfd_boolean bfd_ecoff_debug_externals
+  (bfd *abfd, struct ecoff_debug_info *debug,
+   const struct ecoff_debug_swap *swap, bfd_boolean relocatable,
+   bfd_boolean (*get_extr) (struct bfd_symbol *, struct ecoff_extr *),
+   void (*set_index) (struct bfd_symbol *, bfd_size_type));
+extern bfd_boolean bfd_ecoff_debug_one_external
+  (bfd *abfd, struct ecoff_debug_info *debug,
+   const struct ecoff_debug_swap *swap, const char *name,
+   struct ecoff_extr *esym);
+extern bfd_size_type bfd_ecoff_debug_size
+  (bfd *abfd, struct ecoff_debug_info *debug,
+   const struct ecoff_debug_swap *swap);
+extern bfd_boolean bfd_ecoff_write_debug
+  (bfd *abfd, struct ecoff_debug_info *debug,
+   const struct ecoff_debug_swap *swap, file_ptr where);
+extern bfd_boolean bfd_ecoff_write_accumulated_debug
+  (void *handle, bfd *abfd, struct ecoff_debug_info *debug,
+   const struct ecoff_debug_swap *swap,
+   struct bfd_link_info *info, file_ptr where);
+
+/* Externally visible ELF routines.  */
+
+struct bfd_link_needed_list
+{
+  struct bfd_link_needed_list *next;
+  bfd *by;
+  const char *name;
+};
+
+enum dynamic_lib_link_class {
+  DYN_NORMAL = 0,
+  DYN_AS_NEEDED = 1,
+  DYN_DT_NEEDED = 2,
+  DYN_NO_ADD_NEEDED = 4,
+  DYN_NO_NEEDED = 8
+};
+
+enum notice_asneeded_action {
+  notice_as_needed,
+  notice_not_needed,
+  notice_needed
+};
+
+extern bfd_boolean bfd_elf_record_link_assignment
+  (bfd *, struct bfd_link_info *, const char *, bfd_boolean,
+   bfd_boolean);
+extern struct bfd_link_needed_list *bfd_elf_get_needed_list
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean bfd_elf_get_bfd_needed_list
+  (bfd *, struct bfd_link_needed_list **);
+extern bfd_boolean bfd_elf_size_dynamic_sections
+  (bfd *, const char *, const char *, const char *, const char *, const char *,
+   const char * const *, struct bfd_link_info *, struct bfd_section **);
+extern bfd_boolean bfd_elf_size_dynsym_hash_dynstr
+  (bfd *, struct bfd_link_info *);
+extern void bfd_elf_set_dt_needed_name
+  (bfd *, const char *);
+extern const char *bfd_elf_get_dt_soname
+  (bfd *);
+extern void bfd_elf_set_dyn_lib_class
+  (bfd *, enum dynamic_lib_link_class);
+extern int bfd_elf_get_dyn_lib_class
+  (bfd *);
+extern struct bfd_link_needed_list *bfd_elf_get_runpath_list
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean bfd_elf_discard_info
+  (bfd *, struct bfd_link_info *);
+extern unsigned int _bfd_elf_default_action_discarded
+  (struct bfd_section *);
+
+/* Return an upper bound on the number of bytes required to store a
+   copy of ABFD's program header table entries.  Return -1 if an error
+   occurs; bfd_get_error will return an appropriate code.  */
+extern long bfd_get_elf_phdr_upper_bound
+  (bfd *abfd);
+
+/* Copy ABFD's program header table entries to *PHDRS.  The entries
+   will be stored as an array of Elf_Internal_Phdr structures, as
+   defined in include/elf/internal.h.  To find out how large the
+   buffer needs to be, call bfd_get_elf_phdr_upper_bound.
+
+   Return the number of program header table entries read, or -1 if an
+   error occurs; bfd_get_error will return an appropriate code.  */
+extern int bfd_get_elf_phdrs
+  (bfd *abfd, void *phdrs);
+
+/* Create a new BFD as if by bfd_openr.  Rather than opening a file,
+   reconstruct an ELF file by reading the segments out of remote memory
+   based on the ELF file header at EHDR_VMA and the ELF program headers it
+   points to.  If not null, *LOADBASEP is filled in with the difference
+   between the VMAs from which the segments were read, and the VMAs the
+   file headers (and hence BFD's idea of each section's VMA) put them at.
+
+   The function TARGET_READ_MEMORY is called to copy LEN bytes from the
+   remote memory at target address VMA into the local buffer at MYADDR; it
+   should return zero on success or an `errno' code on failure.  TEMPL must
+   be a BFD for an ELF target with the word size and byte order found in
+   the remote memory.  */
+extern bfd *bfd_elf_bfd_from_remote_memory
+  (bfd *templ, bfd_vma ehdr_vma, bfd_vma *loadbasep,
+   int (*target_read_memory) (bfd_vma vma, bfd_byte *myaddr, int len));
+
+/* Return the arch_size field of an elf bfd, or -1 if not elf.  */
+extern int bfd_get_arch_size
+  (bfd *);
+
+/* Return TRUE if address "naturally" sign extends, or -1 if not elf.  */
+extern int bfd_get_sign_extend_vma
+  (bfd *);
+
+extern struct bfd_section *_bfd_elf_tls_setup
+  (bfd *, struct bfd_link_info *);
+
+extern void _bfd_fix_excluded_sec_syms
+  (bfd *, struct bfd_link_info *);
+
+extern unsigned bfd_m68k_mach_to_features (int);
+
+extern int bfd_m68k_features_to_mach (unsigned);
+
+extern bfd_boolean bfd_m68k_elf32_create_embedded_relocs
+  (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *,
+   char **);
+
+extern void bfd_elf_m68k_set_target_options (struct bfd_link_info *, int);
+
+extern bfd_boolean bfd_bfin_elf32_create_embedded_relocs
+  (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *,
+   char **);
+
+extern bfd_boolean bfd_cr16_elf32_create_embedded_relocs
+  (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *,
+   char **);
+
+/* SunOS shared library support routines for the linker.  */
+
+extern struct bfd_link_needed_list *bfd_sunos_get_needed_list
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean bfd_sunos_record_link_assignment
+  (bfd *, struct bfd_link_info *, const char *);
+extern bfd_boolean bfd_sunos_size_dynamic_sections
+  (bfd *, struct bfd_link_info *, struct bfd_section **,
+   struct bfd_section **, struct bfd_section **);
+
+/* Linux shared library support routines for the linker.  */
+
+extern bfd_boolean bfd_i386linux_size_dynamic_sections
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean bfd_m68klinux_size_dynamic_sections
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean bfd_sparclinux_size_dynamic_sections
+  (bfd *, struct bfd_link_info *);
+
+/* mmap hacks */
+
+struct _bfd_window_internal;
+typedef struct _bfd_window_internal bfd_window_internal;
+
+typedef struct _bfd_window
+{
+  /* What the user asked for.  */
+  void *data;
+  bfd_size_type size;
+  /* The actual window used by BFD.  Small user-requested read-only
+     regions sharing a page may share a single window into the object
+     file.  Read-write versions shouldn't until I've fixed things to
+     keep track of which portions have been claimed by the
+     application; don't want to give the same region back when the
+     application wants two writable copies!  */
+  struct _bfd_window_internal *i;
+}
+bfd_window;
+
+extern void bfd_init_window
+  (bfd_window *);
+extern void bfd_free_window
+  (bfd_window *);
+extern bfd_boolean bfd_get_file_window
+  (bfd *, file_ptr, bfd_size_type, bfd_window *, bfd_boolean);
+
+/* XCOFF support routines for the linker.  */
+
+extern bfd_boolean bfd_xcoff_split_import_path
+  (bfd *, const char *, const char **, const char **);
+extern bfd_boolean bfd_xcoff_set_archive_import_path
+  (struct bfd_link_info *, bfd *, const char *);
+extern bfd_boolean bfd_xcoff_link_record_set
+  (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, bfd_size_type);
+extern bfd_boolean bfd_xcoff_import_symbol
+  (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, bfd_vma,
+   const char *, const char *, const char *, unsigned int);
+extern bfd_boolean bfd_xcoff_export_symbol
+  (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *);
+extern bfd_boolean bfd_xcoff_link_count_reloc
+  (bfd *, struct bfd_link_info *, const char *);
+extern bfd_boolean bfd_xcoff_record_link_assignment
+  (bfd *, struct bfd_link_info *, const char *);
+extern bfd_boolean bfd_xcoff_size_dynamic_sections
+  (bfd *, struct bfd_link_info *, const char *, const char *,
+   unsigned long, unsigned long, unsigned long, bfd_boolean,
+   int, bfd_boolean, unsigned int, struct bfd_section **, bfd_boolean);
+extern bfd_boolean bfd_xcoff_link_generate_rtinit
+  (bfd *, const char *, const char *, bfd_boolean);
+
+/* XCOFF support routines for ar.  */
+extern bfd_boolean bfd_xcoff_ar_archive_set_magic
+  (bfd *, char *);
+
+/* Externally visible COFF routines.  */
+
+#if defined(__STDC__) || defined(ALMOST_STDC)
+struct internal_syment;
+union internal_auxent;
+#endif
+
+extern bfd_boolean bfd_coff_get_syment
+  (bfd *, struct bfd_symbol *, struct internal_syment *);
+
+extern bfd_boolean bfd_coff_get_auxent
+  (bfd *, struct bfd_symbol *, int, union internal_auxent *);
+
+extern bfd_boolean bfd_coff_set_symbol_class
+  (bfd *, struct bfd_symbol *, unsigned int);
+
+extern bfd_boolean bfd_m68k_coff_create_embedded_relocs
+  (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, char **);
+
+/* ARM VFP11 erratum workaround support.  */
+typedef enum
+{
+  BFD_ARM_VFP11_FIX_DEFAULT,
+  BFD_ARM_VFP11_FIX_NONE,
+  BFD_ARM_VFP11_FIX_SCALAR,
+  BFD_ARM_VFP11_FIX_VECTOR
+} bfd_arm_vfp11_fix;
+
+extern void bfd_elf32_arm_init_maps
+  (bfd *);
+
+extern void bfd_elf32_arm_set_vfp11_fix
+  (bfd *, struct bfd_link_info *);
+
+extern void bfd_elf32_arm_set_cortex_a8_fix
+  (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean bfd_elf32_arm_vfp11_erratum_scan
+  (bfd *, struct bfd_link_info *);
+
+extern void bfd_elf32_arm_vfp11_fix_veneer_locations
+  (bfd *, struct bfd_link_info *);
+
+/* ARM Interworking support.  Called from linker.  */
+extern bfd_boolean bfd_arm_allocate_interworking_sections
+  (struct bfd_link_info *);
+
+extern bfd_boolean bfd_arm_process_before_allocation
+  (bfd *, struct bfd_link_info *, int);
+
+extern bfd_boolean bfd_arm_get_bfd_for_interworking
+  (bfd *, struct bfd_link_info *);
+
+/* PE ARM Interworking support.  Called from linker.  */
+extern bfd_boolean bfd_arm_pe_allocate_interworking_sections
+  (struct bfd_link_info *);
+
+extern bfd_boolean bfd_arm_pe_process_before_allocation
+  (bfd *, struct bfd_link_info *, int);
+
+extern bfd_boolean bfd_arm_pe_get_bfd_for_interworking
+  (bfd *, struct bfd_link_info *);
+
+/* ELF ARM Interworking support.  Called from linker.  */
+extern bfd_boolean bfd_elf32_arm_allocate_interworking_sections
+  (struct bfd_link_info *);
+
+extern bfd_boolean bfd_elf32_arm_process_before_allocation
+  (bfd *, struct bfd_link_info *);
+
+void bfd_elf32_arm_set_target_relocs
+  (bfd *, struct bfd_link_info *, int, char *, int, int, bfd_arm_vfp11_fix,
+   int, int, int, int, int);
+
+extern bfd_boolean bfd_elf32_arm_get_bfd_for_interworking
+  (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean bfd_elf32_arm_add_glue_sections_to_bfd
+  (bfd *, struct bfd_link_info *);
+
+/* ELF ARM mapping symbol support */
+#define BFD_ARM_SPECIAL_SYM_TYPE_MAP	(1 << 0)
+#define BFD_ARM_SPECIAL_SYM_TYPE_TAG	(1 << 1)
+#define BFD_ARM_SPECIAL_SYM_TYPE_OTHER  (1 << 2)
+#define BFD_ARM_SPECIAL_SYM_TYPE_ANY	(~0)
+extern bfd_boolean bfd_is_arm_special_symbol_name
+  (const char * name, int type);
+
+extern void bfd_elf32_arm_set_byteswap_code (struct bfd_link_info *, int);
+
+/* ARM Note section processing.  */
+extern bfd_boolean bfd_arm_merge_machines
+  (bfd *, bfd *);
+
+extern bfd_boolean bfd_arm_update_notes
+  (bfd *, const char *);
+
+extern unsigned int bfd_arm_get_mach_from_notes
+  (bfd *, const char *);
+
+/* ARM stub generation support.  Called from the linker.  */
+extern int elf32_arm_setup_section_lists
+  (bfd *, struct bfd_link_info *);
+extern void elf32_arm_next_input_section
+  (struct bfd_link_info *, struct bfd_section *);
+extern bfd_boolean elf32_arm_size_stubs
+  (bfd *, bfd *, struct bfd_link_info *, bfd_signed_vma,
+   struct bfd_section * (*) (const char *, struct bfd_section *), void (*) (void));
+extern bfd_boolean elf32_arm_build_stubs
+  (struct bfd_link_info *);
+
+/* ARM unwind section editing support.  */
+extern bfd_boolean elf32_arm_fix_exidx_coverage
+(struct bfd_section **, unsigned int, struct bfd_link_info *, bfd_boolean);
+
+/* C6x unwind section editing support.  */
+extern bfd_boolean elf32_tic6x_fix_exidx_coverage
+(struct bfd_section **, unsigned int, struct bfd_link_info *, bfd_boolean);
+
+/* PowerPC @tls opcode transform/validate.  */
+extern unsigned int _bfd_elf_ppc_at_tls_transform
+  (unsigned int, unsigned int);
+/* PowerPC @tprel opcode transform/validate.  */
+extern unsigned int _bfd_elf_ppc_at_tprel_transform
+  (unsigned int, unsigned int);
+
+/* TI COFF load page support.  */
+extern void bfd_ticoff_set_section_load_page
+  (struct bfd_section *, int);
+
+extern int bfd_ticoff_get_section_load_page
+  (struct bfd_section *);
+
+/* H8/300 functions.  */
+extern bfd_vma bfd_h8300_pad_address
+  (bfd *, bfd_vma);
+
+/* IA64 Itanium code generation.  Called from linker.  */
+extern void bfd_elf32_ia64_after_parse
+  (int);
+
+extern void bfd_elf64_ia64_after_parse
+  (int);
+
+/* This structure is used for a comdat section, as in PE.  A comdat
+   section is associated with a particular symbol.  When the linker
+   sees a comdat section, it keeps only one of the sections with a
+   given name and associated with a given symbol.  */
+
+struct coff_comdat_info
+{
+  /* The name of the symbol associated with a comdat section.  */
+  const char *name;
+
+  /* The local symbol table index of the symbol associated with a
+     comdat section.  This is only meaningful to the object file format
+     specific code; it is not an index into the list returned by
+     bfd_canonicalize_symtab.  */
+  long symbol;
+};
+
+extern struct coff_comdat_info *bfd_coff_get_comdat_section
+  (bfd *, struct bfd_section *);
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/bfd-in2.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/bfd-in2.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/bfd-in2.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/bfd-in2.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,6230 @@
+/* DO NOT EDIT!  -*- buffer-read-only: t -*-  This file is automatically 
+   generated from "bfd-in.h", "init.c", "opncls.c", "libbfd.c", 
+   "bfdio.c", "bfdwin.c", "section.c", "archures.c", "reloc.c", 
+   "syms.c", "bfd.c", "archive.c", "corefile.c", "targets.c", "format.c", 
+   "linker.c", "simple.c" and "compress.c".
+   Run "make headers" in your build bfd/ to regenerate.  */
+
+/* Main header file for the bfd library -- portable access to object files.
+
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   Contributed by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef __BFD_H_SEEN__
+#define __BFD_H_SEEN__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "ansidecl.h"
+#include "symcat.h"
+#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
+#ifndef SABER
+/* This hack is to avoid a problem with some strict ANSI C preprocessors.
+   The problem is, "32_" is not a valid preprocessing token, and we don't
+   want extra underscores (e.g., "nlm_32_").  The XCONCAT2 macro will
+   cause the inner CONCAT2 macros to be evaluated first, producing
+   still-valid pp-tokens.  Then the final concatenation can be done.  */
+#undef CONCAT4
+#define CONCAT4(a,b,c,d) XCONCAT2(CONCAT2(a,b),CONCAT2(c,d))
+#endif
+#endif
+
+/* This is a utility macro to handle the situation where the code
+   wants to place a constant string into the code, followed by a
+   comma and then the length of the string.  Doing this by hand
+   is error prone, so using this macro is safer.  */
+#define STRING_COMMA_LEN(STR) (STR), (sizeof (STR) - 1)
+/* Unfortunately it is not possible to use the STRING_COMMA_LEN macro
+   to create the arguments to another macro, since the preprocessor
+   will mis-count the number of arguments to the outer macro (by not
+   evaluating STRING_COMMA_LEN and so missing the comma).  This is a
+   problem for example when trying to use STRING_COMMA_LEN to build
+   the arguments to the strncmp() macro.  Hence this alternative
+   definition of strncmp is provided here.
+   
+   Note - these macros do NOT work if STR2 is not a constant string.  */
+#define CONST_STRNEQ(STR1,STR2) (strncmp ((STR1), (STR2), sizeof (STR2) - 1) == 0)
+  /* strcpy() can have a similar problem, but since we know we are
+     copying a constant string, we can use memcpy which will be faster
+     since there is no need to check for a NUL byte inside STR.  We
+     can also save time if we do not need to copy the terminating NUL.  */
+#define LITMEMCPY(DEST,STR2) memcpy ((DEST), (STR2), sizeof (STR2) - 1)
+#define LITSTRCPY(DEST,STR2) memcpy ((DEST), (STR2), sizeof (STR2))
+
+
+#define BFD_SUPPORTS_PLUGINS @supports_plugins@
+
+/* The word size used by BFD on the host.  This may be 64 with a 32
+   bit target if the host is 64 bit, or if other 64 bit targets have
+   been selected with --enable-targets, or if --enable-64-bit-bfd.  */
+#define BFD_ARCH_SIZE @wordsize@
+
+/* The word size of the default bfd target.  */
+#define BFD_DEFAULT_TARGET_SIZE @bfd_default_target_size@
+
+#define BFD_HOST_64BIT_LONG @BFD_HOST_64BIT_LONG@
+#define BFD_HOST_64BIT_LONG_LONG @BFD_HOST_64BIT_LONG_LONG@
+#if @BFD_HOST_64_BIT_DEFINED@
+#define BFD_HOST_64_BIT @BFD_HOST_64_BIT@
+#define BFD_HOST_U_64_BIT @BFD_HOST_U_64_BIT@
+typedef BFD_HOST_64_BIT bfd_int64_t;
+typedef BFD_HOST_U_64_BIT bfd_uint64_t;
+#endif
+
+#if BFD_ARCH_SIZE >= 64
+#define BFD64
+#endif
+
+#ifndef INLINE
+#if __GNUC__ >= 2
+#define INLINE __inline__
+#else
+#define INLINE
+#endif
+#endif
+
+/* Declaring a type wide enough to hold a host long and a host pointer.  */
+#define BFD_HOSTPTR_T	@BFD_HOSTPTR_T@
+typedef BFD_HOSTPTR_T bfd_hostptr_t;
+
+/* Forward declaration.  */
+typedef struct bfd bfd;
+
+/* Boolean type used in bfd.  Too many systems define their own
+   versions of "boolean" for us to safely typedef a "boolean" of
+   our own.  Using an enum for "bfd_boolean" has its own set of
+   problems, with strange looking casts required to avoid warnings
+   on some older compilers.  Thus we just use an int.
+
+   General rule: Functions which are bfd_boolean return TRUE on
+   success and FALSE on failure (unless they're a predicate).  */
+
+typedef int bfd_boolean;
+#undef FALSE
+#undef TRUE
+#define FALSE 0
+#define TRUE 1
+
+#ifdef BFD64
+
+#ifndef BFD_HOST_64_BIT
+ #error No 64 bit integer type available
+#endif /* ! defined (BFD_HOST_64_BIT) */
+
+typedef BFD_HOST_U_64_BIT bfd_vma;
+typedef BFD_HOST_64_BIT bfd_signed_vma;
+typedef BFD_HOST_U_64_BIT bfd_size_type;
+typedef BFD_HOST_U_64_BIT symvalue;
+
+#if BFD_HOST_64BIT_LONG
+#define BFD_VMA_FMT "l"
+#elif defined (__MSVCRT__)
+#define BFD_VMA_FMT "I64"
+#else
+#define BFD_VMA_FMT "ll"
+#endif
+
+#ifndef fprintf_vma
+#define sprintf_vma(s,x) sprintf (s, "%016" BFD_VMA_FMT "x", x)
+#define fprintf_vma(f,x) fprintf (f, "%016" BFD_VMA_FMT "x", x)
+#endif
+
+#else /* not BFD64  */
+
+/* Represent a target address.  Also used as a generic unsigned type
+   which is guaranteed to be big enough to hold any arithmetic types
+   we need to deal with.  */
+typedef unsigned long bfd_vma;
+
+/* A generic signed type which is guaranteed to be big enough to hold any
+   arithmetic types we need to deal with.  Can be assumed to be compatible
+   with bfd_vma in the same way that signed and unsigned ints are compatible
+   (as parameters, in assignment, etc).  */
+typedef long bfd_signed_vma;
+
+typedef unsigned long symvalue;
+typedef unsigned long bfd_size_type;
+
+/* Print a bfd_vma x on stream s.  */
+#define BFD_VMA_FMT "l"
+#define fprintf_vma(s,x) fprintf (s, "%08" BFD_VMA_FMT "x", x)
+#define sprintf_vma(s,x) sprintf (s, "%08" BFD_VMA_FMT "x", x)
+
+#endif /* not BFD64  */
+
+#define HALF_BFD_SIZE_TYPE \
+  (((bfd_size_type) 1) << (8 * sizeof (bfd_size_type) / 2))
+
+#ifndef BFD_HOST_64_BIT
+/* Fall back on a 32 bit type.  The idea is to make these types always
+   available for function return types, but in the case that
+   BFD_HOST_64_BIT is undefined such a function should abort or
+   otherwise signal an error.  */
+typedef bfd_signed_vma bfd_int64_t;
+typedef bfd_vma bfd_uint64_t;
+#endif
+
+/* An offset into a file.  BFD always uses the largest possible offset
+   based on the build time availability of fseek, fseeko, or fseeko64.  */
+typedef @bfd_file_ptr@ file_ptr;
+typedef unsigned @bfd_file_ptr@ ufile_ptr;
+
+extern void bfd_sprintf_vma (bfd *, char *, bfd_vma);
+extern void bfd_fprintf_vma (bfd *, void *, bfd_vma);
+
+#define printf_vma(x) fprintf_vma(stdout,x)
+#define bfd_printf_vma(abfd,x) bfd_fprintf_vma (abfd,stdout,x)
+
+typedef unsigned int flagword;	/* 32 bits of flags */
+typedef unsigned char bfd_byte;
+
+/* File formats.  */
+
+typedef enum bfd_format
+{
+  bfd_unknown = 0,	/* File format is unknown.  */
+  bfd_object,		/* Linker/assembler/compiler output.  */
+  bfd_archive,		/* Object archive file.  */
+  bfd_core,		/* Core dump.  */
+  bfd_type_end		/* Marks the end; don't use it!  */
+}
+bfd_format;
+
+/* Symbols and relocation.  */
+
+/* A count of carsyms (canonical archive symbols).  */
+typedef unsigned long symindex;
+
+/* How to perform a relocation.  */
+typedef const struct reloc_howto_struct reloc_howto_type;
+
+#define BFD_NO_MORE_SYMBOLS ((symindex) ~0)
+
+/* General purpose part of a symbol X;
+   target specific parts are in libcoff.h, libaout.h, etc.  */
+
+#define bfd_get_section(x) ((x)->section)
+#define bfd_get_output_section(x) ((x)->section->output_section)
+#define bfd_set_section(x,y) ((x)->section) = (y)
+#define bfd_asymbol_base(x) ((x)->section->vma)
+#define bfd_asymbol_value(x) (bfd_asymbol_base(x) + (x)->value)
+#define bfd_asymbol_name(x) ((x)->name)
+/*Perhaps future: #define bfd_asymbol_bfd(x) ((x)->section->owner)*/
+#define bfd_asymbol_bfd(x) ((x)->the_bfd)
+#define bfd_asymbol_flavour(x)			\
+  (((x)->flags & BSF_SYNTHETIC) != 0		\
+   ? bfd_target_unknown_flavour			\
+   : bfd_asymbol_bfd (x)->xvec->flavour)
+
+/* A canonical archive symbol.  */
+/* This is a type pun with struct ranlib on purpose!  */
+typedef struct carsym
+{
+  char *name;
+  file_ptr file_offset;	/* Look here to find the file.  */
+}
+carsym;			/* To make these you call a carsymogen.  */
+
+/* Used in generating armaps (archive tables of contents).
+   Perhaps just a forward definition would do?  */
+struct orl 			/* Output ranlib.  */
+{
+  char **name;		/* Symbol name.  */
+  union
+  {
+    file_ptr pos;
+    bfd *abfd;
+  } u;			/* bfd* or file position.  */
+  int namidx;		/* Index into string table.  */
+};
+
+/* Linenumber stuff.  */
+typedef struct lineno_cache_entry
+{
+  unsigned int line_number;	/* Linenumber from start of function.  */
+  union
+  {
+    struct bfd_symbol *sym;	/* Function name.  */
+    bfd_vma offset;	    		/* Offset into section.  */
+  } u;
+}
+alent;
+
+/* Object and core file sections.  */
+
+#define	align_power(addr, align)	\
+  (((addr) + ((bfd_vma) 1 << (align)) - 1) & ((bfd_vma) -1 << (align)))
+
+typedef struct bfd_section *sec_ptr;
+
+#define bfd_get_section_name(bfd, ptr) ((ptr)->name + 0)
+#define bfd_get_section_vma(bfd, ptr) ((ptr)->vma + 0)
+#define bfd_get_section_lma(bfd, ptr) ((ptr)->lma + 0)
+#define bfd_get_section_alignment(bfd, ptr) ((ptr)->alignment_power + 0)
+#define bfd_section_name(bfd, ptr) ((ptr)->name)
+#define bfd_section_size(bfd, ptr) ((ptr)->size)
+#define bfd_get_section_size(ptr) ((ptr)->size)
+#define bfd_section_vma(bfd, ptr) ((ptr)->vma)
+#define bfd_section_lma(bfd, ptr) ((ptr)->lma)
+#define bfd_section_alignment(bfd, ptr) ((ptr)->alignment_power)
+#define bfd_get_section_flags(bfd, ptr) ((ptr)->flags + 0)
+#define bfd_get_section_userdata(bfd, ptr) ((ptr)->userdata)
+
+#define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0)
+
+#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE)
+#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE)
+#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE)
+/* Find the address one past the end of SEC.  */
+#define bfd_get_section_limit(bfd, sec) \
+  (((bfd)->direction != write_direction && (sec)->rawsize != 0	\
+    ? (sec)->rawsize : (sec)->size) / bfd_octets_per_byte (bfd))
+
+/* Return TRUE if input section SEC has been discarded.  */
+#define elf_discarded_section(sec)				\
+  (!bfd_is_abs_section (sec)					\
+   && bfd_is_abs_section ((sec)->output_section)		\
+   && (sec)->sec_info_type != ELF_INFO_TYPE_MERGE		\
+   && (sec)->sec_info_type != ELF_INFO_TYPE_JUST_SYMS)
+
+/* Forward define.  */
+struct stat;
+
+typedef enum bfd_print_symbol
+{
+  bfd_print_symbol_name,
+  bfd_print_symbol_more,
+  bfd_print_symbol_all
+} bfd_print_symbol_type;
+
+/* Information about a symbol that nm needs.  */
+
+typedef struct _symbol_info
+{
+  symvalue value;
+  char type;
+  const char *name;            /* Symbol name.  */
+  unsigned char stab_type;     /* Stab type.  */
+  char stab_other;             /* Stab other.  */
+  short stab_desc;             /* Stab desc.  */
+  const char *stab_name;       /* String for stab type.  */
+} symbol_info;
+
+/* Get the name of a stabs type code.  */
+
+extern const char *bfd_get_stab_name (int);
+
+/* Hash table routines.  There is no way to free up a hash table.  */
+
+/* An element in the hash table.  Most uses will actually use a larger
+   structure, and an instance of this will be the first field.  */
+
+struct bfd_hash_entry
+{
+  /* Next entry for this hash code.  */
+  struct bfd_hash_entry *next;
+  /* String being hashed.  */
+  const char *string;
+  /* Hash code.  This is the full hash code, not the index into the
+     table.  */
+  unsigned long hash;
+};
+
+/* A hash table.  */
+
+struct bfd_hash_table
+{
+  /* The hash array.  */
+  struct bfd_hash_entry **table;
+  /* A function used to create new elements in the hash table.  The
+     first entry is itself a pointer to an element.  When this
+     function is first invoked, this pointer will be NULL.  However,
+     having the pointer permits a hierarchy of method functions to be
+     built each of which calls the function in the superclass.  Thus
+     each function should be written to allocate a new block of memory
+     only if the argument is NULL.  */
+  struct bfd_hash_entry *(*newfunc)
+    (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
+   /* An objalloc for this hash table.  This is a struct objalloc *,
+     but we use void * to avoid requiring the inclusion of objalloc.h.  */
+  void *memory;
+  /* The number of slots in the hash table.  */
+  unsigned int size;
+  /* The number of entries in the hash table.  */
+  unsigned int count;
+  /* The size of elements.  */
+  unsigned int entsize;
+  /* If non-zero, don't grow the hash table.  */
+  unsigned int frozen:1;
+};
+
+/* Initialize a hash table.  */
+extern bfd_boolean bfd_hash_table_init
+  (struct bfd_hash_table *,
+   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
+			       struct bfd_hash_table *,
+			       const char *),
+   unsigned int);
+
+/* Initialize a hash table specifying a size.  */
+extern bfd_boolean bfd_hash_table_init_n
+  (struct bfd_hash_table *,
+   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
+			       struct bfd_hash_table *,
+			       const char *),
+   unsigned int, unsigned int);
+
+/* Free up a hash table.  */
+extern void bfd_hash_table_free
+  (struct bfd_hash_table *);
+
+/* Look up a string in a hash table.  If CREATE is TRUE, a new entry
+   will be created for this string if one does not already exist.  The
+   COPY argument must be TRUE if this routine should copy the string
+   into newly allocated memory when adding an entry.  */
+extern struct bfd_hash_entry *bfd_hash_lookup
+  (struct bfd_hash_table *, const char *, bfd_boolean create,
+   bfd_boolean copy);
+
+/* Insert an entry in a hash table.  */
+extern struct bfd_hash_entry *bfd_hash_insert
+  (struct bfd_hash_table *, const char *, unsigned long);
+
+/* Rename an entry in a hash table.  */
+extern void bfd_hash_rename
+  (struct bfd_hash_table *, const char *, struct bfd_hash_entry *);
+
+/* Replace an entry in a hash table.  */
+extern void bfd_hash_replace
+  (struct bfd_hash_table *, struct bfd_hash_entry *old,
+   struct bfd_hash_entry *nw);
+
+/* Base method for creating a hash table entry.  */
+extern struct bfd_hash_entry *bfd_hash_newfunc
+  (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
+
+/* Grab some space for a hash table entry.  */
+extern void *bfd_hash_allocate
+  (struct bfd_hash_table *, unsigned int);
+
+/* Traverse a hash table in a random order, calling a function on each
+   element.  If the function returns FALSE, the traversal stops.  The
+   INFO argument is passed to the function.  */
+extern void bfd_hash_traverse
+  (struct bfd_hash_table *,
+   bfd_boolean (*) (struct bfd_hash_entry *, void *),
+   void *info);
+
+/* Allows the default size of a hash table to be configured. New hash
+   tables allocated using bfd_hash_table_init will be created with
+   this size.  */
+extern unsigned long bfd_hash_set_default_size (unsigned long);
+
+/* This structure is used to keep track of stabs in sections
+   information while linking.  */
+
+struct stab_info
+{
+  /* A hash table used to hold stabs strings.  */
+  struct bfd_strtab_hash *strings;
+  /* The header file hash table.  */
+  struct bfd_hash_table includes;
+  /* The first .stabstr section.  */
+  struct bfd_section *stabstr;
+};
+
+#define COFF_SWAP_TABLE (void *) &bfd_coff_std_swap_table
+
+/* User program access to BFD facilities.  */
+
+/* Direct I/O routines, for programs which know more about the object
+   file than BFD does.  Use higher level routines if possible.  */
+
+extern bfd_size_type bfd_bread (void *, bfd_size_type, bfd *);
+extern bfd_size_type bfd_bwrite (const void *, bfd_size_type, bfd *);
+extern int bfd_seek (bfd *, file_ptr, int);
+extern file_ptr bfd_tell (bfd *);
+extern int bfd_flush (bfd *);
+extern int bfd_stat (bfd *, struct stat *);
+
+/* Deprecated old routines.  */
+#if __GNUC__
+#define bfd_read(BUF, ELTSIZE, NITEMS, ABFD)				\
+  (warn_deprecated ("bfd_read", __FILE__, __LINE__, __FUNCTION__),	\
+   bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
+#define bfd_write(BUF, ELTSIZE, NITEMS, ABFD)				\
+  (warn_deprecated ("bfd_write", __FILE__, __LINE__, __FUNCTION__),	\
+   bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
+#else
+#define bfd_read(BUF, ELTSIZE, NITEMS, ABFD)				\
+  (warn_deprecated ("bfd_read", (const char *) 0, 0, (const char *) 0), \
+   bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
+#define bfd_write(BUF, ELTSIZE, NITEMS, ABFD)				\
+  (warn_deprecated ("bfd_write", (const char *) 0, 0, (const char *) 0),\
+   bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
+#endif
+extern void warn_deprecated (const char *, const char *, int, const char *);
+
+/* Cast from const char * to char * so that caller can assign to
+   a char * without a warning.  */
+#define bfd_get_filename(abfd) ((char *) (abfd)->filename)
+#define bfd_get_cacheable(abfd) ((abfd)->cacheable)
+#define bfd_get_format(abfd) ((abfd)->format)
+#define bfd_get_target(abfd) ((abfd)->xvec->name)
+#define bfd_get_flavour(abfd) ((abfd)->xvec->flavour)
+#define bfd_family_coff(abfd) \
+  (bfd_get_flavour (abfd) == bfd_target_coff_flavour || \
+   bfd_get_flavour (abfd) == bfd_target_xcoff_flavour)
+#define bfd_big_endian(abfd) ((abfd)->xvec->byteorder == BFD_ENDIAN_BIG)
+#define bfd_little_endian(abfd) ((abfd)->xvec->byteorder == BFD_ENDIAN_LITTLE)
+#define bfd_header_big_endian(abfd) \
+  ((abfd)->xvec->header_byteorder == BFD_ENDIAN_BIG)
+#define bfd_header_little_endian(abfd) \
+  ((abfd)->xvec->header_byteorder == BFD_ENDIAN_LITTLE)
+#define bfd_get_file_flags(abfd) ((abfd)->flags)
+#define bfd_applicable_file_flags(abfd) ((abfd)->xvec->object_flags)
+#define bfd_applicable_section_flags(abfd) ((abfd)->xvec->section_flags)
+#define bfd_my_archive(abfd) ((abfd)->my_archive)
+#define bfd_has_map(abfd) ((abfd)->has_armap)
+#define bfd_is_thin_archive(abfd) ((abfd)->is_thin_archive)
+
+#define bfd_valid_reloc_types(abfd) ((abfd)->xvec->valid_reloc_types)
+#define bfd_usrdata(abfd) ((abfd)->usrdata)
+
+#define bfd_get_start_address(abfd) ((abfd)->start_address)
+#define bfd_get_symcount(abfd) ((abfd)->symcount)
+#define bfd_get_outsymbols(abfd) ((abfd)->outsymbols)
+#define bfd_count_sections(abfd) ((abfd)->section_count)
+
+#define bfd_get_dynamic_symcount(abfd) ((abfd)->dynsymcount)
+
+#define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char)
+
+#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE)
+
+extern bfd_boolean bfd_cache_close
+  (bfd *abfd);
+/* NB: This declaration should match the autogenerated one in libbfd.h.  */
+
+extern bfd_boolean bfd_cache_close_all (void);
+
+extern bfd_boolean bfd_record_phdr
+  (bfd *, unsigned long, bfd_boolean, flagword, bfd_boolean, bfd_vma,
+   bfd_boolean, bfd_boolean, unsigned int, struct bfd_section **);
+
+/* Byte swapping routines.  */
+
+bfd_uint64_t bfd_getb64 (const void *);
+bfd_uint64_t bfd_getl64 (const void *);
+bfd_int64_t bfd_getb_signed_64 (const void *);
+bfd_int64_t bfd_getl_signed_64 (const void *);
+bfd_vma bfd_getb32 (const void *);
+bfd_vma bfd_getl32 (const void *);
+bfd_signed_vma bfd_getb_signed_32 (const void *);
+bfd_signed_vma bfd_getl_signed_32 (const void *);
+bfd_vma bfd_getb16 (const void *);
+bfd_vma bfd_getl16 (const void *);
+bfd_signed_vma bfd_getb_signed_16 (const void *);
+bfd_signed_vma bfd_getl_signed_16 (const void *);
+void bfd_putb64 (bfd_uint64_t, void *);
+void bfd_putl64 (bfd_uint64_t, void *);
+void bfd_putb32 (bfd_vma, void *);
+void bfd_putl32 (bfd_vma, void *);
+void bfd_putb16 (bfd_vma, void *);
+void bfd_putl16 (bfd_vma, void *);
+
+/* Byte swapping routines which take size and endiannes as arguments.  */
+
+bfd_uint64_t bfd_get_bits (const void *, int, bfd_boolean);
+void bfd_put_bits (bfd_uint64_t, void *, int, bfd_boolean);
+
+#if defined(__STDC__) || defined(ALMOST_STDC)
+struct ecoff_debug_info;
+struct ecoff_debug_swap;
+struct ecoff_extr;
+struct bfd_symbol;
+struct bfd_link_info;
+struct bfd_link_hash_entry;
+struct bfd_section_already_linked;
+struct bfd_elf_version_tree;
+#endif
+
+extern bfd_boolean bfd_section_already_linked_table_init (void);
+extern void bfd_section_already_linked_table_free (void);
+extern bfd_boolean _bfd_handle_already_linked
+  (struct bfd_section *, struct bfd_section_already_linked *,
+   struct bfd_link_info *);
+
+/* Externally visible ECOFF routines.  */
+
+extern bfd_vma bfd_ecoff_get_gp_value
+  (bfd * abfd);
+extern bfd_boolean bfd_ecoff_set_gp_value
+  (bfd *abfd, bfd_vma gp_value);
+extern bfd_boolean bfd_ecoff_set_regmasks
+  (bfd *abfd, unsigned long gprmask, unsigned long fprmask,
+   unsigned long *cprmask);
+extern void *bfd_ecoff_debug_init
+  (bfd *output_bfd, struct ecoff_debug_info *output_debug,
+   const struct ecoff_debug_swap *output_swap, struct bfd_link_info *);
+extern void bfd_ecoff_debug_free
+  (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
+   const struct ecoff_debug_swap *output_swap, struct bfd_link_info *);
+extern bfd_boolean bfd_ecoff_debug_accumulate
+  (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
+   const struct ecoff_debug_swap *output_swap, bfd *input_bfd,
+   struct ecoff_debug_info *input_debug,
+   const struct ecoff_debug_swap *input_swap, struct bfd_link_info *);
+extern bfd_boolean bfd_ecoff_debug_accumulate_other
+  (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
+   const struct ecoff_debug_swap *output_swap, bfd *input_bfd,
+   struct bfd_link_info *);
+extern bfd_boolean bfd_ecoff_debug_externals
+  (bfd *abfd, struct ecoff_debug_info *debug,
+   const struct ecoff_debug_swap *swap, bfd_boolean relocatable,
+   bfd_boolean (*get_extr) (struct bfd_symbol *, struct ecoff_extr *),
+   void (*set_index) (struct bfd_symbol *, bfd_size_type));
+extern bfd_boolean bfd_ecoff_debug_one_external
+  (bfd *abfd, struct ecoff_debug_info *debug,
+   const struct ecoff_debug_swap *swap, const char *name,
+   struct ecoff_extr *esym);
+extern bfd_size_type bfd_ecoff_debug_size
+  (bfd *abfd, struct ecoff_debug_info *debug,
+   const struct ecoff_debug_swap *swap);
+extern bfd_boolean bfd_ecoff_write_debug
+  (bfd *abfd, struct ecoff_debug_info *debug,
+   const struct ecoff_debug_swap *swap, file_ptr where);
+extern bfd_boolean bfd_ecoff_write_accumulated_debug
+  (void *handle, bfd *abfd, struct ecoff_debug_info *debug,
+   const struct ecoff_debug_swap *swap,
+   struct bfd_link_info *info, file_ptr where);
+
+/* Externally visible ELF routines.  */
+
+struct bfd_link_needed_list
+{
+  struct bfd_link_needed_list *next;
+  bfd *by;
+  const char *name;
+};
+
+enum dynamic_lib_link_class {
+  DYN_NORMAL = 0,
+  DYN_AS_NEEDED = 1,
+  DYN_DT_NEEDED = 2,
+  DYN_NO_ADD_NEEDED = 4,
+  DYN_NO_NEEDED = 8
+};
+
+enum notice_asneeded_action {
+  notice_as_needed,
+  notice_not_needed,
+  notice_needed
+};
+
+extern bfd_boolean bfd_elf_record_link_assignment
+  (bfd *, struct bfd_link_info *, const char *, bfd_boolean,
+   bfd_boolean);
+extern struct bfd_link_needed_list *bfd_elf_get_needed_list
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean bfd_elf_get_bfd_needed_list
+  (bfd *, struct bfd_link_needed_list **);
+extern bfd_boolean bfd_elf_size_dynamic_sections
+  (bfd *, const char *, const char *, const char *, const char *, const char *,
+   const char * const *, struct bfd_link_info *, struct bfd_section **);
+extern bfd_boolean bfd_elf_size_dynsym_hash_dynstr
+  (bfd *, struct bfd_link_info *);
+extern void bfd_elf_set_dt_needed_name
+  (bfd *, const char *);
+extern const char *bfd_elf_get_dt_soname
+  (bfd *);
+extern void bfd_elf_set_dyn_lib_class
+  (bfd *, enum dynamic_lib_link_class);
+extern int bfd_elf_get_dyn_lib_class
+  (bfd *);
+extern struct bfd_link_needed_list *bfd_elf_get_runpath_list
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean bfd_elf_discard_info
+  (bfd *, struct bfd_link_info *);
+extern unsigned int _bfd_elf_default_action_discarded
+  (struct bfd_section *);
+
+/* Return an upper bound on the number of bytes required to store a
+   copy of ABFD's program header table entries.  Return -1 if an error
+   occurs; bfd_get_error will return an appropriate code.  */
+extern long bfd_get_elf_phdr_upper_bound
+  (bfd *abfd);
+
+/* Copy ABFD's program header table entries to *PHDRS.  The entries
+   will be stored as an array of Elf_Internal_Phdr structures, as
+   defined in include/elf/internal.h.  To find out how large the
+   buffer needs to be, call bfd_get_elf_phdr_upper_bound.
+
+   Return the number of program header table entries read, or -1 if an
+   error occurs; bfd_get_error will return an appropriate code.  */
+extern int bfd_get_elf_phdrs
+  (bfd *abfd, void *phdrs);
+
+/* Create a new BFD as if by bfd_openr.  Rather than opening a file,
+   reconstruct an ELF file by reading the segments out of remote memory
+   based on the ELF file header at EHDR_VMA and the ELF program headers it
+   points to.  If not null, *LOADBASEP is filled in with the difference
+   between the VMAs from which the segments were read, and the VMAs the
+   file headers (and hence BFD's idea of each section's VMA) put them at.
+
+   The function TARGET_READ_MEMORY is called to copy LEN bytes from the
+   remote memory at target address VMA into the local buffer at MYADDR; it
+   should return zero on success or an `errno' code on failure.  TEMPL must
+   be a BFD for an ELF target with the word size and byte order found in
+   the remote memory.  */
+extern bfd *bfd_elf_bfd_from_remote_memory
+  (bfd *templ, bfd_vma ehdr_vma, bfd_vma *loadbasep,
+   int (*target_read_memory) (bfd_vma vma, bfd_byte *myaddr, int len));
+
+/* Return the arch_size field of an elf bfd, or -1 if not elf.  */
+extern int bfd_get_arch_size
+  (bfd *);
+
+/* Return TRUE if address "naturally" sign extends, or -1 if not elf.  */
+extern int bfd_get_sign_extend_vma
+  (bfd *);
+
+extern struct bfd_section *_bfd_elf_tls_setup
+  (bfd *, struct bfd_link_info *);
+
+extern void _bfd_fix_excluded_sec_syms
+  (bfd *, struct bfd_link_info *);
+
+extern unsigned bfd_m68k_mach_to_features (int);
+
+extern int bfd_m68k_features_to_mach (unsigned);
+
+extern bfd_boolean bfd_m68k_elf32_create_embedded_relocs
+  (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *,
+   char **);
+
+extern void bfd_elf_m68k_set_target_options (struct bfd_link_info *, int);
+
+extern bfd_boolean bfd_bfin_elf32_create_embedded_relocs
+  (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *,
+   char **);
+
+extern bfd_boolean bfd_cr16_elf32_create_embedded_relocs
+  (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *,
+   char **);
+
+/* SunOS shared library support routines for the linker.  */
+
+extern struct bfd_link_needed_list *bfd_sunos_get_needed_list
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean bfd_sunos_record_link_assignment
+  (bfd *, struct bfd_link_info *, const char *);
+extern bfd_boolean bfd_sunos_size_dynamic_sections
+  (bfd *, struct bfd_link_info *, struct bfd_section **,
+   struct bfd_section **, struct bfd_section **);
+
+/* Linux shared library support routines for the linker.  */
+
+extern bfd_boolean bfd_i386linux_size_dynamic_sections
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean bfd_m68klinux_size_dynamic_sections
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean bfd_sparclinux_size_dynamic_sections
+  (bfd *, struct bfd_link_info *);
+
+/* mmap hacks */
+
+struct _bfd_window_internal;
+typedef struct _bfd_window_internal bfd_window_internal;
+
+typedef struct _bfd_window
+{
+  /* What the user asked for.  */
+  void *data;
+  bfd_size_type size;
+  /* The actual window used by BFD.  Small user-requested read-only
+     regions sharing a page may share a single window into the object
+     file.  Read-write versions shouldn't until I've fixed things to
+     keep track of which portions have been claimed by the
+     application; don't want to give the same region back when the
+     application wants two writable copies!  */
+  struct _bfd_window_internal *i;
+}
+bfd_window;
+
+extern void bfd_init_window
+  (bfd_window *);
+extern void bfd_free_window
+  (bfd_window *);
+extern bfd_boolean bfd_get_file_window
+  (bfd *, file_ptr, bfd_size_type, bfd_window *, bfd_boolean);
+
+/* XCOFF support routines for the linker.  */
+
+extern bfd_boolean bfd_xcoff_split_import_path
+  (bfd *, const char *, const char **, const char **);
+extern bfd_boolean bfd_xcoff_set_archive_import_path
+  (struct bfd_link_info *, bfd *, const char *);
+extern bfd_boolean bfd_xcoff_link_record_set
+  (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, bfd_size_type);
+extern bfd_boolean bfd_xcoff_import_symbol
+  (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, bfd_vma,
+   const char *, const char *, const char *, unsigned int);
+extern bfd_boolean bfd_xcoff_export_symbol
+  (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *);
+extern bfd_boolean bfd_xcoff_link_count_reloc
+  (bfd *, struct bfd_link_info *, const char *);
+extern bfd_boolean bfd_xcoff_record_link_assignment
+  (bfd *, struct bfd_link_info *, const char *);
+extern bfd_boolean bfd_xcoff_size_dynamic_sections
+  (bfd *, struct bfd_link_info *, const char *, const char *,
+   unsigned long, unsigned long, unsigned long, bfd_boolean,
+   int, bfd_boolean, unsigned int, struct bfd_section **, bfd_boolean);
+extern bfd_boolean bfd_xcoff_link_generate_rtinit
+  (bfd *, const char *, const char *, bfd_boolean);
+
+/* XCOFF support routines for ar.  */
+extern bfd_boolean bfd_xcoff_ar_archive_set_magic
+  (bfd *, char *);
+
+/* Externally visible COFF routines.  */
+
+#if defined(__STDC__) || defined(ALMOST_STDC)
+struct internal_syment;
+union internal_auxent;
+#endif
+
+extern bfd_boolean bfd_coff_get_syment
+  (bfd *, struct bfd_symbol *, struct internal_syment *);
+
+extern bfd_boolean bfd_coff_get_auxent
+  (bfd *, struct bfd_symbol *, int, union internal_auxent *);
+
+extern bfd_boolean bfd_coff_set_symbol_class
+  (bfd *, struct bfd_symbol *, unsigned int);
+
+extern bfd_boolean bfd_m68k_coff_create_embedded_relocs
+  (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, char **);
+
+/* ARM VFP11 erratum workaround support.  */
+typedef enum
+{
+  BFD_ARM_VFP11_FIX_DEFAULT,
+  BFD_ARM_VFP11_FIX_NONE,
+  BFD_ARM_VFP11_FIX_SCALAR,
+  BFD_ARM_VFP11_FIX_VECTOR
+} bfd_arm_vfp11_fix;
+
+extern void bfd_elf32_arm_init_maps
+  (bfd *);
+
+extern void bfd_elf32_arm_set_vfp11_fix
+  (bfd *, struct bfd_link_info *);
+
+extern void bfd_elf32_arm_set_cortex_a8_fix
+  (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean bfd_elf32_arm_vfp11_erratum_scan
+  (bfd *, struct bfd_link_info *);
+
+extern void bfd_elf32_arm_vfp11_fix_veneer_locations
+  (bfd *, struct bfd_link_info *);
+
+/* ARM Interworking support.  Called from linker.  */
+extern bfd_boolean bfd_arm_allocate_interworking_sections
+  (struct bfd_link_info *);
+
+extern bfd_boolean bfd_arm_process_before_allocation
+  (bfd *, struct bfd_link_info *, int);
+
+extern bfd_boolean bfd_arm_get_bfd_for_interworking
+  (bfd *, struct bfd_link_info *);
+
+/* PE ARM Interworking support.  Called from linker.  */
+extern bfd_boolean bfd_arm_pe_allocate_interworking_sections
+  (struct bfd_link_info *);
+
+extern bfd_boolean bfd_arm_pe_process_before_allocation
+  (bfd *, struct bfd_link_info *, int);
+
+extern bfd_boolean bfd_arm_pe_get_bfd_for_interworking
+  (bfd *, struct bfd_link_info *);
+
+/* ELF ARM Interworking support.  Called from linker.  */
+extern bfd_boolean bfd_elf32_arm_allocate_interworking_sections
+  (struct bfd_link_info *);
+
+extern bfd_boolean bfd_elf32_arm_process_before_allocation
+  (bfd *, struct bfd_link_info *);
+
+void bfd_elf32_arm_set_target_relocs
+  (bfd *, struct bfd_link_info *, int, char *, int, int, bfd_arm_vfp11_fix,
+   int, int, int, int, int);
+
+extern bfd_boolean bfd_elf32_arm_get_bfd_for_interworking
+  (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean bfd_elf32_arm_add_glue_sections_to_bfd
+  (bfd *, struct bfd_link_info *);
+
+/* ELF ARM mapping symbol support */
+#define BFD_ARM_SPECIAL_SYM_TYPE_MAP	(1 << 0)
+#define BFD_ARM_SPECIAL_SYM_TYPE_TAG	(1 << 1)
+#define BFD_ARM_SPECIAL_SYM_TYPE_OTHER  (1 << 2)
+#define BFD_ARM_SPECIAL_SYM_TYPE_ANY	(~0)
+extern bfd_boolean bfd_is_arm_special_symbol_name
+  (const char * name, int type);
+
+extern void bfd_elf32_arm_set_byteswap_code (struct bfd_link_info *, int);
+
+/* ARM Note section processing.  */
+extern bfd_boolean bfd_arm_merge_machines
+  (bfd *, bfd *);
+
+extern bfd_boolean bfd_arm_update_notes
+  (bfd *, const char *);
+
+extern unsigned int bfd_arm_get_mach_from_notes
+  (bfd *, const char *);
+
+/* ARM stub generation support.  Called from the linker.  */
+extern int elf32_arm_setup_section_lists
+  (bfd *, struct bfd_link_info *);
+extern void elf32_arm_next_input_section
+  (struct bfd_link_info *, struct bfd_section *);
+extern bfd_boolean elf32_arm_size_stubs
+  (bfd *, bfd *, struct bfd_link_info *, bfd_signed_vma,
+   struct bfd_section * (*) (const char *, struct bfd_section *), void (*) (void));
+extern bfd_boolean elf32_arm_build_stubs
+  (struct bfd_link_info *);
+
+/* ARM unwind section editing support.  */
+extern bfd_boolean elf32_arm_fix_exidx_coverage
+(struct bfd_section **, unsigned int, struct bfd_link_info *, bfd_boolean);
+
+/* C6x unwind section editing support.  */
+extern bfd_boolean elf32_tic6x_fix_exidx_coverage
+(struct bfd_section **, unsigned int, struct bfd_link_info *, bfd_boolean);
+
+/* PowerPC @tls opcode transform/validate.  */
+extern unsigned int _bfd_elf_ppc_at_tls_transform
+  (unsigned int, unsigned int);
+/* PowerPC @tprel opcode transform/validate.  */
+extern unsigned int _bfd_elf_ppc_at_tprel_transform
+  (unsigned int, unsigned int);
+
+/* TI COFF load page support.  */
+extern void bfd_ticoff_set_section_load_page
+  (struct bfd_section *, int);
+
+extern int bfd_ticoff_get_section_load_page
+  (struct bfd_section *);
+
+/* H8/300 functions.  */
+extern bfd_vma bfd_h8300_pad_address
+  (bfd *, bfd_vma);
+
+/* IA64 Itanium code generation.  Called from linker.  */
+extern void bfd_elf32_ia64_after_parse
+  (int);
+
+extern void bfd_elf64_ia64_after_parse
+  (int);
+
+/* This structure is used for a comdat section, as in PE.  A comdat
+   section is associated with a particular symbol.  When the linker
+   sees a comdat section, it keeps only one of the sections with a
+   given name and associated with a given symbol.  */
+
+struct coff_comdat_info
+{
+  /* The name of the symbol associated with a comdat section.  */
+  const char *name;
+
+  /* The local symbol table index of the symbol associated with a
+     comdat section.  This is only meaningful to the object file format
+     specific code; it is not an index into the list returned by
+     bfd_canonicalize_symtab.  */
+  long symbol;
+};
+
+extern struct coff_comdat_info *bfd_coff_get_comdat_section
+  (bfd *, struct bfd_section *);
+
+/* Extracted from init.c.  */
+void bfd_init (void);
+
+/* Extracted from opncls.c.  */
+extern unsigned int bfd_use_reserved_id;
+bfd *bfd_fopen (const char *filename, const char *target,
+    const char *mode, int fd);
+
+bfd *bfd_openr (const char *filename, const char *target);
+
+bfd *bfd_fdopenr (const char *filename, const char *target, int fd);
+
+bfd *bfd_openstreamr (const char *, const char *, void *);
+
+bfd *bfd_openr_iovec (const char *filename, const char *target,
+    void *(*open_func) (struct bfd *nbfd,
+    void *open_closure),
+    void *open_closure,
+    file_ptr (*pread_func) (struct bfd *nbfd,
+    void *stream,
+    void *buf,
+    file_ptr nbytes,
+    file_ptr offset),
+    int (*close_func) (struct bfd *nbfd,
+    void *stream),
+    int (*stat_func) (struct bfd *abfd,
+    void *stream,
+    struct stat *sb));
+
+bfd *bfd_openw (const char *filename, const char *target);
+
+bfd_boolean bfd_close (bfd *abfd);
+
+bfd_boolean bfd_close_all_done (bfd *);
+
+bfd *bfd_create (const char *filename, bfd *templ);
+
+bfd_boolean bfd_make_writable (bfd *abfd);
+
+bfd_boolean bfd_make_readable (bfd *abfd);
+
+void *bfd_alloc (bfd *abfd, bfd_size_type wanted);
+
+void *bfd_zalloc (bfd *abfd, bfd_size_type wanted);
+
+unsigned long bfd_calc_gnu_debuglink_crc32
+   (unsigned long crc, const unsigned char *buf, bfd_size_type len);
+
+char *bfd_follow_gnu_debuglink (bfd *abfd, const char *dir);
+
+struct bfd_section *bfd_create_gnu_debuglink_section
+   (bfd *abfd, const char *filename);
+
+bfd_boolean bfd_fill_in_gnu_debuglink_section
+   (bfd *abfd, struct bfd_section *sect, const char *filename);
+
+/* Extracted from libbfd.c.  */
+
+/* Byte swapping macros for user section data.  */
+
+#define bfd_put_8(abfd, val, ptr) \
+  ((void) (*((unsigned char *) (ptr)) = (val) & 0xff))
+#define bfd_put_signed_8 \
+  bfd_put_8
+#define bfd_get_8(abfd, ptr) \
+  (*(const unsigned char *) (ptr) & 0xff)
+#define bfd_get_signed_8(abfd, ptr) \
+  (((*(const unsigned char *) (ptr) & 0xff) ^ 0x80) - 0x80)
+
+#define bfd_put_16(abfd, val, ptr) \
+  BFD_SEND (abfd, bfd_putx16, ((val),(ptr)))
+#define bfd_put_signed_16 \
+  bfd_put_16
+#define bfd_get_16(abfd, ptr) \
+  BFD_SEND (abfd, bfd_getx16, (ptr))
+#define bfd_get_signed_16(abfd, ptr) \
+  BFD_SEND (abfd, bfd_getx_signed_16, (ptr))
+
+#define bfd_put_32(abfd, val, ptr) \
+  BFD_SEND (abfd, bfd_putx32, ((val),(ptr)))
+#define bfd_put_signed_32 \
+  bfd_put_32
+#define bfd_get_32(abfd, ptr) \
+  BFD_SEND (abfd, bfd_getx32, (ptr))
+#define bfd_get_signed_32(abfd, ptr) \
+  BFD_SEND (abfd, bfd_getx_signed_32, (ptr))
+
+#define bfd_put_64(abfd, val, ptr) \
+  BFD_SEND (abfd, bfd_putx64, ((val), (ptr)))
+#define bfd_put_signed_64 \
+  bfd_put_64
+#define bfd_get_64(abfd, ptr) \
+  BFD_SEND (abfd, bfd_getx64, (ptr))
+#define bfd_get_signed_64(abfd, ptr) \
+  BFD_SEND (abfd, bfd_getx_signed_64, (ptr))
+
+#define bfd_get(bits, abfd, ptr)                       \
+  ((bits) == 8 ? (bfd_vma) bfd_get_8 (abfd, ptr)       \
+   : (bits) == 16 ? bfd_get_16 (abfd, ptr)             \
+   : (bits) == 32 ? bfd_get_32 (abfd, ptr)             \
+   : (bits) == 64 ? bfd_get_64 (abfd, ptr)             \
+   : (abort (), (bfd_vma) - 1))
+
+#define bfd_put(bits, abfd, val, ptr)                  \
+  ((bits) == 8 ? bfd_put_8  (abfd, val, ptr)           \
+   : (bits) == 16 ? bfd_put_16 (abfd, val, ptr)                \
+   : (bits) == 32 ? bfd_put_32 (abfd, val, ptr)                \
+   : (bits) == 64 ? bfd_put_64 (abfd, val, ptr)                \
+   : (abort (), (void) 0))
+
+
+/* Byte swapping macros for file header data.  */
+
+#define bfd_h_put_8(abfd, val, ptr) \
+  bfd_put_8 (abfd, val, ptr)
+#define bfd_h_put_signed_8(abfd, val, ptr) \
+  bfd_put_8 (abfd, val, ptr)
+#define bfd_h_get_8(abfd, ptr) \
+  bfd_get_8 (abfd, ptr)
+#define bfd_h_get_signed_8(abfd, ptr) \
+  bfd_get_signed_8 (abfd, ptr)
+
+#define bfd_h_put_16(abfd, val, ptr) \
+  BFD_SEND (abfd, bfd_h_putx16, (val, ptr))
+#define bfd_h_put_signed_16 \
+  bfd_h_put_16
+#define bfd_h_get_16(abfd, ptr) \
+  BFD_SEND (abfd, bfd_h_getx16, (ptr))
+#define bfd_h_get_signed_16(abfd, ptr) \
+  BFD_SEND (abfd, bfd_h_getx_signed_16, (ptr))
+
+#define bfd_h_put_32(abfd, val, ptr) \
+  BFD_SEND (abfd, bfd_h_putx32, (val, ptr))
+#define bfd_h_put_signed_32 \
+  bfd_h_put_32
+#define bfd_h_get_32(abfd, ptr) \
+  BFD_SEND (abfd, bfd_h_getx32, (ptr))
+#define bfd_h_get_signed_32(abfd, ptr) \
+  BFD_SEND (abfd, bfd_h_getx_signed_32, (ptr))
+
+#define bfd_h_put_64(abfd, val, ptr) \
+  BFD_SEND (abfd, bfd_h_putx64, (val, ptr))
+#define bfd_h_put_signed_64 \
+  bfd_h_put_64
+#define bfd_h_get_64(abfd, ptr) \
+  BFD_SEND (abfd, bfd_h_getx64, (ptr))
+#define bfd_h_get_signed_64(abfd, ptr) \
+  BFD_SEND (abfd, bfd_h_getx_signed_64, (ptr))
+
+/* Aliases for the above, which should eventually go away.  */
+
+#define H_PUT_64  bfd_h_put_64
+#define H_PUT_32  bfd_h_put_32
+#define H_PUT_16  bfd_h_put_16
+#define H_PUT_8   bfd_h_put_8
+#define H_PUT_S64 bfd_h_put_signed_64
+#define H_PUT_S32 bfd_h_put_signed_32
+#define H_PUT_S16 bfd_h_put_signed_16
+#define H_PUT_S8  bfd_h_put_signed_8
+#define H_GET_64  bfd_h_get_64
+#define H_GET_32  bfd_h_get_32
+#define H_GET_16  bfd_h_get_16
+#define H_GET_8   bfd_h_get_8
+#define H_GET_S64 bfd_h_get_signed_64
+#define H_GET_S32 bfd_h_get_signed_32
+#define H_GET_S16 bfd_h_get_signed_16
+#define H_GET_S8  bfd_h_get_signed_8
+
+
+/* Extracted from bfdio.c.  */
+long bfd_get_mtime (bfd *abfd);
+
+file_ptr bfd_get_size (bfd *abfd);
+
+void *bfd_mmap (bfd *abfd, void *addr, bfd_size_type len,
+    int prot, int flags, file_ptr offset,
+    void **map_addr, bfd_size_type *map_len);
+
+/* Extracted from bfdwin.c.  */
+/* Extracted from section.c.  */
+typedef struct bfd_section
+{
+  /* The name of the section; the name isn't a copy, the pointer is
+     the same as that passed to bfd_make_section.  */
+  const char *name;
+
+  /* A unique sequence number.  */
+  int id;
+
+  /* Which section in the bfd; 0..n-1 as sections are created in a bfd.  */
+  int index;
+
+  /* The next section in the list belonging to the BFD, or NULL.  */
+  struct bfd_section *next;
+
+  /* The previous section in the list belonging to the BFD, or NULL.  */
+  struct bfd_section *prev;
+
+  /* The field flags contains attributes of the section. Some
+     flags are read in from the object file, and some are
+     synthesized from other information.  */
+  flagword flags;
+
+#define SEC_NO_FLAGS   0x000
+
+  /* Tells the OS to allocate space for this section when loading.
+     This is clear for a section containing debug information only.  */
+#define SEC_ALLOC      0x001
+
+  /* Tells the OS to load the section from the file when loading.
+     This is clear for a .bss section.  */
+#define SEC_LOAD       0x002
+
+  /* The section contains data still to be relocated, so there is
+     some relocation information too.  */
+#define SEC_RELOC      0x004
+
+  /* A signal to the OS that the section contains read only data.  */
+#define SEC_READONLY   0x008
+
+  /* The section contains code only.  */
+#define SEC_CODE       0x010
+
+  /* The section contains data only.  */
+#define SEC_DATA       0x020
+
+  /* The section will reside in ROM.  */
+#define SEC_ROM        0x040
+
+  /* The section contains constructor information. This section
+     type is used by the linker to create lists of constructors and
+     destructors used by <<g++>>. When a back end sees a symbol
+     which should be used in a constructor list, it creates a new
+     section for the type of name (e.g., <<__CTOR_LIST__>>), attaches
+     the symbol to it, and builds a relocation. To build the lists
+     of constructors, all the linker has to do is catenate all the
+     sections called <<__CTOR_LIST__>> and relocate the data
+     contained within - exactly the operations it would peform on
+     standard data.  */
+#define SEC_CONSTRUCTOR 0x080
+
+  /* The section has contents - a data section could be
+     <<SEC_ALLOC>> | <<SEC_HAS_CONTENTS>>; a debug section could be
+     <<SEC_HAS_CONTENTS>>  */
+#define SEC_HAS_CONTENTS 0x100
+
+  /* An instruction to the linker to not output the section
+     even if it has information which would normally be written.  */
+#define SEC_NEVER_LOAD 0x200
+
+  /* The section contains thread local data.  */
+#define SEC_THREAD_LOCAL 0x400
+
+  /* The section has GOT references.  This flag is only for the
+     linker, and is currently only used by the elf32-hppa back end.
+     It will be set if global offset table references were detected
+     in this section, which indicate to the linker that the section
+     contains PIC code, and must be handled specially when doing a
+     static link.  */
+#define SEC_HAS_GOT_REF 0x800
+
+  /* The section contains common symbols (symbols may be defined
+     multiple times, the value of a symbol is the amount of
+     space it requires, and the largest symbol value is the one
+     used).  Most targets have exactly one of these (which we
+     translate to bfd_com_section_ptr), but ECOFF has two.  */
+#define SEC_IS_COMMON 0x1000
+
+  /* The section contains only debugging information.  For
+     example, this is set for ELF .debug and .stab sections.
+     strip tests this flag to see if a section can be
+     discarded.  */
+#define SEC_DEBUGGING 0x2000
+
+  /* The contents of this section are held in memory pointed to
+     by the contents field.  This is checked by bfd_get_section_contents,
+     and the data is retrieved from memory if appropriate.  */
+#define SEC_IN_MEMORY 0x4000
+
+  /* The contents of this section are to be excluded by the
+     linker for executable and shared objects unless those
+     objects are to be further relocated.  */
+#define SEC_EXCLUDE 0x8000
+
+  /* The contents of this section are to be sorted based on the sum of
+     the symbol and addend values specified by the associated relocation
+     entries.  Entries without associated relocation entries will be
+     appended to the end of the section in an unspecified order.  */
+#define SEC_SORT_ENTRIES 0x10000
+
+  /* When linking, duplicate sections of the same name should be
+     discarded, rather than being combined into a single section as
+     is usually done.  This is similar to how common symbols are
+     handled.  See SEC_LINK_DUPLICATES below.  */
+#define SEC_LINK_ONCE 0x20000
+
+  /* If SEC_LINK_ONCE is set, this bitfield describes how the linker
+     should handle duplicate sections.  */
+#define SEC_LINK_DUPLICATES 0xc0000
+
+  /* This value for SEC_LINK_DUPLICATES means that duplicate
+     sections with the same name should simply be discarded.  */
+#define SEC_LINK_DUPLICATES_DISCARD 0x0
+
+  /* This value for SEC_LINK_DUPLICATES means that the linker
+     should warn if there are any duplicate sections, although
+     it should still only link one copy.  */
+#define SEC_LINK_DUPLICATES_ONE_ONLY 0x40000
+
+  /* This value for SEC_LINK_DUPLICATES means that the linker
+     should warn if any duplicate sections are a different size.  */
+#define SEC_LINK_DUPLICATES_SAME_SIZE 0x80000
+
+  /* This value for SEC_LINK_DUPLICATES means that the linker
+     should warn if any duplicate sections contain different
+     contents.  */
+#define SEC_LINK_DUPLICATES_SAME_CONTENTS \
+  (SEC_LINK_DUPLICATES_ONE_ONLY | SEC_LINK_DUPLICATES_SAME_SIZE)
+
+  /* This section was created by the linker as part of dynamic
+     relocation or other arcane processing.  It is skipped when
+     going through the first-pass output, trusting that someone
+     else up the line will take care of it later.  */
+#define SEC_LINKER_CREATED 0x100000
+
+  /* This section should not be subject to garbage collection.
+     Also set to inform the linker that this section should not be
+     listed in the link map as discarded.  */
+#define SEC_KEEP 0x200000
+
+  /* This section contains "short" data, and should be placed
+     "near" the GP.  */
+#define SEC_SMALL_DATA 0x400000
+
+  /* Attempt to merge identical entities in the section.
+     Entity size is given in the entsize field.  */
+#define SEC_MERGE 0x800000
+
+  /* If given with SEC_MERGE, entities to merge are zero terminated
+     strings where entsize specifies character size instead of fixed
+     size entries.  */
+#define SEC_STRINGS 0x1000000
+
+  /* This section contains data about section groups.  */
+#define SEC_GROUP 0x2000000
+
+  /* The section is a COFF shared library section.  This flag is
+     only for the linker.  If this type of section appears in
+     the input file, the linker must copy it to the output file
+     without changing the vma or size.  FIXME: Although this
+     was originally intended to be general, it really is COFF
+     specific (and the flag was renamed to indicate this).  It
+     might be cleaner to have some more general mechanism to
+     allow the back end to control what the linker does with
+     sections.  */
+#define SEC_COFF_SHARED_LIBRARY 0x4000000
+
+  /* This input section should be copied to output in reverse order
+     as an array of pointers.  This is for ELF linker internal use
+     only.  */
+#define SEC_ELF_REVERSE_COPY 0x4000000
+
+  /* This section contains data which may be shared with other
+     executables or shared objects. This is for COFF only.  */
+#define SEC_COFF_SHARED 0x8000000
+
+  /* When a section with this flag is being linked, then if the size of
+     the input section is less than a page, it should not cross a page
+     boundary.  If the size of the input section is one page or more,
+     it should be aligned on a page boundary.  This is for TI
+     TMS320C54X only.  */
+#define SEC_TIC54X_BLOCK 0x10000000
+
+  /* Conditionally link this section; do not link if there are no
+     references found to any symbol in the section.  This is for TI
+     TMS320C54X only.  */
+#define SEC_TIC54X_CLINK 0x20000000
+
+  /* Indicate that section has the no read flag set. This happens
+     when memory read flag isn't set. */
+#define SEC_COFF_NOREAD 0x40000000
+
+  /*  End of section flags.  */
+
+  /* Some internal packed boolean fields.  */
+
+  /* See the vma field.  */
+  unsigned int user_set_vma : 1;
+
+  /* A mark flag used by some of the linker backends.  */
+  unsigned int linker_mark : 1;
+
+  /* Another mark flag used by some of the linker backends.  Set for
+     output sections that have an input section.  */
+  unsigned int linker_has_input : 1;
+
+  /* Mark flag used by some linker backends for garbage collection.  */
+  unsigned int gc_mark : 1;
+
+  /* Section compression status.  */
+  unsigned int compress_status : 2;
+#define COMPRESS_SECTION_NONE    0
+#define COMPRESS_SECTION_DONE    1
+#define DECOMPRESS_SECTION_SIZED 2
+
+  /* The following flags are used by the ELF linker. */
+
+  /* Mark sections which have been allocated to segments.  */
+  unsigned int segment_mark : 1;
+
+  /* Type of sec_info information.  */
+  unsigned int sec_info_type:3;
+#define ELF_INFO_TYPE_NONE      0
+#define ELF_INFO_TYPE_STABS     1
+#define ELF_INFO_TYPE_MERGE     2
+#define ELF_INFO_TYPE_EH_FRAME  3
+#define ELF_INFO_TYPE_JUST_SYMS 4
+
+  /* Nonzero if this section uses RELA relocations, rather than REL.  */
+  unsigned int use_rela_p:1;
+
+  /* Bits used by various backends.  The generic code doesn't touch
+     these fields.  */
+
+  unsigned int sec_flg0:1;
+  unsigned int sec_flg1:1;
+  unsigned int sec_flg2:1;
+  unsigned int sec_flg3:1;
+  unsigned int sec_flg4:1;
+  unsigned int sec_flg5:1;
+
+  /* End of internal packed boolean fields.  */
+
+  /*  The virtual memory address of the section - where it will be
+      at run time.  The symbols are relocated against this.  The
+      user_set_vma flag is maintained by bfd; if it's not set, the
+      backend can assign addresses (for example, in <<a.out>>, where
+      the default address for <<.data>> is dependent on the specific
+      target and various flags).  */
+  bfd_vma vma;
+
+  /*  The load address of the section - where it would be in a
+      rom image; really only used for writing section header
+      information.  */
+  bfd_vma lma;
+
+  /* The size of the section in octets, as it will be output.
+     Contains a value even if the section has no contents (e.g., the
+     size of <<.bss>>).  */
+  bfd_size_type size;
+
+  /* For input sections, the original size on disk of the section, in
+     octets.  This field should be set for any section whose size is
+     changed by linker relaxation.  It is required for sections where
+     the linker relaxation scheme doesn't cache altered section and
+     reloc contents (stabs, eh_frame, SEC_MERGE, some coff relaxing
+     targets), and thus the original size needs to be kept to read the
+     section multiple times.  For output sections, rawsize holds the
+     section size calculated on a previous linker relaxation pass.  */
+  bfd_size_type rawsize;
+
+  /* The compressed size of the section in octets.  */
+  bfd_size_type compressed_size;
+
+  /* Relaxation table. */
+  struct relax_table *relax;
+
+  /* Count of used relaxation table entries. */
+  int relax_count;
+
+
+  /* If this section is going to be output, then this value is the
+     offset in *bytes* into the output section of the first byte in the
+     input section (byte ==> smallest addressable unit on the
+     target).  In most cases, if this was going to start at the
+     100th octet (8-bit quantity) in the output section, this value
+     would be 100.  However, if the target byte size is 16 bits
+     (bfd_octets_per_byte is "2"), this value would be 50.  */
+  bfd_vma output_offset;
+
+  /* The output section through which to map on output.  */
+  struct bfd_section *output_section;
+
+  /* The alignment requirement of the section, as an exponent of 2 -
+     e.g., 3 aligns to 2^3 (or 8).  */
+  unsigned int alignment_power;
+
+  /* If an input section, a pointer to a vector of relocation
+     records for the data in this section.  */
+  struct reloc_cache_entry *relocation;
+
+  /* If an output section, a pointer to a vector of pointers to
+     relocation records for the data in this section.  */
+  struct reloc_cache_entry **orelocation;
+
+  /* The number of relocation records in one of the above.  */
+  unsigned reloc_count;
+
+  /* Information below is back end specific - and not always used
+     or updated.  */
+
+  /* File position of section data.  */
+  file_ptr filepos;
+
+  /* File position of relocation info.  */
+  file_ptr rel_filepos;
+
+  /* File position of line data.  */
+  file_ptr line_filepos;
+
+  /* Pointer to data for applications.  */
+  void *userdata;
+
+  /* If the SEC_IN_MEMORY flag is set, this points to the actual
+     contents.  */
+  unsigned char *contents;
+
+  /* Attached line number information.  */
+  alent *lineno;
+
+  /* Number of line number records.  */
+  unsigned int lineno_count;
+
+  /* Entity size for merging purposes.  */
+  unsigned int entsize;
+
+  /* Points to the kept section if this section is a link-once section,
+     and is discarded.  */
+  struct bfd_section *kept_section;
+
+  /* When a section is being output, this value changes as more
+     linenumbers are written out.  */
+  file_ptr moving_line_filepos;
+
+  /* What the section number is in the target world.  */
+  int target_index;
+
+  void *used_by_bfd;
+
+  /* If this is a constructor section then here is a list of the
+     relocations created to relocate items within it.  */
+  struct relent_chain *constructor_chain;
+
+  /* The BFD which owns the section.  */
+  bfd *owner;
+
+  /* INPUT_SECTION_FLAGS if specified in the linker script.  */
+  struct flag_info *section_flag_info;
+
+  /* A symbol which points at this section only.  */
+  struct bfd_symbol *symbol;
+  struct bfd_symbol **symbol_ptr_ptr;
+
+  /* Early in the link process, map_head and map_tail are used to build
+     a list of input sections attached to an output section.  Later,
+     output sections use these fields for a list of bfd_link_order
+     structs.  */
+  union {
+    struct bfd_link_order *link_order;
+    struct bfd_section *s;
+  } map_head, map_tail;
+} asection;
+
+/* Relax table contains information about instructions which can
+   be removed by relaxation -- replacing a long address with a 
+   short address.  */
+struct relax_table {
+  /* Address where bytes may be deleted. */
+  bfd_vma addr;
+  
+  /* Number of bytes to be deleted.  */
+  int size;
+};
+
+/* These sections are global, and are managed by BFD.  The application
+   and target back end are not permitted to change the values in
+   these sections.  New code should use the section_ptr macros rather
+   than referring directly to the const sections.  The const sections
+   may eventually vanish.  */
+#define BFD_ABS_SECTION_NAME "*ABS*"
+#define BFD_UND_SECTION_NAME "*UND*"
+#define BFD_COM_SECTION_NAME "*COM*"
+#define BFD_IND_SECTION_NAME "*IND*"
+
+/* The absolute section.  */
+extern asection bfd_abs_section;
+#define bfd_abs_section_ptr ((asection *) &bfd_abs_section)
+#define bfd_is_abs_section(sec) ((sec) == bfd_abs_section_ptr)
+/* Pointer to the undefined section.  */
+extern asection bfd_und_section;
+#define bfd_und_section_ptr ((asection *) &bfd_und_section)
+#define bfd_is_und_section(sec) ((sec) == bfd_und_section_ptr)
+/* Pointer to the common section.  */
+extern asection bfd_com_section;
+#define bfd_com_section_ptr ((asection *) &bfd_com_section)
+/* Pointer to the indirect section.  */
+extern asection bfd_ind_section;
+#define bfd_ind_section_ptr ((asection *) &bfd_ind_section)
+#define bfd_is_ind_section(sec) ((sec) == bfd_ind_section_ptr)
+
+#define bfd_is_const_section(SEC)              \
+ (   ((SEC) == bfd_abs_section_ptr)            \
+  || ((SEC) == bfd_und_section_ptr)            \
+  || ((SEC) == bfd_com_section_ptr)            \
+  || ((SEC) == bfd_ind_section_ptr))
+
+/* Macros to handle insertion and deletion of a bfd's sections.  These
+   only handle the list pointers, ie. do not adjust section_count,
+   target_index etc.  */
+#define bfd_section_list_remove(ABFD, S) \
+  do                                                   \
+    {                                                  \
+      asection *_s = S;                                \
+      asection *_next = _s->next;                      \
+      asection *_prev = _s->prev;                      \
+      if (_prev)                                       \
+        _prev->next = _next;                           \
+      else                                             \
+        (ABFD)->sections = _next;                      \
+      if (_next)                                       \
+        _next->prev = _prev;                           \
+      else                                             \
+        (ABFD)->section_last = _prev;                  \
+    }                                                  \
+  while (0)
+#define bfd_section_list_append(ABFD, S) \
+  do                                                   \
+    {                                                  \
+      asection *_s = S;                                \
+      bfd *_abfd = ABFD;                               \
+      _s->next = NULL;                                 \
+      if (_abfd->section_last)                         \
+        {                                              \
+          _s->prev = _abfd->section_last;              \
+          _abfd->section_last->next = _s;              \
+        }                                              \
+      else                                             \
+        {                                              \
+          _s->prev = NULL;                             \
+          _abfd->sections = _s;                        \
+        }                                              \
+      _abfd->section_last = _s;                        \
+    }                                                  \
+  while (0)
+#define bfd_section_list_prepend(ABFD, S) \
+  do                                                   \
+    {                                                  \
+      asection *_s = S;                                \
+      bfd *_abfd = ABFD;                               \
+      _s->prev = NULL;                                 \
+      if (_abfd->sections)                             \
+        {                                              \
+          _s->next = _abfd->sections;                  \
+          _abfd->sections->prev = _s;                  \
+        }                                              \
+      else                                             \
+        {                                              \
+          _s->next = NULL;                             \
+          _abfd->section_last = _s;                    \
+        }                                              \
+      _abfd->sections = _s;                            \
+    }                                                  \
+  while (0)
+#define bfd_section_list_insert_after(ABFD, A, S) \
+  do                                                   \
+    {                                                  \
+      asection *_a = A;                                \
+      asection *_s = S;                                \
+      asection *_next = _a->next;                      \
+      _s->next = _next;                                \
+      _s->prev = _a;                                   \
+      _a->next = _s;                                   \
+      if (_next)                                       \
+        _next->prev = _s;                              \
+      else                                             \
+        (ABFD)->section_last = _s;                     \
+    }                                                  \
+  while (0)
+#define bfd_section_list_insert_before(ABFD, B, S) \
+  do                                                   \
+    {                                                  \
+      asection *_b = B;                                \
+      asection *_s = S;                                \
+      asection *_prev = _b->prev;                      \
+      _s->prev = _prev;                                \
+      _s->next = _b;                                   \
+      _b->prev = _s;                                   \
+      if (_prev)                                       \
+        _prev->next = _s;                              \
+      else                                             \
+        (ABFD)->sections = _s;                         \
+    }                                                  \
+  while (0)
+#define bfd_section_removed_from_list(ABFD, S) \
+  ((S)->next == NULL ? (ABFD)->section_last != (S) : (S)->next->prev != (S))
+
+#define BFD_FAKE_SECTION(SEC, FLAGS, SYM, NAME, IDX)                   \
+  /* name, id,  index, next, prev, flags, user_set_vma,            */  \
+  { NAME,  IDX, 0,     NULL, NULL, FLAGS, 0,                           \
+                                                                       \
+  /* linker_mark, linker_has_input, gc_mark, decompress_status,    */  \
+     0,           0,                1,       0,                        \
+                                                                       \
+  /* segment_mark, sec_info_type, use_rela_p,                      */  \
+     0,            0,             0,                                   \
+                                                                       \
+  /* sec_flg0, sec_flg1, sec_flg2, sec_flg3, sec_flg4, sec_flg5,   */  \
+     0,        0,        0,        0,        0,        0,              \
+                                                                       \
+  /* vma, lma, size, rawsize, compressed_size, relax, relax_count, */  \
+     0,   0,   0,    0,       0,               0,     0,               \
+                                                                       \
+  /* output_offset, output_section,              alignment_power,  */  \
+     0,             (struct bfd_section *) &SEC, 0,                    \
+                                                                       \
+  /* relocation, orelocation, reloc_count, filepos, rel_filepos,   */  \
+     NULL,       NULL,        0,           0,       0,                 \
+                                                                       \
+  /* line_filepos, userdata, contents, lineno, lineno_count,       */  \
+     0,            NULL,     NULL,     NULL,   0,                      \
+                                                                       \
+  /* entsize, kept_section, moving_line_filepos,                    */ \
+     0,       NULL,          0,                                        \
+                                                                       \
+  /* target_index, used_by_bfd, constructor_chain, owner,          */  \
+     0,            NULL,        NULL,              NULL,               \
+                                                                       \
+  /* flag_info,                                                    */  \
+     NULL,                                                             \
+                                                                       \
+  /* symbol,                    symbol_ptr_ptr,                    */  \
+     (struct bfd_symbol *) SYM, &SEC.symbol,                           \
+                                                                       \
+  /* map_head, map_tail                                            */  \
+     { NULL }, { NULL }                                                \
+    }
+
+void bfd_section_list_clear (bfd *);
+
+asection *bfd_get_section_by_name (bfd *abfd, const char *name);
+
+asection *bfd_get_section_by_name_if
+   (bfd *abfd,
+    const char *name,
+    bfd_boolean (*func) (bfd *abfd, asection *sect, void *obj),
+    void *obj);
+
+char *bfd_get_unique_section_name
+   (bfd *abfd, const char *templat, int *count);
+
+asection *bfd_make_section_old_way (bfd *abfd, const char *name);
+
+asection *bfd_make_section_anyway_with_flags
+   (bfd *abfd, const char *name, flagword flags);
+
+asection *bfd_make_section_anyway (bfd *abfd, const char *name);
+
+asection *bfd_make_section_with_flags
+   (bfd *, const char *name, flagword flags);
+
+asection *bfd_make_section (bfd *, const char *name);
+
+bfd_boolean bfd_set_section_flags
+   (bfd *abfd, asection *sec, flagword flags);
+
+void bfd_rename_section
+   (bfd *abfd, asection *sec, const char *newname);
+
+void bfd_map_over_sections
+   (bfd *abfd,
+    void (*func) (bfd *abfd, asection *sect, void *obj),
+    void *obj);
+
+asection *bfd_sections_find_if
+   (bfd *abfd,
+    bfd_boolean (*operation) (bfd *abfd, asection *sect, void *obj),
+    void *obj);
+
+bfd_boolean bfd_set_section_size
+   (bfd *abfd, asection *sec, bfd_size_type val);
+
+bfd_boolean bfd_set_section_contents
+   (bfd *abfd, asection *section, const void *data,
+    file_ptr offset, bfd_size_type count);
+
+bfd_boolean bfd_get_section_contents
+   (bfd *abfd, asection *section, void *location, file_ptr offset,
+    bfd_size_type count);
+
+bfd_boolean bfd_malloc_and_get_section
+   (bfd *abfd, asection *section, bfd_byte **buf);
+
+bfd_boolean bfd_copy_private_section_data
+   (bfd *ibfd, asection *isec, bfd *obfd, asection *osec);
+
+#define bfd_copy_private_section_data(ibfd, isection, obfd, osection) \
+     BFD_SEND (obfd, _bfd_copy_private_section_data, \
+               (ibfd, isection, obfd, osection))
+bfd_boolean bfd_generic_is_group_section (bfd *, const asection *sec);
+
+bfd_boolean bfd_generic_discard_group (bfd *abfd, asection *group);
+
+/* Extracted from archures.c.  */
+enum bfd_architecture
+{
+  bfd_arch_unknown,   /* File arch not known.  */
+  bfd_arch_obscure,   /* Arch known, not one of these.  */
+  bfd_arch_m68k,      /* Motorola 68xxx */
+#define bfd_mach_m68000 1
+#define bfd_mach_m68008 2
+#define bfd_mach_m68010 3
+#define bfd_mach_m68020 4
+#define bfd_mach_m68030 5
+#define bfd_mach_m68040 6
+#define bfd_mach_m68060 7
+#define bfd_mach_cpu32  8
+#define bfd_mach_fido   9
+#define bfd_mach_mcf_isa_a_nodiv 10
+#define bfd_mach_mcf_isa_a 11
+#define bfd_mach_mcf_isa_a_mac 12
+#define bfd_mach_mcf_isa_a_emac 13
+#define bfd_mach_mcf_isa_aplus 14
+#define bfd_mach_mcf_isa_aplus_mac 15
+#define bfd_mach_mcf_isa_aplus_emac 16
+#define bfd_mach_mcf_isa_b_nousp 17
+#define bfd_mach_mcf_isa_b_nousp_mac 18
+#define bfd_mach_mcf_isa_b_nousp_emac 19
+#define bfd_mach_mcf_isa_b 20
+#define bfd_mach_mcf_isa_b_mac 21
+#define bfd_mach_mcf_isa_b_emac 22
+#define bfd_mach_mcf_isa_b_float 23
+#define bfd_mach_mcf_isa_b_float_mac 24
+#define bfd_mach_mcf_isa_b_float_emac 25
+#define bfd_mach_mcf_isa_c 26
+#define bfd_mach_mcf_isa_c_mac 27
+#define bfd_mach_mcf_isa_c_emac 28
+#define bfd_mach_mcf_isa_c_nodiv 29
+#define bfd_mach_mcf_isa_c_nodiv_mac 30
+#define bfd_mach_mcf_isa_c_nodiv_emac 31
+  bfd_arch_vax,       /* DEC Vax */
+  bfd_arch_i960,      /* Intel 960 */
+    /* The order of the following is important.
+       lower number indicates a machine type that
+       only accepts a subset of the instructions
+       available to machines with higher numbers.
+       The exception is the "ca", which is
+       incompatible with all other machines except
+       "core".  */
+
+#define bfd_mach_i960_core      1
+#define bfd_mach_i960_ka_sa     2
+#define bfd_mach_i960_kb_sb     3
+#define bfd_mach_i960_mc        4
+#define bfd_mach_i960_xa        5
+#define bfd_mach_i960_ca        6
+#define bfd_mach_i960_jx        7
+#define bfd_mach_i960_hx        8
+
+  bfd_arch_or32,      /* OpenRISC 32 */
+
+  bfd_arch_sparc,     /* SPARC */
+#define bfd_mach_sparc                 1
+/* The difference between v8plus and v9 is that v9 is a true 64 bit env.  */
+#define bfd_mach_sparc_sparclet        2
+#define bfd_mach_sparc_sparclite       3
+#define bfd_mach_sparc_v8plus          4
+#define bfd_mach_sparc_v8plusa         5 /* with ultrasparc add'ns.  */
+#define bfd_mach_sparc_sparclite_le    6
+#define bfd_mach_sparc_v9              7
+#define bfd_mach_sparc_v9a             8 /* with ultrasparc add'ns.  */
+#define bfd_mach_sparc_v8plusb         9 /* with cheetah add'ns.  */
+#define bfd_mach_sparc_v9b             10 /* with cheetah add'ns.  */
+/* Nonzero if MACH has the v9 instruction set.  */
+#define bfd_mach_sparc_v9_p(mach) \
+  ((mach) >= bfd_mach_sparc_v8plus && (mach) <= bfd_mach_sparc_v9b \
+   && (mach) != bfd_mach_sparc_sparclite_le)
+/* Nonzero if MACH is a 64 bit sparc architecture.  */
+#define bfd_mach_sparc_64bit_p(mach) \
+  ((mach) >= bfd_mach_sparc_v9 && (mach) != bfd_mach_sparc_v8plusb)
+  bfd_arch_spu,       /* PowerPC SPU */
+#define bfd_mach_spu           256 
+  bfd_arch_mips,      /* MIPS Rxxxx */
+#define bfd_mach_mips3000              3000
+#define bfd_mach_mips3900              3900
+#define bfd_mach_mips4000              4000
+#define bfd_mach_mips4010              4010
+#define bfd_mach_mips4100              4100
+#define bfd_mach_mips4111              4111
+#define bfd_mach_mips4120              4120
+#define bfd_mach_mips4300              4300
+#define bfd_mach_mips4400              4400
+#define bfd_mach_mips4600              4600
+#define bfd_mach_mips4650              4650
+#define bfd_mach_mips5000              5000
+#define bfd_mach_mips5400              5400
+#define bfd_mach_mips5500              5500
+#define bfd_mach_mips6000              6000
+#define bfd_mach_mips7000              7000
+#define bfd_mach_mips8000              8000
+#define bfd_mach_mips9000              9000
+#define bfd_mach_mips10000             10000
+#define bfd_mach_mips12000             12000
+#define bfd_mach_mips14000             14000
+#define bfd_mach_mips16000             16000
+#define bfd_mach_mips16                16
+#define bfd_mach_mips5                 5
+#define bfd_mach_mips_loongson_2e      3001
+#define bfd_mach_mips_loongson_2f      3002
+#define bfd_mach_mips_loongson_3a      3003
+#define bfd_mach_mips_sb1              12310201 /* octal 'SB', 01 */
+#define bfd_mach_mips_octeon           6501
+#define bfd_mach_mips_xlr              887682   /* decimal 'XLR'  */
+#define bfd_mach_mipsisa32             32
+#define bfd_mach_mipsisa32r2           33
+#define bfd_mach_mipsisa64             64
+#define bfd_mach_mipsisa64r2           65
+#define bfd_mach_mips_micromips        96
+  bfd_arch_i386,      /* Intel 386 */
+#define bfd_mach_i386_intel_syntax     (1 << 0)
+#define bfd_mach_i386_i8086            (1 << 1)
+#define bfd_mach_i386_i386             (1 << 2)
+#define bfd_mach_x86_64                (1 << 3)
+#define bfd_mach_x64_32                (1 << 4)
+#define bfd_mach_i386_i386_intel_syntax (bfd_mach_i386_i386 | bfd_mach_i386_intel_syntax)
+#define bfd_mach_x86_64_intel_syntax   (bfd_mach_x86_64 | bfd_mach_i386_intel_syntax)
+#define bfd_mach_x64_32_intel_syntax   (bfd_mach_x64_32 | bfd_mach_i386_intel_syntax)
+  bfd_arch_l1om,   /* Intel L1OM */
+#define bfd_mach_l1om                  (1 << 5)
+#define bfd_mach_l1om_intel_syntax     (bfd_mach_l1om | bfd_mach_i386_intel_syntax)
+  bfd_arch_k1om,   /* Intel K1OM */
+#define bfd_mach_k1om                  (1 << 6)
+#define bfd_mach_k1om_intel_syntax     (bfd_mach_k1om | bfd_mach_i386_intel_syntax)
+  bfd_arch_we32k,     /* AT&T WE32xxx */
+  bfd_arch_tahoe,     /* CCI/Harris Tahoe */
+  bfd_arch_i860,      /* Intel 860 */
+  bfd_arch_i370,      /* IBM 360/370 Mainframes */
+  bfd_arch_romp,      /* IBM ROMP PC/RT */
+  bfd_arch_convex,    /* Convex */
+  bfd_arch_m88k,      /* Motorola 88xxx */
+  bfd_arch_m98k,      /* Motorola 98xxx */
+  bfd_arch_pyramid,   /* Pyramid Technology */
+  bfd_arch_h8300,     /* Renesas H8/300 (formerly Hitachi H8/300) */
+#define bfd_mach_h8300    1
+#define bfd_mach_h8300h   2
+#define bfd_mach_h8300s   3
+#define bfd_mach_h8300hn  4
+#define bfd_mach_h8300sn  5
+#define bfd_mach_h8300sx  6
+#define bfd_mach_h8300sxn 7
+  bfd_arch_pdp11,     /* DEC PDP-11 */
+  bfd_arch_plugin,
+  bfd_arch_powerpc,   /* PowerPC */
+#define bfd_mach_ppc           32
+#define bfd_mach_ppc64         64
+#define bfd_mach_ppc_403       403
+#define bfd_mach_ppc_403gc     4030
+#define bfd_mach_ppc_405       405
+#define bfd_mach_ppc_505       505
+#define bfd_mach_ppc_601       601
+#define bfd_mach_ppc_602       602
+#define bfd_mach_ppc_603       603
+#define bfd_mach_ppc_ec603e    6031
+#define bfd_mach_ppc_604       604
+#define bfd_mach_ppc_620       620
+#define bfd_mach_ppc_630       630
+#define bfd_mach_ppc_750       750
+#define bfd_mach_ppc_860       860
+#define bfd_mach_ppc_a35       35
+#define bfd_mach_ppc_rs64ii    642
+#define bfd_mach_ppc_rs64iii   643
+#define bfd_mach_ppc_7400      7400
+#define bfd_mach_ppc_e500      500
+#define bfd_mach_ppc_e500mc    5001
+#define bfd_mach_ppc_e500mc64  5005
+#define bfd_mach_ppc_titan     83
+  bfd_arch_rs6000,    /* IBM RS/6000 */
+#define bfd_mach_rs6k          6000
+#define bfd_mach_rs6k_rs1      6001
+#define bfd_mach_rs6k_rsc      6003
+#define bfd_mach_rs6k_rs2      6002
+  bfd_arch_hppa,      /* HP PA RISC */
+#define bfd_mach_hppa10        10
+#define bfd_mach_hppa11        11
+#define bfd_mach_hppa20        20
+#define bfd_mach_hppa20w       25
+  bfd_arch_d10v,      /* Mitsubishi D10V */
+#define bfd_mach_d10v          1
+#define bfd_mach_d10v_ts2      2
+#define bfd_mach_d10v_ts3      3
+  bfd_arch_d30v,      /* Mitsubishi D30V */
+  bfd_arch_dlx,       /* DLX */
+  bfd_arch_m68hc11,   /* Motorola 68HC11 */
+  bfd_arch_m68hc12,   /* Motorola 68HC12 */
+#define bfd_mach_m6812_default 0
+#define bfd_mach_m6812         1
+#define bfd_mach_m6812s        2
+  bfd_arch_z8k,       /* Zilog Z8000 */
+#define bfd_mach_z8001         1
+#define bfd_mach_z8002         2
+  bfd_arch_h8500,     /* Renesas H8/500 (formerly Hitachi H8/500) */
+  bfd_arch_sh,        /* Renesas / SuperH SH (formerly Hitachi SH) */
+#define bfd_mach_sh            1
+#define bfd_mach_sh2        0x20
+#define bfd_mach_sh_dsp     0x2d
+#define bfd_mach_sh2a       0x2a
+#define bfd_mach_sh2a_nofpu 0x2b
+#define bfd_mach_sh2a_nofpu_or_sh4_nommu_nofpu 0x2a1
+#define bfd_mach_sh2a_nofpu_or_sh3_nommu 0x2a2
+#define bfd_mach_sh2a_or_sh4  0x2a3
+#define bfd_mach_sh2a_or_sh3e 0x2a4
+#define bfd_mach_sh2e       0x2e
+#define bfd_mach_sh3        0x30
+#define bfd_mach_sh3_nommu  0x31
+#define bfd_mach_sh3_dsp    0x3d
+#define bfd_mach_sh3e       0x3e
+#define bfd_mach_sh4        0x40
+#define bfd_mach_sh4_nofpu  0x41
+#define bfd_mach_sh4_nommu_nofpu  0x42
+#define bfd_mach_sh4a       0x4a
+#define bfd_mach_sh4a_nofpu 0x4b
+#define bfd_mach_sh4al_dsp  0x4d
+#define bfd_mach_sh5        0x50
+  bfd_arch_alpha,     /* Dec Alpha */
+#define bfd_mach_alpha_ev4  0x10
+#define bfd_mach_alpha_ev5  0x20
+#define bfd_mach_alpha_ev6  0x30
+  bfd_arch_arm,       /* Advanced Risc Machines ARM.  */
+#define bfd_mach_arm_unknown   0
+#define bfd_mach_arm_2         1
+#define bfd_mach_arm_2a        2
+#define bfd_mach_arm_3         3
+#define bfd_mach_arm_3M        4
+#define bfd_mach_arm_4         5
+#define bfd_mach_arm_4T        6
+#define bfd_mach_arm_5         7
+#define bfd_mach_arm_5T        8
+#define bfd_mach_arm_5TE       9
+#define bfd_mach_arm_XScale    10
+#define bfd_mach_arm_ep9312    11
+#define bfd_mach_arm_iWMMXt    12
+#define bfd_mach_arm_iWMMXt2   13
+  bfd_arch_ns32k,     /* National Semiconductors ns32000 */
+  bfd_arch_w65,       /* WDC 65816 */
+  bfd_arch_tic30,     /* Texas Instruments TMS320C30 */
+  bfd_arch_tic4x,     /* Texas Instruments TMS320C3X/4X */
+#define bfd_mach_tic3x         30
+#define bfd_mach_tic4x         40
+  bfd_arch_tic54x,    /* Texas Instruments TMS320C54X */
+  bfd_arch_tic6x,     /* Texas Instruments TMS320C6X */
+  bfd_arch_tic80,     /* TI TMS320c80 (MVP) */
+  bfd_arch_v850,      /* NEC V850 */
+#define bfd_mach_v850          1
+#define bfd_mach_v850e         'E'
+#define bfd_mach_v850e1        '1'
+#define bfd_mach_v850e2        0x4532
+#define bfd_mach_v850e2v3      0x45325633
+  bfd_arch_arc,       /* ARC Cores */
+#define bfd_mach_arc_5         5
+#define bfd_mach_arc_6         6
+#define bfd_mach_arc_7         7
+#define bfd_mach_arc_8         8
+ bfd_arch_m32c,     /* Renesas M16C/M32C.  */
+#define bfd_mach_m16c        0x75
+#define bfd_mach_m32c        0x78
+  bfd_arch_m32r,      /* Renesas M32R (formerly Mitsubishi M32R/D) */
+#define bfd_mach_m32r          1 /* For backwards compatibility.  */
+#define bfd_mach_m32rx         'x'
+#define bfd_mach_m32r2         '2'
+  bfd_arch_mn10200,   /* Matsushita MN10200 */
+  bfd_arch_mn10300,   /* Matsushita MN10300 */
+#define bfd_mach_mn10300               300
+#define bfd_mach_am33          330
+#define bfd_mach_am33_2        332
+  bfd_arch_fr30,
+#define bfd_mach_fr30          0x46523330
+  bfd_arch_frv,
+#define bfd_mach_frv           1
+#define bfd_mach_frvsimple     2
+#define bfd_mach_fr300         300
+#define bfd_mach_fr400         400
+#define bfd_mach_fr450         450
+#define bfd_mach_frvtomcat     499     /* fr500 prototype */
+#define bfd_mach_fr500         500
+#define bfd_mach_fr550         550
+  bfd_arch_moxie,       /* The moxie processor */
+#define bfd_mach_moxie         1
+  bfd_arch_mcore,
+  bfd_arch_mep,
+#define bfd_mach_mep           1
+#define bfd_mach_mep_h1        0x6831
+#define bfd_mach_mep_c5        0x6335
+  bfd_arch_ia64,      /* HP/Intel ia64 */
+#define bfd_mach_ia64_elf64    64
+#define bfd_mach_ia64_elf32    32
+  bfd_arch_ip2k,      /* Ubicom IP2K microcontrollers. */
+#define bfd_mach_ip2022        1
+#define bfd_mach_ip2022ext     2
+ bfd_arch_iq2000,     /* Vitesse IQ2000.  */
+#define bfd_mach_iq2000        1
+#define bfd_mach_iq10          2
+  bfd_arch_mt,
+#define bfd_mach_ms1           1
+#define bfd_mach_mrisc2        2
+#define bfd_mach_ms2           3
+  bfd_arch_pj,
+  bfd_arch_avr,       /* Atmel AVR microcontrollers.  */
+#define bfd_mach_avr1          1
+#define bfd_mach_avr2          2
+#define bfd_mach_avr25         25
+#define bfd_mach_avr3          3
+#define bfd_mach_avr31         31
+#define bfd_mach_avr35         35
+#define bfd_mach_avr4          4
+#define bfd_mach_avr5          5
+#define bfd_mach_avr51         51
+#define bfd_mach_avr6          6
+#define bfd_mach_avrxmega1 101
+#define bfd_mach_avrxmega2 102
+#define bfd_mach_avrxmega3 103
+#define bfd_mach_avrxmega4 104
+#define bfd_mach_avrxmega5 105
+#define bfd_mach_avrxmega6 106
+#define bfd_mach_avrxmega7 107
+  bfd_arch_bfin,        /* ADI Blackfin */
+#define bfd_mach_bfin          1
+  bfd_arch_cr16,       /* National Semiconductor CompactRISC (ie CR16). */
+#define bfd_mach_cr16          1
+  bfd_arch_cr16c,       /* National Semiconductor CompactRISC. */
+#define bfd_mach_cr16c         1
+  bfd_arch_crx,       /*  National Semiconductor CRX.  */
+#define bfd_mach_crx           1
+  bfd_arch_cris,      /* Axis CRIS */
+#define bfd_mach_cris_v0_v10   255
+#define bfd_mach_cris_v32      32
+#define bfd_mach_cris_v10_v32  1032
+  bfd_arch_rx,        /* Renesas RX.  */
+#define bfd_mach_rx            0x75
+  bfd_arch_s390,      /* IBM s390 */
+#define bfd_mach_s390_31       31
+#define bfd_mach_s390_64       64
+  bfd_arch_score,     /* Sunplus score */ 
+#define bfd_mach_score3         3
+#define bfd_mach_score7         7
+  bfd_arch_openrisc,  /* OpenRISC */
+  bfd_arch_mmix,      /* Donald Knuth's educational processor.  */
+  bfd_arch_xstormy16,
+#define bfd_mach_xstormy16     1
+  bfd_arch_msp430,    /* Texas Instruments MSP430 architecture.  */
+#define bfd_mach_msp11          11
+#define bfd_mach_msp110         110
+#define bfd_mach_msp12          12
+#define bfd_mach_msp13          13
+#define bfd_mach_msp14          14
+#define bfd_mach_msp15          15
+#define bfd_mach_msp16          16
+#define bfd_mach_msp21          21
+#define bfd_mach_msp31          31
+#define bfd_mach_msp32          32
+#define bfd_mach_msp33          33
+#define bfd_mach_msp41          41
+#define bfd_mach_msp42          42
+#define bfd_mach_msp43          43
+#define bfd_mach_msp44          44
+  bfd_arch_xc16x,     /* Infineon's XC16X Series.               */
+#define bfd_mach_xc16x         1
+#define bfd_mach_xc16xl        2
+#define bfd_mach_xc16xs         3
+  bfd_arch_xtensa,    /* Tensilica's Xtensa cores.  */
+#define bfd_mach_xtensa        1
+  bfd_arch_z80,
+#define bfd_mach_z80strict      1 /* No undocumented opcodes.  */
+#define bfd_mach_z80            3 /* With ixl, ixh, iyl, and iyh.  */
+#define bfd_mach_z80full        7 /* All undocumented instructions.  */
+#define bfd_mach_r800           11 /* R800: successor with multiplication.  */
+  bfd_arch_lm32,      /* Lattice Mico32 */
+#define bfd_mach_lm32      1
+  bfd_arch_microblaze,/* Xilinx MicroBlaze. */
+  bfd_arch_tilepro,   /* Tilera TILEPro */
+  bfd_arch_tilegx, /* Tilera TILE-Gx */
+#define bfd_mach_tilepro   1
+#define bfd_mach_tilegx    1
+  bfd_arch_last
+  };
+
+typedef struct bfd_arch_info
+{
+  int bits_per_word;
+  int bits_per_address;
+  int bits_per_byte;
+  enum bfd_architecture arch;
+  unsigned long mach;
+  const char *arch_name;
+  const char *printable_name;
+  unsigned int section_align_power;
+  /* TRUE if this is the default machine for the architecture.
+     The default arch should be the first entry for an arch so that
+     all the entries for that arch can be accessed via <<next>>.  */
+  bfd_boolean the_default;
+  const struct bfd_arch_info * (*compatible)
+    (const struct bfd_arch_info *a, const struct bfd_arch_info *b);
+
+  bfd_boolean (*scan) (const struct bfd_arch_info *, const char *);
+
+  const struct bfd_arch_info *next;
+}
+bfd_arch_info_type;
+
+const char *bfd_printable_name (bfd *abfd);
+
+const bfd_arch_info_type *bfd_scan_arch (const char *string);
+
+const char **bfd_arch_list (void);
+
+const bfd_arch_info_type *bfd_arch_get_compatible
+   (const bfd *abfd, const bfd *bbfd, bfd_boolean accept_unknowns);
+
+void bfd_set_arch_info (bfd *abfd, const bfd_arch_info_type *arg);
+
+enum bfd_architecture bfd_get_arch (bfd *abfd);
+
+unsigned long bfd_get_mach (bfd *abfd);
+
+unsigned int bfd_arch_bits_per_byte (bfd *abfd);
+
+unsigned int bfd_arch_bits_per_address (bfd *abfd);
+
+const bfd_arch_info_type *bfd_get_arch_info (bfd *abfd);
+
+const bfd_arch_info_type *bfd_lookup_arch
+   (enum bfd_architecture arch, unsigned long machine);
+
+const char *bfd_printable_arch_mach
+   (enum bfd_architecture arch, unsigned long machine);
+
+unsigned int bfd_octets_per_byte (bfd *abfd);
+
+unsigned int bfd_arch_mach_octets_per_byte
+   (enum bfd_architecture arch, unsigned long machine);
+
+/* Extracted from reloc.c.  */
+typedef enum bfd_reloc_status
+{
+  /* No errors detected.  */
+  bfd_reloc_ok,
+
+  /* The relocation was performed, but there was an overflow.  */
+  bfd_reloc_overflow,
+
+  /* The address to relocate was not within the section supplied.  */
+  bfd_reloc_outofrange,
+
+  /* Used by special functions.  */
+  bfd_reloc_continue,
+
+  /* Unsupported relocation size requested.  */
+  bfd_reloc_notsupported,
+
+  /* Unused.  */
+  bfd_reloc_other,
+
+  /* The symbol to relocate against was undefined.  */
+  bfd_reloc_undefined,
+
+  /* The relocation was performed, but may not be ok - presently
+     generated only when linking i960 coff files with i960 b.out
+     symbols.  If this type is returned, the error_message argument
+     to bfd_perform_relocation will be set.  */
+  bfd_reloc_dangerous
+ }
+ bfd_reloc_status_type;
+
+
+typedef struct reloc_cache_entry
+{
+  /* A pointer into the canonical table of pointers.  */
+  struct bfd_symbol **sym_ptr_ptr;
+
+  /* offset in section.  */
+  bfd_size_type address;
+
+  /* addend for relocation value.  */
+  bfd_vma addend;
+
+  /* Pointer to how to perform the required relocation.  */
+  reloc_howto_type *howto;
+
+}
+arelent;
+
+enum complain_overflow
+{
+  /* Do not complain on overflow.  */
+  complain_overflow_dont,
+
+  /* Complain if the value overflows when considered as a signed
+     number one bit larger than the field.  ie. A bitfield of N bits
+     is allowed to represent -2**n to 2**n-1.  */
+  complain_overflow_bitfield,
+
+  /* Complain if the value overflows when considered as a signed
+     number.  */
+  complain_overflow_signed,
+
+  /* Complain if the value overflows when considered as an
+     unsigned number.  */
+  complain_overflow_unsigned
+};
+
+struct reloc_howto_struct
+{
+  /*  The type field has mainly a documentary use - the back end can
+      do what it wants with it, though normally the back end's
+      external idea of what a reloc number is stored
+      in this field.  For example, a PC relative word relocation
+      in a coff environment has the type 023 - because that's
+      what the outside world calls a R_PCRWORD reloc.  */
+  unsigned int type;
+
+  /*  The value the final relocation is shifted right by.  This drops
+      unwanted data from the relocation.  */
+  unsigned int rightshift;
+
+  /*  The size of the item to be relocated.  This is *not* a
+      power-of-two measure.  To get the number of bytes operated
+      on by a type of relocation, use bfd_get_reloc_size.  */
+  int size;
+
+  /*  The number of bits in the item to be relocated.  This is used
+      when doing overflow checking.  */
+  unsigned int bitsize;
+
+  /*  The relocation is relative to the field being relocated.  */
+  bfd_boolean pc_relative;
+
+  /*  The bit position of the reloc value in the destination.
+      The relocated value is left shifted by this amount.  */
+  unsigned int bitpos;
+
+  /* What type of overflow error should be checked for when
+     relocating.  */
+  enum complain_overflow complain_on_overflow;
+
+  /* If this field is non null, then the supplied function is
+     called rather than the normal function.  This allows really
+     strange relocation methods to be accommodated (e.g., i960 callj
+     instructions).  */
+  bfd_reloc_status_type (*special_function)
+    (bfd *, arelent *, struct bfd_symbol *, void *, asection *,
+     bfd *, char **);
+
+  /* The textual name of the relocation type.  */
+  char *name;
+
+  /* Some formats record a relocation addend in the section contents
+     rather than with the relocation.  For ELF formats this is the
+     distinction between USE_REL and USE_RELA (though the code checks
+     for USE_REL == 1/0).  The value of this field is TRUE if the
+     addend is recorded with the section contents; when performing a
+     partial link (ld -r) the section contents (the data) will be
+     modified.  The value of this field is FALSE if addends are
+     recorded with the relocation (in arelent.addend); when performing
+     a partial link the relocation will be modified.
+     All relocations for all ELF USE_RELA targets should set this field
+     to FALSE (values of TRUE should be looked on with suspicion).
+     However, the converse is not true: not all relocations of all ELF
+     USE_REL targets set this field to TRUE.  Why this is so is peculiar
+     to each particular target.  For relocs that aren't used in partial
+     links (e.g. GOT stuff) it doesn't matter what this is set to.  */
+  bfd_boolean partial_inplace;
+
+  /* src_mask selects the part of the instruction (or data) to be used
+     in the relocation sum.  If the target relocations don't have an
+     addend in the reloc, eg. ELF USE_REL, src_mask will normally equal
+     dst_mask to extract the addend from the section contents.  If
+     relocations do have an addend in the reloc, eg. ELF USE_RELA, this
+     field should be zero.  Non-zero values for ELF USE_RELA targets are
+     bogus as in those cases the value in the dst_mask part of the
+     section contents should be treated as garbage.  */
+  bfd_vma src_mask;
+
+  /* dst_mask selects which parts of the instruction (or data) are
+     replaced with a relocated value.  */
+  bfd_vma dst_mask;
+
+  /* When some formats create PC relative instructions, they leave
+     the value of the pc of the place being relocated in the offset
+     slot of the instruction, so that a PC relative relocation can
+     be made just by adding in an ordinary offset (e.g., sun3 a.out).
+     Some formats leave the displacement part of an instruction
+     empty (e.g., m88k bcs); this flag signals the fact.  */
+  bfd_boolean pcrel_offset;
+};
+
+#define HOWTO(C, R, S, B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC) \
+  { (unsigned) C, R, S, B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC }
+#define NEWHOWTO(FUNCTION, NAME, SIZE, REL, IN) \
+  HOWTO (0, 0, SIZE, 0, REL, 0, complain_overflow_dont, FUNCTION, \
+         NAME, FALSE, 0, 0, IN)
+
+#define EMPTY_HOWTO(C) \
+  HOWTO ((C), 0, 0, 0, FALSE, 0, complain_overflow_dont, NULL, \
+         NULL, FALSE, 0, 0, FALSE)
+
+#define HOWTO_PREPARE(relocation, symbol)               \
+  {                                                     \
+    if (symbol != NULL)                                 \
+      {                                                 \
+        if (bfd_is_com_section (symbol->section))       \
+          {                                             \
+            relocation = 0;                             \
+          }                                             \
+        else                                            \
+          {                                             \
+            relocation = symbol->value;                 \
+          }                                             \
+      }                                                 \
+  }
+
+unsigned int bfd_get_reloc_size (reloc_howto_type *);
+
+typedef struct relent_chain
+{
+  arelent relent;
+  struct relent_chain *next;
+}
+arelent_chain;
+
+bfd_reloc_status_type bfd_check_overflow
+   (enum complain_overflow how,
+    unsigned int bitsize,
+    unsigned int rightshift,
+    unsigned int addrsize,
+    bfd_vma relocation);
+
+bfd_reloc_status_type bfd_perform_relocation
+   (bfd *abfd,
+    arelent *reloc_entry,
+    void *data,
+    asection *input_section,
+    bfd *output_bfd,
+    char **error_message);
+
+bfd_reloc_status_type bfd_install_relocation
+   (bfd *abfd,
+    arelent *reloc_entry,
+    void *data, bfd_vma data_start,
+    asection *input_section,
+    char **error_message);
+
+enum bfd_reloc_code_real {
+  _dummy_first_bfd_reloc_code_real,
+
+
+/* Basic absolute relocations of N bits.  */
+  BFD_RELOC_64,
+  BFD_RELOC_32,
+  BFD_RELOC_26,
+  BFD_RELOC_24,
+  BFD_RELOC_16,
+  BFD_RELOC_14,
+  BFD_RELOC_8,
+
+/* PC-relative relocations.  Sometimes these are relative to the address
+of the relocation itself; sometimes they are relative to the start of
+the section containing the relocation.  It depends on the specific target.
+
+The 24-bit relocation is used in some Intel 960 configurations.  */
+  BFD_RELOC_64_PCREL,
+  BFD_RELOC_32_PCREL,
+  BFD_RELOC_24_PCREL,
+  BFD_RELOC_16_PCREL,
+  BFD_RELOC_12_PCREL,
+  BFD_RELOC_8_PCREL,
+
+/* Section relative relocations.  Some targets need this for DWARF2.  */
+  BFD_RELOC_32_SECREL,
+
+/* For ELF.  */
+  BFD_RELOC_32_GOT_PCREL,
+  BFD_RELOC_16_GOT_PCREL,
+  BFD_RELOC_8_GOT_PCREL,
+  BFD_RELOC_32_GOTOFF,
+  BFD_RELOC_16_GOTOFF,
+  BFD_RELOC_LO16_GOTOFF,
+  BFD_RELOC_HI16_GOTOFF,
+  BFD_RELOC_HI16_S_GOTOFF,
+  BFD_RELOC_8_GOTOFF,
+  BFD_RELOC_64_PLT_PCREL,
+  BFD_RELOC_32_PLT_PCREL,
+  BFD_RELOC_24_PLT_PCREL,
+  BFD_RELOC_16_PLT_PCREL,
+  BFD_RELOC_8_PLT_PCREL,
+  BFD_RELOC_64_PLTOFF,
+  BFD_RELOC_32_PLTOFF,
+  BFD_RELOC_16_PLTOFF,
+  BFD_RELOC_LO16_PLTOFF,
+  BFD_RELOC_HI16_PLTOFF,
+  BFD_RELOC_HI16_S_PLTOFF,
+  BFD_RELOC_8_PLTOFF,
+
+/* Relocations used by 68K ELF.  */
+  BFD_RELOC_68K_GLOB_DAT,
+  BFD_RELOC_68K_JMP_SLOT,
+  BFD_RELOC_68K_RELATIVE,
+  BFD_RELOC_68K_TLS_GD32,
+  BFD_RELOC_68K_TLS_GD16,
+  BFD_RELOC_68K_TLS_GD8,
+  BFD_RELOC_68K_TLS_LDM32,
+  BFD_RELOC_68K_TLS_LDM16,
+  BFD_RELOC_68K_TLS_LDM8,
+  BFD_RELOC_68K_TLS_LDO32,
+  BFD_RELOC_68K_TLS_LDO16,
+  BFD_RELOC_68K_TLS_LDO8,
+  BFD_RELOC_68K_TLS_IE32,
+  BFD_RELOC_68K_TLS_IE16,
+  BFD_RELOC_68K_TLS_IE8,
+  BFD_RELOC_68K_TLS_LE32,
+  BFD_RELOC_68K_TLS_LE16,
+  BFD_RELOC_68K_TLS_LE8,
+
+/* Linkage-table relative.  */
+  BFD_RELOC_32_BASEREL,
+  BFD_RELOC_16_BASEREL,
+  BFD_RELOC_LO16_BASEREL,
+  BFD_RELOC_HI16_BASEREL,
+  BFD_RELOC_HI16_S_BASEREL,
+  BFD_RELOC_8_BASEREL,
+  BFD_RELOC_RVA,
+
+/* Absolute 8-bit relocation, but used to form an address like 0xFFnn.  */
+  BFD_RELOC_8_FFnn,
+
+/* These PC-relative relocations are stored as word displacements --
+i.e., byte displacements shifted right two bits.  The 30-bit word
+displacement (<<32_PCREL_S2>> -- 32 bits, shifted 2) is used on the
+SPARC.  (SPARC tools generally refer to this as <<WDISP30>>.)  The
+signed 16-bit displacement is used on the MIPS, and the 23-bit
+displacement is used on the Alpha.  */
+  BFD_RELOC_32_PCREL_S2,
+  BFD_RELOC_16_PCREL_S2,
+  BFD_RELOC_23_PCREL_S2,
+
+/* High 22 bits and low 10 bits of 32-bit value, placed into lower bits of
+the target word.  These are used on the SPARC.  */
+  BFD_RELOC_HI22,
+  BFD_RELOC_LO10,
+
+/* For systems that allocate a Global Pointer register, these are
+displacements off that register.  These relocation types are
+handled specially, because the value the register will have is
+decided relatively late.  */
+  BFD_RELOC_GPREL16,
+  BFD_RELOC_GPREL32,
+
+/* Reloc types used for i960/b.out.  */
+  BFD_RELOC_I960_CALLJ,
+
+/* SPARC ELF relocations.  There is probably some overlap with other
+relocation types already defined.  */
+  BFD_RELOC_NONE,
+  BFD_RELOC_SPARC_WDISP22,
+  BFD_RELOC_SPARC22,
+  BFD_RELOC_SPARC13,
+  BFD_RELOC_SPARC_GOT10,
+  BFD_RELOC_SPARC_GOT13,
+  BFD_RELOC_SPARC_GOT22,
+  BFD_RELOC_SPARC_PC10,
+  BFD_RELOC_SPARC_PC22,
+  BFD_RELOC_SPARC_WPLT30,
+  BFD_RELOC_SPARC_COPY,
+  BFD_RELOC_SPARC_GLOB_DAT,
+  BFD_RELOC_SPARC_JMP_SLOT,
+  BFD_RELOC_SPARC_RELATIVE,
+  BFD_RELOC_SPARC_UA16,
+  BFD_RELOC_SPARC_UA32,
+  BFD_RELOC_SPARC_UA64,
+  BFD_RELOC_SPARC_GOTDATA_HIX22,
+  BFD_RELOC_SPARC_GOTDATA_LOX10,
+  BFD_RELOC_SPARC_GOTDATA_OP_HIX22,
+  BFD_RELOC_SPARC_GOTDATA_OP_LOX10,
+  BFD_RELOC_SPARC_GOTDATA_OP,
+  BFD_RELOC_SPARC_JMP_IREL,
+  BFD_RELOC_SPARC_IRELATIVE,
+
+/* I think these are specific to SPARC a.out (e.g., Sun 4).  */
+  BFD_RELOC_SPARC_BASE13,
+  BFD_RELOC_SPARC_BASE22,
+
+/* SPARC64 relocations  */
+#define BFD_RELOC_SPARC_64 BFD_RELOC_64
+  BFD_RELOC_SPARC_10,
+  BFD_RELOC_SPARC_11,
+  BFD_RELOC_SPARC_OLO10,
+  BFD_RELOC_SPARC_HH22,
+  BFD_RELOC_SPARC_HM10,
+  BFD_RELOC_SPARC_LM22,
+  BFD_RELOC_SPARC_PC_HH22,
+  BFD_RELOC_SPARC_PC_HM10,
+  BFD_RELOC_SPARC_PC_LM22,
+  BFD_RELOC_SPARC_WDISP16,
+  BFD_RELOC_SPARC_WDISP19,
+  BFD_RELOC_SPARC_7,
+  BFD_RELOC_SPARC_6,
+  BFD_RELOC_SPARC_5,
+#define BFD_RELOC_SPARC_DISP64 BFD_RELOC_64_PCREL
+  BFD_RELOC_SPARC_PLT32,
+  BFD_RELOC_SPARC_PLT64,
+  BFD_RELOC_SPARC_HIX22,
+  BFD_RELOC_SPARC_LOX10,
+  BFD_RELOC_SPARC_H44,
+  BFD_RELOC_SPARC_M44,
+  BFD_RELOC_SPARC_L44,
+  BFD_RELOC_SPARC_REGISTER,
+
+/* SPARC little endian relocation  */
+  BFD_RELOC_SPARC_REV32,
+
+/* SPARC TLS relocations  */
+  BFD_RELOC_SPARC_TLS_GD_HI22,
+  BFD_RELOC_SPARC_TLS_GD_LO10,
+  BFD_RELOC_SPARC_TLS_GD_ADD,
+  BFD_RELOC_SPARC_TLS_GD_CALL,
+  BFD_RELOC_SPARC_TLS_LDM_HI22,
+  BFD_RELOC_SPARC_TLS_LDM_LO10,
+  BFD_RELOC_SPARC_TLS_LDM_ADD,
+  BFD_RELOC_SPARC_TLS_LDM_CALL,
+  BFD_RELOC_SPARC_TLS_LDO_HIX22,
+  BFD_RELOC_SPARC_TLS_LDO_LOX10,
+  BFD_RELOC_SPARC_TLS_LDO_ADD,
+  BFD_RELOC_SPARC_TLS_IE_HI22,
+  BFD_RELOC_SPARC_TLS_IE_LO10,
+  BFD_RELOC_SPARC_TLS_IE_LD,
+  BFD_RELOC_SPARC_TLS_IE_LDX,
+  BFD_RELOC_SPARC_TLS_IE_ADD,
+  BFD_RELOC_SPARC_TLS_LE_HIX22,
+  BFD_RELOC_SPARC_TLS_LE_LOX10,
+  BFD_RELOC_SPARC_TLS_DTPMOD32,
+  BFD_RELOC_SPARC_TLS_DTPMOD64,
+  BFD_RELOC_SPARC_TLS_DTPOFF32,
+  BFD_RELOC_SPARC_TLS_DTPOFF64,
+  BFD_RELOC_SPARC_TLS_TPOFF32,
+  BFD_RELOC_SPARC_TLS_TPOFF64,
+
+/* SPU Relocations.  */
+  BFD_RELOC_SPU_IMM7,
+  BFD_RELOC_SPU_IMM8,
+  BFD_RELOC_SPU_IMM10,
+  BFD_RELOC_SPU_IMM10W,
+  BFD_RELOC_SPU_IMM16,
+  BFD_RELOC_SPU_IMM16W,
+  BFD_RELOC_SPU_IMM18,
+  BFD_RELOC_SPU_PCREL9a,
+  BFD_RELOC_SPU_PCREL9b,
+  BFD_RELOC_SPU_PCREL16,
+  BFD_RELOC_SPU_LO16,
+  BFD_RELOC_SPU_HI16,
+  BFD_RELOC_SPU_PPU32,
+  BFD_RELOC_SPU_PPU64,
+  BFD_RELOC_SPU_ADD_PIC,
+
+/* Alpha ECOFF and ELF relocations.  Some of these treat the symbol or
+"addend" in some special way.
+For GPDISP_HI16 ("gpdisp") relocations, the symbol is ignored when
+writing; when reading, it will be the absolute section symbol.  The
+addend is the displacement in bytes of the "lda" instruction from
+the "ldah" instruction (which is at the address of this reloc).  */
+  BFD_RELOC_ALPHA_GPDISP_HI16,
+
+/* For GPDISP_LO16 ("ignore") relocations, the symbol is handled as
+with GPDISP_HI16 relocs.  The addend is ignored when writing the
+relocations out, and is filled in with the file's GP value on
+reading, for convenience.  */
+  BFD_RELOC_ALPHA_GPDISP_LO16,
+
+/* The ELF GPDISP relocation is exactly the same as the GPDISP_HI16
+relocation except that there is no accompanying GPDISP_LO16
+relocation.  */
+  BFD_RELOC_ALPHA_GPDISP,
+
+/* The Alpha LITERAL/LITUSE relocs are produced by a symbol reference;
+the assembler turns it into a LDQ instruction to load the address of
+the symbol, and then fills in a register in the real instruction.
+
+The LITERAL reloc, at the LDQ instruction, refers to the .lita
+section symbol.  The addend is ignored when writing, but is filled
+in with the file's GP value on reading, for convenience, as with the
+GPDISP_LO16 reloc.
+
+The ELF_LITERAL reloc is somewhere between 16_GOTOFF and GPDISP_LO16.
+It should refer to the symbol to be referenced, as with 16_GOTOFF,
+but it generates output not based on the position within the .got
+section, but relative to the GP value chosen for the file during the
+final link stage.
+
+The LITUSE reloc, on the instruction using the loaded address, gives
+information to the linker that it might be able to use to optimize
+away some literal section references.  The symbol is ignored (read
+as the absolute section symbol), and the "addend" indicates the type
+of instruction using the register:
+1 - "memory" fmt insn
+2 - byte-manipulation (byte offset reg)
+3 - jsr (target of branch)  */
+  BFD_RELOC_ALPHA_LITERAL,
+  BFD_RELOC_ALPHA_ELF_LITERAL,
+  BFD_RELOC_ALPHA_LITUSE,
+
+/* The HINT relocation indicates a value that should be filled into the
+"hint" field of a jmp/jsr/ret instruction, for possible branch-
+prediction logic which may be provided on some processors.  */
+  BFD_RELOC_ALPHA_HINT,
+
+/* The LINKAGE relocation outputs a linkage pair in the object file,
+which is filled by the linker.  */
+  BFD_RELOC_ALPHA_LINKAGE,
+
+/* The CODEADDR relocation outputs a STO_CA in the object file,
+which is filled by the linker.  */
+  BFD_RELOC_ALPHA_CODEADDR,
+
+/* The GPREL_HI/LO relocations together form a 32-bit offset from the
+GP register.  */
+  BFD_RELOC_ALPHA_GPREL_HI16,
+  BFD_RELOC_ALPHA_GPREL_LO16,
+
+/* Like BFD_RELOC_23_PCREL_S2, except that the source and target must
+share a common GP, and the target address is adjusted for
+STO_ALPHA_STD_GPLOAD.  */
+  BFD_RELOC_ALPHA_BRSGP,
+
+/* The NOP relocation outputs a NOP if the longword displacement
+between two procedure entry points is < 2^21.  */
+  BFD_RELOC_ALPHA_NOP,
+
+/* The BSR relocation outputs a BSR if the longword displacement
+between two procedure entry points is < 2^21.  */
+  BFD_RELOC_ALPHA_BSR,
+
+/* The LDA relocation outputs a LDA if the longword displacement
+between two procedure entry points is < 2^16.  */
+  BFD_RELOC_ALPHA_LDA,
+
+/* The BOH relocation outputs a BSR if the longword displacement
+between two procedure entry points is < 2^21, or else a hint.  */
+  BFD_RELOC_ALPHA_BOH,
+
+/* Alpha thread-local storage relocations.  */
+  BFD_RELOC_ALPHA_TLSGD,
+  BFD_RELOC_ALPHA_TLSLDM,
+  BFD_RELOC_ALPHA_DTPMOD64,
+  BFD_RELOC_ALPHA_GOTDTPREL16,
+  BFD_RELOC_ALPHA_DTPREL64,
+  BFD_RELOC_ALPHA_DTPREL_HI16,
+  BFD_RELOC_ALPHA_DTPREL_LO16,
+  BFD_RELOC_ALPHA_DTPREL16,
+  BFD_RELOC_ALPHA_GOTTPREL16,
+  BFD_RELOC_ALPHA_TPREL64,
+  BFD_RELOC_ALPHA_TPREL_HI16,
+  BFD_RELOC_ALPHA_TPREL_LO16,
+  BFD_RELOC_ALPHA_TPREL16,
+
+/* The MIPS jump instruction.  */
+  BFD_RELOC_MIPS_JMP,
+  BFD_RELOC_MICROMIPS_JMP,
+
+/* The MIPS16 jump instruction.  */
+  BFD_RELOC_MIPS16_JMP,
+
+/* MIPS16 GP relative reloc.  */
+  BFD_RELOC_MIPS16_GPREL,
+
+/* High 16 bits of 32-bit value; simple reloc.  */
+  BFD_RELOC_HI16,
+
+/* High 16 bits of 32-bit value but the low 16 bits will be sign
+extended and added to form the final result.  If the low 16
+bits form a negative number, we need to add one to the high value
+to compensate for the borrow when the low bits are added.  */
+  BFD_RELOC_HI16_S,
+
+/* Low 16 bits.  */
+  BFD_RELOC_LO16,
+
+/* High 16 bits of 32-bit pc-relative value  */
+  BFD_RELOC_HI16_PCREL,
+
+/* High 16 bits of 32-bit pc-relative value, adjusted  */
+  BFD_RELOC_HI16_S_PCREL,
+
+/* Low 16 bits of pc-relative value  */
+  BFD_RELOC_LO16_PCREL,
+
+/* Equivalent of BFD_RELOC_MIPS_*, but with the MIPS16 layout of
+16-bit immediate fields  */
+  BFD_RELOC_MIPS16_GOT16,
+  BFD_RELOC_MIPS16_CALL16,
+
+/* MIPS16 high 16 bits of 32-bit value.  */
+  BFD_RELOC_MIPS16_HI16,
+
+/* MIPS16 high 16 bits of 32-bit value but the low 16 bits will be sign
+extended and added to form the final result.  If the low 16
+bits form a negative number, we need to add one to the high value
+to compensate for the borrow when the low bits are added.  */
+  BFD_RELOC_MIPS16_HI16_S,
+
+/* MIPS16 low 16 bits.  */
+  BFD_RELOC_MIPS16_LO16,
+
+/* Relocation against a MIPS literal section.  */
+  BFD_RELOC_MIPS_LITERAL,
+  BFD_RELOC_MICROMIPS_LITERAL,
+
+/* microMIPS PC-relative relocations.  */
+  BFD_RELOC_MICROMIPS_7_PCREL_S1,
+  BFD_RELOC_MICROMIPS_10_PCREL_S1,
+  BFD_RELOC_MICROMIPS_16_PCREL_S1,
+
+/* microMIPS versions of generic BFD relocs.  */
+  BFD_RELOC_MICROMIPS_GPREL16,
+  BFD_RELOC_MICROMIPS_HI16,
+  BFD_RELOC_MICROMIPS_HI16_S,
+  BFD_RELOC_MICROMIPS_LO16,
+
+/* MIPS ELF relocations.  */
+  BFD_RELOC_MIPS_GOT16,
+  BFD_RELOC_MICROMIPS_GOT16,
+  BFD_RELOC_MIPS_CALL16,
+  BFD_RELOC_MICROMIPS_CALL16,
+  BFD_RELOC_MIPS_GOT_HI16,
+  BFD_RELOC_MICROMIPS_GOT_HI16,
+  BFD_RELOC_MIPS_GOT_LO16,
+  BFD_RELOC_MICROMIPS_GOT_LO16,
+  BFD_RELOC_MIPS_CALL_HI16,
+  BFD_RELOC_MICROMIPS_CALL_HI16,
+  BFD_RELOC_MIPS_CALL_LO16,
+  BFD_RELOC_MICROMIPS_CALL_LO16,
+  BFD_RELOC_MIPS_SUB,
+  BFD_RELOC_MICROMIPS_SUB,
+  BFD_RELOC_MIPS_GOT_PAGE,
+  BFD_RELOC_MICROMIPS_GOT_PAGE,
+  BFD_RELOC_MIPS_GOT_OFST,
+  BFD_RELOC_MICROMIPS_GOT_OFST,
+  BFD_RELOC_MIPS_GOT_DISP,
+  BFD_RELOC_MICROMIPS_GOT_DISP,
+  BFD_RELOC_MIPS_SHIFT5,
+  BFD_RELOC_MIPS_SHIFT6,
+  BFD_RELOC_MIPS_INSERT_A,
+  BFD_RELOC_MIPS_INSERT_B,
+  BFD_RELOC_MIPS_DELETE,
+  BFD_RELOC_MIPS_HIGHEST,
+  BFD_RELOC_MICROMIPS_HIGHEST,
+  BFD_RELOC_MIPS_HIGHER,
+  BFD_RELOC_MICROMIPS_HIGHER,
+  BFD_RELOC_MIPS_SCN_DISP,
+  BFD_RELOC_MICROMIPS_SCN_DISP,
+  BFD_RELOC_MIPS_REL16,
+  BFD_RELOC_MIPS_RELGOT,
+  BFD_RELOC_MIPS_JALR,
+  BFD_RELOC_MICROMIPS_JALR,
+  BFD_RELOC_MIPS_TLS_DTPMOD32,
+  BFD_RELOC_MIPS_TLS_DTPREL32,
+  BFD_RELOC_MIPS_TLS_DTPMOD64,
+  BFD_RELOC_MIPS_TLS_DTPREL64,
+  BFD_RELOC_MIPS_TLS_GD,
+  BFD_RELOC_MICROMIPS_TLS_GD,
+  BFD_RELOC_MIPS_TLS_LDM,
+  BFD_RELOC_MICROMIPS_TLS_LDM,
+  BFD_RELOC_MIPS_TLS_DTPREL_HI16,
+  BFD_RELOC_MICROMIPS_TLS_DTPREL_HI16,
+  BFD_RELOC_MIPS_TLS_DTPREL_LO16,
+  BFD_RELOC_MICROMIPS_TLS_DTPREL_LO16,
+  BFD_RELOC_MIPS_TLS_GOTTPREL,
+  BFD_RELOC_MICROMIPS_TLS_GOTTPREL,
+  BFD_RELOC_MIPS_TLS_TPREL32,
+  BFD_RELOC_MIPS_TLS_TPREL64,
+  BFD_RELOC_MIPS_TLS_TPREL_HI16,
+  BFD_RELOC_MICROMIPS_TLS_TPREL_HI16,
+  BFD_RELOC_MIPS_TLS_TPREL_LO16,
+  BFD_RELOC_MICROMIPS_TLS_TPREL_LO16,
+
+
+/* MIPS ELF relocations (VxWorks and PLT extensions).  */
+  BFD_RELOC_MIPS_COPY,
+  BFD_RELOC_MIPS_JUMP_SLOT,
+
+
+/* Moxie ELF relocations.  */
+  BFD_RELOC_MOXIE_10_PCREL,
+
+
+/* Fujitsu Frv Relocations.  */
+  BFD_RELOC_FRV_LABEL16,
+  BFD_RELOC_FRV_LABEL24,
+  BFD_RELOC_FRV_LO16,
+  BFD_RELOC_FRV_HI16,
+  BFD_RELOC_FRV_GPREL12,
+  BFD_RELOC_FRV_GPRELU12,
+  BFD_RELOC_FRV_GPREL32,
+  BFD_RELOC_FRV_GPRELHI,
+  BFD_RELOC_FRV_GPRELLO,
+  BFD_RELOC_FRV_GOT12,
+  BFD_RELOC_FRV_GOTHI,
+  BFD_RELOC_FRV_GOTLO,
+  BFD_RELOC_FRV_FUNCDESC,
+  BFD_RELOC_FRV_FUNCDESC_GOT12,
+  BFD_RELOC_FRV_FUNCDESC_GOTHI,
+  BFD_RELOC_FRV_FUNCDESC_GOTLO,
+  BFD_RELOC_FRV_FUNCDESC_VALUE,
+  BFD_RELOC_FRV_FUNCDESC_GOTOFF12,
+  BFD_RELOC_FRV_FUNCDESC_GOTOFFHI,
+  BFD_RELOC_FRV_FUNCDESC_GOTOFFLO,
+  BFD_RELOC_FRV_GOTOFF12,
+  BFD_RELOC_FRV_GOTOFFHI,
+  BFD_RELOC_FRV_GOTOFFLO,
+  BFD_RELOC_FRV_GETTLSOFF,
+  BFD_RELOC_FRV_TLSDESC_VALUE,
+  BFD_RELOC_FRV_GOTTLSDESC12,
+  BFD_RELOC_FRV_GOTTLSDESCHI,
+  BFD_RELOC_FRV_GOTTLSDESCLO,
+  BFD_RELOC_FRV_TLSMOFF12,
+  BFD_RELOC_FRV_TLSMOFFHI,
+  BFD_RELOC_FRV_TLSMOFFLO,
+  BFD_RELOC_FRV_GOTTLSOFF12,
+  BFD_RELOC_FRV_GOTTLSOFFHI,
+  BFD_RELOC_FRV_GOTTLSOFFLO,
+  BFD_RELOC_FRV_TLSOFF,
+  BFD_RELOC_FRV_TLSDESC_RELAX,
+  BFD_RELOC_FRV_GETTLSOFF_RELAX,
+  BFD_RELOC_FRV_TLSOFF_RELAX,
+  BFD_RELOC_FRV_TLSMOFF,
+
+
+/* This is a 24bit GOT-relative reloc for the mn10300.  */
+  BFD_RELOC_MN10300_GOTOFF24,
+
+/* This is a 32bit GOT-relative reloc for the mn10300, offset by two bytes
+in the instruction.  */
+  BFD_RELOC_MN10300_GOT32,
+
+/* This is a 24bit GOT-relative reloc for the mn10300, offset by two bytes
+in the instruction.  */
+  BFD_RELOC_MN10300_GOT24,
+
+/* This is a 16bit GOT-relative reloc for the mn10300, offset by two bytes
+in the instruction.  */
+  BFD_RELOC_MN10300_GOT16,
+
+/* Copy symbol at runtime.  */
+  BFD_RELOC_MN10300_COPY,
+
+/* Create GOT entry.  */
+  BFD_RELOC_MN10300_GLOB_DAT,
+
+/* Create PLT entry.  */
+  BFD_RELOC_MN10300_JMP_SLOT,
+
+/* Adjust by program base.  */
+  BFD_RELOC_MN10300_RELATIVE,
+
+/* Together with another reloc targeted at the same location,
+allows for a value that is the difference of two symbols
+in the same section.  */
+  BFD_RELOC_MN10300_SYM_DIFF,
+
+/* The addend of this reloc is an alignment power that must
+be honoured at the offset's location, regardless of linker
+relaxation.  */
+  BFD_RELOC_MN10300_ALIGN,
+
+
+/* i386/elf relocations  */
+  BFD_RELOC_386_GOT32,
+  BFD_RELOC_386_PLT32,
+  BFD_RELOC_386_COPY,
+  BFD_RELOC_386_GLOB_DAT,
+  BFD_RELOC_386_JUMP_SLOT,
+  BFD_RELOC_386_RELATIVE,
+  BFD_RELOC_386_GOTOFF,
+  BFD_RELOC_386_GOTPC,
+  BFD_RELOC_386_TLS_TPOFF,
+  BFD_RELOC_386_TLS_IE,
+  BFD_RELOC_386_TLS_GOTIE,
+  BFD_RELOC_386_TLS_LE,
+  BFD_RELOC_386_TLS_GD,
+  BFD_RELOC_386_TLS_LDM,
+  BFD_RELOC_386_TLS_LDO_32,
+  BFD_RELOC_386_TLS_IE_32,
+  BFD_RELOC_386_TLS_LE_32,
+  BFD_RELOC_386_TLS_DTPMOD32,
+  BFD_RELOC_386_TLS_DTPOFF32,
+  BFD_RELOC_386_TLS_TPOFF32,
+  BFD_RELOC_386_TLS_GOTDESC,
+  BFD_RELOC_386_TLS_DESC_CALL,
+  BFD_RELOC_386_TLS_DESC,
+  BFD_RELOC_386_IRELATIVE,
+
+/* x86-64/elf relocations  */
+  BFD_RELOC_X86_64_GOT32,
+  BFD_RELOC_X86_64_PLT32,
+  BFD_RELOC_X86_64_COPY,
+  BFD_RELOC_X86_64_GLOB_DAT,
+  BFD_RELOC_X86_64_JUMP_SLOT,
+  BFD_RELOC_X86_64_RELATIVE,
+  BFD_RELOC_X86_64_GOTPCREL,
+  BFD_RELOC_X86_64_32S,
+  BFD_RELOC_X86_64_DTPMOD64,
+  BFD_RELOC_X86_64_DTPOFF64,
+  BFD_RELOC_X86_64_TPOFF64,
+  BFD_RELOC_X86_64_TLSGD,
+  BFD_RELOC_X86_64_TLSLD,
+  BFD_RELOC_X86_64_DTPOFF32,
+  BFD_RELOC_X86_64_GOTTPOFF,
+  BFD_RELOC_X86_64_TPOFF32,
+  BFD_RELOC_X86_64_GOTOFF64,
+  BFD_RELOC_X86_64_GOTPC32,
+  BFD_RELOC_X86_64_GOT64,
+  BFD_RELOC_X86_64_GOTPCREL64,
+  BFD_RELOC_X86_64_GOTPC64,
+  BFD_RELOC_X86_64_GOTPLT64,
+  BFD_RELOC_X86_64_PLTOFF64,
+  BFD_RELOC_X86_64_GOTPC32_TLSDESC,
+  BFD_RELOC_X86_64_TLSDESC_CALL,
+  BFD_RELOC_X86_64_TLSDESC,
+  BFD_RELOC_X86_64_IRELATIVE,
+
+/* ns32k relocations  */
+  BFD_RELOC_NS32K_IMM_8,
+  BFD_RELOC_NS32K_IMM_16,
+  BFD_RELOC_NS32K_IMM_32,
+  BFD_RELOC_NS32K_IMM_8_PCREL,
+  BFD_RELOC_NS32K_IMM_16_PCREL,
+  BFD_RELOC_NS32K_IMM_32_PCREL,
+  BFD_RELOC_NS32K_DISP_8,
+  BFD_RELOC_NS32K_DISP_16,
+  BFD_RELOC_NS32K_DISP_32,
+  BFD_RELOC_NS32K_DISP_8_PCREL,
+  BFD_RELOC_NS32K_DISP_16_PCREL,
+  BFD_RELOC_NS32K_DISP_32_PCREL,
+
+/* PDP11 relocations  */
+  BFD_RELOC_PDP11_DISP_8_PCREL,
+  BFD_RELOC_PDP11_DISP_6_PCREL,
+
+/* Picojava relocs.  Not all of these appear in object files.  */
+  BFD_RELOC_PJ_CODE_HI16,
+  BFD_RELOC_PJ_CODE_LO16,
+  BFD_RELOC_PJ_CODE_DIR16,
+  BFD_RELOC_PJ_CODE_DIR32,
+  BFD_RELOC_PJ_CODE_REL16,
+  BFD_RELOC_PJ_CODE_REL32,
+
+/* Power(rs6000) and PowerPC relocations.  */
+  BFD_RELOC_PPC_B26,
+  BFD_RELOC_PPC_BA26,
+  BFD_RELOC_PPC_TOC16,
+  BFD_RELOC_PPC_B16,
+  BFD_RELOC_PPC_B16_BRTAKEN,
+  BFD_RELOC_PPC_B16_BRNTAKEN,
+  BFD_RELOC_PPC_BA16,
+  BFD_RELOC_PPC_BA16_BRTAKEN,
+  BFD_RELOC_PPC_BA16_BRNTAKEN,
+  BFD_RELOC_PPC_COPY,
+  BFD_RELOC_PPC_GLOB_DAT,
+  BFD_RELOC_PPC_JMP_SLOT,
+  BFD_RELOC_PPC_RELATIVE,
+  BFD_RELOC_PPC_LOCAL24PC,
+  BFD_RELOC_PPC_EMB_NADDR32,
+  BFD_RELOC_PPC_EMB_NADDR16,
+  BFD_RELOC_PPC_EMB_NADDR16_LO,
+  BFD_RELOC_PPC_EMB_NADDR16_HI,
+  BFD_RELOC_PPC_EMB_NADDR16_HA,
+  BFD_RELOC_PPC_EMB_SDAI16,
+  BFD_RELOC_PPC_EMB_SDA2I16,
+  BFD_RELOC_PPC_EMB_SDA2REL,
+  BFD_RELOC_PPC_EMB_SDA21,
+  BFD_RELOC_PPC_EMB_MRKREF,
+  BFD_RELOC_PPC_EMB_RELSEC16,
+  BFD_RELOC_PPC_EMB_RELST_LO,
+  BFD_RELOC_PPC_EMB_RELST_HI,
+  BFD_RELOC_PPC_EMB_RELST_HA,
+  BFD_RELOC_PPC_EMB_BIT_FLD,
+  BFD_RELOC_PPC_EMB_RELSDA,
+  BFD_RELOC_PPC64_HIGHER,
+  BFD_RELOC_PPC64_HIGHER_S,
+  BFD_RELOC_PPC64_HIGHEST,
+  BFD_RELOC_PPC64_HIGHEST_S,
+  BFD_RELOC_PPC64_TOC16_LO,
+  BFD_RELOC_PPC64_TOC16_HI,
+  BFD_RELOC_PPC64_TOC16_HA,
+  BFD_RELOC_PPC64_TOC,
+  BFD_RELOC_PPC64_PLTGOT16,
+  BFD_RELOC_PPC64_PLTGOT16_LO,
+  BFD_RELOC_PPC64_PLTGOT16_HI,
+  BFD_RELOC_PPC64_PLTGOT16_HA,
+  BFD_RELOC_PPC64_ADDR16_DS,
+  BFD_RELOC_PPC64_ADDR16_LO_DS,
+  BFD_RELOC_PPC64_GOT16_DS,
+  BFD_RELOC_PPC64_GOT16_LO_DS,
+  BFD_RELOC_PPC64_PLT16_LO_DS,
+  BFD_RELOC_PPC64_SECTOFF_DS,
+  BFD_RELOC_PPC64_SECTOFF_LO_DS,
+  BFD_RELOC_PPC64_TOC16_DS,
+  BFD_RELOC_PPC64_TOC16_LO_DS,
+  BFD_RELOC_PPC64_PLTGOT16_DS,
+  BFD_RELOC_PPC64_PLTGOT16_LO_DS,
+
+/* PowerPC and PowerPC64 thread-local storage relocations.  */
+  BFD_RELOC_PPC_TLS,
+  BFD_RELOC_PPC_TLSGD,
+  BFD_RELOC_PPC_TLSLD,
+  BFD_RELOC_PPC_DTPMOD,
+  BFD_RELOC_PPC_TPREL16,
+  BFD_RELOC_PPC_TPREL16_LO,
+  BFD_RELOC_PPC_TPREL16_HI,
+  BFD_RELOC_PPC_TPREL16_HA,
+  BFD_RELOC_PPC_TPREL,
+  BFD_RELOC_PPC_DTPREL16,
+  BFD_RELOC_PPC_DTPREL16_LO,
+  BFD_RELOC_PPC_DTPREL16_HI,
+  BFD_RELOC_PPC_DTPREL16_HA,
+  BFD_RELOC_PPC_DTPREL,
+  BFD_RELOC_PPC_GOT_TLSGD16,
+  BFD_RELOC_PPC_GOT_TLSGD16_LO,
+  BFD_RELOC_PPC_GOT_TLSGD16_HI,
+  BFD_RELOC_PPC_GOT_TLSGD16_HA,
+  BFD_RELOC_PPC_GOT_TLSLD16,
+  BFD_RELOC_PPC_GOT_TLSLD16_LO,
+  BFD_RELOC_PPC_GOT_TLSLD16_HI,
+  BFD_RELOC_PPC_GOT_TLSLD16_HA,
+  BFD_RELOC_PPC_GOT_TPREL16,
+  BFD_RELOC_PPC_GOT_TPREL16_LO,
+  BFD_RELOC_PPC_GOT_TPREL16_HI,
+  BFD_RELOC_PPC_GOT_TPREL16_HA,
+  BFD_RELOC_PPC_GOT_DTPREL16,
+  BFD_RELOC_PPC_GOT_DTPREL16_LO,
+  BFD_RELOC_PPC_GOT_DTPREL16_HI,
+  BFD_RELOC_PPC_GOT_DTPREL16_HA,
+  BFD_RELOC_PPC64_TPREL16_DS,
+  BFD_RELOC_PPC64_TPREL16_LO_DS,
+  BFD_RELOC_PPC64_TPREL16_HIGHER,
+  BFD_RELOC_PPC64_TPREL16_HIGHERA,
+  BFD_RELOC_PPC64_TPREL16_HIGHEST,
+  BFD_RELOC_PPC64_TPREL16_HIGHESTA,
+  BFD_RELOC_PPC64_DTPREL16_DS,
+  BFD_RELOC_PPC64_DTPREL16_LO_DS,
+  BFD_RELOC_PPC64_DTPREL16_HIGHER,
+  BFD_RELOC_PPC64_DTPREL16_HIGHERA,
+  BFD_RELOC_PPC64_DTPREL16_HIGHEST,
+  BFD_RELOC_PPC64_DTPREL16_HIGHESTA,
+
+/* IBM 370/390 relocations  */
+  BFD_RELOC_I370_D12,
+
+/* The type of reloc used to build a constructor table - at the moment
+probably a 32 bit wide absolute relocation, but the target can choose.
+It generally does map to one of the other relocation types.  */
+  BFD_RELOC_CTOR,
+
+/* ARM 26 bit pc-relative branch.  The lowest two bits must be zero and are
+not stored in the instruction.  */
+  BFD_RELOC_ARM_PCREL_BRANCH,
+
+/* ARM 26 bit pc-relative branch.  The lowest bit must be zero and is
+not stored in the instruction.  The 2nd lowest bit comes from a 1 bit
+field in the instruction.  */
+  BFD_RELOC_ARM_PCREL_BLX,
+
+/* Thumb 22 bit pc-relative branch.  The lowest bit must be zero and is
+not stored in the instruction.  The 2nd lowest bit comes from a 1 bit
+field in the instruction.  */
+  BFD_RELOC_THUMB_PCREL_BLX,
+
+/* ARM 26-bit pc-relative branch for an unconditional BL or BLX instruction.  */
+  BFD_RELOC_ARM_PCREL_CALL,
+
+/* ARM 26-bit pc-relative branch for B or conditional BL instruction.  */
+  BFD_RELOC_ARM_PCREL_JUMP,
+
+/* Thumb 7-, 9-, 12-, 20-, 23-, and 25-bit pc-relative branches.
+The lowest bit must be zero and is not stored in the instruction.
+Note that the corresponding ELF R_ARM_THM_JUMPnn constant has an
+"nn" one smaller in all cases.  Note further that BRANCH23
+corresponds to R_ARM_THM_CALL.  */
+  BFD_RELOC_THUMB_PCREL_BRANCH7,
+  BFD_RELOC_THUMB_PCREL_BRANCH9,
+  BFD_RELOC_THUMB_PCREL_BRANCH12,
+  BFD_RELOC_THUMB_PCREL_BRANCH20,
+  BFD_RELOC_THUMB_PCREL_BRANCH23,
+  BFD_RELOC_THUMB_PCREL_BRANCH25,
+
+/* 12-bit immediate offset, used in ARM-format ldr and str instructions.  */
+  BFD_RELOC_ARM_OFFSET_IMM,
+
+/* 5-bit immediate offset, used in Thumb-format ldr and str instructions.  */
+  BFD_RELOC_ARM_THUMB_OFFSET,
+
+/* Pc-relative or absolute relocation depending on target.  Used for
+entries in .init_array sections.  */
+  BFD_RELOC_ARM_TARGET1,
+
+/* Read-only segment base relative address.  */
+  BFD_RELOC_ARM_ROSEGREL32,
+
+/* Data segment base relative address.  */
+  BFD_RELOC_ARM_SBREL32,
+
+/* This reloc is used for references to RTTI data from exception handling
+tables.  The actual definition depends on the target.  It may be a
+pc-relative or some form of GOT-indirect relocation.  */
+  BFD_RELOC_ARM_TARGET2,
+
+/* 31-bit PC relative address.  */
+  BFD_RELOC_ARM_PREL31,
+
+/* Low and High halfword relocations for MOVW and MOVT instructions.  */
+  BFD_RELOC_ARM_MOVW,
+  BFD_RELOC_ARM_MOVT,
+  BFD_RELOC_ARM_MOVW_PCREL,
+  BFD_RELOC_ARM_MOVT_PCREL,
+  BFD_RELOC_ARM_THUMB_MOVW,
+  BFD_RELOC_ARM_THUMB_MOVT,
+  BFD_RELOC_ARM_THUMB_MOVW_PCREL,
+  BFD_RELOC_ARM_THUMB_MOVT_PCREL,
+
+/* Relocations for setting up GOTs and PLTs for shared libraries.  */
+  BFD_RELOC_ARM_JUMP_SLOT,
+  BFD_RELOC_ARM_GLOB_DAT,
+  BFD_RELOC_ARM_GOT32,
+  BFD_RELOC_ARM_PLT32,
+  BFD_RELOC_ARM_RELATIVE,
+  BFD_RELOC_ARM_GOTOFF,
+  BFD_RELOC_ARM_GOTPC,
+  BFD_RELOC_ARM_GOT_PREL,
+
+/* ARM thread-local storage relocations.  */
+  BFD_RELOC_ARM_TLS_GD32,
+  BFD_RELOC_ARM_TLS_LDO32,
+  BFD_RELOC_ARM_TLS_LDM32,
+  BFD_RELOC_ARM_TLS_DTPOFF32,
+  BFD_RELOC_ARM_TLS_DTPMOD32,
+  BFD_RELOC_ARM_TLS_TPOFF32,
+  BFD_RELOC_ARM_TLS_IE32,
+  BFD_RELOC_ARM_TLS_LE32,
+  BFD_RELOC_ARM_TLS_GOTDESC,
+  BFD_RELOC_ARM_TLS_CALL,
+  BFD_RELOC_ARM_THM_TLS_CALL,
+  BFD_RELOC_ARM_TLS_DESCSEQ,
+  BFD_RELOC_ARM_THM_TLS_DESCSEQ,
+  BFD_RELOC_ARM_TLS_DESC,
+
+/* ARM group relocations.  */
+  BFD_RELOC_ARM_ALU_PC_G0_NC,
+  BFD_RELOC_ARM_ALU_PC_G0,
+  BFD_RELOC_ARM_ALU_PC_G1_NC,
+  BFD_RELOC_ARM_ALU_PC_G1,
+  BFD_RELOC_ARM_ALU_PC_G2,
+  BFD_RELOC_ARM_LDR_PC_G0,
+  BFD_RELOC_ARM_LDR_PC_G1,
+  BFD_RELOC_ARM_LDR_PC_G2,
+  BFD_RELOC_ARM_LDRS_PC_G0,
+  BFD_RELOC_ARM_LDRS_PC_G1,
+  BFD_RELOC_ARM_LDRS_PC_G2,
+  BFD_RELOC_ARM_LDC_PC_G0,
+  BFD_RELOC_ARM_LDC_PC_G1,
+  BFD_RELOC_ARM_LDC_PC_G2,
+  BFD_RELOC_ARM_ALU_SB_G0_NC,
+  BFD_RELOC_ARM_ALU_SB_G0,
+  BFD_RELOC_ARM_ALU_SB_G1_NC,
+  BFD_RELOC_ARM_ALU_SB_G1,
+  BFD_RELOC_ARM_ALU_SB_G2,
+  BFD_RELOC_ARM_LDR_SB_G0,
+  BFD_RELOC_ARM_LDR_SB_G1,
+  BFD_RELOC_ARM_LDR_SB_G2,
+  BFD_RELOC_ARM_LDRS_SB_G0,
+  BFD_RELOC_ARM_LDRS_SB_G1,
+  BFD_RELOC_ARM_LDRS_SB_G2,
+  BFD_RELOC_ARM_LDC_SB_G0,
+  BFD_RELOC_ARM_LDC_SB_G1,
+  BFD_RELOC_ARM_LDC_SB_G2,
+
+/* Annotation of BX instructions.  */
+  BFD_RELOC_ARM_V4BX,
+
+/* ARM support for STT_GNU_IFUNC.  */
+  BFD_RELOC_ARM_IRELATIVE,
+
+/* These relocs are only used within the ARM assembler.  They are not
+(at present) written to any object files.  */
+  BFD_RELOC_ARM_IMMEDIATE,
+  BFD_RELOC_ARM_ADRL_IMMEDIATE,
+  BFD_RELOC_ARM_T32_IMMEDIATE,
+  BFD_RELOC_ARM_T32_ADD_IMM,
+  BFD_RELOC_ARM_T32_IMM12,
+  BFD_RELOC_ARM_T32_ADD_PC12,
+  BFD_RELOC_ARM_SHIFT_IMM,
+  BFD_RELOC_ARM_SMC,
+  BFD_RELOC_ARM_HVC,
+  BFD_RELOC_ARM_SWI,
+  BFD_RELOC_ARM_MULTI,
+  BFD_RELOC_ARM_CP_OFF_IMM,
+  BFD_RELOC_ARM_CP_OFF_IMM_S2,
+  BFD_RELOC_ARM_T32_CP_OFF_IMM,
+  BFD_RELOC_ARM_T32_CP_OFF_IMM_S2,
+  BFD_RELOC_ARM_ADR_IMM,
+  BFD_RELOC_ARM_LDR_IMM,
+  BFD_RELOC_ARM_LITERAL,
+  BFD_RELOC_ARM_IN_POOL,
+  BFD_RELOC_ARM_OFFSET_IMM8,
+  BFD_RELOC_ARM_T32_OFFSET_U8,
+  BFD_RELOC_ARM_T32_OFFSET_IMM,
+  BFD_RELOC_ARM_HWLITERAL,
+  BFD_RELOC_ARM_THUMB_ADD,
+  BFD_RELOC_ARM_THUMB_IMM,
+  BFD_RELOC_ARM_THUMB_SHIFT,
+
+/* Renesas / SuperH SH relocs.  Not all of these appear in object files.  */
+  BFD_RELOC_SH_PCDISP8BY2,
+  BFD_RELOC_SH_PCDISP12BY2,
+  BFD_RELOC_SH_IMM3,
+  BFD_RELOC_SH_IMM3U,
+  BFD_RELOC_SH_DISP12,
+  BFD_RELOC_SH_DISP12BY2,
+  BFD_RELOC_SH_DISP12BY4,
+  BFD_RELOC_SH_DISP12BY8,
+  BFD_RELOC_SH_DISP20,
+  BFD_RELOC_SH_DISP20BY8,
+  BFD_RELOC_SH_IMM4,
+  BFD_RELOC_SH_IMM4BY2,
+  BFD_RELOC_SH_IMM4BY4,
+  BFD_RELOC_SH_IMM8,
+  BFD_RELOC_SH_IMM8BY2,
+  BFD_RELOC_SH_IMM8BY4,
+  BFD_RELOC_SH_PCRELIMM8BY2,
+  BFD_RELOC_SH_PCRELIMM8BY4,
+  BFD_RELOC_SH_SWITCH16,
+  BFD_RELOC_SH_SWITCH32,
+  BFD_RELOC_SH_USES,
+  BFD_RELOC_SH_COUNT,
+  BFD_RELOC_SH_ALIGN,
+  BFD_RELOC_SH_CODE,
+  BFD_RELOC_SH_DATA,
+  BFD_RELOC_SH_LABEL,
+  BFD_RELOC_SH_LOOP_START,
+  BFD_RELOC_SH_LOOP_END,
+  BFD_RELOC_SH_COPY,
+  BFD_RELOC_SH_GLOB_DAT,
+  BFD_RELOC_SH_JMP_SLOT,
+  BFD_RELOC_SH_RELATIVE,
+  BFD_RELOC_SH_GOTPC,
+  BFD_RELOC_SH_GOT_LOW16,
+  BFD_RELOC_SH_GOT_MEDLOW16,
+  BFD_RELOC_SH_GOT_MEDHI16,
+  BFD_RELOC_SH_GOT_HI16,
+  BFD_RELOC_SH_GOTPLT_LOW16,
+  BFD_RELOC_SH_GOTPLT_MEDLOW16,
+  BFD_RELOC_SH_GOTPLT_MEDHI16,
+  BFD_RELOC_SH_GOTPLT_HI16,
+  BFD_RELOC_SH_PLT_LOW16,
+  BFD_RELOC_SH_PLT_MEDLOW16,
+  BFD_RELOC_SH_PLT_MEDHI16,
+  BFD_RELOC_SH_PLT_HI16,
+  BFD_RELOC_SH_GOTOFF_LOW16,
+  BFD_RELOC_SH_GOTOFF_MEDLOW16,
+  BFD_RELOC_SH_GOTOFF_MEDHI16,
+  BFD_RELOC_SH_GOTOFF_HI16,
+  BFD_RELOC_SH_GOTPC_LOW16,
+  BFD_RELOC_SH_GOTPC_MEDLOW16,
+  BFD_RELOC_SH_GOTPC_MEDHI16,
+  BFD_RELOC_SH_GOTPC_HI16,
+  BFD_RELOC_SH_COPY64,
+  BFD_RELOC_SH_GLOB_DAT64,
+  BFD_RELOC_SH_JMP_SLOT64,
+  BFD_RELOC_SH_RELATIVE64,
+  BFD_RELOC_SH_GOT10BY4,
+  BFD_RELOC_SH_GOT10BY8,
+  BFD_RELOC_SH_GOTPLT10BY4,
+  BFD_RELOC_SH_GOTPLT10BY8,
+  BFD_RELOC_SH_GOTPLT32,
+  BFD_RELOC_SH_SHMEDIA_CODE,
+  BFD_RELOC_SH_IMMU5,
+  BFD_RELOC_SH_IMMS6,
+  BFD_RELOC_SH_IMMS6BY32,
+  BFD_RELOC_SH_IMMU6,
+  BFD_RELOC_SH_IMMS10,
+  BFD_RELOC_SH_IMMS10BY2,
+  BFD_RELOC_SH_IMMS10BY4,
+  BFD_RELOC_SH_IMMS10BY8,
+  BFD_RELOC_SH_IMMS16,
+  BFD_RELOC_SH_IMMU16,
+  BFD_RELOC_SH_IMM_LOW16,
+  BFD_RELOC_SH_IMM_LOW16_PCREL,
+  BFD_RELOC_SH_IMM_MEDLOW16,
+  BFD_RELOC_SH_IMM_MEDLOW16_PCREL,
+  BFD_RELOC_SH_IMM_MEDHI16,
+  BFD_RELOC_SH_IMM_MEDHI16_PCREL,
+  BFD_RELOC_SH_IMM_HI16,
+  BFD_RELOC_SH_IMM_HI16_PCREL,
+  BFD_RELOC_SH_PT_16,
+  BFD_RELOC_SH_TLS_GD_32,
+  BFD_RELOC_SH_TLS_LD_32,
+  BFD_RELOC_SH_TLS_LDO_32,
+  BFD_RELOC_SH_TLS_IE_32,
+  BFD_RELOC_SH_TLS_LE_32,
+  BFD_RELOC_SH_TLS_DTPMOD32,
+  BFD_RELOC_SH_TLS_DTPOFF32,
+  BFD_RELOC_SH_TLS_TPOFF32,
+  BFD_RELOC_SH_GOT20,
+  BFD_RELOC_SH_GOTOFF20,
+  BFD_RELOC_SH_GOTFUNCDESC,
+  BFD_RELOC_SH_GOTFUNCDESC20,
+  BFD_RELOC_SH_GOTOFFFUNCDESC,
+  BFD_RELOC_SH_GOTOFFFUNCDESC20,
+  BFD_RELOC_SH_FUNCDESC,
+
+/* ARC Cores relocs.
+ARC 22 bit pc-relative branch.  The lowest two bits must be zero and are
+not stored in the instruction.  The high 20 bits are installed in bits 26
+through 7 of the instruction.  */
+  BFD_RELOC_ARC_B22_PCREL,
+
+/* ARC 26 bit absolute branch.  The lowest two bits must be zero and are not
+stored in the instruction.  The high 24 bits are installed in bits 23
+through 0.  */
+  BFD_RELOC_ARC_B26,
+
+/* ADI Blackfin 16 bit immediate absolute reloc.  */
+  BFD_RELOC_BFIN_16_IMM,
+
+/* ADI Blackfin 16 bit immediate absolute reloc higher 16 bits.  */
+  BFD_RELOC_BFIN_16_HIGH,
+
+/* ADI Blackfin 'a' part of LSETUP.  */
+  BFD_RELOC_BFIN_4_PCREL,
+
+/* ADI Blackfin.  */
+  BFD_RELOC_BFIN_5_PCREL,
+
+/* ADI Blackfin 16 bit immediate absolute reloc lower 16 bits.  */
+  BFD_RELOC_BFIN_16_LOW,
+
+/* ADI Blackfin.  */
+  BFD_RELOC_BFIN_10_PCREL,
+
+/* ADI Blackfin 'b' part of LSETUP.  */
+  BFD_RELOC_BFIN_11_PCREL,
+
+/* ADI Blackfin.  */
+  BFD_RELOC_BFIN_12_PCREL_JUMP,
+
+/* ADI Blackfin Short jump, pcrel.  */
+  BFD_RELOC_BFIN_12_PCREL_JUMP_S,
+
+/* ADI Blackfin Call.x not implemented.  */
+  BFD_RELOC_BFIN_24_PCREL_CALL_X,
+
+/* ADI Blackfin Long Jump pcrel.  */
+  BFD_RELOC_BFIN_24_PCREL_JUMP_L,
+
+/* ADI Blackfin FD-PIC relocations.  */
+  BFD_RELOC_BFIN_GOT17M4,
+  BFD_RELOC_BFIN_GOTHI,
+  BFD_RELOC_BFIN_GOTLO,
+  BFD_RELOC_BFIN_FUNCDESC,
+  BFD_RELOC_BFIN_FUNCDESC_GOT17M4,
+  BFD_RELOC_BFIN_FUNCDESC_GOTHI,
+  BFD_RELOC_BFIN_FUNCDESC_GOTLO,
+  BFD_RELOC_BFIN_FUNCDESC_VALUE,
+  BFD_RELOC_BFIN_FUNCDESC_GOTOFF17M4,
+  BFD_RELOC_BFIN_FUNCDESC_GOTOFFHI,
+  BFD_RELOC_BFIN_FUNCDESC_GOTOFFLO,
+  BFD_RELOC_BFIN_GOTOFF17M4,
+  BFD_RELOC_BFIN_GOTOFFHI,
+  BFD_RELOC_BFIN_GOTOFFLO,
+
+/* ADI Blackfin GOT relocation.  */
+  BFD_RELOC_BFIN_GOT,
+
+/* ADI Blackfin PLTPC relocation.  */
+  BFD_RELOC_BFIN_PLTPC,
+
+/* ADI Blackfin arithmetic relocation.  */
+  BFD_ARELOC_BFIN_PUSH,
+
+/* ADI Blackfin arithmetic relocation.  */
+  BFD_ARELOC_BFIN_CONST,
+
+/* ADI Blackfin arithmetic relocation.  */
+  BFD_ARELOC_BFIN_ADD,
+
+/* ADI Blackfin arithmetic relocation.  */
+  BFD_ARELOC_BFIN_SUB,
+
+/* ADI Blackfin arithmetic relocation.  */
+  BFD_ARELOC_BFIN_MULT,
+
+/* ADI Blackfin arithmetic relocation.  */
+  BFD_ARELOC_BFIN_DIV,
+
+/* ADI Blackfin arithmetic relocation.  */
+  BFD_ARELOC_BFIN_MOD,
+
+/* ADI Blackfin arithmetic relocation.  */
+  BFD_ARELOC_BFIN_LSHIFT,
+
+/* ADI Blackfin arithmetic relocation.  */
+  BFD_ARELOC_BFIN_RSHIFT,
+
+/* ADI Blackfin arithmetic relocation.  */
+  BFD_ARELOC_BFIN_AND,
+
+/* ADI Blackfin arithmetic relocation.  */
+  BFD_ARELOC_BFIN_OR,
+
+/* ADI Blackfin arithmetic relocation.  */
+  BFD_ARELOC_BFIN_XOR,
+
+/* ADI Blackfin arithmetic relocation.  */
+  BFD_ARELOC_BFIN_LAND,
+
+/* ADI Blackfin arithmetic relocation.  */
+  BFD_ARELOC_BFIN_LOR,
+
+/* ADI Blackfin arithmetic relocation.  */
+  BFD_ARELOC_BFIN_LEN,
+
+/* ADI Blackfin arithmetic relocation.  */
+  BFD_ARELOC_BFIN_NEG,
+
+/* ADI Blackfin arithmetic relocation.  */
+  BFD_ARELOC_BFIN_COMP,
+
+/* ADI Blackfin arithmetic relocation.  */
+  BFD_ARELOC_BFIN_PAGE,
+
+/* ADI Blackfin arithmetic relocation.  */
+  BFD_ARELOC_BFIN_HWPAGE,
+
+/* ADI Blackfin arithmetic relocation.  */
+  BFD_ARELOC_BFIN_ADDR,
+
+/* Mitsubishi D10V relocs.
+This is a 10-bit reloc with the right 2 bits
+assumed to be 0.  */
+  BFD_RELOC_D10V_10_PCREL_R,
+
+/* Mitsubishi D10V relocs.
+This is a 10-bit reloc with the right 2 bits
+assumed to be 0.  This is the same as the previous reloc
+except it is in the left container, i.e.,
+shifted left 15 bits.  */
+  BFD_RELOC_D10V_10_PCREL_L,
+
+/* This is an 18-bit reloc with the right 2 bits
+assumed to be 0.  */
+  BFD_RELOC_D10V_18,
+
+/* This is an 18-bit reloc with the right 2 bits
+assumed to be 0.  */
+  BFD_RELOC_D10V_18_PCREL,
+
+/* Mitsubishi D30V relocs.
+This is a 6-bit absolute reloc.  */
+  BFD_RELOC_D30V_6,
+
+/* This is a 6-bit pc-relative reloc with
+the right 3 bits assumed to be 0.  */
+  BFD_RELOC_D30V_9_PCREL,
+
+/* This is a 6-bit pc-relative reloc with
+the right 3 bits assumed to be 0. Same
+as the previous reloc but on the right side
+of the container.  */
+  BFD_RELOC_D30V_9_PCREL_R,
+
+/* This is a 12-bit absolute reloc with the
+right 3 bitsassumed to be 0.  */
+  BFD_RELOC_D30V_15,
+
+/* This is a 12-bit pc-relative reloc with
+the right 3 bits assumed to be 0.  */
+  BFD_RELOC_D30V_15_PCREL,
+
+/* This is a 12-bit pc-relative reloc with
+the right 3 bits assumed to be 0. Same
+as the previous reloc but on the right side
+of the container.  */
+  BFD_RELOC_D30V_15_PCREL_R,
+
+/* This is an 18-bit absolute reloc with
+the right 3 bits assumed to be 0.  */
+  BFD_RELOC_D30V_21,
+
+/* This is an 18-bit pc-relative reloc with
+the right 3 bits assumed to be 0.  */
+  BFD_RELOC_D30V_21_PCREL,
+
+/* This is an 18-bit pc-relative reloc with
+the right 3 bits assumed to be 0. Same
+as the previous reloc but on the right side
+of the container.  */
+  BFD_RELOC_D30V_21_PCREL_R,
+
+/* This is a 32-bit absolute reloc.  */
+  BFD_RELOC_D30V_32,
+
+/* This is a 32-bit pc-relative reloc.  */
+  BFD_RELOC_D30V_32_PCREL,
+
+/* DLX relocs  */
+  BFD_RELOC_DLX_HI16_S,
+
+/* DLX relocs  */
+  BFD_RELOC_DLX_LO16,
+
+/* DLX relocs  */
+  BFD_RELOC_DLX_JMP26,
+
+/* Renesas M16C/M32C Relocations.  */
+  BFD_RELOC_M32C_HI8,
+  BFD_RELOC_M32C_RL_JUMP,
+  BFD_RELOC_M32C_RL_1ADDR,
+  BFD_RELOC_M32C_RL_2ADDR,
+
+/* Renesas M32R (formerly Mitsubishi M32R) relocs.
+This is a 24 bit absolute address.  */
+  BFD_RELOC_M32R_24,
+
+/* This is a 10-bit pc-relative reloc with the right 2 bits assumed to be 0.  */
+  BFD_RELOC_M32R_10_PCREL,
+
+/* This is an 18-bit reloc with the right 2 bits assumed to be 0.  */
+  BFD_RELOC_M32R_18_PCREL,
+
+/* This is a 26-bit reloc with the right 2 bits assumed to be 0.  */
+  BFD_RELOC_M32R_26_PCREL,
+
+/* This is a 16-bit reloc containing the high 16 bits of an address
+used when the lower 16 bits are treated as unsigned.  */
+  BFD_RELOC_M32R_HI16_ULO,
+
+/* This is a 16-bit reloc containing the high 16 bits of an address
+used when the lower 16 bits are treated as signed.  */
+  BFD_RELOC_M32R_HI16_SLO,
+
+/* This is a 16-bit reloc containing the lower 16 bits of an address.  */
+  BFD_RELOC_M32R_LO16,
+
+/* This is a 16-bit reloc containing the small data area offset for use in
+add3, load, and store instructions.  */
+  BFD_RELOC_M32R_SDA16,
+
+/* For PIC.  */
+  BFD_RELOC_M32R_GOT24,
+  BFD_RELOC_M32R_26_PLTREL,
+  BFD_RELOC_M32R_COPY,
+  BFD_RELOC_M32R_GLOB_DAT,
+  BFD_RELOC_M32R_JMP_SLOT,
+  BFD_RELOC_M32R_RELATIVE,
+  BFD_RELOC_M32R_GOTOFF,
+  BFD_RELOC_M32R_GOTOFF_HI_ULO,
+  BFD_RELOC_M32R_GOTOFF_HI_SLO,
+  BFD_RELOC_M32R_GOTOFF_LO,
+  BFD_RELOC_M32R_GOTPC24,
+  BFD_RELOC_M32R_GOT16_HI_ULO,
+  BFD_RELOC_M32R_GOT16_HI_SLO,
+  BFD_RELOC_M32R_GOT16_LO,
+  BFD_RELOC_M32R_GOTPC_HI_ULO,
+  BFD_RELOC_M32R_GOTPC_HI_SLO,
+  BFD_RELOC_M32R_GOTPC_LO,
+
+/* This is a 9-bit reloc  */
+  BFD_RELOC_V850_9_PCREL,
+
+/* This is a 22-bit reloc  */
+  BFD_RELOC_V850_22_PCREL,
+
+/* This is a 16 bit offset from the short data area pointer.  */
+  BFD_RELOC_V850_SDA_16_16_OFFSET,
+
+/* This is a 16 bit offset (of which only 15 bits are used) from the
+short data area pointer.  */
+  BFD_RELOC_V850_SDA_15_16_OFFSET,
+
+/* This is a 16 bit offset from the zero data area pointer.  */
+  BFD_RELOC_V850_ZDA_16_16_OFFSET,
+
+/* This is a 16 bit offset (of which only 15 bits are used) from the
+zero data area pointer.  */
+  BFD_RELOC_V850_ZDA_15_16_OFFSET,
+
+/* This is an 8 bit offset (of which only 6 bits are used) from the
+tiny data area pointer.  */
+  BFD_RELOC_V850_TDA_6_8_OFFSET,
+
+/* This is an 8bit offset (of which only 7 bits are used) from the tiny
+data area pointer.  */
+  BFD_RELOC_V850_TDA_7_8_OFFSET,
+
+/* This is a 7 bit offset from the tiny data area pointer.  */
+  BFD_RELOC_V850_TDA_7_7_OFFSET,
+
+/* This is a 16 bit offset from the tiny data area pointer.  */
+  BFD_RELOC_V850_TDA_16_16_OFFSET,
+
+/* This is a 5 bit offset (of which only 4 bits are used) from the tiny
+data area pointer.  */
+  BFD_RELOC_V850_TDA_4_5_OFFSET,
+
+/* This is a 4 bit offset from the tiny data area pointer.  */
+  BFD_RELOC_V850_TDA_4_4_OFFSET,
+
+/* This is a 16 bit offset from the short data area pointer, with the
+bits placed non-contiguously in the instruction.  */
+  BFD_RELOC_V850_SDA_16_16_SPLIT_OFFSET,
+
+/* This is a 16 bit offset from the zero data area pointer, with the
+bits placed non-contiguously in the instruction.  */
+  BFD_RELOC_V850_ZDA_16_16_SPLIT_OFFSET,
+
+/* This is a 6 bit offset from the call table base pointer.  */
+  BFD_RELOC_V850_CALLT_6_7_OFFSET,
+
+/* This is a 16 bit offset from the call table base pointer.  */
+  BFD_RELOC_V850_CALLT_16_16_OFFSET,
+
+/* Used for relaxing indirect function calls.  */
+  BFD_RELOC_V850_LONGCALL,
+
+/* Used for relaxing indirect jumps.  */
+  BFD_RELOC_V850_LONGJUMP,
+
+/* Used to maintain alignment whilst relaxing.  */
+  BFD_RELOC_V850_ALIGN,
+
+/* This is a variation of BFD_RELOC_LO16 that can be used in v850e ld.bu
+instructions.  */
+  BFD_RELOC_V850_LO16_SPLIT_OFFSET,
+
+/* This is a 16-bit reloc.  */
+  BFD_RELOC_V850_16_PCREL,
+
+/* This is a 17-bit reloc.  */
+  BFD_RELOC_V850_17_PCREL,
+
+/* This is a 23-bit reloc.  */
+  BFD_RELOC_V850_23,
+
+/* This is a 32-bit reloc.  */
+  BFD_RELOC_V850_32_PCREL,
+
+/* This is a 32-bit reloc.  */
+  BFD_RELOC_V850_32_ABS,
+
+/* This is a 16-bit reloc.  */
+  BFD_RELOC_V850_16_SPLIT_OFFSET,
+
+/* This is a 16-bit reloc.  */
+  BFD_RELOC_V850_16_S1,
+
+/* Low 16 bits. 16 bit shifted by 1.  */
+  BFD_RELOC_V850_LO16_S1,
+
+/* This is a 16 bit offset from the call table base pointer.  */
+  BFD_RELOC_V850_CALLT_15_16_OFFSET,
+
+/* DSO relocations.  */
+  BFD_RELOC_V850_32_GOTPCREL,
+
+/* DSO relocations.  */
+  BFD_RELOC_V850_16_GOT,
+
+/* DSO relocations.  */
+  BFD_RELOC_V850_32_GOT,
+
+/* DSO relocations.  */
+  BFD_RELOC_V850_22_PLT_PCREL,
+
+/* DSO relocations.  */
+  BFD_RELOC_V850_32_PLT_PCREL,
+
+/* DSO relocations.  */
+  BFD_RELOC_V850_COPY,
+
+/* DSO relocations.  */
+  BFD_RELOC_V850_GLOB_DAT,
+
+/* DSO relocations.  */
+  BFD_RELOC_V850_JMP_SLOT,
+
+/* DSO relocations.  */
+  BFD_RELOC_V850_RELATIVE,
+
+/* DSO relocations.  */
+  BFD_RELOC_V850_16_GOTOFF,
+
+/* DSO relocations.  */
+  BFD_RELOC_V850_32_GOTOFF,
+
+/* start code.  */
+  BFD_RELOC_V850_CODE,
+
+/* start data in text.  */
+  BFD_RELOC_V850_DATA,
+
+/* This is a 32bit pcrel reloc for the mn10300, offset by two bytes in the
+instruction.  */
+  BFD_RELOC_MN10300_32_PCREL,
+
+/* This is a 16bit pcrel reloc for the mn10300, offset by two bytes in the
+instruction.  */
+  BFD_RELOC_MN10300_16_PCREL,
+
+/* This is a 8bit DP reloc for the tms320c30, where the most
+significant 8 bits of a 24 bit word are placed into the least
+significant 8 bits of the opcode.  */
+  BFD_RELOC_TIC30_LDP,
+
+/* This is a 7bit reloc for the tms320c54x, where the least
+significant 7 bits of a 16 bit word are placed into the least
+significant 7 bits of the opcode.  */
+  BFD_RELOC_TIC54X_PARTLS7,
+
+/* This is a 9bit DP reloc for the tms320c54x, where the most
+significant 9 bits of a 16 bit word are placed into the least
+significant 9 bits of the opcode.  */
+  BFD_RELOC_TIC54X_PARTMS9,
+
+/* This is an extended address 23-bit reloc for the tms320c54x.  */
+  BFD_RELOC_TIC54X_23,
+
+/* This is a 16-bit reloc for the tms320c54x, where the least
+significant 16 bits of a 23-bit extended address are placed into
+the opcode.  */
+  BFD_RELOC_TIC54X_16_OF_23,
+
+/* This is a reloc for the tms320c54x, where the most
+significant 7 bits of a 23-bit extended address are placed into
+the opcode.  */
+  BFD_RELOC_TIC54X_MS7_OF_23,
+
+/* TMS320C6000 relocations.  */
+  BFD_RELOC_C6000_PCR_S21,
+  BFD_RELOC_C6000_PCR_S12,
+  BFD_RELOC_C6000_PCR_S10,
+  BFD_RELOC_C6000_PCR_S7,
+  BFD_RELOC_C6000_ABS_S16,
+  BFD_RELOC_C6000_ABS_L16,
+  BFD_RELOC_C6000_ABS_H16,
+  BFD_RELOC_C6000_SBR_U15_B,
+  BFD_RELOC_C6000_SBR_U15_H,
+  BFD_RELOC_C6000_SBR_U15_W,
+  BFD_RELOC_C6000_SBR_S16,
+  BFD_RELOC_C6000_SBR_L16_B,
+  BFD_RELOC_C6000_SBR_L16_H,
+  BFD_RELOC_C6000_SBR_L16_W,
+  BFD_RELOC_C6000_SBR_H16_B,
+  BFD_RELOC_C6000_SBR_H16_H,
+  BFD_RELOC_C6000_SBR_H16_W,
+  BFD_RELOC_C6000_SBR_GOT_U15_W,
+  BFD_RELOC_C6000_SBR_GOT_L16_W,
+  BFD_RELOC_C6000_SBR_GOT_H16_W,
+  BFD_RELOC_C6000_DSBT_INDEX,
+  BFD_RELOC_C6000_PREL31,
+  BFD_RELOC_C6000_COPY,
+  BFD_RELOC_C6000_JUMP_SLOT,
+  BFD_RELOC_C6000_EHTYPE,
+  BFD_RELOC_C6000_PCR_H16,
+  BFD_RELOC_C6000_PCR_L16,
+  BFD_RELOC_C6000_ALIGN,
+  BFD_RELOC_C6000_FPHEAD,
+  BFD_RELOC_C6000_NOCMP,
+
+/* This is a 48 bit reloc for the FR30 that stores 32 bits.  */
+  BFD_RELOC_FR30_48,
+
+/* This is a 32 bit reloc for the FR30 that stores 20 bits split up into
+two sections.  */
+  BFD_RELOC_FR30_20,
+
+/* This is a 16 bit reloc for the FR30 that stores a 6 bit word offset in
+4 bits.  */
+  BFD_RELOC_FR30_6_IN_4,
+
+/* This is a 16 bit reloc for the FR30 that stores an 8 bit byte offset
+into 8 bits.  */
+  BFD_RELOC_FR30_8_IN_8,
+
+/* This is a 16 bit reloc for the FR30 that stores a 9 bit short offset
+into 8 bits.  */
+  BFD_RELOC_FR30_9_IN_8,
+
+/* This is a 16 bit reloc for the FR30 that stores a 10 bit word offset
+into 8 bits.  */
+  BFD_RELOC_FR30_10_IN_8,
+
+/* This is a 16 bit reloc for the FR30 that stores a 9 bit pc relative
+short offset into 8 bits.  */
+  BFD_RELOC_FR30_9_PCREL,
+
+/* This is a 16 bit reloc for the FR30 that stores a 12 bit pc relative
+short offset into 11 bits.  */
+  BFD_RELOC_FR30_12_PCREL,
+
+/* Motorola Mcore relocations.  */
+  BFD_RELOC_MCORE_PCREL_IMM8BY4,
+  BFD_RELOC_MCORE_PCREL_IMM11BY2,
+  BFD_RELOC_MCORE_PCREL_IMM4BY2,
+  BFD_RELOC_MCORE_PCREL_32,
+  BFD_RELOC_MCORE_PCREL_JSR_IMM11BY2,
+  BFD_RELOC_MCORE_RVA,
+
+/* Toshiba Media Processor Relocations.  */
+  BFD_RELOC_MEP_8,
+  BFD_RELOC_MEP_16,
+  BFD_RELOC_MEP_32,
+  BFD_RELOC_MEP_PCREL8A2,
+  BFD_RELOC_MEP_PCREL12A2,
+  BFD_RELOC_MEP_PCREL17A2,
+  BFD_RELOC_MEP_PCREL24A2,
+  BFD_RELOC_MEP_PCABS24A2,
+  BFD_RELOC_MEP_LOW16,
+  BFD_RELOC_MEP_HI16U,
+  BFD_RELOC_MEP_HI16S,
+  BFD_RELOC_MEP_GPREL,
+  BFD_RELOC_MEP_TPREL,
+  BFD_RELOC_MEP_TPREL7,
+  BFD_RELOC_MEP_TPREL7A2,
+  BFD_RELOC_MEP_TPREL7A4,
+  BFD_RELOC_MEP_UIMM24,
+  BFD_RELOC_MEP_ADDR24A4,
+  BFD_RELOC_MEP_GNU_VTINHERIT,
+  BFD_RELOC_MEP_GNU_VTENTRY,
+
+
+/* These are relocations for the GETA instruction.  */
+  BFD_RELOC_MMIX_GETA,
+  BFD_RELOC_MMIX_GETA_1,
+  BFD_RELOC_MMIX_GETA_2,
+  BFD_RELOC_MMIX_GETA_3,
+
+/* These are relocations for a conditional branch instruction.  */
+  BFD_RELOC_MMIX_CBRANCH,
+  BFD_RELOC_MMIX_CBRANCH_J,
+  BFD_RELOC_MMIX_CBRANCH_1,
+  BFD_RELOC_MMIX_CBRANCH_2,
+  BFD_RELOC_MMIX_CBRANCH_3,
+
+/* These are relocations for the PUSHJ instruction.  */
+  BFD_RELOC_MMIX_PUSHJ,
+  BFD_RELOC_MMIX_PUSHJ_1,
+  BFD_RELOC_MMIX_PUSHJ_2,
+  BFD_RELOC_MMIX_PUSHJ_3,
+  BFD_RELOC_MMIX_PUSHJ_STUBBABLE,
+
+/* These are relocations for the JMP instruction.  */
+  BFD_RELOC_MMIX_JMP,
+  BFD_RELOC_MMIX_JMP_1,
+  BFD_RELOC_MMIX_JMP_2,
+  BFD_RELOC_MMIX_JMP_3,
+
+/* This is a relocation for a relative address as in a GETA instruction or
+a branch.  */
+  BFD_RELOC_MMIX_ADDR19,
+
+/* This is a relocation for a relative address as in a JMP instruction.  */
+  BFD_RELOC_MMIX_ADDR27,
+
+/* This is a relocation for an instruction field that may be a general
+register or a value 0..255.  */
+  BFD_RELOC_MMIX_REG_OR_BYTE,
+
+/* This is a relocation for an instruction field that may be a general
+register.  */
+  BFD_RELOC_MMIX_REG,
+
+/* This is a relocation for two instruction fields holding a register and
+an offset, the equivalent of the relocation.  */
+  BFD_RELOC_MMIX_BASE_PLUS_OFFSET,
+
+/* This relocation is an assertion that the expression is not allocated as
+a global register.  It does not modify contents.  */
+  BFD_RELOC_MMIX_LOCAL,
+
+/* This is a 16 bit reloc for the AVR that stores 8 bit pc relative
+short offset into 7 bits.  */
+  BFD_RELOC_AVR_7_PCREL,
+
+/* This is a 16 bit reloc for the AVR that stores 13 bit pc relative
+short offset into 12 bits.  */
+  BFD_RELOC_AVR_13_PCREL,
+
+/* This is a 16 bit reloc for the AVR that stores 17 bit value (usually
+program memory address) into 16 bits.  */
+  BFD_RELOC_AVR_16_PM,
+
+/* This is a 16 bit reloc for the AVR that stores 8 bit value (usually
+data memory address) into 8 bit immediate value of LDI insn.  */
+  BFD_RELOC_AVR_LO8_LDI,
+
+/* This is a 16 bit reloc for the AVR that stores 8 bit value (high 8 bit
+of data memory address) into 8 bit immediate value of LDI insn.  */
+  BFD_RELOC_AVR_HI8_LDI,
+
+/* This is a 16 bit reloc for the AVR that stores 8 bit value (most high 8 bit
+of program memory address) into 8 bit immediate value of LDI insn.  */
+  BFD_RELOC_AVR_HH8_LDI,
+
+/* This is a 16 bit reloc for the AVR that stores 8 bit value (most high 8 bit
+of 32 bit value) into 8 bit immediate value of LDI insn.  */
+  BFD_RELOC_AVR_MS8_LDI,
+
+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value
+(usually data memory address) into 8 bit immediate value of SUBI insn.  */
+  BFD_RELOC_AVR_LO8_LDI_NEG,
+
+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value
+(high 8 bit of data memory address) into 8 bit immediate value of
+SUBI insn.  */
+  BFD_RELOC_AVR_HI8_LDI_NEG,
+
+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value
+(most high 8 bit of program memory address) into 8 bit immediate value
+of LDI or SUBI insn.  */
+  BFD_RELOC_AVR_HH8_LDI_NEG,
+
+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value (msb
+of 32 bit value) into 8 bit immediate value of LDI insn.  */
+  BFD_RELOC_AVR_MS8_LDI_NEG,
+
+/* This is a 16 bit reloc for the AVR that stores 8 bit value (usually
+command address) into 8 bit immediate value of LDI insn.  */
+  BFD_RELOC_AVR_LO8_LDI_PM,
+
+/* This is a 16 bit reloc for the AVR that stores 8 bit value 
+(command address) into 8 bit immediate value of LDI insn. If the address
+is beyond the 128k boundary, the linker inserts a jump stub for this reloc
+in the lower 128k.  */
+  BFD_RELOC_AVR_LO8_LDI_GS,
+
+/* This is a 16 bit reloc for the AVR that stores 8 bit value (high 8 bit
+of command address) into 8 bit immediate value of LDI insn.  */
+  BFD_RELOC_AVR_HI8_LDI_PM,
+
+/* This is a 16 bit reloc for the AVR that stores 8 bit value (high 8 bit
+of command address) into 8 bit immediate value of LDI insn.  If the address
+is beyond the 128k boundary, the linker inserts a jump stub for this reloc
+below 128k.  */
+  BFD_RELOC_AVR_HI8_LDI_GS,
+
+/* This is a 16 bit reloc for the AVR that stores 8 bit value (most high 8 bit
+of command address) into 8 bit immediate value of LDI insn.  */
+  BFD_RELOC_AVR_HH8_LDI_PM,
+
+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value
+(usually command address) into 8 bit immediate value of SUBI insn.  */
+  BFD_RELOC_AVR_LO8_LDI_PM_NEG,
+
+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value
+(high 8 bit of 16 bit command address) into 8 bit immediate value
+of SUBI insn.  */
+  BFD_RELOC_AVR_HI8_LDI_PM_NEG,
+
+/* This is a 16 bit reloc for the AVR that stores negated 8 bit value
+(high 6 bit of 22 bit command address) into 8 bit immediate
+value of SUBI insn.  */
+  BFD_RELOC_AVR_HH8_LDI_PM_NEG,
+
+/* This is a 32 bit reloc for the AVR that stores 23 bit value
+into 22 bits.  */
+  BFD_RELOC_AVR_CALL,
+
+/* This is a 16 bit reloc for the AVR that stores all needed bits
+for absolute addressing with ldi with overflow check to linktime  */
+  BFD_RELOC_AVR_LDI,
+
+/* This is a 6 bit reloc for the AVR that stores offset for ldd/std
+instructions  */
+  BFD_RELOC_AVR_6,
+
+/* This is a 6 bit reloc for the AVR that stores offset for adiw/sbiw
+instructions  */
+  BFD_RELOC_AVR_6_ADIW,
+
+/* Renesas RX Relocations.  */
+  BFD_RELOC_RX_NEG8,
+  BFD_RELOC_RX_NEG16,
+  BFD_RELOC_RX_NEG24,
+  BFD_RELOC_RX_NEG32,
+  BFD_RELOC_RX_16_OP,
+  BFD_RELOC_RX_24_OP,
+  BFD_RELOC_RX_32_OP,
+  BFD_RELOC_RX_8U,
+  BFD_RELOC_RX_16U,
+  BFD_RELOC_RX_24U,
+  BFD_RELOC_RX_DIR3U_PCREL,
+  BFD_RELOC_RX_DIFF,
+  BFD_RELOC_RX_GPRELB,
+  BFD_RELOC_RX_GPRELW,
+  BFD_RELOC_RX_GPRELL,
+  BFD_RELOC_RX_SYM,
+  BFD_RELOC_RX_OP_SUBTRACT,
+  BFD_RELOC_RX_OP_NEG,
+  BFD_RELOC_RX_ABS8,
+  BFD_RELOC_RX_ABS16,
+  BFD_RELOC_RX_ABS16_REV,
+  BFD_RELOC_RX_ABS32,
+  BFD_RELOC_RX_ABS32_REV,
+  BFD_RELOC_RX_ABS16U,
+  BFD_RELOC_RX_ABS16UW,
+  BFD_RELOC_RX_ABS16UL,
+  BFD_RELOC_RX_RELAX,
+
+/* Direct 12 bit.  */
+  BFD_RELOC_390_12,
+
+/* 12 bit GOT offset.  */
+  BFD_RELOC_390_GOT12,
+
+/* 32 bit PC relative PLT address.  */
+  BFD_RELOC_390_PLT32,
+
+/* Copy symbol at runtime.  */
+  BFD_RELOC_390_COPY,
+
+/* Create GOT entry.  */
+  BFD_RELOC_390_GLOB_DAT,
+
+/* Create PLT entry.  */
+  BFD_RELOC_390_JMP_SLOT,
+
+/* Adjust by program base.  */
+  BFD_RELOC_390_RELATIVE,
+
+/* 32 bit PC relative offset to GOT.  */
+  BFD_RELOC_390_GOTPC,
+
+/* 16 bit GOT offset.  */
+  BFD_RELOC_390_GOT16,
+
+/* PC relative 16 bit shifted by 1.  */
+  BFD_RELOC_390_PC16DBL,
+
+/* 16 bit PC rel. PLT shifted by 1.  */
+  BFD_RELOC_390_PLT16DBL,
+
+/* PC relative 32 bit shifted by 1.  */
+  BFD_RELOC_390_PC32DBL,
+
+/* 32 bit PC rel. PLT shifted by 1.  */
+  BFD_RELOC_390_PLT32DBL,
+
+/* 32 bit PC rel. GOT shifted by 1.  */
+  BFD_RELOC_390_GOTPCDBL,
+
+/* 64 bit GOT offset.  */
+  BFD_RELOC_390_GOT64,
+
+/* 64 bit PC relative PLT address.  */
+  BFD_RELOC_390_PLT64,
+
+/* 32 bit rel. offset to GOT entry.  */
+  BFD_RELOC_390_GOTENT,
+
+/* 64 bit offset to GOT.  */
+  BFD_RELOC_390_GOTOFF64,
+
+/* 12-bit offset to symbol-entry within GOT, with PLT handling.  */
+  BFD_RELOC_390_GOTPLT12,
+
+/* 16-bit offset to symbol-entry within GOT, with PLT handling.  */
+  BFD_RELOC_390_GOTPLT16,
+
+/* 32-bit offset to symbol-entry within GOT, with PLT handling.  */
+  BFD_RELOC_390_GOTPLT32,
+
+/* 64-bit offset to symbol-entry within GOT, with PLT handling.  */
+  BFD_RELOC_390_GOTPLT64,
+
+/* 32-bit rel. offset to symbol-entry within GOT, with PLT handling.  */
+  BFD_RELOC_390_GOTPLTENT,
+
+/* 16-bit rel. offset from the GOT to a PLT entry.  */
+  BFD_RELOC_390_PLTOFF16,
+
+/* 32-bit rel. offset from the GOT to a PLT entry.  */
+  BFD_RELOC_390_PLTOFF32,
+
+/* 64-bit rel. offset from the GOT to a PLT entry.  */
+  BFD_RELOC_390_PLTOFF64,
+
+/* s390 tls relocations.  */
+  BFD_RELOC_390_TLS_LOAD,
+  BFD_RELOC_390_TLS_GDCALL,
+  BFD_RELOC_390_TLS_LDCALL,
+  BFD_RELOC_390_TLS_GD32,
+  BFD_RELOC_390_TLS_GD64,
+  BFD_RELOC_390_TLS_GOTIE12,
+  BFD_RELOC_390_TLS_GOTIE32,
+  BFD_RELOC_390_TLS_GOTIE64,
+  BFD_RELOC_390_TLS_LDM32,
+  BFD_RELOC_390_TLS_LDM64,
+  BFD_RELOC_390_TLS_IE32,
+  BFD_RELOC_390_TLS_IE64,
+  BFD_RELOC_390_TLS_IEENT,
+  BFD_RELOC_390_TLS_LE32,
+  BFD_RELOC_390_TLS_LE64,
+  BFD_RELOC_390_TLS_LDO32,
+  BFD_RELOC_390_TLS_LDO64,
+  BFD_RELOC_390_TLS_DTPMOD,
+  BFD_RELOC_390_TLS_DTPOFF,
+  BFD_RELOC_390_TLS_TPOFF,
+
+/* Long displacement extension.  */
+  BFD_RELOC_390_20,
+  BFD_RELOC_390_GOT20,
+  BFD_RELOC_390_GOTPLT20,
+  BFD_RELOC_390_TLS_GOTIE20,
+
+/* Score relocations
+Low 16 bit for load/store  */
+  BFD_RELOC_SCORE_GPREL15,
+
+/* This is a 24-bit reloc with the right 1 bit assumed to be 0  */
+  BFD_RELOC_SCORE_DUMMY2,
+  BFD_RELOC_SCORE_JMP,
+
+/* This is a 19-bit reloc with the right 1 bit assumed to be 0  */
+  BFD_RELOC_SCORE_BRANCH,
+
+/* This is a 32-bit reloc for 48-bit instructions.  */
+  BFD_RELOC_SCORE_IMM30,
+
+/* This is a 32-bit reloc for 48-bit instructions.  */
+  BFD_RELOC_SCORE_IMM32,
+
+/* This is a 11-bit reloc with the right 1 bit assumed to be 0  */
+  BFD_RELOC_SCORE16_JMP,
+
+/* This is a 8-bit reloc with the right 1 bit assumed to be 0  */
+  BFD_RELOC_SCORE16_BRANCH,
+
+/* This is a 9-bit reloc with the right 1 bit assumed to be 0  */
+  BFD_RELOC_SCORE_BCMP,
+
+/* Undocumented Score relocs  */
+  BFD_RELOC_SCORE_GOT15,
+  BFD_RELOC_SCORE_GOT_LO16,
+  BFD_RELOC_SCORE_CALL15,
+  BFD_RELOC_SCORE_DUMMY_HI16,
+
+/* Scenix IP2K - 9-bit register number / data address  */
+  BFD_RELOC_IP2K_FR9,
+
+/* Scenix IP2K - 4-bit register/data bank number  */
+  BFD_RELOC_IP2K_BANK,
+
+/* Scenix IP2K - low 13 bits of instruction word address  */
+  BFD_RELOC_IP2K_ADDR16CJP,
+
+/* Scenix IP2K - high 3 bits of instruction word address  */
+  BFD_RELOC_IP2K_PAGE3,
+
+/* Scenix IP2K - ext/low/high 8 bits of data address  */
+  BFD_RELOC_IP2K_LO8DATA,
+  BFD_RELOC_IP2K_HI8DATA,
+  BFD_RELOC_IP2K_EX8DATA,
+
+/* Scenix IP2K - low/high 8 bits of instruction word address  */
+  BFD_RELOC_IP2K_LO8INSN,
+  BFD_RELOC_IP2K_HI8INSN,
+
+/* Scenix IP2K - even/odd PC modifier to modify snb pcl.0  */
+  BFD_RELOC_IP2K_PC_SKIP,
+
+/* Scenix IP2K - 16 bit word address in text section.  */
+  BFD_RELOC_IP2K_TEXT,
+
+/* Scenix IP2K - 7-bit sp or dp offset  */
+  BFD_RELOC_IP2K_FR_OFFSET,
+
+/* Scenix VPE4K coprocessor - data/insn-space addressing  */
+  BFD_RELOC_VPE4KMATH_DATA,
+  BFD_RELOC_VPE4KMATH_INSN,
+
+/* These two relocations are used by the linker to determine which of
+the entries in a C++ virtual function table are actually used.  When
+the --gc-sections option is given, the linker will zero out the entries
+that are not used, so that the code for those functions need not be
+included in the output.
+
+VTABLE_INHERIT is a zero-space relocation used to describe to the
+linker the inheritance tree of a C++ virtual function table.  The
+relocation's symbol should be the parent class' vtable, and the
+relocation should be located at the child vtable.
+
+VTABLE_ENTRY is a zero-space relocation that describes the use of a
+virtual function table entry.  The reloc's symbol should refer to the
+table of the class mentioned in the code.  Off of that base, an offset
+describes the entry that is being used.  For Rela hosts, this offset
+is stored in the reloc's addend.  For Rel hosts, we are forced to put
+this offset in the reloc's section offset.  */
+  BFD_RELOC_VTABLE_INHERIT,
+  BFD_RELOC_VTABLE_ENTRY,
+
+/* Intel IA64 Relocations.  */
+  BFD_RELOC_IA64_IMM14,
+  BFD_RELOC_IA64_IMM22,
+  BFD_RELOC_IA64_IMM64,
+  BFD_RELOC_IA64_DIR32MSB,
+  BFD_RELOC_IA64_DIR32LSB,
+  BFD_RELOC_IA64_DIR64MSB,
+  BFD_RELOC_IA64_DIR64LSB,
+  BFD_RELOC_IA64_GPREL22,
+  BFD_RELOC_IA64_GPREL64I,
+  BFD_RELOC_IA64_GPREL32MSB,
+  BFD_RELOC_IA64_GPREL32LSB,
+  BFD_RELOC_IA64_GPREL64MSB,
+  BFD_RELOC_IA64_GPREL64LSB,
+  BFD_RELOC_IA64_LTOFF22,
+  BFD_RELOC_IA64_LTOFF64I,
+  BFD_RELOC_IA64_PLTOFF22,
+  BFD_RELOC_IA64_PLTOFF64I,
+  BFD_RELOC_IA64_PLTOFF64MSB,
+  BFD_RELOC_IA64_PLTOFF64LSB,
+  BFD_RELOC_IA64_FPTR64I,
+  BFD_RELOC_IA64_FPTR32MSB,
+  BFD_RELOC_IA64_FPTR32LSB,
+  BFD_RELOC_IA64_FPTR64MSB,
+  BFD_RELOC_IA64_FPTR64LSB,
+  BFD_RELOC_IA64_PCREL21B,
+  BFD_RELOC_IA64_PCREL21BI,
+  BFD_RELOC_IA64_PCREL21M,
+  BFD_RELOC_IA64_PCREL21F,
+  BFD_RELOC_IA64_PCREL22,
+  BFD_RELOC_IA64_PCREL60B,
+  BFD_RELOC_IA64_PCREL64I,
+  BFD_RELOC_IA64_PCREL32MSB,
+  BFD_RELOC_IA64_PCREL32LSB,
+  BFD_RELOC_IA64_PCREL64MSB,
+  BFD_RELOC_IA64_PCREL64LSB,
+  BFD_RELOC_IA64_LTOFF_FPTR22,
+  BFD_RELOC_IA64_LTOFF_FPTR64I,
+  BFD_RELOC_IA64_LTOFF_FPTR32MSB,
+  BFD_RELOC_IA64_LTOFF_FPTR32LSB,
+  BFD_RELOC_IA64_LTOFF_FPTR64MSB,
+  BFD_RELOC_IA64_LTOFF_FPTR64LSB,
+  BFD_RELOC_IA64_SEGREL32MSB,
+  BFD_RELOC_IA64_SEGREL32LSB,
+  BFD_RELOC_IA64_SEGREL64MSB,
+  BFD_RELOC_IA64_SEGREL64LSB,
+  BFD_RELOC_IA64_SECREL32MSB,
+  BFD_RELOC_IA64_SECREL32LSB,
+  BFD_RELOC_IA64_SECREL64MSB,
+  BFD_RELOC_IA64_SECREL64LSB,
+  BFD_RELOC_IA64_REL32MSB,
+  BFD_RELOC_IA64_REL32LSB,
+  BFD_RELOC_IA64_REL64MSB,
+  BFD_RELOC_IA64_REL64LSB,
+  BFD_RELOC_IA64_LTV32MSB,
+  BFD_RELOC_IA64_LTV32LSB,
+  BFD_RELOC_IA64_LTV64MSB,
+  BFD_RELOC_IA64_LTV64LSB,
+  BFD_RELOC_IA64_IPLTMSB,
+  BFD_RELOC_IA64_IPLTLSB,
+  BFD_RELOC_IA64_COPY,
+  BFD_RELOC_IA64_LTOFF22X,
+  BFD_RELOC_IA64_LDXMOV,
+  BFD_RELOC_IA64_TPREL14,
+  BFD_RELOC_IA64_TPREL22,
+  BFD_RELOC_IA64_TPREL64I,
+  BFD_RELOC_IA64_TPREL64MSB,
+  BFD_RELOC_IA64_TPREL64LSB,
+  BFD_RELOC_IA64_LTOFF_TPREL22,
+  BFD_RELOC_IA64_DTPMOD64MSB,
+  BFD_RELOC_IA64_DTPMOD64LSB,
+  BFD_RELOC_IA64_LTOFF_DTPMOD22,
+  BFD_RELOC_IA64_DTPREL14,
+  BFD_RELOC_IA64_DTPREL22,
+  BFD_RELOC_IA64_DTPREL64I,
+  BFD_RELOC_IA64_DTPREL32MSB,
+  BFD_RELOC_IA64_DTPREL32LSB,
+  BFD_RELOC_IA64_DTPREL64MSB,
+  BFD_RELOC_IA64_DTPREL64LSB,
+  BFD_RELOC_IA64_LTOFF_DTPREL22,
+
+/* Motorola 68HC11 reloc.
+This is the 8 bit high part of an absolute address.  */
+  BFD_RELOC_M68HC11_HI8,
+
+/* Motorola 68HC11 reloc.
+This is the 8 bit low part of an absolute address.  */
+  BFD_RELOC_M68HC11_LO8,
+
+/* Motorola 68HC11 reloc.
+This is the 3 bit of a value.  */
+  BFD_RELOC_M68HC11_3B,
+
+/* Motorola 68HC11 reloc.
+This reloc marks the beginning of a jump/call instruction.
+It is used for linker relaxation to correctly identify beginning
+of instruction and change some branches to use PC-relative
+addressing mode.  */
+  BFD_RELOC_M68HC11_RL_JUMP,
+
+/* Motorola 68HC11 reloc.
+This reloc marks a group of several instructions that gcc generates
+and for which the linker relaxation pass can modify and/or remove
+some of them.  */
+  BFD_RELOC_M68HC11_RL_GROUP,
+
+/* Motorola 68HC11 reloc.
+This is the 16-bit lower part of an address.  It is used for 'call'
+instruction to specify the symbol address without any special
+transformation (due to memory bank window).  */
+  BFD_RELOC_M68HC11_LO16,
+
+/* Motorola 68HC11 reloc.
+This is a 8-bit reloc that specifies the page number of an address.
+It is used by 'call' instruction to specify the page number of
+the symbol.  */
+  BFD_RELOC_M68HC11_PAGE,
+
+/* Motorola 68HC11 reloc.
+This is a 24-bit reloc that represents the address with a 16-bit
+value and a 8-bit page number.  The symbol address is transformed
+to follow the 16K memory bank of 68HC12 (seen as mapped in the window).  */
+  BFD_RELOC_M68HC11_24,
+
+/* Motorola 68HC12 reloc.
+This is the 5 bits of a value.  */
+  BFD_RELOC_M68HC12_5B,
+
+/* NS CR16C Relocations.  */
+  BFD_RELOC_16C_NUM08,
+  BFD_RELOC_16C_NUM08_C,
+  BFD_RELOC_16C_NUM16,
+  BFD_RELOC_16C_NUM16_C,
+  BFD_RELOC_16C_NUM32,
+  BFD_RELOC_16C_NUM32_C,
+  BFD_RELOC_16C_DISP04,
+  BFD_RELOC_16C_DISP04_C,
+  BFD_RELOC_16C_DISP08,
+  BFD_RELOC_16C_DISP08_C,
+  BFD_RELOC_16C_DISP16,
+  BFD_RELOC_16C_DISP16_C,
+  BFD_RELOC_16C_DISP24,
+  BFD_RELOC_16C_DISP24_C,
+  BFD_RELOC_16C_DISP24a,
+  BFD_RELOC_16C_DISP24a_C,
+  BFD_RELOC_16C_REG04,
+  BFD_RELOC_16C_REG04_C,
+  BFD_RELOC_16C_REG04a,
+  BFD_RELOC_16C_REG04a_C,
+  BFD_RELOC_16C_REG14,
+  BFD_RELOC_16C_REG14_C,
+  BFD_RELOC_16C_REG16,
+  BFD_RELOC_16C_REG16_C,
+  BFD_RELOC_16C_REG20,
+  BFD_RELOC_16C_REG20_C,
+  BFD_RELOC_16C_ABS20,
+  BFD_RELOC_16C_ABS20_C,
+  BFD_RELOC_16C_ABS24,
+  BFD_RELOC_16C_ABS24_C,
+  BFD_RELOC_16C_IMM04,
+  BFD_RELOC_16C_IMM04_C,
+  BFD_RELOC_16C_IMM16,
+  BFD_RELOC_16C_IMM16_C,
+  BFD_RELOC_16C_IMM20,
+  BFD_RELOC_16C_IMM20_C,
+  BFD_RELOC_16C_IMM24,
+  BFD_RELOC_16C_IMM24_C,
+  BFD_RELOC_16C_IMM32,
+  BFD_RELOC_16C_IMM32_C,
+
+/* NS CR16 Relocations.  */
+  BFD_RELOC_CR16_NUM8,
+  BFD_RELOC_CR16_NUM16,
+  BFD_RELOC_CR16_NUM32,
+  BFD_RELOC_CR16_NUM32a,
+  BFD_RELOC_CR16_REGREL0,
+  BFD_RELOC_CR16_REGREL4,
+  BFD_RELOC_CR16_REGREL4a,
+  BFD_RELOC_CR16_REGREL14,
+  BFD_RELOC_CR16_REGREL14a,
+  BFD_RELOC_CR16_REGREL16,
+  BFD_RELOC_CR16_REGREL20,
+  BFD_RELOC_CR16_REGREL20a,
+  BFD_RELOC_CR16_ABS20,
+  BFD_RELOC_CR16_ABS24,
+  BFD_RELOC_CR16_IMM4,
+  BFD_RELOC_CR16_IMM8,
+  BFD_RELOC_CR16_IMM16,
+  BFD_RELOC_CR16_IMM20,
+  BFD_RELOC_CR16_IMM24,
+  BFD_RELOC_CR16_IMM32,
+  BFD_RELOC_CR16_IMM32a,
+  BFD_RELOC_CR16_DISP4,
+  BFD_RELOC_CR16_DISP8,
+  BFD_RELOC_CR16_DISP16,
+  BFD_RELOC_CR16_DISP20,
+  BFD_RELOC_CR16_DISP24,
+  BFD_RELOC_CR16_DISP24a,
+  BFD_RELOC_CR16_SWITCH8,
+  BFD_RELOC_CR16_SWITCH16,
+  BFD_RELOC_CR16_SWITCH32,
+  BFD_RELOC_CR16_GOT_REGREL20,
+  BFD_RELOC_CR16_GOTC_REGREL20,
+  BFD_RELOC_CR16_GLOB_DAT,
+
+/* NS CRX Relocations.  */
+  BFD_RELOC_CRX_REL4,
+  BFD_RELOC_CRX_REL8,
+  BFD_RELOC_CRX_REL8_CMP,
+  BFD_RELOC_CRX_REL16,
+  BFD_RELOC_CRX_REL24,
+  BFD_RELOC_CRX_REL32,
+  BFD_RELOC_CRX_REGREL12,
+  BFD_RELOC_CRX_REGREL22,
+  BFD_RELOC_CRX_REGREL28,
+  BFD_RELOC_CRX_REGREL32,
+  BFD_RELOC_CRX_ABS16,
+  BFD_RELOC_CRX_ABS32,
+  BFD_RELOC_CRX_NUM8,
+  BFD_RELOC_CRX_NUM16,
+  BFD_RELOC_CRX_NUM32,
+  BFD_RELOC_CRX_IMM16,
+  BFD_RELOC_CRX_IMM32,
+  BFD_RELOC_CRX_SWITCH8,
+  BFD_RELOC_CRX_SWITCH16,
+  BFD_RELOC_CRX_SWITCH32,
+
+/* These relocs are only used within the CRIS assembler.  They are not
+(at present) written to any object files.  */
+  BFD_RELOC_CRIS_BDISP8,
+  BFD_RELOC_CRIS_UNSIGNED_5,
+  BFD_RELOC_CRIS_SIGNED_6,
+  BFD_RELOC_CRIS_UNSIGNED_6,
+  BFD_RELOC_CRIS_SIGNED_8,
+  BFD_RELOC_CRIS_UNSIGNED_8,
+  BFD_RELOC_CRIS_SIGNED_16,
+  BFD_RELOC_CRIS_UNSIGNED_16,
+  BFD_RELOC_CRIS_LAPCQ_OFFSET,
+  BFD_RELOC_CRIS_UNSIGNED_4,
+
+/* Relocs used in ELF shared libraries for CRIS.  */
+  BFD_RELOC_CRIS_COPY,
+  BFD_RELOC_CRIS_GLOB_DAT,
+  BFD_RELOC_CRIS_JUMP_SLOT,
+  BFD_RELOC_CRIS_RELATIVE,
+
+/* 32-bit offset to symbol-entry within GOT.  */
+  BFD_RELOC_CRIS_32_GOT,
+
+/* 16-bit offset to symbol-entry within GOT.  */
+  BFD_RELOC_CRIS_16_GOT,
+
+/* 32-bit offset to symbol-entry within GOT, with PLT handling.  */
+  BFD_RELOC_CRIS_32_GOTPLT,
+
+/* 16-bit offset to symbol-entry within GOT, with PLT handling.  */
+  BFD_RELOC_CRIS_16_GOTPLT,
+
+/* 32-bit offset to symbol, relative to GOT.  */
+  BFD_RELOC_CRIS_32_GOTREL,
+
+/* 32-bit offset to symbol with PLT entry, relative to GOT.  */
+  BFD_RELOC_CRIS_32_PLT_GOTREL,
+
+/* 32-bit offset to symbol with PLT entry, relative to this relocation.  */
+  BFD_RELOC_CRIS_32_PLT_PCREL,
+
+/* Relocs used in TLS code for CRIS.  */
+  BFD_RELOC_CRIS_32_GOT_GD,
+  BFD_RELOC_CRIS_16_GOT_GD,
+  BFD_RELOC_CRIS_32_GD,
+  BFD_RELOC_CRIS_DTP,
+  BFD_RELOC_CRIS_32_DTPREL,
+  BFD_RELOC_CRIS_16_DTPREL,
+  BFD_RELOC_CRIS_32_GOT_TPREL,
+  BFD_RELOC_CRIS_16_GOT_TPREL,
+  BFD_RELOC_CRIS_32_TPREL,
+  BFD_RELOC_CRIS_16_TPREL,
+  BFD_RELOC_CRIS_DTPMOD,
+  BFD_RELOC_CRIS_32_IE,
+
+/* Intel i860 Relocations.  */
+  BFD_RELOC_860_COPY,
+  BFD_RELOC_860_GLOB_DAT,
+  BFD_RELOC_860_JUMP_SLOT,
+  BFD_RELOC_860_RELATIVE,
+  BFD_RELOC_860_PC26,
+  BFD_RELOC_860_PLT26,
+  BFD_RELOC_860_PC16,
+  BFD_RELOC_860_LOW0,
+  BFD_RELOC_860_SPLIT0,
+  BFD_RELOC_860_LOW1,
+  BFD_RELOC_860_SPLIT1,
+  BFD_RELOC_860_LOW2,
+  BFD_RELOC_860_SPLIT2,
+  BFD_RELOC_860_LOW3,
+  BFD_RELOC_860_LOGOT0,
+  BFD_RELOC_860_SPGOT0,
+  BFD_RELOC_860_LOGOT1,
+  BFD_RELOC_860_SPGOT1,
+  BFD_RELOC_860_LOGOTOFF0,
+  BFD_RELOC_860_SPGOTOFF0,
+  BFD_RELOC_860_LOGOTOFF1,
+  BFD_RELOC_860_SPGOTOFF1,
+  BFD_RELOC_860_LOGOTOFF2,
+  BFD_RELOC_860_LOGOTOFF3,
+  BFD_RELOC_860_LOPC,
+  BFD_RELOC_860_HIGHADJ,
+  BFD_RELOC_860_HAGOT,
+  BFD_RELOC_860_HAGOTOFF,
+  BFD_RELOC_860_HAPC,
+  BFD_RELOC_860_HIGH,
+  BFD_RELOC_860_HIGOT,
+  BFD_RELOC_860_HIGOTOFF,
+
+/* OpenRISC Relocations.  */
+  BFD_RELOC_OPENRISC_ABS_26,
+  BFD_RELOC_OPENRISC_REL_26,
+
+/* H8 elf Relocations.  */
+  BFD_RELOC_H8_DIR16A8,
+  BFD_RELOC_H8_DIR16R8,
+  BFD_RELOC_H8_DIR24A8,
+  BFD_RELOC_H8_DIR24R8,
+  BFD_RELOC_H8_DIR32A16,
+
+/* Sony Xstormy16 Relocations.  */
+  BFD_RELOC_XSTORMY16_REL_12,
+  BFD_RELOC_XSTORMY16_12,
+  BFD_RELOC_XSTORMY16_24,
+  BFD_RELOC_XSTORMY16_FPTR16,
+
+/* Self-describing complex relocations.  */
+  BFD_RELOC_RELC,
+
+
+/* Infineon Relocations.  */
+  BFD_RELOC_XC16X_PAG,
+  BFD_RELOC_XC16X_POF,
+  BFD_RELOC_XC16X_SEG,
+  BFD_RELOC_XC16X_SOF,
+
+/* Relocations used by VAX ELF.  */
+  BFD_RELOC_VAX_GLOB_DAT,
+  BFD_RELOC_VAX_JMP_SLOT,
+  BFD_RELOC_VAX_RELATIVE,
+
+/* Morpho MT - 16 bit immediate relocation.  */
+  BFD_RELOC_MT_PC16,
+
+/* Morpho MT - Hi 16 bits of an address.  */
+  BFD_RELOC_MT_HI16,
+
+/* Morpho MT - Low 16 bits of an address.  */
+  BFD_RELOC_MT_LO16,
+
+/* Morpho MT - Used to tell the linker which vtable entries are used.  */
+  BFD_RELOC_MT_GNU_VTINHERIT,
+
+/* Morpho MT - Used to tell the linker which vtable entries are used.  */
+  BFD_RELOC_MT_GNU_VTENTRY,
+
+/* Morpho MT - 8 bit immediate relocation.  */
+  BFD_RELOC_MT_PCINSN8,
+
+/* msp430 specific relocation codes  */
+  BFD_RELOC_MSP430_10_PCREL,
+  BFD_RELOC_MSP430_16_PCREL,
+  BFD_RELOC_MSP430_16,
+  BFD_RELOC_MSP430_16_PCREL_BYTE,
+  BFD_RELOC_MSP430_16_BYTE,
+  BFD_RELOC_MSP430_2X_PCREL,
+  BFD_RELOC_MSP430_RL_PCREL,
+
+/* IQ2000 Relocations.  */
+  BFD_RELOC_IQ2000_OFFSET_16,
+  BFD_RELOC_IQ2000_OFFSET_21,
+  BFD_RELOC_IQ2000_UHI16,
+
+/* Special Xtensa relocation used only by PLT entries in ELF shared
+objects to indicate that the runtime linker should set the value
+to one of its own internal functions or data structures.  */
+  BFD_RELOC_XTENSA_RTLD,
+
+/* Xtensa relocations for ELF shared objects.  */
+  BFD_RELOC_XTENSA_GLOB_DAT,
+  BFD_RELOC_XTENSA_JMP_SLOT,
+  BFD_RELOC_XTENSA_RELATIVE,
+
+/* Xtensa relocation used in ELF object files for symbols that may require
+PLT entries.  Otherwise, this is just a generic 32-bit relocation.  */
+  BFD_RELOC_XTENSA_PLT,
+
+/* Xtensa relocations to mark the difference of two local symbols.
+These are only needed to support linker relaxation and can be ignored
+when not relaxing.  The field is set to the value of the difference
+assuming no relaxation.  The relocation encodes the position of the
+first symbol so the linker can determine whether to adjust the field
+value.  */
+  BFD_RELOC_XTENSA_DIFF8,
+  BFD_RELOC_XTENSA_DIFF16,
+  BFD_RELOC_XTENSA_DIFF32,
+
+/* Generic Xtensa relocations for instruction operands.  Only the slot
+number is encoded in the relocation.  The relocation applies to the
+last PC-relative immediate operand, or if there are no PC-relative
+immediates, to the last immediate operand.  */
+  BFD_RELOC_XTENSA_SLOT0_OP,
+  BFD_RELOC_XTENSA_SLOT1_OP,
+  BFD_RELOC_XTENSA_SLOT2_OP,
+  BFD_RELOC_XTENSA_SLOT3_OP,
+  BFD_RELOC_XTENSA_SLOT4_OP,
+  BFD_RELOC_XTENSA_SLOT5_OP,
+  BFD_RELOC_XTENSA_SLOT6_OP,
+  BFD_RELOC_XTENSA_SLOT7_OP,
+  BFD_RELOC_XTENSA_SLOT8_OP,
+  BFD_RELOC_XTENSA_SLOT9_OP,
+  BFD_RELOC_XTENSA_SLOT10_OP,
+  BFD_RELOC_XTENSA_SLOT11_OP,
+  BFD_RELOC_XTENSA_SLOT12_OP,
+  BFD_RELOC_XTENSA_SLOT13_OP,
+  BFD_RELOC_XTENSA_SLOT14_OP,
+
+/* Alternate Xtensa relocations.  Only the slot is encoded in the
+relocation.  The meaning of these relocations is opcode-specific.  */
+  BFD_RELOC_XTENSA_SLOT0_ALT,
+  BFD_RELOC_XTENSA_SLOT1_ALT,
+  BFD_RELOC_XTENSA_SLOT2_ALT,
+  BFD_RELOC_XTENSA_SLOT3_ALT,
+  BFD_RELOC_XTENSA_SLOT4_ALT,
+  BFD_RELOC_XTENSA_SLOT5_ALT,
+  BFD_RELOC_XTENSA_SLOT6_ALT,
+  BFD_RELOC_XTENSA_SLOT7_ALT,
+  BFD_RELOC_XTENSA_SLOT8_ALT,
+  BFD_RELOC_XTENSA_SLOT9_ALT,
+  BFD_RELOC_XTENSA_SLOT10_ALT,
+  BFD_RELOC_XTENSA_SLOT11_ALT,
+  BFD_RELOC_XTENSA_SLOT12_ALT,
+  BFD_RELOC_XTENSA_SLOT13_ALT,
+  BFD_RELOC_XTENSA_SLOT14_ALT,
+
+/* Xtensa relocations for backward compatibility.  These have all been
+replaced by BFD_RELOC_XTENSA_SLOT0_OP.  */
+  BFD_RELOC_XTENSA_OP0,
+  BFD_RELOC_XTENSA_OP1,
+  BFD_RELOC_XTENSA_OP2,
+
+/* Xtensa relocation to mark that the assembler expanded the
+instructions from an original target.  The expansion size is
+encoded in the reloc size.  */
+  BFD_RELOC_XTENSA_ASM_EXPAND,
+
+/* Xtensa relocation to mark that the linker should simplify
+assembler-expanded instructions.  This is commonly used
+internally by the linker after analysis of a
+BFD_RELOC_XTENSA_ASM_EXPAND.  */
+  BFD_RELOC_XTENSA_ASM_SIMPLIFY,
+
+/* Xtensa TLS relocations.  */
+  BFD_RELOC_XTENSA_TLSDESC_FN,
+  BFD_RELOC_XTENSA_TLSDESC_ARG,
+  BFD_RELOC_XTENSA_TLS_DTPOFF,
+  BFD_RELOC_XTENSA_TLS_TPOFF,
+  BFD_RELOC_XTENSA_TLS_FUNC,
+  BFD_RELOC_XTENSA_TLS_ARG,
+  BFD_RELOC_XTENSA_TLS_CALL,
+
+/* 8 bit signed offset in (ix+d) or (iy+d).  */
+  BFD_RELOC_Z80_DISP8,
+
+/* DJNZ offset.  */
+  BFD_RELOC_Z8K_DISP7,
+
+/* CALR offset.  */
+  BFD_RELOC_Z8K_CALLR,
+
+/* 4 bit value.  */
+  BFD_RELOC_Z8K_IMM4L,
+
+/* Lattice Mico32 relocations.  */
+  BFD_RELOC_LM32_CALL,
+  BFD_RELOC_LM32_BRANCH,
+  BFD_RELOC_LM32_16_GOT,
+  BFD_RELOC_LM32_GOTOFF_HI16,
+  BFD_RELOC_LM32_GOTOFF_LO16,
+  BFD_RELOC_LM32_COPY,
+  BFD_RELOC_LM32_GLOB_DAT,
+  BFD_RELOC_LM32_JMP_SLOT,
+  BFD_RELOC_LM32_RELATIVE,
+
+/* Difference between two section addreses.  Must be followed by a
+BFD_RELOC_MACH_O_PAIR.  */
+  BFD_RELOC_MACH_O_SECTDIFF,
+
+/* Pair of relocation.  Contains the first symbol.  */
+  BFD_RELOC_MACH_O_PAIR,
+
+/* PCREL relocations.  They are marked as branch to create PLT entry if
+required.  */
+  BFD_RELOC_MACH_O_X86_64_BRANCH32,
+  BFD_RELOC_MACH_O_X86_64_BRANCH8,
+
+/* Used when referencing a GOT entry.  */
+  BFD_RELOC_MACH_O_X86_64_GOT,
+
+/* Used when loading a GOT entry with movq.  It is specially marked so that
+the linker could optimize the movq to a leaq if possible.  */
+  BFD_RELOC_MACH_O_X86_64_GOT_LOAD,
+
+/* Symbol will be substracted.  Must be followed by a BFD_RELOC_64.  */
+  BFD_RELOC_MACH_O_X86_64_SUBTRACTOR32,
+
+/* Symbol will be substracted.  Must be followed by a BFD_RELOC_64.  */
+  BFD_RELOC_MACH_O_X86_64_SUBTRACTOR64,
+
+/* Same as BFD_RELOC_32_PCREL but with an implicit -1 addend.  */
+  BFD_RELOC_MACH_O_X86_64_PCREL32_1,
+
+/* Same as BFD_RELOC_32_PCREL but with an implicit -2 addend.  */
+  BFD_RELOC_MACH_O_X86_64_PCREL32_2,
+
+/* Same as BFD_RELOC_32_PCREL but with an implicit -4 addend.  */
+  BFD_RELOC_MACH_O_X86_64_PCREL32_4,
+
+/* This is a 32 bit reloc for the microblaze that stores the 
+low 16 bits of a value  */
+  BFD_RELOC_MICROBLAZE_32_LO,
+
+/* This is a 32 bit pc-relative reloc for the microblaze that 
+stores the low 16 bits of a value  */
+  BFD_RELOC_MICROBLAZE_32_LO_PCREL,
+
+/* This is a 32 bit reloc for the microblaze that stores a 
+value relative to the read-only small data area anchor  */
+  BFD_RELOC_MICROBLAZE_32_ROSDA,
+
+/* This is a 32 bit reloc for the microblaze that stores a 
+value relative to the read-write small data area anchor  */
+  BFD_RELOC_MICROBLAZE_32_RWSDA,
+
+/* This is a 32 bit reloc for the microblaze to handle 
+expressions of the form "Symbol Op Symbol"  */
+  BFD_RELOC_MICROBLAZE_32_SYM_OP_SYM,
+
+/* This is a 64 bit reloc that stores the 32 bit pc relative 
+value in two words (with an imm instruction).  No relocation is 
+done here - only used for relaxing  */
+  BFD_RELOC_MICROBLAZE_64_NONE,
+
+/* This is a 64 bit reloc that stores the 32 bit pc relative 
+value in two words (with an imm instruction).  The relocation is
+PC-relative GOT offset  */
+  BFD_RELOC_MICROBLAZE_64_GOTPC,
+
+/* This is a 64 bit reloc that stores the 32 bit pc relative 
+value in two words (with an imm instruction).  The relocation is
+GOT offset  */
+  BFD_RELOC_MICROBLAZE_64_GOT,
+
+/* This is a 64 bit reloc that stores the 32 bit pc relative 
+value in two words (with an imm instruction).  The relocation is
+PC-relative offset into PLT  */
+  BFD_RELOC_MICROBLAZE_64_PLT,
+
+/* This is a 64 bit reloc that stores the 32 bit GOT relative 
+value in two words (with an imm instruction).  The relocation is
+relative offset from _GLOBAL_OFFSET_TABLE_  */
+  BFD_RELOC_MICROBLAZE_64_GOTOFF,
+
+/* This is a 32 bit reloc that stores the 32 bit GOT relative 
+value in a word.  The relocation is relative offset from  */
+  BFD_RELOC_MICROBLAZE_32_GOTOFF,
+
+/* This is used to tell the dynamic linker to copy the value out of
+the dynamic object into the runtime process image.  */
+  BFD_RELOC_MICROBLAZE_COPY,
+
+/* Tilera TILEPro Relocations.  */
+  BFD_RELOC_TILEPRO_COPY,
+  BFD_RELOC_TILEPRO_GLOB_DAT,
+  BFD_RELOC_TILEPRO_JMP_SLOT,
+  BFD_RELOC_TILEPRO_RELATIVE,
+  BFD_RELOC_TILEPRO_BROFF_X1,
+  BFD_RELOC_TILEPRO_JOFFLONG_X1,
+  BFD_RELOC_TILEPRO_JOFFLONG_X1_PLT,
+  BFD_RELOC_TILEPRO_IMM8_X0,
+  BFD_RELOC_TILEPRO_IMM8_Y0,
+  BFD_RELOC_TILEPRO_IMM8_X1,
+  BFD_RELOC_TILEPRO_IMM8_Y1,
+  BFD_RELOC_TILEPRO_DEST_IMM8_X1,
+  BFD_RELOC_TILEPRO_MT_IMM15_X1,
+  BFD_RELOC_TILEPRO_MF_IMM15_X1,
+  BFD_RELOC_TILEPRO_IMM16_X0,
+  BFD_RELOC_TILEPRO_IMM16_X1,
+  BFD_RELOC_TILEPRO_IMM16_X0_LO,
+  BFD_RELOC_TILEPRO_IMM16_X1_LO,
+  BFD_RELOC_TILEPRO_IMM16_X0_HI,
+  BFD_RELOC_TILEPRO_IMM16_X1_HI,
+  BFD_RELOC_TILEPRO_IMM16_X0_HA,
+  BFD_RELOC_TILEPRO_IMM16_X1_HA,
+  BFD_RELOC_TILEPRO_IMM16_X0_PCREL,
+  BFD_RELOC_TILEPRO_IMM16_X1_PCREL,
+  BFD_RELOC_TILEPRO_IMM16_X0_LO_PCREL,
+  BFD_RELOC_TILEPRO_IMM16_X1_LO_PCREL,
+  BFD_RELOC_TILEPRO_IMM16_X0_HI_PCREL,
+  BFD_RELOC_TILEPRO_IMM16_X1_HI_PCREL,
+  BFD_RELOC_TILEPRO_IMM16_X0_HA_PCREL,
+  BFD_RELOC_TILEPRO_IMM16_X1_HA_PCREL,
+  BFD_RELOC_TILEPRO_IMM16_X0_GOT,
+  BFD_RELOC_TILEPRO_IMM16_X1_GOT,
+  BFD_RELOC_TILEPRO_IMM16_X0_GOT_LO,
+  BFD_RELOC_TILEPRO_IMM16_X1_GOT_LO,
+  BFD_RELOC_TILEPRO_IMM16_X0_GOT_HI,
+  BFD_RELOC_TILEPRO_IMM16_X1_GOT_HI,
+  BFD_RELOC_TILEPRO_IMM16_X0_GOT_HA,
+  BFD_RELOC_TILEPRO_IMM16_X1_GOT_HA,
+  BFD_RELOC_TILEPRO_MMSTART_X0,
+  BFD_RELOC_TILEPRO_MMEND_X0,
+  BFD_RELOC_TILEPRO_MMSTART_X1,
+  BFD_RELOC_TILEPRO_MMEND_X1,
+  BFD_RELOC_TILEPRO_SHAMT_X0,
+  BFD_RELOC_TILEPRO_SHAMT_X1,
+  BFD_RELOC_TILEPRO_SHAMT_Y0,
+  BFD_RELOC_TILEPRO_SHAMT_Y1,
+  BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD,
+  BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD,
+  BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_LO,
+  BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_LO,
+  BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_HI,
+  BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_HI,
+  BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_HA,
+  BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_HA,
+  BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE,
+  BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE,
+  BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE_LO,
+  BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE_LO,
+  BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE_HI,
+  BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE_HI,
+  BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE_HA,
+  BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE_HA,
+  BFD_RELOC_TILEPRO_TLS_DTPMOD32,
+  BFD_RELOC_TILEPRO_TLS_DTPOFF32,
+  BFD_RELOC_TILEPRO_TLS_TPOFF32,
+
+/* Tilera TILE-Gx Relocations.  */
+  BFD_RELOC_TILEGX_HW0,
+  BFD_RELOC_TILEGX_HW1,
+  BFD_RELOC_TILEGX_HW2,
+  BFD_RELOC_TILEGX_HW3,
+  BFD_RELOC_TILEGX_HW0_LAST,
+  BFD_RELOC_TILEGX_HW1_LAST,
+  BFD_RELOC_TILEGX_HW2_LAST,
+  BFD_RELOC_TILEGX_COPY,
+  BFD_RELOC_TILEGX_GLOB_DAT,
+  BFD_RELOC_TILEGX_JMP_SLOT,
+  BFD_RELOC_TILEGX_RELATIVE,
+  BFD_RELOC_TILEGX_BROFF_X1,
+  BFD_RELOC_TILEGX_JUMPOFF_X1,
+  BFD_RELOC_TILEGX_JUMPOFF_X1_PLT,
+  BFD_RELOC_TILEGX_IMM8_X0,
+  BFD_RELOC_TILEGX_IMM8_Y0,
+  BFD_RELOC_TILEGX_IMM8_X1,
+  BFD_RELOC_TILEGX_IMM8_Y1,
+  BFD_RELOC_TILEGX_DEST_IMM8_X1,
+  BFD_RELOC_TILEGX_MT_IMM14_X1,
+  BFD_RELOC_TILEGX_MF_IMM14_X1,
+  BFD_RELOC_TILEGX_MMSTART_X0,
+  BFD_RELOC_TILEGX_MMEND_X0,
+  BFD_RELOC_TILEGX_SHAMT_X0,
+  BFD_RELOC_TILEGX_SHAMT_X1,
+  BFD_RELOC_TILEGX_SHAMT_Y0,
+  BFD_RELOC_TILEGX_SHAMT_Y1,
+  BFD_RELOC_TILEGX_IMM16_X0_HW0,
+  BFD_RELOC_TILEGX_IMM16_X1_HW0,
+  BFD_RELOC_TILEGX_IMM16_X0_HW1,
+  BFD_RELOC_TILEGX_IMM16_X1_HW1,
+  BFD_RELOC_TILEGX_IMM16_X0_HW2,
+  BFD_RELOC_TILEGX_IMM16_X1_HW2,
+  BFD_RELOC_TILEGX_IMM16_X0_HW3,
+  BFD_RELOC_TILEGX_IMM16_X1_HW3,
+  BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST,
+  BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST,
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST,
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST,
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST,
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST,
+  BFD_RELOC_TILEGX_IMM16_X0_HW0_PCREL,
+  BFD_RELOC_TILEGX_IMM16_X1_HW0_PCREL,
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_PCREL,
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_PCREL,
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_PCREL,
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_PCREL,
+  BFD_RELOC_TILEGX_IMM16_X0_HW3_PCREL,
+  BFD_RELOC_TILEGX_IMM16_X1_HW3_PCREL,
+  BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_PCREL,
+  BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_PCREL,
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_PCREL,
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_PCREL,
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_PCREL,
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_PCREL,
+  BFD_RELOC_TILEGX_IMM16_X0_HW0_GOT,
+  BFD_RELOC_TILEGX_IMM16_X1_HW0_GOT,
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_GOT,
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_GOT,
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_GOT,
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_GOT,
+  BFD_RELOC_TILEGX_IMM16_X0_HW3_GOT,
+  BFD_RELOC_TILEGX_IMM16_X1_HW3_GOT,
+  BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_GOT,
+  BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_GOT,
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_GOT,
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_GOT,
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_GOT,
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_GOT,
+  BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X0_HW3_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X1_HW3_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_TLS_GD,
+  BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X0_HW3_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X1_HW3_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_TLS_IE,
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_TLS_IE,
+  BFD_RELOC_TILEGX_TLS_DTPMOD64,
+  BFD_RELOC_TILEGX_TLS_DTPOFF64,
+  BFD_RELOC_TILEGX_TLS_TPOFF64,
+  BFD_RELOC_TILEGX_TLS_DTPMOD32,
+  BFD_RELOC_TILEGX_TLS_DTPOFF32,
+  BFD_RELOC_TILEGX_TLS_TPOFF32,
+  BFD_RELOC_UNUSED };
+typedef enum bfd_reloc_code_real bfd_reloc_code_real_type;
+reloc_howto_type *bfd_reloc_type_lookup
+   (bfd *abfd, bfd_reloc_code_real_type code);
+reloc_howto_type *bfd_reloc_name_lookup
+   (bfd *abfd, const char *reloc_name);
+
+const char *bfd_get_reloc_code_name (bfd_reloc_code_real_type code);
+
+/* Extracted from syms.c.  */
+
+typedef struct bfd_symbol
+{
+  /* A pointer to the BFD which owns the symbol. This information
+     is necessary so that a back end can work out what additional
+     information (invisible to the application writer) is carried
+     with the symbol.
+
+     This field is *almost* redundant, since you can use section->owner
+     instead, except that some symbols point to the global sections
+     bfd_{abs,com,und}_section.  This could be fixed by making
+     these globals be per-bfd (or per-target-flavor).  FIXME.  */
+  struct bfd *the_bfd; /* Use bfd_asymbol_bfd(sym) to access this field.  */
+
+  /* The text of the symbol. The name is left alone, and not copied; the
+     application may not alter it.  */
+  const char *name;
+
+  /* The value of the symbol.  This really should be a union of a
+     numeric value with a pointer, since some flags indicate that
+     a pointer to another symbol is stored here.  */
+  symvalue value;
+
+  /* Attributes of a symbol.  */
+#define BSF_NO_FLAGS           0x00
+
+  /* The symbol has local scope; <<static>> in <<C>>. The value
+     is the offset into the section of the data.  */
+#define BSF_LOCAL              (1 << 0)
+
+  /* The symbol has global scope; initialized data in <<C>>. The
+     value is the offset into the section of the data.  */
+#define BSF_GLOBAL             (1 << 1)
+
+  /* The symbol has global scope and is exported. The value is
+     the offset into the section of the data.  */
+#define BSF_EXPORT     BSF_GLOBAL /* No real difference.  */
+
+  /* A normal C symbol would be one of:
+     <<BSF_LOCAL>>, <<BSF_COMMON>>,  <<BSF_UNDEFINED>> or
+     <<BSF_GLOBAL>>.  */
+
+  /* The symbol is a debugging record. The value has an arbitrary
+     meaning, unless BSF_DEBUGGING_RELOC is also set.  */
+#define BSF_DEBUGGING          (1 << 2)
+
+  /* The symbol denotes a function entry point.  Used in ELF,
+     perhaps others someday.  */
+#define BSF_FUNCTION           (1 << 3)
+
+  /* Used by the linker.  */
+#define BSF_KEEP               (1 << 5)
+#define BSF_KEEP_G             (1 << 6)
+
+  /* A weak global symbol, overridable without warnings by
+     a regular global symbol of the same name.  */
+#define BSF_WEAK               (1 << 7)
+
+  /* This symbol was created to point to a section, e.g. ELF's
+     STT_SECTION symbols.  */
+#define BSF_SECTION_SYM        (1 << 8)
+
+  /* The symbol used to be a common symbol, but now it is
+     allocated.  */
+#define BSF_OLD_COMMON         (1 << 9)
+
+  /* In some files the type of a symbol sometimes alters its
+     location in an output file - ie in coff a <<ISFCN>> symbol
+     which is also <<C_EXT>> symbol appears where it was
+     declared and not at the end of a section.  This bit is set
+     by the target BFD part to convey this information.  */
+#define BSF_NOT_AT_END         (1 << 10)
+
+  /* Signal that the symbol is the label of constructor section.  */
+#define BSF_CONSTRUCTOR        (1 << 11)
+
+  /* Signal that the symbol is a warning symbol.  The name is a
+     warning.  The name of the next symbol is the one to warn about;
+     if a reference is made to a symbol with the same name as the next
+     symbol, a warning is issued by the linker.  */
+#define BSF_WARNING            (1 << 12)
+
+  /* Signal that the symbol is indirect.  This symbol is an indirect
+     pointer to the symbol with the same name as the next symbol.  */
+#define BSF_INDIRECT           (1 << 13)
+
+  /* BSF_FILE marks symbols that contain a file name.  This is used
+     for ELF STT_FILE symbols.  */
+#define BSF_FILE               (1 << 14)
+
+  /* Symbol is from dynamic linking information.  */
+#define BSF_DYNAMIC            (1 << 15)
+
+  /* The symbol denotes a data object.  Used in ELF, and perhaps
+     others someday.  */
+#define BSF_OBJECT             (1 << 16)
+
+  /* This symbol is a debugging symbol.  The value is the offset
+     into the section of the data.  BSF_DEBUGGING should be set
+     as well.  */
+#define BSF_DEBUGGING_RELOC    (1 << 17)
+
+  /* This symbol is thread local.  Used in ELF.  */
+#define BSF_THREAD_LOCAL       (1 << 18)
+
+  /* This symbol represents a complex relocation expression,
+     with the expression tree serialized in the symbol name.  */
+#define BSF_RELC               (1 << 19)
+
+  /* This symbol represents a signed complex relocation expression,
+     with the expression tree serialized in the symbol name.  */
+#define BSF_SRELC              (1 << 20)
+
+  /* This symbol was created by bfd_get_synthetic_symtab.  */
+#define BSF_SYNTHETIC          (1 << 21)
+
+  /* This symbol is an indirect code object.  Unrelated to BSF_INDIRECT.
+     The dynamic linker will compute the value of this symbol by
+     calling the function that it points to.  BSF_FUNCTION must
+     also be also set.  */
+#define BSF_GNU_INDIRECT_FUNCTION (1 << 22)
+  /* This symbol is a globally unique data object.  The dynamic linker
+     will make sure that in the entire process there is just one symbol
+     with this name and type in use.  BSF_OBJECT must also be set.  */
+#define BSF_GNU_UNIQUE         (1 << 23)
+
+  flagword flags;
+
+  /* A pointer to the section to which this symbol is
+     relative.  This will always be non NULL, there are special
+     sections for undefined and absolute symbols.  */
+  struct bfd_section *section;
+
+  /* Back end special data.  */
+  union
+    {
+      void *p;
+      bfd_vma i;
+    }
+  udata;
+}
+asymbol;
+
+#define bfd_get_symtab_upper_bound(abfd) \
+     BFD_SEND (abfd, _bfd_get_symtab_upper_bound, (abfd))
+
+bfd_boolean bfd_is_local_label (bfd *abfd, asymbol *sym);
+
+bfd_boolean bfd_is_local_label_name (bfd *abfd, const char *name);
+
+#define bfd_is_local_label_name(abfd, name) \
+  BFD_SEND (abfd, _bfd_is_local_label_name, (abfd, name))
+
+bfd_boolean bfd_is_target_special_symbol (bfd *abfd, asymbol *sym);
+
+#define bfd_is_target_special_symbol(abfd, sym) \
+  BFD_SEND (abfd, _bfd_is_target_special_symbol, (abfd, sym))
+
+#define bfd_canonicalize_symtab(abfd, location) \
+  BFD_SEND (abfd, _bfd_canonicalize_symtab, (abfd, location))
+
+bfd_boolean bfd_set_symtab
+   (bfd *abfd, asymbol **location, unsigned int count);
+
+void bfd_print_symbol_vandf (bfd *abfd, void *file, asymbol *symbol);
+
+#define bfd_make_empty_symbol(abfd) \
+  BFD_SEND (abfd, _bfd_make_empty_symbol, (abfd))
+
+asymbol *_bfd_generic_make_empty_symbol (bfd *);
+
+#define bfd_make_debug_symbol(abfd,ptr,size) \
+  BFD_SEND (abfd, _bfd_make_debug_symbol, (abfd, ptr, size))
+
+int bfd_decode_symclass (asymbol *symbol);
+
+bfd_boolean bfd_is_undefined_symclass (int symclass);
+
+void bfd_symbol_info (asymbol *symbol, symbol_info *ret);
+
+bfd_boolean bfd_copy_private_symbol_data
+   (bfd *ibfd, asymbol *isym, bfd *obfd, asymbol *osym);
+
+#define bfd_copy_private_symbol_data(ibfd, isymbol, obfd, osymbol) \
+  BFD_SEND (obfd, _bfd_copy_private_symbol_data, \
+            (ibfd, isymbol, obfd, osymbol))
+
+/* Extracted from bfd.c.  */
+enum bfd_direction
+  {
+    no_direction = 0,
+    read_direction = 1,
+    write_direction = 2,
+    both_direction = 3
+  };
+
+struct bfd
+{
+  /* A unique identifier of the BFD  */
+  unsigned int id;
+
+  /* The filename the application opened the BFD with.  */
+  const char *filename;
+
+  /* A pointer to the target jump table.  */
+  const struct bfd_target *xvec;
+
+  /* The IOSTREAM, and corresponding IO vector that provide access
+     to the file backing the BFD.  */
+  void *iostream;
+  const struct bfd_iovec *iovec;
+
+  /* The caching routines use these to maintain a
+     least-recently-used list of BFDs.  */
+  struct bfd *lru_prev, *lru_next;
+
+  /* When a file is closed by the caching routines, BFD retains
+     state information on the file here...  */
+  ufile_ptr where;
+
+  /* File modified time, if mtime_set is TRUE.  */
+  long mtime;
+
+  /* Reserved for an unimplemented file locking extension.  */
+  int ifd;
+
+  /* The format which belongs to the BFD. (object, core, etc.)  */
+  bfd_format format;
+
+  /* The direction with which the BFD was opened.  */
+  enum bfd_direction direction;
+
+  /* Format_specific flags.  */
+  flagword flags;
+
+  /* Values that may appear in the flags field of a BFD.  These also
+     appear in the object_flags field of the bfd_target structure, where
+     they indicate the set of flags used by that backend (not all flags
+     are meaningful for all object file formats) (FIXME: at the moment,
+     the object_flags values have mostly just been copied from backend
+     to another, and are not necessarily correct).  */
+
+#define BFD_NO_FLAGS   0x00
+
+  /* BFD contains relocation entries.  */
+#define HAS_RELOC      0x01
+
+  /* BFD is directly executable.  */
+#define EXEC_P         0x02
+
+  /* BFD has line number information (basically used for F_LNNO in a
+     COFF header).  */
+#define HAS_LINENO     0x04
+
+  /* BFD has debugging information.  */
+#define HAS_DEBUG      0x08
+
+  /* BFD has symbols.  */
+#define HAS_SYMS       0x10
+
+  /* BFD has local symbols (basically used for F_LSYMS in a COFF
+     header).  */
+#define HAS_LOCALS     0x20
+
+  /* BFD is a dynamic object.  */
+#define DYNAMIC        0x40
+
+  /* Text section is write protected (if D_PAGED is not set, this is
+     like an a.out NMAGIC file) (the linker sets this by default, but
+     clears it for -r or -N).  */
+#define WP_TEXT        0x80
+
+  /* BFD is dynamically paged (this is like an a.out ZMAGIC file) (the
+     linker sets this by default, but clears it for -r or -n or -N).  */
+#define D_PAGED        0x100
+
+  /* BFD is relaxable (this means that bfd_relax_section may be able to
+     do something) (sometimes bfd_relax_section can do something even if
+     this is not set).  */
+#define BFD_IS_RELAXABLE 0x200
+
+  /* This may be set before writing out a BFD to request using a
+     traditional format.  For example, this is used to request that when
+     writing out an a.out object the symbols not be hashed to eliminate
+     duplicates.  */
+#define BFD_TRADITIONAL_FORMAT 0x400
+
+  /* This flag indicates that the BFD contents are actually cached
+     in memory.  If this is set, iostream points to a bfd_in_memory
+     struct.  */
+#define BFD_IN_MEMORY 0x800
+
+  /* The sections in this BFD specify a memory page.  */
+#define HAS_LOAD_PAGE 0x1000
+
+  /* This BFD has been created by the linker and doesn't correspond
+     to any input file.  */
+#define BFD_LINKER_CREATED 0x2000
+
+  /* This may be set before writing out a BFD to request that it
+     be written using values for UIDs, GIDs, timestamps, etc. that
+     will be consistent from run to run.  */
+#define BFD_DETERMINISTIC_OUTPUT 0x4000
+
+  /* Compress sections in this BFD.  */
+#define BFD_COMPRESS 0x8000
+
+  /* Decompress sections in this BFD.  */
+#define BFD_DECOMPRESS 0x10000
+
+  /* BFD is a dummy, for plugins.  */
+#define BFD_PLUGIN 0x20000
+
+  /* Flags bits to be saved in bfd_preserve_save.  */
+#define BFD_FLAGS_SAVED \
+  (BFD_IN_MEMORY | BFD_COMPRESS | BFD_DECOMPRESS | BFD_PLUGIN)
+
+  /* Flags bits which are for BFD use only.  */
+#define BFD_FLAGS_FOR_BFD_USE_MASK \
+  (BFD_IN_MEMORY | BFD_COMPRESS | BFD_DECOMPRESS | BFD_LINKER_CREATED \
+   | BFD_PLUGIN | BFD_TRADITIONAL_FORMAT | BFD_DETERMINISTIC_OUTPUT)
+
+  /* Currently my_archive is tested before adding origin to
+     anything. I believe that this can become always an add of
+     origin, with origin set to 0 for non archive files.  */
+  ufile_ptr origin;
+
+  /* The origin in the archive of the proxy entry.  This will
+     normally be the same as origin, except for thin archives,
+     when it will contain the current offset of the proxy in the
+     thin archive rather than the offset of the bfd in its actual
+     container.  */
+  ufile_ptr proxy_origin;
+
+  /* A hash table for section names.  */
+  struct bfd_hash_table section_htab;
+
+  /* Pointer to linked list of sections.  */
+  struct bfd_section *sections;
+
+  /* The last section on the section list.  */
+  struct bfd_section *section_last;
+
+  /* The number of sections.  */
+  unsigned int section_count;
+
+  /* Stuff only useful for object files:
+     The start address.  */
+  bfd_vma start_address;
+
+  /* Used for input and output.  */
+  unsigned int symcount;
+
+  /* Symbol table for output BFD (with symcount entries).
+     Also used by the linker to cache input BFD symbols.  */
+  struct bfd_symbol  **outsymbols;
+
+  /* Used for slurped dynamic symbol tables.  */
+  unsigned int dynsymcount;
+
+  /* Pointer to structure which contains architecture information.  */
+  const struct bfd_arch_info *arch_info;
+
+  /* Stuff only useful for archives.  */
+  void *arelt_data;
+  struct bfd *my_archive;      /* The containing archive BFD.  */
+  struct bfd *archive_next;    /* The next BFD in the archive.  */
+  struct bfd *archive_head;    /* The first BFD in the archive.  */
+  struct bfd *nested_archives; /* List of nested archive in a flattened
+                                  thin archive.  */
+
+  /* A chain of BFD structures involved in a link.  */
+  struct bfd *link_next;
+
+  /* A field used by _bfd_generic_link_add_archive_symbols.  This will
+     be used only for archive elements.  */
+  int archive_pass;
+
+  /* Used by the back end to hold private data.  */
+  union
+    {
+      struct aout_data_struct *aout_data;
+      struct artdata *aout_ar_data;
+      struct _oasys_data *oasys_obj_data;
+      struct _oasys_ar_data *oasys_ar_data;
+      struct coff_tdata *coff_obj_data;
+      struct pe_tdata *pe_obj_data;
+      struct xcoff_tdata *xcoff_obj_data;
+      struct ecoff_tdata *ecoff_obj_data;
+      struct ieee_data_struct *ieee_data;
+      struct ieee_ar_data_struct *ieee_ar_data;
+      struct srec_data_struct *srec_data;
+      struct verilog_data_struct *verilog_data;
+      struct ihex_data_struct *ihex_data;
+      struct tekhex_data_struct *tekhex_data;
+      struct elf_obj_tdata *elf_obj_data;
+      struct nlm_obj_tdata *nlm_obj_data;
+      struct bout_data_struct *bout_data;
+      struct mmo_data_struct *mmo_data;
+      struct sun_core_struct *sun_core_data;
+      struct sco5_core_struct *sco5_core_data;
+      struct trad_core_struct *trad_core_data;
+      struct som_data_struct *som_data;
+      struct hpux_core_struct *hpux_core_data;
+      struct hppabsd_core_struct *hppabsd_core_data;
+      struct sgi_core_struct *sgi_core_data;
+      struct lynx_core_struct *lynx_core_data;
+      struct osf_core_struct *osf_core_data;
+      struct cisco_core_struct *cisco_core_data;
+      struct versados_data_struct *versados_data;
+      struct netbsd_core_struct *netbsd_core_data;
+      struct mach_o_data_struct *mach_o_data;
+      struct mach_o_fat_data_struct *mach_o_fat_data;
+      struct plugin_data_struct *plugin_data;
+      struct bfd_pef_data_struct *pef_data;
+      struct bfd_pef_xlib_data_struct *pef_xlib_data;
+      struct bfd_sym_data_struct *sym_data;
+      struct asxxxx_data_struct *asxxxx_data;
+      void *any;
+    }
+  tdata;
+
+  /* Used by the application to hold private data.  */
+  void *usrdata;
+
+  /* Where all the allocated stuff under this BFD goes.  This is a
+     struct objalloc *, but we use void * to avoid requiring the inclusion
+     of objalloc.h.  */
+  void *memory;
+
+  /* Is the file descriptor being cached?  That is, can it be closed as
+     needed, and re-opened when accessed later?  */
+  unsigned int cacheable : 1;
+
+  /* Marks whether there was a default target specified when the
+     BFD was opened. This is used to select which matching algorithm
+     to use to choose the back end.  */
+  unsigned int target_defaulted : 1;
+
+  /* ... and here: (``once'' means at least once).  */
+  unsigned int opened_once : 1;
+
+  /* Set if we have a locally maintained mtime value, rather than
+     getting it from the file each time.  */
+  unsigned int mtime_set : 1;
+
+  /* Flag set if symbols from this BFD should not be exported.  */
+  unsigned int no_export : 1;
+
+  /* Remember when output has begun, to stop strange things
+     from happening.  */
+  unsigned int output_has_begun : 1;
+
+  /* Have archive map.  */
+  unsigned int has_armap : 1;
+
+  /* Set if this is a thin archive.  */
+  unsigned int is_thin_archive : 1;
+
+  /* Set if only required symbols should be added in the link hash table for
+     this object.  Used by VMS linkers.  */
+  unsigned int selective_search : 1;
+};
+
+typedef enum bfd_error
+{
+  bfd_error_no_error = 0,
+  bfd_error_system_call,
+  bfd_error_invalid_target,
+  bfd_error_wrong_format,
+  bfd_error_wrong_object_format,
+  bfd_error_invalid_operation,
+  bfd_error_no_memory,
+  bfd_error_no_symbols,
+  bfd_error_no_armap,
+  bfd_error_no_more_archived_files,
+  bfd_error_malformed_archive,
+  bfd_error_file_not_recognized,
+  bfd_error_file_ambiguously_recognized,
+  bfd_error_no_contents,
+  bfd_error_nonrepresentable_section,
+  bfd_error_no_debug_section,
+  bfd_error_bad_value,
+  bfd_error_file_truncated,
+  bfd_error_file_too_big,
+  bfd_error_on_input,
+  bfd_error_invalid_error_code
+}
+bfd_error_type;
+
+bfd_error_type bfd_get_error (void);
+
+void bfd_set_error (bfd_error_type error_tag, ...);
+
+const char *bfd_errmsg (bfd_error_type error_tag);
+
+void bfd_perror (const char *message);
+
+typedef void (*bfd_error_handler_type) (const char *, ...);
+
+bfd_error_handler_type bfd_set_error_handler (bfd_error_handler_type);
+
+void bfd_set_error_program_name (const char *);
+
+bfd_error_handler_type bfd_get_error_handler (void);
+
+long bfd_get_reloc_upper_bound (bfd *abfd, asection *sect);
+
+long bfd_canonicalize_reloc
+   (bfd *abfd, asection *sec, arelent **loc, asymbol **syms);
+
+void bfd_set_reloc
+   (bfd *abfd, asection *sec, arelent **rel, unsigned int count);
+
+bfd_boolean bfd_set_file_flags (bfd *abfd, flagword flags);
+
+int bfd_get_arch_size (bfd *abfd);
+
+int bfd_get_sign_extend_vma (bfd *abfd);
+
+bfd_boolean bfd_set_start_address (bfd *abfd, bfd_vma vma);
+
+unsigned int bfd_get_gp_size (bfd *abfd);
+
+void bfd_set_gp_size (bfd *abfd, unsigned int i);
+
+bfd_vma bfd_scan_vma (const char *string, const char **end, int base);
+
+bfd_boolean bfd_copy_private_header_data (bfd *ibfd, bfd *obfd);
+
+#define bfd_copy_private_header_data(ibfd, obfd) \
+     BFD_SEND (obfd, _bfd_copy_private_header_data, \
+               (ibfd, obfd))
+bfd_boolean bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd);
+
+#define bfd_copy_private_bfd_data(ibfd, obfd) \
+     BFD_SEND (obfd, _bfd_copy_private_bfd_data, \
+               (ibfd, obfd))
+bfd_boolean bfd_merge_private_bfd_data (bfd *ibfd, bfd *obfd);
+
+#define bfd_merge_private_bfd_data(ibfd, obfd) \
+     BFD_SEND (obfd, _bfd_merge_private_bfd_data, \
+               (ibfd, obfd))
+bfd_boolean bfd_set_private_flags (bfd *abfd, flagword flags);
+
+#define bfd_set_private_flags(abfd, flags) \
+     BFD_SEND (abfd, _bfd_set_private_flags, (abfd, flags))
+#define bfd_sizeof_headers(abfd, info) \
+       BFD_SEND (abfd, _bfd_sizeof_headers, (abfd, info))
+
+#define bfd_find_nearest_line(abfd, sec, syms, off, file, func, line) \
+       BFD_SEND (abfd, _bfd_find_nearest_line, \
+                 (abfd, sec, syms, off, file, func, line))
+
+#define bfd_find_line(abfd, syms, sym, file, line) \
+       BFD_SEND (abfd, _bfd_find_line, \
+                 (abfd, syms, sym, file, line))
+
+#define bfd_find_inliner_info(abfd, file, func, line) \
+       BFD_SEND (abfd, _bfd_find_inliner_info, \
+                 (abfd, file, func, line))
+
+#define bfd_debug_info_start(abfd) \
+       BFD_SEND (abfd, _bfd_debug_info_start, (abfd))
+
+#define bfd_debug_info_end(abfd) \
+       BFD_SEND (abfd, _bfd_debug_info_end, (abfd))
+
+#define bfd_debug_info_accumulate(abfd, section) \
+       BFD_SEND (abfd, _bfd_debug_info_accumulate, (abfd, section))
+
+#define bfd_stat_arch_elt(abfd, stat) \
+       BFD_SEND (abfd, _bfd_stat_arch_elt,(abfd, stat))
+
+#define bfd_update_armap_timestamp(abfd) \
+       BFD_SEND (abfd, _bfd_update_armap_timestamp, (abfd))
+
+#define bfd_set_arch_mach(abfd, arch, mach)\
+       BFD_SEND ( abfd, _bfd_set_arch_mach, (abfd, arch, mach))
+
+#define bfd_relax_section(abfd, section, link_info, again) \
+       BFD_SEND (abfd, _bfd_relax_section, (abfd, section, link_info, again))
+
+#define bfd_gc_sections(abfd, link_info) \
+       BFD_SEND (abfd, _bfd_gc_sections, (abfd, link_info))
+
+#define bfd_lookup_section_flags(link_info, flag_info) \
+       BFD_SEND (abfd, _bfd_lookup_section_flags, (link_info, flag_info))
+
+#define bfd_merge_sections(abfd, link_info) \
+       BFD_SEND (abfd, _bfd_merge_sections, (abfd, link_info))
+
+#define bfd_is_group_section(abfd, sec) \
+       BFD_SEND (abfd, _bfd_is_group_section, (abfd, sec))
+
+#define bfd_discard_group(abfd, sec) \
+       BFD_SEND (abfd, _bfd_discard_group, (abfd, sec))
+
+#define bfd_link_hash_table_create(abfd) \
+       BFD_SEND (abfd, _bfd_link_hash_table_create, (abfd))
+
+#define bfd_link_hash_table_free(abfd, hash) \
+       BFD_SEND (abfd, _bfd_link_hash_table_free, (hash))
+
+#define bfd_link_add_symbols(abfd, info) \
+       BFD_SEND (abfd, _bfd_link_add_symbols, (abfd, info))
+
+#define bfd_link_just_syms(abfd, sec, info) \
+       BFD_SEND (abfd, _bfd_link_just_syms, (sec, info))
+
+#define bfd_final_link(abfd, info) \
+       BFD_SEND (abfd, _bfd_final_link, (abfd, info))
+
+#define bfd_free_cached_info(abfd) \
+       BFD_SEND (abfd, _bfd_free_cached_info, (abfd))
+
+#define bfd_get_dynamic_symtab_upper_bound(abfd) \
+       BFD_SEND (abfd, _bfd_get_dynamic_symtab_upper_bound, (abfd))
+
+#define bfd_print_private_bfd_data(abfd, file)\
+       BFD_SEND (abfd, _bfd_print_private_bfd_data, (abfd, file))
+
+#define bfd_canonicalize_dynamic_symtab(abfd, asymbols) \
+       BFD_SEND (abfd, _bfd_canonicalize_dynamic_symtab, (abfd, asymbols))
+
+#define bfd_get_synthetic_symtab(abfd, count, syms, dyncount, dynsyms, ret) \
+       BFD_SEND (abfd, _bfd_get_synthetic_symtab, (abfd, count, syms, \
+                                                   dyncount, dynsyms, ret))
+
+#define bfd_get_dynamic_reloc_upper_bound(abfd) \
+       BFD_SEND (abfd, _bfd_get_dynamic_reloc_upper_bound, (abfd))
+
+#define bfd_canonicalize_dynamic_reloc(abfd, arels, asyms) \
+       BFD_SEND (abfd, _bfd_canonicalize_dynamic_reloc, (abfd, arels, asyms))
+
+extern bfd_byte *bfd_get_relocated_section_contents
+  (bfd *, struct bfd_link_info *, struct bfd_link_order *, bfd_byte *,
+   bfd_boolean, asymbol **);
+
+bfd_boolean bfd_alt_mach_code (bfd *abfd, int alternative);
+
+struct bfd_preserve
+{
+  void *marker;
+  void *tdata;
+  flagword flags;
+  const struct bfd_arch_info *arch_info;
+  struct bfd_section *sections;
+  struct bfd_section *section_last;
+  unsigned int section_count;
+  struct bfd_hash_table section_htab;
+};
+
+bfd_boolean bfd_preserve_save (bfd *, struct bfd_preserve *);
+
+void bfd_preserve_restore (bfd *, struct bfd_preserve *);
+
+void bfd_preserve_finish (bfd *, struct bfd_preserve *);
+
+bfd_vma bfd_emul_get_maxpagesize (const char *);
+
+void bfd_emul_set_maxpagesize (const char *, bfd_vma);
+
+bfd_vma bfd_emul_get_commonpagesize (const char *);
+
+void bfd_emul_set_commonpagesize (const char *, bfd_vma);
+
+char *bfd_demangle (bfd *, const char *, int);
+
+/* Extracted from archive.c.  */
+symindex bfd_get_next_mapent
+   (bfd *abfd, symindex previous, carsym **sym);
+
+bfd_boolean bfd_set_archive_head (bfd *output, bfd *new_head);
+
+bfd *bfd_openr_next_archived_file (bfd *archive, bfd *previous);
+
+/* Extracted from corefile.c.  */
+const char *bfd_core_file_failing_command (bfd *abfd);
+
+int bfd_core_file_failing_signal (bfd *abfd);
+
+int bfd_core_file_pid (bfd *abfd);
+
+bfd_boolean core_file_matches_executable_p
+   (bfd *core_bfd, bfd *exec_bfd);
+
+bfd_boolean generic_core_file_matches_executable_p
+   (bfd *core_bfd, bfd *exec_bfd);
+
+/* Extracted from targets.c.  */
+#define BFD_SEND(bfd, message, arglist) \
+  ((*((bfd)->xvec->message)) arglist)
+
+#ifdef DEBUG_BFD_SEND
+#undef BFD_SEND
+#define BFD_SEND(bfd, message, arglist) \
+  (((bfd) && (bfd)->xvec && (bfd)->xvec->message) ? \
+    ((*((bfd)->xvec->message)) arglist) : \
+    (bfd_assert (__FILE__,__LINE__), NULL))
+#endif
+#define BFD_SEND_FMT(bfd, message, arglist) \
+  (((bfd)->xvec->message[(int) ((bfd)->format)]) arglist)
+
+#ifdef DEBUG_BFD_SEND
+#undef BFD_SEND_FMT
+#define BFD_SEND_FMT(bfd, message, arglist) \
+  (((bfd) && (bfd)->xvec && (bfd)->xvec->message) ? \
+   (((bfd)->xvec->message[(int) ((bfd)->format)]) arglist) : \
+   (bfd_assert (__FILE__,__LINE__), NULL))
+#endif
+
+enum bfd_flavour
+{
+  bfd_target_unknown_flavour,
+  bfd_target_aout_flavour,
+  bfd_target_coff_flavour,
+  bfd_target_ecoff_flavour,
+  bfd_target_xcoff_flavour,
+  bfd_target_elf_flavour,
+  bfd_target_ieee_flavour,
+  bfd_target_nlm_flavour,
+  bfd_target_oasys_flavour,
+  bfd_target_tekhex_flavour,
+  bfd_target_srec_flavour,
+  bfd_target_verilog_flavour,
+  bfd_target_ihex_flavour,
+  bfd_target_som_flavour,
+  bfd_target_os9k_flavour,
+  bfd_target_versados_flavour,
+  bfd_target_msdos_flavour,
+  bfd_target_ovax_flavour,
+  bfd_target_evax_flavour,
+  bfd_target_mmo_flavour,
+  bfd_target_mach_o_flavour,
+  bfd_target_pef_flavour,
+  bfd_target_pef_xlib_flavour,
+  bfd_target_sym_flavour,
+  bfd_target_asxxxx_flavour
+};
+
+enum bfd_endian { BFD_ENDIAN_BIG, BFD_ENDIAN_LITTLE, BFD_ENDIAN_UNKNOWN };
+
+/* Forward declaration.  */
+typedef struct bfd_link_info _bfd_link_info;
+
+/* Forward declaration.  */
+typedef struct flag_info flag_info;
+
+typedef struct bfd_target
+{
+  /* Identifies the kind of target, e.g., SunOS4, Ultrix, etc.  */
+  char *name;
+
+ /* The "flavour" of a back end is a general indication about
+    the contents of a file.  */
+  enum bfd_flavour flavour;
+
+  /* The order of bytes within the data area of a file.  */
+  enum bfd_endian byteorder;
+
+ /* The order of bytes within the header parts of a file.  */
+  enum bfd_endian header_byteorder;
+
+  /* A mask of all the flags which an executable may have set -
+     from the set <<BFD_NO_FLAGS>>, <<HAS_RELOC>>, ...<<D_PAGED>>.  */
+  flagword object_flags;
+
+ /* A mask of all the flags which a section may have set - from
+    the set <<SEC_NO_FLAGS>>, <<SEC_ALLOC>>, ...<<SET_NEVER_LOAD>>.  */
+  flagword section_flags;
+
+ /* The character normally found at the front of a symbol.
+    (if any), perhaps `_'.  */
+  char symbol_leading_char;
+
+ /* The pad character for file names within an archive header.  */
+  char ar_pad_char;
+
+  /* The maximum number of characters in an archive header.  */
+  unsigned char ar_max_namelen;
+
+  /* How well this target matches, used to select between various
+     possible targets when more than one target matches.  */
+  unsigned char match_priority;
+
+  /* Entries for byte swapping for data. These are different from the
+     other entry points, since they don't take a BFD as the first argument.
+     Certain other handlers could do the same.  */
+  bfd_uint64_t   (*bfd_getx64) (const void *);
+  bfd_int64_t    (*bfd_getx_signed_64) (const void *);
+  void           (*bfd_putx64) (bfd_uint64_t, void *);
+  bfd_vma        (*bfd_getx32) (const void *);
+  bfd_signed_vma (*bfd_getx_signed_32) (const void *);
+  void           (*bfd_putx32) (bfd_vma, void *);
+  bfd_vma        (*bfd_getx16) (const void *);
+  bfd_signed_vma (*bfd_getx_signed_16) (const void *);
+  void           (*bfd_putx16) (bfd_vma, void *);
+
+  /* Byte swapping for the headers.  */
+  bfd_uint64_t   (*bfd_h_getx64) (const void *);
+  bfd_int64_t    (*bfd_h_getx_signed_64) (const void *);
+  void           (*bfd_h_putx64) (bfd_uint64_t, void *);
+  bfd_vma        (*bfd_h_getx32) (const void *);
+  bfd_signed_vma (*bfd_h_getx_signed_32) (const void *);
+  void           (*bfd_h_putx32) (bfd_vma, void *);
+  bfd_vma        (*bfd_h_getx16) (const void *);
+  bfd_signed_vma (*bfd_h_getx_signed_16) (const void *);
+  void           (*bfd_h_putx16) (bfd_vma, void *);
+
+  /* Format dependent routines: these are vectors of entry points
+     within the target vector structure, one for each format to check.  */
+
+  /* Check the format of a file being read.  Return a <<bfd_target *>> or zero.  */
+  const struct bfd_target *(*_bfd_check_format[bfd_type_end]) (bfd *);
+
+  /* Set the format of a file being written.  */
+  bfd_boolean (*_bfd_set_format[bfd_type_end]) (bfd *);
+
+  /* Write cached information into a file being written, at <<bfd_close>>.  */
+  bfd_boolean (*_bfd_write_contents[bfd_type_end]) (bfd *);
+
+
+  /* Generic entry points.  */
+#define BFD_JUMP_TABLE_GENERIC(NAME) \
+  NAME##_close_and_cleanup, \
+  NAME##_bfd_free_cached_info, \
+  NAME##_new_section_hook, \
+  NAME##_get_section_contents, \
+  NAME##_get_section_contents_in_window
+
+  /* Called when the BFD is being closed to do any necessary cleanup.  */
+  bfd_boolean (*_close_and_cleanup) (bfd *);
+  /* Ask the BFD to free all cached information.  */
+  bfd_boolean (*_bfd_free_cached_info) (bfd *);
+  /* Called when a new section is created.  */
+  bfd_boolean (*_new_section_hook) (bfd *, sec_ptr);
+  /* Read the contents of a section.  */
+  bfd_boolean (*_bfd_get_section_contents)
+    (bfd *, sec_ptr, void *, file_ptr, bfd_size_type);
+  bfd_boolean (*_bfd_get_section_contents_in_window)
+    (bfd *, sec_ptr, bfd_window *, file_ptr, bfd_size_type);
+
+  /* Entry points to copy private data.  */
+#define BFD_JUMP_TABLE_COPY(NAME) \
+  NAME##_bfd_copy_private_bfd_data, \
+  NAME##_bfd_merge_private_bfd_data, \
+  _bfd_generic_init_private_section_data, \
+  NAME##_bfd_copy_private_section_data, \
+  NAME##_bfd_copy_private_symbol_data, \
+  NAME##_bfd_copy_private_header_data, \
+  NAME##_bfd_set_private_flags, \
+  NAME##_bfd_print_private_bfd_data
+
+  /* Called to copy BFD general private data from one object file
+     to another.  */
+  bfd_boolean (*_bfd_copy_private_bfd_data) (bfd *, bfd *);
+  /* Called to merge BFD general private data from one object file
+     to a common output file when linking.  */
+  bfd_boolean (*_bfd_merge_private_bfd_data) (bfd *, bfd *);
+  /* Called to initialize BFD private section data from one object file
+     to another.  */
+#define bfd_init_private_section_data(ibfd, isec, obfd, osec, link_info) \
+  BFD_SEND (obfd, _bfd_init_private_section_data, (ibfd, isec, obfd, osec, link_info))
+  bfd_boolean (*_bfd_init_private_section_data)
+    (bfd *, sec_ptr, bfd *, sec_ptr, struct bfd_link_info *);
+  /* Called to copy BFD private section data from one object file
+     to another.  */
+  bfd_boolean (*_bfd_copy_private_section_data)
+    (bfd *, sec_ptr, bfd *, sec_ptr);
+  /* Called to copy BFD private symbol data from one symbol
+     to another.  */
+  bfd_boolean (*_bfd_copy_private_symbol_data)
+    (bfd *, asymbol *, bfd *, asymbol *);
+  /* Called to copy BFD private header data from one object file
+     to another.  */
+  bfd_boolean (*_bfd_copy_private_header_data)
+    (bfd *, bfd *);
+  /* Called to set private backend flags.  */
+  bfd_boolean (*_bfd_set_private_flags) (bfd *, flagword);
+
+  /* Called to print private BFD data.  */
+  bfd_boolean (*_bfd_print_private_bfd_data) (bfd *, void *);
+
+  /* Core file entry points.  */
+#define BFD_JUMP_TABLE_CORE(NAME) \
+  NAME##_core_file_failing_command, \
+  NAME##_core_file_failing_signal, \
+  NAME##_core_file_matches_executable_p, \
+  NAME##_core_file_pid
+
+  char *      (*_core_file_failing_command) (bfd *);
+  int         (*_core_file_failing_signal) (bfd *);
+  bfd_boolean (*_core_file_matches_executable_p) (bfd *, bfd *);
+  int         (*_core_file_pid) (bfd *);
+
+  /* Archive entry points.  */
+#define BFD_JUMP_TABLE_ARCHIVE(NAME) \
+  NAME##_slurp_armap, \
+  NAME##_slurp_extended_name_table, \
+  NAME##_construct_extended_name_table, \
+  NAME##_truncate_arname, \
+  NAME##_write_armap, \
+  NAME##_read_ar_hdr, \
+  NAME##_write_ar_hdr, \
+  NAME##_openr_next_archived_file, \
+  NAME##_get_elt_at_index, \
+  NAME##_generic_stat_arch_elt, \
+  NAME##_update_armap_timestamp
+
+  bfd_boolean (*_bfd_slurp_armap) (bfd *);
+  bfd_boolean (*_bfd_slurp_extended_name_table) (bfd *);
+  bfd_boolean (*_bfd_construct_extended_name_table)
+    (bfd *, char **, bfd_size_type *, const char **);
+  void        (*_bfd_truncate_arname) (bfd *, const char *, char *);
+  bfd_boolean (*write_armap)
+    (bfd *, unsigned int, struct orl *, unsigned int, int);
+  void *      (*_bfd_read_ar_hdr_fn) (bfd *);
+  bfd_boolean (*_bfd_write_ar_hdr_fn) (bfd *, bfd *);
+  bfd *       (*openr_next_archived_file) (bfd *, bfd *);
+#define bfd_get_elt_at_index(b,i) BFD_SEND (b, _bfd_get_elt_at_index, (b,i))
+  bfd *       (*_bfd_get_elt_at_index) (bfd *, symindex);
+  int         (*_bfd_stat_arch_elt) (bfd *, struct stat *);
+  bfd_boolean (*_bfd_update_armap_timestamp) (bfd *);
+
+  /* Entry points used for symbols.  */
+#define BFD_JUMP_TABLE_SYMBOLS(NAME) \
+  NAME##_get_symtab_upper_bound, \
+  NAME##_canonicalize_symtab, \
+  NAME##_make_empty_symbol, \
+  NAME##_print_symbol, \
+  NAME##_get_symbol_info, \
+  NAME##_bfd_is_local_label_name, \
+  NAME##_bfd_is_target_special_symbol, \
+  NAME##_get_lineno, \
+  NAME##_find_nearest_line, \
+  _bfd_generic_find_line, \
+  NAME##_find_inliner_info, \
+  NAME##_bfd_make_debug_symbol, \
+  NAME##_read_minisymbols, \
+  NAME##_minisymbol_to_symbol
+
+  long        (*_bfd_get_symtab_upper_bound) (bfd *);
+  long        (*_bfd_canonicalize_symtab)
+    (bfd *, struct bfd_symbol **);
+  struct bfd_symbol *
+              (*_bfd_make_empty_symbol) (bfd *);
+  void        (*_bfd_print_symbol)
+    (bfd *, void *, struct bfd_symbol *, bfd_print_symbol_type);
+#define bfd_print_symbol(b,p,s,e) BFD_SEND (b, _bfd_print_symbol, (b,p,s,e))
+  void        (*_bfd_get_symbol_info)
+    (bfd *, struct bfd_symbol *, symbol_info *);
+#define bfd_get_symbol_info(b,p,e) BFD_SEND (b, _bfd_get_symbol_info, (b,p,e))
+  bfd_boolean (*_bfd_is_local_label_name) (bfd *, const char *);
+  bfd_boolean (*_bfd_is_target_special_symbol) (bfd *, asymbol *);
+  alent *     (*_get_lineno) (bfd *, struct bfd_symbol *);
+  bfd_boolean (*_bfd_find_nearest_line)
+    (bfd *, struct bfd_section *, struct bfd_symbol **, bfd_vma,
+     const char **, const char **, unsigned int *);
+  bfd_boolean (*_bfd_find_line)
+    (bfd *, struct bfd_symbol **, struct bfd_symbol *,
+     const char **, unsigned int *);
+  bfd_boolean (*_bfd_find_inliner_info)
+    (bfd *, const char **, const char **, unsigned int *);
+ /* Back-door to allow format-aware applications to create debug symbols
+    while using BFD for everything else.  Currently used by the assembler
+    when creating COFF files.  */
+  asymbol *   (*_bfd_make_debug_symbol)
+    (bfd *, void *, unsigned long size);
+#define bfd_read_minisymbols(b, d, m, s) \
+  BFD_SEND (b, _read_minisymbols, (b, d, m, s))
+  long        (*_read_minisymbols)
+    (bfd *, bfd_boolean, void **, unsigned int *);
+#define bfd_minisymbol_to_symbol(b, d, m, f) \
+  BFD_SEND (b, _minisymbol_to_symbol, (b, d, m, f))
+  asymbol *   (*_minisymbol_to_symbol)
+    (bfd *, bfd_boolean, const void *, asymbol *);
+
+  /* Routines for relocs.  */
+#define BFD_JUMP_TABLE_RELOCS(NAME) \
+  NAME##_get_reloc_upper_bound, \
+  NAME##_canonicalize_reloc, \
+  NAME##_bfd_reloc_type_lookup, \
+  NAME##_bfd_reloc_name_lookup
+
+  long        (*_get_reloc_upper_bound) (bfd *, sec_ptr);
+  long        (*_bfd_canonicalize_reloc)
+    (bfd *, sec_ptr, arelent **, struct bfd_symbol **);
+  /* See documentation on reloc types.  */
+  reloc_howto_type *
+              (*reloc_type_lookup) (bfd *, bfd_reloc_code_real_type);
+  reloc_howto_type *
+              (*reloc_name_lookup) (bfd *, const char *);
+
+
+  /* Routines used when writing an object file.  */
+#define BFD_JUMP_TABLE_WRITE(NAME) \
+  NAME##_set_arch_mach, \
+  NAME##_set_section_contents
+
+  bfd_boolean (*_bfd_set_arch_mach)
+    (bfd *, enum bfd_architecture, unsigned long);
+  bfd_boolean (*_bfd_set_section_contents)
+    (bfd *, sec_ptr, const void *, file_ptr, bfd_size_type);
+
+  /* Routines used by the linker.  */
+#define BFD_JUMP_TABLE_LINK(NAME) \
+  NAME##_sizeof_headers, \
+  NAME##_bfd_get_relocated_section_contents, \
+  NAME##_bfd_relax_section, \
+  NAME##_bfd_link_hash_table_create, \
+  NAME##_bfd_link_hash_table_free, \
+  NAME##_bfd_link_add_symbols, \
+  NAME##_bfd_link_just_syms, \
+  NAME##_bfd_copy_link_hash_symbol_type, \
+  NAME##_bfd_final_link, \
+  NAME##_bfd_link_split_section, \
+  NAME##_bfd_gc_sections, \
+  NAME##_bfd_lookup_section_flags, \
+  NAME##_bfd_merge_sections, \
+  NAME##_bfd_is_group_section, \
+  NAME##_bfd_discard_group, \
+  NAME##_section_already_linked, \
+  NAME##_bfd_define_common_symbol
+
+  int         (*_bfd_sizeof_headers) (bfd *, struct bfd_link_info *);
+  bfd_byte *  (*_bfd_get_relocated_section_contents)
+    (bfd *, struct bfd_link_info *, struct bfd_link_order *,
+     bfd_byte *, bfd_boolean, struct bfd_symbol **);
+
+  bfd_boolean (*_bfd_relax_section)
+    (bfd *, struct bfd_section *, struct bfd_link_info *, bfd_boolean *);
+
+  /* Create a hash table for the linker.  Different backends store
+     different information in this table.  */
+  struct bfd_link_hash_table *
+              (*_bfd_link_hash_table_create) (bfd *);
+
+  /* Release the memory associated with the linker hash table.  */
+  void        (*_bfd_link_hash_table_free) (struct bfd_link_hash_table *);
+
+  /* Add symbols from this object file into the hash table.  */
+  bfd_boolean (*_bfd_link_add_symbols) (bfd *, struct bfd_link_info *);
+
+  /* Indicate that we are only retrieving symbol values from this section.  */
+  void        (*_bfd_link_just_syms) (asection *, struct bfd_link_info *);
+
+  /* Copy the symbol type of a linker hash table entry.  */
+#define bfd_copy_link_hash_symbol_type(b, t, f) \
+  BFD_SEND (b, _bfd_copy_link_hash_symbol_type, (b, t, f))
+  void (*_bfd_copy_link_hash_symbol_type)
+    (bfd *, struct bfd_link_hash_entry *, struct bfd_link_hash_entry *);
+
+  /* Do a link based on the link_order structures attached to each
+     section of the BFD.  */
+  bfd_boolean (*_bfd_final_link) (bfd *, struct bfd_link_info *);
+
+  /* Should this section be split up into smaller pieces during linking.  */
+  bfd_boolean (*_bfd_link_split_section) (bfd *, struct bfd_section *);
+
+  /* Remove sections that are not referenced from the output.  */
+  bfd_boolean (*_bfd_gc_sections) (bfd *, struct bfd_link_info *);
+
+  /* Sets the bitmask of allowed and disallowed section flags.  */
+  void (*_bfd_lookup_section_flags) (struct bfd_link_info *,
+                                     struct flag_info *);
+
+  /* Attempt to merge SEC_MERGE sections.  */
+  bfd_boolean (*_bfd_merge_sections) (bfd *, struct bfd_link_info *);
+
+  /* Is this section a member of a group?  */
+  bfd_boolean (*_bfd_is_group_section) (bfd *, const struct bfd_section *);
+
+  /* Discard members of a group.  */
+  bfd_boolean (*_bfd_discard_group) (bfd *, struct bfd_section *);
+
+  /* Check if SEC has been already linked during a reloceatable or
+     final link.  */
+  bfd_boolean (*_section_already_linked) (bfd *, asection *,
+                                          struct bfd_link_info *);
+
+  /* Define a common symbol.  */
+  bfd_boolean (*_bfd_define_common_symbol) (bfd *, struct bfd_link_info *,
+                                            struct bfd_link_hash_entry *);
+
+  /* Routines to handle dynamic symbols and relocs.  */
+#define BFD_JUMP_TABLE_DYNAMIC(NAME) \
+  NAME##_get_dynamic_symtab_upper_bound, \
+  NAME##_canonicalize_dynamic_symtab, \
+  NAME##_get_synthetic_symtab, \
+  NAME##_get_dynamic_reloc_upper_bound, \
+  NAME##_canonicalize_dynamic_reloc
+
+  /* Get the amount of memory required to hold the dynamic symbols.  */
+  long        (*_bfd_get_dynamic_symtab_upper_bound) (bfd *);
+  /* Read in the dynamic symbols.  */
+  long        (*_bfd_canonicalize_dynamic_symtab)
+    (bfd *, struct bfd_symbol **);
+  /* Create synthetized symbols.  */
+  long        (*_bfd_get_synthetic_symtab)
+    (bfd *, long, struct bfd_symbol **, long, struct bfd_symbol **,
+     struct bfd_symbol **);
+  /* Get the amount of memory required to hold the dynamic relocs.  */
+  long        (*_bfd_get_dynamic_reloc_upper_bound) (bfd *);
+  /* Read in the dynamic relocs.  */
+  long        (*_bfd_canonicalize_dynamic_reloc)
+    (bfd *, arelent **, struct bfd_symbol **);
+
+  /* Opposite endian version of this target.  */
+  const struct bfd_target * alternative_target;
+
+  /* Data for use by back-end routines, which isn't
+     generic enough to belong in this structure.  */
+  const void *backend_data;
+
+} bfd_target;
+
+bfd_boolean bfd_set_default_target (const char *name);
+
+const bfd_target *bfd_find_target (const char *target_name, bfd *abfd);
+
+const bfd_target *bfd_get_target_info (const char *target_name,
+    bfd *abfd,
+    bfd_boolean *is_bigendian,
+    int *underscoring,
+    const char **def_target_arch);
+const char ** bfd_target_list (void);
+
+const bfd_target *bfd_search_for_target
+   (int (*search_func) (const bfd_target *, void *),
+    void *);
+
+/* Extracted from format.c.  */
+bfd_boolean bfd_check_format (bfd *abfd, bfd_format format);
+
+bfd_boolean bfd_check_format_matches
+   (bfd *abfd, bfd_format format, char ***matching);
+
+bfd_boolean bfd_set_format (bfd *abfd, bfd_format format);
+
+const char *bfd_format_string (bfd_format format);
+
+/* Extracted from linker.c.  */
+bfd_boolean bfd_link_split_section (bfd *abfd, asection *sec);
+
+#define bfd_link_split_section(abfd, sec) \
+       BFD_SEND (abfd, _bfd_link_split_section, (abfd, sec))
+
+bfd_boolean bfd_section_already_linked (bfd *abfd,
+    asection *sec,
+    struct bfd_link_info *info);
+
+#define bfd_section_already_linked(abfd, sec, info) \
+       BFD_SEND (abfd, _section_already_linked, (abfd, sec, info))
+
+bfd_boolean bfd_generic_define_common_symbol
+   (bfd *output_bfd, struct bfd_link_info *info,
+    struct bfd_link_hash_entry *h);
+
+#define bfd_define_common_symbol(output_bfd, info, h) \
+       BFD_SEND (output_bfd, _bfd_define_common_symbol, (output_bfd, info, h))
+
+struct bfd_elf_version_tree * bfd_find_version_for_sym
+   (struct bfd_elf_version_tree *verdefs,
+    const char *sym_name, bfd_boolean *hide);
+
+bfd_boolean bfd_hide_sym_by_version
+   (struct bfd_elf_version_tree *verdefs, const char *sym_name);
+
+/* Extracted from simple.c.  */
+bfd_byte *bfd_simple_get_relocated_section_contents
+   (bfd *abfd, asection *sec, bfd_byte *outbuf, asymbol **symbol_table);
+
+/* Extracted from compress.c.  */
+bfd_boolean bfd_compress_section_contents
+   (bfd *abfd, asection *section, bfd_byte *uncompressed_buffer,
+    bfd_size_type uncompressed_size);
+
+bfd_boolean bfd_get_full_section_contents
+   (bfd *abfd, asection *section, bfd_byte **ptr);
+
+bfd_boolean bfd_is_section_compressed
+   (bfd *abfd, asection *section);
+
+bfd_boolean bfd_init_section_decompress_status
+   (bfd *abfd, asection *section);
+
+bfd_boolean bfd_init_section_compress_status
+   (bfd *abfd, asection *section);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/bfd.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/bfd.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/bfd.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/bfd.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1942 @@
+/* Generic BFD library interface and support routines.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/*
+SECTION
+	<<typedef bfd>>
+
+	A BFD has type <<bfd>>; objects of this type are the
+	cornerstone of any application using BFD. Using BFD
+	consists of making references though the BFD and to data in the BFD.
+
+	Here is the structure that defines the type <<bfd>>.  It
+	contains the major data about the file and pointers
+	to the rest of the data.
+
+CODE_FRAGMENT
+.
+.enum bfd_direction
+.  {
+.    no_direction = 0,
+.    read_direction = 1,
+.    write_direction = 2,
+.    both_direction = 3
+.  };
+.
+.struct bfd
+.{
+.  {* A unique identifier of the BFD  *}
+.  unsigned int id;
+.
+.  {* The filename the application opened the BFD with.  *}
+.  const char *filename;
+.
+.  {* A pointer to the target jump table.  *}
+.  const struct bfd_target *xvec;
+.
+.  {* The IOSTREAM, and corresponding IO vector that provide access
+.     to the file backing the BFD.  *}
+.  void *iostream;
+.  const struct bfd_iovec *iovec;
+.
+.  {* The caching routines use these to maintain a
+.     least-recently-used list of BFDs.  *}
+.  struct bfd *lru_prev, *lru_next;
+.
+.  {* When a file is closed by the caching routines, BFD retains
+.     state information on the file here...  *}
+.  ufile_ptr where;
+.
+.  {* File modified time, if mtime_set is TRUE.  *}
+.  long mtime;
+.
+.  {* Reserved for an unimplemented file locking extension.  *}
+.  int ifd;
+.
+.  {* The format which belongs to the BFD. (object, core, etc.)  *}
+.  bfd_format format;
+.
+.  {* The direction with which the BFD was opened.  *}
+.  enum bfd_direction direction;
+.
+.  {* Format_specific flags.  *}
+.  flagword flags;
+.
+.  {* Values that may appear in the flags field of a BFD.  These also
+.     appear in the object_flags field of the bfd_target structure, where
+.     they indicate the set of flags used by that backend (not all flags
+.     are meaningful for all object file formats) (FIXME: at the moment,
+.     the object_flags values have mostly just been copied from backend
+.     to another, and are not necessarily correct).  *}
+.
+.#define BFD_NO_FLAGS	0x00
+.
+.  {* BFD contains relocation entries.  *}
+.#define HAS_RELOC   	0x01
+.
+.  {* BFD is directly executable.  *}
+.#define EXEC_P      	0x02
+.
+.  {* BFD has line number information (basically used for F_LNNO in a
+.     COFF header).  *}
+.#define HAS_LINENO  	0x04
+.
+.  {* BFD has debugging information.  *}
+.#define HAS_DEBUG   	0x08
+.
+.  {* BFD has symbols.  *}
+.#define HAS_SYMS    	0x10
+.
+.  {* BFD has local symbols (basically used for F_LSYMS in a COFF
+.     header).  *}
+.#define HAS_LOCALS  	0x20
+.
+.  {* BFD is a dynamic object.  *}
+.#define DYNAMIC     	0x40
+.
+.  {* Text section is write protected (if D_PAGED is not set, this is
+.     like an a.out NMAGIC file) (the linker sets this by default, but
+.     clears it for -r or -N).  *}
+.#define WP_TEXT     	0x80
+.
+.  {* BFD is dynamically paged (this is like an a.out ZMAGIC file) (the
+.     linker sets this by default, but clears it for -r or -n or -N).  *}
+.#define D_PAGED     	0x100
+.
+.  {* BFD is relaxable (this means that bfd_relax_section may be able to
+.     do something) (sometimes bfd_relax_section can do something even if
+.     this is not set).  *}
+.#define BFD_IS_RELAXABLE 0x200
+.
+.  {* This may be set before writing out a BFD to request using a
+.     traditional format.  For example, this is used to request that when
+.     writing out an a.out object the symbols not be hashed to eliminate
+.     duplicates.  *}
+.#define BFD_TRADITIONAL_FORMAT 0x400
+.
+.  {* This flag indicates that the BFD contents are actually cached
+.     in memory.  If this is set, iostream points to a bfd_in_memory
+.     struct.  *}
+.#define BFD_IN_MEMORY 0x800
+.
+.  {* The sections in this BFD specify a memory page.  *}
+.#define HAS_LOAD_PAGE 0x1000
+.
+.  {* This BFD has been created by the linker and doesn't correspond
+.     to any input file.  *}
+.#define BFD_LINKER_CREATED 0x2000
+.
+.  {* This may be set before writing out a BFD to request that it
+.     be written using values for UIDs, GIDs, timestamps, etc. that
+.     will be consistent from run to run.  *}
+.#define BFD_DETERMINISTIC_OUTPUT 0x4000
+.
+.  {* Compress sections in this BFD.  *}
+.#define BFD_COMPRESS 0x8000
+.
+.  {* Decompress sections in this BFD.  *}
+.#define BFD_DECOMPRESS 0x10000
+.
+.  {* BFD is a dummy, for plugins.  *}
+.#define BFD_PLUGIN 0x20000
+.
+.  {* Flags bits to be saved in bfd_preserve_save.  *}
+.#define BFD_FLAGS_SAVED \
+.  (BFD_IN_MEMORY | BFD_COMPRESS | BFD_DECOMPRESS | BFD_PLUGIN)
+.
+.  {* Flags bits which are for BFD use only.  *}
+.#define BFD_FLAGS_FOR_BFD_USE_MASK \
+.  (BFD_IN_MEMORY | BFD_COMPRESS | BFD_DECOMPRESS | BFD_LINKER_CREATED \
+.   | BFD_PLUGIN | BFD_TRADITIONAL_FORMAT | BFD_DETERMINISTIC_OUTPUT)
+.
+.  {* Currently my_archive is tested before adding origin to
+.     anything. I believe that this can become always an add of
+.     origin, with origin set to 0 for non archive files.  *}
+.  ufile_ptr origin;
+.
+.  {* The origin in the archive of the proxy entry.  This will
+.     normally be the same as origin, except for thin archives,
+.     when it will contain the current offset of the proxy in the
+.     thin archive rather than the offset of the bfd in its actual
+.     container.  *}
+.  ufile_ptr proxy_origin;
+.
+.  {* A hash table for section names.  *}
+.  struct bfd_hash_table section_htab;
+.
+.  {* Pointer to linked list of sections.  *}
+.  struct bfd_section *sections;
+.
+.  {* The last section on the section list.  *}
+.  struct bfd_section *section_last;
+.
+.  {* The number of sections.  *}
+.  unsigned int section_count;
+.
+.  {* Stuff only useful for object files:
+.     The start address.  *}
+.  bfd_vma start_address;
+.
+.  {* Used for input and output.  *}
+.  unsigned int symcount;
+.
+.  {* Symbol table for output BFD (with symcount entries).
+.     Also used by the linker to cache input BFD symbols.  *}
+.  struct bfd_symbol  **outsymbols;
+.
+.  {* Used for slurped dynamic symbol tables.  *}
+.  unsigned int dynsymcount;
+.
+.  {* Pointer to structure which contains architecture information.  *}
+.  const struct bfd_arch_info *arch_info;
+.
+.  {* Stuff only useful for archives.  *}
+.  void *arelt_data;
+.  struct bfd *my_archive;      {* The containing archive BFD.  *}
+.  struct bfd *archive_next;    {* The next BFD in the archive.  *}
+.  struct bfd *archive_head;    {* The first BFD in the archive.  *}
+.  struct bfd *nested_archives; {* List of nested archive in a flattened
+.                                  thin archive.  *}
+.
+.  {* A chain of BFD structures involved in a link.  *}
+.  struct bfd *link_next;
+.
+.  {* A field used by _bfd_generic_link_add_archive_symbols.  This will
+.     be used only for archive elements.  *}
+.  int archive_pass;
+.
+.  {* Used by the back end to hold private data.  *}
+.  union
+.    {
+.      struct aout_data_struct *aout_data;
+.      struct artdata *aout_ar_data;
+.      struct _oasys_data *oasys_obj_data;
+.      struct _oasys_ar_data *oasys_ar_data;
+.      struct coff_tdata *coff_obj_data;
+.      struct pe_tdata *pe_obj_data;
+.      struct xcoff_tdata *xcoff_obj_data;
+.      struct ecoff_tdata *ecoff_obj_data;
+.      struct ieee_data_struct *ieee_data;
+.      struct ieee_ar_data_struct *ieee_ar_data;
+.      struct srec_data_struct *srec_data;
+.      struct verilog_data_struct *verilog_data;
+.      struct ihex_data_struct *ihex_data;
+.      struct tekhex_data_struct *tekhex_data;
+.      struct elf_obj_tdata *elf_obj_data;
+.      struct nlm_obj_tdata *nlm_obj_data;
+.      struct bout_data_struct *bout_data;
+.      struct mmo_data_struct *mmo_data;
+.      struct sun_core_struct *sun_core_data;
+.      struct sco5_core_struct *sco5_core_data;
+.      struct trad_core_struct *trad_core_data;
+.      struct som_data_struct *som_data;
+.      struct hpux_core_struct *hpux_core_data;
+.      struct hppabsd_core_struct *hppabsd_core_data;
+.      struct sgi_core_struct *sgi_core_data;
+.      struct lynx_core_struct *lynx_core_data;
+.      struct osf_core_struct *osf_core_data;
+.      struct cisco_core_struct *cisco_core_data;
+.      struct versados_data_struct *versados_data;
+.      struct netbsd_core_struct *netbsd_core_data;
+.      struct mach_o_data_struct *mach_o_data;
+.      struct mach_o_fat_data_struct *mach_o_fat_data;
+.      struct plugin_data_struct *plugin_data;
+.      struct bfd_pef_data_struct *pef_data;
+.      struct bfd_pef_xlib_data_struct *pef_xlib_data;
+.      struct bfd_sym_data_struct *sym_data;
+.      struct asxxxx_data_struct *asxxxx_data;
+.      void *any;
+.    }
+.  tdata;
+.
+.  {* Used by the application to hold private data.  *}
+.  void *usrdata;
+.
+.  {* Where all the allocated stuff under this BFD goes.  This is a
+.     struct objalloc *, but we use void * to avoid requiring the inclusion
+.     of objalloc.h.  *}
+.  void *memory;
+.
+.  {* Is the file descriptor being cached?  That is, can it be closed as
+.     needed, and re-opened when accessed later?  *}
+.  unsigned int cacheable : 1;
+.
+.  {* Marks whether there was a default target specified when the
+.     BFD was opened. This is used to select which matching algorithm
+.     to use to choose the back end.  *}
+.  unsigned int target_defaulted : 1;
+.
+.  {* ... and here: (``once'' means at least once).  *}
+.  unsigned int opened_once : 1;
+.
+.  {* Set if we have a locally maintained mtime value, rather than
+.     getting it from the file each time.  *}
+.  unsigned int mtime_set : 1;
+.
+.  {* Flag set if symbols from this BFD should not be exported.  *}
+.  unsigned int no_export : 1;
+.
+.  {* Remember when output has begun, to stop strange things
+.     from happening.  *}
+.  unsigned int output_has_begun : 1;
+.
+.  {* Have archive map.  *}
+.  unsigned int has_armap : 1;
+.
+.  {* Set if this is a thin archive.  *}
+.  unsigned int is_thin_archive : 1;
+.
+.  {* Set if only required symbols should be added in the link hash table for
+.     this object.  Used by VMS linkers.  *}
+.  unsigned int selective_search : 1;
+.};
+.
+*/
+
+#include "sysdep.h"
+#include <stdarg.h>
+#include "bfd.h"
+#include "bfdver.h"
+#include "libiberty.h"
+#include "demangle.h"
+#include "safe-ctype.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "coff/internal.h"
+#include "coff/sym.h"
+#include "libcoff.h"
+#include "libecoff.h"
+#undef obj_symbols
+#include "elf-bfd.h"
+
+#ifndef EXIT_FAILURE
+#define EXIT_FAILURE 1
+#endif
+
+
+/* provide storage for subsystem, stack and heap data which may have been
+   passed in on the command line.  Ld puts this data into a bfd_link_info
+   struct which ultimately gets passed in to the bfd.  When it arrives, copy
+   it to the following struct so that the data will be available in coffcode.h
+   where it is needed.  The typedef's used are defined in bfd.h */
+
+/*
+SECTION
+	Error reporting
+
+	Most BFD functions return nonzero on success (check their
+	individual documentation for precise semantics).  On an error,
+	they call <<bfd_set_error>> to set an error condition that callers
+	can check by calling <<bfd_get_error>>.
+        If that returns <<bfd_error_system_call>>, then check
+	<<errno>>.
+
+	The easiest way to report a BFD error to the user is to
+	use <<bfd_perror>>.
+
+SUBSECTION
+	Type <<bfd_error_type>>
+
+	The values returned by <<bfd_get_error>> are defined by the
+	enumerated type <<bfd_error_type>>.
+
+CODE_FRAGMENT
+.
+.typedef enum bfd_error
+.{
+.  bfd_error_no_error = 0,
+.  bfd_error_system_call,
+.  bfd_error_invalid_target,
+.  bfd_error_wrong_format,
+.  bfd_error_wrong_object_format,
+.  bfd_error_invalid_operation,
+.  bfd_error_no_memory,
+.  bfd_error_no_symbols,
+.  bfd_error_no_armap,
+.  bfd_error_no_more_archived_files,
+.  bfd_error_malformed_archive,
+.  bfd_error_file_not_recognized,
+.  bfd_error_file_ambiguously_recognized,
+.  bfd_error_no_contents,
+.  bfd_error_nonrepresentable_section,
+.  bfd_error_no_debug_section,
+.  bfd_error_bad_value,
+.  bfd_error_file_truncated,
+.  bfd_error_file_too_big,
+.  bfd_error_on_input,
+.  bfd_error_invalid_error_code
+.}
+.bfd_error_type;
+.
+*/
+
+static bfd_error_type bfd_error = bfd_error_no_error;
+static bfd *input_bfd = NULL;
+static bfd_error_type input_error = bfd_error_no_error;
+
+const char *const bfd_errmsgs[] =
+{
+  N_("No error"),
+  N_("System call error"),
+  N_("Invalid bfd target"),
+  N_("File in wrong format"),
+  N_("Archive object file in wrong format"),
+  N_("Invalid operation"),
+  N_("Memory exhausted"),
+  N_("No symbols"),
+  N_("Archive has no index; run ranlib to add one"),
+  N_("No more archived files"),
+  N_("Malformed archive"),
+  N_("File format not recognized"),
+  N_("File format is ambiguous"),
+  N_("Section has no contents"),
+  N_("Nonrepresentable section on output"),
+  N_("Symbol needs debug section which does not exist"),
+  N_("Bad value"),
+  N_("File truncated"),
+  N_("File too big"),
+  N_("Error reading %s: %s"),
+  N_("#<Invalid error code>")
+};
+
+/*
+FUNCTION
+	bfd_get_error
+
+SYNOPSIS
+	bfd_error_type bfd_get_error (void);
+
+DESCRIPTION
+	Return the current BFD error condition.
+*/
+
+bfd_error_type
+bfd_get_error (void)
+{
+  return bfd_error;
+}
+
+/*
+FUNCTION
+	bfd_set_error
+
+SYNOPSIS
+	void bfd_set_error (bfd_error_type error_tag, ...);
+
+DESCRIPTION
+	Set the BFD error condition to be @var{error_tag}.
+	If @var{error_tag} is bfd_error_on_input, then this function
+	takes two more parameters, the input bfd where the error
+	occurred, and the bfd_error_type error.
+*/
+
+void
+bfd_set_error (bfd_error_type error_tag, ...)
+{
+  bfd_error = error_tag;
+  if (error_tag == bfd_error_on_input)
+    {
+      /* This is an error that occurred during bfd_close when
+	 writing an archive, but on one of the input files.  */
+      va_list ap;
+
+      va_start (ap, error_tag);
+      input_bfd = va_arg (ap, bfd *);
+      input_error = (bfd_error_type) va_arg (ap, int);
+      if (input_error >= bfd_error_on_input)
+	abort ();
+      va_end (ap);
+    }
+}
+
+/*
+FUNCTION
+	bfd_errmsg
+
+SYNOPSIS
+	const char *bfd_errmsg (bfd_error_type error_tag);
+
+DESCRIPTION
+	Return a string describing the error @var{error_tag}, or
+	the system error if @var{error_tag} is <<bfd_error_system_call>>.
+*/
+
+const char *
+bfd_errmsg (bfd_error_type error_tag)
+{
+#ifndef errno
+  extern int errno;
+#endif
+  if (error_tag == bfd_error_on_input)
+    {
+      char *buf;
+      const char *msg = bfd_errmsg (input_error);
+
+      if (asprintf (&buf, _(bfd_errmsgs [error_tag]), input_bfd->filename, msg)
+	  != -1)
+	return buf;
+
+      /* Ick, what to do on out of memory?  */
+      return msg;
+    }
+
+  if (error_tag == bfd_error_system_call)
+    return xstrerror (errno);
+
+  if (error_tag > bfd_error_invalid_error_code)
+    error_tag = bfd_error_invalid_error_code;	/* sanity check */
+
+  return _(bfd_errmsgs [error_tag]);
+}
+
+/*
+FUNCTION
+	bfd_perror
+
+SYNOPSIS
+	void bfd_perror (const char *message);
+
+DESCRIPTION
+	Print to the standard error stream a string describing the
+	last BFD error that occurred, or the last system error if
+	the last BFD error was a system call failure.  If @var{message}
+	is non-NULL and non-empty, the error string printed is preceded
+	by @var{message}, a colon, and a space.  It is followed by a newline.
+*/
+
+void
+bfd_perror (const char *message)
+{
+  fflush (stdout);
+  if (message == NULL || *message == '\0')
+    fprintf (stderr, "%s\n", bfd_errmsg (bfd_get_error ()));
+  else
+    fprintf (stderr, "%s: %s\n", message, bfd_errmsg (bfd_get_error ()));
+  fflush (stderr);
+}
+
+/*
+SUBSECTION
+	BFD error handler
+
+	Some BFD functions want to print messages describing the
+	problem.  They call a BFD error handler function.  This
+	function may be overridden by the program.
+
+	The BFD error handler acts like printf.
+
+CODE_FRAGMENT
+.
+.typedef void (*bfd_error_handler_type) (const char *, ...);
+.
+*/
+
+/* The program name used when printing BFD error messages.  */
+
+static const char *_bfd_error_program_name;
+
+/* This is the default routine to handle BFD error messages.
+   Like fprintf (stderr, ...), but also handles some extra format specifiers.
+
+   %A section name from section.  For group components, print group name too.
+   %B file name from bfd.  For archive components, prints archive too.
+
+   Note - because these two extra format specifiers require special handling
+   they are scanned for and processed in this function, before calling
+   vfprintf.  This means that the *arguments* for these format specifiers
+   must be the first ones in the variable argument list, regardless of where
+   the specifiers appear in the format string.  Thus for example calling
+   this function with a format string of:
+
+      "blah %s blah %A blah %d blah %B"
+
+   would involve passing the arguments as:
+
+      "blah %s blah %A blah %d blah %B",
+        asection_for_the_%A,
+	bfd_for_the_%B,
+	string_for_the_%s,
+	integer_for_the_%d);
+ */
+
+void
+_bfd_default_error_handler (const char *fmt, ...)
+{
+  va_list ap;
+  char *bufp;
+  const char *new_fmt, *p;
+  size_t avail = 1000;
+  char buf[1000];
+
+  /* PR 4992: Don't interrupt output being sent to stdout.  */
+  fflush (stdout);
+
+  if (_bfd_error_program_name != NULL)
+    fprintf (stderr, "%s: ", _bfd_error_program_name);
+  else
+    fprintf (stderr, "BFD: ");
+
+  va_start (ap, fmt);
+  new_fmt = fmt;
+  bufp = buf;
+
+  /* Reserve enough space for the existing format string.  */
+  avail -= strlen (fmt) + 1;
+  if (avail > 1000)
+    _exit (EXIT_FAILURE);
+
+  p = fmt;
+  while (1)
+    {
+      char *q;
+      size_t len, extra, trim;
+
+      p = strchr (p, '%');
+      if (p == NULL || p[1] == '\0')
+	{
+	  if (new_fmt == buf)
+	    {
+	      len = strlen (fmt);
+	      memcpy (bufp, fmt, len + 1);
+	    }
+	  break;
+	}
+
+      if (p[1] == 'A' || p[1] == 'B')
+	{
+	  len = p - fmt;
+	  memcpy (bufp, fmt, len);
+	  bufp += len;
+	  fmt = p + 2;
+	  new_fmt = buf;
+
+	  /* If we run out of space, tough, you lose your ridiculously
+	     long file or section name.  It's not safe to try to alloc
+	     memory here;  We might be printing an out of memory message.  */
+	  if (avail == 0)
+	    {
+	      *bufp++ = '*';
+	      *bufp++ = '*';
+	      *bufp = '\0';
+	    }
+	  else
+	    {
+	      if (p[1] == 'B')
+		{
+		  bfd *abfd = va_arg (ap, bfd *);
+
+		  if (abfd == NULL)
+		    /* Invoking %B with a null bfd pointer is an internal error.  */
+		    abort ();
+		  else if (abfd->my_archive)
+		    snprintf (bufp, avail, "%s(%s)",
+			      abfd->my_archive->filename, abfd->filename);
+		  else
+		    snprintf (bufp, avail, "%s", abfd->filename);
+		}
+	      else
+		{
+		  asection *sec = va_arg (ap, asection *);
+		  bfd *abfd;
+		  const char *group = NULL;
+		  struct coff_comdat_info *ci;
+
+		  if (sec == NULL)
+		    /* Invoking %A with a null section pointer is an internal error.  */
+		    abort ();
+		  abfd = sec->owner;
+		  if (abfd != NULL
+		      && bfd_get_flavour (abfd) == bfd_target_elf_flavour
+		      && elf_next_in_group (sec) != NULL
+		      && (sec->flags & SEC_GROUP) == 0)
+		    group = elf_group_name (sec);
+		  else if (abfd != NULL
+			   && bfd_get_flavour (abfd) == bfd_target_coff_flavour
+			   && (ci = bfd_coff_get_comdat_section (sec->owner,
+								 sec)) != NULL)
+		    group = ci->name;
+		  if (group != NULL)
+		    snprintf (bufp, avail, "%s[%s]", sec->name, group);
+		  else
+		    snprintf (bufp, avail, "%s", sec->name);
+		}
+	      len = strlen (bufp);
+	      avail = avail - len + 2;
+
+	      /* We need to replace any '%' we printed by "%%".
+		 First count how many.  */
+	      q = bufp;
+	      bufp += len;
+	      extra = 0;
+	      while ((q = strchr (q, '%')) != NULL)
+		{
+		  ++q;
+		  ++extra;
+		}
+
+	      /* If there isn't room, trim off the end of the string.  */
+	      q = bufp;
+	      bufp += extra;
+	      if (extra > avail)
+		{
+		  trim = extra - avail;
+		  bufp -= trim;
+		  do
+		    {
+		      if (*--q == '%')
+			--extra;
+		    }
+		  while (--trim != 0);
+		  *q = '\0';
+		  avail = extra;
+		}
+	      avail -= extra;
+
+	      /* Now double all '%' chars, shuffling the string as we go.  */
+	      while (extra != 0)
+		{
+		  while ((q[extra] = *q) != '%')
+		    --q;
+		  q[--extra] = '%';
+		  --q;
+		}
+	    }
+	}
+      p = p + 2;
+    }
+
+  vfprintf (stderr, new_fmt, ap);
+  va_end (ap);
+
+  putc ('\n', stderr);
+  fflush (stderr);
+}
+
+/* This is a function pointer to the routine which should handle BFD
+   error messages.  It is called when a BFD routine encounters an
+   error for which it wants to print a message.  Going through a
+   function pointer permits a program linked against BFD to intercept
+   the messages and deal with them itself.  */
+
+bfd_error_handler_type _bfd_error_handler = _bfd_default_error_handler;
+
+/*
+FUNCTION
+	bfd_set_error_handler
+
+SYNOPSIS
+	bfd_error_handler_type bfd_set_error_handler (bfd_error_handler_type);
+
+DESCRIPTION
+	Set the BFD error handler function.  Returns the previous
+	function.
+*/
+
+bfd_error_handler_type
+bfd_set_error_handler (bfd_error_handler_type pnew)
+{
+  bfd_error_handler_type pold;
+
+  pold = _bfd_error_handler;
+  _bfd_error_handler = pnew;
+  return pold;
+}
+
+/*
+FUNCTION
+	bfd_set_error_program_name
+
+SYNOPSIS
+	void bfd_set_error_program_name (const char *);
+
+DESCRIPTION
+	Set the program name to use when printing a BFD error.  This
+	is printed before the error message followed by a colon and
+	space.  The string must not be changed after it is passed to
+	this function.
+*/
+
+void
+bfd_set_error_program_name (const char *name)
+{
+  _bfd_error_program_name = name;
+}
+
+/*
+FUNCTION
+	bfd_get_error_handler
+
+SYNOPSIS
+	bfd_error_handler_type bfd_get_error_handler (void);
+
+DESCRIPTION
+	Return the BFD error handler function.
+*/
+
+bfd_error_handler_type
+bfd_get_error_handler (void)
+{
+  return _bfd_error_handler;
+}
+
+/*
+SECTION
+	Miscellaneous
+
+SUBSECTION
+	Miscellaneous functions
+*/
+
+/*
+FUNCTION
+	bfd_get_reloc_upper_bound
+
+SYNOPSIS
+	long bfd_get_reloc_upper_bound (bfd *abfd, asection *sect);
+
+DESCRIPTION
+	Return the number of bytes required to store the
+	relocation information associated with section @var{sect}
+	attached to bfd @var{abfd}.  If an error occurs, return -1.
+
+*/
+
+long
+bfd_get_reloc_upper_bound (bfd *abfd, sec_ptr asect)
+{
+  if (abfd->format != bfd_object)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return -1;
+    }
+
+  return BFD_SEND (abfd, _get_reloc_upper_bound, (abfd, asect));
+}
+
+/*
+FUNCTION
+	bfd_canonicalize_reloc
+
+SYNOPSIS
+	long bfd_canonicalize_reloc
+	  (bfd *abfd, asection *sec, arelent **loc, asymbol **syms);
+
+DESCRIPTION
+	Call the back end associated with the open BFD
+	@var{abfd} and translate the external form of the relocation
+	information attached to @var{sec} into the internal canonical
+	form.  Place the table into memory at @var{loc}, which has
+	been preallocated, usually by a call to
+	<<bfd_get_reloc_upper_bound>>.  Returns the number of relocs, or
+	-1 on error.
+
+	The @var{syms} table is also needed for horrible internal magic
+	reasons.
+
+*/
+long
+bfd_canonicalize_reloc (bfd *abfd,
+			sec_ptr asect,
+			arelent **location,
+			asymbol **symbols)
+{
+  if (abfd->format != bfd_object)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return -1;
+    }
+
+  return BFD_SEND (abfd, _bfd_canonicalize_reloc,
+		   (abfd, asect, location, symbols));
+}
+
+/*
+FUNCTION
+	bfd_set_reloc
+
+SYNOPSIS
+	void bfd_set_reloc
+	  (bfd *abfd, asection *sec, arelent **rel, unsigned int count);
+
+DESCRIPTION
+	Set the relocation pointer and count within
+	section @var{sec} to the values @var{rel} and @var{count}.
+	The argument @var{abfd} is ignored.
+
+*/
+
+void
+bfd_set_reloc (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+	       sec_ptr asect,
+	       arelent **location,
+	       unsigned int count)
+{
+  asect->orelocation = location;
+  asect->reloc_count = count;
+}
+
+/*
+FUNCTION
+	bfd_set_file_flags
+
+SYNOPSIS
+	bfd_boolean bfd_set_file_flags (bfd *abfd, flagword flags);
+
+DESCRIPTION
+	Set the flag word in the BFD @var{abfd} to the value @var{flags}.
+
+	Possible errors are:
+	o <<bfd_error_wrong_format>> - The target bfd was not of object format.
+	o <<bfd_error_invalid_operation>> - The target bfd was open for reading.
+	o <<bfd_error_invalid_operation>> -
+	The flag word contained a bit which was not applicable to the
+	type of file.  E.g., an attempt was made to set the <<D_PAGED>> bit
+	on a BFD format which does not support demand paging.
+
+*/
+
+bfd_boolean
+bfd_set_file_flags (bfd *abfd, flagword flags)
+{
+  if (abfd->format != bfd_object)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+
+  if (bfd_read_p (abfd))
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  bfd_get_file_flags (abfd) = flags;
+  if ((flags & bfd_applicable_file_flags (abfd)) != flags)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+void
+bfd_assert (const char *file, int line)
+{
+  (*_bfd_error_handler) (_("BFD %s assertion fail %s:%d"),
+			 BFD_VERSION_STRING, file, line);
+}
+
+/* A more or less friendly abort message.  In libbfd.h abort is
+   defined to call this function.  */
+
+void
+_bfd_abort (const char *file, int line, const char *fn)
+{
+  if (fn != NULL)
+    (*_bfd_error_handler)
+      (_("BFD %s internal error, aborting at %s line %d in %s\n"),
+       BFD_VERSION_STRING, file, line, fn);
+  else
+    (*_bfd_error_handler)
+      (_("BFD %s internal error, aborting at %s line %d\n"),
+       BFD_VERSION_STRING, file, line);
+  (*_bfd_error_handler) (_("Please report this bug.\n"));
+  _exit (EXIT_FAILURE);
+}
+
+/*
+FUNCTION
+	bfd_get_arch_size
+
+SYNOPSIS
+ 	int bfd_get_arch_size (bfd *abfd);
+
+DESCRIPTION
+	Returns the architecture address size, in bits, as determined
+	by the object file's format.  For ELF, this information is
+	included in the header.
+
+RETURNS
+	Returns the arch size in bits if known, <<-1>> otherwise.
+*/
+
+int
+bfd_get_arch_size (bfd *abfd)
+{
+  if (abfd->xvec->flavour == bfd_target_elf_flavour)
+    return get_elf_backend_data (abfd)->s->arch_size;
+
+  return -1;
+}
+
+/*
+FUNCTION
+	bfd_get_sign_extend_vma
+
+SYNOPSIS
+ 	int bfd_get_sign_extend_vma (bfd *abfd);
+
+DESCRIPTION
+	Indicates if the target architecture "naturally" sign extends
+	an address.  Some architectures implicitly sign extend address
+	values when they are converted to types larger than the size
+	of an address.  For instance, bfd_get_start_address() will
+	return an address sign extended to fill a bfd_vma when this is
+	the case.
+
+RETURNS
+	Returns <<1>> if the target architecture is known to sign
+	extend addresses, <<0>> if the target architecture is known to
+	not sign extend addresses, and <<-1>> otherwise.
+*/
+
+int
+bfd_get_sign_extend_vma (bfd *abfd)
+{
+  char *name;
+
+  if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+    return get_elf_backend_data (abfd)->sign_extend_vma;
+
+  name = bfd_get_target (abfd);
+
+  /* Return a proper value for DJGPP & PE COFF.
+     This function is required for DWARF2 support, but there is
+     no place to store this information in the COFF back end.
+     Should enough other COFF targets add support for DWARF2,
+     a place will have to be found.  Until then, this hack will do.  */
+  if (CONST_STRNEQ (name, "coff-go32")
+      || strcmp (name, "pe-i386") == 0
+      || strcmp (name, "pei-i386") == 0
+      || strcmp (name, "pe-x86-64") == 0
+      || strcmp (name, "pei-x86-64") == 0
+      || strcmp (name, "pe-arm-wince-little") == 0
+      || strcmp (name, "pei-arm-wince-little") == 0
+      || strcmp (name, "aixcoff-rs6000") == 0)
+    return 1;
+
+  if (CONST_STRNEQ (name, "mach-o"))
+    return 0;
+
+  bfd_set_error (bfd_error_wrong_format);
+  return -1;
+}
+
+/*
+FUNCTION
+	bfd_set_start_address
+
+SYNOPSIS
+ 	bfd_boolean bfd_set_start_address (bfd *abfd, bfd_vma vma);
+
+DESCRIPTION
+	Make @var{vma} the entry point of output BFD @var{abfd}.
+
+RETURNS
+	Returns <<TRUE>> on success, <<FALSE>> otherwise.
+*/
+
+bfd_boolean
+bfd_set_start_address (bfd *abfd, bfd_vma vma)
+{
+  abfd->start_address = vma;
+  return TRUE;
+}
+
+/*
+FUNCTION
+	bfd_get_gp_size
+
+SYNOPSIS
+	unsigned int bfd_get_gp_size (bfd *abfd);
+
+DESCRIPTION
+	Return the maximum size of objects to be optimized using the GP
+	register under MIPS ECOFF.  This is typically set by the <<-G>>
+	argument to the compiler, assembler or linker.
+*/
+
+unsigned int
+bfd_get_gp_size (bfd *abfd)
+{
+  if (abfd->format == bfd_object)
+    {
+      if (abfd->xvec->flavour == bfd_target_ecoff_flavour)
+	return ecoff_data (abfd)->gp_size;
+      else if (abfd->xvec->flavour == bfd_target_elf_flavour)
+	return elf_gp_size (abfd);
+    }
+  return 0;
+}
+
+/*
+FUNCTION
+	bfd_set_gp_size
+
+SYNOPSIS
+	void bfd_set_gp_size (bfd *abfd, unsigned int i);
+
+DESCRIPTION
+	Set the maximum size of objects to be optimized using the GP
+	register under ECOFF or MIPS ELF.  This is typically set by
+	the <<-G>> argument to the compiler, assembler or linker.
+*/
+
+void
+bfd_set_gp_size (bfd *abfd, unsigned int i)
+{
+  /* Don't try to set GP size on an archive or core file!  */
+  if (abfd->format != bfd_object)
+    return;
+
+  if (abfd->xvec->flavour == bfd_target_ecoff_flavour)
+    ecoff_data (abfd)->gp_size = i;
+  else if (abfd->xvec->flavour == bfd_target_elf_flavour)
+    elf_gp_size (abfd) = i;
+}
+
+/* Get the GP value.  This is an internal function used by some of the
+   relocation special_function routines on targets which support a GP
+   register.  */
+
+bfd_vma
+_bfd_get_gp_value (bfd *abfd)
+{
+  if (! abfd)
+    return 0;
+  if (abfd->format != bfd_object)
+    return 0;
+
+  if (abfd->xvec->flavour == bfd_target_ecoff_flavour)
+    return ecoff_data (abfd)->gp;
+  else if (abfd->xvec->flavour == bfd_target_elf_flavour)
+    return elf_gp (abfd);
+
+  return 0;
+}
+
+/* Set the GP value.  */
+
+void
+_bfd_set_gp_value (bfd *abfd, bfd_vma v)
+{
+  if (! abfd)
+    abort ();
+  if (abfd->format != bfd_object)
+    return;
+
+  if (abfd->xvec->flavour == bfd_target_ecoff_flavour)
+    ecoff_data (abfd)->gp = v;
+  else if (abfd->xvec->flavour == bfd_target_elf_flavour)
+    elf_gp (abfd) = v;
+}
+
+/*
+FUNCTION
+	bfd_scan_vma
+
+SYNOPSIS
+	bfd_vma bfd_scan_vma (const char *string, const char **end, int base);
+
+DESCRIPTION
+	Convert, like <<strtoul>>, a numerical expression
+	@var{string} into a <<bfd_vma>> integer, and return that integer.
+	(Though without as many bells and whistles as <<strtoul>>.)
+	The expression is assumed to be unsigned (i.e., positive).
+	If given a @var{base}, it is used as the base for conversion.
+	A base of 0 causes the function to interpret the string
+	in hex if a leading "0x" or "0X" is found, otherwise
+	in octal if a leading zero is found, otherwise in decimal.
+
+	If the value would overflow, the maximum <<bfd_vma>> value is
+	returned.
+*/
+
+bfd_vma
+bfd_scan_vma (const char *string, const char **end, int base)
+{
+  bfd_vma value;
+  bfd_vma cutoff;
+  unsigned int cutlim;
+  int overflow;
+
+  /* Let the host do it if possible.  */
+  if (sizeof (bfd_vma) <= sizeof (unsigned long))
+    return strtoul (string, (char **) end, base);
+
+#ifdef HAVE_STRTOULL
+  if (sizeof (bfd_vma) <= sizeof (unsigned long long))
+    return strtoull (string, (char **) end, base);
+#endif
+
+  if (base == 0)
+    {
+      if (string[0] == '0')
+	{
+	  if ((string[1] == 'x') || (string[1] == 'X'))
+	    base = 16;
+	  else
+	    base = 8;
+	}
+    }
+
+  if ((base < 2) || (base > 36))
+    base = 10;
+
+  if (base == 16
+      && string[0] == '0'
+      && (string[1] == 'x' || string[1] == 'X')
+      && ISXDIGIT (string[2]))
+    {
+      string += 2;
+    }
+
+  cutoff = (~ (bfd_vma) 0) / (bfd_vma) base;
+  cutlim = (~ (bfd_vma) 0) % (bfd_vma) base;
+  value = 0;
+  overflow = 0;
+  while (1)
+    {
+      unsigned int digit;
+
+      digit = *string;
+      if (ISDIGIT (digit))
+	digit = digit - '0';
+      else if (ISALPHA (digit))
+	digit = TOUPPER (digit) - 'A' + 10;
+      else
+	break;
+      if (digit >= (unsigned int) base)
+	break;
+      if (value > cutoff || (value == cutoff && digit > cutlim))
+	overflow = 1;
+      value = value * base + digit;
+      ++string;
+    }
+
+  if (overflow)
+    value = ~ (bfd_vma) 0;
+
+  if (end != NULL)
+    *end = string;
+
+  return value;
+}
+
+/*
+FUNCTION
+	bfd_copy_private_header_data
+
+SYNOPSIS
+	bfd_boolean bfd_copy_private_header_data (bfd *ibfd, bfd *obfd);
+
+DESCRIPTION
+	Copy private BFD header information from the BFD @var{ibfd} to the
+	the BFD @var{obfd}.  This copies information that may require
+	sections to exist, but does not require symbol tables.  Return
+	<<true>> on success, <<false>> on error.
+	Possible error returns are:
+
+	o <<bfd_error_no_memory>> -
+	Not enough memory exists to create private data for @var{obfd}.
+
+.#define bfd_copy_private_header_data(ibfd, obfd) \
+.     BFD_SEND (obfd, _bfd_copy_private_header_data, \
+.		(ibfd, obfd))
+
+*/
+
+/*
+FUNCTION
+	bfd_copy_private_bfd_data
+
+SYNOPSIS
+	bfd_boolean bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd);
+
+DESCRIPTION
+	Copy private BFD information from the BFD @var{ibfd} to the
+	the BFD @var{obfd}.  Return <<TRUE>> on success, <<FALSE>> on error.
+	Possible error returns are:
+
+	o <<bfd_error_no_memory>> -
+	Not enough memory exists to create private data for @var{obfd}.
+
+.#define bfd_copy_private_bfd_data(ibfd, obfd) \
+.     BFD_SEND (obfd, _bfd_copy_private_bfd_data, \
+.		(ibfd, obfd))
+
+*/
+
+/*
+FUNCTION
+	bfd_merge_private_bfd_data
+
+SYNOPSIS
+	bfd_boolean bfd_merge_private_bfd_data (bfd *ibfd, bfd *obfd);
+
+DESCRIPTION
+	Merge private BFD information from the BFD @var{ibfd} to the
+	the output file BFD @var{obfd} when linking.  Return <<TRUE>>
+	on success, <<FALSE>> on error.  Possible error returns are:
+
+	o <<bfd_error_no_memory>> -
+	Not enough memory exists to create private data for @var{obfd}.
+
+.#define bfd_merge_private_bfd_data(ibfd, obfd) \
+.     BFD_SEND (obfd, _bfd_merge_private_bfd_data, \
+.		(ibfd, obfd))
+
+*/
+
+/*
+FUNCTION
+	bfd_set_private_flags
+
+SYNOPSIS
+	bfd_boolean bfd_set_private_flags (bfd *abfd, flagword flags);
+
+DESCRIPTION
+	Set private BFD flag information in the BFD @var{abfd}.
+	Return <<TRUE>> on success, <<FALSE>> on error.  Possible error
+	returns are:
+
+	o <<bfd_error_no_memory>> -
+	Not enough memory exists to create private data for @var{obfd}.
+
+.#define bfd_set_private_flags(abfd, flags) \
+.     BFD_SEND (abfd, _bfd_set_private_flags, (abfd, flags))
+
+*/
+
+/*
+FUNCTION
+	Other functions
+
+DESCRIPTION
+	The following functions exist but have not yet been documented.
+
+.#define bfd_sizeof_headers(abfd, info) \
+.       BFD_SEND (abfd, _bfd_sizeof_headers, (abfd, info))
+.
+.#define bfd_find_nearest_line(abfd, sec, syms, off, file, func, line) \
+.       BFD_SEND (abfd, _bfd_find_nearest_line, \
+.                 (abfd, sec, syms, off, file, func, line))
+.
+.#define bfd_find_line(abfd, syms, sym, file, line) \
+.       BFD_SEND (abfd, _bfd_find_line, \
+.                 (abfd, syms, sym, file, line))
+.
+.#define bfd_find_inliner_info(abfd, file, func, line) \
+.       BFD_SEND (abfd, _bfd_find_inliner_info, \
+.                 (abfd, file, func, line))
+.
+.#define bfd_debug_info_start(abfd) \
+.       BFD_SEND (abfd, _bfd_debug_info_start, (abfd))
+.
+.#define bfd_debug_info_end(abfd) \
+.       BFD_SEND (abfd, _bfd_debug_info_end, (abfd))
+.
+.#define bfd_debug_info_accumulate(abfd, section) \
+.       BFD_SEND (abfd, _bfd_debug_info_accumulate, (abfd, section))
+.
+.#define bfd_stat_arch_elt(abfd, stat) \
+.       BFD_SEND (abfd, _bfd_stat_arch_elt,(abfd, stat))
+.
+.#define bfd_update_armap_timestamp(abfd) \
+.       BFD_SEND (abfd, _bfd_update_armap_timestamp, (abfd))
+.
+.#define bfd_set_arch_mach(abfd, arch, mach)\
+.       BFD_SEND ( abfd, _bfd_set_arch_mach, (abfd, arch, mach))
+.
+.#define bfd_relax_section(abfd, section, link_info, again) \
+.       BFD_SEND (abfd, _bfd_relax_section, (abfd, section, link_info, again))
+.
+.#define bfd_gc_sections(abfd, link_info) \
+.	BFD_SEND (abfd, _bfd_gc_sections, (abfd, link_info))
+.
+.#define bfd_lookup_section_flags(link_info, flag_info) \
+.	BFD_SEND (abfd, _bfd_lookup_section_flags, (link_info, flag_info))
+.
+.#define bfd_merge_sections(abfd, link_info) \
+.	BFD_SEND (abfd, _bfd_merge_sections, (abfd, link_info))
+.
+.#define bfd_is_group_section(abfd, sec) \
+.	BFD_SEND (abfd, _bfd_is_group_section, (abfd, sec))
+.
+.#define bfd_discard_group(abfd, sec) \
+.	BFD_SEND (abfd, _bfd_discard_group, (abfd, sec))
+.
+.#define bfd_link_hash_table_create(abfd) \
+.	BFD_SEND (abfd, _bfd_link_hash_table_create, (abfd))
+.
+.#define bfd_link_hash_table_free(abfd, hash) \
+.	BFD_SEND (abfd, _bfd_link_hash_table_free, (hash))
+.
+.#define bfd_link_add_symbols(abfd, info) \
+.	BFD_SEND (abfd, _bfd_link_add_symbols, (abfd, info))
+.
+.#define bfd_link_just_syms(abfd, sec, info) \
+.	BFD_SEND (abfd, _bfd_link_just_syms, (sec, info))
+.
+.#define bfd_final_link(abfd, info) \
+.	BFD_SEND (abfd, _bfd_final_link, (abfd, info))
+.
+.#define bfd_free_cached_info(abfd) \
+.       BFD_SEND (abfd, _bfd_free_cached_info, (abfd))
+.
+.#define bfd_get_dynamic_symtab_upper_bound(abfd) \
+.	BFD_SEND (abfd, _bfd_get_dynamic_symtab_upper_bound, (abfd))
+.
+.#define bfd_print_private_bfd_data(abfd, file)\
+.	BFD_SEND (abfd, _bfd_print_private_bfd_data, (abfd, file))
+.
+.#define bfd_canonicalize_dynamic_symtab(abfd, asymbols) \
+.	BFD_SEND (abfd, _bfd_canonicalize_dynamic_symtab, (abfd, asymbols))
+.
+.#define bfd_get_synthetic_symtab(abfd, count, syms, dyncount, dynsyms, ret) \
+.	BFD_SEND (abfd, _bfd_get_synthetic_symtab, (abfd, count, syms, \
+.						    dyncount, dynsyms, ret))
+.
+.#define bfd_get_dynamic_reloc_upper_bound(abfd) \
+.	BFD_SEND (abfd, _bfd_get_dynamic_reloc_upper_bound, (abfd))
+.
+.#define bfd_canonicalize_dynamic_reloc(abfd, arels, asyms) \
+.	BFD_SEND (abfd, _bfd_canonicalize_dynamic_reloc, (abfd, arels, asyms))
+.
+.extern bfd_byte *bfd_get_relocated_section_contents
+.  (bfd *, struct bfd_link_info *, struct bfd_link_order *, bfd_byte *,
+.   bfd_boolean, asymbol **);
+.
+
+*/
+
+bfd_byte *
+bfd_get_relocated_section_contents (bfd *abfd,
+				    struct bfd_link_info *link_info,
+				    struct bfd_link_order *link_order,
+				    bfd_byte *data,
+				    bfd_boolean relocatable,
+				    asymbol **symbols)
+{
+  bfd *abfd2;
+  bfd_byte *(*fn) (bfd *, struct bfd_link_info *, struct bfd_link_order *,
+		   bfd_byte *, bfd_boolean, asymbol **);
+
+  if (link_order->type == bfd_indirect_link_order)
+    {
+      abfd2 = link_order->u.indirect.section->owner;
+      if (abfd2 == NULL)
+	abfd2 = abfd;
+    }
+  else
+    abfd2 = abfd;
+
+  fn = abfd2->xvec->_bfd_get_relocated_section_contents;
+
+  return (*fn) (abfd, link_info, link_order, data, relocatable, symbols);
+}
+
+/* Record information about an ELF program header.  */
+
+bfd_boolean
+bfd_record_phdr (bfd *abfd,
+		 unsigned long type,
+		 bfd_boolean flags_valid,
+		 flagword flags,
+		 bfd_boolean at_valid,
+		 bfd_vma at,
+		 bfd_boolean includes_filehdr,
+		 bfd_boolean includes_phdrs,
+		 unsigned int count,
+		 asection **secs)
+{
+  struct elf_segment_map *m, **pm;
+  bfd_size_type amt;
+
+  if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  amt = sizeof (struct elf_segment_map);
+  amt += ((bfd_size_type) count - 1) * sizeof (asection *);
+  m = (struct elf_segment_map *) bfd_zalloc (abfd, amt);
+  if (m == NULL)
+    return FALSE;
+
+  m->p_type = type;
+  m->p_flags = flags;
+  m->p_paddr = at;
+  m->p_flags_valid = flags_valid;
+  m->p_paddr_valid = at_valid;
+  m->includes_filehdr = includes_filehdr;
+  m->includes_phdrs = includes_phdrs;
+  m->count = count;
+  if (count > 0)
+    memcpy (m->sections, secs, count * sizeof (asection *));
+
+  for (pm = &elf_tdata (abfd)->segment_map; *pm != NULL; pm = &(*pm)->next)
+    ;
+  *pm = m;
+
+  return TRUE;
+}
+
+#ifdef BFD64
+/* Return true iff this target is 32-bit.  */
+
+static bfd_boolean
+is32bit (bfd *abfd)
+{
+  if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+    {
+      const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+      return bed->s->elfclass == ELFCLASS32;
+    }
+
+  /* For non-ELF targets, use architecture information.  */
+  return bfd_arch_bits_per_address (abfd) <= 32;
+}
+#endif
+
+/* bfd_sprintf_vma and bfd_fprintf_vma display an address in the
+   target's address size.  */
+
+void
+bfd_sprintf_vma (bfd *abfd ATTRIBUTE_UNUSED, char *buf, bfd_vma value)
+{
+#ifdef BFD64
+  if (is32bit (abfd))
+    {
+      sprintf (buf, "%08lx", (unsigned long) value & 0xffffffff);
+      return;
+    }
+#endif
+  sprintf_vma (buf, value);
+}
+
+void
+bfd_fprintf_vma (bfd *abfd ATTRIBUTE_UNUSED, void *stream, bfd_vma value)
+{
+#ifdef BFD64
+  if (is32bit (abfd))
+    {
+      fprintf ((FILE *) stream, "%08lx", (unsigned long) value & 0xffffffff);
+      return;
+    }
+#endif
+  fprintf_vma ((FILE *) stream, value);
+}
+
+/*
+FUNCTION
+	bfd_alt_mach_code
+
+SYNOPSIS
+	bfd_boolean bfd_alt_mach_code (bfd *abfd, int alternative);
+
+DESCRIPTION
+
+	When more than one machine code number is available for the
+	same machine type, this function can be used to switch between
+	the preferred one (alternative == 0) and any others.  Currently,
+	only ELF supports this feature, with up to two alternate
+	machine codes.
+*/
+
+bfd_boolean
+bfd_alt_mach_code (bfd *abfd, int alternative)
+{
+  if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+    {
+      int code;
+
+      switch (alternative)
+	{
+	case 0:
+	  code = get_elf_backend_data (abfd)->elf_machine_code;
+	  break;
+
+	case 1:
+	  code = get_elf_backend_data (abfd)->elf_machine_alt1;
+	  if (code == 0)
+	    return FALSE;
+	  break;
+
+	case 2:
+	  code = get_elf_backend_data (abfd)->elf_machine_alt2;
+	  if (code == 0)
+	    return FALSE;
+	  break;
+
+	default:
+	  return FALSE;
+	}
+
+      elf_elfheader (abfd)->e_machine = code;
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+/*
+CODE_FRAGMENT
+
+.struct bfd_preserve
+.{
+.  void *marker;
+.  void *tdata;
+.  flagword flags;
+.  const struct bfd_arch_info *arch_info;
+.  struct bfd_section *sections;
+.  struct bfd_section *section_last;
+.  unsigned int section_count;
+.  struct bfd_hash_table section_htab;
+.};
+.
+*/
+
+/*
+FUNCTION
+	bfd_preserve_save
+
+SYNOPSIS
+	bfd_boolean bfd_preserve_save (bfd *, struct bfd_preserve *);
+
+DESCRIPTION
+	When testing an object for compatibility with a particular
+	target back-end, the back-end object_p function needs to set
+	up certain fields in the bfd on successfully recognizing the
+	object.  This typically happens in a piecemeal fashion, with
+	failures possible at many points.  On failure, the bfd is
+	supposed to be restored to its initial state, which is
+	virtually impossible.  However, restoring a subset of the bfd
+	state works in practice.  This function stores the subset and
+	reinitializes the bfd.
+
+*/
+
+bfd_boolean
+bfd_preserve_save (bfd *abfd, struct bfd_preserve *preserve)
+{
+  preserve->tdata = abfd->tdata.any;
+  preserve->arch_info = abfd->arch_info;
+  preserve->flags = abfd->flags;
+  preserve->sections = abfd->sections;
+  preserve->section_last = abfd->section_last;
+  preserve->section_count = abfd->section_count;
+  preserve->section_htab = abfd->section_htab;
+
+  if (! bfd_hash_table_init (&abfd->section_htab, bfd_section_hash_newfunc,
+			     sizeof (struct section_hash_entry)))
+    return FALSE;
+
+  abfd->tdata.any = NULL;
+  abfd->arch_info = &bfd_default_arch_struct;
+  abfd->flags &= BFD_FLAGS_SAVED;
+  abfd->sections = NULL;
+  abfd->section_last = NULL;
+  abfd->section_count = 0;
+
+  return TRUE;
+}
+
+/*
+FUNCTION
+	bfd_preserve_restore
+
+SYNOPSIS
+	void bfd_preserve_restore (bfd *, struct bfd_preserve *);
+
+DESCRIPTION
+	This function restores bfd state saved by bfd_preserve_save.
+	If MARKER is non-NULL in struct bfd_preserve then that block
+	and all subsequently bfd_alloc'd memory is freed.
+
+*/
+
+void
+bfd_preserve_restore (bfd *abfd, struct bfd_preserve *preserve)
+{
+  bfd_hash_table_free (&abfd->section_htab);
+
+  abfd->tdata.any = preserve->tdata;
+  abfd->arch_info = preserve->arch_info;
+  abfd->flags = preserve->flags;
+  abfd->section_htab = preserve->section_htab;
+  abfd->sections = preserve->sections;
+  abfd->section_last = preserve->section_last;
+  abfd->section_count = preserve->section_count;
+
+  /* bfd_release frees all memory more recently bfd_alloc'd than
+     its arg, as well as its arg.  */
+  if (preserve->marker != NULL)
+    {
+      bfd_release (abfd, preserve->marker);
+      preserve->marker = NULL;
+    }
+}
+
+/*
+FUNCTION
+	bfd_preserve_finish
+
+SYNOPSIS
+	void bfd_preserve_finish (bfd *, struct bfd_preserve *);
+
+DESCRIPTION
+	This function should be called when the bfd state saved by
+	bfd_preserve_save is no longer needed.  ie. when the back-end
+	object_p function returns with success.
+
+*/
+
+void
+bfd_preserve_finish (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_preserve *preserve)
+{
+  /* It would be nice to be able to free more memory here, eg. old
+     tdata, but that's not possible since these blocks are sitting
+     inside bfd_alloc'd memory.  The section hash is on a separate
+     objalloc.  */
+  bfd_hash_table_free (&preserve->section_htab);
+}
+
+/*
+FUNCTION
+	bfd_emul_get_maxpagesize
+
+SYNOPSIS
+ 	bfd_vma bfd_emul_get_maxpagesize (const char *);
+
+DESCRIPTION
+	Returns the maximum page size, in bytes, as determined by
+	emulation.
+
+RETURNS
+	Returns the maximum page size in bytes for ELF, 0 otherwise.
+*/
+
+bfd_vma
+bfd_emul_get_maxpagesize (const char *emul)
+{
+  const bfd_target *target;
+
+  target = bfd_find_target (emul, NULL);
+  if (target != NULL
+      && target->flavour == bfd_target_elf_flavour)
+    return xvec_get_elf_backend_data (target)->maxpagesize;
+
+  return 0;
+}
+
+static void
+bfd_elf_set_pagesize (const bfd_target *target, bfd_vma size,
+		      int offset, const bfd_target *orig_target)
+{
+  if (target->flavour == bfd_target_elf_flavour)
+    {
+      const struct elf_backend_data *bed;
+
+      bed = xvec_get_elf_backend_data (target);
+      *((bfd_vma *) ((char *) bed + offset)) = size;
+    }
+
+  if (target->alternative_target
+      && target->alternative_target != orig_target)
+    bfd_elf_set_pagesize (target->alternative_target, size, offset,
+			  orig_target);
+}
+
+/*
+FUNCTION
+	bfd_emul_set_maxpagesize
+
+SYNOPSIS
+ 	void bfd_emul_set_maxpagesize (const char *, bfd_vma);
+
+DESCRIPTION
+	For ELF, set the maximum page size for the emulation.  It is
+	a no-op for other formats.
+
+*/
+
+void
+bfd_emul_set_maxpagesize (const char *emul, bfd_vma size)
+{
+  const bfd_target *target;
+
+  target = bfd_find_target (emul, NULL);
+  if (target)
+    bfd_elf_set_pagesize (target, size,
+			  offsetof (struct elf_backend_data,
+				    maxpagesize), target);
+}
+
+/*
+FUNCTION
+	bfd_emul_get_commonpagesize
+
+SYNOPSIS
+ 	bfd_vma bfd_emul_get_commonpagesize (const char *);
+
+DESCRIPTION
+	Returns the common page size, in bytes, as determined by
+	emulation.
+
+RETURNS
+	Returns the common page size in bytes for ELF, 0 otherwise.
+*/
+
+bfd_vma
+bfd_emul_get_commonpagesize (const char *emul)
+{
+  const bfd_target *target;
+
+  target = bfd_find_target (emul, NULL);
+  if (target != NULL
+      && target->flavour == bfd_target_elf_flavour)
+    return xvec_get_elf_backend_data (target)->commonpagesize;
+
+  return 0;
+}
+
+/*
+FUNCTION
+	bfd_emul_set_commonpagesize
+
+SYNOPSIS
+ 	void bfd_emul_set_commonpagesize (const char *, bfd_vma);
+
+DESCRIPTION
+	For ELF, set the common page size for the emulation.  It is
+	a no-op for other formats.
+
+*/
+
+void
+bfd_emul_set_commonpagesize (const char *emul, bfd_vma size)
+{
+  const bfd_target *target;
+
+  target = bfd_find_target (emul, NULL);
+  if (target)
+    bfd_elf_set_pagesize (target, size,
+			  offsetof (struct elf_backend_data,
+				    commonpagesize), target);
+}
+
+/*
+FUNCTION
+	bfd_demangle
+
+SYNOPSIS
+	char *bfd_demangle (bfd *, const char *, int);
+
+DESCRIPTION
+	Wrapper around cplus_demangle.  Strips leading underscores and
+	other such chars that would otherwise confuse the demangler.
+	If passed a g++ v3 ABI mangled name, returns a buffer allocated
+	with malloc holding the demangled name.  Returns NULL otherwise
+	and on memory alloc failure.
+*/
+
+char *
+bfd_demangle (bfd *abfd, const char *name, int options)
+{
+  char *res, *alloc;
+  const char *pre, *suf;
+  size_t pre_len;
+  bfd_boolean skip_lead;
+
+  skip_lead = (abfd != NULL
+	       && *name != '\0'
+	       && bfd_get_symbol_leading_char (abfd) == *name);
+  if (skip_lead)
+    ++name;
+
+  /* This is a hack for better error reporting on XCOFF, PowerPC64-ELF
+     or the MS PE format.  These formats have a number of leading '.'s
+     on at least some symbols, so we remove all dots to avoid
+     confusing the demangler.  */
+  pre = name;
+  while (*name == '.' || *name == '$')
+    ++name;
+  pre_len = name - pre;
+
+  /* Strip off @plt and suchlike too.  */
+  alloc = NULL;
+  suf = strchr (name, '@');
+  if (suf != NULL)
+    {
+      alloc = (char *) bfd_malloc (suf - name + 1);
+      if (alloc == NULL)
+	return NULL;
+      memcpy (alloc, name, suf - name);
+      alloc[suf - name] = '\0';
+      name = alloc;
+    }
+
+  res = cplus_demangle (name, options);
+
+  if (alloc != NULL)
+    free (alloc);
+
+  if (res == NULL)
+    {
+      if (skip_lead)
+	{
+	  size_t len = strlen (pre) + 1;
+	  alloc = (char *) bfd_malloc (len);
+	  if (alloc == NULL)
+	    return NULL;
+	  memcpy (alloc, pre, len);
+	  return alloc;
+	}
+      return NULL;
+    }
+
+  /* Put back any prefix or suffix.  */
+  if (pre_len != 0 || suf != NULL)
+    {
+      size_t len;
+      size_t suf_len;
+      char *final;
+
+      len = strlen (res);
+      if (suf == NULL)
+	suf = res + len;
+      suf_len = strlen (suf) + 1;
+      final = (char *) bfd_malloc (pre_len + len + suf_len);
+      if (final != NULL)
+	{
+	  memcpy (final, pre, pre_len);
+	  memcpy (final + pre_len, res, len);
+	  memcpy (final + pre_len + len, suf, suf_len);
+	}
+      free (res);
+      res = final;
+    }
+
+  return res;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/bfd.m4 sdcc-3.2.0+dfsg/support/sdbinutils/bfd/bfd.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/bfd.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/bfd.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,45 @@
+dnl This file was derived from acinclude.m4.
+
+
+dnl Check for existence of a type $1 in sys/procfs.h
+
+AC_DEFUN([BFD_HAVE_SYS_PROCFS_TYPE],
+[AC_MSG_CHECKING([for $1 in sys/procfs.h])
+ AC_CACHE_VAL(bfd_cv_have_sys_procfs_type_$1,
+   [AC_TRY_COMPILE([
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>],
+      [$1 avar],
+      bfd_cv_have_sys_procfs_type_$1=yes,
+      bfd_cv_have_sys_procfs_type_$1=no
+   )])
+ if test $bfd_cv_have_sys_procfs_type_$1 = yes; then
+   AC_DEFINE([HAVE_]translit($1, [a-z], [A-Z]), 1,
+	     [Define if <sys/procfs.h> has $1.])
+ fi
+ AC_MSG_RESULT($bfd_cv_have_sys_procfs_type_$1)
+])
+
+dnl Check for existence of member $2 in type $1 in sys/procfs.h
+
+AC_DEFUN([BFD_HAVE_SYS_PROCFS_TYPE_MEMBER],
+[AC_MSG_CHECKING([for $1.$2 in sys/procfs.h])
+ AC_CACHE_VAL(bfd_cv_have_sys_procfs_type_member_$1_$2,
+   [AC_TRY_COMPILE([
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>],
+      [$1 avar; void* aref = (void*) &avar.$2],
+      bfd_cv_have_sys_procfs_type_member_$1_$2=yes,
+      bfd_cv_have_sys_procfs_type_member_$1_$2=no
+   )])
+ if test $bfd_cv_have_sys_procfs_type_member_$1_$2 = yes; then
+   AC_DEFINE([HAVE_]translit($1, [a-z], [A-Z])[_]translit($2, [a-z], [A-Z]), 1,
+	     [Define if <sys/procfs.h> has $1.$2.])
+ fi
+ AC_MSG_RESULT($bfd_cv_have_sys_procfs_type_member_$1_$2)
+])
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/bfdio.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/bfdio.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/bfdio.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/bfdio.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,611 @@
+/* Low-level I/O routines for BFDs.
+
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011
+   Free Software Foundation, Inc.
+
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include <limits.h>
+#include "bfd.h"
+#include "libbfd.h"
+
+#ifndef S_IXUSR
+#define S_IXUSR 0100    /* Execute by owner.  */
+#endif
+#ifndef S_IXGRP
+#define S_IXGRP 0010    /* Execute by group.  */
+#endif
+#ifndef S_IXOTH
+#define S_IXOTH 0001    /* Execute by others.  */
+#endif
+
+#ifndef FD_CLOEXEC
+#define FD_CLOEXEC 1
+#endif
+
+file_ptr
+real_ftell (FILE *file)
+{
+#if defined (HAVE_FTELLO64)
+  return ftello64 (file);
+#elif defined (HAVE_FTELLO)
+  return ftello (file);
+#else
+  return ftell (file);
+#endif
+}
+
+int
+real_fseek (FILE *file, file_ptr offset, int whence)
+{
+#if defined (HAVE_FSEEKO64)
+  return fseeko64 (file, offset, whence);
+#elif defined (HAVE_FSEEKO)
+  return fseeko (file, offset, whence);
+#else
+  return fseek (file, offset, whence);
+#endif
+}
+
+/* Mark FILE as close-on-exec.  Return FILE.  FILE may be NULL, in
+   which case nothing is done.  */
+static FILE *
+close_on_exec (FILE *file)
+{
+#if defined (HAVE_FILENO) && defined (F_GETFD)
+  if (file)
+    {
+      int fd = fileno (file);
+      int old = fcntl (fd, F_GETFD, 0);
+      if (old >= 0)
+	fcntl (fd, F_SETFD, old | FD_CLOEXEC);
+    }
+#endif
+  return file;
+}
+
+FILE *
+real_fopen (const char *filename, const char *modes)
+{
+#ifdef VMS
+  char vms_modes[4];
+  char *vms_attr;
+
+  /* On VMS, fopen allows file attributes as optionnal arguments.
+     We need to use them but we'd better to use the common prototype.
+     In fopen-vms.h, they are separated from the mode with a comma.
+     Split here.  */
+  vms_attr = strchr (modes, ',');
+  if (vms_attr == NULL)
+    {
+      /* No attributes.  */
+      return close_on_exec (fopen (filename, modes));
+    }
+  else
+    {
+      /* Attributes found.  Split.  */
+      size_t modes_len = strlen (modes) + 1;
+      char attrs[modes_len + 1];
+      char *at[3];
+      int i;
+
+      memcpy (attrs, modes, modes_len);
+      at[0] = attrs;
+      for (i = 0; i < 2; i++)
+	{
+	  at[i + 1] = strchr (at[i], ',');
+	  BFD_ASSERT (at[i + 1] != NULL);
+	  *(at[i + 1]++) = 0; /* Replace ',' with a nul, and skip it.  */
+	}
+      return close_on_exec (fopen (filename, at[0], at[1], at[2]));
+    }
+#else /* !VMS */
+#if defined (HAVE_FOPEN64)
+  return close_on_exec (fopen64 (filename, modes));
+#else
+  return close_on_exec (fopen (filename, modes));
+#endif
+#endif /* !VMS */
+}
+
+/*
+INTERNAL_DEFINITION
+	struct bfd_iovec
+
+DESCRIPTION
+
+	The <<struct bfd_iovec>> contains the internal file I/O class.
+	Each <<BFD>> has an instance of this class and all file I/O is
+	routed through it (it is assumed that the instance implements
+	all methods listed below).
+
+.struct bfd_iovec
+.{
+.  {* To avoid problems with macros, a "b" rather than "f"
+.     prefix is prepended to each method name.  *}
+.  {* Attempt to read/write NBYTES on ABFD's IOSTREAM storing/fetching
+.     bytes starting at PTR.  Return the number of bytes actually
+.     transfered (a read past end-of-file returns less than NBYTES),
+.     or -1 (setting <<bfd_error>>) if an error occurs.  *}
+.  file_ptr (*bread) (struct bfd *abfd, void *ptr, file_ptr nbytes);
+.  file_ptr (*bwrite) (struct bfd *abfd, const void *ptr,
+.                      file_ptr nbytes);
+.  {* Return the current IOSTREAM file offset, or -1 (setting <<bfd_error>>
+.     if an error occurs.  *}
+.  file_ptr (*btell) (struct bfd *abfd);
+.  {* For the following, on successful completion a value of 0 is returned.
+.     Otherwise, a value of -1 is returned (and  <<bfd_error>> is set).  *}
+.  int (*bseek) (struct bfd *abfd, file_ptr offset, int whence);
+.  int (*bclose) (struct bfd *abfd);
+.  int (*bflush) (struct bfd *abfd);
+.  int (*bstat) (struct bfd *abfd, struct stat *sb);
+.  {* Mmap a part of the files. ADDR, LEN, PROT, FLAGS and OFFSET are the usual
+.     mmap parameter, except that LEN and OFFSET do not need to be page
+.     aligned.  Returns (void *)-1 on failure, mmapped address on success.
+.     Also write in MAP_ADDR the address of the page aligned buffer and in
+.     MAP_LEN the size mapped (a page multiple).  Use unmap with MAP_ADDR and
+.     MAP_LEN to unmap.  *}
+.  void *(*bmmap) (struct bfd *abfd, void *addr, bfd_size_type len,
+.                  int prot, int flags, file_ptr offset,
+.                  void **map_addr, bfd_size_type *map_len);
+.};
+
+.extern const struct bfd_iovec _bfd_memory_iovec;
+
+*/
+
+
+/* Return value is amount read.  */
+
+bfd_size_type
+bfd_bread (void *ptr, bfd_size_type size, bfd *abfd)
+{
+  size_t nread;
+
+  /* If this is an archive element, don't read past the end of
+     this element.  */
+  if (abfd->arelt_data != NULL)
+    {
+      size_t maxbytes = ((struct areltdata *) abfd->arelt_data)->parsed_size;
+      if (abfd->where + size > maxbytes)
+        {
+          if (abfd->where >= maxbytes)
+            return 0;
+          size = maxbytes - abfd->where;
+        }
+    }
+
+  if (abfd->iovec)
+    nread = abfd->iovec->bread (abfd, ptr, size);
+  else
+    nread = 0;
+  if (nread != (size_t) -1)
+    abfd->where += nread;
+
+  return nread;
+}
+
+bfd_size_type
+bfd_bwrite (const void *ptr, bfd_size_type size, bfd *abfd)
+{
+  size_t nwrote;
+
+  if (abfd->iovec)
+    nwrote = abfd->iovec->bwrite (abfd, ptr, size);
+  else
+    nwrote = 0;
+
+  if (nwrote != (size_t) -1)
+    abfd->where += nwrote;
+  if (nwrote != size)
+    {
+#ifdef ENOSPC
+      errno = ENOSPC;
+#endif
+      bfd_set_error (bfd_error_system_call);
+    }
+  return nwrote;
+}
+
+file_ptr
+bfd_tell (bfd *abfd)
+{
+  file_ptr ptr;
+
+  if (abfd->iovec)
+    {
+      ptr = abfd->iovec->btell (abfd);
+
+      if (abfd->my_archive)
+	ptr -= abfd->origin;
+    }
+  else
+    ptr = 0;
+
+  abfd->where = ptr;
+  return ptr;
+}
+
+int
+bfd_flush (bfd *abfd)
+{
+  if (abfd->iovec)
+    return abfd->iovec->bflush (abfd);
+  return 0;
+}
+
+/* Returns 0 for success, negative value for failure (in which case
+   bfd_get_error can retrieve the error code).  */
+int
+bfd_stat (bfd *abfd, struct stat *statbuf)
+{
+  int result;
+
+  if (abfd->iovec)
+    result = abfd->iovec->bstat (abfd, statbuf);
+  else
+    result = -1;
+
+  if (result < 0)
+    bfd_set_error (bfd_error_system_call);
+  return result;
+}
+
+/* Returns 0 for success, nonzero for failure (in which case bfd_get_error
+   can retrieve the error code).  */
+
+int
+bfd_seek (bfd *abfd, file_ptr position, int direction)
+{
+  int result;
+  file_ptr file_position;
+  /* For the time being, a BFD may not seek to it's end.  The problem
+     is that we don't easily have a way to recognize the end of an
+     element in an archive.  */
+
+  BFD_ASSERT (direction == SEEK_SET || direction == SEEK_CUR);
+
+  if (direction == SEEK_CUR && position == 0)
+    return 0;
+
+  if (abfd->format != bfd_archive && abfd->my_archive == 0)
+    {
+      if (direction == SEEK_SET && (bfd_vma) position == abfd->where)
+	return 0;
+    }
+  else
+    {
+      /* We need something smarter to optimize access to archives.
+	 Currently, anything inside an archive is read via the file
+	 handle for the archive.  Which means that a bfd_seek on one
+	 component affects the `current position' in the archive, as
+	 well as in any other component.
+
+	 It might be sufficient to put a spike through the cache
+	 abstraction, and look to the archive for the file position,
+	 but I think we should try for something cleaner.
+
+	 In the meantime, no optimization for archives.  */
+    }
+
+  file_position = position;
+  if (direction == SEEK_SET && abfd->my_archive != NULL)
+    file_position += abfd->origin;
+
+  if (abfd->iovec)
+    result = abfd->iovec->bseek (abfd, file_position, direction);
+  else
+    result = -1;
+
+  if (result != 0)
+    {
+      int hold_errno = errno;
+
+      /* Force redetermination of `where' field.  */
+      bfd_tell (abfd);
+
+      /* An EINVAL error probably means that the file offset was
+         absurd.  */
+      if (hold_errno == EINVAL)
+	bfd_set_error (bfd_error_file_truncated);
+      else
+	{
+	  bfd_set_error (bfd_error_system_call);
+	  errno = hold_errno;
+	}
+    }
+  else
+    {
+      /* Adjust `where' field.  */
+      if (direction == SEEK_SET)
+	abfd->where = position;
+      else
+	abfd->where += position;
+    }
+  return result;
+}
+
+/*
+FUNCTION
+	bfd_get_mtime
+
+SYNOPSIS
+	long bfd_get_mtime (bfd *abfd);
+
+DESCRIPTION
+	Return the file modification time (as read from the file system, or
+	from the archive header for archive members).
+
+*/
+
+long
+bfd_get_mtime (bfd *abfd)
+{
+  struct stat buf;
+
+  if (abfd->mtime_set)
+    return abfd->mtime;
+
+  if (abfd->iovec == NULL)
+    return 0;
+
+  if (abfd->iovec->bstat (abfd, &buf) != 0)
+    return 0;
+
+  abfd->mtime = buf.st_mtime;		/* Save value in case anyone wants it */
+  return buf.st_mtime;
+}
+
+/*
+FUNCTION
+	bfd_get_size
+
+SYNOPSIS
+	file_ptr bfd_get_size (bfd *abfd);
+
+DESCRIPTION
+	Return the file size (as read from file system) for the file
+	associated with BFD @var{abfd}.
+
+	The initial motivation for, and use of, this routine is not
+	so we can get the exact size of the object the BFD applies to, since
+	that might not be generally possible (archive members for example).
+	It would be ideal if someone could eventually modify
+	it so that such results were guaranteed.
+
+	Instead, we want to ask questions like "is this NNN byte sized
+	object I'm about to try read from file offset YYY reasonable?"
+	As as example of where we might do this, some object formats
+	use string tables for which the first <<sizeof (long)>> bytes of the
+	table contain the size of the table itself, including the size bytes.
+	If an application tries to read what it thinks is one of these
+	string tables, without some way to validate the size, and for
+	some reason the size is wrong (byte swapping error, wrong location
+	for the string table, etc.), the only clue is likely to be a read
+	error when it tries to read the table, or a "virtual memory
+	exhausted" error when it tries to allocate 15 bazillon bytes
+	of space for the 15 bazillon byte table it is about to read.
+	This function at least allows us to answer the question, "is the
+	size reasonable?".
+*/
+
+file_ptr
+bfd_get_size (bfd *abfd)
+{
+  struct stat buf;
+
+  if (abfd->iovec == NULL)
+    return 0;
+
+  if (abfd->iovec->bstat (abfd, &buf) != 0)
+    return 0;
+
+  return buf.st_size;
+}
+
+
+/*
+FUNCTION
+	bfd_mmap
+
+SYNOPSIS
+	void *bfd_mmap (bfd *abfd, void *addr, bfd_size_type len,
+	                int prot, int flags, file_ptr offset,
+	                void **map_addr, bfd_size_type *map_len);
+
+DESCRIPTION
+	Return mmap()ed region of the file, if possible and implemented.
+        LEN and OFFSET do not need to be page aligned.  The page aligned
+        address and length are written to MAP_ADDR and MAP_LEN.
+
+*/
+
+void *
+bfd_mmap (bfd *abfd, void *addr, bfd_size_type len,
+	  int prot, int flags, file_ptr offset,
+          void **map_addr, bfd_size_type *map_len)
+{
+  void *ret = (void *)-1;
+
+  if (abfd->iovec == NULL)
+    return ret;
+
+  return abfd->iovec->bmmap (abfd, addr, len, prot, flags, offset,
+                             map_addr, map_len);
+}
+
+/* Memory file I/O operations.  */
+
+static file_ptr
+memory_bread (bfd *abfd, void *ptr, file_ptr size)
+{
+  struct bfd_in_memory *bim;
+  bfd_size_type get;
+
+  bim = (struct bfd_in_memory *) abfd->iostream;
+  get = size;
+  if (abfd->where + get > bim->size)
+    {
+      if (bim->size < (bfd_size_type) abfd->where)
+        get = 0;
+      else
+        get = bim->size - abfd->where;
+      bfd_set_error (bfd_error_file_truncated);
+    }
+  memcpy (ptr, bim->buffer + abfd->where, (size_t) get);
+  return get;
+}
+
+static file_ptr
+memory_bwrite (bfd *abfd, const void *ptr, file_ptr size)
+{
+  struct bfd_in_memory *bim = (struct bfd_in_memory *) abfd->iostream;
+
+  if (abfd->where + size > bim->size)
+    {
+      bfd_size_type newsize, oldsize;
+
+      oldsize = (bim->size + 127) & ~(bfd_size_type) 127;
+      bim->size = abfd->where + size;
+      /* Round up to cut down on memory fragmentation */
+      newsize = (bim->size + 127) & ~(bfd_size_type) 127;
+      if (newsize > oldsize)
+        {
+          bim->buffer = (bfd_byte *) bfd_realloc_or_free (bim->buffer, newsize);
+          if (bim->buffer == NULL)
+            {
+              bim->size = 0;
+              return 0;
+            }
+          if (newsize > bim->size)
+            memset (bim->buffer + bim->size, 0, newsize - bim->size);
+        }
+    }
+  memcpy (bim->buffer + abfd->where, ptr, (size_t) size);
+  return size;
+}
+
+static file_ptr
+memory_btell (bfd *abfd)
+{
+  return abfd->where;
+}
+
+static int
+memory_bseek (bfd *abfd, file_ptr position, int direction)
+{
+  file_ptr nwhere;
+  struct bfd_in_memory *bim;
+
+  bim = (struct bfd_in_memory *) abfd->iostream;
+
+  if (direction == SEEK_SET)
+    nwhere = position;
+  else
+    nwhere = abfd->where + position;
+
+  if (nwhere < 0)
+    {
+      abfd->where = 0;
+      errno = EINVAL;
+      return -1;
+    }
+
+  if ((bfd_size_type)nwhere > bim->size)
+    {
+      if (abfd->direction == write_direction
+          || abfd->direction == both_direction)
+        {
+          bfd_size_type newsize, oldsize;
+
+          oldsize = (bim->size + 127) & ~(bfd_size_type) 127;
+          bim->size = nwhere;
+          /* Round up to cut down on memory fragmentation */
+          newsize = (bim->size + 127) & ~(bfd_size_type) 127;
+          if (newsize > oldsize)
+            {
+              bim->buffer = (bfd_byte *) bfd_realloc_or_free (bim->buffer, newsize);
+              if (bim->buffer == NULL)
+                {
+                  errno = EINVAL;
+                  bim->size = 0;
+                  return -1;
+                }
+              memset (bim->buffer + oldsize, 0, newsize - oldsize);
+            }
+        }
+      else
+        {
+          abfd->where = bim->size;
+          errno = EINVAL;
+          bfd_set_error (bfd_error_file_truncated);
+          return -1;
+        }
+    }
+  return 0;
+}
+
+static int
+memory_bclose (struct bfd *abfd)
+{
+  struct bfd_in_memory *bim = (struct bfd_in_memory *) abfd->iostream;
+
+  if (bim->buffer != NULL)
+    free (bim->buffer);
+  free (bim);
+  abfd->iostream = NULL;
+
+  return TRUE;
+}
+
+static int
+memory_bflush (bfd *abfd ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+memory_bstat (bfd *abfd, struct stat *statbuf)
+{
+  struct bfd_in_memory *bim = (struct bfd_in_memory *) abfd->iostream;
+
+  memset (statbuf, 0, sizeof (*statbuf));
+  statbuf->st_size = bim->size;
+
+  return 0;
+}
+
+static void *
+memory_bmmap (bfd *abfd ATTRIBUTE_UNUSED, void *addr ATTRIBUTE_UNUSED,
+              bfd_size_type len ATTRIBUTE_UNUSED, int prot ATTRIBUTE_UNUSED,
+              int flags ATTRIBUTE_UNUSED, file_ptr offset ATTRIBUTE_UNUSED,
+              void **map_addr ATTRIBUTE_UNUSED,
+              bfd_size_type *map_len ATTRIBUTE_UNUSED)
+{
+  return (void *)-1;
+}
+
+const struct bfd_iovec _bfd_memory_iovec =
+{
+  &memory_bread, &memory_bwrite, &memory_btell, &memory_bseek,
+  &memory_bclose, &memory_bflush, &memory_bstat, &memory_bmmap
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/bfdwin.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/bfdwin.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/bfdwin.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/bfdwin.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,264 @@
+/* Support for memory-mapped windows into a BFD.
+   Copyright 1995, 1996, 2001, 2002, 2003, 2005, 2007, 2008, 2009, 2011
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+
+#include "bfd.h"
+#include "libbfd.h"
+
+/* Currently, if USE_MMAP is undefined, none of the window stuff is
+   used.  Enabled by --with-mmap.  */
+
+#ifdef USE_MMAP
+
+#undef HAVE_MPROTECT /* code's not tested yet */
+
+#if HAVE_MMAP || HAVE_MPROTECT || HAVE_MADVISE
+#include <sys/mman.h>
+#endif
+
+#ifndef MAP_FILE
+#define MAP_FILE 0
+#endif
+
+static int debug_windows;
+
+/* The idea behind the next and refcount fields is that one mapped
+   region can suffice for multiple read-only windows or multiple
+   non-overlapping read-write windows.  It's not implemented yet
+   though.  */
+
+/*
+INTERNAL_DEFINITION
+
+.struct _bfd_window_internal {
+.  struct _bfd_window_internal *next;
+.  void *data;
+.  bfd_size_type size;
+.  int refcount : 31;		{* should be enough...  *}
+.  unsigned mapped : 1;		{* 1 = mmap, 0 = malloc *}
+.};
+*/
+
+void
+bfd_init_window (bfd_window *windowp)
+{
+  windowp->data = 0;
+  windowp->i = 0;
+  windowp->size = 0;
+}
+
+void
+bfd_free_window (bfd_window *windowp)
+{
+  bfd_window_internal *i = windowp->i;
+  windowp->i = 0;
+  windowp->data = 0;
+  if (i == 0)
+    return;
+  i->refcount--;
+  if (debug_windows)
+    fprintf (stderr, "freeing window @%p<%p,%lx,%p>\n",
+	     windowp, windowp->data, (unsigned long) windowp->size, windowp->i);
+  if (i->refcount != 0)
+    return;
+
+  if (i->mapped)
+    {
+#ifdef HAVE_MMAP
+      munmap (i->data, i->size);
+      goto no_free;
+#else
+      abort ();
+#endif
+    }
+#ifdef HAVE_MPROTECT
+  mprotect (i->data, i->size, PROT_READ | PROT_WRITE);
+#endif
+  free (i->data);
+#ifdef HAVE_MMAP
+ no_free:
+#endif
+  i->data = 0;
+  /* There should be no more references to i at this point.  */
+  free (i);
+}
+
+static int ok_to_map = 1;
+
+bfd_boolean
+bfd_get_file_window (bfd *abfd,
+		     file_ptr offset,
+		     bfd_size_type size,
+		     bfd_window *windowp,
+		     bfd_boolean writable)
+{
+  static size_t pagesize;
+  bfd_window_internal *i = windowp->i;
+  bfd_size_type size_to_alloc = size;
+
+  if (debug_windows)
+    fprintf (stderr, "bfd_get_file_window (%p, %6ld, %6ld, %p<%p,%lx,%p>, %d)",
+	     abfd, (long) offset, (long) size,
+	     windowp, windowp->data, (unsigned long) windowp->size,
+	     windowp->i, writable);
+
+  /* Make sure we know the page size, so we can be friendly to mmap.  */
+  if (pagesize == 0)
+    pagesize = getpagesize ();
+  if (pagesize == 0)
+    abort ();
+
+  if (i == NULL)
+    {
+      i = bfd_zmalloc (sizeof (bfd_window_internal));
+      if (i == NULL)
+	return FALSE;
+      i->data = NULL;
+    }
+#ifdef HAVE_MMAP
+  if (ok_to_map
+      && (i->data == NULL || i->mapped == 1)
+      && (abfd->flags & BFD_IN_MEMORY) == 0)
+    {
+      file_ptr file_offset, offset2;
+      size_t real_size;
+      int fd;
+
+      /* Find the real file and the real offset into it.  */
+      while (abfd->my_archive != NULL)
+	{
+	  offset += abfd->origin;
+	  abfd = abfd->my_archive;
+	}
+
+      /* Seek into the file, to ensure it is open if cacheable.  */
+      if (abfd->iostream == NULL
+	  && (abfd->iovec == NULL
+	      || abfd->iovec->bseek (abfd, offset, SEEK_SET) != 0))
+	goto free_and_fail;
+
+      fd = fileno ((FILE *) abfd->iostream);
+      /* Compute offsets and size for mmap and for the user's data.  */
+      offset2 = offset % pagesize;
+      if (offset2 < 0)
+	abort ();
+      file_offset = offset - offset2;
+      real_size = offset + size - file_offset;
+      real_size = real_size + pagesize - 1;
+      real_size -= real_size % pagesize;
+
+      /* If we're re-using a memory region, make sure it's big enough.  */
+      if (i->data != NULL && i->size < size)
+	{
+	  munmap (i->data, i->size);
+	  i->data = NULL;
+	}
+      i->data = mmap (i->data, real_size,
+		      writable ? PROT_WRITE | PROT_READ : PROT_READ,
+		      (writable
+		       ? MAP_FILE | MAP_PRIVATE
+		       : MAP_FILE | MAP_SHARED),
+		      fd, file_offset);
+      if (i->data == (void *) -1)
+	{
+	  /* An error happened.  Report it, or try using malloc, or
+	     something.  */
+	  bfd_set_error (bfd_error_system_call);
+	  windowp->data = 0;
+	  if (debug_windows)
+	    fprintf (stderr, "\t\tmmap failed!\n");
+	  goto free_and_fail;
+	}
+      if (debug_windows)
+	fprintf (stderr, "\n\tmapped %ld at %p, offset is %ld\n",
+		 (long) real_size, i->data, (long) offset2);
+      i->size = real_size;
+      windowp->data = (bfd_byte *) i->data + offset2;
+      windowp->size = size;
+      i->mapped = 1;
+      i->refcount = 1;
+      windowp->i = i;
+      return TRUE;
+    }
+  else if (debug_windows)
+    {
+      if (ok_to_map)
+	fprintf (stderr, _("not mapping: data=%lx mapped=%d\n"),
+		 (unsigned long) i->data, (int) i->mapped);
+      else
+	fprintf (stderr, _("not mapping: env var not set\n"));
+    }
+#else
+  ok_to_map = 0;
+#endif
+
+#ifdef HAVE_MPROTECT
+  if (!writable)
+    {
+      size_to_alloc += pagesize - 1;
+      size_to_alloc -= size_to_alloc % pagesize;
+    }
+#endif
+  if (debug_windows)
+    fprintf (stderr, "\n\t%s(%6ld)",
+	     i->data ? "realloc" : " malloc", (long) size_to_alloc);
+  i->data = bfd_realloc_or_free (i->data, size_to_alloc);
+  if (debug_windows)
+    fprintf (stderr, "\t-> %p\n", i->data);
+  if (i->data == NULL)
+    {
+      if (size_to_alloc == 0)
+	{
+	  windowp->i = i;
+	  return TRUE;
+	}
+      goto free_and_fail;
+    }
+  i->refcount = 1;
+  if (bfd_seek (abfd, offset, SEEK_SET) != 0)
+    goto free_and_fail;
+  i->size = bfd_bread (i->data, size, abfd);
+  if (i->size != size)
+    goto free_and_fail;
+  i->mapped = 0;
+#ifdef HAVE_MPROTECT
+  if (!writable)
+    {
+      if (debug_windows)
+	fprintf (stderr, "\tmprotect (%p, %ld, PROT_READ)\n", i->data,
+		 (long) i->size);
+      mprotect (i->data, i->size, PROT_READ);
+    }
+#endif
+  windowp->data = i->data;
+  windowp->size = i->size;
+  windowp->i = i;
+  return TRUE;
+
+ free_and_fail:
+  /* We have a bfd_window_internal, but an error occurred.  Free it. */
+  free (i);
+  return FALSE;
+}
+
+#endif /* USE_MMAP */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/binary.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/binary.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/binary.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/binary.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,369 @@
+/* BFD back-end for binary objects.
+   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007, 2009, 2011 Free Software Foundation, Inc.
+   Written by Ian Lance Taylor, Cygnus Support, <ian@cygnus.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This is a BFD backend which may be used to write binary objects.
+   It may only be used for output, not input.  The intention is that
+   this may be used as an output format for objcopy in order to
+   generate raw binary data.
+
+   This is very simple.  The only complication is that the real data
+   will start at some address X, and in some cases we will not want to
+   include X zeroes just to get to that point.  Since the start
+   address is not meaningful for this object file format, we use it
+   instead to indicate the number of zeroes to skip at the start of
+   the file.  objcopy cooperates by specially setting the start
+   address to zero by default.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "safe-ctype.h"
+#include "libbfd.h"
+
+/* Any bfd we create by reading a binary file has three symbols:
+   a start symbol, an end symbol, and an absolute length symbol.  */
+#define BIN_SYMS 3
+
+/* Create a binary object.  Invoked via bfd_set_format.  */
+
+static bfd_boolean
+binary_mkobject (bfd *abfd ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+/* Any file may be considered to be a binary file, provided the target
+   was not defaulted.  That is, it must be explicitly specified as
+   being binary.  */
+
+static const bfd_target *
+binary_object_p (bfd *abfd)
+{
+  struct stat statbuf;
+  asection *sec;
+  flagword flags;
+
+  if (abfd->target_defaulted)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  abfd->symcount = BIN_SYMS;
+
+  /* Find the file size.  */
+  if (bfd_stat (abfd, &statbuf) < 0)
+    {
+      bfd_set_error (bfd_error_system_call);
+      return NULL;
+    }
+
+  /* One data section.  */
+  flags = SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_HAS_CONTENTS;
+  sec = bfd_make_section_with_flags (abfd, ".data", flags);
+  if (sec == NULL)
+    return NULL;
+  sec->vma = 0;
+  sec->size = statbuf.st_size;
+  sec->filepos = 0;
+
+  abfd->tdata.any = (void *) sec;
+
+  return abfd->xvec;
+}
+
+#define binary_close_and_cleanup     _bfd_generic_close_and_cleanup
+#define binary_bfd_free_cached_info  _bfd_generic_bfd_free_cached_info
+#define binary_new_section_hook      _bfd_generic_new_section_hook
+
+/* Get contents of the only section.  */
+
+static bfd_boolean
+binary_get_section_contents (bfd *abfd,
+			     asection *section ATTRIBUTE_UNUSED,
+			     void * location,
+			     file_ptr offset,
+			     bfd_size_type count)
+{
+  if (bfd_seek (abfd, offset, SEEK_SET) != 0
+      || bfd_bread (location, count, abfd) != count)
+    return FALSE;
+  return TRUE;
+}
+
+/* Return the amount of memory needed to read the symbol table.  */
+
+static long
+binary_get_symtab_upper_bound (bfd *abfd ATTRIBUTE_UNUSED)
+{
+  return (BIN_SYMS + 1) * sizeof (asymbol *);
+}
+
+/* Create a symbol name based on the bfd's filename.  */
+
+static char *
+mangle_name (bfd *abfd, char *suffix)
+{
+  bfd_size_type size;
+  char *buf;
+  char *p;
+
+  size = (strlen (bfd_get_filename (abfd))
+	  + strlen (suffix)
+	  + sizeof "_binary__");
+
+  buf = (char *) bfd_alloc (abfd, size);
+  if (buf == NULL)
+    return "";
+
+  sprintf (buf, "_binary_%s_%s", bfd_get_filename (abfd), suffix);
+
+  /* Change any non-alphanumeric characters to underscores.  */
+  for (p = buf; *p; p++)
+    if (! ISALNUM (*p))
+      *p = '_';
+
+  return buf;
+}
+
+/* Return the symbol table.  */
+
+static long
+binary_canonicalize_symtab (bfd *abfd, asymbol **alocation)
+{
+  asection *sec = (asection *) abfd->tdata.any;
+  asymbol *syms;
+  unsigned int i;
+  bfd_size_type amt = BIN_SYMS * sizeof (asymbol);
+
+  syms = (asymbol *) bfd_alloc (abfd, amt);
+  if (syms == NULL)
+    return -1;
+
+  /* Start symbol.  */
+  syms[0].the_bfd = abfd;
+  syms[0].name = mangle_name (abfd, "start");
+  syms[0].value = 0;
+  syms[0].flags = BSF_GLOBAL;
+  syms[0].section = sec;
+  syms[0].udata.p = NULL;
+
+  /* End symbol.  */
+  syms[1].the_bfd = abfd;
+  syms[1].name = mangle_name (abfd, "end");
+  syms[1].value = sec->size;
+  syms[1].flags = BSF_GLOBAL;
+  syms[1].section = sec;
+  syms[1].udata.p = NULL;
+
+  /* Size symbol.  */
+  syms[2].the_bfd = abfd;
+  syms[2].name = mangle_name (abfd, "size");
+  syms[2].value = sec->size;
+  syms[2].flags = BSF_GLOBAL;
+  syms[2].section = bfd_abs_section_ptr;
+  syms[2].udata.p = NULL;
+
+  for (i = 0; i < BIN_SYMS; i++)
+    *alocation++ = syms++;
+  *alocation = NULL;
+
+  return BIN_SYMS;
+}
+
+#define binary_make_empty_symbol  _bfd_generic_make_empty_symbol
+#define binary_print_symbol       _bfd_nosymbols_print_symbol
+
+/* Get information about a symbol.  */
+
+static void
+binary_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+			asymbol *symbol,
+			symbol_info *ret)
+{
+  bfd_symbol_info (symbol, ret);
+}
+
+#define binary_bfd_is_local_label_name      bfd_generic_is_local_label_name
+#define binary_get_lineno                  _bfd_nosymbols_get_lineno
+#define binary_find_nearest_line           _bfd_nosymbols_find_nearest_line
+#define binary_find_inliner_info           _bfd_nosymbols_find_inliner_info
+#define binary_bfd_make_debug_symbol       _bfd_nosymbols_bfd_make_debug_symbol
+#define binary_read_minisymbols            _bfd_generic_read_minisymbols
+#define binary_minisymbol_to_symbol        _bfd_generic_minisymbol_to_symbol
+#define binary_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+
+/* Set the architecture of a binary file.  */
+#define binary_set_arch_mach _bfd_generic_set_arch_mach
+
+/* Write section contents of a binary file.  */
+
+static bfd_boolean
+binary_set_section_contents (bfd *abfd,
+			     asection *sec,
+			     const void * data,
+			     file_ptr offset,
+			     bfd_size_type size)
+{
+  if (size == 0)
+    return TRUE;
+
+  if (! abfd->output_has_begun)
+    {
+      bfd_boolean found_low;
+      bfd_vma low;
+      asection *s;
+
+      /* The lowest section LMA sets the virtual address of the start
+         of the file.  We use this to set the file position of all the
+         sections.  */
+      found_low = FALSE;
+      low = 0;
+      for (s = abfd->sections; s != NULL; s = s->next)
+	if (((s->flags
+	      & (SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC | SEC_NEVER_LOAD))
+	     == (SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC))
+	    && (s->size > 0)
+	    && (! found_low || s->lma < low))
+	  {
+	    low = s->lma;
+	    found_low = TRUE;
+	  }
+
+      for (s = abfd->sections; s != NULL; s = s->next)
+	{
+	  s->filepos = s->lma - low;
+
+	  /* Skip following warning check for sections that will not
+	     occupy file space.  */
+	  if ((s->flags
+	       & (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_NEVER_LOAD))
+	      != (SEC_HAS_CONTENTS | SEC_ALLOC)
+	      || (s->size == 0))
+	    continue;
+
+	  /* If attempting to generate a binary file from a bfd with
+	     LMA's all over the place, huge (sparse?) binary files may
+	     result.  This condition attempts to detect this situation
+	     and print a warning.  Better heuristics would be nice to
+	     have.  */
+
+	  if (s->filepos < 0)
+	    (*_bfd_error_handler)
+	      (_("Warning: Writing section `%s' to huge (ie negative) file offset 0x%lx."),
+	       bfd_get_section_name (abfd, s),
+	       (unsigned long) s->filepos);
+	}
+
+      abfd->output_has_begun = TRUE;
+    }
+
+  /* We don't want to output anything for a section that is neither
+     loaded nor allocated.  The contents of such a section are not
+     meaningful in the binary format.  */
+  if ((sec->flags & (SEC_LOAD | SEC_ALLOC)) == 0)
+    return TRUE;
+  if ((sec->flags & SEC_NEVER_LOAD) != 0)
+    return TRUE;
+
+  return _bfd_generic_set_section_contents (abfd, sec, data, offset, size);
+}
+
+/* No space is required for header information.  */
+
+static int
+binary_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+		       struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+#define binary_bfd_get_relocated_section_contents  bfd_generic_get_relocated_section_contents
+#define binary_bfd_relax_section                   bfd_generic_relax_section
+#define binary_bfd_gc_sections                     bfd_generic_gc_sections
+#define binary_bfd_lookup_section_flags            bfd_generic_lookup_section_flags
+#define binary_bfd_merge_sections                  bfd_generic_merge_sections
+#define binary_bfd_is_group_section                bfd_generic_is_group_section
+#define binary_bfd_discard_group                   bfd_generic_discard_group
+#define binary_section_already_linked             _bfd_generic_section_already_linked
+#define binary_bfd_define_common_symbol            bfd_generic_define_common_symbol
+#define binary_bfd_link_hash_table_create         _bfd_generic_link_hash_table_create
+#define binary_bfd_link_hash_table_free           _bfd_generic_link_hash_table_free
+#define binary_bfd_link_just_syms                 _bfd_generic_link_just_syms
+#define binary_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define binary_bfd_link_add_symbols               _bfd_generic_link_add_symbols
+#define binary_bfd_final_link                     _bfd_generic_final_link
+#define binary_bfd_link_split_section             _bfd_generic_link_split_section
+#define binary_get_section_contents_in_window     _bfd_generic_get_section_contents_in_window
+
+const bfd_target binary_vec =
+{
+  "binary",			/* name */
+  bfd_target_unknown_flavour,	/* flavour */
+  BFD_ENDIAN_UNKNOWN,		/* byteorder */
+  BFD_ENDIAN_UNKNOWN,		/* header_byteorder */
+  EXEC_P,			/* object_flags */
+  (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE | SEC_DATA
+   | SEC_ROM | SEC_HAS_CONTENTS), /* section_flags */
+  0,				/* symbol_leading_char */
+  ' ',				/* ar_pad_char */
+  16,				/* ar_max_namelen */
+  255,				/* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* hdrs */
+  {				/* bfd_check_format */
+    _bfd_dummy_target,
+    binary_object_p,
+    _bfd_dummy_target,
+    _bfd_dummy_target,
+  },
+  {				/* bfd_set_format */
+    bfd_false,
+    binary_mkobject,
+    bfd_false,
+    bfd_false,
+  },
+  {				/* bfd_write_contents */
+    bfd_false,
+    bfd_true,
+    bfd_false,
+    bfd_false,
+  },
+
+  BFD_JUMP_TABLE_GENERIC (binary),
+  BFD_JUMP_TABLE_COPY (_bfd_generic),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+  BFD_JUMP_TABLE_SYMBOLS (binary),
+  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+  BFD_JUMP_TABLE_WRITE (binary),
+  BFD_JUMP_TABLE_LINK (binary),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  NULL
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/bout.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/bout.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/bout.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/bout.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1483 @@
+/* BFD back-end for Intel 960 b.out binaries.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "bfdlink.h"
+#include "genlink.h"
+#include "bout.h"
+#include "libiberty.h"
+
+#include "aout/stab_gnu.h"
+#include "libaout.h"		/* BFD a.out internal data structures.  */
+
+#define ABS32CODE 0
+#define ABS32CODE_SHRUNK 1
+#define PCREL24 2
+#define CALLJ 3
+#define ABS32 4
+#define PCREL13 5
+#define ABS32_MAYBE_RELAXABLE 1
+#define ABS32_WAS_RELAXABLE 2
+
+#define ALIGNER 10
+#define ALIGNDONE 11
+
+static reloc_howto_type howto_reloc_callj =
+  HOWTO (CALLJ, 0, 2, 24, TRUE, 0, complain_overflow_signed, 0,"callj", TRUE, 0x00ffffff, 0x00ffffff,FALSE);
+static  reloc_howto_type howto_reloc_abs32 =
+  HOWTO (ABS32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,0,"abs32", TRUE, 0xffffffff,0xffffffff,FALSE);
+static reloc_howto_type howto_reloc_pcrel24 =
+  HOWTO (PCREL24, 0, 2, 24, TRUE, 0, complain_overflow_signed,0,"pcrel24", TRUE, 0x00ffffff,0x00ffffff,FALSE);
+static reloc_howto_type howto_reloc_pcrel13 =
+  HOWTO (PCREL13, 0, 2, 13, TRUE, 0, complain_overflow_signed,0,"pcrel13", TRUE, 0x00001fff,0x00001fff,FALSE);
+static reloc_howto_type howto_reloc_abs32codeshrunk =
+  HOWTO (ABS32CODE_SHRUNK, 0, 2, 24, TRUE, 0, complain_overflow_signed, 0,"callx->callj", TRUE, 0x00ffffff, 0x00ffffff,FALSE);
+static  reloc_howto_type howto_reloc_abs32code =
+  HOWTO (ABS32CODE, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,0,"callx", TRUE, 0xffffffff,0xffffffff,FALSE);
+
+static reloc_howto_type howto_align_table[] =
+{
+  HOWTO (ALIGNER, 0, 0x1, 0, FALSE, 0, complain_overflow_dont, 0, "align16", FALSE, 0, 0, FALSE),
+  HOWTO (ALIGNER, 0, 0x3, 0, FALSE, 0, complain_overflow_dont, 0, "align32", FALSE, 0, 0, FALSE),
+  HOWTO (ALIGNER, 0, 0x7, 0, FALSE, 0, complain_overflow_dont, 0, "align64", FALSE, 0, 0, FALSE),
+  HOWTO (ALIGNER, 0, 0xf, 0, FALSE, 0, complain_overflow_dont, 0, "align128", FALSE, 0, 0, FALSE),
+};
+
+static reloc_howto_type howto_done_align_table[] =
+{
+  HOWTO (ALIGNDONE, 0x1, 0x1, 0, FALSE, 0, complain_overflow_dont, 0, "donealign16", FALSE, 0, 0, FALSE),
+  HOWTO (ALIGNDONE, 0x3, 0x3, 0, FALSE, 0, complain_overflow_dont, 0, "donealign32", FALSE, 0, 0, FALSE),
+  HOWTO (ALIGNDONE, 0x7, 0x7, 0, FALSE, 0, complain_overflow_dont, 0, "donealign64", FALSE, 0, 0, FALSE),
+  HOWTO (ALIGNDONE, 0xf, 0xf, 0, FALSE, 0, complain_overflow_dont, 0, "donealign128", FALSE, 0, 0, FALSE),
+};
+
+/* Swaps the information in an executable header taken from a raw byte
+   stream memory image, into the internal exec_header structure.  */
+
+static void
+bout_swap_exec_header_in (bfd *abfd,
+			  struct external_exec *bytes,
+			  struct internal_exec *execp)
+{
+  /* Now fill in fields in the execp, from the bytes in the raw data.  */
+  execp->a_info      = H_GET_32 (abfd, bytes->e_info);
+  execp->a_text      = GET_WORD (abfd, bytes->e_text);
+  execp->a_data      = GET_WORD (abfd, bytes->e_data);
+  execp->a_bss       = GET_WORD (abfd, bytes->e_bss);
+  execp->a_syms      = GET_WORD (abfd, bytes->e_syms);
+  execp->a_entry     = GET_WORD (abfd, bytes->e_entry);
+  execp->a_trsize    = GET_WORD (abfd, bytes->e_trsize);
+  execp->a_drsize    = GET_WORD (abfd, bytes->e_drsize);
+  execp->a_tload     = GET_WORD (abfd, bytes->e_tload);
+  execp->a_dload     = GET_WORD (abfd, bytes->e_dload);
+  execp->a_talign    = bytes->e_talign[0];
+  execp->a_dalign    = bytes->e_dalign[0];
+  execp->a_balign    = bytes->e_balign[0];
+  execp->a_relaxable = bytes->e_relaxable[0];
+}
+
+/* Swaps the information in an internal exec header structure into the
+   supplied buffer ready for writing to disk.  */
+
+static void
+bout_swap_exec_header_out (bfd *abfd,
+			   struct internal_exec *execp,
+			   struct external_exec *bytes)
+{
+  /* Now fill in fields in the raw data, from the fields in the exec struct.  */
+  H_PUT_32 (abfd, execp->a_info  , bytes->e_info);
+  PUT_WORD (abfd, execp->a_text  , bytes->e_text);
+  PUT_WORD (abfd, execp->a_data  , bytes->e_data);
+  PUT_WORD (abfd, execp->a_bss   , bytes->e_bss);
+  PUT_WORD (abfd, execp->a_syms  , bytes->e_syms);
+  PUT_WORD (abfd, execp->a_entry , bytes->e_entry);
+  PUT_WORD (abfd, execp->a_trsize, bytes->e_trsize);
+  PUT_WORD (abfd, execp->a_drsize, bytes->e_drsize);
+  PUT_WORD (abfd, execp->a_tload , bytes->e_tload);
+  PUT_WORD (abfd, execp->a_dload , bytes->e_dload);
+  bytes->e_talign[0]    = execp->a_talign;
+  bytes->e_dalign[0]    = execp->a_dalign;
+  bytes->e_balign[0]    = execp->a_balign;
+  bytes->e_relaxable[0] = execp->a_relaxable;
+}
+
+/* Finish up the opening of a b.out file for reading.  Fill in all the
+   fields that are not handled by common code.  */
+
+static const bfd_target *
+b_out_callback (bfd *abfd)
+{
+  struct internal_exec *execp = exec_hdr (abfd);
+  unsigned long bss_start;
+
+  /* Architecture and machine type.  */
+  bfd_set_arch_mach (abfd,
+		     bfd_arch_i960,     /* B.out only used on i960.  */
+		     bfd_mach_i960_core /* Default.  */
+		     );
+
+  /* The positions of the string table and symbol table.  */
+  obj_str_filepos (abfd) = N_STROFF (*execp);
+  obj_sym_filepos (abfd) = N_SYMOFF (*execp);
+
+  /* The alignments of the sections.  */
+  obj_textsec (abfd)->alignment_power = execp->a_talign;
+  obj_datasec (abfd)->alignment_power = execp->a_dalign;
+  obj_bsssec  (abfd)->alignment_power = execp->a_balign;
+
+  /* The starting addresses of the sections.  */
+  obj_textsec (abfd)->vma = execp->a_tload;
+  obj_datasec (abfd)->vma = execp->a_dload;
+
+  obj_textsec (abfd)->lma = obj_textsec (abfd)->vma;
+  obj_datasec (abfd)->lma = obj_datasec (abfd)->vma;
+
+  /* And reload the sizes, since the aout module zaps them.  */
+  obj_textsec (abfd)->size = execp->a_text;
+
+  bss_start = execp->a_dload + execp->a_data; /* BSS = end of data section.  */
+  obj_bsssec (abfd)->vma = align_power (bss_start, execp->a_balign);
+
+  obj_bsssec (abfd)->lma = obj_bsssec (abfd)->vma;
+
+  /* The file positions of the sections.  */
+  obj_textsec (abfd)->filepos = N_TXTOFF (*execp);
+  obj_datasec (abfd)->filepos = N_DATOFF (*execp);
+
+  /* The file positions of the relocation info.  */
+  obj_textsec (abfd)->rel_filepos = N_TROFF (*execp);
+  obj_datasec (abfd)->rel_filepos =  N_DROFF (*execp);
+
+  adata (abfd).page_size = 1;	/* Not applicable.  */
+  adata (abfd).segment_size = 1; /* Not applicable.  */
+  adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
+
+  if (execp->a_relaxable)
+   abfd->flags |= BFD_IS_RELAXABLE;
+  return abfd->xvec;
+}
+
+static const bfd_target *
+b_out_object_p (bfd *abfd)
+{
+  struct internal_exec anexec;
+  struct external_exec exec_bytes;
+  bfd_size_type amt = EXEC_BYTES_SIZE;
+
+  if (bfd_bread ((void *) &exec_bytes, amt, abfd) != amt)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return 0;
+    }
+
+  anexec.a_info = H_GET_32 (abfd, exec_bytes.e_info);
+
+  if (N_BADMAG (anexec))
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return 0;
+    }
+
+  bout_swap_exec_header_in (abfd, &exec_bytes, &anexec);
+  return aout_32_some_aout_object_p (abfd, &anexec, b_out_callback);
+}
+
+struct bout_data_struct
+  {
+    struct aoutdata a;
+    struct internal_exec e;
+  };
+
+static bfd_boolean
+b_out_mkobject (bfd *abfd)
+{
+  struct bout_data_struct *rawptr;
+  bfd_size_type amt = sizeof (struct bout_data_struct);
+
+  rawptr = bfd_zalloc (abfd, amt);
+  if (rawptr == NULL)
+    return FALSE;
+
+  abfd->tdata.bout_data = rawptr;
+  exec_hdr (abfd) = &rawptr->e;
+
+  obj_textsec (abfd) = NULL;
+  obj_datasec (abfd) = NULL;
+  obj_bsssec (abfd)  = NULL;
+
+  return TRUE;
+}
+
+static int
+b_out_symbol_cmp (const void * a_ptr, const void * b_ptr)
+{
+  struct aout_symbol ** a = (struct aout_symbol **) a_ptr;
+  struct aout_symbol ** b = (struct aout_symbol **) b_ptr;
+  asection *sec;
+  bfd_vma av, bv;
+
+  /* Primary key is address.  */
+  sec = bfd_get_section (&(*a)->symbol);
+  av = sec->output_section->vma + sec->output_offset + (*a)->symbol.value;
+  sec = bfd_get_section (&(*b)->symbol);
+  bv = sec->output_section->vma + sec->output_offset + (*b)->symbol.value;
+
+  if (av < bv)
+    return -1;
+  if (av > bv)
+    return 1;
+
+  /* Secondary key puts CALLNAME syms last and BALNAME syms first,
+     so that they have the best chance of being contiguous.  */
+  if (IS_BALNAME ((*a)->other) || IS_CALLNAME ((*b)->other))
+    return -1;
+  if (IS_CALLNAME ((*a)->other) || IS_BALNAME ((*b)->other))
+    return 1;
+
+  return 0;
+}
+
+static bfd_boolean
+b_out_squirt_out_relocs (bfd *abfd, asection *section)
+{
+  arelent **generic;
+  int r_extern = 0;
+  int r_idx;
+  int incode_mask;
+  int len_1;
+  unsigned int count = section->reloc_count;
+  struct relocation_info *native, *natptr;
+  bfd_size_type natsize;
+  int extern_mask, pcrel_mask, len_2, callj_mask;
+
+  if (count == 0)
+    return TRUE;
+
+  generic = section->orelocation;
+  natsize = (bfd_size_type) count * sizeof (struct relocation_info);
+  native = bfd_malloc (natsize);
+  if (!native && natsize != 0)
+    return FALSE;
+
+  if (bfd_header_big_endian (abfd))
+    {
+      /* Big-endian bit field allocation order.  */
+      pcrel_mask  = 0x80;
+      extern_mask = 0x10;
+      len_2       = 0x40;
+      len_1       = 0x20;
+      callj_mask  = 0x02;
+      incode_mask = 0x08;
+    }
+  else
+    {
+      /* Little-endian bit field allocation order.  */
+      pcrel_mask  = 0x01;
+      extern_mask = 0x08;
+      len_2       = 0x04;
+      len_1       = 0x02;
+      callj_mask  = 0x40;
+      incode_mask = 0x10;
+    }
+
+  for (natptr = native; count > 0; --count, ++natptr, ++generic)
+    {
+      arelent *g = *generic;
+      unsigned char *raw = (unsigned char *) natptr;
+      asymbol *sym = *(g->sym_ptr_ptr);
+      asection *output_section = sym->section->output_section;
+
+      H_PUT_32 (abfd, g->address, raw);
+      /* Find a type in the output format which matches the input howto -
+	 at the moment we assume input format == output format FIXME!!  */
+      r_idx = 0;
+      /* FIXME:  Need callj stuff here, and to check the howto entries to
+	 be sure they are real for this architecture.  */
+      if (g->howto== &howto_reloc_callj)
+	raw[7] = callj_mask + pcrel_mask + len_2;
+      else if (g->howto == &howto_reloc_pcrel24)
+	raw[7] = pcrel_mask + len_2;
+      else if (g->howto == &howto_reloc_pcrel13)
+	raw[7] = pcrel_mask + len_1;
+      else if (g->howto == &howto_reloc_abs32code)
+	raw[7] = len_2 + incode_mask;
+      else if (g->howto >= howto_align_table
+	       && g->howto <= (howto_align_table + ARRAY_SIZE (howto_align_table) - 1))
+	{
+	  /* symnum == -2; extern_mask not set, pcrel_mask set.  */
+	  r_idx = -2;
+	  r_extern = 0;
+	  raw[7] = (pcrel_mask
+		    | ((g->howto - howto_align_table) << 1));
+	}
+      else
+	raw[7] = len_2;
+
+      if (r_idx != 0)
+	/* Already mucked with r_extern, r_idx.  */;
+      else if (bfd_is_com_section (output_section)
+	       || bfd_is_abs_section (output_section)
+	       || bfd_is_und_section (output_section))
+	{
+	  if (bfd_abs_section_ptr->symbol == sym)
+	    {
+	      /* Whoops, looked like an abs symbol, but is really an offset
+		 from the abs section.  */
+	      r_idx = 0;
+	      r_extern = 0;
+	    }
+	  else
+	    {
+	      /* Fill in symbol.  */
+	      r_extern = 1;
+	      r_idx = (*g->sym_ptr_ptr)->udata.i;
+	    }
+	}
+      else
+	{
+	  /* Just an ordinary section.  */
+	  r_extern = 0;
+	  r_idx  = output_section->target_index;
+	}
+
+      if (bfd_header_big_endian (abfd))
+	{
+	  raw[4] = (unsigned char) (r_idx >> 16);
+	  raw[5] = (unsigned char) (r_idx >>  8);
+	  raw[6] = (unsigned char) (r_idx      );
+	}
+      else
+	{
+	  raw[6] = (unsigned char) (r_idx >> 16);
+	  raw[5] = (unsigned char) (r_idx>>   8);
+	  raw[4] = (unsigned char) (r_idx      );
+	}
+
+      if (r_extern)
+	raw[7] |= extern_mask;
+    }
+
+  if (bfd_bwrite ((void *) native, natsize, abfd) != natsize)
+    {
+      free (native);
+      return FALSE;
+    }
+
+  free (native);
+
+  return TRUE;
+}
+
+static bfd_boolean
+b_out_write_object_contents (bfd *abfd)
+{
+  struct external_exec swapped_hdr;
+  bfd_size_type amt;
+
+  if (! aout_32_make_sections (abfd))
+    return FALSE;
+
+  exec_hdr (abfd)->a_info = BMAGIC;
+
+  exec_hdr (abfd)->a_text = obj_textsec (abfd)->size;
+  exec_hdr (abfd)->a_data = obj_datasec (abfd)->size;
+  exec_hdr (abfd)->a_bss = obj_bsssec (abfd)->size;
+  exec_hdr (abfd)->a_syms = bfd_get_symcount (abfd) * 12;
+  exec_hdr (abfd)->a_entry = bfd_get_start_address (abfd);
+  exec_hdr (abfd)->a_trsize = (obj_textsec (abfd)->reloc_count) * 8;
+  exec_hdr (abfd)->a_drsize = (obj_datasec (abfd)->reloc_count) * 8;
+
+  exec_hdr (abfd)->a_talign = obj_textsec (abfd)->alignment_power;
+  exec_hdr (abfd)->a_dalign = obj_datasec (abfd)->alignment_power;
+  exec_hdr (abfd)->a_balign = obj_bsssec (abfd)->alignment_power;
+
+  exec_hdr (abfd)->a_tload = obj_textsec (abfd)->vma;
+  exec_hdr (abfd)->a_dload = obj_datasec (abfd)->vma;
+
+  bout_swap_exec_header_out (abfd, exec_hdr (abfd), &swapped_hdr);
+
+  amt = EXEC_BYTES_SIZE;
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
+      || bfd_bwrite ((void *) &swapped_hdr, amt, abfd) != amt)
+    return FALSE;
+
+  /* Now write out reloc info, followed by syms and strings */
+  if (bfd_get_symcount (abfd) != 0)
+    {
+      /* Make sure {CALL,BAL}NAME symbols remain adjacent on output
+	 by sorting.  This is complicated by the fact that stabs are
+	 also ordered.  Solve this by shifting all stabs to the end
+	 in order, then sorting the rest.  */
+
+      asymbol **outsyms, **p, **q;
+
+      outsyms = bfd_get_outsymbols (abfd);
+      p = outsyms + bfd_get_symcount (abfd);
+
+      for (q = p--; p >= outsyms; p--)
+	{
+	  if ((*p)->flags & BSF_DEBUGGING)
+	    {
+	      asymbol *t = *--q;
+	      *q = *p;
+	      *p = t;
+	    }
+	}
+
+      if (q > outsyms)
+	qsort (outsyms, (size_t) (q - outsyms), sizeof (asymbol*),
+	       b_out_symbol_cmp);
+
+      /* Back to your regularly scheduled program.  */
+      if (bfd_seek (abfd, (file_ptr) (N_SYMOFF (*exec_hdr (abfd))), SEEK_SET)
+	  != 0)
+	return FALSE;
+
+      if (! aout_32_write_syms (abfd))
+	return FALSE;
+
+      if (bfd_seek (abfd, (file_ptr) (N_TROFF (*exec_hdr (abfd))), SEEK_SET)
+	  != 0)
+	return FALSE;
+
+      if (!b_out_squirt_out_relocs (abfd, obj_textsec (abfd)))
+	return FALSE;
+      if (bfd_seek (abfd, (file_ptr) (N_DROFF (*exec_hdr (abfd))), SEEK_SET)
+	  != 0)
+	return FALSE;
+
+      if (!b_out_squirt_out_relocs (abfd, obj_datasec (abfd)))
+	return FALSE;
+    }
+  return TRUE;
+}
+
+/* Some reloc hackery.  */
+
+#define CALLS	  0x66003800	/* Template for 'calls' instruction	*/
+#define BAL	  0x0b000000	/* Template for 'bal' instruction 	*/
+#define BAL_MASK  0x00ffffff
+#define BALX	  0x85f00000	/* Template for 'balx' instruction	*/
+#define BALX_MASK 0x0007ffff
+#define CALL      0x09000000
+#define PCREL13_MASK 0x1fff
+
+#define output_addr(sec) ((sec)->output_offset+(sec)->output_section->vma)
+
+static bfd_vma
+get_value (arelent *reloc,
+	   struct bfd_link_info *link_info,
+	   asection *input_section)
+{
+  bfd_vma value;
+  asymbol *symbol = *(reloc->sym_ptr_ptr);
+
+  /* A symbol holds a pointer to a section, and an offset from the
+     base of the section.  To relocate, we find where the section will
+     live in the output and add that in.  */
+  if (bfd_is_und_section (symbol->section))
+    {
+      struct bfd_link_hash_entry *h;
+
+      /* The symbol is undefined in this BFD.  Look it up in the
+	 global linker hash table.  FIXME: This should be changed when
+	 we convert b.out to use a specific final_link function and
+	 change the interface to bfd_relax_section to not require the
+	 generic symbols.  */
+      h = bfd_wrapped_link_hash_lookup (input_section->owner, link_info,
+					bfd_asymbol_name (symbol),
+					FALSE, FALSE, TRUE);
+      if (h != (struct bfd_link_hash_entry *) NULL
+	  && (h->type == bfd_link_hash_defined
+	      || h->type == bfd_link_hash_defweak))
+	value = h->u.def.value + output_addr (h->u.def.section);
+      else if (h != (struct bfd_link_hash_entry *) NULL
+	       && h->type == bfd_link_hash_common)
+	value = h->u.c.size;
+      else
+	{
+	  if (! ((*link_info->callbacks->undefined_symbol)
+		 (link_info, bfd_asymbol_name (symbol),
+		  input_section->owner, input_section, reloc->address,
+		  TRUE)))
+	    abort ();
+	  value = 0;
+	}
+    }
+  else
+    value = symbol->value + output_addr (symbol->section);
+
+  /* Add the value contained in the relocation.  */
+  value += reloc->addend;
+
+  return value;
+}
+
+/* Magic to turn callx into calljx.  */
+
+static bfd_reloc_status_type
+calljx_callback (bfd *abfd,
+		 struct bfd_link_info *link_info,
+		 arelent *reloc_entry,
+		 void * src,
+		 void * dst,
+		 asection *input_section)
+{
+  int word = bfd_get_32 (abfd, src);
+  asymbol *symbol_in = *(reloc_entry->sym_ptr_ptr);
+  aout_symbol_type *symbol = aout_symbol (symbol_in);
+  bfd_vma value;
+
+  value = get_value (reloc_entry, link_info, input_section);
+
+  if (IS_CALLNAME (symbol->other))
+    {
+      aout_symbol_type *balsym = symbol+1;
+      int inst = bfd_get_32 (abfd, (bfd_byte *) src-4);
+
+      /* The next symbol should be an N_BALNAME.  */
+      BFD_ASSERT (IS_BALNAME (balsym->other));
+      inst &= BALX_MASK;
+      inst |= BALX;
+      bfd_put_32 (abfd, (bfd_vma) inst, (bfd_byte *) dst-4);
+      symbol = balsym;
+      value = (symbol->symbol.value
+	       + output_addr (symbol->symbol.section));
+    }
+
+  word += value + reloc_entry->addend;
+
+  bfd_put_32 (abfd, (bfd_vma) word, dst);
+  return bfd_reloc_ok;
+}
+
+/* Magic to turn call into callj.  */
+
+static bfd_reloc_status_type
+callj_callback (bfd *abfd,
+		struct bfd_link_info *link_info,
+		arelent *reloc_entry,
+		void * data,
+		unsigned int srcidx,
+		unsigned int dstidx,
+		asection *input_section,
+		bfd_boolean shrinking)
+{
+  int word = bfd_get_32 (abfd, (bfd_byte *) data + srcidx);
+  asymbol *symbol_in = *(reloc_entry->sym_ptr_ptr);
+  aout_symbol_type *symbol = aout_symbol (symbol_in);
+  bfd_vma value;
+
+  value = get_value (reloc_entry, link_info, input_section);
+
+  if (IS_OTHER (symbol->other))
+    /* Call to a system procedure - replace code with system
+       procedure number.  */
+    word = CALLS | (symbol->other - 1);
+
+  else if (IS_CALLNAME (symbol->other))
+    {
+      aout_symbol_type *balsym = symbol+1;
+
+      /* The next symbol should be an N_BALNAME.  */
+      BFD_ASSERT (IS_BALNAME (balsym->other));
+
+      /* We are calling a leaf, so replace the call instruction with a
+	 bal.  */
+      word = BAL | ((word
+		     + output_addr (balsym->symbol.section)
+		     + balsym->symbol.value + reloc_entry->addend
+		     - dstidx
+		     - output_addr (input_section))
+		    & BAL_MASK);
+    }
+  else if ((symbol->symbol.flags & BSF_SECTION_SYM) != 0)
+    {
+      /* A callj against a symbol in the same section is a fully
+         resolved relative call.  We don't need to do anything here.
+         If the symbol is not in the same section, I'm not sure what
+         to do; fortunately, this case will probably never arise.  */
+      BFD_ASSERT (! shrinking);
+      BFD_ASSERT (symbol->symbol.section == input_section);
+    }
+  else
+    word = CALL | (((word & BAL_MASK)
+		    + value
+		    + reloc_entry->addend
+		    - (shrinking ? dstidx : 0)
+		    - output_addr (input_section))
+		   & BAL_MASK);
+
+  bfd_put_32 (abfd, (bfd_vma) word, (bfd_byte *) data + dstidx);
+  return bfd_reloc_ok;
+}
+
+static reloc_howto_type *
+b_out_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			     bfd_reloc_code_real_type code)
+{
+  switch (code)
+    {
+    default:
+      return 0;
+    case BFD_RELOC_I960_CALLJ:
+      return &howto_reloc_callj;
+    case BFD_RELOC_32:
+    case BFD_RELOC_CTOR:
+      return &howto_reloc_abs32;
+    case BFD_RELOC_24_PCREL:
+      return &howto_reloc_pcrel24;
+    }
+}
+
+static reloc_howto_type *
+b_out_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			     const char *r_name)
+{
+  if (strcasecmp (howto_reloc_callj.name, r_name) == 0)
+    return &howto_reloc_callj;
+  if (strcasecmp (howto_reloc_abs32.name, r_name) == 0)
+    return &howto_reloc_abs32;
+  if (strcasecmp (howto_reloc_pcrel24.name, r_name) == 0)
+    return &howto_reloc_pcrel24;
+
+  return NULL;
+}
+
+/* Allocate enough room for all the reloc entries, plus pointers to them all.  */
+
+static bfd_boolean
+b_out_slurp_reloc_table (bfd *abfd, sec_ptr asect, asymbol **symbols)
+{
+  struct relocation_info *rptr;
+  unsigned int counter;
+  arelent *cache_ptr;
+  int extern_mask, pcrel_mask, callj_mask, length_shift;
+  int incode_mask;
+  int size_mask;
+  bfd_vma prev_addr = 0;
+  unsigned int count;
+  bfd_size_type reloc_size, amt;
+  struct relocation_info *relocs;
+  arelent *reloc_cache;
+
+  if (asect->relocation)
+    return TRUE;
+
+  if (!aout_32_slurp_symbol_table (abfd))
+    return FALSE;
+
+  if (asect == obj_datasec (abfd))
+    reloc_size = exec_hdr (abfd)->a_drsize;
+  else if (asect == obj_textsec (abfd))
+    reloc_size = exec_hdr (abfd)->a_trsize;
+  else if (asect == obj_bsssec (abfd))
+    reloc_size = 0;
+  else
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0)
+    return FALSE;
+  count = reloc_size / sizeof (struct relocation_info);
+
+  relocs = bfd_malloc (reloc_size);
+  if (!relocs && reloc_size != 0)
+    return FALSE;
+
+  amt = ((bfd_size_type) count + 1) * sizeof (arelent);
+  reloc_cache = bfd_malloc (amt);
+  if (!reloc_cache)
+    {
+      if (relocs != NULL)
+	free (relocs);
+      return FALSE;
+    }
+
+  if (bfd_bread ((void *) relocs, reloc_size, abfd) != reloc_size)
+    {
+      free (reloc_cache);
+      if (relocs != NULL)
+	free (relocs);
+      return FALSE;
+    }
+
+  if (bfd_header_big_endian (abfd))
+    {
+      /* Big-endian bit field allocation order.  */
+      pcrel_mask  = 0x80;
+      extern_mask = 0x10;
+      incode_mask = 0x08;
+      callj_mask  = 0x02;
+      size_mask =   0x20;
+      length_shift = 5;
+    }
+  else
+    {
+      /* Little-endian bit field allocation order.  */
+      pcrel_mask  = 0x01;
+      extern_mask = 0x08;
+      incode_mask = 0x10;
+      callj_mask  = 0x40;
+      size_mask   = 0x02;
+      length_shift = 1;
+    }
+
+  for (rptr = relocs, cache_ptr = reloc_cache, counter = 0;
+       counter < count;
+       counter++, rptr++, cache_ptr++)
+  {
+    unsigned char *raw = (unsigned char *)rptr;
+    unsigned int symnum;
+
+    cache_ptr->address = H_GET_32 (abfd, raw + 0);
+    cache_ptr->howto = 0;
+
+    if (bfd_header_big_endian (abfd))
+      symnum = (raw[4] << 16) | (raw[5] << 8) | raw[6];
+    else
+      symnum = (raw[6] << 16) | (raw[5] << 8) | raw[4];
+
+    if (raw[7] & extern_mask)
+      {
+	/* If this is set then the r_index is an index into the symbol table;
+	   if the bit is not set then r_index contains a section map.
+	   We either fill in the sym entry with a pointer to the symbol,
+	   or point to the correct section.  */
+      cache_ptr->sym_ptr_ptr = symbols + symnum;
+      cache_ptr->addend = 0;
+      }
+    else
+      {
+	/* In a.out symbols are relative to the beginning of the
+	   file rather than sections ?
+	   (look in translate_from_native_sym_flags)
+	   The reloc entry addend has added to it the offset into the
+	   file of the data, so subtract the base to make the reloc
+	   section relative.  */
+	int s;
+
+	/* Sign-extend symnum from 24 bits to whatever host uses.  */
+	s = symnum;
+	if (s & (1 << 23))
+	  s |= (~0) << 24;
+
+	cache_ptr->sym_ptr_ptr = (asymbol **)NULL;
+	switch (s)
+	  {
+	  case N_TEXT:
+	  case N_TEXT | N_EXT:
+	    cache_ptr->sym_ptr_ptr = obj_textsec (abfd)->symbol_ptr_ptr;
+	    cache_ptr->addend = - obj_textsec (abfd)->vma;
+	    break;
+	  case N_DATA:
+	  case N_DATA | N_EXT:
+	    cache_ptr->sym_ptr_ptr = obj_datasec (abfd)->symbol_ptr_ptr;
+	    cache_ptr->addend = - obj_datasec (abfd)->vma;
+	    break;
+	  case N_BSS:
+	  case N_BSS | N_EXT:
+	    cache_ptr->sym_ptr_ptr = obj_bsssec (abfd)->symbol_ptr_ptr;
+	    cache_ptr->addend =  - obj_bsssec (abfd)->vma;
+	    break;
+	  case N_ABS:
+	  case N_ABS | N_EXT:
+	    cache_ptr->sym_ptr_ptr = obj_bsssec (abfd)->symbol_ptr_ptr;
+	    cache_ptr->addend = 0;
+	    break;
+	  case -2: /* .align */
+	    if (raw[7] & pcrel_mask)
+	      {
+		cache_ptr->howto = &howto_align_table[(raw[7] >> length_shift) & 3];
+		cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+	      }
+	    else
+	      {
+		/* .org? */
+		abort ();
+	      }
+	    cache_ptr->addend = 0;
+	    break;
+	  default:
+	    BFD_ASSERT (FALSE);
+	    break;
+	  }
+      }
+
+    /* The i960 only has a few relocation types:
+       abs 32-bit and pcrel 24bit.   except for callj's!  */
+    if (cache_ptr->howto != 0)
+      ;
+    else if (raw[7] & callj_mask)
+      {
+	cache_ptr->howto = &howto_reloc_callj;
+      }
+    else if ( raw[7] & pcrel_mask)
+      {
+	if (raw[7] & size_mask)
+	  cache_ptr->howto = &howto_reloc_pcrel13;
+	else
+	  cache_ptr->howto = &howto_reloc_pcrel24;
+      }
+    else
+      {
+	if (raw[7] & incode_mask)
+	  cache_ptr->howto = &howto_reloc_abs32code;
+	else
+	  cache_ptr->howto = &howto_reloc_abs32;
+      }
+
+    if (cache_ptr->address < prev_addr)
+      {
+	/* Ouch! this reloc is out of order, insert into the right place.  */
+	arelent tmp;
+	arelent *cursor = cache_ptr-1;
+	bfd_vma stop = cache_ptr->address;
+
+	tmp  = *cache_ptr;
+	while (cursor->address > stop && cursor >= reloc_cache)
+	  {
+	    cursor[1] = cursor[0];
+	    cursor--;
+	  }
+
+	cursor[1] = tmp;
+      }
+    else
+      prev_addr = cache_ptr->address;
+  }
+
+  if (relocs != NULL)
+    free (relocs);
+  asect->relocation = reloc_cache;
+  asect->reloc_count = count;
+
+  return TRUE;
+}
+
+/* This is stupid.  This function should be a boolean predicate.  */
+
+static long
+b_out_canonicalize_reloc (bfd *abfd,
+			  sec_ptr section,
+			  arelent **relptr,
+			  asymbol **symbols)
+{
+  arelent *tblptr;
+  unsigned int count;
+
+  if ((section->flags & SEC_CONSTRUCTOR) != 0)
+    {
+      arelent_chain *chain = section->constructor_chain;
+
+      for (count = 0; count < section->reloc_count; count++)
+	{
+	  *relptr++ = &chain->relent;
+	  chain = chain->next;
+	}
+    }
+  else
+    {
+      if (section->relocation == NULL
+	  && ! b_out_slurp_reloc_table (abfd, section, symbols))
+	return -1;
+
+      tblptr = section->relocation;
+      for (count = 0; count++ < section->reloc_count;)
+	*relptr++ = tblptr++;
+    }
+
+  *relptr = NULL;
+
+  return section->reloc_count;
+}
+
+static long
+b_out_get_reloc_upper_bound (bfd *abfd, sec_ptr asect)
+{
+  if (bfd_get_format (abfd) != bfd_object)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return -1;
+    }
+
+  if (asect->flags & SEC_CONSTRUCTOR)
+    return sizeof (arelent *) * (asect->reloc_count + 1);
+
+  if (asect == obj_datasec (abfd))
+    return (sizeof (arelent *) *
+	    ((exec_hdr (abfd)->a_drsize / sizeof (struct relocation_info))
+	     + 1));
+
+  if (asect == obj_textsec (abfd))
+    return (sizeof (arelent *) *
+	    ((exec_hdr (abfd)->a_trsize / sizeof (struct relocation_info))
+	     + 1));
+
+  if (asect == obj_bsssec (abfd))
+    return 0;
+
+  bfd_set_error (bfd_error_invalid_operation);
+  return -1;
+}
+
+
+static bfd_boolean
+b_out_set_section_contents (bfd *abfd,
+			    asection *section,
+			    const void * location,
+			    file_ptr offset,
+			    bfd_size_type count)
+{
+  if (! abfd->output_has_begun)
+    {
+      /* Set by bfd.c handler.  */
+      if (! aout_32_make_sections (abfd))
+	return FALSE;
+
+      obj_textsec (abfd)->filepos = sizeof (struct external_exec);
+      obj_datasec (abfd)->filepos = obj_textsec (abfd)->filepos
+	+  obj_textsec (abfd)->size;
+    }
+
+  /* Regardless, once we know what we're doing, we might as well get going.  */
+  if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0)
+    return FALSE;
+
+  if (count == 0)
+    return TRUE;
+
+  return bfd_bwrite ((void *) location, count, abfd) == count;
+}
+
+static bfd_boolean
+b_out_set_arch_mach (bfd *abfd,
+		     enum bfd_architecture arch,
+		     unsigned long machine)
+{
+  bfd_default_set_arch_mach (abfd, arch, machine);
+
+  if (arch == bfd_arch_unknown)	/* Unknown machine arch is OK.  */
+    return TRUE;
+
+  if (arch == bfd_arch_i960)	/* i960 default is OK.  */
+    switch (machine)
+      {
+      case bfd_mach_i960_core:
+      case bfd_mach_i960_kb_sb:
+      case bfd_mach_i960_mc:
+      case bfd_mach_i960_xa:
+      case bfd_mach_i960_ca:
+      case bfd_mach_i960_ka_sa:
+      case bfd_mach_i960_jx:
+      case bfd_mach_i960_hx:
+      case 0:
+	return TRUE;
+      default:
+	return FALSE;
+      }
+
+  return FALSE;
+}
+
+static int
+b_out_sizeof_headers (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+		      struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return sizeof (struct external_exec);
+}
+
+static void
+perform_slip (bfd *abfd,
+	      unsigned int slip,
+	      asection *input_section,
+	      bfd_vma value)
+{
+  asymbol **s;
+
+  s = _bfd_generic_link_get_symbols (abfd);
+  BFD_ASSERT (s != (asymbol **) NULL);
+
+  /* Find all symbols past this point, and make them know
+     what's happened.  */
+  while (*s)
+    {
+      asymbol *p = *s;
+
+      if (p->section == input_section)
+	{
+	  /* This was pointing into this section, so mangle it.  */
+	  if (p->value > value)
+	    {
+	      p->value -=slip;
+
+	      if (p->udata.p != NULL)
+		{
+		  struct generic_link_hash_entry *h;
+
+		  h = (struct generic_link_hash_entry *) p->udata.p;
+		  BFD_ASSERT (h->root.type == bfd_link_hash_defined);
+		  h->root.u.def.value -= slip;
+		  BFD_ASSERT (h->root.u.def.value == p->value);
+		}
+	    }
+	}
+      s++;
+    }
+}
+
+/* This routine works out if the thing we want to get to can be
+   reached with a 24bit offset instead of a 32 bit one.
+   If it can, then it changes the amode.  */
+
+static int
+abs32code (bfd *abfd,
+	   asection *input_section,
+	   arelent *r,
+	   unsigned int shrink,
+	   struct bfd_link_info *link_info)
+{
+  bfd_vma value = get_value (r, link_info, input_section);
+  bfd_vma dot = output_addr (input_section) + r->address;
+  bfd_vma gap;
+
+  /* See if the address we're looking at within 2^23 bytes of where
+     we are, if so then we can use a small branch rather than the
+     jump we were going to.  */
+  gap = value - (dot - shrink);
+
+  if (-1 << 23 < (long)gap && (long)gap < 1 << 23)
+    {
+      /* Change the reloc type from 32bitcode possible 24, to 24bit
+	 possible 32.  */
+      r->howto = &howto_reloc_abs32codeshrunk;
+      /* The place to relc moves back by four bytes.  */
+      r->address -=4;
+
+      /* This will be four bytes smaller in the long run.  */
+      shrink += 4 ;
+      perform_slip (abfd, 4, input_section, r->address-shrink + 4);
+    }
+
+  return shrink;
+}
+
+static int
+aligncode (bfd *abfd,
+	   asection *input_section,
+	   arelent *r,
+	   unsigned int shrink)
+{
+  bfd_vma dot = output_addr (input_section) + r->address;
+  bfd_vma old_end;
+  bfd_vma new_end;
+  unsigned int shrink_delta;
+  int size = r->howto->size;
+
+  /* Reduce the size of the alignment so that it's still aligned but
+     smaller  - the current size is already the same size as or bigger
+     than the alignment required.  */
+
+  /* Calculate the first byte following the padding before we optimize.  */
+  old_end = ((dot + size ) & ~size) + size+1;
+  /* Work out where the new end will be - remember that we're smaller
+     than we used to be.  */
+  new_end = ((dot - shrink + size) & ~size);
+
+  shrink_delta = (old_end - new_end) - shrink;
+
+  if (shrink_delta)
+    {
+      /* Change the reloc so that it knows how far to align to.  */
+      r->howto = howto_done_align_table + (r->howto - howto_align_table);
+
+      /* Encode the stuff into the addend - for future use we need to
+	 know how big the reloc used to be.  */
+      r->addend = old_end - dot + r->address;
+
+      /* This will be N bytes smaller in the long run, adjust all the symbols.  */
+      perform_slip (abfd, shrink_delta, input_section, r->address - shrink);
+      shrink += shrink_delta;
+    }
+
+  return shrink;
+}
+
+static bfd_boolean
+b_out_bfd_relax_section (bfd *abfd,
+			 asection *i,
+			 struct bfd_link_info *link_info,
+			 bfd_boolean *again)
+{
+  /* Get enough memory to hold the stuff.  */
+  bfd *input_bfd = i->owner;
+  asection *input_section = i;
+  unsigned int shrink = 0 ;
+  arelent **reloc_vector = NULL;
+  long reloc_size = bfd_get_reloc_upper_bound (input_bfd, input_section);
+
+  if (link_info->relocatable)
+    (*link_info->callbacks->einfo)
+      (_("%P%F: --relax and -r may not be used together\n"));
+
+  if (reloc_size < 0)
+    return FALSE;
+
+  /* We only run this relaxation once.  It might work to run it
+     multiple times, but it hasn't been tested.  */
+  *again = FALSE;
+
+  if (reloc_size)
+    {
+      long reloc_count;
+
+      reloc_vector = bfd_malloc ((bfd_size_type) reloc_size);
+      if (reloc_vector == NULL && reloc_size != 0)
+	goto error_return;
+
+      /* Get the relocs and think about them.  */
+      reloc_count =
+	bfd_canonicalize_reloc (input_bfd, input_section, reloc_vector,
+				_bfd_generic_link_get_symbols (input_bfd));
+      if (reloc_count < 0)
+	goto error_return;
+      if (reloc_count > 0)
+	{
+	  arelent **parent;
+
+	  for (parent = reloc_vector; *parent; parent++)
+	    {
+	      arelent *r = *parent;
+
+	      switch (r->howto->type)
+		{
+		case ALIGNER:
+		  /* An alignment reloc.  */
+		  shrink = aligncode (abfd, input_section, r, shrink);
+		  break;
+		case ABS32CODE:
+		  /* A 32bit reloc in an addressing mode.  */
+		  shrink = abs32code (input_bfd, input_section, r, shrink,
+				      link_info);
+		  break;
+		case ABS32CODE_SHRUNK:
+		  shrink += 4;
+		  break;
+		}
+	    }
+	}
+    }
+  input_section->size -= shrink;
+
+  if (reloc_vector != NULL)
+    free (reloc_vector);
+  return TRUE;
+ error_return:
+  if (reloc_vector != NULL)
+    free (reloc_vector);
+  return FALSE;
+}
+
+static bfd_byte *
+b_out_bfd_get_relocated_section_contents (bfd *output_bfd,
+					  struct bfd_link_info *link_info,
+					  struct bfd_link_order *link_order,
+					  bfd_byte *data,
+					  bfd_boolean relocatable,
+					  asymbol **symbols)
+{
+  /* Get enough memory to hold the stuff.  */
+  bfd *input_bfd = link_order->u.indirect.section->owner;
+  asection *input_section = link_order->u.indirect.section;
+  long reloc_size = bfd_get_reloc_upper_bound (input_bfd, input_section);
+  arelent **reloc_vector = NULL;
+  long reloc_count;
+
+  if (reloc_size < 0)
+    goto error_return;
+
+  /* If producing relocatable output, don't bother to relax.  */
+  if (relocatable)
+    return bfd_generic_get_relocated_section_contents (output_bfd, link_info,
+						       link_order,
+						       data, relocatable,
+						       symbols);
+
+  reloc_vector = bfd_malloc ((bfd_size_type) reloc_size);
+  if (reloc_vector == NULL && reloc_size != 0)
+    goto error_return;
+
+  /* Read in the section.  */
+  BFD_ASSERT (bfd_get_section_contents (input_bfd,
+					input_section,
+					data,
+					(bfd_vma) 0,
+					input_section->size));
+
+  reloc_count = bfd_canonicalize_reloc (input_bfd,
+					input_section,
+					reloc_vector,
+					symbols);
+  if (reloc_count < 0)
+    goto error_return;
+  if (reloc_count > 0)
+    {
+      arelent **parent = reloc_vector;
+      arelent *reloc ;
+      unsigned int dst_address = 0;
+      unsigned int src_address = 0;
+      unsigned int run;
+      unsigned int idx;
+
+      /* Find how long a run we can do.  */
+      while (dst_address < link_order->size)
+	{
+	  reloc = *parent;
+	  if (reloc)
+	    {
+	      /* Note that the relaxing didn't tie up the addresses in the
+		 relocation, so we use the original address to work out the
+		 run of non-relocated data.  */
+	      BFD_ASSERT (reloc->address >= src_address);
+	      run = reloc->address - src_address;
+	      parent++;
+	    }
+	  else
+	    run = link_order->size - dst_address;
+
+	  /* Copy the bytes.  */
+	  for (idx = 0; idx < run; idx++)
+	    data[dst_address++] = data[src_address++];
+
+	  /* Now do the relocation.  */
+	  if (reloc)
+	    {
+	      switch (reloc->howto->type)
+		{
+		case ABS32CODE:
+		  calljx_callback (input_bfd, link_info, reloc,
+				   src_address + data, dst_address + data,
+				   input_section);
+		  src_address += 4;
+		  dst_address += 4;
+		  break;
+		case ABS32:
+		  bfd_put_32 (input_bfd,
+			      (bfd_get_32 (input_bfd, data + src_address)
+			       + get_value (reloc, link_info, input_section)),
+			      data + dst_address);
+		  src_address += 4;
+		  dst_address += 4;
+		  break;
+		case CALLJ:
+		  callj_callback (input_bfd, link_info, reloc, data,
+				  src_address, dst_address, input_section,
+				  FALSE);
+		  src_address += 4;
+		  dst_address += 4;
+		  break;
+		case ALIGNDONE:
+		  BFD_ASSERT (reloc->addend >= src_address);
+		  BFD_ASSERT ((bfd_vma) reloc->addend
+			      <= input_section->size);
+		  src_address = reloc->addend;
+		  dst_address = ((dst_address + reloc->howto->size)
+				 & ~reloc->howto->size);
+		  break;
+		case ABS32CODE_SHRUNK:
+		  /* This used to be a callx, but we've found out that a
+		     callj will reach, so do the right thing.  */
+		  callj_callback (input_bfd, link_info, reloc, data,
+				  src_address + 4, dst_address, input_section,
+				  TRUE);
+		  dst_address += 4;
+		  src_address += 8;
+		  break;
+		case PCREL24:
+		  {
+		    long int word = bfd_get_32 (input_bfd,
+						data + src_address);
+		    bfd_vma value;
+
+		    value = get_value (reloc, link_info, input_section);
+		    word = ((word & ~BAL_MASK)
+			    | (((word & BAL_MASK)
+				+ value
+				- output_addr (input_section)
+				+ reloc->addend)
+			       & BAL_MASK));
+
+		    bfd_put_32 (input_bfd, (bfd_vma) word, data + dst_address);
+		    dst_address += 4;
+		    src_address += 4;
+
+		  }
+		  break;
+		case PCREL13:
+		  {
+		    long int word = bfd_get_32 (input_bfd,
+						data + src_address);
+		    bfd_vma value;
+
+		    value = get_value (reloc, link_info, input_section);
+		    word = ((word & ~PCREL13_MASK)
+			    | (((word & PCREL13_MASK)
+				+ value
+				+ reloc->addend
+				- output_addr (input_section))
+			       & PCREL13_MASK));
+
+		    bfd_put_32 (input_bfd, (bfd_vma) word, data + dst_address);
+		    dst_address += 4;
+		    src_address += 4;
+		  }
+		  break;
+
+		default:
+		  abort ();
+		}
+	    }
+	}
+    }
+  if (reloc_vector != NULL)
+    free (reloc_vector);
+  return data;
+ error_return:
+  if (reloc_vector != NULL)
+    free (reloc_vector);
+  return NULL;
+}
+
+
+/* Build the transfer vectors for Big and Little-Endian B.OUT files.  */
+
+#define aout_32_bfd_make_debug_symbol          _bfd_nosymbols_bfd_make_debug_symbol
+#define aout_32_close_and_cleanup              aout_32_bfd_free_cached_info
+#define b_out_bfd_link_hash_table_create       _bfd_generic_link_hash_table_create
+#define b_out_bfd_link_hash_table_free         _bfd_generic_link_hash_table_free
+#define b_out_bfd_link_add_symbols             _bfd_generic_link_add_symbols
+#define b_out_bfd_link_just_syms               _bfd_generic_link_just_syms
+#define b_out_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define b_out_bfd_final_link                   _bfd_generic_final_link
+#define b_out_bfd_link_split_section           _bfd_generic_link_split_section
+#define b_out_bfd_gc_sections                  bfd_generic_gc_sections
+#define b_out_bfd_lookup_section_flags         bfd_generic_lookup_section_flags
+#define b_out_bfd_merge_sections               bfd_generic_merge_sections
+#define b_out_bfd_is_group_section             bfd_generic_is_group_section
+#define b_out_bfd_discard_group                bfd_generic_discard_group
+#define b_out_section_already_linked           _bfd_generic_section_already_linked
+#define b_out_bfd_define_common_symbol         bfd_generic_define_common_symbol
+#define aout_32_get_section_contents_in_window _bfd_generic_get_section_contents_in_window
+
+extern const bfd_target b_out_vec_little_host;
+
+const bfd_target b_out_vec_big_host =
+{
+  "b.out.big",			/* Name.  */
+  bfd_target_aout_flavour,
+  BFD_ENDIAN_LITTLE,		/* Data byte order.  */
+  BFD_ENDIAN_BIG,		/* Header byte order.  */
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | BFD_IS_RELAXABLE ),
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
+  '_',				/* Symbol leading char.  */
+  ' ',				/* AR_pad_char.  */
+  16,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Data.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* Headers.  */
+ {_bfd_dummy_target, b_out_object_p, /* bfd_check_format.  */
+   bfd_generic_archive_p, _bfd_dummy_target},
+ {bfd_false, b_out_mkobject,	/* bfd_set_format.  */
+   _bfd_generic_mkarchive, bfd_false},
+ {bfd_false, b_out_write_object_contents, /* bfd_write_contents.  */
+   _bfd_write_archive_contents, bfd_false},
+
+     BFD_JUMP_TABLE_GENERIC (aout_32),
+     BFD_JUMP_TABLE_COPY (_bfd_generic),
+     BFD_JUMP_TABLE_CORE (_bfd_nocore),
+     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd),
+     BFD_JUMP_TABLE_SYMBOLS (aout_32),
+     BFD_JUMP_TABLE_RELOCS (b_out),
+     BFD_JUMP_TABLE_WRITE (b_out),
+     BFD_JUMP_TABLE_LINK (b_out),
+     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  & b_out_vec_little_host,
+
+  NULL
+};
+
+const bfd_target b_out_vec_little_host =
+{
+  "b.out.little",		/* Name.  */
+  bfd_target_aout_flavour,
+  BFD_ENDIAN_LITTLE,		/* Data byte order.  */
+  BFD_ENDIAN_LITTLE,		/* Header byte order.  */
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | BFD_IS_RELAXABLE ),
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
+  '_',				/* Symbol leading char.  */
+  ' ',				/* AR_pad_char.  */
+  16,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Data.  */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Headers.  */
+
+  {_bfd_dummy_target, b_out_object_p, /* bfd_check_format.  */
+     bfd_generic_archive_p, _bfd_dummy_target},
+  {bfd_false, b_out_mkobject,	/* bfd_set_format.  */
+     _bfd_generic_mkarchive, bfd_false},
+  {bfd_false, b_out_write_object_contents, /* bfd_write_contents.  */
+     _bfd_write_archive_contents, bfd_false},
+
+     BFD_JUMP_TABLE_GENERIC (aout_32),
+     BFD_JUMP_TABLE_COPY (_bfd_generic),
+     BFD_JUMP_TABLE_CORE (_bfd_nocore),
+     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd),
+     BFD_JUMP_TABLE_SYMBOLS (aout_32),
+     BFD_JUMP_TABLE_RELOCS (b_out),
+     BFD_JUMP_TABLE_WRITE (b_out),
+     BFD_JUMP_TABLE_LINK (b_out),
+     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  & b_out_vec_big_host,
+
+  NULL
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cache.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cache.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cache.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cache.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,619 @@
+/* BFD library -- caching of file descriptors.
+
+   Copyright 1990, 1991, 1992, 1993, 1994, 1996, 2000, 2001, 2002,
+   2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+   Hacked by Steve Chamberlain of Cygnus Support (steve@cygnus.com).
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/*
+SECTION
+	File caching
+
+	The file caching mechanism is embedded within BFD and allows
+	the application to open as many BFDs as it wants without
+	regard to the underlying operating system's file descriptor
+	limit (often as low as 20 open files).  The module in
+	<<cache.c>> maintains a least recently used list of
+	<<BFD_CACHE_MAX_OPEN>> files, and exports the name
+	<<bfd_cache_lookup>>, which runs around and makes sure that
+	the required BFD is open. If not, then it chooses a file to
+	close, closes it and opens the one wanted, returning its file
+	handle.
+
+SUBSECTION
+	Caching functions
+*/
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libiberty.h"
+#include "bfd_stdint.h"
+
+#ifdef HAVE_MMAP
+#include <sys/mman.h>
+#endif
+
+/* In some cases we can optimize cache operation when reopening files.
+   For instance, a flush is entirely unnecessary if the file is already
+   closed, so a flush would use CACHE_NO_OPEN.  Similarly, a seek using
+   SEEK_SET or SEEK_END need not first seek to the current position.
+   For stat we ignore seek errors, just in case the file has changed
+   while we weren't looking.  If it has, then it's possible that the
+   file is shorter and we don't want a seek error to prevent us doing
+   the stat.  */
+enum cache_flag {
+  CACHE_NORMAL = 0,
+  CACHE_NO_OPEN = 1,
+  CACHE_NO_SEEK = 2,
+  CACHE_NO_SEEK_ERROR = 4
+};
+
+/* The maximum number of files which the cache will keep open at
+   one time.  */
+
+#define BFD_CACHE_MAX_OPEN 10
+
+/* The number of BFD files we have open.  */
+
+static int open_files;
+
+/* Zero, or a pointer to the topmost BFD on the chain.  This is
+   used by the <<bfd_cache_lookup>> macro in @file{libbfd.h} to
+   determine when it can avoid a function call.  */
+
+static bfd *bfd_last_cache = NULL;
+
+/* Insert a BFD into the cache.  */
+
+static void
+insert (bfd *abfd)
+{
+  if (bfd_last_cache == NULL)
+    {
+      abfd->lru_next = abfd;
+      abfd->lru_prev = abfd;
+    }
+  else
+    {
+      abfd->lru_next = bfd_last_cache;
+      abfd->lru_prev = bfd_last_cache->lru_prev;
+      abfd->lru_prev->lru_next = abfd;
+      abfd->lru_next->lru_prev = abfd;
+    }
+  bfd_last_cache = abfd;
+}
+
+/* Remove a BFD from the cache.  */
+
+static void
+snip (bfd *abfd)
+{
+  abfd->lru_prev->lru_next = abfd->lru_next;
+  abfd->lru_next->lru_prev = abfd->lru_prev;
+  if (abfd == bfd_last_cache)
+    {
+      bfd_last_cache = abfd->lru_next;
+      if (abfd == bfd_last_cache)
+	bfd_last_cache = NULL;
+    }
+}
+
+/* Close a BFD and remove it from the cache.  */
+
+static bfd_boolean
+bfd_cache_delete (bfd *abfd)
+{
+  bfd_boolean ret;
+
+  if (fclose ((FILE *) abfd->iostream) == 0)
+    ret = TRUE;
+  else
+    {
+      ret = FALSE;
+      bfd_set_error (bfd_error_system_call);
+    }
+
+  snip (abfd);
+
+  abfd->iostream = NULL;
+  --open_files;
+
+  return ret;
+}
+
+/* We need to open a new file, and the cache is full.  Find the least
+   recently used cacheable BFD and close it.  */
+
+static bfd_boolean
+close_one (void)
+{
+  register bfd *to_kill;
+
+  if (bfd_last_cache == NULL)
+    to_kill = NULL;
+  else
+    {
+      for (to_kill = bfd_last_cache->lru_prev;
+	   ! to_kill->cacheable;
+	   to_kill = to_kill->lru_prev)
+	{
+	  if (to_kill == bfd_last_cache)
+	    {
+	      to_kill = NULL;
+	      break;
+	    }
+	}
+    }
+
+  if (to_kill == NULL)
+    {
+      /* There are no open cacheable BFD's.  */
+      return TRUE;
+    }
+
+  to_kill->where = real_ftell ((FILE *) to_kill->iostream);
+
+  return bfd_cache_delete (to_kill);
+}
+
+/* Check to see if the required BFD is the same as the last one
+   looked up. If so, then it can use the stream in the BFD with
+   impunity, since it can't have changed since the last lookup;
+   otherwise, it has to perform the complicated lookup function.  */
+
+#define bfd_cache_lookup(x, flag) \
+  ((x) == bfd_last_cache			\
+   ? (FILE *) (bfd_last_cache->iostream)	\
+   : bfd_cache_lookup_worker (x, flag))
+
+/* Called when the macro <<bfd_cache_lookup>> fails to find a
+   quick answer.  Find a file descriptor for @var{abfd}.  If
+   necessary, it open it.  If there are already more than
+   <<BFD_CACHE_MAX_OPEN>> files open, it tries to close one first, to
+   avoid running out of file descriptors.  It will return NULL
+   if it is unable to (re)open the @var{abfd}.  */
+
+static FILE *
+bfd_cache_lookup_worker (bfd *abfd, enum cache_flag flag)
+{
+  bfd *orig_bfd = abfd;
+  if ((abfd->flags & BFD_IN_MEMORY) != 0)
+    abort ();
+
+  if (abfd->my_archive)
+    abfd = abfd->my_archive;
+
+  if (abfd->iostream != NULL)
+    {
+      /* Move the file to the start of the cache.  */
+      if (abfd != bfd_last_cache)
+	{
+	  snip (abfd);
+	  insert (abfd);
+	}
+      return (FILE *) abfd->iostream;
+    }
+
+  if (flag & CACHE_NO_OPEN)
+    return NULL;
+
+  if (bfd_open_file (abfd) == NULL)
+    ;
+  else if (!(flag & CACHE_NO_SEEK)
+	   && real_fseek ((FILE *) abfd->iostream, abfd->where, SEEK_SET) != 0
+	   && !(flag & CACHE_NO_SEEK_ERROR))
+    bfd_set_error (bfd_error_system_call);
+  else
+    return (FILE *) abfd->iostream;
+
+  (*_bfd_error_handler) (_("reopening %B: %s\n"),
+			 orig_bfd, bfd_errmsg (bfd_get_error ()));
+  return NULL;
+}
+
+static file_ptr
+cache_btell (struct bfd *abfd)
+{
+  FILE *f = bfd_cache_lookup (abfd, CACHE_NO_OPEN);
+  if (f == NULL)
+    return abfd->where;
+  return real_ftell (f);
+}
+
+static int
+cache_bseek (struct bfd *abfd, file_ptr offset, int whence)
+{
+  FILE *f = bfd_cache_lookup (abfd, whence != SEEK_CUR ? CACHE_NO_SEEK : CACHE_NORMAL);
+  if (f == NULL)
+    return -1;
+  return real_fseek (f, offset, whence);
+}
+
+/* Note that archive entries don't have streams; they share their parent's.
+   This allows someone to play with the iostream behind BFD's back.
+
+   Also, note that the origin pointer points to the beginning of a file's
+   contents (0 for non-archive elements).  For archive entries this is the
+   first octet in the file, NOT the beginning of the archive header.  */
+
+static file_ptr
+cache_bread_1 (struct bfd *abfd, void *buf, file_ptr nbytes)
+{
+  FILE *f;
+  file_ptr nread;
+  /* FIXME - this looks like an optimization, but it's really to cover
+     up for a feature of some OSs (not solaris - sigh) that
+     ld/pe-dll.c takes advantage of (apparently) when it creates BFDs
+     internally and tries to link against them.  BFD seems to be smart
+     enough to realize there are no symbol records in the "file" that
+     doesn't exist but attempts to read them anyway.  On Solaris,
+     attempting to read zero bytes from a NULL file results in a core
+     dump, but on other platforms it just returns zero bytes read.
+     This makes it to something reasonable. - DJ */
+  if (nbytes == 0)
+    return 0;
+
+  f = bfd_cache_lookup (abfd, CACHE_NORMAL);
+  if (f == NULL)
+    return 0;
+
+#if defined (__VAX) && defined (VMS)
+  /* Apparently fread on Vax VMS does not keep the record length
+     information.  */
+  nread = read (fileno (f), buf, nbytes);
+  /* Set bfd_error if we did not read as much data as we expected.  If
+     the read failed due to an error set the bfd_error_system_call,
+     else set bfd_error_file_truncated.  */
+  if (nread == (file_ptr)-1)
+    {
+      bfd_set_error (bfd_error_system_call);
+      return -1;
+    }
+#else
+  nread = fread (buf, 1, nbytes, f);
+  /* Set bfd_error if we did not read as much data as we expected.  If
+     the read failed due to an error set the bfd_error_system_call,
+     else set bfd_error_file_truncated.  */
+  if (nread < nbytes && ferror (f))
+    {
+      bfd_set_error (bfd_error_system_call);
+      return -1;
+    }
+#endif
+  if (nread < nbytes)
+    /* This may or may not be an error, but in case the calling code
+       bails out because of it, set the right error code.  */
+    bfd_set_error (bfd_error_file_truncated);
+  return nread;
+}
+
+static file_ptr
+cache_bread (struct bfd *abfd, void *buf, file_ptr nbytes)
+{
+  file_ptr nread = 0;
+
+  /* Some filesystems are unable to handle reads that are too large
+     (for instance, NetApp shares with oplocks turned off).  To avoid
+     hitting this limitation, we read the buffer in chunks of 8MB max.  */
+  while (nread < nbytes)
+    {
+      const file_ptr max_chunk_size = 0x800000;
+      file_ptr chunk_size = nbytes - nread;
+      file_ptr chunk_nread;
+
+      if (chunk_size > max_chunk_size)
+        chunk_size = max_chunk_size;
+
+      chunk_nread = cache_bread_1 (abfd, (char *) buf + nread, chunk_size);
+
+      /* Update the nread count.
+
+         We just have to be careful of the case when cache_bread_1 returns
+         a negative count:  If this is our first read, then set nread to
+         that negative count in order to return that negative value to the
+         caller.  Otherwise, don't add it to our total count, or we would
+         end up returning a smaller number of bytes read than we actually
+         did.  */
+      if (nread == 0 || chunk_nread > 0)
+        nread += chunk_nread;
+
+      if (chunk_nread < chunk_size)
+        break;
+    }
+
+  return nread;
+}
+
+static file_ptr
+cache_bwrite (struct bfd *abfd, const void *where, file_ptr nbytes)
+{
+  file_ptr nwrite;
+  FILE *f = bfd_cache_lookup (abfd, CACHE_NORMAL);
+
+  if (f == NULL)
+    return 0;
+  nwrite = fwrite (where, 1, nbytes, f);
+  if (nwrite < nbytes && ferror (f))
+    {
+      bfd_set_error (bfd_error_system_call);
+      return -1;
+    }
+  return nwrite;
+}
+
+static int
+cache_bclose (struct bfd *abfd)
+{
+  return bfd_cache_close (abfd);
+}
+
+static int
+cache_bflush (struct bfd *abfd)
+{
+  int sts;
+  FILE *f = bfd_cache_lookup (abfd, CACHE_NO_OPEN);
+
+  if (f == NULL)
+    return 0;
+  sts = fflush (f);
+  if (sts < 0)
+    bfd_set_error (bfd_error_system_call);
+  return sts;
+}
+
+static int
+cache_bstat (struct bfd *abfd, struct stat *sb)
+{
+  int sts;
+  FILE *f = bfd_cache_lookup (abfd, CACHE_NO_SEEK_ERROR);
+
+  if (f == NULL)
+    return -1;
+  sts = fstat (fileno (f), sb);
+  if (sts < 0)
+    bfd_set_error (bfd_error_system_call);
+  return sts;
+}
+
+static void *
+cache_bmmap (struct bfd *abfd ATTRIBUTE_UNUSED,
+	     void *addr ATTRIBUTE_UNUSED,
+	     bfd_size_type len ATTRIBUTE_UNUSED,
+	     int prot ATTRIBUTE_UNUSED,
+	     int flags ATTRIBUTE_UNUSED,
+	     file_ptr offset ATTRIBUTE_UNUSED,
+             void **map_addr ATTRIBUTE_UNUSED,
+             bfd_size_type *map_len ATTRIBUTE_UNUSED)
+{
+  void *ret = (void *) -1;
+
+  if ((abfd->flags & BFD_IN_MEMORY) != 0)
+    abort ();
+#ifdef HAVE_MMAP
+  else
+    {
+      static uintptr_t pagesize_m1;
+      FILE *f;
+      file_ptr pg_offset;
+      bfd_size_type pg_len;
+
+      f = bfd_cache_lookup (abfd, CACHE_NO_SEEK_ERROR);
+      if (f == NULL)
+	return ret;
+
+      if (pagesize_m1 == 0)
+        pagesize_m1 = getpagesize () - 1;
+
+      /* Handle archive members.  */
+      if (abfd->my_archive != NULL)
+        offset += abfd->origin;
+
+      /* Align.  */
+      pg_offset = offset & ~pagesize_m1;
+      pg_len = (len + (offset - pg_offset) + pagesize_m1) & ~pagesize_m1;
+
+      ret = mmap (addr, pg_len, prot, flags, fileno (f), pg_offset);
+      if (ret == (void *) -1)
+	bfd_set_error (bfd_error_system_call);
+      else
+        {
+          *map_addr = ret;
+          *map_len = pg_len;
+          ret += offset & pagesize_m1;
+        }
+    }
+#endif
+
+  return ret;
+}
+
+static const struct bfd_iovec cache_iovec =
+{
+  &cache_bread, &cache_bwrite, &cache_btell, &cache_bseek,
+  &cache_bclose, &cache_bflush, &cache_bstat, &cache_bmmap
+};
+
+/*
+INTERNAL_FUNCTION
+	bfd_cache_init
+
+SYNOPSIS
+	bfd_boolean bfd_cache_init (bfd *abfd);
+
+DESCRIPTION
+	Add a newly opened BFD to the cache.
+*/
+
+bfd_boolean
+bfd_cache_init (bfd *abfd)
+{
+  BFD_ASSERT (abfd->iostream != NULL);
+  if (open_files >= BFD_CACHE_MAX_OPEN)
+    {
+      if (! close_one ())
+	return FALSE;
+    }
+  abfd->iovec = &cache_iovec;
+  insert (abfd);
+  ++open_files;
+  return TRUE;
+}
+
+/*
+INTERNAL_FUNCTION
+	bfd_cache_close
+
+SYNOPSIS
+	bfd_boolean bfd_cache_close (bfd *abfd);
+
+DESCRIPTION
+	Remove the BFD @var{abfd} from the cache. If the attached file is open,
+	then close it too.
+
+RETURNS
+	<<FALSE>> is returned if closing the file fails, <<TRUE>> is
+	returned if all is well.
+*/
+
+bfd_boolean
+bfd_cache_close (bfd *abfd)
+{
+  if (abfd->iovec != &cache_iovec)
+    return TRUE;
+
+  if (abfd->iostream == NULL)
+    /* Previously closed.  */
+    return TRUE;
+
+  return bfd_cache_delete (abfd);
+}
+
+/*
+FUNCTION
+	bfd_cache_close_all
+
+SYNOPSIS
+	bfd_boolean bfd_cache_close_all (void);
+
+DESCRIPTION
+	Remove all BFDs from the cache. If the attached file is open,
+	then close it too.
+
+RETURNS
+	<<FALSE>> is returned if closing one of the file fails, <<TRUE>> is
+	returned if all is well.
+*/
+
+bfd_boolean
+bfd_cache_close_all ()
+{
+  bfd_boolean ret = TRUE;
+
+  while (bfd_last_cache != NULL)
+    ret &= bfd_cache_close (bfd_last_cache);
+
+  return ret;
+}
+
+/*
+INTERNAL_FUNCTION
+	bfd_open_file
+
+SYNOPSIS
+	FILE* bfd_open_file (bfd *abfd);
+
+DESCRIPTION
+	Call the OS to open a file for @var{abfd}.  Return the <<FILE *>>
+	(possibly <<NULL>>) that results from this operation.  Set up the
+	BFD so that future accesses know the file is open. If the <<FILE *>>
+	returned is <<NULL>>, then it won't have been put in the
+	cache, so it won't have to be removed from it.
+*/
+
+FILE *
+bfd_open_file (bfd *abfd)
+{
+  abfd->cacheable = TRUE;	/* Allow it to be closed later.  */
+
+  if (open_files >= BFD_CACHE_MAX_OPEN)
+    {
+      if (! close_one ())
+	return NULL;
+    }
+
+  switch (abfd->direction)
+    {
+    case read_direction:
+    case no_direction:
+      abfd->iostream = (PTR) real_fopen (abfd->filename, FOPEN_RB);
+      break;
+    case both_direction:
+    case write_direction:
+      if (abfd->opened_once)
+	{
+	  abfd->iostream = (PTR) real_fopen (abfd->filename, FOPEN_RUB);
+	  if (abfd->iostream == NULL)
+	    abfd->iostream = (PTR) real_fopen (abfd->filename, FOPEN_WUB);
+	}
+      else
+	{
+	  /* Create the file.
+
+	     Some operating systems won't let us overwrite a running
+	     binary.  For them, we want to unlink the file first.
+
+	     However, gcc 2.95 will create temporary files using
+	     O_EXCL and tight permissions to prevent other users from
+	     substituting other .o files during the compilation.  gcc
+	     will then tell the assembler to use the newly created
+	     file as an output file.  If we unlink the file here, we
+	     open a brief window when another user could still
+	     substitute a file.
+
+	     So we unlink the output file if and only if it has
+	     non-zero size.  */
+#ifndef __MSDOS__
+	  /* Don't do this for MSDOS: it doesn't care about overwriting
+	     a running binary, but if this file is already open by
+	     another BFD, we will be in deep trouble if we delete an
+	     open file.  In fact, objdump does just that if invoked with
+	     the --info option.  */
+	  struct stat s;
+
+	  if (stat (abfd->filename, &s) == 0 && s.st_size != 0)
+	    unlink_if_ordinary (abfd->filename);
+#endif
+	  abfd->iostream = (PTR) real_fopen (abfd->filename, FOPEN_WUB);
+	  abfd->opened_once = TRUE;
+	}
+      break;
+    }
+
+  if (abfd->iostream == NULL)
+    bfd_set_error (bfd_error_system_call);
+  else
+    {
+      if (! bfd_cache_init (abfd))
+	return NULL;
+    }
+
+  return (FILE *) abfd->iostream;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cf-i386lynx.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cf-i386lynx.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cf-i386lynx.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cf-i386lynx.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,35 @@
+/* BFD back-end for Intel 386 COFF LynxOS files.
+   Copyright 1993, 1994, 1995, 2005, 2007, 2008
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+
+#define TARGET_SYM	i386lynx_coff_vec
+#define TARGET_NAME	"coff-i386-lynx"
+
+#define LYNXOS
+
+#define COFF_LONG_FILENAMES
+
+#define	bfd_pe_print_pdata	NULL
+
+#include "coff-i386.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cf-sparclynx.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cf-sparclynx.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cf-sparclynx.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cf-sparclynx.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,29 @@
+/* BFD back-end for Sparc COFF LynxOS files.
+   Copyright 1993, 1994, 2005, 2007 Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define TARGET_SYM	sparclynx_coff_vec
+#define TARGET_NAME	"coff-sparc-lynx"
+
+#define LYNXOS
+
+#define COFF_LONG_FILENAMES
+
+#include "coff-sparc.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cisco-core.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cisco-core.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cisco-core.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cisco-core.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,426 @@
+/* BFD back-end for CISCO crash dumps.
+   Copyright 1994, 1997, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007,
+   2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+/* core_file_failing_signal returns a host signal (this probably should
+   be fixed).  */
+#include <signal.h>
+
+/* for MSVC builds */
+#ifndef SIGTRAP
+# define SIGTRAP 5
+#endif
+#ifndef SIGEMT
+# define SIGEMT 6
+#endif
+#ifndef SIGBUS
+# define SIGBUS 10
+#endif
+
+int crash_info_locs[] = {
+  0x0250,	/* mips, ppc, x86, i960 */
+  0x0400,	/* m68k, mips, x86, i960 */
+  0x0FFC,	/* m68k, mips, ppc, x86, i960 */
+  0x3000,	/* ppc */
+  0x4FFC,	/* m68k */
+  -1
+};
+
+#define CRASH_MAGIC	0xdead1234
+#define MASK_ADDR(x)	((x) & 0x0fffffff)	/* Mask crash info address */
+
+typedef enum {
+    CRASH_REASON_NOTCRASHED = 0,
+    CRASH_REASON_EXCEPTION = 1,
+    CRASH_REASON_CORRUPT = 2,
+} crashreason;
+
+typedef struct {
+  char magic[4];		/* Magic number */
+  char version[4];		/* Version number */
+  char reason[4];		/* Crash reason */
+  char cpu_vector[4];		/* CPU vector for exceptions */
+  char registers[4];		/* Pointer to saved registers */
+  char rambase[4];		/* Base of RAM (not in V1 crash info) */
+  char textbase[4];		/* Base of .text section (not in V3 crash info) */
+  char database[4];		/* Base of .data section (not in V3 crash info) */
+  char bssbase[4];		/* Base of .bss section (not in V3 crash info) */
+} crashinfo_external;
+
+struct cisco_core_struct
+{
+  int sig;
+};
+
+static const bfd_target *cisco_core_file_validate PARAMS ((bfd *, int));
+static const bfd_target *cisco_core_file_p PARAMS ((bfd *));
+char *cisco_core_file_failing_command PARAMS ((bfd *));
+int cisco_core_file_failing_signal PARAMS ((bfd *));
+#define cisco_core_file_matches_executable_p generic_core_file_matches_executable_p
+#define cisco_core_file_pid _bfd_nocore_core_file_pid
+
+/* Examine the file for a crash info struct at the offset given by
+   CRASH_INFO_LOC.  */
+
+static const bfd_target *
+cisco_core_file_validate (abfd, crash_info_loc)
+     bfd *abfd;
+     int crash_info_loc;
+{
+  char buf[4];
+  unsigned int crashinfo_offset;
+  crashinfo_external crashinfo;
+  bfd_size_type nread;
+  unsigned int magic;
+  unsigned int version;
+  unsigned int rambase;
+  sec_ptr asect;
+  struct stat statbuf;
+  bfd_size_type amt;
+  flagword flags;
+
+  if (bfd_seek (abfd, (file_ptr) crash_info_loc, SEEK_SET) != 0)
+    return NULL;
+
+  nread = bfd_bread (buf, (bfd_size_type) 4, abfd);
+  if (nread != 4)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+  crashinfo_offset = MASK_ADDR (bfd_get_32 (abfd, buf));
+
+  if (bfd_seek (abfd, (file_ptr) crashinfo_offset, SEEK_SET) != 0)
+    {
+      /* Most likely we failed because of a bogus (huge) offset */
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  nread = bfd_bread (&crashinfo, (bfd_size_type) sizeof (crashinfo), abfd);
+  if (nread != sizeof (crashinfo))
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  if (bfd_stat (abfd, &statbuf) < 0)
+    {
+      bfd_set_error (bfd_error_system_call);
+      return NULL;
+    }
+
+  magic = bfd_get_32 (abfd, crashinfo.magic);
+  if (magic != CRASH_MAGIC)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  version = bfd_get_32 (abfd, crashinfo.version);
+  if (version == 0)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+  else if (version == 1)
+    {
+      /* V1 core dumps don't specify the dump base, assume 0 */
+      rambase = 0;
+    }
+  else
+    {
+      rambase = bfd_get_32 (abfd, crashinfo.rambase);
+    }
+
+  /* OK, we believe you.  You're a core file.  */
+
+  amt = sizeof (struct cisco_core_struct);
+  abfd->tdata.cisco_core_data = (struct cisco_core_struct *) bfd_zmalloc (amt);
+  if (abfd->tdata.cisco_core_data == NULL)
+    return NULL;
+
+  switch ((crashreason) bfd_get_32 (abfd, crashinfo.reason))
+    {
+    case CRASH_REASON_NOTCRASHED:
+      /* Crash file probably came from write core.  */
+      abfd->tdata.cisco_core_data->sig = 0;
+      break;
+    case CRASH_REASON_CORRUPT:
+      /* The crash context area was corrupt -- proceed with caution.
+	 We have no way of passing this information back to the caller.  */
+      abfd->tdata.cisco_core_data->sig = 0;
+      break;
+    case CRASH_REASON_EXCEPTION:
+      /* Crash occured due to CPU exception.  */
+
+      /* This is 68k-specific; for MIPS we'll need to interpret
+	 cpu_vector differently based on the target configuration
+	 (since CISCO core files don't seem to have the processor
+	 encoded in them).  */
+
+      switch (bfd_get_32 (abfd, crashinfo.cpu_vector))
+	{
+	   /* bus error           */
+	case 2 : abfd->tdata.cisco_core_data->sig = SIGBUS; break;
+	   /* address error       */
+	case 3 : abfd->tdata.cisco_core_data->sig = SIGBUS; break;
+	   /* illegal instruction */
+	case 4 : abfd->tdata.cisco_core_data->sig = SIGILL;  break;
+	   /* zero divide         */
+	case 5 : abfd->tdata.cisco_core_data->sig = SIGFPE;  break;
+	   /* chk instruction     */
+	case 6 : abfd->tdata.cisco_core_data->sig = SIGFPE; break;
+	   /* trapv instruction   */
+	case 7 : abfd->tdata.cisco_core_data->sig = SIGFPE; break;
+	   /* privilege violation */
+	case 8 : abfd->tdata.cisco_core_data->sig = SIGSEGV; break;
+	   /* trace trap          */
+	case 9 : abfd->tdata.cisco_core_data->sig = SIGTRAP;  break;
+	   /* line 1010 emulator  */
+	case 10: abfd->tdata.cisco_core_data->sig = SIGILL;  break;
+	   /* line 1111 emulator  */
+	case 11: abfd->tdata.cisco_core_data->sig = SIGILL;  break;
+
+	  /* Coprocessor protocol violation.  Using a standard MMU or FPU
+	     this cannot be triggered by software.  Call it a SIGBUS.  */
+	case 13: abfd->tdata.cisco_core_data->sig = SIGBUS;  break;
+
+	  /* interrupt           */
+	case 31: abfd->tdata.cisco_core_data->sig = SIGINT;  break;
+	  /* breakpoint          */
+	case 33: abfd->tdata.cisco_core_data->sig = SIGTRAP;  break;
+
+	  /* floating point err  */
+	case 48: abfd->tdata.cisco_core_data->sig = SIGFPE;  break;
+	  /* floating point err  */
+	case 49: abfd->tdata.cisco_core_data->sig = SIGFPE;  break;
+	  /* zero divide         */
+	case 50: abfd->tdata.cisco_core_data->sig = SIGFPE;  break;
+	  /* underflow           */
+	case 51: abfd->tdata.cisco_core_data->sig = SIGFPE;  break;
+	  /* operand error       */
+	case 52: abfd->tdata.cisco_core_data->sig = SIGFPE;  break;
+	   /* overflow            */
+	case 53: abfd->tdata.cisco_core_data->sig = SIGFPE;  break;
+	  /* NAN                 */
+	case 54: abfd->tdata.cisco_core_data->sig = SIGFPE;  break;
+	default:
+#ifndef SIGEMT
+#define SIGEMT SIGTRAP
+#endif
+	  /* "software generated"*/
+	  abfd->tdata.cisco_core_data->sig = SIGEMT;
+	}
+      break;
+    default:
+      /* Unknown crash reason.  */
+      abfd->tdata.cisco_core_data->sig = 0;
+      break;
+    }
+
+  /* Create a ".data" section that maps the entire file, which is
+     essentially a dump of the target system's RAM.  */
+
+  flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;
+  asect = bfd_make_section_anyway_with_flags (abfd, ".data", flags);
+  if (asect == NULL)
+    goto error_return;
+  /* The size of memory is the size of the core file itself.  */
+  asect->size = statbuf.st_size;
+  asect->vma = rambase;
+  asect->filepos = 0;
+
+  /* Create a ".crash" section to allow access to the saved
+     crash information.  */
+
+  flags = SEC_HAS_CONTENTS;
+  asect = bfd_make_section_anyway_with_flags (abfd, ".crash", flags);
+  if (asect == NULL)
+    goto error_return;
+  asect->vma = 0;
+  asect->filepos = crashinfo_offset;
+  asect->size = sizeof (crashinfo);
+
+  /* Create a ".reg" section to allow access to the saved
+     registers.  */
+
+  asect = bfd_make_section_anyway_with_flags (abfd, ".reg", flags);
+  if (asect == NULL)
+    goto error_return;
+  asect->vma = 0;
+  asect->filepos = bfd_get_32 (abfd, crashinfo.registers) - rambase;
+  /* Since we don't know the exact size of the saved register info,
+     choose a register section size that is either the remaining part
+     of the file, or 1024, whichever is smaller.  */
+  nread = statbuf.st_size - asect->filepos;
+  asect->size = (nread < 1024) ? nread : 1024;
+
+  return abfd->xvec;
+
+  /* Get here if we have already started filling out the BFD
+     and there is an error of some kind.  */
+
+ error_return:
+  bfd_release (abfd, abfd->tdata.any);
+  abfd->tdata.any = NULL;
+  bfd_section_list_clear (abfd);
+  return NULL;
+}
+
+static const bfd_target *
+cisco_core_file_p (abfd)
+     bfd *abfd;
+{
+  int *crash_info_locp;
+  const bfd_target *target = NULL;
+
+  for (crash_info_locp = crash_info_locs;
+       *crash_info_locp != -1  &&  target == NULL;
+       crash_info_locp++)
+    {
+      target = cisco_core_file_validate (abfd, *crash_info_locp);
+    }
+  return (target);
+}
+
+char *
+cisco_core_file_failing_command (abfd)
+     bfd *abfd ATTRIBUTE_UNUSED;
+{
+  return NULL;
+}
+
+int
+cisco_core_file_failing_signal (abfd)
+     bfd *abfd ATTRIBUTE_UNUSED;
+{
+  return abfd->tdata.cisco_core_data->sig;
+}
+
+extern const bfd_target cisco_core_little_vec;
+
+const bfd_target cisco_core_big_vec =
+  {
+    "cisco-ios-core-big",
+    bfd_target_unknown_flavour,
+    BFD_ENDIAN_BIG,		/* target byte order */
+    BFD_ENDIAN_BIG,		/* target headers byte order */
+    (HAS_RELOC | EXEC_P |	/* object flags */
+     HAS_LINENO | HAS_DEBUG |
+     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+    0,				/* symbol prefix */
+    ' ',			/* ar_pad_char */
+    16,				/* ar_max_namelen */
+    0,				/* match priority.  */
+    bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+    bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+    bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
+    bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+    bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+    bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
+
+    {				/* bfd_check_format */
+     _bfd_dummy_target,		/* unknown format */
+     _bfd_dummy_target,		/* object file */
+     _bfd_dummy_target,		/* archive */
+     cisco_core_file_p	/* a core file */
+    },
+    {				/* bfd_set_format */
+     bfd_false, bfd_false,
+     bfd_false, bfd_false
+    },
+    {				/* bfd_write_contents */
+     bfd_false, bfd_false,
+     bfd_false, bfd_false
+    },
+
+       BFD_JUMP_TABLE_GENERIC (_bfd_generic),
+       BFD_JUMP_TABLE_COPY (_bfd_generic),
+       BFD_JUMP_TABLE_CORE (cisco),
+       BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+       BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
+       BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+       BFD_JUMP_TABLE_WRITE (_bfd_generic),
+       BFD_JUMP_TABLE_LINK (_bfd_nolink),
+       BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    & cisco_core_little_vec,
+
+    (PTR) 0			/* backend_data */
+};
+
+const bfd_target cisco_core_little_vec =
+  {
+    "cisco-ios-core-little",
+    bfd_target_unknown_flavour,
+    BFD_ENDIAN_LITTLE,		/* target byte order */
+    BFD_ENDIAN_LITTLE,		/* target headers byte order */
+    (HAS_RELOC | EXEC_P |	/* object flags */
+     HAS_LINENO | HAS_DEBUG |
+     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+    0,			                                   /* symbol prefix */
+    ' ',						   /* ar_pad_char */
+    16,							   /* ar_max_namelen */
+    0,				/* match_priority */
+    bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
+    bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
+
+    {				/* bfd_check_format */
+     _bfd_dummy_target,		/* unknown format */
+     _bfd_dummy_target,		/* object file */
+     _bfd_dummy_target,		/* archive */
+     cisco_core_file_p	/* a core file */
+    },
+    {				/* bfd_set_format */
+     bfd_false, bfd_false,
+     bfd_false, bfd_false
+    },
+    {				/* bfd_write_contents */
+     bfd_false, bfd_false,
+     bfd_false, bfd_false
+    },
+
+       BFD_JUMP_TABLE_GENERIC (_bfd_generic),
+       BFD_JUMP_TABLE_COPY (_bfd_generic),
+       BFD_JUMP_TABLE_CORE (cisco),
+       BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+       BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
+       BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+       BFD_JUMP_TABLE_WRITE (_bfd_generic),
+       BFD_JUMP_TABLE_LINK (_bfd_nolink),
+       BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    &cisco_core_big_vec,
+
+    (PTR) 0			/* backend_data */
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-alpha.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-alpha.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-alpha.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-alpha.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2452 @@
+/* BFD back-end for ALPHA Extended-Coff files.
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Modified from coff-mips.c by Steve Chamberlain <sac@cygnus.com> and
+   Ian Lance Taylor <ian@cygnus.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "coff/internal.h"
+#include "coff/sym.h"
+#include "coff/symconst.h"
+#include "coff/ecoff.h"
+#include "coff/alpha.h"
+#include "aout/ar.h"
+#include "libcoff.h"
+#include "libecoff.h"
+
+/* Prototypes for static functions.  */
+
+static const bfd_target *alpha_ecoff_object_p
+  PARAMS ((bfd *));
+static bfd_boolean alpha_ecoff_bad_format_hook
+  PARAMS ((bfd *abfd, PTR filehdr));
+static PTR alpha_ecoff_mkobject_hook
+  PARAMS ((bfd *, PTR filehdr, PTR aouthdr));
+static void alpha_ecoff_swap_reloc_in
+  PARAMS ((bfd *, PTR, struct internal_reloc *));
+static void alpha_ecoff_swap_reloc_out
+  PARAMS ((bfd *, const struct internal_reloc *, PTR));
+static void alpha_adjust_reloc_in
+  PARAMS ((bfd *, const struct internal_reloc *, arelent *));
+static void alpha_adjust_reloc_out
+  PARAMS ((bfd *, const arelent *, struct internal_reloc *));
+static reloc_howto_type *alpha_bfd_reloc_type_lookup
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
+static bfd_byte *alpha_ecoff_get_relocated_section_contents
+  PARAMS ((bfd *abfd, struct bfd_link_info *, struct bfd_link_order *,
+	   bfd_byte *data, bfd_boolean relocatable, asymbol **symbols));
+static bfd_vma alpha_convert_external_reloc
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, struct external_reloc *,
+	   struct ecoff_link_hash_entry *));
+static bfd_boolean alpha_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, PTR));
+static bfd_boolean alpha_adjust_headers
+  PARAMS ((bfd *, struct internal_filehdr *, struct internal_aouthdr *));
+static PTR alpha_ecoff_read_ar_hdr
+  PARAMS ((bfd *));
+static bfd *alpha_ecoff_get_elt_at_filepos
+  PARAMS ((bfd *, file_ptr));
+static bfd *alpha_ecoff_openr_next_archived_file
+  PARAMS ((bfd *, bfd *));
+static bfd *alpha_ecoff_get_elt_at_index
+  PARAMS ((bfd *, symindex));
+
+/* ECOFF has COFF sections, but the debugging information is stored in
+   a completely different format.  ECOFF targets use some of the
+   swapping routines from coffswap.h, and some of the generic COFF
+   routines in coffgen.c, but, unlike the real COFF targets, do not
+   use coffcode.h itself.
+
+   Get the generic COFF swapping routines, except for the reloc,
+   symbol, and lineno ones.  Give them ecoff names.  Define some
+   accessor macros for the large sizes used for Alpha ECOFF.  */
+
+#define GET_FILEHDR_SYMPTR H_GET_64
+#define PUT_FILEHDR_SYMPTR H_PUT_64
+#define GET_AOUTHDR_TSIZE H_GET_64
+#define PUT_AOUTHDR_TSIZE H_PUT_64
+#define GET_AOUTHDR_DSIZE H_GET_64
+#define PUT_AOUTHDR_DSIZE H_PUT_64
+#define GET_AOUTHDR_BSIZE H_GET_64
+#define PUT_AOUTHDR_BSIZE H_PUT_64
+#define GET_AOUTHDR_ENTRY H_GET_64
+#define PUT_AOUTHDR_ENTRY H_PUT_64
+#define GET_AOUTHDR_TEXT_START H_GET_64
+#define PUT_AOUTHDR_TEXT_START H_PUT_64
+#define GET_AOUTHDR_DATA_START H_GET_64
+#define PUT_AOUTHDR_DATA_START H_PUT_64
+#define GET_SCNHDR_PADDR H_GET_64
+#define PUT_SCNHDR_PADDR H_PUT_64
+#define GET_SCNHDR_VADDR H_GET_64
+#define PUT_SCNHDR_VADDR H_PUT_64
+#define GET_SCNHDR_SIZE H_GET_64
+#define PUT_SCNHDR_SIZE H_PUT_64
+#define GET_SCNHDR_SCNPTR H_GET_64
+#define PUT_SCNHDR_SCNPTR H_PUT_64
+#define GET_SCNHDR_RELPTR H_GET_64
+#define PUT_SCNHDR_RELPTR H_PUT_64
+#define GET_SCNHDR_LNNOPTR H_GET_64
+#define PUT_SCNHDR_LNNOPTR H_PUT_64
+
+#define ALPHAECOFF
+
+#define NO_COFF_RELOCS
+#define NO_COFF_SYMBOLS
+#define NO_COFF_LINENOS
+#define coff_swap_filehdr_in alpha_ecoff_swap_filehdr_in
+#define coff_swap_filehdr_out alpha_ecoff_swap_filehdr_out
+#define coff_swap_aouthdr_in alpha_ecoff_swap_aouthdr_in
+#define coff_swap_aouthdr_out alpha_ecoff_swap_aouthdr_out
+#define coff_swap_scnhdr_in alpha_ecoff_swap_scnhdr_in
+#define coff_swap_scnhdr_out alpha_ecoff_swap_scnhdr_out
+#include "coffswap.h"
+
+/* Get the ECOFF swapping routines.  */
+#define ECOFF_64
+#include "ecoffswap.h"
+
+/* How to process the various reloc types.  */
+
+static bfd_reloc_status_type reloc_nil
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+
+static bfd_reloc_status_type
+reloc_nil (abfd, reloc, sym, data, sec, output_bfd, error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc ATTRIBUTE_UNUSED;
+     asymbol *sym ATTRIBUTE_UNUSED;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *sec ATTRIBUTE_UNUSED;
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  return bfd_reloc_ok;
+}
+
+/* In case we're on a 32-bit machine, construct a 64-bit "-1" value
+   from smaller values.  Start with zero, widen, *then* decrement.  */
+#define MINUS_ONE	(((bfd_vma)0) - 1)
+
+static reloc_howto_type alpha_howto_table[] =
+{
+  /* Reloc type 0 is ignored by itself.  However, it appears after a
+     GPDISP reloc to identify the location where the low order 16 bits
+     of the gp register are loaded.  */
+  HOWTO (ALPHA_R_IGNORE,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 reloc_nil,		/* special_function */
+	 "IGNORE",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 32 bit reference to a symbol.  */
+  HOWTO (ALPHA_R_REFLONG,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "REFLONG",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 64 bit reference to a symbol.  */
+  HOWTO (ALPHA_R_REFQUAD,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "REFQUAD",		/* name */
+	 TRUE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32 bit GP relative offset.  This is just like REFLONG except
+     that when the value is used the value of the gp register will be
+     added in.  */
+  HOWTO (ALPHA_R_GPREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "GPREL32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used for an instruction that refers to memory off the GP
+     register.  The offset is 16 bits of the 32 bit instruction.  This
+     reloc always seems to be against the .lita section.  */
+  HOWTO (ALPHA_R_LITERAL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "LITERAL",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* This reloc only appears immediately following a LITERAL reloc.
+     It identifies a use of the literal.  It seems that the linker can
+     use this to eliminate a portion of the .lita section.  The symbol
+     index is special: 1 means the literal address is in the base
+     register of a memory format instruction; 2 means the literal
+     address is in the byte offset register of a byte-manipulation
+     instruction; 3 means the literal address is in the target
+     register of a jsr instruction.  This does not actually do any
+     relocation.  */
+  HOWTO (ALPHA_R_LITUSE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 reloc_nil,		/* special_function */
+	 "LITUSE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Load the gp register.  This is always used for a ldah instruction
+     which loads the upper 16 bits of the gp register.  The next reloc
+     will be an IGNORE reloc which identifies the location of the lda
+     instruction which loads the lower 16 bits.  The symbol index of
+     the GPDISP instruction appears to actually be the number of bytes
+     between the ldah and lda instructions.  This gives two different
+     ways to determine where the lda instruction is; I don't know why
+     both are used.  The value to use for the relocation is the
+     difference between the GP value and the current location; the
+     load will always be done against a register holding the current
+     address.  */
+  HOWTO (ALPHA_R_GPDISP,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 reloc_nil,		/* special_function */
+	 "GPDISP",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 21 bit branch.  The native assembler generates these for
+     branches within the text segment, and also fills in the PC
+     relative offset in the instruction.  */
+  HOWTO (ALPHA_R_BRADDR,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 21,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "BRADDR",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x1fffff,		/* src_mask */
+	 0x1fffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A hint for a jump to a register.  */
+  HOWTO (ALPHA_R_HINT,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 14,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "HINT",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x3fff,		/* src_mask */
+	 0x3fff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit PC relative offset.  */
+  HOWTO (ALPHA_R_SREL16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "SREL16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit PC relative offset.  */
+  HOWTO (ALPHA_R_SREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "SREL32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 64 bit PC relative offset.  */
+  HOWTO (ALPHA_R_SREL64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "SREL64",		/* name */
+	 TRUE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Push a value on the reloc evaluation stack.  */
+  HOWTO (ALPHA_R_OP_PUSH,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "OP_PUSH",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Store the value from the stack at the given address.  Store it in
+     a bitfield of size r_size starting at bit position r_offset.  */
+  HOWTO (ALPHA_R_OP_STORE,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "OP_STORE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Subtract the reloc address from the value on the top of the
+     relocation stack.  */
+  HOWTO (ALPHA_R_OP_PSUB,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "OP_PSUB",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Shift the value on the top of the relocation stack right by the
+     given value.  */
+  HOWTO (ALPHA_R_OP_PRSHIFT,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "OP_PRSHIFT",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Adjust the GP value for a new range in the object file.  */
+  HOWTO (ALPHA_R_GPVALUE,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "GPVALUE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE)			/* pcrel_offset */
+};
+
+/* Recognize an Alpha ECOFF file.  */
+
+static const bfd_target *
+alpha_ecoff_object_p (abfd)
+     bfd *abfd;
+{
+  static const bfd_target *ret;
+
+  ret = coff_object_p (abfd);
+
+  if (ret != NULL)
+    {
+      asection *sec;
+
+      /* Alpha ECOFF has a .pdata section.  The lnnoptr field of the
+	 .pdata section is the number of entries it contains.  Each
+	 entry takes up 8 bytes.  The number of entries is required
+	 since the section is aligned to a 16 byte boundary.  When we
+	 link .pdata sections together, we do not want to include the
+	 alignment bytes.  We handle this on input by faking the size
+	 of the .pdata section to remove the unwanted alignment bytes.
+	 On output we will set the lnnoptr field and force the
+	 alignment.  */
+      sec = bfd_get_section_by_name (abfd, _PDATA);
+      if (sec != (asection *) NULL)
+	{
+	  bfd_size_type size;
+
+	  size = sec->line_filepos * 8;
+	  BFD_ASSERT (size == sec->size
+		      || size + 8 == sec->size);
+	  if (! bfd_set_section_size (abfd, sec, size))
+	    return NULL;
+	}
+    }
+
+  return ret;
+}
+
+/* See whether the magic number matches.  */
+
+static bfd_boolean
+alpha_ecoff_bad_format_hook (abfd, filehdr)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     PTR filehdr;
+{
+  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
+
+  if (! ALPHA_ECOFF_BADMAG (*internal_f))
+    return TRUE;
+
+  if (ALPHA_ECOFF_COMPRESSEDMAG (*internal_f))
+    (*_bfd_error_handler)
+      (_("%B: Cannot handle compressed Alpha binaries.\n"
+	 "   Use compiler flags, or objZ, to generate uncompressed binaries."),
+       abfd);
+
+  return FALSE;
+}
+
+/* This is a hook called by coff_real_object_p to create any backend
+   specific information.  */
+
+static PTR
+alpha_ecoff_mkobject_hook (abfd, filehdr, aouthdr)
+     bfd *abfd;
+     PTR filehdr;
+     PTR aouthdr;
+{
+  PTR ecoff;
+
+  ecoff = _bfd_ecoff_mkobject_hook (abfd, filehdr, aouthdr);
+
+  if (ecoff != NULL)
+    {
+      struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
+
+      /* Set additional BFD flags according to the object type from the
+	 machine specific file header flags.  */
+      switch (internal_f->f_flags & F_ALPHA_OBJECT_TYPE_MASK)
+	{
+	case F_ALPHA_SHARABLE:
+	  abfd->flags |= DYNAMIC;
+	  break;
+	case F_ALPHA_CALL_SHARED:
+	  /* Always executable if using shared libraries as the run time
+	     loader might resolve undefined references.  */
+	  abfd->flags |= (DYNAMIC | EXEC_P);
+	  break;
+	}
+    }
+  return ecoff;
+}
+
+/* Reloc handling.  */
+
+/* Swap a reloc in.  */
+
+static void
+alpha_ecoff_swap_reloc_in (abfd, ext_ptr, intern)
+     bfd *abfd;
+     PTR ext_ptr;
+     struct internal_reloc *intern;
+{
+  const RELOC *ext = (RELOC *) ext_ptr;
+
+  intern->r_vaddr = H_GET_64 (abfd, ext->r_vaddr);
+  intern->r_symndx = H_GET_32 (abfd, ext->r_symndx);
+
+  BFD_ASSERT (bfd_header_little_endian (abfd));
+
+  intern->r_type = ((ext->r_bits[0] & RELOC_BITS0_TYPE_LITTLE)
+		    >> RELOC_BITS0_TYPE_SH_LITTLE);
+  intern->r_extern = (ext->r_bits[1] & RELOC_BITS1_EXTERN_LITTLE) != 0;
+  intern->r_offset = ((ext->r_bits[1] & RELOC_BITS1_OFFSET_LITTLE)
+		      >> RELOC_BITS1_OFFSET_SH_LITTLE);
+  /* Ignored the reserved bits.  */
+  intern->r_size = ((ext->r_bits[3] & RELOC_BITS3_SIZE_LITTLE)
+		    >> RELOC_BITS3_SIZE_SH_LITTLE);
+
+  if (intern->r_type == ALPHA_R_LITUSE
+      || intern->r_type == ALPHA_R_GPDISP)
+    {
+      /* Handle the LITUSE and GPDISP relocs specially.  Its symndx
+	 value is not actually a symbol index, but is instead a
+	 special code.  We put the code in the r_size field, and
+	 clobber the symndx.  */
+      if (intern->r_size != 0)
+	abort ();
+      intern->r_size = intern->r_symndx;
+      intern->r_symndx = RELOC_SECTION_NONE;
+    }
+  else if (intern->r_type == ALPHA_R_IGNORE)
+    {
+      /* The IGNORE reloc generally follows a GPDISP reloc, and is
+	 against the .lita section.  The section is irrelevant.  */
+      if (! intern->r_extern &&
+	  intern->r_symndx == RELOC_SECTION_ABS)
+	abort ();
+      if (! intern->r_extern && intern->r_symndx == RELOC_SECTION_LITA)
+	intern->r_symndx = RELOC_SECTION_ABS;
+    }
+}
+
+/* Swap a reloc out.  */
+
+static void
+alpha_ecoff_swap_reloc_out (abfd, intern, dst)
+     bfd *abfd;
+     const struct internal_reloc *intern;
+     PTR dst;
+{
+  RELOC *ext = (RELOC *) dst;
+  long symndx;
+  unsigned char size;
+
+  /* Undo the hackery done in swap_reloc_in.  */
+  if (intern->r_type == ALPHA_R_LITUSE
+      || intern->r_type == ALPHA_R_GPDISP)
+    {
+      symndx = intern->r_size;
+      size = 0;
+    }
+  else if (intern->r_type == ALPHA_R_IGNORE
+	   && ! intern->r_extern
+	   && intern->r_symndx == RELOC_SECTION_ABS)
+    {
+      symndx = RELOC_SECTION_LITA;
+      size = intern->r_size;
+    }
+  else
+    {
+      symndx = intern->r_symndx;
+      size = intern->r_size;
+    }
+
+  /* XXX FIXME:  The maximum symndx value used to be 14 but this
+     fails with object files produced by DEC's C++ compiler.
+     Where does the value 14 (or 15) come from anyway ?  */
+  BFD_ASSERT (intern->r_extern
+	      || (intern->r_symndx >= 0 && intern->r_symndx <= 15));
+
+  H_PUT_64 (abfd, intern->r_vaddr, ext->r_vaddr);
+  H_PUT_32 (abfd, symndx, ext->r_symndx);
+
+  BFD_ASSERT (bfd_header_little_endian (abfd));
+
+  ext->r_bits[0] = ((intern->r_type << RELOC_BITS0_TYPE_SH_LITTLE)
+		    & RELOC_BITS0_TYPE_LITTLE);
+  ext->r_bits[1] = ((intern->r_extern ? RELOC_BITS1_EXTERN_LITTLE : 0)
+		    | ((intern->r_offset << RELOC_BITS1_OFFSET_SH_LITTLE)
+		       & RELOC_BITS1_OFFSET_LITTLE));
+  ext->r_bits[2] = 0;
+  ext->r_bits[3] = ((size << RELOC_BITS3_SIZE_SH_LITTLE)
+		    & RELOC_BITS3_SIZE_LITTLE);
+}
+
+/* Finish canonicalizing a reloc.  Part of this is generic to all
+   ECOFF targets, and that part is in ecoff.c.  The rest is done in
+   this backend routine.  It must fill in the howto field.  */
+
+static void
+alpha_adjust_reloc_in (abfd, intern, rptr)
+     bfd *abfd;
+     const struct internal_reloc *intern;
+     arelent *rptr;
+{
+  if (intern->r_type > ALPHA_R_GPVALUE)
+    {
+      (*_bfd_error_handler)
+	(_("%B: unknown/unsupported relocation type %d"),
+	 abfd, intern->r_type);
+      bfd_set_error (bfd_error_bad_value);
+      rptr->addend = 0;
+      rptr->howto  = NULL;
+      return;
+    }
+
+  switch (intern->r_type)
+    {
+    case ALPHA_R_BRADDR:
+    case ALPHA_R_SREL16:
+    case ALPHA_R_SREL32:
+    case ALPHA_R_SREL64:
+      /* This relocs appear to be fully resolved when they are against
+         internal symbols.  Against external symbols, BRADDR at least
+         appears to be resolved against the next instruction.  */
+      if (! intern->r_extern)
+	rptr->addend = 0;
+      else
+	rptr->addend = - (intern->r_vaddr + 4);
+      break;
+
+    case ALPHA_R_GPREL32:
+    case ALPHA_R_LITERAL:
+      /* Copy the gp value for this object file into the addend, to
+	 ensure that we are not confused by the linker.  */
+      if (! intern->r_extern)
+	rptr->addend += ecoff_data (abfd)->gp;
+      break;
+
+    case ALPHA_R_LITUSE:
+    case ALPHA_R_GPDISP:
+      /* The LITUSE and GPDISP relocs do not use a symbol, or an
+	 addend, but they do use a special code.  Put this code in the
+	 addend field.  */
+      rptr->addend = intern->r_size;
+      break;
+
+    case ALPHA_R_OP_STORE:
+      /* The STORE reloc needs the size and offset fields.  We store
+	 them in the addend.  */
+      BFD_ASSERT (intern->r_offset <= 256);
+      rptr->addend = (intern->r_offset << 8) + intern->r_size;
+      break;
+
+    case ALPHA_R_OP_PUSH:
+    case ALPHA_R_OP_PSUB:
+    case ALPHA_R_OP_PRSHIFT:
+      /* The PUSH, PSUB and PRSHIFT relocs do not actually use an
+	 address.  I believe that the address supplied is really an
+	 addend.  */
+      rptr->addend = intern->r_vaddr;
+      break;
+
+    case ALPHA_R_GPVALUE:
+      /* Set the addend field to the new GP value.  */
+      rptr->addend = intern->r_symndx + ecoff_data (abfd)->gp;
+      break;
+
+    case ALPHA_R_IGNORE:
+      /* If the type is ALPHA_R_IGNORE, make sure this is a reference
+	 to the absolute section so that the reloc is ignored.  For
+	 some reason the address of this reloc type is not adjusted by
+	 the section vma.  We record the gp value for this object file
+	 here, for convenience when doing the GPDISP relocation.  */
+      rptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+      rptr->address = intern->r_vaddr;
+      rptr->addend = ecoff_data (abfd)->gp;
+      break;
+
+    default:
+      break;
+    }
+
+  rptr->howto = &alpha_howto_table[intern->r_type];
+}
+
+/* When writing out a reloc we need to pull some values back out of
+   the addend field into the reloc.  This is roughly the reverse of
+   alpha_adjust_reloc_in, except that there are several changes we do
+   not need to undo.  */
+
+static void
+alpha_adjust_reloc_out (abfd, rel, intern)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     const arelent *rel;
+     struct internal_reloc *intern;
+{
+  switch (intern->r_type)
+    {
+    case ALPHA_R_LITUSE:
+    case ALPHA_R_GPDISP:
+      intern->r_size = rel->addend;
+      break;
+
+    case ALPHA_R_OP_STORE:
+      intern->r_size = rel->addend & 0xff;
+      intern->r_offset = (rel->addend >> 8) & 0xff;
+      break;
+
+    case ALPHA_R_OP_PUSH:
+    case ALPHA_R_OP_PSUB:
+    case ALPHA_R_OP_PRSHIFT:
+      intern->r_vaddr = rel->addend;
+      break;
+
+    case ALPHA_R_IGNORE:
+      intern->r_vaddr = rel->address;
+      break;
+
+    default:
+      break;
+    }
+}
+
+/* The size of the stack for the relocation evaluator.  */
+#define RELOC_STACKSIZE (10)
+
+/* Alpha ECOFF relocs have a built in expression evaluator as well as
+   other interdependencies.  Rather than use a bunch of special
+   functions and global variables, we use a single routine to do all
+   the relocation for a section.  I haven't yet worked out how the
+   assembler is going to handle this.  */
+
+static bfd_byte *
+alpha_ecoff_get_relocated_section_contents (abfd, link_info, link_order,
+					    data, relocatable, symbols)
+     bfd *abfd;
+     struct bfd_link_info *link_info;
+     struct bfd_link_order *link_order;
+     bfd_byte *data;
+     bfd_boolean relocatable;
+     asymbol **symbols;
+{
+  bfd *input_bfd = link_order->u.indirect.section->owner;
+  asection *input_section = link_order->u.indirect.section;
+  long reloc_size = bfd_get_reloc_upper_bound (input_bfd, input_section);
+  arelent **reloc_vector = NULL;
+  long reloc_count;
+  bfd *output_bfd = relocatable ? abfd : (bfd *) NULL;
+  bfd_vma gp;
+  bfd_size_type sz;
+  bfd_boolean gp_undefined;
+  bfd_vma stack[RELOC_STACKSIZE];
+  int tos = 0;
+
+  if (reloc_size < 0)
+    goto error_return;
+  reloc_vector = (arelent **) bfd_malloc ((bfd_size_type) reloc_size);
+  if (reloc_vector == NULL && reloc_size != 0)
+    goto error_return;
+
+  sz = input_section->rawsize ? input_section->rawsize : input_section->size;
+  if (! bfd_get_section_contents (input_bfd, input_section, data, 0, sz))
+    goto error_return;
+
+  reloc_count = bfd_canonicalize_reloc (input_bfd, input_section,
+					reloc_vector, symbols);
+  if (reloc_count < 0)
+    goto error_return;
+  if (reloc_count == 0)
+    goto successful_return;
+
+  /* Get the GP value for the output BFD.  */
+  gp_undefined = FALSE;
+  gp = _bfd_get_gp_value (abfd);
+  if (gp == 0)
+    {
+      if (relocatable)
+	{
+	  asection *sec;
+	  bfd_vma lo;
+
+	  /* Make up a value.  */
+	  lo = (bfd_vma) -1;
+	  for (sec = abfd->sections; sec != NULL; sec = sec->next)
+	    {
+	      if (sec->vma < lo
+		  && (strcmp (sec->name, ".sbss") == 0
+		      || strcmp (sec->name, ".sdata") == 0
+		      || strcmp (sec->name, ".lit4") == 0
+		      || strcmp (sec->name, ".lit8") == 0
+		      || strcmp (sec->name, ".lita") == 0))
+		lo = sec->vma;
+	    }
+	  gp = lo + 0x8000;
+	  _bfd_set_gp_value (abfd, gp);
+	}
+      else
+	{
+	  struct bfd_link_hash_entry *h;
+
+	  h = bfd_link_hash_lookup (link_info->hash, "_gp", FALSE, FALSE,
+				    TRUE);
+	  if (h == (struct bfd_link_hash_entry *) NULL
+	      || h->type != bfd_link_hash_defined)
+	    gp_undefined = TRUE;
+	  else
+	    {
+	      gp = (h->u.def.value
+		    + h->u.def.section->output_section->vma
+		    + h->u.def.section->output_offset);
+	      _bfd_set_gp_value (abfd, gp);
+	    }
+	}
+    }
+
+  for (; *reloc_vector != (arelent *) NULL; reloc_vector++)
+    {
+      arelent *rel;
+      bfd_reloc_status_type r;
+      char *err;
+
+      rel = *reloc_vector;
+      r = bfd_reloc_ok;
+      switch (rel->howto->type)
+	{
+	case ALPHA_R_IGNORE:
+	  rel->address += input_section->output_offset;
+	  break;
+
+	case ALPHA_R_REFLONG:
+	case ALPHA_R_REFQUAD:
+	case ALPHA_R_BRADDR:
+	case ALPHA_R_HINT:
+	case ALPHA_R_SREL16:
+	case ALPHA_R_SREL32:
+	case ALPHA_R_SREL64:
+	  if (relocatable
+	      && ((*rel->sym_ptr_ptr)->flags & BSF_SECTION_SYM) == 0)
+	    {
+	      rel->address += input_section->output_offset;
+	      break;
+	    }
+	  r = bfd_perform_relocation (input_bfd, rel, data, input_section,
+				      output_bfd, &err);
+	  break;
+
+	case ALPHA_R_GPREL32:
+	  /* This relocation is used in a switch table.  It is a 32
+	     bit offset from the current GP value.  We must adjust it
+	     by the different between the original GP value and the
+	     current GP value.  The original GP value is stored in the
+	     addend.  We adjust the addend and let
+	     bfd_perform_relocation finish the job.  */
+	  rel->addend -= gp;
+	  r = bfd_perform_relocation (input_bfd, rel, data, input_section,
+				      output_bfd, &err);
+	  if (r == bfd_reloc_ok && gp_undefined)
+	    {
+	      r = bfd_reloc_dangerous;
+	      err = (char *) _("GP relative relocation used when GP not defined");
+	    }
+	  break;
+
+	case ALPHA_R_LITERAL:
+	  /* This is a reference to a literal value, generally
+	     (always?) in the .lita section.  This is a 16 bit GP
+	     relative relocation.  Sometimes the subsequent reloc is a
+	     LITUSE reloc, which indicates how this reloc is used.
+	     This sometimes permits rewriting the two instructions
+	     referred to by the LITERAL and the LITUSE into different
+	     instructions which do not refer to .lita.  This can save
+	     a memory reference, and permits removing a value from
+	     .lita thus saving GP relative space.
+
+	     We do not these optimizations.  To do them we would need
+	     to arrange to link the .lita section first, so that by
+	     the time we got here we would know the final values to
+	     use.  This would not be particularly difficult, but it is
+	     not currently implemented.  */
+
+	  {
+	    unsigned long insn;
+
+	    /* I believe that the LITERAL reloc will only apply to a
+	       ldq or ldl instruction, so check my assumption.  */
+	    insn = bfd_get_32 (input_bfd, data + rel->address);
+	    BFD_ASSERT (((insn >> 26) & 0x3f) == 0x29
+			|| ((insn >> 26) & 0x3f) == 0x28);
+
+	    rel->addend -= gp;
+	    r = bfd_perform_relocation (input_bfd, rel, data, input_section,
+					output_bfd, &err);
+	    if (r == bfd_reloc_ok && gp_undefined)
+	      {
+		r = bfd_reloc_dangerous;
+		err =
+		  (char *) _("GP relative relocation used when GP not defined");
+	      }
+	  }
+	  break;
+
+	case ALPHA_R_LITUSE:
+	  /* See ALPHA_R_LITERAL above for the uses of this reloc.  It
+	     does not cause anything to happen, itself.  */
+	  rel->address += input_section->output_offset;
+	  break;
+
+	case ALPHA_R_GPDISP:
+	  /* This marks the ldah of an ldah/lda pair which loads the
+	     gp register with the difference of the gp value and the
+	     current location.  The second of the pair is r_size bytes
+	     ahead; it used to be marked with an ALPHA_R_IGNORE reloc,
+	     but that no longer happens in OSF/1 3.2.  */
+	  {
+	    unsigned long insn1, insn2;
+	    bfd_vma addend;
+
+	    /* Get the two instructions.  */
+	    insn1 = bfd_get_32 (input_bfd, data + rel->address);
+	    insn2 = bfd_get_32 (input_bfd, data + rel->address + rel->addend);
+
+	    BFD_ASSERT (((insn1 >> 26) & 0x3f) == 0x09); /* ldah */
+	    BFD_ASSERT (((insn2 >> 26) & 0x3f) == 0x08); /* lda */
+
+	    /* Get the existing addend.  We must account for the sign
+	       extension done by lda and ldah.  */
+	    addend = ((insn1 & 0xffff) << 16) + (insn2 & 0xffff);
+	    if (insn1 & 0x8000)
+	      {
+		addend -= 0x80000000;
+		addend -= 0x80000000;
+	      }
+	    if (insn2 & 0x8000)
+	      addend -= 0x10000;
+
+	    /* The existing addend includes the different between the
+	       gp of the input BFD and the address in the input BFD.
+	       Subtract this out.  */
+	    addend -= (ecoff_data (input_bfd)->gp
+		       - (input_section->vma + rel->address));
+
+	    /* Now add in the final gp value, and subtract out the
+	       final address.  */
+	    addend += (gp
+		       - (input_section->output_section->vma
+			  + input_section->output_offset
+			  + rel->address));
+
+	    /* Change the instructions, accounting for the sign
+	       extension, and write them out.  */
+	    if (addend & 0x8000)
+	      addend += 0x10000;
+	    insn1 = (insn1 & 0xffff0000) | ((addend >> 16) & 0xffff);
+	    insn2 = (insn2 & 0xffff0000) | (addend & 0xffff);
+
+	    bfd_put_32 (input_bfd, (bfd_vma) insn1, data + rel->address);
+	    bfd_put_32 (input_bfd, (bfd_vma) insn2,
+			data + rel->address + rel->addend);
+
+	    rel->address += input_section->output_offset;
+	  }
+	  break;
+
+	case ALPHA_R_OP_PUSH:
+	  /* Push a value on the reloc evaluation stack.  */
+	  {
+	    asymbol *symbol;
+	    bfd_vma relocation;
+
+	    if (relocatable)
+	      {
+		rel->address += input_section->output_offset;
+		break;
+	      }
+
+	    /* Figure out the relocation of this symbol.  */
+	    symbol = *rel->sym_ptr_ptr;
+
+	    if (bfd_is_und_section (symbol->section))
+	      r = bfd_reloc_undefined;
+
+	    if (bfd_is_com_section (symbol->section))
+	      relocation = 0;
+	    else
+	      relocation = symbol->value;
+	    relocation += symbol->section->output_section->vma;
+	    relocation += symbol->section->output_offset;
+	    relocation += rel->addend;
+
+	    if (tos >= RELOC_STACKSIZE)
+	      abort ();
+
+	    stack[tos++] = relocation;
+	  }
+	  break;
+
+	case ALPHA_R_OP_STORE:
+	  /* Store a value from the reloc stack into a bitfield.  */
+	  {
+	    bfd_vma val;
+	    int offset, size;
+
+	    if (relocatable)
+	      {
+		rel->address += input_section->output_offset;
+		break;
+	      }
+
+	    if (tos == 0)
+	      abort ();
+
+	    /* The offset and size for this reloc are encoded into the
+	       addend field by alpha_adjust_reloc_in.  */
+	    offset = (rel->addend >> 8) & 0xff;
+	    size = rel->addend & 0xff;
+
+	    val = bfd_get_64 (abfd, data + rel->address);
+	    val &=~ (((1 << size) - 1) << offset);
+	    val |= (stack[--tos] & ((1 << size) - 1)) << offset;
+	    bfd_put_64 (abfd, val, data + rel->address);
+	  }
+	  break;
+
+	case ALPHA_R_OP_PSUB:
+	  /* Subtract a value from the top of the stack.  */
+	  {
+	    asymbol *symbol;
+	    bfd_vma relocation;
+
+	    if (relocatable)
+	      {
+		rel->address += input_section->output_offset;
+		break;
+	      }
+
+	    /* Figure out the relocation of this symbol.  */
+	    symbol = *rel->sym_ptr_ptr;
+
+	    if (bfd_is_und_section (symbol->section))
+	      r = bfd_reloc_undefined;
+
+	    if (bfd_is_com_section (symbol->section))
+	      relocation = 0;
+	    else
+	      relocation = symbol->value;
+	    relocation += symbol->section->output_section->vma;
+	    relocation += symbol->section->output_offset;
+	    relocation += rel->addend;
+
+	    if (tos == 0)
+	      abort ();
+
+	    stack[tos - 1] -= relocation;
+	  }
+	  break;
+
+	case ALPHA_R_OP_PRSHIFT:
+	  /* Shift the value on the top of the stack.  */
+	  {
+	    asymbol *symbol;
+	    bfd_vma relocation;
+
+	    if (relocatable)
+	      {
+		rel->address += input_section->output_offset;
+		break;
+	      }
+
+	    /* Figure out the relocation of this symbol.  */
+	    symbol = *rel->sym_ptr_ptr;
+
+	    if (bfd_is_und_section (symbol->section))
+	      r = bfd_reloc_undefined;
+
+	    if (bfd_is_com_section (symbol->section))
+	      relocation = 0;
+	    else
+	      relocation = symbol->value;
+	    relocation += symbol->section->output_section->vma;
+	    relocation += symbol->section->output_offset;
+	    relocation += rel->addend;
+
+	    if (tos == 0)
+	      abort ();
+
+	    stack[tos - 1] >>= relocation;
+	  }
+	  break;
+
+	case ALPHA_R_GPVALUE:
+	  /* I really don't know if this does the right thing.  */
+	  gp = rel->addend;
+	  gp_undefined = FALSE;
+	  break;
+
+	default:
+	  abort ();
+	}
+
+      if (relocatable)
+	{
+	  asection *os = input_section->output_section;
+
+	  /* A partial link, so keep the relocs.  */
+	  os->orelocation[os->reloc_count] = rel;
+	  os->reloc_count++;
+	}
+
+      if (r != bfd_reloc_ok)
+	{
+	  switch (r)
+	    {
+	    case bfd_reloc_undefined:
+	      if (! ((*link_info->callbacks->undefined_symbol)
+		     (link_info, bfd_asymbol_name (*rel->sym_ptr_ptr),
+		      input_bfd, input_section, rel->address, TRUE)))
+		goto error_return;
+	      break;
+	    case bfd_reloc_dangerous:
+	      if (! ((*link_info->callbacks->reloc_dangerous)
+		     (link_info, err, input_bfd, input_section,
+		      rel->address)))
+		goto error_return;
+	      break;
+	    case bfd_reloc_overflow:
+	      if (! ((*link_info->callbacks->reloc_overflow)
+		     (link_info, NULL,
+		      bfd_asymbol_name (*rel->sym_ptr_ptr),
+		      rel->howto->name, rel->addend, input_bfd,
+		      input_section, rel->address)))
+		goto error_return;
+	      break;
+	    case bfd_reloc_outofrange:
+	    default:
+	      abort ();
+	      break;
+	    }
+	}
+    }
+
+  if (tos != 0)
+    abort ();
+
+ successful_return:
+  if (reloc_vector != NULL)
+    free (reloc_vector);
+  return data;
+
+ error_return:
+  if (reloc_vector != NULL)
+    free (reloc_vector);
+  return NULL;
+}
+
+/* Get the howto structure for a generic reloc type.  */
+
+static reloc_howto_type *
+alpha_bfd_reloc_type_lookup (abfd, code)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     bfd_reloc_code_real_type code;
+{
+  int alpha_type;
+
+  switch (code)
+    {
+    case BFD_RELOC_32:
+      alpha_type = ALPHA_R_REFLONG;
+      break;
+    case BFD_RELOC_64:
+    case BFD_RELOC_CTOR:
+      alpha_type = ALPHA_R_REFQUAD;
+      break;
+    case BFD_RELOC_GPREL32:
+      alpha_type = ALPHA_R_GPREL32;
+      break;
+    case BFD_RELOC_ALPHA_LITERAL:
+      alpha_type = ALPHA_R_LITERAL;
+      break;
+    case BFD_RELOC_ALPHA_LITUSE:
+      alpha_type = ALPHA_R_LITUSE;
+      break;
+    case BFD_RELOC_ALPHA_GPDISP_HI16:
+      alpha_type = ALPHA_R_GPDISP;
+      break;
+    case BFD_RELOC_ALPHA_GPDISP_LO16:
+      alpha_type = ALPHA_R_IGNORE;
+      break;
+    case BFD_RELOC_23_PCREL_S2:
+      alpha_type = ALPHA_R_BRADDR;
+      break;
+    case BFD_RELOC_ALPHA_HINT:
+      alpha_type = ALPHA_R_HINT;
+      break;
+    case BFD_RELOC_16_PCREL:
+      alpha_type = ALPHA_R_SREL16;
+      break;
+    case BFD_RELOC_32_PCREL:
+      alpha_type = ALPHA_R_SREL32;
+      break;
+    case BFD_RELOC_64_PCREL:
+      alpha_type = ALPHA_R_SREL64;
+      break;
+    default:
+      return (reloc_howto_type *) NULL;
+    }
+
+  return &alpha_howto_table[alpha_type];
+}
+
+static reloc_howto_type *
+alpha_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			     const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (alpha_howto_table) / sizeof (alpha_howto_table[0]);
+       i++)
+    if (alpha_howto_table[i].name != NULL
+	&& strcasecmp (alpha_howto_table[i].name, r_name) == 0)
+      return &alpha_howto_table[i];
+
+  return NULL;
+}
+
+/* A helper routine for alpha_relocate_section which converts an
+   external reloc when generating relocatable output.  Returns the
+   relocation amount.  */
+
+static bfd_vma
+alpha_convert_external_reloc (output_bfd, info, input_bfd, ext_rel, h)
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     struct external_reloc *ext_rel;
+     struct ecoff_link_hash_entry *h;
+{
+  unsigned long r_symndx;
+  bfd_vma relocation;
+
+  BFD_ASSERT (info->relocatable);
+
+  if (h->root.type == bfd_link_hash_defined
+      || h->root.type == bfd_link_hash_defweak)
+    {
+      asection *hsec;
+      const char *name;
+
+      /* This symbol is defined in the output.  Convert the reloc from
+	 being against the symbol to being against the section.  */
+
+      /* Clear the r_extern bit.  */
+      ext_rel->r_bits[1] &=~ RELOC_BITS1_EXTERN_LITTLE;
+
+      /* Compute a new r_symndx value.  */
+      hsec = h->root.u.def.section;
+      name = bfd_get_section_name (output_bfd, hsec->output_section);
+
+      r_symndx = (unsigned long) -1;
+      switch (name[1])
+	{
+	case 'A':
+	  if (strcmp (name, "*ABS*") == 0)
+	    r_symndx = RELOC_SECTION_ABS;
+	  break;
+	case 'b':
+	  if (strcmp (name, ".bss") == 0)
+	    r_symndx = RELOC_SECTION_BSS;
+	  break;
+	case 'd':
+	  if (strcmp (name, ".data") == 0)
+	    r_symndx = RELOC_SECTION_DATA;
+	  break;
+	case 'f':
+	  if (strcmp (name, ".fini") == 0)
+	    r_symndx = RELOC_SECTION_FINI;
+	  break;
+	case 'i':
+	  if (strcmp (name, ".init") == 0)
+	    r_symndx = RELOC_SECTION_INIT;
+	  break;
+	case 'l':
+	  if (strcmp (name, ".lita") == 0)
+	    r_symndx = RELOC_SECTION_LITA;
+	  else if (strcmp (name, ".lit8") == 0)
+	    r_symndx = RELOC_SECTION_LIT8;
+	  else if (strcmp (name, ".lit4") == 0)
+	    r_symndx = RELOC_SECTION_LIT4;
+	  break;
+	case 'p':
+	  if (strcmp (name, ".pdata") == 0)
+	    r_symndx = RELOC_SECTION_PDATA;
+	  break;
+	case 'r':
+	  if (strcmp (name, ".rdata") == 0)
+	    r_symndx = RELOC_SECTION_RDATA;
+	  else if (strcmp (name, ".rconst") == 0)
+	    r_symndx = RELOC_SECTION_RCONST;
+	  break;
+	case 's':
+	  if (strcmp (name, ".sdata") == 0)
+	    r_symndx = RELOC_SECTION_SDATA;
+	  else if (strcmp (name, ".sbss") == 0)
+	    r_symndx = RELOC_SECTION_SBSS;
+	  break;
+	case 't':
+	  if (strcmp (name, ".text") == 0)
+	    r_symndx = RELOC_SECTION_TEXT;
+	  break;
+	case 'x':
+	  if (strcmp (name, ".xdata") == 0)
+	    r_symndx = RELOC_SECTION_XDATA;
+	  break;
+	}
+
+      if (r_symndx == (unsigned long) -1)
+	abort ();
+
+      /* Add the section VMA and the symbol value.  */
+      relocation = (h->root.u.def.value
+		    + hsec->output_section->vma
+		    + hsec->output_offset);
+    }
+  else
+    {
+      /* Change the symndx value to the right one for
+	 the output BFD.  */
+      r_symndx = h->indx;
+      if (r_symndx == (unsigned long) -1)
+	{
+	  /* Caller must give an error.  */
+	  r_symndx = 0;
+	}
+      relocation = 0;
+    }
+
+  /* Write out the new r_symndx value.  */
+  H_PUT_32 (input_bfd, r_symndx, ext_rel->r_symndx);
+
+  return relocation;
+}
+
+/* Relocate a section while linking an Alpha ECOFF file.  This is
+   quite similar to get_relocated_section_contents.  Perhaps they
+   could be combined somehow.  */
+
+static bfd_boolean
+alpha_relocate_section (output_bfd, info, input_bfd, input_section,
+			contents, external_relocs)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     PTR external_relocs;
+{
+  asection **symndx_to_section, *lita_sec;
+  struct ecoff_link_hash_entry **sym_hashes;
+  bfd_vma gp;
+  bfd_boolean gp_undefined;
+  bfd_vma stack[RELOC_STACKSIZE];
+  int tos = 0;
+  struct external_reloc *ext_rel;
+  struct external_reloc *ext_rel_end;
+  bfd_size_type amt;
+
+  /* We keep a table mapping the symndx found in an internal reloc to
+     the appropriate section.  This is faster than looking up the
+     section by name each time.  */
+  symndx_to_section = ecoff_data (input_bfd)->symndx_to_section;
+  if (symndx_to_section == (asection **) NULL)
+    {
+      amt = NUM_RELOC_SECTIONS * sizeof (asection *);
+      symndx_to_section = (asection **) bfd_alloc (input_bfd, amt);
+      if (!symndx_to_section)
+	return FALSE;
+
+      symndx_to_section[RELOC_SECTION_NONE] = NULL;
+      symndx_to_section[RELOC_SECTION_TEXT] =
+	bfd_get_section_by_name (input_bfd, ".text");
+      symndx_to_section[RELOC_SECTION_RDATA] =
+	bfd_get_section_by_name (input_bfd, ".rdata");
+      symndx_to_section[RELOC_SECTION_DATA] =
+	bfd_get_section_by_name (input_bfd, ".data");
+      symndx_to_section[RELOC_SECTION_SDATA] =
+	bfd_get_section_by_name (input_bfd, ".sdata");
+      symndx_to_section[RELOC_SECTION_SBSS] =
+	bfd_get_section_by_name (input_bfd, ".sbss");
+      symndx_to_section[RELOC_SECTION_BSS] =
+	bfd_get_section_by_name (input_bfd, ".bss");
+      symndx_to_section[RELOC_SECTION_INIT] =
+	bfd_get_section_by_name (input_bfd, ".init");
+      symndx_to_section[RELOC_SECTION_LIT8] =
+	bfd_get_section_by_name (input_bfd, ".lit8");
+      symndx_to_section[RELOC_SECTION_LIT4] =
+	bfd_get_section_by_name (input_bfd, ".lit4");
+      symndx_to_section[RELOC_SECTION_XDATA] =
+	bfd_get_section_by_name (input_bfd, ".xdata");
+      symndx_to_section[RELOC_SECTION_PDATA] =
+	bfd_get_section_by_name (input_bfd, ".pdata");
+      symndx_to_section[RELOC_SECTION_FINI] =
+	bfd_get_section_by_name (input_bfd, ".fini");
+      symndx_to_section[RELOC_SECTION_LITA] =
+	bfd_get_section_by_name (input_bfd, ".lita");
+      symndx_to_section[RELOC_SECTION_ABS] = bfd_abs_section_ptr;
+      symndx_to_section[RELOC_SECTION_RCONST] =
+	bfd_get_section_by_name (input_bfd, ".rconst");
+
+      ecoff_data (input_bfd)->symndx_to_section = symndx_to_section;
+    }
+
+  sym_hashes = ecoff_data (input_bfd)->sym_hashes;
+
+  /* On the Alpha, the .lita section must be addressable by the global
+     pointer.  To support large programs, we need to allow multiple
+     global pointers.  This works as long as each input .lita section
+     is <64KB big.  This implies that when producing relocatable
+     output, the .lita section is limited to 64KB. .  */
+
+  lita_sec = symndx_to_section[RELOC_SECTION_LITA];
+  gp = _bfd_get_gp_value (output_bfd);
+  if (! info->relocatable && lita_sec != NULL)
+    {
+      struct ecoff_section_tdata *lita_sec_data;
+
+      /* Make sure we have a section data structure to which we can
+	 hang on to the gp value we pick for the section.  */
+      lita_sec_data = ecoff_section_data (input_bfd, lita_sec);
+      if (lita_sec_data == NULL)
+	{
+	  amt = sizeof (struct ecoff_section_tdata);
+	  lita_sec_data = ((struct ecoff_section_tdata *)
+			   bfd_zalloc (input_bfd, amt));
+	  lita_sec->used_by_bfd = lita_sec_data;
+	}
+
+      if (lita_sec_data->gp != 0)
+	{
+	  /* If we already assigned a gp to this section, we better
+	     stick with that value.  */
+	  gp = lita_sec_data->gp;
+	}
+      else
+	{
+	  bfd_vma lita_vma;
+	  bfd_size_type lita_size;
+
+	  lita_vma = lita_sec->output_offset + lita_sec->output_section->vma;
+	  lita_size = lita_sec->size;
+
+	  if (gp == 0
+	      || lita_vma <  gp - 0x8000
+	      || lita_vma + lita_size >= gp + 0x8000)
+	    {
+	      /* Either gp hasn't been set at all or the current gp
+		 cannot address this .lita section.  In both cases we
+		 reset the gp to point into the "middle" of the
+		 current input .lita section.  */
+	      if (gp && !ecoff_data (output_bfd)->issued_multiple_gp_warning)
+		{
+		  (*info->callbacks->warning) (info,
+					       _("using multiple gp values"),
+					       (char *) NULL, output_bfd,
+					       (asection *) NULL, (bfd_vma) 0);
+		  ecoff_data (output_bfd)->issued_multiple_gp_warning = TRUE;
+		}
+	      if (lita_vma < gp - 0x8000)
+		gp = lita_vma + lita_size - 0x8000;
+	      else
+		gp = lita_vma + 0x8000;
+
+	    }
+
+	  lita_sec_data->gp = gp;
+	}
+
+      _bfd_set_gp_value (output_bfd, gp);
+    }
+
+  gp_undefined = (gp == 0);
+
+  BFD_ASSERT (bfd_header_little_endian (output_bfd));
+  BFD_ASSERT (bfd_header_little_endian (input_bfd));
+
+  ext_rel = (struct external_reloc *) external_relocs;
+  ext_rel_end = ext_rel + input_section->reloc_count;
+  for (; ext_rel < ext_rel_end; ext_rel++)
+    {
+      bfd_vma r_vaddr;
+      unsigned long r_symndx;
+      int r_type;
+      int r_extern;
+      int r_offset;
+      int r_size;
+      bfd_boolean relocatep;
+      bfd_boolean adjust_addrp;
+      bfd_boolean gp_usedp;
+      bfd_vma addend;
+
+      r_vaddr = H_GET_64 (input_bfd, ext_rel->r_vaddr);
+      r_symndx = H_GET_32 (input_bfd, ext_rel->r_symndx);
+
+      r_type = ((ext_rel->r_bits[0] & RELOC_BITS0_TYPE_LITTLE)
+		>> RELOC_BITS0_TYPE_SH_LITTLE);
+      r_extern = (ext_rel->r_bits[1] & RELOC_BITS1_EXTERN_LITTLE) != 0;
+      r_offset = ((ext_rel->r_bits[1] & RELOC_BITS1_OFFSET_LITTLE)
+		  >> RELOC_BITS1_OFFSET_SH_LITTLE);
+      /* Ignored the reserved bits.  */
+      r_size = ((ext_rel->r_bits[3] & RELOC_BITS3_SIZE_LITTLE)
+		>> RELOC_BITS3_SIZE_SH_LITTLE);
+
+      relocatep = FALSE;
+      adjust_addrp = TRUE;
+      gp_usedp = FALSE;
+      addend = 0;
+
+      switch (r_type)
+	{
+	case ALPHA_R_GPRELHIGH:
+	  (*_bfd_error_handler)
+	    (_("%B: unsupported relocation: ALPHA_R_GPRELHIGH"),
+	     input_bfd);
+	  bfd_set_error (bfd_error_bad_value);
+	  continue;
+	  
+	case ALPHA_R_GPRELLOW:
+	  (*_bfd_error_handler)
+	    (_("%B: unsupported relocation: ALPHA_R_GPRELLOW"),
+	     input_bfd);
+	  bfd_set_error (bfd_error_bad_value);
+	  continue;
+	  
+	default:
+	  (*_bfd_error_handler)
+	    (_("%B: unknown relocation type %d"),
+	     input_bfd, (int) r_type);
+	  bfd_set_error (bfd_error_bad_value);
+	  continue;
+
+	case ALPHA_R_IGNORE:
+	  /* This reloc appears after a GPDISP reloc.  On earlier
+	     versions of OSF/1, It marked the position of the second
+	     instruction to be altered by the GPDISP reloc, but it is
+	     not otherwise used for anything.  For some reason, the
+	     address of the relocation does not appear to include the
+	     section VMA, unlike the other relocation types.  */
+	  if (info->relocatable)
+	    H_PUT_64 (input_bfd, input_section->output_offset + r_vaddr,
+		      ext_rel->r_vaddr);
+	  adjust_addrp = FALSE;
+	  break;
+
+	case ALPHA_R_REFLONG:
+	case ALPHA_R_REFQUAD:
+	case ALPHA_R_HINT:
+	  relocatep = TRUE;
+	  break;
+
+	case ALPHA_R_BRADDR:
+	case ALPHA_R_SREL16:
+	case ALPHA_R_SREL32:
+	case ALPHA_R_SREL64:
+	  if (r_extern)
+	    addend += - (r_vaddr + 4);
+	  relocatep = TRUE;
+	  break;
+
+	case ALPHA_R_GPREL32:
+	  /* This relocation is used in a switch table.  It is a 32
+	     bit offset from the current GP value.  We must adjust it
+	     by the different between the original GP value and the
+	     current GP value.  */
+	  relocatep = TRUE;
+	  addend = ecoff_data (input_bfd)->gp - gp;
+	  gp_usedp = TRUE;
+	  break;
+
+	case ALPHA_R_LITERAL:
+	  /* This is a reference to a literal value, generally
+	     (always?) in the .lita section.  This is a 16 bit GP
+	     relative relocation.  Sometimes the subsequent reloc is a
+	     LITUSE reloc, which indicates how this reloc is used.
+	     This sometimes permits rewriting the two instructions
+	     referred to by the LITERAL and the LITUSE into different
+	     instructions which do not refer to .lita.  This can save
+	     a memory reference, and permits removing a value from
+	     .lita thus saving GP relative space.
+
+	     We do not these optimizations.  To do them we would need
+	     to arrange to link the .lita section first, so that by
+	     the time we got here we would know the final values to
+	     use.  This would not be particularly difficult, but it is
+	     not currently implemented.  */
+
+	  /* I believe that the LITERAL reloc will only apply to a ldq
+	     or ldl instruction, so check my assumption.  */
+	  {
+	    unsigned long insn;
+
+	    insn = bfd_get_32 (input_bfd,
+			       contents + r_vaddr - input_section->vma);
+	    BFD_ASSERT (((insn >> 26) & 0x3f) == 0x29
+			|| ((insn >> 26) & 0x3f) == 0x28);
+	  }
+
+	  relocatep = TRUE;
+	  addend = ecoff_data (input_bfd)->gp - gp;
+	  gp_usedp = TRUE;
+	  break;
+
+	case ALPHA_R_LITUSE:
+	  /* See ALPHA_R_LITERAL above for the uses of this reloc.  It
+	     does not cause anything to happen, itself.  */
+	  break;
+
+	case ALPHA_R_GPDISP:
+	  /* This marks the ldah of an ldah/lda pair which loads the
+	     gp register with the difference of the gp value and the
+	     current location.  The second of the pair is r_symndx
+	     bytes ahead.  It used to be marked with an ALPHA_R_IGNORE
+	     reloc, but OSF/1 3.2 no longer does that.  */
+	  {
+	    unsigned long insn1, insn2;
+
+	    /* Get the two instructions.  */
+	    insn1 = bfd_get_32 (input_bfd,
+				contents + r_vaddr - input_section->vma);
+	    insn2 = bfd_get_32 (input_bfd,
+				(contents
+				 + r_vaddr
+				 - input_section->vma
+				 + r_symndx));
+
+	    BFD_ASSERT (((insn1 >> 26) & 0x3f) == 0x09); /* ldah */
+	    BFD_ASSERT (((insn2 >> 26) & 0x3f) == 0x08); /* lda */
+
+	    /* Get the existing addend.  We must account for the sign
+	       extension done by lda and ldah.  */
+	    addend = ((insn1 & 0xffff) << 16) + (insn2 & 0xffff);
+	    if (insn1 & 0x8000)
+	      {
+		/* This is addend -= 0x100000000 without causing an
+		   integer overflow on a 32 bit host.  */
+		addend -= 0x80000000;
+		addend -= 0x80000000;
+	      }
+	    if (insn2 & 0x8000)
+	      addend -= 0x10000;
+
+	    /* The existing addend includes the difference between the
+	       gp of the input BFD and the address in the input BFD.
+	       We want to change this to the difference between the
+	       final GP and the final address.  */
+	    addend += (gp
+		       - ecoff_data (input_bfd)->gp
+		       + input_section->vma
+		       - (input_section->output_section->vma
+			  + input_section->output_offset));
+
+	    /* Change the instructions, accounting for the sign
+	       extension, and write them out.  */
+	    if (addend & 0x8000)
+	      addend += 0x10000;
+	    insn1 = (insn1 & 0xffff0000) | ((addend >> 16) & 0xffff);
+	    insn2 = (insn2 & 0xffff0000) | (addend & 0xffff);
+
+	    bfd_put_32 (input_bfd, (bfd_vma) insn1,
+			contents + r_vaddr - input_section->vma);
+	    bfd_put_32 (input_bfd, (bfd_vma) insn2,
+			contents + r_vaddr - input_section->vma + r_symndx);
+
+	    gp_usedp = TRUE;
+	  }
+	  break;
+
+	case ALPHA_R_OP_PUSH:
+	case ALPHA_R_OP_PSUB:
+	case ALPHA_R_OP_PRSHIFT:
+	  /* Manipulate values on the reloc evaluation stack.  The
+	     r_vaddr field is not an address in input_section, it is
+	     the current value (including any addend) of the object
+	     being used.  */
+	  if (! r_extern)
+	    {
+	      asection *s;
+
+	      s = symndx_to_section[r_symndx];
+	      if (s == (asection *) NULL)
+		abort ();
+	      addend = s->output_section->vma + s->output_offset - s->vma;
+	    }
+	  else
+	    {
+	      struct ecoff_link_hash_entry *h;
+
+	      h = sym_hashes[r_symndx];
+	      if (h == (struct ecoff_link_hash_entry *) NULL)
+		abort ();
+
+	      if (! info->relocatable)
+		{
+		  if (h->root.type == bfd_link_hash_defined
+		      || h->root.type == bfd_link_hash_defweak)
+		    addend = (h->root.u.def.value
+			      + h->root.u.def.section->output_section->vma
+			      + h->root.u.def.section->output_offset);
+		  else
+		    {
+		      /* Note that we pass the address as 0, since we
+			 do not have a meaningful number for the
+			 location within the section that is being
+			 relocated.  */
+		      if (! ((*info->callbacks->undefined_symbol)
+			     (info, h->root.root.string, input_bfd,
+			      input_section, (bfd_vma) 0, TRUE)))
+			return FALSE;
+		      addend = 0;
+		    }
+		}
+	      else
+		{
+		  if (h->root.type != bfd_link_hash_defined
+		      && h->root.type != bfd_link_hash_defweak
+		      && h->indx == -1)
+		    {
+		      /* This symbol is not being written out.  Pass
+			 the address as 0, as with undefined_symbol,
+			 above.  */
+		      if (! ((*info->callbacks->unattached_reloc)
+			     (info, h->root.root.string, input_bfd,
+			      input_section, (bfd_vma) 0)))
+			return FALSE;
+		    }
+
+		  addend = alpha_convert_external_reloc (output_bfd, info,
+							 input_bfd,
+							 ext_rel, h);
+		}
+	    }
+
+	  addend += r_vaddr;
+
+	  if (info->relocatable)
+	    {
+	      /* Adjust r_vaddr by the addend.  */
+	      H_PUT_64 (input_bfd, addend, ext_rel->r_vaddr);
+	    }
+	  else
+	    {
+	      switch (r_type)
+		{
+		case ALPHA_R_OP_PUSH:
+		  if (tos >= RELOC_STACKSIZE)
+		    abort ();
+		  stack[tos++] = addend;
+		  break;
+
+		case ALPHA_R_OP_PSUB:
+		  if (tos == 0)
+		    abort ();
+		  stack[tos - 1] -= addend;
+		  break;
+
+		case ALPHA_R_OP_PRSHIFT:
+		  if (tos == 0)
+		    abort ();
+		  stack[tos - 1] >>= addend;
+		  break;
+		}
+	    }
+
+	  adjust_addrp = FALSE;
+	  break;
+
+	case ALPHA_R_OP_STORE:
+	  /* Store a value from the reloc stack into a bitfield.  If
+	     we are generating relocatable output, all we do is
+	     adjust the address of the reloc.  */
+	  if (! info->relocatable)
+	    {
+	      bfd_vma mask;
+	      bfd_vma val;
+
+	      if (tos == 0)
+		abort ();
+
+	      /* Get the relocation mask.  The separate steps and the
+		 casts to bfd_vma are attempts to avoid a bug in the
+		 Alpha OSF 1.3 C compiler.  See reloc.c for more
+		 details.  */
+	      mask = 1;
+	      mask <<= (bfd_vma) r_size;
+	      mask -= 1;
+
+	      /* FIXME: I don't know what kind of overflow checking,
+		 if any, should be done here.  */
+	      val = bfd_get_64 (input_bfd,
+				contents + r_vaddr - input_section->vma);
+	      val &=~ mask << (bfd_vma) r_offset;
+	      val |= (stack[--tos] & mask) << (bfd_vma) r_offset;
+	      bfd_put_64 (input_bfd, val,
+			  contents + r_vaddr - input_section->vma);
+	    }
+	  break;
+
+	case ALPHA_R_GPVALUE:
+	  /* I really don't know if this does the right thing.  */
+	  gp = ecoff_data (input_bfd)->gp + r_symndx;
+	  gp_undefined = FALSE;
+	  break;
+	}
+
+      if (relocatep)
+	{
+	  reloc_howto_type *howto;
+	  struct ecoff_link_hash_entry *h = NULL;
+	  asection *s = NULL;
+	  bfd_vma relocation;
+	  bfd_reloc_status_type r;
+
+	  /* Perform a relocation.  */
+
+	  howto = &alpha_howto_table[r_type];
+
+	  if (r_extern)
+	    {
+	      h = sym_hashes[r_symndx];
+	      /* If h is NULL, that means that there is a reloc
+		 against an external symbol which we thought was just
+		 a debugging symbol.  This should not happen.  */
+	      if (h == (struct ecoff_link_hash_entry *) NULL)
+		abort ();
+	    }
+	  else
+	    {
+	      if (r_symndx >= NUM_RELOC_SECTIONS)
+		s = NULL;
+	      else
+		s = symndx_to_section[r_symndx];
+
+	      if (s == (asection *) NULL)
+		abort ();
+	    }
+
+	  if (info->relocatable)
+	    {
+	      /* We are generating relocatable output, and must
+		 convert the existing reloc.  */
+	      if (r_extern)
+		{
+		  if (h->root.type != bfd_link_hash_defined
+		      && h->root.type != bfd_link_hash_defweak
+		      && h->indx == -1)
+		    {
+		      /* This symbol is not being written out.  */
+		      if (! ((*info->callbacks->unattached_reloc)
+			     (info, h->root.root.string, input_bfd,
+			      input_section, r_vaddr - input_section->vma)))
+			return FALSE;
+		    }
+
+		  relocation = alpha_convert_external_reloc (output_bfd,
+							     info,
+							     input_bfd,
+							     ext_rel,
+							     h);
+		}
+	      else
+		{
+		  /* This is a relocation against a section.  Adjust
+		     the value by the amount the section moved.  */
+		  relocation = (s->output_section->vma
+				+ s->output_offset
+				- s->vma);
+		}
+
+	      /* If this is PC relative, the existing object file
+		 appears to already have the reloc worked out.  We
+		 must subtract out the old value and add in the new
+		 one.  */
+	      if (howto->pc_relative)
+		relocation -= (input_section->output_section->vma
+			       + input_section->output_offset
+			       - input_section->vma);
+
+	      /* Put in any addend.  */
+	      relocation += addend;
+
+	      /* Adjust the contents.  */
+	      r = _bfd_relocate_contents (howto, input_bfd, relocation,
+					  (contents
+					   + r_vaddr
+					   - input_section->vma));
+	    }
+	  else
+	    {
+	      /* We are producing a final executable.  */
+	      if (r_extern)
+		{
+		  /* This is a reloc against a symbol.  */
+		  if (h->root.type == bfd_link_hash_defined
+		      || h->root.type == bfd_link_hash_defweak)
+		    {
+		      asection *hsec;
+
+		      hsec = h->root.u.def.section;
+		      relocation = (h->root.u.def.value
+				    + hsec->output_section->vma
+				    + hsec->output_offset);
+		    }
+		  else
+		    {
+		      if (! ((*info->callbacks->undefined_symbol)
+			     (info, h->root.root.string, input_bfd,
+			      input_section,
+			      r_vaddr - input_section->vma, TRUE)))
+			return FALSE;
+		      relocation = 0;
+		    }
+		}
+	      else
+		{
+		  /* This is a reloc against a section.  */
+		  relocation = (s->output_section->vma
+				+ s->output_offset
+				- s->vma);
+
+		  /* Adjust a PC relative relocation by removing the
+		     reference to the original source section.  */
+		  if (howto->pc_relative)
+		    relocation += input_section->vma;
+		}
+
+	      r = _bfd_final_link_relocate (howto,
+					    input_bfd,
+					    input_section,
+					    contents,
+					    r_vaddr - input_section->vma,
+					    relocation,
+					    addend);
+	    }
+
+	  if (r != bfd_reloc_ok)
+	    {
+	      switch (r)
+		{
+		default:
+		case bfd_reloc_outofrange:
+		  abort ();
+		case bfd_reloc_overflow:
+		  {
+		    const char *name;
+
+		    if (r_extern)
+		      name = sym_hashes[r_symndx]->root.root.string;
+		    else
+		      name = bfd_section_name (input_bfd,
+					       symndx_to_section[r_symndx]);
+		    if (! ((*info->callbacks->reloc_overflow)
+			   (info, NULL, name,
+			    alpha_howto_table[r_type].name,
+			    (bfd_vma) 0, input_bfd, input_section,
+			    r_vaddr - input_section->vma)))
+		      return FALSE;
+		  }
+		  break;
+		}
+	    }
+	}
+
+      if (info->relocatable && adjust_addrp)
+	{
+	  /* Change the address of the relocation.  */
+	  H_PUT_64 (input_bfd,
+		    (input_section->output_section->vma
+		     + input_section->output_offset
+		     - input_section->vma
+		     + r_vaddr),
+		    ext_rel->r_vaddr);
+	}
+
+      if (gp_usedp && gp_undefined)
+	{
+	  if (! ((*info->callbacks->reloc_dangerous)
+		 (info, _("GP relative relocation used when GP not defined"),
+		  input_bfd, input_section, r_vaddr - input_section->vma)))
+	    return FALSE;
+	  /* Only give the error once per link.  */
+	  gp = 4;
+	  _bfd_set_gp_value (output_bfd, gp);
+	  gp_undefined = FALSE;
+	}
+    }
+
+  if (tos != 0)
+    abort ();
+
+  return TRUE;
+}
+
+/* Do final adjustments to the filehdr and the aouthdr.  This routine
+   sets the dynamic bits in the file header.  */
+
+static bfd_boolean
+alpha_adjust_headers (abfd, fhdr, ahdr)
+     bfd *abfd;
+     struct internal_filehdr *fhdr;
+     struct internal_aouthdr *ahdr ATTRIBUTE_UNUSED;
+{
+  if ((abfd->flags & (DYNAMIC | EXEC_P)) == (DYNAMIC | EXEC_P))
+    fhdr->f_flags |= F_ALPHA_CALL_SHARED;
+  else if ((abfd->flags & DYNAMIC) != 0)
+    fhdr->f_flags |= F_ALPHA_SHARABLE;
+  return TRUE;
+}
+
+/* Archive handling.  In OSF/1 (or Digital Unix) v3.2, Digital
+   introduced archive packing, in which the elements in an archive are
+   optionally compressed using a simple dictionary scheme.  We know
+   how to read such archives, but we don't write them.  */
+
+#define alpha_ecoff_slurp_armap _bfd_ecoff_slurp_armap
+#define alpha_ecoff_slurp_extended_name_table \
+  _bfd_ecoff_slurp_extended_name_table
+#define alpha_ecoff_construct_extended_name_table \
+  _bfd_ecoff_construct_extended_name_table
+#define alpha_ecoff_truncate_arname _bfd_ecoff_truncate_arname
+#define alpha_ecoff_write_armap _bfd_ecoff_write_armap
+#define alpha_ecoff_write_ar_hdr _bfd_generic_write_ar_hdr
+#define alpha_ecoff_generic_stat_arch_elt _bfd_ecoff_generic_stat_arch_elt
+#define alpha_ecoff_update_armap_timestamp _bfd_ecoff_update_armap_timestamp
+
+/* A compressed file uses this instead of ARFMAG.  */
+
+#define ARFZMAG "Z\012"
+
+/* Read an archive header.  This is like the standard routine, but it
+   also accepts ARFZMAG.  */
+
+static PTR
+alpha_ecoff_read_ar_hdr (abfd)
+     bfd *abfd;
+{
+  struct areltdata *ret;
+  struct ar_hdr *h;
+
+  ret = (struct areltdata *) _bfd_generic_read_ar_hdr_mag (abfd, ARFZMAG);
+  if (ret == NULL)
+    return NULL;
+
+  h = (struct ar_hdr *) ret->arch_header;
+  if (strncmp (h->ar_fmag, ARFZMAG, 2) == 0)
+    {
+      bfd_byte ab[8];
+
+      /* This is a compressed file.  We must set the size correctly.
+         The size is the eight bytes after the dummy file header.  */
+      if (bfd_seek (abfd, (file_ptr) FILHSZ, SEEK_CUR) != 0
+	  || bfd_bread (ab, (bfd_size_type) 8, abfd) != 8
+	  || bfd_seek (abfd, (file_ptr) (- (FILHSZ + 8)), SEEK_CUR) != 0)
+	return NULL;
+
+      ret->parsed_size = H_GET_64 (abfd, ab);
+    }
+
+  return (PTR) ret;
+}
+
+/* Get an archive element at a specified file position.  This is where
+   we uncompress the archive element if necessary.  */
+
+static bfd *
+alpha_ecoff_get_elt_at_filepos (archive, filepos)
+     bfd *archive;
+     file_ptr filepos;
+{
+  bfd *nbfd = NULL;
+  struct areltdata *tdata;
+  struct ar_hdr *hdr;
+  bfd_byte ab[8];
+  bfd_size_type size;
+  bfd_byte *buf, *p;
+  struct bfd_in_memory *bim;
+
+  buf = NULL;
+  nbfd = _bfd_get_elt_at_filepos (archive, filepos);
+  if (nbfd == NULL)
+    goto error_return;
+
+  if ((nbfd->flags & BFD_IN_MEMORY) != 0)
+    {
+      /* We have already expanded this BFD.  */
+      return nbfd;
+    }
+
+  tdata = (struct areltdata *) nbfd->arelt_data;
+  hdr = (struct ar_hdr *) tdata->arch_header;
+  if (strncmp (hdr->ar_fmag, ARFZMAG, 2) != 0)
+    return nbfd;
+
+  /* We must uncompress this element.  We do this by copying it into a
+     memory buffer, and making bfd_bread and bfd_seek use that buffer.
+     This can use a lot of memory, but it's simpler than getting a
+     temporary file, making that work with the file descriptor caching
+     code, and making sure that it is deleted at all appropriate
+     times.  It can be changed if it ever becomes important.  */
+
+  /* The compressed file starts with a dummy ECOFF file header.  */
+  if (bfd_seek (nbfd, (file_ptr) FILHSZ, SEEK_SET) != 0)
+    goto error_return;
+
+  /* The next eight bytes are the real file size.  */
+  if (bfd_bread (ab, (bfd_size_type) 8, nbfd) != 8)
+    goto error_return;
+  size = H_GET_64 (nbfd, ab);
+
+  if (size != 0)
+    {
+      bfd_size_type left;
+      bfd_byte dict[4096];
+      unsigned int h;
+      bfd_byte b;
+
+      buf = (bfd_byte *) bfd_malloc (size);
+      if (buf == NULL)
+	goto error_return;
+      p = buf;
+
+      left = size;
+
+      /* I don't know what the next eight bytes are for.  */
+      if (bfd_bread (ab, (bfd_size_type) 8, nbfd) != 8)
+	goto error_return;
+
+      /* This is the uncompression algorithm.  It's a simple
+	 dictionary based scheme in which each character is predicted
+	 by a hash of the previous three characters.  A control byte
+	 indicates whether the character is predicted or whether it
+	 appears in the input stream; each control byte manages the
+	 next eight bytes in the output stream.  */
+      memset (dict, 0, sizeof dict);
+      h = 0;
+      while (bfd_bread (&b, (bfd_size_type) 1, nbfd) == 1)
+	{
+	  unsigned int i;
+
+	  for (i = 0; i < 8; i++, b >>= 1)
+	    {
+	      bfd_byte n;
+
+	      if ((b & 1) == 0)
+		n = dict[h];
+	      else
+		{
+		  if (! bfd_bread (&n, (bfd_size_type) 1, nbfd))
+		    goto error_return;
+		  dict[h] = n;
+		}
+
+	      *p++ = n;
+
+	      --left;
+	      if (left == 0)
+		break;
+
+	      h <<= 4;
+	      h ^= n;
+	      h &= sizeof dict - 1;
+	    }
+
+	  if (left == 0)
+	    break;
+	}
+    }
+
+  /* Now the uncompressed file contents are in buf.  */
+  bim = ((struct bfd_in_memory *)
+	 bfd_malloc ((bfd_size_type) sizeof (struct bfd_in_memory)));
+  if (bim == NULL)
+    goto error_return;
+  bim->size = size;
+  bim->buffer = buf;
+
+  nbfd->mtime_set = TRUE;
+  nbfd->mtime = strtol (hdr->ar_date, (char **) NULL, 10);
+
+  nbfd->flags |= BFD_IN_MEMORY;
+  nbfd->iostream = (PTR) bim;
+  nbfd->iovec = &_bfd_memory_iovec;
+  nbfd->origin = 0;
+  BFD_ASSERT (! nbfd->cacheable);
+
+  return nbfd;
+
+ error_return:
+  if (buf != NULL)
+    free (buf);
+  if (nbfd != NULL)
+    bfd_close (nbfd);
+  return NULL;
+}
+
+/* Open the next archived file.  */
+
+static bfd *
+alpha_ecoff_openr_next_archived_file (archive, last_file)
+     bfd *archive;
+     bfd *last_file;
+{
+  file_ptr filestart;
+
+  if (last_file == NULL)
+    filestart = bfd_ardata (archive)->first_file_filepos;
+  else
+    {
+      struct areltdata *t;
+      struct ar_hdr *h;
+      bfd_size_type size;
+
+      /* We can't use arelt_size here, because that uses parsed_size,
+         which is the uncompressed size.  We need the compressed size.  */
+      t = (struct areltdata *) last_file->arelt_data;
+      h = (struct ar_hdr *) t->arch_header;
+      size = strtol (h->ar_size, (char **) NULL, 10);
+
+      /* Pad to an even boundary...
+	 Note that last_file->origin can be odd in the case of
+	 BSD-4.4-style element with a long odd size.  */
+      filestart = last_file->proxy_origin + size;
+      filestart += filestart % 2;
+    }
+
+  return alpha_ecoff_get_elt_at_filepos (archive, filestart);
+}
+
+/* Open the archive file given an index into the armap.  */
+
+static bfd *
+alpha_ecoff_get_elt_at_index (bfd *abfd, symindex sym_index)
+{
+  carsym *entry;
+
+  entry = bfd_ardata (abfd)->symdefs + sym_index;
+  return alpha_ecoff_get_elt_at_filepos (abfd, entry->file_offset);
+}
+
+/* This is the ECOFF backend structure.  The backend field of the
+   target vector points to this.  */
+
+static const struct ecoff_backend_data alpha_ecoff_backend_data =
+{
+  /* COFF backend structure.  */
+  {
+    (void (*) PARAMS ((bfd *,PTR,int,int,int,int,PTR))) bfd_void, /* aux_in */
+    (void (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* sym_in */
+    (void (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* lineno_in */
+    (unsigned (*) PARAMS ((bfd *,PTR,int,int,int,int,PTR)))bfd_void,/*aux_out*/
+    (unsigned (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* sym_out */
+    (unsigned (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* lineno_out */
+    (unsigned (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* reloc_out */
+    alpha_ecoff_swap_filehdr_out, alpha_ecoff_swap_aouthdr_out,
+    alpha_ecoff_swap_scnhdr_out,
+    FILHSZ, AOUTSZ, SCNHSZ, 0, 0, 0, 0, FILNMLEN, TRUE, 
+    ECOFF_NO_LONG_SECTION_NAMES, 4, FALSE, 2,
+    alpha_ecoff_swap_filehdr_in, alpha_ecoff_swap_aouthdr_in,
+    alpha_ecoff_swap_scnhdr_in, NULL,
+    alpha_ecoff_bad_format_hook, _bfd_ecoff_set_arch_mach_hook,
+    alpha_ecoff_mkobject_hook, _bfd_ecoff_styp_to_sec_flags,
+    _bfd_ecoff_set_alignment_hook, _bfd_ecoff_slurp_symbol_table,
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+    NULL, NULL, NULL, NULL
+  },
+  /* Supported architecture.  */
+  bfd_arch_alpha,
+  /* Initial portion of armap string.  */
+  "________64",
+  /* The page boundary used to align sections in a demand-paged
+     executable file.  E.g., 0x1000.  */
+  0x2000,
+  /* TRUE if the .rdata section is part of the text segment, as on the
+     Alpha.  FALSE if .rdata is part of the data segment, as on the
+     MIPS.  */
+  TRUE,
+  /* Bitsize of constructor entries.  */
+  64,
+  /* Reloc to use for constructor entries.  */
+  &alpha_howto_table[ALPHA_R_REFQUAD],
+  {
+    /* Symbol table magic number.  */
+    magicSym2,
+    /* Alignment of debugging information.  E.g., 4.  */
+    8,
+    /* Sizes of external symbolic information.  */
+    sizeof (struct hdr_ext),
+    sizeof (struct dnr_ext),
+    sizeof (struct pdr_ext),
+    sizeof (struct sym_ext),
+    sizeof (struct opt_ext),
+    sizeof (struct fdr_ext),
+    sizeof (struct rfd_ext),
+    sizeof (struct ext_ext),
+    /* Functions to swap in external symbolic data.  */
+    ecoff_swap_hdr_in,
+    ecoff_swap_dnr_in,
+    ecoff_swap_pdr_in,
+    ecoff_swap_sym_in,
+    ecoff_swap_opt_in,
+    ecoff_swap_fdr_in,
+    ecoff_swap_rfd_in,
+    ecoff_swap_ext_in,
+    _bfd_ecoff_swap_tir_in,
+    _bfd_ecoff_swap_rndx_in,
+    /* Functions to swap out external symbolic data.  */
+    ecoff_swap_hdr_out,
+    ecoff_swap_dnr_out,
+    ecoff_swap_pdr_out,
+    ecoff_swap_sym_out,
+    ecoff_swap_opt_out,
+    ecoff_swap_fdr_out,
+    ecoff_swap_rfd_out,
+    ecoff_swap_ext_out,
+    _bfd_ecoff_swap_tir_out,
+    _bfd_ecoff_swap_rndx_out,
+    /* Function to read in symbolic data.  */
+    _bfd_ecoff_slurp_symbolic_info
+  },
+  /* External reloc size.  */
+  RELSZ,
+  /* Reloc swapping functions.  */
+  alpha_ecoff_swap_reloc_in,
+  alpha_ecoff_swap_reloc_out,
+  /* Backend reloc tweaking.  */
+  alpha_adjust_reloc_in,
+  alpha_adjust_reloc_out,
+  /* Relocate section contents while linking.  */
+  alpha_relocate_section,
+  /* Do final adjustments to filehdr and aouthdr.  */
+  alpha_adjust_headers,
+  /* Read an element from an archive at a given file position.  */
+  alpha_ecoff_get_elt_at_filepos
+};
+
+/* Looking up a reloc type is Alpha specific.  */
+#define _bfd_ecoff_bfd_reloc_type_lookup alpha_bfd_reloc_type_lookup
+#define _bfd_ecoff_bfd_reloc_name_lookup \
+  alpha_bfd_reloc_name_lookup
+
+/* So is getting relocated section contents.  */
+#define _bfd_ecoff_bfd_get_relocated_section_contents \
+  alpha_ecoff_get_relocated_section_contents
+
+/* Handling file windows is generic.  */
+#define _bfd_ecoff_get_section_contents_in_window \
+  _bfd_generic_get_section_contents_in_window
+
+/* Input section flag lookup is generic.  */
+#define _bfd_ecoff_bfd_lookup_section_flags bfd_generic_lookup_section_flags
+
+/* Relaxing sections is generic.  */
+#define _bfd_ecoff_bfd_relax_section bfd_generic_relax_section
+#define _bfd_ecoff_bfd_gc_sections bfd_generic_gc_sections
+#define _bfd_ecoff_bfd_merge_sections bfd_generic_merge_sections
+#define _bfd_ecoff_bfd_is_group_section bfd_generic_is_group_section
+#define _bfd_ecoff_bfd_discard_group bfd_generic_discard_group
+#define _bfd_ecoff_section_already_linked \
+  _bfd_coff_section_already_linked
+#define _bfd_ecoff_bfd_define_common_symbol bfd_generic_define_common_symbol
+
+const bfd_target ecoffalpha_little_vec =
+{
+  "ecoff-littlealpha",		/* name */
+  bfd_target_ecoff_flavour,
+  BFD_ENDIAN_LITTLE,		/* data byte order is little */
+  BFD_ENDIAN_LITTLE,		/* header byte order is little */
+
+  (HAS_RELOC | EXEC_P |		/* object flags */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED),
+
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
+  0,				/* leading underscore */
+  ' ',				/* ar_pad_char */
+  15,				/* ar_max_namelen */
+  0,				/* match priority.  */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
+
+  {_bfd_dummy_target, alpha_ecoff_object_p, /* bfd_check_format */
+     bfd_generic_archive_p, _bfd_dummy_target},
+  {bfd_false, _bfd_ecoff_mkobject,  /* bfd_set_format */
+     _bfd_generic_mkarchive, bfd_false},
+  {bfd_false, _bfd_ecoff_write_object_contents, /* bfd_write_contents */
+     _bfd_write_archive_contents, bfd_false},
+
+     BFD_JUMP_TABLE_GENERIC (_bfd_ecoff),
+     BFD_JUMP_TABLE_COPY (_bfd_ecoff),
+     BFD_JUMP_TABLE_CORE (_bfd_nocore),
+     BFD_JUMP_TABLE_ARCHIVE (alpha_ecoff),
+     BFD_JUMP_TABLE_SYMBOLS (_bfd_ecoff),
+     BFD_JUMP_TABLE_RELOCS (_bfd_ecoff),
+     BFD_JUMP_TABLE_WRITE (_bfd_ecoff),
+     BFD_JUMP_TABLE_LINK (_bfd_ecoff),
+     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  (PTR) &alpha_ecoff_backend_data
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-apollo.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-apollo.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-apollo.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-apollo.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,124 @@
+/* BFD back-end for Apollo 68000 COFF binaries.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1999, 2000, 2001, 2002, 2003,
+   2005, 2007, 2008  Free Software Foundation, Inc.
+   By Troy Rollo (troy@cbme.unsw.edu.au)
+   Based on m68k standard COFF version Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "coff/apollo.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
+
+#ifdef ONLY_DECLARE_RELOCS
+extern reloc_howto_type apollocoff_howto_table[];
+#else
+reloc_howto_type apollocoff_howto_table[] =
+  {
+    HOWTO (R_RELBYTE,	       0,  0,  	8,  FALSE, 0, complain_overflow_bitfield, 0, "8",	TRUE, 0x000000ff,0x000000ff, FALSE),
+    HOWTO (R_RELWORD,	       0,  1, 	16, FALSE, 0, complain_overflow_bitfield, 0, "16",	TRUE, 0x0000ffff,0x0000ffff, FALSE),
+    HOWTO (R_RELLONG,	       0,  2, 	32, FALSE, 0, complain_overflow_bitfield, 0, "32",	TRUE, 0xffffffff,0xffffffff, FALSE),
+    HOWTO (R_PCRBYTE,	       0,  0, 	8,  TRUE,  0, complain_overflow_signed,   0, "DISP8",   TRUE, 0x000000ff,0x000000ff, FALSE),
+    HOWTO (R_PCRWORD,	       0,  1, 	16, TRUE,  0, complain_overflow_signed,   0, "DISP16",  TRUE, 0x0000ffff,0x0000ffff, FALSE),
+    HOWTO (R_PCRLONG,	       0,  2, 	32, TRUE,  0, complain_overflow_signed,   0, "DISP32",  TRUE, 0xffffffff,0xffffffff, FALSE),
+    HOWTO (R_RELLONG_NEG,      0,  -2, 	32, FALSE, 0, complain_overflow_bitfield, 0, "-32",	TRUE, 0xffffffff,0xffffffff, FALSE),
+  };
+#endif /* not ONLY_DECLARE_RELOCS */
+
+#ifndef BADMAG
+#define BADMAG(x) M68KBADMAG(x)
+#endif
+#define APOLLO_M68 1		/* Customize coffcode.h */
+
+/* Turn a howto into a reloc number.  */
+
+extern void apollo_rtype2howto PARAMS ((arelent *, int));
+extern int  apollo_howto2rtype PARAMS ((reloc_howto_type *));
+#ifndef ONLY_DECLARE_RELOCS
+
+void
+apollo_rtype2howto (internal, relocentry)
+     arelent *internal;
+     int relocentry;
+{
+  switch (relocentry)
+    {
+    case R_RELBYTE:	internal->howto = apollocoff_howto_table + 0; break;
+    case R_RELWORD:	internal->howto = apollocoff_howto_table + 1; break;
+    case R_RELLONG:	internal->howto = apollocoff_howto_table + 2; break;
+    case R_PCRBYTE:	internal->howto = apollocoff_howto_table + 3; break;
+    case R_PCRWORD:	internal->howto = apollocoff_howto_table + 4; break;
+    case R_PCRLONG:	internal->howto = apollocoff_howto_table + 5; break;
+    case R_RELLONG_NEG:	internal->howto = apollocoff_howto_table + 6; break;
+    }
+}
+
+int
+apollo_howto2rtype (internal)
+     reloc_howto_type *internal;
+{
+  if (internal->pc_relative)
+    {
+      switch (internal->bitsize)
+	{
+	case 32: return R_PCRLONG;
+	case 16: return R_PCRWORD;
+	case 8: return R_PCRBYTE;
+	}
+    }
+  else
+    {
+      switch (internal->bitsize)
+	{
+	case 32: return R_RELLONG;
+	case 16: return R_RELWORD;
+	case 8: return R_RELBYTE;
+	}
+    }
+  return R_RELLONG;
+}
+#endif /* not ONLY_DECLARE_RELOCS */
+
+#define RTYPE2HOWTO(internal, relocentry) \
+  apollo_rtype2howto (internal, (relocentry)->r_type)
+
+#define SELECT_RELOC(external, internal) \
+  external.r_type = apollo_howto2rtype (internal);
+
+#define bfd_pe_print_pdata	NULL
+
+#include "coffcode.h"
+
+#ifndef TARGET_SYM
+#define TARGET_SYM apollocoff_vec
+#endif
+
+#ifndef TARGET_NAME
+#define TARGET_NAME "apollo-m68k"
+#endif
+
+#ifdef NAMES_HAVE_UNDERSCORE
+CREATE_BIG_COFF_TARGET_VEC (TARGET_SYM, TARGET_NAME, 0, 0, '_', NULL, COFF_SWAP_TABLE)
+#else
+CREATE_BIG_COFF_TARGET_VEC (TARGET_SYM, TARGET_NAME, 0, 0, 0, NULL, COFF_SWAP_TABLE)
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-arm.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-arm.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-arm.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-arm.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2566 @@
+/* BFD back-end for ARM COFF files.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "coff/arm.h"
+#include "coff/internal.h"
+
+#ifdef COFF_WITH_PE
+#include "coff/pe.h"
+#endif
+
+#include "libcoff.h"
+
+/* Macros for manipulation the bits in the flags field of the coff data
+   structure.  */
+#define APCS_26_FLAG(abfd) \
+  (coff_data (abfd)->flags & F_APCS_26)
+
+#define APCS_FLOAT_FLAG(abfd) \
+  (coff_data (abfd)->flags & F_APCS_FLOAT)
+
+#define PIC_FLAG(abfd) \
+  (coff_data (abfd)->flags & F_PIC)
+
+#define APCS_SET(abfd) \
+  (coff_data (abfd)->flags & F_APCS_SET)
+
+#define SET_APCS_FLAGS(abfd, flgs) \
+  do									\
+    {									\
+      coff_data (abfd)->flags &= ~(F_APCS_26 | F_APCS_FLOAT | F_PIC);	\
+      coff_data (abfd)->flags |= (flgs) | F_APCS_SET;			\
+    }									\
+  while (0)
+
+#define INTERWORK_FLAG(abfd) \
+  (coff_data (abfd)->flags & F_INTERWORK)
+
+#define INTERWORK_SET(abfd) \
+  (coff_data (abfd)->flags & F_INTERWORK_SET)
+
+#define SET_INTERWORK_FLAG(abfd, flg) \
+  do									\
+    {									\
+      coff_data (abfd)->flags &= ~F_INTERWORK;				\
+      coff_data (abfd)->flags |= (flg) | F_INTERWORK_SET;		\
+    }									\
+  while (0)
+
+#ifndef NUM_ELEM
+#define NUM_ELEM(a) ((sizeof (a)) / sizeof ((a)[0]))
+#endif
+
+typedef enum {bunknown, b9, b12, b23} thumb_pcrel_branchtype;
+/* Some typedefs for holding instructions.  */
+typedef unsigned long int insn32;
+typedef unsigned short int insn16;
+
+/* The linker script knows the section names for placement.
+   The entry_names are used to do simple name mangling on the stubs.
+   Given a function name, and its type, the stub can be found. The
+   name can be changed. The only requirement is the %s be present.  */
+
+#define THUMB2ARM_GLUE_SECTION_NAME ".glue_7t"
+#define THUMB2ARM_GLUE_ENTRY_NAME   "__%s_from_thumb"
+
+#define ARM2THUMB_GLUE_SECTION_NAME ".glue_7"
+#define ARM2THUMB_GLUE_ENTRY_NAME   "__%s_from_arm"
+
+/* Used by the assembler.  */
+
+static bfd_reloc_status_type
+coff_arm_reloc (bfd *abfd,
+		arelent *reloc_entry,
+		asymbol *symbol ATTRIBUTE_UNUSED,
+		void * data,
+		asection *input_section ATTRIBUTE_UNUSED,
+		bfd *output_bfd,
+		char **error_message ATTRIBUTE_UNUSED)
+{
+  symvalue diff;
+
+  if (output_bfd == NULL)
+    return bfd_reloc_continue;
+
+  diff = reloc_entry->addend;
+
+#define DOIT(x)							\
+  x = ((x & ~howto->dst_mask)					\
+       | (((x & howto->src_mask) + diff) & howto->dst_mask))
+
+    if (diff != 0)
+      {
+	reloc_howto_type *howto = reloc_entry->howto;
+	unsigned char *addr = (unsigned char *) data + reloc_entry->address;
+
+	switch (howto->size)
+	  {
+	  case 0:
+	    {
+	      char x = bfd_get_8 (abfd, addr);
+	      DOIT (x);
+	      bfd_put_8 (abfd, x, addr);
+	    }
+	    break;
+
+	  case 1:
+	    {
+	      short x = bfd_get_16 (abfd, addr);
+	      DOIT (x);
+	      bfd_put_16 (abfd, (bfd_vma) x, addr);
+	    }
+	    break;
+
+	  case 2:
+	    {
+	      long x = bfd_get_32 (abfd, addr);
+	      DOIT (x);
+	      bfd_put_32 (abfd, (bfd_vma) x, addr);
+	    }
+	    break;
+
+	  default:
+	    abort ();
+	  }
+      }
+
+  /* Now let bfd_perform_relocation finish everything up.  */
+  return bfd_reloc_continue;
+}
+
+/* If USER_LABEL_PREFIX is defined as "_" (see coff_arm_is_local_label_name()
+   in this file), then TARGET_UNDERSCORE should be defined, otherwise it
+   should not.  */
+#ifndef TARGET_UNDERSCORE
+#define TARGET_UNDERSCORE '_'
+#endif
+
+#ifndef PCRELOFFSET
+#define PCRELOFFSET TRUE
+#endif
+
+/* These most certainly belong somewhere else. Just had to get rid of
+   the manifest constants in the code.  */
+
+#ifdef ARM_WINCE
+
+#define ARM_26D      0
+#define ARM_32       1
+#define ARM_RVA32    2
+#define ARM_26	     3
+#define ARM_THUMB12  4
+#define ARM_SECTION  14
+#define ARM_SECREL   15
+
+#else
+
+#define ARM_8        0
+#define ARM_16       1
+#define ARM_32       2
+#define ARM_26       3
+#define ARM_DISP8    4
+#define ARM_DISP16   5
+#define ARM_DISP32   6
+#define ARM_26D      7
+/* 8 is unused.  */
+#define ARM_NEG16    9
+#define ARM_NEG32   10
+#define ARM_RVA32   11
+#define ARM_THUMB9  12
+#define ARM_THUMB12 13
+#define ARM_THUMB23 14
+
+#endif
+
+static bfd_reloc_status_type aoutarm_fix_pcrel_26_done
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type aoutarm_fix_pcrel_26
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type coff_thumb_pcrel_12
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+#ifndef ARM_WINCE
+static bfd_reloc_status_type coff_thumb_pcrel_9
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type coff_thumb_pcrel_23
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+#endif
+
+static reloc_howto_type aoutarm_std_reloc_howto[] =
+  {
+#ifdef ARM_WINCE
+    HOWTO (ARM_26D,
+	   2,
+	   2,
+	   24,
+	   TRUE,
+	   0,
+	   complain_overflow_dont,
+	   aoutarm_fix_pcrel_26_done,
+	   "ARM_26D",
+	   TRUE, 	/* partial_inplace.  */
+	   0x00ffffff,
+	   0x0,
+	   PCRELOFFSET),
+    HOWTO (ARM_32,
+	   0,
+	   2,
+	   32,
+	   FALSE,
+	   0,
+	   complain_overflow_bitfield,
+	   coff_arm_reloc,
+	   "ARM_32",
+	   TRUE, 	/* partial_inplace.  */
+	   0xffffffff,
+	   0xffffffff,
+	   PCRELOFFSET),
+    HOWTO (ARM_RVA32,
+	   0,
+	   2,
+	   32,
+	   FALSE,
+	   0,
+	   complain_overflow_bitfield,
+	   coff_arm_reloc,
+	   "ARM_RVA32",
+	   TRUE, 	/* partial_inplace.  */
+	   0xffffffff,
+	   0xffffffff,
+	   PCRELOFFSET),
+    HOWTO (ARM_26,
+	   2,
+	   2,
+	   24,
+	   TRUE,
+	   0,
+	   complain_overflow_signed,
+	   aoutarm_fix_pcrel_26 ,
+	   "ARM_26",
+	   FALSE,
+	   0x00ffffff,
+	   0x00ffffff,
+	   PCRELOFFSET),
+    HOWTO (ARM_THUMB12,
+	   1,
+	   1,
+	   11,
+	   TRUE,
+	   0,
+	   complain_overflow_signed,
+	   coff_thumb_pcrel_12 ,
+	   "ARM_THUMB12",
+	   FALSE,
+	   0x000007ff,
+	   0x000007ff,
+	   PCRELOFFSET),
+    EMPTY_HOWTO (-1),
+    EMPTY_HOWTO (-1),
+    EMPTY_HOWTO (-1),
+    EMPTY_HOWTO (-1),
+    EMPTY_HOWTO (-1),
+    EMPTY_HOWTO (-1),
+    EMPTY_HOWTO (-1),
+    EMPTY_HOWTO (-1),
+    EMPTY_HOWTO (-1),
+    HOWTO (ARM_SECTION,
+	   0,
+	   1,
+	   16,
+	   FALSE,
+	   0,
+	   complain_overflow_bitfield,
+	   coff_arm_reloc,
+	   "ARM_SECTION",
+	   TRUE, 	/* partial_inplace.  */
+	   0x0000ffff,
+	   0x0000ffff,
+	   PCRELOFFSET),
+    HOWTO (ARM_SECREL,
+	   0,
+	   2,
+	   32,
+	   FALSE,
+	   0,
+	   complain_overflow_bitfield,
+	   coff_arm_reloc,
+	   "ARM_SECREL",
+	   TRUE, 	/* partial_inplace.  */
+	   0xffffffff,
+	   0xffffffff,
+	   PCRELOFFSET),
+#else /* not ARM_WINCE */
+    HOWTO (ARM_8,
+	   0,
+	   0,
+	   8,
+	   FALSE,
+	   0,
+	   complain_overflow_bitfield,
+	   coff_arm_reloc,
+	   "ARM_8",
+	   TRUE,
+	   0x000000ff,
+	   0x000000ff,
+	   PCRELOFFSET),
+    HOWTO (ARM_16,
+	   0,
+	   1,
+	   16,
+	   FALSE,
+	   0,
+	   complain_overflow_bitfield,
+	   coff_arm_reloc,
+	   "ARM_16",
+	   TRUE,
+	   0x0000ffff,
+	   0x0000ffff,
+	   PCRELOFFSET),
+    HOWTO (ARM_32,
+	   0,
+	   2,
+	   32,
+	   FALSE,
+	   0,
+	   complain_overflow_bitfield,
+	   coff_arm_reloc,
+	   "ARM_32",
+	   TRUE,
+	   0xffffffff,
+	   0xffffffff,
+	   PCRELOFFSET),
+    HOWTO (ARM_26,
+	   2,
+	   2,
+	   24,
+	   TRUE,
+	   0,
+	   complain_overflow_signed,
+	   aoutarm_fix_pcrel_26 ,
+	   "ARM_26",
+	   FALSE,
+	   0x00ffffff,
+	   0x00ffffff,
+	   PCRELOFFSET),
+    HOWTO (ARM_DISP8,
+	   0,
+	   0,
+	   8,
+	   TRUE,
+	   0,
+	   complain_overflow_signed,
+	   coff_arm_reloc,
+	   "ARM_DISP8",
+	   TRUE,
+	   0x000000ff,
+	   0x000000ff,
+	   TRUE),
+    HOWTO (ARM_DISP16,
+	   0,
+	   1,
+	   16,
+	   TRUE,
+	   0,
+	   complain_overflow_signed,
+	   coff_arm_reloc,
+	   "ARM_DISP16",
+	   TRUE,
+	   0x0000ffff,
+	   0x0000ffff,
+	   TRUE),
+    HOWTO (ARM_DISP32,
+	   0,
+	   2,
+	   32,
+	   TRUE,
+	   0,
+	   complain_overflow_signed,
+	   coff_arm_reloc,
+	   "ARM_DISP32",
+	   TRUE,
+	   0xffffffff,
+	   0xffffffff,
+	   TRUE),
+    HOWTO (ARM_26D,
+	   2,
+	   2,
+	   24,
+	   FALSE,
+	   0,
+	   complain_overflow_dont,
+	   aoutarm_fix_pcrel_26_done,
+	   "ARM_26D",
+	   TRUE,
+	   0x00ffffff,
+	   0x0,
+	   FALSE),
+    /* 8 is unused */
+    EMPTY_HOWTO (-1),
+    HOWTO (ARM_NEG16,
+	   0,
+	   -1,
+	   16,
+	   FALSE,
+	   0,
+	   complain_overflow_bitfield,
+	   coff_arm_reloc,
+	   "ARM_NEG16",
+	   TRUE,
+	   0x0000ffff,
+	   0x0000ffff,
+	   FALSE),
+    HOWTO (ARM_NEG32,
+	   0,
+	   -2,
+	   32,
+	   FALSE,
+	   0,
+	   complain_overflow_bitfield,
+	   coff_arm_reloc,
+	   "ARM_NEG32",
+	   TRUE,
+	   0xffffffff,
+	   0xffffffff,
+	   FALSE),
+    HOWTO (ARM_RVA32,
+	   0,
+	   2,
+	   32,
+	   FALSE,
+	   0,
+	   complain_overflow_bitfield,
+	   coff_arm_reloc,
+	   "ARM_RVA32",
+	   TRUE,
+	   0xffffffff,
+	   0xffffffff,
+	   PCRELOFFSET),
+    HOWTO (ARM_THUMB9,
+	   1,
+	   1,
+	   8,
+	   TRUE,
+	   0,
+	   complain_overflow_signed,
+	   coff_thumb_pcrel_9 ,
+	   "ARM_THUMB9",
+	   FALSE,
+	   0x000000ff,
+	   0x000000ff,
+	   PCRELOFFSET),
+    HOWTO (ARM_THUMB12,
+	   1,
+	   1,
+	   11,
+	   TRUE,
+	   0,
+	   complain_overflow_signed,
+	   coff_thumb_pcrel_12 ,
+	   "ARM_THUMB12",
+	   FALSE,
+	   0x000007ff,
+	   0x000007ff,
+	   PCRELOFFSET),
+    HOWTO (ARM_THUMB23,
+	   1,
+	   2,
+	   22,
+	   TRUE,
+	   0,
+	   complain_overflow_signed,
+	   coff_thumb_pcrel_23 ,
+	   "ARM_THUMB23",
+	   FALSE,
+	   0x07ff07ff,
+	   0x07ff07ff,
+	   PCRELOFFSET)
+#endif /* not ARM_WINCE */
+  };
+
+#define NUM_RELOCS NUM_ELEM (aoutarm_std_reloc_howto)
+
+#ifdef COFF_WITH_PE
+/* Return TRUE if this relocation should
+   appear in the output .reloc section.  */
+
+static bfd_boolean
+in_reloc_p (bfd * abfd ATTRIBUTE_UNUSED,
+	    reloc_howto_type * howto)
+{
+  return !howto->pc_relative && howto->type != ARM_RVA32;
+}
+#endif
+
+#define RTYPE2HOWTO(cache_ptr, dst)		\
+  (cache_ptr)->howto =				\
+    (dst)->r_type < NUM_RELOCS			\
+    ? aoutarm_std_reloc_howto + (dst)->r_type	\
+    : NULL
+
+#define coff_rtype_to_howto coff_arm_rtype_to_howto
+
+static reloc_howto_type *
+coff_arm_rtype_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+			 asection *sec,
+			 struct internal_reloc *rel,
+			 struct coff_link_hash_entry *h ATTRIBUTE_UNUSED,
+			 struct internal_syment *sym ATTRIBUTE_UNUSED,
+			 bfd_vma *addendp)
+{
+  reloc_howto_type * howto;
+
+  if (rel->r_type >= NUM_RELOCS)
+    return NULL;
+
+  howto = aoutarm_std_reloc_howto + rel->r_type;
+
+  if (rel->r_type == ARM_RVA32)
+    *addendp -= pe_data (sec->output_section->owner)->pe_opthdr.ImageBase;
+
+#if defined COFF_WITH_PE && defined ARM_WINCE
+  if (rel->r_type == ARM_SECREL)
+    {
+      bfd_vma osect_vma;
+
+      if (h && (h->type == bfd_link_hash_defined
+		|| h->type == bfd_link_hash_defweak))
+	osect_vma = h->root.u.def.section->output_section->vma;
+      else
+	{
+	  int i;
+
+	  /* Sigh, the only way to get the section to offset against
+	     is to find it the hard way.  */
+
+	  for (sec = abfd->sections, i = 1; i < sym->n_scnum; i++)
+	    sec = sec->next;
+
+	  osect_vma = sec->output_section->vma;
+	}
+
+      *addendp -= osect_vma;
+    }
+#endif
+
+  return howto;
+}
+
+/* Used by the assembler.  */
+
+static bfd_reloc_status_type
+aoutarm_fix_pcrel_26_done (bfd *abfd ATTRIBUTE_UNUSED,
+			   arelent *reloc_entry ATTRIBUTE_UNUSED,
+			   asymbol *symbol ATTRIBUTE_UNUSED,
+			   void * data ATTRIBUTE_UNUSED,
+			   asection *input_section ATTRIBUTE_UNUSED,
+			   bfd *output_bfd ATTRIBUTE_UNUSED,
+			   char **error_message ATTRIBUTE_UNUSED)
+{
+  /* This is dead simple at present.  */
+  return bfd_reloc_ok;
+}
+
+/* Used by the assembler.  */
+
+static bfd_reloc_status_type
+aoutarm_fix_pcrel_26 (bfd *abfd,
+		      arelent *reloc_entry,
+		      asymbol *symbol,
+		      void * data,
+		      asection *input_section,
+		      bfd *output_bfd,
+		      char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma relocation;
+  bfd_size_type addr = reloc_entry->address;
+  long target = bfd_get_32 (abfd, (bfd_byte *) data + addr);
+  bfd_reloc_status_type flag = bfd_reloc_ok;
+
+  /* If this is an undefined symbol, return error.  */
+  if (symbol->section == &bfd_und_section
+      && (symbol->flags & BSF_WEAK) == 0)
+    return output_bfd ? bfd_reloc_continue : bfd_reloc_undefined;
+
+  /* If the sections are different, and we are doing a partial relocation,
+     just ignore it for now.  */
+  if (symbol->section->name != input_section->name
+      && output_bfd != (bfd *)NULL)
+    return bfd_reloc_continue;
+
+  relocation = (target & 0x00ffffff) << 2;
+  relocation = (relocation ^ 0x02000000) - 0x02000000; /* Sign extend.  */
+  relocation += symbol->value;
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  relocation += reloc_entry->addend;
+  relocation -= input_section->output_section->vma;
+  relocation -= input_section->output_offset;
+  relocation -= addr;
+
+  if (relocation & 3)
+    return bfd_reloc_overflow;
+
+  /* Check for overflow.  */
+  if (relocation & 0x02000000)
+    {
+      if ((relocation & ~ (bfd_vma) 0x03ffffff) != ~ (bfd_vma) 0x03ffffff)
+	flag = bfd_reloc_overflow;
+    }
+  else if (relocation & ~(bfd_vma) 0x03ffffff)
+    flag = bfd_reloc_overflow;
+
+  target &= ~0x00ffffff;
+  target |= (relocation >> 2) & 0x00ffffff;
+  bfd_put_32 (abfd, (bfd_vma) target, (bfd_byte *) data + addr);
+
+  /* Now the ARM magic... Change the reloc type so that it is marked as done.
+     Strictly this is only necessary if we are doing a partial relocation.  */
+  reloc_entry->howto = &aoutarm_std_reloc_howto[ARM_26D];
+
+  return flag;
+}
+
+static bfd_reloc_status_type
+coff_thumb_pcrel_common (bfd *abfd,
+			 arelent *reloc_entry,
+			 asymbol *symbol,
+			 void * data,
+			 asection *input_section,
+			 bfd *output_bfd,
+			 char **error_message ATTRIBUTE_UNUSED,
+			 thumb_pcrel_branchtype btype)
+{
+  bfd_vma relocation = 0;
+  bfd_size_type addr = reloc_entry->address;
+  long target = bfd_get_32 (abfd, (bfd_byte *) data + addr);
+  bfd_reloc_status_type flag = bfd_reloc_ok;
+  bfd_vma dstmsk;
+  bfd_vma offmsk;
+  bfd_vma signbit;
+
+  /* NOTE: This routine is currently used by GAS, but not by the link
+     phase.  */
+  switch (btype)
+    {
+    case b9:
+      dstmsk  = 0x000000ff;
+      offmsk  = 0x000001fe;
+      signbit = 0x00000100;
+      break;
+
+    case b12:
+      dstmsk  = 0x000007ff;
+      offmsk  = 0x00000ffe;
+      signbit = 0x00000800;
+      break;
+
+    case b23:
+      dstmsk  = 0x07ff07ff;
+      offmsk  = 0x007fffff;
+      signbit = 0x00400000;
+      break;
+
+    default:
+      abort ();
+    }
+
+  /* If this is an undefined symbol, return error.  */
+  if (symbol->section == &bfd_und_section
+      && (symbol->flags & BSF_WEAK) == 0)
+    return output_bfd ? bfd_reloc_continue : bfd_reloc_undefined;
+
+  /* If the sections are different, and we are doing a partial relocation,
+     just ignore it for now.  */
+  if (symbol->section->name != input_section->name
+      && output_bfd != (bfd *)NULL)
+    return bfd_reloc_continue;
+
+  switch (btype)
+    {
+    case b9:
+    case b12:
+      relocation = ((target & dstmsk) << 1);
+      break;
+
+    case b23:
+      if (bfd_big_endian (abfd))
+	relocation = ((target & 0x7ff) << 1)  | ((target & 0x07ff0000) >> 4);
+      else
+	relocation = ((target & 0x7ff) << 12) | ((target & 0x07ff0000) >> 15);
+      break;
+
+    default:
+      abort ();
+    }
+
+  relocation = (relocation ^ signbit) - signbit; /* Sign extend.  */
+  relocation += symbol->value;
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  relocation += reloc_entry->addend;
+  relocation -= input_section->output_section->vma;
+  relocation -= input_section->output_offset;
+  relocation -= addr;
+
+  if (relocation & 1)
+    return bfd_reloc_overflow;
+
+  /* Check for overflow.  */
+  if (relocation & signbit)
+    {
+      if ((relocation & ~offmsk) != ~offmsk)
+	flag = bfd_reloc_overflow;
+    }
+  else if (relocation & ~offmsk)
+    flag = bfd_reloc_overflow;
+
+  target &= ~dstmsk;
+  switch (btype)
+   {
+   case b9:
+   case b12:
+     target |= (relocation >> 1);
+     break;
+
+   case b23:
+     if (bfd_big_endian (abfd))
+       target |= (((relocation & 0xfff) >> 1)
+		  | ((relocation << 4)  & 0x07ff0000));
+     else
+       target |= (((relocation & 0xffe) << 15)
+		  | ((relocation >> 12) & 0x7ff));
+     break;
+
+   default:
+     abort ();
+   }
+
+  bfd_put_32 (abfd, (bfd_vma) target, (bfd_byte *) data + addr);
+
+  /* Now the ARM magic... Change the reloc type so that it is marked as done.
+     Strictly this is only necessary if we are doing a partial relocation.  */
+  reloc_entry->howto = & aoutarm_std_reloc_howto [ARM_26D];
+
+  /* TODO: We should possibly have DONE entries for the THUMB PCREL relocations.  */
+  return flag;
+}
+
+#ifndef ARM_WINCE
+static bfd_reloc_status_type
+coff_thumb_pcrel_23 (bfd *abfd,
+		     arelent *reloc_entry,
+		     asymbol *symbol,
+		     void * data,
+		     asection *input_section,
+		     bfd *output_bfd,
+		     char **error_message)
+{
+  return coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data,
+                                  input_section, output_bfd, error_message,
+				  b23);
+}
+
+static bfd_reloc_status_type
+coff_thumb_pcrel_9 (bfd *abfd,
+		    arelent *reloc_entry,
+		    asymbol *symbol,
+		    void * data,
+		    asection *input_section,
+		    bfd *output_bfd,
+		    char **error_message)
+{
+  return coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data,
+                                  input_section, output_bfd, error_message,
+				  b9);
+}
+#endif /* not ARM_WINCE */
+
+static bfd_reloc_status_type
+coff_thumb_pcrel_12 (bfd *abfd,
+		     arelent *reloc_entry,
+		     asymbol *symbol,
+		     void * data,
+		     asection *input_section,
+		     bfd *output_bfd,
+		     char **error_message)
+{
+  return coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data,
+                                  input_section, output_bfd, error_message,
+				  b12);
+}
+
+static const struct reloc_howto_struct *
+coff_arm_reloc_type_lookup (bfd * abfd, bfd_reloc_code_real_type code)
+{
+#define ASTD(i,j)       case i: return aoutarm_std_reloc_howto + j
+
+  if (code == BFD_RELOC_CTOR)
+    switch (bfd_arch_bits_per_address (abfd))
+      {
+      case 32:
+        code = BFD_RELOC_32;
+        break;
+      default:
+	return NULL;
+      }
+
+  switch (code)
+    {
+#ifdef ARM_WINCE
+      ASTD (BFD_RELOC_32,                   ARM_32);
+      ASTD (BFD_RELOC_RVA,                  ARM_RVA32);
+      ASTD (BFD_RELOC_ARM_PCREL_BRANCH,     ARM_26);
+      ASTD (BFD_RELOC_THUMB_PCREL_BRANCH12, ARM_THUMB12);
+      ASTD (BFD_RELOC_32_SECREL,            ARM_SECREL);
+#else
+      ASTD (BFD_RELOC_8,                    ARM_8);
+      ASTD (BFD_RELOC_16,                   ARM_16);
+      ASTD (BFD_RELOC_32,                   ARM_32);
+      ASTD (BFD_RELOC_ARM_PCREL_BRANCH,     ARM_26);
+      ASTD (BFD_RELOC_ARM_PCREL_BLX,        ARM_26);
+      ASTD (BFD_RELOC_8_PCREL,              ARM_DISP8);
+      ASTD (BFD_RELOC_16_PCREL,             ARM_DISP16);
+      ASTD (BFD_RELOC_32_PCREL,             ARM_DISP32);
+      ASTD (BFD_RELOC_RVA,                  ARM_RVA32);
+      ASTD (BFD_RELOC_THUMB_PCREL_BRANCH9,  ARM_THUMB9);
+      ASTD (BFD_RELOC_THUMB_PCREL_BRANCH12, ARM_THUMB12);
+      ASTD (BFD_RELOC_THUMB_PCREL_BRANCH23, ARM_THUMB23);
+      ASTD (BFD_RELOC_THUMB_PCREL_BLX,      ARM_THUMB23);
+#endif
+    default: return NULL;
+    }
+}
+
+static reloc_howto_type *
+coff_arm_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (aoutarm_std_reloc_howto)
+	    / sizeof (aoutarm_std_reloc_howto[0]));
+       i++)
+    if (aoutarm_std_reloc_howto[i].name != NULL
+	&& strcasecmp (aoutarm_std_reloc_howto[i].name, r_name) == 0)
+      return &aoutarm_std_reloc_howto[i];
+
+  return NULL;
+}
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER  2
+#define COFF_PAGE_SIZE                        0x1000
+
+/* Turn a howto into a reloc  nunmber.  */
+#define SELECT_RELOC(x,howto) { x.r_type = howto->type; }
+#define BADMAG(x)             ARMBADMAG(x)
+#define ARM                   1			/* Customize coffcode.h.  */
+
+#ifndef ARM_WINCE
+/* Make sure that the 'r_offset' field is copied properly
+   so that identical binaries will compare the same.  */
+#define SWAP_IN_RELOC_OFFSET	H_GET_32
+#define SWAP_OUT_RELOC_OFFSET	H_PUT_32
+#endif
+
+/* Extend the coff_link_hash_table structure with a few ARM specific fields.
+   This allows us to store global data here without actually creating any
+   global variables, which is a no-no in the BFD world.  */
+struct coff_arm_link_hash_table
+  {
+    /* The original coff_link_hash_table structure.  MUST be first field.  */
+    struct coff_link_hash_table	root;
+
+    /* The size in bytes of the section containing the Thumb-to-ARM glue.  */
+    bfd_size_type		thumb_glue_size;
+
+    /* The size in bytes of the section containing the ARM-to-Thumb glue.  */
+    bfd_size_type		arm_glue_size;
+
+    /* An arbitrary input BFD chosen to hold the glue sections.  */
+    bfd *			bfd_of_glue_owner;
+
+    /* Support interworking with old, non-interworking aware ARM code.  */
+    int 			support_old_code;
+};
+
+/* Get the ARM coff linker hash table from a link_info structure.  */
+#define coff_arm_hash_table(info) \
+  ((struct coff_arm_link_hash_table *) ((info)->hash))
+
+/* Create an ARM coff linker hash table.  */
+
+static struct bfd_link_hash_table *
+coff_arm_link_hash_table_create (bfd * abfd)
+{
+  struct coff_arm_link_hash_table * ret;
+  bfd_size_type amt = sizeof (struct coff_arm_link_hash_table);
+
+  ret = bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_coff_link_hash_table_init (&ret->root,
+				       abfd,
+				       _bfd_coff_link_hash_newfunc,
+				       sizeof (struct coff_link_hash_entry)))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  ret->thumb_glue_size   = 0;
+  ret->arm_glue_size     = 0;
+  ret->bfd_of_glue_owner = NULL;
+
+  return & ret->root.root;
+}
+
+static bfd_boolean
+arm_emit_base_file_entry (struct bfd_link_info *info,
+			  bfd *output_bfd,
+			  asection *input_section,
+			  bfd_vma reloc_offset)
+{
+  bfd_vma addr = (reloc_offset
+		  - input_section->vma
+		  + input_section->output_offset
+		  + input_section->output_section->vma);
+
+  if (coff_data (output_bfd)->pe)
+     addr -= pe_data (output_bfd)->pe_opthdr.ImageBase;
+  if (fwrite (&addr, sizeof (addr), 1, (FILE *) info->base_file) == 1)
+    return TRUE;
+
+  bfd_set_error (bfd_error_system_call);
+  return FALSE;
+}
+
+#ifndef ARM_WINCE
+/* The thumb form of a long branch is a bit finicky, because the offset
+   encoding is split over two fields, each in it's own instruction. They
+   can occur in any order. So given a thumb form of long branch, and an
+   offset, insert the offset into the thumb branch and return finished
+   instruction.
+
+   It takes two thumb instructions to encode the target address. Each has
+   11 bits to invest. The upper 11 bits are stored in one (identified by
+   H-0.. see below), the lower 11 bits are stored in the other (identified
+   by H-1).
+
+   Combine together and shifted left by 1 (it's a half word address) and
+   there you have it.
+
+     Op: 1111 = F,
+     H-0, upper address-0 = 000
+     Op: 1111 = F,
+     H-1, lower address-0 = 800
+
+   They can be ordered either way, but the arm tools I've seen always put
+   the lower one first. It probably doesn't matter. krk@cygnus.com
+
+   XXX:  Actually the order does matter.  The second instruction (H-1)
+   moves the computed address into the PC, so it must be the second one
+   in the sequence.  The problem, however is that whilst little endian code
+   stores the instructions in HI then LOW order, big endian code does the
+   reverse.  nickc@cygnus.com.  */
+
+#define LOW_HI_ORDER 0xF800F000
+#define HI_LOW_ORDER 0xF000F800
+
+static insn32
+insert_thumb_branch (insn32 br_insn, int rel_off)
+{
+  unsigned int low_bits;
+  unsigned int high_bits;
+
+  BFD_ASSERT ((rel_off & 1) != 1);
+
+  rel_off >>= 1;                              /* Half word aligned address.  */
+  low_bits = rel_off & 0x000007FF;            /* The bottom 11 bits.  */
+  high_bits = (rel_off >> 11) & 0x000007FF;   /* The top 11 bits.  */
+
+  if ((br_insn & LOW_HI_ORDER) == LOW_HI_ORDER)
+    br_insn = LOW_HI_ORDER | (low_bits << 16) | high_bits;
+  else if ((br_insn & HI_LOW_ORDER) == HI_LOW_ORDER)
+    br_insn = HI_LOW_ORDER | (high_bits << 16) | low_bits;
+  else
+    /* FIXME: the BFD library should never abort except for internal errors
+       - it should return an error status.  */
+    abort (); /* Error - not a valid branch instruction form.  */
+
+  return br_insn;
+}
+
+
+static struct coff_link_hash_entry *
+find_thumb_glue (struct bfd_link_info *info,
+		 const char *name,
+		 bfd *input_bfd)
+{
+  char *tmp_name;
+  struct coff_link_hash_entry *myh;
+  bfd_size_type amt = strlen (name) + strlen (THUMB2ARM_GLUE_ENTRY_NAME) + 1;
+
+  tmp_name = bfd_malloc (amt);
+
+  BFD_ASSERT (tmp_name);
+
+  sprintf (tmp_name, THUMB2ARM_GLUE_ENTRY_NAME, name);
+
+  myh = coff_link_hash_lookup
+    (coff_hash_table (info), tmp_name, FALSE, FALSE, TRUE);
+
+  if (myh == NULL)
+    /* xgettext:c-format */
+    _bfd_error_handler (_("%B: unable to find THUMB glue '%s' for `%s'"),
+			input_bfd, tmp_name, name);
+
+  free (tmp_name);
+
+  return myh;
+}
+#endif /* not ARM_WINCE */
+
+static struct coff_link_hash_entry *
+find_arm_glue (struct bfd_link_info *info,
+	       const char *name,
+	       bfd *input_bfd)
+{
+  char *tmp_name;
+  struct coff_link_hash_entry * myh;
+  bfd_size_type amt = strlen (name) + strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1;
+
+  tmp_name = bfd_malloc (amt);
+
+  BFD_ASSERT (tmp_name);
+
+  sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name);
+
+  myh = coff_link_hash_lookup
+    (coff_hash_table (info), tmp_name, FALSE, FALSE, TRUE);
+
+  if (myh == NULL)
+    /* xgettext:c-format */
+    _bfd_error_handler (_("%B: unable to find ARM glue '%s' for `%s'"),
+			input_bfd, tmp_name, name);
+
+  free (tmp_name);
+
+  return myh;
+}
+
+/*
+  ARM->Thumb glue:
+
+       .arm
+       __func_from_arm:
+	     ldr r12, __func_addr
+	     bx  r12
+       __func_addr:
+            .word func    @ behave as if you saw a ARM_32 reloc
+*/
+
+#define ARM2THUMB_GLUE_SIZE 12
+static const insn32 a2t1_ldr_insn       = 0xe59fc000;
+static const insn32 a2t2_bx_r12_insn    = 0xe12fff1c;
+static const insn32 a2t3_func_addr_insn = 0x00000001;
+
+/*
+   Thumb->ARM:				Thumb->(non-interworking aware) ARM
+
+   .thumb				.thumb
+   .align 2				.align 2
+      __func_from_thumb:		   __func_from_thumb:
+	   bx pc				push {r6, lr}
+	   nop					ldr  r6, __func_addr
+   .arm						mov  lr, pc
+      __func_change_to_arm:			bx   r6
+	   b func   			.arm
+					   __func_back_to_thumb:
+   		  				ldmia r13! {r6, lr}
+   					        bx    lr
+   					   __func_addr:
+					        .word	func
+*/
+
+#define THUMB2ARM_GLUE_SIZE (globals->support_old_code ? 20 : 8)
+#ifndef ARM_WINCE
+static const insn16 t2a1_bx_pc_insn = 0x4778;
+static const insn16 t2a2_noop_insn  = 0x46c0;
+static const insn32 t2a3_b_insn     = 0xea000000;
+
+static const insn16 t2a1_push_insn  = 0xb540;
+static const insn16 t2a2_ldr_insn   = 0x4e03;
+static const insn16 t2a3_mov_insn   = 0x46fe;
+static const insn16 t2a4_bx_insn    = 0x4730;
+static const insn32 t2a5_pop_insn   = 0xe8bd4040;
+static const insn32 t2a6_bx_insn    = 0xe12fff1e;
+#endif
+
+/* TODO:
+     We should really create new local (static) symbols in destination
+     object for each stub we create.  We should also create local
+     (static) symbols within the stubs when switching between ARM and
+     Thumb code.  This will ensure that the debugger and disassembler
+     can present a better view of stubs.
+
+     We can treat stubs like literal sections, and for the THUMB9 ones
+     (short addressing range) we should be able to insert the stubs
+     between sections. i.e. the simplest approach (since relocations
+     are done on a section basis) is to dump the stubs at the end of
+     processing a section. That way we can always try and minimise the
+     offset to and from a stub. However, this does not map well onto
+     the way that the linker/BFD does its work: mapping all input
+     sections to output sections via the linker script before doing
+     all the processing.
+
+     Unfortunately it may be easier to just to disallow short range
+     Thumb->ARM stubs (i.e. no conditional inter-working branches,
+     only branch-and-link (BL) calls.  This will simplify the processing
+     since we can then put all of the stubs into their own section.
+
+  TODO:
+     On a different subject, rather than complaining when a
+     branch cannot fit in the number of bits available for the
+     instruction we should generate a trampoline stub (needed to
+     address the complete 32bit address space).  */
+
+/* The standard COFF backend linker does not cope with the special
+   Thumb BRANCH23 relocation.  The alternative would be to split the
+   BRANCH23 into seperate HI23 and LO23 relocations. However, it is a
+   bit simpler simply providing our own relocation driver.  */
+
+/* The reloc processing routine for the ARM/Thumb COFF linker.  NOTE:
+   This code is a very slightly modified copy of
+   _bfd_coff_generic_relocate_section.  It would be a much more
+   maintainable solution to have a MACRO that could be expanded within
+   _bfd_coff_generic_relocate_section that would only be provided for
+   ARM/Thumb builds.  It is only the code marked THUMBEXTENSION that
+   is different from the original.  */
+
+static bfd_boolean
+coff_arm_relocate_section (bfd *output_bfd,
+			   struct bfd_link_info *info,
+			   bfd *input_bfd,
+			   asection *input_section,
+			   bfd_byte *contents,
+			   struct internal_reloc *relocs,
+			   struct internal_syment *syms,
+			   asection **sections)
+{
+  struct internal_reloc * rel;
+  struct internal_reloc * relend;
+#ifndef ARM_WINCE
+  bfd_vma high_address = bfd_get_section_limit (input_bfd, input_section);
+#endif
+
+  rel = relocs;
+  relend = rel + input_section->reloc_count;
+
+  for (; rel < relend; rel++)
+    {
+      int                            done = 0;
+      long                           symndx;
+      struct coff_link_hash_entry *  h;
+      struct internal_syment *       sym;
+      bfd_vma                        addend;
+      bfd_vma                        val;
+      reloc_howto_type *             howto;
+      bfd_reloc_status_type          rstat;
+      bfd_vma                        h_val;
+
+      symndx = rel->r_symndx;
+
+      if (symndx == -1)
+	{
+	  h = NULL;
+	  sym = NULL;
+	}
+      else
+	{
+	  h = obj_coff_sym_hashes (input_bfd)[symndx];
+	  sym = syms + symndx;
+	}
+
+      /* COFF treats common symbols in one of two ways.  Either the
+         size of the symbol is included in the section contents, or it
+         is not.  We assume that the size is not included, and force
+         the rtype_to_howto function to adjust the addend as needed.  */
+
+      if (sym != NULL && sym->n_scnum != 0)
+	addend = - sym->n_value;
+      else
+	addend = 0;
+
+      howto = coff_rtype_to_howto (input_bfd, input_section, rel, h,
+				       sym, &addend);
+      if (howto == NULL)
+	return FALSE;
+
+      /* The relocation_section function will skip pcrel_offset relocs
+         when doing a relocatable link.  However, we want to convert
+         ARM_26 to ARM_26D relocs if possible.  We return a fake howto in
+         this case without pcrel_offset set, and adjust the addend to
+         compensate.  'partial_inplace' is also set, since we want 'done'
+         relocations to be reflected in section's data.  */
+      if (rel->r_type == ARM_26
+          && h != NULL
+          && info->relocatable
+          && (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+          && (h->root.u.def.section->output_section
+	      == input_section->output_section))
+        {
+          static reloc_howto_type fake_arm26_reloc =
+	    HOWTO (ARM_26,
+    	       2,
+    	       2,
+    	       24,
+    	       TRUE,
+    	       0,
+    	       complain_overflow_signed,
+    	       aoutarm_fix_pcrel_26 ,
+    	       "ARM_26",
+    	       TRUE,
+    	       0x00ffffff,
+    	       0x00ffffff,
+    	       FALSE);
+
+          addend -= rel->r_vaddr - input_section->vma;
+#ifdef ARM_WINCE
+          /* FIXME: I don't know why, but the hack is necessary for correct
+                    generation of bl's instruction offset.  */
+          addend -= 8;
+#endif
+          howto = & fake_arm26_reloc;
+        }
+
+#ifdef ARM_WINCE
+      /* MS ARM-CE makes the reloc relative to the opcode's pc, not
+	 the next opcode's pc, so is off by one.  */
+      if (howto->pc_relative && !info->relocatable)
+	addend -= 8;
+#endif
+
+      /* If we are doing a relocatable link, then we can just ignore
+         a PC relative reloc that is pcrel_offset.  It will already
+         have the correct value.  If this is not a relocatable link,
+         then we should ignore the symbol value.  */
+      if (howto->pc_relative && howto->pcrel_offset)
+        {
+          if (info->relocatable)
+            continue;
+	  /* FIXME - it is not clear which targets need this next test
+	     and which do not.  It is known that it is needed for the
+	     VxWorks and EPOC-PE targets, but it is also known that it
+	     was suppressed for other ARM targets.  This ought to be
+	     sorted out one day.  */
+#ifdef ARM_COFF_BUGFIX
+	  /* We must not ignore the symbol value.  If the symbol is
+	     within the same section, the relocation should have already
+	     been fixed, but if it is not, we'll be handed a reloc into
+	     the beginning of the symbol's section, so we must not cancel
+	     out the symbol's value, otherwise we'll be adding it in
+	     twice.  */
+          if (sym != NULL && sym->n_scnum != 0)
+            addend += sym->n_value;
+#endif
+        }
+
+      val = 0;
+
+      if (h == NULL)
+	{
+	  asection *sec;
+
+	  if (symndx == -1)
+	    {
+	      sec = bfd_abs_section_ptr;
+	      val = 0;
+	    }
+	  else
+	    {
+	      sec = sections[symndx];
+              val = (sec->output_section->vma
+		     + sec->output_offset
+		     + sym->n_value
+		     - sec->vma);
+	    }
+	}
+      else
+	{
+          /* We don't output the stubs if we are generating a
+             relocatable output file, since we may as well leave the
+             stub generation to the final linker pass. If we fail to
+	     verify that the name is defined, we'll try to build stubs
+	     for an undefined name...  */
+          if (! info->relocatable
+	      && (   h->root.type == bfd_link_hash_defined
+		  || h->root.type == bfd_link_hash_defweak))
+            {
+	      asection *   h_sec = h->root.u.def.section;
+	      const char * name  = h->root.root.string;
+
+	      /* h locates the symbol referenced in the reloc.  */
+	      h_val = (h->root.u.def.value
+		       + h_sec->output_section->vma
+		       + h_sec->output_offset);
+
+              if (howto->type == ARM_26)
+                {
+                  if (   h->symbol_class == C_THUMBSTATFUNC
+		      || h->symbol_class == C_THUMBEXTFUNC)
+		    {
+		      /* Arm code calling a Thumb function.  */
+		      unsigned long int                 tmp;
+		      bfd_vma                           my_offset;
+		      asection *                        s;
+		      long int                          ret_offset;
+		      struct coff_link_hash_entry *     myh;
+		      struct coff_arm_link_hash_table * globals;
+
+		      myh = find_arm_glue (info, name, input_bfd);
+		      if (myh == NULL)
+			return FALSE;
+
+		      globals = coff_arm_hash_table (info);
+
+		      BFD_ASSERT (globals != NULL);
+		      BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
+
+		      my_offset = myh->root.u.def.value;
+
+		      s = bfd_get_section_by_name (globals->bfd_of_glue_owner,
+						  ARM2THUMB_GLUE_SECTION_NAME);
+		      BFD_ASSERT (s != NULL);
+		      BFD_ASSERT (s->contents != NULL);
+		      BFD_ASSERT (s->output_section != NULL);
+
+		      if ((my_offset & 0x01) == 0x01)
+			{
+			  if (h_sec->owner != NULL
+			      && INTERWORK_SET (h_sec->owner)
+			      && ! INTERWORK_FLAG (h_sec->owner))
+			    _bfd_error_handler
+			      /* xgettext:c-format */
+			      (_("%B(%s): warning: interworking not enabled.\n"
+				 "  first occurrence: %B: arm call to thumb"),
+			       h_sec->owner, input_bfd, name);
+
+			  --my_offset;
+			  myh->root.u.def.value = my_offset;
+
+			  bfd_put_32 (output_bfd, (bfd_vma) a2t1_ldr_insn,
+				      s->contents + my_offset);
+
+			  bfd_put_32 (output_bfd, (bfd_vma) a2t2_bx_r12_insn,
+				      s->contents + my_offset + 4);
+
+			  /* It's a thumb address.  Add the low order bit.  */
+			  bfd_put_32 (output_bfd, h_val | a2t3_func_addr_insn,
+				      s->contents + my_offset + 8);
+
+                          if (info->base_file
+			      && !arm_emit_base_file_entry (info, output_bfd,
+							    s, my_offset + 8))
+			    return FALSE;
+			}
+
+		      BFD_ASSERT (my_offset <= globals->arm_glue_size);
+
+		      tmp = bfd_get_32 (input_bfd, contents + rel->r_vaddr
+					- input_section->vma);
+
+		      tmp = tmp & 0xFF000000;
+
+		      /* Somehow these are both 4 too far, so subtract 8.  */
+		      ret_offset =
+			s->output_offset
+			+ my_offset
+			+ s->output_section->vma
+			- (input_section->output_offset
+			   + input_section->output_section->vma
+			   + rel->r_vaddr)
+			- 8;
+
+		      tmp = tmp | ((ret_offset >> 2) & 0x00FFFFFF);
+
+		      bfd_put_32 (output_bfd, (bfd_vma) tmp,
+				  contents + rel->r_vaddr - input_section->vma);
+		      done = 1;
+		    }
+                }
+
+#ifndef ARM_WINCE
+	      /* Note: We used to check for ARM_THUMB9 and ARM_THUMB12.  */
+              else if (howto->type == ARM_THUMB23)
+                {
+                  if (   h->symbol_class == C_EXT
+		      || h->symbol_class == C_STAT
+		      || h->symbol_class == C_LABEL)
+		    {
+		      /* Thumb code calling an ARM function.  */
+		      asection *                         s = 0;
+		      bfd_vma                            my_offset;
+		      unsigned long int                  tmp;
+		      long int                           ret_offset;
+		      struct coff_link_hash_entry *      myh;
+		      struct coff_arm_link_hash_table *  globals;
+
+		      myh = find_thumb_glue (info, name, input_bfd);
+		      if (myh == NULL)
+			return FALSE;
+
+		      globals = coff_arm_hash_table (info);
+
+		      BFD_ASSERT (globals != NULL);
+		      BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
+
+		      my_offset = myh->root.u.def.value;
+
+		      s = bfd_get_section_by_name (globals->bfd_of_glue_owner,
+						   THUMB2ARM_GLUE_SECTION_NAME);
+
+		      BFD_ASSERT (s != NULL);
+		      BFD_ASSERT (s->contents != NULL);
+		      BFD_ASSERT (s->output_section != NULL);
+
+		      if ((my_offset & 0x01) == 0x01)
+			{
+			  if (h_sec->owner != NULL
+			      && INTERWORK_SET (h_sec->owner)
+			      && ! INTERWORK_FLAG (h_sec->owner)
+			      && ! globals->support_old_code)
+			    _bfd_error_handler
+			      /* xgettext:c-format */
+			      (_("%B(%s): warning: interworking not enabled.\n"
+				 "  first occurrence: %B: thumb call to arm\n"
+				 "  consider relinking with --support-old-code enabled"),
+			       h_sec->owner, input_bfd, name);
+
+			  -- my_offset;
+			  myh->root.u.def.value = my_offset;
+
+			  if (globals->support_old_code)
+			    {
+			      bfd_put_16 (output_bfd, (bfd_vma) t2a1_push_insn,
+					  s->contents + my_offset);
+
+			      bfd_put_16 (output_bfd, (bfd_vma) t2a2_ldr_insn,
+					  s->contents + my_offset + 2);
+
+			      bfd_put_16 (output_bfd, (bfd_vma) t2a3_mov_insn,
+					  s->contents + my_offset + 4);
+
+			      bfd_put_16 (output_bfd, (bfd_vma) t2a4_bx_insn,
+					  s->contents + my_offset + 6);
+
+			      bfd_put_32 (output_bfd, (bfd_vma) t2a5_pop_insn,
+					  s->contents + my_offset + 8);
+
+			      bfd_put_32 (output_bfd, (bfd_vma) t2a6_bx_insn,
+					  s->contents + my_offset + 12);
+
+			      /* Store the address of the function in the last word of the stub.  */
+			      bfd_put_32 (output_bfd, h_val,
+					  s->contents + my_offset + 16);
+
+                              if (info->base_file
+				  && !arm_emit_base_file_entry (info,
+								output_bfd, s,
+								my_offset + 16))
+				return FALSE;
+			    }
+			  else
+			    {
+			      bfd_put_16 (output_bfd, (bfd_vma) t2a1_bx_pc_insn,
+					  s->contents + my_offset);
+
+			      bfd_put_16 (output_bfd, (bfd_vma) t2a2_noop_insn,
+					  s->contents + my_offset + 2);
+
+			      ret_offset =
+		/* Address of destination of the stub.  */
+				((bfd_signed_vma) h_val)
+				- ((bfd_signed_vma)
+		/* Offset from the start of the current section to the start of the stubs.  */
+				   (s->output_offset
+		/* Offset of the start of this stub from the start of the stubs.  */
+				    + my_offset
+		/* Address of the start of the current section.  */
+				    + s->output_section->vma)
+		/* The branch instruction is 4 bytes into the stub.  */
+				   + 4
+		/* ARM branches work from the pc of the instruction + 8.  */
+				   + 8);
+
+			      bfd_put_32 (output_bfd,
+					  (bfd_vma) t2a3_b_insn | ((ret_offset >> 2) & 0x00FFFFFF),
+					  s->contents + my_offset + 4);
+
+			    }
+			}
+
+		      BFD_ASSERT (my_offset <= globals->thumb_glue_size);
+
+		      /* Now go back and fix up the original BL insn to point
+			 to here.  */
+		      ret_offset =
+			s->output_offset
+			+ my_offset
+			- (input_section->output_offset
+			   + rel->r_vaddr)
+			-4;
+
+		      tmp = bfd_get_32 (input_bfd, contents + rel->r_vaddr
+					- input_section->vma);
+
+		      bfd_put_32 (output_bfd,
+				  (bfd_vma) insert_thumb_branch (tmp,
+								 ret_offset),
+				  contents + rel->r_vaddr - input_section->vma);
+
+		      done = 1;
+                    }
+                }
+#endif
+            }
+
+          /* If the relocation type and destination symbol does not
+             fall into one of the above categories, then we can just
+             perform a direct link.  */
+
+	  if (done)
+	    rstat = bfd_reloc_ok;
+	  else
+	    if (   h->root.type == bfd_link_hash_defined
+		|| h->root.type == bfd_link_hash_defweak)
+	    {
+	      asection *sec;
+
+	      sec = h->root.u.def.section;
+	      val = (h->root.u.def.value
+		     + sec->output_section->vma
+		     + sec->output_offset);
+	      }
+
+	  else if (! info->relocatable)
+	    {
+	      if (! ((*info->callbacks->undefined_symbol)
+		     (info, h->root.root.string, input_bfd, input_section,
+		      rel->r_vaddr - input_section->vma, TRUE)))
+		return FALSE;
+	    }
+	}
+
+      /* Emit a reloc if the backend thinks it needs it.  */
+      if (info->base_file
+	  && sym
+	  && pe_data(output_bfd)->in_reloc_p(output_bfd, howto)
+	  && !arm_emit_base_file_entry (info, output_bfd, input_section,
+					rel->r_vaddr))
+	return FALSE;
+
+      if (done)
+	rstat = bfd_reloc_ok;
+#ifndef ARM_WINCE
+      /* Only perform this fix during the final link, not a relocatable link.  */
+      else if (! info->relocatable
+	       && howto->type == ARM_THUMB23)
+        {
+          /* This is pretty much a copy of what the default
+             _bfd_final_link_relocate and _bfd_relocate_contents
+             routines do to perform a relocation, with special
+             processing for the split addressing of the Thumb BL
+             instruction.  Again, it would probably be simpler adding a
+             ThumbBRANCH23 specific macro expansion into the default
+             code.  */
+
+          bfd_vma address = rel->r_vaddr - input_section->vma;
+
+	  if (address > high_address)
+	    rstat = bfd_reloc_outofrange;
+          else
+            {
+              bfd_vma relocation = val + addend;
+	      int size = bfd_get_reloc_size (howto);
+	      bfd_boolean overflow = FALSE;
+	      bfd_byte *location = contents + address;
+	      bfd_vma x = bfd_get_32 (input_bfd, location);
+	      bfd_vma src_mask = 0x007FFFFE;
+	      bfd_signed_vma reloc_signed_max = (1 << (howto->bitsize - 1)) - 1;
+	      bfd_signed_vma reloc_signed_min = ~reloc_signed_max;
+	      bfd_vma check;
+	      bfd_signed_vma signed_check;
+	      bfd_vma add;
+	      bfd_signed_vma signed_add;
+
+	      BFD_ASSERT (size == 4);
+
+              /* howto->pc_relative should be TRUE for type 14 BRANCH23.  */
+              relocation -= (input_section->output_section->vma
+                             + input_section->output_offset);
+
+              /* howto->pcrel_offset should be TRUE for type 14 BRANCH23.  */
+              relocation -= address;
+
+	      /* No need to negate the relocation with BRANCH23.  */
+	      /* howto->complain_on_overflow == complain_overflow_signed for BRANCH23.  */
+	      /* howto->rightshift == 1 */
+
+	      /* Drop unwanted bits from the value we are relocating to.  */
+	      check = relocation >> howto->rightshift;
+
+	      /* If this is a signed value, the rightshift just dropped
+		 leading 1 bits (assuming twos complement).  */
+	      if ((bfd_signed_vma) relocation >= 0)
+		signed_check = check;
+	      else
+		signed_check = (check
+				| ((bfd_vma) - 1
+				   & ~((bfd_vma) - 1 >> howto->rightshift)));
+
+	      /* Get the value from the object file.  */
+	      if (bfd_big_endian (input_bfd))
+		add = (((x) & 0x07ff0000) >> 4) | (((x) & 0x7ff) << 1);
+	      else
+		add = ((((x) & 0x7ff) << 12) | (((x) & 0x07ff0000) >> 15));
+
+	      /* Get the value from the object file with an appropriate sign.
+		 The expression involving howto->src_mask isolates the upper
+		 bit of src_mask.  If that bit is set in the value we are
+		 adding, it is negative, and we subtract out that number times
+		 two.  If src_mask includes the highest possible bit, then we
+		 can not get the upper bit, but that does not matter since
+		 signed_add needs no adjustment to become negative in that
+		 case.  */
+	      signed_add = add;
+
+	      if ((add & (((~ src_mask) >> 1) & src_mask)) != 0)
+		signed_add -= (((~ src_mask) >> 1) & src_mask) << 1;
+
+	      /* howto->bitpos == 0 */
+	      /* Add the value from the object file, shifted so that it is a
+		 straight number.  */
+	      signed_check += signed_add;
+	      relocation   += signed_add;
+
+	      BFD_ASSERT (howto->complain_on_overflow == complain_overflow_signed);
+
+	      /* Assumes two's complement.  */
+	      if (   signed_check > reloc_signed_max
+		  || signed_check < reloc_signed_min)
+		overflow = TRUE;
+
+	      /* Put the relocation into the correct bits.
+		 For a BLX instruction, make sure that the relocation is rounded up
+		 to a word boundary.  This follows the semantics of the instruction
+		 which specifies that bit 1 of the target address will come from bit
+		 1 of the base address.  */
+	      if (bfd_big_endian (input_bfd))
+	        {
+		  if ((x & 0x1800) == 0x0800 && (relocation & 0x02))
+		    relocation += 2;
+		  relocation = (((relocation & 0xffe) >> 1)  | ((relocation << 4) & 0x07ff0000));
+		}
+	      else
+	        {
+		  if ((x & 0x18000000) == 0x08000000 && (relocation & 0x02))
+		    relocation += 2;
+		  relocation = (((relocation & 0xffe) << 15) | ((relocation >> 12) & 0x7ff));
+		}
+
+	      /* Add the relocation to the correct bits of X.  */
+	      x = ((x & ~howto->dst_mask) | relocation);
+
+	      /* Put the relocated value back in the object file.  */
+	      bfd_put_32 (input_bfd, x, location);
+
+	      rstat = overflow ? bfd_reloc_overflow : bfd_reloc_ok;
+            }
+        }
+#endif
+      else
+        if (info->relocatable && ! howto->partial_inplace)
+            rstat = bfd_reloc_ok;
+        else
+	  rstat = _bfd_final_link_relocate (howto, input_bfd, input_section,
+					    contents,
+					    rel->r_vaddr - input_section->vma,
+					    val, addend);
+      /* Only perform this fix during the final link, not a relocatable link.  */
+      if (! info->relocatable
+	  && (rel->r_type == ARM_32 || rel->r_type == ARM_RVA32))
+	{
+	  /* Determine if we need to set the bottom bit of a relocated address
+	     because the address is the address of a Thumb code symbol.  */
+	  int patchit = FALSE;
+
+	  if (h != NULL
+	      && (   h->symbol_class == C_THUMBSTATFUNC
+		  || h->symbol_class == C_THUMBEXTFUNC))
+	    {
+	      patchit = TRUE;
+	    }
+	  else if (sym != NULL
+		   && sym->n_scnum > N_UNDEF)
+	    {
+	      /* No hash entry - use the symbol instead.  */
+	      if (   sym->n_sclass == C_THUMBSTATFUNC
+		  || sym->n_sclass == C_THUMBEXTFUNC)
+		patchit = TRUE;
+	    }
+
+	  if (patchit)
+	    {
+	      bfd_byte * location = contents + rel->r_vaddr - input_section->vma;
+	      bfd_vma    x        = bfd_get_32 (input_bfd, location);
+
+	      bfd_put_32 (input_bfd, x | 1, location);
+	    }
+	}
+
+      switch (rstat)
+	{
+	default:
+	  abort ();
+	case bfd_reloc_ok:
+	  break;
+	case bfd_reloc_outofrange:
+	  (*_bfd_error_handler)
+	    (_("%B: bad reloc address 0x%lx in section `%A'"),
+	     input_bfd, input_section, (unsigned long) rel->r_vaddr);
+	  return FALSE;
+	case bfd_reloc_overflow:
+	  {
+	    const char *name;
+	    char buf[SYMNMLEN + 1];
+
+	    if (symndx == -1)
+	      name = "*ABS*";
+	    else if (h != NULL)
+	      name = NULL;
+	    else
+	      {
+		name = _bfd_coff_internal_syment_name (input_bfd, sym, buf);
+		if (name == NULL)
+		  return FALSE;
+	      }
+
+	    if (! ((*info->callbacks->reloc_overflow)
+		   (info, (h ? &h->root : NULL), name, howto->name,
+		    (bfd_vma) 0, input_bfd, input_section,
+		    rel->r_vaddr - input_section->vma)))
+	      return FALSE;
+	  }
+	}
+    }
+
+  return TRUE;
+}
+
+#ifndef COFF_IMAGE_WITH_PE
+
+bfd_boolean
+bfd_arm_allocate_interworking_sections (struct bfd_link_info * info)
+{
+  asection *                        s;
+  bfd_byte *                        foo;
+  struct coff_arm_link_hash_table * globals;
+
+  globals = coff_arm_hash_table (info);
+
+  BFD_ASSERT (globals != NULL);
+
+  if (globals->arm_glue_size != 0)
+    {
+      BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
+
+      s = bfd_get_section_by_name
+	(globals->bfd_of_glue_owner, ARM2THUMB_GLUE_SECTION_NAME);
+
+      BFD_ASSERT (s != NULL);
+
+      foo = bfd_alloc (globals->bfd_of_glue_owner, globals->arm_glue_size);
+
+      s->size = globals->arm_glue_size;
+      s->contents = foo;
+    }
+
+  if (globals->thumb_glue_size != 0)
+    {
+      BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
+
+      s = bfd_get_section_by_name
+	(globals->bfd_of_glue_owner, THUMB2ARM_GLUE_SECTION_NAME);
+
+      BFD_ASSERT (s != NULL);
+
+      foo = bfd_alloc (globals->bfd_of_glue_owner, globals->thumb_glue_size);
+
+      s->size = globals->thumb_glue_size;
+      s->contents = foo;
+    }
+
+  return TRUE;
+}
+
+static void
+record_arm_to_thumb_glue (struct bfd_link_info *        info,
+			  struct coff_link_hash_entry * h)
+{
+  const char *                      name = h->root.root.string;
+  register asection *               s;
+  char *                            tmp_name;
+  struct coff_link_hash_entry *     myh;
+  struct bfd_link_hash_entry *      bh;
+  struct coff_arm_link_hash_table * globals;
+  bfd_vma val;
+  bfd_size_type amt;
+
+  globals = coff_arm_hash_table (info);
+
+  BFD_ASSERT (globals != NULL);
+  BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
+
+  s = bfd_get_section_by_name
+    (globals->bfd_of_glue_owner, ARM2THUMB_GLUE_SECTION_NAME);
+
+  BFD_ASSERT (s != NULL);
+
+  amt = strlen (name) + strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1;
+  tmp_name = bfd_malloc (amt);
+
+  BFD_ASSERT (tmp_name);
+
+  sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name);
+
+  myh = coff_link_hash_lookup
+    (coff_hash_table (info), tmp_name, FALSE, FALSE, TRUE);
+
+  if (myh != NULL)
+    {
+      free (tmp_name);
+      /* We've already seen this guy.  */
+      return;
+    }
+
+  /* The only trick here is using globals->arm_glue_size as the value. Even
+     though the section isn't allocated yet, this is where we will be putting
+     it.  */
+  bh = NULL;
+  val = globals->arm_glue_size + 1;
+  bfd_coff_link_add_one_symbol (info, globals->bfd_of_glue_owner, tmp_name,
+				BSF_GLOBAL, s, val, NULL, TRUE, FALSE, &bh);
+
+  free (tmp_name);
+
+  globals->arm_glue_size += ARM2THUMB_GLUE_SIZE;
+
+  return;
+}
+
+#ifndef ARM_WINCE
+static void
+record_thumb_to_arm_glue (struct bfd_link_info *        info,
+			  struct coff_link_hash_entry * h)
+{
+  const char *                       name = h->root.root.string;
+  asection *                         s;
+  char *                             tmp_name;
+  struct coff_link_hash_entry *      myh;
+  struct bfd_link_hash_entry *       bh;
+  struct coff_arm_link_hash_table *  globals;
+  bfd_vma val;
+  bfd_size_type amt;
+
+  globals = coff_arm_hash_table (info);
+
+  BFD_ASSERT (globals != NULL);
+  BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
+
+  s = bfd_get_section_by_name
+    (globals->bfd_of_glue_owner, THUMB2ARM_GLUE_SECTION_NAME);
+
+  BFD_ASSERT (s != NULL);
+
+  amt = strlen (name) + strlen (THUMB2ARM_GLUE_ENTRY_NAME) + 1;
+  tmp_name = bfd_malloc (amt);
+
+  BFD_ASSERT (tmp_name);
+
+  sprintf (tmp_name, THUMB2ARM_GLUE_ENTRY_NAME, name);
+
+  myh = coff_link_hash_lookup
+    (coff_hash_table (info), tmp_name, FALSE, FALSE, TRUE);
+
+  if (myh != NULL)
+    {
+      free (tmp_name);
+      /* We've already seen this guy.  */
+      return;
+    }
+
+  bh = NULL;
+  val = globals->thumb_glue_size + 1;
+  bfd_coff_link_add_one_symbol (info, globals->bfd_of_glue_owner, tmp_name,
+				BSF_GLOBAL, s, val, NULL, TRUE, FALSE, &bh);
+
+  /* If we mark it 'thumb', the disassembler will do a better job.  */
+  myh = (struct coff_link_hash_entry *) bh;
+  myh->symbol_class = C_THUMBEXTFUNC;
+
+  free (tmp_name);
+
+  /* Allocate another symbol to mark where we switch to arm mode.  */
+
+#define CHANGE_TO_ARM "__%s_change_to_arm"
+#define BACK_FROM_ARM "__%s_back_from_arm"
+
+  amt = strlen (name) + strlen (CHANGE_TO_ARM) + 1;
+  tmp_name = bfd_malloc (amt);
+
+  BFD_ASSERT (tmp_name);
+
+  sprintf (tmp_name, globals->support_old_code ? BACK_FROM_ARM : CHANGE_TO_ARM, name);
+
+  bh = NULL;
+  val = globals->thumb_glue_size + (globals->support_old_code ? 8 : 4);
+  bfd_coff_link_add_one_symbol (info, globals->bfd_of_glue_owner, tmp_name,
+				BSF_LOCAL, s, val, NULL, TRUE, FALSE, &bh);
+
+  free (tmp_name);
+
+  globals->thumb_glue_size += THUMB2ARM_GLUE_SIZE;
+
+  return;
+}
+#endif /* not ARM_WINCE */
+
+/* Select a BFD to be used to hold the sections used by the glue code.
+   This function is called from the linker scripts in ld/emultempl/
+   {armcoff/pe}.em  */
+
+bfd_boolean
+bfd_arm_get_bfd_for_interworking (bfd * 		 abfd,
+				  struct bfd_link_info * info)
+{
+  struct coff_arm_link_hash_table * globals;
+  flagword   			    flags;
+  asection * 			    sec;
+
+  /* If we are only performing a partial link do not bother
+     getting a bfd to hold the glue.  */
+  if (info->relocatable)
+    return TRUE;
+
+  globals = coff_arm_hash_table (info);
+
+  BFD_ASSERT (globals != NULL);
+
+  if (globals->bfd_of_glue_owner != NULL)
+    return TRUE;
+
+  sec = bfd_get_section_by_name (abfd, ARM2THUMB_GLUE_SECTION_NAME);
+
+  if (sec == NULL)
+    {
+      flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	       | SEC_CODE | SEC_READONLY);
+      sec = bfd_make_section_with_flags (abfd, ARM2THUMB_GLUE_SECTION_NAME,
+					 flags);
+      if (sec == NULL
+	  || ! bfd_set_section_alignment (abfd, sec, 2))
+	return FALSE;
+    }
+
+  sec = bfd_get_section_by_name (abfd, THUMB2ARM_GLUE_SECTION_NAME);
+
+  if (sec == NULL)
+    {
+      flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	       | SEC_CODE | SEC_READONLY);
+      sec = bfd_make_section_with_flags (abfd, THUMB2ARM_GLUE_SECTION_NAME,
+					 flags);
+
+      if (sec == NULL
+	  || ! bfd_set_section_alignment (abfd, sec, 2))
+	return FALSE;
+    }
+
+  /* Save the bfd for later use.  */
+  globals->bfd_of_glue_owner = abfd;
+
+  return TRUE;
+}
+
+bfd_boolean
+bfd_arm_process_before_allocation (bfd *                   abfd,
+				   struct bfd_link_info *  info,
+				   int		           support_old_code)
+{
+  asection * sec;
+  struct coff_arm_link_hash_table * globals;
+
+  /* If we are only performing a partial link do not bother
+     to construct any glue.  */
+  if (info->relocatable)
+    return TRUE;
+
+  /* Here we have a bfd that is to be included on the link.  We have a hook
+     to do reloc rummaging, before section sizes are nailed down.  */
+  _bfd_coff_get_external_symbols (abfd);
+
+  globals = coff_arm_hash_table (info);
+
+  BFD_ASSERT (globals != NULL);
+  BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
+
+  globals->support_old_code = support_old_code;
+
+  /* Rummage around all the relocs and map the glue vectors.  */
+  sec = abfd->sections;
+
+  if (sec == NULL)
+    return TRUE;
+
+  for (; sec != NULL; sec = sec->next)
+    {
+      struct internal_reloc * i;
+      struct internal_reloc * rel;
+
+      if (sec->reloc_count == 0)
+	continue;
+
+      /* Load the relocs.  */
+      /* FIXME: there may be a storage leak here.  */
+      i = _bfd_coff_read_internal_relocs (abfd, sec, 1, 0, 0, 0);
+
+      BFD_ASSERT (i != 0);
+
+      for (rel = i; rel < i + sec->reloc_count; ++rel)
+	{
+	  unsigned short                 r_type  = rel->r_type;
+	  long                           symndx;
+	  struct coff_link_hash_entry *  h;
+
+	  symndx = rel->r_symndx;
+
+	  /* If the relocation is not against a symbol it cannot concern us.  */
+	  if (symndx == -1)
+	    continue;
+
+	  /* If the index is outside of the range of our table, something has gone wrong.  */
+	  if (symndx >= obj_conv_table_size (abfd))
+	    {
+	      _bfd_error_handler (_("%B: illegal symbol index in reloc: %d"),
+				  abfd, symndx);
+	      continue;
+	    }
+
+	  h = obj_coff_sym_hashes (abfd)[symndx];
+
+	  /* If the relocation is against a static symbol it must be within
+	     the current section and so cannot be a cross ARM/Thumb relocation.  */
+	  if (h == NULL)
+	    continue;
+
+	  switch (r_type)
+	    {
+	    case ARM_26:
+	      /* This one is a call from arm code.  We need to look up
+		 the target of the call. If it is a thumb target, we
+		 insert glue.  */
+
+	      if (h->symbol_class == C_THUMBEXTFUNC)
+		record_arm_to_thumb_glue (info, h);
+	      break;
+
+#ifndef ARM_WINCE
+	    case ARM_THUMB23:
+	      /* This one is a call from thumb code.  We used to look
+		 for ARM_THUMB9 and ARM_THUMB12 as well.  We need to look
+		 up the target of the call. If it is an arm target, we
+		 insert glue.  If the symbol does not exist it will be
+		 given a class of C_EXT and so we will generate a stub
+		 for it.  This is not really a problem, since the link
+		 is doomed anyway.  */
+
+	      switch (h->symbol_class)
+		{
+		case C_EXT:
+		case C_STAT:
+		case C_LABEL:
+		  record_thumb_to_arm_glue (info, h);
+		  break;
+		default:
+		  ;
+		}
+	      break;
+#endif
+
+	    default:
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+#endif /* ! defined (COFF_IMAGE_WITH_PE) */
+
+#define coff_bfd_reloc_type_lookup 		coff_arm_reloc_type_lookup
+#define coff_bfd_reloc_name_lookup	coff_arm_reloc_name_lookup
+#define coff_relocate_section 			coff_arm_relocate_section
+#define coff_bfd_is_local_label_name 		coff_arm_is_local_label_name
+#define coff_adjust_symndx			coff_arm_adjust_symndx
+#define coff_link_output_has_begun 		coff_arm_link_output_has_begun
+#define coff_final_link_postscript		coff_arm_final_link_postscript
+#define coff_bfd_merge_private_bfd_data		coff_arm_merge_private_bfd_data
+#define coff_bfd_print_private_bfd_data		coff_arm_print_private_bfd_data
+#define coff_bfd_set_private_flags              _bfd_coff_arm_set_private_flags
+#define coff_bfd_copy_private_bfd_data          coff_arm_copy_private_bfd_data
+#define coff_bfd_link_hash_table_create		coff_arm_link_hash_table_create
+
+/* When doing a relocatable link, we want to convert ARM_26 relocs
+   into ARM_26D relocs.  */
+
+static bfd_boolean
+coff_arm_adjust_symndx (bfd *obfd ATTRIBUTE_UNUSED,
+			struct bfd_link_info *info ATTRIBUTE_UNUSED,
+			bfd *ibfd,
+			asection *sec,
+			struct internal_reloc *irel,
+			bfd_boolean *adjustedp)
+{
+  if (irel->r_type == ARM_26)
+    {
+      struct coff_link_hash_entry *h;
+
+      h = obj_coff_sym_hashes (ibfd)[irel->r_symndx];
+      if (h != NULL
+	  && (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	  && h->root.u.def.section->output_section == sec->output_section)
+	irel->r_type = ARM_26D;
+    }
+  *adjustedp = FALSE;
+  return TRUE;
+}
+
+/* Called when merging the private data areas of two BFDs.
+   This is important as it allows us to detect if we are
+   attempting to merge binaries compiled for different ARM
+   targets, eg different CPUs or different APCS's.     */
+
+static bfd_boolean
+coff_arm_merge_private_bfd_data (bfd * ibfd, bfd * obfd)
+{
+  BFD_ASSERT (ibfd != NULL && obfd != NULL);
+
+  if (ibfd == obfd)
+    return TRUE;
+
+  /* If the two formats are different we cannot merge anything.
+     This is not an error, since it is permissable to change the
+     input and output formats.  */
+  if (   ibfd->xvec->flavour != bfd_target_coff_flavour
+      || obfd->xvec->flavour != bfd_target_coff_flavour)
+    return TRUE;
+
+  /* Determine what should happen if the input ARM architecture
+     does not match the output ARM architecture.  */
+  if (! bfd_arm_merge_machines (ibfd, obfd))
+    return FALSE;
+
+  /* Verify that the APCS is the same for the two BFDs.  */
+  if (APCS_SET (ibfd))
+    {
+      if (APCS_SET (obfd))
+	{
+	  /* If the src and dest have different APCS flag bits set, fail.  */
+	  if (APCS_26_FLAG (obfd) != APCS_26_FLAG (ibfd))
+	    {
+	      _bfd_error_handler
+		/* xgettext: c-format */
+		(_("error: %B is compiled for APCS-%d, whereas %B is compiled for APCS-%d"),
+		 ibfd, obfd,
+		 APCS_26_FLAG (ibfd) ? 26 : 32,
+		 APCS_26_FLAG (obfd) ? 26 : 32
+		 );
+
+	      bfd_set_error (bfd_error_wrong_format);
+	      return FALSE;
+	    }
+
+	  if (APCS_FLOAT_FLAG (obfd) != APCS_FLOAT_FLAG (ibfd))
+	    {
+	      const char *msg;
+
+	      if (APCS_FLOAT_FLAG (ibfd))
+		/* xgettext: c-format */
+		msg = _("error: %B passes floats in float registers, whereas %B passes them in integer registers");
+	      else
+		/* xgettext: c-format */
+		msg = _("error: %B passes floats in integer registers, whereas %B passes them in float registers");
+
+	      _bfd_error_handler (msg, ibfd, obfd);
+
+	      bfd_set_error (bfd_error_wrong_format);
+	      return FALSE;
+	    }
+
+	  if (PIC_FLAG (obfd) != PIC_FLAG (ibfd))
+	    {
+	      const char * msg;
+
+	      if (PIC_FLAG (ibfd))
+		/* xgettext: c-format */
+		msg = _("error: %B is compiled as position independent code, whereas target %B is absolute position");
+	      else
+		/* xgettext: c-format */
+		msg = _("error: %B is compiled as absolute position code, whereas target %B is position independent");
+	      _bfd_error_handler (msg, ibfd, obfd);
+
+	      bfd_set_error (bfd_error_wrong_format);
+	      return FALSE;
+	    }
+	}
+      else
+	{
+	  SET_APCS_FLAGS (obfd, APCS_26_FLAG (ibfd) | APCS_FLOAT_FLAG (ibfd) | PIC_FLAG (ibfd));
+
+	  /* Set up the arch and fields as well as these are probably wrong.  */
+	  bfd_set_arch_mach (obfd, bfd_get_arch (ibfd), bfd_get_mach (ibfd));
+	}
+    }
+
+  /* Check the interworking support.  */
+  if (INTERWORK_SET (ibfd))
+    {
+      if (INTERWORK_SET (obfd))
+	{
+	  /* If the src and dest differ in their interworking issue a warning.  */
+	  if (INTERWORK_FLAG (obfd) != INTERWORK_FLAG (ibfd))
+	    {
+	      const char * msg;
+
+	      if (INTERWORK_FLAG (ibfd))
+		/* xgettext: c-format */
+		msg = _("Warning: %B supports interworking, whereas %B does not");
+	      else
+		/* xgettext: c-format */
+		msg = _("Warning: %B does not support interworking, whereas %B does");
+
+	      _bfd_error_handler (msg, ibfd, obfd);
+	    }
+	}
+      else
+	{
+	  SET_INTERWORK_FLAG (obfd, INTERWORK_FLAG (ibfd));
+	}
+    }
+
+  return TRUE;
+}
+
+/* Display the flags field.  */
+
+static bfd_boolean
+coff_arm_print_private_bfd_data (bfd * abfd, void * ptr)
+{
+  FILE * file = (FILE *) ptr;
+
+  BFD_ASSERT (abfd != NULL && ptr != NULL);
+
+  /* xgettext:c-format */
+  fprintf (file, _("private flags = %x:"), coff_data (abfd)->flags);
+
+  if (APCS_SET (abfd))
+    {
+      /* xgettext: APCS is ARM Procedure Call Standard, it should not be translated.  */
+      fprintf (file, " [APCS-%d]", APCS_26_FLAG (abfd) ? 26 : 32);
+
+      if (APCS_FLOAT_FLAG (abfd))
+	fprintf (file, _(" [floats passed in float registers]"));
+      else
+	fprintf (file, _(" [floats passed in integer registers]"));
+
+      if (PIC_FLAG (abfd))
+	fprintf (file, _(" [position independent]"));
+      else
+	fprintf (file, _(" [absolute position]"));
+    }
+
+  if (! INTERWORK_SET (abfd))
+    fprintf (file, _(" [interworking flag not initialised]"));
+  else if (INTERWORK_FLAG (abfd))
+    fprintf (file, _(" [interworking supported]"));
+  else
+    fprintf (file, _(" [interworking not supported]"));
+
+  fputc ('\n', file);
+
+  return TRUE;
+}
+
+/* Copies the given flags into the coff_tdata.flags field.
+   Typically these flags come from the f_flags[] field of
+   the COFF filehdr structure, which contains important,
+   target specific information.
+   Note: Although this function is static, it is explicitly
+   called from both coffcode.h and peicode.h.  */
+
+static bfd_boolean
+_bfd_coff_arm_set_private_flags (bfd * abfd, flagword flags)
+{
+  flagword flag;
+
+  BFD_ASSERT (abfd != NULL);
+
+  flag = (flags & F_APCS26) ? F_APCS_26 : 0;
+
+  /* Make sure that the APCS field has not been initialised to the opposite
+     value.  */
+  if (APCS_SET (abfd)
+      && (   (APCS_26_FLAG    (abfd) != flag)
+	  || (APCS_FLOAT_FLAG (abfd) != (flags & F_APCS_FLOAT))
+	  || (PIC_FLAG        (abfd) != (flags & F_PIC))
+	  ))
+    return FALSE;
+
+  flag |= (flags & (F_APCS_FLOAT | F_PIC));
+
+  SET_APCS_FLAGS (abfd, flag);
+
+  flag = (flags & F_INTERWORK);
+
+  /* If the BFD has already had its interworking flag set, but it
+     is different from the value that we have been asked to set,
+     then assume that that merged code will not support interworking
+     and set the flag accordingly.  */
+  if (INTERWORK_SET (abfd) && (INTERWORK_FLAG (abfd) != flag))
+    {
+      if (flag)
+	/* xgettext: c-format */
+	_bfd_error_handler (_("Warning: Not setting interworking flag of %B since it has already been specified as non-interworking"),
+			    abfd);
+      else
+	/* xgettext: c-format */
+	_bfd_error_handler (_("Warning: Clearing the interworking flag of %B due to outside request"),
+			    abfd);
+      flag = 0;
+    }
+
+  SET_INTERWORK_FLAG (abfd, flag);
+
+  return TRUE;
+}
+
+/* Copy the important parts of the target specific data
+   from one instance of a BFD to another.  */
+
+static bfd_boolean
+coff_arm_copy_private_bfd_data (bfd * src, bfd * dest)
+{
+  BFD_ASSERT (src != NULL && dest != NULL);
+
+  if (src == dest)
+    return TRUE;
+
+  /* If the destination is not in the same format as the source, do not do
+     the copy.  */
+  if (src->xvec != dest->xvec)
+    return TRUE;
+
+  /* Copy the flags field.  */
+  if (APCS_SET (src))
+    {
+      if (APCS_SET (dest))
+	{
+	  /* If the src and dest have different APCS flag bits set, fail.  */
+	  if (APCS_26_FLAG (dest) != APCS_26_FLAG (src))
+	    return FALSE;
+
+	  if (APCS_FLOAT_FLAG (dest) != APCS_FLOAT_FLAG (src))
+	    return FALSE;
+
+	  if (PIC_FLAG (dest) != PIC_FLAG (src))
+	    return FALSE;
+	}
+      else
+	SET_APCS_FLAGS (dest, APCS_26_FLAG (src) | APCS_FLOAT_FLAG (src)
+			| PIC_FLAG (src));
+    }
+
+  if (INTERWORK_SET (src))
+    {
+      if (INTERWORK_SET (dest))
+	{
+	  /* If the src and dest have different interworking flags then turn
+	     off the interworking bit.  */
+	  if (INTERWORK_FLAG (dest) != INTERWORK_FLAG (src))
+	    {
+	      if (INTERWORK_FLAG (dest))
+		{
+		  /* xgettext:c-format */
+		  _bfd_error_handler (("\
+Warning: Clearing the interworking flag of %B because non-interworking code in %B has been linked with it"),
+				      dest, src);
+		}
+
+	      SET_INTERWORK_FLAG (dest, 0);
+	    }
+	}
+      else
+	{
+	  SET_INTERWORK_FLAG (dest, INTERWORK_FLAG (src));
+	}
+    }
+
+  return TRUE;
+}
+
+/* Note:  the definitions here of LOCAL_LABEL_PREFIX and USER_LABEL_PREIFX
+   *must* match the definitions in gcc/config/arm/{coff|semi|aout}.h.  */
+#ifndef LOCAL_LABEL_PREFIX
+#define LOCAL_LABEL_PREFIX ""
+#endif
+#ifndef USER_LABEL_PREFIX
+#define USER_LABEL_PREFIX "_"
+#endif
+
+/* Like _bfd_coff_is_local_label_name, but
+   a) test against USER_LABEL_PREFIX, to avoid stripping labels known to be
+      non-local.
+   b) Allow other prefixes than ".", e.g. an empty prefix would cause all
+      labels of the form Lxxx to be stripped.  */
+
+static bfd_boolean
+coff_arm_is_local_label_name (bfd *        abfd ATTRIBUTE_UNUSED,
+			      const char * name)
+{
+#ifdef USER_LABEL_PREFIX
+  if (USER_LABEL_PREFIX[0] != 0)
+    {
+      size_t len = strlen (USER_LABEL_PREFIX);
+
+      if (strncmp (name, USER_LABEL_PREFIX, len) == 0)
+	return FALSE;
+    }
+#endif
+
+#ifdef LOCAL_LABEL_PREFIX
+  /* If there is a prefix for local labels then look for this.
+     If the prefix exists, but it is empty, then ignore the test.  */
+
+  if (LOCAL_LABEL_PREFIX[0] != 0)
+    {
+      size_t len = strlen (LOCAL_LABEL_PREFIX);
+
+      if (strncmp (name, LOCAL_LABEL_PREFIX, len) != 0)
+	return FALSE;
+
+      /* Perform the checks below for the rest of the name.  */
+      name += len;
+    }
+#endif
+
+  return name[0] == 'L';
+}
+
+/* This piece of machinery exists only to guarantee that the bfd that holds
+   the glue section is written last.
+
+   This does depend on bfd_make_section attaching a new section to the
+   end of the section list for the bfd.  */
+
+static bfd_boolean
+coff_arm_link_output_has_begun (bfd * sub, struct coff_final_link_info * info)
+{
+  return (sub->output_has_begun
+	  || sub == coff_arm_hash_table (info->info)->bfd_of_glue_owner);
+}
+
+static bfd_boolean
+coff_arm_final_link_postscript (bfd * abfd ATTRIBUTE_UNUSED,
+				struct coff_final_link_info * pfinfo)
+{
+  struct coff_arm_link_hash_table * globals;
+
+  globals = coff_arm_hash_table (pfinfo->info);
+
+  BFD_ASSERT (globals != NULL);
+
+  if (globals->bfd_of_glue_owner != NULL)
+    {
+      if (! _bfd_coff_link_input_bfd (pfinfo, globals->bfd_of_glue_owner))
+	return FALSE;
+
+      globals->bfd_of_glue_owner->output_has_begun = TRUE;
+    }
+
+  return bfd_arm_update_notes (abfd, ARM_NOTE_SECTION);
+}
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coffcode.h"
+
+#ifndef TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM armcoff_little_vec
+#endif
+#ifndef TARGET_LITTLE_NAME
+#define TARGET_LITTLE_NAME "coff-arm-little"
+#endif
+#ifndef TARGET_BIG_SYM
+#define TARGET_BIG_SYM armcoff_big_vec
+#endif
+#ifndef TARGET_BIG_NAME
+#define TARGET_BIG_NAME "coff-arm-big"
+#endif
+
+#ifndef TARGET_UNDERSCORE
+#define TARGET_UNDERSCORE 0
+#endif
+
+#ifndef EXTRA_S_FLAGS
+#ifdef COFF_WITH_PE
+#define EXTRA_S_FLAGS (SEC_CODE | SEC_LINK_ONCE | SEC_LINK_DUPLICATES)
+#else
+#define EXTRA_S_FLAGS SEC_CODE
+#endif
+#endif
+
+/* Forward declaration for use initialising alternative_target field.  */
+extern const bfd_target TARGET_BIG_SYM ;
+
+/* Target vectors.  */
+CREATE_LITTLE_COFF_TARGET_VEC (TARGET_LITTLE_SYM, TARGET_LITTLE_NAME, D_PAGED, EXTRA_S_FLAGS, TARGET_UNDERSCORE, & TARGET_BIG_SYM, COFF_SWAP_TABLE)
+CREATE_BIG_COFF_TARGET_VEC (TARGET_BIG_SYM, TARGET_BIG_NAME, D_PAGED, EXTRA_S_FLAGS, TARGET_UNDERSCORE, & TARGET_LITTLE_SYM, COFF_SWAP_TABLE)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-aux.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-aux.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-aux.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-aux.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,142 @@
+/* BFD back-end for Apple M68K COFF A/UX 3.x files.
+   Copyright 1996, 1997, 2000, 2002, 2005, 2007, 2008, 2011
+   Free Software Foundation, Inc.
+   Written by Richard Henderson <rth@tamu.edu>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define TARGET_SYM	m68kaux_coff_vec
+#define TARGET_NAME	"coff-m68k-aux"
+
+#ifndef TARG_AUX
+#define TARG_AUX
+#endif
+
+#define COFF_LONG_FILENAMES
+
+/* 4k pages */
+#define COFF_PAGE_SIZE 0x1000
+
+/* On AUX, a STYP_NOLOAD|STYP_BSS section is part of a shared library.  */
+#define BSS_NOLOAD_IS_SHARED_LIBRARY
+
+#define STATIC_RELOCS
+
+#define COFF_COMMON_ADDEND
+
+#include "sysdep.h"
+#include "bfd.h"
+
+static bfd_boolean coff_m68k_aux_link_add_one_symbol
+  PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword,
+           asection *, bfd_vma, const char *, bfd_boolean, bfd_boolean,
+           struct bfd_link_hash_entry **));
+
+#define coff_link_add_one_symbol coff_m68k_aux_link_add_one_symbol
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coff/aux-coff.h"  /* override coff/internal.h and coff/m68k.h */
+#include "coff-m68k.c"
+
+/* We need non-absolute symbols to override absolute symbols.  This
+   mirrors Apple's "solution" to let a static library symbol override
+   a shared library symbol.  On the whole not a good thing, given how
+   shared libraries work here, but can work if you are careful with
+   what you include in the shared object.  */
+
+static bfd_boolean
+coff_m68k_aux_link_add_one_symbol (info, abfd, name, flags, section, value,
+				   string, copy, collect, hashp)
+     struct bfd_link_info *info;
+     bfd *abfd;
+     const char *name;
+     flagword flags;
+     asection *section;
+     bfd_vma value;
+     const char *string;
+     bfd_boolean copy;
+     bfd_boolean collect;
+     struct bfd_link_hash_entry **hashp;
+{
+  struct bfd_link_hash_entry *h;
+
+  if ((flags & (BSF_WARNING | BSF_CONSTRUCTOR | BSF_WEAK)) == 0 &&
+      !bfd_is_und_section (section) &&
+      !bfd_is_com_section (section))
+    {
+      /* The new symbol is a definition or an indirect definition */
+
+      /* This bit copied from linker.c */
+      if (hashp != NULL && *hashp != NULL)
+	{
+	  h = *hashp;
+	  BFD_ASSERT (strcmp (h->root.string, name) == 0);
+	}
+      else
+	{
+	  h = bfd_link_hash_lookup (info->hash, name, TRUE, copy, FALSE);
+	  if (h == NULL)
+	    {
+	      if (hashp != NULL)
+		*hashp = NULL;
+	      return FALSE;
+	    }
+	}
+
+      if (info->notice_hash != (struct bfd_hash_table *) NULL
+	  && (bfd_hash_lookup (info->notice_hash, name, FALSE, FALSE)
+	      != (struct bfd_hash_entry *) NULL))
+	{
+	  if (! (*info->callbacks->notice) (info, h, abfd, section, value,
+					    flags, string))
+	    return FALSE;
+	}
+
+      if (hashp != (struct bfd_link_hash_entry **) NULL)
+	*hashp = h;
+      /* end duplication from linker.c */
+
+      if (h->type == bfd_link_hash_defined
+	  || h->type == bfd_link_hash_indirect)
+	{
+	  asection *msec;
+
+	  if (h->type == bfd_link_hash_defined)
+	    msec = h->u.def.section;
+	  else
+	    msec = bfd_ind_section_ptr;
+
+	  if (bfd_is_abs_section (msec) && !bfd_is_abs_section (section))
+	    {
+	      h->u.def.section = section;
+	      h->u.def.value = value;
+	      return TRUE;
+	    }
+	  else if (bfd_is_abs_section (section) && !bfd_is_abs_section (msec))
+	    return TRUE;
+	}
+    }
+
+  /* If we didn't exit early, finish processing in the generic routine */
+  return _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section,
+					   value, string, copy, collect,
+					   hashp);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-go32.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-go32.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-go32.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-go32.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,46 @@
+/* BFD back-end for Intel 386 COFF files (DJGPP variant).
+   Copyright 1990, 1991, 1992, 1993, 1994, 1999, 2000, 2001, 2005, 2007
+   Free Software Foundation, Inc.
+   Written by DJ Delorie.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define TARGET_SYM		go32coff_vec
+#define TARGET_NAME		"coff-go32"
+#define TARGET_UNDERSCORE	'_'
+#define COFF_LONG_SECTION_NAMES
+#define COFF_SUPPORT_GNU_LINKONCE
+#define COFF_LONG_FILENAMES
+
+#define COFF_SECTION_ALIGNMENT_ENTRIES \
+{ COFF_SECTION_NAME_EXACT_MATCH (".data"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 4 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".text"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 4 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.d"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 4 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.t"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 4 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.r"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 4 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".debug"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
+
+#include "coff-i386.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-h8300.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-h8300.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-h8300.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-h8300.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1445 @@
+/* BFD back-end for Renesas H8/300 COFF binaries.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+   Free Software Foundation, Inc.
+   Written by Steve Chamberlain, <sac@cygnus.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "bfdlink.h"
+#include "genlink.h"
+#include "coff/h8300.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+#include "libiberty.h"
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (1)
+
+/* We derive a hash table from the basic BFD hash table to
+   hold entries in the function vector.  Aside from the
+   info stored by the basic hash table, we need the offset
+   of a particular entry within the hash table as well as
+   the offset where we'll add the next entry.  */
+
+struct funcvec_hash_entry
+  {
+    /* The basic hash table entry.  */
+    struct bfd_hash_entry root;
+
+    /* The offset within the vectors section where
+       this entry lives.  */
+    bfd_vma offset;
+  };
+
+struct funcvec_hash_table
+  {
+    /* The basic hash table.  */
+    struct bfd_hash_table root;
+
+    bfd *abfd;
+
+    /* Offset at which we'll add the next entry.  */
+    unsigned int offset;
+  };
+
+static struct bfd_hash_entry *
+funcvec_hash_newfunc
+  (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
+
+static bfd_reloc_status_type special
+  (bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **);
+static int select_reloc
+  (reloc_howto_type *);
+static void rtype2howto
+  (arelent *, struct internal_reloc *);
+static void reloc_processing
+  (arelent *, struct internal_reloc *, asymbol **, bfd *, asection *);
+static bfd_boolean h8300_symbol_address_p
+  (bfd *, asection *, bfd_vma);
+static int h8300_reloc16_estimate
+  (bfd *, asection *, arelent *, unsigned int,
+   struct bfd_link_info *);
+static void h8300_reloc16_extra_cases
+  (bfd *, struct bfd_link_info *, struct bfd_link_order *, arelent *,
+   bfd_byte *, unsigned int *, unsigned int *);
+static bfd_boolean h8300_bfd_link_add_symbols
+  (bfd *, struct bfd_link_info *);
+
+/* To lookup a value in the function vector hash table.  */
+#define funcvec_hash_lookup(table, string, create, copy) \
+  ((struct funcvec_hash_entry *) \
+   bfd_hash_lookup (&(table)->root, (string), (create), (copy)))
+
+/* The derived h8300 COFF linker table.  Note it's derived from
+   the generic linker hash table, not the COFF backend linker hash
+   table!  We use this to attach additional data structures we
+   need while linking on the h8300.  */
+struct h8300_coff_link_hash_table {
+  /* The main hash table.  */
+  struct generic_link_hash_table root;
+
+  /* Section for the vectors table.  This gets attached to a
+     random input bfd, we keep it here for easy access.  */
+  asection *vectors_sec;
+
+  /* Hash table of the functions we need to enter into the function
+     vector.  */
+  struct funcvec_hash_table *funcvec_hash_table;
+};
+
+static struct bfd_link_hash_table *h8300_coff_link_hash_table_create (bfd *);
+
+/* Get the H8/300 COFF linker hash table from a link_info structure.  */
+
+#define h8300_coff_hash_table(p) \
+  ((struct h8300_coff_link_hash_table *) ((coff_hash_table (p))))
+
+/* Initialize fields within a funcvec hash table entry.  Called whenever
+   a new entry is added to the funcvec hash table.  */
+
+static struct bfd_hash_entry *
+funcvec_hash_newfunc (struct bfd_hash_entry *entry,
+		      struct bfd_hash_table *gen_table,
+		      const char *string)
+{
+  struct funcvec_hash_entry *ret;
+  struct funcvec_hash_table *table;
+
+  ret = (struct funcvec_hash_entry *) entry;
+  table = (struct funcvec_hash_table *) gen_table;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = ((struct funcvec_hash_entry *)
+	   bfd_hash_allocate (gen_table,
+			      sizeof (struct funcvec_hash_entry)));
+  if (ret == NULL)
+    return NULL;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct funcvec_hash_entry *)
+	 bfd_hash_newfunc ((struct bfd_hash_entry *) ret, gen_table, string));
+
+  if (ret == NULL)
+    return NULL;
+
+  /* Note where this entry will reside in the function vector table.  */
+  ret->offset = table->offset;
+
+  /* Bump the offset at which we store entries in the function
+     vector.  We'd like to bump up the size of the vectors section,
+     but it's not easily available here.  */
+ switch (bfd_get_mach (table->abfd))
+   {
+   case bfd_mach_h8300:
+   case bfd_mach_h8300hn:
+   case bfd_mach_h8300sn:
+     table->offset += 2;
+     break;
+   case bfd_mach_h8300h:
+   case bfd_mach_h8300s:
+     table->offset += 4;
+     break;
+   default:
+     return NULL;
+   }
+
+  /* Everything went OK.  */
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Initialize the function vector hash table.  */
+
+static bfd_boolean
+funcvec_hash_table_init (struct funcvec_hash_table *table,
+			 bfd *abfd,
+			 struct bfd_hash_entry *(*newfunc)
+			   (struct bfd_hash_entry *,
+			    struct bfd_hash_table *,
+			    const char *),
+			 unsigned int entsize)
+{
+  /* Initialize our local fields, then call the generic initialization
+     routine.  */
+  table->offset = 0;
+  table->abfd = abfd;
+  return (bfd_hash_table_init (&table->root, newfunc, entsize));
+}
+
+/* Create the derived linker hash table.  We use a derived hash table
+   basically to hold "static" information during an H8/300 coff link
+   without using static variables.  */
+
+static struct bfd_link_hash_table *
+h8300_coff_link_hash_table_create (bfd *abfd)
+{
+  struct h8300_coff_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct h8300_coff_link_hash_table);
+
+  ret = (struct h8300_coff_link_hash_table *) bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+  if (!_bfd_link_hash_table_init (&ret->root.root, abfd,
+				  _bfd_generic_link_hash_newfunc,
+				  sizeof (struct generic_link_hash_entry)))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  /* Initialize our data.  */
+  ret->vectors_sec = NULL;
+  ret->funcvec_hash_table = NULL;
+
+  /* OK.  Everything's initialized, return the base pointer.  */
+  return &ret->root.root;
+}
+
+/* Special handling for H8/300 relocs.
+   We only come here for pcrel stuff and return normally if not an -r link.
+   When doing -r, we can't do any arithmetic for the pcrel stuff, because
+   the code in reloc.c assumes that we can manipulate the targets of
+   the pcrel branches.  This isn't so, since the H8/300 can do relaxing,
+   which means that the gap after the instruction may not be enough to
+   contain the offset required for the branch, so we have to use only
+   the addend until the final link.  */
+
+static bfd_reloc_status_type
+special (bfd *abfd ATTRIBUTE_UNUSED,
+	 arelent *reloc_entry ATTRIBUTE_UNUSED,
+	 asymbol *symbol ATTRIBUTE_UNUSED,
+	 PTR data ATTRIBUTE_UNUSED,
+	 asection *input_section ATTRIBUTE_UNUSED,
+	 bfd *output_bfd,
+	 char **error_message ATTRIBUTE_UNUSED)
+{
+  if (output_bfd == (bfd *) NULL)
+    return bfd_reloc_continue;
+
+  /* Adjust the reloc address to that in the output section.  */
+  reloc_entry->address += input_section->output_offset;
+  return bfd_reloc_ok;
+}
+
+static reloc_howto_type howto_table[] = {
+  HOWTO (R_RELBYTE, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, special, "8", FALSE, 0x000000ff, 0x000000ff, FALSE),
+  HOWTO (R_RELWORD, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, special, "16", FALSE, 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (R_RELLONG, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, special, "32", FALSE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO (R_PCRBYTE, 0, 0, 8, TRUE, 0, complain_overflow_signed, special, "DISP8", FALSE, 0x000000ff, 0x000000ff, TRUE),
+  HOWTO (R_PCRWORD, 0, 1, 16, TRUE, 0, complain_overflow_signed, special, "DISP16", FALSE, 0x0000ffff, 0x0000ffff, TRUE),
+  HOWTO (R_PCRLONG, 0, 2, 32, TRUE, 0, complain_overflow_signed, special, "DISP32", FALSE, 0xffffffff, 0xffffffff, TRUE),
+  HOWTO (R_MOV16B1, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, special, "relaxable mov.b:16", FALSE, 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (R_MOV16B2, 0, 1, 8, FALSE, 0, complain_overflow_bitfield, special, "relaxed mov.b:16", FALSE, 0x000000ff, 0x000000ff, FALSE),
+  HOWTO (R_JMP1, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, special, "16/pcrel", FALSE, 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (R_JMP2, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, special, "pcrecl/16", FALSE, 0x000000ff, 0x000000ff, FALSE),
+  HOWTO (R_JMPL1, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, special, "24/pcrell", FALSE, 0x00ffffff, 0x00ffffff, FALSE),
+  HOWTO (R_JMPL2, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, special, "pc8/24", FALSE, 0x000000ff, 0x000000ff, FALSE),
+  HOWTO (R_MOV24B1, 0, 1, 32, FALSE, 0, complain_overflow_bitfield, special, "relaxable mov.b:24", FALSE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO (R_MOV24B2, 0, 1, 8, FALSE, 0, complain_overflow_bitfield, special, "relaxed mov.b:24", FALSE, 0x0000ffff, 0x0000ffff, FALSE),
+
+  /* An indirect reference to a function.  This causes the function's address
+     to be added to the function vector in lo-mem and puts the address of
+     the function vector's entry in the jsr instruction.  */
+  HOWTO (R_MEM_INDIRECT, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, special, "8/indirect", FALSE, 0x000000ff, 0x000000ff, FALSE),
+
+  /* Internal reloc for relaxing.  This is created when a 16-bit pc-relative
+     branch is turned into an 8-bit pc-relative branch.  */
+  HOWTO (R_PCRWORD_B, 0, 0, 8, TRUE, 0, complain_overflow_bitfield, special, "relaxed bCC:16", FALSE, 0x000000ff, 0x000000ff, FALSE),
+
+  HOWTO (R_MOVL1, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,special, "32/24 relaxable move", FALSE, 0xffffffff, 0xffffffff, FALSE),
+
+  HOWTO (R_MOVL2, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, special, "32/24 relaxed move", FALSE, 0x0000ffff, 0x0000ffff, FALSE),
+
+  HOWTO (R_BCC_INV, 0, 0, 8, TRUE, 0, complain_overflow_signed, special, "DISP8 inverted", FALSE, 0x000000ff, 0x000000ff, TRUE),
+
+  HOWTO (R_JMP_DEL, 0, 0, 8, TRUE, 0, complain_overflow_signed, special, "Deleted jump", FALSE, 0x000000ff, 0x000000ff, TRUE),
+};
+
+/* Turn a howto into a reloc number.  */
+
+#define SELECT_RELOC(x,howto) \
+  { x.r_type = select_reloc (howto); }
+
+#define BADMAG(x) (H8300BADMAG (x) && H8300HBADMAG (x) && H8300SBADMAG (x) \
+				   && H8300HNBADMAG(x) && H8300SNBADMAG(x))
+#define H8300 1			/* Customize coffcode.h  */
+#define __A_MAGIC_SET__
+
+/* Code to swap in the reloc.  */
+#define SWAP_IN_RELOC_OFFSET	H_GET_32
+#define SWAP_OUT_RELOC_OFFSET	H_PUT_32
+#define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) \
+  dst->r_stuff[0] = 'S'; \
+  dst->r_stuff[1] = 'C';
+
+static int
+select_reloc (reloc_howto_type *howto)
+{
+  return howto->type;
+}
+
+/* Code to turn a r_type into a howto ptr, uses the above howto table.  */
+
+static void
+rtype2howto (arelent *internal, struct internal_reloc *dst)
+{
+  switch (dst->r_type)
+    {
+    case R_RELBYTE:
+      internal->howto = howto_table + 0;
+      break;
+    case R_RELWORD:
+      internal->howto = howto_table + 1;
+      break;
+    case R_RELLONG:
+      internal->howto = howto_table + 2;
+      break;
+    case R_PCRBYTE:
+      internal->howto = howto_table + 3;
+      break;
+    case R_PCRWORD:
+      internal->howto = howto_table + 4;
+      break;
+    case R_PCRLONG:
+      internal->howto = howto_table + 5;
+      break;
+    case R_MOV16B1:
+      internal->howto = howto_table + 6;
+      break;
+    case R_MOV16B2:
+      internal->howto = howto_table + 7;
+      break;
+    case R_JMP1:
+      internal->howto = howto_table + 8;
+      break;
+    case R_JMP2:
+      internal->howto = howto_table + 9;
+      break;
+    case R_JMPL1:
+      internal->howto = howto_table + 10;
+      break;
+    case R_JMPL2:
+      internal->howto = howto_table + 11;
+      break;
+    case R_MOV24B1:
+      internal->howto = howto_table + 12;
+      break;
+    case R_MOV24B2:
+      internal->howto = howto_table + 13;
+      break;
+    case R_MEM_INDIRECT:
+      internal->howto = howto_table + 14;
+      break;
+    case R_PCRWORD_B:
+      internal->howto = howto_table + 15;
+      break;
+    case R_MOVL1:
+      internal->howto = howto_table + 16;
+      break;
+    case R_MOVL2:
+      internal->howto = howto_table + 17;
+      break;
+    case R_BCC_INV:
+      internal->howto = howto_table + 18;
+      break;
+    case R_JMP_DEL:
+      internal->howto = howto_table + 19;
+      break;
+    default:
+      abort ();
+      break;
+    }
+}
+
+#define RTYPE2HOWTO(internal, relocentry) rtype2howto (internal, relocentry)
+
+/* Perform any necessary magic to the addend in a reloc entry.  */
+
+#define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \
+ cache_ptr->addend = ext_reloc.r_offset;
+
+#define RELOC_PROCESSING(relent,reloc,symbols,abfd,section) \
+ reloc_processing (relent, reloc, symbols, abfd, section)
+
+static void
+reloc_processing (arelent *relent, struct internal_reloc *reloc,
+		  asymbol **symbols, bfd *abfd, asection *section)
+{
+  relent->address = reloc->r_vaddr;
+  rtype2howto (relent, reloc);
+
+  if (((int) reloc->r_symndx) > 0)
+    relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
+  else
+    relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+
+  relent->addend = reloc->r_offset;
+  relent->address -= section->vma;
+}
+
+static bfd_boolean
+h8300_symbol_address_p (bfd *abfd, asection *input_section, bfd_vma address)
+{
+  asymbol **s;
+
+  s = _bfd_generic_link_get_symbols (abfd);
+  BFD_ASSERT (s != (asymbol **) NULL);
+
+  /* Search all the symbols for one in INPUT_SECTION with
+     address ADDRESS.  */
+  while (*s)
+    {
+      asymbol *p = *s;
+
+      if (p->section == input_section
+	  && (input_section->output_section->vma
+	      + input_section->output_offset
+	      + p->value) == address)
+	return TRUE;
+      s++;
+    }
+  return FALSE;
+}
+
+/* If RELOC represents a relaxable instruction/reloc, change it into
+   the relaxed reloc, notify the linker that symbol addresses
+   have changed (bfd_perform_slip) and return how much the current
+   section has shrunk by.
+
+   FIXME: Much of this code has knowledge of the ordering of entries
+   in the howto table.  This needs to be fixed.  */
+
+static int
+h8300_reloc16_estimate (bfd *abfd, asection *input_section, arelent *reloc,
+			unsigned int shrink, struct bfd_link_info *link_info)
+{
+  bfd_vma value;
+  bfd_vma dot;
+  bfd_vma gap;
+  static asection *last_input_section = NULL;
+  static arelent *last_reloc = NULL;
+
+  /* The address of the thing to be relocated will have moved back by
+     the size of the shrink - but we don't change reloc->address here,
+     since we need it to know where the relocation lives in the source
+     uncooked section.  */
+  bfd_vma address = reloc->address - shrink;
+
+  if (input_section != last_input_section)
+    last_reloc = NULL;
+
+  /* Only examine the relocs which might be relaxable.  */
+  switch (reloc->howto->type)
+    {
+      /* This is the 16-/24-bit absolute branch which could become an
+	 8-bit pc-relative branch.  */
+    case R_JMP1:
+    case R_JMPL1:
+      /* Get the address of the target of this branch.  */
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+
+      /* Get the address of the next instruction (not the reloc).  */
+      dot = (input_section->output_section->vma
+	     + input_section->output_offset + address);
+
+      /* Adjust for R_JMP1 vs R_JMPL1.  */
+      dot += (reloc->howto->type == R_JMP1 ? 1 : 2);
+
+      /* Compute the distance from this insn to the branch target.  */
+      gap = value - dot;
+
+      /* If the distance is within -128..+128 inclusive, then we can relax
+	 this jump.  +128 is valid since the target will move two bytes
+	 closer if we do relax this branch.  */
+      if ((int) gap >= -128 && (int) gap <= 128)
+	{
+	  bfd_byte code;
+
+	  if (!bfd_get_section_contents (abfd, input_section, & code,
+					 reloc->address, 1))
+	    break;
+	  code = bfd_get_8 (abfd, & code);
+
+	  /* It's possible we may be able to eliminate this branch entirely;
+	     if the previous instruction is a branch around this instruction,
+	     and there's no label at this instruction, then we can reverse
+	     the condition on the previous branch and eliminate this jump.
+
+	       original:			new:
+		 bCC lab1			bCC' lab2
+		 jmp lab2
+		lab1:				lab1:
+
+	     This saves 4 bytes instead of two, and should be relatively
+	     common.
+
+	     Only perform this optimisation for jumps (code 0x5a) not
+	     subroutine calls, as otherwise it could transform:
+
+			     mov.w   r0,r0
+			     beq     .L1
+			     jsr     @_bar
+		      .L1:   rts
+		      _bar:  rts
+	     into:
+			     mov.w   r0,r0
+			     bne     _bar
+			     rts
+		      _bar:  rts
+
+	     which changes the call (jsr) into a branch (bne).  */
+	  if (code == 0x5a
+	      && gap <= 126
+	      && last_reloc
+	      && last_reloc->howto->type == R_PCRBYTE)
+	    {
+	      bfd_vma last_value;
+	      last_value = bfd_coff_reloc16_get_value (last_reloc, link_info,
+						       input_section) + 1;
+
+	      if (last_value == dot + 2
+		  && last_reloc->address + 1 == reloc->address
+		  && !h8300_symbol_address_p (abfd, input_section, dot - 2))
+		{
+		  reloc->howto = howto_table + 19;
+		  last_reloc->howto = howto_table + 18;
+		  last_reloc->sym_ptr_ptr = reloc->sym_ptr_ptr;
+		  last_reloc->addend = reloc->addend;
+		  shrink += 4;
+		  bfd_perform_slip (abfd, 4, input_section, address);
+		  break;
+		}
+	    }
+
+	  /* Change the reloc type.  */
+	  reloc->howto = reloc->howto + 1;
+
+	  /* This shrinks this section by two bytes.  */
+	  shrink += 2;
+	  bfd_perform_slip (abfd, 2, input_section, address);
+	}
+      break;
+
+    /* This is the 16-bit pc-relative branch which could become an 8-bit
+       pc-relative branch.  */
+    case R_PCRWORD:
+      /* Get the address of the target of this branch, add one to the value
+	 because the addend field in PCrel jumps is off by -1.  */
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section) + 1;
+
+      /* Get the address of the next instruction if we were to relax.  */
+      dot = input_section->output_section->vma +
+	input_section->output_offset + address;
+
+      /* Compute the distance from this insn to the branch target.  */
+      gap = value - dot;
+
+      /* If the distance is within -128..+128 inclusive, then we can relax
+	 this jump.  +128 is valid since the target will move two bytes
+	 closer if we do relax this branch.  */
+      if ((int) gap >= -128 && (int) gap <= 128)
+	{
+	  /* Change the reloc type.  */
+	  reloc->howto = howto_table + 15;
+
+	  /* This shrinks this section by two bytes.  */
+	  shrink += 2;
+	  bfd_perform_slip (abfd, 2, input_section, address);
+	}
+      break;
+
+    /* This is a 16-bit absolute address in a mov.b insn, which can
+       become an 8-bit absolute address if it's in the right range.  */
+    case R_MOV16B1:
+      /* Get the address of the data referenced by this mov.b insn.  */
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+      value = bfd_h8300_pad_address (abfd, value);
+
+      /* If the address is in the top 256 bytes of the address space
+	 then we can relax this instruction.  */
+      if (value >= 0xffffff00u)
+	{
+	  /* Change the reloc type.  */
+	  reloc->howto = reloc->howto + 1;
+
+	  /* This shrinks this section by two bytes.  */
+	  shrink += 2;
+	  bfd_perform_slip (abfd, 2, input_section, address);
+	}
+      break;
+
+    /* Similarly for a 24-bit absolute address in a mov.b.  Note that
+       if we can't relax this into an 8-bit absolute, we'll fall through
+       and try to relax it into a 16-bit absolute.  */
+    case R_MOV24B1:
+      /* Get the address of the data referenced by this mov.b insn.  */
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+      value = bfd_h8300_pad_address (abfd, value);
+
+      if (value >= 0xffffff00u)
+	{
+	  /* Change the reloc type.  */
+	  reloc->howto = reloc->howto + 1;
+
+	  /* This shrinks this section by four bytes.  */
+	  shrink += 4;
+	  bfd_perform_slip (abfd, 4, input_section, address);
+
+	  /* Done with this reloc.  */
+	  break;
+	}
+
+      /* FALLTHROUGH and try to turn the 24-/32-bit reloc into a 16-bit
+	 reloc.  */
+
+    /* This is a 24-/32-bit absolute address in a mov insn, which can
+       become an 16-bit absolute address if it's in the right range.  */
+    case R_MOVL1:
+      /* Get the address of the data referenced by this mov insn.  */
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+      value = bfd_h8300_pad_address (abfd, value);
+
+      /* If the address is a sign-extended 16-bit value then we can
+         relax this instruction.  */
+      if (value <= 0x7fff || value >= 0xffff8000u)
+	{
+	  /* Change the reloc type.  */
+	  reloc->howto = howto_table + 17;
+
+	  /* This shrinks this section by two bytes.  */
+	  shrink += 2;
+	  bfd_perform_slip (abfd, 2, input_section, address);
+	}
+      break;
+
+      /* No other reloc types represent relaxing opportunities.  */
+    default:
+      break;
+    }
+
+  last_reloc = reloc;
+  last_input_section = input_section;
+  return shrink;
+}
+
+/* Handle relocations for the H8/300, including relocs for relaxed
+   instructions.
+
+   FIXME: Not all relocations check for overflow!  */
+
+static void
+h8300_reloc16_extra_cases (bfd *abfd, struct bfd_link_info *link_info,
+			   struct bfd_link_order *link_order, arelent *reloc,
+			   bfd_byte *data, unsigned int *src_ptr,
+			   unsigned int *dst_ptr)
+{
+  unsigned int src_address = *src_ptr;
+  unsigned int dst_address = *dst_ptr;
+  asection *input_section = link_order->u.indirect.section;
+  bfd_vma value;
+  bfd_vma dot;
+  int gap, tmp;
+  unsigned char temp_code;
+
+  switch (reloc->howto->type)
+    {
+    /* Generic 8-bit pc-relative relocation.  */
+    case R_PCRBYTE:
+      /* Get the address of the target of this branch.  */
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+
+      dot = (input_section->output_offset
+	     + dst_address
+	     + link_order->u.indirect.section->output_section->vma);
+
+      gap = value - dot;
+
+      /* Sanity check.  */
+      if (gap < -128 || gap > 126)
+	{
+	  if (! ((*link_info->callbacks->reloc_overflow)
+		 (link_info, NULL,
+		  bfd_asymbol_name (*reloc->sym_ptr_ptr),
+		  reloc->howto->name, reloc->addend, input_section->owner,
+		  input_section, reloc->address)))
+	    abort ();
+	}
+
+      /* Everything looks OK.  Apply the relocation and update the
+	 src/dst address appropriately.  */
+      bfd_put_8 (abfd, gap, data + dst_address);
+      dst_address++;
+      src_address++;
+
+      /* All done.  */
+      break;
+
+    /* Generic 16-bit pc-relative relocation.  */
+    case R_PCRWORD:
+      /* Get the address of the target of this branch.  */
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+
+      /* Get the address of the instruction (not the reloc).  */
+      dot = (input_section->output_offset
+	     + dst_address
+	     + link_order->u.indirect.section->output_section->vma + 1);
+
+      gap = value - dot;
+
+      /* Sanity check.  */
+      if (gap > 32766 || gap < -32768)
+	{
+	  if (! ((*link_info->callbacks->reloc_overflow)
+		 (link_info, NULL,
+		  bfd_asymbol_name (*reloc->sym_ptr_ptr),
+		  reloc->howto->name, reloc->addend, input_section->owner,
+		  input_section, reloc->address)))
+	    abort ();
+	}
+
+      /* Everything looks OK.  Apply the relocation and update the
+	 src/dst address appropriately.  */
+      bfd_put_16 (abfd, (bfd_vma) gap, data + dst_address);
+      dst_address += 2;
+      src_address += 2;
+
+      /* All done.  */
+      break;
+
+    /* Generic 8-bit absolute relocation.  */
+    case R_RELBYTE:
+      /* Get the address of the object referenced by this insn.  */
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+
+      bfd_put_8 (abfd, value & 0xff, data + dst_address);
+      dst_address += 1;
+      src_address += 1;
+
+      /* All done.  */
+      break;
+
+    /* Various simple 16-bit absolute relocations.  */
+    case R_MOV16B1:
+    case R_JMP1:
+    case R_RELWORD:
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+      bfd_put_16 (abfd, value, data + dst_address);
+      dst_address += 2;
+      src_address += 2;
+      break;
+
+    /* Various simple 24-/32-bit absolute relocations.  */
+    case R_MOV24B1:
+    case R_MOVL1:
+    case R_RELLONG:
+      /* Get the address of the target of this branch.  */
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+      bfd_put_32 (abfd, value, data + dst_address);
+      dst_address += 4;
+      src_address += 4;
+      break;
+
+    /* Another 24-/32-bit absolute relocation.  */
+    case R_JMPL1:
+      /* Get the address of the target of this branch.  */
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+
+      value = ((value & 0x00ffffff)
+	       | (bfd_get_32 (abfd, data + src_address) & 0xff000000));
+      bfd_put_32 (abfd, value, data + dst_address);
+      dst_address += 4;
+      src_address += 4;
+      break;
+
+      /* This is a 24-/32-bit absolute address in one of the following
+	 instructions:
+
+	   "band", "bclr", "biand", "bild", "bior", "bist", "bixor",
+	   "bld", "bnot", "bor", "bset", "bst", "btst", "bxor", "ldc.w",
+	   "stc.w" and "mov.[bwl]"
+
+	 We may relax this into an 16-bit absolute address if it's in
+	 the right range.  */
+    case R_MOVL2:
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+      value = bfd_h8300_pad_address (abfd, value);
+
+      /* Sanity check.  */
+      if (value <= 0x7fff || value >= 0xffff8000u)
+	{
+	  /* Insert the 16-bit value into the proper location.  */
+	  bfd_put_16 (abfd, value, data + dst_address);
+
+	  /* Fix the opcode.  For all the instructions that belong to
+	     this relaxation, we simply need to turn off bit 0x20 in
+	     the previous byte.  */
+	  data[dst_address - 1] &= ~0x20;
+	  dst_address += 2;
+	  src_address += 4;
+	}
+      else
+	{
+	  if (! ((*link_info->callbacks->reloc_overflow)
+		 (link_info, NULL,
+		  bfd_asymbol_name (*reloc->sym_ptr_ptr),
+		  reloc->howto->name, reloc->addend, input_section->owner,
+		  input_section, reloc->address)))
+	    abort ();
+	}
+      break;
+
+    /* A 16-bit absolute branch that is now an 8-bit pc-relative branch.  */
+    case R_JMP2:
+      /* Get the address of the target of this branch.  */
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+
+      /* Get the address of the next instruction.  */
+      dot = (input_section->output_offset
+	     + dst_address
+	     + link_order->u.indirect.section->output_section->vma + 1);
+
+      gap = value - dot;
+
+      /* Sanity check.  */
+      if (gap < -128 || gap > 126)
+	{
+	  if (! ((*link_info->callbacks->reloc_overflow)
+		 (link_info, NULL,
+		  bfd_asymbol_name (*reloc->sym_ptr_ptr),
+		  reloc->howto->name, reloc->addend, input_section->owner,
+		  input_section, reloc->address)))
+	    abort ();
+	}
+
+      /* Now fix the instruction itself.  */
+      switch (data[dst_address - 1])
+	{
+	case 0x5e:
+	  /* jsr -> bsr */
+	  bfd_put_8 (abfd, 0x55, data + dst_address - 1);
+	  break;
+	case 0x5a:
+	  /* jmp -> bra */
+	  bfd_put_8 (abfd, 0x40, data + dst_address - 1);
+	  break;
+
+	default:
+	  abort ();
+	}
+
+      /* Write out the 8-bit value.  */
+      bfd_put_8 (abfd, gap, data + dst_address);
+
+      dst_address += 1;
+      src_address += 3;
+
+      break;
+
+    /* A 16-bit pc-relative branch that is now an 8-bit pc-relative branch.  */
+    case R_PCRWORD_B:
+      /* Get the address of the target of this branch.  */
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+
+      /* Get the address of the instruction (not the reloc).  */
+      dot = (input_section->output_offset
+	     + dst_address
+	     + link_order->u.indirect.section->output_section->vma - 1);
+
+      gap = value - dot;
+
+      /* Sanity check.  */
+      if (gap < -128 || gap > 126)
+	{
+	  if (! ((*link_info->callbacks->reloc_overflow)
+		 (link_info, NULL,
+		  bfd_asymbol_name (*reloc->sym_ptr_ptr),
+		  reloc->howto->name, reloc->addend, input_section->owner,
+		  input_section, reloc->address)))
+	    abort ();
+	}
+
+      /* Now fix the instruction.  */
+      switch (data[dst_address - 2])
+	{
+	case 0x58:
+	  /* bCC:16 -> bCC:8 */
+	  /* Get the second byte of the original insn, which contains
+	     the condition code.  */
+	  tmp = data[dst_address - 1];
+
+	  /* Compute the fisrt byte of the relaxed instruction.  The
+	     original sequence 0x58 0xX0 is relaxed to 0x4X, where X
+	     represents the condition code.  */
+	  tmp &= 0xf0;
+	  tmp >>= 4;
+	  tmp |= 0x40;
+
+	  /* Write it.  */
+	  bfd_put_8 (abfd, tmp, data + dst_address - 2);
+	  break;
+
+	case 0x5c:
+	  /* bsr:16 -> bsr:8 */
+	  bfd_put_8 (abfd, 0x55, data + dst_address - 2);
+	  break;
+
+	default:
+	  abort ();
+	}
+
+      /* Output the target.  */
+      bfd_put_8 (abfd, gap, data + dst_address - 1);
+
+      /* We don't advance dst_address -- the 8-bit reloc is applied at
+	 dst_address - 1, so the next insn should begin at dst_address.  */
+      src_address += 2;
+
+      break;
+
+    /* Similarly for a 24-bit absolute that is now 8 bits.  */
+    case R_JMPL2:
+      /* Get the address of the target of this branch.  */
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+
+      /* Get the address of the instruction (not the reloc).  */
+      dot = (input_section->output_offset
+	     + dst_address
+	     + link_order->u.indirect.section->output_section->vma + 2);
+
+      gap = value - dot;
+
+      /* Fix the instruction.  */
+      switch (data[src_address])
+	{
+	case 0x5e:
+	  /* jsr -> bsr */
+	  bfd_put_8 (abfd, 0x55, data + dst_address);
+	  break;
+	case 0x5a:
+	  /* jmp ->bra */
+	  bfd_put_8 (abfd, 0x40, data + dst_address);
+	  break;
+	default:
+	  abort ();
+	}
+
+      bfd_put_8 (abfd, gap, data + dst_address + 1);
+      dst_address += 2;
+      src_address += 4;
+
+      break;
+
+      /* This is a 16-bit absolute address in one of the following
+	 instructions:
+
+	   "band", "bclr", "biand", "bild", "bior", "bist", "bixor",
+	   "bld", "bnot", "bor", "bset", "bst", "btst", "bxor", and
+	   "mov.b"
+
+	 We may relax this into an 8-bit absolute address if it's in
+	 the right range.  */
+    case R_MOV16B2:
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+
+      /* All instructions with R_H8_DIR16B2 start with 0x6a.  */
+      if (data[dst_address - 2] != 0x6a)
+	abort ();
+
+      temp_code = data[src_address - 1];
+
+      /* If this is a mov.b instruction, clear the lower nibble, which
+	 contains the source/destination register number.  */
+      if ((temp_code & 0x10) != 0x10)
+	temp_code &= 0xf0;
+
+      /* Fix up the opcode.  */
+      switch (temp_code)
+	{
+	case 0x00:
+	  /* This is mov.b @aa:16,Rd.  */
+	  data[dst_address - 2] = (data[src_address - 1] & 0xf) | 0x20;
+	  break;
+	case 0x80:
+	  /* This is mov.b Rs,@aa:16.  */
+	  data[dst_address - 2] = (data[src_address - 1] & 0xf) | 0x30;
+	  break;
+	case 0x18:
+	  /* This is a bit-maniputation instruction that stores one
+	     bit into memory, one of "bclr", "bist", "bnot", "bset",
+	     and "bst".  */
+	  data[dst_address - 2] = 0x7f;
+	  break;
+	case 0x10:
+	  /* This is a bit-maniputation instruction that loads one bit
+	     from memory, one of "band", "biand", "bild", "bior",
+	     "bixor", "bld", "bor", "btst", and "bxor".  */
+	  data[dst_address - 2] = 0x7e;
+	  break;
+	default:
+	  abort ();
+	}
+
+      bfd_put_8 (abfd, value & 0xff, data + dst_address - 1);
+      src_address += 2;
+      break;
+
+      /* This is a 24-bit absolute address in one of the following
+	 instructions:
+
+	   "band", "bclr", "biand", "bild", "bior", "bist", "bixor",
+	   "bld", "bnot", "bor", "bset", "bst", "btst", "bxor", and
+	   "mov.b"
+
+	 We may relax this into an 8-bit absolute address if it's in
+	 the right range.  */
+    case R_MOV24B2:
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+
+      /* All instructions with R_MOV24B2 start with 0x6a.  */
+      if (data[dst_address - 2] != 0x6a)
+	abort ();
+
+      temp_code = data[src_address - 1];
+
+      /* If this is a mov.b instruction, clear the lower nibble, which
+	 contains the source/destination register number.  */
+      if ((temp_code & 0x30) != 0x30)
+	temp_code &= 0xf0;
+
+      /* Fix up the opcode.  */
+      switch (temp_code)
+	{
+	case 0x20:
+	  /* This is mov.b @aa:24/32,Rd.  */
+	  data[dst_address - 2] = (data[src_address - 1] & 0xf) | 0x20;
+	  break;
+	case 0xa0:
+	  /* This is mov.b Rs,@aa:24/32.  */
+	  data[dst_address - 2] = (data[src_address - 1] & 0xf) | 0x30;
+	  break;
+	case 0x38:
+	  /* This is a bit-maniputation instruction that stores one
+	     bit into memory, one of "bclr", "bist", "bnot", "bset",
+	     and "bst".  */
+	  data[dst_address - 2] = 0x7f;
+	  break;
+	case 0x30:
+	  /* This is a bit-maniputation instruction that loads one bit
+	     from memory, one of "band", "biand", "bild", "bior",
+	     "bixor", "bld", "bor", "btst", and "bxor".  */
+	  data[dst_address - 2] = 0x7e;
+	  break;
+	default:
+	  abort ();
+	}
+
+      bfd_put_8 (abfd, value & 0xff, data + dst_address - 1);
+      src_address += 4;
+      break;
+
+    case R_BCC_INV:
+      /* Get the address of the target of this branch.  */
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+
+      dot = (input_section->output_offset
+	     + dst_address
+	     + link_order->u.indirect.section->output_section->vma) + 1;
+
+      gap = value - dot;
+
+      /* Sanity check.  */
+      if (gap < -128 || gap > 126)
+	{
+	  if (! ((*link_info->callbacks->reloc_overflow)
+		 (link_info, NULL,
+		  bfd_asymbol_name (*reloc->sym_ptr_ptr),
+		  reloc->howto->name, reloc->addend, input_section->owner,
+		  input_section, reloc->address)))
+	    abort ();
+	}
+
+      /* Everything looks OK.  Fix the condition in the instruction, apply
+	 the relocation, and update the src/dst address appropriately.  */
+
+      bfd_put_8 (abfd, bfd_get_8 (abfd, data + dst_address - 1) ^ 1,
+		 data + dst_address - 1);
+      bfd_put_8 (abfd, gap, data + dst_address);
+      dst_address++;
+      src_address++;
+
+      /* All done.  */
+      break;
+
+    case R_JMP_DEL:
+      src_address += 4;
+      break;
+
+    /* An 8-bit memory indirect instruction (jmp/jsr).
+
+       There's several things that need to be done to handle
+       this relocation.
+
+       If this is a reloc against the absolute symbol, then
+       we should handle it just R_RELBYTE.  Likewise if it's
+       for a symbol with a value ge 0 and le 0xff.
+
+       Otherwise it's a jump/call through the function vector,
+       and the linker is expected to set up the function vector
+       and put the right value into the jump/call instruction.  */
+    case R_MEM_INDIRECT:
+      {
+	/* We need to find the symbol so we can determine it's
+	   address in the function vector table.  */
+	asymbol *symbol;
+	const char *name;
+	struct funcvec_hash_table *ftab;
+	struct funcvec_hash_entry *h;
+	struct h8300_coff_link_hash_table *htab;
+	asection *vectors_sec;
+
+	if (link_info->output_bfd->xvec != abfd->xvec)
+	  {
+	    (*_bfd_error_handler)
+	      (_("cannot handle R_MEM_INDIRECT reloc when using %s output"),
+	       link_info->output_bfd->xvec->name);
+
+	    /* What else can we do?  This function doesn't allow return
+	       of an error, and we don't want to call abort as that
+	       indicates an internal error.  */
+#ifndef EXIT_FAILURE
+#define EXIT_FAILURE 1
+#endif
+	    xexit (EXIT_FAILURE);
+	  }
+	htab = h8300_coff_hash_table (link_info);
+	vectors_sec = htab->vectors_sec;
+
+	/* First see if this is a reloc against the absolute symbol
+	   or against a symbol with a nonnegative value <= 0xff.  */
+	symbol = *(reloc->sym_ptr_ptr);
+	value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+	if (symbol == bfd_abs_section_ptr->symbol
+	    || value <= 0xff)
+	  {
+	    /* This should be handled in a manner very similar to
+	       R_RELBYTES.   If the value is in range, then just slam
+	       the value into the right location.  Else trigger a
+	       reloc overflow callback.  */
+	    if (value <= 0xff)
+	      {
+		bfd_put_8 (abfd, value, data + dst_address);
+		dst_address += 1;
+		src_address += 1;
+	      }
+	    else
+	      {
+		if (! ((*link_info->callbacks->reloc_overflow)
+		       (link_info, NULL,
+			bfd_asymbol_name (*reloc->sym_ptr_ptr),
+			reloc->howto->name, reloc->addend, input_section->owner,
+			input_section, reloc->address)))
+		  abort ();
+	      }
+	    break;
+	  }
+
+	/* This is a jump/call through a function vector, and we're
+	   expected to create the function vector ourselves.
+
+	   First look up this symbol in the linker hash table -- we need
+	   the derived linker symbol which holds this symbol's index
+	   in the function vector.  */
+	name = symbol->name;
+	if (symbol->flags & BSF_LOCAL)
+	  {
+	    char *new_name = bfd_malloc ((bfd_size_type) strlen (name) + 10);
+
+	    if (new_name == NULL)
+	      abort ();
+
+	    sprintf (new_name, "%s_%08x", name, symbol->section->id);
+	    name = new_name;
+	  }
+
+	ftab = htab->funcvec_hash_table;
+	h = funcvec_hash_lookup (ftab, name, FALSE, FALSE);
+
+	/* This shouldn't ever happen.  If it does that means we've got
+	   data corruption of some kind.  Aborting seems like a reasonable
+	   thing to do here.  */
+	if (h == NULL || vectors_sec == NULL)
+	  abort ();
+
+	/* Place the address of the function vector entry into the
+	   reloc's address.  */
+	bfd_put_8 (abfd,
+		   vectors_sec->output_offset + h->offset,
+		   data + dst_address);
+
+	dst_address++;
+	src_address++;
+
+	/* Now create an entry in the function vector itself.  */
+	switch (bfd_get_mach (input_section->owner))
+	  {
+	  case bfd_mach_h8300:
+	  case bfd_mach_h8300hn:
+	  case bfd_mach_h8300sn:
+	    bfd_put_16 (abfd,
+			bfd_coff_reloc16_get_value (reloc,
+						    link_info,
+						    input_section),
+			vectors_sec->contents + h->offset);
+	    break;
+	  case bfd_mach_h8300h:
+	  case bfd_mach_h8300s:
+	    bfd_put_32 (abfd,
+			bfd_coff_reloc16_get_value (reloc,
+						    link_info,
+						    input_section),
+			vectors_sec->contents + h->offset);
+	    break;
+	  default:
+	    abort ();
+	  }
+
+	/* Gross.  We've already written the contents of the vector section
+	   before we get here...  So we write it again with the new data.  */
+	bfd_set_section_contents (vectors_sec->output_section->owner,
+				  vectors_sec->output_section,
+				  vectors_sec->contents,
+				  (file_ptr) vectors_sec->output_offset,
+				  vectors_sec->size);
+	break;
+      }
+
+    default:
+      abort ();
+      break;
+
+    }
+
+  *src_ptr = src_address;
+  *dst_ptr = dst_address;
+}
+
+/* Routine for the h8300 linker.
+
+   This routine is necessary to handle the special R_MEM_INDIRECT
+   relocs on the h8300.  It's responsible for generating a vectors
+   section and attaching it to an input bfd as well as sizing
+   the vectors section.  It also creates our vectors hash table.
+
+   It uses the generic linker routines to actually add the symbols.
+   from this BFD to the bfd linker hash table.  It may add a few
+   selected static symbols to the bfd linker hash table.  */
+
+static bfd_boolean
+h8300_bfd_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  asection *sec;
+  struct funcvec_hash_table *funcvec_hash_table;
+  bfd_size_type amt;
+  struct h8300_coff_link_hash_table *htab;
+
+  /* Add the symbols using the generic code.  */
+  _bfd_generic_link_add_symbols (abfd, info);
+
+  if (info->output_bfd->xvec != abfd->xvec)
+    return TRUE;
+
+  htab = h8300_coff_hash_table (info);
+
+  /* If we haven't created a vectors section, do so now.  */
+  if (!htab->vectors_sec)
+    {
+      flagword flags;
+
+      /* Make sure the appropriate flags are set, including SEC_IN_MEMORY.  */
+      flags = (SEC_ALLOC | SEC_LOAD
+	       | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_READONLY);
+      htab->vectors_sec = bfd_make_section_with_flags (abfd, ".vectors",
+						       flags);
+
+      /* If the section wasn't created, or we couldn't set the flags,
+	 quit quickly now, rather than dying a painful death later.  */
+      if (!htab->vectors_sec)
+	return FALSE;
+
+      /* Also create the vector hash table.  */
+      amt = sizeof (struct funcvec_hash_table);
+      funcvec_hash_table = (struct funcvec_hash_table *) bfd_alloc (abfd, amt);
+
+      if (!funcvec_hash_table)
+	return FALSE;
+
+      /* And initialize the funcvec hash table.  */
+      if (!funcvec_hash_table_init (funcvec_hash_table, abfd,
+				    funcvec_hash_newfunc,
+				    sizeof (struct funcvec_hash_entry)))
+	{
+	  bfd_release (abfd, funcvec_hash_table);
+	  return FALSE;
+	}
+
+      /* Store away a pointer to the funcvec hash table.  */
+      htab->funcvec_hash_table = funcvec_hash_table;
+    }
+
+  /* Load up the function vector hash table.  */
+  funcvec_hash_table = htab->funcvec_hash_table;
+
+  /* Now scan the relocs for all the sections in this bfd; create
+     additional space in the .vectors section as needed.  */
+  for (sec = abfd->sections; sec; sec = sec->next)
+    {
+      long reloc_size, reloc_count, i;
+      asymbol **symbols;
+      arelent **relocs;
+
+      /* Suck in the relocs, symbols & canonicalize them.  */
+      reloc_size = bfd_get_reloc_upper_bound (abfd, sec);
+      if (reloc_size <= 0)
+	continue;
+
+      relocs = (arelent **) bfd_malloc ((bfd_size_type) reloc_size);
+      if (!relocs)
+	return FALSE;
+
+      /* The symbols should have been read in by _bfd_generic link_add_symbols
+	 call abovec, so we can cheat and use the pointer to them that was
+	 saved in the above call.  */
+      symbols = _bfd_generic_link_get_symbols(abfd);
+      reloc_count = bfd_canonicalize_reloc (abfd, sec, relocs, symbols);
+      if (reloc_count <= 0)
+	{
+	  free (relocs);
+	  continue;
+	}
+
+      /* Now walk through all the relocations in this section.  */
+      for (i = 0; i < reloc_count; i++)
+	{
+	  arelent *reloc = relocs[i];
+	  asymbol *symbol = *(reloc->sym_ptr_ptr);
+	  const char *name;
+
+	  /* We've got an indirect reloc.  See if we need to add it
+	     to the function vector table.   At this point, we have
+	     to add a new entry for each unique symbol referenced
+	     by an R_MEM_INDIRECT relocation except for a reloc
+	     against the absolute section symbol.  */
+	  if (reloc->howto->type == R_MEM_INDIRECT
+	      && symbol != bfd_abs_section_ptr->symbol)
+
+	    {
+	      struct funcvec_hash_table *ftab;
+	      struct funcvec_hash_entry *h;
+
+	      name = symbol->name;
+	      if (symbol->flags & BSF_LOCAL)
+		{
+		  char *new_name;
+
+		  new_name = bfd_malloc ((bfd_size_type) strlen (name) + 10);
+		  if (new_name == NULL)
+		    abort ();
+
+		  sprintf (new_name, "%s_%08x", name, symbol->section->id);
+		  name = new_name;
+		}
+
+	      /* Look this symbol up in the function vector hash table.  */
+	      ftab = htab->funcvec_hash_table;
+	      h = funcvec_hash_lookup (ftab, name, FALSE, FALSE);
+
+	      /* If this symbol isn't already in the hash table, add
+		 it and bump up the size of the hash table.  */
+	      if (h == NULL)
+		{
+		  h = funcvec_hash_lookup (ftab, name, TRUE, TRUE);
+		  if (h == NULL)
+		    {
+		      free (relocs);
+		      return FALSE;
+		    }
+
+		  /* Bump the size of the vectors section.  Each vector
+		     takes 2 bytes on the h8300 and 4 bytes on the h8300h.  */
+		  switch (bfd_get_mach (abfd))
+		    {
+		    case bfd_mach_h8300:
+		    case bfd_mach_h8300hn:
+		    case bfd_mach_h8300sn:
+		      htab->vectors_sec->size += 2;
+		      break;
+		    case bfd_mach_h8300h:
+		    case bfd_mach_h8300s:
+		      htab->vectors_sec->size += 4;
+		      break;
+		    default:
+		      abort ();
+		    }
+		}
+	    }
+	}
+
+      /* We're done with the relocations, release them.  */
+      free (relocs);
+    }
+
+  /* Now actually allocate some space for the function vector.  It's
+     wasteful to do this more than once, but this is easier.  */
+  sec = htab->vectors_sec;
+  if (sec->size != 0)
+    {
+      /* Free the old contents.  */
+      if (sec->contents)
+	free (sec->contents);
+
+      /* Allocate new contents.  */
+      sec->contents = bfd_malloc (sec->size);
+    }
+
+  return TRUE;
+}
+
+#define coff_reloc16_extra_cases h8300_reloc16_extra_cases
+#define coff_reloc16_estimate h8300_reloc16_estimate
+#define coff_bfd_link_add_symbols h8300_bfd_link_add_symbols
+#define coff_bfd_link_hash_table_create h8300_coff_link_hash_table_create
+
+#define COFF_LONG_FILENAMES
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coffcode.h"
+
+#undef coff_bfd_get_relocated_section_contents
+#undef coff_bfd_relax_section
+#define coff_bfd_get_relocated_section_contents \
+  bfd_coff_reloc16_get_relocated_section_contents
+#define coff_bfd_relax_section bfd_coff_reloc16_relax_section
+
+CREATE_BIG_COFF_TARGET_VEC (h8300coff_vec, "coff-h8300", BFD_IS_RELAXABLE, 0, '_', NULL, COFF_SWAP_TABLE)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-h8500.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-h8500.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-h8500.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-h8500.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,313 @@
+/* BFD back-end for Renesas H8/500 COFF binaries.
+   Copyright 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2007, 2008  Free Software Foundation, Inc.
+   Contributed by Cygnus Support.
+   Written by Steve Chamberlain, <sac@cygnus.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "bfdlink.h"
+#include "coff/h8500.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+
+static int  coff_h8500_select_reloc PARAMS ((reloc_howto_type *));
+static void rtype2howto      PARAMS ((arelent *, struct internal_reloc *));
+static void reloc_processing PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection *));
+static void extra_case       PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *, arelent *, bfd_byte *, unsigned int *, unsigned int *));
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (1)
+
+static reloc_howto_type r_imm8 =
+HOWTO (R_H8500_IMM8, 0, 1, 8, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_imm8", TRUE, 0x000000ff, 0x000000ff, FALSE);
+
+static reloc_howto_type r_imm16 =
+HOWTO (R_H8500_IMM16, 0, 1, 16, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_imm16", TRUE, 0x0000ffff, 0x0000ffff, FALSE);
+
+static reloc_howto_type r_imm24 =
+HOWTO (R_H8500_IMM24, 0, 1, 24, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_imm24", TRUE, 0x00ffffff, 0x00ffffff, FALSE);
+
+static reloc_howto_type r_imm32 =
+HOWTO (R_H8500_IMM32, 0, 1, 32, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_imm32", TRUE, 0xffffffff, 0xffffffff, FALSE);
+
+static reloc_howto_type r_high8 =
+HOWTO (R_H8500_HIGH8, 0, 1, 8, FALSE, 0,
+       complain_overflow_dont, 0, "r_high8", TRUE, 0x000000ff, 0x000000ff, FALSE);
+
+static reloc_howto_type r_low16 =
+HOWTO (R_H8500_LOW16, 0, 1, 16, FALSE, 0,
+       complain_overflow_dont, 0, "r_low16", TRUE, 0x0000ffff, 0x0000ffff, FALSE);
+
+static reloc_howto_type r_pcrel8 =
+HOWTO (R_H8500_PCREL8, 0, 1, 8, TRUE, 0, complain_overflow_signed, 0, "r_pcrel8", TRUE, 0, 0, TRUE);
+
+static reloc_howto_type r_pcrel16 =
+HOWTO (R_H8500_PCREL16, 0, 1, 16, TRUE, 0, complain_overflow_signed, 0, "r_pcrel16", TRUE, 0, 0, TRUE);
+
+static reloc_howto_type r_high16 =
+HOWTO (R_H8500_HIGH16, 0, 1, 8, FALSE, 0,
+       complain_overflow_dont, 0, "r_high16", TRUE, 0x000ffff, 0x0000ffff, FALSE);
+
+/* Turn a howto into a reloc number.  */
+
+static int
+coff_h8500_select_reloc (howto)
+     reloc_howto_type *howto;
+{
+  return howto->type;
+}
+
+#define SELECT_RELOC(x,howto) x.r_type = coff_h8500_select_reloc(howto)
+
+#define BADMAG(x) H8500BADMAG(x)
+#define H8500 1			/* Customize coffcode.h */
+
+#define __A_MAGIC_SET__
+
+/* Code to swap in the reloc.  */
+#define SWAP_IN_RELOC_OFFSET	H_GET_32
+#define SWAP_OUT_RELOC_OFFSET	H_PUT_32
+#define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) \
+  dst->r_stuff[0] = 'S'; \
+  dst->r_stuff[1] = 'C';
+
+/* Code to turn a r_type into a howto ptr, uses the above howto table.  */
+
+static void
+rtype2howto (internal, dst)
+     arelent * internal;
+     struct internal_reloc *dst;
+{
+  switch (dst->r_type)
+    {
+    default:
+      abort ();
+      break;
+    case R_H8500_IMM8:
+      internal->howto = &r_imm8;
+      break;
+    case R_H8500_IMM16:
+      internal->howto = &r_imm16;
+      break;
+    case R_H8500_IMM24:
+      internal->howto = &r_imm24;
+      break;
+    case R_H8500_IMM32:
+      internal->howto = &r_imm32;
+      break;
+    case R_H8500_PCREL8:
+      internal->howto = &r_pcrel8;
+      break;
+    case R_H8500_PCREL16:
+      internal->howto = &r_pcrel16;
+      break;
+    case R_H8500_HIGH8:
+      internal->howto = &r_high8;
+      break;
+    case R_H8500_HIGH16:
+      internal->howto = &r_high16;
+      break;
+    case R_H8500_LOW16:
+      internal->howto = &r_low16;
+      break;
+    }
+}
+
+#define RTYPE2HOWTO(internal, relocentry) rtype2howto(internal,relocentry)
+
+/* Perform any necessary magic to the addend in a reloc entry.  */
+
+#define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \
+ cache_ptr->addend =  ext_reloc.r_offset;
+
+#define RELOC_PROCESSING(relent,reloc,symbols,abfd,section) \
+ reloc_processing(relent, reloc, symbols, abfd, section)
+
+static void reloc_processing (relent, reloc, symbols, abfd, section)
+     arelent * relent;
+     struct internal_reloc *reloc;
+     asymbol ** symbols;
+     bfd * abfd;
+     asection * section;
+{
+  relent->address = reloc->r_vaddr;
+  rtype2howto (relent, reloc);
+
+  if (reloc->r_symndx > 0)
+    relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
+  else
+    relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+
+  relent->addend = reloc->r_offset;
+  relent->address -= section->vma;
+}
+
+static void
+extra_case (in_abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr)
+     bfd *in_abfd;
+     struct bfd_link_info *link_info;
+     struct bfd_link_order *link_order;
+     arelent *reloc;
+     bfd_byte *data;
+     unsigned int *src_ptr;
+     unsigned int *dst_ptr;
+{
+  bfd_byte *d = data+*dst_ptr;
+  asection *input_section = link_order->u.indirect.section;
+
+  switch (reloc->howto->type)
+    {
+    case R_H8500_IMM8:
+      bfd_put_8 (in_abfd,
+		 bfd_coff_reloc16_get_value (reloc, link_info, input_section),
+		 d);
+      (*dst_ptr) += 1;
+      (*src_ptr) += 1;
+      break;
+
+    case R_H8500_HIGH8:
+      bfd_put_8 (in_abfd,
+		 (bfd_coff_reloc16_get_value (reloc, link_info, input_section)
+		  >> 16),
+		 d);
+      (*dst_ptr) += 1;
+      (*src_ptr) += 1;
+      break;
+
+    case R_H8500_IMM16:
+      bfd_put_16 (in_abfd,
+		  bfd_coff_reloc16_get_value (reloc, link_info, input_section),
+		  d);
+      (*dst_ptr) += 2;
+      (*src_ptr) += 2;
+      break;
+
+    case R_H8500_LOW16:
+      bfd_put_16 (in_abfd,
+		  bfd_coff_reloc16_get_value (reloc, link_info, input_section),
+		  d);
+
+      (*dst_ptr) += 2;
+      (*src_ptr) += 2;
+      break;
+
+    case R_H8500_HIGH16:
+      bfd_put_16 (in_abfd,
+		  (bfd_coff_reloc16_get_value (reloc, link_info, input_section)
+		   >> 16),
+		  d);
+
+      (*dst_ptr) += 2;
+      (*src_ptr) += 2;
+      break;
+
+    case R_H8500_IMM24:
+      {
+	int v = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+	int o = bfd_get_32 (in_abfd, data+ *dst_ptr -1);
+	v = (v & 0x00ffffff) | (o & 0xff00000);
+	bfd_put_32 (in_abfd, (bfd_vma) v, data  + *dst_ptr -1);
+	(*dst_ptr) += 3;
+	(*src_ptr) += 3;;
+      }
+      break;
+    case R_H8500_IMM32:
+      {
+	int v = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+	bfd_put_32 (in_abfd, (bfd_vma) v, data  + *dst_ptr);
+	(*dst_ptr) += 4;
+	(*src_ptr) += 4;;
+      }
+      break;
+
+    case R_H8500_PCREL8:
+      {
+	bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
+						  input_section);
+	bfd_vma dot = (*dst_ptr
+		       + input_section->output_offset
+		       + input_section->output_section->vma);
+	int gap = dst - dot - 1; /* -1 since were in the odd byte of the
+				    word and the pc's been incremented.  */
+
+	if (gap > 128 || gap < -128)
+	  {
+	    if (! ((*link_info->callbacks->reloc_overflow)
+		   (link_info, NULL,
+		    bfd_asymbol_name (*reloc->sym_ptr_ptr),
+		    reloc->howto->name, reloc->addend, input_section->owner,
+		    input_section, reloc->address)))
+	      abort ();
+	  }
+	bfd_put_8 (in_abfd, gap, data + *dst_ptr);
+	(*dst_ptr)++;
+	(*src_ptr)++;
+	break;
+      }
+    case R_H8500_PCREL16:
+      {
+	bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
+						  input_section);
+	bfd_vma dot = (*dst_ptr
+		       + input_section->output_offset
+		       + input_section->output_section->vma);
+	int gap = dst - dot - 1; /* -1 since were in the odd byte of the
+				    word and the pc's been incremented.  */
+
+	if (gap > 32767 || gap < -32768)
+	  {
+	    if (! ((*link_info->callbacks->reloc_overflow)
+		   (link_info, NULL,
+		    bfd_asymbol_name (*reloc->sym_ptr_ptr),
+		    reloc->howto->name, reloc->addend, input_section->owner,
+		    input_section, reloc->address)))
+	      abort ();
+	  }
+	bfd_put_16 (in_abfd, (bfd_vma) gap, data + *dst_ptr);
+	(*dst_ptr) += 2;
+	(*src_ptr) += 2;
+	break;
+      }
+
+    default:
+      abort ();
+    }
+}
+
+#define coff_reloc16_extra_cases extra_case
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coffcode.h"
+
+#undef  coff_bfd_get_relocated_section_contents
+#undef coff_bfd_relax_section
+#define coff_bfd_get_relocated_section_contents \
+  bfd_coff_reloc16_get_relocated_section_contents
+#define coff_bfd_relax_section bfd_coff_reloc16_relax_section
+
+CREATE_BIG_COFF_TARGET_VEC (h8500coff_vec, "coff-h8500", 0, 0, '_', NULL, COFF_SWAP_TABLE)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-i386.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-i386.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-i386.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-i386.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,699 @@
+/* BFD back-end for Intel 386 COFF files.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#include "coff/i386.h"
+
+#include "coff/internal.h"
+
+#ifdef COFF_WITH_PE
+#include "coff/pe.h"
+#endif
+
+#ifdef COFF_GO32_EXE
+#include "coff/go32exe.h"
+#endif
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "libcoff.h"
+
+static bfd_reloc_status_type coff_i386_reloc
+  (bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **);
+static reloc_howto_type *coff_i386_rtype_to_howto
+  (bfd *, asection *, struct internal_reloc *,
+   struct coff_link_hash_entry *, struct internal_syment *,
+   bfd_vma *);
+static reloc_howto_type *coff_i386_reloc_type_lookup
+  (bfd *, bfd_reloc_code_real_type);
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (2)
+/* The page size is a guess based on ELF.  */
+
+#define COFF_PAGE_SIZE 0x1000
+
+/* For some reason when using i386 COFF the value stored in the .text
+   section for a reference to a common symbol is the value itself plus
+   any desired offset.  Ian Taylor, Cygnus Support.  */
+
+/* If we are producing relocatable output, we need to do some
+   adjustments to the object file that are not done by the
+   bfd_perform_relocation function.  This function is called by every
+   reloc type to make any required adjustments.  */
+
+static bfd_reloc_status_type
+coff_i386_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
+		 error_message)
+     bfd *abfd;
+     arelent *reloc_entry;
+     asymbol *symbol;
+     PTR data;
+     asection *input_section ATTRIBUTE_UNUSED;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  symvalue diff;
+
+#ifndef COFF_WITH_PE
+  if (output_bfd == (bfd *) NULL)
+    return bfd_reloc_continue;
+#endif
+
+  if (bfd_is_com_section (symbol->section))
+    {
+#ifndef COFF_WITH_PE
+      /* We are relocating a common symbol.  The current value in the
+	 object file is ORIG + OFFSET, where ORIG is the value of the
+	 common symbol as seen by the object file when it was compiled
+	 (this may be zero if the symbol was undefined) and OFFSET is
+	 the offset into the common symbol (normally zero, but may be
+	 non-zero when referring to a field in a common structure).
+	 ORIG is the negative of reloc_entry->addend, which is set by
+	 the CALC_ADDEND macro below.  We want to replace the value in
+	 the object file with NEW + OFFSET, where NEW is the value of
+	 the common symbol which we are going to put in the final
+	 object file.  NEW is symbol->value.  */
+      diff = symbol->value + reloc_entry->addend;
+#else
+      /* In PE mode, we do not offset the common symbol.  */
+      diff = reloc_entry->addend;
+#endif
+    }
+  else
+    {
+      /* For some reason bfd_perform_relocation always effectively
+	 ignores the addend for a COFF target when producing
+	 relocatable output.  This seems to be always wrong for 386
+	 COFF, so we handle the addend here instead.  */
+#ifdef COFF_WITH_PE
+      if (output_bfd == (bfd *) NULL)
+	{
+	  reloc_howto_type *howto = reloc_entry->howto;
+
+	  /* Although PC relative relocations are very similar between
+	     PE and non-PE formats, but they are off by 1 << howto->size
+	     bytes. For the external relocation, PE is very different
+	     from others. See md_apply_fix3 () in gas/config/tc-i386.c.
+	     When we link PE and non-PE object files together to
+	     generate a non-PE executable, we have to compensate it
+	     here.  */
+	  if (howto->pc_relative && howto->pcrel_offset)
+	    diff = -(1 << howto->size);
+	  else if (symbol->flags & BSF_WEAK)
+	    diff = reloc_entry->addend - symbol->value;
+	  else
+	    diff = -reloc_entry->addend;
+	}
+      else
+#endif
+	diff = reloc_entry->addend;
+    }
+
+#ifdef COFF_WITH_PE
+  /* FIXME: How should this case be handled?  */
+  if (reloc_entry->howto->type == R_IMAGEBASE
+      && output_bfd != NULL
+      && bfd_get_flavour(output_bfd) == bfd_target_coff_flavour)
+    diff -= pe_data (output_bfd)->pe_opthdr.ImageBase;
+#endif
+
+#define DOIT(x) \
+  x = ((x & ~howto->dst_mask) | (((x & howto->src_mask) + diff) & howto->dst_mask))
+
+    if (diff != 0)
+      {
+	reloc_howto_type *howto = reloc_entry->howto;
+	unsigned char *addr = (unsigned char *) data + reloc_entry->address;
+
+	switch (howto->size)
+	  {
+	  case 0:
+	    {
+	      char x = bfd_get_8 (abfd, addr);
+	      DOIT (x);
+	      bfd_put_8 (abfd, x, addr);
+	    }
+	    break;
+
+	  case 1:
+	    {
+	      short x = bfd_get_16 (abfd, addr);
+	      DOIT (x);
+	      bfd_put_16 (abfd, (bfd_vma) x, addr);
+	    }
+	    break;
+
+	  case 2:
+	    {
+	      long x = bfd_get_32 (abfd, addr);
+	      DOIT (x);
+	      bfd_put_32 (abfd, (bfd_vma) x, addr);
+	    }
+	    break;
+
+	  default:
+	    abort ();
+	  }
+      }
+
+  /* Now let bfd_perform_relocation finish everything up.  */
+  return bfd_reloc_continue;
+}
+
+#ifdef COFF_WITH_PE
+/* Return TRUE if this relocation should appear in the output .reloc
+   section.  */
+
+static bfd_boolean in_reloc_p PARAMS ((bfd *, reloc_howto_type *));
+
+static bfd_boolean in_reloc_p (abfd, howto)
+     bfd * abfd ATTRIBUTE_UNUSED;
+     reloc_howto_type *howto;
+{
+  return ! howto->pc_relative && howto->type != R_IMAGEBASE
+	 && howto->type != R_SECREL32;
+}
+#endif /* COFF_WITH_PE */
+
+#ifndef PCRELOFFSET
+#define PCRELOFFSET FALSE
+#endif
+
+static reloc_howto_type howto_table[] =
+{
+  EMPTY_HOWTO (0),
+  EMPTY_HOWTO (1),
+  EMPTY_HOWTO (2),
+  EMPTY_HOWTO (3),
+  EMPTY_HOWTO (4),
+  EMPTY_HOWTO (5),
+  HOWTO (R_DIR32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 coff_i386_reloc,	/* special_function */
+	 "dir32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+  /* PE IMAGE_REL_I386_DIR32NB relocation (7).	*/
+  HOWTO (R_IMAGEBASE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 coff_i386_reloc,	/* special_function */
+	 "rva32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  EMPTY_HOWTO (010),
+  EMPTY_HOWTO (011),
+  EMPTY_HOWTO (012),
+#ifdef COFF_WITH_PE
+  /* 32-bit longword section relative relocation (013).  */
+  HOWTO (R_SECREL32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 coff_i386_reloc,	/* special_function */
+	 "secrel32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+#else
+  EMPTY_HOWTO (013),
+#endif
+  EMPTY_HOWTO (014),
+  EMPTY_HOWTO (015),
+  EMPTY_HOWTO (016),
+  /* Byte relocation (017).  */
+  HOWTO (R_RELBYTE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 coff_i386_reloc,	/* special_function */
+	 "8",			/* name */
+	 TRUE,			/* partial_inplace */
+	 0x000000ff,		/* src_mask */
+	 0x000000ff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+  /* 16-bit word relocation (020).  */
+  HOWTO (R_RELWORD,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 coff_i386_reloc,	/* special_function */
+	 "16",			/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+  /* 32-bit longword relocation (021).	*/
+  HOWTO (R_RELLONG,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 coff_i386_reloc,	/* special_function */
+	 "32",			/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+  /* Byte PC relative relocation (022).	 */
+  HOWTO (R_PCRBYTE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 coff_i386_reloc,	/* special_function */
+	 "DISP8",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x000000ff,		/* src_mask */
+	 0x000000ff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+  /* 16-bit word PC relative relocation (023).	*/
+  HOWTO (R_PCRWORD,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 coff_i386_reloc,	/* special_function */
+	 "DISP16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+  /* 32-bit longword PC relative relocation (024).  */
+  HOWTO (R_PCRLONG,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 coff_i386_reloc,	/* special_function */
+	 "DISP32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 PCRELOFFSET)		/* pcrel_offset */
+};
+
+/* Turn a howto into a reloc  nunmber */
+
+#define SELECT_RELOC(x,howto) { x.r_type = howto->type; }
+#define BADMAG(x) I386BADMAG(x)
+#define I386 1			/* Customize coffcode.h */
+
+#define RTYPE2HOWTO(cache_ptr, dst)					\
+  ((cache_ptr)->howto =							\
+   ((dst)->r_type < sizeof (howto_table) / sizeof (howto_table[0])	\
+    ? howto_table + (dst)->r_type					\
+    : NULL))
+
+/* For 386 COFF a STYP_NOLOAD | STYP_BSS section is part of a shared
+   library.  On some other COFF targets STYP_BSS is normally
+   STYP_NOLOAD.  */
+#define BSS_NOLOAD_IS_SHARED_LIBRARY
+
+/* Compute the addend of a reloc.  If the reloc is to a common symbol,
+   the object file contains the value of the common symbol.  By the
+   time this is called, the linker may be using a different symbol
+   from a different object file with a different value.  Therefore, we
+   hack wildly to locate the original symbol from this file so that we
+   can make the correct adjustment.  This macro sets coffsym to the
+   symbol from the original file, and uses it to set the addend value
+   correctly.  If this is not a common symbol, the usual addend
+   calculation is done, except that an additional tweak is needed for
+   PC relative relocs.
+   FIXME: This macro refers to symbols and asect; these are from the
+   calling function, not the macro arguments.  */
+
+#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr)		\
+  {								\
+    coff_symbol_type *coffsym = (coff_symbol_type *) NULL;	\
+    if (ptr && bfd_asymbol_bfd (ptr) != abfd)			\
+      coffsym = (obj_symbols (abfd)				\
+	         + (cache_ptr->sym_ptr_ptr - symbols));		\
+    else if (ptr)						\
+      coffsym = coff_symbol_from (abfd, ptr);			\
+    if (coffsym != (coff_symbol_type *) NULL			\
+	&& coffsym->native->u.syment.n_scnum == 0)		\
+      cache_ptr->addend = - coffsym->native->u.syment.n_value;	\
+    else if (ptr && bfd_asymbol_bfd (ptr) == abfd		\
+	     && ptr->section != (asection *) NULL)		\
+      cache_ptr->addend = - (ptr->section->vma + ptr->value);	\
+    else							\
+      cache_ptr->addend = 0;					\
+    if (ptr && howto_table[reloc.r_type].pc_relative)		\
+      cache_ptr->addend += asect->vma;				\
+  }
+
+/* We use the special COFF backend linker.  For normal i386 COFF, we
+   can use the generic relocate_section routine.  For PE, we need our
+   own routine.  */
+
+#ifndef COFF_WITH_PE
+
+#define coff_relocate_section _bfd_coff_generic_relocate_section
+
+#else /* COFF_WITH_PE */
+
+/* The PE relocate section routine.  The only difference between this
+   and the regular routine is that we don't want to do anything for a
+   relocatable link.  */
+
+static bfd_boolean coff_pe_i386_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+	   struct internal_reloc *, struct internal_syment *, asection **));
+
+static bfd_boolean
+coff_pe_i386_relocate_section (output_bfd, info, input_bfd,
+			       input_section, contents, relocs, syms,
+			       sections)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     struct internal_reloc *relocs;
+     struct internal_syment *syms;
+     asection **sections;
+{
+  if (info->relocatable)
+    return TRUE;
+
+  return _bfd_coff_generic_relocate_section (output_bfd, info, input_bfd,
+					     input_section, contents,
+					     relocs, syms, sections);
+}
+
+#define coff_relocate_section coff_pe_i386_relocate_section
+
+#endif /* COFF_WITH_PE */
+
+/* Convert an rtype to howto for the COFF backend linker.  */
+
+static reloc_howto_type *
+coff_i386_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     asection *sec;
+     struct internal_reloc *rel;
+     struct coff_link_hash_entry *h;
+     struct internal_syment *sym;
+     bfd_vma *addendp;
+{
+  reloc_howto_type *howto;
+
+  if (rel->r_type >= sizeof (howto_table) / sizeof (howto_table[0]))
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return NULL;
+    }
+
+  howto = howto_table + rel->r_type;
+
+#ifdef COFF_WITH_PE
+  /* Cancel out code in _bfd_coff_generic_relocate_section.  */
+  *addendp = 0;
+#endif
+
+  if (howto->pc_relative)
+    *addendp += sec->vma;
+
+  if (sym != NULL && sym->n_scnum == 0 && sym->n_value != 0)
+    {
+      /* This is a common symbol.  The section contents include the
+	 size (sym->n_value) as an addend.  The relocate_section
+	 function will be adding in the final value of the symbol.  We
+	 need to subtract out the current size in order to get the
+	 correct result.  */
+
+      BFD_ASSERT (h != NULL);
+
+#ifndef COFF_WITH_PE
+      /* I think we *do* want to bypass this.  If we don't, I have
+	 seen some data parameters get the wrong relocation address.
+	 If I link two versions with and without this section bypassed
+	 and then do a binary comparison, the addresses which are
+	 different can be looked up in the map.  The case in which
+	 this section has been bypassed has addresses which correspond
+	 to values I can find in the map.  */
+      *addendp -= sym->n_value;
+#endif
+    }
+
+#ifndef COFF_WITH_PE
+  /* If the output symbol is common (in which case this must be a
+     relocatable link), we need to add in the final size of the
+     common symbol.  */
+  if (h != NULL && h->root.type == bfd_link_hash_common)
+    *addendp += h->root.u.c.size;
+#endif
+
+#ifdef COFF_WITH_PE
+  if (howto->pc_relative)
+    {
+      *addendp -= 4;
+
+      /* If the symbol is defined, then the generic code is going to
+         add back the symbol value in order to cancel out an
+         adjustment it made to the addend.  However, we set the addend
+         to 0 at the start of this function.  We need to adjust here,
+         to avoid the adjustment the generic code will make.  FIXME:
+         This is getting a bit hackish.  */
+      if (sym != NULL && sym->n_scnum != 0)
+	*addendp -= sym->n_value;
+    }
+
+  if (rel->r_type == R_IMAGEBASE
+      && (bfd_get_flavour(sec->output_section->owner)
+	  == bfd_target_coff_flavour))
+    {
+      *addendp -= pe_data(sec->output_section->owner)->pe_opthdr.ImageBase;
+    }
+
+  BFD_ASSERT (sym != NULL);
+  if (rel->r_type == R_SECREL32 && sym != NULL)
+    {
+      bfd_vma osect_vma;
+
+      if (h && (h->type == bfd_link_hash_defined
+		|| h->type == bfd_link_hash_defweak))
+	osect_vma = h->root.u.def.section->output_section->vma;
+      else
+	{
+	  asection *s;
+	  int i;
+
+	  /* Sigh, the only way to get the section to offset against
+	     is to find it the hard way.  */
+
+	  for (s = abfd->sections, i = 1; i < sym->n_scnum; i++)
+	    s = s->next;
+
+	  osect_vma = s->output_section->vma;
+	}
+
+      *addendp -= osect_vma;
+    }
+#endif
+
+  return howto;
+}
+
+#define coff_bfd_reloc_type_lookup coff_i386_reloc_type_lookup
+#define coff_bfd_reloc_name_lookup coff_i386_reloc_name_lookup
+
+static reloc_howto_type *
+coff_i386_reloc_type_lookup (abfd, code)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     bfd_reloc_code_real_type code;
+{
+  switch (code)
+    {
+    case BFD_RELOC_RVA:
+      return howto_table + R_IMAGEBASE;
+    case BFD_RELOC_32:
+      return howto_table + R_DIR32;
+    case BFD_RELOC_32_PCREL:
+      return howto_table + R_PCRLONG;
+    case BFD_RELOC_16:
+      return howto_table + R_RELWORD;
+    case BFD_RELOC_16_PCREL:
+      return howto_table + R_PCRWORD;
+    case BFD_RELOC_8:
+      return howto_table + R_RELBYTE;
+    case BFD_RELOC_8_PCREL:
+      return howto_table + R_PCRBYTE;
+#ifdef COFF_WITH_PE
+    case BFD_RELOC_32_SECREL:
+      return howto_table + R_SECREL32;
+#endif
+    default:
+      BFD_FAIL ();
+      return 0;
+    }
+}
+
+static reloc_howto_type *
+coff_i386_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			     const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (howto_table) / sizeof (howto_table[0]); i++)
+    if (howto_table[i].name != NULL
+	&& strcasecmp (howto_table[i].name, r_name) == 0)
+      return &howto_table[i];
+
+  return NULL;
+}
+
+#define coff_rtype_to_howto coff_i386_rtype_to_howto
+
+#ifdef TARGET_UNDERSCORE
+
+/* If i386 gcc uses underscores for symbol names, then it does not use
+   a leading dot for local labels, so if TARGET_UNDERSCORE is defined
+   we treat all symbols starting with L as local.  */
+
+static bfd_boolean coff_i386_is_local_label_name
+  PARAMS ((bfd *, const char *));
+
+static bfd_boolean
+coff_i386_is_local_label_name (abfd, name)
+     bfd *abfd;
+     const char *name;
+{
+  if (name[0] == 'L')
+    return TRUE;
+
+  return _bfd_coff_is_local_label_name (abfd, name);
+}
+
+#define coff_bfd_is_local_label_name coff_i386_is_local_label_name
+
+#endif /* TARGET_UNDERSCORE */
+
+#include "coffcode.h"
+
+const bfd_target
+#ifdef TARGET_SYM
+  TARGET_SYM =
+#else
+  i386coff_vec =
+#endif
+{
+#ifdef TARGET_NAME
+  TARGET_NAME,
+#else
+  "coff-i386",			/* name */
+#endif
+  bfd_target_coff_flavour,
+  BFD_ENDIAN_LITTLE,		/* data byte order is little */
+  BFD_ENDIAN_LITTLE,		/* header byte order is little */
+
+  (HAS_RELOC | EXEC_P |		/* object flags */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC /* section flags */
+#ifdef COFF_WITH_PE
+   | SEC_LINK_ONCE | SEC_LINK_DUPLICATES | SEC_READONLY
+#endif
+   | SEC_CODE | SEC_DATA),
+
+#ifdef TARGET_UNDERSCORE
+  TARGET_UNDERSCORE,		/* leading underscore */
+#else
+  0,				/* leading underscore */
+#endif
+  '/',				/* ar_pad_char */
+  15,				/* ar_max_namelen */
+  0,				/* match priority.  */
+
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
+
+/* Note that we allow an object file to be treated as a core file as well.  */
+    /* bfd_check_format */
+#ifdef COFF_CHECK_FORMAT
+    {_bfd_dummy_target, COFF_CHECK_FORMAT,
+       bfd_generic_archive_p, COFF_CHECK_FORMAT},
+#else
+    {_bfd_dummy_target, coff_object_p, bfd_generic_archive_p, coff_object_p},
+#endif
+    {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
+       bfd_false},
+    {bfd_false, coff_write_object_contents, /* bfd_write_contents */
+       _bfd_write_archive_contents, bfd_false},
+
+     BFD_JUMP_TABLE_GENERIC (coff),
+     BFD_JUMP_TABLE_COPY (coff),
+     BFD_JUMP_TABLE_CORE (_bfd_nocore),
+     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+     BFD_JUMP_TABLE_SYMBOLS (coff),
+     BFD_JUMP_TABLE_RELOCS (coff),
+     BFD_JUMP_TABLE_WRITE (coff),
+     BFD_JUMP_TABLE_LINK (coff),
+     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  COFF_SWAP_TABLE
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-i860.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-i860.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-i860.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-i860.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,710 @@
+/* BFD back-end for Intel i860 COFF files.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2007, 2008, 2010, 2011  Free Software Foundation, Inc.
+   Created mostly by substituting "860" for "386" in coff-i386.c
+   Harry Dolan <dolan@ssd.intel.com>, October 1995
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#include "coff/i860.h"
+
+#include "coff/internal.h"
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "libcoff.h"
+
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (2)
+/* The page size is a guess based on ELF.  */
+
+#define COFF_PAGE_SIZE 0x1000
+
+/* For some reason when using i860 COFF the value stored in the .text
+   section for a reference to a common symbol is the value itself plus
+   any desired offset.  Ian Taylor, Cygnus Support.  */
+
+/* If we are producing relocatable output, we need to do some
+   adjustments to the object file that are not done by the
+   bfd_perform_relocation function.  This function is called by every
+   reloc type to make any required adjustments.  */
+
+static bfd_reloc_status_type
+coff_i860_reloc (bfd *abfd,
+		 arelent *reloc_entry,
+		 asymbol *symbol,
+		 void *data,
+		 asection *input_section ATTRIBUTE_UNUSED,
+		 bfd *output_bfd,
+		 char **error_message ATTRIBUTE_UNUSED)
+{
+  symvalue diff;
+
+  if (output_bfd == (bfd *) NULL)
+    return bfd_reloc_continue;
+
+  if (bfd_is_com_section (symbol->section))
+    {
+      /* We are relocating a common symbol.  The current value in the
+	 object file is ORIG + OFFSET, where ORIG is the value of the
+	 common symbol as seen by the object file when it was compiled
+	 (this may be zero if the symbol was undefined) and OFFSET is
+	 the offset into the common symbol (normally zero, but may be
+	 non-zero when referring to a field in a common structure).
+	 ORIG is the negative of reloc_entry->addend, which is set by
+	 the CALC_ADDEND macro below.  We want to replace the value in
+	 the object file with NEW + OFFSET, where NEW is the value of
+	 the common symbol which we are going to put in the final
+	 object file.  NEW is symbol->value.  */
+      diff = symbol->value + reloc_entry->addend;
+    }
+  else
+    {
+      /* For some reason bfd_perform_relocation always effectively
+	 ignores the addend for a COFF target when producing
+	 relocatable output.  This seems to be always wrong for 860
+	 COFF, so we handle the addend here instead.  */
+      diff = reloc_entry->addend;
+    }
+
+#define DOIT(x) \
+  x = ((x & ~howto->dst_mask) | (((x & howto->src_mask) + diff) & howto->dst_mask))
+
+    if (diff != 0)
+      {
+	reloc_howto_type *howto = reloc_entry->howto;
+	unsigned char *addr = (unsigned char *) data + reloc_entry->address;
+
+	switch (howto->size)
+	  {
+	  case 0:
+	    {
+	      char x = bfd_get_8 (abfd, addr);
+	      DOIT (x);
+	      bfd_put_8 (abfd, x, addr);
+	    }
+	    break;
+
+	  case 1:
+	    {
+	      short x = bfd_get_16 (abfd, addr);
+	      DOIT (x);
+	      bfd_put_16 (abfd, (bfd_vma) x, addr);
+	    }
+	    break;
+
+	  case 2:
+	    {
+	      long x = bfd_get_32 (abfd, addr);
+	      DOIT (x);
+	      bfd_put_32 (abfd, (bfd_vma) x, addr);
+	    }
+	    break;
+
+	  default:
+	    abort ();
+	  }
+      }
+
+  /* Now let bfd_perform_relocation finish everything up.  */
+  return bfd_reloc_continue;
+}
+
+/* This is just a temporary measure until we teach bfd to generate 
+   these relocations.  */
+
+static bfd_reloc_status_type
+coff_i860_reloc_nyi (bfd *abfd ATTRIBUTE_UNUSED,
+		     arelent *reloc_entry,
+		     asymbol *symbol ATTRIBUTE_UNUSED,
+		     void *data ATTRIBUTE_UNUSED,
+		     asection *input_section ATTRIBUTE_UNUSED,
+		     bfd *output_bfd ATTRIBUTE_UNUSED,
+		     char **error_message ATTRIBUTE_UNUSED)
+{
+  reloc_howto_type *howto = reloc_entry->howto;
+  (*_bfd_error_handler) (_("relocation `%s' not yet implemented"), howto->name);
+  return bfd_reloc_notsupported;
+}
+
+#ifndef PCRELOFFSET
+#define PCRELOFFSET FALSE
+#endif
+
+static reloc_howto_type howto_table[] =
+{
+  EMPTY_HOWTO (0),
+  EMPTY_HOWTO (1),
+  EMPTY_HOWTO (2),
+  EMPTY_HOWTO (3),
+  EMPTY_HOWTO (4),
+  EMPTY_HOWTO (5),
+  HOWTO (R_DIR32,               /* type */
+	 0,	                /* rightshift */
+	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 32,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 coff_i860_reloc,       /* special_function */
+	 "dir32",               /* name */
+	 TRUE,	                /* partial_inplace */
+	 0xffffffff,            /* src_mask */
+	 0xffffffff,            /* dst_mask */
+	 TRUE),                /* pcrel_offset */
+  /* {7}, */
+  HOWTO (R_IMAGEBASE,            /* type */
+	 0,	                /* rightshift */
+	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 32,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 coff_i860_reloc,       /* special_function */
+	 "rva32",	           /* name */
+	 TRUE,	                /* partial_inplace */
+	 0xffffffff,            /* src_mask */
+	 0xffffffff,            /* dst_mask */
+	 FALSE),                /* pcrel_offset */
+  EMPTY_HOWTO (010),
+  EMPTY_HOWTO (011),
+  EMPTY_HOWTO (012),
+  EMPTY_HOWTO (013),
+  EMPTY_HOWTO (014),
+  EMPTY_HOWTO (015),
+  EMPTY_HOWTO (016),
+  HOWTO (R_RELBYTE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 coff_i860_reloc,	/* special_function */
+	 "8",			/* name */
+	 TRUE,			/* partial_inplace */
+	 0x000000ff,		/* src_mask */
+	 0x000000ff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+  HOWTO (R_RELWORD,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 coff_i860_reloc,	/* special_function */
+	 "16",			/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+  HOWTO (R_RELLONG,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 coff_i860_reloc,	/* special_function */
+	 "32",			/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+  HOWTO (R_PCRBYTE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 coff_i860_reloc,	/* special_function */
+	 "DISP8",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x000000ff,		/* src_mask */
+	 0x000000ff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+  HOWTO (R_PCRWORD,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 coff_i860_reloc,	/* special_function */
+	 "DISP16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+  HOWTO (R_PCRLONG,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 coff_i860_reloc,	/* special_function */
+	 "DISP32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+  EMPTY_HOWTO (0x15),
+  EMPTY_HOWTO (0x16),
+  EMPTY_HOWTO (0x17),
+  EMPTY_HOWTO (0x18),
+  EMPTY_HOWTO (0x19),
+  EMPTY_HOWTO (0x1a),
+  EMPTY_HOWTO (0x1b),
+  HOWTO (COFF860_R_PAIR,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 coff_i860_reloc_nyi,	/* special_function */
+	 "PAIR",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+  EMPTY_HOWTO (0x1d),
+  HOWTO (COFF860_R_HIGH,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 coff_i860_reloc,	/* special_function */
+	 "HIGH",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+  HOWTO (COFF860_R_LOW0,        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 coff_i860_reloc,	/* special_function */
+	 "LOW0",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+  HOWTO (COFF860_R_LOW1,        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 coff_i860_reloc,	/* special_function */
+	 "LOW1",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xfffe,		/* src_mask */
+	 0xfffe,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+  HOWTO (COFF860_R_LOW2,        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 coff_i860_reloc,	/* special_function */
+	 "LOW2",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xfffc,		/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+  HOWTO (COFF860_R_LOW3,        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 coff_i860_reloc,	/* special_function */
+	 "LOW3",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xfff8,		/* src_mask */
+	 0xfff8,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+  HOWTO (COFF860_R_LOW4,        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 coff_i860_reloc,	/* special_function */
+	 "LOW4",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xfff0,		/* src_mask */
+	 0xfff0,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+  HOWTO (COFF860_R_SPLIT0,      /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 coff_i860_reloc_nyi,	/* special_function */
+	 "SPLIT0",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x1f07ff,		/* src_mask */
+	 0x1f07ff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+  HOWTO (COFF860_R_SPLIT1,      /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 coff_i860_reloc_nyi,	/* special_function */
+	 "SPLIT1",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x1f07fe,		/* src_mask */
+	 0x1f07fe,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+  HOWTO (COFF860_R_SPLIT2,      /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 coff_i860_reloc_nyi,	/* special_function */
+	 "SPLIT2",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x1f07fc,		/* src_mask */
+	 0x1f07fc,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+  HOWTO (COFF860_R_HIGHADJ,     /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 coff_i860_reloc_nyi,	/* special_function */
+	 "HIGHADJ",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+  HOWTO (COFF860_R_BRADDR,      /* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 coff_i860_reloc_nyi,	/* special_function */
+	 "BRADDR",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x3ffffff,		/* src_mask */
+	 0x3ffffff,		/* dst_mask */
+	 TRUE)		        /* pcrel_offset */
+};
+
+/* Turn a howto into a reloc number.  */
+
+#define SELECT_RELOC(x,howto) { x.r_type = howto->type; }
+#define BADMAG(x) I860BADMAG(x)
+#define I860 1			/* Customize coffcode.h */
+
+#define RTYPE2HOWTO(cache_ptr, dst)					\
+  ((cache_ptr)->howto =							\
+   ((dst)->r_type < sizeof (howto_table) / sizeof (howto_table[0])	\
+    ? howto_table + (dst)->r_type					\
+    : NULL))
+
+/* For 860 COFF a STYP_NOLOAD | STYP_BSS section is part of a shared
+   library.  On some other COFF targets STYP_BSS is normally
+   STYP_NOLOAD.  */
+#define BSS_NOLOAD_IS_SHARED_LIBRARY
+
+/* Compute the addend of a reloc.  If the reloc is to a common symbol,
+   the object file contains the value of the common symbol.  By the
+   time this is called, the linker may be using a different symbol
+   from a different object file with a different value.  Therefore, we
+   hack wildly to locate the original symbol from this file so that we
+   can make the correct adjustment.  This macro sets coffsym to the
+   symbol from the original file, and uses it to set the addend value
+   correctly.  If this is not a common symbol, the usual addend
+   calculation is done, except that an additional tweak is needed for
+   PC relative relocs.
+   FIXME: This macro refers to symbols and asect; these are from the
+   calling function, not the macro arguments.  */
+
+#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr)
+
+/* We use the special COFF backend linker.  */
+#define coff_relocate_section _bfd_coff_generic_relocate_section
+
+static reloc_howto_type *
+coff_i860_rtype_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+			  asection *sec,
+			  struct internal_reloc *rel,
+			  struct coff_link_hash_entry *h,
+			  struct internal_syment *sym,
+			  bfd_vma *addendp)
+{
+
+  reloc_howto_type *howto;
+
+  if (rel->r_type > sizeof (howto_table) / sizeof (howto_table[0]))
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return NULL;
+    }
+
+  howto = howto_table + rel->r_type;
+
+  if (howto->pc_relative)
+    *addendp += sec->vma;
+
+  if (sym != NULL && sym->n_scnum == 0 && sym->n_value != 0)
+    {
+      /* This is a common symbol.  The section contents include the
+	 size (sym->n_value) as an addend.  The relocate_section
+	 function will be adding in the final value of the symbol.  We
+	 need to subtract out the current size in order to get the
+	 correct result.  */
+
+      BFD_ASSERT (h != NULL);
+
+      /* I think we *do* want to bypass this.  If we don't, I have seen some data
+	 parameters get the wrong relocation address.  If I link two versions
+	 with and without this section bypassed and then do a binary comparison,
+	 the addresses which are different can be looked up in the map.  The
+	 case in which this section has been bypassed has addresses which correspond
+	 to values I can find in the map.  */
+      *addendp -= sym->n_value;
+    }
+
+  /* If the output symbol is common (in which case this must be a
+     relocatable link), we need to add in the final size of the
+     common symbol.  */
+  if (h != NULL && h->root.type == bfd_link_hash_common)
+    *addendp += h->root.u.c.size;
+
+  return howto;
+}
+
+static reloc_howto_type *
+coff_i860_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			     bfd_reloc_code_real_type code)
+{
+  switch (code)
+    {
+    case BFD_RELOC_32:
+      return howto_table + R_DIR32;
+    case BFD_RELOC_860_PC26:
+      return howto_table + COFF860_R_BRADDR;
+    case BFD_RELOC_860_PC16:
+      /* ??? How to handle PC16 for COFF?  SPLIT0 is close for now.  */
+      return howto_table + COFF860_R_SPLIT0;
+    case BFD_RELOC_860_LOW0:
+      return howto_table + COFF860_R_LOW0;
+    case BFD_RELOC_860_SPLIT0:
+      return howto_table + COFF860_R_SPLIT0;
+    case BFD_RELOC_860_LOW1:
+      return howto_table + COFF860_R_LOW1;
+    case BFD_RELOC_860_SPLIT1:
+      return howto_table + COFF860_R_SPLIT1;
+    case BFD_RELOC_860_LOW2:
+      return howto_table + COFF860_R_LOW2;
+    case BFD_RELOC_860_SPLIT2:
+      return howto_table + COFF860_R_SPLIT2;
+    case BFD_RELOC_860_LOW3:
+      return howto_table + COFF860_R_LOW3;
+    case BFD_RELOC_860_HIGHADJ:
+      return howto_table + COFF860_R_HIGHADJ;
+    case BFD_RELOC_860_HIGH:
+      return howto_table + COFF860_R_HIGH;
+    default:
+      BFD_FAIL ();
+      return 0;
+    }
+}
+
+static reloc_howto_type *
+coff_i860_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			     const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (howto_table) / sizeof (howto_table[0]); i++)
+    if (howto_table[i].name != NULL
+	&& strcasecmp (howto_table[i].name, r_name) == 0)
+      return &howto_table[i];
+
+  return NULL;
+}
+
+/* This is called from coff_slurp_reloc_table for each relocation
+   entry.  This special handling is due to the `PAIR' relocation
+   which has a different meaning for the `r_symndx' field.  */
+
+static void
+i860_reloc_processing (arelent *cache_ptr, struct internal_reloc *dst,
+		       asymbol **symbols, bfd *abfd, asection *asect)
+{
+  if (dst->r_type == COFF860_R_PAIR)
+    {
+      /* Handle the PAIR relocation specially.  */
+      cache_ptr->howto = howto_table + dst->r_type;
+      cache_ptr->address = dst->r_vaddr;
+      cache_ptr->addend = dst->r_symndx;
+      cache_ptr->sym_ptr_ptr= bfd_abs_section_ptr->symbol_ptr_ptr;
+    }
+  else
+    {
+      /* For every other relocation, do exactly what coff_slurp_reloc_table
+         would do (which this code is taken directly from).  */
+      asymbol *ptr = NULL;
+      cache_ptr->address = dst->r_vaddr;
+
+      if (dst->r_symndx != -1)
+	{
+	  if (dst->r_symndx < 0 || dst->r_symndx >= obj_conv_table_size (abfd))
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: warning: illegal symbol index %ld in relocs"),
+		 abfd, dst->r_symndx);
+	      cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+	      ptr = NULL;
+	    }
+	  else
+	    {
+	      cache_ptr->sym_ptr_ptr = (symbols
+					+ obj_convert (abfd)[dst->r_symndx]);
+	      ptr = *(cache_ptr->sym_ptr_ptr);
+	    }
+	}
+      else
+	{
+	  cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+	  ptr = NULL;
+	}
+
+      /* The symbols definitions that we have read in have been
+	 relocated as if their sections started at 0. But the offsets
+	 refering to the symbols in the raw data have not been
+	 modified, so we have to have a negative addend to compensate.
+
+	 Note that symbols which used to be common must be left alone.  */
+
+      /* Calculate any reloc addend by looking at the symbol.  */
+      CALC_ADDEND (abfd, ptr, (*dst), cache_ptr);
+      (void) ptr;
+
+      cache_ptr->address -= asect->vma;
+
+      /* Fill in the cache_ptr->howto field from dst->r_type.  */
+      RTYPE2HOWTO (cache_ptr, dst);
+    }
+}
+
+#define coff_rtype_to_howto		coff_i860_rtype_to_howto
+#define coff_bfd_reloc_type_lookup	coff_i860_reloc_type_lookup
+#define coff_bfd_reloc_name_lookup coff_i860_reloc_name_lookup
+
+#define RELOC_PROCESSING(relent, reloc, symbols, abfd, section) \
+  i860_reloc_processing (relent, reloc, symbols, abfd, section)
+
+#include "coffcode.h"
+
+static const bfd_target *
+i3coff_object_p(bfd *a)
+{
+  return coff_object_p (a);
+}
+
+const bfd_target
+#ifdef TARGET_SYM
+  TARGET_SYM =
+#else
+  i860coff_vec =
+#endif
+{
+#ifdef TARGET_NAME
+  TARGET_NAME,
+#else
+  "coff-i860",			/* name */
+#endif
+  bfd_target_coff_flavour,
+  BFD_ENDIAN_LITTLE,		/* data byte order is little */
+  BFD_ENDIAN_LITTLE,		/* header byte order is little */
+
+  (HAS_RELOC | EXEC_P |		/* object flags */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+  '_',				/* leading underscore */
+  '/',				/* ar_pad_char */
+  15,				/* ar_max_namelen */
+  0,				/* match priority.  */
+
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
+
+/* Note that we allow an object file to be treated as a core file as well.  */
+    {_bfd_dummy_target, i3coff_object_p, /* bfd_check_format */
+       bfd_generic_archive_p, i3coff_object_p},
+    {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
+       bfd_false},
+    {bfd_false, coff_write_object_contents, /* bfd_write_contents */
+       _bfd_write_archive_contents, bfd_false},
+
+     BFD_JUMP_TABLE_GENERIC (coff),
+     BFD_JUMP_TABLE_COPY (coff),
+     BFD_JUMP_TABLE_CORE (_bfd_nocore),
+     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+     BFD_JUMP_TABLE_SYMBOLS (coff),
+     BFD_JUMP_TABLE_RELOCS (coff),
+     BFD_JUMP_TABLE_WRITE (coff),
+     BFD_JUMP_TABLE_LINK (coff),
+     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  COFF_SWAP_TABLE
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-i960.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-i960.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-i960.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-i960.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,689 @@
+/* BFD back-end for Intel 960 COFF files.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999, 2000, 2001,
+   2002, 2003, 2004, 2005, 2007, 2008, 2009, 2011
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define I960 1
+#define BADMAG(x) I960BADMAG(x)
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "coff/i960.h"
+#include "coff/internal.h"
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "libcoff.h"		/* To allow easier abstraction-breaking.  */
+
+static bfd_boolean coff_i960_is_local_label_name
+  PARAMS ((bfd *, const char *));
+static bfd_reloc_status_type optcall_callback
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_reloc_status_type coff_i960_relocate
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static reloc_howto_type *coff_i960_reloc_type_lookup
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
+static bfd_boolean coff_i960_start_final_link
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean coff_i960_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+	   struct internal_reloc *, struct internal_syment *, asection **));
+static bfd_boolean coff_i960_adjust_symndx
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
+	   struct internal_reloc *, bfd_boolean *));
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
+#define COFF_ALIGN_IN_SECTION_HEADER 1
+
+#define GET_SCNHDR_ALIGN H_GET_32
+#define PUT_SCNHDR_ALIGN H_PUT_32
+
+/* The i960 does not support an MMU, so COFF_PAGE_SIZE can be
+   arbitrarily small.  */
+#define COFF_PAGE_SIZE 1
+
+#define COFF_LONG_FILENAMES
+
+/* This set of local label names is taken from gas.  */
+
+static bfd_boolean
+coff_i960_is_local_label_name (abfd, name)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     const char *name;
+{
+  return (name[0] == 'L'
+	  || (name[0] == '.'
+	      && (name[1] == 'C'
+		  || name[1] == 'I'
+		  || name[1] == '.')));
+}
+
+/* This is just like the usual CALC_ADDEND, but it includes the
+   section VMA for PC relative relocs.  */
+#ifndef CALC_ADDEND
+#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr)                \
+  {                                                             \
+    coff_symbol_type *coffsym = (coff_symbol_type *) NULL;      \
+    if (ptr && bfd_asymbol_bfd (ptr) != abfd)                   \
+      coffsym = (obj_symbols (abfd)                             \
+                 + (cache_ptr->sym_ptr_ptr - symbols));         \
+    else if (ptr)                                               \
+      coffsym = coff_symbol_from (abfd, ptr);                   \
+    if (coffsym != (coff_symbol_type *) NULL                    \
+        && coffsym->native->u.syment.n_scnum == 0)              \
+      cache_ptr->addend = 0;                                    \
+    else if (ptr && bfd_asymbol_bfd (ptr) == abfd               \
+             && ptr->section != (asection *) NULL)              \
+      cache_ptr->addend = - (ptr->section->vma + ptr->value);   \
+    else                                                        \
+      cache_ptr->addend = 0;                                    \
+    if (ptr && (reloc.r_type == 25 || reloc.r_type == 27))	\
+      cache_ptr->addend += asect->vma;				\
+  }
+#endif
+
+#define CALLS	 0x66003800	/* Template for 'calls' instruction	*/
+#define BAL	 0x0b000000	/* Template for 'bal' instruction	*/
+#define BAL_MASK 0x00ffffff
+
+static bfd_reloc_status_type
+optcall_callback (abfd, reloc_entry, symbol_in, data,
+		  input_section, ignore_bfd, error_message)
+     bfd *abfd;
+     arelent *reloc_entry;
+     asymbol *symbol_in;
+     PTR data;
+     asection *input_section;
+     bfd *ignore_bfd ATTRIBUTE_UNUSED;
+     char **error_message;
+{
+  /* This item has already been relocated correctly, but we may be
+   * able to patch in yet better code - done by digging out the
+   * correct info on this symbol */
+  bfd_reloc_status_type result;
+  coff_symbol_type *cs = coffsymbol(symbol_in);
+
+  /* Don't do anything with symbols which aren't tied up yet,
+     except move the reloc.  */
+  if (bfd_is_und_section (cs->symbol.section)) {
+    reloc_entry->address += input_section->output_offset;
+    return bfd_reloc_ok;
+  }
+
+  /* So the target symbol has to be of coff type, and the symbol
+     has to have the correct native information within it */
+  if ((bfd_asymbol_flavour(&cs->symbol) != bfd_target_coff_flavour)
+      || (cs->native == (combined_entry_type *)NULL))
+    {
+      /* This is interesting, consider the case where we're outputting coff
+	 from a mix n match input, linking from coff to a symbol defined in a
+	 bout file will cause this match to be true. Should I complain?  This
+	 will only work if the bout symbol is non leaf.  */
+      *error_message =
+	(char *) _("uncertain calling convention for non-COFF symbol");
+      result = bfd_reloc_dangerous;
+    }
+  else
+    {
+    switch (cs->native->u.syment.n_sclass)
+      {
+      case C_LEAFSTAT:
+      case C_LEAFEXT:
+  	/* This is a call to a leaf procedure, replace instruction with a bal
+	   to the correct location.  */
+	{
+	  union internal_auxent *aux = &((cs->native+2)->u.auxent);
+	  int word = bfd_get_32 (abfd, (bfd_byte *)data + reloc_entry->address);
+	  int olf = (aux->x_bal.x_balntry - cs->native->u.syment.n_value);
+	  BFD_ASSERT(cs->native->u.syment.n_numaux==2);
+
+	  /* We replace the original call instruction with a bal to
+	     the bal entry point - the offset of which is described in
+	     the 2nd auxent of the original symbol. We keep the native
+	     sym and auxents untouched, so the delta between the two
+	     is the offset of the bal entry point.  */
+	  word = ((word +  olf)  & BAL_MASK) | BAL;
+  	  bfd_put_32 (abfd, (bfd_vma) word,
+		      (bfd_byte *) data + reloc_entry->address);
+  	}
+	result = bfd_reloc_ok;
+	break;
+      case C_SCALL:
+	/* This is a call to a system call, replace with a calls to # */
+	BFD_ASSERT(0);
+	result = bfd_reloc_ok;
+	break;
+      default:
+	result = bfd_reloc_ok;
+	break;
+      }
+  }
+  return result;
+}
+
+/* i960 COFF is used by VxWorks 5.1.  However, VxWorks 5.1 does not
+   appear to correctly handle a reloc against a symbol defined in the
+   same object file.  It appears to simply discard such relocs, rather
+   than adding their values into the object file.  We handle this here
+   by converting all relocs against defined symbols into relocs
+   against the section symbol, when generating a relocatable output
+   file.
+
+   Note that this function is only called if we are not using the COFF
+   specific backend linker.  It only does something when doing a
+   relocatable link, which will almost certainly fail when not
+   generating COFF i960 output, so this function is actually no longer
+   useful.  It was used before this target was converted to use the
+   COFF specific backend linker.  */
+
+static bfd_reloc_status_type
+coff_i960_relocate (abfd, reloc_entry, symbol, data, input_section,
+		    output_bfd, error_message)
+     bfd *abfd;
+     arelent *reloc_entry;
+     asymbol *symbol;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section ATTRIBUTE_UNUSED;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  asection *osec;
+
+  if (output_bfd == NULL)
+    {
+      /* Not generating relocatable output file.  */
+      return bfd_reloc_continue;
+    }
+
+  if (bfd_is_und_section (bfd_get_section (symbol)))
+    {
+      /* Symbol is not defined, so no need to worry about it.  */
+      return bfd_reloc_continue;
+    }
+
+  if (bfd_is_com_section (bfd_get_section (symbol)))
+    {
+      /* I don't really know what the right action is for a common
+         symbol.  */
+      return bfd_reloc_continue;
+    }
+
+  /* Convert the reloc to use the section symbol.  FIXME: This method
+     is ridiculous.  */
+  osec = bfd_get_section (symbol)->output_section;
+  if (coff_section_data (output_bfd, osec) != NULL
+      && coff_section_data (output_bfd, osec)->tdata != NULL)
+    reloc_entry->sym_ptr_ptr =
+      (asymbol **) coff_section_data (output_bfd, osec)->tdata;
+  else
+    {
+      const char *sec_name;
+      asymbol **syms, **sym_end;
+
+      sec_name = bfd_get_section_name (output_bfd, osec);
+      syms = bfd_get_outsymbols (output_bfd);
+      sym_end = syms + bfd_get_symcount (output_bfd);
+      for (; syms < sym_end; syms++)
+	{
+	  if (bfd_asymbol_name (*syms) != NULL
+	      && (*syms)->value == 0
+	      && strcmp ((*syms)->section->output_section->name,
+			 sec_name) == 0)
+	    break;
+	}
+
+      if (syms >= sym_end)
+	abort ();
+
+      reloc_entry->sym_ptr_ptr = syms;
+
+      if (coff_section_data (output_bfd, osec) == NULL)
+	{
+	  bfd_size_type amt = sizeof (struct coff_section_tdata);
+	  osec->used_by_bfd = (PTR) bfd_zalloc (abfd, amt);
+	  if (osec->used_by_bfd == NULL)
+	    return bfd_reloc_overflow;
+	}
+      coff_section_data (output_bfd, osec)->tdata = (PTR) syms;
+    }
+
+  /* Let bfd_perform_relocation do its thing, which will include
+     stuffing the symbol addend into the object file.  */
+  return bfd_reloc_continue;
+}
+
+static reloc_howto_type howto_rellong =
+  HOWTO ((unsigned int) R_RELLONG, 0, 2, 32,FALSE, 0,
+	 complain_overflow_bitfield, coff_i960_relocate,"rellong", TRUE,
+	 0xffffffff, 0xffffffff, 0);
+static reloc_howto_type howto_iprmed =
+  HOWTO (R_IPRMED, 0, 2, 24,TRUE,0, complain_overflow_signed,
+	 coff_i960_relocate, "iprmed ", TRUE, 0x00ffffff, 0x00ffffff, 0);
+static reloc_howto_type howto_optcall =
+  HOWTO (R_OPTCALL, 0,2,24,TRUE,0, complain_overflow_signed,
+	 optcall_callback, "optcall", TRUE, 0x00ffffff, 0x00ffffff, 0);
+
+static reloc_howto_type *
+coff_i960_reloc_type_lookup (abfd, code)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     bfd_reloc_code_real_type code;
+{
+  switch (code)
+    {
+    default:
+      return 0;
+    case BFD_RELOC_I960_CALLJ:
+      return &howto_optcall;
+    case BFD_RELOC_32:
+    case BFD_RELOC_CTOR:
+      return &howto_rellong;
+    case BFD_RELOC_24_PCREL:
+      return &howto_iprmed;
+    }
+}
+
+static reloc_howto_type *
+coff_i960_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			     const char *r_name)
+{
+  if (strcasecmp (howto_optcall.name, r_name) == 0)
+    return &howto_optcall;
+  if (strcasecmp (howto_rellong.name, r_name) == 0)
+    return &howto_rellong;
+  if (strcasecmp (howto_iprmed.name, r_name) == 0)
+    return &howto_iprmed;
+
+  return NULL;
+}
+
+/* The real code is in coffcode.h */
+
+#define RTYPE2HOWTO(cache_ptr, dst) \
+{							\
+   reloc_howto_type *howto_ptr;				\
+   switch ((dst)->r_type) {				\
+     case 17: howto_ptr = &howto_rellong; break;	\
+     case 25: howto_ptr = &howto_iprmed; break;		\
+     case 27: howto_ptr = &howto_optcall; break;	\
+     default: howto_ptr = 0; break;			\
+     }							\
+   (cache_ptr)->howto = howto_ptr;			\
+ }
+
+/* i960 COFF is used by VxWorks 5.1.  However, VxWorks 5.1 does not
+   appear to correctly handle a reloc against a symbol defined in the
+   same object file.  It appears to simply discard such relocs, rather
+   than adding their values into the object file.  We handle this by
+   converting all relocs against global symbols into relocs against
+   internal symbols at the start of the section.  This routine is
+   called at the start of the linking process, and it creates the
+   necessary symbols.  */
+
+static bfd_boolean
+coff_i960_start_final_link (abfd, info)
+     bfd *abfd;
+     struct bfd_link_info *info;
+{
+  bfd_size_type symesz = bfd_coff_symesz (abfd);
+  asection *o;
+  bfd_byte *esym;
+
+  if (! info->relocatable)
+    return TRUE;
+
+  esym = (bfd_byte *) bfd_malloc (symesz);
+  if (esym == NULL)
+    return FALSE;
+
+  if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0)
+    return FALSE;
+
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      struct internal_syment isym;
+
+      strncpy (isym._n._n_name, o->name, SYMNMLEN);
+      isym.n_value = 0;
+      isym.n_scnum = o->target_index;
+      isym.n_type = T_NULL;
+      isym.n_sclass = C_STAT;
+      isym.n_numaux = 0;
+
+      bfd_coff_swap_sym_out (abfd, (PTR) &isym, (PTR) esym);
+
+      if (bfd_bwrite (esym, symesz, abfd) != symesz)
+	{
+	  free (esym);
+	  return FALSE;
+	}
+
+      obj_raw_syment_count (abfd) += 1;
+    }
+
+  free (esym);
+
+  return TRUE;
+}
+
+/* The reloc processing routine for the optimized COFF linker.  */
+
+static bfd_boolean
+coff_i960_relocate_section (output_bfd, info, input_bfd, input_section,
+			    contents, relocs, syms, sections)
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     struct internal_reloc *relocs;
+     struct internal_syment *syms;
+     asection **sections;
+{
+  struct internal_reloc *rel;
+  struct internal_reloc *relend;
+
+  rel = relocs;
+  relend = rel + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      long symndx;
+      struct coff_link_hash_entry *h;
+      struct internal_syment *sym;
+      bfd_vma addend;
+      bfd_vma val;
+      reloc_howto_type *howto;
+      bfd_reloc_status_type rstat = bfd_reloc_ok;
+      bfd_boolean done;
+
+      symndx = rel->r_symndx;
+
+      if (symndx == -1)
+	{
+	  h = NULL;
+	  sym = NULL;
+	}
+      else
+	{
+	  h = obj_coff_sym_hashes (input_bfd)[symndx];
+	  sym = syms + symndx;
+	}
+
+      if (sym != NULL && sym->n_scnum != 0)
+	addend = - sym->n_value;
+      else
+	addend = 0;
+
+      switch (rel->r_type)
+	{
+	case 17: howto = &howto_rellong; break;
+	case 25: howto = &howto_iprmed; break;
+	case 27: howto = &howto_optcall; break;
+	default:
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      val = 0;
+
+      if (h == NULL)
+	{
+	  asection *sec;
+
+	  if (symndx == -1)
+	    {
+	      sec = bfd_abs_section_ptr;
+	      val = 0;
+	    }
+	  else
+	    {
+	      sec = sections[symndx];
+              val = (sec->output_section->vma
+		     + sec->output_offset
+		     + sym->n_value
+		     - sec->vma);
+	    }
+	}
+      else
+	{
+	  if (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	    {
+	      asection *sec;
+
+	      sec = h->root.u.def.section;
+	      val = (h->root.u.def.value
+		     + sec->output_section->vma
+		     + sec->output_offset);
+	    }
+	  else if (! info->relocatable)
+	    {
+	      if (! ((*info->callbacks->undefined_symbol)
+		     (info, h->root.root.string, input_bfd, input_section,
+		      rel->r_vaddr - input_section->vma, TRUE)))
+		return FALSE;
+	    }
+	}
+
+      done = FALSE;
+
+      if (howto->type == R_OPTCALL && ! info->relocatable && symndx != -1)
+	{
+	  int class_val;
+
+	  if (h != NULL)
+	    class_val = h->symbol_class;
+	  else
+	    class_val = sym->n_sclass;
+
+	  switch (class_val)
+	    {
+	    case C_NULL:
+	      /* This symbol is apparently not from a COFF input file.
+                 We warn, and then assume that it is not a leaf
+                 function.  */
+	      if (! ((*info->callbacks->reloc_dangerous)
+		     (info,
+		      _("uncertain calling convention for non-COFF symbol"),
+		      input_bfd, input_section,
+		      rel->r_vaddr - input_section->vma)))
+		return FALSE;
+	      break;
+	    case C_LEAFSTAT:
+	    case C_LEAFEXT:
+	      /* This is a call to a leaf procedure; use the bal
+                 instruction.  */
+	      {
+		long olf;
+		unsigned long word;
+
+		if (h != NULL)
+		  {
+		    BFD_ASSERT (h->numaux == 2);
+		    olf = h->aux[1].x_bal.x_balntry;
+		  }
+		else
+		  {
+		    bfd_byte *esyms;
+		    union internal_auxent aux;
+
+		    BFD_ASSERT (sym->n_numaux == 2);
+		    esyms = (bfd_byte *) obj_coff_external_syms (input_bfd);
+		    esyms += (symndx + 2) * bfd_coff_symesz (input_bfd);
+		    bfd_coff_swap_aux_in (input_bfd, (PTR) esyms, sym->n_type,
+					  sym->n_sclass, 1, sym->n_numaux,
+					  (PTR) &aux);
+		    olf = aux.x_bal.x_balntry;
+		  }
+
+		word = bfd_get_32 (input_bfd,
+				   (contents
+				    + (rel->r_vaddr - input_section->vma)));
+		word = ((word + olf - val) & BAL_MASK) | BAL;
+		bfd_put_32 (input_bfd,
+			    (bfd_vma) word,
+			    contents + (rel->r_vaddr - input_section->vma));
+		done = TRUE;
+	      }
+	      break;
+	    case C_SCALL:
+	      BFD_ASSERT (0);
+	      break;
+	    }
+	}
+
+      if (! done)
+	{
+	  if (howto->pc_relative)
+	    addend += input_section->vma;
+	  rstat = _bfd_final_link_relocate (howto, input_bfd, input_section,
+					    contents,
+					    rel->r_vaddr - input_section->vma,
+					    val, addend);
+	}
+
+      switch (rstat)
+	{
+	default:
+	  abort ();
+	case bfd_reloc_ok:
+	  break;
+	case bfd_reloc_overflow:
+	  {
+	    const char *name;
+	    char buf[SYMNMLEN + 1];
+
+	    if (symndx == -1)
+	      name = "*ABS*";
+	    else if (h != NULL)
+	      name = NULL;
+	    else
+	      {
+		name = _bfd_coff_internal_syment_name (input_bfd, sym, buf);
+		if (name == NULL)
+		  return FALSE;
+	      }
+
+	    if (! ((*info->callbacks->reloc_overflow)
+		   (info, (h ? &h->root : NULL), name, howto->name,
+		    (bfd_vma) 0, input_bfd, input_section,
+		    rel->r_vaddr - input_section->vma)))
+	      return FALSE;
+	  }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Adjust the symbol index of any reloc against a global symbol to
+   instead be a reloc against the internal symbol we created specially
+   for the section.  */
+
+static bfd_boolean
+coff_i960_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp)
+     bfd *obfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+     bfd *ibfd;
+     asection *sec ATTRIBUTE_UNUSED;
+     struct internal_reloc *irel;
+     bfd_boolean *adjustedp;
+{
+  struct coff_link_hash_entry *h;
+
+  *adjustedp = FALSE;
+
+  h = obj_coff_sym_hashes (ibfd)[irel->r_symndx];
+  if (h == NULL
+      || (h->root.type != bfd_link_hash_defined
+	  && h->root.type != bfd_link_hash_defweak))
+    return TRUE;
+
+  irel->r_symndx = h->root.u.def.section->output_section->target_index - 1;
+  *adjustedp = TRUE;
+
+  return TRUE;
+}
+
+#define coff_bfd_is_local_label_name coff_i960_is_local_label_name
+
+#define coff_start_final_link coff_i960_start_final_link
+
+#define coff_relocate_section coff_i960_relocate_section
+
+#define coff_adjust_symndx coff_i960_adjust_symndx
+
+#define coff_bfd_reloc_type_lookup coff_i960_reloc_type_lookup
+#define coff_bfd_reloc_name_lookup coff_i960_reloc_name_lookup
+
+#include "coffcode.h"
+
+extern const bfd_target icoff_big_vec;
+
+CREATE_LITTLE_COFF_TARGET_VEC (icoff_little_vec, "coff-Intel-little", 0, 0, '_', & icoff_big_vec, COFF_SWAP_TABLE)
+
+const bfd_target icoff_big_vec =
+{
+  "coff-Intel-big",		/* name */
+  bfd_target_coff_flavour,
+  BFD_ENDIAN_LITTLE,		/* data byte order is little */
+  BFD_ENDIAN_BIG,		/* header byte order is big */
+
+  (HAS_RELOC | EXEC_P |		/* object flags */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT),
+
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+  '_',				/* leading underscore */
+  '/',				/* ar_pad_char */
+  15,				/* ar_max_namelen */
+  0,				/* match priority.  */
+
+bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
+bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
+
+  {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
+     bfd_generic_archive_p, _bfd_dummy_target},
+  {bfd_false, coff_mkobject,	/* bfd_set_format */
+     _bfd_generic_mkarchive, bfd_false},
+  {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
+     _bfd_write_archive_contents, bfd_false},
+
+     BFD_JUMP_TABLE_GENERIC (coff),
+     BFD_JUMP_TABLE_COPY (coff),
+     BFD_JUMP_TABLE_CORE (_bfd_nocore),
+     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+     BFD_JUMP_TABLE_SYMBOLS (coff),
+     BFD_JUMP_TABLE_RELOCS (coff),
+     BFD_JUMP_TABLE_WRITE (coff),
+     BFD_JUMP_TABLE_LINK (coff),
+     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  & icoff_little_vec,
+
+  COFF_SWAP_TABLE
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-ia64.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-ia64.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-ia64.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-ia64.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,209 @@
+/* BFD back-end for HP/Intel IA-64 COFF files.
+   Copyright 1999, 2000, 2001, 2002, 2005, 2007, 2008, 2009, 2011
+   Free Software Foundation, Inc.
+   Contributed by David Mosberger <davidm@hpl.hp.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "coff/ia64.h"
+#include "coff/internal.h"
+#include "coff/pe.h"
+#include "libcoff.h"
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (2)
+
+/* Windows ia64 uses 8K page size.  */
+#define COFF_PAGE_SIZE 0x2000
+
+static reloc_howto_type howto_table[] =
+{
+  EMPTY_HOWTO (0),
+};
+
+#define BADMAG(x) IA64BADMAG(x)
+#define IA64 1			/* Customize coffcode.h */
+
+#ifdef COFF_WITH_pep
+# undef AOUTSZ
+# define AOUTSZ		PEPAOUTSZ
+# define PEAOUTHDR	PEPAOUTHDR
+#endif
+
+#define RTYPE2HOWTO(cache_ptr, dst) \
+	    (cache_ptr)->howto = howto_table + (dst)->r_type;
+
+#ifdef COFF_WITH_PE
+/* Return TRUE if this relocation should
+   appear in the output .reloc section.  */
+
+static bfd_boolean in_reloc_p PARAMS ((bfd *, reloc_howto_type *));
+
+static bfd_boolean
+in_reloc_p(abfd, howto)
+     bfd * abfd ATTRIBUTE_UNUSED;
+     reloc_howto_type *howto ATTRIBUTE_UNUSED;
+{
+  return FALSE;			/* We don't do relocs for now...  */
+}
+#endif
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coffcode.h"
+
+static const bfd_target *ia64coff_object_p PARAMS ((bfd *));
+
+static const bfd_target *
+ia64coff_object_p (abfd)
+     bfd *abfd;
+{
+#ifdef COFF_IMAGE_WITH_PE
+  {
+    struct external_PEI_DOS_hdr dos_hdr;
+    struct external_PEI_IMAGE_hdr image_hdr;
+    file_ptr offset;
+
+    if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
+	|| (bfd_bread (&dos_hdr, (bfd_size_type) sizeof (dos_hdr), abfd)
+	    != sizeof (dos_hdr)))
+      {
+	if (bfd_get_error () != bfd_error_system_call)
+	  bfd_set_error (bfd_error_wrong_format);
+	return NULL;
+      }
+
+    /* There are really two magic numbers involved; the magic number
+       that says this is a NT executable (PEI) and the magic number
+       that determines the architecture.  The former is DOSMAGIC,
+       stored in the e_magic field.  The latter is stored in the
+       f_magic field.  If the NT magic number isn't valid, the
+       architecture magic number could be mimicked by some other
+       field (specifically, the number of relocs in section 3).  Since
+       this routine can only be called correctly for a PEI file, check
+       the e_magic number here, and, if it doesn't match, clobber the
+       f_magic number so that we don't get a false match.  */
+    if (H_GET_16 (abfd, dos_hdr.e_magic) != DOSMAGIC)
+      {
+	bfd_set_error (bfd_error_wrong_format);
+	return NULL;
+      }
+
+    offset = H_GET_32 (abfd, dos_hdr.e_lfanew);
+    if (bfd_seek (abfd, offset, SEEK_SET) != 0
+	|| (bfd_bread (&image_hdr, (bfd_size_type) sizeof (image_hdr), abfd)
+	    != sizeof (image_hdr)))
+      {
+	if (bfd_get_error () != bfd_error_system_call)
+	  bfd_set_error (bfd_error_wrong_format);
+	return NULL;
+      }
+
+    if (H_GET_32 (abfd, image_hdr.nt_signature)
+	!= 0x4550)
+      {
+	bfd_set_error (bfd_error_wrong_format);
+	return NULL;
+      }
+
+    /* Here is the hack.  coff_object_p wants to read filhsz bytes to
+       pick up the COFF header for PE, see "struct external_PEI_filehdr"
+       in include/coff/pe.h.  We adjust so that that will work. */
+    if (bfd_seek (abfd, offset - sizeof (dos_hdr), SEEK_SET) != 0)
+      {
+	if (bfd_get_error () != bfd_error_system_call)
+	  bfd_set_error (bfd_error_wrong_format);
+	return NULL;
+      }
+  }
+#endif
+
+  return coff_object_p (abfd);
+}
+
+const bfd_target
+#ifdef TARGET_SYM
+  TARGET_SYM =
+#else
+  ia64coff_vec =
+#endif
+{
+#ifdef TARGET_NAME
+  TARGET_NAME,
+#else
+  "coff-ia64",			/* name */
+#endif
+  bfd_target_coff_flavour,
+  BFD_ENDIAN_LITTLE,		/* data byte order is little */
+  BFD_ENDIAN_LITTLE,		/* header byte order is little */
+
+  (HAS_RELOC | EXEC_P |		/* object flags */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+
+#ifndef COFF_WITH_PE
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC /* section flags */
+   | SEC_CODE | SEC_DATA),
+#else
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC /* section flags */
+   | SEC_CODE | SEC_DATA
+   | SEC_LINK_ONCE | SEC_LINK_DUPLICATES),
+#endif
+
+#ifdef TARGET_UNDERSCORE
+  TARGET_UNDERSCORE,		/* leading underscore */
+#else
+  0,				/* leading underscore */
+#endif
+  '/',				/* ar_pad_char */
+  15,				/* ar_max_namelen */
+  0,				/* match priority.  */
+
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
+
+/* Note that we allow an object file to be treated as a core file as well.  */
+    {_bfd_dummy_target, ia64coff_object_p, /* bfd_check_format */
+       bfd_generic_archive_p, ia64coff_object_p},
+    {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
+       bfd_false},
+    {bfd_false, coff_write_object_contents, /* bfd_write_contents */
+       _bfd_write_archive_contents, bfd_false},
+
+     BFD_JUMP_TABLE_GENERIC (coff),
+     BFD_JUMP_TABLE_COPY (coff),
+     BFD_JUMP_TABLE_CORE (_bfd_nocore),
+     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+     BFD_JUMP_TABLE_SYMBOLS (coff),
+     BFD_JUMP_TABLE_RELOCS (coff),
+     BFD_JUMP_TABLE_WRITE (coff),
+     BFD_JUMP_TABLE_LINK (coff),
+     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  COFF_SWAP_TABLE
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-m68k.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-m68k.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-m68k.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-m68k.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,566 @@
+/* BFD back-end for Motorola 68000 COFF binaries.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1999,
+   2000, 2001, 2002, 2003, 2005, 2007, 2008
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "coff/m68k.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+
+/* This source file is compiled multiple times for various m68k COFF
+   variants.  The following macros control its behaviour:
+
+   TARGET_SYM
+     The C name of the BFD target vector.  The default is m68kcoff_vec.
+   TARGET_NAME
+     The user visible target name.  The default is "coff-m68k".
+   NAMES_HAVE_UNDERSCORE
+     Whether symbol names have an underscore.
+   ONLY_DECLARE_RELOCS
+     Only declare the relocation howto array.  Don't actually compile
+     it.  The actual array will be picked up in another version of the
+     file.
+   STATIC_RELOCS
+     Make the relocation howto array, and associated functions, static.
+   COFF_COMMON_ADDEND
+     If this is defined, then, for a relocation against a common
+     symbol, the object file holds the value (the size) of the common
+     symbol.  If this is not defined, then, for a relocation against a
+     common symbol, the object file holds zero.  */
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (2)
+
+#ifndef COFF_PAGE_SIZE
+/* The page size is a guess based on ELF.  */
+#define COFF_PAGE_SIZE 0x2000
+#endif
+
+#ifndef COFF_COMMON_ADDEND
+#define RELOC_SPECIAL_FN 0
+#else
+static bfd_reloc_status_type m68kcoff_common_addend_special_fn
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static reloc_howto_type *m68kcoff_common_addend_rtype_to_howto
+  PARAMS ((bfd *, asection *, struct internal_reloc *,
+	   struct coff_link_hash_entry *, struct internal_syment *,
+	   bfd_vma *));
+#define RELOC_SPECIAL_FN m68kcoff_common_addend_special_fn
+#endif
+
+static bfd_boolean m68k_coff_is_local_label_name
+  PARAMS ((bfd *, const char *));
+
+/* On the delta, a symbol starting with L% is local.  We won't see
+   such a symbol on other platforms, so it should be safe to always
+   consider it local here.  */
+
+static bfd_boolean
+m68k_coff_is_local_label_name (abfd, name)
+     bfd *abfd;
+     const char *name;
+{
+  if (name[0] == 'L' && name[1] == '%')
+    return TRUE;
+
+  return _bfd_coff_is_local_label_name (abfd, name);
+}
+
+#ifndef STATIC_RELOCS
+/* Clean up namespace.  */
+#define m68kcoff_howto_table	_bfd_m68kcoff_howto_table
+#define m68k_rtype2howto	_bfd_m68kcoff_rtype2howto
+#define m68k_howto2rtype	_bfd_m68kcoff_howto2rtype
+#define m68k_reloc_type_lookup	_bfd_m68kcoff_reloc_type_lookup
+#define m68k_reloc_name_lookup _bfd_m68kcoff_reloc_name_lookup
+#endif
+
+#ifdef ONLY_DECLARE_RELOCS
+extern reloc_howto_type m68kcoff_howto_table[];
+#else
+#ifdef STATIC_RELOCS
+static
+#endif
+reloc_howto_type m68kcoff_howto_table[] =
+  {
+    HOWTO (R_RELBYTE,	       0,  0,  	8,  FALSE, 0, complain_overflow_bitfield, RELOC_SPECIAL_FN, "8",	TRUE, 0x000000ff,0x000000ff, FALSE),
+    HOWTO (R_RELWORD,	       0,  1, 	16, FALSE, 0, complain_overflow_bitfield, RELOC_SPECIAL_FN, "16",	TRUE, 0x0000ffff,0x0000ffff, FALSE),
+    HOWTO (R_RELLONG,	       0,  2, 	32, FALSE, 0, complain_overflow_bitfield, RELOC_SPECIAL_FN, "32",	TRUE, 0xffffffff,0xffffffff, FALSE),
+    HOWTO (R_PCRBYTE,	       0,  0, 	8,  TRUE,  0, complain_overflow_signed,   RELOC_SPECIAL_FN, "DISP8",    TRUE, 0x000000ff,0x000000ff, FALSE),
+    HOWTO (R_PCRWORD,	       0,  1, 	16, TRUE,  0, complain_overflow_signed,   RELOC_SPECIAL_FN, "DISP16",   TRUE, 0x0000ffff,0x0000ffff, FALSE),
+    HOWTO (R_PCRLONG,	       0,  2, 	32, TRUE,  0, complain_overflow_signed,   RELOC_SPECIAL_FN, "DISP32",   TRUE, 0xffffffff,0xffffffff, FALSE),
+    HOWTO (R_RELLONG_NEG,      0, -2, 	32, FALSE, 0, complain_overflow_bitfield, RELOC_SPECIAL_FN, "-32",	TRUE, 0xffffffff,0xffffffff, FALSE),
+  };
+#endif /* not ONLY_DECLARE_RELOCS */
+
+#ifndef BADMAG
+#define BADMAG(x) M68KBADMAG(x)
+#endif
+#define M68 1		/* Customize coffcode.h */
+
+/* Turn a howto into a reloc number */
+
+#ifdef ONLY_DECLARE_RELOCS
+extern void m68k_rtype2howto PARAMS ((arelent *internal, int relocentry));
+extern int m68k_howto2rtype PARAMS ((reloc_howto_type *));
+extern reloc_howto_type *m68k_reloc_type_lookup
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
+extern reloc_howto_type *m68k_reloc_name_lookup
+  PARAMS ((bfd *, const char *));
+#else
+
+#ifdef STATIC_RELOCS
+#define STAT_REL static
+#else
+#define STAT_REL
+#endif
+
+STAT_REL reloc_howto_type * m68k_reloc_type_lookup PARAMS ((bfd *, bfd_reloc_code_real_type));
+STAT_REL reloc_howto_type * m68k_reloc_name_lookup PARAMS ((bfd *, const char *));
+STAT_REL int m68k_howto2rtype PARAMS ((reloc_howto_type *));
+STAT_REL void m68k_rtype2howto PARAMS ((arelent *, int));
+
+
+STAT_REL void
+m68k_rtype2howto(internal, relocentry)
+     arelent *internal;
+     int relocentry;
+{
+  switch (relocentry)
+    {
+    case R_RELBYTE:	internal->howto = m68kcoff_howto_table + 0; break;
+    case R_RELWORD:	internal->howto = m68kcoff_howto_table + 1; break;
+    case R_RELLONG:	internal->howto = m68kcoff_howto_table + 2; break;
+    case R_PCRBYTE:	internal->howto = m68kcoff_howto_table + 3; break;
+    case R_PCRWORD:	internal->howto = m68kcoff_howto_table + 4; break;
+    case R_PCRLONG:	internal->howto = m68kcoff_howto_table + 5; break;
+    case R_RELLONG_NEG:	internal->howto = m68kcoff_howto_table + 6; break;
+    }
+}
+
+STAT_REL int
+m68k_howto2rtype (internal)
+     reloc_howto_type *internal;
+{
+  if (internal->pc_relative)
+    {
+      switch (internal->bitsize)
+	{
+	case 32: return R_PCRLONG;
+	case 16: return R_PCRWORD;
+	case 8: return R_PCRBYTE;
+	}
+    }
+  else
+    {
+      switch (internal->bitsize)
+	{
+	case 32: return R_RELLONG;
+	case 16: return R_RELWORD;
+	case 8: return R_RELBYTE;
+	}
+    }
+  return R_RELLONG;
+}
+
+STAT_REL reloc_howto_type *
+m68k_reloc_type_lookup (abfd, code)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     bfd_reloc_code_real_type code;
+{
+  switch (code)
+    {
+    default:			return NULL;
+    case BFD_RELOC_8:		return m68kcoff_howto_table + 0;
+    case BFD_RELOC_16:		return m68kcoff_howto_table + 1;
+    case BFD_RELOC_CTOR:
+    case BFD_RELOC_32:		return m68kcoff_howto_table + 2;
+    case BFD_RELOC_8_PCREL:	return m68kcoff_howto_table + 3;
+    case BFD_RELOC_16_PCREL:	return m68kcoff_howto_table + 4;
+    case BFD_RELOC_32_PCREL:	return m68kcoff_howto_table + 5;
+      /* FIXME: There doesn't seem to be a code for R_RELLONG_NEG.  */
+    }
+  /*NOTREACHED*/
+}
+
+STAT_REL reloc_howto_type *
+m68k_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+		        const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (m68kcoff_howto_table) / sizeof (m68kcoff_howto_table[0]);
+       i++)
+    if (m68kcoff_howto_table[i].name != NULL
+	&& strcasecmp (m68kcoff_howto_table[i].name, r_name) == 0)
+      return &m68kcoff_howto_table[i];
+
+  return NULL;
+}
+
+#endif /* not ONLY_DECLARE_RELOCS */
+
+#define RTYPE2HOWTO(internal, relocentry) \
+  m68k_rtype2howto(internal, (relocentry)->r_type)
+
+#define SELECT_RELOC(external, internal) \
+  external.r_type = m68k_howto2rtype (internal)
+
+#define coff_bfd_reloc_type_lookup m68k_reloc_type_lookup
+#define coff_bfd_reloc_name_lookup m68k_reloc_name_lookup
+
+#ifndef COFF_COMMON_ADDEND
+#ifndef coff_rtype_to_howto
+
+#define coff_rtype_to_howto m68kcoff_rtype_to_howto
+
+static reloc_howto_type *m68kcoff_rtype_to_howto
+  PARAMS ((bfd *, asection *, struct internal_reloc *,
+	   struct coff_link_hash_entry *, struct internal_syment *,
+	   bfd_vma *));
+
+static reloc_howto_type *
+m68kcoff_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     asection *sec;
+     struct internal_reloc *rel;
+     struct coff_link_hash_entry *h ATTRIBUTE_UNUSED;
+     struct internal_syment *sym ATTRIBUTE_UNUSED;
+     bfd_vma *addendp;
+{
+  arelent relent;
+  reloc_howto_type *howto;
+
+  relent.howto = NULL;
+  RTYPE2HOWTO (&relent, rel);
+
+  howto = relent.howto;
+
+  if (howto != NULL && howto->pc_relative)
+    *addendp += sec->vma;
+
+  return howto;
+}
+
+#endif /* ! defined (coff_rtype_to_howto) */
+#endif /* ! defined (COFF_COMMON_ADDEND) */
+
+#ifdef COFF_COMMON_ADDEND
+
+/* If COFF_COMMON_ADDEND is defined, then when using m68k COFF the
+   value stored in the .text section for a reference to a common
+   symbol is the value itself plus any desired offset.  (taken from
+   work done by Ian Taylor, Cygnus Support, for I386 COFF).  */
+
+/* If we are producing relocatable output, we need to do some
+   adjustments to the object file that are not done by the
+   bfd_perform_relocation function.  This function is called by every
+   reloc type to make any required adjustments.  */
+
+static bfd_reloc_status_type
+m68kcoff_common_addend_special_fn (abfd, reloc_entry, symbol, data,
+				   input_section, output_bfd, error_message)
+     bfd *abfd;
+     arelent *reloc_entry;
+     asymbol *symbol;
+     PTR data;
+     asection *input_section ATTRIBUTE_UNUSED;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  symvalue diff;
+
+  if (output_bfd == (bfd *) NULL)
+    return bfd_reloc_continue;
+
+  if (bfd_is_com_section (symbol->section))
+    {
+      /* We are relocating a common symbol.  The current value in the
+	 object file is ORIG + OFFSET, where ORIG is the value of the
+	 common symbol as seen by the object file when it was compiled
+	 (this may be zero if the symbol was undefined) and OFFSET is
+	 the offset into the common symbol (normally zero, but may be
+	 non-zero when referring to a field in a common structure).
+	 ORIG is the negative of reloc_entry->addend, which is set by
+	 the CALC_ADDEND macro below.  We want to replace the value in
+	 the object file with NEW + OFFSET, where NEW is the value of
+	 the common symbol which we are going to put in the final
+	 object file.  NEW is symbol->value.  */
+      diff = symbol->value + reloc_entry->addend;
+    }
+  else
+    {
+      /* For some reason bfd_perform_relocation always effectively
+	 ignores the addend for a COFF target when producing
+	 relocatable output.  This seems to be always wrong for 386
+	 COFF, so we handle the addend here instead.  */
+      diff = reloc_entry->addend;
+    }
+
+#define DOIT(x) \
+  x = ((x & ~howto->dst_mask) | (((x & howto->src_mask) + diff) & howto->dst_mask))
+
+  if (diff != 0)
+    {
+      reloc_howto_type *howto = reloc_entry->howto;
+      unsigned char *addr = (unsigned char *) data + reloc_entry->address;
+
+      switch (howto->size)
+	{
+	case 0:
+	  {
+	    char x = bfd_get_8 (abfd, addr);
+	    DOIT (x);
+	    bfd_put_8 (abfd, x, addr);
+	  }
+	  break;
+
+	case 1:
+	  {
+	    short x = bfd_get_16 (abfd, addr);
+	    DOIT (x);
+	    bfd_put_16 (abfd, (bfd_vma) x, addr);
+	  }
+	  break;
+
+	case 2:
+	  {
+	    long x = bfd_get_32 (abfd, addr);
+	    DOIT (x);
+	    bfd_put_32 (abfd, (bfd_vma) x, addr);
+	  }
+	  break;
+
+	default:
+	  abort ();
+	}
+    }
+
+  /* Now let bfd_perform_relocation finish everything up.  */
+  return bfd_reloc_continue;
+}
+
+/* Compute the addend of a reloc.  If the reloc is to a common symbol,
+   the object file contains the value of the common symbol.  By the
+   time this is called, the linker may be using a different symbol
+   from a different object file with a different value.  Therefore, we
+   hack wildly to locate the original symbol from this file so that we
+   can make the correct adjustment.  This macro sets coffsym to the
+   symbol from the original file, and uses it to set the addend value
+   correctly.  If this is not a common symbol, the usual addend
+   calculation is done, except that an additional tweak is needed for
+   PC relative relocs.
+   FIXME: This macro refers to symbols and asect; these are from the
+   calling function, not the macro arguments.  */
+
+#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr)		\
+  {								\
+    coff_symbol_type *coffsym = (coff_symbol_type *) NULL;	\
+    if (ptr && bfd_asymbol_bfd (ptr) != abfd)			\
+      coffsym = (obj_symbols (abfd)				\
+	         + (cache_ptr->sym_ptr_ptr - symbols));		\
+    else if (ptr)						\
+      coffsym = coff_symbol_from (abfd, ptr);			\
+    if (coffsym != (coff_symbol_type *) NULL			\
+	&& coffsym->native->u.syment.n_scnum == 0)		\
+      cache_ptr->addend = - coffsym->native->u.syment.n_value;	\
+    else if (ptr && bfd_asymbol_bfd (ptr) == abfd		\
+	     && ptr->section != (asection *) NULL)		\
+      cache_ptr->addend = - (ptr->section->vma + ptr->value);	\
+    else							\
+      cache_ptr->addend = 0;					\
+    if (ptr && (reloc.r_type == R_PCRBYTE			\
+		|| reloc.r_type == R_PCRWORD			\
+		|| reloc.r_type == R_PCRLONG))			\
+      cache_ptr->addend += asect->vma;				\
+  }
+
+#ifndef coff_rtype_to_howto
+
+/* coff-m68k.c uses the special COFF backend linker.  We need to
+   adjust common symbols.  */
+
+static reloc_howto_type *
+m68kcoff_common_addend_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     asection *sec;
+     struct internal_reloc *rel;
+     struct coff_link_hash_entry *h;
+     struct internal_syment *sym;
+     bfd_vma *addendp;
+{
+  arelent relent;
+  reloc_howto_type *howto;
+
+  relent.howto = NULL;
+  RTYPE2HOWTO (&relent, rel);
+
+  howto = relent.howto;
+
+  if (howto->pc_relative)
+    *addendp += sec->vma;
+
+  if (sym != NULL && sym->n_scnum == 0 && sym->n_value != 0)
+    {
+      /* This is a common symbol.  The section contents include the
+	 size (sym->n_value) as an addend.  The relocate_section
+	 function will be adding in the final value of the symbol.  We
+	 need to subtract out the current size in order to get the
+	 correct result.  */
+      BFD_ASSERT (h != NULL);
+      *addendp -= sym->n_value;
+    }
+
+  /* If the output symbol is common (in which case this must be a
+     relocatable link), we need to add in the final size of the
+     common symbol.  */
+  if (h != NULL && h->root.type == bfd_link_hash_common)
+    *addendp += h->root.u.c.size;
+
+  return howto;
+}
+
+#define coff_rtype_to_howto m68kcoff_common_addend_rtype_to_howto
+
+#endif /* ! defined (coff_rtype_to_howto) */
+
+#endif /* COFF_COMMON_ADDEND */
+
+#if !defined ONLY_DECLARE_RELOCS && ! defined STATIC_RELOCS
+/* Given a .data section and a .emreloc in-memory section, store
+   relocation information into the .emreloc section which can be
+   used at runtime to relocate the section.  This is called by the
+   linker when the --embedded-relocs switch is used.  This is called
+   after the add_symbols entry point has been called for all the
+   objects, and before the final_link entry point is called.  */
+
+bfd_boolean
+bfd_m68k_coff_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
+     bfd *abfd;
+     struct bfd_link_info *info;
+     asection *datasec;
+     asection *relsec;
+     char **errmsg;
+{
+  char *extsyms;
+  bfd_size_type symesz;
+  struct internal_reloc *irel, *irelend;
+  bfd_byte *p;
+  bfd_size_type amt;
+
+  BFD_ASSERT (! info->relocatable);
+
+  *errmsg = NULL;
+
+  if (datasec->reloc_count == 0)
+    return TRUE;
+
+  extsyms = obj_coff_external_syms (abfd);
+  symesz = bfd_coff_symesz (abfd);
+
+  irel = _bfd_coff_read_internal_relocs (abfd, datasec, TRUE, NULL, FALSE,
+					 NULL);
+  irelend = irel + datasec->reloc_count;
+
+  amt = (bfd_size_type) datasec->reloc_count * 12;
+  relsec->contents = (bfd_byte *) bfd_alloc (abfd, amt);
+  if (relsec->contents == NULL)
+    return FALSE;
+
+  p = relsec->contents;
+
+  for (; irel < irelend; irel++, p += 12)
+    {
+      asection *targetsec;
+
+      /* We are going to write a four byte longword into the runtime
+       reloc section.  The longword will be the address in the data
+       section which must be relocated.  It is followed by the name
+       of the target section NUL-padded or truncated to 8
+       characters.  */
+
+      /* We can only relocate absolute longword relocs at run time.  */
+      if (irel->r_type != R_RELLONG)
+	{
+	  *errmsg = _("unsupported reloc type");
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      if (irel->r_symndx == -1)
+	targetsec = bfd_abs_section_ptr;
+      else
+	{
+	  struct coff_link_hash_entry *h;
+
+	  h = obj_coff_sym_hashes (abfd)[irel->r_symndx];
+	  if (h == NULL)
+	    {
+	      struct internal_syment isym;
+
+	      bfd_coff_swap_sym_in (abfd, extsyms + symesz * irel->r_symndx,
+				    &isym);
+	      targetsec = coff_section_from_bfd_index (abfd, isym.n_scnum);
+	    }
+	  else if (h->root.type == bfd_link_hash_defined
+		   || h->root.type == bfd_link_hash_defweak)
+	    targetsec = h->root.u.def.section;
+	  else
+	    targetsec = NULL;
+	}
+
+      bfd_put_32 (abfd,
+		  (irel->r_vaddr - datasec->vma + datasec->output_offset), p);
+      memset (p + 4, 0, 8);
+      if (targetsec != NULL)
+	strncpy ((char *) p + 4, targetsec->output_section->name, 8);
+    }
+
+  return TRUE;
+}
+#endif /* neither ONLY_DECLARE_RELOCS not STATIC_RELOCS  */
+
+#define coff_bfd_is_local_label_name m68k_coff_is_local_label_name
+
+#define coff_relocate_section _bfd_coff_generic_relocate_section
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coffcode.h"
+
+#ifndef TARGET_SYM
+#define TARGET_SYM m68kcoff_vec
+#endif
+
+#ifndef TARGET_NAME
+#define TARGET_NAME "coff-m68k"
+#endif
+
+#ifdef NAMES_HAVE_UNDERSCORE
+CREATE_BIG_COFF_TARGET_VEC (TARGET_SYM, TARGET_NAME, D_PAGED, 0, '_', NULL, COFF_SWAP_TABLE)
+#else
+CREATE_BIG_COFF_TARGET_VEC (TARGET_SYM, TARGET_NAME, D_PAGED, 0, 0, NULL, COFF_SWAP_TABLE)
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-m88k.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-m88k.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-m88k.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-m88k.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,296 @@
+/* BFD back-end for Motorola 88000 COFF "Binary Compatibility Standard" files.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1998, 1999, 2000,
+   2001, 2002, 2003, 2005, 2007, 2008   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define M88 1		/* Customize various include files */
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "coff/m88k.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+
+static bfd_boolean m88k_is_local_label_name PARAMS ((bfd *, const char *));
+static bfd_reloc_status_type m88k_special_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static void rtype2howto PARAMS ((arelent *, struct internal_reloc *));
+static void reloc_processing
+  PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection *));
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
+
+#define GET_SCNHDR_NRELOC H_GET_32
+#define GET_SCNHDR_NLNNO  H_GET_32
+
+/* On coff-m88k, local labels start with '@'.  */
+
+#define coff_bfd_is_local_label_name m88k_is_local_label_name
+
+static bfd_boolean
+m88k_is_local_label_name (abfd, name)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     const char *name;
+{
+  return name[0] == '@';
+}
+
+static bfd_reloc_status_type
+m88k_special_reloc (abfd, reloc_entry, symbol, data,
+		    input_section, output_bfd, error_message)
+     bfd *abfd;
+     arelent *reloc_entry;
+     asymbol *symbol;
+     PTR data;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  reloc_howto_type *howto = reloc_entry->howto;
+
+  switch (howto->type)
+    {
+    case R_HVRT16:
+    case R_LVRT16:
+      if (output_bfd != (bfd *) NULL)
+	{
+	  /* This is a partial relocation, and we want to apply the
+	     relocation to the reloc entry rather than the raw data.
+	     Modify the reloc inplace to reflect what we now know.  */
+
+	  reloc_entry->address += input_section->output_offset;
+	}
+      else
+	{
+	  bfd_vma output_base = 0;
+	  bfd_vma addr = reloc_entry->address;
+	  bfd_vma x = bfd_get_16 (abfd, (bfd_byte *) data + addr);
+	  asection *reloc_target_output_section;
+	  long relocation = 0;
+
+	  /* Work out which section the relocation is targeted at and the
+	     initial relocation command value.  */
+
+	  /* Get symbol value.  (Common symbols are special.)  */
+	  if (bfd_is_com_section (symbol->section))
+	    relocation = 0;
+	  else
+	    relocation = symbol->value;
+
+	  reloc_target_output_section = symbol->section->output_section;
+
+	  /* Convert input-section-relative symbol value to absolute.  */
+	  if (output_bfd)
+	    output_base = 0;
+	  else
+	    output_base = reloc_target_output_section->vma;
+
+	  relocation += output_base + symbol->section->output_offset;
+
+	  /* Add in supplied addend.  */
+	  relocation += ((reloc_entry->addend << howto->bitsize) + x);
+
+	  reloc_entry->addend = 0;
+
+	  relocation >>= (bfd_vma) howto->rightshift;
+
+	  /* Shift everything up to where it's going to be used */
+
+	  relocation <<= (bfd_vma) howto->bitpos;
+
+	  if (relocation)
+	    bfd_put_16 (abfd, (bfd_vma) relocation,
+			(unsigned char *) data + addr);
+	}
+
+      /* If we are not producing relocatable output, return an error if
+	 the symbol is not defined.  */
+      if (bfd_is_und_section (symbol->section) && output_bfd == (bfd *) NULL)
+	return bfd_reloc_undefined;
+
+      return bfd_reloc_ok;
+
+    default:
+      if (output_bfd != (bfd *) NULL)
+	{
+	  /* This is a partial relocation, and we want to apply the
+	     relocation to the reloc entry rather than the raw data.
+	     Modify the reloc inplace to reflect what we now know.  */
+
+	  reloc_entry->address += input_section->output_offset;
+	  return bfd_reloc_ok;
+	}
+      break;
+    }
+
+  if (output_bfd == (bfd *) NULL)
+    return bfd_reloc_continue;
+
+  return bfd_reloc_ok;
+}
+
+static reloc_howto_type howto_table[] =
+{
+  HOWTO (R_PCR16L,			/* type */
+	 02,				/* rightshift */
+	 1,				/* size (0 = byte, 1 = short, 2 = long) */
+	 16,				/* bitsize */
+	 TRUE,				/* pc_relative */
+	 0,				/* bitpos */
+	 complain_overflow_signed,	/* complain_on_overflow */
+	 m88k_special_reloc,		/* special_function */
+	 "PCR16L",			/* name */
+	 FALSE,				/* partial_inplace */
+	 0x0000ffff,			/* src_mask */
+	 0x0000ffff,			/* dst_mask */
+	 TRUE),				/* pcrel_offset */
+
+  HOWTO (R_PCR26L,			/* type */
+	 02,				/* rightshift */
+	 2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 26,				/* bitsize */
+	 TRUE,				/* pc_relative */
+	 0,				/* bitpos */
+	 complain_overflow_signed,	/* complain_on_overflow */
+	 m88k_special_reloc,		/* special_function */
+	 "PCR26L",			/* name */
+	 FALSE,				/* partial_inplace */
+	 0x03ffffff,			/* src_mask */
+	 0x03ffffff,			/* dst_mask */
+	 TRUE),				/* pcrel_offset */
+
+  HOWTO (R_VRT16,			/* type */
+	 00,				/* rightshift */
+	 1,				/* size (0 = byte, 1 = short, 2 = long) */
+	 16,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 0,				/* bitpos */
+	 complain_overflow_bitfield,	/* complain_on_overflow */
+	 m88k_special_reloc,		/* special_function */
+	 "VRT16",			/* name */
+	 FALSE,				/* partial_inplace */
+	 0x0000ffff,			/* src_mask */
+	 0x0000ffff,			/* dst_mask */
+	 TRUE),				/* pcrel_offset */
+
+  HOWTO (R_HVRT16,			/* type */
+	 16,				/* rightshift */
+	 1,				/* size (0 = byte, 1 = short, 2 = long) */
+	 16,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 0,				/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 m88k_special_reloc,		/* special_function */
+	 "HVRT16",			/* name */
+	 FALSE,				/* partial_inplace */
+	 0x0000ffff,			/* src_mask */
+	 0x0000ffff,			/* dst_mask */
+	 TRUE),				/* pcrel_offset */
+
+  HOWTO (R_LVRT16,			/* type */
+	 00,				/* rightshift */
+	 1,				/* size (0 = byte, 1 = short, 2 = long) */
+	 16,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 0,				/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 m88k_special_reloc,		/* special_function */
+	 "LVRT16",			/* name */
+	 FALSE,				/* partial_inplace */
+	 0x0000ffff,			/* src_mask */
+	 0x0000ffff,			/* dst_mask */
+	 TRUE),				/* pcrel_offset */
+
+  HOWTO (R_VRT32,			/* type */
+	 00,				/* rightshift */
+	 2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 32,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 0,				/* bitpos */
+	 complain_overflow_bitfield,	/* complain_on_overflow */
+	 m88k_special_reloc,		/* special_function */
+	 "VRT32",			/* name */
+	 FALSE,				/* partial_inplace */
+	 0xffffffff,			/* src_mask */
+	 0xffffffff,			/* dst_mask */
+	 TRUE),				/* pcrel_offset */
+};
+
+/* Code to turn an external r_type into a pointer to an entry in the
+   above howto table.  */
+static void
+rtype2howto (cache_ptr, dst)
+     arelent *cache_ptr;
+     struct internal_reloc *dst;
+{
+  if (dst->r_type >= R_PCR16L && dst->r_type <= R_VRT32)
+    {
+      cache_ptr->howto = howto_table + dst->r_type - R_PCR16L;
+    }
+  else
+    {
+      BFD_ASSERT (0);
+    }
+}
+
+#define RTYPE2HOWTO(cache_ptr, dst) rtype2howto (cache_ptr, dst)
+
+/* Code to swap in the reloc offset */
+#define SWAP_IN_RELOC_OFFSET  H_GET_16
+#define SWAP_OUT_RELOC_OFFSET H_PUT_16
+
+#define RELOC_PROCESSING(relent,reloc,symbols,abfd,section)	\
+  reloc_processing(relent, reloc, symbols, abfd, section)
+
+static void
+reloc_processing (relent, reloc, symbols, abfd, section)
+     arelent *relent;
+     struct internal_reloc *reloc;
+     asymbol **symbols;
+     bfd *abfd;
+     asection *section;
+{
+  relent->address = reloc->r_vaddr;
+  rtype2howto (relent, reloc);
+
+  if (((int) reloc->r_symndx) > 0)
+    {
+      relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
+    }
+  else
+    {
+      relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+    }
+
+  relent->addend = reloc->r_offset;
+  relent->address -= section->vma;
+}
+
+#define BADMAG(x) MC88BADMAG(x)
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coffcode.h"
+
+#undef coff_write_armap
+
+CREATE_BIG_COFF_TARGET_VEC (m88kbcs_vec, "coff-m88kbcs", 0, 0, '_', NULL, COFF_SWAP_TABLE)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-mcore.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-mcore.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-mcore.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-mcore.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,578 @@
+/* BFD back-end for Motorola MCore COFF/PE
+   Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "coff/mcore.h"
+#include "coff/internal.h"
+#include "coff/pe.h"
+#include "libcoff.h"
+
+#ifdef BADMAG
+#undef BADMAG
+#endif
+#define BADMAG(x) MCOREBADMAG(x)
+
+#ifndef NUM_ELEM
+#define NUM_ELEM(A) (sizeof (A) / sizeof (A)[0])
+#endif
+
+/* This file is compiled more than once, but we only compile the
+   final_link routine once.  */
+extern bfd_boolean mcore_bfd_coff_final_link
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_reloc_status_type mcore_coff_unsupported_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_boolean coff_mcore_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+	   struct internal_reloc *, struct internal_syment *, asection **));
+static reloc_howto_type *mcore_coff_reloc_type_lookup
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
+static reloc_howto_type *coff_mcore_rtype_to_howto
+  PARAMS ((bfd *, asection *, struct internal_reloc *,
+	   struct coff_link_hash_entry *, struct internal_syment *,
+	   bfd_vma *));
+static bfd_boolean in_reloc_p PARAMS ((bfd *, reloc_howto_type *));
+
+/* The NT loader points the toc register to &toc + 32768, in order to
+   use the complete range of a 16-bit displacement. We have to adjust
+   for this when we fix up loads displaced off the toc reg.  */
+#define TOC_LOAD_ADJUSTMENT (-32768)
+#define TOC_SECTION_NAME ".private.toc"
+
+/* The main body of code is in coffcode.h.  */
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER 2
+
+/* In case we're on a 32-bit machine, construct a 64-bit "-1" value
+   from smaller values.  Start with zero, widen, *then* decrement.  */
+#define MINUS_ONE	(((bfd_vma)0) - 1)
+
+static reloc_howto_type mcore_coff_howto_table[] =
+{
+  /* Unused: */
+  HOWTO (IMAGE_REL_MCORE_ABSOLUTE,/* type */
+	 0,	                 /* rightshift */
+	 0,	                 /* size (0 = byte, 1 = short, 2 = long) */
+	 0,	                 /* bitsize */
+	 FALSE,	                 /* pc_relative */
+	 0,	                 /* bitpos */
+	 complain_overflow_dont, /* dont complain_on_overflow */
+	 NULL,		         /* special_function */
+	 "ABSOLUTE",             /* name */
+	 FALSE,	                 /* partial_inplace */
+	 0x00,	 	         /* src_mask */
+	 0x00,        		 /* dst_mask */
+	 FALSE),                 /* pcrel_offset */
+
+  HOWTO (IMAGE_REL_MCORE_ADDR32,/* type */
+	 0,	                /* rightshift */
+	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 32,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 NULL,		        /* special_function */
+	 "ADDR32",              /* name */
+	 TRUE,	                /* partial_inplace */
+	 0xffffffff,            /* src_mask */
+	 0xffffffff,            /* dst_mask */
+	 FALSE),                /* pcrel_offset */
+
+  /* 8 bits + 2 zero bits; jmpi/jsri/lrw instructions.
+     Should not appear in object files.  */
+  HOWTO (IMAGE_REL_MCORE_PCREL_IMM8BY4,	/* type */
+	 2,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 mcore_coff_unsupported_reloc, /* special_function */
+	 "IMM8BY4",             /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* bsr/bt/bf/br instructions; 11 bits + 1 zero bit
+     Span 2k instructions == 4k bytes.
+     Only useful pieces at the relocated address are the opcode (5 bits) */
+  HOWTO (IMAGE_REL_MCORE_PCREL_IMM11BY2,/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 11,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 NULL,	                /* special_function */
+	 "IMM11BY2",            /* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0x7ff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 4 bits + 1 zero bit; 'loopt' instruction only; unsupported.  */
+  HOWTO (IMAGE_REL_MCORE_PCREL_IMM4BY2,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 4,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 mcore_coff_unsupported_reloc, /* special_function */
+	 "IMM4BY2",              /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 32-bit pc-relative. Eventually this will help support PIC code.  */
+  HOWTO (IMAGE_REL_MCORE_PCREL_32,/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 NULL,	                /* special_function */
+	 "PCREL_32",	        /* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Like PCREL_IMM11BY2, this relocation indicates that there is a
+     'jsri' at the specified address. There is a separate relocation
+     entry for the literal pool entry that it references, but we
+     might be able to change the jsri to a bsr if the target turns out
+     to be close enough [even though we won't reclaim the literal pool
+     entry, we'll get some runtime efficiency back]. Note that this
+     is a relocation that we are allowed to safely ignore.  */
+  HOWTO (IMAGE_REL_MCORE_PCREL_JSR_IMM11BY2,/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 11,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 NULL,	                /* special_function */
+	 "JSR_IMM11BY2",        /* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0x7ff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (IMAGE_REL_MCORE_RVA,   /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 NULL,                  /* special_function */
+	 "MCORE_RVA",           /* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE)			/* pcrel_offset */
+};
+
+/* Extend the coff_link_hash_table structure with a few M*Core specific fields.
+   This allows us to store global data here without actually creating any
+   global variables, which is a no-no in the BFD world.  */
+typedef struct coff_mcore_link_hash_table
+{
+  /* The original coff_link_hash_table structure.  MUST be first field.  */
+  struct coff_link_hash_table	root;
+
+  bfd *                         bfd_of_toc_owner;
+  long int                      global_toc_size;
+  long int                      import_table_size;
+  long int                      first_thunk_address;
+  long int                      thunk_size;
+}
+mcore_hash_table;
+
+/* Get the MCore coff linker hash table from a link_info structure.  */
+#define coff_mcore_hash_table(info) \
+  ((mcore_hash_table *) ((info)->hash))
+
+
+/* Add an entry to the base file.  */
+
+static bfd_boolean
+mcore_emit_base_file_entry (struct bfd_link_info *info,
+			    bfd *output_bfd,
+			    asection *input_section,
+			    bfd_vma reloc_offset)
+{
+  bfd_vma addr = reloc_offset
+                 - input_section->vma
+                 + input_section->output_offset
+                 + input_section->output_section->vma;
+
+  if (coff_data (output_bfd)->pe)
+     addr -= pe_data (output_bfd)->pe_opthdr.ImageBase;
+
+  if (fwrite (&addr, sizeof (addr), 1, (FILE *) info->base_file) == 1)
+    return TRUE;
+
+  bfd_set_error (bfd_error_system_call);
+  return FALSE;
+}
+
+static bfd_reloc_status_type
+mcore_coff_unsupported_reloc (abfd, reloc_entry, symbol, data, input_section,
+			   output_bfd, error_message)
+     bfd * abfd;
+     arelent * reloc_entry;
+     asymbol * symbol ATTRIBUTE_UNUSED;
+     PTR data ATTRIBUTE_UNUSED;
+     asection * input_section ATTRIBUTE_UNUSED;
+     bfd * output_bfd ATTRIBUTE_UNUSED;
+     char ** error_message ATTRIBUTE_UNUSED;
+{
+  BFD_ASSERT (reloc_entry->howto != (reloc_howto_type *)0);
+
+  _bfd_error_handler (_("%B: Relocation %s (%d) is not currently supported.\n"),
+		      abfd,
+		      reloc_entry->howto->name,
+		      reloc_entry->howto->type);
+
+  return bfd_reloc_notsupported;
+}
+
+/* A cheesy little macro to make the code a little more readable.  */
+#define HOW2MAP(bfd_rtype, mcore_rtype)  \
+ case bfd_rtype: return & mcore_coff_howto_table [mcore_rtype]
+
+static reloc_howto_type *
+mcore_coff_reloc_type_lookup (abfd, code)
+     bfd * abfd ATTRIBUTE_UNUSED;
+     bfd_reloc_code_real_type code;
+{
+  switch (code)
+    {
+      HOW2MAP (BFD_RELOC_32,                       IMAGE_REL_MCORE_ADDR32);
+      HOW2MAP (BFD_RELOC_MCORE_PCREL_IMM8BY4,      IMAGE_REL_MCORE_PCREL_IMM8BY4);
+      HOW2MAP (BFD_RELOC_MCORE_PCREL_IMM11BY2,     IMAGE_REL_MCORE_PCREL_IMM11BY2);
+      HOW2MAP (BFD_RELOC_MCORE_PCREL_IMM4BY2,      IMAGE_REL_MCORE_PCREL_IMM4BY2);
+      HOW2MAP (BFD_RELOC_32_PCREL,                 IMAGE_REL_MCORE_PCREL_32);
+      HOW2MAP (BFD_RELOC_MCORE_PCREL_JSR_IMM11BY2, IMAGE_REL_MCORE_PCREL_JSR_IMM11BY2);
+      HOW2MAP (BFD_RELOC_RVA,                      IMAGE_REL_MCORE_RVA);
+   default:
+      return NULL;
+    }
+  /*NOTREACHED*/
+}
+#undef HOW2MAP
+
+static reloc_howto_type *
+mcore_coff_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			      const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (mcore_coff_howto_table)
+	    / sizeof (mcore_coff_howto_table[0]));
+       i++)
+    if (mcore_coff_howto_table[i].name != NULL
+	&& strcasecmp (mcore_coff_howto_table[i].name, r_name) == 0)
+      return &mcore_coff_howto_table[i];
+
+  return NULL;
+}
+
+#define RTYPE2HOWTO(cache_ptr, dst) \
+  (cache_ptr)->howto = mcore_coff_howto_table + (dst)->r_type;
+
+static reloc_howto_type *
+coff_mcore_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
+     bfd * abfd ATTRIBUTE_UNUSED;
+     asection * sec;
+     struct internal_reloc * rel;
+     struct coff_link_hash_entry * h ATTRIBUTE_UNUSED;
+     struct internal_syment * sym;
+     bfd_vma * addendp;
+{
+  reloc_howto_type * howto;
+
+  if (rel->r_type >= NUM_ELEM (mcore_coff_howto_table))
+    return NULL;
+
+  howto = mcore_coff_howto_table + rel->r_type;
+
+  if (rel->r_type == IMAGE_REL_MCORE_RVA)
+    * addendp -= pe_data (sec->output_section->owner)->pe_opthdr.ImageBase;
+
+  else if (howto->pc_relative)
+    {
+      * addendp = sec->vma - 2; /* XXX guess - is this right ? */
+
+      /* If the symbol is defined, then the generic code is going to
+         add back the symbol value in order to cancel out an
+         adjustment it made to the addend.  However, we set the addend
+         to 0 at the start of this function.  We need to adjust here,
+         to avoid the adjustment the generic code will make.  FIXME:
+         This is getting a bit hackish.  */
+      if (sym != NULL && sym->n_scnum != 0)
+	* addendp -= sym->n_value;
+    }
+  else
+    * addendp = 0;
+
+  return howto;
+}
+
+/* Return TRUE if this relocation should appear in the output .reloc section.
+   This function is referenced in pe_mkobject in peicode.h.  */
+
+static bfd_boolean
+in_reloc_p (abfd, howto)
+     bfd * abfd ATTRIBUTE_UNUSED;
+     reloc_howto_type * howto;
+{
+  return ! howto->pc_relative && howto->type != IMAGE_REL_MCORE_RVA;
+}
+
+/* The reloc processing routine for the optimized COFF linker.  */
+static bfd_boolean
+coff_mcore_relocate_section (output_bfd, info, input_bfd, input_section,
+			   contents, relocs, syms, sections)
+     bfd * output_bfd;
+     struct bfd_link_info * info;
+     bfd * input_bfd;
+     asection * input_section;
+     bfd_byte * contents;
+     struct internal_reloc * relocs;
+     struct internal_syment * syms;
+     asection ** sections;
+{
+  struct internal_reloc * rel;
+  struct internal_reloc * relend;
+
+  /* If we are performing a relocatable link, we don't need to do a
+     thing.  The caller will take care of adjusting the reloc
+     addresses and symbol indices.  */
+  if (info->relocatable)
+    return TRUE;
+
+  /* Check if we have the same endianness */
+  if (   input_bfd->xvec->byteorder != output_bfd->xvec->byteorder
+      && output_bfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN)
+    {
+      (*_bfd_error_handler)
+	(_("%B: compiled for a %s system and target is %s.\n"),
+	 input_bfd,
+         bfd_big_endian (input_bfd) ? _("big endian") : _("little endian"),
+         bfd_big_endian (output_bfd) ? _("big endian") : _("little endian"));
+
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+
+  rel = relocs;
+  relend = rel + input_section->reloc_count;
+
+  for (; rel < relend; rel++)
+    {
+      long                           symndx;
+      struct internal_syment *       sym;
+      bfd_vma                        val;
+      bfd_vma                        addend;
+      bfd_reloc_status_type          rstat;
+      bfd_byte *                     loc;
+      unsigned short                 r_type = rel->r_type;
+      reloc_howto_type *             howto = NULL;
+      struct coff_link_hash_entry *  h;
+      const char *                   my_name;
+
+      symndx = rel->r_symndx;
+      loc = contents + rel->r_vaddr - input_section->vma;
+
+      if (symndx == -1)
+	{
+	  h = NULL;
+	  sym = NULL;
+	}
+      else
+	{
+	  h = obj_coff_sym_hashes (input_bfd)[symndx];
+	  sym = syms + symndx;
+	}
+
+      addend = 0;
+
+      /* Get the howto and initialise the addend.  */
+      howto = bfd_coff_rtype_to_howto (input_bfd, input_section, rel, h,
+				       sym, & addend);
+      if (howto == NULL)
+	return FALSE;
+
+      val = 0;
+
+      if (h == NULL)
+	{
+	  if (symndx == -1)
+	    my_name = "*ABS*";
+	  else
+	    {
+	      asection * sec = sections[symndx];
+
+	      val = (sym->n_value
+		     + sec->output_section->vma
+		     + sec->output_offset);
+
+	      if (sym == NULL)
+		my_name = "*unknown*";
+	      else if (   sym->_n._n_n._n_zeroes == 0
+		       && sym->_n._n_n._n_offset != 0)
+		my_name = obj_coff_strings (input_bfd) + sym->_n._n_n._n_offset;
+	      else
+		{
+		  static char buf [SYMNMLEN + 1];
+
+		  strncpy (buf, sym->_n._n_name, SYMNMLEN);
+		  buf[SYMNMLEN] = '\0';
+		  my_name = buf;
+		}
+	    }
+	}
+      else
+	{
+	  if (   h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	    {
+	      asection * sec = h->root.u.def.section;
+
+	      val = (h->root.u.def.value
+		     + sec->output_section->vma
+		     + sec->output_offset);
+	    }
+	  else
+	    {
+	      if (! ((*info->callbacks->undefined_symbol)
+		     (info, h->root.root.string, input_bfd, input_section,
+		      rel->r_vaddr - input_section->vma, TRUE)))
+		return FALSE;
+	    }
+
+	  my_name = h->root.root.string;
+	}
+
+      rstat = bfd_reloc_ok;
+
+      /* Each case must do its own relocation, setting rstat appropriately.  */
+      switch (r_type)
+	{
+	default:
+	  _bfd_error_handler (_("%B: unsupported relocation type 0x%02x"),
+			      input_bfd, r_type);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+
+	case IMAGE_REL_MCORE_ABSOLUTE:
+	  _bfd_error_handler
+	    (_("Warning: unsupported reloc %s <file %B, section %A>\n"
+	       "sym %ld (%s), r_vaddr %ld (%lx)"),
+	     input_bfd, input_section, howto->name,
+	     rel->r_symndx, my_name, (long) rel->r_vaddr,
+	     (unsigned long) rel->r_vaddr);
+	  break;
+
+	case IMAGE_REL_MCORE_PCREL_IMM8BY4:
+	case IMAGE_REL_MCORE_PCREL_IMM11BY2:
+	case IMAGE_REL_MCORE_PCREL_IMM4BY2:
+	case IMAGE_REL_MCORE_PCREL_32:
+	case IMAGE_REL_MCORE_PCREL_JSR_IMM11BY2:
+	case IMAGE_REL_MCORE_ADDR32:
+	  /* XXX fixme - shouldn't this be like the code for the RVA reloc ? */
+	  rstat = _bfd_relocate_contents (howto, input_bfd, val, loc);
+	  break;
+
+	case IMAGE_REL_MCORE_RVA:
+	  rstat = _bfd_final_link_relocate
+	    (howto, input_bfd,
+	     input_section, contents, rel->r_vaddr - input_section->vma,
+	     val, addend);
+	  break;
+	}
+
+      /* Emit a reloc if the backend thinks it needs it.  */
+      if (info->base_file
+	  && sym
+	  && pe_data (output_bfd)->in_reloc_p (output_bfd, howto)
+	  && !mcore_emit_base_file_entry (info, output_bfd, input_section,
+					  rel->r_vaddr))
+	return FALSE;
+
+      switch (rstat)
+	{
+	default:
+	  abort ();
+
+	case bfd_reloc_ok:
+	  break;
+
+	case bfd_reloc_overflow:
+	  if (! ((*info->callbacks->reloc_overflow)
+		 (info, (h ? &h->root : NULL), my_name, howto->name,
+		  (bfd_vma) 0, input_bfd,
+		  input_section, rel->r_vaddr - input_section->vma)))
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Tailor coffcode.h -- macro heaven.  */
+
+/* We use the special COFF backend linker, with our own special touch.  */
+
+#define coff_bfd_reloc_type_lookup   mcore_coff_reloc_type_lookup
+#define coff_bfd_reloc_name_lookup mcore_coff_reloc_name_lookup
+#define coff_relocate_section        coff_mcore_relocate_section
+#define coff_rtype_to_howto          coff_mcore_rtype_to_howto
+
+#define SELECT_RELOC(internal, howto) {internal.r_type = howto->type;}
+
+/* Make sure that the 'r_offset' field is copied properly
+   so that identical binaries will compare the same.  */
+#define SWAP_IN_RELOC_OFFSET         H_GET_32
+#define SWAP_OUT_RELOC_OFFSET        H_PUT_32
+
+#define COFF_PAGE_SIZE               0x1000
+
+#include "coffcode.h"
+
+/* Forward declaration to initialise alternative_target field.  */
+extern const bfd_target TARGET_LITTLE_SYM;
+
+/* The transfer vectors that lead the outside world to all of the above.  */
+CREATE_BIG_COFF_TARGET_VEC (TARGET_BIG_SYM, TARGET_BIG_NAME, D_PAGED,
+			    (SEC_CODE | SEC_DATA | SEC_DEBUGGING | SEC_READONLY | SEC_LINK_ONCE | SEC_LINK_DUPLICATES),
+			    0, & TARGET_LITTLE_SYM, COFF_SWAP_TABLE)
+CREATE_LITTLE_COFF_TARGET_VEC (TARGET_LITTLE_SYM, TARGET_LITTLE_NAME, D_PAGED,
+			       (SEC_CODE | SEC_DATA | SEC_DEBUGGING | SEC_READONLY | SEC_LINK_ONCE | SEC_LINK_DUPLICATES),
+			       0, & TARGET_BIG_SYM, COFF_SWAP_TABLE)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-mips.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-mips.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-mips.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-mips.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1559 @@
+/* BFD back-end for MIPS Extended-Coff files.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2011
+   Free Software Foundation, Inc.
+   Original version by Per Bothner.
+   Full support added by Ian Lance Taylor, ian@cygnus.com.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "coff/internal.h"
+#include "coff/sym.h"
+#include "coff/symconst.h"
+#include "coff/ecoff.h"
+#include "coff/mips.h"
+#include "libcoff.h"
+#include "libecoff.h"
+
+/* Prototypes for static functions.  */
+
+static bfd_boolean mips_ecoff_bad_format_hook
+  PARAMS ((bfd *abfd, PTR filehdr));
+static void mips_ecoff_swap_reloc_in
+  PARAMS ((bfd *, PTR, struct internal_reloc *));
+static void mips_ecoff_swap_reloc_out
+  PARAMS ((bfd *, const struct internal_reloc *, PTR));
+static void mips_adjust_reloc_in
+  PARAMS ((bfd *, const struct internal_reloc *, arelent *));
+static void mips_adjust_reloc_out
+  PARAMS ((bfd *, const arelent *, struct internal_reloc *));
+static bfd_reloc_status_type mips_generic_reloc
+  PARAMS ((bfd *abfd, arelent *reloc, asymbol *symbol, PTR data,
+	   asection *section, bfd *output_bfd, char **error));
+static bfd_reloc_status_type mips_refhi_reloc
+  PARAMS ((bfd *abfd, arelent *reloc, asymbol *symbol, PTR data,
+	   asection *section, bfd *output_bfd, char **error));
+static bfd_reloc_status_type mips_reflo_reloc
+  PARAMS ((bfd *abfd, arelent *reloc, asymbol *symbol, PTR data,
+	   asection *section, bfd *output_bfd, char **error));
+static bfd_reloc_status_type mips_gprel_reloc
+  PARAMS ((bfd *abfd, arelent *reloc, asymbol *symbol, PTR data,
+	   asection *section, bfd *output_bfd, char **error));
+static void mips_relocate_hi
+  PARAMS ((struct internal_reloc *refhi, struct internal_reloc *reflo,
+	   bfd *input_bfd, asection *input_section, bfd_byte *contents,
+	   bfd_vma relocation));
+static bfd_boolean mips_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, PTR));
+static reloc_howto_type *mips_bfd_reloc_type_lookup
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
+
+/* ECOFF has COFF sections, but the debugging information is stored in
+   a completely different format.  ECOFF targets use some of the
+   swapping routines from coffswap.h, and some of the generic COFF
+   routines in coffgen.c, but, unlike the real COFF targets, do not
+   use coffcode.h itself.
+
+   Get the generic COFF swapping routines, except for the reloc,
+   symbol, and lineno ones.  Give them ECOFF names.  */
+#define MIPSECOFF
+#define NO_COFF_RELOCS
+#define NO_COFF_SYMBOLS
+#define NO_COFF_LINENOS
+#define coff_swap_filehdr_in mips_ecoff_swap_filehdr_in
+#define coff_swap_filehdr_out mips_ecoff_swap_filehdr_out
+#define coff_swap_aouthdr_in mips_ecoff_swap_aouthdr_in
+#define coff_swap_aouthdr_out mips_ecoff_swap_aouthdr_out
+#define coff_swap_scnhdr_in mips_ecoff_swap_scnhdr_in
+#define coff_swap_scnhdr_out mips_ecoff_swap_scnhdr_out
+
+#include "coffswap.h"
+
+/* Get the ECOFF swapping routines.  */
+#define ECOFF_32
+#include "ecoffswap.h"
+
+/* How to process the various relocs types.  */
+
+static reloc_howto_type mips_howto_table[] =
+{
+  /* Reloc type 0 is ignored.  The reloc reading code ensures that
+     this is a reference to the .abs section, which will cause
+     bfd_perform_relocation to do nothing.  */
+  HOWTO (MIPS_R_IGNORE,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "IGNORE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit reference to a symbol, normally from a data section.  */
+  HOWTO (MIPS_R_REFHALF,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 mips_generic_reloc,	/* special_function */
+	 "REFHALF",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32 bit reference to a symbol, normally from a data section.  */
+  HOWTO (MIPS_R_REFWORD,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 mips_generic_reloc,	/* special_function */
+	 "REFWORD",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 26 bit absolute jump address.  */
+  HOWTO (MIPS_R_JMPADDR,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 			/* This needs complex overflow
+				   detection, because the upper four
+				   bits must match the PC.  */
+	 mips_generic_reloc,	/* special_function */
+	 "JMPADDR",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x3ffffff,		/* src_mask */
+	 0x3ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The high 16 bits of a symbol value.  Handled by the function
+     mips_refhi_reloc.  */
+  HOWTO (MIPS_R_REFHI,		/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 mips_refhi_reloc,	/* special_function */
+	 "REFHI",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The low 16 bits of a symbol value.  */
+  HOWTO (MIPS_R_REFLO,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 mips_reflo_reloc,	/* special_function */
+	 "REFLO",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A reference to an offset from the gp register.  Handled by the
+     function mips_gprel_reloc.  */
+  HOWTO (MIPS_R_GPREL,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mips_gprel_reloc,	/* special_function */
+	 "GPREL",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A reference to a literal using an offset from the gp register.
+     Handled by the function mips_gprel_reloc.  */
+  HOWTO (MIPS_R_LITERAL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mips_gprel_reloc,	/* special_function */
+	 "LITERAL",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (8),
+  EMPTY_HOWTO (9),
+  EMPTY_HOWTO (10),
+  EMPTY_HOWTO (11),
+
+  /* FIXME: This relocation is used (internally only) to represent branches
+     when assembling.  It should never appear in output files, and
+     be removed.  (It used to be used for embedded-PIC support.)  */
+  HOWTO (MIPS_R_PCREL16,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mips_generic_reloc,	/* special_function */
+	 "PCREL16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+};
+
+#define MIPS_HOWTO_COUNT \
+  (sizeof mips_howto_table / sizeof mips_howto_table[0])
+
+/* See whether the magic number matches.  */
+
+static bfd_boolean
+mips_ecoff_bad_format_hook (abfd, filehdr)
+     bfd *abfd;
+     PTR filehdr;
+{
+  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
+
+  switch (internal_f->f_magic)
+    {
+    case MIPS_MAGIC_1:
+      /* I don't know what endianness this implies.  */
+      return TRUE;
+
+    case MIPS_MAGIC_BIG:
+    case MIPS_MAGIC_BIG2:
+    case MIPS_MAGIC_BIG3:
+      return bfd_big_endian (abfd);
+
+    case MIPS_MAGIC_LITTLE:
+    case MIPS_MAGIC_LITTLE2:
+    case MIPS_MAGIC_LITTLE3:
+      return bfd_little_endian (abfd);
+
+    default:
+      return FALSE;
+    }
+}
+
+/* Reloc handling.  MIPS ECOFF relocs are packed into 8 bytes in
+   external form.  They use a bit which indicates whether the symbol
+   is external.  */
+
+/* Swap a reloc in.  */
+
+static void
+mips_ecoff_swap_reloc_in (abfd, ext_ptr, intern)
+     bfd *abfd;
+     PTR ext_ptr;
+     struct internal_reloc *intern;
+{
+  const RELOC *ext = (RELOC *) ext_ptr;
+
+  intern->r_vaddr = H_GET_32 (abfd, ext->r_vaddr);
+  if (bfd_header_big_endian (abfd))
+    {
+      intern->r_symndx = (((int) ext->r_bits[0]
+			   << RELOC_BITS0_SYMNDX_SH_LEFT_BIG)
+			  | ((int) ext->r_bits[1]
+			     << RELOC_BITS1_SYMNDX_SH_LEFT_BIG)
+			  | ((int) ext->r_bits[2]
+			     << RELOC_BITS2_SYMNDX_SH_LEFT_BIG));
+      intern->r_type = ((ext->r_bits[3] & RELOC_BITS3_TYPE_BIG)
+			>> RELOC_BITS3_TYPE_SH_BIG);
+      intern->r_extern = (ext->r_bits[3] & RELOC_BITS3_EXTERN_BIG) != 0;
+    }
+  else
+    {
+      intern->r_symndx = (((int) ext->r_bits[0]
+			   << RELOC_BITS0_SYMNDX_SH_LEFT_LITTLE)
+			  | ((int) ext->r_bits[1]
+			     << RELOC_BITS1_SYMNDX_SH_LEFT_LITTLE)
+			  | ((int) ext->r_bits[2]
+			     << RELOC_BITS2_SYMNDX_SH_LEFT_LITTLE));
+      intern->r_type = (((ext->r_bits[3] & RELOC_BITS3_TYPE_LITTLE)
+			 >> RELOC_BITS3_TYPE_SH_LITTLE)
+			| ((ext->r_bits[3] & RELOC_BITS3_TYPEHI_LITTLE)
+			   << RELOC_BITS3_TYPEHI_SH_LITTLE));
+      intern->r_extern = (ext->r_bits[3] & RELOC_BITS3_EXTERN_LITTLE) != 0;
+    }
+}
+
+/* Swap a reloc out.  */
+
+static void
+mips_ecoff_swap_reloc_out (abfd, intern, dst)
+     bfd *abfd;
+     const struct internal_reloc *intern;
+     PTR dst;
+{
+  RELOC *ext = (RELOC *) dst;
+  long r_symndx;
+
+  BFD_ASSERT (intern->r_extern
+	      || (intern->r_symndx >= 0 && intern->r_symndx <= 12));
+
+  r_symndx = intern->r_symndx;
+
+  H_PUT_32 (abfd, intern->r_vaddr, ext->r_vaddr);
+  if (bfd_header_big_endian (abfd))
+    {
+      ext->r_bits[0] = r_symndx >> RELOC_BITS0_SYMNDX_SH_LEFT_BIG;
+      ext->r_bits[1] = r_symndx >> RELOC_BITS1_SYMNDX_SH_LEFT_BIG;
+      ext->r_bits[2] = r_symndx >> RELOC_BITS2_SYMNDX_SH_LEFT_BIG;
+      ext->r_bits[3] = (((intern->r_type << RELOC_BITS3_TYPE_SH_BIG)
+			 & RELOC_BITS3_TYPE_BIG)
+			| (intern->r_extern ? RELOC_BITS3_EXTERN_BIG : 0));
+    }
+  else
+    {
+      ext->r_bits[0] = r_symndx >> RELOC_BITS0_SYMNDX_SH_LEFT_LITTLE;
+      ext->r_bits[1] = r_symndx >> RELOC_BITS1_SYMNDX_SH_LEFT_LITTLE;
+      ext->r_bits[2] = r_symndx >> RELOC_BITS2_SYMNDX_SH_LEFT_LITTLE;
+      ext->r_bits[3] = (((intern->r_type << RELOC_BITS3_TYPE_SH_LITTLE)
+			 & RELOC_BITS3_TYPE_LITTLE)
+			| ((intern->r_type >> RELOC_BITS3_TYPEHI_SH_LITTLE
+			    & RELOC_BITS3_TYPEHI_LITTLE))
+			| (intern->r_extern ? RELOC_BITS3_EXTERN_LITTLE : 0));
+    }
+}
+
+/* Finish canonicalizing a reloc.  Part of this is generic to all
+   ECOFF targets, and that part is in ecoff.c.  The rest is done in
+   this backend routine.  It must fill in the howto field.  */
+
+static void
+mips_adjust_reloc_in (abfd, intern, rptr)
+     bfd *abfd;
+     const struct internal_reloc *intern;
+     arelent *rptr;
+{
+  if (intern->r_type > MIPS_R_PCREL16)
+    abort ();
+
+  if (! intern->r_extern
+      && (intern->r_type == MIPS_R_GPREL
+	  || intern->r_type == MIPS_R_LITERAL))
+    rptr->addend += ecoff_data (abfd)->gp;
+
+  /* If the type is MIPS_R_IGNORE, make sure this is a reference to
+     the absolute section so that the reloc is ignored.  */
+  if (intern->r_type == MIPS_R_IGNORE)
+    rptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+
+  rptr->howto = &mips_howto_table[intern->r_type];
+}
+
+/* Make any adjustments needed to a reloc before writing it out.  None
+   are needed for MIPS.  */
+
+static void
+mips_adjust_reloc_out (abfd, rel, intern)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     const arelent *rel ATTRIBUTE_UNUSED;
+     struct internal_reloc *intern ATTRIBUTE_UNUSED;
+{
+}
+
+/* ECOFF relocs are either against external symbols, or against
+   sections.  If we are producing relocatable output, and the reloc
+   is against an external symbol, and nothing has given us any
+   additional addend, the resulting reloc will also be against the
+   same symbol.  In such a case, we don't want to change anything
+   about the way the reloc is handled, since it will all be done at
+   final link time.  Rather than put special case code into
+   bfd_perform_relocation, all the reloc types use this howto
+   function.  It just short circuits the reloc if producing
+   relocatable output against an external symbol.  */
+
+static bfd_reloc_status_type
+mips_generic_reloc (abfd,
+		    reloc_entry,
+		    symbol,
+		    data,
+		    input_section,
+		    output_bfd,
+		    error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry;
+     asymbol *symbol;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  if (output_bfd != (bfd *) NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && reloc_entry->addend == 0)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  return bfd_reloc_continue;
+}
+
+/* Do a REFHI relocation.  This has to be done in combination with a
+   REFLO reloc, because there is a carry from the REFLO to the REFHI.
+   Here we just save the information we need; we do the actual
+   relocation when we see the REFLO.  MIPS ECOFF requires that the
+   REFLO immediately follow the REFHI.  As a GNU extension, we permit
+   an arbitrary number of HI relocs to be associated with a single LO
+   reloc.  This extension permits gcc to output the HI and LO relocs
+   itself.  */
+
+struct mips_hi
+{
+  struct mips_hi *next;
+  bfd_byte *addr;
+  bfd_vma addend;
+};
+
+/* FIXME: This should not be a static variable.  */
+
+static struct mips_hi *mips_refhi_list;
+
+static bfd_reloc_status_type
+mips_refhi_reloc (abfd,
+		  reloc_entry,
+		  symbol,
+		  data,
+		  input_section,
+		  output_bfd,
+		  error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry;
+     asymbol *symbol;
+     PTR data;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  bfd_reloc_status_type ret;
+  bfd_vma relocation;
+  struct mips_hi *n;
+
+  /* If we're relocating, and this an external symbol, we don't want
+     to change anything.  */
+  if (output_bfd != (bfd *) NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && reloc_entry->addend == 0)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  ret = bfd_reloc_ok;
+  if (bfd_is_und_section (symbol->section)
+      && output_bfd == (bfd *) NULL)
+    ret = bfd_reloc_undefined;
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  relocation += reloc_entry->addend;
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  /* Save the information, and let REFLO do the actual relocation.  */
+  n = (struct mips_hi *) bfd_malloc ((bfd_size_type) sizeof *n);
+  if (n == NULL)
+    return bfd_reloc_outofrange;
+  n->addr = (bfd_byte *) data + reloc_entry->address;
+  n->addend = relocation;
+  n->next = mips_refhi_list;
+  mips_refhi_list = n;
+
+  if (output_bfd != (bfd *) NULL)
+    reloc_entry->address += input_section->output_offset;
+
+  return ret;
+}
+
+/* Do a REFLO relocation.  This is a straightforward 16 bit inplace
+   relocation; this function exists in order to do the REFHI
+   relocation described above.  */
+
+static bfd_reloc_status_type
+mips_reflo_reloc (abfd,
+		  reloc_entry,
+		  symbol,
+		  data,
+		  input_section,
+		  output_bfd,
+		  error_message)
+     bfd *abfd;
+     arelent *reloc_entry;
+     asymbol *symbol;
+     PTR data;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message;
+{
+  if (mips_refhi_list != NULL)
+    {
+      struct mips_hi *l;
+
+      l = mips_refhi_list;
+      while (l != NULL)
+	{
+	  unsigned long insn;
+	  unsigned long val;
+	  unsigned long vallo;
+	  struct mips_hi *next;
+
+	  /* Do the REFHI relocation.  Note that we actually don't
+	     need to know anything about the REFLO itself, except
+	     where to find the low 16 bits of the addend needed by the
+	     REFHI.  */
+	  insn = bfd_get_32 (abfd, l->addr);
+	  vallo = (bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address)
+		   & 0xffff);
+	  val = ((insn & 0xffff) << 16) + vallo;
+	  val += l->addend;
+
+	  /* The low order 16 bits are always treated as a signed
+	     value.  Therefore, a negative value in the low order bits
+	     requires an adjustment in the high order bits.  We need
+	     to make this adjustment in two ways: once for the bits we
+	     took from the data, and once for the bits we are putting
+	     back in to the data.  */
+	  if ((vallo & 0x8000) != 0)
+	    val -= 0x10000;
+	  if ((val & 0x8000) != 0)
+	    val += 0x10000;
+
+	  insn = (insn &~ (unsigned) 0xffff) | ((val >> 16) & 0xffff);
+	  bfd_put_32 (abfd, (bfd_vma) insn, l->addr);
+
+	  next = l->next;
+	  free (l);
+	  l = next;
+	}
+
+      mips_refhi_list = NULL;
+    }
+
+  /* Now do the REFLO reloc in the usual way.  */
+  return mips_generic_reloc (abfd, reloc_entry, symbol, data,
+			      input_section, output_bfd, error_message);
+}
+
+/* Do a GPREL relocation.  This is a 16 bit value which must become
+   the offset from the gp register.  */
+
+static bfd_reloc_status_type
+mips_gprel_reloc (abfd,
+		  reloc_entry,
+		  symbol,
+		  data,
+		  input_section,
+		  output_bfd,
+		  error_message)
+     bfd *abfd;
+     arelent *reloc_entry;
+     asymbol *symbol;
+     PTR data;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message;
+{
+  bfd_boolean relocatable;
+  bfd_vma gp;
+  bfd_vma relocation;
+  unsigned long val;
+  unsigned long insn;
+
+  /* If we're relocating, and this is an external symbol with no
+     addend, we don't want to change anything.  We will only have an
+     addend if this is a newly created reloc, not read from an ECOFF
+     file.  */
+  if (output_bfd != (bfd *) NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && reloc_entry->addend == 0)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  if (output_bfd != (bfd *) NULL)
+    relocatable = TRUE;
+  else
+    {
+      relocatable = FALSE;
+      output_bfd = symbol->section->output_section->owner;
+    }
+
+  if (bfd_is_und_section (symbol->section) && ! relocatable)
+    return bfd_reloc_undefined;
+
+  /* We have to figure out the gp value, so that we can adjust the
+     symbol value correctly.  We look up the symbol _gp in the output
+     BFD.  If we can't find it, we're stuck.  We cache it in the ECOFF
+     target data.  We don't need to adjust the symbol value for an
+     external symbol if we are producing relocatable output.  */
+  gp = _bfd_get_gp_value (output_bfd);
+  if (gp == 0
+      && (! relocatable
+	  || (symbol->flags & BSF_SECTION_SYM) != 0))
+    {
+      if (relocatable)
+	{
+	  /* Make up a value.  */
+	  gp = symbol->section->output_section->vma + 0x4000;
+	  _bfd_set_gp_value (output_bfd, gp);
+	}
+      else
+	{
+	  unsigned int count;
+	  asymbol **sym;
+	  unsigned int i;
+
+	  count = bfd_get_symcount (output_bfd);
+	  sym = bfd_get_outsymbols (output_bfd);
+
+	  if (sym == (asymbol **) NULL)
+	    i = count;
+	  else
+	    {
+	      for (i = 0; i < count; i++, sym++)
+		{
+		  register const char *name;
+
+		  name = bfd_asymbol_name (*sym);
+		  if (*name == '_' && strcmp (name, "_gp") == 0)
+		    {
+		      gp = bfd_asymbol_value (*sym);
+		      _bfd_set_gp_value (output_bfd, gp);
+		      break;
+		    }
+		}
+	    }
+
+	  if (i >= count)
+	    {
+	      /* Only get the error once.  */
+	      gp = 4;
+	      _bfd_set_gp_value (output_bfd, gp);
+	      *error_message =
+		(char *) _("GP relative relocation when _gp not defined");
+	      return bfd_reloc_dangerous;
+	    }
+	}
+    }
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  insn = bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
+
+  /* Set val to the offset into the section or symbol.  */
+  val = ((insn & 0xffff) + reloc_entry->addend) & 0xffff;
+  if (val & 0x8000)
+    val -= 0x10000;
+
+  /* Adjust val for the final section location and GP value.  If we
+     are producing relocatable output, we don't want to do this for
+     an external symbol.  */
+  if (! relocatable
+      || (symbol->flags & BSF_SECTION_SYM) != 0)
+    val += relocation - gp;
+
+  insn = (insn &~ (unsigned) 0xffff) | (val & 0xffff);
+  bfd_put_32 (abfd, (bfd_vma) insn, (bfd_byte *) data + reloc_entry->address);
+
+  if (relocatable)
+    reloc_entry->address += input_section->output_offset;
+
+  /* Make sure it fit in 16 bits.  */
+  if ((long) val >= 0x8000 || (long) val < -0x8000)
+    return bfd_reloc_overflow;
+
+  return bfd_reloc_ok;
+}
+
+/* Get the howto structure for a generic reloc type.  */
+
+static reloc_howto_type *
+mips_bfd_reloc_type_lookup (abfd, code)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     bfd_reloc_code_real_type code;
+{
+  int mips_type;
+
+  switch (code)
+    {
+    case BFD_RELOC_16:
+      mips_type = MIPS_R_REFHALF;
+      break;
+    case BFD_RELOC_32:
+    case BFD_RELOC_CTOR:
+      mips_type = MIPS_R_REFWORD;
+      break;
+    case BFD_RELOC_MIPS_JMP:
+      mips_type = MIPS_R_JMPADDR;
+      break;
+    case BFD_RELOC_HI16_S:
+      mips_type = MIPS_R_REFHI;
+      break;
+    case BFD_RELOC_LO16:
+      mips_type = MIPS_R_REFLO;
+      break;
+    case BFD_RELOC_GPREL16:
+      mips_type = MIPS_R_GPREL;
+      break;
+    case BFD_RELOC_MIPS_LITERAL:
+      mips_type = MIPS_R_LITERAL;
+      break;
+    case BFD_RELOC_16_PCREL_S2:
+      mips_type = MIPS_R_PCREL16;
+      break;
+    default:
+      return (reloc_howto_type *) NULL;
+    }
+
+  return &mips_howto_table[mips_type];
+}
+
+static reloc_howto_type *
+mips_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (mips_howto_table) / sizeof (mips_howto_table[0]);
+       i++)
+    if (mips_howto_table[i].name != NULL
+	&& strcasecmp (mips_howto_table[i].name, r_name) == 0)
+      return &mips_howto_table[i];
+
+  return NULL;
+}
+
+/* A helper routine for mips_relocate_section which handles the REFHI
+   relocations.  The REFHI relocation must be followed by a REFLO
+   relocation, and the addend used is formed from the addends of both
+   instructions.  */
+
+static void
+mips_relocate_hi (refhi, reflo, input_bfd, input_section, contents,
+		  relocation)
+     struct internal_reloc *refhi;
+     struct internal_reloc *reflo;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     bfd_vma relocation;
+{
+  unsigned long insn;
+  unsigned long val;
+  unsigned long vallo;
+
+  if (refhi == NULL)
+    return;
+
+  insn = bfd_get_32 (input_bfd,
+		     contents + refhi->r_vaddr - input_section->vma);
+  if (reflo == NULL)
+    vallo = 0;
+  else
+    vallo = (bfd_get_32 (input_bfd,
+			 contents + reflo->r_vaddr - input_section->vma)
+	     & 0xffff);
+
+  val = ((insn & 0xffff) << 16) + vallo;
+  val += relocation;
+
+  /* The low order 16 bits are always treated as a signed value.
+     Therefore, a negative value in the low order bits requires an
+     adjustment in the high order bits.  We need to make this
+     adjustment in two ways: once for the bits we took from the data,
+     and once for the bits we are putting back in to the data.  */
+  if ((vallo & 0x8000) != 0)
+    val -= 0x10000;
+
+  if ((val & 0x8000) != 0)
+    val += 0x10000;
+
+  insn = (insn &~ (unsigned) 0xffff) | ((val >> 16) & 0xffff);
+  bfd_put_32 (input_bfd, (bfd_vma) insn,
+	      contents + refhi->r_vaddr - input_section->vma);
+}
+
+/* Relocate a section while linking a MIPS ECOFF file.  */
+
+static bfd_boolean
+mips_relocate_section (output_bfd, info, input_bfd, input_section,
+		       contents, external_relocs)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     PTR external_relocs;
+{
+  asection **symndx_to_section;
+  struct ecoff_link_hash_entry **sym_hashes;
+  bfd_vma gp;
+  bfd_boolean gp_undefined;
+  struct external_reloc *ext_rel;
+  struct external_reloc *ext_rel_end;
+  unsigned int i;
+  bfd_boolean got_lo;
+  struct internal_reloc lo_int_rel;
+  bfd_size_type amt;
+
+  BFD_ASSERT (input_bfd->xvec->byteorder
+	      == output_bfd->xvec->byteorder);
+
+  /* We keep a table mapping the symndx found in an internal reloc to
+     the appropriate section.  This is faster than looking up the
+     section by name each time.  */
+  symndx_to_section = ecoff_data (input_bfd)->symndx_to_section;
+  if (symndx_to_section == (asection **) NULL)
+    {
+      amt = NUM_RELOC_SECTIONS * sizeof (asection *);
+      symndx_to_section = (asection **) bfd_alloc (input_bfd, amt);
+      if (!symndx_to_section)
+	return FALSE;
+
+      symndx_to_section[RELOC_SECTION_NONE] = NULL;
+      symndx_to_section[RELOC_SECTION_TEXT] =
+	bfd_get_section_by_name (input_bfd, ".text");
+      symndx_to_section[RELOC_SECTION_RDATA] =
+	bfd_get_section_by_name (input_bfd, ".rdata");
+      symndx_to_section[RELOC_SECTION_DATA] =
+	bfd_get_section_by_name (input_bfd, ".data");
+      symndx_to_section[RELOC_SECTION_SDATA] =
+	bfd_get_section_by_name (input_bfd, ".sdata");
+      symndx_to_section[RELOC_SECTION_SBSS] =
+	bfd_get_section_by_name (input_bfd, ".sbss");
+      symndx_to_section[RELOC_SECTION_BSS] =
+	bfd_get_section_by_name (input_bfd, ".bss");
+      symndx_to_section[RELOC_SECTION_INIT] =
+	bfd_get_section_by_name (input_bfd, ".init");
+      symndx_to_section[RELOC_SECTION_LIT8] =
+	bfd_get_section_by_name (input_bfd, ".lit8");
+      symndx_to_section[RELOC_SECTION_LIT4] =
+	bfd_get_section_by_name (input_bfd, ".lit4");
+      symndx_to_section[RELOC_SECTION_XDATA] = NULL;
+      symndx_to_section[RELOC_SECTION_PDATA] = NULL;
+      symndx_to_section[RELOC_SECTION_FINI] =
+	bfd_get_section_by_name (input_bfd, ".fini");
+      symndx_to_section[RELOC_SECTION_LITA] = NULL;
+      symndx_to_section[RELOC_SECTION_ABS] = NULL;
+
+      ecoff_data (input_bfd)->symndx_to_section = symndx_to_section;
+    }
+
+  sym_hashes = ecoff_data (input_bfd)->sym_hashes;
+
+  gp = _bfd_get_gp_value (output_bfd);
+  if (gp == 0)
+    gp_undefined = TRUE;
+  else
+    gp_undefined = FALSE;
+
+  got_lo = FALSE;
+
+  ext_rel = (struct external_reloc *) external_relocs;
+  ext_rel_end = ext_rel + input_section->reloc_count;
+  for (i = 0; ext_rel < ext_rel_end; ext_rel++, i++)
+    {
+      struct internal_reloc int_rel;
+      bfd_boolean use_lo = FALSE;
+      bfd_vma addend;
+      reloc_howto_type *howto;
+      struct ecoff_link_hash_entry *h = NULL;
+      asection *s = NULL;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+
+      if (! got_lo)
+	mips_ecoff_swap_reloc_in (input_bfd, (PTR) ext_rel, &int_rel);
+      else
+	{
+	  int_rel = lo_int_rel;
+	  got_lo = FALSE;
+	}
+
+      BFD_ASSERT (int_rel.r_type
+		  < sizeof mips_howto_table / sizeof mips_howto_table[0]);
+
+      /* The REFHI reloc requires special handling.  It must be followed
+	 by a REFLO reloc, and the addend is formed from both relocs.  */
+      if (int_rel.r_type == MIPS_R_REFHI)
+	{
+	  struct external_reloc *lo_ext_rel;
+
+	  /* As a GNU extension, permit an arbitrary number of REFHI
+             relocs before the REFLO reloc.  This permits gcc to emit
+	     the HI and LO relocs itself.  */
+	  for (lo_ext_rel = ext_rel + 1;
+	       lo_ext_rel < ext_rel_end;
+	       lo_ext_rel++)
+	    {
+	      mips_ecoff_swap_reloc_in (input_bfd, (PTR) lo_ext_rel,
+					&lo_int_rel);
+	      if (lo_int_rel.r_type != int_rel.r_type)
+		break;
+	    }
+
+	  if (lo_ext_rel < ext_rel_end
+	      && lo_int_rel.r_type == MIPS_R_REFLO
+	      && int_rel.r_extern == lo_int_rel.r_extern
+	      && int_rel.r_symndx == lo_int_rel.r_symndx)
+	    {
+	      use_lo = TRUE;
+	      if (lo_ext_rel == ext_rel + 1)
+		got_lo = TRUE;
+	    }
+	}
+
+      howto = &mips_howto_table[int_rel.r_type];
+
+      if (int_rel.r_extern)
+	{
+	  h = sym_hashes[int_rel.r_symndx];
+	  /* If h is NULL, that means that there is a reloc against an
+	     external symbol which we thought was just a debugging
+	     symbol.  This should not happen.  */
+	  if (h == (struct ecoff_link_hash_entry *) NULL)
+	    abort ();
+	}
+      else
+	{
+	  if (int_rel.r_symndx < 0 || int_rel.r_symndx >= NUM_RELOC_SECTIONS)
+	    s = NULL;
+	  else
+	    s = symndx_to_section[int_rel.r_symndx];
+
+	  if (s == (asection *) NULL)
+	    abort ();
+	}
+
+      /* The GPREL reloc uses an addend: the difference in the GP
+	 values.  */
+      if (int_rel.r_type != MIPS_R_GPREL
+	  && int_rel.r_type != MIPS_R_LITERAL)
+	addend = 0;
+      else
+	{
+	  if (gp_undefined)
+	    {
+	      if (! ((*info->callbacks->reloc_dangerous)
+		     (info, _("GP relative relocation used when GP not defined"),
+		      input_bfd, input_section,
+		      int_rel.r_vaddr - input_section->vma)))
+		return FALSE;
+	      /* Only give the error once per link.  */
+	      gp = 4;
+	      _bfd_set_gp_value (output_bfd, gp);
+	      gp_undefined = FALSE;
+	    }
+	  if (! int_rel.r_extern)
+	    {
+	      /* This is a relocation against a section.  The current
+		 addend in the instruction is the difference between
+		 INPUT_SECTION->vma and the GP value of INPUT_BFD.  We
+		 must change this to be the difference between the
+		 final definition (which will end up in RELOCATION)
+		 and the GP value of OUTPUT_BFD (which is in GP).  */
+	      addend = ecoff_data (input_bfd)->gp - gp;
+	    }
+	  else if (! info->relocatable
+		   || h->root.type == bfd_link_hash_defined
+		   || h->root.type == bfd_link_hash_defweak)
+	    {
+	      /* This is a relocation against a defined symbol.  The
+		 current addend in the instruction is simply the
+		 desired offset into the symbol (normally zero).  We
+		 are going to change this into a relocation against a
+		 defined symbol, so we want the instruction to hold
+		 the difference between the final definition of the
+		 symbol (which will end up in RELOCATION) and the GP
+		 value of OUTPUT_BFD (which is in GP).  */
+	      addend = - gp;
+	    }
+	  else
+	    {
+	      /* This is a relocation against an undefined or common
+		 symbol.  The current addend in the instruction is
+		 simply the desired offset into the symbol (normally
+		 zero).  We are generating relocatable output, and we
+		 aren't going to define this symbol, so we just leave
+		 the instruction alone.  */
+	      addend = 0;
+	    }
+	}
+
+      if (info->relocatable)
+	{
+	  /* We are generating relocatable output, and must convert
+	     the existing reloc.  */
+	  if (int_rel.r_extern)
+	    {
+	      if ((h->root.type == bfd_link_hash_defined
+		   || h->root.type == bfd_link_hash_defweak)
+		  && ! bfd_is_abs_section (h->root.u.def.section))
+		{
+		  const char *name;
+
+		  /* This symbol is defined in the output.  Convert
+		     the reloc from being against the symbol to being
+		     against the section.  */
+
+		  /* Clear the r_extern bit.  */
+		  int_rel.r_extern = 0;
+
+		  /* Compute a new r_symndx value.  */
+		  s = h->root.u.def.section;
+		  name = bfd_get_section_name (output_bfd,
+					       s->output_section);
+
+		  int_rel.r_symndx = -1;
+		  switch (name[1])
+		    {
+		    case 'b':
+		      if (strcmp (name, ".bss") == 0)
+			int_rel.r_symndx = RELOC_SECTION_BSS;
+		      break;
+		    case 'd':
+		      if (strcmp (name, ".data") == 0)
+			int_rel.r_symndx = RELOC_SECTION_DATA;
+		      break;
+		    case 'f':
+		      if (strcmp (name, ".fini") == 0)
+			int_rel.r_symndx = RELOC_SECTION_FINI;
+		      break;
+		    case 'i':
+		      if (strcmp (name, ".init") == 0)
+			int_rel.r_symndx = RELOC_SECTION_INIT;
+		      break;
+		    case 'l':
+		      if (strcmp (name, ".lit8") == 0)
+			int_rel.r_symndx = RELOC_SECTION_LIT8;
+		      else if (strcmp (name, ".lit4") == 0)
+			int_rel.r_symndx = RELOC_SECTION_LIT4;
+		      break;
+		    case 'r':
+		      if (strcmp (name, ".rdata") == 0)
+			int_rel.r_symndx = RELOC_SECTION_RDATA;
+		      break;
+		    case 's':
+		      if (strcmp (name, ".sdata") == 0)
+			int_rel.r_symndx = RELOC_SECTION_SDATA;
+		      else if (strcmp (name, ".sbss") == 0)
+			int_rel.r_symndx = RELOC_SECTION_SBSS;
+		      break;
+		    case 't':
+		      if (strcmp (name, ".text") == 0)
+			int_rel.r_symndx = RELOC_SECTION_TEXT;
+		      break;
+		    }
+
+		  if (int_rel.r_symndx == -1)
+		    abort ();
+
+		  /* Add the section VMA and the symbol value.  */
+		  relocation = (h->root.u.def.value
+				+ s->output_section->vma
+				+ s->output_offset);
+
+		  /* For a PC relative relocation, the object file
+		     currently holds just the addend.  We must adjust
+		     by the address to get the right value.  */
+		  if (howto->pc_relative)
+		    relocation -= int_rel.r_vaddr - input_section->vma;
+
+		  h = NULL;
+		}
+	      else
+		{
+		  /* Change the symndx value to the right one for the
+		     output BFD.  */
+		  int_rel.r_symndx = h->indx;
+		  if (int_rel.r_symndx == -1)
+		    {
+		      /* This symbol is not being written out.  */
+		      if (! ((*info->callbacks->unattached_reloc)
+			     (info, h->root.root.string, input_bfd,
+			      input_section,
+			      int_rel.r_vaddr - input_section->vma)))
+			return FALSE;
+		      int_rel.r_symndx = 0;
+		    }
+		  relocation = 0;
+		}
+	    }
+	  else
+	    {
+	      /* This is a relocation against a section.  Adjust the
+		 value by the amount the section moved.  */
+	      relocation = (s->output_section->vma
+			    + s->output_offset
+			    - s->vma);
+	    }
+
+	  relocation += addend;
+	  addend = 0;
+
+	  /* Adjust a PC relative relocation by removing the reference
+	     to the original address in the section and including the
+	     reference to the new address.  */
+	  if (howto->pc_relative)
+	    relocation -= (input_section->output_section->vma
+			   + input_section->output_offset
+			   - input_section->vma);
+
+	  /* Adjust the contents.  */
+	  if (relocation == 0)
+	    r = bfd_reloc_ok;
+	  else
+	    {
+	      if (int_rel.r_type != MIPS_R_REFHI)
+		r = _bfd_relocate_contents (howto, input_bfd, relocation,
+					    (contents
+					     + int_rel.r_vaddr
+					     - input_section->vma));
+	      else
+		{
+		  mips_relocate_hi (&int_rel,
+				    use_lo ? &lo_int_rel : NULL,
+				    input_bfd, input_section, contents,
+				    relocation);
+		  r = bfd_reloc_ok;
+		}
+	    }
+
+	  /* Adjust the reloc address.  */
+	  int_rel.r_vaddr += (input_section->output_section->vma
+			      + input_section->output_offset
+			      - input_section->vma);
+
+	  /* Save the changed reloc information.  */
+	  mips_ecoff_swap_reloc_out (input_bfd, &int_rel, (PTR) ext_rel);
+	}
+      else
+	{
+	  /* We are producing a final executable.  */
+	  if (int_rel.r_extern)
+	    {
+	      /* This is a reloc against a symbol.  */
+	      if (h->root.type == bfd_link_hash_defined
+		  || h->root.type == bfd_link_hash_defweak)
+		{
+		  asection *hsec;
+
+		  hsec = h->root.u.def.section;
+		  relocation = (h->root.u.def.value
+				+ hsec->output_section->vma
+				+ hsec->output_offset);
+		}
+	      else
+		{
+		  if (! ((*info->callbacks->undefined_symbol)
+			 (info, h->root.root.string, input_bfd,
+			  input_section,
+			  int_rel.r_vaddr - input_section->vma, TRUE)))
+		    return FALSE;
+		  relocation = 0;
+		}
+	    }
+	  else
+	    {
+	      /* This is a reloc against a section.  */
+	      relocation = (s->output_section->vma
+			    + s->output_offset
+			    - s->vma);
+
+	      /* A PC relative reloc is already correct in the object
+		 file.  Make it look like a pcrel_offset relocation by
+		 adding in the start address.  */
+	      if (howto->pc_relative)
+		relocation += int_rel.r_vaddr;
+	    }
+
+	  if (int_rel.r_type != MIPS_R_REFHI)
+	    r = _bfd_final_link_relocate (howto,
+					  input_bfd,
+					  input_section,
+					  contents,
+					  (int_rel.r_vaddr
+					   - input_section->vma),
+					  relocation,
+					  addend);
+	  else
+	    {
+	      mips_relocate_hi (&int_rel,
+				use_lo ? &lo_int_rel : NULL,
+				input_bfd, input_section, contents,
+				relocation);
+	      r = bfd_reloc_ok;
+	    }
+	}
+
+      /* MIPS_R_JMPADDR requires peculiar overflow detection.  The
+	 instruction provides a 28 bit address (the two lower bits are
+	 implicit zeroes) which is combined with the upper four bits
+	 of the instruction address.  */
+      if (r == bfd_reloc_ok
+	  && int_rel.r_type == MIPS_R_JMPADDR
+	  && (((relocation
+		+ addend
+		+ (int_rel.r_extern ? 0 : s->vma))
+	       & 0xf0000000)
+	      != ((input_section->output_section->vma
+		   + input_section->output_offset
+		   + (int_rel.r_vaddr - input_section->vma))
+		  & 0xf0000000)))
+	r = bfd_reloc_overflow;
+
+      if (r != bfd_reloc_ok)
+	{
+	  switch (r)
+	    {
+	    default:
+	    case bfd_reloc_outofrange:
+	      abort ();
+	    case bfd_reloc_overflow:
+	      {
+		const char *name;
+
+		if (int_rel.r_extern)
+		  name = NULL;
+		else
+		  name = bfd_section_name (input_bfd, s);
+		if (! ((*info->callbacks->reloc_overflow)
+		       (info, (h ? &h->root : NULL), name, howto->name,
+			(bfd_vma) 0, input_bfd, input_section,
+			int_rel.r_vaddr - input_section->vma)))
+		  return FALSE;
+	      }
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* This is the ECOFF backend structure.  The backend field of the
+   target vector points to this.  */
+
+static const struct ecoff_backend_data mips_ecoff_backend_data =
+{
+  /* COFF backend structure.  */
+  {
+    (void (*) PARAMS ((bfd *,PTR,int,int,int,int,PTR))) bfd_void, /* aux_in */
+    (void (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* sym_in */
+    (void (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* lineno_in */
+    (unsigned (*) PARAMS ((bfd *,PTR,int,int,int,int,PTR)))bfd_void,/*aux_out*/
+    (unsigned (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* sym_out */
+    (unsigned (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* lineno_out */
+    (unsigned (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* reloc_out */
+    mips_ecoff_swap_filehdr_out, mips_ecoff_swap_aouthdr_out,
+    mips_ecoff_swap_scnhdr_out,
+    FILHSZ, AOUTSZ, SCNHSZ, 0, 0, 0, 0, FILNMLEN, TRUE, 
+    ECOFF_NO_LONG_SECTION_NAMES, 4, FALSE, 2,
+    mips_ecoff_swap_filehdr_in, mips_ecoff_swap_aouthdr_in,
+    mips_ecoff_swap_scnhdr_in, NULL,
+    mips_ecoff_bad_format_hook, _bfd_ecoff_set_arch_mach_hook,
+    _bfd_ecoff_mkobject_hook, _bfd_ecoff_styp_to_sec_flags,
+    _bfd_ecoff_set_alignment_hook, _bfd_ecoff_slurp_symbol_table,
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+    NULL, NULL, NULL
+  },
+  /* Supported architecture.  */
+  bfd_arch_mips,
+  /* Initial portion of armap string.  */
+  "__________",
+  /* The page boundary used to align sections in a demand-paged
+     executable file.  E.g., 0x1000.  */
+  0x1000,
+  /* TRUE if the .rdata section is part of the text segment, as on the
+     Alpha.  FALSE if .rdata is part of the data segment, as on the
+     MIPS.  */
+  FALSE,
+  /* Bitsize of constructor entries.  */
+  32,
+  /* Reloc to use for constructor entries.  */
+  &mips_howto_table[MIPS_R_REFWORD],
+  {
+    /* Symbol table magic number.  */
+    magicSym,
+    /* Alignment of debugging information.  E.g., 4.  */
+    4,
+    /* Sizes of external symbolic information.  */
+    sizeof (struct hdr_ext),
+    sizeof (struct dnr_ext),
+    sizeof (struct pdr_ext),
+    sizeof (struct sym_ext),
+    sizeof (struct opt_ext),
+    sizeof (struct fdr_ext),
+    sizeof (struct rfd_ext),
+    sizeof (struct ext_ext),
+    /* Functions to swap in external symbolic data.  */
+    ecoff_swap_hdr_in,
+    ecoff_swap_dnr_in,
+    ecoff_swap_pdr_in,
+    ecoff_swap_sym_in,
+    ecoff_swap_opt_in,
+    ecoff_swap_fdr_in,
+    ecoff_swap_rfd_in,
+    ecoff_swap_ext_in,
+    _bfd_ecoff_swap_tir_in,
+    _bfd_ecoff_swap_rndx_in,
+    /* Functions to swap out external symbolic data.  */
+    ecoff_swap_hdr_out,
+    ecoff_swap_dnr_out,
+    ecoff_swap_pdr_out,
+    ecoff_swap_sym_out,
+    ecoff_swap_opt_out,
+    ecoff_swap_fdr_out,
+    ecoff_swap_rfd_out,
+    ecoff_swap_ext_out,
+    _bfd_ecoff_swap_tir_out,
+    _bfd_ecoff_swap_rndx_out,
+    /* Function to read in symbolic data.  */
+    _bfd_ecoff_slurp_symbolic_info
+  },
+  /* External reloc size.  */
+  RELSZ,
+  /* Reloc swapping functions.  */
+  mips_ecoff_swap_reloc_in,
+  mips_ecoff_swap_reloc_out,
+  /* Backend reloc tweaking.  */
+  mips_adjust_reloc_in,
+  mips_adjust_reloc_out,
+  /* Relocate section contents while linking.  */
+  mips_relocate_section,
+  /* Do final adjustments to filehdr and aouthdr.  */
+  NULL,
+  /* Read an element from an archive at a given file position.  */
+  _bfd_get_elt_at_filepos
+};
+
+/* Looking up a reloc type is MIPS specific.  */
+#define _bfd_ecoff_bfd_reloc_type_lookup mips_bfd_reloc_type_lookup
+#define _bfd_ecoff_bfd_reloc_name_lookup mips_bfd_reloc_name_lookup
+
+/* Getting relocated section contents is generic.  */
+#define _bfd_ecoff_bfd_get_relocated_section_contents \
+  bfd_generic_get_relocated_section_contents
+
+/* Handling file windows is generic.  */
+#define _bfd_ecoff_get_section_contents_in_window \
+  _bfd_generic_get_section_contents_in_window
+
+/* Relaxing sections is MIPS specific.  */
+#define _bfd_ecoff_bfd_relax_section bfd_generic_relax_section
+
+/* GC of sections is not done.  */
+#define _bfd_ecoff_bfd_gc_sections bfd_generic_gc_sections
+
+/* Input section flags is not implemented.  */
+#define _bfd_ecoff_bfd_lookup_section_flags bfd_generic_lookup_section_flags
+
+/* Merging of sections is not done.  */
+#define _bfd_ecoff_bfd_merge_sections bfd_generic_merge_sections
+
+#define _bfd_ecoff_bfd_is_group_section bfd_generic_is_group_section
+#define _bfd_ecoff_bfd_discard_group bfd_generic_discard_group
+#define _bfd_ecoff_section_already_linked \
+  _bfd_coff_section_already_linked
+#define _bfd_ecoff_bfd_define_common_symbol bfd_generic_define_common_symbol
+
+extern const bfd_target ecoff_big_vec;
+
+const bfd_target ecoff_little_vec =
+{
+  "ecoff-littlemips",		/* name */
+  bfd_target_ecoff_flavour,
+  BFD_ENDIAN_LITTLE,		/* data byte order is little */
+  BFD_ENDIAN_LITTLE,		/* header byte order is little */
+
+  (HAS_RELOC | EXEC_P |		/* object flags */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
+  0,				/* leading underscore */
+  ' ',				/* ar_pad_char */
+  15,				/* ar_max_namelen */
+  0,				/* match priority.  */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
+
+  {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
+     bfd_generic_archive_p, _bfd_dummy_target},
+  {bfd_false, _bfd_ecoff_mkobject,  /* bfd_set_format */
+     _bfd_generic_mkarchive, bfd_false},
+  {bfd_false, _bfd_ecoff_write_object_contents, /* bfd_write_contents */
+     _bfd_write_archive_contents, bfd_false},
+
+     BFD_JUMP_TABLE_GENERIC (_bfd_ecoff),
+     BFD_JUMP_TABLE_COPY (_bfd_ecoff),
+     BFD_JUMP_TABLE_CORE (_bfd_nocore),
+     BFD_JUMP_TABLE_ARCHIVE (_bfd_ecoff),
+     BFD_JUMP_TABLE_SYMBOLS (_bfd_ecoff),
+     BFD_JUMP_TABLE_RELOCS (_bfd_ecoff),
+     BFD_JUMP_TABLE_WRITE (_bfd_ecoff),
+     BFD_JUMP_TABLE_LINK (_bfd_ecoff),
+     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  & ecoff_big_vec,
+
+  (PTR) &mips_ecoff_backend_data
+};
+
+const bfd_target ecoff_big_vec =
+{
+  "ecoff-bigmips",		/* name */
+  bfd_target_ecoff_flavour,
+  BFD_ENDIAN_BIG,		/* data byte order is big */
+  BFD_ENDIAN_BIG,		/* header byte order is big */
+
+  (HAS_RELOC | EXEC_P |		/* object flags */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
+  0,				/* leading underscore */
+  ' ',				/* ar_pad_char */
+  15,				/* ar_max_namelen */
+  0,				/* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+     bfd_getb16, bfd_getb_signed_16, bfd_putb16,
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+     bfd_getb16, bfd_getb_signed_16, bfd_putb16,
+ {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
+    bfd_generic_archive_p, _bfd_dummy_target},
+ {bfd_false, _bfd_ecoff_mkobject, /* bfd_set_format */
+    _bfd_generic_mkarchive, bfd_false},
+ {bfd_false, _bfd_ecoff_write_object_contents, /* bfd_write_contents */
+    _bfd_write_archive_contents, bfd_false},
+
+     BFD_JUMP_TABLE_GENERIC (_bfd_ecoff),
+     BFD_JUMP_TABLE_COPY (_bfd_ecoff),
+     BFD_JUMP_TABLE_CORE (_bfd_nocore),
+     BFD_JUMP_TABLE_ARCHIVE (_bfd_ecoff),
+     BFD_JUMP_TABLE_SYMBOLS (_bfd_ecoff),
+     BFD_JUMP_TABLE_RELOCS (_bfd_ecoff),
+     BFD_JUMP_TABLE_WRITE (_bfd_ecoff),
+     BFD_JUMP_TABLE_LINK (_bfd_ecoff),
+     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  & ecoff_little_vec,
+
+  (PTR) &mips_ecoff_backend_data
+};
+
+const bfd_target ecoff_biglittle_vec =
+{
+  "ecoff-biglittlemips",		/* name */
+  bfd_target_ecoff_flavour,
+  BFD_ENDIAN_LITTLE,		/* data byte order is little */
+  BFD_ENDIAN_BIG,		/* header byte order is big */
+
+  (HAS_RELOC | EXEC_P |		/* object flags */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
+  0,				/* leading underscore */
+  ' ',				/* ar_pad_char */
+  15,				/* ar_max_namelen */
+  0,				/* match priority.  */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
+
+  {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
+     bfd_generic_archive_p, _bfd_dummy_target},
+  {bfd_false, _bfd_ecoff_mkobject,  /* bfd_set_format */
+     _bfd_generic_mkarchive, bfd_false},
+  {bfd_false, _bfd_ecoff_write_object_contents, /* bfd_write_contents */
+     _bfd_write_archive_contents, bfd_false},
+
+     BFD_JUMP_TABLE_GENERIC (_bfd_ecoff),
+     BFD_JUMP_TABLE_COPY (_bfd_ecoff),
+     BFD_JUMP_TABLE_CORE (_bfd_nocore),
+     BFD_JUMP_TABLE_ARCHIVE (_bfd_ecoff),
+     BFD_JUMP_TABLE_SYMBOLS (_bfd_ecoff),
+     BFD_JUMP_TABLE_RELOCS (_bfd_ecoff),
+     BFD_JUMP_TABLE_WRITE (_bfd_ecoff),
+     BFD_JUMP_TABLE_LINK (_bfd_ecoff),
+     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  (PTR) &mips_ecoff_backend_data
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-or32.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-or32.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-or32.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-or32.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,646 @@
+/* BFD back-end for OpenRISC 1000 COFF binaries.
+   Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2011
+   Free Software Foundation, Inc.
+   Contributed by Ivan Guzvinec  <ivang@opencores.org>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define OR32 1
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "coff/or32.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+
+static long get_symbol_value
+  PARAMS ((asymbol *));
+static bfd_reloc_status_type or32_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_boolean coff_or32_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+	   struct internal_reloc *, struct internal_syment *, asection **));
+static bfd_boolean coff_or32_adjust_symndx
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
+	   struct internal_reloc *, bfd_boolean *));
+static void reloc_processing
+  PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection *));
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (2)
+
+#define INSERT_HWORD(WORD,HWORD)              \
+    (((WORD) & 0xffff0000) | ((HWORD)& 0x0000ffff))
+#define EXTRACT_HWORD(WORD)                   \
+    ((WORD) & 0x0000ffff)
+#define SIGN_EXTEND_HWORD(HWORD)              \
+    ((HWORD) & 0x8000 ? (HWORD)|(~0xffffL) : (HWORD))
+
+#define INSERT_JUMPTARG(WORD,JT)              \
+    (((WORD) & 0xfc000000) | ((JT)& 0x03ffffff))
+#define EXTRACT_JUMPTARG(WORD)                   \
+    ((WORD) & 0x03ffffff)
+#define SIGN_EXTEND_JUMPTARG(JT)              \
+    ((JT) & 0x04000000 ? (JT)|(~0x03ffffffL) : (JT))
+
+/* Provided the symbol, returns the value reffed.  */
+
+static long
+get_symbol_value (symbol)
+     asymbol *symbol;
+{
+  long relocation = 0;
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value +
+      symbol->section->output_section->vma +
+      symbol->section->output_offset;
+
+  return relocation;
+}
+
+/* This function is in charge of performing all the or32 relocations.  */
+
+static bfd_reloc_status_type
+or32_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
+            error_message)
+     bfd *abfd;
+     arelent *reloc_entry;
+     asymbol *symbol_in;
+     PTR data;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message;
+{
+  /* The consth relocation comes in two parts, we have to remember
+     the state between calls, in these variables.  */
+  static bfd_boolean part1_consth_active = FALSE;
+  static unsigned long part1_consth_value;
+
+  unsigned long insn;
+  unsigned long sym_value;
+  unsigned long unsigned_value;
+  unsigned short r_type;
+  long signed_value;
+
+  unsigned long addr = reloc_entry->address ;   /*+ input_section->vma*/
+  bfd_byte *hit_data =addr + (bfd_byte *)(data);
+
+  r_type = reloc_entry->howto->type;
+
+  if (output_bfd)
+    {
+      /* Partial linking - do nothing.  */
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  if (symbol_in != NULL
+      && bfd_is_und_section (symbol_in->section))
+    {
+      /* Keep the state machine happy in case we're called again.  */
+      if (r_type == R_IHIHALF)
+        {
+          part1_consth_active = TRUE;
+          part1_consth_value  = 0;
+        }
+
+      return bfd_reloc_undefined;
+    }
+
+  if ((part1_consth_active) && (r_type != R_IHCONST))
+    {
+      part1_consth_active = FALSE;
+      *error_message = (char *) "Missing IHCONST";
+
+      return bfd_reloc_dangerous;
+    }
+
+  sym_value = get_symbol_value (symbol_in);
+
+  switch (r_type)
+    {
+    case R_IREL:
+      insn = bfd_get_32(abfd, hit_data);
+
+      /* Take the value in the field and sign extend it.  */
+      signed_value = EXTRACT_JUMPTARG (insn);
+      signed_value = SIGN_EXTEND_JUMPTARG (signed_value);
+      signed_value <<= 2;
+
+      /* See the note on the R_IREL reloc in coff_or32_relocate_section.  */
+      if (signed_value == - (long) reloc_entry->address)
+        signed_value = 0;
+
+      signed_value += sym_value + reloc_entry->addend;
+      /* Relative jmp/call, so subtract from the value the
+	 address of the place we're coming from.  */
+      signed_value -= (reloc_entry->address
+		       + input_section->output_section->vma
+		       + input_section->output_offset);
+      if (signed_value > 0x7ffffff || signed_value < -0x8000000)
+	return bfd_reloc_overflow;
+
+      signed_value >>= 2;
+      insn = INSERT_JUMPTARG (insn, signed_value);
+      bfd_put_32 (abfd, insn, hit_data);
+      break;
+
+    case R_ILOHALF:
+      insn = bfd_get_32 (abfd, hit_data);
+      unsigned_value = EXTRACT_HWORD (insn);
+      unsigned_value +=  sym_value + reloc_entry->addend;
+      insn = INSERT_HWORD (insn, unsigned_value);
+      bfd_put_32 (abfd, insn, hit_data);
+      break;
+
+    case R_IHIHALF:
+      insn = bfd_get_32 (abfd, hit_data);
+
+      /* consth, part 1
+         Just get the symbol value that is referenced.  */
+      part1_consth_active = TRUE;
+      part1_consth_value = sym_value + reloc_entry->addend;
+
+      /* Don't modify insn until R_IHCONST.  */
+      break;
+
+    case R_IHCONST:
+      insn = bfd_get_32 (abfd, hit_data);
+
+      /* consth, part 2
+         Now relocate the reference.  */
+      if (! part1_consth_active)
+        {
+          *error_message = (char *) "Missing IHIHALF";
+          return bfd_reloc_dangerous;
+        }
+
+      /* sym_ptr_ptr = r_symndx, in coff_slurp_reloc_table() */
+      unsigned_value = 0;   /*EXTRACT_HWORD(insn) << 16;*/
+      unsigned_value += reloc_entry->addend; /* r_symndx */
+      unsigned_value += part1_consth_value;
+      unsigned_value = unsigned_value >> 16;
+      insn = INSERT_HWORD (insn, unsigned_value);
+      part1_consth_active = FALSE;
+      bfd_put_32 (abfd, insn, hit_data);
+      break;
+
+    case R_BYTE:
+      insn = bfd_get_8 (abfd, hit_data);
+      unsigned_value = insn + sym_value + reloc_entry->addend;
+      if (unsigned_value & 0xffffff00)
+        return bfd_reloc_overflow;
+      bfd_put_8 (abfd, unsigned_value, hit_data);
+      break;
+
+    case R_HWORD:
+      insn = bfd_get_16 (abfd, hit_data);
+      unsigned_value = insn + sym_value + reloc_entry->addend;
+      if (unsigned_value & 0xffff0000)
+        return bfd_reloc_overflow;
+      bfd_put_16 (abfd, insn, hit_data);
+      break;
+
+    case R_WORD:
+      insn = bfd_get_32 (abfd, hit_data);
+      insn += sym_value + reloc_entry->addend;
+      bfd_put_32 (abfd, insn, hit_data);
+      break;
+
+    default:
+      *error_message = _("Unrecognized reloc");
+      return bfd_reloc_dangerous;
+    }
+
+  return bfd_reloc_ok;
+}
+
+/*      type     rightshift
+           size
+        bitsize
+             pc-relative
+             bitpos
+           absolute
+               complain_on_overflow
+              special_function
+                relocation name
+                     partial_inplace
+                      src_mask
+*/
+
+/* FIXME: I'm not real sure about this table.  */
+static reloc_howto_type howto_table[] =
+{
+  { R_ABS,      0, 3, 32, FALSE,  0, complain_overflow_bitfield,  or32_reloc, "ABS",     TRUE, 0xffffffff,0xffffffff, FALSE },
+    EMPTY_HOWTO (1),
+    EMPTY_HOWTO (2),
+    EMPTY_HOWTO (3),
+    EMPTY_HOWTO (4),
+    EMPTY_HOWTO (5),
+    EMPTY_HOWTO (6),
+    EMPTY_HOWTO (7),
+    EMPTY_HOWTO (8),
+    EMPTY_HOWTO (9),
+    EMPTY_HOWTO (10),
+    EMPTY_HOWTO (11),
+    EMPTY_HOWTO (12),
+    EMPTY_HOWTO (13),
+    EMPTY_HOWTO (14),
+    EMPTY_HOWTO (15),
+    EMPTY_HOWTO (16),
+    EMPTY_HOWTO (17),
+    EMPTY_HOWTO (18),
+    EMPTY_HOWTO (19),
+    EMPTY_HOWTO (20),
+    EMPTY_HOWTO (21),
+    EMPTY_HOWTO (22),
+    EMPTY_HOWTO (23),
+  { R_IREL,     0, 3, 32, TRUE,   0, complain_overflow_signed,    or32_reloc, "IREL",    TRUE, 0xffffffff,0xffffffff, FALSE },
+  { R_IABS,     0, 3, 32, FALSE,  0, complain_overflow_bitfield,  or32_reloc, "IABS",    TRUE, 0xffffffff,0xffffffff, FALSE },
+  { R_ILOHALF,  0, 3, 16, TRUE,   0, complain_overflow_signed,    or32_reloc, "ILOHALF", TRUE, 0x0000ffff,0x0000ffff, FALSE },
+  { R_IHIHALF,  0, 3, 16, TRUE,   16,complain_overflow_signed,    or32_reloc, "IHIHALF", TRUE, 0xffff0000,0xffff0000, FALSE },
+  { R_IHCONST,  0, 3, 16, TRUE,   0, complain_overflow_signed,    or32_reloc, "IHCONST", TRUE, 0xffff0000,0xffff0000, FALSE },
+  { R_BYTE,     0, 0, 8,  FALSE,  0, complain_overflow_bitfield,  or32_reloc, "BYTE",    TRUE, 0x000000ff,0x000000ff, FALSE },
+  { R_HWORD,    0, 1, 16, FALSE,  0, complain_overflow_bitfield,  or32_reloc, "HWORD",   TRUE, 0x0000ffff,0x0000ffff, FALSE },
+  { R_WORD,     0, 2, 32, FALSE,  0, complain_overflow_bitfield,  or32_reloc, "WORD",    TRUE, 0xffffffff,0xffffffff, FALSE },
+};
+
+#define BADMAG(x) OR32BADMAG (x)
+
+#define RELOC_PROCESSING(relent, reloc, symbols, abfd, section) \
+  reloc_processing (relent, reloc, symbols, abfd, section)
+
+static void
+reloc_processing (relent,reloc, symbols, abfd, section)
+     arelent *relent;
+     struct internal_reloc *reloc;
+     asymbol **symbols;
+     bfd *abfd;
+     asection *section;
+{
+  static bfd_vma ihihalf_vaddr = (bfd_vma) -1;
+
+  relent->address = reloc->r_vaddr;
+  relent->howto = howto_table + reloc->r_type;
+
+  if (reloc->r_type == R_IHCONST)
+    {
+      /* The address of an R_IHCONST should always be the address of
+	 the immediately preceding R_IHIHALF.  relocs generated by gas
+	 are correct, but relocs generated by High C are different (I
+	 can't figure out what the address means for High C).  We can
+	 handle both gas and High C by ignoring the address here, and
+	 simply reusing the address saved for R_IHIHALF.  */
+      if (ihihalf_vaddr == (bfd_vma) -1)
+	abort ();
+
+      relent->address = ihihalf_vaddr;
+      ihihalf_vaddr = (bfd_vma) -1;
+      relent->addend = reloc->r_symndx;
+      relent->sym_ptr_ptr= bfd_abs_section_ptr->symbol_ptr_ptr;
+    }
+  else
+    {
+      relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
+      relent->addend = 0;
+      relent->address-= section->vma;
+
+      if (reloc->r_type == R_IHIHALF)
+	ihihalf_vaddr = relent->address;
+      else if (ihihalf_vaddr != (bfd_vma) -1)
+	abort ();
+    }
+}
+
+/* The reloc processing routine for the optimized COFF linker.  */
+
+static bfd_boolean
+coff_or32_relocate_section (output_bfd, info, input_bfd, input_section,
+                            contents, relocs, syms, sections)
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     struct internal_reloc *relocs;
+     struct internal_syment *syms;
+     asection **sections;
+{
+  struct internal_reloc *rel;
+  struct internal_reloc *relend;
+  bfd_boolean hihalf;
+  bfd_vma hihalf_val;
+
+  /* If we are performing a relocatable link, we don't need to do a
+     thing.  The caller will take care of adjusting the reloc
+     addresses and symbol indices.  */
+  if (info->relocatable)
+    return TRUE;
+
+  hihalf = FALSE;
+  hihalf_val = 0;
+
+  rel = relocs;
+  relend = rel + input_section->reloc_count;
+
+  for (; rel < relend; rel++)
+    {
+      long symndx;
+      bfd_byte *loc;
+      struct coff_link_hash_entry *h;
+      struct internal_syment *sym;
+      asection *sec;
+      bfd_vma val;
+      bfd_boolean overflow;
+      unsigned long insn;
+      long signed_value;
+      unsigned long unsigned_value;
+      bfd_reloc_status_type rstat;
+
+      symndx = rel->r_symndx;
+      loc = contents + rel->r_vaddr - input_section->vma;
+
+      if (symndx == -1 || rel->r_type == R_IHCONST)
+        h = NULL;
+      else
+        h = obj_coff_sym_hashes (input_bfd)[symndx];
+
+      sym = NULL;
+      sec = NULL;
+      val = 0;
+
+      /* An R_IHCONST reloc does not have a symbol.  Instead, the
+         symbol index is an addend.  R_IHCONST is always used in
+         conjunction with R_IHHALF.  */
+      if (rel->r_type != R_IHCONST)
+        {
+          if (h == NULL)
+            {
+              if (symndx == -1)
+                sec = bfd_abs_section_ptr;
+              else
+                {
+                  sym = syms + symndx;
+                  sec = sections[symndx];
+                  val = (sec->output_section->vma
+                         + sec->output_offset
+                         + sym->n_value
+                         - sec->vma);
+                }
+            }
+          else
+            {
+              if (h->root.type == bfd_link_hash_defined
+                  || h->root.type == bfd_link_hash_defweak)
+                {
+                  sec = h->root.u.def.section;
+                  val = (h->root.u.def.value
+                         + sec->output_section->vma
+                         + sec->output_offset);
+                }
+              else
+                {
+                  if (! ((*info->callbacks->undefined_symbol)
+                         (info, h->root.root.string, input_bfd, input_section,
+                          rel->r_vaddr - input_section->vma, TRUE)))
+                    return FALSE;
+                }
+            }
+
+          if (hihalf)
+            {
+              if (! ((*info->callbacks->reloc_dangerous)
+                     (info, "missing IHCONST reloc", input_bfd,
+                      input_section, rel->r_vaddr - input_section->vma)))
+                return FALSE;
+              hihalf = FALSE;
+            }
+        }
+
+      overflow = FALSE;
+
+      switch (rel->r_type)
+        {
+        default:
+          bfd_set_error (bfd_error_bad_value);
+          return FALSE;
+
+        case R_IREL:
+          insn = bfd_get_32 (input_bfd, loc);
+
+          /* Extract the addend.  */
+          signed_value = EXTRACT_JUMPTARG (insn);
+          signed_value = SIGN_EXTEND_JUMPTARG (signed_value);
+          signed_value <<= 2;
+
+          /* Determine the destination of the jump.  */
+          signed_value += val;
+
+	  /* Make the destination PC relative.  */
+	  signed_value -= (input_section->output_section->vma
+			   + input_section->output_offset
+			   + (rel->r_vaddr - input_section->vma));
+	  if (signed_value > 0x7ffffff || signed_value < - 0x8000000)
+	    {
+	      overflow = TRUE;
+	      signed_value = 0;
+	    }
+
+          /* Put the adjusted value back into the instruction.  */
+          signed_value >>= 2;
+          insn = INSERT_JUMPTARG(insn, signed_value);
+
+          bfd_put_32 (input_bfd, (bfd_vma) insn, loc);
+          break;
+
+        case R_ILOHALF:
+          insn = bfd_get_32 (input_bfd, loc);
+          unsigned_value = EXTRACT_HWORD (insn);
+          unsigned_value += val;
+          insn = INSERT_HWORD (insn, unsigned_value);
+          bfd_put_32 (input_bfd, insn, loc);
+          break;
+
+        case R_IHIHALF:
+          /* Save the value for the R_IHCONST reloc.  */
+          hihalf = TRUE;
+          hihalf_val = val;
+          break;
+
+        case R_IHCONST:
+          if (! hihalf)
+            {
+              if (! ((*info->callbacks->reloc_dangerous)
+                     (info, "missing IHIHALF reloc", input_bfd,
+                      input_section, rel->r_vaddr - input_section->vma)))
+                return FALSE;
+              hihalf_val = 0;
+            }
+
+          insn = bfd_get_32 (input_bfd, loc);
+          unsigned_value = rel->r_symndx + hihalf_val;
+          unsigned_value >>= 16;
+          insn = INSERT_HWORD (insn, unsigned_value);
+          bfd_put_32 (input_bfd, (bfd_vma) insn, loc);
+
+          hihalf = FALSE;
+          break;
+
+        case R_BYTE:
+        case R_HWORD:
+        case R_WORD:
+          rstat = _bfd_relocate_contents (howto_table + rel->r_type,
+                                          input_bfd, val, loc);
+          if (rstat == bfd_reloc_overflow)
+            overflow = TRUE;
+          else if (rstat != bfd_reloc_ok)
+            abort ();
+          break;
+        }
+
+      if (overflow)
+        {
+          const char *name;
+          char buf[SYMNMLEN + 1];
+
+          if (symndx == -1)
+            name = "*ABS*";
+          else if (h != NULL)
+            name = NULL;
+          else if (sym == NULL)
+            name = "*unknown*";
+          else if (sym->_n._n_n._n_zeroes == 0
+                   && sym->_n._n_n._n_offset != 0)
+            name = obj_coff_strings (input_bfd) + sym->_n._n_n._n_offset;
+          else
+            {
+              strncpy (buf, sym->_n._n_name, SYMNMLEN);
+              buf[SYMNMLEN] = '\0';
+              name = buf;
+            }
+
+          if (! ((*info->callbacks->reloc_overflow)
+                 (info, (h ? &h->root : NULL), name,
+		  howto_table[rel->r_type].name, (bfd_vma) 0, input_bfd,
+		  input_section, rel->r_vaddr - input_section->vma)))
+            return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+#define coff_relocate_section coff_or32_relocate_section
+
+/* We don't want to change the symndx of a R_IHCONST reloc, since it
+   is actually an addend, not a symbol index at all.  */
+
+static bfd_boolean
+coff_or32_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp)
+     bfd *obfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+     bfd *ibfd ATTRIBUTE_UNUSED;
+     asection *sec ATTRIBUTE_UNUSED;
+     struct internal_reloc *irel;
+     bfd_boolean *adjustedp;
+{
+  if (irel->r_type == R_IHCONST)
+    *adjustedp = TRUE;
+  else
+    *adjustedp = FALSE;
+  return TRUE;
+}
+
+#define coff_adjust_symndx coff_or32_adjust_symndx
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coffcode.h"
+
+const bfd_target or32coff_big_vec =
+{
+  "coff-or32-big",  /* Name.  */
+  bfd_target_coff_flavour,
+  BFD_ENDIAN_BIG,   /* Data byte order is big.  */
+  BFD_ENDIAN_BIG,   /* Header byte order is big.  */
+
+  (HAS_RELOC  | EXEC_P |    /* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS   | HAS_LOCALS | WP_TEXT),
+
+  (SEC_HAS_CONTENTS | SEC_ALLOC | /* Section flags.  */
+   SEC_LOAD | SEC_RELOC |
+   SEC_READONLY ),
+  '_',        /* Leading underscore.  */
+  '/',        /* ar_pad_char.  */
+  15,         /* ar_max_namelen.  */
+  0,          /* match priority.  */
+
+  /* Data.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,
+
+  /* Headers.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,
+
+  {
+    _bfd_dummy_target,
+    coff_object_p,
+    bfd_generic_archive_p,
+    _bfd_dummy_target
+  },
+  {
+    bfd_false,
+    coff_mkobject,
+    _bfd_generic_mkarchive,
+    bfd_false
+  },
+  {
+    bfd_false,
+    coff_write_object_contents,
+    _bfd_write_archive_contents,
+    bfd_false
+  },
+
+  BFD_JUMP_TABLE_GENERIC (coff),
+  BFD_JUMP_TABLE_COPY (coff),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+  BFD_JUMP_TABLE_SYMBOLS (coff),
+  BFD_JUMP_TABLE_RELOCS (coff),
+  BFD_JUMP_TABLE_WRITE (coff),
+  BFD_JUMP_TABLE_LINK (coff),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+ /* Alternative_target.  */
+#ifdef TARGET_LITTLE_SYM
+  & TARGET_LITTLE_SYM,
+#else
+  NULL,
+#endif
+
+  COFF_SWAP_TABLE
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-ppc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-ppc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-ppc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-ppc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2681 @@
+/* BFD back-end for PowerPC Microsoft Portable Executable files.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   Original version pieced together by Kim Knuttila (krk@cygnus.com)
+
+   There is nothing new under the sun. This file draws a lot on other
+   coff files, in particular, those for the rs/6000, alpha, mips, and
+   intel backends, and the PE work for the arm.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* Current State:
+   - objdump works
+   - relocs generated by gas
+   - ld will link files, but they do not run.
+   - dlltool will not produce correct output in some .reloc cases, and will
+     not produce the right glue code for dll function calls.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#include "coff/powerpc.h"
+#include "coff/internal.h"
+
+#include "coff/pe.h"
+
+#ifdef BADMAG
+#undef BADMAG
+#endif
+
+#define BADMAG(x) PPCBADMAG(x)
+
+#include "libcoff.h"
+
+/* This file is compiled more than once, but we only compile the
+   final_link routine once.  */
+extern bfd_boolean ppc_bfd_coff_final_link
+  PARAMS ((bfd *, struct bfd_link_info *));
+extern void dump_toc PARAMS ((PTR));
+
+/* The toc is a set of bfd_vma fields. We use the fact that valid
+   addresses are even (i.e. the bit representing "1" is off) to allow
+   us to encode a little extra information in the field
+   - Unallocated addresses are initialized to 1.
+   - Allocated addresses are even numbers.
+   The first time we actually write a reference to the toc in the bfd,
+   we want to record that fact in a fixup file (if it is asked for), so
+   we keep track of whether or not an address has been written by marking
+   the low order bit with a "1" upon writing.  */
+
+#define SET_UNALLOCATED(x)  ((x) = 1)
+#define IS_UNALLOCATED(x)   ((x) == 1)
+
+#define IS_WRITTEN(x)       ((x) & 1)
+#define MARK_AS_WRITTEN(x)  ((x) |= 1)
+#define MAKE_ADDR_AGAIN(x)  ((x) &= ~1)
+
+/* Turn on this check if you suspect something amiss in the hash tables.  */
+#ifdef DEBUG_HASH
+
+/* Need a 7 char string for an eye catcher.  */
+#define EYE "krkjunk"
+
+#define HASH_CHECK_DCL char eye_catcher[8];
+#define HASH_CHECK_INIT(ret)      strcpy(ret->eye_catcher, EYE)
+#define HASH_CHECK(addr) \
+ if (strcmp(addr->eye_catcher, EYE) != 0) \
+  { \
+    fprintf (stderr,\
+    _("File %s, line %d, Hash check failure, bad eye %8s\n"), \
+    __FILE__, __LINE__, addr->eye_catcher); \
+    abort (); \
+ }
+
+#else
+
+#define HASH_CHECK_DCL
+#define HASH_CHECK_INIT(ret)
+#define HASH_CHECK(addr)
+
+#endif
+
+/* In order not to add an int to every hash table item for every coff
+   linker, we define our own hash table, derived from the coff one.  */
+
+/* PE linker hash table entries.  */
+
+struct ppc_coff_link_hash_entry
+{
+  struct coff_link_hash_entry root; /* First entry, as required.  */
+
+  /* As we wonder around the relocs, we'll keep the assigned toc_offset
+     here.  */
+  bfd_vma toc_offset;               /* Our addition, as required.  */
+  int symbol_is_glue;
+  unsigned long int glue_insn;
+
+  HASH_CHECK_DCL
+};
+
+/* PE linker hash table.  */
+
+struct ppc_coff_link_hash_table
+{
+  struct coff_link_hash_table root; /* First entry, as required.  */
+};
+
+static struct bfd_hash_entry *ppc_coff_link_hash_newfunc
+  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *,
+	   const char *));
+static struct bfd_link_hash_table *ppc_coff_link_hash_table_create
+  PARAMS ((bfd *));
+static bfd_boolean coff_ppc_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+	   struct internal_reloc *, struct internal_syment *, asection **));
+static reloc_howto_type *coff_ppc_rtype_to_howto
+  PARAMS ((bfd *, asection *, struct internal_reloc *,
+	   struct coff_link_hash_entry *, struct internal_syment *,
+	   bfd_vma *));
+
+/* Routine to create an entry in the link hash table.  */
+
+static struct bfd_hash_entry *
+ppc_coff_link_hash_newfunc (entry, table, string)
+     struct bfd_hash_entry *entry;
+     struct bfd_hash_table *table;
+     const char *string;
+{
+  struct ppc_coff_link_hash_entry *ret =
+    (struct ppc_coff_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == (struct ppc_coff_link_hash_entry *) NULL)
+    ret = (struct ppc_coff_link_hash_entry *)
+      bfd_hash_allocate (table,
+			 sizeof (struct ppc_coff_link_hash_entry));
+
+  if (ret == (struct ppc_coff_link_hash_entry *) NULL)
+    return NULL;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct ppc_coff_link_hash_entry *)
+	 _bfd_coff_link_hash_newfunc ((struct bfd_hash_entry *) ret,
+				      table, string));
+
+  if (ret)
+    {
+      /* Initialize the local fields.  */
+      SET_UNALLOCATED (ret->toc_offset);
+      ret->symbol_is_glue = 0;
+      ret->glue_insn = 0;
+
+      HASH_CHECK_INIT (ret);
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Initialize a PE linker hash table.  */
+
+static bfd_boolean
+ppc_coff_link_hash_table_init (struct ppc_coff_link_hash_table *table,
+			       bfd *abfd,
+			       struct bfd_hash_entry *(*newfunc) (struct bfd_hash_entry *,
+								  struct bfd_hash_table *,
+								  const char *),
+			       unsigned int entsize)
+{
+  return _bfd_coff_link_hash_table_init (&table->root, abfd, newfunc, entsize);
+}
+
+/* Create a PE linker hash table.  */
+
+static struct bfd_link_hash_table *
+ppc_coff_link_hash_table_create (abfd)
+     bfd *abfd;
+{
+  struct ppc_coff_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct ppc_coff_link_hash_table);
+
+  ret = (struct ppc_coff_link_hash_table *) bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+  if (!ppc_coff_link_hash_table_init (ret, abfd,
+				      ppc_coff_link_hash_newfunc,
+				      sizeof (struct ppc_coff_link_hash_entry)))
+    {
+      free (ret);
+      return (struct bfd_link_hash_table *) NULL;
+    }
+  return &ret->root.root;
+}
+
+/* Now, tailor coffcode.h to use our hash stuff.  */
+
+#define coff_bfd_link_hash_table_create ppc_coff_link_hash_table_create
+
+/* The nt loader points the toc register to &toc + 32768, in order to
+   use the complete range of a 16-bit displacement. We have to adjust
+   for this when we fix up loads displaced off the toc reg.  */
+#define TOC_LOAD_ADJUSTMENT (-32768)
+#define TOC_SECTION_NAME ".private.toc"
+
+/* The main body of code is in coffcode.h.  */
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
+
+/* In case we're on a 32-bit machine, construct a 64-bit "-1" value
+   from smaller values.  Start with zero, widen, *then* decrement.  */
+#define MINUS_ONE	(((bfd_vma)0) - 1)
+
+/* These should definitely go in a header file somewhere...  */
+
+/* NOP */
+#define IMAGE_REL_PPC_ABSOLUTE          0x0000
+
+/* 64-bit address */
+#define IMAGE_REL_PPC_ADDR64            0x0001
+
+/* 32-bit address */
+#define IMAGE_REL_PPC_ADDR32            0x0002
+
+/* 26-bit address, shifted left 2 (branch absolute) */
+#define IMAGE_REL_PPC_ADDR24            0x0003
+
+/* 16-bit address */
+#define IMAGE_REL_PPC_ADDR16            0x0004
+
+/* 16-bit address, shifted left 2 (load doubleword) */
+#define IMAGE_REL_PPC_ADDR14            0x0005
+
+/* 26-bit PC-relative offset, shifted left 2 (branch relative) */
+#define IMAGE_REL_PPC_REL24             0x0006
+
+/* 16-bit PC-relative offset, shifted left 2 (br cond relative) */
+#define IMAGE_REL_PPC_REL14             0x0007
+
+/* 16-bit offset from TOC base */
+#define IMAGE_REL_PPC_TOCREL16          0x0008
+
+/* 16-bit offset from TOC base, shifted left 2 (load doubleword) */
+#define IMAGE_REL_PPC_TOCREL14          0x0009
+
+/* 32-bit addr w/o image base */
+#define IMAGE_REL_PPC_ADDR32NB          0x000A
+
+/* va of containing section (as in an image sectionhdr) */
+#define IMAGE_REL_PPC_SECREL            0x000B
+
+/* sectionheader number */
+#define IMAGE_REL_PPC_SECTION           0x000C
+
+/* substitute TOC restore instruction iff symbol is glue code */
+#define IMAGE_REL_PPC_IFGLUE            0x000D
+
+/* symbol is glue code; virtual address is TOC restore instruction */
+#define IMAGE_REL_PPC_IMGLUE            0x000E
+
+/* va of containing section (limited to 16 bits) */
+#define IMAGE_REL_PPC_SECREL16          0x000F
+
+/* Stuff to handle immediate data when the number of bits in the
+   data is greater than the number of bits in the immediate field
+   We need to do (usually) 32 bit arithmetic on 16 bit chunks.  */
+#define IMAGE_REL_PPC_REFHI             0x0010
+#define IMAGE_REL_PPC_REFLO             0x0011
+#define IMAGE_REL_PPC_PAIR              0x0012
+
+/* This is essentially the same as tocrel16, with TOCDEFN assumed.  */
+#define IMAGE_REL_PPC_TOCREL16_DEFN     0x0013
+
+/* Flag bits in IMAGE_RELOCATION.TYPE.  */
+
+/* Subtract reloc value rather than adding it.  */
+#define IMAGE_REL_PPC_NEG               0x0100
+
+/* Fix branch prediction bit to predict branch taken.  */
+#define IMAGE_REL_PPC_BRTAKEN           0x0200
+
+/* Fix branch prediction bit to predict branch not taken.  */
+#define IMAGE_REL_PPC_BRNTAKEN          0x0400
+
+/* TOC slot defined in file (or, data in toc).  */
+#define IMAGE_REL_PPC_TOCDEFN           0x0800
+
+/* Masks to isolate above values in IMAGE_RELOCATION.Type.  */
+#define IMAGE_REL_PPC_TYPEMASK          0x00FF
+#define IMAGE_REL_PPC_FLAGMASK          0x0F00
+
+#define EXTRACT_TYPE(x)                 ((x) & IMAGE_REL_PPC_TYPEMASK)
+#define EXTRACT_FLAGS(x) ((x) & IMAGE_REL_PPC_FLAGMASK)
+#define EXTRACT_JUNK(x)  \
+           ((x) & ~(IMAGE_REL_PPC_TYPEMASK | IMAGE_REL_PPC_FLAGMASK))
+
+/* Static helper functions to make relocation work.  */
+/* (Work In Progress) */
+
+static bfd_reloc_status_type ppc_refhi_reloc PARAMS ((bfd *abfd,
+						      arelent *reloc,
+						      asymbol *symbol,
+						      PTR data,
+						      asection *section,
+						      bfd *output_bfd,
+						      char **error));
+static bfd_reloc_status_type ppc_pair_reloc PARAMS ((bfd *abfd,
+						     arelent *reloc,
+						     asymbol *symbol,
+						     PTR data,
+						     asection *section,
+						     bfd *output_bfd,
+						     char **error));
+
+static bfd_reloc_status_type ppc_toc16_reloc PARAMS ((bfd *abfd,
+						      arelent *reloc,
+						      asymbol *symbol,
+						      PTR data,
+						      asection *section,
+						      bfd *output_bfd,
+						      char **error));
+
+static bfd_reloc_status_type ppc_section_reloc PARAMS ((bfd *abfd,
+							arelent *reloc,
+							asymbol *symbol,
+							PTR data,
+							asection *section,
+							bfd *output_bfd,
+							char **error));
+
+static bfd_reloc_status_type ppc_secrel_reloc PARAMS ((bfd *abfd,
+						       arelent *reloc,
+						       asymbol *symbol,
+						       PTR data,
+						       asection *section,
+						       bfd *output_bfd,
+						       char **error));
+
+static bfd_reloc_status_type ppc_imglue_reloc PARAMS ((bfd *abfd,
+						       arelent *reloc,
+						       asymbol *symbol,
+						       PTR data,
+						       asection *section,
+						       bfd *output_bfd,
+						       char **error));
+
+static bfd_boolean in_reloc_p PARAMS((bfd *abfd, reloc_howto_type *howto));
+
+/* FIXME: It'll take a while to get through all of these. I only need a few to
+   get us started, so those I'll make sure work. Those marked FIXME are either
+   completely unverified or have a specific unknown marked in the comment.  */
+
+/* Relocation entries for Windows/NT on PowerPC.                             
+
+   From the document "" we find the following listed as used relocs:
+
+     ABSOLUTE       : The noop
+     ADDR[64|32|16] : fields that hold addresses in data fields or the
+                      16 bit displacement field on a load/store.
+     ADDR[24|14]    : fields that hold addresses in branch and cond
+                      branches. These represent [26|16] bit addresses.
+                      The low order 2 bits are preserved.
+     REL[24|14]     : branches relative to the Instruction Address
+                      register. These represent [26|16] bit addresses,
+                      as before. The instruction field will be zero, and
+                      the address of the SYM will be inserted at link time.
+     TOCREL16       : 16 bit displacement field referring to a slot in
+                      toc.
+     TOCREL14       : 16 bit displacement field, similar to REL14 or ADDR14.
+     ADDR32NB       : 32 bit address relative to the virtual origin.
+                      (On the alpha, this is always a linker generated thunk)
+                      (i.e. 32bit addr relative to the image base)
+     SECREL         : The value is relative to the start of the section
+                      containing the symbol.
+     SECTION        : access to the header containing the item. Supports the
+                      codeview debugger.
+
+   In particular, note that the document does not indicate that the
+   relocations listed in the header file are used.  */
+
+
+static reloc_howto_type ppc_coff_howto_table[] =
+{
+  /* IMAGE_REL_PPC_ABSOLUTE 0x0000   NOP */
+  /* Unused: */
+  HOWTO (IMAGE_REL_PPC_ABSOLUTE, /* type */
+	 0,	                 /* rightshift */
+	 0,	                 /* size (0 = byte, 1 = short, 2 = long) */
+	 0,	                 /* bitsize */
+	 FALSE,	                 /* pc_relative */
+	 0,	                 /* bitpos */
+	 complain_overflow_dont, /* dont complain_on_overflow */
+	 0,		         /* special_function */
+	 "ABSOLUTE",             /* name */
+	 FALSE,	                 /* partial_inplace */
+	 0x00,	 	         /* src_mask */
+	 0x00,        		 /* dst_mask */
+	 FALSE),                 /* pcrel_offset */
+
+  /* IMAGE_REL_PPC_ADDR64 0x0001  64-bit address */
+  /* Unused: */
+  HOWTO(IMAGE_REL_PPC_ADDR64,    /* type */
+	0,	                 /* rightshift */
+	3,	                 /* size (0 = byte, 1 = short, 2 = long) */
+	64,	                 /* bitsize */
+	FALSE,	                 /* pc_relative */
+	0,	                 /* bitpos */
+	complain_overflow_bitfield, 	 /* complain_on_overflow */
+	0,		         /* special_function */
+	"ADDR64",               /* name */
+	TRUE,	                 /* partial_inplace */
+	MINUS_ONE,	 	 /* src_mask */
+	MINUS_ONE,        	 /* dst_mask */
+	FALSE),                 /* pcrel_offset */
+
+  /* IMAGE_REL_PPC_ADDR32 0x0002  32-bit address */
+  /* Used: */
+  HOWTO (IMAGE_REL_PPC_ADDR32,	/* type */
+	 0,	                /* rightshift */
+	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 32,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,		        /* special_function */
+	 "ADDR32",              /* name */
+	 TRUE,	                /* partial_inplace */
+	 0xffffffff,            /* src_mask */
+	 0xffffffff,            /* dst_mask */
+	 FALSE),                /* pcrel_offset */
+
+  /* IMAGE_REL_PPC_ADDR24 0x0003  26-bit address, shifted left 2 (branch absolute) */
+  /* the LI field is in bit 6 through bit 29 is 24 bits, + 2 for the shift */
+  /* Of course, That's the IBM approved bit numbering, which is not what */
+  /* anyone else uses.... The li field is in bit 2 thru 25 */
+  /* Used: */
+  HOWTO (IMAGE_REL_PPC_ADDR24,  /* type */
+	 0,	                /* rightshift */
+	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 26,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,		        /* special_function */
+	 "ADDR24",              /* name */
+	 TRUE,	                /* partial_inplace */
+	 0x07fffffc,	        /* src_mask */
+	 0x07fffffc,        	/* dst_mask */
+	 FALSE),                /* pcrel_offset */
+
+  /* IMAGE_REL_PPC_ADDR16 0x0004  16-bit address */
+  /* Used: */
+  HOWTO (IMAGE_REL_PPC_ADDR16,  /* type */
+	 0,	                /* rightshift */
+	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 16,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,		        /* special_function */
+	 "ADDR16",              /* name */
+	 TRUE,	                /* partial_inplace */
+	 0xffff,	        /* src_mask */
+	 0xffff,        	/* dst_mask */
+	 FALSE),                /* pcrel_offset */
+
+  /* IMAGE_REL_PPC_ADDR14 0x0005 */
+  /*  16-bit address, shifted left 2 (load doubleword) */
+  /* FIXME: the mask is likely wrong, and the bit position may be as well */
+  /* Unused: */
+  HOWTO (IMAGE_REL_PPC_ADDR14,  /* type */
+	 1,	                /* rightshift */
+	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 16,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,		        /* special_function */
+	 "ADDR16",              /* name */
+	 TRUE,	                /* partial_inplace */
+	 0xffff,	        /* src_mask */
+	 0xffff,        	/* dst_mask */
+	 FALSE),                /* pcrel_offset */
+
+  /* IMAGE_REL_PPC_REL24 0x0006 */
+  /*   26-bit PC-relative offset, shifted left 2 (branch relative) */
+  /* Used: */
+  HOWTO (IMAGE_REL_PPC_REL24,   /* type */
+	 0,	                /* rightshift */
+	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 26,	                /* bitsize */
+	 TRUE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,		        /* special_function */
+	 "REL24",               /* name */
+	 TRUE,	                /* partial_inplace */
+	 0x3fffffc,	        /* src_mask */
+	 0x3fffffc,        	/* dst_mask */
+	 FALSE),                /* pcrel_offset */
+
+  /* IMAGE_REL_PPC_REL14 0x0007 */
+  /*   16-bit PC-relative offset, shifted left 2 (br cond relative) */
+  /* FIXME: the mask is likely wrong, and the bit position may be as well */
+  /* FIXME: how does it know how far to shift? */
+  /* Unused: */
+  HOWTO (IMAGE_REL_PPC_ADDR14,  /* type */
+	 1,	                /* rightshift */
+	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 16,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,		        /* special_function */
+	 "ADDR16",              /* name */
+	 TRUE,	                /* partial_inplace */
+	 0xffff,	        /* src_mask */
+	 0xffff,        	/* dst_mask */
+	 TRUE),                 /* pcrel_offset */
+
+  /* IMAGE_REL_PPC_TOCREL16 0x0008 */
+  /*   16-bit offset from TOC base */
+  /* Used: */
+  HOWTO (IMAGE_REL_PPC_TOCREL16,/* type */
+	 0,	                /* rightshift */
+	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 16,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_toc16_reloc,       /* special_function */
+	 "TOCREL16",            /* name */
+	 FALSE,	                /* partial_inplace */
+	 0xffff,	        /* src_mask */
+	 0xffff,        	/* dst_mask */
+	 FALSE),                /* pcrel_offset */
+
+  /* IMAGE_REL_PPC_TOCREL14 0x0009 */
+  /*   16-bit offset from TOC base, shifted left 2 (load doubleword) */
+  /* Unused: */
+  HOWTO (IMAGE_REL_PPC_TOCREL14,/* type */
+	 1,	                /* rightshift */
+	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 16,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,		        /* special_function */
+	 "TOCREL14",            /* name */
+	 FALSE,	                /* partial_inplace */
+	 0xffff,	        /* src_mask */
+	 0xffff,        	/* dst_mask */
+	 FALSE),                /* pcrel_offset */
+
+  /* IMAGE_REL_PPC_ADDR32NB 0x000A */
+  /*   32-bit addr w/ image base */
+  /* Unused: */
+  HOWTO (IMAGE_REL_PPC_ADDR32NB,/* type */
+	 0,	                /* rightshift */
+	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 32,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,                     /* special_function */
+	 "ADDR32NB",            /* name */
+	 TRUE,	                /* partial_inplace */
+	 0xffffffff,	        /* src_mask */
+	 0xffffffff,        	/* dst_mask */
+	 FALSE),                 /* pcrel_offset */
+
+  /* IMAGE_REL_PPC_SECREL 0x000B */
+  /*   va of containing section (as in an image sectionhdr) */
+  /* Unused: */
+  HOWTO (IMAGE_REL_PPC_SECREL,/* type */
+	 0,	                /* rightshift */
+	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 32,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc_secrel_reloc,      /* special_function */
+	 "SECREL",              /* name */
+	 TRUE,	                /* partial_inplace */
+	 0xffffffff,	        /* src_mask */
+	 0xffffffff,        	/* dst_mask */
+	 TRUE),                 /* pcrel_offset */
+
+  /* IMAGE_REL_PPC_SECTION 0x000C */
+  /*   sectionheader number */
+  /* Unused: */
+  HOWTO (IMAGE_REL_PPC_SECTION,/* type */
+	 0,	                /* rightshift */
+	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 32,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc_section_reloc,     /* special_function */
+	 "SECTION",             /* name */
+	 TRUE,	                /* partial_inplace */
+	 0xffffffff,	        /* src_mask */
+	 0xffffffff,        	/* dst_mask */
+	 TRUE),                 /* pcrel_offset */
+
+  /* IMAGE_REL_PPC_IFGLUE 0x000D */
+  /*   substitute TOC restore instruction iff symbol is glue code */
+  /* Used: */
+  HOWTO (IMAGE_REL_PPC_IFGLUE,/* type */
+	 0,	                /* rightshift */
+	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 32,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,		        /* special_function */
+	 "IFGLUE",              /* name */
+	 TRUE,	                /* partial_inplace */
+	 0xffffffff,	        /* src_mask */
+	 0xffffffff,        	/* dst_mask */
+	 FALSE),                /* pcrel_offset */
+
+  /* IMAGE_REL_PPC_IMGLUE 0x000E */
+  /*   symbol is glue code; virtual address is TOC restore instruction */
+  /* Unused: */
+  HOWTO (IMAGE_REL_PPC_IMGLUE,/* type */
+	 0,	                /* rightshift */
+	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 32,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_imglue_reloc,      /* special_function */
+	 "IMGLUE",              /* name */
+	 FALSE,	                /* partial_inplace */
+	 0xffffffff,	        /* src_mask */
+	 0xffffffff,        	/* dst_mask */
+	 FALSE),                 /* pcrel_offset */
+
+  /* IMAGE_REL_PPC_SECREL16 0x000F */
+  /*   va of containing section (limited to 16 bits) */
+  /* Unused: */
+  HOWTO (IMAGE_REL_PPC_SECREL16,/* type */
+	 0,	                /* rightshift */
+	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 16,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,		        /* special_function */
+	 "SECREL16",            /* name */
+	 TRUE,	                /* partial_inplace */
+	 0xffff,	        /* src_mask */
+	 0xffff,        	/* dst_mask */
+	 TRUE),                 /* pcrel_offset */
+
+  /* IMAGE_REL_PPC_REFHI             0x0010 */
+  /* Unused: */
+  HOWTO (IMAGE_REL_PPC_REFHI,   /* type */
+	 0,	                /* rightshift */
+	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 16,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc_refhi_reloc,	/* special_function */
+	 "REFHI",               /* name */
+	 TRUE,	                /* partial_inplace */
+	 0xffffffff,	        /* src_mask */
+	 0xffffffff,        	/* dst_mask */
+	 FALSE),                 /* pcrel_offset */
+
+  /* IMAGE_REL_PPC_REFLO             0x0011 */
+  /* Unused: */
+  HOWTO (IMAGE_REL_PPC_REFLO,   /* type */
+	 0,	                /* rightshift */
+	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 16,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc_refhi_reloc,	/* special_function */
+	 "REFLO",               /* name */
+	 TRUE,	                /* partial_inplace */
+	 0xffffffff,	        /* src_mask */
+	 0xffffffff,        	/* dst_mask */
+	 FALSE),                /* pcrel_offset */
+
+  /* IMAGE_REL_PPC_PAIR              0x0012 */
+  /* Unused: */
+  HOWTO (IMAGE_REL_PPC_PAIR,    /* type */
+	 0,	                /* rightshift */
+	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 16,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc_pair_reloc,        /* special_function */
+	 "PAIR",                /* name */
+	 TRUE,	                /* partial_inplace */
+	 0xffffffff,	        /* src_mask */
+	 0xffffffff,        	/* dst_mask */
+	 FALSE),                /* pcrel_offset */
+
+  /* IMAGE_REL_PPC_TOCREL16_DEFN 0x0013 */
+  /*   16-bit offset from TOC base, without causing a definition */
+  /* Used: */
+  HOWTO ( (IMAGE_REL_PPC_TOCREL16 | IMAGE_REL_PPC_TOCDEFN), /* type */
+	 0,	                /* rightshift */
+	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 16,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 0,                     /* special_function */
+	 "TOCREL16, TOCDEFN",   /* name */
+	 FALSE,	                /* partial_inplace */
+	 0xffff,	        /* src_mask */
+	 0xffff,        	/* dst_mask */
+	 FALSE),                /* pcrel_offset */
+
+};
+
+/* Some really cheezy macros that can be turned on to test stderr :-)  */
+
+#ifdef DEBUG_RELOC
+#define UN_IMPL(x)                                           \
+{                                                            \
+   static int i;                                             \
+   if (i == 0)                                               \
+     {                                                       \
+       i = 1;                                                \
+       fprintf (stderr,_("Unimplemented Relocation -- %s\n"),x); \
+     }                                                       \
+}
+
+#define DUMP_RELOC(n,r)                              \
+{                                                    \
+   fprintf (stderr,"%s sym %d, addr %d, addend %d\n", \
+	   n, (*(r->sym_ptr_ptr))->name,             \
+	   r->address, r->addend);                   \
+}
+
+/* Given a reloc name, n, and a pointer to an internal_reloc,
+   dump out interesting information on the contents
+
+#define n_name		_n._n_name
+#define n_zeroes	_n._n_n._n_zeroes
+#define n_offset	_n._n_n._n_offset  */
+
+#define DUMP_RELOC2(n,r)                     		\
+{                                            		\
+   fprintf (stderr,"%s sym %d, r_vaddr %d %s\n", 	\
+	   n, r->r_symndx, r->r_vaddr,			\
+	   (((r->r_type) & IMAGE_REL_PPC_TOCDEFN) == 0) \
+	   ?" ":" TOCDEFN"  );      			\
+}
+
+#else
+#define UN_IMPL(x)
+#define DUMP_RELOC(n,r)
+#define DUMP_RELOC2(n,r)
+#endif
+
+/* TOC construction and management routines.  */
+
+/* This file is compiled twice, and these variables are defined in one
+   of the compilations.  FIXME: This is confusing and weird.  Also,
+   BFD should not use global variables.  */
+extern bfd *    bfd_of_toc_owner;
+extern long int global_toc_size;
+extern long int import_table_size;
+extern long int first_thunk_address;
+extern long int thunk_size;
+
+enum toc_type
+{
+  default_toc,
+  toc_32,
+  toc_64
+};
+
+enum ref_category
+{
+  priv,
+  pub,
+  tocdata
+};
+
+struct list_ele
+{
+  struct list_ele *next;
+  bfd_vma addr;
+  enum ref_category cat;
+  int offset;
+  const char *name;
+};
+
+extern struct list_ele *head;
+extern struct list_ele *tail;
+
+static void record_toc
+  PARAMS ((asection *, bfd_signed_vma, enum ref_category, const char *));
+
+static void
+record_toc (toc_section, our_toc_offset, cat, name)
+     asection *toc_section;
+     bfd_signed_vma our_toc_offset;
+     enum ref_category cat;
+     const char *name;
+{
+  /* Add this entry to our toc addr-offset-name list.  */
+  bfd_size_type amt = sizeof (struct list_ele);
+  struct list_ele *t = (struct list_ele *) bfd_malloc (amt);
+
+  if (t == NULL)
+    abort ();
+  t->next = 0;
+  t->offset = our_toc_offset;
+  t->name = name;
+  t->cat = cat;
+  t->addr = toc_section->output_offset + our_toc_offset;
+
+  if (head == 0)
+    {
+      head = t;
+      tail = t;
+    }
+  else
+    {
+      tail->next = t;
+      tail = t;
+    }
+}
+
+#ifdef COFF_IMAGE_WITH_PE
+
+static bfd_boolean ppc_record_toc_entry
+  PARAMS ((bfd *, struct bfd_link_info *, asection *, int, enum toc_type));
+static void ppc_mark_symbol_as_glue
+  PARAMS ((bfd *, int, struct internal_reloc *));
+
+/* Record a toc offset against a symbol.  */
+static bfd_boolean
+ppc_record_toc_entry(abfd, info, sec, sym, toc_kind)
+     bfd *abfd;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+     asection *sec ATTRIBUTE_UNUSED;
+     int sym;
+     enum toc_type toc_kind ATTRIBUTE_UNUSED;
+{
+  struct ppc_coff_link_hash_entry *h;
+  int *local_syms;
+
+  h = 0;
+
+  h = (struct ppc_coff_link_hash_entry *) (obj_coff_sym_hashes (abfd)[sym]);
+  if (h != 0)
+    {
+      HASH_CHECK(h);
+    }
+
+  if (h == 0)
+    {
+      local_syms = obj_coff_local_toc_table(abfd);
+
+      if (local_syms == 0)
+	{
+	  unsigned int i;
+	  bfd_size_type amt;
+
+	  /* allocate a table */
+	  amt = (bfd_size_type) obj_raw_syment_count (abfd) * sizeof (int);
+	  local_syms = (int *) bfd_zalloc (abfd, amt);
+	  if (local_syms == 0)
+	    return FALSE;
+	  obj_coff_local_toc_table (abfd) = local_syms;
+
+	  for (i = 0; i < obj_raw_syment_count (abfd); ++i)
+	    {
+	      SET_UNALLOCATED (local_syms[i]);
+	    }
+	}
+
+      if (IS_UNALLOCATED(local_syms[sym]))
+	{
+	  local_syms[sym] = global_toc_size;
+	  global_toc_size += 4;
+
+	  /* The size must fit in a 16-bit displacement.  */
+	  if (global_toc_size > 65535)
+	    {
+	      (*_bfd_error_handler) (_("TOC overflow"));
+	      bfd_set_error (bfd_error_file_too_big);
+	      return FALSE;
+	    }
+	}
+    }
+  else
+    {
+      /* Check to see if there's a toc slot allocated. If not, do it
+	 here. It will be used in relocate_section.  */
+      if (IS_UNALLOCATED(h->toc_offset))
+	{
+	  h->toc_offset = global_toc_size;
+	  global_toc_size += 4;
+
+	  /* The size must fit in a 16-bit displacement.  */
+	  if (global_toc_size >= 65535)
+	    {
+	      (*_bfd_error_handler) (_("TOC overflow"));
+	      bfd_set_error (bfd_error_file_too_big);
+	      return FALSE;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Record a toc offset against a symbol.  */
+static void
+ppc_mark_symbol_as_glue(abfd, sym, rel)
+     bfd *abfd;
+     int sym;
+     struct internal_reloc *rel;
+{
+  struct ppc_coff_link_hash_entry *h;
+
+  h = (struct ppc_coff_link_hash_entry *) (obj_coff_sym_hashes (abfd)[sym]);
+
+  HASH_CHECK(h);
+
+  h->symbol_is_glue = 1;
+  h->glue_insn = bfd_get_32 (abfd, (bfd_byte *) &rel->r_vaddr);
+
+  return;
+}
+
+#endif /* COFF_IMAGE_WITH_PE */
+
+/* Return TRUE if this relocation should
+   appear in the output .reloc section.  */
+
+static bfd_boolean in_reloc_p(abfd, howto)
+     bfd * abfd ATTRIBUTE_UNUSED;
+     reloc_howto_type *howto;
+{
+  return
+    (! howto->pc_relative)
+      && (howto->type != IMAGE_REL_PPC_ADDR32NB)
+      && (howto->type != IMAGE_REL_PPC_TOCREL16)
+      && (howto->type != IMAGE_REL_PPC_IMGLUE)
+      && (howto->type != IMAGE_REL_PPC_IFGLUE)
+      && (howto->type != IMAGE_REL_PPC_SECREL)
+      && (howto->type != IMAGE_REL_PPC_SECTION)
+      && (howto->type != IMAGE_REL_PPC_SECREL16)
+      && (howto->type != IMAGE_REL_PPC_REFHI)
+      && (howto->type != IMAGE_REL_PPC_REFLO)
+      && (howto->type != IMAGE_REL_PPC_PAIR)
+      && (howto->type != IMAGE_REL_PPC_TOCREL16_DEFN) ;
+}
+
+static bfd_boolean
+write_base_file_entry (bfd *obfd, struct bfd_link_info *info, bfd_vma addr)
+{
+  if (coff_data (obfd)->pe)
+     addr -= pe_data (obfd)->pe_opthdr.ImageBase;
+  if (fwrite (&addr, sizeof (addr), 1, (FILE *) info->base_file) == 1)
+    return TRUE;
+
+  bfd_set_error (bfd_error_system_call);
+  return FALSE;
+}
+
+/* The reloc processing routine for the optimized COFF linker.  */
+
+static bfd_boolean
+coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
+			   contents, relocs, syms, sections)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     struct internal_reloc *relocs;
+     struct internal_syment *syms;
+     asection **sections;
+{
+  struct internal_reloc *rel;
+  struct internal_reloc *relend;
+  asection *toc_section = 0;
+  bfd_vma relocation;
+  reloc_howto_type *howto = 0;
+
+  /* If we are performing a relocatable link, we don't need to do a
+     thing.  The caller will take care of adjusting the reloc
+     addresses and symbol indices.  */
+  if (info->relocatable)
+    return TRUE;
+
+  rel = relocs;
+  relend = rel + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      long symndx;
+      struct ppc_coff_link_hash_entry *h;
+      struct internal_syment *sym;
+      bfd_vma val;
+
+      asection *sec;
+      bfd_reloc_status_type rstat;
+      bfd_byte *loc;
+
+      unsigned short r_type  = EXTRACT_TYPE (rel->r_type);
+      unsigned short r_flags = EXTRACT_FLAGS(rel->r_type);
+
+      symndx = rel->r_symndx;
+      loc = contents + rel->r_vaddr - input_section->vma;
+
+      /* FIXME: check bounds on r_type */
+      howto = ppc_coff_howto_table + r_type;
+
+      if (symndx == -1)
+	{
+	  h = NULL;
+	  sym = NULL;
+	}
+      else
+	{
+	  h = (struct ppc_coff_link_hash_entry *)
+	    (obj_coff_sym_hashes (input_bfd)[symndx]);
+	  if (h != 0)
+	    {
+	      HASH_CHECK(h);
+	    }
+
+	  sym = syms + symndx;
+	}
+
+      if (r_type == IMAGE_REL_PPC_IMGLUE && h == 0)
+	{
+	  /* An IMGLUE reloc must have a name. Something is very wrong.  */
+	  abort ();
+	}
+
+      sec = NULL;
+      val = 0;
+
+      /* FIXME: PAIR unsupported in the following code.  */
+      if (h == NULL)
+	{
+	  if (symndx == -1)
+	    sec = bfd_abs_section_ptr;
+	  else
+	    {
+	      sec = sections[symndx];
+	      val = (sec->output_section->vma
+		     + sec->output_offset
+		     + sym->n_value);
+	      if (! obj_pe (output_bfd))
+		val -= sec->vma;
+	    }
+	}
+      else
+	{
+	  HASH_CHECK(h);
+
+	  if (h->root.root.type == bfd_link_hash_defined
+	      || h->root.root.type == bfd_link_hash_defweak)
+	    {
+	      sec = h->root.root.u.def.section;
+	      val = (h->root.root.u.def.value
+		     + sec->output_section->vma
+		     + sec->output_offset);
+	    }
+	  else
+	    {
+	      if (! ((*info->callbacks->undefined_symbol)
+		     (info, h->root.root.root.string, input_bfd, input_section,
+		      rel->r_vaddr - input_section->vma, TRUE)))
+		return FALSE;
+	    }
+	}
+
+      rstat = bfd_reloc_ok;
+
+      /* Each case must do its own relocation, setting rstat appropriately.  */
+      switch (r_type)
+	{
+	default:
+	  (*_bfd_error_handler)
+	    (_("%B: unsupported relocation type 0x%02x"), input_bfd, r_type);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	case IMAGE_REL_PPC_TOCREL16:
+	  {
+	    bfd_signed_vma our_toc_offset;
+	    int fixit;
+
+	    DUMP_RELOC2(howto->name, rel);
+
+	    if (toc_section == 0)
+	      {
+		toc_section = bfd_get_section_by_name (bfd_of_toc_owner,
+						       TOC_SECTION_NAME);
+
+		if ( toc_section == NULL )
+		  {
+		    /* There is no toc section. Something is very wrong.  */
+		    abort ();
+		  }
+	      }
+
+	    /* Amazing bit tricks present. As we may have seen earlier, we
+	       use the 1 bit to tell us whether or not a toc offset has been
+	       allocated. Now that they've all been allocated, we will use
+	       the 1 bit to tell us if we've written this particular toc
+	       entry out.  */
+	    fixit = FALSE;
+	    if (h == 0)
+	      {
+		/* It is a file local symbol.  */
+		int *local_toc_table;
+		const char *name;
+
+		sym = syms + symndx;
+		name = sym->_n._n_name;
+
+		local_toc_table = obj_coff_local_toc_table(input_bfd);
+		our_toc_offset = local_toc_table[symndx];
+
+		if (IS_WRITTEN(our_toc_offset))
+		  {
+		    /* If it has been written out, it is marked with the
+		       1 bit. Fix up our offset, but do not write it out
+		       again.  */
+		    MAKE_ADDR_AGAIN(our_toc_offset);
+		  }
+		else
+		  {
+		    /* Write out the toc entry.  */
+		    record_toc (toc_section, our_toc_offset, priv,
+				strdup (name));
+
+		    bfd_put_32 (output_bfd, val,
+			       toc_section->contents + our_toc_offset);
+
+		    MARK_AS_WRITTEN(local_toc_table[symndx]);
+		    fixit = TRUE;
+		  }
+	      }
+	    else
+	      {
+		const char *name = h->root.root.root.string;
+		our_toc_offset = h->toc_offset;
+
+		if ((r_flags & IMAGE_REL_PPC_TOCDEFN)
+		    == IMAGE_REL_PPC_TOCDEFN )
+		  {
+		    /* This is unbelievable cheese. Some knowledgable asm
+		       hacker has decided to use r2 as a base for loading
+		       a value. He/She does this by setting the tocdefn bit,
+		       and not supplying a toc definition. The behaviour is
+		       then to use the difference between the value of the
+		       symbol and the actual location of the toc as the toc
+		       index.
+
+		       In fact, what is usually happening is, because the
+		       Import Address Table is mapped immediately following
+		       the toc, some trippy library code trying for speed on
+		       dll linkage, takes advantage of that and considers
+		       the IAT to be part of the toc, thus saving a load.  */
+
+		    our_toc_offset = val - (toc_section->output_section->vma
+					    + toc_section->output_offset);
+
+		    /* The size must still fit in a 16-bit displacement.  */
+		    if ((bfd_vma) our_toc_offset >= 65535)
+		      {
+			(*_bfd_error_handler)
+			  (_("%B: Relocation for %s of %lx exceeds Toc size limit"),
+			   input_bfd, name,
+			   (unsigned long) our_toc_offset);
+			bfd_set_error (bfd_error_bad_value);
+			return FALSE;
+		      }
+
+		    record_toc (toc_section, our_toc_offset, pub,
+				strdup (name));
+		  }
+		else if (IS_WRITTEN (our_toc_offset))
+		  {
+		    /* If it has been written out, it is marked with the
+		       1 bit. Fix up our offset, but do not write it out
+		       again.  */
+		    MAKE_ADDR_AGAIN(our_toc_offset);
+		  }
+		else
+		  {
+		    record_toc(toc_section, our_toc_offset, pub,
+			       strdup (name));
+
+		    /* Write out the toc entry.  */
+		    bfd_put_32 (output_bfd, val,
+			       toc_section->contents + our_toc_offset);
+
+		    MARK_AS_WRITTEN(h->toc_offset);
+		    /* The tricky part is that this is the address that
+		       needs a .reloc entry for it.  */
+		    fixit = TRUE;
+		  }
+	      }
+
+	    if (fixit && info->base_file)
+	      {
+		/* So if this is non pcrelative, and is referenced
+		   to a section or a common symbol, then it needs a reloc.  */
+
+		/* Relocation to a symbol in a section which
+		   isn't absolute - we output the address here
+		   to a file.  */
+		bfd_vma addr = (toc_section->output_section->vma
+				+ toc_section->output_offset + our_toc_offset);
+
+		if (!write_base_file_entry (output_bfd, info, addr))
+		  return FALSE;
+	      }
+
+	    /* FIXME: this test is conservative.  */
+	    if ((r_flags & IMAGE_REL_PPC_TOCDEFN) != IMAGE_REL_PPC_TOCDEFN
+		&& (bfd_vma) our_toc_offset > toc_section->size)
+	      {
+		(*_bfd_error_handler)
+		  (_("%B: Relocation exceeds allocated TOC (%lx)"),
+		   input_bfd, (unsigned long) toc_section->size);
+		bfd_set_error (bfd_error_bad_value);
+		return FALSE;
+	      }
+
+	    /* Now we know the relocation for this toc reference.  */
+	    relocation =  our_toc_offset + TOC_LOAD_ADJUSTMENT;
+	    rstat = _bfd_relocate_contents (howto, input_bfd, relocation, loc);
+	  }
+	  break;
+	case IMAGE_REL_PPC_IFGLUE:
+	  {
+	    /* To solve this, we need to know whether or not the symbol
+	       appearing on the call instruction is a glue function or not.
+	       A glue function must announce itself via a IMGLUE reloc, and 
+	       the reloc contains the required toc restore instruction.  */
+	    DUMP_RELOC2 (howto->name, rel);
+
+	    if (h != 0)
+	      {
+		if (h->symbol_is_glue == 1)
+		  {
+		    bfd_put_32 (input_bfd, (bfd_vma) h->glue_insn, loc);
+		  }
+	      }
+	  }
+	  break;
+	case IMAGE_REL_PPC_SECREL:
+	  /* Unimplemented: codeview debugging information.  */
+	  /* For fast access to the header of the section
+	     containing the item.  */
+	  break;
+	case IMAGE_REL_PPC_SECTION:
+	  /* Unimplemented: codeview debugging information.  */
+	  /* Is used to indicate that the value should be relative
+	     to the beginning of the section that contains the
+	     symbol.  */
+	  break;
+	case IMAGE_REL_PPC_ABSOLUTE:
+	  {
+	    const char *my_name;
+
+	    if (h == 0)
+	      my_name = (syms+symndx)->_n._n_name;
+	    else
+	      my_name = h->root.root.root.string;
+
+	    (*_bfd_error_handler)
+	      (_("Warning: unsupported reloc %s <file %B, section %A>\n"
+		 "sym %ld (%s), r_vaddr %ld (%lx)"),
+	       input_bfd, input_section, howto->name,
+	       rel->r_symndx, my_name, (long) rel->r_vaddr,
+	       (unsigned long) rel->r_vaddr);
+	  }
+	  break;
+	case IMAGE_REL_PPC_IMGLUE:
+	  {
+	    /* There is nothing to do now. This reloc was noted in the first
+	       pass over the relocs, and the glue instruction extracted.  */
+	    const char *my_name;
+
+	    if (h->symbol_is_glue == 1)
+	      break;
+	    my_name = h->root.root.root.string;
+
+	    (*_bfd_error_handler)
+	      (_("%B: Out of order IMGLUE reloc for %s"), input_bfd, my_name);
+	    bfd_set_error (bfd_error_bad_value);
+	    return FALSE;
+	  }
+
+	case IMAGE_REL_PPC_ADDR32NB:
+	  {
+	    const char *name = 0;
+
+	    DUMP_RELOC2 (howto->name, rel);
+
+	    if (CONST_STRNEQ (input_section->name, ".idata$2") && first_thunk_address == 0)
+	      {
+		/* Set magic values.  */
+		int idata5offset;
+		struct coff_link_hash_entry *myh;
+
+		myh = coff_link_hash_lookup (coff_hash_table (info),
+					     "__idata5_magic__",
+					     FALSE, FALSE, TRUE);
+		first_thunk_address = myh->root.u.def.value +
+		  sec->output_section->vma +
+		    sec->output_offset -
+		      pe_data(output_bfd)->pe_opthdr.ImageBase;
+
+		idata5offset = myh->root.u.def.value;
+		myh = coff_link_hash_lookup (coff_hash_table (info),
+					     "__idata6_magic__",
+					     FALSE, FALSE, TRUE);
+
+		thunk_size = myh->root.u.def.value - idata5offset;
+		myh = coff_link_hash_lookup (coff_hash_table (info),
+					     "__idata4_magic__",
+					     FALSE, FALSE, TRUE);
+		import_table_size = myh->root.u.def.value;
+	      }
+
+	    if (h == 0)
+	      {
+		/* It is a file local symbol.  */
+		sym = syms + symndx;
+		name = sym->_n._n_name;
+	      }
+	    else
+	      {
+		char *target = 0;
+
+		name = h->root.root.root.string;
+		if (strcmp (".idata$2", name) == 0)
+		  target = "__idata2_magic__";
+		else if (strcmp (".idata$4", name) == 0)
+		  target = "__idata4_magic__";
+		else if (strcmp (".idata$5", name) == 0)
+		  target = "__idata5_magic__";
+
+		if (target != 0)
+		  {
+		    struct coff_link_hash_entry *myh;
+
+		    myh = coff_link_hash_lookup (coff_hash_table (info),
+						 target,
+						 FALSE, FALSE, TRUE);
+		    if (myh == 0)
+		      {
+			/* Missing magic cookies. Something is very wrong.  */
+			abort ();
+		      }
+
+		    val = myh->root.u.def.value +
+		      sec->output_section->vma + sec->output_offset;
+		    if (first_thunk_address == 0)
+		      {
+			int idata5offset;
+			myh = coff_link_hash_lookup (coff_hash_table (info),
+						     "__idata5_magic__",
+						     FALSE, FALSE, TRUE);
+			first_thunk_address = myh->root.u.def.value +
+			  sec->output_section->vma +
+			    sec->output_offset -
+			      pe_data(output_bfd)->pe_opthdr.ImageBase;
+
+			idata5offset = myh->root.u.def.value;
+			myh = coff_link_hash_lookup (coff_hash_table (info),
+						     "__idata6_magic__",
+						     FALSE, FALSE, TRUE);
+
+			thunk_size = myh->root.u.def.value - idata5offset;
+			myh = coff_link_hash_lookup (coff_hash_table (info),
+						     "__idata4_magic__",
+						     FALSE, FALSE, TRUE);
+			import_table_size = myh->root.u.def.value;
+		      }
+		  }
+	      }
+
+	    rstat = _bfd_relocate_contents (howto,
+					    input_bfd,
+					    val -
+					    pe_data (output_bfd)->pe_opthdr.ImageBase,
+					    loc);
+	  }
+	  break;
+
+	case IMAGE_REL_PPC_REL24:
+	  DUMP_RELOC2(howto->name, rel);
+	  val -= (input_section->output_section->vma
+		  + input_section->output_offset);
+
+	  rstat = _bfd_relocate_contents (howto,
+					  input_bfd,
+					  val,
+					  loc);
+	  break;
+	case IMAGE_REL_PPC_ADDR16:
+	case IMAGE_REL_PPC_ADDR24:
+	case IMAGE_REL_PPC_ADDR32:
+	  DUMP_RELOC2(howto->name, rel);
+	  rstat = _bfd_relocate_contents (howto,
+					  input_bfd,
+					  val,
+					  loc);
+	  break;
+	}
+
+      if (info->base_file)
+	{
+	  /* So if this is non pcrelative, and is referenced
+	     to a section or a common symbol, then it needs a reloc.  */
+	  if (sym && pe_data(output_bfd)->in_reloc_p (output_bfd, howto))
+	    {
+	      /* Relocation to a symbol in a section which
+		 isn't absolute - we output the address here
+		 to a file.  */
+	      bfd_vma addr = (rel->r_vaddr
+			      - input_section->vma
+			      + input_section->output_offset
+			      + input_section->output_section->vma);
+
+	      if (!write_base_file_entry (output_bfd, info, addr))
+		return FALSE;
+	    }
+	}
+
+      switch (rstat)
+	{
+	default:
+	  abort ();
+	case bfd_reloc_ok:
+	  break;
+	case bfd_reloc_overflow:
+	  {
+	    const char *name;
+	    char buf[SYMNMLEN + 1];
+
+	    if (symndx == -1)
+	      name = "*ABS*";
+	    else if (h != NULL)
+	      name = NULL;
+	    else if (sym == NULL)
+	      name = "*unknown*";
+	    else if (sym->_n._n_n._n_zeroes == 0
+		     && sym->_n._n_n._n_offset != 0)
+	      name = obj_coff_strings (input_bfd) + sym->_n._n_n._n_offset;
+	    else
+	      {
+		strncpy (buf, sym->_n._n_name, SYMNMLEN);
+		buf[SYMNMLEN] = '\0';
+		name = buf;
+	      }
+
+	    if (! ((*info->callbacks->reloc_overflow)
+		   (info, (h ? &h->root.root : NULL), name, howto->name,
+		    (bfd_vma) 0, input_bfd,
+		    input_section, rel->r_vaddr - input_section->vma)))
+	      return FALSE;
+	  }
+	}
+    }
+
+  return TRUE;
+}
+
+#ifdef COFF_IMAGE_WITH_PE
+
+/* FIXME: BFD should not use global variables.  This file is compiled
+   twice, and these variables are shared.  This is confusing and
+   weird.  */
+
+long int global_toc_size = 4;
+
+bfd* bfd_of_toc_owner = 0;
+
+long int import_table_size;
+long int first_thunk_address;
+long int thunk_size;
+
+struct list_ele *head;
+struct list_ele *tail;
+
+static char *
+h1 = N_("\n\t\t\tTOC MAPPING\n\n");
+static char *
+h2 = N_(" TOC    disassembly  Comments       Name\n");
+static char *
+h3 = N_(" Offset  spelling                   (if present)\n");
+
+void
+dump_toc (vfile)
+     PTR vfile;
+{
+  FILE *file = (FILE *) vfile;
+  struct list_ele *t;
+
+  fputs (_(h1), file);
+  fputs (_(h2), file);
+  fputs (_(h3), file);
+
+  for (t = head; t != 0; t=t->next)
+    {
+      const char *cat = "";
+
+      if (t->cat == priv)
+	cat = _("private       ");
+      else if (t->cat == pub)
+	cat = _("public        ");
+      else if (t->cat == tocdata)
+	cat = _("data-in-toc   ");
+
+      if (t->offset > global_toc_size)
+	{
+	  if (t->offset <= global_toc_size + thunk_size)
+	    cat = _("IAT reference ");
+	  else
+	    {
+	      fprintf (file,
+		      _("**** global_toc_size %ld(%lx), thunk_size %ld(%lx)\n"),
+		       global_toc_size, (unsigned long) global_toc_size,
+		       thunk_size, (unsigned long) thunk_size);
+	      cat = _("Out of bounds!");
+	    }
+	}
+
+      fprintf (file,
+	      " %04lx    (%d)", (unsigned long) t->offset, t->offset - 32768);
+      fprintf (file,
+	      "    %s %s\n",
+	      cat, t->name);
+
+    }
+
+  fprintf (file, "\n");
+}
+
+bfd_boolean
+ppc_allocate_toc_section (info)
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+{
+  asection *s;
+  bfd_byte *foo;
+  bfd_size_type amt;
+  static char test_char = '1';
+
+  if ( global_toc_size == 0 ) /* FIXME: does this get me in trouble?  */
+    return TRUE;
+
+  if (bfd_of_toc_owner == 0)
+    /* No toc owner? Something is very wrong.  */
+    abort ();
+
+  s = bfd_get_section_by_name ( bfd_of_toc_owner , TOC_SECTION_NAME);
+  if (s == NULL)
+    /* No toc section? Something is very wrong.  */
+    abort ();
+
+  amt = global_toc_size;
+  foo = (bfd_byte *) bfd_alloc (bfd_of_toc_owner, amt);
+  memset(foo, test_char, (size_t) global_toc_size);
+
+  s->size = global_toc_size;
+  s->contents = foo;
+
+  return TRUE;
+}
+
+bfd_boolean
+ppc_process_before_allocation (abfd, info)
+     bfd *abfd;
+     struct bfd_link_info *info;
+{
+  asection *sec;
+  struct internal_reloc *i, *rel;
+
+  /* Here we have a bfd that is to be included on the link. We have a hook
+     to do reloc rummaging, before section sizes are nailed down.  */
+  _bfd_coff_get_external_symbols (abfd);
+
+  /* Rummage around all the relocs and map the toc.  */
+  sec = abfd->sections;
+
+  if (sec == 0)
+    return TRUE;
+
+  for (; sec != 0; sec = sec->next)
+    {
+      if (sec->reloc_count == 0)
+	continue;
+
+      /* load the relocs */
+      /* FIXME: there may be a storage leak here */
+      i=_bfd_coff_read_internal_relocs(abfd,sec,1,0,0,0);
+
+      if (i == 0)
+	abort ();
+
+      for (rel = i; rel < i + sec->reloc_count; ++rel)
+	{
+	  unsigned short r_type  = EXTRACT_TYPE  (rel->r_type);
+	  unsigned short r_flags = EXTRACT_FLAGS (rel->r_type);
+	  bfd_boolean ok = TRUE;
+
+	  DUMP_RELOC2 (ppc_coff_howto_table[r_type].name, rel);
+
+	  switch(r_type)
+	    {
+	    case IMAGE_REL_PPC_TOCREL16:
+	      /* If TOCDEFN is on, ignore as someone else has allocated the
+		 toc entry.  */
+	      if ((r_flags & IMAGE_REL_PPC_TOCDEFN) != IMAGE_REL_PPC_TOCDEFN)
+		ok = ppc_record_toc_entry(abfd, info, sec,
+					  rel->r_symndx, default_toc);
+	      if (!ok)
+		return FALSE;
+	      break;
+	    case IMAGE_REL_PPC_IMGLUE:
+	      ppc_mark_symbol_as_glue (abfd, rel->r_symndx, rel);
+	      break;
+	    default:
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+#endif
+
+static bfd_reloc_status_type
+ppc_refhi_reloc (abfd, reloc_entry, symbol, data,
+		 input_section, output_bfd, error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry ATTRIBUTE_UNUSED;
+     asymbol *symbol ATTRIBUTE_UNUSED;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section ATTRIBUTE_UNUSED;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  UN_IMPL("REFHI");
+  DUMP_RELOC("REFHI",reloc_entry);
+
+  if (output_bfd == (bfd *) NULL)
+    return bfd_reloc_continue;
+
+  return bfd_reloc_undefined;
+}
+
+static bfd_reloc_status_type
+ppc_pair_reloc (abfd, reloc_entry, symbol, data,
+		input_section, output_bfd, error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry ATTRIBUTE_UNUSED;
+     asymbol *symbol ATTRIBUTE_UNUSED;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section ATTRIBUTE_UNUSED;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  UN_IMPL("PAIR");
+  DUMP_RELOC("PAIR",reloc_entry);
+
+  if (output_bfd == (bfd *) NULL)
+    return bfd_reloc_continue;
+
+  return bfd_reloc_undefined;
+}
+
+static bfd_reloc_status_type
+ppc_toc16_reloc (abfd, reloc_entry, symbol, data,
+		 input_section, output_bfd, error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry ATTRIBUTE_UNUSED;
+     asymbol *symbol ATTRIBUTE_UNUSED;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section ATTRIBUTE_UNUSED;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  UN_IMPL ("TOCREL16");
+  DUMP_RELOC ("TOCREL16",reloc_entry);
+
+  if (output_bfd == (bfd *) NULL)
+    return bfd_reloc_continue;
+
+  return bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type
+ppc_secrel_reloc (abfd, reloc_entry, symbol, data,
+		  input_section, output_bfd, error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry ATTRIBUTE_UNUSED;
+     asymbol *symbol ATTRIBUTE_UNUSED;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section ATTRIBUTE_UNUSED;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  UN_IMPL("SECREL");
+  DUMP_RELOC("SECREL",reloc_entry);
+
+  if (output_bfd == (bfd *) NULL)
+    return bfd_reloc_continue;
+
+  return bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type
+ppc_section_reloc (abfd, reloc_entry, symbol, data,
+		   input_section, output_bfd, error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry ATTRIBUTE_UNUSED;
+     asymbol *symbol ATTRIBUTE_UNUSED;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section ATTRIBUTE_UNUSED;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  UN_IMPL("SECTION");
+  DUMP_RELOC("SECTION",reloc_entry);
+
+  if (output_bfd == (bfd *) NULL)
+    return bfd_reloc_continue;
+
+  return bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type
+ppc_imglue_reloc (abfd, reloc_entry, symbol, data,
+		  input_section, output_bfd, error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry ATTRIBUTE_UNUSED;
+     asymbol *symbol ATTRIBUTE_UNUSED;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section ATTRIBUTE_UNUSED;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  UN_IMPL("IMGLUE");
+  DUMP_RELOC("IMGLUE",reloc_entry);
+
+  if (output_bfd == (bfd *) NULL)
+    return bfd_reloc_continue;
+
+  return bfd_reloc_ok;
+}
+
+#define MAX_RELOC_INDEX  \
+      (sizeof (ppc_coff_howto_table) / sizeof (ppc_coff_howto_table[0]) - 1)
+
+/* FIXME: There is a possibility that when we read in a reloc from a file,
+          that there are some bits encoded in the upper portion of the
+	  type field. Not yet implemented.  */
+static void ppc_coff_rtype2howto PARAMS ((arelent *, struct internal_reloc *));
+
+static void
+ppc_coff_rtype2howto (relent, internal)
+     arelent *relent;
+     struct internal_reloc *internal;
+{
+  /* We can encode one of three things in the type field, aside from the
+     type:
+     1. IMAGE_REL_PPC_NEG - indicates the value field is a subtraction
+        value, rather than an addition value
+     2. IMAGE_REL_PPC_BRTAKEN, IMAGE_REL_PPC_BRNTAKEN - indicates that
+        the branch is expected to be taken or not.
+     3. IMAGE_REL_PPC_TOCDEFN - toc slot definition in the file
+     For now, we just strip this stuff to find the type, and ignore it other
+     than that.  */
+  reloc_howto_type *howto;
+  unsigned short r_type  = EXTRACT_TYPE (internal->r_type);
+  unsigned short r_flags = EXTRACT_FLAGS(internal->r_type);
+  unsigned short junk    = EXTRACT_JUNK (internal->r_type);
+
+  /* The masking process only slices off the bottom byte for r_type.  */
+  if ( r_type > MAX_RELOC_INDEX )
+    abort ();
+
+  /* Check for absolute crap.  */
+  if (junk != 0)
+    abort ();
+
+  switch(r_type)
+    {
+    case IMAGE_REL_PPC_ADDR16:
+    case IMAGE_REL_PPC_REL24:
+    case IMAGE_REL_PPC_ADDR24:
+    case IMAGE_REL_PPC_ADDR32:
+    case IMAGE_REL_PPC_IFGLUE:
+    case IMAGE_REL_PPC_ADDR32NB:
+    case IMAGE_REL_PPC_SECTION:
+    case IMAGE_REL_PPC_SECREL:
+      DUMP_RELOC2 (ppc_coff_howto_table[r_type].name, internal);
+      howto = ppc_coff_howto_table + r_type;
+      break;
+    case IMAGE_REL_PPC_IMGLUE:
+      DUMP_RELOC2 (ppc_coff_howto_table[r_type].name, internal);
+      howto = ppc_coff_howto_table + r_type;
+      break;
+    case IMAGE_REL_PPC_TOCREL16:
+      DUMP_RELOC2 (ppc_coff_howto_table[r_type].name, internal);
+      if (r_flags & IMAGE_REL_PPC_TOCDEFN)
+	howto = ppc_coff_howto_table + IMAGE_REL_PPC_TOCREL16_DEFN;
+      else
+	howto = ppc_coff_howto_table + IMAGE_REL_PPC_TOCREL16;
+      break;
+    default:
+      (*_bfd_error_handler) (_("warning: unsupported reloc %s [%d] used -- it may not work"),
+			     ppc_coff_howto_table[r_type].name,
+			     r_type);
+      howto = ppc_coff_howto_table + r_type;
+      break;
+    }
+
+  relent->howto = howto;
+}
+
+static reloc_howto_type *
+coff_ppc_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     asection *sec;
+     struct internal_reloc *rel;
+     struct coff_link_hash_entry *h ATTRIBUTE_UNUSED;
+     struct internal_syment *sym ATTRIBUTE_UNUSED;
+     bfd_vma *addendp;
+{
+  reloc_howto_type *howto;
+
+  /* We can encode one of three things in the type field, aside from the
+     type:
+     1. IMAGE_REL_PPC_NEG - indicates the value field is a subtraction
+        value, rather than an addition value
+     2. IMAGE_REL_PPC_BRTAKEN, IMAGE_REL_PPC_BRNTAKEN - indicates that
+        the branch is expected to be taken or not.
+     3. IMAGE_REL_PPC_TOCDEFN - toc slot definition in the file
+     For now, we just strip this stuff to find the type, and ignore it other
+     than that.  */
+
+  unsigned short r_type  = EXTRACT_TYPE  (rel->r_type);
+  unsigned short r_flags = EXTRACT_FLAGS (rel->r_type);
+  unsigned short junk    = EXTRACT_JUNK  (rel->r_type);
+
+  /* The masking process only slices off the bottom byte for r_type.  */
+  if (r_type > MAX_RELOC_INDEX)
+    abort ();
+
+  /* Check for absolute crap.  */
+  if (junk != 0)
+    abort ();
+
+  switch(r_type)
+    {
+    case IMAGE_REL_PPC_ADDR32NB:
+      DUMP_RELOC2(ppc_coff_howto_table[r_type].name, rel);
+      *addendp -= pe_data(sec->output_section->owner)->pe_opthdr.ImageBase;
+      howto = ppc_coff_howto_table + r_type;
+      break;
+    case IMAGE_REL_PPC_TOCREL16:
+      DUMP_RELOC2(ppc_coff_howto_table[r_type].name, rel);
+      if (r_flags & IMAGE_REL_PPC_TOCDEFN)
+	howto = ppc_coff_howto_table + IMAGE_REL_PPC_TOCREL16_DEFN;
+      else
+	howto = ppc_coff_howto_table + IMAGE_REL_PPC_TOCREL16;
+      break;
+    case IMAGE_REL_PPC_ADDR16:
+    case IMAGE_REL_PPC_REL24:
+    case IMAGE_REL_PPC_ADDR24:
+    case IMAGE_REL_PPC_ADDR32:
+    case IMAGE_REL_PPC_IFGLUE:
+    case IMAGE_REL_PPC_SECTION:
+    case IMAGE_REL_PPC_SECREL:
+      DUMP_RELOC2(ppc_coff_howto_table[r_type].name, rel);
+      howto = ppc_coff_howto_table + r_type;
+      break;
+    case IMAGE_REL_PPC_IMGLUE:
+      DUMP_RELOC2(ppc_coff_howto_table[r_type].name, rel);
+      howto = ppc_coff_howto_table + r_type;
+      break;
+    default:
+      (*_bfd_error_handler) (_("warning: unsupported reloc %s [%d] used -- it may not work"),
+			     ppc_coff_howto_table[r_type].name,
+			     r_type);
+      howto = ppc_coff_howto_table + r_type;
+      break;
+    }
+
+  return howto;
+}
+
+/* A cheesy little macro to make the code a little more readable.  */
+#define HOW2MAP(bfd_rtype,ppc_rtype)  \
+ case bfd_rtype: return &ppc_coff_howto_table[ppc_rtype]
+
+static reloc_howto_type *ppc_coff_reloc_type_lookup
+PARAMS ((bfd *, bfd_reloc_code_real_type));
+
+static reloc_howto_type *
+ppc_coff_reloc_type_lookup (abfd, code)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     bfd_reloc_code_real_type code;
+{
+  switch (code)
+    {
+      HOW2MAP(BFD_RELOC_32_GOTOFF,    IMAGE_REL_PPC_IMGLUE);
+      HOW2MAP(BFD_RELOC_16_GOT_PCREL, IMAGE_REL_PPC_IFGLUE);
+      HOW2MAP(BFD_RELOC_16,           IMAGE_REL_PPC_ADDR16);
+      HOW2MAP(BFD_RELOC_PPC_B26,      IMAGE_REL_PPC_REL24);
+      HOW2MAP(BFD_RELOC_PPC_BA26,     IMAGE_REL_PPC_ADDR24);
+      HOW2MAP(BFD_RELOC_PPC_TOC16,    IMAGE_REL_PPC_TOCREL16);
+      HOW2MAP(BFD_RELOC_16_GOTOFF,    IMAGE_REL_PPC_TOCREL16_DEFN);
+      HOW2MAP(BFD_RELOC_32,           IMAGE_REL_PPC_ADDR32);
+      HOW2MAP(BFD_RELOC_RVA,          IMAGE_REL_PPC_ADDR32NB);
+    default:
+      return NULL;
+    }
+}
+#undef HOW2MAP
+
+static reloc_howto_type *
+ppc_coff_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (ppc_coff_howto_table) / sizeof (ppc_coff_howto_table[0]);
+       i++)
+    if (ppc_coff_howto_table[i].name != NULL
+	&& strcasecmp (ppc_coff_howto_table[i].name, r_name) == 0)
+      return &ppc_coff_howto_table[i];
+
+  return NULL;
+}
+
+/* Tailor coffcode.h -- macro heaven.  */
+
+#define RTYPE2HOWTO(cache_ptr, dst)  ppc_coff_rtype2howto (cache_ptr, dst)
+
+/* We use the special COFF backend linker, with our own special touch.  */
+
+#define coff_bfd_reloc_type_lookup   ppc_coff_reloc_type_lookup
+#define coff_bfd_reloc_name_lookup ppc_coff_reloc_name_lookup
+#define coff_rtype_to_howto          coff_ppc_rtype_to_howto
+#define coff_relocate_section        coff_ppc_relocate_section
+#define coff_bfd_final_link          ppc_bfd_coff_final_link
+
+#ifndef COFF_IMAGE_WITH_PE
+#endif
+
+#define SELECT_RELOC(internal, howto) {internal.r_type=howto->type;}
+
+#define COFF_PAGE_SIZE                       0x1000
+
+/* FIXME: This controls some code that used to be in peicode.h and is
+   now in peigen.c.  It will not control the code in peigen.c.  If
+   anybody wants to get this working, you will need to fix that.  */
+#define POWERPC_LE_PE
+
+#define COFF_SECTION_ALIGNMENT_ENTRIES \
+{ COFF_SECTION_NAME_EXACT_MATCH (".idata$2"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".idata$3"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".idata$4"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".idata$5"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".idata$6"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 1 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".reloc"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 1 }
+
+#include "coffcode.h"
+
+#ifndef COFF_IMAGE_WITH_PE
+
+static bfd_boolean ppc_do_last PARAMS ((bfd *));
+static bfd *ppc_get_last PARAMS ((void));
+
+static bfd_boolean
+ppc_do_last (abfd)
+     bfd *abfd;
+{
+  if (abfd == bfd_of_toc_owner)
+    return TRUE;
+  else
+    return FALSE;
+}
+
+static bfd *
+ppc_get_last()
+{
+  return bfd_of_toc_owner;
+}
+
+/* This piece of machinery exists only to guarantee that the bfd that holds
+   the toc section is written last.
+
+   This does depend on bfd_make_section attaching a new section to the
+   end of the section list for the bfd.
+
+   This is otherwise intended to be functionally the same as
+   cofflink.c:_bfd_coff_final_link(). It is specifically different only
+   where the POWERPC_LE_PE macro modifies the code. It is left in as a
+   precise form of comment. krk@cygnus.com  */
+
+/* Do the final link step.  */
+
+bfd_boolean
+ppc_bfd_coff_final_link (abfd, info)
+     bfd *abfd;
+     struct bfd_link_info *info;
+{
+  bfd_size_type symesz;
+  struct coff_final_link_info finfo;
+  bfd_boolean debug_merge_allocated;
+  asection *o;
+  struct bfd_link_order *p;
+  bfd_size_type max_sym_count;
+  bfd_size_type max_lineno_count;
+  bfd_size_type max_reloc_count;
+  bfd_size_type max_output_reloc_count;
+  bfd_size_type max_contents_size;
+  file_ptr rel_filepos;
+  unsigned int relsz;
+  file_ptr line_filepos;
+  unsigned int linesz;
+  bfd *sub;
+  bfd_byte *external_relocs = NULL;
+  char strbuf[STRING_SIZE_SIZE];
+  bfd_size_type amt;
+
+  symesz = bfd_coff_symesz (abfd);
+
+  finfo.info = info;
+  finfo.output_bfd = abfd;
+  finfo.strtab = NULL;
+  finfo.section_info = NULL;
+  finfo.last_file_index = -1;
+  finfo.last_bf_index = -1;
+  finfo.internal_syms = NULL;
+  finfo.sec_ptrs = NULL;
+  finfo.sym_indices = NULL;
+  finfo.outsyms = NULL;
+  finfo.linenos = NULL;
+  finfo.contents = NULL;
+  finfo.external_relocs = NULL;
+  finfo.internal_relocs = NULL;
+  debug_merge_allocated = FALSE;
+
+  coff_data (abfd)->link_info = info;
+
+  finfo.strtab = _bfd_stringtab_init ();
+  if (finfo.strtab == NULL)
+    goto error_return;
+
+  if (! coff_debug_merge_hash_table_init (&finfo.debug_merge))
+    goto error_return;
+  debug_merge_allocated = TRUE;
+
+  /* Compute the file positions for all the sections.  */
+  if (! abfd->output_has_begun)
+    {
+      if (! bfd_coff_compute_section_file_positions (abfd))
+	return FALSE;
+    }
+
+  /* Count the line numbers and relocation entries required for the
+     output file.  Set the file positions for the relocs.  */
+  rel_filepos = obj_relocbase (abfd);
+  relsz = bfd_coff_relsz (abfd);
+  max_contents_size = 0;
+  max_lineno_count = 0;
+  max_reloc_count = 0;
+
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      o->reloc_count = 0;
+      o->lineno_count = 0;
+
+      for (p = o->map_head.link_order; p != NULL; p = p->next)
+	{
+	  if (p->type == bfd_indirect_link_order)
+	    {
+	      asection *sec;
+
+	      sec = p->u.indirect.section;
+
+	      /* Mark all sections which are to be included in the
+		 link.  This will normally be every section.  We need
+		 to do this so that we can identify any sections which
+		 the linker has decided to not include.  */
+	      sec->linker_mark = TRUE;
+
+	      if (info->strip == strip_none
+		  || info->strip == strip_some)
+		o->lineno_count += sec->lineno_count;
+
+	      if (info->relocatable)
+		o->reloc_count += sec->reloc_count;
+
+	      if (sec->rawsize > max_contents_size)
+		max_contents_size = sec->rawsize;
+	      if (sec->size > max_contents_size)
+		max_contents_size = sec->size;
+	      if (sec->lineno_count > max_lineno_count)
+		max_lineno_count = sec->lineno_count;
+	      if (sec->reloc_count > max_reloc_count)
+		max_reloc_count = sec->reloc_count;
+	    }
+	  else if (info->relocatable
+		   && (p->type == bfd_section_reloc_link_order
+		       || p->type == bfd_symbol_reloc_link_order))
+	    ++o->reloc_count;
+	}
+      if (o->reloc_count == 0)
+	o->rel_filepos = 0;
+      else
+	{
+	  o->flags |= SEC_RELOC;
+	  o->rel_filepos = rel_filepos;
+	  rel_filepos += o->reloc_count * relsz;
+	}
+    }
+
+  /* If doing a relocatable link, allocate space for the pointers we
+     need to keep.  */
+  if (info->relocatable)
+    {
+      unsigned int i;
+
+      /* We use section_count + 1, rather than section_count, because
+         the target_index fields are 1 based.  */
+      amt = abfd->section_count + 1;
+      amt *= sizeof (struct coff_link_section_info);
+      finfo.section_info = (struct coff_link_section_info *) bfd_malloc (amt);
+
+      if (finfo.section_info == NULL)
+	goto error_return;
+
+      for (i = 0; i <= abfd->section_count; i++)
+	{
+	  finfo.section_info[i].relocs = NULL;
+	  finfo.section_info[i].rel_hashes = NULL;
+	}
+    }
+
+  /* We now know the size of the relocs, so we can determine the file
+     positions of the line numbers.  */
+  line_filepos = rel_filepos;
+  linesz = bfd_coff_linesz (abfd);
+  max_output_reloc_count = 0;
+
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      if (o->lineno_count == 0)
+	o->line_filepos = 0;
+      else
+	{
+	  o->line_filepos = line_filepos;
+	  line_filepos += o->lineno_count * linesz;
+	}
+
+      if (o->reloc_count != 0)
+	{
+	  /* We don't know the indices of global symbols until we have
+             written out all the local symbols.  For each section in
+             the output file, we keep an array of pointers to hash
+             table entries.  Each entry in the array corresponds to a
+             reloc.  When we find a reloc against a global symbol, we
+             set the corresponding entry in this array so that we can
+             fix up the symbol index after we have written out all the
+             local symbols.
+
+	     Because of this problem, we also keep the relocs in
+	     memory until the end of the link.  This wastes memory,
+	     but only when doing a relocatable link, which is not the
+	     common case.  */
+	  BFD_ASSERT (info->relocatable);
+	  amt = o->reloc_count;
+	  amt *= sizeof (struct internal_reloc);
+	  finfo.section_info[o->target_index].relocs =
+	    (struct internal_reloc *) bfd_malloc (amt);
+	  amt = o->reloc_count;
+	  amt *= sizeof (struct coff_link_hash_entry *);
+	  finfo.section_info[o->target_index].rel_hashes =
+	    (struct coff_link_hash_entry **) bfd_malloc (amt);
+	  if (finfo.section_info[o->target_index].relocs == NULL
+	      || finfo.section_info[o->target_index].rel_hashes == NULL)
+	    goto error_return;
+
+	  if (o->reloc_count > max_output_reloc_count)
+	    max_output_reloc_count = o->reloc_count;
+	}
+
+      /* Reset the reloc and lineno counts, so that we can use them to
+	 count the number of entries we have output so far.  */
+      o->reloc_count = 0;
+      o->lineno_count = 0;
+    }
+
+  obj_sym_filepos (abfd) = line_filepos;
+
+  /* Figure out the largest number of symbols in an input BFD.  Take
+     the opportunity to clear the output_has_begun fields of all the
+     input BFD's.  */
+  max_sym_count = 0;
+  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+    {
+      bfd_size_type sz;
+
+      sub->output_has_begun = FALSE;
+      sz = obj_raw_syment_count (sub);
+      if (sz > max_sym_count)
+	max_sym_count = sz;
+    }
+
+  /* Allocate some buffers used while linking.  */
+  amt = max_sym_count * sizeof (struct internal_syment);
+  finfo.internal_syms = (struct internal_syment *) bfd_malloc (amt);
+  amt = max_sym_count * sizeof (asection *);
+  finfo.sec_ptrs = (asection **) bfd_malloc (amt);
+  amt = max_sym_count * sizeof (long);
+  finfo.sym_indices = (long *) bfd_malloc (amt);
+  amt = (max_sym_count + 1) * symesz;
+  finfo.outsyms = (bfd_byte *) bfd_malloc (amt);
+  amt = max_lineno_count * bfd_coff_linesz (abfd);
+  finfo.linenos = (bfd_byte *) bfd_malloc (amt);
+  finfo.contents = (bfd_byte *) bfd_malloc (max_contents_size);
+  finfo.external_relocs = (bfd_byte *) bfd_malloc (max_reloc_count * relsz);
+  if (! info->relocatable)
+    {
+      amt = max_reloc_count * sizeof (struct internal_reloc);
+      finfo.internal_relocs = (struct internal_reloc *) bfd_malloc (amt);
+    }
+  if ((finfo.internal_syms == NULL && max_sym_count > 0)
+      || (finfo.sec_ptrs == NULL && max_sym_count > 0)
+      || (finfo.sym_indices == NULL && max_sym_count > 0)
+      || finfo.outsyms == NULL
+      || (finfo.linenos == NULL && max_lineno_count > 0)
+      || (finfo.contents == NULL && max_contents_size > 0)
+      || (finfo.external_relocs == NULL && max_reloc_count > 0)
+      || (! info->relocatable
+	  && finfo.internal_relocs == NULL
+	  && max_reloc_count > 0))
+    goto error_return;
+
+  /* We now know the position of everything in the file, except that
+     we don't know the size of the symbol table and therefore we don't
+     know where the string table starts.  We just build the string
+     table in memory as we go along.  We process all the relocations
+     for a single input file at once.  */
+  obj_raw_syment_count (abfd) = 0;
+
+  if (coff_backend_info (abfd)->_bfd_coff_start_final_link)
+    {
+      if (! bfd_coff_start_final_link (abfd, info))
+	goto error_return;
+    }
+
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      for (p = o->map_head.link_order; p != NULL; p = p->next)
+	{
+	  if (p->type == bfd_indirect_link_order
+	      && (bfd_get_flavour (p->u.indirect.section->owner)
+		  == bfd_target_coff_flavour))
+	    {
+	      sub = p->u.indirect.section->owner;
+#ifdef POWERPC_LE_PE
+	      if (! sub->output_has_begun && !ppc_do_last(sub))
+#else
+	      if (! sub->output_has_begun)
+#endif
+		{
+		  if (! _bfd_coff_link_input_bfd (&finfo, sub))
+		    goto error_return;
+		  sub->output_has_begun = TRUE;
+		}
+	    }
+	  else if (p->type == bfd_section_reloc_link_order
+		   || p->type == bfd_symbol_reloc_link_order)
+	    {
+	      if (! _bfd_coff_reloc_link_order (abfd, &finfo, o, p))
+		goto error_return;
+	    }
+	  else
+	    {
+	      if (! _bfd_default_link_order (abfd, info, o, p))
+		goto error_return;
+	    }
+	}
+    }
+
+#ifdef POWERPC_LE_PE
+  {
+    bfd* last_one = ppc_get_last();
+    if (last_one)
+      {
+	if (! _bfd_coff_link_input_bfd (&finfo, last_one))
+	  goto error_return;
+      }
+    last_one->output_has_begun = TRUE;
+  }
+#endif
+
+  /* Free up the buffers used by _bfd_coff_link_input_bfd.  */
+  coff_debug_merge_hash_table_free (&finfo.debug_merge);
+  debug_merge_allocated = FALSE;
+
+  if (finfo.internal_syms != NULL)
+    {
+      free (finfo.internal_syms);
+      finfo.internal_syms = NULL;
+    }
+  if (finfo.sec_ptrs != NULL)
+    {
+      free (finfo.sec_ptrs);
+      finfo.sec_ptrs = NULL;
+    }
+  if (finfo.sym_indices != NULL)
+    {
+      free (finfo.sym_indices);
+      finfo.sym_indices = NULL;
+    }
+  if (finfo.linenos != NULL)
+    {
+      free (finfo.linenos);
+      finfo.linenos = NULL;
+    }
+  if (finfo.contents != NULL)
+    {
+      free (finfo.contents);
+      finfo.contents = NULL;
+    }
+  if (finfo.external_relocs != NULL)
+    {
+      free (finfo.external_relocs);
+      finfo.external_relocs = NULL;
+    }
+  if (finfo.internal_relocs != NULL)
+    {
+      free (finfo.internal_relocs);
+      finfo.internal_relocs = NULL;
+    }
+
+  /* The value of the last C_FILE symbol is supposed to be the symbol
+     index of the first external symbol.  Write it out again if
+     necessary.  */
+  if (finfo.last_file_index != -1
+      && (unsigned int) finfo.last_file.n_value != obj_raw_syment_count (abfd))
+    {
+      file_ptr pos;
+
+      finfo.last_file.n_value = obj_raw_syment_count (abfd);
+      bfd_coff_swap_sym_out (abfd, (PTR) &finfo.last_file,
+			     (PTR) finfo.outsyms);
+      pos = obj_sym_filepos (abfd) + finfo.last_file_index * symesz;
+      if (bfd_seek (abfd, pos, SEEK_SET) != 0
+	  || bfd_bwrite (finfo.outsyms, symesz, abfd) != symesz)
+	return FALSE;
+    }
+
+  /* Write out the global symbols.  */
+  finfo.failed = FALSE;
+  bfd_hash_traverse (&info->hash->table, _bfd_coff_write_global_sym, &finfo);
+  if (finfo.failed)
+    goto error_return;
+
+  /* The outsyms buffer is used by _bfd_coff_write_global_sym.  */
+  if (finfo.outsyms != NULL)
+    {
+      free (finfo.outsyms);
+      finfo.outsyms = NULL;
+    }
+
+  if (info->relocatable)
+    {
+      /* Now that we have written out all the global symbols, we know
+	 the symbol indices to use for relocs against them, and we can
+	 finally write out the relocs.  */
+      amt = max_output_reloc_count * relsz;
+      external_relocs = (bfd_byte *) bfd_malloc (amt);
+      if (external_relocs == NULL)
+	goto error_return;
+
+      for (o = abfd->sections; o != NULL; o = o->next)
+	{
+	  struct internal_reloc *irel;
+	  struct internal_reloc *irelend;
+	  struct coff_link_hash_entry **rel_hash;
+	  bfd_byte *erel;
+
+	  if (o->reloc_count == 0)
+	    continue;
+
+	  irel = finfo.section_info[o->target_index].relocs;
+	  irelend = irel + o->reloc_count;
+	  rel_hash = finfo.section_info[o->target_index].rel_hashes;
+	  erel = external_relocs;
+	  for (; irel < irelend; irel++, rel_hash++, erel += relsz)
+	    {
+	      if (*rel_hash != NULL)
+		{
+		  BFD_ASSERT ((*rel_hash)->indx >= 0);
+		  irel->r_symndx = (*rel_hash)->indx;
+		}
+	      bfd_coff_swap_reloc_out (abfd, (PTR) irel, (PTR) erel);
+	    }
+
+	  amt = relsz * o->reloc_count;
+	  if (bfd_seek (abfd, o->rel_filepos, SEEK_SET) != 0
+	      || bfd_bwrite ((PTR) external_relocs, amt, abfd) != amt)
+	    goto error_return;
+	}
+
+      free (external_relocs);
+      external_relocs = NULL;
+    }
+
+  /* Free up the section information.  */
+  if (finfo.section_info != NULL)
+    {
+      unsigned int i;
+
+      for (i = 0; i < abfd->section_count; i++)
+	{
+	  if (finfo.section_info[i].relocs != NULL)
+	    free (finfo.section_info[i].relocs);
+	  if (finfo.section_info[i].rel_hashes != NULL)
+	    free (finfo.section_info[i].rel_hashes);
+	}
+      free (finfo.section_info);
+      finfo.section_info = NULL;
+    }
+
+  /* If we have optimized stabs strings, output them.  */
+  if (coff_hash_table (info)->stab_info.stabstr != NULL)
+    {
+      if (! _bfd_write_stab_strings (abfd, &coff_hash_table (info)->stab_info))
+	return FALSE;
+    }
+
+  /* Write out the string table.  */
+  if (obj_raw_syment_count (abfd) != 0)
+    {
+      file_ptr pos;
+
+      pos = obj_sym_filepos (abfd) + obj_raw_syment_count (abfd) * symesz;
+      if (bfd_seek (abfd, pos, SEEK_SET) != 0)
+	return FALSE;
+
+#if STRING_SIZE_SIZE == 4
+      H_PUT_32 (abfd,
+		_bfd_stringtab_size (finfo.strtab) + STRING_SIZE_SIZE,
+		strbuf);
+#else
+ #error Change H_PUT_32 above
+#endif
+
+      if (bfd_bwrite (strbuf, (bfd_size_type) STRING_SIZE_SIZE, abfd)
+	  != STRING_SIZE_SIZE)
+	return FALSE;
+
+      if (! _bfd_stringtab_emit (abfd, finfo.strtab))
+	return FALSE;
+    }
+
+  _bfd_stringtab_free (finfo.strtab);
+
+  /* Setting bfd_get_symcount to 0 will cause write_object_contents to
+     not try to write out the symbols.  */
+  bfd_get_symcount (abfd) = 0;
+
+  return TRUE;
+
+ error_return:
+  if (debug_merge_allocated)
+    coff_debug_merge_hash_table_free (&finfo.debug_merge);
+  if (finfo.strtab != NULL)
+    _bfd_stringtab_free (finfo.strtab);
+  if (finfo.section_info != NULL)
+    {
+      unsigned int i;
+
+      for (i = 0; i < abfd->section_count; i++)
+	{
+	  if (finfo.section_info[i].relocs != NULL)
+	    free (finfo.section_info[i].relocs);
+	  if (finfo.section_info[i].rel_hashes != NULL)
+	    free (finfo.section_info[i].rel_hashes);
+	}
+      free (finfo.section_info);
+    }
+  if (finfo.internal_syms != NULL)
+    free (finfo.internal_syms);
+  if (finfo.sec_ptrs != NULL)
+    free (finfo.sec_ptrs);
+  if (finfo.sym_indices != NULL)
+    free (finfo.sym_indices);
+  if (finfo.outsyms != NULL)
+    free (finfo.outsyms);
+  if (finfo.linenos != NULL)
+    free (finfo.linenos);
+  if (finfo.contents != NULL)
+    free (finfo.contents);
+  if (finfo.external_relocs != NULL)
+    free (finfo.external_relocs);
+  if (finfo.internal_relocs != NULL)
+    free (finfo.internal_relocs);
+  if (external_relocs != NULL)
+    free (external_relocs);
+  return FALSE;
+}
+#endif
+
+/* Forward declaration for use by alternative_target field.  */
+#ifdef TARGET_BIG_SYM
+extern const bfd_target TARGET_BIG_SYM;
+#endif
+
+/* The transfer vectors that lead the outside world to all of the above.  */
+
+#ifdef TARGET_LITTLE_SYM
+const bfd_target TARGET_LITTLE_SYM =
+{
+  TARGET_LITTLE_NAME,		/* name or coff-arm-little */
+  bfd_target_coff_flavour,
+  BFD_ENDIAN_LITTLE,		/* data byte order is little */
+  BFD_ENDIAN_LITTLE,		/* header byte order is little */
+
+  (HAS_RELOC | EXEC_P |		/* FIXME: object flags */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+
+#ifndef COFF_WITH_PE
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+#else
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC /* section flags */
+   | SEC_LINK_ONCE | SEC_LINK_DUPLICATES),
+#endif
+
+  0,				/* leading char */
+  '/',				/* ar_pad_char */
+  15,				/* ar_max_namelen??? FIXMEmgo */
+  0,				/* match priority.  */
+
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
+
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
+
+  {_bfd_dummy_target, coff_object_p, 	/* bfd_check_format */
+     bfd_generic_archive_p, /* _bfd_dummy_target */ coff_object_p },
+  {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
+     bfd_false},
+  {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
+     _bfd_write_archive_contents, bfd_false},
+
+  BFD_JUMP_TABLE_GENERIC (coff),
+  BFD_JUMP_TABLE_COPY (coff),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+  BFD_JUMP_TABLE_SYMBOLS (coff),
+  BFD_JUMP_TABLE_RELOCS (coff),
+  BFD_JUMP_TABLE_WRITE (coff),
+  BFD_JUMP_TABLE_LINK (coff),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  /* Alternative_target.  */
+#ifdef TARGET_BIG_SYM
+  & TARGET_BIG_SYM,
+#else
+  NULL,
+#endif
+
+  COFF_SWAP_TABLE
+};
+#endif
+
+#ifdef TARGET_BIG_SYM
+const bfd_target TARGET_BIG_SYM =
+{
+  TARGET_BIG_NAME,
+  bfd_target_coff_flavour,
+  BFD_ENDIAN_BIG,		/* data byte order is big */
+  BFD_ENDIAN_BIG,		/* header byte order is big */
+
+  (HAS_RELOC | EXEC_P |		/* FIXME: object flags */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+
+#ifndef COFF_WITH_PE
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+#else
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC /* section flags */
+   | SEC_LINK_ONCE | SEC_LINK_DUPLICATES),
+#endif
+
+  0,				/* leading char */
+  '/',				/* ar_pad_char */
+  15,				/* ar_max_namelen??? FIXMEmgo */
+  0,				/* match priority.  */
+
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
+
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
+
+  {_bfd_dummy_target, coff_object_p, 	/* bfd_check_format */
+     bfd_generic_archive_p, /* _bfd_dummy_target */ coff_object_p },
+  {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
+     bfd_false},
+  {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
+     _bfd_write_archive_contents, bfd_false},
+
+  BFD_JUMP_TABLE_GENERIC (coff),
+  BFD_JUMP_TABLE_COPY (coff),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+  BFD_JUMP_TABLE_SYMBOLS (coff),
+  BFD_JUMP_TABLE_RELOCS (coff),
+  BFD_JUMP_TABLE_WRITE (coff),
+  BFD_JUMP_TABLE_LINK (coff),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  /* Alternative_target.  */
+#ifdef TARGET_LITTLE_SYM
+  & TARGET_LITTLE_SYM,
+#else
+  NULL,
+#endif
+
+  COFF_SWAP_TABLE
+};
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-rs6000.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-rs6000.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-rs6000.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-rs6000.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4378 @@
+/* BFD back-end for IBM RS/6000 "XCOFF" files.
+   Copyright 1990-1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+   2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Metin G. Ozisik, Mimi Phuong-Thao Vo, and John Gilmore.
+   Archive support from Damon A. Permezel.
+   Contributed by IBM Corporation and Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "coff/internal.h"
+#include "coff/xcoff.h"
+#include "coff/rs6000.h"
+#include "libcoff.h"
+#include "libxcoff.h"
+
+extern bfd_boolean _bfd_xcoff_mkobject (bfd *);
+extern bfd_boolean _bfd_xcoff_copy_private_bfd_data (bfd *, bfd *);
+extern bfd_boolean _bfd_xcoff_is_local_label_name (bfd *, const char *);
+extern reloc_howto_type *_bfd_xcoff_reloc_type_lookup
+  (bfd *, bfd_reloc_code_real_type);
+extern bfd_boolean _bfd_xcoff_slurp_armap (bfd *);
+extern const bfd_target *_bfd_xcoff_archive_p (bfd *);
+extern PTR _bfd_xcoff_read_ar_hdr (bfd *);
+extern bfd *_bfd_xcoff_openr_next_archived_file (bfd *, bfd *);
+extern int _bfd_xcoff_stat_arch_elt (bfd *, struct stat *);
+extern bfd_boolean _bfd_xcoff_write_armap
+  (bfd *, unsigned int, struct orl *, unsigned int, int);
+extern bfd_boolean _bfd_xcoff_write_archive_contents (bfd *);
+extern int _bfd_xcoff_sizeof_headers (bfd *, struct bfd_link_info *);
+extern void _bfd_xcoff_swap_sym_in (bfd *, PTR, PTR);
+extern unsigned int _bfd_xcoff_swap_sym_out (bfd *, PTR, PTR);
+extern void _bfd_xcoff_swap_aux_in (bfd *, PTR, int, int, int, int, PTR);
+extern unsigned int _bfd_xcoff_swap_aux_out
+  (bfd *, PTR, int, int, int, int, PTR);
+static void xcoff_swap_reloc_in (bfd *, PTR, PTR);
+static unsigned int xcoff_swap_reloc_out (bfd *, PTR, PTR);
+
+/* Forward declare xcoff_rtype2howto for coffcode.h macro.  */
+void xcoff_rtype2howto (arelent *, struct internal_reloc *);
+
+/* coffcode.h needs these to be defined.  */
+#define RS6000COFF_C 1
+
+#define SELECT_RELOC(internal, howto)					\
+  {									\
+    internal.r_type = howto->type;					\
+    internal.r_size =							\
+      ((howto->complain_on_overflow == complain_overflow_signed		\
+	? 0x80								\
+	: 0)								\
+       | (howto->bitsize - 1));						\
+  }
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
+#define COFF_LONG_FILENAMES
+#define NO_COFF_SYMBOLS
+#define RTYPE2HOWTO(cache_ptr, dst) xcoff_rtype2howto (cache_ptr, dst)
+#define coff_mkobject _bfd_xcoff_mkobject
+#define coff_bfd_copy_private_bfd_data _bfd_xcoff_copy_private_bfd_data
+#define coff_bfd_is_local_label_name _bfd_xcoff_is_local_label_name
+#define coff_bfd_reloc_type_lookup _bfd_xcoff_reloc_type_lookup
+#define coff_bfd_reloc_name_lookup _bfd_xcoff_reloc_name_lookup
+#ifdef AIX_CORE
+extern const bfd_target * rs6000coff_core_p (bfd *abfd);
+extern bfd_boolean rs6000coff_core_file_matches_executable_p
+  (bfd *cbfd, bfd *ebfd);
+extern char *rs6000coff_core_file_failing_command (bfd *abfd);
+extern int rs6000coff_core_file_failing_signal (bfd *abfd);
+#define CORE_FILE_P rs6000coff_core_p
+#define coff_core_file_failing_command \
+  rs6000coff_core_file_failing_command
+#define coff_core_file_failing_signal \
+  rs6000coff_core_file_failing_signal
+#define coff_core_file_matches_executable_p \
+  rs6000coff_core_file_matches_executable_p
+#define coff_core_file_pid \
+  _bfd_nocore_core_file_pid
+#else
+#define CORE_FILE_P _bfd_dummy_target
+#define coff_core_file_failing_command \
+  _bfd_nocore_core_file_failing_command
+#define coff_core_file_failing_signal \
+  _bfd_nocore_core_file_failing_signal
+#define coff_core_file_matches_executable_p \
+  _bfd_nocore_core_file_matches_executable_p
+#define coff_core_file_pid \
+  _bfd_nocore_core_file_pid
+#endif
+#define coff_SWAP_sym_in _bfd_xcoff_swap_sym_in
+#define coff_SWAP_sym_out _bfd_xcoff_swap_sym_out
+#define coff_SWAP_aux_in _bfd_xcoff_swap_aux_in
+#define coff_SWAP_aux_out _bfd_xcoff_swap_aux_out
+#define coff_swap_reloc_in xcoff_swap_reloc_in
+#define coff_swap_reloc_out xcoff_swap_reloc_out
+#define NO_COFF_RELOCS
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coffcode.h"
+
+/* The main body of code is in coffcode.h.  */
+
+static const char *normalize_filename (bfd *);
+static bfd_boolean xcoff_write_armap_old
+  (bfd *, unsigned int, struct orl *, unsigned int, int);
+static bfd_boolean xcoff_write_armap_big
+  (bfd *, unsigned int, struct orl *, unsigned int, int);
+static bfd_boolean xcoff_write_archive_contents_old (bfd *);
+static bfd_boolean xcoff_write_archive_contents_big (bfd *);
+static void xcoff_swap_ldhdr_in (bfd *, const PTR, struct internal_ldhdr *);
+static void xcoff_swap_ldhdr_out (bfd *, const struct internal_ldhdr *, PTR);
+static void xcoff_swap_ldsym_in (bfd *, const PTR, struct internal_ldsym *);
+static void xcoff_swap_ldsym_out (bfd *, const struct internal_ldsym *, PTR);
+static void xcoff_swap_ldrel_in (bfd *, const PTR, struct internal_ldrel *);
+static void xcoff_swap_ldrel_out (bfd *, const struct internal_ldrel *, PTR);
+static bfd_boolean xcoff_ppc_relocate_section
+  (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+   struct internal_reloc *, struct internal_syment *, asection **);
+static bfd_boolean _bfd_xcoff_put_ldsymbol_name
+  (bfd *, struct xcoff_loader_info *, struct internal_ldsym *, const char *);
+static asection *xcoff_create_csect_from_smclas
+  (bfd *, union internal_auxent *, const char *);
+static bfd_boolean xcoff_is_lineno_count_overflow (bfd *, bfd_vma);
+static bfd_boolean xcoff_is_reloc_count_overflow (bfd *, bfd_vma);
+static bfd_vma xcoff_loader_symbol_offset (bfd *, struct internal_ldhdr *);
+static bfd_vma xcoff_loader_reloc_offset (bfd *, struct internal_ldhdr *);
+static bfd_boolean xcoff_generate_rtinit
+  (bfd *, const char *, const char *, bfd_boolean);
+static bfd_boolean do_pad (bfd *, unsigned int);
+static bfd_boolean do_copy (bfd *, bfd *);
+
+/* Relocation functions */
+static bfd_boolean xcoff_reloc_type_br (XCOFF_RELOC_FUNCTION_ARGS);
+
+static bfd_boolean xcoff_complain_overflow_dont_func
+  (XCOFF_COMPLAIN_FUNCTION_ARGS);
+static bfd_boolean xcoff_complain_overflow_bitfield_func
+  (XCOFF_COMPLAIN_FUNCTION_ARGS);
+static bfd_boolean xcoff_complain_overflow_signed_func
+  (XCOFF_COMPLAIN_FUNCTION_ARGS);
+static bfd_boolean xcoff_complain_overflow_unsigned_func
+  (XCOFF_COMPLAIN_FUNCTION_ARGS);
+
+bfd_boolean (*xcoff_calculate_relocation[XCOFF_MAX_CALCULATE_RELOCATION])
+  (XCOFF_RELOC_FUNCTION_ARGS) =
+{
+  xcoff_reloc_type_pos,	 /* R_POS   (0x00) */
+  xcoff_reloc_type_neg,	 /* R_NEG   (0x01) */
+  xcoff_reloc_type_rel,	 /* R_REL   (0x02) */
+  xcoff_reloc_type_toc,	 /* R_TOC   (0x03) */
+  xcoff_reloc_type_fail, /* R_RTB   (0x04) */
+  xcoff_reloc_type_toc,	 /* R_GL    (0x05) */
+  xcoff_reloc_type_toc,	 /* R_TCL   (0x06) */
+  xcoff_reloc_type_fail, /*	    (0x07) */
+  xcoff_reloc_type_ba,	 /* R_BA    (0x08) */
+  xcoff_reloc_type_fail, /*	    (0x09) */
+  xcoff_reloc_type_br,	 /* R_BR    (0x0a) */
+  xcoff_reloc_type_fail, /*	    (0x0b) */
+  xcoff_reloc_type_pos,	 /* R_RL    (0x0c) */
+  xcoff_reloc_type_pos,	 /* R_RLA   (0x0d) */
+  xcoff_reloc_type_fail, /*	    (0x0e) */
+  xcoff_reloc_type_noop, /* R_REF   (0x0f) */
+  xcoff_reloc_type_fail, /*	    (0x10) */
+  xcoff_reloc_type_fail, /*	    (0x11) */
+  xcoff_reloc_type_toc,	 /* R_TRL   (0x12) */
+  xcoff_reloc_type_toc,	 /* R_TRLA  (0x13) */
+  xcoff_reloc_type_fail, /* R_RRTBI (0x14) */
+  xcoff_reloc_type_fail, /* R_RRTBA (0x15) */
+  xcoff_reloc_type_ba,	 /* R_CAI   (0x16) */
+  xcoff_reloc_type_crel, /* R_CREL  (0x17) */
+  xcoff_reloc_type_ba,	 /* R_RBA   (0x18) */
+  xcoff_reloc_type_ba,	 /* R_RBAC  (0x19) */
+  xcoff_reloc_type_br,	 /* R_RBR   (0x1a) */
+  xcoff_reloc_type_ba,	 /* R_RBRC  (0x1b) */
+};
+
+bfd_boolean (*xcoff_complain_overflow[XCOFF_MAX_COMPLAIN_OVERFLOW])
+  (XCOFF_COMPLAIN_FUNCTION_ARGS) =
+{
+  xcoff_complain_overflow_dont_func,
+  xcoff_complain_overflow_bitfield_func,
+  xcoff_complain_overflow_signed_func,
+  xcoff_complain_overflow_unsigned_func,
+};
+
+/* Information about one member of an archive.  */
+struct member_layout {
+  /* The archive member that this structure describes.  */
+  bfd *member;
+
+  /* The number of bytes of padding that must be inserted before the
+     start of the member in order to ensure that the section contents
+     are correctly aligned.  */
+  unsigned int leading_padding;
+
+  /* The offset of MEMBER from the start of the archive (i.e. the end
+     of the leading padding).  */
+  file_ptr offset;
+
+  /* The normalized name of MEMBER.  */
+  const char *name;
+
+  /* The length of NAME, without padding.  */
+  bfd_size_type namlen;
+
+  /* The length of NAME, with padding.  */
+  bfd_size_type padded_namlen;
+
+  /* The size of MEMBER's header, including the name and magic sequence.  */
+  bfd_size_type header_size;
+
+  /* The size of the MEMBER's contents.  */
+  bfd_size_type contents_size;
+
+  /* The number of bytes of padding that must be inserted after MEMBER
+     in order to preserve even alignment.  */
+  bfd_size_type trailing_padding;
+};
+
+/* A structure used for iterating over the members of an archive.  */
+struct archive_iterator {
+  /* The archive itself.  */
+  bfd *archive;
+
+  /* Information about the current archive member.  */
+  struct member_layout current;
+
+  /* Information about the next archive member.  MEMBER is null if there
+     are no more archive members, in which case OFFSET is the offset of
+     the first unused byte.  */
+  struct member_layout next;
+};
+
+/* Initialize INFO so that it describes member MEMBER of archive ARCHIVE.
+   OFFSET is the even-padded offset of MEMBER, not including any leading
+   padding needed for section alignment.  */
+
+static void
+member_layout_init (struct member_layout *info, bfd *archive,
+		    bfd *member, file_ptr offset)
+{
+  info->member = member;
+  info->leading_padding = 0;
+  if (member)
+    {
+      info->name = normalize_filename (member);
+      info->namlen = strlen (info->name);
+      info->padded_namlen = info->namlen + (info->namlen & 1);
+      if (xcoff_big_format_p (archive))
+	info->header_size = SIZEOF_AR_HDR_BIG;
+      else
+	info->header_size = SIZEOF_AR_HDR;
+      info->header_size += info->padded_namlen + SXCOFFARFMAG;
+      info->contents_size = arelt_size (member);
+      info->trailing_padding = info->contents_size & 1;
+
+      if (bfd_check_format (member, bfd_object)
+	  && bfd_get_flavour (member) == bfd_target_xcoff_flavour
+	  && (member->flags & DYNAMIC) != 0)
+	info->leading_padding
+	  = (-(offset + info->header_size)
+	     & ((1 << bfd_xcoff_text_align_power (member)) - 1));
+    }
+  info->offset = offset + info->leading_padding;
+}
+
+/* Set up ITERATOR to iterate through archive ARCHIVE.  */
+
+static void
+archive_iterator_begin (struct archive_iterator *iterator,
+			bfd *archive)
+{
+  iterator->archive = archive;
+  member_layout_init (&iterator->next, archive, archive->archive_head,
+		      xcoff_big_format_p (archive)
+		      ? SIZEOF_AR_FILE_HDR_BIG
+		      : SIZEOF_AR_FILE_HDR);
+}
+
+/* Make ITERATOR visit the first unvisited archive member.  Return true
+   on success; return false if all members have been visited.  */
+
+static bfd_boolean
+archive_iterator_next (struct archive_iterator *iterator)
+{
+  if (!iterator->next.member)
+    return FALSE;
+
+  iterator->current = iterator->next;
+  member_layout_init (&iterator->next, iterator->archive,
+		      iterator->current.member->archive_next,
+		      iterator->current.offset
+		      + iterator->current.header_size
+		      + iterator->current.contents_size
+		      + iterator->current.trailing_padding);
+  return TRUE;
+}
+
+/* We use our own tdata type.  Its first field is the COFF tdata type,
+   so the COFF routines are compatible.  */
+
+bfd_boolean
+_bfd_xcoff_mkobject (bfd *abfd)
+{
+  coff_data_type *coff;
+  bfd_size_type amt = sizeof (struct xcoff_tdata);
+
+  abfd->tdata.xcoff_obj_data = (struct xcoff_tdata *) bfd_zalloc (abfd, amt);
+  if (abfd->tdata.xcoff_obj_data == NULL)
+    return FALSE;
+  coff = coff_data (abfd);
+  coff->symbols = (coff_symbol_type *) NULL;
+  coff->conversion_table = (unsigned int *) NULL;
+  coff->raw_syments = (struct coff_ptr_struct *) NULL;
+  coff->relocbase = 0;
+
+  xcoff_data (abfd)->modtype = ('1' << 8) | 'L';
+
+  /* We set cputype to -1 to indicate that it has not been
+     initialized.  */
+  xcoff_data (abfd)->cputype = -1;
+
+  xcoff_data (abfd)->csects = NULL;
+  xcoff_data (abfd)->debug_indices = NULL;
+
+  /* text section alignment is different than the default */
+  bfd_xcoff_text_align_power (abfd) = 2;
+
+  return TRUE;
+}
+
+/* Copy XCOFF data from one BFD to another.  */
+
+bfd_boolean
+_bfd_xcoff_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  struct xcoff_tdata *ix, *ox;
+  asection *sec;
+
+  if (ibfd->xvec != obfd->xvec)
+    return TRUE;
+  ix = xcoff_data (ibfd);
+  ox = xcoff_data (obfd);
+  ox->full_aouthdr = ix->full_aouthdr;
+  ox->toc = ix->toc;
+  if (ix->sntoc == 0)
+    ox->sntoc = 0;
+  else
+    {
+      sec = coff_section_from_bfd_index (ibfd, ix->sntoc);
+      if (sec == NULL)
+	ox->sntoc = 0;
+      else
+	ox->sntoc = sec->output_section->target_index;
+    }
+  if (ix->snentry == 0)
+    ox->snentry = 0;
+  else
+    {
+      sec = coff_section_from_bfd_index (ibfd, ix->snentry);
+      if (sec == NULL)
+	ox->snentry = 0;
+      else
+	ox->snentry = sec->output_section->target_index;
+    }
+  bfd_xcoff_text_align_power (obfd) = bfd_xcoff_text_align_power (ibfd);
+  bfd_xcoff_data_align_power (obfd) = bfd_xcoff_data_align_power (ibfd);
+  ox->modtype = ix->modtype;
+  ox->cputype = ix->cputype;
+  ox->maxdata = ix->maxdata;
+  ox->maxstack = ix->maxstack;
+  return TRUE;
+}
+
+/* I don't think XCOFF really has a notion of local labels based on
+   name.  This will mean that ld -X doesn't actually strip anything.
+   The AIX native linker does not have a -X option, and it ignores the
+   -x option.  */
+
+bfd_boolean
+_bfd_xcoff_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED,
+                                const char *name ATTRIBUTE_UNUSED)
+{
+  return FALSE;
+}
+
+void
+_bfd_xcoff_swap_sym_in (bfd *abfd, PTR ext1, PTR in1)
+{
+  SYMENT *ext = (SYMENT *)ext1;
+  struct internal_syment * in = (struct internal_syment *)in1;
+
+  if (ext->e.e_name[0] != 0)
+    {
+      memcpy (in->_n._n_name, ext->e.e_name, SYMNMLEN);
+    }
+  else
+    {
+      in->_n._n_n._n_zeroes = 0;
+      in->_n._n_n._n_offset = H_GET_32 (abfd, ext->e.e.e_offset);
+    }
+
+  in->n_value = H_GET_32 (abfd, ext->e_value);
+  in->n_scnum = H_GET_16 (abfd, ext->e_scnum);
+  in->n_type = H_GET_16 (abfd, ext->e_type);
+  in->n_sclass = H_GET_8 (abfd, ext->e_sclass);
+  in->n_numaux = H_GET_8 (abfd, ext->e_numaux);
+}
+
+unsigned int
+_bfd_xcoff_swap_sym_out (bfd *abfd, PTR inp, PTR extp)
+{
+  struct internal_syment *in = (struct internal_syment *)inp;
+  SYMENT *ext =(SYMENT *)extp;
+
+  if (in->_n._n_name[0] != 0)
+    {
+      memcpy (ext->e.e_name, in->_n._n_name, SYMNMLEN);
+    }
+  else
+    {
+      H_PUT_32 (abfd, 0, ext->e.e.e_zeroes);
+      H_PUT_32 (abfd, in->_n._n_n._n_offset, ext->e.e.e_offset);
+    }
+
+  H_PUT_32 (abfd, in->n_value, ext->e_value);
+  H_PUT_16 (abfd, in->n_scnum, ext->e_scnum);
+  H_PUT_16 (abfd, in->n_type, ext->e_type);
+  H_PUT_8 (abfd, in->n_sclass, ext->e_sclass);
+  H_PUT_8 (abfd, in->n_numaux, ext->e_numaux);
+  return bfd_coff_symesz (abfd);
+}
+
+void
+_bfd_xcoff_swap_aux_in (bfd *abfd, PTR ext1, int type, int in_class,
+                        int indx, int numaux, PTR in1)
+{
+  AUXENT * ext = (AUXENT *)ext1;
+  union internal_auxent *in = (union internal_auxent *)in1;
+
+  switch (in_class)
+    {
+    case C_FILE:
+      if (ext->x_file.x_n.x_fname[0] == 0)
+	{
+	  in->x_file.x_n.x_zeroes = 0;
+	  in->x_file.x_n.x_offset =
+	    H_GET_32 (abfd, ext->x_file.x_n.x_n.x_offset);
+	}
+      else
+	{
+	  if (numaux > 1)
+	    {
+	      if (indx == 0)
+		memcpy (in->x_file.x_fname, ext->x_file.x_n.x_fname,
+			numaux * sizeof (AUXENT));
+	    }
+	  else
+	    {
+	      memcpy (in->x_file.x_fname, ext->x_file.x_n.x_fname, FILNMLEN);
+	    }
+	}
+      goto end;
+
+      /* RS/6000 "csect" auxents */
+    case C_EXT:
+    case C_AIX_WEAKEXT:
+    case C_HIDEXT:
+      if (indx + 1 == numaux)
+	{
+	  in->x_csect.x_scnlen.l = H_GET_32 (abfd, ext->x_csect.x_scnlen);
+	  in->x_csect.x_parmhash = H_GET_32 (abfd, ext->x_csect.x_parmhash);
+	  in->x_csect.x_snhash   = H_GET_16 (abfd, ext->x_csect.x_snhash);
+	  /* We don't have to hack bitfields in x_smtyp because it's
+	     defined by shifts-and-ands, which are equivalent on all
+	     byte orders.  */
+	  in->x_csect.x_smtyp    = H_GET_8 (abfd, ext->x_csect.x_smtyp);
+	  in->x_csect.x_smclas   = H_GET_8 (abfd, ext->x_csect.x_smclas);
+	  in->x_csect.x_stab     = H_GET_32 (abfd, ext->x_csect.x_stab);
+	  in->x_csect.x_snstab   = H_GET_16 (abfd, ext->x_csect.x_snstab);
+	  goto end;
+	}
+      break;
+
+    case C_STAT:
+    case C_LEAFSTAT:
+    case C_HIDDEN:
+      if (type == T_NULL)
+	{
+	  in->x_scn.x_scnlen = H_GET_32 (abfd, ext->x_scn.x_scnlen);
+	  in->x_scn.x_nreloc = H_GET_16 (abfd, ext->x_scn.x_nreloc);
+	  in->x_scn.x_nlinno = H_GET_16 (abfd, ext->x_scn.x_nlinno);
+	  /* PE defines some extra fields; we zero them out for
+	     safety.  */
+	  in->x_scn.x_checksum = 0;
+	  in->x_scn.x_associated = 0;
+	  in->x_scn.x_comdat = 0;
+
+	  goto end;
+	}
+      break;
+    }
+
+  in->x_sym.x_tagndx.l = H_GET_32 (abfd, ext->x_sym.x_tagndx);
+  in->x_sym.x_tvndx = H_GET_16 (abfd, ext->x_sym.x_tvndx);
+
+  if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
+      || ISTAG (in_class))
+    {
+      in->x_sym.x_fcnary.x_fcn.x_lnnoptr =
+	H_GET_32 (abfd, ext->x_sym.x_fcnary.x_fcn.x_lnnoptr);
+      in->x_sym.x_fcnary.x_fcn.x_endndx.l =
+	H_GET_32 (abfd, ext->x_sym.x_fcnary.x_fcn.x_endndx);
+    }
+  else
+    {
+      in->x_sym.x_fcnary.x_ary.x_dimen[0] =
+	H_GET_16 (abfd, ext->x_sym.x_fcnary.x_ary.x_dimen[0]);
+      in->x_sym.x_fcnary.x_ary.x_dimen[1] =
+	H_GET_16 (abfd, ext->x_sym.x_fcnary.x_ary.x_dimen[1]);
+      in->x_sym.x_fcnary.x_ary.x_dimen[2] =
+	H_GET_16 (abfd, ext->x_sym.x_fcnary.x_ary.x_dimen[2]);
+      in->x_sym.x_fcnary.x_ary.x_dimen[3] =
+	H_GET_16 (abfd, ext->x_sym.x_fcnary.x_ary.x_dimen[3]);
+    }
+
+  if (ISFCN (type))
+    {
+      in->x_sym.x_misc.x_fsize = H_GET_32 (abfd, ext->x_sym.x_misc.x_fsize);
+    }
+  else
+    {
+      in->x_sym.x_misc.x_lnsz.x_lnno =
+	H_GET_16 (abfd, ext->x_sym.x_misc.x_lnsz.x_lnno);
+      in->x_sym.x_misc.x_lnsz.x_size =
+	H_GET_16 (abfd, ext->x_sym.x_misc.x_lnsz.x_size);
+    }
+
+ end: ;
+  /* The semicolon is because MSVC doesn't like labels at
+     end of block.  */
+}
+
+unsigned int
+_bfd_xcoff_swap_aux_out (bfd *abfd, PTR inp, int type, int in_class,
+                         int indx ATTRIBUTE_UNUSED,
+                         int numaux ATTRIBUTE_UNUSED,
+                         PTR extp)
+{
+  union internal_auxent *in = (union internal_auxent *)inp;
+  AUXENT *ext = (AUXENT *)extp;
+
+  memset ((PTR)ext, 0, bfd_coff_auxesz (abfd));
+  switch (in_class)
+    {
+    case C_FILE:
+      if (in->x_file.x_fname[0] == 0)
+	{
+	  H_PUT_32 (abfd, 0, ext->x_file.x_n.x_n.x_zeroes);
+	  H_PUT_32 (abfd, in->x_file.x_n.x_offset,
+                    ext->x_file.x_n.x_n.x_offset);
+	}
+      else
+	{
+	  memcpy (ext->x_file.x_n.x_fname, in->x_file.x_fname, FILNMLEN);
+	}
+      goto end;
+
+      /* RS/6000 "csect" auxents */
+    case C_EXT:
+    case C_AIX_WEAKEXT:
+    case C_HIDEXT:
+      if (indx + 1 == numaux)
+	{
+	  H_PUT_32 (abfd, in->x_csect.x_scnlen.l, ext->x_csect.x_scnlen);
+	  H_PUT_32 (abfd, in->x_csect.x_parmhash, ext->x_csect.x_parmhash);
+	  H_PUT_16 (abfd, in->x_csect.x_snhash, ext->x_csect.x_snhash);
+	  /* We don't have to hack bitfields in x_smtyp because it's
+	     defined by shifts-and-ands, which are equivalent on all
+	     byte orders.  */
+	  H_PUT_8 (abfd, in->x_csect.x_smtyp, ext->x_csect.x_smtyp);
+	  H_PUT_8 (abfd, in->x_csect.x_smclas, ext->x_csect.x_smclas);
+	  H_PUT_32 (abfd, in->x_csect.x_stab, ext->x_csect.x_stab);
+	  H_PUT_16 (abfd, in->x_csect.x_snstab, ext->x_csect.x_snstab);
+	  goto end;
+	}
+      break;
+
+    case C_STAT:
+    case C_LEAFSTAT:
+    case C_HIDDEN:
+      if (type == T_NULL)
+	{
+	  H_PUT_32 (abfd, in->x_scn.x_scnlen, ext->x_scn.x_scnlen);
+	  H_PUT_16 (abfd, in->x_scn.x_nreloc, ext->x_scn.x_nreloc);
+	  H_PUT_16 (abfd, in->x_scn.x_nlinno, ext->x_scn.x_nlinno);
+	  goto end;
+	}
+      break;
+    }
+
+  H_PUT_32 (abfd, in->x_sym.x_tagndx.l, ext->x_sym.x_tagndx);
+  H_PUT_16 (abfd, in->x_sym.x_tvndx, ext->x_sym.x_tvndx);
+
+  if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
+      || ISTAG (in_class))
+    {
+      H_PUT_32 (abfd, in->x_sym.x_fcnary.x_fcn.x_lnnoptr,
+		ext->x_sym.x_fcnary.x_fcn.x_lnnoptr);
+      H_PUT_32 (abfd, in->x_sym.x_fcnary.x_fcn.x_endndx.l,
+		ext->x_sym.x_fcnary.x_fcn.x_endndx);
+    }
+  else
+    {
+      H_PUT_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[0],
+		ext->x_sym.x_fcnary.x_ary.x_dimen[0]);
+      H_PUT_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[1],
+		ext->x_sym.x_fcnary.x_ary.x_dimen[1]);
+      H_PUT_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[2],
+		ext->x_sym.x_fcnary.x_ary.x_dimen[2]);
+      H_PUT_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[3],
+		ext->x_sym.x_fcnary.x_ary.x_dimen[3]);
+    }
+
+  if (ISFCN (type))
+    H_PUT_32 (abfd, in->x_sym.x_misc.x_fsize, ext->x_sym.x_misc.x_fsize);
+  else
+    {
+      H_PUT_16 (abfd, in->x_sym.x_misc.x_lnsz.x_lnno,
+		ext->x_sym.x_misc.x_lnsz.x_lnno);
+      H_PUT_16 (abfd, in->x_sym.x_misc.x_lnsz.x_size,
+		ext->x_sym.x_misc.x_lnsz.x_size);
+    }
+
+end:
+  return bfd_coff_auxesz (abfd);
+}
+
+
+
+/* The XCOFF reloc table.  Actually, XCOFF relocations specify the
+   bitsize and whether they are signed or not, along with a
+   conventional type.  This table is for the types, which are used for
+   different algorithms for putting in the reloc.  Many of these
+   relocs need special_function entries, which I have not written.  */
+
+
+reloc_howto_type xcoff_howto_table[] =
+{
+  /* Standard 32 bit relocation.  */
+  HOWTO (R_POS,			/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_POS",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit relocation, but store negative value.  */
+  HOWTO (R_NEG,			/* type */
+	 0,			/* rightshift */
+	 -2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_NEG",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit PC relative relocation.  */
+  HOWTO (R_REL,			/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_REL",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit TOC relative relocation.  */
+  HOWTO (R_TOC,			/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_TOC",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* I don't really know what this is.  */
+  HOWTO (R_RTB,			/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RTB",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* External TOC relative symbol.  */
+  HOWTO (R_GL,			/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_GL",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Local TOC relative symbol.	 */
+  HOWTO (R_TCL,			/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_TCL",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (7),
+
+  /* Non modifiable absolute branch.  */
+  HOWTO (R_BA,			/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_BA_26",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x03fffffc,		/* src_mask */
+	 0x03fffffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (9),
+
+  /* Non modifiable relative branch.  */
+  HOWTO (R_BR,			/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_BR",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x03fffffc,		/* src_mask */
+	 0x03fffffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (0xb),
+
+  /* Indirect load.  */
+  HOWTO (R_RL,			/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RL",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Load address.  */
+  HOWTO (R_RLA,			/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RLA",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (0xe),
+
+  /* Non-relocating reference.  Bitsize is 1 so that r_rsize is 0.  */
+  HOWTO (R_REF,			/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 1,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_REF",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (0x10),
+  EMPTY_HOWTO (0x11),
+
+  /* TOC relative indirect load.  */
+  HOWTO (R_TRL,			/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_TRL",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TOC relative load address.  */
+  HOWTO (R_TRLA,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_TRLA",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Modifiable relative branch.  */
+  HOWTO (R_RRTBI,		 /* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RRTBI",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Modifiable absolute branch.  */
+  HOWTO (R_RRTBA,		 /* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RRTBA",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Modifiable call absolute indirect.  */
+  HOWTO (R_CAI,			/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_CAI",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Modifiable call relative.  */
+  HOWTO (R_CREL,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_CREL",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Modifiable branch absolute.  */
+  HOWTO (R_RBA,			/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RBA",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x03fffffc,		/* src_mask */
+	 0x03fffffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Modifiable branch absolute.  */
+  HOWTO (R_RBAC,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RBAC",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Modifiable branch relative.  */
+  HOWTO (R_RBR,			/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RBR_26",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x03fffffc,		/* src_mask */
+	 0x03fffffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Modifiable branch absolute.  */
+  HOWTO (R_RBRC,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RBRC",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit Non modifiable absolute branch.  */
+  HOWTO (R_BA,			/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_BA_16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xfffc,		/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Modifiable branch relative.  */
+  HOWTO (R_RBR,			/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RBR_16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Modifiable branch relative.  */
+  HOWTO (R_RBA,			/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RBA_16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+};
+
+void
+xcoff_rtype2howto (arelent *relent, struct internal_reloc *internal)
+{
+  if (internal->r_type > R_RBRC)
+    abort ();
+
+  /* Default howto layout works most of the time */
+  relent->howto = &xcoff_howto_table[internal->r_type];
+
+  /* Special case some 16 bit reloc */
+  if (15 == (internal->r_size & 0x1f))
+    {
+      if (R_BA == internal->r_type)
+	relent->howto = &xcoff_howto_table[0x1c];
+      else if (R_RBR == internal->r_type)
+	relent->howto = &xcoff_howto_table[0x1d];
+      else if (R_RBA == internal->r_type)
+	relent->howto = &xcoff_howto_table[0x1e];
+    }
+
+  /* The r_size field of an XCOFF reloc encodes the bitsize of the
+     relocation, as well as indicating whether it is signed or not.
+     Doublecheck that the relocation information gathered from the
+     type matches this information.  The bitsize is not significant
+     for R_REF relocs.  */
+  if (relent->howto->dst_mask != 0
+      && (relent->howto->bitsize
+	  != ((unsigned int) internal->r_size & 0x1f) + 1))
+    abort ();
+}
+
+reloc_howto_type *
+_bfd_xcoff_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                              bfd_reloc_code_real_type code)
+{
+  switch (code)
+    {
+    case BFD_RELOC_PPC_B26:
+      return &xcoff_howto_table[0xa];
+    case BFD_RELOC_PPC_BA16:
+      return &xcoff_howto_table[0x1c];
+    case BFD_RELOC_PPC_BA26:
+      return &xcoff_howto_table[8];
+    case BFD_RELOC_PPC_TOC16:
+      return &xcoff_howto_table[3];
+    case BFD_RELOC_32:
+    case BFD_RELOC_CTOR:
+      return &xcoff_howto_table[0];
+    case BFD_RELOC_NONE:
+      return &xcoff_howto_table[0xf];
+    default:
+      return NULL;
+    }
+}
+
+static reloc_howto_type *
+_bfd_xcoff_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			      const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (xcoff_howto_table) / sizeof (xcoff_howto_table[0]);
+       i++)
+    if (xcoff_howto_table[i].name != NULL
+	&& strcasecmp (xcoff_howto_table[i].name, r_name) == 0)
+      return &xcoff_howto_table[i];
+
+  return NULL;
+}
+
+/* XCOFF archive support.  The original version of this code was by
+   Damon A. Permezel.  It was enhanced to permit cross support, and
+   writing archive files, by Ian Lance Taylor, Cygnus Support.
+
+   XCOFF uses its own archive format.  Everything is hooked together
+   with file offset links, so it is possible to rapidly update an
+   archive in place.  Of course, we don't do that.  An XCOFF archive
+   has a real file header, not just an ARMAG string.  The structure of
+   the file header and of each archive header appear below.
+
+   An XCOFF archive also has a member table, which is a list of
+   elements in the archive (you can get that by looking through the
+   linked list, but you have to read a lot more of the file).  The
+   member table has a normal archive header with an empty name.  It is
+   normally (and perhaps must be) the second to last entry in the
+   archive.  The member table data is almost printable ASCII.  It
+   starts with a 12 character decimal string which is the number of
+   entries in the table.  For each entry it has a 12 character decimal
+   string which is the offset in the archive of that member.  These
+   entries are followed by a series of null terminated strings which
+   are the member names for each entry.
+
+   Finally, an XCOFF archive has a global symbol table, which is what
+   we call the armap.  The global symbol table has a normal archive
+   header with an empty name.  It is normally (and perhaps must be)
+   the last entry in the archive.  The contents start with a four byte
+   binary number which is the number of entries.  This is followed by
+   a that many four byte binary numbers; each is the file offset of an
+   entry in the archive.  These numbers are followed by a series of
+   null terminated strings, which are symbol names.
+
+   AIX 4.3 introduced a new archive format which can handle larger
+   files and also 32- and 64-bit objects in the same archive.  The
+   things said above remain true except that there is now more than
+   one global symbol table.  The one is used to index 32-bit objects,
+   the other for 64-bit objects.
+
+   The new archives (recognizable by the new ARMAG string) has larger
+   field lengths so that we cannot really share any code.  Also we have
+   to take care that we are not generating the new form of archives
+   on AIX 4.2 or earlier systems.  */
+
+/* XCOFF archives use this as a magic string.  Note that both strings
+   have the same length.  */
+
+/* Set the magic for archive.  */
+
+bfd_boolean
+bfd_xcoff_ar_archive_set_magic (bfd *abfd ATTRIBUTE_UNUSED,
+                                char *magic ATTRIBUTE_UNUSED)
+{
+  /* Not supported yet.  */
+  return FALSE;
+ /* bfd_xcoff_archive_set_magic (abfd, magic); */
+}
+
+/* Read in the armap of an XCOFF archive.  */
+
+bfd_boolean
+_bfd_xcoff_slurp_armap (bfd *abfd)
+{
+  file_ptr off;
+  size_t namlen;
+  bfd_size_type sz;
+  bfd_byte *contents, *cend;
+  bfd_vma c, i;
+  carsym *arsym;
+  bfd_byte *p;
+
+  if (xcoff_ardata (abfd) == NULL)
+    {
+      bfd_has_map (abfd) = FALSE;
+      return TRUE;
+    }
+
+  if (! xcoff_big_format_p (abfd))
+    {
+      /* This is for the old format.  */
+      struct xcoff_ar_hdr hdr;
+
+      off = strtol (xcoff_ardata (abfd)->symoff, (char **) NULL, 10);
+      if (off == 0)
+	{
+	  bfd_has_map (abfd) = FALSE;
+	  return TRUE;
+	}
+
+      if (bfd_seek (abfd, off, SEEK_SET) != 0)
+	return FALSE;
+
+      /* The symbol table starts with a normal archive header.  */
+      if (bfd_bread ((PTR) &hdr, (bfd_size_type) SIZEOF_AR_HDR, abfd)
+	  != SIZEOF_AR_HDR)
+	return FALSE;
+
+      /* Skip the name (normally empty).  */
+      namlen = strtol (hdr.namlen, (char **) NULL, 10);
+      off = ((namlen + 1) & ~ (size_t) 1) + SXCOFFARFMAG;
+      if (bfd_seek (abfd, off, SEEK_CUR) != 0)
+	return FALSE;
+
+      sz = strtol (hdr.size, (char **) NULL, 10);
+
+      /* Read in the entire symbol table.  */
+      contents = (bfd_byte *) bfd_alloc (abfd, sz);
+      if (contents == NULL)
+	return FALSE;
+      if (bfd_bread ((PTR) contents, sz, abfd) != sz)
+	return FALSE;
+
+      /* The symbol table starts with a four byte count.  */
+      c = H_GET_32 (abfd, contents);
+
+      if (c * 4 >= sz)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      bfd_ardata (abfd)->symdefs =
+	((carsym *) bfd_alloc (abfd, c * sizeof (carsym)));
+      if (bfd_ardata (abfd)->symdefs == NULL)
+	return FALSE;
+
+      /* After the count comes a list of four byte file offsets.  */
+      for (i = 0, arsym = bfd_ardata (abfd)->symdefs, p = contents + 4;
+	   i < c;
+	   ++i, ++arsym, p += 4)
+	arsym->file_offset = H_GET_32 (abfd, p);
+    }
+  else
+    {
+      /* This is for the new format.  */
+      struct xcoff_ar_hdr_big hdr;
+
+      off = strtol (xcoff_ardata_big (abfd)->symoff, (char **) NULL, 10);
+      if (off == 0)
+	{
+	  bfd_has_map (abfd) = FALSE;
+	  return TRUE;
+	}
+
+      if (bfd_seek (abfd, off, SEEK_SET) != 0)
+	return FALSE;
+
+      /* The symbol table starts with a normal archive header.  */
+      if (bfd_bread ((PTR) &hdr, (bfd_size_type) SIZEOF_AR_HDR_BIG, abfd)
+	  != SIZEOF_AR_HDR_BIG)
+	return FALSE;
+
+      /* Skip the name (normally empty).  */
+      namlen = strtol (hdr.namlen, (char **) NULL, 10);
+      off = ((namlen + 1) & ~ (size_t) 1) + SXCOFFARFMAG;
+      if (bfd_seek (abfd, off, SEEK_CUR) != 0)
+	return FALSE;
+
+      /* XXX This actually has to be a call to strtoll (at least on 32-bit
+	 machines) since the field width is 20 and there numbers with more
+	 than 32 bits can be represented.  */
+      sz = strtol (hdr.size, (char **) NULL, 10);
+
+      /* Read in the entire symbol table.  */
+      contents = (bfd_byte *) bfd_alloc (abfd, sz);
+      if (contents == NULL)
+	return FALSE;
+      if (bfd_bread ((PTR) contents, sz, abfd) != sz)
+	return FALSE;
+
+      /* The symbol table starts with an eight byte count.  */
+      c = H_GET_64 (abfd, contents);
+
+      if (c * 8 >= sz)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      bfd_ardata (abfd)->symdefs =
+	((carsym *) bfd_alloc (abfd, c * sizeof (carsym)));
+      if (bfd_ardata (abfd)->symdefs == NULL)
+	return FALSE;
+
+      /* After the count comes a list of eight byte file offsets.  */
+      for (i = 0, arsym = bfd_ardata (abfd)->symdefs, p = contents + 8;
+	   i < c;
+	   ++i, ++arsym, p += 8)
+	arsym->file_offset = H_GET_64 (abfd, p);
+    }
+
+  /* After the file offsets come null terminated symbol names.  */
+  cend = contents + sz;
+  for (i = 0, arsym = bfd_ardata (abfd)->symdefs;
+       i < c;
+       ++i, ++arsym, p += strlen ((char *) p) + 1)
+    {
+      if (p >= cend)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+      arsym->name = (char *) p;
+    }
+
+  bfd_ardata (abfd)->symdef_count = c;
+  bfd_has_map (abfd) = TRUE;
+
+  return TRUE;
+}
+
+/* See if this is an XCOFF archive.  */
+
+const bfd_target *
+_bfd_xcoff_archive_p (bfd *abfd)
+{
+  struct artdata *tdata_hold;
+  char magic[SXCOFFARMAG];
+  bfd_size_type amt = SXCOFFARMAG;
+
+  if (bfd_bread ((PTR) magic, amt, abfd) != amt)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  if (strncmp (magic, XCOFFARMAG, SXCOFFARMAG) != 0
+      && strncmp (magic, XCOFFARMAGBIG, SXCOFFARMAG) != 0)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  tdata_hold = bfd_ardata (abfd);
+
+  amt = sizeof (struct artdata);
+  bfd_ardata (abfd) = (struct artdata *) bfd_zalloc (abfd, amt);
+  if (bfd_ardata (abfd) == (struct artdata *) NULL)
+    goto error_ret_restore;
+
+  /* Cleared by bfd_zalloc above.
+     bfd_ardata (abfd)->cache = NULL;
+     bfd_ardata (abfd)->archive_head = NULL;
+     bfd_ardata (abfd)->symdefs = NULL;
+     bfd_ardata (abfd)->extended_names = NULL;
+     bfd_ardata (abfd)->extended_names_size = 0;  */
+
+  /* Now handle the two formats.  */
+  if (magic[1] != 'b')
+    {
+      /* This is the old format.  */
+      struct xcoff_ar_file_hdr hdr;
+
+      /* Copy over the magic string.  */
+      memcpy (hdr.magic, magic, SXCOFFARMAG);
+
+      /* Now read the rest of the file header.  */
+      amt = SIZEOF_AR_FILE_HDR - SXCOFFARMAG;
+      if (bfd_bread ((PTR) &hdr.memoff, amt, abfd) != amt)
+	{
+	  if (bfd_get_error () != bfd_error_system_call)
+	    bfd_set_error (bfd_error_wrong_format);
+	  goto error_ret;
+	}
+
+      bfd_ardata (abfd)->first_file_filepos = strtol (hdr.firstmemoff,
+						      (char **) NULL, 10);
+
+      amt = SIZEOF_AR_FILE_HDR;
+      bfd_ardata (abfd)->tdata = bfd_zalloc (abfd, amt);
+      if (bfd_ardata (abfd)->tdata == NULL)
+	goto error_ret;
+
+      memcpy (bfd_ardata (abfd)->tdata, &hdr, SIZEOF_AR_FILE_HDR);
+    }
+  else
+    {
+      /* This is the new format.  */
+      struct xcoff_ar_file_hdr_big hdr;
+
+      /* Copy over the magic string.  */
+      memcpy (hdr.magic, magic, SXCOFFARMAG);
+
+      /* Now read the rest of the file header.  */
+      amt = SIZEOF_AR_FILE_HDR_BIG - SXCOFFARMAG;
+      if (bfd_bread ((PTR) &hdr.memoff, amt, abfd) != amt)
+	{
+	  if (bfd_get_error () != bfd_error_system_call)
+	    bfd_set_error (bfd_error_wrong_format);
+	  goto error_ret;
+	}
+
+      bfd_ardata (abfd)->first_file_filepos = bfd_scan_vma (hdr.firstmemoff,
+							    (const char **) 0,
+							    10);
+
+      amt = SIZEOF_AR_FILE_HDR_BIG;
+      bfd_ardata (abfd)->tdata = bfd_zalloc (abfd, amt);
+      if (bfd_ardata (abfd)->tdata == NULL)
+	goto error_ret;
+
+      memcpy (bfd_ardata (abfd)->tdata, &hdr, SIZEOF_AR_FILE_HDR_BIG);
+    }
+
+  if (! _bfd_xcoff_slurp_armap (abfd))
+    {
+    error_ret:
+      bfd_release (abfd, bfd_ardata (abfd));
+    error_ret_restore:
+      bfd_ardata (abfd) = tdata_hold;
+      return NULL;
+    }
+
+  return abfd->xvec;
+}
+
+/* Read the archive header in an XCOFF archive.  */
+
+PTR
+_bfd_xcoff_read_ar_hdr (bfd *abfd)
+{
+  bfd_size_type namlen;
+  struct areltdata *ret;
+  bfd_size_type amt = sizeof (struct areltdata);
+
+  ret = (struct areltdata *) bfd_alloc (abfd, amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (! xcoff_big_format_p (abfd))
+    {
+      struct xcoff_ar_hdr hdr;
+      struct xcoff_ar_hdr *hdrp;
+
+      if (bfd_bread ((PTR) &hdr, (bfd_size_type) SIZEOF_AR_HDR, abfd)
+	  != SIZEOF_AR_HDR)
+	{
+	  free (ret);
+	  return NULL;
+	}
+
+      namlen = strtol (hdr.namlen, (char **) NULL, 10);
+      amt = SIZEOF_AR_HDR + namlen + 1;
+      hdrp = (struct xcoff_ar_hdr *) bfd_alloc (abfd, amt);
+      if (hdrp == NULL)
+	{
+	  free (ret);
+	  return NULL;
+	}
+      memcpy (hdrp, &hdr, SIZEOF_AR_HDR);
+      if (bfd_bread ((char *) hdrp + SIZEOF_AR_HDR, namlen, abfd) != namlen)
+	{
+	  free (ret);
+	  return NULL;
+	}
+      ((char *) hdrp)[SIZEOF_AR_HDR + namlen] = '\0';
+
+      ret->arch_header = (char *) hdrp;
+      ret->parsed_size = strtol (hdr.size, (char **) NULL, 10);
+      ret->filename = (char *) hdrp + SIZEOF_AR_HDR;
+    }
+  else
+    {
+      struct xcoff_ar_hdr_big hdr;
+      struct xcoff_ar_hdr_big *hdrp;
+
+      if (bfd_bread ((PTR) &hdr, (bfd_size_type) SIZEOF_AR_HDR_BIG, abfd)
+	  != SIZEOF_AR_HDR_BIG)
+	{
+	  free (ret);
+	  return NULL;
+	}
+
+      namlen = strtol (hdr.namlen, (char **) NULL, 10);
+      amt = SIZEOF_AR_HDR_BIG + namlen + 1;
+      hdrp = (struct xcoff_ar_hdr_big *) bfd_alloc (abfd, amt);
+      if (hdrp == NULL)
+	{
+	  free (ret);
+	  return NULL;
+	}
+      memcpy (hdrp, &hdr, SIZEOF_AR_HDR_BIG);
+      if (bfd_bread ((char *) hdrp + SIZEOF_AR_HDR_BIG, namlen, abfd) != namlen)
+	{
+	  free (ret);
+	  return NULL;
+	}
+      ((char *) hdrp)[SIZEOF_AR_HDR_BIG + namlen] = '\0';
+
+      ret->arch_header = (char *) hdrp;
+      /* XXX This actually has to be a call to strtoll (at least on 32-bit
+	 machines) since the field width is 20 and there numbers with more
+	 than 32 bits can be represented.  */
+      ret->parsed_size = strtol (hdr.size, (char **) NULL, 10);
+      ret->filename = (char *) hdrp + SIZEOF_AR_HDR_BIG;
+    }
+
+  /* Skip over the XCOFFARFMAG at the end of the file name.  */
+  if (bfd_seek (abfd, (file_ptr) ((namlen & 1) + SXCOFFARFMAG), SEEK_CUR) != 0)
+    return NULL;
+
+  return (PTR) ret;
+}
+
+/* Open the next element in an XCOFF archive.  */
+
+bfd *
+_bfd_xcoff_openr_next_archived_file (bfd *archive, bfd *last_file)
+{
+  file_ptr filestart;
+
+  if (xcoff_ardata (archive) == NULL)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return NULL;
+    }
+
+  if (! xcoff_big_format_p (archive))
+    {
+      if (last_file == NULL)
+	filestart = bfd_ardata (archive)->first_file_filepos;
+      else
+	filestart = strtol (arch_xhdr (last_file)->nextoff, (char **) NULL,
+			    10);
+
+      if (filestart == 0
+	  || filestart == strtol (xcoff_ardata (archive)->memoff,
+				  (char **) NULL, 10)
+	  || filestart == strtol (xcoff_ardata (archive)->symoff,
+				  (char **) NULL, 10))
+	{
+	  bfd_set_error (bfd_error_no_more_archived_files);
+	  return NULL;
+	}
+    }
+  else
+    {
+      if (last_file == NULL)
+	filestart = bfd_ardata (archive)->first_file_filepos;
+      else
+	/* XXX These actually have to be a calls to strtoll (at least
+	   on 32-bit machines) since the fields's width is 20 and
+	   there numbers with more than 32 bits can be represented.  */
+	filestart = strtol (arch_xhdr_big (last_file)->nextoff, (char **) NULL,
+			    10);
+
+      /* XXX These actually have to be calls to strtoll (at least on 32-bit
+	 machines) since the fields's width is 20 and there numbers with more
+	 than 32 bits can be represented.  */
+      if (filestart == 0
+	  || filestart == strtol (xcoff_ardata_big (archive)->memoff,
+				  (char **) NULL, 10)
+	  || filestart == strtol (xcoff_ardata_big (archive)->symoff,
+				  (char **) NULL, 10))
+	{
+	  bfd_set_error (bfd_error_no_more_archived_files);
+	  return NULL;
+	}
+    }
+
+  return _bfd_get_elt_at_filepos (archive, filestart);
+}
+
+/* Stat an element in an XCOFF archive.  */
+
+int
+_bfd_xcoff_stat_arch_elt (bfd *abfd, struct stat *s)
+{
+  if (abfd->arelt_data == NULL)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return -1;
+    }
+
+  if (! xcoff_big_format_p (abfd->my_archive))
+    {
+      struct xcoff_ar_hdr *hdrp = arch_xhdr (abfd);
+
+      s->st_mtime = strtol (hdrp->date, (char **) NULL, 10);
+      s->st_uid = strtol (hdrp->uid, (char **) NULL, 10);
+      s->st_gid = strtol (hdrp->gid, (char **) NULL, 10);
+      s->st_mode = strtol (hdrp->mode, (char **) NULL, 8);
+      s->st_size = arch_eltdata (abfd)->parsed_size;
+    }
+  else
+    {
+      struct xcoff_ar_hdr_big *hdrp = arch_xhdr_big (abfd);
+
+      s->st_mtime = strtol (hdrp->date, (char **) NULL, 10);
+      s->st_uid = strtol (hdrp->uid, (char **) NULL, 10);
+      s->st_gid = strtol (hdrp->gid, (char **) NULL, 10);
+      s->st_mode = strtol (hdrp->mode, (char **) NULL, 8);
+      s->st_size = arch_eltdata (abfd)->parsed_size;
+    }
+
+  return 0;
+}
+
+/* Normalize a file name for inclusion in an archive.  */
+
+static const char *
+normalize_filename (bfd *abfd)
+{
+  const char *file;
+  const char *filename;
+
+  file = bfd_get_filename (abfd);
+  filename = strrchr (file, '/');
+  if (filename != NULL)
+    filename++;
+  else
+    filename = file;
+  return filename;
+}
+
+/* Write out an XCOFF armap.  */
+
+static bfd_boolean
+xcoff_write_armap_old (bfd *abfd, unsigned int elength ATTRIBUTE_UNUSED,
+                       struct orl *map, unsigned int orl_count, int stridx)
+{
+  struct archive_iterator iterator;
+  struct xcoff_ar_hdr hdr;
+  char *p;
+  unsigned char buf[4];
+  unsigned int i;
+
+  memset (&hdr, 0, sizeof hdr);
+  sprintf (hdr.size, "%ld", (long) (4 + orl_count * 4 + stridx));
+  sprintf (hdr.nextoff, "%d", 0);
+  memcpy (hdr.prevoff, xcoff_ardata (abfd)->memoff, XCOFFARMAG_ELEMENT_SIZE);
+  sprintf (hdr.date, "%d", 0);
+  sprintf (hdr.uid, "%d", 0);
+  sprintf (hdr.gid, "%d", 0);
+  sprintf (hdr.mode, "%d", 0);
+  sprintf (hdr.namlen, "%d", 0);
+
+  /* We need spaces, not null bytes, in the header.  */
+  for (p = (char *) &hdr; p < (char *) &hdr + SIZEOF_AR_HDR; p++)
+    if (*p == '\0')
+      *p = ' ';
+
+  if (bfd_bwrite ((PTR) &hdr, (bfd_size_type) SIZEOF_AR_HDR, abfd)
+      != SIZEOF_AR_HDR
+      || (bfd_bwrite (XCOFFARFMAG, (bfd_size_type) SXCOFFARFMAG, abfd)
+	  != SXCOFFARFMAG))
+    return FALSE;
+
+  H_PUT_32 (abfd, orl_count, buf);
+  if (bfd_bwrite (buf, (bfd_size_type) 4, abfd) != 4)
+    return FALSE;
+
+  i = 0;
+  archive_iterator_begin (&iterator, abfd);
+  while (i < orl_count && archive_iterator_next (&iterator))
+    while (map[i].u.abfd == iterator.current.member)
+      {
+	H_PUT_32 (abfd, iterator.current.offset, buf);
+	if (bfd_bwrite (buf, (bfd_size_type) 4, abfd) != 4)
+	  return FALSE;
+	++i;
+      }
+
+  for (i = 0; i < orl_count; i++)
+    {
+      const char *name;
+      size_t namlen;
+
+      name = *map[i].name;
+      namlen = strlen (name);
+      if (bfd_bwrite (name, (bfd_size_type) (namlen + 1), abfd) != namlen + 1)
+	return FALSE;
+    }
+
+  if ((stridx & 1) != 0)
+    {
+      char b;
+
+      b = '\0';
+      if (bfd_bwrite (&b, (bfd_size_type) 1, abfd) != 1)
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+static char buff20[XCOFFARMAGBIG_ELEMENT_SIZE + 1];
+#define FMT20  "%-20lld"
+#define FMT12  "%-12d"
+#define FMT12_OCTAL  "%-12o"
+#define FMT4  "%-4d"
+#define PRINT20(d, v) \
+  sprintf (buff20, FMT20, (long long)(v)), \
+  memcpy ((void *) (d), buff20, 20)
+
+#define PRINT12(d, v) \
+  sprintf (buff20, FMT12, (int)(v)), \
+  memcpy ((void *) (d), buff20, 12)
+
+#define PRINT12_OCTAL(d, v) \
+  sprintf (buff20, FMT12_OCTAL, (unsigned int)(v)), \
+  memcpy ((void *) (d), buff20, 12)
+
+#define PRINT4(d, v) \
+  sprintf (buff20, FMT4, (int)(v)), \
+  memcpy ((void *) (d), buff20, 4)
+
+#define READ20(d, v) \
+  buff20[20] = 0, \
+  memcpy (buff20, (d), 20), \
+  (v) = bfd_scan_vma (buff20, (const char **) NULL, 10)
+
+static bfd_boolean
+do_pad (bfd *abfd, unsigned int number)
+{
+  bfd_byte b = 0;
+
+  /* Limit pad to <= 4096.  */
+  if (number > 4096)
+    return FALSE;
+
+  while (number--)
+    if (bfd_bwrite (&b, (bfd_size_type) 1, abfd) != 1)
+      return FALSE;
+
+  return TRUE;
+}
+
+static bfd_boolean
+do_copy (bfd *out_bfd, bfd *in_bfd)
+{
+  bfd_size_type remaining;
+  bfd_byte buffer[DEFAULT_BUFFERSIZE];
+
+  if (bfd_seek (in_bfd, (file_ptr) 0, SEEK_SET) != 0)
+    return FALSE;
+
+  remaining = arelt_size (in_bfd);
+
+  while (remaining >= DEFAULT_BUFFERSIZE)
+    {
+      if (bfd_bread (buffer, DEFAULT_BUFFERSIZE, in_bfd) != DEFAULT_BUFFERSIZE
+	  || bfd_bwrite (buffer, DEFAULT_BUFFERSIZE, out_bfd) != DEFAULT_BUFFERSIZE)
+	return FALSE;
+
+      remaining -= DEFAULT_BUFFERSIZE;
+    }
+
+  if (remaining)
+    {
+      if (bfd_bread (buffer, remaining, in_bfd) != remaining
+	  || bfd_bwrite (buffer, remaining, out_bfd) != remaining)
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+xcoff_write_armap_big (bfd *abfd, unsigned int elength ATTRIBUTE_UNUSED,
+                       struct orl *map, unsigned int orl_count, int stridx)
+{
+  struct archive_iterator iterator;
+  struct xcoff_ar_file_hdr_big *fhdr;
+  bfd_vma i, sym_32, sym_64, str_32, str_64;
+  const bfd_arch_info_type *arch_info;
+  bfd *current_bfd;
+  size_t string_length;
+  file_ptr nextoff, prevoff;
+
+  /* First, we look through the symbols and work out which are
+     from 32-bit objects and which from 64-bit ones.  */
+  sym_32 = sym_64 = str_32 = str_64 = 0;
+
+  i = 0;
+  for (current_bfd = abfd->archive_head;
+       current_bfd != NULL && i < orl_count;
+       current_bfd = current_bfd->archive_next)
+    {
+      arch_info = bfd_get_arch_info (current_bfd);
+      while (map[i].u.abfd == current_bfd)
+	{
+	  string_length = strlen (*map[i].name) + 1;
+	  if (arch_info->bits_per_address == 64)
+	    {
+	      sym_64++;
+	      str_64 += string_length;
+	    }
+	  else
+	    {
+	      sym_32++;
+	      str_32 += string_length;
+	    }
+	  i++;
+	}
+    }
+
+  /* A quick sanity check... */
+  BFD_ASSERT (sym_64 + sym_32 == orl_count);
+  /* Explicit cast to int for compiler.  */
+  BFD_ASSERT ((int)(str_64 + str_32) == stridx);
+
+  fhdr = xcoff_ardata_big (abfd);
+
+  /* xcoff_write_archive_contents_big passes nextoff in symoff. */
+  READ20 (fhdr->memoff, prevoff);
+  READ20 (fhdr->symoff, nextoff);
+
+  BFD_ASSERT (nextoff == bfd_tell (abfd));
+
+  /* Write out the symbol table.
+     Layout :
+
+     standard big archive header
+     0x0000		      ar_size	[0x14]
+     0x0014		      ar_nxtmem [0x14]
+     0x0028		      ar_prvmem [0x14]
+     0x003C		      ar_date	[0x0C]
+     0x0048		      ar_uid	[0x0C]
+     0x0054		      ar_gid	[0x0C]
+     0x0060		      ar_mod	[0x0C]
+     0x006C		      ar_namelen[0x04]
+     0x0070		      ar_fmag	[SXCOFFARFMAG]
+
+     Symbol table
+     0x0072		      num_syms	[0x08], binary
+     0x0078		      offsets	[0x08 * num_syms], binary
+     0x0086 + 0x08 * num_syms names	[??]
+     ??			      pad to even bytes.
+  */
+
+  if (sym_32)
+    {
+      struct xcoff_ar_hdr_big *hdr;
+      char *symbol_table;
+      char *st;
+
+      bfd_vma symbol_table_size =
+	SIZEOF_AR_HDR_BIG
+	+ SXCOFFARFMAG
+	+ 8
+	+ 8 * sym_32
+	+ str_32 + (str_32 & 1);
+
+      symbol_table = bfd_zmalloc (symbol_table_size);
+      if (symbol_table == NULL)
+	return FALSE;
+
+      hdr = (struct xcoff_ar_hdr_big *) symbol_table;
+
+      PRINT20 (hdr->size, 8 + 8 * sym_32 + str_32 + (str_32 & 1));
+
+      if (sym_64)
+	PRINT20 (hdr->nextoff, nextoff + symbol_table_size);
+      else
+	PRINT20 (hdr->nextoff, 0);
+
+      PRINT20 (hdr->prevoff, prevoff);
+      PRINT12 (hdr->date, 0);
+      PRINT12 (hdr->uid, 0);
+      PRINT12 (hdr->gid, 0);
+      PRINT12 (hdr->mode, 0);
+      PRINT4 (hdr->namlen, 0) ;
+
+      st = symbol_table + SIZEOF_AR_HDR_BIG;
+      memcpy (st, XCOFFARFMAG, SXCOFFARFMAG);
+      st += SXCOFFARFMAG;
+
+      bfd_h_put_64 (abfd, sym_32, st);
+      st += 8;
+
+      /* loop over the 32 bit offsets */
+      i = 0;
+      archive_iterator_begin (&iterator, abfd);
+      while (i < orl_count && archive_iterator_next (&iterator))
+	{
+	  arch_info = bfd_get_arch_info (iterator.current.member);
+	  while (map[i].u.abfd == iterator.current.member)
+	    {
+	      if (arch_info->bits_per_address == 32)
+		{
+		  bfd_h_put_64 (abfd, iterator.current.offset, st);
+		  st += 8;
+		}
+	      i++;
+	    }
+	}
+
+      /* loop over the 32 bit symbol names */
+      i = 0;
+      for (current_bfd = abfd->archive_head;
+	   current_bfd != NULL && i < orl_count;
+	   current_bfd = current_bfd->archive_next)
+	{
+	  arch_info = bfd_get_arch_info (current_bfd);
+	  while (map[i].u.abfd == current_bfd)
+	    {
+	      if (arch_info->bits_per_address == 32)
+		{
+		  string_length = sprintf (st, "%s", *map[i].name);
+		  st += string_length + 1;
+		}
+	      i++;
+	    }
+	}
+
+      bfd_bwrite (symbol_table, symbol_table_size, abfd);
+
+      free (symbol_table);
+
+      prevoff = nextoff;
+      nextoff = nextoff + symbol_table_size;
+    }
+  else
+    PRINT20 (fhdr->symoff, 0);
+
+  if (sym_64)
+    {
+      struct xcoff_ar_hdr_big *hdr;
+      char *symbol_table;
+      char *st;
+
+      bfd_vma symbol_table_size =
+	SIZEOF_AR_HDR_BIG
+	+ SXCOFFARFMAG
+	+ 8
+	+ 8 * sym_64
+	+ str_64 + (str_64 & 1);
+
+      symbol_table = bfd_zmalloc (symbol_table_size);
+      if (symbol_table == NULL)
+	return FALSE;
+
+      hdr = (struct xcoff_ar_hdr_big *) symbol_table;
+
+      PRINT20 (hdr->size, 8 + 8 * sym_64 + str_64 + (str_64 & 1));
+      PRINT20 (hdr->nextoff, 0);
+      PRINT20 (hdr->prevoff, prevoff);
+      PRINT12 (hdr->date, 0);
+      PRINT12 (hdr->uid, 0);
+      PRINT12 (hdr->gid, 0);
+      PRINT12 (hdr->mode, 0);
+      PRINT4 (hdr->namlen, 0);
+
+      st = symbol_table + SIZEOF_AR_HDR_BIG;
+      memcpy (st, XCOFFARFMAG, SXCOFFARFMAG);
+      st += SXCOFFARFMAG;
+
+      bfd_h_put_64 (abfd, sym_64, st);
+      st += 8;
+
+      /* loop over the 64 bit offsets */
+      i = 0;
+      archive_iterator_begin (&iterator, abfd);
+      while (i < orl_count && archive_iterator_next (&iterator))
+	{
+	  arch_info = bfd_get_arch_info (iterator.current.member);
+	  while (map[i].u.abfd == iterator.current.member)
+	    {
+	      if (arch_info->bits_per_address == 64)
+		{
+		  bfd_h_put_64 (abfd, iterator.current.offset, st);
+		  st += 8;
+		}
+	      i++;
+	    }
+	}
+
+      /* loop over the 64 bit symbol names */
+      i = 0;
+      for (current_bfd = abfd->archive_head;
+	   current_bfd != NULL && i < orl_count;
+	   current_bfd = current_bfd->archive_next)
+	{
+	  arch_info = bfd_get_arch_info (current_bfd);
+	  while (map[i].u.abfd == current_bfd)
+	    {
+	      if (arch_info->bits_per_address == 64)
+		{
+		  string_length = sprintf (st, "%s", *map[i].name);
+		  st += string_length + 1;
+		}
+	      i++;
+	    }
+	}
+
+      bfd_bwrite (symbol_table, symbol_table_size, abfd);
+
+      free (symbol_table);
+
+      PRINT20 (fhdr->symoff64, nextoff);
+    }
+  else
+    PRINT20 (fhdr->symoff64, 0);
+
+  return TRUE;
+}
+
+bfd_boolean
+_bfd_xcoff_write_armap (bfd *abfd, unsigned int elength ATTRIBUTE_UNUSED,
+                        struct orl *map, unsigned int orl_count, int stridx)
+{
+  if (! xcoff_big_format_p (abfd))
+    return xcoff_write_armap_old (abfd, elength, map, orl_count, stridx);
+  else
+    return xcoff_write_armap_big (abfd, elength, map, orl_count, stridx);
+}
+
+/* Write out an XCOFF archive.  We always write an entire archive,
+   rather than fussing with the freelist and so forth.  */
+
+static bfd_boolean
+xcoff_write_archive_contents_old (bfd *abfd)
+{
+  struct archive_iterator iterator;
+  struct xcoff_ar_file_hdr fhdr;
+  bfd_size_type count;
+  bfd_size_type total_namlen;
+  file_ptr *offsets;
+  bfd_boolean makemap;
+  bfd_boolean hasobjects;
+  file_ptr prevoff, nextoff;
+  bfd *sub;
+  size_t i;
+  struct xcoff_ar_hdr ahdr;
+  bfd_size_type size;
+  char *p;
+  char decbuf[XCOFFARMAG_ELEMENT_SIZE + 1];
+
+  memset (&fhdr, 0, sizeof fhdr);
+  (void) strncpy (fhdr.magic, XCOFFARMAG, SXCOFFARMAG);
+  sprintf (fhdr.firstmemoff, "%d", SIZEOF_AR_FILE_HDR);
+  sprintf (fhdr.freeoff, "%d", 0);
+
+  count = 0;
+  total_namlen = 0;
+  for (sub = abfd->archive_head; sub != NULL; sub = sub->archive_next)
+    {
+      ++count;
+      total_namlen += strlen (normalize_filename (sub)) + 1;
+      if (sub->arelt_data == NULL)
+	{
+	  sub->arelt_data = bfd_zalloc (sub, sizeof (struct areltdata));
+	  if (sub->arelt_data == NULL)
+	    return FALSE;
+	}
+      if (arch_xhdr (sub) == NULL)
+	{
+	  struct xcoff_ar_hdr *ahdrp;
+	  struct stat s;
+
+	  if (stat (bfd_get_filename (sub), &s) != 0)
+	    {
+	      bfd_set_error (bfd_error_system_call);
+	      return FALSE;
+	    }
+
+	  ahdrp = bfd_zalloc (sub, sizeof (*ahdrp));
+	  if (ahdrp == NULL)
+	    return FALSE;
+
+	  sprintf (ahdrp->size, "%ld", (long) s.st_size);
+	  sprintf (ahdrp->date, "%ld", (long) s.st_mtime);
+	  sprintf (ahdrp->uid, "%ld", (long) s.st_uid);
+	  sprintf (ahdrp->gid, "%ld", (long) s.st_gid);
+	  sprintf (ahdrp->mode, "%o", (unsigned int) s.st_mode);
+
+	  arch_eltdata (sub)->arch_header = (char *) ahdrp;
+	  arch_eltdata (sub)->parsed_size = s.st_size;
+	}
+    }
+  offsets = (file_ptr *) bfd_alloc (abfd, count * sizeof (file_ptr));
+  if (offsets == NULL)
+    return FALSE;
+
+  if (bfd_seek (abfd, (file_ptr) SIZEOF_AR_FILE_HDR, SEEK_SET) != 0)
+    return FALSE;
+
+  makemap = bfd_has_map (abfd);
+  hasobjects = FALSE;
+  prevoff = 0;
+  for (archive_iterator_begin (&iterator, abfd), i = 0;
+       archive_iterator_next (&iterator);
+       i++)
+    {
+      bfd_size_type namlen;
+      struct xcoff_ar_hdr *ahdrp;
+
+      if (makemap && ! hasobjects)
+	{
+	  if (bfd_check_format (iterator.current.member, bfd_object))
+	    hasobjects = TRUE;
+	}
+
+      ahdrp = arch_xhdr (iterator.current.member);
+      sprintf (ahdrp->prevoff, "%ld", (long) prevoff);
+      sprintf (ahdrp->namlen, "%ld", (long) iterator.current.namlen);
+      sprintf (ahdrp->nextoff, "%ld", (long) iterator.next.offset);
+
+      /* We need spaces, not null bytes, in the header.  */
+      for (p = (char *) ahdrp; p < (char *) ahdrp + SIZEOF_AR_HDR; p++)
+	if (*p == '\0')
+	  *p = ' ';
+
+      if (!do_pad (abfd, iterator.current.leading_padding))
+	return FALSE;
+
+      BFD_ASSERT (iterator.current.offset == bfd_tell (abfd));
+      namlen = iterator.current.padded_namlen;
+      if (bfd_bwrite (ahdrp, SIZEOF_AR_HDR, abfd) != SIZEOF_AR_HDR
+	  || bfd_bwrite (iterator.current.name, namlen, abfd) != namlen
+	  || bfd_bwrite (XCOFFARFMAG, SXCOFFARFMAG, abfd) != SXCOFFARFMAG
+	  || bfd_seek (iterator.current.member, 0, SEEK_SET) != 0
+	  || !do_copy (abfd, iterator.current.member)
+	  || !do_pad (abfd, iterator.current.trailing_padding))
+	return FALSE;
+
+      offsets[i] = iterator.current.offset;
+      prevoff = iterator.current.offset;
+    }
+
+  sprintf (fhdr.lastmemoff, "%ld", (long) prevoff);
+
+  /* Write out the member table.  */
+
+  nextoff = iterator.next.offset;
+  BFD_ASSERT (nextoff == bfd_tell (abfd));
+  sprintf (fhdr.memoff, "%ld", (long) nextoff);
+
+  memset (&ahdr, 0, sizeof ahdr);
+  sprintf (ahdr.size, "%ld", (long) (XCOFFARMAG_ELEMENT_SIZE
+				     + count * XCOFFARMAG_ELEMENT_SIZE
+				     + total_namlen));
+  sprintf (ahdr.prevoff, "%ld", (long) prevoff);
+  sprintf (ahdr.date, "%d", 0);
+  sprintf (ahdr.uid, "%d", 0);
+  sprintf (ahdr.gid, "%d", 0);
+  sprintf (ahdr.mode, "%d", 0);
+  sprintf (ahdr.namlen, "%d", 0);
+
+  size = (SIZEOF_AR_HDR
+	  + XCOFFARMAG_ELEMENT_SIZE
+	  + count * XCOFFARMAG_ELEMENT_SIZE
+	  + total_namlen
+	  + SXCOFFARFMAG);
+
+  prevoff = nextoff;
+  nextoff += size + (size & 1);
+
+  if (makemap && hasobjects)
+    sprintf (ahdr.nextoff, "%ld", (long) nextoff);
+  else
+    sprintf (ahdr.nextoff, "%d", 0);
+
+  /* We need spaces, not null bytes, in the header.  */
+  for (p = (char *) &ahdr; p < (char *) &ahdr + SIZEOF_AR_HDR; p++)
+    if (*p == '\0')
+      *p = ' ';
+
+  if ((bfd_bwrite ((PTR) &ahdr, (bfd_size_type) SIZEOF_AR_HDR, abfd)
+       != SIZEOF_AR_HDR)
+      || (bfd_bwrite ((PTR) XCOFFARFMAG, (bfd_size_type) SXCOFFARFMAG, abfd)
+	  != SXCOFFARFMAG))
+    return FALSE;
+
+  sprintf (decbuf, "%-12ld", (long) count);
+  if (bfd_bwrite ((PTR) decbuf, (bfd_size_type) XCOFFARMAG_ELEMENT_SIZE, abfd)
+      != XCOFFARMAG_ELEMENT_SIZE)
+    return FALSE;
+  for (i = 0; i < (size_t) count; i++)
+    {
+      sprintf (decbuf, "%-12ld", (long) offsets[i]);
+      if (bfd_bwrite ((PTR) decbuf, (bfd_size_type) XCOFFARMAG_ELEMENT_SIZE,
+		      abfd) != XCOFFARMAG_ELEMENT_SIZE)
+	return FALSE;
+    }
+  for (sub = abfd->archive_head; sub != NULL; sub = sub->archive_next)
+    {
+      const char *name;
+      bfd_size_type namlen;
+
+      name = normalize_filename (sub);
+      namlen = strlen (name);
+      if (bfd_bwrite ((PTR) name, namlen + 1, abfd) != namlen + 1)
+	return FALSE;
+    }
+
+  if (! do_pad (abfd, size & 1))
+    return FALSE;
+
+  /* Write out the armap, if appropriate.  */
+  if (! makemap || ! hasobjects)
+    sprintf (fhdr.symoff, "%d", 0);
+  else
+    {
+      BFD_ASSERT (nextoff == bfd_tell (abfd));
+      sprintf (fhdr.symoff, "%ld", (long) nextoff);
+      bfd_ardata (abfd)->tdata = (PTR) &fhdr;
+      if (! _bfd_compute_and_write_armap (abfd, 0))
+	return FALSE;
+    }
+
+  /* Write out the archive file header.  */
+
+  /* We need spaces, not null bytes, in the header.  */
+  for (p = (char *) &fhdr; p < (char *) &fhdr + SIZEOF_AR_FILE_HDR; p++)
+    if (*p == '\0')
+      *p = ' ';
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
+      || (bfd_bwrite ((PTR) &fhdr, (bfd_size_type) SIZEOF_AR_FILE_HDR, abfd)
+	  != SIZEOF_AR_FILE_HDR))
+    return FALSE;
+
+  return TRUE;
+}
+
+static bfd_boolean
+xcoff_write_archive_contents_big (bfd *abfd)
+{
+  struct xcoff_ar_file_hdr_big fhdr;
+  bfd_size_type count;
+  bfd_size_type total_namlen;
+  file_ptr *offsets;
+  bfd_boolean makemap;
+  bfd_boolean hasobjects;
+  file_ptr prevoff, nextoff;
+  bfd *current_bfd;
+  size_t i;
+  struct xcoff_ar_hdr_big *hdr;
+  bfd_size_type size;
+  char *member_table, *mt;
+  bfd_vma member_table_size;
+  struct archive_iterator iterator;
+
+  memset (&fhdr, 0, SIZEOF_AR_FILE_HDR_BIG);
+  memcpy (fhdr.magic, XCOFFARMAGBIG, SXCOFFARMAG);
+
+  if (bfd_seek (abfd, (file_ptr) SIZEOF_AR_FILE_HDR_BIG, SEEK_SET) != 0)
+    return FALSE;
+
+  /* Calculate count and total_namlen.  */
+  makemap = bfd_has_map (abfd);
+  hasobjects = FALSE;
+  for (current_bfd = abfd->archive_head, count = 0, total_namlen = 0;
+       current_bfd != NULL;
+       current_bfd = current_bfd->archive_next, count++)
+    {
+      total_namlen += strlen (normalize_filename (current_bfd)) + 1;
+
+      if (makemap
+	  && ! hasobjects
+	  && bfd_check_format (current_bfd, bfd_object))
+	hasobjects = TRUE;
+
+      if (current_bfd->arelt_data == NULL)
+	{
+	  size = sizeof (struct areltdata);
+	  current_bfd->arelt_data = bfd_zalloc (current_bfd, size);
+	  if (current_bfd->arelt_data == NULL)
+	    return FALSE;
+	}
+
+      if (arch_xhdr_big (current_bfd) == NULL)
+	{
+	  struct xcoff_ar_hdr_big *ahdrp;
+	  struct stat s;
+
+	  /* XXX This should actually be a call to stat64 (at least on
+	     32-bit machines).
+	     XXX This call will fail if the original object is not found.  */
+	  if (stat (bfd_get_filename (current_bfd), &s) != 0)
+	    {
+	      bfd_set_error (bfd_error_system_call);
+	      return FALSE;
+	    }
+
+	  ahdrp = bfd_zalloc (current_bfd, sizeof (*ahdrp));
+	  if (ahdrp == NULL)
+	    return FALSE;
+
+	  PRINT20 (ahdrp->size, s.st_size);
+	  PRINT12 (ahdrp->date, s.st_mtime);
+	  PRINT12 (ahdrp->uid,  s.st_uid);
+	  PRINT12 (ahdrp->gid,  s.st_gid);
+	  PRINT12_OCTAL (ahdrp->mode, s.st_mode);
+
+	  arch_eltdata (current_bfd)->arch_header = (char *) ahdrp;
+	  arch_eltdata (current_bfd)->parsed_size = s.st_size;
+	}
+    }
+
+  offsets = NULL;
+  if (count)
+    {
+      offsets = (file_ptr *) bfd_malloc (count * sizeof (file_ptr));
+      if (offsets == NULL)
+	return FALSE;
+    }
+
+  prevoff = 0;
+  for (archive_iterator_begin (&iterator, abfd), i = 0;
+       archive_iterator_next (&iterator);
+       i++)
+    {
+      bfd_size_type namlen;
+      struct xcoff_ar_hdr_big *ahdrp;
+
+      ahdrp = arch_xhdr_big (iterator.current.member);
+      PRINT20 (ahdrp->prevoff, prevoff);
+      PRINT4 (ahdrp->namlen, iterator.current.namlen);
+      PRINT20 (ahdrp->nextoff, iterator.next.offset);
+
+      if (!do_pad (abfd, iterator.current.leading_padding))
+	return FALSE;
+
+      BFD_ASSERT (iterator.current.offset == bfd_tell (abfd));
+      namlen = iterator.current.padded_namlen;
+      if (bfd_bwrite (ahdrp, SIZEOF_AR_HDR_BIG, abfd) != SIZEOF_AR_HDR_BIG
+	  || bfd_bwrite (iterator.current.name, namlen, abfd) != namlen
+	  || bfd_bwrite (XCOFFARFMAG, SXCOFFARFMAG, abfd) != SXCOFFARFMAG
+	  || bfd_seek (iterator.current.member, 0, SEEK_SET) != 0
+	  || !do_copy (abfd, iterator.current.member)
+	  || !do_pad (abfd, iterator.current.trailing_padding))
+	return FALSE;
+
+      offsets[i] = iterator.current.offset;
+      prevoff = iterator.current.offset;
+    }
+
+  if (count)
+    {
+      PRINT20 (fhdr.firstmemoff, offsets[0]);
+      PRINT20 (fhdr.lastmemoff, prevoff);
+    }
+
+  /* Write out the member table.
+     Layout :
+
+     standard big archive header
+     0x0000		      ar_size	[0x14]
+     0x0014		      ar_nxtmem [0x14]
+     0x0028		      ar_prvmem [0x14]
+     0x003C		      ar_date	[0x0C]
+     0x0048		      ar_uid	[0x0C]
+     0x0054		      ar_gid	[0x0C]
+     0x0060		      ar_mod	[0x0C]
+     0x006C		      ar_namelen[0x04]
+     0x0070		      ar_fmag	[0x02]
+
+     Member table
+     0x0072		      count	[0x14]
+     0x0086		      offsets	[0x14 * counts]
+     0x0086 + 0x14 * counts   names	[??]
+     ??			      pad to even bytes.
+   */
+
+  nextoff = iterator.next.offset;
+  BFD_ASSERT (nextoff == bfd_tell (abfd));
+
+  member_table_size = (SIZEOF_AR_HDR_BIG
+		       + SXCOFFARFMAG
+		       + XCOFFARMAGBIG_ELEMENT_SIZE
+		       + count * XCOFFARMAGBIG_ELEMENT_SIZE
+		       + total_namlen);
+
+  member_table_size += member_table_size & 1;
+  member_table = bfd_zmalloc (member_table_size);
+  if (member_table == NULL)
+    return FALSE;
+
+  hdr = (struct xcoff_ar_hdr_big *) member_table;
+
+  PRINT20 (hdr->size, (XCOFFARMAGBIG_ELEMENT_SIZE
+		       + count * XCOFFARMAGBIG_ELEMENT_SIZE
+		       + total_namlen + (total_namlen & 1)));
+  if (makemap && hasobjects)
+    PRINT20 (hdr->nextoff, nextoff + member_table_size);
+  else
+    PRINT20 (hdr->nextoff, 0);
+  PRINT20 (hdr->prevoff, prevoff);
+  PRINT12 (hdr->date, 0);
+  PRINT12 (hdr->uid, 0);
+  PRINT12 (hdr->gid, 0);
+  PRINT12 (hdr->mode, 0);
+  PRINT4 (hdr->namlen, 0);
+
+  mt = member_table + SIZEOF_AR_HDR_BIG;
+  memcpy (mt, XCOFFARFMAG, SXCOFFARFMAG);
+  mt += SXCOFFARFMAG;
+
+  PRINT20 (mt, count);
+  mt += XCOFFARMAGBIG_ELEMENT_SIZE;
+  for (i = 0; i < (size_t) count; i++)
+    {
+      PRINT20 (mt, offsets[i]);
+      mt += XCOFFARMAGBIG_ELEMENT_SIZE;
+    }
+
+  if (count)
+    {
+      free (offsets);
+      offsets = NULL;
+    }
+
+  for (current_bfd = abfd->archive_head;
+       current_bfd != NULL;
+       current_bfd = current_bfd->archive_next)
+    {
+      const char *name;
+      size_t namlen;
+
+      name = normalize_filename (current_bfd);
+      namlen = sprintf (mt, "%s", name);
+      mt += namlen + 1;
+    }
+
+  if (bfd_bwrite (member_table, member_table_size, abfd) != member_table_size)
+    return FALSE;
+
+  free (member_table);
+
+  PRINT20 (fhdr.memoff, nextoff);
+
+  prevoff = nextoff;
+  nextoff += member_table_size;
+
+  /* Write out the armap, if appropriate.  */
+
+  if (! makemap || ! hasobjects)
+    PRINT20 (fhdr.symoff, 0);
+  else
+    {
+      BFD_ASSERT (nextoff == bfd_tell (abfd));
+
+      /* Save nextoff in fhdr.symoff so the armap routine can use it.  */
+      PRINT20 (fhdr.symoff, nextoff);
+
+      bfd_ardata (abfd)->tdata = (PTR) &fhdr;
+      if (! _bfd_compute_and_write_armap (abfd, 0))
+	return FALSE;
+    }
+
+  /* Write out the archive file header.  */
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
+      || (bfd_bwrite ((PTR) &fhdr, (bfd_size_type) SIZEOF_AR_FILE_HDR_BIG,
+		      abfd) != SIZEOF_AR_FILE_HDR_BIG))
+    return FALSE;
+
+  return TRUE;
+}
+
+bfd_boolean
+_bfd_xcoff_write_archive_contents (bfd *abfd)
+{
+  if (! xcoff_big_format_p (abfd))
+    return xcoff_write_archive_contents_old (abfd);
+  else
+    return xcoff_write_archive_contents_big (abfd);
+}
+
+/* We can't use the usual coff_sizeof_headers routine, because AIX
+   always uses an a.out header.  */
+
+int
+_bfd_xcoff_sizeof_headers (bfd *abfd,
+			   struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  int size;
+
+  size = FILHSZ;
+  if (xcoff_data (abfd)->full_aouthdr)
+    size += AOUTSZ;
+  else
+    size += SMALL_AOUTSZ;
+  size += abfd->section_count * SCNHSZ;
+  return size;
+}
+
+/* Routines to swap information in the XCOFF .loader section.  If we
+   ever need to write an XCOFF loader, this stuff will need to be
+   moved to another file shared by the linker (which XCOFF calls the
+   ``binder'') and the loader.  */
+
+/* Swap in the ldhdr structure.  */
+
+static void
+xcoff_swap_ldhdr_in (bfd *abfd, const PTR s, struct internal_ldhdr *dst)
+{
+  const struct external_ldhdr *src = (const struct external_ldhdr *) s;
+
+  dst->l_version = bfd_get_32 (abfd, src->l_version);
+  dst->l_nsyms = bfd_get_32 (abfd, src->l_nsyms);
+  dst->l_nreloc = bfd_get_32 (abfd, src->l_nreloc);
+  dst->l_istlen = bfd_get_32 (abfd, src->l_istlen);
+  dst->l_nimpid = bfd_get_32 (abfd, src->l_nimpid);
+  dst->l_impoff = bfd_get_32 (abfd, src->l_impoff);
+  dst->l_stlen = bfd_get_32 (abfd, src->l_stlen);
+  dst->l_stoff = bfd_get_32 (abfd, src->l_stoff);
+}
+
+/* Swap out the ldhdr structure.  */
+
+static void
+xcoff_swap_ldhdr_out (bfd *abfd, const struct internal_ldhdr *src, PTR d)
+{
+  struct external_ldhdr *dst = (struct external_ldhdr *) d;
+
+  bfd_put_32 (abfd, (bfd_vma) src->l_version, dst->l_version);
+  bfd_put_32 (abfd, src->l_nsyms, dst->l_nsyms);
+  bfd_put_32 (abfd, src->l_nreloc, dst->l_nreloc);
+  bfd_put_32 (abfd, src->l_istlen, dst->l_istlen);
+  bfd_put_32 (abfd, src->l_nimpid, dst->l_nimpid);
+  bfd_put_32 (abfd, src->l_impoff, dst->l_impoff);
+  bfd_put_32 (abfd, src->l_stlen, dst->l_stlen);
+  bfd_put_32 (abfd, src->l_stoff, dst->l_stoff);
+}
+
+/* Swap in the ldsym structure.  */
+
+static void
+xcoff_swap_ldsym_in (bfd *abfd, const PTR s, struct internal_ldsym *dst)
+{
+  const struct external_ldsym *src = (const struct external_ldsym *) s;
+
+  if (bfd_get_32 (abfd, src->_l._l_l._l_zeroes) != 0) {
+    memcpy (dst->_l._l_name, src->_l._l_name, SYMNMLEN);
+  } else {
+    dst->_l._l_l._l_zeroes = 0;
+    dst->_l._l_l._l_offset = bfd_get_32 (abfd, src->_l._l_l._l_offset);
+  }
+  dst->l_value = bfd_get_32 (abfd, src->l_value);
+  dst->l_scnum = bfd_get_16 (abfd, src->l_scnum);
+  dst->l_smtype = bfd_get_8 (abfd, src->l_smtype);
+  dst->l_smclas = bfd_get_8 (abfd, src->l_smclas);
+  dst->l_ifile = bfd_get_32 (abfd, src->l_ifile);
+  dst->l_parm = bfd_get_32 (abfd, src->l_parm);
+}
+
+/* Swap out the ldsym structure.  */
+
+static void
+xcoff_swap_ldsym_out (bfd *abfd, const struct internal_ldsym *src, PTR d)
+{
+  struct external_ldsym *dst = (struct external_ldsym *) d;
+
+  if (src->_l._l_l._l_zeroes != 0)
+    memcpy (dst->_l._l_name, src->_l._l_name, SYMNMLEN);
+  else
+    {
+      bfd_put_32 (abfd, (bfd_vma) 0, dst->_l._l_l._l_zeroes);
+      bfd_put_32 (abfd, (bfd_vma) src->_l._l_l._l_offset,
+		  dst->_l._l_l._l_offset);
+    }
+  bfd_put_32 (abfd, src->l_value, dst->l_value);
+  bfd_put_16 (abfd, (bfd_vma) src->l_scnum, dst->l_scnum);
+  bfd_put_8 (abfd, src->l_smtype, dst->l_smtype);
+  bfd_put_8 (abfd, src->l_smclas, dst->l_smclas);
+  bfd_put_32 (abfd, src->l_ifile, dst->l_ifile);
+  bfd_put_32 (abfd, src->l_parm, dst->l_parm);
+}
+
+static void
+xcoff_swap_reloc_in (bfd *abfd, PTR s, PTR d)
+{
+  struct external_reloc *src = (struct external_reloc *) s;
+  struct internal_reloc *dst = (struct internal_reloc *) d;
+
+  memset (dst, 0, sizeof (struct internal_reloc));
+
+  dst->r_vaddr = bfd_get_32 (abfd, src->r_vaddr);
+  dst->r_symndx = bfd_get_32 (abfd, src->r_symndx);
+  dst->r_size = bfd_get_8 (abfd, src->r_size);
+  dst->r_type = bfd_get_8 (abfd, src->r_type);
+}
+
+static unsigned int
+xcoff_swap_reloc_out (bfd *abfd, PTR s, PTR d)
+{
+  struct internal_reloc *src = (struct internal_reloc *) s;
+  struct external_reloc *dst = (struct external_reloc *) d;
+
+  bfd_put_32 (abfd, src->r_vaddr, dst->r_vaddr);
+  bfd_put_32 (abfd, src->r_symndx, dst->r_symndx);
+  bfd_put_8 (abfd, src->r_type, dst->r_type);
+  bfd_put_8 (abfd, src->r_size, dst->r_size);
+
+  return bfd_coff_relsz (abfd);
+}
+
+/* Swap in the ldrel structure.  */
+
+static void
+xcoff_swap_ldrel_in (bfd *abfd, const PTR s, struct internal_ldrel *dst)
+{
+  const struct external_ldrel *src = (const struct external_ldrel *) s;
+
+  dst->l_vaddr = bfd_get_32 (abfd, src->l_vaddr);
+  dst->l_symndx = bfd_get_32 (abfd, src->l_symndx);
+  dst->l_rtype = bfd_get_16 (abfd, src->l_rtype);
+  dst->l_rsecnm = bfd_get_16 (abfd, src->l_rsecnm);
+}
+
+/* Swap out the ldrel structure.  */
+
+static void
+xcoff_swap_ldrel_out (bfd *abfd, const struct internal_ldrel *src, PTR d)
+{
+  struct external_ldrel *dst = (struct external_ldrel *) d;
+
+  bfd_put_32 (abfd, src->l_vaddr, dst->l_vaddr);
+  bfd_put_32 (abfd, src->l_symndx, dst->l_symndx);
+  bfd_put_16 (abfd, (bfd_vma) src->l_rtype, dst->l_rtype);
+  bfd_put_16 (abfd, (bfd_vma) src->l_rsecnm, dst->l_rsecnm);
+}
+
+
+bfd_boolean
+xcoff_reloc_type_noop (bfd *input_bfd ATTRIBUTE_UNUSED,
+                       asection *input_section ATTRIBUTE_UNUSED,
+                       bfd *output_bfd ATTRIBUTE_UNUSED,
+                       struct internal_reloc *rel ATTRIBUTE_UNUSED,
+                       struct internal_syment *sym ATTRIBUTE_UNUSED,
+                       struct reloc_howto_struct *howto ATTRIBUTE_UNUSED,
+                       bfd_vma val ATTRIBUTE_UNUSED,
+                       bfd_vma addend ATTRIBUTE_UNUSED,
+                       bfd_vma *relocation ATTRIBUTE_UNUSED,
+                       bfd_byte *contents ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+bfd_boolean
+xcoff_reloc_type_fail (bfd *input_bfd,
+                       asection *input_section ATTRIBUTE_UNUSED,
+                       bfd *output_bfd ATTRIBUTE_UNUSED,
+                       struct internal_reloc *rel,
+                       struct internal_syment *sym ATTRIBUTE_UNUSED,
+                       struct reloc_howto_struct *howto ATTRIBUTE_UNUSED,
+                       bfd_vma val ATTRIBUTE_UNUSED,
+                       bfd_vma addend ATTRIBUTE_UNUSED,
+                       bfd_vma *relocation ATTRIBUTE_UNUSED,
+                       bfd_byte *contents ATTRIBUTE_UNUSED)
+{
+  (*_bfd_error_handler)
+    (_("%s: unsupported relocation type 0x%02x"),
+     bfd_get_filename (input_bfd), (unsigned int) rel->r_type);
+  bfd_set_error (bfd_error_bad_value);
+  return FALSE;
+}
+
+bfd_boolean
+xcoff_reloc_type_pos (bfd *input_bfd ATTRIBUTE_UNUSED,
+                      asection *input_section ATTRIBUTE_UNUSED,
+                      bfd *output_bfd ATTRIBUTE_UNUSED,
+                      struct internal_reloc *rel ATTRIBUTE_UNUSED,
+                      struct internal_syment *sym ATTRIBUTE_UNUSED,
+                      struct reloc_howto_struct *howto ATTRIBUTE_UNUSED,
+                      bfd_vma val,
+                      bfd_vma addend,
+                      bfd_vma *relocation,
+                      bfd_byte *contents ATTRIBUTE_UNUSED)
+{
+  *relocation = val + addend;
+  return TRUE;
+}
+
+bfd_boolean
+xcoff_reloc_type_neg (bfd *input_bfd ATTRIBUTE_UNUSED,
+                      asection *input_section ATTRIBUTE_UNUSED,
+                      bfd *output_bfd ATTRIBUTE_UNUSED,
+                      struct internal_reloc *rel ATTRIBUTE_UNUSED,
+                      struct internal_syment *sym ATTRIBUTE_UNUSED,
+                      struct reloc_howto_struct *howto ATTRIBUTE_UNUSED,
+                      bfd_vma val,
+                      bfd_vma addend,
+                      bfd_vma *relocation,
+                      bfd_byte *contents ATTRIBUTE_UNUSED)
+{
+  *relocation = addend - val;
+  return TRUE;
+}
+
+bfd_boolean
+xcoff_reloc_type_rel (bfd *input_bfd ATTRIBUTE_UNUSED,
+                      asection *input_section,
+                      bfd *output_bfd ATTRIBUTE_UNUSED,
+                      struct internal_reloc *rel ATTRIBUTE_UNUSED,
+                      struct internal_syment *sym ATTRIBUTE_UNUSED,
+                      struct reloc_howto_struct *howto,
+                      bfd_vma val,
+                      bfd_vma addend,
+                      bfd_vma *relocation,
+                      bfd_byte *contents ATTRIBUTE_UNUSED)
+{
+  howto->pc_relative = TRUE;
+
+  /* A PC relative reloc includes the section address.  */
+  addend += input_section->vma;
+
+  *relocation = val + addend;
+  *relocation -= (input_section->output_section->vma
+		  + input_section->output_offset);
+  return TRUE;
+}
+
+bfd_boolean
+xcoff_reloc_type_toc (bfd *input_bfd,
+                      asection *input_section ATTRIBUTE_UNUSED,
+                      bfd *output_bfd,
+                      struct internal_reloc *rel,
+                      struct internal_syment *sym,
+                      struct reloc_howto_struct *howto ATTRIBUTE_UNUSED,
+                      bfd_vma val,
+                      bfd_vma addend ATTRIBUTE_UNUSED,
+                      bfd_vma *relocation,
+                      bfd_byte *contents ATTRIBUTE_UNUSED)
+{
+  struct xcoff_link_hash_entry *h;
+
+  if (0 > rel->r_symndx)
+    return FALSE;
+
+  h = obj_xcoff_sym_hashes (input_bfd)[rel->r_symndx];
+
+  if (h != NULL && h->smclas != XMC_TD)
+    {
+      if (h->toc_section == NULL)
+	{
+	  (*_bfd_error_handler)
+	    (_("%s: TOC reloc at 0x%x to symbol `%s' with no TOC entry"),
+	     bfd_get_filename (input_bfd), rel->r_vaddr,
+	     h->root.root.string);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      BFD_ASSERT ((h->flags & XCOFF_SET_TOC) == 0);
+      val = (h->toc_section->output_section->vma
+	      + h->toc_section->output_offset);
+    }
+
+  *relocation = ((val - xcoff_data (output_bfd)->toc)
+		 - (sym->n_value - xcoff_data (input_bfd)->toc));
+  return TRUE;
+}
+
+bfd_boolean
+xcoff_reloc_type_ba (bfd *input_bfd ATTRIBUTE_UNUSED,
+                     asection *input_section ATTRIBUTE_UNUSED,
+                     bfd *output_bfd ATTRIBUTE_UNUSED,
+                     struct internal_reloc *rel ATTRIBUTE_UNUSED,
+                     struct internal_syment *sym ATTRIBUTE_UNUSED,
+                     struct reloc_howto_struct *howto,
+                     bfd_vma val,
+                     bfd_vma addend,
+                     bfd_vma *relocation,
+                     bfd_byte *contents ATTRIBUTE_UNUSED)
+{
+  howto->src_mask &= ~3;
+  howto->dst_mask = howto->src_mask;
+
+  *relocation = val + addend;
+
+  return TRUE;
+}
+
+static bfd_boolean
+xcoff_reloc_type_br (bfd *input_bfd,
+                     asection *input_section,
+                     bfd *output_bfd ATTRIBUTE_UNUSED,
+                     struct internal_reloc *rel,
+                     struct internal_syment *sym ATTRIBUTE_UNUSED,
+                     struct reloc_howto_struct *howto,
+                     bfd_vma val,
+                     bfd_vma addend,
+                     bfd_vma *relocation,
+                     bfd_byte *contents)
+{
+  struct xcoff_link_hash_entry *h;
+  bfd_vma section_offset;
+
+  if (0 > rel->r_symndx)
+    return FALSE;
+
+  h = obj_xcoff_sym_hashes (input_bfd)[rel->r_symndx];
+  section_offset = rel->r_vaddr - input_section->vma;
+
+  /* If we see an R_BR or R_RBR reloc which is jumping to global
+     linkage code, and it is followed by an appropriate cror nop
+     instruction, we replace the cror with lwz r2,20(r1).  This
+     restores the TOC after the glink code.  Contrariwise, if the
+     call is followed by a lwz r2,20(r1), but the call is not
+     going to global linkage code, we can replace the load with a
+     cror.  */
+  if (NULL != h
+      && (bfd_link_hash_defined == h->root.type
+	  || bfd_link_hash_defweak == h->root.type)
+      && section_offset + 8 <= input_section->size)
+    {
+      bfd_byte *pnext;
+      unsigned long next;
+
+      pnext = contents + section_offset + 4;
+      next = bfd_get_32 (input_bfd, pnext);
+
+      /* The _ptrgl function is magic.  It is used by the AIX
+	 compiler to call a function through a pointer.  */
+      if (h->smclas == XMC_GL || strcmp (h->root.root.string, "._ptrgl") == 0)
+	{
+	  if (next == 0x4def7b82			/* cror 15,15,15 */
+	      || next == 0x4ffffb82			/* cror 31,31,31 */
+	      || next == 0x60000000)			/* ori r0,r0,0 */
+	    bfd_put_32 (input_bfd, 0x80410014, pnext);	/* lwz r2,20(r1) */
+
+	}
+      else
+	{
+	  if (next == 0x80410014)			/* lwz r2,20(r1) */
+	    bfd_put_32 (input_bfd, 0x60000000, pnext);	/* ori r0,r0,0 */
+	}
+    }
+  else if (NULL != h && bfd_link_hash_undefined == h->root.type)
+    {
+      /* Normally, this relocation is against a defined symbol.  In the
+	 case where this is a partial link and the output section offset
+	 is greater than 2^25, the linker will return an invalid error
+	 message that the relocation has been truncated.  Yes it has been
+	 truncated but no it not important.  For this case, disable the
+	 overflow checking. */
+
+      howto->complain_on_overflow = complain_overflow_dont;
+    }
+
+  /* The original PC-relative relocation is biased by -r_vaddr, so adding
+     the value below will give the absolute target address.  */
+  *relocation = val + addend + rel->r_vaddr;
+
+  howto->src_mask &= ~3;
+  howto->dst_mask = howto->src_mask;
+
+  if (h != NULL
+      && (h->root.type == bfd_link_hash_defined
+	  || h->root.type == bfd_link_hash_defweak)
+      && bfd_is_abs_section (h->root.u.def.section)
+      && section_offset + 4 <= input_section->size)
+    {
+      bfd_byte *ptr;
+      bfd_vma insn;
+
+      /* Turn the relative branch into an absolute one by setting the
+	 AA bit.  */
+      ptr = contents + section_offset;
+      insn = bfd_get_32 (input_bfd, ptr);
+      insn |= 2;
+      bfd_put_32 (input_bfd, insn, ptr);
+
+      /* Make the howto absolute too.  */
+      howto->pc_relative = FALSE;
+      howto->complain_on_overflow = complain_overflow_bitfield;
+    }
+  else
+    {
+      /* Use a PC-relative howto and subtract the instruction's address
+	 from the target address we calculated above.  */
+      howto->pc_relative = TRUE;
+      *relocation -= (input_section->output_section->vma
+		      + input_section->output_offset
+		      + section_offset);
+    }
+  return TRUE;
+}
+
+bfd_boolean
+xcoff_reloc_type_crel (bfd *input_bfd ATTRIBUTE_UNUSED,
+                       asection *input_section,
+                       bfd *output_bfd ATTRIBUTE_UNUSED,
+                       struct internal_reloc *rel ATTRIBUTE_UNUSED,
+                       struct internal_syment *sym ATTRIBUTE_UNUSED,
+                       struct reloc_howto_struct *howto,
+                       bfd_vma val ATTRIBUTE_UNUSED,
+                       bfd_vma addend,
+                       bfd_vma *relocation,
+                       bfd_byte *contents ATTRIBUTE_UNUSED)
+{
+  howto->pc_relative = TRUE;
+  howto->src_mask &= ~3;
+  howto->dst_mask = howto->src_mask;
+
+  /* A PC relative reloc includes the section address.  */
+  addend += input_section->vma;
+
+  *relocation = val + addend;
+  *relocation -= (input_section->output_section->vma
+		  + input_section->output_offset);
+  return TRUE;
+}
+
+static bfd_boolean
+xcoff_complain_overflow_dont_func (bfd *input_bfd ATTRIBUTE_UNUSED,
+                                   bfd_vma val ATTRIBUTE_UNUSED,
+                                   bfd_vma relocation ATTRIBUTE_UNUSED,
+                                   struct reloc_howto_struct *
+                                      howto ATTRIBUTE_UNUSED)
+{
+  return FALSE;
+}
+
+static bfd_boolean
+xcoff_complain_overflow_bitfield_func (bfd *input_bfd,
+                                       bfd_vma val,
+                                       bfd_vma relocation,
+                                       struct reloc_howto_struct *howto)
+{
+  bfd_vma fieldmask, signmask, ss;
+  bfd_vma a, b, sum;
+
+  /* Get the values to be added together.  For signed and unsigned
+     relocations, we assume that all values should be truncated to
+     the size of an address.  For bitfields, all the bits matter.
+     See also bfd_check_overflow.  */
+  fieldmask = N_ONES (howto->bitsize);
+  a = relocation;
+  b = val & howto->src_mask;
+
+  /* Much like unsigned, except no trimming with addrmask.  In
+     addition, the sum overflows if there is a carry out of
+     the bfd_vma, i.e., the sum is less than either input
+     operand.  */
+  a >>= howto->rightshift;
+  b >>= howto->bitpos;
+
+  /* Bitfields are sometimes used for signed numbers; for
+     example, a 13-bit field sometimes represents values in
+     0..8191 and sometimes represents values in -4096..4095.
+     If the field is signed and a is -4095 (0x1001) and b is
+     -1 (0x1fff), the sum is -4096 (0x1000), but (0x1001 +
+     0x1fff is 0x3000).  It's not clear how to handle this
+     everywhere, since there is not way to know how many bits
+     are significant in the relocation, but the original code
+     assumed that it was fully sign extended, and we will keep
+     that assumption.  */
+  signmask = (fieldmask >> 1) + 1;
+
+  if ((a & ~ fieldmask) != 0)
+    {
+      /* Some bits out of the field are set.  This might not
+	 be a problem: if this is a signed bitfield, it is OK
+	 iff all the high bits are set, including the sign
+	 bit.  We'll try setting all but the most significant
+	 bit in the original relocation value: if this is all
+	 ones, we are OK, assuming a signed bitfield.  */
+      ss = (signmask << howto->rightshift) - 1;
+      if ((ss | relocation) != ~ (bfd_vma) 0)
+	return TRUE;
+      a &= fieldmask;
+    }
+
+  /* We just assume (b & ~ fieldmask) == 0.  */
+
+  /* We explicitly permit wrap around if this relocation
+     covers the high bit of an address.  The Linux kernel
+     relies on it, and it is the only way to write assembler
+     code which can run when loaded at a location 0x80000000
+     away from the location at which it is linked.  */
+  if (howto->bitsize + howto->rightshift
+      == bfd_arch_bits_per_address (input_bfd))
+    return FALSE;
+
+  sum = a + b;
+  if (sum < a || (sum & ~ fieldmask) != 0)
+    {
+      /* There was a carry out, or the field overflow.  Test
+	 for signed operands again.  Here is the overflow test
+	 is as for complain_overflow_signed.  */
+      if (((~ (a ^ b)) & (a ^ sum)) & signmask)
+	return TRUE;
+    }
+
+  return FALSE;
+}
+
+static bfd_boolean
+xcoff_complain_overflow_signed_func (bfd *input_bfd,
+                                     bfd_vma val,
+                                     bfd_vma relocation,
+                                     struct reloc_howto_struct *howto)
+{
+  bfd_vma addrmask, fieldmask, signmask, ss;
+  bfd_vma a, b, sum;
+
+  /* Get the values to be added together.  For signed and unsigned
+     relocations, we assume that all values should be truncated to
+     the size of an address.  For bitfields, all the bits matter.
+     See also bfd_check_overflow.  */
+  fieldmask = N_ONES (howto->bitsize);
+  addrmask = N_ONES (bfd_arch_bits_per_address (input_bfd)) | fieldmask;
+  a = relocation;
+  b = val & howto->src_mask;
+
+  a = (a & addrmask) >> howto->rightshift;
+
+  /* If any sign bits are set, all sign bits must be set.
+     That is, A must be a valid negative address after
+     shifting.  */
+  signmask = ~ (fieldmask >> 1);
+  ss = a & signmask;
+  if (ss != 0 && ss != ((addrmask >> howto->rightshift) & signmask))
+    return TRUE;
+
+  /* We only need this next bit of code if the sign bit of B
+     is below the sign bit of A.  This would only happen if
+     SRC_MASK had fewer bits than BITSIZE.  Note that if
+     SRC_MASK has more bits than BITSIZE, we can get into
+     trouble; we would need to verify that B is in range, as
+     we do for A above.  */
+  signmask = ((~ howto->src_mask) >> 1) & howto->src_mask;
+  if ((b & signmask) != 0)
+    {
+      /* Set all the bits above the sign bit.  */
+      b -= signmask <<= 1;
+    }
+
+  b = (b & addrmask) >> howto->bitpos;
+
+  /* Now we can do the addition.  */
+  sum = a + b;
+
+  /* See if the result has the correct sign.  Bits above the
+     sign bit are junk now; ignore them.  If the sum is
+     positive, make sure we did not have all negative inputs;
+     if the sum is negative, make sure we did not have all
+     positive inputs.  The test below looks only at the sign
+     bits, and it really just
+     SIGN (A) == SIGN (B) && SIGN (A) != SIGN (SUM)
+  */
+  signmask = (fieldmask >> 1) + 1;
+  if (((~ (a ^ b)) & (a ^ sum)) & signmask)
+    return TRUE;
+
+  return FALSE;
+}
+
+static bfd_boolean
+xcoff_complain_overflow_unsigned_func (bfd *input_bfd,
+                                       bfd_vma val,
+                                       bfd_vma relocation,
+                                       struct reloc_howto_struct *howto)
+{
+  bfd_vma addrmask, fieldmask;
+  bfd_vma a, b, sum;
+
+  /* Get the values to be added together.  For signed and unsigned
+     relocations, we assume that all values should be truncated to
+     the size of an address.  For bitfields, all the bits matter.
+     See also bfd_check_overflow.  */
+  fieldmask = N_ONES (howto->bitsize);
+  addrmask = N_ONES (bfd_arch_bits_per_address (input_bfd)) | fieldmask;
+  a = relocation;
+  b = val & howto->src_mask;
+
+  /* Checking for an unsigned overflow is relatively easy:
+     trim the addresses and add, and trim the result as well.
+     Overflow is normally indicated when the result does not
+     fit in the field.  However, we also need to consider the
+     case when, e.g., fieldmask is 0x7fffffff or smaller, an
+     input is 0x80000000, and bfd_vma is only 32 bits; then we
+     will get sum == 0, but there is an overflow, since the
+     inputs did not fit in the field.  Instead of doing a
+     separate test, we can check for this by or-ing in the
+     operands when testing for the sum overflowing its final
+     field.  */
+  a = (a & addrmask) >> howto->rightshift;
+  b = (b & addrmask) >> howto->bitpos;
+  sum = (a + b) & addrmask;
+  if ((a | b | sum) & ~ fieldmask)
+    return TRUE;
+
+  return FALSE;
+}
+
+/* This is the relocation function for the RS/6000/POWER/PowerPC.
+   This is currently the only processor which uses XCOFF; I hope that
+   will never change.
+
+   I took the relocation type definitions from two documents:
+   the PowerPC AIX Version 4 Application Binary Interface, First
+   Edition (April 1992), and the PowerOpen ABI, Big-Endian
+   32-Bit Hardware Implementation (June 30, 1994).  Differences
+   between the documents are noted below.
+
+   Unsupported r_type's
+
+   R_RTB:
+   R_RRTBI:
+   R_RRTBA:
+
+   These relocs are defined by the PowerPC ABI to be
+   relative branches which use half of the difference
+   between the symbol and the program counter.  I can't
+   quite figure out when this is useful.  These relocs are
+   not defined by the PowerOpen ABI.
+
+   Supported r_type's
+
+   R_POS:
+   Simple positive relocation.
+
+   R_NEG:
+   Simple negative relocation.
+
+   R_REL:
+   Simple PC relative relocation.
+
+   R_TOC:
+   TOC relative relocation.  The value in the instruction in
+   the input file is the offset from the input file TOC to
+   the desired location.  We want the offset from the final
+   TOC to the desired location.  We have:
+   isym = iTOC + in
+   iinsn = in + o
+   osym = oTOC + on
+   oinsn = on + o
+   so we must change insn by on - in.
+
+   R_GL:
+   GL linkage relocation.  The value of this relocation
+   is the address of the entry in the TOC section.
+
+   R_TCL:
+   Local object TOC address.  I can't figure out the
+   difference between this and case R_GL.
+
+   R_TRL:
+   TOC relative relocation.  A TOC relative load instruction
+   which may be changed to a load address instruction.
+   FIXME: We don't currently implement this optimization.
+
+   R_TRLA:
+   TOC relative relocation.  This is a TOC relative load
+   address instruction which may be changed to a load
+   instruction.  FIXME: I don't know if this is the correct
+   implementation.
+
+   R_BA:
+   Absolute branch.  We don't want to mess with the lower
+   two bits of the instruction.
+
+   R_CAI:
+   The PowerPC ABI defines this as an absolute call which
+   may be modified to become a relative call.  The PowerOpen
+   ABI does not define this relocation type.
+
+   R_RBA:
+   Absolute branch which may be modified to become a
+   relative branch.
+
+   R_RBAC:
+   The PowerPC ABI defines this as an absolute branch to a
+   fixed address which may be modified to an absolute branch
+   to a symbol.  The PowerOpen ABI does not define this
+   relocation type.
+
+   R_RBRC:
+   The PowerPC ABI defines this as an absolute branch to a
+   fixed address which may be modified to a relative branch.
+   The PowerOpen ABI does not define this relocation type.
+
+   R_BR:
+   Relative branch.  We don't want to mess with the lower
+   two bits of the instruction.
+
+   R_CREL:
+   The PowerPC ABI defines this as a relative call which may
+   be modified to become an absolute call.  The PowerOpen
+   ABI does not define this relocation type.
+
+   R_RBR:
+   A relative branch which may be modified to become an
+   absolute branch.
+
+   R_RL:
+   The PowerPC AIX ABI describes this as a load which may be
+   changed to a load address.  The PowerOpen ABI says this
+   is the same as case R_POS.
+
+   R_RLA:
+   The PowerPC AIX ABI describes this as a load address
+   which may be changed to a load.  The PowerOpen ABI says
+   this is the same as R_POS.
+*/
+
+bfd_boolean
+xcoff_ppc_relocate_section (bfd *output_bfd,
+                            struct bfd_link_info *info,
+                            bfd *input_bfd,
+                            asection *input_section,
+                            bfd_byte *contents,
+                            struct internal_reloc *relocs,
+                            struct internal_syment *syms,
+                            asection **sections)
+{
+  struct internal_reloc *rel;
+  struct internal_reloc *relend;
+
+  rel = relocs;
+  relend = rel + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      long symndx;
+      struct xcoff_link_hash_entry *h;
+      struct internal_syment *sym;
+      bfd_vma addend;
+      bfd_vma val;
+      struct reloc_howto_struct howto;
+      bfd_vma relocation;
+      bfd_vma value_to_relocate;
+      bfd_vma address;
+      bfd_byte *location;
+
+      /* Relocation type R_REF is a special relocation type which is
+	 merely used to prevent garbage collection from occurring for
+	 the csect including the symbol which it references.  */
+      if (rel->r_type == R_REF)
+	continue;
+
+      /* howto */
+      howto.type = rel->r_type;
+      howto.rightshift = 0;
+      howto.bitsize = (rel->r_size & 0x1f) + 1;
+      howto.size = howto.bitsize > 16 ? 2 : 1;
+      howto.pc_relative = FALSE;
+      howto.bitpos = 0;
+      howto.complain_on_overflow = (rel->r_size & 0x80
+				    ? complain_overflow_signed
+				    : complain_overflow_bitfield);
+      howto.special_function = NULL;
+      howto.name = "internal";
+      howto.partial_inplace = TRUE;
+      howto.src_mask = howto.dst_mask = N_ONES (howto.bitsize);
+      howto.pcrel_offset = FALSE;
+
+      /* symbol */
+      val = 0;
+      addend = 0;
+      h = NULL;
+      sym = NULL;
+      symndx = rel->r_symndx;
+
+      if (-1 != symndx)
+	{
+	  asection *sec;
+
+	  h = obj_xcoff_sym_hashes (input_bfd)[symndx];
+	  sym = syms + symndx;
+	  addend = - sym->n_value;
+
+	  if (NULL == h)
+	    {
+	      sec = sections[symndx];
+	      /* Hack to make sure we use the right TOC anchor value
+		 if this reloc is against the TOC anchor.  */
+	      if (sec->name[3] == '0'
+		  && strcmp (sec->name, ".tc0") == 0)
+		val = xcoff_data (output_bfd)->toc;
+	      else
+		val = (sec->output_section->vma
+		       + sec->output_offset
+		       + sym->n_value
+		       - sec->vma);
+	    }
+	  else
+	    {
+	      if (info->unresolved_syms_in_objects != RM_IGNORE
+		  && (h->flags & XCOFF_WAS_UNDEFINED) != 0)
+		{
+		  if (! ((*info->callbacks->undefined_symbol)
+			 (info, h->root.root.string,
+			  input_bfd, input_section,
+			  rel->r_vaddr - input_section->vma,
+			  (info->unresolved_syms_in_objects
+			   == RM_GENERATE_ERROR))))
+		    return FALSE;
+		}
+	      if (h->root.type == bfd_link_hash_defined
+		  || h->root.type == bfd_link_hash_defweak)
+		{
+		  sec = h->root.u.def.section;
+		  val = (h->root.u.def.value
+			 + sec->output_section->vma
+			 + sec->output_offset);
+		}
+	      else if (h->root.type == bfd_link_hash_common)
+		{
+		  sec = h->root.u.c.p->section;
+		  val = (sec->output_section->vma
+			 + sec->output_offset);
+
+		}
+	      else
+		{
+		  BFD_ASSERT (info->relocatable
+			      || (info->static_link
+				  && (h->flags & XCOFF_WAS_UNDEFINED) != 0)
+			      || (h->flags & XCOFF_DEF_DYNAMIC) != 0
+			      || (h->flags & XCOFF_IMPORT) != 0);
+		}
+	    }
+	}
+
+      if (rel->r_type >= XCOFF_MAX_CALCULATE_RELOCATION
+	  || !((*xcoff_calculate_relocation[rel->r_type])
+	       (input_bfd, input_section, output_bfd, rel, sym, &howto, val,
+		addend, &relocation, contents)))
+	return FALSE;
+
+      /* address */
+      address = rel->r_vaddr - input_section->vma;
+      location = contents + address;
+
+      if (address > input_section->size)
+	abort ();
+
+      /* Get the value we are going to relocate.  */
+      if (1 == howto.size)
+	value_to_relocate = bfd_get_16 (input_bfd, location);
+      else
+	value_to_relocate = bfd_get_32 (input_bfd, location);
+
+      /* overflow.
+
+	 FIXME: We may drop bits during the addition
+	 which we don't check for.  We must either check at every single
+	 operation, which would be tedious, or we must do the computations
+	 in a type larger than bfd_vma, which would be inefficient.  */
+
+      if ((unsigned int) howto.complain_on_overflow
+	  >= XCOFF_MAX_COMPLAIN_OVERFLOW)
+	abort ();
+
+      if (((*xcoff_complain_overflow[howto.complain_on_overflow])
+	   (input_bfd, value_to_relocate, relocation, &howto)))
+	{
+	  const char *name;
+	  char buf[SYMNMLEN + 1];
+	  char reloc_type_name[10];
+
+	  if (symndx == -1)
+	    {
+	      name = "*ABS*";
+	    }
+	  else if (h != NULL)
+	    {
+	      name = NULL;
+	    }
+	  else
+	    {
+	      name = _bfd_coff_internal_syment_name (input_bfd, sym, buf);
+	      if (name == NULL)
+		name = "UNKNOWN";
+	    }
+	  sprintf (reloc_type_name, "0x%02x", rel->r_type);
+
+	  if (! ((*info->callbacks->reloc_overflow)
+		 (info, (h ? &h->root : NULL), name, reloc_type_name,
+		  (bfd_vma) 0, input_bfd, input_section,
+		  rel->r_vaddr - input_section->vma)))
+	    return FALSE;
+	}
+
+      /* Add RELOCATION to the right bits of VALUE_TO_RELOCATE.  */
+      value_to_relocate = ((value_to_relocate & ~howto.dst_mask)
+			   | (((value_to_relocate & howto.src_mask)
+			       + relocation) & howto.dst_mask));
+
+      /* Put the value back in the object file.  */
+      if (1 == howto.size)
+	bfd_put_16 (input_bfd, value_to_relocate, location);
+      else
+	bfd_put_32 (input_bfd, value_to_relocate, location);
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+_bfd_xcoff_put_ldsymbol_name (bfd *abfd ATTRIBUTE_UNUSED,
+                              struct xcoff_loader_info *ldinfo,
+                              struct internal_ldsym *ldsym,
+                              const char *name)
+{
+  size_t len;
+  len = strlen (name);
+
+  if (len <= SYMNMLEN)
+    strncpy (ldsym->_l._l_name, name, SYMNMLEN);
+  else
+    {
+      if (ldinfo->string_size + len + 3 > ldinfo->string_alc)
+	{
+	  bfd_size_type newalc;
+	  char *newstrings;
+
+	  newalc = ldinfo->string_alc * 2;
+	  if (newalc == 0)
+	    newalc = 32;
+	  while (ldinfo->string_size + len + 3 > newalc)
+	    newalc *= 2;
+
+	  newstrings = bfd_realloc (ldinfo->strings, newalc);
+	  if (newstrings == NULL)
+	    {
+	      ldinfo->failed = TRUE;
+	      return FALSE;
+	    }
+	  ldinfo->string_alc = newalc;
+	  ldinfo->strings = newstrings;
+	}
+
+      bfd_put_16 (ldinfo->output_bfd, (bfd_vma) (len + 1),
+		  ldinfo->strings + ldinfo->string_size);
+      strcpy (ldinfo->strings + ldinfo->string_size + 2, name);
+      ldsym->_l._l_l._l_zeroes = 0;
+      ldsym->_l._l_l._l_offset = ldinfo->string_size + 2;
+      ldinfo->string_size += len + 3;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+_bfd_xcoff_put_symbol_name (bfd *abfd, struct bfd_strtab_hash *strtab,
+			    struct internal_syment *sym,
+			    const char *name)
+{
+  if (strlen (name) <= SYMNMLEN)
+    {
+      strncpy (sym->_n._n_name, name, SYMNMLEN);
+    }
+  else
+    {
+      bfd_boolean hash;
+      bfd_size_type indx;
+
+      hash = TRUE;
+      if ((abfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
+	hash = FALSE;
+      indx = _bfd_stringtab_add (strtab, name, hash, FALSE);
+      if (indx == (bfd_size_type) -1)
+	return FALSE;
+      sym->_n._n_n._n_zeroes = 0;
+      sym->_n._n_n._n_offset = STRING_SIZE_SIZE + indx;
+    }
+  return TRUE;
+}
+
+static asection *
+xcoff_create_csect_from_smclas (bfd *abfd,
+                                union internal_auxent *aux,
+                                const char *symbol_name)
+{
+  asection *return_value = NULL;
+
+  /* .sv64 = x_smclas == 17
+     This is an invalid csect for 32 bit apps.  */
+  static const char *names[19] =
+  {
+    ".pr", ".ro", ".db", ".tc", ".ua", ".rw", ".gl", ".xo",
+    ".sv", ".bs", ".ds", ".uc", ".ti", ".tb", NULL, ".tc0",
+    ".td", NULL, ".sv3264"
+  };
+
+  if ((19 >= aux->x_csect.x_smclas)
+      && (NULL != names[aux->x_csect.x_smclas]))
+    {
+      return_value = bfd_make_section_anyway
+	(abfd, names[aux->x_csect.x_smclas]);
+    }
+  else
+    {
+      (*_bfd_error_handler)
+	(_("%B: symbol `%s' has unrecognized smclas %d"),
+	 abfd, symbol_name, aux->x_csect.x_smclas);
+      bfd_set_error (bfd_error_bad_value);
+    }
+
+  return return_value;
+}
+
+static bfd_boolean
+xcoff_is_lineno_count_overflow (bfd *abfd ATTRIBUTE_UNUSED, bfd_vma value)
+{
+  if (0xffff <= value)
+    return TRUE;
+
+  return FALSE;
+}
+
+static bfd_boolean
+xcoff_is_reloc_count_overflow (bfd *abfd ATTRIBUTE_UNUSED, bfd_vma value)
+{
+  if (0xffff <= value)
+    return TRUE;
+
+  return FALSE;
+}
+
+static bfd_vma
+xcoff_loader_symbol_offset (bfd *abfd,
+                            struct internal_ldhdr *ldhdr ATTRIBUTE_UNUSED)
+{
+  return bfd_xcoff_ldhdrsz (abfd);
+}
+
+static bfd_vma
+xcoff_loader_reloc_offset (bfd *abfd, struct internal_ldhdr *ldhdr)
+{
+  return bfd_xcoff_ldhdrsz (abfd) + ldhdr->l_nsyms * bfd_xcoff_ldsymsz (abfd);
+}
+
+static bfd_boolean
+xcoff_generate_rtinit  (bfd *abfd, const char *init, const char *fini,
+                        bfd_boolean rtld)
+{
+  bfd_byte filehdr_ext[FILHSZ];
+  bfd_byte scnhdr_ext[SCNHSZ];
+  bfd_byte syment_ext[SYMESZ * 10];
+  bfd_byte reloc_ext[RELSZ * 3];
+  bfd_byte *data_buffer;
+  bfd_size_type data_buffer_size;
+  bfd_byte *string_table = NULL, *st_tmp = NULL;
+  bfd_size_type string_table_size;
+  bfd_vma val;
+  size_t initsz, finisz;
+  struct internal_filehdr filehdr;
+  struct internal_scnhdr scnhdr;
+  struct internal_syment syment;
+  union internal_auxent auxent;
+  struct internal_reloc reloc;
+
+  char *data_name = ".data";
+  char *rtinit_name = "__rtinit";
+  char *rtld_name = "__rtld";
+
+  if (! bfd_xcoff_rtinit_size (abfd))
+    return FALSE;
+
+  initsz = (init == NULL ? 0 : 1 + strlen (init));
+  finisz = (fini == NULL ? 0 : 1 + strlen (fini));
+
+  /* file header */
+  memset (filehdr_ext, 0, FILHSZ);
+  memset (&filehdr, 0, sizeof (struct internal_filehdr));
+  filehdr.f_magic = bfd_xcoff_magic_number (abfd);
+  filehdr.f_nscns = 1;
+  filehdr.f_timdat = 0;
+  filehdr.f_nsyms = 0;  /* at least 6, no more than 10 */
+  filehdr.f_symptr = 0; /* set below */
+  filehdr.f_opthdr = 0;
+  filehdr.f_flags = 0;
+
+  /* section header */
+  memset (scnhdr_ext, 0, SCNHSZ);
+  memset (&scnhdr, 0, sizeof (struct internal_scnhdr));
+  memcpy (scnhdr.s_name, data_name, strlen (data_name));
+  scnhdr.s_paddr = 0;
+  scnhdr.s_vaddr = 0;
+  scnhdr.s_size = 0;    /* set below */
+  scnhdr.s_scnptr = FILHSZ + SCNHSZ;
+  scnhdr.s_relptr = 0;  /* set below */
+  scnhdr.s_lnnoptr = 0;
+  scnhdr.s_nreloc = 0;  /* either 1 or 2 */
+  scnhdr.s_nlnno = 0;
+  scnhdr.s_flags = STYP_DATA;
+
+  /* .data
+     0x0000	      0x00000000 : rtl
+     0x0004	      0x00000010 : offset to init, or 0
+     0x0008	      0x00000028 : offset to fini, or 0
+     0x000C	      0x0000000C : size of descriptor
+     0x0010	      0x00000000 : init, needs a reloc
+     0x0014	      0x00000040 : offset to init name
+     0x0018	      0x00000000 : flags, padded to a word
+     0x001C	      0x00000000 : empty init
+     0x0020	      0x00000000 :
+     0x0024	      0x00000000 :
+     0x0028	      0x00000000 : fini, needs a reloc
+     0x002C	      0x00000??? : offset to fini name
+     0x0030	      0x00000000 : flags, padded to a word
+     0x0034	      0x00000000 : empty fini
+     0x0038	      0x00000000 :
+     0x003C	      0x00000000 :
+     0x0040	      init name
+     0x0040 + initsz  fini name */
+
+  data_buffer_size = 0x0040 + initsz + finisz;
+  data_buffer_size = (data_buffer_size + 7) &~ (bfd_size_type) 7;
+  data_buffer = NULL;
+  data_buffer = (bfd_byte *) bfd_zmalloc (data_buffer_size);
+  if (data_buffer == NULL)
+    return FALSE;
+
+  if (initsz)
+    {
+      val = 0x10;
+      bfd_h_put_32 (abfd, val, &data_buffer[0x04]);
+      val = 0x40;
+      bfd_h_put_32 (abfd, val, &data_buffer[0x14]);
+      memcpy (&data_buffer[val], init, initsz);
+    }
+
+  if (finisz)
+    {
+      val = 0x28;
+      bfd_h_put_32 (abfd, val, &data_buffer[0x08]);
+      val = 0x40 + initsz;
+      bfd_h_put_32 (abfd, val, &data_buffer[0x2C]);
+      memcpy (&data_buffer[val], fini, finisz);
+    }
+
+  val = 0x0C;
+  bfd_h_put_32 (abfd, val, &data_buffer[0x0C]);
+
+  scnhdr.s_size = data_buffer_size;
+
+  /* string table */
+  string_table_size = 0;
+  if (initsz > 9)
+    string_table_size += initsz;
+  if (finisz > 9)
+    string_table_size += finisz;
+  if (string_table_size)
+    {
+      string_table_size += 4;
+      string_table = (bfd_byte *) bfd_zmalloc (string_table_size);
+      if (string_table == NULL)
+	return FALSE;
+
+      val = string_table_size;
+      bfd_h_put_32 (abfd, val, &string_table[0]);
+      st_tmp = string_table + 4;
+    }
+
+  /* symbols
+     0. .data csect
+     2. __rtinit
+     4. init function
+     6. fini function
+     8. __rtld  */
+  memset (syment_ext, 0, 10 * SYMESZ);
+  memset (reloc_ext, 0, 3 * RELSZ);
+
+  /* .data csect */
+  memset (&syment, 0, sizeof (struct internal_syment));
+  memset (&auxent, 0, sizeof (union internal_auxent));
+  memcpy (syment._n._n_name, data_name, strlen (data_name));
+  syment.n_scnum = 1;
+  syment.n_sclass = C_HIDEXT;
+  syment.n_numaux = 1;
+  auxent.x_csect.x_scnlen.l = data_buffer_size;
+  auxent.x_csect.x_smtyp = 3 << 3 | XTY_SD;
+  auxent.x_csect.x_smclas = XMC_RW;
+  bfd_coff_swap_sym_out (abfd, &syment,
+			 &syment_ext[filehdr.f_nsyms * SYMESZ]);
+  bfd_coff_swap_aux_out (abfd, &auxent, syment.n_type, syment.n_sclass, 0,
+			 syment.n_numaux,
+			 &syment_ext[(filehdr.f_nsyms + 1) * SYMESZ]);
+  filehdr.f_nsyms += 2;
+
+  /* __rtinit */
+  memset (&syment, 0, sizeof (struct internal_syment));
+  memset (&auxent, 0, sizeof (union internal_auxent));
+  memcpy (syment._n._n_name, rtinit_name, strlen (rtinit_name));
+  syment.n_scnum = 1;
+  syment.n_sclass = C_EXT;
+  syment.n_numaux = 1;
+  auxent.x_csect.x_smtyp = XTY_LD;
+  auxent.x_csect.x_smclas = XMC_RW;
+  bfd_coff_swap_sym_out (abfd, &syment,
+			 &syment_ext[filehdr.f_nsyms * SYMESZ]);
+  bfd_coff_swap_aux_out (abfd, &auxent, syment.n_type, syment.n_sclass, 0,
+			 syment.n_numaux,
+			 &syment_ext[(filehdr.f_nsyms + 1) * SYMESZ]);
+  filehdr.f_nsyms += 2;
+
+  /* init */
+  if (initsz)
+    {
+      memset (&syment, 0, sizeof (struct internal_syment));
+      memset (&auxent, 0, sizeof (union internal_auxent));
+
+      if (initsz > 9)
+	{
+	  syment._n._n_n._n_offset = st_tmp - string_table;
+	  memcpy (st_tmp, init, initsz);
+	  st_tmp += initsz;
+	}
+      else
+	memcpy (syment._n._n_name, init, initsz - 1);
+
+      syment.n_sclass = C_EXT;
+      syment.n_numaux = 1;
+      bfd_coff_swap_sym_out (abfd, &syment,
+			     &syment_ext[filehdr.f_nsyms * SYMESZ]);
+      bfd_coff_swap_aux_out (abfd, &auxent, syment.n_type, syment.n_sclass, 0,
+			     syment.n_numaux,
+			     &syment_ext[(filehdr.f_nsyms + 1) * SYMESZ]);
+
+      /* reloc */
+      memset (&reloc, 0, sizeof (struct internal_reloc));
+      reloc.r_vaddr = 0x0010;
+      reloc.r_symndx = filehdr.f_nsyms;
+      reloc.r_type = R_POS;
+      reloc.r_size = 31;
+      bfd_coff_swap_reloc_out (abfd, &reloc, &reloc_ext[0]);
+
+      filehdr.f_nsyms += 2;
+      scnhdr.s_nreloc += 1;
+    }
+
+  /* fini */
+  if (finisz)
+    {
+      memset (&syment, 0, sizeof (struct internal_syment));
+      memset (&auxent, 0, sizeof (union internal_auxent));
+
+      if (finisz > 9)
+	{
+	  syment._n._n_n._n_offset = st_tmp - string_table;
+	  memcpy (st_tmp, fini, finisz);
+	  st_tmp += finisz;
+	}
+      else
+	memcpy (syment._n._n_name, fini, finisz - 1);
+
+      syment.n_sclass = C_EXT;
+      syment.n_numaux = 1;
+      bfd_coff_swap_sym_out (abfd, &syment,
+			     &syment_ext[filehdr.f_nsyms * SYMESZ]);
+      bfd_coff_swap_aux_out (abfd, &auxent, syment.n_type, syment.n_sclass, 0,
+			     syment.n_numaux,
+			     &syment_ext[(filehdr.f_nsyms + 1) * SYMESZ]);
+
+      /* reloc */
+      memset (&reloc, 0, sizeof (struct internal_reloc));
+      reloc.r_vaddr = 0x0028;
+      reloc.r_symndx = filehdr.f_nsyms;
+      reloc.r_type = R_POS;
+      reloc.r_size = 31;
+      bfd_coff_swap_reloc_out (abfd, &reloc,
+			       &reloc_ext[scnhdr.s_nreloc * RELSZ]);
+
+      filehdr.f_nsyms += 2;
+      scnhdr.s_nreloc += 1;
+    }
+
+  if (rtld)
+    {
+      memset (&syment, 0, sizeof (struct internal_syment));
+      memset (&auxent, 0, sizeof (union internal_auxent));
+      memcpy (syment._n._n_name, rtld_name, strlen (rtld_name));
+      syment.n_sclass = C_EXT;
+      syment.n_numaux = 1;
+      bfd_coff_swap_sym_out (abfd, &syment,
+			     &syment_ext[filehdr.f_nsyms * SYMESZ]);
+      bfd_coff_swap_aux_out (abfd, &auxent, syment.n_type, syment.n_sclass, 0,
+			     syment.n_numaux,
+			     &syment_ext[(filehdr.f_nsyms + 1) * SYMESZ]);
+
+      /* reloc */
+      memset (&reloc, 0, sizeof (struct internal_reloc));
+      reloc.r_vaddr = 0x0000;
+      reloc.r_symndx = filehdr.f_nsyms;
+      reloc.r_type = R_POS;
+      reloc.r_size = 31;
+      bfd_coff_swap_reloc_out (abfd, &reloc,
+			       &reloc_ext[scnhdr.s_nreloc * RELSZ]);
+
+      filehdr.f_nsyms += 2;
+      scnhdr.s_nreloc += 1;
+    }
+
+  scnhdr.s_relptr = scnhdr.s_scnptr + data_buffer_size;
+  filehdr.f_symptr = scnhdr.s_relptr + scnhdr.s_nreloc * RELSZ;
+
+  bfd_coff_swap_filehdr_out (abfd, &filehdr, filehdr_ext);
+  bfd_bwrite (filehdr_ext, FILHSZ, abfd);
+  bfd_coff_swap_scnhdr_out (abfd, &scnhdr, scnhdr_ext);
+  bfd_bwrite (scnhdr_ext, SCNHSZ, abfd);
+  bfd_bwrite (data_buffer, data_buffer_size, abfd);
+  bfd_bwrite (reloc_ext, scnhdr.s_nreloc * RELSZ, abfd);
+  bfd_bwrite (syment_ext, filehdr.f_nsyms * SYMESZ, abfd);
+  bfd_bwrite (string_table, string_table_size, abfd);
+
+  free (data_buffer);
+  data_buffer = NULL;
+
+  return TRUE;
+}
+
+
+static reloc_howto_type xcoff_dynamic_reloc =
+HOWTO (0,			/* type */
+       0,			/* rightshift */
+       2,			/* size (0 = byte, 1 = short, 2 = long) */
+       32,			/* bitsize */
+       FALSE,			/* pc_relative */
+       0,			/* bitpos */
+       complain_overflow_bitfield, /* complain_on_overflow */
+       0,			/* special_function */
+       "R_POS",			/* name */
+       TRUE,			/* partial_inplace */
+       0xffffffff,		/* src_mask */
+       0xffffffff,		/* dst_mask */
+       FALSE);			/* pcrel_offset */
+
+/*  glink
+
+   The first word of global linkage code must be modified by filling in
+   the correct TOC offset.  */
+
+static unsigned long xcoff_glink_code[9] =
+  {
+    0x81820000,	/* lwz r12,0(r2) */
+    0x90410014,	/* stw r2,20(r1) */
+    0x800c0000,	/* lwz r0,0(r12) */
+    0x804c0004,	/* lwz r2,4(r12) */
+    0x7c0903a6,	/* mtctr r0 */
+    0x4e800420,	/* bctr */
+    0x00000000,	/* start of traceback table */
+    0x000c8000,	/* traceback table */
+    0x00000000,	/* traceback table */
+  };
+
+/* Table to convert DWARF flags to section names.  */
+
+const struct xcoff_dwsect_name xcoff_dwsect_names[] = {
+  { SSUBTYP_DWINFO,  ".dwinfo",   TRUE },
+  { SSUBTYP_DWLINE,  ".dwline",   TRUE },
+  { SSUBTYP_DWPBNMS, ".dwpbnms",  TRUE },
+  { SSUBTYP_DWPBTYP, ".dwpbtyp",  TRUE },
+  { SSUBTYP_DWARNGE, ".dwarnge",  TRUE },
+  { SSUBTYP_DWABREV, ".dwabrev",  FALSE },
+  { SSUBTYP_DWSTR,   ".dwstr",    TRUE },
+  { SSUBTYP_DWRNGES, ".dwrnges",  TRUE }
+};
+
+static const struct xcoff_backend_data_rec bfd_xcoff_backend_data =
+  {
+    { /* COFF backend, defined in libcoff.h.  */
+      _bfd_xcoff_swap_aux_in,
+      _bfd_xcoff_swap_sym_in,
+      coff_swap_lineno_in,
+      _bfd_xcoff_swap_aux_out,
+      _bfd_xcoff_swap_sym_out,
+      coff_swap_lineno_out,
+      xcoff_swap_reloc_out,
+      coff_swap_filehdr_out,
+      coff_swap_aouthdr_out,
+      coff_swap_scnhdr_out,
+      FILHSZ,
+      AOUTSZ,
+      SCNHSZ,
+      SYMESZ,
+      AUXESZ,
+      RELSZ,
+      LINESZ,
+      FILNMLEN,
+      TRUE,			/* _bfd_coff_long_filenames */
+      XCOFF_NO_LONG_SECTION_NAMES,  /* _bfd_coff_long_section_names */
+      3,			/* _bfd_coff_default_section_alignment_power */
+      FALSE,			/* _bfd_coff_force_symnames_in_strings */
+      2,			/* _bfd_coff_debug_string_prefix_length */
+      coff_swap_filehdr_in,
+      coff_swap_aouthdr_in,
+      coff_swap_scnhdr_in,
+      xcoff_swap_reloc_in,
+      coff_bad_format_hook,
+      coff_set_arch_mach_hook,
+      coff_mkobject_hook,
+      styp_to_sec_flags,
+      coff_set_alignment_hook,
+      coff_slurp_symbol_table,
+      symname_in_debug_hook,
+      coff_pointerize_aux_hook,
+      coff_print_aux,
+      dummy_reloc16_extra_cases,
+      dummy_reloc16_estimate,
+      NULL,			/* bfd_coff_sym_is_global */
+      coff_compute_section_file_positions,
+      NULL,			/* _bfd_coff_start_final_link */
+      xcoff_ppc_relocate_section,
+      coff_rtype_to_howto,
+      NULL,			/* _bfd_coff_adjust_symndx */
+      _bfd_generic_link_add_one_symbol,
+      coff_link_output_has_begun,
+      coff_final_link_postscript,
+      NULL			/* print_pdata.  */
+    },
+
+    0x01DF,			/* magic number */
+    bfd_arch_rs6000,
+    bfd_mach_rs6k,
+
+    /* Function pointers to xcoff specific swap routines.  */
+    xcoff_swap_ldhdr_in,
+    xcoff_swap_ldhdr_out,
+    xcoff_swap_ldsym_in,
+    xcoff_swap_ldsym_out,
+    xcoff_swap_ldrel_in,
+    xcoff_swap_ldrel_out,
+
+    /* Sizes.  */
+    LDHDRSZ,
+    LDSYMSZ,
+    LDRELSZ,
+    12,				/* _xcoff_function_descriptor_size */
+    SMALL_AOUTSZ,
+
+    /* Versions.  */
+    1,				/* _xcoff_ldhdr_version */
+
+    _bfd_xcoff_put_symbol_name,
+    _bfd_xcoff_put_ldsymbol_name,
+    &xcoff_dynamic_reloc,
+    xcoff_create_csect_from_smclas,
+
+    /* Lineno and reloc count overflow.  */
+    xcoff_is_lineno_count_overflow,
+    xcoff_is_reloc_count_overflow,
+
+    xcoff_loader_symbol_offset,
+    xcoff_loader_reloc_offset,
+
+    /* glink.  */
+    &xcoff_glink_code[0],
+    36,				/* _xcoff_glink_size */
+
+    /* rtinit */
+    64,				/* _xcoff_rtinit_size */
+    xcoff_generate_rtinit,
+  };
+
+/* The transfer vector that leads the outside world to all of the above.  */
+const bfd_target rs6000coff_vec =
+  {
+    "aixcoff-rs6000",
+    bfd_target_xcoff_flavour,
+    BFD_ENDIAN_BIG,		/* data byte order is big */
+    BFD_ENDIAN_BIG,		/* header byte order is big */
+
+    (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | DYNAMIC
+     | HAS_SYMS | HAS_LOCALS | WP_TEXT),
+
+    SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA,
+    0,				/* leading char */
+    '/',			/* ar_pad_char */
+    15,				/* ar_max_namelen */
+    0,				/* match priority.  */
+
+    /* data */
+    bfd_getb64,
+    bfd_getb_signed_64,
+    bfd_putb64,
+    bfd_getb32,
+    bfd_getb_signed_32,
+    bfd_putb32,
+    bfd_getb16,
+    bfd_getb_signed_16,
+    bfd_putb16,
+
+    /* hdrs */
+    bfd_getb64,
+    bfd_getb_signed_64,
+    bfd_putb64,
+    bfd_getb32,
+    bfd_getb_signed_32,
+    bfd_putb32,
+    bfd_getb16,
+    bfd_getb_signed_16,
+    bfd_putb16,
+
+    { /* bfd_check_format */
+      _bfd_dummy_target,
+      coff_object_p,
+      _bfd_xcoff_archive_p,
+      CORE_FILE_P
+    },
+
+    { /* bfd_set_format */
+      bfd_false,
+      coff_mkobject,
+      _bfd_generic_mkarchive,
+      bfd_false
+    },
+
+    {/* bfd_write_contents */
+      bfd_false,
+      coff_write_object_contents,
+      _bfd_xcoff_write_archive_contents,
+      bfd_false
+    },
+
+    /* Generic */
+    bfd_true,
+    bfd_true,
+    coff_new_section_hook,
+    _bfd_generic_get_section_contents,
+    _bfd_generic_get_section_contents_in_window,
+
+    /* Copy */
+    _bfd_xcoff_copy_private_bfd_data,
+    _bfd_generic_bfd_merge_private_bfd_data,
+    _bfd_generic_init_private_section_data,
+    _bfd_generic_bfd_copy_private_section_data,
+    _bfd_generic_bfd_copy_private_symbol_data,
+    _bfd_generic_bfd_copy_private_header_data,
+    _bfd_generic_bfd_set_private_flags,
+    _bfd_generic_bfd_print_private_bfd_data,
+
+    /* Core */
+    BFD_JUMP_TABLE_CORE (coff),
+
+    /* Archive */
+    _bfd_xcoff_slurp_armap,
+    _bfd_noarchive_slurp_extended_name_table,
+    _bfd_noarchive_construct_extended_name_table,
+    bfd_dont_truncate_arname,
+    _bfd_xcoff_write_armap,
+    _bfd_xcoff_read_ar_hdr,
+    _bfd_generic_write_ar_hdr,
+    _bfd_xcoff_openr_next_archived_file,
+    _bfd_generic_get_elt_at_index,
+    _bfd_xcoff_stat_arch_elt,
+    bfd_true,
+
+    /* Symbols */
+    coff_get_symtab_upper_bound,
+    coff_canonicalize_symtab,
+    coff_make_empty_symbol,
+    coff_print_symbol,
+    coff_get_symbol_info,
+    _bfd_xcoff_is_local_label_name,
+    coff_bfd_is_target_special_symbol,
+    coff_get_lineno,
+    coff_find_nearest_line,
+    _bfd_generic_find_line,
+    coff_find_inliner_info,
+    coff_bfd_make_debug_symbol,
+    _bfd_generic_read_minisymbols,
+    _bfd_generic_minisymbol_to_symbol,
+
+    /* Reloc */
+    coff_get_reloc_upper_bound,
+    coff_canonicalize_reloc,
+    _bfd_xcoff_reloc_type_lookup,
+    _bfd_xcoff_reloc_name_lookup,
+
+    /* Write */
+    coff_set_arch_mach,
+    coff_set_section_contents,
+
+    /* Link */
+    _bfd_xcoff_sizeof_headers,
+    bfd_generic_get_relocated_section_contents,
+    bfd_generic_relax_section,
+    _bfd_xcoff_bfd_link_hash_table_create,
+    _bfd_generic_link_hash_table_free,
+    _bfd_xcoff_bfd_link_add_symbols,
+    _bfd_generic_link_just_syms,
+    _bfd_generic_copy_link_hash_symbol_type,
+    _bfd_xcoff_bfd_final_link,
+    _bfd_generic_link_split_section,
+    bfd_generic_gc_sections,
+    bfd_generic_lookup_section_flags,
+    bfd_generic_merge_sections,
+    bfd_generic_is_group_section,
+    bfd_generic_discard_group,
+    _bfd_generic_section_already_linked,
+    _bfd_xcoff_define_common_symbol,
+
+    /* Dynamic */
+    _bfd_xcoff_get_dynamic_symtab_upper_bound,
+    _bfd_xcoff_canonicalize_dynamic_symtab,
+    _bfd_nodynamic_get_synthetic_symtab,
+    _bfd_xcoff_get_dynamic_reloc_upper_bound,
+    _bfd_xcoff_canonicalize_dynamic_reloc,
+
+    /* Opposite endian version, none exists */
+    NULL,
+
+    (void *) &bfd_xcoff_backend_data,
+  };
+
+/* xcoff-powermac target
+   Old target.
+   Only difference between this target and the rs6000 target is the
+   the default architecture and machine type used in coffcode.h
+
+   PowerPC Macs use the same magic numbers as RS/6000
+   (because that's how they were bootstrapped originally),
+   but they are always PowerPC architecture.  */
+static const struct xcoff_backend_data_rec bfd_pmac_xcoff_backend_data =
+  {
+    { /* COFF backend, defined in libcoff.h.  */
+      _bfd_xcoff_swap_aux_in,
+      _bfd_xcoff_swap_sym_in,
+      coff_swap_lineno_in,
+      _bfd_xcoff_swap_aux_out,
+      _bfd_xcoff_swap_sym_out,
+      coff_swap_lineno_out,
+      xcoff_swap_reloc_out,
+      coff_swap_filehdr_out,
+      coff_swap_aouthdr_out,
+      coff_swap_scnhdr_out,
+      FILHSZ,
+      AOUTSZ,
+      SCNHSZ,
+      SYMESZ,
+      AUXESZ,
+      RELSZ,
+      LINESZ,
+      FILNMLEN,
+      TRUE,			/* _bfd_coff_long_filenames */
+      XCOFF_NO_LONG_SECTION_NAMES,  /* _bfd_coff_long_section_names */
+      3,			/* _bfd_coff_default_section_alignment_power */
+      FALSE,			/* _bfd_coff_force_symnames_in_strings */
+      2,			/* _bfd_coff_debug_string_prefix_length */
+      coff_swap_filehdr_in,
+      coff_swap_aouthdr_in,
+      coff_swap_scnhdr_in,
+      xcoff_swap_reloc_in,
+      coff_bad_format_hook,
+      coff_set_arch_mach_hook,
+      coff_mkobject_hook,
+      styp_to_sec_flags,
+      coff_set_alignment_hook,
+      coff_slurp_symbol_table,
+      symname_in_debug_hook,
+      coff_pointerize_aux_hook,
+      coff_print_aux,
+      dummy_reloc16_extra_cases,
+      dummy_reloc16_estimate,
+      NULL,			/* bfd_coff_sym_is_global */
+      coff_compute_section_file_positions,
+      NULL,			/* _bfd_coff_start_final_link */
+      xcoff_ppc_relocate_section,
+      coff_rtype_to_howto,
+      NULL,			/* _bfd_coff_adjust_symndx */
+      _bfd_generic_link_add_one_symbol,
+      coff_link_output_has_begun,
+      coff_final_link_postscript,
+      NULL			/* print_pdata.  */
+    },
+
+    0x01DF,			/* magic number */
+    bfd_arch_powerpc,
+    bfd_mach_ppc,
+
+    /* Function pointers to xcoff specific swap routines.  */
+    xcoff_swap_ldhdr_in,
+    xcoff_swap_ldhdr_out,
+    xcoff_swap_ldsym_in,
+    xcoff_swap_ldsym_out,
+    xcoff_swap_ldrel_in,
+    xcoff_swap_ldrel_out,
+
+    /* Sizes.  */
+    LDHDRSZ,
+    LDSYMSZ,
+    LDRELSZ,
+    12,				/* _xcoff_function_descriptor_size */
+    SMALL_AOUTSZ,
+
+    /* Versions.  */
+    1,				/* _xcoff_ldhdr_version */
+
+    _bfd_xcoff_put_symbol_name,
+    _bfd_xcoff_put_ldsymbol_name,
+    &xcoff_dynamic_reloc,
+    xcoff_create_csect_from_smclas,
+
+    /* Lineno and reloc count overflow.  */
+    xcoff_is_lineno_count_overflow,
+    xcoff_is_reloc_count_overflow,
+
+    xcoff_loader_symbol_offset,
+    xcoff_loader_reloc_offset,
+
+    /* glink.  */
+    &xcoff_glink_code[0],
+    36,				/* _xcoff_glink_size */
+
+    /* rtinit */
+    0,				/* _xcoff_rtinit_size */
+    xcoff_generate_rtinit,
+  };
+
+/* The transfer vector that leads the outside world to all of the above.  */
+const bfd_target pmac_xcoff_vec =
+  {
+    "xcoff-powermac",
+    bfd_target_xcoff_flavour,
+    BFD_ENDIAN_BIG,		/* data byte order is big */
+    BFD_ENDIAN_BIG,		/* header byte order is big */
+
+    (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | DYNAMIC
+     | HAS_SYMS | HAS_LOCALS | WP_TEXT),
+
+    SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA,
+    0,				/* leading char */
+    '/',			/* ar_pad_char */
+    15,				/* ar_max_namelen */
+    0,				/* match priority.  */
+
+    /* data */
+    bfd_getb64,
+    bfd_getb_signed_64,
+    bfd_putb64,
+    bfd_getb32,
+    bfd_getb_signed_32,
+    bfd_putb32,
+    bfd_getb16,
+    bfd_getb_signed_16,
+    bfd_putb16,
+
+    /* hdrs */
+    bfd_getb64,
+    bfd_getb_signed_64,
+    bfd_putb64,
+    bfd_getb32,
+    bfd_getb_signed_32,
+    bfd_putb32,
+    bfd_getb16,
+    bfd_getb_signed_16,
+    bfd_putb16,
+
+    { /* bfd_check_format */
+      _bfd_dummy_target,
+      coff_object_p,
+      _bfd_xcoff_archive_p,
+      CORE_FILE_P
+    },
+
+    { /* bfd_set_format */
+      bfd_false,
+      coff_mkobject,
+      _bfd_generic_mkarchive,
+      bfd_false
+    },
+
+    {/* bfd_write_contents */
+      bfd_false,
+      coff_write_object_contents,
+      _bfd_xcoff_write_archive_contents,
+      bfd_false
+    },
+
+    /* Generic */
+    bfd_true,
+    bfd_true,
+    coff_new_section_hook,
+    _bfd_generic_get_section_contents,
+    _bfd_generic_get_section_contents_in_window,
+
+    /* Copy */
+    _bfd_xcoff_copy_private_bfd_data,
+    _bfd_generic_bfd_merge_private_bfd_data,
+    _bfd_generic_init_private_section_data,
+    _bfd_generic_bfd_copy_private_section_data,
+    _bfd_generic_bfd_copy_private_symbol_data,
+    _bfd_generic_bfd_copy_private_header_data,
+    _bfd_generic_bfd_set_private_flags,
+    _bfd_generic_bfd_print_private_bfd_data,
+
+    /* Core */
+    BFD_JUMP_TABLE_CORE (coff),
+
+    /* Archive */
+    _bfd_xcoff_slurp_armap,
+    _bfd_noarchive_slurp_extended_name_table,
+    _bfd_noarchive_construct_extended_name_table,
+    bfd_dont_truncate_arname,
+    _bfd_xcoff_write_armap,
+    _bfd_xcoff_read_ar_hdr,
+    _bfd_generic_write_ar_hdr,
+    _bfd_xcoff_openr_next_archived_file,
+    _bfd_generic_get_elt_at_index,
+    _bfd_xcoff_stat_arch_elt,
+    bfd_true,
+
+    /* Symbols */
+    coff_get_symtab_upper_bound,
+    coff_canonicalize_symtab,
+    coff_make_empty_symbol,
+    coff_print_symbol,
+    coff_get_symbol_info,
+    _bfd_xcoff_is_local_label_name,
+    coff_bfd_is_target_special_symbol,
+    coff_get_lineno,
+    coff_find_nearest_line,
+    _bfd_generic_find_line,
+    coff_find_inliner_info,
+    coff_bfd_make_debug_symbol,
+    _bfd_generic_read_minisymbols,
+    _bfd_generic_minisymbol_to_symbol,
+
+    /* Reloc */
+    coff_get_reloc_upper_bound,
+    coff_canonicalize_reloc,
+    _bfd_xcoff_reloc_type_lookup,
+    _bfd_xcoff_reloc_name_lookup,
+
+    /* Write */
+    coff_set_arch_mach,
+    coff_set_section_contents,
+
+    /* Link */
+    _bfd_xcoff_sizeof_headers,
+    bfd_generic_get_relocated_section_contents,
+    bfd_generic_relax_section,
+    _bfd_xcoff_bfd_link_hash_table_create,
+    _bfd_generic_link_hash_table_free,
+    _bfd_xcoff_bfd_link_add_symbols,
+    _bfd_generic_link_just_syms,
+    _bfd_generic_copy_link_hash_symbol_type,
+    _bfd_xcoff_bfd_final_link,
+    _bfd_generic_link_split_section,
+    bfd_generic_gc_sections,
+    bfd_generic_lookup_section_flags,
+    bfd_generic_merge_sections,
+    bfd_generic_is_group_section,
+    bfd_generic_discard_group,
+    _bfd_generic_section_already_linked,
+    _bfd_xcoff_define_common_symbol,
+
+    /* Dynamic */
+    _bfd_xcoff_get_dynamic_symtab_upper_bound,
+    _bfd_xcoff_canonicalize_dynamic_symtab,
+    _bfd_nodynamic_get_synthetic_symtab,
+    _bfd_xcoff_get_dynamic_reloc_upper_bound,
+    _bfd_xcoff_canonicalize_dynamic_reloc,
+
+    /* Opposite endian version, none exists */
+    NULL,
+
+    (void *) &bfd_pmac_xcoff_backend_data,
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-sh.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-sh.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-sh.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-sh.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3262 @@
+/* BFD back-end for Renesas Super-H COFF binaries.
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011
+   Free Software Foundation, Inc.
+   Contributed by Cygnus Support.
+   Written by Steve Chamberlain, <sac@cygnus.com>.
+   Relaxing code written by Ian Lance Taylor, <ian@cygnus.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libiberty.h"
+#include "libbfd.h"
+#include "bfdlink.h"
+#include "coff/sh.h"
+#include "coff/internal.h"
+
+#undef  bfd_pe_print_pdata
+
+#ifdef COFF_WITH_PE
+#include "coff/pe.h"
+
+#ifndef COFF_IMAGE_WITH_PE
+static bfd_boolean sh_align_load_span
+  PARAMS ((bfd *, asection *, bfd_byte *,
+	   bfd_boolean (*) (bfd *, asection *, PTR, bfd_byte *, bfd_vma),
+	   PTR, bfd_vma **, bfd_vma *, bfd_vma, bfd_vma, bfd_boolean *));
+
+#define _bfd_sh_align_load_span sh_align_load_span
+#endif
+
+#define	bfd_pe_print_pdata   _bfd_pe_print_ce_compressed_pdata
+
+#else
+
+#define	bfd_pe_print_pdata   NULL
+
+#endif /* COFF_WITH_PE.  */
+
+#include "libcoff.h"
+
+/* Internal functions.  */
+static bfd_reloc_status_type sh_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static long get_symbol_value PARAMS ((asymbol *));
+static bfd_boolean sh_relax_section
+  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
+static bfd_boolean sh_relax_delete_bytes
+  PARAMS ((bfd *, asection *, bfd_vma, int));
+#ifndef COFF_IMAGE_WITH_PE
+static const struct sh_opcode *sh_insn_info PARAMS ((unsigned int));
+#endif
+static bfd_boolean sh_align_loads
+  PARAMS ((bfd *, asection *, struct internal_reloc *, bfd_byte *,
+	   bfd_boolean *));
+static bfd_boolean sh_swap_insns
+  PARAMS ((bfd *, asection *, PTR, bfd_byte *, bfd_vma));
+static bfd_boolean sh_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+	   struct internal_reloc *, struct internal_syment *, asection **));
+static bfd_byte *sh_coff_get_relocated_section_contents
+  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
+	   bfd_byte *, bfd_boolean, asymbol **));
+static reloc_howto_type * sh_coff_reloc_type_lookup PARAMS ((bfd *, bfd_reloc_code_real_type));
+
+#ifdef COFF_WITH_PE
+/* Can't build import tables with 2**4 alignment.  */
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER	2
+#else
+/* Default section alignment to 2**4.  */
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER	4
+#endif
+
+#ifdef COFF_IMAGE_WITH_PE
+/* Align PE executables.  */
+#define COFF_PAGE_SIZE 0x1000
+#endif
+
+/* Generate long file names.  */
+#define COFF_LONG_FILENAMES
+
+#ifdef COFF_WITH_PE
+static bfd_boolean in_reloc_p PARAMS ((bfd *, reloc_howto_type *));
+/* Return TRUE if this relocation should
+   appear in the output .reloc section.  */
+static bfd_boolean in_reloc_p (abfd, howto)
+     bfd * abfd ATTRIBUTE_UNUSED;
+     reloc_howto_type * howto;
+{
+  return ! howto->pc_relative && howto->type != R_SH_IMAGEBASE;
+}
+#endif
+
+/* The supported relocations.  There are a lot of relocations defined
+   in coff/internal.h which we do not expect to ever see.  */
+static reloc_howto_type sh_coff_howtos[] =
+{
+  EMPTY_HOWTO (0),
+  EMPTY_HOWTO (1),
+#ifdef COFF_WITH_PE
+  /* Windows CE */
+  HOWTO (R_SH_IMM32CE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 sh_reloc,		/* special_function */
+	 "r_imm32ce",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+#else
+  EMPTY_HOWTO (2),
+#endif
+  EMPTY_HOWTO (3), /* R_SH_PCREL8 */
+  EMPTY_HOWTO (4), /* R_SH_PCREL16 */
+  EMPTY_HOWTO (5), /* R_SH_HIGH8 */
+  EMPTY_HOWTO (6), /* R_SH_IMM24 */
+  EMPTY_HOWTO (7), /* R_SH_LOW16 */
+  EMPTY_HOWTO (8),
+  EMPTY_HOWTO (9), /* R_SH_PCDISP8BY4 */
+
+  HOWTO (R_SH_PCDISP8BY2,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 sh_reloc,		/* special_function */
+	 "r_pcdisp8by2",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xff,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  EMPTY_HOWTO (11), /* R_SH_PCDISP8 */
+
+  HOWTO (R_SH_PCDISP,		/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 sh_reloc,		/* special_function */
+	 "r_pcdisp12by2",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xfff,			/* src_mask */
+	 0xfff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  EMPTY_HOWTO (13),
+
+  HOWTO (R_SH_IMM32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 sh_reloc,		/* special_function */
+	 "r_imm32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (15),
+#ifdef COFF_WITH_PE
+  HOWTO (R_SH_IMAGEBASE,        /* type */
+	 0,	                /* rightshift */
+	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 32,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 sh_reloc,       	/* special_function */
+	 "rva32",	        /* name */
+	 TRUE,	                /* partial_inplace */
+	 0xffffffff,            /* src_mask */
+	 0xffffffff,            /* dst_mask */
+	 FALSE),                /* pcrel_offset */
+#else
+  EMPTY_HOWTO (16), /* R_SH_IMM8 */
+#endif
+  EMPTY_HOWTO (17), /* R_SH_IMM8BY2 */
+  EMPTY_HOWTO (18), /* R_SH_IMM8BY4 */
+  EMPTY_HOWTO (19), /* R_SH_IMM4 */
+  EMPTY_HOWTO (20), /* R_SH_IMM4BY2 */
+  EMPTY_HOWTO (21), /* R_SH_IMM4BY4 */
+
+  HOWTO (R_SH_PCRELIMM8BY2,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_reloc,		/* special_function */
+	 "r_pcrelimm8by2",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xff,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_SH_PCRELIMM8BY4,	/* type */
+	 2,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_reloc,		/* special_function */
+	 "r_pcrelimm8by4",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xff,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_SH_IMM16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 sh_reloc,		/* special_function */
+	 "r_imm16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_SWITCH16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 sh_reloc,		/* special_function */
+	 "r_switch16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_SWITCH32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 sh_reloc,		/* special_function */
+	 "r_switch32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_USES,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 sh_reloc,		/* special_function */
+	 "r_uses",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_COUNT,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 sh_reloc,		/* special_function */
+	 "r_count",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_ALIGN,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 sh_reloc,		/* special_function */
+	 "r_align",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_CODE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 sh_reloc,		/* special_function */
+	 "r_code",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_DATA,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 sh_reloc,		/* special_function */
+	 "r_data",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_LABEL,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 sh_reloc,		/* special_function */
+	 "r_label",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_SWITCH8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 sh_reloc,		/* special_function */
+	 "r_switch8",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xff,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 FALSE)			/* pcrel_offset */
+};
+
+#define SH_COFF_HOWTO_COUNT (sizeof sh_coff_howtos / sizeof sh_coff_howtos[0])
+
+/* Check for a bad magic number.  */
+#define BADMAG(x) SHBADMAG(x)
+
+/* Customize coffcode.h (this is not currently used).  */
+#define SH 1
+
+/* FIXME: This should not be set here.  */
+#define __A_MAGIC_SET__
+
+#ifndef COFF_WITH_PE
+/* Swap the r_offset field in and out.  */
+#define SWAP_IN_RELOC_OFFSET  H_GET_32
+#define SWAP_OUT_RELOC_OFFSET H_PUT_32
+
+/* Swap out extra information in the reloc structure.  */
+#define SWAP_OUT_RELOC_EXTRA(abfd, src, dst)	\
+  do						\
+    {						\
+      dst->r_stuff[0] = 'S';			\
+      dst->r_stuff[1] = 'C';			\
+    }						\
+  while (0)
+#endif
+
+/* Get the value of a symbol, when performing a relocation.  */
+
+static long
+get_symbol_value (symbol)
+     asymbol *symbol;
+{
+  bfd_vma relocation;
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = (symbol->value +
+		  symbol->section->output_section->vma +
+		  symbol->section->output_offset);
+
+  return relocation;
+}
+
+#ifdef COFF_WITH_PE
+/* Convert an rtype to howto for the COFF backend linker.
+   Copied from coff-i386.  */
+#define coff_rtype_to_howto coff_sh_rtype_to_howto
+static reloc_howto_type * coff_sh_rtype_to_howto PARAMS ((bfd *, asection *, struct internal_reloc *, struct coff_link_hash_entry *, struct internal_syment *, bfd_vma *));
+
+static reloc_howto_type *
+coff_sh_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
+     bfd * abfd ATTRIBUTE_UNUSED;
+     asection * sec;
+     struct internal_reloc * rel;
+     struct coff_link_hash_entry * h;
+     struct internal_syment * sym;
+     bfd_vma * addendp;
+{
+  reloc_howto_type * howto;
+
+  howto = sh_coff_howtos + rel->r_type;
+
+  *addendp = 0;
+
+  if (howto->pc_relative)
+    *addendp += sec->vma;
+
+  if (sym != NULL && sym->n_scnum == 0 && sym->n_value != 0)
+    {
+      /* This is a common symbol.  The section contents include the
+	 size (sym->n_value) as an addend.  The relocate_section
+	 function will be adding in the final value of the symbol.  We
+	 need to subtract out the current size in order to get the
+	 correct result.  */
+      BFD_ASSERT (h != NULL);
+    }
+
+  if (howto->pc_relative)
+    {
+      *addendp -= 4;
+
+      /* If the symbol is defined, then the generic code is going to
+         add back the symbol value in order to cancel out an
+         adjustment it made to the addend.  However, we set the addend
+         to 0 at the start of this function.  We need to adjust here,
+         to avoid the adjustment the generic code will make.  FIXME:
+         This is getting a bit hackish.  */
+      if (sym != NULL && sym->n_scnum != 0)
+	*addendp -= sym->n_value;
+    }
+
+  if (rel->r_type == R_SH_IMAGEBASE)
+    *addendp -= pe_data (sec->output_section->owner)->pe_opthdr.ImageBase;
+
+  return howto;
+}
+
+#endif /* COFF_WITH_PE */
+
+/* This structure is used to map BFD reloc codes to SH PE relocs.  */
+struct shcoff_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned char shcoff_reloc_val;
+};
+
+#ifdef COFF_WITH_PE
+/* An array mapping BFD reloc codes to SH PE relocs.  */
+static const struct shcoff_reloc_map sh_reloc_map[] =
+{
+  { BFD_RELOC_32, R_SH_IMM32CE },
+  { BFD_RELOC_RVA, R_SH_IMAGEBASE },
+  { BFD_RELOC_CTOR, R_SH_IMM32CE },
+};
+#else
+/* An array mapping BFD reloc codes to SH PE relocs.  */
+static const struct shcoff_reloc_map sh_reloc_map[] =
+{
+  { BFD_RELOC_32, R_SH_IMM32 },
+  { BFD_RELOC_CTOR, R_SH_IMM32 },
+};
+#endif
+
+/* Given a BFD reloc code, return the howto structure for the
+   corresponding SH PE reloc.  */
+#define coff_bfd_reloc_type_lookup	sh_coff_reloc_type_lookup
+#define coff_bfd_reloc_name_lookup sh_coff_reloc_name_lookup
+
+static reloc_howto_type *
+sh_coff_reloc_type_lookup (abfd, code)
+     bfd * abfd ATTRIBUTE_UNUSED;
+     bfd_reloc_code_real_type code;
+{
+  unsigned int i;
+
+  for (i = ARRAY_SIZE (sh_reloc_map); i--;)
+    if (sh_reloc_map[i].bfd_reloc_val == code)
+      return &sh_coff_howtos[(int) sh_reloc_map[i].shcoff_reloc_val];
+
+  (*_bfd_error_handler) (_("SH Error: unknown reloc type %d"), code);
+  return NULL;
+}
+
+static reloc_howto_type *
+sh_coff_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			   const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (sh_coff_howtos) / sizeof (sh_coff_howtos[0]); i++)
+    if (sh_coff_howtos[i].name != NULL
+	&& strcasecmp (sh_coff_howtos[i].name, r_name) == 0)
+      return &sh_coff_howtos[i];
+
+  return NULL;
+}
+
+/* This macro is used in coffcode.h to get the howto corresponding to
+   an internal reloc.  */
+
+#define RTYPE2HOWTO(relent, internal)		\
+  ((relent)->howto =				\
+   ((internal)->r_type < SH_COFF_HOWTO_COUNT	\
+    ? &sh_coff_howtos[(internal)->r_type]	\
+    : (reloc_howto_type *) NULL))
+
+/* This is the same as the macro in coffcode.h, except that it copies
+   r_offset into reloc_entry->addend for some relocs.  */
+#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr)                \
+  {                                                             \
+    coff_symbol_type *coffsym = (coff_symbol_type *) NULL;      \
+    if (ptr && bfd_asymbol_bfd (ptr) != abfd)                   \
+      coffsym = (obj_symbols (abfd)                             \
+                 + (cache_ptr->sym_ptr_ptr - symbols));         \
+    else if (ptr)                                               \
+      coffsym = coff_symbol_from (abfd, ptr);                   \
+    if (coffsym != (coff_symbol_type *) NULL                    \
+        && coffsym->native->u.syment.n_scnum == 0)              \
+      cache_ptr->addend = 0;                                    \
+    else if (ptr && bfd_asymbol_bfd (ptr) == abfd               \
+             && ptr->section != (asection *) NULL)              \
+      cache_ptr->addend = - (ptr->section->vma + ptr->value);   \
+    else                                                        \
+      cache_ptr->addend = 0;                                    \
+    if ((reloc).r_type == R_SH_SWITCH8				\
+	|| (reloc).r_type == R_SH_SWITCH16			\
+	|| (reloc).r_type == R_SH_SWITCH32			\
+	|| (reloc).r_type == R_SH_USES				\
+	|| (reloc).r_type == R_SH_COUNT				\
+	|| (reloc).r_type == R_SH_ALIGN)			\
+      cache_ptr->addend = (reloc).r_offset;			\
+  }
+
+/* This is the howto function for the SH relocations.  */
+
+static bfd_reloc_status_type
+sh_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
+	  error_message)
+     bfd *abfd;
+     arelent *reloc_entry;
+     asymbol *symbol_in;
+     PTR data;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  unsigned long insn;
+  bfd_vma sym_value;
+  unsigned short r_type;
+  bfd_vma addr = reloc_entry->address;
+  bfd_byte *hit_data = addr + (bfd_byte *) data;
+
+  r_type = reloc_entry->howto->type;
+
+  if (output_bfd != NULL)
+    {
+      /* Partial linking--do nothing.  */
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  /* Almost all relocs have to do with relaxing.  If any work must be
+     done for them, it has been done in sh_relax_section.  */
+  if (r_type != R_SH_IMM32
+#ifdef COFF_WITH_PE
+      && r_type != R_SH_IMM32CE
+      && r_type != R_SH_IMAGEBASE
+#endif
+      && (r_type != R_SH_PCDISP
+	  || (symbol_in->flags & BSF_LOCAL) != 0))
+    return bfd_reloc_ok;
+
+  if (symbol_in != NULL
+      && bfd_is_und_section (symbol_in->section))
+    return bfd_reloc_undefined;
+
+  sym_value = get_symbol_value (symbol_in);
+
+  switch (r_type)
+    {
+    case R_SH_IMM32:
+#ifdef COFF_WITH_PE
+    case R_SH_IMM32CE:
+#endif
+      insn = bfd_get_32 (abfd, hit_data);
+      insn += sym_value + reloc_entry->addend;
+      bfd_put_32 (abfd, (bfd_vma) insn, hit_data);
+      break;
+#ifdef COFF_WITH_PE
+    case R_SH_IMAGEBASE:
+      insn = bfd_get_32 (abfd, hit_data);
+      insn += sym_value + reloc_entry->addend;
+      insn -= pe_data (input_section->output_section->owner)->pe_opthdr.ImageBase;
+      bfd_put_32 (abfd, (bfd_vma) insn, hit_data);
+      break;
+#endif
+    case R_SH_PCDISP:
+      insn = bfd_get_16 (abfd, hit_data);
+      sym_value += reloc_entry->addend;
+      sym_value -= (input_section->output_section->vma
+		    + input_section->output_offset
+		    + addr
+		    + 4);
+      sym_value += (insn & 0xfff) << 1;
+      if (insn & 0x800)
+	sym_value -= 0x1000;
+      insn = (insn & 0xf000) | (sym_value & 0xfff);
+      bfd_put_16 (abfd, (bfd_vma) insn, hit_data);
+      if (sym_value < (bfd_vma) -0x1000 || sym_value >= 0x1000)
+	return bfd_reloc_overflow;
+      break;
+    default:
+      abort ();
+      break;
+    }
+
+  return bfd_reloc_ok;
+}
+
+#define coff_bfd_merge_private_bfd_data _bfd_generic_verify_endian_match
+
+/* We can do relaxing.  */
+#define coff_bfd_relax_section sh_relax_section
+
+/* We use the special COFF backend linker.  */
+#define coff_relocate_section sh_relocate_section
+
+/* When relaxing, we need to use special code to get the relocated
+   section contents.  */
+#define coff_bfd_get_relocated_section_contents \
+  sh_coff_get_relocated_section_contents
+
+#include "coffcode.h"
+
+/* This function handles relaxing on the SH.
+
+   Function calls on the SH look like this:
+
+       movl  L1,r0
+       ...
+       jsr   @r0
+       ...
+     L1:
+       .long function
+
+   The compiler and assembler will cooperate to create R_SH_USES
+   relocs on the jsr instructions.  The r_offset field of the
+   R_SH_USES reloc is the PC relative offset to the instruction which
+   loads the register (the r_offset field is computed as though it
+   were a jump instruction, so the offset value is actually from four
+   bytes past the instruction).  The linker can use this reloc to
+   determine just which function is being called, and thus decide
+   whether it is possible to replace the jsr with a bsr.
+
+   If multiple function calls are all based on a single register load
+   (i.e., the same function is called multiple times), the compiler
+   guarantees that each function call will have an R_SH_USES reloc.
+   Therefore, if the linker is able to convert each R_SH_USES reloc
+   which refers to that address, it can safely eliminate the register
+   load.
+
+   When the assembler creates an R_SH_USES reloc, it examines it to
+   determine which address is being loaded (L1 in the above example).
+   It then counts the number of references to that address, and
+   creates an R_SH_COUNT reloc at that address.  The r_offset field of
+   the R_SH_COUNT reloc will be the number of references.  If the
+   linker is able to eliminate a register load, it can use the
+   R_SH_COUNT reloc to see whether it can also eliminate the function
+   address.
+
+   SH relaxing also handles another, unrelated, matter.  On the SH, if
+   a load or store instruction is not aligned on a four byte boundary,
+   the memory cycle interferes with the 32 bit instruction fetch,
+   causing a one cycle bubble in the pipeline.  Therefore, we try to
+   align load and store instructions on four byte boundaries if we
+   can, by swapping them with one of the adjacent instructions.  */
+
+static bfd_boolean
+sh_relax_section (abfd, sec, link_info, again)
+     bfd *abfd;
+     asection *sec;
+     struct bfd_link_info *link_info;
+     bfd_boolean *again;
+{
+  struct internal_reloc *internal_relocs;
+  bfd_boolean have_code;
+  struct internal_reloc *irel, *irelend;
+  bfd_byte *contents = NULL;
+
+  *again = FALSE;
+
+  if (link_info->relocatable
+      || (sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0)
+    return TRUE;
+
+  if (coff_section_data (abfd, sec) == NULL)
+    {
+      bfd_size_type amt = sizeof (struct coff_section_tdata);
+      sec->used_by_bfd = (PTR) bfd_zalloc (abfd, amt);
+      if (sec->used_by_bfd == NULL)
+	return FALSE;
+    }
+
+  internal_relocs = (_bfd_coff_read_internal_relocs
+		     (abfd, sec, link_info->keep_memory,
+		      (bfd_byte *) NULL, FALSE,
+		      (struct internal_reloc *) NULL));
+  if (internal_relocs == NULL)
+    goto error_return;
+
+  have_code = FALSE;
+
+  irelend = internal_relocs + sec->reloc_count;
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      bfd_vma laddr, paddr, symval;
+      unsigned short insn;
+      struct internal_reloc *irelfn, *irelscan, *irelcount;
+      struct internal_syment sym;
+      bfd_signed_vma foff;
+
+      if (irel->r_type == R_SH_CODE)
+	have_code = TRUE;
+
+      if (irel->r_type != R_SH_USES)
+	continue;
+
+      /* Get the section contents.  */
+      if (contents == NULL)
+	{
+	  if (coff_section_data (abfd, sec)->contents != NULL)
+	    contents = coff_section_data (abfd, sec)->contents;
+	  else
+	    {
+	      if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+		goto error_return;
+	    }
+	}
+
+      /* The r_offset field of the R_SH_USES reloc will point us to
+         the register load.  The 4 is because the r_offset field is
+         computed as though it were a jump offset, which are based
+         from 4 bytes after the jump instruction.  */
+      laddr = irel->r_vaddr - sec->vma + 4;
+      /* Careful to sign extend the 32-bit offset.  */
+      laddr += ((irel->r_offset & 0xffffffff) ^ 0x80000000) - 0x80000000;
+      if (laddr >= sec->size)
+	{
+	  (*_bfd_error_handler) ("%B: 0x%lx: warning: bad R_SH_USES offset",
+				 abfd, (unsigned long) irel->r_vaddr);
+	  continue;
+	}
+      insn = bfd_get_16 (abfd, contents + laddr);
+
+      /* If the instruction is not mov.l NN,rN, we don't know what to do.  */
+      if ((insn & 0xf000) != 0xd000)
+	{
+	  ((*_bfd_error_handler)
+	   ("%B: 0x%lx: warning: R_SH_USES points to unrecognized insn 0x%x",
+	    abfd, (unsigned long) irel->r_vaddr, insn));
+	  continue;
+	}
+
+      /* Get the address from which the register is being loaded.  The
+      	 displacement in the mov.l instruction is quadrupled.  It is a
+      	 displacement from four bytes after the movl instruction, but,
+      	 before adding in the PC address, two least significant bits
+      	 of the PC are cleared.  We assume that the section is aligned
+      	 on a four byte boundary.  */
+      paddr = insn & 0xff;
+      paddr *= 4;
+      paddr += (laddr + 4) &~ (bfd_vma) 3;
+      if (paddr >= sec->size)
+	{
+	  ((*_bfd_error_handler)
+	   ("%B: 0x%lx: warning: bad R_SH_USES load offset",
+	    abfd, (unsigned long) irel->r_vaddr));
+	  continue;
+	}
+
+      /* Get the reloc for the address from which the register is
+         being loaded.  This reloc will tell us which function is
+         actually being called.  */
+      paddr += sec->vma;
+      for (irelfn = internal_relocs; irelfn < irelend; irelfn++)
+	if (irelfn->r_vaddr == paddr
+#ifdef COFF_WITH_PE
+	    && (irelfn->r_type == R_SH_IMM32
+		|| irelfn->r_type == R_SH_IMM32CE
+		|| irelfn->r_type == R_SH_IMAGEBASE)
+
+#else
+	    && irelfn->r_type == R_SH_IMM32
+#endif
+	    )
+	  break;
+      if (irelfn >= irelend)
+	{
+	  ((*_bfd_error_handler)
+	   ("%B: 0x%lx: warning: could not find expected reloc",
+	    abfd, (unsigned long) paddr));
+	  continue;
+	}
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      if (! _bfd_coff_get_external_symbols (abfd))
+	goto error_return;
+      bfd_coff_swap_sym_in (abfd,
+			    ((bfd_byte *) obj_coff_external_syms (abfd)
+			     + (irelfn->r_symndx
+				* bfd_coff_symesz (abfd))),
+			    &sym);
+      if (sym.n_scnum != 0 && sym.n_scnum != sec->target_index)
+	{
+	  ((*_bfd_error_handler)
+	   ("%B: 0x%lx: warning: symbol in unexpected section",
+	    abfd, (unsigned long) paddr));
+	  continue;
+	}
+
+      if (sym.n_sclass != C_EXT)
+	{
+	  symval = (sym.n_value
+		    - sec->vma
+		    + sec->output_section->vma
+		    + sec->output_offset);
+	}
+      else
+	{
+	  struct coff_link_hash_entry *h;
+
+	  h = obj_coff_sym_hashes (abfd)[irelfn->r_symndx];
+	  BFD_ASSERT (h != NULL);
+	  if (h->root.type != bfd_link_hash_defined
+	      && h->root.type != bfd_link_hash_defweak)
+	    {
+	      /* This appears to be a reference to an undefined
+                 symbol.  Just ignore it--it will be caught by the
+                 regular reloc processing.  */
+	      continue;
+	    }
+
+	  symval = (h->root.u.def.value
+		    + h->root.u.def.section->output_section->vma
+		    + h->root.u.def.section->output_offset);
+	}
+
+      symval += bfd_get_32 (abfd, contents + paddr - sec->vma);
+
+      /* See if this function call can be shortened.  */
+      foff = (symval
+	      - (irel->r_vaddr
+		 - sec->vma
+		 + sec->output_section->vma
+		 + sec->output_offset
+		 + 4));
+      if (foff < -0x1000 || foff >= 0x1000)
+	{
+	  /* After all that work, we can't shorten this function call.  */
+	  continue;
+	}
+
+      /* Shorten the function call.  */
+
+      /* For simplicity of coding, we are going to modify the section
+	 contents, the section relocs, and the BFD symbol table.  We
+	 must tell the rest of the code not to free up this
+	 information.  It would be possible to instead create a table
+	 of changes which have to be made, as is done in coff-mips.c;
+	 that would be more work, but would require less memory when
+	 the linker is run.  */
+
+      coff_section_data (abfd, sec)->relocs = internal_relocs;
+      coff_section_data (abfd, sec)->keep_relocs = TRUE;
+
+      coff_section_data (abfd, sec)->contents = contents;
+      coff_section_data (abfd, sec)->keep_contents = TRUE;
+
+      obj_coff_keep_syms (abfd) = TRUE;
+
+      /* Replace the jsr with a bsr.  */
+
+      /* Change the R_SH_USES reloc into an R_SH_PCDISP reloc, and
+         replace the jsr with a bsr.  */
+      irel->r_type = R_SH_PCDISP;
+      irel->r_symndx = irelfn->r_symndx;
+      if (sym.n_sclass != C_EXT)
+	{
+	  /* If this needs to be changed because of future relaxing,
+             it will be handled here like other internal PCDISP
+             relocs.  */
+	  bfd_put_16 (abfd,
+		      (bfd_vma) 0xb000 | ((foff >> 1) & 0xfff),
+		      contents + irel->r_vaddr - sec->vma);
+	}
+      else
+	{
+	  /* We can't fully resolve this yet, because the external
+             symbol value may be changed by future relaxing.  We let
+             the final link phase handle it.  */
+	  bfd_put_16 (abfd, (bfd_vma) 0xb000,
+		      contents + irel->r_vaddr - sec->vma);
+	}
+
+      /* See if there is another R_SH_USES reloc referring to the same
+         register load.  */
+      for (irelscan = internal_relocs; irelscan < irelend; irelscan++)
+	if (irelscan->r_type == R_SH_USES
+	    && laddr == irelscan->r_vaddr - sec->vma + 4 + irelscan->r_offset)
+	  break;
+      if (irelscan < irelend)
+	{
+	  /* Some other function call depends upon this register load,
+	     and we have not yet converted that function call.
+	     Indeed, we may never be able to convert it.  There is
+	     nothing else we can do at this point.  */
+	  continue;
+	}
+
+      /* Look for a R_SH_COUNT reloc on the location where the
+         function address is stored.  Do this before deleting any
+         bytes, to avoid confusion about the address.  */
+      for (irelcount = internal_relocs; irelcount < irelend; irelcount++)
+	if (irelcount->r_vaddr == paddr
+	    && irelcount->r_type == R_SH_COUNT)
+	  break;
+
+      /* Delete the register load.  */
+      if (! sh_relax_delete_bytes (abfd, sec, laddr, 2))
+	goto error_return;
+
+      /* That will change things, so, just in case it permits some
+         other function call to come within range, we should relax
+         again.  Note that this is not required, and it may be slow.  */
+      *again = TRUE;
+
+      /* Now check whether we got a COUNT reloc.  */
+      if (irelcount >= irelend)
+	{
+	  ((*_bfd_error_handler)
+	   ("%B: 0x%lx: warning: could not find expected COUNT reloc",
+	    abfd, (unsigned long) paddr));
+	  continue;
+	}
+
+      /* The number of uses is stored in the r_offset field.  We've
+         just deleted one.  */
+      if (irelcount->r_offset == 0)
+	{
+	  ((*_bfd_error_handler) ("%B: 0x%lx: warning: bad count",
+				  abfd, (unsigned long) paddr));
+	  continue;
+	}
+
+      --irelcount->r_offset;
+
+      /* If there are no more uses, we can delete the address.  Reload
+         the address from irelfn, in case it was changed by the
+         previous call to sh_relax_delete_bytes.  */
+      if (irelcount->r_offset == 0)
+	{
+	  if (! sh_relax_delete_bytes (abfd, sec,
+				       irelfn->r_vaddr - sec->vma, 4))
+	    goto error_return;
+	}
+
+      /* We've done all we can with that function call.  */
+    }
+
+  /* Look for load and store instructions that we can align on four
+     byte boundaries.  */
+  if (have_code)
+    {
+      bfd_boolean swapped;
+
+      /* Get the section contents.  */
+      if (contents == NULL)
+	{
+	  if (coff_section_data (abfd, sec)->contents != NULL)
+	    contents = coff_section_data (abfd, sec)->contents;
+	  else
+	    {
+	      if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+		goto error_return;
+	    }
+	}
+
+      if (! sh_align_loads (abfd, sec, internal_relocs, contents, &swapped))
+	goto error_return;
+
+      if (swapped)
+	{
+	  coff_section_data (abfd, sec)->relocs = internal_relocs;
+	  coff_section_data (abfd, sec)->keep_relocs = TRUE;
+
+	  coff_section_data (abfd, sec)->contents = contents;
+	  coff_section_data (abfd, sec)->keep_contents = TRUE;
+
+	  obj_coff_keep_syms (abfd) = TRUE;
+	}
+    }
+
+  if (internal_relocs != NULL
+      && internal_relocs != coff_section_data (abfd, sec)->relocs)
+    {
+      if (! link_info->keep_memory)
+	free (internal_relocs);
+      else
+	coff_section_data (abfd, sec)->relocs = internal_relocs;
+    }
+
+  if (contents != NULL && contents != coff_section_data (abfd, sec)->contents)
+    {
+      if (! link_info->keep_memory)
+	free (contents);
+      else
+	/* Cache the section contents for coff_link_input_bfd.  */
+	coff_section_data (abfd, sec)->contents = contents;
+    }
+
+  return TRUE;
+
+ error_return:
+  if (internal_relocs != NULL
+      && internal_relocs != coff_section_data (abfd, sec)->relocs)
+    free (internal_relocs);
+  if (contents != NULL && contents != coff_section_data (abfd, sec)->contents)
+    free (contents);
+  return FALSE;
+}
+
+/* Delete some bytes from a section while relaxing.  */
+
+static bfd_boolean
+sh_relax_delete_bytes (abfd, sec, addr, count)
+     bfd *abfd;
+     asection *sec;
+     bfd_vma addr;
+     int count;
+{
+  bfd_byte *contents;
+  struct internal_reloc *irel, *irelend;
+  struct internal_reloc *irelalign;
+  bfd_vma toaddr;
+  bfd_byte *esym, *esymend;
+  bfd_size_type symesz;
+  struct coff_link_hash_entry **sym_hash;
+  asection *o;
+
+  contents = coff_section_data (abfd, sec)->contents;
+
+  /* The deletion must stop at the next ALIGN reloc for an aligment
+     power larger than the number of bytes we are deleting.  */
+
+  irelalign = NULL;
+  toaddr = sec->size;
+
+  irel = coff_section_data (abfd, sec)->relocs;
+  irelend = irel + sec->reloc_count;
+  for (; irel < irelend; irel++)
+    {
+      if (irel->r_type == R_SH_ALIGN
+	  && irel->r_vaddr - sec->vma > addr
+	  && count < (1 << irel->r_offset))
+	{
+	  irelalign = irel;
+	  toaddr = irel->r_vaddr - sec->vma;
+	  break;
+	}
+    }
+
+  /* Actually delete the bytes.  */
+  memmove (contents + addr, contents + addr + count,
+	   (size_t) (toaddr - addr - count));
+  if (irelalign == NULL)
+    sec->size -= count;
+  else
+    {
+      int i;
+
+#define NOP_OPCODE (0x0009)
+
+      BFD_ASSERT ((count & 1) == 0);
+      for (i = 0; i < count; i += 2)
+	bfd_put_16 (abfd, (bfd_vma) NOP_OPCODE, contents + toaddr - count + i);
+    }
+
+  /* Adjust all the relocs.  */
+  for (irel = coff_section_data (abfd, sec)->relocs; irel < irelend; irel++)
+    {
+      bfd_vma nraddr, stop;
+      bfd_vma start = 0;
+      int insn = 0;
+      struct internal_syment sym;
+      int off, adjust, oinsn;
+      bfd_signed_vma voff = 0;
+      bfd_boolean overflow;
+
+      /* Get the new reloc address.  */
+      nraddr = irel->r_vaddr - sec->vma;
+      if ((irel->r_vaddr - sec->vma > addr
+	   && irel->r_vaddr - sec->vma < toaddr)
+	  || (irel->r_type == R_SH_ALIGN
+	      && irel->r_vaddr - sec->vma == toaddr))
+	nraddr -= count;
+
+      /* See if this reloc was for the bytes we have deleted, in which
+	 case we no longer care about it.  Don't delete relocs which
+	 represent addresses, though.  */
+      if (irel->r_vaddr - sec->vma >= addr
+	  && irel->r_vaddr - sec->vma < addr + count
+	  && irel->r_type != R_SH_ALIGN
+	  && irel->r_type != R_SH_CODE
+	  && irel->r_type != R_SH_DATA
+	  && irel->r_type != R_SH_LABEL)
+	irel->r_type = R_SH_UNUSED;
+
+      /* If this is a PC relative reloc, see if the range it covers
+         includes the bytes we have deleted.  */
+      switch (irel->r_type)
+	{
+	default:
+	  break;
+
+	case R_SH_PCDISP8BY2:
+	case R_SH_PCDISP:
+	case R_SH_PCRELIMM8BY2:
+	case R_SH_PCRELIMM8BY4:
+	  start = irel->r_vaddr - sec->vma;
+	  insn = bfd_get_16 (abfd, contents + nraddr);
+	  break;
+	}
+
+      switch (irel->r_type)
+	{
+	default:
+	  start = stop = addr;
+	  break;
+
+	case R_SH_IMM32:
+#ifdef COFF_WITH_PE
+	case R_SH_IMM32CE:
+	case R_SH_IMAGEBASE:
+#endif
+	  /* If this reloc is against a symbol defined in this
+             section, and the symbol will not be adjusted below, we
+             must check the addend to see it will put the value in
+             range to be adjusted, and hence must be changed.  */
+	  bfd_coff_swap_sym_in (abfd,
+				((bfd_byte *) obj_coff_external_syms (abfd)
+				 + (irel->r_symndx
+				    * bfd_coff_symesz (abfd))),
+				&sym);
+	  if (sym.n_sclass != C_EXT
+	      && sym.n_scnum == sec->target_index
+	      && ((bfd_vma) sym.n_value <= addr
+		  || (bfd_vma) sym.n_value >= toaddr))
+	    {
+	      bfd_vma val;
+
+	      val = bfd_get_32 (abfd, contents + nraddr);
+	      val += sym.n_value;
+	      if (val > addr && val < toaddr)
+		bfd_put_32 (abfd, val - count, contents + nraddr);
+	    }
+	  start = stop = addr;
+	  break;
+
+	case R_SH_PCDISP8BY2:
+	  off = insn & 0xff;
+	  if (off & 0x80)
+	    off -= 0x100;
+	  stop = (bfd_vma) ((bfd_signed_vma) start + 4 + off * 2);
+	  break;
+
+	case R_SH_PCDISP:
+	  bfd_coff_swap_sym_in (abfd,
+				((bfd_byte *) obj_coff_external_syms (abfd)
+				 + (irel->r_symndx
+				    * bfd_coff_symesz (abfd))),
+				&sym);
+	  if (sym.n_sclass == C_EXT)
+	    start = stop = addr;
+	  else
+	    {
+	      off = insn & 0xfff;
+	      if (off & 0x800)
+		off -= 0x1000;
+	      stop = (bfd_vma) ((bfd_signed_vma) start + 4 + off * 2);
+	    }
+	  break;
+
+	case R_SH_PCRELIMM8BY2:
+	  off = insn & 0xff;
+	  stop = start + 4 + off * 2;
+	  break;
+
+	case R_SH_PCRELIMM8BY4:
+	  off = insn & 0xff;
+	  stop = (start &~ (bfd_vma) 3) + 4 + off * 4;
+	  break;
+
+	case R_SH_SWITCH8:
+	case R_SH_SWITCH16:
+	case R_SH_SWITCH32:
+	  /* These relocs types represent
+	       .word L2-L1
+	     The r_offset field holds the difference between the reloc
+	     address and L1.  That is the start of the reloc, and
+	     adding in the contents gives us the top.  We must adjust
+	     both the r_offset field and the section contents.  */
+
+	  start = irel->r_vaddr - sec->vma;
+	  stop = (bfd_vma) ((bfd_signed_vma) start - (long) irel->r_offset);
+
+	  if (start > addr
+	      && start < toaddr
+	      && (stop <= addr || stop >= toaddr))
+	    irel->r_offset += count;
+	  else if (stop > addr
+		   && stop < toaddr
+		   && (start <= addr || start >= toaddr))
+	    irel->r_offset -= count;
+
+	  start = stop;
+
+	  if (irel->r_type == R_SH_SWITCH16)
+	    voff = bfd_get_signed_16 (abfd, contents + nraddr);
+	  else if (irel->r_type == R_SH_SWITCH8)
+	    voff = bfd_get_8 (abfd, contents + nraddr);
+	  else
+	    voff = bfd_get_signed_32 (abfd, contents + nraddr);
+	  stop = (bfd_vma) ((bfd_signed_vma) start + voff);
+
+	  break;
+
+	case R_SH_USES:
+	  start = irel->r_vaddr - sec->vma;
+	  stop = (bfd_vma) ((bfd_signed_vma) start
+			    + (long) irel->r_offset
+			    + 4);
+	  break;
+	}
+
+      if (start > addr
+	  && start < toaddr
+	  && (stop <= addr || stop >= toaddr))
+	adjust = count;
+      else if (stop > addr
+	       && stop < toaddr
+	       && (start <= addr || start >= toaddr))
+	adjust = - count;
+      else
+	adjust = 0;
+
+      if (adjust != 0)
+	{
+	  oinsn = insn;
+	  overflow = FALSE;
+	  switch (irel->r_type)
+	    {
+	    default:
+	      abort ();
+	      break;
+
+	    case R_SH_PCDISP8BY2:
+	    case R_SH_PCRELIMM8BY2:
+	      insn += adjust / 2;
+	      if ((oinsn & 0xff00) != (insn & 0xff00))
+		overflow = TRUE;
+	      bfd_put_16 (abfd, (bfd_vma) insn, contents + nraddr);
+	      break;
+
+	    case R_SH_PCDISP:
+	      insn += adjust / 2;
+	      if ((oinsn & 0xf000) != (insn & 0xf000))
+		overflow = TRUE;
+	      bfd_put_16 (abfd, (bfd_vma) insn, contents + nraddr);
+	      break;
+
+	    case R_SH_PCRELIMM8BY4:
+	      BFD_ASSERT (adjust == count || count >= 4);
+	      if (count >= 4)
+		insn += adjust / 4;
+	      else
+		{
+		  if ((irel->r_vaddr & 3) == 0)
+		    ++insn;
+		}
+	      if ((oinsn & 0xff00) != (insn & 0xff00))
+		overflow = TRUE;
+	      bfd_put_16 (abfd, (bfd_vma) insn, contents + nraddr);
+	      break;
+
+	    case R_SH_SWITCH8:
+	      voff += adjust;
+	      if (voff < 0 || voff >= 0xff)
+		overflow = TRUE;
+	      bfd_put_8 (abfd, (bfd_vma) voff, contents + nraddr);
+	      break;
+
+	    case R_SH_SWITCH16:
+	      voff += adjust;
+	      if (voff < - 0x8000 || voff >= 0x8000)
+		overflow = TRUE;
+	      bfd_put_signed_16 (abfd, (bfd_vma) voff, contents + nraddr);
+	      break;
+
+	    case R_SH_SWITCH32:
+	      voff += adjust;
+	      bfd_put_signed_32 (abfd, (bfd_vma) voff, contents + nraddr);
+	      break;
+
+	    case R_SH_USES:
+	      irel->r_offset += adjust;
+	      break;
+	    }
+
+	  if (overflow)
+	    {
+	      ((*_bfd_error_handler)
+	       ("%B: 0x%lx: fatal: reloc overflow while relaxing",
+		abfd, (unsigned long) irel->r_vaddr));
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	}
+
+      irel->r_vaddr = nraddr + sec->vma;
+    }
+
+  /* Look through all the other sections.  If there contain any IMM32
+     relocs against internal symbols which we are not going to adjust
+     below, we may need to adjust the addends.  */
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      struct internal_reloc *internal_relocs;
+      struct internal_reloc *irelscan, *irelscanend;
+      bfd_byte *ocontents;
+
+      if (o == sec
+	  || (o->flags & SEC_RELOC) == 0
+	  || o->reloc_count == 0)
+	continue;
+
+      /* We always cache the relocs.  Perhaps, if info->keep_memory is
+         FALSE, we should free them, if we are permitted to, when we
+         leave sh_coff_relax_section.  */
+      internal_relocs = (_bfd_coff_read_internal_relocs
+			 (abfd, o, TRUE, (bfd_byte *) NULL, FALSE,
+			  (struct internal_reloc *) NULL));
+      if (internal_relocs == NULL)
+	return FALSE;
+
+      ocontents = NULL;
+      irelscanend = internal_relocs + o->reloc_count;
+      for (irelscan = internal_relocs; irelscan < irelscanend; irelscan++)
+	{
+	  struct internal_syment sym;
+
+#ifdef COFF_WITH_PE
+	  if (irelscan->r_type != R_SH_IMM32
+	      && irelscan->r_type != R_SH_IMAGEBASE
+	      && irelscan->r_type != R_SH_IMM32CE)
+#else
+	  if (irelscan->r_type != R_SH_IMM32)
+#endif
+	    continue;
+
+	  bfd_coff_swap_sym_in (abfd,
+				((bfd_byte *) obj_coff_external_syms (abfd)
+				 + (irelscan->r_symndx
+				    * bfd_coff_symesz (abfd))),
+				&sym);
+	  if (sym.n_sclass != C_EXT
+	      && sym.n_scnum == sec->target_index
+	      && ((bfd_vma) sym.n_value <= addr
+		  || (bfd_vma) sym.n_value >= toaddr))
+	    {
+	      bfd_vma val;
+
+	      if (ocontents == NULL)
+		{
+		  if (coff_section_data (abfd, o)->contents != NULL)
+		    ocontents = coff_section_data (abfd, o)->contents;
+		  else
+		    {
+		      if (!bfd_malloc_and_get_section (abfd, o, &ocontents))
+			return FALSE;
+		      /* We always cache the section contents.
+                         Perhaps, if info->keep_memory is FALSE, we
+                         should free them, if we are permitted to,
+                         when we leave sh_coff_relax_section.  */
+		      coff_section_data (abfd, o)->contents = ocontents;
+		    }
+		}
+
+	      val = bfd_get_32 (abfd, ocontents + irelscan->r_vaddr - o->vma);
+	      val += sym.n_value;
+	      if (val > addr && val < toaddr)
+		bfd_put_32 (abfd, val - count,
+			    ocontents + irelscan->r_vaddr - o->vma);
+
+	      coff_section_data (abfd, o)->keep_contents = TRUE;
+	    }
+	}
+    }
+
+  /* Adjusting the internal symbols will not work if something has
+     already retrieved the generic symbols.  It would be possible to
+     make this work by adjusting the generic symbols at the same time.
+     However, this case should not arise in normal usage.  */
+  if (obj_symbols (abfd) != NULL
+      || obj_raw_syments (abfd) != NULL)
+    {
+      ((*_bfd_error_handler)
+       ("%B: fatal: generic symbols retrieved before relaxing", abfd));
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  /* Adjust all the symbols.  */
+  sym_hash = obj_coff_sym_hashes (abfd);
+  symesz = bfd_coff_symesz (abfd);
+  esym = (bfd_byte *) obj_coff_external_syms (abfd);
+  esymend = esym + obj_raw_syment_count (abfd) * symesz;
+  while (esym < esymend)
+    {
+      struct internal_syment isym;
+
+      bfd_coff_swap_sym_in (abfd, (PTR) esym, (PTR) &isym);
+
+      if (isym.n_scnum == sec->target_index
+	  && (bfd_vma) isym.n_value > addr
+	  && (bfd_vma) isym.n_value < toaddr)
+	{
+	  isym.n_value -= count;
+
+	  bfd_coff_swap_sym_out (abfd, (PTR) &isym, (PTR) esym);
+
+	  if (*sym_hash != NULL)
+	    {
+	      BFD_ASSERT ((*sym_hash)->root.type == bfd_link_hash_defined
+			  || (*sym_hash)->root.type == bfd_link_hash_defweak);
+	      BFD_ASSERT ((*sym_hash)->root.u.def.value >= addr
+			  && (*sym_hash)->root.u.def.value < toaddr);
+	      (*sym_hash)->root.u.def.value -= count;
+	    }
+	}
+
+      esym += (isym.n_numaux + 1) * symesz;
+      sym_hash += isym.n_numaux + 1;
+    }
+
+  /* See if we can move the ALIGN reloc forward.  We have adjusted
+     r_vaddr for it already.  */
+  if (irelalign != NULL)
+    {
+      bfd_vma alignto, alignaddr;
+
+      alignto = BFD_ALIGN (toaddr, 1 << irelalign->r_offset);
+      alignaddr = BFD_ALIGN (irelalign->r_vaddr - sec->vma,
+			     1 << irelalign->r_offset);
+      if (alignto != alignaddr)
+	{
+	  /* Tail recursion.  */
+	  return sh_relax_delete_bytes (abfd, sec, alignaddr,
+					(int) (alignto - alignaddr));
+	}
+    }
+
+  return TRUE;
+}
+
+/* This is yet another version of the SH opcode table, used to rapidly
+   get information about a particular instruction.  */
+
+/* The opcode map is represented by an array of these structures.  The
+   array is indexed by the high order four bits in the instruction.  */
+
+struct sh_major_opcode
+{
+  /* A pointer to the instruction list.  This is an array which
+     contains all the instructions with this major opcode.  */
+  const struct sh_minor_opcode *minor_opcodes;
+  /* The number of elements in minor_opcodes.  */
+  unsigned short count;
+};
+
+/* This structure holds information for a set of SH opcodes.  The
+   instruction code is anded with the mask value, and the resulting
+   value is used to search the order opcode list.  */
+
+struct sh_minor_opcode
+{
+  /* The sorted opcode list.  */
+  const struct sh_opcode *opcodes;
+  /* The number of elements in opcodes.  */
+  unsigned short count;
+  /* The mask value to use when searching the opcode list.  */
+  unsigned short mask;
+};
+
+/* This structure holds information for an SH instruction.  An array
+   of these structures is sorted in order by opcode.  */
+
+struct sh_opcode
+{
+  /* The code for this instruction, after it has been anded with the
+     mask value in the sh_major_opcode structure.  */
+  unsigned short opcode;
+  /* Flags for this instruction.  */
+  unsigned long flags;
+};
+
+/* Flag which appear in the sh_opcode structure.  */
+
+/* This instruction loads a value from memory.  */
+#define LOAD (0x1)
+
+/* This instruction stores a value to memory.  */
+#define STORE (0x2)
+
+/* This instruction is a branch.  */
+#define BRANCH (0x4)
+
+/* This instruction has a delay slot.  */
+#define DELAY (0x8)
+
+/* This instruction uses the value in the register in the field at
+   mask 0x0f00 of the instruction.  */
+#define USES1 (0x10)
+#define USES1_REG(x) ((x & 0x0f00) >> 8)
+
+/* This instruction uses the value in the register in the field at
+   mask 0x00f0 of the instruction.  */
+#define USES2 (0x20)
+#define USES2_REG(x) ((x & 0x00f0) >> 4)
+
+/* This instruction uses the value in register 0.  */
+#define USESR0 (0x40)
+
+/* This instruction sets the value in the register in the field at
+   mask 0x0f00 of the instruction.  */
+#define SETS1 (0x80)
+#define SETS1_REG(x) ((x & 0x0f00) >> 8)
+
+/* This instruction sets the value in the register in the field at
+   mask 0x00f0 of the instruction.  */
+#define SETS2 (0x100)
+#define SETS2_REG(x) ((x & 0x00f0) >> 4)
+
+/* This instruction sets register 0.  */
+#define SETSR0 (0x200)
+
+/* This instruction sets a special register.  */
+#define SETSSP (0x400)
+
+/* This instruction uses a special register.  */
+#define USESSP (0x800)
+
+/* This instruction uses the floating point register in the field at
+   mask 0x0f00 of the instruction.  */
+#define USESF1 (0x1000)
+#define USESF1_REG(x) ((x & 0x0f00) >> 8)
+
+/* This instruction uses the floating point register in the field at
+   mask 0x00f0 of the instruction.  */
+#define USESF2 (0x2000)
+#define USESF2_REG(x) ((x & 0x00f0) >> 4)
+
+/* This instruction uses floating point register 0.  */
+#define USESF0 (0x4000)
+
+/* This instruction sets the floating point register in the field at
+   mask 0x0f00 of the instruction.  */
+#define SETSF1 (0x8000)
+#define SETSF1_REG(x) ((x & 0x0f00) >> 8)
+
+#define USESAS (0x10000)
+#define USESAS_REG(x) (((((x) >> 8) - 2) & 3) + 2)
+#define USESR8 (0x20000)
+#define SETSAS (0x40000)
+#define SETSAS_REG(x) USESAS_REG (x)
+
+#define MAP(a) a, sizeof a / sizeof a[0]
+
+#ifndef COFF_IMAGE_WITH_PE
+static bfd_boolean sh_insn_uses_reg
+  PARAMS ((unsigned int, const struct sh_opcode *, unsigned int));
+static bfd_boolean sh_insn_sets_reg
+  PARAMS ((unsigned int, const struct sh_opcode *, unsigned int));
+static bfd_boolean sh_insn_uses_or_sets_reg
+  PARAMS ((unsigned int, const struct sh_opcode *, unsigned int));
+static bfd_boolean sh_insn_uses_freg
+  PARAMS ((unsigned int, const struct sh_opcode *, unsigned int));
+static bfd_boolean sh_insn_sets_freg
+  PARAMS ((unsigned int, const struct sh_opcode *, unsigned int));
+static bfd_boolean sh_insn_uses_or_sets_freg
+  PARAMS ((unsigned int, const struct sh_opcode *, unsigned int));
+static bfd_boolean sh_insns_conflict
+  PARAMS ((unsigned int, const struct sh_opcode *, unsigned int,
+	   const struct sh_opcode *));
+static bfd_boolean sh_load_use
+  PARAMS ((unsigned int, const struct sh_opcode *, unsigned int,
+	   const struct sh_opcode *));
+
+/* The opcode maps.  */
+
+static const struct sh_opcode sh_opcode00[] =
+{
+  { 0x0008, SETSSP },			/* clrt */
+  { 0x0009, 0 },			/* nop */
+  { 0x000b, BRANCH | DELAY | USESSP },	/* rts */
+  { 0x0018, SETSSP },			/* sett */
+  { 0x0019, SETSSP },			/* div0u */
+  { 0x001b, 0 },			/* sleep */
+  { 0x0028, SETSSP },			/* clrmac */
+  { 0x002b, BRANCH | DELAY | SETSSP },	/* rte */
+  { 0x0038, USESSP | SETSSP },		/* ldtlb */
+  { 0x0048, SETSSP },			/* clrs */
+  { 0x0058, SETSSP }			/* sets */
+};
+
+static const struct sh_opcode sh_opcode01[] =
+{
+  { 0x0003, BRANCH | DELAY | USES1 | SETSSP },	/* bsrf rn */
+  { 0x000a, SETS1 | USESSP },			/* sts mach,rn */
+  { 0x001a, SETS1 | USESSP },			/* sts macl,rn */
+  { 0x0023, BRANCH | DELAY | USES1 },		/* braf rn */
+  { 0x0029, SETS1 | USESSP },			/* movt rn */
+  { 0x002a, SETS1 | USESSP },			/* sts pr,rn */
+  { 0x005a, SETS1 | USESSP },			/* sts fpul,rn */
+  { 0x006a, SETS1 | USESSP },			/* sts fpscr,rn / sts dsr,rn */
+  { 0x0083, LOAD | USES1 },			/* pref @rn */
+  { 0x007a, SETS1 | USESSP },			/* sts a0,rn */
+  { 0x008a, SETS1 | USESSP },			/* sts x0,rn */
+  { 0x009a, SETS1 | USESSP },			/* sts x1,rn */
+  { 0x00aa, SETS1 | USESSP },			/* sts y0,rn */
+  { 0x00ba, SETS1 | USESSP }			/* sts y1,rn */
+};
+
+static const struct sh_opcode sh_opcode02[] =
+{
+  { 0x0002, SETS1 | USESSP },			/* stc <special_reg>,rn */
+  { 0x0004, STORE | USES1 | USES2 | USESR0 },	/* mov.b rm,@(r0,rn) */
+  { 0x0005, STORE | USES1 | USES2 | USESR0 },	/* mov.w rm,@(r0,rn) */
+  { 0x0006, STORE | USES1 | USES2 | USESR0 },	/* mov.l rm,@(r0,rn) */
+  { 0x0007, SETSSP | USES1 | USES2 },		/* mul.l rm,rn */
+  { 0x000c, LOAD | SETS1 | USES2 | USESR0 },	/* mov.b @(r0,rm),rn */
+  { 0x000d, LOAD | SETS1 | USES2 | USESR0 },	/* mov.w @(r0,rm),rn */
+  { 0x000e, LOAD | SETS1 | USES2 | USESR0 },	/* mov.l @(r0,rm),rn */
+  { 0x000f, LOAD|SETS1|SETS2|SETSSP|USES1|USES2|USESSP }, /* mac.l @rm+,@rn+ */
+};
+
+static const struct sh_minor_opcode sh_opcode0[] =
+{
+  { MAP (sh_opcode00), 0xffff },
+  { MAP (sh_opcode01), 0xf0ff },
+  { MAP (sh_opcode02), 0xf00f }
+};
+
+static const struct sh_opcode sh_opcode10[] =
+{
+  { 0x1000, STORE | USES1 | USES2 }	/* mov.l rm,@(disp,rn) */
+};
+
+static const struct sh_minor_opcode sh_opcode1[] =
+{
+  { MAP (sh_opcode10), 0xf000 }
+};
+
+static const struct sh_opcode sh_opcode20[] =
+{
+  { 0x2000, STORE | USES1 | USES2 },		/* mov.b rm,@rn */
+  { 0x2001, STORE | USES1 | USES2 },		/* mov.w rm,@rn */
+  { 0x2002, STORE | USES1 | USES2 },		/* mov.l rm,@rn */
+  { 0x2004, STORE | SETS1 | USES1 | USES2 },	/* mov.b rm,@-rn */
+  { 0x2005, STORE | SETS1 | USES1 | USES2 },	/* mov.w rm,@-rn */
+  { 0x2006, STORE | SETS1 | USES1 | USES2 },	/* mov.l rm,@-rn */
+  { 0x2007, SETSSP | USES1 | USES2 | USESSP },	/* div0s */
+  { 0x2008, SETSSP | USES1 | USES2 },		/* tst rm,rn */
+  { 0x2009, SETS1 | USES1 | USES2 },		/* and rm,rn */
+  { 0x200a, SETS1 | USES1 | USES2 },		/* xor rm,rn */
+  { 0x200b, SETS1 | USES1 | USES2 },		/* or rm,rn */
+  { 0x200c, SETSSP | USES1 | USES2 },		/* cmp/str rm,rn */
+  { 0x200d, SETS1 | USES1 | USES2 },		/* xtrct rm,rn */
+  { 0x200e, SETSSP | USES1 | USES2 },		/* mulu.w rm,rn */
+  { 0x200f, SETSSP | USES1 | USES2 }		/* muls.w rm,rn */
+};
+
+static const struct sh_minor_opcode sh_opcode2[] =
+{
+  { MAP (sh_opcode20), 0xf00f }
+};
+
+static const struct sh_opcode sh_opcode30[] =
+{
+  { 0x3000, SETSSP | USES1 | USES2 },		/* cmp/eq rm,rn */
+  { 0x3002, SETSSP | USES1 | USES2 },		/* cmp/hs rm,rn */
+  { 0x3003, SETSSP | USES1 | USES2 },		/* cmp/ge rm,rn */
+  { 0x3004, SETSSP | USESSP | USES1 | USES2 },	/* div1 rm,rn */
+  { 0x3005, SETSSP | USES1 | USES2 },		/* dmulu.l rm,rn */
+  { 0x3006, SETSSP | USES1 | USES2 },		/* cmp/hi rm,rn */
+  { 0x3007, SETSSP | USES1 | USES2 },		/* cmp/gt rm,rn */
+  { 0x3008, SETS1 | USES1 | USES2 },		/* sub rm,rn */
+  { 0x300a, SETS1 | SETSSP | USES1 | USES2 | USESSP }, /* subc rm,rn */
+  { 0x300b, SETS1 | SETSSP | USES1 | USES2 },	/* subv rm,rn */
+  { 0x300c, SETS1 | USES1 | USES2 },		/* add rm,rn */
+  { 0x300d, SETSSP | USES1 | USES2 },		/* dmuls.l rm,rn */
+  { 0x300e, SETS1 | SETSSP | USES1 | USES2 | USESSP }, /* addc rm,rn */
+  { 0x300f, SETS1 | SETSSP | USES1 | USES2 }	/* addv rm,rn */
+};
+
+static const struct sh_minor_opcode sh_opcode3[] =
+{
+  { MAP (sh_opcode30), 0xf00f }
+};
+
+static const struct sh_opcode sh_opcode40[] =
+{
+  { 0x4000, SETS1 | SETSSP | USES1 },		/* shll rn */
+  { 0x4001, SETS1 | SETSSP | USES1 },		/* shlr rn */
+  { 0x4002, STORE | SETS1 | USES1 | USESSP },	/* sts.l mach,@-rn */
+  { 0x4004, SETS1 | SETSSP | USES1 },		/* rotl rn */
+  { 0x4005, SETS1 | SETSSP | USES1 },		/* rotr rn */
+  { 0x4006, LOAD | SETS1 | SETSSP | USES1 },	/* lds.l @rm+,mach */
+  { 0x4008, SETS1 | USES1 },			/* shll2 rn */
+  { 0x4009, SETS1 | USES1 },			/* shlr2 rn */
+  { 0x400a, SETSSP | USES1 },			/* lds rm,mach */
+  { 0x400b, BRANCH | DELAY | USES1 },		/* jsr @rn */
+  { 0x4010, SETS1 | SETSSP | USES1 },		/* dt rn */
+  { 0x4011, SETSSP | USES1 },			/* cmp/pz rn */
+  { 0x4012, STORE | SETS1 | USES1 | USESSP },	/* sts.l macl,@-rn */
+  { 0x4014, SETSSP | USES1 },			/* setrc rm */
+  { 0x4015, SETSSP | USES1 },			/* cmp/pl rn */
+  { 0x4016, LOAD | SETS1 | SETSSP | USES1 },	/* lds.l @rm+,macl */
+  { 0x4018, SETS1 | USES1 },			/* shll8 rn */
+  { 0x4019, SETS1 | USES1 },			/* shlr8 rn */
+  { 0x401a, SETSSP | USES1 },			/* lds rm,macl */
+  { 0x401b, LOAD | SETSSP | USES1 },		/* tas.b @rn */
+  { 0x4020, SETS1 | SETSSP | USES1 },		/* shal rn */
+  { 0x4021, SETS1 | SETSSP | USES1 },		/* shar rn */
+  { 0x4022, STORE | SETS1 | USES1 | USESSP },	/* sts.l pr,@-rn */
+  { 0x4024, SETS1 | SETSSP | USES1 | USESSP },	/* rotcl rn */
+  { 0x4025, SETS1 | SETSSP | USES1 | USESSP },	/* rotcr rn */
+  { 0x4026, LOAD | SETS1 | SETSSP | USES1 },	/* lds.l @rm+,pr */
+  { 0x4028, SETS1 | USES1 },			/* shll16 rn */
+  { 0x4029, SETS1 | USES1 },			/* shlr16 rn */
+  { 0x402a, SETSSP | USES1 },			/* lds rm,pr */
+  { 0x402b, BRANCH | DELAY | USES1 },		/* jmp @rn */
+  { 0x4052, STORE | SETS1 | USES1 | USESSP },	/* sts.l fpul,@-rn */
+  { 0x4056, LOAD | SETS1 | SETSSP | USES1 },	/* lds.l @rm+,fpul */
+  { 0x405a, SETSSP | USES1 },			/* lds.l rm,fpul */
+  { 0x4062, STORE | SETS1 | USES1 | USESSP },	/* sts.l fpscr / dsr,@-rn */
+  { 0x4066, LOAD | SETS1 | SETSSP | USES1 },	/* lds.l @rm+,fpscr / dsr */
+  { 0x406a, SETSSP | USES1 },			/* lds rm,fpscr / lds rm,dsr */
+  { 0x4072, STORE | SETS1 | USES1 | USESSP },	/* sts.l a0,@-rn */
+  { 0x4076, LOAD | SETS1 | SETSSP | USES1 },	/* lds.l @rm+,a0 */
+  { 0x407a, SETSSP | USES1 },			/* lds.l rm,a0 */
+  { 0x4082, STORE | SETS1 | USES1 | USESSP },	/* sts.l x0,@-rn */
+  { 0x4086, LOAD | SETS1 | SETSSP | USES1 },	/* lds.l @rm+,x0 */
+  { 0x408a, SETSSP | USES1 },			/* lds.l rm,x0 */
+  { 0x4092, STORE | SETS1 | USES1 | USESSP },	/* sts.l x1,@-rn */
+  { 0x4096, LOAD | SETS1 | SETSSP | USES1 },	/* lds.l @rm+,x1 */
+  { 0x409a, SETSSP | USES1 },			/* lds.l rm,x1 */
+  { 0x40a2, STORE | SETS1 | USES1 | USESSP },	/* sts.l y0,@-rn */
+  { 0x40a6, LOAD | SETS1 | SETSSP | USES1 },	/* lds.l @rm+,y0 */
+  { 0x40aa, SETSSP | USES1 },			/* lds.l rm,y0 */
+  { 0x40b2, STORE | SETS1 | USES1 | USESSP },	/* sts.l y1,@-rn */
+  { 0x40b6, LOAD | SETS1 | SETSSP | USES1 },	/* lds.l @rm+,y1 */
+  { 0x40ba, SETSSP | USES1 }			/* lds.l rm,y1 */
+};
+
+static const struct sh_opcode sh_opcode41[] =
+{
+  { 0x4003, STORE | SETS1 | USES1 | USESSP },	/* stc.l <special_reg>,@-rn */
+  { 0x4007, LOAD | SETS1 | SETSSP | USES1 },	/* ldc.l @rm+,<special_reg> */
+  { 0x400c, SETS1 | USES1 | USES2 },		/* shad rm,rn */
+  { 0x400d, SETS1 | USES1 | USES2 },		/* shld rm,rn */
+  { 0x400e, SETSSP | USES1 },			/* ldc rm,<special_reg> */
+  { 0x400f, LOAD|SETS1|SETS2|SETSSP|USES1|USES2|USESSP }, /* mac.w @rm+,@rn+ */
+};
+
+static const struct sh_minor_opcode sh_opcode4[] =
+{
+  { MAP (sh_opcode40), 0xf0ff },
+  { MAP (sh_opcode41), 0xf00f }
+};
+
+static const struct sh_opcode sh_opcode50[] =
+{
+  { 0x5000, LOAD | SETS1 | USES2 }	/* mov.l @(disp,rm),rn */
+};
+
+static const struct sh_minor_opcode sh_opcode5[] =
+{
+  { MAP (sh_opcode50), 0xf000 }
+};
+
+static const struct sh_opcode sh_opcode60[] =
+{
+  { 0x6000, LOAD | SETS1 | USES2 },		/* mov.b @rm,rn */
+  { 0x6001, LOAD | SETS1 | USES2 },		/* mov.w @rm,rn */
+  { 0x6002, LOAD | SETS1 | USES2 },		/* mov.l @rm,rn */
+  { 0x6003, SETS1 | USES2 },			/* mov rm,rn */
+  { 0x6004, LOAD | SETS1 | SETS2 | USES2 },	/* mov.b @rm+,rn */
+  { 0x6005, LOAD | SETS1 | SETS2 | USES2 },	/* mov.w @rm+,rn */
+  { 0x6006, LOAD | SETS1 | SETS2 | USES2 },	/* mov.l @rm+,rn */
+  { 0x6007, SETS1 | USES2 },			/* not rm,rn */
+  { 0x6008, SETS1 | USES2 },			/* swap.b rm,rn */
+  { 0x6009, SETS1 | USES2 },			/* swap.w rm,rn */
+  { 0x600a, SETS1 | SETSSP | USES2 | USESSP },	/* negc rm,rn */
+  { 0x600b, SETS1 | USES2 },			/* neg rm,rn */
+  { 0x600c, SETS1 | USES2 },			/* extu.b rm,rn */
+  { 0x600d, SETS1 | USES2 },			/* extu.w rm,rn */
+  { 0x600e, SETS1 | USES2 },			/* exts.b rm,rn */
+  { 0x600f, SETS1 | USES2 }			/* exts.w rm,rn */
+};
+
+static const struct sh_minor_opcode sh_opcode6[] =
+{
+  { MAP (sh_opcode60), 0xf00f }
+};
+
+static const struct sh_opcode sh_opcode70[] =
+{
+  { 0x7000, SETS1 | USES1 }		/* add #imm,rn */
+};
+
+static const struct sh_minor_opcode sh_opcode7[] =
+{
+  { MAP (sh_opcode70), 0xf000 }
+};
+
+static const struct sh_opcode sh_opcode80[] =
+{
+  { 0x8000, STORE | USES2 | USESR0 },	/* mov.b r0,@(disp,rn) */
+  { 0x8100, STORE | USES2 | USESR0 },	/* mov.w r0,@(disp,rn) */
+  { 0x8200, SETSSP },			/* setrc #imm */
+  { 0x8400, LOAD | SETSR0 | USES2 },	/* mov.b @(disp,rm),r0 */
+  { 0x8500, LOAD | SETSR0 | USES2 },	/* mov.w @(disp,rn),r0 */
+  { 0x8800, SETSSP | USESR0 },		/* cmp/eq #imm,r0 */
+  { 0x8900, BRANCH | USESSP },		/* bt label */
+  { 0x8b00, BRANCH | USESSP },		/* bf label */
+  { 0x8c00, SETSSP },			/* ldrs @(disp,pc) */
+  { 0x8d00, BRANCH | DELAY | USESSP },	/* bt/s label */
+  { 0x8e00, SETSSP },			/* ldre @(disp,pc) */
+  { 0x8f00, BRANCH | DELAY | USESSP }	/* bf/s label */
+};
+
+static const struct sh_minor_opcode sh_opcode8[] =
+{
+  { MAP (sh_opcode80), 0xff00 }
+};
+
+static const struct sh_opcode sh_opcode90[] =
+{
+  { 0x9000, LOAD | SETS1 }	/* mov.w @(disp,pc),rn */
+};
+
+static const struct sh_minor_opcode sh_opcode9[] =
+{
+  { MAP (sh_opcode90), 0xf000 }
+};
+
+static const struct sh_opcode sh_opcodea0[] =
+{
+  { 0xa000, BRANCH | DELAY }	/* bra label */
+};
+
+static const struct sh_minor_opcode sh_opcodea[] =
+{
+  { MAP (sh_opcodea0), 0xf000 }
+};
+
+static const struct sh_opcode sh_opcodeb0[] =
+{
+  { 0xb000, BRANCH | DELAY }	/* bsr label */
+};
+
+static const struct sh_minor_opcode sh_opcodeb[] =
+{
+  { MAP (sh_opcodeb0), 0xf000 }
+};
+
+static const struct sh_opcode sh_opcodec0[] =
+{
+  { 0xc000, STORE | USESR0 | USESSP },		/* mov.b r0,@(disp,gbr) */
+  { 0xc100, STORE | USESR0 | USESSP },		/* mov.w r0,@(disp,gbr) */
+  { 0xc200, STORE | USESR0 | USESSP },		/* mov.l r0,@(disp,gbr) */
+  { 0xc300, BRANCH | USESSP },			/* trapa #imm */
+  { 0xc400, LOAD | SETSR0 | USESSP },		/* mov.b @(disp,gbr),r0 */
+  { 0xc500, LOAD | SETSR0 | USESSP },		/* mov.w @(disp,gbr),r0 */
+  { 0xc600, LOAD | SETSR0 | USESSP },		/* mov.l @(disp,gbr),r0 */
+  { 0xc700, SETSR0 },				/* mova @(disp,pc),r0 */
+  { 0xc800, SETSSP | USESR0 },			/* tst #imm,r0 */
+  { 0xc900, SETSR0 | USESR0 },			/* and #imm,r0 */
+  { 0xca00, SETSR0 | USESR0 },			/* xor #imm,r0 */
+  { 0xcb00, SETSR0 | USESR0 },			/* or #imm,r0 */
+  { 0xcc00, LOAD | SETSSP | USESR0 | USESSP },	/* tst.b #imm,@(r0,gbr) */
+  { 0xcd00, LOAD | STORE | USESR0 | USESSP },	/* and.b #imm,@(r0,gbr) */
+  { 0xce00, LOAD | STORE | USESR0 | USESSP },	/* xor.b #imm,@(r0,gbr) */
+  { 0xcf00, LOAD | STORE | USESR0 | USESSP }	/* or.b #imm,@(r0,gbr) */
+};
+
+static const struct sh_minor_opcode sh_opcodec[] =
+{
+  { MAP (sh_opcodec0), 0xff00 }
+};
+
+static const struct sh_opcode sh_opcoded0[] =
+{
+  { 0xd000, LOAD | SETS1 }		/* mov.l @(disp,pc),rn */
+};
+
+static const struct sh_minor_opcode sh_opcoded[] =
+{
+  { MAP (sh_opcoded0), 0xf000 }
+};
+
+static const struct sh_opcode sh_opcodee0[] =
+{
+  { 0xe000, SETS1 }		/* mov #imm,rn */
+};
+
+static const struct sh_minor_opcode sh_opcodee[] =
+{
+  { MAP (sh_opcodee0), 0xf000 }
+};
+
+static const struct sh_opcode sh_opcodef0[] =
+{
+  { 0xf000, SETSF1 | USESF1 | USESF2 },		/* fadd fm,fn */
+  { 0xf001, SETSF1 | USESF1 | USESF2 },		/* fsub fm,fn */
+  { 0xf002, SETSF1 | USESF1 | USESF2 },		/* fmul fm,fn */
+  { 0xf003, SETSF1 | USESF1 | USESF2 },		/* fdiv fm,fn */
+  { 0xf004, SETSSP | USESF1 | USESF2 },		/* fcmp/eq fm,fn */
+  { 0xf005, SETSSP | USESF1 | USESF2 },		/* fcmp/gt fm,fn */
+  { 0xf006, LOAD | SETSF1 | USES2 | USESR0 },	/* fmov.s @(r0,rm),fn */
+  { 0xf007, STORE | USES1 | USESF2 | USESR0 },	/* fmov.s fm,@(r0,rn) */
+  { 0xf008, LOAD | SETSF1 | USES2 },		/* fmov.s @rm,fn */
+  { 0xf009, LOAD | SETS2 | SETSF1 | USES2 },	/* fmov.s @rm+,fn */
+  { 0xf00a, STORE | USES1 | USESF2 },		/* fmov.s fm,@rn */
+  { 0xf00b, STORE | SETS1 | USES1 | USESF2 },	/* fmov.s fm,@-rn */
+  { 0xf00c, SETSF1 | USESF2 },			/* fmov fm,fn */
+  { 0xf00e, SETSF1 | USESF1 | USESF2 | USESF0 }	/* fmac f0,fm,fn */
+};
+
+static const struct sh_opcode sh_opcodef1[] =
+{
+  { 0xf00d, SETSF1 | USESSP },	/* fsts fpul,fn */
+  { 0xf01d, SETSSP | USESF1 },	/* flds fn,fpul */
+  { 0xf02d, SETSF1 | USESSP },	/* float fpul,fn */
+  { 0xf03d, SETSSP | USESF1 },	/* ftrc fn,fpul */
+  { 0xf04d, SETSF1 | USESF1 },	/* fneg fn */
+  { 0xf05d, SETSF1 | USESF1 },	/* fabs fn */
+  { 0xf06d, SETSF1 | USESF1 },	/* fsqrt fn */
+  { 0xf07d, SETSSP | USESF1 },	/* ftst/nan fn */
+  { 0xf08d, SETSF1 },		/* fldi0 fn */
+  { 0xf09d, SETSF1 }		/* fldi1 fn */
+};
+
+static const struct sh_minor_opcode sh_opcodef[] =
+{
+  { MAP (sh_opcodef0), 0xf00f },
+  { MAP (sh_opcodef1), 0xf0ff }
+};
+
+static struct sh_major_opcode sh_opcodes[] =
+{
+  { MAP (sh_opcode0) },
+  { MAP (sh_opcode1) },
+  { MAP (sh_opcode2) },
+  { MAP (sh_opcode3) },
+  { MAP (sh_opcode4) },
+  { MAP (sh_opcode5) },
+  { MAP (sh_opcode6) },
+  { MAP (sh_opcode7) },
+  { MAP (sh_opcode8) },
+  { MAP (sh_opcode9) },
+  { MAP (sh_opcodea) },
+  { MAP (sh_opcodeb) },
+  { MAP (sh_opcodec) },
+  { MAP (sh_opcoded) },
+  { MAP (sh_opcodee) },
+  { MAP (sh_opcodef) }
+};
+
+/* The double data transfer / parallel processing insns are not
+   described here.  This will cause sh_align_load_span to leave them alone.  */
+
+static const struct sh_opcode sh_dsp_opcodef0[] =
+{
+  { 0xf400, USESAS | SETSAS | LOAD | SETSSP },	/* movs.x @-as,ds */
+  { 0xf401, USESAS | SETSAS | STORE | USESSP },	/* movs.x ds,@-as */
+  { 0xf404, USESAS | LOAD | SETSSP },		/* movs.x @as,ds */
+  { 0xf405, USESAS | STORE | USESSP },		/* movs.x ds,@as */
+  { 0xf408, USESAS | SETSAS | LOAD | SETSSP },	/* movs.x @as+,ds */
+  { 0xf409, USESAS | SETSAS | STORE | USESSP },	/* movs.x ds,@as+ */
+  { 0xf40c, USESAS | SETSAS | LOAD | SETSSP | USESR8 },	/* movs.x @as+r8,ds */
+  { 0xf40d, USESAS | SETSAS | STORE | USESSP | USESR8 }	/* movs.x ds,@as+r8 */
+};
+
+static const struct sh_minor_opcode sh_dsp_opcodef[] =
+{
+  { MAP (sh_dsp_opcodef0), 0xfc0d }
+};
+
+/* Given an instruction, return a pointer to the corresponding
+   sh_opcode structure.  Return NULL if the instruction is not
+   recognized.  */
+
+static const struct sh_opcode *
+sh_insn_info (insn)
+     unsigned int insn;
+{
+  const struct sh_major_opcode *maj;
+  const struct sh_minor_opcode *min, *minend;
+
+  maj = &sh_opcodes[(insn & 0xf000) >> 12];
+  min = maj->minor_opcodes;
+  minend = min + maj->count;
+  for (; min < minend; min++)
+    {
+      unsigned int l;
+      const struct sh_opcode *op, *opend;
+
+      l = insn & min->mask;
+      op = min->opcodes;
+      opend = op + min->count;
+
+      /* Since the opcodes tables are sorted, we could use a binary
+         search here if the count were above some cutoff value.  */
+      for (; op < opend; op++)
+	if (op->opcode == l)
+	  return op;
+    }
+
+  return NULL;
+}
+
+/* See whether an instruction uses or sets a general purpose register */
+
+static bfd_boolean
+sh_insn_uses_or_sets_reg (insn, op, reg)
+     unsigned int insn;
+     const struct sh_opcode *op;
+     unsigned int reg;
+{
+  if (sh_insn_uses_reg (insn, op, reg))
+    return TRUE;
+
+  return sh_insn_sets_reg (insn, op, reg);
+}
+
+/* See whether an instruction uses a general purpose register.  */
+
+static bfd_boolean
+sh_insn_uses_reg (insn, op, reg)
+     unsigned int insn;
+     const struct sh_opcode *op;
+     unsigned int reg;
+{
+  unsigned int f;
+
+  f = op->flags;
+
+  if ((f & USES1) != 0
+      && USES1_REG (insn) == reg)
+    return TRUE;
+  if ((f & USES2) != 0
+      && USES2_REG (insn) == reg)
+    return TRUE;
+  if ((f & USESR0) != 0
+      && reg == 0)
+    return TRUE;
+  if ((f & USESAS) && reg == USESAS_REG (insn))
+    return TRUE;
+  if ((f & USESR8) && reg == 8)
+    return TRUE;
+
+  return FALSE;
+}
+
+/* See whether an instruction sets a general purpose register.  */
+
+static bfd_boolean
+sh_insn_sets_reg (insn, op, reg)
+     unsigned int insn;
+     const struct sh_opcode *op;
+     unsigned int reg;
+{
+  unsigned int f;
+
+  f = op->flags;
+
+  if ((f & SETS1) != 0
+      && SETS1_REG (insn) == reg)
+    return TRUE;
+  if ((f & SETS2) != 0
+      && SETS2_REG (insn) == reg)
+    return TRUE;
+  if ((f & SETSR0) != 0
+      && reg == 0)
+    return TRUE;
+  if ((f & SETSAS) && reg == SETSAS_REG (insn))
+    return TRUE;
+
+  return FALSE;
+}
+
+/* See whether an instruction uses or sets a floating point register */
+
+static bfd_boolean
+sh_insn_uses_or_sets_freg (insn, op, reg)
+     unsigned int insn;
+     const struct sh_opcode *op;
+     unsigned int reg;
+{
+  if (sh_insn_uses_freg (insn, op, reg))
+    return TRUE;
+
+  return sh_insn_sets_freg (insn, op, reg);
+}
+
+/* See whether an instruction uses a floating point register.  */
+
+static bfd_boolean
+sh_insn_uses_freg (insn, op, freg)
+     unsigned int insn;
+     const struct sh_opcode *op;
+     unsigned int freg;
+{
+  unsigned int f;
+
+  f = op->flags;
+
+  /* We can't tell if this is a double-precision insn, so just play safe
+     and assume that it might be.  So not only have we test FREG against
+     itself, but also even FREG against FREG+1 - if the using insn uses
+     just the low part of a double precision value - but also an odd
+     FREG against FREG-1 -  if the setting insn sets just the low part
+     of a double precision value.
+     So what this all boils down to is that we have to ignore the lowest
+     bit of the register number.  */
+
+  if ((f & USESF1) != 0
+      && (USESF1_REG (insn) & 0xe) == (freg & 0xe))
+    return TRUE;
+  if ((f & USESF2) != 0
+      && (USESF2_REG (insn) & 0xe) == (freg & 0xe))
+    return TRUE;
+  if ((f & USESF0) != 0
+      && freg == 0)
+    return TRUE;
+
+  return FALSE;
+}
+
+/* See whether an instruction sets a floating point register.  */
+
+static bfd_boolean
+sh_insn_sets_freg (insn, op, freg)
+     unsigned int insn;
+     const struct sh_opcode *op;
+     unsigned int freg;
+{
+  unsigned int f;
+
+  f = op->flags;
+
+  /* We can't tell if this is a double-precision insn, so just play safe
+     and assume that it might be.  So not only have we test FREG against
+     itself, but also even FREG against FREG+1 - if the using insn uses
+     just the low part of a double precision value - but also an odd
+     FREG against FREG-1 -  if the setting insn sets just the low part
+     of a double precision value.
+     So what this all boils down to is that we have to ignore the lowest
+     bit of the register number.  */
+
+  if ((f & SETSF1) != 0
+      && (SETSF1_REG (insn) & 0xe) == (freg & 0xe))
+    return TRUE;
+
+  return FALSE;
+}
+
+/* See whether instructions I1 and I2 conflict, assuming I1 comes
+   before I2.  OP1 and OP2 are the corresponding sh_opcode structures.
+   This should return TRUE if there is a conflict, or FALSE if the
+   instructions can be swapped safely.  */
+
+static bfd_boolean
+sh_insns_conflict (i1, op1, i2, op2)
+     unsigned int i1;
+     const struct sh_opcode *op1;
+     unsigned int i2;
+     const struct sh_opcode *op2;
+{
+  unsigned int f1, f2;
+
+  f1 = op1->flags;
+  f2 = op2->flags;
+
+  /* Load of fpscr conflicts with floating point operations.
+     FIXME: shouldn't test raw opcodes here.  */
+  if (((i1 & 0xf0ff) == 0x4066 && (i2 & 0xf000) == 0xf000)
+      || ((i2 & 0xf0ff) == 0x4066 && (i1 & 0xf000) == 0xf000))
+    return TRUE;
+
+  if ((f1 & (BRANCH | DELAY)) != 0
+      || (f2 & (BRANCH | DELAY)) != 0)
+    return TRUE;
+
+  if (((f1 | f2) & SETSSP)
+      && (f1 & (SETSSP | USESSP))
+      && (f2 & (SETSSP | USESSP)))
+    return TRUE;
+
+  if ((f1 & SETS1) != 0
+      && sh_insn_uses_or_sets_reg (i2, op2, SETS1_REG (i1)))
+    return TRUE;
+  if ((f1 & SETS2) != 0
+      && sh_insn_uses_or_sets_reg (i2, op2, SETS2_REG (i1)))
+    return TRUE;
+  if ((f1 & SETSR0) != 0
+      && sh_insn_uses_or_sets_reg (i2, op2, 0))
+    return TRUE;
+  if ((f1 & SETSAS)
+      && sh_insn_uses_or_sets_reg (i2, op2, SETSAS_REG (i1)))
+    return TRUE;
+  if ((f1 & SETSF1) != 0
+      && sh_insn_uses_or_sets_freg (i2, op2, SETSF1_REG (i1)))
+    return TRUE;
+
+  if ((f2 & SETS1) != 0
+      && sh_insn_uses_or_sets_reg (i1, op1, SETS1_REG (i2)))
+    return TRUE;
+  if ((f2 & SETS2) != 0
+      && sh_insn_uses_or_sets_reg (i1, op1, SETS2_REG (i2)))
+    return TRUE;
+  if ((f2 & SETSR0) != 0
+      && sh_insn_uses_or_sets_reg (i1, op1, 0))
+    return TRUE;
+  if ((f2 & SETSAS)
+      && sh_insn_uses_or_sets_reg (i1, op1, SETSAS_REG (i2)))
+    return TRUE;
+  if ((f2 & SETSF1) != 0
+      && sh_insn_uses_or_sets_freg (i1, op1, SETSF1_REG (i2)))
+    return TRUE;
+
+  /* The instructions do not conflict.  */
+  return FALSE;
+}
+
+/* I1 is a load instruction, and I2 is some other instruction.  Return
+   TRUE if I1 loads a register which I2 uses.  */
+
+static bfd_boolean
+sh_load_use (i1, op1, i2, op2)
+     unsigned int i1;
+     const struct sh_opcode *op1;
+     unsigned int i2;
+     const struct sh_opcode *op2;
+{
+  unsigned int f1;
+
+  f1 = op1->flags;
+
+  if ((f1 & LOAD) == 0)
+    return FALSE;
+
+  /* If both SETS1 and SETSSP are set, that means a load to a special
+     register using postincrement addressing mode, which we don't care
+     about here.  */
+  if ((f1 & SETS1) != 0
+      && (f1 & SETSSP) == 0
+      && sh_insn_uses_reg (i2, op2, (i1 & 0x0f00) >> 8))
+    return TRUE;
+
+  if ((f1 & SETSR0) != 0
+      && sh_insn_uses_reg (i2, op2, 0))
+    return TRUE;
+
+  if ((f1 & SETSF1) != 0
+      && sh_insn_uses_freg (i2, op2, (i1 & 0x0f00) >> 8))
+    return TRUE;
+
+  return FALSE;
+}
+
+/* Try to align loads and stores within a span of memory.  This is
+   called by both the ELF and the COFF sh targets.  ABFD and SEC are
+   the BFD and section we are examining.  CONTENTS is the contents of
+   the section.  SWAP is the routine to call to swap two instructions.
+   RELOCS is a pointer to the internal relocation information, to be
+   passed to SWAP.  PLABEL is a pointer to the current label in a
+   sorted list of labels; LABEL_END is the end of the list.  START and
+   STOP are the range of memory to examine.  If a swap is made,
+   *PSWAPPED is set to TRUE.  */
+
+#ifdef COFF_WITH_PE
+static
+#endif
+bfd_boolean
+_bfd_sh_align_load_span (abfd, sec, contents, swap, relocs,
+			 plabel, label_end, start, stop, pswapped)
+     bfd *abfd;
+     asection *sec;
+     bfd_byte *contents;
+     bfd_boolean (*swap) PARAMS ((bfd *, asection *, PTR, bfd_byte *, bfd_vma));
+     PTR relocs;
+     bfd_vma **plabel;
+     bfd_vma *label_end;
+     bfd_vma start;
+     bfd_vma stop;
+     bfd_boolean *pswapped;
+{
+  int dsp = (abfd->arch_info->mach == bfd_mach_sh_dsp
+	     || abfd->arch_info->mach == bfd_mach_sh3_dsp);
+  bfd_vma i;
+
+  /* The SH4 has a Harvard architecture, hence aligning loads is not
+     desirable.  In fact, it is counter-productive, since it interferes
+     with the schedules generated by the compiler.  */
+  if (abfd->arch_info->mach == bfd_mach_sh4)
+    return TRUE;
+
+  /* If we are linking sh[3]-dsp code, swap the FPU instructions for DSP
+     instructions.  */
+  if (dsp)
+    {
+      sh_opcodes[0xf].minor_opcodes = sh_dsp_opcodef;
+      sh_opcodes[0xf].count = sizeof sh_dsp_opcodef / sizeof sh_dsp_opcodef;
+    }
+
+  /* Instructions should be aligned on 2 byte boundaries.  */
+  if ((start & 1) == 1)
+    ++start;
+
+  /* Now look through the unaligned addresses.  */
+  i = start;
+  if ((i & 2) == 0)
+    i += 2;
+  for (; i < stop; i += 4)
+    {
+      unsigned int insn;
+      const struct sh_opcode *op;
+      unsigned int prev_insn = 0;
+      const struct sh_opcode *prev_op = NULL;
+
+      insn = bfd_get_16 (abfd, contents + i);
+      op = sh_insn_info (insn);
+      if (op == NULL
+	  || (op->flags & (LOAD | STORE)) == 0)
+	continue;
+
+      /* This is a load or store which is not on a four byte boundary.  */
+
+      while (*plabel < label_end && **plabel < i)
+	++*plabel;
+
+      if (i > start)
+	{
+	  prev_insn = bfd_get_16 (abfd, contents + i - 2);
+	  /* If INSN is the field b of a parallel processing insn, it is not
+	     a load / store after all.  Note that the test here might mistake
+	     the field_b of a pcopy insn for the starting code of a parallel
+	     processing insn; this might miss a swapping opportunity, but at
+	     least we're on the safe side.  */
+	  if (dsp && (prev_insn & 0xfc00) == 0xf800)
+	    continue;
+
+	  /* Check if prev_insn is actually the field b of a parallel
+	     processing insn.  Again, this can give a spurious match
+	     after a pcopy.  */
+	  if (dsp && i - 2 > start)
+	    {
+	      unsigned pprev_insn = bfd_get_16 (abfd, contents + i - 4);
+
+	      if ((pprev_insn & 0xfc00) == 0xf800)
+		prev_op = NULL;
+	      else
+		prev_op = sh_insn_info (prev_insn);
+	    }
+	  else
+	    prev_op = sh_insn_info (prev_insn);
+
+	  /* If the load/store instruction is in a delay slot, we
+	     can't swap.  */
+	  if (prev_op == NULL
+	      || (prev_op->flags & DELAY) != 0)
+	    continue;
+	}
+      if (i > start
+	  && (*plabel >= label_end || **plabel != i)
+	  && prev_op != NULL
+	  && (prev_op->flags & (LOAD | STORE)) == 0
+	  && ! sh_insns_conflict (prev_insn, prev_op, insn, op))
+	{
+	  bfd_boolean ok;
+
+	  /* The load/store instruction does not have a label, and
+	     there is a previous instruction; PREV_INSN is not
+	     itself a load/store instruction, and PREV_INSN and
+	     INSN do not conflict.  */
+
+	  ok = TRUE;
+
+	  if (i >= start + 4)
+	    {
+	      unsigned int prev2_insn;
+	      const struct sh_opcode *prev2_op;
+
+	      prev2_insn = bfd_get_16 (abfd, contents + i - 4);
+	      prev2_op = sh_insn_info (prev2_insn);
+
+	      /* If the instruction before PREV_INSN has a delay
+		 slot--that is, PREV_INSN is in a delay slot--we
+		 can not swap.  */
+	      if (prev2_op == NULL
+		  || (prev2_op->flags & DELAY) != 0)
+		ok = FALSE;
+
+	      /* If the instruction before PREV_INSN is a load,
+		 and it sets a register which INSN uses, then
+		 putting INSN immediately after PREV_INSN will
+		 cause a pipeline bubble, so there is no point to
+		 making the swap.  */
+	      if (ok
+		  && (prev2_op->flags & LOAD) != 0
+		  && sh_load_use (prev2_insn, prev2_op, insn, op))
+		ok = FALSE;
+	    }
+
+	  if (ok)
+	    {
+	      if (! (*swap) (abfd, sec, relocs, contents, i - 2))
+		return FALSE;
+	      *pswapped = TRUE;
+	      continue;
+	    }
+	}
+
+      while (*plabel < label_end && **plabel < i + 2)
+	++*plabel;
+
+      if (i + 2 < stop
+	  && (*plabel >= label_end || **plabel != i + 2))
+	{
+	  unsigned int next_insn;
+	  const struct sh_opcode *next_op;
+
+	  /* There is an instruction after the load/store
+	     instruction, and it does not have a label.  */
+	  next_insn = bfd_get_16 (abfd, contents + i + 2);
+	  next_op = sh_insn_info (next_insn);
+	  if (next_op != NULL
+	      && (next_op->flags & (LOAD | STORE)) == 0
+	      && ! sh_insns_conflict (insn, op, next_insn, next_op))
+	    {
+	      bfd_boolean ok;
+
+	      /* NEXT_INSN is not itself a load/store instruction,
+		 and it does not conflict with INSN.  */
+
+	      ok = TRUE;
+
+	      /* If PREV_INSN is a load, and it sets a register
+		 which NEXT_INSN uses, then putting NEXT_INSN
+		 immediately after PREV_INSN will cause a pipeline
+		 bubble, so there is no reason to make this swap.  */
+	      if (prev_op != NULL
+		  && (prev_op->flags & LOAD) != 0
+		  && sh_load_use (prev_insn, prev_op, next_insn, next_op))
+		ok = FALSE;
+
+	      /* If INSN is a load, and it sets a register which
+		 the insn after NEXT_INSN uses, then doing the
+		 swap will cause a pipeline bubble, so there is no
+		 reason to make the swap.  However, if the insn
+		 after NEXT_INSN is itself a load or store
+		 instruction, then it is misaligned, so
+		 optimistically hope that it will be swapped
+		 itself, and just live with the pipeline bubble if
+		 it isn't.  */
+	      if (ok
+		  && i + 4 < stop
+		  && (op->flags & LOAD) != 0)
+		{
+		  unsigned int next2_insn;
+		  const struct sh_opcode *next2_op;
+
+		  next2_insn = bfd_get_16 (abfd, contents + i + 4);
+		  next2_op = sh_insn_info (next2_insn);
+		  if (next2_op == NULL
+		      || ((next2_op->flags & (LOAD | STORE)) == 0
+			  && sh_load_use (insn, op, next2_insn, next2_op)))
+		    ok = FALSE;
+		}
+
+	      if (ok)
+		{
+		  if (! (*swap) (abfd, sec, relocs, contents, i))
+		    return FALSE;
+		  *pswapped = TRUE;
+		  continue;
+		}
+	    }
+	}
+    }
+
+  return TRUE;
+}
+#endif /* not COFF_IMAGE_WITH_PE */
+
+/* Look for loads and stores which we can align to four byte
+   boundaries.  See the longer comment above sh_relax_section for why
+   this is desirable.  This sets *PSWAPPED if some instruction was
+   swapped.  */
+
+static bfd_boolean
+sh_align_loads (abfd, sec, internal_relocs, contents, pswapped)
+     bfd *abfd;
+     asection *sec;
+     struct internal_reloc *internal_relocs;
+     bfd_byte *contents;
+     bfd_boolean *pswapped;
+{
+  struct internal_reloc *irel, *irelend;
+  bfd_vma *labels = NULL;
+  bfd_vma *label, *label_end;
+  bfd_size_type amt;
+
+  *pswapped = FALSE;
+
+  irelend = internal_relocs + sec->reloc_count;
+
+  /* Get all the addresses with labels on them.  */
+  amt = (bfd_size_type) sec->reloc_count * sizeof (bfd_vma);
+  labels = (bfd_vma *) bfd_malloc (amt);
+  if (labels == NULL)
+    goto error_return;
+  label_end = labels;
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      if (irel->r_type == R_SH_LABEL)
+	{
+	  *label_end = irel->r_vaddr - sec->vma;
+	  ++label_end;
+	}
+    }
+
+  /* Note that the assembler currently always outputs relocs in
+     address order.  If that ever changes, this code will need to sort
+     the label values and the relocs.  */
+
+  label = labels;
+
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      bfd_vma start, stop;
+
+      if (irel->r_type != R_SH_CODE)
+	continue;
+
+      start = irel->r_vaddr - sec->vma;
+
+      for (irel++; irel < irelend; irel++)
+	if (irel->r_type == R_SH_DATA)
+	  break;
+      if (irel < irelend)
+	stop = irel->r_vaddr - sec->vma;
+      else
+	stop = sec->size;
+
+      if (! _bfd_sh_align_load_span (abfd, sec, contents, sh_swap_insns,
+				     (PTR) internal_relocs, &label,
+				     label_end, start, stop, pswapped))
+	goto error_return;
+    }
+
+  free (labels);
+
+  return TRUE;
+
+ error_return:
+  if (labels != NULL)
+    free (labels);
+  return FALSE;
+}
+
+/* Swap two SH instructions.  */
+
+static bfd_boolean
+sh_swap_insns (abfd, sec, relocs, contents, addr)
+     bfd *abfd;
+     asection *sec;
+     PTR relocs;
+     bfd_byte *contents;
+     bfd_vma addr;
+{
+  struct internal_reloc *internal_relocs = (struct internal_reloc *) relocs;
+  unsigned short i1, i2;
+  struct internal_reloc *irel, *irelend;
+
+  /* Swap the instructions themselves.  */
+  i1 = bfd_get_16 (abfd, contents + addr);
+  i2 = bfd_get_16 (abfd, contents + addr + 2);
+  bfd_put_16 (abfd, (bfd_vma) i2, contents + addr);
+  bfd_put_16 (abfd, (bfd_vma) i1, contents + addr + 2);
+
+  /* Adjust all reloc addresses.  */
+  irelend = internal_relocs + sec->reloc_count;
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      int type, add;
+
+      /* There are a few special types of relocs that we don't want to
+         adjust.  These relocs do not apply to the instruction itself,
+         but are only associated with the address.  */
+      type = irel->r_type;
+      if (type == R_SH_ALIGN
+	  || type == R_SH_CODE
+	  || type == R_SH_DATA
+	  || type == R_SH_LABEL)
+	continue;
+
+      /* If an R_SH_USES reloc points to one of the addresses being
+         swapped, we must adjust it.  It would be incorrect to do this
+         for a jump, though, since we want to execute both
+         instructions after the jump.  (We have avoided swapping
+         around a label, so the jump will not wind up executing an
+         instruction it shouldn't).  */
+      if (type == R_SH_USES)
+	{
+	  bfd_vma off;
+
+	  off = irel->r_vaddr - sec->vma + 4 + irel->r_offset;
+	  if (off == addr)
+	    irel->r_offset += 2;
+	  else if (off == addr + 2)
+	    irel->r_offset -= 2;
+	}
+
+      if (irel->r_vaddr - sec->vma == addr)
+	{
+	  irel->r_vaddr += 2;
+	  add = -2;
+	}
+      else if (irel->r_vaddr - sec->vma == addr + 2)
+	{
+	  irel->r_vaddr -= 2;
+	  add = 2;
+	}
+      else
+	add = 0;
+
+      if (add != 0)
+	{
+	  bfd_byte *loc;
+	  unsigned short insn, oinsn;
+	  bfd_boolean overflow;
+
+	  loc = contents + irel->r_vaddr - sec->vma;
+	  overflow = FALSE;
+	  switch (type)
+	    {
+	    default:
+	      break;
+
+	    case R_SH_PCDISP8BY2:
+	    case R_SH_PCRELIMM8BY2:
+	      insn = bfd_get_16 (abfd, loc);
+	      oinsn = insn;
+	      insn += add / 2;
+	      if ((oinsn & 0xff00) != (insn & 0xff00))
+		overflow = TRUE;
+	      bfd_put_16 (abfd, (bfd_vma) insn, loc);
+	      break;
+
+	    case R_SH_PCDISP:
+	      insn = bfd_get_16 (abfd, loc);
+	      oinsn = insn;
+	      insn += add / 2;
+	      if ((oinsn & 0xf000) != (insn & 0xf000))
+		overflow = TRUE;
+	      bfd_put_16 (abfd, (bfd_vma) insn, loc);
+	      break;
+
+	    case R_SH_PCRELIMM8BY4:
+	      /* This reloc ignores the least significant 3 bits of
+                 the program counter before adding in the offset.
+                 This means that if ADDR is at an even address, the
+                 swap will not affect the offset.  If ADDR is an at an
+                 odd address, then the instruction will be crossing a
+                 four byte boundary, and must be adjusted.  */
+	      if ((addr & 3) != 0)
+		{
+		  insn = bfd_get_16 (abfd, loc);
+		  oinsn = insn;
+		  insn += add / 2;
+		  if ((oinsn & 0xff00) != (insn & 0xff00))
+		    overflow = TRUE;
+		  bfd_put_16 (abfd, (bfd_vma) insn, loc);
+		}
+
+	      break;
+	    }
+
+	  if (overflow)
+	    {
+	      ((*_bfd_error_handler)
+	       ("%B: 0x%lx: fatal: reloc overflow while relaxing",
+		abfd, (unsigned long) irel->r_vaddr));
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* This is a modification of _bfd_coff_generic_relocate_section, which
+   will handle SH relaxing.  */
+
+static bfd_boolean
+sh_relocate_section (output_bfd, info, input_bfd, input_section, contents,
+		     relocs, syms, sections)
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     struct internal_reloc *relocs;
+     struct internal_syment *syms;
+     asection **sections;
+{
+  struct internal_reloc *rel;
+  struct internal_reloc *relend;
+
+  rel = relocs;
+  relend = rel + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      long symndx;
+      struct coff_link_hash_entry *h;
+      struct internal_syment *sym;
+      bfd_vma addend;
+      bfd_vma val;
+      reloc_howto_type *howto;
+      bfd_reloc_status_type rstat;
+
+      /* Almost all relocs have to do with relaxing.  If any work must
+         be done for them, it has been done in sh_relax_section.  */
+      if (rel->r_type != R_SH_IMM32
+#ifdef COFF_WITH_PE
+	  && rel->r_type != R_SH_IMM32CE
+	  && rel->r_type != R_SH_IMAGEBASE
+#endif
+	  && rel->r_type != R_SH_PCDISP)
+	continue;
+
+      symndx = rel->r_symndx;
+
+      if (symndx == -1)
+	{
+	  h = NULL;
+	  sym = NULL;
+	}
+      else
+	{
+	  if (symndx < 0
+	      || (unsigned long) symndx >= obj_raw_syment_count (input_bfd))
+	    {
+	      (*_bfd_error_handler)
+		("%B: illegal symbol index %ld in relocs",
+		 input_bfd, symndx);
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	  h = obj_coff_sym_hashes (input_bfd)[symndx];
+	  sym = syms + symndx;
+	}
+
+      if (sym != NULL && sym->n_scnum != 0)
+	addend = - sym->n_value;
+      else
+	addend = 0;
+
+      if (rel->r_type == R_SH_PCDISP)
+	addend -= 4;
+
+      if (rel->r_type >= SH_COFF_HOWTO_COUNT)
+	howto = NULL;
+      else
+	howto = &sh_coff_howtos[rel->r_type];
+
+      if (howto == NULL)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+#ifdef COFF_WITH_PE
+      if (rel->r_type == R_SH_IMAGEBASE)
+	addend -= pe_data (input_section->output_section->owner)->pe_opthdr.ImageBase;
+#endif
+
+      val = 0;
+
+      if (h == NULL)
+	{
+	  asection *sec;
+
+	  /* There is nothing to do for an internal PCDISP reloc.  */
+	  if (rel->r_type == R_SH_PCDISP)
+	    continue;
+
+	  if (symndx == -1)
+	    {
+	      sec = bfd_abs_section_ptr;
+	      val = 0;
+	    }
+	  else
+	    {
+	      sec = sections[symndx];
+              val = (sec->output_section->vma
+		     + sec->output_offset
+		     + sym->n_value
+		     - sec->vma);
+	    }
+	}
+      else
+	{
+	  if (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	    {
+	      asection *sec;
+
+	      sec = h->root.u.def.section;
+	      val = (h->root.u.def.value
+		     + sec->output_section->vma
+		     + sec->output_offset);
+	    }
+	  else if (! info->relocatable)
+	    {
+	      if (! ((*info->callbacks->undefined_symbol)
+		     (info, h->root.root.string, input_bfd, input_section,
+		      rel->r_vaddr - input_section->vma, TRUE)))
+		return FALSE;
+	    }
+	}
+
+      rstat = _bfd_final_link_relocate (howto, input_bfd, input_section,
+					contents,
+					rel->r_vaddr - input_section->vma,
+					val, addend);
+
+      switch (rstat)
+	{
+	default:
+	  abort ();
+	case bfd_reloc_ok:
+	  break;
+	case bfd_reloc_overflow:
+	  {
+	    const char *name;
+	    char buf[SYMNMLEN + 1];
+
+	    if (symndx == -1)
+	      name = "*ABS*";
+	    else if (h != NULL)
+	      name = NULL;
+	    else if (sym->_n._n_n._n_zeroes == 0
+		     && sym->_n._n_n._n_offset != 0)
+	      name = obj_coff_strings (input_bfd) + sym->_n._n_n._n_offset;
+	    else
+	      {
+ 		strncpy (buf, sym->_n._n_name, SYMNMLEN);
+		buf[SYMNMLEN] = '\0';
+		name = buf;
+	      }
+
+	    if (! ((*info->callbacks->reloc_overflow)
+		   (info, (h ? &h->root : NULL), name, howto->name,
+		    (bfd_vma) 0, input_bfd, input_section,
+		    rel->r_vaddr - input_section->vma)))
+	      return FALSE;
+	  }
+	}
+    }
+
+  return TRUE;
+}
+
+/* This is a version of bfd_generic_get_relocated_section_contents
+   which uses sh_relocate_section.  */
+
+static bfd_byte *
+sh_coff_get_relocated_section_contents (output_bfd, link_info, link_order,
+					data, relocatable, symbols)
+     bfd *output_bfd;
+     struct bfd_link_info *link_info;
+     struct bfd_link_order *link_order;
+     bfd_byte *data;
+     bfd_boolean relocatable;
+     asymbol **symbols;
+{
+  asection *input_section = link_order->u.indirect.section;
+  bfd *input_bfd = input_section->owner;
+  asection **sections = NULL;
+  struct internal_reloc *internal_relocs = NULL;
+  struct internal_syment *internal_syms = NULL;
+
+  /* We only need to handle the case of relaxing, or of having a
+     particular set of section contents, specially.  */
+  if (relocatable
+      || coff_section_data (input_bfd, input_section) == NULL
+      || coff_section_data (input_bfd, input_section)->contents == NULL)
+    return bfd_generic_get_relocated_section_contents (output_bfd, link_info,
+						       link_order, data,
+						       relocatable,
+						       symbols);
+
+  memcpy (data, coff_section_data (input_bfd, input_section)->contents,
+	  (size_t) input_section->size);
+
+  if ((input_section->flags & SEC_RELOC) != 0
+      && input_section->reloc_count > 0)
+    {
+      bfd_size_type symesz = bfd_coff_symesz (input_bfd);
+      bfd_byte *esym, *esymend;
+      struct internal_syment *isymp;
+      asection **secpp;
+      bfd_size_type amt;
+
+      if (! _bfd_coff_get_external_symbols (input_bfd))
+	goto error_return;
+
+      internal_relocs = (_bfd_coff_read_internal_relocs
+			 (input_bfd, input_section, FALSE, (bfd_byte *) NULL,
+			  FALSE, (struct internal_reloc *) NULL));
+      if (internal_relocs == NULL)
+	goto error_return;
+
+      amt = obj_raw_syment_count (input_bfd);
+      amt *= sizeof (struct internal_syment);
+      internal_syms = (struct internal_syment *) bfd_malloc (amt);
+      if (internal_syms == NULL)
+	goto error_return;
+
+      amt = obj_raw_syment_count (input_bfd);
+      amt *= sizeof (asection *);
+      sections = (asection **) bfd_malloc (amt);
+      if (sections == NULL)
+	goto error_return;
+
+      isymp = internal_syms;
+      secpp = sections;
+      esym = (bfd_byte *) obj_coff_external_syms (input_bfd);
+      esymend = esym + obj_raw_syment_count (input_bfd) * symesz;
+      while (esym < esymend)
+	{
+	  bfd_coff_swap_sym_in (input_bfd, (PTR) esym, (PTR) isymp);
+
+	  if (isymp->n_scnum != 0)
+	    *secpp = coff_section_from_bfd_index (input_bfd, isymp->n_scnum);
+	  else
+	    {
+	      if (isymp->n_value == 0)
+		*secpp = bfd_und_section_ptr;
+	      else
+		*secpp = bfd_com_section_ptr;
+	    }
+
+	  esym += (isymp->n_numaux + 1) * symesz;
+	  secpp += isymp->n_numaux + 1;
+	  isymp += isymp->n_numaux + 1;
+	}
+
+      if (! sh_relocate_section (output_bfd, link_info, input_bfd,
+				 input_section, data, internal_relocs,
+				 internal_syms, sections))
+	goto error_return;
+
+      free (sections);
+      sections = NULL;
+      free (internal_syms);
+      internal_syms = NULL;
+      free (internal_relocs);
+      internal_relocs = NULL;
+    }
+
+  return data;
+
+ error_return:
+  if (internal_relocs != NULL)
+    free (internal_relocs);
+  if (internal_syms != NULL)
+    free (internal_syms);
+  if (sections != NULL)
+    free (sections);
+  return NULL;
+}
+
+/* The target vectors.  */
+
+#ifndef TARGET_SHL_SYM
+CREATE_BIG_COFF_TARGET_VEC (shcoff_vec, "coff-sh", BFD_IS_RELAXABLE, 0, '_', NULL, COFF_SWAP_TABLE)
+#endif
+
+#ifdef TARGET_SHL_SYM
+#define TARGET_SYM TARGET_SHL_SYM
+#else
+#define TARGET_SYM shlcoff_vec
+#endif
+
+#ifndef TARGET_SHL_NAME
+#define TARGET_SHL_NAME "coff-shl"
+#endif
+
+#ifdef COFF_WITH_PE
+CREATE_LITTLE_COFF_TARGET_VEC (TARGET_SYM, TARGET_SHL_NAME, BFD_IS_RELAXABLE,
+			       SEC_CODE | SEC_DATA, '_', NULL, COFF_SWAP_TABLE);
+#else
+CREATE_LITTLE_COFF_TARGET_VEC (TARGET_SYM, TARGET_SHL_NAME, BFD_IS_RELAXABLE,
+			       0, '_', NULL, COFF_SWAP_TABLE)
+#endif
+
+#ifndef TARGET_SHL_SYM
+static const bfd_target * coff_small_object_p PARAMS ((bfd *));
+static bfd_boolean coff_small_new_section_hook PARAMS ((bfd *, asection *));
+/* Some people want versions of the SH COFF target which do not align
+   to 16 byte boundaries.  We implement that by adding a couple of new
+   target vectors.  These are just like the ones above, but they
+   change the default section alignment.  To generate them in the
+   assembler, use -small.  To use them in the linker, use -b
+   coff-sh{l}-small and -oformat coff-sh{l}-small.
+
+   Yes, this is a horrible hack.  A general solution for setting
+   section alignment in COFF is rather complex.  ELF handles this
+   correctly.  */
+
+/* Only recognize the small versions if the target was not defaulted.
+   Otherwise we won't recognize the non default endianness.  */
+
+static const bfd_target *
+coff_small_object_p (abfd)
+     bfd *abfd;
+{
+  if (abfd->target_defaulted)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+  return coff_object_p (abfd);
+}
+
+/* Set the section alignment for the small versions.  */
+
+static bfd_boolean
+coff_small_new_section_hook (abfd, section)
+     bfd *abfd;
+     asection *section;
+{
+  if (! coff_new_section_hook (abfd, section))
+    return FALSE;
+
+  /* We must align to at least a four byte boundary, because longword
+     accesses must be on a four byte boundary.  */
+  if (section->alignment_power == COFF_DEFAULT_SECTION_ALIGNMENT_POWER)
+    section->alignment_power = 2;
+
+  return TRUE;
+}
+
+/* This is copied from bfd_coff_std_swap_table so that we can change
+   the default section alignment power.  */
+
+static bfd_coff_backend_data bfd_coff_small_swap_table =
+{
+  coff_swap_aux_in, coff_swap_sym_in, coff_swap_lineno_in,
+  coff_swap_aux_out, coff_swap_sym_out,
+  coff_swap_lineno_out, coff_swap_reloc_out,
+  coff_swap_filehdr_out, coff_swap_aouthdr_out,
+  coff_swap_scnhdr_out,
+  FILHSZ, AOUTSZ, SCNHSZ, SYMESZ, AUXESZ, RELSZ, LINESZ, FILNMLEN,
+#ifdef COFF_LONG_FILENAMES
+  TRUE,
+#else
+  FALSE,
+#endif
+  COFF_DEFAULT_LONG_SECTION_NAMES,
+  2,
+#ifdef COFF_FORCE_SYMBOLS_IN_STRINGS
+  TRUE,
+#else
+  FALSE,
+#endif
+#ifdef COFF_DEBUG_STRING_WIDE_PREFIX
+  4,
+#else
+  2,
+#endif
+  coff_swap_filehdr_in, coff_swap_aouthdr_in, coff_swap_scnhdr_in,
+  coff_swap_reloc_in, coff_bad_format_hook, coff_set_arch_mach_hook,
+  coff_mkobject_hook, styp_to_sec_flags, coff_set_alignment_hook,
+  coff_slurp_symbol_table, symname_in_debug_hook, coff_pointerize_aux_hook,
+  coff_print_aux, coff_reloc16_extra_cases, coff_reloc16_estimate,
+  coff_classify_symbol, coff_compute_section_file_positions,
+  coff_start_final_link, coff_relocate_section, coff_rtype_to_howto,
+  coff_adjust_symndx, coff_link_add_one_symbol,
+  coff_link_output_has_begun, coff_final_link_postscript,
+  bfd_pe_print_pdata
+};
+
+#define coff_small_close_and_cleanup \
+  coff_close_and_cleanup
+#define coff_small_bfd_free_cached_info \
+  coff_bfd_free_cached_info
+#define coff_small_get_section_contents \
+  coff_get_section_contents
+#define coff_small_get_section_contents_in_window \
+  coff_get_section_contents_in_window
+
+extern const bfd_target shlcoff_small_vec;
+
+const bfd_target shcoff_small_vec =
+{
+  "coff-sh-small",		/* name */
+  bfd_target_coff_flavour,
+  BFD_ENDIAN_BIG,		/* data byte order is big */
+  BFD_ENDIAN_BIG,		/* header byte order is big */
+
+  (HAS_RELOC | EXEC_P |		/* object flags */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | BFD_IS_RELAXABLE),
+
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC),
+  '_',				/* leading symbol underscore */
+  '/',				/* ar_pad_char */
+  15,				/* ar_max_namelen */
+  0,				/* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
+
+  {_bfd_dummy_target, coff_small_object_p, /* bfd_check_format */
+     bfd_generic_archive_p, _bfd_dummy_target},
+  {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
+     bfd_false},
+  {bfd_false, coff_write_object_contents, /* bfd_write_contents */
+     _bfd_write_archive_contents, bfd_false},
+
+  BFD_JUMP_TABLE_GENERIC (coff_small),
+  BFD_JUMP_TABLE_COPY (coff),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+  BFD_JUMP_TABLE_SYMBOLS (coff),
+  BFD_JUMP_TABLE_RELOCS (coff),
+  BFD_JUMP_TABLE_WRITE (coff),
+  BFD_JUMP_TABLE_LINK (coff),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  & shlcoff_small_vec,
+
+  (PTR) &bfd_coff_small_swap_table
+};
+
+const bfd_target shlcoff_small_vec =
+{
+  "coff-shl-small",		/* name */
+  bfd_target_coff_flavour,
+  BFD_ENDIAN_LITTLE,		/* data byte order is little */
+  BFD_ENDIAN_LITTLE,		/* header byte order is little endian too*/
+
+  (HAS_RELOC | EXEC_P |		/* object flags */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | BFD_IS_RELAXABLE),
+
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC),
+  '_',				/* leading symbol underscore */
+  '/',				/* ar_pad_char */
+  15,				/* ar_max_namelen */
+  0,				/* match priority.  */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
+
+  {_bfd_dummy_target, coff_small_object_p, /* bfd_check_format */
+     bfd_generic_archive_p, _bfd_dummy_target},
+  {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
+     bfd_false},
+  {bfd_false, coff_write_object_contents, /* bfd_write_contents */
+     _bfd_write_archive_contents, bfd_false},
+
+  BFD_JUMP_TABLE_GENERIC (coff_small),
+  BFD_JUMP_TABLE_COPY (coff),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+  BFD_JUMP_TABLE_SYMBOLS (coff),
+  BFD_JUMP_TABLE_RELOCS (coff),
+  BFD_JUMP_TABLE_WRITE (coff),
+  BFD_JUMP_TABLE_LINK (coff),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  & shcoff_small_vec,
+
+  (PTR) &bfd_coff_small_swap_table
+};
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-sparc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-sparc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-sparc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-sparc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,221 @@
+/* BFD back-end for Sparc COFF files.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1999, 2000, 2001,
+   2002, 2003, 2005, 2007, 2008  Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "coff/sparc.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
+
+#define BADMAG(x) ((x).f_magic != SPARCMAGIC && (x).f_magic != LYNXCOFFMAGIC)
+
+/* The page size is a guess based on ELF.  */
+#define COFF_PAGE_SIZE 0x10000
+
+
+static reloc_howto_type *coff_sparc_reloc_type_lookup
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
+static void rtype2howto PARAMS ((arelent *, struct internal_reloc *));
+
+enum reloc_type
+  {
+    R_SPARC_NONE = 0,
+    R_SPARC_8,		R_SPARC_16,		R_SPARC_32,
+    R_SPARC_DISP8,	R_SPARC_DISP16,		R_SPARC_DISP32,
+    R_SPARC_WDISP30,	R_SPARC_WDISP22,
+    R_SPARC_HI22,	R_SPARC_22,
+    R_SPARC_13,		R_SPARC_LO10,
+    R_SPARC_GOT10,	R_SPARC_GOT13,		R_SPARC_GOT22,
+    R_SPARC_PC10,	R_SPARC_PC22,
+    R_SPARC_WPLT30,
+    R_SPARC_COPY,
+    R_SPARC_GLOB_DAT,	R_SPARC_JMP_SLOT,
+    R_SPARC_RELATIVE,
+    R_SPARC_UA32,
+    R_SPARC_max
+  };
+
+/* This is stolen pretty directly from elf.c.  */
+static bfd_reloc_status_type
+bfd_coff_generic_reloc PARAMS ((bfd *, arelent *, asymbol *, PTR,
+				asection *, bfd *, char **));
+
+static bfd_reloc_status_type
+bfd_coff_generic_reloc (abfd, reloc_entry, symbol, data, input_section,
+			output_bfd, error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry;
+     asymbol *symbol;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  if (output_bfd != (bfd *) NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  return bfd_reloc_continue;
+}
+
+static reloc_howto_type coff_sparc_howto_table[] =
+{
+  HOWTO(R_SPARC_NONE,    0,0, 0,FALSE,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_NONE",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_8,       0,0, 8,FALSE,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_8",       FALSE,0,0x000000ff,TRUE),
+  HOWTO(R_SPARC_16,      0,1,16,FALSE,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_16",      FALSE,0,0x0000ffff,TRUE),
+  HOWTO(R_SPARC_32,      0,2,32,FALSE,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_32",      FALSE,0,0xffffffff,TRUE),
+  HOWTO(R_SPARC_DISP8,   0,0, 8,TRUE, 0,complain_overflow_signed,  bfd_coff_generic_reloc,"R_SPARC_DISP8",   FALSE,0,0x000000ff,TRUE),
+  HOWTO(R_SPARC_DISP16,  0,1,16,TRUE, 0,complain_overflow_signed,  bfd_coff_generic_reloc,"R_SPARC_DISP16",  FALSE,0,0x0000ffff,TRUE),
+  HOWTO(R_SPARC_DISP32,  0,2,32,TRUE, 0,complain_overflow_signed,  bfd_coff_generic_reloc,"R_SPARC_DISP32",  FALSE,0,0x00ffffff,TRUE),
+  HOWTO(R_SPARC_WDISP30, 2,2,30,TRUE, 0,complain_overflow_signed,  bfd_coff_generic_reloc,"R_SPARC_WDISP30", FALSE,0,0x3fffffff,TRUE),
+  HOWTO(R_SPARC_WDISP22, 2,2,22,TRUE, 0,complain_overflow_signed,  bfd_coff_generic_reloc,"R_SPARC_WDISP22", FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_HI22,   10,2,22,FALSE,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_HI22",    FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_22,      0,2,22,FALSE,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_22",      FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_13,      0,2,13,FALSE,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_13",      FALSE,0,0x00001fff,TRUE),
+  HOWTO(R_SPARC_LO10,    0,2,10,FALSE,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_LO10",    FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_GOT10,   0,2,10,FALSE,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_GOT10",   FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_GOT13,   0,2,13,FALSE,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_GOT13",   FALSE,0,0x00001fff,TRUE),
+  HOWTO(R_SPARC_GOT22,  10,2,22,FALSE,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_GOT22",   FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_PC10,    0,2,10,FALSE,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_PC10",    FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_PC22,    0,2,22,FALSE,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_PC22",    FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_WPLT30,  0,0,00,FALSE,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_WPLT30",  FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_COPY,    0,0,00,FALSE,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_COPY",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_GLOB_DAT,0,0,00,FALSE,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_GLOB_DAT",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_JMP_SLOT,0,0,00,FALSE,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_JMP_SLOT",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_RELATIVE,0,0,00,FALSE,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_RELATIVE",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_UA32,    0,0,00,FALSE,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_UA32",    FALSE,0,0x00000000,TRUE),
+};
+
+struct coff_reloc_map {
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned char coff_reloc_val;
+};
+
+static const struct coff_reloc_map sparc_reloc_map[] =
+{
+  { BFD_RELOC_NONE, R_SPARC_NONE, },
+  { BFD_RELOC_16, R_SPARC_16, },
+  { BFD_RELOC_8, R_SPARC_8 },
+  { BFD_RELOC_8_PCREL, R_SPARC_DISP8 },
+  { BFD_RELOC_CTOR, R_SPARC_32 }, /* @@ Assumes 32 bits.  */
+  { BFD_RELOC_32, R_SPARC_32 },
+  { BFD_RELOC_32_PCREL, R_SPARC_DISP32 },
+  { BFD_RELOC_HI22, R_SPARC_HI22 },
+  { BFD_RELOC_LO10, R_SPARC_LO10, },
+  { BFD_RELOC_32_PCREL_S2, R_SPARC_WDISP30 },
+  { BFD_RELOC_SPARC22, R_SPARC_22 },
+  { BFD_RELOC_SPARC13, R_SPARC_13 },
+  { BFD_RELOC_SPARC_GOT10, R_SPARC_GOT10 },
+  { BFD_RELOC_SPARC_GOT13, R_SPARC_GOT13 },
+  { BFD_RELOC_SPARC_GOT22, R_SPARC_GOT22 },
+  { BFD_RELOC_SPARC_PC10, R_SPARC_PC10 },
+  { BFD_RELOC_SPARC_PC22, R_SPARC_PC22 },
+  { BFD_RELOC_SPARC_WPLT30, R_SPARC_WPLT30 },
+  { BFD_RELOC_SPARC_COPY, R_SPARC_COPY },
+  { BFD_RELOC_SPARC_GLOB_DAT, R_SPARC_GLOB_DAT },
+  { BFD_RELOC_SPARC_JMP_SLOT, R_SPARC_JMP_SLOT },
+  { BFD_RELOC_SPARC_RELATIVE, R_SPARC_RELATIVE },
+  { BFD_RELOC_SPARC_WDISP22, R_SPARC_WDISP22 },
+  /*  { BFD_RELOC_SPARC_UA32, R_SPARC_UA32 }, not used?? */
+};
+
+static reloc_howto_type *
+coff_sparc_reloc_type_lookup (abfd, code)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     bfd_reloc_code_real_type code;
+{
+  unsigned int i;
+  for (i = 0; i < sizeof (sparc_reloc_map) / sizeof (struct coff_reloc_map); i++)
+    {
+      if (sparc_reloc_map[i].bfd_reloc_val == code)
+	return &coff_sparc_howto_table[(int) sparc_reloc_map[i].coff_reloc_val];
+    }
+  return 0;
+}
+#define coff_bfd_reloc_type_lookup	coff_sparc_reloc_type_lookup
+
+static reloc_howto_type *
+coff_sparc_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			      const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (coff_sparc_howto_table)
+	    / sizeof (coff_sparc_howto_table[0]));
+       i++)
+    if (coff_sparc_howto_table[i].name != NULL
+	&& strcasecmp (coff_sparc_howto_table[i].name, r_name) == 0)
+      return &coff_sparc_howto_table[i];
+
+  return NULL;
+}
+#define coff_bfd_reloc_name_lookup coff_sparc_reloc_name_lookup
+
+static void
+rtype2howto (cache_ptr, dst)
+     arelent *cache_ptr;
+     struct internal_reloc *dst;
+{
+  BFD_ASSERT (dst->r_type < (unsigned int) R_SPARC_max);
+  cache_ptr->howto = &coff_sparc_howto_table[dst->r_type];
+}
+
+#define RTYPE2HOWTO(internal, relocentry) rtype2howto(internal,relocentry)
+
+#define SWAP_IN_RELOC_OFFSET	H_GET_32
+#define SWAP_OUT_RELOC_OFFSET	H_PUT_32
+#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr) \
+  cache_ptr->addend = reloc.r_offset;
+
+/* Clear the r_spare field in relocs.  */
+#define SWAP_OUT_RELOC_EXTRA(abfd,src,dst) \
+  do { \
+       dst->r_spare[0] = 0; \
+       dst->r_spare[1] = 0; \
+     } while (0)
+
+#define __A_MAGIC_SET__
+
+/* Enable Sparc-specific hacks in coffcode.h.  */
+
+#define COFF_SPARC
+
+#define bfd_pe_print_pdata	NULL
+
+#include "coffcode.h"
+
+#ifndef TARGET_SYM
+#define TARGET_SYM sparccoff_vec
+#endif
+
+#ifndef TARGET_NAME
+#define TARGET_NAME "coff-sparc"
+#endif
+
+CREATE_BIG_COFF_TARGET_VEC (TARGET_SYM, TARGET_NAME, D_PAGED, 0, '_', NULL, COFF_SWAP_TABLE)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-stgo32.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-stgo32.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-stgo32.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-stgo32.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,440 @@
+/* BFD back-end for Intel 386 COFF files (DJGPP variant with a stub).
+   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2005, 2006, 2007, 2009,
+   2011  Free Software Foundation, Inc.
+   Written by Robert Hoehne.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file handles now also stubbed coff images. The stub is a small
+   DOS executable program before the coff image to load it in memory
+   and execute it. This is needed, because DOS cannot run coff files.
+
+   All the functions below are called by the corresponding functions
+   from coffswap.h.
+   The only thing what they do is to adjust the information stored in
+   the COFF file which are offset into the file.
+   This is needed, because DJGPP uses a very special way to load and run
+   the coff image. It loads the image in memory and assumes then, that the
+   image had no stub by using the filepointers as pointers in the coff
+   image and NOT in the file.
+
+   To be compatible with any existing executables I have fixed this
+   here and NOT in the DJGPP startup code.  */
+
+#define TARGET_SYM		go32stubbedcoff_vec
+#define TARGET_NAME		"coff-go32-exe"
+#define TARGET_UNDERSCORE	'_'
+#define COFF_GO32_EXE
+#define COFF_LONG_SECTION_NAMES
+#define COFF_SUPPORT_GNU_LINKONCE
+#define COFF_LONG_FILENAMES
+
+#define COFF_SECTION_ALIGNMENT_ENTRIES \
+{ COFF_SECTION_NAME_EXACT_MATCH (".data"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 4 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".text"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 4 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".debug"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
+
+#include "bfd.h"
+
+/* At first the prototypes.  */
+
+static void
+adjust_filehdr_in_post PARAMS ((bfd *, PTR, PTR));
+static void
+adjust_filehdr_out_pre PARAMS ((bfd *, PTR, PTR));
+static void
+adjust_filehdr_out_post PARAMS ((bfd *, PTR, PTR));
+static void
+adjust_scnhdr_in_post PARAMS ((bfd *, PTR, PTR));
+static void
+adjust_scnhdr_out_pre PARAMS ((bfd *, PTR, PTR));
+static void
+adjust_scnhdr_out_post PARAMS ((bfd *, PTR, PTR));
+static void
+adjust_aux_in_post PARAMS ((bfd *, PTR, int, int, int, int, PTR));
+static void
+adjust_aux_out_pre PARAMS ((bfd *, PTR, int, int, int, int, PTR));
+static void
+adjust_aux_out_post PARAMS ((bfd *, PTR, int, int, int, int, PTR));
+static void
+create_go32_stub PARAMS ((bfd *));
+
+/* All that ..._PRE and ...POST functions are called from the corresponding
+   coff_swap... functions. The ...PRE functions are called at the beginning
+   of the function and the ...POST functions at the end of the swap routines.  */
+
+#define COFF_ADJUST_FILEHDR_IN_POST adjust_filehdr_in_post
+#define COFF_ADJUST_FILEHDR_OUT_PRE adjust_filehdr_out_pre
+#define COFF_ADJUST_FILEHDR_OUT_POST adjust_filehdr_out_post
+
+#define COFF_ADJUST_SCNHDR_IN_POST adjust_scnhdr_in_post
+#define COFF_ADJUST_SCNHDR_OUT_PRE adjust_scnhdr_out_pre
+#define COFF_ADJUST_SCNHDR_OUT_POST adjust_scnhdr_out_post
+
+#define COFF_ADJUST_AUX_IN_POST adjust_aux_in_post
+#define COFF_ADJUST_AUX_OUT_PRE adjust_aux_out_pre
+#define COFF_ADJUST_AUX_OUT_POST adjust_aux_out_post
+
+static const bfd_target *go32_check_format (bfd *abfd);
+
+#define COFF_CHECK_FORMAT go32_check_format
+
+static bfd_boolean
+  go32_stubbed_coff_bfd_copy_private_bfd_data PARAMS ((bfd *, bfd *));
+
+#define coff_bfd_copy_private_bfd_data go32_stubbed_coff_bfd_copy_private_bfd_data
+
+#include "coff-i386.c"
+
+/* This macro is used, because I cannot assume the endianness of the
+   host system.  */
+#define _H(index) (H_GET_16 (abfd, (header + index * 2)))
+
+/* These bytes are a 2048-byte DOS executable, which loads the COFF
+   image into memory and then runs it. It is called 'stub'.  */
+
+static const unsigned char stub_bytes[GO32_STUBSIZE] =
+{
+#include "go32stub.h"
+};
+
+/*
+   I have not commented each swap function below, because the
+   technique is in any function the same. For the ...in function,
+   all the pointers are adjusted by adding GO32_STUBSIZE and for the
+   ...out function, it is subtracted first and after calling the
+   standard swap function it is reset to the old value.  */
+
+/* This macro is used for adjusting the filepointers, which
+   is done only, if the pointer is nonzero.  */
+
+#define ADJUST_VAL(val,diff) \
+  if (val != 0) val += diff
+
+static void
+adjust_filehdr_in_post  (abfd, src, dst)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     PTR src;
+     PTR dst;
+{
+  FILHDR *filehdr_src = (FILHDR *) src;
+  struct internal_filehdr *filehdr_dst = (struct internal_filehdr *) dst;
+
+  ADJUST_VAL (filehdr_dst->f_symptr, GO32_STUBSIZE);
+
+  /* Save now the stub to be used later.  Put the stub data to FILEHDR_DST
+     first as coff_data (abfd) still does not exist.  It may not even be ever
+     created as we are just checking the file format of ABFD.  */
+  memcpy (filehdr_dst->go32stub, filehdr_src->stub, GO32_STUBSIZE);
+  filehdr_dst->f_flags |= F_GO32STUB;
+}
+
+static void
+adjust_filehdr_out_pre  (abfd, in, out)
+     bfd *abfd;
+     PTR in;
+     PTR out;
+{
+  struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
+  FILHDR *filehdr_out = (FILHDR *) out;
+
+  /* Generate the stub.  */
+  create_go32_stub (abfd);
+
+  /* Copy the stub to the file header.  */
+  if (coff_data (abfd)->go32stub != NULL)
+    memcpy (filehdr_out->stub, coff_data (abfd)->go32stub, GO32_STUBSIZE);
+  else
+    /* Use the default.  */
+    memcpy (filehdr_out->stub, stub_bytes, GO32_STUBSIZE);
+
+  ADJUST_VAL (filehdr_in->f_symptr, -GO32_STUBSIZE);
+}
+
+static void
+adjust_filehdr_out_post  (abfd, in, out)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     PTR in;
+     PTR out ATTRIBUTE_UNUSED;
+{
+  struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
+  /* Undo the above change.  */
+  ADJUST_VAL (filehdr_in->f_symptr, GO32_STUBSIZE);
+}
+
+static void
+adjust_scnhdr_in_post  (abfd, ext, in)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     PTR ext ATTRIBUTE_UNUSED;
+     PTR in;
+{
+  struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
+
+  ADJUST_VAL (scnhdr_int->s_scnptr, GO32_STUBSIZE);
+  ADJUST_VAL (scnhdr_int->s_relptr, GO32_STUBSIZE);
+  ADJUST_VAL (scnhdr_int->s_lnnoptr, GO32_STUBSIZE);
+}
+
+static void
+adjust_scnhdr_out_pre  (abfd, in, out)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     PTR in;
+     PTR out ATTRIBUTE_UNUSED;
+{
+  struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
+
+  ADJUST_VAL (scnhdr_int->s_scnptr, -GO32_STUBSIZE);
+  ADJUST_VAL (scnhdr_int->s_relptr, -GO32_STUBSIZE);
+  ADJUST_VAL (scnhdr_int->s_lnnoptr, -GO32_STUBSIZE);
+}
+
+static void
+adjust_scnhdr_out_post (abfd, in, out)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     PTR in;
+     PTR out ATTRIBUTE_UNUSED;
+{
+  struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
+
+  ADJUST_VAL (scnhdr_int->s_scnptr, GO32_STUBSIZE);
+  ADJUST_VAL (scnhdr_int->s_relptr, GO32_STUBSIZE);
+  ADJUST_VAL (scnhdr_int->s_lnnoptr, GO32_STUBSIZE);
+}
+
+static void
+adjust_aux_in_post  (abfd, ext1, type, in_class, indx, numaux, in1)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     PTR ext1 ATTRIBUTE_UNUSED;
+     int type;
+     int in_class;
+     int indx ATTRIBUTE_UNUSED;
+     int numaux ATTRIBUTE_UNUSED;
+     PTR in1;
+{
+  union internal_auxent *in = (union internal_auxent *) in1;
+
+  if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
+      || ISTAG (in_class))
+    {
+      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, GO32_STUBSIZE);
+    }
+}
+
+static void
+adjust_aux_out_pre  (abfd, inp, type, in_class, indx, numaux, extp)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     PTR inp;
+     int type;
+     int in_class;
+     int indx ATTRIBUTE_UNUSED;
+     int numaux ATTRIBUTE_UNUSED;
+     PTR extp ATTRIBUTE_UNUSED;
+{
+  union internal_auxent *in = (union internal_auxent *) inp;
+
+  if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
+      || ISTAG (in_class))
+    {
+      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, -GO32_STUBSIZE);
+    }
+}
+
+static void
+adjust_aux_out_post (abfd, inp, type, in_class, indx, numaux, extp)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     PTR inp;
+     int type;
+     int in_class;
+     int indx ATTRIBUTE_UNUSED;
+     int numaux ATTRIBUTE_UNUSED;
+     PTR extp ATTRIBUTE_UNUSED;
+{
+  union internal_auxent *in = (union internal_auxent *) inp;
+
+  if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
+      || ISTAG (in_class))
+    {
+      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, GO32_STUBSIZE);
+    }
+}
+
+/* That's the function, which creates the stub. There are
+   different cases from where the stub is taken.
+   At first the environment variable $(GO32STUB) is checked and then
+   $(STUB) if it was not set.
+   If it exists and points to a valid stub the stub is taken from
+   that file. This file can be also a whole executable file, because
+   the stub is computed from the exe information at the start of that
+   file.
+
+   If there was any error, the standard stub (compiled in this file)
+   is taken.  */
+
+static void
+create_go32_stub (abfd)
+     bfd *abfd;
+{
+  /* Do it only once.  */
+  if (coff_data (abfd)->go32stub == NULL)
+    {
+      char *stub;
+      struct stat st;
+      int f;
+      unsigned char header[10];
+      char magic[8];
+      unsigned long coff_start;
+      long exe_start;
+
+      /* Check at first the environment variable $(GO32STUB).  */
+      stub = getenv ("GO32STUB");
+      /* Now check the environment variable $(STUB).  */
+      if (stub == NULL)
+	stub = getenv ("STUB");
+      if (stub == NULL)
+	goto stub_end;
+      if (stat (stub, &st) != 0)
+	goto stub_end;
+#ifdef O_BINARY
+      f = open (stub, O_RDONLY | O_BINARY);
+#else
+      f = open (stub, O_RDONLY);
+#endif
+      if (f < 0)
+	goto stub_end;
+      if (read (f, &header, sizeof (header)) < 0)
+	{
+	  close (f);
+	  goto stub_end;
+	}
+      if (_H (0) != 0x5a4d)	/* It is not an exe file.  */
+	{
+	  close (f);
+	  goto stub_end;
+	}
+      /* Compute the size of the stub (it is every thing up
+         to the beginning of the coff image).  */
+      coff_start = (long) _H (2) * 512L;
+      if (_H (1))
+	coff_start += (long) _H (1) - 512L;
+
+      /* Currently there is only a fixed stub size of 2048 bytes
+         supported.  */
+      if (coff_start != 2048)
+	{
+	  close (f);
+	  goto stub_end;
+	}
+      exe_start = _H (4) * 16;
+      if ((long) lseek (f, exe_start, SEEK_SET) != exe_start)
+	{
+	  close (f);
+	  goto stub_end;
+	}
+      if (read (f, &magic, 8) != 8)
+	{
+	  close (f);
+	  goto stub_end;
+	}
+      if (! CONST_STRNEQ (magic, "go32stub"))
+	{
+	  close (f);
+	  goto stub_end;
+	}
+      /* Now we found a correct stub (hopefully).  */
+      coff_data (abfd)->go32stub = bfd_alloc (abfd, (bfd_size_type) coff_start);
+      if (coff_data (abfd)->go32stub == NULL)
+	{
+	  close (f);
+	  return;
+	}
+      lseek (f, 0L, SEEK_SET);
+      if ((unsigned long) read (f, coff_data (abfd)->go32stub, coff_start)
+	  != coff_start)
+	{
+	  bfd_release (abfd, coff_data (abfd)->go32stub);
+	  coff_data (abfd)->go32stub = NULL;
+	}
+      close (f);
+    }
+stub_end:
+  /* There was something wrong above, so use now the standard builtin
+     stub.  */
+  if (coff_data (abfd)->go32stub == NULL)
+    {
+      coff_data (abfd)->go32stub
+	= bfd_alloc (abfd, (bfd_size_type) GO32_STUBSIZE);
+      if (coff_data (abfd)->go32stub == NULL)
+	return;
+      memcpy (coff_data (abfd)->go32stub, stub_bytes, GO32_STUBSIZE);
+    }
+}
+
+/* If ibfd was a stubbed coff image, copy the stub from that bfd
+   to the new obfd.  */
+
+static bfd_boolean
+go32_stubbed_coff_bfd_copy_private_bfd_data  (ibfd, obfd)
+     bfd *ibfd;
+     bfd *obfd;
+{
+  /* Check if both are the same targets.  */
+  if (ibfd->xvec != obfd->xvec)
+    return TRUE;
+
+  /* Check if we have a source stub.  */
+  if (coff_data (ibfd)->go32stub == NULL)
+    return TRUE;
+
+  /* As adjust_filehdr_out_pre may get called only after this function,
+     optionally allocate the output stub.  */
+  if (coff_data (obfd)->go32stub == NULL)
+    coff_data (obfd)->go32stub = bfd_alloc (obfd,
+					  (bfd_size_type) GO32_STUBSIZE);
+
+  /* Now copy the stub.  */
+  if (coff_data (obfd)->go32stub != NULL)
+    memcpy (coff_data (obfd)->go32stub, coff_data (ibfd)->go32stub,
+	    GO32_STUBSIZE);
+
+  return TRUE;
+}
+
+/* coff_object_p only checks 2 bytes F_MAGIC at GO32_STUBSIZE inside the file
+   which is too fragile.  */
+
+static const bfd_target *
+go32_check_format (bfd *abfd)
+{
+  char mz[2];
+
+  if (bfd_bread (mz, 2, abfd) != 2 || mz[0] != 'M' || mz[1] != 'Z')
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  if (bfd_seek (abfd, 0, SEEK_SET) != 0)
+    return NULL;
+
+  return coff_object_p (abfd);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-svm68k.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-svm68k.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-svm68k.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-svm68k.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,27 @@
+/* BFD back-end for Motorola sysv68
+   Copyright 1997, 2005, 2007 Free Software Foundation, Inc.
+   Written by Philippe De Muyter <phdm@info.ucl.ac.be>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define TARGET_SYM	m68ksysvcoff_vec
+#define TARGET_NAME	"coff-m68k-sysv"
+#define STATIC_RELOCS
+#define COFF_COMMON_ADDEND
+
+#include "coff-m68k.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-tic30.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-tic30.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-tic30.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-tic30.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,234 @@
+/* BFD back-end for TMS320C30 coff binaries.
+   Copyright 1998, 1999, 2000, 2001, 2002, 2005, 2007, 2008, 2011
+   Free Software Foundation, Inc.
+   Contributed by Steven Haworth (steve@pm.cse.rmit.edu.au)
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "bfdlink.h"
+#include "coff/tic30.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+
+static int  coff_tic30_select_reloc PARAMS ((reloc_howto_type *));
+static void rtype2howto PARAMS ((arelent *, struct internal_reloc *));
+static void reloc_processing PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection *));
+
+reloc_howto_type * tic30_coff_reloc_type_lookup PARAMS ((bfd *, bfd_reloc_code_real_type));
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (1)
+
+reloc_howto_type tic30_coff_howto_table[] =
+  {
+    HOWTO (R_TIC30_ABS16, 2, 1, 16, FALSE, 0, 0, NULL,
+	   "16", FALSE, 0x0000FFFF, 0x0000FFFF, FALSE),
+    HOWTO (R_TIC30_ABS24, 2, 2, 24, FALSE, 8, complain_overflow_bitfield, NULL,
+	   "24", FALSE, 0xFFFFFF00, 0xFFFFFF00, FALSE),
+    HOWTO (R_TIC30_LDP, 18, 0, 24, FALSE, 0, complain_overflow_bitfield, NULL,
+	   "LDP", FALSE, 0x00FF0000, 0x000000FF, FALSE),
+    HOWTO (R_TIC30_ABS32, 2, 2, 32, FALSE, 0, complain_overflow_bitfield, NULL,
+	   "32", FALSE, 0xFFFFFFFF, 0xFFFFFFFF, FALSE),
+    HOWTO (R_TIC30_PC16, 2, 1, 16, TRUE, 0, complain_overflow_signed, NULL,
+	   "PCREL", FALSE, 0x0000FFFF, 0x0000FFFF, FALSE),
+    EMPTY_HOWTO (-1)
+  };
+
+#ifndef coff_bfd_reloc_type_lookup
+#define coff_bfd_reloc_type_lookup tic30_coff_reloc_type_lookup
+#define coff_bfd_reloc_name_lookup tic30_coff_reloc_name_lookup
+
+/* For the case statement use the code values used in tc_gen_reloc to
+   map to the howto table entries that match those in both the aout
+   and coff implementations.  */
+
+reloc_howto_type *
+tic30_coff_reloc_type_lookup (abfd, code)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     bfd_reloc_code_real_type code;
+{
+  switch (code)
+    {
+    case BFD_RELOC_8:
+    case BFD_RELOC_TIC30_LDP:
+      return &tic30_coff_howto_table[2];
+    case BFD_RELOC_16:
+      return &tic30_coff_howto_table[0];
+    case BFD_RELOC_24:
+      return &tic30_coff_howto_table[1];
+    case BFD_RELOC_16_PCREL:
+      return &tic30_coff_howto_table[4];
+    case BFD_RELOC_32:
+      return &tic30_coff_howto_table[3];
+    default:
+      return (reloc_howto_type *) NULL;
+    }
+}
+
+static reloc_howto_type *
+tic30_coff_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			      const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (tic30_coff_howto_table)
+	    / sizeof (tic30_coff_howto_table[0]));
+       i++)
+    if (tic30_coff_howto_table[i].name != NULL
+	&& strcasecmp (tic30_coff_howto_table[i].name, r_name) == 0)
+      return &tic30_coff_howto_table[i];
+
+  return NULL;
+}
+
+#endif
+
+/* Turn a howto into a reloc number.  */
+
+static int
+coff_tic30_select_reloc (howto)
+     reloc_howto_type *howto;
+{
+  return howto->type;
+}
+
+#define SELECT_RELOC(x,howto) x.r_type = coff_tic30_select_reloc(howto)
+
+#define BADMAG(x) TIC30BADMAG(x)
+#define TIC30 1			/* Customize coffcode.h */
+#define __A_MAGIC_SET__
+
+/* Code to swap in the reloc */
+#define SWAP_IN_RELOC_OFFSET  H_GET_32
+#define SWAP_OUT_RELOC_OFFSET H_PUT_32
+#define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) dst->r_stuff[0] = 'S'; \
+dst->r_stuff[1] = 'C';
+
+/* Code to turn a r_type into a howto ptr, uses the above howto table.  */
+
+static void
+rtype2howto (internal, dst)
+     arelent *internal;
+     struct internal_reloc *dst;
+{
+  switch (dst->r_type)
+    {
+    case R_TIC30_ABS16:
+      internal->howto = &tic30_coff_howto_table[0];
+      break;
+    case R_TIC30_ABS24:
+      internal->howto = &tic30_coff_howto_table[1];
+      break;
+    case R_TIC30_ABS32:
+      internal->howto = &tic30_coff_howto_table[3];
+      break;
+    case R_TIC30_LDP:
+      internal->howto = &tic30_coff_howto_table[2];
+      break;
+    case R_TIC30_PC16:
+      internal->howto = &tic30_coff_howto_table[4];
+      break;
+    default:
+      abort ();
+      break;
+    }
+}
+
+#define RTYPE2HOWTO(internal, relocentry) rtype2howto (internal, relocentry)
+
+/* Perform any necessary magic to the addend in a reloc entry */
+
+#define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \
+ cache_ptr->addend =  ext_reloc.r_offset;
+
+#define RELOC_PROCESSING(relent,reloc,symbols,abfd,section) \
+ reloc_processing(relent, reloc, symbols, abfd, section)
+
+static void
+reloc_processing (relent, reloc, symbols, abfd, section)
+     arelent *relent;
+     struct internal_reloc *reloc;
+     asymbol **symbols;
+     bfd *abfd;
+     asection *section;
+{
+  relent->address = reloc->r_vaddr;
+  rtype2howto (relent, reloc);
+
+  if (reloc->r_symndx > 0)
+    relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
+  else
+    relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+
+  relent->addend = reloc->r_offset;
+  relent->address -= section->vma;
+}
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coffcode.h"
+
+const bfd_target tic30_coff_vec =
+{
+  "coff-tic30",			/* name */
+  bfd_target_coff_flavour,
+  BFD_ENDIAN_BIG,		/* data byte order is big */
+  BFD_ENDIAN_LITTLE,		/* header byte order is little */
+
+  (HAS_RELOC | EXEC_P |		/* object flags */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT),
+
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+  '_',				/* leading symbol underscore */
+  '/',				/* ar_pad_char */
+  15,				/* ar_max_namelen */
+  0,				/* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* hdrs */
+
+  {_bfd_dummy_target, coff_object_p,	/* bfd_check_format */
+   bfd_generic_archive_p, _bfd_dummy_target},
+  {bfd_false, coff_mkobject, _bfd_generic_mkarchive,	/* bfd_set_format */
+   bfd_false},
+  {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
+   _bfd_write_archive_contents, bfd_false},
+
+  BFD_JUMP_TABLE_GENERIC (coff),
+  BFD_JUMP_TABLE_COPY (coff),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+  BFD_JUMP_TABLE_SYMBOLS (coff),
+  BFD_JUMP_TABLE_RELOCS (coff),
+  BFD_JUMP_TABLE_WRITE (coff),
+  BFD_JUMP_TABLE_LINK (coff),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  COFF_SWAP_TABLE
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-tic4x.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-tic4x.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-tic4x.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-tic4x.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,292 @@
+/* BFD back-end for TMS320C4X coff binaries.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2005, 2007,
+   2008  Free Software Foundation, Inc.
+
+   Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz)
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "bfdlink.h"
+#include "coff/tic4x.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+
+#undef  F_LSYMS
+#define	F_LSYMS		F_LSYMS_TICOFF
+
+static bfd_boolean ticoff_bfd_is_local_label_name
+    PARAMS ((bfd *, const char *));
+static bfd_reloc_status_type tic4x_relocation
+    PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char ** ));
+static reloc_howto_type *tic4x_coff_reloc_type_lookup
+    PARAMS ((bfd *, bfd_reloc_code_real_type ));
+static void tic4x_lookup_howto
+    PARAMS ((arelent *, struct internal_reloc * ));
+static reloc_howto_type *coff_tic4x_rtype_to_howto
+    PARAMS ((bfd *, asection *, struct internal_reloc *, struct coff_link_hash_entry *, struct internal_syment *, bfd_vma * ));
+static void tic4x_reloc_processing
+    PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection * ));
+
+
+/* Replace the stock _bfd_coff_is_local_label_name to recognize TI COFF local
+   labels.  */
+static bfd_boolean
+ticoff_bfd_is_local_label_name (abfd, name)
+  bfd *abfd ATTRIBUTE_UNUSED;
+  const char *name;
+{
+  if (TICOFF_LOCAL_LABEL_P(name))
+    return TRUE;
+  return FALSE;
+}
+
+#define coff_bfd_is_local_label_name ticoff_bfd_is_local_label_name
+
+#define RELOC_PROCESSING(RELENT,RELOC,SYMS,ABFD,SECT)\
+ tic4x_reloc_processing (RELENT,RELOC,SYMS,ABFD,SECT)
+
+/* Customize coffcode.h; the default coff_ functions are set up to use
+   COFF2; coff_bad_format_hook uses BADMAG, so set that for COFF2.
+   The COFF1 and COFF0 vectors use custom _bad_format_hook procs
+   instead of setting BADMAG.  */
+#define BADMAG(x) COFF2_BADMAG(x)
+
+#undef  coff_rtype_to_howto
+#define coff_rtype_to_howto	coff_tic4x_rtype_to_howto
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coffcode.h"
+
+static bfd_reloc_status_type
+tic4x_relocation (abfd, reloc_entry, symbol, data, input_section,
+		  output_bfd, error_message)
+  bfd *abfd ATTRIBUTE_UNUSED;
+  arelent *reloc_entry;
+  asymbol *symbol ATTRIBUTE_UNUSED;
+  PTR data ATTRIBUTE_UNUSED;
+  asection *input_section;
+  bfd *output_bfd;
+  char **error_message ATTRIBUTE_UNUSED;
+{
+  if (output_bfd != (bfd *) NULL)
+    {
+      /* This is a partial relocation, and we want to apply the
+ 	 relocation to the reloc entry rather than the raw data.
+ 	 Modify the reloc inplace to reflect what we now know.  */
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+  return bfd_reloc_continue;
+}
+
+reloc_howto_type tic4x_howto_table[] =
+{
+    HOWTO(R_RELWORD,	 0,  2, 16, FALSE, 0, complain_overflow_signed,   tic4x_relocation, "RELWORD",   TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO(R_REL24,	 0,  2, 24, FALSE, 0, complain_overflow_bitfield, tic4x_relocation, "REL24",     TRUE, 0x00ffffff, 0x00ffffff, FALSE),
+    HOWTO(R_RELLONG,	 0,  2, 32, FALSE, 0, complain_overflow_dont,     tic4x_relocation, "RELLONG",   TRUE, 0xffffffff, 0xffffffff, FALSE),
+    HOWTO(R_PCRWORD,	 0,  2, 16, TRUE,  0, complain_overflow_signed,   tic4x_relocation, "PCRWORD",   TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO(R_PCR24,	 0,  2, 24, TRUE,  0, complain_overflow_signed,   tic4x_relocation, "PCR24",     TRUE, 0x00ffffff, 0x00ffffff, FALSE),
+    HOWTO(R_PARTLS16,	 0,  2, 16, FALSE, 0, complain_overflow_dont,     tic4x_relocation, "PARTLS16",  TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO(R_PARTMS8,	16,  2, 16, FALSE, 0, complain_overflow_dont,     tic4x_relocation, "PARTMS8",   TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO(R_RELWORD,	 0,  2, 16, FALSE, 0, complain_overflow_signed,   tic4x_relocation, "ARELWORD",  TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO(R_REL24,	 0,  2, 24, FALSE, 0, complain_overflow_signed,   tic4x_relocation, "AREL24",    TRUE, 0x00ffffff, 0x00ffffff, FALSE),
+    HOWTO(R_RELLONG,	 0,  2, 32, FALSE, 0, complain_overflow_signed,   tic4x_relocation, "ARELLONG",  TRUE, 0xffffffff, 0xffffffff, FALSE),
+    HOWTO(R_PCRWORD,	 0,  2, 16, TRUE,  0, complain_overflow_signed,   tic4x_relocation, "APCRWORD",  TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO(R_PCR24,	 0,  2, 24, TRUE,  0, complain_overflow_signed,   tic4x_relocation, "APCR24",    TRUE, 0x00ffffff, 0x00ffffff, FALSE),
+    HOWTO(R_PARTLS16,	 0,  2, 16, FALSE, 0, complain_overflow_dont,     tic4x_relocation, "APARTLS16", TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO(R_PARTMS8,	16,  2, 16, FALSE, 0, complain_overflow_dont,     tic4x_relocation, "APARTMS8",  TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+};
+#define HOWTO_SIZE (sizeof(tic4x_howto_table) / sizeof(tic4x_howto_table[0]))
+
+#undef coff_bfd_reloc_type_lookup
+#define coff_bfd_reloc_type_lookup tic4x_coff_reloc_type_lookup
+#undef coff_bfd_reloc_name_lookup
+#define coff_bfd_reloc_name_lookup tic4x_coff_reloc_name_lookup
+
+/* For the case statement use the code values used tc_gen_reloc (defined in
+   bfd/reloc.c) to map to the howto table entries.  */
+
+static reloc_howto_type *
+tic4x_coff_reloc_type_lookup (abfd, code)
+    bfd *abfd ATTRIBUTE_UNUSED;
+    bfd_reloc_code_real_type code;
+{
+  unsigned int type;
+  unsigned int i;
+
+  switch (code)
+    {
+    case BFD_RELOC_32:		type = R_RELLONG; break;
+    case BFD_RELOC_24:		type = R_REL24; break;
+    case BFD_RELOC_16:		type = R_RELWORD; break;
+    case BFD_RELOC_24_PCREL:	type = R_PCR24; break;
+    case BFD_RELOC_16_PCREL:	type = R_PCRWORD; break;
+    case BFD_RELOC_HI16:	type = R_PARTMS8; break;
+    case BFD_RELOC_LO16:	type = R_PARTLS16; break;
+    default:
+      return NULL;
+    }
+
+  for (i = 0; i < HOWTO_SIZE; i++)
+    {
+      if (tic4x_howto_table[i].type == type)
+	return tic4x_howto_table + i;
+    }
+  return NULL;
+}
+
+static reloc_howto_type *
+tic4x_coff_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			      const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (tic4x_howto_table) / sizeof (tic4x_howto_table[0]);
+       i++)
+    if (tic4x_howto_table[i].name != NULL
+	&& strcasecmp (tic4x_howto_table[i].name, r_name) == 0)
+      return &tic4x_howto_table[i];
+
+  return NULL;
+}
+
+/* Code to turn a r_type into a howto ptr, uses the above howto table.
+   Called after some initial checking by the tic4x_rtype_to_howto fn
+   below.  */
+static void
+tic4x_lookup_howto (internal, dst)
+     arelent *internal;
+     struct internal_reloc *dst;
+{
+  unsigned int i;
+  int bank = (dst->r_symndx == -1) ? HOWTO_BANK : 0;
+
+  for (i = 0; i < HOWTO_SIZE; i++)
+    {
+      if (tic4x_howto_table[i].type == dst->r_type)
+	{
+	  internal->howto = tic4x_howto_table + i + bank;
+	  return;
+	}
+    }
+
+  (*_bfd_error_handler) (_("Unrecognized reloc type 0x%x"),
+			 (unsigned int) dst->r_type);
+  abort();
+}
+
+static reloc_howto_type *
+coff_tic4x_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     asection *sec;
+     struct internal_reloc *rel;
+     struct coff_link_hash_entry *h ATTRIBUTE_UNUSED;
+     struct internal_syment *sym ATTRIBUTE_UNUSED;
+     bfd_vma *addendp;
+{
+  arelent genrel;
+
+  if (rel->r_symndx == -1 && addendp != NULL)
+    /* This is a TI "internal relocation", which means that the relocation
+       amount is the amount by which the current section is being relocated
+       in the output section.  */
+    *addendp = (sec->output_section->vma + sec->output_offset) - sec->vma;
+
+  tic4x_lookup_howto (&genrel, rel);
+
+  return genrel.howto;
+}
+
+
+static void
+tic4x_reloc_processing (relent, reloc, symbols, abfd, section)
+     arelent *relent;
+     struct internal_reloc *reloc;
+     asymbol **symbols;
+     bfd *abfd;
+     asection *section;
+{
+  asymbol *ptr;
+
+  relent->address = reloc->r_vaddr;
+
+  if (reloc->r_symndx != -1)
+    {
+      if (reloc->r_symndx < 0 || reloc->r_symndx >= obj_conv_table_size (abfd))
+        {
+          (*_bfd_error_handler)
+            (_("%s: warning: illegal symbol index %ld in relocs"),
+             bfd_get_filename (abfd), reloc->r_symndx);
+          relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+          ptr = NULL;
+        }
+      else
+        {
+          relent->sym_ptr_ptr = (symbols
+                                 + obj_convert (abfd)[reloc->r_symndx]);
+          ptr = *(relent->sym_ptr_ptr);
+        }
+    }
+  else
+    {
+      relent->sym_ptr_ptr = section->symbol_ptr_ptr;
+      ptr = *(relent->sym_ptr_ptr);
+    }
+
+  /* The symbols definitions that we have read in have been relocated
+     as if their sections started at 0.  But the offsets refering to
+     the symbols in the raw data have not been modified, so we have to
+     have a negative addend to compensate.
+
+     Note that symbols which used to be common must be left alone.  */
+
+  /* Calculate any reloc addend by looking at the symbol.  */
+  CALC_ADDEND (abfd, ptr, *reloc, relent);
+
+  relent->address -= section->vma;
+  /* !!     relent->section = (asection *) NULL;  */
+
+  /* Fill in the relent->howto field from reloc->r_type.  */
+  tic4x_lookup_howto (relent, reloc);
+}
+
+
+/* TI COFF v0, DOS tools (little-endian headers).  */
+CREATE_LITTLE_COFF_TARGET_VEC(tic4x_coff0_vec, "coff0-tic4x", HAS_LOAD_PAGE, 0, '_', NULL, (PTR)&ticoff0_swap_table);
+
+/* TI COFF v0, SPARC tools (big-endian headers).  */
+CREATE_BIGHDR_COFF_TARGET_VEC(tic4x_coff0_beh_vec, "coff0-beh-tic4x", HAS_LOAD_PAGE, 0, '_', &tic4x_coff0_vec, (PTR)&ticoff0_swap_table);
+
+/* TI COFF v1, DOS tools (little-endian headers).  */
+CREATE_LITTLE_COFF_TARGET_VEC(tic4x_coff1_vec, "coff1-tic4x", HAS_LOAD_PAGE, 0, '_', &tic4x_coff0_beh_vec, (PTR)&ticoff1_swap_table);
+
+/* TI COFF v1, SPARC tools (big-endian headers).  */
+CREATE_BIGHDR_COFF_TARGET_VEC(tic4x_coff1_beh_vec, "coff1-beh-tic4x", HAS_LOAD_PAGE, 0, '_', &tic4x_coff1_vec, (PTR)&ticoff1_swap_table);
+
+/* TI COFF v2, TI DOS tools output (little-endian headers).  */
+CREATE_LITTLE_COFF_TARGET_VEC(tic4x_coff2_vec, "coff2-tic4x", HAS_LOAD_PAGE, 0, '_', &tic4x_coff1_beh_vec, COFF_SWAP_TABLE);
+
+/* TI COFF v2, TI SPARC tools output (big-endian headers).  */
+CREATE_BIGHDR_COFF_TARGET_VEC(tic4x_coff2_beh_vec, "coff2-beh-tic4x", HAS_LOAD_PAGE, 0, '_', &tic4x_coff2_vec, COFF_SWAP_TABLE);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-tic54x.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-tic54x.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-tic54x.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-tic54x.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,706 @@
+/* BFD back-end for TMS320C54X coff binaries.
+   Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2011
+   Free Software Foundation, Inc.
+   Contributed by Timothy Wall (twall@cygnus.com)
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "bfdlink.h"
+#include "coff/tic54x.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+
+#undef  F_LSYMS
+#define	F_LSYMS		F_LSYMS_TICOFF
+
+static void tic54x_reloc_processing
+  PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection *));
+static bfd_reloc_status_type tic54x_relocation
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_boolean tic54x_set_section_contents
+  PARAMS ((bfd *, sec_ptr, const PTR, file_ptr, bfd_size_type));
+static reloc_howto_type *coff_tic54x_rtype_to_howto
+  PARAMS ((bfd *, asection *, struct internal_reloc *, struct coff_link_hash_entry *, struct internal_syment *, bfd_vma *));
+static bfd_boolean tic54x_set_arch_mach
+  PARAMS ((bfd *, enum bfd_architecture, unsigned long));
+static reloc_howto_type * tic54x_coff_reloc_type_lookup
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
+static void tic54x_lookup_howto
+  PARAMS ((arelent *, struct internal_reloc *));
+static bfd_boolean ticoff_bfd_is_local_label_name
+  PARAMS ((bfd *, const char *));
+
+/* 32-bit operations
+   The octet order is screwy.  words are LSB first (LS octet, actually), but
+   longwords are MSW first.  For example, 0x12345678 is encoded 0x5678 in the
+   first word and 0x1234 in the second.  When looking at the data as stored in
+   the COFF file, you would see the octets ordered as 0x78, 0x56, 0x34, 0x12.
+   Don't bother with 64-bits, as there aren't any.  */
+
+static bfd_vma
+tic54x_getl32 (const void *p)
+{
+  const bfd_byte *addr = p;
+  unsigned long v;
+
+  v  = (unsigned long) addr[2];
+  v |= (unsigned long) addr[3] << 8;
+  v |= (unsigned long) addr[0] << 16;
+  v |= (unsigned long) addr[1] << 24;
+  return v;
+}
+
+static void
+tic54x_putl32 (bfd_vma data, void *p)
+{
+  bfd_byte *addr = p;
+  addr[2] = data & 0xff;
+  addr[3] = (data >>  8) & 0xff;
+  addr[0] = (data >> 16) & 0xff;
+  addr[1] = (data >> 24) & 0xff;
+}
+
+static bfd_signed_vma
+tic54x_getl_signed_32 (const void *p)
+{
+  const bfd_byte *addr = p;
+  unsigned long v;
+
+  v  = (unsigned long) addr[2];
+  v |= (unsigned long) addr[3] << 8;
+  v |= (unsigned long) addr[0] << 16;
+  v |= (unsigned long) addr[1] << 24;
+#define COERCE32(x) \
+  ((bfd_signed_vma) (long) (((unsigned long) (x) ^ 0x80000000) - 0x80000000))
+  return COERCE32 (v);
+}
+
+#define coff_get_section_load_page bfd_ticoff_get_section_load_page
+#define coff_set_section_load_page bfd_ticoff_set_section_load_page
+
+void
+bfd_ticoff_set_section_load_page (sect, page)
+  asection *sect;
+  int page;
+{
+  sect->lma = (sect->lma & ADDR_MASK) | PG_TO_FLAG(page);
+}
+
+int
+bfd_ticoff_get_section_load_page (sect)
+  asection *sect;
+{
+  int page;
+
+  /* Provide meaningful defaults for predefined sections.  */
+  if (sect == &bfd_com_section)
+    page = PG_DATA;
+
+  else if (sect == &bfd_und_section
+      || sect == &bfd_abs_section
+      || sect == &bfd_ind_section)
+    page = PG_PROG;
+
+  else
+    page = FLAG_TO_PG (sect->lma);
+
+  return page;
+}
+
+/* Set the architecture appropriately.  Allow unkown architectures
+   (e.g. binary).  */
+
+static bfd_boolean
+tic54x_set_arch_mach (abfd, arch, machine)
+     bfd *abfd;
+     enum bfd_architecture arch;
+     unsigned long machine;
+{
+  if (arch == bfd_arch_unknown)
+    arch = bfd_arch_tic54x;
+
+  else if (arch != bfd_arch_tic54x)
+    return FALSE;
+
+  return bfd_default_set_arch_mach (abfd, arch, machine);
+}
+
+static bfd_reloc_status_type
+tic54x_relocation (abfd, reloc_entry, symbol, data, input_section,
+                   output_bfd, error_message)
+  bfd *abfd ATTRIBUTE_UNUSED;
+  arelent *reloc_entry;
+  asymbol *symbol ATTRIBUTE_UNUSED;
+  PTR data ATTRIBUTE_UNUSED;
+  asection *input_section;
+  bfd *output_bfd;
+  char **error_message ATTRIBUTE_UNUSED;
+{
+  if (output_bfd != (bfd *) NULL)
+    {
+      /* This is a partial relocation, and we want to apply the
+ 	 relocation to the reloc entry rather than the raw data.
+ 	 Modify the reloc inplace to reflect what we now know.  */
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+  return bfd_reloc_continue;
+}
+
+reloc_howto_type tic54x_howto_table[] =
+  {
+    /* type,rightshift,size (0=byte, 1=short, 2=long),
+       bit size, pc_relative, bitpos, dont complain_on_overflow,
+       special_function, name, partial_inplace, src_mask, dst_mask, pcrel_offset.  */
+
+    /* NORMAL BANK */
+    /* 16-bit direct reference to symbol's address.  */
+    HOWTO (R_RELWORD,0,1,16,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"REL16",FALSE,0xFFFF,0xFFFF,FALSE),
+
+    /* 7 LSBs of an address */
+    HOWTO (R_PARTLS7,0,1,7,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"LS7",FALSE,0x007F,0x007F,FALSE),
+
+    /* 9 MSBs of an address */
+    /* TI assembler doesn't shift its encoding, and is thus incompatible */
+    HOWTO (R_PARTMS9,7,1,9,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"MS9",FALSE,0x01FF,0x01FF,FALSE),
+
+    /* 23-bit relocation */
+    HOWTO (R_EXTWORD,0,2,23,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"RELEXT",FALSE,0x7FFFFF,0x7FFFFF,FALSE),
+
+    /* 16 bits of 23-bit extended address */
+    HOWTO (R_EXTWORD16,0,1,16,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"RELEXT16",FALSE,0x7FFFFF,0x7FFFFF,FALSE),
+
+    /* upper 7 bits of 23-bit extended address */
+    HOWTO (R_EXTWORDMS7,16,1,7,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"RELEXTMS7",FALSE,0x7F,0x7F,FALSE),
+
+    /* ABSOLUTE BANK */
+    /* 16-bit direct reference to symbol's address, absolute */
+    HOWTO (R_RELWORD,0,1,16,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"AREL16",FALSE,0xFFFF,0xFFFF,FALSE),
+
+    /* 7 LSBs of an address, absolute */
+    HOWTO (R_PARTLS7,0,1,7,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"ALS7",FALSE,0x007F,0x007F,FALSE),
+
+    /* 9 MSBs of an address, absolute */
+    /* TI assembler doesn't shift its encoding, and is thus incompatible */
+    HOWTO (R_PARTMS9,7,1,9,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"AMS9",FALSE,0x01FF,0x01FF,FALSE),
+
+    /* 23-bit direct reference, absolute */
+    HOWTO (R_EXTWORD,0,2,23,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"ARELEXT",FALSE,0x7FFFFF,0x7FFFFF,FALSE),
+
+    /* 16 bits of 23-bit extended address, absolute */
+    HOWTO (R_EXTWORD16,0,1,16,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"ARELEXT16",FALSE,0x7FFFFF,0x7FFFFF,FALSE),
+
+    /* upper 7 bits of 23-bit extended address, absolute */
+    HOWTO (R_EXTWORDMS7,16,1,7,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"ARELEXTMS7",FALSE,0x7F,0x7F,FALSE),
+
+    /* 32-bit relocation exclusively for stabs */
+    HOWTO (R_RELLONG,0,2,32,FALSE,0,complain_overflow_dont,
+	   tic54x_relocation,"STAB",FALSE,0xFFFFFFFF,0xFFFFFFFF,FALSE),
+  };
+
+#define coff_bfd_reloc_type_lookup tic54x_coff_reloc_type_lookup
+#define coff_bfd_reloc_name_lookup tic54x_coff_reloc_name_lookup
+
+/* For the case statement use the code values used tc_gen_reloc (defined in
+   bfd/reloc.c) to map to the howto table entries.  */
+
+reloc_howto_type *
+tic54x_coff_reloc_type_lookup (abfd, code)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     bfd_reloc_code_real_type code;
+{
+  switch (code)
+    {
+    case BFD_RELOC_16:
+      return &tic54x_howto_table[0];
+    case BFD_RELOC_TIC54X_PARTLS7:
+      return &tic54x_howto_table[1];
+    case BFD_RELOC_TIC54X_PARTMS9:
+      return &tic54x_howto_table[2];
+    case BFD_RELOC_TIC54X_23:
+      return &tic54x_howto_table[3];
+    case BFD_RELOC_TIC54X_16_OF_23:
+      return &tic54x_howto_table[4];
+    case BFD_RELOC_TIC54X_MS7_OF_23:
+      return &tic54x_howto_table[5];
+    case BFD_RELOC_32:
+      return &tic54x_howto_table[12];
+    default:
+      return (reloc_howto_type *) NULL;
+    }
+}
+
+static reloc_howto_type *
+tic54x_coff_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			       const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (tic54x_howto_table) / sizeof (tic54x_howto_table[0]);
+       i++)
+    if (tic54x_howto_table[i].name != NULL
+	&& strcasecmp (tic54x_howto_table[i].name, r_name) == 0)
+      return &tic54x_howto_table[i];
+
+  return NULL;
+}
+
+/* Code to turn a r_type into a howto ptr, uses the above howto table.
+   Called after some initial checking by the tic54x_rtype_to_howto fn below.  */
+
+static void
+tic54x_lookup_howto (internal, dst)
+     arelent *internal;
+     struct internal_reloc *dst;
+{
+  unsigned i;
+  int bank = (dst->r_symndx == -1) ? HOWTO_BANK : 0;
+
+  for (i = 0; i < sizeof tic54x_howto_table/sizeof tic54x_howto_table[0]; i++)
+    {
+      if (tic54x_howto_table[i].type == dst->r_type)
+	{
+	  internal->howto = tic54x_howto_table + i + bank;
+	  return;
+	}
+    }
+
+  (*_bfd_error_handler) (_("Unrecognized reloc type 0x%x"),
+			 (unsigned int) dst->r_type);
+  abort ();
+}
+
+#define RELOC_PROCESSING(RELENT,RELOC,SYMS,ABFD,SECT)\
+ tic54x_reloc_processing(RELENT,RELOC,SYMS,ABFD,SECT)
+
+#define coff_rtype_to_howto coff_tic54x_rtype_to_howto
+
+static reloc_howto_type *
+coff_tic54x_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     asection *sec;
+     struct internal_reloc *rel;
+     struct coff_link_hash_entry *h ATTRIBUTE_UNUSED;
+     struct internal_syment *sym ATTRIBUTE_UNUSED;
+     bfd_vma *addendp;
+{
+  arelent genrel;
+
+  if (rel->r_symndx == -1 && addendp != NULL)
+    {
+      /* This is a TI "internal relocation", which means that the relocation
+	 amount is the amount by which the current section is being relocated
+	 in the output section.  */
+      *addendp = (sec->output_section->vma + sec->output_offset) - sec->vma;
+    }
+
+  tic54x_lookup_howto (&genrel, rel);
+
+  return genrel.howto;
+}
+
+/* Replace the stock _bfd_coff_is_local_label_name to recognize TI COFF local
+   labels.  */
+
+static bfd_boolean
+ticoff_bfd_is_local_label_name (abfd, name)
+  bfd *abfd ATTRIBUTE_UNUSED;
+  const char *name;
+{
+  if (TICOFF_LOCAL_LABEL_P(name))
+    return TRUE;
+  return FALSE;
+}
+
+#define coff_bfd_is_local_label_name ticoff_bfd_is_local_label_name
+
+/* Clear the r_reserved field in relocs.  */
+#define SWAP_OUT_RELOC_EXTRA(abfd,src,dst) \
+  do \
+    { \
+      dst->r_reserved[0] = 0; \
+      dst->r_reserved[1] = 0; \
+    } \
+  while (0)
+
+/* Customize coffcode.h; the default coff_ functions are set up to use COFF2;
+   coff_bad_format_hook uses BADMAG, so set that for COFF2.  The COFF1
+   and COFF0 vectors use custom _bad_format_hook procs instead of setting
+   BADMAG.  */
+#define BADMAG(x) COFF2_BADMAG(x)
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coffcode.h"
+
+static bfd_boolean
+tic54x_set_section_contents (abfd, section, location, offset, bytes_to_do)
+     bfd *abfd;
+     sec_ptr section;
+     const PTR location;
+     file_ptr offset;
+     bfd_size_type bytes_to_do;
+{
+  return coff_set_section_contents (abfd, section, location,
+                                    offset, bytes_to_do);
+}
+
+static void
+tic54x_reloc_processing (relent, reloc, symbols, abfd, section)
+     arelent *relent;
+     struct internal_reloc *reloc;
+     asymbol **symbols;
+     bfd *abfd;
+     asection *section;
+{
+  asymbol *ptr;
+
+  relent->address = reloc->r_vaddr;
+
+  if (reloc->r_symndx != -1)
+    {
+      if (reloc->r_symndx < 0 || reloc->r_symndx >= obj_conv_table_size (abfd))
+        {
+          (*_bfd_error_handler)
+            (_("%B: warning: illegal symbol index %ld in relocs"),
+             abfd, reloc->r_symndx);
+          relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+          ptr = NULL;
+        }
+      else
+        {
+          relent->sym_ptr_ptr = (symbols
+                                 + obj_convert (abfd)[reloc->r_symndx]);
+          ptr = *(relent->sym_ptr_ptr);
+        }
+    }
+  else
+    {
+      relent->sym_ptr_ptr = section->symbol_ptr_ptr;
+      ptr = *(relent->sym_ptr_ptr);
+    }
+
+  /* The symbols definitions that we have read in have been
+     relocated as if their sections started at 0. But the offsets
+     refering to the symbols in the raw data have not been
+     modified, so we have to have a negative addend to compensate.
+
+     Note that symbols which used to be common must be left alone.  */
+
+  /* Calculate any reloc addend by looking at the symbol.  */
+  CALC_ADDEND (abfd, ptr, *reloc, relent);
+
+  relent->address -= section->vma;
+  /* !!     relent->section = (asection *) NULL;*/
+
+  /* Fill in the relent->howto field from reloc->r_type.  */
+  tic54x_lookup_howto (relent, reloc);
+}
+
+/* TI COFF v0, DOS tools (little-endian headers).  */
+const bfd_target tic54x_coff0_vec =
+  {
+    "coff0-c54x",			/* name */
+    bfd_target_coff_flavour,
+    BFD_ENDIAN_LITTLE,		/* data byte order is little */
+    BFD_ENDIAN_LITTLE,		/* header byte order is little (DOS tools) */
+
+    (HAS_RELOC | EXEC_P |		/* object flags */
+     HAS_LINENO | HAS_DEBUG |
+     HAS_SYMS | HAS_LOCALS | WP_TEXT ),
+
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+    '_',				/* leading symbol underscore */
+    '/',				/* ar_pad_char */
+    15,				/* ar_max_namelen */
+    0,				/* match priority.  */
+    bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    tic54x_getl32, tic54x_getl_signed_32, tic54x_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* data */
+    bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* hdrs */
+
+    {_bfd_dummy_target, coff_object_p,	/* bfd_check_format */
+     bfd_generic_archive_p, _bfd_dummy_target},
+    {bfd_false, coff_mkobject, _bfd_generic_mkarchive,	/* bfd_set_format */
+     bfd_false},
+    {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
+     _bfd_write_archive_contents, bfd_false},
+
+    BFD_JUMP_TABLE_GENERIC (coff),
+    BFD_JUMP_TABLE_COPY (coff),
+    BFD_JUMP_TABLE_CORE (_bfd_nocore),
+    BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+    BFD_JUMP_TABLE_SYMBOLS (coff),
+    BFD_JUMP_TABLE_RELOCS (coff),
+    BFD_JUMP_TABLE_WRITE (tic54x),
+    BFD_JUMP_TABLE_LINK (coff),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+    NULL,
+
+    (PTR) & ticoff0_swap_table
+  };
+
+/* TI COFF v0, SPARC tools (big-endian headers).  */
+const bfd_target tic54x_coff0_beh_vec =
+  {
+    "coff0-beh-c54x",			/* name */
+    bfd_target_coff_flavour,
+    BFD_ENDIAN_LITTLE,		/* data byte order is little */
+    BFD_ENDIAN_BIG,		/* header byte order is big */
+
+    (HAS_RELOC | EXEC_P |		/* object flags */
+     HAS_LINENO | HAS_DEBUG |
+     HAS_SYMS | HAS_LOCALS | WP_TEXT ),
+
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+    '_',				/* leading symbol underscore */
+    '/',				/* ar_pad_char */
+    15,				/* ar_max_namelen */
+    0,				/* match priority.  */
+    bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    tic54x_getl32, tic54x_getl_signed_32, tic54x_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* data */
+    bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+    bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+    bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* hdrs */
+
+    {_bfd_dummy_target, coff_object_p,	/* bfd_check_format */
+     bfd_generic_archive_p, _bfd_dummy_target},
+    {bfd_false, coff_mkobject, _bfd_generic_mkarchive,	/* bfd_set_format */
+     bfd_false},
+    {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
+     _bfd_write_archive_contents, bfd_false},
+
+    BFD_JUMP_TABLE_GENERIC (coff),
+    BFD_JUMP_TABLE_COPY (coff),
+    BFD_JUMP_TABLE_CORE (_bfd_nocore),
+    BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+    BFD_JUMP_TABLE_SYMBOLS (coff),
+    BFD_JUMP_TABLE_RELOCS (coff),
+    BFD_JUMP_TABLE_WRITE (tic54x),
+    BFD_JUMP_TABLE_LINK (coff),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    & tic54x_coff0_vec,
+
+    (PTR) & ticoff0_swap_table
+  };
+
+/* TI COFF v1, DOS tools (little-endian headers).  */
+const bfd_target tic54x_coff1_vec =
+  {
+    "coff1-c54x",			/* name */
+    bfd_target_coff_flavour,
+    BFD_ENDIAN_LITTLE,		/* data byte order is little */
+    BFD_ENDIAN_LITTLE,		/* header byte order is little (DOS tools) */
+
+    (HAS_RELOC | EXEC_P |		/* object flags */
+     HAS_LINENO | HAS_DEBUG |
+     HAS_SYMS | HAS_LOCALS | WP_TEXT ),
+
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+    '_',				/* leading symbol underscore */
+    '/',				/* ar_pad_char */
+    15,				/* ar_max_namelen */
+    0,				/* match priority.  */
+    bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    tic54x_getl32, tic54x_getl_signed_32, tic54x_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* data */
+    bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* hdrs */
+
+    {_bfd_dummy_target, coff_object_p,	/* bfd_check_format */
+     bfd_generic_archive_p, _bfd_dummy_target},
+    {bfd_false, coff_mkobject, _bfd_generic_mkarchive,	/* bfd_set_format */
+     bfd_false},
+    {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
+     _bfd_write_archive_contents, bfd_false},
+
+    BFD_JUMP_TABLE_GENERIC (coff),
+    BFD_JUMP_TABLE_COPY (coff),
+    BFD_JUMP_TABLE_CORE (_bfd_nocore),
+    BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+    BFD_JUMP_TABLE_SYMBOLS (coff),
+    BFD_JUMP_TABLE_RELOCS (coff),
+    BFD_JUMP_TABLE_WRITE (tic54x),
+    BFD_JUMP_TABLE_LINK (coff),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    & tic54x_coff0_beh_vec,
+
+    (PTR) & ticoff1_swap_table
+};
+
+/* TI COFF v1, SPARC tools (big-endian headers).  */
+const bfd_target tic54x_coff1_beh_vec =
+  {
+    "coff1-beh-c54x",			/* name */
+    bfd_target_coff_flavour,
+    BFD_ENDIAN_LITTLE,		/* data byte order is little */
+    BFD_ENDIAN_BIG,		/* header byte order is big */
+
+    (HAS_RELOC | EXEC_P |		/* object flags */
+     HAS_LINENO | HAS_DEBUG |
+     HAS_SYMS | HAS_LOCALS | WP_TEXT ),
+
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+    '_',				/* leading symbol underscore */
+    '/',				/* ar_pad_char */
+    15,				/* ar_max_namelen */
+    0,				/* match priority.  */
+    bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    tic54x_getl32, tic54x_getl_signed_32, tic54x_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* data */
+    bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+    bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+    bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* hdrs */
+
+    {_bfd_dummy_target, coff_object_p,	/* bfd_check_format */
+     bfd_generic_archive_p, _bfd_dummy_target},
+    {bfd_false, coff_mkobject, _bfd_generic_mkarchive,	/* bfd_set_format */
+     bfd_false},
+    {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
+     _bfd_write_archive_contents, bfd_false},
+
+    BFD_JUMP_TABLE_GENERIC (coff),
+    BFD_JUMP_TABLE_COPY (coff),
+    BFD_JUMP_TABLE_CORE (_bfd_nocore),
+    BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+    BFD_JUMP_TABLE_SYMBOLS (coff),
+    BFD_JUMP_TABLE_RELOCS (coff),
+    BFD_JUMP_TABLE_WRITE (tic54x),
+    BFD_JUMP_TABLE_LINK (coff),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    & tic54x_coff1_vec,
+
+    (PTR) & ticoff1_swap_table
+  };
+
+/* TI COFF v2, TI DOS tools output (little-endian headers).  */
+const bfd_target tic54x_coff2_vec =
+  {
+    "coff2-c54x",			/* name */
+    bfd_target_coff_flavour,
+    BFD_ENDIAN_LITTLE,		/* data byte order is little */
+    BFD_ENDIAN_LITTLE,		/* header byte order is little (DOS tools) */
+
+    (HAS_RELOC | EXEC_P |		/* object flags */
+     HAS_LINENO | HAS_DEBUG |
+     HAS_SYMS | HAS_LOCALS | WP_TEXT ),
+
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+    '_',				/* leading symbol underscore */
+    '/',				/* ar_pad_char */
+    15,				/* ar_max_namelen */
+    0,				/* match priority.  */
+    bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    tic54x_getl32, tic54x_getl_signed_32, tic54x_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* data */
+    bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* hdrs */
+
+    {_bfd_dummy_target, coff_object_p,	/* bfd_check_format */
+     bfd_generic_archive_p, _bfd_dummy_target},
+    {bfd_false, coff_mkobject, _bfd_generic_mkarchive,	/* bfd_set_format */
+     bfd_false},
+    {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
+     _bfd_write_archive_contents, bfd_false},
+
+    BFD_JUMP_TABLE_GENERIC (coff),
+    BFD_JUMP_TABLE_COPY (coff),
+    BFD_JUMP_TABLE_CORE (_bfd_nocore),
+    BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+    BFD_JUMP_TABLE_SYMBOLS (coff),
+    BFD_JUMP_TABLE_RELOCS (coff),
+    BFD_JUMP_TABLE_WRITE (tic54x),
+    BFD_JUMP_TABLE_LINK (coff),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    & tic54x_coff1_beh_vec,
+
+    COFF_SWAP_TABLE
+  };
+
+/* TI COFF v2, TI SPARC tools output (big-endian headers).  */
+const bfd_target tic54x_coff2_beh_vec =
+  {
+    "coff2-beh-c54x",			/* name */
+    bfd_target_coff_flavour,
+    BFD_ENDIAN_LITTLE,		/* data byte order is little */
+    BFD_ENDIAN_BIG,		/* header byte order is big */
+
+    (HAS_RELOC | EXEC_P |		/* object flags */
+     HAS_LINENO | HAS_DEBUG |
+     HAS_SYMS | HAS_LOCALS | WP_TEXT ),
+
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+    '_',				/* leading symbol underscore */
+    '/',				/* ar_pad_char */
+    15,				/* ar_max_namelen */
+    0,				/* match priority.  */
+    bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    tic54x_getl32, tic54x_getl_signed_32, tic54x_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* data */
+    bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+    bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+    bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* hdrs */
+
+    {_bfd_dummy_target, coff_object_p,	/* bfd_check_format */
+     bfd_generic_archive_p, _bfd_dummy_target},
+    {bfd_false, coff_mkobject, _bfd_generic_mkarchive,	/* bfd_set_format */
+     bfd_false},
+    {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
+     _bfd_write_archive_contents, bfd_false},
+
+    BFD_JUMP_TABLE_GENERIC (coff),
+    BFD_JUMP_TABLE_COPY (coff),
+    BFD_JUMP_TABLE_CORE (_bfd_nocore),
+    BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+    BFD_JUMP_TABLE_SYMBOLS (coff),
+    BFD_JUMP_TABLE_RELOCS (coff),
+    BFD_JUMP_TABLE_WRITE (tic54x),
+    BFD_JUMP_TABLE_LINK (coff),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    & tic54x_coff2_vec,
+
+    COFF_SWAP_TABLE
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-tic80.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-tic80.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-tic80.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-tic80.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,744 @@
+/* BFD back-end for Texas Instruments TMS320C80 Multimedia Video Processor (MVP).
+   Copyright 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008
+   Free Software Foundation, Inc.
+
+   Written by Fred Fish (fnf@cygnus.com)
+
+   There is nothing new under the sun. This file draws a lot on other
+   coff files.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#ifdef _CONST
+/* Newlib-based hosts define _CONST as a STDC-safe alias for const,
+  but to the tic80 toolchain it means something altogether different.
+  Since sysdep.h will have pulled in stdio.h and hence _ansi.h which
+  contains this definition, we must undef it before including the 
+  tic80-specific definition. */
+#undef _CONST
+#endif /* _CONST */
+#include "coff/tic80.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (2)
+#define COFF_ALIGN_IN_SECTION_HEADER 1
+#define COFF_ALIGN_IN_SFLAGS 1
+
+#define GET_SCNHDR_FLAGS H_GET_16
+#define PUT_SCNHDR_FLAGS H_PUT_16
+
+static void rtype2howto
+  PARAMS ((arelent *cache_ptr, struct internal_reloc *dst));
+static bfd_reloc_status_type ppbase_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_reloc_status_type glob15_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_reloc_status_type glob16_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_reloc_status_type local16_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_boolean coff_tic80_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+	   struct internal_reloc *, struct internal_syment *, asection **));
+static reloc_howto_type * coff_tic80_rtype_to_howto
+  PARAMS ((bfd *, asection *, struct internal_reloc *,
+	   struct coff_link_hash_entry *, struct internal_syment *,
+	   bfd_vma *));
+
+static reloc_howto_type tic80_howto_table[] =
+{
+
+  HOWTO (R_RELLONG,			/* type */
+	 0,				/* rightshift */
+	 2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 32,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 0,				/* bitpos */
+	 complain_overflow_bitfield,	/* complain_on_overflow */
+	 NULL,				/* special_function */
+	 "RELLONG",			/* name */
+	 TRUE,				/* partial_inplace */
+	 0xffffffff,			/* src_mask */
+	 0xffffffff,			/* dst_mask */
+	 FALSE),			/* pcrel_offset */
+
+  HOWTO (R_MPPCR,			/* type */
+	 2,				/* rightshift */
+	 2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 32,				/* bitsize */
+	 TRUE,				/* pc_relative */
+	 0,				/* bitpos */
+	 complain_overflow_signed,	/* complain_on_overflow */
+	 NULL,				/* special_function */
+	 "MPPCR",			/* name */
+	 TRUE,				/* partial_inplace */
+	 0xffffffff,			/* src_mask */
+	 0xffffffff,			/* dst_mask */
+	 TRUE),				/* pcrel_offset */
+
+  HOWTO (R_ABS,				/* type */
+	 0,				/* rightshift */
+	 2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 32,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 0,				/* bitpos */
+	 complain_overflow_bitfield,	/* complain_on_overflow */
+	 NULL,				/* special_function */
+	 "ABS",				/* name */
+	 TRUE,				/* partial_inplace */
+	 0xffffffff,			/* src_mask */
+	 0xffffffff,			/* dst_mask */
+	 FALSE),				/* pcrel_offset */
+
+  HOWTO (R_PPBASE,			/* type */
+	 0,				/* rightshift */
+	 2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 32,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 0,				/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 ppbase_reloc,			/* special_function */
+	 "PPBASE",			/* name */
+	 TRUE,				/* partial_inplace */
+	 0xffffffff,			/* src_mask */
+	 0xffffffff,			/* dst_mask */
+	 FALSE),			/* pcrel_offset */
+
+  HOWTO (R_PPLBASE,			/* type */
+	 0,				/* rightshift */
+	 2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 32,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 0,				/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 ppbase_reloc,			/* special_function */
+	 "PPLBASE",			/* name */
+	 TRUE,				/* partial_inplace */
+	 0xffffffff,			/* src_mask */
+	 0xffffffff,			/* dst_mask */
+	 FALSE),			/* pcrel_offset */
+
+  HOWTO (R_PP15,			/* type */
+	 0,				/* rightshift */
+	 2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 15,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 6,				/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 glob15_reloc,			/* special_function */
+	 "PP15",			/* name */
+	 TRUE,				/* partial_inplace */
+	 0x1ffc0,			/* src_mask */
+	 0x1ffc0,			/* dst_mask */
+	 FALSE),			/* pcrel_offset */
+
+  HOWTO (R_PP15W,			/* type */
+	 2,				/* rightshift */
+	 2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 15,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 6,				/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 glob15_reloc,			/* special_function */
+	 "PP15W",			/* name */
+	 TRUE,				/* partial_inplace */
+	 0x1ffc0,			/* src_mask */
+	 0x1ffc0,			/* dst_mask */
+	 FALSE),			/* pcrel_offset */
+
+  HOWTO (R_PP15H,			/* type */
+	 1,				/* rightshift */
+	 2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 15,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 6,				/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 glob15_reloc,			/* special_function */
+	 "PP15H",			/* name */
+	 TRUE,				/* partial_inplace */
+	 0x1ffc0,			/* src_mask */
+	 0x1ffc0,			/* dst_mask */
+	 FALSE),			/* pcrel_offset */
+
+  HOWTO (R_PP16B,			/* type */
+	 0,				/* rightshift */
+	 2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 16,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 6,				/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 glob16_reloc,			/* special_function */
+	 "PP16B",			/* name */
+	 TRUE,				/* partial_inplace */
+	 0x3ffc0,			/* src_mask */
+	 0x3ffc0,			/* dst_mask */
+	 FALSE),			/* pcrel_offset */
+
+  HOWTO (R_PPL15,			/* type */
+	 0,				/* rightshift */
+	 2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 15,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 0,				/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 NULL,				/* special_function */
+	 "PPL15",			/* name */
+	 TRUE,				/* partial_inplace */
+	 0x7fff,			/* src_mask */
+	 0x7fff,			/* dst_mask */
+	 FALSE),			/* pcrel_offset */
+
+  HOWTO (R_PPL15W,			/* type */
+	 2,				/* rightshift */
+	 2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 15,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 0,				/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 NULL,				/* special_function */
+	 "PPL15W",			/* name */
+	 TRUE,				/* partial_inplace */
+	 0x7fff,			/* src_mask */
+	 0x7fff,			/* dst_mask */
+	 FALSE),			/* pcrel_offset */
+
+  HOWTO (R_PPL15H,			/* type */
+	 1,				/* rightshift */
+	 2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 15,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 0,				/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 NULL,				/* special_function */
+	 "PPL15H",			/* name */
+	 TRUE,				/* partial_inplace */
+	 0x7fff,			/* src_mask */
+	 0x7fff,			/* dst_mask */
+	 FALSE),			/* pcrel_offset */
+
+  HOWTO (R_PPL16B,			/* type */
+	 0,				/* rightshift */
+	 2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 16,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 0,				/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 local16_reloc,			/* special_function */
+	 "PPL16B",			/* name */
+	 TRUE,				/* partial_inplace */
+	 0xffff,			/* src_mask */
+	 0xffff,			/* dst_mask */
+	 FALSE),			/* pcrel_offset */
+
+  HOWTO (R_PPN15,			/* type */
+	 0,				/* rightshift */
+	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 15,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 6,				/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 glob15_reloc,			/* special_function */
+	 "PPN15",			/* name */
+	 TRUE,				/* partial_inplace */
+	 0x1ffc0,			/* src_mask */
+	 0x1ffc0,			/* dst_mask */
+	 FALSE),			/* pcrel_offset */
+
+  HOWTO (R_PPN15W,			/* type */
+	 2,				/* rightshift */
+	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 15,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 6,				/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 glob15_reloc,			/* special_function */
+	 "PPN15W",			/* name */
+	 TRUE,				/* partial_inplace */
+	 0x1ffc0,			/* src_mask */
+	 0x1ffc0,			/* dst_mask */
+	 FALSE),			/* pcrel_offset */
+
+  HOWTO (R_PPN15H,			/* type */
+	 1,				/* rightshift */
+	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 15,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 6,				/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 glob15_reloc,			/* special_function */
+	 "PPN15H",			/* name */
+	 TRUE,				/* partial_inplace */
+	 0x1ffc0,			/* src_mask */
+	 0x1ffc0,			/* dst_mask */
+	 FALSE),			/* pcrel_offset */
+
+  HOWTO (R_PPN16B,			/* type */
+	 0,				/* rightshift */
+	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 16,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 6,				/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 glob16_reloc,			/* special_function */
+	 "PPN16B",			/* name */
+	 TRUE,				/* partial_inplace */
+	 0x3ffc0,			/* src_mask */
+	 0x3ffc0,			/* dst_mask */
+	 FALSE),			/* pcrel_offset */
+
+  HOWTO (R_PPLN15,			/* type */
+	 0,				/* rightshift */
+	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 15,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 0,				/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 NULL,				/* special_function */
+	 "PPLN15",			/* name */
+	 TRUE,				/* partial_inplace */
+	 0x7fff,			/* src_mask */
+	 0x7fff,			/* dst_mask */
+	 FALSE),			/* pcrel_offset */
+
+  HOWTO (R_PPLN15W,			/* type */
+	 2,				/* rightshift */
+	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 15,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 0,				/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 NULL,				/* special_function */
+	 "PPLN15W",			/* name */
+	 TRUE,				/* partial_inplace */
+	 0x7fff,			/* src_mask */
+	 0x7fff,			/* dst_mask */
+	 FALSE),			/* pcrel_offset */
+
+  HOWTO (R_PPLN15H,			/* type */
+	 1,				/* rightshift */
+	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 15,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 0,				/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 NULL,				/* special_function */
+	 "PPLN15H",			/* name */
+	 TRUE,				/* partial_inplace */
+	 0x7fff,			/* src_mask */
+	 0x7fff,			/* dst_mask */
+	 FALSE),			/* pcrel_offset */
+
+  HOWTO (R_PPLN16B,			/* type */
+	 0,				/* rightshift */
+	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 15,				/* bitsize */
+	 FALSE,				/* pc_relative */
+	 0,				/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 local16_reloc,			/* special_function */
+	 "PPLN16B",			/* name */
+	 TRUE,				/* partial_inplace */
+	 0xffff,			/* src_mask */
+	 0xffff,			/* dst_mask */
+	 FALSE)				/* pcrel_offset */
+};
+
+/* Special relocation functions, used when the output file is not
+   itself a COFF TIc80 file.  */
+
+/* This special function is used for the base address type
+   relocations.  */
+
+static bfd_reloc_status_type
+ppbase_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
+	      error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry ATTRIBUTE_UNUSED;
+     asymbol *symbol_in ATTRIBUTE_UNUSED;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section ATTRIBUTE_UNUSED;
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  /* FIXME.  */
+  abort ();
+}
+
+/* This special function is used for the global 15 bit relocations.  */
+
+static bfd_reloc_status_type
+glob15_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
+	      error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry ATTRIBUTE_UNUSED;
+     asymbol *symbol_in ATTRIBUTE_UNUSED;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section ATTRIBUTE_UNUSED;
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  /* FIXME.  */
+  abort ();
+}
+
+/* This special function is used for the global 16 bit relocations.  */
+
+static bfd_reloc_status_type
+glob16_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
+	      error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry ATTRIBUTE_UNUSED;
+     asymbol *symbol_in ATTRIBUTE_UNUSED;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section ATTRIBUTE_UNUSED;
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  /* FIXME.  */
+  abort ();
+}
+
+/* This special function is used for the local 16 bit relocations.  */
+
+static bfd_reloc_status_type
+local16_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
+	      error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry ATTRIBUTE_UNUSED;
+     asymbol *symbol_in ATTRIBUTE_UNUSED;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section ATTRIBUTE_UNUSED;
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  /* FIXME.  */
+  abort ();
+}
+
+/* Code to turn an external r_type into a pointer to an entry in the howto_table.
+   If passed an r_type we don't recognize the abort rather than silently failing
+   to generate an output file.  */
+
+static void
+rtype2howto (cache_ptr, dst)
+     arelent *cache_ptr;
+     struct internal_reloc *dst;
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof tic80_howto_table / sizeof tic80_howto_table[0]; i++)
+    {
+      if (tic80_howto_table[i].type == dst->r_type)
+	{
+	  cache_ptr->howto = tic80_howto_table + i;
+	  return;
+	}
+    }
+
+  (*_bfd_error_handler) (_("Unrecognized reloc type 0x%x"),
+			 (unsigned int) dst->r_type);
+  cache_ptr->howto = tic80_howto_table + 0;
+}
+
+#define RTYPE2HOWTO(cache_ptr, dst) rtype2howto (cache_ptr, dst)
+#define coff_rtype_to_howto coff_tic80_rtype_to_howto
+
+static reloc_howto_type *
+coff_tic80_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     asection *sec;
+     struct internal_reloc *rel;
+     struct coff_link_hash_entry *h ATTRIBUTE_UNUSED;
+     struct internal_syment *sym ATTRIBUTE_UNUSED;
+     bfd_vma *addendp;
+{
+  arelent genrel;
+
+  if (rel -> r_symndx == -1 && addendp != NULL)
+    {
+      /* This is a TI "internal relocation", which means that the relocation
+	 amount is the amount by which the current section is being relocated
+	 in the output section.  */
+      *addendp = (sec -> output_section -> vma + sec -> output_offset) - sec -> vma;
+    }
+  RTYPE2HOWTO (&genrel, rel);
+  return genrel.howto;
+}
+
+#ifndef BADMAG
+#define BADMAG(x) TIC80BADMAG(x)
+#endif
+
+#define coff_relocate_section coff_tic80_relocate_section
+
+/* We need a special relocation routine to handle the PP relocs.  Most
+   of this is a copy of _bfd_coff_generic_relocate_section.  */
+
+static bfd_boolean
+coff_tic80_relocate_section (output_bfd, info, input_bfd,
+			     input_section, contents, relocs, syms,
+			     sections)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     struct internal_reloc *relocs;
+     struct internal_syment *syms;
+     asection **sections;
+{
+  struct internal_reloc *rel;
+  struct internal_reloc *relend;
+
+  rel = relocs;
+  relend = rel + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      long symndx;
+      struct coff_link_hash_entry *h;
+      struct internal_syment *sym;
+      bfd_vma addend;
+      bfd_vma val;
+      reloc_howto_type *howto;
+      bfd_reloc_status_type rstat;
+      bfd_vma addr;
+
+      symndx = rel->r_symndx;
+
+      if (symndx == -1)
+	{
+	  h = NULL;
+	  sym = NULL;
+	}
+      else
+	{
+	  h = obj_coff_sym_hashes (input_bfd)[symndx];
+	  sym = syms + symndx;
+	}
+
+      /* COFF treats common symbols in one of two ways.  Either the
+         size of the symbol is included in the section contents, or it
+         is not.  We assume that the size is not included, and force
+         the rtype_to_howto function to adjust the addend as needed.  */
+
+      if (sym != NULL && sym->n_scnum != 0)
+	addend = - sym->n_value;
+      else
+	addend = 0;
+
+      howto = bfd_coff_rtype_to_howto (input_bfd, input_section, rel, h,
+				       sym, &addend);
+      if (howto == NULL)
+	return FALSE;
+
+      val = 0;
+
+      if (h == NULL)
+	{
+	  asection *sec;
+
+	  if (symndx == -1)
+	    {
+	      sec = bfd_abs_section_ptr;
+	      val = 0;
+	    }
+	  else
+	    {
+	      sec = sections[symndx];
+              val = (sec->output_section->vma
+		     + sec->output_offset
+		     + sym->n_value);
+	      if (! obj_pe (output_bfd))
+		val -= sec->vma;
+	    }
+	}
+      else
+	{
+	  if (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	    {
+	      asection *sec;
+
+	      sec = h->root.u.def.section;
+	      val = (h->root.u.def.value
+		     + sec->output_section->vma
+		     + sec->output_offset);
+	      }
+
+	  else if (! info->relocatable)
+	    {
+	      if (! ((*info->callbacks->undefined_symbol)
+		     (info, h->root.root.string, input_bfd, input_section,
+		      rel->r_vaddr - input_section->vma, TRUE)))
+		return FALSE;
+	    }
+	}
+
+      addr = rel->r_vaddr - input_section->vma;
+
+      /* FIXME: This code assumes little endian, but the PP can
+         apparently be bi-endian.  I don't know if the bi-endianness
+         applies to the instruction set or just to the data.  */
+      switch (howto->type)
+	{
+	default:
+	case R_ABS:
+	case R_RELLONGX:
+	case R_PPL15:
+	case R_PPL15W:
+	case R_PPL15H:
+	case R_PPLN15:
+	case R_PPLN15W:
+	case R_PPLN15H:
+	  rstat = _bfd_final_link_relocate (howto, input_bfd, input_section,
+					    contents, addr, val, addend);
+	  break;
+
+	case R_PP15:
+	case R_PP15W:
+	case R_PP15H:
+	case R_PPN15:
+	case R_PPN15W:
+	case R_PPN15H:
+	  /* Offset the address so that we can use 4 byte relocations.  */
+	  rstat = _bfd_final_link_relocate (howto, input_bfd, input_section,
+					    contents + 2, addr, val, addend);
+	  break;
+
+	case R_PP16B:
+	case R_PPN16B:
+	  {
+	    /* The most significant bit is stored in bit 6.  */
+	    bfd_byte hold;
+
+	    hold = contents[addr + 4];
+	    contents[addr + 4] &=~ 0x20;
+	    contents[addr + 4] |= (contents[addr] >> 1) & 0x20;
+	    rstat = _bfd_final_link_relocate (howto, input_bfd, input_section,
+					      contents + 2, addr,
+					      val, addend);
+	    contents[addr] &=~ 0x40;
+	    contents[addr] |= (contents[addr + 4] << 1) & 0x40;
+	    contents[addr + 4] &=~ 0x20;
+	    contents[addr + 4] |= hold & 0x20;
+	    break;
+	  }
+
+	case R_PPL16B:
+	case R_PPLN16B:
+	  {
+	    /* The most significant bit is stored in bit 28.  */
+	    bfd_byte hold;
+
+	    hold = contents[addr + 1];
+	    contents[addr + 1] &=~ 0x80;
+	    contents[addr + 1] |= (contents[addr + 3] << 3) & 0x80;
+	    rstat = _bfd_final_link_relocate (howto, input_bfd, input_section,
+					      contents, addr,
+					      val, addend);
+	    contents[addr + 3] &= ~0x10;
+	    contents[addr + 3] |= (contents[addr + 1] >> 3) & 0x10;
+	    contents[addr + 1] &=~ 0x80;
+	    contents[addr + 1] |= hold & 0x80;
+	    break;
+	  }
+
+	case R_PPBASE:
+	  /* Parameter RAM is from 0x1000000 to 0x1000800.  */
+	  contents[addr] &=~ 0x3;
+	  if (val >= 0x1000000 && val < 0x1000800)
+	    contents[addr] |= 0x3;
+	  else
+	    contents[addr] |= 0x2;
+	  rstat = bfd_reloc_ok;
+	  break;
+
+	case R_PPLBASE:
+	  /* Parameter RAM is from 0x1000000 to 0x1000800.  */
+	  contents[addr + 2] &= ~0xc0;
+	  if (val >= 0x1000000 && val < 0x1000800)
+	    contents[addr + 2] |= 0xc0;
+	  else
+	    contents[addr + 2] |= 0x80;
+	  rstat = bfd_reloc_ok;
+	  break;
+	}
+
+      switch (rstat)
+	{
+	default:
+	  abort ();
+	case bfd_reloc_ok:
+	  break;
+	case bfd_reloc_outofrange:
+	  (*_bfd_error_handler)
+	    (_("%B: bad reloc address 0x%lx in section `%A'"),
+	     input_bfd, input_section, (unsigned long) rel->r_vaddr);
+	  return FALSE;
+	case bfd_reloc_overflow:
+	  {
+	    const char *name;
+	    char buf[SYMNMLEN + 1];
+
+	    if (symndx == -1)
+	      name = "*ABS*";
+	    else if (h != NULL)
+	      name = NULL;
+	    else
+	      {
+		name = _bfd_coff_internal_syment_name (input_bfd, sym, buf);
+		if (name == NULL)
+		  return FALSE;
+	      }
+
+	    if (! ((*info->callbacks->reloc_overflow)
+		   (info, (h ? &h->root : NULL), name, howto->name,
+		    (bfd_vma) 0, input_bfd, input_section,
+		    rel->r_vaddr - input_section->vma)))
+	      return FALSE;
+	  }
+	}
+    }
+  return TRUE;
+}
+
+/* Clear the r_reserved field in relocs.  */
+#define SWAP_OUT_RELOC_EXTRA(abfd,src,dst) \
+  do \
+    { \
+      dst->r_reserved[0] = 0; \
+      dst->r_reserved[1] = 0; \
+    } \
+  while (0)
+
+#define TIC80COFF 1		/* Customize coffcode.h */
+#undef C_AUTOARG		/* Clashes with TIc80's C_UEXT */
+#undef C_LASTENT		/* Clashes with TIc80's C_STATLAB */
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coffcode.h"
+
+CREATE_LITTLE_COFF_TARGET_VEC (tic80coff_vec, "coff-tic80", D_PAGED, 0, '_', NULL, COFF_SWAP_TABLE)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-u68k.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-u68k.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-u68k.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-u68k.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,36 @@
+/* BFD back-end for Motorola 68000 COFF binaries having underscore with name.
+   Copyright 1990, 1991, 1992, 2005, 2007 Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define TARGET_SYM	m68kcoffun_vec
+#define TARGET_NAME	"coff-m68k-un"
+
+#define NAMES_HAVE_UNDERSCORE
+
+/* define this to not have multiple copy of m68k_rtype2howto
+   in the executable file */
+#define ONLY_DECLARE_RELOCS
+
+/* This magic number indicates that the names have underscores.
+   Other 68k magic numbers indicate that the names do not have
+   underscores.  */
+#define BADMAG(x) ((x).f_magic != MC68KBCSMAGIC)
+
+#include "coff-m68k.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-w65.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-w65.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-w65.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-w65.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,390 @@
+/* BFD back-end for WDC 65816 COFF binaries.
+   Copyright 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006, 2007, 2008  Free Software Foundation, Inc.
+   Written by Steve Chamberlain, <sac@cygnus.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "bfdlink.h"
+#include "coff/w65.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+
+static int  select_reloc              PARAMS ((reloc_howto_type *));
+static void rtype2howto               PARAMS ((arelent *, struct internal_reloc *));
+static void reloc_processing          PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection *));
+static int  w65_reloc16_estimate    PARAMS ((bfd *, asection *, arelent *, unsigned int, struct bfd_link_info *));
+static void w65_reloc16_extra_cases PARAMS ((bfd *,struct bfd_link_info *, struct bfd_link_order *, arelent *, bfd_byte *, unsigned int *, unsigned int *));
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (1)
+static reloc_howto_type howto_table[] =
+  {
+    HOWTO (R_W65_ABS8,    0,  0, 8,  FALSE, 0, complain_overflow_bitfield, 0, "abs8", TRUE, 0x000000ff, 0x000000ff, FALSE),
+    HOWTO (R_W65_ABS16,   1,  0, 16, FALSE, 0, complain_overflow_bitfield, 0, "abs16", TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO (R_W65_ABS24,   0,  2, 32, FALSE, 0, complain_overflow_bitfield, 0, "abs24", TRUE, 0x00ffffff, 0x00ffffff, FALSE),
+    HOWTO (R_W65_ABS8S8,  0,  0, 8,  FALSE, 0, complain_overflow_bitfield, 0, ">abs8", TRUE, 0x000000ff, 0x000000ff, FALSE),
+    HOWTO (R_W65_ABS8S16, 0,  0, 8,  FALSE, 0, complain_overflow_bitfield, 0, "^abs8", TRUE, 0x000000ff, 0x000000ff, FALSE),
+    HOWTO (R_W65_ABS16S8, 1,  0, 16, FALSE, 0, complain_overflow_bitfield, 0, ">abs16", TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO (R_W65_ABS16S16,1,  0, 16, FALSE, 0, complain_overflow_bitfield, 0, "^abs16", TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+    HOWTO (R_W65_PCR8,    0,  0, 8,  FALSE, 0, complain_overflow_bitfield, 0, "pcrel8", TRUE, 0x000000ff, 0x000000ff, TRUE),
+    HOWTO (R_W65_PCR16,   1,  0, 16, FALSE, 0, complain_overflow_bitfield, 0, "pcrel16", TRUE, 0x0000ffff, 0x0000ffff, TRUE),
+    HOWTO (R_W65_DP,      0,  0, 8,  FALSE, 0, complain_overflow_bitfield, 0, "dp", TRUE, 0x000000ff, 0x000000ff, FALSE),
+  };
+
+/* Turn a howto into a reloc number.  */
+
+#define SELECT_RELOC(x,howto) \
+  { x.r_type = select_reloc(howto); }
+
+#define BADMAG(x) (W65BADMAG(x))
+#define W65 1			/* Customize coffcode.h */
+#define __A_MAGIC_SET__
+
+/* Code to swap in the reloc */
+#define SWAP_IN_RELOC_OFFSET	H_GET_32
+#define SWAP_OUT_RELOC_OFFSET	H_PUT_32
+#define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) \
+  dst->r_stuff[0] = 'S'; \
+  dst->r_stuff[1] = 'C';
+
+static int
+select_reloc (howto)
+     reloc_howto_type *howto;
+{
+  return howto->type ;
+}
+
+/* Code to turn a r_type into a howto ptr, uses the above howto table.  */
+
+static void
+rtype2howto (internal, dst)
+     arelent *internal;
+     struct internal_reloc *dst;
+{
+  internal->howto = howto_table + dst->r_type - 1;
+}
+
+#define RTYPE2HOWTO(internal, relocentry) rtype2howto(internal,relocentry)
+
+/* Perform any necessary magic to the addend in a reloc entry.  */
+
+#define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \
+ cache_ptr->addend =  ext_reloc.r_offset;
+
+#define RELOC_PROCESSING(relent,reloc,symbols,abfd,section) \
+ reloc_processing(relent, reloc, symbols, abfd, section)
+
+static void
+reloc_processing (relent, reloc, symbols, abfd, section)
+     arelent * relent;
+     struct internal_reloc *reloc;
+     asymbol ** symbols;
+     bfd * abfd;
+     asection * section;
+{
+  relent->address = reloc->r_vaddr;
+  rtype2howto (relent, reloc);
+
+  if (((int) reloc->r_symndx) > 0)
+    relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
+  else
+    relent->sym_ptr_ptr = (asymbol **) bfd_abs_section_ptr->symbol_ptr_ptr;
+
+  relent->addend = reloc->r_offset;
+
+  relent->address -= section->vma;
+  /*  relent->section = 0;*/
+}
+
+static int
+w65_reloc16_estimate (abfd, input_section, reloc, shrink, link_info)
+     bfd *abfd;
+     asection *input_section;
+     arelent *reloc;
+     unsigned int shrink;
+     struct bfd_link_info *link_info;
+{
+  bfd_vma value;
+  bfd_vma dot;
+  bfd_vma gap;
+
+  /* The address of the thing to be relocated will have moved back by
+   the size of the shrink  - but we don't change reloc->address here,
+   since we need it to know where the relocation lives in the source
+   uncooked section.  */
+
+  /*  reloc->address -= shrink;   conceptual */
+
+  bfd_vma address = reloc->address - shrink;
+
+  switch (reloc->howto->type)
+    {
+    case R_MOV16B2:
+    case R_JMP2:
+      shrink+=2;
+      break;
+
+      /* Thing is a move one byte.  */
+    case R_MOV16B1:
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+
+      if (value >= 0xff00)
+	{
+	  /* Change the reloc type from 16bit, possible 8 to 8bit
+	     possible 16.  */
+	  reloc->howto = reloc->howto + 1;
+	  /* The place to relc moves back by one.  */
+	  /* This will be two bytes smaller in the long run.  */
+	  shrink += 2;
+	  bfd_perform_slip (abfd, 2, input_section, address);
+	}
+
+      break;
+      /* This is the 24 bit branch which could become an 8 bitter,
+	 the relocation points to the first byte of the insn, not the
+	 actual data.  */
+
+    case R_JMPL1:
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+
+      dot = input_section->output_section->vma +
+	input_section->output_offset + address;
+
+      /* See if the address we're looking at within 127 bytes of where
+	 we are, if so then we can use a small branch rather than the
+	 jump we were going to.  */
+      gap = value - dot;
+
+      if (-120 < (long) gap && (long) gap < 120)
+	{
+	  /* Change the reloc type from 24bit, possible 8 to 8bit
+	     possible 32.  */
+	  reloc->howto = reloc->howto + 1;
+	  /* This will be two bytes smaller in the long run.  */
+	  shrink += 2;
+	  bfd_perform_slip (abfd, 2, input_section, address);
+	}
+      break;
+
+    case R_JMP1:
+      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+
+      dot = input_section->output_section->vma +
+	input_section->output_offset + address;
+
+      /* See if the address we're looking at within 127 bytes of where
+	 we are, if so then we can use a small branch rather than the
+	 jump we were going to.  */
+      gap = value - (dot - shrink);
+
+      if (-120 < (long) gap && (long) gap < 120)
+	{
+	  /* Change the reloc type from 16bit, possible 8 to 8bit
+	     possible 16.  */
+	  reloc->howto = reloc->howto + 1;
+	  /* The place to relc moves back by one.  */
+
+	  /* This will be two bytes smaller in the long run.  */
+	  shrink += 2;
+	  bfd_perform_slip (abfd, 2, input_section, address);
+	}
+      break;
+    }
+
+  return shrink;
+}
+
+/* First phase of a relaxing link.  */
+
+/* Reloc types
+   large		small
+   R_MOV16B1		R_MOV16B2	mov.b with 16bit or 8 bit address
+   R_JMP1		R_JMP2		jmp or pcrel branch
+   R_JMPL1		R_JMPL_B8	24jmp or pcrel branch
+   R_MOV24B1		R_MOV24B2	24 or 8 bit reloc for mov.b  */
+
+static void
+w65_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
+			   dst_ptr)
+     bfd *abfd;
+     struct bfd_link_info *link_info;
+     struct bfd_link_order *link_order;
+     arelent *reloc;
+     bfd_byte *data;
+     unsigned int *src_ptr;
+     unsigned int *dst_ptr;
+{
+  unsigned int src_address = *src_ptr;
+  unsigned int dst_address = *dst_ptr;
+  asection *input_section = link_order->u.indirect.section;
+
+  switch (reloc->howto->type)
+    {
+    case R_W65_ABS8:
+    case R_W65_DP:
+      {
+	unsigned int gap = bfd_coff_reloc16_get_value (reloc, link_info,
+						       input_section);
+	bfd_put_8 (abfd, gap, data + dst_address);
+	dst_address += 1;
+	src_address += 1;
+      }
+      break;
+
+    case R_W65_ABS8S8:
+      {
+	unsigned int gap = bfd_coff_reloc16_get_value (reloc, link_info,
+						       input_section);
+	gap >>= 8;
+	bfd_put_8 (abfd, gap, data + dst_address);
+	dst_address += 1;
+	src_address += 1;
+      }
+      break;
+
+    case R_W65_ABS8S16:
+      {
+	unsigned int gap = bfd_coff_reloc16_get_value (reloc, link_info,
+						       input_section);
+	gap >>= 16;
+	bfd_put_8 (abfd, gap, data + dst_address);
+	dst_address += 1;
+	src_address += 1;
+      }
+      break;
+
+    case R_W65_ABS16:
+      {
+	unsigned int gap = bfd_coff_reloc16_get_value (reloc, link_info,
+						       input_section);
+
+	bfd_put_16 (abfd, (bfd_vma) gap, data + dst_address);
+	dst_address += 2;
+	src_address += 2;
+      }
+      break;
+    case R_W65_ABS16S8:
+      {
+	unsigned int gap = bfd_coff_reloc16_get_value (reloc, link_info,
+						       input_section);
+	gap >>= 8;
+	bfd_put_16 (abfd, (bfd_vma) gap, data + dst_address);
+	dst_address += 2;
+	src_address += 2;
+      }
+      break;
+    case R_W65_ABS16S16:
+      {
+	unsigned int gap = bfd_coff_reloc16_get_value (reloc, link_info,
+						       input_section);
+	gap >>= 16;
+	bfd_put_16 (abfd, (bfd_vma) gap, data + dst_address);
+	dst_address += 2;
+	src_address += 2;
+      }
+      break;
+
+    case R_W65_ABS24:
+      {
+	unsigned int gap = bfd_coff_reloc16_get_value (reloc, link_info,
+						       input_section);
+	bfd_put_16 (abfd, (bfd_vma) gap, data + dst_address);
+	bfd_put_8 (abfd, gap >> 16, data+dst_address + 2);
+	dst_address += 3;
+	src_address += 3;
+      }
+      break;
+
+    case R_W65_PCR8:
+      {
+	int gap = bfd_coff_reloc16_get_value (reloc, link_info,
+					      input_section);
+	bfd_vma dot = (dst_address
+		       + input_section->output_offset
+		       + input_section->output_section->vma);
+
+	gap -= dot + 1;
+	if (gap < -128 || gap > 127)
+	  {
+	    if (! ((*link_info->callbacks->reloc_overflow)
+		   (link_info, NULL,
+		    bfd_asymbol_name (*reloc->sym_ptr_ptr),
+		    reloc->howto->name, reloc->addend, input_section->owner,
+		    input_section, reloc->address)))
+	      abort ();
+	  }
+	bfd_put_8 (abfd, gap, data + dst_address);
+	dst_address += 1;
+	src_address += 1;
+      }
+      break;
+
+    case R_W65_PCR16:
+      {
+	bfd_vma gap = bfd_coff_reloc16_get_value (reloc, link_info,
+						  input_section);
+	bfd_vma dot = (dst_address
+		       + input_section->output_offset
+		       + input_section->output_section->vma);
+
+	/* This wraps within the page, so ignore the relativeness, look at the
+	   high part.  */
+	if ((gap & 0xf0000) != (dot & 0xf0000))
+	  {
+	    if (! ((*link_info->callbacks->reloc_overflow)
+		   (link_info, NULL,
+		    bfd_asymbol_name (*reloc->sym_ptr_ptr),
+		    reloc->howto->name, reloc->addend, input_section->owner,
+		    input_section, reloc->address)))
+	      abort ();
+	  }
+
+	gap -= dot + 2;
+	bfd_put_16 (abfd, gap, data + dst_address);
+	dst_address += 2;
+	src_address += 2;
+      }
+      break;
+    default:
+      printf (_("ignoring reloc %s\n"), reloc->howto->name);
+      break;
+
+    }
+  *src_ptr = src_address;
+  *dst_ptr = dst_address;
+}
+
+#define coff_reloc16_extra_cases w65_reloc16_extra_cases
+#define coff_reloc16_estimate w65_reloc16_estimate
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coffcode.h"
+
+#undef coff_bfd_get_relocated_section_contents
+#undef coff_bfd_relax_section
+#define coff_bfd_get_relocated_section_contents \
+  bfd_coff_reloc16_get_relocated_section_contents
+#define coff_bfd_relax_section bfd_coff_reloc16_relax_section
+
+CREATE_LITTLE_COFF_TARGET_VEC (w65_vec, "coff-w65", BFD_IS_RELAXABLE, 0, '_', NULL, COFF_SWAP_TABLE)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-we32k.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-we32k.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-we32k.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-we32k.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,74 @@
+/* BFD back-end for we32k COFF files.
+   Copyright 1992, 1993, 1994, 1999, 2000, 2002, 2003, 2005, 2007, 2008
+   Free Software Foundation, Inc.
+   Contributed by Brendan Kehoe (brendan@cs.widener.edu).
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "coff/we32k.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
+
+static reloc_howto_type howto_table[] =
+{
+    EMPTY_HOWTO (0),
+    EMPTY_HOWTO (1),
+    EMPTY_HOWTO (2),
+    EMPTY_HOWTO (3),
+    EMPTY_HOWTO (4),
+    EMPTY_HOWTO (5),
+  HOWTO(R_DIR32,	       0,  2, 	32, FALSE, 0,complain_overflow_bitfield, 0, "dir32",	TRUE, 0xffffffff,0xffffffff, FALSE),
+    EMPTY_HOWTO (7),
+    EMPTY_HOWTO (010),
+    EMPTY_HOWTO (011),
+    EMPTY_HOWTO (012),
+    EMPTY_HOWTO (013),
+    EMPTY_HOWTO (014),
+    EMPTY_HOWTO (015),
+    EMPTY_HOWTO (016),
+  HOWTO(R_RELBYTE,	       0,  0,  	8,  FALSE, 0, complain_overflow_bitfield, 0, "8",	TRUE, 0x000000ff,0x000000ff, FALSE),
+  HOWTO(R_RELWORD,	       0,  1, 	16, FALSE, 0, complain_overflow_bitfield, 0, "16",	TRUE, 0x0000ffff,0x0000ffff, FALSE),
+  HOWTO(R_RELLONG,	       0,  2, 	32, FALSE, 0, complain_overflow_bitfield, 0, "32",	TRUE, 0xffffffff,0xffffffff, FALSE),
+  HOWTO(R_PCRBYTE,	       0,  0, 	8,  TRUE,  0, complain_overflow_signed, 0, "DISP8",    TRUE, 0x000000ff,0x000000ff, FALSE),
+  HOWTO(R_PCRWORD,	       0,  1, 	16, TRUE,  0, complain_overflow_signed, 0, "DISP16",   TRUE, 0x0000ffff,0x0000ffff, FALSE),
+  HOWTO(R_PCRLONG,	       0,  2, 	32, TRUE,  0, complain_overflow_signed, 0, "DISP32",   TRUE, 0xffffffff,0xffffffff, FALSE),
+};
+
+/* Turn a howto into a reloc  nunmber */
+
+#define SELECT_RELOC(x,howto) { x.r_type = howto->type; }
+#define BADMAG(x) WE32KBADMAG(x)
+#define WE32K	1
+
+#define RTYPE2HOWTO(cache_ptr, dst) \
+	    (cache_ptr)->howto = howto_table + (dst)->r_type;
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coffcode.h"
+
+#define coff_write_armap bsd_write_armap
+
+CREATE_BIG_COFF_TARGET_VEC (we32kcoff_vec, "coff-we32k", 0, 0, 0, NULL, COFF_SWAP_TABLE)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-x86_64.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-x86_64.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-x86_64.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-x86_64.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,796 @@
+/* BFD back-end for AMD 64 COFF files.
+   Copyright 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.
+   
+   Written by Kai Tietz, OneVision Software GmbH&CoKg.  */
+
+#ifndef COFF_WITH_pex64
+#define COFF_WITH_pex64
+#endif
+
+/* Note we have to make sure not to include headers twice.
+   Not all headers are wrapped in #ifdef guards, so we define
+   PEI_HEADERS to prevent double including here.  */
+#ifndef PEI_HEADERS
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "coff/x86_64.h"
+#include "coff/internal.h"
+#include "coff/pe.h"
+#include "libcoff.h"
+#include "libiberty.h"
+#endif
+
+#define BADMAG(x) AMD64BADMAG(x)
+
+#ifdef COFF_WITH_pex64
+# undef  AOUTSZ
+# define AOUTSZ		PEPAOUTSZ
+# define PEAOUTHDR	PEPAOUTHDR
+#endif
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (2)
+
+/* The page size is a guess based on ELF.  */
+
+#define COFF_PAGE_SIZE 0x1000
+
+/* For some reason when using AMD COFF the value stored in the .text
+   section for a reference to a common symbol is the value itself plus
+   any desired offset.  Ian Taylor, Cygnus Support.  */
+
+/* If we are producing relocatable output, we need to do some
+   adjustments to the object file that are not done by the
+   bfd_perform_relocation function.  This function is called by every
+   reloc type to make any required adjustments.  */
+
+static bfd_reloc_status_type
+coff_amd64_reloc (bfd *abfd,
+		  arelent *reloc_entry,
+		  asymbol *symbol,
+		  void * data,
+		  asection *input_section ATTRIBUTE_UNUSED,
+		  bfd *output_bfd,
+		  char **error_message ATTRIBUTE_UNUSED)
+{
+  symvalue diff;
+
+#if !defined(COFF_WITH_PE)
+  if (output_bfd == NULL)
+    return bfd_reloc_continue;
+#endif
+
+  if (bfd_is_com_section (symbol->section))
+    {
+#if !defined(COFF_WITH_PE)
+      /* We are relocating a common symbol.  The current value in the
+	 object file is ORIG + OFFSET, where ORIG is the value of the
+	 common symbol as seen by the object file when it was compiled
+	 (this may be zero if the symbol was undefined) and OFFSET is
+	 the offset into the common symbol (normally zero, but may be
+	 non-zero when referring to a field in a common structure).
+	 ORIG is the negative of reloc_entry->addend, which is set by
+	 the CALC_ADDEND macro below.  We want to replace the value in
+	 the object file with NEW + OFFSET, where NEW is the value of
+	 the common symbol which we are going to put in the final
+	 object file.  NEW is symbol->value.  */
+      diff = symbol->value + reloc_entry->addend;
+#else
+      /* In PE mode, we do not offset the common symbol.  */
+      diff = reloc_entry->addend;
+#endif
+    }
+  else
+    {
+      /* For some reason bfd_perform_relocation always effectively
+	 ignores the addend for a COFF target when producing
+	 relocatable output.  This seems to be always wrong for 386
+	 COFF, so we handle the addend here instead.  */
+#if defined(COFF_WITH_PE)
+      if (output_bfd == NULL)
+	{
+	  reloc_howto_type *howto = reloc_entry->howto;
+
+	  /* Although PC relative relocations are very similar between
+	     PE and non-PE formats, but they are off by 1 << howto->size
+	     bytes. For the external relocation, PE is very different
+	     from others. See md_apply_fix3 () in gas/config/tc-amd64.c.
+	     When we link PE and non-PE object files together to
+	     generate a non-PE executable, we have to compensate it
+	     here.  */
+	  if(howto->pc_relative && howto->pcrel_offset)
+	    diff = -(1 << howto->size);
+	  else if(symbol->flags & BSF_WEAK)
+	    diff = reloc_entry->addend - symbol->value;
+	  else
+	    diff = -reloc_entry->addend;
+	}
+      else
+#endif
+	diff = reloc_entry->addend;
+    }
+
+#if defined(COFF_WITH_PE)
+  /* FIXME: How should this case be handled?  */
+  if (reloc_entry->howto->type == R_AMD64_IMAGEBASE
+      && output_bfd != NULL
+      && bfd_get_flavour (output_bfd) == bfd_target_coff_flavour)
+    diff -= pe_data (output_bfd)->pe_opthdr.ImageBase;
+#endif
+
+#define DOIT(x) \
+  x = ((x & ~howto->dst_mask) | (((x & howto->src_mask) + diff) & howto->dst_mask))
+
+    if (diff != 0)
+      {
+	reloc_howto_type *howto = reloc_entry->howto;
+	unsigned char *addr = (unsigned char *) data + reloc_entry->address;
+
+	switch (howto->size)
+	  {
+	  case 0:
+	    {
+	      char x = bfd_get_8 (abfd, addr);
+	      DOIT (x);
+	      bfd_put_8 (abfd, x, addr);
+	    }
+	    break;
+
+	  case 1:
+	    {
+	      short x = bfd_get_16 (abfd, addr);
+	      DOIT (x);
+	      bfd_put_16 (abfd, (bfd_vma) x, addr);
+	    }
+	    break;
+
+	  case 2:
+	    {
+	      long x = bfd_get_32 (abfd, addr);
+	      DOIT (x);
+	      bfd_put_32 (abfd, (bfd_vma) x, addr);
+	    }
+	    break;
+	  case 4:
+	    {
+	      long long x = bfd_get_64 (abfd, addr);
+	      DOIT (x);
+	      bfd_put_64 (abfd, (bfd_vma) x, addr);
+	    }
+	    break;
+
+	  default:
+	    abort ();
+	  }
+      }
+
+  /* Now let bfd_perform_relocation finish everything up.  */
+  return bfd_reloc_continue;
+}
+
+#if defined(COFF_WITH_PE)
+/* Return TRUE if this relocation should appear in the output .reloc
+   section.  */
+
+static bfd_boolean
+in_reloc_p (bfd *abfd ATTRIBUTE_UNUSED, reloc_howto_type *howto)
+{
+  return ! howto->pc_relative && howto->type != R_AMD64_IMAGEBASE
+	 && howto->type != R_AMD64_SECREL;
+}
+#endif /* COFF_WITH_PE */
+
+#ifndef PCRELOFFSET
+#define PCRELOFFSET TRUE
+#endif
+
+static reloc_howto_type howto_table[] =
+{
+  EMPTY_HOWTO (0),
+  HOWTO (R_AMD64_DIR64,		/* type  1*/
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long, 4 = long long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 coff_amd64_reloc,	/* special_function */
+	 "R_X86_64_64",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffffffffffffll,	/* src_mask */
+	 0xffffffffffffffffll,	/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+  HOWTO (R_AMD64_DIR32,		/* type 2 */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 coff_amd64_reloc,	/* special_function */
+	 "R_X86_64_32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+  /* PE IMAGE_REL_AMD64_ADDR32NB relocation (3).	*/
+  HOWTO (R_AMD64_IMAGEBASE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 coff_amd64_reloc,	/* special_function */
+	 "rva32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  /* 32-bit longword PC relative relocation (4).  */
+  HOWTO (R_AMD64_PCRLONG,	/* type 4 */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 coff_amd64_reloc,	/* special_function */
+	 "R_X86_64_PC32",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+
+ HOWTO (R_AMD64_PCRLONG_1,	/* type 5 */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 coff_amd64_reloc,	/* special_function */
+	 "DISP32+1",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+ HOWTO (R_AMD64_PCRLONG_2,	/* type 6 */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 coff_amd64_reloc,	/* special_function */
+	 "DISP32+2",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+ HOWTO (R_AMD64_PCRLONG_3,	/* type 7 */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 coff_amd64_reloc,	/* special_function */
+	 "DISP32+3",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+ HOWTO (R_AMD64_PCRLONG_4,	/* type 8 */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 coff_amd64_reloc,	/* special_function */
+	 "DISP32+4",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+ HOWTO (R_AMD64_PCRLONG_5,	/* type 9 */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 coff_amd64_reloc,	/* special_function */
+	 "DISP32+5",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+  EMPTY_HOWTO (10), /* R_AMD64_SECTION 10  */
+#if defined(COFF_WITH_PE)
+  /* 32-bit longword section relative relocation (11).  */
+  HOWTO (R_AMD64_SECREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 coff_amd64_reloc,	/* special_function */
+	 "secrel32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+#else
+  EMPTY_HOWTO (11),
+#endif
+  EMPTY_HOWTO (12),
+  EMPTY_HOWTO (13),
+#ifndef DONT_EXTEND_AMD64
+  HOWTO (R_AMD64_PCRQUAD,
+         0,                     /* rightshift */
+         4,                     /* size (0 = byte, 1 = short, 2 = long) */
+         64,                    /* bitsize */
+         TRUE,                  /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_signed, /* complain_on_overflow */
+         coff_amd64_reloc,      /* special_function */
+         "R_X86_64_PC64",       /* name */
+         TRUE,                  /* partial_inplace */
+         0xffffffffffffffffll,  /* src_mask */
+         0xffffffffffffffffll,  /* dst_mask */
+         PCRELOFFSET),           /* pcrel_offset */
+#else
+  EMPTY_HOWTO (14),
+#endif
+  /* Byte relocation (15).  */
+  HOWTO (R_RELBYTE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 coff_amd64_reloc,	/* special_function */
+	 "R_X86_64_8",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x000000ff,		/* src_mask */
+	 0x000000ff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+  /* 16-bit word relocation (16).  */
+  HOWTO (R_RELWORD,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 coff_amd64_reloc,	/* special_function */
+	 "R_X86_64_16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+  /* 32-bit longword relocation (17).	*/
+  HOWTO (R_RELLONG,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 coff_amd64_reloc,	/* special_function */
+	 "R_X86_64_32S",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+  /* Byte PC relative relocation (18).	 */
+  HOWTO (R_PCRBYTE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 coff_amd64_reloc,	/* special_function */
+	 "R_X86_64_PC8",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x000000ff,		/* src_mask */
+	 0x000000ff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+  /* 16-bit word PC relative relocation (19).	*/
+  HOWTO (R_PCRWORD,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 coff_amd64_reloc,	/* special_function */
+	 "R_X86_64_PC16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 PCRELOFFSET),		/* pcrel_offset */
+  /* 32-bit longword PC relative relocation (20).  */
+  HOWTO (R_PCRLONG,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 coff_amd64_reloc,	/* special_function */
+	 "R_X86_64_PC32",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 PCRELOFFSET)		/* pcrel_offset */
+};
+
+/* Turn a howto into a reloc  nunmber */
+
+#define SELECT_RELOC(x,howto) { x.r_type = howto->type; }
+#define I386  1			/* Customize coffcode.h */
+#define AMD64 1
+
+#define RTYPE2HOWTO(cache_ptr, dst)		\
+  ((cache_ptr)->howto =				\
+   ((dst)->r_type < ARRAY_SIZE (howto_table))	\
+    ? howto_table + (dst)->r_type		\
+    : NULL)
+
+/* For 386 COFF a STYP_NOLOAD | STYP_BSS section is part of a shared
+   library.  On some other COFF targets STYP_BSS is normally
+   STYP_NOLOAD.  */
+#define BSS_NOLOAD_IS_SHARED_LIBRARY
+
+/* Compute the addend of a reloc.  If the reloc is to a common symbol,
+   the object file contains the value of the common symbol.  By the
+   time this is called, the linker may be using a different symbol
+   from a different object file with a different value.  Therefore, we
+   hack wildly to locate the original symbol from this file so that we
+   can make the correct adjustment.  This macro sets coffsym to the
+   symbol from the original file, and uses it to set the addend value
+   correctly.  If this is not a common symbol, the usual addend
+   calculation is done, except that an additional tweak is needed for
+   PC relative relocs.
+   FIXME: This macro refers to symbols and asect; these are from the
+   calling function, not the macro arguments.  */
+
+#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr)		\
+  {								\
+    coff_symbol_type *coffsym = NULL;				\
+    								\
+    if (ptr && bfd_asymbol_bfd (ptr) != abfd)			\
+      coffsym = (obj_symbols (abfd)				\
+	         + (cache_ptr->sym_ptr_ptr - symbols));		\
+    else if (ptr)						\
+      coffsym = coff_symbol_from (abfd, ptr);			\
+    								\
+    if (coffsym != NULL						\
+	&& coffsym->native->u.syment.n_scnum == 0)		\
+      cache_ptr->addend = - coffsym->native->u.syment.n_value;	\
+    else if (ptr && bfd_asymbol_bfd (ptr) == abfd		\
+	     && ptr->section != NULL)				\
+      cache_ptr->addend = - (ptr->section->vma + ptr->value);	\
+    else							\
+      cache_ptr->addend = 0;					\
+    if (ptr && howto_table[reloc.r_type].pc_relative)		\
+      cache_ptr->addend += asect->vma;				\
+  }
+
+/* We use the special COFF backend linker.  For normal AMD64 COFF, we
+   can use the generic relocate_section routine.  For PE, we need our
+   own routine.  */
+
+#if !defined(COFF_WITH_PE)
+
+#define coff_relocate_section _bfd_coff_generic_relocate_section
+
+#else /* COFF_WITH_PE */
+
+/* The PE relocate section routine.  The only difference between this
+   and the regular routine is that we don't want to do anything for a
+   relocatable link.  */
+
+static bfd_boolean
+coff_pe_amd64_relocate_section (bfd *output_bfd,
+				struct bfd_link_info *info,
+				bfd *input_bfd,
+				asection *input_section,
+				bfd_byte *contents,
+				struct internal_reloc *relocs,
+				struct internal_syment *syms,
+				asection **sections)
+{
+  if (info->relocatable)
+    return TRUE;
+
+  return _bfd_coff_generic_relocate_section (output_bfd, info, input_bfd,input_section, contents,relocs, syms, sections);
+}
+
+#define coff_relocate_section coff_pe_amd64_relocate_section
+
+#endif /* COFF_WITH_PE */
+
+/* Convert an rtype to howto for the COFF backend linker.  */
+
+static reloc_howto_type *
+coff_amd64_rtype_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+			   asection *sec,
+			   struct internal_reloc *rel,
+			   struct coff_link_hash_entry *h,
+			   struct internal_syment *sym,
+			   bfd_vma *addendp)
+{
+  reloc_howto_type *howto;
+
+  if (rel->r_type >= ARRAY_SIZE (howto_table))
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return NULL;
+    }
+  howto = howto_table + rel->r_type;
+
+#if defined(COFF_WITH_PE)
+  /* Cancel out code in _bfd_coff_generic_relocate_section.  */
+  *addendp = 0;
+  if (rel->r_type >= R_AMD64_PCRLONG_1 && rel->r_type <= R_AMD64_PCRLONG_5)
+    {
+      *addendp -= (bfd_vma)(rel->r_type - R_AMD64_PCRLONG);
+      rel->r_type = R_AMD64_PCRLONG;
+    }
+#endif
+
+  if (howto->pc_relative)
+    *addendp += sec->vma;
+
+  if (sym != NULL && sym->n_scnum == 0 && sym->n_value != 0)
+    {
+      /* This is a common symbol.  The section contents include the
+	 size (sym->n_value) as an addend.  The relocate_section
+	 function will be adding in the final value of the symbol.  We
+	 need to subtract out the current size in order to get the
+	 correct result.  */
+      BFD_ASSERT (h != NULL);
+
+#if !defined(COFF_WITH_PE)
+      /* I think we *do* want to bypass this.  If we don't, I have
+	 seen some data parameters get the wrong relocation address.
+	 If I link two versions with and without this section bypassed
+	 and then do a binary comparison, the addresses which are
+	 different can be looked up in the map.  The case in which
+	 this section has been bypassed has addresses which correspond
+	 to values I can find in the map.  */
+      *addendp -= sym->n_value;
+#endif
+    }
+
+#if !defined(COFF_WITH_PE)
+  /* If the output symbol is common (in which case this must be a
+     relocatable link), we need to add in the final size of the
+     common symbol.  */
+  if (h != NULL && h->root.type == bfd_link_hash_common)
+    *addendp += h->root.u.c.size;
+#endif
+
+#if defined(COFF_WITH_PE)
+  if (howto->pc_relative)
+    {
+      *addendp -= 4;
+
+      /* If the symbol is defined, then the generic code is going to
+         add back the symbol value in order to cancel out an
+         adjustment it made to the addend.  However, we set the addend
+         to 0 at the start of this function.  We need to adjust here,
+         to avoid the adjustment the generic code will make.  FIXME:
+         This is getting a bit hackish.  */
+      if (sym != NULL && sym->n_scnum != 0)
+	*addendp -= sym->n_value;
+    }
+
+  if (rel->r_type == R_AMD64_IMAGEBASE
+      && (bfd_get_flavour (sec->output_section->owner) == bfd_target_coff_flavour))
+    *addendp -= pe_data (sec->output_section->owner)->pe_opthdr.ImageBase;
+
+  if (rel->r_type == R_AMD64_SECREL)
+    {
+      bfd_vma osect_vma;
+
+      if (h && (h->type == bfd_link_hash_defined || h->type == bfd_link_hash_defweak))
+	osect_vma = h->root.u.def.section->output_section->vma;
+      else
+	{
+	  asection *s;
+	  int i;
+
+	  /* Sigh, the only way to get the section to offset against
+	     is to find it the hard way.  */
+	  for (s = abfd->sections, i = 1; i < sym->n_scnum; i++)
+	    s = s->next;
+
+	  osect_vma = s->output_section->vma;
+	}
+
+      *addendp -= osect_vma;
+    }
+#endif
+
+  return howto;
+}
+
+#define coff_bfd_reloc_type_lookup coff_amd64_reloc_type_lookup
+#define coff_bfd_reloc_name_lookup coff_amd64_reloc_name_lookup
+
+static reloc_howto_type *
+coff_amd64_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, bfd_reloc_code_real_type code)
+{
+  switch (code)
+    {
+    case BFD_RELOC_RVA:
+      return howto_table + R_AMD64_IMAGEBASE;
+    case BFD_RELOC_32:
+      return howto_table + R_AMD64_DIR32;
+    case BFD_RELOC_64:
+      return howto_table + R_AMD64_DIR64;
+    case BFD_RELOC_64_PCREL:
+#ifndef DONT_EXTEND_AMD64
+      return howto_table + R_AMD64_PCRQUAD;
+#else
+      /* Fall through.  */
+#endif
+    case BFD_RELOC_32_PCREL:
+      return howto_table + R_AMD64_PCRLONG;
+    case BFD_RELOC_X86_64_32S:
+      return howto_table + R_RELLONG;
+    case BFD_RELOC_16:
+      return howto_table + R_RELWORD;
+    case BFD_RELOC_16_PCREL:
+      return howto_table + R_PCRWORD;
+    case BFD_RELOC_8:
+      return howto_table + R_RELBYTE;
+    case BFD_RELOC_8_PCREL:
+      return howto_table + R_PCRBYTE;
+#if defined(COFF_WITH_PE)
+    case BFD_RELOC_32_SECREL:
+      return howto_table + R_AMD64_SECREL;
+#endif
+    default:
+      BFD_FAIL ();
+      return 0;
+    }
+}
+
+static reloc_howto_type *
+coff_amd64_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			      const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (howto_table) / sizeof (howto_table[0]); i++)
+    if (howto_table[i].name != NULL
+	&& strcasecmp (howto_table[i].name, r_name) == 0)
+      return &howto_table[i];
+
+  return NULL;
+}
+
+#define coff_rtype_to_howto coff_amd64_rtype_to_howto
+
+#ifdef TARGET_UNDERSCORE
+
+/* If amd64 gcc uses underscores for symbol names, then it does not use
+   a leading dot for local labels, so if TARGET_UNDERSCORE is defined
+   we treat all symbols starting with L as local.  */
+
+static bfd_boolean
+coff_amd64_is_local_label_name (bfd *abfd, const char *name)
+{
+  if (name[0] == 'L')
+    return TRUE;
+
+  return _bfd_coff_is_local_label_name (abfd, name);
+}
+
+#define coff_bfd_is_local_label_name coff_amd64_is_local_label_name
+
+#endif /* TARGET_UNDERSCORE */
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata   NULL
+#endif
+
+#include "coffcode.h"
+
+#ifdef PE
+#define amd64coff_object_p pe_bfd_object_p
+#else
+#define amd64coff_object_p coff_object_p
+#endif
+
+const bfd_target
+#ifdef TARGET_SYM
+  TARGET_SYM =
+#else
+  x86_64coff_vec =
+#endif
+{
+#ifdef TARGET_NAME
+  TARGET_NAME,
+#else
+ "coff-x86-64",			/* Name.  */
+#endif
+  bfd_target_coff_flavour,
+  BFD_ENDIAN_LITTLE,		/* Data byte order is little.  */
+  BFD_ENDIAN_LITTLE,		/* Header byte order is little.  */
+
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC /* Section flags.  */
+#if defined(COFF_WITH_PE)
+   | SEC_LINK_ONCE | SEC_LINK_DUPLICATES | SEC_READONLY
+#endif
+   | SEC_CODE | SEC_DATA),
+
+#ifdef TARGET_UNDERSCORE
+  TARGET_UNDERSCORE,		/* Leading underscore.  */
+#else
+  0,				/* Leading underscore.  */
+#endif
+  '/',				/* Ar_pad_char.  */
+  15,				/* Ar_max_namelen.  */
+  0,				/* match priority.  */
+
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Data.  */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Hdrs.  */
+
+  /* Note that we allow an object file to be treated as a core file as well.  */
+  { _bfd_dummy_target, amd64coff_object_p, /* BFD_check_format.  */
+    bfd_generic_archive_p, amd64coff_object_p },
+  { bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format.  */
+    bfd_false },
+  { bfd_false, coff_write_object_contents, /* bfd_write_contents.  */
+   _bfd_write_archive_contents, bfd_false },
+
+  BFD_JUMP_TABLE_GENERIC (coff),
+  BFD_JUMP_TABLE_COPY (coff),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+  BFD_JUMP_TABLE_SYMBOLS (coff),
+  BFD_JUMP_TABLE_RELOCS (coff),
+  BFD_JUMP_TABLE_WRITE (coff),
+  BFD_JUMP_TABLE_LINK (coff),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  COFF_SWAP_TABLE
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-z80.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-z80.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-z80.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-z80.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,289 @@
+/* BFD back-end for Zilog Z80 COFF binaries.
+   Copyright 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+   Contributed by Arnold Metselaar <arnold_m@operamail.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify 
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "bfdlink.h"
+#include "coff/z80.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER 0
+
+static reloc_howto_type r_imm32 =
+HOWTO (R_IMM32, 0, 2, 32, FALSE, 0,
+       complain_overflow_dont, 0, "r_imm32", TRUE, 0xffffffff, 0xffffffff,
+       FALSE);
+
+static reloc_howto_type r_imm24 =
+HOWTO (R_IMM24, 0, 1, 24, FALSE, 0,
+       complain_overflow_dont, 0, "r_imm24", TRUE, 0x00ffffff, 0x00ffffff,
+       FALSE);
+
+static reloc_howto_type r_imm16 =
+HOWTO (R_IMM16, 0, 1, 16, FALSE, 0,
+       complain_overflow_dont, 0, "r_imm16", TRUE, 0x0000ffff, 0x0000ffff,
+       FALSE);
+
+static reloc_howto_type r_imm8 =
+HOWTO (R_IMM8, 0, 0, 8, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_imm8", TRUE, 0x000000ff, 0x000000ff,
+       FALSE);
+
+static reloc_howto_type r_jr =
+HOWTO (R_JR, 0, 0, 8, TRUE, 0, 
+       complain_overflow_signed, 0, "r_jr", FALSE, 0, 0xFF,
+       FALSE);
+
+static reloc_howto_type r_off8 =
+HOWTO (R_OFF8, 0, 0, 8, FALSE, 0, 
+       complain_overflow_signed, 0,"r_off8", FALSE, 0, 0xff,
+       FALSE);
+
+
+#define BADMAG(x) Z80BADMAG(x)
+#define Z80 1			/* Customize coffcode.h.  */
+#define __A_MAGIC_SET__
+
+/* Code to swap in the reloc.  */
+
+#define SWAP_IN_RELOC_OFFSET	H_GET_32
+#define SWAP_OUT_RELOC_OFFSET	H_PUT_32
+
+#define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) \
+  dst->r_stuff[0] = 'S'; \
+  dst->r_stuff[1] = 'C';
+
+/* Code to turn a r_type into a howto ptr, uses the above howto table.  */
+
+static void
+rtype2howto (arelent *internal, struct internal_reloc *dst)
+{
+  switch (dst->r_type)
+    {
+    default:
+      abort ();
+      break;
+    case R_IMM8:
+      internal->howto = &r_imm8;
+      break;
+    case R_IMM16:
+      internal->howto = &r_imm16;
+      break;
+    case R_IMM24:
+      internal->howto = &r_imm24;
+      break;
+    case R_IMM32:
+      internal->howto = &r_imm32;
+      break;
+    case R_JR:
+      internal->howto = &r_jr;
+      break;
+    case R_OFF8:
+      internal->howto = &r_off8;
+      break;
+    }
+}
+
+#define RTYPE2HOWTO(internal, relocentry) rtype2howto (internal, relocentry)
+
+static reloc_howto_type *
+coff_z80_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    bfd_reloc_code_real_type code)
+{
+  switch (code)
+    {
+    case BFD_RELOC_8:		return & r_imm8;
+    case BFD_RELOC_16:		return & r_imm16;
+    case BFD_RELOC_24:		return & r_imm24;
+    case BFD_RELOC_32:		return & r_imm32;
+    case BFD_RELOC_8_PCREL:	return & r_jr;
+    case BFD_RELOC_Z80_DISP8:	return & r_off8;
+    default:			BFD_FAIL ();
+      return NULL;
+    }
+}
+
+static reloc_howto_type *
+coff_z80_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    const char *r_name)
+{
+  if (strcasecmp (r_imm8.name, r_name) == 0)
+    return &r_imm8;
+  if (strcasecmp (r_imm16.name, r_name) == 0)
+    return &r_imm16;
+  if (strcasecmp (r_imm24.name, r_name) == 0)
+    return &r_imm24;
+  if (strcasecmp (r_imm32.name, r_name) == 0)
+    return &r_imm32;
+  if (strcasecmp (r_jr.name, r_name) == 0)
+    return &r_jr;
+  if (strcasecmp (r_off8.name, r_name) == 0)
+    return &r_off8;
+
+  return NULL;
+}
+
+/* Perform any necessary magic to the addend in a reloc entry.  */
+
+#define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \
+ cache_ptr->addend =  ext_reloc.r_offset;
+
+#define RELOC_PROCESSING(relent,reloc,symbols,abfd,section) \
+ reloc_processing(relent, reloc, symbols, abfd, section)
+
+static void
+reloc_processing (arelent *relent,
+                  struct internal_reloc *reloc,
+                  asymbol **symbols,
+                  bfd *abfd,
+                  asection *section)
+{
+  relent->address = reloc->r_vaddr;
+  rtype2howto (relent, reloc);
+
+  if (reloc->r_symndx > 0)
+    relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
+  else
+    relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+
+  relent->addend = reloc->r_offset;
+  relent->address -= section->vma;
+}
+
+static void
+extra_case (bfd *in_abfd,
+            struct bfd_link_info *link_info,
+            struct bfd_link_order *link_order,
+            arelent *reloc,
+            bfd_byte *data,
+            unsigned int *src_ptr,
+            unsigned int *dst_ptr)
+{
+  asection * input_section = link_order->u.indirect.section;
+  int val;
+
+  switch (reloc->howto->type)
+    {
+    case R_OFF8:
+	val = bfd_coff_reloc16_get_value (reloc, link_info,
+					   input_section);
+	if (val>127 || val<-128) /* Test for overflow.  */
+	  {
+	    if (! ((*link_info->callbacks->reloc_overflow)
+		   (link_info, NULL,
+		    bfd_asymbol_name (*reloc->sym_ptr_ptr),
+		    reloc->howto->name, reloc->addend, input_section->owner,
+		    input_section, reloc->address)))
+	      abort ();
+	  }
+	bfd_put_8 (in_abfd, val, data + *dst_ptr);
+	(*dst_ptr) += 1;
+	(*src_ptr) += 1;
+      break;
+
+    case R_IMM8:
+      val = bfd_get_8 ( in_abfd, data+*src_ptr)
+	+ bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+      bfd_put_8 (in_abfd, val, data + *dst_ptr);
+      (*dst_ptr) += 1;
+      (*src_ptr) += 1;
+      break;
+
+    case R_IMM16:
+      val = bfd_get_16 ( in_abfd, data+*src_ptr)
+	+ bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+      bfd_put_16 (in_abfd, val, data + *dst_ptr);
+      (*dst_ptr) += 2;
+      (*src_ptr) += 2;
+      break;
+
+    case R_IMM24:
+      val = bfd_get_16 ( in_abfd, data+*src_ptr)
+	+ (bfd_get_8 ( in_abfd, data+*src_ptr+2) << 16)
+	+ bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+      bfd_put_16 (in_abfd, val, data + *dst_ptr);
+      bfd_put_8 (in_abfd, val >> 16, data + *dst_ptr+2);
+      (*dst_ptr) += 3;
+      (*src_ptr) += 3;
+      break;
+
+    case R_IMM32:
+      val = bfd_get_32 ( in_abfd, data+*src_ptr)
+	+ bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+      bfd_put_32 (in_abfd, val, data + *dst_ptr);
+      (*dst_ptr) += 4;
+      (*src_ptr) += 4;
+      break;
+
+    case R_JR:
+      {
+	bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
+						  input_section);
+	bfd_vma dot = (*dst_ptr
+		       + input_section->output_offset
+		       + input_section->output_section->vma);
+	int gap = dst - dot - 1;  /* -1, Since the offset is relative
+				     to the value of PC after reading
+				     the offset.  */
+
+	if (gap >= 128 || gap < -128)
+	  {
+	    if (! ((*link_info->callbacks->reloc_overflow)
+		   (link_info, NULL,
+		    bfd_asymbol_name (*reloc->sym_ptr_ptr),
+		    reloc->howto->name, reloc->addend, input_section->owner,
+		    input_section, reloc->address)))
+	      abort ();
+	  }
+	bfd_put_8 (in_abfd, gap, data + *dst_ptr);
+	(*dst_ptr)++;
+	(*src_ptr)++;
+	break;
+      }
+
+    default:
+      abort ();
+    }
+}
+
+#define coff_reloc16_extra_cases    extra_case
+#define coff_bfd_reloc_type_lookup  coff_z80_reloc_type_lookup
+#define coff_bfd_reloc_name_lookup coff_z80_reloc_name_lookup
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coffcode.h"
+
+#undef  coff_bfd_get_relocated_section_contents
+#define coff_bfd_get_relocated_section_contents \
+  bfd_coff_reloc16_get_relocated_section_contents
+
+#undef  coff_bfd_relax_section
+#define coff_bfd_relax_section bfd_coff_reloc16_relax_section
+
+CREATE_LITTLE_COFF_TARGET_VEC (z80coff_vec, "coff-z80", 0,
+			       SEC_CODE | SEC_DATA, '\0', NULL, 
+			       COFF_SWAP_TABLE)
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-z8k.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-z8k.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff-z8k.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff-z8k.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,388 @@
+/* BFD back-end for Zilog Z800n COFF binaries.
+   Copyright 1992, 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2007, 2008  Free Software Foundation, Inc.
+   Contributed by Cygnus Support.
+   Written by Steve Chamberlain, <sac@cygnus.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "bfdlink.h"
+#include "coff/z8k.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (1)
+
+static reloc_howto_type r_imm32 =
+HOWTO (R_IMM32, 0, 2, 32, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_imm32", TRUE, 0xffffffff,
+       0xffffffff, FALSE);
+
+static reloc_howto_type r_imm4l =
+HOWTO (R_IMM4L, 0, 0, 4, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_imm4l", TRUE, 0xf, 0xf, FALSE);
+
+static reloc_howto_type r_da =
+HOWTO (R_IMM16, 0, 1, 16, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_da", TRUE, 0x0000ffff, 0x0000ffff,
+       FALSE);
+
+static reloc_howto_type r_imm8 =
+HOWTO (R_IMM8, 0, 0, 8, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_imm8", TRUE, 0x000000ff, 0x000000ff,
+       FALSE);
+
+static reloc_howto_type r_rel16 =
+HOWTO (R_REL16, 0, 1, 16, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_rel16", TRUE, 0x0000ffff, 0x0000ffff,
+       TRUE);
+
+static reloc_howto_type r_jr =
+HOWTO (R_JR, 1, 0, 8, TRUE, 0, complain_overflow_signed, 0,
+       "r_jr", TRUE, 0xff, 0xff, TRUE);
+
+static reloc_howto_type r_disp7 =
+HOWTO (R_DISP7, 0, 0, 7, TRUE, 0, complain_overflow_bitfield, 0,
+       "r_disp7", TRUE, 0x7f, 0x7f, TRUE);
+
+static reloc_howto_type r_callr =
+HOWTO (R_CALLR, 1, 1, 12, TRUE, 0, complain_overflow_signed, 0,
+       "r_callr", TRUE, 0xfff, 0xfff, TRUE);
+
+#define BADMAG(x) Z8KBADMAG(x)
+#define Z8K 1			/* Customize coffcode.h.  */
+#define __A_MAGIC_SET__
+
+/* Code to swap in the reloc.  */
+#define SWAP_IN_RELOC_OFFSET	H_GET_32
+#define SWAP_OUT_RELOC_OFFSET	H_PUT_32
+#define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) \
+  dst->r_stuff[0] = 'S'; \
+  dst->r_stuff[1] = 'C';
+
+/* Code to turn a r_type into a howto ptr, uses the above howto table.  */
+
+static void
+rtype2howto (arelent *internal, struct internal_reloc *dst)
+{
+  switch (dst->r_type)
+    {
+    default:
+      abort ();
+      break;
+    case R_IMM8:
+      internal->howto = &r_imm8;
+      break;
+     case R_IMM16:
+      internal->howto = &r_da;
+      break;
+    case R_JR:
+      internal->howto = &r_jr;
+      break;
+    case R_DISP7:
+      internal->howto = &r_disp7;
+      break;
+    case R_CALLR:
+      internal->howto = &r_callr;
+      break;
+    case R_REL16:
+      internal->howto = &r_rel16;
+      break;
+    case R_IMM32:
+      internal->howto = &r_imm32;
+      break;
+    case R_IMM4L:
+      internal->howto = &r_imm4l;
+      break;
+    }
+}
+
+#define RTYPE2HOWTO(internal, relocentry) rtype2howto (internal, relocentry)
+
+static reloc_howto_type *
+coff_z8k_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                            bfd_reloc_code_real_type code)
+{
+  switch (code)
+    {
+    case BFD_RELOC_8:      	return & r_imm8;
+    case BFD_RELOC_16:      	return & r_da;
+    case BFD_RELOC_32:      	return & r_imm32;
+    case BFD_RELOC_8_PCREL:     return & r_jr;
+    case BFD_RELOC_16_PCREL:    return & r_rel16;
+    case BFD_RELOC_Z8K_DISP7:   return & r_disp7;
+    case BFD_RELOC_Z8K_CALLR:   return & r_callr;
+    case BFD_RELOC_Z8K_IMM4L:   return & r_imm4l;
+    default:			BFD_FAIL ();
+      return 0;
+    }
+}
+
+static reloc_howto_type *
+coff_z8k_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    const char *r_name)
+{
+  if (strcasecmp (r_imm8.name, r_name) == 0)
+    return &r_imm8;
+  if (strcasecmp (r_da.name, r_name) == 0)
+    return &r_da;
+  if (strcasecmp (r_imm32.name, r_name) == 0)
+    return &r_imm32;
+  if (strcasecmp (r_jr.name, r_name) == 0)
+    return &r_jr;
+  if (strcasecmp (r_rel16.name, r_name) == 0)
+    return &r_rel16;
+  if (strcasecmp (r_disp7.name, r_name) == 0)
+    return &r_disp7;
+  if (strcasecmp (r_callr.name, r_name) == 0)
+    return &r_callr;
+  if (strcasecmp (r_imm4l.name, r_name) == 0)
+    return &r_imm4l;
+
+  return NULL;
+}
+
+/* Perform any necessary magic to the addend in a reloc entry.  */
+
+#define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \
+ cache_ptr->addend =  ext_reloc.r_offset;
+
+#define RELOC_PROCESSING(relent,reloc,symbols,abfd,section) \
+ reloc_processing(relent, reloc, symbols, abfd, section)
+
+static void
+reloc_processing (arelent *relent,
+                  struct internal_reloc *reloc,
+                  asymbol **symbols,
+                  bfd *abfd,
+                  asection *section)
+{
+  relent->address = reloc->r_vaddr;
+  rtype2howto (relent, reloc);
+
+  if (reloc->r_symndx > 0)
+    relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
+  else
+    relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+
+  relent->addend = reloc->r_offset;
+  relent->address -= section->vma;
+}
+
+static void
+extra_case (bfd *in_abfd,
+            struct bfd_link_info *link_info,
+            struct bfd_link_order *link_order,
+            arelent *reloc,
+            bfd_byte *data,
+            unsigned int *src_ptr,
+            unsigned int *dst_ptr)
+{
+  asection * input_section = link_order->u.indirect.section;
+
+  switch (reloc->howto->type)
+    {
+    case R_IMM8:
+      bfd_put_8 (in_abfd,
+		 bfd_coff_reloc16_get_value (reloc, link_info, input_section),
+		 data + *dst_ptr);
+      (*dst_ptr) += 1;
+      (*src_ptr) += 1;
+      break;
+
+    case R_IMM32:
+      /* If no flags are set, assume immediate value.  */
+      if (! (*reloc->sym_ptr_ptr)->section->flags)
+	{
+	  bfd_put_32 (in_abfd,
+		      bfd_coff_reloc16_get_value (reloc, link_info,
+						  input_section),
+		      data + *dst_ptr);
+	}
+      else
+	{
+	  bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
+						    input_section);
+	  /* Addresses are 23 bit, and the layout of those in a 32-bit
+	     value is as follows:
+	       1AAAAAAA xxxxxxxx AAAAAAAA AAAAAAAA
+	     (A - address bits,  x - ignore).  */
+	  dst = (dst & 0xffff) | ((dst & 0xff0000) << 8) | 0x80000000;
+	  bfd_put_32 (in_abfd, dst, data + *dst_ptr);
+	}
+      (*dst_ptr) += 4;
+      (*src_ptr) += 4;
+      break;
+
+    case R_IMM4L:
+      bfd_put_8 (in_abfd,
+		 ((bfd_get_8 (in_abfd, data + *dst_ptr) & 0xf0)
+		  | (0x0f
+		     & bfd_coff_reloc16_get_value (reloc, link_info,
+						   input_section))),
+		 data + *dst_ptr);
+      (*dst_ptr) += 1;
+      (*src_ptr) += 1;
+      break;
+
+    case R_IMM16:
+      bfd_put_16 (in_abfd,
+		  bfd_coff_reloc16_get_value (reloc, link_info, input_section),
+		  data + *dst_ptr);
+      (*dst_ptr) += 2;
+      (*src_ptr) += 2;
+      break;
+
+    case R_JR:
+      {
+	bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
+						  input_section);
+	bfd_vma dot = (*dst_ptr
+		       + input_section->output_offset
+		       + input_section->output_section->vma);
+	int gap = dst - dot - 1;  /* -1, since we're in the odd byte of the
+                                     word and the pc's been incremented.  */
+
+	if (gap & 1)
+	  abort ();
+	gap /= 2;
+	if (gap > 128 || gap < -128)
+	  {
+	    if (! ((*link_info->callbacks->reloc_overflow)
+		   (link_info, NULL,
+		    bfd_asymbol_name (*reloc->sym_ptr_ptr),
+		    reloc->howto->name, reloc->addend, input_section->owner,
+		    input_section, reloc->address)))
+	      abort ();
+	  }
+	bfd_put_8 (in_abfd, gap, data + *dst_ptr);
+	(*dst_ptr)++;
+	(*src_ptr)++;
+	break;
+      }
+
+    case R_DISP7:
+      {
+	bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
+						  input_section);
+	bfd_vma dot = (*dst_ptr
+		       + input_section->output_offset
+		       + input_section->output_section->vma);
+	int gap = dst - dot - 1;  /* -1, since we're in the odd byte of the
+                                     word and the pc's been incremented.  */
+
+	if (gap & 1)
+	  abort ();
+	gap /= 2;
+
+	if (gap > 0 || gap < -127)
+	  {
+	    if (! ((*link_info->callbacks->reloc_overflow)
+		   (link_info, NULL,
+		    bfd_asymbol_name (*reloc->sym_ptr_ptr),
+		    reloc->howto->name, reloc->addend, input_section->owner,
+		    input_section, reloc->address)))
+	      abort ();
+	  }
+	bfd_put_8 (in_abfd,
+                   (bfd_get_8 ( in_abfd, data + *dst_ptr) & 0x80) + (-gap & 0x7f),
+                   data + *dst_ptr);
+	(*dst_ptr)++;
+	(*src_ptr)++;
+	break;
+      }
+
+    case R_CALLR:
+      {
+	bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
+						  input_section);
+	bfd_vma dot = (*dst_ptr
+		       + input_section->output_offset
+		       + input_section->output_section->vma);
+	int gap = dst - dot - 2;
+
+	if (gap & 1)
+	  abort ();
+	if (gap > 4096 || gap < -4095)
+	  {
+	    if (! ((*link_info->callbacks->reloc_overflow)
+		   (link_info, NULL,
+		    bfd_asymbol_name (*reloc->sym_ptr_ptr),
+		    reloc->howto->name, reloc->addend, input_section->owner,
+		    input_section, reloc->address)))
+	      abort ();
+	  }
+	gap /= 2;
+	bfd_put_16 (in_abfd,
+                    (bfd_get_16 ( in_abfd, data + *dst_ptr) & 0xf000) | (-gap & 0x0fff),
+                    data + *dst_ptr);
+	(*dst_ptr) += 2;
+	(*src_ptr) += 2;
+	break;
+      }
+
+    case R_REL16:
+      {
+	bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
+						  input_section);
+	bfd_vma dot = (*dst_ptr
+		       + input_section->output_offset
+		       + input_section->output_section->vma);
+	int gap = dst - dot - 2;
+
+	if (gap > 32767 || gap < -32768)
+	  {
+	    if (! ((*link_info->callbacks->reloc_overflow)
+		   (link_info, NULL,
+		    bfd_asymbol_name (*reloc->sym_ptr_ptr),
+		    reloc->howto->name, reloc->addend, input_section->owner,
+		    input_section, reloc->address)))
+	      abort ();
+	  }
+	bfd_put_16 (in_abfd, (bfd_vma) gap, data + *dst_ptr);
+	(*dst_ptr) += 2;
+	(*src_ptr) += 2;
+	break;
+      }
+
+    default:
+      abort ();
+    }
+}
+
+#define coff_reloc16_extra_cases    extra_case
+#define coff_bfd_reloc_type_lookup  coff_z8k_reloc_type_lookup
+#define coff_bfd_reloc_name_lookup coff_z8k_reloc_name_lookup
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coffcode.h"
+
+#undef  coff_bfd_get_relocated_section_contents
+#define coff_bfd_get_relocated_section_contents \
+  bfd_coff_reloc16_get_relocated_section_contents
+
+#undef  coff_bfd_relax_section
+#define coff_bfd_relax_section bfd_coff_reloc16_relax_section
+
+CREATE_BIG_COFF_TARGET_VEC (z8kcoff_vec, "coff-z8k", 0, 0, '_', NULL, COFF_SWAP_TABLE)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff64-rs6000.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff64-rs6000.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coff64-rs6000.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coff64-rs6000.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3016 @@
+/* BFD back-end for IBM RS/6000 "XCOFF64" files.
+   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+   2010, 2011
+   Free Software Foundation, Inc.
+   Written Clinton Popetz.
+   Contributed by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "coff/internal.h"
+#include "coff/xcoff.h"
+#include "coff/rs6k64.h"
+#include "libcoff.h"
+#include "libxcoff.h"
+
+#define GET_FILEHDR_SYMPTR H_GET_64
+#define PUT_FILEHDR_SYMPTR H_PUT_64
+#define GET_AOUTHDR_DATA_START H_GET_64
+#define PUT_AOUTHDR_DATA_START H_PUT_64
+#define GET_AOUTHDR_TEXT_START H_GET_64
+#define PUT_AOUTHDR_TEXT_START H_PUT_64
+#define GET_AOUTHDR_TSIZE H_GET_64
+#define PUT_AOUTHDR_TSIZE H_PUT_64
+#define GET_AOUTHDR_DSIZE H_GET_64
+#define PUT_AOUTHDR_DSIZE H_PUT_64
+#define GET_AOUTHDR_BSIZE H_GET_64
+#define PUT_AOUTHDR_BSIZE H_PUT_64
+#define GET_AOUTHDR_ENTRY H_GET_64
+#define PUT_AOUTHDR_ENTRY H_PUT_64
+#define GET_SCNHDR_PADDR H_GET_64
+#define PUT_SCNHDR_PADDR H_PUT_64
+#define GET_SCNHDR_VADDR H_GET_64
+#define PUT_SCNHDR_VADDR H_PUT_64
+#define GET_SCNHDR_SIZE H_GET_64
+#define PUT_SCNHDR_SIZE H_PUT_64
+#define GET_SCNHDR_SCNPTR H_GET_64
+#define PUT_SCNHDR_SCNPTR H_PUT_64
+#define GET_SCNHDR_RELPTR H_GET_64
+#define PUT_SCNHDR_RELPTR H_PUT_64
+#define GET_SCNHDR_LNNOPTR H_GET_64
+#define PUT_SCNHDR_LNNOPTR H_PUT_64
+#define GET_SCNHDR_NRELOC H_GET_32
+#define MAX_SCNHDR_NRELOC 0xffffffff
+#define PUT_SCNHDR_NRELOC H_PUT_32
+#define GET_SCNHDR_NLNNO H_GET_32
+#define MAX_SCNHDR_NLNNO 0xffffffff
+#define PUT_SCNHDR_NLNNO H_PUT_32
+#define GET_RELOC_VADDR H_GET_64
+#define PUT_RELOC_VADDR H_PUT_64
+
+#define COFF_FORCE_SYMBOLS_IN_STRINGS
+#define COFF_DEBUG_STRING_WIDE_PREFIX
+
+
+#define COFF_ADJUST_SCNHDR_OUT_POST(ABFD, INT, EXT)			\
+  do									\
+    {									\
+      memset (((SCNHDR *) EXT)->s_pad, 0,				\
+	      sizeof (((SCNHDR *) EXT)->s_pad));			\
+    }									\
+  while (0)
+
+#define NO_COFF_LINENOS
+
+#define coff_SWAP_lineno_in _bfd_xcoff64_swap_lineno_in
+#define coff_SWAP_lineno_out _bfd_xcoff64_swap_lineno_out
+
+static void _bfd_xcoff64_swap_lineno_in
+  (bfd *, void *, void *);
+static unsigned int _bfd_xcoff64_swap_lineno_out
+  (bfd *, void *, void *);
+static bfd_boolean _bfd_xcoff64_put_symbol_name
+  (bfd *, struct bfd_strtab_hash *, struct internal_syment *, const char *);
+static bfd_boolean _bfd_xcoff64_put_ldsymbol_name
+  (bfd *, struct xcoff_loader_info *, struct internal_ldsym *, const char *);
+static void _bfd_xcoff64_swap_sym_in
+  (bfd *, void *, void *);
+static unsigned int _bfd_xcoff64_swap_sym_out
+  (bfd *, void *, void *);
+static void _bfd_xcoff64_swap_aux_in
+  (bfd *, void *, int, int, int, int, void *);
+static unsigned int _bfd_xcoff64_swap_aux_out
+  (bfd *, void *, int, int, int, int, void *);
+static void xcoff64_swap_reloc_in
+  (bfd *, void *, void *);
+static unsigned int xcoff64_swap_reloc_out
+  (bfd *, void *, void *);
+extern bfd_boolean _bfd_xcoff_mkobject
+  (bfd *);
+extern bfd_boolean _bfd_xcoff_copy_private_bfd_data
+  (bfd *, bfd *);
+extern bfd_boolean _bfd_xcoff_is_local_label_name
+  (bfd *, const char *);
+extern void xcoff64_rtype2howto
+  (arelent *, struct internal_reloc *);
+extern reloc_howto_type * xcoff64_reloc_type_lookup
+  (bfd *, bfd_reloc_code_real_type);
+extern bfd_boolean _bfd_xcoff_slurp_armap
+  (bfd *);
+extern void *_bfd_xcoff_read_ar_hdr
+  (bfd *);
+extern bfd *_bfd_xcoff_openr_next_archived_file
+  (bfd *, bfd *);
+extern int _bfd_xcoff_stat_arch_elt
+  (bfd *, struct stat *);
+extern bfd_boolean _bfd_xcoff_write_armap
+  (bfd *, unsigned int, struct orl *, unsigned int, int);
+extern bfd_boolean _bfd_xcoff_write_archive_contents
+  (bfd *);
+extern int _bfd_xcoff_sizeof_headers
+  (bfd *, struct bfd_link_info *);
+extern void _bfd_xcoff_swap_sym_in
+  (bfd *, void *, void *);
+extern unsigned int _bfd_xcoff_swap_sym_out
+  (bfd *, void *, void *);
+extern void _bfd_xcoff_swap_aux_in
+  (bfd *, void *, int, int, int, int, void *);
+extern unsigned int _bfd_xcoff_swap_aux_out
+  (bfd *, void *, int, int, int, int, void *);
+static void xcoff64_swap_ldhdr_in
+  (bfd *, const void *, struct internal_ldhdr *);
+static void xcoff64_swap_ldhdr_out
+  (bfd *, const struct internal_ldhdr *, void *d);
+static void xcoff64_swap_ldsym_in
+  (bfd *, const void *, struct internal_ldsym *);
+static void xcoff64_swap_ldsym_out
+  (bfd *, const struct internal_ldsym *, void *d);
+static void xcoff64_swap_ldrel_in
+  (bfd *, const void *, struct internal_ldrel *);
+static void xcoff64_swap_ldrel_out
+  (bfd *, const struct internal_ldrel *, void *d);
+static bfd_boolean xcoff64_write_object_contents
+  (bfd *);
+static bfd_boolean xcoff64_ppc_relocate_section
+  (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+   struct internal_reloc *, struct internal_syment *,
+   asection **);
+static bfd_boolean xcoff64_slurp_armap
+  (bfd *);
+static const bfd_target *xcoff64_archive_p
+  (bfd *);
+static bfd *xcoff64_openr_next_archived_file
+  (bfd *, bfd *);
+static int xcoff64_sizeof_headers
+  (bfd *, struct bfd_link_info *);
+static asection *xcoff64_create_csect_from_smclas
+  (bfd *, union internal_auxent *, const char *);
+static bfd_boolean xcoff64_is_lineno_count_overflow
+  (bfd *, bfd_vma);
+static bfd_boolean xcoff64_is_reloc_count_overflow
+  (bfd *, bfd_vma);
+static bfd_vma xcoff64_loader_symbol_offset
+  (bfd *, struct internal_ldhdr *);
+static bfd_vma xcoff64_loader_reloc_offset
+  (bfd *, struct internal_ldhdr *);
+static bfd_boolean xcoff64_generate_rtinit
+  (bfd *, const char *, const char *, bfd_boolean);
+static bfd_boolean xcoff64_bad_format_hook
+  (bfd *, void *);
+
+/* Relocation functions */
+static bfd_boolean xcoff64_reloc_type_br
+  (XCOFF_RELOC_FUNCTION_ARGS);
+
+bfd_boolean (*xcoff64_calculate_relocation[XCOFF_MAX_CALCULATE_RELOCATION])
+  (XCOFF_RELOC_FUNCTION_ARGS) =
+{
+  xcoff_reloc_type_pos,	 /* R_POS   (0x00) */
+  xcoff_reloc_type_neg,	 /* R_NEG   (0x01) */
+  xcoff_reloc_type_rel,	 /* R_REL   (0x02) */
+  xcoff_reloc_type_toc,	 /* R_TOC   (0x03) */
+  xcoff_reloc_type_fail, /* R_RTB   (0x04) */
+  xcoff_reloc_type_toc,	 /* R_GL    (0x05) */
+  xcoff_reloc_type_toc,	 /* R_TCL   (0x06) */
+  xcoff_reloc_type_fail, /*	    (0x07) */
+  xcoff_reloc_type_ba,	 /* R_BA    (0x08) */
+  xcoff_reloc_type_fail, /*	    (0x09) */
+  xcoff64_reloc_type_br, /* R_BR    (0x0a) */
+  xcoff_reloc_type_fail, /*	    (0x0b) */
+  xcoff_reloc_type_pos,	 /* R_RL    (0x0c) */
+  xcoff_reloc_type_pos,	 /* R_RLA   (0x0d) */
+  xcoff_reloc_type_fail, /*	    (0x0e) */
+  xcoff_reloc_type_noop, /* R_REF   (0x0f) */
+  xcoff_reloc_type_fail, /*	    (0x10) */
+  xcoff_reloc_type_fail, /*	    (0x11) */
+  xcoff_reloc_type_toc,	 /* R_TRL   (0x12) */
+  xcoff_reloc_type_toc,	 /* R_TRLA  (0x13) */
+  xcoff_reloc_type_fail, /* R_RRTBI (0x14) */
+  xcoff_reloc_type_fail, /* R_RRTBA (0x15) */
+  xcoff_reloc_type_ba,	 /* R_CAI   (0x16) */
+  xcoff_reloc_type_crel, /* R_CREL  (0x17) */
+  xcoff_reloc_type_ba,	 /* R_RBA   (0x18) */
+  xcoff_reloc_type_ba,	 /* R_RBAC  (0x19) */
+  xcoff64_reloc_type_br, /* R_RBR   (0x1a) */
+  xcoff_reloc_type_ba,	 /* R_RBRC  (0x1b) */
+};
+
+/* coffcode.h needs these to be defined.  */
+/* Internalcoff.h and coffcode.h modify themselves based on these flags.  */
+#define XCOFF64
+#define RS6000COFF_C 1
+
+#define SELECT_RELOC(internal, howto)					\
+  {									\
+    internal.r_type = howto->type;					\
+    internal.r_size =							\
+      ((howto->complain_on_overflow == complain_overflow_signed		\
+	? 0x80								\
+	: 0)								\
+       | (howto->bitsize - 1));						\
+  }
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
+#define COFF_LONG_FILENAMES
+#define NO_COFF_SYMBOLS
+#define RTYPE2HOWTO(cache_ptr, dst) xcoff64_rtype2howto (cache_ptr, dst)
+#define coff_mkobject _bfd_xcoff_mkobject
+#define coff_bfd_copy_private_bfd_data _bfd_xcoff_copy_private_bfd_data
+#define coff_bfd_is_local_label_name _bfd_xcoff_is_local_label_name
+#define coff_bfd_reloc_type_lookup xcoff64_reloc_type_lookup
+#define coff_bfd_reloc_name_lookup xcoff64_reloc_name_lookup
+#ifdef AIX_CORE
+extern const bfd_target * rs6000coff_core_p
+  (bfd *abfd);
+extern bfd_boolean rs6000coff_core_file_matches_executable_p
+  (bfd *cbfd, bfd *ebfd);
+extern char *rs6000coff_core_file_failing_command
+  (bfd *abfd);
+extern int rs6000coff_core_file_failing_signal
+  (bfd *abfd);
+#define CORE_FILE_P rs6000coff_core_p
+#define coff_core_file_failing_command \
+  rs6000coff_core_file_failing_command
+#define coff_core_file_failing_signal \
+  rs6000coff_core_file_failing_signal
+#define coff_core_file_matches_executable_p \
+  rs6000coff_core_file_matches_executable_p
+#define coff_core_file_pid \
+  _bfd_nocore_core_file_pid
+#else
+#define CORE_FILE_P _bfd_dummy_target
+#define coff_core_file_failing_command \
+  _bfd_nocore_core_file_failing_command
+#define coff_core_file_failing_signal \
+  _bfd_nocore_core_file_failing_signal
+#define coff_core_file_matches_executable_p \
+  _bfd_nocore_core_file_matches_executable_p
+#define coff_core_file_pid \
+  _bfd_nocore_core_file_pid
+#endif
+#define coff_SWAP_sym_in _bfd_xcoff64_swap_sym_in
+#define coff_SWAP_sym_out _bfd_xcoff64_swap_sym_out
+#define coff_SWAP_aux_in _bfd_xcoff64_swap_aux_in
+#define coff_SWAP_aux_out _bfd_xcoff64_swap_aux_out
+#define coff_swap_reloc_in xcoff64_swap_reloc_in
+#define coff_swap_reloc_out xcoff64_swap_reloc_out
+#define NO_COFF_RELOCS
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coffcode.h"
+
+/* For XCOFF64, the effective width of symndx changes depending on
+   whether we are the first entry.  Sigh.  */
+static void
+_bfd_xcoff64_swap_lineno_in (bfd *abfd, void *ext1, void *in1)
+{
+  LINENO *ext = (LINENO *) ext1;
+  struct internal_lineno *in = (struct internal_lineno *) in1;
+
+  in->l_lnno = H_GET_32 (abfd, (ext->l_lnno));
+  if (in->l_lnno == 0)
+    in->l_addr.l_symndx = H_GET_32 (abfd, ext->l_addr.l_symndx);
+  else
+    in->l_addr.l_paddr = H_GET_64 (abfd, ext->l_addr.l_paddr);
+}
+
+static unsigned int
+_bfd_xcoff64_swap_lineno_out (bfd *abfd, void *inp, void *outp)
+{
+  struct internal_lineno *in = (struct internal_lineno *) inp;
+  struct external_lineno *ext = (struct external_lineno *) outp;
+
+  H_PUT_32 (abfd, in->l_addr.l_symndx, ext->l_addr.l_symndx);
+  H_PUT_32 (abfd, in->l_lnno, (ext->l_lnno));
+
+  if (in->l_lnno == 0)
+    H_PUT_32 (abfd, in->l_addr.l_symndx, ext->l_addr.l_symndx);
+  else
+    H_PUT_64 (abfd, in->l_addr.l_paddr, ext->l_addr.l_paddr);
+
+  return bfd_coff_linesz (abfd);
+}
+
+static void
+_bfd_xcoff64_swap_sym_in (bfd *abfd, void *ext1, void *in1)
+{
+  struct external_syment *ext = (struct external_syment *) ext1;
+  struct internal_syment *in = (struct internal_syment *) in1;
+
+  in->_n._n_n._n_zeroes = 0;
+  in->_n._n_n._n_offset = H_GET_32 (abfd, ext->e_offset);
+  in->n_value = H_GET_64 (abfd, ext->e_value);
+  in->n_scnum = H_GET_16 (abfd, ext->e_scnum);
+  in->n_type = H_GET_16 (abfd, ext->e_type);
+  in->n_sclass = H_GET_8 (abfd, ext->e_sclass);
+  in->n_numaux = H_GET_8 (abfd, ext->e_numaux);
+}
+
+static unsigned int
+_bfd_xcoff64_swap_sym_out (bfd *abfd, void *inp, void *extp)
+{
+  struct internal_syment *in = (struct internal_syment *) inp;
+  struct external_syment *ext = (struct external_syment *) extp;
+
+  H_PUT_32 (abfd, in->_n._n_n._n_offset, ext->e_offset);
+  H_PUT_64 (abfd, in->n_value, ext->e_value);
+  H_PUT_16 (abfd, in->n_scnum, ext->e_scnum);
+  H_PUT_16 (abfd, in->n_type, ext->e_type);
+  H_PUT_8 (abfd, in->n_sclass, ext->e_sclass);
+  H_PUT_8 (abfd, in->n_numaux, ext->e_numaux);
+  return bfd_coff_symesz (abfd);
+}
+
+static void
+_bfd_xcoff64_swap_aux_in (bfd *abfd, void *ext1, int type, int in_class,
+                          int indx, int numaux, void *in1)
+{
+  union external_auxent *ext = (union external_auxent *) ext1;
+  union internal_auxent *in = (union internal_auxent *) in1;
+
+  switch (in_class)
+    {
+    case C_FILE:
+      if (ext->x_file.x_n.x_n.x_zeroes[0] == 0)
+	{
+	  in->x_file.x_n.x_zeroes = 0;
+	  in->x_file.x_n.x_offset =
+            H_GET_32 (abfd, ext->x_file.x_n.x_n.x_offset);
+	}
+      else
+	{
+	  memcpy (in->x_file.x_fname, ext->x_file.x_n.x_fname, FILNMLEN);
+	}
+      goto end;
+
+      /* RS/6000 "csect" auxents */
+    case C_EXT:
+    case C_AIX_WEAKEXT:
+    case C_HIDEXT:
+      if (indx + 1 == numaux)
+	{
+	  bfd_signed_vma h = 0;
+	  bfd_vma l = 0;
+
+	  h = H_GET_S32 (abfd, ext->x_csect.x_scnlen_hi);
+	  l = H_GET_32 (abfd, ext->x_csect.x_scnlen_lo);
+
+	  in->x_csect.x_scnlen.l = h << 32 | (l & 0xffffffff);
+
+	  in->x_csect.x_parmhash = H_GET_32 (abfd, ext->x_csect.x_parmhash);
+	  in->x_csect.x_snhash = H_GET_16 (abfd, ext->x_csect.x_snhash);
+	  /* We don't have to hack bitfields in x_smtyp because it's
+	     defined by shifts-and-ands, which are equivalent on all
+	     byte orders.  */
+	  in->x_csect.x_smtyp = H_GET_8 (abfd, ext->x_csect.x_smtyp);
+	  in->x_csect.x_smclas = H_GET_8 (abfd, ext->x_csect.x_smclas);
+	  goto end;
+	}
+      break;
+
+    case C_STAT:
+    case C_LEAFSTAT:
+    case C_HIDDEN:
+      if (type == T_NULL)
+	{
+	  /* PE defines some extra fields; we zero them out for
+	     safety.  */
+	  in->x_scn.x_checksum = 0;
+	  in->x_scn.x_associated = 0;
+	  in->x_scn.x_comdat = 0;
+
+	  goto end;
+	}
+      break;
+    }
+
+  if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
+      || ISTAG (in_class))
+    {
+      in->x_sym.x_fcnary.x_fcn.x_lnnoptr
+	= H_GET_64 (abfd, ext->x_sym.x_fcnary.x_fcn.x_lnnoptr);
+      in->x_sym.x_fcnary.x_fcn.x_endndx.l
+	= H_GET_32 (abfd, ext->x_sym.x_fcnary.x_fcn.x_endndx);
+    }
+  if (ISFCN (type))
+    {
+      in->x_sym.x_misc.x_fsize
+	= H_GET_32 (abfd, ext->x_sym.x_fcnary.x_fcn.x_fsize);
+    }
+  else
+    {
+      in->x_sym.x_misc.x_lnsz.x_lnno
+	= H_GET_32 (abfd, ext->x_sym.x_fcnary.x_lnsz.x_lnno);
+      in->x_sym.x_misc.x_lnsz.x_size
+	= H_GET_16 (abfd, ext->x_sym.x_fcnary.x_lnsz.x_size);
+    }
+
+ end: ;
+}
+
+static unsigned int
+_bfd_xcoff64_swap_aux_out (bfd *abfd, void *inp, int type, int in_class,
+                           int indx ATTRIBUTE_UNUSED,
+                           int numaux ATTRIBUTE_UNUSED,
+                           void *extp)
+{
+  union internal_auxent *in = (union internal_auxent *) inp;
+  union external_auxent *ext = (union external_auxent *) extp;
+
+  memset (ext, 0, bfd_coff_auxesz (abfd));
+  switch (in_class)
+    {
+    case C_FILE:
+      if (in->x_file.x_n.x_zeroes == 0)
+	{
+	  H_PUT_32 (abfd, 0, ext->x_file.x_n.x_n.x_zeroes);
+	  H_PUT_32 (abfd, in->x_file.x_n.x_offset,
+                    ext->x_file.x_n.x_n.x_offset);
+	}
+      else
+	{
+	  memcpy (ext->x_file.x_n.x_fname, in->x_file.x_fname, FILNMLEN);
+	}
+      H_PUT_8 (abfd, _AUX_FILE, ext->x_auxtype.x_auxtype);
+      goto end;
+
+      /* RS/6000 "csect" auxents */
+    case C_EXT:
+    case C_AIX_WEAKEXT:
+    case C_HIDEXT:
+      if (indx + 1 == numaux)
+	{
+	  bfd_vma temp;
+
+	  temp = in->x_csect.x_scnlen.l & 0xffffffff;
+	  H_PUT_32 (abfd, temp, ext->x_csect.x_scnlen_lo);
+	  temp = in->x_csect.x_scnlen.l >> 32;
+	  H_PUT_32 (abfd, temp, ext->x_csect.x_scnlen_hi);
+	  H_PUT_32 (abfd, in->x_csect.x_parmhash, ext->x_csect.x_parmhash);
+	  H_PUT_16 (abfd, in->x_csect.x_snhash, ext->x_csect.x_snhash);
+	  /* We don't have to hack bitfields in x_smtyp because it's
+	     defined by shifts-and-ands, which are equivalent on all
+	     byte orders.  */
+	  H_PUT_8 (abfd, in->x_csect.x_smtyp, ext->x_csect.x_smtyp);
+	  H_PUT_8 (abfd, in->x_csect.x_smclas, ext->x_csect.x_smclas);
+	  H_PUT_8 (abfd, _AUX_CSECT, ext->x_auxtype.x_auxtype);
+	  goto end;
+	}
+      break;
+
+    case C_STAT:
+    case C_LEAFSTAT:
+    case C_HIDDEN:
+      if (type == T_NULL)
+	{
+	  goto end;
+	}
+      break;
+    }
+
+  if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
+      || ISTAG (in_class))
+    {
+      H_PUT_64 (abfd, in->x_sym.x_fcnary.x_fcn.x_lnnoptr,
+	       ext->x_sym.x_fcnary.x_fcn.x_lnnoptr);
+      H_PUT_8 (abfd, _AUX_FCN,
+	       ext->x_auxtype.x_auxtype);
+      H_PUT_32 (abfd, in->x_sym.x_fcnary.x_fcn.x_endndx.l,
+	       ext->x_sym.x_fcnary.x_fcn.x_endndx);
+    }
+  if (ISFCN (type))
+    {
+      H_PUT_32 (abfd, in->x_sym.x_misc.x_fsize,
+	       ext->x_sym.x_fcnary.x_fcn.x_fsize);
+    }
+  else
+    {
+      H_PUT_32 (abfd, in->x_sym.x_misc.x_lnsz.x_lnno,
+	       ext->x_sym.x_fcnary.x_lnsz.x_lnno);
+      H_PUT_16 (abfd, in->x_sym.x_misc.x_lnsz.x_size,
+	       ext->x_sym.x_fcnary.x_lnsz.x_size);
+    }
+
+ end:
+
+  return bfd_coff_auxesz (abfd);
+}
+
+static bfd_boolean
+_bfd_xcoff64_put_symbol_name (bfd *abfd, struct bfd_strtab_hash *strtab,
+                              struct internal_syment *sym,
+                              const char *name)
+{
+  bfd_boolean hash;
+  bfd_size_type indx;
+
+  hash = TRUE;
+
+  if ((abfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
+    hash = FALSE;
+
+  indx = _bfd_stringtab_add (strtab, name, hash, FALSE);
+
+  if (indx == (bfd_size_type) -1)
+    return FALSE;
+
+  sym->_n._n_n._n_zeroes = 0;
+  sym->_n._n_n._n_offset = STRING_SIZE_SIZE + indx;
+
+  return TRUE;
+}
+
+static bfd_boolean
+_bfd_xcoff64_put_ldsymbol_name (bfd *abfd ATTRIBUTE_UNUSED,
+                                struct xcoff_loader_info *ldinfo,
+                                struct internal_ldsym *ldsym,
+                                const char *name)
+{
+  size_t len;
+  len = strlen (name);
+
+  if (ldinfo->string_size + len + 3 > ldinfo->string_alc)
+    {
+      bfd_size_type newalc;
+      char *newstrings;
+
+      newalc = ldinfo->string_alc * 2;
+      if (newalc == 0)
+	newalc = 32;
+      while (ldinfo->string_size + len + 3 > newalc)
+	newalc *= 2;
+
+      newstrings = bfd_realloc (ldinfo->strings, newalc);
+      if (newstrings == NULL)
+	{
+	  ldinfo->failed = TRUE;
+	  return FALSE;
+	}
+      ldinfo->string_alc = newalc;
+      ldinfo->strings = newstrings;
+    }
+
+  bfd_put_16 (ldinfo->output_bfd, (bfd_vma) (len + 1),
+	      ldinfo->strings + ldinfo->string_size);
+  strcpy (ldinfo->strings + ldinfo->string_size + 2, name);
+  ldsym->_l._l_l._l_zeroes = 0;
+  ldsym->_l._l_l._l_offset = ldinfo->string_size + 2;
+  ldinfo->string_size += len + 3;
+
+  return TRUE;
+}
+
+/* Routines to swap information in the XCOFF .loader section.  If we
+   ever need to write an XCOFF loader, this stuff will need to be
+   moved to another file shared by the linker (which XCOFF calls the
+   ``binder'') and the loader.  */
+
+/* Swap in the ldhdr structure.  */
+
+static void
+xcoff64_swap_ldhdr_in (bfd *abfd,
+                       const void *s,
+                       struct internal_ldhdr *dst)
+{
+  const struct external_ldhdr *src = (const struct external_ldhdr *) s;
+
+  dst->l_version = bfd_get_32 (abfd, src->l_version);
+  dst->l_nsyms = bfd_get_32 (abfd, src->l_nsyms);
+  dst->l_nreloc = bfd_get_32 (abfd, src->l_nreloc);
+  dst->l_istlen = bfd_get_32 (abfd, src->l_istlen);
+  dst->l_nimpid = bfd_get_32 (abfd, src->l_nimpid);
+  dst->l_stlen = bfd_get_32 (abfd, src->l_stlen);
+  dst->l_impoff = bfd_get_64 (abfd, src->l_impoff);
+  dst->l_stoff = bfd_get_64 (abfd, src->l_stoff);
+  dst->l_symoff = bfd_get_64 (abfd, src->l_symoff);
+  dst->l_rldoff = bfd_get_64 (abfd, src->l_rldoff);
+}
+
+/* Swap out the ldhdr structure.  */
+
+static void
+xcoff64_swap_ldhdr_out (bfd *abfd, const struct internal_ldhdr *src, void *d)
+{
+  struct external_ldhdr *dst = (struct external_ldhdr *) d;
+
+  bfd_put_32 (abfd, (bfd_vma) src->l_version, dst->l_version);
+  bfd_put_32 (abfd, src->l_nsyms, dst->l_nsyms);
+  bfd_put_32 (abfd, src->l_nreloc, dst->l_nreloc);
+  bfd_put_32 (abfd, src->l_istlen, dst->l_istlen);
+  bfd_put_32 (abfd, src->l_nimpid, dst->l_nimpid);
+  bfd_put_32 (abfd, src->l_stlen, dst->l_stlen);
+  bfd_put_64 (abfd, src->l_impoff, dst->l_impoff);
+  bfd_put_64 (abfd, src->l_stoff, dst->l_stoff);
+  bfd_put_64 (abfd, src->l_symoff, dst->l_symoff);
+  bfd_put_64 (abfd, src->l_rldoff, dst->l_rldoff);
+}
+
+/* Swap in the ldsym structure.  */
+
+static void
+xcoff64_swap_ldsym_in (bfd *abfd, const void *s, struct internal_ldsym *dst)
+{
+  const struct external_ldsym *src = (const struct external_ldsym *) s;
+  /* XCOFF64 does not use l_zeroes like XCOFF32
+     Set the internal l_zeroes to 0 so the common 32/64 code uses l_value
+     as an offset into the loader symbol table.  */
+  dst->_l._l_l._l_zeroes = 0;
+  dst->_l._l_l._l_offset = bfd_get_32 (abfd, src->l_offset);
+  dst->l_value = bfd_get_64 (abfd, src->l_value);
+  dst->l_scnum = bfd_get_16 (abfd, src->l_scnum);
+  dst->l_smtype = bfd_get_8 (abfd, src->l_smtype);
+  dst->l_smclas = bfd_get_8 (abfd, src->l_smclas);
+  dst->l_ifile = bfd_get_32 (abfd, src->l_ifile);
+  dst->l_parm = bfd_get_32 (abfd, src->l_parm);
+}
+
+/* Swap out the ldsym structure.  */
+
+static void
+xcoff64_swap_ldsym_out (bfd *abfd, const struct internal_ldsym *src, void *d)
+{
+  struct external_ldsym *dst = (struct external_ldsym *) d;
+
+  bfd_put_64 (abfd, src->l_value, dst->l_value);
+  bfd_put_32 (abfd, (bfd_vma) src->_l._l_l._l_offset, dst->l_offset);
+  bfd_put_16 (abfd, (bfd_vma) src->l_scnum, dst->l_scnum);
+  bfd_put_8 (abfd, src->l_smtype, dst->l_smtype);
+  bfd_put_8 (abfd, src->l_smclas, dst->l_smclas);
+  bfd_put_32 (abfd, src->l_ifile, dst->l_ifile);
+  bfd_put_32 (abfd, src->l_parm, dst->l_parm);
+}
+
+static void
+xcoff64_swap_reloc_in (bfd *abfd, void *s, void *d)
+{
+  struct external_reloc *src = (struct external_reloc *) s;
+  struct internal_reloc *dst = (struct internal_reloc *) d;
+
+  memset (dst, 0, sizeof (struct internal_reloc));
+
+  dst->r_vaddr = bfd_get_64 (abfd, src->r_vaddr);
+  dst->r_symndx = bfd_get_32 (abfd, src->r_symndx);
+  dst->r_size = bfd_get_8 (abfd, src->r_size);
+  dst->r_type = bfd_get_8 (abfd, src->r_type);
+}
+
+static unsigned int
+xcoff64_swap_reloc_out (bfd *abfd, void *s, void *d)
+{
+  struct internal_reloc *src = (struct internal_reloc *) s;
+  struct external_reloc *dst = (struct external_reloc *) d;
+
+  bfd_put_64 (abfd, src->r_vaddr, dst->r_vaddr);
+  bfd_put_32 (abfd, src->r_symndx, dst->r_symndx);
+  bfd_put_8 (abfd, src->r_type, dst->r_type);
+  bfd_put_8 (abfd, src->r_size, dst->r_size);
+
+  return bfd_coff_relsz (abfd);
+}
+
+/* Swap in the ldrel structure.  */
+
+static void
+xcoff64_swap_ldrel_in (bfd *abfd, const void *s, struct internal_ldrel *dst)
+{
+  const struct external_ldrel *src = (const struct external_ldrel *) s;
+
+  dst->l_vaddr = bfd_get_64 (abfd, src->l_vaddr);
+  dst->l_symndx = bfd_get_32 (abfd, src->l_symndx);
+  dst->l_rtype = bfd_get_16 (abfd, src->l_rtype);
+  dst->l_rsecnm = bfd_get_16 (abfd, src->l_rsecnm);
+}
+
+/* Swap out the ldrel structure.  */
+
+static void
+xcoff64_swap_ldrel_out (bfd *abfd, const struct internal_ldrel *src, void *d)
+{
+  struct external_ldrel *dst = (struct external_ldrel *) d;
+
+  bfd_put_64 (abfd, src->l_vaddr, dst->l_vaddr);
+  bfd_put_16 (abfd, (bfd_vma) src->l_rtype, dst->l_rtype);
+  bfd_put_16 (abfd, (bfd_vma) src->l_rsecnm, dst->l_rsecnm);
+  bfd_put_32 (abfd, src->l_symndx, dst->l_symndx);
+}
+
+static bfd_boolean
+xcoff64_write_object_contents (bfd *abfd)
+{
+  asection *current;
+  bfd_boolean hasrelocs = FALSE;
+  bfd_boolean haslinno = FALSE;
+  file_ptr scn_base;
+  file_ptr reloc_base;
+  file_ptr lineno_base;
+  file_ptr sym_base;
+  unsigned long reloc_size = 0;
+  unsigned long lnno_size = 0;
+  asection *text_sec = NULL;
+  asection *data_sec = NULL;
+  asection *bss_sec = NULL;
+  struct internal_filehdr internal_f;
+  struct internal_aouthdr internal_a;
+
+  bfd_set_error (bfd_error_system_call);
+
+  if (! abfd->output_has_begun)
+    {
+      if (! bfd_coff_compute_section_file_positions (abfd))
+	return FALSE;
+    }
+
+  /* Work out the size of the reloc and linno areas.  */
+  reloc_base = obj_relocbase (abfd);
+
+  for (current = abfd->sections; current != NULL; current = current->next)
+    reloc_size += current->reloc_count * bfd_coff_relsz (abfd);
+
+  lineno_base = reloc_base + reloc_size;
+
+  /* Make a pass through the symbol table to count line number entries and
+     put them into the correct asections.  */
+  lnno_size = coff_count_linenumbers (abfd) * bfd_coff_linesz (abfd);
+
+  sym_base = lineno_base + lnno_size;
+
+  /* Indicate in each section->line_filepos its actual file address.  */
+  for (current = abfd->sections; current != NULL; current =  current->next)
+    {
+      if (current->lineno_count)
+	{
+	  current->line_filepos = lineno_base;
+	  current->moving_line_filepos = lineno_base;
+	  lineno_base += current->lineno_count * bfd_coff_linesz (abfd);
+	}
+      else
+	{
+	  current->line_filepos = 0;
+	}
+
+      if (current->reloc_count)
+	{
+	  current->rel_filepos = reloc_base;
+	  reloc_base += current->reloc_count * bfd_coff_relsz (abfd);
+	}
+      else
+	{
+	  current->rel_filepos = 0;
+	}
+    }
+
+  if ((abfd->flags & EXEC_P) != 0)
+    {
+      scn_base = bfd_coff_filhsz (abfd) + bfd_coff_aoutsz (abfd);
+      internal_f.f_opthdr = bfd_coff_aoutsz (abfd);
+    }
+  else
+    {
+      scn_base = bfd_coff_filhsz (abfd);
+      internal_f.f_opthdr = 0;
+    }
+
+  internal_f.f_nscns = 0;
+
+  if (bfd_seek (abfd, scn_base, SEEK_SET) != 0)
+    return FALSE;
+
+  for (current = abfd->sections; current != NULL; current = current->next)
+    {
+      struct internal_scnhdr section;
+      struct external_scnhdr buff;
+      bfd_size_type amount;
+
+      internal_f.f_nscns++;
+
+      strncpy (section.s_name, current->name, SCNNMLEN);
+
+      section.s_vaddr = current->vma;
+      section.s_paddr = current->lma;
+      section.s_size =  current->size;
+
+      /* If this section has no size or is unloadable then the scnptr
+	 will be 0 too.  */
+      if (current->size == 0
+	  || (current->flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0)
+	{
+	  section.s_scnptr = 0;
+	}
+      else
+	{
+	  section.s_scnptr = current->filepos;
+	}
+
+      section.s_relptr = current->rel_filepos;
+      section.s_lnnoptr = current->line_filepos;
+      section.s_nreloc = current->reloc_count;
+
+      section.s_nlnno = current->lineno_count;
+      if (current->reloc_count != 0)
+	hasrelocs = TRUE;
+      if (current->lineno_count != 0)
+	haslinno = TRUE;
+
+      section.s_flags = sec_to_styp_flags (current->name, current->flags);
+
+      if (!strcmp (current->name, _TEXT))
+	{
+	  text_sec = current;
+	}
+      else if (!strcmp (current->name, _DATA))
+	{
+	  data_sec = current;
+	}
+      else if (!strcmp (current->name, _BSS))
+	{
+	  bss_sec = current;
+	}
+
+      amount = bfd_coff_scnhsz (abfd);
+      if (bfd_coff_swap_scnhdr_out (abfd, &section, &buff) == 0
+	  || bfd_bwrite (&buff, amount, abfd) != amount)
+	return FALSE;
+    }
+
+  internal_f.f_timdat = 0;
+
+  internal_f.f_flags = 0;
+
+  if (!hasrelocs)
+    internal_f.f_flags |= F_RELFLG;
+  if (!haslinno)
+    internal_f.f_flags |= F_LNNO;
+  if (abfd->flags & EXEC_P)
+    internal_f.f_flags |= F_EXEC;
+
+  /* FIXME: this is wrong for PPC_PE!  */
+  if (bfd_little_endian (abfd))
+    internal_f.f_flags |= F_AR32WR;
+  else
+    internal_f.f_flags |= F_AR32W;
+
+  if ((abfd->flags & DYNAMIC) != 0)
+    internal_f.f_flags |= F_SHROBJ;
+  if (bfd_get_section_by_name (abfd, _LOADER) != NULL)
+    internal_f.f_flags |= F_DYNLOAD;
+
+  memset (&internal_a, 0, sizeof internal_a);
+
+  internal_f.f_magic = bfd_xcoff_magic_number (abfd);
+  internal_a.magic = (abfd->flags & D_PAGED
+		      ? RS6K_AOUTHDR_ZMAGIC
+		      : (abfd->flags & WP_TEXT
+			 ? RS6K_AOUTHDR_NMAGIC
+			 : RS6K_AOUTHDR_OMAGIC));
+
+  /* FIXME: Does anybody ever set this to another value?  */
+  internal_a.vstamp = 0;
+
+  /* Now should write relocs, strings, syms.  */
+  obj_sym_filepos (abfd) = sym_base;
+
+  internal_f.f_symptr = 0;
+  internal_f.f_nsyms = 0;
+
+  /* If bfd_get_symcount (abfd) != 0, then we are not using the COFF
+     backend linker, and obj_raw_syment_count is not valid until after
+     coff_write_symbols is called.  */
+  if (bfd_get_symcount (abfd) != 0)
+    {
+      int firstundef;
+
+      if (!coff_renumber_symbols (abfd, &firstundef))
+	return FALSE;
+      coff_mangle_symbols (abfd);
+      if (! coff_write_symbols (abfd))
+	return FALSE;
+      if (! coff_write_linenumbers (abfd))
+	return FALSE;
+      if (! coff_write_relocs (abfd, firstundef))
+	return FALSE;
+
+      internal_f.f_symptr = sym_base;
+      internal_f.f_nsyms = bfd_get_symcount (abfd);
+    }
+  else if (obj_raw_syment_count (abfd) != 0)
+    {
+      internal_f.f_symptr = sym_base;
+
+      /* AIX appears to require that F_RELFLG not be set if there are
+	 local symbols but no relocations.  */
+      internal_f.f_flags &=~ F_RELFLG;
+    }
+  else
+    {
+      internal_f.f_flags |= F_LSYMS;
+    }
+
+  if (text_sec)
+    {
+      internal_a.tsize = text_sec->size;
+      internal_a.text_start = internal_a.tsize ? text_sec->vma : 0;
+    }
+
+  if (data_sec)
+    {
+      internal_a.dsize = data_sec->size;
+      internal_a.data_start = internal_a.dsize ? data_sec->vma : 0;
+    }
+
+  if (bss_sec)
+    {
+      internal_a.bsize = bss_sec->size;
+      if (internal_a.bsize && bss_sec->vma < internal_a.data_start)
+	internal_a.data_start = bss_sec->vma;
+    }
+
+  internal_a.entry = bfd_get_start_address (abfd);
+  internal_f.f_nsyms = obj_raw_syment_count (abfd);
+
+  if (xcoff_data (abfd)->full_aouthdr)
+    {
+      bfd_vma toc;
+      asection *loader_sec;
+
+      internal_a.vstamp = 1;
+
+      internal_a.o_snentry = xcoff_data (abfd)->snentry;
+      if (internal_a.o_snentry == 0)
+	internal_a.entry = (bfd_vma) -1;
+
+      if (text_sec != NULL)
+	{
+	  internal_a.o_sntext = text_sec->target_index;
+	  internal_a.o_algntext = bfd_get_section_alignment (abfd, text_sec);
+	}
+      else
+	{
+	  internal_a.o_sntext = 0;
+	  internal_a.o_algntext = 0;
+	}
+
+      if (data_sec != NULL)
+	{
+	  internal_a.o_sndata = data_sec->target_index;
+	  internal_a.o_algndata = bfd_get_section_alignment (abfd, data_sec);
+	}
+      else
+	{
+	  internal_a.o_sndata = 0;
+	  internal_a.o_algndata = 0;
+	}
+
+      loader_sec = bfd_get_section_by_name (abfd, ".loader");
+      if (loader_sec != NULL)
+	internal_a.o_snloader = loader_sec->target_index;
+      else
+	internal_a.o_snloader = 0;
+      if (bss_sec != NULL)
+	internal_a.o_snbss = bss_sec->target_index;
+      else
+	internal_a.o_snbss = 0;
+
+      toc = xcoff_data (abfd)->toc;
+      internal_a.o_toc = toc;
+      internal_a.o_sntoc = xcoff_data (abfd)->sntoc;
+
+      internal_a.o_modtype = xcoff_data (abfd)->modtype;
+      if (xcoff_data (abfd)->cputype != -1)
+	internal_a.o_cputype = xcoff_data (abfd)->cputype;
+      else
+	{
+	  switch (bfd_get_arch (abfd))
+	    {
+	    case bfd_arch_rs6000:
+	      internal_a.o_cputype = 4;
+	      break;
+	    case bfd_arch_powerpc:
+	      if (bfd_get_mach (abfd) == bfd_mach_ppc)
+		internal_a.o_cputype = 3;
+	      else if (bfd_get_mach (abfd) == bfd_mach_ppc_620)
+		internal_a.o_cputype = 2;
+	      else
+		internal_a.o_cputype = 1;
+	      break;
+	    default:
+	      abort ();
+	    }
+	}
+      internal_a.o_maxstack = xcoff_data (abfd)->maxstack;
+      internal_a.o_maxdata = xcoff_data (abfd)->maxdata;
+    }
+
+  if (bfd_seek (abfd, (file_ptr) 0, 0) != 0)
+    return FALSE;
+
+  {
+    char * buff;
+    bfd_size_type amount = bfd_coff_filhsz (abfd);
+
+    buff = bfd_malloc (amount);
+    if (buff == NULL)
+      return FALSE;
+
+    bfd_coff_swap_filehdr_out (abfd, &internal_f, buff);
+    amount = bfd_bwrite (buff, amount, abfd);
+
+    free (buff);
+
+    if (amount != bfd_coff_filhsz (abfd))
+      return FALSE;
+  }
+
+  if (abfd->flags & EXEC_P)
+    {
+      char * buff;
+      bfd_size_type amount = bfd_coff_aoutsz (abfd);
+
+      buff = bfd_malloc (amount);
+      if (buff == NULL)
+	return FALSE;
+
+      bfd_coff_swap_aouthdr_out (abfd, &internal_a, buff);
+      amount = bfd_bwrite (buff, amount, abfd);
+
+      free (buff);
+
+      if (amount != bfd_coff_aoutsz (abfd))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+xcoff64_reloc_type_br (bfd *input_bfd,
+                       asection *input_section,
+                       bfd *output_bfd ATTRIBUTE_UNUSED,
+                       struct internal_reloc *rel,
+                       struct internal_syment *sym ATTRIBUTE_UNUSED,
+                       struct reloc_howto_struct *howto,
+                       bfd_vma val,
+                       bfd_vma addend,
+                       bfd_vma *relocation,
+                       bfd_byte *contents)
+{
+  struct xcoff_link_hash_entry *h;
+  bfd_vma section_offset;
+
+  if (0 > rel->r_symndx)
+    return FALSE;
+
+  h = obj_xcoff_sym_hashes (input_bfd)[rel->r_symndx];
+  section_offset = rel->r_vaddr - input_section->vma;
+
+  /* If we see an R_BR or R_RBR reloc which is jumping to global
+     linkage code, and it is followed by an appropriate cror nop
+     instruction, we replace the cror with ld r2,40(r1).  This
+     restores the TOC after the glink code.  Contrariwise, if the
+     call is followed by a ld r2,40(r1), but the call is not
+     going to global linkage code, we can replace the load with a
+     cror.  */
+  if (NULL != h
+      && (bfd_link_hash_defined == h->root.type
+	  || bfd_link_hash_defweak == h->root.type)
+      && section_offset + 8 <= input_section->size)
+    {
+      bfd_byte *pnext;
+      unsigned long next;
+
+      pnext = contents + section_offset + 4;
+      next = bfd_get_32 (input_bfd, pnext);
+
+      /* The _ptrgl function is magic.  It is used by the AIX compiler to call
+	 a function through a pointer.  */
+      if (h->smclas == XMC_GL || strcmp (h->root.root.string, "._ptrgl") == 0)
+	{
+	  if (next == 0x4def7b82			/* cror 15,15,15  */
+	      || next == 0x4ffffb82			/* cror 31,31,31  */
+	      || next == 0x60000000)			/* ori	r0,r0,0	  */
+	    bfd_put_32 (input_bfd, 0xe8410028, pnext);	/* ld	r2,40(r1) */
+	}
+      else
+	{
+	  if (next == 0xe8410028)			/* ld r2,40(r1)	  */
+	    bfd_put_32 (input_bfd, 0x60000000, pnext);	/* ori r0,r0,0	  */
+	}
+    }
+  else if (NULL != h && bfd_link_hash_undefined == h->root.type)
+    {
+      /* Normally, this relocation is against a defined symbol.  In the
+	 case where this is a partial link and the output section offset
+	 is greater than 2^25, the linker will return an invalid error
+	 message that the relocation has been truncated.  Yes it has been
+	 truncated but no it not important.  For this case, disable the
+	 overflow checking. */
+      howto->complain_on_overflow = complain_overflow_dont;
+    }
+
+  /* The original PC-relative relocation is biased by -r_vaddr, so adding
+     the value below will give the absolute target address.  */
+  *relocation = val + addend + rel->r_vaddr;
+
+  howto->src_mask &= ~3;
+  howto->dst_mask = howto->src_mask;
+
+  if (h != NULL
+      && (h->root.type == bfd_link_hash_defined
+	  || h->root.type == bfd_link_hash_defweak)
+      && bfd_is_abs_section (h->root.u.def.section)
+      && section_offset + 4 <= input_section->size)
+    {
+      bfd_byte *ptr;
+      bfd_vma insn;
+
+      /* Turn the relative branch into an absolute one by setting the
+	 AA bit.  */
+      ptr = contents + section_offset;
+      insn = bfd_get_32 (input_bfd, ptr);
+      insn |= 2;
+      bfd_put_32 (input_bfd, insn, ptr);
+
+      /* Make the howto absolute too.  */
+      howto->pc_relative = FALSE;
+      howto->complain_on_overflow = complain_overflow_bitfield;
+    }
+  else
+    {
+      /* Use a PC-relative howto and subtract the instruction's address
+	 from the target address we calculated above.  */
+      howto->pc_relative = TRUE;
+      *relocation -= (input_section->output_section->vma
+		      + input_section->output_offset
+		      + section_offset);
+    }
+  return TRUE;
+}
+
+/* This is the relocation function for the PowerPC64.
+   See xcoff_ppc_relocation_section for more information. */
+
+bfd_boolean
+xcoff64_ppc_relocate_section (bfd *output_bfd,
+                              struct bfd_link_info *info,
+                              bfd *input_bfd,
+                              asection *input_section,
+                              bfd_byte *contents,
+                              struct internal_reloc *relocs,
+                              struct internal_syment *syms,
+                              asection **sections)
+{
+  struct internal_reloc *rel;
+  struct internal_reloc *relend;
+
+  rel = relocs;
+  relend = rel + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      long symndx;
+      struct xcoff_link_hash_entry *h;
+      struct internal_syment *sym;
+      bfd_vma addend;
+      bfd_vma val;
+      struct reloc_howto_struct howto;
+      bfd_vma relocation;
+      bfd_vma value_to_relocate;
+      bfd_vma address;
+      bfd_byte *location;
+
+      /* Relocation type R_REF is a special relocation type which is
+	 merely used to prevent garbage collection from occurring for
+	 the csect including the symbol which it references.  */
+      if (rel->r_type == R_REF)
+	continue;
+
+      /* howto */
+      howto.type = rel->r_type;
+      howto.rightshift = 0;
+      howto.bitsize = (rel->r_size & 0x3f) + 1;
+      howto.size = howto.bitsize > 16 ? (howto.bitsize > 32 ? 4 : 2) : 1;
+      howto.pc_relative = FALSE;
+      howto.bitpos = 0;
+      howto.complain_on_overflow = (rel->r_size & 0x80
+				    ? complain_overflow_signed
+				    : complain_overflow_bitfield);
+      howto.special_function = NULL;
+      howto.name = "internal";
+      howto.partial_inplace = TRUE;
+      howto.src_mask = howto.dst_mask = N_ONES (howto.bitsize);
+      howto.pcrel_offset = FALSE;
+
+      /* symbol */
+      val = 0;
+      addend = 0;
+      h = NULL;
+      sym = NULL;
+      symndx = rel->r_symndx;
+
+      if (-1 != symndx)
+	{
+	  asection *sec;
+
+	  h = obj_xcoff_sym_hashes (input_bfd)[symndx];
+	  sym = syms + symndx;
+	  addend = - sym->n_value;
+
+	  if (NULL == h)
+	    {
+	      sec = sections[symndx];
+	      /* Hack to make sure we use the right TOC anchor value
+		 if this reloc is against the TOC anchor.  */
+	      if (sec->name[3] == '0'
+		  && strcmp (sec->name, ".tc0") == 0)
+		val = xcoff_data (output_bfd)->toc;
+	      else
+		val = (sec->output_section->vma
+		       + sec->output_offset
+		       + sym->n_value
+		       - sec->vma);
+	    }
+	  else
+	    {
+	      if (info->unresolved_syms_in_objects != RM_IGNORE
+		  && (h->flags & XCOFF_WAS_UNDEFINED) != 0)
+		{
+		  if (! ((*info->callbacks->undefined_symbol)
+			 (info, h->root.root.string,
+			  input_bfd, input_section,
+			  rel->r_vaddr - input_section->vma,
+			  (info->unresolved_syms_in_objects
+			   == RM_GENERATE_ERROR))))
+		    return FALSE;
+		}
+	      if (h->root.type == bfd_link_hash_defined
+		  || h->root.type == bfd_link_hash_defweak)
+		{
+		  sec = h->root.u.def.section;
+		  val = (h->root.u.def.value
+			 + sec->output_section->vma
+			 + sec->output_offset);
+		}
+	      else if (h->root.type == bfd_link_hash_common)
+		{
+		  sec = h->root.u.c.p->section;
+		  val = (sec->output_section->vma
+			 + sec->output_offset);
+		}
+	      else
+		{
+		  BFD_ASSERT (info->relocatable
+			      || (h->flags & XCOFF_DEF_DYNAMIC) != 0
+			      || (h->flags & XCOFF_IMPORT) != 0);
+		}
+	    }
+	}
+
+      if (rel->r_type >= XCOFF_MAX_CALCULATE_RELOCATION
+	  || !((*xcoff64_calculate_relocation[rel->r_type])
+	      (input_bfd, input_section, output_bfd, rel, sym, &howto, val,
+	       addend, &relocation, contents)))
+	return FALSE;
+
+      /* address */
+      address = rel->r_vaddr - input_section->vma;
+      location = contents + address;
+
+      if (address > input_section->size)
+	abort ();
+
+      /* Get the value we are going to relocate.  */
+      if (1 == howto.size)
+	value_to_relocate = bfd_get_16 (input_bfd, location);
+      else if (2 == howto.size)
+	value_to_relocate = bfd_get_32 (input_bfd, location);
+      else
+	value_to_relocate = bfd_get_64 (input_bfd, location);
+
+      /* overflow.
+
+	 FIXME: We may drop bits during the addition
+	 which we don't check for.  We must either check at every single
+	 operation, which would be tedious, or we must do the computations
+	 in a type larger than bfd_vma, which would be inefficient.  */
+
+      if ((unsigned int) howto.complain_on_overflow
+	  >= XCOFF_MAX_COMPLAIN_OVERFLOW)
+	abort ();
+
+      if (((*xcoff_complain_overflow[howto.complain_on_overflow])
+	   (input_bfd, value_to_relocate, relocation, &howto)))
+	{
+	  const char *name;
+	  char buf[SYMNMLEN + 1];
+	  char reloc_type_name[10];
+
+	  if (symndx == -1)
+	    {
+	      name = "*ABS*";
+	    }
+	  else if (h != NULL)
+	    {
+	      name = NULL;
+	    }
+	  else
+	    {
+	      name = _bfd_coff_internal_syment_name (input_bfd, sym, buf);
+	      if (name == NULL)
+		name = "UNKNOWN";
+	    }
+	  sprintf (reloc_type_name, "0x%02x", rel->r_type);
+
+	  if (! ((*info->callbacks->reloc_overflow)
+		 (info, (h ? &h->root : NULL), name, reloc_type_name,
+		  (bfd_vma) 0, input_bfd, input_section,
+		  rel->r_vaddr - input_section->vma)))
+	    return FALSE;
+	}
+
+      /* Add RELOCATION to the right bits of VALUE_TO_RELOCATE.  */
+      value_to_relocate = ((value_to_relocate & ~howto.dst_mask)
+			   | (((value_to_relocate & howto.src_mask)
+			       + relocation) & howto.dst_mask));
+
+      /* Put the value back in the object file.  */
+      if (1 == howto.size)
+	bfd_put_16 (input_bfd, value_to_relocate, location);
+      else if (2 == howto.size)
+	bfd_put_32 (input_bfd, value_to_relocate, location);
+      else
+	bfd_put_64 (input_bfd, value_to_relocate, location);
+
+    }
+  return TRUE;
+}
+
+
+/* The XCOFF reloc table.  Actually, XCOFF relocations specify the
+   bitsize and whether they are signed or not, along with a
+   conventional type.  This table is for the types, which are used for
+   different algorithms for putting in the reloc.  Many of these
+   relocs need special_function entries, which I have not written.  */
+
+reloc_howto_type xcoff64_howto_table[] =
+{
+  /* Standard 64 bit relocation.  */
+  HOWTO (R_POS,			/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_POS_64",		/* name */
+	 TRUE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 64 bit relocation, but store negative value.  */
+  HOWTO (R_NEG,			/* type */
+	 0,			/* rightshift */
+	 -4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_NEG",		/* name */
+	 TRUE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit PC relative relocation.  */
+  HOWTO (R_REL,			/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_REL",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit TOC relative relocation.  */
+  HOWTO (R_TOC,			/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_TOC",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* I don't really know what this is.	*/
+  HOWTO (R_RTB,			/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RTB",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* External TOC relative symbol.  */
+  HOWTO (R_GL,			/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_GL",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Local TOC relative symbol.	 */
+  HOWTO (R_TCL,			/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_TCL",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (7),
+
+  /* Non modifiable absolute branch.  */
+  HOWTO (R_BA,			/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_BA_26",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x03fffffc,		/* src_mask */
+	 0x03fffffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (9),
+
+  /* Non modifiable relative branch.  */
+  HOWTO (R_BR,			/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_BR",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x03fffffc,		/* src_mask */
+	 0x03fffffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (0xb),
+
+  /* Indirect load.  */
+  HOWTO (R_RL,			/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RL",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Load address.  */
+  HOWTO (R_RLA,			/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RLA",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (0xe),
+
+  /* Non-relocating reference.  Bitsize is 1 so that r_rsize is 0.  */
+  HOWTO (R_REF,			/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 1,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_REF",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (0x10),
+  EMPTY_HOWTO (0x11),
+
+  /* TOC relative indirect load.  */
+  HOWTO (R_TRL,			/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_TRL",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TOC relative load address.	 */
+  HOWTO (R_TRLA,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_TRLA",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Modifiable relative branch.  */
+  HOWTO (R_RRTBI,		/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RRTBI",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Modifiable absolute branch.  */
+  HOWTO (R_RRTBA,		/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RRTBA",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Modifiable call absolute indirect.	 */
+  HOWTO (R_CAI,			/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_CAI",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Modifiable call relative.	*/
+  HOWTO (R_CREL,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_CREL",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Modifiable branch absolute.  */
+  HOWTO (R_RBA,			/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RBA",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x03fffffc,		/* src_mask */
+	 0x03fffffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Modifiable branch absolute.  */
+  HOWTO (R_RBAC,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RBAC",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Modifiable branch relative.  */
+  HOWTO (R_RBR,			/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RBR_26",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x03fffffc,		/* src_mask */
+	 0x03fffffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Modifiable branch absolute.  */
+  HOWTO (R_RBRC,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RBRC",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_POS,			/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_POS_32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit Non modifiable absolute branch.  */
+  HOWTO (R_BA,			/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_BA_16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xfffc,		/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Modifiable branch relative.  */
+  HOWTO (R_RBR,			/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RBR_16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Modifiable branch absolute.  */
+  HOWTO (R_RBA,			/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 0,			/* special_function */
+	 "R_RBA_16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+};
+
+void
+xcoff64_rtype2howto (arelent *relent, struct internal_reloc *internal)
+{
+  if (internal->r_type > R_RBRC)
+    abort ();
+
+  /* Default howto layout works most of the time */
+  relent->howto = &xcoff64_howto_table[internal->r_type];
+
+  /* Special case some 16 bit reloc */
+  if (15 == (internal->r_size & 0x3f))
+    {
+      if (R_BA == internal->r_type)
+	relent->howto = &xcoff64_howto_table[0x1d];
+      else if (R_RBR == internal->r_type)
+	relent->howto = &xcoff64_howto_table[0x1e];
+      else if (R_RBA == internal->r_type)
+	relent->howto = &xcoff64_howto_table[0x1f];
+    }
+  /* Special case 32 bit */
+  else if (31 == (internal->r_size & 0x3f))
+    {
+      if (R_POS == internal->r_type)
+	relent->howto = &xcoff64_howto_table[0x1c];
+    }
+
+  /* The r_size field of an XCOFF reloc encodes the bitsize of the
+     relocation, as well as indicating whether it is signed or not.
+     Doublecheck that the relocation information gathered from the
+     type matches this information.  The bitsize is not significant
+     for R_REF relocs.  */
+  if (relent->howto->dst_mask != 0
+      && (relent->howto->bitsize
+	  != ((unsigned int) internal->r_size & 0x3f) + 1))
+    abort ();
+}
+
+reloc_howto_type *
+xcoff64_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                           bfd_reloc_code_real_type code)
+{
+  switch (code)
+    {
+    case BFD_RELOC_PPC_B26:
+      return &xcoff64_howto_table[0xa];
+    case BFD_RELOC_PPC_BA16:
+      return &xcoff64_howto_table[0x1d];
+    case BFD_RELOC_PPC_BA26:
+      return &xcoff64_howto_table[8];
+    case BFD_RELOC_PPC_TOC16:
+      return &xcoff64_howto_table[3];
+    case BFD_RELOC_32:
+    case BFD_RELOC_CTOR:
+      return &xcoff64_howto_table[0x1c];
+    case BFD_RELOC_64:
+      return &xcoff64_howto_table[0];
+    case BFD_RELOC_NONE:
+      return &xcoff64_howto_table[0xf];
+    default:
+      return NULL;
+    }
+}
+
+static reloc_howto_type *
+xcoff64_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			   const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (xcoff64_howto_table) / sizeof (xcoff64_howto_table[0]);
+       i++)
+    if (xcoff64_howto_table[i].name != NULL
+	&& strcasecmp (xcoff64_howto_table[i].name, r_name) == 0)
+      return &xcoff64_howto_table[i];
+
+  return NULL;
+}
+
+/* Read in the armap of an XCOFF archive.  */
+
+static bfd_boolean
+xcoff64_slurp_armap (bfd *abfd)
+{
+  file_ptr off;
+  size_t namlen;
+  bfd_size_type sz, amt;
+  bfd_byte *contents, *cend;
+  bfd_vma c, i;
+  carsym *arsym;
+  bfd_byte *p;
+  file_ptr pos;
+
+  /* This is for the new format.  */
+  struct xcoff_ar_hdr_big hdr;
+
+  if (xcoff_ardata (abfd) == NULL)
+    {
+      bfd_has_map (abfd) = FALSE;
+      return TRUE;
+    }
+
+  off = bfd_scan_vma (xcoff_ardata_big (abfd)->symoff64,
+		      (const char **) NULL, 10);
+  if (off == 0)
+    {
+      bfd_has_map (abfd) = FALSE;
+      return TRUE;
+    }
+
+  if (bfd_seek (abfd, off, SEEK_SET) != 0)
+    return FALSE;
+
+  /* The symbol table starts with a normal archive header.  */
+  if (bfd_bread (&hdr, (bfd_size_type) SIZEOF_AR_HDR_BIG, abfd)
+      != SIZEOF_AR_HDR_BIG)
+    return FALSE;
+
+  /* Skip the name (normally empty).  */
+  namlen = strtol (hdr.namlen, (char **) NULL, 10);
+  pos = ((namlen + 1) & ~(size_t) 1) + SXCOFFARFMAG;
+  if (bfd_seek (abfd, pos, SEEK_CUR) != 0)
+    return FALSE;
+
+  sz = bfd_scan_vma (hdr.size, (const char **) NULL, 10);
+
+  /* Read in the entire symbol table.  */
+  contents = (bfd_byte *) bfd_alloc (abfd, sz);
+  if (contents == NULL)
+    return FALSE;
+  if (bfd_bread (contents, sz, abfd) != sz)
+    return FALSE;
+
+  /* The symbol table starts with an eight byte count.  */
+  c = H_GET_64 (abfd, contents);
+
+  if (c * 8 >= sz)
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+  amt = c;
+  amt *= sizeof (carsym);
+  bfd_ardata (abfd)->symdefs = (carsym *) bfd_alloc (abfd, amt);
+  if (bfd_ardata (abfd)->symdefs == NULL)
+    return FALSE;
+
+  /* After the count comes a list of eight byte file offsets.  */
+  for (i = 0, arsym = bfd_ardata (abfd)->symdefs, p = contents + 8;
+       i < c;
+       ++i, ++arsym, p += 8)
+    arsym->file_offset = H_GET_64 (abfd, p);
+
+  /* After the file offsets come null terminated symbol names.  */
+  cend = contents + sz;
+  for (i = 0, arsym = bfd_ardata (abfd)->symdefs;
+       i < c;
+       ++i, ++arsym, p += strlen ((char *) p) + 1)
+    {
+      if (p >= cend)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+      arsym->name = (char *) p;
+    }
+
+  bfd_ardata (abfd)->symdef_count = c;
+  bfd_has_map (abfd) = TRUE;
+
+  return TRUE;
+}
+
+
+/* See if this is an NEW XCOFF archive.  */
+
+static const bfd_target *
+xcoff64_archive_p (bfd *abfd)
+{
+  struct artdata *tdata_hold;
+  char magic[SXCOFFARMAG];
+  /* This is the new format.  */
+  struct xcoff_ar_file_hdr_big hdr;
+  bfd_size_type amt = SXCOFFARMAG;
+
+  if (bfd_bread (magic, amt, abfd) != amt)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  if (strncmp (magic, XCOFFARMAGBIG, SXCOFFARMAG) != 0)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  /* Copy over the magic string.  */
+  memcpy (hdr.magic, magic, SXCOFFARMAG);
+
+  /* Now read the rest of the file header.  */
+  amt = SIZEOF_AR_FILE_HDR_BIG - SXCOFFARMAG;
+  if (bfd_bread (&hdr.memoff, amt, abfd) != amt)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  tdata_hold = bfd_ardata (abfd);
+
+  amt = sizeof (struct artdata);
+  bfd_ardata (abfd) = (struct artdata *) bfd_zalloc (abfd, amt);
+  if (bfd_ardata (abfd) == (struct artdata *) NULL)
+    goto error_ret_restore;
+
+  /* Already cleared by bfd_zalloc above.
+     bfd_ardata (abfd)->cache = NULL;
+     bfd_ardata (abfd)->archive_head = NULL;
+     bfd_ardata (abfd)->symdefs = NULL;
+     bfd_ardata (abfd)->extended_names = NULL;
+     bfd_ardata (abfd)->extended_names_size = 0;  */
+  bfd_ardata (abfd)->first_file_filepos = bfd_scan_vma (hdr.firstmemoff,
+							(const char **) NULL,
+							10);
+
+  amt = SIZEOF_AR_FILE_HDR_BIG;
+  bfd_ardata (abfd)->tdata = bfd_zalloc (abfd, amt);
+  if (bfd_ardata (abfd)->tdata == NULL)
+    goto error_ret;
+
+  memcpy (bfd_ardata (abfd)->tdata, &hdr, SIZEOF_AR_FILE_HDR_BIG);
+
+  if (! xcoff64_slurp_armap (abfd))
+    {
+    error_ret:
+      bfd_release (abfd, bfd_ardata (abfd));
+    error_ret_restore:
+      bfd_ardata (abfd) = tdata_hold;
+      return NULL;
+    }
+
+  return abfd->xvec;
+}
+
+
+/* Open the next element in an XCOFF archive.  */
+
+static bfd *
+xcoff64_openr_next_archived_file (bfd *archive, bfd *last_file)
+{
+  bfd_vma filestart;
+
+  if ((xcoff_ardata (archive) == NULL)
+      || ! xcoff_big_format_p (archive))
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return NULL;
+    }
+
+  if (last_file == NULL)
+    {
+      filestart = bfd_ardata (archive)->first_file_filepos;
+    }
+  else
+    {
+      filestart = bfd_scan_vma (arch_xhdr_big (last_file)->nextoff,
+				(const char **) NULL, 10);
+    }
+
+  if (filestart == 0
+      || filestart == bfd_scan_vma (xcoff_ardata_big (archive)->memoff,
+				    (const char **) NULL, 10)
+      || filestart == bfd_scan_vma (xcoff_ardata_big (archive)->symoff,
+				    (const char **) NULL, 10))
+    {
+      bfd_set_error (bfd_error_no_more_archived_files);
+      return NULL;
+    }
+
+  return _bfd_get_elt_at_filepos (archive, (file_ptr) filestart);
+}
+
+/* We can't use the usual coff_sizeof_headers routine, because AIX
+   always uses an a.out header.  */
+
+static int
+xcoff64_sizeof_headers (bfd *abfd,
+			struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  int size;
+
+  size = bfd_coff_filhsz (abfd);
+
+  /* Don't think the small aout header can be used since some of the
+     old elements have been reordered past the end of the old coff
+     small aout size.  */
+
+  if (xcoff_data (abfd)->full_aouthdr)
+    size += bfd_coff_aoutsz (abfd);
+
+  size += abfd->section_count * bfd_coff_scnhsz (abfd);
+  return size;
+}
+
+static asection *
+xcoff64_create_csect_from_smclas (bfd *abfd, union internal_auxent *aux,
+                                  const char *symbol_name)
+{
+  asection *return_value = NULL;
+
+  /* Changes from 32 :
+     .sv == 8, is only for 32 bit programs
+     .ti == 12 and .tb == 13 are now reserved.  */
+  static const char *names[19] =
+  {
+    ".pr", ".ro", ".db", ".tc", ".ua", ".rw", ".gl", ".xo",
+    NULL, ".bs", ".ds", ".uc", NULL,  NULL,  NULL,  ".tc0",
+    ".td", ".sv64", ".sv3264"
+  };
+
+  if ((19 >= aux->x_csect.x_smclas)
+      && (NULL != names[aux->x_csect.x_smclas]))
+    {
+
+      return_value = bfd_make_section_anyway
+	(abfd, names[aux->x_csect.x_smclas]);
+
+    }
+  else
+    {
+      (*_bfd_error_handler)
+	(_("%B: symbol `%s' has unrecognized smclas %d"),
+	 abfd, symbol_name, aux->x_csect.x_smclas);
+      bfd_set_error (bfd_error_bad_value);
+    }
+
+  return return_value;
+}
+
+static bfd_boolean
+xcoff64_is_lineno_count_overflow (bfd *abfd ATTRIBUTE_UNUSED,
+                                  bfd_vma value ATTRIBUTE_UNUSED)
+{
+  return FALSE;
+}
+
+static bfd_boolean
+xcoff64_is_reloc_count_overflow (bfd *abfd ATTRIBUTE_UNUSED,
+                                 bfd_vma value ATTRIBUTE_UNUSED)
+{
+  return FALSE;
+}
+
+static bfd_vma
+xcoff64_loader_symbol_offset (bfd *abfd ATTRIBUTE_UNUSED,
+                              struct internal_ldhdr *ldhdr)
+{
+  return (ldhdr->l_symoff);
+}
+
+static bfd_vma
+xcoff64_loader_reloc_offset (bfd *abfd ATTRIBUTE_UNUSED,
+                             struct internal_ldhdr *ldhdr)
+{
+  return (ldhdr->l_rldoff);
+}
+
+static bfd_boolean
+xcoff64_bad_format_hook (bfd * abfd, void *filehdr)
+{
+  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
+
+  /* Check flavor first.  */
+  if (bfd_get_flavour (abfd) != bfd_target_xcoff_flavour)
+    return FALSE;
+
+  if (bfd_xcoff_magic_number (abfd) != internal_f->f_magic)
+    return FALSE;
+
+  return TRUE;
+}
+
+static bfd_boolean
+xcoff64_generate_rtinit (bfd *abfd, const char *init, const char *fini,
+                         bfd_boolean rtld)
+{
+  bfd_byte filehdr_ext[FILHSZ];
+  bfd_byte scnhdr_ext[SCNHSZ * 3];
+  bfd_byte syment_ext[SYMESZ * 10];
+  bfd_byte reloc_ext[RELSZ * 3];
+  bfd_byte *data_buffer;
+  bfd_size_type data_buffer_size;
+  bfd_byte *string_table, *st_tmp;
+  bfd_size_type string_table_size;
+  bfd_vma val;
+  size_t initsz, finisz;
+  struct internal_filehdr filehdr;
+  struct internal_scnhdr text_scnhdr;
+  struct internal_scnhdr data_scnhdr;
+  struct internal_scnhdr bss_scnhdr;
+  struct internal_syment syment;
+  union internal_auxent auxent;
+  struct internal_reloc reloc;
+
+  char *text_name = ".text";
+  char *data_name = ".data";
+  char *bss_name = ".bss";
+  char *rtinit_name = "__rtinit";
+  char *rtld_name = "__rtld";
+
+  if (! bfd_xcoff_rtinit_size (abfd))
+    return FALSE;
+
+  initsz = (init == NULL ? 0 : 1 + strlen (init));
+  finisz = (fini == NULL ? 0 : 1 + strlen (fini));
+
+  /* File header.  */
+  memset (filehdr_ext, 0, FILHSZ);
+  memset (&filehdr, 0, sizeof (struct internal_filehdr));
+  filehdr.f_magic = bfd_xcoff_magic_number (abfd);
+  filehdr.f_nscns = 3;
+  filehdr.f_timdat = 0;
+  filehdr.f_nsyms = 0;  /* at least 6, no more than 8 */
+  filehdr.f_symptr = 0; /* set below */
+  filehdr.f_opthdr = 0;
+  filehdr.f_flags = 0;
+
+  /* Section headers.  */
+  memset (scnhdr_ext, 0, 3 * SCNHSZ);
+
+  /* Text.  */
+  memset (&text_scnhdr, 0, sizeof (struct internal_scnhdr));
+  memcpy (text_scnhdr.s_name, text_name, strlen (text_name));
+  text_scnhdr.s_paddr = 0;
+  text_scnhdr.s_vaddr = 0;
+  text_scnhdr.s_size = 0;
+  text_scnhdr.s_scnptr = 0;
+  text_scnhdr.s_relptr = 0;
+  text_scnhdr.s_lnnoptr = 0;
+  text_scnhdr.s_nreloc = 0;
+  text_scnhdr.s_nlnno = 0;
+  text_scnhdr.s_flags = STYP_TEXT;
+
+  /* Data.  */
+  memset (&data_scnhdr, 0, sizeof (struct internal_scnhdr));
+  memcpy (data_scnhdr.s_name, data_name, strlen (data_name));
+  data_scnhdr.s_paddr = 0;
+  data_scnhdr.s_vaddr = 0;
+  data_scnhdr.s_size = 0;    /* set below */
+  data_scnhdr.s_scnptr = FILHSZ + 3 * SCNHSZ;
+  data_scnhdr.s_relptr = 0;  /* set below */
+  data_scnhdr.s_lnnoptr = 0;
+  data_scnhdr.s_nreloc = 0;  /* either 1 or 2 */
+  data_scnhdr.s_nlnno = 0;
+  data_scnhdr.s_flags = STYP_DATA;
+
+  /* Bss.  */
+  memset (&bss_scnhdr, 0, sizeof (struct internal_scnhdr));
+  memcpy (bss_scnhdr.s_name, bss_name, strlen (bss_name));
+  bss_scnhdr.s_paddr = 0; /* set below */
+  bss_scnhdr.s_vaddr = 0; /* set below */
+  bss_scnhdr.s_size = 0;  /* set below */
+  bss_scnhdr.s_scnptr = 0;
+  bss_scnhdr.s_relptr = 0;
+  bss_scnhdr.s_lnnoptr = 0;
+  bss_scnhdr.s_nreloc = 0;
+  bss_scnhdr.s_nlnno = 0;
+  bss_scnhdr.s_flags = STYP_BSS;
+
+  /* .data
+     0x0000	      0x00000000 : rtl
+     0x0004	      0x00000000 :
+     0x0008	      0x00000018 : offset to init, or 0
+     0x000C	      0x00000038 : offset to fini, or 0
+     0x0010	      0x00000010 : size of descriptor
+     0x0014	      0x00000000 : pad
+     0x0018	      0x00000000 : init, needs a reloc
+     0x001C	      0x00000000 :
+     0x0020	      0x00000058 : offset to init name
+     0x0024	      0x00000000 : flags, padded to a word
+     0x0028	      0x00000000 : empty init
+     0x002C	      0x00000000 :
+     0x0030	      0x00000000 :
+     0x0034	      0x00000000 :
+     0x0038	      0x00000000 : fini, needs a reloc
+     0x003C	      0x00000000 :
+     0x0040	      0x00000??? : offset to fini name
+     0x0044	      0x00000000 : flags, padded to a word
+     0x0048	      0x00000000 : empty fini
+     0x004C	      0x00000000 :
+     0x0050	      0x00000000 :
+     0x0054	      0x00000000 :
+     0x0058	      init name
+     0x0058 + initsz  fini name */
+
+  data_buffer_size = 0x0058 + initsz + finisz;
+  data_buffer_size = (data_buffer_size + 7) &~ (bfd_size_type) 7;
+  data_buffer = NULL;
+  data_buffer = (bfd_byte *) bfd_zmalloc (data_buffer_size);
+  if (data_buffer == NULL)
+    return FALSE;
+
+  if (initsz)
+    {
+      val = 0x18;
+      bfd_put_32 (abfd, val, &data_buffer[0x08]);
+      val = 0x58;
+      bfd_put_32 (abfd, val, &data_buffer[0x20]);
+      memcpy (&data_buffer[val], init, initsz);
+    }
+
+  if (finisz)
+    {
+      val = 0x38;
+      bfd_put_32 (abfd, val, &data_buffer[0x0C]);
+      val = 0x58 + initsz;
+      bfd_put_32 (abfd, val, &data_buffer[0x40]);
+      memcpy (&data_buffer[val], fini, finisz);
+    }
+
+  val = 0x10;
+  bfd_put_32 (abfd, val, &data_buffer[0x10]);
+  data_scnhdr.s_size = data_buffer_size;
+  bss_scnhdr.s_paddr = bss_scnhdr.s_vaddr = data_scnhdr.s_size;
+
+  /* String table.  */
+  string_table_size = 4;
+  string_table_size += strlen (data_name) + 1;
+  string_table_size += strlen (rtinit_name) + 1;
+  string_table_size += initsz;
+  string_table_size += finisz;
+  if (rtld)
+    string_table_size += strlen (rtld_name) + 1;
+
+  string_table = (bfd_byte *) bfd_zmalloc (string_table_size);
+  if (string_table == NULL)
+    return FALSE;
+
+  val = string_table_size;
+  bfd_put_32 (abfd, val, &string_table[0]);
+  st_tmp = string_table + 4;
+
+  /* symbols
+     0. .data csect
+     2. __rtinit
+     4. init function
+     6. fini function
+     8. __rtld  */
+  memset (syment_ext, 0, 10 * SYMESZ);
+  memset (reloc_ext, 0, 3 * RELSZ);
+
+  /* .data csect */
+  memset (&syment, 0, sizeof (struct internal_syment));
+  memset (&auxent, 0, sizeof (union internal_auxent));
+
+  syment._n._n_n._n_offset = st_tmp - string_table;
+  memcpy (st_tmp, data_name, strlen (data_name));
+  st_tmp += strlen (data_name) + 1;
+
+  syment.n_scnum = 2;
+  syment.n_sclass = C_HIDEXT;
+  syment.n_numaux = 1;
+  auxent.x_csect.x_scnlen.l = data_buffer_size;
+  auxent.x_csect.x_smtyp = 3 << 3 | XTY_SD;
+  auxent.x_csect.x_smclas = XMC_RW;
+  bfd_coff_swap_sym_out (abfd, &syment,
+			 &syment_ext[filehdr.f_nsyms * SYMESZ]);
+  bfd_coff_swap_aux_out (abfd, &auxent, syment.n_type, syment.n_sclass, 0,
+			 syment.n_numaux,
+			 &syment_ext[(filehdr.f_nsyms + 1) * SYMESZ]);
+  filehdr.f_nsyms += 2;
+
+  /* __rtinit */
+  memset (&syment, 0, sizeof (struct internal_syment));
+  memset (&auxent, 0, sizeof (union internal_auxent));
+  syment._n._n_n._n_offset = st_tmp - string_table;
+  memcpy (st_tmp, rtinit_name, strlen (rtinit_name));
+  st_tmp += strlen (rtinit_name) + 1;
+
+  syment.n_scnum = 2;
+  syment.n_sclass = C_EXT;
+  syment.n_numaux = 1;
+  auxent.x_csect.x_smtyp = XTY_LD;
+  auxent.x_csect.x_smclas = XMC_RW;
+  bfd_coff_swap_sym_out (abfd, &syment,
+			 &syment_ext[filehdr.f_nsyms * SYMESZ]);
+  bfd_coff_swap_aux_out (abfd, &auxent, syment.n_type, syment.n_sclass, 0,
+			 syment.n_numaux,
+			 &syment_ext[(filehdr.f_nsyms + 1) * SYMESZ]);
+  filehdr.f_nsyms += 2;
+
+  /* Init.  */
+  if (initsz)
+    {
+      memset (&syment, 0, sizeof (struct internal_syment));
+      memset (&auxent, 0, sizeof (union internal_auxent));
+
+      syment._n._n_n._n_offset = st_tmp - string_table;
+      memcpy (st_tmp, init, initsz);
+      st_tmp += initsz;
+
+      syment.n_sclass = C_EXT;
+      syment.n_numaux = 1;
+      bfd_coff_swap_sym_out (abfd, &syment,
+			     &syment_ext[filehdr.f_nsyms * SYMESZ]);
+      bfd_coff_swap_aux_out (abfd, &auxent, syment.n_type, syment.n_sclass, 0,
+			     syment.n_numaux,
+			     &syment_ext[(filehdr.f_nsyms + 1) * SYMESZ]);
+      /* Reloc.  */
+      memset (&reloc, 0, sizeof (struct internal_reloc));
+      reloc.r_vaddr = 0x0018;
+      reloc.r_symndx = filehdr.f_nsyms;
+      reloc.r_type = R_POS;
+      reloc.r_size = 63;
+      bfd_coff_swap_reloc_out (abfd, &reloc, &reloc_ext[0]);
+
+      filehdr.f_nsyms += 2;
+      data_scnhdr.s_nreloc += 1;
+    }
+
+  /* Finit.  */
+  if (finisz)
+    {
+      memset (&syment, 0, sizeof (struct internal_syment));
+      memset (&auxent, 0, sizeof (union internal_auxent));
+
+      syment._n._n_n._n_offset = st_tmp - string_table;
+      memcpy (st_tmp, fini, finisz);
+      st_tmp += finisz;
+
+      syment.n_sclass = C_EXT;
+      syment.n_numaux = 1;
+      bfd_coff_swap_sym_out (abfd, &syment,
+			     &syment_ext[filehdr.f_nsyms * SYMESZ]);
+      bfd_coff_swap_aux_out (abfd, &auxent, syment.n_type, syment.n_sclass, 0,
+			     syment.n_numaux,
+			     &syment_ext[(filehdr.f_nsyms + 1) * SYMESZ]);
+
+      /* Reloc.  */
+      memset (&reloc, 0, sizeof (struct internal_reloc));
+      reloc.r_vaddr = 0x0038;
+      reloc.r_symndx = filehdr.f_nsyms;
+      reloc.r_type = R_POS;
+      reloc.r_size = 63;
+      bfd_coff_swap_reloc_out (abfd, &reloc,
+			       &reloc_ext[data_scnhdr.s_nreloc * RELSZ]);
+
+      filehdr.f_nsyms += 2;
+      data_scnhdr.s_nreloc += 1;
+    }
+
+  if (rtld)
+    {
+      memset (&syment, 0, sizeof (struct internal_syment));
+      memset (&auxent, 0, sizeof (union internal_auxent));
+
+      syment._n._n_n._n_offset = st_tmp - string_table;
+      memcpy (st_tmp, rtld_name, strlen (rtld_name));
+      st_tmp += strlen (rtld_name) + 1;
+
+      syment.n_sclass = C_EXT;
+      syment.n_numaux = 1;
+      bfd_coff_swap_sym_out (abfd, &syment,
+			     &syment_ext[filehdr.f_nsyms * SYMESZ]);
+      bfd_coff_swap_aux_out (abfd, &auxent, syment.n_type, syment.n_sclass, 0,
+			     syment.n_numaux,
+			     &syment_ext[(filehdr.f_nsyms + 1) * SYMESZ]);
+
+      /* Reloc.  */
+      memset (&reloc, 0, sizeof (struct internal_reloc));
+      reloc.r_vaddr = 0x0000;
+      reloc.r_symndx = filehdr.f_nsyms;
+      reloc.r_type = R_POS;
+      reloc.r_size = 63;
+      bfd_coff_swap_reloc_out (abfd, &reloc,
+			       &reloc_ext[data_scnhdr.s_nreloc * RELSZ]);
+
+      filehdr.f_nsyms += 2;
+      data_scnhdr.s_nreloc += 1;
+
+      bss_scnhdr.s_size = 0;
+    }
+
+  data_scnhdr.s_relptr = data_scnhdr.s_scnptr + data_buffer_size;
+  filehdr.f_symptr = data_scnhdr.s_relptr + data_scnhdr.s_nreloc * RELSZ;
+
+  bfd_coff_swap_filehdr_out (abfd, &filehdr, filehdr_ext);
+  bfd_bwrite (filehdr_ext, FILHSZ, abfd);
+  bfd_coff_swap_scnhdr_out (abfd, &text_scnhdr, &scnhdr_ext[SCNHSZ * 0]);
+  bfd_coff_swap_scnhdr_out (abfd, &data_scnhdr, &scnhdr_ext[SCNHSZ * 1]);
+  bfd_coff_swap_scnhdr_out (abfd, &bss_scnhdr, &scnhdr_ext[SCNHSZ * 2]);
+  bfd_bwrite (scnhdr_ext, 3 * SCNHSZ, abfd);
+  bfd_bwrite (data_buffer, data_buffer_size, abfd);
+  bfd_bwrite (reloc_ext, data_scnhdr.s_nreloc * RELSZ, abfd);
+  bfd_bwrite (syment_ext, filehdr.f_nsyms * SYMESZ, abfd);
+  bfd_bwrite (string_table, string_table_size, abfd);
+
+  free (data_buffer);
+  data_buffer = NULL;
+
+  return TRUE;
+}
+
+/* The typical dynamic reloc.  */
+
+static reloc_howto_type xcoff64_dynamic_reloc =
+HOWTO (0,			/* type */
+       0,			/* rightshift */
+       4,			/* size (0 = byte, 1 = short, 2 = long) */
+       64,			/* bitsize */
+       FALSE,			/* pc_relative */
+       0,			/* bitpos */
+       complain_overflow_bitfield, /* complain_on_overflow */
+       0,			/* special_function */
+       "R_POS",			/* name */
+       TRUE,			/* partial_inplace */
+       MINUS_ONE,		/* src_mask */
+       MINUS_ONE,		/* dst_mask */
+       FALSE);			/* pcrel_offset */
+
+static unsigned long xcoff64_glink_code[10] =
+{
+  0xe9820000,	/* ld r12,0(r2) */
+  0xf8410028,	/* std r2,40(r1) */
+  0xe80c0000,	/* ld r0,0(r12) */
+  0xe84c0008,	/* ld r0,8(r12) */
+  0x7c0903a6,	/* mtctr r0 */
+  0x4e800420,	/* bctr */
+  0x00000000,	/* start of traceback table */
+  0x000ca000,	/* traceback table */
+  0x00000000,	/* traceback table */
+  0x00000018,	/* ??? */
+};
+
+static const struct xcoff_backend_data_rec bfd_xcoff_backend_data =
+  {
+    { /* COFF backend, defined in libcoff.h.  */
+      _bfd_xcoff64_swap_aux_in,
+      _bfd_xcoff64_swap_sym_in,
+      _bfd_xcoff64_swap_lineno_in,
+      _bfd_xcoff64_swap_aux_out,
+      _bfd_xcoff64_swap_sym_out,
+      _bfd_xcoff64_swap_lineno_out,
+      xcoff64_swap_reloc_out,
+      coff_swap_filehdr_out,
+      coff_swap_aouthdr_out,
+      coff_swap_scnhdr_out,
+      FILHSZ,
+      AOUTSZ,
+      SCNHSZ,
+      SYMESZ,
+      AUXESZ,
+      RELSZ,
+      LINESZ,
+      FILNMLEN,
+      TRUE,			/* _bfd_coff_long_filenames */
+      XCOFF_NO_LONG_SECTION_NAMES,  /* _bfd_coff_long_section_names */
+      3,			/* _bfd_coff_default_section_alignment_power */
+      TRUE,			/* _bfd_coff_force_symnames_in_strings */
+      4,			/* _bfd_coff_debug_string_prefix_length */
+      coff_swap_filehdr_in,
+      coff_swap_aouthdr_in,
+      coff_swap_scnhdr_in,
+      xcoff64_swap_reloc_in,
+      xcoff64_bad_format_hook,
+      coff_set_arch_mach_hook,
+      coff_mkobject_hook,
+      styp_to_sec_flags,
+      coff_set_alignment_hook,
+      coff_slurp_symbol_table,
+      symname_in_debug_hook,
+      coff_pointerize_aux_hook,
+      coff_print_aux,
+      dummy_reloc16_extra_cases,
+      dummy_reloc16_estimate,
+      NULL,			/* bfd_coff_symbol_classification */
+      coff_compute_section_file_positions,
+      NULL,			/* _bfd_coff_start_final_link */
+      xcoff64_ppc_relocate_section,
+      coff_rtype_to_howto,
+      NULL,			/* _bfd_coff_adjust_symndx */
+      _bfd_generic_link_add_one_symbol,
+      coff_link_output_has_begun,
+      coff_final_link_postscript,
+      NULL			/* print_pdata.  */
+    },
+
+    0x01EF,			/* magic number */
+    bfd_arch_powerpc,
+    bfd_mach_ppc_620,
+
+    /* Function pointers to xcoff specific swap routines.  */
+    xcoff64_swap_ldhdr_in,
+    xcoff64_swap_ldhdr_out,
+    xcoff64_swap_ldsym_in,
+    xcoff64_swap_ldsym_out,
+    xcoff64_swap_ldrel_in,
+    xcoff64_swap_ldrel_out,
+
+    /* Sizes.  */
+    LDHDRSZ,
+    LDSYMSZ,
+    LDRELSZ,
+    24,				/* _xcoff_function_descriptor_size */
+    0,				/* _xcoff_small_aout_header_size */
+
+    /* Versions.  */
+    2,				/* _xcoff_ldhdr_version */
+
+    _bfd_xcoff64_put_symbol_name,
+    _bfd_xcoff64_put_ldsymbol_name,
+    &xcoff64_dynamic_reloc,
+    xcoff64_create_csect_from_smclas,
+
+    /* Lineno and reloc count overflow.  */
+    xcoff64_is_lineno_count_overflow,
+    xcoff64_is_reloc_count_overflow,
+
+    xcoff64_loader_symbol_offset,
+    xcoff64_loader_reloc_offset,
+
+    /* glink.  */
+    &xcoff64_glink_code[0],
+    40,				/* _xcoff_glink_size */
+
+    /* rtinit.  */
+    88,				/* _xcoff_rtinit_size */
+    xcoff64_generate_rtinit,
+  };
+
+/* The transfer vector that leads the outside world to all of the above.  */
+const bfd_target rs6000coff64_vec =
+  {
+    "aixcoff64-rs6000",
+    bfd_target_xcoff_flavour,
+    BFD_ENDIAN_BIG,		/* data byte order is big */
+    BFD_ENDIAN_BIG,		/* header byte order is big */
+
+    (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | DYNAMIC
+     | HAS_SYMS | HAS_LOCALS | WP_TEXT),
+
+    SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA,
+    0,				/* leading char */
+    '/',			/* ar_pad_char */
+    15,				/* ar_max_namelen */
+    0,				/* match priority.  */
+
+    /* data */
+    bfd_getb64,
+    bfd_getb_signed_64,
+    bfd_putb64,
+    bfd_getb32,
+    bfd_getb_signed_32,
+    bfd_putb32,
+    bfd_getb16,
+    bfd_getb_signed_16,
+    bfd_putb16,
+
+    /* hdrs */
+    bfd_getb64,
+    bfd_getb_signed_64,
+    bfd_putb64,
+    bfd_getb32,
+    bfd_getb_signed_32,
+    bfd_putb32,
+    bfd_getb16,
+    bfd_getb_signed_16,
+    bfd_putb16,
+
+    { /* bfd_check_format */
+      _bfd_dummy_target,
+      coff_object_p,
+      xcoff64_archive_p,
+      CORE_FILE_P
+    },
+
+    { /* bfd_set_format */
+      bfd_false,
+      coff_mkobject,
+      _bfd_generic_mkarchive,
+      bfd_false
+    },
+
+    {/* bfd_write_contents */
+      bfd_false,
+      xcoff64_write_object_contents,
+      _bfd_xcoff_write_archive_contents,
+      bfd_false
+    },
+
+    /* Generic */
+    bfd_true,
+    bfd_true,
+    coff_new_section_hook,
+    _bfd_generic_get_section_contents,
+    _bfd_generic_get_section_contents_in_window,
+
+    /* Copy */
+    _bfd_xcoff_copy_private_bfd_data,
+    _bfd_generic_bfd_merge_private_bfd_data,
+    _bfd_generic_init_private_section_data,
+    _bfd_generic_bfd_copy_private_section_data,
+    _bfd_generic_bfd_copy_private_symbol_data,
+    _bfd_generic_bfd_copy_private_header_data,
+    _bfd_generic_bfd_set_private_flags,
+    _bfd_generic_bfd_print_private_bfd_data,
+
+    /* Core */
+    BFD_JUMP_TABLE_CORE (coff),
+
+    /* Archive */
+    xcoff64_slurp_armap,
+    _bfd_noarchive_slurp_extended_name_table,
+    _bfd_noarchive_construct_extended_name_table,
+    bfd_dont_truncate_arname,
+    _bfd_xcoff_write_armap,
+    _bfd_xcoff_read_ar_hdr,
+    _bfd_generic_write_ar_hdr,
+    xcoff64_openr_next_archived_file,
+    _bfd_generic_get_elt_at_index,
+    _bfd_xcoff_stat_arch_elt,
+    bfd_true,
+
+    /* Symbols */
+    coff_get_symtab_upper_bound,
+    coff_canonicalize_symtab,
+    coff_make_empty_symbol,
+    coff_print_symbol,
+    coff_get_symbol_info,
+    _bfd_xcoff_is_local_label_name,
+    coff_bfd_is_target_special_symbol,
+    coff_get_lineno,
+    coff_find_nearest_line,
+    _bfd_generic_find_line,
+    coff_find_inliner_info,
+    coff_bfd_make_debug_symbol,
+    _bfd_generic_read_minisymbols,
+    _bfd_generic_minisymbol_to_symbol,
+
+    /* Reloc */
+    coff_get_reloc_upper_bound,
+    coff_canonicalize_reloc,
+    xcoff64_reloc_type_lookup,
+    xcoff64_reloc_name_lookup,
+
+    /* Write */
+    coff_set_arch_mach,
+    coff_set_section_contents,
+
+    /* Link */
+    xcoff64_sizeof_headers,
+    bfd_generic_get_relocated_section_contents,
+    bfd_generic_relax_section,
+    _bfd_xcoff_bfd_link_hash_table_create,
+    _bfd_generic_link_hash_table_free,
+    _bfd_xcoff_bfd_link_add_symbols,
+    _bfd_generic_link_just_syms,
+    _bfd_generic_copy_link_hash_symbol_type,
+    _bfd_xcoff_bfd_final_link,
+    _bfd_generic_link_split_section,
+    bfd_generic_gc_sections,
+    bfd_generic_lookup_section_flags,
+    bfd_generic_merge_sections,
+    bfd_generic_is_group_section,
+    bfd_generic_discard_group,
+    _bfd_generic_section_already_linked,
+    _bfd_xcoff_define_common_symbol,
+
+    /* Dynamic */
+    _bfd_xcoff_get_dynamic_symtab_upper_bound,
+    _bfd_xcoff_canonicalize_dynamic_symtab,
+    _bfd_nodynamic_get_synthetic_symtab,
+    _bfd_xcoff_get_dynamic_reloc_upper_bound,
+    _bfd_xcoff_canonicalize_dynamic_reloc,
+
+    /* Opposite endian version, none exists */
+    NULL,
+
+    &bfd_xcoff_backend_data,
+  };
+
+extern const bfd_target *xcoff64_core_p
+  (bfd *);
+extern bfd_boolean xcoff64_core_file_matches_executable_p
+  (bfd *, bfd *);
+extern char *xcoff64_core_file_failing_command
+  (bfd *);
+extern int xcoff64_core_file_failing_signal
+  (bfd *);
+#define xcoff64_core_file_pid _bfd_nocore_core_file_pid
+
+/* AIX 5 */
+static const struct xcoff_backend_data_rec bfd_xcoff_aix5_backend_data =
+  {
+    { /* COFF backend, defined in libcoff.h.  */
+      _bfd_xcoff64_swap_aux_in,
+      _bfd_xcoff64_swap_sym_in,
+      _bfd_xcoff64_swap_lineno_in,
+      _bfd_xcoff64_swap_aux_out,
+      _bfd_xcoff64_swap_sym_out,
+      _bfd_xcoff64_swap_lineno_out,
+      xcoff64_swap_reloc_out,
+      coff_swap_filehdr_out,
+      coff_swap_aouthdr_out,
+      coff_swap_scnhdr_out,
+      FILHSZ,
+      AOUTSZ,
+      SCNHSZ,
+      SYMESZ,
+      AUXESZ,
+      RELSZ,
+      LINESZ,
+      FILNMLEN,
+      TRUE,			/* _bfd_coff_long_filenames */
+      XCOFF_NO_LONG_SECTION_NAMES,  /* _bfd_coff_long_section_names */
+      3,			/* _bfd_coff_default_section_alignment_power */
+      TRUE,			/* _bfd_coff_force_symnames_in_strings */
+      4,			/* _bfd_coff_debug_string_prefix_length */
+      coff_swap_filehdr_in,
+      coff_swap_aouthdr_in,
+      coff_swap_scnhdr_in,
+      xcoff64_swap_reloc_in,
+      xcoff64_bad_format_hook,
+      coff_set_arch_mach_hook,
+      coff_mkobject_hook,
+      styp_to_sec_flags,
+      coff_set_alignment_hook,
+      coff_slurp_symbol_table,
+      symname_in_debug_hook,
+      coff_pointerize_aux_hook,
+      coff_print_aux,
+      dummy_reloc16_extra_cases,
+      dummy_reloc16_estimate,
+      NULL,			/* bfd_coff_sym_is_global */
+      coff_compute_section_file_positions,
+      NULL,			/* _bfd_coff_start_final_link */
+      xcoff64_ppc_relocate_section,
+      coff_rtype_to_howto,
+      NULL,			/* _bfd_coff_adjust_symndx */
+      _bfd_generic_link_add_one_symbol,
+      coff_link_output_has_begun,
+      coff_final_link_postscript,
+      NULL			/* print_pdata.  */
+    },
+
+    U64_TOCMAGIC,		/* magic number */
+    bfd_arch_powerpc,
+    bfd_mach_ppc_620,
+
+    /* Function pointers to xcoff specific swap routines.  */
+    xcoff64_swap_ldhdr_in,
+    xcoff64_swap_ldhdr_out,
+    xcoff64_swap_ldsym_in,
+    xcoff64_swap_ldsym_out,
+    xcoff64_swap_ldrel_in,
+    xcoff64_swap_ldrel_out,
+
+    /* Sizes.  */
+    LDHDRSZ,
+    LDSYMSZ,
+    LDRELSZ,
+    24,				/* _xcoff_function_descriptor_size */
+    0,				/* _xcoff_small_aout_header_size */
+    /* Versions.  */
+    2,				/* _xcoff_ldhdr_version */
+
+    _bfd_xcoff64_put_symbol_name,
+    _bfd_xcoff64_put_ldsymbol_name,
+    &xcoff64_dynamic_reloc,
+    xcoff64_create_csect_from_smclas,
+
+    /* Lineno and reloc count overflow.  */
+    xcoff64_is_lineno_count_overflow,
+    xcoff64_is_reloc_count_overflow,
+
+    xcoff64_loader_symbol_offset,
+    xcoff64_loader_reloc_offset,
+
+    /* glink.  */
+    &xcoff64_glink_code[0],
+    40,				/* _xcoff_glink_size */
+
+    /* rtinit.  */
+    88,				/* _xcoff_rtinit_size */
+    xcoff64_generate_rtinit,
+  };
+
+/* The transfer vector that leads the outside world to all of the above.  */
+const bfd_target aix5coff64_vec =
+  {
+    "aix5coff64-rs6000",
+    bfd_target_xcoff_flavour,
+    BFD_ENDIAN_BIG,		/* data byte order is big */
+    BFD_ENDIAN_BIG,		/* header byte order is big */
+
+    (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | DYNAMIC
+     | HAS_SYMS | HAS_LOCALS | WP_TEXT),
+
+    SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA,
+    0,				/* leading char */
+    '/',			/* ar_pad_char */
+    15,				/* ar_max_namelen */
+    0,				/* match priority.  */
+
+    /* data */
+    bfd_getb64,
+    bfd_getb_signed_64,
+    bfd_putb64,
+    bfd_getb32,
+    bfd_getb_signed_32,
+    bfd_putb32,
+    bfd_getb16,
+    bfd_getb_signed_16,
+    bfd_putb16,
+
+    /* hdrs */
+    bfd_getb64,
+    bfd_getb_signed_64,
+    bfd_putb64,
+    bfd_getb32,
+    bfd_getb_signed_32,
+    bfd_putb32,
+    bfd_getb16,
+    bfd_getb_signed_16,
+    bfd_putb16,
+
+    { /* bfd_check_format */
+      _bfd_dummy_target,
+      coff_object_p,
+      xcoff64_archive_p,
+      xcoff64_core_p
+    },
+
+    { /* bfd_set_format */
+      bfd_false,
+      coff_mkobject,
+      _bfd_generic_mkarchive,
+      bfd_false
+    },
+
+    {/* bfd_write_contents */
+      bfd_false,
+      xcoff64_write_object_contents,
+      _bfd_xcoff_write_archive_contents,
+      bfd_false
+    },
+
+    /* Generic */
+    bfd_true,
+    bfd_true,
+    coff_new_section_hook,
+    _bfd_generic_get_section_contents,
+    _bfd_generic_get_section_contents_in_window,
+
+    /* Copy */
+    _bfd_xcoff_copy_private_bfd_data,
+    _bfd_generic_bfd_merge_private_bfd_data,
+    _bfd_generic_init_private_section_data,
+    _bfd_generic_bfd_copy_private_section_data,
+    _bfd_generic_bfd_copy_private_symbol_data,
+    _bfd_generic_bfd_copy_private_header_data,
+    _bfd_generic_bfd_set_private_flags,
+    _bfd_generic_bfd_print_private_bfd_data,
+
+    /* Core */
+    BFD_JUMP_TABLE_CORE (xcoff64),
+
+    /* Archive */
+    xcoff64_slurp_armap,
+    _bfd_noarchive_slurp_extended_name_table,
+    _bfd_noarchive_construct_extended_name_table,
+    bfd_dont_truncate_arname,
+    _bfd_xcoff_write_armap,
+    _bfd_xcoff_read_ar_hdr,
+    _bfd_generic_write_ar_hdr,
+    xcoff64_openr_next_archived_file,
+    _bfd_generic_get_elt_at_index,
+    _bfd_xcoff_stat_arch_elt,
+    bfd_true,
+
+    /* Symbols */
+    coff_get_symtab_upper_bound,
+    coff_canonicalize_symtab,
+    coff_make_empty_symbol,
+    coff_print_symbol,
+    coff_get_symbol_info,
+    _bfd_xcoff_is_local_label_name,
+    coff_bfd_is_target_special_symbol,
+    coff_get_lineno,
+    coff_find_nearest_line,
+    _bfd_generic_find_line,
+    coff_find_inliner_info,
+    coff_bfd_make_debug_symbol,
+    _bfd_generic_read_minisymbols,
+    _bfd_generic_minisymbol_to_symbol,
+
+    /* Reloc */
+    coff_get_reloc_upper_bound,
+    coff_canonicalize_reloc,
+    xcoff64_reloc_type_lookup,
+    xcoff64_reloc_name_lookup,
+
+    /* Write */
+    coff_set_arch_mach,
+    coff_set_section_contents,
+
+    /* Link */
+    xcoff64_sizeof_headers,
+    bfd_generic_get_relocated_section_contents,
+    bfd_generic_relax_section,
+    _bfd_xcoff_bfd_link_hash_table_create,
+    _bfd_generic_link_hash_table_free,
+    _bfd_xcoff_bfd_link_add_symbols,
+    _bfd_generic_link_just_syms,
+    _bfd_generic_copy_link_hash_symbol_type,
+    _bfd_xcoff_bfd_final_link,
+    _bfd_generic_link_split_section,
+    bfd_generic_gc_sections,
+    bfd_generic_lookup_section_flags,
+    bfd_generic_merge_sections,
+    bfd_generic_is_group_section,
+    bfd_generic_discard_group,
+    _bfd_generic_section_already_linked,
+    _bfd_xcoff_define_common_symbol,
+
+    /* Dynamic */
+    _bfd_xcoff_get_dynamic_symtab_upper_bound,
+    _bfd_xcoff_canonicalize_dynamic_symtab,
+    _bfd_nodynamic_get_synthetic_symtab,
+    _bfd_xcoff_get_dynamic_reloc_upper_bound,
+    _bfd_xcoff_canonicalize_dynamic_reloc,
+
+    /* Opposite endian version, none exists.  */
+    NULL,
+
+    & bfd_xcoff_aix5_backend_data,
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coffcode.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coffcode.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coffcode.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coffcode.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,5829 @@
+/* Support for the generic parts of most COFF variants, for BFD.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* Most of this hacked by  Steve Chamberlain,
+			sac@cygnus.com.  */
+/*
+SECTION
+	coff backends
+
+	BFD supports a number of different flavours of coff format.
+	The major differences between formats are the sizes and
+	alignments of fields in structures on disk, and the occasional
+	extra field.
+
+	Coff in all its varieties is implemented with a few common
+	files and a number of implementation specific files. For
+	example, The 88k bcs coff format is implemented in the file
+	@file{coff-m88k.c}. This file @code{#include}s
+	@file{coff/m88k.h} which defines the external structure of the
+	coff format for the 88k, and @file{coff/internal.h} which
+	defines the internal structure. @file{coff-m88k.c} also
+	defines the relocations used by the 88k format
+	@xref{Relocations}.
+
+	The Intel i960 processor version of coff is implemented in
+	@file{coff-i960.c}. This file has the same structure as
+	@file{coff-m88k.c}, except that it includes @file{coff/i960.h}
+	rather than @file{coff-m88k.h}.
+
+SUBSECTION
+	Porting to a new version of coff
+
+	The recommended method is to select from the existing
+	implementations the version of coff which is most like the one
+	you want to use.  For example, we'll say that i386 coff is
+	the one you select, and that your coff flavour is called foo.
+	Copy @file{i386coff.c} to @file{foocoff.c}, copy
+	@file{../include/coff/i386.h} to @file{../include/coff/foo.h},
+	and add the lines to @file{targets.c} and @file{Makefile.in}
+	so that your new back end is used. Alter the shapes of the
+	structures in @file{../include/coff/foo.h} so that they match
+	what you need. You will probably also have to add
+	@code{#ifdef}s to the code in @file{coff/internal.h} and
+	@file{coffcode.h} if your version of coff is too wild.
+
+	You can verify that your new BFD backend works quite simply by
+	building @file{objdump} from the @file{binutils} directory,
+	and making sure that its version of what's going on and your
+	host system's idea (assuming it has the pretty standard coff
+	dump utility, usually called @code{att-dump} or just
+	@code{dump}) are the same.  Then clean up your code, and send
+	what you've done to Cygnus. Then your stuff will be in the
+	next release, and you won't have to keep integrating it.
+
+SUBSECTION
+	How the coff backend works
+
+SUBSUBSECTION
+	File layout
+
+	The Coff backend is split into generic routines that are
+	applicable to any Coff target and routines that are specific
+	to a particular target.  The target-specific routines are
+	further split into ones which are basically the same for all
+	Coff targets except that they use the external symbol format
+	or use different values for certain constants.
+
+	The generic routines are in @file{coffgen.c}.  These routines
+	work for any Coff target.  They use some hooks into the target
+	specific code; the hooks are in a @code{bfd_coff_backend_data}
+	structure, one of which exists for each target.
+
+	The essentially similar target-specific routines are in
+	@file{coffcode.h}.  This header file includes executable C code.
+	The various Coff targets first include the appropriate Coff
+	header file, make any special defines that are needed, and
+	then include @file{coffcode.h}.
+
+	Some of the Coff targets then also have additional routines in
+	the target source file itself.
+
+	For example, @file{coff-i960.c} includes
+	@file{coff/internal.h} and @file{coff/i960.h}.  It then
+	defines a few constants, such as @code{I960}, and includes
+	@file{coffcode.h}.  Since the i960 has complex relocation
+	types, @file{coff-i960.c} also includes some code to
+	manipulate the i960 relocs.  This code is not in
+	@file{coffcode.h} because it would not be used by any other
+	target.
+
+SUBSUBSECTION
+	Coff long section names
+
+	In the standard Coff object format, section names are limited to
+	the eight bytes available in the @code{s_name} field of the
+	@code{SCNHDR} section header structure.  The format requires the
+	field to be NUL-padded, but not necessarily NUL-terminated, so
+	the longest section names permitted are a full eight characters.
+
+	The Microsoft PE variants of the Coff object file format add
+	an extension to support the use of long section names.  This
+	extension is defined in section 4 of the Microsoft PE/COFF 
+	specification (rev 8.1).  If a section name is too long to fit
+	into the section header's @code{s_name} field, it is instead
+	placed into the string table, and the @code{s_name} field is
+	filled with a slash ("/") followed by the ASCII decimal 
+	representation of the offset of the full name relative to the
+	string table base.
+
+	Note that this implies that the extension can only be used in object
+	files, as executables do not contain a string table.  The standard
+	specifies that long section names from objects emitted into executable
+	images are to be truncated.
+
+	However, as a GNU extension, BFD can generate executable images
+	that contain a string table and long section names.  This
+	would appear to be technically valid, as the standard only says
+	that Coff debugging information is deprecated, not forbidden,
+	and in practice it works, although some tools that parse PE files
+	expecting the MS standard format may become confused; @file{PEview} is
+	one known example.
+
+	The functionality is supported in BFD by code implemented under 
+	the control of the macro @code{COFF_LONG_SECTION_NAMES}.  If not
+	defined, the format does not support long section names in any way.
+	If defined, it is used to initialise a flag, 
+	@code{_bfd_coff_long_section_names}, and a hook function pointer, 
+	@code{_bfd_coff_set_long_section_names}, in the Coff backend data
+	structure.  The flag controls the generation of long section names
+	in output BFDs at runtime; if it is false, as it will be by default
+	when generating an executable image, long section names are truncated;
+	if true, the long section names extension is employed.  The hook
+	points to a function that allows the value of the flag to be altered
+	at runtime, on formats that support long section names at all; on
+	other formats it points to a stub that returns an error indication.
+	
+	With input BFDs, the flag is set according to whether any long section
+	names are detected while reading the section headers.  For a completely
+	new BFD, the flag is set to the default for the target format.  This
+	information can be used by a client of the BFD library when deciding
+	what output format to generate, and means that a BFD that is opened
+	for read and subsequently converted to a writeable BFD and modified
+	in-place will retain whatever format it had on input.
+
+	If @code{COFF_LONG_SECTION_NAMES} is simply defined (blank), or is
+	defined to the value "1", then long section names are enabled by
+	default; if it is defined to the value zero, they are disabled by
+	default (but still accepted in input BFDs).  The header @file{coffcode.h}
+	defines a macro, @code{COFF_DEFAULT_LONG_SECTION_NAMES}, which is
+	used in the backends to initialise the backend data structure fields
+	appropriately; see the comments for further detail.
+
+SUBSUBSECTION
+	Bit twiddling
+
+	Each flavour of coff supported in BFD has its own header file
+	describing the external layout of the structures. There is also
+	an internal description of the coff layout, in
+	@file{coff/internal.h}. A major function of the
+	coff backend is swapping the bytes and twiddling the bits to
+	translate the external form of the structures into the normal
+	internal form. This is all performed in the
+	@code{bfd_swap}_@i{thing}_@i{direction} routines. Some
+	elements are different sizes between different versions of
+	coff; it is the duty of the coff version specific include file
+	to override the definitions of various packing routines in
+	@file{coffcode.h}. E.g., the size of line number entry in coff is
+	sometimes 16 bits, and sometimes 32 bits. @code{#define}ing
+	@code{PUT_LNSZ_LNNO} and @code{GET_LNSZ_LNNO} will select the
+	correct one. No doubt, some day someone will find a version of
+	coff which has a varying field size not catered to at the
+	moment. To port BFD, that person will have to add more @code{#defines}.
+	Three of the bit twiddling routines are exported to
+	@code{gdb}; @code{coff_swap_aux_in}, @code{coff_swap_sym_in}
+	and @code{coff_swap_lineno_in}. @code{GDB} reads the symbol
+	table on its own, but uses BFD to fix things up.  More of the
+	bit twiddlers are exported for @code{gas};
+	@code{coff_swap_aux_out}, @code{coff_swap_sym_out},
+	@code{coff_swap_lineno_out}, @code{coff_swap_reloc_out},
+	@code{coff_swap_filehdr_out}, @code{coff_swap_aouthdr_out},
+	@code{coff_swap_scnhdr_out}. @code{Gas} currently keeps track
+	of all the symbol table and reloc drudgery itself, thereby
+	saving the internal BFD overhead, but uses BFD to swap things
+	on the way out, making cross ports much safer.  Doing so also
+	allows BFD (and thus the linker) to use the same header files
+	as @code{gas}, which makes one avenue to disaster disappear.
+
+SUBSUBSECTION
+	Symbol reading
+
+	The simple canonical form for symbols used by BFD is not rich
+	enough to keep all the information available in a coff symbol
+	table. The back end gets around this problem by keeping the original
+	symbol table around, "behind the scenes".
+
+	When a symbol table is requested (through a call to
+	@code{bfd_canonicalize_symtab}), a request gets through to
+	@code{coff_get_normalized_symtab}. This reads the symbol table from
+	the coff file and swaps all the structures inside into the
+	internal form. It also fixes up all the pointers in the table
+	(represented in the file by offsets from the first symbol in
+	the table) into physical pointers to elements in the new
+	internal table. This involves some work since the meanings of
+	fields change depending upon context: a field that is a
+	pointer to another structure in the symbol table at one moment
+	may be the size in bytes of a structure at the next.  Another
+	pass is made over the table. All symbols which mark file names
+	(<<C_FILE>> symbols) are modified so that the internal
+	string points to the value in the auxent (the real filename)
+	rather than the normal text associated with the symbol
+	(@code{".file"}).
+
+	At this time the symbol names are moved around. Coff stores
+	all symbols less than nine characters long physically
+	within the symbol table; longer strings are kept at the end of
+	the file in the string table. This pass moves all strings
+	into memory and replaces them with pointers to the strings.
+
+	The symbol table is massaged once again, this time to create
+	the canonical table used by the BFD application. Each symbol
+	is inspected in turn, and a decision made (using the
+	@code{sclass} field) about the various flags to set in the
+	@code{asymbol}.  @xref{Symbols}. The generated canonical table
+	shares strings with the hidden internal symbol table.
+
+	Any linenumbers are read from the coff file too, and attached
+	to the symbols which own the functions the linenumbers belong to.
+
+SUBSUBSECTION
+	Symbol writing
+
+	Writing a symbol to a coff file which didn't come from a coff
+	file will lose any debugging information. The @code{asymbol}
+	structure remembers the BFD from which the symbol was taken, and on
+	output the back end makes sure that the same destination target as
+	source target is present.
+
+	When the symbols have come from a coff file then all the
+	debugging information is preserved.
+
+	Symbol tables are provided for writing to the back end in a
+	vector of pointers to pointers. This allows applications like
+	the linker to accumulate and output large symbol tables
+	without having to do too much byte copying.
+
+	This function runs through the provided symbol table and
+	patches each symbol marked as a file place holder
+	(@code{C_FILE}) to point to the next file place holder in the
+	list. It also marks each @code{offset} field in the list with
+	the offset from the first symbol of the current symbol.
+
+	Another function of this procedure is to turn the canonical
+	value form of BFD into the form used by coff. Internally, BFD
+	expects symbol values to be offsets from a section base; so a
+	symbol physically at 0x120, but in a section starting at
+	0x100, would have the value 0x20. Coff expects symbols to
+	contain their final value, so symbols have their values
+	changed at this point to reflect their sum with their owning
+	section.  This transformation uses the
+	<<output_section>> field of the @code{asymbol}'s
+	@code{asection} @xref{Sections}.
+
+	o <<coff_mangle_symbols>>
+
+	This routine runs though the provided symbol table and uses
+	the offsets generated by the previous pass and the pointers
+	generated when the symbol table was read in to create the
+	structured hierarchy required by coff. It changes each pointer
+	to a symbol into the index into the symbol table of the asymbol.
+
+	o <<coff_write_symbols>>
+
+	This routine runs through the symbol table and patches up the
+	symbols from their internal form into the coff way, calls the
+	bit twiddlers, and writes out the table to the file.
+
+*/
+
+/*
+INTERNAL_DEFINITION
+	coff_symbol_type
+
+DESCRIPTION
+	The hidden information for an <<asymbol>> is described in a
+	<<combined_entry_type>>:
+
+CODE_FRAGMENT
+.
+.typedef struct coff_ptr_struct
+.{
+.  {* Remembers the offset from the first symbol in the file for
+.     this symbol. Generated by coff_renumber_symbols. *}
+.  unsigned int offset;
+.
+.  {* Should the value of this symbol be renumbered.  Used for
+.     XCOFF C_BSTAT symbols.  Set by coff_slurp_symbol_table.  *}
+.  unsigned int fix_value : 1;
+.
+.  {* Should the tag field of this symbol be renumbered.
+.     Created by coff_pointerize_aux. *}
+.  unsigned int fix_tag : 1;
+.
+.  {* Should the endidx field of this symbol be renumbered.
+.     Created by coff_pointerize_aux. *}
+.  unsigned int fix_end : 1;
+.
+.  {* Should the x_csect.x_scnlen field be renumbered.
+.     Created by coff_pointerize_aux. *}
+.  unsigned int fix_scnlen : 1;
+.
+.  {* Fix up an XCOFF C_BINCL/C_EINCL symbol.  The value is the
+.     index into the line number entries.  Set by coff_slurp_symbol_table.  *}
+.  unsigned int fix_line : 1;
+.
+.  {* The container for the symbol structure as read and translated
+.     from the file. *}
+.  union
+.  {
+.    union internal_auxent auxent;
+.    struct internal_syment syment;
+.  } u;
+.} combined_entry_type;
+.
+.
+.{* Each canonical asymbol really looks like this: *}
+.
+.typedef struct coff_symbol_struct
+.{
+.  {* The actual symbol which the rest of BFD works with *}
+.  asymbol symbol;
+.
+.  {* A pointer to the hidden information for this symbol *}
+.  combined_entry_type *native;
+.
+.  {* A pointer to the linenumber information for this symbol *}
+.  struct lineno_cache_entry *lineno;
+.
+.  {* Have the line numbers been relocated yet ? *}
+.  bfd_boolean done_lineno;
+.} coff_symbol_type;
+
+*/
+
+#include "libiberty.h"
+
+#ifdef COFF_WITH_PE
+#include "peicode.h"
+#else
+#include "coffswap.h"
+#endif
+
+#define STRING_SIZE_SIZE 4
+
+#define DOT_DEBUG	".debug"
+#define GNU_LINKONCE_WI ".gnu.linkonce.wi."
+#define GNU_LINKONCE_WT ".gnu.linkonce.wt."
+#define DOT_RELOC	".reloc"
+
+#if defined (COFF_LONG_SECTION_NAMES)
+/* Needed to expand the inputs to BLANKOR1TOODD.  */
+#define COFFLONGSECTIONCATHELPER(x,y)    x ## y
+/* If the input macro Y is blank or '1', return an odd number; if it is
+   '0', return an even number.  Result undefined in all other cases.  */
+#define BLANKOR1TOODD(y)                 COFFLONGSECTIONCATHELPER(1,y)
+/* Defined to numerical 0 or 1 according to whether generation of long
+   section names is disabled or enabled by default.  */
+#define COFF_ENABLE_LONG_SECTION_NAMES   (BLANKOR1TOODD(COFF_LONG_SECTION_NAMES) & 1)
+/* Where long section names are supported, we allow them to be enabled
+   and disabled at runtime, so select an appropriate hook function for
+   _bfd_coff_set_long_section_names.  */
+#define COFF_LONG_SECTION_NAMES_SETTER   bfd_coff_set_long_section_names_allowed
+#else /* !defined (COFF_LONG_SECTION_NAMES) */
+/* If long section names are not supported, this stub disallows any
+   attempt to enable them at run-time.  */
+#define COFF_LONG_SECTION_NAMES_SETTER   bfd_coff_set_long_section_names_disallowed
+#endif /* defined (COFF_LONG_SECTION_NAMES) */
+
+/* Define a macro that can be used to initialise both the fields relating
+   to long section names in the backend data struct simultaneously.  */
+#if COFF_ENABLE_LONG_SECTION_NAMES
+#define COFF_DEFAULT_LONG_SECTION_NAMES  (TRUE), COFF_LONG_SECTION_NAMES_SETTER
+#else /* !COFF_ENABLE_LONG_SECTION_NAMES */
+#define COFF_DEFAULT_LONG_SECTION_NAMES  (FALSE), COFF_LONG_SECTION_NAMES_SETTER
+#endif /* COFF_ENABLE_LONG_SECTION_NAMES */
+
+#if defined (COFF_LONG_SECTION_NAMES)
+static bfd_boolean bfd_coff_set_long_section_names_allowed
+  (bfd *, int);
+#else /* !defined (COFF_LONG_SECTION_NAMES) */
+static bfd_boolean bfd_coff_set_long_section_names_disallowed
+  (bfd *, int);
+#endif /* defined (COFF_LONG_SECTION_NAMES) */
+static long sec_to_styp_flags
+  (const char *, flagword);
+static bfd_boolean styp_to_sec_flags
+  (bfd *, void *, const char *, asection *, flagword *);
+static bfd_boolean coff_bad_format_hook
+  (bfd *, void *);
+static void coff_set_custom_section_alignment
+  (bfd *, asection *, const struct coff_section_alignment_entry *,
+   const unsigned int);
+static bfd_boolean coff_new_section_hook
+  (bfd *, asection *);
+static bfd_boolean coff_set_arch_mach_hook
+  (bfd *, void *);
+static bfd_boolean coff_write_relocs
+  (bfd *, int);
+static bfd_boolean coff_set_flags
+  (bfd *, unsigned int *, unsigned short *);
+static bfd_boolean coff_set_arch_mach
+  (bfd *, enum bfd_architecture, unsigned long) ATTRIBUTE_UNUSED;
+static bfd_boolean coff_compute_section_file_positions
+  (bfd *);
+static bfd_boolean coff_write_object_contents
+  (bfd *) ATTRIBUTE_UNUSED;
+static bfd_boolean coff_set_section_contents
+  (bfd *, asection *, const void *, file_ptr, bfd_size_type);
+static void * buy_and_read
+  (bfd *, file_ptr, bfd_size_type);
+static bfd_boolean coff_slurp_line_table
+  (bfd *, asection *);
+static bfd_boolean coff_slurp_symbol_table
+  (bfd *);
+static enum coff_symbol_classification coff_classify_symbol
+  (bfd *, struct internal_syment *);
+static bfd_boolean coff_slurp_reloc_table
+  (bfd *, asection *, asymbol **);
+static long coff_canonicalize_reloc
+  (bfd *, asection *, arelent **, asymbol **);
+#ifndef coff_mkobject_hook
+static void * coff_mkobject_hook
+  (bfd *, void *,  void *);
+#endif
+#ifdef COFF_WITH_PE
+static flagword handle_COMDAT
+  (bfd *, flagword, void *, const char *, asection *);
+#endif
+#ifdef COFF_IMAGE_WITH_PE
+static bfd_boolean coff_read_word
+  (bfd *, unsigned int *);
+static unsigned int coff_compute_checksum
+  (bfd *);
+static bfd_boolean coff_apply_checksum
+  (bfd *);
+#endif
+#ifdef TICOFF
+static bfd_boolean ticoff0_bad_format_hook
+  (bfd *, void * );
+static bfd_boolean ticoff1_bad_format_hook
+  (bfd *, void * );
+#endif
+
+/* void warning(); */
+
+#if defined (COFF_LONG_SECTION_NAMES)
+static bfd_boolean
+bfd_coff_set_long_section_names_allowed (bfd *abfd, int enable)
+{
+  coff_backend_info (abfd)->_bfd_coff_long_section_names = enable;
+  return TRUE;
+}
+#else /* !defined (COFF_LONG_SECTION_NAMES) */
+static bfd_boolean
+bfd_coff_set_long_section_names_disallowed (bfd *abfd, int enable)
+{
+  (void) abfd;
+  (void) enable;
+  return FALSE;
+}
+#endif /* defined (COFF_LONG_SECTION_NAMES) */
+
+/* Return a word with STYP_* (scnhdr.s_flags) flags set to represent
+   the incoming SEC_* flags.  The inverse of this function is
+   styp_to_sec_flags().  NOTE: If you add to/change this routine, you
+   should probably mirror the changes in styp_to_sec_flags().  */
+
+#ifndef COFF_WITH_PE
+
+/* Macros for setting debugging flags.  */
+
+#ifdef STYP_DEBUG
+#define STYP_XCOFF_DEBUG STYP_DEBUG
+#else
+#define STYP_XCOFF_DEBUG STYP_INFO
+#endif
+
+#ifdef COFF_ALIGN_IN_S_FLAGS
+#define STYP_DEBUG_INFO STYP_DSECT
+#else
+#define STYP_DEBUG_INFO STYP_INFO
+#endif
+
+static long
+sec_to_styp_flags (const char *sec_name, flagword sec_flags)
+{
+  long styp_flags = 0;
+
+  if (!strcmp (sec_name, _TEXT))
+    {
+      styp_flags = STYP_TEXT;
+    }
+  else if (!strcmp (sec_name, _DATA))
+    {
+      styp_flags = STYP_DATA;
+    }
+  else if (!strcmp (sec_name, _BSS))
+    {
+      styp_flags = STYP_BSS;
+#ifdef _COMMENT
+    }
+  else if (!strcmp (sec_name, _COMMENT))
+    {
+      styp_flags = STYP_INFO;
+#endif /* _COMMENT */
+#ifdef _LIB
+    }
+  else if (!strcmp (sec_name, _LIB))
+    {
+      styp_flags = STYP_LIB;
+#endif /* _LIB */
+#ifdef _LIT
+    }
+  else if (!strcmp (sec_name, _LIT))
+    {
+      styp_flags = STYP_LIT;
+#endif /* _LIT */
+    }
+  else if (CONST_STRNEQ (sec_name, DOT_DEBUG))
+    {
+      /* Handle the XCOFF debug section and DWARF2 debug sections.  */
+      if (!sec_name[6])
+	styp_flags = STYP_XCOFF_DEBUG;
+      else
+	styp_flags = STYP_DEBUG_INFO;
+    }
+  else if (CONST_STRNEQ (sec_name, ".stab"))
+    {
+      styp_flags = STYP_DEBUG_INFO;
+    }
+#ifdef COFF_LONG_SECTION_NAMES
+  else if (CONST_STRNEQ (sec_name, GNU_LINKONCE_WI)
+  	   || CONST_STRNEQ (sec_name, GNU_LINKONCE_WT))
+    {
+      styp_flags = STYP_DEBUG_INFO;
+    }
+#endif
+#ifdef RS6000COFF_C
+  else if (!strcmp (sec_name, _PAD))
+    {
+      styp_flags = STYP_PAD;
+    }
+  else if (!strcmp (sec_name, _LOADER))
+    {
+      styp_flags = STYP_LOADER;
+    }
+  else if (!strcmp (sec_name, _EXCEPT))
+    {
+      styp_flags = STYP_EXCEPT;
+    }
+  else if (!strcmp (sec_name, _TYPCHK))
+    {
+      styp_flags = STYP_TYPCHK;
+    }
+  else if (sec_flags & SEC_DEBUGGING)
+    {
+      int i;
+
+      for (i = 0; i < XCOFF_DWSECT_NBR_NAMES; i++)
+        if (!strcmp (sec_name, xcoff_dwsect_names[i].name))
+          {
+            styp_flags = STYP_DWARF | xcoff_dwsect_names[i].flag;
+            break;
+          }
+    }
+#endif
+  /* Try and figure out what it should be */
+  else if (sec_flags & SEC_CODE)
+    {
+      styp_flags = STYP_TEXT;
+    }
+  else if (sec_flags & SEC_DATA)
+    {
+      styp_flags = STYP_DATA;
+    }
+  else if (sec_flags & SEC_READONLY)
+    {
+#ifdef STYP_LIT			/* 29k readonly text/data section */
+      styp_flags = STYP_LIT;
+#else
+      styp_flags = STYP_TEXT;
+#endif /* STYP_LIT */
+    }
+  else if (sec_flags & SEC_LOAD)
+    {
+      styp_flags = STYP_TEXT;
+    }
+  else if (sec_flags & SEC_ALLOC)
+    {
+      styp_flags = STYP_BSS;
+    }
+
+#ifdef STYP_CLINK
+  if (sec_flags & SEC_TIC54X_CLINK)
+    styp_flags |= STYP_CLINK;
+#endif
+
+#ifdef STYP_BLOCK
+  if (sec_flags & SEC_TIC54X_BLOCK)
+    styp_flags |= STYP_BLOCK;
+#endif
+
+#ifdef STYP_NOLOAD
+  if ((sec_flags & (SEC_NEVER_LOAD | SEC_COFF_SHARED_LIBRARY)) != 0)
+    styp_flags |= STYP_NOLOAD;
+#endif
+
+  return styp_flags;
+}
+
+#else /* COFF_WITH_PE */
+
+/* The PE version; see above for the general comments.  The non-PE
+   case seems to be more guessing, and breaks PE format; specifically,
+   .rdata is readonly, but it sure ain't text.  Really, all this
+   should be set up properly in gas (or whatever assembler is in use),
+   and honor whatever objcopy/strip, etc. sent us as input.  */
+
+static long
+sec_to_styp_flags (const char *sec_name, flagword sec_flags)
+{
+  long styp_flags = 0;
+  bfd_boolean is_dbg = FALSE;
+
+  if (CONST_STRNEQ (sec_name, DOT_DEBUG)
+#ifdef COFF_LONG_SECTION_NAMES
+      || CONST_STRNEQ (sec_name, GNU_LINKONCE_WI)
+      || CONST_STRNEQ (sec_name, GNU_LINKONCE_WT)
+#endif
+      || CONST_STRNEQ (sec_name, ".stab"))
+    is_dbg = TRUE;
+
+  /* caution: there are at least three groups of symbols that have
+     very similar bits and meanings: IMAGE_SCN*, SEC_*, and STYP_*.
+     SEC_* are the BFD internal flags, used for generic BFD
+     information.  STYP_* are the COFF section flags which appear in
+     COFF files.  IMAGE_SCN_* are the PE section flags which appear in
+     PE files.  The STYP_* flags and the IMAGE_SCN_* flags overlap,
+     but there are more IMAGE_SCN_* flags.  */
+
+  /* FIXME: There is no gas syntax to specify the debug section flag.  */
+  if (is_dbg)
+    {
+      sec_flags &= (SEC_LINK_ONCE | SEC_LINK_DUPLICATES_DISCARD);
+      sec_flags |= SEC_DEBUGGING | SEC_READONLY;
+    }
+
+  /* skip LOAD */
+  /* READONLY later */
+  /* skip RELOC */
+  if ((sec_flags & SEC_CODE) != 0)
+    styp_flags |= IMAGE_SCN_CNT_CODE;
+  if ((sec_flags & (SEC_DATA | SEC_DEBUGGING)) != 0)
+    styp_flags |= IMAGE_SCN_CNT_INITIALIZED_DATA;
+  if ((sec_flags & SEC_ALLOC) != 0 && (sec_flags & SEC_LOAD) == 0)
+    styp_flags |= IMAGE_SCN_CNT_UNINITIALIZED_DATA;  /* ==STYP_BSS */
+  /* skip ROM */
+  /* skip constRUCTOR */
+  /* skip CONTENTS */
+  if ((sec_flags & SEC_IS_COMMON) != 0)
+    styp_flags |= IMAGE_SCN_LNK_COMDAT;
+  if ((sec_flags & SEC_DEBUGGING) != 0)
+    styp_flags |= IMAGE_SCN_MEM_DISCARDABLE;
+  if ((sec_flags & SEC_EXCLUDE) != 0 && !is_dbg)
+    styp_flags |= IMAGE_SCN_LNK_REMOVE;
+  if ((sec_flags & SEC_NEVER_LOAD) != 0 && !is_dbg)
+    styp_flags |= IMAGE_SCN_LNK_REMOVE;
+  /* skip IN_MEMORY */
+  /* skip SORT */
+  if (sec_flags & SEC_LINK_ONCE)
+    styp_flags |= IMAGE_SCN_LNK_COMDAT;
+  /* skip LINK_DUPLICATES */
+  /* skip LINKER_CREATED */
+
+  if ((sec_flags & SEC_COFF_NOREAD) == 0)
+    styp_flags |= IMAGE_SCN_MEM_READ;     /* Invert NOREAD for read.  */
+  if ((sec_flags & SEC_READONLY) == 0)
+    styp_flags |= IMAGE_SCN_MEM_WRITE;    /* Invert READONLY for write.  */
+  if (sec_flags & SEC_CODE)
+    styp_flags |= IMAGE_SCN_MEM_EXECUTE;  /* CODE->EXECUTE.  */
+  if (sec_flags & SEC_COFF_SHARED)
+    styp_flags |= IMAGE_SCN_MEM_SHARED;   /* Shared remains meaningful.  */
+
+  return styp_flags;
+}
+
+#endif /* COFF_WITH_PE */
+
+/* Return a word with SEC_* flags set to represent the incoming STYP_*
+   flags (from scnhdr.s_flags).  The inverse of this function is
+   sec_to_styp_flags().  NOTE: If you add to/change this routine, you
+   should probably mirror the changes in sec_to_styp_flags().  */
+
+#ifndef COFF_WITH_PE
+
+static bfd_boolean
+styp_to_sec_flags (bfd *abfd ATTRIBUTE_UNUSED,
+		   void * hdr,
+		   const char *name,
+		   asection *section ATTRIBUTE_UNUSED,
+		   flagword *flags_ptr)
+{
+  struct internal_scnhdr *internal_s = (struct internal_scnhdr *) hdr;
+  long styp_flags = internal_s->s_flags;
+  flagword sec_flags = 0;
+
+#ifdef STYP_BLOCK
+  if (styp_flags & STYP_BLOCK)
+    sec_flags |= SEC_TIC54X_BLOCK;
+#endif
+
+#ifdef STYP_CLINK
+  if (styp_flags & STYP_CLINK)
+    sec_flags |= SEC_TIC54X_CLINK;
+#endif
+
+#ifdef STYP_NOLOAD
+  if (styp_flags & STYP_NOLOAD)
+    sec_flags |= SEC_NEVER_LOAD;
+#endif /* STYP_NOLOAD */
+
+  /* For 386 COFF, at least, an unloadable text or data section is
+     actually a shared library section.  */
+  if (styp_flags & STYP_TEXT)
+    {
+      if (sec_flags & SEC_NEVER_LOAD)
+	sec_flags |= SEC_CODE | SEC_COFF_SHARED_LIBRARY;
+      else
+	sec_flags |= SEC_CODE | SEC_LOAD | SEC_ALLOC;
+    }
+  else if (styp_flags & STYP_DATA)
+    {
+      if (sec_flags & SEC_NEVER_LOAD)
+	sec_flags |= SEC_DATA | SEC_COFF_SHARED_LIBRARY;
+      else
+	sec_flags |= SEC_DATA | SEC_LOAD | SEC_ALLOC;
+    }
+  else if (styp_flags & STYP_BSS)
+    {
+#ifdef BSS_NOLOAD_IS_SHARED_LIBRARY
+      if (sec_flags & SEC_NEVER_LOAD)
+	sec_flags |= SEC_ALLOC | SEC_COFF_SHARED_LIBRARY;
+      else
+#endif
+	sec_flags |= SEC_ALLOC;
+    }
+  else if (styp_flags & STYP_INFO)
+    {
+      /* We mark these as SEC_DEBUGGING, but only if COFF_PAGE_SIZE is
+	 defined.  coff_compute_section_file_positions uses
+	 COFF_PAGE_SIZE to ensure that the low order bits of the
+	 section VMA and the file offset match.  If we don't know
+	 COFF_PAGE_SIZE, we can't ensure the correct correspondence,
+	 and demand page loading of the file will fail.  */
+#if defined (COFF_PAGE_SIZE) && !defined (COFF_ALIGN_IN_S_FLAGS)
+      sec_flags |= SEC_DEBUGGING;
+#endif
+    }
+  else if (styp_flags & STYP_PAD)
+    sec_flags = 0;
+#ifdef RS6000COFF_C
+  else if (styp_flags & STYP_DWARF)
+    sec_flags |= SEC_DEBUGGING;
+#endif
+  else if (strcmp (name, _TEXT) == 0)
+    {
+      if (sec_flags & SEC_NEVER_LOAD)
+	sec_flags |= SEC_CODE | SEC_COFF_SHARED_LIBRARY;
+      else
+	sec_flags |= SEC_CODE | SEC_LOAD | SEC_ALLOC;
+    }
+  else if (strcmp (name, _DATA) == 0)
+    {
+      if (sec_flags & SEC_NEVER_LOAD)
+	sec_flags |= SEC_DATA | SEC_COFF_SHARED_LIBRARY;
+      else
+	sec_flags |= SEC_DATA | SEC_LOAD | SEC_ALLOC;
+    }
+  else if (strcmp (name, _BSS) == 0)
+    {
+#ifdef BSS_NOLOAD_IS_SHARED_LIBRARY
+      if (sec_flags & SEC_NEVER_LOAD)
+	sec_flags |= SEC_ALLOC | SEC_COFF_SHARED_LIBRARY;
+      else
+#endif
+	sec_flags |= SEC_ALLOC;
+    }
+  else if (CONST_STRNEQ (name, DOT_DEBUG)
+#ifdef _COMMENT
+	   || strcmp (name, _COMMENT) == 0
+#endif
+#ifdef COFF_LONG_SECTION_NAMES
+	   || CONST_STRNEQ (name, GNU_LINKONCE_WI)
+	   || CONST_STRNEQ (name, GNU_LINKONCE_WT)
+#endif
+	   || CONST_STRNEQ (name, ".stab"))
+    {
+#ifdef COFF_PAGE_SIZE
+      sec_flags |= SEC_DEBUGGING;
+#endif
+    }
+#ifdef _LIB
+  else if (strcmp (name, _LIB) == 0)
+    ;
+#endif
+#ifdef _LIT
+  else if (strcmp (name, _LIT) == 0)
+    sec_flags = SEC_LOAD | SEC_ALLOC | SEC_READONLY;
+#endif
+  else
+    sec_flags |= SEC_ALLOC | SEC_LOAD;
+
+#ifdef STYP_LIT			/* A29k readonly text/data section type.  */
+  if ((styp_flags & STYP_LIT) == STYP_LIT)
+    sec_flags = (SEC_LOAD | SEC_ALLOC | SEC_READONLY);
+#endif /* STYP_LIT */
+
+#ifdef STYP_OTHER_LOAD		/* Other loaded sections.  */
+  if (styp_flags & STYP_OTHER_LOAD)
+    sec_flags = (SEC_LOAD | SEC_ALLOC);
+#endif /* STYP_SDATA */
+
+#if defined (COFF_LONG_SECTION_NAMES) && defined (COFF_SUPPORT_GNU_LINKONCE)
+  /* As a GNU extension, if the name begins with .gnu.linkonce, we
+     only link a single copy of the section.  This is used to support
+     g++.  g++ will emit each template expansion in its own section.
+     The symbols will be defined as weak, so that multiple definitions
+     are permitted.  The GNU linker extension is to actually discard
+     all but one of the sections.  */
+  if (CONST_STRNEQ (name, ".gnu.linkonce"))
+    sec_flags |= SEC_LINK_ONCE | SEC_LINK_DUPLICATES_DISCARD;
+#endif
+
+  if (flags_ptr == NULL)
+    return FALSE;
+
+  * flags_ptr = sec_flags;
+  return TRUE;
+}
+
+#else /* COFF_WITH_PE */
+
+static flagword
+handle_COMDAT (bfd * abfd,
+	       flagword sec_flags,
+	       void * hdr,
+	       const char *name,
+	       asection *section)
+{
+  struct internal_scnhdr *internal_s = (struct internal_scnhdr *) hdr;
+  bfd_byte *esymstart, *esym, *esymend;
+  int seen_state = 0;
+  char *target_name = NULL;
+
+  sec_flags |= SEC_LINK_ONCE;
+
+  /* Unfortunately, the PE format stores essential information in
+     the symbol table, of all places.  We need to extract that
+     information now, so that objdump and the linker will know how
+     to handle the section without worrying about the symbols.  We
+     can't call slurp_symtab, because the linker doesn't want the
+     swapped symbols.  */
+
+  /* COMDAT sections are special.  The first symbol is the section
+     symbol, which tells what kind of COMDAT section it is.  The
+     second symbol is the "comdat symbol" - the one with the
+     unique name.  GNU uses the section symbol for the unique
+     name; MS uses ".text" for every comdat section.  Sigh.  - DJ */
+
+  /* This is not mirrored in sec_to_styp_flags(), but there
+     doesn't seem to be a need to, either, and it would at best be
+     rather messy.  */
+
+  if (! _bfd_coff_get_external_symbols (abfd))
+    return sec_flags;
+
+  esymstart = esym = (bfd_byte *) obj_coff_external_syms (abfd);
+  esymend = esym + obj_raw_syment_count (abfd) * bfd_coff_symesz (abfd);
+
+  while (esym < esymend)
+    {
+      struct internal_syment isym;
+      char buf[SYMNMLEN + 1];
+      const char *symname;
+
+      bfd_coff_swap_sym_in (abfd, esym, & isym);
+
+      if (sizeof (internal_s->s_name) > SYMNMLEN)
+	{
+	  /* This case implies that the matching
+	     symbol name will be in the string table.  */
+	  abort ();
+	}
+
+      if (isym.n_scnum == section->target_index)
+	{
+	  /* According to the MSVC documentation, the first
+	     TWO entries with the section # are both of
+	     interest to us.  The first one is the "section
+	     symbol" (section name).  The second is the comdat
+	     symbol name.  Here, we've found the first
+	     qualifying entry; we distinguish it from the
+	     second with a state flag.
+
+	     In the case of gas-generated (at least until that
+	     is fixed) .o files, it isn't necessarily the
+	     second one.  It may be some other later symbol.
+
+	     Since gas also doesn't follow MS conventions and
+	     emits the section similar to .text$<name>, where
+	     <something> is the name we're looking for, we
+	     distinguish the two as follows:
+
+	     If the section name is simply a section name (no
+	     $) we presume it's MS-generated, and look at
+	     precisely the second symbol for the comdat name.
+	     If the section name has a $, we assume it's
+	     gas-generated, and look for <something> (whatever
+	     follows the $) as the comdat symbol.  */
+
+	  /* All 3 branches use this.  */
+	  symname = _bfd_coff_internal_syment_name (abfd, &isym, buf);
+
+	  if (symname == NULL)
+	    abort ();
+
+	  switch (seen_state)
+	    {
+	    case 0:
+	      {
+		/* The first time we've seen the symbol.  */
+		union internal_auxent aux;
+
+		/* If it isn't the stuff we're expecting, die;
+		   The MS documentation is vague, but it
+		   appears that the second entry serves BOTH
+		   as the comdat symbol and the defining
+		   symbol record (either C_STAT or C_EXT,
+		   possibly with an aux entry with debug
+		   information if it's a function.)  It
+		   appears the only way to find the second one
+		   is to count.  (On Intel, they appear to be
+		   adjacent, but on Alpha, they have been
+		   found separated.)
+
+		   Here, we think we've found the first one,
+		   but there's some checking we can do to be
+		   sure.  */
+
+		if (! ((isym.n_sclass == C_STAT
+			|| isym.n_sclass == C_EXT)
+		       && BTYPE (isym.n_type) == T_NULL
+		       && isym.n_value == 0))
+		  abort ();
+
+		/* FIXME LATER: MSVC generates section names
+		   like .text for comdats.  Gas generates
+		   names like .text$foo__Fv (in the case of a
+		   function).  See comment above for more.  */
+
+		if (isym.n_sclass == C_STAT && strcmp (name, symname) != 0)
+		  _bfd_error_handler (_("%B: warning: COMDAT symbol '%s' does not match section name '%s'"),
+				      abfd, symname, name);
+
+		seen_state = 1;
+
+		/* This is the section symbol.  */
+		bfd_coff_swap_aux_in (abfd, (esym + bfd_coff_symesz (abfd)),
+				      isym.n_type, isym.n_sclass,
+				      0, isym.n_numaux, & aux);
+
+		target_name = strchr (name, '$');
+		if (target_name != NULL)
+		  {
+		    /* Gas mode.  */
+		    seen_state = 2;
+		    /* Skip the `$'.  */
+		    target_name += 1;
+		  }
+
+		/* FIXME: Microsoft uses NODUPLICATES and
+		   ASSOCIATIVE, but gnu uses ANY and
+		   SAME_SIZE.  Unfortunately, gnu doesn't do
+		   the comdat symbols right.  So, until we can
+		   fix it to do the right thing, we are
+		   temporarily disabling comdats for the MS
+		   types (they're used in DLLs and C++, but we
+		   don't support *their* C++ libraries anyway
+		   - DJ.  */
+
+		/* Cygwin does not follow the MS style, and
+		   uses ANY and SAME_SIZE where NODUPLICATES
+		   and ASSOCIATIVE should be used.  For
+		   Interix, we just do the right thing up
+		   front.  */
+
+		switch (aux.x_scn.x_comdat)
+		  {
+		  case IMAGE_COMDAT_SELECT_NODUPLICATES:
+#ifdef STRICT_PE_FORMAT
+		    sec_flags |= SEC_LINK_DUPLICATES_ONE_ONLY;
+#else
+		    sec_flags &= ~SEC_LINK_ONCE;
+#endif
+		    break;
+
+		  case IMAGE_COMDAT_SELECT_ANY:
+		    sec_flags |= SEC_LINK_DUPLICATES_DISCARD;
+		    break;
+
+		  case IMAGE_COMDAT_SELECT_SAME_SIZE:
+		    sec_flags |= SEC_LINK_DUPLICATES_SAME_SIZE;
+		    break;
+
+		  case IMAGE_COMDAT_SELECT_EXACT_MATCH:
+		    /* Not yet fully implemented ??? */
+		    sec_flags |= SEC_LINK_DUPLICATES_SAME_CONTENTS;
+		    break;
+
+		    /* debug$S gets this case; other
+		       implications ??? */
+
+		    /* There may be no symbol... we'll search
+		       the whole table... Is this the right
+		       place to play this game? Or should we do
+		       it when reading it in.  */
+		  case IMAGE_COMDAT_SELECT_ASSOCIATIVE:
+#ifdef STRICT_PE_FORMAT
+		    /* FIXME: This is not currently implemented.  */
+		    sec_flags |= SEC_LINK_DUPLICATES_DISCARD;
+#else
+		    sec_flags &= ~SEC_LINK_ONCE;
+#endif
+		    break;
+
+		  default:  /* 0 means "no symbol" */
+		    /* debug$F gets this case; other
+		       implications ??? */
+		    sec_flags |= SEC_LINK_DUPLICATES_DISCARD;
+		    break;
+		  }
+	      }
+	      break;
+
+	    case 2:
+	      /* Gas mode: the first matching on partial name.  */
+
+#ifndef TARGET_UNDERSCORE
+#define TARGET_UNDERSCORE 0
+#endif
+	      /* Is this the name we're looking for ?  */
+	      if (strcmp (target_name,
+			  symname + (TARGET_UNDERSCORE ? 1 : 0)) != 0)
+		{
+		  /* Not the name we're looking for */
+		  esym += (isym.n_numaux + 1) * bfd_coff_symesz (abfd);
+		  continue;
+		}
+	      /* Fall through.  */
+	    case 1:
+	      /* MSVC mode: the lexically second symbol (or
+		 drop through from the above).  */
+	      {
+		char *newname;
+		bfd_size_type amt;
+
+		/* This must the second symbol with the
+		   section #.  It is the actual symbol name.
+		   Intel puts the two adjacent, but Alpha (at
+		   least) spreads them out.  */
+
+		amt = sizeof (struct coff_comdat_info);
+		coff_section_data (abfd, section)->comdat
+		  = (struct coff_comdat_info *) bfd_alloc (abfd, amt);
+		if (coff_section_data (abfd, section)->comdat == NULL)
+		  abort ();
+
+		coff_section_data (abfd, section)->comdat->symbol =
+		  (esym - esymstart) / bfd_coff_symesz (abfd);
+
+		amt = strlen (symname) + 1;
+		newname = (char *) bfd_alloc (abfd, amt);
+		if (newname == NULL)
+		  abort ();
+
+		strcpy (newname, symname);
+		coff_section_data (abfd, section)->comdat->name
+		  = newname;
+	      }
+
+	      goto breakloop;
+	    }
+	}
+
+      esym += (isym.n_numaux + 1) * bfd_coff_symesz (abfd);
+    }
+
+ breakloop:
+  return sec_flags;
+}
+
+
+/* The PE version; see above for the general comments.
+
+   Since to set the SEC_LINK_ONCE and associated flags, we have to
+   look at the symbol table anyway, we return the symbol table index
+   of the symbol being used as the COMDAT symbol.  This is admittedly
+   ugly, but there's really nowhere else that we have access to the
+   required information.  FIXME: Is the COMDAT symbol index used for
+   any purpose other than objdump?  */
+
+static bfd_boolean
+styp_to_sec_flags (bfd *abfd,
+		   void * hdr,
+		   const char *name,
+		   asection *section,
+		   flagword *flags_ptr)
+{
+  struct internal_scnhdr *internal_s = (struct internal_scnhdr *) hdr;
+  long styp_flags = internal_s->s_flags;
+  flagword sec_flags;
+  bfd_boolean result = TRUE;
+  bfd_boolean is_dbg = FALSE;
+
+  if (CONST_STRNEQ (name, DOT_DEBUG)
+#ifdef COFF_LONG_SECTION_NAMES
+      || CONST_STRNEQ (name, GNU_LINKONCE_WI)
+      || CONST_STRNEQ (name, GNU_LINKONCE_WT)
+#endif
+      || CONST_STRNEQ (name, ".stab"))
+    is_dbg = TRUE;
+  /* Assume read only unless IMAGE_SCN_MEM_WRITE is specified.  */
+  sec_flags = SEC_READONLY;
+
+  /* If section disallows read, then set the NOREAD flag. */
+  if ((styp_flags & IMAGE_SCN_MEM_READ) == 0)
+    sec_flags |= SEC_COFF_NOREAD;
+
+  /* Process each flag bit in styp_flags in turn.  */
+  while (styp_flags)
+    {
+      long flag = styp_flags & - styp_flags;
+      char * unhandled = NULL;
+
+      styp_flags &= ~ flag;
+
+      /* We infer from the distinct read/write/execute bits the settings
+	 of some of the bfd flags; the actual values, should we need them,
+	 are also in pei_section_data (abfd, section)->pe_flags.  */
+
+      switch (flag)
+	{
+	case STYP_DSECT:
+	  unhandled = "STYP_DSECT";
+	  break;
+	case STYP_GROUP:
+	  unhandled = "STYP_GROUP";
+	  break;
+	case STYP_COPY:
+	  unhandled = "STYP_COPY";
+	  break;
+	case STYP_OVER:
+	  unhandled = "STYP_OVER";
+	  break;
+#ifdef SEC_NEVER_LOAD
+	case STYP_NOLOAD:
+	  sec_flags |= SEC_NEVER_LOAD;
+	  break;
+#endif
+	case IMAGE_SCN_MEM_READ:
+	  sec_flags &= ~SEC_COFF_NOREAD;
+	  break;
+	case IMAGE_SCN_TYPE_NO_PAD:
+	  /* Skip.  */
+	  break;
+	case IMAGE_SCN_LNK_OTHER:
+	  unhandled = "IMAGE_SCN_LNK_OTHER";
+	  break;
+	case IMAGE_SCN_MEM_NOT_CACHED:
+	  unhandled = "IMAGE_SCN_MEM_NOT_CACHED";
+	  break;
+	case IMAGE_SCN_MEM_NOT_PAGED:
+	  /* Generate a warning message rather using the 'unhandled'
+	     variable as this will allow some .sys files generate by
+	     other toolchains to be processed.  See bugzilla issue 196.  */
+	  _bfd_error_handler (_("%B: Warning: Ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section %s"),
+			      abfd, name);
+	  break;
+	case IMAGE_SCN_MEM_EXECUTE:
+	  sec_flags |= SEC_CODE;
+	  break;
+	case IMAGE_SCN_MEM_WRITE:
+	  sec_flags &= ~ SEC_READONLY;
+	  break;
+	case IMAGE_SCN_MEM_DISCARDABLE:
+	  /* The MS PE spec says that debug sections are DISCARDABLE,
+	     but the presence of a DISCARDABLE flag does not necessarily
+	     mean that a given section contains debug information.  Thus
+	     we only set the SEC_DEBUGGING flag on sections that we
+	     recognise as containing debug information.  */
+	     if (is_dbg
+#ifdef _COMMENT
+	      || strcmp (name, _COMMENT) == 0
+#endif
+	      )
+	    {
+	      sec_flags |= SEC_DEBUGGING | SEC_READONLY;
+	    }
+	  break;
+	case IMAGE_SCN_MEM_SHARED:
+	  sec_flags |= SEC_COFF_SHARED;
+	  break;
+	case IMAGE_SCN_LNK_REMOVE:
+	  if (!is_dbg)
+	    sec_flags |= SEC_EXCLUDE;
+	  break;
+	case IMAGE_SCN_CNT_CODE:
+	  sec_flags |= SEC_CODE | SEC_ALLOC | SEC_LOAD;
+	  break;
+	case IMAGE_SCN_CNT_INITIALIZED_DATA:
+	  if (is_dbg)
+	    sec_flags |= SEC_DEBUGGING;
+	  else
+	    sec_flags |= SEC_DATA | SEC_ALLOC | SEC_LOAD;
+	  break;
+	case IMAGE_SCN_CNT_UNINITIALIZED_DATA:
+	  sec_flags |= SEC_ALLOC;
+	  break;
+	case IMAGE_SCN_LNK_INFO:
+	  /* We mark these as SEC_DEBUGGING, but only if COFF_PAGE_SIZE is
+	     defined.  coff_compute_section_file_positions uses
+	     COFF_PAGE_SIZE to ensure that the low order bits of the
+	     section VMA and the file offset match.  If we don't know
+	     COFF_PAGE_SIZE, we can't ensure the correct correspondence,
+	     and demand page loading of the file will fail.  */
+#ifdef COFF_PAGE_SIZE
+	  sec_flags |= SEC_DEBUGGING;
+#endif
+	  break;
+	case IMAGE_SCN_LNK_COMDAT:
+	  /* COMDAT gets very special treatment.  */
+	  sec_flags = handle_COMDAT (abfd, sec_flags, hdr, name, section);
+	  break;
+	default:
+	  /* Silently ignore for now.  */
+	  break;
+	}
+
+      /* If the section flag was not handled, report it here.  */
+      if (unhandled != NULL)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B (%s): Section flag %s (0x%x) ignored"),
+	     abfd, name, unhandled, flag);
+	  result = FALSE;
+	}
+    }
+
+#if defined (COFF_LONG_SECTION_NAMES) && defined (COFF_SUPPORT_GNU_LINKONCE)
+  /* As a GNU extension, if the name begins with .gnu.linkonce, we
+     only link a single copy of the section.  This is used to support
+     g++.  g++ will emit each template expansion in its own section.
+     The symbols will be defined as weak, so that multiple definitions
+     are permitted.  The GNU linker extension is to actually discard
+     all but one of the sections.  */
+  if (CONST_STRNEQ (name, ".gnu.linkonce"))
+    sec_flags |= SEC_LINK_ONCE | SEC_LINK_DUPLICATES_DISCARD;
+#endif
+
+  if (flags_ptr)
+    * flags_ptr = sec_flags;
+
+  return result;
+}
+
+#endif /* COFF_WITH_PE */
+
+#define	get_index(symbol)	((symbol)->udata.i)
+
+/*
+INTERNAL_DEFINITION
+	bfd_coff_backend_data
+
+CODE_FRAGMENT
+
+.{* COFF symbol classifications.  *}
+.
+.enum coff_symbol_classification
+.{
+.  {* Global symbol.  *}
+.  COFF_SYMBOL_GLOBAL,
+.  {* Common symbol.  *}
+.  COFF_SYMBOL_COMMON,
+.  {* Undefined symbol.  *}
+.  COFF_SYMBOL_UNDEFINED,
+.  {* Local symbol.  *}
+.  COFF_SYMBOL_LOCAL,
+.  {* PE section symbol.  *}
+.  COFF_SYMBOL_PE_SECTION
+.};
+.
+Special entry points for gdb to swap in coff symbol table parts:
+.typedef struct
+.{
+.  void (*_bfd_coff_swap_aux_in)
+.    (bfd *, void *, int, int, int, int, void *);
+.
+.  void (*_bfd_coff_swap_sym_in)
+.    (bfd *, void *, void *);
+.
+.  void (*_bfd_coff_swap_lineno_in)
+.    (bfd *, void *, void *);
+.
+.  unsigned int (*_bfd_coff_swap_aux_out)
+.    (bfd *, void *, int, int, int, int, void *);
+.
+.  unsigned int (*_bfd_coff_swap_sym_out)
+.    (bfd *, void *, void *);
+.
+.  unsigned int (*_bfd_coff_swap_lineno_out)
+.    (bfd *, void *, void *);
+.
+.  unsigned int (*_bfd_coff_swap_reloc_out)
+.    (bfd *, void *, void *);
+.
+.  unsigned int (*_bfd_coff_swap_filehdr_out)
+.    (bfd *, void *, void *);
+.
+.  unsigned int (*_bfd_coff_swap_aouthdr_out)
+.    (bfd *, void *, void *);
+.
+.  unsigned int (*_bfd_coff_swap_scnhdr_out)
+.    (bfd *, void *, void *);
+.
+.  unsigned int _bfd_filhsz;
+.  unsigned int _bfd_aoutsz;
+.  unsigned int _bfd_scnhsz;
+.  unsigned int _bfd_symesz;
+.  unsigned int _bfd_auxesz;
+.  unsigned int _bfd_relsz;
+.  unsigned int _bfd_linesz;
+.  unsigned int _bfd_filnmlen;
+.  bfd_boolean _bfd_coff_long_filenames;
+.
+.  bfd_boolean _bfd_coff_long_section_names;
+.  bfd_boolean (*_bfd_coff_set_long_section_names)
+.    (bfd *, int);
+.  
+.  unsigned int _bfd_coff_default_section_alignment_power;
+.  bfd_boolean _bfd_coff_force_symnames_in_strings;
+.  unsigned int _bfd_coff_debug_string_prefix_length;
+.
+.  void (*_bfd_coff_swap_filehdr_in)
+.    (bfd *, void *, void *);
+.
+.  void (*_bfd_coff_swap_aouthdr_in)
+.    (bfd *, void *, void *);
+.
+.  void (*_bfd_coff_swap_scnhdr_in)
+.    (bfd *, void *, void *);
+.
+.  void (*_bfd_coff_swap_reloc_in)
+.    (bfd *abfd, void *, void *);
+.
+.  bfd_boolean (*_bfd_coff_bad_format_hook)
+.    (bfd *, void *);
+.
+.  bfd_boolean (*_bfd_coff_set_arch_mach_hook)
+.    (bfd *, void *);
+.
+.  void * (*_bfd_coff_mkobject_hook)
+.    (bfd *, void *, void *);
+.
+.  bfd_boolean (*_bfd_styp_to_sec_flags_hook)
+.    (bfd *, void *, const char *, asection *, flagword *);
+.
+.  void (*_bfd_set_alignment_hook)
+.    (bfd *, asection *, void *);
+.
+.  bfd_boolean (*_bfd_coff_slurp_symbol_table)
+.    (bfd *);
+.
+.  bfd_boolean (*_bfd_coff_symname_in_debug)
+.    (bfd *, struct internal_syment *);
+.
+.  bfd_boolean (*_bfd_coff_pointerize_aux_hook)
+.    (bfd *, combined_entry_type *, combined_entry_type *,
+.	     unsigned int, combined_entry_type *);
+.
+.  bfd_boolean (*_bfd_coff_print_aux)
+.    (bfd *, FILE *, combined_entry_type *, combined_entry_type *,
+.	     combined_entry_type *, unsigned int);
+.
+.  void (*_bfd_coff_reloc16_extra_cases)
+.    (bfd *, struct bfd_link_info *, struct bfd_link_order *, arelent *,
+.	    bfd_byte *, unsigned int *, unsigned int *);
+.
+.  int (*_bfd_coff_reloc16_estimate)
+.    (bfd *, asection *, arelent *, unsigned int,
+.	     struct bfd_link_info *);
+.
+.  enum coff_symbol_classification (*_bfd_coff_classify_symbol)
+.    (bfd *, struct internal_syment *);
+.
+.  bfd_boolean (*_bfd_coff_compute_section_file_positions)
+.    (bfd *);
+.
+.  bfd_boolean (*_bfd_coff_start_final_link)
+.    (bfd *, struct bfd_link_info *);
+.
+.  bfd_boolean (*_bfd_coff_relocate_section)
+.    (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+.	     struct internal_reloc *, struct internal_syment *, asection **);
+.
+.  reloc_howto_type *(*_bfd_coff_rtype_to_howto)
+.    (bfd *, asection *, struct internal_reloc *,
+.	     struct coff_link_hash_entry *, struct internal_syment *,
+.	     bfd_vma *);
+.
+.  bfd_boolean (*_bfd_coff_adjust_symndx)
+.    (bfd *, struct bfd_link_info *, bfd *, asection *,
+.	     struct internal_reloc *, bfd_boolean *);
+.
+.  bfd_boolean (*_bfd_coff_link_add_one_symbol)
+.    (struct bfd_link_info *, bfd *, const char *, flagword,
+.	     asection *, bfd_vma, const char *, bfd_boolean, bfd_boolean,
+.	     struct bfd_link_hash_entry **);
+.
+.  bfd_boolean (*_bfd_coff_link_output_has_begun)
+.    (bfd *, struct coff_final_link_info *);
+.
+.  bfd_boolean (*_bfd_coff_final_link_postscript)
+.    (bfd *, struct coff_final_link_info *);
+.
+.  bfd_boolean (*_bfd_coff_print_pdata)
+.    (bfd *, void *);
+.
+.} bfd_coff_backend_data;
+.
+.#define coff_backend_info(abfd) \
+.  ((bfd_coff_backend_data *) (abfd)->xvec->backend_data)
+.
+.#define bfd_coff_swap_aux_in(a,e,t,c,ind,num,i) \
+.  ((coff_backend_info (a)->_bfd_coff_swap_aux_in) (a,e,t,c,ind,num,i))
+.
+.#define bfd_coff_swap_sym_in(a,e,i) \
+.  ((coff_backend_info (a)->_bfd_coff_swap_sym_in) (a,e,i))
+.
+.#define bfd_coff_swap_lineno_in(a,e,i) \
+.  ((coff_backend_info ( a)->_bfd_coff_swap_lineno_in) (a,e,i))
+.
+.#define bfd_coff_swap_reloc_out(abfd, i, o) \
+.  ((coff_backend_info (abfd)->_bfd_coff_swap_reloc_out) (abfd, i, o))
+.
+.#define bfd_coff_swap_lineno_out(abfd, i, o) \
+.  ((coff_backend_info (abfd)->_bfd_coff_swap_lineno_out) (abfd, i, o))
+.
+.#define bfd_coff_swap_aux_out(a,i,t,c,ind,num,o) \
+.  ((coff_backend_info (a)->_bfd_coff_swap_aux_out) (a,i,t,c,ind,num,o))
+.
+.#define bfd_coff_swap_sym_out(abfd, i,o) \
+.  ((coff_backend_info (abfd)->_bfd_coff_swap_sym_out) (abfd, i, o))
+.
+.#define bfd_coff_swap_scnhdr_out(abfd, i,o) \
+.  ((coff_backend_info (abfd)->_bfd_coff_swap_scnhdr_out) (abfd, i, o))
+.
+.#define bfd_coff_swap_filehdr_out(abfd, i,o) \
+.  ((coff_backend_info (abfd)->_bfd_coff_swap_filehdr_out) (abfd, i, o))
+.
+.#define bfd_coff_swap_aouthdr_out(abfd, i,o) \
+.  ((coff_backend_info (abfd)->_bfd_coff_swap_aouthdr_out) (abfd, i, o))
+.
+.#define bfd_coff_filhsz(abfd) (coff_backend_info (abfd)->_bfd_filhsz)
+.#define bfd_coff_aoutsz(abfd) (coff_backend_info (abfd)->_bfd_aoutsz)
+.#define bfd_coff_scnhsz(abfd) (coff_backend_info (abfd)->_bfd_scnhsz)
+.#define bfd_coff_symesz(abfd) (coff_backend_info (abfd)->_bfd_symesz)
+.#define bfd_coff_auxesz(abfd) (coff_backend_info (abfd)->_bfd_auxesz)
+.#define bfd_coff_relsz(abfd)  (coff_backend_info (abfd)->_bfd_relsz)
+.#define bfd_coff_linesz(abfd) (coff_backend_info (abfd)->_bfd_linesz)
+.#define bfd_coff_filnmlen(abfd) (coff_backend_info (abfd)->_bfd_filnmlen)
+.#define bfd_coff_long_filenames(abfd) \
+.  (coff_backend_info (abfd)->_bfd_coff_long_filenames)
+.#define bfd_coff_long_section_names(abfd) \
+.  (coff_backend_info (abfd)->_bfd_coff_long_section_names)
+.#define bfd_coff_set_long_section_names(abfd, enable) \
+.  ((coff_backend_info (abfd)->_bfd_coff_set_long_section_names) (abfd, enable))
+.#define bfd_coff_default_section_alignment_power(abfd) \
+.  (coff_backend_info (abfd)->_bfd_coff_default_section_alignment_power)
+.#define bfd_coff_swap_filehdr_in(abfd, i,o) \
+.  ((coff_backend_info (abfd)->_bfd_coff_swap_filehdr_in) (abfd, i, o))
+.
+.#define bfd_coff_swap_aouthdr_in(abfd, i,o) \
+.  ((coff_backend_info (abfd)->_bfd_coff_swap_aouthdr_in) (abfd, i, o))
+.
+.#define bfd_coff_swap_scnhdr_in(abfd, i,o) \
+.  ((coff_backend_info (abfd)->_bfd_coff_swap_scnhdr_in) (abfd, i, o))
+.
+.#define bfd_coff_swap_reloc_in(abfd, i, o) \
+.  ((coff_backend_info (abfd)->_bfd_coff_swap_reloc_in) (abfd, i, o))
+.
+.#define bfd_coff_bad_format_hook(abfd, filehdr) \
+.  ((coff_backend_info (abfd)->_bfd_coff_bad_format_hook) (abfd, filehdr))
+.
+.#define bfd_coff_set_arch_mach_hook(abfd, filehdr)\
+.  ((coff_backend_info (abfd)->_bfd_coff_set_arch_mach_hook) (abfd, filehdr))
+.#define bfd_coff_mkobject_hook(abfd, filehdr, aouthdr)\
+.  ((coff_backend_info (abfd)->_bfd_coff_mkobject_hook)\
+.   (abfd, filehdr, aouthdr))
+.
+.#define bfd_coff_styp_to_sec_flags_hook(abfd, scnhdr, name, section, flags_ptr)\
+.  ((coff_backend_info (abfd)->_bfd_styp_to_sec_flags_hook)\
+.   (abfd, scnhdr, name, section, flags_ptr))
+.
+.#define bfd_coff_set_alignment_hook(abfd, sec, scnhdr)\
+.  ((coff_backend_info (abfd)->_bfd_set_alignment_hook) (abfd, sec, scnhdr))
+.
+.#define bfd_coff_slurp_symbol_table(abfd)\
+.  ((coff_backend_info (abfd)->_bfd_coff_slurp_symbol_table) (abfd))
+.
+.#define bfd_coff_symname_in_debug(abfd, sym)\
+.  ((coff_backend_info (abfd)->_bfd_coff_symname_in_debug) (abfd, sym))
+.
+.#define bfd_coff_force_symnames_in_strings(abfd)\
+.  (coff_backend_info (abfd)->_bfd_coff_force_symnames_in_strings)
+.
+.#define bfd_coff_debug_string_prefix_length(abfd)\
+.  (coff_backend_info (abfd)->_bfd_coff_debug_string_prefix_length)
+.
+.#define bfd_coff_print_aux(abfd, file, base, symbol, aux, indaux)\
+.  ((coff_backend_info (abfd)->_bfd_coff_print_aux)\
+.   (abfd, file, base, symbol, aux, indaux))
+.
+.#define bfd_coff_reloc16_extra_cases(abfd, link_info, link_order,\
+.                                     reloc, data, src_ptr, dst_ptr)\
+.  ((coff_backend_info (abfd)->_bfd_coff_reloc16_extra_cases)\
+.   (abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr))
+.
+.#define bfd_coff_reloc16_estimate(abfd, section, reloc, shrink, link_info)\
+.  ((coff_backend_info (abfd)->_bfd_coff_reloc16_estimate)\
+.   (abfd, section, reloc, shrink, link_info))
+.
+.#define bfd_coff_classify_symbol(abfd, sym)\
+.  ((coff_backend_info (abfd)->_bfd_coff_classify_symbol)\
+.   (abfd, sym))
+.
+.#define bfd_coff_compute_section_file_positions(abfd)\
+.  ((coff_backend_info (abfd)->_bfd_coff_compute_section_file_positions)\
+.   (abfd))
+.
+.#define bfd_coff_start_final_link(obfd, info)\
+.  ((coff_backend_info (obfd)->_bfd_coff_start_final_link)\
+.   (obfd, info))
+.#define bfd_coff_relocate_section(obfd,info,ibfd,o,con,rel,isyms,secs)\
+.  ((coff_backend_info (ibfd)->_bfd_coff_relocate_section)\
+.   (obfd, info, ibfd, o, con, rel, isyms, secs))
+.#define bfd_coff_rtype_to_howto(abfd, sec, rel, h, sym, addendp)\
+.  ((coff_backend_info (abfd)->_bfd_coff_rtype_to_howto)\
+.   (abfd, sec, rel, h, sym, addendp))
+.#define bfd_coff_adjust_symndx(obfd, info, ibfd, sec, rel, adjustedp)\
+.  ((coff_backend_info (abfd)->_bfd_coff_adjust_symndx)\
+.   (obfd, info, ibfd, sec, rel, adjustedp))
+.#define bfd_coff_link_add_one_symbol(info, abfd, name, flags, section,\
+.                                     value, string, cp, coll, hashp)\
+.  ((coff_backend_info (abfd)->_bfd_coff_link_add_one_symbol)\
+.   (info, abfd, name, flags, section, value, string, cp, coll, hashp))
+.
+.#define bfd_coff_link_output_has_begun(a,p) \
+.  ((coff_backend_info (a)->_bfd_coff_link_output_has_begun) (a, p))
+.#define bfd_coff_final_link_postscript(a,p) \
+.  ((coff_backend_info (a)->_bfd_coff_final_link_postscript) (a, p))
+.
+.#define bfd_coff_have_print_pdata(a) \
+.  (coff_backend_info (a)->_bfd_coff_print_pdata)
+.#define bfd_coff_print_pdata(a,p) \
+.  ((coff_backend_info (a)->_bfd_coff_print_pdata) (a, p))
+.
+.{* Macro: Returns true if the bfd is a PE executable as opposed to a
+.   PE object file.  *}
+.#define bfd_pei_p(abfd) \
+.  (CONST_STRNEQ ((abfd)->xvec->name, "pei-"))
+*/
+
+/* See whether the magic number matches.  */
+
+static bfd_boolean
+coff_bad_format_hook (bfd * abfd ATTRIBUTE_UNUSED, void * filehdr)
+{
+  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
+
+  if (BADMAG (*internal_f))
+    return FALSE;
+
+  /* If the optional header is NULL or not the correct size then
+     quit; the only difference I can see between m88k dgux headers (MC88DMAGIC)
+     and Intel 960 readwrite headers (I960WRMAGIC) is that the
+     optional header is of a different size.
+
+     But the mips keeps extra stuff in it's opthdr, so dont check
+     when doing that.  */
+
+#if defined(M88) || defined(I960)
+  if (internal_f->f_opthdr != 0 && bfd_coff_aoutsz (abfd) != internal_f->f_opthdr)
+    return FALSE;
+#endif
+
+  return TRUE;
+}
+
+#ifdef TICOFF
+static bfd_boolean
+ticoff0_bad_format_hook (bfd *abfd ATTRIBUTE_UNUSED, void * filehdr)
+{
+  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
+
+  if (COFF0_BADMAG (*internal_f))
+    return FALSE;
+
+  return TRUE;
+}
+#endif
+
+#ifdef TICOFF
+static bfd_boolean
+ticoff1_bad_format_hook (bfd *abfd ATTRIBUTE_UNUSED, void * filehdr)
+{
+  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
+
+  if (COFF1_BADMAG (*internal_f))
+    return FALSE;
+
+  return TRUE;
+}
+#endif
+
+/* Check whether this section uses an alignment other than the
+   default.  */
+
+static void
+coff_set_custom_section_alignment (bfd *abfd ATTRIBUTE_UNUSED,
+				   asection *section,
+				   const struct coff_section_alignment_entry *alignment_table,
+				   const unsigned int table_size)
+{
+  const unsigned int default_alignment = COFF_DEFAULT_SECTION_ALIGNMENT_POWER;
+  unsigned int i;
+
+  for (i = 0; i < table_size; ++i)
+    {
+      const char *secname = bfd_get_section_name (abfd, section);
+
+      if (alignment_table[i].comparison_length == (unsigned int) -1
+	  ? strcmp (alignment_table[i].name, secname) == 0
+	  : strncmp (alignment_table[i].name, secname,
+		     alignment_table[i].comparison_length) == 0)
+	break;
+    }
+  if (i >= table_size)
+    return;
+
+  if (alignment_table[i].default_alignment_min != COFF_ALIGNMENT_FIELD_EMPTY
+      && default_alignment < alignment_table[i].default_alignment_min)
+    return;
+
+  if (alignment_table[i].default_alignment_max != COFF_ALIGNMENT_FIELD_EMPTY
+#if COFF_DEFAULT_SECTION_ALIGNMENT_POWER != 0
+      && default_alignment > alignment_table[i].default_alignment_max
+#endif
+      )
+    return;
+
+  section->alignment_power = alignment_table[i].alignment_power;
+}
+
+/* Custom section alignment records.  */
+
+static const struct coff_section_alignment_entry
+coff_section_alignment_table[] =
+{
+#ifdef COFF_SECTION_ALIGNMENT_ENTRIES
+  COFF_SECTION_ALIGNMENT_ENTRIES,
+#endif
+  /* There must not be any gaps between .stabstr sections.  */
+  { COFF_SECTION_NAME_PARTIAL_MATCH (".stabstr"),
+    1, COFF_ALIGNMENT_FIELD_EMPTY, 0 },
+  /* The .stab section must be aligned to 2**2 at most, to avoid gaps.  */
+  { COFF_SECTION_NAME_PARTIAL_MATCH (".stab"),
+    3, COFF_ALIGNMENT_FIELD_EMPTY, 2 },
+  /* Similarly for the .ctors and .dtors sections.  */
+  { COFF_SECTION_NAME_EXACT_MATCH (".ctors"),
+    3, COFF_ALIGNMENT_FIELD_EMPTY, 2 },
+  { COFF_SECTION_NAME_EXACT_MATCH (".dtors"),
+    3, COFF_ALIGNMENT_FIELD_EMPTY, 2 }
+};
+
+static const unsigned int coff_section_alignment_table_size =
+  sizeof coff_section_alignment_table / sizeof coff_section_alignment_table[0];
+
+/* Initialize a section structure with information peculiar to this
+   particular implementation of COFF.  */
+
+static bfd_boolean
+coff_new_section_hook (bfd * abfd, asection * section)
+{
+  combined_entry_type *native;
+  bfd_size_type amt;
+  unsigned char sclass = C_STAT;
+
+  section->alignment_power = COFF_DEFAULT_SECTION_ALIGNMENT_POWER;
+
+#ifdef RS6000COFF_C
+  if (bfd_xcoff_text_align_power (abfd) != 0
+      && strcmp (bfd_get_section_name (abfd, section), ".text") == 0)
+    section->alignment_power = bfd_xcoff_text_align_power (abfd);
+  else if (bfd_xcoff_data_align_power (abfd) != 0
+      && strcmp (bfd_get_section_name (abfd, section), ".data") == 0)
+    section->alignment_power = bfd_xcoff_data_align_power (abfd);
+  else
+    {
+      int i;
+
+      for (i = 0; i < XCOFF_DWSECT_NBR_NAMES; i++)
+        if (strcmp (bfd_get_section_name (abfd, section),
+                    xcoff_dwsect_names[i].name) == 0)
+          {
+            section->alignment_power = 0;
+            sclass = C_DWARF;
+            break;
+          }
+    }
+#endif
+
+  /* Set up the section symbol.  */
+  if (!_bfd_generic_new_section_hook (abfd, section))
+    return FALSE;
+
+  /* Allocate aux records for section symbols, to store size and
+     related info.
+
+     @@ The 10 is a guess at a plausible maximum number of aux entries
+     (but shouldn't be a constant).  */
+  amt = sizeof (combined_entry_type) * 10;
+  native = (combined_entry_type *) bfd_zalloc (abfd, amt);
+  if (native == NULL)
+    return FALSE;
+
+  /* We don't need to set up n_name, n_value, or n_scnum in the native
+     symbol information, since they'll be overridden by the BFD symbol
+     anyhow.  However, we do need to set the type and storage class,
+     in case this symbol winds up getting written out.  The value 0
+     for n_numaux is already correct.  */
+
+  native->u.syment.n_type = T_NULL;
+  native->u.syment.n_sclass = sclass;
+
+  coffsymbol (section->symbol)->native = native;
+
+  coff_set_custom_section_alignment (abfd, section,
+				     coff_section_alignment_table,
+				     coff_section_alignment_table_size);
+
+  return TRUE;
+}
+
+#ifdef COFF_ALIGN_IN_SECTION_HEADER
+
+/* Set the alignment of a BFD section.  */
+
+static void
+coff_set_alignment_hook (bfd * abfd ATTRIBUTE_UNUSED,
+			 asection * section,
+			 void * scnhdr)
+{
+  struct internal_scnhdr *hdr = (struct internal_scnhdr *) scnhdr;
+  unsigned int i;
+
+#ifdef I960
+  /* Extract ALIGN from 2**ALIGN stored in section header.  */
+  for (i = 0; i < 32; i++)
+    if ((1 << i) >= hdr->s_align)
+      break;
+#endif
+#ifdef TIC80COFF
+  /* TI tools puts the alignment power in bits 8-11.  */
+  i = (hdr->s_flags >> 8) & 0xF ;
+#endif
+#ifdef COFF_DECODE_ALIGNMENT
+  i = COFF_DECODE_ALIGNMENT(hdr->s_flags);
+#endif
+  section->alignment_power = i;
+
+#ifdef coff_set_section_load_page
+  coff_set_section_load_page (section, hdr->s_page);
+#endif
+}
+
+#else /* ! COFF_ALIGN_IN_SECTION_HEADER */
+#ifdef COFF_WITH_PE
+
+static void
+coff_set_alignment_hook (bfd * abfd ATTRIBUTE_UNUSED,
+			 asection * section,
+			 void * scnhdr)
+{
+  struct internal_scnhdr *hdr = (struct internal_scnhdr *) scnhdr;
+  bfd_size_type amt;
+  unsigned int alignment_power_const
+    = hdr->s_flags & IMAGE_SCN_ALIGN_POWER_BIT_MASK;
+
+  switch (alignment_power_const)
+    {
+    case IMAGE_SCN_ALIGN_8192BYTES:
+    case IMAGE_SCN_ALIGN_4096BYTES:
+    case IMAGE_SCN_ALIGN_2048BYTES:
+    case IMAGE_SCN_ALIGN_1024BYTES:
+    case IMAGE_SCN_ALIGN_512BYTES:
+    case IMAGE_SCN_ALIGN_256BYTES:
+    case IMAGE_SCN_ALIGN_128BYTES:
+    case IMAGE_SCN_ALIGN_64BYTES:
+    case IMAGE_SCN_ALIGN_32BYTES:
+    case IMAGE_SCN_ALIGN_16BYTES:
+    case IMAGE_SCN_ALIGN_8BYTES:
+    case IMAGE_SCN_ALIGN_4BYTES:
+    case IMAGE_SCN_ALIGN_2BYTES:
+    case IMAGE_SCN_ALIGN_1BYTES:
+      section->alignment_power
+	= IMAGE_SCN_ALIGN_POWER_NUM (alignment_power_const);
+      break;
+    default:
+      break;
+    }
+
+  /* In a PE image file, the s_paddr field holds the virtual size of a
+     section, while the s_size field holds the raw size.  We also keep
+     the original section flag value, since not every bit can be
+     mapped onto a generic BFD section bit.  */
+  if (coff_section_data (abfd, section) == NULL)
+    {
+      amt = sizeof (struct coff_section_tdata);
+      section->used_by_bfd = bfd_zalloc (abfd, amt);
+      if (section->used_by_bfd == NULL)
+	/* FIXME: Return error.  */
+	abort ();
+    }
+
+  if (pei_section_data (abfd, section) == NULL)
+    {
+      amt = sizeof (struct pei_section_tdata);
+      coff_section_data (abfd, section)->tdata = bfd_zalloc (abfd, amt);
+      if (coff_section_data (abfd, section)->tdata == NULL)
+	/* FIXME: Return error.  */
+	abort ();
+    }
+  pei_section_data (abfd, section)->virt_size = hdr->s_paddr;
+  pei_section_data (abfd, section)->pe_flags = hdr->s_flags;
+
+  section->lma = hdr->s_vaddr;
+
+  /* Check for extended relocs.  */
+  if (hdr->s_flags & IMAGE_SCN_LNK_NRELOC_OVFL)
+    {
+      struct external_reloc dst;
+      struct internal_reloc n;
+      file_ptr oldpos = bfd_tell (abfd);
+      bfd_size_type relsz = bfd_coff_relsz (abfd);
+
+      if (bfd_seek (abfd, (file_ptr) hdr->s_relptr, 0) != 0)
+	return;
+      if (bfd_bread (& dst, relsz, abfd) != relsz)
+	return;
+
+      coff_swap_reloc_in (abfd, &dst, &n);
+      if (bfd_seek (abfd, oldpos, 0) != 0)
+	return;
+      section->reloc_count = hdr->s_nreloc = n.r_vaddr - 1;
+      section->rel_filepos += relsz;
+    }
+  else if (hdr->s_nreloc == 0xffff)
+    (*_bfd_error_handler)
+      ("%s: warning: claims to have 0xffff relocs, without overflow",
+       bfd_get_filename (abfd));
+}
+#undef ALIGN_SET
+#undef ELIFALIGN_SET
+
+#else /* ! COFF_WITH_PE */
+#ifdef RS6000COFF_C
+
+/* We grossly abuse this function to handle XCOFF overflow headers.
+   When we see one, we correct the reloc and line number counts in the
+   real header, and remove the section we just created.  */
+
+static void
+coff_set_alignment_hook (bfd *abfd, asection *section, void * scnhdr)
+{
+  struct internal_scnhdr *hdr = (struct internal_scnhdr *) scnhdr;
+  asection *real_sec;
+
+  if ((hdr->s_flags & STYP_OVRFLO) == 0)
+    return;
+
+  real_sec = coff_section_from_bfd_index (abfd, (int) hdr->s_nreloc);
+  if (real_sec == NULL)
+    return;
+
+  real_sec->reloc_count = hdr->s_paddr;
+  real_sec->lineno_count = hdr->s_vaddr;
+
+  if (!bfd_section_removed_from_list (abfd, section))
+    {
+      bfd_section_list_remove (abfd, section);
+      --abfd->section_count;
+    }
+}
+
+#else /* ! RS6000COFF_C */
+
+#define coff_set_alignment_hook \
+  ((void (*) (bfd *, asection *, void *)) bfd_void)
+
+#endif /* ! RS6000COFF_C */
+#endif /* ! COFF_WITH_PE */
+#endif /* ! COFF_ALIGN_IN_SECTION_HEADER */
+
+#ifndef coff_mkobject
+
+static bfd_boolean
+coff_mkobject (bfd * abfd)
+{
+  coff_data_type *coff;
+  bfd_size_type amt = sizeof (coff_data_type);
+
+  abfd->tdata.coff_obj_data = bfd_zalloc (abfd, amt);
+  if (abfd->tdata.coff_obj_data == NULL)
+    return FALSE;
+  coff = coff_data (abfd);
+  coff->symbols = NULL;
+  coff->conversion_table = NULL;
+  coff->raw_syments = NULL;
+  coff->relocbase = 0;
+  coff->local_toc_sym_map = 0;
+
+/*  make_abs_section(abfd);*/
+
+  return TRUE;
+}
+#endif
+
+/* Create the COFF backend specific information.  */
+
+#ifndef coff_mkobject_hook
+static void *
+coff_mkobject_hook (bfd * abfd,
+		    void * filehdr,
+		    void * aouthdr ATTRIBUTE_UNUSED)
+{
+  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
+  coff_data_type *coff;
+
+  if (! coff_mkobject (abfd))
+    return NULL;
+
+  coff = coff_data (abfd);
+
+  coff->sym_filepos = internal_f->f_symptr;
+
+  /* These members communicate important constants about the symbol
+     table to GDB's symbol-reading code.  These `constants'
+     unfortunately vary among coff implementations...  */
+  coff->local_n_btmask = N_BTMASK;
+  coff->local_n_btshft = N_BTSHFT;
+  coff->local_n_tmask = N_TMASK;
+  coff->local_n_tshift = N_TSHIFT;
+  coff->local_symesz = bfd_coff_symesz (abfd);
+  coff->local_auxesz = bfd_coff_auxesz (abfd);
+  coff->local_linesz = bfd_coff_linesz (abfd);
+
+  coff->timestamp = internal_f->f_timdat;
+
+  obj_raw_syment_count (abfd) =
+    obj_conv_table_size (abfd) =
+      internal_f->f_nsyms;
+
+#ifdef RS6000COFF_C
+  if ((internal_f->f_flags & F_SHROBJ) != 0)
+    abfd->flags |= DYNAMIC;
+  if (aouthdr != NULL && internal_f->f_opthdr >= bfd_coff_aoutsz (abfd))
+    {
+      struct internal_aouthdr *internal_a =
+	(struct internal_aouthdr *) aouthdr;
+      struct xcoff_tdata *xcoff;
+
+      xcoff = xcoff_data (abfd);
+# ifdef U803XTOCMAGIC
+      xcoff->xcoff64 = internal_f->f_magic == U803XTOCMAGIC;
+# else
+      xcoff->xcoff64 = 0;
+# endif
+      xcoff->full_aouthdr = TRUE;
+      xcoff->toc = internal_a->o_toc;
+      xcoff->sntoc = internal_a->o_sntoc;
+      xcoff->snentry = internal_a->o_snentry;
+      bfd_xcoff_text_align_power (abfd) = internal_a->o_algntext;
+      bfd_xcoff_data_align_power (abfd) = internal_a->o_algndata;
+      xcoff->modtype = internal_a->o_modtype;
+      xcoff->cputype = internal_a->o_cputype;
+      xcoff->maxdata = internal_a->o_maxdata;
+      xcoff->maxstack = internal_a->o_maxstack;
+    }
+#endif
+
+#ifdef ARM
+  /* Set the flags field from the COFF header read in.  */
+  if (! _bfd_coff_arm_set_private_flags (abfd, internal_f->f_flags))
+    coff->flags = 0;
+#endif
+
+#ifdef COFF_WITH_PE
+  /* FIXME: I'm not sure this is ever executed, since peicode.h
+     defines coff_mkobject_hook.  */
+  if ((internal_f->f_flags & IMAGE_FILE_DEBUG_STRIPPED) == 0)
+    abfd->flags |= HAS_DEBUG;
+#endif
+
+  if ((internal_f->f_flags & F_GO32STUB) != 0)
+    coff->go32stub = (char *) bfd_alloc (abfd, (bfd_size_type) GO32_STUBSIZE);
+  if (coff->go32stub != NULL)
+    memcpy (coff->go32stub, internal_f->go32stub, GO32_STUBSIZE);
+
+  return coff;
+}
+#endif
+
+/* Determine the machine architecture and type.  FIXME: This is target
+   dependent because the magic numbers are defined in the target
+   dependent header files.  But there is no particular need for this.
+   If the magic numbers were moved to a separate file, this function
+   would be target independent and would also be much more successful
+   at linking together COFF files for different architectures.  */
+
+static bfd_boolean
+coff_set_arch_mach_hook (bfd *abfd, void * filehdr)
+{
+  unsigned long machine;
+  enum bfd_architecture arch;
+  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
+
+  /* Zero selects the default machine for an arch.  */
+  machine = 0;
+  switch (internal_f->f_magic)
+    {
+#ifdef OR32_MAGIC_BIG
+    case OR32_MAGIC_BIG:
+    case OR32_MAGIC_LITTLE:
+      arch = bfd_arch_or32;
+      break;
+#endif
+#ifdef PPCMAGIC
+    case PPCMAGIC:
+      arch = bfd_arch_powerpc;
+      break;
+#endif
+#ifdef I386MAGIC
+    case I386MAGIC:
+    case I386PTXMAGIC:
+    case I386AIXMAGIC:		/* Danbury PS/2 AIX C Compiler.  */
+    case LYNXCOFFMAGIC:		/* Shadows the m68k Lynx number below, sigh.  */
+      arch = bfd_arch_i386;
+      break;
+#endif
+#ifdef AMD64MAGIC
+    case AMD64MAGIC:
+      arch = bfd_arch_i386;
+      machine = bfd_mach_x86_64;
+      break;
+#endif
+#ifdef IA64MAGIC
+    case IA64MAGIC:
+      arch = bfd_arch_ia64;
+      break;
+#endif
+#ifdef ARMMAGIC
+    case ARMMAGIC:
+    case ARMPEMAGIC:
+    case THUMBPEMAGIC:
+      arch = bfd_arch_arm;
+      machine = bfd_arm_get_mach_from_notes (abfd, ARM_NOTE_SECTION);
+      if (machine == bfd_mach_arm_unknown)
+	{
+	  switch (internal_f->f_flags & F_ARM_ARCHITECTURE_MASK)
+	    {
+	    case F_ARM_2:  machine = bfd_mach_arm_2;  break;
+	    case F_ARM_2a: machine = bfd_mach_arm_2a; break;
+	    case F_ARM_3:  machine = bfd_mach_arm_3;  break;
+	    default:
+	    case F_ARM_3M: machine = bfd_mach_arm_3M; break;
+	    case F_ARM_4:  machine = bfd_mach_arm_4;  break;
+	    case F_ARM_4T: machine = bfd_mach_arm_4T; break;
+	      /* The COFF header does not have enough bits available
+		 to cover all the different ARM architectures.  So
+		 we interpret F_ARM_5, the highest flag value to mean
+		 "the highest ARM architecture known to BFD" which is
+		 currently the XScale.  */
+	    case F_ARM_5:  machine = bfd_mach_arm_XScale;  break;
+	    }
+	}
+      break;
+#endif
+#ifdef MC68MAGIC
+    case MC68MAGIC:
+    case M68MAGIC:
+#ifdef MC68KBCSMAGIC
+    case MC68KBCSMAGIC:
+#endif
+#ifdef APOLLOM68KMAGIC
+    case APOLLOM68KMAGIC:
+#endif
+#ifdef LYNXCOFFMAGIC
+    case LYNXCOFFMAGIC:
+#endif
+      arch = bfd_arch_m68k;
+      machine = bfd_mach_m68020;
+      break;
+#endif
+#ifdef MC88MAGIC
+    case MC88MAGIC:
+    case MC88DMAGIC:
+    case MC88OMAGIC:
+      arch = bfd_arch_m88k;
+      machine = 88100;
+      break;
+#endif
+#ifdef Z80MAGIC
+    case Z80MAGIC:
+      arch = bfd_arch_z80;
+      switch (internal_f->f_flags & F_MACHMASK)
+	{
+	case 0:
+	case bfd_mach_z80strict << 12:
+	case bfd_mach_z80 << 12:
+	case bfd_mach_z80full << 12:
+	case bfd_mach_r800 << 12:
+	  machine = ((unsigned)internal_f->f_flags & F_MACHMASK) >> 12;
+	  break;
+	default:
+	  return FALSE;
+	}
+      break;
+#endif
+#ifdef Z8KMAGIC
+    case Z8KMAGIC:
+      arch = bfd_arch_z8k;
+      switch (internal_f->f_flags & F_MACHMASK)
+	{
+	case F_Z8001:
+	  machine = bfd_mach_z8001;
+	  break;
+	case F_Z8002:
+	  machine = bfd_mach_z8002;
+	  break;
+	default:
+	  return FALSE;
+	}
+      break;
+#endif
+#ifdef I860
+    case I860MAGIC:
+      arch = bfd_arch_i860;
+      break;
+#endif
+#ifdef I960
+#ifdef I960ROMAGIC
+    case I960ROMAGIC:
+    case I960RWMAGIC:
+      arch = bfd_arch_i960;
+      switch (F_I960TYPE & internal_f->f_flags)
+	{
+	default:
+	case F_I960CORE:
+	  machine = bfd_mach_i960_core;
+	  break;
+	case F_I960KB:
+	  machine = bfd_mach_i960_kb_sb;
+	  break;
+	case F_I960MC:
+	  machine = bfd_mach_i960_mc;
+	  break;
+	case F_I960XA:
+	  machine = bfd_mach_i960_xa;
+	  break;
+	case F_I960CA:
+	  machine = bfd_mach_i960_ca;
+	  break;
+	case F_I960KA:
+	  machine = bfd_mach_i960_ka_sa;
+	  break;
+	case F_I960JX:
+	  machine = bfd_mach_i960_jx;
+	  break;
+	case F_I960HX:
+	  machine = bfd_mach_i960_hx;
+	  break;
+	}
+      break;
+#endif
+#endif
+
+#ifdef RS6000COFF_C
+#ifdef XCOFF64
+    case U64_TOCMAGIC:
+    case U803XTOCMAGIC:
+#else
+    case U802ROMAGIC:
+    case U802WRMAGIC:
+    case U802TOCMAGIC:
+#endif
+      {
+	int cputype;
+
+	if (xcoff_data (abfd)->cputype != -1)
+	  cputype = xcoff_data (abfd)->cputype & 0xff;
+	else
+	  {
+	    /* We did not get a value from the a.out header.  If the
+	       file has not been stripped, we may be able to get the
+	       architecture information from the first symbol, if it
+	       is a .file symbol.  */
+	    if (obj_raw_syment_count (abfd) == 0)
+	      cputype = 0;
+	    else
+	      {
+		bfd_byte *buf;
+		struct internal_syment sym;
+		bfd_size_type amt = bfd_coff_symesz (abfd);
+
+		buf = bfd_malloc (amt);
+		if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0
+		    || bfd_bread (buf, amt, abfd) != amt)
+		  {
+		    free (buf);
+		    return FALSE;
+		  }
+		bfd_coff_swap_sym_in (abfd, buf, & sym);
+		if (sym.n_sclass == C_FILE)
+		  cputype = sym.n_type & 0xff;
+		else
+		  cputype = 0;
+		free (buf);
+	      }
+	  }
+
+	/* FIXME: We don't handle all cases here.  */
+	switch (cputype)
+	  {
+	  default:
+	  case 0:
+	    arch = bfd_xcoff_architecture (abfd);
+	    machine = bfd_xcoff_machine (abfd);
+	    break;
+
+	  case 1:
+	    arch = bfd_arch_powerpc;
+	    machine = bfd_mach_ppc_601;
+	    break;
+	  case 2: /* 64 bit PowerPC */
+	    arch = bfd_arch_powerpc;
+	    machine = bfd_mach_ppc_620;
+	    break;
+	  case 3:
+	    arch = bfd_arch_powerpc;
+	    machine = bfd_mach_ppc;
+	    break;
+	  case 4:
+	    arch = bfd_arch_rs6000;
+	    machine = bfd_mach_rs6k;
+	    break;
+	  }
+      }
+      break;
+#endif
+
+#ifdef WE32KMAGIC
+    case WE32KMAGIC:
+      arch = bfd_arch_we32k;
+      break;
+#endif
+
+#ifdef H8300MAGIC
+    case H8300MAGIC:
+      arch = bfd_arch_h8300;
+      machine = bfd_mach_h8300;
+      /* !! FIXME this probably isn't the right place for this.  */
+      abfd->flags |= BFD_IS_RELAXABLE;
+      break;
+#endif
+
+#ifdef H8300HMAGIC
+    case H8300HMAGIC:
+      arch = bfd_arch_h8300;
+      machine = bfd_mach_h8300h;
+      /* !! FIXME this probably isn't the right place for this.  */
+      abfd->flags |= BFD_IS_RELAXABLE;
+      break;
+#endif
+
+#ifdef H8300SMAGIC
+    case H8300SMAGIC:
+      arch = bfd_arch_h8300;
+      machine = bfd_mach_h8300s;
+      /* !! FIXME this probably isn't the right place for this.  */
+      abfd->flags |= BFD_IS_RELAXABLE;
+      break;
+#endif
+
+#ifdef H8300HNMAGIC
+    case H8300HNMAGIC:
+      arch = bfd_arch_h8300;
+      machine = bfd_mach_h8300hn;
+      /* !! FIXME this probably isn't the right place for this.  */
+      abfd->flags |= BFD_IS_RELAXABLE;
+      break;
+#endif
+
+#ifdef H8300SNMAGIC
+    case H8300SNMAGIC:
+      arch = bfd_arch_h8300;
+      machine = bfd_mach_h8300sn;
+      /* !! FIXME this probably isn't the right place for this.  */
+      abfd->flags |= BFD_IS_RELAXABLE;
+      break;
+#endif
+
+#ifdef SH_ARCH_MAGIC_BIG
+    case SH_ARCH_MAGIC_BIG:
+    case SH_ARCH_MAGIC_LITTLE:
+#ifdef COFF_WITH_PE
+    case SH_ARCH_MAGIC_WINCE:
+#endif
+      arch = bfd_arch_sh;
+      break;
+#endif
+
+#ifdef MIPS_ARCH_MAGIC_WINCE
+    case MIPS_ARCH_MAGIC_WINCE:
+      arch = bfd_arch_mips;
+      break;
+#endif
+
+#ifdef H8500MAGIC
+    case H8500MAGIC:
+      arch = bfd_arch_h8500;
+      break;
+#endif
+
+#ifdef SPARCMAGIC
+    case SPARCMAGIC:
+#ifdef LYNXCOFFMAGIC
+    case LYNXCOFFMAGIC:
+#endif
+      arch = bfd_arch_sparc;
+      break;
+#endif
+
+#ifdef TIC30MAGIC
+    case TIC30MAGIC:
+      arch = bfd_arch_tic30;
+      break;
+#endif
+
+#ifdef TICOFF0MAGIC
+#ifdef TICOFF_TARGET_ARCH
+      /* This TI COFF section should be used by all new TI COFF v0 targets.  */
+    case TICOFF0MAGIC:
+      arch = TICOFF_TARGET_ARCH;
+      machine = TICOFF_TARGET_MACHINE_GET (internal_f->f_flags);
+      break;
+#endif
+#endif
+
+#ifdef TICOFF1MAGIC
+      /* This TI COFF section should be used by all new TI COFF v1/2 targets.  */
+      /* TI COFF1 and COFF2 use the target_id field to specify which arch.  */
+    case TICOFF1MAGIC:
+    case TICOFF2MAGIC:
+      switch (internal_f->f_target_id)
+	{
+#ifdef TI_TARGET_ID
+	case TI_TARGET_ID:
+	  arch = TICOFF_TARGET_ARCH;
+	  machine = TICOFF_TARGET_MACHINE_GET (internal_f->f_flags);
+	  break;
+#endif
+	default:
+	  arch = bfd_arch_obscure;
+	  (*_bfd_error_handler)
+	    (_("Unrecognized TI COFF target id '0x%x'"),
+	     internal_f->f_target_id);
+	  break;
+	}
+      break;
+#endif
+
+#ifdef TIC80_ARCH_MAGIC
+    case TIC80_ARCH_MAGIC:
+      arch = bfd_arch_tic80;
+      break;
+#endif
+
+#ifdef MCOREMAGIC
+    case MCOREMAGIC:
+      arch = bfd_arch_mcore;
+      break;
+#endif
+
+#ifdef W65MAGIC
+    case W65MAGIC:
+      arch = bfd_arch_w65;
+      break;
+#endif
+
+    default:			/* Unreadable input file type.  */
+      arch = bfd_arch_obscure;
+      break;
+    }
+
+  bfd_default_set_arch_mach (abfd, arch, machine);
+  return TRUE;
+}
+
+#ifdef SYMNAME_IN_DEBUG
+
+static bfd_boolean
+symname_in_debug_hook (bfd * abfd ATTRIBUTE_UNUSED, struct internal_syment *sym)
+{
+  return SYMNAME_IN_DEBUG (sym) != 0;
+}
+
+#else
+
+#define symname_in_debug_hook \
+  (bfd_boolean (*) (bfd *, struct internal_syment *)) bfd_false
+
+#endif
+
+#ifdef RS6000COFF_C
+
+#ifdef XCOFF64
+#define FORCE_SYMNAMES_IN_STRINGS
+#endif
+
+/* Handle the csect auxent of a C_EXT, C_AIX_WEAKEXT or C_HIDEXT symbol.  */
+
+static bfd_boolean
+coff_pointerize_aux_hook (bfd *abfd ATTRIBUTE_UNUSED,
+			  combined_entry_type *table_base,
+			  combined_entry_type *symbol,
+			  unsigned int indaux,
+			  combined_entry_type *aux)
+{
+  int n_sclass = symbol->u.syment.n_sclass;
+
+  if (CSECT_SYM_P (n_sclass)
+      && indaux + 1 == symbol->u.syment.n_numaux)
+    {
+      if (SMTYP_SMTYP (aux->u.auxent.x_csect.x_smtyp) == XTY_LD)
+	{
+	  aux->u.auxent.x_csect.x_scnlen.p =
+	    table_base + aux->u.auxent.x_csect.x_scnlen.l;
+	  aux->fix_scnlen = 1;
+	}
+
+      /* Return TRUE to indicate that the caller should not do any
+	 further work on this auxent.  */
+      return TRUE;
+    }
+
+  /* Return FALSE to indicate that this auxent should be handled by
+     the caller.  */
+  return FALSE;
+}
+
+#else
+#ifdef I960
+
+/* We don't want to pointerize bal entries.  */
+
+static bfd_boolean
+coff_pointerize_aux_hook (bfd *abfd ATTRIBUTE_UNUSED,
+			  combined_entry_type *table_base ATTRIBUTE_UNUSED,
+			  combined_entry_type *symbol,
+			  unsigned int indaux,
+			  combined_entry_type *aux ATTRIBUTE_UNUSED)
+{
+  /* Return TRUE if we don't want to pointerize this aux entry, which
+     is the case for the lastfirst aux entry for a C_LEAFPROC symbol.  */
+  return (indaux == 1
+	  && (symbol->u.syment.n_sclass == C_LEAFPROC
+	      || symbol->u.syment.n_sclass == C_LEAFSTAT
+	      || symbol->u.syment.n_sclass == C_LEAFEXT));
+}
+
+#else /* ! I960 */
+
+#define coff_pointerize_aux_hook 0
+
+#endif /* ! I960 */
+#endif /* ! RS6000COFF_C */
+
+/* Print an aux entry.  This returns TRUE if it has printed it.  */
+
+static bfd_boolean
+coff_print_aux (bfd *abfd ATTRIBUTE_UNUSED,
+		FILE *file ATTRIBUTE_UNUSED,
+		combined_entry_type *table_base ATTRIBUTE_UNUSED,
+		combined_entry_type *symbol ATTRIBUTE_UNUSED,
+		combined_entry_type *aux ATTRIBUTE_UNUSED,
+		unsigned int indaux ATTRIBUTE_UNUSED)
+{
+#ifdef RS6000COFF_C
+  if (CSECT_SYM_P (symbol->u.syment.n_sclass)
+      && indaux + 1 == symbol->u.syment.n_numaux)
+    {
+      /* This is a csect entry.  */
+      fprintf (file, "AUX ");
+      if (SMTYP_SMTYP (aux->u.auxent.x_csect.x_smtyp) != XTY_LD)
+	{
+	  BFD_ASSERT (! aux->fix_scnlen);
+#ifdef XCOFF64
+	  fprintf (file, "val %5lld",
+		   (long long) aux->u.auxent.x_csect.x_scnlen.l);
+#else
+	  fprintf (file, "val %5ld", (long) aux->u.auxent.x_csect.x_scnlen.l);
+#endif
+	}
+      else
+	{
+	  fprintf (file, "indx ");
+	  if (! aux->fix_scnlen)
+#ifdef XCOFF64
+	    fprintf (file, "%4lld",
+		     (long long) aux->u.auxent.x_csect.x_scnlen.l);
+#else
+	    fprintf (file, "%4ld", (long) aux->u.auxent.x_csect.x_scnlen.l);
+#endif
+	  else
+	    fprintf (file, "%4ld",
+		     (long) (aux->u.auxent.x_csect.x_scnlen.p - table_base));
+	}
+      fprintf (file,
+	       " prmhsh %ld snhsh %u typ %d algn %d clss %u stb %ld snstb %u",
+	       aux->u.auxent.x_csect.x_parmhash,
+	       (unsigned int) aux->u.auxent.x_csect.x_snhash,
+	       SMTYP_SMTYP (aux->u.auxent.x_csect.x_smtyp),
+	       SMTYP_ALIGN (aux->u.auxent.x_csect.x_smtyp),
+	       (unsigned int) aux->u.auxent.x_csect.x_smclas,
+	       aux->u.auxent.x_csect.x_stab,
+	       (unsigned int) aux->u.auxent.x_csect.x_snstab);
+      return TRUE;
+    }
+#endif
+
+  /* Return FALSE to indicate that no special action was taken.  */
+  return FALSE;
+}
+
+/*
+SUBSUBSECTION
+	Writing relocations
+
+	To write relocations, the back end steps though the
+	canonical relocation table and create an
+	@code{internal_reloc}. The symbol index to use is removed from
+	the @code{offset} field in the symbol table supplied.  The
+	address comes directly from the sum of the section base
+	address and the relocation offset; the type is dug directly
+	from the howto field.  Then the @code{internal_reloc} is
+	swapped into the shape of an @code{external_reloc} and written
+	out to disk.
+
+*/
+
+#ifdef TARG_AUX
+
+
+/* AUX's ld wants relocations to be sorted.  */
+static int
+compare_arelent_ptr (const void * x, const void * y)
+{
+  const arelent **a = (const arelent **) x;
+  const arelent **b = (const arelent **) y;
+  bfd_size_type aadr = (*a)->address;
+  bfd_size_type badr = (*b)->address;
+
+  return (aadr < badr ? -1 : badr < aadr ? 1 : 0);
+}
+
+#endif /* TARG_AUX */
+
+static bfd_boolean
+coff_write_relocs (bfd * abfd, int first_undef)
+{
+  asection *s;
+
+  for (s = abfd->sections; s != NULL; s = s->next)
+    {
+      unsigned int i;
+      struct external_reloc dst;
+      arelent **p;
+
+#ifndef TARG_AUX
+      p = s->orelocation;
+#else
+      {
+	/* Sort relocations before we write them out.  */
+	bfd_size_type amt;
+
+	amt = s->reloc_count;
+	amt *= sizeof (arelent *);
+	p = bfd_malloc (amt);
+	if (p == NULL && s->reloc_count > 0)
+	  return FALSE;
+	memcpy (p, s->orelocation, (size_t) amt);
+	qsort (p, s->reloc_count, sizeof (arelent *), compare_arelent_ptr);
+      }
+#endif
+
+      if (bfd_seek (abfd, s->rel_filepos, SEEK_SET) != 0)
+	return FALSE;
+
+#ifdef COFF_WITH_PE
+      if (obj_pe (abfd) && s->reloc_count >= 0xffff)
+	{
+	  /* Encode real count here as first reloc.  */
+	  struct internal_reloc n;
+
+	  memset (& n, 0, sizeof (n));
+	  /* Add one to count *this* reloc (grr).  */
+	  n.r_vaddr = s->reloc_count + 1;
+	  coff_swap_reloc_out (abfd, &n, &dst);
+	  if (bfd_bwrite (& dst, (bfd_size_type) bfd_coff_relsz (abfd),
+			  abfd) != bfd_coff_relsz (abfd))
+	    return FALSE;
+	}
+#endif
+
+      for (i = 0; i < s->reloc_count; i++)
+	{
+	  struct internal_reloc n;
+	  arelent *q = p[i];
+
+	  memset (& n, 0, sizeof (n));
+
+	  /* Now we've renumbered the symbols we know where the
+	     undefined symbols live in the table.  Check the reloc
+	     entries for symbols who's output bfd isn't the right one.
+	     This is because the symbol was undefined (which means
+	     that all the pointers are never made to point to the same
+	     place). This is a bad thing,'cause the symbols attached
+	     to the output bfd are indexed, so that the relocation
+	     entries know which symbol index they point to.  So we
+	     have to look up the output symbol here.  */
+
+	  if (q->sym_ptr_ptr[0] != NULL && q->sym_ptr_ptr[0]->the_bfd != abfd)
+	    {
+	      int j;
+	      const char *sname = q->sym_ptr_ptr[0]->name;
+	      asymbol **outsyms = abfd->outsymbols;
+
+	      for (j = first_undef; outsyms[j]; j++)
+		{
+		  const char *intable = outsyms[j]->name;
+
+		  if (strcmp (intable, sname) == 0)
+		    {
+		      /* Got a hit, so repoint the reloc.  */
+		      q->sym_ptr_ptr = outsyms + j;
+		      break;
+		    }
+		}
+	    }
+
+	  n.r_vaddr = q->address + s->vma;
+
+#ifdef R_IHCONST
+	  /* The 29k const/consth reloc pair is a real kludge.  The consth
+	     part doesn't have a symbol; it has an offset.  So rebuilt
+	     that here.  */
+	  if (q->howto->type == R_IHCONST)
+	    n.r_symndx = q->addend;
+	  else
+#endif
+	    if (q->sym_ptr_ptr && q->sym_ptr_ptr[0] != NULL)
+	      {
+#ifdef SECTION_RELATIVE_ABSOLUTE_SYMBOL_P
+		if (SECTION_RELATIVE_ABSOLUTE_SYMBOL_P (q, s))
+#else
+		if ((*q->sym_ptr_ptr)->section == bfd_abs_section_ptr
+		    && ((*q->sym_ptr_ptr)->flags & BSF_SECTION_SYM) != 0)
+#endif
+		  /* This is a relocation relative to the absolute symbol.  */
+		  n.r_symndx = -1;
+		else
+		  {
+		    n.r_symndx = get_index ((*(q->sym_ptr_ptr)));
+		    /* Check to see if the symbol reloc points to a symbol
+		       we don't have in our symbol table.  */
+		    if (n.r_symndx > obj_conv_table_size (abfd))
+		      {
+			bfd_set_error (bfd_error_bad_value);
+			_bfd_error_handler (_("%B: reloc against a non-existant symbol index: %ld"),
+					    abfd, n.r_symndx);
+			return FALSE;
+		      }
+		  }
+	      }
+
+#ifdef SWAP_OUT_RELOC_OFFSET
+	  n.r_offset = q->addend;
+#endif
+
+#ifdef SELECT_RELOC
+	  /* Work out reloc type from what is required.  */
+	  SELECT_RELOC (n, q->howto);
+#else
+	  n.r_type = q->howto->type;
+#endif
+	  coff_swap_reloc_out (abfd, &n, &dst);
+
+	  if (bfd_bwrite (& dst, (bfd_size_type) bfd_coff_relsz (abfd),
+			 abfd) != bfd_coff_relsz (abfd))
+	    return FALSE;
+	}
+
+#ifdef TARG_AUX
+      if (p != NULL)
+	free (p);
+#endif
+    }
+
+  return TRUE;
+}
+
+/* Set flags and magic number of a coff file from architecture and machine
+   type.  Result is TRUE if we can represent the arch&type, FALSE if not.  */
+
+static bfd_boolean
+coff_set_flags (bfd * abfd,
+		unsigned int *magicp ATTRIBUTE_UNUSED,
+		unsigned short *flagsp ATTRIBUTE_UNUSED)
+{
+  switch (bfd_get_arch (abfd))
+    {
+#ifdef Z80MAGIC
+    case bfd_arch_z80:
+      *magicp = Z80MAGIC;
+      switch (bfd_get_mach (abfd))
+	{
+	case 0:
+	case bfd_mach_z80strict:
+	case bfd_mach_z80:
+	case bfd_mach_z80full:
+	case bfd_mach_r800:
+	  *flagsp = bfd_get_mach (abfd) << 12;
+	  break;
+	default:
+	  return FALSE;
+	}
+      return TRUE;
+#endif
+
+#ifdef Z8KMAGIC
+    case bfd_arch_z8k:
+      *magicp = Z8KMAGIC;
+
+      switch (bfd_get_mach (abfd))
+	{
+	case bfd_mach_z8001: *flagsp = F_Z8001;	break;
+	case bfd_mach_z8002: *flagsp = F_Z8002;	break;
+	default:	     return FALSE;
+	}
+      return TRUE;
+#endif
+
+#ifdef I960ROMAGIC
+    case bfd_arch_i960:
+
+      {
+	unsigned flags;
+
+	*magicp = I960ROMAGIC;
+
+	switch (bfd_get_mach (abfd))
+	  {
+	  case bfd_mach_i960_core:  flags = F_I960CORE; break;
+	  case bfd_mach_i960_kb_sb: flags = F_I960KB;	break;
+	  case bfd_mach_i960_mc:    flags = F_I960MC;	break;
+	  case bfd_mach_i960_xa:    flags = F_I960XA;	break;
+	  case bfd_mach_i960_ca:    flags = F_I960CA;	break;
+	  case bfd_mach_i960_ka_sa: flags = F_I960KA;	break;
+	  case bfd_mach_i960_jx:    flags = F_I960JX;	break;
+	  case bfd_mach_i960_hx:    flags = F_I960HX;	break;
+	  default:		    return FALSE;
+	  }
+	*flagsp = flags;
+	return TRUE;
+      }
+      break;
+#endif
+
+#ifdef TIC30MAGIC
+    case bfd_arch_tic30:
+      *magicp = TIC30MAGIC;
+      return TRUE;
+#endif
+
+#ifdef TICOFF_DEFAULT_MAGIC
+    case TICOFF_TARGET_ARCH:
+      /* If there's no indication of which version we want, use the default.  */
+      if (!abfd->xvec )
+	*magicp = TICOFF_DEFAULT_MAGIC;
+      else
+	{
+	  /* We may want to output in a different COFF version.  */
+	  switch (abfd->xvec->name[4])
+	    {
+	    case '0':
+	      *magicp = TICOFF0MAGIC;
+	      break;
+	    case '1':
+	      *magicp = TICOFF1MAGIC;
+	      break;
+	    case '2':
+	      *magicp = TICOFF2MAGIC;
+	      break;
+	    default:
+	      return FALSE;
+	    }
+	}
+      TICOFF_TARGET_MACHINE_SET (flagsp, bfd_get_mach (abfd));
+      return TRUE;
+#endif
+
+#ifdef TIC80_ARCH_MAGIC
+    case bfd_arch_tic80:
+      *magicp = TIC80_ARCH_MAGIC;
+      return TRUE;
+#endif
+
+#ifdef ARMMAGIC
+    case bfd_arch_arm:
+#ifdef ARM_WINCE
+      * magicp = ARMPEMAGIC;
+#else
+      * magicp = ARMMAGIC;
+#endif
+      * flagsp = 0;
+      if (APCS_SET (abfd))
+	{
+	  if (APCS_26_FLAG (abfd))
+	    * flagsp |= F_APCS26;
+
+	  if (APCS_FLOAT_FLAG (abfd))
+	    * flagsp |= F_APCS_FLOAT;
+
+	  if (PIC_FLAG (abfd))
+	    * flagsp |= F_PIC;
+	}
+      if (INTERWORK_SET (abfd) && INTERWORK_FLAG (abfd))
+	* flagsp |= F_INTERWORK;
+      switch (bfd_get_mach (abfd))
+	{
+	case bfd_mach_arm_2:  * flagsp |= F_ARM_2;  break;
+	case bfd_mach_arm_2a: * flagsp |= F_ARM_2a; break;
+	case bfd_mach_arm_3:  * flagsp |= F_ARM_3;  break;
+	case bfd_mach_arm_3M: * flagsp |= F_ARM_3M; break;
+	case bfd_mach_arm_4:  * flagsp |= F_ARM_4;  break;
+	case bfd_mach_arm_4T: * flagsp |= F_ARM_4T; break;
+	case bfd_mach_arm_5:  * flagsp |= F_ARM_5;  break;
+	  /* FIXME: we do not have F_ARM vaues greater than F_ARM_5.
+	     See also the comment in coff_set_arch_mach_hook().  */
+	case bfd_mach_arm_5T: * flagsp |= F_ARM_5;  break;
+	case bfd_mach_arm_5TE: * flagsp |= F_ARM_5; break;
+	case bfd_mach_arm_XScale: * flagsp |= F_ARM_5; break;
+	}
+      return TRUE;
+#endif
+
+#ifdef PPCMAGIC
+    case bfd_arch_powerpc:
+      *magicp = PPCMAGIC;
+      return TRUE;
+#endif
+
+#if defined(I386MAGIC) || defined(AMD64MAGIC)
+    case bfd_arch_i386:
+#if defined(I386MAGIC)
+      *magicp = I386MAGIC;
+#endif
+#if defined LYNXOS
+      /* Just overwrite the usual value if we're doing Lynx.  */
+      *magicp = LYNXCOFFMAGIC;
+#endif
+#if defined AMD64MAGIC
+      *magicp = AMD64MAGIC;
+#endif
+      return TRUE;
+#endif
+
+#ifdef I860MAGIC
+    case bfd_arch_i860:
+      *magicp = I860MAGIC;
+      return TRUE;
+#endif
+
+#ifdef IA64MAGIC
+    case bfd_arch_ia64:
+      *magicp = IA64MAGIC;
+      return TRUE;
+#endif
+
+#ifdef MC68MAGIC
+    case bfd_arch_m68k:
+#ifdef APOLLOM68KMAGIC
+      *magicp = APOLLO_COFF_VERSION_NUMBER;
+#else
+      /* NAMES_HAVE_UNDERSCORE may be defined by coff-u68k.c.  */
+#ifdef NAMES_HAVE_UNDERSCORE
+      *magicp = MC68KBCSMAGIC;
+#else
+      *magicp = MC68MAGIC;
+#endif
+#endif
+#ifdef LYNXOS
+      /* Just overwrite the usual value if we're doing Lynx.  */
+      *magicp = LYNXCOFFMAGIC;
+#endif
+      return TRUE;
+#endif
+
+#ifdef MC88MAGIC
+    case bfd_arch_m88k:
+      *magicp = MC88OMAGIC;
+      return TRUE;
+#endif
+
+#ifdef H8300MAGIC
+    case bfd_arch_h8300:
+      switch (bfd_get_mach (abfd))
+	{
+	case bfd_mach_h8300:   *magicp = H8300MAGIC;   return TRUE;
+	case bfd_mach_h8300h:  *magicp = H8300HMAGIC;  return TRUE;
+	case bfd_mach_h8300s:  *magicp = H8300SMAGIC;  return TRUE;
+	case bfd_mach_h8300hn: *magicp = H8300HNMAGIC; return TRUE;
+	case bfd_mach_h8300sn: *magicp = H8300SNMAGIC; return TRUE;
+	default: break;
+	}
+      break;
+#endif
+
+#ifdef SH_ARCH_MAGIC_BIG
+    case bfd_arch_sh:
+#ifdef COFF_IMAGE_WITH_PE
+      *magicp = SH_ARCH_MAGIC_WINCE;
+#else
+      if (bfd_big_endian (abfd))
+	*magicp = SH_ARCH_MAGIC_BIG;
+      else
+	*magicp = SH_ARCH_MAGIC_LITTLE;
+#endif
+      return TRUE;
+#endif
+
+#ifdef MIPS_ARCH_MAGIC_WINCE
+    case bfd_arch_mips:
+      *magicp = MIPS_ARCH_MAGIC_WINCE;
+      return TRUE;
+#endif
+
+#ifdef SPARCMAGIC
+    case bfd_arch_sparc:
+      *magicp = SPARCMAGIC;
+#ifdef LYNXOS
+      /* Just overwrite the usual value if we're doing Lynx.  */
+      *magicp = LYNXCOFFMAGIC;
+#endif
+      return TRUE;
+#endif
+
+#ifdef H8500MAGIC
+    case bfd_arch_h8500:
+      *magicp = H8500MAGIC;
+      return TRUE;
+      break;
+#endif
+
+#ifdef WE32KMAGIC
+    case bfd_arch_we32k:
+      *magicp = WE32KMAGIC;
+      return TRUE;
+#endif
+
+#ifdef RS6000COFF_C
+    case bfd_arch_rs6000:
+#ifndef PPCMAGIC
+    case bfd_arch_powerpc:
+#endif
+      BFD_ASSERT (bfd_get_flavour (abfd) == bfd_target_xcoff_flavour);
+      *magicp = bfd_xcoff_magic_number (abfd);
+      return TRUE;
+#endif
+
+#ifdef MCOREMAGIC
+    case bfd_arch_mcore:
+      * magicp = MCOREMAGIC;
+      return TRUE;
+#endif
+
+#ifdef W65MAGIC
+    case bfd_arch_w65:
+      *magicp = W65MAGIC;
+      return TRUE;
+#endif
+
+#ifdef OR32_MAGIC_BIG
+    case bfd_arch_or32:
+      if (bfd_big_endian (abfd))
+	* magicp = OR32_MAGIC_BIG;
+      else
+	* magicp = OR32_MAGIC_LITTLE;
+      return TRUE;
+#endif
+
+    default:			/* Unknown architecture.  */
+      /* Fall through to "return FALSE" below, to avoid
+	 "statement never reached" errors on the one below.  */
+      break;
+    }
+
+  return FALSE;
+}
+
+static bfd_boolean
+coff_set_arch_mach (bfd * abfd,
+		    enum bfd_architecture arch,
+		    unsigned long machine)
+{
+  unsigned dummy1;
+  unsigned short dummy2;
+
+  if (! bfd_default_set_arch_mach (abfd, arch, machine))
+    return FALSE;
+
+  if (arch != bfd_arch_unknown
+      && ! coff_set_flags (abfd, &dummy1, &dummy2))
+    return FALSE;		/* We can't represent this type.  */
+
+  return TRUE;			/* We're easy...  */
+}
+
+#ifdef COFF_IMAGE_WITH_PE
+
+/* This is used to sort sections by VMA, as required by PE image
+   files.  */
+
+static int
+sort_by_secaddr (const void * arg1, const void * arg2)
+{
+  const asection *a = *(const asection **) arg1;
+  const asection *b = *(const asection **) arg2;
+
+  if (a->vma < b->vma)
+    return -1;
+  else if (a->vma > b->vma)
+    return 1;
+
+  return 0;
+}
+
+#endif /* COFF_IMAGE_WITH_PE */
+
+/* Calculate the file position for each section.  */
+
+#ifndef I960
+#define ALIGN_SECTIONS_IN_FILE
+#endif
+#if defined(TIC80COFF) || defined(TICOFF)
+#undef ALIGN_SECTIONS_IN_FILE
+#endif
+
+static bfd_boolean
+coff_compute_section_file_positions (bfd * abfd)
+{
+  asection *current;
+  file_ptr sofar = bfd_coff_filhsz (abfd);
+  bfd_boolean align_adjust;
+  int target_index;
+#ifdef ALIGN_SECTIONS_IN_FILE
+  asection *previous = NULL;
+  file_ptr old_sofar;
+#endif
+
+#ifdef COFF_IMAGE_WITH_PE
+  int page_size;
+
+  if (coff_data (abfd)->link_info)
+    {
+      page_size = pe_data (abfd)->pe_opthdr.FileAlignment;
+
+      /* If no file alignment has been set, default to one.
+	 This repairs 'ld -r' for arm-wince-pe target.  */
+      if (page_size == 0)
+	page_size = 1;
+    }
+  else
+    page_size = PE_DEF_FILE_ALIGNMENT;
+#else
+#ifdef COFF_PAGE_SIZE
+  int page_size = COFF_PAGE_SIZE;
+#endif
+#endif
+
+#ifdef RS6000COFF_C
+  /* On XCOFF, if we have symbols, set up the .debug section.  */
+  if (bfd_get_symcount (abfd) > 0)
+    {
+      bfd_size_type sz;
+      bfd_size_type i, symcount;
+      asymbol **symp;
+
+      sz = 0;
+      symcount = bfd_get_symcount (abfd);
+      for (symp = abfd->outsymbols, i = 0; i < symcount; symp++, i++)
+	{
+	  coff_symbol_type *cf;
+
+	  cf = coff_symbol_from (abfd, *symp);
+	  if (cf != NULL
+	      && cf->native != NULL
+	      && SYMNAME_IN_DEBUG (&cf->native->u.syment))
+	    {
+	      size_t len;
+
+	      len = strlen (bfd_asymbol_name (*symp));
+	      if (len > SYMNMLEN || bfd_coff_force_symnames_in_strings (abfd))
+		sz += len + 1 + bfd_coff_debug_string_prefix_length (abfd);
+	    }
+	}
+      if (sz > 0)
+	{
+	  asection *dsec;
+
+	  dsec = bfd_make_section_old_way (abfd, DOT_DEBUG);
+	  if (dsec == NULL)
+	    abort ();
+	  dsec->size = sz;
+	  dsec->flags |= SEC_HAS_CONTENTS;
+	}
+    }
+#endif
+
+  if (bfd_get_start_address (abfd))
+    /*  A start address may have been added to the original file. In this
+	case it will need an optional header to record it.  */
+    abfd->flags |= EXEC_P;
+
+  if (abfd->flags & EXEC_P)
+    sofar += bfd_coff_aoutsz (abfd);
+#ifdef RS6000COFF_C
+  else if (xcoff_data (abfd)->full_aouthdr)
+    sofar += bfd_coff_aoutsz (abfd);
+  else
+    sofar += SMALL_AOUTSZ;
+#endif
+
+  sofar += abfd->section_count * bfd_coff_scnhsz (abfd);
+
+#ifdef RS6000COFF_C
+  /* XCOFF handles overflows in the reloc and line number count fields
+     by allocating a new section header to hold the correct counts.  */
+  for (current = abfd->sections; current != NULL; current = current->next)
+    if (current->reloc_count >= 0xffff || current->lineno_count >= 0xffff)
+      sofar += bfd_coff_scnhsz (abfd);
+#endif
+
+#ifdef COFF_IMAGE_WITH_PE
+  {
+    /* PE requires the sections to be in memory order when listed in
+       the section headers.  It also does not like empty loadable
+       sections.  The sections apparently do not have to be in the
+       right order in the image file itself, but we do need to get the
+       target_index values right.  */
+
+    unsigned int count;
+    asection **section_list;
+    unsigned int i;
+    bfd_size_type amt;
+
+#ifdef COFF_PAGE_SIZE
+    /* Clear D_PAGED if section alignment is smaller than
+       COFF_PAGE_SIZE.  */
+   if (pe_data (abfd)->pe_opthdr.SectionAlignment < COFF_PAGE_SIZE)
+     abfd->flags &= ~D_PAGED;
+#endif
+
+    count = 0;
+    for (current = abfd->sections; current != NULL; current = current->next)
+      ++count;
+
+    /* We allocate an extra cell to simplify the final loop.  */
+    amt = sizeof (struct asection *) * (count + 1);
+    section_list = (asection **) bfd_malloc (amt);
+    if (section_list == NULL)
+      return FALSE;
+
+    i = 0;
+    for (current = abfd->sections; current != NULL; current = current->next)
+      {
+	section_list[i] = current;
+	++i;
+      }
+    section_list[i] = NULL;
+
+    qsort (section_list, count, sizeof (asection *), sort_by_secaddr);
+
+    /* Rethread the linked list into sorted order; at the same time,
+       assign target_index values.  */
+    target_index = 1;
+    abfd->sections = NULL;
+    abfd->section_last = NULL;
+    for (i = 0; i < count; i++)
+      {
+	current = section_list[i];
+	bfd_section_list_append (abfd, current);
+
+	/* Later, if the section has zero size, we'll be throwing it
+	   away, so we don't want to number it now.  Note that having
+	   a zero size and having real contents are different
+	   concepts: .bss has no contents, but (usually) non-zero
+	   size.  */
+	if (current->size == 0)
+	  {
+	    /* Discard.  However, it still might have (valid) symbols
+	       in it, so arbitrarily set it to section 1 (indexing is
+	       1-based here; usually .text).  __end__ and other
+	       contents of .endsection really have this happen.
+	       FIXME: This seems somewhat dubious.  */
+	    current->target_index = 1;
+	  }
+	else
+	  current->target_index = target_index++;
+      }
+
+    free (section_list);
+  }
+#else /* ! COFF_IMAGE_WITH_PE */
+  {
+    /* Set the target_index field.  */
+    target_index = 1;
+    for (current = abfd->sections; current != NULL; current = current->next)
+      current->target_index = target_index++;
+  }
+#endif /* ! COFF_IMAGE_WITH_PE */
+
+  if (target_index >= 32768)
+    {
+      bfd_set_error (bfd_error_file_too_big);
+      (*_bfd_error_handler)
+	(_("%B: too many sections (%d)"), abfd, target_index);
+      return FALSE;
+    }
+
+  align_adjust = FALSE;
+  for (current = abfd->sections;
+       current != NULL;
+       current = current->next)
+    {
+#ifdef COFF_IMAGE_WITH_PE
+      /* With PE we have to pad each section to be a multiple of its
+	 page size too, and remember both sizes.  */
+      if (coff_section_data (abfd, current) == NULL)
+	{
+	  bfd_size_type amt = sizeof (struct coff_section_tdata);
+
+	  current->used_by_bfd = bfd_zalloc (abfd, amt);
+	  if (current->used_by_bfd == NULL)
+	    return FALSE;
+	}
+      if (pei_section_data (abfd, current) == NULL)
+	{
+	  bfd_size_type amt = sizeof (struct pei_section_tdata);
+
+	  coff_section_data (abfd, current)->tdata = bfd_zalloc (abfd, amt);
+	  if (coff_section_data (abfd, current)->tdata == NULL)
+	    return FALSE;
+	}
+      if (pei_section_data (abfd, current)->virt_size == 0)
+	pei_section_data (abfd, current)->virt_size = current->size;
+#endif
+
+      /* Only deal with sections which have contents.  */
+      if (!(current->flags & SEC_HAS_CONTENTS))
+	continue;
+
+      current->rawsize = current->size;
+
+#ifdef COFF_IMAGE_WITH_PE
+      /* Make sure we skip empty sections in a PE image.  */
+      if (current->size == 0)
+	continue;
+#endif
+
+      /* Align the sections in the file to the same boundary on
+	 which they are aligned in virtual memory.  I960 doesn't
+	 do this (FIXME) so we can stay in sync with Intel.  960
+	 doesn't yet page from files...  */
+#ifdef ALIGN_SECTIONS_IN_FILE
+      if ((abfd->flags & EXEC_P) != 0)
+	{
+	  /* Make sure this section is aligned on the right boundary - by
+	     padding the previous section up if necessary.  */
+	  old_sofar = sofar;
+
+#ifdef RS6000COFF_C
+	  /* AIX loader checks the text section alignment of (vma - filepos)
+	     So even though the filepos may be aligned wrt the o_algntext, for
+	     AIX executables, this check fails. This shows up when a native
+	     AIX executable is stripped with gnu strip because the default vma
+	     of native is 0x10000150 but default for gnu is 0x10000140.  Gnu
+	     stripped gnu excutable passes this check because the filepos is
+	     0x0140.  This problem also show up with 64 bit shared objects. The
+	     data section must also be aligned.  */
+	  if (!strcmp (current->name, _TEXT)
+	      || !strcmp (current->name, _DATA))
+	    {
+	      bfd_vma pad;
+	      bfd_vma align;
+
+	      sofar = BFD_ALIGN (sofar, 1 << current->alignment_power);
+
+	      align = 1 << current->alignment_power;
+	      pad = abs (current->vma - sofar) % align;
+
+	      if (pad)
+		{
+		  pad = align - pad;
+		  sofar += pad;
+		}
+	    }
+	  else
+#else
+	    {
+	      sofar = BFD_ALIGN (sofar, 1 << current->alignment_power);
+	    }
+#endif
+	  if (previous != NULL)
+	    previous->size += sofar - old_sofar;
+	}
+
+#endif
+
+      /* In demand paged files the low order bits of the file offset
+	 must match the low order bits of the virtual address.  */
+#ifdef COFF_PAGE_SIZE
+      if ((abfd->flags & D_PAGED) != 0
+	  && (current->flags & SEC_ALLOC) != 0)
+	sofar += (current->vma - (bfd_vma) sofar) % page_size;
+#endif
+      current->filepos = sofar;
+
+#ifdef COFF_IMAGE_WITH_PE
+      /* Set the padded size.  */
+      current->size = (current->size + page_size - 1) & -page_size;
+#endif
+
+      sofar += current->size;
+
+#ifdef ALIGN_SECTIONS_IN_FILE
+      /* Make sure that this section is of the right size too.  */
+      if ((abfd->flags & EXEC_P) == 0)
+	{
+	  bfd_size_type old_size;
+
+	  old_size = current->size;
+	  current->size = BFD_ALIGN (current->size,
+				     1 << current->alignment_power);
+	  align_adjust = current->size != old_size;
+	  sofar += current->size - old_size;
+	}
+      else
+	{
+	  old_sofar = sofar;
+	  sofar = BFD_ALIGN (sofar, 1 << current->alignment_power);
+	  align_adjust = sofar != old_sofar;
+	  current->size += sofar - old_sofar;
+	}
+#endif
+
+#ifdef COFF_IMAGE_WITH_PE
+      /* For PE we need to make sure we pad out to the aligned
+	 size, in case the caller only writes out data to the
+	 unaligned size.  */
+      if (pei_section_data (abfd, current)->virt_size < current->size)
+	align_adjust = TRUE;
+#endif
+
+#ifdef _LIB
+      /* Force .lib sections to start at zero.  The vma is then
+	 incremented in coff_set_section_contents.  This is right for
+	 SVR3.2.  */
+      if (strcmp (current->name, _LIB) == 0)
+	bfd_set_section_vma (abfd, current, 0);
+#endif
+
+#ifdef ALIGN_SECTIONS_IN_FILE
+      previous = current;
+#endif
+    }
+
+  /* It is now safe to write to the output file.  If we needed an
+     alignment adjustment for the last section, then make sure that
+     there is a byte at offset sofar.  If there are no symbols and no
+     relocs, then nothing follows the last section.  If we don't force
+     the last byte out, then the file may appear to be truncated.  */
+  if (align_adjust)
+    {
+      bfd_byte b;
+
+      b = 0;
+      if (bfd_seek (abfd, sofar - 1, SEEK_SET) != 0
+	  || bfd_bwrite (&b, (bfd_size_type) 1, abfd) != 1)
+	return FALSE;
+    }
+
+  /* Make sure the relocations are aligned.  We don't need to make
+     sure that this byte exists, because it will only matter if there
+     really are relocs.  */
+  sofar = BFD_ALIGN (sofar, 1 << COFF_DEFAULT_SECTION_ALIGNMENT_POWER);
+
+  obj_relocbase (abfd) = sofar;
+  abfd->output_has_begun = TRUE;
+
+  return TRUE;
+}
+
+#ifdef COFF_IMAGE_WITH_PE
+
+static unsigned int pelength;
+static unsigned int peheader;
+
+static bfd_boolean
+coff_read_word (bfd *abfd, unsigned int *value)
+{
+  unsigned char b[2];
+  int status;
+
+  status = bfd_bread (b, (bfd_size_type) 2, abfd);
+  if (status < 1)
+    {
+      *value = 0;
+      return FALSE;
+    }
+
+  if (status == 1)
+    *value = (unsigned int) b[0];
+  else
+    *value = (unsigned int) (b[0] + (b[1] << 8));
+
+  pelength += (unsigned int) status;
+
+  return TRUE;
+}
+
+static unsigned int
+coff_compute_checksum (bfd *abfd)
+{
+  bfd_boolean more_data;
+  file_ptr filepos;
+  unsigned int value;
+  unsigned int total;
+
+  total = 0;
+  pelength = 0;
+  filepos = (file_ptr) 0;
+
+  do
+    {
+      if (bfd_seek (abfd, filepos, SEEK_SET) != 0)
+	return 0;
+
+      more_data = coff_read_word (abfd, &value);
+      total += value;
+      total = 0xffff & (total + (total >> 0x10));
+      filepos += 2;
+    }
+  while (more_data);
+
+  return (0xffff & (total + (total >> 0x10)));
+}
+
+static bfd_boolean
+coff_apply_checksum (bfd *abfd)
+{
+  unsigned int computed;
+  unsigned int checksum = 0;
+
+  if (bfd_seek (abfd, 0x3c, SEEK_SET) != 0)
+    return FALSE;
+
+  if (!coff_read_word (abfd, &peheader))
+    return FALSE;
+
+  if (bfd_seek (abfd, peheader + 0x58, SEEK_SET) != 0)
+    return FALSE;
+
+  checksum = 0;
+  bfd_bwrite (&checksum, (bfd_size_type) 4, abfd);
+
+  if (bfd_seek (abfd, peheader, SEEK_SET) != 0)
+    return FALSE;
+
+  computed = coff_compute_checksum (abfd);
+
+  checksum = computed + pelength;
+
+  if (bfd_seek (abfd, peheader + 0x58, SEEK_SET) != 0)
+    return FALSE;
+
+  bfd_bwrite (&checksum, (bfd_size_type) 4, abfd);
+
+  return TRUE;
+}
+
+#endif /* COFF_IMAGE_WITH_PE */
+
+static bfd_boolean
+coff_write_object_contents (bfd * abfd)
+{
+  asection *current;
+  bfd_boolean hasrelocs = FALSE;
+  bfd_boolean haslinno = FALSE;
+#ifdef COFF_IMAGE_WITH_PE
+  bfd_boolean hasdebug = FALSE;
+#endif
+  file_ptr scn_base;
+  file_ptr reloc_base;
+  file_ptr lineno_base;
+  file_ptr sym_base;
+  unsigned long reloc_size = 0, reloc_count = 0;
+  unsigned long lnno_size = 0;
+  bfd_boolean long_section_names;
+  asection *text_sec = NULL;
+  asection *data_sec = NULL;
+  asection *bss_sec = NULL;
+  struct internal_filehdr internal_f;
+  struct internal_aouthdr internal_a;
+#ifdef COFF_LONG_SECTION_NAMES
+  size_t string_size = STRING_SIZE_SIZE;
+#endif
+
+  bfd_set_error (bfd_error_system_call);
+
+  /* Make a pass through the symbol table to count line number entries and
+     put them into the correct asections.  */
+  lnno_size = coff_count_linenumbers (abfd) * bfd_coff_linesz (abfd);
+
+  if (! abfd->output_has_begun)
+    {
+      if (! coff_compute_section_file_positions (abfd))
+	return FALSE;
+    }
+
+  reloc_base = obj_relocbase (abfd);
+
+  /* Work out the size of the reloc and linno areas.  */
+
+  for (current = abfd->sections; current != NULL; current =
+       current->next)
+    {
+#ifdef COFF_WITH_PE
+      /* We store the actual reloc count in the first reloc's addr.  */
+      if (obj_pe (abfd) && current->reloc_count >= 0xffff)
+	reloc_count ++;
+#endif
+      reloc_count += current->reloc_count;
+    }
+
+  reloc_size = reloc_count * bfd_coff_relsz (abfd);
+
+  lineno_base = reloc_base + reloc_size;
+  sym_base = lineno_base + lnno_size;
+
+  /* Indicate in each section->line_filepos its actual file address.  */
+  for (current = abfd->sections; current != NULL; current =
+       current->next)
+    {
+      if (current->lineno_count)
+	{
+	  current->line_filepos = lineno_base;
+	  current->moving_line_filepos = lineno_base;
+	  lineno_base += current->lineno_count * bfd_coff_linesz (abfd);
+	}
+      else
+	current->line_filepos = 0;
+
+      if (current->reloc_count)
+	{
+	  current->rel_filepos = reloc_base;
+	  reloc_base += current->reloc_count * bfd_coff_relsz (abfd);
+#ifdef COFF_WITH_PE
+	  /* Extra reloc to hold real count.  */
+	  if (obj_pe (abfd) && current->reloc_count >= 0xffff)
+	    reloc_base += bfd_coff_relsz (abfd);
+#endif
+	}
+      else
+	current->rel_filepos = 0;
+    }
+
+  /* Write section headers to the file.  */
+  internal_f.f_nscns = 0;
+
+  if ((abfd->flags & EXEC_P) != 0)
+    scn_base = bfd_coff_filhsz (abfd) + bfd_coff_aoutsz (abfd);
+  else
+    {
+      scn_base = bfd_coff_filhsz (abfd);
+#ifdef RS6000COFF_C
+#ifndef XCOFF64
+      if (xcoff_data (abfd)->full_aouthdr)
+	scn_base += bfd_coff_aoutsz (abfd);
+      else
+	scn_base += SMALL_AOUTSZ;
+#endif
+#endif
+    }
+
+  if (bfd_seek (abfd, scn_base, SEEK_SET) != 0)
+    return FALSE;
+
+  long_section_names = FALSE;
+  for (current = abfd->sections;
+       current != NULL;
+       current = current->next)
+    {
+      struct internal_scnhdr section;
+#ifdef COFF_IMAGE_WITH_PE
+      bfd_boolean is_reloc_section = FALSE;
+
+      if (strcmp (current->name, DOT_RELOC) == 0)
+	{
+	  is_reloc_section = TRUE;
+	  hasrelocs = TRUE;
+	  pe_data (abfd)->has_reloc_section = 1;
+	}
+#endif
+
+      internal_f.f_nscns++;
+
+      strncpy (section.s_name, current->name, SCNNMLEN);
+
+#ifdef COFF_LONG_SECTION_NAMES
+      /* Handle long section names as in PE.  This must be compatible
+	 with the code in coff_write_symbols and _bfd_coff_final_link.  */
+      if (bfd_coff_long_section_names (abfd))
+	{
+	  size_t len;
+
+	  len = strlen (current->name);
+	  if (len > SCNNMLEN)
+	    {
+	      /* The s_name field is defined to be NUL-padded but need not be
+		 NUL-terminated.  We use a temporary buffer so that we can still
+		 sprintf all eight chars without splatting a terminating NUL
+		 over the first byte of the following member (s_paddr).  */
+	      char s_name_buf[SCNNMLEN + 1];
+
+	      /* An inherent limitation of the /nnnnnnn notation used to indicate
+		 the offset of the long name in the string table is that we
+		 cannot address entries beyone the ten million byte boundary.  */
+	      if (string_size >= 10000000)
+		{
+		  bfd_set_error (bfd_error_file_too_big);
+		  (*_bfd_error_handler)
+		    (_("%B: section %s: string table overflow at offset %ld"),
+		    abfd, current->name, string_size);
+		  return FALSE;
+		}
+
+	      /* snprintf not strictly necessary now we've verified the value
+		 has less than eight ASCII digits, but never mind.  */
+	      snprintf (s_name_buf, SCNNMLEN + 1, "/%lu", (unsigned long) string_size);
+	      /* Then strncpy takes care of any padding for us.  */
+	      strncpy (section.s_name, s_name_buf, SCNNMLEN);
+	      string_size += len + 1;
+	      long_section_names = TRUE;
+	    }
+	}
+#endif
+
+#ifdef _LIB
+      /* Always set s_vaddr of .lib to 0.  This is right for SVR3.2
+	 Ian Taylor <ian@cygnus.com>.  */
+      if (strcmp (current->name, _LIB) == 0)
+	section.s_vaddr = 0;
+      else
+#endif
+      section.s_vaddr = current->vma;
+      section.s_paddr = current->lma;
+      section.s_size =  current->size;
+#ifdef coff_get_section_load_page
+      section.s_page = coff_get_section_load_page (current);
+#else
+      section.s_page = 0;
+#endif
+
+#ifdef COFF_WITH_PE
+      section.s_paddr = 0;
+#endif
+#ifdef COFF_IMAGE_WITH_PE
+      /* Reminder: s_paddr holds the virtual size of the section.  */
+      if (coff_section_data (abfd, current) != NULL
+	  && pei_section_data (abfd, current) != NULL)
+	section.s_paddr = pei_section_data (abfd, current)->virt_size;
+      else
+	section.s_paddr = 0;
+#endif
+
+      /* If this section has no size or is unloadable then the scnptr
+	 will be 0 too.  */
+      if (current->size == 0
+	  || (current->flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0)
+	section.s_scnptr = 0;
+      else
+	section.s_scnptr = current->filepos;
+
+      section.s_relptr = current->rel_filepos;
+      section.s_lnnoptr = current->line_filepos;
+      section.s_nreloc = current->reloc_count;
+      section.s_nlnno = current->lineno_count;
+#ifndef COFF_IMAGE_WITH_PE
+      /* In PEI, relocs come in the .reloc section.  */
+      if (current->reloc_count != 0)
+	hasrelocs = TRUE;
+#endif
+      if (current->lineno_count != 0)
+	haslinno = TRUE;
+#ifdef COFF_IMAGE_WITH_PE
+      if ((current->flags & SEC_DEBUGGING) != 0
+	  && ! is_reloc_section)
+	hasdebug = TRUE;
+#endif
+
+#ifdef RS6000COFF_C
+#ifndef XCOFF64
+      /* Indicate the use of an XCOFF overflow section header.  */
+      if (current->reloc_count >= 0xffff || current->lineno_count >= 0xffff)
+	{
+	  section.s_nreloc = 0xffff;
+	  section.s_nlnno = 0xffff;
+	}
+#endif
+#endif
+
+      section.s_flags = sec_to_styp_flags (current->name, current->flags);
+
+      if (!strcmp (current->name, _TEXT))
+	text_sec = current;
+      else if (!strcmp (current->name, _DATA))
+	data_sec = current;
+      else if (!strcmp (current->name, _BSS))
+	bss_sec = current;
+
+#ifdef I960
+      section.s_align = (current->alignment_power
+			 ? 1 << current->alignment_power
+			 : 0);
+#endif
+#ifdef TIC80COFF
+      /* TI COFF puts the alignment power in bits 8-11 of the flags.  */
+      section.s_flags |= (current->alignment_power & 0xF) << 8;
+#endif
+#ifdef COFF_ENCODE_ALIGNMENT
+      COFF_ENCODE_ALIGNMENT(section, current->alignment_power);
+#endif
+
+#ifdef COFF_IMAGE_WITH_PE
+      /* Suppress output of the sections if they are null.  ld
+	 includes the bss and data sections even if there is no size
+	 assigned to them.  NT loader doesn't like it if these section
+	 headers are included if the sections themselves are not
+	 needed.  See also coff_compute_section_file_positions.  */
+      if (section.s_size == 0)
+	internal_f.f_nscns--;
+      else
+#endif
+	{
+	  SCNHDR buff;
+	  bfd_size_type amt = bfd_coff_scnhsz (abfd);
+
+	  if (coff_swap_scnhdr_out (abfd, &section, &buff) == 0
+	      || bfd_bwrite (& buff, amt, abfd) != amt)
+	    return FALSE;
+	}
+
+#ifdef COFF_WITH_PE
+      /* PE stores COMDAT section information in the symbol table.  If
+	 this section is supposed to have some COMDAT info, track down
+	 the symbol in the symbol table and modify it.  */
+      if ((current->flags & SEC_LINK_ONCE) != 0)
+	{
+	  unsigned int i, count;
+	  asymbol **psym;
+	  coff_symbol_type *csym = NULL;
+	  asymbol **psymsec;
+
+	  psymsec = NULL;
+	  count = bfd_get_symcount (abfd);
+	  for (i = 0, psym = abfd->outsymbols; i < count; i++, psym++)
+	    {
+	      if ((*psym)->section != current)
+		continue;
+
+	      /* Remember the location of the first symbol in this
+		 section.  */
+	      if (psymsec == NULL)
+		psymsec = psym;
+
+	      /* See if this is the section symbol.  */
+	      if (strcmp ((*psym)->name, current->name) == 0)
+		{
+		  csym = coff_symbol_from (abfd, *psym);
+		  if (csym == NULL
+		      || csym->native == NULL
+		      || csym->native->u.syment.n_numaux < 1
+		      || csym->native->u.syment.n_sclass != C_STAT
+		      || csym->native->u.syment.n_type != T_NULL)
+		    continue;
+
+		  /* Here *PSYM is the section symbol for CURRENT.  */
+
+		  break;
+		}
+	    }
+
+	  /* Did we find it?
+	     Note that we might not if we're converting the file from
+	     some other object file format.  */
+	  if (i < count)
+	    {
+	      combined_entry_type *aux;
+
+	      /* We don't touch the x_checksum field.  The
+		 x_associated field is not currently supported.  */
+
+	      aux = csym->native + 1;
+	      switch (current->flags & SEC_LINK_DUPLICATES)
+		{
+		case SEC_LINK_DUPLICATES_DISCARD:
+		  aux->u.auxent.x_scn.x_comdat = IMAGE_COMDAT_SELECT_ANY;
+		  break;
+
+		case SEC_LINK_DUPLICATES_ONE_ONLY:
+		  aux->u.auxent.x_scn.x_comdat =
+		    IMAGE_COMDAT_SELECT_NODUPLICATES;
+		  break;
+
+		case SEC_LINK_DUPLICATES_SAME_SIZE:
+		  aux->u.auxent.x_scn.x_comdat =
+		    IMAGE_COMDAT_SELECT_SAME_SIZE;
+		  break;
+
+		case SEC_LINK_DUPLICATES_SAME_CONTENTS:
+		  aux->u.auxent.x_scn.x_comdat =
+		    IMAGE_COMDAT_SELECT_EXACT_MATCH;
+		  break;
+		}
+
+	      /* The COMDAT symbol must be the first symbol from this
+		 section in the symbol table.  In order to make this
+		 work, we move the COMDAT symbol before the first
+		 symbol we found in the search above.  It's OK to
+		 rearrange the symbol table at this point, because
+		 coff_renumber_symbols is going to rearrange it
+		 further and fix up all the aux entries.  */
+	      if (psym != psymsec)
+		{
+		  asymbol *hold;
+		  asymbol **pcopy;
+
+		  hold = *psym;
+		  for (pcopy = psym; pcopy > psymsec; pcopy--)
+		    pcopy[0] = pcopy[-1];
+		  *psymsec = hold;
+		}
+	    }
+	}
+#endif /* COFF_WITH_PE */
+    }
+
+#ifdef RS6000COFF_C
+#ifndef XCOFF64
+  /* XCOFF handles overflows in the reloc and line number count fields
+     by creating a new section header to hold the correct values.  */
+  for (current = abfd->sections; current != NULL; current = current->next)
+    {
+      if (current->reloc_count >= 0xffff || current->lineno_count >= 0xffff)
+	{
+	  struct internal_scnhdr scnhdr;
+	  SCNHDR buff;
+	  bfd_size_type amt;
+
+	  internal_f.f_nscns++;
+	  strncpy (&(scnhdr.s_name[0]), current->name, 8);
+	  scnhdr.s_paddr = current->reloc_count;
+	  scnhdr.s_vaddr = current->lineno_count;
+	  scnhdr.s_size = 0;
+	  scnhdr.s_scnptr = 0;
+	  scnhdr.s_relptr = current->rel_filepos;
+	  scnhdr.s_lnnoptr = current->line_filepos;
+	  scnhdr.s_nreloc = current->target_index;
+	  scnhdr.s_nlnno = current->target_index;
+	  scnhdr.s_flags = STYP_OVRFLO;
+	  amt = bfd_coff_scnhsz (abfd);
+	  if (coff_swap_scnhdr_out (abfd, &scnhdr, &buff) == 0
+	      || bfd_bwrite (& buff, amt, abfd) != amt)
+	    return FALSE;
+	}
+    }
+#endif
+#endif
+
+  /* OK, now set up the filehdr...  */
+
+  /* Don't include the internal abs section in the section count */
+
+  /* We will NOT put a fucking timestamp in the header here. Every time you
+     put it back, I will come in and take it out again.  I'm sorry.  This
+     field does not belong here.  We fill it with a 0 so it compares the
+     same but is not a reasonable time. -- gnu@cygnus.com  */
+  internal_f.f_timdat = 0;
+  internal_f.f_flags = 0;
+
+  if (abfd->flags & EXEC_P)
+    internal_f.f_opthdr = bfd_coff_aoutsz (abfd);
+  else
+    {
+      internal_f.f_opthdr = 0;
+#ifdef RS6000COFF_C
+#ifndef XCOFF64
+      if (xcoff_data (abfd)->full_aouthdr)
+	internal_f.f_opthdr = bfd_coff_aoutsz (abfd);
+      else
+	internal_f.f_opthdr = SMALL_AOUTSZ;
+#endif
+#endif
+    }
+
+  if (!hasrelocs)
+    internal_f.f_flags |= F_RELFLG;
+  if (!haslinno)
+    internal_f.f_flags |= F_LNNO;
+  if (abfd->flags & EXEC_P)
+    internal_f.f_flags |= F_EXEC;
+#ifdef COFF_IMAGE_WITH_PE
+  if (! hasdebug)
+    internal_f.f_flags |= IMAGE_FILE_DEBUG_STRIPPED;
+  if (pe_data (abfd)->real_flags & IMAGE_FILE_LARGE_ADDRESS_AWARE)
+    internal_f.f_flags |= IMAGE_FILE_LARGE_ADDRESS_AWARE;
+#endif
+
+#ifndef COFF_WITH_pex64
+#ifdef COFF_WITH_PE
+  internal_f.f_flags |= IMAGE_FILE_32BIT_MACHINE;
+#else
+  if (bfd_little_endian (abfd))
+    internal_f.f_flags |= F_AR32WR;
+  else
+    internal_f.f_flags |= F_AR32W;
+#endif
+#endif
+
+#ifdef TI_TARGET_ID
+  /* Target id is used in TI COFF v1 and later; COFF0 won't use this field,
+     but it doesn't hurt to set it internally.  */
+  internal_f.f_target_id = TI_TARGET_ID;
+#endif
+#ifdef TIC80_TARGET_ID
+  internal_f.f_target_id = TIC80_TARGET_ID;
+#endif
+
+  /* FIXME, should do something about the other byte orders and
+     architectures.  */
+
+#ifdef RS6000COFF_C
+  if ((abfd->flags & DYNAMIC) != 0)
+    internal_f.f_flags |= F_SHROBJ;
+  if (bfd_get_section_by_name (abfd, _LOADER) != NULL)
+    internal_f.f_flags |= F_DYNLOAD;
+#endif
+
+  memset (&internal_a, 0, sizeof internal_a);
+
+  /* Set up architecture-dependent stuff.  */
+  {
+    unsigned int magic = 0;
+    unsigned short flags = 0;
+
+    coff_set_flags (abfd, &magic, &flags);
+    internal_f.f_magic = magic;
+    internal_f.f_flags |= flags;
+    /* ...and the "opt"hdr...  */
+
+#ifdef TICOFF_AOUT_MAGIC
+    internal_a.magic = TICOFF_AOUT_MAGIC;
+#define __A_MAGIC_SET__
+#endif
+#ifdef TIC80COFF
+    internal_a.magic = TIC80_ARCH_MAGIC;
+#define __A_MAGIC_SET__
+#endif /* TIC80 */
+#ifdef I860
+    /* FIXME: What are the a.out magic numbers for the i860?  */
+    internal_a.magic = 0;
+#define __A_MAGIC_SET__
+#endif /* I860 */
+#ifdef I960
+    internal_a.magic = (magic == I960ROMAGIC ? NMAGIC : OMAGIC);
+#define __A_MAGIC_SET__
+#endif /* I960 */
+#if M88
+#define __A_MAGIC_SET__
+    internal_a.magic = PAGEMAGICBCS;
+#endif /* M88 */
+
+#if APOLLO_M68
+#define __A_MAGIC_SET__
+    internal_a.magic = APOLLO_COFF_VERSION_NUMBER;
+#endif
+
+#if defined(M68) || defined(WE32K) || defined(M68K)
+#define __A_MAGIC_SET__
+#if defined(LYNXOS)
+    internal_a.magic = LYNXCOFFMAGIC;
+#else
+#if defined(TARG_AUX)
+    internal_a.magic = (abfd->flags & D_PAGED ? PAGEMAGICPEXECPAGED :
+			abfd->flags & WP_TEXT ? PAGEMAGICPEXECSWAPPED :
+			PAGEMAGICEXECSWAPPED);
+#else
+#if defined (PAGEMAGICPEXECPAGED)
+    internal_a.magic = PAGEMAGICPEXECPAGED;
+#endif
+#endif /* TARG_AUX */
+#endif /* LYNXOS */
+#endif /* M68 || WE32K || M68K */
+
+#if defined(ARM)
+#define __A_MAGIC_SET__
+    internal_a.magic = ZMAGIC;
+#endif
+
+#if defined(PPC_PE)
+#define __A_MAGIC_SET__
+    internal_a.magic = IMAGE_NT_OPTIONAL_HDR_MAGIC;
+#endif
+
+#if defined MCORE_PE
+#define __A_MAGIC_SET__
+    internal_a.magic = IMAGE_NT_OPTIONAL_HDR_MAGIC;
+#endif
+
+#if defined(I386)
+#define __A_MAGIC_SET__
+#if defined LYNXOS
+    internal_a.magic = LYNXCOFFMAGIC;
+#elif defined AMD64
+    internal_a.magic = IMAGE_NT_OPTIONAL_HDR64_MAGIC;
+#else
+    internal_a.magic = ZMAGIC;
+#endif
+#endif /* I386 */
+
+#if defined(IA64)
+#define __A_MAGIC_SET__
+    internal_a.magic = PE32PMAGIC;
+#endif /* IA64 */
+
+#if defined(SPARC)
+#define __A_MAGIC_SET__
+#if defined(LYNXOS)
+    internal_a.magic = LYNXCOFFMAGIC;
+#endif /* LYNXOS */
+#endif /* SPARC */
+
+#ifdef RS6000COFF_C
+#define __A_MAGIC_SET__
+    internal_a.magic = (abfd->flags & D_PAGED) ? RS6K_AOUTHDR_ZMAGIC :
+    (abfd->flags & WP_TEXT) ? RS6K_AOUTHDR_NMAGIC :
+    RS6K_AOUTHDR_OMAGIC;
+#endif
+
+#if defined(SH) && defined(COFF_WITH_PE)
+#define __A_MAGIC_SET__
+    internal_a.magic = SH_PE_MAGIC;
+#endif
+
+#if defined(MIPS) && defined(COFF_WITH_PE)
+#define __A_MAGIC_SET__
+    internal_a.magic = MIPS_PE_MAGIC;
+#endif
+
+#ifdef OR32
+#define __A_MAGIC_SET__
+    internal_a.magic = NMAGIC; /* Assume separate i/d.  */
+#endif
+
+#ifndef __A_MAGIC_SET__
+#include "Your aouthdr magic number is not being set!"
+#else
+#undef __A_MAGIC_SET__
+#endif
+  }
+
+  /* FIXME: Does anybody ever set this to another value?  */
+  internal_a.vstamp = 0;
+
+  /* Now should write relocs, strings, syms.  */
+  obj_sym_filepos (abfd) = sym_base;
+
+  if (bfd_get_symcount (abfd) != 0)
+    {
+      int firstundef;
+
+      if (!coff_renumber_symbols (abfd, &firstundef))
+	return FALSE;
+      coff_mangle_symbols (abfd);
+      if (! coff_write_symbols (abfd))
+	return FALSE;
+      if (! coff_write_linenumbers (abfd))
+	return FALSE;
+      if (! coff_write_relocs (abfd, firstundef))
+	return FALSE;
+    }
+#ifdef COFF_LONG_SECTION_NAMES
+  else if (long_section_names && ! obj_coff_strings_written (abfd))
+    {
+      /* If we have long section names we have to write out the string
+	 table even if there are no symbols.  */
+      if (! coff_write_symbols (abfd))
+	return FALSE;
+    }
+#endif
+#ifdef COFF_IMAGE_WITH_PE
+#ifdef PPC_PE
+  else if ((abfd->flags & EXEC_P) != 0)
+    {
+      bfd_byte b;
+
+      /* PowerPC PE appears to require that all executable files be
+	 rounded up to the page size.  */
+      b = 0;
+      if (bfd_seek (abfd,
+		    (file_ptr) BFD_ALIGN (sym_base, COFF_PAGE_SIZE) - 1,
+		    SEEK_SET) != 0
+	  || bfd_bwrite (&b, (bfd_size_type) 1, abfd) != 1)
+	return FALSE;
+    }
+#endif
+#endif
+
+  /* If bfd_get_symcount (abfd) != 0, then we are not using the COFF
+     backend linker, and obj_raw_syment_count is not valid until after
+     coff_write_symbols is called.  */
+  if (obj_raw_syment_count (abfd) != 0)
+    {
+      internal_f.f_symptr = sym_base;
+#ifdef RS6000COFF_C
+      /* AIX appears to require that F_RELFLG not be set if there are
+	 local symbols but no relocations.  */
+      internal_f.f_flags &=~ F_RELFLG;
+#endif
+    }
+  else
+    {
+      if (long_section_names)
+	internal_f.f_symptr = sym_base;
+      else
+	internal_f.f_symptr = 0;
+      internal_f.f_flags |= F_LSYMS;
+    }
+
+  if (text_sec)
+    {
+      internal_a.tsize = text_sec->size;
+      internal_a.text_start = internal_a.tsize ? text_sec->vma : 0;
+    }
+  if (data_sec)
+    {
+      internal_a.dsize = data_sec->size;
+      internal_a.data_start = internal_a.dsize ? data_sec->vma : 0;
+    }
+  if (bss_sec)
+    {
+      internal_a.bsize = bss_sec->size;
+      if (internal_a.bsize && bss_sec->vma < internal_a.data_start)
+	internal_a.data_start = bss_sec->vma;
+    }
+
+  internal_a.entry = bfd_get_start_address (abfd);
+  internal_f.f_nsyms = obj_raw_syment_count (abfd);
+
+#ifdef RS6000COFF_C
+  if (xcoff_data (abfd)->full_aouthdr)
+    {
+      bfd_vma toc;
+      asection *loader_sec;
+
+      internal_a.vstamp = 1;
+
+      internal_a.o_snentry = xcoff_data (abfd)->snentry;
+      if (internal_a.o_snentry == 0)
+	internal_a.entry = (bfd_vma) -1;
+
+      if (text_sec != NULL)
+	{
+	  internal_a.o_sntext = text_sec->target_index;
+	  internal_a.o_algntext = bfd_get_section_alignment (abfd, text_sec);
+	}
+      else
+	{
+	  internal_a.o_sntext = 0;
+	  internal_a.o_algntext = 0;
+	}
+      if (data_sec != NULL)
+	{
+	  internal_a.o_sndata = data_sec->target_index;
+	  internal_a.o_algndata = bfd_get_section_alignment (abfd, data_sec);
+	}
+      else
+	{
+	  internal_a.o_sndata = 0;
+	  internal_a.o_algndata = 0;
+	}
+      loader_sec = bfd_get_section_by_name (abfd, ".loader");
+      if (loader_sec != NULL)
+	internal_a.o_snloader = loader_sec->target_index;
+      else
+	internal_a.o_snloader = 0;
+      if (bss_sec != NULL)
+	internal_a.o_snbss = bss_sec->target_index;
+      else
+	internal_a.o_snbss = 0;
+
+      toc = xcoff_data (abfd)->toc;
+      internal_a.o_toc = toc;
+      internal_a.o_sntoc = xcoff_data (abfd)->sntoc;
+
+      internal_a.o_modtype = xcoff_data (abfd)->modtype;
+      if (xcoff_data (abfd)->cputype != -1)
+	internal_a.o_cputype = xcoff_data (abfd)->cputype;
+      else
+	{
+	  switch (bfd_get_arch (abfd))
+	    {
+	    case bfd_arch_rs6000:
+	      internal_a.o_cputype = 4;
+	      break;
+	    case bfd_arch_powerpc:
+	      if (bfd_get_mach (abfd) == bfd_mach_ppc)
+		internal_a.o_cputype = 3;
+	      else
+		internal_a.o_cputype = 1;
+	      break;
+	    default:
+	      abort ();
+	    }
+	}
+      internal_a.o_maxstack = xcoff_data (abfd)->maxstack;
+      internal_a.o_maxdata = xcoff_data (abfd)->maxdata;
+    }
+#endif
+
+  /* Now write them.  */
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    return FALSE;
+
+  {
+    char * buff;
+    bfd_size_type amount = bfd_coff_filhsz (abfd);
+
+    buff = (char *) bfd_malloc (amount);
+    if (buff == NULL)
+      return FALSE;
+
+    bfd_coff_swap_filehdr_out (abfd, & internal_f, buff);
+    amount = bfd_bwrite (buff, amount, abfd);
+
+    free (buff);
+
+    if (amount != bfd_coff_filhsz (abfd))
+      return FALSE;
+  }
+
+  if (abfd->flags & EXEC_P)
+    {
+      /* Note that peicode.h fills in a PEAOUTHDR, not an AOUTHDR.
+	 include/coff/pe.h sets AOUTSZ == sizeof (PEAOUTHDR)).  */
+      char * buff;
+      bfd_size_type amount = bfd_coff_aoutsz (abfd);
+
+      buff = (char *) bfd_malloc (amount);
+      if (buff == NULL)
+	return FALSE;
+
+      coff_swap_aouthdr_out (abfd, & internal_a, buff);
+      amount = bfd_bwrite (buff, amount, abfd);
+
+      free (buff);
+
+      if (amount != bfd_coff_aoutsz (abfd))
+	return FALSE;
+
+#ifdef COFF_IMAGE_WITH_PE
+      if (! coff_apply_checksum (abfd))
+	return FALSE;
+#endif
+    }
+#ifdef RS6000COFF_C
+  else
+    {
+      AOUTHDR buff;
+      size_t size;
+
+      /* XCOFF seems to always write at least a small a.out header.  */
+      coff_swap_aouthdr_out (abfd, & internal_a, & buff);
+      if (xcoff_data (abfd)->full_aouthdr)
+	size = bfd_coff_aoutsz (abfd);
+      else
+	size = SMALL_AOUTSZ;
+      if (bfd_bwrite (& buff, (bfd_size_type) size, abfd) != size)
+	return FALSE;
+    }
+#endif
+
+  return TRUE;
+}
+
+static bfd_boolean
+coff_set_section_contents (bfd * abfd,
+			   sec_ptr section,
+			   const void * location,
+			   file_ptr offset,
+			   bfd_size_type count)
+{
+  if (! abfd->output_has_begun)	/* Set by bfd.c handler.  */
+    {
+      if (! coff_compute_section_file_positions (abfd))
+	return FALSE;
+    }
+
+#if defined(_LIB) && !defined(TARG_AUX)
+   /* The physical address field of a .lib section is used to hold the
+      number of shared libraries in the section.  This code counts the
+      number of sections being written, and increments the lma field
+      with the number.
+
+      I have found no documentation on the contents of this section.
+      Experimentation indicates that the section contains zero or more
+      records, each of which has the following structure:
+
+      - a (four byte) word holding the length of this record, in words,
+      - a word that always seems to be set to "2",
+      - the path to a shared library, null-terminated and then padded
+        to a whole word boundary.
+
+      bfd_assert calls have been added to alert if an attempt is made
+      to write a section which doesn't follow these assumptions.  The
+      code has been tested on ISC 4.1 by me, and on SCO by Robert Lipe
+      <robertl@arnet.com> (Thanks!).
+
+      Gvran Uddeborg <gvran@uddeborg.pp.se>.  */
+    if (strcmp (section->name, _LIB) == 0)
+      {
+	bfd_byte *rec, *recend;
+
+	rec = (bfd_byte *) location;
+	recend = rec + count;
+	while (rec < recend)
+	  {
+	    ++section->lma;
+	    rec += bfd_get_32 (abfd, rec) * 4;
+	  }
+
+	BFD_ASSERT (rec == recend);
+      }
+#endif
+
+  /* Don't write out bss sections - one way to do this is to
+       see if the filepos has not been set.  */
+  if (section->filepos == 0)
+    return TRUE;
+
+  if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0)
+    return FALSE;
+
+  if (count == 0)
+    return TRUE;
+
+  return bfd_bwrite (location, count, abfd) == count;
+}
+
+static void *
+buy_and_read (bfd *abfd, file_ptr where, bfd_size_type size)
+{
+  void * area = bfd_alloc (abfd, size);
+
+  if (!area)
+    return (NULL);
+  if (bfd_seek (abfd, where, SEEK_SET) != 0
+      || bfd_bread (area, size, abfd) != size)
+    return (NULL);
+  return (area);
+}
+
+/*
+SUBSUBSECTION
+	Reading linenumbers
+
+	Creating the linenumber table is done by reading in the entire
+	coff linenumber table, and creating another table for internal use.
+
+	A coff linenumber table is structured so that each function
+	is marked as having a line number of 0. Each line within the
+	function is an offset from the first line in the function. The
+	base of the line number information for the table is stored in
+	the symbol associated with the function.
+
+	Note: The PE format uses line number 0 for a flag indicating a
+	new source file.
+
+	The information is copied from the external to the internal
+	table, and each symbol which marks a function is marked by
+	pointing its...
+
+	How does this work ?
+*/
+
+static int
+coff_sort_func_alent (const void * arg1, const void * arg2)
+{
+  const alent *al1 = *(const alent **) arg1;
+  const alent *al2 = *(const alent **) arg2;
+  const coff_symbol_type *s1 = (const coff_symbol_type *) (al1->u.sym);
+  const coff_symbol_type *s2 = (const coff_symbol_type *) (al2->u.sym);
+
+  if (s1->symbol.value < s2->symbol.value)
+    return -1;
+  else if (s1->symbol.value > s2->symbol.value)
+    return 1;
+
+  return 0;
+}
+
+static bfd_boolean
+coff_slurp_line_table (bfd *abfd, asection *asect)
+{
+  LINENO *native_lineno;
+  alent *lineno_cache;
+  bfd_size_type amt;
+  unsigned int counter;
+  alent *cache_ptr;
+  bfd_vma prev_offset = 0;
+  int ordered = 1;
+  unsigned int nbr_func;
+  LINENO *src;
+
+  BFD_ASSERT (asect->lineno == NULL);
+
+  amt = ((bfd_size_type) asect->lineno_count + 1) * sizeof (alent);
+  lineno_cache = (alent *) bfd_alloc (abfd, amt);
+  if (lineno_cache == NULL)
+    return FALSE;
+
+  amt = (bfd_size_type) bfd_coff_linesz (abfd) * asect->lineno_count;
+  native_lineno = (LINENO *) buy_and_read (abfd, asect->line_filepos, amt);
+  if (native_lineno == NULL)
+    {
+      (*_bfd_error_handler)
+	(_("%B: warning: line number table read failed"), abfd);
+      bfd_release (abfd, lineno_cache);
+      return FALSE;
+    }
+
+  cache_ptr = lineno_cache;
+  asect->lineno = lineno_cache;
+  src = native_lineno;
+  nbr_func = 0;
+
+  for (counter = 0; counter < asect->lineno_count; counter++)
+    {
+      struct internal_lineno dst;
+
+      bfd_coff_swap_lineno_in (abfd, src, &dst);
+      cache_ptr->line_number = dst.l_lnno;
+
+      if (cache_ptr->line_number == 0)
+	{
+	  bfd_boolean warned;
+	  bfd_signed_vma symndx;
+	  coff_symbol_type *sym;
+
+	  nbr_func++;
+	  warned = FALSE;
+	  symndx = dst.l_addr.l_symndx;
+	  if (symndx < 0
+	      || (bfd_vma) symndx >= obj_raw_syment_count (abfd))
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: warning: illegal symbol index %ld in line numbers"),
+		 abfd, (long) symndx);
+	      symndx = 0;
+	      warned = TRUE;
+	    }
+
+	  /* FIXME: We should not be casting between ints and
+	     pointers like this.  */
+	  sym = ((coff_symbol_type *)
+		 ((symndx + obj_raw_syments (abfd))
+		  ->u.syment._n._n_n._n_zeroes));
+	  cache_ptr->u.sym = (asymbol *) sym;
+	  if (sym->lineno != NULL && ! warned)
+	    (*_bfd_error_handler)
+	      (_("%B: warning: duplicate line number information for `%s'"),
+	       abfd, bfd_asymbol_name (&sym->symbol));
+
+	  sym->lineno = cache_ptr;
+	  if (sym->symbol.value < prev_offset)
+	    ordered = 0;
+	  prev_offset = sym->symbol.value;
+	}
+      else
+	cache_ptr->u.offset = dst.l_addr.l_paddr
+	  - bfd_section_vma (abfd, asect);
+
+      cache_ptr++;
+      src++;
+    }
+  cache_ptr->line_number = 0;
+  bfd_release (abfd, native_lineno);
+
+  /* On some systems (eg AIX5.3) the lineno table may not be sorted.  */
+  if (!ordered)
+    {
+      /* Sort the table.  */
+      alent **func_table;
+      alent *n_lineno_cache;
+
+      /* Create a table of functions.  */
+      func_table = (alent **) bfd_alloc (abfd, nbr_func * sizeof (alent *));
+      if (func_table != NULL)
+	{
+	  alent **p = func_table;
+	  unsigned int i;
+
+	  for (i = 0; i < counter; i++)
+	    if (lineno_cache[i].line_number == 0)
+	      *p++ = &lineno_cache[i];
+
+	  /* Sort by functions.  */
+	  qsort (func_table, nbr_func, sizeof (alent *), coff_sort_func_alent);
+
+	  /* Create the new sorted table.  */
+	  amt = ((bfd_size_type) asect->lineno_count + 1) * sizeof (alent);
+	  n_lineno_cache = (alent *) bfd_alloc (abfd, amt);
+	  if (n_lineno_cache != NULL)
+	    {
+	      alent *n_cache_ptr = n_lineno_cache;
+
+	      for (i = 0; i < nbr_func; i++)
+		{
+		  coff_symbol_type *sym;
+		  alent *old_ptr = func_table[i];
+
+		  /* Copy the function entry and update it.  */
+		  *n_cache_ptr = *old_ptr;
+		  sym = (coff_symbol_type *)n_cache_ptr->u.sym;
+		  sym->lineno = n_cache_ptr;
+		  n_cache_ptr++;
+		  old_ptr++;
+
+		  /* Copy the line number entries.  */
+		  while (old_ptr->line_number != 0)
+		    *n_cache_ptr++ = *old_ptr++;
+		}
+	      n_cache_ptr->line_number = 0;
+	      memcpy (lineno_cache, n_lineno_cache, amt);
+	    }
+	  bfd_release (abfd, func_table);
+	}
+    }
+
+  return TRUE;
+}
+
+/* Slurp in the symbol table, converting it to generic form.  Note
+   that if coff_relocate_section is defined, the linker will read
+   symbols via coff_link_add_symbols, rather than via this routine.  */
+
+static bfd_boolean
+coff_slurp_symbol_table (bfd * abfd)
+{
+  combined_entry_type *native_symbols;
+  coff_symbol_type *cached_area;
+  unsigned int *table_ptr;
+  bfd_size_type amt;
+  unsigned int number_of_symbols = 0;
+
+  if (obj_symbols (abfd))
+    return TRUE;
+
+  /* Read in the symbol table.  */
+  if ((native_symbols = coff_get_normalized_symtab (abfd)) == NULL)
+    return FALSE;
+
+  /* Allocate enough room for all the symbols in cached form.  */
+  amt = obj_raw_syment_count (abfd);
+  amt *= sizeof (coff_symbol_type);
+  cached_area = (coff_symbol_type *) bfd_alloc (abfd, amt);
+  if (cached_area == NULL)
+    return FALSE;
+
+  amt = obj_raw_syment_count (abfd);
+  amt *= sizeof (unsigned int);
+  table_ptr = (unsigned int *) bfd_alloc (abfd, amt);
+
+  if (table_ptr == NULL)
+    return FALSE;
+  else
+    {
+      coff_symbol_type *dst = cached_area;
+      unsigned int last_native_index = obj_raw_syment_count (abfd);
+      unsigned int this_index = 0;
+
+      while (this_index < last_native_index)
+	{
+	  combined_entry_type *src = native_symbols + this_index;
+	  table_ptr[this_index] = number_of_symbols;
+	  dst->symbol.the_bfd = abfd;
+
+	  dst->symbol.name = (char *) (src->u.syment._n._n_n._n_offset);
+	  /* We use the native name field to point to the cached field.  */
+	  src->u.syment._n._n_n._n_zeroes = (bfd_hostptr_t) dst;
+	  dst->symbol.section = coff_section_from_bfd_index (abfd,
+						     src->u.syment.n_scnum);
+	  dst->symbol.flags = 0;
+	  dst->done_lineno = FALSE;
+
+	  switch (src->u.syment.n_sclass)
+	    {
+#ifdef I960
+	    case C_LEAFEXT:
+	      /* Fall through to next case.  */
+#endif
+
+	    case C_EXT:
+	    case C_WEAKEXT:
+#if defined ARM
+	    case C_THUMBEXT:
+	    case C_THUMBEXTFUNC:
+#endif
+#ifdef RS6000COFF_C
+	    case C_HIDEXT:
+#endif
+#ifdef C_SYSTEM
+	    case C_SYSTEM:	/* System Wide variable.  */
+#endif
+#ifdef COFF_WITH_PE
+	    /* In PE, 0x68 (104) denotes a section symbol.  */
+	    case C_SECTION:
+	    /* In PE, 0x69 (105) denotes a weak external symbol.  */
+	    case C_NT_WEAK:
+#endif
+	      switch (coff_classify_symbol (abfd, &src->u.syment))
+		{
+		case COFF_SYMBOL_GLOBAL:
+		  dst->symbol.flags = BSF_EXPORT | BSF_GLOBAL;
+#if defined COFF_WITH_PE
+		  /* PE sets the symbol to a value relative to the
+		     start of the section.  */
+		  dst->symbol.value = src->u.syment.n_value;
+#else
+		  dst->symbol.value = (src->u.syment.n_value
+				       - dst->symbol.section->vma);
+#endif
+		  if (ISFCN ((src->u.syment.n_type)))
+		    /* A function ext does not go at the end of a
+		       file.  */
+		    dst->symbol.flags |= BSF_NOT_AT_END | BSF_FUNCTION;
+		  break;
+
+		case COFF_SYMBOL_COMMON:
+		  dst->symbol.section = bfd_com_section_ptr;
+		  dst->symbol.value = src->u.syment.n_value;
+		  break;
+
+		case COFF_SYMBOL_UNDEFINED:
+		  dst->symbol.section = bfd_und_section_ptr;
+		  dst->symbol.value = 0;
+		  break;
+
+		case COFF_SYMBOL_PE_SECTION:
+		  dst->symbol.flags |= BSF_EXPORT | BSF_SECTION_SYM;
+		  dst->symbol.value = 0;
+		  break;
+
+		case COFF_SYMBOL_LOCAL:
+		  dst->symbol.flags = BSF_LOCAL;
+#if defined COFF_WITH_PE
+		  /* PE sets the symbol to a value relative to the
+		     start of the section.  */
+		  dst->symbol.value = src->u.syment.n_value;
+#else
+		  dst->symbol.value = (src->u.syment.n_value
+				       - dst->symbol.section->vma);
+#endif
+		  if (ISFCN ((src->u.syment.n_type)))
+		    dst->symbol.flags |= BSF_NOT_AT_END | BSF_FUNCTION;
+		  break;
+		}
+
+#ifdef RS6000COFF_C
+	      /* A symbol with a csect entry should not go at the end.  */
+	      if (src->u.syment.n_numaux > 0)
+		dst->symbol.flags |= BSF_NOT_AT_END;
+#endif
+
+#ifdef COFF_WITH_PE
+	      if (src->u.syment.n_sclass == C_NT_WEAK)
+		dst->symbol.flags |= BSF_WEAK;
+
+	      if (src->u.syment.n_sclass == C_SECTION
+		  && src->u.syment.n_scnum > 0)
+		dst->symbol.flags = BSF_LOCAL;
+#endif
+	      if (src->u.syment.n_sclass == C_WEAKEXT)
+		dst->symbol.flags |= BSF_WEAK;
+
+	      break;
+
+	    case C_STAT:	 /* Static.  */
+#ifdef I960
+	    case C_LEAFSTAT:	 /* Static leaf procedure.  */
+#endif
+#if defined ARM
+	    case C_THUMBSTAT:    /* Thumb static.  */
+	    case C_THUMBLABEL:   /* Thumb label.  */
+	    case C_THUMBSTATFUNC:/* Thumb static function.  */
+#endif
+#ifdef RS6000COFF_C
+            case C_DWARF:	 /* A label in a dwarf section.  */
+            case C_INFO:	 /* A label in a comment section.  */
+#endif
+	    case C_LABEL:	 /* Label.  */
+	      if (src->u.syment.n_scnum == N_DEBUG)
+		dst->symbol.flags = BSF_DEBUGGING;
+	      else
+		dst->symbol.flags = BSF_LOCAL;
+
+	      /* Base the value as an index from the base of the
+		 section, if there is one.  */
+	      if (dst->symbol.section)
+		{
+#if defined COFF_WITH_PE
+		  /* PE sets the symbol to a value relative to the
+		     start of the section.  */
+		  dst->symbol.value = src->u.syment.n_value;
+#else
+		  dst->symbol.value = (src->u.syment.n_value
+				       - dst->symbol.section->vma);
+#endif
+		}
+	      else
+		dst->symbol.value = src->u.syment.n_value;
+	      break;
+
+	    case C_MOS:		/* Member of structure.  */
+	    case C_EOS:		/* End of structure.  */
+	    case C_REGPARM:	/* Register parameter.  */
+	    case C_REG:		/* register variable.  */
+	      /* C_AUTOARG conflicts with TI COFF C_UEXT.  */
+#if !defined (TIC80COFF) && !defined (TICOFF)
+#ifdef C_AUTOARG
+	    case C_AUTOARG:	/* 960-specific storage class.  */
+#endif
+#endif
+	    case C_TPDEF:	/* Type definition.  */
+	    case C_ARG:
+	    case C_AUTO:	/* Automatic variable.  */
+	    case C_FIELD:	/* Bit field.  */
+	    case C_ENTAG:	/* Enumeration tag.  */
+	    case C_MOE:		/* Member of enumeration.  */
+	    case C_MOU:		/* Member of union.  */
+	    case C_UNTAG:	/* Union tag.  */
+	      dst->symbol.flags = BSF_DEBUGGING;
+	      dst->symbol.value = (src->u.syment.n_value);
+	      break;
+
+	    case C_FILE:	/* File name.  */
+	    case C_STRTAG:	/* Structure tag.  */
+#ifdef RS6000COFF_C
+	    case C_GSYM:
+	    case C_LSYM:
+	    case C_PSYM:
+	    case C_RSYM:
+	    case C_RPSYM:
+	    case C_STSYM:
+	    case C_TCSYM:
+	    case C_BCOMM:
+	    case C_ECOML:
+	    case C_ECOMM:
+	    case C_DECL:
+	    case C_ENTRY:
+	    case C_FUN:
+	    case C_ESTAT:
+#endif
+	      dst->symbol.flags = BSF_DEBUGGING;
+	      dst->symbol.value = (src->u.syment.n_value);
+	      break;
+
+#ifdef RS6000COFF_C
+	    case C_BINCL:	/* Beginning of include file.  */
+	    case C_EINCL:	/* Ending of include file.  */
+	      /* The value is actually a pointer into the line numbers
+		 of the file.  We locate the line number entry, and
+		 set the section to the section which contains it, and
+		 the value to the index in that section.  */
+	      {
+		asection *sec;
+
+		dst->symbol.flags = BSF_DEBUGGING;
+		for (sec = abfd->sections; sec != NULL; sec = sec->next)
+		  if (sec->line_filepos <= (file_ptr) src->u.syment.n_value
+		      && ((file_ptr) (sec->line_filepos
+				      + sec->lineno_count * bfd_coff_linesz (abfd))
+			  > (file_ptr) src->u.syment.n_value))
+		    break;
+		if (sec == NULL)
+		  dst->symbol.value = 0;
+		else
+		  {
+		    dst->symbol.section = sec;
+		    dst->symbol.value = ((src->u.syment.n_value
+					  - sec->line_filepos)
+					 / bfd_coff_linesz (abfd));
+		    src->fix_line = 1;
+		  }
+	      }
+	      break;
+
+	    case C_BSTAT:
+	      dst->symbol.flags = BSF_DEBUGGING;
+
+	      /* The value is actually a symbol index.  Save a pointer
+		 to the symbol instead of the index.  FIXME: This
+		 should use a union.  */
+	      src->u.syment.n_value =
+		(long) (intptr_t) (native_symbols + src->u.syment.n_value);
+	      dst->symbol.value = src->u.syment.n_value;
+	      src->fix_value = 1;
+	      break;
+#endif
+
+	    case C_BLOCK:	/* ".bb" or ".eb".  */
+	    case C_FCN:		/* ".bf" or ".ef" (or PE ".lf").  */
+	    case C_EFCN:	/* Physical end of function.  */
+#if defined COFF_WITH_PE
+	      /* PE sets the symbol to a value relative to the start
+		 of the section.  */
+	      dst->symbol.value = src->u.syment.n_value;
+	      if (strcmp (dst->symbol.name, ".bf") != 0)
+		{
+		  /* PE uses funny values for .ef and .lf; don't
+		     relocate them.  */
+		  dst->symbol.flags = BSF_DEBUGGING;
+		}
+	      else
+		dst->symbol.flags = BSF_DEBUGGING | BSF_DEBUGGING_RELOC;
+#else
+	      /* Base the value as an index from the base of the
+		 section.  */
+	      dst->symbol.flags = BSF_LOCAL;
+	      dst->symbol.value = (src->u.syment.n_value
+				   - dst->symbol.section->vma);
+#endif
+	      break;
+
+	    case C_STATLAB:	/* Static load time label.  */
+	      dst->symbol.value = src->u.syment.n_value;
+	      dst->symbol.flags = BSF_GLOBAL;
+	      break;
+
+	    case C_NULL:
+	      /* PE DLLs sometimes have zeroed out symbols for some
+		 reason.  Just ignore them without a warning.  */
+	      if (src->u.syment.n_type == 0
+		  && src->u.syment.n_value == 0
+		  && src->u.syment.n_scnum == 0)
+		break;
+#ifdef RS6000COFF_C
+              /* XCOFF specific: deleted entry.  */
+              if (src->u.syment.n_value == C_NULL_VALUE)
+                break;
+#endif
+	      /* Fall through.  */
+	    case C_EXTDEF:	/* External definition.  */
+	    case C_ULABEL:	/* Undefined label.  */
+	    case C_USTATIC:	/* Undefined static.  */
+#ifndef COFF_WITH_PE
+	    /* C_LINE in regular coff is 0x68.  NT has taken over this storage
+	       class to represent a section symbol.  */
+	    case C_LINE:	/* line # reformatted as symbol table entry.  */
+	      /* NT uses 0x67 for a weak symbol, not C_ALIAS.  */
+	    case C_ALIAS:	/* Duplicate tag.  */
+#endif
+	      /* New storage classes for TI COFF.  */
+#if defined(TIC80COFF) || defined(TICOFF)
+	    case C_UEXT:	/* Tentative external definition.  */
+#endif
+	    case C_EXTLAB:	/* External load time label.  */
+	    case C_HIDDEN:	/* Ext symbol in dmert public lib.  */
+	    default:
+	      (*_bfd_error_handler)
+		(_("%B: Unrecognized storage class %d for %s symbol `%s'"),
+		 abfd, src->u.syment.n_sclass,
+		 dst->symbol.section->name, dst->symbol.name);
+	      dst->symbol.flags = BSF_DEBUGGING;
+	      dst->symbol.value = (src->u.syment.n_value);
+	      break;
+	    }
+
+	  dst->native = src;
+
+	  dst->symbol.udata.i = 0;
+	  dst->lineno = NULL;
+	  this_index += (src->u.syment.n_numaux) + 1;
+	  dst++;
+	  number_of_symbols++;
+	}
+    }
+
+  obj_symbols (abfd) = cached_area;
+  obj_raw_syments (abfd) = native_symbols;
+
+  bfd_get_symcount (abfd) = number_of_symbols;
+  obj_convert (abfd) = table_ptr;
+  /* Slurp the line tables for each section too.  */
+  {
+    asection *p;
+
+    p = abfd->sections;
+    while (p)
+      {
+	coff_slurp_line_table (abfd, p);
+	p = p->next;
+      }
+  }
+
+  return TRUE;
+}
+
+/* Classify a COFF symbol.  A couple of targets have globally visible
+   symbols which are not class C_EXT, and this handles those.  It also
+   recognizes some special PE cases.  */
+
+static enum coff_symbol_classification
+coff_classify_symbol (bfd *abfd,
+		      struct internal_syment *syment)
+{
+  /* FIXME: This partially duplicates the switch in
+     coff_slurp_symbol_table.  */
+  switch (syment->n_sclass)
+    {
+    case C_EXT:
+    case C_WEAKEXT:
+#ifdef I960
+    case C_LEAFEXT:
+#endif
+#ifdef ARM
+    case C_THUMBEXT:
+    case C_THUMBEXTFUNC:
+#endif
+#ifdef C_SYSTEM
+    case C_SYSTEM:
+#endif
+#ifdef COFF_WITH_PE
+    case C_NT_WEAK:
+#endif
+      if (syment->n_scnum == 0)
+	{
+	  if (syment->n_value == 0)
+	    return COFF_SYMBOL_UNDEFINED;
+	  else
+	    return COFF_SYMBOL_COMMON;
+	}
+      return COFF_SYMBOL_GLOBAL;
+
+    default:
+      break;
+    }
+
+#ifdef COFF_WITH_PE
+  if (syment->n_sclass == C_STAT)
+    {
+      if (syment->n_scnum == 0)
+	/* The Microsoft compiler sometimes generates these if a
+	   small static function is inlined every time it is used.
+	   The function is discarded, but the symbol table entry
+	   remains.  */
+	return COFF_SYMBOL_LOCAL;
+
+#ifdef STRICT_PE_FORMAT
+      /* This is correct for Microsoft generated objects, but it
+	 breaks gas generated objects.  */
+      if (syment->n_value == 0)
+	{
+	  asection *sec;
+	  char buf[SYMNMLEN + 1];
+
+	  sec = coff_section_from_bfd_index (abfd, syment->n_scnum);
+	  if (sec != NULL
+	      && (strcmp (bfd_get_section_name (abfd, sec),
+			  _bfd_coff_internal_syment_name (abfd, syment, buf))
+		  == 0))
+	    return COFF_SYMBOL_PE_SECTION;
+	}
+#endif
+
+      return COFF_SYMBOL_LOCAL;
+    }
+
+  if (syment->n_sclass == C_SECTION)
+    {
+      /* In some cases in a DLL generated by the Microsoft linker, the
+	 n_value field will contain garbage.  FIXME: This should
+	 probably be handled by the swapping function instead.  */
+      syment->n_value = 0;
+      if (syment->n_scnum == 0)
+	return COFF_SYMBOL_UNDEFINED;
+      return COFF_SYMBOL_PE_SECTION;
+    }
+#endif /* COFF_WITH_PE */
+
+  /* If it is not a global symbol, we presume it is a local symbol.  */
+  if (syment->n_scnum == 0)
+    {
+      char buf[SYMNMLEN + 1];
+
+      (*_bfd_error_handler)
+	(_("warning: %B: local symbol `%s' has no section"),
+	 abfd, _bfd_coff_internal_syment_name (abfd, syment, buf));
+    }
+
+  return COFF_SYMBOL_LOCAL;
+}
+
+/*
+SUBSUBSECTION
+	Reading relocations
+
+	Coff relocations are easily transformed into the internal BFD form
+	(@code{arelent}).
+
+	Reading a coff relocation table is done in the following stages:
+
+	o Read the entire coff relocation table into memory.
+
+	o Process each relocation in turn; first swap it from the
+	external to the internal form.
+
+	o Turn the symbol referenced in the relocation's symbol index
+	into a pointer into the canonical symbol table.
+	This table is the same as the one returned by a call to
+	@code{bfd_canonicalize_symtab}. The back end will call that
+	routine and save the result if a canonicalization hasn't been done.
+
+	o The reloc index is turned into a pointer to a howto
+	structure, in a back end specific way. For instance, the 386
+	and 960 use the @code{r_type} to directly produce an index
+	into a howto table vector; the 88k subtracts a number from the
+	@code{r_type} field and creates an addend field.
+*/
+
+#ifndef CALC_ADDEND
+#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr)		\
+  {								\
+    coff_symbol_type *coffsym = NULL;				\
+								\
+    if (ptr && bfd_asymbol_bfd (ptr) != abfd)			\
+      coffsym = (obj_symbols (abfd)				\
+		 + (cache_ptr->sym_ptr_ptr - symbols));		\
+    else if (ptr)						\
+      coffsym = coff_symbol_from (abfd, ptr);			\
+    if (coffsym != NULL						\
+	&& coffsym->native->u.syment.n_scnum == 0)		\
+      cache_ptr->addend = 0;					\
+    else if (ptr && bfd_asymbol_bfd (ptr) == abfd		\
+	     && ptr->section != NULL)				\
+      cache_ptr->addend = - (ptr->section->vma + ptr->value);	\
+    else							\
+      cache_ptr->addend = 0;					\
+  }
+#endif
+
+static bfd_boolean
+coff_slurp_reloc_table (bfd * abfd, sec_ptr asect, asymbol ** symbols)
+{
+  RELOC *native_relocs;
+  arelent *reloc_cache;
+  arelent *cache_ptr;
+  unsigned int idx;
+  bfd_size_type amt;
+
+  if (asect->relocation)
+    return TRUE;
+  if (asect->reloc_count == 0)
+    return TRUE;
+  if (asect->flags & SEC_CONSTRUCTOR)
+    return TRUE;
+  if (!coff_slurp_symbol_table (abfd))
+    return FALSE;
+
+  amt = (bfd_size_type) bfd_coff_relsz (abfd) * asect->reloc_count;
+  native_relocs = (RELOC *) buy_and_read (abfd, asect->rel_filepos, amt);
+  amt = (bfd_size_type) asect->reloc_count * sizeof (arelent);
+  reloc_cache = (arelent *) bfd_alloc (abfd, amt);
+
+  if (reloc_cache == NULL || native_relocs == NULL)
+    return FALSE;
+
+  for (idx = 0; idx < asect->reloc_count; idx++)
+    {
+      struct internal_reloc dst;
+      struct external_reloc *src;
+#ifndef RELOC_PROCESSING
+      asymbol *ptr;
+#endif
+
+      cache_ptr = reloc_cache + idx;
+      src = native_relocs + idx;
+
+      dst.r_offset = 0;
+      coff_swap_reloc_in (abfd, src, &dst);
+
+#ifdef RELOC_PROCESSING
+      RELOC_PROCESSING (cache_ptr, &dst, symbols, abfd, asect);
+#else
+      cache_ptr->address = dst.r_vaddr;
+
+      if (dst.r_symndx != -1)
+	{
+	  if (dst.r_symndx < 0 || dst.r_symndx >= obj_conv_table_size (abfd))
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: warning: illegal symbol index %ld in relocs"),
+		 abfd, (long) dst.r_symndx);
+	      cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+	      ptr = NULL;
+	    }
+	  else
+	    {
+	      cache_ptr->sym_ptr_ptr = (symbols
+					+ obj_convert (abfd)[dst.r_symndx]);
+	      ptr = *(cache_ptr->sym_ptr_ptr);
+	    }
+	}
+      else
+	{
+	  cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+	  ptr = NULL;
+	}
+
+      /* The symbols definitions that we have read in have been
+	 relocated as if their sections started at 0. But the offsets
+	 refering to the symbols in the raw data have not been
+	 modified, so we have to have a negative addend to compensate.
+
+	 Note that symbols which used to be common must be left alone.  */
+
+      /* Calculate any reloc addend by looking at the symbol.  */
+      CALC_ADDEND (abfd, ptr, dst, cache_ptr);
+      (void) ptr;
+
+      cache_ptr->address -= asect->vma;
+      /* !! cache_ptr->section = NULL;*/
+
+      /* Fill in the cache_ptr->howto field from dst.r_type.  */
+      RTYPE2HOWTO (cache_ptr, &dst);
+#endif	/* RELOC_PROCESSING */
+
+      if (cache_ptr->howto == NULL)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B: illegal relocation type %d at address 0x%lx"),
+	     abfd, dst.r_type, (long) dst.r_vaddr);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+    }
+
+  asect->relocation = reloc_cache;
+  return TRUE;
+}
+
+#ifndef coff_rtype_to_howto
+#ifdef RTYPE2HOWTO
+
+/* Get the howto structure for a reloc.  This is only used if the file
+   including this one defines coff_relocate_section to be
+   _bfd_coff_generic_relocate_section, so it is OK if it does not
+   always work.  It is the responsibility of the including file to
+   make sure it is reasonable if it is needed.  */
+
+static reloc_howto_type *
+coff_rtype_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+		     asection *sec ATTRIBUTE_UNUSED,
+		     struct internal_reloc *rel,
+		     struct coff_link_hash_entry *h ATTRIBUTE_UNUSED,
+		     struct internal_syment *sym ATTRIBUTE_UNUSED,
+		     bfd_vma *addendp ATTRIBUTE_UNUSED)
+{
+  arelent genrel;
+
+  genrel.howto = NULL;
+  RTYPE2HOWTO (&genrel, rel);
+  return genrel.howto;
+}
+
+#else /* ! defined (RTYPE2HOWTO) */
+
+#define coff_rtype_to_howto NULL
+
+#endif /* ! defined (RTYPE2HOWTO) */
+#endif /* ! defined (coff_rtype_to_howto) */
+
+/* This is stupid.  This function should be a boolean predicate.  */
+
+static long
+coff_canonicalize_reloc (bfd * abfd,
+			 sec_ptr section,
+			 arelent ** relptr,
+			 asymbol ** symbols)
+{
+  arelent *tblptr = section->relocation;
+  unsigned int count = 0;
+
+  if (section->flags & SEC_CONSTRUCTOR)
+    {
+      /* This section has relocs made up by us, they are not in the
+	 file, so take them out of their chain and place them into
+	 the data area provided.  */
+      arelent_chain *chain = section->constructor_chain;
+
+      for (count = 0; count < section->reloc_count; count++)
+	{
+	  *relptr++ = &chain->relent;
+	  chain = chain->next;
+	}
+    }
+  else
+    {
+      if (! coff_slurp_reloc_table (abfd, section, symbols))
+	return -1;
+
+      tblptr = section->relocation;
+
+      for (; count++ < section->reloc_count;)
+	*relptr++ = tblptr++;
+    }
+  *relptr = 0;
+  return section->reloc_count;
+}
+
+#ifndef coff_reloc16_estimate
+#define coff_reloc16_estimate dummy_reloc16_estimate
+
+static int
+dummy_reloc16_estimate (bfd *abfd ATTRIBUTE_UNUSED,
+			asection *input_section ATTRIBUTE_UNUSED,
+			arelent *reloc ATTRIBUTE_UNUSED,
+			unsigned int shrink ATTRIBUTE_UNUSED,
+			struct bfd_link_info *link_info ATTRIBUTE_UNUSED)
+{
+  abort ();
+  return 0;
+}
+
+#endif
+
+#ifndef coff_reloc16_extra_cases
+
+#define coff_reloc16_extra_cases dummy_reloc16_extra_cases
+
+/* This works even if abort is not declared in any header file.  */
+
+static void
+dummy_reloc16_extra_cases (bfd *abfd ATTRIBUTE_UNUSED,
+			   struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
+			   struct bfd_link_order *link_order ATTRIBUTE_UNUSED,
+			   arelent *reloc ATTRIBUTE_UNUSED,
+			   bfd_byte *data ATTRIBUTE_UNUSED,
+			   unsigned int *src_ptr ATTRIBUTE_UNUSED,
+			   unsigned int *dst_ptr ATTRIBUTE_UNUSED)
+{
+  abort ();
+}
+#endif
+
+#ifndef coff_bfd_link_hash_table_free
+#define coff_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
+#endif
+
+/* If coff_relocate_section is defined, we can use the optimized COFF
+   backend linker.  Otherwise we must continue to use the old linker.  */
+
+#ifdef coff_relocate_section
+
+#ifndef coff_bfd_link_hash_table_create
+#define coff_bfd_link_hash_table_create _bfd_coff_link_hash_table_create
+#endif
+#ifndef coff_bfd_link_add_symbols
+#define coff_bfd_link_add_symbols _bfd_coff_link_add_symbols
+#endif
+#ifndef coff_bfd_final_link
+#define coff_bfd_final_link _bfd_coff_final_link
+#endif
+
+#else /* ! defined (coff_relocate_section) */
+
+#define coff_relocate_section NULL
+#ifndef coff_bfd_link_hash_table_create
+#define coff_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
+#endif
+#ifndef coff_bfd_link_add_symbols
+#define coff_bfd_link_add_symbols _bfd_generic_link_add_symbols
+#endif
+#define coff_bfd_final_link _bfd_generic_final_link
+
+#endif /* ! defined (coff_relocate_section) */
+
+#define coff_bfd_link_just_syms      _bfd_generic_link_just_syms
+#define coff_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define coff_bfd_link_split_section  _bfd_generic_link_split_section
+
+#ifndef coff_start_final_link
+#define coff_start_final_link NULL
+#endif
+
+#ifndef coff_adjust_symndx
+#define coff_adjust_symndx NULL
+#endif
+
+#ifndef coff_link_add_one_symbol
+#define coff_link_add_one_symbol _bfd_generic_link_add_one_symbol
+#endif
+
+#ifndef coff_link_output_has_begun
+
+static bfd_boolean
+coff_link_output_has_begun (bfd * abfd,
+			    struct coff_final_link_info * info ATTRIBUTE_UNUSED)
+{
+  return abfd->output_has_begun;
+}
+#endif
+
+#ifndef coff_final_link_postscript
+
+static bfd_boolean
+coff_final_link_postscript (bfd * abfd ATTRIBUTE_UNUSED,
+			    struct coff_final_link_info * pfinfo ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+#endif
+
+#ifndef coff_SWAP_aux_in
+#define coff_SWAP_aux_in coff_swap_aux_in
+#endif
+#ifndef coff_SWAP_sym_in
+#define coff_SWAP_sym_in coff_swap_sym_in
+#endif
+#ifndef coff_SWAP_lineno_in
+#define coff_SWAP_lineno_in coff_swap_lineno_in
+#endif
+#ifndef coff_SWAP_aux_out
+#define coff_SWAP_aux_out coff_swap_aux_out
+#endif
+#ifndef coff_SWAP_sym_out
+#define coff_SWAP_sym_out coff_swap_sym_out
+#endif
+#ifndef coff_SWAP_lineno_out
+#define coff_SWAP_lineno_out coff_swap_lineno_out
+#endif
+#ifndef coff_SWAP_reloc_out
+#define coff_SWAP_reloc_out coff_swap_reloc_out
+#endif
+#ifndef coff_SWAP_filehdr_out
+#define coff_SWAP_filehdr_out coff_swap_filehdr_out
+#endif
+#ifndef coff_SWAP_aouthdr_out
+#define coff_SWAP_aouthdr_out coff_swap_aouthdr_out
+#endif
+#ifndef coff_SWAP_scnhdr_out
+#define coff_SWAP_scnhdr_out coff_swap_scnhdr_out
+#endif
+#ifndef coff_SWAP_reloc_in
+#define coff_SWAP_reloc_in coff_swap_reloc_in
+#endif
+#ifndef coff_SWAP_filehdr_in
+#define coff_SWAP_filehdr_in coff_swap_filehdr_in
+#endif
+#ifndef coff_SWAP_aouthdr_in
+#define coff_SWAP_aouthdr_in coff_swap_aouthdr_in
+#endif
+#ifndef coff_SWAP_scnhdr_in
+#define coff_SWAP_scnhdr_in coff_swap_scnhdr_in
+#endif
+
+static bfd_coff_backend_data bfd_coff_std_swap_table ATTRIBUTE_UNUSED =
+{
+  coff_SWAP_aux_in, coff_SWAP_sym_in, coff_SWAP_lineno_in,
+  coff_SWAP_aux_out, coff_SWAP_sym_out,
+  coff_SWAP_lineno_out, coff_SWAP_reloc_out,
+  coff_SWAP_filehdr_out, coff_SWAP_aouthdr_out,
+  coff_SWAP_scnhdr_out,
+  FILHSZ, AOUTSZ, SCNHSZ, SYMESZ, AUXESZ, RELSZ, LINESZ, FILNMLEN,
+#ifdef COFF_LONG_FILENAMES
+  TRUE,
+#else
+  FALSE,
+#endif
+  COFF_DEFAULT_LONG_SECTION_NAMES,
+  COFF_DEFAULT_SECTION_ALIGNMENT_POWER,
+#ifdef COFF_FORCE_SYMBOLS_IN_STRINGS
+  TRUE,
+#else
+  FALSE,
+#endif
+#ifdef COFF_DEBUG_STRING_WIDE_PREFIX
+  4,
+#else
+  2,
+#endif
+  coff_SWAP_filehdr_in, coff_SWAP_aouthdr_in, coff_SWAP_scnhdr_in,
+  coff_SWAP_reloc_in, coff_bad_format_hook, coff_set_arch_mach_hook,
+  coff_mkobject_hook, styp_to_sec_flags, coff_set_alignment_hook,
+  coff_slurp_symbol_table, symname_in_debug_hook, coff_pointerize_aux_hook,
+  coff_print_aux, coff_reloc16_extra_cases, coff_reloc16_estimate,
+  coff_classify_symbol, coff_compute_section_file_positions,
+  coff_start_final_link, coff_relocate_section, coff_rtype_to_howto,
+  coff_adjust_symndx, coff_link_add_one_symbol,
+  coff_link_output_has_begun, coff_final_link_postscript,
+  bfd_pe_print_pdata
+};
+
+#ifdef TICOFF
+/* COFF0 differs in file/section header size and relocation entry size.  */
+
+static bfd_coff_backend_data ticoff0_swap_table =
+{
+  coff_SWAP_aux_in, coff_SWAP_sym_in, coff_SWAP_lineno_in,
+  coff_SWAP_aux_out, coff_SWAP_sym_out,
+  coff_SWAP_lineno_out, coff_SWAP_reloc_out,
+  coff_SWAP_filehdr_out, coff_SWAP_aouthdr_out,
+  coff_SWAP_scnhdr_out,
+  FILHSZ_V0, AOUTSZ, SCNHSZ_V01, SYMESZ, AUXESZ, RELSZ_V0, LINESZ, FILNMLEN,
+#ifdef COFF_LONG_FILENAMES
+  TRUE,
+#else
+  FALSE,
+#endif
+  COFF_DEFAULT_LONG_SECTION_NAMES,
+  COFF_DEFAULT_SECTION_ALIGNMENT_POWER,
+#ifdef COFF_FORCE_SYMBOLS_IN_STRINGS
+  TRUE,
+#else
+  FALSE,
+#endif
+#ifdef COFF_DEBUG_STRING_WIDE_PREFIX
+  4,
+#else
+  2,
+#endif
+  coff_SWAP_filehdr_in, coff_SWAP_aouthdr_in, coff_SWAP_scnhdr_in,
+  coff_SWAP_reloc_in, ticoff0_bad_format_hook, coff_set_arch_mach_hook,
+  coff_mkobject_hook, styp_to_sec_flags, coff_set_alignment_hook,
+  coff_slurp_symbol_table, symname_in_debug_hook, coff_pointerize_aux_hook,
+  coff_print_aux, coff_reloc16_extra_cases, coff_reloc16_estimate,
+  coff_classify_symbol, coff_compute_section_file_positions,
+  coff_start_final_link, coff_relocate_section, coff_rtype_to_howto,
+  coff_adjust_symndx, coff_link_add_one_symbol,
+  coff_link_output_has_begun, coff_final_link_postscript,
+  bfd_pe_print_pdata
+};
+#endif
+
+#ifdef TICOFF
+/* COFF1 differs in section header size.  */
+
+static bfd_coff_backend_data ticoff1_swap_table =
+{
+  coff_SWAP_aux_in, coff_SWAP_sym_in, coff_SWAP_lineno_in,
+  coff_SWAP_aux_out, coff_SWAP_sym_out,
+  coff_SWAP_lineno_out, coff_SWAP_reloc_out,
+  coff_SWAP_filehdr_out, coff_SWAP_aouthdr_out,
+  coff_SWAP_scnhdr_out,
+  FILHSZ, AOUTSZ, SCNHSZ_V01, SYMESZ, AUXESZ, RELSZ, LINESZ, FILNMLEN,
+#ifdef COFF_LONG_FILENAMES
+  TRUE,
+#else
+  FALSE,
+#endif
+  COFF_DEFAULT_LONG_SECTION_NAMES,
+  COFF_DEFAULT_SECTION_ALIGNMENT_POWER,
+#ifdef COFF_FORCE_SYMBOLS_IN_STRINGS
+  TRUE,
+#else
+  FALSE,
+#endif
+#ifdef COFF_DEBUG_STRING_WIDE_PREFIX
+  4,
+#else
+  2,
+#endif
+  coff_SWAP_filehdr_in, coff_SWAP_aouthdr_in, coff_SWAP_scnhdr_in,
+  coff_SWAP_reloc_in, ticoff1_bad_format_hook, coff_set_arch_mach_hook,
+  coff_mkobject_hook, styp_to_sec_flags, coff_set_alignment_hook,
+  coff_slurp_symbol_table, symname_in_debug_hook, coff_pointerize_aux_hook,
+  coff_print_aux, coff_reloc16_extra_cases, coff_reloc16_estimate,
+  coff_classify_symbol, coff_compute_section_file_positions,
+  coff_start_final_link, coff_relocate_section, coff_rtype_to_howto,
+  coff_adjust_symndx, coff_link_add_one_symbol,
+  coff_link_output_has_begun, coff_final_link_postscript,
+  bfd_pe_print_pdata	/* huh */
+};
+#endif
+
+#ifndef coff_close_and_cleanup
+#define coff_close_and_cleanup		    _bfd_generic_close_and_cleanup
+#endif
+
+#ifndef coff_bfd_free_cached_info
+#define coff_bfd_free_cached_info	    _bfd_generic_bfd_free_cached_info
+#endif
+
+#ifndef coff_get_section_contents
+#define coff_get_section_contents	    _bfd_generic_get_section_contents
+#endif
+
+#ifndef coff_bfd_copy_private_symbol_data
+#define coff_bfd_copy_private_symbol_data   _bfd_generic_bfd_copy_private_symbol_data
+#endif
+
+#ifndef coff_bfd_copy_private_header_data
+#define coff_bfd_copy_private_header_data   _bfd_generic_bfd_copy_private_header_data
+#endif
+
+#ifndef coff_bfd_copy_private_section_data
+#define coff_bfd_copy_private_section_data  _bfd_generic_bfd_copy_private_section_data
+#endif
+
+#ifndef coff_bfd_copy_private_bfd_data
+#define coff_bfd_copy_private_bfd_data      _bfd_generic_bfd_copy_private_bfd_data
+#endif
+
+#ifndef coff_bfd_merge_private_bfd_data
+#define coff_bfd_merge_private_bfd_data     _bfd_generic_bfd_merge_private_bfd_data
+#endif
+
+#ifndef coff_bfd_set_private_flags
+#define coff_bfd_set_private_flags	    _bfd_generic_bfd_set_private_flags
+#endif
+
+#ifndef coff_bfd_print_private_bfd_data
+#define coff_bfd_print_private_bfd_data     _bfd_generic_bfd_print_private_bfd_data
+#endif
+
+#ifndef coff_bfd_is_local_label_name
+#define coff_bfd_is_local_label_name	    _bfd_coff_is_local_label_name
+#endif
+
+#ifndef coff_bfd_is_target_special_symbol
+#define coff_bfd_is_target_special_symbol   ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#endif
+
+#ifndef coff_read_minisymbols
+#define coff_read_minisymbols		    _bfd_generic_read_minisymbols
+#endif
+
+#ifndef coff_minisymbol_to_symbol
+#define coff_minisymbol_to_symbol	    _bfd_generic_minisymbol_to_symbol
+#endif
+
+/* The reloc lookup routine must be supplied by each individual COFF
+   backend.  */
+#ifndef coff_bfd_reloc_type_lookup
+#define coff_bfd_reloc_type_lookup	    _bfd_norelocs_bfd_reloc_type_lookup
+#endif
+#ifndef coff_bfd_reloc_name_lookup
+#define coff_bfd_reloc_name_lookup    _bfd_norelocs_bfd_reloc_name_lookup
+#endif
+
+#ifndef coff_bfd_get_relocated_section_contents
+#define coff_bfd_get_relocated_section_contents \
+  bfd_generic_get_relocated_section_contents
+#endif
+
+#ifndef coff_bfd_relax_section
+#define coff_bfd_relax_section		    bfd_generic_relax_section
+#endif
+
+#ifndef coff_bfd_gc_sections
+#define coff_bfd_gc_sections		    bfd_generic_gc_sections
+#endif
+
+#ifndef coff_bfd_lookup_section_flags
+#define coff_bfd_lookup_section_flags	    bfd_generic_lookup_section_flags
+#endif
+
+#ifndef coff_bfd_merge_sections
+#define coff_bfd_merge_sections		    bfd_generic_merge_sections
+#endif
+
+#ifndef coff_bfd_is_group_section
+#define coff_bfd_is_group_section	    bfd_generic_is_group_section
+#endif
+
+#ifndef coff_bfd_discard_group
+#define coff_bfd_discard_group		    bfd_generic_discard_group
+#endif
+
+#ifndef coff_section_already_linked
+#define coff_section_already_linked \
+  _bfd_coff_section_already_linked
+#endif
+
+#ifndef coff_bfd_define_common_symbol
+#define coff_bfd_define_common_symbol	    bfd_generic_define_common_symbol
+#endif
+
+#define CREATE_BIG_COFF_TARGET_VEC(VAR, NAME, EXTRA_O_FLAGS, EXTRA_S_FLAGS, UNDER, ALTERNATIVE, SWAP_TABLE)	\
+const bfd_target VAR =							\
+{									\
+  NAME ,								\
+  bfd_target_coff_flavour,						\
+  BFD_ENDIAN_BIG,		/* Data byte order is big.  */		\
+  BFD_ENDIAN_BIG,		/* Header byte order is big.  */	\
+  /* object flags */							\
+  (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG |			\
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | EXTRA_O_FLAGS),			\
+  /* section flags */							\
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | EXTRA_S_FLAGS),\
+  UNDER,			/* Leading symbol underscore.  */	\
+  '/',				/* AR_pad_char.  */			\
+  15,				/* AR_max_namelen.  */			\
+  0,				/* match priority.  */			\
+									\
+  /* Data conversion functions.  */					\
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,				\
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,				\
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,				\
+									\
+  /* Header conversion functions.  */					\
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,				\
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,				\
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,				\
+									\
+	/* bfd_check_format.  */					\
+  { _bfd_dummy_target, coff_object_p, bfd_generic_archive_p,		\
+    _bfd_dummy_target },						\
+	/* bfd_set_format.  */						\
+  { bfd_false, coff_mkobject, _bfd_generic_mkarchive, bfd_false },	\
+	/* bfd_write_contents.  */					\
+  { bfd_false, coff_write_object_contents, _bfd_write_archive_contents,	\
+    bfd_false },							\
+									\
+  BFD_JUMP_TABLE_GENERIC (coff),					\
+  BFD_JUMP_TABLE_COPY (coff),						\
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),					\
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),				\
+  BFD_JUMP_TABLE_SYMBOLS (coff),					\
+  BFD_JUMP_TABLE_RELOCS (coff),						\
+  BFD_JUMP_TABLE_WRITE (coff),						\
+  BFD_JUMP_TABLE_LINK (coff),						\
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),				\
+									\
+  ALTERNATIVE,								\
+									\
+  SWAP_TABLE								\
+};
+
+#define CREATE_BIGHDR_COFF_TARGET_VEC(VAR, NAME, EXTRA_O_FLAGS, EXTRA_S_FLAGS, UNDER, ALTERNATIVE, SWAP_TABLE)	\
+const bfd_target VAR =							\
+{									\
+  NAME ,								\
+  bfd_target_coff_flavour,						\
+  BFD_ENDIAN_LITTLE,		/* Data byte order is little.  */	\
+  BFD_ENDIAN_BIG,		/* Header byte order is big.  */	\
+  /* object flags */							\
+  (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG |			\
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | EXTRA_O_FLAGS),			\
+  /* section flags */							\
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | EXTRA_S_FLAGS),\
+  UNDER,			/* Leading symbol underscore.  */	\
+  '/',				/* AR_pad_char.  */			\
+  15,				/* AR_max_namelen.  */			\
+  0,				/* match priority.  */			\
+									\
+  /* Data conversion functions.  */					\
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,				\
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,				\
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,				\
+									\
+  /* Header conversion functions.  */					\
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,				\
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,				\
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,				\
+									\
+	/* bfd_check_format.  */					\
+  { _bfd_dummy_target, coff_object_p, bfd_generic_archive_p,		\
+    _bfd_dummy_target },						\
+	/* bfd_set_format.  */						\
+  { bfd_false, coff_mkobject, _bfd_generic_mkarchive, bfd_false },	\
+	/* bfd_write_contents.  */					\
+  { bfd_false, coff_write_object_contents, _bfd_write_archive_contents,	\
+    bfd_false },							\
+									\
+  BFD_JUMP_TABLE_GENERIC (coff),					\
+  BFD_JUMP_TABLE_COPY (coff),						\
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),					\
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),				\
+  BFD_JUMP_TABLE_SYMBOLS (coff),					\
+  BFD_JUMP_TABLE_RELOCS (coff),						\
+  BFD_JUMP_TABLE_WRITE (coff),						\
+  BFD_JUMP_TABLE_LINK (coff),						\
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),				\
+									\
+  ALTERNATIVE,								\
+									\
+  SWAP_TABLE								\
+};
+
+#define CREATE_LITTLE_COFF_TARGET_VEC(VAR, NAME, EXTRA_O_FLAGS, EXTRA_S_FLAGS, UNDER, ALTERNATIVE, SWAP_TABLE)	\
+const bfd_target VAR =							\
+{									\
+  NAME ,								\
+  bfd_target_coff_flavour,						\
+  BFD_ENDIAN_LITTLE,		/* Data byte order is little.  */	\
+  BFD_ENDIAN_LITTLE,		/* Header byte order is little.  */	\
+	/* object flags */						\
+  (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG |			\
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | EXTRA_O_FLAGS),			\
+	/* section flags */						\
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | EXTRA_S_FLAGS),\
+  UNDER,			/* Leading symbol underscore.  */	\
+  '/',				/* AR_pad_char.  */			\
+  15,				/* AR_max_namelen.  */			\
+  0,				/* match priority.  */			\
+									\
+  /* Data conversion functions.  */					\
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,				\
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,				\
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16,				\
+  /* Header conversion functions.  */					\
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,				\
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,				\
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16,				\
+	/* bfd_check_format.  */					\
+  { _bfd_dummy_target, coff_object_p, bfd_generic_archive_p,		\
+    _bfd_dummy_target },						\
+       /* bfd_set_format.  */						\
+  { bfd_false, coff_mkobject, _bfd_generic_mkarchive, bfd_false },	\
+	/* bfd_write_contents.  */					\
+  { bfd_false, coff_write_object_contents, _bfd_write_archive_contents,	\
+    bfd_false },							\
+									\
+  BFD_JUMP_TABLE_GENERIC (coff),					\
+  BFD_JUMP_TABLE_COPY (coff),						\
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),					\
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),				\
+  BFD_JUMP_TABLE_SYMBOLS (coff),					\
+  BFD_JUMP_TABLE_RELOCS (coff),						\
+  BFD_JUMP_TABLE_WRITE (coff),						\
+  BFD_JUMP_TABLE_LINK (coff),						\
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),				\
+									\
+  ALTERNATIVE,								\
+									\
+  SWAP_TABLE								\
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coffgen.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coffgen.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coffgen.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coffgen.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2468 @@
+/* Support for the generic parts of COFF, for BFD.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* Most of this hacked by  Steve Chamberlain, sac@cygnus.com.
+   Split out of coffcode.h by Ian Taylor, ian@cygnus.com.  */
+
+/* This file contains COFF code that is not dependent on any
+   particular COFF target.  There is only one version of this file in
+   libbfd.a, so no target specific code may be put in here.  Or, to
+   put it another way,
+
+   ********** DO NOT PUT TARGET SPECIFIC CODE IN THIS FILE **********
+
+   If you need to add some target specific behaviour, add a new hook
+   function to bfd_coff_backend_data.
+
+   Some of these functions are also called by the ECOFF routines.
+   Those functions may not use any COFF specific information, such as
+   coff_data (abfd).  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+
+/* Take a section header read from a coff file (in HOST byte order),
+   and make a BFD "section" out of it.  This is used by ECOFF.  */
+
+static bfd_boolean
+make_a_section_from_file (bfd *abfd,
+			  struct internal_scnhdr *hdr,
+			  unsigned int target_index)
+{
+  asection *return_section;
+  char *name;
+  bfd_boolean result = TRUE;
+  flagword flags;
+
+  name = NULL;
+
+  /* Handle long section names as in PE.  On reading, we want to
+    accept long names if the format permits them at all, regardless
+    of the current state of the flag that dictates if we would generate
+    them in outputs; this construct checks if that is the case by
+    attempting to set the flag, without changing its state; the call
+    will fail for formats that do not support long names at all.  */
+  if (bfd_coff_set_long_section_names (abfd, bfd_coff_long_section_names (abfd))
+      && hdr->s_name[0] == '/')
+    {
+      char buf[SCNNMLEN];
+      long strindex;
+      char *p;
+      const char *strings;
+
+      /* Flag that this BFD uses long names, even though the format might
+         expect them to be off by default.  This won't directly affect the
+         format of any output BFD created from this one, but the information
+         can be used to decide what to do.  */
+      bfd_coff_set_long_section_names (abfd, TRUE);
+      memcpy (buf, hdr->s_name + 1, SCNNMLEN - 1);
+      buf[SCNNMLEN - 1] = '\0';
+      strindex = strtol (buf, &p, 10);
+      if (*p == '\0' && strindex >= 0)
+	{
+	  strings = _bfd_coff_read_string_table (abfd);
+	  if (strings == NULL)
+	    return FALSE;
+	  /* FIXME: For extra safety, we should make sure that
+             strindex does not run us past the end, but right now we
+             don't know the length of the string table.  */
+	  strings += strindex;
+	  name = (char *) bfd_alloc (abfd,
+                                     (bfd_size_type) strlen (strings) + 1);
+	  if (name == NULL)
+	    return FALSE;
+	  strcpy (name, strings);
+	}
+    }
+
+  if (name == NULL)
+    {
+      /* Assorted wastage to null-terminate the name, thanks AT&T! */
+      name = (char *) bfd_alloc (abfd,
+                                 (bfd_size_type) sizeof (hdr->s_name) + 1);
+      if (name == NULL)
+	return FALSE;
+      strncpy (name, (char *) &hdr->s_name[0], sizeof (hdr->s_name));
+      name[sizeof (hdr->s_name)] = 0;
+    }
+
+  return_section = bfd_make_section_anyway (abfd, name);
+  if (return_section == NULL)
+    return FALSE;
+
+  return_section->vma = hdr->s_vaddr;
+  return_section->lma = hdr->s_paddr;
+  return_section->size = hdr->s_size;
+  return_section->filepos = hdr->s_scnptr;
+  return_section->rel_filepos = hdr->s_relptr;
+  return_section->reloc_count = hdr->s_nreloc;
+
+  bfd_coff_set_alignment_hook (abfd, return_section, hdr);
+
+  return_section->line_filepos = hdr->s_lnnoptr;
+
+  return_section->lineno_count = hdr->s_nlnno;
+  return_section->userdata = NULL;
+  return_section->next = NULL;
+  return_section->target_index = target_index;
+
+  if (! bfd_coff_styp_to_sec_flags_hook (abfd, hdr, name, return_section,
+					 & flags))
+    result = FALSE;
+
+  return_section->flags = flags;
+
+  /* At least on i386-coff, the line number count for a shared library
+     section must be ignored.  */
+  if ((return_section->flags & SEC_COFF_SHARED_LIBRARY) != 0)
+    return_section->lineno_count = 0;
+
+  if (hdr->s_nreloc != 0)
+    return_section->flags |= SEC_RELOC;
+  /* FIXME: should this check 'hdr->s_size > 0'.  */
+  if (hdr->s_scnptr != 0)
+    return_section->flags |= SEC_HAS_CONTENTS;
+
+  return result;
+}
+
+/* Read in a COFF object and make it into a BFD.  This is used by
+   ECOFF as well.  */
+
+static const bfd_target *
+coff_real_object_p (bfd *abfd,
+		    unsigned nscns,
+		    struct internal_filehdr *internal_f,
+		    struct internal_aouthdr *internal_a)
+{
+  flagword oflags = abfd->flags;
+  bfd_vma ostart = bfd_get_start_address (abfd);
+  void * tdata;
+  void * tdata_save;
+  bfd_size_type readsize;	/* Length of file_info.  */
+  unsigned int scnhsz;
+  char *external_sections;
+
+  if (!(internal_f->f_flags & F_RELFLG))
+    abfd->flags |= HAS_RELOC;
+  if ((internal_f->f_flags & F_EXEC))
+    abfd->flags |= EXEC_P;
+  if (!(internal_f->f_flags & F_LNNO))
+    abfd->flags |= HAS_LINENO;
+  if (!(internal_f->f_flags & F_LSYMS))
+    abfd->flags |= HAS_LOCALS;
+
+  /* FIXME: How can we set D_PAGED correctly?  */
+  if ((internal_f->f_flags & F_EXEC) != 0)
+    abfd->flags |= D_PAGED;
+
+  bfd_get_symcount (abfd) = internal_f->f_nsyms;
+  if (internal_f->f_nsyms)
+    abfd->flags |= HAS_SYMS;
+
+  if (internal_a != (struct internal_aouthdr *) NULL)
+    bfd_get_start_address (abfd) = internal_a->entry;
+  else
+    bfd_get_start_address (abfd) = 0;
+
+  /* Set up the tdata area.  ECOFF uses its own routine, and overrides
+     abfd->flags.  */
+  tdata_save = abfd->tdata.any;
+  tdata = bfd_coff_mkobject_hook (abfd, (void *) internal_f, (void *) internal_a);
+  if (tdata == NULL)
+    goto fail2;
+
+  scnhsz = bfd_coff_scnhsz (abfd);
+  readsize = (bfd_size_type) nscns * scnhsz;
+  external_sections = (char *) bfd_alloc (abfd, readsize);
+  if (!external_sections)
+    goto fail;
+
+  if (bfd_bread ((void *) external_sections, readsize, abfd) != readsize)
+    goto fail;
+
+  /* Set the arch/mach *before* swapping in sections; section header swapping
+     may depend on arch/mach info.  */
+  if (! bfd_coff_set_arch_mach_hook (abfd, (void *) internal_f))
+    goto fail;
+
+  /* Now copy data as required; construct all asections etc.  */
+  if (nscns != 0)
+    {
+      unsigned int i;
+      for (i = 0; i < nscns; i++)
+	{
+	  struct internal_scnhdr tmp;
+	  bfd_coff_swap_scnhdr_in (abfd,
+				   (void *) (external_sections + i * scnhsz),
+				   (void *) & tmp);
+	  if (! make_a_section_from_file (abfd, &tmp, i + 1))
+	    goto fail;
+	}
+    }
+
+  return abfd->xvec;
+
+ fail:
+  bfd_release (abfd, tdata);
+ fail2:
+  abfd->tdata.any = tdata_save;
+  abfd->flags = oflags;
+  bfd_get_start_address (abfd) = ostart;
+  return (const bfd_target *) NULL;
+}
+
+/* Turn a COFF file into a BFD, but fail with bfd_error_wrong_format if it is
+   not a COFF file.  This is also used by ECOFF.  */
+
+const bfd_target *
+coff_object_p (bfd *abfd)
+{
+  bfd_size_type filhsz;
+  bfd_size_type aoutsz;
+  unsigned int nscns;
+  void * filehdr;
+  struct internal_filehdr internal_f;
+  struct internal_aouthdr internal_a;
+
+  /* Figure out how much to read.  */
+  filhsz = bfd_coff_filhsz (abfd);
+  aoutsz = bfd_coff_aoutsz (abfd);
+
+  filehdr = bfd_alloc (abfd, filhsz);
+  if (filehdr == NULL)
+    return NULL;
+  if (bfd_bread (filehdr, filhsz, abfd) != filhsz)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      bfd_release (abfd, filehdr);
+      return NULL;
+    }
+  bfd_coff_swap_filehdr_in (abfd, filehdr, &internal_f);
+  bfd_release (abfd, filehdr);
+
+  /* The XCOFF format has two sizes for the f_opthdr.  SMALL_AOUTSZ
+     (less than aoutsz) used in object files and AOUTSZ (equal to
+     aoutsz) in executables.  The bfd_coff_swap_aouthdr_in function
+     expects this header to be aoutsz bytes in length, so we use that
+     value in the call to bfd_alloc below.  But we must be careful to
+     only read in f_opthdr bytes in the call to bfd_bread.  We should
+     also attempt to catch corrupt or non-COFF binaries with a strange
+     value for f_opthdr.  */
+  if (! bfd_coff_bad_format_hook (abfd, &internal_f)
+      || internal_f.f_opthdr > aoutsz)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+  nscns = internal_f.f_nscns;
+
+  if (internal_f.f_opthdr)
+    {
+      void * opthdr;
+
+      opthdr = bfd_alloc (abfd, aoutsz);
+      if (opthdr == NULL)
+	return NULL;
+      if (bfd_bread (opthdr, (bfd_size_type) internal_f.f_opthdr, abfd)
+	  != internal_f.f_opthdr)
+	{
+	  bfd_release (abfd, opthdr);
+	  return NULL;
+	}
+      bfd_coff_swap_aouthdr_in (abfd, opthdr, (void *) &internal_a);
+      bfd_release (abfd, opthdr);
+    }
+
+  return coff_real_object_p (abfd, nscns, &internal_f,
+			     (internal_f.f_opthdr != 0
+			      ? &internal_a
+			      : (struct internal_aouthdr *) NULL));
+}
+
+/* Get the BFD section from a COFF symbol section number.  */
+
+asection *
+coff_section_from_bfd_index (bfd *abfd, int section_index)
+{
+  struct bfd_section *answer = abfd->sections;
+
+  if (section_index == N_ABS)
+    return bfd_abs_section_ptr;
+  if (section_index == N_UNDEF)
+    return bfd_und_section_ptr;
+  if (section_index == N_DEBUG)
+    return bfd_abs_section_ptr;
+
+  while (answer)
+    {
+      if (answer->target_index == section_index)
+	return answer;
+      answer = answer->next;
+    }
+
+  /* We should not reach this point, but the SCO 3.2v4 /lib/libc_s.a
+     has a bad symbol table in biglitpow.o.  */
+  return bfd_und_section_ptr;
+}
+
+/* Get the upper bound of a COFF symbol table.  */
+
+long
+coff_get_symtab_upper_bound (bfd *abfd)
+{
+  if (!bfd_coff_slurp_symbol_table (abfd))
+    return -1;
+
+  return (bfd_get_symcount (abfd) + 1) * (sizeof (coff_symbol_type *));
+}
+
+/* Canonicalize a COFF symbol table.  */
+
+long
+coff_canonicalize_symtab (bfd *abfd, asymbol **alocation)
+{
+  unsigned int counter;
+  coff_symbol_type *symbase;
+  coff_symbol_type **location = (coff_symbol_type **) alocation;
+
+  if (!bfd_coff_slurp_symbol_table (abfd))
+    return -1;
+
+  symbase = obj_symbols (abfd);
+  counter = bfd_get_symcount (abfd);
+  while (counter-- > 0)
+    *location++ = symbase++;
+
+  *location = NULL;
+
+  return bfd_get_symcount (abfd);
+}
+
+/* Get the name of a symbol.  The caller must pass in a buffer of size
+   >= SYMNMLEN + 1.  */
+
+const char *
+_bfd_coff_internal_syment_name (bfd *abfd,
+				const struct internal_syment *sym,
+				char *buf)
+{
+  /* FIXME: It's not clear this will work correctly if sizeof
+     (_n_zeroes) != 4.  */
+  if (sym->_n._n_n._n_zeroes != 0
+      || sym->_n._n_n._n_offset == 0)
+    {
+      memcpy (buf, sym->_n._n_name, SYMNMLEN);
+      buf[SYMNMLEN] = '\0';
+      return buf;
+    }
+  else
+    {
+      const char *strings;
+
+      BFD_ASSERT (sym->_n._n_n._n_offset >= STRING_SIZE_SIZE);
+      strings = obj_coff_strings (abfd);
+      if (strings == NULL)
+	{
+	  strings = _bfd_coff_read_string_table (abfd);
+	  if (strings == NULL)
+	    return NULL;
+	}
+      return strings + sym->_n._n_n._n_offset;
+    }
+}
+
+/* Read in and swap the relocs.  This returns a buffer holding the
+   relocs for section SEC in file ABFD.  If CACHE is TRUE and
+   INTERNAL_RELOCS is NULL, the relocs read in will be saved in case
+   the function is called again.  If EXTERNAL_RELOCS is not NULL, it
+   is a buffer large enough to hold the unswapped relocs.  If
+   INTERNAL_RELOCS is not NULL, it is a buffer large enough to hold
+   the swapped relocs.  If REQUIRE_INTERNAL is TRUE, then the return
+   value must be INTERNAL_RELOCS.  The function returns NULL on error.  */
+
+struct internal_reloc *
+_bfd_coff_read_internal_relocs (bfd *abfd,
+				asection *sec,
+				bfd_boolean cache,
+				bfd_byte *external_relocs,
+				bfd_boolean require_internal,
+				struct internal_reloc *internal_relocs)
+{
+  bfd_size_type relsz;
+  bfd_byte *free_external = NULL;
+  struct internal_reloc *free_internal = NULL;
+  bfd_byte *erel;
+  bfd_byte *erel_end;
+  struct internal_reloc *irel;
+  bfd_size_type amt;
+
+  if (sec->reloc_count == 0)
+    return internal_relocs;	/* Nothing to do.  */
+
+  if (coff_section_data (abfd, sec) != NULL
+      && coff_section_data (abfd, sec)->relocs != NULL)
+    {
+      if (! require_internal)
+	return coff_section_data (abfd, sec)->relocs;
+      memcpy (internal_relocs, coff_section_data (abfd, sec)->relocs,
+	      sec->reloc_count * sizeof (struct internal_reloc));
+      return internal_relocs;
+    }
+
+  relsz = bfd_coff_relsz (abfd);
+
+  amt = sec->reloc_count * relsz;
+  if (external_relocs == NULL)
+    {
+      free_external = (bfd_byte *) bfd_malloc (amt);
+      if (free_external == NULL)
+	goto error_return;
+      external_relocs = free_external;
+    }
+
+  if (bfd_seek (abfd, sec->rel_filepos, SEEK_SET) != 0
+      || bfd_bread (external_relocs, amt, abfd) != amt)
+    goto error_return;
+
+  if (internal_relocs == NULL)
+    {
+      amt = sec->reloc_count;
+      amt *= sizeof (struct internal_reloc);
+      free_internal = (struct internal_reloc *) bfd_malloc (amt);
+      if (free_internal == NULL)
+	goto error_return;
+      internal_relocs = free_internal;
+    }
+
+  /* Swap in the relocs.  */
+  erel = external_relocs;
+  erel_end = erel + relsz * sec->reloc_count;
+  irel = internal_relocs;
+  for (; erel < erel_end; erel += relsz, irel++)
+    bfd_coff_swap_reloc_in (abfd, (void *) erel, (void *) irel);
+
+  if (free_external != NULL)
+    {
+      free (free_external);
+      free_external = NULL;
+    }
+
+  if (cache && free_internal != NULL)
+    {
+      if (coff_section_data (abfd, sec) == NULL)
+	{
+	  amt = sizeof (struct coff_section_tdata);
+	  sec->used_by_bfd = bfd_zalloc (abfd, amt);
+	  if (sec->used_by_bfd == NULL)
+	    goto error_return;
+	  coff_section_data (abfd, sec)->contents = NULL;
+	}
+      coff_section_data (abfd, sec)->relocs = free_internal;
+    }
+
+  return internal_relocs;
+
+ error_return:
+  if (free_external != NULL)
+    free (free_external);
+  if (free_internal != NULL)
+    free (free_internal);
+  return NULL;
+}
+
+/* Set lineno_count for the output sections of a COFF file.  */
+
+int
+coff_count_linenumbers (bfd *abfd)
+{
+  unsigned int limit = bfd_get_symcount (abfd);
+  unsigned int i;
+  int total = 0;
+  asymbol **p;
+  asection *s;
+
+  if (limit == 0)
+    {
+      /* This may be from the backend linker, in which case the
+         lineno_count in the sections is correct.  */
+      for (s = abfd->sections; s != NULL; s = s->next)
+	total += s->lineno_count;
+      return total;
+    }
+
+  for (s = abfd->sections; s != NULL; s = s->next)
+    BFD_ASSERT (s->lineno_count == 0);
+
+  for (p = abfd->outsymbols, i = 0; i < limit; i++, p++)
+    {
+      asymbol *q_maybe = *p;
+
+      if (bfd_family_coff (bfd_asymbol_bfd (q_maybe)))
+	{
+	  coff_symbol_type *q = coffsymbol (q_maybe);
+
+	  /* The AIX 4.1 compiler can sometimes generate line numbers
+             attached to debugging symbols.  We try to simply ignore
+             those here.  */
+	  if (q->lineno != NULL
+	      && q->symbol.section->owner != NULL)
+	    {
+	      /* This symbol has line numbers.  Increment the owning
+	         section's linenumber count.  */
+	      alent *l = q->lineno;
+
+	      do
+		{
+		  asection * sec = q->symbol.section->output_section;
+
+		  /* Do not try to update fields in read-only sections.  */
+		  if (! bfd_is_const_section (sec))
+		    sec->lineno_count ++;
+
+		  ++total;
+		  ++l;
+		}
+	      while (l->line_number != 0);
+	    }
+	}
+    }
+
+  return total;
+}
+
+/* Takes a bfd and a symbol, returns a pointer to the coff specific
+   area of the symbol if there is one.  */
+
+coff_symbol_type *
+coff_symbol_from (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+		  asymbol *symbol)
+{
+  if (!bfd_family_coff (bfd_asymbol_bfd (symbol)))
+    return (coff_symbol_type *) NULL;
+
+  if (bfd_asymbol_bfd (symbol)->tdata.coff_obj_data == (coff_data_type *) NULL)
+    return (coff_symbol_type *) NULL;
+
+  return (coff_symbol_type *) symbol;
+}
+
+static void
+fixup_symbol_value (bfd *abfd,
+		    coff_symbol_type *coff_symbol_ptr,
+		    struct internal_syment *syment)
+{
+  /* Normalize the symbol flags.  */
+  if (coff_symbol_ptr->symbol.section 
+      && bfd_is_com_section (coff_symbol_ptr->symbol.section))
+    {
+      /* A common symbol is undefined with a value.  */
+      syment->n_scnum = N_UNDEF;
+      syment->n_value = coff_symbol_ptr->symbol.value;
+    }
+  else if ((coff_symbol_ptr->symbol.flags & BSF_DEBUGGING) != 0
+	   && (coff_symbol_ptr->symbol.flags & BSF_DEBUGGING_RELOC) == 0)
+    {
+      syment->n_value = coff_symbol_ptr->symbol.value;
+    }
+  else if (bfd_is_und_section (coff_symbol_ptr->symbol.section))
+    {
+      syment->n_scnum = N_UNDEF;
+      syment->n_value = 0;
+    }
+  /* FIXME: Do we need to handle the absolute section here?  */
+  else
+    {
+      if (coff_symbol_ptr->symbol.section)
+	{
+	  syment->n_scnum =
+	    coff_symbol_ptr->symbol.section->output_section->target_index;
+
+	  syment->n_value = (coff_symbol_ptr->symbol.value
+			     + coff_symbol_ptr->symbol.section->output_offset);
+	  if (! obj_pe (abfd))
+            {
+              syment->n_value += (syment->n_sclass == C_STATLAB)
+                ? coff_symbol_ptr->symbol.section->output_section->lma
+                : coff_symbol_ptr->symbol.section->output_section->vma;
+            }
+	}
+      else
+	{
+	  BFD_ASSERT (0);
+	  /* This can happen, but I don't know why yet (steve@cygnus.com) */
+	  syment->n_scnum = N_ABS;
+	  syment->n_value = coff_symbol_ptr->symbol.value;
+	}
+    }
+}
+
+/* Run through all the symbols in the symbol table and work out what
+   their indexes into the symbol table will be when output.
+
+   Coff requires that each C_FILE symbol points to the next one in the
+   chain, and that the last one points to the first external symbol. We
+   do that here too.  */
+
+bfd_boolean
+coff_renumber_symbols (bfd *bfd_ptr, int *first_undef)
+{
+  unsigned int symbol_count = bfd_get_symcount (bfd_ptr);
+  asymbol **symbol_ptr_ptr = bfd_ptr->outsymbols;
+  unsigned int native_index = 0;
+  struct internal_syment *last_file = NULL;
+  unsigned int symbol_index;
+
+  /* COFF demands that undefined symbols come after all other symbols.
+     Since we don't need to impose this extra knowledge on all our
+     client programs, deal with that here.  Sort the symbol table;
+     just move the undefined symbols to the end, leaving the rest
+     alone.  The O'Reilly book says that defined global symbols come
+     at the end before the undefined symbols, so we do that here as
+     well.  */
+  /* @@ Do we have some condition we could test for, so we don't always
+     have to do this?  I don't think relocatability is quite right, but
+     I'm not certain.  [raeburn:19920508.1711EST]  */
+  {
+    asymbol **newsyms;
+    unsigned int i;
+    bfd_size_type amt;
+
+    amt = sizeof (asymbol *) * ((bfd_size_type) symbol_count + 1);
+    newsyms = (asymbol **) bfd_alloc (bfd_ptr, amt);
+    if (!newsyms)
+      return FALSE;
+    bfd_ptr->outsymbols = newsyms;
+    for (i = 0; i < symbol_count; i++)
+      if ((symbol_ptr_ptr[i]->flags & BSF_NOT_AT_END) != 0
+	  || (!bfd_is_und_section (symbol_ptr_ptr[i]->section)
+	      && !bfd_is_com_section (symbol_ptr_ptr[i]->section)
+	      && ((symbol_ptr_ptr[i]->flags & BSF_FUNCTION) != 0
+		  || ((symbol_ptr_ptr[i]->flags & (BSF_GLOBAL | BSF_WEAK))
+		      == 0))))
+	*newsyms++ = symbol_ptr_ptr[i];
+
+    for (i = 0; i < symbol_count; i++)
+      if ((symbol_ptr_ptr[i]->flags & BSF_NOT_AT_END) == 0
+	  && !bfd_is_und_section (symbol_ptr_ptr[i]->section)
+	  && (bfd_is_com_section (symbol_ptr_ptr[i]->section)
+	      || ((symbol_ptr_ptr[i]->flags & BSF_FUNCTION) == 0
+		  && ((symbol_ptr_ptr[i]->flags & (BSF_GLOBAL | BSF_WEAK))
+		      != 0))))
+	*newsyms++ = symbol_ptr_ptr[i];
+
+    *first_undef = newsyms - bfd_ptr->outsymbols;
+
+    for (i = 0; i < symbol_count; i++)
+      if ((symbol_ptr_ptr[i]->flags & BSF_NOT_AT_END) == 0
+	  && bfd_is_und_section (symbol_ptr_ptr[i]->section))
+	*newsyms++ = symbol_ptr_ptr[i];
+    *newsyms = (asymbol *) NULL;
+    symbol_ptr_ptr = bfd_ptr->outsymbols;
+  }
+
+  for (symbol_index = 0; symbol_index < symbol_count; symbol_index++)
+    {
+      coff_symbol_type *coff_symbol_ptr = coff_symbol_from (bfd_ptr, symbol_ptr_ptr[symbol_index]);
+      symbol_ptr_ptr[symbol_index]->udata.i = symbol_index;
+      if (coff_symbol_ptr && coff_symbol_ptr->native)
+	{
+	  combined_entry_type *s = coff_symbol_ptr->native;
+	  int i;
+
+	  if (s->u.syment.n_sclass == C_FILE)
+	    {
+	      if (last_file != NULL)
+		last_file->n_value = native_index;
+	      last_file = &(s->u.syment);
+	    }
+	  else
+	    /* Modify the symbol values according to their section and
+	       type.  */
+	    fixup_symbol_value (bfd_ptr, coff_symbol_ptr, &(s->u.syment));
+
+	  for (i = 0; i < s->u.syment.n_numaux + 1; i++)
+	    s[i].offset = native_index++;
+	}
+      else
+	native_index++;
+    }
+
+  obj_conv_table_size (bfd_ptr) = native_index;
+
+  return TRUE;
+}
+
+/* Run thorough the symbol table again, and fix it so that all
+   pointers to entries are changed to the entries' index in the output
+   symbol table.  */
+
+void
+coff_mangle_symbols (bfd *bfd_ptr)
+{
+  unsigned int symbol_count = bfd_get_symcount (bfd_ptr);
+  asymbol **symbol_ptr_ptr = bfd_ptr->outsymbols;
+  unsigned int symbol_index;
+
+  for (symbol_index = 0; symbol_index < symbol_count; symbol_index++)
+    {
+      coff_symbol_type *coff_symbol_ptr =
+      coff_symbol_from (bfd_ptr, symbol_ptr_ptr[symbol_index]);
+
+      if (coff_symbol_ptr && coff_symbol_ptr->native)
+	{
+	  int i;
+	  combined_entry_type *s = coff_symbol_ptr->native;
+
+	  if (s->fix_value)
+	    {
+	      /* FIXME: We should use a union here.  */
+	      s->u.syment.n_value =
+		(bfd_hostptr_t) ((combined_entry_type *)
+			  ((bfd_hostptr_t) s->u.syment.n_value))->offset;
+	      s->fix_value = 0;
+	    }
+	  if (s->fix_line)
+	    {
+	      /* The value is the offset into the line number entries
+                 for the symbol's section.  On output, the symbol's
+                 section should be N_DEBUG.  */
+	      s->u.syment.n_value =
+		(coff_symbol_ptr->symbol.section->output_section->line_filepos
+		 + s->u.syment.n_value * bfd_coff_linesz (bfd_ptr));
+	      coff_symbol_ptr->symbol.section =
+		coff_section_from_bfd_index (bfd_ptr, N_DEBUG);
+	      BFD_ASSERT (coff_symbol_ptr->symbol.flags & BSF_DEBUGGING);
+	    }
+	  for (i = 0; i < s->u.syment.n_numaux; i++)
+	    {
+	      combined_entry_type *a = s + i + 1;
+	      if (a->fix_tag)
+		{
+		  a->u.auxent.x_sym.x_tagndx.l =
+		    a->u.auxent.x_sym.x_tagndx.p->offset;
+		  a->fix_tag = 0;
+		}
+	      if (a->fix_end)
+		{
+		  a->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.l =
+		    a->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.p->offset;
+		  a->fix_end = 0;
+		}
+	      if (a->fix_scnlen)
+		{
+		  a->u.auxent.x_csect.x_scnlen.l =
+		    a->u.auxent.x_csect.x_scnlen.p->offset;
+		  a->fix_scnlen = 0;
+		}
+	    }
+	}
+    }
+}
+
+static void
+coff_fix_symbol_name (bfd *abfd,
+		      asymbol *symbol,
+		      combined_entry_type *native,
+		      bfd_size_type *string_size_p,
+		      asection **debug_string_section_p,
+		      bfd_size_type *debug_string_size_p)
+{
+  unsigned int name_length;
+  union internal_auxent *auxent;
+  char *name = (char *) (symbol->name);
+
+  if (name == NULL)
+    {
+      /* COFF symbols always have names, so we'll make one up.  */
+      symbol->name = "strange";
+      name = (char *) symbol->name;
+    }
+  name_length = strlen (name);
+
+  if (native->u.syment.n_sclass == C_FILE
+      && native->u.syment.n_numaux > 0)
+    {
+      unsigned int filnmlen;
+
+      if (bfd_coff_force_symnames_in_strings (abfd))
+	{
+          native->u.syment._n._n_n._n_offset =
+	      (*string_size_p + STRING_SIZE_SIZE);
+	  native->u.syment._n._n_n._n_zeroes = 0;
+	  *string_size_p += 6;  /* strlen(".file") + 1 */
+	}
+      else
+  	strncpy (native->u.syment._n._n_name, ".file", SYMNMLEN);
+
+      auxent = &(native + 1)->u.auxent;
+
+      filnmlen = bfd_coff_filnmlen (abfd);
+
+      if (bfd_coff_long_filenames (abfd))
+	{
+	  if (name_length <= filnmlen)
+	    strncpy (auxent->x_file.x_fname, name, filnmlen);
+	  else
+	    {
+	      auxent->x_file.x_n.x_offset = *string_size_p + STRING_SIZE_SIZE;
+	      auxent->x_file.x_n.x_zeroes = 0;
+	      *string_size_p += name_length + 1;
+	    }
+	}
+      else
+	{
+	  strncpy (auxent->x_file.x_fname, name, filnmlen);
+	  if (name_length > filnmlen)
+	    name[filnmlen] = '\0';
+	}
+    }
+  else
+    {
+      if (name_length <= SYMNMLEN && !bfd_coff_force_symnames_in_strings (abfd))
+	/* This name will fit into the symbol neatly.  */
+	strncpy (native->u.syment._n._n_name, symbol->name, SYMNMLEN);
+
+      else if (!bfd_coff_symname_in_debug (abfd, &native->u.syment))
+	{
+	  native->u.syment._n._n_n._n_offset = (*string_size_p
+						+ STRING_SIZE_SIZE);
+	  native->u.syment._n._n_n._n_zeroes = 0;
+	  *string_size_p += name_length + 1;
+	}
+      else
+	{
+	  file_ptr filepos;
+	  bfd_byte buf[4];
+	  int prefix_len = bfd_coff_debug_string_prefix_length (abfd);
+
+	  /* This name should be written into the .debug section.  For
+	     some reason each name is preceded by a two byte length
+	     and also followed by a null byte.  FIXME: We assume that
+	     the .debug section has already been created, and that it
+	     is large enough.  */
+	  if (*debug_string_section_p == (asection *) NULL)
+	    *debug_string_section_p = bfd_get_section_by_name (abfd, ".debug");
+	  filepos = bfd_tell (abfd);
+	  if (prefix_len == 4)
+	    bfd_put_32 (abfd, (bfd_vma) (name_length + 1), buf);
+	  else
+	    bfd_put_16 (abfd, (bfd_vma) (name_length + 1), buf);
+
+	  if (!bfd_set_section_contents (abfd,
+					 *debug_string_section_p,
+					 (void *) buf,
+					 (file_ptr) *debug_string_size_p,
+					 (bfd_size_type) prefix_len)
+	      || !bfd_set_section_contents (abfd,
+					    *debug_string_section_p,
+					    (void *) symbol->name,
+					    (file_ptr) (*debug_string_size_p
+							+ prefix_len),
+					    (bfd_size_type) name_length + 1))
+	    abort ();
+	  if (bfd_seek (abfd, filepos, SEEK_SET) != 0)
+	    abort ();
+	  native->u.syment._n._n_n._n_offset =
+	      *debug_string_size_p + prefix_len;
+	  native->u.syment._n._n_n._n_zeroes = 0;
+	  *debug_string_size_p += name_length + 1 + prefix_len;
+	}
+    }
+}
+
+/* We need to keep track of the symbol index so that when we write out
+   the relocs we can get the index for a symbol.  This method is a
+   hack.  FIXME.  */
+
+#define set_index(symbol, idx)	((symbol)->udata.i = (idx))
+
+/* Write a symbol out to a COFF file.  */
+
+static bfd_boolean
+coff_write_symbol (bfd *abfd,
+		   asymbol *symbol,
+		   combined_entry_type *native,
+		   bfd_vma *written,
+		   bfd_size_type *string_size_p,
+		   asection **debug_string_section_p,
+		   bfd_size_type *debug_string_size_p)
+{
+  unsigned int numaux = native->u.syment.n_numaux;
+  int type = native->u.syment.n_type;
+  int n_sclass = (int) native->u.syment.n_sclass;
+  asection *output_section = symbol->section->output_section
+			       ? symbol->section->output_section
+			       : symbol->section;
+  void * buf;
+  bfd_size_type symesz;
+
+  if (native->u.syment.n_sclass == C_FILE)
+    symbol->flags |= BSF_DEBUGGING;
+
+  if (symbol->flags & BSF_DEBUGGING
+      && bfd_is_abs_section (symbol->section))
+    native->u.syment.n_scnum = N_DEBUG;
+
+  else if (bfd_is_abs_section (symbol->section))
+    native->u.syment.n_scnum = N_ABS;
+
+  else if (bfd_is_und_section (symbol->section))
+    native->u.syment.n_scnum = N_UNDEF;
+
+  else
+    native->u.syment.n_scnum =
+      output_section->target_index;
+
+  coff_fix_symbol_name (abfd, symbol, native, string_size_p,
+			debug_string_section_p, debug_string_size_p);
+
+  symesz = bfd_coff_symesz (abfd);
+  buf = bfd_alloc (abfd, symesz);
+  if (!buf)
+    return FALSE;
+  bfd_coff_swap_sym_out (abfd, &native->u.syment, buf);
+  if (bfd_bwrite (buf, symesz, abfd) != symesz)
+    return FALSE;
+  bfd_release (abfd, buf);
+
+  if (native->u.syment.n_numaux > 0)
+    {
+      bfd_size_type auxesz;
+      unsigned int j;
+
+      auxesz = bfd_coff_auxesz (abfd);
+      buf = bfd_alloc (abfd, auxesz);
+      if (!buf)
+	return FALSE;
+      for (j = 0; j < native->u.syment.n_numaux; j++)
+	{
+	  bfd_coff_swap_aux_out (abfd,
+				 &((native + j + 1)->u.auxent),
+				 type, n_sclass, (int) j,
+				 native->u.syment.n_numaux,
+				 buf);
+	  if (bfd_bwrite (buf, auxesz, abfd) != auxesz)
+	    return FALSE;
+	}
+      bfd_release (abfd, buf);
+    }
+
+  /* Store the index for use when we write out the relocs.  */
+  set_index (symbol, *written);
+
+  *written += numaux + 1;
+  return TRUE;
+}
+
+/* Write out a symbol to a COFF file that does not come from a COFF
+   file originally.  This symbol may have been created by the linker,
+   or we may be linking a non COFF file to a COFF file.  */
+
+static bfd_boolean
+coff_write_alien_symbol (bfd *abfd,
+			 asymbol *symbol,
+			 bfd_vma *written,
+			 bfd_size_type *string_size_p,
+			 asection **debug_string_section_p,
+			 bfd_size_type *debug_string_size_p)
+{
+  combined_entry_type *native;
+  combined_entry_type dummy;
+  asection *output_section = symbol->section->output_section
+			       ? symbol->section->output_section
+			       : symbol->section;
+
+  native = &dummy;
+  native->u.syment.n_type = T_NULL;
+  native->u.syment.n_flags = 0;
+  if (bfd_is_und_section (symbol->section))
+    {
+      native->u.syment.n_scnum = N_UNDEF;
+      native->u.syment.n_value = symbol->value;
+    }
+  else if (bfd_is_com_section (symbol->section))
+    {
+      native->u.syment.n_scnum = N_UNDEF;
+      native->u.syment.n_value = symbol->value;
+    }
+  else if (symbol->flags & BSF_DEBUGGING)
+    {
+      /* There isn't much point to writing out a debugging symbol
+         unless we are prepared to convert it into COFF debugging
+         format.  So, we just ignore them.  We must clobber the symbol
+         name to keep it from being put in the string table.  */
+      symbol->name = "";
+      return TRUE;
+    }
+  else
+    {
+      native->u.syment.n_scnum = output_section->target_index;
+      native->u.syment.n_value = (symbol->value
+				  + symbol->section->output_offset);
+      if (! obj_pe (abfd))
+	native->u.syment.n_value += output_section->vma;
+
+      /* Copy the any flags from the file header into the symbol.
+         FIXME: Why?  */
+      {
+	coff_symbol_type *c = coff_symbol_from (abfd, symbol);
+	if (c != (coff_symbol_type *) NULL)
+	  native->u.syment.n_flags = bfd_asymbol_bfd (&c->symbol)->flags;
+      }
+    }
+
+  native->u.syment.n_type = 0;
+  if (symbol->flags & BSF_LOCAL)
+    native->u.syment.n_sclass = C_STAT;
+  else if (symbol->flags & BSF_WEAK)
+    native->u.syment.n_sclass = obj_pe (abfd) ? C_NT_WEAK : C_WEAKEXT;
+  else
+    native->u.syment.n_sclass = C_EXT;
+  native->u.syment.n_numaux = 0;
+
+  return coff_write_symbol (abfd, symbol, native, written, string_size_p,
+			    debug_string_section_p, debug_string_size_p);
+}
+
+/* Write a native symbol to a COFF file.  */
+
+static bfd_boolean
+coff_write_native_symbol (bfd *abfd,
+			  coff_symbol_type *symbol,
+			  bfd_vma *written,
+			  bfd_size_type *string_size_p,
+			  asection **debug_string_section_p,
+			  bfd_size_type *debug_string_size_p)
+{
+  combined_entry_type *native = symbol->native;
+  alent *lineno = symbol->lineno;
+
+  /* If this symbol has an associated line number, we must store the
+     symbol index in the line number field.  We also tag the auxent to
+     point to the right place in the lineno table.  */
+  if (lineno && !symbol->done_lineno && symbol->symbol.section->owner != NULL)
+    {
+      unsigned int count = 0;
+
+      lineno[count].u.offset = *written;
+      if (native->u.syment.n_numaux)
+	{
+	  union internal_auxent *a = &((native + 1)->u.auxent);
+
+	  a->x_sym.x_fcnary.x_fcn.x_lnnoptr =
+	    symbol->symbol.section->output_section->moving_line_filepos;
+	}
+
+      /* Count and relocate all other linenumbers.  */
+      count++;
+      while (lineno[count].line_number != 0)
+	{
+	  lineno[count].u.offset +=
+	    (symbol->symbol.section->output_section->vma
+	     + symbol->symbol.section->output_offset);
+	  count++;
+	}
+      symbol->done_lineno = TRUE;
+
+      if (! bfd_is_const_section (symbol->symbol.section->output_section))
+	symbol->symbol.section->output_section->moving_line_filepos +=
+	  count * bfd_coff_linesz (abfd);
+    }
+
+  return coff_write_symbol (abfd, &(symbol->symbol), native, written,
+			    string_size_p, debug_string_section_p,
+			    debug_string_size_p);
+}
+
+static void
+null_error_handler (const char * fmt ATTRIBUTE_UNUSED, ...)
+{
+}
+
+/* Write out the COFF symbols.  */
+
+bfd_boolean
+coff_write_symbols (bfd *abfd)
+{
+  bfd_size_type string_size;
+  asection *debug_string_section;
+  bfd_size_type debug_string_size;
+  unsigned int i;
+  unsigned int limit = bfd_get_symcount (abfd);
+  bfd_vma written = 0;
+  asymbol **p;
+
+  string_size = 0;
+  debug_string_section = NULL;
+  debug_string_size = 0;
+
+  /* If this target supports long section names, they must be put into
+     the string table.  This is supported by PE.  This code must
+     handle section names just as they are handled in
+     coff_write_object_contents.  */
+  if (bfd_coff_long_section_names (abfd))
+    {
+      asection *o;
+
+      for (o = abfd->sections; o != NULL; o = o->next)
+	{
+	  size_t len;
+
+	  len = strlen (o->name);
+	  if (len > SCNNMLEN)
+	    string_size += len + 1;
+	}
+    }
+
+  /* Seek to the right place.  */
+  if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0)
+    return FALSE;
+
+  /* Output all the symbols we have.  */
+  written = 0;
+  for (p = abfd->outsymbols, i = 0; i < limit; i++, p++)
+    {
+      asymbol *symbol = *p;
+      coff_symbol_type *c_symbol = coff_symbol_from (abfd, symbol);
+
+      if (c_symbol == (coff_symbol_type *) NULL
+	  || c_symbol->native == (combined_entry_type *) NULL)
+	{
+	  if (!coff_write_alien_symbol (abfd, symbol, &written, &string_size,
+					&debug_string_section,
+					&debug_string_size))
+	    return FALSE;
+	}
+      else
+	{
+	  if (coff_backend_info (abfd)->_bfd_coff_classify_symbol != NULL)
+	    {
+	      bfd_error_handler_type current_error_handler;
+	      enum coff_symbol_classification sym_class;
+	      unsigned char *n_sclass;
+
+	      /* Suppress error reporting by bfd_coff_classify_symbol.
+		 Error messages can be generated when we are processing a local
+		 symbol which has no associated section and we do not have to
+		 worry about this, all we need to know is that it is local.  */
+	      current_error_handler = bfd_set_error_handler (null_error_handler);
+	      sym_class = bfd_coff_classify_symbol (abfd,
+                                                   &c_symbol->native->u.syment);
+	      (void) bfd_set_error_handler (current_error_handler);
+
+	      n_sclass = &c_symbol->native->u.syment.n_sclass;
+
+	      /* If the symbol class has been changed (eg objcopy/ld script/etc)
+		 we cannot retain the existing sclass from the original symbol.
+		 Weak symbols only have one valid sclass, so just set it always.
+		 If it is not local class and should be, set it C_STAT.
+		 If it is global and not classified as global, or if it is
+		 weak (which is also classified as global), set it C_EXT.  */
+
+	      if (symbol->flags & BSF_WEAK)
+		*n_sclass = obj_pe (abfd) ? C_NT_WEAK : C_WEAKEXT;
+	      else if (symbol->flags & BSF_LOCAL && sym_class != COFF_SYMBOL_LOCAL)
+		*n_sclass = C_STAT;
+	      else if (symbol->flags & BSF_GLOBAL
+		       && (sym_class != COFF_SYMBOL_GLOBAL
+#ifdef COFF_WITH_PE
+			   || *n_sclass == C_NT_WEAK
+#endif
+			   || *n_sclass == C_WEAKEXT))
+		c_symbol->native->u.syment.n_sclass = C_EXT;
+	    }
+
+	  if (!coff_write_native_symbol (abfd, c_symbol, &written,
+					 &string_size, &debug_string_section,
+					 &debug_string_size))
+	    return FALSE;
+	}
+    }
+
+  obj_raw_syment_count (abfd) = written;
+
+  /* Now write out strings.  */
+  if (string_size != 0)
+    {
+      unsigned int size = string_size + STRING_SIZE_SIZE;
+      bfd_byte buffer[STRING_SIZE_SIZE];
+
+#if STRING_SIZE_SIZE == 4
+      H_PUT_32 (abfd, size, buffer);
+#else
+ #error Change H_PUT_32
+#endif
+      if (bfd_bwrite ((void *) buffer, (bfd_size_type) sizeof (buffer), abfd)
+	  != sizeof (buffer))
+	return FALSE;
+
+      /* Handle long section names.  This code must handle section
+	 names just as they are handled in coff_write_object_contents.  */
+      if (bfd_coff_long_section_names (abfd))
+	{
+	  asection *o;
+
+	  for (o = abfd->sections; o != NULL; o = o->next)
+	    {
+	      size_t len;
+
+	      len = strlen (o->name);
+	      if (len > SCNNMLEN)
+		{
+		  if (bfd_bwrite (o->name, (bfd_size_type) (len + 1), abfd)
+		      != len + 1)
+		    return FALSE;
+		}
+	    }
+	}
+
+      for (p = abfd->outsymbols, i = 0;
+	   i < limit;
+	   i++, p++)
+	{
+	  asymbol *q = *p;
+	  size_t name_length = strlen (q->name);
+	  coff_symbol_type *c_symbol = coff_symbol_from (abfd, q);
+	  size_t maxlen;
+
+	  /* Figure out whether the symbol name should go in the string
+	     table.  Symbol names that are short enough are stored
+	     directly in the syment structure.  File names permit a
+	     different, longer, length in the syment structure.  On
+	     XCOFF, some symbol names are stored in the .debug section
+	     rather than in the string table.  */
+
+	  if (c_symbol == NULL
+	      || c_symbol->native == NULL)
+	    /* This is not a COFF symbol, so it certainly is not a
+	       file name, nor does it go in the .debug section.  */
+	    maxlen = bfd_coff_force_symnames_in_strings (abfd) ? 0 : SYMNMLEN;
+
+	  else if (bfd_coff_symname_in_debug (abfd,
+					      &c_symbol->native->u.syment))
+	    /* This symbol name is in the XCOFF .debug section.
+	       Don't write it into the string table.  */
+	    maxlen = name_length;
+
+	  else if (c_symbol->native->u.syment.n_sclass == C_FILE
+		   && c_symbol->native->u.syment.n_numaux > 0)
+	    {
+	      if (bfd_coff_force_symnames_in_strings (abfd))
+		{
+		  if (bfd_bwrite (".file", (bfd_size_type) 6, abfd) != 6)
+		    return FALSE;
+		}
+	      maxlen = bfd_coff_filnmlen (abfd);
+	    }
+	  else
+	    maxlen = bfd_coff_force_symnames_in_strings (abfd) ? 0 : SYMNMLEN;
+
+	  if (name_length > maxlen)
+	    {
+	      if (bfd_bwrite ((void *) (q->name), (bfd_size_type) name_length + 1,
+			     abfd) != name_length + 1)
+		return FALSE;
+	    }
+	}
+    }
+  else
+    {
+      /* We would normally not write anything here, but we'll write
+         out 4 so that any stupid coff reader which tries to read the
+         string table even when there isn't one won't croak.  */
+      unsigned int size = STRING_SIZE_SIZE;
+      bfd_byte buffer[STRING_SIZE_SIZE];
+
+#if STRING_SIZE_SIZE == 4
+      H_PUT_32 (abfd, size, buffer);
+#else
+ #error Change H_PUT_32
+#endif
+      if (bfd_bwrite ((void *) buffer, (bfd_size_type) STRING_SIZE_SIZE, abfd)
+	  != STRING_SIZE_SIZE)
+	return FALSE;
+    }
+
+  /* Make sure the .debug section was created to be the correct size.
+     We should create it ourselves on the fly, but we don't because
+     BFD won't let us write to any section until we know how large all
+     the sections are.  We could still do it by making another pass
+     over the symbols.  FIXME.  */
+  BFD_ASSERT (debug_string_size == 0
+	      || (debug_string_section != (asection *) NULL
+		  && (BFD_ALIGN (debug_string_size,
+				 1 << debug_string_section->alignment_power)
+		      == debug_string_section->size)));
+
+  return TRUE;
+}
+
+bfd_boolean
+coff_write_linenumbers (bfd *abfd)
+{
+  asection *s;
+  bfd_size_type linesz;
+  void * buff;
+
+  linesz = bfd_coff_linesz (abfd);
+  buff = bfd_alloc (abfd, linesz);
+  if (!buff)
+    return FALSE;
+  for (s = abfd->sections; s != (asection *) NULL; s = s->next)
+    {
+      if (s->lineno_count)
+	{
+	  asymbol **q = abfd->outsymbols;
+	  if (bfd_seek (abfd, s->line_filepos, SEEK_SET) != 0)
+	    return FALSE;
+	  /* Find all the linenumbers in this section.  */
+	  while (*q)
+	    {
+	      asymbol *p = *q;
+	      if (p->section->output_section == s)
+		{
+		  alent *l =
+		  BFD_SEND (bfd_asymbol_bfd (p), _get_lineno,
+			    (bfd_asymbol_bfd (p), p));
+		  if (l)
+		    {
+		      /* Found a linenumber entry, output.  */
+		      struct internal_lineno out;
+		      memset ((void *) & out, 0, sizeof (out));
+		      out.l_lnno = 0;
+		      out.l_addr.l_symndx = l->u.offset;
+		      bfd_coff_swap_lineno_out (abfd, &out, buff);
+		      if (bfd_bwrite (buff, (bfd_size_type) linesz, abfd)
+			  != linesz)
+			return FALSE;
+		      l++;
+		      while (l->line_number)
+			{
+			  out.l_lnno = l->line_number;
+			  out.l_addr.l_symndx = l->u.offset;
+			  bfd_coff_swap_lineno_out (abfd, &out, buff);
+			  if (bfd_bwrite (buff, (bfd_size_type) linesz, abfd)
+			      != linesz)
+			    return FALSE;
+			  l++;
+			}
+		    }
+		}
+	      q++;
+	    }
+	}
+    }
+  bfd_release (abfd, buff);
+  return TRUE;
+}
+
+alent *
+coff_get_lineno (bfd *ignore_abfd ATTRIBUTE_UNUSED, asymbol *symbol)
+{
+  return coffsymbol (symbol)->lineno;
+}
+
+/* This function transforms the offsets into the symbol table into
+   pointers to syments.  */
+
+static void
+coff_pointerize_aux (bfd *abfd,
+		     combined_entry_type *table_base,
+		     combined_entry_type *symbol,
+		     unsigned int indaux,
+		     combined_entry_type *auxent)
+{
+  unsigned int type = symbol->u.syment.n_type;
+  unsigned int n_sclass = symbol->u.syment.n_sclass;
+
+  if (coff_backend_info (abfd)->_bfd_coff_pointerize_aux_hook)
+    {
+      if ((*coff_backend_info (abfd)->_bfd_coff_pointerize_aux_hook)
+	  (abfd, table_base, symbol, indaux, auxent))
+	return;
+    }
+
+  /* Don't bother if this is a file or a section.  */
+  if (n_sclass == C_STAT && type == T_NULL)
+    return;
+  if (n_sclass == C_FILE)
+    return;
+
+  /* Otherwise patch up.  */
+#define N_TMASK coff_data  (abfd)->local_n_tmask
+#define N_BTSHFT coff_data (abfd)->local_n_btshft
+  
+  if ((ISFCN (type) || ISTAG (n_sclass) || n_sclass == C_BLOCK
+       || n_sclass == C_FCN)
+      && auxent->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.l > 0)
+    {
+      auxent->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.p =
+	table_base + auxent->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.l;
+      auxent->fix_end = 1;
+    }
+  /* A negative tagndx is meaningless, but the SCO 3.2v4 cc can
+     generate one, so we must be careful to ignore it.  */
+  if (auxent->u.auxent.x_sym.x_tagndx.l > 0)
+    {
+      auxent->u.auxent.x_sym.x_tagndx.p =
+	table_base + auxent->u.auxent.x_sym.x_tagndx.l;
+      auxent->fix_tag = 1;
+    }
+}
+
+/* Allocate space for the ".debug" section, and read it.
+   We did not read the debug section until now, because
+   we didn't want to go to the trouble until someone needed it.  */
+
+static char *
+build_debug_section (bfd *abfd)
+{
+  char *debug_section;
+  file_ptr position;
+  bfd_size_type sec_size;
+
+  asection *sect = bfd_get_section_by_name (abfd, ".debug");
+
+  if (!sect)
+    {
+      bfd_set_error (bfd_error_no_debug_section);
+      return NULL;
+    }
+
+  sec_size = sect->size;
+  debug_section = (char *) bfd_alloc (abfd, sec_size);
+  if (debug_section == NULL)
+    return NULL;
+
+  /* Seek to the beginning of the `.debug' section and read it.
+     Save the current position first; it is needed by our caller.
+     Then read debug section and reset the file pointer.  */
+
+  position = bfd_tell (abfd);
+  if (bfd_seek (abfd, sect->filepos, SEEK_SET) != 0
+      || bfd_bread (debug_section, sec_size, abfd) != sec_size
+      || bfd_seek (abfd, position, SEEK_SET) != 0)
+    return NULL;
+  return debug_section;
+}
+
+/* Return a pointer to a malloc'd copy of 'name'.  'name' may not be
+   \0-terminated, but will not exceed 'maxlen' characters.  The copy *will*
+   be \0-terminated.  */
+
+static char *
+copy_name (bfd *abfd, char *name, size_t maxlen)
+{
+  size_t len;
+  char *newname;
+
+  for (len = 0; len < maxlen; ++len)
+    if (name[len] == '\0')
+      break;
+
+  if ((newname = (char *) bfd_alloc (abfd, (bfd_size_type) len + 1)) == NULL)
+    return NULL;
+
+  strncpy (newname, name, len);
+  newname[len] = '\0';
+  return newname;
+}
+
+/* Read in the external symbols.  */
+
+bfd_boolean
+_bfd_coff_get_external_symbols (bfd *abfd)
+{
+  bfd_size_type symesz;
+  bfd_size_type size;
+  void * syms;
+
+  if (obj_coff_external_syms (abfd) != NULL)
+    return TRUE;
+
+  symesz = bfd_coff_symesz (abfd);
+
+  size = obj_raw_syment_count (abfd) * symesz;
+  if (size == 0)
+    return TRUE;
+
+  syms = bfd_malloc (size);
+  if (syms == NULL)
+    return FALSE;
+
+  if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0
+      || bfd_bread (syms, size, abfd) != size)
+    {
+      if (syms != NULL)
+	free (syms);
+      return FALSE;
+    }
+
+  obj_coff_external_syms (abfd) = syms;
+
+  return TRUE;
+}
+
+/* Read in the external strings.  The strings are not loaded until
+   they are needed.  This is because we have no simple way of
+   detecting a missing string table in an archive.  */
+
+const char *
+_bfd_coff_read_string_table (bfd *abfd)
+{
+  char extstrsize[STRING_SIZE_SIZE];
+  bfd_size_type strsize;
+  char *strings;
+  file_ptr pos;
+
+  if (obj_coff_strings (abfd) != NULL)
+    return obj_coff_strings (abfd);
+
+  if (obj_sym_filepos (abfd) == 0)
+    {
+      bfd_set_error (bfd_error_no_symbols);
+      return NULL;
+    }
+
+  pos = obj_sym_filepos (abfd);
+  pos += obj_raw_syment_count (abfd) * bfd_coff_symesz (abfd);
+  if (bfd_seek (abfd, pos, SEEK_SET) != 0)
+    return NULL;
+
+  if (bfd_bread (extstrsize, (bfd_size_type) sizeof extstrsize, abfd)
+      != sizeof extstrsize)
+    {
+      if (bfd_get_error () != bfd_error_file_truncated)
+	return NULL;
+
+      /* There is no string table.  */
+      strsize = STRING_SIZE_SIZE;
+    }
+  else
+    {
+#if STRING_SIZE_SIZE == 4
+      strsize = H_GET_32 (abfd, extstrsize);
+#else
+ #error Change H_GET_32
+#endif
+    }
+
+  if (strsize < STRING_SIZE_SIZE)
+    {
+      (*_bfd_error_handler)
+	(_("%B: bad string table size %lu"), abfd, (unsigned long) strsize);
+      bfd_set_error (bfd_error_bad_value);
+      return NULL;
+    }
+
+  strings = (char *) bfd_malloc (strsize);
+  if (strings == NULL)
+    return NULL;
+
+  if (bfd_bread (strings + STRING_SIZE_SIZE, strsize - STRING_SIZE_SIZE, abfd)
+      != strsize - STRING_SIZE_SIZE)
+    {
+      free (strings);
+      return NULL;
+    }
+
+  obj_coff_strings (abfd) = strings;
+
+  return strings;
+}
+
+/* Free up the external symbols and strings read from a COFF file.  */
+
+bfd_boolean
+_bfd_coff_free_symbols (bfd *abfd)
+{
+  if (obj_coff_external_syms (abfd) != NULL
+      && ! obj_coff_keep_syms (abfd))
+    {
+      free (obj_coff_external_syms (abfd));
+      obj_coff_external_syms (abfd) = NULL;
+    }
+  if (obj_coff_strings (abfd) != NULL
+      && ! obj_coff_keep_strings (abfd))
+    {
+      free (obj_coff_strings (abfd));
+      obj_coff_strings (abfd) = NULL;
+    }
+  return TRUE;
+}
+
+/* Read a symbol table into freshly bfd_allocated memory, swap it, and
+   knit the symbol names into a normalized form.  By normalized here I
+   mean that all symbols have an n_offset pointer that points to a null-
+   terminated string.  */
+
+combined_entry_type *
+coff_get_normalized_symtab (bfd *abfd)
+{
+  combined_entry_type *internal;
+  combined_entry_type *internal_ptr;
+  combined_entry_type *symbol_ptr;
+  combined_entry_type *internal_end;
+  size_t symesz;
+  char *raw_src;
+  char *raw_end;
+  const char *string_table = NULL;
+  char *debug_section = NULL;
+  bfd_size_type size;
+
+  if (obj_raw_syments (abfd) != NULL)
+    return obj_raw_syments (abfd);
+
+  size = obj_raw_syment_count (abfd) * sizeof (combined_entry_type);
+  internal = (combined_entry_type *) bfd_zalloc (abfd, size);
+  if (internal == NULL && size != 0)
+    return NULL;
+  internal_end = internal + obj_raw_syment_count (abfd);
+
+  if (! _bfd_coff_get_external_symbols (abfd))
+    return NULL;
+
+  raw_src = (char *) obj_coff_external_syms (abfd);
+
+  /* Mark the end of the symbols.  */
+  symesz = bfd_coff_symesz (abfd);
+  raw_end = (char *) raw_src + obj_raw_syment_count (abfd) * symesz;
+
+  /* FIXME SOMEDAY.  A string table size of zero is very weird, but
+     probably possible.  If one shows up, it will probably kill us.  */
+
+  /* Swap all the raw entries.  */
+  for (internal_ptr = internal;
+       raw_src < raw_end;
+       raw_src += symesz, internal_ptr++)
+    {
+
+      unsigned int i;
+      bfd_coff_swap_sym_in (abfd, (void *) raw_src,
+			    (void *) & internal_ptr->u.syment);
+      symbol_ptr = internal_ptr;
+
+      for (i = 0;
+	   i < symbol_ptr->u.syment.n_numaux;
+	   i++)
+	{
+	  internal_ptr++;
+	  raw_src += symesz;
+	  bfd_coff_swap_aux_in (abfd, (void *) raw_src,
+				symbol_ptr->u.syment.n_type,
+				symbol_ptr->u.syment.n_sclass,
+				(int) i, symbol_ptr->u.syment.n_numaux,
+				&(internal_ptr->u.auxent));
+	  coff_pointerize_aux (abfd, internal, symbol_ptr, i,
+			       internal_ptr);
+	}
+    }
+
+  /* Free the raw symbols, but not the strings (if we have them).  */
+  obj_coff_keep_strings (abfd) = TRUE;
+  if (! _bfd_coff_free_symbols (abfd))
+    return NULL;
+
+  for (internal_ptr = internal; internal_ptr < internal_end;
+       internal_ptr++)
+    {
+      if (internal_ptr->u.syment.n_sclass == C_FILE
+	  && internal_ptr->u.syment.n_numaux > 0)
+	{
+	  /* Make a file symbol point to the name in the auxent, since
+	     the text ".file" is redundant.  */
+	  if ((internal_ptr + 1)->u.auxent.x_file.x_n.x_zeroes == 0)
+	    {
+	      /* The filename is a long one, point into the string table.  */
+	      if (string_table == NULL)
+		{
+		  string_table = _bfd_coff_read_string_table (abfd);
+		  if (string_table == NULL)
+		    return NULL;
+		}
+
+	      internal_ptr->u.syment._n._n_n._n_offset =
+		((bfd_hostptr_t)
+		 (string_table
+		  + (internal_ptr + 1)->u.auxent.x_file.x_n.x_offset));
+	    }
+	  else
+	    {
+	      /* Ordinary short filename, put into memory anyway.  The
+                 Microsoft PE tools sometimes store a filename in
+                 multiple AUX entries.  */
+	      if (internal_ptr->u.syment.n_numaux > 1
+		  && coff_data (abfd)->pe)
+		internal_ptr->u.syment._n._n_n._n_offset =
+		  ((bfd_hostptr_t)
+		   copy_name (abfd,
+			      (internal_ptr + 1)->u.auxent.x_file.x_fname,
+			      internal_ptr->u.syment.n_numaux * symesz));
+	      else
+		internal_ptr->u.syment._n._n_n._n_offset =
+		  ((bfd_hostptr_t)
+		   copy_name (abfd,
+			      (internal_ptr + 1)->u.auxent.x_file.x_fname,
+			      (size_t) bfd_coff_filnmlen (abfd)));
+	    }
+	}
+      else
+	{
+	  if (internal_ptr->u.syment._n._n_n._n_zeroes != 0)
+	    {
+	      /* This is a "short" name.  Make it long.  */
+	      size_t i;
+	      char *newstring;
+
+	      /* Find the length of this string without walking into memory
+	         that isn't ours.  */
+	      for (i = 0; i < 8; ++i)
+		if (internal_ptr->u.syment._n._n_name[i] == '\0')
+		  break;
+
+	      newstring = (char *) bfd_zalloc (abfd, (bfd_size_type) (i + 1));
+	      if (newstring == NULL)
+		return NULL;
+	      strncpy (newstring, internal_ptr->u.syment._n._n_name, i);
+	      internal_ptr->u.syment._n._n_n._n_offset = (bfd_hostptr_t) newstring;
+	      internal_ptr->u.syment._n._n_n._n_zeroes = 0;
+	    }
+	  else if (internal_ptr->u.syment._n._n_n._n_offset == 0)
+	    internal_ptr->u.syment._n._n_n._n_offset = (bfd_hostptr_t) "";
+	  else if (!bfd_coff_symname_in_debug (abfd, &internal_ptr->u.syment))
+	    {
+	      /* Long name already.  Point symbol at the string in the
+                 table.  */
+	      if (string_table == NULL)
+		{
+		  string_table = _bfd_coff_read_string_table (abfd);
+		  if (string_table == NULL)
+		    return NULL;
+		}
+	      internal_ptr->u.syment._n._n_n._n_offset =
+		((bfd_hostptr_t)
+		 (string_table
+		  + internal_ptr->u.syment._n._n_n._n_offset));
+	    }
+	  else
+	    {
+	      /* Long name in debug section.  Very similar.  */
+	      if (debug_section == NULL)
+		debug_section = build_debug_section (abfd);
+	      internal_ptr->u.syment._n._n_n._n_offset = (bfd_hostptr_t)
+		(debug_section + internal_ptr->u.syment._n._n_n._n_offset);
+	    }
+	}
+      internal_ptr += internal_ptr->u.syment.n_numaux;
+    }
+
+  obj_raw_syments (abfd) = internal;
+  BFD_ASSERT (obj_raw_syment_count (abfd)
+	      == (unsigned int) (internal_ptr - internal));
+
+  return internal;
+}
+
+long
+coff_get_reloc_upper_bound (bfd *abfd, sec_ptr asect)
+{
+  if (bfd_get_format (abfd) != bfd_object)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return -1;
+    }
+  return (asect->reloc_count + 1) * sizeof (arelent *);
+}
+
+asymbol *
+coff_make_empty_symbol (bfd *abfd)
+{
+  bfd_size_type amt = sizeof (coff_symbol_type);
+  coff_symbol_type *new_symbol = (coff_symbol_type *) bfd_zalloc (abfd, amt);
+
+  if (new_symbol == NULL)
+    return NULL;
+  new_symbol->symbol.section = 0;
+  new_symbol->native = 0;
+  new_symbol->lineno = NULL;
+  new_symbol->done_lineno = FALSE;
+  new_symbol->symbol.the_bfd = abfd;
+
+  return & new_symbol->symbol;
+}
+
+/* Make a debugging symbol.  */
+
+asymbol *
+coff_bfd_make_debug_symbol (bfd *abfd,
+			    void * ptr ATTRIBUTE_UNUSED,
+			    unsigned long sz ATTRIBUTE_UNUSED)
+{
+  bfd_size_type amt = sizeof (coff_symbol_type);
+  coff_symbol_type *new_symbol = (coff_symbol_type *) bfd_alloc (abfd, amt);
+
+  if (new_symbol == NULL)
+    return NULL;
+  /* @@ The 10 is a guess at a plausible maximum number of aux entries
+     (but shouldn't be a constant).  */
+  amt = sizeof (combined_entry_type) * 10;
+  new_symbol->native = (combined_entry_type *) bfd_zalloc (abfd, amt);
+  if (!new_symbol->native)
+    return NULL;
+  new_symbol->symbol.section = bfd_abs_section_ptr;
+  new_symbol->symbol.flags = BSF_DEBUGGING;
+  new_symbol->lineno = NULL;
+  new_symbol->done_lineno = FALSE;
+  new_symbol->symbol.the_bfd = abfd;
+  
+  return & new_symbol->symbol;
+}
+
+void
+coff_get_symbol_info (bfd *abfd, asymbol *symbol, symbol_info *ret)
+{
+  bfd_symbol_info (symbol, ret);
+
+  if (coffsymbol (symbol)->native != NULL
+      && coffsymbol (symbol)->native->fix_value)
+    ret->value = coffsymbol (symbol)->native->u.syment.n_value -
+      (bfd_hostptr_t) obj_raw_syments (abfd);
+}
+
+/* Return the COFF syment for a symbol.  */
+
+bfd_boolean
+bfd_coff_get_syment (bfd *abfd,
+		     asymbol *symbol,
+		     struct internal_syment *psyment)
+{
+  coff_symbol_type *csym;
+
+  csym = coff_symbol_from (abfd, symbol);
+  if (csym == NULL || csym->native == NULL)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  *psyment = csym->native->u.syment;
+
+  if (csym->native->fix_value)
+    psyment->n_value = psyment->n_value -
+      (bfd_hostptr_t) obj_raw_syments (abfd);
+
+  /* FIXME: We should handle fix_line here.  */
+
+  return TRUE;
+}
+
+/* Return the COFF auxent for a symbol.  */
+
+bfd_boolean
+bfd_coff_get_auxent (bfd *abfd,
+		     asymbol *symbol,
+		     int indx,
+		     union internal_auxent *pauxent)
+{
+  coff_symbol_type *csym;
+  combined_entry_type *ent;
+
+  csym = coff_symbol_from (abfd, symbol);
+
+  if (csym == NULL
+      || csym->native == NULL
+      || indx >= csym->native->u.syment.n_numaux)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  ent = csym->native + indx + 1;
+
+  *pauxent = ent->u.auxent;
+
+  if (ent->fix_tag)
+    pauxent->x_sym.x_tagndx.l =
+      ((combined_entry_type *) pauxent->x_sym.x_tagndx.p
+       - obj_raw_syments (abfd));
+
+  if (ent->fix_end)
+    pauxent->x_sym.x_fcnary.x_fcn.x_endndx.l =
+      ((combined_entry_type *) pauxent->x_sym.x_fcnary.x_fcn.x_endndx.p
+       - obj_raw_syments (abfd));
+
+  if (ent->fix_scnlen)
+    pauxent->x_csect.x_scnlen.l =
+      ((combined_entry_type *) pauxent->x_csect.x_scnlen.p
+       - obj_raw_syments (abfd));
+
+  return TRUE;
+}
+
+/* Print out information about COFF symbol.  */
+
+void
+coff_print_symbol (bfd *abfd,
+		   void * filep,
+		   asymbol *symbol,
+		   bfd_print_symbol_type how)
+{
+  FILE * file = (FILE *) filep;
+
+  switch (how)
+    {
+    case bfd_print_symbol_name:
+      fprintf (file, "%s", symbol->name);
+      break;
+
+    case bfd_print_symbol_more:
+      fprintf (file, "coff %s %s",
+	       coffsymbol (symbol)->native ? "n" : "g",
+	       coffsymbol (symbol)->lineno ? "l" : " ");
+      break;
+
+    case bfd_print_symbol_all:
+      if (coffsymbol (symbol)->native)
+	{
+	  bfd_vma val;
+	  unsigned int aux;
+	  combined_entry_type *combined = coffsymbol (symbol)->native;
+	  combined_entry_type *root = obj_raw_syments (abfd);
+	  struct lineno_cache_entry *l = coffsymbol (symbol)->lineno;
+
+	  fprintf (file, "[%3ld]", (long) (combined - root));
+
+	  if (! combined->fix_value)
+	    val = (bfd_vma) combined->u.syment.n_value;
+	  else
+	    val = combined->u.syment.n_value - (bfd_hostptr_t) root;
+
+	  fprintf (file, "(sec %2d)(fl 0x%02x)(ty %3x)(scl %3d) (nx %d) 0x",
+		   combined->u.syment.n_scnum,
+		   combined->u.syment.n_flags,
+		   combined->u.syment.n_type,
+		   combined->u.syment.n_sclass,
+		   combined->u.syment.n_numaux);
+	  bfd_fprintf_vma (abfd, file, val);
+	  fprintf (file, " %s", symbol->name);
+
+	  for (aux = 0; aux < combined->u.syment.n_numaux; aux++)
+	    {
+	      combined_entry_type *auxp = combined + aux + 1;
+	      long tagndx;
+
+	      if (auxp->fix_tag)
+		tagndx = auxp->u.auxent.x_sym.x_tagndx.p - root;
+	      else
+		tagndx = auxp->u.auxent.x_sym.x_tagndx.l;
+
+	      fprintf (file, "\n");
+
+	      if (bfd_coff_print_aux (abfd, file, root, combined, auxp, aux))
+		continue;
+
+	      switch (combined->u.syment.n_sclass)
+		{
+		case C_FILE:
+		  fprintf (file, "File ");
+		  break;
+
+		case C_STAT:
+		  if (combined->u.syment.n_type == T_NULL)
+		    /* Probably a section symbol ?  */
+		    {
+		      fprintf (file, "AUX scnlen 0x%lx nreloc %d nlnno %d",
+			       (unsigned long) auxp->u.auxent.x_scn.x_scnlen,
+			       auxp->u.auxent.x_scn.x_nreloc,
+			       auxp->u.auxent.x_scn.x_nlinno);
+		      if (auxp->u.auxent.x_scn.x_checksum != 0
+			  || auxp->u.auxent.x_scn.x_associated != 0
+			  || auxp->u.auxent.x_scn.x_comdat != 0)
+			fprintf (file, " checksum 0x%lx assoc %d comdat %d",
+				 auxp->u.auxent.x_scn.x_checksum,
+				 auxp->u.auxent.x_scn.x_associated,
+				 auxp->u.auxent.x_scn.x_comdat);
+		      break;
+		    }
+		    /* Otherwise fall through.  */
+		case C_EXT:
+		case C_AIX_WEAKEXT:
+		  if (ISFCN (combined->u.syment.n_type))
+		    {
+		      long next, llnos;
+
+		      if (auxp->fix_end)
+			next = (auxp->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.p
+			       - root);
+		      else
+			next = auxp->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.l;
+		      llnos = auxp->u.auxent.x_sym.x_fcnary.x_fcn.x_lnnoptr;
+		      fprintf (file,
+			       "AUX tagndx %ld ttlsiz 0x%lx lnnos %ld next %ld",
+			       tagndx,
+			       (unsigned long) auxp->u.auxent.x_sym.x_misc.x_fsize,
+			       llnos, next);
+		      break;
+		    }
+		  /* Otherwise fall through.  */
+		default:
+		  fprintf (file, "AUX lnno %d size 0x%x tagndx %ld",
+			   auxp->u.auxent.x_sym.x_misc.x_lnsz.x_lnno,
+			   auxp->u.auxent.x_sym.x_misc.x_lnsz.x_size,
+			   tagndx);
+		  if (auxp->fix_end)
+		    fprintf (file, " endndx %ld",
+			     ((long)
+			      (auxp->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.p
+			       - root)));
+		  break;
+		}
+	    }
+
+	  if (l)
+	    {
+	      fprintf (file, "\n%s :", l->u.sym->name);
+	      l++;
+	      while (l->line_number)
+		{
+		  fprintf (file, "\n%4d : ", l->line_number);
+		  bfd_fprintf_vma (abfd, file, l->u.offset + symbol->section->vma);
+		  l++;
+		}
+	    }
+	}
+      else
+	{
+	  bfd_print_symbol_vandf (abfd, (void *) file, symbol);
+	  fprintf (file, " %-5s %s %s %s",
+		   symbol->section->name,
+		   coffsymbol (symbol)->native ? "n" : "g",
+		   coffsymbol (symbol)->lineno ? "l" : " ",
+		   symbol->name);
+	}
+    }
+}
+
+/* Return whether a symbol name implies a local symbol.  In COFF,
+   local symbols generally start with ``.L''.  Most targets use this
+   function for the is_local_label_name entry point, but some may
+   override it.  */
+
+bfd_boolean
+_bfd_coff_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED,
+			       const char *name)
+{
+  return name[0] == '.' && name[1] == 'L';
+}
+
+/* Provided a BFD, a section and an offset (in bytes, not octets) into the
+   section, calculate and return the name of the source file and the line
+   nearest to the wanted location.  */
+
+bfd_boolean
+coff_find_nearest_line (bfd *abfd,
+			asection *section,
+			asymbol **symbols,
+			bfd_vma offset,
+			const char **filename_ptr,
+			const char **functionname_ptr,
+			unsigned int *line_ptr)
+{
+  bfd_boolean found;
+  unsigned int i;
+  unsigned int line_base;
+  coff_data_type *cof = coff_data (abfd);
+  /* Run through the raw syments if available.  */
+  combined_entry_type *p;
+  combined_entry_type *pend;
+  alent *l;
+  struct coff_section_tdata *sec_data;
+  bfd_size_type amt;
+
+  /* Before looking through the symbol table, try to use a .stab
+     section to find the information.  */
+  if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset,
+					     &found, filename_ptr,
+					     functionname_ptr, line_ptr,
+					     &coff_data(abfd)->line_info))
+    return FALSE;
+
+  if (found)
+    return TRUE;
+
+  /* Also try examining DWARF2 debugging information.  */
+  if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
+				     filename_ptr, functionname_ptr,
+				     line_ptr, 0,
+				     &coff_data(abfd)->dwarf2_find_line_info))
+    return TRUE;
+
+  *filename_ptr = 0;
+  *functionname_ptr = 0;
+  *line_ptr = 0;
+
+  /* Don't try and find line numbers in a non coff file.  */
+  if (!bfd_family_coff (abfd))
+    return FALSE;
+
+  if (cof == NULL)
+    return FALSE;
+
+  /* Find the first C_FILE symbol.  */
+  p = cof->raw_syments;
+  if (!p)
+    return FALSE;
+
+  pend = p + cof->raw_syment_count;
+  while (p < pend)
+    {
+      if (p->u.syment.n_sclass == C_FILE)
+	break;
+      p += 1 + p->u.syment.n_numaux;
+    }
+
+  if (p < pend)
+    {
+      bfd_vma sec_vma;
+      bfd_vma maxdiff;
+
+      /* Look through the C_FILE symbols to find the best one.  */
+      sec_vma = bfd_get_section_vma (abfd, section);
+      *filename_ptr = (char *) p->u.syment._n._n_n._n_offset;
+      maxdiff = (bfd_vma) 0 - (bfd_vma) 1;
+      while (1)
+	{
+	  bfd_vma file_addr;
+	  combined_entry_type *p2;
+
+	  for (p2 = p + 1 + p->u.syment.n_numaux;
+	       p2 < pend;
+	       p2 += 1 + p2->u.syment.n_numaux)
+	    {
+	      if (p2->u.syment.n_scnum > 0
+		  && (section
+		      == coff_section_from_bfd_index (abfd,
+						      p2->u.syment.n_scnum)))
+		break;
+	      if (p2->u.syment.n_sclass == C_FILE)
+		{
+		  p2 = pend;
+		  break;
+		}
+	    }
+
+	  file_addr = (bfd_vma) p2->u.syment.n_value;
+	  /* PR 11512: Include the section address of the function name symbol.  */
+	  if (p2->u.syment.n_scnum > 0)
+	    file_addr += coff_section_from_bfd_index (abfd,
+						      p2->u.syment.n_scnum)->vma;
+	  /* We use <= MAXDIFF here so that if we get a zero length
+             file, we actually use the next file entry.  */
+	  if (p2 < pend
+	      && offset + sec_vma >= file_addr
+	      && offset + sec_vma - file_addr <= maxdiff)
+	    {
+	      *filename_ptr = (char *) p->u.syment._n._n_n._n_offset;
+	      maxdiff = offset + sec_vma - p2->u.syment.n_value;
+	    }
+
+	  /* Avoid endless loops on erroneous files by ensuring that
+	     we always move forward in the file.  */
+	  if (p >= cof->raw_syments + p->u.syment.n_value)
+	    break;
+
+	  p = cof->raw_syments + p->u.syment.n_value;
+	  if (p > pend || p->u.syment.n_sclass != C_FILE)
+	    break;
+	}
+    }
+
+  /* Now wander though the raw linenumbers of the section.  */
+  /* If we have been called on this section before, and the offset we
+     want is further down then we can prime the lookup loop.  */
+  sec_data = coff_section_data (abfd, section);
+  if (sec_data != NULL
+      && sec_data->i > 0
+      && offset >= sec_data->offset)
+    {
+      i = sec_data->i;
+      *functionname_ptr = sec_data->function;
+      line_base = sec_data->line_base;
+    }
+  else
+    {
+      i = 0;
+      line_base = 0;
+    }
+
+  if (section->lineno != NULL)
+    {
+      bfd_vma last_value = 0;
+
+      l = &section->lineno[i];
+
+      for (; i < section->lineno_count; i++)
+	{
+	  if (l->line_number == 0)
+	    {
+	      /* Get the symbol this line number points at.  */
+	      coff_symbol_type *coff = (coff_symbol_type *) (l->u.sym);
+	      if (coff->symbol.value > offset)
+		break;
+	      *functionname_ptr = coff->symbol.name;
+	      last_value = coff->symbol.value;
+	      if (coff->native)
+		{
+		  combined_entry_type *s = coff->native;
+		  s = s + 1 + s->u.syment.n_numaux;
+
+		  /* In XCOFF a debugging symbol can follow the
+		     function symbol.  */
+		  if (s->u.syment.n_scnum == N_DEBUG)
+		    s = s + 1 + s->u.syment.n_numaux;
+
+		  /* S should now point to the .bf of the function.  */
+		  if (s->u.syment.n_numaux)
+		    {
+		      /* The linenumber is stored in the auxent.  */
+		      union internal_auxent *a = &((s + 1)->u.auxent);
+		      line_base = a->x_sym.x_misc.x_lnsz.x_lnno;
+		      *line_ptr = line_base;
+		    }
+		}
+	    }
+	  else
+	    {
+	      if (l->u.offset > offset)
+		break;
+	      *line_ptr = l->line_number + line_base - 1;
+	    }
+	  l++;
+	}
+
+      /* If we fell off the end of the loop, then assume that this
+	 symbol has no line number info.  Otherwise, symbols with no
+	 line number info get reported with the line number of the
+	 last line of the last symbol which does have line number
+	 info.  We use 0x100 as a slop to account for cases where the
+	 last line has executable code.  */
+      if (i >= section->lineno_count
+	  && last_value != 0
+	  && offset - last_value > 0x100)
+	{
+	  *functionname_ptr = NULL;
+	  *line_ptr = 0;
+	}
+    }
+
+  /* Cache the results for the next call.  */
+  if (sec_data == NULL && section->owner == abfd)
+    {
+      amt = sizeof (struct coff_section_tdata);
+      section->used_by_bfd = bfd_zalloc (abfd, amt);
+      sec_data = (struct coff_section_tdata *) section->used_by_bfd;
+    }
+  if (sec_data != NULL)
+    {
+      sec_data->offset = offset;
+      sec_data->i = i - 1;
+      sec_data->function = *functionname_ptr;
+      sec_data->line_base = line_base;
+    }
+
+  return TRUE;
+}
+
+bfd_boolean
+coff_find_inliner_info (bfd *abfd,
+			const char **filename_ptr,
+			const char **functionname_ptr,
+			unsigned int *line_ptr)
+{
+  bfd_boolean found;
+
+  found = _bfd_dwarf2_find_inliner_info (abfd, filename_ptr,
+					 functionname_ptr, line_ptr,
+					 &coff_data(abfd)->dwarf2_find_line_info);
+  return (found);
+}
+
+int
+coff_sizeof_headers (bfd *abfd, struct bfd_link_info *info)
+{
+  size_t size;
+
+  if (!info->relocatable)
+    size = bfd_coff_filhsz (abfd) + bfd_coff_aoutsz (abfd);
+  else
+    size = bfd_coff_filhsz (abfd);
+
+  size += abfd->section_count * bfd_coff_scnhsz (abfd);
+  return size;
+}
+
+/* Change the class of a coff symbol held by BFD.  */
+
+bfd_boolean
+bfd_coff_set_symbol_class (bfd *         abfd,
+			   asymbol *     symbol,
+			   unsigned int  symbol_class)
+{
+  coff_symbol_type * csym;
+
+  csym = coff_symbol_from (abfd, symbol);
+  if (csym == NULL)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+  else if (csym->native == NULL)
+    {
+      /* This is an alien symbol which no native coff backend data.
+	 We cheat here by creating a fake native entry for it and
+	 then filling in the class.  This code is based on that in
+	 coff_write_alien_symbol().  */
+
+      combined_entry_type * native;
+      bfd_size_type amt = sizeof (* native);
+
+      native = (combined_entry_type *) bfd_zalloc (abfd, amt);
+      if (native == NULL)
+	return FALSE;
+
+      native->u.syment.n_type   = T_NULL;
+      native->u.syment.n_sclass = symbol_class;
+
+      if (bfd_is_und_section (symbol->section))
+	{
+	  native->u.syment.n_scnum = N_UNDEF;
+	  native->u.syment.n_value = symbol->value;
+	}
+      else if (bfd_is_com_section (symbol->section))
+	{
+	  native->u.syment.n_scnum = N_UNDEF;
+	  native->u.syment.n_value = symbol->value;
+	}
+      else
+	{
+	  native->u.syment.n_scnum =
+	    symbol->section->output_section->target_index;
+	  native->u.syment.n_value = (symbol->value
+				      + symbol->section->output_offset);
+	  if (! obj_pe (abfd))
+	    native->u.syment.n_value += symbol->section->output_section->vma;
+
+	  /* Copy the any flags from the file header into the symbol.
+	     FIXME: Why?  */
+	  native->u.syment.n_flags = bfd_asymbol_bfd (& csym->symbol)->flags;
+	}
+
+      csym->native = native;
+    }
+  else
+    csym->native->u.syment.n_sclass = symbol_class;
+
+  return TRUE;
+}
+
+struct coff_comdat_info *
+bfd_coff_get_comdat_section (bfd *abfd, struct bfd_section *sec)
+{
+  if (bfd_get_flavour (abfd) == bfd_target_coff_flavour
+      && coff_section_data (abfd, sec) != NULL)
+    return coff_section_data (abfd, sec)->comdat;
+  else
+    return NULL;
+}
+
+bfd_boolean
+_bfd_coff_section_already_linked (bfd *abfd,
+				  asection *sec,
+				  struct bfd_link_info *info)
+{
+  flagword flags;
+  const char *name, *key;
+  struct bfd_section_already_linked *l;
+  struct bfd_section_already_linked_hash_entry *already_linked_list;
+  struct coff_comdat_info *s_comdat;
+
+  flags = sec->flags;
+  if ((flags & SEC_LINK_ONCE) == 0)
+    return FALSE;
+
+  /* The COFF backend linker doesn't support group sections.  */
+  if ((flags & SEC_GROUP) != 0)
+    return FALSE;
+
+  name = bfd_get_section_name (abfd, sec);
+  s_comdat = bfd_coff_get_comdat_section (abfd, sec);
+
+  if (s_comdat != NULL)
+    key = s_comdat->name;
+  else
+    {
+      if (CONST_STRNEQ (name, ".gnu.linkonce.")
+	  && (key = strchr (name + sizeof (".gnu.linkonce.") - 1, '.')) != NULL)
+	key++;
+      else
+	/* FIXME: gcc as of 2011-09 emits sections like .text$<key>,
+	   .xdata$<key> and .pdata$<key> only the first of which has a
+	   comdat key.  Should these all match the LTO IR key?  */
+	key = name;
+    }
+
+  already_linked_list = bfd_section_already_linked_table_lookup (key);
+
+  for (l = already_linked_list->entry; l != NULL; l = l->next)
+    {
+      struct coff_comdat_info *l_comdat;
+
+      l_comdat = bfd_coff_get_comdat_section (l->sec->owner, l->sec);
+
+      /* The section names must match, and both sections must be
+	 comdat and have the same comdat name, or both sections must
+	 be non-comdat.  LTO IR plugin sections are an exception.  They
+	 are always named .gnu.linkonce.t.<key> (<key> is some string)
+	 and match any comdat section with comdat name of <key>, and
+	 any linkonce section with the same suffix, ie.
+	 .gnu.linkonce.*.<key>.  */
+      if (((s_comdat != NULL) == (l_comdat != NULL)
+	   && strcmp (name, l->sec->name) == 0)
+	  || (l->sec->owner->flags & BFD_PLUGIN) != 0)
+	{
+	  /* The section has already been linked.  See if we should
+	     issue a warning.  */
+	  return _bfd_handle_already_linked (sec, l, info);
+	}
+    }
+
+  /* This is the first section with this name.  Record it.  */
+  if (!bfd_section_already_linked_table_insert (already_linked_list, sec))
+    info->callbacks->einfo (_("%F%P: already_linked_table: %E\n"));
+  return FALSE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cofflink.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cofflink.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cofflink.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cofflink.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3109 @@
+/* COFF specific linker code.
+   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
+   Written by Ian Lance Taylor, Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file contains the COFF backend linker code.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+#include "safe-ctype.h"
+
+static bfd_boolean coff_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info);
+static bfd_boolean coff_link_check_archive_element (bfd *abfd, struct bfd_link_info *info, bfd_boolean *pneeded);
+static bfd_boolean coff_link_add_symbols (bfd *abfd, struct bfd_link_info *info);
+
+/* Return TRUE if SYM is a weak, external symbol.  */
+#define IS_WEAK_EXTERNAL(abfd, sym)			\
+  ((sym).n_sclass == C_WEAKEXT				\
+   || (obj_pe (abfd) && (sym).n_sclass == C_NT_WEAK))
+
+/* Return TRUE if SYM is an external symbol.  */
+#define IS_EXTERNAL(abfd, sym)				\
+  ((sym).n_sclass == C_EXT || IS_WEAK_EXTERNAL (abfd, sym))
+
+/* Define macros so that the ISFCN, et. al., macros work correctly.
+   These macros are defined in include/coff/internal.h in terms of
+   N_TMASK, etc.  These definitions require a user to define local
+   variables with the appropriate names, and with values from the
+   coff_data (abfd) structure.  */
+
+#define N_TMASK n_tmask
+#define N_BTSHFT n_btshft
+#define N_BTMASK n_btmask
+
+/* Create an entry in a COFF linker hash table.  */
+
+struct bfd_hash_entry *
+_bfd_coff_link_hash_newfunc (struct bfd_hash_entry *entry,
+			     struct bfd_hash_table *table,
+			     const char *string)
+{
+  struct coff_link_hash_entry *ret = (struct coff_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == (struct coff_link_hash_entry *) NULL)
+    ret = ((struct coff_link_hash_entry *)
+	   bfd_hash_allocate (table, sizeof (struct coff_link_hash_entry)));
+  if (ret == (struct coff_link_hash_entry *) NULL)
+    return (struct bfd_hash_entry *) ret;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct coff_link_hash_entry *)
+	 _bfd_link_hash_newfunc ((struct bfd_hash_entry *) ret,
+				 table, string));
+  if (ret != (struct coff_link_hash_entry *) NULL)
+    {
+      /* Set local fields.  */
+      ret->indx = -1;
+      ret->type = T_NULL;
+      ret->symbol_class = C_NULL;
+      ret->numaux = 0;
+      ret->auxbfd = NULL;
+      ret->aux = NULL;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Initialize a COFF linker hash table.  */
+
+bfd_boolean
+_bfd_coff_link_hash_table_init (struct coff_link_hash_table *table,
+				bfd *abfd,
+				struct bfd_hash_entry *(*newfunc) (struct bfd_hash_entry *,
+								   struct bfd_hash_table *,
+								   const char *),
+				unsigned int entsize)
+{
+  memset (&table->stab_info, 0, sizeof (table->stab_info));
+  return _bfd_link_hash_table_init (&table->root, abfd, newfunc, entsize);
+}
+
+/* Create a COFF linker hash table.  */
+
+struct bfd_link_hash_table *
+_bfd_coff_link_hash_table_create (bfd *abfd)
+{
+  struct coff_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct coff_link_hash_table);
+
+  ret = (struct coff_link_hash_table *) bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (! _bfd_coff_link_hash_table_init (ret, abfd,
+					_bfd_coff_link_hash_newfunc,
+					sizeof (struct coff_link_hash_entry)))
+    {
+      free (ret);
+      return (struct bfd_link_hash_table *) NULL;
+    }
+  return &ret->root;
+}
+
+/* Create an entry in a COFF debug merge hash table.  */
+
+struct bfd_hash_entry *
+_bfd_coff_debug_merge_hash_newfunc (struct bfd_hash_entry *entry,
+				    struct bfd_hash_table *table,
+				    const char *string)
+{
+  struct coff_debug_merge_hash_entry *ret =
+    (struct coff_debug_merge_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == (struct coff_debug_merge_hash_entry *) NULL)
+    ret = ((struct coff_debug_merge_hash_entry *)
+	   bfd_hash_allocate (table,
+			      sizeof (struct coff_debug_merge_hash_entry)));
+  if (ret == (struct coff_debug_merge_hash_entry *) NULL)
+    return (struct bfd_hash_entry *) ret;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct coff_debug_merge_hash_entry *)
+	 bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
+  if (ret != (struct coff_debug_merge_hash_entry *) NULL)
+    {
+      /* Set local fields.  */
+      ret->types = NULL;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Given a COFF BFD, add symbols to the global hash table as
+   appropriate.  */
+
+bfd_boolean
+_bfd_coff_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  switch (bfd_get_format (abfd))
+    {
+    case bfd_object:
+      return coff_link_add_object_symbols (abfd, info);
+    case bfd_archive:
+      return _bfd_generic_link_add_archive_symbols
+	(abfd, info, coff_link_check_archive_element);
+    default:
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+}
+
+/* Add symbols from a COFF object file.  */
+
+static bfd_boolean
+coff_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  if (! _bfd_coff_get_external_symbols (abfd))
+    return FALSE;
+  if (! coff_link_add_symbols (abfd, info))
+    return FALSE;
+
+  if (! info->keep_memory
+      && ! _bfd_coff_free_symbols (abfd))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Look through the symbols to see if this object file should be
+   included in the link.  */
+
+static bfd_boolean
+coff_link_check_ar_symbols (bfd *abfd,
+			    struct bfd_link_info *info,
+			    bfd_boolean *pneeded,
+			    bfd **subsbfd)
+{
+  bfd_size_type symesz;
+  bfd_byte *esym;
+  bfd_byte *esym_end;
+
+  *pneeded = FALSE;
+
+  symesz = bfd_coff_symesz (abfd);
+  esym = (bfd_byte *) obj_coff_external_syms (abfd);
+  esym_end = esym + obj_raw_syment_count (abfd) * symesz;
+  while (esym < esym_end)
+    {
+      struct internal_syment sym;
+      enum coff_symbol_classification classification;
+
+      bfd_coff_swap_sym_in (abfd, esym, &sym);
+
+      classification = bfd_coff_classify_symbol (abfd, &sym);
+      if (classification == COFF_SYMBOL_GLOBAL
+	  || classification == COFF_SYMBOL_COMMON)
+	{
+	  const char *name;
+	  char buf[SYMNMLEN + 1];
+	  struct bfd_link_hash_entry *h;
+
+	  /* This symbol is externally visible, and is defined by this
+             object file.  */
+	  name = _bfd_coff_internal_syment_name (abfd, &sym, buf);
+	  if (name == NULL)
+	    return FALSE;
+	  h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE);
+
+	  /* Auto import.  */
+	  if (!h
+	      && info->pei386_auto_import
+	      && CONST_STRNEQ (name, "__imp_"))
+	    h = bfd_link_hash_lookup (info->hash, name + 6, FALSE, FALSE, TRUE);
+
+	  /* We are only interested in symbols that are currently
+	     undefined.  If a symbol is currently known to be common,
+	     COFF linkers do not bring in an object file which defines
+	     it.  */
+	  if (h != (struct bfd_link_hash_entry *) NULL
+	      && h->type == bfd_link_hash_undefined)
+	    {
+	      if (!(*info->callbacks
+		    ->add_archive_element) (info, abfd, name, subsbfd))
+		return FALSE;
+	      *pneeded = TRUE;
+	      return TRUE;
+	    }
+	}
+
+      esym += (sym.n_numaux + 1) * symesz;
+    }
+
+  /* We do not need this object file.  */
+  return TRUE;
+}
+
+/* Check a single archive element to see if we need to include it in
+   the link.  *PNEEDED is set according to whether this element is
+   needed in the link or not.  This is called via
+   _bfd_generic_link_add_archive_symbols.  */
+
+static bfd_boolean
+coff_link_check_archive_element (bfd *abfd,
+				 struct bfd_link_info *info,
+				 bfd_boolean *pneeded)
+{
+  bfd *oldbfd;
+  bfd_boolean needed;
+
+  if (!_bfd_coff_get_external_symbols (abfd))
+    return FALSE;
+
+  oldbfd = abfd;
+  if (!coff_link_check_ar_symbols (abfd, info, pneeded, &abfd))
+    return FALSE;
+
+  needed = *pneeded;
+  if (needed)
+    {
+      /* Potentially, the add_archive_element hook may have set a
+	 substitute BFD for us.  */
+      if (abfd != oldbfd)
+	{
+	  if (!info->keep_memory
+	      && !_bfd_coff_free_symbols (oldbfd))
+	    return FALSE;
+	  if (!_bfd_coff_get_external_symbols (abfd))
+	    return FALSE;
+	}
+      if (!coff_link_add_symbols (abfd, info))
+	return FALSE;
+    }
+
+  if (!info->keep_memory || !needed)
+    {
+      if (!_bfd_coff_free_symbols (abfd))
+	return FALSE;
+    }
+  return TRUE;
+}
+
+/* Add all the symbols from an object file to the hash table.  */
+
+static bfd_boolean
+coff_link_add_symbols (bfd *abfd,
+		       struct bfd_link_info *info)
+{
+  unsigned int n_tmask = coff_data (abfd)->local_n_tmask;
+  unsigned int n_btshft = coff_data (abfd)->local_n_btshft;
+  unsigned int n_btmask = coff_data (abfd)->local_n_btmask;
+  bfd_boolean keep_syms;
+  bfd_boolean default_copy;
+  bfd_size_type symcount;
+  struct coff_link_hash_entry **sym_hash;
+  bfd_size_type symesz;
+  bfd_byte *esym;
+  bfd_byte *esym_end;
+  bfd_size_type amt;
+
+  symcount = obj_raw_syment_count (abfd);
+
+  if (symcount == 0)
+    return TRUE;		/* Nothing to do.  */
+
+  /* Keep the symbols during this function, in case the linker needs
+     to read the generic symbols in order to report an error message.  */
+  keep_syms = obj_coff_keep_syms (abfd);
+  obj_coff_keep_syms (abfd) = TRUE;
+
+  if (info->keep_memory)
+    default_copy = FALSE;
+  else
+    default_copy = TRUE;
+
+  /* We keep a list of the linker hash table entries that correspond
+     to particular symbols.  */
+  amt = symcount * sizeof (struct coff_link_hash_entry *);
+  sym_hash = (struct coff_link_hash_entry **) bfd_zalloc (abfd, amt);
+  if (sym_hash == NULL)
+    goto error_return;
+  obj_coff_sym_hashes (abfd) = sym_hash;
+
+  symesz = bfd_coff_symesz (abfd);
+  BFD_ASSERT (symesz == bfd_coff_auxesz (abfd));
+  esym = (bfd_byte *) obj_coff_external_syms (abfd);
+  esym_end = esym + symcount * symesz;
+  while (esym < esym_end)
+    {
+      struct internal_syment sym;
+      enum coff_symbol_classification classification;
+      bfd_boolean copy;
+
+      bfd_coff_swap_sym_in (abfd, esym, &sym);
+
+      classification = bfd_coff_classify_symbol (abfd, &sym);
+      if (classification != COFF_SYMBOL_LOCAL)
+	{
+	  const char *name;
+	  char buf[SYMNMLEN + 1];
+	  flagword flags;
+	  asection *section;
+	  bfd_vma value;
+	  bfd_boolean addit;
+
+	  /* This symbol is externally visible.  */
+
+	  name = _bfd_coff_internal_syment_name (abfd, &sym, buf);
+	  if (name == NULL)
+	    goto error_return;
+
+	  /* We must copy the name into memory if we got it from the
+             syment itself, rather than the string table.  */
+	  copy = default_copy;
+	  if (sym._n._n_n._n_zeroes != 0
+	      || sym._n._n_n._n_offset == 0)
+	    copy = TRUE;
+
+	  value = sym.n_value;
+
+	  switch (classification)
+	    {
+	    default:
+	      abort ();
+
+	    case COFF_SYMBOL_GLOBAL:
+	      flags = BSF_EXPORT | BSF_GLOBAL;
+	      section = coff_section_from_bfd_index (abfd, sym.n_scnum);
+	      if (! obj_pe (abfd))
+		value -= section->vma;
+	      break;
+
+	    case COFF_SYMBOL_UNDEFINED:
+	      flags = 0;
+	      section = bfd_und_section_ptr;
+	      break;
+
+	    case COFF_SYMBOL_COMMON:
+	      flags = BSF_GLOBAL;
+	      section = bfd_com_section_ptr;
+	      break;
+
+	    case COFF_SYMBOL_PE_SECTION:
+	      flags = BSF_SECTION_SYM | BSF_GLOBAL;
+	      section = coff_section_from_bfd_index (abfd, sym.n_scnum);
+	      break;
+	    }
+
+	  if (IS_WEAK_EXTERNAL (abfd, sym))
+	    flags = BSF_WEAK;
+
+	  addit = TRUE;
+
+	  /* In the PE format, section symbols actually refer to the
+             start of the output section.  We handle them specially
+             here.  */
+	  if (obj_pe (abfd) && (flags & BSF_SECTION_SYM) != 0)
+	    {
+	      *sym_hash = coff_link_hash_lookup (coff_hash_table (info),
+						 name, FALSE, copy, FALSE);
+	      if (*sym_hash != NULL)
+		{
+		  if (((*sym_hash)->coff_link_hash_flags
+		       & COFF_LINK_HASH_PE_SECTION_SYMBOL) == 0
+		      && (*sym_hash)->root.type != bfd_link_hash_undefined
+		      && (*sym_hash)->root.type != bfd_link_hash_undefweak)
+		    (*_bfd_error_handler)
+		      ("Warning: symbol `%s' is both section and non-section",
+		       name);
+
+		  addit = FALSE;
+		}
+	    }
+
+	  /* The Microsoft Visual C compiler does string pooling by
+	     hashing the constants to an internal symbol name, and
+	     relying on the linker comdat support to discard
+	     duplicate names.  However, if one string is a literal and
+	     one is a data initializer, one will end up in the .data
+	     section and one will end up in the .rdata section.  The
+	     Microsoft linker will combine them into the .data
+	     section, which seems to be wrong since it might cause the
+	     literal to change.
+
+	     As long as there are no external references to the
+	     symbols, which there shouldn't be, we can treat the .data
+	     and .rdata instances as separate symbols.  The comdat
+	     code in the linker will do the appropriate merging.  Here
+	     we avoid getting a multiple definition error for one of
+	     these special symbols.
+
+	     FIXME: I don't think this will work in the case where
+	     there are two object files which use the constants as a
+	     literal and two object files which use it as a data
+	     initializer.  One or the other of the second object files
+	     is going to wind up with an inappropriate reference.  */
+	  if (obj_pe (abfd)
+	      && (classification == COFF_SYMBOL_GLOBAL
+		  || classification == COFF_SYMBOL_PE_SECTION)
+	      && coff_section_data (abfd, section) != NULL
+	      && coff_section_data (abfd, section)->comdat != NULL
+	      && CONST_STRNEQ (name, "??_")
+	      && strcmp (name, coff_section_data (abfd, section)->comdat->name) == 0)
+	    {
+	      if (*sym_hash == NULL)
+		*sym_hash = coff_link_hash_lookup (coff_hash_table (info),
+						   name, FALSE, copy, FALSE);
+	      if (*sym_hash != NULL
+		  && (*sym_hash)->root.type == bfd_link_hash_defined
+		  && coff_section_data (abfd, (*sym_hash)->root.u.def.section)->comdat != NULL
+		  && strcmp (coff_section_data (abfd, (*sym_hash)->root.u.def.section)->comdat->name,
+			     coff_section_data (abfd, section)->comdat->name) == 0)
+		addit = FALSE;
+	    }
+
+	  if (addit)
+	    {
+	      if (! (bfd_coff_link_add_one_symbol
+		     (info, abfd, name, flags, section, value,
+		      (const char *) NULL, copy, FALSE,
+		      (struct bfd_link_hash_entry **) sym_hash)))
+		goto error_return;
+	    }
+
+	  if (obj_pe (abfd) && (flags & BSF_SECTION_SYM) != 0)
+	    (*sym_hash)->coff_link_hash_flags |=
+	      COFF_LINK_HASH_PE_SECTION_SYMBOL;
+
+	  /* Limit the alignment of a common symbol to the possible
+             alignment of a section.  There is no point to permitting
+             a higher alignment for a common symbol: we can not
+             guarantee it, and it may cause us to allocate extra space
+             in the common section.  */
+	  if (section == bfd_com_section_ptr
+	      && (*sym_hash)->root.type == bfd_link_hash_common
+	      && ((*sym_hash)->root.u.c.p->alignment_power
+		  > bfd_coff_default_section_alignment_power (abfd)))
+	    (*sym_hash)->root.u.c.p->alignment_power
+	      = bfd_coff_default_section_alignment_power (abfd);
+
+	  if (bfd_get_flavour (info->output_bfd) == bfd_get_flavour (abfd))
+	    {
+	      /* If we don't have any symbol information currently in
+                 the hash table, or if we are looking at a symbol
+                 definition, then update the symbol class and type in
+                 the hash table.  */
+  	      if (((*sym_hash)->symbol_class == C_NULL
+  		   && (*sym_hash)->type == T_NULL)
+  		  || sym.n_scnum != 0
+  		  || (sym.n_value != 0
+  		      && (*sym_hash)->root.type != bfd_link_hash_defined
+  		      && (*sym_hash)->root.type != bfd_link_hash_defweak))
+  		{
+  		  (*sym_hash)->symbol_class = sym.n_sclass;
+  		  if (sym.n_type != T_NULL)
+  		    {
+  		      /* We want to warn if the type changed, but not
+  			 if it changed from an unspecified type.
+  			 Testing the whole type byte may work, but the
+  			 change from (e.g.) a function of unspecified
+  			 type to function of known type also wants to
+  			 skip the warning.  */
+  		      if ((*sym_hash)->type != T_NULL
+  			  && (*sym_hash)->type != sym.n_type
+  		          && !(DTYPE ((*sym_hash)->type) == DTYPE (sym.n_type)
+  		               && (BTYPE ((*sym_hash)->type) == T_NULL
+  		                   || BTYPE (sym.n_type) == T_NULL)))
+  			(*_bfd_error_handler)
+  			  (_("Warning: type of symbol `%s' changed from %d to %d in %B"),
+  			   abfd, name, (*sym_hash)->type, sym.n_type);
+
+  		      /* We don't want to change from a meaningful
+  			 base type to a null one, but if we know
+  			 nothing, take what little we might now know.  */
+  		      if (BTYPE (sym.n_type) != T_NULL
+  			  || (*sym_hash)->type == T_NULL)
+			(*sym_hash)->type = sym.n_type;
+  		    }
+  		  (*sym_hash)->auxbfd = abfd;
+		  if (sym.n_numaux != 0)
+		    {
+		      union internal_auxent *alloc;
+		      unsigned int i;
+		      bfd_byte *eaux;
+		      union internal_auxent *iaux;
+
+		      (*sym_hash)->numaux = sym.n_numaux;
+		      alloc = ((union internal_auxent *)
+			       bfd_hash_allocate (&info->hash->table,
+						  (sym.n_numaux
+						   * sizeof (*alloc))));
+		      if (alloc == NULL)
+			goto error_return;
+		      for (i = 0, eaux = esym + symesz, iaux = alloc;
+			   i < sym.n_numaux;
+			   i++, eaux += symesz, iaux++)
+			bfd_coff_swap_aux_in (abfd, eaux, sym.n_type,
+					      sym.n_sclass, (int) i,
+					      sym.n_numaux, iaux);
+		      (*sym_hash)->aux = alloc;
+		    }
+		}
+	    }
+
+	  if (classification == COFF_SYMBOL_PE_SECTION
+	      && (*sym_hash)->numaux != 0)
+	    {
+	      /* Some PE sections (such as .bss) have a zero size in
+                 the section header, but a non-zero size in the AUX
+                 record.  Correct that here.
+
+		 FIXME: This is not at all the right place to do this.
+		 For example, it won't help objdump.  This needs to be
+		 done when we swap in the section header.  */
+	      BFD_ASSERT ((*sym_hash)->numaux == 1);
+	      if (section->size == 0)
+		section->size = (*sym_hash)->aux[0].x_scn.x_scnlen;
+
+	      /* FIXME: We could test whether the section sizes
+                 matches the size in the aux entry, but apparently
+                 that sometimes fails unexpectedly.  */
+	    }
+	}
+
+      esym += (sym.n_numaux + 1) * symesz;
+      sym_hash += sym.n_numaux + 1;
+    }
+
+  /* If this is a non-traditional, non-relocatable link, try to
+     optimize the handling of any .stab/.stabstr sections.  */
+  if (! info->relocatable
+      && ! info->traditional_format
+      && bfd_get_flavour (info->output_bfd) == bfd_get_flavour (abfd)
+      && (info->strip != strip_all && info->strip != strip_debugger))
+    {
+      asection *stabstr;
+
+      stabstr = bfd_get_section_by_name (abfd, ".stabstr");
+
+      if (stabstr != NULL)
+	{
+	  bfd_size_type string_offset = 0;
+	  asection *stab;
+	  
+	  for (stab = abfd->sections; stab; stab = stab->next)
+	    if (CONST_STRNEQ (stab->name, ".stab")
+		&& (!stab->name[5]
+		    || (stab->name[5] == '.' && ISDIGIT (stab->name[6]))))
+	    {
+	      struct coff_link_hash_table *table;
+	      struct coff_section_tdata *secdata
+		= coff_section_data (abfd, stab);
+	      
+	      if (secdata == NULL)
+		{
+		  amt = sizeof (struct coff_section_tdata);
+		  stab->used_by_bfd = bfd_zalloc (abfd, amt);
+		  if (stab->used_by_bfd == NULL)
+		    goto error_return;
+		  secdata = coff_section_data (abfd, stab);
+		}
+
+	      table = coff_hash_table (info);
+
+	      if (! _bfd_link_section_stabs (abfd, &table->stab_info,
+					     stab, stabstr,
+					     &secdata->stab_info,
+					     &string_offset))
+		goto error_return;
+	    }
+	}
+    }
+
+  obj_coff_keep_syms (abfd) = keep_syms;
+
+  return TRUE;
+
+ error_return:
+  obj_coff_keep_syms (abfd) = keep_syms;
+  return FALSE;
+}
+
+/* Do the final link step.  */
+
+bfd_boolean
+_bfd_coff_final_link (bfd *abfd,
+		      struct bfd_link_info *info)
+{
+  bfd_size_type symesz;
+  struct coff_final_link_info finfo;
+  bfd_boolean debug_merge_allocated;
+  bfd_boolean long_section_names;
+  asection *o;
+  struct bfd_link_order *p;
+  bfd_size_type max_sym_count;
+  bfd_size_type max_lineno_count;
+  bfd_size_type max_reloc_count;
+  bfd_size_type max_output_reloc_count;
+  bfd_size_type max_contents_size;
+  file_ptr rel_filepos;
+  unsigned int relsz;
+  file_ptr line_filepos;
+  unsigned int linesz;
+  bfd *sub;
+  bfd_byte *external_relocs = NULL;
+  char strbuf[STRING_SIZE_SIZE];
+  bfd_size_type amt;
+
+  symesz = bfd_coff_symesz (abfd);
+
+  finfo.info = info;
+  finfo.output_bfd = abfd;
+  finfo.strtab = NULL;
+  finfo.section_info = NULL;
+  finfo.last_file_index = -1;
+  finfo.last_bf_index = -1;
+  finfo.internal_syms = NULL;
+  finfo.sec_ptrs = NULL;
+  finfo.sym_indices = NULL;
+  finfo.outsyms = NULL;
+  finfo.linenos = NULL;
+  finfo.contents = NULL;
+  finfo.external_relocs = NULL;
+  finfo.internal_relocs = NULL;
+  finfo.global_to_static = FALSE;
+  debug_merge_allocated = FALSE;
+
+  coff_data (abfd)->link_info = info;
+
+  finfo.strtab = _bfd_stringtab_init ();
+  if (finfo.strtab == NULL)
+    goto error_return;
+
+  if (! coff_debug_merge_hash_table_init (&finfo.debug_merge))
+    goto error_return;
+  debug_merge_allocated = TRUE;
+
+  /* Compute the file positions for all the sections.  */
+  if (! abfd->output_has_begun)
+    {
+      if (! bfd_coff_compute_section_file_positions (abfd))
+	goto error_return;
+    }
+
+  /* Count the line numbers and relocation entries required for the
+     output file.  Set the file positions for the relocs.  */
+  rel_filepos = obj_relocbase (abfd);
+  relsz = bfd_coff_relsz (abfd);
+  max_contents_size = 0;
+  max_lineno_count = 0;
+  max_reloc_count = 0;
+
+  long_section_names = FALSE;
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      o->reloc_count = 0;
+      o->lineno_count = 0;
+      for (p = o->map_head.link_order; p != NULL; p = p->next)
+	{
+	  if (p->type == bfd_indirect_link_order)
+	    {
+	      asection *sec;
+
+	      sec = p->u.indirect.section;
+
+	      /* Mark all sections which are to be included in the
+		 link.  This will normally be every section.  We need
+		 to do this so that we can identify any sections which
+		 the linker has decided to not include.  */
+	      sec->linker_mark = TRUE;
+
+	      if (info->strip == strip_none
+		  || info->strip == strip_some)
+		o->lineno_count += sec->lineno_count;
+
+	      if (info->relocatable)
+		o->reloc_count += sec->reloc_count;
+
+	      if (sec->rawsize > max_contents_size)
+		max_contents_size = sec->rawsize;
+	      if (sec->size > max_contents_size)
+		max_contents_size = sec->size;
+	      if (sec->lineno_count > max_lineno_count)
+		max_lineno_count = sec->lineno_count;
+	      if (sec->reloc_count > max_reloc_count)
+		max_reloc_count = sec->reloc_count;
+	    }
+	  else if (info->relocatable
+		   && (p->type == bfd_section_reloc_link_order
+		       || p->type == bfd_symbol_reloc_link_order))
+	    ++o->reloc_count;
+	}
+      if (o->reloc_count == 0)
+	o->rel_filepos = 0;
+      else
+	{
+	  o->flags |= SEC_RELOC;
+	  o->rel_filepos = rel_filepos;
+	  rel_filepos += o->reloc_count * relsz;
+	  /* In PE COFF, if there are at least 0xffff relocations an
+	     extra relocation will be written out to encode the count.  */
+	  if (obj_pe (abfd) && o->reloc_count >= 0xffff)
+	    rel_filepos += relsz;
+	}
+
+      if (bfd_coff_long_section_names (abfd)
+	  && strlen (o->name) > SCNNMLEN)
+	{
+	  /* This section has a long name which must go in the string
+             table.  This must correspond to the code in
+             coff_write_object_contents which puts the string index
+             into the s_name field of the section header.  That is why
+             we pass hash as FALSE.  */
+	  if (_bfd_stringtab_add (finfo.strtab, o->name, FALSE, FALSE)
+	      == (bfd_size_type) -1)
+	    goto error_return;
+	  long_section_names = TRUE;
+	}
+    }
+
+  /* If doing a relocatable link, allocate space for the pointers we
+     need to keep.  */
+  if (info->relocatable)
+    {
+      unsigned int i;
+
+      /* We use section_count + 1, rather than section_count, because
+         the target_index fields are 1 based.  */
+      amt = abfd->section_count + 1;
+      amt *= sizeof (struct coff_link_section_info);
+      finfo.section_info = (struct coff_link_section_info *) bfd_malloc (amt);
+      if (finfo.section_info == NULL)
+	goto error_return;
+      for (i = 0; i <= abfd->section_count; i++)
+	{
+	  finfo.section_info[i].relocs = NULL;
+	  finfo.section_info[i].rel_hashes = NULL;
+	}
+    }
+
+  /* We now know the size of the relocs, so we can determine the file
+     positions of the line numbers.  */
+  line_filepos = rel_filepos;
+  linesz = bfd_coff_linesz (abfd);
+  max_output_reloc_count = 0;
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      if (o->lineno_count == 0)
+	o->line_filepos = 0;
+      else
+	{
+	  o->line_filepos = line_filepos;
+	  line_filepos += o->lineno_count * linesz;
+	}
+
+      if (o->reloc_count != 0)
+	{
+	  /* We don't know the indices of global symbols until we have
+             written out all the local symbols.  For each section in
+             the output file, we keep an array of pointers to hash
+             table entries.  Each entry in the array corresponds to a
+             reloc.  When we find a reloc against a global symbol, we
+             set the corresponding entry in this array so that we can
+             fix up the symbol index after we have written out all the
+             local symbols.
+
+	     Because of this problem, we also keep the relocs in
+	     memory until the end of the link.  This wastes memory,
+	     but only when doing a relocatable link, which is not the
+	     common case.  */
+	  BFD_ASSERT (info->relocatable);
+	  amt = o->reloc_count;
+	  amt *= sizeof (struct internal_reloc);
+	  finfo.section_info[o->target_index].relocs =
+              (struct internal_reloc *) bfd_malloc (amt);
+	  amt = o->reloc_count;
+	  amt *= sizeof (struct coff_link_hash_entry *);
+	  finfo.section_info[o->target_index].rel_hashes =
+              (struct coff_link_hash_entry **) bfd_malloc (amt);
+	  if (finfo.section_info[o->target_index].relocs == NULL
+	      || finfo.section_info[o->target_index].rel_hashes == NULL)
+	    goto error_return;
+
+	  if (o->reloc_count > max_output_reloc_count)
+	    max_output_reloc_count = o->reloc_count;
+	}
+
+      /* Reset the reloc and lineno counts, so that we can use them to
+	 count the number of entries we have output so far.  */
+      o->reloc_count = 0;
+      o->lineno_count = 0;
+    }
+
+  obj_sym_filepos (abfd) = line_filepos;
+
+  /* Figure out the largest number of symbols in an input BFD.  Take
+     the opportunity to clear the output_has_begun fields of all the
+     input BFD's.  */
+  max_sym_count = 0;
+  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+    {
+      size_t sz;
+
+      sub->output_has_begun = FALSE;
+      sz = obj_raw_syment_count (sub);
+      if (sz > max_sym_count)
+	max_sym_count = sz;
+    }
+
+  /* Allocate some buffers used while linking.  */
+  amt = max_sym_count * sizeof (struct internal_syment);
+  finfo.internal_syms = (struct internal_syment *) bfd_malloc (amt);
+  amt = max_sym_count * sizeof (asection *);
+  finfo.sec_ptrs = (asection **) bfd_malloc (amt);
+  amt = max_sym_count * sizeof (long);
+  finfo.sym_indices = (long int *) bfd_malloc (amt);
+  finfo.outsyms = (bfd_byte *) bfd_malloc ((max_sym_count + 1) * symesz);
+  amt = max_lineno_count * bfd_coff_linesz (abfd);
+  finfo.linenos = (bfd_byte *) bfd_malloc (amt);
+  finfo.contents = (bfd_byte *) bfd_malloc (max_contents_size);
+  amt = max_reloc_count * relsz;
+  finfo.external_relocs = (bfd_byte *) bfd_malloc (amt);
+  if (! info->relocatable)
+    {
+      amt = max_reloc_count * sizeof (struct internal_reloc);
+      finfo.internal_relocs = (struct internal_reloc *) bfd_malloc (amt);
+    }
+  if ((finfo.internal_syms == NULL && max_sym_count > 0)
+      || (finfo.sec_ptrs == NULL && max_sym_count > 0)
+      || (finfo.sym_indices == NULL && max_sym_count > 0)
+      || finfo.outsyms == NULL
+      || (finfo.linenos == NULL && max_lineno_count > 0)
+      || (finfo.contents == NULL && max_contents_size > 0)
+      || (finfo.external_relocs == NULL && max_reloc_count > 0)
+      || (! info->relocatable
+	  && finfo.internal_relocs == NULL
+	  && max_reloc_count > 0))
+    goto error_return;
+
+  /* We now know the position of everything in the file, except that
+     we don't know the size of the symbol table and therefore we don't
+     know where the string table starts.  We just build the string
+     table in memory as we go along.  We process all the relocations
+     for a single input file at once.  */
+  obj_raw_syment_count (abfd) = 0;
+
+  if (coff_backend_info (abfd)->_bfd_coff_start_final_link)
+    {
+      if (! bfd_coff_start_final_link (abfd, info))
+	goto error_return;
+    }
+
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      for (p = o->map_head.link_order; p != NULL; p = p->next)
+	{
+	  if (p->type == bfd_indirect_link_order
+	      && bfd_family_coff (p->u.indirect.section->owner))
+	    {
+	      sub = p->u.indirect.section->owner;
+	      if (! bfd_coff_link_output_has_begun (sub, & finfo))
+		{
+		  if (! _bfd_coff_link_input_bfd (&finfo, sub))
+		    goto error_return;
+		  sub->output_has_begun = TRUE;
+		}
+	    }
+	  else if (p->type == bfd_section_reloc_link_order
+		   || p->type == bfd_symbol_reloc_link_order)
+	    {
+	      if (! _bfd_coff_reloc_link_order (abfd, &finfo, o, p))
+		goto error_return;
+	    }
+	  else
+	    {
+	      if (! _bfd_default_link_order (abfd, info, o, p))
+		goto error_return;
+	    }
+	}
+    }
+
+  if (! bfd_coff_final_link_postscript (abfd, & finfo))
+    goto error_return;
+
+  /* Free up the buffers used by _bfd_coff_link_input_bfd.  */
+
+  coff_debug_merge_hash_table_free (&finfo.debug_merge);
+  debug_merge_allocated = FALSE;
+
+  if (finfo.internal_syms != NULL)
+    {
+      free (finfo.internal_syms);
+      finfo.internal_syms = NULL;
+    }
+  if (finfo.sec_ptrs != NULL)
+    {
+      free (finfo.sec_ptrs);
+      finfo.sec_ptrs = NULL;
+    }
+  if (finfo.sym_indices != NULL)
+    {
+      free (finfo.sym_indices);
+      finfo.sym_indices = NULL;
+    }
+  if (finfo.linenos != NULL)
+    {
+      free (finfo.linenos);
+      finfo.linenos = NULL;
+    }
+  if (finfo.contents != NULL)
+    {
+      free (finfo.contents);
+      finfo.contents = NULL;
+    }
+  if (finfo.external_relocs != NULL)
+    {
+      free (finfo.external_relocs);
+      finfo.external_relocs = NULL;
+    }
+  if (finfo.internal_relocs != NULL)
+    {
+      free (finfo.internal_relocs);
+      finfo.internal_relocs = NULL;
+    }
+
+  /* The value of the last C_FILE symbol is supposed to be the symbol
+     index of the first external symbol.  Write it out again if
+     necessary.  */
+  if (finfo.last_file_index != -1
+      && (unsigned int) finfo.last_file.n_value != obj_raw_syment_count (abfd))
+    {
+      file_ptr pos;
+
+      finfo.last_file.n_value = obj_raw_syment_count (abfd);
+      bfd_coff_swap_sym_out (abfd, &finfo.last_file,
+			     finfo.outsyms);
+
+      pos = obj_sym_filepos (abfd) + finfo.last_file_index * symesz;
+      if (bfd_seek (abfd, pos, SEEK_SET) != 0
+	  || bfd_bwrite (finfo.outsyms, symesz, abfd) != symesz)
+	return FALSE;
+    }
+
+  /* If doing task linking (ld --task-link) then make a pass through the
+     global symbols, writing out any that are defined, and making them
+     static.  */
+  if (info->task_link)
+    {
+      finfo.failed = FALSE;
+      coff_link_hash_traverse (coff_hash_table (info),
+			       _bfd_coff_write_task_globals, &finfo);
+      if (finfo.failed)
+	goto error_return;
+    }
+
+  /* Write out the global symbols.  */
+  finfo.failed = FALSE;
+  bfd_hash_traverse (&info->hash->table, _bfd_coff_write_global_sym, &finfo);
+  if (finfo.failed)
+    goto error_return;
+
+  /* The outsyms buffer is used by _bfd_coff_write_global_sym.  */
+  if (finfo.outsyms != NULL)
+    {
+      free (finfo.outsyms);
+      finfo.outsyms = NULL;
+    }
+
+  if (info->relocatable && max_output_reloc_count > 0)
+    {
+      /* Now that we have written out all the global symbols, we know
+	 the symbol indices to use for relocs against them, and we can
+	 finally write out the relocs.  */
+      amt = max_output_reloc_count * relsz;
+      external_relocs = (bfd_byte *) bfd_malloc (amt);
+      if (external_relocs == NULL)
+	goto error_return;
+
+      for (o = abfd->sections; o != NULL; o = o->next)
+	{
+	  struct internal_reloc *irel;
+	  struct internal_reloc *irelend;
+	  struct coff_link_hash_entry **rel_hash;
+	  bfd_byte *erel;
+
+	  if (o->reloc_count == 0)
+	    continue;
+
+	  irel = finfo.section_info[o->target_index].relocs;
+	  irelend = irel + o->reloc_count;
+	  rel_hash = finfo.section_info[o->target_index].rel_hashes;
+	  erel = external_relocs;
+	  for (; irel < irelend; irel++, rel_hash++, erel += relsz)
+	    {
+	      if (*rel_hash != NULL)
+		{
+		  BFD_ASSERT ((*rel_hash)->indx >= 0);
+		  irel->r_symndx = (*rel_hash)->indx;
+		}
+	      bfd_coff_swap_reloc_out (abfd, irel, erel);
+	    }
+
+	  if (bfd_seek (abfd, o->rel_filepos, SEEK_SET) != 0)
+	    goto error_return;
+	  if (obj_pe (abfd) && o->reloc_count >= 0xffff)
+	    {
+	      /* In PE COFF, write the count of relocs as the first
+		 reloc.  The header overflow bit will be set
+		 elsewhere. */
+	      struct internal_reloc incount;
+	      bfd_byte *excount = (bfd_byte *)bfd_malloc (relsz);
+	      
+	      memset (&incount, 0, sizeof (incount));
+	      incount.r_vaddr = o->reloc_count + 1;
+	      bfd_coff_swap_reloc_out (abfd, (PTR) &incount, (PTR) excount);
+	      if (bfd_bwrite (excount, relsz, abfd) != relsz)
+		/* We'll leak, but it's an error anyway. */
+		goto error_return;
+	      free (excount);
+	    }
+	  if (bfd_bwrite (external_relocs,
+			  (bfd_size_type) relsz * o->reloc_count, abfd)
+	      != (bfd_size_type) relsz * o->reloc_count)
+	    goto error_return;
+	}
+
+      free (external_relocs);
+      external_relocs = NULL;
+    }
+
+  /* Free up the section information.  */
+  if (finfo.section_info != NULL)
+    {
+      unsigned int i;
+
+      for (i = 0; i < abfd->section_count; i++)
+	{
+	  if (finfo.section_info[i].relocs != NULL)
+	    free (finfo.section_info[i].relocs);
+	  if (finfo.section_info[i].rel_hashes != NULL)
+	    free (finfo.section_info[i].rel_hashes);
+	}
+      free (finfo.section_info);
+      finfo.section_info = NULL;
+    }
+
+  /* If we have optimized stabs strings, output them.  */
+  if (coff_hash_table (info)->stab_info.stabstr != NULL)
+    {
+      if (! _bfd_write_stab_strings (abfd, &coff_hash_table (info)->stab_info))
+	return FALSE;
+    }
+
+  /* Write out the string table.  */
+  if (obj_raw_syment_count (abfd) != 0 || long_section_names)
+    {
+      file_ptr pos;
+
+      pos = obj_sym_filepos (abfd) + obj_raw_syment_count (abfd) * symesz;
+      if (bfd_seek (abfd, pos, SEEK_SET) != 0)
+	return FALSE;
+
+#if STRING_SIZE_SIZE == 4
+      H_PUT_32 (abfd,
+		_bfd_stringtab_size (finfo.strtab) + STRING_SIZE_SIZE,
+		strbuf);
+#else
+ #error Change H_PUT_32 above
+#endif
+
+      if (bfd_bwrite (strbuf, (bfd_size_type) STRING_SIZE_SIZE, abfd)
+	  != STRING_SIZE_SIZE)
+	return FALSE;
+
+      if (! _bfd_stringtab_emit (abfd, finfo.strtab))
+	return FALSE;
+
+      obj_coff_strings_written (abfd) = TRUE;
+    }
+
+  _bfd_stringtab_free (finfo.strtab);
+
+  /* Setting bfd_get_symcount to 0 will cause write_object_contents to
+     not try to write out the symbols.  */
+  bfd_get_symcount (abfd) = 0;
+
+  return TRUE;
+
+ error_return:
+  if (debug_merge_allocated)
+    coff_debug_merge_hash_table_free (&finfo.debug_merge);
+  if (finfo.strtab != NULL)
+    _bfd_stringtab_free (finfo.strtab);
+  if (finfo.section_info != NULL)
+    {
+      unsigned int i;
+
+      for (i = 0; i < abfd->section_count; i++)
+	{
+	  if (finfo.section_info[i].relocs != NULL)
+	    free (finfo.section_info[i].relocs);
+	  if (finfo.section_info[i].rel_hashes != NULL)
+	    free (finfo.section_info[i].rel_hashes);
+	}
+      free (finfo.section_info);
+    }
+  if (finfo.internal_syms != NULL)
+    free (finfo.internal_syms);
+  if (finfo.sec_ptrs != NULL)
+    free (finfo.sec_ptrs);
+  if (finfo.sym_indices != NULL)
+    free (finfo.sym_indices);
+  if (finfo.outsyms != NULL)
+    free (finfo.outsyms);
+  if (finfo.linenos != NULL)
+    free (finfo.linenos);
+  if (finfo.contents != NULL)
+    free (finfo.contents);
+  if (finfo.external_relocs != NULL)
+    free (finfo.external_relocs);
+  if (finfo.internal_relocs != NULL)
+    free (finfo.internal_relocs);
+  if (external_relocs != NULL)
+    free (external_relocs);
+  return FALSE;
+}
+
+/* Parse out a -heap <reserved>,<commit> line.  */
+
+static char *
+dores_com (char *ptr, bfd *output_bfd, int heap)
+{
+  if (coff_data(output_bfd)->pe)
+    {
+      int val = strtoul (ptr, &ptr, 0);
+
+      if (heap)
+	pe_data(output_bfd)->pe_opthdr.SizeOfHeapReserve = val;
+      else
+	pe_data(output_bfd)->pe_opthdr.SizeOfStackReserve = val;
+
+      if (ptr[0] == ',')
+	{
+	  val = strtoul (ptr+1, &ptr, 0);
+	  if (heap)
+	    pe_data(output_bfd)->pe_opthdr.SizeOfHeapCommit = val;
+	  else
+	    pe_data(output_bfd)->pe_opthdr.SizeOfStackCommit = val;
+	}
+    }
+  return ptr;
+}
+
+static char *
+get_name (char *ptr, char **dst)
+{
+  while (*ptr == ' ')
+    ptr++;
+  *dst = ptr;
+  while (*ptr && *ptr != ' ')
+    ptr++;
+  *ptr = 0;
+  return ptr+1;
+}
+
+/* Process any magic embedded commands in a section called .drectve.  */
+
+static int
+process_embedded_commands (bfd *output_bfd,
+			   struct bfd_link_info *info ATTRIBUTE_UNUSED,
+			   bfd *abfd)
+{
+  asection *sec = bfd_get_section_by_name (abfd, ".drectve");
+  char *s;
+  char *e;
+  bfd_byte *copy;
+
+  if (!sec)
+    return 1;
+
+  if (!bfd_malloc_and_get_section (abfd, sec, &copy))
+    {
+      if (copy != NULL)
+	free (copy);
+      return 0;
+    }
+  e = (char *) copy + sec->size;
+
+  for (s = (char *) copy; s < e ; )
+    {
+      if (s[0] != '-')
+	{
+	  s++;
+	  continue;
+	}
+      if (CONST_STRNEQ (s, "-attr"))
+	{
+	  char *name;
+	  char *attribs;
+	  asection *asec;
+	  int loop = 1;
+	  int had_write = 0;
+	  int had_exec= 0;
+
+	  s += 5;
+	  s = get_name (s, &name);
+	  s = get_name (s, &attribs);
+
+	  while (loop)
+	    {
+	      switch (*attribs++)
+		{
+		case 'W':
+		  had_write = 1;
+		  break;
+		case 'R':
+		  break;
+		case 'S':
+		  break;
+		case 'X':
+		  had_exec = 1;
+		  break;
+		default:
+		  loop = 0;
+		}
+	    }
+	  asec = bfd_get_section_by_name (abfd, name);
+	  if (asec)
+	    {
+	      if (had_exec)
+		asec->flags |= SEC_CODE;
+	      if (!had_write)
+		asec->flags |= SEC_READONLY;
+	    }
+	}
+      else if (CONST_STRNEQ (s, "-heap"))
+	s = dores_com (s + 5, output_bfd, 1);
+
+      else if (CONST_STRNEQ (s, "-stack"))
+	s = dores_com (s + 6, output_bfd, 0);
+
+      /* GNU extension for aligned commons.  */
+      else if (CONST_STRNEQ (s, "-aligncomm:"))
+	{
+	  /* Common symbols must be aligned on reading, as it
+	  is too late to do anything here, after they have
+	  already been allocated, so just skip the directive.  */
+	  s += 11;
+	}
+
+      else
+	s++;
+    }
+  free (copy);
+  return 1;
+}
+
+/* Place a marker against all symbols which are used by relocations.
+   This marker can be picked up by the 'do we skip this symbol ?'
+   loop in _bfd_coff_link_input_bfd() and used to prevent skipping
+   that symbol.  */
+
+static void
+mark_relocs (struct coff_final_link_info *finfo, bfd *input_bfd)
+{
+  asection * a;
+
+  if ((bfd_get_file_flags (input_bfd) & HAS_SYMS) == 0)
+    return;
+
+  for (a = input_bfd->sections; a != (asection *) NULL; a = a->next)
+    {
+      struct internal_reloc *	internal_relocs;
+      struct internal_reloc *	irel;
+      struct internal_reloc *	irelend;
+
+      if ((a->flags & SEC_RELOC) == 0 || a->reloc_count  < 1)
+	continue;
+      /* Don't mark relocs in excluded sections.  */
+      if (a->output_section == bfd_abs_section_ptr)
+	continue;
+
+      /* Read in the relocs.  */
+      internal_relocs = _bfd_coff_read_internal_relocs
+	(input_bfd, a, FALSE,
+	 finfo->external_relocs,
+	 finfo->info->relocatable,
+	 (finfo->info->relocatable
+	  ? (finfo->section_info[ a->output_section->target_index ].relocs + a->output_section->reloc_count)
+	  : finfo->internal_relocs)
+	);
+
+      if (internal_relocs == NULL)
+	continue;
+
+      irel     = internal_relocs;
+      irelend  = irel + a->reloc_count;
+
+      /* Place a mark in the sym_indices array (whose entries have
+	 been initialised to 0) for all of the symbols that are used
+	 in the relocation table.  This will then be picked up in the
+	 skip/don't-skip pass.  */
+      for (; irel < irelend; irel++)
+	finfo->sym_indices[ irel->r_symndx ] = -1;
+    }
+}
+
+/* Link an input file into the linker output file.  This function
+   handles all the sections and relocations of the input file at once.  */
+
+bfd_boolean
+_bfd_coff_link_input_bfd (struct coff_final_link_info *finfo, bfd *input_bfd)
+{
+  unsigned int n_tmask = coff_data (input_bfd)->local_n_tmask;
+  unsigned int n_btshft = coff_data (input_bfd)->local_n_btshft;
+  bfd_boolean (*adjust_symndx)
+    (bfd *, struct bfd_link_info *, bfd *, asection *,
+     struct internal_reloc *, bfd_boolean *);
+  bfd *output_bfd;
+  const char *strings;
+  bfd_size_type syment_base;
+  bfd_boolean copy, hash;
+  bfd_size_type isymesz;
+  bfd_size_type osymesz;
+  bfd_size_type linesz;
+  bfd_byte *esym;
+  bfd_byte *esym_end;
+  struct internal_syment *isymp;
+  asection **secpp;
+  long *indexp;
+  unsigned long output_index;
+  bfd_byte *outsym;
+  struct coff_link_hash_entry **sym_hash;
+  asection *o;
+
+  /* Move all the symbols to the output file.  */
+
+  output_bfd = finfo->output_bfd;
+  strings = NULL;
+  syment_base = obj_raw_syment_count (output_bfd);
+  isymesz = bfd_coff_symesz (input_bfd);
+  osymesz = bfd_coff_symesz (output_bfd);
+  linesz = bfd_coff_linesz (input_bfd);
+  BFD_ASSERT (linesz == bfd_coff_linesz (output_bfd));
+
+  copy = FALSE;
+  if (! finfo->info->keep_memory)
+    copy = TRUE;
+  hash = TRUE;
+  if ((output_bfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
+    hash = FALSE;
+
+  if (! _bfd_coff_get_external_symbols (input_bfd))
+    return FALSE;
+
+  esym = (bfd_byte *) obj_coff_external_syms (input_bfd);
+  esym_end = esym + obj_raw_syment_count (input_bfd) * isymesz;
+  isymp = finfo->internal_syms;
+  secpp = finfo->sec_ptrs;
+  indexp = finfo->sym_indices;
+  output_index = syment_base;
+  outsym = finfo->outsyms;
+
+  if (coff_data (output_bfd)->pe
+      && ! process_embedded_commands (output_bfd, finfo->info, input_bfd))
+    return FALSE;
+
+  /* If we are going to perform relocations and also strip/discard some
+     symbols then we must make sure that we do not strip/discard those
+     symbols that are going to be involved in the relocations.  */
+  if ((   finfo->info->strip   != strip_none
+       || finfo->info->discard != discard_none)
+      && finfo->info->relocatable)
+    {
+      /* Mark the symbol array as 'not-used'.  */
+      memset (indexp, 0, obj_raw_syment_count (input_bfd) * sizeof * indexp);
+
+      mark_relocs (finfo, input_bfd);
+    }
+
+  while (esym < esym_end)
+    {
+      struct internal_syment isym;
+      enum coff_symbol_classification classification;
+      bfd_boolean skip;
+      bfd_boolean global;
+      bfd_boolean dont_skip_symbol;
+      int add;
+
+      bfd_coff_swap_sym_in (input_bfd, esym, isymp);
+
+      /* Make a copy of *isymp so that the relocate_section function
+	 always sees the original values.  This is more reliable than
+	 always recomputing the symbol value even if we are stripping
+	 the symbol.  */
+      isym = *isymp;
+
+      classification = bfd_coff_classify_symbol (input_bfd, &isym);
+      switch (classification)
+	{
+	default:
+	  abort ();
+	case COFF_SYMBOL_GLOBAL:
+	case COFF_SYMBOL_PE_SECTION:
+	case COFF_SYMBOL_LOCAL:
+	  *secpp = coff_section_from_bfd_index (input_bfd, isym.n_scnum);
+	  break;
+	case COFF_SYMBOL_COMMON:
+	  *secpp = bfd_com_section_ptr;
+	  break;
+	case COFF_SYMBOL_UNDEFINED:
+	  *secpp = bfd_und_section_ptr;
+	  break;
+	}
+
+      /* Extract the flag indicating if this symbol is used by a
+         relocation.  */
+      if ((finfo->info->strip != strip_none
+	   || finfo->info->discard != discard_none)
+	  && finfo->info->relocatable)
+	dont_skip_symbol = *indexp;
+      else
+	dont_skip_symbol = FALSE;
+
+      *indexp = -1;
+
+      skip = FALSE;
+      global = FALSE;
+      add = 1 + isym.n_numaux;
+
+      /* If we are stripping all symbols, we want to skip this one.  */
+      if (finfo->info->strip == strip_all && ! dont_skip_symbol)
+	skip = TRUE;
+
+      if (! skip)
+	{
+	  switch (classification)
+	    {
+	    default:
+	      abort ();
+	    case COFF_SYMBOL_GLOBAL:
+	    case COFF_SYMBOL_COMMON:
+	    case COFF_SYMBOL_PE_SECTION:
+	      /* This is a global symbol.  Global symbols come at the
+		 end of the symbol table, so skip them for now.
+		 Locally defined function symbols, however, are an
+		 exception, and are not moved to the end.  */
+	      global = TRUE;
+	      if (! ISFCN (isym.n_type))
+		skip = TRUE;
+	      break;
+
+	    case COFF_SYMBOL_UNDEFINED:
+	      /* Undefined symbols are left for the end.  */
+	      global = TRUE;
+	      skip = TRUE;
+	      break;
+
+	    case COFF_SYMBOL_LOCAL:
+	      /* This is a local symbol.  Skip it if we are discarding
+                 local symbols.  */
+	      if (finfo->info->discard == discard_all && ! dont_skip_symbol)
+		skip = TRUE;
+	      break;
+	    }
+	}
+
+#ifndef COFF_WITH_PE
+      /* Skip section symbols for sections which are not going to be
+	 emitted.  */
+      if (!skip
+	  && !dont_skip_symbol
+	  && isym.n_sclass == C_STAT
+	  && isym.n_type == T_NULL
+	  && isym.n_numaux > 0
+	  && ((*secpp)->output_section == bfd_abs_section_ptr
+	      || bfd_section_removed_from_list (output_bfd,
+						(*secpp)->output_section)))
+	skip = TRUE;
+#endif
+
+      /* If we stripping debugging symbols, and this is a debugging
+         symbol, then skip it.  FIXME: gas sets the section to N_ABS
+         for some types of debugging symbols; I don't know if this is
+         a bug or not.  In any case, we handle it here.  */
+      if (! skip
+	  && finfo->info->strip == strip_debugger
+	  && ! dont_skip_symbol
+	  && (isym.n_scnum == N_DEBUG
+	      || (isym.n_scnum == N_ABS
+		  && (isym.n_sclass == C_AUTO
+		      || isym.n_sclass == C_REG
+		      || isym.n_sclass == C_MOS
+		      || isym.n_sclass == C_MOE
+		      || isym.n_sclass == C_MOU
+		      || isym.n_sclass == C_ARG
+		      || isym.n_sclass == C_REGPARM
+		      || isym.n_sclass == C_FIELD
+		      || isym.n_sclass == C_EOS))))
+	skip = TRUE;
+
+      /* If some symbols are stripped based on the name, work out the
+	 name and decide whether to skip this symbol.  */
+      if (! skip
+	  && (finfo->info->strip == strip_some
+	      || finfo->info->discard == discard_l))
+	{
+	  const char *name;
+	  char buf[SYMNMLEN + 1];
+
+	  name = _bfd_coff_internal_syment_name (input_bfd, &isym, buf);
+	  if (name == NULL)
+	    return FALSE;
+
+	  if (! dont_skip_symbol
+	      && ((finfo->info->strip == strip_some
+		   && (bfd_hash_lookup (finfo->info->keep_hash, name, FALSE,
+				    FALSE) == NULL))
+		   || (! global
+		       && finfo->info->discard == discard_l
+		       && bfd_is_local_label_name (input_bfd, name))))
+	    skip = TRUE;
+	}
+
+      /* If this is an enum, struct, or union tag, see if we have
+         already output an identical type.  */
+      if (! skip
+	  && (finfo->output_bfd->flags & BFD_TRADITIONAL_FORMAT) == 0
+	  && (isym.n_sclass == C_ENTAG
+	      || isym.n_sclass == C_STRTAG
+	      || isym.n_sclass == C_UNTAG)
+	  && isym.n_numaux == 1)
+	{
+	  const char *name;
+	  char buf[SYMNMLEN + 1];
+	  struct coff_debug_merge_hash_entry *mh;
+	  struct coff_debug_merge_type *mt;
+	  union internal_auxent aux;
+	  struct coff_debug_merge_element **epp;
+	  bfd_byte *esl, *eslend;
+	  struct internal_syment *islp;
+	  bfd_size_type amt;
+
+	  name = _bfd_coff_internal_syment_name (input_bfd, &isym, buf);
+	  if (name == NULL)
+	    return FALSE;
+
+	  /* Ignore fake names invented by compiler; treat them all as
+             the same name.  */
+	  if (*name == '~' || *name == '.' || *name == '$'
+	      || (*name == bfd_get_symbol_leading_char (input_bfd)
+		  && (name[1] == '~' || name[1] == '.' || name[1] == '$')))
+	    name = "";
+
+	  mh = coff_debug_merge_hash_lookup (&finfo->debug_merge, name,
+					     TRUE, TRUE);
+	  if (mh == NULL)
+	    return FALSE;
+
+	  /* Allocate memory to hold type information.  If this turns
+             out to be a duplicate, we pass this address to
+             bfd_release.  */
+	  amt = sizeof (struct coff_debug_merge_type);
+	  mt = (struct coff_debug_merge_type *) bfd_alloc (input_bfd, amt);
+	  if (mt == NULL)
+	    return FALSE;
+	  mt->type_class = isym.n_sclass;
+
+	  /* Pick up the aux entry, which points to the end of the tag
+             entries.  */
+	  bfd_coff_swap_aux_in (input_bfd, (esym + isymesz),
+				isym.n_type, isym.n_sclass, 0, isym.n_numaux,
+				&aux);
+
+	  /* Gather the elements.  */
+	  epp = &mt->elements;
+	  mt->elements = NULL;
+	  islp = isymp + 2;
+	  esl = esym + 2 * isymesz;
+	  eslend = ((bfd_byte *) obj_coff_external_syms (input_bfd)
+		    + aux.x_sym.x_fcnary.x_fcn.x_endndx.l * isymesz);
+	  while (esl < eslend)
+	    {
+	      const char *elename;
+	      char elebuf[SYMNMLEN + 1];
+	      char *name_copy;
+
+	      bfd_coff_swap_sym_in (input_bfd, esl, islp);
+
+	      amt = sizeof (struct coff_debug_merge_element);
+	      *epp = (struct coff_debug_merge_element *)
+                  bfd_alloc (input_bfd, amt);
+	      if (*epp == NULL)
+		return FALSE;
+
+	      elename = _bfd_coff_internal_syment_name (input_bfd, islp,
+							elebuf);
+	      if (elename == NULL)
+		return FALSE;
+
+	      amt = strlen (elename) + 1;
+	      name_copy = (char *) bfd_alloc (input_bfd, amt);
+	      if (name_copy == NULL)
+		return FALSE;
+	      strcpy (name_copy, elename);
+
+	      (*epp)->name = name_copy;
+	      (*epp)->type = islp->n_type;
+	      (*epp)->tagndx = 0;
+	      if (islp->n_numaux >= 1
+		  && islp->n_type != T_NULL
+		  && islp->n_sclass != C_EOS)
+		{
+		  union internal_auxent eleaux;
+		  long indx;
+
+		  bfd_coff_swap_aux_in (input_bfd, (esl + isymesz),
+					islp->n_type, islp->n_sclass, 0,
+					islp->n_numaux, &eleaux);
+		  indx = eleaux.x_sym.x_tagndx.l;
+
+		  /* FIXME: If this tagndx entry refers to a symbol
+		     defined later in this file, we just ignore it.
+		     Handling this correctly would be tedious, and may
+		     not be required.  */
+		  if (indx > 0
+		      && (indx
+			  < ((esym -
+			      (bfd_byte *) obj_coff_external_syms (input_bfd))
+			     / (long) isymesz)))
+		    {
+		      (*epp)->tagndx = finfo->sym_indices[indx];
+		      if ((*epp)->tagndx < 0)
+			(*epp)->tagndx = 0;
+		    }
+		}
+	      epp = &(*epp)->next;
+	      *epp = NULL;
+
+	      esl += (islp->n_numaux + 1) * isymesz;
+	      islp += islp->n_numaux + 1;
+	    }
+
+	  /* See if we already have a definition which matches this
+             type.  We always output the type if it has no elements,
+             for simplicity.  */
+	  if (mt->elements == NULL)
+	    bfd_release (input_bfd, mt);
+	  else
+	    {
+	      struct coff_debug_merge_type *mtl;
+
+	      for (mtl = mh->types; mtl != NULL; mtl = mtl->next)
+		{
+		  struct coff_debug_merge_element *me, *mel;
+
+		  if (mtl->type_class != mt->type_class)
+		    continue;
+
+		  for (me = mt->elements, mel = mtl->elements;
+		       me != NULL && mel != NULL;
+		       me = me->next, mel = mel->next)
+		    {
+		      if (strcmp (me->name, mel->name) != 0
+			  || me->type != mel->type
+			  || me->tagndx != mel->tagndx)
+			break;
+		    }
+
+		  if (me == NULL && mel == NULL)
+		    break;
+		}
+
+	      if (mtl == NULL || (bfd_size_type) mtl->indx >= syment_base)
+		{
+		  /* This is the first definition of this type.  */
+		  mt->indx = output_index;
+		  mt->next = mh->types;
+		  mh->types = mt;
+		}
+	      else
+		{
+		  /* This is a redefinition which can be merged.  */
+		  bfd_release (input_bfd, mt);
+		  *indexp = mtl->indx;
+		  add = (eslend - esym) / isymesz;
+		  skip = TRUE;
+		}
+	    }
+	}
+
+      /* We now know whether we are to skip this symbol or not.  */
+      if (! skip)
+	{
+	  /* Adjust the symbol in order to output it.  */
+
+	  if (isym._n._n_n._n_zeroes == 0
+	      && isym._n._n_n._n_offset != 0)
+	    {
+	      const char *name;
+	      bfd_size_type indx;
+
+	      /* This symbol has a long name.  Enter it in the string
+		 table we are building.  Note that we do not check
+		 bfd_coff_symname_in_debug.  That is only true for
+		 XCOFF, and XCOFF requires different linking code
+		 anyhow.  */
+	      name = _bfd_coff_internal_syment_name (input_bfd, &isym, NULL);
+	      if (name == NULL)
+		return FALSE;
+	      indx = _bfd_stringtab_add (finfo->strtab, name, hash, copy);
+	      if (indx == (bfd_size_type) -1)
+		return FALSE;
+	      isym._n._n_n._n_offset = STRING_SIZE_SIZE + indx;
+	    }
+
+	  switch (isym.n_sclass)
+	    {
+	    case C_AUTO:
+	    case C_MOS:
+	    case C_EOS:
+	    case C_MOE:
+	    case C_MOU:
+	    case C_UNTAG:
+	    case C_STRTAG:
+	    case C_ENTAG:
+	    case C_TPDEF:
+	    case C_ARG:
+	    case C_USTATIC:
+	    case C_REG:
+	    case C_REGPARM:
+	    case C_FIELD:
+	      /* The symbol value should not be modified.  */
+	      break;
+
+	    case C_FCN:
+	      if (obj_pe (input_bfd)
+		  && strcmp (isym.n_name, ".bf") != 0
+		  && isym.n_scnum > 0)
+		{
+		  /* For PE, .lf and .ef get their value left alone,
+		     while .bf gets relocated.  However, they all have
+		     "real" section numbers, and need to be moved into
+		     the new section.  */
+		  isym.n_scnum = (*secpp)->output_section->target_index;
+		  break;
+		}
+	      /* Fall through.  */
+	    default:
+	    case C_LABEL:  /* Not completely sure about these 2 */
+	    case C_EXTDEF:
+	    case C_BLOCK:
+	    case C_EFCN:
+	    case C_NULL:
+	    case C_EXT:
+	    case C_STAT:
+	    case C_SECTION:
+	    case C_NT_WEAK:
+	      /* Compute new symbol location.  */
+	    if (isym.n_scnum > 0)
+	      {
+		isym.n_scnum = (*secpp)->output_section->target_index;
+		isym.n_value += (*secpp)->output_offset;
+		if (! obj_pe (input_bfd))
+		  isym.n_value -= (*secpp)->vma;
+		if (! obj_pe (finfo->output_bfd))
+		  isym.n_value += (*secpp)->output_section->vma;
+	      }
+	    break;
+
+	    case C_FILE:
+	      /* The value of a C_FILE symbol is the symbol index of
+		 the next C_FILE symbol.  The value of the last C_FILE
+		 symbol is the symbol index to the first external
+		 symbol (actually, coff_renumber_symbols does not get
+		 this right--it just sets the value of the last C_FILE
+		 symbol to zero--and nobody has ever complained about
+		 it).  We try to get this right, below, just before we
+		 write the symbols out, but in the general case we may
+		 have to write the symbol out twice.  */
+	      if (finfo->last_file_index != -1
+		  && finfo->last_file.n_value != (bfd_vma) output_index)
+		{
+		  /* We must correct the value of the last C_FILE
+                     entry.  */
+		  finfo->last_file.n_value = output_index;
+		  if ((bfd_size_type) finfo->last_file_index >= syment_base)
+		    {
+		      /* The last C_FILE symbol is in this input file.  */
+		      bfd_coff_swap_sym_out (output_bfd,
+					     &finfo->last_file,
+					     (finfo->outsyms
+					      + ((finfo->last_file_index
+						  - syment_base)
+						 * osymesz)));
+		    }
+		  else
+		    {
+		      file_ptr pos;
+
+		      /* We have already written out the last C_FILE
+			 symbol.  We need to write it out again.  We
+			 borrow *outsym temporarily.  */
+		      bfd_coff_swap_sym_out (output_bfd,
+					     &finfo->last_file, outsym);
+		      pos = obj_sym_filepos (output_bfd);
+		      pos += finfo->last_file_index * osymesz;
+		      if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
+			  || bfd_bwrite (outsym, osymesz, output_bfd) != osymesz)
+			return FALSE;
+		    }
+		}
+
+	      finfo->last_file_index = output_index;
+	      finfo->last_file = isym;
+	      break;
+	    }
+
+	  /* If doing task linking, convert normal global function symbols to
+	     static functions.  */
+	  if (finfo->info->task_link && IS_EXTERNAL (input_bfd, isym))
+	    isym.n_sclass = C_STAT;
+
+	  /* Output the symbol.  */
+	  bfd_coff_swap_sym_out (output_bfd, &isym, outsym);
+
+	  *indexp = output_index;
+
+	  if (global)
+	    {
+	      long indx;
+	      struct coff_link_hash_entry *h;
+
+	      indx = ((esym - (bfd_byte *) obj_coff_external_syms (input_bfd))
+		      / isymesz);
+	      h = obj_coff_sym_hashes (input_bfd)[indx];
+	      if (h == NULL)
+		{
+		  /* This can happen if there were errors earlier in
+                     the link.  */
+		  bfd_set_error (bfd_error_bad_value);
+		  return FALSE;
+		}
+	      h->indx = output_index;
+	    }
+
+	  output_index += add;
+	  outsym += add * osymesz;
+	}
+
+      esym += add * isymesz;
+      isymp += add;
+      ++secpp;
+      ++indexp;
+      for (--add; add > 0; --add)
+	{
+	  *secpp++ = NULL;
+	  *indexp++ = -1;
+	}
+    }
+
+  /* Fix up the aux entries.  This must be done in a separate pass,
+     because we don't know the correct symbol indices until we have
+     already decided which symbols we are going to keep.  */
+  esym = (bfd_byte *) obj_coff_external_syms (input_bfd);
+  esym_end = esym + obj_raw_syment_count (input_bfd) * isymesz;
+  isymp = finfo->internal_syms;
+  indexp = finfo->sym_indices;
+  sym_hash = obj_coff_sym_hashes (input_bfd);
+  outsym = finfo->outsyms;
+
+  while (esym < esym_end)
+    {
+      int add;
+
+      add = 1 + isymp->n_numaux;
+
+      if ((*indexp < 0
+	   || (bfd_size_type) *indexp < syment_base)
+	  && (*sym_hash == NULL
+	      || (*sym_hash)->auxbfd != input_bfd))
+	esym += add * isymesz;
+      else
+	{
+	  struct coff_link_hash_entry *h;
+	  int i;
+
+	  h = NULL;
+	  if (*indexp < 0)
+	    {
+	      h = *sym_hash;
+
+	      /* The m68k-motorola-sysv assembler will sometimes
+                 generate two symbols with the same name, but only one
+                 will have aux entries.  */
+	      BFD_ASSERT (isymp->n_numaux == 0
+			  || h->numaux == 0
+			  || h->numaux == isymp->n_numaux);
+	    }
+
+	  esym += isymesz;
+
+	  if (h == NULL)
+	    outsym += osymesz;
+
+	  /* Handle the aux entries.  This handling is based on
+	     coff_pointerize_aux.  I don't know if it always correct.  */
+	  for (i = 0; i < isymp->n_numaux && esym < esym_end; i++)
+	    {
+	      union internal_auxent aux;
+	      union internal_auxent *auxp;
+
+	      if (h != NULL && h->aux != NULL && (h->numaux > i))
+		auxp = h->aux + i;
+	      else
+		{
+		  bfd_coff_swap_aux_in (input_bfd, esym, isymp->n_type,
+					isymp->n_sclass, i, isymp->n_numaux, &aux);
+		  auxp = &aux;
+		}
+
+	      if (isymp->n_sclass == C_FILE)
+		{
+		  /* If this is a long filename, we must put it in the
+		     string table.  */
+		  if (auxp->x_file.x_n.x_zeroes == 0
+		      && auxp->x_file.x_n.x_offset != 0)
+		    {
+		      const char *filename;
+		      bfd_size_type indx;
+
+		      BFD_ASSERT (auxp->x_file.x_n.x_offset
+				  >= STRING_SIZE_SIZE);
+		      if (strings == NULL)
+			{
+			  strings = _bfd_coff_read_string_table (input_bfd);
+			  if (strings == NULL)
+			    return FALSE;
+			}
+		      filename = strings + auxp->x_file.x_n.x_offset;
+		      indx = _bfd_stringtab_add (finfo->strtab, filename,
+						 hash, copy);
+		      if (indx == (bfd_size_type) -1)
+			return FALSE;
+		      auxp->x_file.x_n.x_offset = STRING_SIZE_SIZE + indx;
+		    }
+		}
+	      else if ((isymp->n_sclass != C_STAT || isymp->n_type != T_NULL)
+		       && isymp->n_sclass != C_NT_WEAK)
+		{
+		  unsigned long indx;
+
+		  if (ISFCN (isymp->n_type)
+		      || ISTAG (isymp->n_sclass)
+		      || isymp->n_sclass == C_BLOCK
+		      || isymp->n_sclass == C_FCN)
+		    {
+		      indx = auxp->x_sym.x_fcnary.x_fcn.x_endndx.l;
+		      if (indx > 0
+			  && indx < obj_raw_syment_count (input_bfd))
+			{
+			  /* We look forward through the symbol for
+                             the index of the next symbol we are going
+                             to include.  I don't know if this is
+                             entirely right.  */
+			  while ((finfo->sym_indices[indx] < 0
+				  || ((bfd_size_type) finfo->sym_indices[indx]
+				      < syment_base))
+				 && indx < obj_raw_syment_count (input_bfd))
+			    ++indx;
+			  if (indx >= obj_raw_syment_count (input_bfd))
+			    indx = output_index;
+			  else
+			    indx = finfo->sym_indices[indx];
+			  auxp->x_sym.x_fcnary.x_fcn.x_endndx.l = indx;
+			}
+		    }
+
+		  indx = auxp->x_sym.x_tagndx.l;
+		  if (indx > 0 && indx < obj_raw_syment_count (input_bfd))
+		    {
+		      long symindx;
+
+		      symindx = finfo->sym_indices[indx];
+		      if (symindx < 0)
+			auxp->x_sym.x_tagndx.l = 0;
+		      else
+			auxp->x_sym.x_tagndx.l = symindx;
+		    }
+
+		  /* The .bf symbols are supposed to be linked through
+		     the endndx field.  We need to carry this list
+		     across object files.  */
+		  if (i == 0
+		      && h == NULL
+		      && isymp->n_sclass == C_FCN
+		      && (isymp->_n._n_n._n_zeroes != 0
+			  || isymp->_n._n_n._n_offset == 0)
+		      && isymp->_n._n_name[0] == '.'
+		      && isymp->_n._n_name[1] == 'b'
+		      && isymp->_n._n_name[2] == 'f'
+		      && isymp->_n._n_name[3] == '\0')
+		    {
+		      if (finfo->last_bf_index != -1)
+			{
+			  finfo->last_bf.x_sym.x_fcnary.x_fcn.x_endndx.l =
+			    *indexp;
+
+			  if ((bfd_size_type) finfo->last_bf_index
+			      >= syment_base)
+			    {
+			      void *auxout;
+
+			      /* The last .bf symbol is in this input
+				 file.  This will only happen if the
+				 assembler did not set up the .bf
+				 endndx symbols correctly.  */
+			      auxout = (finfo->outsyms
+					+ ((finfo->last_bf_index
+					    - syment_base)
+					   * osymesz));
+
+			      bfd_coff_swap_aux_out (output_bfd,
+						     &finfo->last_bf,
+						     isymp->n_type,
+						     isymp->n_sclass,
+						     0, isymp->n_numaux,
+						     auxout);
+			    }
+			  else
+			    {
+			      file_ptr pos;
+
+			      /* We have already written out the last
+                                 .bf aux entry.  We need to write it
+                                 out again.  We borrow *outsym
+                                 temporarily.  FIXME: This case should
+                                 be made faster.  */
+			      bfd_coff_swap_aux_out (output_bfd,
+						     &finfo->last_bf,
+						     isymp->n_type,
+						     isymp->n_sclass,
+						     0, isymp->n_numaux,
+						     outsym);
+			      pos = obj_sym_filepos (output_bfd);
+			      pos += finfo->last_bf_index * osymesz;
+			      if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
+				  || (bfd_bwrite (outsym, osymesz, output_bfd)
+				      != osymesz))
+				return FALSE;
+			    }
+			}
+
+		      if (auxp->x_sym.x_fcnary.x_fcn.x_endndx.l != 0)
+			finfo->last_bf_index = -1;
+		      else
+			{
+			  /* The endndx field of this aux entry must
+                             be updated with the symbol number of the
+                             next .bf symbol.  */
+			  finfo->last_bf = *auxp;
+			  finfo->last_bf_index = (((outsym - finfo->outsyms)
+						   / osymesz)
+						  + syment_base);
+			}
+		    }
+		}
+
+	      if (h == NULL)
+		{
+		  bfd_coff_swap_aux_out (output_bfd, auxp, isymp->n_type,
+					 isymp->n_sclass, i, isymp->n_numaux,
+					 outsym);
+		  outsym += osymesz;
+		}
+
+	      esym += isymesz;
+	    }
+	}
+
+      indexp += add;
+      isymp += add;
+      sym_hash += add;
+    }
+
+  /* Relocate the line numbers, unless we are stripping them.  */
+  if (finfo->info->strip == strip_none
+      || finfo->info->strip == strip_some)
+    {
+      for (o = input_bfd->sections; o != NULL; o = o->next)
+	{
+	  bfd_vma offset;
+	  bfd_byte *eline;
+	  bfd_byte *elineend;
+	  bfd_byte *oeline;
+	  bfd_boolean skipping;
+	  file_ptr pos;
+	  bfd_size_type amt;
+
+	  /* FIXME: If SEC_HAS_CONTENTS is not for the section, then
+	     build_link_order in ldwrite.c will not have created a
+	     link order, which means that we will not have seen this
+	     input section in _bfd_coff_final_link, which means that
+	     we will not have allocated space for the line numbers of
+	     this section.  I don't think line numbers can be
+	     meaningful for a section which does not have
+	     SEC_HAS_CONTENTS set, but, if they do, this must be
+	     changed.  */
+	  if (o->lineno_count == 0
+	      || (o->output_section->flags & SEC_HAS_CONTENTS) == 0)
+	    continue;
+
+	  if (bfd_seek (input_bfd, o->line_filepos, SEEK_SET) != 0
+	      || bfd_bread (finfo->linenos, linesz * o->lineno_count,
+			   input_bfd) != linesz * o->lineno_count)
+	    return FALSE;
+
+	  offset = o->output_section->vma + o->output_offset - o->vma;
+	  eline = finfo->linenos;
+	  oeline = finfo->linenos;
+	  elineend = eline + linesz * o->lineno_count;
+	  skipping = FALSE;
+	  for (; eline < elineend; eline += linesz)
+	    {
+	      struct internal_lineno iline;
+
+	      bfd_coff_swap_lineno_in (input_bfd, eline, &iline);
+
+	      if (iline.l_lnno != 0)
+		iline.l_addr.l_paddr += offset;
+	      else if (iline.l_addr.l_symndx >= 0
+		       && ((unsigned long) iline.l_addr.l_symndx
+			   < obj_raw_syment_count (input_bfd)))
+		{
+		  long indx;
+
+		  indx = finfo->sym_indices[iline.l_addr.l_symndx];
+
+		  if (indx < 0)
+		    {
+		      /* These line numbers are attached to a symbol
+			 which we are stripping.  We must discard the
+			 line numbers because reading them back with
+			 no associated symbol (or associating them all
+			 with symbol #0) will fail.  We can't regain
+			 the space in the output file, but at least
+			 they're dense.  */
+		      skipping = TRUE;
+		    }
+		  else
+		    {
+		      struct internal_syment is;
+		      union internal_auxent ia;
+
+		      /* Fix up the lnnoptr field in the aux entry of
+			 the symbol.  It turns out that we can't do
+			 this when we modify the symbol aux entries,
+			 because gas sometimes screws up the lnnoptr
+			 field and makes it an offset from the start
+			 of the line numbers rather than an absolute
+			 file index.  */
+		      bfd_coff_swap_sym_in (output_bfd,
+					    (finfo->outsyms
+					     + ((indx - syment_base)
+						* osymesz)), &is);
+		      if ((ISFCN (is.n_type)
+			   || is.n_sclass == C_BLOCK)
+			  && is.n_numaux >= 1)
+			{
+			  void *auxptr;
+
+			  auxptr = (finfo->outsyms
+				    + ((indx - syment_base + 1)
+				       * osymesz));
+			  bfd_coff_swap_aux_in (output_bfd, auxptr,
+						is.n_type, is.n_sclass,
+						0, is.n_numaux, &ia);
+			  ia.x_sym.x_fcnary.x_fcn.x_lnnoptr =
+			    (o->output_section->line_filepos
+			     + o->output_section->lineno_count * linesz
+			     + eline - finfo->linenos);
+			  bfd_coff_swap_aux_out (output_bfd, &ia,
+						 is.n_type, is.n_sclass, 0,
+						 is.n_numaux, auxptr);
+			}
+
+		      skipping = FALSE;
+		    }
+
+		  iline.l_addr.l_symndx = indx;
+		}
+
+	      if (!skipping)
+	        {
+		  bfd_coff_swap_lineno_out (output_bfd, &iline, oeline);
+		  oeline += linesz;
+		}
+	    }
+
+	  pos = o->output_section->line_filepos;
+	  pos += o->output_section->lineno_count * linesz;
+	  amt = oeline - finfo->linenos;
+	  if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
+	      || bfd_bwrite (finfo->linenos, amt, output_bfd) != amt)
+	    return FALSE;
+
+	  o->output_section->lineno_count += amt / linesz;
+	}
+    }
+
+  /* If we swapped out a C_FILE symbol, guess that the next C_FILE
+     symbol will be the first symbol in the next input file.  In the
+     normal case, this will save us from writing out the C_FILE symbol
+     again.  */
+  if (finfo->last_file_index != -1
+      && (bfd_size_type) finfo->last_file_index >= syment_base)
+    {
+      finfo->last_file.n_value = output_index;
+      bfd_coff_swap_sym_out (output_bfd, &finfo->last_file,
+			     (finfo->outsyms
+			      + ((finfo->last_file_index - syment_base)
+				 * osymesz)));
+    }
+
+  /* Write the modified symbols to the output file.  */
+  if (outsym > finfo->outsyms)
+    {
+      file_ptr pos;
+      bfd_size_type amt;
+
+      pos = obj_sym_filepos (output_bfd) + syment_base * osymesz;
+      amt = outsym - finfo->outsyms;
+      if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
+	  || bfd_bwrite (finfo->outsyms, amt, output_bfd) != amt)
+	return FALSE;
+
+      BFD_ASSERT ((obj_raw_syment_count (output_bfd)
+		   + (outsym - finfo->outsyms) / osymesz)
+		  == output_index);
+
+      obj_raw_syment_count (output_bfd) = output_index;
+    }
+
+  /* Relocate the contents of each section.  */
+  adjust_symndx = coff_backend_info (input_bfd)->_bfd_coff_adjust_symndx;
+  for (o = input_bfd->sections; o != NULL; o = o->next)
+    {
+      bfd_byte *contents;
+      struct coff_section_tdata *secdata;
+
+      if (! o->linker_mark)
+	/* This section was omitted from the link.  */
+	continue;
+
+      if ((o->flags & SEC_LINKER_CREATED) != 0)
+	continue;
+
+      if ((o->flags & SEC_HAS_CONTENTS) == 0
+	  || (o->size == 0 && (o->flags & SEC_RELOC) == 0))
+	{
+	  if ((o->flags & SEC_RELOC) != 0
+	      && o->reloc_count != 0)
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: relocs in section `%A', but it has no contents"),
+		 input_bfd, o);
+	      bfd_set_error (bfd_error_no_contents);
+	      return FALSE;
+	    }
+
+	  continue;
+	}
+
+      secdata = coff_section_data (input_bfd, o);
+      if (secdata != NULL && secdata->contents != NULL)
+	contents = secdata->contents;
+      else
+	{
+	  bfd_size_type x = o->rawsize ? o->rawsize : o->size;
+	  if (! bfd_get_section_contents (input_bfd, o, finfo->contents, 0, x))
+	    return FALSE;
+	  contents = finfo->contents;
+	}
+
+      if ((o->flags & SEC_RELOC) != 0)
+	{
+	  int target_index;
+	  struct internal_reloc *internal_relocs;
+	  struct internal_reloc *irel;
+
+	  /* Read in the relocs.  */
+	  target_index = o->output_section->target_index;
+	  internal_relocs = (_bfd_coff_read_internal_relocs
+			     (input_bfd, o, FALSE, finfo->external_relocs,
+			      finfo->info->relocatable,
+			      (finfo->info->relocatable
+			       ? (finfo->section_info[target_index].relocs
+				  + o->output_section->reloc_count)
+			       : finfo->internal_relocs)));
+	  if (internal_relocs == NULL)
+	    return FALSE;
+
+	  /* Run through the relocs looking for relocs against symbols
+	     coming from discarded sections and complain about them.  */
+	  irel = internal_relocs;
+	  for (; irel < &internal_relocs[o->reloc_count]; irel++)
+	    {
+	      struct coff_link_hash_entry *h;
+	      asection *ps = NULL;
+	      long symndx = irel->r_symndx;
+	      if (symndx < 0)
+		continue;
+	      h = obj_coff_sym_hashes (input_bfd)[symndx];
+	      if (h == NULL)
+		continue;
+	      while (h->root.type == bfd_link_hash_indirect
+		     || h->root.type == bfd_link_hash_warning)
+		h = (struct coff_link_hash_entry *) h->root.u.i.link;
+	      if (h->root.type == bfd_link_hash_defined
+		  || h->root.type == bfd_link_hash_defweak)
+		ps = h->root.u.def.section;
+	      if (ps == NULL)
+		continue;
+	      /* Complain if definition comes from an excluded section.  */
+	      if (ps->flags & SEC_EXCLUDE)
+		(*finfo->info->callbacks->einfo)
+		  (_("%X`%s' referenced in section `%A' of %B: "
+		     "defined in discarded section `%A' of %B\n"),
+		   h->root.root.string, o, input_bfd, ps, ps->owner);
+	    }
+
+	  /* Call processor specific code to relocate the section
+             contents.  */
+	  if (! bfd_coff_relocate_section (output_bfd, finfo->info,
+					   input_bfd, o,
+					   contents,
+					   internal_relocs,
+					   finfo->internal_syms,
+					   finfo->sec_ptrs))
+	    return FALSE;
+
+	  if (finfo->info->relocatable)
+	    {
+	      bfd_vma offset;
+	      struct internal_reloc *irelend;
+	      struct coff_link_hash_entry **rel_hash;
+
+	      offset = o->output_section->vma + o->output_offset - o->vma;
+	      irel = internal_relocs;
+	      irelend = irel + o->reloc_count;
+	      rel_hash = (finfo->section_info[target_index].rel_hashes
+			  + o->output_section->reloc_count);
+	      for (; irel < irelend; irel++, rel_hash++)
+		{
+		  struct coff_link_hash_entry *h;
+		  bfd_boolean adjusted;
+
+		  *rel_hash = NULL;
+
+		  /* Adjust the reloc address and symbol index.  */
+		  irel->r_vaddr += offset;
+
+		  if (irel->r_symndx == -1)
+		    continue;
+
+		  if (adjust_symndx)
+		    {
+		      if (! (*adjust_symndx) (output_bfd, finfo->info,
+					      input_bfd, o, irel,
+					      &adjusted))
+			return FALSE;
+		      if (adjusted)
+			continue;
+		    }
+
+		  h = obj_coff_sym_hashes (input_bfd)[irel->r_symndx];
+		  if (h != NULL)
+		    {
+		      /* This is a global symbol.  */
+		      if (h->indx >= 0)
+			irel->r_symndx = h->indx;
+		      else
+			{
+			  /* This symbol is being written at the end
+			     of the file, and we do not yet know the
+			     symbol index.  We save the pointer to the
+			     hash table entry in the rel_hash list.
+			     We set the indx field to -2 to indicate
+			     that this symbol must not be stripped.  */
+			  *rel_hash = h;
+			  h->indx = -2;
+			}
+		    }
+		  else
+		    {
+		      long indx;
+
+		      indx = finfo->sym_indices[irel->r_symndx];
+		      if (indx != -1)
+			irel->r_symndx = indx;
+		      else
+			{
+			  struct internal_syment *is;
+			  const char *name;
+			  char buf[SYMNMLEN + 1];
+
+			  /* This reloc is against a symbol we are
+                             stripping.  This should have been handled
+			     by the 'dont_skip_symbol' code in the while
+			     loop at the top of this function.  */
+			  is = finfo->internal_syms + irel->r_symndx;
+
+			  name = (_bfd_coff_internal_syment_name
+				  (input_bfd, is, buf));
+			  if (name == NULL)
+			    return FALSE;
+
+			  if (! ((*finfo->info->callbacks->unattached_reloc)
+				 (finfo->info, name, input_bfd, o,
+				  irel->r_vaddr)))
+			    return FALSE;
+			}
+		    }
+		}
+
+	      o->output_section->reloc_count += o->reloc_count;
+	    }
+	}
+
+      /* Write out the modified section contents.  */
+      if (secdata == NULL || secdata->stab_info == NULL)
+	{
+	  file_ptr loc = o->output_offset * bfd_octets_per_byte (output_bfd);
+	  if (! bfd_set_section_contents (output_bfd, o->output_section,
+					  contents, loc, o->size))
+	    return FALSE;
+	}
+      else
+	{
+	  if (! (_bfd_write_section_stabs
+		 (output_bfd, &coff_hash_table (finfo->info)->stab_info,
+		  o, &secdata->stab_info, contents)))
+	    return FALSE;
+	}
+    }
+
+  if (! finfo->info->keep_memory
+      && ! _bfd_coff_free_symbols (input_bfd))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Write out a global symbol.  Called via bfd_hash_traverse.  */
+
+bfd_boolean
+_bfd_coff_write_global_sym (struct bfd_hash_entry *bh, void *data)
+{
+  struct coff_link_hash_entry *h = (struct coff_link_hash_entry *) bh;
+  struct coff_final_link_info *finfo = (struct coff_final_link_info *) data;
+  bfd *output_bfd;
+  struct internal_syment isym;
+  bfd_size_type symesz;
+  unsigned int i;
+  file_ptr pos;
+
+  output_bfd = finfo->output_bfd;
+
+  if (h->root.type == bfd_link_hash_warning)
+    {
+      h = (struct coff_link_hash_entry *) h->root.u.i.link;
+      if (h->root.type == bfd_link_hash_new)
+	return TRUE;
+    }
+
+  if (h->indx >= 0)
+    return TRUE;
+
+  if (h->indx != -2
+      && (finfo->info->strip == strip_all
+	  || (finfo->info->strip == strip_some
+	      && (bfd_hash_lookup (finfo->info->keep_hash,
+				   h->root.root.string, FALSE, FALSE)
+		  == NULL))))
+    return TRUE;
+
+  switch (h->root.type)
+    {
+    default:
+    case bfd_link_hash_new:
+    case bfd_link_hash_warning:
+      abort ();
+      return FALSE;
+
+    case bfd_link_hash_undefined:
+    case bfd_link_hash_undefweak:
+      isym.n_scnum = N_UNDEF;
+      isym.n_value = 0;
+      break;
+
+    case bfd_link_hash_defined:
+    case bfd_link_hash_defweak:
+      {
+	asection *sec;
+
+	sec = h->root.u.def.section->output_section;
+	if (bfd_is_abs_section (sec))
+	  isym.n_scnum = N_ABS;
+	else
+	  isym.n_scnum = sec->target_index;
+	isym.n_value = (h->root.u.def.value
+			+ h->root.u.def.section->output_offset);
+	if (! obj_pe (finfo->output_bfd))
+	  isym.n_value += sec->vma;
+      }
+      break;
+
+    case bfd_link_hash_common:
+      isym.n_scnum = N_UNDEF;
+      isym.n_value = h->root.u.c.size;
+      break;
+
+    case bfd_link_hash_indirect:
+      /* Just ignore these.  They can't be handled anyhow.  */
+      return TRUE;
+    }
+
+  if (strlen (h->root.root.string) <= SYMNMLEN)
+    strncpy (isym._n._n_name, h->root.root.string, SYMNMLEN);
+  else
+    {
+      bfd_boolean hash;
+      bfd_size_type indx;
+
+      hash = TRUE;
+      if ((output_bfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
+	hash = FALSE;
+      indx = _bfd_stringtab_add (finfo->strtab, h->root.root.string, hash,
+				 FALSE);
+      if (indx == (bfd_size_type) -1)
+	{
+	  finfo->failed = TRUE;
+	  return FALSE;
+	}
+      isym._n._n_n._n_zeroes = 0;
+      isym._n._n_n._n_offset = STRING_SIZE_SIZE + indx;
+    }
+
+  isym.n_sclass = h->symbol_class;
+  isym.n_type = h->type;
+
+  if (isym.n_sclass == C_NULL)
+    isym.n_sclass = C_EXT;
+
+  /* If doing task linking and this is the pass where we convert
+     defined globals to statics, then do that conversion now.  If the
+     symbol is not being converted, just ignore it and it will be
+     output during a later pass.  */
+  if (finfo->global_to_static)
+    {
+      if (! IS_EXTERNAL (output_bfd, isym))
+	return TRUE;
+
+      isym.n_sclass = C_STAT;
+    }
+
+  /* When a weak symbol is not overridden by a strong one,
+     turn it into an external symbol when not building a
+     shared or relocatable object.  */
+  if (! finfo->info->shared
+      && ! finfo->info->relocatable
+      && IS_WEAK_EXTERNAL (finfo->output_bfd, isym))
+    isym.n_sclass = C_EXT;
+
+  isym.n_numaux = h->numaux;
+
+  bfd_coff_swap_sym_out (output_bfd, &isym, finfo->outsyms);
+
+  symesz = bfd_coff_symesz (output_bfd);
+
+  pos = obj_sym_filepos (output_bfd);
+  pos += obj_raw_syment_count (output_bfd) * symesz;
+  if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
+      || bfd_bwrite (finfo->outsyms, symesz, output_bfd) != symesz)
+    {
+      finfo->failed = TRUE;
+      return FALSE;
+    }
+
+  h->indx = obj_raw_syment_count (output_bfd);
+
+  ++obj_raw_syment_count (output_bfd);
+
+  /* Write out any associated aux entries.  Most of the aux entries
+     will have been modified in _bfd_coff_link_input_bfd.  We have to
+     handle section aux entries here, now that we have the final
+     relocation and line number counts.  */
+  for (i = 0; i < isym.n_numaux; i++)
+    {
+      union internal_auxent *auxp;
+
+      auxp = h->aux + i;
+
+      /* Look for a section aux entry here using the same tests that
+         coff_swap_aux_out uses.  */
+      if (i == 0
+	  && (isym.n_sclass == C_STAT
+	      || isym.n_sclass == C_HIDDEN)
+	  && isym.n_type == T_NULL
+	  && (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak))
+	{
+	  asection *sec;
+
+	  sec = h->root.u.def.section->output_section;
+	  if (sec != NULL)
+	    {
+	      auxp->x_scn.x_scnlen = sec->size;
+
+	      /* For PE, an overflow on the final link reportedly does
+                 not matter.  FIXME: Why not?  */
+	      if (sec->reloc_count > 0xffff
+		  && (! obj_pe (output_bfd)
+		      || finfo->info->relocatable))
+		(*_bfd_error_handler)
+		  (_("%s: %s: reloc overflow: 0x%lx > 0xffff"),
+		   bfd_get_filename (output_bfd),
+		   bfd_get_section_name (output_bfd, sec),
+		   sec->reloc_count);
+
+	      if (sec->lineno_count > 0xffff
+		  && (! obj_pe (output_bfd)
+		      || finfo->info->relocatable))
+		(*_bfd_error_handler)
+		  (_("%s: warning: %s: line number overflow: 0x%lx > 0xffff"),
+		   bfd_get_filename (output_bfd),
+		   bfd_get_section_name (output_bfd, sec),
+		   sec->lineno_count);
+
+	      auxp->x_scn.x_nreloc = sec->reloc_count;
+	      auxp->x_scn.x_nlinno = sec->lineno_count;
+	      auxp->x_scn.x_checksum = 0;
+	      auxp->x_scn.x_associated = 0;
+	      auxp->x_scn.x_comdat = 0;
+	    }
+	}
+
+      bfd_coff_swap_aux_out (output_bfd, auxp, isym.n_type,
+			     isym.n_sclass, (int) i, isym.n_numaux,
+			     finfo->outsyms);
+      if (bfd_bwrite (finfo->outsyms, symesz, output_bfd) != symesz)
+	{
+	  finfo->failed = TRUE;
+	  return FALSE;
+	}
+      ++obj_raw_syment_count (output_bfd);
+    }
+
+  return TRUE;
+}
+
+/* Write out task global symbols, converting them to statics.  Called
+   via coff_link_hash_traverse.  Calls bfd_coff_write_global_sym to do
+   the dirty work, if the symbol we are processing needs conversion.  */
+
+bfd_boolean
+_bfd_coff_write_task_globals (struct coff_link_hash_entry *h, void *data)
+{
+  struct coff_final_link_info *finfo = (struct coff_final_link_info *) data;
+  bfd_boolean rtnval = TRUE;
+  bfd_boolean save_global_to_static;
+
+  if (h->root.type == bfd_link_hash_warning)
+    h = (struct coff_link_hash_entry *) h->root.u.i.link;
+
+  if (h->indx < 0)
+    {
+      switch (h->root.type)
+	{
+	case bfd_link_hash_defined:
+	case bfd_link_hash_defweak:
+	  save_global_to_static = finfo->global_to_static;
+	  finfo->global_to_static = TRUE;
+	  rtnval = _bfd_coff_write_global_sym (&h->root.root, data);
+	  finfo->global_to_static = save_global_to_static;
+	  break;
+	default:
+	  break;
+	}
+    }
+  return (rtnval);
+}
+
+/* Handle a link order which is supposed to generate a reloc.  */
+
+bfd_boolean
+_bfd_coff_reloc_link_order (bfd *output_bfd,
+			    struct coff_final_link_info *finfo,
+			    asection *output_section,
+			    struct bfd_link_order *link_order)
+{
+  reloc_howto_type *howto;
+  struct internal_reloc *irel;
+  struct coff_link_hash_entry **rel_hash_ptr;
+
+  howto = bfd_reloc_type_lookup (output_bfd, link_order->u.reloc.p->reloc);
+  if (howto == NULL)
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  if (link_order->u.reloc.p->addend != 0)
+    {
+      bfd_size_type size;
+      bfd_byte *buf;
+      bfd_reloc_status_type rstat;
+      bfd_boolean ok;
+      file_ptr loc;
+
+      size = bfd_get_reloc_size (howto);
+      buf = (bfd_byte *) bfd_zmalloc (size);
+      if (buf == NULL)
+	return FALSE;
+
+      rstat = _bfd_relocate_contents (howto, output_bfd,
+				      (bfd_vma) link_order->u.reloc.p->addend,\
+				      buf);
+      switch (rstat)
+	{
+	case bfd_reloc_ok:
+	  break;
+	default:
+	case bfd_reloc_outofrange:
+	  abort ();
+	case bfd_reloc_overflow:
+	  if (! ((*finfo->info->callbacks->reloc_overflow)
+		 (finfo->info, NULL,
+		  (link_order->type == bfd_section_reloc_link_order
+		   ? bfd_section_name (output_bfd,
+				       link_order->u.reloc.p->u.section)
+		   : link_order->u.reloc.p->u.name),
+		  howto->name, link_order->u.reloc.p->addend,
+		  (bfd *) NULL, (asection *) NULL, (bfd_vma) 0)))
+	    {
+	      free (buf);
+	      return FALSE;
+	    }
+	  break;
+	}
+      loc = link_order->offset * bfd_octets_per_byte (output_bfd);
+      ok = bfd_set_section_contents (output_bfd, output_section, buf,
+                                     loc, size);
+      free (buf);
+      if (! ok)
+	return FALSE;
+    }
+
+  /* Store the reloc information in the right place.  It will get
+     swapped and written out at the end of the final_link routine.  */
+  irel = (finfo->section_info[output_section->target_index].relocs
+	  + output_section->reloc_count);
+  rel_hash_ptr = (finfo->section_info[output_section->target_index].rel_hashes
+		  + output_section->reloc_count);
+
+  memset (irel, 0, sizeof (struct internal_reloc));
+  *rel_hash_ptr = NULL;
+
+  irel->r_vaddr = output_section->vma + link_order->offset;
+
+  if (link_order->type == bfd_section_reloc_link_order)
+    {
+      /* We need to somehow locate a symbol in the right section.  The
+         symbol must either have a value of zero, or we must adjust
+         the addend by the value of the symbol.  FIXME: Write this
+         when we need it.  The old linker couldn't handle this anyhow.  */
+      abort ();
+      *rel_hash_ptr = NULL;
+      irel->r_symndx = 0;
+    }
+  else
+    {
+      struct coff_link_hash_entry *h;
+
+      h = ((struct coff_link_hash_entry *)
+	   bfd_wrapped_link_hash_lookup (output_bfd, finfo->info,
+					 link_order->u.reloc.p->u.name,
+					 FALSE, FALSE, TRUE));
+      if (h != NULL)
+	{
+	  if (h->indx >= 0)
+	    irel->r_symndx = h->indx;
+	  else
+	    {
+	      /* Set the index to -2 to force this symbol to get
+		 written out.  */
+	      h->indx = -2;
+	      *rel_hash_ptr = h;
+	      irel->r_symndx = 0;
+	    }
+	}
+      else
+	{
+	  if (! ((*finfo->info->callbacks->unattached_reloc)
+		 (finfo->info, link_order->u.reloc.p->u.name, (bfd *) NULL,
+		  (asection *) NULL, (bfd_vma) 0)))
+	    return FALSE;
+	  irel->r_symndx = 0;
+	}
+    }
+
+  /* FIXME: Is this always right?  */
+  irel->r_type = howto->type;
+
+  /* r_size is only used on the RS/6000, which needs its own linker
+     routines anyhow.  r_extern is only used for ECOFF.  */
+
+  /* FIXME: What is the right value for r_offset?  Is zero OK?  */
+  ++output_section->reloc_count;
+
+  return TRUE;
+}
+
+/* A basic reloc handling routine which may be used by processors with
+   simple relocs.  */
+
+bfd_boolean
+_bfd_coff_generic_relocate_section (bfd *output_bfd,
+				    struct bfd_link_info *info,
+				    bfd *input_bfd,
+				    asection *input_section,
+				    bfd_byte *contents,
+				    struct internal_reloc *relocs,
+				    struct internal_syment *syms,
+				    asection **sections)
+{
+  struct internal_reloc *rel;
+  struct internal_reloc *relend;
+
+  rel = relocs;
+  relend = rel + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      long symndx;
+      struct coff_link_hash_entry *h;
+      struct internal_syment *sym;
+      bfd_vma addend;
+      bfd_vma val;
+      reloc_howto_type *howto;
+      bfd_reloc_status_type rstat;
+
+      symndx = rel->r_symndx;
+
+      if (symndx == -1)
+	{
+	  h = NULL;
+	  sym = NULL;
+	}
+      else if (symndx < 0
+	       || (unsigned long) symndx >= obj_raw_syment_count (input_bfd))
+	{
+	  (*_bfd_error_handler)
+	    ("%B: illegal symbol index %ld in relocs", input_bfd, symndx);
+	  return FALSE;
+	}
+      else
+	{
+	  h = obj_coff_sym_hashes (input_bfd)[symndx];
+	  sym = syms + symndx;
+	}
+
+      /* COFF treats common symbols in one of two ways.  Either the
+         size of the symbol is included in the section contents, or it
+         is not.  We assume that the size is not included, and force
+         the rtype_to_howto function to adjust the addend as needed.  */
+      if (sym != NULL && sym->n_scnum != 0)
+	addend = - sym->n_value;
+      else
+	addend = 0;
+
+      howto = bfd_coff_rtype_to_howto (input_bfd, input_section, rel, h,
+				       sym, &addend);
+      if (howto == NULL)
+	return FALSE;
+
+      /* If we are doing a relocatable link, then we can just ignore
+         a PC relative reloc that is pcrel_offset.  It will already
+         have the correct value.  If this is not a relocatable link,
+         then we should ignore the symbol value.  */
+      if (howto->pc_relative && howto->pcrel_offset)
+	{
+	  if (info->relocatable)
+	    continue;
+	  if (sym != NULL && sym->n_scnum != 0)
+	    addend += sym->n_value;
+	}
+
+      val = 0;
+
+      if (h == NULL)
+	{
+	  asection *sec;
+
+	  if (symndx == -1)
+	    {
+	      sec = bfd_abs_section_ptr;
+	      val = 0;
+	    }
+	  else
+	    {
+	      sec = sections[symndx];
+              val = (sec->output_section->vma
+		     + sec->output_offset
+		     + sym->n_value);
+	      if (! obj_pe (input_bfd))
+		val -= sec->vma;
+	    }
+	}
+      else
+	{
+	  if (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	    {
+	      /* Defined weak symbols are a GNU extension. */
+	      asection *sec;
+
+	      sec = h->root.u.def.section;
+	      val = (h->root.u.def.value
+		     + sec->output_section->vma
+		     + sec->output_offset);
+	    }
+
+	  else if (h->root.type == bfd_link_hash_undefweak)
+	    {
+              if (h->symbol_class == C_NT_WEAK && h->numaux == 1)
+		{
+		  /* See _Microsoft Portable Executable and Common Object
+                     File Format Specification_, section 5.5.3.
+		     Note that weak symbols without aux records are a GNU
+		     extension.
+		     FIXME: All weak externals are treated as having
+		     characteristic IMAGE_WEAK_EXTERN_SEARCH_NOLIBRARY (1).
+		     These behave as per SVR4 ABI:  A library member
+		     will resolve a weak external only if a normal
+		     external causes the library member to be linked.
+		     See also linker.c: generic_link_check_archive_element. */
+		  asection *sec;
+		  struct coff_link_hash_entry *h2 =
+		    h->auxbfd->tdata.coff_obj_data->sym_hashes[
+		    h->aux->x_sym.x_tagndx.l];
+
+		  if (!h2 || h2->root.type == bfd_link_hash_undefined)
+		    {
+		      sec = bfd_abs_section_ptr;
+		      val = 0;
+		    }
+		  else
+		    {
+		      sec = h2->root.u.def.section;
+		      val = h2->root.u.def.value
+			+ sec->output_section->vma + sec->output_offset;
+		    }
+		}
+	      else
+                /* This is a GNU extension.  */
+		val = 0;
+	    }
+
+	  else if (! info->relocatable)
+	    {
+	      if (! ((*info->callbacks->undefined_symbol)
+		     (info, h->root.root.string, input_bfd, input_section,
+		      rel->r_vaddr - input_section->vma, TRUE)))
+		return FALSE;
+	    }
+	}
+
+      if (info->base_file)
+	{
+	  /* Emit a reloc if the backend thinks it needs it.  */
+	  if (sym && pe_data (output_bfd)->in_reloc_p (output_bfd, howto))
+	    {
+	      /* Relocation to a symbol in a section which isn't
+		 absolute.  We output the address here to a file.
+		 This file is then read by dlltool when generating the
+		 reloc section.  Note that the base file is not
+		 portable between systems.  We write out a bfd_vma here,
+		 and dlltool reads in a bfd_vma.  */
+	      bfd_vma addr = (rel->r_vaddr
+			   - input_section->vma
+			   + input_section->output_offset
+			   + input_section->output_section->vma);
+	      if (coff_data (output_bfd)->pe)
+		addr -= pe_data(output_bfd)->pe_opthdr.ImageBase;
+	      if (fwrite (&addr, 1, sizeof (bfd_vma), (FILE *) info->base_file)
+		  != sizeof (bfd_vma))
+		{
+		  bfd_set_error (bfd_error_system_call);
+		  return FALSE;
+		}
+	    }
+	}
+
+      rstat = _bfd_final_link_relocate (howto, input_bfd, input_section,
+					contents,
+					rel->r_vaddr - input_section->vma,
+					val, addend);
+
+      switch (rstat)
+	{
+	default:
+	  abort ();
+	case bfd_reloc_ok:
+	  break;
+	case bfd_reloc_outofrange:
+	  (*_bfd_error_handler)
+	    (_("%B: bad reloc address 0x%lx in section `%A'"),
+	     input_bfd, input_section, (unsigned long) rel->r_vaddr);
+	  return FALSE;
+	case bfd_reloc_overflow:
+	  {
+	    const char *name;
+	    char buf[SYMNMLEN + 1];
+
+	    if (symndx == -1)
+	      name = "*ABS*";
+	    else if (h != NULL)
+	      name = NULL;
+	    else
+	      {
+		name = _bfd_coff_internal_syment_name (input_bfd, sym, buf);
+		if (name == NULL)
+		  return FALSE;
+	      }
+
+	    if (! ((*info->callbacks->reloc_overflow)
+		   (info, (h ? &h->root : NULL), name, howto->name,
+		    (bfd_vma) 0, input_bfd, input_section,
+		    rel->r_vaddr - input_section->vma)))
+	      return FALSE;
+	  }
+	}
+    }
+  return TRUE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coffswap.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coffswap.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/coffswap.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/coffswap.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,842 @@
+/* Generic COFF swapping routines, for BFD.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000,
+   2001, 2002, 2004, 2005, 2007
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file contains routines used to swap COFF data.  It is a header
+   file because the details of swapping depend on the details of the
+   structures used by each COFF implementation.  This is included by
+   coffcode.h, as well as by the ECOFF backend.
+
+   Any file which uses this must first include "coff/internal.h" and
+   "coff/CPU.h".  The functions will then be correct for that CPU.  */
+
+#ifndef GET_FCN_LNNOPTR
+#define GET_FCN_LNNOPTR(abfd, ext) \
+  H_GET_32 (abfd, ext->x_sym.x_fcnary.x_fcn.x_lnnoptr)
+#endif
+
+#ifndef GET_FCN_ENDNDX
+#define GET_FCN_ENDNDX(abfd, ext) \
+  H_GET_32 (abfd, ext->x_sym.x_fcnary.x_fcn.x_endndx)
+#endif
+
+#ifndef PUT_FCN_LNNOPTR
+#define PUT_FCN_LNNOPTR(abfd, in, ext) \
+  H_PUT_32 (abfd,  in, ext->x_sym.x_fcnary.x_fcn.x_lnnoptr)
+#endif
+#ifndef PUT_FCN_ENDNDX
+#define PUT_FCN_ENDNDX(abfd, in, ext) \
+  H_PUT_32 (abfd, in, ext->x_sym.x_fcnary.x_fcn.x_endndx)
+#endif
+#ifndef GET_LNSZ_LNNO
+#define GET_LNSZ_LNNO(abfd, ext) \
+  H_GET_16 (abfd, ext->x_sym.x_misc.x_lnsz.x_lnno)
+#endif
+#ifndef GET_LNSZ_SIZE
+#define GET_LNSZ_SIZE(abfd, ext) \
+  H_GET_16 (abfd, ext->x_sym.x_misc.x_lnsz.x_size)
+#endif
+#ifndef PUT_LNSZ_LNNO
+#define PUT_LNSZ_LNNO(abfd, in, ext) \
+  H_PUT_16 (abfd, in, ext->x_sym.x_misc.x_lnsz.x_lnno)
+#endif
+#ifndef PUT_LNSZ_SIZE
+#define PUT_LNSZ_SIZE(abfd, in, ext) \
+  H_PUT_16 (abfd, in, ext->x_sym.x_misc.x_lnsz.x_size)
+#endif
+#ifndef GET_SCN_SCNLEN
+#define GET_SCN_SCNLEN(abfd, ext) \
+  H_GET_32 (abfd, ext->x_scn.x_scnlen)
+#endif
+#ifndef GET_SCN_NRELOC
+#define GET_SCN_NRELOC(abfd, ext) \
+  H_GET_16 (abfd, ext->x_scn.x_nreloc)
+#endif
+#ifndef GET_SCN_NLINNO
+#define GET_SCN_NLINNO(abfd, ext) \
+  H_GET_16 (abfd, ext->x_scn.x_nlinno)
+#endif
+#ifndef PUT_SCN_SCNLEN
+#define PUT_SCN_SCNLEN(abfd, in, ext) \
+  H_PUT_32 (abfd, in, ext->x_scn.x_scnlen)
+#endif
+#ifndef PUT_SCN_NRELOC
+#define PUT_SCN_NRELOC(abfd, in, ext) \
+  H_PUT_16 (abfd, in, ext->x_scn.x_nreloc)
+#endif
+#ifndef PUT_SCN_NLINNO
+#define PUT_SCN_NLINNO(abfd, in, ext) \
+  H_PUT_16 (abfd, in, ext->x_scn.x_nlinno)
+#endif
+#ifndef GET_LINENO_LNNO
+#define GET_LINENO_LNNO(abfd, ext) \
+  H_GET_16 (abfd, ext->l_lnno);
+#endif
+#ifndef PUT_LINENO_LNNO
+#define PUT_LINENO_LNNO(abfd, val, ext) \
+  H_PUT_16 (abfd, val, ext->l_lnno);
+#endif
+
+/* The f_symptr field in the filehdr is sometimes 64 bits.  */
+#ifndef GET_FILEHDR_SYMPTR
+#define GET_FILEHDR_SYMPTR H_GET_32
+#endif
+#ifndef PUT_FILEHDR_SYMPTR
+#define PUT_FILEHDR_SYMPTR H_PUT_32
+#endif
+
+/* Some fields in the aouthdr are sometimes 64 bits.  */
+#ifndef GET_AOUTHDR_TSIZE
+#define GET_AOUTHDR_TSIZE H_GET_32
+#endif
+#ifndef PUT_AOUTHDR_TSIZE
+#define PUT_AOUTHDR_TSIZE H_PUT_32
+#endif
+#ifndef GET_AOUTHDR_DSIZE
+#define GET_AOUTHDR_DSIZE H_GET_32
+#endif
+#ifndef PUT_AOUTHDR_DSIZE
+#define PUT_AOUTHDR_DSIZE H_PUT_32
+#endif
+#ifndef GET_AOUTHDR_BSIZE
+#define GET_AOUTHDR_BSIZE H_GET_32
+#endif
+#ifndef PUT_AOUTHDR_BSIZE
+#define PUT_AOUTHDR_BSIZE H_PUT_32
+#endif
+#ifndef GET_AOUTHDR_ENTRY
+#define GET_AOUTHDR_ENTRY H_GET_32
+#endif
+#ifndef PUT_AOUTHDR_ENTRY
+#define PUT_AOUTHDR_ENTRY H_PUT_32
+#endif
+#ifndef GET_AOUTHDR_TEXT_START
+#define GET_AOUTHDR_TEXT_START H_GET_32
+#endif
+#ifndef PUT_AOUTHDR_TEXT_START
+#define PUT_AOUTHDR_TEXT_START H_PUT_32
+#endif
+#ifndef GET_AOUTHDR_DATA_START
+#define GET_AOUTHDR_DATA_START H_GET_32
+#endif
+#ifndef PUT_AOUTHDR_DATA_START
+#define PUT_AOUTHDR_DATA_START H_PUT_32
+#endif
+
+/* Some fields in the scnhdr are sometimes 64 bits.  */
+#ifndef GET_SCNHDR_PADDR
+#define GET_SCNHDR_PADDR H_GET_32
+#endif
+#ifndef PUT_SCNHDR_PADDR
+#define PUT_SCNHDR_PADDR H_PUT_32
+#endif
+#ifndef GET_SCNHDR_VADDR
+#define GET_SCNHDR_VADDR H_GET_32
+#endif
+#ifndef PUT_SCNHDR_VADDR
+#define PUT_SCNHDR_VADDR H_PUT_32
+#endif
+#ifndef GET_SCNHDR_SIZE
+#define GET_SCNHDR_SIZE H_GET_32
+#endif
+#ifndef PUT_SCNHDR_SIZE
+#define PUT_SCNHDR_SIZE H_PUT_32
+#endif
+#ifndef GET_SCNHDR_SCNPTR
+#define GET_SCNHDR_SCNPTR H_GET_32
+#endif
+#ifndef PUT_SCNHDR_SCNPTR
+#define PUT_SCNHDR_SCNPTR H_PUT_32
+#endif
+#ifndef GET_SCNHDR_RELPTR
+#define GET_SCNHDR_RELPTR H_GET_32
+#endif
+#ifndef PUT_SCNHDR_RELPTR
+#define PUT_SCNHDR_RELPTR H_PUT_32
+#endif
+#ifndef GET_SCNHDR_LNNOPTR
+#define GET_SCNHDR_LNNOPTR H_GET_32
+#endif
+#ifndef PUT_SCNHDR_LNNOPTR
+#define PUT_SCNHDR_LNNOPTR H_PUT_32
+#endif
+#ifndef GET_SCNHDR_NRELOC
+#define GET_SCNHDR_NRELOC H_GET_16
+#endif
+#ifndef MAX_SCNHDR_NRELOC
+#define MAX_SCNHDR_NRELOC 0xffff
+#endif
+#ifndef PUT_SCNHDR_NRELOC
+#define PUT_SCNHDR_NRELOC H_PUT_16
+#endif
+#ifndef GET_SCNHDR_NLNNO
+#define GET_SCNHDR_NLNNO H_GET_16
+#endif
+#ifndef MAX_SCNHDR_NLNNO
+#define MAX_SCNHDR_NLNNO 0xffff
+#endif
+#ifndef PUT_SCNHDR_NLNNO
+#define PUT_SCNHDR_NLNNO H_PUT_16
+#endif
+#ifndef GET_SCNHDR_FLAGS
+#define GET_SCNHDR_FLAGS H_GET_32
+#endif
+#ifndef PUT_SCNHDR_FLAGS
+#define PUT_SCNHDR_FLAGS H_PUT_32
+#endif
+
+#ifndef GET_RELOC_VADDR
+#define GET_RELOC_VADDR H_GET_32
+#endif
+#ifndef PUT_RELOC_VADDR
+#define PUT_RELOC_VADDR H_PUT_32
+#endif
+
+#ifndef NO_COFF_RELOCS
+
+static void
+coff_swap_reloc_in (bfd * abfd, void * src, void * dst)
+{
+  RELOC *reloc_src = (RELOC *) src;
+  struct internal_reloc *reloc_dst = (struct internal_reloc *) dst;
+
+  reloc_dst->r_vaddr  = GET_RELOC_VADDR (abfd, reloc_src->r_vaddr);
+  reloc_dst->r_symndx = H_GET_S32 (abfd, reloc_src->r_symndx);
+  reloc_dst->r_type   = H_GET_16 (abfd, reloc_src->r_type);
+
+#ifdef SWAP_IN_RELOC_OFFSET
+  reloc_dst->r_offset = SWAP_IN_RELOC_OFFSET (abfd, reloc_src->r_offset);
+#endif
+}
+
+static unsigned int
+coff_swap_reloc_out (bfd * abfd, void * src, void * dst)
+{
+  struct internal_reloc *reloc_src = (struct internal_reloc *) src;
+  struct external_reloc *reloc_dst = (struct external_reloc *) dst;
+
+  PUT_RELOC_VADDR (abfd, reloc_src->r_vaddr, reloc_dst->r_vaddr);
+  H_PUT_32 (abfd, reloc_src->r_symndx, reloc_dst->r_symndx);
+  H_PUT_16 (abfd, reloc_src->r_type, reloc_dst->r_type);
+
+#ifdef SWAP_OUT_RELOC_OFFSET
+  SWAP_OUT_RELOC_OFFSET (abfd, reloc_src->r_offset, reloc_dst->r_offset);
+#endif
+#ifdef SWAP_OUT_RELOC_EXTRA
+  SWAP_OUT_RELOC_EXTRA (abfd, reloc_src, reloc_dst);
+#endif
+
+  return bfd_coff_relsz (abfd);
+}
+
+#endif /* NO_COFF_RELOCS */
+
+static void
+coff_swap_filehdr_in (bfd * abfd, void * src, void * dst)
+{
+  FILHDR *filehdr_src = (FILHDR *) src;
+  struct internal_filehdr *filehdr_dst = (struct internal_filehdr *) dst;
+
+#ifdef COFF_ADJUST_FILEHDR_IN_PRE
+  COFF_ADJUST_FILEHDR_IN_PRE (abfd, src, dst);
+#endif
+  filehdr_dst->f_magic  = H_GET_16 (abfd, filehdr_src->f_magic);
+  filehdr_dst->f_nscns  = H_GET_16 (abfd, filehdr_src->f_nscns);
+  filehdr_dst->f_timdat = H_GET_32 (abfd, filehdr_src->f_timdat);
+  filehdr_dst->f_symptr = GET_FILEHDR_SYMPTR (abfd, filehdr_src->f_symptr);
+  filehdr_dst->f_nsyms  = H_GET_32 (abfd, filehdr_src->f_nsyms);
+  filehdr_dst->f_opthdr = H_GET_16 (abfd, filehdr_src->f_opthdr);
+  filehdr_dst->f_flags  = H_GET_16 (abfd, filehdr_src->f_flags);
+#ifdef TIC80_TARGET_ID
+  filehdr_dst->f_target_id = H_GET_16 (abfd, filehdr_src->f_target_id);
+#endif
+
+#ifdef COFF_ADJUST_FILEHDR_IN_POST
+  COFF_ADJUST_FILEHDR_IN_POST (abfd, src, dst);
+#endif
+}
+
+static  unsigned int
+coff_swap_filehdr_out (bfd *abfd, void * in, void * out)
+{
+  struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
+  FILHDR *filehdr_out = (FILHDR *) out;
+
+#ifdef COFF_ADJUST_FILEHDR_OUT_PRE
+  COFF_ADJUST_FILEHDR_OUT_PRE (abfd, in, out);
+#endif
+  H_PUT_16 (abfd, filehdr_in->f_magic, filehdr_out->f_magic);
+  H_PUT_16 (abfd, filehdr_in->f_nscns, filehdr_out->f_nscns);
+  H_PUT_32 (abfd, filehdr_in->f_timdat, filehdr_out->f_timdat);
+  PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, filehdr_out->f_symptr);
+  H_PUT_32 (abfd, filehdr_in->f_nsyms, filehdr_out->f_nsyms);
+  H_PUT_16 (abfd, filehdr_in->f_opthdr, filehdr_out->f_opthdr);
+  H_PUT_16 (abfd, filehdr_in->f_flags, filehdr_out->f_flags);
+#ifdef TIC80_TARGET_ID
+  H_PUT_16 (abfd, filehdr_in->f_target_id, filehdr_out->f_target_id);
+#endif
+
+#ifdef COFF_ADJUST_FILEHDR_OUT_POST
+  COFF_ADJUST_FILEHDR_OUT_POST (abfd, in, out);
+#endif
+  return bfd_coff_filhsz (abfd);
+}
+
+#ifndef NO_COFF_SYMBOLS
+
+static void
+coff_swap_sym_in (bfd * abfd, void * ext1, void * in1)
+{
+  SYMENT *ext = (SYMENT *) ext1;
+  struct internal_syment *in = (struct internal_syment *) in1;
+
+  if (ext->e.e_name[0] == 0)
+    {
+      in->_n._n_n._n_zeroes = 0;
+      in->_n._n_n._n_offset = H_GET_32 (abfd, ext->e.e.e_offset);
+    }
+  else
+    {
+#if SYMNMLEN != E_SYMNMLEN
+#error we need to cope with truncating or extending SYMNMLEN
+#else
+      memcpy (in->_n._n_name, ext->e.e_name, SYMNMLEN);
+#endif
+    }
+
+  in->n_value = H_GET_32 (abfd, ext->e_value);
+  in->n_scnum = H_GET_16 (abfd, ext->e_scnum);
+  if (sizeof (ext->e_type) == 2)
+    in->n_type = H_GET_16 (abfd, ext->e_type);
+  else
+    in->n_type = H_GET_32 (abfd, ext->e_type);
+  in->n_sclass = H_GET_8 (abfd, ext->e_sclass);
+  in->n_numaux = H_GET_8 (abfd, ext->e_numaux);
+#ifdef COFF_ADJUST_SYM_IN_POST
+  COFF_ADJUST_SYM_IN_POST (abfd, ext1, in1);
+#endif
+}
+
+static unsigned int
+coff_swap_sym_out (bfd * abfd, void * inp, void * extp)
+{
+  struct internal_syment *in = (struct internal_syment *) inp;
+  SYMENT *ext =(SYMENT *) extp;
+
+#ifdef COFF_ADJUST_SYM_OUT_PRE
+  COFF_ADJUST_SYM_OUT_PRE (abfd, inp, extp);
+#endif
+
+  if (in->_n._n_name[0] == 0)
+    {
+      H_PUT_32 (abfd, 0, ext->e.e.e_zeroes);
+      H_PUT_32 (abfd, in->_n._n_n._n_offset, ext->e.e.e_offset);
+    }
+  else
+    {
+#if SYMNMLEN != E_SYMNMLEN
+#error we need to cope with truncating or extending SYMNMLEN
+#else
+      memcpy (ext->e.e_name, in->_n._n_name, SYMNMLEN);
+#endif
+    }
+
+  H_PUT_32 (abfd, in->n_value, ext->e_value);
+  H_PUT_16 (abfd, in->n_scnum, ext->e_scnum);
+
+  if (sizeof (ext->e_type) == 2)
+    H_PUT_16 (abfd, in->n_type, ext->e_type);
+  else
+    H_PUT_32 (abfd, in->n_type, ext->e_type);
+
+  H_PUT_8 (abfd, in->n_sclass, ext->e_sclass);
+  H_PUT_8 (abfd, in->n_numaux, ext->e_numaux);
+
+#ifdef COFF_ADJUST_SYM_OUT_POST
+  COFF_ADJUST_SYM_OUT_POST (abfd, inp, extp);
+#endif
+
+  return SYMESZ;
+}
+
+static void
+coff_swap_aux_in (bfd *abfd,
+		  void * ext1,
+		  int type,
+		  int in_class,
+		  int indx,
+		  int numaux,
+		  void * in1)
+{
+  AUXENT *ext = (AUXENT *) ext1;
+  union internal_auxent *in = (union internal_auxent *) in1;
+
+#ifdef COFF_ADJUST_AUX_IN_PRE
+  COFF_ADJUST_AUX_IN_PRE (abfd, ext1, type, in_class, indx, numaux, in1);
+#endif
+
+  switch (in_class)
+    {
+    case C_FILE:
+      if (ext->x_file.x_fname[0] == 0)
+	{
+	  in->x_file.x_n.x_zeroes = 0;
+	  in->x_file.x_n.x_offset = H_GET_32 (abfd, ext->x_file.x_n.x_offset);
+	}
+      else
+	{
+#if FILNMLEN != E_FILNMLEN
+#error we need to cope with truncating or extending FILNMLEN
+#else
+	  if (numaux > 1)
+	    {
+	      if (indx == 0)
+		memcpy (in->x_file.x_fname, ext->x_file.x_fname,
+			numaux * sizeof (AUXENT));
+	    }
+	  else
+	    memcpy (in->x_file.x_fname, ext->x_file.x_fname, FILNMLEN);
+#endif
+	}
+      goto end;
+
+    case C_STAT:
+#ifdef C_LEAFSTAT
+    case C_LEAFSTAT:
+#endif
+    case C_HIDDEN:
+      if (type == T_NULL)
+	{
+	  in->x_scn.x_scnlen = GET_SCN_SCNLEN (abfd, ext);
+	  in->x_scn.x_nreloc = GET_SCN_NRELOC (abfd, ext);
+	  in->x_scn.x_nlinno = GET_SCN_NLINNO (abfd, ext);
+
+	  /* PE defines some extra fields; we zero them out for
+             safety.  */
+	  in->x_scn.x_checksum = 0;
+	  in->x_scn.x_associated = 0;
+	  in->x_scn.x_comdat = 0;
+
+	  goto end;
+	}
+      break;
+    }
+
+  in->x_sym.x_tagndx.l = H_GET_32 (abfd, ext->x_sym.x_tagndx);
+#ifndef NO_TVNDX
+  in->x_sym.x_tvndx = H_GET_16 (abfd, ext->x_sym.x_tvndx);
+#endif
+
+  if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
+      || ISTAG (in_class))
+    {
+      in->x_sym.x_fcnary.x_fcn.x_lnnoptr = GET_FCN_LNNOPTR (abfd, ext);
+      in->x_sym.x_fcnary.x_fcn.x_endndx.l = GET_FCN_ENDNDX (abfd, ext);
+    }
+  else
+    {
+#if DIMNUM != E_DIMNUM
+#error we need to cope with truncating or extending DIMNUM
+#endif
+      in->x_sym.x_fcnary.x_ary.x_dimen[0] =
+	H_GET_16 (abfd, ext->x_sym.x_fcnary.x_ary.x_dimen[0]);
+      in->x_sym.x_fcnary.x_ary.x_dimen[1] =
+	H_GET_16 (abfd, ext->x_sym.x_fcnary.x_ary.x_dimen[1]);
+      in->x_sym.x_fcnary.x_ary.x_dimen[2] =
+	H_GET_16 (abfd, ext->x_sym.x_fcnary.x_ary.x_dimen[2]);
+      in->x_sym.x_fcnary.x_ary.x_dimen[3] =
+	H_GET_16 (abfd, ext->x_sym.x_fcnary.x_ary.x_dimen[3]);
+    }
+
+  if (ISFCN (type))
+    in->x_sym.x_misc.x_fsize = H_GET_32 (abfd, ext->x_sym.x_misc.x_fsize);
+  else
+    {
+      in->x_sym.x_misc.x_lnsz.x_lnno = GET_LNSZ_LNNO (abfd, ext);
+      in->x_sym.x_misc.x_lnsz.x_size = GET_LNSZ_SIZE (abfd, ext);
+    }
+
+ end: ;
+
+#ifdef COFF_ADJUST_AUX_IN_POST
+  COFF_ADJUST_AUX_IN_POST (abfd, ext1, type, in_class, indx, numaux, in1);
+#endif
+}
+
+static unsigned int
+coff_swap_aux_out (bfd * abfd,
+		   void * inp,
+		   int type,
+		   int in_class,
+		   int indx ATTRIBUTE_UNUSED,
+		   int numaux ATTRIBUTE_UNUSED,
+		   void * extp)
+{
+  union internal_auxent * in = (union internal_auxent *) inp;
+  AUXENT *ext = (AUXENT *) extp;
+
+#ifdef COFF_ADJUST_AUX_OUT_PRE
+  COFF_ADJUST_AUX_OUT_PRE (abfd, inp, type, in_class, indx, numaux, extp);
+#endif
+
+  memset (ext, 0, AUXESZ);
+
+  switch (in_class)
+    {
+    case C_FILE:
+      if (in->x_file.x_fname[0] == 0)
+	{
+	  H_PUT_32 (abfd, 0, ext->x_file.x_n.x_zeroes);
+	  H_PUT_32 (abfd, in->x_file.x_n.x_offset, ext->x_file.x_n.x_offset);
+	}
+      else
+	{
+#if FILNMLEN != E_FILNMLEN
+#error we need to cope with truncating or extending FILNMLEN
+#else
+	  memcpy (ext->x_file.x_fname, in->x_file.x_fname, FILNMLEN);
+#endif
+	}
+      goto end;
+
+    case C_STAT:
+#ifdef C_LEAFSTAT
+    case C_LEAFSTAT:
+#endif
+    case C_HIDDEN:
+      if (type == T_NULL)
+	{
+	  PUT_SCN_SCNLEN (abfd, in->x_scn.x_scnlen, ext);
+	  PUT_SCN_NRELOC (abfd, in->x_scn.x_nreloc, ext);
+	  PUT_SCN_NLINNO (abfd, in->x_scn.x_nlinno, ext);
+	  goto end;
+	}
+      break;
+    }
+
+  H_PUT_32 (abfd, in->x_sym.x_tagndx.l, ext->x_sym.x_tagndx);
+#ifndef NO_TVNDX
+  H_PUT_16 (abfd, in->x_sym.x_tvndx, ext->x_sym.x_tvndx);
+#endif
+
+  if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
+      || ISTAG (in_class))
+    {
+      PUT_FCN_LNNOPTR (abfd, in->x_sym.x_fcnary.x_fcn.x_lnnoptr, ext);
+      PUT_FCN_ENDNDX (abfd, in->x_sym.x_fcnary.x_fcn.x_endndx.l, ext);
+    }
+  else
+    {
+#if DIMNUM != E_DIMNUM
+#error we need to cope with truncating or extending DIMNUM
+#endif
+      H_PUT_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[0],
+	       ext->x_sym.x_fcnary.x_ary.x_dimen[0]);
+      H_PUT_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[1],
+	       ext->x_sym.x_fcnary.x_ary.x_dimen[1]);
+      H_PUT_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[2],
+	       ext->x_sym.x_fcnary.x_ary.x_dimen[2]);
+      H_PUT_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[3],
+	       ext->x_sym.x_fcnary.x_ary.x_dimen[3]);
+    }
+
+  if (ISFCN (type))
+    H_PUT_32 (abfd, in->x_sym.x_misc.x_fsize, ext->x_sym.x_misc.x_fsize);
+  else
+    {
+      PUT_LNSZ_LNNO (abfd, in->x_sym.x_misc.x_lnsz.x_lnno, ext);
+      PUT_LNSZ_SIZE (abfd, in->x_sym.x_misc.x_lnsz.x_size, ext);
+    }
+
+ end:
+#ifdef COFF_ADJUST_AUX_OUT_POST
+  COFF_ADJUST_AUX_OUT_POST (abfd, inp, type, in_class, indx, numaux, extp);
+#endif
+  return AUXESZ;
+}
+
+#endif /* NO_COFF_SYMBOLS */
+
+#ifndef NO_COFF_LINENOS
+
+static void
+coff_swap_lineno_in (bfd * abfd, void * ext1, void * in1)
+{
+  LINENO *ext = (LINENO *) ext1;
+  struct internal_lineno *in = (struct internal_lineno *) in1;
+
+  in->l_addr.l_symndx = H_GET_32 (abfd, ext->l_addr.l_symndx);
+  in->l_lnno = GET_LINENO_LNNO (abfd, ext);
+}
+
+static unsigned int
+coff_swap_lineno_out (bfd * abfd, void * inp, void * outp)
+{
+  struct internal_lineno *in = (struct internal_lineno *) inp;
+  struct external_lineno *ext = (struct external_lineno *) outp;
+  H_PUT_32 (abfd, in->l_addr.l_symndx, ext->l_addr.l_symndx);
+
+  PUT_LINENO_LNNO (abfd, in->l_lnno, ext);
+  return LINESZ;
+}
+
+#endif /* NO_COFF_LINENOS */
+
+static void
+coff_swap_aouthdr_in (bfd * abfd, void * aouthdr_ext1, void * aouthdr_int1)
+{
+  AOUTHDR *aouthdr_ext;
+  struct internal_aouthdr *aouthdr_int;
+
+  aouthdr_ext = (AOUTHDR *) aouthdr_ext1;
+  aouthdr_int = (struct internal_aouthdr *) aouthdr_int1;
+  aouthdr_int->magic = H_GET_16 (abfd, aouthdr_ext->magic);
+  aouthdr_int->vstamp = H_GET_16 (abfd, aouthdr_ext->vstamp);
+  aouthdr_int->tsize = GET_AOUTHDR_TSIZE (abfd, aouthdr_ext->tsize);
+  aouthdr_int->dsize = GET_AOUTHDR_DSIZE (abfd, aouthdr_ext->dsize);
+  aouthdr_int->bsize = GET_AOUTHDR_BSIZE (abfd, aouthdr_ext->bsize);
+  aouthdr_int->entry = GET_AOUTHDR_ENTRY (abfd, aouthdr_ext->entry);
+  aouthdr_int->text_start =
+    GET_AOUTHDR_TEXT_START (abfd, aouthdr_ext->text_start);
+  aouthdr_int->data_start =
+    GET_AOUTHDR_DATA_START (abfd, aouthdr_ext->data_start);
+
+#ifdef I960
+  aouthdr_int->tagentries = H_GET_32 (abfd, aouthdr_ext->tagentries);
+#endif
+
+#ifdef APOLLO_M68
+  H_PUT_32 (abfd, aouthdr_int->o_inlib, aouthdr_ext->o_inlib);
+  H_PUT_32 (abfd, aouthdr_int->o_sri, aouthdr_ext->o_sri);
+  H_PUT_32 (abfd, aouthdr_int->vid[0], aouthdr_ext->vid);
+  H_PUT_32 (abfd, aouthdr_int->vid[1], aouthdr_ext->vid + 4);
+#endif
+
+#ifdef RS6000COFF_C
+#ifdef XCOFF64
+  aouthdr_int->o_toc = H_GET_64 (abfd, aouthdr_ext->o_toc);
+#else
+  aouthdr_int->o_toc = H_GET_32 (abfd, aouthdr_ext->o_toc);
+#endif
+  aouthdr_int->o_snentry  = H_GET_16 (abfd, aouthdr_ext->o_snentry);
+  aouthdr_int->o_sntext   = H_GET_16 (abfd, aouthdr_ext->o_sntext);
+  aouthdr_int->o_sndata   = H_GET_16 (abfd, aouthdr_ext->o_sndata);
+  aouthdr_int->o_sntoc    = H_GET_16 (abfd, aouthdr_ext->o_sntoc);
+  aouthdr_int->o_snloader = H_GET_16 (abfd, aouthdr_ext->o_snloader);
+  aouthdr_int->o_snbss    = H_GET_16 (abfd, aouthdr_ext->o_snbss);
+  aouthdr_int->o_algntext = H_GET_16 (abfd, aouthdr_ext->o_algntext);
+  aouthdr_int->o_algndata = H_GET_16 (abfd, aouthdr_ext->o_algndata);
+  aouthdr_int->o_modtype  = H_GET_16 (abfd, aouthdr_ext->o_modtype);
+  aouthdr_int->o_cputype  = H_GET_16 (abfd, aouthdr_ext->o_cputype);
+#ifdef XCOFF64
+  aouthdr_int->o_maxstack = H_GET_64 (abfd, aouthdr_ext->o_maxstack);
+  aouthdr_int->o_maxdata  = H_GET_64 (abfd, aouthdr_ext->o_maxdata);
+#else
+  aouthdr_int->o_maxstack = H_GET_32 (abfd, aouthdr_ext->o_maxstack);
+  aouthdr_int->o_maxdata  = H_GET_32 (abfd, aouthdr_ext->o_maxdata);
+#endif
+#endif
+
+#ifdef MIPSECOFF
+  aouthdr_int->bss_start  = H_GET_32 (abfd, aouthdr_ext->bss_start);
+  aouthdr_int->gp_value   = H_GET_32 (abfd, aouthdr_ext->gp_value);
+  aouthdr_int->gprmask    = H_GET_32 (abfd, aouthdr_ext->gprmask);
+  aouthdr_int->cprmask[0] = H_GET_32 (abfd, aouthdr_ext->cprmask[0]);
+  aouthdr_int->cprmask[1] = H_GET_32 (abfd, aouthdr_ext->cprmask[1]);
+  aouthdr_int->cprmask[2] = H_GET_32 (abfd, aouthdr_ext->cprmask[2]);
+  aouthdr_int->cprmask[3] = H_GET_32 (abfd, aouthdr_ext->cprmask[3]);
+#endif
+
+#ifdef ALPHAECOFF
+  aouthdr_int->bss_start = H_GET_64 (abfd, aouthdr_ext->bss_start);
+  aouthdr_int->gp_value  = H_GET_64 (abfd, aouthdr_ext->gp_value);
+  aouthdr_int->gprmask   = H_GET_32 (abfd, aouthdr_ext->gprmask);
+  aouthdr_int->fprmask   = H_GET_32 (abfd, aouthdr_ext->fprmask);
+#endif
+}
+
+static unsigned int
+coff_swap_aouthdr_out (bfd * abfd, void * in, void * out)
+{
+  struct internal_aouthdr *aouthdr_in = (struct internal_aouthdr *) in;
+  AOUTHDR *aouthdr_out = (AOUTHDR *) out;
+
+  H_PUT_16 (abfd, aouthdr_in->magic, aouthdr_out->magic);
+  H_PUT_16 (abfd, aouthdr_in->vstamp, aouthdr_out->vstamp);
+  PUT_AOUTHDR_TSIZE (abfd, aouthdr_in->tsize, aouthdr_out->tsize);
+  PUT_AOUTHDR_DSIZE (abfd, aouthdr_in->dsize, aouthdr_out->dsize);
+  PUT_AOUTHDR_BSIZE (abfd, aouthdr_in->bsize, aouthdr_out->bsize);
+  PUT_AOUTHDR_ENTRY (abfd, aouthdr_in->entry, aouthdr_out->entry);
+  PUT_AOUTHDR_TEXT_START (abfd, aouthdr_in->text_start,
+			  aouthdr_out->text_start);
+  PUT_AOUTHDR_DATA_START (abfd, aouthdr_in->data_start,
+			  aouthdr_out->data_start);
+
+#ifdef I960
+  H_PUT_32 (abfd, aouthdr_in->tagentries, aouthdr_out->tagentries);
+#endif
+
+#ifdef RS6000COFF_C
+#ifdef XCOFF64
+  H_PUT_64 (abfd, aouthdr_in->o_toc, aouthdr_out->o_toc);
+#else
+  H_PUT_32 (abfd, aouthdr_in->o_toc, aouthdr_out->o_toc);
+#endif
+  H_PUT_16 (abfd, aouthdr_in->o_snentry, aouthdr_out->o_snentry);
+  H_PUT_16 (abfd, aouthdr_in->o_sntext, aouthdr_out->o_sntext);
+  H_PUT_16 (abfd, aouthdr_in->o_sndata, aouthdr_out->o_sndata);
+  H_PUT_16 (abfd, aouthdr_in->o_sntoc, aouthdr_out->o_sntoc);
+  H_PUT_16 (abfd, aouthdr_in->o_snloader, aouthdr_out->o_snloader);
+  H_PUT_16 (abfd, aouthdr_in->o_snbss, aouthdr_out->o_snbss);
+  H_PUT_16 (abfd, aouthdr_in->o_algntext, aouthdr_out->o_algntext);
+  H_PUT_16 (abfd, aouthdr_in->o_algndata, aouthdr_out->o_algndata);
+  H_PUT_16 (abfd, aouthdr_in->o_modtype, aouthdr_out->o_modtype);
+  H_PUT_16 (abfd, aouthdr_in->o_cputype, aouthdr_out->o_cputype);
+#ifdef XCOFF64
+  H_PUT_64 (abfd, aouthdr_in->o_maxstack, aouthdr_out->o_maxstack);
+  H_PUT_64 (abfd, aouthdr_in->o_maxdata, aouthdr_out->o_maxdata);
+#else
+  H_PUT_32 (abfd, aouthdr_in->o_maxstack, aouthdr_out->o_maxstack);
+  H_PUT_32 (abfd, aouthdr_in->o_maxdata, aouthdr_out->o_maxdata);
+#endif
+  memset (aouthdr_out->o_resv2, 0, sizeof aouthdr_out->o_resv2);
+#ifdef XCOFF64
+  memset (aouthdr_out->o_debugger, 0, sizeof aouthdr_out->o_debugger);
+  memset (aouthdr_out->o_resv3, 0, sizeof aouthdr_out->o_resv3);
+#endif
+#endif
+
+#ifdef MIPSECOFF
+  H_PUT_32 (abfd, aouthdr_in->bss_start, aouthdr_out->bss_start);
+  H_PUT_32 (abfd, aouthdr_in->gp_value, aouthdr_out->gp_value);
+  H_PUT_32 (abfd, aouthdr_in->gprmask, aouthdr_out->gprmask);
+  H_PUT_32 (abfd, aouthdr_in->cprmask[0], aouthdr_out->cprmask[0]);
+  H_PUT_32 (abfd, aouthdr_in->cprmask[1], aouthdr_out->cprmask[1]);
+  H_PUT_32 (abfd, aouthdr_in->cprmask[2], aouthdr_out->cprmask[2]);
+  H_PUT_32 (abfd, aouthdr_in->cprmask[3], aouthdr_out->cprmask[3]);
+#endif
+
+#ifdef ALPHAECOFF
+  /* FIXME: What does bldrev mean?  */
+  H_PUT_16 (abfd, 2, aouthdr_out->bldrev);
+  H_PUT_16 (abfd, 0, aouthdr_out->padding);
+  H_PUT_64 (abfd, aouthdr_in->bss_start, aouthdr_out->bss_start);
+  H_PUT_64 (abfd, aouthdr_in->gp_value, aouthdr_out->gp_value);
+  H_PUT_32 (abfd, aouthdr_in->gprmask, aouthdr_out->gprmask);
+  H_PUT_32 (abfd, aouthdr_in->fprmask, aouthdr_out->fprmask);
+#endif
+
+  return AOUTSZ;
+}
+
+static void
+coff_swap_scnhdr_in (bfd * abfd, void * ext, void * in)
+{
+  SCNHDR *scnhdr_ext = (SCNHDR *) ext;
+  struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
+
+#ifdef COFF_ADJUST_SCNHDR_IN_PRE
+  COFF_ADJUST_SCNHDR_IN_PRE (abfd, ext, in);
+#endif
+  memcpy (scnhdr_int->s_name, scnhdr_ext->s_name, sizeof (scnhdr_int->s_name));
+
+  scnhdr_int->s_vaddr = GET_SCNHDR_VADDR (abfd, scnhdr_ext->s_vaddr);
+  scnhdr_int->s_paddr = GET_SCNHDR_PADDR (abfd, scnhdr_ext->s_paddr);
+  scnhdr_int->s_size = GET_SCNHDR_SIZE (abfd, scnhdr_ext->s_size);
+
+  scnhdr_int->s_scnptr = GET_SCNHDR_SCNPTR (abfd, scnhdr_ext->s_scnptr);
+  scnhdr_int->s_relptr = GET_SCNHDR_RELPTR (abfd, scnhdr_ext->s_relptr);
+  scnhdr_int->s_lnnoptr = GET_SCNHDR_LNNOPTR (abfd, scnhdr_ext->s_lnnoptr);
+  scnhdr_int->s_flags = GET_SCNHDR_FLAGS (abfd, scnhdr_ext->s_flags);
+  scnhdr_int->s_nreloc = GET_SCNHDR_NRELOC (abfd, scnhdr_ext->s_nreloc);
+  scnhdr_int->s_nlnno = GET_SCNHDR_NLNNO (abfd, scnhdr_ext->s_nlnno);
+#ifdef I960
+  scnhdr_int->s_align = GET_SCNHDR_ALIGN (abfd, scnhdr_ext->s_align);
+#endif
+#ifdef COFF_ADJUST_SCNHDR_IN_POST
+  COFF_ADJUST_SCNHDR_IN_POST (abfd, ext, in);
+#endif
+}
+
+static unsigned int
+coff_swap_scnhdr_out (bfd * abfd, void * in, void * out)
+{
+  struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
+  SCNHDR *scnhdr_ext = (SCNHDR *) out;
+  unsigned int ret = bfd_coff_scnhsz (abfd);
+
+#ifdef COFF_ADJUST_SCNHDR_OUT_PRE
+  COFF_ADJUST_SCNHDR_OUT_PRE (abfd, in, out);
+#endif
+  memcpy (scnhdr_ext->s_name, scnhdr_int->s_name, sizeof (scnhdr_int->s_name));
+
+  PUT_SCNHDR_VADDR (abfd, scnhdr_int->s_vaddr, scnhdr_ext->s_vaddr);
+  PUT_SCNHDR_PADDR (abfd, scnhdr_int->s_paddr, scnhdr_ext->s_paddr);
+  PUT_SCNHDR_SIZE (abfd, scnhdr_int->s_size, scnhdr_ext->s_size);
+  PUT_SCNHDR_SCNPTR (abfd, scnhdr_int->s_scnptr, scnhdr_ext->s_scnptr);
+  PUT_SCNHDR_RELPTR (abfd, scnhdr_int->s_relptr, scnhdr_ext->s_relptr);
+  PUT_SCNHDR_LNNOPTR (abfd, scnhdr_int->s_lnnoptr, scnhdr_ext->s_lnnoptr);
+  PUT_SCNHDR_FLAGS (abfd, scnhdr_int->s_flags, scnhdr_ext->s_flags);
+#if defined(M88)
+  H_PUT_32 (abfd, scnhdr_int->s_nlnno, scnhdr_ext->s_nlnno);
+  H_PUT_32 (abfd, scnhdr_int->s_nreloc, scnhdr_ext->s_nreloc);
+#else
+  if (scnhdr_int->s_nlnno <= MAX_SCNHDR_NLNNO)
+    PUT_SCNHDR_NLNNO (abfd, scnhdr_int->s_nlnno, scnhdr_ext->s_nlnno);
+  else
+    {
+      char buf[sizeof (scnhdr_int->s_name) + 1];
+
+      memcpy (buf, scnhdr_int->s_name, sizeof (scnhdr_int->s_name));
+      buf[sizeof (scnhdr_int->s_name)] = '\0';
+      (*_bfd_error_handler)
+	(_("%s: warning: %s: line number overflow: 0x%lx > 0xffff"),
+	 bfd_get_filename (abfd),
+	 buf, scnhdr_int->s_nlnno);
+      PUT_SCNHDR_NLNNO (abfd, 0xffff, scnhdr_ext->s_nlnno);
+    }
+
+  if (scnhdr_int->s_nreloc <= MAX_SCNHDR_NRELOC)
+    PUT_SCNHDR_NRELOC (abfd, scnhdr_int->s_nreloc, scnhdr_ext->s_nreloc);
+  else
+    {
+      char buf[sizeof (scnhdr_int->s_name) + 1];
+
+      memcpy (buf, scnhdr_int->s_name, sizeof (scnhdr_int->s_name));
+      buf[sizeof (scnhdr_int->s_name)] = '\0';
+      (*_bfd_error_handler) (_("%s: %s: reloc overflow: 0x%lx > 0xffff"),
+			     bfd_get_filename (abfd),
+			     buf, scnhdr_int->s_nreloc);
+      bfd_set_error (bfd_error_file_truncated);
+      PUT_SCNHDR_NRELOC (abfd, 0xffff, scnhdr_ext->s_nreloc);
+      ret = 0;
+    }
+#endif
+
+#ifdef I960
+  PUT_SCNHDR_ALIGN (abfd, scnhdr_int->s_align, scnhdr_ext->s_align);
+#endif
+#ifdef COFF_ADJUST_SCNHDR_OUT_POST
+  COFF_ADJUST_SCNHDR_OUT_POST (abfd, in, out);
+#endif
+  return ret;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/compress.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/compress.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/compress.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/compress.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,400 @@
+/* Compressed section support (intended for debug sections).
+   Copyright 2008, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "config.h"
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#ifdef HAVE_ZLIB_H
+#include <zlib.h>
+#endif
+
+#ifdef HAVE_ZLIB_H
+static bfd_boolean
+decompress_contents (bfd_byte *compressed_buffer,
+		     bfd_size_type compressed_size,
+		     bfd_byte *uncompressed_buffer,
+		     bfd_size_type uncompressed_size)
+{
+  z_stream strm;
+  int rc;
+
+  /* It is possible the section consists of several compressed
+     buffers concatenated together, so we uncompress in a loop.  */
+  strm.zalloc = NULL;
+  strm.zfree = NULL;
+  strm.opaque = NULL;
+  strm.avail_in = compressed_size - 12;
+  strm.next_in = (Bytef*) compressed_buffer + 12;
+  strm.avail_out = uncompressed_size;
+
+  rc = inflateInit (&strm);
+  while (strm.avail_in > 0)
+    {
+      if (rc != Z_OK)
+	return FALSE;
+      strm.next_out = ((Bytef*) uncompressed_buffer
+                       + (uncompressed_size - strm.avail_out));
+      rc = inflate (&strm, Z_FINISH);
+      if (rc != Z_STREAM_END)
+	return FALSE;
+      rc = inflateReset (&strm);
+    }
+  rc = inflateEnd (&strm);
+  return rc == Z_OK && strm.avail_out == 0;
+}
+#endif
+
+/*
+FUNCTION
+	bfd_compress_section_contents
+
+SYNOPSIS
+	bfd_boolean bfd_compress_section_contents
+	  (bfd *abfd, asection *section, bfd_byte *uncompressed_buffer,
+	   bfd_size_type uncompressed_size);
+
+DESCRIPTION
+
+	Compress data of the size specified in @var{uncompressed_size}
+	and pointed to by @var{uncompressed_buffer} using zlib and store
+	as the contents field.  This function assumes the contents
+	field was allocated using bfd_malloc() or equivalent.  If zlib
+	is not installed on this machine, the input is unmodified.
+
+	Return @code{TRUE} if the full section contents is compressed 
+	successfully.
+*/
+
+bfd_boolean
+bfd_compress_section_contents (bfd *abfd ATTRIBUTE_UNUSED,
+			       sec_ptr sec ATTRIBUTE_UNUSED,
+			       bfd_byte *uncompressed_buffer ATTRIBUTE_UNUSED,
+			       bfd_size_type uncompressed_size ATTRIBUTE_UNUSED)
+{
+#ifndef HAVE_ZLIB_H
+  bfd_set_error (bfd_error_invalid_operation);
+  return FALSE;
+#else
+  uLong compressed_size;
+  bfd_byte *compressed_buffer;
+
+  compressed_size = compressBound (uncompressed_size) + 12;
+  compressed_buffer = (bfd_byte *) bfd_malloc (compressed_size);
+
+  if (compressed_buffer == NULL)
+    return FALSE;
+
+  if (compress ((Bytef*) compressed_buffer + 12,
+		&compressed_size,
+		(const Bytef*) uncompressed_buffer,
+		uncompressed_size) != Z_OK)
+    {
+      free (compressed_buffer);
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  /* Write the zlib header.  In this case, it should be "ZLIB" followed
+     by the uncompressed section size, 8 bytes in big-endian order.  */
+  memcpy (compressed_buffer, "ZLIB", 4);
+  compressed_buffer[11] = uncompressed_size; uncompressed_size >>= 8;
+  compressed_buffer[10] = uncompressed_size; uncompressed_size >>= 8;
+  compressed_buffer[9] = uncompressed_size; uncompressed_size >>= 8;
+  compressed_buffer[8] = uncompressed_size; uncompressed_size >>= 8;
+  compressed_buffer[7] = uncompressed_size; uncompressed_size >>= 8;
+  compressed_buffer[6] = uncompressed_size; uncompressed_size >>= 8;
+  compressed_buffer[5] = uncompressed_size; uncompressed_size >>= 8;
+  compressed_buffer[4] = uncompressed_size;
+  compressed_size += 12;
+
+  /* Free the uncompressed contents if we compress in place.  */
+  if (uncompressed_buffer == sec->contents)
+    free (uncompressed_buffer);
+
+  sec->contents = compressed_buffer;
+  sec->size = compressed_size;
+  sec->compress_status = COMPRESS_SECTION_DONE;
+
+  return TRUE;
+#endif  /* HAVE_ZLIB_H */
+}
+
+/*
+FUNCTION
+	bfd_get_full_section_contents
+
+SYNOPSIS
+	bfd_boolean bfd_get_full_section_contents
+	  (bfd *abfd, asection *section, bfd_byte **ptr);
+
+DESCRIPTION
+	Read all data from @var{section} in BFD @var{abfd}, decompress
+	if needed, and store in @var{*ptr}.  If @var{*ptr} is NULL,
+	return @var{*ptr} with memory malloc'd by this function.  
+
+	Return @code{TRUE} if the full section contents is retrieved
+	successfully.
+*/
+
+bfd_boolean
+bfd_get_full_section_contents (bfd *abfd, sec_ptr sec, bfd_byte **ptr)
+{
+  bfd_size_type sz;
+  bfd_byte *p = *ptr;
+#ifdef HAVE_ZLIB_H
+  bfd_boolean ret;
+  bfd_size_type compressed_size;
+  bfd_size_type uncompressed_size;
+  bfd_size_type rawsize;
+  bfd_byte *compressed_buffer;
+  bfd_byte *uncompressed_buffer;
+#endif
+
+  if (abfd->direction != write_direction && sec->rawsize != 0)
+    sz = sec->rawsize;
+  else
+    sz = sec->size;
+  if (sz == 0)
+    return TRUE;
+
+  switch (sec->compress_status)
+    {
+    case COMPRESS_SECTION_NONE:
+      if (p == NULL)
+	{
+	  p = (bfd_byte *) bfd_malloc (sz);
+	  if (p == NULL)
+	    return FALSE;
+	}
+      if (!bfd_get_section_contents (abfd, sec, p, 0, sz))
+	{
+	  if (*ptr != p)
+	    free (p);
+	  return FALSE;
+	}
+      *ptr = p;
+      return TRUE;
+
+    case DECOMPRESS_SECTION_SIZED:
+#ifndef HAVE_ZLIB_H
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+#else
+      /* Read in the full compressed section contents.  */
+      uncompressed_size = sec->size;
+      compressed_size = sec->compressed_size;
+      compressed_buffer = (bfd_byte *) bfd_malloc (compressed_size);
+      if (compressed_buffer == NULL)
+	return FALSE;
+      rawsize = sec->rawsize;
+      /* Clear rawsize, set size to compressed size and set compress_status
+	 to COMPRESS_SECTION_NONE.  If the compressed size is bigger than
+	 the uncompressed size, bfd_get_section_contents will fail.  */
+      sec->rawsize = 0;
+      sec->size = compressed_size;
+      sec->compress_status = COMPRESS_SECTION_NONE;
+      ret = bfd_get_section_contents (abfd, sec, compressed_buffer,
+				      0, compressed_size);
+      /* Restore rawsize and size.  */
+      sec->rawsize = rawsize;
+      sec->size = uncompressed_size;
+      sec->compress_status = DECOMPRESS_SECTION_SIZED;
+      if (!ret)
+	goto fail_compressed;
+
+      uncompressed_buffer = (bfd_byte *) bfd_malloc (uncompressed_size);
+      if (uncompressed_buffer == NULL)
+	goto fail_compressed;
+
+      if (!decompress_contents (compressed_buffer, compressed_size,
+				uncompressed_buffer, uncompressed_size))
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  free (uncompressed_buffer);
+	fail_compressed:
+	  free (compressed_buffer);
+	  return FALSE;
+	}
+
+      free (compressed_buffer);
+      sec->contents = uncompressed_buffer;
+      sec->compress_status = COMPRESS_SECTION_DONE;
+      /* Fall thru */
+#endif
+
+    case COMPRESS_SECTION_DONE:
+      if (p == NULL)
+	{
+	  p = (bfd_byte *) bfd_malloc (sz);
+	  if (p == NULL)
+	    return FALSE;
+	  *ptr = p;
+	}
+      memcpy (p, sec->contents, sz);
+      return TRUE;
+
+    default:
+      abort ();
+    }
+}
+
+/*
+FUNCTION
+	bfd_is_section_compressed
+
+SYNOPSIS
+	bfd_boolean bfd_is_section_compressed
+	  (bfd *abfd, asection *section);
+
+DESCRIPTION
+	Return @code{TRUE} if @var{section} is compressed.
+*/
+
+bfd_boolean
+bfd_is_section_compressed (bfd *abfd, sec_ptr sec)
+{
+  bfd_byte compressed_buffer [12];
+
+  /* Read the zlib header.  In this case, it should be "ZLIB" followed
+     by the uncompressed section size, 8 bytes in big-endian order.  */
+  return (bfd_get_section_contents (abfd, sec, compressed_buffer, 0, 12)
+	  && CONST_STRNEQ ((char*) compressed_buffer, "ZLIB"));
+}
+
+/*
+FUNCTION
+	bfd_init_section_decompress_status
+
+SYNOPSIS
+	bfd_boolean bfd_init_section_decompress_status
+	  (bfd *abfd, asection *section);
+
+DESCRIPTION
+	Record compressed section size, update section size with
+	decompressed size and set compress_status to
+	DECOMPRESS_SECTION_SIZED.
+
+	Return @code{FALSE} if the section is not a valid compressed
+	section or zlib is not installed on this machine.  Otherwise,
+	return @code{TRUE}.
+*/
+
+bfd_boolean
+bfd_init_section_decompress_status (bfd *abfd ATTRIBUTE_UNUSED,
+				    sec_ptr sec ATTRIBUTE_UNUSED)
+{
+#ifndef HAVE_ZLIB_H
+  bfd_set_error (bfd_error_invalid_operation);
+  return FALSE;
+#else
+  bfd_byte compressed_buffer [12];
+  bfd_size_type uncompressed_size;
+
+  if (sec->rawsize != 0
+      || sec->contents != NULL
+      || sec->compress_status != COMPRESS_SECTION_NONE
+      || !bfd_get_section_contents (abfd, sec, compressed_buffer, 0, 12))
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  /* Read the zlib header.  In this case, it should be "ZLIB" followed
+     by the uncompressed section size, 8 bytes in big-endian order.  */
+  if (! CONST_STRNEQ ((char*) compressed_buffer, "ZLIB"))
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+
+  uncompressed_size = compressed_buffer[4]; uncompressed_size <<= 8;
+  uncompressed_size += compressed_buffer[5]; uncompressed_size <<= 8;
+  uncompressed_size += compressed_buffer[6]; uncompressed_size <<= 8;
+  uncompressed_size += compressed_buffer[7]; uncompressed_size <<= 8;
+  uncompressed_size += compressed_buffer[8]; uncompressed_size <<= 8;
+  uncompressed_size += compressed_buffer[9]; uncompressed_size <<= 8;
+  uncompressed_size += compressed_buffer[10]; uncompressed_size <<= 8;
+  uncompressed_size += compressed_buffer[11];
+
+  sec->compressed_size = sec->size;
+  sec->size = uncompressed_size;
+  sec->compress_status = DECOMPRESS_SECTION_SIZED;
+
+  return TRUE;
+#endif
+}
+
+/*
+FUNCTION
+	bfd_init_section_compress_status
+
+SYNOPSIS
+	bfd_boolean bfd_init_section_compress_status
+	  (bfd *abfd, asection *section);
+
+DESCRIPTION
+	If open for read, compress section, update section size with
+	compressed size and set compress_status to COMPRESS_SECTION_DONE.
+
+	Return @code{FALSE} if the section is not a valid compressed
+	section or zlib is not installed on this machine.  Otherwise,
+	return @code{TRUE}.
+*/
+
+bfd_boolean
+bfd_init_section_compress_status (bfd *abfd ATTRIBUTE_UNUSED,
+				  sec_ptr sec ATTRIBUTE_UNUSED)
+{
+#ifndef HAVE_ZLIB_H
+  bfd_set_error (bfd_error_invalid_operation);
+  return FALSE;
+#else
+  bfd_size_type uncompressed_size;
+  bfd_byte *uncompressed_buffer;
+  bfd_boolean ret;
+
+  /* Error if not opened for read.  */
+  if (abfd->direction != read_direction
+      || sec->size == 0
+      || sec->rawsize != 0
+      || sec->contents != NULL
+      || sec->compress_status != COMPRESS_SECTION_NONE)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  /* Read in the full section contents and compress it.  */
+  uncompressed_size = sec->size;
+  uncompressed_buffer = (bfd_byte *) bfd_malloc (uncompressed_size);
+  if (!bfd_get_section_contents (abfd, sec, uncompressed_buffer,
+				 0, uncompressed_size))
+    ret = FALSE;
+  else
+    ret = bfd_compress_section_contents (abfd, sec,
+					 uncompressed_buffer,
+					 uncompressed_size);
+
+  free (uncompressed_buffer);
+  return ret;
+#endif
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/config.bfd sdcc-3.2.0+dfsg/support/sdbinutils/bfd/config.bfd
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/config.bfd	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/config.bfd	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1616 @@
+# config.bfd
+# Convert a canonical host type into a BFD host type.
+# Set shell variable targ to canonical target name, and run
+# using ``. config.bfd''.
+# Sets the following shell variables:
+#  targ_defvec		Default vector for this target
+#  targ_selvecs		Vectors to build for this target
+#  targ64_selvecs	Vectors to build if --enable-64-bit-bfd is given
+#			or if host is 64 bit.
+#  targ_archs		Architectures for this target
+#  targ_cflags		$(CFLAGS) for this target (FIXME: pretty bogus)
+#  targ_underscore	Whether underscores are used: yes or no
+
+# Part of this file is processed by targmatch.sed to generate the
+# targmatch.h file.  The #ifdef and #endif lines that appear below are
+# copied directly into targmatch.h.
+
+# The binutils c++filt program wants to know whether underscores are
+# stripped or not.  That is why we set targ_underscore.  c++filt uses
+# this information to choose a default.  This information is
+# duplicated in the symbol_leading_char field of the BFD target
+# vector, but c++filt does not deal with object files and is not
+# linked against libbfd.a.  It is not terribly important that c++filt
+# get this right; it is just convenient.
+
+targ_defvec=
+targ_selvecs=
+targ64_selvecs=
+targ_cflags=
+targ_underscore=no
+
+# Catch obsolete configurations.
+case $targ in
+ null)
+    if test "x$enable_obsolete" != xyes; then
+      echo "*** Configuration $targ is obsolete." >&2
+      echo "*** Specify --enable-obsolete to build it anyway." >&2
+      echo "*** Support will be REMOVED in the next major release of BINUTILS," >&2
+      echo "*** unless a maintainer comes forward." >&2
+      exit 1
+    fi;;
+esac
+
+case $targ in
+ m68*-apple-aux* | \
+ m68*-apollo-* | \
+ m68*-bull-sysv* | \
+ m68*-*-rtemscoff* | \
+ maxq-*-coff | \
+ i960-*-rtems* | \
+ or32-*-rtems* | \
+ m68*-*-lynxos* | \
+ sparc-*-lynxos* | \
+ vax-*-vms* | \
+ arm-*-oabi | \
+ a29k-* | \
+ hppa*-*-rtems* | \
+ *-go32-rtems* | \
+ i[3-7]86*-*-rtemscoff* | \
+ mips*el-*-rtems* | \
+ powerpcle-*-rtems* | \
+ sparc*-*-rtemsaout* | \
+ null)
+    echo "*** Configuration $targ is obsolete." >&2
+    echo "*** Support has been REMOVED." >&2
+    exit 1
+    ;;
+esac
+
+targ_cpu=`echo $targ | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+case "${targ_cpu}" in
+alpha*)		 targ_archs=bfd_alpha_arch ;;
+am34*|am33_2.0*) targ_archs=bfd_mn10300_arch ;;
+arm*)		 targ_archs=bfd_arm_arch ;;
+bfin*)		 targ_archs=bfd_bfin_arch ;;
+c30*)		 targ_archs=bfd_tic30_arch ;;
+c4x*)		 targ_archs=bfd_tic4x_arch ;;
+c54x*)		 targ_archs=bfd_tic54x_arch ;;
+cr16*)		 targ_archs=bfd_cr16_arch ;;
+crisv32)	 targ_archs=bfd_cris_arch ;;
+crx*)		 targ_archs=bfd_crx_arch ;;
+dlx*)		 targ_archs=bfd_dlx_arch ;;
+fido*)		 targ_archs=bfd_m68k_arch ;;
+hppa*)		 targ_archs=bfd_hppa_arch ;;
+i[3-7]86)	 targ_archs=bfd_i386_arch ;;
+i370)		 targ_archs=bfd_i370_arch ;;
+lm32)	         targ_archs=bfd_lm32_arch ;;
+m6811*|m68hc11*) targ_archs="bfd_m68hc11_arch bfd_m68hc12_arch" ;;
+m6812*|m68hc12*) targ_archs="bfd_m68hc12_arch bfd_m68hc11_arch" ;;
+m68*)		 targ_archs=bfd_m68k_arch ;;
+m88*)		 targ_archs=bfd_m88k_arch ;;
+microblaze*)	 targ_archs=bfd_microblaze_arch ;;
+mips*)		 targ_archs=bfd_mips_arch ;;
+or32*)		 targ_archs=bfd_or32_arch ;;
+pdp11*)		 targ_archs=bfd_pdp11_arch ;;
+pj*)		 targ_archs="bfd_pj_arch bfd_i386_arch";;
+powerpc*)	 targ_archs="bfd_rs6000_arch bfd_powerpc_arch" ;;
+rs6000)		 targ_archs="bfd_rs6000_arch bfd_powerpc_arch" ;;
+s390*)		 targ_archs=bfd_s390_arch ;;
+sh*)		 targ_archs=bfd_sh_arch ;;
+sparc*)		 targ_archs=bfd_sparc_arch ;;
+spu*)            targ_archs=bfd_spu_arch ;;
+tilegx*)	 targ_archs=bfd_tilegx_arch ;;
+tilepro*)	 targ_archs=bfd_tilepro_arch ;;
+v850*)		 targ_archs=bfd_v850_arch ;;
+x86_64*)	 targ_archs=bfd_i386_arch ;;
+xtensa*)	 targ_archs=bfd_xtensa_arch ;;
+z80|r800)	 targ_archs=bfd_z80_arch ;;
+z8k*)		 targ_archs=bfd_z8k_arch ;;
+*)		 targ_archs=bfd_${targ_cpu}_arch ;;
+esac
+
+
+# WHEN ADDING ENTRIES TO THIS MATRIX:
+#  Make sure that the left side always has two dashes.  Otherwise you
+#  can get spurious matches.  Even for unambiguous cases, do this as a
+#  convention, else the table becomes a real mess to understand and maintain.
+#
+#  Keep obsolete entries above the START comment, to keep them out of
+#  targmatch.h.
+
+case "${targ}" in
+  mips*-dec-bsd*)
+    echo "This target is obsolete and has been removed."
+    exit 1
+    ;;
+
+  mips*-*-mach3*)
+    echo "This target is obsolete and has been removed."
+    exit 1
+    ;;
+
+  mips*-*-pe*)
+    echo "This target is obsolete and has been removed."
+    exit 1
+    ;;
+
+  plugin)
+    targ_defvec=plugin_vec
+    targ_selvecs="plugin_vec"
+    ;;
+
+# START OF targmatch.h
+#ifdef BFD64
+  alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
+    targ_defvec=bfd_elf64_alpha_freebsd_vec
+    targ_selvecs="bfd_elf64_alpha_vec ecoffalpha_little_vec"
+    want64=true
+    # FreeBSD <= 4.0 supports only the old nonstandard way of ABI labelling.
+    case "${targ}" in
+      alpha*-*-freebsd3* | alpha*-*-freebsd4 | alpha*-*-freebsd4.0*)
+	targ_cflags=-DOLD_FREEBSD_ABI_LABEL ;;
+    esac
+    ;;
+  alpha*-*-netbsd* | alpha*-*-openbsd*)
+    targ_defvec=bfd_elf64_alpha_vec
+    targ_selvecs=ecoffalpha_little_vec
+    want64=true
+    ;;
+  alpha*-*-netware*)
+    targ_defvec=ecoffalpha_little_vec
+    targ_selvecs=nlm32_alpha_vec
+    want64=true
+    ;;
+  alpha*-*-linuxecoff*)
+    targ_defvec=ecoffalpha_little_vec
+    targ_selvecs=bfd_elf64_alpha_vec
+    want64=true
+    ;;
+  alpha*-*-linux-* | alpha*-*-elf*)
+    targ_defvec=bfd_elf64_alpha_vec
+    targ_selvecs=ecoffalpha_little_vec
+    want64=true
+    ;;
+  alpha*-*-*vms*)
+    targ_defvec=vms_alpha_vec
+    targ_selvecs=vms_lib_txt_vec
+    want64=true
+    ;;
+  alpha*-*-*)
+    targ_defvec=ecoffalpha_little_vec
+    want64=true
+    ;;
+  ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu)
+    targ_defvec=bfd_elf64_ia64_little_vec
+    targ_selvecs="bfd_elf64_ia64_big_vec bfd_pei_ia64_vec"
+    want64=true
+    ;;
+  ia64*-*-hpux*)
+    targ_defvec=bfd_elf32_ia64_hpux_big_vec
+    targ_selvecs="bfd_elf64_ia64_hpux_big_vec"
+    want64=true
+    ;;
+  ia64*-*-*vms*)
+    targ_defvec=bfd_elf64_ia64_vms_vec
+    targ_selvecs=vms_lib_txt_vec
+    want64=true
+    ;;
+  sparc64-*-freebsd* | sparc64-*-kfreebsd*-gnu)
+    targ_defvec=bfd_elf64_sparc_freebsd_vec
+    targ_selvecs="bfd_elf64_sparc_vec bfd_elf32_sparc_vec sunos_big_vec"
+    ;;
+  sparc64-*-netbsd* | sparc64-*-openbsd*)
+    targ_defvec=bfd_elf64_sparc_vec
+    targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec"
+    want64=true
+    ;;
+#endif /* BFD64 */
+
+  am34-*-linux* | am33_2.0-*-linux*)
+    targ_defvec=bfd_elf32_am33lin_vec
+    ;;
+
+  arc-*-elf*)
+    targ_defvec=bfd_elf32_littlearc_vec
+    targ_selvecs=bfd_elf32_bigarc_vec
+    ;;
+
+  armeb-*-netbsdelf*)
+    targ_defvec=bfd_elf32_bigarm_vec
+    targ_selvecs="bfd_elf32_littlearm_vec armnetbsd_vec"
+    ;;
+  arm-*-netbsdelf*)
+    targ_defvec=bfd_elf32_littlearm_vec
+    targ_selvecs="bfd_elf32_bigarm_vec armnetbsd_vec"
+    ;;
+  arm-*-netbsd* | arm-*-openbsd*)
+    targ_defvec=armnetbsd_vec
+    targ_selvecs="bfd_elf32_littlearm_vec bfd_elf32_bigarm_vec"
+    targ_underscore=yes
+    targ_cflags=-D__QNXTARGET__
+    ;;
+  arm-*-nto* | nto*arm*)
+    targ_defvec=bfd_elf32_littlearm_vec
+    targ_selvecs=bfd_elf32_bigarm_vec
+    ;;
+  arm-*-riscix*)
+    targ_defvec=riscix_vec
+    ;;
+  arm-epoc-pe*)
+    targ_defvec=arm_epoc_pe_little_vec
+    targ_selvecs="arm_epoc_pe_little_vec arm_epoc_pe_big_vec arm_epoc_pei_little_vec arm_epoc_pei_big_vec"
+    targ_underscore=no
+    targ_cflags=-DARM_COFF_BUGFIX
+    ;;
+  arm-wince-pe | arm-*-wince | arm*-*-mingw32ce* | arm*-*-cegcc*)
+    targ_defvec=arm_wince_pe_little_vec
+    targ_selvecs="arm_wince_pe_little_vec arm_wince_pe_big_vec arm_wince_pei_little_vec arm_wince_pei_big_vec"
+    targ_underscore=no
+    targ_cflags="-DARM_WINCE -DARM_COFF_BUGFIX"
+    ;;
+  arm-*-pe*)
+    targ_defvec=armpe_little_vec
+    targ_selvecs="armpe_little_vec armpe_big_vec armpei_little_vec armpei_big_vec"
+    targ_underscore=yes
+    ;;
+  arm-*-aout | armel-*-aout)
+    targ_defvec=aout_arm_little_vec
+    targ_selvecs=aout_arm_big_vec
+    ;;
+  armeb-*-aout)
+    targ_defvec=aout_arm_big_vec
+    targ_selvecs=aout_arm_little_vec
+    ;;
+  arm-*-coff)
+    targ_defvec=armcoff_little_vec
+    targ_selvecs=armcoff_big_vec
+    targ_underscore=yes
+    ;;
+  arm-*-rtems*)
+    targ_defvec=bfd_elf32_littlearm_vec
+    targ_selvecs=bfd_elf32_bigarm_vec
+    ;;
+  armeb-*-elf | arm*b-*-linux-*)
+    targ_defvec=bfd_elf32_bigarm_vec
+    targ_selvecs=bfd_elf32_littlearm_vec
+    ;;
+  arm-*-kaos*)
+    targ_defvec=bfd_elf32_littlearm_vec
+    targ_selvecs=bfd_elf32_bigarm_vec
+    ;;
+  arm-*-elf | arm-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
+  arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
+  arm*-*-eabi* )
+    targ_defvec=bfd_elf32_littlearm_vec
+    targ_selvecs=bfd_elf32_bigarm_vec
+    ;;
+  arm*-*-vxworks | arm*-*-windiss)
+    targ_defvec=bfd_elf32_littlearm_vxworks_vec
+    targ_selvecs=bfd_elf32_bigarm_vxworks_vec
+    ;;
+  arm*-*-symbianelf*)
+    targ_defvec=bfd_elf32_littlearm_symbian_vec
+    targ_selvecs=bfd_elf32_bigarm_symbian_vec
+    ;;
+  arm9e-*-elf)
+    targ_defvec=bfd_elf32_littlearm_vec
+    targ_selvecs=bfd_elf32_bigarm_vec
+    ;;
+
+  avr-*-*)
+    targ_defvec=bfd_elf32_avr_vec
+    ;;
+
+  bfin-*-*)
+    targ_defvec=bfd_elf32_bfin_vec
+    targ_selvecs=bfd_elf32_bfinfdpic_vec
+    targ_underscore=yes
+    ;;
+
+  c30-*-*aout* | tic30-*-*aout*)
+    targ_defvec=tic30_aout_vec
+    ;;
+  c30-*-*coff* | tic30-*-*coff*)
+    targ_defvec=tic30_coff_vec
+    ;;
+
+  c4x-*-*coff* | tic4x-*-*coff* | tic4x-*-rtems*)
+    targ_defvec=tic4x_coff1_vec
+    targ_selvecs="tic4x_coff1_beh_vec tic4x_coff2_vec tic4x_coff2_beh_vec tic4x_coff0_vec tic4x_coff0_beh_vec"
+    targ_underscore=yes
+    ;;
+
+  c54x*-*-*coff* | tic54x-*-*coff*)
+    targ_defvec=tic54x_coff1_vec
+    targ_selvecs="tic54x_coff1_beh_vec tic54x_coff2_vec tic54x_coff2_beh_vec tic54x_coff0_vec tic54x_coff0_beh_vec"
+    targ_underscore=yes
+    ;;
+
+  cr16-*-elf*)
+    targ_defvec=bfd_elf32_cr16_vec
+    targ_underscore=yes
+    ;;
+
+  cr16c-*-elf*)
+    targ_defvec=bfd_elf32_cr16c_vec
+    targ_underscore=yes
+    ;;
+
+  cris-*-* | crisv32-*-*)
+    targ_defvec=cris_aout_vec
+    targ_selvecs="bfd_elf32_us_cris_vec bfd_elf32_cris_vec ieee_vec"
+    targ_underscore=yes # Note: not true for bfd_elf32_cris_vec.
+    ;;
+
+  crx-*-elf*)
+    targ_defvec=bfd_elf32_crx_vec
+    targ_underscore=yes
+    ;;
+
+  d10v-*-*)
+    targ_defvec=bfd_elf32_d10v_vec
+    ;;
+
+  dlx-*-elf*)
+    targ_defvec=bfd_elf32_dlx_big_vec
+    targ_selvecs="bfd_elf32_dlx_big_vec"
+    ;;
+
+  d30v-*-*)
+    targ_defvec=bfd_elf32_d30v_vec
+    ;;
+
+  fido-*-elf* )
+    targ_defvec=bfd_elf32_m68k_vec
+    targ_selvecs="m68kcoff_vec ieee_vec"
+    ;;
+
+  fr30-*-elf)
+    targ_defvec=bfd_elf32_fr30_vec
+    ;;
+
+  frv-*-elf)
+    targ_defvec=bfd_elf32_frv_vec
+    targ_selvecs=bfd_elf32_frvfdpic_vec
+    ;;
+
+  frv-*-*linux*)
+    targ_defvec=bfd_elf32_frvfdpic_vec
+    targ_selvecs=bfd_elf32_frv_vec
+    ;;
+
+  moxie-*-elf | moxie-*-rtems | moxie-*-uclinux)
+    targ_defvec=bfd_elf32_moxie_vec
+    ;;
+
+  h8300*-*-rtemscoff*)
+    targ_defvec=h8300coff_vec
+    targ_underscore=yes
+    ;;
+
+  h8300*-*-elf | h8300*-*-rtems*)
+    targ_defvec=bfd_elf32_h8300_vec
+    targ_underscore=yes
+    ;;
+
+  h8300*-*-*)
+    targ_defvec=h8300coff_vec
+    targ_underscore=yes
+    ;;
+
+  h8500-*-*)
+    targ_defvec=h8500coff_vec
+    targ_underscore=yes
+    ;;
+
+#ifdef BFD64
+  hppa*64*-*-linux-*)
+    targ_defvec=bfd_elf64_hppa_linux_vec
+    targ_selvecs=bfd_elf64_hppa_vec
+    want64=true
+    ;;
+  hppa*64*-*-hpux11*)
+    targ_defvec=bfd_elf64_hppa_vec
+    targ_selvecs=bfd_elf64_hppa_linux_vec
+    targ_cflags=-DHPUX_LARGE_AR_IDS
+    want64=true
+    ;;
+#endif
+
+  hppa*-*-linux-*)
+    targ_defvec=bfd_elf32_hppa_linux_vec
+    targ_selvecs=bfd_elf32_hppa_vec
+    ;;
+  hppa*-*-netbsd*)
+    targ_defvec=bfd_elf32_hppa_nbsd_vec
+    targ_selvecs="bfd_elf32_hppa_vec bfd_elf32_hppa_linux_vec"
+    ;;
+  hppa*-*-*elf* | hppa*-*-lites* | hppa*-*-sysv4* | hppa*-*-openbsd*)
+    targ_defvec=bfd_elf32_hppa_vec
+    targ_selvecs=bfd_elf32_hppa_linux_vec
+    ;;
+
+  hppa*-*-bsd*)
+    targ_defvec=som_vec
+    targ_selvecs=bfd_elf32_hppa_vec
+    ;;
+  hppa*-*-hpux* | hppa*-*-hiux* | hppa*-*-mpeix*)
+    targ_defvec=som_vec
+    ;;
+  hppa*-*-osf*)
+    targ_defvec=som_vec
+    targ_selvecs=bfd_elf32_hppa_vec
+    ;;
+
+  i370-*-*)
+    targ_defvec=bfd_elf32_i370_vec
+    targ_selvecs="bfd_elf32_i370_vec"
+    ;;
+  i[3-7]86-*-sco3.2v5*coff)
+    targ_defvec=i386coff_vec
+    targ_selvecs=bfd_elf32_i386_vec
+    ;;
+  i[3-7]86-*-sysv4* | i[3-7]86-*-unixware* | \
+  i[3-7]86-*-elf | i[3-7]86-*-sco3.2v5* | \
+  i[3-7]86-*-dgux* | i[3-7]86-*-sysv5*)
+    targ_defvec=bfd_elf32_i386_vec
+    targ_selvecs=i386coff_vec
+    ;;
+  i[3-7]86-*-solaris2*)
+    targ_defvec=bfd_elf32_i386_sol2_vec
+    targ_selvecs="i386coff_vec"
+    targ64_selvecs="bfd_elf64_x86_64_sol2_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+    want64=true
+    ;;
+#ifdef BFD64
+  x86_64-*-solaris2*)
+    targ_defvec=bfd_elf32_i386_sol2_vec
+    targ_selvecs="bfd_elf64_x86_64_sol2_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec i386coff_vec"
+    want64=true
+    ;;
+#endif
+  i[3-7]86-*-kaos*)
+    targ_defvec=bfd_elf32_i386_vec
+    targ_selvecs=bfd_elf32_i386_vec
+    ;;
+  i[3-7]86-*-nto*)
+    targ_defvec=bfd_elf32_i386_vec
+    targ_selvecs=i386coff_vec
+    ;;
+  i[3-7]86-*-aros*)
+    targ_defvec=bfd_elf32_i386_vec
+    ;;
+  i[3-7]86-*-chorus*)
+    targ_defvec=bfd_elf32_i386_vec
+    ;;
+  i[3-7]86-*-dicos*)
+    targ_defvec=bfd_elf32_i386_vec
+    targ64_selvecs="bfd_elf64_x86_64_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+    ;;
+  *-*-msdosdjgpp* | *-*-go32* )
+    targ_defvec=go32coff_vec
+    targ_selvecs="go32stubbedcoff_vec i386aout_vec"
+    ;;
+  i[3-7]86-*-sysv* | i[3-7]86-*-isc* | i[3-7]86-*-sco* | i[3-7]86-*-coff | \
+  i[3-7]86-*-aix*)
+    targ_defvec=i386coff_vec
+    ;;
+  i[3-7]86-*-rtems*)
+    targ_defvec=bfd_elf32_i386_vec
+    targ_selvecs="i386coff_vec i386aout_vec"
+    ;;
+  i[3-7]86-*-darwin* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*)
+    targ_defvec=mach_o_i386_vec
+    targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
+    targ_archs="$targ_archs bfd_powerpc_arch bfd_rs6000_arch"
+    ;;
+ i[3-7]86-sequent-bsd*)
+    targ_defvec=i386dynix_vec
+    targ_underscore=yes
+    ;;
+  i[3-7]86-*-bsd*)
+    targ_defvec=i386bsd_vec
+    targ_underscore=yes
+    ;;
+  i[3-7]86-*-dragonfly*)
+    targ_defvec=bfd_elf32_i386_vec
+    targ64_selvecs="bfd_elf64_x86_64_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+    ;;
+  i[3-7]86-*-freebsdaout* | i[3-7]86-*-freebsd[12].* | \
+  i[3-7]86-*-freebsd[12])
+    targ_defvec=i386freebsd_vec
+    targ_selvecs=i386bsd_vec
+    targ_underscore=yes
+    ;;
+  i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu)
+    targ_defvec=bfd_elf32_i386_freebsd_vec
+    targ_selvecs="bfd_elf32_i386_vec i386pei_vec i386coff_vec"
+    targ64_selvecs="bfd_elf64_x86_64_freebsd_vec bfd_elf64_x86_64_vec x86_64pei_vec bfd_elf64_l1om_vec bfd_elf64_l1om_freebsd_vec bfd_elf64_k1om_vec bfd_elf64_k1om_freebsd_vec"
+    # FreeBSD <= 4.0 supports only the old nonstandard way of ABI labelling.
+    case "${targ}" in
+      i[3-7]86-*-freebsd3* | i[3-7]86-*-freebsd4 | i[3-7]86-*-freebsd4.0*)
+	targ_cflags=-DOLD_FREEBSD_ABI_LABEL ;;
+    esac
+    ;;
+  i[3-7]86-*-netbsdelf* | i[3-7]86-*-netbsd*-gnu* | i[3-7]86-*-knetbsd*-gnu)
+    targ_defvec=bfd_elf32_i386_vec
+    targ_selvecs=i386netbsd_vec
+    targ64_selvecs="bfd_elf64_x86_64_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+    ;;
+  i[3-7]86-*-netbsdpe*)
+    targ_defvec=i386pe_vec
+    targ_selvecs="i386pe_vec i386pei_vec bfd_elf32_i386_vec"
+    ;;
+  i[3-7]86-*-netbsdaout* | i[3-7]86-*-netbsd* | \
+  i[3-7]86-*-openbsd[0-2].* | i[3-7]86-*-openbsd3.[0-3])
+    targ_defvec=i386netbsd_vec
+    targ_selvecs="bfd_elf32_i386_vec i386bsd_vec"
+    targ_underscore=yes
+    ;;
+  i[3-7]86-*-openbsd*)
+    targ_defvec=bfd_elf32_i386_vec
+    targ_selvecs=i386netbsd_vec
+    ;;
+  i[3-7]86-*-netware*)
+    targ_defvec=bfd_elf32_i386_vec
+    targ_selvecs="nlm32_i386_vec i386coff_vec i386aout_vec"
+    ;;
+  i[3-7]86-*-linux*aout*)
+    targ_defvec=i386linux_vec
+    targ_selvecs=bfd_elf32_i386_vec
+    targ_underscore=yes
+    ;;
+  i[3-7]86-*-linux-*)
+    targ_defvec=bfd_elf32_i386_vec
+    targ_selvecs="i386linux_vec i386pei_vec"
+    targ64_selvecs="bfd_elf64_x86_64_vec bfd_elf32_x86_64_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+    ;;
+  i[3-7]86-*-nacl*)
+    targ_defvec=bfd_elf32_i386_nacl_vec
+    targ_selvecs="bfd_elf32_i386_vec"
+    ;;
+#ifdef BFD64
+  x86_64-*-darwin*)
+    targ_defvec=mach_o_x86_64_vec
+    targ_selvecs="mach_o_i386_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
+    targ_archs="$targ_archs bfd_powerpc_arch bfd_rs6000_arch"
+    want64=true
+    ;;
+  x86_64-*-dicos*)
+    targ_defvec=bfd_elf64_x86_64_vec
+    targ_selvecs="bfd_elf32_i386_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+    want64=true
+    ;;
+  x86_64-*-elf*)
+    targ_defvec=bfd_elf64_x86_64_vec
+    targ_selvecs="bfd_elf32_i386_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec i386coff_vec"
+    want64=true
+    ;;
+  x86_64-*-dragonfly*)
+    targ_defvec=bfd_elf64_x86_64_vec
+    targ_selvecs="bfd_elf32_i386_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+    want64=true
+    ;;
+  x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
+    targ_defvec=bfd_elf64_x86_64_freebsd_vec
+    targ_selvecs="bfd_elf32_i386_freebsd_vec i386coff_vec i386pei_vec x86_64pei_vec bfd_elf32_i386_vec bfd_elf64_x86_64_vec bfd_elf64_l1om_vec bfd_elf64_l1om_freebsd_vec bfd_elf64_k1om_vec bfd_elf64_k1om_freebsd_vec"
+    want64=true
+    ;;
+  x86_64-*-netbsd* | x86_64-*-openbsd*)
+    targ_defvec=bfd_elf64_x86_64_vec
+    targ_selvecs="bfd_elf32_i386_vec i386netbsd_vec i386coff_vec i386pei_vec x86_64pei_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+    want64=true
+    ;;
+  x86_64-*-linux-*)
+    targ_defvec=bfd_elf64_x86_64_vec
+    targ_selvecs="bfd_elf32_i386_vec bfd_elf32_x86_64_vec i386linux_vec i386pei_vec x86_64pei_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+    want64=true
+    ;;
+  x86_64-*-mingw* | x86_64-*-pe | x86_64-*-pep)
+    targ_defvec=x86_64pe_vec
+    targ_selvecs="x86_64pe_vec x86_64pei_vec bfd_elf64_x86_64_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec i386pe_vec i386pei_vec bfd_elf32_i386_vec"
+    want64=true
+    targ_underscore=no
+    ;;
+#endif
+  i[3-7]86-*-lynxos*)
+    targ_defvec=bfd_elf32_i386_vec
+    targ_selvecs="i386lynx_coff_vec i386lynx_aout_vec"
+    ;;
+  i[3-7]86-*-gnu*)
+    targ_defvec=bfd_elf32_i386_vec
+    ;;
+  i[3-7]86-*-mach* | i[3-7]86-*-osf1mk*)
+    targ_defvec=i386mach3_vec
+    targ_cflags=-DSTAT_FOR_EXEC
+    targ_underscore=yes
+    ;;
+  i[3-7]86-*-os9k)
+    targ_defvec=i386os9k_vec
+    ;;
+  i[3-7]86-*-msdos*)
+    targ_defvec=i386aout_vec
+    targ_selvecs=i386msdos_vec
+    ;;
+  i[3-7]86-*-moss*)
+    targ_defvec=bfd_elf32_i386_vec
+    targ_selvecs="i386msdos_vec i386aout_vec"
+    ;;
+  i[3-7]86-*-beospe*)
+    targ_defvec=i386pe_vec
+    targ_selvecs="i386pe_vec i386pei_vec"
+    ;;
+  i[3-7]86-*-beoself* | i[3-7]86-*-beos*)
+    targ_defvec=bfd_elf32_i386_vec
+    targ_selvecs="i386pe_vec i386pei_vec"
+    ;;
+  i[3-7]86-*-interix*)
+    targ_defvec=i386pei_vec
+    targ_selvecs="i386pe_vec"
+    # FIXME: This should eventually be checked at runtime.
+    targ_cflags=-DSTRICT_PE_FORMAT
+    ;;
+  i[3-7]86-*-rdos*)
+    targ_defvec=bfd_elf32_i386_vec
+    targ_selvecs=i386coff_vec
+    ;;
+  i[3-7]86-*-mingw32* | i[3-7]86-*-cygwin* | i[3-7]86-*-winnt | i[3-7]86-*-pe)
+    targ_defvec=i386pe_vec
+    targ_selvecs="i386pe_vec i386pei_vec bfd_elf32_i386_vec"
+    targ_underscore=yes
+    ;;
+  i[3-7]86-none-*)
+    targ_defvec=i386coff_vec
+    ;;
+  i[3-7]86-*-aout* | i[3-7]86*-*-vsta*)
+    targ_defvec=i386aout_vec
+    ;;
+  i[3-7]86-*-vxworks*)
+    targ_defvec=bfd_elf32_i386_vxworks_vec
+    targ_underscore=yes
+    ;;
+  i[3-7]86-*-chaos)
+    targ_defvec=bfd_elf32_i386_vec
+    targ_selfvecs=i386chaos_vec
+    ;;
+
+  i860-*-mach3* | i860-*-osf1* | i860-*-coff*)
+    targ_defvec=i860coff_vec
+    ;;
+  i860-stardent-sysv4* | i860-stardent-elf*)
+    targ_defvec=bfd_elf32_i860_little_vec
+    targ_selvecs="bfd_elf32_i860_vec bfd_elf32_i860_little_vec"
+    ;;
+  i860-*-sysv4* | i860-*-elf*)
+    targ_defvec=bfd_elf32_i860_vec
+    ;;
+
+  i960-*-vxworks4* | i960-*-vxworks5.0)
+    targ_defvec=b_out_vec_little_host
+    targ_selvecs="b_out_vec_big_host icoff_little_vec icoff_big_vec ieee_vec"
+    targ_underscore=yes
+    ;;
+  i960-*-vxworks5.* | i960-*-coff* | i960-*-sysv*)
+    targ_defvec=icoff_little_vec
+    targ_selvecs="icoff_big_vec b_out_vec_little_host b_out_vec_big_host ieee_vec"
+    targ_underscore=yes
+    ;;
+  i960-*-vxworks* | i960-*-aout* | i960-*-bout* | i960-*-nindy*)
+    targ_defvec=b_out_vec_little_host
+    targ_selvecs="b_out_vec_big_host icoff_little_vec icoff_big_vec ieee_vec"
+    targ_underscore=yes
+    ;;
+  i960-*-elf*)
+    targ_defvec=bfd_elf32_i960_vec
+    targ_selvecs="icoff_little_vec icoff_big_vec"
+    ;;
+
+  ip2k-*-elf)
+    targ_defvec=bfd_elf32_ip2k_vec
+    ;;
+
+  iq2000-*-elf)
+    targ_defvec=bfd_elf32_iq2000_vec
+    ;;
+
+  lm32-*-elf | lm32-*-rtems*)
+    targ_defvec=bfd_elf32_lm32_vec
+    targ_selvecs=bfd_elf32_lm32fdpic_vec
+    ;;
+
+  lm32-*-*linux*)
+    targ_defvec=bfd_elf32_lm32fdpic_vec
+    targ_selvecs=bfd_elf32_lm32_vec
+    ;;
+
+  m32c-*-elf | m32c-*-rtems*)
+    targ_defvec=bfd_elf32_m32c_vec
+    ;;
+
+  m32r*le-*-linux*)
+    targ_defvec=bfd_elf32_m32rlelin_vec
+    targ_selvecs="bfd_elf32_m32rlin_vec  bfd_elf32_m32rlelin_vec"
+    ;;
+  m32r*-*-linux*)
+    targ_defvec=bfd_elf32_m32rlin_vec
+    targ_selvecs="bfd_elf32_m32rlin_vec  bfd_elf32_m32rlelin_vec"
+    ;;
+  m32r*le-*-*)
+    targ_defvec=bfd_elf32_m32rle_vec
+    targ_selvecs="bfd_elf32_m32r_vec bfd_elf32_m32rle_vec"
+    ;;
+  m32r-*-*)
+    targ_defvec=bfd_elf32_m32r_vec
+    ;;
+
+  m68hc11-*-* | m6811-*-*)
+    targ_defvec=bfd_elf32_m68hc11_vec
+    targ_selvecs="bfd_elf32_m68hc11_vec bfd_elf32_m68hc12_vec"
+    ;;
+  m68hc12-*-* | m6812-*-*)
+    targ_defvec=bfd_elf32_m68hc12_vec
+    targ_selvecs="bfd_elf32_m68hc11_vec bfd_elf32_m68hc12_vec"
+    ;;
+
+  m68*-motorola-sysv*)
+    targ_defvec=m68ksysvcoff_vec
+    ;;
+  m68*-hp-bsd*)
+    targ_defvec=hp300bsd_vec
+    targ_underscore=yes
+    ;;
+  m68*-*-aout*)
+    targ_defvec=aout0_big_vec
+    # We include cisco_core_big_vec here, rather than making a separate cisco
+    # configuration, so that cisco-core.c gets routinely tested at
+    # least for compilation.
+    targ_selvecs="cisco_core_big_vec ieee_vec"
+    targ_underscore=yes
+    ;;
+  m68*-*-elf* | m68*-*-sysv4* | m68*-*-uclinux*)
+    targ_defvec=bfd_elf32_m68k_vec
+    targ_selvecs="m68kcoff_vec ieee_vec"
+    ;;
+  m68*-*-rtems*)
+    targ_defvec=bfd_elf32_m68k_vec
+    targ_selvecs="m68kcoff_vec versados_vec ieee_vec aout0_big_vec"
+    ;;
+  m68*-*-coff* | m68*-*-sysv*)
+    targ_defvec=m68kcoff_vec
+    targ_selvecs="m68kcoff_vec versados_vec ieee_vec"
+    ;;
+  m68*-*-hpux*)
+    targ_defvec=hp300hpux_vec
+    targ_underscore=yes
+    ;;
+  m68*-*-linux*aout*)
+    targ_defvec=m68klinux_vec
+    targ_selvecs=bfd_elf32_m68k_vec
+    targ_underscore=yes
+    ;;
+  m68*-*-linux-*)
+    targ_defvec=bfd_elf32_m68k_vec
+    targ_selvecs=m68klinux_vec
+    ;;
+  m68*-*-gnu*)
+    targ_defvec=bfd_elf32_m68k_vec
+    # targ_selvecs=m68kmach3_vec
+    # targ_cflags=-DSTAT_FOR_EXEC
+    ;;
+  m68*-hp*-netbsd*)
+    targ_defvec=m68k4knetbsd_vec
+    targ_selvecs="m68knetbsd_vec hp300bsd_vec sunos_big_vec"
+    targ_underscore=yes
+    ;;
+  m68*-*-netbsdelf*)
+    targ_defvec=bfd_elf32_m68k_vec
+    targ_selvecs="m68knetbsd_vec m68k4knetbsd_vec hp300bsd_vec sunos_big_vec"
+    ;;
+  m68*-*-netbsdaout* | m68*-*-netbsd*)
+    targ_defvec=m68knetbsd_vec
+    targ_selvecs="m68k4knetbsd_vec bfd_elf32_m68k_vec hp300bsd_vec sunos_big_vec"
+    targ_underscore=yes
+    ;;
+  m68*-*-openbsd*)
+    targ_defvec=m68knetbsd_vec
+    targ_selvecs="m68k4knetbsd_vec hp300bsd_vec sunos_big_vec"
+    targ_underscore=yes
+    ;;
+  m68*-*-sunos* | m68*-*-os68k* | m68*-*-vxworks* | m68*-netx-* | \
+  m68*-*-bsd* | m68*-*-vsta*)
+    targ_defvec=sunos_big_vec
+    targ_underscore=yes
+    ;;
+  m68*-ericsson-*)
+    targ_defvec=sunos_big_vec
+    targ_selvecs="m68kcoff_vec versados_vec tekhex_vec"
+    targ_underscore=yes
+    ;;
+  m68*-cbm-*)
+    targ_defvec=bfd_elf32_m68k_vec
+    targ_selvecs=m68kcoff_vec
+    ;;
+  m68*-*-psos*)
+    targ_defvec=bfd_elf32_m68k_vec
+    targ_selvecs=ieee_vec
+    targ_underscore=yes
+    ;;
+
+  m88*-harris-cxux* | m88*-*-dgux* | m88*-*-sysv4*)
+    targ_defvec=bfd_elf32_m88k_vec
+    targ_selvecs=m88kbcs_vec
+    ;;
+  m88*-*-mach3*)
+    targ_defvec=m88kmach3_vec
+    targ_cflags=-DSTAT_FOR_EXEC
+    ;;
+  m88*-*-openbsd*)
+   targ_defvec=m88kopenbsd_vec
+   targ_underscore=yes
+   ;;
+  m88*-*-*)
+    targ_defvec=m88kbcs_vec
+    targ_underscore=yes
+    ;;
+
+  mcore-*-elf)
+    targ_defvec=bfd_elf32_mcore_big_vec
+    targ_selvecs="bfd_elf32_mcore_big_vec bfd_elf32_mcore_little_vec"
+    ;;
+  mcore-*-pe)
+    targ_defvec=mcore_pe_big_vec
+    targ_selvecs="mcore_pe_big_vec mcore_pe_little_vec mcore_pei_big_vec mcore_pei_little_vec"
+    ;;
+
+  mep-*-elf)
+    targ_defvec=bfd_elf32_mep_vec
+    targ_selvecs=bfd_elf32_mep_little_vec
+    ;;
+
+  microblaze*-*)
+    targ_defvec=bfd_elf32_microblaze_vec
+    ;;
+
+  mips*-big-*)
+    targ_defvec=ecoff_big_vec
+    targ_selvecs=ecoff_little_vec
+    ;;
+  mips*el-*-netbsd*)
+    targ_defvec=bfd_elf32_tradlittlemips_vec
+    targ_selvecs="bfd_elf32_tradbigmips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_little_vec ecoff_big_vec"
+    ;;
+  mips*-*-netbsd*)
+    targ_defvec=bfd_elf32_tradbigmips_vec
+    targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec"
+    ;;
+  mips*-dec-* | mips*el-*-ecoff*)
+    targ_defvec=ecoff_little_vec
+    targ_selvecs=ecoff_big_vec
+    ;;
+  mips*-*-ecoff*)
+    targ_defvec=ecoff_big_vec
+    targ_selvecs=ecoff_little_vec
+    ;;
+#ifdef BFD64
+  mips*-*-irix6*)
+    targ_defvec=bfd_elf32_nbigmips_vec
+    targ_selvecs="bfd_elf32_nlittlemips_vec bfd_elf32_bigmips_vec bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec"
+    want64=true
+    ;;
+#endif
+  mips*-*-irix5*)
+    targ_defvec=bfd_elf32_bigmips_vec
+    targ_selvecs="bfd_elf32_littlemips_vec ecoff_big_vec ecoff_little_vec"
+    ;;
+  mips*-sgi-* | mips*-*-bsd*)
+    targ_defvec=ecoff_big_vec
+    targ_selvecs=ecoff_little_vec
+    ;;
+  mips*-*-lnews*)
+    targ_defvec=ecoff_biglittle_vec
+    targ_selvecs="ecoff_little_vec ecoff_big_vec"
+    ;;
+  mips*-*-sysv4*)
+    targ_defvec=bfd_elf32_tradbigmips_vec
+    targ_selvecs="bfd_elf32_tradlittlemips_vec ecoff_big_vec ecoff_little_vec"
+    ;;
+  mips*-*-sysv* | mips*-*-riscos*)
+    targ_defvec=ecoff_big_vec
+    targ_selvecs=ecoff_little_vec
+    ;;
+#ifdef BFD64
+  mips*el-*-vxworks*)
+    targ_defvec=bfd_elf32_littlemips_vxworks_vec
+    targ_selvecs="bfd_elf32_littlemips_vec bfd_elf32_bigmips_vxworks_vec bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec"
+    want64=true
+    ;;
+  mips*-*-vxworks*)
+    targ_defvec=bfd_elf32_bigmips_vxworks_vec
+    targ_selvecs="bfd_elf32_bigmips_vec bfd_elf32_littlemips_vxworks_vec bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec"
+    want64=true
+    ;;
+#endif
+  mips*el-sde-elf*)
+    targ_defvec=bfd_elf32_tradlittlemips_vec
+    targ_selvecs="bfd_elf32_tradbigmips_vec bfd_elf32_ntradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec"
+    want64=true
+    ;;
+  mips*-sde-elf*)
+    targ_defvec=bfd_elf32_tradbigmips_vec
+    targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec"
+    want64=true
+    ;;
+  mips*el-*-elf* | mips*el-*-vxworks* | mips*-*-chorus*)
+    targ_defvec=bfd_elf32_littlemips_vec
+    targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec"
+    ;;
+  mips*-*-elf* | mips*-*-rtems* | mips*-*-vxworks | mips*-*-windiss)
+    targ_defvec=bfd_elf32_bigmips_vec
+    targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec"
+    ;;
+  mips*-*-none)
+    targ_defvec=bfd_elf32_bigmips_vec
+    targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec"
+    ;;
+#ifdef BFD64
+  mips64*-*-openbsd*)
+    targ_defvec=bfd_elf64_tradbigmips_vec
+    targ_selvecs="bfd_elf32_ntradlittlemips_vec bfd_elf32_ntradbigmips_vec bfd_elf32_tradlittlemips_vec bfd_elf32_tradbigmips_vec bfd_elf64_tradlittlemips_vec"
+    want64=true
+    ;;
+#endif
+  mips*el-*-openbsd*)
+    targ_defvec=bfd_elf32_littlemips_vec
+    targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec"
+    ;;
+  mips*-*-openbsd*)
+    targ_defvec=bfd_elf32_bigmips_vec
+    targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_big_vec ecoff_little_vec"
+    ;;
+#ifdef BFD64
+  mips64*el-*-linux*)
+    targ_defvec=bfd_elf32_ntradlittlemips_vec
+    targ_selvecs="bfd_elf32_ntradbigmips_vec bfd_elf32_tradlittlemips_vec bfd_elf32_tradbigmips_vec bfd_elf64_tradlittlemips_vec bfd_elf64_tradbigmips_vec"
+    want64=true
+    ;;
+  mips64*-*-linux*)
+    targ_defvec=bfd_elf32_ntradbigmips_vec
+    targ_selvecs="bfd_elf32_ntradlittlemips_vec bfd_elf32_tradbigmips_vec bfd_elf32_tradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec"
+    want64=true
+    ;;
+#endif
+  mips*el-*-linux*)
+    targ_defvec=bfd_elf32_tradlittlemips_vec
+    targ_selvecs="bfd_elf32_tradbigmips_vec ecoff_little_vec ecoff_big_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradlittlemips_vec bfd_elf32_ntradbigmips_vec bfd_elf64_tradbigmips_vec"
+    want64=true
+    ;;
+  mips*-*-linux*)
+    targ_defvec=bfd_elf32_tradbigmips_vec
+    targ_selvecs="bfd_elf32_tradlittlemips_vec ecoff_big_vec ecoff_little_vec bfd_elf32_ntradbigmips_vec bfd_elf64_tradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradlittlemips_vec"
+    want64=true
+    ;;
+#ifdef BFD64
+  mips64*el-*-freebsd* | mips64*el-*-kfreebsd*-gnu)
+    # FreeBSD vectors
+    targ_defvec=bfd_elf32_ntradlittlemips_freebsd_vec
+    targ_selvecs="bfd_elf32_ntradbigmips_freebsd_vec bfd_elf32_tradlittlemips_freebsd_vec bfd_elf32_tradbigmips_freebsd_vec bfd_elf64_tradlittlemips_freebsd_vec bfd_elf64_tradbigmips_freebsd_vec"
+    # Generic vectors
+    targ_selvecs="${targ_selvecs} bfd_elf32_ntradlittlemips_vec bfd_elf32_ntradbigmips_vec bfd_elf32_tradlittlemips_vec bfd_elf32_tradbigmips_vec bfd_elf64_tradlittlemips_vec bfd_elf64_tradbigmips_vec"
+    want64=true
+    ;;
+  mips64*-*-freebsd* | mips64*-*-kfreebsd*-gnu)
+    # FreeBSD vectors
+    targ_defvec=bfd_elf32_ntradbigmips_freebsd_vec
+    targ_selvecs="bfd_elf32_ntradlittlemips_freebsd_vec bfd_elf32_tradbigmips_freebsd_vec bfd_elf32_tradlittlemips_freebsd_vec bfd_elf64_tradbigmips_freebsd_vec bfd_elf64_tradlittlemips_freebsd_vec"
+    # Generic vectors
+    targ_selvecs="${targ_selvecs} bfd_elf32_ntradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf32_tradbigmips_vec bfd_elf32_tradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec"
+    want64=true
+    ;;
+#endif
+  mips*el-*-freebsd* | mips*el-*-kfreebsd*-gnu)
+    # FreeBSD vectors
+    targ_defvec=bfd_elf32_tradlittlemips_freebsd_vec
+    targ_selvecs="bfd_elf32_tradbigmips_freebsd_vec bfd_elf32_ntradlittlemips_freebsd_vec bfd_elf64_tradlittlemips_freebsd_vec bfd_elf32_ntradbigmips_freebsd_vec bfd_elf64_tradbigmips_freebsd_vec"
+    # Generic vectors
+    targ_selvecs="${targ_selvecs} bfd_elf32_tradlittlemips_vec bfd_elf32_tradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradlittlemips_vec bfd_elf32_ntradbigmips_vec bfd_elf64_tradbigmips_vec"
+    want64=true
+    ;;
+  mips*-*-freebsd* | mips*-*-kfreebsd*-gnu)
+    # FreeBSD vectors
+    targ_defvec=bfd_elf32_tradbigmips_freebsd_vec
+    targ_selvecs="bfd_elf32_tradlittlemips_freebsd_vec bfd_elf32_ntradbigmips_freebsd_vec bfd_elf64_tradbigmips_freebsd_vec bfd_elf32_ntradlittlemips_freebsd_vec bfd_elf64_tradlittlemips_freebsd_vec"
+    # Generic vectors
+    targ_selvecs="${targ_selvecs} bfd_elf32_tradbigmips_vec bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmips_vec bfd_elf64_tradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradlittlemips_vec"
+    want64=true
+    ;;
+#ifdef BFD64
+  mmix-*-*)
+    targ_defvec=bfd_elf64_mmix_vec
+    targ_selvecs=bfd_mmo_vec
+    want64=true
+    ;;
+#endif
+  mn10200-*-*)
+    targ_defvec=bfd_elf32_mn10200_vec
+    ;;
+
+  mn10300-*-*)
+    targ_defvec=bfd_elf32_mn10300_vec
+    targ_underscore=yes
+    ;;
+
+  mt-*-elf)
+    targ_defvec=bfd_elf32_mt_vec
+    ;;
+
+  msp430-*-*)
+    targ_defvec=bfd_elf32_msp430_vec
+    ;;
+
+  ns32k-pc532-mach* | ns32k-pc532-ux*)
+    targ_defvec=pc532machaout_vec
+    targ_underscore=yes
+    ;;
+  ns32k-*-netbsd* | ns32k-*-lites* | ns32k-*-openbsd*)
+    targ_defvec=pc532netbsd_vec
+    targ_underscore=yes
+    ;;
+
+  openrisc-*-elf)
+    targ_defvec=bfd_elf32_openrisc_vec
+    ;;
+
+  or32-*-coff)
+    targ_defvec=or32coff_big_vec
+    targ_underscore=yes
+    ;;
+
+  or32-*-elf)
+    targ_defvec=bfd_elf32_or32_big_vec
+    ;;
+
+  pdp11-*-*)
+    targ_defvec=pdp11_aout_vec
+    targ_underscore=yes
+    ;;
+
+  pj-*-*)
+    targ_defvec=bfd_elf32_pj_vec
+    targ_selvecs="bfd_elf32_pj_vec bfd_elf32_pjl_vec"
+    ;;
+
+  pjl-*-*)
+    targ_defvec=bfd_elf32_pjl_vec
+    targ_selvecs="bfd_elf32_pjl_vec bfd_elf32_pj_vec bfd_elf32_i386_vec"
+    ;;
+
+  powerpc-*-aix5.[01] | rs6000-*-aix5.[01])
+    targ_defvec=rs6000coff_vec
+    targ_selvecs="aix5coff64_vec"
+    want64=true
+    ;;
+#ifdef BFD64
+  powerpc64-*-aix5.[01] | rs6000-*-aix5.[01])
+    targ_defvec=aix5coff64_vec
+    targ_selvecs="rs6000coff_vec"
+    want64=true
+    ;;
+#endif
+  powerpc-*-aix[5-9]* | rs6000-*-aix[5-9]*)
+    targ_cflags=-DAIX_WEAK_SUPPORT
+    targ_defvec=rs6000coff_vec
+    targ_selvecs="aix5coff64_vec"
+    want64=true
+    ;;
+#ifdef BFD64
+  powerpc64-*-aix[5-9]* | rs6000-*-aix[5-9]*)
+    targ_cflags=-DAIX_WEAK_SUPPORT
+    targ_defvec=aix5coff64_vec
+    targ_selvecs="rs6000coff_vec"
+    want64=true
+    ;;
+#endif
+
+  powerpc-*-aix* | powerpc-*-beos* | rs6000-*-*)
+    targ_defvec=rs6000coff_vec
+    targ64_selvecs=rs6000coff64_vec
+    case "${targ}" in
+	*-*-aix4.[3456789]* | *-*-aix[56789]*)
+	want64=true;;
+	*)
+	targ_cflags=-DSMALL_ARCHIVE;;
+    esac
+    ;;
+#ifdef BFD64
+  powerpc64-*-aix*)
+    targ_defvec=rs6000coff64_vec
+    targ_selvecs=rs6000coff_vec
+    want64=true
+    ;;
+  powerpc64-*-elf* | powerpc-*-elf64* | powerpc64-*-linux* | \
+  powerpc64-*-*bsd*)
+    targ_defvec=bfd_elf64_powerpc_vec
+    targ_selvecs="bfd_elf64_powerpcle_vec bfd_elf32_powerpc_vec bfd_elf32_powerpcle_vec rs6000coff_vec rs6000coff64_vec aix5coff64_vec"
+    want64=true
+    ;;
+  powerpc64le-*-elf* | powerpcle-*-elf64*)
+    targ_defvec=bfd_elf64_powerpcle_vec
+    targ_selvecs="bfd_elf64_powerpc_vec bfd_elf32_powerpcle_vec bfd_elf32_powerpc_vec rs6000coff_vec rs6000coff64_vec aix5coff64_vec"
+    want64=true
+    ;;
+#endif
+  powerpc-*-*bsd* | powerpc-*-elf* | powerpc-*-sysv4* | powerpc-*-eabi* | \
+  powerpc-*-solaris2* | powerpc-*-linux-* | powerpc-*-rtems* | \
+  powerpc-*-chorus*)
+    targ_defvec=bfd_elf32_powerpc_vec
+    targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec ppcboot_vec"
+    targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
+    ;;
+  powerpc-*-kaos*)
+    targ_defvec=bfd_elf32_powerpc_vec
+    targ_selvecs="bfd_elf32_powerpcle_vec ppcboot_vec"
+    targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
+    ;;
+  powerpc-*-darwin* | powerpc-*-macos10* | powerpc-*-rhapsody*)
+    targ_defvec=mach_o_be_vec
+    targ_selvecs="mach_o_be_vec mach_o_le_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
+    targ_archs="$targ_archs bfd_i386_arch"
+    ;;
+  powerpc-*-macos*)
+    targ_defvec=pmac_xcoff_vec
+    ;;
+  powerpc-*-lynxos*)
+    targ_defvec=bfd_elf32_powerpc_vec
+    targ_selvecs="rs6000coff_vec"
+    targ_cflags=-DSMALL_ARCHIVE
+    ;;
+  powerpc-*-netware*)
+    targ_defvec=bfd_elf32_powerpc_vec
+    targ_selvecs="nlm32_powerpc_vec rs6000coff_vec"
+    ;;
+  powerpc-*-nto*)
+    targ_defvec=bfd_elf32_powerpc_vec
+    targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec ppcboot_vec"
+    ;;
+  powerpc-*-vxworks* | powerpc-*-windiss*)
+    targ_defvec=bfd_elf32_powerpc_vxworks_vec
+    targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec bfd_elf32_powerpcle_vec ppcboot_vec"
+    targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
+    ;;
+  powerpcle-*-nto*)
+    targ_defvec=bfd_elf32_powerpcle_vec
+    targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
+    ;;
+  powerpcle-*-elf* | powerpcle-*-sysv4* | powerpcle-*-eabi* | \
+  powerpcle-*-solaris2* | powerpcle-*-linux-* | powerpcle-*-vxworks*)
+    targ_defvec=bfd_elf32_powerpcle_vec
+    targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
+    targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
+    ;;
+  powerpcle-*-pe | powerpcle-*-winnt* | powerpcle-*-cygwin*)
+    targ_defvec=bfd_powerpcle_pe_vec
+    targ_selvecs="bfd_powerpcle_pei_vec bfd_powerpc_pei_vec bfd_powerpcle_pe_vec bfd_powerpc_pe_vec"
+    ;;
+
+  rx-*-elf)
+    targ_defvec=bfd_elf32_rx_le_vec
+    targ_selvecs="bfd_elf32_rx_be_vec bfd_elf32_rx_le_vec bfd_elf32_rx_be_ns_vec"
+    ;;
+
+  s390-*-linux*)
+    targ_defvec=bfd_elf32_s390_vec
+    targ64_selvecs=bfd_elf64_s390_vec
+    want64=true
+    ;;
+#ifdef BFD64
+  s390x-*-linux*)
+    targ_defvec=bfd_elf64_s390_vec
+    targ_selvecs=bfd_elf32_s390_vec
+    want64=true
+    ;;
+  s390x-*-tpf*)
+    targ_defvec=bfd_elf64_s390_vec
+    want64=true
+    ;;
+
+  score*-*-elf*)
+    targ_defvec=bfd_elf32_bigscore_vec
+    targ_selvecs=bfd_elf32_littlescore_vec
+    ;;
+
+  sh64l*-*-elf*)
+    targ_defvec=bfd_elf32_sh64l_vec
+    targ_selvecs="bfd_elf32_sh64_vec bfd_elf64_sh64l_vec bfd_elf64_sh64_vec bfd_elf32_shl_vec bfd_elf32_sh_vec"
+    targ_underscore=yes
+    want64=true
+    ;;
+  sh64-*-elf*)
+    targ_defvec=bfd_elf32_sh64_vec
+    targ_selvecs="bfd_elf32_sh64l_vec bfd_elf64_sh64_vec bfd_elf64_sh64l_vec bfd_elf32_sh_vec bfd_elf32_shl_vec"
+    targ_underscore=yes
+    want64=true
+    ;;
+  sh64eb-*-linux*)
+    targ_defvec=bfd_elf32_sh64blin_vec
+    targ_selvecs="bfd_elf32_sh64lin_vec bfd_elf64_sh64blin_vec bfd_elf64_sh64lin_vec bfd_elf32_shblin_vec bfd_elf32_shlin_vec"
+    want64=true
+    ;;
+  sh64-*-linux*)
+    targ_defvec=bfd_elf32_sh64lin_vec
+    targ_selvecs="bfd_elf32_sh64blin_vec bfd_elf64_sh64lin_vec bfd_elf64_sh64blin_vec bfd_elf32_shlin_vec bfd_elf32_shblin_vec"
+    want64=true
+    ;;
+  sh-*-linux*)
+    targ_defvec=bfd_elf32_shblin_vec
+    targ_selvecs="bfd_elf32_shlin_vec bfd_elf32_sh64lin_vec bfd_elf32_sh64blin_vec bfd_elf64_sh64lin_vec bfd_elf64_sh64blin_vec"
+    want64=true
+    ;;
+#endif /* BFD64 */
+
+  sh*eb-*-linux*)
+    targ_defvec=bfd_elf32_shblin_vec
+    targ_selvecs=bfd_elf32_shlin_vec
+    ;;
+  sh*-*-linux*)
+    targ_defvec=bfd_elf32_shlin_vec
+    targ_selvecs=bfd_elf32_shblin_vec
+    ;;
+
+  sh-*-uclinux* | sh[12]-*-uclinux*)
+    targ_defvec=bfd_elf32_sh_vec
+    targ_selvecs="bfd_elf32_shl_vec bfd_elf32_shblin_vec bfd_elf32_shlin_vec bfd_elf32_shfd_vec bfd_elf32_shbfd_vec"
+#ifdef BFD64
+    targ_selvecs="${targ_selvecs} bfd_elf32_sh64lin_vec bfd_elf32_sh64blin_vec bfd_elf64_sh64lin_vec bfd_elf64_sh64blin_vec"
+#endif
+    ;;
+
+#ifdef BFD64
+  sh5le-*-netbsd*)
+    targ_defvec=bfd_elf32_sh64lnbsd_vec
+    targ_selvecs="bfd_elf32_sh64nbsd_vec bfd_elf64_sh64lnbsd_vec bfd_elf64_sh64nbsd_vec bfd_elf32_shnbsd_vec bfd_elf32_shlnbsd_vec"
+    want64=true
+    ;;
+  sh5-*-netbsd*)
+    targ_defvec=bfd_elf32_sh64nbsd_vec
+    targ_selvecs="bfd_elf32_sh64lnbsd_vec bfd_elf64_sh64lnbsd_vec bfd_elf64_sh64nbsd_vec bfd_elf32_shnbsd_vec bfd_elf32_shlnbsd_vec"
+    want64=true
+    ;;
+
+  sh64le-*-netbsd*)
+    targ_defvec=bfd_elf64_sh64lnbsd_vec
+    targ_selvecs="bfd_elf64_sh64nbsd_vec bfd_elf32_sh64lnbsd_vec bfd_elf32_sh64nbsd_vec bfd_elf32_shnbsd_vec bfd_elf32_shlnbsd_vec"
+    want64=true
+    ;;
+  sh64-*-netbsd*)
+    targ_defvec=bfd_elf64_sh64nbsd_vec
+    targ_selvecs="bfd_elf64_sh64lnbsd_vec bfd_elf32_sh64lnbsd_vec bfd_elf32_sh64nbsd_vec bfd_elf32_shnbsd_vec bfd_elf32_shlnbsd_vec"
+    want64=true
+    ;;
+
+  sh*l*-*-netbsdelf*)
+    targ_defvec=bfd_elf32_shlnbsd_vec
+    targ_selvecs="bfd_elf32_shnbsd_vec shcoff_vec shlcoff_vec bfd_elf32_sh64lnbsd_vec bfd_elf32_sh64nbsd_vec bfd_elf64_sh64lnbsd_vec bfd_elf64_sh64nbsd_vec"
+    want64=true
+    ;;
+  sh-*-netbsdelf*)
+    targ_defvec=bfd_elf32_shnbsd_vec
+    targ_selvecs="bfd_elf32_shlnbsd_vec shcoff_vec shlcoff_vec bfd_elf32_sh64lnbsd_vec bfd_elf32_sh64nbsd_vec bfd_elf64_sh64lnbsd_vec bfd_elf64_sh64nbsd_vec"
+    want64=true
+    ;;
+#endif
+
+  sh*-*-netbsdelf*)
+    targ_defvec=bfd_elf32_shnbsd_vec
+    targ_selvecs="bfd_elf32_shlnbsd_vec shcoff_vec shlcoff_vec"
+    ;;
+  sh*-*-symbianelf*)
+    targ_defvec=bfd_elf32_shl_symbian_vec
+    targ_selvecs="shlcoff_vec shlcoff_small_vec"
+    targ_underscore=yes
+    ;;
+
+#ifdef BFD64
+  shl*-*-elf* | sh[1234]l*-*-elf* | sh3el*-*-elf* | shl*-*-kaos*)
+    targ_defvec=bfd_elf32_shl_vec
+    targ_selvecs="bfd_elf32_sh_vec shlcoff_vec shcoff_vec shlcoff_small_vec shcoff_small_vec bfd_elf32_sh64_vec bfd_elf32_sh64l_vec bfd_elf64_sh64_vec bfd_elf64_sh64l_vec"
+    targ_underscore=yes
+    want64=true
+    ;;
+#endif
+
+  sh-*-rtemscoff*)
+    targ_defvec=shcoff_vec
+    targ_selvecs="shcoff_vec shlcoff_vec shcoff_small_vec shlcoff_small_vec"
+    targ_underscore=yes
+    ;;
+
+#ifdef BFD64
+  sh-*-elf* | sh[1234]*-elf* | sh-*-rtems* | sh-*-kaos*)
+    targ_defvec=bfd_elf32_sh_vec
+    targ_selvecs="bfd_elf32_shl_vec shcoff_vec shlcoff_vec shcoff_small_vec shlcoff_small_vec bfd_elf32_sh64_vec bfd_elf32_sh64l_vec bfd_elf64_sh64_vec bfd_elf64_sh64l_vec"
+    targ_underscore=yes
+    want64=true
+    ;;
+#endif
+
+  sh-*-nto*)
+    targ_defvec=bfd_elf32_sh_vec
+    targ_selvecs="bfd_elf32_shl_vec shcoff_vec shlcoff_vec shcoff_small_vec shlcoff_small_vec"
+    targ_underscore=yes
+    ;;
+  sh*-*-openbsd*)
+    targ_defvec=bfd_elf32_shlnbsd_vec
+    targ_selvecs="bfd_elf32_shnbsd_vec shcoff_vec shlcoff_vec"
+    ;;
+  sh-*-pe)
+    targ_defvec=shlpe_vec
+    targ_selvecs="shlpe_vec shlpei_vec"
+    targ_underscore=yes
+    ;;
+  sh-*-vxworks)
+    targ_defvec=bfd_elf32_shvxworks_vec
+    targ_selvecs="bfd_elf32_shlvxworks_vec"
+    # FIXME None of the following are actually used on this target, but
+    # they're necessary for coff-sh.c (which is unconditionally used) to be
+    # compiled correctly.
+    targ_selvecs="$targ_selvecs shcoff_vec shlcoff_vec shcoff_small_vec shlcoff_small_vec"
+    targ_underscore=yes
+    ;;
+  sh-*-*)
+    targ_defvec=shcoff_vec
+    targ_selvecs="shcoff_vec shlcoff_vec shcoff_small_vec shlcoff_small_vec"
+    targ_underscore=yes
+    ;;
+
+  sparclet-*-aout*)
+    targ_defvec=sunos_big_vec
+    targ_selvecs=sparcle_aout_vec
+    targ_underscore=yes
+    ;;
+  sparc86x-*-aout*)
+    targ_defvec=sunos_big_vec
+    targ_underscore=yes
+    ;;
+  sparclite-*-elf* | sparc86x-*-elf*)
+    targ_defvec=bfd_elf32_sparc_vec
+    ;;
+  sparc*-*-chorus*)
+    targ_defvec=bfd_elf32_sparc_vec
+    ;;
+  sparc-*-linux*aout*)
+    targ_defvec=sparclinux_vec
+    targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec"
+    targ_underscore=yes
+    ;;
+  sparc-*-linux-* | sparcv*-*-linux-*)
+    targ_defvec=bfd_elf32_sparc_vec
+    targ_selvecs="sparclinux_vec bfd_elf64_sparc_vec sunos_big_vec"
+    ;;
+  sparc-*-netbsdelf*)
+    targ_defvec=bfd_elf32_sparc_vec
+    targ_selvecs=sparcnetbsd_vec
+    ;;
+  sparc-*-netbsdaout* | sparc-*-netbsd*)
+    targ_defvec=sparcnetbsd_vec
+    targ_selvecs=bfd_elf32_sparc_vec
+    targ_underscore=yes
+    ;;
+  sparc-*-openbsd[0-2].* | sparc-*-openbsd3.[0-1])
+    targ_defvec=sparcnetbsd_vec
+    targ_underscore=yes
+    ;;
+  sparc-*-openbsd*)
+    targ_defvec=bfd_elf32_sparc_vec
+    targ_selvecs=sparcnetbsd_vec
+    ;;
+  sparc-*-elf*)
+    targ_defvec=bfd_elf32_sparc_vec
+    targ_selvecs=sunos_big_vec
+    ;;
+  sparc-*-solaris2.[0-6] | sparc-*-solaris2.[0-6].*)
+    targ_defvec=bfd_elf32_sparc_sol2_vec
+    targ_selvecs=sunos_big_vec
+    ;;
+#ifdef BFD64
+  sparc-*-solaris2* | sparcv9-*-solaris2* | sparc64-*-solaris2*)
+    targ_defvec=bfd_elf32_sparc_sol2_vec
+    targ_selvecs="bfd_elf64_sparc_sol2_vec sunos_big_vec"
+    want64=true
+    ;;
+#endif
+  sparc-*-sysv4*)
+    targ_defvec=bfd_elf32_sparc_vec
+    ;;
+  sparc-*-vxworks*)
+    targ_defvec=bfd_elf32_sparc_vxworks_vec
+    targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec"
+    ;;
+  sparc-*-netware*)
+    targ_defvec=bfd_elf32_sparc_vec
+    targ_selvecs="nlm32_sparc_vec sunos_big_vec"
+    ;;
+#ifdef BFD64
+  sparc64-*-aout*)
+    targ_defvec=sunos_big_vec
+    targ_underscore=yes
+    want64=true
+    ;;
+  sparc64*-*-linux-*)
+    targ_defvec=bfd_elf64_sparc_vec
+    targ_selvecs="bfd_elf32_sparc_vec sparclinux_vec sunos_big_vec"
+    want64=true
+    ;;
+  sparc64-*-elf* | sparc64-*-rtems* )
+    targ_defvec=bfd_elf64_sparc_vec
+    targ_selvecs=bfd_elf32_sparc_vec
+    want64=true
+    ;;
+#endif /* BFD64 */
+  sparc*-*-coff*)
+    targ_defvec=sparccoff_vec
+    ;;
+  sparc-*-rtems*)
+    targ_defvec=bfd_elf32_sparc_vec
+    targ_selvecs="sunos_big_vec sparccoff_vec"
+    ;;
+  sparc*-*-*)
+    targ_defvec=sunos_big_vec
+    targ_underscore=yes
+    ;;
+
+  spu-*-elf)
+    targ_defvec=bfd_elf32_spu_vec
+    want64=true
+    ;;
+
+#if HAVE_host_aout_vec
+  tahoe-*-*)
+    targ_defvec=host_aout_vec
+    targ_underscore=yes
+    ;;
+#endif
+
+  tic6x-*-elf)
+    targ_defvec=bfd_elf32_tic6x_elf_le_vec
+    targ_selvecs="bfd_elf32_tic6x_elf_be_vec bfd_elf32_tic6x_le_vec bfd_elf32_tic6x_be_vec"
+    ;;
+
+  tic6x-*-uclinux)
+    targ_defvec=bfd_elf32_tic6x_linux_le_vec
+    targ_selvecs="bfd_elf32_tic6x_linux_be_vec bfd_elf32_tic6x_le_vec bfd_elf32_tic6x_be_vec"
+    ;;
+
+  tic80*-*-*)
+    targ_defvec=tic80coff_vec
+    targ_underscore=yes
+    ;;
+
+#ifdef BFD64
+  tilegx-*-*)
+    targ_defvec=bfd_elf64_tilegx_vec
+    targ_selvecs=bfd_elf32_tilegx_vec
+    ;;
+#endif
+
+  tilepro-*-*)
+    targ_defvec=bfd_elf32_tilepro_vec
+    ;;
+
+  v850*-*-*)
+    targ_defvec=bfd_elf32_v850_vec
+    ;;
+
+  vax-*-netbsdelf*)
+    targ_defvec=bfd_elf32_vax_vec
+    targ_selvecs="vaxnetbsd_vec vax1knetbsd_vec"
+    ;;
+
+  vax-*-netbsdaout* | vax-*-netbsd*)
+    targ_defvec=vaxnetbsd_vec
+    targ_selvecs="bfd_elf32_vax_vec vax1knetbsd_vec"
+    targ_underscore=yes
+    ;;
+
+  vax-*-bsd* | vax-*-ultrix*)
+    targ_defvec=vaxbsd_vec
+    targ_underscore=yes
+    ;;
+
+  vax-*-openbsd*)
+    targ_defvec=vaxnetbsd_vec
+    targ_underscore=yes
+    ;;
+
+  vax-*-linux-*)
+    targ_defvec=bfd_elf32_vax_vec
+    ;;
+
+  we32k-*-*)
+    targ_defvec=we32kcoff_vec
+    ;;
+
+  w65-*-*)
+    targ_defvec=w65_vec
+    ;;
+
+  xstormy16-*-elf)
+    targ_defvec=bfd_elf32_xstormy16_vec
+    ;;
+
+  xtensa*-*-*)
+    targ_defvec=bfd_elf32_xtensa_le_vec
+    targ_selvecs=bfd_elf32_xtensa_be_vec
+    ;;
+ xc16x-*-elf)
+    targ_defvec=bfd_elf32_xc16x_vec
+    ;;
+
+  z80-*-*)
+    targ_defvec=z80coff_vec
+    targ_underscore=no
+    ;;
+
+  z8k*-*-*)
+    targ_defvec=z8kcoff_vec
+    targ_underscore=yes
+    ;;
+
+  *-*-ieee*)
+    targ_defvec=ieee_vec
+    ;;
+
+  *-adobe-*)
+    targ_defvec=a_out_adobe_vec
+    targ_underscore=yes
+    ;;
+
+  *-sony-*)
+    targ_defvec=newsos3_vec
+    targ_underscore=yes
+    ;;
+
+  *-tandem-*)
+    targ_defvec=m68kcoff_vec
+    targ_selvecs=ieee_vec
+    ;;
+# END OF targmatch.h
+  *)
+    echo 1>&2 "*** BFD does not support target ${targ}."
+    echo 1>&2 "*** Look in bfd/config.bfd for supported targets."
+    exit 1
+    ;;
+esac
+
+case "${host64}${want64}" in
+  *true*)
+    targ_selvecs="${targ_selvecs} ${targ64_selvecs}"
+    ;;
+esac
+
+# If we support any ELF target, then automatically add support for the
+# generic ELF targets.  This permits an objdump with some ELF support
+# to be used on an arbitrary ELF file for anything other than
+# relocation information.
+case "${targ_defvec} ${targ_selvecs}" in
+  *bfd_elf64* | *bfd_elf32_n*mips*)
+    targ_selvecs="${targ_selvecs} bfd_elf64_little_generic_vec bfd_elf64_big_generic_vec bfd_elf32_little_generic_vec bfd_elf32_big_generic_vec"
+    ;;
+  *bfd_elf32*)
+    targ_selvecs="${targ_selvecs} bfd_elf32_little_generic_vec bfd_elf32_big_generic_vec"
+    ;;
+esac
+
+# If we support Intel L1OM target, then add support for bfd_l1om_arch.
+case "${targ_defvec} ${targ_selvecs}" in
+  *bfd_elf64_l1om_vec*)
+    targ_archs="$targ_archs bfd_l1om_arch"
+    ;;
+esac
+
+# If we support Intel K1OM target, then add support for bfd_k1om_arch.
+case "${targ_defvec} ${targ_selvecs}" in
+  *bfd_elf64_k1om_vec*)
+    targ_archs="$targ_archs bfd_k1om_arch"
+    ;;
+esac
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/config.in sdcc-3.2.0+dfsg/support/sdbinutils/bfd/config.in
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/config.in	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/config.in	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,363 @@
+/* config.in.  Generated from configure.in by autoheader.  */
+
+/* Name of host specific core header file to include in elf.c. */
+#undef CORE_HEADER
+
+/* Define to 1 if translation of program messages to the user's native
+   language is requested. */
+#undef ENABLE_NLS
+
+/* Define to 1 if you have the <alloca.h> header file. */
+#undef HAVE_ALLOCA_H
+
+/* Define to 1 if you have the declaration of `basename', and to 0 if you
+   don't. */
+#undef HAVE_DECL_BASENAME
+
+/* Define to 1 if you have the declaration of `ffs', and to 0 if you don't. */
+#undef HAVE_DECL_FFS
+
+/* Define to 1 if you have the declaration of `free', and to 0 if you don't.
+   */
+#undef HAVE_DECL_FREE
+
+/* Define to 1 if you have the declaration of `fseeko', and to 0 if you don't.
+   */
+#undef HAVE_DECL_FSEEKO
+
+/* Define to 1 if you have the declaration of `fseeko64', and to 0 if you
+   don't. */
+#undef HAVE_DECL_FSEEKO64
+
+/* Define to 1 if you have the declaration of `ftello', and to 0 if you don't.
+   */
+#undef HAVE_DECL_FTELLO
+
+/* Define to 1 if you have the declaration of `ftello64', and to 0 if you
+   don't. */
+#undef HAVE_DECL_FTELLO64
+
+/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
+   */
+#undef HAVE_DECL_GETENV
+
+/* Define to 1 if you have the declaration of `malloc', and to 0 if you don't.
+   */
+#undef HAVE_DECL_MALLOC
+
+/* Define to 1 if you have the declaration of `realloc', and to 0 if you
+   don't. */
+#undef HAVE_DECL_REALLOC
+
+/* Define to 1 if you have the declaration of `snprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL_SNPRINTF
+
+/* Define to 1 if you have the declaration of `stpcpy', and to 0 if you don't.
+   */
+#undef HAVE_DECL_STPCPY
+
+/* Define to 1 if you have the declaration of `strstr', and to 0 if you don't.
+   */
+#undef HAVE_DECL_STRSTR
+
+/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL_VSNPRINTF
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_DIRENT_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the `fcntl' function. */
+#undef HAVE_FCNTL
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define to 1 if you have the `fdopen' function. */
+#undef HAVE_FDOPEN
+
+/* Define to 1 if you have the `fileno' function. */
+#undef HAVE_FILENO
+
+/* Define to 1 if you have the `fopen64' function. */
+#undef HAVE_FOPEN64
+
+/* Define to 1 if you have the `fseeko' function. */
+#undef HAVE_FSEEKO
+
+/* Define to 1 if you have the `fseeko64' function. */
+#undef HAVE_FSEEKO64
+
+/* Define to 1 if you have the `ftello' function. */
+#undef HAVE_FTELLO
+
+/* Define to 1 if you have the `ftello64' function. */
+#undef HAVE_FTELLO64
+
+/* Define to 1 if you have the `getgid' function. */
+#undef HAVE_GETGID
+
+/* Define to 1 if you have the `getpagesize' function. */
+#undef HAVE_GETPAGESIZE
+
+/* Define to 1 if you have the `getuid' function. */
+#undef HAVE_GETUID
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define if <sys/procfs.h> has lwpstatus_t. */
+#undef HAVE_LWPSTATUS_T
+
+/* Define if <sys/procfs.h> has lwpstatus_t.pr_context. */
+#undef HAVE_LWPSTATUS_T_PR_CONTEXT
+
+/* Define if <sys/procfs.h> has lwpstatus_t.pr_fpreg. */
+#undef HAVE_LWPSTATUS_T_PR_FPREG
+
+/* Define if <sys/procfs.h> has lwpstatus_t.pr_reg. */
+#undef HAVE_LWPSTATUS_T_PR_REG
+
+/* Define if <sys/procfs.h> has lwpxstatus_t. */
+#undef HAVE_LWPXSTATUS_T
+
+/* Define to 1 if you have the `madvise' function. */
+#undef HAVE_MADVISE
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have a working `mmap' system call. */
+#undef HAVE_MMAP
+
+/* Define to 1 if you have the `mprotect' function. */
+#undef HAVE_MPROTECT
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
+
+/* Define if <sys/procfs.h> has prpsinfo32_t. */
+#undef HAVE_PRPSINFO32_T
+
+/* Define if <sys/procfs.h> has prpsinfo32_t.pr_pid. */
+#undef HAVE_PRPSINFO32_T_PR_PID
+
+/* Define if <sys/procfs.h> has prpsinfo_t. */
+#undef HAVE_PRPSINFO_T
+
+/* Define if <sys/procfs.h> has prpsinfo_t.pr_pid. */
+#undef HAVE_PRPSINFO_T_PR_PID
+
+/* Define if <sys/procfs.h> has prstatus32_t. */
+#undef HAVE_PRSTATUS32_T
+
+/* Define if <sys/procfs.h> has prstatus32_t.pr_who. */
+#undef HAVE_PRSTATUS32_T_PR_WHO
+
+/* Define if <sys/procfs.h> has prstatus_t. */
+#undef HAVE_PRSTATUS_T
+
+/* Define if <sys/procfs.h> has prstatus_t.pr_who. */
+#undef HAVE_PRSTATUS_T_PR_WHO
+
+/* Define if <sys/procfs.h> has psinfo32_t. */
+#undef HAVE_PSINFO32_T
+
+/* Define if <sys/procfs.h> has psinfo32_t.pr_pid. */
+#undef HAVE_PSINFO32_T_PR_PID
+
+/* Define if <sys/procfs.h> has psinfo_t. */
+#undef HAVE_PSINFO_T
+
+/* Define if <sys/procfs.h> has psinfo_t.pr_pid. */
+#undef HAVE_PSINFO_T_PR_PID
+
+/* Define if <sys/procfs.h> has pstatus32_t. */
+#undef HAVE_PSTATUS32_T
+
+/* Define if <sys/procfs.h> has pstatus_t. */
+#undef HAVE_PSTATUS_T
+
+/* Define if <sys/procfs.h> has pxstatus_t. */
+#undef HAVE_PXSTATUS_T
+
+/* Define to 1 if you have the `setitimer' function. */
+#undef HAVE_SETITIMER
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#undef HAVE_STDDEF_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strtoull' function. */
+#undef HAVE_STRTOULL
+
+/* Define if struct core_dumpx has member c_impl */
+#undef HAVE_ST_C_IMPL
+
+/* Define to 1 if you have the `sysconf' function. */
+#undef HAVE_SYSCONF
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_DIR_H
+
+/* Define to 1 if you have the <sys/file.h> header file. */
+#undef HAVE_SYS_FILE_H
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_NDIR_H
+
+/* Define to 1 if you have the <sys/procfs.h> header file. */
+#undef HAVE_SYS_PROCFS_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <time.h> header file. */
+#undef HAVE_TIME_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define if <sys/procfs.h> has win32_pstatus_t. */
+#undef HAVE_WIN32_PSTATUS_T
+
+/* Define to 1 if you have the <zlib.h> header file. */
+#undef HAVE_ZLIB_H
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* The size of `char', as computed by sizeof. */
+#undef SIZEOF_CHAR
+
+/* The size of `int', as computed by sizeof. */
+#undef SIZEOF_INT
+
+/* The size of `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* The size of `long long', as computed by sizeof. */
+#undef SIZEOF_LONG_LONG
+
+/* The size of `off_t', as computed by sizeof. */
+#undef SIZEOF_OFF_T
+
+/* The size of `short', as computed by sizeof. */
+#undef SIZEOF_SHORT
+
+/* The size of `void *', as computed by sizeof. */
+#undef SIZEOF_VOID_P
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define if you can safely include both <string.h> and <strings.h>. */
+#undef STRING_WITH_STRINGS
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
+
+/* Name of host specific header file to include in trad-core.c. */
+#undef TRAD_HEADER
+
+/* Use b modifier when opening binary files? */
+#undef USE_BINARY_FOPEN
+
+/* Define if we should use leading underscore on 64 bit mingw targets */
+#undef USE_MINGW64_LEADING_UNDERSCORES
+
+/* Use mmap if it's available? */
+#undef USE_MMAP
+
+/* Define if we should default to creating read-only plt entries */
+#undef USE_SECUREPLT
+
+/* Define if we may generate symbols with ELF's STT_COMMON type */
+#undef USE_STT_COMMON
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Version number of package */
+#undef VERSION
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/configure sdcc-3.2.0+dfsg/support/sdbinutils/bfd/configure
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/configure	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/configure	2012-03-01 21:14:28.000000000 +0000
@@ -0,0 +1,18749 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.64.
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# Foundation, Inc.
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+
+exec 7<&0 </dev/null 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
+PACKAGE_URL=
+
+ac_unique_file="libbfd.c"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+LIBOBJS
+havevecs
+tdefaults
+bfd_ufile_ptr
+bfd_file_ptr
+supports_plugins
+bfd_default_target_size
+bfd_machines
+bfd_backends
+all_backends
+bfd64_libs
+wordsize
+TDEFINES
+SHARED_LIBADD
+SHARED_LDFLAGS
+LIBM
+COREFLAG
+COREFILE
+EXEEXT_FOR_BUILD
+CC_FOR_BUILD
+BFD_HOSTPTR_T
+BFD_HOST_U_64_BIT
+BFD_HOST_64_BIT
+BFD_HOST_64_BIT_DEFINED
+BFD_HOST_64BIT_LONG_LONG
+BFD_HOST_64BIT_LONG
+HDEFINES
+MSGMERGE
+MSGFMT
+MKINSTALLDIRS
+CATOBJEXT
+GENCAT
+INSTOBJEXT
+DATADIRNAME
+CATALOGS
+POSUB
+GMSGFMT
+XGETTEXT
+INCINTL
+LIBINTL_DEP
+LIBINTL
+USE_NLS
+bfdincludedir
+bfdlibdir
+target_noncanonical
+host_noncanonical
+INSTALL_LIBBFD_FALSE
+INSTALL_LIBBFD_TRUE
+GENINSRC_NEVER_FALSE
+GENINSRC_NEVER_TRUE
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+NO_WERROR
+WARN_CFLAGS
+REPORT_BUGS_TEXI
+REPORT_BUGS_TO
+PKGVERSION
+DEBUGDIR
+PLUGINS_FALSE
+PLUGINS_TRUE
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+OBJDUMP
+LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+SED
+LIBTOOL
+EGREP
+GREP
+CPP
+RANLIB
+AR
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+target_os
+target_vendor
+target_cpu
+target
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_dependency_tracking
+enable_shared
+enable_static
+with_pic
+enable_fast_install
+with_gnu_ld
+enable_libtool_lock
+enable_plugins
+enable_largefile
+enable_64_bit_bfd
+enable_targets
+with_mmap
+enable_secureplt
+enable_leading_mingw64_underscores
+with_separate_debug_dir
+enable_elf_stt_common
+with_pkgversion
+with_bugurl
+enable_werror
+enable_build_warnings
+enable_maintainer_mode
+enable_install_libbfd
+enable_nls
+with_zlib
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures this package to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+  --target=TARGET   configure for building compilers for TARGET [HOST]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-shared[=PKGS]  build shared libraries [default=no]
+  --enable-static[=PKGS]  build static libraries [default=yes]
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-plugins        Enable support for plugins (defaults no)
+  --disable-largefile     omit support for large files
+  --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
+  --enable-targets        alternative target configurations
+  --enable-secureplt      Default to creating read-only plt entries
+  --enable-leading-mingw64-underscores
+                          Enable leading underscores on 64 bit mingw targets
+  --enable-elf-stt-common Allow the generation of ELF symbols with the STT_COMMON type
+  --enable-werror         treat compile warnings as errors
+  --enable-build-warnings enable build-time compiler warnings
+  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer
+  --enable-install-libbfd controls installation of libbfd and related headers
+  --disable-nls           do not use Native Language Support
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-pic              try to use only PIC/non-PIC objects [default=use
+                          both]
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-mmap             try using mmap for BFD input files if available
+  --with-separate-debug-dir=DIR
+                          Look for global separate debug info in DIR
+                          [default=LIBDIR/debug]
+  --with-pkgversion=PKG   Use PKG in the version string in place of
+                          "sdbinutils derived from GNU Binutils"
+  --with-bugurl=URL       Direct users to URL to report a bug
+  --with-zlib             include zlib support (auto/yes/no) default=auto
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to the package provider.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+configure
+generated by GNU Autoconf 2.64
+
+Copyright (C) 2009 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+# --------------------------------------------
+# Tries to find the compile-time value of EXPR in a program that includes
+# INCLUDES, setting VAR accordingly. Returns whether the value could be
+# computed
+ac_fn_c_compute_int ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if test "$cross_compiling" = yes; then
+    # Depending upon the size, compute the lo and hi bounds.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid; break
+else
+  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) < 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=$ac_mid; break
+else
+  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  ac_lo= ac_hi=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid
+else
+  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in #((
+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+'') ac_retval=1 ;;
+esac
+  else
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (($2) < 0)
+    {
+      long int i = longval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+else
+  ac_retval=1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f conftest.val
+
+  fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_compute_int
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_type
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR
+# ------------------------------------
+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_decl
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by $as_me, which was
+generated by GNU Autoconf 2.64.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    cat <<\_ASBOX
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+_ASBOX
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    cat <<\_ASBOX
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+_ASBOX
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      cat <<\_ASBOX
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
+_ASBOX
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      cat <<\_ASBOX
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+_ASBOX
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  ac_site_file1=$CONFIG_SITE
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special
+  # files actually), so we avoid doing that.
+  if test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+
+
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
+$as_echo_n "checking target system type... " >&6; }
+if test "${ac_cv_target+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$target_alias" = x; then
+  ac_cv_target=$ac_cv_host
+else
+  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
+$as_echo "$ac_cv_target" >&6; }
+case $ac_cv_target in
+*-*-*) ;;
+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
+esac
+target=$ac_cv_target
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_target
+shift
+target_cpu=$1
+target_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+target_os=$*
+IFS=$ac_save_IFS
+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+test -n "$target_alias" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_prefix=${target_alias}-
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    rm -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+if test -z "$ac_file"; then :
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
+fi
+ac_exeext=$ac_cv_exeext
+
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+  if { ac_try='./$ac_file'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+ac_clean_files=$ac_clean_files_save
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
+fi
+rm -f conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if test "${ac_cv_objext+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
+$as_echo_n "checking for library containing strerror... " >&6; }
+if test "${ac_cv_search_strerror+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char strerror ();
+int
+main ()
+{
+return strerror ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' cposix; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_strerror=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_strerror+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_strerror+set}" = set; then :
+
+else
+  ac_cv_search_strerror=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
+$as_echo "$ac_cv_search_strerror" >&6; }
+ac_res=$ac_cv_search_strerror
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+
+am__api_version='1.11'
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+esac
+
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
+   fi
+
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   as_fn_error "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE=bfd
+ VERSION=2.22
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+
+
+
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AR"; then
+  ac_ct_AR=$AR
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_AR="ar"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AR" = x; then
+    AR=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+else
+  AR="$ac_cv_prog_AR"
+fi
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+
+# Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_shared=no
+fi
+
+
+
+
+
+
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    rm -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
+if test "x$ac_cv_header_minix_config_h" = x""yes; then :
+  MINIX=yes
+else
+  MINIX=
+fi
+
+
+  if test "$MINIX" = yes; then
+
+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
+
+
+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+
+$as_echo "#define _MINIX 1" >>confdefs.h
+
+  fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#	  define __EXTENSIONS__ 1
+	  $ac_includes_default
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_safe_to_define___extensions__=yes
+else
+  ac_cv_safe_to_define___extensions__=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+
+  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+
+
+
+
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.2.7a'
+macro_revision='1.3134'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`print -r -- -n 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case "$ECHO" in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if test "${ac_cv_path_SED+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if test "${ac_cv_path_FGREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in fgrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_FGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_FGREP=$FGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if test "${lt_cv_path_LD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if test "${lt_cv_path_NM+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in dumpbin "link -dump"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
+
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if test "${lt_cv_nm_interface+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+    i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+
+fi
+
+if test -n $lt_cv_sys_max_cmd_len ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
+$as_echo "$xsi_shell" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
+$as_echo "$lt_shell_append" >&6; }
+
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+
+
+
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if test "${lt_cv_ld_reload_flag+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_reload_flag='-r'
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if test "${lt_cv_deplibs_check_method+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AR"; then
+  ac_ct_AR=$AR
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_AR="ar"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+else
+  AR="$ac_cv_prog_AR"
+fi
+
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+test -z "$STRIP" && STRIP=:
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+test -z "$RANLIB" && RANLIB=:
+
+
+
+
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+const struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+  enableval=$enable_libtool_lock;
+fi
+
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  ppc64-*linux*|powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  ppc*-*linux*|powerpc*-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if test "${lt_cv_cc_needs_belf+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_cc_needs_belf=yes
+else
+  lt_cv_cc_needs_belf=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LIPO+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OTOOL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_ld_exported_symbols_list=yes
+else
+  lt_cv_ld_exported_symbols_list=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+	LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if test "${lt_cv_ld_force_load+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[012]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+
+# Set options
+enable_dlopen=yes
+
+
+
+
+  enable_win32_dll=no
+
+
+
+  # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_static=yes
+fi
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then :
+  withval=$with_pic; pic_mode="$withval"
+else
+  pic_mode=default
+fi
+
+
+test -z "$pic_mode" && pic_mode=default
+
+
+
+
+
+
+
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then :
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi
+
+
+
+
+
+
+
+
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+test -z "$LN_S" && LN_S="ln -s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if test "${lt_cv_objdir+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
+
+
+
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/${ac_tool_prefix}file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  else
+    MAGIC_CMD=:
+  fi
+fi
+
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+
+lt_save_CC="$CC"
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+
+lt_prog_compiler_no_builtin_flag=
+
+if test "$GCC" = yes; then
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+
+
+
+
+
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+
+  if test "$GCC" = yes; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ F* | *Sun*Fortran*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
+
+
+
+
+
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  runpath_var=
+  allow_undefined_flag=
+  always_export_symbols=no
+  archive_cmds=
+  archive_expsym_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
+  export_dynamic_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_flag_spec_ld=
+  hardcode_libdir_separator=
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
+  link_all_deplibs=unknown
+  module_cmds=
+  module_expsym_cmds=
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  ld_shlibs=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    export_dynamic_flag_spec='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='${wl}--export-all-symbols'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  whole_archive_flag_spec=
+	  tmp_sharedflag='--shared' ;;
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+	  hardcode_libdir_flag_spec=
+	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        ld_shlibs=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+    esac
+
+    if test "$ld_shlibs" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct=unsupported
+      fi
+      ;;
+
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_direct_absolute=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      file_list_spec='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  hardcode_direct=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      export_dynamic_flag_spec='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag="-z nodefs"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag=' ${wl}-bernotok'
+	  allow_undefined_flag=' ${wl}-berok'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
+	  archive_cmds_need_lc=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[45]*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      allow_undefined_flag=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      old_archive_from_new_cmds='true'
+      # FIXME: Should let the user specify the lib program.
+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
+    darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+  else
+    whole_archive_flag_spec=''
+  fi
+  link_all_deplibs=yes
+  allow_undefined_flag="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+
+  else
+  ld_shlibs=no
+  fi
+
+      ;;
+
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_flag_spec_ld='+b $libdir'
+	hardcode_libdir_separator=:
+	hardcode_direct=yes
+	hardcode_direct_absolute=yes
+	export_dynamic_flag_spec='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if test "${lt_cv_prog_compiler__b+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test x"$lt_cv_prog_compiler__b" = xyes; then
+    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+	  ;;
+	*)
+	  hardcode_direct=yes
+	  hardcode_direct_absolute=yes
+	  export_dynamic_flag_spec='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+        save_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo(void) {}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+        LDFLAGS="$save_LDFLAGS"
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      inherit_rpath=yes
+      link_all_deplibs=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_separator=:
+      ;;
+
+    solaris*)
+      no_undefined_flag=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      link_all_deplibs=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds='$CC -r -o $output$reload_objs'
+	  hardcode_direct=no
+        ;;
+	motorola)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='${wl}-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='${wl}-z,text'
+      allow_undefined_flag='${wl}-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-R,$libdir'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	export_dynamic_flag_spec='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
+test "$ld_shlibs" = no && can_build_shared=no
+
+with_gnu_ld=$with_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if test "${lt_cv_archive_cmds_need_lc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag
+	  allow_undefined_flag=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+haiku*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
+   test "X$hardcode_automatic" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$hardcode_direct" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
+     test "$hardcode_minus_L" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
+
+if test "$hardcode_action" = relink ||
+   test "$inherit_rpath" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+  if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+    ;;
+
+  *)
+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = x""yes; then :
+  lt_cv_dlopen="shl_load"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+int
+main ()
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_shl_load=yes
+else
+  ac_cv_lib_dld_shl_load=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+else
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = x""yes; then :
+  lt_cv_dlopen="dlopen"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_svld_dlopen=yes
+else
+  ac_cv_lib_svld_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link ();
+int
+main ()
+{
+return dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_dld_link=yes
+else
+  ac_cv_lib_dld_dld_link=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if test "${lt_cv_dlopen_self+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line 11407 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+void fnord () __attribute__((visibility("default")));
+#endif
+
+void fnord () { int i=42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if test "${lt_cv_dlopen_self_static+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line 11513 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+void fnord () __attribute__((visibility("default")));
+#endif
+
+void fnord () { int i=42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+striplib=
+old_striplib=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+  # Report which library types will actually be built
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[4-9]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+
+
+
+
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC="$lt_save_CC"
+
+
+
+
+
+
+
+
+
+
+
+
+
+        ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+
+# AC_PLUGINS setting $plugins is called by ACX_LARGEFILE.
+
+# The tests for host and target for $enable_largefile require
+# canonical names.
+
+
+
+# As the $enable_largefile decision depends on --enable-plugins we must set it
+# even in directories otherwise not depending on the $plugins option.
+
+
+# Check whether --enable-plugins was given.
+if test "${enable_plugins+set}" = set; then :
+  enableval=$enable_plugins; case "${enableval}" in
+  yes | "") plugins=yes ;;
+  no) plugins=no ;;
+  *) plugins=yes ;;
+ esac
+else
+  plugins=no
+fi
+
+
+
+case "${host}" in
+  sparc-*-solaris*|i[3-7]86-*-solaris*)
+    # On native 32bit sparc and ia32 solaris, large-file and procfs support
+    # are mutually exclusive; and without procfs support, the bfd/ elf module
+    # cannot provide certain routines such as elfcore_write_prpsinfo
+    # or elfcore_write_prstatus.  So unless the user explicitly requested
+    # large-file support through the --enable-largefile switch, disable
+    # large-file support in favor of procfs support.
+    test "${target}" = "${host}" -a "x$plugins" = xno \
+      && : ${enable_largefile="no"}
+    ;;
+esac
+
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+  enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if test "${ac_cv_sys_largefile_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+	 # IRIX 6.2 and later do not support large files by default,
+	 # so use the C compiler's -n32 option if that helps.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+	 if ac_fn_c_try_compile "$LINENO"; then :
+  break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 CC="$CC -n32"
+	 if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_largefile_CC=' -n32'; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=64; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_file_offset_bits=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  if test $ac_cv_sys_file_offset_bits = unknown; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if test "${ac_cv_sys_large_files+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_large_files=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  fi
+fi
+
+
+
+ if test "$plugins" = "yes"; then
+  PLUGINS_TRUE=
+  PLUGINS_FALSE='#'
+else
+  PLUGINS_TRUE='#'
+  PLUGINS_FALSE=
+fi
+
+
+if test "$plugins" = "yes"; then
+  if test "$enable_dlopen" != "yes" ; then
+    as_fn_error "
+      Building BFD with plugin support requires a host that supports -ldl." "$LINENO" 5
+  fi
+  enable_targets="$enable_targets plugin"
+fi
+
+# Check whether --enable-64-bit-bfd was given.
+if test "${enable_64_bit_bfd+set}" = set; then :
+  enableval=$enable_64_bit_bfd; case "${enableval}" in
+  yes)  want64=true  ;;
+  no)   want64=false ;;
+  *)    as_fn_error "bad value ${enableval} for 64-bit-bfd option" "$LINENO" 5 ;;
+esac
+else
+  want64=false
+fi
+
+# Check whether --enable-targets was given.
+if test "${enable_targets+set}" = set; then :
+  enableval=$enable_targets; case "${enableval}" in
+  yes | "") as_fn_error "enable-targets option must specify target names or 'all'" "$LINENO" 5
+            ;;
+  no)       enable_targets= ;;
+  *)        enable_targets=$enableval ;;
+esac
+fi
+
+
+# Check whether --with-mmap was given.
+if test "${with_mmap+set}" = set; then :
+  withval=$with_mmap; case "${withval}" in
+  yes)  want_mmap=true ;;
+  no)   want_mmap=false ;;
+  *)    as_fn_error "bad value ${withval} for BFD with-mmap option" "$LINENO" 5 ;;
+esac
+else
+  want_mmap=false
+fi
+
+# Check whether --enable-secureplt was given.
+if test "${enable_secureplt+set}" = set; then :
+  enableval=$enable_secureplt; case "${enableval}" in
+  yes)  use_secureplt=true  ;;
+  no)   use_secureplt=false ;;
+  *)    as_fn_error "bad value ${enableval} for secureplt option" "$LINENO" 5 ;;
+esac
+else
+  use_secureplt=false
+fi
+if test $use_secureplt = true; then
+
+$as_echo "#define USE_SECUREPLT 1" >>confdefs.h
+
+fi
+
+# Check whether --enable-leading-mingw64-underscores was given.
+if test "${enable_leading_mingw64_underscores+set}" = set; then :
+  enableval=$enable_leading_mingw64_underscores;
+fi
+
+if  test x"$enable_leading_mingw64_underscores" = xyes ; then :
+
+$as_echo "#define USE_MINGW64_LEADING_UNDERSCORES 1" >>confdefs.h
+
+fi
+
+DEBUGDIR=${libdir}/debug
+
+# Check whether --with-separate-debug-dir was given.
+if test "${with_separate_debug_dir+set}" = set; then :
+  withval=$with_separate_debug_dir; DEBUGDIR="${withval}"
+fi
+
+
+
+# Check to see if we should allow the generation of
+# symbols with the ELF standard's STT_COMMON type.
+# Check whether --enable-elf-stt-common was given.
+if test "${enable_elf_stt_common+set}" = set; then :
+  enableval=$enable_elf_stt_common; case "${enableval}" in
+  yes) want_elf_stt_common=true ;;
+  no)  want_elf_stt_common=false ;;
+  *)   as_fn_error "bad value ${enableval} for ELF STT_COMMON option" "$LINENO" 5 ;;
+ esac
+else
+  # We have to choose a default behaviour.  For native builds we could
+# test whether the loader supports the STT_COMMON type, but that would
+# mean that built binaries could not be exported to older systems where
+# the loader does not support it. So by default we always choose to
+# disable this feature.
+  want_elf_stt_common=false
+fi
+if test $want_elf_stt_common = true; then
+
+$as_echo "#define USE_STT_COMMON 1" >>confdefs.h
+
+fi
+
+####ACX_PKGVERSION([GNU Binutils])
+####ACX_BUGURL([http://www.sourceware.org/bugzilla/])
+
+
+# Check whether --with-pkgversion was given.
+if test "${with_pkgversion+set}" = set; then :
+  withval=$with_pkgversion; case "$withval" in
+      yes) as_fn_error "package version not specified" "$LINENO" 5 ;;
+      no)  PKGVERSION= ;;
+      *)   PKGVERSION="($withval) " ;;
+     esac
+else
+  PKGVERSION="(sdbinutils derived from GNU Binutils) "
+
+fi
+
+
+
+
+
+# Check whether --with-bugurl was given.
+if test "${with_bugurl+set}" = set; then :
+  withval=$with_bugurl; case "$withval" in
+      yes) as_fn_error "bug URL not specified" "$LINENO" 5 ;;
+      no)  BUGURL=
+	   ;;
+      *)   BUGURL="$withval"
+	   ;;
+     esac
+else
+  BUGURL="http://sourceforge.net/tracker/?group_id=599&atid=100599"
+
+fi
+
+  case ${BUGURL} in
+  "")
+    REPORT_BUGS_TO=
+    REPORT_BUGS_TEXI=
+    ;;
+  *)
+    REPORT_BUGS_TO="<$BUGURL>"
+    REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`}
+    ;;
+  esac;
+
+
+
+
+
+GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+__GNUC__
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+
+else
+  GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wshadow"
+fi
+rm -f conftest*
+
+
+# Check whether --enable-werror was given.
+if test "${enable_werror+set}" = set; then :
+  enableval=$enable_werror; case "${enableval}" in
+     yes | y) ERROR_ON_WARNING="yes" ;;
+     no | n)  ERROR_ON_WARNING="no" ;;
+     *) as_fn_error "bad value ${enableval} for --enable-werror" "$LINENO" 5 ;;
+   esac
+fi
+
+
+# Disable -Wformat by default when using gcc on mingw
+case "${host}" in
+  *-*-mingw32*)
+    if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
+      GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format"
+    fi
+    ;;
+  *) ;;
+esac
+
+# Enable -Werror by default when using gcc
+if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
+    ERROR_ON_WARNING=yes
+fi
+
+NO_WERROR=
+if test "${ERROR_ON_WARNING}" = yes ; then
+    GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror"
+    NO_WERROR="-Wno-error"
+fi
+
+if test "${GCC}" = yes ; then
+  WARN_CFLAGS="${GCC_WARN_CFLAGS}"
+fi
+
+# Check whether --enable-build-warnings was given.
+if test "${enable_build_warnings+set}" = set; then :
+  enableval=$enable_build_warnings; case "${enableval}" in
+  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}";;
+  no)	if test "${GCC}" = yes ; then
+	  WARN_CFLAGS="-w"
+	fi;;
+  ,*)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
+        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";;
+  *,)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
+        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";;
+  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;;
+esac
+fi
+
+
+if test x"$silent" != x"yes" && test x"$WARN_CFLAGS" != x""; then
+  echo "Setting warning flags = $WARN_CFLAGS" 6>&1
+fi
+
+
+
+
+
+ac_config_headers="$ac_config_headers config.h:config.in"
+
+
+if test -z "$target" ; then
+    as_fn_error "Unrecognized target system type; please check config.sub." "$LINENO" 5
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+    # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then :
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+   if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
+ if false; then
+  GENINSRC_NEVER_TRUE=
+  GENINSRC_NEVER_FALSE='#'
+else
+  GENINSRC_NEVER_TRUE='#'
+  GENINSRC_NEVER_FALSE=
+fi
+
+ case ${build_alias} in
+  "") build_noncanonical=${build} ;;
+  *) build_noncanonical=${build_alias} ;;
+esac
+
+ case ${host_alias} in
+  "") host_noncanonical=${build_noncanonical} ;;
+  *) host_noncanonical=${host_alias} ;;
+esac
+
+ case ${target_alias} in
+  "") target_noncanonical=${host_noncanonical} ;;
+  *) target_noncanonical=${target_alias} ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install libbfd" >&5
+$as_echo_n "checking whether to install libbfd... " >&6; }
+  # Check whether --enable-install-libbfd was given.
+if test "${enable_install_libbfd+set}" = set; then :
+  enableval=$enable_install_libbfd; install_libbfd_p=$enableval
+else
+  if test "${host}" = "${target}" || test "$enable_shared" = "yes"; then
+        install_libbfd_p=yes
+      else
+        install_libbfd_p=no
+      fi
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $install_libbfd_p" >&5
+$as_echo "$install_libbfd_p" >&6; }
+   if test $install_libbfd_p = yes; then
+  INSTALL_LIBBFD_TRUE=
+  INSTALL_LIBBFD_FALSE='#'
+else
+  INSTALL_LIBBFD_TRUE='#'
+  INSTALL_LIBBFD_FALSE=
+fi
+
+  # Need _noncanonical variables for this.
+
+
+
+
+  # libbfd.a is a host library containing target dependent code
+  bfdlibdir='$(libdir)'
+  bfdincludedir='$(includedir)'
+  if test "${host}" != "${target}"; then
+    bfdlibdir='$(exec_prefix)/$(host_noncanonical)/$(target_noncanonical)/lib'
+    bfdincludedir='$(exec_prefix)/$(host_noncanonical)/$(target_noncanonical)/include'
+  fi
+
+
+
+
+
+
+
+
+host64=false
+target64=false
+bfd_default_target_size=32
+
+# host stuff:
+
+ALL_LINGUAS="fr tr ja es sv da zh_CN ro rw vi fi id ru"
+# If we haven't got the data from the intl directory,
+# assume NLS is disabled.
+USE_NLS=no
+LIBINTL=
+LIBINTL_DEP=
+INCINTL=
+XGETTEXT=
+GMSGFMT=
+POSUB=
+
+if test -f  ../intl/config.intl; then
+  .  ../intl/config.intl
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
+if test x"$USE_NLS" != xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
+$as_echo_n "checking for catalogs to be installed... " >&6; }
+  # Look for .po and .gmo files in the source directory.
+  CATALOGS=
+  XLINGUAS=
+  for cat in $srcdir/po/*.gmo $srcdir/po/*.po; do
+    # If there aren't any .gmo files the shell will give us the
+    # literal string "../path/to/srcdir/po/*.gmo" which has to be
+    # weeded out.
+    case "$cat" in *\**)
+      continue;;
+    esac
+    # The quadruple backslash is collapsed to a double backslash
+    # by the backticks, then collapsed again by the double quotes,
+    # leaving us with one backslash in the sed expression (right
+    # before the dot that mustn't act as a wildcard).
+    cat=`echo $cat | sed -e "s!$srcdir/po/!!" -e "s!\\\\.po!.gmo!"`
+    lang=`echo $cat | sed -e "s!\\\\.gmo!!"`
+    # The user is allowed to set LINGUAS to a list of languages to
+    # install catalogs for.  If it's empty that means "all of them."
+    if test "x$LINGUAS" = x; then
+      CATALOGS="$CATALOGS $cat"
+      XLINGUAS="$XLINGUAS $lang"
+    else
+      case "$LINGUAS" in *$lang*)
+        CATALOGS="$CATALOGS $cat"
+        XLINGUAS="$XLINGUAS $lang"
+        ;;
+      esac
+    fi
+  done
+  LINGUAS="$XLINGUAS"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
+$as_echo "$LINGUAS" >&6; }
+
+
+    DATADIRNAME=share
+
+  INSTOBJEXT=.mo
+
+  GENCAT=gencat
+
+  CATOBJEXT=.gmo
+
+fi
+
+        MKINSTALLDIRS=
+  if test -n "$ac_aux_dir"; then
+    case "$ac_aux_dir" in
+      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
+      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
+    esac
+  fi
+  if test -z "$MKINSTALLDIRS"; then
+    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+  fi
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
+    # Check whether --enable-nls was given.
+if test "${enable_nls+set}" = set; then :
+  enableval=$enable_nls; USE_NLS=$enableval
+else
+  USE_NLS=yes
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
+
+
+
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case "$MSGFMT" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+            ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
+    ;;
+esac
+fi
+MSGFMT="$ac_cv_path_MSGFMT"
+if test "$MSGFMT" != ":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  # Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GMSGFMT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  ;;
+esac
+fi
+GMSGFMT=$ac_cv_path_GMSGFMT
+if test -n "$GMSGFMT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case "$XGETTEXT" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+            ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+    ;;
+esac
+fi
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test "$XGETTEXT" != ":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+    rm -f messages.po
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "msgmerge", so it can be a program name with args.
+set dummy msgmerge; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case "$MSGMERGE" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
+            ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+  test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
+    ;;
+esac
+fi
+MSGMERGE="$ac_cv_path_MSGMERGE"
+if test "$MSGMERGE" != ":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+$as_echo "$MSGMERGE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+      if test "$GMSGFMT" != ":"; then
+            if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
+       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+      : ;
+    else
+      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
+$as_echo "found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
+      GMSGFMT=":"
+    fi
+  fi
+
+      if test "$XGETTEXT" != ":"; then
+            if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+      : ;
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
+$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
+      XGETTEXT=":"
+    fi
+        rm -f messages.po
+  fi
+
+  ac_config_commands="$ac_config_commands default-1"
+
+
+
+# Permit host specific settings.
+. ${srcdir}/configure.host
+
+
+
+
+BFD_HOST_64BIT_LONG=0
+BFD_HOST_64BIT_LONG_LONG=0
+BFD_HOST_64_BIT_DEFINED=0
+BFD_HOST_64_BIT=
+BFD_HOST_U_64_BIT=
+BFD_HOSTPTR_T="unsigned long"
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+$as_echo_n "checking size of long long... " >&6; }
+if test "${ac_cv_sizeof_long_long+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long long)
+See \`config.log' for more details." "$LINENO" 5; }; }
+   else
+     ac_cv_sizeof_long_long=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
+$as_echo "$ac_cv_sizeof_long_long" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+_ACEOF
+
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
+$as_echo_n "checking size of void *... " >&6; }
+if test "${ac_cv_sizeof_void_p+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_void_p" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (void *)
+See \`config.log' for more details." "$LINENO" 5; }; }
+   else
+     ac_cv_sizeof_void_p=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
+$as_echo "$ac_cv_sizeof_void_p" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
+_ACEOF
+
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if test "${ac_cv_sizeof_long+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long)
+See \`config.log' for more details." "$LINENO" 5; }; }
+   else
+     ac_cv_sizeof_long=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
+
+
+
+if test "x${ac_cv_sizeof_void_p}" = "x8"; then
+  host64=true
+fi
+
+if test "x${ac_cv_sizeof_long}" = "x8"; then
+  BFD_HOST_64BIT_LONG=1
+  test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"
+  test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"
+elif test "x${ac_cv_sizeof_long_long}" = "x8"; then
+  BFD_HOST_64BIT_LONG_LONG=1
+  test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long"
+  test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long"
+  if test "x${ac_cv_sizeof_void_p}" = "x8"; then
+    BFD_HOSTPTR_T="unsigned long long"
+  fi
+fi
+
+if test -n "${HOST_64BIT_TYPE}" -a -n "${HOST_U_64BIT_TYPE}"; then
+  BFD_HOST_64_BIT_DEFINED=1
+  BFD_HOST_64_BIT="${HOST_64BIT_TYPE}"
+  BFD_HOST_U_64_BIT="${HOST_U_64BIT_TYPE}"
+fi
+
+
+
+
+
+
+
+
+# Put a plausible default for CC_FOR_BUILD in Makefile.
+if test -z "$CC_FOR_BUILD"; then
+  if test "x$cross_compiling" = "xno"; then
+    CC_FOR_BUILD='$(CC)'
+  else
+    CC_FOR_BUILD=gcc
+  fi
+fi
+
+# Also set EXEEXT_FOR_BUILD.
+if test "x$cross_compiling" = "xno"; then
+  EXEEXT_FOR_BUILD='$(EXEEXT)'
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for build system executable suffix" >&5
+$as_echo_n "checking for build system executable suffix... " >&6; }
+if test "${bfd_cv_build_exeext+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f conftest*
+     echo 'int main () { return 0; }' > conftest.c
+     bfd_cv_build_exeext=
+     ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5
+     for file in conftest.*; do
+       case $file in
+       *.c | *.o | *.obj | *.ilk | *.pdb) ;;
+       *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;;
+       esac
+     done
+     rm -f conftest*
+     test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_build_exeext" >&5
+$as_echo "$bfd_cv_build_exeext" >&6; }
+  EXEEXT_FOR_BUILD=""
+  test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
+fi
+
+
+for ac_header in alloca.h stddef.h string.h strings.h stdlib.h time.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+for ac_header in fcntl.h sys/file.h sys/time.h sys/stat.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+inttype_headers=`echo inttypes.h sys/inttypes.h  | sed -e 's/,/ /g'`
+
+acx_cv_header_stdint=stddef.h
+acx_cv_header_stdint_kind="(already complete)"
+for i in stdint.h $inttype_headers; do
+  unset ac_cv_type_uintptr_t
+  unset ac_cv_type_uintmax_t
+  unset ac_cv_type_int_least32_t
+  unset ac_cv_type_int_fast32_t
+  unset ac_cv_type_uint64_t
+  $as_echo_n "looking for a compliant stdint.h in $i, " >&6
+  ac_fn_c_check_type "$LINENO" "uintmax_t" "ac_cv_type_uintmax_t" "#include <sys/types.h>
+#include <$i>
+"
+if test "x$ac_cv_type_uintmax_t" = x""yes; then :
+  acx_cv_header_stdint=$i
+else
+  continue
+fi
+
+  ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "#include <sys/types.h>
+#include <$i>
+"
+if test "x$ac_cv_type_uintptr_t" = x""yes; then :
+
+else
+  acx_cv_header_stdint_kind="(mostly complete)"
+fi
+
+  ac_fn_c_check_type "$LINENO" "int_least32_t" "ac_cv_type_int_least32_t" "#include <sys/types.h>
+#include <$i>
+"
+if test "x$ac_cv_type_int_least32_t" = x""yes; then :
+
+else
+  acx_cv_header_stdint_kind="(mostly complete)"
+fi
+
+  ac_fn_c_check_type "$LINENO" "int_fast32_t" "ac_cv_type_int_fast32_t" "#include <sys/types.h>
+#include <$i>
+"
+if test "x$ac_cv_type_int_fast32_t" = x""yes; then :
+
+else
+  acx_cv_header_stdint_kind="(mostly complete)"
+fi
+
+  ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "#include <sys/types.h>
+#include <$i>
+"
+if test "x$ac_cv_type_uint64_t" = x""yes; then :
+
+else
+  acx_cv_header_stdint_kind="(lacks uint64_t)"
+fi
+
+  break
+done
+if test "$acx_cv_header_stdint" = stddef.h; then
+  acx_cv_header_stdint_kind="(lacks uintmax_t)"
+  for i in stdint.h $inttype_headers; do
+    unset ac_cv_type_uintptr_t
+    unset ac_cv_type_uint32_t
+    unset ac_cv_type_uint64_t
+    $as_echo_n "looking for an incomplete stdint.h in $i, " >&6
+    ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "#include <sys/types.h>
+#include <$i>
+"
+if test "x$ac_cv_type_uint32_t" = x""yes; then :
+  acx_cv_header_stdint=$i
+else
+  continue
+fi
+
+    ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "#include <sys/types.h>
+#include <$i>
+"
+if test "x$ac_cv_type_uint64_t" = x""yes; then :
+
+fi
+
+    ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "#include <sys/types.h>
+#include <$i>
+"
+if test "x$ac_cv_type_uintptr_t" = x""yes; then :
+
+fi
+
+    break
+  done
+fi
+if test "$acx_cv_header_stdint" = stddef.h; then
+  acx_cv_header_stdint_kind="(u_intXX_t style)"
+  for i in sys/types.h $inttype_headers; do
+    unset ac_cv_type_u_int32_t
+    unset ac_cv_type_u_int64_t
+    $as_echo_n "looking for u_intXX_t types in $i, " >&6
+    ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "#include <sys/types.h>
+#include <$i>
+"
+if test "x$ac_cv_type_u_int32_t" = x""yes; then :
+  acx_cv_header_stdint=$i
+else
+  continue
+fi
+
+    ac_fn_c_check_type "$LINENO" "u_int64_t" "ac_cv_type_u_int64_t" "#include <sys/types.h>
+#include <$i>
+"
+if test "x$ac_cv_type_u_int64_t" = x""yes; then :
+
+fi
+
+    break
+  done
+fi
+if test "$acx_cv_header_stdint" = stddef.h; then
+  acx_cv_header_stdint_kind="(using manual detection)"
+fi
+
+test -z "$ac_cv_type_uintptr_t" && ac_cv_type_uintptr_t=no
+test -z "$ac_cv_type_uint64_t" && ac_cv_type_uint64_t=no
+test -z "$ac_cv_type_u_int64_t" && ac_cv_type_u_int64_t=no
+test -z "$ac_cv_type_int_least32_t" && ac_cv_type_int_least32_t=no
+test -z "$ac_cv_type_int_fast32_t" && ac_cv_type_int_fast32_t=no
+
+# ----------------- Summarize what we found so far
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what to include in bfd_stdint.h" >&5
+$as_echo_n "checking what to include in bfd_stdint.h... " >&6; }
+
+case `$as_basename -- bfd_stdint.h ||
+$as_expr X/bfd_stdint.h : '.*/\([^/][^/]*\)/*$' \| \
+	 Xbfd_stdint.h : 'X\(//\)$' \| \
+	 Xbfd_stdint.h : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/bfd_stdint.h |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'` in
+  stdint.h) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: are you sure you want it there?" >&5
+$as_echo "$as_me: WARNING: are you sure you want it there?" >&2;} ;;
+  inttypes.h) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: are you sure you want it there?" >&5
+$as_echo "$as_me: WARNING: are you sure you want it there?" >&2;} ;;
+  *) ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_header_stdint $acx_cv_header_stdint_kind" >&5
+$as_echo "$acx_cv_header_stdint $acx_cv_header_stdint_kind" >&6; }
+
+# ----------------- done included file, check C basic types --------
+
+# Lacking an uintptr_t?  Test size of void *
+case "$acx_cv_header_stdint:$ac_cv_type_uintptr_t" in
+  stddef.h:* | *:no) # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
+$as_echo_n "checking size of void *... " >&6; }
+if test "${ac_cv_sizeof_void_p+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_void_p" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (void *)
+See \`config.log' for more details." "$LINENO" 5; }; }
+   else
+     ac_cv_sizeof_void_p=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
+$as_echo "$ac_cv_sizeof_void_p" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
+_ACEOF
+
+ ;;
+esac
+
+# Lacking an uint64_t?  Test size of long
+case "$acx_cv_header_stdint:$ac_cv_type_uint64_t:$ac_cv_type_u_int64_t" in
+  stddef.h:*:* | *:no:no) # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if test "${ac_cv_sizeof_long+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long)
+See \`config.log' for more details." "$LINENO" 5; }; }
+   else
+     ac_cv_sizeof_long=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
+
+ ;;
+esac
+
+if test $acx_cv_header_stdint = stddef.h; then
+  # Lacking a good header?  Test size of everything and deduce all types.
+  # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
+if test "${ac_cv_sizeof_int+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (int)
+See \`config.log' for more details." "$LINENO" 5; }; }
+   else
+     ac_cv_sizeof_int=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+$as_echo "$ac_cv_sizeof_int" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+_ACEOF
+
+
+  # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
+$as_echo_n "checking size of short... " >&6; }
+if test "${ac_cv_sizeof_short+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_short" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (short)
+See \`config.log' for more details." "$LINENO" 5; }; }
+   else
+     ac_cv_sizeof_short=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
+$as_echo "$ac_cv_sizeof_short" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
+_ACEOF
+
+
+  # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5
+$as_echo_n "checking size of char... " >&6; }
+if test "${ac_cv_sizeof_char+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_char" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (char)
+See \`config.log' for more details." "$LINENO" 5; }; }
+   else
+     ac_cv_sizeof_char=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char" >&5
+$as_echo "$ac_cv_sizeof_char" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_CHAR $ac_cv_sizeof_char
+_ACEOF
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type equivalent to int8_t" >&5
+$as_echo_n "checking for type equivalent to int8_t... " >&6; }
+  case "$ac_cv_sizeof_char" in
+    1) acx_cv_type_int8_t=char ;;
+    *) as_fn_error "no 8-bit type, please report a bug" "$LINENO" 5
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_type_int8_t" >&5
+$as_echo "$acx_cv_type_int8_t" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type equivalent to int16_t" >&5
+$as_echo_n "checking for type equivalent to int16_t... " >&6; }
+  case "$ac_cv_sizeof_int:$ac_cv_sizeof_short" in
+    2:*) acx_cv_type_int16_t=int ;;
+    *:2) acx_cv_type_int16_t=short ;;
+    *) as_fn_error "no 16-bit type, please report a bug" "$LINENO" 5
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_type_int16_t" >&5
+$as_echo "$acx_cv_type_int16_t" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type equivalent to int32_t" >&5
+$as_echo_n "checking for type equivalent to int32_t... " >&6; }
+  case "$ac_cv_sizeof_int:$ac_cv_sizeof_long" in
+    4:*) acx_cv_type_int32_t=int ;;
+    *:4) acx_cv_type_int32_t=long ;;
+    *) as_fn_error "no 32-bit type, please report a bug" "$LINENO" 5
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_type_int32_t" >&5
+$as_echo "$acx_cv_type_int32_t" >&6; }
+fi
+
+# These tests are here to make the output prettier
+
+if test "$ac_cv_type_uint64_t" != yes && test "$ac_cv_type_u_int64_t" != yes; then
+  case "$ac_cv_sizeof_long" in
+    8) acx_cv_type_int64_t=long ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type equivalent to int64_t" >&5
+$as_echo_n "checking for type equivalent to int64_t... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${acx_cv_type_int64_t-'using preprocessor symbols'}" >&5
+$as_echo "${acx_cv_type_int64_t-'using preprocessor symbols'}" >&6; }
+fi
+
+# Now we can use the above types
+
+if test "$ac_cv_type_uintptr_t" != yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type equivalent to intptr_t" >&5
+$as_echo_n "checking for type equivalent to intptr_t... " >&6; }
+  case $ac_cv_sizeof_void_p in
+    2) acx_cv_type_intptr_t=int16_t ;;
+    4) acx_cv_type_intptr_t=int32_t ;;
+    8) acx_cv_type_intptr_t=int64_t ;;
+    *) as_fn_error "no equivalent for intptr_t, please report a bug" "$LINENO" 5
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_type_intptr_t" >&5
+$as_echo "$acx_cv_type_intptr_t" >&6; }
+fi
+
+# ----------------- done all checks, emit header -------------
+ac_config_commands="$ac_config_commands bfd_stdint.h"
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+if test "${ac_cv_header_time+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
+
+int
+main ()
+{
+if ((struct tm *) 0)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_time=yes
+else
+  ac_cv_header_time=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
+$as_echo "$ac_cv_header_time" >&6; }
+if test $ac_cv_header_time = yes; then
+
+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+
+fi
+
+ac_header_dirent=no
+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <$ac_hdr>
+
+int
+main ()
+{
+if ((DIR *) 0)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_ac_Header=yes"
+else
+  eval "$as_ac_Header=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$as_ac_Header
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+_ACEOF
+
+ac_header_dirent=$ac_hdr; break
+fi
+
+done
+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+if test $ac_header_dirent = dirent.h; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+$as_echo_n "checking for library containing opendir... " >&6; }
+if test "${ac_cv_search_opendir+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char opendir ();
+int
+main ()
+{
+return opendir ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' dir; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_opendir=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_opendir+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_opendir+set}" = set; then :
+
+else
+  ac_cv_search_opendir=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+$as_echo "$ac_cv_search_opendir" >&6; }
+ac_res=$ac_cv_search_opendir
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+$as_echo_n "checking for library containing opendir... " >&6; }
+if test "${ac_cv_search_opendir+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char opendir ();
+int
+main ()
+{
+return opendir ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' x; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_opendir=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_opendir+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_opendir+set}" = set; then :
+
+else
+  ac_cv_search_opendir=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+$as_echo "$ac_cv_search_opendir" >&6; }
+ac_res=$ac_cv_search_opendir
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether string.h and strings.h may both be included" >&5
+$as_echo_n "checking whether string.h and strings.h may both be included... " >&6; }
+if test "${gcc_cv_header_string+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+#include <strings.h>
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gcc_cv_header_string=yes
+else
+  gcc_cv_header_string=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_header_string" >&5
+$as_echo "$gcc_cv_header_string" >&6; }
+if test $gcc_cv_header_string = yes; then
+
+$as_echo "#define STRING_WITH_STRINGS 1" >>confdefs.h
+
+fi
+
+for ac_func in fcntl getpagesize setitimer sysconf fdopen getuid getgid fileno
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+for ac_func in strtoull
+do :
+  ac_fn_c_check_func "$LINENO" "strtoull" "ac_cv_func_strtoull"
+if test "x$ac_cv_func_strtoull" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STRTOULL 1
+_ACEOF
+
+fi
+done
+
+
+ac_fn_c_check_decl "$LINENO" "basename" "ac_cv_have_decl_basename" "$ac_includes_default"
+if test "x$ac_cv_have_decl_basename" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_BASENAME $ac_have_decl
+_ACEOF
+
+ac_fn_c_check_decl "$LINENO" "ftello" "ac_cv_have_decl_ftello" "$ac_includes_default"
+if test "x$ac_cv_have_decl_ftello" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FTELLO $ac_have_decl
+_ACEOF
+
+ac_fn_c_check_decl "$LINENO" "ftello64" "ac_cv_have_decl_ftello64" "$ac_includes_default"
+if test "x$ac_cv_have_decl_ftello64" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FTELLO64 $ac_have_decl
+_ACEOF
+
+ac_fn_c_check_decl "$LINENO" "fseeko" "ac_cv_have_decl_fseeko" "$ac_includes_default"
+if test "x$ac_cv_have_decl_fseeko" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FSEEKO $ac_have_decl
+_ACEOF
+
+ac_fn_c_check_decl "$LINENO" "fseeko64" "ac_cv_have_decl_fseeko64" "$ac_includes_default"
+if test "x$ac_cv_have_decl_fseeko64" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FSEEKO64 $ac_have_decl
+_ACEOF
+
+
+
+case "${host}" in
+*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
+
+$as_echo "#define USE_BINARY_FOPEN 1" >>confdefs.h
+ ;;
+esac
+
+ac_fn_c_check_decl "$LINENO" "ffs" "ac_cv_have_decl_ffs" "$ac_includes_default"
+if test "x$ac_cv_have_decl_ffs" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FFS $ac_have_decl
+_ACEOF
+
+ac_fn_c_check_decl "$LINENO" "free" "ac_cv_have_decl_free" "$ac_includes_default"
+if test "x$ac_cv_have_decl_free" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FREE $ac_have_decl
+_ACEOF
+
+ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getenv" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETENV $ac_have_decl
+_ACEOF
+
+ac_fn_c_check_decl "$LINENO" "malloc" "ac_cv_have_decl_malloc" "$ac_includes_default"
+if test "x$ac_cv_have_decl_malloc" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_MALLOC $ac_have_decl
+_ACEOF
+
+ac_fn_c_check_decl "$LINENO" "realloc" "ac_cv_have_decl_realloc" "$ac_includes_default"
+if test "x$ac_cv_have_decl_realloc" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_REALLOC $ac_have_decl
+_ACEOF
+
+ac_fn_c_check_decl "$LINENO" "stpcpy" "ac_cv_have_decl_stpcpy" "$ac_includes_default"
+if test "x$ac_cv_have_decl_stpcpy" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STPCPY $ac_have_decl
+_ACEOF
+
+ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default"
+if test "x$ac_cv_have_decl_strstr" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR $ac_have_decl
+_ACEOF
+
+ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_snprintf" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_SNPRINTF $ac_have_decl
+_ACEOF
+
+ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_VSNPRINTF $ac_have_decl
+_ACEOF
+
+
+# Link in zlib if we can.  This allows us to read compressed debug sections.
+# This is used only by compress.c.
+
+  # See if the user specified whether he wants zlib support or not.
+
+# Check whether --with-zlib was given.
+if test "${with_zlib+set}" = set; then :
+  withval=$with_zlib;
+else
+  with_zlib=auto
+fi
+
+
+  if test "$with_zlib" != "no"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing zlibVersion" >&5
+$as_echo_n "checking for library containing zlibVersion... " >&6; }
+if test "${ac_cv_search_zlibVersion+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char zlibVersion ();
+int
+main ()
+{
+return zlibVersion ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' z; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_zlibVersion=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_zlibVersion+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_zlibVersion+set}" = set; then :
+
+else
+  ac_cv_search_zlibVersion=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_zlibVersion" >&5
+$as_echo "$ac_cv_search_zlibVersion" >&6; }
+ac_res=$ac_cv_search_zlibVersion
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  for ac_header in zlib.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_zlib_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ZLIB_H 1
+_ACEOF
+
+fi
+
+done
+
+fi
+
+    if test "$with_zlib" = "yes" -a "$ac_cv_header_zlib_h" != "yes"; then
+      as_fn_error "zlib (libz) library was explicitly requested but not found" "$LINENO" 5
+    fi
+  fi
+
+
+# If we are configured native, pick a core file support file.
+COREFILE=
+COREFLAG=
+CORE_HEADER=
+TRAD_HEADER=
+if test "${target}" = "${host}"; then
+  case "${host}" in
+  alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu | alpha*-*-*vms*)
+	COREFILE=''
+	;;
+  alpha*-*-linux-*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/alphalinux.h"'
+	;;
+  alpha*-*-netbsd* | alpha*-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+  alpha*-*-*)
+        COREFILE=osf-core.lo
+	;;
+  arm-*-freebsd* | arm-*-kfreebsd*-gnu)
+	COREFILE='' ;;
+  arm-*-netbsd* | arm-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+  arm-*-riscix)		COREFILE=trad-core.lo ;;
+  hppa*-*-hpux*)	COREFILE=hpux-core.lo ;;
+  hppa*-*-hiux*)	COREFILE=hpux-core.lo ;;
+  hppa*-*-mpeix*)	COREFILE=hpux-core.lo ;;
+  hppa*-*-bsd*)		COREFILE="hpux-core.lo hppabsd-core.lo"
+			COREFLAG="-DHPUX_CORE -DHPPABSD_CORE" ;;
+  hppa*-*-netbsd* | hppa*-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+
+  i370-*-*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/i370linux.h"'
+	;;
+
+  i[3-7]86-sequent-bsd*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/symmetry.h"'
+	;;
+  i[3-7]86-sequent-sysv4*) ;;
+  i[3-7]86-sequent-sysv*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/symmetry.h"'
+	;;
+  i[3-7]86-*-bsdi)
+	COREFILE=
+	;;
+  i[3-7]86-*-bsd* | i[3-7]86-*-freebsd[123] | i[3-7]86-*-freebsd[123]\.* | i[3-7]86-*-freebsd4\.[01234] | i[3-7]86-*-freebsd4\.[01234]\.* | i[3-7]86-*-freebsd*aout*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/i386bsd.h"'
+	;;
+  i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu | i[3-7]86-*-dragonfly*)
+	COREFILE=''
+	TRAD_HEADER='"hosts/i386bsd.h"'
+	;;
+  i[3-7]86-*-netbsd* | i[3-7]86-*-knetbsd*-gnu | i[3-7]86-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+  i[3-7]86-esix-sysv3*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/esix.h"'
+	;;
+  i[3-7]86-*-sco3.2v5*)
+	COREFILE=sco5-core.lo
+	;;
+  i[3-7]86-*-sco* | i[3-7]86-*-isc*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/i386sco.h"'
+	;;
+  i[3-7]86-*-mach3*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/i386mach3.h"'
+	;;
+  i[3-7]86-*-linux-*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/i386linux.h"'
+	;;
+  i[3-7]86-*-isc*)	COREFILE=trad-core.lo ;;
+  i[3-7]86-*-aix*)	COREFILE=aix386-core.lo ;;
+  i860-*-mach3* | i860-*-osf1*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/i860mach3.h"'
+	;;
+  mips-*-netbsd* | mips*-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+  mips-dec-*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/decstation.h"'
+	;;
+  mips-sgi-irix4*)	COREFILE=irix-core.lo ;;
+  mips-sgi-irix5*)	COREFILE=irix-core.lo ;;
+  mips-sgi-irix6*)	COREFILE=irix-core.lo ;;
+  mips-*-sysv4*)	;;
+  mips-*-sysv* | mips-*-riscos*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/riscos.h"'
+	;;
+  mips-sony-bsd*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/news-mips.h"'
+	;;
+  m68*-bull*-sysv*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/dpx2.h"'
+	;;
+  m68*-hp-hpux*)	COREFILE=hpux-core.lo ;;
+  m68*-hp-bsd*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/hp300bsd.h"'
+	;;
+  m68*-*-linux-*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/m68klinux.h"'
+	;;
+  m68*-motorola-sysv*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/delta68.h"'
+	;;
+  m68*-sony-*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/news.h"'
+	;;
+  m68*-*-netbsd* | m68*-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+  m68*-apple-aux*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/m68kaux.h"'
+	;;
+  m88*-*-sysv4*)
+	;;
+  m88*-motorola-sysv*)
+	COREFILE=ptrace-core.lo
+	;;
+  m88*-*-mach3*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/m88kmach3.h"'
+	;;
+  m88*-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+  ns32k-pc532-mach)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/pc532mach.h"'
+	;;
+  ns32k-*-netbsd* | ns32k-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+  rs6000-*-lynx*)
+  	COREFILE=lynx-core.lo
+	;;
+  rs6000-*-aix[5-9].* | powerpc-*-aix[5-9].*)
+        COREFILE=rs6000-core.lo
+	COREFLAG="$COREFLAG -DAIX_5_CORE -DAIX_CORE_DUMPX_CORE"
+	;;
+  rs6000-*-aix4.[3-9]* | powerpc-*-aix4.[3-9]*)
+        COREFILE=rs6000-core.lo
+	COREFLAG="$COREFLAG -DAIX_CORE_DUMPX_CORE"
+	# Not all versions of AIX with -DAIX_CORE_DUMPX_CORE
+	# have c_impl as a member of struct core_dumpx
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for c_impl in struct core_dumpx" >&5
+$as_echo_n "checking for c_impl in struct core_dumpx... " >&6; }
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <core.h>
+int
+main ()
+{
+struct core_dumpx c; c.c_impl = 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_ST_C_IMPL 1" >>confdefs.h
+
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+	;;
+  rs6000-*-aix4*)	COREFILE=rs6000-core.lo ;;
+  rs6000-*-*)		COREFILE=rs6000-core.lo ;;
+  powerpc-*-aix4*)	COREFILE=rs6000-core.lo ;;
+  powerpc-*-aix*)	COREFILE=rs6000-core.lo ;;
+  powerpc-*-beos*)	;;
+  powerpc-*-freebsd* | powerpc-*-kfreebsd*-gnu)
+		        COREFILE='' ;;
+  powerpc-*-netbsd*)	COREFILE=netbsd-core.lo ;;
+  powerpc-*-*bsd*)	COREFILE=netbsd-core.lo ;;
+  s390*-*-*)            COREFILE=trad-core.lo ;;
+  sh*-*-netbsd* | sh*-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+  sparc-*-netbsd* | sparc*-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+  tahoe-*-*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/tahoe.h"'
+	;;
+  vax-*-netbsd* | vax-*-openbsd*)
+  	COREFILE=netbsd-core.lo
+	;;
+  vax-*-ultrix2*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/vaxult2.h"'
+	;;
+  vax-*-ultrix*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/vaxult2.h"'
+	;;
+  vax-*-linux-*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/vaxlinux.h"'
+	;;
+  vax-*-*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/vaxbsd.h"'
+	;;
+  x86_64-*-linux*)
+	CORE_HEADER='"hosts/x86-64linux.h"'
+	;;
+  x86_64-*-netbsd* | x86_64-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+  esac
+
+  case "$COREFILE" in
+  aix386-core.lo)	COREFLAG=-DAIX386_CORE ;;
+  hppabsd-core.lo)	COREFLAG=-DHPPABSD_CORE ;;
+  hpux-core.lo)		COREFLAG=-DHPUX_CORE ;;
+  irix-core.lo)		COREFLAG=-DIRIX_CORE ;;
+  lynx-core.lo)		COREFLAG=-DLYNX_CORE ;;
+  netbsd-core.lo)	COREFLAG=-DNETBSD_CORE ;;
+  osf-core.lo)		COREFLAG=-DOSF_CORE ;;
+  ptrace-core.lo)	COREFLAG=-DPTRACE_CORE ;;
+  rs6000-core.lo)	COREFLAG="$COREFLAG -DAIX_CORE" ;;
+  sco5-core.lo)		COREFLAG="$COREFLAG -DSCO5_CORE" ;;
+  trad-core.lo)		COREFLAG="$COREFLAG -DTRAD_CORE" ;;
+  esac
+
+  # ELF corefile support has several flavors, but all of
+  # them use something called <sys/procfs.h>
+  for ac_header in sys/procfs.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/procfs.h" "ac_cv_header_sys_procfs_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_procfs_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_PROCFS_H 1
+_ACEOF
+
+fi
+
+done
+
+  if test "$ac_cv_header_sys_procfs_h" = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prstatus_t in sys/procfs.h" >&5
+$as_echo_n "checking for prstatus_t in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_prstatus_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+prstatus_t avar
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_prstatus_t=yes
+else
+  bfd_cv_have_sys_procfs_type_prstatus_t=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_prstatus_t = yes; then
+
+$as_echo "#define HAVE_PRSTATUS_T 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_prstatus_t" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_prstatus_t" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prstatus32_t in sys/procfs.h" >&5
+$as_echo_n "checking for prstatus32_t in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_prstatus32_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+prstatus32_t avar
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_prstatus32_t=yes
+else
+  bfd_cv_have_sys_procfs_type_prstatus32_t=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_prstatus32_t = yes; then
+
+$as_echo "#define HAVE_PRSTATUS32_T 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_prstatus32_t" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_prstatus32_t" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prstatus_t.pr_who in sys/procfs.h" >&5
+$as_echo_n "checking for prstatus_t.pr_who in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+prstatus_t avar; void* aref = (void*) &avar.pr_who
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who=yes
+else
+  bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who = yes; then
+
+$as_echo "#define HAVE_PRSTATUS_T_PR_WHO 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prstatus32_t.pr_who in sys/procfs.h" >&5
+$as_echo_n "checking for prstatus32_t.pr_who in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_member_prstatus32_t_pr_who+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+prstatus32_t avar; void* aref = (void*) &avar.pr_who
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_member_prstatus32_t_pr_who=yes
+else
+  bfd_cv_have_sys_procfs_type_member_prstatus32_t_pr_who=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_member_prstatus32_t_pr_who = yes; then
+
+$as_echo "#define HAVE_PRSTATUS32_T_PR_WHO 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_member_prstatus32_t_pr_who" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_member_prstatus32_t_pr_who" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pstatus_t in sys/procfs.h" >&5
+$as_echo_n "checking for pstatus_t in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_pstatus_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+pstatus_t avar
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_pstatus_t=yes
+else
+  bfd_cv_have_sys_procfs_type_pstatus_t=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_pstatus_t = yes; then
+
+$as_echo "#define HAVE_PSTATUS_T 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_pstatus_t" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_pstatus_t" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pxstatus_t in sys/procfs.h" >&5
+$as_echo_n "checking for pxstatus_t in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_pxstatus_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+pxstatus_t avar
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_pxstatus_t=yes
+else
+  bfd_cv_have_sys_procfs_type_pxstatus_t=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_pxstatus_t = yes; then
+
+$as_echo "#define HAVE_PXSTATUS_T 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_pxstatus_t" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_pxstatus_t" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pstatus32_t in sys/procfs.h" >&5
+$as_echo_n "checking for pstatus32_t in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_pstatus32_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+pstatus32_t avar
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_pstatus32_t=yes
+else
+  bfd_cv_have_sys_procfs_type_pstatus32_t=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_pstatus32_t = yes; then
+
+$as_echo "#define HAVE_PSTATUS32_T 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_pstatus32_t" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_pstatus32_t" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prpsinfo_t in sys/procfs.h" >&5
+$as_echo_n "checking for prpsinfo_t in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_prpsinfo_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+prpsinfo_t avar
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_prpsinfo_t=yes
+else
+  bfd_cv_have_sys_procfs_type_prpsinfo_t=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_prpsinfo_t = yes; then
+
+$as_echo "#define HAVE_PRPSINFO_T 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_prpsinfo_t" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_prpsinfo_t" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prpsinfo_t.pr_pid in sys/procfs.h" >&5
+$as_echo_n "checking for prpsinfo_t.pr_pid in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_member_prpsinfo_t_pr_pid+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+prpsinfo_t avar; void* aref = (void*) &avar.pr_pid
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_member_prpsinfo_t_pr_pid=yes
+else
+  bfd_cv_have_sys_procfs_type_member_prpsinfo_t_pr_pid=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_member_prpsinfo_t_pr_pid = yes; then
+
+$as_echo "#define HAVE_PRPSINFO_T_PR_PID 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_member_prpsinfo_t_pr_pid" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_member_prpsinfo_t_pr_pid" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prpsinfo32_t in sys/procfs.h" >&5
+$as_echo_n "checking for prpsinfo32_t in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_prpsinfo32_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+prpsinfo32_t avar
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_prpsinfo32_t=yes
+else
+  bfd_cv_have_sys_procfs_type_prpsinfo32_t=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_prpsinfo32_t = yes; then
+
+$as_echo "#define HAVE_PRPSINFO32_T 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_prpsinfo32_t" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_prpsinfo32_t" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prpsinfo32_t.pr_pid in sys/procfs.h" >&5
+$as_echo_n "checking for prpsinfo32_t.pr_pid in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_member_prpsinfo32_t_pr_pid+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+prpsinfo32_t avar; void* aref = (void*) &avar.pr_pid
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_member_prpsinfo32_t_pr_pid=yes
+else
+  bfd_cv_have_sys_procfs_type_member_prpsinfo32_t_pr_pid=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_member_prpsinfo32_t_pr_pid = yes; then
+
+$as_echo "#define HAVE_PRPSINFO32_T_PR_PID 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_member_prpsinfo32_t_pr_pid" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_member_prpsinfo32_t_pr_pid" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for psinfo_t in sys/procfs.h" >&5
+$as_echo_n "checking for psinfo_t in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_psinfo_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+psinfo_t avar
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_psinfo_t=yes
+else
+  bfd_cv_have_sys_procfs_type_psinfo_t=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_psinfo_t = yes; then
+
+$as_echo "#define HAVE_PSINFO_T 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_psinfo_t" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_psinfo_t" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for psinfo_t.pr_pid in sys/procfs.h" >&5
+$as_echo_n "checking for psinfo_t.pr_pid in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_member_psinfo_t_pr_pid+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+psinfo_t avar; void* aref = (void*) &avar.pr_pid
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_member_psinfo_t_pr_pid=yes
+else
+  bfd_cv_have_sys_procfs_type_member_psinfo_t_pr_pid=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_member_psinfo_t_pr_pid = yes; then
+
+$as_echo "#define HAVE_PSINFO_T_PR_PID 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_member_psinfo_t_pr_pid" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_member_psinfo_t_pr_pid" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for psinfo32_t in sys/procfs.h" >&5
+$as_echo_n "checking for psinfo32_t in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_psinfo32_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+psinfo32_t avar
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_psinfo32_t=yes
+else
+  bfd_cv_have_sys_procfs_type_psinfo32_t=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_psinfo32_t = yes; then
+
+$as_echo "#define HAVE_PSINFO32_T 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_psinfo32_t" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_psinfo32_t" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for psinfo32_t.pr_pid in sys/procfs.h" >&5
+$as_echo_n "checking for psinfo32_t.pr_pid in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_member_psinfo32_t_pr_pid+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+psinfo32_t avar; void* aref = (void*) &avar.pr_pid
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_member_psinfo32_t_pr_pid=yes
+else
+  bfd_cv_have_sys_procfs_type_member_psinfo32_t_pr_pid=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_member_psinfo32_t_pr_pid = yes; then
+
+$as_echo "#define HAVE_PSINFO32_T_PR_PID 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_member_psinfo32_t_pr_pid" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_member_psinfo32_t_pr_pid" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lwpstatus_t in sys/procfs.h" >&5
+$as_echo_n "checking for lwpstatus_t in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_lwpstatus_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+lwpstatus_t avar
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_lwpstatus_t=yes
+else
+  bfd_cv_have_sys_procfs_type_lwpstatus_t=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_lwpstatus_t = yes; then
+
+$as_echo "#define HAVE_LWPSTATUS_T 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_lwpstatus_t" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_lwpstatus_t" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lwpxstatus_t in sys/procfs.h" >&5
+$as_echo_n "checking for lwpxstatus_t in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_lwpxstatus_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+lwpxstatus_t avar
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_lwpxstatus_t=yes
+else
+  bfd_cv_have_sys_procfs_type_lwpxstatus_t=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_lwpxstatus_t = yes; then
+
+$as_echo "#define HAVE_LWPXSTATUS_T 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_lwpxstatus_t" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_lwpxstatus_t" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lwpstatus_t.pr_context in sys/procfs.h" >&5
+$as_echo_n "checking for lwpstatus_t.pr_context in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_context+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+lwpstatus_t avar; void* aref = (void*) &avar.pr_context
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_context=yes
+else
+  bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_context=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_context = yes; then
+
+$as_echo "#define HAVE_LWPSTATUS_T_PR_CONTEXT 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_context" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_context" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lwpstatus_t.pr_reg in sys/procfs.h" >&5
+$as_echo_n "checking for lwpstatus_t.pr_reg in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_reg+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+lwpstatus_t avar; void* aref = (void*) &avar.pr_reg
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_reg=yes
+else
+  bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_reg=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_reg = yes; then
+
+$as_echo "#define HAVE_LWPSTATUS_T_PR_REG 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_reg" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_reg" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lwpstatus_t.pr_fpreg in sys/procfs.h" >&5
+$as_echo_n "checking for lwpstatus_t.pr_fpreg in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_fpreg+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+lwpstatus_t avar; void* aref = (void*) &avar.pr_fpreg
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_fpreg=yes
+else
+  bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_fpreg=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_fpreg = yes; then
+
+$as_echo "#define HAVE_LWPSTATUS_T_PR_FPREG 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_fpreg" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_fpreg" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for win32_pstatus_t in sys/procfs.h" >&5
+$as_echo_n "checking for win32_pstatus_t in sys/procfs.h... " >&6; }
+ if test "${bfd_cv_have_sys_procfs_type_win32_pstatus_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define _SYSCALL32
+/* Needed for new procfs interface on sparc-solaris.  */
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+int
+main ()
+{
+win32_pstatus_t avar
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bfd_cv_have_sys_procfs_type_win32_pstatus_t=yes
+else
+  bfd_cv_have_sys_procfs_type_win32_pstatus_t=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+ if test $bfd_cv_have_sys_procfs_type_win32_pstatus_t = yes; then
+
+$as_echo "#define HAVE_WIN32_PSTATUS_T 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_procfs_type_win32_pstatus_t" >&5
+$as_echo "$bfd_cv_have_sys_procfs_type_win32_pstatus_t" >&6; }
+
+  fi
+fi
+
+
+if test -n "$CORE_HEADER"; then
+
+cat >>confdefs.h <<_ACEOF
+#define CORE_HEADER $CORE_HEADER
+_ACEOF
+
+fi
+if test -n "$TRAD_HEADER"; then
+
+cat >>confdefs.h <<_ACEOF
+#define TRAD_HEADER $TRAD_HEADER
+_ACEOF
+
+fi
+
+# Check if linker supports --as-needed and --no-as-needed options
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linker --as-needed support" >&5
+$as_echo_n "checking linker --as-needed support... " >&6; }
+if test "${bfd_cv_ld_as_needed+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  bfd_cv_ld_as_needed=no
+	if $LD --help 2>/dev/null | grep as-needed > /dev/null; then
+		bfd_cv_ld_as_needed=yes
+	fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_ld_as_needed" >&5
+$as_echo "$bfd_cv_ld_as_needed" >&6; }
+
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mwvalidcheckl in -lmw" >&5
+$as_echo_n "checking for _mwvalidcheckl in -lmw... " >&6; }
+if test "${ac_cv_lib_mw__mwvalidcheckl+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmw  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char _mwvalidcheckl ();
+int
+main ()
+{
+return _mwvalidcheckl ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_mw__mwvalidcheckl=yes
+else
+  ac_cv_lib_mw__mwvalidcheckl=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5
+$as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; }
+if test "x$ac_cv_lib_mw__mwvalidcheckl" = x""yes; then :
+  LIBM="-lmw"
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
+$as_echo_n "checking for cos in -lm... " >&6; }
+if test "${ac_cv_lib_m_cos+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cos ();
+int
+main ()
+{
+return cos ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_m_cos=yes
+else
+  ac_cv_lib_m_cos=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
+$as_echo "$ac_cv_lib_m_cos" >&6; }
+if test "x$ac_cv_lib_m_cos" = x""yes; then :
+  LIBM="$LIBM -lm"
+fi
+
+  ;;
+*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
+$as_echo_n "checking for cos in -lm... " >&6; }
+if test "${ac_cv_lib_m_cos+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cos ();
+int
+main ()
+{
+return cos ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_m_cos=yes
+else
+  ac_cv_lib_m_cos=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
+$as_echo "$ac_cv_lib_m_cos" >&6; }
+if test "x$ac_cv_lib_m_cos" = x""yes; then :
+  LIBM="-lm"
+fi
+
+  ;;
+esac
+
+
+
+# When building a shared libbfd, link against the pic version of libiberty
+# so that apps that use libbfd won't need libiberty just to satisfy any
+# libbfd references.
+# We can't do that if a pic libiberty is unavailable since including non-pic
+# code would insert text relocations into libbfd.
+SHARED_LIBADD=
+SHARED_LDFLAGS=
+if test "$enable_shared" = "yes"; then
+  x=`sed -n -e 's/^[ 	]*PICFLAG[ 	]*=[ 	]*//p' < ../libiberty/Makefile | sed -n '$p'`
+  if test -n "$x"; then
+    SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
+  fi
+
+# More hacks to build DLLs on Windows.
+  case "${host}" in
+  *-*-cygwin*)
+    SHARED_LDFLAGS="-no-undefined"
+    SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32"
+  ;;
+  esac
+
+  if test -n "$SHARED_LIBADD"; then
+    if test -n "$LIBM"; then
+      if test x"$bfd_cv_ld_as_needed" = xyes; then
+	# Link against libm only when needed.  Put -lc, -lm inside -Wl
+	# to stop libtool reordering these options.
+	SHARED_LIBADD="$SHARED_LIBADD -Wl,-lc,--as-needed,`echo $LIBM | sed 's/ /,/g'`,--no-as-needed"
+      else
+	SHARED_LIBADD="$SHARED_LIBADD $LIBM"
+      fi
+    fi
+  fi
+fi
+
+
+
+# target stuff:
+
+# Canonicalize the secondary target names.
+if test -n "$enable_targets" ; then
+    for targ in `echo $enable_targets | sed 's/,/ /g'`
+    do
+	result=`$ac_config_sub $targ 2>/dev/null`
+	if test -n "$result" ; then
+	    canon_targets="$canon_targets $result"
+	else
+	    # Allow targets that config.sub doesn't recognize, like "all".
+	    canon_targets="$canon_targets $targ"
+	fi
+    done
+fi
+
+all_targets=false
+defvec=
+selvecs=
+assocvecs=
+selarchs=
+TDEFINES=
+for targ in $target $canon_targets
+do
+    if test "x$targ" = "xall"; then
+        all_targets=true
+	assocvecs="$assocvecs $targ_defvec $targ_selvecs"
+    else
+	. $srcdir/config.bfd
+	if test "x$targ" = "x$target"; then
+	    defvec=$targ_defvec
+	fi
+	selvecs="$selvecs $targ_defvec $targ_selvecs"
+	selarchs="$selarchs $targ_archs"
+	TDEFINES="$TDEFINES $targ_cflags"
+    fi
+done
+
+
+# This processing still needs to be done if we're to decide properly whether
+# 64-bit support needs to be compiled in.  Currently, it will be included if
+# the default or any other explicitly requested target requires it; it
+# will not be included on a 32-bit host if no 64-bit target is requested, and
+# no "--with-64-bit-bfd" option is given, even if "--enable-targets=all" is
+# used.
+
+# uniq the default and selected vectors in all the configured targets.
+f=""
+for i in $selvecs ; do
+    case " $f " in
+    *" $i "*) ;;
+    *) f="$f $i" ;;
+    esac
+done
+selvecs="$f"
+
+
+# uniq the associated vectors in all the configured targets.
+f=""
+for i in $assocvecs ; do
+    case " $f " in
+    *" $i "*) ;;
+    *) f="$f $i" ;;
+    esac
+done
+assocvecs="$f"
+
+
+# uniq the architectures in all the configured targets.
+f=""
+for i in $selarchs ; do
+    case " $f " in
+    *" $i "*) ;;
+    *) f="$f $i" ;;
+    esac
+done
+selarchs="$f"
+
+# Target backend .o files.
+tb=
+
+elf="elf.lo elflink.lo elf-attrs.lo elf-strtab.lo
+     elf-eh-frame.lo dwarf1.lo"
+
+for vec in $selvecs
+do
+    target_size=32
+    case "$vec" in
+    # This list is alphabetized to make it easy to compare
+    # with the two vector lists in targets.c.  For the same reason,
+    # use one entry per line, even though this leads to long lines.
+    a_out_adobe_vec)		tb="$tb aout-adobe.lo aout32.lo" ;;
+    aix5coff64_vec)		tb="$tb coff64-rs6000.lo xcofflink.lo aix5ppc-core.lo"; target_size=64 ;;
+    aout0_big_vec)		tb="$tb aout0.lo aout32.lo" ;;
+    aout_arm_big_vec)		tb="$tb aout-arm.lo aout32.lo" ;;
+    aout_arm_little_vec)	tb="$tb aout-arm.lo aout32.lo" ;;
+    apollocoff_vec)		tb="$tb coff-apollo.lo" ;;
+    arm_epoc_pe_big_vec)	tb="$tb epoc-pe-arm.lo peigen.lo cofflink.lo " ;;
+    arm_epoc_pe_little_vec)	tb="$tb epoc-pe-arm.lo peigen.lo cofflink.lo " ;;
+    arm_epoc_pei_big_vec)	tb="$tb epoc-pei-arm.lo peigen.lo cofflink.lo " ;;
+    arm_epoc_pei_little_vec)	tb="$tb epoc-pei-arm.lo peigen.lo cofflink.lo " ;;
+    arm_wince_pe_big_vec)	tb="$tb pe-arm-wince.lo pe-arm.lo peigen.lo cofflink.lo " ;;
+    arm_wince_pe_little_vec)	tb="$tb pe-arm-wince.lo pe-arm.lo peigen.lo cofflink.lo " ;;
+    arm_wince_pei_big_vec)	tb="$tb pei-arm-wince.lo pei-arm.lo peigen.lo cofflink.lo " ;;
+    arm_wince_pei_little_vec)	tb="$tb pei-arm-wince.lo pei-arm.lo peigen.lo cofflink.lo " ;;
+    armcoff_big_vec)		tb="$tb coff-arm.lo cofflink.lo " ;;
+    armcoff_little_vec)		tb="$tb coff-arm.lo cofflink.lo " ;;
+    armnetbsd_vec)		tb="$tb armnetbsd.lo aout32.lo" ;;
+    armpe_big_vec)		tb="$tb pe-arm.lo peigen.lo cofflink.lo " ;;
+    armpe_little_vec)		tb="$tb pe-arm.lo peigen.lo cofflink.lo " ;;
+    armpei_big_vec)		tb="$tb pei-arm.lo peigen.lo cofflink.lo " ;;
+    armpei_little_vec)		tb="$tb pei-arm.lo peigen.lo cofflink.lo " ;;
+    asxxxx_vec)			tb="$tb asxxxx.lo" ;;
+    b_out_vec_big_host)		tb="$tb bout.lo aout32.lo" ;;
+    b_out_vec_little_host)	tb="$tb bout.lo aout32.lo" ;;
+    bfd_pei_ia64_vec)		tb="$tb pei-ia64.lo pepigen.lo cofflink.lo"; target_size=64 ;;
+    bfd_elf32_am33lin_vec)	tb="$tb elf32-am33lin.lo elf32.lo $elf" ;;
+    bfd_elf32_avr_vec)		tb="$tb elf32-avr.lo elf32.lo $elf" ;;
+    bfd_elf32_bfin_vec)		tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
+    bfd_elf32_bfinfdpic_vec)	tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
+    bfd_elf32_big_generic_vec) 	tb="$tb elf32-gen.lo elf32.lo $elf" ;;
+    bfd_elf32_bigarc_vec)	tb="$tb elf32-arc.lo elf32.lo $elf" ;;
+    bfd_elf32_bigarm_vec)	tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    bfd_elf32_bigarm_symbian_vec)
+                                tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    bfd_elf32_bigarm_vxworks_vec)
+                                tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    bfd_elf32_bigmips_vec) 	tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    bfd_elf32_bigmips_vxworks_vec)
+			 	tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    bfd_elf32_cr16_vec)		tb="$tb elf32-cr16.lo elf32.lo $elf" ;;
+    bfd_elf32_cr16c_vec)	tb="$tb elf32-cr16c.lo elf32.lo $elf" ;;
+    bfd_elf32_cris_vec)		tb="$tb elf32-cris.lo elf32.lo $elf" ;;
+    bfd_elf32_crx_vec)          tb="$tb elf32-crx.lo elf32.lo $elf" ;;
+    bfd_elf32_d10v_vec)		tb="$tb elf32-d10v.lo elf32.lo $elf" ;;
+    bfd_elf32_d30v_vec)		tb="$tb elf32-d30v.lo elf32.lo $elf" ;;
+    bfd_elf32_dlx_big_vec)	tb="$tb elf32-dlx.lo elf32.lo $elf" ;;
+    bfd_elf32_fr30_vec)		tb="$tb elf32-fr30.lo elf32.lo $elf" ;;
+    bfd_elf32_frv_vec)		tb="$tb elf32-frv.lo elf32.lo $elf" ;;
+    bfd_elf32_frvfdpic_vec)	tb="$tb elf32-frv.lo elf32.lo $elf" ;;
+    bfd_elf32_moxie_vec)	tb="$tb elf32-moxie.lo elf32.lo $elf" ;;
+    bfd_elf32_h8300_vec)	tb="$tb elf32-h8300.lo elf32.lo $elf" ;;
+    bfd_elf32_hppa_linux_vec)	tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
+    bfd_elf32_hppa_nbsd_vec)	tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
+    bfd_elf32_hppa_vec)		tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
+    bfd_elf32_i370_vec)		tb="$tb elf32-i370.lo elf32.lo $elf" ;;
+    bfd_elf32_i386_sol2_vec)	tb="$tb elf32-i386.lo elf-ifunc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_i386_freebsd_vec)	tb="$tb elf32-i386.lo elf-ifunc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_i386_nacl_vec)	tb="$tb elf32-i386.lo elf-ifunc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_i386_vxworks_vec)	tb="$tb elf32-i386.lo elf-ifunc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_i386_vec)		tb="$tb elf32-i386.lo elf-ifunc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_i860_little_vec)	tb="$tb elf32-i860.lo elf32.lo $elf" ;;
+    bfd_elf32_i860_vec)		tb="$tb elf32-i860.lo elf32.lo $elf" ;;
+    bfd_elf32_i960_vec)		tb="$tb elf32-i960.lo elf32.lo $elf" ;;
+    bfd_elf32_ia64_big_vec)	tb="$tb elf32-ia64.lo elfxx-ia64.lo elf32.lo $elf" ;;
+    bfd_elf32_ia64_hpux_big_vec) tb="$tb elf32-ia64.lo elfxx-ia64.lo elf32.lo $elf";;
+    bfd_elf32_ip2k_vec)		tb="$tb elf32-ip2k.lo elf32.lo $elf" ;;
+    bfd_elf32_iq2000_vec)       tb="$tb elf32-iq2000.lo elf32.lo $elf" ;;
+    bfd_elf32_lm32_vec)         tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
+    bfd_elf32_lm32fdpic_vec)         tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
+    bfd_elf32_little_generic_vec) tb="$tb elf32-gen.lo elf32.lo $elf" ;;
+    bfd_elf32_littlearc_vec)	tb="$tb elf32-arc.lo elf32.lo $elf" ;;
+    bfd_elf32_littlearm_symbian_vec)
+                                tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    bfd_elf32_littlearm_vxworks_vec)
+                                tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    bfd_elf32_littlearm_vec)	tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    bfd_elf32_littlemips_vec) 	tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    bfd_elf32_littlemips_vxworks_vec)
+			 	tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    bfd_elf32_m32c_vec)         tb="$tb elf32-m32c.lo elf32.lo $elf" ;;
+    bfd_elf32_m32r_vec)		tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
+    bfd_elf32_m32rle_vec)       tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
+    bfd_elf32_m32rlin_vec)      tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
+    bfd_elf32_m32rlelin_vec)    tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
+    bfd_elf32_m68hc11_vec)	tb="$tb elf32-m68hc11.lo elf32-m68hc1x.lo elf32.lo $elf" ;;
+    bfd_elf32_m68hc12_vec)	tb="$tb elf32-m68hc12.lo elf32-m68hc1x.lo elf32.lo $elf" ;;
+    bfd_elf32_m68k_vec)		tb="$tb elf32-m68k.lo elf32.lo $elf" ;;
+    bfd_elf32_m88k_vec)		tb="$tb elf32-m88k.lo elf32.lo $elf" ;;
+    bfd_elf32_mcore_big_vec)	tb="$tb elf32-mcore.lo elf32.lo $elf" ;;
+    bfd_elf32_mcore_little_vec)	tb="$tb elf32-mcore.lo elf32.lo $elf" ;;
+    bfd_elf32_mep_vec)		tb="$tb elf32-mep.lo elf32.lo $elf" ;;
+    bfd_elf32_mep_little_vec)	tb="$tb elf32-mep.lo elf32.lo $elf" ;;
+    bfd_elf32_microblaze_vec)	tb="$tb elf32-microblaze.lo elf32.lo $elf" ;;
+    bfd_elf32_mn10200_vec)	tb="$tb elf-m10200.lo elf32.lo $elf" ;;
+    bfd_elf32_mn10300_vec)	tb="$tb elf-m10300.lo elf32.lo $elf" ;;
+    bfd_elf32_mt_vec)           tb="$tb elf32-mt.lo elf32.lo $elf" ;;
+    bfd_elf32_msp430_vec)	tb="$tb elf32-msp430.lo elf32.lo $elf" ;;
+    bfd_elf32_nbigmips_vec)	tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    bfd_elf32_nlittlemips_vec)	tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    bfd_elf32_ntradbigmips_vec | bfd_elf32_ntradbigmips_freebsd_vec)
+				tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    bfd_elf32_ntradlittlemips_vec | bfd_elf32_ntradlittlemips_freebsd_vec)
+				tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    bfd_elf32_openrisc_vec)	tb="$tb elf32-openrisc.lo elf32.lo $elf" ;;
+    bfd_elf32_or32_big_vec)	tb="$tb elf32-or32.lo elf32.lo $elf" ;;
+    bfd_elf32_pj_vec)           tb="$tb elf32-pj.lo elf32.lo $elf";;
+    bfd_elf32_pjl_vec)          tb="$tb elf32-pj.lo elf32.lo $elf";;
+    bfd_elf32_powerpc_vec)	tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_powerpcle_vec)	tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_powerpc_vxworks_vec) tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_rx_le_vec)        tb="$tb elf32-rx.lo elf32.lo $elf" ;;
+    bfd_elf32_rx_be_vec)        tb="$tb elf32-rx.lo elf32.lo $elf" ;;
+    bfd_elf32_rx_be_ns_vec)     tb="$tb elf32-rx.lo elf32.lo $elf" ;;
+    bfd_elf32_s390_vec)		tb="$tb elf32-s390.lo elf32.lo $elf" ;;
+    bfd_elf32_bigscore_vec)     tb="$tb elf32-score.lo elf32-score7.lo elf32.lo $elf"; want64=true; target_size=64;;
+    bfd_elf32_littlescore_vec)  tb="$tb elf32-score.lo elf32-score7.lo elf32.lo $elf"; want64=true; target_size=64;;
+    # FIXME: We include cofflink.lo not because it's needed for
+    # bfd_elf32_sh64[l]_vec, but because we include bfd_elf32_sh[l]_vec
+    # which needs it but does not list it.  Should be fixed in right place.
+    bfd_elf32_sh64_vec)		tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
+    bfd_elf32_sh64l_vec)	tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
+    bfd_elf32_sh64lin_vec)	tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
+    bfd_elf32_sh64blin_vec)	tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
+    bfd_elf32_sh64lnbsd_vec)	tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" ;;
+    bfd_elf32_sh64nbsd_vec)	tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" ;;
+    bfd_elf32_sh_vec)		tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
+    bfd_elf32_shbfd_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    bfd_elf32_shblin_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    bfd_elf32_shfd_vec)		tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    bfd_elf32_shl_vec)		tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
+    bfd_elf32_shl_symbian_vec)	tb="$tb elf32-sh-symbian.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
+    bfd_elf32_shlin_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    bfd_elf32_shlnbsd_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    bfd_elf32_shlvxworks_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
+    bfd_elf32_shnbsd_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    bfd_elf32_shvxworks_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
+    bfd_elf32_sparc_vec)	tb="$tb elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_sparc_sol2_vec)	tb="$tb elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_sparc_vxworks_vec) tb="$tb elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_spu_vec)		tb="$tb elf32-spu.lo elf32.lo $elf" ;;
+    bfd_elf32_tic6x_be_vec)	tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    bfd_elf32_tic6x_le_vec)	tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    bfd_elf32_tic6x_linux_be_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    bfd_elf32_tic6x_linux_le_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    bfd_elf32_tic6x_elf_be_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    bfd_elf32_tic6x_elf_le_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    bfd_elf32_tilegx_vec)	tb="$tb elf32-tilegx.lo elfxx-tilegx.lo elf32.lo $elf" ; target_size=32 ;;
+    bfd_elf32_tilepro_vec)	tb="$tb elf32-tilepro.lo elf32.lo $elf" ;;
+    bfd_elf32_tradbigmips_vec | bfd_elf32_tradbigmips_freebsd_vec)
+				tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    bfd_elf32_tradlittlemips_vec | bfd_elf32_tradlittlemips_freebsd_vec)
+				tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    bfd_elf32_us_cris_vec)	tb="$tb elf32-cris.lo elf32.lo $elf" ;;
+    bfd_elf32_v850_vec)		tb="$tb elf32-v850.lo elf32.lo $elf" ;;
+    bfd_elf32_vax_vec)		tb="$tb elf32-vax.lo elf32.lo $elf" ;;
+    bfd_elf32_xstormy16_vec)	tb="$tb elf32-xstormy16.lo elf32.lo $elf" ;;
+    bfd_elf32_xc16x_vec)		tb="$tb elf32-xc16x.lo elf32.lo $elf" ;;
+    bfd_elf32_xtensa_le_vec)	tb="$tb xtensa-isa.lo xtensa-modules.lo elf32-xtensa.lo elf32.lo $elf" ;;
+    bfd_elf32_xtensa_be_vec)	tb="$tb xtensa-isa.lo xtensa-modules.lo elf32-xtensa.lo elf32.lo $elf" ;;
+    bfd_elf64_alpha_freebsd_vec) tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_alpha_vec)	tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_big_generic_vec) 	tb="$tb elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_bigmips_vec) 	tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    bfd_elf64_hppa_linux_vec)	tb="$tb elf64-hppa.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_hppa_vec)		tb="$tb elf64-hppa.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_ia64_big_vec)	tb="$tb elf64-ia64.lo elfxx-ia64.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_ia64_hpux_big_vec) tb="$tb elf64-ia64.lo elfxx-ia64.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_ia64_little_vec)	tb="$tb elf64-ia64.lo elfxx-ia64.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_ia64_vms_vec)	tb="$tb elf64-ia64.lo elfxx-ia64.lo  elf64.lo vms-lib.lo vms-misc.lo $elf"; target_size=64 ;;
+    bfd_elf64_little_generic_vec) tb="$tb elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_littlemips_vec) 	tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    bfd_elf64_mmix_vec) 	tb="$tb elf64-mmix.lo elf64.lo $elf" target_size=64 ;;
+    bfd_elf64_powerpc_vec)	tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_powerpcle_vec)	tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;;
+    bfd_elf64_s390_vec)		tb="$tb elf64-s390.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_sh64_vec)		tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    bfd_elf64_sh64l_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    bfd_elf64_sh64lin_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    bfd_elf64_sh64blin_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    bfd_elf64_sh64lnbsd_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    bfd_elf64_sh64nbsd_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    bfd_elf64_sparc_vec)	tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_sparc_freebsd_vec) tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_sparc_sol2_vec) tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_tilegx_vec)	tb="$tb elf64-tilegx.lo elfxx-tilegx.lo elf64.lo $elf" ; target_size=64 ;;
+    bfd_elf64_tradbigmips_vec | bfd_elf64_tradbigmips_freebsd_vec)
+				tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    bfd_elf64_tradlittlemips_vec | bfd_elf64_tradlittlemips_freebsd_vec)
+				tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    bfd_elf64_x86_64_freebsd_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_x86_64_sol2_vec)  tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_x86_64_vec)	tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf32_x86_64_vec)	tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo elf32.lo $elf"; target_size=64 ;;
+    bfd_elf64_l1om_vec)		tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_l1om_freebsd_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_k1om_vec)		tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_k1om_freebsd_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_mmo_vec)		tb="$tb mmo.lo" target_size=64 ;;
+    bfd_powerpc_pe_vec)         tb="$tb pe-ppc.lo peigen.lo cofflink.lo" ;;
+    bfd_powerpc_pei_vec)        tb="$tb pei-ppc.lo peigen.lo cofflink.lo" ;;
+    bfd_powerpcle_pe_vec)       tb="$tb pe-ppc.lo peigen.lo cofflink.lo" ;;
+    bfd_powerpcle_pei_vec)      tb="$tb pei-ppc.lo peigen.lo cofflink.lo" ;;
+    cris_aout_vec)		tb="$tb aout-cris.lo" ;;
+    demo_64_vec)		tb="$tb demo64.lo aout64.lo"; target_size=64 ;;
+    ecoff_big_vec)		tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
+    ecoff_biglittle_vec)	tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
+    ecoff_little_vec)		tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
+    ecoffalpha_little_vec)	tb="$tb coff-alpha.lo ecoff.lo ecofflink.lo"; target_size=64 ;;
+    go32coff_vec)		tb="$tb coff-go32.lo cofflink.lo" ;;
+    go32stubbedcoff_vec)	tb="$tb coff-stgo32.lo cofflink.lo" ;;
+    h8300coff_vec)		tb="$tb coff-h8300.lo reloc16.lo" ;;
+    h8500coff_vec)		tb="$tb coff-h8500.lo reloc16.lo" ;;
+    host_aout_vec)		tb="$tb host-aout.lo aout32.lo" ;;
+    hp300bsd_vec)		tb="$tb hp300bsd.lo aout32.lo" ;;
+    hp300hpux_vec)		tb="$tb hp300hpux.lo aout32.lo" ;;
+    i386aout_vec)		tb="$tb i386aout.lo aout32.lo" ;;
+    i386bsd_vec)		tb="$tb i386bsd.lo aout32.lo" ;;
+    i386coff_vec)		tb="$tb coff-i386.lo cofflink.lo" ;;
+    x86_64coff_vec)		tb="$tb coff-x86_64.lo cofflink.lo"; target_size=64 ;;
+    i386dynix_vec)		tb="$tb i386dynix.lo aout32.lo" ;;
+    i386freebsd_vec)		tb="$tb i386freebsd.lo aout32.lo" ;;
+    i386linux_vec)		tb="$tb i386linux.lo aout32.lo" ;;
+    i386lynx_aout_vec)		tb="$tb i386lynx.lo lynx-core.lo aout32.lo" ;;
+    i386lynx_coff_vec)		tb="$tb cf-i386lynx.lo cofflink.lo lynx-core.lo" ;;
+    i386mach3_vec)		tb="$tb i386mach3.lo aout32.lo" ;;
+    i386msdos_vec)		tb="$tb i386msdos.lo" ;;
+    i386netbsd_vec)		tb="$tb i386netbsd.lo aout32.lo" ;;
+    i386os9k_vec)		tb="$tb i386os9k.lo aout32.lo" ;;
+    i386pe_vec)			tb="$tb pe-i386.lo peigen.lo cofflink.lo" ;;
+    i386pei_vec)		tb="$tb pei-i386.lo peigen.lo cofflink.lo" ;;
+    x86_64pe_vec)		tb="$tb pe-x86_64.lo pex64igen.lo cofflink.lo"; target_size=64 ;;
+    x86_64pei_vec)		tb="$tb pei-x86_64.lo pex64igen.lo cofflink.lo"; target_size=64 ;;
+    i860coff_vec)		tb="$tb coff-i860.lo cofflink.lo" ;;
+    icoff_big_vec)		tb="$tb coff-i960.lo cofflink.lo" ;;
+    icoff_little_vec)		tb="$tb coff-i960.lo cofflink.lo" ;;
+    ieee_vec)			tb="$tb ieee.lo" ;;
+    m68k4knetbsd_vec)		tb="$tb m68k4knetbsd.lo aout32.lo" ;;
+    m68kaux_coff_vec)		tb="$tb coff-aux.lo coff-m68k.lo cofflink.lo" ;;
+    m68kcoff_vec)		tb="$tb coff-m68k.lo cofflink.lo" ;;
+    m68kcoffun_vec)		tb="$tb coff-u68k.lo coff-m68k.lo cofflink.lo" ;;
+    m68klinux_vec)		tb="$tb m68klinux.lo aout32.lo" ;;
+    m68knetbsd_vec)		tb="$tb m68knetbsd.lo aout32.lo" ;;
+    m68ksysvcoff_vec)		tb="$tb coff-svm68k.lo cofflink.lo" ;;
+    m88kbcs_vec)		tb="$tb coff-m88k.lo" ;;
+    m88kmach3_vec)		tb="$tb m88kmach3.lo aout32.lo" ;;
+    m88kopenbsd_vec)		tb="$tb m88kopenbsd.lo aout32.lo" ;;
+    mach_o_be_vec)              tb="$tb mach-o.lo" ;;
+    mach_o_le_vec)              tb="$tb mach-o.lo" ;;
+    mach_o_fat_vec)             tb="$tb mach-o.lo" ;;
+    mach_o_i386_vec)            tb="$tb mach-o-i386.lo" ;;
+    mach_o_x86_64_vec)          tb="$tb mach-o-x86-64.lo" ;;
+    mcore_pe_big_vec)		tb="$tb pe-mcore.lo peigen.lo cofflink.lo" ;;
+    mcore_pe_little_vec)	tb="$tb pe-mcore.lo peigen.lo cofflink.lo" ;;
+    mcore_pei_big_vec)		tb="$tb pei-mcore.lo peigen.lo cofflink.lo" ;;
+    mcore_pei_little_vec)	tb="$tb pei-mcore.lo peigen.lo cofflink.lo" ;;
+    mipslpe_vec)		tb="$tb pe-mips.lo peigen.lo cofflink.lo" ;;
+    mipslpei_vec)		tb="$tb pei-mips.lo peigen.lo cofflink.lo" ;;
+    newsos3_vec)		tb="$tb newsos3.lo aout32.lo" ;;
+    nlm32_alpha_vec)		tb="$tb nlm32-alpha.lo nlm32.lo nlm.lo"; target_size=64 ;;
+    nlm32_i386_vec)		tb="$tb nlm32-i386.lo nlm32.lo nlm.lo" ;;
+    nlm32_powerpc_vec)		tb="$tb nlm32-ppc.lo nlm32.lo nlm.lo" ;;
+    nlm32_sparc_vec)		tb="$tb nlm32-sparc.lo nlm32.lo nlm.lo" ;;
+    or32coff_big_vec)		tb="$tb coff-or32.lo cofflink.lo" ;;
+    pc532machaout_vec)		tb="$tb pc532-mach.lo aout-ns32k.lo" ;;
+    pc532netbsd_vec)		tb="$tb ns32knetbsd.lo aout-ns32k.lo" ;;
+    pef_vec)                    tb="$tb pef.lo" ;;
+    pef_xlib_vec)               tb="$tb pef.lo" ;;
+    pdp11_aout_vec)		tb="$tb pdp11.lo" ;;
+    plugin_vec)                 tb="$tb plugin.lo" ;;
+    pmac_xcoff_vec)		tb="$tb coff-rs6000.lo xcofflink.lo" ;;
+    ppcboot_vec)		tb="$tb ppcboot.lo" ;;
+    riscix_vec)			tb="$tb aout32.lo riscix.lo" ;;
+    rs6000coff64_vec)		tb="$tb coff64-rs6000.lo xcofflink.lo aix5ppc-core.lo"; target_size=64 ;;
+    rs6000coff_vec)		tb="$tb coff-rs6000.lo xcofflink.lo" ;;
+    shcoff_small_vec)		tb="$tb coff-sh.lo cofflink.lo" ;;
+    shcoff_vec)			tb="$tb coff-sh.lo cofflink.lo" ;;
+    shlcoff_small_vec)		tb="$tb coff-sh.lo cofflink.lo" ;;
+    shlcoff_vec)		tb="$tb coff-sh.lo cofflink.lo" ;;
+    shlpe_vec)			tb="$tb pe-sh.lo coff-sh.lo peigen.lo cofflink.lo" ;;
+    shlpei_vec)			tb="$tb pei-sh.lo coff-sh.lo peigen.lo cofflink.lo" ;;
+    som_vec)			tb="$tb som.lo" ;;
+    sparccoff_vec)		tb="$tb coff-sparc.lo" ;;
+    sparcle_aout_vec)		tb="$tb aout-sparcle.lo aout32.lo" ;;
+    sparclinux_vec)		tb="$tb sparclinux.lo aout32.lo" ;;
+    sparclynx_aout_vec)		tb="$tb sparclynx.lo lynx-core.lo aout32.lo" ;;
+    sparclynx_coff_vec)		tb="$tb cf-sparclynx.lo lynx-core.lo" ;;
+    sparcnetbsd_vec)		tb="$tb sparcnetbsd.lo aout32.lo" ;;
+    sunos_big_vec)		tb="$tb sunos.lo aout32.lo" ;;
+    sym_vec)                    tb="$tb xsym.lo" ;;
+    tic30_aout_vec)		tb="$tb aout-tic30.lo" ;;
+    tic30_coff_vec)		tb="$tb coff-tic30.lo" ;;
+    tic4x_coff0_vec)            tb="$tb coff-tic4x.lo" ;;
+    tic4x_coff0_beh_vec)        tb="$tb coff-tic4x.lo" ;;
+    tic4x_coff1_vec)            tb="$tb coff-tic4x.lo" ;;
+    tic4x_coff1_beh_vec)        tb="$tb coff-tic4x.lo" ;;
+    tic4x_coff2_vec)            tb="$tb coff-tic4x.lo" ;;
+    tic4x_coff2_beh_vec)        tb="$tb coff-tic4x.lo" ;;
+    tic54x_coff0_beh_vec)	tb="$tb coff-tic54x.lo" ;;
+    tic54x_coff0_vec)		tb="$tb coff-tic54x.lo" ;;
+    tic54x_coff1_beh_vec)	tb="$tb coff-tic54x.lo" ;;
+    tic54x_coff1_vec)		tb="$tb coff-tic54x.lo" ;;
+    tic54x_coff2_beh_vec)	tb="$tb coff-tic54x.lo" ;;
+    tic54x_coff2_vec)		tb="$tb coff-tic54x.lo" ;;
+    tic80coff_vec)		tb="$tb coff-tic80.lo cofflink.lo" ;;
+    vaxnetbsd_vec)		tb="$tb vaxnetbsd.lo aout32.lo" ;;
+    vax1knetbsd_vec)		tb="$tb vax1knetbsd.lo aout32.lo" ;;
+    vaxbsd_vec)			tb="$tb vaxbsd.lo aout32.lo" ;;
+    versados_vec)		tb="$tb versados.lo" ;;
+    vms_alpha_vec)		tb="$tb vms-alpha.lo vms-misc.lo vms-lib.lo"; target_size=64 ;;
+    vms_lib_txt_vec)		tb="$tb vms-lib.lo vms-misc.lo" ;;
+    w65_vec)			tb="$tb coff-w65.lo reloc16.lo" ;;
+    we32kcoff_vec)		tb="$tb coff-we32k.lo" ;;
+    z80coff_vec)		tb="$tb coff-z80.lo reloc16.lo" ;;
+    z8kcoff_vec)		tb="$tb coff-z8k.lo reloc16.lo cofflink.lo" ;;
+
+    # These appear out of order in targets.c
+    srec_vec)			tb="$tb srec.lo" ;;
+    symbolsrec_vec)		tb="$tb srec.lo" ;;
+    tekhex_vec)			tb="$tb tekhex.lo" ;;
+    cisco_core_big_vec)		tb="$tb cisco-core.lo" ;;
+    cisco_core_little_vec)	tb="$tb cisco-core.lo" ;;
+
+    "")			;;
+    *) as_fn_error "*** unknown target vector $vec" "$LINENO" 5 ;;
+    esac
+
+    if test ${target_size} = 64; then
+	target64=true
+    fi
+    if test x"${vec}" = x"${defvec}"; then
+	bfd_default_target_size=${target_size}
+    fi
+done
+
+# Target architecture .o files.
+# A couple of CPUs use shorter file names to avoid problems on DOS
+# filesystems.
+ta=`echo $selarchs | sed -e s/bfd_/cpu-/g -e s/_arch/.lo/g -e s/mn10200/m10200/ -e s/mn10300/m10300/`
+
+# Weed out duplicate .o files.
+f=""
+for i in $tb ; do
+    case " $f " in
+    *" $i "*) ;;
+    *) f="$f $i" ;;
+    esac
+done
+tb="$f"
+
+f=""
+for i in $ta ; do
+    case " $f " in
+    *" $i "*) ;;
+    *) f="$f $i" ;;
+    esac
+done
+ta="$f"
+
+bfd_backends="$tb"
+bfd_machines="$ta"
+
+if test x${all_targets} = xtrue ; then
+  bfd_backends="${bfd_backends}"' $(ALL_BACKENDS)'
+  bfd_machines="${bfd_machines}"' $(ALL_MACHINES)'
+  selvecs=
+  havevecs=-DHAVE_all_vecs
+  selarchs=
+  test -n "$assocvecs" &&
+    assocvecs=`echo $assocvecs | sed -e 's/^/\&/' -e 's/ \(.\)/,\&\1/g'`
+else	# all_targets is true
+  # Only set these if they will be nonempty, for the clever echo.
+  havevecs=
+  assocvecs=
+  test -n "$selvecs" &&
+    havevecs=`echo $selvecs | sed -e 's/^/-DHAVE_/' -e 's/ \(.\)/ -DHAVE_\1/g'`
+  test -n "$selvecs" &&
+    selvecs=`echo $selvecs | sed -e 's/^/\&/' -e 's/ \(.\)/,\&\1/g'`
+  test -n "$selarchs" &&
+    selarchs=`echo $selarchs | sed -e 's/^/\&/' -e 's/ \(.\)/,\&\1/g'`
+fi	# all_targets is true
+
+case ${host64}-${target64}-${want64} in
+  *true*)
+    wordsize=64
+    bfd64_libs='$(BFD64_LIBS)'
+    all_backends='$(BFD64_BACKENDS) $(BFD32_BACKENDS)'
+    if test $BFD_HOST_64_BIT_DEFINED = 0; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You have requested a 64 bit BFD configuration, but" >&5
+$as_echo "$as_me: WARNING: You have requested a 64 bit BFD configuration, but" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: your compiler may not have a 64 bit integral type" >&5
+$as_echo "$as_me: WARNING: your compiler may not have a 64 bit integral type" >&2;}
+    fi
+    if test -n "$GCC" ; then
+       bad_64bit_gcc=no;
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc version with buggy 64-bit support" >&5
+$as_echo_n "checking for gcc version with buggy 64-bit support... " >&6; }
+       # Add more tests for gcc versions with non-working 64-bit support here.
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+:__GNUC__:__GNUC_MINOR__:__i386__:
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP ": 2 : 91 : 1 :" >/dev/null 2>&1; then :
+  bad_64bit_gcc=yes;
+		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes: egcs-1.1.2 on ix86 spotted" >&5
+$as_echo "yes: egcs-1.1.2 on ix86 spotted" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f conftest*
+
+       if test $bad_64bit_gcc = yes ; then
+	 as_fn_error "A newer version of gcc is needed for the requested 64-bit BFD configuration" "$LINENO" 5
+       fi
+    fi
+    ;;
+  false-false-false)
+    wordsize=32
+    all_backends='$(BFD32_BACKENDS)'
+    ;;
+esac
+
+
+
+
+
+
+
+
+if test "$plugins" = "yes"; then
+  supports_plugins=1
+else
+  supports_plugins=0
+fi
+
+
+# Determine the host dependant file_ptr a.k.a. off_t type.  In order
+# prefer: off64_t - if ftello64 and fseeko64, off_t - if ftello and
+# fseeko, long.  This assumes that sizeof off_t is .ge. sizeof long.
+# Hopefully a reasonable assumption since fseeko et.al. should be
+# upward compatible.
+for ac_func in ftello ftello64 fseeko fseeko64 fopen64
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+if test x"$ac_cv_func_ftello" = xyes -a x"$ac_cv_func_fseeko" = xyes; then
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
+$as_echo_n "checking size of off_t... " >&6; }
+if test "${ac_cv_sizeof_off_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_off_t" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (off_t)
+See \`config.log' for more details." "$LINENO" 5; }; }
+   else
+     ac_cv_sizeof_off_t=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5
+$as_echo "$ac_cv_sizeof_off_t" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_OFF_T $ac_cv_sizeof_off_t
+_ACEOF
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking file_ptr type" >&5
+$as_echo_n "checking file_ptr type... " >&6; }
+bfd_file_ptr="long"
+bfd_ufile_ptr="unsigned long"
+if test x"$ac_cv_func_ftello64" = xyes -a x"$ac_cv_func_fseeko64" = xyes \
+	-o x"${ac_cv_sizeof_off_t}" = x8; then
+    bfd_file_ptr=BFD_HOST_64_BIT
+    bfd_ufile_ptr=BFD_HOST_U_64_BIT
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_file_ptr" >&5
+$as_echo "$bfd_file_ptr" >&6; }
+
+
+
+
+tdefaults=""
+test -n "${defvec}" && tdefaults="${tdefaults} -DDEFAULT_VECTOR=${defvec}"
+test -n "${selvecs}" && tdefaults="${tdefaults} -DSELECT_VECS='${selvecs}'"
+test -n "${assocvecs}" && tdefaults="${tdefaults} -DASSOCIATED_VECS='${assocvecs}'"
+test -n "${selarchs}" && tdefaults="${tdefaults} -DSELECT_ARCHITECTURES='${selarchs}'"
+
+
+
+for ac_header in stdlib.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+for ac_func in getpagesize
+do :
+  ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
+if test "x$ac_cv_func_getpagesize" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETPAGESIZE 1
+_ACEOF
+
+fi
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
+$as_echo_n "checking for working mmap... " >&6; }
+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_mmap_fixed_mapped=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+/* malloc might have been renamed as rpl_malloc. */
+#undef malloc
+
+/* Thanks to Mike Haertel and Jim Avera for this test.
+   Here is a matrix of mmap possibilities:
+	mmap private not fixed
+	mmap private fixed at somewhere currently unmapped
+	mmap private fixed at somewhere already mapped
+	mmap shared not fixed
+	mmap shared fixed at somewhere currently unmapped
+	mmap shared fixed at somewhere already mapped
+   For private mappings, we should verify that changes cannot be read()
+   back from the file, nor mmap's back from the file at a different
+   address.  (There have been systems where private was not correctly
+   implemented like the infamous i386 svr4.0, and systems where the
+   VM page cache was not coherent with the file system buffer cache
+   like early versions of FreeBSD and possibly contemporary NetBSD.)
+   For shared mappings, we should conversely verify that changes get
+   propagated back to all the places they're supposed to be.
+
+   Grep wants private fixed already mapped.
+   The main things grep needs to know about mmap are:
+   * does it exist and is it safe to write into the mmap'd area
+   * how to use it (BSD variants)  */
+
+#include <fcntl.h>
+#include <sys/mman.h>
+
+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
+char *malloc ();
+#endif
+
+/* This mess was copied from the GNU getpagesize.h.  */
+#ifndef HAVE_GETPAGESIZE
+/* Assume that all systems that can run configure have sys/param.h.  */
+# ifndef HAVE_SYS_PARAM_H
+#  define HAVE_SYS_PARAM_H 1
+# endif
+
+# ifdef _SC_PAGESIZE
+#  define getpagesize() sysconf(_SC_PAGESIZE)
+# else /* no _SC_PAGESIZE */
+#  ifdef HAVE_SYS_PARAM_H
+#   include <sys/param.h>
+#   ifdef EXEC_PAGESIZE
+#    define getpagesize() EXEC_PAGESIZE
+#   else /* no EXEC_PAGESIZE */
+#    ifdef NBPG
+#     define getpagesize() NBPG * CLSIZE
+#     ifndef CLSIZE
+#      define CLSIZE 1
+#     endif /* no CLSIZE */
+#    else /* no NBPG */
+#     ifdef NBPC
+#      define getpagesize() NBPC
+#     else /* no NBPC */
+#      ifdef PAGESIZE
+#       define getpagesize() PAGESIZE
+#      endif /* PAGESIZE */
+#     endif /* no NBPC */
+#    endif /* no NBPG */
+#   endif /* no EXEC_PAGESIZE */
+#  else /* no HAVE_SYS_PARAM_H */
+#   define getpagesize() 8192	/* punt totally */
+#  endif /* no HAVE_SYS_PARAM_H */
+# endif /* no _SC_PAGESIZE */
+
+#endif /* no HAVE_GETPAGESIZE */
+
+int
+main ()
+{
+  char *data, *data2, *data3;
+  int i, pagesize;
+  int fd;
+
+  pagesize = getpagesize ();
+
+  /* First, make a file with some known garbage in it. */
+  data = (char *) malloc (pagesize);
+  if (!data)
+    return 1;
+  for (i = 0; i < pagesize; ++i)
+    *(data + i) = rand ();
+  umask (0);
+  fd = creat ("conftest.mmap", 0600);
+  if (fd < 0)
+    return 1;
+  if (write (fd, data, pagesize) != pagesize)
+    return 1;
+  close (fd);
+
+  /* Next, try to mmap the file at a fixed address which already has
+     something else allocated at it.  If we can, also make sure that
+     we see the same garbage.  */
+  fd = open ("conftest.mmap", O_RDWR);
+  if (fd < 0)
+    return 1;
+  data2 = (char *) malloc (2 * pagesize);
+  if (!data2)
+    return 1;
+  data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
+  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
+		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
+    return 1;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data + i) != *(data2 + i))
+      return 1;
+
+  /* Finally, make sure that changes to the mapped area do not
+     percolate back to the file as seen by read().  (This is a bug on
+     some variants of i386 svr4.0.)  */
+  for (i = 0; i < pagesize; ++i)
+    *(data2 + i) = *(data2 + i) + 1;
+  data3 = (char *) malloc (pagesize);
+  if (!data3)
+    return 1;
+  if (read (fd, data3, pagesize) != pagesize)
+    return 1;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data + i) != *(data3 + i))
+      return 1;
+  close (fd);
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_mmap_fixed_mapped=yes
+else
+  ac_cv_func_mmap_fixed_mapped=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
+$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
+if test $ac_cv_func_mmap_fixed_mapped = yes; then
+
+$as_echo "#define HAVE_MMAP 1" >>confdefs.h
+
+fi
+rm -f conftest.mmap
+
+for ac_func in madvise mprotect
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+case ${want_mmap}+${ac_cv_func_mmap_fixed_mapped} in
+  true+yes )
+$as_echo "#define USE_MMAP 1" >>confdefs.h
+ ;;
+esac
+
+rm -f doc/config.status
+####AC_CONFIG_FILES([Makefile doc/Makefile bfd-in3.h:bfd-in2.h po/Makefile.in:po/Make-in])
+ac_config_files="$ac_config_files Makefile doc/Makefile bfd-in3.h:bfd-in2.h"
+
+
+####dnl We need this duplication, even though we use AM_PO_SUBDIRS, because of
+####dnl our two separate POTFILES.  Yuck.
+####AC_CONFIG_COMMANDS([default],
+####[[
+####case "$srcdir" in
+####  .) srcdirpre= ;;
+####  *) srcdirpre='$(srcdir)/' ;;
+####esac
+####POFILES=
+####GMOFILES=
+####for lang in dummy $OBSOLETE_ALL_LINGUAS; do
+####  if test $lang != dummy; then
+####    POFILES="$POFILES $srcdirpre$lang.po"
+####    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+####  fi
+####done
+####sed -e '/SRC-POTFILES =/r po/SRC-POTFILES' \
+####    -e '/BLD-POTFILES =/r po/BLD-POTFILES' \
+####    -e "s,@POFILES@,$POFILES," \
+####    -e "s,@GMOFILES@,$GMOFILES," \
+####    po/Makefile.in > po/Makefile]],[[]])
+
+
+
+
+
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    test "x$cache_file" != "x/dev/null" &&
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+    cat confcache >$cache_file
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
+if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then
+  as_fn_error "conditional \"PLUGINS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GENINSRC_NEVER_TRUE}" && test -z "${GENINSRC_NEVER_FALSE}"; then
+  as_fn_error "conditional \"GENINSRC_NEVER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${INSTALL_LIBBFD_TRUE}" && test -z "${INSTALL_LIBBFD_FALSE}"; then
+  as_fn_error "conditional \"INSTALL_LIBBFD\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+: ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by $as_me, which was
+generated by GNU Autoconf 2.64.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to the package provider."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_version="\\
+config.status
+configured by $0, generated by GNU Autoconf 2.64,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright (C) 2009 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in SHELL \
+ECHO \
+SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+OBJDUMP \
+deplibs_check_method \
+file_magic_cmd \
+AR \
+AR_FLAGS \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_wl \
+lt_prog_compiler_pic \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_flag_spec_ld \
+hardcode_libdir_separator \
+fix_srcfile_path \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+install_override_mode \
+finish_eval \
+old_striplib \
+striplib; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+sys_lib_dlsearch_path_spec; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+ac_aux_dir='$ac_aux_dir'
+xsi_shell='$xsi_shell'
+lt_shell_append='$lt_shell_append'
+
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'
+
+
+
+# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+    # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
+    # from automake.
+    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+    # Capture the value of LINGUAS because we need it to compute CATALOGS.
+    LINGUAS="${LINGUAS-%UNSET%}"
+
+
+GCC="$GCC"
+CC="$CC"
+acx_cv_header_stdint="$acx_cv_header_stdint"
+acx_cv_type_int8_t="$acx_cv_type_int8_t"
+acx_cv_type_int16_t="$acx_cv_type_int16_t"
+acx_cv_type_int32_t="$acx_cv_type_int32_t"
+acx_cv_type_int64_t="$acx_cv_type_int64_t"
+acx_cv_type_intptr_t="$acx_cv_type_intptr_t"
+ac_cv_type_uintmax_t="$ac_cv_type_uintmax_t"
+ac_cv_type_uintptr_t="$ac_cv_type_uintptr_t"
+ac_cv_type_uint64_t="$ac_cv_type_uint64_t"
+ac_cv_type_u_int64_t="$ac_cv_type_u_int64_t"
+ac_cv_type_u_int32_t="$ac_cv_type_u_int32_t"
+ac_cv_type_int_least32_t="$ac_cv_type_int_least32_t"
+ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t"
+ac_cv_sizeof_void_p="$ac_cv_sizeof_void_p"
+
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
+    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+    "bfd_stdint.h") CONFIG_COMMANDS="$CONFIG_COMMANDS bfd_stdint.h" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+    "bfd-in3.h") CONFIG_FILES="$CONFIG_FILES bfd-in3.h:bfd-in2.h" ;;
+
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp=
+  trap 'exit_status=$?
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&2;}
+
+  rm -f "$tmp/stdin"
+  case $ac_file in
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error "could not create -" "$LINENO" 5
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+ ;;
+    "libtool":C)
+
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags=""
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# An object symbol dumper.
+OBJDUMP=$lt_OBJDUMP
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking.  This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  case $xsi_shell in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result="${1##*/}"
+}
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+  func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+  # positional parameters, so assign one to ordinary parameter first.
+  func_stripname_result=${3}
+  func_stripname_result=${func_stripname_result#"${1}"}
+  func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=${1%%=*}
+  func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  case ${1} in
+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+    *)    func_lo2o_result=${1} ;;
+  esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=$(( $* ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=${#1}
+}
+
+_LT_EOF
+    ;;
+  *) # Bourne compatible functions.
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+}
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+  case ${2} in
+    .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+    *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+}
+
+# sed scripts:
+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[^=]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
+  func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=`expr "$@"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
+esac
+
+case $lt_shell_append in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$1+=\$2"
+}
+_LT_EOF
+    ;;
+  *)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$1=\$$1\$2"
+}
+
+_LT_EOF
+    ;;
+  esac
+
+
+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+ ;;
+    "default-1":C)
+    for ac_file in $CONFIG_FILES; do
+      # Support "outfile[:infile[:infile...]]"
+      case "$ac_file" in
+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+      esac
+      # PO directories have a Makefile.in generated from Makefile.in.in.
+      case "$ac_file" in */Makefile.in)
+        # Adjust a relative srcdir.
+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+        # In autoconf-2.13 it is called $ac_given_srcdir.
+        # In autoconf-2.50 it is called $srcdir.
+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+        case "$ac_given_srcdir" in
+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+          /*) top_srcdir="$ac_given_srcdir" ;;
+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+        esac
+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+          rm -f "$ac_dir/POTFILES"
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          POMAKEFILEDEPS="POTFILES.in"
+          # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
+          # on $ac_dir but don't depend on user-specified configuration
+          # parameters.
+          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+            # The LINGUAS file contains the set of available languages.
+            if test -n "$OBSOLETE_ALL_LINGUAS"; then
+              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+            fi
+            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assigment from automake.
+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+          else
+            # The set of available languages was given in configure.in.
+            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+          fi
+          case "$ac_given_srcdir" in
+            .) srcdirpre= ;;
+            *) srcdirpre='$(srcdir)/' ;;
+          esac
+          POFILES=
+          GMOFILES=
+          UPDATEPOFILES=
+          DUMMYPOFILES=
+          for lang in $ALL_LINGUAS; do
+            POFILES="$POFILES $srcdirpre$lang.po"
+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+          done
+          # CATALOGS depends on both $ac_dir and the user's LINGUAS
+          # environment variable.
+          INST_LINGUAS=
+          if test -n "$ALL_LINGUAS"; then
+            for presentlang in $ALL_LINGUAS; do
+              useit=no
+              if test "%UNSET%" != "$LINGUAS"; then
+                desiredlanguages="$LINGUAS"
+              else
+                desiredlanguages="$ALL_LINGUAS"
+              fi
+              for desiredlang in $desiredlanguages; do
+                # Use the presentlang catalog if desiredlang is
+                #   a. equal to presentlang, or
+                #   b. a variant of presentlang (because in this case,
+                #      presentlang can be used as a fallback for messages
+                #      which are not translated in the desiredlang catalog).
+                case "$desiredlang" in
+                  "$presentlang"*) useit=yes;;
+                esac
+              done
+              if test $useit = yes; then
+                INST_LINGUAS="$INST_LINGUAS $presentlang"
+              fi
+            done
+          fi
+          CATALOGS=
+          if test -n "$INST_LINGUAS"; then
+            for lang in $INST_LINGUAS; do
+              CATALOGS="$CATALOGS $lang.gmo"
+            done
+          fi
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+            if test -f "$f"; then
+              case "$f" in
+                *.orig | *.bak | *~) ;;
+                *) cat "$f" >> "$ac_dir/Makefile" ;;
+              esac
+            fi
+          done
+        fi
+        ;;
+      esac
+    done ;;
+    "bfd_stdint.h":C)
+if test "$GCC" = yes; then
+  echo "/* generated for " `$CC --version | sed 1q` "*/" > tmp-stdint.h
+else
+  echo "/* generated for $CC */" > tmp-stdint.h
+fi
+
+sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+  #ifndef GCC_GENERATED_STDINT_H
+  #define GCC_GENERATED_STDINT_H 1
+
+  #include <sys/types.h>
+EOF
+
+if test "$acx_cv_header_stdint" != stdint.h; then
+  echo "#include <stddef.h>" >> tmp-stdint.h
+fi
+if test "$acx_cv_header_stdint" != stddef.h; then
+  echo "#include <$acx_cv_header_stdint>" >> tmp-stdint.h
+fi
+
+sed 's/^ *//' >> tmp-stdint.h <<EOF
+  /* glibc uses these symbols as guards to prevent redefinitions.  */
+  #ifdef __int8_t_defined
+  #define _INT8_T
+  #define _INT16_T
+  #define _INT32_T
+  #endif
+  #ifdef __uint32_t_defined
+  #define _UINT32_T
+  #endif
+
+EOF
+
+# ----------------- done header, emit basic int types -------------
+if test "$acx_cv_header_stdint" = stddef.h; then
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    #ifndef _UINT8_T
+    #define _UINT8_T
+    #ifndef __uint8_t_defined
+    #define __uint8_t_defined
+    #ifndef uint8_t
+    typedef unsigned $acx_cv_type_int8_t uint8_t;
+    #endif
+    #endif
+    #endif
+
+    #ifndef _UINT16_T
+    #define _UINT16_T
+    #ifndef __uint16_t_defined
+    #define __uint16_t_defined
+    #ifndef uint16_t
+    typedef unsigned $acx_cv_type_int16_t uint16_t;
+    #endif
+    #endif
+    #endif
+
+    #ifndef _UINT32_T
+    #define _UINT32_T
+    #ifndef __uint32_t_defined
+    #define __uint32_t_defined
+    #ifndef uint32_t
+    typedef unsigned $acx_cv_type_int32_t uint32_t;
+    #endif
+    #endif
+    #endif
+
+    #ifndef _INT8_T
+    #define _INT8_T
+    #ifndef __int8_t_defined
+    #define __int8_t_defined
+    #ifndef int8_t
+    typedef $acx_cv_type_int8_t int8_t;
+    #endif
+    #endif
+    #endif
+
+    #ifndef _INT16_T
+    #define _INT16_T
+    #ifndef __int16_t_defined
+    #define __int16_t_defined
+    #ifndef int16_t
+    typedef $acx_cv_type_int16_t int16_t;
+    #endif
+    #endif
+    #endif
+
+    #ifndef _INT32_T
+    #define _INT32_T
+    #ifndef __int32_t_defined
+    #define __int32_t_defined
+    #ifndef int32_t
+    typedef $acx_cv_type_int32_t int32_t;
+    #endif
+    #endif
+    #endif
+EOF
+elif test "$ac_cv_type_u_int32_t" = yes; then
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    /* int8_t int16_t int32_t defined by inet code, we do the u_intXX types */
+    #ifndef _INT8_T
+    #define _INT8_T
+    #endif
+    #ifndef _INT16_T
+    #define _INT16_T
+    #endif
+    #ifndef _INT32_T
+    #define _INT32_T
+    #endif
+
+    #ifndef _UINT8_T
+    #define _UINT8_T
+    #ifndef __uint8_t_defined
+    #define __uint8_t_defined
+    #ifndef uint8_t
+    typedef u_int8_t uint8_t;
+    #endif
+    #endif
+    #endif
+
+    #ifndef _UINT16_T
+    #define _UINT16_T
+    #ifndef __uint16_t_defined
+    #define __uint16_t_defined
+    #ifndef uint16_t
+    typedef u_int16_t uint16_t;
+    #endif
+    #endif
+    #endif
+
+    #ifndef _UINT32_T
+    #define _UINT32_T
+    #ifndef __uint32_t_defined
+    #define __uint32_t_defined
+    #ifndef uint32_t
+    typedef u_int32_t uint32_t;
+    #endif
+    #endif
+    #endif
+EOF
+else
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    /* Some systems have guard macros to prevent redefinitions, define them.  */
+    #ifndef _INT8_T
+    #define _INT8_T
+    #endif
+    #ifndef _INT16_T
+    #define _INT16_T
+    #endif
+    #ifndef _INT32_T
+    #define _INT32_T
+    #endif
+    #ifndef _UINT8_T
+    #define _UINT8_T
+    #endif
+    #ifndef _UINT16_T
+    #define _UINT16_T
+    #endif
+    #ifndef _UINT32_T
+    #define _UINT32_T
+    #endif
+EOF
+fi
+
+# ------------- done basic int types, emit int64_t types ------------
+if test "$ac_cv_type_uint64_t" = yes; then
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    /* system headers have good uint64_t and int64_t */
+    #ifndef _INT64_T
+    #define _INT64_T
+    #endif
+    #ifndef _UINT64_T
+    #define _UINT64_T
+    #endif
+EOF
+elif test "$ac_cv_type_u_int64_t" = yes; then
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    /* system headers have an u_int64_t (and int64_t) */
+    #ifndef _INT64_T
+    #define _INT64_T
+    #endif
+    #ifndef _UINT64_T
+    #define _UINT64_T
+    #ifndef __uint64_t_defined
+    #define __uint64_t_defined
+    #ifndef uint64_t
+    typedef u_int64_t uint64_t;
+    #endif
+    #endif
+    #endif
+EOF
+elif test -n "$acx_cv_type_int64_t"; then
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    /* architecture has a 64-bit type, $acx_cv_type_int64_t */
+    #ifndef _INT64_T
+    #define _INT64_T
+    #ifndef int64_t
+    typedef $acx_cv_type_int64_t int64_t;
+    #endif
+    #endif
+    #ifndef _UINT64_T
+    #define _UINT64_T
+    #ifndef __uint64_t_defined
+    #define __uint64_t_defined
+    #ifndef uint64_t
+    typedef unsigned $acx_cv_type_int64_t uint64_t;
+    #endif
+    #endif
+    #endif
+EOF
+else
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    /* some common heuristics for int64_t, using compiler-specific tests */
+    #if defined __STDC_VERSION__ && (__STDC_VERSION__-0) >= 199901L
+    #ifndef _INT64_T
+    #define _INT64_T
+    #ifndef __int64_t_defined
+    #ifndef int64_t
+    typedef long long int64_t;
+    #endif
+    #endif
+    #endif
+    #ifndef _UINT64_T
+    #define _UINT64_T
+    #ifndef uint64_t
+    typedef unsigned long long uint64_t;
+    #endif
+    #endif
+
+    #elif defined __GNUC__ && defined (__STDC__) && __STDC__-0
+    /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
+       does not implement __extension__.  But that compiler doesn't define
+       __GNUC_MINOR__.  */
+    # if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__)
+    # define __extension__
+    # endif
+
+    # ifndef _INT64_T
+    # define _INT64_T
+    # ifndef int64_t
+    __extension__ typedef long long int64_t;
+    # endif
+    # endif
+    # ifndef _UINT64_T
+    # define _UINT64_T
+    # ifndef uint64_t
+    __extension__ typedef unsigned long long uint64_t;
+    # endif
+    # endif
+
+    #elif !defined __STRICT_ANSI__
+    # if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
+
+    #  ifndef _INT64_T
+    #  define _INT64_T
+    #  ifndef int64_t
+    typedef __int64 int64_t;
+    #  endif
+    #  endif
+    #  ifndef _UINT64_T
+    #  define _UINT64_T
+    #  ifndef uint64_t
+    typedef unsigned __int64 uint64_t;
+    #  endif
+    #  endif
+    # endif /* compiler */
+
+    #endif /* ANSI version */
+EOF
+fi
+
+# ------------- done int64_t types, emit intptr types ------------
+if test "$ac_cv_type_uintptr_t" != yes; then
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    /* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */
+    #ifndef __uintptr_t_defined
+    #ifndef uintptr_t
+    typedef u$acx_cv_type_intptr_t uintptr_t;
+    #endif
+    #endif
+    #ifndef __intptr_t_defined
+    #ifndef intptr_t
+    typedef $acx_cv_type_intptr_t  intptr_t;
+    #endif
+    #endif
+EOF
+fi
+
+# ------------- done intptr types, emit int_least types ------------
+if test "$ac_cv_type_int_least32_t" != yes; then
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    /* Define int_least types */
+    typedef int8_t     int_least8_t;
+    typedef int16_t    int_least16_t;
+    typedef int32_t    int_least32_t;
+    #ifdef _INT64_T
+    typedef int64_t    int_least64_t;
+    #endif
+
+    typedef uint8_t    uint_least8_t;
+    typedef uint16_t   uint_least16_t;
+    typedef uint32_t   uint_least32_t;
+    #ifdef _UINT64_T
+    typedef uint64_t   uint_least64_t;
+    #endif
+EOF
+fi
+
+# ------------- done intptr types, emit int_fast types ------------
+if test "$ac_cv_type_int_fast32_t" != yes; then
+      sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    /* Define int_fast types.  short is often slow */
+    typedef int8_t       int_fast8_t;
+    typedef int          int_fast16_t;
+    typedef int32_t      int_fast32_t;
+    #ifdef _INT64_T
+    typedef int64_t      int_fast64_t;
+    #endif
+
+    typedef uint8_t      uint_fast8_t;
+    typedef unsigned int uint_fast16_t;
+    typedef uint32_t     uint_fast32_t;
+    #ifdef _UINT64_T
+    typedef uint64_t     uint_fast64_t;
+    #endif
+EOF
+fi
+
+if test "$ac_cv_type_uintmax_t" != yes; then
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    /* Define intmax based on what we found */
+    #ifndef intmax_t
+    #ifdef _INT64_T
+    typedef int64_t       intmax_t;
+    #else
+    typedef long          intmax_t;
+    #endif
+    #endif
+    #ifndef uintmax_t
+    #ifdef _UINT64_T
+    typedef uint64_t      uintmax_t;
+    #else
+    typedef unsigned long uintmax_t;
+    #endif
+    #endif
+EOF
+fi
+
+sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+  #endif /* GCC_GENERATED_STDINT_H */
+EOF
+
+if test -r bfd_stdint.h && cmp -s tmp-stdint.h bfd_stdint.h; then
+  rm -f tmp-stdint.h
+else
+  mv -f tmp-stdint.h bfd_stdint.h
+fi
+
+ ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit $?
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/configure.com sdcc-3.2.0+dfsg/support/sdbinutils/bfd/configure.com
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/configure.com	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/configure.com	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,414 @@
+$!
+$! This file configures the bfd library for use with openVMS.
+$!
+$! We do not use the configure script, since we do not have /bin/sh
+$! to execute it.
+$!
+$! Written by Klaus K"ampf (kkaempf@rmi.de)
+$! Rewritten by Tristan Gingold (gingold@adacore.com)
+$!
+$ arch=F$GETSYI("ARCH_NAME")
+$ arch=F$EDIT(arch,"LOWERCASE")
+$if arch .eqs. "alpha" then target = "alpha"
+$if arch .eqs. "ia64" then target = "ia64"
+$!
+$if (arch .eqs. "alpha") .or. (arch .eqs. "ia64")
+$then
+$!
+$ write sys$output "Configuring BFD for ''target' target"
+$!
+$!
+$! copy bfd-in2.h to bfd.h, replacing @ macros
+$!
+$ edit/tpu/nojournal/nosection/nodisplay/command=sys$input -
+        []bfd-in2.h /output=[]bfd.h
+$DECK
+!
+!  Copy file, changing lines with macros (@@)
+!
+!
+   set (success,off);
+   vfile := CREATE_BUFFER("vfile", "CONFIGURE.IN");
+   rang := CREATE_RANGE(BEGINNING_OF(vfile), END_OF(vfile));
+   match_pos := SEARCH_QUIETLY('AM_INIT_AUTOMAKE(bfd, ', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+     POSITION(BEGINNING_OF(match_pos));
+     ERASE(match_pos);
+     vers := CURRENT_LINE-")";
+   ELSE;
+     vers := "unknown";
+   ENDIF;
+
+   file := CREATE_BUFFER("file", GET_INFO(COMMAND_LINE, "file_name"));
+   rang := CREATE_RANGE(BEGINNING_OF(file), END_OF(file));
+
+   match_pos := SEARCH_QUIETLY('@VERSION@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT(vers);
+   ENDIF;
+   match_pos := SEARCH_QUIETLY('@wordsize@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT('64');
+   ENDIF;
+   match_pos := SEARCH_QUIETLY('@bfd_default_target_size@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT('64');
+   ENDIF;
+   match_pos := SEARCH_QUIETLY('@BFD_HOST_64BIT_LONG@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT('0');
+   ENDIF;
+   match_pos := SEARCH_QUIETLY('@BFD_HOST_LONG_LONG@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT('1');
+   ENDIF;
+   match_pos := SEARCH_QUIETLY('@BFD_HOST_64BIT_LONG_LONG@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT('1');
+   ENDIF;
+   match_pos := SEARCH_QUIETLY('@BFD_HOST_64_BIT_DEFINED@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT('__DECC');
+      SPLIT_LINE;
+      COPY_TEXT('#include <ints.h>');
+   ENDIF;
+   match_pos := SEARCH_QUIETLY('@BFD_HOST_64_BIT@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT('int64');
+   ENDIF;
+   match_pos := SEARCH_QUIETLY('@BFD_HOST_U_64_BIT@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT('uint64');
+   ENDIF;
+   match_pos := SEARCH_QUIETLY('@BFD_HOSTPTR_T@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT('uint64');
+   ENDIF;
+   match_pos := SEARCH_QUIETLY('@bfd_file_ptr@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT('bfd_signed_vma');
+   ENDIF;
+   match_pos := SEARCH_QUIETLY('unsigned @bfd_file_ptr@ ufile_ptr', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT('bfd_vma ufile_ptr');
+   ENDIF;
+   match_pos := SEARCH_QUIETLY('@supports_plugins@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT('0');
+   ENDIF;
+   WRITE_FILE(file, GET_INFO(COMMAND_LINE, "output_file"));
+   QUIT
+$  EOD
+$
+$else
+$
+$ write sys$output "Configuring for Vax target"
+$ target = "vax"
+$!
+$! copy bfd-in2.h to bfd.h, replacing @ macros
+$!
+$ write sys$output "Generated `bfd.h' from `bfd-in2.h'."
+$ edit/tpu/nojournal/nosection/nodisplay/command=sys$input -
+        []bfd-in2.h /output=[]bfd.h
+$DECK
+!
+!  Copy file, changing lines with macros (@@)
+!
+!
+   set (success,off);
+   vfile := CREATE_BUFFER("vfile", "CONFIGURE.IN");
+   rang := CREATE_RANGE(BEGINNING_OF(vfile), END_OF(vfile));
+   match_pos := SEARCH_QUIETLY('AM_INIT_AUTOMAKE(bfd, ', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+     POSITION(BEGINNING_OF(match_pos));
+     ERASE(match_pos);
+     vers := CURRENT_LINE-")";
+   ELSE;
+     vers := "unknown";
+   ENDIF;
+
+   file := CREATE_BUFFER("file", GET_INFO(COMMAND_LINE, "file_name"));
+   rang := CREATE_RANGE(BEGINNING_OF(file), END_OF(file));
+
+   match_pos := SEARCH_QUIETLY('@VERSION@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT(vers);
+   ENDIF;
+   match_pos := SEARCH_QUIETLY('@wordsize@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT('32');
+   ENDIF;
+   match_pos := SEARCH_QUIETLY('@BFD_HOST_64BIT_LONG@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT('0');
+   ENDIF;
+   match_pos := SEARCH_QUIETLY('@BFD_HOST_64_BIT_DEFINED@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT('__DECC');
+      SPLIT_LINE;
+      COPY_TEXT('#include <ints.h>');
+   ENDIF;
+   match_pos := SEARCH_QUIETLY('@BFD_HOST_64_BIT@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT('int64');
+   ENDIF;
+   match_pos := SEARCH_QUIETLY('@BFD_HOST_U_64_BIT@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT('uint64');
+   ENDIF;
+   WRITE_FILE(file, GET_INFO(COMMAND_LINE, "output_file"));
+   QUIT
+$  EOD
+$endif
+$
+$!
+$! create bfdver.h
+$!
+$ write sys$output "Generate `bfdver.h' from 'version.h' and `configure.in'."
+$ edit/tpu/nojournal/nosection/nodisplay/command=sys$input -
+        []version.h /output=[]bfdver.h
+$DECK
+!
+!  Copy file, changing lines with macros (@@)
+!
+!
+   set (success,off);
+   vfile := CREATE_BUFFER("vfile", "configure.in");
+   rang := CREATE_RANGE(BEGINNING_OF(vfile), END_OF(vfile));
+   match_pos := SEARCH_QUIETLY('AM_INIT_AUTOMAKE(bfd, ', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+     POSITION(BEGINNING_OF(match_pos));
+     ERASE(match_pos);
+     vers := CURRENT_LINE-")";
+   ELSE;
+     vers := "unknown";
+   ENDIF;
+   versnum := vers - "." - ".";
+
+   file := CREATE_BUFFER("file", GET_INFO(COMMAND_LINE, "file_name"));
+   rang := CREATE_RANGE(BEGINNING_OF(file), END_OF(file));
+
+   match_pos := SEARCH_QUIETLY('@bfd_version@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT(versnum);
+   ENDIF;
+   match_pos := SEARCH_QUIETLY('@bfd_version_string@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT('"');
+      COPY_TEXT(vers);
+      COPY_TEXT('"');
+   ENDIF;
+   match_pos := SEARCH_QUIETLY('@bfd_version_package@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT('"(GNU Binutils) "');
+   ENDIF;
+   match_pos := SEARCH_QUIETLY('@report_bugs_to@', FORWARD, EXACT, rang);
+   IF match_pos <> 0 THEN;
+      POSITION(BEGINNING_OF(match_pos));
+      ERASE(match_pos);
+      COPY_TEXT('"<http://www.sourceware.org/bugzilla/>"');
+   ENDIF;
+   WRITE_FILE(file, GET_INFO(COMMAND_LINE, "output_file"));
+   QUIT
+$  EOD
+$!
+$!
+$! create bfd_stdint.h
+$!
+$ write sys$output "Generate `bfd_stdint.h'"
+$ create []bfd_stdint.h
+#include <inttypes.h>
+$!
+$!
+$! create targmatch.h
+$!
+$ write sys$output "Generate `targmatch.h'"
+$ open/write tfile []targmatch.h
+$ write tfile "{ """ + target + "-*-*vms*""" + ","
+$ write tfile "#if defined (SELECT_VECS)"
+$ write tfile "SELECT_VECS"
+$ write tfile "#else"
+$ write tfile "UNSUPPORTED_TARGET"
+$ write tfile "#endif"
+$ write tfile "},"
+$ close tfile
+$!
+$!
+$! create config.h
+$!
+$ write sys$output "Generate `config.h'"
+$ create []config.h
+/* config.h-vms.  Generated by hand by Klaus K�mpf, kkaempf@didymus.rmi.de.  */
+/* config.in.  Generated automatically from configure.in by autoheader.  */
+/* Whether malloc must be declared even if <stdlib.h> is included.  */
+/* #undef NEED_DECLARATION_MALLOC */
+/* Whether free must be declared even if <stdlib.h> is included.  */
+/* #undef NEED_DECLARATION_FREE */
+/* Define if you have a working `mmap' system call.  */
+/* #define HAVE_MMAP 1 */
+/* Do we need to use the b modifier when opening binary files?  */
+/* #undef USE_BINARY_FOPEN */
+/* Name of host specific header file to include in trad-core.c.  */
+/* #undef TRAD_HEADER */
+/* Define only if <sys/procfs.h> is available *and* it defines prstatus_t.  */
+/* #undef HAVE_SYS_PROCFS_H */
+/* Do we really want to use mmap if it's available?  */
+/* #undef USE_MMAP */
+/* Define if you have the fcntl function.  */
+#define HAVE_FCNTL 1
+/* Define if you have the getpagesize function.  */
+#define HAVE_GETPAGESIZE 1
+/* Define if you have the madvise function.  */
+#define HAVE_MADVISE 1
+/* Define if you have the mprotect function.  */
+#define HAVE_MPROTECT 1
+/* Define if you have the <fcntl.h> header file.  */
+#define HAVE_FCNTL_H 1
+/* Define if you have the <stddef.h> header file.  */
+#define HAVE_STDDEF_H 1
+/* Define if you have the <stdlib.h> header file.  */
+#define HAVE_STDLIB_H 1
+/* Define if you have the <string.h> header file.  */
+#define HAVE_STRING_H 1
+/* Define if you have the <strings.h> header file.  */
+#define HAVE_STRINGS_H 1
+/* Define if you have the <sys/file.h> header file.  */
+#define HAVE_SYS_FILE_H 1
+/* Define if you have the <time.h> header file.  */
+#define HAVE_TIME_H 1
+/* Define if you have the <unistd.h> header file.  */
+#define HAVE_UNISTD_H 1
+/* Disable NLS  */
+#undef ENABLE_NLS
+$!
+$ write sys$output "Copy sysdep.h"
+$ copy [.hosts]alphavms.h sysdep.h
+$
+$ write sys$output "Generate build.com"
+$!
+$ if ARCH.eqs."alpha"
+$ then
+$   create build.com
+$DECK
+$ DEFS="""SELECT_VECS=&vms_alpha_vec"","+-
+  """SELECT_ARCHITECTURES=&bfd_alpha_arch"""
+$ FILES="cpu-alpha,vms,vms-hdr,vms-gsd,vms-tir,vms-misc,"
+$EOD
+$ endif
+$ if ARCH.eqs."ia64"
+$ then
+$   create build.com
+$DECK
+$ DEFS="""SELECT_VECS=&bfd_elf64_ia64_vms_vec"","+-
+  """SELECT_ARCHITECTURES=&bfd_ia64_arch"""
+$ FILES="cpu-ia64,elf64-ia64,elf-strtab,corefile,stabs,merge,elf-eh-frame,"+-
+  "elflink,elf-attrs,dwarf1,elf64,"
+$EOD
+$ create substxx.tpu
+$DECK
+   set (success,off);
+   file := CREATE_BUFFER("file", GET_INFO(COMMAND_LINE, "file_name"));
+   found_range := CREATE_RANGE(BEGINNING_OF(file), BEGINNING_OF(file));
+
+   LOOP
+     rang := CREATE_RANGE (END_OF(found_range),END_OF(file));
+     match_pos := SEARCH_QUIETLY('NN', FORWARD, EXACT, rang);
+     EXITIF match_pos = 0;
+     POSITION(BEGINNING_OF(match_pos));
+     ERASE(match_pos);
+     COPY_TEXT('64');
+   ENDLOOP;
+   WRITE_FILE(file, GET_INFO(COMMAND_LINE, "output_file"));
+   QUIT
+$  EOD
+$ write sys$output "Generate elf64-ia64.c from elfxx-ia64.c"
+$ edit/tpu/nojournal/nosection/nodisplay/command=substxx.tpu -
+        []elfXX-ia64.c /output=[]elf64-ia64.c
+$ write sys$output "Generate elf64-target.h from elfxx-target.h"
+$ edit/tpu/nojournal/nosection/nodisplay/command=substxx.tpu -
+        []elfXX-target.h /output=[]elf64-target.h
+$ del substxx.tpu;*
+$ endif
+$ append sys$input build.com
+$DECK
+$ DEFS=DEFS + ",""unlink=remove"",""DEBUGDIR=""""GNU$DEBUGDIR:"""""""
+$ OPT="/noopt/debug"
+$ CFLAGS="/name=(as_is,shortened)" + -
+  "/include=([],""../"",""../include"")" + -
+  "/define=(" + DEFS + ")" + OPT
+$ FILES=FILES + "archive,archive64,archures,bfd,bfdio,binary,cache,coffgen,"+-
+  "compress,corefile,dwarf2,elf,format,hash,ihex,init,libbfd,linker,"+-
+  "opncls,reloc,section,simple,srec,stab-syms,syms,targets,tekhex,verilog"
+$ write sys$output "CFLAGS=",CFLAGS
+$ cflags_libbfd="/warning=(disable=missingreturn)"
+$ cflags_nil=""
+$ NUM = 0
+$ OBJS=""
+$ LOOP:
+$   F = F$ELEMENT(NUM,",",FILES)
+$   IF F.EQS."," THEN GOTO END
+$   eflags_name="cflags_''f'"
+$   name_len=f$length(eflags_name)
+$   dash_pos=f$locate("-",eflags_name)
+$   if dash_pos.ne.name_len
+$   then
+$     eflags_name['dash_pos,1]:="_"
+$     dash_pos=f$locate("-",eflags_name)
+$     if dash_pos.ne.name_len then eflags_name['dash_pos,1]:="_"
+$   endif
+$   if f$type('eflags_name).eqs."" then eflags_name="cflags_nil"
+$   eflags='eflags_name
+$   write sys$output "Compiling ", F, ".c", eflags
+$   cc 'CFLAGS 'eflags 'F.c
+$   IF OBJS.NES."" THEN OBJS=OBJS + ","
+$   OBJS=OBJS + F + ".obj"
+$   NUM = NUM + 1
+$   GOTO LOOP
+$ END:
+$ purge
+$ lib/create libbfd 'OBJS
+$EOD
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/configure.host sdcc-3.2.0+dfsg/support/sdbinutils/bfd/configure.host
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/configure.host	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/configure.host	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,85 @@
+# This file is a shell script that overrides some of the tools and
+# flags used on a host specific basis.
+
+# Since the "bfd/hosts" directory is shared by the bfd, opcodes, and
+# binutils directories (at least), the index to it is also shared.
+# This is that index.  Each configure.in file should source this file
+# in its per-host part.
+
+# This sets the following shell variables:
+#  HDEFINES		host specific compiler options
+#  host64		set to true if 64 bit types are as fast as 32 bit
+#  HOST_64BIT_TYPE	host 64 bit type
+#  HOST_U_64BIT_TYPE	unsigned 64 bit type (not needed if 64BIT_TYPE is long)
+
+HDEFINES=
+host64=false
+HOST_64BIT_TYPE=
+HOST_U_64BIT_TYPE=
+
+case "${host}" in
+
+hppa*64*-*-hpux*)	# HP/UX's ftello64 et.al. declarations are only
+			# visible when _LARGEFILE64_SOURCE is defined.
+			# Without those declarations, real_ftell et.al.
+			# get mis-compiled.
+			HDEFINES="-DHOST_HPPAHPUX -D_LARGEFILE64_SOURCE"
+			host64=true;;
+hppa*-*-hpux*)		HDEFINES="-DHOST_HPPAHPUX -D_LARGEFILE64_SOURCE" ;;
+hppa*-*-hiux*)		HDEFINES=-DHOST_HPPAHPUX ;;
+hppa*-*-mpeix*)		HDEFINES=-DHOST_HPPAMPEIX ;;
+hppa*-*-bsd*)		HDEFINES=-DHOST_HPPABSD ;;
+hppa*-*-osf*)		HDEFINES=-DHOST_HPPAOSF ;;
+
+ia64-*-hpux*)		HDEFINES=-D_LARGEFILE64_SOURCE
+			host64=true;;
+ia64-*-*)		host64=true;;
+
+# Workaround for limitations on win9x where file contents are
+# not zero'd out if you seek past the end and then write.
+i[3-7]86-*-mingw32*)	HDEFINES=-D__USE_MINGW_FSEEK;;
+
+i[3-7]86-sequent-bsd*)	HDEFINES=-Dshared=genshared ;;
+i[3-7]86-sequent-sysv4*) ;;
+i[3-7]86-sequent-sysv*)	HDEFINES=-Dshared=genshared ;;
+
+mips*-*-netbsd*)	;;
+mips*-*-openbsd*)	;;
+mips*-dec-*)		HDEFINES="-G 4"	;;
+mips*-sgi-irix3*)	HDEFINES="-G 4" ;;
+mips*-sgi-irix4*)	HDEFINES="-G 4" ;;
+mips*-sgi-irix6*)	host64=true;;
+mips64*-*-linux*)	host64=true;;
+mips64*-*-freebsd* | mips64*-*-kfreebsd*-gnu) host64=true;;
+mips*-*-sysv4*)		;;
+mips*-*-sysv*)		HDEFINES="-G 4" ;;
+mips*-*-riscos*)	HDEFINES="-G 4" ;;
+
+m68*-hp-hpux*)		HDEFINES=-DHOST_HP300HPUX ;;
+
+# Some Solaris systems (osol0906 at least) have a libc that doesn't recognise
+# the "MS-ANSI" code page name, so we define an override for CP_ACP (sets the
+# default code page used by windres/windmc when not specified by a commandline
+# option) to select the "WINDOWS-1252" name instead.  See PR11280 for details.
+*-*-solaris2.11)	HDEFINES=-DCP_ACP=1 ;;
+
+*-*-windows*)
+			HOST_64BIT_TYPE=__int64
+			HOST_U_64BIT_TYPE="unsigned __int64"
+# The following krock is necessary because we can't run the build compiler
+# (MSVC) on the configure host, so we have to explicitly set the values here.
+# Note that this file is never run through autoconf, so we can't use any
+# autoconf macros here.  Because of this, we have to muck with autoconf
+# variables explicitly.
+			ac_cv_func_mmap_fixed_mapped=no
+			ac_cv_header_time=no
+			ac_cv_func_getpagesize=no
+			ac_cv_func_madvise=no
+			ac_cv_func_mprotect=no
+			ac_cv_func_getuid=no
+			ac_cv_func_getgid=no
+			ac_cv_header_sys_file_h=no
+			ac_cv_header_sys_time_h=no
+			ac_cv_header_unistd_h=no
+			;;
+esac
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/configure.in sdcc-3.2.0+dfsg/support/sdbinutils/bfd/configure.in
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/configure.in	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/configure.in	2012-03-01 21:14:28.000000000 +0000
@@ -0,0 +1,1151 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+
+AC_PREREQ(2.59)
+AC_INIT
+AC_CONFIG_SRCDIR([libbfd.c])
+
+AC_CANONICAL_TARGET
+AC_ISC_POSIX
+
+AM_INIT_AUTOMAKE(bfd, 2.22)
+
+dnl These must be called before LT_INIT, because it may want
+dnl to call AC_CHECK_PROG.
+AC_CHECK_TOOL(AR, ar)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+
+dnl Default to a non shared library.  This may be overridden by the
+dnl configure option --enable-shared.
+AC_DISABLE_SHARED
+
+AC_PROG_CC
+AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
+
+LT_INIT([dlopen])
+
+# AC_PLUGINS setting $plugins is called by ACX_LARGEFILE.
+ACX_LARGEFILE
+
+AM_CONDITIONAL(PLUGINS, test "$plugins" = "yes")
+
+if test "$plugins" = "yes"; then
+  if test "$enable_dlopen" != "yes" ; then
+    AC_MSG_ERROR([
+      Building BFD with plugin support requires a host that supports -ldl.])
+  fi
+  enable_targets="$enable_targets plugin"
+fi
+
+AC_ARG_ENABLE(64-bit-bfd,
+[  --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)],
+[case "${enableval}" in
+  yes)  want64=true  ;;
+  no)   want64=false ;;
+  *)    AC_MSG_ERROR(bad value ${enableval} for 64-bit-bfd option) ;;
+esac],[want64=false])dnl
+
+AC_ARG_ENABLE(targets,
+[  --enable-targets        alternative target configurations],
+[case "${enableval}" in
+  yes | "") AC_MSG_ERROR([enable-targets option must specify target names or 'all'])
+            ;;
+  no)       enable_targets= ;;
+  *)        enable_targets=$enableval ;;
+esac])dnl
+
+AC_ARG_WITH(mmap,
+[  --with-mmap             try using mmap for BFD input files if available],
+[case "${withval}" in
+  yes)  want_mmap=true ;;
+  no)   want_mmap=false ;;
+  *)    AC_MSG_ERROR(bad value ${withval} for BFD with-mmap option) ;;
+esac],[want_mmap=false])dnl
+
+AC_ARG_ENABLE(secureplt,
+[  --enable-secureplt      Default to creating read-only plt entries],
+[case "${enableval}" in
+  yes)  use_secureplt=true  ;;
+  no)   use_secureplt=false ;;
+  *)    AC_MSG_ERROR(bad value ${enableval} for secureplt option) ;;
+esac],[use_secureplt=false])dnl
+if test $use_secureplt = true; then
+  AC_DEFINE(USE_SECUREPLT, 1,
+    [Define if we should default to creating read-only plt entries])
+fi
+
+AC_ARG_ENABLE(leading-mingw64-underscores,
+  AS_HELP_STRING([--enable-leading-mingw64-underscores],
+                 [Enable leading underscores on 64 bit mingw targets]),
+  [],[])
+AS_IF([ test x"$enable_leading_mingw64_underscores" = xyes ],
+  [AC_DEFINE(USE_MINGW64_LEADING_UNDERSCORES, 1,
+    [Define if we should use leading underscore on 64 bit mingw targets])])
+
+DEBUGDIR=${libdir}/debug
+AC_ARG_WITH(separate-debug-dir,
+  AS_HELP_STRING([--with-separate-debug-dir=DIR],
+                 [Look for global separate debug info in DIR [[default=LIBDIR/debug]]]),
+[DEBUGDIR="${withval}"])
+AC_SUBST(DEBUGDIR)
+
+# Check to see if we should allow the generation of
+# symbols with the ELF standard's STT_COMMON type.
+AC_ARG_ENABLE(elf-stt-common,
+[  --enable-elf-stt-common Allow the generation of ELF symbols with the STT_COMMON type],
+[case "${enableval}" in
+  yes) want_elf_stt_common=true ;;
+  no)  want_elf_stt_common=false ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for ELF STT_COMMON option) ;;
+ esac],
+# We have to choose a default behaviour.  For native builds we could
+# test whether the loader supports the STT_COMMON type, but that would
+# mean that built binaries could not be exported to older systems where
+# the loader does not support it. So by default we always choose to
+# disable this feature.
+  want_elf_stt_common=false)dnl
+if test $want_elf_stt_common = true; then
+  AC_DEFINE(USE_STT_COMMON, 1,
+    [Define if we may generate symbols with ELF's STT_COMMON type])
+fi
+	 
+####ACX_PKGVERSION([GNU Binutils])
+####ACX_BUGURL([http://www.sourceware.org/bugzilla/])
+ACX_PKGVERSION([sdbinutils derived from GNU Binutils])
+ACX_BUGURL([http://sourceforge.net/tracker/?group_id=599&atid=100599])
+
+AM_BINUTILS_WARNINGS
+
+AC_CONFIG_HEADERS(config.h:config.in)
+
+if test -z "$target" ; then
+    AC_MSG_ERROR(Unrecognized target system type; please check config.sub.)
+fi
+
+AM_MAINTAINER_MODE
+AM_CONDITIONAL(GENINSRC_NEVER, false)
+AM_INSTALL_LIBBFD
+AC_EXEEXT
+
+host64=false
+target64=false
+bfd_default_target_size=32
+
+# host stuff:
+
+ALL_LINGUAS="fr tr ja es sv da zh_CN ro rw vi fi id ru"
+ZW_GNU_GETTEXT_SISTER_DIR
+AM_PO_SUBDIRS
+
+# Permit host specific settings.
+. ${srcdir}/configure.host
+
+AC_SUBST(HDEFINES)
+AC_PROG_INSTALL
+
+BFD_HOST_64BIT_LONG=0
+BFD_HOST_64BIT_LONG_LONG=0
+BFD_HOST_64_BIT_DEFINED=0
+BFD_HOST_64_BIT=
+BFD_HOST_U_64_BIT=
+BFD_HOSTPTR_T="unsigned long"
+
+AC_CHECK_SIZEOF(long long)
+AC_CHECK_SIZEOF(void *)
+AC_CHECK_SIZEOF(long)
+
+if test "x${ac_cv_sizeof_void_p}" = "x8"; then
+  host64=true
+fi
+
+if test "x${ac_cv_sizeof_long}" = "x8"; then
+  BFD_HOST_64BIT_LONG=1
+  test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"
+  test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"
+elif test "x${ac_cv_sizeof_long_long}" = "x8"; then
+  BFD_HOST_64BIT_LONG_LONG=1
+  test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long"
+  test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long"
+  if test "x${ac_cv_sizeof_void_p}" = "x8"; then
+    BFD_HOSTPTR_T="unsigned long long"
+  fi
+fi
+
+if test -n "${HOST_64BIT_TYPE}" -a -n "${HOST_U_64BIT_TYPE}"; then
+  BFD_HOST_64_BIT_DEFINED=1
+  BFD_HOST_64_BIT="${HOST_64BIT_TYPE}"
+  BFD_HOST_U_64_BIT="${HOST_U_64BIT_TYPE}"
+fi
+
+AC_SUBST(BFD_HOST_64BIT_LONG)
+AC_SUBST(BFD_HOST_64BIT_LONG_LONG)
+AC_SUBST(BFD_HOST_64_BIT_DEFINED)
+AC_SUBST(BFD_HOST_64_BIT)
+AC_SUBST(BFD_HOST_U_64_BIT)
+AC_SUBST(BFD_HOSTPTR_T)
+
+BFD_CC_FOR_BUILD
+
+AC_CHECK_HEADERS(alloca.h stddef.h string.h strings.h stdlib.h time.h unistd.h)
+AC_CHECK_HEADERS(fcntl.h sys/file.h sys/time.h sys/stat.h)
+GCC_HEADER_STDINT(bfd_stdint.h)
+AC_HEADER_TIME
+AC_HEADER_DIRENT
+ACX_HEADER_STRING
+AC_CHECK_FUNCS(fcntl getpagesize setitimer sysconf fdopen getuid getgid fileno)
+AC_CHECK_FUNCS(strtoull)
+
+AC_CHECK_DECLS(basename)
+AC_CHECK_DECLS(ftello)
+AC_CHECK_DECLS(ftello64)
+AC_CHECK_DECLS(fseeko)
+AC_CHECK_DECLS(fseeko64)
+
+BFD_BINARY_FOPEN
+
+AC_CHECK_DECLS(ffs)
+AC_CHECK_DECLS(free)
+AC_CHECK_DECLS(getenv)
+AC_CHECK_DECLS(malloc)
+AC_CHECK_DECLS(realloc)
+AC_CHECK_DECLS(stpcpy)
+AC_CHECK_DECLS(strstr)
+AC_CHECK_DECLS(snprintf)
+AC_CHECK_DECLS(vsnprintf)
+
+# Link in zlib if we can.  This allows us to read compressed debug sections.
+# This is used only by compress.c.
+AM_ZLIB
+
+# If we are configured native, pick a core file support file.
+COREFILE=
+COREFLAG=
+CORE_HEADER=
+TRAD_HEADER=
+if test "${target}" = "${host}"; then
+  case "${host}" in
+  alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu | alpha*-*-*vms*)
+	COREFILE=''
+	;;
+  alpha*-*-linux-*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/alphalinux.h"'
+	;;
+  alpha*-*-netbsd* | alpha*-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+  alpha*-*-*)
+        COREFILE=osf-core.lo
+	;;
+  arm-*-freebsd* | arm-*-kfreebsd*-gnu)
+	COREFILE='' ;;
+  arm-*-netbsd* | arm-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+  arm-*-riscix)		COREFILE=trad-core.lo ;;
+  hppa*-*-hpux*)	COREFILE=hpux-core.lo ;;
+  hppa*-*-hiux*)	COREFILE=hpux-core.lo ;;
+  hppa*-*-mpeix*)	COREFILE=hpux-core.lo ;;
+  hppa*-*-bsd*)		COREFILE="hpux-core.lo hppabsd-core.lo"
+			COREFLAG="-DHPUX_CORE -DHPPABSD_CORE" ;;
+  hppa*-*-netbsd* | hppa*-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+
+  i370-*-*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/i370linux.h"'
+	;;
+
+changequote(,)dnl
+  i[3-7]86-sequent-bsd*)
+changequote([,])dnl
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/symmetry.h"'
+	;;
+changequote(,)dnl
+  i[3-7]86-sequent-sysv4*) ;;
+  i[3-7]86-sequent-sysv*)
+changequote([,])dnl
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/symmetry.h"'
+	;;
+changequote(,)dnl
+  i[3-7]86-*-bsdi)
+changequote([,])dnl
+	COREFILE=
+	;;
+changequote(,)dnl
+  i[3-7]86-*-bsd* | i[3-7]86-*-freebsd[123] | i[3-7]86-*-freebsd[123]\.* | i[3-7]86-*-freebsd4\.[01234] | i[3-7]86-*-freebsd4\.[01234]\.* | i[3-7]86-*-freebsd*aout*)
+changequote([,])dnl
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/i386bsd.h"'
+	;;
+changequote(,)dnl
+  i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu | i[3-7]86-*-dragonfly*)
+changequote([,])dnl
+	COREFILE=''
+	TRAD_HEADER='"hosts/i386bsd.h"'
+	;;
+changequote(,)dnl
+  i[3-7]86-*-netbsd* | i[3-7]86-*-knetbsd*-gnu | i[3-7]86-*-openbsd*)
+changequote([,])dnl
+	COREFILE=netbsd-core.lo
+	;;
+changequote(,)dnl
+  i[3-7]86-esix-sysv3*)
+changequote([,])dnl
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/esix.h"'
+	;;
+changequote(,)dnl
+  i[3-7]86-*-sco3.2v5*)
+changequote([,])dnl
+	COREFILE=sco5-core.lo
+	;;
+changequote(,)dnl
+  i[3-7]86-*-sco* | i[3-7]86-*-isc*)
+changequote([,])dnl
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/i386sco.h"'
+	;;
+changequote(,)dnl
+  i[3-7]86-*-mach3*)
+changequote([,])dnl
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/i386mach3.h"'
+	;;
+changequote(,)dnl
+  i[3-7]86-*-linux-*)
+changequote([,])dnl
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/i386linux.h"'
+	;;
+changequote(,)dnl
+  i[3-7]86-*-isc*)	COREFILE=trad-core.lo ;;
+  i[3-7]86-*-aix*)	COREFILE=aix386-core.lo ;;
+changequote([,])dnl
+  i860-*-mach3* | i860-*-osf1*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/i860mach3.h"'
+	;;
+  mips-*-netbsd* | mips*-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+  mips-dec-*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/decstation.h"'
+	;;
+  mips-sgi-irix4*)	COREFILE=irix-core.lo ;;
+  mips-sgi-irix5*)	COREFILE=irix-core.lo ;;
+  mips-sgi-irix6*)	COREFILE=irix-core.lo ;;
+  mips-*-sysv4*)	;;
+  mips-*-sysv* | mips-*-riscos*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/riscos.h"'
+	;;
+  mips-sony-bsd*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/news-mips.h"'
+	;;
+  m68*-bull*-sysv*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/dpx2.h"'
+	;;
+  m68*-hp-hpux*)	COREFILE=hpux-core.lo ;;
+  m68*-hp-bsd*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/hp300bsd.h"'
+	;;
+  m68*-*-linux-*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/m68klinux.h"'
+	;;
+  m68*-motorola-sysv*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/delta68.h"'
+	;;
+  m68*-sony-*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/news.h"'
+	;;
+  m68*-*-netbsd* | m68*-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+  m68*-apple-aux*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/m68kaux.h"'
+	;;
+  m88*-*-sysv4*)
+	;;
+  m88*-motorola-sysv*)
+	COREFILE=ptrace-core.lo
+	;;
+  m88*-*-mach3*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/m88kmach3.h"'
+	;;
+  m88*-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+  ns32k-pc532-mach)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/pc532mach.h"'
+	;;
+  ns32k-*-netbsd* | ns32k-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+  rs6000-*-lynx*)
+  	COREFILE=lynx-core.lo
+	;;
+changequote(,)dnl
+  rs6000-*-aix[5-9].* | powerpc-*-aix[5-9].*)
+changequote([,])dnl
+        COREFILE=rs6000-core.lo
+	COREFLAG="$COREFLAG -DAIX_5_CORE -DAIX_CORE_DUMPX_CORE"
+	;;
+changequote(,)dnl
+  rs6000-*-aix4.[3-9]* | powerpc-*-aix4.[3-9]*)
+changequote([,])dnl
+        COREFILE=rs6000-core.lo
+	COREFLAG="$COREFLAG -DAIX_CORE_DUMPX_CORE"
+	# Not all versions of AIX with -DAIX_CORE_DUMPX_CORE
+	# have c_impl as a member of struct core_dumpx
+	AC_MSG_CHECKING([for c_impl in struct core_dumpx])
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <core.h>]], [[struct core_dumpx c; c.c_impl = 0;]])],[AC_DEFINE(HAVE_ST_C_IMPL, 1,
+	    [Define if struct core_dumpx has member c_impl])
+	  AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
+	;;
+  rs6000-*-aix4*)	COREFILE=rs6000-core.lo ;;
+  rs6000-*-*)		COREFILE=rs6000-core.lo ;;
+  powerpc-*-aix4*)	COREFILE=rs6000-core.lo ;;
+  powerpc-*-aix*)	COREFILE=rs6000-core.lo ;;
+  powerpc-*-beos*)	;;
+  powerpc-*-freebsd* | powerpc-*-kfreebsd*-gnu)
+		        COREFILE='' ;;
+  powerpc-*-netbsd*)	COREFILE=netbsd-core.lo ;;
+  powerpc-*-*bsd*)	COREFILE=netbsd-core.lo ;;
+  s390*-*-*)            COREFILE=trad-core.lo ;;
+  sh*-*-netbsd* | sh*-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+  sparc-*-netbsd* | sparc*-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+  tahoe-*-*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/tahoe.h"'
+	;;
+  vax-*-netbsd* | vax-*-openbsd*)
+  	COREFILE=netbsd-core.lo
+	;;
+  vax-*-ultrix2*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/vaxult2.h"'
+	;;
+  vax-*-ultrix*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/vaxult2.h"'
+	;;
+  vax-*-linux-*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/vaxlinux.h"'
+	;;
+  vax-*-*)
+	COREFILE=trad-core.lo
+	TRAD_HEADER='"hosts/vaxbsd.h"'
+	;;
+  x86_64-*-linux*)
+	CORE_HEADER='"hosts/x86-64linux.h"'
+	;;
+  x86_64-*-netbsd* | x86_64-*-openbsd*)
+	COREFILE=netbsd-core.lo
+	;;
+  esac
+
+  case "$COREFILE" in
+  aix386-core.lo)	COREFLAG=-DAIX386_CORE ;;
+  hppabsd-core.lo)	COREFLAG=-DHPPABSD_CORE ;;
+  hpux-core.lo)		COREFLAG=-DHPUX_CORE ;;
+  irix-core.lo)		COREFLAG=-DIRIX_CORE ;;
+  lynx-core.lo)		COREFLAG=-DLYNX_CORE ;;
+  netbsd-core.lo)	COREFLAG=-DNETBSD_CORE ;;
+  osf-core.lo)		COREFLAG=-DOSF_CORE ;;
+  ptrace-core.lo)	COREFLAG=-DPTRACE_CORE ;;
+  rs6000-core.lo)	COREFLAG="$COREFLAG -DAIX_CORE" ;;
+  sco5-core.lo)		COREFLAG="$COREFLAG -DSCO5_CORE" ;;
+  trad-core.lo)		COREFLAG="$COREFLAG -DTRAD_CORE" ;;
+  esac
+
+  # ELF corefile support has several flavors, but all of
+  # them use something called <sys/procfs.h>
+  AC_CHECK_HEADERS(sys/procfs.h)
+  if test "$ac_cv_header_sys_procfs_h" = yes; then
+    BFD_HAVE_SYS_PROCFS_TYPE(prstatus_t)
+    BFD_HAVE_SYS_PROCFS_TYPE(prstatus32_t)
+    BFD_HAVE_SYS_PROCFS_TYPE_MEMBER(prstatus_t, pr_who)
+    BFD_HAVE_SYS_PROCFS_TYPE_MEMBER(prstatus32_t, pr_who)
+    BFD_HAVE_SYS_PROCFS_TYPE(pstatus_t)
+    BFD_HAVE_SYS_PROCFS_TYPE(pxstatus_t)
+    BFD_HAVE_SYS_PROCFS_TYPE(pstatus32_t)
+    BFD_HAVE_SYS_PROCFS_TYPE(prpsinfo_t)
+    BFD_HAVE_SYS_PROCFS_TYPE_MEMBER(prpsinfo_t, pr_pid)
+    BFD_HAVE_SYS_PROCFS_TYPE(prpsinfo32_t)
+    BFD_HAVE_SYS_PROCFS_TYPE_MEMBER(prpsinfo32_t, pr_pid)
+    BFD_HAVE_SYS_PROCFS_TYPE(psinfo_t)
+    BFD_HAVE_SYS_PROCFS_TYPE_MEMBER(psinfo_t, pr_pid)
+    BFD_HAVE_SYS_PROCFS_TYPE(psinfo32_t)
+    BFD_HAVE_SYS_PROCFS_TYPE_MEMBER(psinfo32_t, pr_pid)
+    BFD_HAVE_SYS_PROCFS_TYPE(lwpstatus_t)
+    BFD_HAVE_SYS_PROCFS_TYPE(lwpxstatus_t)
+    BFD_HAVE_SYS_PROCFS_TYPE_MEMBER(lwpstatus_t, pr_context)
+    BFD_HAVE_SYS_PROCFS_TYPE_MEMBER(lwpstatus_t, pr_reg)
+    BFD_HAVE_SYS_PROCFS_TYPE_MEMBER(lwpstatus_t, pr_fpreg)
+    BFD_HAVE_SYS_PROCFS_TYPE(win32_pstatus_t)
+  fi
+fi
+AC_SUBST(COREFILE)
+AC_SUBST(COREFLAG)
+if test -n "$CORE_HEADER"; then
+  AC_DEFINE_UNQUOTED(CORE_HEADER, $CORE_HEADER,
+    [Name of host specific core header file to include in elf.c.])
+fi
+if test -n "$TRAD_HEADER"; then
+  AC_DEFINE_UNQUOTED(TRAD_HEADER, $TRAD_HEADER,
+    [Name of host specific header file to include in trad-core.c.])
+fi
+
+# Check if linker supports --as-needed and --no-as-needed options
+AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed,
+	[bfd_cv_ld_as_needed=no
+	if $LD --help 2>/dev/null | grep as-needed > /dev/null; then
+		bfd_cv_ld_as_needed=yes
+	fi
+	])
+
+LT_LIB_M
+
+# When building a shared libbfd, link against the pic version of libiberty
+# so that apps that use libbfd won't need libiberty just to satisfy any
+# libbfd references.
+# We can't do that if a pic libiberty is unavailable since including non-pic
+# code would insert text relocations into libbfd.
+SHARED_LIBADD=
+SHARED_LDFLAGS=
+if test "$enable_shared" = "yes"; then
+changequote(,)dnl
+  x=`sed -n -e 's/^[ 	]*PICFLAG[ 	]*=[ 	]*//p' < ../libiberty/Makefile | sed -n '$p'`
+changequote([,])dnl
+  if test -n "$x"; then
+    SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
+  fi
+
+# More hacks to build DLLs on Windows.
+  case "${host}" in
+  *-*-cygwin*)
+    SHARED_LDFLAGS="-no-undefined"
+    SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32"
+  ;;
+  esac
+
+  if test -n "$SHARED_LIBADD"; then
+    if test -n "$LIBM"; then
+      if test x"$bfd_cv_ld_as_needed" = xyes; then
+	# Link against libm only when needed.  Put -lc, -lm inside -Wl
+	# to stop libtool reordering these options.
+	SHARED_LIBADD="$SHARED_LIBADD -Wl,-lc,--as-needed,`echo $LIBM | sed 's/ /,/g'`,--no-as-needed"
+      else
+	SHARED_LIBADD="$SHARED_LIBADD $LIBM"
+      fi
+    fi
+  fi
+fi
+AC_SUBST(SHARED_LDFLAGS)
+AC_SUBST(SHARED_LIBADD)
+
+# target stuff:
+
+# Canonicalize the secondary target names.
+if test -n "$enable_targets" ; then
+    for targ in `echo $enable_targets | sed 's/,/ /g'`
+    do
+	result=`$ac_config_sub $targ 2>/dev/null`
+	if test -n "$result" ; then
+	    canon_targets="$canon_targets $result"
+	else
+	    # Allow targets that config.sub doesn't recognize, like "all".
+	    canon_targets="$canon_targets $targ"
+	fi
+    done
+fi
+
+all_targets=false
+defvec=
+selvecs=
+assocvecs=
+selarchs=
+TDEFINES=
+for targ in $target $canon_targets
+do
+    if test "x$targ" = "xall"; then
+        all_targets=true
+	assocvecs="$assocvecs $targ_defvec $targ_selvecs"
+    else
+	. $srcdir/config.bfd
+	if test "x$targ" = "x$target"; then
+	    defvec=$targ_defvec
+	fi
+	selvecs="$selvecs $targ_defvec $targ_selvecs"
+	selarchs="$selarchs $targ_archs"
+	TDEFINES="$TDEFINES $targ_cflags"
+    fi
+done
+AC_SUBST(TDEFINES)
+
+# This processing still needs to be done if we're to decide properly whether
+# 64-bit support needs to be compiled in.  Currently, it will be included if
+# the default or any other explicitly requested target requires it; it
+# will not be included on a 32-bit host if no 64-bit target is requested, and
+# no "--with-64-bit-bfd" option is given, even if "--enable-targets=all" is
+# used.
+
+# uniq the default and selected vectors in all the configured targets.
+f=""
+for i in $selvecs ; do
+    case " $f " in
+    *" $i "*) ;;
+    *) f="$f $i" ;;
+    esac
+done
+selvecs="$f"
+
+
+# uniq the associated vectors in all the configured targets.
+f=""
+for i in $assocvecs ; do
+    case " $f " in
+    *" $i "*) ;;
+    *) f="$f $i" ;;
+    esac
+done
+assocvecs="$f"
+
+
+# uniq the architectures in all the configured targets.
+f=""
+for i in $selarchs ; do
+    case " $f " in
+    *" $i "*) ;;
+    *) f="$f $i" ;;
+    esac
+done
+selarchs="$f"
+
+# Target backend .o files.
+tb=
+
+elf="elf.lo elflink.lo elf-attrs.lo elf-strtab.lo
+     elf-eh-frame.lo dwarf1.lo"
+
+for vec in $selvecs
+do
+    target_size=32
+    case "$vec" in
+    # This list is alphabetized to make it easy to compare
+    # with the two vector lists in targets.c.  For the same reason,
+    # use one entry per line, even though this leads to long lines.
+    a_out_adobe_vec)		tb="$tb aout-adobe.lo aout32.lo" ;;
+    aix5coff64_vec)		tb="$tb coff64-rs6000.lo xcofflink.lo aix5ppc-core.lo"; target_size=64 ;;
+    aout0_big_vec)		tb="$tb aout0.lo aout32.lo" ;;
+    aout_arm_big_vec)		tb="$tb aout-arm.lo aout32.lo" ;;
+    aout_arm_little_vec)	tb="$tb aout-arm.lo aout32.lo" ;;
+    apollocoff_vec)		tb="$tb coff-apollo.lo" ;;
+    arm_epoc_pe_big_vec)	tb="$tb epoc-pe-arm.lo peigen.lo cofflink.lo " ;;
+    arm_epoc_pe_little_vec)	tb="$tb epoc-pe-arm.lo peigen.lo cofflink.lo " ;;
+    arm_epoc_pei_big_vec)	tb="$tb epoc-pei-arm.lo peigen.lo cofflink.lo " ;;
+    arm_epoc_pei_little_vec)	tb="$tb epoc-pei-arm.lo peigen.lo cofflink.lo " ;;
+    arm_wince_pe_big_vec)	tb="$tb pe-arm-wince.lo pe-arm.lo peigen.lo cofflink.lo " ;;
+    arm_wince_pe_little_vec)	tb="$tb pe-arm-wince.lo pe-arm.lo peigen.lo cofflink.lo " ;;
+    arm_wince_pei_big_vec)	tb="$tb pei-arm-wince.lo pei-arm.lo peigen.lo cofflink.lo " ;;
+    arm_wince_pei_little_vec)	tb="$tb pei-arm-wince.lo pei-arm.lo peigen.lo cofflink.lo " ;;
+    armcoff_big_vec)		tb="$tb coff-arm.lo cofflink.lo " ;;
+    armcoff_little_vec)		tb="$tb coff-arm.lo cofflink.lo " ;;
+    armnetbsd_vec)		tb="$tb armnetbsd.lo aout32.lo" ;;
+    armpe_big_vec)		tb="$tb pe-arm.lo peigen.lo cofflink.lo " ;;
+    armpe_little_vec)		tb="$tb pe-arm.lo peigen.lo cofflink.lo " ;;
+    armpei_big_vec)		tb="$tb pei-arm.lo peigen.lo cofflink.lo " ;;
+    armpei_little_vec)		tb="$tb pei-arm.lo peigen.lo cofflink.lo " ;;
+    asxxxx_vec)			tb="$tb asxxxx.lo" ;;
+    b_out_vec_big_host)		tb="$tb bout.lo aout32.lo" ;;
+    b_out_vec_little_host)	tb="$tb bout.lo aout32.lo" ;;
+    bfd_pei_ia64_vec)		tb="$tb pei-ia64.lo pepigen.lo cofflink.lo"; target_size=64 ;;
+    bfd_elf32_am33lin_vec)	tb="$tb elf32-am33lin.lo elf32.lo $elf" ;;
+    bfd_elf32_avr_vec)		tb="$tb elf32-avr.lo elf32.lo $elf" ;;
+    bfd_elf32_bfin_vec)		tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
+    bfd_elf32_bfinfdpic_vec)	tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
+    bfd_elf32_big_generic_vec) 	tb="$tb elf32-gen.lo elf32.lo $elf" ;;
+    bfd_elf32_bigarc_vec)	tb="$tb elf32-arc.lo elf32.lo $elf" ;;
+    bfd_elf32_bigarm_vec)	tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    bfd_elf32_bigarm_symbian_vec)	
+                                tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    bfd_elf32_bigarm_vxworks_vec)	
+                                tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    bfd_elf32_bigmips_vec) 	tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    bfd_elf32_bigmips_vxworks_vec)
+			 	tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    bfd_elf32_cr16_vec)		tb="$tb elf32-cr16.lo elf32.lo $elf" ;;
+    bfd_elf32_cr16c_vec)	tb="$tb elf32-cr16c.lo elf32.lo $elf" ;;
+    bfd_elf32_cris_vec)		tb="$tb elf32-cris.lo elf32.lo $elf" ;;
+    bfd_elf32_crx_vec)          tb="$tb elf32-crx.lo elf32.lo $elf" ;;    
+    bfd_elf32_d10v_vec)		tb="$tb elf32-d10v.lo elf32.lo $elf" ;;
+    bfd_elf32_d30v_vec)		tb="$tb elf32-d30v.lo elf32.lo $elf" ;;
+    bfd_elf32_dlx_big_vec)	tb="$tb elf32-dlx.lo elf32.lo $elf" ;;
+    bfd_elf32_fr30_vec)		tb="$tb elf32-fr30.lo elf32.lo $elf" ;;
+    bfd_elf32_frv_vec)		tb="$tb elf32-frv.lo elf32.lo $elf" ;;
+    bfd_elf32_frvfdpic_vec)	tb="$tb elf32-frv.lo elf32.lo $elf" ;;
+    bfd_elf32_moxie_vec)	tb="$tb elf32-moxie.lo elf32.lo $elf" ;;
+    bfd_elf32_h8300_vec)	tb="$tb elf32-h8300.lo elf32.lo $elf" ;;
+    bfd_elf32_hppa_linux_vec)	tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
+    bfd_elf32_hppa_nbsd_vec)	tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
+    bfd_elf32_hppa_vec)		tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
+    bfd_elf32_i370_vec)		tb="$tb elf32-i370.lo elf32.lo $elf" ;;
+    bfd_elf32_i386_sol2_vec)	tb="$tb elf32-i386.lo elf-ifunc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_i386_freebsd_vec)	tb="$tb elf32-i386.lo elf-ifunc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_i386_nacl_vec)	tb="$tb elf32-i386.lo elf-ifunc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_i386_vxworks_vec)	tb="$tb elf32-i386.lo elf-ifunc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_i386_vec)		tb="$tb elf32-i386.lo elf-ifunc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_i860_little_vec)	tb="$tb elf32-i860.lo elf32.lo $elf" ;;
+    bfd_elf32_i860_vec)		tb="$tb elf32-i860.lo elf32.lo $elf" ;;
+    bfd_elf32_i960_vec)		tb="$tb elf32-i960.lo elf32.lo $elf" ;;
+    bfd_elf32_ia64_big_vec)	tb="$tb elf32-ia64.lo elfxx-ia64.lo elf32.lo $elf" ;;
+    bfd_elf32_ia64_hpux_big_vec) tb="$tb elf32-ia64.lo elfxx-ia64.lo elf32.lo $elf";;
+    bfd_elf32_ip2k_vec)		tb="$tb elf32-ip2k.lo elf32.lo $elf" ;;
+    bfd_elf32_iq2000_vec)       tb="$tb elf32-iq2000.lo elf32.lo $elf" ;;
+    bfd_elf32_lm32_vec)         tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
+    bfd_elf32_lm32fdpic_vec)         tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
+    bfd_elf32_little_generic_vec) tb="$tb elf32-gen.lo elf32.lo $elf" ;;
+    bfd_elf32_littlearc_vec)	tb="$tb elf32-arc.lo elf32.lo $elf" ;;
+    bfd_elf32_littlearm_symbian_vec)
+                                tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    bfd_elf32_littlearm_vxworks_vec)
+                                tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    bfd_elf32_littlearm_vec)	tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    bfd_elf32_littlemips_vec) 	tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    bfd_elf32_littlemips_vxworks_vec)
+			 	tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    bfd_elf32_m32c_vec)         tb="$tb elf32-m32c.lo elf32.lo $elf" ;;
+    bfd_elf32_m32r_vec)		tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
+    bfd_elf32_m32rle_vec)       tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
+    bfd_elf32_m32rlin_vec)      tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
+    bfd_elf32_m32rlelin_vec)    tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
+    bfd_elf32_m68hc11_vec)	tb="$tb elf32-m68hc11.lo elf32-m68hc1x.lo elf32.lo $elf" ;;
+    bfd_elf32_m68hc12_vec)	tb="$tb elf32-m68hc12.lo elf32-m68hc1x.lo elf32.lo $elf" ;;
+    bfd_elf32_m68k_vec)		tb="$tb elf32-m68k.lo elf32.lo $elf" ;;
+    bfd_elf32_m88k_vec)		tb="$tb elf32-m88k.lo elf32.lo $elf" ;;
+    bfd_elf32_mcore_big_vec)	tb="$tb elf32-mcore.lo elf32.lo $elf" ;;
+    bfd_elf32_mcore_little_vec)	tb="$tb elf32-mcore.lo elf32.lo $elf" ;;
+    bfd_elf32_mep_vec)		tb="$tb elf32-mep.lo elf32.lo $elf" ;;
+    bfd_elf32_mep_little_vec)	tb="$tb elf32-mep.lo elf32.lo $elf" ;;
+    bfd_elf32_microblaze_vec)	tb="$tb elf32-microblaze.lo elf32.lo $elf" ;;
+    bfd_elf32_mn10200_vec)	tb="$tb elf-m10200.lo elf32.lo $elf" ;;
+    bfd_elf32_mn10300_vec)	tb="$tb elf-m10300.lo elf32.lo $elf" ;;
+    bfd_elf32_mt_vec)           tb="$tb elf32-mt.lo elf32.lo $elf" ;;
+    bfd_elf32_msp430_vec)	tb="$tb elf32-msp430.lo elf32.lo $elf" ;;
+    bfd_elf32_nbigmips_vec)	tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    bfd_elf32_nlittlemips_vec)	tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    bfd_elf32_ntradbigmips_vec | bfd_elf32_ntradbigmips_freebsd_vec)
+				tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    bfd_elf32_ntradlittlemips_vec | bfd_elf32_ntradlittlemips_freebsd_vec)
+				tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    bfd_elf32_openrisc_vec)	tb="$tb elf32-openrisc.lo elf32.lo $elf" ;;
+    bfd_elf32_or32_big_vec)	tb="$tb elf32-or32.lo elf32.lo $elf" ;;
+    bfd_elf32_pj_vec)           tb="$tb elf32-pj.lo elf32.lo $elf";;
+    bfd_elf32_pjl_vec)          tb="$tb elf32-pj.lo elf32.lo $elf";;
+    bfd_elf32_powerpc_vec)	tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_powerpcle_vec)	tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_powerpc_vxworks_vec) tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_rx_le_vec)        tb="$tb elf32-rx.lo elf32.lo $elf" ;;
+    bfd_elf32_rx_be_vec)        tb="$tb elf32-rx.lo elf32.lo $elf" ;;
+    bfd_elf32_rx_be_ns_vec)     tb="$tb elf32-rx.lo elf32.lo $elf" ;;
+    bfd_elf32_s390_vec)		tb="$tb elf32-s390.lo elf32.lo $elf" ;;
+    bfd_elf32_bigscore_vec)     tb="$tb elf32-score.lo elf32-score7.lo elf32.lo $elf"; want64=true; target_size=64;;
+    bfd_elf32_littlescore_vec)  tb="$tb elf32-score.lo elf32-score7.lo elf32.lo $elf"; want64=true; target_size=64;;
+    # FIXME: We include cofflink.lo not because it's needed for
+    # bfd_elf32_sh64[l]_vec, but because we include bfd_elf32_sh[l]_vec
+    # which needs it but does not list it.  Should be fixed in right place.
+    bfd_elf32_sh64_vec)		tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
+    bfd_elf32_sh64l_vec)	tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
+    bfd_elf32_sh64lin_vec)	tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
+    bfd_elf32_sh64blin_vec)	tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
+    bfd_elf32_sh64lnbsd_vec)	tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" ;;
+    bfd_elf32_sh64nbsd_vec)	tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" ;;
+    bfd_elf32_sh_vec)		tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
+    bfd_elf32_shbfd_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    bfd_elf32_shblin_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    bfd_elf32_shfd_vec)		tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    bfd_elf32_shl_vec)		tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
+    bfd_elf32_shl_symbian_vec)	tb="$tb elf32-sh-symbian.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
+    bfd_elf32_shlin_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    bfd_elf32_shlnbsd_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    bfd_elf32_shlvxworks_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
+    bfd_elf32_shnbsd_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    bfd_elf32_shvxworks_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
+    bfd_elf32_sparc_vec)	tb="$tb elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_sparc_sol2_vec)	tb="$tb elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_sparc_vxworks_vec) tb="$tb elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    bfd_elf32_spu_vec)		tb="$tb elf32-spu.lo elf32.lo $elf" ;;
+    bfd_elf32_tic6x_be_vec)	tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    bfd_elf32_tic6x_le_vec)	tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    bfd_elf32_tic6x_linux_be_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    bfd_elf32_tic6x_linux_le_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    bfd_elf32_tic6x_elf_be_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    bfd_elf32_tic6x_elf_le_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    bfd_elf32_tilegx_vec)	tb="$tb elf32-tilegx.lo elfxx-tilegx.lo elf32.lo $elf" ; target_size=32 ;;
+    bfd_elf32_tilepro_vec)	tb="$tb elf32-tilepro.lo elf32.lo $elf" ;;
+    bfd_elf32_tradbigmips_vec | bfd_elf32_tradbigmips_freebsd_vec)
+				tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    bfd_elf32_tradlittlemips_vec | bfd_elf32_tradlittlemips_freebsd_vec)
+				tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    bfd_elf32_us_cris_vec)	tb="$tb elf32-cris.lo elf32.lo $elf" ;;
+    bfd_elf32_v850_vec)		tb="$tb elf32-v850.lo elf32.lo $elf" ;;
+    bfd_elf32_vax_vec)		tb="$tb elf32-vax.lo elf32.lo $elf" ;;
+    bfd_elf32_xstormy16_vec)	tb="$tb elf32-xstormy16.lo elf32.lo $elf" ;;
+    bfd_elf32_xc16x_vec)		tb="$tb elf32-xc16x.lo elf32.lo $elf" ;;
+    bfd_elf32_xtensa_le_vec)	tb="$tb xtensa-isa.lo xtensa-modules.lo elf32-xtensa.lo elf32.lo $elf" ;;
+    bfd_elf32_xtensa_be_vec)	tb="$tb xtensa-isa.lo xtensa-modules.lo elf32-xtensa.lo elf32.lo $elf" ;;
+    bfd_elf64_alpha_freebsd_vec) tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_alpha_vec)	tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_big_generic_vec) 	tb="$tb elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_bigmips_vec) 	tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    bfd_elf64_hppa_linux_vec)	tb="$tb elf64-hppa.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_hppa_vec)		tb="$tb elf64-hppa.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_ia64_big_vec)	tb="$tb elf64-ia64.lo elfxx-ia64.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_ia64_hpux_big_vec) tb="$tb elf64-ia64.lo elfxx-ia64.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_ia64_little_vec)	tb="$tb elf64-ia64.lo elfxx-ia64.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_ia64_vms_vec)	tb="$tb elf64-ia64.lo elfxx-ia64.lo  elf64.lo vms-lib.lo vms-misc.lo $elf"; target_size=64 ;;
+    bfd_elf64_little_generic_vec) tb="$tb elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_littlemips_vec) 	tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    bfd_elf64_mmix_vec) 	tb="$tb elf64-mmix.lo elf64.lo $elf" target_size=64 ;;
+    bfd_elf64_powerpc_vec)	tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_powerpcle_vec)	tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;;
+    bfd_elf64_s390_vec)		tb="$tb elf64-s390.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_sh64_vec)		tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    bfd_elf64_sh64l_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    bfd_elf64_sh64lin_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    bfd_elf64_sh64blin_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    bfd_elf64_sh64lnbsd_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    bfd_elf64_sh64nbsd_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    bfd_elf64_sparc_vec)	tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_sparc_freebsd_vec) tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_sparc_sol2_vec) tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_tilegx_vec)	tb="$tb elf64-tilegx.lo elfxx-tilegx.lo elf64.lo $elf" ; target_size=64 ;;
+    bfd_elf64_tradbigmips_vec | bfd_elf64_tradbigmips_freebsd_vec)
+				tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    bfd_elf64_tradlittlemips_vec | bfd_elf64_tradlittlemips_freebsd_vec)
+				tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    bfd_elf64_x86_64_freebsd_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_x86_64_sol2_vec)  tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_x86_64_vec)	tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf32_x86_64_vec)	tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo elf32.lo $elf"; target_size=64 ;;
+    bfd_elf64_l1om_vec)		tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_l1om_freebsd_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_k1om_vec)		tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_elf64_k1om_freebsd_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    bfd_mmo_vec)		tb="$tb mmo.lo" target_size=64 ;;
+    bfd_powerpc_pe_vec)         tb="$tb pe-ppc.lo peigen.lo cofflink.lo" ;;
+    bfd_powerpc_pei_vec)        tb="$tb pei-ppc.lo peigen.lo cofflink.lo" ;;
+    bfd_powerpcle_pe_vec)       tb="$tb pe-ppc.lo peigen.lo cofflink.lo" ;;
+    bfd_powerpcle_pei_vec)      tb="$tb pei-ppc.lo peigen.lo cofflink.lo" ;;
+    cris_aout_vec)		tb="$tb aout-cris.lo" ;;
+    demo_64_vec)		tb="$tb demo64.lo aout64.lo"; target_size=64 ;;
+    ecoff_big_vec)		tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
+    ecoff_biglittle_vec)	tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
+    ecoff_little_vec)		tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
+    ecoffalpha_little_vec)	tb="$tb coff-alpha.lo ecoff.lo ecofflink.lo"; target_size=64 ;;
+    go32coff_vec)		tb="$tb coff-go32.lo cofflink.lo" ;;
+    go32stubbedcoff_vec)	tb="$tb coff-stgo32.lo cofflink.lo" ;;
+    h8300coff_vec)		tb="$tb coff-h8300.lo reloc16.lo" ;;
+    h8500coff_vec)		tb="$tb coff-h8500.lo reloc16.lo" ;;
+    host_aout_vec)		tb="$tb host-aout.lo aout32.lo" ;;
+    hp300bsd_vec)		tb="$tb hp300bsd.lo aout32.lo" ;;
+    hp300hpux_vec)		tb="$tb hp300hpux.lo aout32.lo" ;;
+    i386aout_vec)		tb="$tb i386aout.lo aout32.lo" ;;
+    i386bsd_vec)		tb="$tb i386bsd.lo aout32.lo" ;;
+    i386coff_vec)		tb="$tb coff-i386.lo cofflink.lo" ;;
+    x86_64coff_vec)		tb="$tb coff-x86_64.lo cofflink.lo"; target_size=64 ;;
+    i386dynix_vec)		tb="$tb i386dynix.lo aout32.lo" ;;
+    i386freebsd_vec)		tb="$tb i386freebsd.lo aout32.lo" ;;
+    i386linux_vec)		tb="$tb i386linux.lo aout32.lo" ;;
+    i386lynx_aout_vec)		tb="$tb i386lynx.lo lynx-core.lo aout32.lo" ;;
+    i386lynx_coff_vec)		tb="$tb cf-i386lynx.lo cofflink.lo lynx-core.lo" ;;
+    i386mach3_vec)		tb="$tb i386mach3.lo aout32.lo" ;;
+    i386msdos_vec)		tb="$tb i386msdos.lo" ;;
+    i386netbsd_vec)		tb="$tb i386netbsd.lo aout32.lo" ;;
+    i386os9k_vec)		tb="$tb i386os9k.lo aout32.lo" ;;
+    i386pe_vec)			tb="$tb pe-i386.lo peigen.lo cofflink.lo" ;;
+    i386pei_vec)		tb="$tb pei-i386.lo peigen.lo cofflink.lo" ;;
+    x86_64pe_vec)		tb="$tb pe-x86_64.lo pex64igen.lo cofflink.lo"; target_size=64 ;;
+    x86_64pei_vec)		tb="$tb pei-x86_64.lo pex64igen.lo cofflink.lo"; target_size=64 ;;
+    i860coff_vec)		tb="$tb coff-i860.lo cofflink.lo" ;;
+    icoff_big_vec)		tb="$tb coff-i960.lo cofflink.lo" ;;
+    icoff_little_vec)		tb="$tb coff-i960.lo cofflink.lo" ;;
+    ieee_vec)			tb="$tb ieee.lo" ;;
+    m68k4knetbsd_vec)		tb="$tb m68k4knetbsd.lo aout32.lo" ;;
+    m68kaux_coff_vec)		tb="$tb coff-aux.lo coff-m68k.lo cofflink.lo" ;;
+    m68kcoff_vec)		tb="$tb coff-m68k.lo cofflink.lo" ;;
+    m68kcoffun_vec)		tb="$tb coff-u68k.lo coff-m68k.lo cofflink.lo" ;;
+    m68klinux_vec)		tb="$tb m68klinux.lo aout32.lo" ;;
+    m68knetbsd_vec)		tb="$tb m68knetbsd.lo aout32.lo" ;;
+    m68ksysvcoff_vec)		tb="$tb coff-svm68k.lo cofflink.lo" ;;
+    m88kbcs_vec)		tb="$tb coff-m88k.lo" ;;
+    m88kmach3_vec)		tb="$tb m88kmach3.lo aout32.lo" ;;
+    m88kopenbsd_vec)		tb="$tb m88kopenbsd.lo aout32.lo" ;;
+    mach_o_be_vec)              tb="$tb mach-o.lo" ;;
+    mach_o_le_vec)              tb="$tb mach-o.lo" ;;
+    mach_o_fat_vec)             tb="$tb mach-o.lo" ;;
+    mach_o_i386_vec)            tb="$tb mach-o-i386.lo" ;;
+    mach_o_x86_64_vec)          tb="$tb mach-o-x86-64.lo" ;;
+    mcore_pe_big_vec)		tb="$tb pe-mcore.lo peigen.lo cofflink.lo" ;;
+    mcore_pe_little_vec)	tb="$tb pe-mcore.lo peigen.lo cofflink.lo" ;;
+    mcore_pei_big_vec)		tb="$tb pei-mcore.lo peigen.lo cofflink.lo" ;;
+    mcore_pei_little_vec)	tb="$tb pei-mcore.lo peigen.lo cofflink.lo" ;;
+    mipslpe_vec)		tb="$tb pe-mips.lo peigen.lo cofflink.lo" ;;
+    mipslpei_vec)		tb="$tb pei-mips.lo peigen.lo cofflink.lo" ;;
+    newsos3_vec)		tb="$tb newsos3.lo aout32.lo" ;;
+    nlm32_alpha_vec)		tb="$tb nlm32-alpha.lo nlm32.lo nlm.lo"; target_size=64 ;;
+    nlm32_i386_vec)		tb="$tb nlm32-i386.lo nlm32.lo nlm.lo" ;;
+    nlm32_powerpc_vec)		tb="$tb nlm32-ppc.lo nlm32.lo nlm.lo" ;;
+    nlm32_sparc_vec)		tb="$tb nlm32-sparc.lo nlm32.lo nlm.lo" ;;
+    or32coff_big_vec)		tb="$tb coff-or32.lo cofflink.lo" ;;
+    pc532machaout_vec)		tb="$tb pc532-mach.lo aout-ns32k.lo" ;;
+    pc532netbsd_vec)		tb="$tb ns32knetbsd.lo aout-ns32k.lo" ;;
+    pef_vec)                    tb="$tb pef.lo" ;;
+    pef_xlib_vec)               tb="$tb pef.lo" ;;
+    pdp11_aout_vec)		tb="$tb pdp11.lo" ;;
+    plugin_vec)                 tb="$tb plugin.lo" ;;
+    pmac_xcoff_vec)		tb="$tb coff-rs6000.lo xcofflink.lo" ;;
+    ppcboot_vec)		tb="$tb ppcboot.lo" ;;
+    riscix_vec)			tb="$tb aout32.lo riscix.lo" ;;
+    rs6000coff64_vec)		tb="$tb coff64-rs6000.lo xcofflink.lo aix5ppc-core.lo"; target_size=64 ;;
+    rs6000coff_vec)		tb="$tb coff-rs6000.lo xcofflink.lo" ;;
+    shcoff_small_vec)		tb="$tb coff-sh.lo cofflink.lo" ;;
+    shcoff_vec)			tb="$tb coff-sh.lo cofflink.lo" ;;
+    shlcoff_small_vec)		tb="$tb coff-sh.lo cofflink.lo" ;;
+    shlcoff_vec)		tb="$tb coff-sh.lo cofflink.lo" ;;
+    shlpe_vec)			tb="$tb pe-sh.lo coff-sh.lo peigen.lo cofflink.lo" ;;
+    shlpei_vec)			tb="$tb pei-sh.lo coff-sh.lo peigen.lo cofflink.lo" ;;
+    som_vec)			tb="$tb som.lo" ;;
+    sparccoff_vec)		tb="$tb coff-sparc.lo" ;;
+    sparcle_aout_vec)		tb="$tb aout-sparcle.lo aout32.lo" ;;
+    sparclinux_vec)		tb="$tb sparclinux.lo aout32.lo" ;;
+    sparclynx_aout_vec)		tb="$tb sparclynx.lo lynx-core.lo aout32.lo" ;;
+    sparclynx_coff_vec)		tb="$tb cf-sparclynx.lo lynx-core.lo" ;;
+    sparcnetbsd_vec)		tb="$tb sparcnetbsd.lo aout32.lo" ;;
+    sunos_big_vec)		tb="$tb sunos.lo aout32.lo" ;;
+    sym_vec)                    tb="$tb xsym.lo" ;;
+    tic30_aout_vec)		tb="$tb aout-tic30.lo" ;;
+    tic30_coff_vec)		tb="$tb coff-tic30.lo" ;;
+    tic4x_coff0_vec)            tb="$tb coff-tic4x.lo" ;;
+    tic4x_coff0_beh_vec)        tb="$tb coff-tic4x.lo" ;;
+    tic4x_coff1_vec)            tb="$tb coff-tic4x.lo" ;;
+    tic4x_coff1_beh_vec)        tb="$tb coff-tic4x.lo" ;;
+    tic4x_coff2_vec)            tb="$tb coff-tic4x.lo" ;;
+    tic4x_coff2_beh_vec)        tb="$tb coff-tic4x.lo" ;;
+    tic54x_coff0_beh_vec)	tb="$tb coff-tic54x.lo" ;;
+    tic54x_coff0_vec)		tb="$tb coff-tic54x.lo" ;;
+    tic54x_coff1_beh_vec)	tb="$tb coff-tic54x.lo" ;;
+    tic54x_coff1_vec)		tb="$tb coff-tic54x.lo" ;;
+    tic54x_coff2_beh_vec)	tb="$tb coff-tic54x.lo" ;;
+    tic54x_coff2_vec)		tb="$tb coff-tic54x.lo" ;;
+    tic80coff_vec)		tb="$tb coff-tic80.lo cofflink.lo" ;;
+    vaxnetbsd_vec)		tb="$tb vaxnetbsd.lo aout32.lo" ;;
+    vax1knetbsd_vec)		tb="$tb vax1knetbsd.lo aout32.lo" ;;
+    vaxbsd_vec)			tb="$tb vaxbsd.lo aout32.lo" ;;
+    versados_vec)		tb="$tb versados.lo" ;;
+    vms_alpha_vec)		tb="$tb vms-alpha.lo vms-misc.lo vms-lib.lo"; target_size=64 ;;
+    vms_lib_txt_vec)		tb="$tb vms-lib.lo vms-misc.lo" ;;
+    w65_vec)			tb="$tb coff-w65.lo reloc16.lo" ;;
+    we32kcoff_vec)		tb="$tb coff-we32k.lo" ;;
+    z80coff_vec)		tb="$tb coff-z80.lo reloc16.lo" ;;
+    z8kcoff_vec)		tb="$tb coff-z8k.lo reloc16.lo cofflink.lo" ;;
+
+    # These appear out of order in targets.c
+    srec_vec)			tb="$tb srec.lo" ;;
+    symbolsrec_vec)		tb="$tb srec.lo" ;;
+    tekhex_vec)			tb="$tb tekhex.lo" ;;
+    cisco_core_big_vec)		tb="$tb cisco-core.lo" ;;
+    cisco_core_little_vec)	tb="$tb cisco-core.lo" ;;
+
+    "")			;;
+    *) AC_MSG_ERROR(*** unknown target vector $vec) ;;
+    esac
+
+    if test ${target_size} = 64; then
+	target64=true
+    fi
+    if test x"${vec}" = x"${defvec}"; then
+	bfd_default_target_size=${target_size}
+    fi
+done
+
+# Target architecture .o files.
+# A couple of CPUs use shorter file names to avoid problems on DOS
+# filesystems.
+ta=`echo $selarchs | sed -e s/bfd_/cpu-/g -e s/_arch/.lo/g -e s/mn10200/m10200/ -e s/mn10300/m10300/`
+
+# Weed out duplicate .o files.
+f=""
+for i in $tb ; do
+    case " $f " in
+    *" $i "*) ;;
+    *) f="$f $i" ;;
+    esac
+done
+tb="$f"
+
+f=""
+for i in $ta ; do
+    case " $f " in
+    *" $i "*) ;;
+    *) f="$f $i" ;;
+    esac
+done
+ta="$f"
+
+bfd_backends="$tb"
+bfd_machines="$ta"
+
+if test x${all_targets} = xtrue ; then
+  bfd_backends="${bfd_backends}"' $(ALL_BACKENDS)'
+  bfd_machines="${bfd_machines}"' $(ALL_MACHINES)'
+  selvecs=
+  havevecs=-DHAVE_all_vecs
+  selarchs=
+  test -n "$assocvecs" &&
+    assocvecs=`echo $assocvecs | sed -e 's/^/\&/' -e 's/ \(.\)/,\&\1/g'`
+else	# all_targets is true
+  # Only set these if they will be nonempty, for the clever echo.
+  havevecs=
+  assocvecs=
+  test -n "$selvecs" &&
+    havevecs=`echo $selvecs | sed -e 's/^/-DHAVE_/' -e 's/ \(.\)/ -DHAVE_\1/g'`
+  test -n "$selvecs" &&
+    selvecs=`echo $selvecs | sed -e 's/^/\&/' -e 's/ \(.\)/,\&\1/g'`
+  test -n "$selarchs" &&
+    selarchs=`echo $selarchs | sed -e 's/^/\&/' -e 's/ \(.\)/,\&\1/g'`
+fi	# all_targets is true
+
+case ${host64}-${target64}-${want64} in
+  *true*)
+    wordsize=64
+    bfd64_libs='$(BFD64_LIBS)'
+    all_backends='$(BFD64_BACKENDS) $(BFD32_BACKENDS)'
+    if test $BFD_HOST_64_BIT_DEFINED = 0; then
+      AC_MSG_WARN([You have requested a 64 bit BFD configuration, but])
+      AC_MSG_WARN([your compiler may not have a 64 bit integral type])
+    fi
+    if test -n "$GCC" ; then
+       bad_64bit_gcc=no;
+       AC_MSG_CHECKING([for gcc version with buggy 64-bit support])
+       # Add more tests for gcc versions with non-working 64-bit support here.
+       AC_EGREP_CPP([: 2 : 91 : 1 :],[:__GNUC__:__GNUC_MINOR__:__i386__:],
+		    bad_64bit_gcc=yes;
+		    AC_MSG_RESULT([yes: egcs-1.1.2 on ix86 spotted]),
+		    AC_MSG_RESULT(no))
+       if test $bad_64bit_gcc = yes ; then
+	 AC_MSG_ERROR([A newer version of gcc is needed for the requested 64-bit BFD configuration])
+       fi
+    fi
+    ;;
+  false-false-false)
+    wordsize=32
+    all_backends='$(BFD32_BACKENDS)'
+    ;;
+esac
+
+AC_SUBST(wordsize)
+AC_SUBST(bfd64_libs)
+AC_SUBST(all_backends)
+AC_SUBST(bfd_backends)
+AC_SUBST(bfd_machines)
+AC_SUBST(bfd_default_target_size)
+
+if test "$plugins" = "yes"; then
+  supports_plugins=1
+else
+  supports_plugins=0
+fi
+AC_SUBST(supports_plugins)
+
+# Determine the host dependant file_ptr a.k.a. off_t type.  In order
+# prefer: off64_t - if ftello64 and fseeko64, off_t - if ftello and
+# fseeko, long.  This assumes that sizeof off_t is .ge. sizeof long.
+# Hopefully a reasonable assumption since fseeko et.al. should be
+# upward compatible.
+AC_CHECK_FUNCS(ftello ftello64 fseeko fseeko64 fopen64)
+if test x"$ac_cv_func_ftello" = xyes -a x"$ac_cv_func_fseeko" = xyes; then
+    AC_CHECK_SIZEOF(off_t)
+fi
+AC_MSG_CHECKING([file_ptr type])
+bfd_file_ptr="long"
+bfd_ufile_ptr="unsigned long"
+if test x"$ac_cv_func_ftello64" = xyes -a x"$ac_cv_func_fseeko64" = xyes \
+	-o x"${ac_cv_sizeof_off_t}" = x8; then
+    bfd_file_ptr=BFD_HOST_64_BIT
+    bfd_ufile_ptr=BFD_HOST_U_64_BIT
+fi
+AC_MSG_RESULT($bfd_file_ptr)
+AC_SUBST(bfd_file_ptr)
+AC_SUBST(bfd_ufile_ptr)
+
+
+tdefaults=""
+test -n "${defvec}" && tdefaults="${tdefaults} -DDEFAULT_VECTOR=${defvec}"
+test -n "${selvecs}" && tdefaults="${tdefaults} -DSELECT_VECS='${selvecs}'"
+test -n "${assocvecs}" && tdefaults="${tdefaults} -DASSOCIATED_VECS='${assocvecs}'"
+test -n "${selarchs}" && tdefaults="${tdefaults} -DSELECT_ARCHITECTURES='${selarchs}'"
+AC_SUBST(tdefaults)
+AC_SUBST(havevecs)
+
+dnl AC_CHECK_HEADERS(sys/mman.h)
+AC_FUNC_MMAP
+AC_CHECK_FUNCS(madvise mprotect)
+case ${want_mmap}+${ac_cv_func_mmap_fixed_mapped} in
+  true+yes )  AC_DEFINE(USE_MMAP, 1, [Use mmap if it's available?]) ;;
+esac
+
+rm -f doc/config.status
+####AC_CONFIG_FILES([Makefile doc/Makefile bfd-in3.h:bfd-in2.h po/Makefile.in:po/Make-in])
+AC_CONFIG_FILES([Makefile doc/Makefile bfd-in3.h:bfd-in2.h])
+
+####dnl We need this duplication, even though we use AM_PO_SUBDIRS, because of
+####dnl our two separate POTFILES.  Yuck.
+####AC_CONFIG_COMMANDS([default],
+####[[
+####case "$srcdir" in
+####  .) srcdirpre= ;;
+####  *) srcdirpre='$(srcdir)/' ;;
+####esac
+####POFILES=
+####GMOFILES=
+####for lang in dummy $OBSOLETE_ALL_LINGUAS; do
+####  if test $lang != dummy; then
+####    POFILES="$POFILES $srcdirpre$lang.po"
+####    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+####  fi
+####done
+####sed -e '/SRC-POTFILES =/r po/SRC-POTFILES' \
+####    -e '/BLD-POTFILES =/r po/BLD-POTFILES' \
+####    -e "s,@POFILES@,$POFILES," \
+####    -e "s,@GMOFILES@,$GMOFILES," \
+####    po/Makefile.in > po/Makefile]],[[]])
+
+dnl Required by html, pdf, install-pdf and install-html
+AC_SUBST(datarootdir)
+AC_SUBST(docdir)
+AC_SUBST(htmldir)
+AC_SUBST(pdfdir)
+
+AC_OUTPUT
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/corefile.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/corefile.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/corefile.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/corefile.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,191 @@
+/* Core file generic interface routines for BFD.
+   Copyright 1990, 1991, 1992, 1993, 1994, 2000, 2001, 2002, 2003, 2005,
+   2007 Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/*
+SECTION
+	Core files
+
+SUBSECTION
+	Core file functions
+
+DESCRIPTION
+	These are functions pertaining to core files.
+*/
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+/*
+FUNCTION
+	bfd_core_file_failing_command
+
+SYNOPSIS
+	const char *bfd_core_file_failing_command (bfd *abfd);
+
+DESCRIPTION
+	Return a read-only string explaining which program was running
+	when it failed and produced the core file @var{abfd}.
+
+*/
+
+const char *
+bfd_core_file_failing_command (bfd *abfd)
+{
+  if (abfd->format != bfd_core)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return NULL;
+    }
+  return BFD_SEND (abfd, _core_file_failing_command, (abfd));
+}
+
+/*
+FUNCTION
+	bfd_core_file_failing_signal
+
+SYNOPSIS
+	int bfd_core_file_failing_signal (bfd *abfd);
+
+DESCRIPTION
+	Returns the signal number which caused the core dump which
+	generated the file the BFD @var{abfd} is attached to.
+*/
+
+int
+bfd_core_file_failing_signal (bfd *abfd)
+{
+  if (abfd->format != bfd_core)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return 0;
+    }
+  return BFD_SEND (abfd, _core_file_failing_signal, (abfd));
+}
+
+/*
+FUNCTION
+	bfd_core_file_pid
+
+SYNOPSIS
+	int bfd_core_file_pid (bfd *abfd);
+
+DESCRIPTION
+
+	Returns the PID of the process the core dump the BFD
+	@var{abfd} is attached to was generated from.
+*/
+
+int
+bfd_core_file_pid (bfd *abfd)
+{
+  if (abfd->format != bfd_core)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return 0;
+    }
+  return BFD_SEND (abfd, _core_file_pid, (abfd));
+}
+
+
+/*
+FUNCTION
+	core_file_matches_executable_p
+
+SYNOPSIS
+	bfd_boolean core_file_matches_executable_p
+	  (bfd *core_bfd, bfd *exec_bfd);
+
+DESCRIPTION
+	Return <<TRUE>> if the core file attached to @var{core_bfd}
+	was generated by a run of the executable file attached to
+	@var{exec_bfd}, <<FALSE>> otherwise.
+*/
+
+bfd_boolean
+core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)
+{
+  if (core_bfd->format != bfd_core || exec_bfd->format != bfd_object)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+
+  return BFD_SEND (core_bfd, _core_file_matches_executable_p,
+		   (core_bfd, exec_bfd));
+}
+
+/*
+FUNCTION
+        generic_core_file_matches_executable_p
+
+SYNOPSIS
+        bfd_boolean generic_core_file_matches_executable_p
+          (bfd *core_bfd, bfd *exec_bfd);
+
+DESCRIPTION
+        Return TRUE if the core file attached to @var{core_bfd}
+        was generated by a run of the executable file attached
+        to @var{exec_bfd}.  The match is based on executable
+        basenames only.
+
+        Note: When not able to determine the core file failing
+        command or the executable name, we still return TRUE even
+        though we're not sure that core file and executable match.
+        This is to avoid generating a false warning in situations
+        where we really don't know whether they match or not.
+*/
+
+bfd_boolean
+generic_core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)
+{
+  char *exec;
+  char *core;
+  char *last_slash;
+
+  if (exec_bfd == NULL || core_bfd == NULL)
+    return TRUE;
+
+  /* The cast below is to avoid a compiler warning due to the assignment
+     of the const char * returned by bfd_core_file_failing_command to a
+     non-const char *.  In this case, the assignement does not lead to
+     breaking the const, as we're only reading the string.  */
+     
+  core = (char *) bfd_core_file_failing_command (core_bfd);
+  if (core == NULL)
+    return TRUE;
+
+  exec = bfd_get_filename (exec_bfd);
+  if (exec == NULL)
+    return TRUE;
+
+  last_slash = strrchr (core, '/');
+  if (last_slash != NULL)
+    core = last_slash + 1;
+
+  last_slash = strrchr (exec, '/');
+  if (last_slash != NULL)
+    exec = last_slash + 1;
+  
+  return filename_cmp (exec, core) == 0;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-alpha.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-alpha.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-alpha.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-alpha.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,53 @@
+/* BFD support for the Alpha architecture.
+   Copyright 1992, 1993, 1998, 2000, 2002, 2003, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#define N(BITS_WORD, BITS_ADDR, NUMBER, PRINT, DEFAULT, NEXT) \
+  {							\
+    BITS_WORD, /* bits in a word */			\
+    BITS_ADDR, /* bits in an address */			\
+    8,	/* 8 bits in a byte */				\
+    bfd_arch_alpha,					\
+    NUMBER,						\
+    "alpha",						\
+    PRINT,						\
+    3,							\
+    DEFAULT,						\
+    bfd_default_compatible, 				\
+    bfd_default_scan,					\
+    NEXT,						\
+  }
+
+#define NN(index) (&arch_info_struct[index])
+
+/* These exist only so that we can reasonably disassemble PALcode.  */
+static const bfd_arch_info_type arch_info_struct[] =
+{
+  N (64, 64, bfd_mach_alpha_ev4, "alpha:ev4", FALSE, NN(1)),
+  N (64, 64, bfd_mach_alpha_ev5, "alpha:ev5", FALSE, NN(2)),
+  N (64, 64, bfd_mach_alpha_ev6, "alpha:ev6", FALSE, 0),
+};
+
+const bfd_arch_info_type bfd_alpha_arch =
+  N (64, 64, 0, "alpha", TRUE, NN(0));
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-arc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-arc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-arc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-arc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,72 @@
+/* BFD support for the ARC processor
+   Copyright 1994, 1995, 1997, 2001, 2002, 2005, 2007
+   Free Software Foundation, Inc.
+   Contributed by Doug Evans (dje@cygnus.com).
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#define ARC(mach, print_name, default_p, next) \
+{					\
+    32,	/* 32 bits in a word  */	\
+    32,	/* 32 bits in an address  */	\
+    8,	/* 8 bits in a byte  */		\
+    bfd_arch_arc,			\
+    mach,				\
+    "arc",				\
+    print_name,				\
+    4, /* section alignment power  */	\
+    default_p,				\
+    bfd_default_compatible,		\
+    bfd_default_scan,			\
+    next,				\
+  }
+
+static const bfd_arch_info_type arch_info_struct[] =
+{
+  ARC ( bfd_mach_arc_5, "arc5", FALSE, &arch_info_struct[1] ),
+  ARC ( bfd_mach_arc_5, "base", FALSE, &arch_info_struct[2] ),
+  ARC ( bfd_mach_arc_6, "arc6", FALSE, &arch_info_struct[3] ),
+  ARC ( bfd_mach_arc_7, "arc7", FALSE, &arch_info_struct[4] ),
+  ARC ( bfd_mach_arc_8, "arc8", FALSE, NULL ),
+};
+
+const bfd_arch_info_type bfd_arc_arch =
+  ARC ( bfd_mach_arc_6, "arc", TRUE, &arch_info_struct[0] );
+
+/* Utility routines.  */
+
+/* Given cpu type NAME, return its bfd_mach_arc_xxx value.
+   Returns -1 if not found.  */
+
+int arc_get_mach PARAMS ((char *));
+
+int
+arc_get_mach (name)
+     char *name;
+{
+  const bfd_arch_info_type *p;
+
+  for (p = &bfd_arc_arch; p != NULL; p = p->next)
+    if (strcmp (name, p->printable_name) == 0)
+      return p->mach;
+  return -1;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-arm.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-arm.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-arm.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-arm.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,433 @@
+/* BFD support for the ARM processor
+   Copyright 1994, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007,
+   2009, 2010 Free Software Foundation, Inc.
+   Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libiberty.h"
+
+/* This routine is provided two arch_infos and works out which ARM
+   machine which would be compatible with both and returns a pointer
+   to its info structure.  */
+
+static const bfd_arch_info_type *
+compatible (const bfd_arch_info_type *a, const bfd_arch_info_type *b)
+{
+  /* If a & b are for different architecture we can do nothing.  */
+  if (a->arch != b->arch)
+      return NULL;
+
+  /* If a & b are for the same machine then all is well.  */
+  if (a->mach == b->mach)
+    return a;
+
+  /* Otherwise if either a or b is the 'default' machine
+     then it can be polymorphed into the other.  */
+  if (a->the_default)
+    return b;
+
+  if (b->the_default)
+    return a;
+
+  /* So far all newer ARM architecture cores are
+     supersets of previous cores.  */
+  if (a->mach < b->mach)
+    return b;
+  else if (a->mach > b->mach)
+    return a;
+
+  /* Never reached!  */
+  return NULL;
+}
+
+static struct
+{
+  unsigned int mach;
+  char *       name;
+}
+processors[] =
+{
+  { bfd_mach_arm_2,  "arm2"     },
+  { bfd_mach_arm_2a, "arm250"   },
+  { bfd_mach_arm_2a, "arm3"     },
+  { bfd_mach_arm_3,  "arm6"     },
+  { bfd_mach_arm_3,  "arm60"    },
+  { bfd_mach_arm_3,  "arm600"   },
+  { bfd_mach_arm_3,  "arm610"   },
+  { bfd_mach_arm_3,  "arm7"     },
+  { bfd_mach_arm_3,  "arm710"   },
+  { bfd_mach_arm_3,  "arm7500"  },
+  { bfd_mach_arm_3,  "arm7d"    },
+  { bfd_mach_arm_3,  "arm7di"   },
+  { bfd_mach_arm_3M, "arm7dm"   },
+  { bfd_mach_arm_3M, "arm7dmi"  },
+  { bfd_mach_arm_4T, "arm7tdmi" },
+  { bfd_mach_arm_4,  "arm8"     },
+  { bfd_mach_arm_4,  "arm810"   },
+  { bfd_mach_arm_4,  "arm9"     },
+  { bfd_mach_arm_4,  "arm920"   },
+  { bfd_mach_arm_4T, "arm920t"  },
+  { bfd_mach_arm_4T, "arm9tdmi" },
+  { bfd_mach_arm_4,  "sa1"      },
+  { bfd_mach_arm_4,  "strongarm"},
+  { bfd_mach_arm_4,  "strongarm110" },
+  { bfd_mach_arm_4,  "strongarm1100" },
+  { bfd_mach_arm_XScale, "xscale" },
+  { bfd_mach_arm_ep9312, "ep9312" },
+  { bfd_mach_arm_iWMMXt, "iwmmxt" },
+  { bfd_mach_arm_iWMMXt2, "iwmmxt2" }
+};
+
+static bfd_boolean
+scan (const struct bfd_arch_info *info, const char *string)
+{
+  int  i;
+
+  /* First test for an exact match.  */
+  if (strcasecmp (string, info->printable_name) == 0)
+    return TRUE;
+
+  /* Next check for a processor name instead of an Architecture name.  */
+  for (i = sizeof (processors) / sizeof (processors[0]); i--;)
+    {
+      if (strcasecmp (string, processors [i].name) == 0)
+	break;
+    }
+
+  if (i != -1 && info->mach == processors [i].mach)
+    return TRUE;
+
+  /* Finally check for the default architecture.  */
+  if (strcasecmp (string, "arm") == 0)
+    return info->the_default;
+
+  return FALSE;
+}
+
+#define N(number, print, default, next)  \
+{  32, 32, 8, bfd_arch_arm, number, "arm", print, 4, default, compatible, scan, next }
+
+static const bfd_arch_info_type arch_info_struct[] =
+{
+  N (bfd_mach_arm_2,      "armv2",   FALSE, & arch_info_struct[1]),
+  N (bfd_mach_arm_2a,     "armv2a",  FALSE, & arch_info_struct[2]),
+  N (bfd_mach_arm_3,      "armv3",   FALSE, & arch_info_struct[3]),
+  N (bfd_mach_arm_3M,     "armv3m",  FALSE, & arch_info_struct[4]),
+  N (bfd_mach_arm_4,      "armv4",   FALSE, & arch_info_struct[5]),
+  N (bfd_mach_arm_4T,     "armv4t",  FALSE, & arch_info_struct[6]),
+  N (bfd_mach_arm_5,      "armv5",   FALSE, & arch_info_struct[7]),
+  N (bfd_mach_arm_5T,     "armv5t",  FALSE, & arch_info_struct[8]),
+  N (bfd_mach_arm_5TE,    "armv5te", FALSE, & arch_info_struct[9]),
+  N (bfd_mach_arm_XScale, "xscale",  FALSE, & arch_info_struct[10]),
+  N (bfd_mach_arm_ep9312, "ep9312",  FALSE, & arch_info_struct[11]),
+  N (bfd_mach_arm_iWMMXt, "iwmmxt",  FALSE, & arch_info_struct[12]),
+  N (bfd_mach_arm_iWMMXt2, "iwmmxt2", FALSE, NULL)
+};
+
+const bfd_arch_info_type bfd_arm_arch =
+  N (0, "arm", TRUE, & arch_info_struct[0]);
+
+/* Support functions used by both the COFF and ELF versions of the ARM port.  */
+
+/* Handle the merging of the 'machine' settings of input file IBFD
+   and an output file OBFD.  These values actually represent the
+   different possible ARM architecture variants.
+   Returns TRUE if they were merged successfully or FALSE otherwise.  */
+
+bfd_boolean
+bfd_arm_merge_machines (bfd *ibfd, bfd *obfd)
+{
+  unsigned int in  = bfd_get_mach (ibfd);
+  unsigned int out = bfd_get_mach (obfd);
+
+  /* If the output architecture is unknown, we now have a value to set.  */
+  if (out == bfd_mach_arm_unknown)
+    bfd_set_arch_mach (obfd, bfd_arch_arm, in);
+
+  /* If the input architecture is unknown,
+     then so must be the output architecture.  */
+  else if (in == bfd_mach_arm_unknown)
+    /* FIXME: We ought to have some way to
+       override this on the command line.  */
+    bfd_set_arch_mach (obfd, bfd_arch_arm, bfd_mach_arm_unknown);
+
+  /* If they are the same then nothing needs to be done.  */
+  else if (out == in)
+    ;
+
+  /* Otherwise the general principle that a earlier architecture can be
+     linked with a later architecture to produce a binary that will execute
+     on the later architecture.
+
+     We fail however if we attempt to link a Cirrus EP9312 binary with an
+     Intel XScale binary, since these architecture have co-processors which
+     will not both be present on the same physical hardware.  */
+  else if (in == bfd_mach_arm_ep9312
+	   && (out == bfd_mach_arm_XScale
+	       || out == bfd_mach_arm_iWMMXt
+	       || out == bfd_mach_arm_iWMMXt2))
+    {
+      _bfd_error_handler (_("\
+error: %B is compiled for the EP9312, whereas %B is compiled for XScale"),
+			  ibfd, obfd);
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+  else if (out == bfd_mach_arm_ep9312
+	   && (in == bfd_mach_arm_XScale
+	       || in == bfd_mach_arm_iWMMXt
+	       || in == bfd_mach_arm_iWMMXt2))
+    {
+      _bfd_error_handler (_("\
+error: %B is compiled for the EP9312, whereas %B is compiled for XScale"),
+			  obfd, ibfd);
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+  else if (in > out)
+    bfd_set_arch_mach (obfd, bfd_arch_arm, in);
+  /* else
+     Nothing to do.  */
+
+  return TRUE;
+}
+
+typedef struct
+{
+  unsigned char	namesz[4];	/* Size of entry's owner string.  */
+  unsigned char	descsz[4];	/* Size of the note descriptor.  */
+  unsigned char	type[4];	/* Interpretation of the descriptor.  */
+  char		name[1];	/* Start of the name+desc data.  */
+} arm_Note;
+
+static bfd_boolean
+arm_check_note (bfd *abfd,
+		bfd_byte *buffer,
+		bfd_size_type buffer_size,
+		const char *expected_name,
+		char **description_return)
+{
+  unsigned long namesz;
+  unsigned long descsz;
+  unsigned long type;
+  char *        descr;
+
+  if (buffer_size < offsetof (arm_Note, name))
+    return FALSE;
+
+  /* We have to extract the values this way to allow for a
+     host whose endian-ness is different from the target.  */
+  namesz = bfd_get_32 (abfd, buffer);
+  descsz = bfd_get_32 (abfd, buffer + offsetof (arm_Note, descsz));
+  type   = bfd_get_32 (abfd, buffer + offsetof (arm_Note, type));
+  descr  = (char *) buffer + offsetof (arm_Note, name);
+
+  /* Check for buffer overflow.  */
+  if (namesz + descsz + offsetof (arm_Note, name) > buffer_size)
+    return FALSE;
+
+  if (expected_name == NULL)
+    {
+      if (namesz != 0)
+	return FALSE;
+    }
+  else
+    { 
+      if (namesz != ((strlen (expected_name) + 1 + 3) & ~3))
+	return FALSE;
+      
+      if (strcmp (descr, expected_name) != 0)
+	return FALSE;
+
+      descr += (namesz + 3) & ~3;
+    }
+
+  /* FIXME: We should probably check the type as well.  */
+  (void) type;
+
+  if (description_return != NULL)
+    * description_return = descr;
+
+  return TRUE;
+}
+
+#define NOTE_ARCH_STRING 	"arch: "
+
+bfd_boolean
+bfd_arm_update_notes (bfd *abfd, const char *note_section)
+{
+  asection *     arm_arch_section;
+  bfd_size_type  buffer_size;
+  bfd_byte *     buffer;
+  char *         arch_string;
+  char *         expected;
+
+  /* Look for a note section.  If one is present check the architecture
+     string encoded in it, and set it to the current architecture if it is
+     different.  */
+  arm_arch_section = bfd_get_section_by_name (abfd, note_section);
+
+  if (arm_arch_section == NULL)
+    return TRUE;
+
+  buffer_size = arm_arch_section->size;
+  if (buffer_size == 0)
+    return FALSE;
+
+  if (!bfd_malloc_and_get_section (abfd, arm_arch_section, &buffer))
+    goto FAIL;
+
+  /* Parse the note.  */
+  if (! arm_check_note (abfd, buffer, buffer_size, NOTE_ARCH_STRING, & arch_string))
+    goto FAIL;
+
+  /* Check the architecture in the note against the architecture of the bfd.  */
+  switch (bfd_get_mach (abfd))
+    {
+    default:
+    case bfd_mach_arm_unknown: expected = "unknown"; break;
+    case bfd_mach_arm_2:       expected = "armv2"; break;
+    case bfd_mach_arm_2a:      expected = "armv2a"; break;
+    case bfd_mach_arm_3:       expected = "armv3"; break;
+    case bfd_mach_arm_3M:      expected = "armv3M"; break;
+    case bfd_mach_arm_4:       expected = "armv4"; break;
+    case bfd_mach_arm_4T:      expected = "armv4t"; break;
+    case bfd_mach_arm_5:       expected = "armv5"; break;
+    case bfd_mach_arm_5T:      expected = "armv5t"; break;
+    case bfd_mach_arm_5TE:     expected = "armv5te"; break;
+    case bfd_mach_arm_XScale:  expected = "XScale"; break;
+    case bfd_mach_arm_ep9312:  expected = "ep9312"; break;
+    case bfd_mach_arm_iWMMXt:  expected = "iWMMXt"; break;
+    case bfd_mach_arm_iWMMXt2: expected = "iWMMXt2"; break;
+    }
+
+  if (strcmp (arch_string, expected) != 0)
+    {
+      strcpy ((char *) buffer + (offsetof (arm_Note, name)
+				 + ((strlen (NOTE_ARCH_STRING) + 3) & ~3)),
+	      expected);
+
+      if (! bfd_set_section_contents (abfd, arm_arch_section, buffer,
+				      (file_ptr) 0, buffer_size))
+	{
+	  (*_bfd_error_handler)
+	    (_("warning: unable to update contents of %s section in %s"),
+	     note_section, bfd_get_filename (abfd));
+	  goto FAIL;
+	}
+    }
+
+  free (buffer);
+  return TRUE;
+
+ FAIL:
+  if (buffer != NULL)
+    free (buffer);
+  return FALSE;
+}
+
+
+static struct
+{
+  const char * string;
+  unsigned int mach;
+}
+architectures[] =
+{
+  { "armv2",   bfd_mach_arm_2 },
+  { "armv2a",  bfd_mach_arm_2a },
+  { "armv3",   bfd_mach_arm_3 },
+  { "armv3M",  bfd_mach_arm_3M },
+  { "armv4",   bfd_mach_arm_4 },
+  { "armv4t",  bfd_mach_arm_4T },
+  { "armv5",   bfd_mach_arm_5 },
+  { "armv5t",  bfd_mach_arm_5T },
+  { "armv5te", bfd_mach_arm_5TE },
+  { "XScale",  bfd_mach_arm_XScale },
+  { "ep9312",  bfd_mach_arm_ep9312 },
+  { "iWMMXt",  bfd_mach_arm_iWMMXt },
+  { "iWMMXt2", bfd_mach_arm_iWMMXt2 }
+};
+
+/* Extract the machine number stored in a note section.  */
+unsigned int
+bfd_arm_get_mach_from_notes (bfd *abfd, const char *note_section)
+{
+  asection *     arm_arch_section;
+  bfd_size_type  buffer_size;
+  bfd_byte *     buffer;
+  char *         arch_string;
+  int            i;
+
+  /* Look for a note section.  If one is present check the architecture
+     string encoded in it, and set it to the current architecture if it is
+     different.  */
+  arm_arch_section = bfd_get_section_by_name (abfd, note_section);
+
+  if (arm_arch_section == NULL)
+    return bfd_mach_arm_unknown;
+
+  buffer_size = arm_arch_section->size;
+  if (buffer_size == 0)
+    return bfd_mach_arm_unknown;
+
+  if (!bfd_malloc_and_get_section (abfd, arm_arch_section, &buffer))
+    goto FAIL;
+
+  /* Parse the note.  */
+  if (! arm_check_note (abfd, buffer, buffer_size, NOTE_ARCH_STRING, & arch_string))
+    goto FAIL;
+
+  /* Interpret the architecture string.  */
+  for (i = ARRAY_SIZE (architectures); i--;)
+    if (strcmp (arch_string, architectures[i].string) == 0)
+      {
+	free (buffer);
+	return architectures[i].mach;
+      }
+
+ FAIL:
+  if (buffer != NULL)
+    free (buffer);
+  return bfd_mach_arm_unknown;
+}
+
+bfd_boolean
+bfd_is_arm_special_symbol_name (const char * name, int type)
+{
+  /* The ARM compiler outputs several obsolete forms.  Recognize them
+     in addition to the standard $a, $t and $d.  We are somewhat loose
+     in what we accept here, since the full set is not documented.  */
+  if (!name || name[0] != '$')
+    return FALSE;
+  if (name[1] == 'a' || name[1] == 't' || name[1] == 'd')
+    type &= BFD_ARM_SPECIAL_SYM_TYPE_MAP;
+  else if (name[1] == 'm' || name[1] == 'f' || name[1] == 'p')
+    type &= BFD_ARM_SPECIAL_SYM_TYPE_TAG;
+  else if (name[1] >= 'a' && name[1] <= 'z')
+    type &= BFD_ARM_SPECIAL_SYM_TYPE_OTHER;
+  else
+    return FALSE;
+
+  return (type != 0 && (name[2] == 0 || name[2] == '.'));
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-avr.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-avr.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-avr.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-avr.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,162 @@
+/* BFD library support routines for the AVR architecture.
+   Copyright 1999, 2000, 2002, 2005, 2006, 2007, 2008
+   Free Software Foundation, Inc.
+   Contributed by Denis Chertykov <denisc@overta.ru>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+/* This routine is provided two arch_infos and works out which AVR
+   machine which would be compatible with both and returns a pointer
+   to its info structure.  */
+
+static const bfd_arch_info_type *
+compatible (const bfd_arch_info_type * a,
+	    const bfd_arch_info_type * b)
+{
+  /* If a & b are for different architectures we can do nothing.  */
+  if (a->arch != b->arch)
+    return NULL;
+
+  if (a->mach == b->mach)
+    return a;
+
+  /* avr-6 is compatible only with itself as its call convention is not
+     compatible with other avr (the mcu saves the return address on 3 bytes
+     instead of 2).  */
+  if (a->mach == bfd_mach_avr6 || b->mach == bfd_mach_avr6)
+    return NULL;
+
+  if (a->mach < bfd_mach_avr6 && b->mach < bfd_mach_avr6)
+    {
+      /* Special case for ATmega[16]03 (avr:3) and ATmega83 (avr:4).  */
+      if ((a->mach == bfd_mach_avr3 && b->mach == bfd_mach_avr4)
+         || (a->mach == bfd_mach_avr4 && b->mach == bfd_mach_avr3))
+       return NULL;
+
+      if (a->mach <= b->mach)
+       return b;
+       
+      if (a->mach >= b->mach)
+       return a;
+    }
+
+  if (a->mach == bfd_mach_avr2 && b->mach == bfd_mach_avr25)
+    return a;
+  if (a->mach == bfd_mach_avr25 && b->mach == bfd_mach_avr2)
+    return b;
+    
+  if (a->mach == bfd_mach_avr3 && b->mach == bfd_mach_avr31)
+    return a;
+  if (a->mach == bfd_mach_avr31 && b->mach == bfd_mach_avr3)
+    return b;
+
+  if (a->mach == bfd_mach_avr3 && b->mach == bfd_mach_avr35)
+    return a;
+  if (a->mach == bfd_mach_avr35 && b->mach == bfd_mach_avr3)
+    return b;
+
+  if (a->mach == bfd_mach_avr5 && b->mach == bfd_mach_avr51)
+    return a;
+  if (a->mach == bfd_mach_avr51 && b->mach == bfd_mach_avr5)
+    return b;
+
+
+  return NULL;
+}
+
+#define N(addr_bits, machine, print, default, next)		\
+{								\
+  8,				/* 8 bits in a word.  */	\
+  addr_bits,			/* bits in an address.  */	\
+  8,				/* 8 bits in a byte.  */	\
+  bfd_arch_avr,							\
+  machine,			/* Machine number.  */		\
+  "avr",			/* Architecture name.   */	\
+  print,			/* Printable name.  */		\
+  1,				/* Section align power.  */	\
+  default,			/* Is this the default ?  */	\
+  compatible,							\
+  bfd_default_scan,						\
+  next								\
+}
+
+static const bfd_arch_info_type arch_info_struct[] =
+{
+  /* Assembler only.  */
+  N (16, bfd_mach_avr1, "avr:1", FALSE, & arch_info_struct[1]),
+
+  /* Classic, <= 8K.  */
+  N (16, bfd_mach_avr2, "avr:2", FALSE, & arch_info_struct[2]),
+
+  /* Classic + MOVW, <= 8K.  */
+  N (16, bfd_mach_avr25, "avr:25", FALSE, & arch_info_struct[3]),
+
+  /* Classic, > 8K, <= 64K.  */
+  /* TODO:  addr_bits should be 16, but set to 22 for some following 
+     version of GCC (from 4.3) for backward compatibility.  */
+  N (22, bfd_mach_avr3, "avr:3", FALSE, & arch_info_struct[4]),
+
+  /* Classic, == 128K.  */
+  N (22, bfd_mach_avr31, "avr:31", FALSE, & arch_info_struct[5]),
+
+  /* Classic + MOVW + JMP/CALL, > 8K, <= 64K. */
+  N (16, bfd_mach_avr35, "avr:35", FALSE, & arch_info_struct[6]),
+
+  /* Enhanced, <= 8K.  */
+  N (16, bfd_mach_avr4, "avr:4", FALSE, & arch_info_struct[7]),
+
+  /* Enhanced, > 8K, <= 64K.  */
+  /* TODO:  addr_bits should be 16, but set to 22 for some following 
+     version of GCC (from 4.3) for backward compatibility.  */
+  N (22, bfd_mach_avr5, "avr:5", FALSE, & arch_info_struct[8]),
+  
+  /* Enhanced, == 128K.  */
+  N (22, bfd_mach_avr51, "avr:51", FALSE, & arch_info_struct[9]),
+
+  /* 3-Byte PC.  */
+  N (22, bfd_mach_avr6, "avr:6", FALSE, & arch_info_struct[10]),
+  
+  /* Xmega 1 */
+  N (24, bfd_mach_avrxmega1, "avr:101", FALSE, & arch_info_struct[11]),
+
+  /* Xmega 2 */
+  N (24, bfd_mach_avrxmega2, "avr:102", FALSE, & arch_info_struct[12]),
+  
+  /* Xmega 3 */
+  N (24, bfd_mach_avrxmega3, "avr:103", FALSE, & arch_info_struct[13]),
+  
+  /* Xmega 4 */
+  N (24, bfd_mach_avrxmega4, "avr:104", FALSE, & arch_info_struct[14]),
+  
+  /* Xmega 5 */
+  N (24, bfd_mach_avrxmega5, "avr:105", FALSE, & arch_info_struct[15]),
+  
+  /* Xmega 6 */
+  N (24, bfd_mach_avrxmega6, "avr:106", FALSE, & arch_info_struct[16]),
+  
+  /* Xmega 7 */
+  N (24, bfd_mach_avrxmega7, "avr:107", FALSE, NULL)
+  
+};
+
+const bfd_arch_info_type bfd_avr_arch =
+  N (16, bfd_mach_avr2, "avr", TRUE, & arch_info_struct[0]);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-bfin.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-bfin.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-bfin.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-bfin.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,40 @@
+/* BFD Support for the ADI Blackfin processor.
+
+   Copyright 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_bfin_arch =
+  {
+    16,     		/* Bits in a word.  */
+    32,  		/* Bits in an address.  */
+    8,     		/* Bits in a byte.  */
+    bfd_arch_bfin,
+    0,                	/* Only one machine.  */
+    "bfin",        	/* Arch name.  */
+    "bfin",        	/* Arch printable name.  */
+    4,                	/* Section align power.  */
+    TRUE,             	/* The one and only.  */
+    bfd_default_compatible, 
+    bfd_default_scan ,
+    0,
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-cr16.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-cr16.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-cr16.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-cr16.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,40 @@
+/* BFD support for the CR16 processor.
+   Copyright 2007 Free Software Foundation, Inc.
+   Written by M R Swami Reddy
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+
+const bfd_arch_info_type bfd_cr16_arch =
+  {
+    16,               /* 16 bits in a word.  */
+    32,               /* 32 bits in an address.  */
+    8,                /*  8 bits in a byte.  */
+    bfd_arch_cr16,    /* enum bfd_architecture arch.  */
+    bfd_mach_cr16,
+    "cr16",           /* Arch name.  */
+    "cr16",           /* Printable name.  */
+    1,                /* Unsigned int section alignment power.  */
+    TRUE,             /* The one and only.  */
+    bfd_default_compatible, 
+    bfd_default_scan ,
+    0,
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-cr16c.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-cr16c.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-cr16c.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-cr16c.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,39 @@
+/* BFD support for the CR16C processor.
+   Copyright 2004, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_cr16c_arch =
+  {
+    16,		/* 16 bits in a word.  */
+    32,		/* 32 bits in an address.  */
+    8,		/*  8 bits in a byte.  */
+    bfd_arch_cr16c,
+    bfd_mach_cr16c,
+    "cr16c",
+    "cr16c",
+    1,
+    TRUE, 	/* The one and only.  */
+    bfd_default_compatible, 
+    bfd_default_scan ,
+    0,
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-cris.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-cris.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-cris.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-cris.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,110 @@
+/* BFD support for the Axis CRIS architecture.
+   Copyright 2000, 2002, 2004, 2005, 2007
+   Free Software Foundation, Inc.
+   Contributed by Axis Communications AB.
+   Written by Hans-Peter Nilsson.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+/* This routine is provided two arch_infos and returns the lowest common
+   denominator.  CRIS v0..v10 vs. v32 are not compatible in general, but
+   there's a compatible subset for which we provide an arch_info.  */
+
+static const bfd_arch_info_type * get_compatible
+  PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
+
+static const bfd_arch_info_type *
+get_compatible (a,b)
+     const bfd_arch_info_type *a;
+     const bfd_arch_info_type *b;
+{
+  /* Arches must match.  */
+  if (a->arch != b->arch)
+   return NULL;
+
+  /* If either is the compatible mach, return the other.  */
+  if (a->mach == bfd_mach_cris_v10_v32)
+    return b;
+  if (b->mach == bfd_mach_cris_v10_v32)
+    return a;
+
+#if 0
+  /* The code below is disabled but kept as a warning.
+     See ldlang.c:lang_check.  Quite illogically, incompatible arches
+     (as signalled by this function) are only *warned* about, while with
+     this function signalling compatible ones, we can have the
+     cris_elf_merge_private_bfd_data function return an error.  This is
+     undoubtedly a FIXME: in general.  Also, the
+     command_line.warn_mismatch flag and the --no-warn-mismatch option
+     are misnamed for the multitude of ports that signal compatibility:
+     it is there an error, not a warning.  We work around it by
+     pretending matching machs here.  */
+
+  /* Except for the compatible mach, machs must match.  */
+  if (a->mach != b->mach)
+    return NULL;
+#endif
+
+  return a;
+}
+
+#define N(NUMBER, PRINT, NEXT)  \
+ { 32, 32, 8, bfd_arch_cris, NUMBER, "cris", PRINT, 1, FALSE, \
+   get_compatible, bfd_default_scan, NEXT }
+
+static const bfd_arch_info_type bfd_cris_arch_compat_v10_v32 =
+ N (bfd_mach_cris_v10_v32, "cris:common_v10_v32", NULL);
+
+static const bfd_arch_info_type bfd_cris_arch_v32 =
+ N (bfd_mach_cris_v32, "crisv32", &bfd_cris_arch_compat_v10_v32);
+
+const bfd_arch_info_type bfd_cris_arch =
+{
+  32,				/* There's 32 bits_per_word.  */
+  32,				/* There's 32 bits_per_address.  */
+  8,				/* There's 8 bits_per_byte.  */
+  bfd_arch_cris,		/* One of enum bfd_architecture, defined
+				   in archures.c and provided in
+				   generated header files.  */
+  bfd_mach_cris_v0_v10,		/* Random BFD-internal number for this
+				   machine, similarly listed in
+				   archures.c.  Not emitted in output.  */
+  "cris",			/* The arch_name.  */
+  "cris",			/* The printable name is the same.  */
+  1,				/* Section alignment power; each section
+				   is aligned to (only) 2^1 bytes.  */
+  TRUE,				/* This is the default "machine".  */
+  get_compatible,		/* A function for testing
+				   "machine" compatibility of two
+				   bfd_arch_info_type.  */
+  bfd_default_scan,		/* Check if a bfd_arch_info_type is a
+				   match.  */
+  &bfd_cris_arch_v32		/* Pointer to next bfd_arch_info_type in
+				   the same family.  */
+};
+
+/*
+ * Local variables:
+ * eval: (c-set-style "gnu")
+ * indent-tabs-mode: t
+ * End:
+ */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-crx.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-crx.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-crx.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-crx.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,40 @@
+/* BFD support for the CRX processor.
+   Copyright 2004, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+
+const bfd_arch_info_type bfd_crx_arch =
+  {
+    16,		/* 16 bits in a word.  */
+    32,		/* 32 bits in an address.  */
+    8,		/*  8 bits in a byte.  */
+    bfd_arch_crx, /* enum bfd_architecture arch.  */
+    bfd_mach_crx,
+    "crx", 	/* Arch name.  */
+    "crx", 	/* Printable name.  */
+    1,      	/* Unsigned int section alignment power.  */
+    TRUE, 	/* The one and only.  */
+    bfd_default_compatible, 
+    bfd_default_scan ,
+    0,
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-d10v.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-d10v.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-d10v.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-d10v.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,73 @@
+/* BFD support for the D10V processor
+   Copyright 1996, 1999, 2000, 2002, 2005, 2007, 2010
+   Free Software Foundation, Inc.
+   Contributed by Martin Hunt (hunt@cygnus.com).
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+static const bfd_arch_info_type d10v_ts3_info =
+{
+  16,	/* 16 bits in a word.  */
+  18,	/* really 16 bits in an address, but code has 18 bit range.  */
+  8,	/* 8 bits in a byte.  */
+  bfd_arch_d10v,
+  bfd_mach_d10v_ts3,
+  "d10v",
+  "d10v:ts3",
+  4, 	/* Section alignment power.  */
+  FALSE,
+  bfd_default_compatible,
+  bfd_default_scan,
+  0,
+};
+
+static const bfd_arch_info_type d10v_ts2_info =
+{
+  16,
+  18,
+  8,
+  bfd_arch_d10v,
+  bfd_mach_d10v_ts2,
+  "d10v",
+  "d10v:ts2",
+  4,
+  FALSE,
+  bfd_default_compatible,
+  bfd_default_scan,
+  & d10v_ts3_info,
+};
+
+const bfd_arch_info_type bfd_d10v_arch =
+{
+  16,
+  18,
+  8,
+  bfd_arch_d10v,
+  bfd_mach_d10v,
+  "d10v",
+  "d10v",
+  4,
+  TRUE,
+  bfd_default_compatible,
+  bfd_default_scan,
+  & d10v_ts2_info,
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-d30v.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-d30v.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-d30v.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-d30v.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,40 @@
+/* BFD support for the Mitsubishi D30V processor
+   Copyright 1997, 2002, 2005, 2007 Free Software Foundation, Inc.
+   Contributed by Martin Hunt (hunt@cygnus.com).
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_d30v_arch =
+{
+    32,	/* Bits in a word.  */
+    32,	/* Bits in an address.  */
+    8,	/* Bits in a byte.  */
+    bfd_arch_d30v,
+    0,
+    "d30v",
+    "d30v",
+    4, /* Section alignment power.  */
+    TRUE,
+    bfd_default_compatible,
+    bfd_default_scan,
+    0,
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-dlx.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-dlx.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-dlx.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-dlx.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,40 @@
+/* BFD support for the DLX Microprocessor architecture.
+   Copyright 2002, 2005, 2007 Free Software Foundation, Inc.
+   Hacked by Kuang Hwa Lin <kuang@sbcglobal.net>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_dlx_arch =
+  {
+    32,	/* 32 bits in a word.  */
+    32,	/* 32 bits in an address.  */
+    8,	/* 8 bits in a byte.  */
+    bfd_arch_dlx,
+    0,	/* Only 1 machine.  */
+    "dlx",
+    "dlx",
+    4,
+    TRUE, /* The one and only.  */
+    bfd_default_compatible,
+    bfd_default_scan ,
+    0,
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-fr30.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-fr30.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-fr30.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-fr30.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,39 @@
+/* BFD support for the FR30 processor.
+   Copyright 1998, 2002, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_fr30_arch =
+{
+  32,				/* bits per word */
+  32,				/* bits per address */
+  8,				/* bits per byte */
+  bfd_arch_fr30,		/* architecture */
+  bfd_mach_fr30,		/* machine */
+  "fr30",			/* architecture name */
+  "fr30",			/* printable name */
+  4,				/* section align power */
+  TRUE,				/* the default ? */
+  bfd_default_compatible,	/* architecture comparison fn */
+  bfd_default_scan,		/* string to architecture convert fn */
+  NULL				/* next in list */
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-frv.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-frv.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-frv.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-frv.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,64 @@
+/* BFD support for the FRV processor.
+   Copyright 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#define FRV_ARCH(MACHINE, NAME, DEFAULT, NEXT)				\
+{									\
+  32,	                        /* 32 bits in a word */			\
+  32,	                        /* 32 bits in an address */		\
+  8,	                        /* 8 bits in a byte */			\
+  bfd_arch_frv,			/* architecture */			\
+  MACHINE,			/* which machine */			\
+  "frv",			/* architecture name */			\
+  NAME,				/* machine name */			\
+  4,				/* default alignment */			\
+  DEFAULT,			/* is this the default? */		\
+  bfd_default_compatible,	/* architecture comparison fn */	\
+  bfd_default_scan,		/* string to architecture convert fn */	\
+  NEXT				/* next in list */			\
+}
+
+static const bfd_arch_info_type arch_info_300
+  = FRV_ARCH (bfd_mach_fr300,   "fr300",   FALSE, (bfd_arch_info_type *)0);
+
+static const bfd_arch_info_type arch_info_400
+  = FRV_ARCH (bfd_mach_fr400, "fr400", FALSE, &arch_info_300);
+
+static const bfd_arch_info_type arch_info_450
+  = FRV_ARCH (bfd_mach_fr450, "fr450", FALSE, &arch_info_400);
+
+static const bfd_arch_info_type arch_info_500
+  = FRV_ARCH (bfd_mach_fr500, "fr500", FALSE, &arch_info_450);
+
+static const bfd_arch_info_type arch_info_550
+  = FRV_ARCH (bfd_mach_fr550, "fr550", FALSE, &arch_info_500);
+
+static const bfd_arch_info_type arch_info_simple
+  = FRV_ARCH (bfd_mach_frvsimple, "simple", FALSE, &arch_info_550);
+
+static const bfd_arch_info_type arch_info_tomcat
+  = FRV_ARCH (bfd_mach_frvtomcat, "tomcat", FALSE, &arch_info_simple);
+
+const bfd_arch_info_type bfd_frv_arch
+  = FRV_ARCH (bfd_mach_frv, "frv", TRUE, &arch_info_tomcat);
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-h8300.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-h8300.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-h8300.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-h8300.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,262 @@
+/* BFD library support routines for the Renesas H8/300 architecture.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2000, 2001, 2002,
+   2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+   Hacked by Steve Chamberlain of Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+static bfd_boolean
+h8300_scan (const struct bfd_arch_info *info, const char *string)
+{
+  if (*string != 'h' && *string != 'H')
+    return FALSE;
+
+  string++;
+  if (*string != '8')
+    return FALSE;
+
+  string++;
+  if (*string == '/')
+    string++;
+
+  if (*string != '3')
+    return FALSE;
+  string++;
+  if (*string != '0')
+    return FALSE;
+  string++;
+  if (*string != '0')
+    return FALSE;
+  string++;
+  if (*string == '-')
+    string++;
+
+  /* In ELF linker scripts, we typically express the architecture/machine
+     as architecture:machine.
+
+     So if we've matched so far and encounter a colon, try to match the
+     string following the colon.  */
+  if (*string == ':')
+    {
+      string++;
+      return h8300_scan (info, string);
+    }
+
+  if (*string == 'h' || *string == 'H')
+    {
+      string++;
+      if (*string == 'n' || *string == 'N')
+	return (info->mach == bfd_mach_h8300hn);
+
+      return (info->mach == bfd_mach_h8300h);
+    }
+  else if (*string == 's' || *string == 'S')
+    {
+      string++;
+      if (*string == 'n' || *string == 'N')
+	return (info->mach == bfd_mach_h8300sn);
+
+      if (*string == 'x' || *string == 'X')
+	{
+	  string++;
+	  if (*string == 'n' || *string == 'N')
+	    return (info->mach == bfd_mach_h8300sxn);
+
+	  return (info->mach == bfd_mach_h8300sx);
+	}
+      
+      return (info->mach == bfd_mach_h8300s);
+    }
+  else
+    return info->mach == bfd_mach_h8300;
+}
+
+/* This routine is provided two arch_infos and works out the machine
+   which would be compatible with both and returns a pointer to its
+   info structure.  */
+
+static const bfd_arch_info_type *
+compatible (const bfd_arch_info_type *in, const bfd_arch_info_type *out)
+{
+  if (in->arch != out->arch)
+    return 0;
+  if (in->mach == bfd_mach_h8300sx && out->mach == bfd_mach_h8300s)
+    return in;
+  if (in->mach == bfd_mach_h8300s && out->mach == bfd_mach_h8300sx)
+    return out;
+  if (in->mach == bfd_mach_h8300sxn && out->mach == bfd_mach_h8300sn)
+    return in;
+  if (in->mach == bfd_mach_h8300sn && out->mach == bfd_mach_h8300sxn)
+    return out;
+  /* It's really not a good idea to mix and match modes.  */
+  if (in->mach != out->mach)
+    return 0;
+  else
+    return in;
+}
+
+static const bfd_arch_info_type h8300sxn_info_struct =
+{
+  32,				/* 32 bits in a word */
+  16,				/* 16 bits in an address */
+  8,				/* 8 bits in a byte */
+  bfd_arch_h8300,
+  bfd_mach_h8300sxn,
+  "h8300sxn",			/* arch_name  */
+  "h8300sxn",			/* printable name */
+  1,
+  FALSE,			/* the default machine */
+  compatible,
+  h8300_scan,
+  0
+};
+
+static const bfd_arch_info_type h8300sx_info_struct =
+{
+  32,				/* 32 bits in a word */
+  32,				/* 32 bits in an address */
+  8,				/* 8 bits in a byte */
+  bfd_arch_h8300,
+  bfd_mach_h8300sx,
+  "h8300sx",			/* arch_name  */
+  "h8300sx",			/* printable name */
+  1,
+  FALSE,			/* the default machine */
+  compatible,
+  h8300_scan,
+  &h8300sxn_info_struct
+};
+
+static const bfd_arch_info_type h8300sn_info_struct =
+{
+  32,				/* 32 bits in a word.  */
+  16,				/* 16 bits in an address.  */
+  8,				/* 8 bits in a byte.  */
+  bfd_arch_h8300,
+  bfd_mach_h8300sn,
+  "h8300sn",			/* Architecture name.  */
+  "h8300sn",			/* Printable name.  */
+  1,
+  FALSE,			/* The default machine.  */
+  compatible,
+  h8300_scan,
+  &h8300sx_info_struct
+};
+
+static const bfd_arch_info_type h8300hn_info_struct =
+{
+  32,				/* 32 bits in a word.  */
+  16,				/* 16 bits in an address.  */
+  8,				/* 8 bits in a byte.  */
+  bfd_arch_h8300,
+  bfd_mach_h8300hn,
+  "h8300hn",			/* Architecture name.  */
+  "h8300hn",			/* Printable name.  */
+  1,
+  FALSE,			/* The default machine.  */
+  compatible,
+  h8300_scan,
+  &h8300sn_info_struct
+};
+
+static const bfd_arch_info_type h8300s_info_struct =
+{
+  32,				/* 32 bits in a word.  */
+  32,				/* 32 bits in an address.  */
+  8,				/* 8 bits in a byte.  */
+  bfd_arch_h8300,
+  bfd_mach_h8300s,
+  "h8300s",			/* Architecture name.  */
+  "h8300s",			/* Printable name.  */
+  1,
+  FALSE,			/* The default machine.  */
+  compatible,
+  h8300_scan,
+  & h8300hn_info_struct
+};
+
+static const bfd_arch_info_type h8300h_info_struct =
+{
+  32,				/* 32 bits in a word.  */
+  32,				/* 32 bits in an address.  */
+  8,				/* 8 bits in a byte.  */
+  bfd_arch_h8300,
+  bfd_mach_h8300h,
+  "h8300h",			/* Architecture name.  */
+  "h8300h",			/* Printable name.  */
+  1,
+  FALSE,			/* The default machine.  */
+  compatible,
+  h8300_scan,
+  &h8300s_info_struct
+};
+
+const bfd_arch_info_type bfd_h8300_arch =
+{
+  16,				/* 16 bits in a word.  */
+  16,				/* 16 bits in an address.  */
+  8,				/* 8 bits in a byte.  */
+  bfd_arch_h8300,
+  bfd_mach_h8300,
+  "h8300",			/* Architecture name.  */
+  "h8300",			/* Printable name.  */
+  1,
+  TRUE,				/* The default machine.  */
+  compatible,
+  h8300_scan,
+  &h8300h_info_struct
+};
+
+/* Pad the given address to 32 bits, converting 16-bit and 24-bit
+   addresses into the values they would have had on a h8s target.  */
+
+bfd_vma
+bfd_h8300_pad_address (bfd *abfd, bfd_vma address)
+{
+  /* Cope with bfd_vma's larger than 32 bits.  */
+  address &= 0xffffffffu;
+
+  switch (bfd_get_mach (abfd))
+    {
+    case bfd_mach_h8300:
+    case bfd_mach_h8300hn:
+    case bfd_mach_h8300sn:
+    case bfd_mach_h8300sxn:
+      /* Sign extend a 16-bit address.  */
+      if (address >= 0x8000)
+	return address | 0xffff0000u;
+      return address;
+
+    case bfd_mach_h8300h:
+      /* Sign extend a 24-bit address.  */
+      if (address >= 0x800000)
+	return address | 0xff000000u;
+      return address;
+
+    case bfd_mach_h8300s:
+    case bfd_mach_h8300sx:
+      return address;
+
+    default:
+      abort ();
+    }
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-h8500.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-h8500.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-h8500.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-h8500.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,60 @@
+/* BFD library support routines for the H8/500 architecture.
+   Copyright 1993, 1995, 1999, 2000, 2001, 2002, 2003, 2005, 2007
+   Free Software Foundation, Inc.
+   Hacked by Steve Chamberlain of Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+static bfd_boolean scan_mach
+  PARAMS ((const struct bfd_arch_info *, const char *));
+
+static bfd_boolean
+scan_mach (info, string)
+     const struct bfd_arch_info *info ATTRIBUTE_UNUSED;
+     const char *string;
+{
+  if (strcmp (string,"h8/500") == 0)
+    return TRUE;
+  if (strcmp (string,"H8/500") == 0)
+    return TRUE;
+  if (strcmp (string,"h8500") == 0)
+    return TRUE;
+  if (strcmp (string,"H8500") == 0)
+    return TRUE;
+  return FALSE;
+}
+
+const bfd_arch_info_type bfd_h8500_arch =
+{
+  16,				/* 16 bits in a word */
+  24,				/* 24 bits in an address */
+  8,				/* 8 bits in a byte */
+  bfd_arch_h8500,
+  0,				/* only 1 machine */
+  "h8500",			/* arch_name  */
+  "h8500",			/* printable name */
+  1,
+  TRUE,				/* the default machine */
+  bfd_default_compatible,
+  scan_mach,
+  0,
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-hppa.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-hppa.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-hppa.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-hppa.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,90 @@
+/* BFD support for the HP Precision Architecture architecture.
+   Copyright 1992, 1995, 1998, 1999, 2000, 2002, 2003, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+static const bfd_arch_info_type bfd_hppa10_arch =
+{
+  32,				/* 32 bits in a word */
+  32,				/* 32 bits in an address */
+  8,				/* 8 bits in a byte */
+  bfd_arch_hppa,
+  bfd_mach_hppa10,		/* By convention PA1.0 = 10 */
+  "hppa",
+  "hppa1.0",
+  3,
+  TRUE,				/* Unless we use 1.1 specific features */
+  bfd_default_compatible,
+  bfd_default_scan ,
+  0,
+};
+
+/* PA2.0 in narrow mode */
+static const bfd_arch_info_type bfd_hppa20_arch =
+{
+  32,				/* 32 bits in a word */
+  32,				/* 32 bits in an address */
+  8,				/* 8 bits in a byte */
+  bfd_arch_hppa,
+  bfd_mach_hppa20,		/* By convention PA2.0 = 20 */
+  "hppa",
+  "hppa2.0",
+  3,
+  FALSE,			/* Unless we use 1.1 specific features */
+  bfd_default_compatible,
+  bfd_default_scan ,
+  &bfd_hppa10_arch,
+};
+
+/* PA2.0 in wide mode */
+static const bfd_arch_info_type bfd_hppa20w_arch =
+{
+  64,				/* 64 bits in a word */
+  64,				/* 64 bits in an address */
+  8,				/* 8 bits in a byte */
+  bfd_arch_hppa,
+  bfd_mach_hppa20w,		/* ??? How best to describe wide mode here?  */
+  "hppa",
+  "hppa2.0w",
+  3,
+  FALSE,			/* Unless we use 1.1 specific features */
+  bfd_default_compatible,
+  bfd_default_scan ,
+  &bfd_hppa20_arch,
+};
+
+const bfd_arch_info_type bfd_hppa_arch =
+{
+  32,				/* 32 bits in a word */
+  32,				/* 32 bits in an address */
+  8,				/* 8 bits in a byte */
+  bfd_arch_hppa,
+  bfd_mach_hppa11,		/* By convention PA1.1 = 11 */
+  "hppa",
+  "hppa1.1",
+  3,
+  FALSE,			/* 1.1 specific features used */
+  bfd_default_compatible,
+  bfd_default_scan ,
+  &bfd_hppa20w_arch,
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-i370.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-i370.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-i370.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-i370.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,75 @@
+/* BFD i370 CPU definition
+   Copyright 1994, 1995, 1996, 1998, 1999, 2000, 2002, 2005, 2007
+   Free Software Foundation, Inc.
+   Contributed by Ian Lance Taylor, Cygnus Support.
+   Hacked by Linas Vepstas <linas@linas.org> in 1998, 1999
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+static const bfd_arch_info_type arch_info_struct[] =
+{
+  /* Hack alert: old old machines are really 16 and 24 bit arch ...  */
+  {
+    32, 	/* 32 bits in a word.  */
+    32, 	/* 32 bits in an address.  */
+    8,  	/* 8 bits in a byte.  */
+    bfd_arch_i370,
+    360, 	/* For the 360.  */
+    "i370",
+    "i370:360",
+    3,
+    FALSE, 	/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    &arch_info_struct[1]
+  },
+  {
+    32, 	/* 32 bits in a word.  */
+    32, 	/* 32 bits in an address.  */
+    8,  	/* 8 bits in a byte.  */
+    bfd_arch_i370,
+    370, 	/* For the 370.  */
+    "i370",
+    "i370:370",
+    3,
+    FALSE, 	/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    0
+  },
+};
+
+const bfd_arch_info_type bfd_i370_arch =
+{
+  32, 		/* 32 bits in a word.  */
+  32, 		/* 32 bits in an address.  */
+  8,  		/* 8 bits in a byte.  */
+  bfd_arch_i370,
+  0,		/* For the 360/370 common architecture.  */
+  "i370",
+  "i370:common",
+  3,
+  TRUE, 	/* The default.  */
+  bfd_default_compatible,
+  bfd_default_scan,
+  & arch_info_struct[0]
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-i386.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-i386.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-i386.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-i386.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,151 @@
+/* BFD support for the Intel 386 architecture.
+   Copyright 1992, 1994, 1995, 1996, 1998, 2000, 2001, 2002, 2004, 2005,
+   2007, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+static const bfd_arch_info_type *
+bfd_i386_compatible (const bfd_arch_info_type *a,
+		     const bfd_arch_info_type *b)
+{
+  const bfd_arch_info_type *compat = bfd_default_compatible (a, b);
+
+  /* Don't allow mixing x64_32 with x86_64.  */
+  if (compat
+      && (a->mach & bfd_mach_x64_32) != (b->mach & bfd_mach_x64_32))
+    compat = NULL;
+
+  return compat;
+}
+
+static const bfd_arch_info_type bfd_x64_32_arch_intel_syntax =
+{
+  64, /* 64 bits in a word */
+  64, /* 64 bits in an address */
+  8,  /* 8 bits in a byte */
+  bfd_arch_i386,
+  bfd_mach_x64_32_intel_syntax,
+  "i386:intel",
+  "i386:x64-32:intel",
+  3,
+  FALSE,
+  bfd_i386_compatible,
+  bfd_default_scan,
+  0
+};
+
+static const bfd_arch_info_type bfd_x86_64_arch_intel_syntax =
+{
+  64, /* 64 bits in a word */
+  64, /* 64 bits in an address */
+  8,  /* 8 bits in a byte */
+  bfd_arch_i386,
+  bfd_mach_x86_64_intel_syntax,
+  "i386:intel",
+  "i386:x86-64:intel",
+  3,
+  FALSE,
+  bfd_i386_compatible,
+  bfd_default_scan,
+  &bfd_x64_32_arch_intel_syntax,
+};
+
+static const bfd_arch_info_type bfd_i386_arch_intel_syntax =
+{
+  32,	/* 32 bits in a word */
+  32,	/* 32 bits in an address */
+  8,	/* 8 bits in a byte */
+  bfd_arch_i386,
+  bfd_mach_i386_i386_intel_syntax,
+  "i386:intel",
+  "i386:intel",
+  3,
+  TRUE,
+  bfd_i386_compatible,
+  bfd_default_scan,
+  &bfd_x86_64_arch_intel_syntax
+};
+
+static const bfd_arch_info_type i8086_arch =
+{
+  32,	/* 32 bits in a word */
+  32,	/* 32 bits in an address (well, not really) */
+  8,	/* 8 bits in a byte */
+  bfd_arch_i386,
+  bfd_mach_i386_i8086,
+  "i8086",
+  "i8086",
+  3,
+  FALSE,
+  bfd_i386_compatible,
+  bfd_default_scan,
+  &bfd_i386_arch_intel_syntax
+};
+
+static const bfd_arch_info_type bfd_x64_32_arch =
+{
+  64, /* 64 bits in a word */
+  64, /* 64 bits in an address */
+  8,  /* 8 bits in a byte */
+  bfd_arch_i386,
+  bfd_mach_x64_32,
+  "i386",
+  "i386:x64-32",
+  3,
+  FALSE,
+  bfd_i386_compatible,
+  bfd_default_scan,
+  &i8086_arch
+};
+
+static const bfd_arch_info_type bfd_x86_64_arch =
+{
+  64, /* 64 bits in a word */
+  64, /* 64 bits in an address */
+  8,  /* 8 bits in a byte */
+  bfd_arch_i386,
+  bfd_mach_x86_64,
+  "i386",
+  "i386:x86-64",
+  3,
+  FALSE,
+  bfd_i386_compatible,
+  bfd_default_scan,
+  &bfd_x64_32_arch
+};
+
+const bfd_arch_info_type bfd_i386_arch =
+{
+  32,	/* 32 bits in a word */
+  32,	/* 32 bits in an address */
+  8,	/* 8 bits in a byte */
+  bfd_arch_i386,
+  bfd_mach_i386_i386,
+  "i386",
+  "i386",
+  3,
+  TRUE,
+  bfd_i386_compatible,
+  bfd_default_scan,
+  &bfd_x86_64_arch
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-i860.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-i860.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-i860.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-i860.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,42 @@
+/* BFD support for the Intel 860 architecture.
+   Copyright 1992, 1995, 2000, 2002, 2005, 2007
+   Free Software Foundation, Inc.
+   Created mostly by substituting "860" for "386" in cpu-i386.c
+   Harry Dolan <dolan@ssd.intel.com>, October 1995
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_i860_arch =
+  {
+    32,				/* 32 bits in a word */
+    32,				/* 32 bits in an address */
+    8,				/* 8 bits in a byte */
+    bfd_arch_i860,		/* Architecture */
+    0,				/* Only one machine */
+    "i860",			/* Architecture name */
+    "i860",			/* Printable name */
+    3,				/* Section alignment exponent */
+    TRUE,			/* Is this the default architecture? */
+    bfd_default_compatible,
+    bfd_default_scan,
+    0,				/* Next in list */
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-i960.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-i960.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-i960.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-i960.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,183 @@
+/* BFD library support routines for the i960 architecture.
+   Copyright 1990, 1991, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2005, 2006,
+   2007 Free Software Foundation, Inc.
+   Hacked by Steve Chamberlain of Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+static bfd_boolean scan_960_mach
+  PARAMS ((const bfd_arch_info_type *, const char *));
+static const bfd_arch_info_type *compatible
+  PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
+
+/* This routine is provided a string, and tries to work out if it
+   could possibly refer to the i960 machine pointed at in the
+   info_struct pointer */
+
+static bfd_boolean
+scan_960_mach (ap, string)
+     const bfd_arch_info_type *ap;
+     const char *string;
+{
+  unsigned long machine;
+  int fail_because_not_80960 = FALSE;
+
+  /* Look for the string i960 at the front of the string.  */
+  if (strncasecmp ("i960", string, 4) == 0)
+    {
+      string += 4;
+
+      /* i960 on it's own means core to us.  */
+      if (* string == 0)
+	return ap->mach == bfd_mach_i960_core;
+
+      /* "i960:*" is valid, anything else is not.  */
+      if (* string != ':')
+	return FALSE;
+
+      string ++;
+    }
+  /* In some bfds the cpu-id is written as "80960KA", "80960KB",
+     "80960CA" or "80960MC".  */
+  else if (CONST_STRNEQ (string, "80960"))
+    {
+      string += 5;
+
+      /* Set this to TRUE here.  If a correct matching postfix
+	 is detected below it will be reset to FALSE.  */
+      fail_because_not_80960 = TRUE;
+    }
+  /* No match, can't be us.  */
+  else
+    return FALSE;
+
+  if (* string == '\0')
+    return FALSE;
+
+  if (string[0] == 'c' && string[1] == 'o' && string[2] == 'r' &&
+      string[3] == 'e' && string[4] == '\0')
+    machine = bfd_mach_i960_core;
+  else if (strcasecmp (string, "ka_sa") == 0)
+    machine = bfd_mach_i960_ka_sa;
+  else if (strcasecmp (string, "kb_sb") == 0)
+    machine = bfd_mach_i960_kb_sb;
+  else if (string[1] == '\0' || string[2] != '\0') /* rest are 2-char.  */
+    return FALSE;
+  else if (string[0] == 'k' && string[1] == 'b')
+    { machine = bfd_mach_i960_kb_sb; fail_because_not_80960 = FALSE; }
+  else if (string[0] == 's' && string[1] == 'b')
+    machine = bfd_mach_i960_kb_sb;
+  else if (string[0] == 'm' && string[1] == 'c')
+    { machine = bfd_mach_i960_mc; fail_because_not_80960 = FALSE; }
+  else if (string[0] == 'x' && string[1] == 'a')
+    machine = bfd_mach_i960_xa;
+  else if (string[0] == 'c' && string[1] == 'a')
+    { machine = bfd_mach_i960_ca; fail_because_not_80960 = FALSE; }
+  else if (string[0] == 'k' && string[1] == 'a')
+    { machine = bfd_mach_i960_ka_sa; fail_because_not_80960 = FALSE; }
+  else if (string[0] == 's' && string[1] == 'a')
+    machine = bfd_mach_i960_ka_sa;
+  else if (string[0] == 'j' && string[1] == 'x')
+    machine = bfd_mach_i960_jx;
+  else if (string[0] == 'h' && string[1] == 'x')
+    machine = bfd_mach_i960_hx;
+  else
+    return FALSE;
+
+  if (fail_because_not_80960)
+    return FALSE;
+
+  if (machine == ap->mach)
+    return TRUE;
+
+  return FALSE;
+}
+
+/* This routine is provided two arch_infos and works out the i960
+   machine which would be compatible with both and returns a pointer
+   to its info structure */
+
+static const bfd_arch_info_type *
+compatible (a,b)
+     const bfd_arch_info_type *a;
+     const bfd_arch_info_type *b;
+{
+
+  /* The i960 has distinct subspecies which may not interbreed:
+	CORE CA
+	CORE KA KB MC XA
+	CORE HX JX
+     Any architecture on the same line is compatible, the one on
+     the right is the least restrictive.
+
+     We represent this information in an array, each machine to a side */
+
+#define ERROR	0
+#define CORE	bfd_mach_i960_core  /*1*/
+#define KA 	bfd_mach_i960_ka_sa /*2*/
+#define KB 	bfd_mach_i960_kb_sb /*3*/
+#define MC 	bfd_mach_i960_mc    /*4*/
+#define XA 	bfd_mach_i960_xa    /*5*/
+#define CA 	bfd_mach_i960_ca    /*6*/
+#define JX	bfd_mach_i960_jx    /*7*/
+#define HX	bfd_mach_i960_hx    /*8*/
+#define MAX_ARCH ((int)HX)
+
+  static const unsigned long matrix[MAX_ARCH+1][MAX_ARCH+1] =
+    {
+      { ERROR,	CORE,	KA,	KB,	MC,	XA,	CA,	JX,	HX },
+      { CORE,	CORE,	KA,	KB,	MC,	XA,	CA,	JX,	HX },
+      { KA,	KA,	KA,	KB,	MC,	XA,	ERROR,	ERROR,	ERROR},
+      { KB,	KB,	KB,	KB,	MC,	XA,	ERROR, 	ERROR,	ERROR},
+      { MC,	MC,	MC,	MC,	MC,	XA,	ERROR,	ERROR,	ERROR},
+      { XA,	XA,	XA,	XA,	XA,	XA,	ERROR,	ERROR,	ERROR},
+      { CA,	CA,	ERROR,	ERROR,	ERROR,	ERROR,	CA,	ERROR,	ERROR},
+      { JX,	JX,	ERROR,	ERROR,	ERROR,	ERROR,	ERROR,  JX,	HX },
+      { HX,	HX,	ERROR,	ERROR,	ERROR,	ERROR,	ERROR,	HX,	HX },
+    };
+
+  if (a->arch != b->arch || matrix[a->mach][b->mach] == ERROR)
+    {
+    return NULL;
+    }
+  else
+    {
+    return (a->mach  ==  matrix[a->mach][b->mach]) ?  a : b;
+    }
+}
+
+#define N(a,b,d,n) \
+{ 32, 32, 8,bfd_arch_i960,a,"i960",b,3,d,compatible,scan_960_mach,n,}
+
+static const bfd_arch_info_type arch_info_struct[] =
+{
+  N(bfd_mach_i960_ka_sa,"i960:ka_sa",FALSE, &arch_info_struct[1]),
+  N(bfd_mach_i960_kb_sb,"i960:kb_sb",FALSE, &arch_info_struct[2]),
+  N(bfd_mach_i960_mc,   "i960:mc",   FALSE, &arch_info_struct[3]),
+  N(bfd_mach_i960_xa,   "i960:xa",   FALSE, &arch_info_struct[4]),
+  N(bfd_mach_i960_ca,   "i960:ca",   FALSE, &arch_info_struct[5]),
+  N(bfd_mach_i960_jx,   "i960:jx",   FALSE, &arch_info_struct[6]),
+  N(bfd_mach_i960_hx,	"i960:hx",   FALSE, 0),
+};
+
+const bfd_arch_info_type bfd_i960_arch =
+  N(bfd_mach_i960_core, "i960:core", TRUE, &arch_info_struct[0]);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-ia64-opc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-ia64-opc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-ia64-opc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-ia64-opc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,616 @@
+/* Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009
+   Free Software Foundation, Inc.
+   Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* Logically, this code should be part of libopcode but since some of
+   the operand insertion/extraction functions help bfd to implement
+   relocations, this code is included as part of cpu-ia64.c.  This
+   avoids circular dependencies between libopcode and libbfd and also
+   obviates the need for applications to link in libopcode when all
+   they really want is libbfd.
+
+   --davidm Mon Apr 13 22:14:02 1998 */
+
+#include "../opcodes/ia64-opc.h"
+
+#define NELEMS(a)  ((int) (sizeof (a) / sizeof ((a)[0])))
+
+static const char*
+ins_rsvd (const struct ia64_operand *self ATTRIBUTE_UNUSED,
+	  ia64_insn value ATTRIBUTE_UNUSED, ia64_insn *code ATTRIBUTE_UNUSED)
+{
+  return "internal error---this shouldn't happen";
+}
+
+static const char*
+ext_rsvd (const struct ia64_operand *self ATTRIBUTE_UNUSED,
+	  ia64_insn code ATTRIBUTE_UNUSED, ia64_insn *valuep ATTRIBUTE_UNUSED)
+{
+  return "internal error---this shouldn't happen";
+}
+
+static const char*
+ins_const (const struct ia64_operand *self ATTRIBUTE_UNUSED,
+	   ia64_insn value ATTRIBUTE_UNUSED, ia64_insn *code ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static const char*
+ext_const (const struct ia64_operand *self ATTRIBUTE_UNUSED,
+	   ia64_insn code ATTRIBUTE_UNUSED, ia64_insn *valuep ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static const char*
+ins_reg (const struct ia64_operand *self, ia64_insn value, ia64_insn *code)
+{
+  if (value >= 1u << self->field[0].bits)
+    return "register number out of range";
+
+  *code |= value << self->field[0].shift;
+  return 0;
+}
+
+static const char*
+ext_reg (const struct ia64_operand *self, ia64_insn code, ia64_insn *valuep)
+{
+  *valuep = ((code >> self->field[0].shift)
+	     & ((1u << self->field[0].bits) - 1));
+  return 0;
+}
+
+static const char*
+ins_immu (const struct ia64_operand *self, ia64_insn value, ia64_insn *code)
+{
+  ia64_insn new_insn = 0;
+  int i;
+
+  for (i = 0; i < NELEMS (self->field) && self->field[i].bits; ++i)
+    {
+      new_insn |= ((value & ((((ia64_insn) 1) << self->field[i].bits) - 1))
+                 << self->field[i].shift);
+      value >>= self->field[i].bits;
+    }
+  if (value)
+    return "integer operand out of range";
+
+  *code |= new_insn;
+  return 0;
+}
+
+static const char*
+ext_immu (const struct ia64_operand *self, ia64_insn code, ia64_insn *valuep)
+{
+  BFD_HOST_U_64_BIT value = 0;
+  int i, bits = 0, total = 0;
+
+  for (i = 0; i < NELEMS (self->field) && self->field[i].bits; ++i)
+    {
+      bits = self->field[i].bits;
+      value |= ((code >> self->field[i].shift)
+		& ((((BFD_HOST_U_64_BIT) 1) << bits) - 1)) << total;
+      total += bits;
+    }
+  *valuep = value;
+  return 0;
+}
+
+static const char*
+ins_immu5b (const struct ia64_operand *self, ia64_insn value,
+	    ia64_insn *code)
+{
+  if (value < 32 || value > 63)
+    return "value must be between 32 and 63";
+  return ins_immu (self, value - 32, code);
+}
+
+static const char*
+ext_immu5b (const struct ia64_operand *self, ia64_insn code,
+	    ia64_insn *valuep)
+{
+  const char *result;
+
+  result = ext_immu (self, code, valuep);
+  if (result)
+    return result;
+
+  *valuep = *valuep + 32;
+  return 0;
+}
+
+static const char*
+ins_immus8 (const struct ia64_operand *self, ia64_insn value, ia64_insn *code)
+{
+  if (value & 0x7)
+    return "value not an integer multiple of 8";
+  return ins_immu (self, value >> 3, code);
+}
+
+static const char*
+ext_immus8 (const struct ia64_operand *self, ia64_insn code, ia64_insn *valuep)
+{
+  const char *result;
+
+  result = ext_immu (self, code, valuep);
+  if (result)
+    return result;
+
+  *valuep = *valuep << 3;
+  return 0;
+}
+
+static const char*
+ins_imms_scaled (const struct ia64_operand *self, ia64_insn value,
+		 ia64_insn *code, int scale)
+{
+  BFD_HOST_64_BIT svalue = value, sign_bit = 0;
+  ia64_insn new_insn = 0;
+  int i;
+
+  svalue >>= scale;
+
+  for (i = 0; i < NELEMS (self->field) && self->field[i].bits; ++i)
+    {
+      new_insn |= ((svalue & ((((ia64_insn) 1) << self->field[i].bits) - 1))
+                 << self->field[i].shift);
+      sign_bit = (svalue >> (self->field[i].bits - 1)) & 1;
+      svalue >>= self->field[i].bits;
+    }
+  if ((!sign_bit && svalue != 0) || (sign_bit && svalue != -1))
+    return "integer operand out of range";
+
+  *code |= new_insn;
+  return 0;
+}
+
+static const char*
+ext_imms_scaled (const struct ia64_operand *self, ia64_insn code,
+		 ia64_insn *valuep, int scale)
+{
+  int i, bits = 0, total = 0;
+  BFD_HOST_64_BIT val = 0, sign;
+
+  for (i = 0; i < NELEMS (self->field) && self->field[i].bits; ++i)
+    {
+      bits = self->field[i].bits;
+      val |= ((code >> self->field[i].shift)
+	      & ((((BFD_HOST_U_64_BIT) 1) << bits) - 1)) << total;
+      total += bits;
+    }
+  /* sign extend: */
+  sign = (BFD_HOST_64_BIT) 1 << (total - 1);
+  val = (val ^ sign) - sign;
+
+  *valuep = (val << scale);
+  return 0;
+}
+
+static const char*
+ins_imms (const struct ia64_operand *self, ia64_insn value, ia64_insn *code)
+{
+  return ins_imms_scaled (self, value, code, 0);
+}
+
+static const char*
+ins_immsu4 (const struct ia64_operand *self, ia64_insn value, ia64_insn *code)
+{
+  value = ((value & 0xffffffff) ^ 0x80000000) - 0x80000000;
+
+  return ins_imms_scaled (self, value, code, 0);
+}
+
+static const char*
+ext_imms (const struct ia64_operand *self, ia64_insn code, ia64_insn *valuep)
+{
+  return ext_imms_scaled (self, code, valuep, 0);
+}
+
+static const char*
+ins_immsm1 (const struct ia64_operand *self, ia64_insn value, ia64_insn *code)
+{
+  --value;
+  return ins_imms_scaled (self, value, code, 0);
+}
+
+static const char*
+ins_immsm1u4 (const struct ia64_operand *self, ia64_insn value,
+	      ia64_insn *code)
+{
+  value = ((value & 0xffffffff) ^ 0x80000000) - 0x80000000;
+
+  --value;
+  return ins_imms_scaled (self, value, code, 0);
+}
+
+static const char*
+ext_immsm1 (const struct ia64_operand *self, ia64_insn code, ia64_insn *valuep)
+{
+  const char *res = ext_imms_scaled (self, code, valuep, 0);
+
+  ++*valuep;
+  return res;
+}
+
+static const char*
+ins_imms1 (const struct ia64_operand *self, ia64_insn value, ia64_insn *code)
+{
+  return ins_imms_scaled (self, value, code, 1);
+}
+
+static const char*
+ext_imms1 (const struct ia64_operand *self, ia64_insn code, ia64_insn *valuep)
+{
+  return ext_imms_scaled (self, code, valuep, 1);
+}
+
+static const char*
+ins_imms4 (const struct ia64_operand *self, ia64_insn value, ia64_insn *code)
+{
+  return ins_imms_scaled (self, value, code, 4);
+}
+
+static const char*
+ext_imms4 (const struct ia64_operand *self, ia64_insn code, ia64_insn *valuep)
+{
+  return ext_imms_scaled (self, code, valuep, 4);
+}
+
+static const char*
+ins_imms16 (const struct ia64_operand *self, ia64_insn value, ia64_insn *code)
+{
+  return ins_imms_scaled (self, value, code, 16);
+}
+
+static const char*
+ext_imms16 (const struct ia64_operand *self, ia64_insn code, ia64_insn *valuep)
+{
+  return ext_imms_scaled (self, code, valuep, 16);
+}
+
+static const char*
+ins_cimmu (const struct ia64_operand *self, ia64_insn value, ia64_insn *code)
+{
+  ia64_insn mask = (((ia64_insn) 1) << self->field[0].bits) - 1;
+  return ins_immu (self, value ^ mask, code);
+}
+
+static const char*
+ext_cimmu (const struct ia64_operand *self, ia64_insn code, ia64_insn *valuep)
+{
+  const char *result;
+  ia64_insn mask;
+
+  mask = (((ia64_insn) 1) << self->field[0].bits) - 1;
+  result = ext_immu (self, code, valuep);
+  if (!result)
+    {
+      mask = (((ia64_insn) 1) << self->field[0].bits) - 1;
+      *valuep ^= mask;
+    }
+  return result;
+}
+
+static const char*
+ins_cnt (const struct ia64_operand *self, ia64_insn value, ia64_insn *code)
+{
+  --value;
+  if (value >= ((BFD_HOST_U_64_BIT) 1) << self->field[0].bits)
+    return "count out of range";
+
+  *code |= value << self->field[0].shift;
+  return 0;
+}
+
+static const char*
+ext_cnt (const struct ia64_operand *self, ia64_insn code, ia64_insn *valuep)
+{
+  *valuep = ((code >> self->field[0].shift)
+	     & ((((BFD_HOST_U_64_BIT) 1) << self->field[0].bits) - 1)) + 1;
+  return 0;
+}
+
+static const char*
+ins_cnt2b (const struct ia64_operand *self, ia64_insn value, ia64_insn *code)
+{
+  --value;
+
+  if (value > 2)
+    return "count must be in range 1..3";
+
+  *code |= value << self->field[0].shift;
+  return 0;
+}
+
+static const char*
+ext_cnt2b (const struct ia64_operand *self, ia64_insn code, ia64_insn *valuep)
+{
+  *valuep = ((code >> self->field[0].shift) & 0x3) + 1;
+  return 0;
+}
+
+static const char*
+ins_cnt2c (const struct ia64_operand *self, ia64_insn value, ia64_insn *code)
+{
+  switch (value)
+    {
+    case 0:	value = 0; break;
+    case 7:	value = 1; break;
+    case 15:	value = 2; break;
+    case 16:	value = 3; break;
+    default:	return "count must be 0, 7, 15, or 16";
+    }
+  *code |= value << self->field[0].shift;
+  return 0;
+}
+
+static const char*
+ext_cnt2c (const struct ia64_operand *self, ia64_insn code, ia64_insn *valuep)
+{
+  ia64_insn value;
+
+  value = (code >> self->field[0].shift) & 0x3;
+  switch (value)
+    {
+    case 0: value =  0; break;
+    case 1: value =  7; break;
+    case 2: value = 15; break;
+    case 3: value = 16; break;
+    }
+  *valuep = value;
+  return 0;
+}
+
+static const char*
+ins_inc3 (const struct ia64_operand *self, ia64_insn value, ia64_insn *code)
+{
+  BFD_HOST_64_BIT val = value;
+  BFD_HOST_U_64_BIT sign = 0;
+
+  if (val < 0)
+    {
+      sign = 0x4;
+      value = -value;
+    }
+  switch (value)
+    {
+    case  1:	value = 3; break;
+    case  4:	value = 2; break;
+    case  8:	value = 1; break;
+    case 16:	value = 0; break;
+    default:	return "count must be +/- 1, 4, 8, or 16";
+    }
+  *code |= (sign | value) << self->field[0].shift;
+  return 0;
+}
+
+static const char*
+ext_inc3 (const struct ia64_operand *self, ia64_insn code, ia64_insn *valuep)
+{
+  BFD_HOST_64_BIT val;
+  int negate;
+
+  val = (code >> self->field[0].shift) & 0x7;
+  negate = val & 0x4;
+  switch (val & 0x3)
+    {
+    case 0: val = 16; break;
+    case 1: val =  8; break;
+    case 2: val =  4; break;
+    case 3: val =  1; break;
+    }
+  if (negate)
+    val = -val;
+
+  *valuep = val;
+  return 0;
+}
+
+#define CST	IA64_OPND_CLASS_CST
+#define REG	IA64_OPND_CLASS_REG
+#define IND	IA64_OPND_CLASS_IND
+#define ABS	IA64_OPND_CLASS_ABS
+#define REL	IA64_OPND_CLASS_REL
+
+#define SDEC	IA64_OPND_FLAG_DECIMAL_SIGNED
+#define UDEC	IA64_OPND_FLAG_DECIMAL_UNSIGNED
+
+const struct ia64_operand elf64_ia64_operands[IA64_OPND_COUNT] =
+  {
+    /* constants: */
+    { CST, ins_const, ext_const, "NIL",		{{ 0, 0}}, 0, "<none>" },
+    { CST, ins_const, ext_const, "ar.csd",	{{ 0, 0}}, 0, "ar.csd" },
+    { CST, ins_const, ext_const, "ar.ccv",	{{ 0, 0}}, 0, "ar.ccv" },
+    { CST, ins_const, ext_const, "ar.pfs",	{{ 0, 0}}, 0, "ar.pfs" },
+    { CST, ins_const, ext_const, "1",		{{ 0, 0}}, 0, "1" },
+    { CST, ins_const, ext_const, "8",		{{ 0, 0}}, 0, "8" },
+    { CST, ins_const, ext_const, "16",		{{ 0, 0}}, 0, "16" },
+    { CST, ins_const, ext_const, "r0",		{{ 0, 0}}, 0, "r0" },
+    { CST, ins_const, ext_const, "ip",		{{ 0, 0}}, 0, "ip" },
+    { CST, ins_const, ext_const, "pr",		{{ 0, 0}}, 0, "pr" },
+    { CST, ins_const, ext_const, "pr.rot",	{{ 0, 0}}, 0, "pr.rot" },
+    { CST, ins_const, ext_const, "psr",		{{ 0, 0}}, 0, "psr" },
+    { CST, ins_const, ext_const, "psr.l",	{{ 0, 0}}, 0, "psr.l" },
+    { CST, ins_const, ext_const, "psr.um",	{{ 0, 0}}, 0, "psr.um" },
+
+    /* register operands: */
+    { REG, ins_reg,   ext_reg,	"ar", {{ 7, 20}}, 0,		/* AR3 */
+      "an application register" },
+    { REG, ins_reg,   ext_reg,	 "b", {{ 3,  6}}, 0,		/* B1 */
+      "a branch register" },
+    { REG, ins_reg,   ext_reg,	 "b", {{ 3, 13}}, 0,		/* B2 */
+      "a branch register"},
+    { REG, ins_reg,   ext_reg,	"cr", {{ 7, 20}}, 0,		/* CR */
+      "a control register"},
+    { REG, ins_reg,   ext_reg,	 "f", {{ 7,  6}}, 0,		/* F1 */
+      "a floating-point register" },
+    { REG, ins_reg,   ext_reg,	 "f", {{ 7, 13}}, 0,		/* F2 */
+      "a floating-point register" },
+    { REG, ins_reg,   ext_reg,	 "f", {{ 7, 20}}, 0,		/* F3 */
+      "a floating-point register" },
+    { REG, ins_reg,   ext_reg,	 "f", {{ 7, 27}}, 0,		/* F4 */
+      "a floating-point register" },
+    { REG, ins_reg,   ext_reg,	 "p", {{ 6,  6}}, 0,		/* P1 */
+      "a predicate register" },
+    { REG, ins_reg,   ext_reg,	 "p", {{ 6, 27}}, 0,		/* P2 */
+      "a predicate register" },
+    { REG, ins_reg,   ext_reg,	 "r", {{ 7,  6}}, 0,		/* R1 */
+      "a general register" },
+    { REG, ins_reg,   ext_reg,	 "r", {{ 7, 13}}, 0,		/* R2 */
+      "a general register" },
+    { REG, ins_reg,   ext_reg,	 "r", {{ 7, 20}}, 0,		/* R3 */
+      "a general register" },
+    { REG, ins_reg,   ext_reg,	 "r", {{ 2, 20}}, 0,		/* R3_2 */
+      "a general register r0-r3" },
+
+    /* memory operands: */
+    { IND, ins_reg,   ext_reg,	"",      {{7, 20}}, 0,		/* MR3 */
+      "a memory address" },
+
+    /* indirect operands: */
+    { IND, ins_reg,   ext_reg,	"cpuid", {{7, 20}}, 0,		/* CPUID_R3 */
+      "a cpuid register" },
+    { IND, ins_reg,   ext_reg,	"dbr",   {{7, 20}}, 0,		/* DBR_R3 */
+      "a dbr register" },
+    { IND, ins_reg,   ext_reg,	"dtr",   {{7, 20}}, 0,		/* DTR_R3 */
+      "a dtr register" },
+    { IND, ins_reg,   ext_reg,	"itr",   {{7, 20}}, 0,		/* ITR_R3 */
+      "an itr register" },
+    { IND, ins_reg,   ext_reg,	"ibr",   {{7, 20}}, 0,		/* IBR_R3 */
+      "an ibr register" },
+    { IND, ins_reg,   ext_reg,	"msr",   {{7, 20}}, 0,		/* MSR_R3 */
+      "an msr register" },
+    { IND, ins_reg,   ext_reg,	"pkr",   {{7, 20}}, 0,		/* PKR_R3 */
+      "a pkr register" },
+    { IND, ins_reg,   ext_reg,	"pmc",   {{7, 20}}, 0,		/* PMC_R3 */
+      "a pmc register" },
+    { IND, ins_reg,   ext_reg,	"pmd",   {{7, 20}}, 0,		/* PMD_R3 */
+      "a pmd register" },
+    { IND, ins_reg,   ext_reg,	"rr",    {{7, 20}}, 0,		/* RR_R3 */
+      "an rr register" },
+
+    /* immediate operands: */
+    { ABS, ins_cimmu, ext_cimmu, 0, {{ 5, 20 }}, UDEC,		/* CCNT5 */
+      "a 5-bit count (0-31)" },
+    { ABS, ins_cnt,   ext_cnt,   0, {{ 2, 27 }}, UDEC,		/* CNT2a */
+      "a 2-bit count (1-4)" },
+    { ABS, ins_cnt2b, ext_cnt2b, 0, {{ 2, 27 }}, UDEC,		/* CNT2b */
+      "a 2-bit count (1-3)" },
+    { ABS, ins_cnt2c, ext_cnt2c, 0, {{ 2, 30 }}, UDEC,		/* CNT2c */
+      "a count (0, 7, 15, or 16)" },
+    { ABS, ins_immu,  ext_immu,  0, {{ 5, 14}}, UDEC,		/* CNT5 */
+      "a 5-bit count (0-31)" },
+    { ABS, ins_immu,  ext_immu,  0, {{ 6, 27}}, UDEC,		/* CNT6 */
+      "a 6-bit count (0-63)" },
+    { ABS, ins_cimmu, ext_cimmu, 0, {{ 6, 20}}, UDEC,		/* CPOS6a */
+      "a 6-bit bit pos (0-63)" },
+    { ABS, ins_cimmu, ext_cimmu, 0, {{ 6, 14}}, UDEC,		/* CPOS6b */
+      "a 6-bit bit pos (0-63)" },
+    { ABS, ins_cimmu, ext_cimmu, 0, {{ 6, 31}}, UDEC,		/* CPOS6c */
+      "a 6-bit bit pos (0-63)" },
+    { ABS, ins_imms,  ext_imms,  0, {{ 1, 36}}, SDEC,		/* IMM1 */
+      "a 1-bit integer (-1, 0)" },
+    { ABS, ins_immu,  ext_immu,  0, {{ 2, 13}}, UDEC,		/* IMMU2 */
+      "a 2-bit unsigned (0-3)" },
+    { ABS, ins_immu5b,  ext_immu5b,  0, {{ 5, 14}}, UDEC,	/* IMMU5b */
+      "a 5-bit unsigned (32 + (0-31))" },
+    { ABS, ins_immu,  ext_immu,  0, {{ 7, 13}}, 0,		/* IMMU7a */
+      "a 7-bit unsigned (0-127)" },
+    { ABS, ins_immu,  ext_immu,  0, {{ 7, 20}}, 0,		/* IMMU7b */
+      "a 7-bit unsigned (0-127)" },
+    { ABS, ins_immu,  ext_immu,  0, {{ 7, 13}}, UDEC,		/* SOF */
+      "a frame size (register count)" },
+    { ABS, ins_immu,  ext_immu,  0, {{ 7, 20}}, UDEC,		/* SOL */
+      "a local register count" },
+    { ABS, ins_immus8,ext_immus8,0, {{ 4, 27}}, UDEC,		/* SOR */
+      "a rotating register count (integer multiple of 8)" },
+    { ABS, ins_imms,  ext_imms,  0,				/* IMM8 */
+      {{ 7, 13}, { 1, 36}}, SDEC,
+      "an 8-bit integer (-128-127)" },
+    { ABS, ins_immsu4,  ext_imms,  0,				/* IMM8U4 */
+      {{ 7, 13}, { 1, 36}}, SDEC,
+      "an 8-bit signed integer for 32-bit unsigned compare (-128-127)" },
+    { ABS, ins_immsm1,  ext_immsm1,  0,				/* IMM8M1 */
+      {{ 7, 13}, { 1, 36}}, SDEC,
+      "an 8-bit integer (-127-128)" },
+    { ABS, ins_immsm1u4,  ext_immsm1,  0,			/* IMM8M1U4 */
+      {{ 7, 13}, { 1, 36}}, SDEC,
+      "an 8-bit integer for 32-bit unsigned compare (-127-(-1),1-128,0x100000000)" },
+    { ABS, ins_immsm1,  ext_immsm1,  0,				/* IMM8M1U8 */
+      {{ 7, 13}, { 1, 36}}, SDEC,
+      "an 8-bit integer for 64-bit unsigned compare (-127-(-1),1-128,0x10000000000000000)" },
+    { ABS, ins_immu,  ext_immu,  0, {{ 2, 33}, { 7, 20}}, 0,	/* IMMU9 */
+      "a 9-bit unsigned (0-511)" },
+    { ABS, ins_imms,  ext_imms,  0,				/* IMM9a */
+      {{ 7,  6}, { 1, 27}, { 1, 36}}, SDEC,
+      "a 9-bit integer (-256-255)" },
+    { ABS, ins_imms,  ext_imms, 0,				/* IMM9b */
+      {{ 7, 13}, { 1, 27}, { 1, 36}}, SDEC,
+      "a 9-bit integer (-256-255)" },
+    { ABS, ins_imms,  ext_imms, 0,				/* IMM14 */
+      {{ 7, 13}, { 6, 27}, { 1, 36}}, SDEC,
+      "a 14-bit integer (-8192-8191)" },
+    { ABS, ins_imms1, ext_imms1, 0,				/* IMM17 */
+      {{ 7,  6}, { 8, 24}, { 1, 36}}, 0,
+      "a 17-bit integer (-65536-65535)" },
+    { ABS, ins_immu,  ext_immu,  0, {{20,  6}, { 1, 36}}, 0,	/* IMMU21 */
+      "a 21-bit unsigned" },
+    { ABS, ins_imms,  ext_imms,  0,				/* IMM22 */
+      {{ 7, 13}, { 9, 27}, { 5, 22}, { 1, 36}}, SDEC,
+      "a 22-bit signed integer" },
+    { ABS, ins_immu,  ext_immu,  0,				/* IMMU24 */
+      {{21,  6}, { 2, 31}, { 1, 36}}, 0,
+      "a 24-bit unsigned" },
+    { ABS, ins_imms16,ext_imms16,0, {{27,  6}, { 1, 36}}, 0,	/* IMM44 */
+      "a 44-bit unsigned (least 16 bits ignored/zeroes)" },
+    { ABS, ins_rsvd,  ext_rsvd,	0, {{0,  0}}, 0,		/* IMMU62 */
+      "a 62-bit unsigned" },
+    { ABS, ins_rsvd,  ext_rsvd,	0, {{0,  0}}, 0,		/* IMMU64 */
+      "a 64-bit unsigned" },
+    { ABS, ins_inc3,  ext_inc3,  0, {{ 3, 13}}, SDEC,		/* INC3 */
+      "an increment (+/- 1, 4, 8, or 16)" },
+    { ABS, ins_cnt,   ext_cnt,   0, {{ 4, 27}}, UDEC,		/* LEN4 */
+      "a 4-bit length (1-16)" },
+    { ABS, ins_cnt,   ext_cnt,   0, {{ 6, 27}}, UDEC,		/* LEN6 */
+      "a 6-bit length (1-64)" },
+    { ABS, ins_immu,  ext_immu,  0, {{ 4, 20}},	0,		/* MBTYPE4 */
+      "a mix type (@rev, @mix, @shuf, @alt, or @brcst)" },
+    { ABS, ins_immu,  ext_immu,  0, {{ 8, 20}},	0,		/* MBTYPE8 */
+      "an 8-bit mix type" },
+    { ABS, ins_immu,  ext_immu,  0, {{ 6, 14}}, UDEC,		/* POS6 */
+      "a 6-bit bit pos (0-63)" },
+    { REL, ins_imms4, ext_imms4, 0, {{ 7,  6}, { 2, 33}}, 0,	/* TAG13 */
+      "a branch tag" },
+    { REL, ins_imms4, ext_imms4, 0, {{ 9, 24}}, 0,		/* TAG13b */
+      "a branch tag" },
+    { REL, ins_imms4, ext_imms4, 0, {{20,  6}, { 1, 36}}, 0,	/* TGT25 */
+      "a branch target" },
+    { REL, ins_imms4, ext_imms4, 0,				/* TGT25b */
+      {{ 7,  6}, {13, 20}, { 1, 36}}, 0,
+      "a branch target" },
+    { REL, ins_imms4, ext_imms4, 0, {{20, 13}, { 1, 36}}, 0,	/* TGT25c */
+      "a branch target" },
+    { REL, ins_rsvd, ext_rsvd, 0, {{0, 0}}, 0,                  /* TGT64  */
+      "a branch target" },
+
+    { ABS, ins_const, ext_const, 0, {{0, 0}}, 0,		/* LDXMOV */
+      "ldxmov target" },
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-ia64.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-ia64.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-ia64.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-ia64.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,58 @@
+/* BFD support for the ia64 architecture.
+   Copyright 1998, 1999, 2000, 2002, 2005, 2007 Free Software Foundation, Inc.
+   Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_ia64_elf32_arch =
+  {
+    64,	/* 64 bits in a word */
+    32,	/* 32 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_ia64,
+    bfd_mach_ia64_elf32,
+    "ia64",
+    "ia64-elf32",
+    3,	/* log2 of section alignment */
+    TRUE, /* the one and only */
+    bfd_default_compatible,
+    bfd_default_scan ,
+    0,
+  };
+
+const bfd_arch_info_type bfd_ia64_arch =
+  {
+    64,	/* 64 bits in a word */
+    64,	/* 64 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_ia64,
+    bfd_mach_ia64_elf64,
+    "ia64",
+    "ia64-elf64",
+    3,	/* log2 of section alignment */
+    TRUE, /* the one and only */
+    bfd_default_compatible,
+    bfd_default_scan ,
+    &bfd_ia64_elf32_arch,
+  };
+
+#include "cpu-ia64-opc.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-ip2k.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-ip2k.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-ip2k.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-ip2k.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,55 @@
+/* BFD support for the Scenix IP2xxx processor.
+   Copyright 2000, 2002, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_ip2k_nonext_arch =
+{
+  32,				/* Bits per word - not really true.  */
+  16,				/* Bits per address.  */
+  8,				/* Bits per byte.  */
+  bfd_arch_ip2k,		/* Architecture.  */
+  bfd_mach_ip2022,		/* Machine.  */
+  "ip2k",			/* Architecture name.  */
+  "ip2022",			/* Machine name.  */
+  1,				/* Section align power.  */
+  FALSE,		        /* The default ?  */
+  bfd_default_compatible,	/* Architecture comparison fn.  */
+  bfd_default_scan,		/* String to architecture convert fn.  */
+  NULL				/* Next in list.  */
+};
+
+const bfd_arch_info_type bfd_ip2k_arch =
+{
+  32,				/* Bits per word - not really true.  */
+  16,				/* Bits per address.  */
+  8,				/* Bits per byte.  */
+  bfd_arch_ip2k,		/* Architecture.  */
+  bfd_mach_ip2022ext,		/* Machine.  */
+  "ip2k",			/* Architecture name.  */
+  "ip2022ext",			/* Machine name.  */
+  1,				/* Section align power.  */
+  TRUE,				/* The default ?  */
+  bfd_default_compatible,	/* Architecture comparison fn.  */
+  bfd_default_scan,		/* String to architecture convert fn.  */
+  & bfd_ip2k_nonext_arch	/* Next in list.  */
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-iq2000.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-iq2000.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-iq2000.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-iq2000.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,57 @@
+/* BFD support for the Vitesse IQ2000 processor.
+   Copyright (C) 2003, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+static const bfd_arch_info_type arch_info_struct[] =
+{
+  {
+    32,				/* bits per word */
+    32,				/* bits per address */
+    8,				/* bits per byte */
+    bfd_arch_iq2000,		/* architecture */
+    bfd_mach_iq10,		/* machine */
+    "iq2000",			/* architecture name */
+    "iq10",			/* printable name */
+    3,				/* section align power */
+    FALSE,			/* the default ? */
+    bfd_default_compatible,	/* architecture comparison fn */
+    bfd_default_scan,		/* string to architecture convert fn */
+    NULL			/* next in list */
+  }
+};
+
+const bfd_arch_info_type bfd_iq2000_arch =
+{
+  32,				/* bits per word */
+  32,				/* bits per address */
+  8,				/* bits per byte */
+  bfd_arch_iq2000,		/* architecture */
+  bfd_mach_iq2000,		/* machine */
+  "iq2000",			/* architecture name */
+  "iq2000",			/* printable name */
+  3,				/* section align power */
+  TRUE,				/* the default ? */
+  bfd_default_compatible,	/* architecture comparison fn */
+  bfd_default_scan,		/* string to architecture convert fn */
+  &arch_info_struct[0],		/* next in list */
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-k1om.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-k1om.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-k1om.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-k1om.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,56 @@
+/* BFD support for the Intel K1OM architecture.
+   Copyright 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+static const bfd_arch_info_type bfd_k1om_arch_intel_syntax =
+{
+  64, /* 64 bits in a word */
+  64, /* 64 bits in an address */
+  8,  /* 8 bits in a byte */
+  bfd_arch_k1om,
+  bfd_mach_k1om_intel_syntax,
+  "k1om:intel",
+  "k1om:intel",
+  3,
+  TRUE,
+  bfd_default_compatible,
+  bfd_default_scan,
+  0
+};
+
+const bfd_arch_info_type bfd_k1om_arch =
+{
+  64, /* 64 bits in a word */
+  64, /* 64 bits in an address */
+  8,  /* 8 bits in a byte */
+  bfd_arch_k1om,
+  bfd_mach_k1om,
+  "k1om",
+  "k1om",
+  3,
+  TRUE,
+  bfd_default_compatible,
+  bfd_default_scan,
+  &bfd_k1om_arch_intel_syntax
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-l1om.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-l1om.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-l1om.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-l1om.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,56 @@
+/* BFD support for the Intel L1OM architecture.
+   Copyright 2009
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+static const bfd_arch_info_type bfd_l1om_arch_intel_syntax =
+{
+  64, /* 64 bits in a word */
+  64, /* 64 bits in an address */
+  8,  /* 8 bits in a byte */
+  bfd_arch_l1om,
+  bfd_mach_l1om_intel_syntax,
+  "l1om:intel",
+  "l1om:intel",
+  3,
+  TRUE,
+  bfd_default_compatible,
+  bfd_default_scan,
+  0
+};
+
+const bfd_arch_info_type bfd_l1om_arch =
+{
+  64, /* 64 bits in a word */
+  64, /* 64 bits in an address */
+  8,  /* 8 bits in a byte */
+  bfd_arch_l1om,
+  bfd_mach_l1om,
+  "l1om",
+  "l1om",
+  3,
+  TRUE,
+  bfd_default_compatible,
+  bfd_default_scan,
+  &bfd_l1om_arch_intel_syntax
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-lm32.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-lm32.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-lm32.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-lm32.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,41 @@
+/* BFD support for the Lattice Mico32 architecture.
+   Copyright 2008 Free Software Foundation, Inc.
+   Contributed by Jon Beniston <jon@beniston.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "bfd.h"
+#include "sysdep.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_lm32_arch = 
+{
+    32,                           /* Bits in word.  */
+    32,                           /* Bits in address.  */
+    8,                            /* Bits in byte.  */
+    bfd_arch_lm32,                /* Enum bfd_architecture.  */ 
+    bfd_mach_lm32,                /* Machine number.  */
+    "lm32",                       /* Architecture name.  */
+    "lm32",                       /* Printable name.  */
+    4,                            /* Alignment.  */
+    TRUE,                         /* Is this the default machine for the target.  */
+    bfd_default_compatible,       /* Function callback to test if two files have compatible machines.  */
+    bfd_default_scan,
+    NULL                          /* Next.  */
+};
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-m10200.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-m10200.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-m10200.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-m10200.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,39 @@
+/* BFD support for the Matsushita 10200 processor
+   Copyright 1996, 1997, 2002, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_mn10200_arch =
+  {
+    16, /* 16 bits in a word */
+    24, /* 16 bits in an address */
+    8,  /* 8 bits in a byte */
+    bfd_arch_mn10200,
+    200,
+    "mn10200",
+    "mn10200",
+    2,
+    TRUE, /* the one and only */
+    bfd_default_compatible,
+    bfd_default_scan ,
+    0,
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-m10300.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-m10300.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-m10300.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-m10300.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,72 @@
+/* BFD support for the Matsushita 10300 processor
+   Copyright 1996, 1997, 1999, 2000, 2002, 2003, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_am33_2_arch =
+  {
+    32, /* 32 bits in a word */
+    32, /* 32 bits in an address */
+    8,  /* 8 bits in a byte */
+    bfd_arch_mn10300,
+    332,
+    "am33_2",
+    "am33-2",
+    2,
+    FALSE,
+    bfd_default_compatible,
+    bfd_default_scan,
+    0,
+  };
+
+const bfd_arch_info_type bfd_am33_arch =
+  {
+    32, /* 32 bits in a word */
+    32, /* 32 bits in an address */
+    8,  /* 8 bits in a byte */
+    bfd_arch_mn10300,
+    330,
+    "am33",
+    "am33",
+    2,
+    FALSE,
+    bfd_default_compatible,
+    bfd_default_scan,
+    &bfd_am33_2_arch,
+  };
+
+const bfd_arch_info_type bfd_mn10300_arch =
+  {
+    32, /* 32 bits in a word */
+    32, /* 32 bits in an address */
+    8,  /* 8 bits in a byte */
+    bfd_arch_mn10300,
+    300,
+    "mn10300",
+    "mn10300",
+    2,
+    TRUE, /* the one and only */
+    bfd_default_compatible,
+    bfd_default_scan,
+    &bfd_am33_arch,
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-m32c.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-m32c.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-m32c.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-m32c.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,70 @@
+/* BFD support for the M16C/M32C processors.
+   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+/* Like bfd_default_scan but if the string is just "m32c" then
+   skip the m16c architecture.  */
+
+static bfd_boolean
+m32c_scan (const bfd_arch_info_type * info, const char * string)
+{
+  if (strcmp (string, "m32c") == 0
+      && info->mach == bfd_mach_m16c)
+    return FALSE;
+
+  return bfd_default_scan (info, string);
+}
+
+static const bfd_arch_info_type arch_info_struct[] =
+{
+  {
+    32,				/* bits per word */
+    32,				/* bits per address */
+    8,				/* bits per byte */
+    bfd_arch_m32c,		/* architecture */
+    bfd_mach_m32c,		/* machine */
+    "m32c",			/* architecture name */
+    "m32c",			/* printable name */
+    3,				/* section align power */
+    FALSE,			/* the default ? */
+    bfd_default_compatible,	/* architecture comparison fn */
+    m32c_scan,			/* string to architecture convert fn */
+    NULL			/* next in list */
+  },
+};
+
+const bfd_arch_info_type bfd_m32c_arch =
+{
+  32,				/* Bits per word.  */
+  32,				/* Bits per address.  */
+  8,				/* Bits per byte.  */
+  bfd_arch_m32c,		/* Architecture.  */
+  bfd_mach_m16c,		/* Machine.  */
+  "m32c",			/* Architecture name.  */
+  "m16c",			/* Printable name.  */
+  4,				/* Section align power.  */
+  TRUE,				/* The default ?  */
+  bfd_default_compatible,	/* Architecture comparison fn.  */
+  m32c_scan,			/* String to architecture convert fn.  */
+  &arch_info_struct[0],		/* Next in list.  */
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-m32r.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-m32r.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-m32r.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-m32r.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,40 @@
+/* BFD support for the M32R processor.
+   Copyright 1996, 1999, 2000, 2002, 2003, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#define N(number, print, default, next)  \
+{  32, 32, 8, bfd_arch_m32r, number, "m32r", print, 4, default, \
+     bfd_default_compatible, bfd_default_scan, next }
+
+#define M32R2_NEXT   & arch_info_struct [1]
+#define NEXT         & arch_info_struct [0]
+
+static const bfd_arch_info_type arch_info_struct[] =
+{
+  N (bfd_mach_m32rx, "m32rx", FALSE, M32R2_NEXT) ,
+  N (bfd_mach_m32r2, "m32r2", FALSE, NULL)
+};
+
+const bfd_arch_info_type bfd_m32r_arch =
+  N (bfd_mach_m32r, "m32r", TRUE, NEXT);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-m68hc11.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-m68hc11.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-m68hc11.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-m68hc11.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,39 @@
+/* BFD support for the Motorola 68HC11 processor
+   Copyright 1999, 2000, 2001, 2002, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_m68hc11_arch =
+{
+    16,	/* 16 bits in a word */
+    16,	/* 16 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_m68hc11,
+    0,
+    "m68hc11",
+    "m68hc11",
+    4, /* section alignment power */
+    TRUE,
+    bfd_default_compatible,
+    bfd_default_scan,
+    0,
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-m68hc12.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-m68hc12.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-m68hc12.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-m68hc12.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,55 @@
+/* BFD support for the Motorola 68HC12 processor
+   Copyright 1999, 2000, 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_m68hc12s_arch =
+{
+    16,	/* 16 bits in a word */
+    32,	/* 16 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_m68hc12,
+    bfd_mach_m6812s,
+    "m68hc12:HCS12",
+    "m68hc12",
+    4, /* section alignment power */
+    TRUE,
+    bfd_default_compatible,
+    bfd_default_scan,
+    0,
+};
+
+const bfd_arch_info_type bfd_m68hc12_arch =
+{
+    16,	/* 16 bits in a word */
+    32,	/* 16 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_m68hc12,
+    0,
+    "m68hc12",
+    "m68hc12",
+    4, /* section alignment power */
+    TRUE,
+    bfd_default_compatible,
+    bfd_default_scan,
+    &bfd_m68hc12s_arch,
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-m68k.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-m68k.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-m68k.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-m68k.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,273 @@
+/* BFD library support routines for architectures.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1997, 1998, 2000, 2001, 2002,
+   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Hacked by Steve Chamberlain of Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "opcode/m68k.h"
+
+static const bfd_arch_info_type *
+bfd_m68k_compatible (const bfd_arch_info_type *a,
+		     const bfd_arch_info_type *b);
+
+#define N(name, print,d,next)  \
+{  32, 32, 8, bfd_arch_m68k, name, "m68k",print,2,d,bfd_m68k_compatible,bfd_default_scan, next, }
+
+static const bfd_arch_info_type arch_info_struct[] =
+  {
+    N(bfd_mach_m68000,  "m68k:68000", FALSE, &arch_info_struct[1]),
+    N(bfd_mach_m68008,  "m68k:68008", FALSE, &arch_info_struct[2]),
+    N(bfd_mach_m68010,  "m68k:68010", FALSE, &arch_info_struct[3]),
+    N(bfd_mach_m68020,  "m68k:68020", FALSE, &arch_info_struct[4]),
+    N(bfd_mach_m68030,  "m68k:68030", FALSE, &arch_info_struct[5]),
+    N(bfd_mach_m68040,  "m68k:68040", FALSE, &arch_info_struct[6]),
+    N(bfd_mach_m68060,  "m68k:68060", FALSE, &arch_info_struct[7]),
+    N(bfd_mach_cpu32,   "m68k:cpu32", FALSE, &arch_info_struct[8]),
+    N(bfd_mach_fido,    "m68k:fido",  FALSE, &arch_info_struct[9]),
+
+    /* Various combinations of CF architecture features */
+    N(bfd_mach_mcf_isa_a_nodiv, "m68k:isa-a:nodiv",
+      FALSE, &arch_info_struct[10]),
+    N(bfd_mach_mcf_isa_a, "m68k:isa-a",
+      FALSE, &arch_info_struct[11]),
+    N(bfd_mach_mcf_isa_a_mac, "m68k:isa-a:mac",
+      FALSE, &arch_info_struct[12]),
+    N(bfd_mach_mcf_isa_a_emac, "m68k:isa-a:emac",
+      FALSE, &arch_info_struct[13]),
+    N(bfd_mach_mcf_isa_aplus, "m68k:isa-aplus",
+      FALSE, &arch_info_struct[14]),
+    N(bfd_mach_mcf_isa_aplus_mac, "m68k:isa-aplus:mac",
+      FALSE, &arch_info_struct[15]),
+    N(bfd_mach_mcf_isa_aplus_emac, "m68k:isa-aplus:emac",
+      FALSE, &arch_info_struct[16]),
+    N(bfd_mach_mcf_isa_b_nousp, "m68k:isa-b:nousp",
+      FALSE, &arch_info_struct[17]),
+    N(bfd_mach_mcf_isa_b_nousp_mac, "m68k:isa-b:nousp:mac",
+      FALSE, &arch_info_struct[18]),
+    N(bfd_mach_mcf_isa_b_nousp_emac, "m68k:isa-b:nousp:emac",
+      FALSE, &arch_info_struct[19]),
+    N(bfd_mach_mcf_isa_b, "m68k:isa-b",
+      FALSE, &arch_info_struct[20]),
+    N(bfd_mach_mcf_isa_b_mac, "m68k:isa-b:mac",
+      FALSE, &arch_info_struct[21]),
+    N(bfd_mach_mcf_isa_b_emac, "m68k:isa-b:emac",
+      FALSE, &arch_info_struct[22]),
+    N(bfd_mach_mcf_isa_b_float, "m68k:isa-b:float",
+      FALSE, &arch_info_struct[23]),
+    N(bfd_mach_mcf_isa_b_float_mac, "m68k:isa-b:float:mac",
+      FALSE, &arch_info_struct[24]),
+    N(bfd_mach_mcf_isa_b_float_emac, "m68k:isa-b:float:emac",
+      FALSE, &arch_info_struct[25]),
+    N(bfd_mach_mcf_isa_c, "m68k:isa-c",
+      FALSE, &arch_info_struct[26]),
+    N(bfd_mach_mcf_isa_c_mac, "m68k:isa-c:mac",
+      FALSE, &arch_info_struct[27]),
+    N(bfd_mach_mcf_isa_c_emac, "m68k:isa-c:emac",
+      FALSE, &arch_info_struct[28]),
+    N(bfd_mach_mcf_isa_c_nodiv, "m68k:isa-c:nodiv",
+      FALSE, &arch_info_struct[29]),
+    N(bfd_mach_mcf_isa_c_nodiv_mac, "m68k:isa-c:nodiv:mac",
+      FALSE, &arch_info_struct[30]),
+    N(bfd_mach_mcf_isa_c_nodiv_emac, "m68k:isa-c:nodiv:emac",
+      FALSE, &arch_info_struct[31]),
+
+    /* Legacy names for CF architectures */
+    N(bfd_mach_mcf_isa_a_nodiv, "m68k:5200", FALSE, &arch_info_struct[32]),
+    N(bfd_mach_mcf_isa_a_mac,"m68k:5206e", FALSE, &arch_info_struct[33]),
+    N(bfd_mach_mcf_isa_a_mac, "m68k:5307", FALSE, &arch_info_struct[34]),
+    N(bfd_mach_mcf_isa_b_nousp_mac, "m68k:5407", FALSE, &arch_info_struct[35]),
+    N(bfd_mach_mcf_isa_aplus_emac, "m68k:528x", FALSE, &arch_info_struct[36]),
+    N(bfd_mach_mcf_isa_aplus_emac, "m68k:521x", FALSE, &arch_info_struct[37]),
+    N(bfd_mach_mcf_isa_a_emac, "m68k:5249", FALSE, &arch_info_struct[38]),
+    N(bfd_mach_mcf_isa_b_float_emac, "m68k:547x",
+      FALSE, &arch_info_struct[39]),
+    N(bfd_mach_mcf_isa_b_float_emac, "m68k:548x",
+      FALSE, &arch_info_struct[40]),
+    N(bfd_mach_mcf_isa_b_float_emac, "m68k:cfv4e", FALSE, 0),
+  };
+
+const bfd_arch_info_type bfd_m68k_arch =
+  N(0, "m68k", TRUE, &arch_info_struct[0]);
+
+/* Table indexed by bfd_mach_arch number indicating which
+   architectural features are supported.  */
+static const unsigned m68k_arch_features[] = 
+{
+  0,
+  m68000|m68881|m68851,
+  m68000|m68881|m68851,
+  m68010|m68881|m68851,
+  m68020|m68881|m68851,
+  m68030|m68881|m68851,
+  m68040|m68881|m68851,
+  m68060|m68881|m68851,
+  cpu32|m68881,
+  fido_a|m68881,
+  mcfisa_a,
+  mcfisa_a|mcfhwdiv,
+  mcfisa_a|mcfhwdiv|mcfmac,
+  mcfisa_a|mcfhwdiv|mcfemac,
+  mcfisa_a|mcfisa_aa|mcfhwdiv|mcfusp,
+  mcfisa_a|mcfisa_aa|mcfhwdiv|mcfusp|mcfmac,
+  mcfisa_a|mcfisa_aa|mcfhwdiv|mcfusp|mcfemac,
+  mcfisa_a|mcfhwdiv|mcfisa_b,
+  mcfisa_a|mcfhwdiv|mcfisa_b|mcfmac,
+  mcfisa_a|mcfhwdiv|mcfisa_b|mcfemac,
+  mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp,
+  mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp|mcfmac,
+  mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp|mcfemac,
+  mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp|cfloat,
+  mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp|cfloat|mcfmac,
+  mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp|cfloat|mcfemac,
+  mcfisa_a|mcfhwdiv|mcfisa_c|mcfusp,
+  mcfisa_a|mcfhwdiv|mcfisa_c|mcfusp|mcfmac,
+  mcfisa_a|mcfhwdiv|mcfisa_c|mcfusp|mcfemac,
+  mcfisa_a|mcfisa_c|mcfusp,
+  mcfisa_a|mcfisa_c|mcfusp|mcfmac,
+  mcfisa_a|mcfisa_c|mcfusp|mcfemac,
+};
+
+/* Return the count of bits set in MASK  */
+static unsigned
+bit_count (unsigned mask)
+{
+  unsigned ix;
+
+  for (ix = 0; mask; ix++)
+    /* Clear the LSB set */
+    mask ^= mask & -mask;
+  return ix;
+}
+
+/* Return the architectural features supported by MACH */
+
+unsigned
+bfd_m68k_mach_to_features (int mach)
+{
+  if ((unsigned)mach
+      >= sizeof (m68k_arch_features) / sizeof (m68k_arch_features[0]))
+    mach = 0;
+  return m68k_arch_features[mach];
+}
+
+/* Return the bfd machine that most closely represents the
+   architectural features.  We find the machine with the smallest
+   number of additional features.  If there is no such machine, we
+   find the one with the smallest number of missing features.  */
+
+int bfd_m68k_features_to_mach (unsigned features)
+{
+  int superset = 0, subset = 0;
+  unsigned extra = 99, missing = 99;
+  unsigned ix;
+
+  for (ix = 0;
+       ix != sizeof (m68k_arch_features) / sizeof (m68k_arch_features[0]);
+       ix++)
+    {
+      unsigned this_extra, this_missing;
+      
+      if (m68k_arch_features[ix] == features)
+	return ix;
+      this_extra = bit_count (m68k_arch_features[ix] & ~features);
+      if (this_extra < extra)
+	{
+	  extra = this_extra;
+	  superset = ix;
+	}
+      
+      this_missing = bit_count (features & ~m68k_arch_features[ix]);
+      if (this_missing < missing)
+	{
+	  missing = this_missing;
+	  superset = ix;
+	}
+    }
+  return superset ? superset : subset;
+}
+
+static const bfd_arch_info_type *
+bfd_m68k_compatible (const bfd_arch_info_type *a,
+		     const bfd_arch_info_type *b)
+{
+  if (a->arch != b->arch)
+    return NULL;
+
+  if (a->bits_per_word != b->bits_per_word)
+    return NULL;
+
+  if (!a->mach)
+    return b;
+  if (!b->mach)
+    return a;
+  
+  if (a->mach <= bfd_mach_m68060 && b->mach <= bfd_mach_m68060)
+    /* Merge m68k machine. */
+    return a->mach > b->mach ? a : b;
+  else if (a->mach >= bfd_mach_cpu32 && b->mach >= bfd_mach_cpu32)
+    {
+      /* Merge the machine features.  */
+      unsigned features = (bfd_m68k_mach_to_features (a->mach)
+			   | bfd_m68k_mach_to_features (b->mach));
+
+      /* CPU32 and Coldfire are incompatible.  */
+      if ((~features & (cpu32 | mcfisa_a)) == 0)
+	return NULL;
+
+      /* Fido and Coldfire are incompatible.  */
+      if ((~features & (fido_a | mcfisa_a)) == 0)
+	return NULL;
+
+      /* ISA A+ and ISA B are incompatible.  */
+      if ((~features & (mcfisa_aa | mcfisa_b)) == 0)
+	return NULL;
+
+      /* ISA B and ISA C are incompatible.  */
+      if ((~features & (mcfisa_b | mcfisa_c)) == 0)
+	return NULL;
+
+      /* MAC and EMAC code cannot be merged.  */
+      if ((~features & (mcfmac | mcfemac)) == 0)
+	return NULL;
+
+      /* CPU32 is compatible with Fido except that Fido does not
+	 support tbl instructions.  Warn when the user wants to mix
+	 the two.  */
+      if ((a->mach == bfd_mach_cpu32 && b->mach == bfd_mach_fido)
+	  || (a->mach == bfd_mach_fido && b->mach == bfd_mach_cpu32))
+	{
+	  static int cpu32_fido_mix_warning;
+	  if (!cpu32_fido_mix_warning)
+	    {
+	      cpu32_fido_mix_warning = 1;
+	      (*_bfd_error_handler) ("warning: linking CPU32 objects with fido objects");
+	    }
+	  return bfd_lookup_arch (a->arch,
+				  bfd_m68k_features_to_mach (fido_a | m68881));
+	}
+
+      return bfd_lookup_arch (a->arch, bfd_m68k_features_to_mach (features));
+    }
+  else
+    /* They are incompatible.  */
+    return NULL;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-m88k.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-m88k.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-m88k.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-m88k.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,41 @@
+/* bfd back-end for m88k support
+   Copyright 1990, 1991, 1994, 2000, 2002, 2005, 2007
+   Free Software Foundation, Inc.
+   Written by Steve Chamberlain of Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_m88k_arch =
+  {
+    32,	/* 32 bits in a word */
+    32,	/* 32 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_m88k,
+    88100,	/* only 1 machine */
+    "m88k",
+    "m88k:88100",
+    3,
+    TRUE, /* the one and only */
+    bfd_default_compatible,
+    bfd_default_scan ,
+    0,
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-mcore.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-mcore.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-mcore.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-mcore.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,39 @@
+/* BFD library support routines for Motorola's MCore architecture
+   Copyright 1993, 1999, 2000, 2002, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_mcore_arch =
+{
+  32,		  		/* 32 bits in a word */
+  32,		  		/* 32 bits in an address */
+  8,		  		/* 8 bits in a byte */
+  bfd_arch_mcore, 		/* Architecture */
+  0,		  		/* Machine number - 0 for now */
+  "MCore",	  		/* Architecture name */
+  "MCore",	  		/* Printable name */
+  3,		  		/* Section align power */
+  TRUE,		  		/* Is this the default architecture ? */
+  bfd_default_compatible,	/* Architecture comparison function */
+  bfd_default_scan,	   	/* String to architecture conversion */
+  NULL			   	/* Next in list */
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-mep.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-mep.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-mep.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-mep.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,29 @@
+/* BFD support for the Toshiba Media Engine Processor.
+   Copyright (C) 2001, 2002, 2004, 2007, 2009 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#define MA(x, n, def, y) { 32, 32, 8, bfd_arch_mep, x, "mep", n, \
+	2, def, bfd_default_compatible, bfd_default_scan, y }
+
+static const bfd_arch_info_type bfd_c5_arch = MA (bfd_mach_mep_c5, "c5", FALSE, NULL);
+static const bfd_arch_info_type bfd_h1_arch = MA (bfd_mach_mep_h1, "h1", FALSE, & bfd_c5_arch);
+const bfd_arch_info_type bfd_mep_arch = MA (bfd_mach_mep, "mep", TRUE, & bfd_h1_arch);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-microblaze.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-microblaze.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-microblaze.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-microblaze.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,40 @@
+/* BFD Xilinx MicroBlaze architecture definition
+
+   Copyright 2009 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "bfd.h"
+#include "sysdep.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_microblaze_arch =
+{
+  32,		  		/* 32 bits in a word.  */
+  32,		  		/* 32 bits in an address.  */
+  8,		  		/* 8 bits in a byte.  */
+  bfd_arch_microblaze, 		/* Architecture.  */
+  0,		  		/* Machine number - 0 for now.  */
+  "microblaze",	  		/* Architecture name.  */
+  "MicroBlaze",	  		/* Printable name.  */
+  3,		  		/* Section align power.  */
+  TRUE,		  		/* Is this the default architecture ?  */
+  bfd_default_compatible,	/* Architecture comparison function.  */
+  bfd_default_scan,	   	/* String to architecture conversion.  */
+  NULL			   	/* Next in list.  */
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-mips.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-mips.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-mips.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-mips.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,146 @@
+/* bfd back-end for mips support
+   Copyright 1990, 1991, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001,
+   2002, 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
+   Written by Steve Chamberlain of Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+static const bfd_arch_info_type *mips_compatible
+  (const bfd_arch_info_type *, const bfd_arch_info_type *);
+
+/* The default routine tests bits_per_word, which is wrong on mips as
+   mips word size doesn't correlate with reloc size.  */
+
+static const bfd_arch_info_type *
+mips_compatible (const bfd_arch_info_type *a, const bfd_arch_info_type *b)
+{
+  if (a->arch != b->arch)
+    return NULL;
+
+  /* Machine compatibility is checked in
+     _bfd_mips_elf_merge_private_bfd_data.  */
+
+  return a;
+}
+
+#define N(BITS_WORD, BITS_ADDR, NUMBER, PRINT, DEFAULT, NEXT)		\
+  {							\
+    BITS_WORD, /*  bits in a word */			\
+    BITS_ADDR, /* bits in an address */			\
+    8,	/* 8 bits in a byte */				\
+    bfd_arch_mips,					\
+    NUMBER,						\
+    "mips",						\
+    PRINT,						\
+    3,							\
+    DEFAULT,						\
+    mips_compatible,					\
+    bfd_default_scan,					\
+    NEXT,						\
+  }
+
+enum
+{
+  I_mips3000,
+  I_mips3900,
+  I_mips4000,
+  I_mips4010,
+  I_mips4100,
+  I_mips4111,
+  I_mips4120,
+  I_mips4300,
+  I_mips4400,
+  I_mips4600,
+  I_mips4650,
+  I_mips5000,
+  I_mips5400,
+  I_mips5500,
+  I_mips6000,
+  I_mips7000,
+  I_mips8000,
+  I_mips9000,
+  I_mips10000,
+  I_mips12000,
+  I_mips14000,
+  I_mips16000,
+  I_mips16,
+  I_mips5,
+  I_mipsisa32,
+  I_mipsisa32r2,
+  I_mipsisa64,
+  I_mipsisa64r2,
+  I_sb1,
+  I_loongson_2e,
+  I_loongson_2f,
+  I_loongson_3a,
+  I_mipsocteon,
+  I_xlr,
+  I_micromips
+};
+
+#define NN(index) (&arch_info_struct[(index) + 1])
+
+static const bfd_arch_info_type arch_info_struct[] =
+{
+  N (32, 32, bfd_mach_mips3000, "mips:3000",      FALSE, NN(I_mips3000)),
+  N (32, 32, bfd_mach_mips3900, "mips:3900",      FALSE, NN(I_mips3900)),
+  N (64, 64, bfd_mach_mips4000, "mips:4000",      FALSE, NN(I_mips4000)),
+  N (64, 64, bfd_mach_mips4010, "mips:4010",      FALSE, NN(I_mips4010)),
+  N (64, 64, bfd_mach_mips4100, "mips:4100",      FALSE, NN(I_mips4100)),
+  N (64, 64, bfd_mach_mips4111, "mips:4111",      FALSE, NN(I_mips4111)),
+  N (64, 64, bfd_mach_mips4120, "mips:4120",      FALSE, NN(I_mips4120)),
+  N (64, 64, bfd_mach_mips4300, "mips:4300",      FALSE, NN(I_mips4300)),
+  N (64, 64, bfd_mach_mips4400, "mips:4400",      FALSE, NN(I_mips4400)),
+  N (64, 64, bfd_mach_mips4600, "mips:4600",      FALSE, NN(I_mips4600)),
+  N (64, 64, bfd_mach_mips4650, "mips:4650",      FALSE, NN(I_mips4650)),
+  N (64, 64, bfd_mach_mips5000, "mips:5000",      FALSE, NN(I_mips5000)),
+  N (64, 64, bfd_mach_mips5400, "mips:5400",      FALSE, NN(I_mips5400)),
+  N (64, 64, bfd_mach_mips5500, "mips:5500",      FALSE, NN(I_mips5500)),
+  N (32, 32, bfd_mach_mips6000, "mips:6000",      FALSE, NN(I_mips6000)),
+  N (64, 64, bfd_mach_mips7000, "mips:7000",      FALSE, NN(I_mips7000)),
+  N (64, 64, bfd_mach_mips8000, "mips:8000",      FALSE, NN(I_mips8000)),
+  N (64, 64, bfd_mach_mips9000, "mips:9000",      FALSE, NN(I_mips9000)),
+  N (64, 64, bfd_mach_mips10000,"mips:10000",     FALSE, NN(I_mips10000)),
+  N (64, 64, bfd_mach_mips12000,"mips:12000",     FALSE, NN(I_mips12000)),
+  N (64, 64, bfd_mach_mips14000,"mips:14000",     FALSE, NN(I_mips14000)),
+  N (64, 64, bfd_mach_mips16000,"mips:16000",     FALSE, NN(I_mips16000)),
+  N (64, 64, bfd_mach_mips16,   "mips:16",        FALSE, NN(I_mips16)),
+  N (64, 64, bfd_mach_mips5,    "mips:mips5",     FALSE, NN(I_mips5)),
+  N (32, 32, bfd_mach_mipsisa32,  "mips:isa32",   FALSE, NN(I_mipsisa32)),
+  N (32, 32, bfd_mach_mipsisa32r2,"mips:isa32r2", FALSE, NN(I_mipsisa32r2)),
+  N (64, 64, bfd_mach_mipsisa64,  "mips:isa64",   FALSE, NN(I_mipsisa64)),
+  N (64, 64, bfd_mach_mipsisa64r2,"mips:isa64r2", FALSE, NN(I_mipsisa64r2)),
+  N (64, 64, bfd_mach_mips_sb1, "mips:sb1",       FALSE, NN(I_sb1)),
+  N (64, 64, bfd_mach_mips_loongson_2e, "mips:loongson_2e",       FALSE, NN(I_loongson_2e)),
+  N (64, 64, bfd_mach_mips_loongson_2f, "mips:loongson_2f",       FALSE, NN(I_loongson_2f)),
+  N (64, 64, bfd_mach_mips_loongson_3a, "mips:loongson_3a",       FALSE, NN(I_loongson_3a)),
+  N (64, 64, bfd_mach_mips_octeon,"mips:octeon",  FALSE, NN(I_mipsocteon)),
+  N (64, 64, bfd_mach_mips_xlr, "mips:xlr",       FALSE, NN(I_xlr)),
+  N (64, 64, bfd_mach_mips_micromips,"mips:micromips",FALSE,0)
+};
+
+/* The default architecture is mips:3000, but with a machine number of
+   zero.  This lets the linker distinguish between a default setting
+   of mips, and an explicit setting of mips:3000.  */
+
+const bfd_arch_info_type bfd_mips_arch =
+N (32, 32, 0, "mips", TRUE, &arch_info_struct[0]);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-mmix.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-mmix.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-mmix.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-mmix.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,42 @@
+/* BFD library support routines for MMIX.
+   Copyright 2001, 2002, 2005, 2007 Free Software Foundation, Inc.
+   Contributed by Hans-Peter Nilsson (hp@bitrange.com)
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type
+bfd_mmix_arch =
+ {
+   64,				/* 64 bits in a word.  */
+   64,				/* 64 bits in an address.  */
+   8,				/* 8 bits in a byte.  */
+   bfd_arch_mmix,		/* Architecture.  */
+   0,				/* Machine number - 0 for now.  */
+   /* Sorry, these are by custom and creeping assumption lower-case.  */
+   "mmix",			/* Architecture name.  */
+   "mmix",			/* Printable name.  */
+   3,				/* Section align power.  */
+   TRUE,			/* This is the default architecture.  */
+   bfd_default_compatible,	/* Architecture comparison function.  */
+   bfd_default_scan,		/* String to architecture conversion.  */
+   NULL				/* Next in list.  */
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-moxie.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-moxie.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-moxie.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-moxie.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,40 @@
+/* BFD support for the moxie processor.
+   Copyright 2009 Free Software Foundation, Inc.
+   Written by Anthony Green
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+
+const bfd_arch_info_type bfd_moxie_arch =
+  {
+    32,               /* 32 bits in a word.  */
+    32,               /* 32 bits in an address.  */
+    8,                /*  8 bits in a byte.  */
+    bfd_arch_moxie,   /* enum bfd_architecture arch.  */
+    bfd_mach_moxie,
+    "moxie",          /* Arch name.  */
+    "moxie",          /* Printable name.  */
+    2,                /* Unsigned int section alignment power.  */
+    TRUE,             /* The one and only.  */
+    bfd_default_compatible, 
+    bfd_default_scan ,
+    0,
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-msp430.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-msp430.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-msp430.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-msp430.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,113 @@
+/* BFD library support routines for the MSP architecture.
+   Copyright (C) 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
+   Contributed by Dmitry Diky <diwil@mail.ru>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+static const bfd_arch_info_type *compatible
+  PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
+
+#define N(addr_bits, machine, print, default, next)		\
+{								\
+  16,				/* 16 bits in a word.  */	\
+  addr_bits,			/* Bits in an address.  */	\
+  8,				/* 8 bits in a byte.  */	\
+  bfd_arch_msp430,						\
+  machine,			/* Machine number.  */		\
+  "msp430",			/* Architecture name.   */	\
+  print,			/* Printable name.  */		\
+  1,				/* Section align power.  */	\
+  default,			/* The default machine.  */	\
+  compatible,							\
+  bfd_default_scan,						\
+  next								\
+}
+
+static const bfd_arch_info_type arch_info_struct[] =
+{
+  /* msp430x11x.  */
+  N (16, bfd_mach_msp11, "msp:11", FALSE, & arch_info_struct[1]),
+
+  /* msp430x11x1.  */
+  N (16, bfd_mach_msp110, "msp:110", FALSE, & arch_info_struct[2]),
+
+  /* msp430x12x.  */
+  N (16, bfd_mach_msp12, "msp:12", FALSE, & arch_info_struct[3]),
+
+  /* msp430x13x.  */
+  N (16, bfd_mach_msp13, "msp:13", FALSE, & arch_info_struct[4]),
+
+  /* msp430x14x.  */
+  N (16, bfd_mach_msp14, "msp:14", FALSE, & arch_info_struct[5]),
+
+  /* msp430x15x.  */
+  N (16, bfd_mach_msp15, "msp:15", FALSE, & arch_info_struct[6]),
+  
+  /* msp430x16x.  */
+  N (16, bfd_mach_msp16, "msp:16", FALSE, & arch_info_struct[7]),
+
+  /* msp430x21x.  */
+  N (16, bfd_mach_msp21, "msp:21", FALSE, & arch_info_struct[8]),
+
+  /* msp430x31x.  */
+  N (16, bfd_mach_msp31, "msp:31", FALSE, & arch_info_struct[9]), 
+
+  /* msp430x32x.  */
+  N (16, bfd_mach_msp32, "msp:32", FALSE, & arch_info_struct[10]), 
+
+  /* msp430x33x.  */
+  N (16, bfd_mach_msp33, "msp:33", FALSE, & arch_info_struct[11]),
+  
+  /* msp430x41x.  */
+  N (16, bfd_mach_msp41, "msp:41", FALSE, & arch_info_struct[12]),
+
+  /* msp430x42x.  */
+  N (16, bfd_mach_msp42, "msp:42", FALSE, & arch_info_struct[13]),
+
+  /* msp430x43x.  */
+  N (16, bfd_mach_msp43, "msp:43", FALSE, & arch_info_struct[14]),
+
+  /* msp430x44x.  */
+  N (16, bfd_mach_msp43, "msp:44", FALSE, NULL)
+};
+
+const bfd_arch_info_type bfd_msp430_arch =
+  N (16, bfd_mach_msp14, "msp:14", TRUE, & arch_info_struct[0]);
+
+/* This routine is provided two arch_infos and works out which MSP
+   machine which would be compatible with both and returns a pointer
+   to its info structure.  */
+
+static const bfd_arch_info_type *
+compatible (a,b)
+     const bfd_arch_info_type * a;
+     const bfd_arch_info_type * b;
+{
+  /* If a & b are for different architectures we can do nothing.  */
+  if (a->arch != b->arch)
+    return NULL;
+
+  if (a->mach <= b->mach)
+    return b;
+
+  return a;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-mt.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-mt.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-mt.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-mt.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,72 @@
+/* BFD support for the Morpho Technologies MT processor.
+   Copyright (C) 2001, 2002, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+   MA 02111-1307, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type arch_info_struct[] =
+{
+{
+  32,				/* Bits per word - not really true.  */
+  32,				/* Bits per address.  */
+  8,				/* Bits per byte.  */
+  bfd_arch_mt,			/* Architecture.  */
+  bfd_mach_mrisc2,		/* Machine.  */
+  "mt",				/* Architecture name.  */
+  "ms1-003",			/* Printable name.  */
+  1,				/* Section align power.  */
+  FALSE,		        /* The default ?  */
+  bfd_default_compatible,	/* Architecture comparison fn.  */
+  bfd_default_scan,		/* String to architecture convert fn.  */
+  &arch_info_struct[1]          /* Next in list.  */
+},
+{
+  32,				/* Bits per word - not really true.  */
+  32,				/* Bits per address.  */
+  8,				/* Bits per byte.  */
+  bfd_arch_mt,			/* Architecture.  */
+  bfd_mach_ms2,		        /* Machine.  */
+  "mt",				/* Architecture name.  */
+  "ms2",			/* Printable name.  */
+  1,				/* Section align power.  */
+  FALSE,		        /* The default ?  */
+  bfd_default_compatible,	/* Architecture comparison fn.  */
+  bfd_default_scan,		/* String to architecture convert fn.  */
+  NULL				/* Next in list.  */
+},
+};
+
+const bfd_arch_info_type bfd_mt_arch =
+{
+  32,				/* Bits per word - not really true.  */
+  32,				/* Bits per address.  */
+  8,				/* Bits per byte.  */
+  bfd_arch_mt,			/* Architecture.  */
+  bfd_mach_ms1,			/* Machine.  */
+  "mt",				/* Architecture name.  */
+  "ms1",			/* Printable name.  */
+  1,				/* Section align power.  */
+  TRUE,		        	/* The default ?  */
+  bfd_default_compatible,	/* Architecture comparison fn.  */
+  bfd_default_scan,		/* String to architecture convert fn.  */
+  &arch_info_struct[0]		/* Next in list.  */
+};
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-ns32k.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-ns32k.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-ns32k.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-ns32k.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,835 @@
+/* BFD support for the ns32k architecture.
+   Copyright 1990, 1991, 1994, 1995, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2007 Free Software Foundation, Inc.
+   Almost totally rewritten by Ian Dall from initial work
+   by Andrew Cagney.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "ns32k.h"
+
+#define N(machine, printable, d, next)  \
+{  32, 32, 8, bfd_arch_ns32k, machine, "ns32k",printable,3,d,bfd_default_compatible,bfd_default_scan, next, }
+
+static const bfd_arch_info_type arch_info_struct[] =
+{
+  N(32532,"ns32k:32532",TRUE, 0), /* The word ns32k will match this too.  */
+};
+
+const bfd_arch_info_type bfd_ns32k_arch =
+  N(32032,"ns32k:32032",FALSE, &arch_info_struct[0]);
+
+static bfd_reloc_status_type do_ns32k_reloc
+  PARAMS ((bfd *, arelent *, struct bfd_symbol *, PTR, asection *,
+	   bfd *, char **,
+	   bfd_vma (*) (bfd_byte *, int),
+	   void (*) (bfd_vma, bfd_byte *, int)));
+
+bfd_vma
+_bfd_ns32k_get_displacement (buffer, size)
+     bfd_byte *buffer;
+     int size;
+{
+  bfd_signed_vma value;
+
+  switch (size)
+    {
+    case 1:
+      value = ((*buffer & 0x7f) ^ 0x40) - 0x40;
+      break;
+
+    case 2:
+      value = ((*buffer++ & 0x3f) ^ 0x20) - 0x20;
+      value = (value << 8) | (0xff & *buffer);
+      break;
+
+    case 4:
+      value = ((*buffer++ & 0x3f) ^ 0x20) - 0x20;
+      value = (value << 8) | (0xff & *buffer++);
+      value = (value << 8) | (0xff & *buffer++);
+      value = (value << 8) | (0xff & *buffer);
+      break;
+
+    default:
+      abort ();
+      return 0;
+    }
+
+  return value;
+}
+
+void
+_bfd_ns32k_put_displacement (value, buffer, size)
+     bfd_vma value;
+     bfd_byte *buffer;
+     int size;
+{
+  switch (size)
+    {
+    case 1:
+      value &= 0x7f;
+      *buffer++ = value;
+      break;
+
+    case 2:
+      value &= 0x3fff;
+      value |= 0x8000;
+      *buffer++ = (value >> 8);
+      *buffer++ = value;
+      break;
+
+    case 4:
+      value |= (bfd_vma) 0xc0000000;
+      *buffer++ = (value >> 24);
+      *buffer++ = (value >> 16);
+      *buffer++ = (value >> 8);
+      *buffer++ = value;
+      break;
+  }
+  return;
+}
+
+bfd_vma
+_bfd_ns32k_get_immediate (buffer, size)
+     bfd_byte *buffer;
+     int size;
+{
+  bfd_vma value = 0;
+
+  switch (size)
+    {
+    case 4:
+      value = (value << 8) | (*buffer++ & 0xff);
+      value = (value << 8) | (*buffer++ & 0xff);
+    case 2:
+      value = (value << 8) | (*buffer++ & 0xff);
+    case 1:
+      value = (value << 8) | (*buffer++ & 0xff);
+      break;
+    default:
+      abort ();
+    }
+  return value;
+}
+
+void
+_bfd_ns32k_put_immediate (value, buffer, size)
+     bfd_vma value;
+     bfd_byte *buffer;
+     int size;
+{
+  buffer += size - 1;
+  switch (size)
+    {
+    case 4:
+      *buffer-- = (value & 0xff); value >>= 8;
+      *buffer-- = (value & 0xff); value >>= 8;
+    case 2:
+      *buffer-- = (value & 0xff); value >>= 8;
+    case 1:
+      *buffer-- = (value & 0xff); value >>= 8;
+    }
+}
+
+/* This is just like the standard perform_relocation except we
+   use get_data and put_data which know about the ns32k storage
+   methods.  This is probably a lot more complicated than it
+   needs to be!  */
+
+static bfd_reloc_status_type
+do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
+		error_message, get_data, put_data)
+     bfd *abfd;
+     arelent *reloc_entry;
+     struct bfd_symbol *symbol;
+     PTR data;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+     bfd_vma (*get_data) PARAMS ((bfd_byte *, int));
+     void (*put_data) PARAMS ((bfd_vma, bfd_byte *, int));
+{
+  int overflow = 0;
+  bfd_vma relocation;
+  bfd_reloc_status_type flag = bfd_reloc_ok;
+  bfd_size_type addr = reloc_entry->address;
+  bfd_vma output_base = 0;
+  reloc_howto_type *howto = reloc_entry->howto;
+  asection *reloc_target_output_section;
+  bfd_byte *location;
+
+  if ((symbol->section == &bfd_abs_section)
+      && output_bfd != (bfd *) NULL)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  /* If we are not producing relocatable output, return an error if
+     the symbol is not defined.  An undefined weak symbol is
+     considered to have a value of zero (SVR4 ABI, p. 4-27).  */
+  if (symbol->section == &bfd_und_section
+      && (symbol->flags & BSF_WEAK) == 0
+      && output_bfd == (bfd *) NULL)
+    flag = bfd_reloc_undefined;
+
+  /* Is the address of the relocation really within the section?  */
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  /* Work out which section the relocation is targeted at and the
+     initial relocation command value.  */
+
+  /* Get symbol value.  (Common symbols are special.)  */
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  reloc_target_output_section = symbol->section->output_section;
+
+  /* Convert input-section-relative symbol value to absolute.  */
+  if (output_bfd != NULL && ! howto->partial_inplace)
+    output_base = 0;
+  else
+    output_base = reloc_target_output_section->vma;
+
+  relocation += output_base + symbol->section->output_offset;
+
+  /* Add in supplied addend.  */
+  relocation += reloc_entry->addend;
+
+  /* Here the variable relocation holds the final address of the
+     symbol we are relocating against, plus any addend.  */
+
+  if (howto->pc_relative)
+    {
+      /* This is a PC relative relocation.  We want to set RELOCATION
+	 to the distance between the address of the symbol and the
+	 location.  RELOCATION is already the address of the symbol.
+
+	 We start by subtracting the address of the section containing
+	 the location.
+
+	 If pcrel_offset is set, we must further subtract the position
+	 of the location within the section.  Some targets arrange for
+	 the addend to be the negative of the position of the location
+	 within the section; for example, i386-aout does this.  For
+	 i386-aout, pcrel_offset is FALSE.  Some other targets do not
+	 include the position of the location; for example, m88kbcs,
+	 or ELF.  For those targets, pcrel_offset is TRUE.
+
+	 If we are producing relocatable output, then we must ensure
+	 that this reloc will be correctly computed when the final
+	 relocation is done.  If pcrel_offset is FALSE we want to wind
+	 up with the negative of the location within the section,
+	 which means we must adjust the existing addend by the change
+	 in the location within the section.  If pcrel_offset is TRUE
+	 we do not want to adjust the existing addend at all.
+
+	 FIXME: This seems logical to me, but for the case of
+	 producing relocatable output it is not what the code
+	 actually does.  I don't want to change it, because it seems
+	 far too likely that something will break.  */
+      relocation -=
+	input_section->output_section->vma + input_section->output_offset;
+
+      if (howto->pcrel_offset)
+	relocation -= reloc_entry->address;
+    }
+
+  if (output_bfd != (bfd *) NULL)
+    {
+      if (! howto->partial_inplace)
+	{
+	  /* This is a partial relocation, and we want to apply the relocation
+	     to the reloc entry rather than the raw data. Modify the reloc
+	     inplace to reflect what we now know.  */
+	  reloc_entry->addend = relocation;
+	  reloc_entry->address += input_section->output_offset;
+	  return flag;
+	}
+      else
+	{
+	  /* This is a partial relocation, but inplace, so modify the
+	     reloc record a bit.
+
+	     If we've relocated with a symbol with a section, change
+	     into a ref to the section belonging to the symbol.  */
+
+	  reloc_entry->address += input_section->output_offset;
+
+	  /* WTF?? */
+	  if (abfd->xvec->flavour == bfd_target_coff_flavour)
+	    {
+	      /* For m68k-coff, the addend was being subtracted twice during
+		 relocation with -r.  Removing the line below this comment
+		 fixes that problem; see PR 2953.
+
+		 However, Ian wrote the following, regarding removing the line
+		 below, which explains why it is still enabled:  --djm
+
+		 If you put a patch like that into BFD you need to check all
+		 the COFF linkers.  I am fairly certain that patch will break
+		 coff-i386 (e.g., SCO); see coff_i386_reloc in coff-i386.c
+		 where I worked around the problem in a different way.  There
+		 may very well be a reason that the code works as it does.
+
+		 Hmmm.  The first obvious point is that bfd_perform_relocation
+		 should not have any tests that depend upon the flavour.  It's
+		 seem like entirely the wrong place for such a thing.  The
+		 second obvious point is that the current code ignores the
+		 reloc addend when producing relocatable output for COFF.
+		 That's peculiar.  In fact, I really have no idea what the
+		 point of the line you want to remove is.
+
+		 A typical COFF reloc subtracts the old value of the symbol
+		 and adds in the new value to the location in the object file
+		 (if it's a pc relative reloc it adds the difference between
+		 the symbol value and the location).  When relocating we need
+		 to preserve that property.
+
+		 BFD handles this by setting the addend to the negative of the
+		 old value of the symbol.  Unfortunately it handles common
+		 symbols in a non-standard way (it doesn't subtract the old
+		 value) but that's a different story (we can't change it
+		 without losing backward compatibility with old object files)
+		 (coff-i386 does subtract the old value, to be compatible with
+		 existing coff-i386 targets, like SCO).
+
+		 So everything works fine when not producing relocatable
+		 output.  When we are producing relocatable output, logically
+		 we should do exactly what we do when not producing
+		 relocatable output.  Therefore, your patch is correct.  In
+		 fact, it should probably always just set reloc_entry->addend
+		 to 0 for all cases, since it is, in fact, going to add the
+		 value into the object file.  This won't hurt the COFF code,
+		 which doesn't use the addend; I'm not sure what it will do
+		 to other formats (the thing to check for would be whether
+		 any formats both use the addend and set partial_inplace).
+
+		 When I wanted to make coff-i386 produce relocatable output,
+		 I ran into the problem that you are running into: I wanted
+		 to remove that line.  Rather than risk it, I made the
+		 coff-i386 relocs use a special function; it's coff_i386_reloc
+		 in coff-i386.c.  The function specifically adds the addend
+		 field into the object file, knowing that bfd_perform_relocation
+		 is not going to.  If you remove that line, then coff-i386.c
+		 will wind up adding the addend field in twice.  It's trivial
+		 to fix; it just needs to be done.
+
+		 The problem with removing the line is just that it may break
+		 some working code.  With BFD it's hard to be sure of anything.
+		 The right way to deal with this is simply to build and test at
+		 least all the supported COFF targets.  It should be
+		 straightforward if time and disk space consuming.  For each
+		 target:
+		   1) build the linker
+		   2) generate some executable, and link it using -r (I would
+		      probably use paranoia.o and link against newlib/libc.a,
+		      which for all the supported targets would be available in
+		      /usr/cygnus/progressive/H-host/target/lib/libc.a).
+		   3) make the change to reloc.c
+		   4) rebuild the linker
+		   5) repeat step 2
+		   6) if the resulting object files are the same, you have at
+		      least made it no worse
+		   7) if they are different you have to figure out which
+		      version is right.  */
+	      relocation -= reloc_entry->addend;
+	      reloc_entry->addend = 0;
+	    }
+	  else
+	    {
+	      reloc_entry->addend = relocation;
+	    }
+	}
+    }
+  else
+    {
+      reloc_entry->addend = 0;
+    }
+
+  /* FIXME: This overflow checking is incomplete, because the value
+     might have overflowed before we get here.  For a correct check we
+     need to compute the value in a size larger than bitsize, but we
+     can't reasonably do that for a reloc the same size as a host
+     machine word.
+     FIXME: We should also do overflow checking on the result after
+     adding in the value contained in the object file.  */
+  if (howto->complain_on_overflow != complain_overflow_dont)
+    {
+      bfd_vma check;
+
+      /* Get the value that will be used for the relocation, but
+	 starting at bit position zero.  */
+      if (howto->rightshift > howto->bitpos)
+	check = relocation >> (howto->rightshift - howto->bitpos);
+      else
+	check = relocation << (howto->bitpos - howto->rightshift);
+      switch (howto->complain_on_overflow)
+	{
+	case complain_overflow_signed:
+	  {
+	    /* Assumes two's complement.  */
+	    bfd_signed_vma reloc_signed_max = (1 << (howto->bitsize - 1)) - 1;
+	    bfd_signed_vma reloc_signed_min = ~reloc_signed_max;
+
+	    /* The above right shift is incorrect for a signed value.
+	       Fix it up by forcing on the upper bits.  */
+	    if (howto->rightshift > howto->bitpos
+		&& (bfd_signed_vma) relocation < 0)
+	      check |= ((bfd_vma) - 1
+			& ~((bfd_vma) - 1
+			    >> (howto->rightshift - howto->bitpos)));
+	    if ((bfd_signed_vma) check > reloc_signed_max
+		|| (bfd_signed_vma) check < reloc_signed_min)
+	      flag = bfd_reloc_overflow;
+	  }
+	  break;
+	case complain_overflow_unsigned:
+	  {
+	    /* Assumes two's complement.  This expression avoids
+	       overflow if howto->bitsize is the number of bits in
+	       bfd_vma.  */
+	    bfd_vma reloc_unsigned_max =
+	    (((1 << (howto->bitsize - 1)) - 1) << 1) | 1;
+
+	    if ((bfd_vma) check > reloc_unsigned_max)
+	      flag = bfd_reloc_overflow;
+	  }
+	  break;
+	case complain_overflow_bitfield:
+	  {
+	    /* Assumes two's complement.  This expression avoids
+	       overflow if howto->bitsize is the number of bits in
+	       bfd_vma.  */
+	    bfd_vma reloc_bits = (((1 << (howto->bitsize - 1)) - 1) << 1) | 1;
+
+	    if (((bfd_vma) check & ~reloc_bits) != 0
+		&& (((bfd_vma) check & ~reloc_bits)
+		    != (-(bfd_vma) 1 & ~reloc_bits)))
+	      {
+		/* The above right shift is incorrect for a signed
+		   value.  See if turning on the upper bits fixes the
+		   overflow.  */
+		if (howto->rightshift > howto->bitpos
+		    && (bfd_signed_vma) relocation < 0)
+		  {
+		    check |= ((bfd_vma) - 1
+			      & ~((bfd_vma) - 1
+				  >> (howto->rightshift - howto->bitpos)));
+		    if (((bfd_vma) check & ~reloc_bits)
+			!= (-(bfd_vma) 1 & ~reloc_bits))
+		      flag = bfd_reloc_overflow;
+		  }
+		else
+		  flag = bfd_reloc_overflow;
+	      }
+	  }
+	  break;
+	default:
+	  abort ();
+	}
+    }
+
+  /* Either we are relocating all the way, or we don't want to apply
+     the relocation to the reloc entry (probably because there isn't
+     any room in the output format to describe addends to relocs).  */
+
+  /* The cast to bfd_vma avoids a bug in the Alpha OSF/1 C compiler
+     (OSF version 1.3, compiler version 3.11).  It miscompiles the
+     following program:
+
+     struct str
+     {
+       unsigned int i0;
+     } s = { 0 };
+
+     int
+     main ()
+     {
+       unsigned long x;
+
+       x = 0x100000000;
+       x <<= (unsigned long) s.i0;
+       if (x == 0)
+	 printf ("failed\n");
+       else
+	 printf ("succeeded (%lx)\n", x);
+     }
+     */
+
+  relocation >>= (bfd_vma) howto->rightshift;
+
+  /* Shift everything up to where it's going to be used.  */
+  relocation <<= (bfd_vma) howto->bitpos;
+
+  /* Wait for the day when all have the mask in them.  */
+
+  /* What we do:
+     i instruction to be left alone
+     o offset within instruction
+     r relocation offset to apply
+     S src mask
+     D dst mask
+     N ~dst mask
+     A part 1
+     B part 2
+     R result
+
+     Do this:
+     i i i i i o o o o o        from bfd_get<size>
+     and           S S S S S    to get the size offset we want
+     +   r r r r r r r r r r  to get the final value to place
+     and           D D D D D  to chop to right size
+     -----------------------
+     A A A A A
+     And this:
+     ...   i i i i i o o o o o  from bfd_get<size>
+     and   N N N N N            get instruction
+     -----------------------
+     ...   B B B B B
+
+     And then:
+     B B B B B
+     or              A A A A A
+     -----------------------
+     R R R R R R R R R R        put into bfd_put<size>.  */
+
+#define DOIT(x) \
+  x = ( (x & ~howto->dst_mask) | (((x & howto->src_mask) +  relocation) & howto->dst_mask))
+
+  location = (bfd_byte *) data + addr;
+  switch (howto->size)
+    {
+    case 0:
+      {
+	bfd_vma x = get_data (location, 1);
+	DOIT (x);
+	put_data ((bfd_vma) x, location, 1);
+      }
+      break;
+
+    case 1:
+      if (relocation)
+	{
+	  bfd_vma x = get_data (location, 2);
+	  DOIT (x);
+	  put_data ((bfd_vma) x, location, 2);
+	}
+      break;
+    case 2:
+      if (relocation)
+	{
+	  bfd_vma x = get_data (location, 4);
+	  DOIT (x);
+	  put_data ((bfd_vma) x, location, 4);
+	}
+      break;
+    case -2:
+      {
+	bfd_vma x = get_data (location, 4);
+	relocation = -relocation;
+	DOIT(x);
+	put_data ((bfd_vma) x, location, 4);
+      }
+      break;
+
+    case 3:
+      /* Do nothing.  */
+      break;
+
+    case 4:
+#ifdef BFD64
+      if (relocation)
+	{
+	  bfd_vma x = get_data (location, 8);
+	  DOIT (x);
+	  put_data (x, location, 8);
+	}
+#else
+      abort ();
+#endif
+      break;
+    default:
+      return bfd_reloc_other;
+    }
+  if ((howto->complain_on_overflow != complain_overflow_dont) && overflow)
+    return bfd_reloc_overflow;
+
+  return flag;
+}
+
+/* Relocate a given location using a given value and howto.  */
+
+bfd_reloc_status_type
+_bfd_do_ns32k_reloc_contents (howto, input_bfd, relocation, location,
+			      get_data, put_data)
+     reloc_howto_type *howto;
+     bfd *input_bfd ATTRIBUTE_UNUSED;
+     bfd_vma relocation;
+     bfd_byte *location;
+     bfd_vma (*get_data) PARAMS ((bfd_byte *, int));
+     void (*put_data) PARAMS ((bfd_vma, bfd_byte *, int));
+{
+  int size;
+  bfd_vma x;
+  bfd_boolean overflow;
+
+  /* If the size is negative, negate RELOCATION.  This isn't very
+     general.  */
+  if (howto->size < 0)
+    relocation = -relocation;
+
+  /* Get the value we are going to relocate.  */
+  size = bfd_get_reloc_size (howto);
+  switch (size)
+    {
+    default:
+    case 0:
+      abort ();
+    case 1:
+    case 2:
+    case 4:
+#ifdef BFD64
+    case 8:
+#endif
+      x = get_data (location, size);
+      break;
+    }
+
+  /* Check for overflow.  FIXME: We may drop bits during the addition
+     which we don't check for.  We must either check at every single
+     operation, which would be tedious, or we must do the computations
+     in a type larger than bfd_vma, which would be inefficient.  */
+  overflow = FALSE;
+  if (howto->complain_on_overflow != complain_overflow_dont)
+    {
+      bfd_vma check;
+      bfd_signed_vma signed_check;
+      bfd_vma add;
+      bfd_signed_vma signed_add;
+
+      if (howto->rightshift == 0)
+	{
+	  check = relocation;
+	  signed_check = (bfd_signed_vma) relocation;
+	}
+      else
+	{
+	  /* Drop unwanted bits from the value we are relocating to.  */
+	  check = relocation >> howto->rightshift;
+
+	  /* If this is a signed value, the rightshift just dropped
+	     leading 1 bits (assuming twos complement).  */
+	  if ((bfd_signed_vma) relocation >= 0)
+	    signed_check = check;
+	  else
+	    signed_check = (check
+			    | ((bfd_vma) - 1
+			       & ~((bfd_vma) - 1 >> howto->rightshift)));
+	}
+
+      /* Get the value from the object file.  */
+      add = x & howto->src_mask;
+
+      /* Get the value from the object file with an appropriate sign.
+	 The expression involving howto->src_mask isolates the upper
+	 bit of src_mask.  If that bit is set in the value we are
+	 adding, it is negative, and we subtract out that number times
+	 two.  If src_mask includes the highest possible bit, then we
+	 can not get the upper bit, but that does not matter since
+	 signed_add needs no adjustment to become negative in that
+	 case.  */
+      signed_add = add;
+      if ((add & (((~howto->src_mask) >> 1) & howto->src_mask)) != 0)
+	signed_add -= (((~howto->src_mask) >> 1) & howto->src_mask) << 1;
+
+      /* Add the value from the object file, shifted so that it is a
+	 straight number.  */
+      if (howto->bitpos == 0)
+	{
+	  check += add;
+	  signed_check += signed_add;
+	}
+      else
+	{
+	  check += add >> howto->bitpos;
+
+	  /* For the signed case we use ADD, rather than SIGNED_ADD,
+	     to avoid warnings from SVR4 cc.  This is OK since we
+	     explicitly handle the sign bits.  */
+	  if (signed_add >= 0)
+	    signed_check += add >> howto->bitpos;
+	  else
+	    signed_check += ((add >> howto->bitpos)
+			     | ((bfd_vma) - 1
+				& ~((bfd_vma) - 1 >> howto->bitpos)));
+	}
+
+      switch (howto->complain_on_overflow)
+	{
+	case complain_overflow_signed:
+	  {
+	    /* Assumes two's complement.  */
+	    bfd_signed_vma reloc_signed_max = (1 << (howto->bitsize - 1)) - 1;
+	    bfd_signed_vma reloc_signed_min = ~reloc_signed_max;
+
+	    if (signed_check > reloc_signed_max
+		|| signed_check < reloc_signed_min)
+	      overflow = TRUE;
+	  }
+	  break;
+	case complain_overflow_unsigned:
+	  {
+	    /* Assumes two's complement.  This expression avoids
+	       overflow if howto->bitsize is the number of bits in
+	       bfd_vma.  */
+	    bfd_vma reloc_unsigned_max =
+	    (((1 << (howto->bitsize - 1)) - 1) << 1) | 1;
+
+	    if (check > reloc_unsigned_max)
+	      overflow = TRUE;
+	  }
+	  break;
+	case complain_overflow_bitfield:
+	  {
+	    /* Assumes two's complement.  This expression avoids
+	       overflow if howto->bitsize is the number of bits in
+	       bfd_vma.  */
+	    bfd_vma reloc_bits = (((1 << (howto->bitsize - 1)) - 1) << 1) | 1;
+
+	    if ((check & ~reloc_bits) != 0
+		&& (((bfd_vma) signed_check & ~reloc_bits)
+		    != (-(bfd_vma) 1 & ~reloc_bits)))
+	      overflow = TRUE;
+	  }
+	  break;
+	default:
+	  abort ();
+	}
+    }
+
+  /* Put RELOCATION in the right bits.  */
+  relocation >>= (bfd_vma) howto->rightshift;
+  relocation <<= (bfd_vma) howto->bitpos;
+
+  /* Add RELOCATION to the right bits of X.  */
+  x = ((x & ~howto->dst_mask)
+       | (((x & howto->src_mask) + relocation) & howto->dst_mask));
+
+  /* Put the relocated value back in the object file.  */
+  switch (size)
+    {
+    default:
+    case 0:
+      abort ();
+    case 1:
+    case 2:
+    case 4:
+#ifdef BFD64
+    case 8:
+#endif
+      put_data (x, location, size);
+      break;
+    }
+
+  return overflow ? bfd_reloc_overflow : bfd_reloc_ok;
+}
+
+bfd_reloc_status_type
+_bfd_ns32k_reloc_disp (abfd, reloc_entry, symbol, data, input_section,
+		       output_bfd, error_message)
+     bfd *abfd;
+     arelent *reloc_entry;
+     struct bfd_symbol *symbol;
+     PTR data;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message;
+{
+  return do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section,
+			 output_bfd, error_message,
+			 _bfd_ns32k_get_displacement,
+			 _bfd_ns32k_put_displacement);
+}
+
+bfd_reloc_status_type
+_bfd_ns32k_reloc_imm (abfd, reloc_entry, symbol, data, input_section,
+		      output_bfd, error_message)
+     bfd *abfd;
+     arelent *reloc_entry;
+     struct bfd_symbol *symbol;
+     PTR data;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message;
+{
+  return do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section,
+			 output_bfd, error_message, _bfd_ns32k_get_immediate,
+			 _bfd_ns32k_put_immediate);
+}
+
+bfd_reloc_status_type
+_bfd_ns32k_final_link_relocate (howto, input_bfd, input_section, contents,
+				address, value, addend)
+     reloc_howto_type *howto;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     bfd_vma address;
+     bfd_vma value;
+     bfd_vma addend;
+{
+  bfd_vma relocation;
+
+  /* Sanity check the address.  */
+  if (address > bfd_get_section_limit (input_bfd, input_section))
+    return bfd_reloc_outofrange;
+
+  /* This function assumes that we are dealing with a basic relocation
+     against a symbol.  We want to compute the value of the symbol to
+     relocate to.  This is just VALUE, the value of the symbol, plus
+     ADDEND, any addend associated with the reloc.  */
+  relocation = value + addend;
+
+  /* If the relocation is PC relative, we want to set RELOCATION to
+     the distance between the symbol (currently in RELOCATION) and the
+     location we are relocating.  Some targets (e.g., i386-aout)
+     arrange for the contents of the section to be the negative of the
+     offset of the location within the section; for such targets
+     pcrel_offset is FALSE.  Other targets (e.g., m88kbcs or ELF)
+     simply leave the contents of the section as zero; for such
+     targets pcrel_offset is TRUE.  If pcrel_offset is FALSE we do not
+     need to subtract out the offset of the location within the
+     section (which is just ADDRESS).  */
+  if (howto->pc_relative)
+    {
+      relocation -= (input_section->output_section->vma
+		     + input_section->output_offset);
+      if (howto->pcrel_offset)
+	relocation -= address;
+    }
+
+  return _bfd_ns32k_relocate_contents (howto, input_bfd, relocation,
+				       contents + address);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-openrisc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-openrisc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-openrisc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-openrisc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,43 @@
+/* BFD support for the OpenRISC architecture.
+   Copyright 2001, 2002, 2005, 2007 Free Software Foundation, Inc.
+   Contributed by Johan Rydberg, jrydberg@opencores.org
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#define N(BITS_WORD, BITS_ADDR, NUMBER, PRINT, DEFAULT, NEXT) \
+  {                                                           \
+    BITS_WORD,           /* bits in a word */                 \
+    BITS_ADDR,           /* bits in an address */             \
+    8,                   /* 8 bits in a byte */               \
+    bfd_arch_openrisc,                                        \
+    NUMBER,                                                   \
+    "openrisc",                                               \
+    PRINT,                                                    \
+    2,                                                        \
+    DEFAULT,                                                  \
+    bfd_default_compatible,                                   \
+    bfd_default_scan,                                         \
+    NEXT,                                                     \
+  }
+
+const bfd_arch_info_type bfd_openrisc_arch =
+  N (32, 32, 0, "openrisc", TRUE, 0);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-or32.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-or32.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-or32.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-or32.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,41 @@
+/* BFD support for the OpenRISC 1000 architecture.
+   Copyright 2002, 2005, 2007 Free Software Foundation, Inc.
+   Contributed by Ivan Guzvinec  <ivang@opencores.org>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_or32_arch =
+  {
+    32,           /* 32 bits in a word.  */
+    32,	          /* 32 bits in an address.  */
+    8,	          /* 8 bits in a byte.  */
+    bfd_arch_or32,
+    0,	          /* Only 1 machine.  */
+    "or32",
+    "or32",
+    4,
+    TRUE,         /* The one and only.  */
+    bfd_default_compatible,
+    bfd_default_scan ,
+    0,
+  };
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-pdp11.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-pdp11.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-pdp11.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-pdp11.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,40 @@
+/* BFD back-end for PDP-11 support.
+   Copyright 2001, 2002, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_pdp11_arch =
+  {
+    16,	/* 16 bits in a word */
+    16,	/* 16 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_pdp11,
+    0,	/* only 1 machine */
+    "pdp11",
+    "pdp11",
+    1,		/* aligment = 16 bit */
+    TRUE, /* the one and only */
+    bfd_default_compatible,
+    bfd_default_scan ,
+    0,
+  };
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-pj.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-pj.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-pj.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-pj.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,41 @@
+/* BFD library support routines for the Pico Java architecture.
+   Copyright 1999, 2000, 2001, 2002, 2005, 2007
+   Free Software Foundation, Inc.
+   Hacked by Steve Chamberlain of Transmeta. sac@pobox.com
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_pj_arch =
+{
+  32,				/* 32 bits in a word */
+  32,				/* 32 bits in an address */
+  8,				/* 8 bits in a byte */
+  bfd_arch_pj,
+  0,
+  "pj",				/* arch_name  */
+  "pj",				/* printable name */
+  1,
+  TRUE,				/* the default machine */
+  bfd_default_compatible,
+  bfd_default_scan,
+  0
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-plugin.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-plugin.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-plugin.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-plugin.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,40 @@
+/* BFD support for plugins.
+   Copyright 2009
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_plugin_arch =
+{
+  32,	/* 32 bits in a word.  */
+  32,	/* 32 bits in an address.  */
+  8,	/* 8 bits in a byte.  */
+  bfd_arch_plugin,
+  0,	/* Only 1 machine.  */
+  "plugin",
+  "plugin",
+  3,
+  TRUE,
+  bfd_default_compatible,
+  bfd_default_scan,
+  0
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-powerpc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-powerpc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-powerpc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-powerpc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,357 @@
+/* BFD PowerPC CPU definition
+   Copyright 1994, 1995, 1996, 2000, 2001, 2002, 2003, 2005, 2007, 2008, 2010
+   Free Software Foundation, Inc.
+   Contributed by Ian Lance Taylor, Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+/* The common PowerPC architecture is compatible with the RS/6000.  */
+
+static const bfd_arch_info_type *powerpc_compatible
+  PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
+
+static const bfd_arch_info_type *
+powerpc_compatible (a,b)
+     const bfd_arch_info_type *a;
+     const bfd_arch_info_type *b;
+{
+  BFD_ASSERT (a->arch == bfd_arch_powerpc);
+  switch (b->arch)
+    {
+    default:
+      return NULL;
+    case bfd_arch_powerpc:
+      return bfd_default_compatible (a, b);
+    case bfd_arch_rs6000:
+      if (b->mach == bfd_mach_rs6k)
+	return a;
+      return NULL;
+    }
+  /*NOTREACHED*/
+}
+
+const bfd_arch_info_type bfd_powerpc_archs[] =
+{
+#if BFD_DEFAULT_TARGET_SIZE == 64
+  /* Default arch must come first.  */
+  {
+    64,	/* 64 bits in a word */
+    64,	/* 64 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc64,
+    "powerpc",
+    "powerpc:common64",
+    3,
+    TRUE, /* default for 64 bit target */
+    powerpc_compatible,
+    bfd_default_scan,
+    &bfd_powerpc_archs[1]
+  },
+  /* elf32-ppc:ppc_elf_object_p relies on the default 32 bit arch
+     being immediately after the 64 bit default.  */
+  {
+    32,	/* 32 bits in a word */
+    32,	/* 32 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc, /* for the POWER/PowerPC common architecture */
+    "powerpc",
+    "powerpc:common",
+    3,
+    FALSE,
+    powerpc_compatible,
+    bfd_default_scan,
+    &bfd_powerpc_archs[2],
+  },
+#else
+  /* Default arch must come first.  */
+  {
+    32,	/* 32 bits in a word */
+    32,	/* 32 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc, /* for the POWER/PowerPC common architecture */
+    "powerpc",
+    "powerpc:common",
+    3,
+    TRUE, /* default for 32 bit target */
+    powerpc_compatible,
+    bfd_default_scan,
+    &bfd_powerpc_archs[1],
+  },
+  /* elf64-ppc:ppc64_elf_object_p relies on the default 64 bit arch
+     being immediately after the 32 bit default.  */
+  {
+    64,	/* 64 bits in a word */
+    64,	/* 64 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc64,
+    "powerpc",
+    "powerpc:common64",
+    3,
+    FALSE,
+    powerpc_compatible,
+    bfd_default_scan,
+    &bfd_powerpc_archs[2]
+  },
+#endif
+  {
+    32,	/* 32 bits in a word */
+    32,	/* 32 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc_603,
+    "powerpc",
+    "powerpc:603",
+    3,
+    FALSE, /* not the default */
+    powerpc_compatible,
+    bfd_default_scan,
+    &bfd_powerpc_archs[3]
+  },
+  {
+    32,	/* 32 bits in a word */
+    32,	/* 32 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc_ec603e,
+    "powerpc",
+    "powerpc:EC603e",
+    3,
+    FALSE, /* not the default */
+    powerpc_compatible,
+    bfd_default_scan,
+    &bfd_powerpc_archs[4]
+  },
+  {
+    32,	/* 32 bits in a word */
+    32,	/* 32 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc_604,
+    "powerpc",
+    "powerpc:604",
+    3,
+    FALSE, /* not the default */
+    powerpc_compatible,
+    bfd_default_scan,
+    &bfd_powerpc_archs[5]
+  },
+  {
+    32,	/* 32 bits in a word */
+    32,	/* 32 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc_403,
+    "powerpc",
+    "powerpc:403",
+    3,
+    FALSE, /* not the default */
+    powerpc_compatible,
+    bfd_default_scan,
+    &bfd_powerpc_archs[6]
+  },
+  {
+    32,	/* 32 bits in a word */
+    32,	/* 32 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc_601,
+    "powerpc",
+    "powerpc:601",
+    3,
+    FALSE, /* not the default */
+    powerpc_compatible,
+    bfd_default_scan,
+    &bfd_powerpc_archs[7]
+  },
+  {
+    64,	/* 64 bits in a word */
+    64,	/* 64 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc_620,
+    "powerpc",
+    "powerpc:620",
+    3,
+    FALSE, /* not the default */
+    powerpc_compatible,
+    bfd_default_scan,
+    &bfd_powerpc_archs[8]
+  },
+  {
+    64,	/* 64 bits in a word */
+    64,	/* 64 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc_630,
+    "powerpc",
+    "powerpc:630",
+    3,
+    FALSE, /* not the default */
+    powerpc_compatible,
+    bfd_default_scan,
+    &bfd_powerpc_archs[9]
+  },
+  {
+    64,	/* 64 bits in a word */
+    64,	/* 64 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc_a35,
+    "powerpc",
+    "powerpc:a35",
+    3,
+    FALSE, /* not the default */
+    powerpc_compatible,
+    bfd_default_scan,
+    &bfd_powerpc_archs[10]
+  },
+  {
+    64,	/* 64 bits in a word */
+    64,	/* 64 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc_rs64ii,
+    "powerpc",
+    "powerpc:rs64ii",
+    3,
+    FALSE, /* not the default */
+    powerpc_compatible,
+    bfd_default_scan,
+    &bfd_powerpc_archs[11]
+  },
+  {
+    64,	/* 64 bits in a word */
+    64,	/* 64 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc_rs64iii,
+    "powerpc",
+    "powerpc:rs64iii",
+    3,
+    FALSE, /* not the default */
+    powerpc_compatible,
+    bfd_default_scan,
+    &bfd_powerpc_archs[12]
+  },
+  {
+    32,	/* 32 bits in a word */
+    32,	/* 32 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc_7400,
+    "powerpc",
+    "powerpc:7400",
+    3,
+    FALSE, /* not the default */
+    powerpc_compatible,
+    bfd_default_scan,
+    &bfd_powerpc_archs[13]
+  },
+  {
+    32, /* 32 bits in a word */
+    32, /* 32 bits in an address */
+    8,  /* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc_e500,
+    "powerpc",
+    "powerpc:e500",
+    3,
+    FALSE,
+    powerpc_compatible,
+    bfd_default_scan,
+    &bfd_powerpc_archs[14]
+  },
+  {
+    32,        /* 32 bits in a word */
+    32,        /* 32 bits in an address */
+    8, /* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc_e500mc,
+    "powerpc",
+    "powerpc:e500mc",
+    3,
+    FALSE, /* not the default */
+    powerpc_compatible,
+    bfd_default_scan,
+    &bfd_powerpc_archs[15]
+  },
+  {
+    64, /* 64 bits in a word */
+    64, /* 64 bits in an address */
+    8,  /* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc_e500mc64,
+    "powerpc",
+    "powerpc:e500mc64",
+    3,
+    FALSE, /* not the default */
+    powerpc_compatible,
+    bfd_default_scan,
+    &bfd_powerpc_archs[16]
+  },
+  {
+    32,       /* 32 bits in a word */
+    32,       /* 32 bits in an address */
+    8,        /* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc_860,
+    "powerpc",
+    "powerpc:MPC8XX",
+    3,
+    FALSE, /* not the default */
+    powerpc_compatible,
+    bfd_default_scan,
+    &bfd_powerpc_archs[17]
+  },
+  {
+    32, /* 32 bits in a word */
+    32, /* 32 bits in an address */
+    8,  /* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc_750,
+    "powerpc",
+    "powerpc:750",
+    3,
+    FALSE, /* not the default */
+    powerpc_compatible,
+    bfd_default_scan,
+    &bfd_powerpc_archs[18]
+  },
+  {
+    32, /* 32 bits in a word */
+    32, /* 32 bits in an address */
+    8,  /* 8 bits in a byte */
+    bfd_arch_powerpc,
+    bfd_mach_ppc_titan,
+    "powerpc",
+    "powerpc:titan",
+    3,
+    FALSE, /* not the default */
+    powerpc_compatible,
+    bfd_default_scan,
+    0
+  }
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-rs6000.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-rs6000.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-rs6000.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-rs6000.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,114 @@
+/* BFD back-end for rs6000 support
+   Copyright 1990, 1991, 1993, 1995, 2000, 2002, 2003, 2005, 2007
+   Free Software Foundation, Inc.
+   Written by Mimi Phuong-Thao Vo of IBM
+   and John Gilmore of Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+/* The RS/6000 architecture is compatible with the PowerPC common
+   architecture.  */
+
+static const bfd_arch_info_type *rs6000_compatible
+  PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
+
+static const bfd_arch_info_type *
+rs6000_compatible (a,b)
+     const bfd_arch_info_type *a;
+     const bfd_arch_info_type *b;
+{
+  BFD_ASSERT (a->arch == bfd_arch_rs6000);
+  switch (b->arch)
+    {
+    default:
+      return NULL;
+    case bfd_arch_rs6000:
+      return bfd_default_compatible (a, b);
+    case bfd_arch_powerpc:
+      if (a->mach == bfd_mach_rs6k)
+	return b;
+      return NULL;
+    }
+  /*NOTREACHED*/
+}
+
+static const bfd_arch_info_type arch_info_struct[] =
+{
+  {
+    32,	/* 32 bits in a word */
+    32,	/* 32 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_rs6000,
+    bfd_mach_rs6k_rs1,
+    "rs6000",
+    "rs6000:rs1",
+    3,
+    FALSE, /* not the default */
+    rs6000_compatible,
+    bfd_default_scan,
+    &arch_info_struct[1]
+  },
+  {
+    32,	/* 32 bits in a word */
+    32,	/* 32 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_rs6000,
+    bfd_mach_rs6k_rsc,
+    "rs6000",
+    "rs6000:rsc",
+    3,
+    FALSE, /* not the default */
+    rs6000_compatible,
+    bfd_default_scan,
+    &arch_info_struct[2]
+  },
+  {
+    32,	/* 32 bits in a word */
+    32,	/* 32 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_rs6000,
+    bfd_mach_rs6k_rs2,
+    "rs6000",
+    "rs6000:rs2",
+    3,
+    FALSE, /* not the default */
+    rs6000_compatible,
+    bfd_default_scan,
+    0
+  }
+};
+
+const bfd_arch_info_type bfd_rs6000_arch =
+  {
+    32,	/* 32 bits in a word */
+    32,	/* 32 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_rs6000,
+    bfd_mach_rs6k,	/* POWER common architecture */
+    "rs6000",
+    "rs6000:6000",
+    3,
+    TRUE, /* the default */
+    rs6000_compatible,
+    bfd_default_scan,
+    &arch_info_struct[0]
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-rx.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-rx.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-rx.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-rx.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,57 @@
+/* BFD support for the RX processor.
+   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+static const bfd_arch_info_type arch_info_struct[] =
+{
+  {
+    32,				/* Bits per word.  */
+    32,				/* Bits per address.  */
+    8,				/* Bits per byte.  */
+    bfd_arch_rx,		/* Architecture.  */
+    bfd_mach_rx,		/* Machine.  */
+    "rx",			/* Architecture name.  */
+    "rx",			/* Printable name.  */
+    3,				/* Section align power.  */
+    FALSE,			/* The default ?  */
+    bfd_default_compatible,	/* Architecture comparison fn.  */
+    bfd_default_scan,		/* String to architecture convert fn.  */
+    NULL			/* Next in list.  */
+  },
+};
+
+const bfd_arch_info_type bfd_rx_arch =
+{
+  32,				/* Bits per word.  */
+  32,				/* Bits per address.  */
+  8,				/* Bits per byte.  */
+  bfd_arch_rx,			/* Architecture.  */
+  bfd_mach_rx,			/* Machine.  */
+  "rx",				/* Architecture name.  */
+  "rx",				/* Printable name.  */
+  4,				/* Section align power.  */
+  TRUE,				/* The default ?  */
+  bfd_default_compatible,	/* Architecture comparison fn.  */
+  bfd_default_scan,		/* String to architecture convert fn.  */
+  & arch_info_struct[0],	/* Next in list.  */
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-s390.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-s390.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-s390.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-s390.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,56 @@
+/* BFD support for the s390 processor.
+   Copyright 2000, 2001, 2002, 2005, 2007 Free Software Foundation, Inc.
+   Contributed by Carl B. Pedersen and Martin Schwidefsky.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_s390_64_arch =
+{
+    64,        /* bits in a word */
+    64,        /* bits in an address */
+    8, /* bits in a byte */
+    bfd_arch_s390,
+    bfd_mach_s390_64,
+    "s390",
+    "s390:64-bit",
+    3, /* section alignment power */
+    TRUE, /* the default */
+    bfd_default_compatible,
+    bfd_default_scan,
+    NULL
+};
+
+const bfd_arch_info_type bfd_s390_arch =
+{
+    32,	/* bits in a word */
+    32,	/* bits in an address */
+    8,	/* bits in a byte */
+    bfd_arch_s390,
+    bfd_mach_s390_31,
+    "s390",
+    "s390:31-bit",
+    3, /* section alignment power */
+    TRUE, /* the default */
+    bfd_default_compatible,
+    bfd_default_scan,
+    &bfd_s390_64_arch
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-score.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-score.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-score.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-score.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,68 @@
+/* BFD support for the score processor
+   Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+   Contributed by
+   Brain.lin (brain.lin@sunplusct.com)
+   Mei Ligang (ligang@sunnorth.com.cn)
+   Pei-Lin Tsai (pltsai@sunplus.com)
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "bfd.h"
+#include "sysdep.h"
+#include "libbfd.h"
+
+/* This routine is provided two arch_infos and works out which Score
+   machine which would be compatible with both and returns a pointer
+   to its info structure.  */
+
+static const bfd_arch_info_type *
+compatible (const bfd_arch_info_type * a, const bfd_arch_info_type * b)
+{
+  /* If a & b are for different architectures we can do nothing.  */
+  if (a->arch != b->arch)
+    return NULL;
+
+  if (a->mach != b->mach)
+    return NULL;
+
+  return a;
+}
+
+#define N(addr_bits, machine, print, default, next)		\
+{								\
+  32,				/* 16 bits in a word.  */	\
+  32,				/* Bits in an address.  */	\
+  8,				/* 8 bits in a byte.  */	\
+  bfd_arch_score,						\
+  machine,			/* Machine number.  */		\
+  "score",			/* Architecture name.   */	\
+  print,			/* Printable name.  */		\
+  4,				/* Section align power.  */	\
+  default,			/* The default machine.  */	\
+  compatible,							\
+  bfd_default_scan,						\
+  next								\
+}
+
+static const bfd_arch_info_type arch_info_struct[] =
+{
+  N (16, bfd_mach_score3, "score3", FALSE, NULL),
+};
+
+const bfd_arch_info_type bfd_score_arch =
+  N (16, bfd_mach_score7, "score7", TRUE, & arch_info_struct[0]);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-sh.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-sh.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-sh.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-sh.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,525 @@
+/* BFD library support routines for the Renesas / SuperH SH architecture.
+   Copyright 1993, 1994, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005,
+   2007 Free Software Foundation, Inc.
+   Hacked by Steve Chamberlain of Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "../opcodes/sh-opc.h"
+
+#define SH_NEXT                            arch_info_struct + 0
+#define SH2_NEXT                           arch_info_struct + 1
+#define SH2E_NEXT                          arch_info_struct + 2
+#define SH_DSP_NEXT                        arch_info_struct + 3
+#define SH3_NEXT                           arch_info_struct + 4
+#define SH3_NOMMU_NEXT                     arch_info_struct + 5
+#define SH3_DSP_NEXT                       arch_info_struct + 6
+#define SH3E_NEXT                          arch_info_struct + 7
+#define SH4_NEXT                           arch_info_struct + 8
+#define SH4A_NEXT                          arch_info_struct + 9
+#define SH4AL_DSP_NEXT                     arch_info_struct + 10
+#define SH4_NOFPU_NEXT                     arch_info_struct + 11
+#define SH4_NOMMU_NOFPU_NEXT               arch_info_struct + 12
+#define SH4A_NOFPU_NEXT                    arch_info_struct + 13
+#define SH2A_NEXT                          arch_info_struct + 14
+#define SH2A_NOFPU_NEXT                    arch_info_struct + 15
+#define SH2A_NOFPU_OR_SH4_NOMMU_NOFPU_NEXT arch_info_struct + 16
+#define SH2A_NOFPU_OR_SH3_NOMMU_NEXT       arch_info_struct + 17
+#define SH2A_OR_SH4_NEXT                   arch_info_struct + 18
+#define SH2A_OR_SH3E_NEXT                  arch_info_struct + 19
+#define SH64_NEXT                          NULL
+
+static const bfd_arch_info_type arch_info_struct[] =
+{
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    8,				/* 8 bits in a byte.  */
+    bfd_arch_sh,
+    bfd_mach_sh2,
+    "sh",			/* Architecture name.  */
+    "sh2",			/* Machine name.  */
+    1,
+    FALSE,			/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH2_NEXT
+  },
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    8,				/* 8 bits in a byte.  */
+    bfd_arch_sh,
+    bfd_mach_sh2e,
+    "sh",			/* Architecture name.  */
+    "sh2e",			/* Machine name.  */
+    1,
+    FALSE,			/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH2E_NEXT
+  },
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    8,				/* 8 bits in a byte.  */
+    bfd_arch_sh,
+    bfd_mach_sh_dsp,
+    "sh",			/* Architecture name.   */
+    "sh-dsp",			/* Machine name.  */
+    1,
+    FALSE,			/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH_DSP_NEXT
+  },
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    8,				/* 8 bits in a byte.  */
+    bfd_arch_sh,
+    bfd_mach_sh3,
+    "sh",			/* Architecture name.   */
+    "sh3",			/* Machine name.  */
+    1,
+    FALSE,			/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH3_NEXT
+  },
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    8,				/* 8 bits in a byte.  */
+    bfd_arch_sh,
+    bfd_mach_sh3_nommu,
+    "sh",			/* Architecture name.   */
+    "sh3-nommu",		/* Machine name.  */
+    1,
+    FALSE,			/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH3_NOMMU_NEXT
+  },
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    8,				/* 8 bits in a byte.  */
+    bfd_arch_sh,
+    bfd_mach_sh3_dsp,
+    "sh",			/* Architecture name.   */
+    "sh3-dsp",			/* Machine name.  */
+    1,
+    FALSE,			/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH3_DSP_NEXT
+  },
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    8,				/* 8 bits in a byte.  */
+    bfd_arch_sh,
+    bfd_mach_sh3e,
+    "sh",			/* Architecture name.   */
+    "sh3e",			/* Machine name.  */
+    1,
+    FALSE,			/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH3E_NEXT
+  },
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    8,				/* 8 bits in a byte.  */
+    bfd_arch_sh,
+    bfd_mach_sh4,
+    "sh",			/* Architecture name.   */
+    "sh4",			/* Machine name.  */
+    1,
+    FALSE,			/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH4_NEXT
+  },
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    8,				/* 8 bits in a byte.  */
+    bfd_arch_sh,
+    bfd_mach_sh4a,
+    "sh",			/* Architecture name.   */
+    "sh4a",			/* Machine name.  */
+    1,
+    FALSE,			/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH4A_NEXT
+  },
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    8,				/* 8 bits in a byte.  */
+    bfd_arch_sh,
+    bfd_mach_sh4al_dsp,
+    "sh",			/* Architecture name.   */
+    "sh4al-dsp",		/* Machine name.  */
+    1,
+    FALSE,			/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH4AL_DSP_NEXT
+  },
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    8,				/* 8 bits in a byte.  */
+    bfd_arch_sh,
+    bfd_mach_sh4_nofpu,
+    "sh",			/* Architecture name.   */
+    "sh4-nofpu",		/* Machine name.  */
+    1,
+    FALSE,			/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH4_NOFPU_NEXT
+  },
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    8,				/* 8 bits in a byte.  */
+    bfd_arch_sh,
+    bfd_mach_sh4_nommu_nofpu,
+    "sh",			/* Architecture name.   */
+    "sh4-nommu-nofpu",		/* Machine name.  */
+    1,
+    FALSE,			/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH4_NOMMU_NOFPU_NEXT
+  },
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    8,				/* 8 bits in a byte.  */
+    bfd_arch_sh,
+    bfd_mach_sh4a_nofpu,
+    "sh",			/* Architecture name.   */
+    "sh4a-nofpu",		/* Machine name.  */
+    1,
+    FALSE,			/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH4A_NOFPU_NEXT
+  },
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    8,				/* 8 bits in a byte.  */
+    bfd_arch_sh,
+    bfd_mach_sh2a,
+    "sh",			/* Architecture name.  */
+    "sh2a",			/* Machine name.  */
+    1,
+    FALSE,			/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH2A_NEXT
+  },
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    8,				/* 8 bits in a byte.  */
+    bfd_arch_sh,
+    bfd_mach_sh2a_nofpu,
+    "sh",			/* Architecture name.  */
+    "sh2a-nofpu",		/* Machine name.  */
+    1,
+    FALSE,			/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH2A_NOFPU_NEXT
+  },
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    8,				/* 8 bits in a byte.  */
+    bfd_arch_sh,
+    bfd_mach_sh2a_nofpu_or_sh4_nommu_nofpu,
+    "sh",			/* Architecture name.  */
+    "sh2a-nofpu-or-sh4-nommu-nofpu",		/* Machine name.  */
+    1,
+    FALSE,			/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH2A_NOFPU_OR_SH4_NOMMU_NOFPU_NEXT
+  },
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    8,				/* 8 bits in a byte.  */
+    bfd_arch_sh,
+    bfd_mach_sh2a_nofpu_or_sh3_nommu,
+    "sh",			/* Architecture name. .  */
+    "sh2a-nofpu-or-sh3-nommu",	/* Machine name.  */
+    1,
+    FALSE,			/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH2A_NOFPU_OR_SH3_NOMMU_NEXT
+  },
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    8,				/* 8 bits in a byte.  */
+    bfd_arch_sh,
+    bfd_mach_sh2a_or_sh4,
+    "sh",			/* Architecture name.  */
+    "sh2a-or-sh4",		/* Machine name.  */
+    1,
+    FALSE,			/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH2A_OR_SH4_NEXT
+  },
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    8,				/* 8 bits in a byte.  */
+    bfd_arch_sh,
+    bfd_mach_sh2a_or_sh3e,
+    "sh",			/* Architecture name.  */
+    "sh2a-or-sh3e",		/* Machine name.  */
+    1,
+    FALSE,			/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH2A_OR_SH3E_NEXT
+  },
+  {
+    64,				/* 64 bits in a word.  */
+    64,				/* 64 bits in an address.  */
+    8,				/* 8 bits in a byte.  */
+    bfd_arch_sh,
+    bfd_mach_sh5,
+    "sh",			/* Architecture name.   */
+    "sh5",			/* Machine name.  */
+    1,
+    FALSE,			/* Not the default.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH64_NEXT
+  },
+};
+
+const bfd_arch_info_type bfd_sh_arch =
+{
+  32,				/* 32 bits in a word.  */
+  32,				/* 32 bits in an address.  */
+  8,				/* 8 bits in a byte.  */
+  bfd_arch_sh,
+  bfd_mach_sh,
+  "sh",				/* Architecture name.   */
+  "sh",				/* Machine name.  */
+  1,
+  TRUE,				/* The default machine.  */
+  bfd_default_compatible,
+  bfd_default_scan,
+  SH_NEXT
+};
+
+
+/* This table defines the mappings from the BFD internal numbering
+   system to the opcodes internal flags system.
+   It is used by the functions defined below.
+   The prototypes for these SH specific functions are found in
+   sh-opc.h .  */
+
+static struct { unsigned long bfd_mach, arch, arch_up; } bfd_to_arch_table[] =
+{
+  { bfd_mach_sh,              arch_sh1,             arch_sh_up },
+  { bfd_mach_sh2,             arch_sh2,             arch_sh2_up },
+  { bfd_mach_sh2e,            arch_sh2e,            arch_sh2e_up },
+  { bfd_mach_sh_dsp,          arch_sh_dsp,          arch_sh_dsp_up },
+  { bfd_mach_sh2a,            arch_sh2a,            arch_sh2a_up },
+  { bfd_mach_sh2a_nofpu,      arch_sh2a_nofpu,      arch_sh2a_nofpu_up },
+
+  { bfd_mach_sh2a_nofpu_or_sh4_nommu_nofpu,         arch_sh2a_nofpu_or_sh4_nommu_nofpu,   arch_sh2a_nofpu_or_sh4_nommu_nofpu_up },
+  { bfd_mach_sh2a_nofpu_or_sh3_nommu,               arch_sh2a_nofpu_or_sh3_nommu,         arch_sh2a_nofpu_or_sh3_nommu_up },
+  { bfd_mach_sh2a_or_sh4,     arch_sh2a_or_sh4,     arch_sh2a_or_sh4_up },
+  { bfd_mach_sh2a_or_sh3e,    arch_sh2a_or_sh3e,    arch_sh2a_or_sh3e_up },
+  
+  { bfd_mach_sh3,             arch_sh3,             arch_sh3_up },
+  { bfd_mach_sh3_nommu,       arch_sh3_nommu,       arch_sh3_nommu_up },
+  { bfd_mach_sh3_dsp,         arch_sh3_dsp,         arch_sh3_dsp_up },
+  { bfd_mach_sh3e,            arch_sh3e,            arch_sh3e_up },
+  { bfd_mach_sh4,             arch_sh4,             arch_sh4_up },
+  { bfd_mach_sh4a,            arch_sh4a,            arch_sh4a_up },
+  { bfd_mach_sh4al_dsp,       arch_sh4al_dsp,       arch_sh4al_dsp_up },
+  { bfd_mach_sh4_nofpu,       arch_sh4_nofpu,       arch_sh4_nofpu_up },
+  { bfd_mach_sh4_nommu_nofpu, arch_sh4_nommu_nofpu, arch_sh4_nommu_nofpu_up },
+  { bfd_mach_sh4a_nofpu,      arch_sh4a_nofpu,      arch_sh4a_nofpu_up },
+  { 0, 0, 0 }   /* Terminator.  */
+};
+
+
+/* Convert a BFD mach number into the right opcodes arch flags
+   using the table above.  */
+
+unsigned int
+sh_get_arch_from_bfd_mach (unsigned long mach)
+{
+  int i = 0;
+
+  while (bfd_to_arch_table[i].bfd_mach != 0)
+    if (bfd_to_arch_table[i].bfd_mach == mach)
+      return bfd_to_arch_table[i].arch;
+    else
+      i++;
+
+  /* Machine not found.   */
+  BFD_FAIL();
+
+  return SH_ARCH_UNKNOWN_ARCH;
+}
+
+
+/* Convert a BFD mach number into a set of opcodes arch flags
+   describing all the compatible architectures (i.e. arch_up)
+   using the table above.  */
+
+unsigned int
+sh_get_arch_up_from_bfd_mach (unsigned long mach)
+{
+  int i = 0;
+
+  while (bfd_to_arch_table[i].bfd_mach != 0)
+    if (bfd_to_arch_table[i].bfd_mach == mach)
+      return bfd_to_arch_table[i].arch_up;
+    else
+      i++;
+
+  /* Machine not found.  */
+  BFD_FAIL();
+
+  return SH_ARCH_UNKNOWN_ARCH;
+}
+
+
+/* Convert an arbitary arch_set - not necessarily corresponding
+   directly to anything in the table above - to the most generic
+   architecture which supports all the required features, and
+   return the corresponding BFD mach.  */
+
+unsigned long
+sh_get_bfd_mach_from_arch_set (unsigned int arch_set)
+{
+  unsigned long result = 0;
+  unsigned int best = ~arch_set;
+  unsigned int co_mask = ~0;
+  int i = 0;
+
+  /* If arch_set permits variants with no coprocessor then do not allow
+     the other irrelevant co-processor bits to influence the choice:
+       e.g. if dsp is disallowed by arch_set, then the algorithm would
+       prefer fpu variants over nofpu variants because they also disallow
+       dsp - even though the nofpu would be the most correct choice.
+     This assumes that EVERY fpu/dsp variant has a no-coprocessor
+     counter-part, or their non-fpu/dsp instructions do not have the
+     no co-processor bit set.  */
+  if (arch_set & arch_sh_no_co)
+    co_mask = ~(arch_sh_sp_fpu | arch_sh_dp_fpu | arch_sh_has_dsp);
+
+  while (bfd_to_arch_table[i].bfd_mach != 0)
+    {
+      unsigned int try = bfd_to_arch_table[i].arch_up & co_mask;
+
+      /* Conceptually: Find the architecture with the least number
+	 of extra features or, if they have the same number, then
+	 the greatest number of required features.  Disregard
+         architectures where the required features alone do
+	 not describe a valid architecture.  */
+      if (((try & ~arch_set) < (best & ~arch_set)
+	   || ((try & ~arch_set) == (best & ~arch_set)
+	       && (~try & arch_set) < (~best & arch_set)))
+	  && SH_MERGE_ARCH_SET_VALID (try, arch_set))
+	{
+	  result = bfd_to_arch_table[i].bfd_mach;
+	  best = try;
+	}
+
+      i++;
+    }
+
+  /* This might happen if a new variant is added to sh-opc.h
+     but no corresponding entry is added to the table above.  */
+  BFD_ASSERT (result != 0);
+
+  return result;
+}
+
+
+/* Merge the architecture type of two BFD files, such that the
+   resultant architecture supports all the features required
+   by the two input BFDs.
+   If the input BFDs are multually incompatible - i.e. one uses
+   DSP while the other uses FPU - or there is no known architecture
+   that fits the requirements then an error is emitted.  */
+
+bfd_boolean
+sh_merge_bfd_arch (bfd *ibfd, bfd *obfd)
+{
+  unsigned int old_arch, new_arch, merged_arch;
+
+  if (! _bfd_generic_verify_endian_match (ibfd, obfd))
+    return FALSE;
+
+  old_arch = sh_get_arch_up_from_bfd_mach (bfd_get_mach (obfd));
+  new_arch = sh_get_arch_up_from_bfd_mach (bfd_get_mach (ibfd));
+
+  merged_arch = SH_MERGE_ARCH_SET (old_arch, new_arch);
+
+  if (!SH_VALID_CO_ARCH_SET (merged_arch))
+    {
+      (*_bfd_error_handler)
+	("%B: uses %s instructions while previous modules use %s instructions",
+	 ibfd,
+	 SH_ARCH_SET_HAS_DSP (new_arch) ? "dsp" : "floating point",
+	 SH_ARCH_SET_HAS_DSP (new_arch) ? "floating point" : "dsp");
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+  else if (!SH_VALID_ARCH_SET (merged_arch))
+    {
+      (*_bfd_error_handler)
+	("internal error: merge of architecture '%s' with architecture '%s' produced unknown architecture\n",
+	 bfd_printable_name (obfd),
+	 bfd_printable_name (ibfd));
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  bfd_default_set_arch_mach (obfd, bfd_arch_sh,
+			     sh_get_bfd_mach_from_arch_set (merged_arch));
+  
+  return TRUE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-sparc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-sparc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-sparc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-sparc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,170 @@
+/* BFD support for the SPARC architecture.
+   Copyright 1992, 1995, 1996, 1998, 2000, 2002, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+static const bfd_arch_info_type arch_info_struct[] =
+{
+  {
+    32,	/* bits in a word */
+    32,	/* bits in an address */
+    8,	/* bits in a byte */
+    bfd_arch_sparc,
+    bfd_mach_sparc_sparclet,
+    "sparc",
+    "sparc:sparclet",
+    3,
+    FALSE,
+    bfd_default_compatible,
+    bfd_default_scan,
+    &arch_info_struct[1],
+  },
+  {
+    32,	/* bits in a word */
+    32,	/* bits in an address */
+    8,	/* bits in a byte */
+    bfd_arch_sparc,
+    bfd_mach_sparc_sparclite,
+    "sparc",
+    "sparc:sparclite",
+    3,
+    FALSE,
+    bfd_default_compatible,
+    bfd_default_scan,
+    &arch_info_struct[2],
+  },
+  {
+    32,	/* bits in a word */
+    32,	/* bits in an address */
+    8,	/* bits in a byte */
+    bfd_arch_sparc,
+    bfd_mach_sparc_v8plus,
+    "sparc",
+    "sparc:v8plus",
+    3,
+    FALSE,
+    bfd_default_compatible,
+    bfd_default_scan,
+    &arch_info_struct[3],
+  },
+  {
+    32,	/* bits in a word */
+    32,	/* bits in an address */
+    8,	/* bits in a byte */
+    bfd_arch_sparc,
+    bfd_mach_sparc_v8plusa,
+    "sparc",
+    "sparc:v8plusa",
+    3,
+    FALSE,
+    bfd_default_compatible,
+    bfd_default_scan,
+    &arch_info_struct[4],
+  },
+  {
+    32,	/* bits in a word */
+    32,	/* bits in an address */
+    8,	/* bits in a byte */
+    bfd_arch_sparc,
+    bfd_mach_sparc_sparclite_le,
+    "sparc",
+    "sparc:sparclite_le",
+    3,
+    FALSE,
+    bfd_default_compatible,
+    bfd_default_scan,
+    &arch_info_struct[5],
+  },
+  {
+    64,	/* bits in a word */
+    64,	/* bits in an address */
+    8,	/* bits in a byte */
+    bfd_arch_sparc,
+    bfd_mach_sparc_v9,
+    "sparc",
+    "sparc:v9",
+    3,
+    FALSE,
+    bfd_default_compatible,
+    bfd_default_scan,
+    &arch_info_struct[6],
+  },
+  {
+    64,	/* bits in a word */
+    64,	/* bits in an address */
+    8,	/* bits in a byte */
+    bfd_arch_sparc,
+    bfd_mach_sparc_v9a,
+    "sparc",
+    "sparc:v9a",
+    3,
+    FALSE,
+    bfd_default_compatible,
+    bfd_default_scan,
+    &arch_info_struct[7],
+  },
+  {
+    32,	/* bits in a word */
+    32,	/* bits in an address */
+    8,	/* bits in a byte */
+    bfd_arch_sparc,
+    bfd_mach_sparc_v8plusb,
+    "sparc",
+    "sparc:v8plusb",
+    3,
+    FALSE,
+    bfd_default_compatible,
+    bfd_default_scan,
+    &arch_info_struct[8],
+  },
+  {
+    64,	/* bits in a word */
+    64,	/* bits in an address */
+    8,	/* bits in a byte */
+    bfd_arch_sparc,
+    bfd_mach_sparc_v9b,
+    "sparc",
+    "sparc:v9b",
+    3,
+    FALSE,
+    bfd_default_compatible,
+    bfd_default_scan,
+    0,
+  }
+};
+
+const bfd_arch_info_type bfd_sparc_arch =
+  {
+    32,	/* bits in a word */
+    32,	/* bits in an address */
+    8,	/* bits in a byte */
+    bfd_arch_sparc,
+    bfd_mach_sparc,
+    "sparc",
+    "sparc",
+    3,
+    TRUE, /* the default */
+    bfd_default_compatible,
+    bfd_default_scan,
+    &arch_info_struct[0],
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-spu.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-spu.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-spu.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-spu.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,54 @@
+/* Copyright 2006, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+
+static const bfd_arch_info_type *
+spu_compatible (const bfd_arch_info_type *a, const bfd_arch_info_type *b)
+{
+  BFD_ASSERT (a->arch == bfd_arch_spu);
+  switch (b->arch)
+    {
+    default:
+      return NULL;
+    case bfd_arch_spu:
+      return bfd_default_compatible (a, b);
+    }
+  /*NOTREACHED*/
+}
+
+const bfd_arch_info_type bfd_spu_arch[] =
+{
+  {
+    32,	/* 32 bits in a word */
+    32,	/* 32 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_spu,	/* architecture */
+    bfd_mach_spu,	/* machine */
+    "spu",		/* architecture name */
+    "spu:256K",		/* printable name */
+    3,			/* aligned power */
+    TRUE, 		/* the default machine for the architecture */
+    spu_compatible,	/* the spu is only compatible with itself, see above */
+    bfd_default_scan,
+    0,			/* next -- there are none! */
+  }
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-tic30.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-tic30.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-tic30.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-tic30.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,39 @@
+/* BFD support for the Texas Instruments TMS320C30 architecture.
+   Copyright 1998, 2002, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_tic30_arch =
+{
+  32,				/* 32 bits in a word */
+  32,				/* 32 bits in an address */
+  8,				/* 8 bits in a byte */
+  bfd_arch_tic30,
+  0,				/* only 1 machine */
+  "tic30",
+  "tms320c30",
+  2,
+  TRUE,				/* the one and only */
+  bfd_default_compatible,
+  bfd_default_scan,
+  0,
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-tic4x.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-tic4x.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-tic4x.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-tic4x.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,86 @@
+/* bfd back-end for TMS320C[34]x support
+   Copyright 1996, 1997, 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
+
+   Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz)
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+static bfd_boolean tic4x_scan
+    PARAMS ((const struct bfd_arch_info *, const char * ));
+
+
+static bfd_boolean
+tic4x_scan (info, string)
+     const struct bfd_arch_info *info;
+     const char *string;
+{
+  /* Allow strings of form [ti][Cc][34][0-9], let's not be too picky
+     about strange numbered machines in C3x or C4x series.  */
+  if (string[0] == 't' && string[1] == 'i')
+    string += 2;
+  if (*string == 'C' || *string == 'c')
+    string++;
+  if (string[1] < '0' && string[1] > '9')
+    return FALSE;
+
+  if (*string == '3')
+    return (info->mach == bfd_mach_tic3x);
+  else if (*string == '4')
+    return info->mach == bfd_mach_tic4x;
+
+  return FALSE;
+}
+
+
+const bfd_arch_info_type bfd_tic3x_arch =
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    32,				/* 32 bits in a byte.  */
+    bfd_arch_tic4x,
+    bfd_mach_tic3x,		/* Machine number.  */
+    "tic3x",			/* Architecture name.  */
+    "tms320c3x",		/* Printable name.  */
+    0,				/* Alignment power.  */
+    FALSE,			/* Not the default architecture.  */
+    bfd_default_compatible,
+    tic4x_scan,
+    0
+  };
+
+const bfd_arch_info_type bfd_tic4x_arch =
+  {
+    32,				/* 32 bits in a word.  */
+    32,				/* 32 bits in an address.  */
+    32,				/* 32 bits in a byte.  */
+    bfd_arch_tic4x,
+    bfd_mach_tic4x,		/* Machine number.  */
+    "tic4x",			/* Architecture name.  */
+    "tms320c4x",		/* Printable name.  */
+    0,				/* Alignment power.  */
+    TRUE,			/* The default architecture.  */
+    bfd_default_compatible,
+    tic4x_scan,
+    &bfd_tic3x_arch,
+  };
+
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-tic54x.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-tic54x.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-tic54x.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-tic54x.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,39 @@
+/* BFD support for the Texas Instruments TMS320C54X architecture.
+   Copyright 1999, 2000, 2002, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_tic54x_arch =
+{
+  16,				/* 16 bits in a word */
+  16,				/* 16 bits in an address (except '548) */
+  16,				/* 16 bits in a byte */
+  bfd_arch_tic54x,
+  0,				/* only 1 machine */
+  "tic54x",
+  "tms320c54x",
+  1,
+  TRUE,				/* the one and only */
+  bfd_default_compatible,
+  bfd_default_scan,
+  0,
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-tic6x.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-tic6x.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-tic6x.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-tic6x.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,40 @@
+/* BFD support for the TI C6X processor.
+   Copyright 2010
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_tic6x_arch =
+  {
+    32, /* 32 bits in a word.  */
+    32, /* 32 bits in an address.  */
+    8, /* 8 bits in a byte.  */
+    bfd_arch_tic6x, /* Architecture.  */
+    0, /* No BFD machine numbers needed.  */
+    "tic6x", /* Architecture name.  */
+    "tic6x", /* Printable name.  */
+    2, /* Section alignment power.  */
+    TRUE, /* Default machine for this architecture.  */
+    bfd_default_compatible,
+    bfd_default_scan,
+    0,
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-tic80.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-tic80.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-tic80.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-tic80.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,40 @@
+/* bfd back-end for TI TMS320C80 (MVP) support
+   Copyright 1996, 2002, 2005, 2007 Free Software Foundation, Inc.
+   Written by Fred Fish at Cygnus support (fnf@cygnus.com)
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_tic80_arch =
+  {
+    32,				/* 32 bits in a word */
+    32,				/* 32 bits in an address */
+    8,				/* 8 bits in a byte */
+    bfd_arch_tic80,		/* bfd_architecture enum */
+    0,				/* only 1 machine */
+    "tic80",			/* architecture name */
+    "tic80",			/* printable name */
+    2,				/* section alignment power */
+    TRUE,			/* default machine for architecture */
+    bfd_default_compatible,
+    bfd_default_scan ,
+    NULL,				/* Pointer to next in chain */
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-tilegx.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-tilegx.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-tilegx.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-tilegx.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,39 @@
+/* BFD support for the TILE-Gx processor.
+   Copyright 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "bfd.h"
+#include "sysdep.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_tilegx_arch =
+  {
+    64, /* 64 bits in a word */
+    64, /* 64 bits in an address */
+    8,  /* 8 bits in a byte */
+    bfd_arch_tilegx,
+    bfd_mach_tilegx,
+    "tilegx",
+    "tilegx",
+    3,
+    TRUE,
+    bfd_default_compatible,
+    bfd_default_scan,
+    0,
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-tilepro.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-tilepro.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-tilepro.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-tilepro.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,39 @@
+/* BFD support for the TILEPro processor.
+   Copyright 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "bfd.h"
+#include "sysdep.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_tilepro_arch =
+  {
+    32, /* 32 bits in a word */
+    32, /* 32 bits in an address */
+    8,  /* 8 bits in a byte */
+    bfd_arch_tilepro,
+    bfd_mach_tilepro,
+    "tilepro",
+    "tilepro",
+    3,
+    TRUE,
+    bfd_default_compatible,
+    bfd_default_scan,
+    0,
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-v850.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-v850.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-v850.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-v850.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,45 @@
+/* BFD support for the NEC V850 processor
+   Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2007,
+   2010  Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "safe-ctype.h"
+
+#define N(number, print, default, next)  \
+{  32, 32, 8, bfd_arch_v850, number, "v850", print, 2, default, \
+     bfd_default_compatible, bfd_default_scan, next }
+
+#define NEXT NULL
+
+static const bfd_arch_info_type arch_info_struct[] =
+{
+  N (bfd_mach_v850e2v3, "v850e2v3", 	FALSE, & arch_info_struct[1]),
+  N (bfd_mach_v850e2,   "v850e2", 	FALSE, & arch_info_struct[2]),
+  N (bfd_mach_v850e1,   "v850e1",  	FALSE, & arch_info_struct[3]),
+  N (bfd_mach_v850e,    "v850e",   	FALSE, NULL)
+};
+
+#undef  NEXT
+#define NEXT & arch_info_struct[0]
+
+const bfd_arch_info_type bfd_v850_arch =
+  N (bfd_mach_v850, "v850", TRUE, NEXT);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-vax.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-vax.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-vax.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-vax.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,41 @@
+/* bfd back-end for vax support
+   Copyright 1990, 1991, 1994, 2000, 2002, 2005, 2007
+   Free Software Foundation, Inc.
+   Written by Steve Chamberlain of Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_vax_arch =
+  {
+    32,	/* 32 bits in a word */
+    32,	/* 32 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_vax,
+    0,	/* only 1 machine */
+    "vax",
+    "vax",
+    3,
+    TRUE, /* the one and only */
+    bfd_default_compatible,
+    bfd_default_scan,
+    0,
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-w65.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-w65.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-w65.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-w65.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,56 @@
+/* BFD library support routines for the WDC 65816 architecture.
+   Copyright 1995, 1999, 2000, 2001, 2002, 2005, 2007
+   Free Software Foundation, Inc.
+   Hacked by Steve Chamberlain of Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as publiw65ed by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You w65ould have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+static bfd_boolean scan_mach
+  PARAMS ((const struct bfd_arch_info *, const char *));
+
+static bfd_boolean
+scan_mach (info, string)
+     const struct bfd_arch_info *info ATTRIBUTE_UNUSED;
+     const char *string;
+{
+  if (strcmp(string,"w65") == 0)
+    return TRUE;
+  if (strcmp(string,"w65816") == 0)
+    return TRUE;
+  return FALSE;
+}
+
+const bfd_arch_info_type bfd_w65_arch =
+{
+  16,				/* 16 bits in a word */
+  24,				/* 24 bits in an address */
+  8,				/* 8 bits in a byte */
+  bfd_arch_w65,
+  0,				/* only 1 machine */
+  "w65",			/* arch_name  */
+  "w65",			/* printable name */
+  1,
+  TRUE,				/* the default machine */
+  bfd_default_compatible,
+  scan_mach,
+  0,
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-we32k.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-we32k.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-we32k.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-we32k.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,40 @@
+/* bfd back-end for we32k support
+   Copyright 1992, 2000, 2002, 2005, 2007 Free Software Foundation, Inc.
+   Contributed by Brendan Kehoe (brendan@cs.widener.edu).
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_we32k_arch =
+  {
+    32,	/* 32 bits in a word */
+    32,	/* 32 bits in an address */
+    8,	/* 8 bits in a byte */
+    bfd_arch_we32k,
+    32000,	/* only 1 machine */
+    "we32k",
+    "we32k:32000",
+    3,
+    TRUE, /* the one and only */
+    bfd_default_compatible,
+    bfd_default_scan ,
+    0,
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-xc16x.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-xc16x.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-xc16x.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-xc16x.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,73 @@
+/* BFD support for the Infineon XC16X Microcontroller.
+   Copyright 2006, 2007 Free Software Foundation, Inc.
+   Contributed by KPIT Cummins Infosystems 
+
+   This file is part of BFD, the Binary File Descriptor library.
+   Contributed by Anil Paranjpe(anilp1@kpitcummins.com)
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type xc16xs_info_struct =
+{
+  16,				/* Bits per word.  */
+  16,				/* Bits per address.  */
+  8,				/* Bits per byte.  */
+  bfd_arch_xc16x,		/* Architecture.  */
+  bfd_mach_xc16xs,		/* Machine.  */
+  "xc16x",			/* Architecture name.  */
+  "xc16xs",			/* Printable name.  */
+  1,				/* Section alignment - 16 bit.  */
+  TRUE,				/* The default ?  */
+  bfd_default_compatible,	/* Architecture comparison fn.  */
+  bfd_default_scan,		/* String to architecture convert fn.  */
+  NULL				/* Next in list.  */
+};
+
+const bfd_arch_info_type xc16xl_info_struct =
+{
+  16,				/* Bits per word.  */
+  32,				/* Bits per address.  */
+  8,				/* Bits per byte.  */
+  bfd_arch_xc16x,		/* Architecture.  */
+  bfd_mach_xc16xl,		/* Machine.  */
+  "xc16x",			/* Architecture name.  */
+  "xc16xl",			/* Printable name.  */
+  1,				/* Section alignment - 16 bit.  */
+  TRUE,				/* The default ?  */
+  bfd_default_compatible,	/* Architecture comparison fn.  */
+  bfd_default_scan,		/* String to architecture convert fn.  */
+  & xc16xs_info_struct		/* Next in list.  */
+};
+
+const bfd_arch_info_type bfd_xc16x_arch =
+{
+  16,				/* Bits per word.  */
+  16,				/* Bits per address.  */
+  8,				/* Bits per byte.  */
+  bfd_arch_xc16x,		/* Architecture.  */
+  bfd_mach_xc16x,		/* Machine.  */
+  "xc16x",			/* Architecture name.  */
+  "xc16x",			/* Printable name.  */
+  1,				/* Section alignment - 16 bit.  */
+  TRUE,				/* The default ?  */
+  bfd_default_compatible,	/* Architecture comparison fn.  */
+  bfd_default_scan,		/* String to architecture convert fn.  */
+  & xc16xl_info_struct		/* Next in list.  */
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-xstormy16.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-xstormy16.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-xstormy16.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-xstormy16.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,39 @@
+/* BFD support for the XSTORMY16 processor.
+   Copyright 2001, 2002, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_xstormy16_arch =
+{
+  16,				/* bits per word */
+  32,				/* bits per address */
+  8,				/* bits per byte */
+  bfd_arch_xstormy16,		/* architecture */
+  bfd_mach_xstormy16,		/* machine */
+  "xstormy16",			/* architecture name */
+  "xstormy16",			/* printable name */
+  2,				/* section align power */
+  TRUE,				/* the default ? */
+  bfd_default_compatible,	/* architecture comparison fn */
+  bfd_default_scan,		/* string to architecture convert fn */
+  NULL				/* next in list */
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-xtensa.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-xtensa.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-xtensa.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-xtensa.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,39 @@
+/* BFD support for the Xtensa processor.
+   Copyright 2003, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_xtensa_arch =
+{
+  32,				/* Bits per word.  */
+  32,				/* Bits per address.  */
+  8,				/* Bits per byte.  */
+  bfd_arch_xtensa,		/* Architecture.  */
+  bfd_mach_xtensa,		/* Machine.  */
+  "xtensa",			/* Architecture name.  */
+  "xtensa",			/* Printable name.  */
+  4,				/* Section align power.  */
+  TRUE,				/* The default?  */
+  bfd_default_compatible,	/* Architecture comparison fn.  */
+  bfd_default_scan,		/* String to architecture convert fn.  */
+  NULL				/* Next in list.  */
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-z80.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-z80.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-z80.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-z80.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,57 @@
+/* BFD library support routines for the Z80 architecture.
+   Copyright 2005, 2007 Free Software Foundation, Inc.
+   Contributed by Arnold Metselaar <arnold_m@operamail.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+const bfd_arch_info_type bfd_z80_arch;
+
+/* This routine is provided two arch_infos and
+   returns whether they'd be compatible.  */
+
+static const bfd_arch_info_type *
+compatible (const bfd_arch_info_type *a, const bfd_arch_info_type *b)
+{
+  if (a->arch != b->arch)
+    return NULL;
+
+  if (a->mach == b->mach)
+    return a;
+
+  return (a->arch == bfd_arch_z80) ? & bfd_z80_arch : NULL;
+}
+
+#define N(name,print,default,next)  \
+{ 16, 16, 8, bfd_arch_z80, name, "z80", print, 0, default, \
+    compatible, bfd_default_scan, next }
+
+#define M(n) &arch_info_struct[n]
+
+static const bfd_arch_info_type arch_info_struct[] =
+{
+  N (bfd_mach_z80strict, "z80-strict", FALSE, M(1)),
+  N (bfd_mach_z80,       "z80",        FALSE, M(2)),
+  N (bfd_mach_z80full,   "z80-full",   FALSE, M(3)),
+  N (bfd_mach_r800,      "r800",       FALSE, NULL)
+};
+
+const bfd_arch_info_type bfd_z80_arch = N (0, "z80-any", TRUE, M(0));
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-z8k.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-z8k.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/cpu-z8k.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/cpu-z8k.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,48 @@
+/* BFD library support routines for the Z800n architecture.
+   Copyright 1992, 1993, 1994, 2000, 2001, 2002, 2003, 2005, 2007
+   Free Software Foundation, Inc.
+   Hacked by Steve Chamberlain of Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+/* This routine is provided two arch_infos and returns whether
+   they'd be compatible */
+
+static const bfd_arch_info_type *
+compatible (const bfd_arch_info_type *a, const bfd_arch_info_type *b)
+{
+  if (a->arch != b->arch || a->mach != b->mach)
+    return NULL;
+  return a;
+}
+
+static const bfd_arch_info_type arch_info_struct[] =
+{
+  { 32, 16, 8, bfd_arch_z8k, bfd_mach_z8002, "z8k", "z8002", 1, FALSE,
+    compatible, bfd_default_scan, 0 }
+};
+
+const bfd_arch_info_type bfd_z8k_arch =
+{
+  32, 32, 8, bfd_arch_z8k, bfd_mach_z8001, "z8k", "z8001", 1, TRUE,
+  compatible, bfd_default_scan, &arch_info_struct[0]
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/demo64.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/demo64.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/demo64.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/demo64.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,31 @@
+/* BFD backend for demonstration 64-bit a.out binaries.
+   Copyright 1990, 1991, 1992, 1993, 1994, 2001, 2005, 2007
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define ARCH_SIZE 64
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (demo_64_,OP)
+
+#define TARGETNAME  "demo64"
+#include "aoutf1.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/dep-in.sed sdcc-3.2.0+dfsg/support/sdbinutils/bfd/dep-in.sed
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/dep-in.sed	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/dep-in.sed	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,28 @@
+:loop
+/\\$/N
+s/\\\n */ /g
+t loop
+
+s! \./! !g
+s! @BFD_H@!!g
+s!@SRCDIR@/../include!$(INCDIR)!g
+s!@TOPDIR@/include!$(INCDIR)!g
+s!@SRCDIR@/../opcodes!$(srcdir)/../opcodes!g
+s!@TOPDIR@/opcodes!$(srcdir)/../opcodes!g
+s!@SRCDIR@/!!g
+s! hosts/[^ ]*\.h!!g
+s! sysdep.h!!g
+s! \.\./bfd/sysdep.h!!g
+s! libbfd.h!!g
+s! config.h!!g
+s! \$(INCDIR)/fopen-[^ ]*\.h!!g
+s! \$(INCDIR)/ansidecl\.h!!g
+s! \$(INCDIR)/symcat\.h!!g
+s! \.\./intl/libintl\.h!!g
+
+s/ *$//
+s/  */ /g
+s/^ */A/
+s/ / \\\
+B/g
+$s/$/ \\/
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/doc/ChangeLog sdcc-3.2.0+dfsg/support/sdbinutils/bfd/doc/ChangeLog
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/doc/ChangeLog	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/doc/ChangeLog	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,242 @@
+2010-10-28  Matthias Klose  <doko@ubuntu.com>
+
+	* bfd.texinfo: Add directory section for info document.
+
+2010-05-07  Tristan Gingold  <gingold@adacore.com>
+
+	* Makefile.in: Regenerate with automake 1.11.1.
+
+2010-01-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.in: Regenerate.
+
+2009-09-25  Martin Thuresson  <martint@google.com>
+
+	Update soruces to make alpha targets compile cleanly with
+	-Wc++-compat:
+	* chew.c: Add casts.
+
+2009-08-29  Martin Thuresson  <martin@mtme.org>
+
+	* chew.c (newentry, add_intrinsic): Rename variable new to
+	new_d.
+
+2009-08-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.in: Regenerate.
+
+2009-08-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am)
+	(html__strip_dir, install-html, install-html-am): Remove.
+	* Makefile.in: Regenerate.
+
+	* Makefile.in: Regenerate.
+
+2009-05-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
+2009-04-22  Anthony Green  <green@moxielogic.com>
+
+	* bfdint.texi (BFD target vector miscellaneous): Mention verilog
+	flavour.
+
+2008-11-19  Nick Clifton  <nickc@redhat.com>
+
+	* fdl.texi: Update to v1.3
+	* bfd.texinfo: Change license to v1.3.
+
+2008-08-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (chew.o): Delete rule.
+	($(MKDOC)): Move options before C file.
+	* Makefile.in: Regenerate.
+
+2008-08-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
+2008-07-09  Craig Silverstein  <csilvers@google.com>
+
+	* Makefile.am (BFD_H_DEP): Add ../compress.c.
+	* Makefile.in: Regenerate.
+
+2008-05-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
+2008-03-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.in: Regenerate.
+
+2008-03-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
+2007-10-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* chew.c (write_buffer): Check fwrite return value.
+
+2007-09-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
+2007-07-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
+2007-06-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.in: Likewise.
+
+2007-06-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.in: Regenerated.
+
+2007-05-22  Nick Clifton  <nickc@redhat.com>
+
+	* bfd.texinfo: Use @copying around the copyright notice.
+	* bfdint.texi: Likewise.
+
+2007-05-21  Nick Clifton  <nickc@redhat.com>
+
+	* bfdint.texi: Add GNU Free Documentation License notice.
+
+2007-04-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
+2007-02-17  Mark Mitchell  <mark@codesourcery.com>
+	    Nathan Sidwell  <nathan@codesourcery.com>
+	    Vladimir Prus  <vladimir@codesourcery.com
+	    Joseph Myers  <joseph@codesourcery.com>
+
+	* Makefile.in: Regenerate.
+
+2006-07-24  Ralk Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* bfd..texinfo: Fix spelling mistakes.
+	* bfdint.texinfo: Likewise.
+
+2006-07-18  Nigel Stephens  <nigel@mips.com>
+
+	* bfd.texinfo: Add @section for "What to Put Where".
+
+2006-06-07  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* bfd.texinfo: Remove local @tex code.
+
+2006-06-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
+2006-05-11  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* bfd.texinfo: Rename "Index" to "BFD Index"
+
+2006-04-06  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* Makefile.am: Add install-html and install-html-am targets.
+	Define datarootdir, docdir and htmldir.
+	* Makefile.in: Regenerate.
+
+2006-02-27  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* Makefile.am: Add html target.
+	* Makefile.in: Regenerate.
+
+2005-07-24  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* chew.c: Include <string.h>.
+
+2005-07-22  DJ Delorie  <dj@redhat.com>
+
+	* chew.c: Include stdlib.h.
+
+2005-07-22  Kazu Hirata  <kazu@codesourcery.com>
+
+	* chew.c: Don't include sysdep.h.
+
+2005-05-09  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.am: Use a temporary file to build chew.
+	* Makefile.in: Regenerated.
+
+2005-05-04  Nick Clifton  <nickc@redhat.com>
+
+	* chew.c: Update the address and phone number of the FSF
+	organization in the GPL notice.
+
+2005-05-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am (INCLUDES): Remove -D_GNU_SOURCE.
+	* Makefile.in: Regenerate.
+
+2005-04-29  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.am: Remove stamp rules.  Depend on chew.c
+	instead of $(MKDOC).
+	* Makefile.in: Regnerated.
+
+2005-04-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am (INCLUDES): New. Add -D_GNU_SOURCE.
+	(chew.o): Use it.
+	* Makefile.in: Regenerate.
+
+2005-04-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
+2005-04-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
+2005-02-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
+2005-02-13  Maciej W. Rozycki  <macro@linux-mips.org>
+
+	* Makefile.am: Use CFLAGS_FOR_BUILD and LDFLAGS_FOR_BUILD for
+	building chew.
+	* Makefile.in: Regenerate.
+
+2005-02-01  Ben Elliston  <bje@au.ibm.com>
+
+	* chew.c: Remove #if 0'd code throughout. Similarly, collapse #if
+	1'd code.
+
+2004-12-20  Ian Lance Taylor  <ian@c2microsystems.com>
+
+	* Makefile.am: Use $(SHELL) whenever we run move-if-change.
+	* Makefile.in: Rebuild.
+
+2004-09-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am (AUTOMAKE_OPTIONS): Require 1.9.
+	(bfd.info): Rename the target to ...
+	($(srcdir)/bfd.info): This.
+	* Makefile.in: Regenerated.
+
+2004-09-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
+2004-03-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdint.texi: Remove all mention of elflink.h.
+
+2004-03-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
+For older changes see ChangeLog-9103
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/doc/ChangeLog-9103 sdcc-3.2.0+dfsg/support/sdbinutils/bfd/doc/ChangeLog-9103
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/doc/ChangeLog-9103	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/doc/ChangeLog-9103	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,594 @@
+2003-10-15  Andrew Cagney  <cagney@redhat.com>
+
+	* bfdint.texi (BFD target vector symbols): Rename _get_symtab to
+	_canonicalize_symtab.
+
+2003-10-08  David Taylor <dtaylor@emc.com>
+
+	* bfd.texinfo: Remove spurious backslash.
+
+2003-07-04  Josh Baratz  <baratz@intersystems.com>
+
+	* Makefile.am (MKDOC rule): Add $(CFLAGS) in case it contains
+	CC_FOR_BUILD specific switches.
+	* Makefile.in: Regenerate.
+
+2003-06-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* chew.c (paramstuff): Don't emit PARAMS.
+
+2003-02-12  Bob Wilson  <bob.wilson@acm.org>
+
+	* bfd.texinfo: Fix quotes for texinfo.  Make section title
+	capitalization more consistent.  Use @example instead of @lisp.
+	Replace FDL appendix with include of fdl.texi.
+	* fdl.texi: New file.
+
+2002-11-18  Klee Dienes  <kdienes@apple.com>
+
+	* Makefile.am (DOCFILES): Add bfdwin.texi, bfdio.texi.
+	(PROTOS): Add bfdio.p, bfdwin.p.
+	(SRCDOC): Add bfdio.c, bfdwin.c.
+	(SRCPROT): Add bfdio.c, bfdwin.c.
+	(SRCIPROT): Add bfdio.c, bfdwin.c.
+	(LIBBFD_H_DEP): Add bfdio.c, bfdwin.c.
+	(BFD_H_DEP): Add bfdio.c, bfdwin.c.
+	Add rules for bfdio.texi, bfdwin.text.
+	* bfd.texinfo: Include bfdio.texi.
+
+2002-10-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
+2002-10-11  Daniel Jacobowitz  <drow@mvista.com>
+
+	* Makefile.in: Regenerated.
+
+2002-08-29  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* chew.c (paramstuff, outputdots, perform, bang and usage): Remove
+	void from function definitions.
+
+2002-08-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* header.sed: Strip tabs.
+
+2002-06-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Fix quote style in last change.
+	* Makefile.in: Regenerate.
+
+2002-06-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (libbfd.h): Don't use "echo -n".
+	(libcoff.h, bfd.h): Likewise.
+	* Makefile.in: Regenerate.
+
+2002-06-06  Lars Brinkhoff  <lars@nocrew.org>
+
+	* bfdint.texi: Change registry@sco.com to registry@caldera.com.
+
+2002-06-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (libbfd.h): Add "Extracted from.." comment.
+	(libcoff.h, bfd.h): Likewise.
+	* Makefile.in: Regenerate.
+
+2002-05-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* chew.c: Use #include "" instead of <> for local header files.
+
+2002-04-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
+2002-02-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
+2002-02-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* chew.c (WORD): Eliminate.
+
+2002-01-31  Ivan Guzvinec  <ivang@opencores.org>
+
+	* Makefile.in: Regenerate.
+
+2002-01-31  Alan Modra  <amodra@bigpond.net.au>
+
+	* chew.c (courierize): Don't modify @command params.
+
+2002-01-30  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* proto.str (ENUMDOC): Place two spaces between the end of
+	the text and the closing comment marker.
+
+2001-10-30  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* bfdint.texi (BFD target vector miscellaneous): Add
+	bfd_target_mmo_flavour.
+	* bfd.texinfo (BFD back ends): Add entry for mmo.
+	* Makefile.am (DOCFILES): Add mmo.texi.
+	(SRCDOC): Add mmo.c.
+	(s-mmo, mmo.texi): New rules.
+
+2001-10-29  Kazu Hirata  <kazu@hxi.com>
+
+	* bfdsumm.texi: Fix a typo.
+
+2001-10-26  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* bfd.texinfo: Change footer to refer to FSF.  Change subtitle
+	to refer to original creation date.
+
+2002-01-26  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* Makefile.am (install): Depend on install-info.
+	* Makefile.in: Regenerate.
+
+2001-10-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (BFD_H_DEP): Add ../version.h.
+	* Makefile.in: Regenerate.
+
+2001-10-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
+2001-10-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* header.sed: New file, adds header to generated files.
+	* Makefile.am: Rewrite rules generating libbfd.h, libcoff.h and
+	bfd.h, using above.  Add missing elf.c dependecy for libbfd.h.
+	* Makefile.in: Regenerate.
+
+2001-09-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
+2001-09-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdint.texi: Replace reference to bfd_read with bfd_bread.
+	Likewise for bfd_write.
+
+2001-07-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
+2001-06-21  Hans-Peter Nilsson  <hp@axis.com>
+
+	* bfdint.texi (BFD relocation functions) <different formats>:
+	Mention that the GNU linker is aware of input-output format
+	restrictions when generating relocatable output.  Make new
+	paragraph for final-link case.
+	(BFD target vector swap): Fix typo.
+
+2001-01-25  Kazu Hirata  <kazu@hxi.com>
+
+	* chew.c: Do not output trailing whitespaces in type and
+	functionname.  Update copyright.
+
+2001-01-24  Kazu Hirata  <kazu@hxi.com>
+
+	* chew.c: Do not output a trailing whitespace.
+
+2000-11-06  Nick Clifton  <nickc@redhat.com>
+
+	* bfd.texinfo: Add GNU Free Documentation License.
+
+2000-07-09  Alan Modra  <alan@linuxcare.com.au>
+
+	* Makefile.in: Regenerate.
+
+2000-07-08  Alan Modra  <alan@linuxcare.com.au>
+
+	* chew.c (outputdots): Don't add a space before `/*'.
+	(courierize): Likewise.
+
+Wed May 24 12:03:25 2000  Hans-Peter Nilsson  <hp@axis.com>
+
+	* bfdint.texi (BFD ELF processor required): Add paragraph about
+	target necessities for readelf.
+
+2000-04-30  Ben Elliston  <bje@redhat.com>
+
+	* bfdint.texi (BFD generated files): Fix another typo.
+
+2000-04-17  Ben Elliston  <bje@redhat.com>
+
+	* bfdint.texi (BFD_JUMP_TABLE macros): Fix typo.
+
+2000-04-07  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* Makefile.in: Rebuild with current autoconf/automake.
+
+1999-02-04  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in: Rebuild with current autoconf/automake.
+
+1998-07-23  Nick Clifton  <nickc@cygnus.com>
+
+	* bfdint.texi (BFD ELF processor required): Add paragraph
+	describing the necessity to create "include/elf/CPU.h".
+
+1998-05-07  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (chew.o): Add -I options for intl srcdir and
+	objdir.
+	* Makefile.in: Rebuild.
+
+1998-04-27  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfdint.texi: New file.
+	* Makefile.am (noinst_TEXINFOS): New variable.
+	* Makefile.in: Rebuild.
+
+1998-04-13  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in: Rebuild.
+
+1998-04-06  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (STAGESTUFF): Remove variable.
+	(CLEANFILES): Don't remove $(STAGESTUFF).
+	(DISTCLEANFILES, MAINTAINERCLEANFILES): New variables.
+	* Makefile.in: Rebuild.
+
+1998-03-27  Ian Lance Taylor  <ian@cygnus.com>
+
+	* chew.c (skip_white_and_starts): Remove unused declaration.
+	(skip_white_and_stars): Add casts to avoid warnings.
+	(skip_trailing_newlines, paramstuff, courierize): Likewise.
+	(bulletize, do_fancy_stuff, iscommand): Likewise.
+	(kill_bogus_lines, nextword, main): Likewise.
+	(manglecomments): Comment out.
+	(outputdots, kill_bogus_lines): Remove unused local variables.
+	(perform, compile): Likewise.
+	(courierize): Fully parenthesize expression.
+	(copy_past_newline): Declare return value.
+	(print): Change printf format string.
+	(main): Call usage for an unrecognized option.
+
+1998-02-13  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (AUTOMAKE_OPTIONS): Define.
+	* Makefile.in: Rebuild.
+
+1998-01-26  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* doc.str (bodytext): Don't output @* at the end.
+	* chew.c (kill_bogus_lines): Make sure that a period at the
+	beginning is recognized.
+	(indent): Don't put indentation at the end.
+	(copy_past_newline): Expand tabs.
+	* Makefile.am (s-reloc, s-syms): Depend on doc.str.
+	* Makefile.in: Rebuild.
+
+1997-10-01  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (libbfd.h): Don't use cpu-h8300.c, cpu-i960.c, or
+	elfcode.h as input files; they don't contribute anything.
+	* Makefile.in: Rebuild.
+
+1997-08-15  Doug Evans  <dje@canuck.cygnus.com>
+
+	* Makefile.am (libbfd.h, libcoff.h): Invoke $(MKDOC) as ./$(MKDOC).
+	* Makefile.in: Rebuild.
+
+1997-08-01  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (CC_FOR_BUILD): Don't set explicitly.
+	* Makefile.in: Rebuild.
+
+1997-07-31  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am: New file, based on old Makefile.in.
+	* Makefile.in: Now built with automake.
+
+1997-07-22  Robert Hoehne <robert.hoehne@Mathematik.TU-Chemnitz.DE>
+
+	* Makefile.in: Change stamp-* files to s-* files.  Use bfdt.texi
+	rather than bfd.texi.
+	(DOCFILES): Change bfd.texi to bfdt.texi.
+	* bfd.texinfo: Include bfdt.texi, not bfd.texi.
+
+1997-06-16  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (CC, CFLAGS): Substitute from configure script.
+	From Jeff Makey <jeff@cts.com>.
+
+1997-04-15  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (install-info): Use mkinstalldirs to build
+	$(infodir).
+
+1997-04-08  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (install-info): Permit info files to be in srcdir.
+	(stamp-*): Add a stamp-X target for each X.texi target.
+	(*.texi): Just depend upon stamp-X.
+	(clean): Remove stamp-*.
+	(distclean): Depend upon mostlyclean.  Remove stamp-*.  Don't
+	remove $(DOCFILES).
+
+1997-04-07  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (distclean): Don't remove *.info files.
+
+1997-02-13  Klaus Kaempf  (kkaempf@progis.de)
+
+	* makefile.vms: New file.
+
+1996-06-18  Ian Lance Taylor  <ian@cygnus.com>
+
+	* chew.c (kill_bogus_lines): Reset sl when not at the start of a
+	line.  From Uwe Ohse <uwe@tirka.gun.de>.
+
+1996-01-30  Ian Lance Taylor  <ian@cygnus.com>
+
+	From Ronald F. Guilmette <rfg@monkeys.com>:
+	* Makefile.in (libbfd.h): Depend upon proto.str.
+	(libcoff.h, bfd.h): Likewise.
+
+1995-11-03  Fred Fish  <fnf@cygnus.com>
+
+	* Makefile.in (SRCDOC, SRCPROT, core.texi, bfd.h):  Use corefile.c,
+	renamed from core.c.
+
+1995-11-01  Manfred Hollstein KS/EF4A 60/1F/110 #40283  <manfred@lts.sel.alcatel.de>
+
+	* chew.c: Include <ctype.h>.
+
+1995-10-06  Ken Raeburn  <raeburn@cygnus.com>
+
+	Mon Sep 25 22:49:32 1995  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* Makefile.in (Makefile): Only remake this Makefile.
+
+1995-10-04  Ken Raeburn  <raeburn@cygnus.com>
+
+	* chew.c: Include <stdio.h>.
+
+1995-09-12  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (maintainer-clean): New target.
+
+1995-08-31  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (bfd.h): Add additional #endif at end of bfd.h if
+	__cplusplus is defined.
+
+1994-11-29  Doug Evans  <dje@canuck.cygnus.com>
+
+	* chew.c (write_buffer): New argument `f', all callers changed.
+	(stdout, stderr, print, drop, idrop): New forth words.
+	* proto.str (COMMENT): New command.
+	* doc.str (COMMENT): Likewise.
+
+1994-09-12  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* Makefile.in (DOCFILES): Remove ctor.texi.
+	(IPROTOS): Remove ctor.ip.
+	(SRCIPROT): Remove $(srcdir)/../ctor.c.
+	(ctor.texi): Remove target.
+	(libbfd.h): Remove dependency on $(srcdir)/../ctor.c.  Remove
+	$(MKDOC) run on $(srcdir)/../ctor.c.
+	* bfd.texinfo (Constructors): Remove section.
+
+1994-09-02  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* chew.c: Include assert.h.  Added prototypes for most functions.
+	Changed most uses of int to long.  Do bounds checking on the
+	stacks.  Added comment at the beginning documenting most of the
+	intrinsics.  Lots of whitespace changes.  Re-ordered some
+	functions.
+	(die, check_range, icheck_range): New functions.
+	(strip_trailing_newlines, print_stack_level): New functions.
+	(translatecomments): Don't insert tab before "/*".
+	(iscommand): Minimum command length is now 4.
+	(nextword): Handle some \-sequences.
+	(push_addr): Deleted.
+	(main): Add new intrinsics strip_trailing_newlines and
+	print_stack_level.  Complain at end if stack contains more than
+	one element, or less.
+	(remchar): Make sure the string is not empty before chopping off a
+	character.
+
+	* doc.str, proto.str: Handle new commands SENUM, ENUM, ENUMX,
+	ENUMEQ, ENUMEQX, ENUMDOC.
+
+1994-01-12  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* bfd.texinfo: Added Linker Functions node.
+	* Makefile.in (DOCFILES): Added linker.texi.
+	(SRCDOC): Added linker.c.
+	(linker.texi): New target.
+
+1994-01-04  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* chew.c: Don't rely on a correct declaration of exit.
+	(chew_exit): New function which just calls exit.
+	(main): Use it.
+
+1994-01-03  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* bfd.texinfo: Added Hash Tables node.
+	* Makefile.in (DOCFILES): Added hash.texi.
+	(SRCDOC): Added hash.c.
+	(hash.texi): New target.
+
+1993-12-30  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* Makefile.in: Delete all references to seclet.c, since it's just
+	been deleted.  Don't mention hash.c, linker.c, or genlink.h yet,
+	since they don't contain documentation yet (hint, hint!).
+
+1993-11-05  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* bfd.texinfo: Small cleanups.
+
+1993-11-19  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* Makefile.in (archures.texi): Depends on $(MKDOC).
+
+1993-08-10  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* bfd.texinfo (BFD back end): Don't include elfcode.texi, since
+	it's empty now and that triggers a makeinfo bug.
+
+1993-08-09  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* bfd.texinfo (BFD back end): New section on ELF, includes
+	elf.texi and elfcode.texi.
+	* Makefile.in (DOCFILES): Include elf.texi, elfcode.texi.
+	(SRCDOC): Include elfcode.h, elf.c.
+	(elf.texi, elfcode.texi): New intermediate targets.
+
+1993-06-24  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* Makefile.in (.c.o, chew.o): Put CFLAGS last.
+	* bfdsumm.texi: New file, broken out of bfd.texinfo, to share
+	with ld.texinfo.
+
+1993-06-14  david d `zoo' zuhn  (zoo at rtl.cygnus.com)
+
+	* Makefile.in (install-info): remove parentdir cruft,
+
+1993-06-09  Jim Kingdon  (kingdon@cygnus.com)
+
+	* Makefile.in (mostlyclean): Remove chew.o.
+
+1993-05-25  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* Makefile.in (libbfd.h): Use elfcode.h, not elf32.c.
+
+1993-05-24  Ken Raeburn  (raeburn@cygnus.com)
+
+	* chew.c (compile): Add a couple of missing casts.
+
+1993-05-12  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (CC_FOR_BUILD): New variable, define to be $(CC).
+	(chew.o, $(MKDOC)): Build using CC_FOR_BUILD rather than CC, since
+	it must run on the build machine.
+
+1993-04-07  John Gilmore  (gnu@cygnus.com)
+
+	* Makefile.in (chew):  Don't compile from .c to executable in a
+	single step; it puts a temporary .o filename into the executable,
+	which makes multi-stage comparisons fail.  Compile chew.c to
+	chew.o, and link that, which makes identical executables every time.
+
+1993-03-24  david d `zoo' zuhn  (zoo at poseidon.cygnus.com)
+
+	* Makefile.in: fix typo (bfd.texinfo not bfd.texino)
+
+1993-03-19  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+	* bfd.texinfo: Since BFD version number has been bumped, do same
+	to "version number" on title page, and elsewhere.  Should be
+	fixed to extract real version number.
+
+1993-03-16  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Makefile.in:  Add *clean rules.
+
+1993-01-11  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* Makefile.in (libbfd.h): Removed duplicate init.c and libbfd.c.
+	Added seclet.c.
+	(bfd.h): Added dependency on bfd.c and seclet.c.  Added seclet.c
+	to build.
+
+1992-12-17  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: added dvi target, define and use $(TEXI2DVI)
+
+1992-12-03  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* Makefile.in (TEXIDIR): New variable.
+	(bfd.dvi): Look for bfd.texinfo in $(srcdir).  Generate index.
+
+	* bfd.texinfo: Minor doc fixes.
+
+1992-11-05  John Gilmore  (gnu@cygnus.com)
+
+	Cleanup:  Replace all uses of EXFUN in the BFD sources, with PARAMS.
+
+	* chew.c (exfunstuff):  Eliminate.
+	(paramstuff):  Replace exfunstuff with function to generate PARAMS.
+	* proto.str:  Use paramstuff rather than exfunstuff.
+
+1992-08-17  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* chew.c: various patches provided by Howard Chu.
+
+1992-06-19  John Gilmore  (gnu at cygnus.com)
+
+	* Makefile.in (libbfd.h):  Add elf.c as a source of prototypes.
+
+1992-05-11  John Gilmore  (gnu at cygnus.com)
+
+	* chew.c:  exit() should be declared by config files, not by
+	portable source code.  Its type could be int or void function.
+
+1992-05-04  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* Makefile.in: another CFLAGS correction.
+
+1992-04-28  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* Makefile.in: Do the CFLAGS thing.
+
+1992-04-11  Fred Fish  (fnf@cygnus.com)
+
+	* Makefile.in (MINUS_G):  Add macro and default to -g.
+
+1992-03-06  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* chew.c: now has -w switch turn on warnings
+
+1992-02-26  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in, configure.in: removed traces of namesubdir,
+	  -subdirs, $(subdir), $(unsubdir), some rcs triggers.  Forced
+	  copyrights to '92, changed some from Cygnus to FSF.
+
+1991-12-10  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* Makefile.in: build chew into the current directory.  Complete
+	  the MKDOC macro transition.
+
+1991-12-10  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* chew.c: don't core dump when can't open file
+	* Makefile.in: get proto.str from the right place when built in
+	odd directories
+
+1991-12-10  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* Makefile.in: infodir belongs in datadir.
+
+1991-12-07  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* chew.c: Much modified
+	* proto.str, doc.str: New files for extracting to product
+	prototypes and documents respectively.
+
+
+1991-12-06  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* Makefile.in: added standards.text support, host/site/target
+	  inclusion hooks, install using INSTALL_DATA rather than cp,
+	  don't echo on install.
+
+1991-12-05  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* Makefile.in: idestdir and ddestdir go away.  Added copyrights
+	  and shift gpl to v2.  Added ChangeLog if it didn't exist. docdir
+	  and mandir now keyed off datadir by default.
+
+
+Local Variables:
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/doc/Makefile.am sdcc-3.2.0+dfsg/support/sdbinutils/bfd/doc/Makefile.am
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/doc/Makefile.am	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/doc/Makefile.am	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,306 @@
+## Process this file with automake to generate Makefile.in
+
+AUTOMAKE_OPTIONS = 1.9 cygnus
+
+####DOCFILES = aoutx.texi  archive.texi archures.texi \
+####	bfdt.texi  cache.texi coffcode.texi \
+####	core.texi elf.texi elfcode.texi  format.texi \
+####	libbfd.texi bfdwin.texi bfdio.texi \
+####	opncls.texi  reloc.texi  section.texi  \
+####	syms.texi  targets.texi init.texi hash.texi linker.texi \
+####	mmo.texi \
+####	bfdver.texi
+
+PROTOS = archive.p archures.p bfd.p \
+	 core.p format.p \
+	bfdio.p bfdwin.p \
+	libbfd.p opncls.p reloc.p \
+	section.p syms.p targets.p  \
+	format.p  core.p init.p
+
+IPROTOS = cache.ip libbfd.ip reloc.ip init.ip archures.ip coffcode.ip
+
+# SRCDOC, SRCPROT, SRCIPROT only used to sidestep Sun Make bug in interaction 
+# between VPATH and suffix rules.  If you use GNU Make, perhaps other Makes,
+# you don't need these three:
+SRCDOC = $(srcdir)/../aoutx.h  $(srcdir)/../archive.c \
+	$(srcdir)/../archures.c $(srcdir)/../bfd.c \
+	$(srcdir)/../bfdio.c $(srcdir)/../bfdwin.c \
+	$(srcdir)/../cache.c $(srcdir)/../coffcode.h \
+	$(srcdir)/../corefile.c $(srcdir)/../elf.c \
+	$(srcdir)/../elfcode.h  $(srcdir)/../format.c \
+	$(srcdir)/../libbfd.c $(srcdir)/../opncls.c \
+	$(srcdir)/../reloc.c  $(srcdir)/../section.c \
+	$(srcdir)/../syms.c  $(srcdir)/../targets.c \
+	$(srcdir)/../hash.c $(srcdir)/../linker.c \
+	$(srcdir)/../mmo.c
+
+SRCPROT = $(srcdir)/../archive.c $(srcdir)/../archures.c \
+	$(srcdir)/../bfd.c $(srcdir)/../coffcode.h $(srcdir)/../corefile.c \
+	$(srcdir)/../format.c $(srcdir)/../libbfd.c \
+	$(srcdir)/../bfdio.c $(srcdir)/../bfdwin.c \
+	$(srcdir)/../opncls.c $(srcdir)/../reloc.c \
+	$(srcdir)/../section.c $(srcdir)/../syms.c \
+	$(srcdir)/../targets.c $(srcdir)/../init.c
+
+SRCIPROT = $(srcdir)/../cache.c $(srcdir)/../libbfd.c \
+	$(srcdir)/../bfdio.c $(srcdir)/../bfdwin.c \
+	$(srcdir)/../reloc.c $(srcdir)/../cpu-h8300.c \
+	$(srcdir)/../cpu-i960.c $(srcdir)/../archures.c \
+	$(srcdir)/../init.c
+
+####TEXIDIR = $(srcdir)/../../texinfo/fsf
+
+####info_TEXINFOS = bfd.texinfo
+####bfd_TEXINFOS = $(DOCFILES) bfdsumm.texi
+
+MKDOC = chew$(EXEEXT_FOR_BUILD)
+
+AM_CPPFLAGS = -I.. -I$(srcdir)/.. -I$(srcdir)/../../include \
+	-I$(srcdir)/../../intl -I../../intl
+
+$(MKDOC): $(srcdir)/chew.c
+	$(CC_FOR_BUILD) -o chew.$$$$ $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \
+	  $(H_CFLAGS) $(AM_CPPFLAGS) $(srcdir)/chew.c; \
+	$(SHELL) $(srcdir)/../../move-if-change chew.$$$$ $(MKDOC)
+
+protos: libbfd.h libcoff.h bfd.h
+
+# We can't replace these rules with an implicit rule, because
+# makes without VPATH support couldn't find the .h files in `..'.
+
+# We do not depend on chew directly so that we can distribute the info
+# files, and permit people to rebuild them, without requiring the makeinfo
+# program.  If somebody tries to rebuild info, but none of the .texi files
+# have changed, then nothing will be rebuilt.
+
+####aoutx.texi: chew.c $(srcdir)/../aoutx.h $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../aoutx.h >aoutx.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change aoutx.tmp aoutx.texi
+
+####archive.texi: chew.c $(srcdir)/../archive.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../archive.c >archive.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change archive.tmp archive.texi
+
+####archures.texi: chew.c $(srcdir)/../archures.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../archures.c >archures.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change archures.tmp archures.texi
+
+# We use bfdt.texi, rather than bfd.texi, to avoid conflicting with
+# bfd.texinfo on an 8.3 filesystem.
+####bfdt.texi: chew.c $(srcdir)/../bfd.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../bfd.c >bfd.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change bfd.tmp bfdt.texi
+
+####cache.texi: chew.c $(srcdir)/../cache.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../cache.c >cache.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change cache.tmp cache.texi
+
+####coffcode.texi: chew.c $(srcdir)/../coffcode.h $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../coffcode.h >coffcode.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change coffcode.tmp coffcode.texi
+
+####core.texi: chew.c $(srcdir)/../corefile.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../corefile.c >core.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change core.tmp core.texi
+
+####elf.texi: chew.c $(srcdir)/../elf.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../elf.c >elf.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change elf.tmp elf.texi
+
+####elfcode.texi: chew.c $(srcdir)/../elfcode.h $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../elfcode.h >elfcode.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change elfcode.tmp elfcode.texi
+
+####mmo.texi: chew.c $(srcdir)/../mmo.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../mmo.c >mmo.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change mmo.tmp mmo.texi
+
+####format.texi: chew.c $(srcdir)/../format.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../format.c >format.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change format.tmp format.texi
+
+####libbfd.texi: chew.c $(srcdir)/../libbfd.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../libbfd.c >libbfd.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change libbfd.tmp libbfd.texi
+
+####bfdio.texi: chew.c $(srcdir)/../bfdio.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../bfdio.c >bfdio.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change bfdio.tmp bfdio.texi
+
+####bfdwin.texi: chew.c $(srcdir)/../bfdwin.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../bfdwin.c >bfdwin.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change bfdwin.tmp bfdwin.texi
+
+####opncls.texi: chew.c $(srcdir)/../opncls.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str  <$(srcdir)/../opncls.c >opncls.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change opncls.tmp opncls.texi
+
+####reloc.texi: chew.c $(srcdir)/../reloc.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../reloc.c >reloc.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change reloc.tmp reloc.texi
+
+####section.texi: chew.c $(srcdir)/../section.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../section.c >section.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change section.tmp section.texi
+
+####syms.texi: chew.c $(srcdir)/../syms.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../syms.c >syms.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change syms.tmp syms.texi
+
+####targets.texi: chew.c $(srcdir)/../targets.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../targets.c >targets.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change targets.tmp targets.texi
+
+####init.texi: chew.c $(srcdir)/../init.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../init.c >init.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change init.tmp init.texi
+
+####hash.texi: chew.c $(srcdir)/../hash.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../hash.c >hash.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change hash.tmp hash.texi
+
+####linker.texi: chew.c $(srcdir)/../linker.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../linker.c >linker.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change linker.tmp linker.texi
+
+LIBBFD_H_DEP = \
+	$(srcdir)/../libbfd-in.h	\
+	$(srcdir)/../init.c		\
+	$(srcdir)/../libbfd.c		\
+	$(srcdir)/../bfdio.c		\
+	$(srcdir)/../bfdwin.c		\
+	$(srcdir)/../cache.c		\
+	$(srcdir)/../reloc.c		\
+	$(srcdir)/../archures.c		\
+	$(srcdir)/../elf.c		\
+	$(srcdir)/header.sed		\
+	$(srcdir)/proto.str		\
+	$(MKDOC)
+
+libbfd.h: $(LIBBFD_H_DEP)
+	echo "$(LIBBFD_H_DEP)" | sed -f $(srcdir)/header.sed > $@
+	for file in $(LIBBFD_H_DEP); do \
+	  case $$file in \
+	    *-in.h) cat $$file >> $@ ;; \
+	    */header.sed) break ;; \
+	    *)	echo $$file | sed -e 's,.*/,,' -e 's,^,/* Extracted from ,' \
+				-e 's,$$,.  */,' >> $@ ; \
+		./$(MKDOC) -i -f $(srcdir)/proto.str < $$file >> $@ ;; \
+	  esac; \
+	done
+
+LIBCOFF_H_DEP = \
+	$(srcdir)/../libcoff-in.h	\
+	$(srcdir)/../coffcode.h		\
+	$(srcdir)/header.sed		\
+	$(srcdir)/proto.str		\
+	$(MKDOC)
+
+libcoff.h: $(LIBCOFF_H_DEP)
+	echo "$(LIBCOFF_H_DEP)" | sed -f $(srcdir)/header.sed > $@
+	for file in $(LIBCOFF_H_DEP); do \
+	  case $$file in \
+	    *-in.h) cat $$file >> $@ ;; \
+	    */header.sed) break ;; \
+	    *)	echo $$file | sed -e 's,.*/,,' -e 's,^,/* Extracted from ,' \
+				-e 's,$$,.  */,' >> $@ ; \
+		./$(MKDOC) -i -f $(srcdir)/proto.str < $$file >> $@ ;; \
+	  esac; \
+	done
+
+BFD_H_DEP = \
+	$(srcdir)/../bfd-in.h 		\
+	$(srcdir)/../init.c 		\
+	$(srcdir)/../opncls.c 		\
+	$(srcdir)/../libbfd.c 		\
+	$(srcdir)/../bfdio.c		\
+	$(srcdir)/../bfdwin.c		\
+	$(srcdir)/../section.c 		\
+	$(srcdir)/../archures.c		\
+	$(srcdir)/../reloc.c		\
+	$(srcdir)/../syms.c		\
+	$(srcdir)/../bfd.c		\
+	$(srcdir)/../archive.c		\
+	$(srcdir)/../corefile.c		\
+	$(srcdir)/../targets.c		\
+	$(srcdir)/../format.c		\
+	$(srcdir)/../linker.c		\
+	$(srcdir)/../simple.c		\
+	$(srcdir)/../compress.c		\
+	$(srcdir)/header.sed		\
+	$(srcdir)/proto.str		\
+	$(srcdir)/../version.h		\
+	$(MKDOC)
+
+bfd.h: $(BFD_H_DEP)
+	echo "$(BFD_H_DEP)" | sed -f $(srcdir)/header.sed > $@
+	for file in $(BFD_H_DEP); do \
+	  case $$file in \
+	    *-in.h) cat $$file >> $@ ;; \
+	    */header.sed) break ;; \
+	    *)	echo $$file | sed -e 's,.*/,,' -e 's,^,/* Extracted from ,' \
+				-e 's,$$,.  */,' >> $@ ; \
+		./$(MKDOC) -f $(srcdir)/proto.str < $$file >> $@ ;; \
+	  esac; \
+	done
+	echo "#ifdef __cplusplus" >> $@
+	echo "}" >> $@
+	echo "#endif" >> $@
+	echo "#endif" >> $@
+
+####bfdver.texi: $(srcdir)/Makefile.in
+####	@echo "creating $@"; \
+####	echo "@set VERSION $(VERSION)" > bfdver.texi; \
+####	if [ -n "$(PKGVERSION)" ]; then \
+####	  echo "@set VERSION_PACKAGE $(PKGVERSION)" >> bfdver.texi; \
+####	fi; \
+####	echo "@set UPDATED `date '+%B %Y'`" >> bfdver.texi; \
+####	if [ -n "$(REPORT_BUGS_TEXI)" ]; then \
+####	  echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> bfdver.texi; \
+####	fi
+
+####noinst_TEXINFOS = bfdint.texi
+
+MOSTLYCLEANFILES = $(MKDOC) *.o
+
+CLEANFILES = *.p *.ip
+
+DISTCLEANFILES = bfd.?? bfd.??? bfd.h libbfd.h libcoff.h texput.log
+
+####MAINTAINERCLEANFILES = $(DOCFILES)
+
+# We want install to imply install-info as per GNU standards, despite the
+# cygnus option.
+####install: install-info
+
+####MAINTAINERCLEANFILES += bfd.info
+
+# Automake 1.9 will only build info files in the objdir if they are
+# mentioned in DISTCLEANFILES.  It doesn't have to be unconditional,
+# though, so we use a bogus condition.
+####if GENINSRC_NEVER
+####DISTCLEANFILES += bfd.info
+####endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/doc/Makefile.in sdcc-3.2.0+dfsg/support/sdbinutils/bfd/doc/Makefile.in
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/doc/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/doc/Makefile.in	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,688 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = doc
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
+	$(top_srcdir)/../config/depstand.m4 \
+	$(top_srcdir)/../config/gettext-sister.m4 \
+	$(top_srcdir)/../config/largefile.m4 \
+	$(top_srcdir)/../config/lead-dot.m4 \
+	$(top_srcdir)/../config/nls.m4 \
+	$(top_srcdir)/../config/override.m4 \
+	$(top_srcdir)/../config/plugins.m4 \
+	$(top_srcdir)/../config/po.m4 \
+	$(top_srcdir)/../config/progtest.m4 \
+	$(top_srcdir)/../config/stdint.m4 $(top_srcdir)/../libtool.m4 \
+	$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
+	$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
+	$(top_srcdir)/bfd.m4 $(top_srcdir)/warning.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/../config/zlib.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+depcomp =
+am__depfiles_maybe =
+SOURCES =
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BFD_HOSTPTR_T = @BFD_HOSTPTR_T@
+BFD_HOST_64BIT_LONG = @BFD_HOST_64BIT_LONG@
+BFD_HOST_64BIT_LONG_LONG = @BFD_HOST_64BIT_LONG_LONG@
+BFD_HOST_64_BIT = @BFD_HOST_64_BIT@
+BFD_HOST_64_BIT_DEFINED = @BFD_HOST_64_BIT_DEFINED@
+BFD_HOST_U_64_BIT = @BFD_HOST_U_64_BIT@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+COREFILE = @COREFILE@
+COREFLAG = @COREFLAG@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEBUGDIR = @DEBUGDIR@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
+FGREP = @FGREP@
+GENCAT = @GENCAT@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HDEFINES = @HDEFINES@
+INCINTL = @INCINTL@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBINTL = @LIBINTL@
+LIBINTL_DEP = @LIBINTL_DEP@
+LIBM = @LIBM@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NO_WERROR = @NO_WERROR@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKGVERSION = @PKGVERSION@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+REPORT_BUGS_TEXI = @REPORT_BUGS_TEXI@
+REPORT_BUGS_TO = @REPORT_BUGS_TO@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHARED_LDFLAGS = @SHARED_LDFLAGS@
+SHARED_LIBADD = @SHARED_LIBADD@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TDEFINES = @TDEFINES@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+all_backends = @all_backends@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bfd64_libs = @bfd64_libs@
+bfd_backends = @bfd_backends@
+bfd_default_target_size = @bfd_default_target_size@
+bfd_file_ptr = @bfd_file_ptr@
+bfd_machines = @bfd_machines@
+bfd_ufile_ptr = @bfd_ufile_ptr@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+havevecs = @havevecs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_noncanonical = @host_noncanonical@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+supports_plugins = @supports_plugins@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_noncanonical = @target_noncanonical@
+target_os = @target_os@
+target_vendor = @target_vendor@
+tdefaults = @tdefaults@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+wordsize = @wordsize@
+AUTOMAKE_OPTIONS = 1.9 cygnus
+
+####DOCFILES = aoutx.texi  archive.texi archures.texi \
+####	bfdt.texi  cache.texi coffcode.texi \
+####	core.texi elf.texi elfcode.texi  format.texi \
+####	libbfd.texi bfdwin.texi bfdio.texi \
+####	opncls.texi  reloc.texi  section.texi  \
+####	syms.texi  targets.texi init.texi hash.texi linker.texi \
+####	mmo.texi \
+####	bfdver.texi
+PROTOS = archive.p archures.p bfd.p \
+	 core.p format.p \
+	bfdio.p bfdwin.p \
+	libbfd.p opncls.p reloc.p \
+	section.p syms.p targets.p  \
+	format.p  core.p init.p
+
+IPROTOS = cache.ip libbfd.ip reloc.ip init.ip archures.ip coffcode.ip
+
+# SRCDOC, SRCPROT, SRCIPROT only used to sidestep Sun Make bug in interaction 
+# between VPATH and suffix rules.  If you use GNU Make, perhaps other Makes,
+# you don't need these three:
+SRCDOC = $(srcdir)/../aoutx.h  $(srcdir)/../archive.c \
+	$(srcdir)/../archures.c $(srcdir)/../bfd.c \
+	$(srcdir)/../bfdio.c $(srcdir)/../bfdwin.c \
+	$(srcdir)/../cache.c $(srcdir)/../coffcode.h \
+	$(srcdir)/../corefile.c $(srcdir)/../elf.c \
+	$(srcdir)/../elfcode.h  $(srcdir)/../format.c \
+	$(srcdir)/../libbfd.c $(srcdir)/../opncls.c \
+	$(srcdir)/../reloc.c  $(srcdir)/../section.c \
+	$(srcdir)/../syms.c  $(srcdir)/../targets.c \
+	$(srcdir)/../hash.c $(srcdir)/../linker.c \
+	$(srcdir)/../mmo.c
+
+SRCPROT = $(srcdir)/../archive.c $(srcdir)/../archures.c \
+	$(srcdir)/../bfd.c $(srcdir)/../coffcode.h $(srcdir)/../corefile.c \
+	$(srcdir)/../format.c $(srcdir)/../libbfd.c \
+	$(srcdir)/../bfdio.c $(srcdir)/../bfdwin.c \
+	$(srcdir)/../opncls.c $(srcdir)/../reloc.c \
+	$(srcdir)/../section.c $(srcdir)/../syms.c \
+	$(srcdir)/../targets.c $(srcdir)/../init.c
+
+SRCIPROT = $(srcdir)/../cache.c $(srcdir)/../libbfd.c \
+	$(srcdir)/../bfdio.c $(srcdir)/../bfdwin.c \
+	$(srcdir)/../reloc.c $(srcdir)/../cpu-h8300.c \
+	$(srcdir)/../cpu-i960.c $(srcdir)/../archures.c \
+	$(srcdir)/../init.c
+
+
+####TEXIDIR = $(srcdir)/../../texinfo/fsf
+
+####info_TEXINFOS = bfd.texinfo
+####bfd_TEXINFOS = $(DOCFILES) bfdsumm.texi
+MKDOC = chew$(EXEEXT_FOR_BUILD)
+AM_CPPFLAGS = -I.. -I$(srcdir)/.. -I$(srcdir)/../../include \
+	-I$(srcdir)/../../intl -I../../intl
+
+
+# We can't replace these rules with an implicit rule, because
+# makes without VPATH support couldn't find the .h files in `..'.
+
+# We do not depend on chew directly so that we can distribute the info
+# files, and permit people to rebuild them, without requiring the makeinfo
+# program.  If somebody tries to rebuild info, but none of the .texi files
+# have changed, then nothing will be rebuilt.
+
+####aoutx.texi: chew.c $(srcdir)/../aoutx.h $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../aoutx.h >aoutx.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change aoutx.tmp aoutx.texi
+
+####archive.texi: chew.c $(srcdir)/../archive.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../archive.c >archive.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change archive.tmp archive.texi
+
+####archures.texi: chew.c $(srcdir)/../archures.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../archures.c >archures.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change archures.tmp archures.texi
+
+# We use bfdt.texi, rather than bfd.texi, to avoid conflicting with
+# bfd.texinfo on an 8.3 filesystem.
+####bfdt.texi: chew.c $(srcdir)/../bfd.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../bfd.c >bfd.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change bfd.tmp bfdt.texi
+
+####cache.texi: chew.c $(srcdir)/../cache.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../cache.c >cache.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change cache.tmp cache.texi
+
+####coffcode.texi: chew.c $(srcdir)/../coffcode.h $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../coffcode.h >coffcode.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change coffcode.tmp coffcode.texi
+
+####core.texi: chew.c $(srcdir)/../corefile.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../corefile.c >core.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change core.tmp core.texi
+
+####elf.texi: chew.c $(srcdir)/../elf.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../elf.c >elf.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change elf.tmp elf.texi
+
+####elfcode.texi: chew.c $(srcdir)/../elfcode.h $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../elfcode.h >elfcode.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change elfcode.tmp elfcode.texi
+
+####mmo.texi: chew.c $(srcdir)/../mmo.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../mmo.c >mmo.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change mmo.tmp mmo.texi
+
+####format.texi: chew.c $(srcdir)/../format.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../format.c >format.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change format.tmp format.texi
+
+####libbfd.texi: chew.c $(srcdir)/../libbfd.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../libbfd.c >libbfd.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change libbfd.tmp libbfd.texi
+
+####bfdio.texi: chew.c $(srcdir)/../bfdio.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../bfdio.c >bfdio.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change bfdio.tmp bfdio.texi
+
+####bfdwin.texi: chew.c $(srcdir)/../bfdwin.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../bfdwin.c >bfdwin.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change bfdwin.tmp bfdwin.texi
+
+####opncls.texi: chew.c $(srcdir)/../opncls.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str  <$(srcdir)/../opncls.c >opncls.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change opncls.tmp opncls.texi
+
+####reloc.texi: chew.c $(srcdir)/../reloc.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../reloc.c >reloc.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change reloc.tmp reloc.texi
+
+####section.texi: chew.c $(srcdir)/../section.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../section.c >section.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change section.tmp section.texi
+
+####syms.texi: chew.c $(srcdir)/../syms.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../syms.c >syms.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change syms.tmp syms.texi
+
+####targets.texi: chew.c $(srcdir)/../targets.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../targets.c >targets.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change targets.tmp targets.texi
+
+####init.texi: chew.c $(srcdir)/../init.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../init.c >init.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change init.tmp init.texi
+
+####hash.texi: chew.c $(srcdir)/../hash.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../hash.c >hash.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change hash.tmp hash.texi
+
+####linker.texi: chew.c $(srcdir)/../linker.c $(srcdir)/doc.str
+####	$(MAKE) $(MKDOC)
+####	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../linker.c >linker.tmp
+####	$(SHELL) $(srcdir)/../../move-if-change linker.tmp linker.texi
+LIBBFD_H_DEP = \
+	$(srcdir)/../libbfd-in.h	\
+	$(srcdir)/../init.c		\
+	$(srcdir)/../libbfd.c		\
+	$(srcdir)/../bfdio.c		\
+	$(srcdir)/../bfdwin.c		\
+	$(srcdir)/../cache.c		\
+	$(srcdir)/../reloc.c		\
+	$(srcdir)/../archures.c		\
+	$(srcdir)/../elf.c		\
+	$(srcdir)/header.sed		\
+	$(srcdir)/proto.str		\
+	$(MKDOC)
+
+LIBCOFF_H_DEP = \
+	$(srcdir)/../libcoff-in.h	\
+	$(srcdir)/../coffcode.h		\
+	$(srcdir)/header.sed		\
+	$(srcdir)/proto.str		\
+	$(MKDOC)
+
+BFD_H_DEP = \
+	$(srcdir)/../bfd-in.h 		\
+	$(srcdir)/../init.c 		\
+	$(srcdir)/../opncls.c 		\
+	$(srcdir)/../libbfd.c 		\
+	$(srcdir)/../bfdio.c		\
+	$(srcdir)/../bfdwin.c		\
+	$(srcdir)/../section.c 		\
+	$(srcdir)/../archures.c		\
+	$(srcdir)/../reloc.c		\
+	$(srcdir)/../syms.c		\
+	$(srcdir)/../bfd.c		\
+	$(srcdir)/../archive.c		\
+	$(srcdir)/../corefile.c		\
+	$(srcdir)/../targets.c		\
+	$(srcdir)/../format.c		\
+	$(srcdir)/../linker.c		\
+	$(srcdir)/../simple.c		\
+	$(srcdir)/../compress.c		\
+	$(srcdir)/header.sed		\
+	$(srcdir)/proto.str		\
+	$(srcdir)/../version.h		\
+	$(MKDOC)
+
+
+####bfdver.texi: $(srcdir)/Makefile.in
+####	@echo "creating $@"; \
+####	echo "@set VERSION $(VERSION)" > bfdver.texi; \
+####	if [ -n "$(PKGVERSION)" ]; then \
+####	  echo "@set VERSION_PACKAGE $(PKGVERSION)" >> bfdver.texi; \
+####	fi; \
+####	echo "@set UPDATED `date '+%B %Y'`" >> bfdver.texi; \
+####	if [ -n "$(REPORT_BUGS_TEXI)" ]; then \
+####	  echo "@set BUGURL $(REPORT_BUGS_TEXI)" >> bfdver.texi; \
+####	fi
+
+####noinst_TEXINFOS = bfdint.texi
+MOSTLYCLEANFILES = $(MKDOC) *.o
+CLEANFILES = *.p *.ip
+DISTCLEANFILES = bfd.?? bfd.??? bfd.h libbfd.h libcoff.h texput.log
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign doc/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+check-am:
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+
+
+$(MKDOC): $(srcdir)/chew.c
+	$(CC_FOR_BUILD) -o chew.$$$$ $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \
+	  $(H_CFLAGS) $(AM_CPPFLAGS) $(srcdir)/chew.c; \
+	$(SHELL) $(srcdir)/../../move-if-change chew.$$$$ $(MKDOC)
+
+protos: libbfd.h libcoff.h bfd.h
+
+libbfd.h: $(LIBBFD_H_DEP)
+	echo "$(LIBBFD_H_DEP)" | sed -f $(srcdir)/header.sed > $@
+	for file in $(LIBBFD_H_DEP); do \
+	  case $$file in \
+	    *-in.h) cat $$file >> $@ ;; \
+	    */header.sed) break ;; \
+	    *)	echo $$file | sed -e 's,.*/,,' -e 's,^,/* Extracted from ,' \
+				-e 's,$$,.  */,' >> $@ ; \
+		./$(MKDOC) -i -f $(srcdir)/proto.str < $$file >> $@ ;; \
+	  esac; \
+	done
+
+libcoff.h: $(LIBCOFF_H_DEP)
+	echo "$(LIBCOFF_H_DEP)" | sed -f $(srcdir)/header.sed > $@
+	for file in $(LIBCOFF_H_DEP); do \
+	  case $$file in \
+	    *-in.h) cat $$file >> $@ ;; \
+	    */header.sed) break ;; \
+	    *)	echo $$file | sed -e 's,.*/,,' -e 's,^,/* Extracted from ,' \
+				-e 's,$$,.  */,' >> $@ ; \
+		./$(MKDOC) -i -f $(srcdir)/proto.str < $$file >> $@ ;; \
+	  esac; \
+	done
+
+bfd.h: $(BFD_H_DEP)
+	echo "$(BFD_H_DEP)" | sed -f $(srcdir)/header.sed > $@
+	for file in $(BFD_H_DEP); do \
+	  case $$file in \
+	    *-in.h) cat $$file >> $@ ;; \
+	    */header.sed) break ;; \
+	    *)	echo $$file | sed -e 's,.*/,,' -e 's,^,/* Extracted from ,' \
+				-e 's,$$,.  */,' >> $@ ; \
+		./$(MKDOC) -f $(srcdir)/proto.str < $$file >> $@ ;; \
+	  esac; \
+	done
+	echo "#ifdef __cplusplus" >> $@
+	echo "}" >> $@
+	echo "#endif" >> $@
+	echo "#endif" >> $@
+
+####MAINTAINERCLEANFILES = $(DOCFILES)
+
+# We want install to imply install-info as per GNU standards, despite the
+# cygnus option.
+####install: install-info
+
+####MAINTAINERCLEANFILES += bfd.info
+
+# Automake 1.9 will only build info files in the objdir if they are
+# mentioned in DISTCLEANFILES.  It doesn't have to be unconditional,
+# though, so we use a bogus condition.
+####if GENINSRC_NEVER
+####DISTCLEANFILES += bfd.info
+####endif
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/doc/chew.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/doc/chew.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/doc/chew.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/doc/chew.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1571 @@
+/* chew
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001,
+   2002, 2003, 2005, 2007, 2009
+   Free Software Foundation, Inc.
+   Contributed by steve chamberlain @cygnus
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* Yet another way of extracting documentation from source.
+   No, I haven't finished it yet, but I hope you people like it better
+   than the old way
+
+   sac
+
+   Basically, this is a sort of string forth, maybe we should call it
+   struth?
+
+   You define new words thus:
+   : <newword> <oldwords> ;
+
+*/
+
+/* Primitives provided by the program:
+
+   Two stacks are provided, a string stack and an integer stack.
+
+   Internal state variables:
+	internal_wanted - indicates whether `-i' was passed
+	internal_mode - user-settable
+
+   Commands:
+	push_text
+	! - pop top of integer stack for address, pop next for value; store
+	@ - treat value on integer stack as the address of an integer; push
+		that integer on the integer stack after popping the "address"
+	hello - print "hello\n" to stdout
+	stdout - put stdout marker on TOS
+	stderr - put stderr marker on TOS
+	print - print TOS-1 on TOS (eg: "hello\n" stdout print)
+	skip_past_newline
+	catstr - fn icatstr
+	copy_past_newline - append input, up to and including newline into TOS
+	dup - fn other_dup
+	drop - discard TOS
+	idrop - ditto
+	remchar - delete last character from TOS
+	get_stuff_in_command
+	do_fancy_stuff - translate <<foo>> to @code{foo} in TOS
+	bulletize - if "o" lines found, prepend @itemize @bullet to TOS
+		and @item to each "o" line; append @end itemize
+	courierize - put @example around . and | lines, translate {* *} { }
+	exit - fn chew_exit
+	swap
+	outputdots - strip out lines without leading dots
+	paramstuff - convert full declaration into "PARAMS" form if not already
+	maybecatstr - do catstr if internal_mode == internal_wanted, discard
+		value in any case
+	translatecomments - turn {* and *} into comment delimiters
+	kill_bogus_lines - get rid of extra newlines
+	indent
+	internalmode - pop from integer stack, set `internalmode' to that value
+	print_stack_level - print current stack depth to stderr
+	strip_trailing_newlines - go ahead, guess...
+	[quoted string] - push string onto string stack
+	[word starting with digit] - push atol(str) onto integer stack
+
+   A command must be all upper-case, and alone on a line.
+
+   Foo.  */
+
+#include "ansidecl.h"
+#include <assert.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define DEF_SIZE 5000
+#define STACK 50
+
+int internal_wanted;
+int internal_mode;
+
+int warning;
+
+/* Here is a string type ...  */
+
+typedef struct buffer
+{
+  char *ptr;
+  unsigned long write_idx;
+  unsigned long size;
+} string_type;
+
+#ifdef __STDC__
+static void init_string_with_size (string_type *, unsigned int);
+static void init_string (string_type *);
+static int find (string_type *, char *);
+static void write_buffer (string_type *, FILE *);
+static void delete_string (string_type *);
+static char *addr (string_type *, unsigned int);
+static char at (string_type *, unsigned int);
+static void catchar (string_type *, int);
+static void overwrite_string (string_type *, string_type *);
+static void catbuf (string_type *, char *, unsigned int);
+static void cattext (string_type *, char *);
+static void catstr (string_type *, string_type *);
+static void die (char *);
+#endif
+
+static void
+init_string_with_size (buffer, size)
+     string_type *buffer;
+     unsigned int size;
+{
+  buffer->write_idx = 0;
+  buffer->size = size;
+  buffer->ptr = (char *) malloc (size);
+}
+
+static void
+init_string (buffer)
+     string_type *buffer;
+{
+  init_string_with_size (buffer, DEF_SIZE);
+}
+
+static int
+find (str, what)
+     string_type *str;
+     char *what;
+{
+  unsigned int i;
+  char *p;
+  p = what;
+  for (i = 0; i < str->write_idx && *p; i++)
+    {
+      if (*p == str->ptr[i])
+	p++;
+      else
+	p = what;
+    }
+  return (*p == 0);
+}
+
+static void
+write_buffer (buffer, f)
+     string_type *buffer;
+     FILE *f;
+{
+  if (buffer->write_idx != 0
+      && fwrite (buffer->ptr, buffer->write_idx, 1, f) != 1)
+    die ("cannot write output");
+}
+
+static void
+delete_string (buffer)
+     string_type *buffer;
+{
+  free (buffer->ptr);
+}
+
+static char *
+addr (buffer, idx)
+     string_type *buffer;
+     unsigned int idx;
+{
+  return buffer->ptr + idx;
+}
+
+static char
+at (buffer, pos)
+     string_type *buffer;
+     unsigned int pos;
+{
+  if (pos >= buffer->write_idx)
+    return 0;
+  return buffer->ptr[pos];
+}
+
+static void
+catchar (buffer, ch)
+     string_type *buffer;
+     int ch;
+{
+  if (buffer->write_idx == buffer->size)
+    {
+      buffer->size *= 2;
+      buffer->ptr = (char *) realloc (buffer->ptr, buffer->size);
+    }
+
+  buffer->ptr[buffer->write_idx++] = ch;
+}
+
+static void
+overwrite_string (dst, src)
+     string_type *dst;
+     string_type *src;
+{
+  free (dst->ptr);
+  dst->size = src->size;
+  dst->write_idx = src->write_idx;
+  dst->ptr = src->ptr;
+}
+
+static void
+catbuf (buffer, buf, len)
+     string_type *buffer;
+     char *buf;
+     unsigned int len;
+{
+  if (buffer->write_idx + len >= buffer->size)
+    {
+      while (buffer->write_idx + len >= buffer->size)
+	buffer->size *= 2;
+      buffer->ptr = (char *) realloc (buffer->ptr, buffer->size);
+    }
+  memcpy (buffer->ptr + buffer->write_idx, buf, len);
+  buffer->write_idx += len;
+}
+
+static void
+cattext (buffer, string)
+     string_type *buffer;
+     char *string;
+{
+  catbuf (buffer, string, (unsigned int) strlen (string));
+}
+
+static void
+catstr (dst, src)
+     string_type *dst;
+     string_type *src;
+{
+  catbuf (dst, src->ptr, src->write_idx);
+}
+
+static unsigned int
+skip_white_and_stars (src, idx)
+     string_type *src;
+     unsigned int idx;
+{
+  char c;
+  while ((c = at (src, idx)),
+	 isspace ((unsigned char) c)
+	 || (c == '*'
+	     /* Don't skip past end-of-comment or star as first
+		character on its line.  */
+	     && at (src, idx +1) != '/'
+	     && at (src, idx -1) != '\n'))
+    idx++;
+  return idx;
+}
+
+/***********************************************************************/
+
+string_type stack[STACK];
+string_type *tos;
+
+unsigned int idx = 0; /* Pos in input buffer */
+string_type *ptr; /* and the buffer */
+typedef void (*stinst_type)();
+stinst_type *pc;
+stinst_type sstack[STACK];
+stinst_type *ssp = &sstack[0];
+long istack[STACK];
+long *isp = &istack[0];
+
+typedef int *word_type;
+
+struct dict_struct
+{
+  char *word;
+  struct dict_struct *next;
+  stinst_type *code;
+  int code_length;
+  int code_end;
+  int var;
+};
+
+typedef struct dict_struct dict_type;
+
+static void
+die (msg)
+     char *msg;
+{
+  fprintf (stderr, "%s\n", msg);
+  exit (1);
+}
+
+static void
+check_range ()
+{
+  if (tos < stack)
+    die ("underflow in string stack");
+  if (tos >= stack + STACK)
+    die ("overflow in string stack");
+}
+
+static void
+icheck_range ()
+{
+  if (isp < istack)
+    die ("underflow in integer stack");
+  if (isp >= istack + STACK)
+    die ("overflow in integer stack");
+}
+
+#ifdef __STDC__
+static void exec (dict_type *);
+static void call (void);
+static void remchar (void), strip_trailing_newlines (void), push_number (void);
+static void push_text (void);
+static void remove_noncomments (string_type *, string_type *);
+static void print_stack_level (void);
+static void paramstuff (void), translatecomments (void);
+static void outputdots (void), courierize (void), bulletize (void);
+static void do_fancy_stuff (void);
+static int iscommand (string_type *, unsigned int);
+static int copy_past_newline (string_type *, unsigned int, string_type *);
+static void icopy_past_newline (void), kill_bogus_lines (void), indent (void);
+static void get_stuff_in_command (void), swap (void), other_dup (void);
+static void drop (void), idrop (void);
+static void icatstr (void), skip_past_newline (void), internalmode (void);
+static void maybecatstr (void);
+static char *nextword (char *, char **);
+dict_type *lookup_word (char *);
+static void perform (void);
+dict_type *newentry (char *);
+unsigned int add_to_definition (dict_type *, stinst_type);
+void add_intrinsic (char *, void (*)());
+void add_var (char *);
+void compile (char *);
+static void bang (void);
+static void atsign (void);
+static void hello (void);
+static void stdout_ (void);
+static void stderr_ (void);
+static void print (void);
+static void read_in (string_type *, FILE *);
+static void usage (void);
+static void chew_exit (void);
+#endif
+
+static void
+exec (word)
+     dict_type *word;
+{
+  pc = word->code;
+  while (*pc)
+    (*pc) ();
+}
+
+static void
+call ()
+{
+  stinst_type *oldpc = pc;
+  dict_type *e;
+  e = (dict_type *) (pc[1]);
+  exec (e);
+  pc = oldpc + 2;
+}
+
+static void
+remchar ()
+{
+  if (tos->write_idx)
+    tos->write_idx--;
+  pc++;
+}
+
+static void
+strip_trailing_newlines ()
+{
+  while ((isspace ((unsigned char) at (tos, tos->write_idx - 1))
+	  || at (tos, tos->write_idx - 1) == '\n')
+	 && tos->write_idx > 0)
+    tos->write_idx--;
+  pc++;
+}
+
+static void
+push_number ()
+{
+  isp++;
+  icheck_range ();
+  pc++;
+  *isp = (long) (*pc);
+  pc++;
+}
+
+static void
+push_text ()
+{
+  tos++;
+  check_range ();
+  init_string (tos);
+  pc++;
+  cattext (tos, *((char **) pc));
+  pc++;
+}
+
+/* This function removes everything not inside comments starting on
+   the first char of the line from the  string, also when copying
+   comments, removes blank space and leading *'s.
+   Blank lines are turned into one blank line.  */
+
+static void
+remove_noncomments (src, dst)
+     string_type *src;
+     string_type *dst;
+{
+  unsigned int idx = 0;
+
+  while (at (src, idx))
+    {
+      /* Now see if we have a comment at the start of the line.  */
+      if (at (src, idx) == '\n'
+	  && at (src, idx + 1) == '/'
+	  && at (src, idx + 2) == '*')
+	{
+	  idx += 3;
+
+	  idx = skip_white_and_stars (src, idx);
+
+	  /* Remove leading dot */
+	  if (at (src, idx) == '.')
+	    idx++;
+
+	  /* Copy to the end of the line, or till the end of the
+	     comment.  */
+	  while (at (src, idx))
+	    {
+	      if (at (src, idx) == '\n')
+		{
+		  /* end of line, echo and scrape of leading blanks  */
+		  if (at (src, idx + 1) == '\n')
+		    catchar (dst, '\n');
+		  catchar (dst, '\n');
+		  idx++;
+		  idx = skip_white_and_stars (src, idx);
+		}
+	      else if (at (src, idx) == '*' && at (src, idx + 1) == '/')
+		{
+		  idx += 2;
+		  cattext (dst, "\nENDDD\n");
+		  break;
+		}
+	      else
+		{
+		  catchar (dst, at (src, idx));
+		  idx++;
+		}
+	    }
+	}
+      else
+	idx++;
+    }
+}
+
+static void
+print_stack_level ()
+{
+  fprintf (stderr, "current string stack depth = %d, ", tos - stack);
+  fprintf (stderr, "current integer stack depth = %d\n", isp - istack);
+  pc++;
+}
+
+/* turn:
+     foobar name(stuff);
+   into:
+     foobar
+     name PARAMS ((stuff));
+   and a blank line.
+ */
+
+static void
+paramstuff ()
+{
+  unsigned int openp;
+  unsigned int fname;
+  unsigned int idx;
+  unsigned int len;
+  string_type out;
+  init_string (&out);
+
+#define NO_PARAMS 1
+
+  /* Make sure that it's not already param'd or proto'd.  */
+  if (NO_PARAMS
+      || find (tos, "PARAMS") || find (tos, "PROTO") || !find (tos, "("))
+    {
+      catstr (&out, tos);
+    }
+  else
+    {
+      /* Find the open paren.  */
+      for (openp = 0; at (tos, openp) != '(' && at (tos, openp); openp++)
+	;
+
+      fname = openp;
+      /* Step back to the fname.  */
+      fname--;
+      while (fname && isspace ((unsigned char) at (tos, fname)))
+	fname--;
+      while (fname
+	     && !isspace ((unsigned char) at (tos,fname))
+	     && at (tos,fname) != '*')
+	fname--;
+
+      fname++;
+
+      /* Output type, omitting trailing whitespace character(s), if
+         any.  */
+      for (len = fname; 0 < len; len--)
+	{
+	  if (!isspace ((unsigned char) at (tos, len - 1)))
+	    break;
+	}
+      for (idx = 0; idx < len; idx++)
+	catchar (&out, at (tos, idx));
+
+      cattext (&out, "\n");	/* Insert a newline between type and fnname */
+
+      /* Output function name, omitting trailing whitespace
+         character(s), if any.  */
+      for (len = openp; 0 < len; len--)
+	{
+	  if (!isspace ((unsigned char) at (tos, len - 1)))
+	    break;
+	}
+      for (idx = fname; idx < len; idx++)
+	catchar (&out, at (tos, idx));
+
+      cattext (&out, " PARAMS (");
+
+      for (idx = openp; at (tos, idx) && at (tos, idx) != ';'; idx++)
+	catchar (&out, at (tos, idx));
+
+      cattext (&out, ");\n\n");
+    }
+  overwrite_string (tos, &out);
+  pc++;
+
+}
+
+/* turn {*
+   and *} into comments */
+
+static void
+translatecomments ()
+{
+  unsigned int idx = 0;
+  string_type out;
+  init_string (&out);
+
+  while (at (tos, idx))
+    {
+      if (at (tos, idx) == '{' && at (tos, idx + 1) == '*')
+	{
+	  cattext (&out, "/*");
+	  idx += 2;
+	}
+      else if (at (tos, idx) == '*' && at (tos, idx + 1) == '}')
+	{
+	  cattext (&out, "*/");
+	  idx += 2;
+	}
+      else
+	{
+	  catchar (&out, at (tos, idx));
+	  idx++;
+	}
+    }
+
+  overwrite_string (tos, &out);
+
+  pc++;
+}
+
+/* Mod tos so that only lines with leading dots remain */
+static void
+outputdots ()
+{
+  unsigned int idx = 0;
+  string_type out;
+  init_string (&out);
+
+  while (at (tos, idx))
+    {
+      if (at (tos, idx) == '\n' && at (tos, idx + 1) == '.')
+	{
+	  char c;
+	  idx += 2;
+
+	  while ((c = at (tos, idx)) && c != '\n')
+	    {
+	      if (c == '{' && at (tos, idx + 1) == '*')
+		{
+		  cattext (&out, "/*");
+		  idx += 2;
+		}
+	      else if (c == '*' && at (tos, idx + 1) == '}')
+		{
+		  cattext (&out, "*/");
+		  idx += 2;
+		}
+	      else
+		{
+		  catchar (&out, c);
+		  idx++;
+		}
+	    }
+	  catchar (&out, '\n');
+	}
+      else
+	{
+	  idx++;
+	}
+    }
+
+  overwrite_string (tos, &out);
+  pc++;
+}
+
+/* Find lines starting with . and | and put example around them on tos */
+static void
+courierize ()
+{
+  string_type out;
+  unsigned int idx = 0;
+  int command = 0;
+
+  init_string (&out);
+
+  while (at (tos, idx))
+    {
+      if (at (tos, idx) == '\n'
+	  && (at (tos, idx +1 ) == '.'
+	      || at (tos, idx + 1) == '|'))
+	{
+	  cattext (&out, "\n@example\n");
+	  do
+	    {
+	      idx += 2;
+
+	      while (at (tos, idx) && at (tos, idx) != '\n')
+		{
+		  if (command > 1)
+		    {
+		      /* We are inside {} parameters of some command;
+			 Just pass through until matching brace.  */
+		      if (at (tos, idx) == '{')
+			++command;
+		      else if (at (tos, idx) == '}')
+			--command;
+		    }
+		  else if (command != 0)
+		    {
+		      if (at (tos, idx) == '{')
+			++command;
+		      else if (!islower ((unsigned char) at (tos, idx)))
+			--command;
+		    }
+		  else if (at (tos, idx) == '@'
+			   && islower ((unsigned char) at (tos, idx + 1)))
+		    {
+		      ++command;
+		    }
+		  else if (at (tos, idx) == '{' && at (tos, idx + 1) == '*')
+		    {
+		      cattext (&out, "/*");
+		      idx += 2;
+		      continue;
+		    }
+		  else if (at (tos, idx) == '*' && at (tos, idx + 1) == '}')
+		    {
+		      cattext (&out, "*/");
+		      idx += 2;
+		      continue;
+		    }
+		  else if (at (tos, idx) == '{'
+			   || at (tos, idx) == '}')
+		    {
+		      catchar (&out, '@');
+		    }
+
+		  catchar (&out, at (tos, idx));
+		  idx++;
+		}
+	      catchar (&out, '\n');
+	    }
+	  while (at (tos, idx) == '\n'
+		 && ((at (tos, idx + 1) == '.')
+		     || (at (tos, idx + 1) == '|')))
+	    ;
+	  cattext (&out, "@end example");
+	}
+      else
+	{
+	  catchar (&out, at (tos, idx));
+	  idx++;
+	}
+    }
+
+  overwrite_string (tos, &out);
+  pc++;
+}
+
+/* Finds any lines starting with "o ", if there are any, then turns
+   on @itemize @bullet, and @items each of them. Then ends with @end
+   itemize, inplace at TOS*/
+
+static void
+bulletize ()
+{
+  unsigned int idx = 0;
+  int on = 0;
+  string_type out;
+  init_string (&out);
+
+  while (at (tos, idx))
+    {
+      if (at (tos, idx) == '@'
+	  && at (tos, idx + 1) == '*')
+	{
+	  cattext (&out, "*");
+	  idx += 2;
+	}
+      else if (at (tos, idx) == '\n'
+	       && at (tos, idx + 1) == 'o'
+	       && isspace ((unsigned char) at (tos, idx + 2)))
+	{
+	  if (!on)
+	    {
+	      cattext (&out, "\n@itemize @bullet\n");
+	      on = 1;
+
+	    }
+	  cattext (&out, "\n@item\n");
+	  idx += 3;
+	}
+      else
+	{
+	  catchar (&out, at (tos, idx));
+	  if (on && at (tos, idx) == '\n'
+	      && at (tos, idx + 1) == '\n'
+	      && at (tos, idx + 2) != 'o')
+	    {
+	      cattext (&out, "@end itemize");
+	      on = 0;
+	    }
+	  idx++;
+
+	}
+    }
+  if (on)
+    {
+      cattext (&out, "@end itemize\n");
+    }
+
+  delete_string (tos);
+  *tos = out;
+  pc++;
+}
+
+/* Turn <<foo>> into @code{foo} in place at TOS*/
+
+static void
+do_fancy_stuff ()
+{
+  unsigned int idx = 0;
+  string_type out;
+  init_string (&out);
+  while (at (tos, idx))
+    {
+      if (at (tos, idx) == '<'
+	  && at (tos, idx + 1) == '<'
+	  && !isspace ((unsigned char) at (tos, idx + 2)))
+	{
+	  /* This qualifies as a << startup.  */
+	  idx += 2;
+	  cattext (&out, "@code{");
+	  while (at (tos, idx)
+		 && at (tos, idx) != '>' )
+	    {
+	      catchar (&out, at (tos, idx));
+	      idx++;
+
+	    }
+	  cattext (&out, "}");
+	  idx += 2;
+	}
+      else
+	{
+	  catchar (&out, at (tos, idx));
+	  idx++;
+	}
+    }
+  delete_string (tos);
+  *tos = out;
+  pc++;
+
+}
+
+/* A command is all upper case,and alone on a line.  */
+
+static int
+iscommand (ptr, idx)
+     string_type *ptr;
+     unsigned int idx;
+{
+  unsigned int len = 0;
+  while (at (ptr, idx))
+    {
+      if (isupper ((unsigned char) at (ptr, idx))
+	  || at (ptr, idx) == ' ' || at (ptr, idx) == '_')
+	{
+	  len++;
+	  idx++;
+	}
+      else if (at (ptr, idx) == '\n')
+	{
+	  if (len > 3)
+	    return 1;
+	  return 0;
+	}
+      else
+	return 0;
+    }
+  return 0;
+}
+
+static int
+copy_past_newline (ptr, idx, dst)
+     string_type *ptr;
+     unsigned int idx;
+     string_type *dst;
+{
+  int column = 0;
+
+  while (at (ptr, idx) && at (ptr, idx) != '\n')
+    {
+      if (at (ptr, idx) == '\t')
+	{
+	  /* Expand tabs.  Neither makeinfo nor TeX can cope well with
+	     them.  */
+	  do
+	    catchar (dst, ' ');
+	  while (++column & 7);
+	}
+      else
+	{
+	  catchar (dst, at (ptr, idx));
+	  column++;
+	}
+      idx++;
+
+    }
+  catchar (dst, at (ptr, idx));
+  idx++;
+  return idx;
+
+}
+
+static void
+icopy_past_newline ()
+{
+  tos++;
+  check_range ();
+  init_string (tos);
+  idx = copy_past_newline (ptr, idx, tos);
+  pc++;
+}
+
+/* indent
+   Take the string at the top of the stack, do some prettying.  */
+
+static void
+kill_bogus_lines ()
+{
+  int sl;
+
+  int idx = 0;
+  int c;
+  int dot = 0;
+
+  string_type out;
+  init_string (&out);
+  /* Drop leading nl.  */
+  while (at (tos, idx) == '\n')
+    {
+      idx++;
+    }
+  c = idx;
+
+  /* If the first char is a '.' prepend a newline so that it is
+     recognized properly later.  */
+  if (at (tos, idx) == '.')
+    catchar (&out, '\n');
+
+  /* Find the last char.  */
+  while (at (tos, idx))
+    {
+      idx++;
+    }
+
+  /* Find the last non white before the nl.  */
+  idx--;
+
+  while (idx && isspace ((unsigned char) at (tos, idx)))
+    idx--;
+  idx++;
+
+  /* Copy buffer upto last char, but blank lines before and after
+     dots don't count.  */
+  sl = 1;
+
+  while (c < idx)
+    {
+      if (at (tos, c) == '\n'
+	  && at (tos, c + 1) == '\n'
+	  && at (tos, c + 2) == '.')
+	{
+	  /* Ignore two newlines before a dot.  */
+	  c++;
+	}
+      else if (at (tos, c) == '.' && sl)
+	{
+	  /* remember that this line started with a dot.  */
+	  dot = 2;
+	}
+      else if (at (tos, c) == '\n'
+	       && at (tos, c + 1) == '\n'
+	       && dot)
+	{
+	  c++;
+	  /* Ignore two newlines when last line was dot.  */
+	}
+
+      catchar (&out, at (tos, c));
+      if (at (tos, c) == '\n')
+	{
+	  sl = 1;
+
+	  if (dot == 2)
+	    dot = 1;
+	  else
+	    dot = 0;
+	}
+      else
+	sl = 0;
+
+      c++;
+
+    }
+
+  /* Append nl.  */
+  catchar (&out, '\n');
+  pc++;
+  delete_string (tos);
+  *tos = out;
+
+}
+
+static void
+indent ()
+{
+  string_type out;
+  int tab = 0;
+  int idx = 0;
+  int ol = 0;
+  init_string (&out);
+  while (at (tos, idx))
+    {
+      switch (at (tos, idx))
+	{
+	case '\n':
+	  cattext (&out, "\n");
+	  idx++;
+	  if (tab && at (tos, idx))
+	    {
+	      cattext (&out, "    ");
+	    }
+	  ol = 0;
+	  break;
+	case '(':
+	  tab++;
+	  if (ol == 0)
+	    cattext (&out, "   ");
+	  idx++;
+	  cattext (&out, "(");
+	  ol = 1;
+	  break;
+	case ')':
+	  tab--;
+	  cattext (&out, ")");
+	  idx++;
+	  ol = 1;
+
+	  break;
+	default:
+	  catchar (&out, at (tos, idx));
+	  ol = 1;
+
+	  idx++;
+	  break;
+	}
+    }
+
+  pc++;
+  delete_string (tos);
+  *tos = out;
+
+}
+
+static void
+get_stuff_in_command ()
+{
+  tos++;
+  check_range ();
+  init_string (tos);
+
+  while (at (ptr, idx))
+    {
+      if (iscommand (ptr, idx))
+	break;
+      idx = copy_past_newline (ptr, idx, tos);
+    }
+  pc++;
+}
+
+static void
+swap ()
+{
+  string_type t;
+
+  t = tos[0];
+  tos[0] = tos[-1];
+  tos[-1] = t;
+  pc++;
+}
+
+static void
+other_dup ()
+{
+  tos++;
+  check_range ();
+  init_string (tos);
+  catstr (tos, tos - 1);
+  pc++;
+}
+
+static void
+drop ()
+{
+  tos--;
+  check_range ();
+  pc++;
+}
+
+static void
+idrop ()
+{
+  isp--;
+  icheck_range ();
+  pc++;
+}
+
+static void
+icatstr ()
+{
+  tos--;
+  check_range ();
+  catstr (tos, tos + 1);
+  delete_string (tos + 1);
+  pc++;
+}
+
+static void
+skip_past_newline ()
+{
+  while (at (ptr, idx)
+	 && at (ptr, idx) != '\n')
+    idx++;
+  idx++;
+  pc++;
+}
+
+static void
+internalmode ()
+{
+  internal_mode = *(isp);
+  isp--;
+  icheck_range ();
+  pc++;
+}
+
+static void
+maybecatstr ()
+{
+  if (internal_wanted == internal_mode)
+    {
+      catstr (tos - 1, tos);
+    }
+  delete_string (tos);
+  tos--;
+  check_range ();
+  pc++;
+}
+
+char *
+nextword (string, word)
+     char *string;
+     char **word;
+{
+  char *word_start;
+  int idx;
+  char *dst;
+  char *src;
+
+  int length = 0;
+
+  while (isspace ((unsigned char) *string) || *string == '-')
+    {
+      if (*string == '-')
+	{
+	  while (*string && *string != '\n')
+	    string++;
+
+	}
+      else
+	{
+	  string++;
+	}
+    }
+  if (!*string)
+    return 0;
+
+  word_start = string;
+  if (*string == '"')
+    {
+      do
+	{
+	  string++;
+	  length++;
+	  if (*string == '\\')
+	    {
+	      string += 2;
+	      length += 2;
+	    }
+	}
+      while (*string != '"');
+    }
+  else
+    {
+      while (!isspace ((unsigned char) *string))
+	{
+	  string++;
+	  length++;
+
+	}
+    }
+
+  *word = (char *) malloc (length + 1);
+
+  dst = *word;
+  src = word_start;
+
+  for (idx = 0; idx < length; idx++)
+    {
+      if (src[idx] == '\\')
+	switch (src[idx + 1])
+	  {
+	  case 'n':
+	    *dst++ = '\n';
+	    idx++;
+	    break;
+	  case '"':
+	  case '\\':
+	    *dst++ = src[idx + 1];
+	    idx++;
+	    break;
+	  default:
+	    *dst++ = '\\';
+	    break;
+	  }
+      else
+	*dst++ = src[idx];
+    }
+  *dst++ = 0;
+
+  if (*string)
+    return string + 1;
+  else
+    return 0;
+}
+
+dict_type *root;
+
+dict_type *
+lookup_word (word)
+     char *word;
+{
+  dict_type *ptr = root;
+  while (ptr)
+    {
+      if (strcmp (ptr->word, word) == 0)
+	return ptr;
+      ptr = ptr->next;
+    }
+  if (warning)
+    fprintf (stderr, "Can't find %s\n", word);
+  return 0;
+}
+
+static void
+perform ()
+{
+  tos = stack;
+
+  while (at (ptr, idx))
+    {
+      /* It's worth looking through the command list.  */
+      if (iscommand (ptr, idx))
+	{
+	  char *next;
+	  dict_type *word;
+
+	  (void) nextword (addr (ptr, idx), &next);
+
+	  word = lookup_word (next);
+
+	  if (word)
+	    {
+	      exec (word);
+	    }
+	  else
+	    {
+	      if (warning)
+		fprintf (stderr, "warning, %s is not recognised\n", next);
+	      skip_past_newline ();
+	    }
+
+	}
+      else
+	skip_past_newline ();
+    }
+}
+
+dict_type *
+newentry (word)
+     char *word;
+{
+  dict_type *new_d = (dict_type *) malloc (sizeof (dict_type));
+  new_d->word = word;
+  new_d->next = root;
+  root = new_d;
+  new_d->code = (stinst_type *) malloc (sizeof (stinst_type));
+  new_d->code_length = 1;
+  new_d->code_end = 0;
+  return new_d;
+}
+
+unsigned int
+add_to_definition (entry, word)
+     dict_type *entry;
+     stinst_type word;
+{
+  if (entry->code_end == entry->code_length)
+    {
+      entry->code_length += 2;
+      entry->code =
+	(stinst_type *) realloc ((char *) (entry->code),
+				 entry->code_length * sizeof (word_type));
+    }
+  entry->code[entry->code_end] = word;
+
+  return entry->code_end++;
+}
+
+void
+add_intrinsic (name, func)
+     char *name;
+     void (*func) ();
+{
+  dict_type *new_d = newentry (name);
+  add_to_definition (new_d, func);
+  add_to_definition (new_d, 0);
+}
+
+void
+add_var (name)
+     char *name;
+{
+  dict_type *new_d = newentry (name);
+  add_to_definition (new_d, push_number);
+  add_to_definition (new_d, (stinst_type) (&(new_d->var)));
+  add_to_definition (new_d, 0);
+}
+
+void
+compile (string)
+     char *string;
+{
+  /* Add words to the dictionary.  */
+  char *word;
+  string = nextword (string, &word);
+  while (string && *string && word[0])
+    {
+      if (strcmp (word, "var") == 0)
+	{
+	  string = nextword (string, &word);
+
+	  add_var (word);
+	  string = nextword (string, &word);
+	}
+      else if (word[0] == ':')
+	{
+	  dict_type *ptr;
+	  /* Compile a word and add to dictionary.  */
+	  string = nextword (string, &word);
+
+	  ptr = newentry (word);
+	  string = nextword (string, &word);
+	  while (word[0] != ';')
+	    {
+	      switch (word[0])
+		{
+		case '"':
+		  /* got a string, embed magic push string
+		     function */
+		  add_to_definition (ptr, push_text);
+		  add_to_definition (ptr, (stinst_type) (word + 1));
+		  break;
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9':
+		  /* Got a number, embedd the magic push number
+		     function */
+		  add_to_definition (ptr, push_number);
+		  add_to_definition (ptr, (stinst_type) atol (word));
+		  break;
+		default:
+		  add_to_definition (ptr, call);
+		  add_to_definition (ptr, (stinst_type) lookup_word (word));
+		}
+
+	      string = nextword (string, &word);
+	    }
+	  add_to_definition (ptr, 0);
+	  string = nextword (string, &word);
+	}
+      else
+	{
+	  fprintf (stderr, "syntax error at %s\n", string - 1);
+	}
+    }
+}
+
+static void
+bang ()
+{
+  *(long *) ((isp[0])) = isp[-1];
+  isp -= 2;
+  icheck_range ();
+  pc++;
+}
+
+static void
+atsign ()
+{
+  isp[0] = *(long *) (isp[0]);
+  pc++;
+}
+
+static void
+hello ()
+{
+  printf ("hello\n");
+  pc++;
+}
+
+static void
+stdout_ ()
+{
+  isp++;
+  icheck_range ();
+  *isp = 1;
+  pc++;
+}
+
+static void
+stderr_ ()
+{
+  isp++;
+  icheck_range ();
+  *isp = 2;
+  pc++;
+}
+
+static void
+print ()
+{
+  if (*isp == 1)
+    write_buffer (tos, stdout);
+  else if (*isp == 2)
+    write_buffer (tos, stderr);
+  else
+    fprintf (stderr, "print: illegal print destination `%ld'\n", *isp);
+  isp--;
+  tos--;
+  icheck_range ();
+  check_range ();
+  pc++;
+}
+
+static void
+read_in (str, file)
+     string_type *str;
+     FILE *file;
+{
+  char buff[10000];
+  unsigned int r;
+  do
+    {
+      r = fread (buff, 1, sizeof (buff), file);
+      catbuf (str, buff, r);
+    }
+  while (r);
+  buff[0] = 0;
+
+  catbuf (str, buff, 1);
+}
+
+static void
+usage ()
+{
+  fprintf (stderr, "usage: -[d|i|g] <file >file\n");
+  exit (33);
+}
+
+/* There is no reliable way to declare exit.  Sometimes it returns
+   int, and sometimes it returns void.  Sometimes it changes between
+   OS releases.  Trying to get it declared correctly in the hosts file
+   is a pointless waste of time.  */
+
+static void
+chew_exit ()
+{
+  exit (0);
+}
+
+int
+main (ac, av)
+     int ac;
+     char *av[];
+{
+  unsigned int i;
+  string_type buffer;
+  string_type pptr;
+
+  init_string (&buffer);
+  init_string (&pptr);
+  init_string (stack + 0);
+  tos = stack + 1;
+  ptr = &pptr;
+
+  add_intrinsic ("push_text", push_text);
+  add_intrinsic ("!", bang);
+  add_intrinsic ("@", atsign);
+  add_intrinsic ("hello", hello);
+  add_intrinsic ("stdout", stdout_);
+  add_intrinsic ("stderr", stderr_);
+  add_intrinsic ("print", print);
+  add_intrinsic ("skip_past_newline", skip_past_newline);
+  add_intrinsic ("catstr", icatstr);
+  add_intrinsic ("copy_past_newline", icopy_past_newline);
+  add_intrinsic ("dup", other_dup);
+  add_intrinsic ("drop", drop);
+  add_intrinsic ("idrop", idrop);
+  add_intrinsic ("remchar", remchar);
+  add_intrinsic ("get_stuff_in_command", get_stuff_in_command);
+  add_intrinsic ("do_fancy_stuff", do_fancy_stuff);
+  add_intrinsic ("bulletize", bulletize);
+  add_intrinsic ("courierize", courierize);
+  /* If the following line gives an error, exit() is not declared in the
+     ../hosts/foo.h file for this host.  Fix it there, not here!  */
+  /* No, don't fix it anywhere; see comment on chew_exit--Ian Taylor.  */
+  add_intrinsic ("exit", chew_exit);
+  add_intrinsic ("swap", swap);
+  add_intrinsic ("outputdots", outputdots);
+  add_intrinsic ("paramstuff", paramstuff);
+  add_intrinsic ("maybecatstr", maybecatstr);
+  add_intrinsic ("translatecomments", translatecomments);
+  add_intrinsic ("kill_bogus_lines", kill_bogus_lines);
+  add_intrinsic ("indent", indent);
+  add_intrinsic ("internalmode", internalmode);
+  add_intrinsic ("print_stack_level", print_stack_level);
+  add_intrinsic ("strip_trailing_newlines", strip_trailing_newlines);
+
+  /* Put a nl at the start.  */
+  catchar (&buffer, '\n');
+
+  read_in (&buffer, stdin);
+  remove_noncomments (&buffer, ptr);
+  for (i = 1; i < (unsigned int) ac; i++)
+    {
+      if (av[i][0] == '-')
+	{
+	  if (av[i][1] == 'f')
+	    {
+	      string_type b;
+	      FILE *f;
+	      init_string (&b);
+
+	      f = fopen (av[i + 1], "r");
+	      if (!f)
+		{
+		  fprintf (stderr, "Can't open the input file %s\n",
+			   av[i + 1]);
+		  return 33;
+		}
+
+	      read_in (&b, f);
+	      compile (b.ptr);
+	      perform ();
+	    }
+	  else if (av[i][1] == 'i')
+	    {
+	      internal_wanted = 1;
+	    }
+	  else if (av[i][1] == 'w')
+	    {
+	      warning = 1;
+	    }
+	  else
+	    usage ();
+	}
+    }
+  write_buffer (stack + 0, stdout);
+  if (tos != stack)
+    {
+      fprintf (stderr, "finishing with current stack level %d\n",
+	       tos - stack);
+      return 1;
+    }
+  return 0;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/doc/header.sed sdcc-3.2.0+dfsg/support/sdbinutils/bfd/doc/header.sed
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/doc/header.sed	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/doc/header.sed	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,13 @@
+s|[ 	][ 	]*| |g
+s|\(.*\) [^ ]*header.sed.*|\1|
+s|[^ ]*/||g
+s|^ *|"|
+s| |", "|g
+s|$|"|
+s|, \([^ ]*\)$| and \1|
+s|^|/* DO NOT EDIT!  -*- buffer-read-only: t -*-  This file is automatically generated from |
+s|\(.\{60\}[^ ]* \)|\1\
+   |g
+s|$|.\
+   Run "make headers" in your build bfd/ to regenerate.  */\
+|
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/doc/makefile.vms sdcc-3.2.0+dfsg/support/sdbinutils/bfd/doc/makefile.vms
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/doc/makefile.vms	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/doc/makefile.vms	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,5 @@
+CFLAGS = /noopt/include=([],[-],[-.-.include])
+LDFLAGS = /nomap
+LDLIBS = ,sys$$library:vaxcrtl.olb/lib
+
+all: chew.exe
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/doc/proto.str sdcc-3.2.0+dfsg/support/sdbinutils/bfd/doc/proto.str
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/doc/proto.str	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/doc/proto.str	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,135 @@
+
+: SYNOPSIS
+	skip_past_newline
+	get_stuff_in_command	
+	paramstuff
+	indent
+	maybecatstr
+;
+
+: ignore
+	skip_past_newline 
+	get_stuff_in_command
+	outputdots
+	maybecatstr
+	;
+
+: CODE_FRAGMENT
+	ignore ;
+
+: external
+	0 internalmode ignore ;
+
+: internal 
+	1 internalmode ignore ;
+
+- input stack { a b } output b if internal, a if external
+: ifinternal
+	"" swap 1 internalmode maybecatstr
+	swap
+	"" swap 0 internalmode maybecatstr
+	catstr
+	;
+
+- Put note in output string, regardless of internal mode.
+: COMMENT
+	skip_past_newline
+	get_stuff_in_command
+	translatecomments
+	catstr
+	;
+
+- SENUM    enum-type-name
+- ENUM     enum-name
+- ENUMX    addl-enum-name
+- ENUMDOC  doc for preceding enums
+- ENDSENUM max-enum-name
+
+: make_enum_header
+	dup
+	"enum " swap catstr
+	" {\n" catstr
+	swap "  _dummy_first_" swap catstr catstr
+	",\n" catstr
+	;
+: make_string_table_header
+	dup
+	"#ifdef _BFD_MAKE_TABLE_" swap catstr swap
+	"\n\nstatic const char *const " swap catstr catstr
+	"_names[] = { \"@@uninitialized@@\",\n" catstr
+	;
+: SENUM
+	skip_past_newline
+	copy_past_newline
+	remchar
+	dup
+	make_enum_header
+	swap
+	make_string_table_header
+	ifinternal
+	catstr
+	get_stuff_in_command catstr
+	translatecomments ;
+: ENDSENUM
+	skip_past_newline
+	copy_past_newline strip_trailing_newlines
+	dup
+	"  " swap catstr " };\n" catstr	swap
+	" \"@@overflow: " swap catstr "@@\",\n};\n#endif\n\n" catstr
+	ifinternal
+	catstr
+	;
+: make_enumerator
+	"  " swap catstr
+	",\n" catstr
+	;
+: make_enumerator_string
+	"  \"" swap catstr
+	"\",\n" catstr
+	;
+: ENUM
+	skip_past_newline
+	copy_past_newline
+	remchar
+	dup
+	make_enumerator
+	swap
+	make_enumerator_string
+	ifinternal
+	;
+: ENUMX ENUM catstr ;
+: ENUMEQ
+	skip_past_newline
+	"#define "
+	copy_past_newline remchar
+	catstr
+	" "
+	catstr
+	copy_past_newline
+	catstr
+	"" swap 0 internalmode maybecatstr
+	;
+: ENUMEQX ENUMEQ catstr ;
+: ENUMDOC
+	skip_past_newline
+	get_stuff_in_command
+	strip_trailing_newlines
+	"\n{* " swap catstr "  *}\n" catstr
+	translatecomments
+	- discard it if we're doing internal mode
+	"" swap 0 internalmode maybecatstr
+	swap
+	catstr catstr
+	;
+: ENDDD external ;
+: SECTION ignore ;
+: SUBSECTION ignore ;
+: SUBSUBSECTION ignore ;
+: INTERNAL_DEFINITION internal ;
+: DESCRIPTION ignore ;
+: FUNCTION external ;
+: RETURNS ignore ;
+: TYPEDEF external ;
+: INTERNAL_FUNCTION internal ;
+: INTERNAL internal ;
+: INODE ignore ;
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/dwarf1.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/dwarf1.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/dwarf1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/dwarf1.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,564 @@
+/* DWARF 1 find nearest line (_bfd_dwarf1_find_nearest_line).
+   Copyright 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2007, 2008, 2009, 2010
+   Free Software Foundation, Inc.
+
+   Written by Gavin Romig-Koch of Cygnus Solutions (gavin@cygnus.com).
+
+   This file is part of BFD.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or (at
+   your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libiberty.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/dwarf.h"
+
+/* dwarf1_debug is the starting point for all dwarf1 info.  */
+
+struct dwarf1_debug
+{
+  /* The bfd we are working with.  */
+  bfd* abfd;
+
+  /* Pointer to the symbol table.  */
+  asymbol** syms;
+
+  /* List of already parsed compilation units.  */
+  struct dwarf1_unit* lastUnit;
+
+  /* The buffer for the .debug section.
+     Zero indicates that the .debug section failed to load.  */
+  bfd_byte *debug_section;
+
+  /* Pointer to the end of the .debug_info section memory buffer.  */
+  bfd_byte *debug_section_end;
+
+  /* The buffer for the .line section.  */
+  bfd_byte *line_section;
+
+  /* End of that buffer.  */
+  bfd_byte *line_section_end;
+
+  /* The current or next unread die within the .debug section.  */
+  bfd_byte *currentDie;
+};
+
+/* One dwarf1_unit for each parsed compilation unit die.  */
+
+struct dwarf1_unit
+{
+  /* Linked starting from stash->lastUnit.  */
+  struct dwarf1_unit* prev;
+
+  /* Name of the compilation unit.  */
+  char *name;
+
+  /* The highest and lowest address used in the compilation unit.  */
+  unsigned long low_pc;
+  unsigned long high_pc;
+
+  /* Does this unit have a statement list?  */
+  int has_stmt_list;
+
+  /* If any, the offset of the line number table in the .line section.  */
+  unsigned long stmt_list_offset;
+
+  /* If non-zero, a pointer to the first child of this unit.  */
+  bfd_byte *first_child;
+
+  /* How many line entries?  */
+  unsigned long line_count;
+
+  /* The decoded line number table (line_count entries).  */
+  struct linenumber* linenumber_table;
+
+  /* The list of functions in this unit.  */
+  struct dwarf1_func* func_list;
+};
+
+/* One dwarf1_func for each parsed function die.  */
+
+struct dwarf1_func
+{
+  /* Linked starting from aUnit->func_list.  */
+  struct dwarf1_func* prev;
+
+  /* Name of function.  */
+  char* name;
+
+  /* The highest and lowest address used in the compilation unit.  */
+  unsigned long low_pc;
+  unsigned long high_pc;
+};
+
+/* Used to return info about a parsed die.  */
+struct die_info
+{
+  unsigned long length;
+  unsigned long sibling;
+  unsigned long low_pc;
+  unsigned long high_pc;
+  unsigned long stmt_list_offset;
+
+  char* name;
+
+  int has_stmt_list;
+
+  unsigned short tag;
+};
+
+/* Parsed line number information.  */
+struct linenumber
+{
+  /* First address in the line.  */
+  unsigned long addr;
+
+  /* The line number.  */
+  unsigned long linenumber;
+};
+
+/* Find the form of an attr, from the attr field.  */
+#define FORM_FROM_ATTR(attr)	((attr) & 0xF)	/* Implicitly specified.  */
+
+/* Return a newly allocated dwarf1_unit.  It should be cleared and
+   then attached into the 'stash' at 'stash->lastUnit'.  */
+
+static struct dwarf1_unit*
+alloc_dwarf1_unit (struct dwarf1_debug* stash)
+{
+  bfd_size_type amt = sizeof (struct dwarf1_unit);
+
+  struct dwarf1_unit* x = (struct dwarf1_unit *) bfd_zalloc (stash->abfd, amt);
+  if (x)
+    {
+      x->prev = stash->lastUnit;
+      stash->lastUnit = x;
+    }
+
+  return x;
+}
+
+/* Return a newly allocated dwarf1_func.  It must be cleared and
+   attached into 'aUnit' at 'aUnit->func_list'.  */
+
+static struct dwarf1_func *
+alloc_dwarf1_func (struct dwarf1_debug* stash, struct dwarf1_unit* aUnit)
+{
+  bfd_size_type amt = sizeof (struct dwarf1_func);
+
+  struct dwarf1_func* x = (struct dwarf1_func *) bfd_zalloc (stash->abfd, amt);
+  if (x)
+    {
+      x->prev = aUnit->func_list;
+      aUnit->func_list = x;
+    }
+
+  return x;
+}
+
+/* parse_die - parse a Dwarf1 die.
+   Parse the die starting at 'aDiePtr' into 'aDieInfo'.
+   'abfd' must be the bfd from which the section that 'aDiePtr'
+   points to was pulled from.
+
+   Return FALSE if the die is invalidly formatted; TRUE otherwise.  */
+
+static bfd_boolean
+parse_die (bfd *             abfd,
+	   struct die_info * aDieInfo,
+	   bfd_byte *        aDiePtr,
+	   bfd_byte *        aDiePtrEnd)
+{
+  bfd_byte *this_die = aDiePtr;
+  bfd_byte *xptr = this_die;
+
+  memset (aDieInfo, 0, sizeof (* aDieInfo));
+
+  /* First comes the length.  */
+  aDieInfo->length = bfd_get_32 (abfd, (bfd_byte *) xptr);
+  xptr += 4;
+  if (aDieInfo->length == 0
+      || (this_die + aDieInfo->length) >= aDiePtrEnd)
+    return FALSE;
+  if (aDieInfo->length < 6)
+    {
+      /* Just padding bytes.  */
+      aDieInfo->tag = TAG_padding;
+      return TRUE;
+    }
+
+  /* Then the tag.  */
+  aDieInfo->tag = bfd_get_16 (abfd, (bfd_byte *) xptr);
+  xptr += 2;
+
+  /* Then the attributes.  */
+  while (xptr < (this_die + aDieInfo->length))
+    {
+      unsigned short attr;
+
+      /* Parse the attribute based on its form.  This section
+         must handle all dwarf1 forms, but need only handle the
+	 actual attributes that we care about.  */
+      attr = bfd_get_16 (abfd, (bfd_byte *) xptr);
+      xptr += 2;
+
+      switch (FORM_FROM_ATTR (attr))
+	{
+	case FORM_DATA2:
+	  xptr += 2;
+	  break;
+	case FORM_DATA4:
+	case FORM_REF:
+	  if (attr == AT_sibling)
+	    aDieInfo->sibling = bfd_get_32 (abfd, (bfd_byte *) xptr);
+	  else if (attr == AT_stmt_list)
+	    {
+	      aDieInfo->stmt_list_offset = bfd_get_32 (abfd, (bfd_byte *) xptr);
+	      aDieInfo->has_stmt_list = 1;
+	    }
+	  xptr += 4;
+	  break;
+	case FORM_DATA8:
+	  xptr += 8;
+	  break;
+	case FORM_ADDR:
+	  if (attr == AT_low_pc)
+	    aDieInfo->low_pc = bfd_get_32 (abfd, (bfd_byte *) xptr);
+	  else if (attr == AT_high_pc)
+	    aDieInfo->high_pc = bfd_get_32 (abfd, (bfd_byte *) xptr);
+	  xptr += 4;
+	  break;
+	case FORM_BLOCK2:
+	  xptr += 2 + bfd_get_16 (abfd, (bfd_byte *) xptr);
+	  break;
+	case FORM_BLOCK4:
+	  xptr += 4 + bfd_get_32 (abfd, (bfd_byte *) xptr);
+	  break;
+	case FORM_STRING:
+	  if (attr == AT_name)
+	    aDieInfo->name = (char *) xptr;
+	  xptr += strlen ((char *) xptr) + 1;
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Parse a dwarf1 line number table for 'aUnit->stmt_list_offset'
+   into 'aUnit->linenumber_table'.  Return FALSE if an error
+   occurs; TRUE otherwise.  */
+
+static bfd_boolean
+parse_line_table (struct dwarf1_debug* stash, struct dwarf1_unit* aUnit)
+{
+  bfd_byte *xptr;
+
+  /* Load the ".line" section from the bfd if we haven't already.  */
+  if (stash->line_section == 0)
+    {
+      asection *msec;
+      bfd_size_type size;
+
+      msec = bfd_get_section_by_name (stash->abfd, ".line");
+      if (! msec)
+	return FALSE;
+
+      size = msec->rawsize ? msec->rawsize : msec->size;
+      stash->line_section
+	= bfd_simple_get_relocated_section_contents
+	(stash->abfd, msec, NULL, stash->syms);
+
+      if (! stash->line_section)
+	return FALSE;
+
+      stash->line_section_end = stash->line_section + size;
+    }
+
+  xptr = stash->line_section + aUnit->stmt_list_offset;
+  if (xptr < stash->line_section_end)
+    {
+      unsigned long eachLine;
+      bfd_byte *tblend;
+      unsigned long base;
+      bfd_size_type amt;
+
+      /* First comes the length.  */
+      tblend = bfd_get_32 (stash->abfd, (bfd_byte *) xptr) + xptr;
+      xptr += 4;
+
+      /* Then the base address for each address in the table.  */
+      base = bfd_get_32 (stash->abfd, (bfd_byte *) xptr);
+      xptr += 4;
+
+      /* How many line entrys?
+	 10 = 4 (line number) + 2 (pos in line) + 4 (address in line).  */
+      aUnit->line_count = (tblend - xptr) / 10;
+
+      /* Allocate an array for the entries.  */
+      amt = sizeof (struct linenumber) * aUnit->line_count;
+      aUnit->linenumber_table = (struct linenumber *) bfd_alloc (stash->abfd,
+                                                                 amt);
+      if (!aUnit->linenumber_table)
+	return FALSE;
+
+      for (eachLine = 0; eachLine < aUnit->line_count; eachLine++)
+	{
+	  /* A line number.  */
+	  aUnit->linenumber_table[eachLine].linenumber
+	    = bfd_get_32 (stash->abfd, (bfd_byte *) xptr);
+	  xptr += 4;
+
+	  /* Skip the position within the line.  */
+	  xptr += 2;
+
+	  /* And finally the address.  */
+	  aUnit->linenumber_table[eachLine].addr
+	    = base + bfd_get_32 (stash->abfd, (bfd_byte *) xptr);
+	  xptr += 4;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Parse each function die in a compilation unit 'aUnit'.
+   The first child die of 'aUnit' should be in 'aUnit->first_child',
+   the result is placed in 'aUnit->func_list'.
+   Return FALSE if error; TRUE otherwise.  */
+
+static bfd_boolean
+parse_functions_in_unit (struct dwarf1_debug* stash, struct dwarf1_unit* aUnit)
+{
+  bfd_byte *eachDie;
+
+  if (aUnit->first_child)
+    for (eachDie = aUnit->first_child;
+ 	 eachDie < stash->debug_section_end;
+	 )
+      {
+	struct die_info eachDieInfo;
+
+	if (! parse_die (stash->abfd, &eachDieInfo, eachDie,
+			 stash->debug_section_end))
+	  return FALSE;
+
+	if (eachDieInfo.tag == TAG_global_subroutine
+	    || eachDieInfo.tag == TAG_subroutine
+	    || eachDieInfo.tag == TAG_inlined_subroutine
+	    || eachDieInfo.tag == TAG_entry_point)
+	  {
+	    struct dwarf1_func* aFunc = alloc_dwarf1_func (stash,aUnit);
+	    if (!aFunc)
+	      return FALSE;
+
+	    aFunc->name = eachDieInfo.name;
+	    aFunc->low_pc = eachDieInfo.low_pc;
+	    aFunc->high_pc = eachDieInfo.high_pc;
+	  }
+
+	/* Move to next sibling, if none, end loop */
+	if (eachDieInfo.sibling)
+	  eachDie = stash->debug_section + eachDieInfo.sibling;
+	else
+	  break;
+      }
+
+  return TRUE;
+}
+
+/* Find the nearest line to 'addr' in 'aUnit'.
+   Return whether we found the line (or a function) without error.  */
+
+static bfd_boolean
+dwarf1_unit_find_nearest_line (struct dwarf1_debug* stash,
+			       struct dwarf1_unit* aUnit,
+			       unsigned long addr,
+			       const char **filename_ptr,
+			       const char **functionname_ptr,
+			       unsigned int *linenumber_ptr)
+{
+  int line_p = FALSE;
+  int func_p = FALSE;
+
+  if (aUnit->low_pc <= addr && addr < aUnit->high_pc)
+    {
+      if (aUnit->has_stmt_list)
+	{
+	  unsigned long i;
+	  struct dwarf1_func* eachFunc;
+
+	  if (! aUnit->linenumber_table)
+	    {
+	      if (! parse_line_table (stash, aUnit))
+		return FALSE;
+	    }
+
+	  if (! aUnit->func_list)
+	    {
+	      if (! parse_functions_in_unit (stash, aUnit))
+		return FALSE;
+	    }
+
+	  for (i = 0; i < aUnit->line_count; i++)
+	    {
+	      if (aUnit->linenumber_table[i].addr <= addr
+		  && addr < aUnit->linenumber_table[i+1].addr)
+		{
+		  *filename_ptr = aUnit->name;
+		  *linenumber_ptr = aUnit->linenumber_table[i].linenumber;
+		  line_p = TRUE;
+		  break;
+		}
+	    }
+
+	  for (eachFunc = aUnit->func_list;
+	       eachFunc;
+	       eachFunc = eachFunc->prev)
+	    {
+	      if (eachFunc->low_pc <= addr
+		  && addr < eachFunc->high_pc)
+		{
+		  *functionname_ptr = eachFunc->name;
+		  func_p = TRUE;
+		  break;
+		}
+	    }
+	}
+    }
+
+  return line_p || func_p;
+}
+
+/* The DWARF 1 version of find_nearest line.
+   Return TRUE if the line is found without error.  */
+
+bfd_boolean
+_bfd_dwarf1_find_nearest_line (bfd *abfd,
+			       asection *section,
+			       asymbol **symbols,
+			       bfd_vma offset,
+			       const char **filename_ptr,
+			       const char **functionname_ptr,
+			       unsigned int *linenumber_ptr)
+{
+  struct dwarf1_debug *stash = elf_tdata (abfd)->dwarf1_find_line_info;
+
+  struct dwarf1_unit* eachUnit;
+
+  /* What address are we looking for? */
+  unsigned long addr = (unsigned long)(offset + section->vma);
+
+  *filename_ptr = NULL;
+  *functionname_ptr = NULL;
+  *linenumber_ptr = 0;
+
+  if (! stash)
+    {
+      asection *msec;
+      bfd_size_type size = sizeof (struct dwarf1_debug);
+
+      stash = elf_tdata (abfd)->dwarf1_find_line_info
+	= (struct dwarf1_debug *) bfd_zalloc (abfd, size);
+
+      if (! stash)
+	return FALSE;
+
+      msec = bfd_get_section_by_name (abfd, ".debug");
+      if (! msec)
+	/* No dwarf1 info.  Note that at this point the stash
+	   has been allocated, but contains zeros, this lets
+	   future calls to this function fail quicker.  */
+	return FALSE;
+
+      size = msec->rawsize ? msec->rawsize : msec->size;
+      stash->debug_section
+	= bfd_simple_get_relocated_section_contents (abfd, msec, NULL,
+						     symbols);
+
+      if (! stash->debug_section)
+	return FALSE;
+
+      stash->debug_section_end = stash->debug_section + size;
+      stash->currentDie = stash->debug_section;
+      stash->abfd = abfd;
+      stash->syms = symbols;
+    }
+
+  /* A null debug_section indicates that there was no dwarf1 info
+     or that an error occured while setting up the stash.  */
+
+  if (! stash->debug_section)
+    return FALSE;
+
+  /* Look at the previously parsed units to see if any contain
+     the addr.  */
+  for (eachUnit = stash->lastUnit; eachUnit; eachUnit = eachUnit->prev)
+    if (eachUnit->low_pc <= addr && addr < eachUnit->high_pc)
+      return dwarf1_unit_find_nearest_line (stash, eachUnit, addr,
+					    filename_ptr,
+					    functionname_ptr,
+					    linenumber_ptr);
+
+  while (stash->currentDie < stash->debug_section_end)
+    {
+      struct die_info aDieInfo;
+
+      if (! parse_die (stash->abfd, &aDieInfo, stash->currentDie,
+		       stash->debug_section_end))
+	return FALSE;
+
+      if (aDieInfo.tag == TAG_compile_unit)
+	{
+	  struct dwarf1_unit* aUnit
+	    = alloc_dwarf1_unit (stash);
+	  if (!aUnit)
+	    return FALSE;
+
+	  aUnit->name = aDieInfo.name;
+	  aUnit->low_pc = aDieInfo.low_pc;
+	  aUnit->high_pc = aDieInfo.high_pc;
+	  aUnit->has_stmt_list = aDieInfo.has_stmt_list;
+	  aUnit->stmt_list_offset = aDieInfo.stmt_list_offset;
+
+	  /* A die has a child if it's followed by a die that is
+	     not it's sibling.  */
+	  if (aDieInfo.sibling
+	      && stash->currentDie + aDieInfo.length
+                    < stash->debug_section_end
+	      && stash->currentDie + aDieInfo.length
+	            != stash->debug_section + aDieInfo.sibling)
+	    aUnit->first_child = stash->currentDie + aDieInfo.length;
+	  else
+	    aUnit->first_child = 0;
+
+	  if (aUnit->low_pc <= addr && addr < aUnit->high_pc)
+	    return dwarf1_unit_find_nearest_line (stash, aUnit, addr,
+						  filename_ptr,
+						  functionname_ptr,
+						  linenumber_ptr);
+	}
+
+      if (aDieInfo.sibling != 0)
+	stash->currentDie = stash->debug_section + aDieInfo.sibling;
+      else
+	stash->currentDie += aDieInfo.length;
+    }
+
+  return FALSE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/dwarf2.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/dwarf2.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/dwarf2.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/dwarf2.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3583 @@
+/* DWARF 2 support.
+   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+   Adapted from gdb/dwarf2read.c by Gavin Koch of Cygnus Solutions
+   (gavin@cygnus.com).
+
+   From the dwarf2read.c header:
+   Adapted by Gary Funck (gary@intrepid.com), Intrepid Technology,
+   Inc.  with support from Florida State University (under contract
+   with the Ada Joint Program Office), and Silicon Graphics, Inc.
+   Initial contribution by Brent Benson, Harris Computer Systems, Inc.,
+   based on Fred Fish's (Cygnus Support) implementation of DWARF 1
+   support in dwarfread.c
+
+   This file is part of BFD.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or (at
+   your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libiberty.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "dwarf2.h"
+
+/* The data in the .debug_line statement prologue looks like this.  */
+
+struct line_head
+{
+  bfd_vma total_length;
+  unsigned short version;
+  bfd_vma prologue_length;
+  unsigned char minimum_instruction_length;
+  unsigned char maximum_ops_per_insn;
+  unsigned char default_is_stmt;
+  int line_base;
+  unsigned char line_range;
+  unsigned char opcode_base;
+  unsigned char *standard_opcode_lengths;
+};
+
+/* Attributes have a name and a value.  */
+
+struct attribute
+{
+  enum dwarf_attribute name;
+  enum dwarf_form form;
+  union
+  {
+    char *str;
+    struct dwarf_block *blk;
+    bfd_uint64_t val;
+    bfd_int64_t sval;
+  }
+  u;
+};
+
+/* Blocks are a bunch of untyped bytes.  */
+struct dwarf_block
+{
+  unsigned int size;
+  bfd_byte *data;
+};
+
+struct adjusted_section
+{
+  asection *section;
+  bfd_vma adj_vma;
+};
+
+struct dwarf2_debug
+{
+  /* A list of all previously read comp_units.  */
+  struct comp_unit *all_comp_units;
+
+  /* Last comp unit in list above.  */
+  struct comp_unit *last_comp_unit;
+
+  /* The next unread compilation unit within the .debug_info section.
+     Zero indicates that the .debug_info section has not been loaded
+     into a buffer yet.  */
+  bfd_byte *info_ptr;
+
+  /* Pointer to the end of the .debug_info section memory buffer.  */
+  bfd_byte *info_ptr_end;
+
+  /* Pointer to the bfd, section and address of the beginning of the
+     section.  The bfd might be different than expected because of
+     gnu_debuglink sections.  */
+  bfd *bfd_ptr;
+  asection *sec;
+  bfd_byte *sec_info_ptr;
+
+  /* A pointer to the memory block allocated for info_ptr.  Neither
+     info_ptr nor sec_info_ptr are guaranteed to stay pointing to the
+     beginning of the malloc block.  This is used only to free the
+     memory later.  */
+  bfd_byte *info_ptr_memory;
+
+  /* Pointer to the symbol table.  */
+  asymbol **syms;
+
+  /* Pointer to the .debug_abbrev section loaded into memory.  */
+  bfd_byte *dwarf_abbrev_buffer;
+
+  /* Length of the loaded .debug_abbrev section.  */
+  bfd_size_type dwarf_abbrev_size;
+
+  /* Buffer for decode_line_info.  */
+  bfd_byte *dwarf_line_buffer;
+
+  /* Length of the loaded .debug_line section.  */
+  bfd_size_type dwarf_line_size;
+
+  /* Pointer to the .debug_str section loaded into memory.  */
+  bfd_byte *dwarf_str_buffer;
+
+  /* Length of the loaded .debug_str section.  */
+  bfd_size_type dwarf_str_size;
+
+  /* Pointer to the .debug_ranges section loaded into memory. */
+  bfd_byte *dwarf_ranges_buffer;
+
+  /* Length of the loaded .debug_ranges section. */
+  bfd_size_type dwarf_ranges_size;
+
+  /* If the most recent call to bfd_find_nearest_line was given an
+     address in an inlined function, preserve a pointer into the
+     calling chain for subsequent calls to bfd_find_inliner_info to
+     use. */
+  struct funcinfo *inliner_chain;
+
+  /* Number of sections whose VMA we must adjust.  */
+  unsigned int adjusted_section_count;
+
+  /* Array of sections with adjusted VMA.  */
+  struct adjusted_section *adjusted_sections;
+
+  /* Number of times find_line is called.  This is used in
+     the heuristic for enabling the info hash tables.  */
+  int info_hash_count;
+
+#define STASH_INFO_HASH_TRIGGER    100
+
+  /* Hash table mapping symbol names to function infos.  */
+  struct info_hash_table *funcinfo_hash_table;
+
+  /* Hash table mapping symbol names to variable infos.  */
+  struct info_hash_table *varinfo_hash_table;
+
+  /* Head of comp_unit list in the last hash table update.  */
+  struct comp_unit *hash_units_head;
+
+  /* Status of info hash.  */
+  int info_hash_status;
+#define STASH_INFO_HASH_OFF        0
+#define STASH_INFO_HASH_ON         1
+#define STASH_INFO_HASH_DISABLED   2
+};
+
+struct arange
+{
+  struct arange *next;
+  bfd_vma low;
+  bfd_vma high;
+};
+
+/* A minimal decoding of DWARF2 compilation units.  We only decode
+   what's needed to get to the line number information.  */
+
+struct comp_unit
+{
+  /* Chain the previously read compilation units.  */
+  struct comp_unit *next_unit;
+
+  /* Likewise, chain the compilation unit read after this one.
+     The comp units are stored in reversed reading order.  */
+  struct comp_unit *prev_unit;
+
+  /* Keep the bfd convenient (for memory allocation).  */
+  bfd *abfd;
+
+  /* The lowest and highest addresses contained in this compilation
+     unit as specified in the compilation unit header.  */
+  struct arange arange;
+
+  /* The DW_AT_name attribute (for error messages).  */
+  char *name;
+
+  /* The abbrev hash table.  */
+  struct abbrev_info **abbrevs;
+
+  /* Note that an error was found by comp_unit_find_nearest_line.  */
+  int error;
+
+  /* The DW_AT_comp_dir attribute.  */
+  char *comp_dir;
+
+  /* TRUE if there is a line number table associated with this comp. unit.  */
+  int stmtlist;
+
+  /* Pointer to the current comp_unit so that we can find a given entry
+     by its reference.  */
+  bfd_byte *info_ptr_unit;
+
+  /* Pointer to the start of the debug section, for DW_FORM_ref_addr.  */
+  bfd_byte *sec_info_ptr;
+
+  /* The offset into .debug_line of the line number table.  */
+  unsigned long line_offset;
+
+  /* Pointer to the first child die for the comp unit.  */
+  bfd_byte *first_child_die_ptr;
+
+  /* The end of the comp unit.  */
+  bfd_byte *end_ptr;
+
+  /* The decoded line number, NULL if not yet decoded.  */
+  struct line_info_table *line_table;
+
+  /* A list of the functions found in this comp. unit.  */
+  struct funcinfo *function_table;
+
+  /* A list of the variables found in this comp. unit.  */
+  struct varinfo *variable_table;
+
+  /* Pointer to dwarf2_debug structure.  */
+  struct dwarf2_debug *stash;
+
+  /* DWARF format version for this unit - from unit header.  */
+  int version;
+
+  /* Address size for this unit - from unit header.  */
+  unsigned char addr_size;
+
+  /* Offset size for this unit - from unit header.  */
+  unsigned char offset_size;
+
+  /* Base address for this unit - from DW_AT_low_pc attribute of
+     DW_TAG_compile_unit DIE */
+  bfd_vma base_address;
+
+  /* TRUE if symbols are cached in hash table for faster lookup by name.  */
+  bfd_boolean cached;
+};
+
+/* This data structure holds the information of an abbrev.  */
+struct abbrev_info
+{
+  unsigned int number;		/* Number identifying abbrev.  */
+  enum dwarf_tag tag;		/* DWARF tag.  */
+  int has_children;		/* Boolean.  */
+  unsigned int num_attrs;	/* Number of attributes.  */
+  struct attr_abbrev *attrs;	/* An array of attribute descriptions.  */
+  struct abbrev_info *next;	/* Next in chain.  */
+};
+
+struct attr_abbrev
+{
+  enum dwarf_attribute name;
+  enum dwarf_form form;
+};
+
+/* Map of uncompressed DWARF debug section name to compressed one.  It
+   is terminated by NULL uncompressed_name.  */
+
+const struct dwarf_debug_section dwarf_debug_sections[] =
+{
+  { ".debug_abbrev",		".zdebug_abbrev" },
+  { ".debug_aranges",		".zdebug_aranges" },
+  { ".debug_frame",		".zdebug_frame" },
+  { ".debug_info",		".zdebug_info" },
+  { ".debug_line",		".zdebug_line" },
+  { ".debug_loc",		".zdebug_loc" },
+  { ".debug_macinfo",		".zdebug_macinfo" },
+  { ".debug_macro",		".zdebug_macro" },
+  { ".debug_pubnames",		".zdebug_pubnames" },
+  { ".debug_pubtypes",		".zdebug_pubtypes" },
+  { ".debug_ranges",		".zdebug_ranges" },
+  { ".debug_static_func",	".zdebug_static_func" },
+  { ".debug_static_vars",	".zdebug_static_vars" },
+  { ".debug_str",		".zdebug_str", },
+  { ".debug_types",		".zdebug_types" },
+  /* GNU DWARF 1 extensions */
+  { ".debug_sfnames",		".zdebug_sfnames" },
+  { ".debug_srcinfo",		".zebug_srcinfo" },
+  /* SGI/MIPS DWARF 2 extensions */
+  { ".debug_funcnames",		".zdebug_funcnames" },
+  { ".debug_typenames",		".zdebug_typenames" },
+  { ".debug_varnames",		".zdebug_varnames" },
+  { ".debug_weaknames",		".zdebug_weaknames" },
+  { NULL,			NULL },
+};
+
+enum dwarf_debug_section_enum
+{
+  debug_abbrev = 0,
+  debug_aranges,
+  debug_frame,
+  debug_info,
+  debug_line,
+  debug_loc,
+  debug_macinfo,
+  debug_macro,
+  debug_pubnames,
+  debug_pubtypes,
+  debug_ranges,
+  debug_static_func,
+  debug_static_vars,
+  debug_str,
+  debug_types,
+  debug_sfnames,
+  debug_srcinfo,
+  debug_funcnames,
+  debug_typenames,
+  debug_varnames,
+  debug_weaknames
+};
+
+#ifndef ABBREV_HASH_SIZE
+#define ABBREV_HASH_SIZE 121
+#endif
+#ifndef ATTR_ALLOC_CHUNK
+#define ATTR_ALLOC_CHUNK 4
+#endif
+
+/* Variable and function hash tables.  This is used to speed up look-up
+   in lookup_symbol_in_var_table() and lookup_symbol_in_function_table().
+   In order to share code between variable and function infos, we use
+   a list of untyped pointer for all variable/function info associated with
+   a symbol.  We waste a bit of memory for list with one node but that
+   simplifies the code.  */
+
+struct info_list_node
+{
+  struct info_list_node *next;
+  void *info;
+};
+
+/* Info hash entry.  */
+struct info_hash_entry
+{
+  struct bfd_hash_entry root;
+  struct info_list_node *head;
+};
+
+struct info_hash_table
+{
+  struct bfd_hash_table base;
+};
+
+/* Function to create a new entry in info hash table. */
+
+static struct bfd_hash_entry *
+info_hash_table_newfunc (struct bfd_hash_entry *entry,
+			 struct bfd_hash_table *table,
+			 const char *string)
+{
+  struct info_hash_entry *ret = (struct info_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     derived class.  */
+  if (ret == NULL)
+    {
+      ret = (struct info_hash_entry *) bfd_hash_allocate (table,
+                                                          sizeof (* ret));
+      if (ret == NULL)
+	return NULL;
+    }
+
+  /* Call the allocation method of the base class.  */
+  ret = ((struct info_hash_entry *)
+	 bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
+
+  /* Initialize the local fields here.  */
+  if (ret)
+    ret->head = NULL;
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Function to create a new info hash table.  It returns a pointer to the
+   newly created table or NULL if there is any error.  We need abfd
+   solely for memory allocation.  */
+
+static struct info_hash_table *
+create_info_hash_table (bfd *abfd)
+{
+  struct info_hash_table *hash_table;
+
+  hash_table = (struct info_hash_table *)
+      bfd_alloc (abfd, sizeof (struct info_hash_table));
+  if (!hash_table)
+    return hash_table;
+
+  if (!bfd_hash_table_init (&hash_table->base, info_hash_table_newfunc,
+			    sizeof (struct info_hash_entry)))
+    {
+      bfd_release (abfd, hash_table);
+      return NULL;
+    }
+
+  return hash_table;
+}
+
+/* Insert an info entry into an info hash table.  We do not check of
+   duplicate entries.  Also, the caller need to guarantee that the
+   right type of info in inserted as info is passed as a void* pointer.
+   This function returns true if there is no error.  */
+
+static bfd_boolean
+insert_info_hash_table (struct info_hash_table *hash_table,
+			const char *key,
+			void *info,
+			bfd_boolean copy_p)
+{
+  struct info_hash_entry *entry;
+  struct info_list_node *node;
+
+  entry = (struct info_hash_entry*) bfd_hash_lookup (&hash_table->base,
+						     key, TRUE, copy_p);
+  if (!entry)
+    return FALSE;
+
+  node = (struct info_list_node *) bfd_hash_allocate (&hash_table->base,
+                                                      sizeof (*node));
+  if (!node)
+    return FALSE;
+
+  node->info = info;
+  node->next = entry->head;
+  entry->head = node;
+
+  return TRUE;
+}
+
+/* Look up an info entry list from an info hash table.  Return NULL
+   if there is none. */
+
+static struct info_list_node *
+lookup_info_hash_table (struct info_hash_table *hash_table, const char *key)
+{
+  struct info_hash_entry *entry;
+
+  entry = (struct info_hash_entry*) bfd_hash_lookup (&hash_table->base, key,
+						     FALSE, FALSE);
+  return entry ? entry->head : NULL;
+}
+
+/* Read a section into its appropriate place in the dwarf2_debug
+   struct (indicated by SECTION_BUFFER and SECTION_SIZE).  If SYMS is
+   not NULL, use bfd_simple_get_relocated_section_contents to read the
+   section contents, otherwise use bfd_get_section_contents.  Fail if
+   the located section does not contain at least OFFSET bytes.  */
+
+static bfd_boolean
+read_section (bfd *           abfd,
+	      enum dwarf_debug_section_enum sec,
+	      asymbol **      syms,
+	      bfd_uint64_t    offset,
+	      bfd_byte **     section_buffer,
+	      bfd_size_type * section_size)
+{
+  asection *msec;
+  const char *section_name = dwarf_debug_sections[sec].uncompressed_name;
+
+  /* read_section is a noop if the section has already been read.  */
+  if (!*section_buffer)
+    {
+      msec = bfd_get_section_by_name (abfd, section_name);
+      if (! msec)
+	{
+	  section_name = dwarf_debug_sections[sec].compressed_name;
+	  msec = bfd_get_section_by_name (abfd, section_name);
+	}
+      if (! msec)
+	{
+	  (*_bfd_error_handler) (_("Dwarf Error: Can't find %s section."), section_name);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      *section_size = msec->rawsize ? msec->rawsize : msec->size;
+      if (syms)
+	{
+	  *section_buffer
+	      = bfd_simple_get_relocated_section_contents (abfd, msec, NULL, syms);
+	  if (! *section_buffer)
+	    return FALSE;
+	}
+      else
+	{
+	  *section_buffer = (bfd_byte *) bfd_malloc (*section_size);
+	  if (! *section_buffer)
+	    return FALSE;
+	  if (! bfd_get_section_contents (abfd, msec, *section_buffer,
+					  0, *section_size))
+	    return FALSE;
+	}
+    }
+
+  /* It is possible to get a bad value for the offset into the section
+     that the client wants.  Validate it here to avoid trouble later.  */
+  if (offset != 0 && offset >= *section_size)
+    {
+      (*_bfd_error_handler) (_("Dwarf Error: Offset (%lu) greater than or equal to %s size (%lu)."),
+			     (long) offset, section_name, *section_size);
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* VERBATIM
+   The following function up to the END VERBATIM mark are
+   copied directly from dwarf2read.c.  */
+
+/* Read dwarf information from a buffer.  */
+
+static unsigned int
+read_1_byte (bfd *abfd ATTRIBUTE_UNUSED, bfd_byte *buf)
+{
+  return bfd_get_8 (abfd, buf);
+}
+
+static int
+read_1_signed_byte (bfd *abfd ATTRIBUTE_UNUSED, bfd_byte *buf)
+{
+  return bfd_get_signed_8 (abfd, buf);
+}
+
+static unsigned int
+read_2_bytes (bfd *abfd, bfd_byte *buf)
+{
+  return bfd_get_16 (abfd, buf);
+}
+
+static unsigned int
+read_4_bytes (bfd *abfd, bfd_byte *buf)
+{
+  return bfd_get_32 (abfd, buf);
+}
+
+static bfd_uint64_t
+read_8_bytes (bfd *abfd, bfd_byte *buf)
+{
+  return bfd_get_64 (abfd, buf);
+}
+
+static bfd_byte *
+read_n_bytes (bfd *abfd ATTRIBUTE_UNUSED,
+	      bfd_byte *buf,
+	      unsigned int size ATTRIBUTE_UNUSED)
+{
+  return buf;
+}
+
+static char *
+read_string (bfd *abfd ATTRIBUTE_UNUSED,
+	     bfd_byte *buf,
+	     unsigned int *bytes_read_ptr)
+{
+  /* Return a pointer to the embedded string.  */
+  char *str = (char *) buf;
+
+  if (*str == '\0')
+    {
+      *bytes_read_ptr = 1;
+      return NULL;
+    }
+
+  *bytes_read_ptr = strlen (str) + 1;
+  return str;
+}
+
+/* END VERBATIM */
+
+static char *
+read_indirect_string (struct comp_unit * unit,
+		      bfd_byte *         buf,
+		      unsigned int *     bytes_read_ptr)
+{
+  bfd_uint64_t offset;
+  struct dwarf2_debug *stash = unit->stash;
+  char *str;
+
+  if (unit->offset_size == 4)
+    offset = read_4_bytes (unit->abfd, buf);
+  else
+    offset = read_8_bytes (unit->abfd, buf);
+
+  *bytes_read_ptr = unit->offset_size;
+
+  if (! read_section (unit->abfd, debug_str, stash->syms, offset,
+		      &stash->dwarf_str_buffer, &stash->dwarf_str_size))
+    return NULL;
+
+  str = (char *) stash->dwarf_str_buffer + offset;
+  if (*str == '\0')
+    return NULL;
+  return str;
+}
+
+static bfd_uint64_t
+read_address (struct comp_unit *unit, bfd_byte *buf)
+{
+  int signed_vma = get_elf_backend_data (unit->abfd)->sign_extend_vma;
+
+  if (signed_vma)
+    {
+      switch (unit->addr_size)
+	{
+	case 8:
+	  return bfd_get_signed_64 (unit->abfd, buf);
+	case 4:
+	  return bfd_get_signed_32 (unit->abfd, buf);
+	case 2:
+	  return bfd_get_signed_16 (unit->abfd, buf);
+	default:
+	  abort ();
+	}
+    }
+  else
+    {
+      switch (unit->addr_size)
+	{
+	case 8:
+	  return bfd_get_64 (unit->abfd, buf);
+	case 4:
+	  return bfd_get_32 (unit->abfd, buf);
+	case 2:
+	  return bfd_get_16 (unit->abfd, buf);
+	default:
+	  abort ();
+	}
+    }
+}
+
+/* Lookup an abbrev_info structure in the abbrev hash table.  */
+
+static struct abbrev_info *
+lookup_abbrev (unsigned int number, struct abbrev_info **abbrevs)
+{
+  unsigned int hash_number;
+  struct abbrev_info *abbrev;
+
+  hash_number = number % ABBREV_HASH_SIZE;
+  abbrev = abbrevs[hash_number];
+
+  while (abbrev)
+    {
+      if (abbrev->number == number)
+	return abbrev;
+      else
+	abbrev = abbrev->next;
+    }
+
+  return NULL;
+}
+
+/* In DWARF version 2, the description of the debugging information is
+   stored in a separate .debug_abbrev section.  Before we read any
+   dies from a section we read in all abbreviations and install them
+   in a hash table.  */
+
+static struct abbrev_info**
+read_abbrevs (bfd *abfd, bfd_uint64_t offset, struct dwarf2_debug *stash)
+{
+  struct abbrev_info **abbrevs;
+  bfd_byte *abbrev_ptr;
+  struct abbrev_info *cur_abbrev;
+  unsigned int abbrev_number, bytes_read, abbrev_name;
+  unsigned int abbrev_form, hash_number;
+  bfd_size_type amt;
+
+  if (! read_section (abfd, debug_abbrev, stash->syms, offset,
+		      &stash->dwarf_abbrev_buffer, &stash->dwarf_abbrev_size))
+    return NULL;
+
+  amt = sizeof (struct abbrev_info*) * ABBREV_HASH_SIZE;
+  abbrevs = (struct abbrev_info **) bfd_zalloc (abfd, amt);
+  if (abbrevs == NULL)
+    return NULL;
+
+  abbrev_ptr = stash->dwarf_abbrev_buffer + offset;
+  abbrev_number = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
+  abbrev_ptr += bytes_read;
+
+  /* Loop until we reach an abbrev number of 0.  */
+  while (abbrev_number)
+    {
+      amt = sizeof (struct abbrev_info);
+      cur_abbrev = (struct abbrev_info *) bfd_zalloc (abfd, amt);
+      if (cur_abbrev == NULL)
+	return NULL;
+
+      /* Read in abbrev header.  */
+      cur_abbrev->number = abbrev_number;
+      cur_abbrev->tag = (enum dwarf_tag)
+	read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
+      abbrev_ptr += bytes_read;
+      cur_abbrev->has_children = read_1_byte (abfd, abbrev_ptr);
+      abbrev_ptr += 1;
+
+      /* Now read in declarations.  */
+      abbrev_name = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
+      abbrev_ptr += bytes_read;
+      abbrev_form = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
+      abbrev_ptr += bytes_read;
+
+      while (abbrev_name)
+	{
+	  if ((cur_abbrev->num_attrs % ATTR_ALLOC_CHUNK) == 0)
+	    {
+	      struct attr_abbrev *tmp;
+
+	      amt = cur_abbrev->num_attrs + ATTR_ALLOC_CHUNK;
+	      amt *= sizeof (struct attr_abbrev);
+	      tmp = (struct attr_abbrev *) bfd_realloc (cur_abbrev->attrs, amt);
+	      if (tmp == NULL)
+		{
+		  size_t i;
+
+		  for (i = 0; i < ABBREV_HASH_SIZE; i++)
+		    {
+		      struct abbrev_info *abbrev = abbrevs[i];
+
+		      while (abbrev)
+			{
+			  free (abbrev->attrs);
+			  abbrev = abbrev->next;
+			}
+		    }
+		  return NULL;
+		}
+	      cur_abbrev->attrs = tmp;
+	    }
+
+	  cur_abbrev->attrs[cur_abbrev->num_attrs].name
+	    = (enum dwarf_attribute) abbrev_name;
+	  cur_abbrev->attrs[cur_abbrev->num_attrs++].form
+	    = (enum dwarf_form) abbrev_form;
+	  abbrev_name = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
+	  abbrev_ptr += bytes_read;
+	  abbrev_form = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
+	  abbrev_ptr += bytes_read;
+	}
+
+      hash_number = abbrev_number % ABBREV_HASH_SIZE;
+      cur_abbrev->next = abbrevs[hash_number];
+      abbrevs[hash_number] = cur_abbrev;
+
+      /* Get next abbreviation.
+	 Under Irix6 the abbreviations for a compilation unit are not
+	 always properly terminated with an abbrev number of 0.
+	 Exit loop if we encounter an abbreviation which we have
+	 already read (which means we are about to read the abbreviations
+	 for the next compile unit) or if the end of the abbreviation
+	 table is reached.  */
+      if ((unsigned int) (abbrev_ptr - stash->dwarf_abbrev_buffer)
+	  >= stash->dwarf_abbrev_size)
+	break;
+      abbrev_number = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
+      abbrev_ptr += bytes_read;
+      if (lookup_abbrev (abbrev_number,abbrevs) != NULL)
+	break;
+    }
+
+  return abbrevs;
+}
+
+/* Read an attribute value described by an attribute form.  */
+
+static bfd_byte *
+read_attribute_value (struct attribute *attr,
+		      unsigned form,
+		      struct comp_unit *unit,
+		      bfd_byte *info_ptr)
+{
+  bfd *abfd = unit->abfd;
+  unsigned int bytes_read;
+  struct dwarf_block *blk;
+  bfd_size_type amt;
+
+  attr->form = (enum dwarf_form) form;
+
+  switch (form)
+    {
+    case DW_FORM_ref_addr:
+      /* DW_FORM_ref_addr is an address in DWARF2, and an offset in
+	 DWARF3.  */
+      if (unit->version == 3 || unit->version == 4)
+	{
+	  if (unit->offset_size == 4)
+	    attr->u.val = read_4_bytes (unit->abfd, info_ptr);
+	  else
+	    attr->u.val = read_8_bytes (unit->abfd, info_ptr);
+	  info_ptr += unit->offset_size;
+	  break;
+	}
+      /* FALLTHROUGH */
+    case DW_FORM_addr:
+      attr->u.val = read_address (unit, info_ptr);
+      info_ptr += unit->addr_size;
+      break;
+    case DW_FORM_sec_offset:
+      if (unit->offset_size == 4)
+	attr->u.val = read_4_bytes (unit->abfd, info_ptr);
+      else
+	attr->u.val = read_8_bytes (unit->abfd, info_ptr);
+      info_ptr += unit->offset_size;
+      break;
+    case DW_FORM_block2:
+      amt = sizeof (struct dwarf_block);
+      blk = (struct dwarf_block *) bfd_alloc (abfd, amt);
+      if (blk == NULL)
+	return NULL;
+      blk->size = read_2_bytes (abfd, info_ptr);
+      info_ptr += 2;
+      blk->data = read_n_bytes (abfd, info_ptr, blk->size);
+      info_ptr += blk->size;
+      attr->u.blk = blk;
+      break;
+    case DW_FORM_block4:
+      amt = sizeof (struct dwarf_block);
+      blk = (struct dwarf_block *) bfd_alloc (abfd, amt);
+      if (blk == NULL)
+	return NULL;
+      blk->size = read_4_bytes (abfd, info_ptr);
+      info_ptr += 4;
+      blk->data = read_n_bytes (abfd, info_ptr, blk->size);
+      info_ptr += blk->size;
+      attr->u.blk = blk;
+      break;
+    case DW_FORM_data2:
+      attr->u.val = read_2_bytes (abfd, info_ptr);
+      info_ptr += 2;
+      break;
+    case DW_FORM_data4:
+      attr->u.val = read_4_bytes (abfd, info_ptr);
+      info_ptr += 4;
+      break;
+    case DW_FORM_data8:
+      attr->u.val = read_8_bytes (abfd, info_ptr);
+      info_ptr += 8;
+      break;
+    case DW_FORM_string:
+      attr->u.str = read_string (abfd, info_ptr, &bytes_read);
+      info_ptr += bytes_read;
+      break;
+    case DW_FORM_strp:
+      attr->u.str = read_indirect_string (unit, info_ptr, &bytes_read);
+      info_ptr += bytes_read;
+      break;
+    case DW_FORM_exprloc:
+    case DW_FORM_block:
+      amt = sizeof (struct dwarf_block);
+      blk = (struct dwarf_block *) bfd_alloc (abfd, amt);
+      if (blk == NULL)
+	return NULL;
+      blk->size = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
+      info_ptr += bytes_read;
+      blk->data = read_n_bytes (abfd, info_ptr, blk->size);
+      info_ptr += blk->size;
+      attr->u.blk = blk;
+      break;
+    case DW_FORM_block1:
+      amt = sizeof (struct dwarf_block);
+      blk = (struct dwarf_block *) bfd_alloc (abfd, amt);
+      if (blk == NULL)
+	return NULL;
+      blk->size = read_1_byte (abfd, info_ptr);
+      info_ptr += 1;
+      blk->data = read_n_bytes (abfd, info_ptr, blk->size);
+      info_ptr += blk->size;
+      attr->u.blk = blk;
+      break;
+    case DW_FORM_data1:
+      attr->u.val = read_1_byte (abfd, info_ptr);
+      info_ptr += 1;
+      break;
+    case DW_FORM_flag:
+      attr->u.val = read_1_byte (abfd, info_ptr);
+      info_ptr += 1;
+      break;
+    case DW_FORM_flag_present:
+      attr->u.val = 1;
+      break;
+    case DW_FORM_sdata:
+      attr->u.sval = read_signed_leb128 (abfd, info_ptr, &bytes_read);
+      info_ptr += bytes_read;
+      break;
+    case DW_FORM_udata:
+      attr->u.val = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
+      info_ptr += bytes_read;
+      break;
+    case DW_FORM_ref1:
+      attr->u.val = read_1_byte (abfd, info_ptr);
+      info_ptr += 1;
+      break;
+    case DW_FORM_ref2:
+      attr->u.val = read_2_bytes (abfd, info_ptr);
+      info_ptr += 2;
+      break;
+    case DW_FORM_ref4:
+      attr->u.val = read_4_bytes (abfd, info_ptr);
+      info_ptr += 4;
+      break;
+    case DW_FORM_ref8:
+      attr->u.val = read_8_bytes (abfd, info_ptr);
+      info_ptr += 8;
+      break;
+    case DW_FORM_ref_sig8:
+      attr->u.val = read_8_bytes (abfd, info_ptr);
+      info_ptr += 8;
+      break;
+    case DW_FORM_ref_udata:
+      attr->u.val = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
+      info_ptr += bytes_read;
+      break;
+    case DW_FORM_indirect:
+      form = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
+      info_ptr += bytes_read;
+      info_ptr = read_attribute_value (attr, form, unit, info_ptr);
+      break;
+    default:
+      (*_bfd_error_handler) (_("Dwarf Error: Invalid or unhandled FORM value: %u."),
+			     form);
+      bfd_set_error (bfd_error_bad_value);
+      return NULL;
+    }
+  return info_ptr;
+}
+
+/* Read an attribute described by an abbreviated attribute.  */
+
+static bfd_byte *
+read_attribute (struct attribute *attr,
+		struct attr_abbrev *abbrev,
+		struct comp_unit *unit,
+		bfd_byte *info_ptr)
+{
+  attr->name = abbrev->name;
+  info_ptr = read_attribute_value (attr, abbrev->form, unit, info_ptr);
+  return info_ptr;
+}
+
+/* Source line information table routines.  */
+
+#define FILE_ALLOC_CHUNK 5
+#define DIR_ALLOC_CHUNK 5
+
+struct line_info
+{
+  struct line_info* prev_line;
+  bfd_vma address;
+  char *filename;
+  unsigned int line;
+  unsigned int column;
+  unsigned char op_index;
+  unsigned char end_sequence;		/* End of (sequential) code sequence.  */
+};
+
+struct fileinfo
+{
+  char *name;
+  unsigned int dir;
+  unsigned int time;
+  unsigned int size;
+};
+
+struct line_sequence
+{
+  bfd_vma               low_pc;
+  struct line_sequence* prev_sequence;
+  struct line_info*     last_line;  /* Largest VMA.  */
+};
+
+struct line_info_table
+{
+  bfd*                  abfd;
+  unsigned int          num_files;
+  unsigned int          num_dirs;
+  unsigned int          num_sequences;
+  char *                comp_dir;
+  char **               dirs;
+  struct fileinfo*      files;
+  struct line_sequence* sequences;
+  struct line_info*     lcl_head;   /* Local head; used in 'add_line_info'.  */
+};
+
+/* Remember some information about each function.  If the function is
+   inlined (DW_TAG_inlined_subroutine) it may have two additional
+   attributes, DW_AT_call_file and DW_AT_call_line, which specify the
+   source code location where this function was inlined. */
+
+struct funcinfo
+{
+  struct funcinfo *prev_func;		/* Pointer to previous function in list of all functions */
+  struct funcinfo *caller_func;		/* Pointer to function one scope higher */
+  char *caller_file;			/* Source location file name where caller_func inlines this func */
+  int caller_line;			/* Source location line number where caller_func inlines this func */
+  char *file;				/* Source location file name */
+  int line;				/* Source location line number */
+  int tag;
+  char *name;
+  struct arange arange;
+  asection *sec;			/* Where the symbol is defined */
+};
+
+struct varinfo
+{
+  /* Pointer to previous variable in list of all variables */
+  struct varinfo *prev_var;
+  /* Source location file name */
+  char *file;
+  /* Source location line number */
+  int line;
+  int tag;
+  char *name;
+  bfd_vma addr;
+  /* Where the symbol is defined */
+  asection *sec;
+  /* Is this a stack variable? */
+  unsigned int stack: 1;
+};
+
+/* Return TRUE if NEW_LINE should sort after LINE.  */
+
+static inline bfd_boolean
+new_line_sorts_after (struct line_info *new_line, struct line_info *line)
+{
+  return (new_line->address > line->address
+	  || (new_line->address == line->address
+	      && (new_line->op_index > line->op_index
+		  || (new_line->op_index == line->op_index
+		      && new_line->end_sequence < line->end_sequence))));
+}
+
+
+/* Adds a new entry to the line_info list in the line_info_table, ensuring
+   that the list is sorted.  Note that the line_info list is sorted from
+   highest to lowest VMA (with possible duplicates); that is,
+   line_info->prev_line always accesses an equal or smaller VMA.  */
+
+static bfd_boolean
+add_line_info (struct line_info_table *table,
+	       bfd_vma address,
+	       unsigned char op_index,
+	       char *filename,
+	       unsigned int line,
+	       unsigned int column,
+	       int end_sequence)
+{
+  bfd_size_type amt = sizeof (struct line_info);
+  struct line_sequence* seq = table->sequences;
+  struct line_info* info = (struct line_info *) bfd_alloc (table->abfd, amt);
+
+  if (info == NULL)
+    return FALSE;
+
+  /* Set member data of 'info'.  */
+  info->prev_line = NULL;
+  info->address = address;
+  info->op_index = op_index;
+  info->line = line;
+  info->column = column;
+  info->end_sequence = end_sequence;
+
+  if (filename && filename[0])
+    {
+      info->filename = (char *) bfd_alloc (table->abfd, strlen (filename) + 1);
+      if (info->filename == NULL)
+	return FALSE;
+      strcpy (info->filename, filename);
+    }
+  else
+    info->filename = NULL;
+
+  /* Find the correct location for 'info'.  Normally we will receive
+     new line_info data 1) in order and 2) with increasing VMAs.
+     However some compilers break the rules (cf. decode_line_info) and
+     so we include some heuristics for quickly finding the correct
+     location for 'info'. In particular, these heuristics optimize for
+     the common case in which the VMA sequence that we receive is a
+     list of locally sorted VMAs such as
+       p...z a...j  (where a < j < p < z)
+
+     Note: table->lcl_head is used to head an *actual* or *possible*
+     sub-sequence within the list (such as a...j) that is not directly
+     headed by table->last_line
+
+     Note: we may receive duplicate entries from 'decode_line_info'.  */
+
+  if (seq
+      && seq->last_line->address == address
+      && seq->last_line->op_index == op_index
+      && seq->last_line->end_sequence == end_sequence)
+    {
+      /* We only keep the last entry with the same address and end
+	 sequence.  See PR ld/4986.  */
+      if (table->lcl_head == seq->last_line)
+	table->lcl_head = info;
+      info->prev_line = seq->last_line->prev_line;
+      seq->last_line = info;
+    }
+  else if (!seq || seq->last_line->end_sequence)
+    {
+      /* Start a new line sequence.  */
+      amt = sizeof (struct line_sequence);
+      seq = (struct line_sequence *) bfd_malloc (amt);
+      if (seq == NULL)
+	return FALSE;
+      seq->low_pc = address;
+      seq->prev_sequence = table->sequences;
+      seq->last_line = info;
+      table->lcl_head = info;
+      table->sequences = seq;
+      table->num_sequences++;
+    }
+  else if (new_line_sorts_after (info, seq->last_line))
+    {
+      /* Normal case: add 'info' to the beginning of the current sequence.  */
+      info->prev_line = seq->last_line;
+      seq->last_line = info;
+
+      /* lcl_head: initialize to head a *possible* sequence at the end.  */
+      if (!table->lcl_head)
+	table->lcl_head = info;
+    }
+  else if (!new_line_sorts_after (info, table->lcl_head)
+	   && (!table->lcl_head->prev_line
+	       || new_line_sorts_after (info, table->lcl_head->prev_line)))
+    {
+      /* Abnormal but easy: lcl_head is the head of 'info'.  */
+      info->prev_line = table->lcl_head->prev_line;
+      table->lcl_head->prev_line = info;
+    }
+  else
+    {
+      /* Abnormal and hard: Neither 'last_line' nor 'lcl_head'
+	 are valid heads for 'info'.  Reset 'lcl_head'.  */
+      struct line_info* li2 = seq->last_line; /* Always non-NULL.  */
+      struct line_info* li1 = li2->prev_line;
+
+      while (li1)
+	{
+	  if (!new_line_sorts_after (info, li2)
+	      && new_line_sorts_after (info, li1))
+	    break;
+
+	  li2 = li1; /* always non-NULL */
+	  li1 = li1->prev_line;
+	}
+      table->lcl_head = li2;
+      info->prev_line = table->lcl_head->prev_line;
+      table->lcl_head->prev_line = info;
+      if (address < seq->low_pc)
+        seq->low_pc = address;
+    }
+  return TRUE;
+}
+
+/* Extract a fully qualified filename from a line info table.
+   The returned string has been malloc'ed and it is the caller's
+   responsibility to free it.  */
+
+static char *
+concat_filename (struct line_info_table *table, unsigned int file)
+{
+  char *filename;
+
+  if (file - 1 >= table->num_files)
+    {
+      /* FILE == 0 means unknown.  */
+      if (file)
+	(*_bfd_error_handler)
+	  (_("Dwarf Error: mangled line number section (bad file number)."));
+      return strdup ("<unknown>");
+    }
+
+  filename = table->files[file - 1].name;
+
+  if (!IS_ABSOLUTE_PATH (filename))
+    {
+      char *dir_name = NULL;
+      char *subdir_name = NULL;
+      char *name;
+      size_t len;
+
+      if (table->files[file - 1].dir)
+	subdir_name = table->dirs[table->files[file - 1].dir - 1];
+
+      if (!subdir_name || !IS_ABSOLUTE_PATH (subdir_name))
+	dir_name = table->comp_dir;
+
+      if (!dir_name)
+	{
+	  dir_name = subdir_name;
+	  subdir_name = NULL;
+	}
+
+      if (!dir_name)
+	return strdup (filename);
+
+      len = strlen (dir_name) + strlen (filename) + 2;
+
+      if (subdir_name)
+	{
+	  len += strlen (subdir_name) + 1;
+	  name = (char *) bfd_malloc (len);
+	  if (name)
+	    sprintf (name, "%s/%s/%s", dir_name, subdir_name, filename);
+	}
+      else
+	{
+	  name = (char *) bfd_malloc (len);
+	  if (name)
+	    sprintf (name, "%s/%s", dir_name, filename);
+	}
+
+      return name;
+    }
+
+  return strdup (filename);
+}
+
+static bfd_boolean
+arange_add (bfd *abfd, struct arange *first_arange,
+	    bfd_vma low_pc, bfd_vma high_pc)
+{
+  struct arange *arange;
+
+  /* If the first arange is empty, use it. */
+  if (first_arange->high == 0)
+    {
+      first_arange->low = low_pc;
+      first_arange->high = high_pc;
+      return TRUE;
+    }
+
+  /* Next see if we can cheaply extend an existing range.  */
+  arange = first_arange;
+  do
+    {
+      if (low_pc == arange->high)
+	{
+	  arange->high = high_pc;
+	  return TRUE;
+	}
+      if (high_pc == arange->low)
+	{
+	  arange->low = low_pc;
+	  return TRUE;
+	}
+      arange = arange->next;
+    }
+  while (arange);
+
+  /* Need to allocate a new arange and insert it into the arange list.
+     Order isn't significant, so just insert after the first arange. */
+  arange = (struct arange *) bfd_zalloc (abfd, sizeof (*arange));
+  if (arange == NULL)
+    return FALSE;
+  arange->low = low_pc;
+  arange->high = high_pc;
+  arange->next = first_arange->next;
+  first_arange->next = arange;
+  return TRUE;
+}
+
+/* Compare function for line sequences.  */
+
+static int
+compare_sequences (const void* a, const void* b)
+{
+  const struct line_sequence* seq1 = a;
+  const struct line_sequence* seq2 = b;
+
+  /* Sort by low_pc as the primary key.  */
+  if (seq1->low_pc < seq2->low_pc)
+    return -1;
+  if (seq1->low_pc > seq2->low_pc)
+    return 1;
+
+  /* If low_pc values are equal, sort in reverse order of
+     high_pc, so that the largest region comes first.  */
+  if (seq1->last_line->address < seq2->last_line->address)
+    return 1;
+  if (seq1->last_line->address > seq2->last_line->address)
+    return -1;
+
+  if (seq1->last_line->op_index < seq2->last_line->op_index)
+    return 1;
+  if (seq1->last_line->op_index > seq2->last_line->op_index)
+    return -1;
+
+  return 0;
+}
+
+/* Sort the line sequences for quick lookup.  */
+
+static bfd_boolean
+sort_line_sequences (struct line_info_table* table)
+{
+  bfd_size_type amt;
+  struct line_sequence* sequences;
+  struct line_sequence* seq;
+  unsigned int n = 0;
+  unsigned int num_sequences = table->num_sequences;
+  bfd_vma last_high_pc;
+
+  if (num_sequences == 0)
+    return TRUE;
+
+  /* Allocate space for an array of sequences.  */
+  amt = sizeof (struct line_sequence) * num_sequences;
+  sequences = (struct line_sequence *) bfd_alloc (table->abfd, amt);
+  if (sequences == NULL)
+    return FALSE;
+
+  /* Copy the linked list into the array, freeing the original nodes.  */
+  seq = table->sequences;
+  for (n = 0; n < num_sequences; n++)
+    {
+      struct line_sequence* last_seq = seq;
+
+      BFD_ASSERT (seq);
+      sequences[n].low_pc = seq->low_pc;
+      sequences[n].prev_sequence = NULL;
+      sequences[n].last_line = seq->last_line;
+      seq = seq->prev_sequence;
+      free (last_seq);
+    }
+  BFD_ASSERT (seq == NULL);
+
+  qsort (sequences, n, sizeof (struct line_sequence), compare_sequences);
+
+  /* Make the list binary-searchable by trimming overlapping entries
+     and removing nested entries.  */
+  num_sequences = 1;
+  last_high_pc = sequences[0].last_line->address;
+  for (n = 1; n < table->num_sequences; n++)
+    {
+      if (sequences[n].low_pc < last_high_pc)
+        {
+	  if (sequences[n].last_line->address <= last_high_pc)
+	    /* Skip nested entries.  */
+	    continue;
+
+	  /* Trim overlapping entries.  */
+	  sequences[n].low_pc = last_high_pc;
+        }
+      last_high_pc = sequences[n].last_line->address;
+      if (n > num_sequences)
+        {
+          /* Close up the gap.  */
+          sequences[num_sequences].low_pc = sequences[n].low_pc;
+          sequences[num_sequences].last_line = sequences[n].last_line;
+        }
+      num_sequences++;
+    }
+
+  table->sequences = sequences;
+  table->num_sequences = num_sequences;
+  return TRUE;
+}
+
+/* Decode the line number information for UNIT.  */
+
+static struct line_info_table*
+decode_line_info (struct comp_unit *unit, struct dwarf2_debug *stash)
+{
+  bfd *abfd = unit->abfd;
+  struct line_info_table* table;
+  bfd_byte *line_ptr;
+  bfd_byte *line_end;
+  struct line_head lh;
+  unsigned int i, bytes_read, offset_size;
+  char *cur_file, *cur_dir;
+  unsigned char op_code, extended_op, adj_opcode;
+  bfd_size_type amt;
+
+  if (! read_section (abfd, debug_line, stash->syms, unit->line_offset,
+		      &stash->dwarf_line_buffer, &stash->dwarf_line_size))
+    return NULL;
+
+  amt = sizeof (struct line_info_table);
+  table = (struct line_info_table *) bfd_alloc (abfd, amt);
+  if (table == NULL)
+    return NULL;
+  table->abfd = abfd;
+  table->comp_dir = unit->comp_dir;
+
+  table->num_files = 0;
+  table->files = NULL;
+
+  table->num_dirs = 0;
+  table->dirs = NULL;
+
+  table->num_sequences = 0;
+  table->sequences = NULL;
+
+  table->lcl_head = NULL;
+
+  line_ptr = stash->dwarf_line_buffer + unit->line_offset;
+
+  /* Read in the prologue.  */
+  lh.total_length = read_4_bytes (abfd, line_ptr);
+  line_ptr += 4;
+  offset_size = 4;
+  if (lh.total_length == 0xffffffff)
+    {
+      lh.total_length = read_8_bytes (abfd, line_ptr);
+      line_ptr += 8;
+      offset_size = 8;
+    }
+  else if (lh.total_length == 0 && unit->addr_size == 8)
+    {
+      /* Handle (non-standard) 64-bit DWARF2 formats.  */
+      lh.total_length = read_4_bytes (abfd, line_ptr);
+      line_ptr += 4;
+      offset_size = 8;
+    }
+  line_end = line_ptr + lh.total_length;
+  lh.version = read_2_bytes (abfd, line_ptr);
+  if (lh.version < 2 || lh.version > 4)
+    {
+      (*_bfd_error_handler)
+	(_("Dwarf Error: Unhandled .debug_line version %d."), lh.version);
+      bfd_set_error (bfd_error_bad_value);
+      return NULL;
+    }
+  line_ptr += 2;
+  if (offset_size == 4)
+    lh.prologue_length = read_4_bytes (abfd, line_ptr);
+  else
+    lh.prologue_length = read_8_bytes (abfd, line_ptr);
+  line_ptr += offset_size;
+  lh.minimum_instruction_length = read_1_byte (abfd, line_ptr);
+  line_ptr += 1;
+  if (lh.version >= 4)
+    {
+      lh.maximum_ops_per_insn = read_1_byte (abfd, line_ptr);
+      line_ptr += 1;
+    }
+  else
+    lh.maximum_ops_per_insn = 1;
+  if (lh.maximum_ops_per_insn == 0)
+    {
+      (*_bfd_error_handler)
+	(_("Dwarf Error: Invalid maximum operations per instruction."));
+      bfd_set_error (bfd_error_bad_value);
+      return NULL;
+    }
+  lh.default_is_stmt = read_1_byte (abfd, line_ptr);
+  line_ptr += 1;
+  lh.line_base = read_1_signed_byte (abfd, line_ptr);
+  line_ptr += 1;
+  lh.line_range = read_1_byte (abfd, line_ptr);
+  line_ptr += 1;
+  lh.opcode_base = read_1_byte (abfd, line_ptr);
+  line_ptr += 1;
+  amt = lh.opcode_base * sizeof (unsigned char);
+  lh.standard_opcode_lengths = (unsigned char *) bfd_alloc (abfd, amt);
+
+  lh.standard_opcode_lengths[0] = 1;
+
+  for (i = 1; i < lh.opcode_base; ++i)
+    {
+      lh.standard_opcode_lengths[i] = read_1_byte (abfd, line_ptr);
+      line_ptr += 1;
+    }
+
+  /* Read directory table.  */
+  while ((cur_dir = read_string (abfd, line_ptr, &bytes_read)) != NULL)
+    {
+      line_ptr += bytes_read;
+
+      if ((table->num_dirs % DIR_ALLOC_CHUNK) == 0)
+	{
+	  char **tmp;
+
+	  amt = table->num_dirs + DIR_ALLOC_CHUNK;
+	  amt *= sizeof (char *);
+
+	  tmp = (char **) bfd_realloc (table->dirs, amt);
+	  if (tmp == NULL)
+	    goto fail;
+	  table->dirs = tmp;
+	}
+
+      table->dirs[table->num_dirs++] = cur_dir;
+    }
+
+  line_ptr += bytes_read;
+
+  /* Read file name table.  */
+  while ((cur_file = read_string (abfd, line_ptr, &bytes_read)) != NULL)
+    {
+      line_ptr += bytes_read;
+
+      if ((table->num_files % FILE_ALLOC_CHUNK) == 0)
+	{
+	  struct fileinfo *tmp;
+
+	  amt = table->num_files + FILE_ALLOC_CHUNK;
+	  amt *= sizeof (struct fileinfo);
+
+	  tmp = (struct fileinfo *) bfd_realloc (table->files, amt);
+	  if (tmp == NULL)
+	    goto fail;
+	  table->files = tmp;
+	}
+
+      table->files[table->num_files].name = cur_file;
+      table->files[table->num_files].dir =
+	read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
+      line_ptr += bytes_read;
+      table->files[table->num_files].time =
+	read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
+      line_ptr += bytes_read;
+      table->files[table->num_files].size =
+	read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
+      line_ptr += bytes_read;
+      table->num_files++;
+    }
+
+  line_ptr += bytes_read;
+
+  /* Read the statement sequences until there's nothing left.  */
+  while (line_ptr < line_end)
+    {
+      /* State machine registers.  */
+      bfd_vma address = 0;
+      unsigned char op_index = 0;
+      char * filename = table->num_files ? concat_filename (table, 1) : NULL;
+      unsigned int line = 1;
+      unsigned int column = 0;
+      int is_stmt = lh.default_is_stmt;
+      int end_sequence = 0;
+      /* eraxxon@alumni.rice.edu: Against the DWARF2 specs, some
+	 compilers generate address sequences that are wildly out of
+	 order using DW_LNE_set_address (e.g. Intel C++ 6.0 compiler
+	 for ia64-Linux).  Thus, to determine the low and high
+	 address, we must compare on every DW_LNS_copy, etc.  */
+      bfd_vma low_pc  = (bfd_vma) -1;
+      bfd_vma high_pc = 0;
+
+      /* Decode the table.  */
+      while (! end_sequence)
+	{
+	  op_code = read_1_byte (abfd, line_ptr);
+	  line_ptr += 1;
+
+	  if (op_code >= lh.opcode_base)
+	    {
+	      /* Special operand.  */
+	      adj_opcode = op_code - lh.opcode_base;
+	      if (lh.maximum_ops_per_insn == 1)
+		address += (adj_opcode / lh.line_range)
+			   * lh.minimum_instruction_length;
+	      else
+		{
+		  address += ((op_index + (adj_opcode / lh.line_range))
+			      / lh.maximum_ops_per_insn)
+			     * lh.minimum_instruction_length;
+		  op_index = (op_index + (adj_opcode / lh.line_range))
+			     % lh.maximum_ops_per_insn;
+		}
+	      line += lh.line_base + (adj_opcode % lh.line_range);
+	      /* Append row to matrix using current values.  */
+	      if (!add_line_info (table, address, op_index, filename,
+				  line, column, 0))
+		goto line_fail;
+	      if (address < low_pc)
+		low_pc = address;
+	      if (address > high_pc)
+		high_pc = address;
+	    }
+	  else switch (op_code)
+	    {
+	    case DW_LNS_extended_op:
+	      /* Ignore length.  */
+	      line_ptr += 1;
+	      extended_op = read_1_byte (abfd, line_ptr);
+	      line_ptr += 1;
+
+	      switch (extended_op)
+		{
+		case DW_LNE_end_sequence:
+		  end_sequence = 1;
+		  if (!add_line_info (table, address, op_index, filename,
+				      line, column, end_sequence))
+		    goto line_fail;
+		  if (address < low_pc)
+		    low_pc = address;
+		  if (address > high_pc)
+		    high_pc = address;
+		  if (!arange_add (unit->abfd, &unit->arange, low_pc, high_pc))
+		    goto line_fail;
+		  break;
+		case DW_LNE_set_address:
+		  address = read_address (unit, line_ptr);
+		  op_index = 0;
+		  line_ptr += unit->addr_size;
+		  break;
+		case DW_LNE_define_file:
+		  cur_file = read_string (abfd, line_ptr, &bytes_read);
+		  line_ptr += bytes_read;
+		  if ((table->num_files % FILE_ALLOC_CHUNK) == 0)
+		    {
+		      struct fileinfo *tmp;
+
+		      amt = table->num_files + FILE_ALLOC_CHUNK;
+		      amt *= sizeof (struct fileinfo);
+		      tmp = (struct fileinfo *) bfd_realloc (table->files, amt);
+		      if (tmp == NULL)
+			goto line_fail;
+		      table->files = tmp;
+		    }
+		  table->files[table->num_files].name = cur_file;
+		  table->files[table->num_files].dir =
+		    read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
+		  line_ptr += bytes_read;
+		  table->files[table->num_files].time =
+		    read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
+		  line_ptr += bytes_read;
+		  table->files[table->num_files].size =
+		    read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
+		  line_ptr += bytes_read;
+		  table->num_files++;
+		  break;
+		case DW_LNE_set_discriminator:
+		  (void) read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
+		  line_ptr += bytes_read;
+		  break;
+		default:
+		  (*_bfd_error_handler) (_("Dwarf Error: mangled line number section."));
+		  bfd_set_error (bfd_error_bad_value);
+		line_fail:
+		  if (filename != NULL)
+		    free (filename);
+		  goto fail;
+		}
+	      break;
+	    case DW_LNS_copy:
+	      if (!add_line_info (table, address, op_index,
+				  filename, line, column, 0))
+		goto line_fail;
+	      if (address < low_pc)
+		low_pc = address;
+	      if (address > high_pc)
+		high_pc = address;
+	      break;
+	    case DW_LNS_advance_pc:
+	      if (lh.maximum_ops_per_insn == 1)
+		address += lh.minimum_instruction_length
+			   * read_unsigned_leb128 (abfd, line_ptr,
+						   &bytes_read);
+	      else
+		{
+		  bfd_vma adjust = read_unsigned_leb128 (abfd, line_ptr,
+							 &bytes_read);
+		  address = ((op_index + adjust) / lh.maximum_ops_per_insn)
+			    * lh.minimum_instruction_length;
+		  op_index = (op_index + adjust) % lh.maximum_ops_per_insn;
+		}
+	      line_ptr += bytes_read;
+	      break;
+	    case DW_LNS_advance_line:
+	      line += read_signed_leb128 (abfd, line_ptr, &bytes_read);
+	      line_ptr += bytes_read;
+	      break;
+	    case DW_LNS_set_file:
+	      {
+		unsigned int file;
+
+		/* The file and directory tables are 0
+		   based, the references are 1 based.  */
+		file = read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
+		line_ptr += bytes_read;
+		if (filename)
+		  free (filename);
+		filename = concat_filename (table, file);
+		break;
+	      }
+	    case DW_LNS_set_column:
+	      column = read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
+	      line_ptr += bytes_read;
+	      break;
+	    case DW_LNS_negate_stmt:
+	      is_stmt = (!is_stmt);
+	      break;
+	    case DW_LNS_set_basic_block:
+	      break;
+	    case DW_LNS_const_add_pc:
+	      if (lh.maximum_ops_per_insn == 1)
+		address += lh.minimum_instruction_length
+			   * ((255 - lh.opcode_base) / lh.line_range);
+	      else
+		{
+		  bfd_vma adjust = ((255 - lh.opcode_base) / lh.line_range);
+		  address += lh.minimum_instruction_length
+			     * ((op_index + adjust) / lh.maximum_ops_per_insn);
+		  op_index = (op_index + adjust) % lh.maximum_ops_per_insn;
+		}
+	      break;
+	    case DW_LNS_fixed_advance_pc:
+	      address += read_2_bytes (abfd, line_ptr);
+	      op_index = 0;
+	      line_ptr += 2;
+	      break;
+	    default:
+	      /* Unknown standard opcode, ignore it.  */
+	      for (i = 0; i < lh.standard_opcode_lengths[op_code]; i++)
+		{
+		  (void) read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
+		  line_ptr += bytes_read;
+		}
+	      break;
+	    }
+	}
+
+      if (filename)
+	free (filename);
+    }
+
+  if (sort_line_sequences (table))
+    return table;
+
+ fail:
+  if (table->sequences != NULL)
+    free (table->sequences);
+  if (table->files != NULL)
+    free (table->files);
+  if (table->dirs != NULL)
+    free (table->dirs);
+  return NULL;
+}
+
+/* If ADDR is within TABLE set the output parameters and return TRUE,
+   otherwise return FALSE.  The output parameters, FILENAME_PTR and
+   LINENUMBER_PTR, are pointers to the objects to be filled in.  */
+
+static bfd_boolean
+lookup_address_in_line_info_table (struct line_info_table *table,
+				   bfd_vma addr,
+				   const char **filename_ptr,
+				   unsigned int *linenumber_ptr)
+{
+  struct line_sequence *seq = NULL;
+  struct line_info *each_line;
+  int low, high, mid;
+
+  /* Binary search the array of sequences.  */
+  low = 0;
+  high = table->num_sequences;
+  while (low < high)
+    {
+      mid = (low + high) / 2;
+      seq = &table->sequences[mid];
+      if (addr < seq->low_pc)
+	high = mid;
+      else if (addr >= seq->last_line->address)
+	low = mid + 1;
+      else
+	break;
+    }
+
+  if (seq && addr >= seq->low_pc && addr < seq->last_line->address)
+    {
+      /* Note: seq->last_line should be a descendingly sorted list.  */
+      for (each_line = seq->last_line;
+           each_line;
+           each_line = each_line->prev_line)
+        if (addr >= each_line->address)
+          break;
+
+      if (each_line
+          && !(each_line->end_sequence || each_line == seq->last_line))
+        {
+          *filename_ptr = each_line->filename;
+          *linenumber_ptr = each_line->line;
+          return TRUE;
+        }
+    }
+
+  *filename_ptr = NULL;
+  return FALSE;
+}
+
+/* Read in the .debug_ranges section for future reference.  */
+
+static bfd_boolean
+read_debug_ranges (struct comp_unit *unit)
+{
+  struct dwarf2_debug *stash = unit->stash;
+  return read_section (unit->abfd, debug_ranges, stash->syms, 0,
+		       &stash->dwarf_ranges_buffer, &stash->dwarf_ranges_size);
+}
+
+/* Function table functions.  */
+
+/* If ADDR is within TABLE, set FUNCTIONNAME_PTR, and return TRUE.
+   Note that we need to find the function that has the smallest
+   range that contains ADDR, to handle inlined functions without
+   depending upon them being ordered in TABLE by increasing range. */
+
+static bfd_boolean
+lookup_address_in_function_table (struct comp_unit *unit,
+				  bfd_vma addr,
+				  struct funcinfo **function_ptr,
+				  const char **functionname_ptr)
+{
+  struct funcinfo* each_func;
+  struct funcinfo* best_fit = NULL;
+  struct arange *arange;
+
+  for (each_func = unit->function_table;
+       each_func;
+       each_func = each_func->prev_func)
+    {
+      for (arange = &each_func->arange;
+	   arange;
+	   arange = arange->next)
+	{
+	  if (addr >= arange->low && addr < arange->high)
+	    {
+	      if (!best_fit ||
+		  ((arange->high - arange->low) < (best_fit->arange.high - best_fit->arange.low)))
+		best_fit = each_func;
+	    }
+	}
+    }
+
+  if (best_fit)
+    {
+      *functionname_ptr = best_fit->name;
+      *function_ptr = best_fit;
+      return TRUE;
+    }
+  else
+    {
+      return FALSE;
+    }
+}
+
+/* If SYM at ADDR is within function table of UNIT, set FILENAME_PTR
+   and LINENUMBER_PTR, and return TRUE.  */
+
+static bfd_boolean
+lookup_symbol_in_function_table (struct comp_unit *unit,
+				 asymbol *sym,
+				 bfd_vma addr,
+				 const char **filename_ptr,
+				 unsigned int *linenumber_ptr)
+{
+  struct funcinfo* each_func;
+  struct funcinfo* best_fit = NULL;
+  struct arange *arange;
+  const char *name = bfd_asymbol_name (sym);
+  asection *sec = bfd_get_section (sym);
+
+  for (each_func = unit->function_table;
+       each_func;
+       each_func = each_func->prev_func)
+    {
+      for (arange = &each_func->arange;
+	   arange;
+	   arange = arange->next)
+	{
+	  if ((!each_func->sec || each_func->sec == sec)
+	      && addr >= arange->low
+	      && addr < arange->high
+	      && each_func->name
+	      && strcmp (name, each_func->name) == 0
+	      && (!best_fit
+		  || ((arange->high - arange->low)
+		      < (best_fit->arange.high - best_fit->arange.low))))
+	    best_fit = each_func;
+	}
+    }
+
+  if (best_fit)
+    {
+      best_fit->sec = sec;
+      *filename_ptr = best_fit->file;
+      *linenumber_ptr = best_fit->line;
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+/* Variable table functions.  */
+
+/* If SYM is within variable table of UNIT, set FILENAME_PTR and
+   LINENUMBER_PTR, and return TRUE.  */
+
+static bfd_boolean
+lookup_symbol_in_variable_table (struct comp_unit *unit,
+				 asymbol *sym,
+				 bfd_vma addr,
+				 const char **filename_ptr,
+				 unsigned int *linenumber_ptr)
+{
+  const char *name = bfd_asymbol_name (sym);
+  asection *sec = bfd_get_section (sym);
+  struct varinfo* each;
+
+  for (each = unit->variable_table; each; each = each->prev_var)
+    if (each->stack == 0
+	&& each->file != NULL
+	&& each->name != NULL
+	&& each->addr == addr
+	&& (!each->sec || each->sec == sec)
+	&& strcmp (name, each->name) == 0)
+      break;
+
+  if (each)
+    {
+      each->sec = sec;
+      *filename_ptr = each->file;
+      *linenumber_ptr = each->line;
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+static char *
+find_abstract_instance_name (struct comp_unit *unit,
+			     struct attribute *attr_ptr)
+{
+  bfd *abfd = unit->abfd;
+  bfd_byte *info_ptr;
+  unsigned int abbrev_number, bytes_read, i;
+  struct abbrev_info *abbrev;
+  bfd_uint64_t die_ref = attr_ptr->u.val;
+  struct attribute attr;
+  char *name = 0;
+
+  /* DW_FORM_ref_addr can reference an entry in a different CU. It
+     is an offset from the .debug_info section, not the current CU.  */
+  if (attr_ptr->form == DW_FORM_ref_addr)
+    {
+      /* We only support DW_FORM_ref_addr within the same file, so
+	 any relocations should be resolved already.  */
+      if (!die_ref)
+	abort ();
+
+      info_ptr = unit->sec_info_ptr + die_ref;
+    }
+  else 
+    info_ptr = unit->info_ptr_unit + die_ref;
+  abbrev_number = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
+  info_ptr += bytes_read;
+
+  if (abbrev_number)
+    {
+      abbrev = lookup_abbrev (abbrev_number, unit->abbrevs);
+      if (! abbrev)
+	{
+	  (*_bfd_error_handler) (_("Dwarf Error: Could not find abbrev number %u."),
+				 abbrev_number);
+	  bfd_set_error (bfd_error_bad_value);
+	}
+      else
+	{
+	  for (i = 0; i < abbrev->num_attrs; ++i)
+	    {
+	      info_ptr = read_attribute (&attr, &abbrev->attrs[i], unit,
+					 info_ptr);
+	      if (info_ptr == NULL)
+		break;
+	      switch (attr.name)
+		{
+		case DW_AT_name:
+		  /* Prefer DW_AT_MIPS_linkage_name or DW_AT_linkage_name
+		     over DW_AT_name.  */
+		  if (name == NULL)
+		    name = attr.u.str;
+		  break;
+		case DW_AT_specification:
+		  name = find_abstract_instance_name (unit, &attr);
+		  break;
+		case DW_AT_linkage_name:
+		case DW_AT_MIPS_linkage_name:
+		  name = attr.u.str;
+		  break;
+		default:
+		  break;
+		}
+	    }
+	}
+    }
+  return name;
+}
+
+static bfd_boolean
+read_rangelist (struct comp_unit *unit, struct arange *arange,
+		bfd_uint64_t offset)
+{
+  bfd_byte *ranges_ptr;
+  bfd_vma base_address = unit->base_address;
+
+  if (! unit->stash->dwarf_ranges_buffer)
+    {
+      if (! read_debug_ranges (unit))
+	return FALSE;
+    }
+  ranges_ptr = unit->stash->dwarf_ranges_buffer + offset;
+
+  for (;;)
+    {
+      bfd_vma low_pc;
+      bfd_vma high_pc;
+
+      low_pc = read_address (unit, ranges_ptr);
+      ranges_ptr += unit->addr_size;
+      high_pc = read_address (unit, ranges_ptr);
+      ranges_ptr += unit->addr_size;
+
+      if (low_pc == 0 && high_pc == 0)
+	break;
+      if (low_pc == -1UL && high_pc != -1UL)
+	base_address = high_pc;
+      else
+	{
+	  if (!arange_add (unit->abfd, arange,
+			   base_address + low_pc, base_address + high_pc))
+	    return FALSE;
+	}
+    }
+  return TRUE;
+}
+
+/* DWARF2 Compilation unit functions.  */
+
+/* Scan over each die in a comp. unit looking for functions to add
+   to the function table and variables to the variable table.  */
+
+static bfd_boolean
+scan_unit_for_symbols (struct comp_unit *unit)
+{
+  bfd *abfd = unit->abfd;
+  bfd_byte *info_ptr = unit->first_child_die_ptr;
+  int nesting_level = 1;
+  struct funcinfo **nested_funcs;
+  int nested_funcs_size;
+
+  /* Maintain a stack of in-scope functions and inlined functions, which we
+     can use to set the caller_func field.  */
+  nested_funcs_size = 32;
+  nested_funcs = (struct funcinfo **)
+      bfd_malloc (nested_funcs_size * sizeof (struct funcinfo *));
+  if (nested_funcs == NULL)
+    return FALSE;
+  nested_funcs[nesting_level] = 0;
+
+  while (nesting_level)
+    {
+      unsigned int abbrev_number, bytes_read, i;
+      struct abbrev_info *abbrev;
+      struct attribute attr;
+      struct funcinfo *func;
+      struct varinfo *var;
+      bfd_vma low_pc = 0;
+      bfd_vma high_pc = 0;
+
+      abbrev_number = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
+      info_ptr += bytes_read;
+
+      if (! abbrev_number)
+	{
+	  nesting_level--;
+	  continue;
+	}
+
+      abbrev = lookup_abbrev (abbrev_number,unit->abbrevs);
+      if (! abbrev)
+	{
+	  (*_bfd_error_handler)
+	    (_("Dwarf Error: Could not find abbrev number %u."),
+	     abbrev_number);
+	  bfd_set_error (bfd_error_bad_value);
+	  goto fail;
+	}
+
+      var = NULL;
+      if (abbrev->tag == DW_TAG_subprogram
+	  || abbrev->tag == DW_TAG_entry_point
+	  || abbrev->tag == DW_TAG_inlined_subroutine)
+	{
+	  bfd_size_type amt = sizeof (struct funcinfo);
+	  func = (struct funcinfo *) bfd_zalloc (abfd, amt);
+	  if (func == NULL)
+	    goto fail;
+	  func->tag = abbrev->tag;
+	  func->prev_func = unit->function_table;
+	  unit->function_table = func;
+	  BFD_ASSERT (!unit->cached);
+
+	  if (func->tag == DW_TAG_inlined_subroutine)
+	    for (i = nesting_level - 1; i >= 1; i--)
+	      if (nested_funcs[i])
+		{
+		  func->caller_func = nested_funcs[i];
+		  break;
+		}
+	  nested_funcs[nesting_level] = func;
+	}
+      else
+	{
+	  func = NULL;
+	  if (abbrev->tag == DW_TAG_variable)
+	    {
+	      bfd_size_type amt = sizeof (struct varinfo);
+	      var = (struct varinfo *) bfd_zalloc (abfd, amt);
+	      if (var == NULL)
+		goto fail;
+	      var->tag = abbrev->tag;
+	      var->stack = 1;
+	      var->prev_var = unit->variable_table;
+	      unit->variable_table = var;
+	      BFD_ASSERT (!unit->cached);
+	    }
+
+	  /* No inline function in scope at this nesting level.  */
+	  nested_funcs[nesting_level] = 0;
+	}
+
+      for (i = 0; i < abbrev->num_attrs; ++i)
+	{
+	  info_ptr = read_attribute (&attr, &abbrev->attrs[i], unit, info_ptr);
+	  if (info_ptr == NULL)
+	    goto fail;
+
+	  if (func)
+	    {
+	      switch (attr.name)
+		{
+		case DW_AT_call_file:
+		  func->caller_file = concat_filename (unit->line_table,
+						       attr.u.val);
+		  break;
+
+		case DW_AT_call_line:
+		  func->caller_line = attr.u.val;
+		  break;
+
+		case DW_AT_abstract_origin:
+		case DW_AT_specification:
+		  func->name = find_abstract_instance_name (unit, &attr);
+		  break;
+
+		case DW_AT_name:
+		  /* Prefer DW_AT_MIPS_linkage_name or DW_AT_linkage_name
+		     over DW_AT_name.  */
+		  if (func->name == NULL)
+		    func->name = attr.u.str;
+		  break;
+
+		case DW_AT_linkage_name:
+		case DW_AT_MIPS_linkage_name:
+		  func->name = attr.u.str;
+		  break;
+
+		case DW_AT_low_pc:
+		  low_pc = attr.u.val;
+		  break;
+
+		case DW_AT_high_pc:
+		  high_pc = attr.u.val;
+		  break;
+
+		case DW_AT_ranges:
+		  if (!read_rangelist (unit, &func->arange, attr.u.val))
+		    goto fail;
+		  break;
+
+		case DW_AT_decl_file:
+		  func->file = concat_filename (unit->line_table,
+						attr.u.val);
+		  break;
+
+		case DW_AT_decl_line:
+		  func->line = attr.u.val;
+		  break;
+
+		default:
+		  break;
+		}
+	    }
+	  else if (var)
+	    {
+	      switch (attr.name)
+		{
+		case DW_AT_name:
+		  var->name = attr.u.str;
+		  break;
+
+		case DW_AT_decl_file:
+		  var->file = concat_filename (unit->line_table,
+					       attr.u.val);
+		  break;
+
+		case DW_AT_decl_line:
+		  var->line = attr.u.val;
+		  break;
+
+		case DW_AT_external:
+		  if (attr.u.val != 0)
+		    var->stack = 0;
+		  break;
+
+		case DW_AT_location:
+		  switch (attr.form)
+		    {
+		    case DW_FORM_block:
+		    case DW_FORM_block1:
+		    case DW_FORM_block2:
+		    case DW_FORM_block4:
+		    case DW_FORM_exprloc:
+		      if (*attr.u.blk->data == DW_OP_addr)
+			{
+			  var->stack = 0;
+
+			  /* Verify that DW_OP_addr is the only opcode in the
+			     location, in which case the block size will be 1
+			     plus the address size.  */
+			  /* ??? For TLS variables, gcc can emit
+			     DW_OP_addr <addr> DW_OP_GNU_push_tls_address
+			     which we don't handle here yet.  */
+			  if (attr.u.blk->size == unit->addr_size + 1U)
+			    var->addr = bfd_get (unit->addr_size * 8,
+						 unit->abfd,
+						 attr.u.blk->data + 1);
+			}
+		      break;
+
+		    default:
+		      break;
+		    }
+		  break;
+
+		default:
+		  break;
+		}
+	    }
+	}
+
+      if (func && high_pc != 0)
+	{
+	  if (!arange_add (unit->abfd, &func->arange, low_pc, high_pc))
+	    goto fail;
+	}
+
+      if (abbrev->has_children)
+	{
+	  nesting_level++;
+
+	  if (nesting_level >= nested_funcs_size)
+	    {
+	      struct funcinfo **tmp;
+
+	      nested_funcs_size *= 2;
+	      tmp = (struct funcinfo **)
+                 bfd_realloc (nested_funcs,
+                              (nested_funcs_size * sizeof (struct funcinfo *)));
+	      if (tmp == NULL)
+		goto fail;
+	      nested_funcs = tmp;
+	    }
+	  nested_funcs[nesting_level] = 0;
+	}
+    }
+
+  free (nested_funcs);
+  return TRUE;
+
+ fail:
+  free (nested_funcs);
+  return FALSE;
+}
+
+/* Parse a DWARF2 compilation unit starting at INFO_PTR.  This
+   includes the compilation unit header that proceeds the DIE's, but
+   does not include the length field that precedes each compilation
+   unit header.  END_PTR points one past the end of this comp unit.
+   OFFSET_SIZE is the size of DWARF2 offsets (either 4 or 8 bytes).
+
+   This routine does not read the whole compilation unit; only enough
+   to get to the line number information for the compilation unit.  */
+
+static struct comp_unit *
+parse_comp_unit (struct dwarf2_debug *stash,
+		 bfd_vma unit_length,
+		 bfd_byte *info_ptr_unit,
+		 unsigned int offset_size)
+{
+  struct comp_unit* unit;
+  unsigned int version;
+  bfd_uint64_t abbrev_offset = 0;
+  unsigned int addr_size;
+  struct abbrev_info** abbrevs;
+  unsigned int abbrev_number, bytes_read, i;
+  struct abbrev_info *abbrev;
+  struct attribute attr;
+  bfd_byte *info_ptr = stash->info_ptr;
+  bfd_byte *end_ptr = info_ptr + unit_length;
+  bfd_size_type amt;
+  bfd_vma low_pc = 0;
+  bfd_vma high_pc = 0;
+  bfd *abfd = stash->bfd_ptr;
+
+  version = read_2_bytes (abfd, info_ptr);
+  info_ptr += 2;
+  BFD_ASSERT (offset_size == 4 || offset_size == 8);
+  if (offset_size == 4)
+    abbrev_offset = read_4_bytes (abfd, info_ptr);
+  else
+    abbrev_offset = read_8_bytes (abfd, info_ptr);
+  info_ptr += offset_size;
+  addr_size = read_1_byte (abfd, info_ptr);
+  info_ptr += 1;
+
+  if (version != 2 && version != 3 && version != 4)
+    {
+      (*_bfd_error_handler) (_("Dwarf Error: found dwarf version '%u', this reader only handles version 2, 3 and 4 information."), version);
+      bfd_set_error (bfd_error_bad_value);
+      return 0;
+    }
+
+  if (addr_size > sizeof (bfd_vma))
+    {
+      (*_bfd_error_handler) (_("Dwarf Error: found address size '%u', this reader can not handle sizes greater than '%u'."),
+			 addr_size,
+			 (unsigned int) sizeof (bfd_vma));
+      bfd_set_error (bfd_error_bad_value);
+      return 0;
+    }
+
+  if (addr_size != 2 && addr_size != 4 && addr_size != 8)
+    {
+      (*_bfd_error_handler) ("Dwarf Error: found address size '%u', this reader can only handle address sizes '2', '4' and '8'.", addr_size);
+      bfd_set_error (bfd_error_bad_value);
+      return 0;
+    }
+
+  /* Read the abbrevs for this compilation unit into a table.  */
+  abbrevs = read_abbrevs (abfd, abbrev_offset, stash);
+  if (! abbrevs)
+      return 0;
+
+  abbrev_number = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
+  info_ptr += bytes_read;
+  if (! abbrev_number)
+    {
+      (*_bfd_error_handler) (_("Dwarf Error: Bad abbrev number: %u."),
+			 abbrev_number);
+      bfd_set_error (bfd_error_bad_value);
+      return 0;
+    }
+
+  abbrev = lookup_abbrev (abbrev_number, abbrevs);
+  if (! abbrev)
+    {
+      (*_bfd_error_handler) (_("Dwarf Error: Could not find abbrev number %u."),
+			 abbrev_number);
+      bfd_set_error (bfd_error_bad_value);
+      return 0;
+    }
+
+  amt = sizeof (struct comp_unit);
+  unit = (struct comp_unit *) bfd_zalloc (abfd, amt);
+  if (unit == NULL)
+    return NULL;
+  unit->abfd = abfd;
+  unit->version = version;
+  unit->addr_size = addr_size;
+  unit->offset_size = offset_size;
+  unit->abbrevs = abbrevs;
+  unit->end_ptr = end_ptr;
+  unit->stash = stash;
+  unit->info_ptr_unit = info_ptr_unit;
+  unit->sec_info_ptr = stash->sec_info_ptr;
+
+  for (i = 0; i < abbrev->num_attrs; ++i)
+    {
+      info_ptr = read_attribute (&attr, &abbrev->attrs[i], unit, info_ptr);
+      if (info_ptr == NULL)
+	return NULL;
+
+      /* Store the data if it is of an attribute we want to keep in a
+	 partial symbol table.  */
+      switch (attr.name)
+	{
+	case DW_AT_stmt_list:
+	  unit->stmtlist = 1;
+	  unit->line_offset = attr.u.val;
+	  break;
+
+	case DW_AT_name:
+	  unit->name = attr.u.str;
+	  break;
+
+	case DW_AT_low_pc:
+	  low_pc = attr.u.val;
+	  /* If the compilation unit DIE has a DW_AT_low_pc attribute,
+	     this is the base address to use when reading location
+	     lists or range lists. */
+	  unit->base_address = low_pc;
+	  break;
+
+	case DW_AT_high_pc:
+	  high_pc = attr.u.val;
+	  break;
+
+	case DW_AT_ranges:
+	  if (!read_rangelist (unit, &unit->arange, attr.u.val))
+	    return NULL;
+	  break;
+
+	case DW_AT_comp_dir:
+	  {
+	    char *comp_dir = attr.u.str;
+	    if (comp_dir)
+	      {
+		/* Irix 6.2 native cc prepends <machine>.: to the compilation
+		   directory, get rid of it.  */
+		char *cp = strchr (comp_dir, ':');
+
+		if (cp && cp != comp_dir && cp[-1] == '.' && cp[1] == '/')
+		  comp_dir = cp + 1;
+	      }
+	    unit->comp_dir = comp_dir;
+	    break;
+	  }
+
+	default:
+	  break;
+	}
+    }
+  if (high_pc != 0)
+    {
+      if (!arange_add (unit->abfd, &unit->arange, low_pc, high_pc))
+	return NULL;
+    }
+
+  unit->first_child_die_ptr = info_ptr;
+  return unit;
+}
+
+/* Return TRUE if UNIT may contain the address given by ADDR.  When
+   there are functions written entirely with inline asm statements, the
+   range info in the compilation unit header may not be correct.  We
+   need to consult the line info table to see if a compilation unit
+   really contains the given address.  */
+
+static bfd_boolean
+comp_unit_contains_address (struct comp_unit *unit, bfd_vma addr)
+{
+  struct arange *arange;
+
+  if (unit->error)
+    return FALSE;
+
+  arange = &unit->arange;
+  do
+    {
+      if (addr >= arange->low && addr < arange->high)
+	return TRUE;
+      arange = arange->next;
+    }
+  while (arange);
+
+  return FALSE;
+}
+
+/* If UNIT contains ADDR, set the output parameters to the values for
+   the line containing ADDR.  The output parameters, FILENAME_PTR,
+   FUNCTIONNAME_PTR, and LINENUMBER_PTR, are pointers to the objects
+   to be filled in.
+
+   Return TRUE if UNIT contains ADDR, and no errors were encountered;
+   FALSE otherwise.  */
+
+static bfd_boolean
+comp_unit_find_nearest_line (struct comp_unit *unit,
+			     bfd_vma addr,
+			     const char **filename_ptr,
+			     const char **functionname_ptr,
+			     unsigned int *linenumber_ptr,
+			     struct dwarf2_debug *stash)
+{
+  bfd_boolean line_p;
+  bfd_boolean func_p;
+  struct funcinfo *function;
+
+  if (unit->error)
+    return FALSE;
+
+  if (! unit->line_table)
+    {
+      if (! unit->stmtlist)
+	{
+	  unit->error = 1;
+	  return FALSE;
+	}
+
+      unit->line_table = decode_line_info (unit, stash);
+
+      if (! unit->line_table)
+	{
+	  unit->error = 1;
+	  return FALSE;
+	}
+
+      if (unit->first_child_die_ptr < unit->end_ptr
+	  && ! scan_unit_for_symbols (unit))
+	{
+	  unit->error = 1;
+	  return FALSE;
+	}
+    }
+
+  function = NULL;
+  func_p = lookup_address_in_function_table (unit, addr,
+					     &function, functionname_ptr);
+  if (func_p && (function->tag == DW_TAG_inlined_subroutine))
+    stash->inliner_chain = function;
+  line_p = lookup_address_in_line_info_table (unit->line_table, addr,
+					      filename_ptr,
+					      linenumber_ptr);
+  return line_p || func_p;
+}
+
+/* Check to see if line info is already decoded in a comp_unit.
+   If not, decode it.  Returns TRUE if no errors were encountered;
+   FALSE otherwise.  */
+
+static bfd_boolean
+comp_unit_maybe_decode_line_info (struct comp_unit *unit,
+				  struct dwarf2_debug *stash)
+{
+  if (unit->error)
+    return FALSE;
+
+  if (! unit->line_table)
+    {
+      if (! unit->stmtlist)
+	{
+	  unit->error = 1;
+	  return FALSE;
+	}
+
+      unit->line_table = decode_line_info (unit, stash);
+
+      if (! unit->line_table)
+	{
+	  unit->error = 1;
+	  return FALSE;
+	}
+
+      if (unit->first_child_die_ptr < unit->end_ptr
+	  && ! scan_unit_for_symbols (unit))
+	{
+	  unit->error = 1;
+	  return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* If UNIT contains SYM at ADDR, set the output parameters to the
+   values for the line containing SYM.  The output parameters,
+   FILENAME_PTR, and LINENUMBER_PTR, are pointers to the objects to be
+   filled in.
+
+   Return TRUE if UNIT contains SYM, and no errors were encountered;
+   FALSE otherwise.  */
+
+static bfd_boolean
+comp_unit_find_line (struct comp_unit *unit,
+		     asymbol *sym,
+		     bfd_vma addr,
+		     const char **filename_ptr,
+		     unsigned int *linenumber_ptr,
+		     struct dwarf2_debug *stash)
+{
+  if (!comp_unit_maybe_decode_line_info (unit, stash))
+    return FALSE;
+
+  if (sym->flags & BSF_FUNCTION)
+    return lookup_symbol_in_function_table (unit, sym, addr,
+					    filename_ptr,
+					    linenumber_ptr);
+
+  return lookup_symbol_in_variable_table (unit, sym, addr,
+					  filename_ptr,
+					  linenumber_ptr);
+}
+
+static struct funcinfo *
+reverse_funcinfo_list (struct funcinfo *head)
+{
+  struct funcinfo *rhead;
+  struct funcinfo *temp;
+
+  for (rhead = NULL; head; head = temp)
+    {
+      temp = head->prev_func;
+      head->prev_func = rhead;
+      rhead = head;
+    }
+  return rhead;
+}
+
+static struct varinfo *
+reverse_varinfo_list (struct varinfo *head)
+{
+  struct varinfo *rhead;
+  struct varinfo *temp;
+
+  for (rhead = NULL; head; head = temp)
+    {
+      temp = head->prev_var;
+      head->prev_var = rhead;
+      rhead = head;
+    }
+  return rhead;
+}
+
+/* Extract all interesting funcinfos and varinfos of a compilation
+   unit into hash tables for faster lookup.  Returns TRUE if no
+   errors were enountered; FALSE otherwise.  */
+
+static bfd_boolean
+comp_unit_hash_info (struct dwarf2_debug *stash,
+		     struct comp_unit *unit,
+		     struct info_hash_table *funcinfo_hash_table,
+		     struct info_hash_table *varinfo_hash_table)
+{
+  struct funcinfo* each_func;
+  struct varinfo* each_var;
+  bfd_boolean okay = TRUE;
+
+  BFD_ASSERT (stash->info_hash_status != STASH_INFO_HASH_DISABLED);
+
+  if (!comp_unit_maybe_decode_line_info (unit, stash))
+    return FALSE;
+
+  BFD_ASSERT (!unit->cached);
+
+  /* To preserve the original search order, we went to visit the function
+     infos in the reversed order of the list.  However, making the list
+     bi-directional use quite a bit of extra memory.  So we reverse
+     the list first, traverse the list in the now reversed order and
+     finally reverse the list again to get back the original order.  */
+  unit->function_table = reverse_funcinfo_list (unit->function_table);
+  for (each_func = unit->function_table;
+       each_func && okay;
+       each_func = each_func->prev_func)
+    {
+      /* Skip nameless functions. */
+      if (each_func->name)
+	/* There is no need to copy name string into hash table as
+	   name string is either in the dwarf string buffer or
+	   info in the stash.  */
+	okay = insert_info_hash_table (funcinfo_hash_table, each_func->name,
+				       (void*) each_func, FALSE);
+    }
+  unit->function_table = reverse_funcinfo_list (unit->function_table);
+  if (!okay)
+    return FALSE;
+
+  /* We do the same for variable infos.  */
+  unit->variable_table = reverse_varinfo_list (unit->variable_table);
+  for (each_var = unit->variable_table;
+       each_var && okay;
+       each_var = each_var->prev_var)
+    {
+      /* Skip stack vars and vars with no files or names.  */
+      if (each_var->stack == 0
+	  && each_var->file != NULL
+	  && each_var->name != NULL)
+	/* There is no need to copy name string into hash table as
+	   name string is either in the dwarf string buffer or
+	   info in the stash.  */
+	okay = insert_info_hash_table (varinfo_hash_table, each_var->name,
+				       (void*) each_var, FALSE);
+    }
+
+  unit->variable_table = reverse_varinfo_list (unit->variable_table);
+  unit->cached = TRUE;
+  return okay;
+}
+
+/* Locate a section in a BFD containing debugging info.  The search starts
+   from the section after AFTER_SEC, or from the first section in the BFD if
+   AFTER_SEC is NULL.  The search works by examining the names of the
+   sections.  There are two permissiable names.  The first is .debug_info.
+   This is the standard DWARF2 name.  The second is a prefix .gnu.linkonce.wi.
+   This is a variation on the .debug_info section which has a checksum
+   describing the contents appended onto the name.  This allows the linker to
+   identify and discard duplicate debugging sections for different
+   compilation units.  */
+#define DWARF2_DEBUG_INFO ".debug_info"
+#define DWARF2_COMPRESSED_DEBUG_INFO ".zdebug_info"
+#define GNU_LINKONCE_INFO ".gnu.linkonce.wi."
+
+static asection *
+find_debug_info (bfd *abfd, asection *after_sec)
+{
+  asection * msec;
+
+  msec = after_sec != NULL ? after_sec->next : abfd->sections;
+
+  while (msec)
+    {
+      if (strcmp (msec->name, DWARF2_DEBUG_INFO) == 0)
+	return msec;
+
+      if (strcmp (msec->name, DWARF2_COMPRESSED_DEBUG_INFO) == 0)
+	return msec;
+
+      if (CONST_STRNEQ (msec->name, GNU_LINKONCE_INFO))
+	return msec;
+
+      msec = msec->next;
+    }
+
+  return NULL;
+}
+
+/* Unset vmas for adjusted sections in STASH.  */
+
+static void
+unset_sections (struct dwarf2_debug *stash)
+{
+  unsigned int i;
+  struct adjusted_section *p;
+
+  i = stash->adjusted_section_count;
+  p = stash->adjusted_sections;
+  for (; i > 0; i--, p++)
+    p->section->vma = 0;
+}
+
+/* Set unique VMAs for loadable and DWARF sections in ABFD and save
+   VMAs in STASH for unset_sections.  */
+
+static bfd_boolean
+place_sections (bfd *abfd, struct dwarf2_debug *stash)
+{
+  struct adjusted_section *p;
+  unsigned int i;
+
+  if (stash->adjusted_section_count != 0)
+    {
+      i = stash->adjusted_section_count;
+      p = stash->adjusted_sections;
+      for (; i > 0; i--, p++)
+	p->section->vma = p->adj_vma;
+    }
+  else
+    {
+      asection *sect;
+      bfd_vma last_vma = 0, last_dwarf = 0;
+      bfd_size_type amt;
+
+      i = 0;
+      for (sect = abfd->sections; sect != NULL; sect = sect->next)
+	{
+	  bfd_size_type sz;
+	  int is_debug_info;
+
+	  if (sect->vma != 0)
+	    continue;
+
+	  /* We need to adjust the VMAs of any .debug_info sections.
+	     Skip compressed ones, since no relocations could target
+	     them - they should not appear in object files anyway.  */
+	  if (strcmp (sect->name, DWARF2_DEBUG_INFO) == 0)
+	    is_debug_info = 1;
+	  else if (CONST_STRNEQ (sect->name, GNU_LINKONCE_INFO))
+	    is_debug_info = 1;
+	  else
+	    is_debug_info = 0;
+
+	  if (!is_debug_info && (sect->flags & SEC_LOAD) == 0)
+	    continue;
+
+	  sz = sect->rawsize ? sect->rawsize : sect->size;
+	  if (sz == 0)
+	    continue;
+
+	  i++;
+	}
+
+      amt = i * sizeof (struct adjusted_section);
+      p = (struct adjusted_section *) bfd_zalloc (abfd, amt);
+      if (! p)
+	return FALSE;
+
+      stash->adjusted_sections = p;
+      stash->adjusted_section_count = i;
+
+      for (sect = abfd->sections; sect != NULL; sect = sect->next)
+	{
+	  bfd_size_type sz;
+	  int is_debug_info;
+
+	  if (sect->vma != 0)
+	    continue;
+
+	  /* We need to adjust the VMAs of any .debug_info sections.
+	     Skip compressed ones, since no relocations could target
+	     them - they should not appear in object files anyway.  */
+	  if (strcmp (sect->name, DWARF2_DEBUG_INFO) == 0)
+	    is_debug_info = 1;
+	  else if (CONST_STRNEQ (sect->name, GNU_LINKONCE_INFO))
+	    is_debug_info = 1;
+	  else
+	    is_debug_info = 0;
+
+	  if (!is_debug_info && (sect->flags & SEC_LOAD) == 0)
+	    continue;
+
+	  sz = sect->rawsize ? sect->rawsize : sect->size;
+	  if (sz == 0)
+	    continue;
+
+	  p->section = sect;
+	  if (is_debug_info)
+	    {
+	      BFD_ASSERT (sect->alignment_power == 0);
+	      sect->vma = last_dwarf;
+	      last_dwarf += sz;
+	    }
+	  else if (last_vma != 0)
+	    {
+	      /* Align the new address to the current section
+		 alignment.  */
+	      last_vma = ((last_vma
+			   + ~((bfd_vma) -1 << sect->alignment_power))
+			  & ((bfd_vma) -1 << sect->alignment_power));
+	      sect->vma = last_vma;
+	      last_vma += sect->vma + sz;
+	    }
+	  else
+	    last_vma += sect->vma + sz;
+
+	  p->adj_vma = sect->vma;
+
+	  p++;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Look up a funcinfo by name using the given info hash table.  If found,
+   also update the locations pointed to by filename_ptr and linenumber_ptr.
+
+   This function returns TRUE if a funcinfo that matches the given symbol
+   and address is found with any error; otherwise it returns FALSE.  */
+
+static bfd_boolean
+info_hash_lookup_funcinfo (struct info_hash_table *hash_table,
+			   asymbol *sym,
+			   bfd_vma addr,
+			   const char **filename_ptr,
+			   unsigned int *linenumber_ptr)
+{
+  struct funcinfo* each_func;
+  struct funcinfo* best_fit = NULL;
+  struct info_list_node *node;
+  struct arange *arange;
+  const char *name = bfd_asymbol_name (sym);
+  asection *sec = bfd_get_section (sym);
+
+  for (node = lookup_info_hash_table (hash_table, name);
+       node;
+       node = node->next)
+    {
+      each_func = (struct funcinfo *) node->info;
+      for (arange = &each_func->arange;
+	   arange;
+	   arange = arange->next)
+	{
+	  if ((!each_func->sec || each_func->sec == sec)
+	      && addr >= arange->low
+	      && addr < arange->high
+	      && (!best_fit
+		  || ((arange->high - arange->low)
+		      < (best_fit->arange.high - best_fit->arange.low))))
+	    best_fit = each_func;
+	}
+    }
+
+  if (best_fit)
+    {
+      best_fit->sec = sec;
+      *filename_ptr = best_fit->file;
+      *linenumber_ptr = best_fit->line;
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+/* Look up a varinfo by name using the given info hash table.  If found,
+   also update the locations pointed to by filename_ptr and linenumber_ptr.
+
+   This function returns TRUE if a varinfo that matches the given symbol
+   and address is found with any error; otherwise it returns FALSE.  */
+
+static bfd_boolean
+info_hash_lookup_varinfo (struct info_hash_table *hash_table,
+			  asymbol *sym,
+			  bfd_vma addr,
+			  const char **filename_ptr,
+			  unsigned int *linenumber_ptr)
+{
+  const char *name = bfd_asymbol_name (sym);
+  asection *sec = bfd_get_section (sym);
+  struct varinfo* each;
+  struct info_list_node *node;
+
+  for (node = lookup_info_hash_table (hash_table, name);
+       node;
+       node = node->next)
+    {
+      each = (struct varinfo *) node->info;
+      if (each->addr == addr
+	  && (!each->sec || each->sec == sec))
+	{
+	  each->sec = sec;
+	  *filename_ptr = each->file;
+	  *linenumber_ptr = each->line;
+	  return TRUE;
+	}
+    }
+
+  return FALSE;
+}
+
+/* Update the funcinfo and varinfo info hash tables if they are
+   not up to date.  Returns TRUE if there is no error; otherwise
+   returns FALSE and disable the info hash tables.  */
+
+static bfd_boolean
+stash_maybe_update_info_hash_tables (struct dwarf2_debug *stash)
+{
+  struct comp_unit *each;
+
+  /* Exit if hash tables are up-to-date.  */
+  if (stash->all_comp_units == stash->hash_units_head)
+    return TRUE;
+
+  if (stash->hash_units_head)
+    each = stash->hash_units_head->prev_unit;
+  else
+    each = stash->last_comp_unit;
+
+  while (each)
+    {
+      if (!comp_unit_hash_info (stash, each, stash->funcinfo_hash_table,
+				stash->varinfo_hash_table))
+	{
+	  stash->info_hash_status = STASH_INFO_HASH_DISABLED;
+	  return FALSE;
+	}
+      each = each->prev_unit;
+    }
+
+  stash->hash_units_head = stash->all_comp_units;
+  return TRUE;
+}
+
+/* Check consistency of info hash tables.  This is for debugging only. */
+
+static void ATTRIBUTE_UNUSED
+stash_verify_info_hash_table (struct dwarf2_debug *stash)
+{
+  struct comp_unit *each_unit;
+  struct funcinfo *each_func;
+  struct varinfo *each_var;
+  struct info_list_node *node;
+  bfd_boolean found;
+
+  for (each_unit = stash->all_comp_units;
+       each_unit;
+       each_unit = each_unit->next_unit)
+    {
+      for (each_func = each_unit->function_table;
+	   each_func;
+	   each_func = each_func->prev_func)
+	{
+	  if (!each_func->name)
+	    continue;
+	  node = lookup_info_hash_table (stash->funcinfo_hash_table,
+					 each_func->name);
+	  BFD_ASSERT (node);
+	  found = FALSE;
+	  while (node && !found)
+	    {
+	      found = node->info == each_func;
+	      node = node->next;
+	    }
+	  BFD_ASSERT (found);
+	}
+
+      for (each_var = each_unit->variable_table;
+	   each_var;
+	   each_var = each_var->prev_var)
+	{
+	  if (!each_var->name || !each_var->file || each_var->stack)
+	    continue;
+	  node = lookup_info_hash_table (stash->varinfo_hash_table,
+					 each_var->name);
+	  BFD_ASSERT (node);
+	  found = FALSE;
+	  while (node && !found)
+	    {
+	      found = node->info == each_var;
+	      node = node->next;
+	    }
+	  BFD_ASSERT (found);
+	}
+    }
+}
+
+/* Check to see if we want to enable the info hash tables, which consume
+   quite a bit of memory.  Currently we only check the number times
+   bfd_dwarf2_find_line is called.  In the future, we may also want to
+   take the number of symbols into account.  */
+
+static void
+stash_maybe_enable_info_hash_tables (bfd *abfd, struct dwarf2_debug *stash)
+{
+  BFD_ASSERT (stash->info_hash_status == STASH_INFO_HASH_OFF);
+
+  if (stash->info_hash_count++ < STASH_INFO_HASH_TRIGGER)
+    return;
+
+  /* FIXME: Maybe we should check the reduce_memory_overheads
+     and optimize fields in the bfd_link_info structure ?  */
+
+  /* Create hash tables.  */
+  stash->funcinfo_hash_table = create_info_hash_table (abfd);
+  stash->varinfo_hash_table = create_info_hash_table (abfd);
+  if (!stash->funcinfo_hash_table || !stash->varinfo_hash_table)
+    {
+      /* Turn off info hashes if any allocation above fails.  */
+      stash->info_hash_status = STASH_INFO_HASH_DISABLED;
+      return;
+    }
+  /* We need a forced update so that the info hash tables will
+     be created even though there is no compilation unit.  That
+     happens if STASH_INFO_HASH_TRIGGER is 0.  */
+  stash_maybe_update_info_hash_tables (stash);
+  stash->info_hash_status = STASH_INFO_HASH_ON;
+}
+
+/* Find the file and line associated with a symbol and address using the
+   info hash tables of a stash. If there is a match, the function returns
+   TRUE and update the locations pointed to by filename_ptr and linenumber_ptr;
+   otherwise it returns FALSE.  */
+
+static bfd_boolean
+stash_find_line_fast (struct dwarf2_debug *stash,
+		      asymbol *sym,
+		      bfd_vma addr,
+		      const char **filename_ptr,
+		      unsigned int *linenumber_ptr)
+{
+  BFD_ASSERT (stash->info_hash_status == STASH_INFO_HASH_ON);
+
+  if (sym->flags & BSF_FUNCTION)
+    return info_hash_lookup_funcinfo (stash->funcinfo_hash_table, sym, addr,
+				      filename_ptr, linenumber_ptr);
+  return info_hash_lookup_varinfo (stash->varinfo_hash_table, sym, addr,
+				   filename_ptr, linenumber_ptr);
+}
+
+/* Find the source code location of SYMBOL.  If SYMBOL is NULL
+   then find the nearest source code location corresponding to
+   the address SECTION + OFFSET.
+   Returns TRUE if the line is found without error and fills in
+   FILENAME_PTR and LINENUMBER_PTR.  In the case where SYMBOL was
+   NULL the FUNCTIONNAME_PTR is also filled in.
+   SYMBOLS contains the symbol table for ABFD.
+   ADDR_SIZE is the number of bytes in the initial .debug_info length
+   field and in the abbreviation offset, or zero to indicate that the
+   default value should be used.  */
+
+static bfd_boolean
+find_line (bfd *abfd,
+	   asection *section,
+	   bfd_vma offset,
+	   asymbol *symbol,
+	   asymbol **symbols,
+	   const char **filename_ptr,
+	   const char **functionname_ptr,
+	   unsigned int *linenumber_ptr,
+	   unsigned int addr_size,
+	   void **pinfo)
+{
+  /* Read each compilation unit from the section .debug_info, and check
+     to see if it contains the address we are searching for.  If yes,
+     lookup the address, and return the line number info.  If no, go
+     on to the next compilation unit.
+
+     We keep a list of all the previously read compilation units, and
+     a pointer to the next un-read compilation unit.  Check the
+     previously read units before reading more.  */
+  struct dwarf2_debug *stash;
+  /* What address are we looking for?  */
+  bfd_vma addr;
+  struct comp_unit* each;
+  bfd_vma found = FALSE;
+  bfd_boolean do_line;
+
+  stash = (struct dwarf2_debug *) *pinfo;
+
+  if (! stash)
+    {
+      bfd_size_type amt = sizeof (struct dwarf2_debug);
+
+      stash = (struct dwarf2_debug *) bfd_zalloc (abfd, amt);
+      if (! stash)
+	return FALSE;
+    }
+
+  /* In a relocatable file, 2 functions may have the same address.
+     We change the section vma so that they won't overlap.  */
+  if ((abfd->flags & (EXEC_P | DYNAMIC)) == 0)
+    {
+      if (! place_sections (abfd, stash))
+	return FALSE;
+    }
+
+  do_line = (section == NULL
+	     && offset == 0
+	     && functionname_ptr == NULL
+	     && symbol != NULL);
+  if (do_line)
+    {
+      addr = symbol->value;
+      section = bfd_get_section (symbol);
+    }
+  else if (section != NULL
+	   && functionname_ptr != NULL
+	   && symbol == NULL)
+    addr = offset;
+  else
+    abort ();
+
+  if (section->output_section)
+    addr += section->output_section->vma + section->output_offset;
+  else
+    addr += section->vma;
+  *filename_ptr = NULL;
+  if (! do_line)
+    *functionname_ptr = NULL;
+  *linenumber_ptr = 0;
+
+  if (! *pinfo)
+    {
+      bfd *debug_bfd;
+      bfd_size_type total_size;
+      asection *msec;
+
+      *pinfo = stash;
+
+      msec = find_debug_info (abfd, NULL);
+      if (msec == NULL)
+	{
+	  char * debug_filename = bfd_follow_gnu_debuglink (abfd, DEBUGDIR);
+
+	  if (debug_filename == NULL)
+	    /* No dwarf2 info, and no gnu_debuglink to follow.
+	       Note that at this point the stash has been allocated, but
+	       contains zeros.  This lets future calls to this function
+	       fail more quickly.  */
+	    goto done;
+
+	  if ((debug_bfd = bfd_openr (debug_filename, NULL)) == NULL
+	      || ! bfd_check_format (debug_bfd, bfd_object)
+	      || (msec = find_debug_info (debug_bfd, NULL)) == NULL)
+	    {
+	      if (debug_bfd)
+		bfd_close (debug_bfd);
+	      /* FIXME: Should we report our failure to follow the debuglink ?  */
+	      free (debug_filename);
+	      goto done;
+	    }
+	}
+      else
+	debug_bfd = abfd;
+
+      /* There can be more than one DWARF2 info section in a BFD these
+	 days.  First handle the easy case when there's only one.  If
+	 there's more than one, try case two: none of the sections is
+	 compressed.  In that case, read them all in and produce one
+	 large stash.  We do this in two passes - in the first pass we
+	 just accumulate the section sizes, and in the second pass we
+	 read in the section's contents.  (The allows us to avoid
+	 reallocing the data as we add sections to the stash.)  If
+	 some or all sections are compressed, then do things the slow
+	 way, with a bunch of reallocs.  */
+
+      if (! find_debug_info (debug_bfd, msec))
+	{
+	  /* Case 1: only one info section.  */
+	  total_size = msec->size;
+	  if (! read_section (debug_bfd, debug_info, symbols, 0,
+			      &stash->info_ptr_memory, &total_size))
+	    goto done;
+	}
+      else
+	{
+	  /* Case 2: multiple sections.  */
+	  for (total_size = 0; msec; msec = find_debug_info (debug_bfd, msec))
+	    total_size += msec->size;
+
+	  stash->info_ptr_memory = (bfd_byte *) bfd_malloc (total_size);
+	  if (stash->info_ptr_memory == NULL)
+	    goto done;
+
+	  total_size = 0;
+	  for (msec = find_debug_info (debug_bfd, NULL);
+	       msec;
+	       msec = find_debug_info (debug_bfd, msec))
+	    {
+	      bfd_size_type size;
+
+	      size = msec->size;
+	      if (size == 0)
+		continue;
+
+	      if (!(bfd_simple_get_relocated_section_contents
+		    (debug_bfd, msec, stash->info_ptr_memory + total_size,
+		     symbols)))
+		goto done;
+
+	      total_size += size;
+	    }
+	}
+
+      stash->info_ptr = stash->info_ptr_memory;
+      stash->info_ptr_end = stash->info_ptr + total_size;
+      stash->sec = find_debug_info (debug_bfd, NULL);
+      stash->sec_info_ptr = stash->info_ptr;
+      stash->syms = symbols;
+      stash->bfd_ptr = debug_bfd;
+    }
+
+  /* A null info_ptr indicates that there is no dwarf2 info
+     (or that an error occured while setting up the stash).  */
+  if (! stash->info_ptr)
+    goto done;
+
+  stash->inliner_chain = NULL;
+
+  /* Check the previously read comp. units first.  */
+  if (do_line)
+    {
+      /* The info hash tables use quite a bit of memory.  We may not want to
+	 always use them.  We use some heuristics to decide if and when to
+	 turn it on.  */
+      if (stash->info_hash_status == STASH_INFO_HASH_OFF)
+	stash_maybe_enable_info_hash_tables (abfd, stash);
+
+      /* Keep info hash table up to date if they are available.  Note that we
+	 may disable the hash tables if there is any error duing update. */
+      if (stash->info_hash_status == STASH_INFO_HASH_ON)
+	stash_maybe_update_info_hash_tables (stash);
+
+      if (stash->info_hash_status == STASH_INFO_HASH_ON)
+	{
+	  found = stash_find_line_fast (stash, symbol, addr, filename_ptr,
+					linenumber_ptr);
+	  if (found)
+	    goto done;
+	}
+      else
+	{
+	  /* Check the previously read comp. units first.  */
+	  for (each = stash->all_comp_units; each; each = each->next_unit)
+	    if ((symbol->flags & BSF_FUNCTION) == 0
+		|| comp_unit_contains_address (each, addr))
+	      {
+		found = comp_unit_find_line (each, symbol, addr, filename_ptr,
+					     linenumber_ptr, stash);
+		if (found)
+		  goto done;
+	      }
+	}
+    }
+  else
+    {
+      for (each = stash->all_comp_units; each; each = each->next_unit)
+	{
+	  found = (comp_unit_contains_address (each, addr)
+		   && comp_unit_find_nearest_line (each, addr,
+						   filename_ptr,
+						   functionname_ptr,
+						   linenumber_ptr,
+						   stash));
+	  if (found)
+	    goto done;
+	}
+    }
+
+  /* The DWARF2 spec says that the initial length field, and the
+     offset of the abbreviation table, should both be 4-byte values.
+     However, some compilers do things differently.  */
+  if (addr_size == 0)
+    addr_size = 4;
+  BFD_ASSERT (addr_size == 4 || addr_size == 8);
+
+  /* Read each remaining comp. units checking each as they are read.  */
+  while (stash->info_ptr < stash->info_ptr_end)
+    {
+      bfd_vma length;
+      unsigned int offset_size = addr_size;
+      bfd_byte *info_ptr_unit = stash->info_ptr;
+
+      length = read_4_bytes (stash->bfd_ptr, stash->info_ptr);
+      /* A 0xffffff length is the DWARF3 way of indicating
+	 we use 64-bit offsets, instead of 32-bit offsets.  */
+      if (length == 0xffffffff)
+	{
+	  offset_size = 8;
+	  length = read_8_bytes (stash->bfd_ptr, stash->info_ptr + 4);
+	  stash->info_ptr += 12;
+	}
+      /* A zero length is the IRIX way of indicating 64-bit offsets,
+	 mostly because the 64-bit length will generally fit in 32
+	 bits, and the endianness helps.  */
+      else if (length == 0)
+	{
+	  offset_size = 8;
+	  length = read_4_bytes (stash->bfd_ptr, stash->info_ptr + 4);
+	  stash->info_ptr += 8;
+	}
+      /* In the absence of the hints above, we assume 32-bit DWARF2
+	 offsets even for targets with 64-bit addresses, because:
+	   a) most of the time these targets will not have generated
+	      more than 2Gb of debug info and so will not need 64-bit
+	      offsets,
+	 and
+	   b) if they do use 64-bit offsets but they are not using
+	      the size hints that are tested for above then they are
+	      not conforming to the DWARF3 standard anyway.  */
+      else if (addr_size == 8)
+	{
+	  offset_size = 4;
+	  stash->info_ptr += 4;
+	}
+      else
+	stash->info_ptr += 4;
+
+      if (length > 0)
+	{
+	  each = parse_comp_unit (stash, length, info_ptr_unit,
+				  offset_size);
+	  if (!each)
+	    /* The dwarf information is damaged, don't trust it any
+	       more.  */
+	    break;
+	  stash->info_ptr += length;
+
+	  if (stash->all_comp_units)
+	    stash->all_comp_units->prev_unit = each;
+	  else
+	    stash->last_comp_unit = each;
+	  
+	  each->next_unit = stash->all_comp_units;
+	  stash->all_comp_units = each;
+	  
+	  /* DW_AT_low_pc and DW_AT_high_pc are optional for
+	     compilation units.  If we don't have them (i.e.,
+	     unit->high == 0), we need to consult the line info table
+	     to see if a compilation unit contains the given
+	     address.  */
+	  if (do_line)
+	    found = (((symbol->flags & BSF_FUNCTION) == 0
+		      || each->arange.high == 0
+		      || comp_unit_contains_address (each, addr))
+		     && comp_unit_find_line (each, symbol, addr,
+					     filename_ptr,
+					     linenumber_ptr,
+					     stash));
+	  else
+	    found = ((each->arange.high == 0
+		      || comp_unit_contains_address (each, addr))
+		     && comp_unit_find_nearest_line (each, addr,
+						     filename_ptr,
+						     functionname_ptr,
+						     linenumber_ptr,
+						     stash));
+
+	  if ((bfd_vma) (stash->info_ptr - stash->sec_info_ptr)
+	      == stash->sec->size)
+	    {
+	      stash->sec = find_debug_info (stash->bfd_ptr, stash->sec);
+	      stash->sec_info_ptr = stash->info_ptr;
+	    }
+
+	  if (found)
+	    goto done;
+	}
+    }
+
+done:
+  if ((abfd->flags & (EXEC_P | DYNAMIC)) == 0)
+    unset_sections (stash);
+
+  return found;
+}
+
+/* The DWARF2 version of find_nearest_line.
+   Return TRUE if the line is found without error.  */
+
+bfd_boolean
+_bfd_dwarf2_find_nearest_line (bfd *abfd,
+			       asection *section,
+			       asymbol **symbols,
+			       bfd_vma offset,
+			       const char **filename_ptr,
+			       const char **functionname_ptr,
+			       unsigned int *linenumber_ptr,
+			       unsigned int addr_size,
+			       void **pinfo)
+{
+  return find_line (abfd, section, offset, NULL, symbols, filename_ptr,
+		    functionname_ptr, linenumber_ptr, addr_size,
+		    pinfo);
+}
+
+/* The DWARF2 version of find_line.
+   Return TRUE if the line is found without error.  */
+
+bfd_boolean
+_bfd_dwarf2_find_line (bfd *abfd,
+		       asymbol **symbols,
+		       asymbol *symbol,
+		       const char **filename_ptr,
+		       unsigned int *linenumber_ptr,
+		       unsigned int addr_size,
+		       void **pinfo)
+{
+  return find_line (abfd, NULL, 0, symbol, symbols, filename_ptr,
+		    NULL, linenumber_ptr, addr_size,
+		    pinfo);
+}
+
+bfd_boolean
+_bfd_dwarf2_find_inliner_info (bfd *abfd ATTRIBUTE_UNUSED,
+			       const char **filename_ptr,
+			       const char **functionname_ptr,
+			       unsigned int *linenumber_ptr,
+			       void **pinfo)
+{
+  struct dwarf2_debug *stash;
+
+  stash = (struct dwarf2_debug *) *pinfo;
+  if (stash)
+    {
+      struct funcinfo *func = stash->inliner_chain;
+
+      if (func && func->caller_func)
+	{
+	  *filename_ptr = func->caller_file;
+	  *functionname_ptr = func->caller_func->name;
+	  *linenumber_ptr = func->caller_line;
+	  stash->inliner_chain = func->caller_func;
+	  return TRUE;
+	}
+    }
+
+  return FALSE;
+}
+
+void
+_bfd_dwarf2_cleanup_debug_info (bfd *abfd)
+{
+  struct comp_unit *each;
+  struct dwarf2_debug *stash;
+
+  if (abfd == NULL || elf_tdata (abfd) == NULL)
+    return;
+
+  stash = (struct dwarf2_debug *) elf_tdata (abfd)->dwarf2_find_line_info;
+
+  if (stash == NULL)
+    return;
+
+  for (each = stash->all_comp_units; each; each = each->next_unit)
+    {
+      struct abbrev_info **abbrevs = each->abbrevs;
+      struct funcinfo *function_table = each->function_table;
+      struct varinfo *variable_table = each->variable_table;
+      size_t i;
+
+      for (i = 0; i < ABBREV_HASH_SIZE; i++)
+	{
+	  struct abbrev_info *abbrev = abbrevs[i];
+
+	  while (abbrev)
+	    {
+	      free (abbrev->attrs);
+	      abbrev = abbrev->next;
+	    }
+	}
+
+      if (each->line_table)
+	{
+	  free (each->line_table->dirs);
+	  free (each->line_table->files);
+	}
+
+      while (function_table)
+	{
+	  if (function_table->file)
+	    {
+	      free (function_table->file);
+	      function_table->file = NULL;
+	    }
+
+	  if (function_table->caller_file)
+	    {
+	      free (function_table->caller_file);
+	      function_table->caller_file = NULL;
+	    }
+	  function_table = function_table->prev_func;
+	}
+
+      while (variable_table)
+	{
+	  if (variable_table->file)
+	    {
+	      free (variable_table->file);
+	      variable_table->file = NULL;
+	    }
+
+	  variable_table = variable_table->prev_var;
+	}
+    }
+
+  if (stash->dwarf_abbrev_buffer)
+    free (stash->dwarf_abbrev_buffer);
+  if (stash->dwarf_line_buffer)
+    free (stash->dwarf_line_buffer);
+  if (stash->dwarf_str_buffer)
+    free (stash->dwarf_str_buffer);
+  if (stash->dwarf_ranges_buffer)
+    free (stash->dwarf_ranges_buffer);
+  if (stash->info_ptr_memory)
+    free (stash->info_ptr_memory);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ecoff.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ecoff.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ecoff.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ecoff.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4599 @@
+/* Generic ECOFF (Extended-COFF) routines.
+   Copyright 1990, 1991, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Original version by Per Bothner.
+   Full support added by Ian Lance Taylor, ian@cygnus.com.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "aout/ar.h"
+#include "aout/stab_gnu.h"
+
+/* FIXME: We need the definitions of N_SET[ADTB], but aout64.h defines
+   some other stuff which we don't want and which conflicts with stuff
+   we do want.  */
+#include "libaout.h"
+#include "aout/aout64.h"
+#undef N_ABS
+#undef exec_hdr
+#undef obj_sym_filepos
+
+#include "coff/internal.h"
+#include "coff/sym.h"
+#include "coff/symconst.h"
+#include "coff/ecoff.h"
+#include "libcoff.h"
+#include "libecoff.h"
+#include "libiberty.h"
+
+#define streq(a, b)	(strcmp ((a), (b)) == 0)
+#define strneq(a, b, n)	(strncmp ((a), (b), (n)) == 0)
+
+
+/* This stuff is somewhat copied from coffcode.h.  */
+static asection bfd_debug_section =
+{
+  /* name,      id,  index, next, prev, flags, user_set_vma,       */
+     "*DEBUG*", 0,   0,     NULL, NULL, 0,     0,
+  /* linker_mark, linker_has_input, gc_mark, compress_status,      */
+     0,           0,                1,       0,
+  /* segment_mark, sec_info_type, use_rela_p,                      */
+     0,            0,             0,
+  /* sec_flg0, sec_flg1, sec_flg2, sec_flg3, sec_flg4, sec_flg5,   */
+     0,        0,        0,        0,        0,        0,
+  /* vma, lma, size, rawsize, compressed_size, relax, relax_count, */
+     0,   0,   0,    0,       0,               0,     0,
+  /* output_offset, output_section, alignment_power,               */
+     0,             NULL,           0,
+  /* relocation, orelocation, reloc_count, filepos, rel_filepos,   */
+     NULL,       NULL,        0,           0,       0,
+  /* line_filepos, userdata, contents, lineno, lineno_count,       */
+     0,            NULL,     NULL,     NULL,   0,
+  /* entsize, kept_section, moving_line_filepos,                   */
+     0,       NULL,         0,
+  /* target_index, used_by_bfd, constructor_chain, owner,          */
+     0,            NULL,        NULL,              NULL,
+  /* flag_info,                                                    */
+     NULL,
+  /* symbol,                                                       */
+     NULL,
+  /* symbol_ptr_ptr,                                               */
+     NULL,
+  /* map_head, map_tail                                            */
+     { NULL }, { NULL }
+};
+
+/* Create an ECOFF object.  */
+
+bfd_boolean
+_bfd_ecoff_mkobject (bfd *abfd)
+{
+  bfd_size_type amt = sizeof (ecoff_data_type);
+
+  abfd->tdata.ecoff_obj_data = (struct ecoff_tdata *) bfd_zalloc (abfd, amt);
+  if (abfd->tdata.ecoff_obj_data == NULL)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* This is a hook called by coff_real_object_p to create any backend
+   specific information.  */
+
+void *
+_bfd_ecoff_mkobject_hook (bfd *abfd, void * filehdr, void * aouthdr)
+{
+  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
+  struct internal_aouthdr *internal_a = (struct internal_aouthdr *) aouthdr;
+  ecoff_data_type *ecoff;
+
+  if (! _bfd_ecoff_mkobject (abfd))
+    return NULL;
+
+  ecoff = ecoff_data (abfd);
+  ecoff->gp_size = 8;
+  ecoff->sym_filepos = internal_f->f_symptr;
+
+  if (internal_a != NULL)
+    {
+      int i;
+
+      ecoff->text_start = internal_a->text_start;
+      ecoff->text_end = internal_a->text_start + internal_a->tsize;
+      ecoff->gp = internal_a->gp_value;
+      ecoff->gprmask = internal_a->gprmask;
+      for (i = 0; i < 4; i++)
+	ecoff->cprmask[i] = internal_a->cprmask[i];
+      ecoff->fprmask = internal_a->fprmask;
+      if (internal_a->magic == ECOFF_AOUT_ZMAGIC)
+	abfd->flags |= D_PAGED;
+      else
+	abfd->flags &=~ D_PAGED;
+    }
+
+  /* It turns out that no special action is required by the MIPS or
+     Alpha ECOFF backends.  They have different information in the
+     a.out header, but we just copy it all (e.g., gprmask, cprmask and
+     fprmask) and let the swapping routines ensure that only relevant
+     information is written out.  */
+
+  return (void *) ecoff;
+}
+
+/* Initialize a new section.  */
+
+bfd_boolean
+_bfd_ecoff_new_section_hook (bfd *abfd, asection *section)
+{
+  unsigned int i;
+  static struct
+  {
+    const char * name;
+    flagword flags;
+  }
+  section_flags [] =
+  {
+    { _TEXT,   SEC_ALLOC | SEC_CODE | SEC_LOAD },
+    { _INIT,   SEC_ALLOC | SEC_CODE | SEC_LOAD },
+    { _FINI,   SEC_ALLOC | SEC_CODE | SEC_LOAD },
+    { _DATA,   SEC_ALLOC | SEC_DATA | SEC_LOAD },
+    { _SDATA,  SEC_ALLOC | SEC_DATA | SEC_LOAD },
+    { _RDATA,  SEC_ALLOC | SEC_DATA | SEC_LOAD | SEC_READONLY},
+    { _LIT8,   SEC_ALLOC | SEC_DATA | SEC_LOAD | SEC_READONLY},
+    { _LIT4,   SEC_ALLOC | SEC_DATA | SEC_LOAD | SEC_READONLY},
+    { _RCONST, SEC_ALLOC | SEC_DATA | SEC_LOAD | SEC_READONLY},
+    { _PDATA,  SEC_ALLOC | SEC_DATA | SEC_LOAD | SEC_READONLY},
+    { _BSS,    SEC_ALLOC},
+    { _SBSS,   SEC_ALLOC},
+    /* An Irix 4 shared libary.  */
+    { _LIB,    SEC_COFF_SHARED_LIBRARY}
+  };
+
+  section->alignment_power = 4;
+
+  for (i = 0; i < ARRAY_SIZE (section_flags); i++)
+    if (streq (section->name, section_flags[i].name))
+      {
+	section->flags |= section_flags[i].flags;
+	break;
+      }
+
+
+  /* Probably any other section name is SEC_NEVER_LOAD, but I'm
+     uncertain about .init on some systems and I don't know how shared
+     libraries work.  */
+
+  return _bfd_generic_new_section_hook (abfd, section);
+}
+
+/* Determine the machine architecture and type.  This is called from
+   the generic COFF routines.  It is the inverse of ecoff_get_magic,
+   below.  This could be an ECOFF backend routine, with one version
+   for each target, but there aren't all that many ECOFF targets.  */
+
+bfd_boolean
+_bfd_ecoff_set_arch_mach_hook (bfd *abfd, void * filehdr)
+{
+  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
+  enum bfd_architecture arch;
+  unsigned long mach;
+
+  switch (internal_f->f_magic)
+    {
+    case MIPS_MAGIC_1:
+    case MIPS_MAGIC_LITTLE:
+    case MIPS_MAGIC_BIG:
+      arch = bfd_arch_mips;
+      mach = bfd_mach_mips3000;
+      break;
+
+    case MIPS_MAGIC_LITTLE2:
+    case MIPS_MAGIC_BIG2:
+      /* MIPS ISA level 2: the r6000.  */
+      arch = bfd_arch_mips;
+      mach = bfd_mach_mips6000;
+      break;
+
+    case MIPS_MAGIC_LITTLE3:
+    case MIPS_MAGIC_BIG3:
+      /* MIPS ISA level 3: the r4000.  */
+      arch = bfd_arch_mips;
+      mach = bfd_mach_mips4000;
+      break;
+
+    case ALPHA_MAGIC:
+      arch = bfd_arch_alpha;
+      mach = 0;
+      break;
+
+    default:
+      arch = bfd_arch_obscure;
+      mach = 0;
+      break;
+    }
+
+  return bfd_default_set_arch_mach (abfd, arch, mach);
+}
+
+bfd_boolean
+_bfd_ecoff_no_long_sections (abfd, enable)
+     bfd *abfd;
+     int enable;
+{
+  (void) abfd;
+  (void) enable;
+  return FALSE;
+}
+
+/* Get the magic number to use based on the architecture and machine.
+   This is the inverse of _bfd_ecoff_set_arch_mach_hook, above.  */
+
+static int
+ecoff_get_magic (bfd *abfd)
+{
+  int big, little;
+
+  switch (bfd_get_arch (abfd))
+    {
+    case bfd_arch_mips:
+      switch (bfd_get_mach (abfd))
+	{
+	default:
+	case 0:
+	case bfd_mach_mips3000:
+	  big = MIPS_MAGIC_BIG;
+	  little = MIPS_MAGIC_LITTLE;
+	  break;
+
+	case bfd_mach_mips6000:
+	  big = MIPS_MAGIC_BIG2;
+	  little = MIPS_MAGIC_LITTLE2;
+	  break;
+
+	case bfd_mach_mips4000:
+	  big = MIPS_MAGIC_BIG3;
+	  little = MIPS_MAGIC_LITTLE3;
+	  break;
+	}
+
+      return bfd_big_endian (abfd) ? big : little;
+
+    case bfd_arch_alpha:
+      return ALPHA_MAGIC;
+
+    default:
+      abort ();
+      return 0;
+    }
+}
+
+/* Get the section s_flags to use for a section.  */
+
+static long
+ecoff_sec_to_styp_flags (const char *name, flagword flags)
+{
+  unsigned int i;
+  static struct
+  {
+    const char * name;
+    long flags;
+  }
+  styp_flags [] =
+  {
+    { _TEXT,    STYP_TEXT       },
+    { _DATA,    STYP_DATA       },
+    { _SDATA,   STYP_SDATA      },
+    { _RDATA,   STYP_RDATA      },
+    { _LITA,    STYP_LITA       },
+    { _LIT8,    STYP_LIT8       },
+    { _LIT4,    STYP_LIT4       },
+    { _BSS,     STYP_BSS        },
+    { _SBSS,    STYP_SBSS       },
+    { _INIT,    STYP_ECOFF_INIT },
+    { _FINI,    STYP_ECOFF_FINI },
+    { _PDATA,   STYP_PDATA      },
+    { _XDATA,   STYP_XDATA      },
+    { _LIB,     STYP_ECOFF_LIB  },
+    { _GOT,     STYP_GOT        },
+    { _HASH,    STYP_HASH       },
+    { _DYNAMIC, STYP_DYNAMIC    },
+    { _LIBLIST, STYP_LIBLIST    },
+    { _RELDYN,  STYP_RELDYN     },
+    { _CONFLIC, STYP_CONFLIC    },
+    { _DYNSTR,  STYP_DYNSTR     },
+    { _DYNSYM,  STYP_DYNSYM     },
+    { _RCONST,  STYP_RCONST     }
+  };
+  long styp = 0;
+
+  for (i = 0; i < ARRAY_SIZE (styp_flags); i++)
+    if (streq (name, styp_flags[i].name))
+      {
+	styp = styp_flags[i].flags;
+	break;
+      }
+
+  if (styp == 0)
+    {
+      if (streq (name, _COMMENT))
+	{
+	  styp = STYP_COMMENT;
+	  flags &=~ SEC_NEVER_LOAD;
+	}
+      else if (flags & SEC_CODE)
+	styp = STYP_TEXT;
+      else if (flags & SEC_DATA)
+	styp = STYP_DATA;
+      else if (flags & SEC_READONLY)
+	styp = STYP_RDATA;
+      else if (flags & SEC_LOAD)
+	styp = STYP_REG;
+      else
+	styp = STYP_BSS;
+    }
+
+  if (flags & SEC_NEVER_LOAD)
+    styp |= STYP_NOLOAD;
+
+  return styp;
+}
+
+/* Get the BFD flags to use for a section.  */
+
+bfd_boolean
+_bfd_ecoff_styp_to_sec_flags (bfd *abfd ATTRIBUTE_UNUSED,
+			      void * hdr,
+			      const char *name ATTRIBUTE_UNUSED,
+			      asection *section ATTRIBUTE_UNUSED,
+			      flagword * flags_ptr)
+{
+  struct internal_scnhdr *internal_s = (struct internal_scnhdr *) hdr;
+  long styp_flags = internal_s->s_flags;
+  flagword sec_flags = 0;
+
+  if (styp_flags & STYP_NOLOAD)
+    sec_flags |= SEC_NEVER_LOAD;
+
+  /* For 386 COFF, at least, an unloadable text or data section is
+     actually a shared library section.  */
+  if ((styp_flags & STYP_TEXT)
+      || (styp_flags & STYP_ECOFF_INIT)
+      || (styp_flags & STYP_ECOFF_FINI)
+      || (styp_flags & STYP_DYNAMIC)
+      || (styp_flags & STYP_LIBLIST)
+      || (styp_flags & STYP_RELDYN)
+      || styp_flags == STYP_CONFLIC
+      || (styp_flags & STYP_DYNSTR)
+      || (styp_flags & STYP_DYNSYM)
+      || (styp_flags & STYP_HASH))
+    {
+      if (sec_flags & SEC_NEVER_LOAD)
+	sec_flags |= SEC_CODE | SEC_COFF_SHARED_LIBRARY;
+      else
+	sec_flags |= SEC_CODE | SEC_LOAD | SEC_ALLOC;
+    }
+  else if ((styp_flags & STYP_DATA)
+	   || (styp_flags & STYP_RDATA)
+	   || (styp_flags & STYP_SDATA)
+	   || styp_flags == STYP_PDATA
+	   || styp_flags == STYP_XDATA
+	   || (styp_flags & STYP_GOT)
+	   || styp_flags == STYP_RCONST)
+    {
+      if (sec_flags & SEC_NEVER_LOAD)
+	sec_flags |= SEC_DATA | SEC_COFF_SHARED_LIBRARY;
+      else
+	sec_flags |= SEC_DATA | SEC_LOAD | SEC_ALLOC;
+      if ((styp_flags & STYP_RDATA)
+	  || styp_flags == STYP_PDATA
+	  || styp_flags == STYP_RCONST)
+	sec_flags |= SEC_READONLY;
+    }
+  else if ((styp_flags & STYP_BSS)
+	   || (styp_flags & STYP_SBSS))
+    sec_flags |= SEC_ALLOC;
+  else if ((styp_flags & STYP_INFO) || styp_flags == STYP_COMMENT)
+    sec_flags |= SEC_NEVER_LOAD;
+  else if ((styp_flags & STYP_LITA)
+	   || (styp_flags & STYP_LIT8)
+	   || (styp_flags & STYP_LIT4))
+    sec_flags |= SEC_DATA | SEC_LOAD | SEC_ALLOC | SEC_READONLY;
+  else if (styp_flags & STYP_ECOFF_LIB)
+    sec_flags |= SEC_COFF_SHARED_LIBRARY;
+  else
+    sec_flags |= SEC_ALLOC | SEC_LOAD;
+
+  * flags_ptr = sec_flags;
+  return TRUE;
+}
+
+/* Read in the symbolic header for an ECOFF object file.  */
+
+static bfd_boolean
+ecoff_slurp_symbolic_header (bfd *abfd)
+{
+  const struct ecoff_backend_data * const backend = ecoff_backend (abfd);
+  bfd_size_type external_hdr_size;
+  void * raw = NULL;
+  HDRR *internal_symhdr;
+
+  /* See if we've already read it in.  */
+  if (ecoff_data (abfd)->debug_info.symbolic_header.magic ==
+      backend->debug_swap.sym_magic)
+    return TRUE;
+
+  /* See whether there is a symbolic header.  */
+  if (ecoff_data (abfd)->sym_filepos == 0)
+    {
+      bfd_get_symcount (abfd) = 0;
+      return TRUE;
+    }
+
+  /* At this point bfd_get_symcount (abfd) holds the number of symbols
+     as read from the file header, but on ECOFF this is always the
+     size of the symbolic information header.  It would be cleaner to
+     handle this when we first read the file in coffgen.c.  */
+  external_hdr_size = backend->debug_swap.external_hdr_size;
+  if (bfd_get_symcount (abfd) != external_hdr_size)
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  /* Read the symbolic information header.  */
+  raw = bfd_malloc (external_hdr_size);
+  if (raw == NULL)
+    goto error_return;
+
+  if (bfd_seek (abfd, ecoff_data (abfd)->sym_filepos, SEEK_SET) != 0
+      || bfd_bread (raw, external_hdr_size, abfd) != external_hdr_size)
+    goto error_return;
+  internal_symhdr = &ecoff_data (abfd)->debug_info.symbolic_header;
+  (*backend->debug_swap.swap_hdr_in) (abfd, raw, internal_symhdr);
+
+  if (internal_symhdr->magic != backend->debug_swap.sym_magic)
+    {
+      bfd_set_error (bfd_error_bad_value);
+      goto error_return;
+    }
+
+  /* Now we can get the correct number of symbols.  */
+  bfd_get_symcount (abfd) = (internal_symhdr->isymMax
+			     + internal_symhdr->iextMax);
+
+  if (raw != NULL)
+    free (raw);
+  return TRUE;
+ error_return:
+  if (raw != NULL)
+    free (raw);
+  return FALSE;
+}
+
+/* Read in and swap the important symbolic information for an ECOFF
+   object file.  This is called by gdb via the read_debug_info entry
+   point in the backend structure.  */
+
+bfd_boolean
+_bfd_ecoff_slurp_symbolic_info (bfd *abfd,
+				asection *ignore ATTRIBUTE_UNUSED,
+				struct ecoff_debug_info *debug)
+{
+  const struct ecoff_backend_data * const backend = ecoff_backend (abfd);
+  HDRR *internal_symhdr;
+  bfd_size_type raw_base;
+  bfd_size_type raw_size;
+  void * raw;
+  bfd_size_type external_fdr_size;
+  char *fraw_src;
+  char *fraw_end;
+  struct fdr *fdr_ptr;
+  bfd_size_type raw_end;
+  bfd_size_type cb_end;
+  bfd_size_type amt;
+  file_ptr pos;
+
+  BFD_ASSERT (debug == &ecoff_data (abfd)->debug_info);
+
+  /* Check whether we've already gotten it, and whether there's any to
+     get.  */
+  if (ecoff_data (abfd)->raw_syments != NULL)
+    return TRUE;
+  if (ecoff_data (abfd)->sym_filepos == 0)
+    {
+      bfd_get_symcount (abfd) = 0;
+      return TRUE;
+    }
+
+  if (! ecoff_slurp_symbolic_header (abfd))
+    return FALSE;
+
+  internal_symhdr = &debug->symbolic_header;
+
+  /* Read all the symbolic information at once.  */
+  raw_base = (ecoff_data (abfd)->sym_filepos
+	      + backend->debug_swap.external_hdr_size);
+
+  /* Alpha ecoff makes the determination of raw_size difficult. It has
+     an undocumented debug data section between the symhdr and the first
+     documented section. And the ordering of the sections varies between
+     statically and dynamically linked executables.
+     If bfd supports SEEK_END someday, this code could be simplified.  */
+  raw_end = 0;
+
+#define UPDATE_RAW_END(start, count, size) \
+  cb_end = internal_symhdr->start + internal_symhdr->count * (size); \
+  if (cb_end > raw_end) \
+    raw_end = cb_end
+
+  UPDATE_RAW_END (cbLineOffset, cbLine, sizeof (unsigned char));
+  UPDATE_RAW_END (cbDnOffset, idnMax, backend->debug_swap.external_dnr_size);
+  UPDATE_RAW_END (cbPdOffset, ipdMax, backend->debug_swap.external_pdr_size);
+  UPDATE_RAW_END (cbSymOffset, isymMax, backend->debug_swap.external_sym_size);
+  /* eraxxon@alumni.rice.edu: ioptMax refers to the size of the
+     optimization symtab, not the number of entries.  */
+  UPDATE_RAW_END (cbOptOffset, ioptMax, sizeof (char));
+  UPDATE_RAW_END (cbAuxOffset, iauxMax, sizeof (union aux_ext));
+  UPDATE_RAW_END (cbSsOffset, issMax, sizeof (char));
+  UPDATE_RAW_END (cbSsExtOffset, issExtMax, sizeof (char));
+  UPDATE_RAW_END (cbFdOffset, ifdMax, backend->debug_swap.external_fdr_size);
+  UPDATE_RAW_END (cbRfdOffset, crfd, backend->debug_swap.external_rfd_size);
+  UPDATE_RAW_END (cbExtOffset, iextMax, backend->debug_swap.external_ext_size);
+
+#undef UPDATE_RAW_END
+
+  raw_size = raw_end - raw_base;
+  if (raw_size == 0)
+    {
+      ecoff_data (abfd)->sym_filepos = 0;
+      return TRUE;
+    }
+  raw = bfd_alloc (abfd, raw_size);
+  if (raw == NULL)
+    return FALSE;
+
+  pos = ecoff_data (abfd)->sym_filepos;
+  pos += backend->debug_swap.external_hdr_size;
+  if (bfd_seek (abfd, pos, SEEK_SET) != 0
+      || bfd_bread (raw, raw_size, abfd) != raw_size)
+    {
+      bfd_release (abfd, raw);
+      return FALSE;
+    }
+
+  ecoff_data (abfd)->raw_syments = raw;
+
+  /* Get pointers for the numeric offsets in the HDRR structure.  */
+#define FIX(off1, off2, type)				\
+  if (internal_symhdr->off1 == 0)			\
+    debug->off2 = NULL;					\
+  else							\
+    debug->off2 = (type) ((char *) raw			\
+			  + (internal_symhdr->off1	\
+			     - raw_base))
+
+  FIX (cbLineOffset, line, unsigned char *);
+  FIX (cbDnOffset, external_dnr, void *);
+  FIX (cbPdOffset, external_pdr, void *);
+  FIX (cbSymOffset, external_sym, void *);
+  FIX (cbOptOffset, external_opt, void *);
+  FIX (cbAuxOffset, external_aux, union aux_ext *);
+  FIX (cbSsOffset, ss, char *);
+  FIX (cbSsExtOffset, ssext, char *);
+  FIX (cbFdOffset, external_fdr, void *);
+  FIX (cbRfdOffset, external_rfd, void *);
+  FIX (cbExtOffset, external_ext, void *);
+#undef FIX
+
+  /* I don't want to always swap all the data, because it will just
+     waste time and most programs will never look at it.  The only
+     time the linker needs most of the debugging information swapped
+     is when linking big-endian and little-endian MIPS object files
+     together, which is not a common occurrence.
+
+     We need to look at the fdr to deal with a lot of information in
+     the symbols, so we swap them here.  */
+  amt = internal_symhdr->ifdMax;
+  amt *= sizeof (struct fdr);
+  debug->fdr = (FDR *) bfd_alloc (abfd, amt);
+  if (debug->fdr == NULL)
+    return FALSE;
+  external_fdr_size = backend->debug_swap.external_fdr_size;
+  fdr_ptr = debug->fdr;
+  fraw_src = (char *) debug->external_fdr;
+  fraw_end = fraw_src + internal_symhdr->ifdMax * external_fdr_size;
+  for (; fraw_src < fraw_end; fraw_src += external_fdr_size, fdr_ptr++)
+    (*backend->debug_swap.swap_fdr_in) (abfd, (void *) fraw_src, fdr_ptr);
+
+  return TRUE;
+}
+
+/* ECOFF symbol table routines.  The ECOFF symbol table is described
+   in gcc/mips-tfile.c.  */
+
+/* ECOFF uses two common sections.  One is the usual one, and the
+   other is for small objects.  All the small objects are kept
+   together, and then referenced via the gp pointer, which yields
+   faster assembler code.  This is what we use for the small common
+   section.  */
+static asection ecoff_scom_section;
+static asymbol ecoff_scom_symbol;
+static asymbol *ecoff_scom_symbol_ptr;
+
+/* Create an empty symbol.  */
+
+asymbol *
+_bfd_ecoff_make_empty_symbol (bfd *abfd)
+{
+  ecoff_symbol_type *new_symbol;
+  bfd_size_type amt = sizeof (ecoff_symbol_type);
+
+  new_symbol = (ecoff_symbol_type *) bfd_zalloc (abfd, amt);
+  if (new_symbol == NULL)
+    return NULL;
+  new_symbol->symbol.section = NULL;
+  new_symbol->fdr = NULL;
+  new_symbol->local = FALSE;
+  new_symbol->native = NULL;
+  new_symbol->symbol.the_bfd = abfd;
+  return &new_symbol->symbol;
+}
+
+/* Set the BFD flags and section for an ECOFF symbol.  */
+
+static bfd_boolean
+ecoff_set_symbol_info (bfd *abfd,
+		       SYMR *ecoff_sym,
+		       asymbol *asym,
+		       int ext,
+		       int weak)
+{
+  asym->the_bfd = abfd;
+  asym->value = ecoff_sym->value;
+  asym->section = &bfd_debug_section;
+  asym->udata.i = 0;
+
+  /* Most symbol types are just for debugging.  */
+  switch (ecoff_sym->st)
+    {
+    case stGlobal:
+    case stStatic:
+    case stLabel:
+    case stProc:
+    case stStaticProc:
+      break;
+    case stNil:
+      if (ECOFF_IS_STAB (ecoff_sym))
+	{
+	  asym->flags = BSF_DEBUGGING;
+	  return TRUE;
+	}
+      break;
+    default:
+      asym->flags = BSF_DEBUGGING;
+      return TRUE;
+    }
+
+  if (weak)
+    asym->flags = BSF_EXPORT | BSF_WEAK;
+  else if (ext)
+    asym->flags = BSF_EXPORT | BSF_GLOBAL;
+  else
+    {
+      asym->flags = BSF_LOCAL;
+      /* Normally, a local stProc symbol will have a corresponding
+         external symbol.  We mark the local symbol as a debugging
+         symbol, in order to prevent nm from printing both out.
+         Similarly, we mark stLabel and stabs symbols as debugging
+         symbols.  In both cases, we do want to set the value
+         correctly based on the symbol class.  */
+      if (ecoff_sym->st == stProc
+	  || ecoff_sym->st == stLabel
+	  || ECOFF_IS_STAB (ecoff_sym))
+	asym->flags |= BSF_DEBUGGING;
+    }
+
+  if (ecoff_sym->st == stProc || ecoff_sym->st == stStaticProc)
+    asym->flags |= BSF_FUNCTION;
+
+  switch (ecoff_sym->sc)
+    {
+    case scNil:
+      /* Used for compiler generated labels.  Leave them in the
+	 debugging section, and mark them as local.  If BSF_DEBUGGING
+	 is set, then nm does not display them for some reason.  If no
+	 flags are set then the linker whines about them.  */
+      asym->flags = BSF_LOCAL;
+      break;
+    case scText:
+      asym->section = bfd_make_section_old_way (abfd, _TEXT);
+      asym->value -= asym->section->vma;
+      break;
+    case scData:
+      asym->section = bfd_make_section_old_way (abfd, _DATA);
+      asym->value -= asym->section->vma;
+      break;
+    case scBss:
+      asym->section = bfd_make_section_old_way (abfd, _BSS);
+      asym->value -= asym->section->vma;
+      break;
+    case scRegister:
+      asym->flags = BSF_DEBUGGING;
+      break;
+    case scAbs:
+      asym->section = bfd_abs_section_ptr;
+      break;
+    case scUndefined:
+      asym->section = bfd_und_section_ptr;
+      asym->flags = 0;
+      asym->value = 0;
+      break;
+    case scCdbLocal:
+    case scBits:
+    case scCdbSystem:
+    case scRegImage:
+    case scInfo:
+    case scUserStruct:
+      asym->flags = BSF_DEBUGGING;
+      break;
+    case scSData:
+      asym->section = bfd_make_section_old_way (abfd, ".sdata");
+      asym->value -= asym->section->vma;
+      break;
+    case scSBss:
+      asym->section = bfd_make_section_old_way (abfd, ".sbss");
+      asym->value -= asym->section->vma;
+      break;
+    case scRData:
+      asym->section = bfd_make_section_old_way (abfd, ".rdata");
+      asym->value -= asym->section->vma;
+      break;
+    case scVar:
+      asym->flags = BSF_DEBUGGING;
+      break;
+    case scCommon:
+      if (asym->value > ecoff_data (abfd)->gp_size)
+	{
+	  asym->section = bfd_com_section_ptr;
+	  asym->flags = 0;
+	  break;
+	}
+      /* Fall through.  */
+    case scSCommon:
+      if (ecoff_scom_section.name == NULL)
+	{
+	  /* Initialize the small common section.  */
+	  ecoff_scom_section.name = SCOMMON;
+	  ecoff_scom_section.flags = SEC_IS_COMMON;
+	  ecoff_scom_section.output_section = &ecoff_scom_section;
+	  ecoff_scom_section.symbol = &ecoff_scom_symbol;
+	  ecoff_scom_section.symbol_ptr_ptr = &ecoff_scom_symbol_ptr;
+	  ecoff_scom_symbol.name = SCOMMON;
+	  ecoff_scom_symbol.flags = BSF_SECTION_SYM;
+	  ecoff_scom_symbol.section = &ecoff_scom_section;
+	  ecoff_scom_symbol_ptr = &ecoff_scom_symbol;
+	}
+      asym->section = &ecoff_scom_section;
+      asym->flags = 0;
+      break;
+    case scVarRegister:
+    case scVariant:
+      asym->flags = BSF_DEBUGGING;
+      break;
+    case scSUndefined:
+      asym->section = bfd_und_section_ptr;
+      asym->flags = 0;
+      asym->value = 0;
+      break;
+    case scInit:
+      asym->section = bfd_make_section_old_way (abfd, ".init");
+      asym->value -= asym->section->vma;
+      break;
+    case scBasedVar:
+    case scXData:
+    case scPData:
+      asym->flags = BSF_DEBUGGING;
+      break;
+    case scFini:
+      asym->section = bfd_make_section_old_way (abfd, ".fini");
+      asym->value -= asym->section->vma;
+      break;
+    case scRConst:
+      asym->section = bfd_make_section_old_way (abfd, ".rconst");
+      asym->value -= asym->section->vma;
+      break;
+    default:
+      break;
+    }
+
+  /* Look for special constructors symbols and make relocation entries
+     in a special construction section.  These are produced by the
+     -fgnu-linker argument to g++.  */
+  if (ECOFF_IS_STAB (ecoff_sym))
+    {
+      switch (ECOFF_UNMARK_STAB (ecoff_sym->index))
+	{
+	default:
+	  break;
+
+	case N_SETA:
+	case N_SETT:
+	case N_SETD:
+	case N_SETB:
+	  /* Mark the symbol as a constructor.  */
+	  asym->flags |= BSF_CONSTRUCTOR;
+	  break;
+	}
+    }
+  return TRUE;
+}
+
+/* Read an ECOFF symbol table.  */
+
+bfd_boolean
+_bfd_ecoff_slurp_symbol_table (bfd *abfd)
+{
+  const struct ecoff_backend_data * const backend = ecoff_backend (abfd);
+  const bfd_size_type external_ext_size
+    = backend->debug_swap.external_ext_size;
+  const bfd_size_type external_sym_size
+    = backend->debug_swap.external_sym_size;
+  void (* const swap_ext_in) (bfd *, void *, EXTR *)
+    = backend->debug_swap.swap_ext_in;
+  void (* const swap_sym_in) (bfd *, void *, SYMR *)
+    = backend->debug_swap.swap_sym_in;
+  bfd_size_type internal_size;
+  ecoff_symbol_type *internal;
+  ecoff_symbol_type *internal_ptr;
+  char *eraw_src;
+  char *eraw_end;
+  FDR *fdr_ptr;
+  FDR *fdr_end;
+
+  /* If we've already read in the symbol table, do nothing.  */
+  if (ecoff_data (abfd)->canonical_symbols != NULL)
+    return TRUE;
+
+  /* Get the symbolic information.  */
+  if (! _bfd_ecoff_slurp_symbolic_info (abfd, NULL,
+					&ecoff_data (abfd)->debug_info))
+    return FALSE;
+  if (bfd_get_symcount (abfd) == 0)
+    return TRUE;
+
+  internal_size = bfd_get_symcount (abfd);
+  internal_size *= sizeof (ecoff_symbol_type);
+  internal = (ecoff_symbol_type *) bfd_alloc (abfd, internal_size);
+  if (internal == NULL)
+    return FALSE;
+
+  internal_ptr = internal;
+  eraw_src = (char *) ecoff_data (abfd)->debug_info.external_ext;
+  eraw_end = (eraw_src
+	      + (ecoff_data (abfd)->debug_info.symbolic_header.iextMax
+		 * external_ext_size));
+  for (; eraw_src < eraw_end; eraw_src += external_ext_size, internal_ptr++)
+    {
+      EXTR internal_esym;
+
+      (*swap_ext_in) (abfd, (void *) eraw_src, &internal_esym);
+      internal_ptr->symbol.name = (ecoff_data (abfd)->debug_info.ssext
+				   + internal_esym.asym.iss);
+      if (!ecoff_set_symbol_info (abfd, &internal_esym.asym,
+				  &internal_ptr->symbol, 1,
+				  internal_esym.weakext))
+	return FALSE;
+      /* The alpha uses a negative ifd field for section symbols.  */
+      if (internal_esym.ifd >= 0)
+	internal_ptr->fdr = (ecoff_data (abfd)->debug_info.fdr
+			     + internal_esym.ifd);
+      else
+	internal_ptr->fdr = NULL;
+      internal_ptr->local = FALSE;
+      internal_ptr->native = (void *) eraw_src;
+    }
+
+  /* The local symbols must be accessed via the fdr's, because the
+     string and aux indices are relative to the fdr information.  */
+  fdr_ptr = ecoff_data (abfd)->debug_info.fdr;
+  fdr_end = fdr_ptr + ecoff_data (abfd)->debug_info.symbolic_header.ifdMax;
+  for (; fdr_ptr < fdr_end; fdr_ptr++)
+    {
+      char *lraw_src;
+      char *lraw_end;
+
+      lraw_src = ((char *) ecoff_data (abfd)->debug_info.external_sym
+		  + fdr_ptr->isymBase * external_sym_size);
+      lraw_end = lraw_src + fdr_ptr->csym * external_sym_size;
+      for (;
+	   lraw_src < lraw_end;
+	   lraw_src += external_sym_size, internal_ptr++)
+	{
+	  SYMR internal_sym;
+
+	  (*swap_sym_in) (abfd, (void *) lraw_src, &internal_sym);
+	  internal_ptr->symbol.name = (ecoff_data (abfd)->debug_info.ss
+				       + fdr_ptr->issBase
+				       + internal_sym.iss);
+	  if (!ecoff_set_symbol_info (abfd, &internal_sym,
+				      &internal_ptr->symbol, 0, 0))
+	    return FALSE;
+	  internal_ptr->fdr = fdr_ptr;
+	  internal_ptr->local = TRUE;
+	  internal_ptr->native = (void *) lraw_src;
+	}
+    }
+
+  ecoff_data (abfd)->canonical_symbols = internal;
+
+  return TRUE;
+}
+
+/* Return the amount of space needed for the canonical symbols.  */
+
+long
+_bfd_ecoff_get_symtab_upper_bound (bfd *abfd)
+{
+  if (! _bfd_ecoff_slurp_symbolic_info (abfd, NULL,
+					&ecoff_data (abfd)->debug_info))
+    return -1;
+
+  if (bfd_get_symcount (abfd) == 0)
+    return 0;
+
+  return (bfd_get_symcount (abfd) + 1) * (sizeof (ecoff_symbol_type *));
+}
+
+/* Get the canonical symbols.  */
+
+long
+_bfd_ecoff_canonicalize_symtab (bfd *abfd, asymbol **alocation)
+{
+  unsigned int counter = 0;
+  ecoff_symbol_type *symbase;
+  ecoff_symbol_type **location = (ecoff_symbol_type **) alocation;
+
+  if (! _bfd_ecoff_slurp_symbol_table (abfd))
+    return -1;
+  if (bfd_get_symcount (abfd) == 0)
+    return 0;
+
+  symbase = ecoff_data (abfd)->canonical_symbols;
+  while (counter < bfd_get_symcount (abfd))
+    {
+      *(location++) = symbase++;
+      counter++;
+    }
+  *location++ = NULL;
+  return bfd_get_symcount (abfd);
+}
+
+/* Turn ECOFF type information into a printable string.
+   ecoff_emit_aggregate and ecoff_type_to_string are from
+   gcc/mips-tdump.c, with swapping added and used_ptr removed.  */
+
+/* Write aggregate information to a string.  */
+
+static void
+ecoff_emit_aggregate (bfd *abfd,
+		      FDR *fdr,
+		      char *string,
+		      RNDXR *rndx,
+		      long isym,
+		      const char *which)
+{
+  const struct ecoff_debug_swap * const debug_swap =
+    &ecoff_backend (abfd)->debug_swap;
+  struct ecoff_debug_info * const debug_info = &ecoff_data (abfd)->debug_info;
+  unsigned int ifd = rndx->rfd;
+  unsigned int indx = rndx->index;
+  const char *name;
+
+  if (ifd == 0xfff)
+    ifd = isym;
+
+  /* An ifd of -1 is an opaque type.  An escaped index of 0 is a
+     struct return type of a procedure compiled without -g.  */
+  if (ifd == 0xffffffff
+      || (rndx->rfd == 0xfff && indx == 0))
+    name = "<undefined>";
+  else if (indx == indexNil)
+    name = "<no name>";
+  else
+    {
+      SYMR sym;
+
+      if (debug_info->external_rfd == NULL)
+	fdr = debug_info->fdr + ifd;
+      else
+	{
+	  RFDT rfd;
+
+	  (*debug_swap->swap_rfd_in) (abfd,
+				      ((char *) debug_info->external_rfd
+				       + ((fdr->rfdBase + ifd)
+					  * debug_swap->external_rfd_size)),
+				      &rfd);
+	  fdr = debug_info->fdr + rfd;
+	}
+
+      indx += fdr->isymBase;
+
+      (*debug_swap->swap_sym_in) (abfd,
+				  ((char *) debug_info->external_sym
+				   + indx * debug_swap->external_sym_size),
+				  &sym);
+
+      name = debug_info->ss + fdr->issBase + sym.iss;
+    }
+
+  sprintf (string,
+	   "%s %s { ifd = %u, index = %lu }",
+	   which, name, ifd,
+	   ((unsigned long) indx
+	    + debug_info->symbolic_header.iextMax));
+}
+
+/* Convert the type information to string format.  */
+
+static char *
+ecoff_type_to_string (bfd *abfd, FDR *fdr, unsigned int indx)
+{
+  union aux_ext *aux_ptr;
+  int bigendian;
+  AUXU u;
+  struct qual
+  {
+    unsigned int  type;
+    int  low_bound;
+    int  high_bound;
+    int  stride;
+  } qualifiers[7];
+  unsigned int basic_type;
+  int i;
+  char buffer1[1024];
+  static char buffer2[1024];
+  char *p1 = buffer1;
+  char *p2 = buffer2;
+  RNDXR rndx;
+
+  aux_ptr = ecoff_data (abfd)->debug_info.external_aux + fdr->iauxBase;
+  bigendian = fdr->fBigendian;
+
+  for (i = 0; i < 7; i++)
+    {
+      qualifiers[i].low_bound = 0;
+      qualifiers[i].high_bound = 0;
+      qualifiers[i].stride = 0;
+    }
+
+  if (AUX_GET_ISYM (bigendian, &aux_ptr[indx]) == (bfd_vma) -1)
+    return "-1 (no type)";
+  _bfd_ecoff_swap_tir_in (bigendian, &aux_ptr[indx++].a_ti, &u.ti);
+
+  basic_type = u.ti.bt;
+  qualifiers[0].type = u.ti.tq0;
+  qualifiers[1].type = u.ti.tq1;
+  qualifiers[2].type = u.ti.tq2;
+  qualifiers[3].type = u.ti.tq3;
+  qualifiers[4].type = u.ti.tq4;
+  qualifiers[5].type = u.ti.tq5;
+  qualifiers[6].type = tqNil;
+
+  /* Go get the basic type.  */
+  switch (basic_type)
+    {
+    case btNil:			/* Undefined.  */
+      strcpy (p1, "nil");
+      break;
+
+    case btAdr:			/* Address - integer same size as pointer.  */
+      strcpy (p1, "address");
+      break;
+
+    case btChar:		/* Character.  */
+      strcpy (p1, "char");
+      break;
+
+    case btUChar:		/* Unsigned character.  */
+      strcpy (p1, "unsigned char");
+      break;
+
+    case btShort:		/* Short.  */
+      strcpy (p1, "short");
+      break;
+
+    case btUShort:		/* Unsigned short.  */
+      strcpy (p1, "unsigned short");
+      break;
+
+    case btInt:			/* Int.  */
+      strcpy (p1, "int");
+      break;
+
+    case btUInt:		/* Unsigned int.  */
+      strcpy (p1, "unsigned int");
+      break;
+
+    case btLong:		/* Long.  */
+      strcpy (p1, "long");
+      break;
+
+    case btULong:		/* Unsigned long.  */
+      strcpy (p1, "unsigned long");
+      break;
+
+    case btFloat:		/* Float (real).  */
+      strcpy (p1, "float");
+      break;
+
+    case btDouble:		/* Double (real).  */
+      strcpy (p1, "double");
+      break;
+
+      /* Structures add 1-2 aux words:
+	 1st word is [ST_RFDESCAPE, offset] pointer to struct def;
+	 2nd word is file index if 1st word rfd is ST_RFDESCAPE.  */
+
+    case btStruct:		/* Structure (Record).  */
+      _bfd_ecoff_swap_rndx_in (bigendian, &aux_ptr[indx].a_rndx, &rndx);
+      ecoff_emit_aggregate (abfd, fdr, p1, &rndx,
+			    (long) AUX_GET_ISYM (bigendian, &aux_ptr[indx+1]),
+			    "struct");
+      indx++;			/* Skip aux words.  */
+      break;
+
+      /* Unions add 1-2 aux words:
+	 1st word is [ST_RFDESCAPE, offset] pointer to union def;
+	 2nd word is file index if 1st word rfd is ST_RFDESCAPE.  */
+
+    case btUnion:		/* Union.  */
+      _bfd_ecoff_swap_rndx_in (bigendian, &aux_ptr[indx].a_rndx, &rndx);
+      ecoff_emit_aggregate (abfd, fdr, p1, &rndx,
+			    (long) AUX_GET_ISYM (bigendian, &aux_ptr[indx+1]),
+			    "union");
+      indx++;			/* Skip aux words.  */
+      break;
+
+      /* Enumerations add 1-2 aux words:
+	 1st word is [ST_RFDESCAPE, offset] pointer to enum def;
+	 2nd word is file index if 1st word rfd is ST_RFDESCAPE.  */
+
+    case btEnum:		/* Enumeration.  */
+      _bfd_ecoff_swap_rndx_in (bigendian, &aux_ptr[indx].a_rndx, &rndx);
+      ecoff_emit_aggregate (abfd, fdr, p1, &rndx,
+			    (long) AUX_GET_ISYM (bigendian, &aux_ptr[indx+1]),
+			    "enum");
+      indx++;			/* Skip aux words.  */
+      break;
+
+    case btTypedef:		/* Defined via a typedef, isymRef points.  */
+      strcpy (p1, "typedef");
+      break;
+
+    case btRange:		/* Subrange of int.  */
+      strcpy (p1, "subrange");
+      break;
+
+    case btSet:			/* Pascal sets.  */
+      strcpy (p1, "set");
+      break;
+
+    case btComplex:		/* Fortran complex.  */
+      strcpy (p1, "complex");
+      break;
+
+    case btDComplex:		/* Fortran double complex.  */
+      strcpy (p1, "double complex");
+      break;
+
+    case btIndirect:		/* Forward or unnamed typedef.  */
+      strcpy (p1, "forward/unamed typedef");
+      break;
+
+    case btFixedDec:		/* Fixed Decimal.  */
+      strcpy (p1, "fixed decimal");
+      break;
+
+    case btFloatDec:		/* Float Decimal.  */
+      strcpy (p1, "float decimal");
+      break;
+
+    case btString:		/* Varying Length Character String.  */
+      strcpy (p1, "string");
+      break;
+
+    case btBit:			/* Aligned Bit String.  */
+      strcpy (p1, "bit");
+      break;
+
+    case btPicture:		/* Picture.  */
+      strcpy (p1, "picture");
+      break;
+
+    case btVoid:		/* Void.  */
+      strcpy (p1, "void");
+      break;
+
+    default:
+      sprintf (p1, _("Unknown basic type %d"), (int) basic_type);
+      break;
+    }
+
+  p1 += strlen (buffer1);
+
+  /* If this is a bitfield, get the bitsize.  */
+  if (u.ti.fBitfield)
+    {
+      int bitsize;
+
+      bitsize = AUX_GET_WIDTH (bigendian, &aux_ptr[indx++]);
+      sprintf (p1, " : %d", bitsize);
+      p1 += strlen (buffer1);
+    }
+
+  /* Deal with any qualifiers.  */
+  if (qualifiers[0].type != tqNil)
+    {
+      /* Snarf up any array bounds in the correct order.  Arrays
+         store 5 successive words in the aux. table:
+        	word 0	RNDXR to type of the bounds (ie, int)
+        	word 1	Current file descriptor index
+        	word 2	low bound
+        	word 3	high bound (or -1 if [])
+        	word 4	stride size in bits.  */
+      for (i = 0; i < 7; i++)
+	{
+	  if (qualifiers[i].type == tqArray)
+	    {
+	      qualifiers[i].low_bound =
+		AUX_GET_DNLOW (bigendian, &aux_ptr[indx+2]);
+	      qualifiers[i].high_bound =
+		AUX_GET_DNHIGH (bigendian, &aux_ptr[indx+3]);
+	      qualifiers[i].stride =
+		AUX_GET_WIDTH (bigendian, &aux_ptr[indx+4]);
+	      indx += 5;
+	    }
+	}
+
+      /* Now print out the qualifiers.  */
+      for (i = 0; i < 6; i++)
+	{
+	  switch (qualifiers[i].type)
+	    {
+	    case tqNil:
+	    case tqMax:
+	      break;
+
+	    case tqPtr:
+	      strcpy (p2, "ptr to ");
+	      p2 += sizeof ("ptr to ")-1;
+	      break;
+
+	    case tqVol:
+	      strcpy (p2, "volatile ");
+	      p2 += sizeof ("volatile ")-1;
+	      break;
+
+	    case tqFar:
+	      strcpy (p2, "far ");
+	      p2 += sizeof ("far ")-1;
+	      break;
+
+	    case tqProc:
+	      strcpy (p2, "func. ret. ");
+	      p2 += sizeof ("func. ret. ");
+	      break;
+
+	    case tqArray:
+	      {
+		int first_array = i;
+		int j;
+
+		/* Print array bounds reversed (ie, in the order the C
+		   programmer writes them).  C is such a fun language....  */
+		while (i < 5 && qualifiers[i+1].type == tqArray)
+		  i++;
+
+		for (j = i; j >= first_array; j--)
+		  {
+		    strcpy (p2, "array [");
+		    p2 += sizeof ("array [")-1;
+		    if (qualifiers[j].low_bound != 0)
+		      sprintf (p2,
+			       "%ld:%ld {%ld bits}",
+			       (long) qualifiers[j].low_bound,
+			       (long) qualifiers[j].high_bound,
+			       (long) qualifiers[j].stride);
+
+		    else if (qualifiers[j].high_bound != -1)
+		      sprintf (p2,
+			       "%ld {%ld bits}",
+			       (long) (qualifiers[j].high_bound + 1),
+			       (long) (qualifiers[j].stride));
+
+		    else
+		      sprintf (p2, " {%ld bits}", (long) (qualifiers[j].stride));
+
+		    p2 += strlen (p2);
+		    strcpy (p2, "] of ");
+		    p2 += sizeof ("] of ")-1;
+		  }
+	      }
+	      break;
+	    }
+	}
+    }
+
+  strcpy (p2, buffer1);
+  return buffer2;
+}
+
+/* Return information about ECOFF symbol SYMBOL in RET.  */
+
+void
+_bfd_ecoff_get_symbol_info (bfd *abfd ATTRIBUTE_UNUSED,
+			    asymbol *symbol,
+			    symbol_info *ret)
+{
+  bfd_symbol_info (symbol, ret);
+}
+
+/* Return whether this is a local label.  */
+
+bfd_boolean
+_bfd_ecoff_bfd_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED,
+				    const char *name)
+{
+  return name[0] == '$';
+}
+
+/* Print information about an ECOFF symbol.  */
+
+void
+_bfd_ecoff_print_symbol (bfd *abfd,
+			 void * filep,
+			 asymbol *symbol,
+			 bfd_print_symbol_type how)
+{
+  const struct ecoff_debug_swap * const debug_swap
+    = &ecoff_backend (abfd)->debug_swap;
+  FILE *file = (FILE *)filep;
+
+  switch (how)
+    {
+    case bfd_print_symbol_name:
+      fprintf (file, "%s", symbol->name);
+      break;
+    case bfd_print_symbol_more:
+      if (ecoffsymbol (symbol)->local)
+	{
+	  SYMR ecoff_sym;
+
+	  (*debug_swap->swap_sym_in) (abfd, ecoffsymbol (symbol)->native,
+				      &ecoff_sym);
+	  fprintf (file, "ecoff local ");
+	  fprintf_vma (file, (bfd_vma) ecoff_sym.value);
+	  fprintf (file, " %x %x", (unsigned) ecoff_sym.st,
+		   (unsigned) ecoff_sym.sc);
+	}
+      else
+	{
+	  EXTR ecoff_ext;
+
+	  (*debug_swap->swap_ext_in) (abfd, ecoffsymbol (symbol)->native,
+				      &ecoff_ext);
+	  fprintf (file, "ecoff extern ");
+	  fprintf_vma (file, (bfd_vma) ecoff_ext.asym.value);
+	  fprintf (file, " %x %x", (unsigned) ecoff_ext.asym.st,
+		   (unsigned) ecoff_ext.asym.sc);
+	}
+      break;
+    case bfd_print_symbol_all:
+      /* Print out the symbols in a reasonable way.  */
+      {
+	char type;
+	int pos;
+	EXTR ecoff_ext;
+	char jmptbl;
+	char cobol_main;
+	char weakext;
+
+	if (ecoffsymbol (symbol)->local)
+	  {
+	    (*debug_swap->swap_sym_in) (abfd, ecoffsymbol (symbol)->native,
+					&ecoff_ext.asym);
+	    type = 'l';
+	    pos = ((((char *) ecoffsymbol (symbol)->native
+		     - (char *) ecoff_data (abfd)->debug_info.external_sym)
+		    / debug_swap->external_sym_size)
+		   + ecoff_data (abfd)->debug_info.symbolic_header.iextMax);
+	    jmptbl = ' ';
+	    cobol_main = ' ';
+	    weakext = ' ';
+	  }
+	else
+	  {
+	    (*debug_swap->swap_ext_in) (abfd, ecoffsymbol (symbol)->native,
+					&ecoff_ext);
+	    type = 'e';
+	    pos = (((char *) ecoffsymbol (symbol)->native
+		    - (char *) ecoff_data (abfd)->debug_info.external_ext)
+		   / debug_swap->external_ext_size);
+	    jmptbl = ecoff_ext.jmptbl ? 'j' : ' ';
+	    cobol_main = ecoff_ext.cobol_main ? 'c' : ' ';
+	    weakext = ecoff_ext.weakext ? 'w' : ' ';
+	  }
+
+	fprintf (file, "[%3d] %c ",
+		 pos, type);
+	fprintf_vma (file, (bfd_vma) ecoff_ext.asym.value);
+	fprintf (file, " st %x sc %x indx %x %c%c%c %s",
+		 (unsigned) ecoff_ext.asym.st,
+		 (unsigned) ecoff_ext.asym.sc,
+		 (unsigned) ecoff_ext.asym.index,
+		 jmptbl, cobol_main, weakext,
+		 symbol->name);
+
+	if (ecoffsymbol (symbol)->fdr != NULL
+	    && ecoff_ext.asym.index != indexNil)
+	  {
+	    FDR *fdr;
+	    unsigned int indx;
+	    int bigendian;
+	    bfd_size_type sym_base;
+	    union aux_ext *aux_base;
+
+	    fdr = ecoffsymbol (symbol)->fdr;
+	    indx = ecoff_ext.asym.index;
+
+	    /* sym_base is used to map the fdr relative indices which
+	       appear in the file to the position number which we are
+	       using.  */
+	    sym_base = fdr->isymBase;
+	    if (ecoffsymbol (symbol)->local)
+	      sym_base +=
+		ecoff_data (abfd)->debug_info.symbolic_header.iextMax;
+
+	    /* aux_base is the start of the aux entries for this file;
+	       asym.index is an offset from this.  */
+	    aux_base = (ecoff_data (abfd)->debug_info.external_aux
+			+ fdr->iauxBase);
+
+	    /* The aux entries are stored in host byte order; the
+	       order is indicated by a bit in the fdr.  */
+	    bigendian = fdr->fBigendian;
+
+	    /* This switch is basically from gcc/mips-tdump.c.  */
+	    switch (ecoff_ext.asym.st)
+	      {
+	      case stNil:
+	      case stLabel:
+		break;
+
+	      case stFile:
+	      case stBlock:
+		fprintf (file, _("\n      End+1 symbol: %ld"),
+			 (long) (indx + sym_base));
+		break;
+
+	      case stEnd:
+		if (ecoff_ext.asym.sc == scText
+		    || ecoff_ext.asym.sc == scInfo)
+		  fprintf (file, _("\n      First symbol: %ld"),
+			   (long) (indx + sym_base));
+		else
+		  fprintf (file, _("\n      First symbol: %ld"),
+			   ((long)
+			    (AUX_GET_ISYM (bigendian,
+					   &aux_base[ecoff_ext.asym.index])
+			     + sym_base)));
+		break;
+
+	      case stProc:
+	      case stStaticProc:
+		if (ECOFF_IS_STAB (&ecoff_ext.asym))
+		  ;
+		else if (ecoffsymbol (symbol)->local)
+		  fprintf (file, _("\n      End+1 symbol: %-7ld   Type:  %s"),
+			   ((long)
+			    (AUX_GET_ISYM (bigendian,
+					   &aux_base[ecoff_ext.asym.index])
+			     + sym_base)),
+			   ecoff_type_to_string (abfd, fdr, indx + 1));
+		else
+		  fprintf (file, _("\n      Local symbol: %ld"),
+			   ((long) indx
+			    + (long) sym_base
+			    + (ecoff_data (abfd)
+			       ->debug_info.symbolic_header.iextMax)));
+		break;
+
+	      case stStruct:
+		fprintf (file, _("\n      struct; End+1 symbol: %ld"),
+			 (long) (indx + sym_base));
+		break;
+
+	      case stUnion:
+		fprintf (file, _("\n      union; End+1 symbol: %ld"),
+			 (long) (indx + sym_base));
+		break;
+
+	      case stEnum:
+		fprintf (file, _("\n      enum; End+1 symbol: %ld"),
+			 (long) (indx + sym_base));
+		break;
+
+	      default:
+		if (! ECOFF_IS_STAB (&ecoff_ext.asym))
+		  fprintf (file, _("\n      Type: %s"),
+			   ecoff_type_to_string (abfd, fdr, indx));
+		break;
+	      }
+	  }
+      }
+      break;
+    }
+}
+
+/* Read in the relocs for a section.  */
+
+static bfd_boolean
+ecoff_slurp_reloc_table (bfd *abfd,
+			 asection *section,
+			 asymbol **symbols)
+{
+  const struct ecoff_backend_data * const backend = ecoff_backend (abfd);
+  arelent *internal_relocs;
+  bfd_size_type external_reloc_size;
+  bfd_size_type amt;
+  char *external_relocs;
+  arelent *rptr;
+  unsigned int i;
+
+  if (section->relocation != NULL
+      || section->reloc_count == 0
+      || (section->flags & SEC_CONSTRUCTOR) != 0)
+    return TRUE;
+
+  if (! _bfd_ecoff_slurp_symbol_table (abfd))
+    return FALSE;
+
+  amt = section->reloc_count;
+  amt *= sizeof (arelent);
+  internal_relocs = (arelent *) bfd_alloc (abfd, amt);
+
+  external_reloc_size = backend->external_reloc_size;
+  amt = external_reloc_size * section->reloc_count;
+  external_relocs = (char *) bfd_alloc (abfd, amt);
+  if (internal_relocs == NULL || external_relocs == NULL)
+    return FALSE;
+  if (bfd_seek (abfd, section->rel_filepos, SEEK_SET) != 0)
+    return FALSE;
+  if (bfd_bread (external_relocs, amt, abfd) != amt)
+    return FALSE;
+
+  for (i = 0, rptr = internal_relocs; i < section->reloc_count; i++, rptr++)
+    {
+      struct internal_reloc intern;
+
+      (*backend->swap_reloc_in) (abfd,
+				 external_relocs + i * external_reloc_size,
+				 &intern);
+
+      if (intern.r_extern)
+	{
+	  /* r_symndx is an index into the external symbols.  */
+	  BFD_ASSERT (intern.r_symndx >= 0
+		      && (intern.r_symndx
+			  < (ecoff_data (abfd)
+			     ->debug_info.symbolic_header.iextMax)));
+	  rptr->sym_ptr_ptr = symbols + intern.r_symndx;
+	  rptr->addend = 0;
+	}
+      else if (intern.r_symndx == RELOC_SECTION_NONE
+	       || intern.r_symndx == RELOC_SECTION_ABS)
+	{
+	  rptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+	  rptr->addend = 0;
+	}
+      else
+	{
+	  const char *sec_name;
+	  asection *sec;
+
+	  /* r_symndx is a section key.  */
+	  switch (intern.r_symndx)
+	    {
+	    case RELOC_SECTION_TEXT:  sec_name = _TEXT;  break;
+	    case RELOC_SECTION_RDATA: sec_name = _RDATA; break;
+	    case RELOC_SECTION_DATA:  sec_name = _DATA;  break;
+	    case RELOC_SECTION_SDATA: sec_name = _SDATA; break;
+	    case RELOC_SECTION_SBSS:  sec_name = _SBSS;  break;
+	    case RELOC_SECTION_BSS:   sec_name = _BSS;   break;
+	    case RELOC_SECTION_INIT:  sec_name = _INIT;  break;
+	    case RELOC_SECTION_LIT8:  sec_name = _LIT8;  break;
+	    case RELOC_SECTION_LIT4:  sec_name = _LIT4;  break;
+	    case RELOC_SECTION_XDATA: sec_name = _XDATA; break;
+	    case RELOC_SECTION_PDATA: sec_name = _PDATA; break;
+	    case RELOC_SECTION_FINI:  sec_name = _FINI;  break;
+	    case RELOC_SECTION_LITA:  sec_name = _LITA;  break;
+	    case RELOC_SECTION_RCONST: sec_name = _RCONST; break;
+	    default: abort ();
+	    }
+
+	  sec = bfd_get_section_by_name (abfd, sec_name);
+	  if (sec == NULL)
+	    abort ();
+	  rptr->sym_ptr_ptr = sec->symbol_ptr_ptr;
+
+	  rptr->addend = - bfd_get_section_vma (abfd, sec);
+	}
+
+      rptr->address = intern.r_vaddr - bfd_get_section_vma (abfd, section);
+
+      /* Let the backend select the howto field and do any other
+	 required processing.  */
+      (*backend->adjust_reloc_in) (abfd, &intern, rptr);
+    }
+
+  bfd_release (abfd, external_relocs);
+
+  section->relocation = internal_relocs;
+
+  return TRUE;
+}
+
+/* Get a canonical list of relocs.  */
+
+long
+_bfd_ecoff_canonicalize_reloc (bfd *abfd,
+			       asection *section,
+			       arelent **relptr,
+			       asymbol **symbols)
+{
+  unsigned int count;
+
+  if (section->flags & SEC_CONSTRUCTOR)
+    {
+      arelent_chain *chain;
+
+      /* This section has relocs made up by us, not the file, so take
+	 them out of their chain and place them into the data area
+	 provided.  */
+      for (count = 0, chain = section->constructor_chain;
+	   count < section->reloc_count;
+	   count++, chain = chain->next)
+	*relptr++ = &chain->relent;
+    }
+  else
+    {
+      arelent *tblptr;
+
+      if (! ecoff_slurp_reloc_table (abfd, section, symbols))
+	return -1;
+
+      tblptr = section->relocation;
+
+      for (count = 0; count < section->reloc_count; count++)
+	*relptr++ = tblptr++;
+    }
+
+  *relptr = NULL;
+
+  return section->reloc_count;
+}
+
+/* Provided a BFD, a section and an offset into the section, calculate
+   and return the name of the source file and the line nearest to the
+   wanted location.  */
+
+bfd_boolean
+_bfd_ecoff_find_nearest_line (bfd *abfd,
+			      asection *section,
+			      asymbol **ignore_symbols ATTRIBUTE_UNUSED,
+			      bfd_vma offset,
+			      const char **filename_ptr,
+			      const char **functionname_ptr,
+			      unsigned int *retline_ptr)
+{
+  const struct ecoff_debug_swap * const debug_swap
+    = &ecoff_backend (abfd)->debug_swap;
+  struct ecoff_debug_info * const debug_info = &ecoff_data (abfd)->debug_info;
+  struct ecoff_find_line *line_info;
+
+  /* Make sure we have the FDR's.  */
+  if (! _bfd_ecoff_slurp_symbolic_info (abfd, NULL, debug_info)
+      || bfd_get_symcount (abfd) == 0)
+    return FALSE;
+
+  if (ecoff_data (abfd)->find_line_info == NULL)
+    {
+      bfd_size_type amt = sizeof (struct ecoff_find_line);
+
+      ecoff_data (abfd)->find_line_info =
+          (struct ecoff_find_line *) bfd_zalloc (abfd, amt);
+      if (ecoff_data (abfd)->find_line_info == NULL)
+	return FALSE;
+    }
+  line_info = ecoff_data (abfd)->find_line_info;
+
+  return _bfd_ecoff_locate_line (abfd, section, offset, debug_info,
+				 debug_swap, line_info, filename_ptr,
+				 functionname_ptr, retline_ptr);
+}
+
+/* Copy private BFD data.  This is called by objcopy and strip.  We
+   use it to copy the ECOFF debugging information from one BFD to the
+   other.  It would be theoretically possible to represent the ECOFF
+   debugging information in the symbol table.  However, it would be a
+   lot of work, and there would be little gain (gas, gdb, and ld
+   already access the ECOFF debugging information via the
+   ecoff_debug_info structure, and that structure would have to be
+   retained in order to support ECOFF debugging in MIPS ELF).
+
+   The debugging information for the ECOFF external symbols comes from
+   the symbol table, so this function only handles the other debugging
+   information.  */
+
+bfd_boolean
+_bfd_ecoff_bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  struct ecoff_debug_info *iinfo = &ecoff_data (ibfd)->debug_info;
+  struct ecoff_debug_info *oinfo = &ecoff_data (obfd)->debug_info;
+  int i;
+  asymbol **sym_ptr_ptr;
+  size_t c;
+  bfd_boolean local;
+
+  /* We only want to copy information over if both BFD's use ECOFF
+     format.  */
+  if (bfd_get_flavour (ibfd) != bfd_target_ecoff_flavour
+      || bfd_get_flavour (obfd) != bfd_target_ecoff_flavour)
+    return TRUE;
+
+  /* Copy the GP value and the register masks.  */
+  ecoff_data (obfd)->gp = ecoff_data (ibfd)->gp;
+  ecoff_data (obfd)->gprmask = ecoff_data (ibfd)->gprmask;
+  ecoff_data (obfd)->fprmask = ecoff_data (ibfd)->fprmask;
+  for (i = 0; i < 3; i++)
+    ecoff_data (obfd)->cprmask[i] = ecoff_data (ibfd)->cprmask[i];
+
+  /* Copy the version stamp.  */
+  oinfo->symbolic_header.vstamp = iinfo->symbolic_header.vstamp;
+
+  /* If there are no symbols, don't copy any debugging information.  */
+  c = bfd_get_symcount (obfd);
+  sym_ptr_ptr = bfd_get_outsymbols (obfd);
+  if (c == 0 || sym_ptr_ptr == NULL)
+    return TRUE;
+
+  /* See if there are any local symbols.  */
+  local = FALSE;
+  for (; c > 0; c--, sym_ptr_ptr++)
+    {
+      if (ecoffsymbol (*sym_ptr_ptr)->local)
+	{
+	  local = TRUE;
+	  break;
+	}
+    }
+
+  if (local)
+    {
+      /* There are some local symbols.  We just bring over all the
+	 debugging information.  FIXME: This is not quite the right
+	 thing to do.  If the user has asked us to discard all
+	 debugging information, then we are probably going to wind up
+	 keeping it because there will probably be some local symbol
+	 which objcopy did not discard.  We should actually break
+	 apart the debugging information and only keep that which
+	 applies to the symbols we want to keep.  */
+      oinfo->symbolic_header.ilineMax = iinfo->symbolic_header.ilineMax;
+      oinfo->symbolic_header.cbLine = iinfo->symbolic_header.cbLine;
+      oinfo->line = iinfo->line;
+
+      oinfo->symbolic_header.idnMax = iinfo->symbolic_header.idnMax;
+      oinfo->external_dnr = iinfo->external_dnr;
+
+      oinfo->symbolic_header.ipdMax = iinfo->symbolic_header.ipdMax;
+      oinfo->external_pdr = iinfo->external_pdr;
+
+      oinfo->symbolic_header.isymMax = iinfo->symbolic_header.isymMax;
+      oinfo->external_sym = iinfo->external_sym;
+
+      oinfo->symbolic_header.ioptMax = iinfo->symbolic_header.ioptMax;
+      oinfo->external_opt = iinfo->external_opt;
+
+      oinfo->symbolic_header.iauxMax = iinfo->symbolic_header.iauxMax;
+      oinfo->external_aux = iinfo->external_aux;
+
+      oinfo->symbolic_header.issMax = iinfo->symbolic_header.issMax;
+      oinfo->ss = iinfo->ss;
+
+      oinfo->symbolic_header.ifdMax = iinfo->symbolic_header.ifdMax;
+      oinfo->external_fdr = iinfo->external_fdr;
+
+      oinfo->symbolic_header.crfd = iinfo->symbolic_header.crfd;
+      oinfo->external_rfd = iinfo->external_rfd;
+    }
+  else
+    {
+      /* We are discarding all the local symbol information.  Look
+	 through the external symbols and remove all references to FDR
+	 or aux information.  */
+      c = bfd_get_symcount (obfd);
+      sym_ptr_ptr = bfd_get_outsymbols (obfd);
+      for (; c > 0; c--, sym_ptr_ptr++)
+	{
+	  EXTR esym;
+
+	  (*(ecoff_backend (obfd)->debug_swap.swap_ext_in))
+	    (obfd, ecoffsymbol (*sym_ptr_ptr)->native, &esym);
+	  esym.ifd = ifdNil;
+	  esym.asym.index = indexNil;
+	  (*(ecoff_backend (obfd)->debug_swap.swap_ext_out))
+	    (obfd, &esym, ecoffsymbol (*sym_ptr_ptr)->native);
+	}
+    }
+
+  return TRUE;
+}
+
+/* Set the architecture.  The supported architecture is stored in the
+   backend pointer.  We always set the architecture anyhow, since many
+   callers ignore the return value.  */
+
+bfd_boolean
+_bfd_ecoff_set_arch_mach (bfd *abfd,
+			  enum bfd_architecture arch,
+			  unsigned long machine)
+{
+  bfd_default_set_arch_mach (abfd, arch, machine);
+  return arch == ecoff_backend (abfd)->arch;
+}
+
+/* Get the size of the section headers.  */
+
+int
+_bfd_ecoff_sizeof_headers (bfd *abfd,
+			   struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  asection *current;
+  int c;
+  int ret;
+
+  c = 0;
+  for (current = abfd->sections;
+       current != NULL;
+       current = current->next)
+    ++c;
+
+  ret = (bfd_coff_filhsz (abfd)
+	 + bfd_coff_aoutsz (abfd)
+	 + c * bfd_coff_scnhsz (abfd));
+  return BFD_ALIGN (ret, 16);
+}
+
+/* Get the contents of a section.  */
+
+bfd_boolean
+_bfd_ecoff_get_section_contents (bfd *abfd,
+				 asection *section,
+				 void * location,
+				 file_ptr offset,
+				 bfd_size_type count)
+{
+  return _bfd_generic_get_section_contents (abfd, section, location,
+					    offset, count);
+}
+
+/* Sort sections by VMA, but put SEC_ALLOC sections first.  This is
+   called via qsort.  */
+
+static int
+ecoff_sort_hdrs (const void * arg1, const void * arg2)
+{
+  const asection *hdr1 = *(const asection **) arg1;
+  const asection *hdr2 = *(const asection **) arg2;
+
+  if ((hdr1->flags & SEC_ALLOC) != 0)
+    {
+      if ((hdr2->flags & SEC_ALLOC) == 0)
+	return -1;
+    }
+  else
+    {
+      if ((hdr2->flags & SEC_ALLOC) != 0)
+	return 1;
+    }
+  if (hdr1->vma < hdr2->vma)
+    return -1;
+  else if (hdr1->vma > hdr2->vma)
+    return 1;
+  else
+    return 0;
+}
+
+/* Calculate the file position for each section, and set
+   reloc_filepos.  */
+
+static bfd_boolean
+ecoff_compute_section_file_positions (bfd *abfd)
+{
+  file_ptr sofar, file_sofar;
+  asection **sorted_hdrs;
+  asection *current;
+  unsigned int i;
+  file_ptr old_sofar;
+  bfd_boolean rdata_in_text;
+  bfd_boolean first_data, first_nonalloc;
+  const bfd_vma round = ecoff_backend (abfd)->round;
+  bfd_size_type amt;
+
+  sofar = _bfd_ecoff_sizeof_headers (abfd, NULL);
+  file_sofar = sofar;
+
+  /* Sort the sections by VMA.  */
+  amt = abfd->section_count;
+  amt *= sizeof (asection *);
+  sorted_hdrs = (asection **) bfd_malloc (amt);
+  if (sorted_hdrs == NULL)
+    return FALSE;
+  for (current = abfd->sections, i = 0;
+       current != NULL;
+       current = current->next, i++)
+    sorted_hdrs[i] = current;
+  BFD_ASSERT (i == abfd->section_count);
+
+  qsort (sorted_hdrs, abfd->section_count, sizeof (asection *),
+	 ecoff_sort_hdrs);
+
+  /* Some versions of the OSF linker put the .rdata section in the
+     text segment, and some do not.  */
+  rdata_in_text = ecoff_backend (abfd)->rdata_in_text;
+  if (rdata_in_text)
+    {
+      for (i = 0; i < abfd->section_count; i++)
+	{
+	  current = sorted_hdrs[i];
+	  if (streq (current->name, _RDATA))
+	    break;
+	  if ((current->flags & SEC_CODE) == 0
+	      && ! streq (current->name, _PDATA)
+	      && ! streq (current->name, _RCONST))
+	    {
+	      rdata_in_text = FALSE;
+	      break;
+	    }
+	}
+    }
+  ecoff_data (abfd)->rdata_in_text = rdata_in_text;
+
+  first_data = TRUE;
+  first_nonalloc = TRUE;
+  for (i = 0; i < abfd->section_count; i++)
+    {
+      unsigned int alignment_power;
+
+      current = sorted_hdrs[i];
+
+      /* For the Alpha ECOFF .pdata section the lnnoptr field is
+	 supposed to indicate the number of .pdata entries that are
+	 really in the section.  Each entry is 8 bytes.  We store this
+	 away in line_filepos before increasing the section size.  */
+      if (streq (current->name, _PDATA))
+	current->line_filepos = current->size / 8;
+
+      alignment_power = current->alignment_power;
+
+      /* On Ultrix, the data sections in an executable file must be
+	 aligned to a page boundary within the file.  This does not
+	 affect the section size, though.  FIXME: Does this work for
+	 other platforms?  It requires some modification for the
+	 Alpha, because .rdata on the Alpha goes with the text, not
+	 the data.  */
+      if ((abfd->flags & EXEC_P) != 0
+	  && (abfd->flags & D_PAGED) != 0
+	  && ! first_data
+	  && (current->flags & SEC_CODE) == 0
+	  && (! rdata_in_text
+	      || ! streq (current->name, _RDATA))
+	  && ! streq (current->name, _PDATA)
+	  && ! streq (current->name, _RCONST))
+	{
+	  sofar = (sofar + round - 1) &~ (round - 1);
+	  file_sofar = (file_sofar + round - 1) &~ (round - 1);
+	  first_data = FALSE;
+	}
+      else if (streq (current->name, _LIB))
+	{
+	  /* On Irix 4, the location of contents of the .lib section
+	     from a shared library section is also rounded up to a
+	     page boundary.  */
+
+	  sofar = (sofar + round - 1) &~ (round - 1);
+	  file_sofar = (file_sofar + round - 1) &~ (round - 1);
+	}
+      else if (first_nonalloc
+	       && (current->flags & SEC_ALLOC) == 0
+	       && (abfd->flags & D_PAGED) != 0)
+	{
+	  /* Skip up to the next page for an unallocated section, such
+             as the .comment section on the Alpha.  This leaves room
+             for the .bss section.  */
+	  first_nonalloc = FALSE;
+	  sofar = (sofar + round - 1) &~ (round - 1);
+	  file_sofar = (file_sofar + round - 1) &~ (round - 1);
+	}
+
+      /* Align the sections in the file to the same boundary on
+	 which they are aligned in virtual memory.  */
+      sofar = BFD_ALIGN (sofar, 1 << alignment_power);
+      if ((current->flags & SEC_HAS_CONTENTS) != 0)
+	file_sofar = BFD_ALIGN (file_sofar, 1 << alignment_power);
+
+      if ((abfd->flags & D_PAGED) != 0
+	  && (current->flags & SEC_ALLOC) != 0)
+	{
+	  sofar += (current->vma - sofar) % round;
+	  if ((current->flags & SEC_HAS_CONTENTS) != 0)
+	    file_sofar += (current->vma - file_sofar) % round;
+	}
+
+      if ((current->flags & (SEC_HAS_CONTENTS | SEC_LOAD)) != 0)
+	current->filepos = file_sofar;
+
+      sofar += current->size;
+      if ((current->flags & SEC_HAS_CONTENTS) != 0)
+	file_sofar += current->size;
+
+      /* Make sure that this section is of the right size too.  */
+      old_sofar = sofar;
+      sofar = BFD_ALIGN (sofar, 1 << alignment_power);
+      if ((current->flags & SEC_HAS_CONTENTS) != 0)
+	file_sofar = BFD_ALIGN (file_sofar, 1 << alignment_power);
+      current->size += sofar - old_sofar;
+    }
+
+  free (sorted_hdrs);
+  sorted_hdrs = NULL;
+
+  ecoff_data (abfd)->reloc_filepos = file_sofar;
+
+  return TRUE;
+}
+
+/* Determine the location of the relocs for all the sections in the
+   output file, as well as the location of the symbolic debugging
+   information.  */
+
+static bfd_size_type
+ecoff_compute_reloc_file_positions (bfd *abfd)
+{
+  const bfd_size_type external_reloc_size =
+    ecoff_backend (abfd)->external_reloc_size;
+  file_ptr reloc_base;
+  bfd_size_type reloc_size;
+  asection *current;
+  file_ptr sym_base;
+
+  if (! abfd->output_has_begun)
+    {
+      if (! ecoff_compute_section_file_positions (abfd))
+	abort ();
+      abfd->output_has_begun = TRUE;
+    }
+
+  reloc_base = ecoff_data (abfd)->reloc_filepos;
+
+  reloc_size = 0;
+  for (current = abfd->sections;
+       current != NULL;
+       current = current->next)
+    {
+      if (current->reloc_count == 0)
+	current->rel_filepos = 0;
+      else
+	{
+	  bfd_size_type relsize;
+
+	  current->rel_filepos = reloc_base;
+	  relsize = current->reloc_count * external_reloc_size;
+	  reloc_size += relsize;
+	  reloc_base += relsize;
+	}
+    }
+
+  sym_base = ecoff_data (abfd)->reloc_filepos + reloc_size;
+
+  /* At least on Ultrix, the symbol table of an executable file must
+     be aligned to a page boundary.  FIXME: Is this true on other
+     platforms?  */
+  if ((abfd->flags & EXEC_P) != 0
+      && (abfd->flags & D_PAGED) != 0)
+    sym_base = ((sym_base + ecoff_backend (abfd)->round - 1)
+		&~ (ecoff_backend (abfd)->round - 1));
+
+  ecoff_data (abfd)->sym_filepos = sym_base;
+
+  return reloc_size;
+}
+
+/* Set the contents of a section.  */
+
+bfd_boolean
+_bfd_ecoff_set_section_contents (bfd *abfd,
+				 asection *section,
+				 const void * location,
+				 file_ptr offset,
+				 bfd_size_type count)
+{
+  file_ptr pos;
+
+  /* This must be done first, because bfd_set_section_contents is
+     going to set output_has_begun to TRUE.  */
+  if (! abfd->output_has_begun
+      && ! ecoff_compute_section_file_positions (abfd))
+    return FALSE;
+
+  /* Handle the .lib section specially so that Irix 4 shared libraries
+     work out.  See coff_set_section_contents in coffcode.h.  */
+  if (streq (section->name, _LIB))
+    {
+      bfd_byte *rec, *recend;
+
+      rec = (bfd_byte *) location;
+      recend = rec + count;
+      while (rec < recend)
+	{
+	  ++section->lma;
+	  rec += bfd_get_32 (abfd, rec) * 4;
+	}
+
+      BFD_ASSERT (rec == recend);
+    }
+
+  if (count == 0)
+    return TRUE;
+
+  pos = section->filepos + offset;
+  if (bfd_seek (abfd, pos, SEEK_SET) != 0
+      || bfd_bwrite (location, count, abfd) != count)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Get the GP value for an ECOFF file.  This is a hook used by
+   nlmconv.  */
+
+bfd_vma
+bfd_ecoff_get_gp_value (bfd *abfd)
+{
+  if (bfd_get_flavour (abfd) != bfd_target_ecoff_flavour
+      || bfd_get_format (abfd) != bfd_object)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return 0;
+    }
+
+  return ecoff_data (abfd)->gp;
+}
+
+/* Set the GP value for an ECOFF file.  This is a hook used by the
+   assembler.  */
+
+bfd_boolean
+bfd_ecoff_set_gp_value (bfd *abfd, bfd_vma gp_value)
+{
+  if (bfd_get_flavour (abfd) != bfd_target_ecoff_flavour
+      || bfd_get_format (abfd) != bfd_object)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  ecoff_data (abfd)->gp = gp_value;
+
+  return TRUE;
+}
+
+/* Set the register masks for an ECOFF file.  This is a hook used by
+   the assembler.  */
+
+bfd_boolean
+bfd_ecoff_set_regmasks (bfd *abfd,
+			unsigned long gprmask,
+			unsigned long fprmask,
+			unsigned long *cprmask)
+{
+  ecoff_data_type *tdata;
+
+  if (bfd_get_flavour (abfd) != bfd_target_ecoff_flavour
+      || bfd_get_format (abfd) != bfd_object)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  tdata = ecoff_data (abfd);
+  tdata->gprmask = gprmask;
+  tdata->fprmask = fprmask;
+  if (cprmask != NULL)
+    {
+      int i;
+
+      for (i = 0; i < 3; i++)
+	tdata->cprmask[i] = cprmask[i];
+    }
+
+  return TRUE;
+}
+
+/* Get ECOFF EXTR information for an external symbol.  This function
+   is passed to bfd_ecoff_debug_externals.  */
+
+static bfd_boolean
+ecoff_get_extr (asymbol *sym, EXTR *esym)
+{
+  ecoff_symbol_type *ecoff_sym_ptr;
+  bfd *input_bfd;
+
+  if (bfd_asymbol_flavour (sym) != bfd_target_ecoff_flavour
+      || ecoffsymbol (sym)->native == NULL)
+    {
+      /* Don't include debugging, local, or section symbols.  */
+      if ((sym->flags & BSF_DEBUGGING) != 0
+	  || (sym->flags & BSF_LOCAL) != 0
+	  || (sym->flags & BSF_SECTION_SYM) != 0)
+	return FALSE;
+
+      esym->jmptbl = 0;
+      esym->cobol_main = 0;
+      esym->weakext = (sym->flags & BSF_WEAK) != 0;
+      esym->reserved = 0;
+      esym->ifd = ifdNil;
+      /* FIXME: we can do better than this for st and sc.  */
+      esym->asym.st = stGlobal;
+      esym->asym.sc = scAbs;
+      esym->asym.reserved = 0;
+      esym->asym.index = indexNil;
+      return TRUE;
+    }
+
+  ecoff_sym_ptr = ecoffsymbol (sym);
+
+  if (ecoff_sym_ptr->local)
+    return FALSE;
+
+  input_bfd = bfd_asymbol_bfd (sym);
+  (*(ecoff_backend (input_bfd)->debug_swap.swap_ext_in))
+    (input_bfd, ecoff_sym_ptr->native, esym);
+
+  /* If the symbol was defined by the linker, then esym will be
+     undefined but sym will not be.  Get a better class for such a
+     symbol.  */
+  if ((esym->asym.sc == scUndefined
+       || esym->asym.sc == scSUndefined)
+      && ! bfd_is_und_section (bfd_get_section (sym)))
+    esym->asym.sc = scAbs;
+
+  /* Adjust the FDR index for the symbol by that used for the input
+     BFD.  */
+  if (esym->ifd != -1)
+    {
+      struct ecoff_debug_info *input_debug;
+
+      input_debug = &ecoff_data (input_bfd)->debug_info;
+      BFD_ASSERT (esym->ifd < input_debug->symbolic_header.ifdMax);
+      if (input_debug->ifdmap != NULL)
+	esym->ifd = input_debug->ifdmap[esym->ifd];
+    }
+
+  return TRUE;
+}
+
+/* Set the external symbol index.  This routine is passed to
+   bfd_ecoff_debug_externals.  */
+
+static void
+ecoff_set_index (asymbol *sym, bfd_size_type indx)
+{
+  ecoff_set_sym_index (sym, indx);
+}
+
+/* Write out an ECOFF file.  */
+
+bfd_boolean
+_bfd_ecoff_write_object_contents (bfd *abfd)
+{
+  const struct ecoff_backend_data * const backend = ecoff_backend (abfd);
+  const bfd_vma round = backend->round;
+  const bfd_size_type filhsz = bfd_coff_filhsz (abfd);
+  const bfd_size_type aoutsz = bfd_coff_aoutsz (abfd);
+  const bfd_size_type scnhsz = bfd_coff_scnhsz (abfd);
+  const bfd_size_type external_hdr_size
+    = backend->debug_swap.external_hdr_size;
+  const bfd_size_type external_reloc_size = backend->external_reloc_size;
+  void (* const adjust_reloc_out) (bfd *, const arelent *, struct internal_reloc *)
+    = backend->adjust_reloc_out;
+  void (* const swap_reloc_out) (bfd *, const struct internal_reloc *, void *)
+    = backend->swap_reloc_out;
+  struct ecoff_debug_info * const debug = &ecoff_data (abfd)->debug_info;
+  HDRR * const symhdr = &debug->symbolic_header;
+  asection *current;
+  unsigned int count;
+  bfd_size_type reloc_size;
+  bfd_size_type text_size;
+  bfd_vma text_start;
+  bfd_boolean set_text_start;
+  bfd_size_type data_size;
+  bfd_vma data_start;
+  bfd_boolean set_data_start;
+  bfd_size_type bss_size;
+  void * buff = NULL;
+  void * reloc_buff = NULL;
+  struct internal_filehdr internal_f;
+  struct internal_aouthdr internal_a;
+  int i;
+
+  /* Determine where the sections and relocs will go in the output
+     file.  */
+  reloc_size = ecoff_compute_reloc_file_positions (abfd);
+
+  count = 1;
+  for (current = abfd->sections;
+       current != NULL;
+       current = current->next)
+    {
+      current->target_index = count;
+      ++count;
+    }
+
+  if ((abfd->flags & D_PAGED) != 0)
+    text_size = _bfd_ecoff_sizeof_headers (abfd, NULL);
+  else
+    text_size = 0;
+  text_start = 0;
+  set_text_start = FALSE;
+  data_size = 0;
+  data_start = 0;
+  set_data_start = FALSE;
+  bss_size = 0;
+
+  /* Write section headers to the file.  */
+
+  /* Allocate buff big enough to hold a section header,
+     file header, or a.out header.  */
+  {
+    bfd_size_type siz;
+
+    siz = scnhsz;
+    if (siz < filhsz)
+      siz = filhsz;
+    if (siz < aoutsz)
+      siz = aoutsz;
+    buff = bfd_malloc (siz);
+    if (buff == NULL)
+      goto error_return;
+  }
+
+  internal_f.f_nscns = 0;
+  if (bfd_seek (abfd, (file_ptr) (filhsz + aoutsz), SEEK_SET) != 0)
+    goto error_return;
+
+  for (current = abfd->sections;
+       current != NULL;
+       current = current->next)
+    {
+      struct internal_scnhdr section;
+      bfd_vma vma;
+
+      ++internal_f.f_nscns;
+
+      strncpy (section.s_name, current->name, sizeof section.s_name);
+
+      /* This seems to be correct for Irix 4 shared libraries.  */
+      vma = bfd_get_section_vma (abfd, current);
+      if (streq (current->name, _LIB))
+	section.s_vaddr = 0;
+      else
+	section.s_vaddr = vma;
+
+      section.s_paddr = current->lma;
+      section.s_size = current->size;
+
+      /* If this section is unloadable then the scnptr will be 0.  */
+      if ((current->flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0)
+	section.s_scnptr = 0;
+      else
+	section.s_scnptr = current->filepos;
+      section.s_relptr = current->rel_filepos;
+
+      /* FIXME: the lnnoptr of the .sbss or .sdata section of an
+	 object file produced by the assembler is supposed to point to
+	 information about how much room is required by objects of
+	 various different sizes.  I think this only matters if we
+	 want the linker to compute the best size to use, or
+	 something.  I don't know what happens if the information is
+	 not present.  */
+      if (! streq (current->name, _PDATA))
+	section.s_lnnoptr = 0;
+      else
+	{
+	  /* The Alpha ECOFF .pdata section uses the lnnoptr field to
+	     hold the number of entries in the section (each entry is
+	     8 bytes).  We stored this in the line_filepos field in
+	     ecoff_compute_section_file_positions.  */
+	  section.s_lnnoptr = current->line_filepos;
+	}
+
+      section.s_nreloc = current->reloc_count;
+      section.s_nlnno = 0;
+      section.s_flags = ecoff_sec_to_styp_flags (current->name,
+						 current->flags);
+
+      if (bfd_coff_swap_scnhdr_out (abfd, (void *) &section, buff) == 0
+	  || bfd_bwrite (buff, scnhsz, abfd) != scnhsz)
+	goto error_return;
+
+      if ((section.s_flags & STYP_TEXT) != 0
+	  || ((section.s_flags & STYP_RDATA) != 0
+	      && ecoff_data (abfd)->rdata_in_text)
+	  || section.s_flags == STYP_PDATA
+	  || (section.s_flags & STYP_DYNAMIC) != 0
+	  || (section.s_flags & STYP_LIBLIST) != 0
+	  || (section.s_flags & STYP_RELDYN) != 0
+	  || section.s_flags == STYP_CONFLIC
+	  || (section.s_flags & STYP_DYNSTR) != 0
+	  || (section.s_flags & STYP_DYNSYM) != 0
+	  || (section.s_flags & STYP_HASH) != 0
+	  || (section.s_flags & STYP_ECOFF_INIT) != 0
+	  || (section.s_flags & STYP_ECOFF_FINI) != 0
+	  || section.s_flags == STYP_RCONST)
+	{
+	  text_size += current->size;
+	  if (! set_text_start || text_start > vma)
+	    {
+	      text_start = vma;
+	      set_text_start = TRUE;
+	    }
+	}
+      else if ((section.s_flags & STYP_RDATA) != 0
+	       || (section.s_flags & STYP_DATA) != 0
+	       || (section.s_flags & STYP_LITA) != 0
+	       || (section.s_flags & STYP_LIT8) != 0
+	       || (section.s_flags & STYP_LIT4) != 0
+	       || (section.s_flags & STYP_SDATA) != 0
+	       || section.s_flags == STYP_XDATA
+	       || (section.s_flags & STYP_GOT) != 0)
+	{
+	  data_size += current->size;
+	  if (! set_data_start || data_start > vma)
+	    {
+	      data_start = vma;
+	      set_data_start = TRUE;
+	    }
+	}
+      else if ((section.s_flags & STYP_BSS) != 0
+	       || (section.s_flags & STYP_SBSS) != 0)
+	bss_size += current->size;
+      else if (section.s_flags == 0
+	       || (section.s_flags & STYP_ECOFF_LIB) != 0
+	       || section.s_flags == STYP_COMMENT)
+	/* Do nothing.  */ ;
+      else
+	abort ();
+    }
+
+  /* Set up the file header.  */
+  internal_f.f_magic = ecoff_get_magic (abfd);
+
+  /* We will NOT put a fucking timestamp in the header here. Every
+     time you put it back, I will come in and take it out again.  I'm
+     sorry.  This field does not belong here.  We fill it with a 0 so
+     it compares the same but is not a reasonable time. --
+     gnu@cygnus.com.  */
+  internal_f.f_timdat = 0;
+
+  if (bfd_get_symcount (abfd) != 0)
+    {
+      /* The ECOFF f_nsyms field is not actually the number of
+	 symbols, it's the size of symbolic information header.  */
+      internal_f.f_nsyms = external_hdr_size;
+      internal_f.f_symptr = ecoff_data (abfd)->sym_filepos;
+    }
+  else
+    {
+      internal_f.f_nsyms = 0;
+      internal_f.f_symptr = 0;
+    }
+
+  internal_f.f_opthdr = aoutsz;
+
+  internal_f.f_flags = F_LNNO;
+  if (reloc_size == 0)
+    internal_f.f_flags |= F_RELFLG;
+  if (bfd_get_symcount (abfd) == 0)
+    internal_f.f_flags |= F_LSYMS;
+  if (abfd->flags & EXEC_P)
+    internal_f.f_flags |= F_EXEC;
+
+  if (bfd_little_endian (abfd))
+    internal_f.f_flags |= F_AR32WR;
+  else
+    internal_f.f_flags |= F_AR32W;
+
+  /* Set up the ``optional'' header.  */
+  if ((abfd->flags & D_PAGED) != 0)
+    internal_a.magic = ECOFF_AOUT_ZMAGIC;
+  else
+    internal_a.magic = ECOFF_AOUT_OMAGIC;
+
+  /* FIXME: Is this really correct?  */
+  internal_a.vstamp = symhdr->vstamp;
+
+  /* At least on Ultrix, these have to be rounded to page boundaries.
+     FIXME: Is this true on other platforms?  */
+  if ((abfd->flags & D_PAGED) != 0)
+    {
+      internal_a.tsize = (text_size + round - 1) &~ (round - 1);
+      internal_a.text_start = text_start &~ (round - 1);
+      internal_a.dsize = (data_size + round - 1) &~ (round - 1);
+      internal_a.data_start = data_start &~ (round - 1);
+    }
+  else
+    {
+      internal_a.tsize = text_size;
+      internal_a.text_start = text_start;
+      internal_a.dsize = data_size;
+      internal_a.data_start = data_start;
+    }
+
+  /* On Ultrix, the initial portions of the .sbss and .bss segments
+     are at the end of the data section.  The bsize field in the
+     optional header records how many bss bytes are required beyond
+     those in the data section.  The value is not rounded to a page
+     boundary.  */
+  if (bss_size < internal_a.dsize - data_size)
+    bss_size = 0;
+  else
+    bss_size -= internal_a.dsize - data_size;
+  internal_a.bsize = bss_size;
+  internal_a.bss_start = internal_a.data_start + internal_a.dsize;
+
+  internal_a.entry = bfd_get_start_address (abfd);
+
+  internal_a.gp_value = ecoff_data (abfd)->gp;
+
+  internal_a.gprmask = ecoff_data (abfd)->gprmask;
+  internal_a.fprmask = ecoff_data (abfd)->fprmask;
+  for (i = 0; i < 4; i++)
+    internal_a.cprmask[i] = ecoff_data (abfd)->cprmask[i];
+
+  /* Let the backend adjust the headers if necessary.  */
+  if (backend->adjust_headers)
+    {
+      if (! (*backend->adjust_headers) (abfd, &internal_f, &internal_a))
+	goto error_return;
+    }
+
+  /* Write out the file header and the optional header.  */
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    goto error_return;
+
+  bfd_coff_swap_filehdr_out (abfd, (void *) &internal_f, buff);
+  if (bfd_bwrite (buff, filhsz, abfd) != filhsz)
+    goto error_return;
+
+  bfd_coff_swap_aouthdr_out (abfd, (void *) &internal_a, buff);
+  if (bfd_bwrite (buff, aoutsz, abfd) != aoutsz)
+    goto error_return;
+
+  /* Build the external symbol information.  This must be done before
+     writing out the relocs so that we know the symbol indices.  We
+     don't do this if this BFD was created by the backend linker,
+     since it will have already handled the symbols and relocs.  */
+  if (! ecoff_data (abfd)->linker)
+    {
+      symhdr->iextMax = 0;
+      symhdr->issExtMax = 0;
+      debug->external_ext = debug->external_ext_end = NULL;
+      debug->ssext = debug->ssext_end = NULL;
+      if (! bfd_ecoff_debug_externals (abfd, debug, &backend->debug_swap,
+				       (abfd->flags & EXEC_P) == 0,
+				       ecoff_get_extr, ecoff_set_index))
+	goto error_return;
+
+      /* Write out the relocs.  */
+      for (current = abfd->sections;
+	   current != NULL;
+	   current = current->next)
+	{
+	  arelent **reloc_ptr_ptr;
+	  arelent **reloc_end;
+	  char *out_ptr;
+	  bfd_size_type amt;
+
+	  if (current->reloc_count == 0)
+	    continue;
+
+	  amt = current->reloc_count * external_reloc_size;
+	  reloc_buff = bfd_alloc (abfd, amt);
+	  if (reloc_buff == NULL)
+	    goto error_return;
+
+	  reloc_ptr_ptr = current->orelocation;
+	  reloc_end = reloc_ptr_ptr + current->reloc_count;
+	  out_ptr = (char *) reloc_buff;
+
+	  for (;
+	       reloc_ptr_ptr < reloc_end;
+	       reloc_ptr_ptr++, out_ptr += external_reloc_size)
+	    {
+	      arelent *reloc;
+	      asymbol *sym;
+	      struct internal_reloc in;
+
+	      memset ((void *) &in, 0, sizeof in);
+
+	      reloc = *reloc_ptr_ptr;
+	      sym = *reloc->sym_ptr_ptr;
+
+	      /* If the howto field has not been initialised then skip this reloc.
+		 This assumes that an error message has been issued elsewhere.  */
+	      if (reloc->howto == NULL)
+		continue;
+
+	      in.r_vaddr = (reloc->address
+			    + bfd_get_section_vma (abfd, current));
+	      in.r_type = reloc->howto->type;
+
+	      if ((sym->flags & BSF_SECTION_SYM) == 0)
+		{
+		  in.r_symndx = ecoff_get_sym_index (*reloc->sym_ptr_ptr);
+		  in.r_extern = 1;
+		}
+	      else
+		{
+		  const char *name;
+		  unsigned int j;
+		  static struct
+		  {
+		    const char * name;
+		    long r_symndx;
+		  }
+		  section_symndx [] =
+		  {
+		    { _TEXT,   RELOC_SECTION_TEXT   },
+		    { _RDATA,  RELOC_SECTION_RDATA  },
+		    { _DATA,   RELOC_SECTION_DATA   },
+		    { _SDATA,  RELOC_SECTION_SDATA  },
+		    { _SBSS,   RELOC_SECTION_SBSS   },
+		    { _BSS,    RELOC_SECTION_BSS    },
+		    { _INIT,   RELOC_SECTION_INIT   },
+		    { _LIT8,   RELOC_SECTION_LIT8   },
+		    { _LIT4,   RELOC_SECTION_LIT4   },
+		    { _XDATA,  RELOC_SECTION_XDATA  },
+		    { _PDATA,  RELOC_SECTION_PDATA  },
+		    { _FINI,   RELOC_SECTION_FINI   },
+		    { _LITA,   RELOC_SECTION_LITA   },
+		    { "*ABS*", RELOC_SECTION_ABS    },
+		    { _RCONST, RELOC_SECTION_RCONST }
+		  };
+
+		  name = bfd_get_section_name (abfd, bfd_get_section (sym));
+
+		  for (j = 0; j < ARRAY_SIZE (section_symndx); j++)
+		    if (streq (name, section_symndx[j].name))
+		      {
+			in.r_symndx = section_symndx[j].r_symndx;
+			break;
+		      }
+
+		  if (j == ARRAY_SIZE (section_symndx))
+		    abort ();
+		  in.r_extern = 0;
+		}
+
+	      (*adjust_reloc_out) (abfd, reloc, &in);
+
+	      (*swap_reloc_out) (abfd, &in, (void *) out_ptr);
+	    }
+
+	  if (bfd_seek (abfd, current->rel_filepos, SEEK_SET) != 0)
+	    goto error_return;
+	  amt = current->reloc_count * external_reloc_size;
+	  if (bfd_bwrite (reloc_buff, amt, abfd) != amt)
+	    goto error_return;
+	  bfd_release (abfd, reloc_buff);
+	  reloc_buff = NULL;
+	}
+
+      /* Write out the symbolic debugging information.  */
+      if (bfd_get_symcount (abfd) > 0)
+	{
+	  /* Write out the debugging information.  */
+	  if (! bfd_ecoff_write_debug (abfd, debug, &backend->debug_swap,
+				       ecoff_data (abfd)->sym_filepos))
+	    goto error_return;
+	}
+    }
+
+  /* The .bss section of a demand paged executable must receive an
+     entire page.  If there are symbols, the symbols will start on the
+     next page.  If there are no symbols, we must fill out the page by
+     hand.  */
+  if (bfd_get_symcount (abfd) == 0
+      && (abfd->flags & EXEC_P) != 0
+      && (abfd->flags & D_PAGED) != 0)
+    {
+      char c;
+
+      if (bfd_seek (abfd, (file_ptr) ecoff_data (abfd)->sym_filepos - 1,
+		    SEEK_SET) != 0)
+	goto error_return;
+      if (bfd_bread (&c, (bfd_size_type) 1, abfd) == 0)
+	c = 0;
+      if (bfd_seek (abfd, (file_ptr) ecoff_data (abfd)->sym_filepos - 1,
+		    SEEK_SET) != 0)
+	goto error_return;
+      if (bfd_bwrite (&c, (bfd_size_type) 1, abfd) != 1)
+	goto error_return;
+    }
+
+  if (reloc_buff != NULL)
+    bfd_release (abfd, reloc_buff);
+  if (buff != NULL)
+    free (buff);
+  return TRUE;
+ error_return:
+  if (reloc_buff != NULL)
+    bfd_release (abfd, reloc_buff);
+  if (buff != NULL)
+    free (buff);
+  return FALSE;
+}
+
+/* Archive handling.  ECOFF uses what appears to be a unique type of
+   archive header (armap).  The byte ordering of the armap and the
+   contents are encoded in the name of the armap itself.  At least for
+   now, we only support archives with the same byte ordering in the
+   armap and the contents.
+
+   The first four bytes in the armap are the number of symbol
+   definitions.  This is always a power of two.
+
+   This is followed by the symbol definitions.  Each symbol definition
+   occupies 8 bytes.  The first four bytes are the offset from the
+   start of the armap strings to the null-terminated string naming
+   this symbol.  The second four bytes are the file offset to the
+   archive member which defines this symbol.  If the second four bytes
+   are 0, then this is not actually a symbol definition, and it should
+   be ignored.
+
+   The symbols are hashed into the armap with a closed hashing scheme.
+   See the functions below for the details of the algorithm.
+
+   After the symbol definitions comes four bytes holding the size of
+   the string table, followed by the string table itself.  */
+
+/* The name of an archive headers looks like this:
+   __________E[BL]E[BL]_ (with a trailing space).
+   The trailing space is changed to an X if the archive is changed to
+   indicate that the armap is out of date.
+
+   The Alpha seems to use ________64E[BL]E[BL]_.  */
+
+#define ARMAP_BIG_ENDIAN 		'B'
+#define ARMAP_LITTLE_ENDIAN 		'L'
+#define ARMAP_MARKER 			'E'
+#define ARMAP_START_LENGTH 		10
+#define ARMAP_HEADER_MARKER_INDEX	10
+#define ARMAP_HEADER_ENDIAN_INDEX 	11
+#define ARMAP_OBJECT_MARKER_INDEX 	12
+#define ARMAP_OBJECT_ENDIAN_INDEX 	13
+#define ARMAP_END_INDEX 		14
+#define ARMAP_END 			"_ "
+
+/* This is a magic number used in the hashing algorithm.  */
+#define ARMAP_HASH_MAGIC 		0x9dd68ab5
+
+/* This returns the hash value to use for a string.  It also sets
+   *REHASH to the rehash adjustment if the first slot is taken.  SIZE
+   is the number of entries in the hash table, and HLOG is the log
+   base 2 of SIZE.  */
+
+static unsigned int
+ecoff_armap_hash (const char *s,
+		  unsigned int *rehash,
+		  unsigned int size,
+		  unsigned int hlog)
+{
+  unsigned int hash;
+
+  if (hlog == 0)
+    return 0;
+  hash = *s++;
+  while (*s != '\0')
+    hash = ((hash >> 27) | (hash << 5)) + *s++;
+  hash *= ARMAP_HASH_MAGIC;
+  *rehash = (hash & (size - 1)) | 1;
+  return hash >> (32 - hlog);
+}
+
+/* Read in the armap.  */
+
+bfd_boolean
+_bfd_ecoff_slurp_armap (bfd *abfd)
+{
+  char nextname[17];
+  unsigned int i;
+  struct areltdata *mapdata;
+  bfd_size_type parsed_size;
+  char *raw_armap;
+  struct artdata *ardata;
+  unsigned int count;
+  char *raw_ptr;
+  carsym *symdef_ptr;
+  char *stringbase;
+  bfd_size_type amt;
+
+  /* Get the name of the first element.  */
+  i = bfd_bread ((void *) nextname, (bfd_size_type) 16, abfd);
+  if (i == 0)
+      return TRUE;
+  if (i != 16)
+      return FALSE;
+
+  if (bfd_seek (abfd, (file_ptr) -16, SEEK_CUR) != 0)
+    return FALSE;
+
+  /* Irix 4.0.5F apparently can use either an ECOFF armap or a
+     standard COFF armap.  We could move the ECOFF armap stuff into
+     bfd_slurp_armap, but that seems inappropriate since no other
+     target uses this format.  Instead, we check directly for a COFF
+     armap.  */
+  if (CONST_STRNEQ (nextname, "/               "))
+    return bfd_slurp_armap (abfd);
+
+  /* See if the first element is an armap.  */
+  if (! strneq (nextname, ecoff_backend (abfd)->armap_start, ARMAP_START_LENGTH)
+      || nextname[ARMAP_HEADER_MARKER_INDEX] != ARMAP_MARKER
+      || (nextname[ARMAP_HEADER_ENDIAN_INDEX] != ARMAP_BIG_ENDIAN
+	  && nextname[ARMAP_HEADER_ENDIAN_INDEX] != ARMAP_LITTLE_ENDIAN)
+      || nextname[ARMAP_OBJECT_MARKER_INDEX] != ARMAP_MARKER
+      || (nextname[ARMAP_OBJECT_ENDIAN_INDEX] != ARMAP_BIG_ENDIAN
+	  && nextname[ARMAP_OBJECT_ENDIAN_INDEX] != ARMAP_LITTLE_ENDIAN)
+      || ! strneq (nextname + ARMAP_END_INDEX, ARMAP_END, sizeof ARMAP_END - 1))
+    {
+      bfd_has_map (abfd) = FALSE;
+      return TRUE;
+    }
+
+  /* Make sure we have the right byte ordering.  */
+  if (((nextname[ARMAP_HEADER_ENDIAN_INDEX] == ARMAP_BIG_ENDIAN)
+       ^ (bfd_header_big_endian (abfd)))
+      || ((nextname[ARMAP_OBJECT_ENDIAN_INDEX] == ARMAP_BIG_ENDIAN)
+	  ^ (bfd_big_endian (abfd))))
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+
+  /* Read in the armap.  */
+  ardata = bfd_ardata (abfd);
+  mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
+  if (mapdata == NULL)
+    return FALSE;
+  parsed_size = mapdata->parsed_size;
+  bfd_release (abfd, (void *) mapdata);
+
+  raw_armap = (char *) bfd_alloc (abfd, parsed_size);
+  if (raw_armap == NULL)
+    return FALSE;
+
+  if (bfd_bread ((void *) raw_armap, parsed_size, abfd) != parsed_size)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_malformed_archive);
+      bfd_release (abfd, (void *) raw_armap);
+      return FALSE;
+    }
+
+  ardata->tdata = (void *) raw_armap;
+
+  count = H_GET_32 (abfd, raw_armap);
+
+  ardata->symdef_count = 0;
+  ardata->cache = NULL;
+
+  /* This code used to overlay the symdefs over the raw archive data,
+     but that doesn't work on a 64 bit host.  */
+  stringbase = raw_armap + count * 8 + 8;
+
+#ifdef CHECK_ARMAP_HASH
+  {
+    unsigned int hlog;
+
+    /* Double check that I have the hashing algorithm right by making
+       sure that every symbol can be looked up successfully.  */
+    hlog = 0;
+    for (i = 1; i < count; i <<= 1)
+      hlog++;
+    BFD_ASSERT (i == count);
+
+    raw_ptr = raw_armap + 4;
+    for (i = 0; i < count; i++, raw_ptr += 8)
+      {
+	unsigned int name_offset, file_offset;
+	unsigned int hash, rehash, srch;
+
+	name_offset = H_GET_32 (abfd, raw_ptr);
+	file_offset = H_GET_32 (abfd, (raw_ptr + 4));
+	if (file_offset == 0)
+	  continue;
+	hash = ecoff_armap_hash (stringbase + name_offset, &rehash, count,
+				 hlog);
+	if (hash == i)
+	  continue;
+
+	/* See if we can rehash to this location.  */
+	for (srch = (hash + rehash) & (count - 1);
+	     srch != hash && srch != i;
+	     srch = (srch + rehash) & (count - 1))
+	  BFD_ASSERT (H_GET_32 (abfd, (raw_armap + 8 + srch * 8)) != 0);
+	BFD_ASSERT (srch == i);
+      }
+  }
+
+#endif /* CHECK_ARMAP_HASH */
+
+  raw_ptr = raw_armap + 4;
+  for (i = 0; i < count; i++, raw_ptr += 8)
+    if (H_GET_32 (abfd, (raw_ptr + 4)) != 0)
+      ++ardata->symdef_count;
+
+  amt = ardata->symdef_count;
+  amt *= sizeof (carsym);
+  symdef_ptr = (carsym *) bfd_alloc (abfd, amt);
+  if (!symdef_ptr)
+    return FALSE;
+
+  ardata->symdefs = symdef_ptr;
+
+  raw_ptr = raw_armap + 4;
+  for (i = 0; i < count; i++, raw_ptr += 8)
+    {
+      unsigned int name_offset, file_offset;
+
+      file_offset = H_GET_32 (abfd, (raw_ptr + 4));
+      if (file_offset == 0)
+	continue;
+      name_offset = H_GET_32 (abfd, raw_ptr);
+      symdef_ptr->name = stringbase + name_offset;
+      symdef_ptr->file_offset = file_offset;
+      ++symdef_ptr;
+    }
+
+  ardata->first_file_filepos = bfd_tell (abfd);
+  /* Pad to an even boundary.  */
+  ardata->first_file_filepos += ardata->first_file_filepos % 2;
+
+  bfd_has_map (abfd) = TRUE;
+
+  return TRUE;
+}
+
+/* Write out an armap.  */
+
+bfd_boolean
+_bfd_ecoff_write_armap (bfd *abfd,
+			unsigned int elength,
+			struct orl *map,
+			unsigned int orl_count,
+			int stridx)
+{
+  unsigned int hashsize, hashlog;
+  bfd_size_type symdefsize;
+  int padit;
+  unsigned int stringsize;
+  unsigned int mapsize;
+  file_ptr firstreal;
+  struct ar_hdr hdr;
+  struct stat statbuf;
+  unsigned int i;
+  bfd_byte temp[4];
+  bfd_byte *hashtable;
+  bfd *current;
+  bfd *last_elt;
+
+  /* Ultrix appears to use as a hash table size the least power of two
+     greater than twice the number of entries.  */
+  for (hashlog = 0; ((unsigned int) 1 << hashlog) <= 2 * orl_count; hashlog++)
+    ;
+  hashsize = 1 << hashlog;
+
+  symdefsize = hashsize * 8;
+  padit = stridx % 2;
+  stringsize = stridx + padit;
+
+  /* Include 8 bytes to store symdefsize and stringsize in output.  */
+  mapsize = symdefsize + stringsize + 8;
+
+  firstreal = SARMAG + sizeof (struct ar_hdr) + mapsize + elength;
+
+  memset ((void *) &hdr, 0, sizeof hdr);
+
+  /* Work out the ECOFF armap name.  */
+  strcpy (hdr.ar_name, ecoff_backend (abfd)->armap_start);
+  hdr.ar_name[ARMAP_HEADER_MARKER_INDEX] = ARMAP_MARKER;
+  hdr.ar_name[ARMAP_HEADER_ENDIAN_INDEX] =
+    (bfd_header_big_endian (abfd)
+     ? ARMAP_BIG_ENDIAN
+     : ARMAP_LITTLE_ENDIAN);
+  hdr.ar_name[ARMAP_OBJECT_MARKER_INDEX] = ARMAP_MARKER;
+  hdr.ar_name[ARMAP_OBJECT_ENDIAN_INDEX] =
+    bfd_big_endian (abfd) ? ARMAP_BIG_ENDIAN : ARMAP_LITTLE_ENDIAN;
+  memcpy (hdr.ar_name + ARMAP_END_INDEX, ARMAP_END, sizeof ARMAP_END - 1);
+
+  /* Write the timestamp of the archive header to be just a little bit
+     later than the timestamp of the file, otherwise the linker will
+     complain that the index is out of date.  Actually, the Ultrix
+     linker just checks the archive name; the GNU linker may check the
+     date.  */
+  stat (abfd->filename, &statbuf);
+  _bfd_ar_spacepad (hdr.ar_date, sizeof (hdr.ar_date), "%ld",
+		    (long) (statbuf.st_mtime + 60));
+
+  /* The DECstation uses zeroes for the uid, gid and mode of the
+     armap.  */
+  hdr.ar_uid[0] = '0';
+  hdr.ar_gid[0] = '0';
+  /* Building gcc ends up extracting the armap as a file - twice.  */
+  hdr.ar_mode[0] = '6';
+  hdr.ar_mode[1] = '4';
+  hdr.ar_mode[2] = '4';
+
+  _bfd_ar_spacepad (hdr.ar_size, sizeof (hdr.ar_size), "%-10ld", mapsize);
+
+  hdr.ar_fmag[0] = '`';
+  hdr.ar_fmag[1] = '\012';
+
+  /* Turn all null bytes in the header into spaces.  */
+  for (i = 0; i < sizeof (struct ar_hdr); i++)
+   if (((char *) (&hdr))[i] == '\0')
+     (((char *) (&hdr))[i]) = ' ';
+
+  if (bfd_bwrite ((void *) &hdr, (bfd_size_type) sizeof (struct ar_hdr), abfd)
+      != sizeof (struct ar_hdr))
+    return FALSE;
+
+  H_PUT_32 (abfd, hashsize, temp);
+  if (bfd_bwrite ((void *) temp, (bfd_size_type) 4, abfd) != 4)
+    return FALSE;
+
+  hashtable = (bfd_byte *) bfd_zalloc (abfd, symdefsize);
+  if (!hashtable)
+    return FALSE;
+
+  current = abfd->archive_head;
+  last_elt = current;
+  for (i = 0; i < orl_count; i++)
+    {
+      unsigned int hash, rehash = 0;
+
+      /* Advance firstreal to the file position of this archive
+	 element.  */
+      if (map[i].u.abfd != last_elt)
+	{
+	  do
+	    {
+	      firstreal += arelt_size (current) + sizeof (struct ar_hdr);
+	      firstreal += firstreal % 2;
+	      current = current->archive_next;
+	    }
+	  while (current != map[i].u.abfd);
+	}
+
+      last_elt = current;
+
+      hash = ecoff_armap_hash (*map[i].name, &rehash, hashsize, hashlog);
+      if (H_GET_32 (abfd, (hashtable + (hash * 8) + 4)) != 0)
+	{
+	  unsigned int srch;
+
+	  /* The desired slot is already taken.  */
+	  for (srch = (hash + rehash) & (hashsize - 1);
+	       srch != hash;
+	       srch = (srch + rehash) & (hashsize - 1))
+	    if (H_GET_32 (abfd, (hashtable + (srch * 8) + 4)) == 0)
+	      break;
+
+	  BFD_ASSERT (srch != hash);
+
+	  hash = srch;
+	}
+
+      H_PUT_32 (abfd, map[i].namidx, (hashtable + hash * 8));
+      H_PUT_32 (abfd, firstreal, (hashtable + hash * 8 + 4));
+    }
+
+  if (bfd_bwrite ((void *) hashtable, symdefsize, abfd) != symdefsize)
+    return FALSE;
+
+  bfd_release (abfd, hashtable);
+
+  /* Now write the strings.  */
+  H_PUT_32 (abfd, stringsize, temp);
+  if (bfd_bwrite ((void *) temp, (bfd_size_type) 4, abfd) != 4)
+    return FALSE;
+  for (i = 0; i < orl_count; i++)
+    {
+      bfd_size_type len;
+
+      len = strlen (*map[i].name) + 1;
+      if (bfd_bwrite ((void *) (*map[i].name), len, abfd) != len)
+	return FALSE;
+    }
+
+  /* The spec sez this should be a newline.  But in order to be
+     bug-compatible for DECstation ar we use a null.  */
+  if (padit)
+    {
+      if (bfd_bwrite ("", (bfd_size_type) 1, abfd) != 1)
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* ECOFF linker code.  */
+
+/* Routine to create an entry in an ECOFF link hash table.  */
+
+static struct bfd_hash_entry *
+ecoff_link_hash_newfunc (struct bfd_hash_entry *entry,
+			 struct bfd_hash_table *table,
+			 const char *string)
+{
+  struct ecoff_link_hash_entry *ret = (struct ecoff_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = ((struct ecoff_link_hash_entry *)
+	   bfd_hash_allocate (table, sizeof (struct ecoff_link_hash_entry)));
+  if (ret == NULL)
+    return NULL;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct ecoff_link_hash_entry *)
+	 _bfd_link_hash_newfunc ((struct bfd_hash_entry *) ret,
+				 table, string));
+
+  if (ret)
+    {
+      /* Set local fields.  */
+      ret->indx = -1;
+      ret->abfd = NULL;
+      ret->written = 0;
+      ret->small = 0;
+    }
+  memset ((void *) &ret->esym, 0, sizeof ret->esym);
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Create an ECOFF link hash table.  */
+
+struct bfd_link_hash_table *
+_bfd_ecoff_bfd_link_hash_table_create (bfd *abfd)
+{
+  struct ecoff_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct ecoff_link_hash_table);
+
+  ret = (struct ecoff_link_hash_table *) bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+  if (!_bfd_link_hash_table_init (&ret->root, abfd,
+				  ecoff_link_hash_newfunc,
+				  sizeof (struct ecoff_link_hash_entry)))
+    {
+      free (ret);
+      return NULL;
+    }
+  return &ret->root;
+}
+
+/* Look up an entry in an ECOFF link hash table.  */
+
+#define ecoff_link_hash_lookup(table, string, create, copy, follow) \
+  ((struct ecoff_link_hash_entry *) \
+   bfd_link_hash_lookup (&(table)->root, (string), (create), (copy), (follow)))
+
+/* Get the ECOFF link hash table from the info structure.  This is
+   just a cast.  */
+
+#define ecoff_hash_table(p) ((struct ecoff_link_hash_table *) ((p)->hash))
+
+/* Add the external symbols of an object file to the global linker
+   hash table.  The external symbols and strings we are passed are
+   just allocated on the stack, and will be discarded.  We must
+   explicitly save any information we may need later on in the link.
+   We do not want to read the external symbol information again.  */
+
+static bfd_boolean
+ecoff_link_add_externals (bfd *abfd,
+			  struct bfd_link_info *info,
+			  void * external_ext,
+			  char *ssext)
+{
+  const struct ecoff_backend_data * const backend = ecoff_backend (abfd);
+  void (* const swap_ext_in) (bfd *, void *, EXTR *)
+    = backend->debug_swap.swap_ext_in;
+  bfd_size_type external_ext_size = backend->debug_swap.external_ext_size;
+  unsigned long ext_count;
+  struct bfd_link_hash_entry **sym_hash;
+  char *ext_ptr;
+  char *ext_end;
+  bfd_size_type amt;
+
+  ext_count = ecoff_data (abfd)->debug_info.symbolic_header.iextMax;
+
+  amt = ext_count;
+  amt *= sizeof (struct bfd_link_hash_entry *);
+  sym_hash = (struct bfd_link_hash_entry **) bfd_alloc (abfd, amt);
+  if (!sym_hash)
+    return FALSE;
+  ecoff_data (abfd)->sym_hashes = (struct ecoff_link_hash_entry **) sym_hash;
+
+  ext_ptr = (char *) external_ext;
+  ext_end = ext_ptr + ext_count * external_ext_size;
+  for (; ext_ptr < ext_end; ext_ptr += external_ext_size, sym_hash++)
+    {
+      EXTR esym;
+      bfd_boolean skip;
+      bfd_vma value;
+      asection *section;
+      const char *name;
+      struct ecoff_link_hash_entry *h;
+
+      *sym_hash = NULL;
+
+      (*swap_ext_in) (abfd, (void *) ext_ptr, &esym);
+
+      /* Skip debugging symbols.  */
+      skip = FALSE;
+      switch (esym.asym.st)
+	{
+	case stGlobal:
+	case stStatic:
+	case stLabel:
+	case stProc:
+	case stStaticProc:
+	  break;
+	default:
+	  skip = TRUE;
+	  break;
+	}
+
+      if (skip)
+	continue;
+
+      /* Get the information for this symbol.  */
+      value = esym.asym.value;
+      switch (esym.asym.sc)
+	{
+	default:
+	case scNil:
+	case scRegister:
+	case scCdbLocal:
+	case scBits:
+	case scCdbSystem:
+	case scRegImage:
+	case scInfo:
+	case scUserStruct:
+	case scVar:
+	case scVarRegister:
+	case scVariant:
+	case scBasedVar:
+	case scXData:
+	case scPData:
+	  section = NULL;
+	  break;
+	case scText:
+	  section = bfd_make_section_old_way (abfd, _TEXT);
+	  value -= section->vma;
+	  break;
+	case scData:
+	  section = bfd_make_section_old_way (abfd, _DATA);
+	  value -= section->vma;
+	  break;
+	case scBss:
+	  section = bfd_make_section_old_way (abfd, _BSS);
+	  value -= section->vma;
+	  break;
+	case scAbs:
+	  section = bfd_abs_section_ptr;
+	  break;
+	case scUndefined:
+	  section = bfd_und_section_ptr;
+	  break;
+	case scSData:
+	  section = bfd_make_section_old_way (abfd, _SDATA);
+	  value -= section->vma;
+	  break;
+	case scSBss:
+	  section = bfd_make_section_old_way (abfd, _SBSS);
+	  value -= section->vma;
+	  break;
+	case scRData:
+	  section = bfd_make_section_old_way (abfd, _RDATA);
+	  value -= section->vma;
+	  break;
+	case scCommon:
+	  if (value > ecoff_data (abfd)->gp_size)
+	    {
+	      section = bfd_com_section_ptr;
+	      break;
+	    }
+	  /* Fall through.  */
+	case scSCommon:
+	  if (ecoff_scom_section.name == NULL)
+	    {
+	      /* Initialize the small common section.  */
+	      ecoff_scom_section.name = SCOMMON;
+	      ecoff_scom_section.flags = SEC_IS_COMMON;
+	      ecoff_scom_section.output_section = &ecoff_scom_section;
+	      ecoff_scom_section.symbol = &ecoff_scom_symbol;
+	      ecoff_scom_section.symbol_ptr_ptr = &ecoff_scom_symbol_ptr;
+	      ecoff_scom_symbol.name = SCOMMON;
+	      ecoff_scom_symbol.flags = BSF_SECTION_SYM;
+	      ecoff_scom_symbol.section = &ecoff_scom_section;
+	      ecoff_scom_symbol_ptr = &ecoff_scom_symbol;
+	    }
+	  section = &ecoff_scom_section;
+	  break;
+	case scSUndefined:
+	  section = bfd_und_section_ptr;
+	  break;
+	case scInit:
+	  section = bfd_make_section_old_way (abfd, _INIT);
+	  value -= section->vma;
+	  break;
+	case scFini:
+	  section = bfd_make_section_old_way (abfd, _FINI);
+	  value -= section->vma;
+	  break;
+	case scRConst:
+	  section = bfd_make_section_old_way (abfd, _RCONST);
+	  value -= section->vma;
+	  break;
+	}
+
+      if (section == NULL)
+	continue;
+
+      name = ssext + esym.asym.iss;
+
+      if (! (_bfd_generic_link_add_one_symbol
+	     (info, abfd, name,
+	      (flagword) (esym.weakext ? BSF_WEAK : BSF_GLOBAL),
+	      section, value, NULL, TRUE, TRUE, sym_hash)))
+	return FALSE;
+
+      h = (struct ecoff_link_hash_entry *) *sym_hash;
+
+      /* If we are building an ECOFF hash table, save the external
+	 symbol information.  */
+      if (bfd_get_flavour (info->output_bfd) == bfd_get_flavour (abfd))
+	{
+	  if (h->abfd == NULL
+	      || (! bfd_is_und_section (section)
+		  && (! bfd_is_com_section (section)
+		      || (h->root.type != bfd_link_hash_defined
+			  && h->root.type != bfd_link_hash_defweak))))
+	    {
+	      h->abfd = abfd;
+	      h->esym = esym;
+	    }
+
+	  /* Remember whether this symbol was small undefined.  */
+	  if (esym.asym.sc == scSUndefined)
+	    h->small = 1;
+
+	  /* If this symbol was ever small undefined, it needs to wind
+	     up in a GP relative section.  We can't control the
+	     section of a defined symbol, but we can control the
+	     section of a common symbol.  This case is actually needed
+	     on Ultrix 4.2 to handle the symbol cred in -lckrb.  */
+	  if (h->small
+	      && h->root.type == bfd_link_hash_common
+	      && streq (h->root.u.c.p->section->name, SCOMMON))
+	    {
+	      h->root.u.c.p->section = bfd_make_section_old_way (abfd,
+								 SCOMMON);
+	      h->root.u.c.p->section->flags = SEC_ALLOC;
+	      if (h->esym.asym.sc == scCommon)
+		h->esym.asym.sc = scSCommon;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Add symbols from an ECOFF object file to the global linker hash
+   table.  */
+
+static bfd_boolean
+ecoff_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  HDRR *symhdr;
+  bfd_size_type external_ext_size;
+  void * external_ext = NULL;
+  bfd_size_type esize;
+  char *ssext = NULL;
+  bfd_boolean result;
+
+  if (! ecoff_slurp_symbolic_header (abfd))
+    return FALSE;
+
+  /* If there are no symbols, we don't want it.  */
+  if (bfd_get_symcount (abfd) == 0)
+    return TRUE;
+
+  symhdr = &ecoff_data (abfd)->debug_info.symbolic_header;
+
+  /* Read in the external symbols and external strings.  */
+  external_ext_size = ecoff_backend (abfd)->debug_swap.external_ext_size;
+  esize = symhdr->iextMax * external_ext_size;
+  external_ext = bfd_malloc (esize);
+  if (external_ext == NULL && esize != 0)
+    goto error_return;
+
+  if (bfd_seek (abfd, (file_ptr) symhdr->cbExtOffset, SEEK_SET) != 0
+      || bfd_bread (external_ext, esize, abfd) != esize)
+    goto error_return;
+
+  ssext = (char *) bfd_malloc ((bfd_size_type) symhdr->issExtMax);
+  if (ssext == NULL && symhdr->issExtMax != 0)
+    goto error_return;
+
+  if (bfd_seek (abfd, (file_ptr) symhdr->cbSsExtOffset, SEEK_SET) != 0
+      || (bfd_bread (ssext, (bfd_size_type) symhdr->issExtMax, abfd)
+	  != (bfd_size_type) symhdr->issExtMax))
+    goto error_return;
+
+  result = ecoff_link_add_externals (abfd, info, external_ext, ssext);
+
+  if (ssext != NULL)
+    free (ssext);
+  if (external_ext != NULL)
+    free (external_ext);
+  return result;
+
+ error_return:
+  if (ssext != NULL)
+    free (ssext);
+  if (external_ext != NULL)
+    free (external_ext);
+  return FALSE;
+}
+
+/* Factored out from ecoff_link_check_archive_element.  */
+
+static bfd_boolean
+read_ext_syms_and_strs (HDRR **symhdr, bfd_size_type *external_ext_size,
+	bfd_size_type *esize, void **external_ext, char **ssext, bfd *abfd,
+	const struct ecoff_backend_data * const backend)
+{
+  if (! ecoff_slurp_symbolic_header (abfd))
+    return FALSE;
+
+  /* If there are no symbols, we don't want it.  */
+  if (bfd_get_symcount (abfd) == 0)
+    return TRUE;
+
+  *symhdr = &ecoff_data (abfd)->debug_info.symbolic_header;
+
+  *external_ext_size = backend->debug_swap.external_ext_size;
+  *esize = (*symhdr)->iextMax * *external_ext_size;
+  *external_ext = bfd_malloc (*esize);
+  if (*external_ext == NULL && *esize != 0)
+    return FALSE;
+
+  if (bfd_seek (abfd, (file_ptr) (*symhdr)->cbExtOffset, SEEK_SET) != 0
+      || bfd_bread (*external_ext, *esize, abfd) != *esize)
+    return FALSE;
+
+  *ssext = (char *) bfd_malloc ((bfd_size_type) (*symhdr)->issExtMax);
+  if (*ssext == NULL && (*symhdr)->issExtMax != 0)
+    return FALSE;
+
+  if (bfd_seek (abfd, (file_ptr) (*symhdr)->cbSsExtOffset, SEEK_SET) != 0
+      || (bfd_bread (*ssext, (bfd_size_type) (*symhdr)->issExtMax, abfd)
+	  != (bfd_size_type) (*symhdr)->issExtMax))
+    return FALSE;
+  return TRUE;
+}
+
+static bfd_boolean
+reread_ext_syms_and_strs (HDRR **symhdr, bfd_size_type *external_ext_size,
+	bfd_size_type *esize, void **external_ext, char **ssext, bfd *abfd,
+	const struct ecoff_backend_data * const backend)
+{
+  if (*external_ext != NULL)
+    free (*external_ext);
+  *external_ext = NULL;
+  if (*ssext != NULL)
+    free (*ssext);
+  *ssext = NULL;
+  return read_ext_syms_and_strs (symhdr, external_ext_size, esize,
+				external_ext, ssext, abfd, backend);
+}
+
+/* This is called if we used _bfd_generic_link_add_archive_symbols
+   because we were not dealing with an ECOFF archive.  */
+
+static bfd_boolean
+ecoff_link_check_archive_element (bfd *abfd,
+				  struct bfd_link_info *info,
+				  bfd_boolean *pneeded)
+{
+  const struct ecoff_backend_data * const backend = ecoff_backend (abfd);
+  void (* const swap_ext_in) (bfd *, void *, EXTR *)
+    = backend->debug_swap.swap_ext_in;
+  HDRR *symhdr;
+  bfd_size_type external_ext_size;
+  void * external_ext = NULL;
+  bfd_size_type esize;
+  char *ssext = NULL;
+  char *ext_ptr;
+  char *ext_end;
+
+  *pneeded = FALSE;
+
+  /* Read in the external symbols and external strings.  */
+  if (!read_ext_syms_and_strs (&symhdr, &external_ext_size, &esize,
+	&external_ext, &ssext, abfd, backend))
+    goto error_return;
+
+  /* If there are no symbols, we don't want it.  */
+  if (bfd_get_symcount (abfd) == 0)
+    goto successful_return;
+
+  /* Look through the external symbols to see if they define some
+     symbol that is currently undefined.  */
+  ext_ptr = (char *) external_ext;
+  ext_end = ext_ptr + esize;
+  for (; ext_ptr < ext_end; ext_ptr += external_ext_size)
+    {
+      EXTR esym;
+      bfd_boolean def;
+      const char *name;
+      bfd *oldbfd;
+      struct bfd_link_hash_entry *h;
+
+      (*swap_ext_in) (abfd, (void *) ext_ptr, &esym);
+
+      /* See if this symbol defines something.  */
+      if (esym.asym.st != stGlobal
+	  && esym.asym.st != stLabel
+	  && esym.asym.st != stProc)
+	continue;
+
+      switch (esym.asym.sc)
+	{
+	case scText:
+	case scData:
+	case scBss:
+	case scAbs:
+	case scSData:
+	case scSBss:
+	case scRData:
+	case scCommon:
+	case scSCommon:
+	case scInit:
+	case scFini:
+	case scRConst:
+	  def = TRUE;
+	  break;
+	default:
+	  def = FALSE;
+	  break;
+	}
+
+      if (! def)
+	continue;
+
+      name = ssext + esym.asym.iss;
+      h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE);
+
+      /* Unlike the generic linker, we do not pull in elements because
+	 of common symbols.  */
+      if (h == NULL
+	  || h->type != bfd_link_hash_undefined)
+	continue;
+
+      /* Include this element.  */
+      oldbfd = abfd;
+      if (!(*info->callbacks
+	    ->add_archive_element) (info, abfd, name, &abfd))
+	goto error_return;
+      /* Potentially, the add_archive_element hook may have set a
+	 substitute BFD for us.  */
+      if (abfd != oldbfd
+	  && !reread_ext_syms_and_strs (&symhdr, &external_ext_size, &esize,
+					&external_ext, &ssext, abfd, backend))
+	goto error_return;
+      if (! ecoff_link_add_externals (abfd, info, external_ext, ssext))
+	goto error_return;
+
+      *pneeded = TRUE;
+      goto successful_return;
+    }
+
+ successful_return:
+  if (external_ext != NULL)
+    free (external_ext);
+  if (ssext != NULL)
+    free (ssext);
+  return TRUE;
+ error_return:
+  if (external_ext != NULL)
+    free (external_ext);
+  if (ssext != NULL)
+    free (ssext);
+  return FALSE;
+}
+
+/* Add the symbols from an archive file to the global hash table.
+   This looks through the undefined symbols, looks each one up in the
+   archive hash table, and adds any associated object file.  We do not
+   use _bfd_generic_link_add_archive_symbols because ECOFF archives
+   already have a hash table, so there is no reason to construct
+   another one.  */
+
+static bfd_boolean
+ecoff_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  const struct ecoff_backend_data * const backend = ecoff_backend (abfd);
+  const bfd_byte *raw_armap;
+  struct bfd_link_hash_entry **pundef;
+  unsigned int armap_count;
+  unsigned int armap_log;
+  unsigned int i;
+  const bfd_byte *hashtable;
+  const char *stringbase;
+
+  if (! bfd_has_map (abfd))
+    {
+      /* An empty archive is a special case.  */
+      if (bfd_openr_next_archived_file (abfd, NULL) == NULL)
+	return TRUE;
+      bfd_set_error (bfd_error_no_armap);
+      return FALSE;
+    }
+
+  /* If we don't have any raw data for this archive, as can happen on
+     Irix 4.0.5F, we call the generic routine.
+     FIXME: We should be more clever about this, since someday tdata
+     may get to something for a generic archive.  */
+  raw_armap = (const bfd_byte *) bfd_ardata (abfd)->tdata;
+  if (raw_armap == NULL)
+    return (_bfd_generic_link_add_archive_symbols
+	    (abfd, info, ecoff_link_check_archive_element));
+
+  armap_count = H_GET_32 (abfd, raw_armap);
+
+  armap_log = 0;
+  for (i = 1; i < armap_count; i <<= 1)
+    armap_log++;
+  BFD_ASSERT (i == armap_count);
+
+  hashtable = raw_armap + 4;
+  stringbase = (const char *) raw_armap + armap_count * 8 + 8;
+
+  /* Look through the list of undefined symbols.  */
+  pundef = &info->hash->undefs;
+  while (*pundef != NULL)
+    {
+      struct bfd_link_hash_entry *h;
+      unsigned int hash, rehash = 0;
+      unsigned int file_offset;
+      const char *name;
+      bfd *element;
+
+      h = *pundef;
+
+      /* When a symbol is defined, it is not necessarily removed from
+	 the list.  */
+      if (h->type != bfd_link_hash_undefined
+	  && h->type != bfd_link_hash_common)
+	{
+	  /* Remove this entry from the list, for general cleanliness
+	     and because we are going to look through the list again
+	     if we search any more libraries.  We can't remove the
+	     entry if it is the tail, because that would lose any
+	     entries we add to the list later on.  */
+	  if (*pundef != info->hash->undefs_tail)
+	    *pundef = (*pundef)->u.undef.next;
+	  else
+	    pundef = &(*pundef)->u.undef.next;
+	  continue;
+	}
+
+      /* Native ECOFF linkers do not pull in archive elements merely
+	 to satisfy common definitions, so neither do we.  We leave
+	 them on the list, though, in case we are linking against some
+	 other object format.  */
+      if (h->type != bfd_link_hash_undefined)
+	{
+	  pundef = &(*pundef)->u.undef.next;
+	  continue;
+	}
+
+      /* Look for this symbol in the archive hash table.  */
+      hash = ecoff_armap_hash (h->root.string, &rehash, armap_count,
+			       armap_log);
+
+      file_offset = H_GET_32 (abfd, hashtable + (hash * 8) + 4);
+      if (file_offset == 0)
+	{
+	  /* Nothing in this slot.  */
+	  pundef = &(*pundef)->u.undef.next;
+	  continue;
+	}
+
+      name = stringbase + H_GET_32 (abfd, hashtable + (hash * 8));
+      if (name[0] != h->root.string[0]
+	  || ! streq (name, h->root.string))
+	{
+	  unsigned int srch;
+	  bfd_boolean found;
+
+	  /* That was the wrong symbol.  Try rehashing.  */
+	  found = FALSE;
+	  for (srch = (hash + rehash) & (armap_count - 1);
+	       srch != hash;
+	       srch = (srch + rehash) & (armap_count - 1))
+	    {
+	      file_offset = H_GET_32 (abfd, hashtable + (srch * 8) + 4);
+	      if (file_offset == 0)
+		break;
+	      name = stringbase + H_GET_32 (abfd, hashtable + (srch * 8));
+	      if (name[0] == h->root.string[0]
+		  && streq (name, h->root.string))
+		{
+		  found = TRUE;
+		  break;
+		}
+	    }
+
+	  if (! found)
+	    {
+	      pundef = &(*pundef)->u.undef.next;
+	      continue;
+	    }
+
+	  hash = srch;
+	}
+
+      element = (*backend->get_elt_at_filepos) (abfd, (file_ptr) file_offset);
+      if (element == NULL)
+	return FALSE;
+
+      if (! bfd_check_format (element, bfd_object))
+	return FALSE;
+
+      /* Unlike the generic linker, we know that this element provides
+	 a definition for an undefined symbol and we know that we want
+	 to include it.  We don't need to check anything.  */
+      if (!(*info->callbacks
+	    ->add_archive_element) (info, element, name, &element))
+	return FALSE;
+      if (! ecoff_link_add_object_symbols (element, info))
+	return FALSE;
+
+      pundef = &(*pundef)->u.undef.next;
+    }
+
+  return TRUE;
+}
+
+/* Given an ECOFF BFD, add symbols to the global hash table as
+   appropriate.  */
+
+bfd_boolean
+_bfd_ecoff_bfd_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  switch (bfd_get_format (abfd))
+    {
+    case bfd_object:
+      return ecoff_link_add_object_symbols (abfd, info);
+    case bfd_archive:
+      return ecoff_link_add_archive_symbols (abfd, info);
+    default:
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+}
+
+
+/* ECOFF final link routines.  */
+
+/* Structure used to pass information to ecoff_link_write_external.  */
+
+struct extsym_info
+{
+  bfd *abfd;
+  struct bfd_link_info *info;
+};
+
+/* Accumulate the debugging information for an input BFD into the
+   output BFD.  This must read in the symbolic information of the
+   input BFD.  */
+
+static bfd_boolean
+ecoff_final_link_debug_accumulate (bfd *output_bfd,
+				   bfd *input_bfd,
+				   struct bfd_link_info *info,
+				   void * handle)
+{
+  struct ecoff_debug_info * const debug = &ecoff_data (input_bfd)->debug_info;
+  const struct ecoff_debug_swap * const swap =
+    &ecoff_backend (input_bfd)->debug_swap;
+  HDRR *symhdr = &debug->symbolic_header;
+  bfd_boolean ret;
+
+#define READ(ptr, offset, count, size, type)				 \
+  if (symhdr->count == 0)						 \
+    debug->ptr = NULL;							 \
+  else									 \
+    {									 \
+      bfd_size_type amt = (bfd_size_type) size * symhdr->count;		 \
+      debug->ptr = (type) bfd_malloc (amt);                              \
+      if (debug->ptr == NULL)						 \
+	{								 \
+          ret = FALSE;							 \
+          goto return_something;					 \
+	}								 \
+      if (bfd_seek (input_bfd, (file_ptr) symhdr->offset, SEEK_SET) != 0 \
+	  || bfd_bread (debug->ptr, amt, input_bfd) != amt)		 \
+	{								 \
+          ret = FALSE;							 \
+          goto return_something;					 \
+	}								 \
+    }
+
+  /* If raw_syments is not NULL, then the data was already by read by
+     _bfd_ecoff_slurp_symbolic_info.  */
+  if (ecoff_data (input_bfd)->raw_syments == NULL)
+    {
+      READ (line, cbLineOffset, cbLine, sizeof (unsigned char),
+	    unsigned char *);
+      READ (external_dnr, cbDnOffset, idnMax, swap->external_dnr_size, void *);
+      READ (external_pdr, cbPdOffset, ipdMax, swap->external_pdr_size, void *);
+      READ (external_sym, cbSymOffset, isymMax, swap->external_sym_size, void *);
+      READ (external_opt, cbOptOffset, ioptMax, swap->external_opt_size, void *);
+      READ (external_aux, cbAuxOffset, iauxMax, sizeof (union aux_ext),
+	    union aux_ext *);
+      READ (ss, cbSsOffset, issMax, sizeof (char), char *);
+      READ (external_fdr, cbFdOffset, ifdMax, swap->external_fdr_size, void *);
+      READ (external_rfd, cbRfdOffset, crfd, swap->external_rfd_size, void *);
+    }
+#undef READ
+
+  /* We do not read the external strings or the external symbols.  */
+
+  ret = (bfd_ecoff_debug_accumulate
+	 (handle, output_bfd, &ecoff_data (output_bfd)->debug_info,
+	  &ecoff_backend (output_bfd)->debug_swap,
+	  input_bfd, debug, swap, info));
+
+ return_something:
+  if (ecoff_data (input_bfd)->raw_syments == NULL)
+    {
+      if (debug->line != NULL)
+	free (debug->line);
+      if (debug->external_dnr != NULL)
+	free (debug->external_dnr);
+      if (debug->external_pdr != NULL)
+	free (debug->external_pdr);
+      if (debug->external_sym != NULL)
+	free (debug->external_sym);
+      if (debug->external_opt != NULL)
+	free (debug->external_opt);
+      if (debug->external_aux != NULL)
+	free (debug->external_aux);
+      if (debug->ss != NULL)
+	free (debug->ss);
+      if (debug->external_fdr != NULL)
+	free (debug->external_fdr);
+      if (debug->external_rfd != NULL)
+	free (debug->external_rfd);
+
+      /* Make sure we don't accidentally follow one of these pointers
+	 into freed memory.  */
+      debug->line = NULL;
+      debug->external_dnr = NULL;
+      debug->external_pdr = NULL;
+      debug->external_sym = NULL;
+      debug->external_opt = NULL;
+      debug->external_aux = NULL;
+      debug->ss = NULL;
+      debug->external_fdr = NULL;
+      debug->external_rfd = NULL;
+    }
+
+  return ret;
+}
+
+/* Relocate and write an ECOFF section into an ECOFF output file.  */
+
+static bfd_boolean
+ecoff_indirect_link_order (bfd *output_bfd,
+			   struct bfd_link_info *info,
+			   asection *output_section,
+			   struct bfd_link_order *link_order)
+{
+  asection *input_section;
+  bfd *input_bfd;
+  bfd_byte *contents = NULL;
+  bfd_size_type external_reloc_size;
+  bfd_size_type external_relocs_size;
+  void * external_relocs = NULL;
+
+  BFD_ASSERT ((output_section->flags & SEC_HAS_CONTENTS) != 0);
+
+  input_section = link_order->u.indirect.section;
+  input_bfd = input_section->owner;
+  if (input_section->size == 0)
+    return TRUE;
+
+  BFD_ASSERT (input_section->output_section == output_section);
+  BFD_ASSERT (input_section->output_offset == link_order->offset);
+  BFD_ASSERT (input_section->size == link_order->size);
+
+  /* Get the section contents.  */
+  if (!bfd_malloc_and_get_section (input_bfd, input_section, &contents))
+    goto error_return;
+
+  /* Get the relocs.  If we are relaxing MIPS code, they will already
+     have been read in.  Otherwise, we read them in now.  */
+  external_reloc_size = ecoff_backend (input_bfd)->external_reloc_size;
+  external_relocs_size = external_reloc_size * input_section->reloc_count;
+
+  external_relocs = bfd_malloc (external_relocs_size);
+  if (external_relocs == NULL && external_relocs_size != 0)
+    goto error_return;
+
+  if (bfd_seek (input_bfd, input_section->rel_filepos, SEEK_SET) != 0
+      || (bfd_bread (external_relocs, external_relocs_size, input_bfd)
+	  != external_relocs_size))
+    goto error_return;
+
+  /* Relocate the section contents.  */
+  if (! ((*ecoff_backend (input_bfd)->relocate_section)
+	 (output_bfd, info, input_bfd, input_section, contents,
+	  external_relocs)))
+    goto error_return;
+
+  /* Write out the relocated section.  */
+  if (! bfd_set_section_contents (output_bfd,
+				  output_section,
+				  contents,
+				  input_section->output_offset,
+				  input_section->size))
+    goto error_return;
+
+  /* If we are producing relocatable output, the relocs were
+     modified, and we write them out now.  We use the reloc_count
+     field of output_section to keep track of the number of relocs we
+     have output so far.  */
+  if (info->relocatable)
+    {
+      file_ptr pos = (output_section->rel_filepos
+		      + output_section->reloc_count * external_reloc_size);
+      if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
+	  || (bfd_bwrite (external_relocs, external_relocs_size, output_bfd)
+	      != external_relocs_size))
+	goto error_return;
+      output_section->reloc_count += input_section->reloc_count;
+    }
+
+  if (contents != NULL)
+    free (contents);
+  if (external_relocs != NULL)
+    free (external_relocs);
+  return TRUE;
+
+ error_return:
+  if (contents != NULL)
+    free (contents);
+  if (external_relocs != NULL)
+    free (external_relocs);
+  return FALSE;
+}
+
+/* Generate a reloc when linking an ECOFF file.  This is a reloc
+   requested by the linker, and does come from any input file.  This
+   is used to build constructor and destructor tables when linking
+   with -Ur.  */
+
+static bfd_boolean
+ecoff_reloc_link_order (bfd *output_bfd,
+			struct bfd_link_info *info,
+			asection *output_section,
+			struct bfd_link_order *link_order)
+{
+  enum bfd_link_order_type type;
+  asection *section;
+  bfd_vma addend;
+  arelent rel;
+  struct internal_reloc in;
+  bfd_size_type external_reloc_size;
+  bfd_byte *rbuf;
+  bfd_boolean ok;
+  file_ptr pos;
+
+  type = link_order->type;
+  section = NULL;
+  addend = link_order->u.reloc.p->addend;
+
+  /* We set up an arelent to pass to the backend adjust_reloc_out
+     routine.  */
+  rel.address = link_order->offset;
+
+  rel.howto = bfd_reloc_type_lookup (output_bfd, link_order->u.reloc.p->reloc);
+  if (rel.howto == 0)
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  if (type == bfd_section_reloc_link_order)
+    {
+      section = link_order->u.reloc.p->u.section;
+      rel.sym_ptr_ptr = section->symbol_ptr_ptr;
+    }
+  else
+    {
+      struct bfd_link_hash_entry *h;
+
+      /* Treat a reloc against a defined symbol as though it were
+         actually against the section.  */
+      h = bfd_wrapped_link_hash_lookup (output_bfd, info,
+					link_order->u.reloc.p->u.name,
+					FALSE, FALSE, FALSE);
+      if (h != NULL
+	  && (h->type == bfd_link_hash_defined
+	      || h->type == bfd_link_hash_defweak))
+	{
+	  type = bfd_section_reloc_link_order;
+	  section = h->u.def.section->output_section;
+	  /* It seems that we ought to add the symbol value to the
+             addend here, but in practice it has already been added
+             because it was passed to constructor_callback.  */
+	  addend += section->vma + h->u.def.section->output_offset;
+	}
+      else
+	{
+	  /* We can't set up a reloc against a symbol correctly,
+	     because we have no asymbol structure.  Currently no
+	     adjust_reloc_out routine cares.  */
+	  rel.sym_ptr_ptr = NULL;
+	}
+    }
+
+  /* All ECOFF relocs are in-place.  Put the addend into the object
+     file.  */
+
+  BFD_ASSERT (rel.howto->partial_inplace);
+  if (addend != 0)
+    {
+      bfd_size_type size;
+      bfd_reloc_status_type rstat;
+      bfd_byte *buf;
+
+      size = bfd_get_reloc_size (rel.howto);
+      buf = (bfd_byte *) bfd_zmalloc (size);
+      if (buf == NULL)
+	return FALSE;
+      rstat = _bfd_relocate_contents (rel.howto, output_bfd,
+				      (bfd_vma) addend, buf);
+      switch (rstat)
+	{
+	case bfd_reloc_ok:
+	  break;
+	default:
+	case bfd_reloc_outofrange:
+	  abort ();
+	case bfd_reloc_overflow:
+	  if (! ((*info->callbacks->reloc_overflow)
+		 (info, NULL,
+		  (link_order->type == bfd_section_reloc_link_order
+		   ? bfd_section_name (output_bfd, section)
+		   : link_order->u.reloc.p->u.name),
+		  rel.howto->name, addend, NULL,
+		  NULL, (bfd_vma) 0)))
+	    {
+	      free (buf);
+	      return FALSE;
+	    }
+	  break;
+	}
+      ok = bfd_set_section_contents (output_bfd, output_section, (void *) buf,
+				     (file_ptr) link_order->offset, size);
+      free (buf);
+      if (! ok)
+	return FALSE;
+    }
+
+  rel.addend = 0;
+
+  /* Move the information into an internal_reloc structure.  */
+  in.r_vaddr = (rel.address
+		+ bfd_get_section_vma (output_bfd, output_section));
+  in.r_type = rel.howto->type;
+
+  if (type == bfd_symbol_reloc_link_order)
+    {
+      struct ecoff_link_hash_entry *h;
+
+      h = ((struct ecoff_link_hash_entry *)
+	   bfd_wrapped_link_hash_lookup (output_bfd, info,
+					 link_order->u.reloc.p->u.name,
+					 FALSE, FALSE, TRUE));
+      if (h != NULL
+	  && h->indx != -1)
+	in.r_symndx = h->indx;
+      else
+	{
+	  if (! ((*info->callbacks->unattached_reloc)
+		 (info, link_order->u.reloc.p->u.name, NULL,
+		  NULL, (bfd_vma) 0)))
+	    return FALSE;
+	  in.r_symndx = 0;
+	}
+      in.r_extern = 1;
+    }
+  else
+    {
+      const char *name;
+      unsigned int i;
+      static struct
+      {
+	const char * name;
+	long r_symndx;
+      }
+      section_symndx [] =
+      {
+	{ _TEXT,   RELOC_SECTION_TEXT   },
+	{ _RDATA,  RELOC_SECTION_RDATA  },
+	{ _DATA,   RELOC_SECTION_DATA   },
+	{ _SDATA,  RELOC_SECTION_SDATA  },
+	{ _SBSS,   RELOC_SECTION_SBSS   },
+	{ _BSS,    RELOC_SECTION_BSS    },
+	{ _INIT,   RELOC_SECTION_INIT   },
+	{ _LIT8,   RELOC_SECTION_LIT8   },
+	{ _LIT4,   RELOC_SECTION_LIT4   },
+	{ _XDATA,  RELOC_SECTION_XDATA  },
+	{ _PDATA,  RELOC_SECTION_PDATA  },
+	{ _FINI,   RELOC_SECTION_FINI   },
+	{ _LITA,   RELOC_SECTION_LITA   },
+	{ "*ABS*", RELOC_SECTION_ABS    },
+	{ _RCONST, RELOC_SECTION_RCONST }
+      };
+
+      name = bfd_get_section_name (output_bfd, section);
+
+      for (i = 0; i < ARRAY_SIZE (section_symndx); i++)
+	if (streq (name, section_symndx[i].name))
+	  {
+	    in.r_symndx = section_symndx[i].r_symndx;
+	    break;
+	  }
+
+      if (i == ARRAY_SIZE (section_symndx))
+	abort ();
+
+      in.r_extern = 0;
+    }
+
+  /* Let the BFD backend adjust the reloc.  */
+  (*ecoff_backend (output_bfd)->adjust_reloc_out) (output_bfd, &rel, &in);
+
+  /* Get some memory and swap out the reloc.  */
+  external_reloc_size = ecoff_backend (output_bfd)->external_reloc_size;
+  rbuf = (bfd_byte *) bfd_malloc (external_reloc_size);
+  if (rbuf == NULL)
+    return FALSE;
+
+  (*ecoff_backend (output_bfd)->swap_reloc_out) (output_bfd, &in, (void *) rbuf);
+
+  pos = (output_section->rel_filepos
+	 + output_section->reloc_count * external_reloc_size);
+  ok = (bfd_seek (output_bfd, pos, SEEK_SET) == 0
+	&& (bfd_bwrite ((void *) rbuf, external_reloc_size, output_bfd)
+	    == external_reloc_size));
+
+  if (ok)
+    ++output_section->reloc_count;
+
+  free (rbuf);
+
+  return ok;
+}
+
+/* Put out information for an external symbol.  These come only from
+   the hash table.  */
+
+static bfd_boolean
+ecoff_link_write_external (struct bfd_hash_entry *bh, void * data)
+{
+  struct ecoff_link_hash_entry *h = (struct ecoff_link_hash_entry *) bh;
+  struct extsym_info *einfo = (struct extsym_info *) data;
+  bfd *output_bfd = einfo->abfd;
+  bfd_boolean strip;
+
+  if (h->root.type == bfd_link_hash_warning)
+    {
+      h = (struct ecoff_link_hash_entry *) h->root.u.i.link;
+      if (h->root.type == bfd_link_hash_new)
+	return TRUE;
+    }
+
+  /* We need to check if this symbol is being stripped.  */
+  if (h->root.type == bfd_link_hash_undefined
+      || h->root.type == bfd_link_hash_undefweak)
+    strip = FALSE;
+  else if (einfo->info->strip == strip_all
+	   || (einfo->info->strip == strip_some
+	       && bfd_hash_lookup (einfo->info->keep_hash,
+				   h->root.root.string,
+				   FALSE, FALSE) == NULL))
+    strip = TRUE;
+  else
+    strip = FALSE;
+
+  if (strip || h->written)
+    return TRUE;
+
+  if (h->abfd == NULL)
+    {
+      h->esym.jmptbl = 0;
+      h->esym.cobol_main = 0;
+      h->esym.weakext = 0;
+      h->esym.reserved = 0;
+      h->esym.ifd = ifdNil;
+      h->esym.asym.value = 0;
+      h->esym.asym.st = stGlobal;
+
+      if (h->root.type != bfd_link_hash_defined
+	  && h->root.type != bfd_link_hash_defweak)
+	h->esym.asym.sc = scAbs;
+      else
+	{
+	  asection *output_section;
+	  const char *name;
+	  unsigned int i;
+	  static struct
+	  {
+	    const char * name;
+	    int sc;
+	  }
+	  section_storage_classes [] =
+	  {
+	    { _TEXT,   scText   },
+	    { _DATA,   scData   },
+	    { _SDATA,  scSData  },
+	    { _RDATA,  scRData  },
+	    { _BSS,    scBss    },
+	    { _SBSS,   scSBss   },
+	    { _INIT,   scInit   },
+	    { _FINI,   scFini   },
+	    { _PDATA,  scPData  },
+	    { _XDATA,  scXData  },
+	    { _RCONST, scRConst }
+	  };
+
+	  output_section = h->root.u.def.section->output_section;
+	  name = bfd_section_name (output_section->owner, output_section);
+
+	  for (i = 0; i < ARRAY_SIZE (section_storage_classes); i++)
+	    if (streq (name, section_storage_classes[i].name))
+	      {
+		h->esym.asym.sc = section_storage_classes[i].sc;
+		break;
+	      }
+
+	  if (i == ARRAY_SIZE (section_storage_classes))
+	    h->esym.asym.sc = scAbs;
+	}
+
+      h->esym.asym.reserved = 0;
+      h->esym.asym.index = indexNil;
+    }
+  else if (h->esym.ifd != -1)
+    {
+      struct ecoff_debug_info *debug;
+
+      /* Adjust the FDR index for the symbol by that used for the
+	 input BFD.  */
+      debug = &ecoff_data (h->abfd)->debug_info;
+      BFD_ASSERT (h->esym.ifd >= 0
+		  && h->esym.ifd < debug->symbolic_header.ifdMax);
+      h->esym.ifd = debug->ifdmap[h->esym.ifd];
+    }
+
+  switch (h->root.type)
+    {
+    default:
+    case bfd_link_hash_warning:
+    case bfd_link_hash_new:
+      abort ();
+    case bfd_link_hash_undefined:
+    case bfd_link_hash_undefweak:
+      if (h->esym.asym.sc != scUndefined
+	  && h->esym.asym.sc != scSUndefined)
+	h->esym.asym.sc = scUndefined;
+      break;
+    case bfd_link_hash_defined:
+    case bfd_link_hash_defweak:
+      if (h->esym.asym.sc == scUndefined
+	  || h->esym.asym.sc == scSUndefined)
+	h->esym.asym.sc = scAbs;
+      else if (h->esym.asym.sc == scCommon)
+	h->esym.asym.sc = scBss;
+      else if (h->esym.asym.sc == scSCommon)
+	h->esym.asym.sc = scSBss;
+      h->esym.asym.value = (h->root.u.def.value
+			    + h->root.u.def.section->output_section->vma
+			    + h->root.u.def.section->output_offset);
+      break;
+    case bfd_link_hash_common:
+      if (h->esym.asym.sc != scCommon
+	  && h->esym.asym.sc != scSCommon)
+	h->esym.asym.sc = scCommon;
+      h->esym.asym.value = h->root.u.c.size;
+      break;
+    case bfd_link_hash_indirect:
+      /* We ignore these symbols, since the indirected symbol is
+	 already in the hash table.  */
+      return TRUE;
+    }
+
+  /* bfd_ecoff_debug_one_external uses iextMax to keep track of the
+     symbol number.  */
+  h->indx = ecoff_data (output_bfd)->debug_info.symbolic_header.iextMax;
+  h->written = 1;
+
+  return (bfd_ecoff_debug_one_external
+	  (output_bfd, &ecoff_data (output_bfd)->debug_info,
+	   &ecoff_backend (output_bfd)->debug_swap, h->root.root.string,
+	   &h->esym));
+}
+
+/* ECOFF final link routine.  This looks through all the input BFDs
+   and gathers together all the debugging information, and then
+   processes all the link order information.  This may cause it to
+   close and reopen some input BFDs; I'll see how bad this is.  */
+
+bfd_boolean
+_bfd_ecoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info)
+{
+  const struct ecoff_backend_data * const backend = ecoff_backend (abfd);
+  struct ecoff_debug_info * const debug = &ecoff_data (abfd)->debug_info;
+  HDRR *symhdr;
+  void * handle;
+  bfd *input_bfd;
+  asection *o;
+  struct bfd_link_order *p;
+  struct extsym_info einfo;
+
+  /* We accumulate the debugging information counts in the symbolic
+     header.  */
+  symhdr = &debug->symbolic_header;
+  symhdr->vstamp = 0;
+  symhdr->ilineMax = 0;
+  symhdr->cbLine = 0;
+  symhdr->idnMax = 0;
+  symhdr->ipdMax = 0;
+  symhdr->isymMax = 0;
+  symhdr->ioptMax = 0;
+  symhdr->iauxMax = 0;
+  symhdr->issMax = 0;
+  symhdr->issExtMax = 0;
+  symhdr->ifdMax = 0;
+  symhdr->crfd = 0;
+  symhdr->iextMax = 0;
+
+  /* We accumulate the debugging information itself in the debug_info
+     structure.  */
+  debug->line = NULL;
+  debug->external_dnr = NULL;
+  debug->external_pdr = NULL;
+  debug->external_sym = NULL;
+  debug->external_opt = NULL;
+  debug->external_aux = NULL;
+  debug->ss = NULL;
+  debug->ssext = debug->ssext_end = NULL;
+  debug->external_fdr = NULL;
+  debug->external_rfd = NULL;
+  debug->external_ext = debug->external_ext_end = NULL;
+
+  handle = bfd_ecoff_debug_init (abfd, debug, &backend->debug_swap, info);
+  if (handle == NULL)
+    return FALSE;
+
+  /* Accumulate the debugging symbols from each input BFD.  */
+  for (input_bfd = info->input_bfds;
+       input_bfd != NULL;
+       input_bfd = input_bfd->link_next)
+    {
+      bfd_boolean ret;
+
+      if (bfd_get_flavour (input_bfd) == bfd_target_ecoff_flavour)
+	{
+	  /* Arbitrarily set the symbolic header vstamp to the vstamp
+	     of the first object file in the link.  */
+	  if (symhdr->vstamp == 0)
+	    symhdr->vstamp
+	      = ecoff_data (input_bfd)->debug_info.symbolic_header.vstamp;
+	  ret = ecoff_final_link_debug_accumulate (abfd, input_bfd, info,
+						   handle);
+	}
+      else
+	ret = bfd_ecoff_debug_accumulate_other (handle, abfd,
+						debug, &backend->debug_swap,
+						input_bfd, info);
+      if (! ret)
+	return FALSE;
+
+      /* Combine the register masks.  */
+      ecoff_data (abfd)->gprmask |= ecoff_data (input_bfd)->gprmask;
+      ecoff_data (abfd)->fprmask |= ecoff_data (input_bfd)->fprmask;
+      ecoff_data (abfd)->cprmask[0] |= ecoff_data (input_bfd)->cprmask[0];
+      ecoff_data (abfd)->cprmask[1] |= ecoff_data (input_bfd)->cprmask[1];
+      ecoff_data (abfd)->cprmask[2] |= ecoff_data (input_bfd)->cprmask[2];
+      ecoff_data (abfd)->cprmask[3] |= ecoff_data (input_bfd)->cprmask[3];
+    }
+
+  /* Write out the external symbols.  */
+  einfo.abfd = abfd;
+  einfo.info = info;
+  bfd_hash_traverse (&info->hash->table, ecoff_link_write_external, &einfo);
+
+  if (info->relocatable)
+    {
+      /* We need to make a pass over the link_orders to count up the
+	 number of relocations we will need to output, so that we know
+	 how much space they will take up.  */
+      for (o = abfd->sections; o != NULL; o = o->next)
+	{
+	  o->reloc_count = 0;
+	  for (p = o->map_head.link_order;
+	       p != NULL;
+	       p = p->next)
+	    if (p->type == bfd_indirect_link_order)
+	      o->reloc_count += p->u.indirect.section->reloc_count;
+	    else if (p->type == bfd_section_reloc_link_order
+		     || p->type == bfd_symbol_reloc_link_order)
+	      ++o->reloc_count;
+	}
+    }
+
+  /* Compute the reloc and symbol file positions.  */
+  ecoff_compute_reloc_file_positions (abfd);
+
+  /* Write out the debugging information.  */
+  if (! bfd_ecoff_write_accumulated_debug (handle, abfd, debug,
+					   &backend->debug_swap, info,
+					   ecoff_data (abfd)->sym_filepos))
+    return FALSE;
+
+  bfd_ecoff_debug_free (handle, abfd, debug, &backend->debug_swap, info);
+
+  if (info->relocatable)
+    {
+      /* Now reset the reloc_count field of the sections in the output
+	 BFD to 0, so that we can use them to keep track of how many
+	 relocs we have output thus far.  */
+      for (o = abfd->sections; o != NULL; o = o->next)
+	o->reloc_count = 0;
+    }
+
+  /* Get a value for the GP register.  */
+  if (ecoff_data (abfd)->gp == 0)
+    {
+      struct bfd_link_hash_entry *h;
+
+      h = bfd_link_hash_lookup (info->hash, "_gp", FALSE, FALSE, TRUE);
+      if (h != NULL
+	  && h->type == bfd_link_hash_defined)
+	ecoff_data (abfd)->gp = (h->u.def.value
+				 + h->u.def.section->output_section->vma
+				 + h->u.def.section->output_offset);
+      else if (info->relocatable)
+	{
+	  bfd_vma lo;
+
+	  /* Make up a value.  */
+	  lo = (bfd_vma) -1;
+	  for (o = abfd->sections; o != NULL; o = o->next)
+	    {
+	      if (o->vma < lo
+		  && (streq (o->name, _SBSS)
+		      || streq (o->name, _SDATA)
+		      || streq (o->name, _LIT4)
+		      || streq (o->name, _LIT8)
+		      || streq (o->name, _LITA)))
+		lo = o->vma;
+	    }
+	  ecoff_data (abfd)->gp = lo + 0x8000;
+	}
+      else
+	{
+	  /* If the relocate_section function needs to do a reloc
+	     involving the GP value, it should make a reloc_dangerous
+	     callback to warn that GP is not defined.  */
+	}
+    }
+
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      for (p = o->map_head.link_order;
+	   p != NULL;
+	   p = p->next)
+	{
+	  if (p->type == bfd_indirect_link_order
+	      && (bfd_get_flavour (p->u.indirect.section->owner)
+		  == bfd_target_ecoff_flavour))
+	    {
+	      if (! ecoff_indirect_link_order (abfd, info, o, p))
+		return FALSE;
+	    }
+	  else if (p->type == bfd_section_reloc_link_order
+		   || p->type == bfd_symbol_reloc_link_order)
+	    {
+	      if (! ecoff_reloc_link_order (abfd, info, o, p))
+		return FALSE;
+	    }
+	  else
+	    {
+	      if (! _bfd_default_link_order (abfd, info, o, p))
+		return FALSE;
+	    }
+	}
+    }
+
+  bfd_get_symcount (abfd) = symhdr->iextMax + symhdr->isymMax;
+
+  ecoff_data (abfd)->linker = TRUE;
+
+  return TRUE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ecofflink.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ecofflink.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ecofflink.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ecofflink.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2550 @@
+/* Routines to link ECOFF debugging information.
+   Copyright 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+   Written by Ian Lance Taylor, Cygnus Support, <ian@cygnus.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "objalloc.h"
+#include "aout/stab_gnu.h"
+#include "coff/internal.h"
+#include "coff/sym.h"
+#include "coff/symconst.h"
+#include "coff/ecoff.h"
+#include "libcoff.h"
+#include "libecoff.h"
+
+static bfd_boolean ecoff_add_bytes
+  PARAMS ((char **buf, char **bufend, size_t need));
+static struct bfd_hash_entry *string_hash_newfunc
+  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *,
+	   const char *));
+static void ecoff_align_debug
+  PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
+	   const struct ecoff_debug_swap *swap));
+static bfd_boolean ecoff_write_symhdr
+  PARAMS ((bfd *, struct ecoff_debug_info *, const struct ecoff_debug_swap *,
+	   file_ptr where));
+static int cmp_fdrtab_entry
+  PARAMS ((const PTR, const PTR));
+static bfd_boolean mk_fdrtab
+  PARAMS ((bfd *, struct ecoff_debug_info * const,
+	   const struct ecoff_debug_swap * const, struct ecoff_find_line *));
+static long fdrtab_lookup
+  PARAMS ((struct ecoff_find_line *, bfd_vma));
+static bfd_boolean lookup_line
+  PARAMS ((bfd *, struct ecoff_debug_info * const,
+	   const struct ecoff_debug_swap * const, struct ecoff_find_line *));
+
+/* Routines to swap auxiliary information in and out.  I am assuming
+   that the auxiliary information format is always going to be target
+   independent.  */
+
+/* Swap in a type information record.
+   BIGEND says whether AUX symbols are big-endian or little-endian; this
+   info comes from the file header record (fh-fBigendian).  */
+
+void
+_bfd_ecoff_swap_tir_in (bigend, ext_copy, intern)
+     int bigend;
+     const struct tir_ext *ext_copy;
+     TIR *intern;
+{
+  struct tir_ext ext[1];
+
+  *ext = *ext_copy;		/* Make it reasonable to do in-place.  */
+
+  /* now the fun stuff...  */
+  if (bigend) {
+    intern->fBitfield   = 0 != (ext->t_bits1[0] & TIR_BITS1_FBITFIELD_BIG);
+    intern->continued   = 0 != (ext->t_bits1[0] & TIR_BITS1_CONTINUED_BIG);
+    intern->bt          = (ext->t_bits1[0] & TIR_BITS1_BT_BIG)
+			>>		    TIR_BITS1_BT_SH_BIG;
+    intern->tq4         = (ext->t_tq45[0] & TIR_BITS_TQ4_BIG)
+			>>		    TIR_BITS_TQ4_SH_BIG;
+    intern->tq5         = (ext->t_tq45[0] & TIR_BITS_TQ5_BIG)
+			>>		    TIR_BITS_TQ5_SH_BIG;
+    intern->tq0         = (ext->t_tq01[0] & TIR_BITS_TQ0_BIG)
+			>>		    TIR_BITS_TQ0_SH_BIG;
+    intern->tq1         = (ext->t_tq01[0] & TIR_BITS_TQ1_BIG)
+			>>		    TIR_BITS_TQ1_SH_BIG;
+    intern->tq2         = (ext->t_tq23[0] & TIR_BITS_TQ2_BIG)
+			>>		    TIR_BITS_TQ2_SH_BIG;
+    intern->tq3         = (ext->t_tq23[0] & TIR_BITS_TQ3_BIG)
+			>>		    TIR_BITS_TQ3_SH_BIG;
+  } else {
+    intern->fBitfield   = 0 != (ext->t_bits1[0] & TIR_BITS1_FBITFIELD_LITTLE);
+    intern->continued   = 0 != (ext->t_bits1[0] & TIR_BITS1_CONTINUED_LITTLE);
+    intern->bt          = (ext->t_bits1[0] & TIR_BITS1_BT_LITTLE)
+			>>		    TIR_BITS1_BT_SH_LITTLE;
+    intern->tq4         = (ext->t_tq45[0] & TIR_BITS_TQ4_LITTLE)
+			>>		    TIR_BITS_TQ4_SH_LITTLE;
+    intern->tq5         = (ext->t_tq45[0] & TIR_BITS_TQ5_LITTLE)
+			>>		    TIR_BITS_TQ5_SH_LITTLE;
+    intern->tq0         = (ext->t_tq01[0] & TIR_BITS_TQ0_LITTLE)
+			>>		    TIR_BITS_TQ0_SH_LITTLE;
+    intern->tq1         = (ext->t_tq01[0] & TIR_BITS_TQ1_LITTLE)
+			>>		    TIR_BITS_TQ1_SH_LITTLE;
+    intern->tq2         = (ext->t_tq23[0] & TIR_BITS_TQ2_LITTLE)
+			>>		    TIR_BITS_TQ2_SH_LITTLE;
+    intern->tq3         = (ext->t_tq23[0] & TIR_BITS_TQ3_LITTLE)
+			>>		    TIR_BITS_TQ3_SH_LITTLE;
+  }
+
+#ifdef TEST
+  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
+    abort ();
+#endif
+}
+
+/* Swap out a type information record.
+   BIGEND says whether AUX symbols are big-endian or little-endian; this
+   info comes from the file header record (fh-fBigendian).  */
+
+void
+_bfd_ecoff_swap_tir_out (bigend, intern_copy, ext)
+     int bigend;
+     const TIR *intern_copy;
+     struct tir_ext *ext;
+{
+  TIR intern[1];
+
+  *intern = *intern_copy;	/* Make it reasonable to do in-place.  */
+
+  /* now the fun stuff...  */
+  if (bigend) {
+    ext->t_bits1[0] = ((intern->fBitfield ? TIR_BITS1_FBITFIELD_BIG : 0)
+		       | (intern->continued ? TIR_BITS1_CONTINUED_BIG : 0)
+		       | ((intern->bt << TIR_BITS1_BT_SH_BIG)
+			  & TIR_BITS1_BT_BIG));
+    ext->t_tq45[0] = (((intern->tq4 << TIR_BITS_TQ4_SH_BIG)
+		       & TIR_BITS_TQ4_BIG)
+		      | ((intern->tq5 << TIR_BITS_TQ5_SH_BIG)
+			 & TIR_BITS_TQ5_BIG));
+    ext->t_tq01[0] = (((intern->tq0 << TIR_BITS_TQ0_SH_BIG)
+		       & TIR_BITS_TQ0_BIG)
+		      | ((intern->tq1 << TIR_BITS_TQ1_SH_BIG)
+			 & TIR_BITS_TQ1_BIG));
+    ext->t_tq23[0] = (((intern->tq2 << TIR_BITS_TQ2_SH_BIG)
+		       & TIR_BITS_TQ2_BIG)
+		      | ((intern->tq3 << TIR_BITS_TQ3_SH_BIG)
+			 & TIR_BITS_TQ3_BIG));
+  } else {
+    ext->t_bits1[0] = ((intern->fBitfield ? TIR_BITS1_FBITFIELD_LITTLE : 0)
+		       | (intern->continued ? TIR_BITS1_CONTINUED_LITTLE : 0)
+		       | ((intern->bt << TIR_BITS1_BT_SH_LITTLE)
+			  & TIR_BITS1_BT_LITTLE));
+    ext->t_tq45[0] = (((intern->tq4 << TIR_BITS_TQ4_SH_LITTLE)
+		       & TIR_BITS_TQ4_LITTLE)
+		      | ((intern->tq5 << TIR_BITS_TQ5_SH_LITTLE)
+			 & TIR_BITS_TQ5_LITTLE));
+    ext->t_tq01[0] = (((intern->tq0 << TIR_BITS_TQ0_SH_LITTLE)
+		       & TIR_BITS_TQ0_LITTLE)
+		      | ((intern->tq1 << TIR_BITS_TQ1_SH_LITTLE)
+			 & TIR_BITS_TQ1_LITTLE));
+    ext->t_tq23[0] = (((intern->tq2 << TIR_BITS_TQ2_SH_LITTLE)
+		       & TIR_BITS_TQ2_LITTLE)
+		      | ((intern->tq3 << TIR_BITS_TQ3_SH_LITTLE)
+			 & TIR_BITS_TQ3_LITTLE));
+  }
+
+#ifdef TEST
+  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
+    abort ();
+#endif
+}
+
+/* Swap in a relative symbol record.  BIGEND says whether it is in
+   big-endian or little-endian format.*/
+
+void
+_bfd_ecoff_swap_rndx_in (bigend, ext_copy, intern)
+     int bigend;
+     const struct rndx_ext *ext_copy;
+     RNDXR *intern;
+{
+  struct rndx_ext ext[1];
+
+  *ext = *ext_copy;		/* Make it reasonable to do in-place.  */
+
+  /* now the fun stuff...  */
+  if (bigend) {
+    intern->rfd   = (ext->r_bits[0] << RNDX_BITS0_RFD_SH_LEFT_BIG)
+		  | ((ext->r_bits[1] & RNDX_BITS1_RFD_BIG)
+		    		    >> RNDX_BITS1_RFD_SH_BIG);
+    intern->index = ((ext->r_bits[1] & RNDX_BITS1_INDEX_BIG)
+		    		    << RNDX_BITS1_INDEX_SH_LEFT_BIG)
+		  | (ext->r_bits[2] << RNDX_BITS2_INDEX_SH_LEFT_BIG)
+		  | (ext->r_bits[3] << RNDX_BITS3_INDEX_SH_LEFT_BIG);
+  } else {
+    intern->rfd   = (ext->r_bits[0] << RNDX_BITS0_RFD_SH_LEFT_LITTLE)
+		  | ((ext->r_bits[1] & RNDX_BITS1_RFD_LITTLE)
+		    		    << RNDX_BITS1_RFD_SH_LEFT_LITTLE);
+    intern->index = ((ext->r_bits[1] & RNDX_BITS1_INDEX_LITTLE)
+		    		    >> RNDX_BITS1_INDEX_SH_LITTLE)
+		  | (ext->r_bits[2] << RNDX_BITS2_INDEX_SH_LEFT_LITTLE)
+		  | ((unsigned int) ext->r_bits[3]
+		     << RNDX_BITS3_INDEX_SH_LEFT_LITTLE);
+  }
+
+#ifdef TEST
+  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
+    abort ();
+#endif
+}
+
+/* Swap out a relative symbol record.  BIGEND says whether it is in
+   big-endian or little-endian format.*/
+
+void
+_bfd_ecoff_swap_rndx_out (bigend, intern_copy, ext)
+     int bigend;
+     const RNDXR *intern_copy;
+     struct rndx_ext *ext;
+{
+  RNDXR intern[1];
+
+  *intern = *intern_copy;	/* Make it reasonable to do in-place.  */
+
+  /* now the fun stuff...  */
+  if (bigend) {
+    ext->r_bits[0] = intern->rfd >> RNDX_BITS0_RFD_SH_LEFT_BIG;
+    ext->r_bits[1] = (((intern->rfd << RNDX_BITS1_RFD_SH_BIG)
+		       & RNDX_BITS1_RFD_BIG)
+		      | ((intern->index >> RNDX_BITS1_INDEX_SH_LEFT_BIG)
+			 & RNDX_BITS1_INDEX_BIG));
+    ext->r_bits[2] = intern->index >> RNDX_BITS2_INDEX_SH_LEFT_BIG;
+    ext->r_bits[3] = intern->index >> RNDX_BITS3_INDEX_SH_LEFT_BIG;
+  } else {
+    ext->r_bits[0] = intern->rfd >> RNDX_BITS0_RFD_SH_LEFT_LITTLE;
+    ext->r_bits[1] = (((intern->rfd >> RNDX_BITS1_RFD_SH_LEFT_LITTLE)
+		       & RNDX_BITS1_RFD_LITTLE)
+		      | ((intern->index << RNDX_BITS1_INDEX_SH_LITTLE)
+			 & RNDX_BITS1_INDEX_LITTLE));
+    ext->r_bits[2] = intern->index >> RNDX_BITS2_INDEX_SH_LEFT_LITTLE;
+    ext->r_bits[3] = intern->index >> RNDX_BITS3_INDEX_SH_LEFT_LITTLE;
+  }
+
+#ifdef TEST
+  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
+    abort ();
+#endif
+}
+
+/* The minimum amount of data to allocate.  */
+#define ALLOC_SIZE (4064)
+
+/* Add bytes to a buffer.  Return success.  */
+
+static bfd_boolean
+ecoff_add_bytes (buf, bufend, need)
+     char **buf;
+     char **bufend;
+     size_t need;
+{
+  size_t have;
+  size_t want;
+  char *newbuf;
+
+  have = *bufend - *buf;
+  if (have > need)
+    want = ALLOC_SIZE;
+  else
+    {
+      want = need - have;
+      if (want < ALLOC_SIZE)
+	want = ALLOC_SIZE;
+    }
+  newbuf = (char *) bfd_realloc (*buf, (bfd_size_type) have + want);
+  if (newbuf == NULL)
+    return FALSE;
+  *buf = newbuf;
+  *bufend = *buf + have + want;
+  return TRUE;
+}
+
+/* We keep a hash table which maps strings to numbers.  We use it to
+   map FDR names to indices in the output file, and to map local
+   strings when combining stabs debugging information.  */
+
+struct string_hash_entry
+{
+  struct bfd_hash_entry root;
+  /* FDR index or string table offset.  */
+  long val;
+  /* Next entry in string table.  */
+  struct string_hash_entry *next;
+};
+
+struct string_hash_table
+{
+  struct bfd_hash_table table;
+};
+
+/* Routine to create an entry in a string hash table.  */
+
+static struct bfd_hash_entry *
+string_hash_newfunc (entry, table, string)
+     struct bfd_hash_entry *entry;
+     struct bfd_hash_table *table;
+     const char *string;
+{
+  struct string_hash_entry *ret = (struct string_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == (struct string_hash_entry *) NULL)
+    ret = ((struct string_hash_entry *)
+	   bfd_hash_allocate (table, sizeof (struct string_hash_entry)));
+  if (ret == (struct string_hash_entry *) NULL)
+    return NULL;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct string_hash_entry *)
+	 bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
+
+  if (ret)
+    {
+      /* Initialize the local fields.  */
+      ret->val = -1;
+      ret->next = NULL;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Look up an entry in an string hash table.  */
+
+#define string_hash_lookup(t, string, create, copy) \
+  ((struct string_hash_entry *) \
+   bfd_hash_lookup (&(t)->table, (string), (create), (copy)))
+
+/* We can't afford to read in all the debugging information when we do
+   a link.  Instead, we build a list of these structures to show how
+   different parts of the input file map to the output file.  */
+
+struct shuffle
+{
+  /* The next entry in this linked list.  */
+  struct shuffle *next;
+  /* The length of the information.  */
+  unsigned long size;
+  /* Whether this information comes from a file or not.  */
+  bfd_boolean filep;
+  union
+    {
+      struct
+	{
+	  /* The BFD the data comes from.  */
+	  bfd *input_bfd;
+	  /* The offset within input_bfd.  */
+	  file_ptr offset;
+	} file;
+      /* The data to be written out.  */
+      PTR memory;
+    } u;
+};
+
+/* This structure holds information across calls to
+   bfd_ecoff_debug_accumulate.  */
+
+struct accumulate
+{
+  /* The FDR hash table.  */
+  struct string_hash_table fdr_hash;
+  /* The strings hash table.  */
+  struct string_hash_table str_hash;
+  /* Linked lists describing how to shuffle the input debug
+     information into the output file.  We keep a pointer to both the
+     head and the tail.  */
+  struct shuffle *line;
+  struct shuffle *line_end;
+  struct shuffle *pdr;
+  struct shuffle *pdr_end;
+  struct shuffle *sym;
+  struct shuffle *sym_end;
+  struct shuffle *opt;
+  struct shuffle *opt_end;
+  struct shuffle *aux;
+  struct shuffle *aux_end;
+  struct shuffle *ss;
+  struct shuffle *ss_end;
+  struct string_hash_entry *ss_hash;
+  struct string_hash_entry *ss_hash_end;
+  struct shuffle *fdr;
+  struct shuffle *fdr_end;
+  struct shuffle *rfd;
+  struct shuffle *rfd_end;
+  /* The size of the largest file shuffle.  */
+  unsigned long largest_file_shuffle;
+  /* An objalloc for debugging information.  */
+  struct objalloc *memory;
+};
+
+/* Add a file entry to a shuffle list.  */
+
+static bfd_boolean add_file_shuffle
+  PARAMS ((struct accumulate *, struct shuffle **, struct shuffle **,
+	   bfd *, file_ptr, unsigned long));
+
+static bfd_boolean
+add_file_shuffle (ainfo, head, tail, input_bfd, offset, size)
+     struct accumulate *ainfo;
+     struct shuffle **head;
+     struct shuffle **tail;
+     bfd *input_bfd;
+     file_ptr offset;
+     unsigned long size;
+{
+  struct shuffle *n;
+
+  if (*tail != (struct shuffle *) NULL
+      && (*tail)->filep
+      && (*tail)->u.file.input_bfd == input_bfd
+      && (*tail)->u.file.offset + (*tail)->size == (unsigned long) offset)
+    {
+      /* Just merge this entry onto the existing one.  */
+      (*tail)->size += size;
+      if ((*tail)->size > ainfo->largest_file_shuffle)
+	ainfo->largest_file_shuffle = (*tail)->size;
+      return TRUE;
+    }
+
+  n = (struct shuffle *) objalloc_alloc (ainfo->memory,
+					 sizeof (struct shuffle));
+  if (!n)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return FALSE;
+    }
+  n->next = NULL;
+  n->size = size;
+  n->filep = TRUE;
+  n->u.file.input_bfd = input_bfd;
+  n->u.file.offset = offset;
+  if (*head == (struct shuffle *) NULL)
+    *head = n;
+  if (*tail != (struct shuffle *) NULL)
+    (*tail)->next = n;
+  *tail = n;
+  if (size > ainfo->largest_file_shuffle)
+    ainfo->largest_file_shuffle = size;
+  return TRUE;
+}
+
+/* Add a memory entry to a shuffle list.  */
+
+static bfd_boolean add_memory_shuffle
+  PARAMS ((struct accumulate *, struct shuffle **head, struct shuffle **tail,
+	   bfd_byte *data, unsigned long size));
+
+static bfd_boolean
+add_memory_shuffle (ainfo, head, tail, data, size)
+     struct accumulate *ainfo;
+     struct shuffle **head;
+     struct shuffle **tail;
+     bfd_byte *data;
+     unsigned long size;
+{
+  struct shuffle *n;
+
+  n = (struct shuffle *) objalloc_alloc (ainfo->memory,
+					 sizeof (struct shuffle));
+  if (!n)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return FALSE;
+    }
+  n->next = NULL;
+  n->size = size;
+  n->filep = FALSE;
+  n->u.memory = (PTR) data;
+  if (*head == (struct shuffle *) NULL)
+    *head = n;
+  if (*tail != (struct shuffle *) NULL)
+    (*tail)->next = n;
+  *tail = n;
+  return TRUE;
+}
+
+/* Initialize the FDR hash table.  This returns a handle which is then
+   passed in to bfd_ecoff_debug_accumulate, et. al.  */
+
+PTR
+bfd_ecoff_debug_init (output_bfd, output_debug, output_swap, info)
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     struct ecoff_debug_info *output_debug;
+     const struct ecoff_debug_swap *output_swap ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info;
+{
+  struct accumulate *ainfo;
+  bfd_size_type amt = sizeof (struct accumulate);
+
+  ainfo = (struct accumulate *) bfd_malloc (amt);
+  if (!ainfo)
+    return NULL;
+  if (!bfd_hash_table_init_n (&ainfo->fdr_hash.table, string_hash_newfunc,
+			      sizeof (struct string_hash_entry), 1021))
+    return NULL;
+
+  ainfo->line = NULL;
+  ainfo->line_end = NULL;
+  ainfo->pdr = NULL;
+  ainfo->pdr_end = NULL;
+  ainfo->sym = NULL;
+  ainfo->sym_end = NULL;
+  ainfo->opt = NULL;
+  ainfo->opt_end = NULL;
+  ainfo->aux = NULL;
+  ainfo->aux_end = NULL;
+  ainfo->ss = NULL;
+  ainfo->ss_end = NULL;
+  ainfo->ss_hash = NULL;
+  ainfo->ss_hash_end = NULL;
+  ainfo->fdr = NULL;
+  ainfo->fdr_end = NULL;
+  ainfo->rfd = NULL;
+  ainfo->rfd_end = NULL;
+
+  ainfo->largest_file_shuffle = 0;
+
+  if (! info->relocatable)
+    {
+      if (!bfd_hash_table_init (&ainfo->str_hash.table, string_hash_newfunc,
+				sizeof (struct string_hash_entry)))
+	return NULL;
+
+      /* The first entry in the string table is the empty string.  */
+      output_debug->symbolic_header.issMax = 1;
+    }
+
+  ainfo->memory = objalloc_create ();
+  if (ainfo->memory == NULL)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+
+  return (PTR) ainfo;
+}
+
+/* Free the accumulated debugging information.  */
+
+void
+bfd_ecoff_debug_free (handle, output_bfd, output_debug, output_swap, info)
+     PTR handle;
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     struct ecoff_debug_info *output_debug ATTRIBUTE_UNUSED;
+     const struct ecoff_debug_swap *output_swap ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info;
+{
+  struct accumulate *ainfo = (struct accumulate *) handle;
+
+  bfd_hash_table_free (&ainfo->fdr_hash.table);
+
+  if (! info->relocatable)
+    bfd_hash_table_free (&ainfo->str_hash.table);
+
+  objalloc_free (ainfo->memory);
+
+  free (ainfo);
+}
+
+/* Accumulate the debugging information from INPUT_BFD into
+   OUTPUT_BFD.  The INPUT_DEBUG argument points to some ECOFF
+   debugging information which we want to link into the information
+   pointed to by the OUTPUT_DEBUG argument.  OUTPUT_SWAP and
+   INPUT_SWAP point to the swapping information needed.  INFO is the
+   linker information structure.  HANDLE is returned by
+   bfd_ecoff_debug_init.  */
+
+bfd_boolean
+bfd_ecoff_debug_accumulate (handle, output_bfd, output_debug, output_swap,
+			    input_bfd, input_debug, input_swap,
+			    info)
+     PTR handle;
+     bfd *output_bfd;
+     struct ecoff_debug_info *output_debug;
+     const struct ecoff_debug_swap *output_swap;
+     bfd *input_bfd;
+     struct ecoff_debug_info *input_debug;
+     const struct ecoff_debug_swap *input_swap;
+     struct bfd_link_info *info;
+{
+  struct accumulate *ainfo = (struct accumulate *) handle;
+  void (* const swap_sym_in) PARAMS ((bfd *, PTR, SYMR *))
+    = input_swap->swap_sym_in;
+  void (* const swap_rfd_in) PARAMS ((bfd *, PTR, RFDT *))
+    = input_swap->swap_rfd_in;
+  void (* const swap_sym_out) PARAMS ((bfd *, const SYMR *, PTR))
+    = output_swap->swap_sym_out;
+  void (* const swap_fdr_out) PARAMS ((bfd *, const FDR *, PTR))
+    = output_swap->swap_fdr_out;
+  void (* const swap_rfd_out) PARAMS ((bfd *, const RFDT *, PTR))
+    = output_swap->swap_rfd_out;
+  bfd_size_type external_pdr_size = output_swap->external_pdr_size;
+  bfd_size_type external_sym_size = output_swap->external_sym_size;
+  bfd_size_type external_opt_size = output_swap->external_opt_size;
+  bfd_size_type external_fdr_size = output_swap->external_fdr_size;
+  bfd_size_type external_rfd_size = output_swap->external_rfd_size;
+  HDRR * const output_symhdr = &output_debug->symbolic_header;
+  HDRR * const input_symhdr = &input_debug->symbolic_header;
+  bfd_vma section_adjust[scMax];
+  asection *sec;
+  bfd_byte *fdr_start;
+  bfd_byte *fdr_ptr;
+  bfd_byte *fdr_end;
+  bfd_size_type fdr_add;
+  unsigned int copied;
+  RFDT i;
+  unsigned long sz;
+  bfd_byte *rfd_out;
+  bfd_byte *rfd_in;
+  bfd_byte *rfd_end;
+  long newrfdbase = 0;
+  long oldrfdbase = 0;
+  bfd_byte *fdr_out;
+  bfd_size_type amt;
+
+  /* Use section_adjust to hold the value to add to a symbol in a
+     particular section.  */
+  memset ((PTR) section_adjust, 0, sizeof section_adjust);
+
+#define SET(name, indx) \
+  sec = bfd_get_section_by_name (input_bfd, name); \
+  if (sec != NULL) \
+    section_adjust[indx] = (sec->output_section->vma \
+			    + sec->output_offset \
+			    - sec->vma);
+
+  SET (".text", scText);
+  SET (".data", scData);
+  SET (".bss", scBss);
+  SET (".sdata", scSData);
+  SET (".sbss", scSBss);
+  /* scRdata section may be either .rdata or .rodata.  */
+  SET (".rdata", scRData);
+  SET (".rodata", scRData);
+  SET (".init", scInit);
+  SET (".fini", scFini);
+  SET (".rconst", scRConst);
+
+#undef SET
+
+  /* Find all the debugging information based on the FDR's.  We need
+     to handle them whether they are swapped or not.  */
+  if (input_debug->fdr != (FDR *) NULL)
+    {
+      fdr_start = (bfd_byte *) input_debug->fdr;
+      fdr_add = sizeof (FDR);
+    }
+  else
+    {
+      fdr_start = (bfd_byte *) input_debug->external_fdr;
+      fdr_add = input_swap->external_fdr_size;
+    }
+  fdr_end = fdr_start + input_symhdr->ifdMax * fdr_add;
+
+  amt = input_symhdr->ifdMax;
+  amt *= sizeof (RFDT);
+  input_debug->ifdmap = (RFDT *) bfd_alloc (input_bfd, amt);
+
+  sz = (input_symhdr->crfd + input_symhdr->ifdMax) * external_rfd_size;
+  rfd_out = (bfd_byte *) objalloc_alloc (ainfo->memory, sz);
+  if (!input_debug->ifdmap || !rfd_out)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return FALSE;
+    }
+  if (!add_memory_shuffle (ainfo, &ainfo->rfd, &ainfo->rfd_end, rfd_out, sz))
+    return FALSE;
+
+  copied = 0;
+
+  /* Look through the FDR's to see which ones we are going to include
+     in the final output.  We do not want duplicate FDR information
+     for header files, because ECOFF debugging is often very large.
+     When we find an FDR with no line information which can be merged,
+     we look it up in a hash table to ensure that we only include it
+     once.  We keep a table mapping FDR numbers to the final number
+     they get with the BFD, so that we can refer to it when we write
+     out the external symbols.  */
+  for (fdr_ptr = fdr_start, i = 0;
+       fdr_ptr < fdr_end;
+       fdr_ptr += fdr_add, i++, rfd_out += external_rfd_size)
+    {
+      FDR fdr;
+
+      if (input_debug->fdr != (FDR *) NULL)
+	fdr = *(FDR *) fdr_ptr;
+      else
+	(*input_swap->swap_fdr_in) (input_bfd, (PTR) fdr_ptr, &fdr);
+
+      /* See if this FDR can be merged with an existing one.  */
+      if (fdr.cbLine == 0 && fdr.rss != -1 && fdr.fMerge)
+	{
+	  const char *name;
+	  char *lookup;
+	  struct string_hash_entry *fh;
+
+	  /* We look up a string formed from the file name and the
+	     number of symbols and aux entries.  Sometimes an include
+	     file will conditionally define a typedef or something
+	     based on the order of include files.  Using the number of
+	     symbols and aux entries as a hash reduces the chance that
+	     we will merge symbol information that should not be
+	     merged.  */
+	  name = input_debug->ss + fdr.issBase + fdr.rss;
+
+	  lookup = (char *) bfd_malloc ((bfd_size_type) strlen (name) + 20);
+	  if (lookup == NULL)
+	    return FALSE;
+	  sprintf (lookup, "%s %lx %lx", name, (unsigned long) fdr.csym,
+		   (unsigned long) fdr.caux);
+
+	  fh = string_hash_lookup (&ainfo->fdr_hash, lookup, TRUE, TRUE);
+	  free (lookup);
+	  if (fh == (struct string_hash_entry *) NULL)
+	    return FALSE;
+
+	  if (fh->val != -1)
+	    {
+	      input_debug->ifdmap[i] = fh->val;
+	      (*swap_rfd_out) (output_bfd, input_debug->ifdmap + i,
+			       (PTR) rfd_out);
+
+	      /* Don't copy this FDR.  */
+	      continue;
+	    }
+
+	  fh->val = output_symhdr->ifdMax + copied;
+	}
+
+      input_debug->ifdmap[i] = output_symhdr->ifdMax + copied;
+      (*swap_rfd_out) (output_bfd, input_debug->ifdmap + i, (PTR) rfd_out);
+      ++copied;
+    }
+
+  newrfdbase = output_symhdr->crfd;
+  output_symhdr->crfd += input_symhdr->ifdMax;
+
+  /* Copy over any existing RFD's.  RFD's are only created by the
+     linker, so this will only happen for input files which are the
+     result of a partial link.  */
+  rfd_in = (bfd_byte *) input_debug->external_rfd;
+  rfd_end = rfd_in + input_symhdr->crfd * input_swap->external_rfd_size;
+  for (;
+       rfd_in < rfd_end;
+       rfd_in += input_swap->external_rfd_size)
+    {
+      RFDT rfd;
+
+      (*swap_rfd_in) (input_bfd, (PTR) rfd_in, &rfd);
+      BFD_ASSERT (rfd >= 0 && rfd < input_symhdr->ifdMax);
+      rfd = input_debug->ifdmap[rfd];
+      (*swap_rfd_out) (output_bfd, &rfd, (PTR) rfd_out);
+      rfd_out += external_rfd_size;
+    }
+
+  oldrfdbase = output_symhdr->crfd;
+  output_symhdr->crfd += input_symhdr->crfd;
+
+  /* Look through the FDR's and copy over all associated debugging
+     information.  */
+  sz = copied * external_fdr_size;
+  fdr_out = (bfd_byte *) objalloc_alloc (ainfo->memory, sz);
+  if (!fdr_out)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return FALSE;
+    }
+  if (!add_memory_shuffle (ainfo, &ainfo->fdr, &ainfo->fdr_end, fdr_out, sz))
+    return FALSE;
+  for (fdr_ptr = fdr_start, i = 0;
+       fdr_ptr < fdr_end;
+       fdr_ptr += fdr_add, i++)
+    {
+      FDR fdr;
+      bfd_byte *sym_out;
+      bfd_byte *lraw_src;
+      bfd_byte *lraw_end;
+      bfd_boolean fgotfilename;
+
+      if (input_debug->ifdmap[i] < output_symhdr->ifdMax)
+	{
+	  /* We are not copying this FDR.  */
+	  continue;
+	}
+
+      if (input_debug->fdr != (FDR *) NULL)
+	fdr = *(FDR *) fdr_ptr;
+      else
+	(*input_swap->swap_fdr_in) (input_bfd, (PTR) fdr_ptr, &fdr);
+
+      /* FIXME: It is conceivable that this FDR points to the .init or
+	 .fini section, in which case this will not do the right
+	 thing.  */
+      fdr.adr += section_adjust[scText];
+
+      /* Swap in the local symbols, adjust their values, and swap them
+	 out again.  */
+      fgotfilename = FALSE;
+      sz = fdr.csym * external_sym_size;
+      sym_out = (bfd_byte *) objalloc_alloc (ainfo->memory, sz);
+      if (!sym_out)
+	{
+	  bfd_set_error (bfd_error_no_memory);
+	  return FALSE;
+	}
+      if (!add_memory_shuffle (ainfo, &ainfo->sym, &ainfo->sym_end, sym_out,
+			       sz))
+	return FALSE;
+      lraw_src = ((bfd_byte *) input_debug->external_sym
+		  + fdr.isymBase * input_swap->external_sym_size);
+      lraw_end = lraw_src + fdr.csym * input_swap->external_sym_size;
+      for (;  lraw_src < lraw_end;  lraw_src += input_swap->external_sym_size)
+	{
+	  SYMR internal_sym;
+
+	  (*swap_sym_in) (input_bfd, (PTR) lraw_src, &internal_sym);
+
+	  BFD_ASSERT (internal_sym.sc != scCommon
+		      && internal_sym.sc != scSCommon);
+
+	  /* Adjust the symbol value if appropriate.  */
+	  switch (internal_sym.st)
+	    {
+	    case stNil:
+	      if (ECOFF_IS_STAB (&internal_sym))
+		break;
+	      /* Fall through.  */
+	    case stGlobal:
+	    case stStatic:
+	    case stLabel:
+	    case stProc:
+	    case stStaticProc:
+	      internal_sym.value += section_adjust[internal_sym.sc];
+	      break;
+
+	    default:
+	      break;
+	    }
+
+	  /* If we are doing a final link, we hash all the strings in
+	     the local symbol table together.  This reduces the amount
+	     of space required by debugging information.  We don't do
+	     this when performing a relocatable link because it would
+	     prevent us from easily merging different FDR's.  */
+	  if (! info->relocatable)
+	    {
+	      bfd_boolean ffilename;
+	      const char *name;
+
+	      if (! fgotfilename && internal_sym.iss == fdr.rss)
+		ffilename = TRUE;
+	      else
+		ffilename = FALSE;
+
+	      /* Hash the name into the string table.  */
+	      name = input_debug->ss + fdr.issBase + internal_sym.iss;
+	      if (*name == '\0')
+		internal_sym.iss = 0;
+	      else
+		{
+		  struct string_hash_entry *sh;
+
+		  sh = string_hash_lookup (&ainfo->str_hash, name, TRUE, TRUE);
+		  if (sh == (struct string_hash_entry *) NULL)
+		    return FALSE;
+		  if (sh->val == -1)
+		    {
+		      sh->val = output_symhdr->issMax;
+		      output_symhdr->issMax += strlen (name) + 1;
+		      if (ainfo->ss_hash == (struct string_hash_entry *) NULL)
+			ainfo->ss_hash = sh;
+		      if (ainfo->ss_hash_end
+			  != (struct string_hash_entry *) NULL)
+			ainfo->ss_hash_end->next = sh;
+		      ainfo->ss_hash_end = sh;
+		    }
+		  internal_sym.iss = sh->val;
+		}
+
+	      if (ffilename)
+		{
+		  fdr.rss = internal_sym.iss;
+		  fgotfilename = TRUE;
+		}
+	    }
+
+	  (*swap_sym_out) (output_bfd, &internal_sym, sym_out);
+	  sym_out += external_sym_size;
+	}
+
+      fdr.isymBase = output_symhdr->isymMax;
+      output_symhdr->isymMax += fdr.csym;
+
+      /* Copy the information that does not need swapping.  */
+
+      /* FIXME: If we are relaxing, we need to adjust the line
+	 numbers.  Frankly, forget it.  Anybody using stabs debugging
+	 information will not use this line number information, and
+	 stabs are adjusted correctly.  */
+      if (fdr.cbLine > 0)
+	{
+	  file_ptr pos = input_symhdr->cbLineOffset + fdr.cbLineOffset;
+	  if (!add_file_shuffle (ainfo, &ainfo->line, &ainfo->line_end,
+				 input_bfd, pos, (unsigned long) fdr.cbLine))
+	    return FALSE;
+	  fdr.ilineBase = output_symhdr->ilineMax;
+	  fdr.cbLineOffset = output_symhdr->cbLine;
+	  output_symhdr->ilineMax += fdr.cline;
+	  output_symhdr->cbLine += fdr.cbLine;
+	}
+      if (fdr.caux > 0)
+	{
+	  file_ptr pos = (input_symhdr->cbAuxOffset
+			  + fdr.iauxBase * sizeof (union aux_ext));
+	  if (!add_file_shuffle (ainfo, &ainfo->aux, &ainfo->aux_end,
+				 input_bfd, pos,
+				 fdr.caux * sizeof (union aux_ext)))
+	    return FALSE;
+	  fdr.iauxBase = output_symhdr->iauxMax;
+	  output_symhdr->iauxMax += fdr.caux;
+	}
+      if (! info->relocatable)
+	{
+
+	  /* When are are hashing strings, we lie about the number of
+	     strings attached to each FDR.  We need to set cbSs
+	     because some versions of dbx apparently use it to decide
+	     how much of the string table to read in.  */
+	  fdr.issBase = 0;
+	  fdr.cbSs = output_symhdr->issMax;
+	}
+      else if (fdr.cbSs > 0)
+	{
+	  file_ptr pos = input_symhdr->cbSsOffset + fdr.issBase;
+	  if (!add_file_shuffle (ainfo, &ainfo->ss, &ainfo->ss_end,
+				 input_bfd, pos, (unsigned long) fdr.cbSs))
+	    return FALSE;
+	  fdr.issBase = output_symhdr->issMax;
+	  output_symhdr->issMax += fdr.cbSs;
+	}
+
+      if (output_bfd->xvec->header_byteorder
+	  == input_bfd->xvec->header_byteorder)
+	{
+	  /* The two BFD's have the same endianness, and we don't have
+	     to adjust the PDR addresses, so simply copying the
+	     information will suffice.  */
+	  BFD_ASSERT (external_pdr_size == input_swap->external_pdr_size);
+	  if (fdr.cpd > 0)
+	    {
+	      file_ptr pos = (input_symhdr->cbPdOffset
+			      + fdr.ipdFirst * external_pdr_size);
+	      unsigned long size = fdr.cpd * external_pdr_size;
+	      if (!add_file_shuffle (ainfo, &ainfo->pdr, &ainfo->pdr_end,
+				     input_bfd, pos, size))
+		return FALSE;
+	    }
+	  BFD_ASSERT (external_opt_size == input_swap->external_opt_size);
+	  if (fdr.copt > 0)
+	    {
+	      file_ptr pos = (input_symhdr->cbOptOffset
+			      + fdr.ioptBase * external_opt_size);
+	      unsigned long size = fdr.copt * external_opt_size;
+	      if (!add_file_shuffle (ainfo, &ainfo->opt, &ainfo->opt_end,
+				     input_bfd, pos, size))
+		return FALSE;
+	    }
+	}
+      else
+	{
+	  bfd_size_type outsz, insz;
+	  bfd_byte *in;
+	  bfd_byte *end;
+	  bfd_byte *out;
+
+	  /* The two BFD's have different endianness, so we must swap
+	     everything in and out.  This code would always work, but
+	     it would be unnecessarily slow in the normal case.  */
+	  outsz = external_pdr_size;
+	  insz = input_swap->external_pdr_size;
+	  in = ((bfd_byte *) input_debug->external_pdr
+		+ fdr.ipdFirst * insz);
+	  end = in + fdr.cpd * insz;
+	  sz = fdr.cpd * outsz;
+	  out = (bfd_byte *) objalloc_alloc (ainfo->memory, sz);
+	  if (!out)
+	    {
+	      bfd_set_error (bfd_error_no_memory);
+	      return FALSE;
+	    }
+	  if (!add_memory_shuffle (ainfo, &ainfo->pdr, &ainfo->pdr_end, out,
+				   sz))
+	    return FALSE;
+	  for (; in < end; in += insz, out += outsz)
+	    {
+	      PDR pdr;
+
+	      (*input_swap->swap_pdr_in) (input_bfd, (PTR) in, &pdr);
+	      (*output_swap->swap_pdr_out) (output_bfd, &pdr, (PTR) out);
+	    }
+
+	  /* Swap over the optimization information.  */
+	  outsz = external_opt_size;
+	  insz = input_swap->external_opt_size;
+	  in = ((bfd_byte *) input_debug->external_opt
+		+ fdr.ioptBase * insz);
+	  end = in + fdr.copt * insz;
+	  sz = fdr.copt * outsz;
+	  out = (bfd_byte *) objalloc_alloc (ainfo->memory, sz);
+	  if (!out)
+	    {
+	      bfd_set_error (bfd_error_no_memory);
+	      return FALSE;
+	    }
+	  if (!add_memory_shuffle (ainfo, &ainfo->opt, &ainfo->opt_end, out,
+				   sz))
+	    return FALSE;
+	  for (; in < end; in += insz, out += outsz)
+	    {
+	      OPTR opt;
+
+	      (*input_swap->swap_opt_in) (input_bfd, (PTR) in, &opt);
+	      (*output_swap->swap_opt_out) (output_bfd, &opt, (PTR) out);
+	    }
+	}
+
+      fdr.ipdFirst = output_symhdr->ipdMax;
+      output_symhdr->ipdMax += fdr.cpd;
+      fdr.ioptBase = output_symhdr->ioptMax;
+      output_symhdr->ioptMax += fdr.copt;
+
+      if (fdr.crfd <= 0)
+	{
+	  /* Point this FDR at the table of RFD's we created.  */
+	  fdr.rfdBase = newrfdbase;
+	  fdr.crfd = input_symhdr->ifdMax;
+	}
+      else
+	{
+	  /* Point this FDR at the remapped RFD's.  */
+	  fdr.rfdBase += oldrfdbase;
+	}
+
+      (*swap_fdr_out) (output_bfd, &fdr, fdr_out);
+      fdr_out += external_fdr_size;
+      ++output_symhdr->ifdMax;
+    }
+
+  return TRUE;
+}
+
+/* Add a string to the debugging information we are accumulating.
+   Return the offset from the fdr string base.  */
+
+static long ecoff_add_string
+  PARAMS ((struct accumulate *, struct bfd_link_info *,
+	   struct ecoff_debug_info *, FDR *fdr, const char *string));
+
+static long
+ecoff_add_string (ainfo, info, debug, fdr, string)
+     struct accumulate *ainfo;
+     struct bfd_link_info *info;
+     struct ecoff_debug_info *debug;
+     FDR *fdr;
+     const char *string;
+{
+  HDRR *symhdr;
+  size_t len;
+  bfd_size_type ret;
+
+  symhdr = &debug->symbolic_header;
+  len = strlen (string);
+  if (info->relocatable)
+    {
+      if (!add_memory_shuffle (ainfo, &ainfo->ss, &ainfo->ss_end,
+                               (bfd_byte *) string, len + 1))
+	return -1;
+      ret = symhdr->issMax;
+      symhdr->issMax += len + 1;
+      fdr->cbSs += len + 1;
+    }
+  else
+    {
+      struct string_hash_entry *sh;
+
+      sh = string_hash_lookup (&ainfo->str_hash, string, TRUE, TRUE);
+      if (sh == (struct string_hash_entry *) NULL)
+	return -1;
+      if (sh->val == -1)
+	{
+	  sh->val = symhdr->issMax;
+	  symhdr->issMax += len + 1;
+	  if (ainfo->ss_hash == (struct string_hash_entry *) NULL)
+	    ainfo->ss_hash = sh;
+	  if (ainfo->ss_hash_end
+	      != (struct string_hash_entry *) NULL)
+	    ainfo->ss_hash_end->next = sh;
+	  ainfo->ss_hash_end = sh;
+	}
+      ret = sh->val;
+    }
+
+  return ret;
+}
+
+/* Add debugging information from a non-ECOFF file.  */
+
+bfd_boolean
+bfd_ecoff_debug_accumulate_other (handle, output_bfd, output_debug,
+				  output_swap, input_bfd, info)
+     PTR handle;
+     bfd *output_bfd;
+     struct ecoff_debug_info *output_debug;
+     const struct ecoff_debug_swap *output_swap;
+     bfd *input_bfd;
+     struct bfd_link_info *info;
+{
+  struct accumulate *ainfo = (struct accumulate *) handle;
+  void (* const swap_sym_out) PARAMS ((bfd *, const SYMR *, PTR))
+    = output_swap->swap_sym_out;
+  HDRR *output_symhdr = &output_debug->symbolic_header;
+  FDR fdr;
+  asection *sec;
+  asymbol **symbols;
+  asymbol **sym_ptr;
+  asymbol **sym_end;
+  long symsize;
+  long symcount;
+  PTR external_fdr;
+
+  memset ((PTR) &fdr, 0, sizeof fdr);
+
+  sec = bfd_get_section_by_name (input_bfd, ".text");
+  if (sec != NULL)
+    fdr.adr = sec->output_section->vma + sec->output_offset;
+  else
+    {
+      /* FIXME: What about .init or .fini?  */
+      fdr.adr = 0;
+    }
+
+  fdr.issBase = output_symhdr->issMax;
+  fdr.cbSs = 0;
+  fdr.rss = ecoff_add_string (ainfo, info, output_debug, &fdr,
+			      input_bfd->filename);
+  if (fdr.rss == -1)
+    return FALSE;
+  fdr.isymBase = output_symhdr->isymMax;
+
+  /* Get the local symbols from the input BFD.  */
+  symsize = bfd_get_symtab_upper_bound (input_bfd);
+  if (symsize < 0)
+    return FALSE;
+  symbols = (asymbol **) bfd_alloc (output_bfd, (bfd_size_type) symsize);
+  if (symbols == (asymbol **) NULL)
+    return FALSE;
+  symcount = bfd_canonicalize_symtab (input_bfd, symbols);
+  if (symcount < 0)
+    return FALSE;
+  sym_end = symbols + symcount;
+
+  /* Handle the local symbols.  Any external symbols are handled
+     separately.  */
+  fdr.csym = 0;
+  for (sym_ptr = symbols; sym_ptr != sym_end; sym_ptr++)
+    {
+      SYMR internal_sym;
+      PTR external_sym;
+
+      if (((*sym_ptr)->flags & BSF_EXPORT) != 0)
+	continue;
+      memset ((PTR) &internal_sym, 0, sizeof internal_sym);
+      internal_sym.iss = ecoff_add_string (ainfo, info, output_debug, &fdr,
+					   (*sym_ptr)->name);
+
+      if (internal_sym.iss == -1)
+	return FALSE;
+      if (bfd_is_com_section ((*sym_ptr)->section)
+	  || bfd_is_und_section ((*sym_ptr)->section))
+	internal_sym.value = (*sym_ptr)->value;
+      else
+	internal_sym.value = ((*sym_ptr)->value
+			      + (*sym_ptr)->section->output_offset
+			      + (*sym_ptr)->section->output_section->vma);
+      internal_sym.st = stNil;
+      internal_sym.sc = scUndefined;
+      internal_sym.index = indexNil;
+
+      external_sym = (PTR) objalloc_alloc (ainfo->memory,
+					   output_swap->external_sym_size);
+      if (!external_sym)
+	{
+	  bfd_set_error (bfd_error_no_memory);
+	  return FALSE;
+	}
+      (*swap_sym_out) (output_bfd, &internal_sym, external_sym);
+      add_memory_shuffle (ainfo, &ainfo->sym, &ainfo->sym_end,
+			  (bfd_byte *) external_sym,
+			  (unsigned long) output_swap->external_sym_size);
+      ++fdr.csym;
+      ++output_symhdr->isymMax;
+    }
+
+  bfd_release (output_bfd, (PTR) symbols);
+
+  /* Leave everything else in the FDR zeroed out.  This will cause
+     the lang field to be langC.  The fBigendian field will
+     indicate little endian format, but it doesn't matter because
+     it only applies to aux fields and there are none.  */
+  external_fdr = (PTR) objalloc_alloc (ainfo->memory,
+				       output_swap->external_fdr_size);
+  if (!external_fdr)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return FALSE;
+    }
+  (*output_swap->swap_fdr_out) (output_bfd, &fdr, external_fdr);
+  add_memory_shuffle (ainfo, &ainfo->fdr, &ainfo->fdr_end,
+		      (bfd_byte *) external_fdr,
+		      (unsigned long) output_swap->external_fdr_size);
+
+  ++output_symhdr->ifdMax;
+
+  return TRUE;
+}
+
+/* Set up ECOFF debugging information for the external symbols.
+   FIXME: This is done using a memory buffer, but it should be
+   probably be changed to use a shuffle structure.  The assembler uses
+   this interface, so that must be changed to do something else.  */
+
+bfd_boolean
+bfd_ecoff_debug_externals (abfd, debug, swap, relocatable, get_extr,
+			   set_index)
+     bfd *abfd;
+     struct ecoff_debug_info *debug;
+     const struct ecoff_debug_swap *swap;
+     bfd_boolean relocatable;
+     bfd_boolean (*get_extr) PARAMS ((asymbol *, EXTR *));
+     void (*set_index) PARAMS ((asymbol *, bfd_size_type));
+{
+  HDRR * const symhdr = &debug->symbolic_header;
+  asymbol **sym_ptr_ptr;
+  size_t c;
+
+  sym_ptr_ptr = bfd_get_outsymbols (abfd);
+  if (sym_ptr_ptr == NULL)
+    return TRUE;
+
+  for (c = bfd_get_symcount (abfd); c > 0; c--, sym_ptr_ptr++)
+    {
+      asymbol *sym_ptr;
+      EXTR esym;
+
+      sym_ptr = *sym_ptr_ptr;
+
+      /* Get the external symbol information.  */
+      if (! (*get_extr) (sym_ptr, &esym))
+	continue;
+
+      /* If we're producing an executable, move common symbols into
+	 bss.  */
+      if (! relocatable)
+	{
+	  if (esym.asym.sc == scCommon)
+	    esym.asym.sc = scBss;
+	  else if (esym.asym.sc == scSCommon)
+	    esym.asym.sc = scSBss;
+	}
+
+      if (bfd_is_com_section (sym_ptr->section)
+	  || bfd_is_und_section (sym_ptr->section)
+	  || sym_ptr->section->output_section == (asection *) NULL)
+	{
+	  /* FIXME: gas does not keep the value of a small undefined
+	     symbol in the symbol itself, because of relocation
+	     problems.  */
+	  if (esym.asym.sc != scSUndefined
+	      || esym.asym.value == 0
+	      || sym_ptr->value != 0)
+	    esym.asym.value = sym_ptr->value;
+	}
+      else
+	esym.asym.value = (sym_ptr->value
+			   + sym_ptr->section->output_offset
+			   + sym_ptr->section->output_section->vma);
+
+      if (set_index)
+	(*set_index) (sym_ptr, (bfd_size_type) symhdr->iextMax);
+
+      if (! bfd_ecoff_debug_one_external (abfd, debug, swap,
+					  sym_ptr->name, &esym))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Add a single external symbol to the debugging information.  */
+
+bfd_boolean
+bfd_ecoff_debug_one_external (abfd, debug, swap, name, esym)
+     bfd *abfd;
+     struct ecoff_debug_info *debug;
+     const struct ecoff_debug_swap *swap;
+     const char *name;
+     EXTR *esym;
+{
+  const bfd_size_type external_ext_size = swap->external_ext_size;
+  void (* const swap_ext_out) PARAMS ((bfd *, const EXTR *, PTR))
+    = swap->swap_ext_out;
+  HDRR * const symhdr = &debug->symbolic_header;
+  size_t namelen;
+
+  namelen = strlen (name);
+
+  if ((size_t) (debug->ssext_end - debug->ssext)
+      < symhdr->issExtMax + namelen + 1)
+    {
+      if (! ecoff_add_bytes ((char **) &debug->ssext,
+			     (char **) &debug->ssext_end,
+			     symhdr->issExtMax + namelen + 1))
+	return FALSE;
+    }
+  if ((size_t) ((char *) debug->external_ext_end
+		- (char *) debug->external_ext)
+      < (symhdr->iextMax + 1) * external_ext_size)
+    {
+      char *external_ext = (char *) debug->external_ext;
+      char *external_ext_end = (char *) debug->external_ext_end;
+      if (! ecoff_add_bytes ((char **) &external_ext,
+			     (char **) &external_ext_end,
+			     (symhdr->iextMax + 1) * (size_t) external_ext_size))
+	return FALSE;
+      debug->external_ext = external_ext;
+      debug->external_ext_end = external_ext_end;
+    }
+
+  esym->asym.iss = symhdr->issExtMax;
+
+  (*swap_ext_out) (abfd, esym,
+		   ((char *) debug->external_ext
+		    + symhdr->iextMax * swap->external_ext_size));
+
+  ++symhdr->iextMax;
+
+  strcpy (debug->ssext + symhdr->issExtMax, name);
+  symhdr->issExtMax += namelen + 1;
+
+  return TRUE;
+}
+
+/* Align the ECOFF debugging information.  */
+
+static void
+ecoff_align_debug (abfd, debug, swap)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     struct ecoff_debug_info *debug;
+     const struct ecoff_debug_swap *swap;
+{
+  HDRR * const symhdr = &debug->symbolic_header;
+  bfd_size_type debug_align, aux_align, rfd_align;
+  size_t add;
+
+  /* Adjust the counts so that structures are aligned.  */
+  debug_align = swap->debug_align;
+  aux_align = debug_align / sizeof (union aux_ext);
+  rfd_align = debug_align / swap->external_rfd_size;
+
+  add = debug_align - (symhdr->cbLine & (debug_align - 1));
+  if (add != debug_align)
+    {
+      if (debug->line != (unsigned char *) NULL)
+	memset ((PTR) (debug->line + symhdr->cbLine), 0, add);
+      symhdr->cbLine += add;
+    }
+
+  add = debug_align - (symhdr->issMax & (debug_align - 1));
+  if (add != debug_align)
+    {
+      if (debug->ss != (char *) NULL)
+	memset ((PTR) (debug->ss + symhdr->issMax), 0, add);
+      symhdr->issMax += add;
+    }
+
+  add = debug_align - (symhdr->issExtMax & (debug_align - 1));
+  if (add != debug_align)
+    {
+      if (debug->ssext != (char *) NULL)
+	memset ((PTR) (debug->ssext + symhdr->issExtMax), 0, add);
+      symhdr->issExtMax += add;
+    }
+
+  add = aux_align - (symhdr->iauxMax & (aux_align - 1));
+  if (add != aux_align)
+    {
+      if (debug->external_aux != (union aux_ext *) NULL)
+	memset ((PTR) (debug->external_aux + symhdr->iauxMax), 0,
+		add * sizeof (union aux_ext));
+      symhdr->iauxMax += add;
+    }
+
+  add = rfd_align - (symhdr->crfd & (rfd_align - 1));
+  if (add != rfd_align)
+    {
+      if (debug->external_rfd != (PTR) NULL)
+	memset ((PTR) ((char *) debug->external_rfd
+		       + symhdr->crfd * swap->external_rfd_size),
+		0, (size_t) (add * swap->external_rfd_size));
+      symhdr->crfd += add;
+    }
+}
+
+/* Return the size required by the ECOFF debugging information.  */
+
+bfd_size_type
+bfd_ecoff_debug_size (abfd, debug, swap)
+     bfd *abfd;
+     struct ecoff_debug_info *debug;
+     const struct ecoff_debug_swap *swap;
+{
+  bfd_size_type tot;
+
+  ecoff_align_debug (abfd, debug, swap);
+  tot = swap->external_hdr_size;
+
+#define ADD(count, size) \
+  tot += debug->symbolic_header.count * size
+
+  ADD (cbLine, sizeof (unsigned char));
+  ADD (idnMax, swap->external_dnr_size);
+  ADD (ipdMax, swap->external_pdr_size);
+  ADD (isymMax, swap->external_sym_size);
+  ADD (ioptMax, swap->external_opt_size);
+  ADD (iauxMax, sizeof (union aux_ext));
+  ADD (issMax, sizeof (char));
+  ADD (issExtMax, sizeof (char));
+  ADD (ifdMax, swap->external_fdr_size);
+  ADD (crfd, swap->external_rfd_size);
+  ADD (iextMax, swap->external_ext_size);
+
+#undef ADD
+
+  return tot;
+}
+
+/* Write out the ECOFF symbolic header, given the file position it is
+   going to be placed at.  This assumes that the counts are set
+   correctly.  */
+
+static bfd_boolean
+ecoff_write_symhdr (abfd, debug, swap, where)
+     bfd *abfd;
+     struct ecoff_debug_info *debug;
+     const struct ecoff_debug_swap *swap;
+     file_ptr where;
+{
+  HDRR * const symhdr = &debug->symbolic_header;
+  char *buff = NULL;
+
+  ecoff_align_debug (abfd, debug, swap);
+
+  /* Go to the right location in the file.  */
+  if (bfd_seek (abfd, where, SEEK_SET) != 0)
+    return FALSE;
+
+  where += swap->external_hdr_size;
+
+  symhdr->magic = swap->sym_magic;
+
+  /* Fill in the file offsets.  */
+#define SET(offset, count, size) \
+  if (symhdr->count == 0) \
+    symhdr->offset = 0; \
+  else \
+    { \
+      symhdr->offset = where; \
+      where += symhdr->count * size; \
+    }
+
+  SET (cbLineOffset, cbLine, sizeof (unsigned char));
+  SET (cbDnOffset, idnMax, swap->external_dnr_size);
+  SET (cbPdOffset, ipdMax, swap->external_pdr_size);
+  SET (cbSymOffset, isymMax, swap->external_sym_size);
+  SET (cbOptOffset, ioptMax, swap->external_opt_size);
+  SET (cbAuxOffset, iauxMax, sizeof (union aux_ext));
+  SET (cbSsOffset, issMax, sizeof (char));
+  SET (cbSsExtOffset, issExtMax, sizeof (char));
+  SET (cbFdOffset, ifdMax, swap->external_fdr_size);
+  SET (cbRfdOffset, crfd, swap->external_rfd_size);
+  SET (cbExtOffset, iextMax, swap->external_ext_size);
+#undef SET
+
+  buff = (char *) bfd_malloc (swap->external_hdr_size);
+  if (buff == NULL && swap->external_hdr_size != 0)
+    goto error_return;
+
+  (*swap->swap_hdr_out) (abfd, symhdr, buff);
+  if (bfd_bwrite (buff, swap->external_hdr_size, abfd)
+      != swap->external_hdr_size)
+    goto error_return;
+
+  if (buff != NULL)
+    free (buff);
+  return TRUE;
+ error_return:
+  if (buff != NULL)
+    free (buff);
+  return FALSE;
+}
+
+/* Write out the ECOFF debugging information.  This function assumes
+   that the information (the pointers and counts) in *DEBUG have been
+   set correctly.  WHERE is the position in the file to write the
+   information to.  This function fills in the file offsets in the
+   symbolic header.  */
+
+bfd_boolean
+bfd_ecoff_write_debug (abfd, debug, swap, where)
+     bfd *abfd;
+     struct ecoff_debug_info *debug;
+     const struct ecoff_debug_swap *swap;
+     file_ptr where;
+{
+  HDRR * const symhdr = &debug->symbolic_header;
+
+  if (! ecoff_write_symhdr (abfd, debug, swap, where))
+    return FALSE;
+
+#define WRITE(ptr, count, size, offset) \
+  BFD_ASSERT (symhdr->offset == 0 \
+	      || (bfd_vma) bfd_tell (abfd) == symhdr->offset); \
+  if (bfd_bwrite ((PTR) debug->ptr, (bfd_size_type) size * symhdr->count, abfd)\
+      != size * symhdr->count) \
+    return FALSE;
+
+  WRITE (line, cbLine, sizeof (unsigned char), cbLineOffset);
+  WRITE (external_dnr, idnMax, swap->external_dnr_size, cbDnOffset);
+  WRITE (external_pdr, ipdMax, swap->external_pdr_size, cbPdOffset);
+  WRITE (external_sym, isymMax, swap->external_sym_size, cbSymOffset);
+  WRITE (external_opt, ioptMax, swap->external_opt_size, cbOptOffset);
+  WRITE (external_aux, iauxMax, (bfd_size_type) sizeof (union aux_ext),
+	 cbAuxOffset);
+  WRITE (ss, issMax, sizeof (char), cbSsOffset);
+  WRITE (ssext, issExtMax, sizeof (char), cbSsExtOffset);
+  WRITE (external_fdr, ifdMax, swap->external_fdr_size, cbFdOffset);
+  WRITE (external_rfd, crfd, swap->external_rfd_size, cbRfdOffset);
+  WRITE (external_ext, iextMax, swap->external_ext_size, cbExtOffset);
+#undef WRITE
+
+  return TRUE;
+}
+
+/* Write out a shuffle list.  */
+
+static bfd_boolean ecoff_write_shuffle
+  PARAMS ((bfd *, const struct ecoff_debug_swap *, struct shuffle *,
+	   PTR space));
+
+static bfd_boolean
+ecoff_write_shuffle (abfd, swap, shuffle, space)
+     bfd *abfd;
+     const struct ecoff_debug_swap *swap;
+     struct shuffle *shuffle;
+     PTR space;
+{
+  register struct shuffle *l;
+  unsigned long total;
+
+  total = 0;
+  for (l = shuffle; l != (struct shuffle *) NULL; l = l->next)
+    {
+      if (! l->filep)
+	{
+	  if (bfd_bwrite (l->u.memory, (bfd_size_type) l->size, abfd)
+	      != l->size)
+	    return FALSE;
+	}
+      else
+	{
+	  if (bfd_seek (l->u.file.input_bfd, l->u.file.offset, SEEK_SET) != 0
+	      || bfd_bread (space, (bfd_size_type) l->size,
+			   l->u.file.input_bfd) != l->size
+	      || bfd_bwrite (space, (bfd_size_type) l->size, abfd) != l->size)
+	    return FALSE;
+	}
+      total += l->size;
+    }
+
+  if ((total & (swap->debug_align - 1)) != 0)
+    {
+      unsigned int i;
+      bfd_byte *s;
+
+      i = swap->debug_align - (total & (swap->debug_align - 1));
+      s = (bfd_byte *) bfd_zmalloc ((bfd_size_type) i);
+      if (s == NULL && i != 0)
+	return FALSE;
+
+      if (bfd_bwrite ((PTR) s, (bfd_size_type) i, abfd) != i)
+	{
+	  free (s);
+	  return FALSE;
+	}
+      free (s);
+    }
+
+  return TRUE;
+}
+
+/* Write out debugging information using accumulated linker
+   information.  */
+
+bfd_boolean
+bfd_ecoff_write_accumulated_debug (handle, abfd, debug, swap, info, where)
+     PTR handle;
+     bfd *abfd;
+     struct ecoff_debug_info *debug;
+     const struct ecoff_debug_swap *swap;
+     struct bfd_link_info *info;
+     file_ptr where;
+{
+  struct accumulate *ainfo = (struct accumulate *) handle;
+  PTR space = NULL;
+  bfd_size_type amt;
+
+  if (! ecoff_write_symhdr (abfd, debug, swap, where))
+    goto error_return;
+
+  amt = ainfo->largest_file_shuffle;
+  space = (PTR) bfd_malloc (amt);
+  if (space == NULL && ainfo->largest_file_shuffle != 0)
+    goto error_return;
+
+  if (! ecoff_write_shuffle (abfd, swap, ainfo->line, space)
+      || ! ecoff_write_shuffle (abfd, swap, ainfo->pdr, space)
+      || ! ecoff_write_shuffle (abfd, swap, ainfo->sym, space)
+      || ! ecoff_write_shuffle (abfd, swap, ainfo->opt, space)
+      || ! ecoff_write_shuffle (abfd, swap, ainfo->aux, space))
+    goto error_return;
+
+  /* The string table is written out from the hash table if this is a
+     final link.  */
+  if (info->relocatable)
+    {
+      BFD_ASSERT (ainfo->ss_hash == (struct string_hash_entry *) NULL);
+      if (! ecoff_write_shuffle (abfd, swap, ainfo->ss, space))
+	goto error_return;
+    }
+  else
+    {
+      unsigned long total;
+      bfd_byte null;
+      struct string_hash_entry *sh;
+
+      BFD_ASSERT (ainfo->ss == (struct shuffle *) NULL);
+      null = 0;
+      if (bfd_bwrite ((PTR) &null, (bfd_size_type) 1, abfd) != 1)
+	goto error_return;
+      total = 1;
+      BFD_ASSERT (ainfo->ss_hash == NULL || ainfo->ss_hash->val == 1);
+      for (sh = ainfo->ss_hash;
+	   sh != (struct string_hash_entry *) NULL;
+	   sh = sh->next)
+	{
+	  size_t len;
+
+	  len = strlen (sh->root.string);
+	  amt = len + 1;
+	  if (bfd_bwrite ((PTR) sh->root.string, amt, abfd) != amt)
+	    goto error_return;
+	  total += len + 1;
+	}
+
+      if ((total & (swap->debug_align - 1)) != 0)
+	{
+	  unsigned int i;
+	  bfd_byte *s;
+
+	  i = swap->debug_align - (total & (swap->debug_align - 1));
+	  s = (bfd_byte *) bfd_zmalloc ((bfd_size_type) i);
+	  if (s == NULL && i != 0)
+	    goto error_return;
+
+	  if (bfd_bwrite ((PTR) s, (bfd_size_type) i, abfd) != i)
+	    {
+	      free (s);
+	      goto error_return;
+	    }
+	  free (s);
+	}
+    }
+
+  /* The external strings and symbol are not converted over to using
+     shuffles.  FIXME: They probably should be.  */
+  amt = debug->symbolic_header.issExtMax;
+  if (bfd_bwrite (debug->ssext, amt, abfd) != amt)
+    goto error_return;
+  if ((debug->symbolic_header.issExtMax & (swap->debug_align - 1)) != 0)
+    {
+      unsigned int i;
+      bfd_byte *s;
+
+      i = (swap->debug_align
+	   - (debug->symbolic_header.issExtMax & (swap->debug_align - 1)));
+      s = (bfd_byte *) bfd_zmalloc ((bfd_size_type) i);
+      if (s == NULL && i != 0)
+	goto error_return;
+
+      if (bfd_bwrite ((PTR) s, (bfd_size_type) i, abfd) != i)
+	{
+	  free (s);
+	  goto error_return;
+	}
+      free (s);
+    }
+
+  if (! ecoff_write_shuffle (abfd, swap, ainfo->fdr, space)
+      || ! ecoff_write_shuffle (abfd, swap, ainfo->rfd, space))
+    goto error_return;
+
+  BFD_ASSERT (debug->symbolic_header.cbExtOffset == 0
+	      || (debug->symbolic_header.cbExtOffset
+		  == (bfd_vma) bfd_tell (abfd)));
+
+  amt = debug->symbolic_header.iextMax * swap->external_ext_size;
+  if (bfd_bwrite (debug->external_ext, amt, abfd) != amt)
+    goto error_return;
+
+  if (space != NULL)
+    free (space);
+  return TRUE;
+
+ error_return:
+  if (space != NULL)
+    free (space);
+  return FALSE;
+}
+
+/* Handle the find_nearest_line function for both ECOFF and MIPS ELF
+   files.  */
+
+/* Compare FDR entries.  This is called via qsort.  */
+
+static int
+cmp_fdrtab_entry (leftp, rightp)
+     const PTR leftp;
+     const PTR rightp;
+{
+  const struct ecoff_fdrtab_entry *lp =
+    (const struct ecoff_fdrtab_entry *) leftp;
+  const struct ecoff_fdrtab_entry *rp =
+    (const struct ecoff_fdrtab_entry *) rightp;
+
+  if (lp->base_addr < rp->base_addr)
+    return -1;
+  if (lp->base_addr > rp->base_addr)
+    return 1;
+  return 0;
+}
+
+/* Each file descriptor (FDR) has a memory address, to simplify
+   looking up an FDR by address, we build a table covering all FDRs
+   that have a least one procedure descriptor in them.  The final
+   table will be sorted by address so we can look it up via binary
+   search.  */
+
+static bfd_boolean
+mk_fdrtab (abfd, debug_info, debug_swap, line_info)
+     bfd *abfd;
+     struct ecoff_debug_info * const debug_info;
+     const struct ecoff_debug_swap * const debug_swap;
+     struct ecoff_find_line *line_info;
+{
+  struct ecoff_fdrtab_entry *tab;
+  FDR *fdr_ptr;
+  FDR *fdr_start;
+  FDR *fdr_end;
+  bfd_boolean stabs;
+  long len;
+  bfd_size_type amt;
+
+  fdr_start = debug_info->fdr;
+  fdr_end = fdr_start + debug_info->symbolic_header.ifdMax;
+
+  /* First, let's see how long the table needs to be.  */
+  for (len = 0, fdr_ptr = fdr_start; fdr_ptr < fdr_end; fdr_ptr++)
+    {
+      if (fdr_ptr->cpd == 0)	/* Skip FDRs that have no PDRs.  */
+	continue;
+      ++len;
+    }
+
+  /* Now, create and fill in the table.  */
+  amt = (bfd_size_type) len * sizeof (struct ecoff_fdrtab_entry);
+  line_info->fdrtab = (struct ecoff_fdrtab_entry*) bfd_zalloc (abfd, amt);
+  if (line_info->fdrtab == NULL)
+    return FALSE;
+  line_info->fdrtab_len = len;
+
+  tab = line_info->fdrtab;
+  for (fdr_ptr = fdr_start; fdr_ptr < fdr_end; fdr_ptr++)
+    {
+      if (fdr_ptr->cpd == 0)
+	continue;
+
+      /* Check whether this file has stabs debugging information.  In
+	 a file with stabs debugging information, the second local
+	 symbol is named @stabs.  */
+      stabs = FALSE;
+      if (fdr_ptr->csym >= 2)
+	{
+	  char *sym_ptr;
+	  SYMR sym;
+
+	  sym_ptr = ((char *) debug_info->external_sym
+		     + (fdr_ptr->isymBase + 1) * debug_swap->external_sym_size);
+	  (*debug_swap->swap_sym_in) (abfd, sym_ptr, &sym);
+	  if (strcmp (debug_info->ss + fdr_ptr->issBase + sym.iss,
+		      STABS_SYMBOL) == 0)
+	    stabs = TRUE;
+	}
+
+      if (!stabs)
+	{
+	  /* eraxxon: There are at least two problems with this computation:
+	     1) PDRs do *not* contain offsets but full vma's; and typically the
+	     address of the first PDR is the address of the FDR, which will
+	     make (most) of the results of the original computation 0!
+	     2) Once in a wacky while, the Compaq compiler generated PDR
+	     addresses do not equal the FDR vma, but they (the PDR address)
+	     are still vma's and not offsets.  Cf. comments in
+	     'lookup_line'.  */
+	  /* The address of the first PDR is the offset of that
+	     procedure relative to the beginning of file FDR.  */
+	  tab->base_addr = fdr_ptr->adr; 
+	}
+      else
+	{
+	  /* XXX I don't know about stabs, so this is a guess
+	     (davidm@cs.arizona.edu).  */
+	  tab->base_addr = fdr_ptr->adr;
+	}
+      tab->fdr = fdr_ptr;
+      ++tab;
+    }
+
+  /* Finally, the table is sorted in increasing memory-address order.
+     The table is mostly sorted already, but there are cases (e.g.,
+     static functions in include files), where this does not hold.
+     Use "odump -PFv" to verify...  */
+  qsort ((PTR) line_info->fdrtab, (size_t) len,
+	 sizeof (struct ecoff_fdrtab_entry), cmp_fdrtab_entry);
+
+  return TRUE;
+}
+
+/* Return index of first FDR that covers to OFFSET.  */
+
+static long
+fdrtab_lookup (line_info, offset)
+     struct ecoff_find_line *line_info;
+     bfd_vma offset;
+{
+  long low, high, len;
+  long mid = -1;
+  struct ecoff_fdrtab_entry *tab;
+
+  len = line_info->fdrtab_len;
+  if (len == 0)
+    return -1;
+
+  tab = line_info->fdrtab;
+  for (low = 0, high = len - 1 ; low != high ;)
+    {
+      mid = (high + low) / 2;
+      if (offset >= tab[mid].base_addr && offset < tab[mid + 1].base_addr)
+	goto find_min;
+
+      if (tab[mid].base_addr > offset)
+	high = mid;
+      else
+	low = mid + 1;
+    }
+
+  /* eraxxon: at this point 'offset' is either lower than the lowest entry or
+     higher than the highest entry. In the former case high = low = mid = 0;
+     we want to return -1.  In the latter case, low = high and mid = low - 1;
+     we want to return the index of the highest entry.  Only in former case
+     will the following 'catch-all' test be true.  */
+  ++mid;
+
+  /* Last entry is catch-all for all higher addresses.  */
+  if (offset < tab[mid].base_addr)
+    return -1;
+
+ find_min:
+
+  /* eraxxon: There may be multiple FDRs in the table with the
+     same base_addr; make sure that we are at the first one.  */
+  while (mid > 0 && tab[mid - 1].base_addr == tab[mid].base_addr)
+    --mid;
+
+  return mid;
+}
+
+/* Look up a line given an address, storing the information in
+   LINE_INFO->cache.  */
+
+static bfd_boolean
+lookup_line (abfd, debug_info, debug_swap, line_info)
+     bfd *abfd;
+     struct ecoff_debug_info * const debug_info;
+     const struct ecoff_debug_swap * const debug_swap;
+     struct ecoff_find_line *line_info;
+{
+  struct ecoff_fdrtab_entry *tab;
+  bfd_vma offset;
+  bfd_boolean stabs;
+  FDR *fdr_ptr;
+  int i;
+
+  /* eraxxon: note that 'offset' is the full vma, not a section offset.  */
+  offset = line_info->cache.start;
+
+  /* Build FDR table (sorted by object file's base-address) if we
+     don't have it already.  */
+  if (line_info->fdrtab == NULL
+      && !mk_fdrtab (abfd, debug_info, debug_swap, line_info))
+    return FALSE;
+
+  tab = line_info->fdrtab;
+
+  /* Find first FDR for address OFFSET.  */
+  i = fdrtab_lookup (line_info, offset);
+  if (i < 0)
+    return FALSE;		/* no FDR, no fun...  */
+  
+  /* eraxxon: 'fdrtab_lookup' doesn't give what we want, at least for Compaq's
+     C++ compiler 6.2.  Consider three FDRs with starting addresses of x, y,
+     and z, respectively, such that x < y < z.  Assume further that
+     y < 'offset' < z.  It is possible at times that the PDR for 'offset' is
+     associated with FDR x and *not* with FDR y.  Erg!!
+
+     From a binary dump of my C++ test case 'moo' using Compaq's coffobjanl
+     (output format has been edited for our purposes):
+
+     FDR [2]: (main.C): First instruction: 0x12000207c <x>
+       PDR [5] for File [2]: LoopTest__Xv                 <0x1200020a0> (a)
+       PDR [7] for File [2]: foo__Xv                      <0x120002168>
+     FDR [1]: (-1):     First instruction: 0x1200020e8 <y>
+       PDR [3] for File [1]:                              <0x120001ad0> (b)
+     FDR [6]: (-1):     First instruction: 0x1200026f0 <z>
+
+     (a) In the case of PDR5, the vma is such that the first few instructions
+     of the procedure can be found.  But since the size of this procedure is
+     160b, the vma will soon cross into the 'address space' of FDR1 and no
+     debugging info will be found.  How repugnant!
+
+     (b) It is also possible for a PDR to have a *lower* vma than its associated
+     FDR; see FDR1 and PDR3.  Gross!
+
+     Since the FDRs that are causing so much havok (in this case) 1) do not
+     describe actual files (fdr.rss == -1), and 2) contain only compiler
+     generated routines, I thought a simple fix would be to exclude them from
+     the FDR table in 'mk_fdrtab'.  But, besides not knowing for certain
+     whether this would be correct, it creates an additional problem.  If we
+     happen to ask for source file info on a compiler generated (procedure)
+     symbol -- which is still in the symbol table -- the result can be
+     information from a real procedure!  This is because compiler generated
+     procedures with vma's higher than the last FDR in the fdr table will be
+     associated with a PDR from this FDR, specifically the PDR with the
+     highest vma.  This wasn't a problem before, because each procedure had a
+     PDR.  (Yes, this problem could be eliminated if we kept the size of the
+     last PDR around, but things are already getting ugly).
+
+     Probably, a better solution would be to have a sorted PDR table.  Each
+     PDR would have a pointer to its FDR so file information could still be
+     obtained.  A FDR table could still be constructed if necessary -- since
+     it only contains pointers, not much extra memory would be used -- but
+     the PDR table would be searched to locate debugging info.
+
+     There is still at least one remaining issue.  Sometimes a FDR can have a
+     bogus name, but contain PDRs that should belong to another FDR with a
+     real name.  E.g:
+
+     FDR [3]: 0000000120001b50 (/home/.../Array.H~alt~deccxx_5E5A62AD)
+       PDR [a] for File [3]: 0000000120001b50
+       PDR [b] for File [3]: 0000000120001cf0
+       PDR [c] for File [3]: 0000000120001dc8
+       PDR [d] for File [3]: 0000000120001e40
+       PDR [e] for File [3]: 0000000120001eb8
+       PDR [f] for File [3]: 0000000120001f4c
+     FDR [4]: 0000000120001b50 (/home/.../Array.H)
+
+     Here, FDR4 has the correct name, but should (seemingly) contain PDRa-f.
+     The symbol table for PDR4 does contain symbols for PDRa-f, but so does
+     the symbol table for FDR3.  However the former is different; perhaps this
+     can be detected easily. (I'm not sure at this point.)  This problem only
+     seems to be associated with files with templates.  I am assuming the idea
+     is that there is a 'fake' FDR (with PDRs) for each differently typed set
+     of templates that must be generated.  Currently, FDR4 is completely
+     excluded from the FDR table in 'mk_fdrtab' because it contains no PDRs.
+
+     Since I don't have time to prepare a real fix for this right now, be
+     prepared for 'A Horrible Hack' to force the inspection of all non-stabs
+     FDRs.  It's coming...  */
+  fdr_ptr = tab[i].fdr;
+
+  /* Check whether this file has stabs debugging information.  In a
+     file with stabs debugging information, the second local symbol is
+     named @stabs.  */
+  stabs = FALSE;
+  if (fdr_ptr->csym >= 2)
+    {
+      char *sym_ptr;
+      SYMR sym;
+
+      sym_ptr = ((char *) debug_info->external_sym
+		 + (fdr_ptr->isymBase + 1) * debug_swap->external_sym_size);
+      (*debug_swap->swap_sym_in) (abfd, sym_ptr, &sym);
+      if (strcmp (debug_info->ss + fdr_ptr->issBase + sym.iss,
+		  STABS_SYMBOL) == 0)
+	stabs = TRUE;
+    }
+
+  if (!stabs)
+    {
+      bfd_size_type external_pdr_size;
+      char *pdr_ptr;
+      char *best_pdr = NULL;
+      FDR *best_fdr;
+      bfd_signed_vma best_dist = -1;
+      PDR pdr;
+      unsigned char *line_ptr;
+      unsigned char *line_end;
+      int lineno;
+      /* This file uses ECOFF debugging information.  Each FDR has a
+         list of procedure descriptors (PDR).  The address in the FDR
+         is the absolute address of the first procedure.  The address
+         in the first PDR gives the offset of that procedure relative
+         to the object file's base-address.  The addresses in
+         subsequent PDRs specify each procedure's address relative to
+         the object file's base-address.  To make things more juicy,
+         whenever the PROF bit in the PDR is set, the real entry point
+         of the procedure may be 16 bytes below what would normally be
+         the procedure's entry point.  Instead, DEC came up with a
+         wicked scheme to create profiled libraries "on the fly":
+         instead of shipping a regular and a profiled version of each
+         library, they insert 16 bytes of unused space in front of
+         each procedure and set the "prof" bit in the PDR to indicate
+         that there is a gap there (this is done automagically by "as"
+         when option "-pg" is specified).  Thus, normally, you link
+         against such a library and, except for lots of 16 byte gaps
+         between functions, things will behave as usual.  However,
+         when invoking "ld" with option "-pg", it will fill those gaps
+         with code that calls mcount().  It then moves the function's
+         entry point down by 16 bytes, and out pops a binary that has
+         all functions profiled.
+
+         NOTE: Neither FDRs nor PDRs are strictly sorted in memory
+               order.  For example, when including header-files that
+               define functions, the FDRs follow behind the including
+               file, even though their code may have been generated at
+               a lower address.  File coff-alpha.c from libbfd
+               illustrates this (use "odump -PFv" to look at a file's
+               FDR/PDR).  Similarly, PDRs are sometimes out of order
+               as well.  An example of this is OSF/1 v3.0 libc's
+               malloc.c.  I'm not sure why this happens, but it could
+               be due to optimizations that reorder a function's
+               position within an object-file.
+
+         Strategy:
+
+         On the first call to this function, we build a table of FDRs
+         that is sorted by the base-address of the object-file the FDR
+         is referring to.  Notice that each object-file may contain
+         code from multiple source files (e.g., due to code defined in
+         include files).  Thus, for any given base-address, there may
+         be multiple FDRs (but this case is, fortunately, uncommon).
+         lookup(addr) guarantees to return the first FDR that applies
+         to address ADDR.  Thus, after invoking lookup(), we have a
+         list of FDRs that may contain the PDR for ADDR.  Next, we
+         walk through the PDRs of these FDRs and locate the one that
+         is closest to ADDR (i.e., for which the difference between
+         ADDR and the PDR's entry point is positive and minimal).
+         Once, the right FDR and PDR are located, we simply walk
+         through the line-number table to lookup the line-number that
+         best matches ADDR.  Obviously, things could be sped up by
+         keeping a sorted list of PDRs instead of a sorted list of
+         FDRs.  However, this would increase space requirements
+         considerably, which is undesirable.  */
+      external_pdr_size = debug_swap->external_pdr_size;
+
+      /* eraxxon: The Horrible Hack: Because of the problems above, set 'i'
+	 to 0 so we look through all FDRs.
+
+	 Because FDR's without any symbols are assumed to be non-stabs,
+	 searching through all FDRs may cause the following code to try to
+	 read stabs FDRs as ECOFF ones.  However, I don't think this will
+	 harm anything.  */
+      i = 0;
+      
+      /* Search FDR list starting at tab[i] for the PDR that best matches
+         OFFSET.  Normally, the FDR list is only one entry long.  */
+      best_fdr = NULL;
+      do
+	{
+	  /* eraxxon: 'dist' and 'min_dist' can be negative now
+             because we iterate over every FDR rather than just ones
+             with a base address less than or equal to 'offset'.  */
+	  bfd_signed_vma dist = -1, min_dist = -1;
+	  char *pdr_hold;
+	  char *pdr_end;
+
+	  fdr_ptr = tab[i].fdr;
+
+	  pdr_ptr = ((char *) debug_info->external_pdr
+		     + fdr_ptr->ipdFirst * external_pdr_size);
+	  pdr_end = pdr_ptr + fdr_ptr->cpd * external_pdr_size;
+	  (*debug_swap->swap_pdr_in) (abfd, (PTR) pdr_ptr, &pdr);
+	  /* Find PDR that is closest to OFFSET.  If pdr.prof is set,
+	     the procedure entry-point *may* be 0x10 below pdr.adr.  We
+	     simply pretend that pdr.prof *implies* a lower entry-point.
+	     This is safe because it just means that may identify 4 NOPs
+	     in front of the function as belonging to the function.  */
+	  for (pdr_hold = NULL;
+	       pdr_ptr < pdr_end;
+	       (pdr_ptr += external_pdr_size,
+		(*debug_swap->swap_pdr_in) (abfd, (PTR) pdr_ptr, &pdr)))
+	    {
+	      if (offset >= (pdr.adr - 0x10 * pdr.prof))
+		{
+		  dist = offset - (pdr.adr - 0x10 * pdr.prof);
+
+		  /* eraxxon: 'dist' can be negative now.  Note that
+                     'min_dist' can be negative if 'pdr_hold' below is NULL.  */
+		  if (!pdr_hold || (dist >= 0 && dist < min_dist))
+		    {
+		      min_dist = dist;
+		      pdr_hold = pdr_ptr;
+		    }
+		}
+	    }
+
+	  if (!best_pdr || (min_dist >= 0 && min_dist < best_dist))
+	    {
+	      best_dist = (bfd_vma) min_dist;  
+	      best_fdr = fdr_ptr;
+	      best_pdr = pdr_hold;
+	    }
+	  /* Continue looping until base_addr of next entry is different.  */
+	}
+      /* eraxxon: We want to iterate over all FDRs.
+	 See previous comment about 'fdrtab_lookup'.  */
+      while (++i < line_info->fdrtab_len);
+
+      if (!best_fdr || !best_pdr)
+	return FALSE;			/* Shouldn't happen...  */
+
+      /* Phew, finally we got something that we can hold onto.  */
+      fdr_ptr = best_fdr;
+      pdr_ptr = best_pdr;
+      (*debug_swap->swap_pdr_in) (abfd, (PTR) pdr_ptr, &pdr);
+      /* Now we can look for the actual line number.  The line numbers
+         are stored in a very funky format, which I won't try to
+         describe.  The search is bounded by the end of the FDRs line
+         number entries.  */
+      line_end = debug_info->line + fdr_ptr->cbLineOffset + fdr_ptr->cbLine;
+
+      /* Make offset relative to procedure entry.  */
+      offset -= pdr.adr - 0x10 * pdr.prof;
+      lineno = pdr.lnLow;
+      line_ptr = debug_info->line + fdr_ptr->cbLineOffset + pdr.cbLineOffset;
+      while (line_ptr < line_end)
+	{
+	  int delta;
+	  unsigned int count;
+
+	  delta = *line_ptr >> 4;
+	  if (delta >= 0x8)
+	    delta -= 0x10;
+	  count = (*line_ptr & 0xf) + 1;
+	  ++line_ptr;
+	  if (delta == -8)
+	    {
+	      delta = (((line_ptr[0]) & 0xff) << 8) + ((line_ptr[1]) & 0xff);
+	      if (delta >= 0x8000)
+		delta -= 0x10000;
+	      line_ptr += 2;
+	    }
+	  lineno += delta;
+	  if (offset < count * 4)
+	    {
+	      line_info->cache.stop += count * 4 - offset;
+	      break;
+	    }
+	  offset -= count * 4;
+	}
+
+      /* If fdr_ptr->rss is -1, then this file does not have full
+         symbols, at least according to gdb/mipsread.c.  */
+      if (fdr_ptr->rss == -1)
+	{
+	  line_info->cache.filename = NULL;
+	  if (pdr.isym == -1)
+	    line_info->cache.functionname = NULL;
+	  else
+	    {
+	      EXTR proc_ext;
+
+	      (*debug_swap->swap_ext_in)
+		(abfd,
+		 ((char *) debug_info->external_ext
+		  + pdr.isym * debug_swap->external_ext_size),
+		 &proc_ext);
+	      line_info->cache.functionname = (debug_info->ssext
+					       + proc_ext.asym.iss);
+	    }
+	}
+      else
+	{
+	  SYMR proc_sym;
+
+	  line_info->cache.filename = (debug_info->ss
+				       + fdr_ptr->issBase
+				       + fdr_ptr->rss);
+	  (*debug_swap->swap_sym_in)
+	    (abfd,
+	     ((char *) debug_info->external_sym
+	      + ((fdr_ptr->isymBase + pdr.isym)
+		 * debug_swap->external_sym_size)),
+	     &proc_sym);
+	  line_info->cache.functionname = (debug_info->ss
+					   + fdr_ptr->issBase
+					   + proc_sym.iss);
+	}
+      if (lineno == ilineNil)
+	lineno = 0;
+      line_info->cache.line_num = lineno;
+    }
+  else
+    {
+      bfd_size_type external_sym_size;
+      const char *directory_name;
+      const char *main_file_name;
+      const char *current_file_name;
+      const char *function_name;
+      const char *line_file_name;
+      bfd_vma low_func_vma;
+      bfd_vma low_line_vma;
+      bfd_boolean past_line;
+      bfd_boolean past_fn;
+      char *sym_ptr, *sym_ptr_end;
+      size_t len, funclen;
+      char *buffer = NULL;
+
+      /* This file uses stabs debugging information.  When gcc is not
+	 optimizing, it will put the line number information before
+	 the function name stabs entry.  When gcc is optimizing, it
+	 will put the stabs entry for all the function first, followed
+	 by the line number information.  (This appears to happen
+	 because of the two output files used by the -mgpopt switch,
+	 which is implied by -O).  This means that we must keep
+	 looking through the symbols until we find both a line number
+	 and a function name which are beyond the address we want.  */
+
+      line_info->cache.filename = NULL;
+      line_info->cache.functionname = NULL;
+      line_info->cache.line_num = 0;
+
+      directory_name = NULL;
+      main_file_name = NULL;
+      current_file_name = NULL;
+      function_name = NULL;
+      line_file_name = NULL;
+      low_func_vma = 0;
+      low_line_vma = 0;
+      past_line = FALSE;
+      past_fn = FALSE;
+
+      external_sym_size = debug_swap->external_sym_size;
+
+      sym_ptr = ((char *) debug_info->external_sym
+		 + (fdr_ptr->isymBase + 2) * external_sym_size);
+      sym_ptr_end = sym_ptr + (fdr_ptr->csym - 2) * external_sym_size;
+      for (;
+	   sym_ptr < sym_ptr_end && (! past_line || ! past_fn);
+	   sym_ptr += external_sym_size)
+	{
+	  SYMR sym;
+
+	  (*debug_swap->swap_sym_in) (abfd, sym_ptr, &sym);
+
+	  if (ECOFF_IS_STAB (&sym))
+	    {
+	      switch (ECOFF_UNMARK_STAB (sym.index))
+		{
+		case N_SO:
+		  main_file_name = current_file_name =
+		    debug_info->ss + fdr_ptr->issBase + sym.iss;
+
+		  /* Check the next symbol to see if it is also an
+                     N_SO symbol.  */
+		  if (sym_ptr + external_sym_size < sym_ptr_end)
+		    {
+		      SYMR nextsym;
+
+		      (*debug_swap->swap_sym_in) (abfd,
+						  sym_ptr + external_sym_size,
+						  &nextsym);
+		      if (ECOFF_IS_STAB (&nextsym)
+			  && ECOFF_UNMARK_STAB (nextsym.index) == N_SO)
+			{
+ 			  directory_name = current_file_name;
+			  main_file_name = current_file_name =
+			    debug_info->ss + fdr_ptr->issBase + nextsym.iss;
+			  sym_ptr += external_sym_size;
+			}
+		    }
+		  break;
+
+		case N_SOL:
+		  current_file_name =
+		    debug_info->ss + fdr_ptr->issBase + sym.iss;
+		  break;
+
+		case N_FUN:
+		  if (sym.value > offset)
+		    past_fn = TRUE;
+		  else if (sym.value >= low_func_vma)
+		    {
+		      low_func_vma = sym.value;
+		      function_name =
+			debug_info->ss + fdr_ptr->issBase + sym.iss;
+		    }
+		  break;
+		}
+	    }
+	  else if (sym.st == stLabel && sym.index != indexNil)
+	    {
+	      if (sym.value > offset)
+		past_line = TRUE;
+	      else if (sym.value >= low_line_vma)
+		{
+		  low_line_vma = sym.value;
+		  line_file_name = current_file_name;
+		  line_info->cache.line_num = sym.index;
+		}
+	    }
+	}
+
+      if (line_info->cache.line_num != 0)
+	main_file_name = line_file_name;
+
+      /* We need to remove the stuff after the colon in the function
+         name.  We also need to put the directory name and the file
+         name together.  */
+      if (function_name == NULL)
+	len = funclen = 0;
+      else
+	len = funclen = strlen (function_name) + 1;
+
+      if (main_file_name != NULL
+	  && directory_name != NULL
+	  && main_file_name[0] != '/')
+	len += strlen (directory_name) + strlen (main_file_name) + 1;
+
+      if (len != 0)
+	{
+	  if (line_info->find_buffer != NULL)
+	    free (line_info->find_buffer);
+	  buffer = (char *) bfd_malloc ((bfd_size_type) len);
+	  if (buffer == NULL)
+	    return FALSE;
+	  line_info->find_buffer = buffer;
+	}
+
+      if (function_name != NULL)
+	{
+	  char *colon;
+
+	  strcpy (buffer, function_name);
+	  colon = strchr (buffer, ':');
+	  if (colon != NULL)
+	    *colon = '\0';
+	  line_info->cache.functionname = buffer;
+	}
+
+      if (main_file_name != NULL)
+	{
+	  if (directory_name == NULL || main_file_name[0] == '/')
+	    line_info->cache.filename = main_file_name;
+	  else
+	    {
+	      sprintf (buffer + funclen, "%s%s", directory_name,
+		       main_file_name);
+	      line_info->cache.filename = buffer + funclen;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Do the work of find_nearest_line.  */
+
+bfd_boolean
+_bfd_ecoff_locate_line (abfd, section, offset, debug_info, debug_swap,
+			line_info, filename_ptr, functionname_ptr, retline_ptr)
+     bfd *abfd;
+     asection *section;
+     bfd_vma offset;
+     struct ecoff_debug_info * const debug_info;
+     const struct ecoff_debug_swap * const debug_swap;
+     struct ecoff_find_line *line_info;
+     const char **filename_ptr;
+     const char **functionname_ptr;
+     unsigned int *retline_ptr;
+{
+  offset += section->vma;
+
+  if (line_info->cache.sect == NULL
+      || line_info->cache.sect != section
+      || offset < line_info->cache.start
+      || offset >= line_info->cache.stop)
+    {
+      line_info->cache.sect = section;
+      line_info->cache.start = offset;
+      line_info->cache.stop = offset;
+      if (! lookup_line (abfd, debug_info, debug_swap, line_info))
+	{
+	  line_info->cache.sect = NULL;
+	  return FALSE;
+	}
+    }
+
+  *filename_ptr = line_info->cache.filename;
+  *functionname_ptr = line_info->cache.functionname;
+  *retline_ptr = line_info->cache.line_num;
+
+  return TRUE;
+}
+
+/* These routines copy symbolic information into a memory buffer.
+
+   FIXME: The whole point of the shuffle code is to avoid storing
+   everything in memory, since the linker is such a memory hog.  This
+   code makes that effort useless.  It is only called by the MIPS ELF
+   code when generating a shared library, so it is not that big a
+   deal, but it should be fixed eventually.  */
+
+/* Collect a shuffle into a memory buffer.  */
+
+static bfd_boolean ecoff_collect_shuffle
+  PARAMS ((struct shuffle *, bfd_byte *));
+
+static bfd_boolean
+ecoff_collect_shuffle (l, buff)
+     struct shuffle *l;
+     bfd_byte *buff;
+{
+  unsigned long total;
+
+  total = 0;
+  for (; l != (struct shuffle *) NULL; l = l->next)
+    {
+      if (! l->filep)
+	memcpy (buff, l->u.memory, l->size);
+      else
+	{
+	  if (bfd_seek (l->u.file.input_bfd, l->u.file.offset, SEEK_SET) != 0
+	      || (bfd_bread (buff, (bfd_size_type) l->size, l->u.file.input_bfd)
+		  != l->size))
+	    return FALSE;
+	}
+      total += l->size;
+      buff += l->size;
+    }
+
+  return TRUE;
+}
+
+/* Copy PDR information into a memory buffer.  */
+
+bfd_boolean
+_bfd_ecoff_get_accumulated_pdr (handle, buff)
+     PTR handle;
+     bfd_byte *buff;
+{
+  struct accumulate *ainfo = (struct accumulate *) handle;
+
+  return ecoff_collect_shuffle (ainfo->pdr, buff);
+}
+
+/* Copy symbol information into a memory buffer.  */
+
+bfd_boolean
+_bfd_ecoff_get_accumulated_sym (handle, buff)
+     PTR handle;
+     bfd_byte *buff;
+{
+  struct accumulate *ainfo = (struct accumulate *) handle;
+
+  return ecoff_collect_shuffle (ainfo->sym, buff);
+}
+
+/* Copy the string table into a memory buffer.  */
+
+bfd_boolean
+_bfd_ecoff_get_accumulated_ss (handle, buff)
+     PTR handle;
+     bfd_byte *buff;
+{
+  struct accumulate *ainfo = (struct accumulate *) handle;
+  struct string_hash_entry *sh;
+  unsigned long total;
+
+  /* The string table is written out from the hash table if this is a
+     final link.  */
+  BFD_ASSERT (ainfo->ss == (struct shuffle *) NULL);
+  *buff++ = '\0';
+  total = 1;
+  BFD_ASSERT (ainfo->ss_hash == NULL || ainfo->ss_hash->val == 1);
+  for (sh = ainfo->ss_hash;
+       sh != (struct string_hash_entry *) NULL;
+       sh = sh->next)
+    {
+      size_t len;
+
+      len = strlen (sh->root.string);
+      memcpy (buff, (PTR) sh->root.string, len + 1);
+      total += len + 1;
+      buff += len + 1;
+    }
+
+  return TRUE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ecoffswap.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ecoffswap.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ecoffswap.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ecoffswap.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,773 @@
+/* Generic ECOFF swapping routines, for BFD.
+   Copyright 1992, 1993, 1994, 1995, 1996, 2000, 2001, 2002, 2004, 2005,
+   2007  Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* NOTE: This is a header file, but it contains executable routines.
+   This is done this way because these routines are substantially
+   similar, but are not identical, for all ECOFF targets.
+
+   These are routines to swap the ECOFF symbolic information in and
+   out.  The routines are defined statically.  You can set breakpoints
+   on them in gdb by naming the including source file; e.g.,
+   'coff-mips.c':ecoff_swap_hdr_in.
+
+   Before including this header file, one of ECOFF_32, ECOFF_64,
+   ECOFF_SIGNED_32 or ECOFF_SIGNED_64 must be defined.  These are
+   checked when swapping information that depends upon the target
+   size.  This code works for 32 bit and 64 bit ECOFF, but may need to
+   be generalized in the future.
+
+   Some header file which defines the external forms of these
+   structures must also be included before including this header file.
+   Currently this is either coff/mips.h or coff/alpha.h.
+
+   If the symbol TEST is defined when this file is compiled, a
+   comparison is made to ensure that, in fact, the output is
+   bit-for-bit the same as the input.  Of course, this symbol should
+   only be defined when deliberately testing the code on a machine
+   with the proper byte sex and such.  */
+
+#ifdef ECOFF_32
+#define ECOFF_GET_OFF H_GET_32
+#define ECOFF_PUT_OFF H_PUT_32
+#endif
+#ifdef ECOFF_64
+#define ECOFF_GET_OFF H_GET_64
+#define ECOFF_PUT_OFF H_PUT_64
+#endif
+#ifdef ECOFF_SIGNED_32
+#define ECOFF_GET_OFF H_GET_S32
+#define ECOFF_PUT_OFF H_PUT_S32
+#endif
+#ifdef ECOFF_SIGNED_64
+#define ECOFF_GET_OFF H_GET_S64
+#define ECOFF_PUT_OFF H_PUT_S64
+#endif
+
+/* ECOFF auxiliary information swapping routines.  These are the same
+   for all ECOFF targets, so they are defined in ecofflink.c.  */
+
+extern void _bfd_ecoff_swap_tir_in
+  (int, const struct tir_ext *, TIR *);
+extern void _bfd_ecoff_swap_tir_out
+  (int, const TIR *, struct tir_ext *);
+extern void _bfd_ecoff_swap_rndx_in
+  (int, const struct rndx_ext *, RNDXR *);
+extern void _bfd_ecoff_swap_rndx_out
+  (int, const RNDXR *, struct rndx_ext *);
+
+/* Prototypes for functions defined in this file.  */
+
+static void ecoff_swap_hdr_in (bfd *, void *, HDRR *);
+static void ecoff_swap_hdr_out (bfd *, const HDRR *, void *);
+static void ecoff_swap_fdr_in (bfd *, void *, FDR *);
+static void ecoff_swap_fdr_out (bfd *, const FDR *, void *);
+static void ecoff_swap_pdr_in (bfd *, void *, PDR *);
+static void ecoff_swap_pdr_out (bfd *, const PDR *, void *);
+static void ecoff_swap_sym_in (bfd *, void *, SYMR *);
+static void ecoff_swap_sym_out (bfd *, const SYMR *, void *);
+static void ecoff_swap_ext_in (bfd *, void *, EXTR *);
+static void ecoff_swap_ext_out (bfd *, const EXTR *, void *);
+static void ecoff_swap_rfd_in (bfd *, void *, RFDT *);
+static void ecoff_swap_rfd_out (bfd *, const RFDT *, void *);
+static void ecoff_swap_opt_in (bfd *, void *, OPTR *);
+static void ecoff_swap_opt_out (bfd *, const OPTR *, void *);
+static void ecoff_swap_dnr_in (bfd *, void *, DNR *);
+static void ecoff_swap_dnr_out (bfd *, const DNR *, void *);
+
+/* Swap in the symbolic header.  */
+
+static void
+ecoff_swap_hdr_in (bfd *abfd, void * ext_copy, HDRR *intern)
+{
+  struct hdr_ext ext[1];
+
+  *ext = *(struct hdr_ext *) ext_copy;
+
+  intern->magic         = H_GET_S16     (abfd, ext->h_magic);
+  intern->vstamp        = H_GET_S16     (abfd, ext->h_vstamp);
+  intern->ilineMax      = H_GET_32      (abfd, ext->h_ilineMax);
+  intern->cbLine        = ECOFF_GET_OFF (abfd, ext->h_cbLine);
+  intern->cbLineOffset  = ECOFF_GET_OFF (abfd, ext->h_cbLineOffset);
+  intern->idnMax        = H_GET_32      (abfd, ext->h_idnMax);
+  intern->cbDnOffset    = ECOFF_GET_OFF (abfd, ext->h_cbDnOffset);
+  intern->ipdMax        = H_GET_32      (abfd, ext->h_ipdMax);
+  intern->cbPdOffset    = ECOFF_GET_OFF (abfd, ext->h_cbPdOffset);
+  intern->isymMax       = H_GET_32      (abfd, ext->h_isymMax);
+  intern->cbSymOffset   = ECOFF_GET_OFF (abfd, ext->h_cbSymOffset);
+  intern->ioptMax       = H_GET_32      (abfd, ext->h_ioptMax);
+  intern->cbOptOffset   = ECOFF_GET_OFF (abfd, ext->h_cbOptOffset);
+  intern->iauxMax       = H_GET_32      (abfd, ext->h_iauxMax);
+  intern->cbAuxOffset   = ECOFF_GET_OFF (abfd, ext->h_cbAuxOffset);
+  intern->issMax        = H_GET_32      (abfd, ext->h_issMax);
+  intern->cbSsOffset    = ECOFF_GET_OFF (abfd, ext->h_cbSsOffset);
+  intern->issExtMax     = H_GET_32      (abfd, ext->h_issExtMax);
+  intern->cbSsExtOffset = ECOFF_GET_OFF (abfd, ext->h_cbSsExtOffset);
+  intern->ifdMax        = H_GET_32      (abfd, ext->h_ifdMax);
+  intern->cbFdOffset    = ECOFF_GET_OFF (abfd, ext->h_cbFdOffset);
+  intern->crfd          = H_GET_32      (abfd, ext->h_crfd);
+  intern->cbRfdOffset   = ECOFF_GET_OFF (abfd, ext->h_cbRfdOffset);
+  intern->iextMax       = H_GET_32      (abfd, ext->h_iextMax);
+  intern->cbExtOffset   = ECOFF_GET_OFF (abfd, ext->h_cbExtOffset);
+
+#ifdef TEST
+  if (memcmp ((char *) ext, (char *) intern, sizeof (*intern)) != 0)
+    abort ();
+#endif
+}
+
+/* Swap out the symbolic header.  */
+
+static void
+ecoff_swap_hdr_out (bfd *abfd, const HDRR *intern_copy, void * ext_ptr)
+{
+  struct hdr_ext *ext = (struct hdr_ext *) ext_ptr;
+  HDRR intern[1];
+
+  *intern = *intern_copy;
+
+  H_PUT_S16     (abfd, intern->magic,         ext->h_magic);
+  H_PUT_S16     (abfd, intern->vstamp,        ext->h_vstamp);
+  H_PUT_32      (abfd, intern->ilineMax,      ext->h_ilineMax);
+  ECOFF_PUT_OFF (abfd, intern->cbLine,        ext->h_cbLine);
+  ECOFF_PUT_OFF (abfd, intern->cbLineOffset,  ext->h_cbLineOffset);
+  H_PUT_32      (abfd, intern->idnMax,        ext->h_idnMax);
+  ECOFF_PUT_OFF (abfd, intern->cbDnOffset,    ext->h_cbDnOffset);
+  H_PUT_32      (abfd, intern->ipdMax,        ext->h_ipdMax);
+  ECOFF_PUT_OFF (abfd, intern->cbPdOffset,    ext->h_cbPdOffset);
+  H_PUT_32      (abfd, intern->isymMax,       ext->h_isymMax);
+  ECOFF_PUT_OFF (abfd, intern->cbSymOffset,   ext->h_cbSymOffset);
+  H_PUT_32      (abfd, intern->ioptMax,       ext->h_ioptMax);
+  ECOFF_PUT_OFF (abfd, intern->cbOptOffset,   ext->h_cbOptOffset);
+  H_PUT_32      (abfd, intern->iauxMax,       ext->h_iauxMax);
+  ECOFF_PUT_OFF (abfd, intern->cbAuxOffset,   ext->h_cbAuxOffset);
+  H_PUT_32      (abfd, intern->issMax,        ext->h_issMax);
+  ECOFF_PUT_OFF (abfd, intern->cbSsOffset,    ext->h_cbSsOffset);
+  H_PUT_32      (abfd, intern->issExtMax,     ext->h_issExtMax);
+  ECOFF_PUT_OFF (abfd, intern->cbSsExtOffset, ext->h_cbSsExtOffset);
+  H_PUT_32      (abfd, intern->ifdMax,        ext->h_ifdMax);
+  ECOFF_PUT_OFF (abfd, intern->cbFdOffset,    ext->h_cbFdOffset);
+  H_PUT_32      (abfd, intern->crfd,          ext->h_crfd);
+  ECOFF_PUT_OFF (abfd, intern->cbRfdOffset,   ext->h_cbRfdOffset);
+  H_PUT_32      (abfd, intern->iextMax,       ext->h_iextMax);
+  ECOFF_PUT_OFF (abfd, intern->cbExtOffset,   ext->h_cbExtOffset);
+
+#ifdef TEST
+  if (memcmp ((char *) ext, (char *) intern, sizeof (*intern)) != 0)
+    abort ();
+#endif
+}
+
+/* Swap in the file descriptor record.  */
+
+static void
+ecoff_swap_fdr_in (bfd *abfd, void * ext_copy, FDR *intern)
+{
+  struct fdr_ext ext[1];
+
+  *ext = *(struct fdr_ext *) ext_copy;
+
+  intern->adr           = ECOFF_GET_OFF (abfd, ext->f_adr);
+  intern->rss           = H_GET_32 (abfd, ext->f_rss);
+#if defined (ECOFF_64) || defined (ECOFF_SIGNED_64)
+  if (intern->rss == (signed long) 0xffffffff)
+    intern->rss = -1;
+#endif
+  intern->issBase       = H_GET_32 (abfd, ext->f_issBase);
+  intern->cbSs          = ECOFF_GET_OFF (abfd, ext->f_cbSs);
+  intern->isymBase      = H_GET_32 (abfd, ext->f_isymBase);
+  intern->csym          = H_GET_32 (abfd, ext->f_csym);
+  intern->ilineBase     = H_GET_32 (abfd, ext->f_ilineBase);
+  intern->cline         = H_GET_32 (abfd, ext->f_cline);
+  intern->ioptBase      = H_GET_32 (abfd, ext->f_ioptBase);
+  intern->copt          = H_GET_32 (abfd, ext->f_copt);
+#if defined (ECOFF_32) || defined (ECOFF_SIGNED_32)
+  intern->ipdFirst      = H_GET_16 (abfd, ext->f_ipdFirst);
+  intern->cpd           = H_GET_16 (abfd, ext->f_cpd);
+#endif
+#if defined (ECOFF_64) || defined (ECOFF_SIGNED_64)
+  intern->ipdFirst      = H_GET_32 (abfd, ext->f_ipdFirst);
+  intern->cpd           = H_GET_32 (abfd, ext->f_cpd);
+#endif
+  intern->iauxBase      = H_GET_32 (abfd, ext->f_iauxBase);
+  intern->caux          = H_GET_32 (abfd, ext->f_caux);
+  intern->rfdBase       = H_GET_32 (abfd, ext->f_rfdBase);
+  intern->crfd          = H_GET_32 (abfd, ext->f_crfd);
+
+  /* Now the fun stuff...  */
+  if (bfd_header_big_endian (abfd))
+    {
+      intern->lang       = ((ext->f_bits1[0] & FDR_BITS1_LANG_BIG)
+			    >> FDR_BITS1_LANG_SH_BIG);
+      intern->fMerge     = 0 != (ext->f_bits1[0] & FDR_BITS1_FMERGE_BIG);
+      intern->fReadin    = 0 != (ext->f_bits1[0] & FDR_BITS1_FREADIN_BIG);
+      intern->fBigendian = 0 != (ext->f_bits1[0] & FDR_BITS1_FBIGENDIAN_BIG);
+      intern->glevel     = ((ext->f_bits2[0] & FDR_BITS2_GLEVEL_BIG)
+			    >> FDR_BITS2_GLEVEL_SH_BIG);
+    }
+  else
+    {
+      intern->lang       = ((ext->f_bits1[0] & FDR_BITS1_LANG_LITTLE)
+			    >> FDR_BITS1_LANG_SH_LITTLE);
+      intern->fMerge     = 0 != (ext->f_bits1[0] & FDR_BITS1_FMERGE_LITTLE);
+      intern->fReadin    = 0 != (ext->f_bits1[0] & FDR_BITS1_FREADIN_LITTLE);
+      intern->fBigendian = 0 != (ext->f_bits1[0] & FDR_BITS1_FBIGENDIAN_LITTLE);
+      intern->glevel     = ((ext->f_bits2[0] & FDR_BITS2_GLEVEL_LITTLE)
+			    >> FDR_BITS2_GLEVEL_SH_LITTLE);
+    }
+  intern->reserved = 0;
+
+  intern->cbLineOffset  = ECOFF_GET_OFF (abfd, ext->f_cbLineOffset);
+  intern->cbLine        = ECOFF_GET_OFF (abfd, ext->f_cbLine);
+
+#ifdef TEST
+  if (memcmp ((char *) ext, (char *) intern, sizeof (*intern)) != 0)
+    abort ();
+#endif
+}
+
+/* Swap out the file descriptor record.  */
+
+static void
+ecoff_swap_fdr_out (bfd *abfd, const FDR *intern_copy, void * ext_ptr)
+{
+  struct fdr_ext *ext = (struct fdr_ext *) ext_ptr;
+  FDR intern[1];
+
+  /* Make it reasonable to do in-place.  */
+  *intern = *intern_copy;
+
+  ECOFF_PUT_OFF (abfd, intern->adr,       ext->f_adr);
+  H_PUT_32      (abfd, intern->rss,       ext->f_rss);
+  H_PUT_32      (abfd, intern->issBase,   ext->f_issBase);
+  ECOFF_PUT_OFF (abfd, intern->cbSs,      ext->f_cbSs);
+  H_PUT_32      (abfd, intern->isymBase,  ext->f_isymBase);
+  H_PUT_32      (abfd, intern->csym,      ext->f_csym);
+  H_PUT_32      (abfd, intern->ilineBase, ext->f_ilineBase);
+  H_PUT_32      (abfd, intern->cline,     ext->f_cline);
+  H_PUT_32      (abfd, intern->ioptBase,  ext->f_ioptBase);
+  H_PUT_32      (abfd, intern->copt,      ext->f_copt);
+#if defined (ECOFF_32) || defined (ECOFF_SIGNED_32)
+  H_PUT_16      (abfd, intern->ipdFirst,  ext->f_ipdFirst);
+  H_PUT_16      (abfd, intern->cpd,       ext->f_cpd);
+#endif
+#if defined (ECOFF_64) || defined (ECOFF_SIGNED_64)
+  H_PUT_32      (abfd, intern->ipdFirst,  ext->f_ipdFirst);
+  H_PUT_32      (abfd, intern->cpd,       ext->f_cpd);
+#endif
+  H_PUT_32      (abfd, intern->iauxBase,  ext->f_iauxBase);
+  H_PUT_32      (abfd, intern->caux,      ext->f_caux);
+  H_PUT_32      (abfd, intern->rfdBase,   ext->f_rfdBase);
+  H_PUT_32      (abfd, intern->crfd,      ext->f_crfd);
+
+  /* Now the fun stuff...  */
+  if (bfd_header_big_endian (abfd))
+    {
+      ext->f_bits1[0] = (((intern->lang << FDR_BITS1_LANG_SH_BIG)
+			  & FDR_BITS1_LANG_BIG)
+			 | (intern->fMerge ? FDR_BITS1_FMERGE_BIG : 0)
+			 | (intern->fReadin ? FDR_BITS1_FREADIN_BIG : 0)
+			 | (intern->fBigendian ? FDR_BITS1_FBIGENDIAN_BIG : 0));
+      ext->f_bits2[0] = ((intern->glevel << FDR_BITS2_GLEVEL_SH_BIG)
+			 & FDR_BITS2_GLEVEL_BIG);
+      ext->f_bits2[1] = 0;
+      ext->f_bits2[2] = 0;
+    }
+  else
+    {
+      ext->f_bits1[0] = (((intern->lang << FDR_BITS1_LANG_SH_LITTLE)
+			  & FDR_BITS1_LANG_LITTLE)
+			 | (intern->fMerge ? FDR_BITS1_FMERGE_LITTLE : 0)
+			 | (intern->fReadin ? FDR_BITS1_FREADIN_LITTLE : 0)
+			 | (intern->fBigendian ? FDR_BITS1_FBIGENDIAN_LITTLE : 0));
+      ext->f_bits2[0] = ((intern->glevel << FDR_BITS2_GLEVEL_SH_LITTLE)
+			 & FDR_BITS2_GLEVEL_LITTLE);
+      ext->f_bits2[1] = 0;
+      ext->f_bits2[2] = 0;
+    }
+
+  ECOFF_PUT_OFF (abfd, intern->cbLineOffset, ext->f_cbLineOffset);
+  ECOFF_PUT_OFF (abfd, intern->cbLine, ext->f_cbLine);
+
+#ifdef TEST
+  if (memcmp ((char *) ext, (char *) intern, sizeof (*intern)) != 0)
+    abort ();
+#endif
+}
+
+/* Swap in the procedure descriptor record.  */
+
+static void
+ecoff_swap_pdr_in (bfd *abfd, void * ext_copy, PDR *intern)
+{
+  struct pdr_ext ext[1];
+
+  *ext = *(struct pdr_ext *) ext_copy;
+
+  memset ((void *) intern, 0, sizeof (*intern));
+
+  intern->adr           = ECOFF_GET_OFF (abfd, ext->p_adr);
+  intern->isym          = H_GET_32 (abfd, ext->p_isym);
+  intern->iline         = H_GET_32 (abfd, ext->p_iline);
+  intern->regmask       = H_GET_32 (abfd, ext->p_regmask);
+  intern->regoffset     = H_GET_S32 (abfd, ext->p_regoffset);
+  intern->iopt          = H_GET_S32 (abfd, ext->p_iopt);
+  intern->fregmask      = H_GET_32 (abfd, ext->p_fregmask);
+  intern->fregoffset    = H_GET_S32 (abfd, ext->p_fregoffset);
+  intern->frameoffset   = H_GET_S32 (abfd, ext->p_frameoffset);
+  intern->framereg      = H_GET_16 (abfd, ext->p_framereg);
+  intern->pcreg         = H_GET_16 (abfd, ext->p_pcreg);
+  intern->lnLow         = H_GET_32 (abfd, ext->p_lnLow);
+  intern->lnHigh        = H_GET_32 (abfd, ext->p_lnHigh);
+  intern->cbLineOffset  = ECOFF_GET_OFF (abfd, ext->p_cbLineOffset);
+
+#if defined (ECOFF_64) || defined (ECOFF_SIGNED_64)
+  if (intern->isym == (signed long) 0xffffffff)
+    intern->isym = -1;
+  if (intern->iline == (signed long) 0xffffffff)
+    intern->iline = -1;
+
+  intern->gp_prologue = H_GET_8 (abfd, ext->p_gp_prologue);
+  if (bfd_header_big_endian (abfd))
+    {
+      intern->gp_used = 0 != (ext->p_bits1[0] & PDR_BITS1_GP_USED_BIG);
+      intern->reg_frame = 0 != (ext->p_bits1[0] & PDR_BITS1_REG_FRAME_BIG);
+      intern->prof = 0 != (ext->p_bits1[0] & PDR_BITS1_PROF_BIG);
+      intern->reserved = (((ext->p_bits1[0] & PDR_BITS1_RESERVED_BIG)
+			   << PDR_BITS1_RESERVED_SH_LEFT_BIG)
+			  | ((ext->p_bits2[0] & PDR_BITS2_RESERVED_BIG)
+			     >> PDR_BITS2_RESERVED_SH_BIG));
+    }
+  else
+    {
+      intern->gp_used = 0 != (ext->p_bits1[0] & PDR_BITS1_GP_USED_LITTLE);
+      intern->reg_frame = 0 != (ext->p_bits1[0] & PDR_BITS1_REG_FRAME_LITTLE);
+      intern->prof = 0 != (ext->p_bits1[0] & PDR_BITS1_PROF_LITTLE);
+      intern->reserved = (((ext->p_bits1[0] & PDR_BITS1_RESERVED_LITTLE)
+			   >> PDR_BITS1_RESERVED_SH_LITTLE)
+			  | ((ext->p_bits2[0] & PDR_BITS2_RESERVED_LITTLE)
+			     << PDR_BITS2_RESERVED_SH_LEFT_LITTLE));
+    }
+  intern->localoff = H_GET_8 (abfd, ext->p_localoff);
+#endif
+
+#ifdef TEST
+  if (memcmp ((char *) ext, (char *) intern, sizeof (*intern)) != 0)
+    abort ();
+#endif
+}
+
+/* Swap out the procedure descriptor record.  */
+
+static void
+ecoff_swap_pdr_out (bfd *abfd, const PDR *intern_copy, void * ext_ptr)
+{
+  struct pdr_ext *ext = (struct pdr_ext *) ext_ptr;
+  PDR intern[1];
+
+  /* Make it reasonable to do in-place.  */
+  *intern = *intern_copy;
+
+  ECOFF_PUT_OFF (abfd, intern->adr,          ext->p_adr);
+  H_PUT_32      (abfd, intern->isym,         ext->p_isym);
+  H_PUT_32      (abfd, intern->iline,        ext->p_iline);
+  H_PUT_32      (abfd, intern->regmask,      ext->p_regmask);
+  H_PUT_32      (abfd, intern->regoffset,    ext->p_regoffset);
+  H_PUT_32      (abfd, intern->iopt,         ext->p_iopt);
+  H_PUT_32      (abfd, intern->fregmask,     ext->p_fregmask);
+  H_PUT_32      (abfd, intern->fregoffset,   ext->p_fregoffset);
+  H_PUT_32      (abfd, intern->frameoffset,  ext->p_frameoffset);
+  H_PUT_16      (abfd, intern->framereg,     ext->p_framereg);
+  H_PUT_16      (abfd, intern->pcreg,        ext->p_pcreg);
+  H_PUT_32      (abfd, intern->lnLow,        ext->p_lnLow);
+  H_PUT_32      (abfd, intern->lnHigh,       ext->p_lnHigh);
+  ECOFF_PUT_OFF (abfd, intern->cbLineOffset, ext->p_cbLineOffset);
+
+#if defined (ECOFF_64) || defined (ECOFF_SIGNED_64)
+  H_PUT_8       (abfd, intern->gp_prologue,  ext->p_gp_prologue);
+
+  if (bfd_header_big_endian (abfd))
+    {
+      ext->p_bits1[0] = ((intern->gp_used ? PDR_BITS1_GP_USED_BIG : 0)
+			 | (intern->reg_frame ? PDR_BITS1_REG_FRAME_BIG : 0)
+			 | (intern->prof ? PDR_BITS1_PROF_BIG : 0)
+			 | ((intern->reserved
+			     >> PDR_BITS1_RESERVED_SH_LEFT_BIG)
+			    & PDR_BITS1_RESERVED_BIG));
+      ext->p_bits2[0] = ((intern->reserved << PDR_BITS2_RESERVED_SH_BIG)
+			 & PDR_BITS2_RESERVED_BIG);
+    }
+  else
+    {
+      ext->p_bits1[0] = ((intern->gp_used ? PDR_BITS1_GP_USED_LITTLE : 0)
+			 | (intern->reg_frame ? PDR_BITS1_REG_FRAME_LITTLE : 0)
+			 | (intern->prof ? PDR_BITS1_PROF_LITTLE : 0)
+			 | ((intern->reserved << PDR_BITS1_RESERVED_SH_LITTLE)
+			    & PDR_BITS1_RESERVED_LITTLE));
+      ext->p_bits2[0] = ((intern->reserved >>
+			  PDR_BITS2_RESERVED_SH_LEFT_LITTLE)
+			 & PDR_BITS2_RESERVED_LITTLE);
+    }
+  H_PUT_8 (abfd, intern->localoff, ext->p_localoff);
+#endif
+
+#ifdef TEST
+  if (memcmp ((char *) ext, (char *) intern, sizeof (*intern)) != 0)
+    abort ();
+#endif
+}
+
+/* Swap in a symbol record.  */
+
+static void
+ecoff_swap_sym_in (bfd *abfd, void * ext_copy, SYMR *intern)
+{
+  struct sym_ext ext[1];
+
+  *ext = *(struct sym_ext *) ext_copy;
+
+  intern->iss           = H_GET_32 (abfd, ext->s_iss);
+  intern->value         = ECOFF_GET_OFF (abfd, ext->s_value);
+
+#if defined (ECOFF_64) || defined (ECOFF_SIGNED_64)
+  if (intern->iss == (signed long) 0xffffffff)
+    intern->iss = -1;
+#endif  
+
+  /* Now the fun stuff...  */
+  if (bfd_header_big_endian (abfd))
+    {
+      intern->st          =  (ext->s_bits1[0] & SYM_BITS1_ST_BIG)
+					     >> SYM_BITS1_ST_SH_BIG;
+      intern->sc          = ((ext->s_bits1[0] & SYM_BITS1_SC_BIG)
+					     << SYM_BITS1_SC_SH_LEFT_BIG)
+			  | ((ext->s_bits2[0] & SYM_BITS2_SC_BIG)
+					     >> SYM_BITS2_SC_SH_BIG);
+      intern->reserved    = 0 != (ext->s_bits2[0] & SYM_BITS2_RESERVED_BIG);
+      intern->index       = ((ext->s_bits2[0] & SYM_BITS2_INDEX_BIG)
+					     << SYM_BITS2_INDEX_SH_LEFT_BIG)
+			  | (ext->s_bits3[0] << SYM_BITS3_INDEX_SH_LEFT_BIG)
+			  | (ext->s_bits4[0] << SYM_BITS4_INDEX_SH_LEFT_BIG);
+    }
+  else
+    {
+      intern->st          =  (ext->s_bits1[0] & SYM_BITS1_ST_LITTLE)
+					     >> SYM_BITS1_ST_SH_LITTLE;
+      intern->sc          = ((ext->s_bits1[0] & SYM_BITS1_SC_LITTLE)
+					     >> SYM_BITS1_SC_SH_LITTLE)
+			  | ((ext->s_bits2[0] & SYM_BITS2_SC_LITTLE)
+					     << SYM_BITS2_SC_SH_LEFT_LITTLE);
+      intern->reserved    = 0 != (ext->s_bits2[0] & SYM_BITS2_RESERVED_LITTLE);
+      intern->index       = ((ext->s_bits2[0] & SYM_BITS2_INDEX_LITTLE)
+					     >> SYM_BITS2_INDEX_SH_LITTLE)
+			  | (ext->s_bits3[0] << SYM_BITS3_INDEX_SH_LEFT_LITTLE)
+			  | ((unsigned int) ext->s_bits4[0]
+			     << SYM_BITS4_INDEX_SH_LEFT_LITTLE);
+    }
+
+#ifdef TEST
+  if (memcmp ((char *) ext, (char *) intern, sizeof (*intern)) != 0)
+    abort ();
+#endif
+}
+
+/* Swap out a symbol record.  */
+
+static void
+ecoff_swap_sym_out (bfd *abfd, const SYMR *intern_copy, void * ext_ptr)
+{
+  struct sym_ext *ext = (struct sym_ext *) ext_ptr;
+  SYMR intern[1];
+
+  /* Make it reasonable to do in-place.  */
+  *intern = *intern_copy;
+
+  H_PUT_32 (abfd, intern->iss, ext->s_iss);
+  ECOFF_PUT_OFF (abfd, intern->value, ext->s_value);
+
+  /* Now the fun stuff...  */
+  if (bfd_header_big_endian (abfd))
+    {
+      ext->s_bits1[0] = (((intern->st << SYM_BITS1_ST_SH_BIG)
+			  & SYM_BITS1_ST_BIG)
+			 | ((intern->sc >> SYM_BITS1_SC_SH_LEFT_BIG)
+			    & SYM_BITS1_SC_BIG));
+      ext->s_bits2[0] = (((intern->sc << SYM_BITS2_SC_SH_BIG)
+			  & SYM_BITS2_SC_BIG)
+			 | (intern->reserved ? SYM_BITS2_RESERVED_BIG : 0)
+			 | ((intern->index >> SYM_BITS2_INDEX_SH_LEFT_BIG)
+			    & SYM_BITS2_INDEX_BIG));
+      ext->s_bits3[0] = (intern->index >> SYM_BITS3_INDEX_SH_LEFT_BIG) & 0xff;
+      ext->s_bits4[0] = (intern->index >> SYM_BITS4_INDEX_SH_LEFT_BIG) & 0xff;
+    }
+  else
+    {
+      ext->s_bits1[0] = (((intern->st << SYM_BITS1_ST_SH_LITTLE)
+			  & SYM_BITS1_ST_LITTLE)
+			 | ((intern->sc << SYM_BITS1_SC_SH_LITTLE)
+			    & SYM_BITS1_SC_LITTLE));
+      ext->s_bits2[0] = (((intern->sc >> SYM_BITS2_SC_SH_LEFT_LITTLE)
+			  & SYM_BITS2_SC_LITTLE)
+			 | (intern->reserved ? SYM_BITS2_RESERVED_LITTLE : 0)
+			 | ((intern->index << SYM_BITS2_INDEX_SH_LITTLE)
+			    & SYM_BITS2_INDEX_LITTLE));
+      ext->s_bits3[0] = (intern->index >> SYM_BITS3_INDEX_SH_LEFT_LITTLE) & 0xff;
+      ext->s_bits4[0] = (intern->index >> SYM_BITS4_INDEX_SH_LEFT_LITTLE) & 0xff;
+    }
+
+#ifdef TEST
+  if (memcmp ((char *) ext, (char *) intern, sizeof (*intern)) != 0)
+    abort ();
+#endif
+}
+
+/* Swap in an external symbol record.  */
+
+static void
+ecoff_swap_ext_in (bfd *abfd, void * ext_copy, EXTR *intern)
+{
+  struct ext_ext ext[1];
+
+  *ext = *(struct ext_ext *) ext_copy;
+
+  /* Now the fun stuff...  */
+  if (bfd_header_big_endian (abfd))
+    {
+      intern->jmptbl      = 0 != (ext->es_bits1[0] & EXT_BITS1_JMPTBL_BIG);
+      intern->cobol_main  = 0 != (ext->es_bits1[0] & EXT_BITS1_COBOL_MAIN_BIG);
+      intern->weakext     = 0 != (ext->es_bits1[0] & EXT_BITS1_WEAKEXT_BIG);
+    }
+  else
+    {
+      intern->jmptbl      = 0 != (ext->es_bits1[0] & EXT_BITS1_JMPTBL_LITTLE);
+      intern->cobol_main  = 0 != (ext->es_bits1[0] & EXT_BITS1_COBOL_MAIN_LITTLE);
+      intern->weakext     = 0 != (ext->es_bits1[0] & EXT_BITS1_WEAKEXT_LITTLE);
+    }
+  intern->reserved = 0;
+
+#if defined (ECOFF_32) || defined (ECOFF_SIGNED_32)
+  intern->ifd = H_GET_S16 (abfd, ext->es_ifd);
+#endif
+#if defined (ECOFF_64) || defined (ECOFF_SIGNED_64)
+  intern->ifd = H_GET_S32 (abfd, ext->es_ifd);
+#endif
+
+  ecoff_swap_sym_in (abfd, &ext->es_asym, &intern->asym);
+
+#ifdef TEST
+  if (memcmp ((char *) ext, (char *) intern, sizeof (*intern)) != 0)
+    abort ();
+#endif
+}
+
+/* Swap out an external symbol record.  */
+
+static void
+ecoff_swap_ext_out (bfd *abfd, const EXTR *intern_copy, void * ext_ptr)
+{
+  struct ext_ext *ext = (struct ext_ext *) ext_ptr;
+  EXTR intern[1];
+
+  /* Make it reasonable to do in-place.  */
+  *intern = *intern_copy;
+
+  /* Now the fun stuff...  */
+  if (bfd_header_big_endian (abfd))
+    {
+      ext->es_bits1[0] = ((intern->jmptbl ? EXT_BITS1_JMPTBL_BIG : 0)
+			  | (intern->cobol_main ? EXT_BITS1_COBOL_MAIN_BIG : 0)
+			  | (intern->weakext ? EXT_BITS1_WEAKEXT_BIG : 0));
+      ext->es_bits2[0] = 0;
+#if defined (ECOFF_64) || defined (ECOFF_SIGNED_64)
+      ext->es_bits2[1] = 0;
+      ext->es_bits2[2] = 0;
+#endif
+    }
+  else
+    {
+      ext->es_bits1[0] = ((intern->jmptbl ? EXT_BITS1_JMPTBL_LITTLE : 0)
+			  | (intern->cobol_main ? EXT_BITS1_COBOL_MAIN_LITTLE : 0)
+			  | (intern->weakext ? EXT_BITS1_WEAKEXT_LITTLE : 0));
+      ext->es_bits2[0] = 0;
+#if defined (ECOFF_64) || defined (ECOFF_SIGNED_64)
+      ext->es_bits2[1] = 0;
+      ext->es_bits2[2] = 0;
+#endif
+    }
+
+#if defined (ECOFF_32) || defined (ECOFF_SIGNED_32)
+  H_PUT_S16 (abfd, intern->ifd, ext->es_ifd);
+#endif
+#if defined (ECOFF_64) || defined (ECOFF_SIGNED_64)
+  H_PUT_S32 (abfd, intern->ifd, ext->es_ifd);
+#endif
+
+  ecoff_swap_sym_out (abfd, &intern->asym, &ext->es_asym);
+
+#ifdef TEST
+  if (memcmp ((char *) ext, (char *) intern, sizeof (*intern)) != 0)
+    abort ();
+#endif
+}
+
+/* Swap in a relative file descriptor.  */
+
+static void
+ecoff_swap_rfd_in (bfd *abfd, void * ext_ptr, RFDT *intern)
+{
+  struct rfd_ext *ext = (struct rfd_ext *) ext_ptr;
+
+  *intern = H_GET_32 (abfd, ext->rfd);
+
+#ifdef TEST
+  if (memcmp ((char *) ext, (char *) intern, sizeof (*intern)) != 0)
+    abort ();
+#endif
+}
+
+/* Swap out a relative file descriptor.  */
+
+static void
+ecoff_swap_rfd_out (bfd *abfd, const RFDT *intern, void * ext_ptr)
+{
+  struct rfd_ext *ext = (struct rfd_ext *) ext_ptr;
+
+  H_PUT_32 (abfd, *intern, ext->rfd);
+
+#ifdef TEST
+  if (memcmp ((char *) ext, (char *) intern, sizeof (*intern)) != 0)
+    abort ();
+#endif
+}
+
+/* Swap in an optimization symbol.  */
+
+static void
+ecoff_swap_opt_in (bfd *abfd, void * ext_copy, OPTR * intern)
+{
+  struct opt_ext ext[1];
+
+  *ext = *(struct opt_ext *) ext_copy;
+
+  if (bfd_header_big_endian (abfd))
+    {
+      intern->ot = ext->o_bits1[0];
+      intern->value = (((unsigned int) ext->o_bits2[0]
+			<< OPT_BITS2_VALUE_SH_LEFT_BIG)
+		       | ((unsigned int) ext->o_bits3[0]
+			  << OPT_BITS2_VALUE_SH_LEFT_BIG)
+		       | ((unsigned int) ext->o_bits4[0]
+			  << OPT_BITS2_VALUE_SH_LEFT_BIG));
+    }
+  else
+    {
+      intern->ot = ext->o_bits1[0];
+      intern->value = ((ext->o_bits2[0] << OPT_BITS2_VALUE_SH_LEFT_LITTLE)
+		       | (ext->o_bits3[0] << OPT_BITS2_VALUE_SH_LEFT_LITTLE)
+		       | (ext->o_bits4[0] << OPT_BITS2_VALUE_SH_LEFT_LITTLE));
+    }
+
+  _bfd_ecoff_swap_rndx_in (bfd_header_big_endian (abfd),
+			   &ext->o_rndx, &intern->rndx);
+
+  intern->offset = H_GET_32 (abfd, ext->o_offset);
+
+#ifdef TEST
+  if (memcmp ((char *) ext, (char *) intern, sizeof (*intern)) != 0)
+    abort ();
+#endif
+}
+
+/* Swap out an optimization symbol.  */
+
+static void
+ecoff_swap_opt_out (bfd *abfd, const OPTR *intern_copy, void * ext_ptr)
+{
+  struct opt_ext *ext = (struct opt_ext *) ext_ptr;
+  OPTR intern[1];
+
+  /* Make it reasonable to do in-place.  */
+  *intern = *intern_copy;
+
+  if (bfd_header_big_endian (abfd))
+    {
+      ext->o_bits1[0] = intern->ot;
+      ext->o_bits2[0] = intern->value >> OPT_BITS2_VALUE_SH_LEFT_BIG;
+      ext->o_bits3[0] = intern->value >> OPT_BITS3_VALUE_SH_LEFT_BIG;
+      ext->o_bits4[0] = intern->value >> OPT_BITS4_VALUE_SH_LEFT_BIG;
+    }
+  else
+    {
+      ext->o_bits1[0] = intern->ot;
+      ext->o_bits2[0] = intern->value >> OPT_BITS2_VALUE_SH_LEFT_LITTLE;
+      ext->o_bits3[0] = intern->value >> OPT_BITS3_VALUE_SH_LEFT_LITTLE;
+      ext->o_bits4[0] = intern->value >> OPT_BITS4_VALUE_SH_LEFT_LITTLE;
+    }
+
+  _bfd_ecoff_swap_rndx_out (bfd_header_big_endian (abfd),
+			    &intern->rndx, &ext->o_rndx);
+
+  H_PUT_32 (abfd, intern->value, ext->o_offset);
+
+#ifdef TEST
+  if (memcmp ((char *) ext, (char *) intern, sizeof (*intern)) != 0)
+    abort ();
+#endif
+}
+
+/* Swap in a dense number.  */
+
+static void
+ecoff_swap_dnr_in (bfd *abfd, void * ext_copy, DNR *intern)
+{
+  struct dnr_ext ext[1];
+
+  *ext = *(struct dnr_ext *) ext_copy;
+
+  intern->rfd = H_GET_32 (abfd, ext->d_rfd);
+  intern->index = H_GET_32 (abfd, ext->d_index);
+
+#ifdef TEST
+  if (memcmp ((char *) ext, (char *) intern, sizeof (*intern)) != 0)
+    abort ();
+#endif
+}
+
+/* Swap out a dense number.  */
+
+static void
+ecoff_swap_dnr_out (bfd *abfd, const DNR *intern_copy, void * ext_ptr)
+{
+  struct dnr_ext *ext = (struct dnr_ext *) ext_ptr;
+  DNR intern[1];
+
+  /* Make it reasonable to do in-place.  */
+  *intern = *intern_copy;
+
+  H_PUT_32 (abfd, intern->rfd, ext->d_rfd);
+  H_PUT_32 (abfd, intern->index, ext->d_index);
+
+#ifdef TEST
+  if (memcmp ((char *) ext, (char *) intern, sizeof (*intern)) != 0)
+    abort ();
+#endif
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf-attrs.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf-attrs.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf-attrs.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf-attrs.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,699 @@
+/* ELF attributes support (based on ARM EABI attributes).
+   Copyright 2005, 2006, 2007, 2009, 2010
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libiberty.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+
+/* Return the number of bytes needed by I in uleb128 format.  */
+static int
+uleb128_size (unsigned int i)
+{
+  int size;
+  size = 1;
+  while (i >= 0x80)
+    {
+      i >>= 7;
+      size++;
+    }
+  return size;
+}
+
+/* Return TRUE if the attribute has the default value (0/"").  */
+static bfd_boolean
+is_default_attr (obj_attribute *attr)
+{
+  if (ATTR_TYPE_HAS_INT_VAL (attr->type) && attr->i != 0)
+    return FALSE;
+  if (ATTR_TYPE_HAS_STR_VAL (attr->type) && attr->s && *attr->s)
+    return FALSE;
+  if (ATTR_TYPE_HAS_NO_DEFAULT (attr->type))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Return the size of a single attribute.  */
+static bfd_vma
+obj_attr_size (int tag, obj_attribute *attr)
+{
+  bfd_vma size;
+
+  if (is_default_attr (attr))
+    return 0;
+
+  size = uleb128_size (tag);
+  if (ATTR_TYPE_HAS_INT_VAL (attr->type))
+    size += uleb128_size (attr->i);
+  if (ATTR_TYPE_HAS_STR_VAL (attr->type))
+    size += strlen ((char *)attr->s) + 1;
+  return size;
+}
+
+/* Return the vendor name for a given object attributes section.  */
+static const char *
+vendor_obj_attr_name (bfd *abfd, int vendor)
+{
+  return (vendor == OBJ_ATTR_PROC
+	  ? get_elf_backend_data (abfd)->obj_attrs_vendor
+	  : "gnu");
+}
+
+/* Return the size of the object attributes section for VENDOR
+   (OBJ_ATTR_PROC or OBJ_ATTR_GNU), or 0 if there are no attributes
+   for that vendor to record and the vendor is OBJ_ATTR_GNU.  */
+static bfd_vma
+vendor_obj_attr_size (bfd *abfd, int vendor)
+{
+  bfd_vma size;
+  obj_attribute *attr;
+  obj_attribute_list *list;
+  int i;
+  const char *vendor_name = vendor_obj_attr_name (abfd, vendor);
+
+  if (!vendor_name)
+    return 0;
+
+  attr = elf_known_obj_attributes (abfd)[vendor];
+  size = 0;
+  for (i = LEAST_KNOWN_OBJ_ATTRIBUTE; i < NUM_KNOWN_OBJ_ATTRIBUTES; i++)
+    size += obj_attr_size (i, &attr[i]);
+
+  for (list = elf_other_obj_attributes (abfd)[vendor];
+       list;
+       list = list->next)
+    size += obj_attr_size (list->tag, &list->attr);
+
+  /* <size> <vendor_name> NUL 0x1 <size> */
+  return ((size || vendor == OBJ_ATTR_PROC)
+	  ? size + 10 + strlen (vendor_name)
+	  : 0);
+}
+
+/* Return the size of the object attributes section.  */
+bfd_vma
+bfd_elf_obj_attr_size (bfd *abfd)
+{
+  bfd_vma size;
+
+  size = vendor_obj_attr_size (abfd, OBJ_ATTR_PROC);
+  size += vendor_obj_attr_size (abfd, OBJ_ATTR_GNU);
+
+  /* 'A' <sections for each vendor> */
+  return (size ? size + 1 : 0);
+}
+
+/* Write VAL in uleb128 format to P, returning a pointer to the
+   following byte.  */
+static bfd_byte *
+write_uleb128 (bfd_byte *p, unsigned int val)
+{
+  bfd_byte c;
+  do
+    {
+      c = val & 0x7f;
+      val >>= 7;
+      if (val)
+	c |= 0x80;
+      *(p++) = c;
+    }
+  while (val);
+  return p;
+}
+
+/* Write attribute ATTR to butter P, and return a pointer to the following
+   byte.  */
+static bfd_byte *
+write_obj_attribute (bfd_byte *p, int tag, obj_attribute *attr)
+{
+  /* Suppress default entries.  */
+  if (is_default_attr (attr))
+    return p;
+
+  p = write_uleb128 (p, tag);
+  if (ATTR_TYPE_HAS_INT_VAL (attr->type))
+    p = write_uleb128 (p, attr->i);
+  if (ATTR_TYPE_HAS_STR_VAL (attr->type))
+    {
+      int len;
+
+      len = strlen (attr->s) + 1;
+      memcpy (p, attr->s, len);
+      p += len;
+    }
+
+  return p;
+}
+
+/* Write the contents of the object attributes section (length SIZE)
+   for VENDOR to CONTENTS.  */
+static void
+vendor_set_obj_attr_contents (bfd *abfd, bfd_byte *contents, bfd_vma size,
+			      int vendor)
+{
+  bfd_byte *p;
+  obj_attribute *attr;
+  obj_attribute_list *list;
+  int i;
+  const char *vendor_name = vendor_obj_attr_name (abfd, vendor);
+  size_t vendor_length = strlen (vendor_name) + 1;
+
+  p = contents;
+  bfd_put_32 (abfd, size, p);
+  p += 4;
+  memcpy (p, vendor_name, vendor_length);
+  p += vendor_length;
+  *(p++) = Tag_File;
+  bfd_put_32 (abfd, size - 4 - vendor_length, p);
+  p += 4;
+
+  attr = elf_known_obj_attributes (abfd)[vendor];
+  for (i = LEAST_KNOWN_OBJ_ATTRIBUTE; i < NUM_KNOWN_OBJ_ATTRIBUTES; i++)
+    {
+      int tag = i;
+      if (get_elf_backend_data (abfd)->obj_attrs_order)
+	tag = get_elf_backend_data (abfd)->obj_attrs_order (i);
+      p = write_obj_attribute (p, tag, &attr[tag]);
+    }
+
+  for (list = elf_other_obj_attributes (abfd)[vendor];
+       list;
+       list = list->next)
+    p = write_obj_attribute (p, list->tag, &list->attr);
+}
+
+/* Write the contents of the object attributes section to CONTENTS.  */
+void
+bfd_elf_set_obj_attr_contents (bfd *abfd, bfd_byte *contents, bfd_vma size)
+{
+  bfd_byte *p;
+  int vendor;
+  bfd_vma my_size;
+
+  p = contents;
+  *(p++) = 'A';
+  my_size = 1;
+  for (vendor = OBJ_ATTR_FIRST; vendor <= OBJ_ATTR_LAST; vendor++)
+    {
+      bfd_vma vendor_size = vendor_obj_attr_size (abfd, vendor);
+      if (vendor_size)
+	vendor_set_obj_attr_contents (abfd, p, vendor_size, vendor);
+      p += vendor_size;
+      my_size += vendor_size;
+    }
+
+  if (size != my_size)
+    abort ();
+}
+
+/* Allocate/find an object attribute.  */
+static obj_attribute *
+elf_new_obj_attr (bfd *abfd, int vendor, int tag)
+{
+  obj_attribute *attr;
+  obj_attribute_list *list;
+  obj_attribute_list *p;
+  obj_attribute_list **lastp;
+
+
+  if (tag < NUM_KNOWN_OBJ_ATTRIBUTES)
+    {
+      /* Known tags are preallocated.  */
+      attr = &elf_known_obj_attributes (abfd)[vendor][tag];
+    }
+  else
+    {
+      /* Create a new tag.  */
+      list = (obj_attribute_list *)
+	bfd_alloc (abfd, sizeof (obj_attribute_list));
+      memset (list, 0, sizeof (obj_attribute_list));
+      list->tag = tag;
+      /* Keep the tag list in order.  */
+      lastp = &elf_other_obj_attributes (abfd)[vendor];
+      for (p = *lastp; p; p = p->next)
+	{
+	  if (tag < p->tag)
+	    break;
+	  lastp = &p->next;
+	}
+      list->next = *lastp;
+      *lastp = list;
+      attr = &list->attr;
+    }
+
+  return attr;
+}
+
+/* Return the value of an integer object attribute.  */
+int
+bfd_elf_get_obj_attr_int (bfd *abfd, int vendor, int tag)
+{
+  obj_attribute_list *p;
+
+  if (tag < NUM_KNOWN_OBJ_ATTRIBUTES)
+    {
+      /* Known tags are preallocated.  */
+      return elf_known_obj_attributes (abfd)[vendor][tag].i;
+    }
+  else
+    {
+      for (p = elf_other_obj_attributes (abfd)[vendor];
+	   p;
+	   p = p->next)
+	{
+	  if (tag == p->tag)
+	    return p->attr.i;
+	  if (tag < p->tag)
+	    break;
+	}
+      return 0;
+    }
+}
+
+/* Add an integer object attribute.  */
+void
+bfd_elf_add_obj_attr_int (bfd *abfd, int vendor, int tag, unsigned int i)
+{
+  obj_attribute *attr;
+
+  attr = elf_new_obj_attr (abfd, vendor, tag);
+  attr->type = _bfd_elf_obj_attrs_arg_type (abfd, vendor, tag);
+  attr->i = i;
+}
+
+/* Duplicate an object attribute string value.  */
+char *
+_bfd_elf_attr_strdup (bfd *abfd, const char * s)
+{
+  char * p;
+  int len;
+
+  len = strlen (s) + 1;
+  p = (char *) bfd_alloc (abfd, len);
+  return (char *) memcpy (p, s, len);
+}
+
+/* Add a string object attribute.  */
+void
+bfd_elf_add_obj_attr_string (bfd *abfd, int vendor, int tag, const char *s)
+{
+  obj_attribute *attr;
+
+  attr = elf_new_obj_attr (abfd, vendor, tag);
+  attr->type = _bfd_elf_obj_attrs_arg_type (abfd, vendor, tag);
+  attr->s = _bfd_elf_attr_strdup (abfd, s);
+}
+
+/* Add a int+string object attribute.  */
+void
+bfd_elf_add_obj_attr_int_string (bfd *abfd, int vendor, int tag,
+				 unsigned int i, const char *s)
+{
+  obj_attribute *attr;
+
+  attr = elf_new_obj_attr (abfd, vendor, tag);
+  attr->type = _bfd_elf_obj_attrs_arg_type (abfd, vendor, tag);
+  attr->i = i;
+  attr->s = _bfd_elf_attr_strdup (abfd, s);
+}
+
+/* Copy the object attributes from IBFD to OBFD.  */
+void
+_bfd_elf_copy_obj_attributes (bfd *ibfd, bfd *obfd)
+{
+  obj_attribute *in_attr;
+  obj_attribute *out_attr;
+  obj_attribute_list *list;
+  int i;
+  int vendor;
+
+  for (vendor = OBJ_ATTR_FIRST; vendor <= OBJ_ATTR_LAST; vendor++)
+    {
+      in_attr
+	= &elf_known_obj_attributes (ibfd)[vendor][LEAST_KNOWN_OBJ_ATTRIBUTE];
+      out_attr
+	= &elf_known_obj_attributes (obfd)[vendor][LEAST_KNOWN_OBJ_ATTRIBUTE];
+      for (i = LEAST_KNOWN_OBJ_ATTRIBUTE; i < NUM_KNOWN_OBJ_ATTRIBUTES; i++)
+	{
+	  out_attr->type = in_attr->type;
+	  out_attr->i = in_attr->i;
+	  if (in_attr->s && *in_attr->s)
+	    out_attr->s = _bfd_elf_attr_strdup (obfd, in_attr->s);
+	  in_attr++;
+	  out_attr++;
+	}
+
+      for (list = elf_other_obj_attributes (ibfd)[vendor];
+	   list;
+	   list = list->next)
+	{
+	  in_attr = &list->attr;
+	  switch (in_attr->type & (ATTR_TYPE_FLAG_INT_VAL | ATTR_TYPE_FLAG_STR_VAL))
+	    {
+	    case ATTR_TYPE_FLAG_INT_VAL:
+	      bfd_elf_add_obj_attr_int (obfd, vendor, list->tag, in_attr->i);
+	      break;
+	    case ATTR_TYPE_FLAG_STR_VAL:
+	      bfd_elf_add_obj_attr_string (obfd, vendor, list->tag,
+					   in_attr->s);
+	      break;
+	    case ATTR_TYPE_FLAG_INT_VAL | ATTR_TYPE_FLAG_STR_VAL:
+	      bfd_elf_add_obj_attr_int_string (obfd, vendor, list->tag,
+					       in_attr->i, in_attr->s);
+	      break;
+	    default:
+	      abort ();
+	    }
+	}
+    }
+}
+
+/* Determine whether a GNU object attribute tag takes an integer, a
+   string or both.  */
+static int
+gnu_obj_attrs_arg_type (int tag)
+{
+  /* Except for Tag_compatibility, for GNU attributes we follow the
+     same rule ARM ones > 32 follow: odd-numbered tags take strings
+     and even-numbered tags take integers.  In addition, tag & 2 is
+     nonzero for architecture-independent tags and zero for
+     architecture-dependent ones.  */
+  if (tag == Tag_compatibility)
+    return 3;
+  else
+    return (tag & 1) != 0 ? 2 : 1;
+}
+
+/* Determine what arguments an attribute tag takes.  */
+int
+_bfd_elf_obj_attrs_arg_type (bfd *abfd, int vendor, int tag)
+{
+  switch (vendor)
+    {
+    case OBJ_ATTR_PROC:
+      return get_elf_backend_data (abfd)->obj_attrs_arg_type (tag);
+      break;
+    case OBJ_ATTR_GNU:
+      return gnu_obj_attrs_arg_type (tag);
+      break;
+    default:
+      abort ();
+    }
+}
+
+/* Parse an object attributes section.  */
+void
+_bfd_elf_parse_attributes (bfd *abfd, Elf_Internal_Shdr * hdr)
+{
+  bfd_byte *contents;
+  bfd_byte *p;
+  bfd_vma len;
+  const char *std_section;
+
+  contents = (bfd_byte *) bfd_malloc (hdr->sh_size);
+  if (!contents)
+    return;
+  if (!bfd_get_section_contents (abfd, hdr->bfd_section, contents, 0,
+				 hdr->sh_size))
+    {
+      free (contents);
+      return;
+    }
+  p = contents;
+  std_section = get_elf_backend_data (abfd)->obj_attrs_vendor;
+  if (*(p++) == 'A')
+    {
+      len = hdr->sh_size - 1;
+      while (len > 0)
+	{
+	  int namelen;
+	  bfd_vma section_len;
+	  int vendor;
+
+	  section_len = bfd_get_32 (abfd, p);
+	  p += 4;
+	  if (section_len > len)
+	    section_len = len;
+	  len -= section_len;
+	  namelen = strlen ((char *)p) + 1;
+	  section_len -= namelen + 4;
+	  if (std_section && strcmp ((char *)p, std_section) == 0)
+	    vendor = OBJ_ATTR_PROC;
+	  else if (strcmp ((char *)p, "gnu") == 0)
+	    vendor = OBJ_ATTR_GNU;
+	  else
+	    {
+	      /* Other vendor section.  Ignore it.  */
+	      p += namelen + section_len;
+	      continue;
+	    }
+
+	  p += namelen;
+	  while (section_len > 0)
+	    {
+	      int tag;
+	      unsigned int n;
+	      unsigned int val;
+	      bfd_vma subsection_len;
+	      bfd_byte *end;
+
+	      tag = read_unsigned_leb128 (abfd, p, &n);
+	      p += n;
+	      subsection_len = bfd_get_32 (abfd, p);
+	      p += 4;
+	      if (subsection_len > section_len)
+		subsection_len = section_len;
+	      section_len -= subsection_len;
+	      subsection_len -= n + 4;
+	      end = p + subsection_len;
+	      switch (tag)
+		{
+		case Tag_File:
+		  while (p < end)
+		    {
+		      int type;
+
+		      tag = read_unsigned_leb128 (abfd, p, &n);
+		      p += n;
+		      type = _bfd_elf_obj_attrs_arg_type (abfd, vendor, tag);
+		      switch (type & (ATTR_TYPE_FLAG_INT_VAL | ATTR_TYPE_FLAG_STR_VAL))
+			{
+			case ATTR_TYPE_FLAG_INT_VAL | ATTR_TYPE_FLAG_STR_VAL:
+			  val = read_unsigned_leb128 (abfd, p, &n);
+			  p += n;
+			  bfd_elf_add_obj_attr_int_string (abfd, vendor, tag,
+							   val, (char *)p);
+			  p += strlen ((char *)p) + 1;
+			  break;
+			case ATTR_TYPE_FLAG_STR_VAL:
+			  bfd_elf_add_obj_attr_string (abfd, vendor, tag,
+						       (char *)p);
+			  p += strlen ((char *)p) + 1;
+			  break;
+			case ATTR_TYPE_FLAG_INT_VAL:
+			  val = read_unsigned_leb128 (abfd, p, &n);
+			  p += n;
+			  bfd_elf_add_obj_attr_int (abfd, vendor, tag, val);
+			  break;
+			default:
+			  abort ();
+			}
+		    }
+		  break;
+		case Tag_Section:
+		case Tag_Symbol:
+		  /* Don't have anywhere convenient to attach these.
+		     Fall through for now.  */
+		default:
+		  /* Ignore things we don't kow about.  */
+		  p += subsection_len;
+		  subsection_len = 0;
+		  break;
+		}
+	    }
+	}
+    }
+  free (contents);
+}
+
+/* Merge common object attributes from IBFD into OBFD.  Raise an error
+   if there are conflicting attributes.  Any processor-specific
+   attributes have already been merged.  This must be called from the
+   bfd_elfNN_bfd_merge_private_bfd_data hook for each individual
+   target, along with any target-specific merging.  Because there are
+   no common attributes other than Tag_compatibility at present, and
+   non-"gnu" Tag_compatibility is not expected in "gnu" sections, this
+   is not presently called for targets without their own
+   attributes.  */
+
+bfd_boolean
+_bfd_elf_merge_object_attributes (bfd *ibfd, bfd *obfd)
+{
+  obj_attribute *in_attr;
+  obj_attribute *out_attr;
+  int vendor;
+
+  /* The only common attribute is currently Tag_compatibility,
+     accepted in both processor and "gnu" sections.  */
+  for (vendor = OBJ_ATTR_FIRST; vendor <= OBJ_ATTR_LAST; vendor++)
+    {
+      /* Handle Tag_compatibility.  The tags are only compatible if the flags
+	 are identical and, if the flags are '1', the strings are identical.
+	 If the flags are non-zero, then we can only use the string "gnu".  */
+      in_attr = &elf_known_obj_attributes (ibfd)[vendor][Tag_compatibility];
+      out_attr = &elf_known_obj_attributes (obfd)[vendor][Tag_compatibility];
+
+      if (in_attr->i > 0 && strcmp (in_attr->s, "gnu") != 0)
+	{
+	  _bfd_error_handler
+		(_("error: %B: Object has vendor-specific contents that "
+		   "must be processed by the '%s' toolchain"),
+		 ibfd, in_attr->s);
+	  return FALSE;
+	}
+
+      if (in_attr->i != out_attr->i
+	  || (in_attr->i != 0 && strcmp (in_attr->s, out_attr->s) != 0))
+	{
+	  _bfd_error_handler (_("error: %B: Object tag '%d, %s' is "
+				"incompatible with tag '%d, %s'"),
+			      ibfd,
+			      in_attr->i, in_attr->s ? in_attr->s : "",
+			      out_attr->i, out_attr->s ? out_attr->s : "");
+	  return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Merge an unknown processor-specific attribute TAG, within the range
+   of known attributes, from IBFD into OBFD; return TRUE if the link
+   is OK, FALSE if it must fail.  */
+
+bfd_boolean
+_bfd_elf_merge_unknown_attribute_low (bfd *ibfd, bfd *obfd, int tag)
+{
+  obj_attribute *in_attr;
+  obj_attribute *out_attr;
+  bfd *err_bfd = NULL;
+  bfd_boolean result = TRUE;
+
+  in_attr = elf_known_obj_attributes_proc (ibfd);
+  out_attr = elf_known_obj_attributes_proc (obfd);
+
+  if (out_attr[tag].i != 0 || out_attr[tag].s != NULL)
+    err_bfd = obfd;
+  else if (in_attr[tag].i != 0 || in_attr[tag].s != NULL)
+    err_bfd = ibfd;
+
+  if (err_bfd != NULL)
+    result
+      = get_elf_backend_data (err_bfd)->obj_attrs_handle_unknown (err_bfd, tag);
+
+  /* Only pass on attributes that match in both inputs.  */
+  if (in_attr[tag].i != out_attr[tag].i
+      || (in_attr[tag].s == NULL) != (out_attr[tag].s == NULL)
+      || (in_attr[tag].s != NULL && out_attr[tag].s != NULL
+	  && strcmp (in_attr[tag].s, out_attr[tag].s) != 0))
+    {
+      out_attr[tag].i = 0;
+      out_attr[tag].s = NULL;
+    }
+
+  return result;
+}
+
+/* Merge the lists of unknown processor-specific attributes, outside
+   the known range, from IBFD into OBFD; return TRUE if the link is
+   OK, FALSE if it must fail.  */
+
+bfd_boolean
+_bfd_elf_merge_unknown_attribute_list (bfd *ibfd, bfd *obfd)
+{
+  obj_attribute_list *in_list;
+  obj_attribute_list *out_list;
+  obj_attribute_list **out_listp;
+  bfd_boolean result = TRUE;
+
+  in_list = elf_other_obj_attributes_proc (ibfd);
+  out_listp = &elf_other_obj_attributes_proc (obfd);
+  out_list = *out_listp;
+
+  for (; in_list || out_list; )
+    {
+      bfd *err_bfd = NULL;
+      int err_tag = 0;
+
+      /* The tags for each list are in numerical order.  */
+      /* If the tags are equal, then merge.  */
+      if (out_list && (!in_list || in_list->tag > out_list->tag))
+	{
+	  /* This attribute only exists in obfd.  We can't merge, and we don't
+	     know what the tag means, so delete it.  */
+	  err_bfd = obfd;
+	  err_tag = out_list->tag;
+	  *out_listp = out_list->next;
+	  out_list = *out_listp;
+	}
+      else if (in_list && (!out_list || in_list->tag < out_list->tag))
+	{
+	  /* This attribute only exists in ibfd. We can't merge, and we don't
+	     know what the tag means, so ignore it.  */
+	  err_bfd = ibfd;
+	  err_tag = in_list->tag;
+	  in_list = in_list->next;
+	}
+      else /* The tags are equal.  */
+	{
+	  /* As present, all attributes in the list are unknown, and
+	     therefore can't be merged meaningfully.  */
+	  err_bfd = obfd;
+	  err_tag = out_list->tag;
+
+	  /*  Only pass on attributes that match in both inputs.  */
+	  if (in_list->attr.i != out_list->attr.i
+	      || (in_list->attr.s == NULL) != (out_list->attr.s == NULL)
+	      || (in_list->attr.s && out_list->attr.s
+		  && strcmp (in_list->attr.s, out_list->attr.s) != 0))
+	    {
+	      /* No match.  Delete the attribute.  */
+	      *out_listp = out_list->next;
+	      out_list = *out_listp;
+	    }
+	  else
+	    {
+	      /* Matched.  Keep the attribute and move to the next.  */
+	      out_list = out_list->next;
+	      in_list = in_list->next;
+	    }
+	}
+
+      if (err_bfd)
+	result = result
+	  && get_elf_backend_data (err_bfd)->obj_attrs_handle_unknown (err_bfd,
+								       err_tag);
+    }
+
+  return result;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf-bfd.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf-bfd.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf-bfd.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf-bfd.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2443 @@
+/* BFD back-end data structures for ELF files.
+   Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _LIBELF_H_
+#define _LIBELF_H_ 1
+
+#include "elf/common.h"
+#include "elf/external.h"
+#include "elf/internal.h"
+#include "bfdlink.h"
+
+/* The number of entries in a section is its size divided by the size
+   of a single entry.  This is normally only applicable to reloc and
+   symbol table sections.
+   PR 9934: It is possible to have relocations that do not refer to
+   symbols, thus it is also possible to have a relocation section in
+   an object file, but no symbol table.  */
+#define NUM_SHDR_ENTRIES(shdr) ((shdr)->sh_entsize > 0 ? (shdr)->sh_size / (shdr)->sh_entsize : 0)
+
+/* If size isn't specified as 64 or 32, NAME macro should fail.  */
+#ifndef NAME
+#if ARCH_SIZE == 64
+#define NAME(x, y) x ## 64 ## _ ## y
+#endif
+#if ARCH_SIZE == 32
+#define NAME(x, y) x ## 32 ## _ ## y
+#endif
+#endif
+
+#ifndef NAME
+#define NAME(x, y) x ## NOSIZE ## _ ## y
+#endif
+
+#define ElfNAME(X)	NAME(Elf,X)
+#define elfNAME(X)	NAME(elf,X)
+
+/* Information held for an ELF symbol.  The first field is the
+   corresponding asymbol.  Every symbol is an ELF file is actually a
+   pointer to this structure, although it is often handled as a
+   pointer to an asymbol.  */
+
+typedef struct
+{
+  /* The BFD symbol.  */
+  asymbol symbol;
+  /* ELF symbol information.  */
+  Elf_Internal_Sym internal_elf_sym;
+  /* Backend specific information.  */
+  union
+    {
+      unsigned int hppa_arg_reloc;
+      void *mips_extr;
+      void *any;
+    }
+  tc_data;
+
+  /* Version information.  This is from an Elf_Internal_Versym
+     structure in a SHT_GNU_versym section.  It is zero if there is no
+     version information.  */
+  unsigned short version;
+
+} elf_symbol_type;
+
+struct elf_strtab_hash;
+struct got_entry;
+struct plt_entry;
+
+union gotplt_union
+  {
+    bfd_signed_vma refcount;
+    bfd_vma offset;
+    struct got_entry *glist;
+    struct plt_entry *plist;
+  };
+
+struct elf_link_virtual_table_entry
+  {
+    /* Virtual table entry use information.  This array is nominally of size
+       size/sizeof(target_void_pointer), though we have to be able to assume
+       and track a size while the symbol is still undefined.  It is indexed
+       via offset/sizeof(target_void_pointer).  */
+    size_t size;
+    bfd_boolean *used;
+
+    /* Virtual table derivation info.  */
+    struct elf_link_hash_entry *parent;
+  };
+
+/* ELF linker hash table entries.  */
+
+struct elf_link_hash_entry
+{
+  struct bfd_link_hash_entry root;
+
+  /* Symbol index in output file.  This is initialized to -1.  It is
+     set to -2 if the symbol is used by a reloc.  */
+  long indx;
+
+  /* Symbol index as a dynamic symbol.  Initialized to -1, and remains
+     -1 if this is not a dynamic symbol.  */
+  /* ??? Note that this is consistently used as a synonym for tests
+     against whether we can perform various simplifying transformations
+     to the code.  (E.g. changing a pc-relative jump to a PLT entry
+     into a pc-relative jump to the target function.)  That test, which
+     is often relatively complex, and someplaces wrong or incomplete,
+     should really be replaced by a predicate in elflink.c.
+
+     End result: this field -1 does not indicate that the symbol is
+     not in the dynamic symbol table, but rather that the symbol is
+     not visible outside this DSO.  */
+  long dynindx;
+
+  /* If this symbol requires an entry in the global offset table, the
+     processor specific backend uses this field to track usage and
+     final offset.  Two schemes are supported:  The first assumes that
+     a symbol may only have one GOT entry, and uses REFCOUNT until
+     size_dynamic_sections, at which point the contents of the .got is
+     fixed.  Afterward, if OFFSET is -1, then the symbol does not
+     require a global offset table entry.  The second scheme allows
+     multiple GOT entries per symbol, managed via a linked list
+     pointed to by GLIST.  */
+  union gotplt_union got;
+
+  /* Same, but tracks a procedure linkage table entry.  */
+  union gotplt_union plt;
+
+  /* Symbol size.  */
+  bfd_size_type size;
+
+  /* Symbol type (STT_NOTYPE, STT_OBJECT, etc.).  */
+  unsigned int type : 8;
+
+  /* Symbol st_other value, symbol visibility.  */
+  unsigned int other : 8;
+
+  /* The symbol's st_target_internal value (see Elf_Internal_Sym).  */
+  unsigned int target_internal : 8;
+
+  /* Symbol is referenced by a non-shared object (other than the object
+     in which it is defined).  */
+  unsigned int ref_regular : 1;
+  /* Symbol is defined by a non-shared object.  */
+  unsigned int def_regular : 1;
+  /* Symbol is referenced by a shared object.  */
+  unsigned int ref_dynamic : 1;
+  /* Symbol is defined by a shared object.  */
+  unsigned int def_dynamic : 1;
+  /* Symbol has a non-weak reference from a non-shared object (other than
+     the object in which it is defined).  */
+  unsigned int ref_regular_nonweak : 1;
+  /* Dynamic symbol has been adjustd.  */
+  unsigned int dynamic_adjusted : 1;
+  /* Symbol needs a copy reloc.  */
+  unsigned int needs_copy : 1;
+  /* Symbol needs a procedure linkage table entry.  */
+  unsigned int needs_plt : 1;
+  /* Symbol appears in a non-ELF input file.  */
+  unsigned int non_elf : 1;
+  /* Symbol should be marked as hidden in the version information.  */
+  unsigned int hidden : 1;
+  /* Symbol was forced to local scope due to a version script file.  */
+  unsigned int forced_local : 1;
+  /* Symbol was forced to be dynamic due to a version script file.  */
+  unsigned int dynamic : 1;
+  /* Symbol was marked during garbage collection.  */
+  unsigned int mark : 1;
+  /* Symbol is referenced by a non-GOT/non-PLT relocation.  This is
+     not currently set by all the backends.  */
+  unsigned int non_got_ref : 1;
+  /* Symbol has a definition in a shared object.
+     FIXME: There is no real need for this field if def_dynamic is never
+     cleared and all places that test def_dynamic also test def_regular.  */
+  unsigned int dynamic_def : 1;
+  /* Symbol is weak in all shared objects.  */
+  unsigned int dynamic_weak : 1;
+  /* Symbol is referenced with a relocation where C/C++ pointer equality
+     matters.  */
+  unsigned int pointer_equality_needed : 1;
+  /* Symbol is a unique global symbol.  */
+  unsigned int unique_global : 1;
+
+  /* String table index in .dynstr if this is a dynamic symbol.  */
+  unsigned long dynstr_index;
+
+  union
+  {
+    /* If this is a weak defined symbol from a dynamic object, this
+       field points to a defined symbol with the same value, if there is
+       one.  Otherwise it is NULL.  */
+    struct elf_link_hash_entry *weakdef;
+
+    /* Hash value of the name computed using the ELF hash function.
+       Used part way through size_dynamic_sections, after we've finished
+       with weakdefs.  */
+    unsigned long elf_hash_value;
+  } u;
+
+  /* Version information.  */
+  union
+  {
+    /* This field is used for a symbol which is not defined in a
+       regular object.  It points to the version information read in
+       from the dynamic object.  */
+    Elf_Internal_Verdef *verdef;
+    /* This field is used for a symbol which is defined in a regular
+       object.  It is set up in size_dynamic_sections.  It points to
+       the version information we should write out for this symbol.  */
+    struct bfd_elf_version_tree *vertree;
+  } verinfo;
+
+  struct elf_link_virtual_table_entry *vtable;
+};
+
+/* Will references to this symbol always reference the symbol
+   in this object?  */
+#define SYMBOL_REFERENCES_LOCAL(INFO, H) \
+  _bfd_elf_symbol_refs_local_p (H, INFO, 0)
+
+/* Will _calls_ to this symbol always call the version in this object?  */
+#define SYMBOL_CALLS_LOCAL(INFO, H) \
+  _bfd_elf_symbol_refs_local_p (H, INFO, 1)
+
+/* Common symbols that are turned into definitions don't have the
+   DEF_REGULAR flag set, so they might appear to be undefined.  */
+#define ELF_COMMON_DEF_P(H) \
+  (!(H)->def_regular							\
+   && !(H)->def_dynamic							\
+   && (H)->root.type == bfd_link_hash_defined)
+
+/* Records local symbols to be emitted in the dynamic symbol table.  */
+
+struct elf_link_local_dynamic_entry
+{
+  struct elf_link_local_dynamic_entry *next;
+
+  /* The input bfd this symbol came from.  */
+  bfd *input_bfd;
+
+  /* The index of the local symbol being copied.  */
+  long input_indx;
+
+  /* The index in the outgoing dynamic symbol table.  */
+  long dynindx;
+
+  /* A copy of the input symbol.  */
+  Elf_Internal_Sym isym;
+};
+
+struct elf_link_loaded_list
+{
+  struct elf_link_loaded_list *next;
+  bfd *abfd;
+};
+
+/* Structures used by the eh_frame optimization code.  */
+struct eh_cie_fde
+{
+  union {
+    struct {
+      /* If REMOVED == 1, this is the CIE that the FDE originally used.
+	 The CIE belongs to the same .eh_frame input section as the FDE.
+
+	 If REMOVED == 0, this is the CIE that we have chosen to use for
+	 the output FDE.  The CIE's REMOVED field is also 0, but the CIE
+	 might belong to a different .eh_frame input section from the FDE.  */
+      struct eh_cie_fde *cie_inf;
+      struct eh_cie_fde *next_for_section;
+    } fde;
+    struct {
+      /* CIEs have three states:
+
+	 - REMOVED && !MERGED: Slated for removal because we haven't yet
+	   proven that an FDE needs it.  FULL_CIE, if nonnull, points to
+	   more detailed information about the CIE.
+
+	 - REMOVED && MERGED: We have merged this CIE with MERGED_WITH,
+	   which may not belong to the same input section.
+
+	 - !REMOVED: We have decided to keep this CIE.  SEC is the
+	   .eh_frame input section that contains the CIE.  */
+      union {
+	struct cie *full_cie;
+ 	struct eh_cie_fde *merged_with;
+ 	asection *sec;
+      } u;
+
+      /* The offset of the personality data from the start of the CIE,
+	 or 0 if the CIE doesn't have any.  */
+      unsigned int personality_offset : 8;
+
+      /* True if we have marked relocations associated with this CIE.  */
+      unsigned int gc_mark : 1;
+
+      /* True if we have decided to turn an absolute LSDA encoding into
+	 a PC-relative one.  */
+      unsigned int make_lsda_relative : 1;
+
+      /* True if we have decided to turn an absolute personality
+	 encoding into a PC-relative one.  */
+      unsigned int make_per_encoding_relative : 1;
+
+      /* True if the CIE contains personality data and if that
+	 data uses a PC-relative encoding.  Always true when
+	 make_per_encoding_relative is.  */
+      unsigned int per_encoding_relative : 1;
+
+      /* True if we need to add an 'R' (FDE encoding) entry to the
+	 CIE's augmentation data.  */
+      unsigned int add_fde_encoding : 1;
+
+      /* True if we have merged this CIE with another.  */
+      unsigned int merged : 1;
+
+      /* Unused bits.  */
+      unsigned int pad1 : 18;
+    } cie;
+  } u;
+  unsigned int reloc_index;
+  unsigned int size;
+  unsigned int offset;
+  unsigned int new_offset;
+  unsigned int fde_encoding : 8;
+  unsigned int lsda_encoding : 8;
+  unsigned int lsda_offset : 8;
+
+  /* True if this entry represents a CIE, false if it represents an FDE.  */
+  unsigned int cie : 1;
+
+  /* True if this entry is currently marked for removal.  */
+  unsigned int removed : 1;
+
+  /* True if we need to add a 'z' (augmentation size) entry to the CIE's
+     augmentation data, and an associated byte to each of the CIE's FDEs.  */
+  unsigned int add_augmentation_size : 1;
+
+  /* True if we have decided to convert absolute FDE relocations into
+     relative ones.  This applies to the first relocation in the FDE,
+     which is against the code that the FDE describes.  */
+  unsigned int make_relative : 1;
+
+  /* Unused bits.  */
+  unsigned int pad1 : 4;
+
+  unsigned int *set_loc;
+};
+
+struct eh_frame_sec_info
+{
+  unsigned int count;
+  struct cie *cies;
+  struct eh_cie_fde entry[1];
+};
+
+struct eh_frame_array_ent
+{
+  bfd_vma initial_loc;
+  bfd_vma fde;
+};
+
+struct htab;
+
+struct eh_frame_hdr_info
+{
+  struct htab *cies;
+  asection *hdr_sec;
+  unsigned int fde_count, array_count;
+  struct eh_frame_array_ent *array;
+  /* TRUE if we should try to merge CIEs between input sections.  */
+  bfd_boolean merge_cies;
+  /* TRUE if all .eh_frames have been parsd.  */
+  bfd_boolean parsed_eh_frames;
+  /* TRUE if .eh_frame_hdr should contain the sorted search table.
+     We build it if we successfully read all .eh_frame input sections
+     and recognize them.  */
+  bfd_boolean table;
+};
+
+/* Enum used to identify target specific extensions to the elf_obj_tdata
+   and elf_link_hash_table structures.  Note the enums deliberately start
+   from 1 so that we can detect an uninitialized field.  The generic value
+   is last so that additions to this enum do not need to modify more than
+   one line.  */
+enum elf_target_id
+{
+  ALPHA_ELF_DATA = 1,
+  ARM_ELF_DATA,
+  AVR_ELF_DATA,
+  BFIN_ELF_DATA,
+  CRIS_ELF_DATA,
+  FRV_ELF_DATA,
+  HPPA32_ELF_DATA,
+  HPPA64_ELF_DATA,
+  I386_ELF_DATA,
+  IA64_ELF_DATA,
+  LM32_ELF_DATA,
+  M32R_ELF_DATA,
+  M68HC11_ELF_DATA,
+  M68K_ELF_DATA,
+  MICROBLAZE_ELF_DATA,
+  MIPS_ELF_DATA,
+  MN10300_ELF_DATA,
+  PPC32_ELF_DATA,
+  PPC64_ELF_DATA,
+  S390_ELF_DATA,
+  SH_ELF_DATA,
+  SPARC_ELF_DATA,
+  SPU_ELF_DATA,
+  TIC6X_ELF_DATA,
+  X86_64_ELF_DATA,
+  XTENSA_ELF_DATA,
+  TILEGX_ELF_DATA,
+  TILEPRO_ELF_DATA,
+  GENERIC_ELF_DATA
+};
+
+/* ELF linker hash table.  */
+
+struct elf_link_hash_table
+{
+  struct bfd_link_hash_table root;
+
+  /* An identifier used to distinguish different target
+     specific extensions to this structure.  */
+  enum elf_target_id hash_table_id;
+
+  /* Whether we have created the special dynamic sections required
+     when linking against or generating a shared object.  */
+  bfd_boolean dynamic_sections_created;
+
+  /* True if this target has relocatable executables, so needs dynamic
+     section symbols.  */
+  bfd_boolean is_relocatable_executable;
+
+  /* The BFD used to hold special sections created by the linker.
+     This will be the first BFD found which requires these sections to
+     be created.  */
+  bfd *dynobj;
+
+  /* The value to use when initialising got.refcount/offset and
+     plt.refcount/offset in an elf_link_hash_entry.  Set to zero when
+     the values are refcounts.  Set to init_got_offset/init_plt_offset
+     in size_dynamic_sections when the values may be offsets.  */
+  union gotplt_union init_got_refcount;
+  union gotplt_union init_plt_refcount;
+
+  /* The value to use for got.refcount/offset and plt.refcount/offset
+     when the values may be offsets.  Normally (bfd_vma) -1.  */
+  union gotplt_union init_got_offset;
+  union gotplt_union init_plt_offset;
+
+  /* The number of symbols found in the link which must be put into
+     the .dynsym section.  */
+  bfd_size_type dynsymcount;
+
+  /* The string table of dynamic symbols, which becomes the .dynstr
+     section.  */
+  struct elf_strtab_hash *dynstr;
+
+  /* The number of buckets in the hash table in the .hash section.
+     This is based on the number of dynamic symbols.  */
+  bfd_size_type bucketcount;
+
+  /* A linked list of DT_NEEDED names found in dynamic objects
+     included in the link.  */
+  struct bfd_link_needed_list *needed;
+
+  /* Sections in the output bfd that provides a section symbol
+     to be used by relocations emitted against local symbols.
+     Most targets will not use data_index_section.  */
+  asection *text_index_section;
+  asection *data_index_section;
+
+  /* The _GLOBAL_OFFSET_TABLE_ symbol.  */
+  struct elf_link_hash_entry *hgot;
+
+  /* The _PROCEDURE_LINKAGE_TABLE_ symbol.  */
+  struct elf_link_hash_entry *hplt;
+
+  /* A pointer to information used to merge SEC_MERGE sections.  */
+  void *merge_info;
+
+  /* Used to link stabs in sections.  */
+  struct stab_info stab_info;
+
+  /* Used by eh_frame code when editing .eh_frame.  */
+  struct eh_frame_hdr_info eh_info;
+
+  /* A linked list of local symbols to be added to .dynsym.  */
+  struct elf_link_local_dynamic_entry *dynlocal;
+
+  /* A linked list of DT_RPATH/DT_RUNPATH names found in dynamic
+     objects included in the link.  */
+  struct bfd_link_needed_list *runpath;
+
+  /* Cached first output tls section and size of PT_TLS segment.  */
+  asection *tls_sec;
+  bfd_size_type tls_size;
+
+  /* A linked list of BFD's loaded in the link.  */
+  struct elf_link_loaded_list *loaded;
+
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *sgot;
+  asection *sgotplt;
+  asection *srelgot;
+  asection *splt;
+  asection *srelplt;
+  asection *igotplt;
+  asection *iplt;
+  asection *irelplt;
+  asection *irelifunc;
+};
+
+/* Look up an entry in an ELF linker hash table.  */
+
+#define elf_link_hash_lookup(table, string, create, copy, follow)	\
+  ((struct elf_link_hash_entry *)					\
+   bfd_link_hash_lookup (&(table)->root, (string), (create),		\
+			 (copy), (follow)))
+
+/* Traverse an ELF linker hash table.  */
+
+#define elf_link_hash_traverse(table, func, info)			\
+  (bfd_link_hash_traverse						\
+   (&(table)->root,							\
+    (bfd_boolean (*) (struct bfd_link_hash_entry *, void *)) (func),	\
+    (info)))
+
+/* Get the ELF linker hash table from a link_info structure.  */
+
+#define elf_hash_table(p) ((struct elf_link_hash_table *) ((p)->hash))
+
+#define elf_hash_table_id(table)	((table) -> hash_table_id)
+
+/* Returns TRUE if the hash table is a struct elf_link_hash_table.  */
+#define is_elf_hash_table(htab)					      	\
+  (((struct bfd_link_hash_table *) (htab))->type == bfd_link_elf_hash_table)
+
+/* Used by bfd_sym_from_r_symndx to cache a small number of local
+   symbols.  */
+#define LOCAL_SYM_CACHE_SIZE 32
+struct sym_cache
+{
+  bfd *abfd;
+  unsigned long indx[LOCAL_SYM_CACHE_SIZE];
+  Elf_Internal_Sym sym[LOCAL_SYM_CACHE_SIZE];
+};
+
+/* Constant information held for an ELF backend.  */
+
+struct elf_size_info {
+  unsigned char sizeof_ehdr, sizeof_phdr, sizeof_shdr;
+  unsigned char sizeof_rel, sizeof_rela, sizeof_sym, sizeof_dyn, sizeof_note;
+
+  /* The size of entries in the .hash section.  */
+  unsigned char sizeof_hash_entry;
+
+  /* The number of internal relocations to allocate per external
+     relocation entry.  */
+  unsigned char int_rels_per_ext_rel;
+  /* We use some fixed size arrays.  This should be large enough to
+     handle all back-ends.  */
+#define MAX_INT_RELS_PER_EXT_REL 3
+
+  unsigned char arch_size, log_file_align;
+  unsigned char elfclass, ev_current;
+  int (*write_out_phdrs)
+    (bfd *, const Elf_Internal_Phdr *, unsigned int);
+  bfd_boolean
+    (*write_shdrs_and_ehdr) (bfd *);
+  bfd_boolean (*checksum_contents)
+    (bfd * , void (*) (const void *, size_t, void *), void *);
+  void (*write_relocs)
+    (bfd *, asection *, void *);
+  bfd_boolean (*swap_symbol_in)
+    (bfd *, const void *, const void *, Elf_Internal_Sym *);
+  void (*swap_symbol_out)
+    (bfd *, const Elf_Internal_Sym *, void *, void *);
+  bfd_boolean (*slurp_reloc_table)
+    (bfd *, asection *, asymbol **, bfd_boolean);
+  long (*slurp_symbol_table)
+    (bfd *, asymbol **, bfd_boolean);
+  void (*swap_dyn_in)
+    (bfd *, const void *, Elf_Internal_Dyn *);
+  void (*swap_dyn_out)
+    (bfd *, const Elf_Internal_Dyn *, void *);
+
+  /* This function is called to swap in a REL relocation.  If an
+     external relocation corresponds to more than one internal
+     relocation, then all relocations are swapped in at once.  */
+  void (*swap_reloc_in)
+    (bfd *, const bfd_byte *, Elf_Internal_Rela *);
+
+  /* This function is called to swap out a REL relocation.  */
+  void (*swap_reloc_out)
+    (bfd *, const Elf_Internal_Rela *, bfd_byte *);
+
+  /* This function is called to swap in a RELA relocation.  If an
+     external relocation corresponds to more than one internal
+     relocation, then all relocations are swapped in at once.  */
+  void (*swap_reloca_in)
+    (bfd *, const bfd_byte *, Elf_Internal_Rela *);
+
+  /* This function is called to swap out a RELA relocation.  */
+  void (*swap_reloca_out)
+    (bfd *, const Elf_Internal_Rela *, bfd_byte *);
+};
+
+#define elf_symbol_from(ABFD,S) \
+	(((S)->the_bfd->xvec->flavour == bfd_target_elf_flavour \
+	  && (S)->the_bfd->tdata.elf_obj_data != 0) \
+	 ? (elf_symbol_type *) (S) \
+	 : 0)
+
+enum elf_reloc_type_class {
+  reloc_class_normal,
+  reloc_class_relative,
+  reloc_class_plt,
+  reloc_class_copy
+};
+
+struct elf_reloc_cookie
+{
+  Elf_Internal_Rela *rels, *rel, *relend;
+  Elf_Internal_Sym *locsyms;
+  bfd *abfd;
+  size_t locsymcount;
+  size_t extsymoff;
+  struct elf_link_hash_entry **sym_hashes;
+  int r_sym_shift;
+  bfd_boolean bad_symtab;
+};
+
+/* The level of IRIX compatibility we're striving for.  */
+
+typedef enum {
+  ict_none,
+  ict_irix5,
+  ict_irix6
+} irix_compat_t;
+
+/* Mapping of ELF section names and types.  */
+struct bfd_elf_special_section
+{
+  const char *prefix;
+  int prefix_length;
+  /* 0 means name must match PREFIX exactly.
+     -1 means name must start with PREFIX followed by an arbitrary string.
+     -2 means name must match PREFIX exactly or consist of PREFIX followed
+     by a dot then anything.
+     > 0 means name must start with the first PREFIX_LENGTH chars of
+     PREFIX and finish with the last SUFFIX_LENGTH chars of PREFIX.  */
+  int suffix_length;
+  int type;
+  bfd_vma attr;
+};
+
+enum action_discarded
+  {
+    COMPLAIN = 1,
+    PRETEND = 2
+  };
+
+typedef asection * (*elf_gc_mark_hook_fn)
+  (asection *, struct bfd_link_info *, Elf_Internal_Rela *,
+   struct elf_link_hash_entry *, Elf_Internal_Sym *);
+
+struct elf_backend_data
+{
+  /* The architecture for this backend.  */
+  enum bfd_architecture arch;
+
+  /* An identifier used to distinguish different target specific
+     extensions to elf_obj_tdata and elf_link_hash_table structures.  */
+  enum elf_target_id target_id;
+
+  /* The ELF machine code (EM_xxxx) for this backend.  */
+  int elf_machine_code;
+
+  /* EI_OSABI. */
+  int elf_osabi;
+
+  /* The maximum page size for this backend.  */
+  bfd_vma maxpagesize;
+
+  /* The minimum page size for this backend.  An input object will not be
+     considered page aligned unless its sections are correctly aligned for
+     pages at least this large.  May be smaller than maxpagesize.  */
+  bfd_vma minpagesize;
+
+  /* The common page size for this backend.  */
+  bfd_vma commonpagesize;
+
+  /* The BFD flags applied to sections created for dynamic linking.  */
+  flagword dynamic_sec_flags;
+
+  /* Architecture-specific data for this backend.
+     This is actually a pointer to some type like struct elf_ARCH_data.  */
+  const void *arch_data;
+
+  /* A function to translate an ELF RELA relocation to a BFD arelent
+     structure.  */
+  void (*elf_info_to_howto)
+    (bfd *, arelent *, Elf_Internal_Rela *);
+
+  /* A function to translate an ELF REL relocation to a BFD arelent
+     structure.  */
+  void (*elf_info_to_howto_rel)
+    (bfd *, arelent *, Elf_Internal_Rela *);
+
+  /* A function to determine whether a symbol is global when
+     partitioning the symbol table into local and global symbols.
+     This should be NULL for most targets, in which case the correct
+     thing will be done.  MIPS ELF, at least on the Irix 5, has
+     special requirements.  */
+  bfd_boolean (*elf_backend_sym_is_global)
+    (bfd *, asymbol *);
+
+  /* The remaining functions are hooks which are called only if they
+     are not NULL.  */
+
+  /* A function to permit a backend specific check on whether a
+     particular BFD format is relevant for an object file, and to
+     permit the backend to set any global information it wishes.  When
+     this is called elf_elfheader is set, but anything else should be
+     used with caution.  If this returns FALSE, the check_format
+     routine will return a bfd_error_wrong_format error.  */
+  bfd_boolean (*elf_backend_object_p)
+    (bfd *);
+
+  /* A function to do additional symbol processing when reading the
+     ELF symbol table.  This is where any processor-specific special
+     section indices are handled.  */
+  void (*elf_backend_symbol_processing)
+    (bfd *, asymbol *);
+
+  /* A function to do additional symbol processing after reading the
+     entire ELF symbol table.  */
+  bfd_boolean (*elf_backend_symbol_table_processing)
+    (bfd *, elf_symbol_type *, unsigned int);
+
+  /* A function to set the type of the info field.  Processor-specific
+     types should be handled here.  */
+  int (*elf_backend_get_symbol_type)
+    (Elf_Internal_Sym *, int);
+
+  /* A function to return the linker hash table entry of a symbol that
+     might be satisfied by an archive symbol.  */
+  struct elf_link_hash_entry * (*elf_backend_archive_symbol_lookup)
+    (bfd *, struct bfd_link_info *, const char *);
+
+  /* Return true if local section symbols should have a non-null st_name.
+     NULL implies false.  */
+  bfd_boolean (*elf_backend_name_local_section_symbols)
+    (bfd *);
+
+  /* A function to do additional processing on the ELF section header
+     just before writing it out.  This is used to set the flags and
+     type fields for some sections, or to actually write out data for
+     unusual sections.  */
+  bfd_boolean (*elf_backend_section_processing)
+    (bfd *, Elf_Internal_Shdr *);
+
+  /* A function to handle unusual section types when creating BFD
+     sections from ELF sections.  */
+  bfd_boolean (*elf_backend_section_from_shdr)
+    (bfd *, Elf_Internal_Shdr *, const char *, int);
+
+  /* A function to convert machine dependent ELF section header flags to
+     BFD internal section header flags.  */
+  bfd_boolean (*elf_backend_section_flags)
+    (flagword *, const Elf_Internal_Shdr *);
+
+  /* A function that returns a struct containing ELF section flags and
+     type for the given BFD section.   */
+  const struct bfd_elf_special_section * (*get_sec_type_attr)
+    (bfd *, asection *);
+
+  /* A function to handle unusual program segment types when creating BFD
+     sections from ELF program segments.  */
+  bfd_boolean (*elf_backend_section_from_phdr)
+    (bfd *, Elf_Internal_Phdr *, int, const char *);
+
+  /* A function to set up the ELF section header for a BFD section in
+     preparation for writing it out.  This is where the flags and type
+     fields are set for unusual sections.  */
+  bfd_boolean (*elf_backend_fake_sections)
+    (bfd *, Elf_Internal_Shdr *, asection *);
+
+  /* A function to get the ELF section index for a BFD section.  If
+     this returns TRUE, the section was found.  If it is a normal ELF
+     section, *RETVAL should be left unchanged.  If it is not a normal
+     ELF section *RETVAL should be set to the SHN_xxxx index.  */
+  bfd_boolean (*elf_backend_section_from_bfd_section)
+    (bfd *, asection *, int *retval);
+
+  /* If this field is not NULL, it is called by the add_symbols phase
+     of a link just before adding a symbol to the global linker hash
+     table.  It may modify any of the fields as it wishes.  If *NAME
+     is set to NULL, the symbol will be skipped rather than being
+     added to the hash table.  This function is responsible for
+     handling all processor dependent symbol bindings and section
+     indices, and must set at least *FLAGS and *SEC for each processor
+     dependent case; failure to do so will cause a link error.  */
+  bfd_boolean (*elf_add_symbol_hook)
+    (bfd *abfd, struct bfd_link_info *info, Elf_Internal_Sym *,
+     const char **name, flagword *flags, asection **sec, bfd_vma *value);
+
+  /* If this field is not NULL, it is called by the elf_link_output_sym
+     phase of a link for each symbol which will appear in the object file.
+     On error, this function returns 0.  1 is returned when the symbol
+     should be output, 2 is returned when the symbol should be discarded.  */
+  int (*elf_backend_link_output_symbol_hook)
+    (struct bfd_link_info *info, const char *, Elf_Internal_Sym *,
+     asection *, struct elf_link_hash_entry *);
+
+  /* The CREATE_DYNAMIC_SECTIONS function is called by the ELF backend
+     linker the first time it encounters a dynamic object in the link.
+     This function must create any sections required for dynamic
+     linking.  The ABFD argument is a dynamic object.  The .interp,
+     .dynamic, .dynsym, .dynstr, and .hash functions have already been
+     created, and this function may modify the section flags if
+     desired.  This function will normally create the .got and .plt
+     sections, but different backends have different requirements.  */
+  bfd_boolean (*elf_backend_create_dynamic_sections)
+    (bfd *abfd, struct bfd_link_info *info);
+
+  /* When creating a shared library, determine whether to omit the
+     dynamic symbol for the section.  */
+  bfd_boolean (*elf_backend_omit_section_dynsym)
+    (bfd *output_bfd, struct bfd_link_info *info, asection *osec);
+
+  /* Return TRUE if relocations of targets are compatible to the extent
+     that CHECK_RELOCS will properly process them.  PR 4424.  */
+  bfd_boolean (*relocs_compatible) (const bfd_target *, const bfd_target *);
+
+  /* The CHECK_RELOCS function is called by the add_symbols phase of
+     the ELF backend linker.  It is called once for each section with
+     relocs of an object file, just after the symbols for the object
+     file have been added to the global linker hash table.  The
+     function must look through the relocs and do any special handling
+     required.  This generally means allocating space in the global
+     offset table, and perhaps allocating space for a reloc.  The
+     relocs are always passed as Rela structures; if the section
+     actually uses Rel structures, the r_addend field will always be
+     zero.  */
+  bfd_boolean (*check_relocs)
+    (bfd *abfd, struct bfd_link_info *info, asection *o,
+     const Elf_Internal_Rela *relocs);
+
+  /* The CHECK_DIRECTIVES function is called once per input file by
+     the add_symbols phase of the ELF backend linker.  The function
+     must inspect the bfd and create any additional symbols according
+     to any custom directives in the bfd.  */
+  bfd_boolean (*check_directives)
+    (bfd *abfd, struct bfd_link_info *info);
+
+  /* The AS_NEEDED_CLEANUP function is called once per --as-needed
+     input file that was not needed by the add_symbols phase of the
+     ELF backend linker.  The function must undo any target specific
+     changes in the symbol hash table.  */
+  bfd_boolean (*as_needed_cleanup)
+    (bfd *abfd, struct bfd_link_info *info);
+
+  /* The ADJUST_DYNAMIC_SYMBOL function is called by the ELF backend
+     linker for every symbol which is defined by a dynamic object and
+     referenced by a regular object.  This is called after all the
+     input files have been seen, but before the SIZE_DYNAMIC_SECTIONS
+     function has been called.  The hash table entry should be
+     bfd_link_hash_defined ore bfd_link_hash_defweak, and it should be
+     defined in a section from a dynamic object.  Dynamic object
+     sections are not included in the final link, and this function is
+     responsible for changing the value to something which the rest of
+     the link can deal with.  This will normally involve adding an
+     entry to the .plt or .got or some such section, and setting the
+     symbol to point to that.  */
+  bfd_boolean (*elf_backend_adjust_dynamic_symbol)
+    (struct bfd_link_info *info, struct elf_link_hash_entry *h);
+
+  /* The ALWAYS_SIZE_SECTIONS function is called by the backend linker
+     after all the linker input files have been seen but before the
+     section sizes have been set.  This is called after
+     ADJUST_DYNAMIC_SYMBOL, but before SIZE_DYNAMIC_SECTIONS.  */
+  bfd_boolean (*elf_backend_always_size_sections)
+    (bfd *output_bfd, struct bfd_link_info *info);
+
+  /* The SIZE_DYNAMIC_SECTIONS function is called by the ELF backend
+     linker after all the linker input files have been seen but before
+     the sections sizes have been set.  This is called after
+     ADJUST_DYNAMIC_SYMBOL has been called on all appropriate symbols.
+     It is only called when linking against a dynamic object.  It must
+     set the sizes of the dynamic sections, and may fill in their
+     contents as well.  The generic ELF linker can handle the .dynsym,
+     .dynstr and .hash sections.  This function must handle the
+     .interp section and any sections created by the
+     CREATE_DYNAMIC_SECTIONS entry point.  */
+  bfd_boolean (*elf_backend_size_dynamic_sections)
+    (bfd *output_bfd, struct bfd_link_info *info);
+
+  /* Set TEXT_INDEX_SECTION and DATA_INDEX_SECTION, the output sections
+     we keep to use as a base for relocs and symbols.  */
+  void (*elf_backend_init_index_section)
+    (bfd *output_bfd, struct bfd_link_info *info);
+
+  /* The RELOCATE_SECTION function is called by the ELF backend linker
+     to handle the relocations for a section.
+
+     The relocs are always passed as Rela structures; if the section
+     actually uses Rel structures, the r_addend field will always be
+     zero.
+
+     This function is responsible for adjust the section contents as
+     necessary, and (if using Rela relocs and generating a
+     relocatable output file) adjusting the reloc addend as
+     necessary.
+
+     This function does not have to worry about setting the reloc
+     address or the reloc symbol index.
+
+     LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+     LOCAL_SECTIONS is an array giving the section in the input file
+     corresponding to the st_shndx field of each local symbol.
+
+     The global hash table entry for the global symbols can be found
+     via elf_sym_hashes (input_bfd).
+
+     When generating relocatable output, this function must handle
+     STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+     going to be the section symbol corresponding to the output
+     section, which means that the addend must be adjusted
+     accordingly.
+
+     Returns FALSE on error, TRUE on success, 2 if successful and
+     relocations should be written for this section.  */
+  int (*elf_backend_relocate_section)
+    (bfd *output_bfd, struct bfd_link_info *info, bfd *input_bfd,
+     asection *input_section, bfd_byte *contents, Elf_Internal_Rela *relocs,
+     Elf_Internal_Sym *local_syms, asection **local_sections);
+
+  /* The FINISH_DYNAMIC_SYMBOL function is called by the ELF backend
+     linker just before it writes a symbol out to the .dynsym section.
+     The processor backend may make any required adjustment to the
+     symbol.  It may also take the opportunity to set contents of the
+     dynamic sections.  Note that FINISH_DYNAMIC_SYMBOL is called on
+     all .dynsym symbols, while ADJUST_DYNAMIC_SYMBOL is only called
+     on those symbols which are defined by a dynamic object.  */
+  bfd_boolean (*elf_backend_finish_dynamic_symbol)
+    (bfd *output_bfd, struct bfd_link_info *info,
+     struct elf_link_hash_entry *h, Elf_Internal_Sym *sym);
+
+  /* The FINISH_DYNAMIC_SECTIONS function is called by the ELF backend
+     linker just before it writes all the dynamic sections out to the
+     output file.  The FINISH_DYNAMIC_SYMBOL will have been called on
+     all dynamic symbols.  */
+  bfd_boolean (*elf_backend_finish_dynamic_sections)
+    (bfd *output_bfd, struct bfd_link_info *info);
+
+  /* A function to do any beginning processing needed for the ELF file
+     before building the ELF headers and computing file positions.  */
+  void (*elf_backend_begin_write_processing)
+    (bfd *, struct bfd_link_info *);
+
+  /* A function to do any final processing needed for the ELF file
+     before writing it out.  The LINKER argument is TRUE if this BFD
+     was created by the ELF backend linker.  */
+  void (*elf_backend_final_write_processing)
+    (bfd *, bfd_boolean linker);
+
+  /* This function is called by get_program_header_size.  It should
+     return the number of additional program segments which this BFD
+     will need.  It should return -1 on error.  */
+  int (*elf_backend_additional_program_headers)
+    (bfd *, struct bfd_link_info *);
+
+  /* This function is called to modify an existing segment map in a
+     backend specific fashion.  */
+  bfd_boolean (*elf_backend_modify_segment_map)
+    (bfd *, struct bfd_link_info *);
+
+  /* This function is called to modify program headers just before
+     they are written.  */
+  bfd_boolean (*elf_backend_modify_program_headers)
+    (bfd *, struct bfd_link_info *);
+
+  /* This function is called before section garbage collection to
+     mark entry symbol sections.  */
+  void (*gc_keep)
+    (struct bfd_link_info *);
+
+  /* This function is called during section garbage collection to
+     mark sections that define global symbols.  */
+  bfd_boolean (*gc_mark_dynamic_ref)
+    (struct elf_link_hash_entry *, void *);
+
+  /* This function is called during section gc to discover the section a
+     particular relocation refers to.  */
+  elf_gc_mark_hook_fn gc_mark_hook;
+
+  /* This function, if defined, is called after the first gc marking pass
+     to allow the backend to mark additional sections.  */
+  bfd_boolean (*gc_mark_extra_sections)
+    (struct bfd_link_info *, elf_gc_mark_hook_fn);
+
+  /* This function, if defined, is called during the sweep phase of gc
+     in order that a backend might update any data structures it might
+     be maintaining.  */
+  bfd_boolean (*gc_sweep_hook)
+    (bfd *, struct bfd_link_info *, asection *, const Elf_Internal_Rela *);
+
+  /* This function, if defined, is called after the ELF headers have
+     been created.  This allows for things like the OS and ABI versions
+     to be changed.  */
+  void (*elf_backend_post_process_headers)
+    (bfd *, struct bfd_link_info *);
+
+  /* This function, if defined, prints a symbol to file and returns the
+     name of the symbol to be printed.  It should return NULL to fall
+     back to default symbol printing.  */
+  const char *(*elf_backend_print_symbol_all)
+    (bfd *, void *, asymbol *);
+
+  /* This function, if defined, is called after all local symbols and
+     global symbols converted to locals are emitted into the symtab
+     section.  It allows the backend to emit special local symbols
+     not handled in the hash table.  */
+  bfd_boolean (*elf_backend_output_arch_local_syms)
+    (bfd *, struct bfd_link_info *, void *,
+     bfd_boolean (*) (void *, const char *, Elf_Internal_Sym *, asection *,
+		      struct elf_link_hash_entry *));
+
+  /* This function, if defined, is called after all symbols are emitted
+     into the symtab section.  It allows the backend to emit special
+     global symbols not handled in the hash table.  */
+  bfd_boolean (*elf_backend_output_arch_syms)
+    (bfd *, struct bfd_link_info *, void *,
+     bfd_boolean (*) (void *, const char *, Elf_Internal_Sym *, asection *,
+		      struct elf_link_hash_entry *));
+
+  /* Copy any information related to dynamic linking from a pre-existing
+     symbol to a newly created symbol.  Also called to copy flags and
+     other back-end info to a weakdef, in which case the symbol is not
+     newly created and plt/got refcounts and dynamic indices should not
+     be copied.  */
+  void (*elf_backend_copy_indirect_symbol)
+    (struct bfd_link_info *, struct elf_link_hash_entry *,
+     struct elf_link_hash_entry *);
+
+  /* Modify any information related to dynamic linking such that the
+     symbol is not exported.  */
+  void (*elf_backend_hide_symbol)
+    (struct bfd_link_info *, struct elf_link_hash_entry *, bfd_boolean);
+
+  /* A function to do additional symbol fixup, called by
+     _bfd_elf_fix_symbol_flags.  */
+  bfd_boolean (*elf_backend_fixup_symbol)
+    (struct bfd_link_info *, struct elf_link_hash_entry *);
+
+  /* Merge the backend specific symbol attribute.  */
+  void (*elf_backend_merge_symbol_attribute)
+    (struct elf_link_hash_entry *, const Elf_Internal_Sym *, bfd_boolean,
+     bfd_boolean);
+
+  /* This function, if defined, will return a string containing the
+     name of a target-specific dynamic tag.  */
+  char *(*elf_backend_get_target_dtag)
+    (bfd_vma);
+
+  /* Decide whether an undefined symbol is special and can be ignored.
+     This is the case for OPTIONAL symbols on IRIX.  */
+  bfd_boolean (*elf_backend_ignore_undef_symbol)
+    (struct elf_link_hash_entry *);
+
+  /* Emit relocations.  Overrides default routine for emitting relocs,
+     except during a relocatable link, or if all relocs are being emitted.  */
+  bfd_boolean (*elf_backend_emit_relocs)
+    (bfd *, asection *, Elf_Internal_Shdr *, Elf_Internal_Rela *,
+     struct elf_link_hash_entry **);
+
+  /* Count relocations.  Not called for relocatable links
+     or if all relocs are being preserved in the output.  */
+  unsigned int (*elf_backend_count_relocs)
+    (struct bfd_link_info *, asection *);
+
+  /* This function, if defined, is called when an NT_PRSTATUS note is found
+     in a core file.  */
+  bfd_boolean (*elf_backend_grok_prstatus)
+    (bfd *, Elf_Internal_Note *);
+
+  /* This function, if defined, is called when an NT_PSINFO or NT_PRPSINFO
+     note is found in a core file.  */
+  bfd_boolean (*elf_backend_grok_psinfo)
+    (bfd *, Elf_Internal_Note *);
+
+  /* This function, if defined, is called to write a note to a corefile.  */
+  char *(*elf_backend_write_core_note)
+    (bfd *abfd, char *buf, int *bufsiz, int note_type, ...);
+
+  /* This function, if defined, is called to convert target-specific
+     section flag names into hex values.  */
+  flagword (*elf_backend_lookup_section_flags_hook)
+    (char *);
+
+  /* This function returns class of a reloc type.  */
+  enum elf_reloc_type_class (*elf_backend_reloc_type_class)
+    (const Elf_Internal_Rela *);
+
+  /* This function, if defined, removes information about discarded functions
+     from other sections which mention them.  */
+  bfd_boolean (*elf_backend_discard_info)
+    (bfd *, struct elf_reloc_cookie *, struct bfd_link_info *);
+
+  /* This function, if defined, signals that the function above has removed
+     the discarded relocations for this section.  */
+  bfd_boolean (*elf_backend_ignore_discarded_relocs)
+    (asection *);
+
+  /* What to do when ld finds relocations against symbols defined in
+     discarded sections.  */
+  unsigned int (*action_discarded)
+    (asection *);
+
+  /* This function returns the width of FDE pointers in bytes, or 0 if
+     that can't be determined for some reason.  The default definition
+     goes by the bfd's EI_CLASS.  */
+  unsigned int (*elf_backend_eh_frame_address_size)
+    (bfd *, asection *);
+
+  /* These functions tell elf-eh-frame whether to attempt to turn
+     absolute or lsda encodings into pc-relative ones.  The default
+     definition enables these transformations.  */
+  bfd_boolean (*elf_backend_can_make_relative_eh_frame)
+     (bfd *, struct bfd_link_info *, asection *);
+  bfd_boolean (*elf_backend_can_make_lsda_relative_eh_frame)
+     (bfd *, struct bfd_link_info *, asection *);
+
+  /* This function returns an encoding after computing the encoded
+     value (and storing it in ENCODED) for the given OFFSET into OSEC,
+     to be stored in at LOC_OFFSET into the LOC_SEC input section.
+     The default definition chooses a 32-bit PC-relative encoding.  */
+  bfd_byte (*elf_backend_encode_eh_address)
+     (bfd *abfd, struct bfd_link_info *info,
+      asection *osec, bfd_vma offset,
+      asection *loc_sec, bfd_vma loc_offset,
+      bfd_vma *encoded);
+
+  /* This function, if defined, may write out the given section.
+     Returns TRUE if it did so and FALSE if the caller should.  */
+  bfd_boolean (*elf_backend_write_section)
+    (bfd *, struct bfd_link_info *, asection *, bfd_byte *);
+
+  /* The level of IRIX compatibility we're striving for.
+     MIPS ELF specific function.  */
+  irix_compat_t (*elf_backend_mips_irix_compat)
+    (bfd *);
+
+  reloc_howto_type *(*elf_backend_mips_rtype_to_howto)
+    (unsigned int, bfd_boolean);
+
+  /* The swapping table to use when dealing with ECOFF information.
+     Used for the MIPS ELF .mdebug section.  */
+  const struct ecoff_debug_swap *elf_backend_ecoff_debug_swap;
+
+  /* This function implements `bfd_elf_bfd_from_remote_memory';
+     see elf.c, elfcode.h.  */
+  bfd *(*elf_backend_bfd_from_remote_memory)
+     (bfd *templ, bfd_vma ehdr_vma, bfd_vma *loadbasep,
+      int (*target_read_memory) (bfd_vma vma, bfd_byte *myaddr, int len));
+
+  /* This function is used by `_bfd_elf_get_synthetic_symtab';
+     see elf.c.  */
+  bfd_vma (*plt_sym_val) (bfd_vma, const asection *, const arelent *);
+
+  /* Is symbol defined in common section?  */
+  bfd_boolean (*common_definition) (Elf_Internal_Sym *);
+
+  /* Return a common section index for section.  */
+  unsigned int (*common_section_index) (asection *);
+
+  /* Return a common section for section.  */
+  asection *(*common_section) (asection *);
+
+  /* Return TRUE if we can merge 2 definitions.  */
+  bfd_boolean (*merge_symbol) (struct bfd_link_info *,
+			       struct elf_link_hash_entry **,
+			       struct elf_link_hash_entry *,
+			       Elf_Internal_Sym *, asection **,
+			       bfd_vma *, unsigned int *,
+			       bfd_boolean *, bfd_boolean *,
+			       bfd_boolean *, bfd_boolean *,
+			       bfd_boolean *, bfd_boolean *,
+			       bfd_boolean *, bfd_boolean *,
+			       bfd *, asection **,
+			       bfd_boolean *, bfd_boolean *,
+			       bfd_boolean *, bfd_boolean *,
+			       bfd *, asection **);
+
+  /* Return TRUE if symbol should be hashed in the `.gnu.hash' section.  */
+  bfd_boolean (*elf_hash_symbol) (struct elf_link_hash_entry *);
+
+  /* Return TRUE if type is a function symbol type.  */
+  bfd_boolean (*is_function_type) (unsigned int type);
+
+  /* Used to handle bad SHF_LINK_ORDER input.  */
+  bfd_error_handler_type link_order_error_handler;
+
+  /* Name of the PLT relocation section.  */
+  const char *relplt_name;
+
+  /* Alternate EM_xxxx machine codes for this backend.  */
+  int elf_machine_alt1;
+  int elf_machine_alt2;
+
+  const struct elf_size_info *s;
+
+  /* An array of target specific special sections.  */
+  const struct bfd_elf_special_section *special_sections;
+
+  /* The size in bytes of the header for the GOT.  This includes the
+     so-called reserved entries on some systems.  */
+  bfd_vma got_header_size;
+
+  /* The size of the GOT entry for the symbol pointed to by H if non-NULL,
+     otherwise by the local symbol with index SYMNDX in IBFD.  */
+  bfd_vma (*got_elt_size) (bfd *, struct bfd_link_info *,
+			   struct elf_link_hash_entry *h,
+			   bfd *ibfd, unsigned long symndx);
+
+  /* The vendor name to use for a processor-standard attributes section.  */
+  const char *obj_attrs_vendor;
+
+  /* The section name to use for a processor-standard attributes section.  */
+  const char *obj_attrs_section;
+
+  /* Return 1, 2 or 3 to indicate what type of arguments a
+     processor-specific tag takes.  */
+  int (*obj_attrs_arg_type) (int);
+
+  /* The section type to use for an attributes section.  */
+  unsigned int obj_attrs_section_type;
+
+  /* This function determines the order in which any attributes are
+     written.  It must be defined for input in the range
+     LEAST_KNOWN_OBJ_ATTRIBUTE..NUM_KNOWN_OBJ_ATTRIBUTES-1 (this range
+     is used in order to make unity easy).  The returned value is the
+     actual tag number to place in the input position.  */
+  int (*obj_attrs_order) (int);
+
+  /* Handle merging unknown attributes; either warn and return TRUE,
+     or give an error and return FALSE.  */
+  bfd_boolean (*obj_attrs_handle_unknown) (bfd *, int);
+
+  /* This is non-zero if static TLS segments require a special alignment.  */
+  unsigned static_tls_alignment;
+
+  /* This is TRUE if the linker should act like collect and gather
+     global constructors and destructors by name.  This is TRUE for
+     MIPS ELF because the Irix 5 tools can not handle the .init
+     section.  */
+  unsigned collect : 1;
+
+  /* This is TRUE if the linker should ignore changes to the type of a
+     symbol.  This is TRUE for MIPS ELF because some Irix 5 objects
+     record undefined functions as STT_OBJECT although the definitions
+     are STT_FUNC.  */
+  unsigned type_change_ok : 1;
+
+  /* Whether the backend may use REL relocations.  (Some backends use
+     both REL and RELA relocations, and this flag is set for those
+     backends.)  */
+  unsigned may_use_rel_p : 1;
+
+  /* Whether the backend may use RELA relocations.  (Some backends use
+     both REL and RELA relocations, and this flag is set for those
+     backends.)  */
+  unsigned may_use_rela_p : 1;
+
+  /* Whether the default relocation type is RELA.  If a backend with
+     this flag set wants REL relocations for a particular section,
+     it must note that explicitly.  Similarly, if this flag is clear,
+     and the backend wants RELA relocations for a particular
+     section.  */
+  unsigned default_use_rela_p : 1;
+
+  /* True if PLT and copy relocations should be RELA by default.  */
+  unsigned rela_plts_and_copies_p : 1;
+
+  /* Set if RELA relocations for a relocatable link can be handled by
+     generic code.  Backends that set this flag need do nothing in the
+     backend relocate_section routine for relocatable linking.  */
+  unsigned rela_normal : 1;
+
+  /* TRUE if addresses "naturally" sign extend.  This is used when
+     swapping in from Elf32 when BFD64.  */
+  unsigned sign_extend_vma : 1;
+
+  unsigned want_got_plt : 1;
+  unsigned plt_readonly : 1;
+  unsigned want_plt_sym : 1;
+  unsigned plt_not_loaded : 1;
+  unsigned plt_alignment : 4;
+  unsigned can_gc_sections : 1;
+  unsigned can_refcount : 1;
+  unsigned want_got_sym : 1;
+  unsigned want_dynbss : 1;
+
+  /* Targets which do not support physical addressing often require
+     that the p_paddr field in the section header to be set to zero.
+     This field indicates whether this behavior is required.  */
+  unsigned want_p_paddr_set_to_zero : 1;
+
+  /* True if an object file lacking a .note.GNU-stack section
+     should be assumed to be requesting exec stack.  At least one
+     other file in the link needs to have a .note.GNU-stack section
+     for a PT_GNU_STACK segment to be created.  */
+  unsigned default_execstack : 1;
+};
+
+/* Information about reloc sections associated with a bfd_elf_section_data
+   structure.  */
+struct bfd_elf_section_reloc_data
+{
+  /* The ELF header for the reloc section associated with this
+     section, if any.  */
+  Elf_Internal_Shdr *hdr;
+  /* The number of relocations currently assigned to HDR.  */
+  unsigned int count;
+  /* The ELF section number of the reloc section.  Only used for an
+     output file.  */
+  int idx;
+  /* Used by the backend linker to store the symbol hash table entries
+     associated with relocs against global symbols.  */
+  struct elf_link_hash_entry **hashes;
+};
+
+/* Information stored for each BFD section in an ELF file.  This
+   structure is allocated by elf_new_section_hook.  */
+
+struct bfd_elf_section_data
+{
+  /* The ELF header for this section.  */
+  Elf_Internal_Shdr this_hdr;
+
+  /* Information about the REL and RELA reloc sections associated
+     with this section, if any.  */
+  struct bfd_elf_section_reloc_data rel, rela;
+
+  /* The ELF section number of this section.  */
+  int this_idx;
+
+  /* Used by the backend linker when generating a shared library to
+     record the dynamic symbol index for a section symbol
+     corresponding to this section.  A value of 0 means that there is
+     no dynamic symbol for this section.  */
+  int dynindx;
+
+  /* A pointer to the linked-to section for SHF_LINK_ORDER.  */
+  asection *linked_to;
+
+  /* A pointer to the swapped relocs.  If the section uses REL relocs,
+     rather than RELA, all the r_addend fields will be zero.  This
+     pointer may be NULL.  It is used by the backend linker.  */
+  Elf_Internal_Rela *relocs;
+
+  /* A pointer to a linked list tracking dynamic relocs copied for
+     local symbols.  */
+  void *local_dynrel;
+
+  /* A pointer to the bfd section used for dynamic relocs.  */
+  asection *sreloc;
+
+  union {
+    /* Group name, if this section is a member of a group.  */
+    const char *name;
+
+    /* Group signature sym, if this is the SHT_GROUP section.  */
+    struct bfd_symbol *id;
+  } group;
+
+  /* For a member of a group, points to the SHT_GROUP section.
+     NULL for the SHT_GROUP section itself and non-group sections.  */
+  asection *sec_group;
+
+  /* A linked list of member sections in the group.  Circular when used by
+     the linker.  For the SHT_GROUP section, points at first member.  */
+  asection *next_in_group;
+
+  /* The FDEs associated with this section.  The u.fde.next_in_section
+     field acts as a chain pointer.  */
+  struct eh_cie_fde *fde_list;
+
+  /* A pointer used for various section optimizations.  */
+  void *sec_info;
+};
+
+#define elf_section_data(sec)  ((struct bfd_elf_section_data*)(sec)->used_by_bfd)
+#define elf_linked_to_section(sec) (elf_section_data(sec)->linked_to)
+#define elf_section_type(sec)  (elf_section_data(sec)->this_hdr.sh_type)
+#define elf_section_flags(sec) (elf_section_data(sec)->this_hdr.sh_flags)
+#define elf_group_name(sec)    (elf_section_data(sec)->group.name)
+#define elf_group_id(sec)      (elf_section_data(sec)->group.id)
+#define elf_next_in_group(sec) (elf_section_data(sec)->next_in_group)
+#define elf_fde_list(sec)      (elf_section_data(sec)->fde_list)
+#define elf_sec_group(sec)	(elf_section_data(sec)->sec_group)
+
+#define xvec_get_elf_backend_data(xvec) \
+  ((const struct elf_backend_data *) (xvec)->backend_data)
+
+#define get_elf_backend_data(abfd) \
+   xvec_get_elf_backend_data ((abfd)->xvec)
+
+/* The least object attributes (within an attributes subsection) known
+   for any target.  Some code assumes that the value 0 is not used and
+   the field for that attribute can instead be used as a marker to
+   indicate that attributes have been initialized.  */
+#define LEAST_KNOWN_OBJ_ATTRIBUTE 2
+
+/* The maximum number of known object attributes for any target.  */
+#define NUM_KNOWN_OBJ_ATTRIBUTES 71
+
+/* The value of an object attribute.  The type indicates whether the attribute
+   holds and integer, a string, or both.  It can also indicate that there can
+   be no default (i.e. all values must be written to file, even zero).  */
+
+typedef struct obj_attribute
+{
+#define ATTR_TYPE_FLAG_INT_VAL    (1 << 0)
+#define ATTR_TYPE_FLAG_STR_VAL    (1 << 1)
+#define ATTR_TYPE_FLAG_NO_DEFAULT (1 << 2)
+
+#define ATTR_TYPE_HAS_INT_VAL(TYPE)	((TYPE) & ATTR_TYPE_FLAG_INT_VAL)
+#define ATTR_TYPE_HAS_STR_VAL(TYPE)	((TYPE) & ATTR_TYPE_FLAG_STR_VAL)
+#define ATTR_TYPE_HAS_NO_DEFAULT(TYPE)	((TYPE) & ATTR_TYPE_FLAG_NO_DEFAULT)
+
+  int type;
+  unsigned int i;
+  char *s;
+} obj_attribute;
+
+typedef struct obj_attribute_list
+{
+  struct obj_attribute_list *next;
+  int tag;
+  obj_attribute attr;
+} obj_attribute_list;
+
+/* Object attributes may either be defined by the processor ABI, index
+   OBJ_ATTR_PROC in the *_obj_attributes arrays, or be GNU-specific
+   (and possibly also processor-specific), index OBJ_ATTR_GNU.  */
+#define OBJ_ATTR_PROC 0
+#define OBJ_ATTR_GNU 1
+#define OBJ_ATTR_FIRST OBJ_ATTR_PROC
+#define OBJ_ATTR_LAST OBJ_ATTR_GNU
+
+/* The following object attribute tags are taken as generic, for all
+   targets and for "gnu" where there is no target standard.  */
+enum
+{
+  Tag_NULL = 0,
+  Tag_File = 1,
+  Tag_Section = 2,
+  Tag_Symbol = 3,
+  Tag_compatibility = 32
+};
+
+/* The following struct stores information about every SystemTap section
+   found in the object file.  */
+struct sdt_note
+{
+  struct sdt_note *next;
+  bfd_size_type size;
+  bfd_byte data[1];
+};
+
+/* Some private data is stashed away for future use using the tdata pointer
+   in the bfd structure.  */
+
+struct elf_obj_tdata
+{
+  Elf_Internal_Ehdr elf_header[1];	/* Actual data, but ref like ptr */
+  Elf_Internal_Shdr **elf_sect_ptr;
+  Elf_Internal_Phdr *phdr;
+  struct elf_segment_map *segment_map;
+  struct elf_strtab_hash *strtab_ptr;
+  int num_locals;
+  int num_globals;
+  unsigned int num_elf_sections;	/* elf_sect_ptr size */
+  int num_section_syms;
+  asymbol **section_syms;		/* STT_SECTION symbols for each section */
+  Elf_Internal_Shdr symtab_hdr;
+  Elf_Internal_Shdr shstrtab_hdr;
+  Elf_Internal_Shdr strtab_hdr;
+  Elf_Internal_Shdr dynsymtab_hdr;
+  Elf_Internal_Shdr dynstrtab_hdr;
+  Elf_Internal_Shdr dynversym_hdr;
+  Elf_Internal_Shdr dynverref_hdr;
+  Elf_Internal_Shdr dynverdef_hdr;
+  Elf_Internal_Shdr symtab_shndx_hdr;
+  unsigned int symtab_section, shstrtab_section;
+  unsigned int strtab_section, dynsymtab_section;
+  unsigned int symtab_shndx_section;
+  unsigned int dynversym_section, dynverdef_section, dynverref_section;
+  file_ptr next_file_pos;
+  bfd_vma gp;				/* The gp value */
+  unsigned int gp_size;			/* The gp size */
+
+  /* Information grabbed from an elf core file.  */
+  int core_signal;
+  int core_pid;
+  int core_lwpid;
+  char* core_program;
+  char* core_command;
+
+  /* A mapping from external symbols to entries in the linker hash
+     table, used when linking.  This is indexed by the symbol index
+     minus the sh_info field of the symbol table header.  */
+  struct elf_link_hash_entry **sym_hashes;
+
+  /* Track usage and final offsets of GOT entries for local symbols.
+     This array is indexed by symbol index.  Elements are used
+     identically to "got" in struct elf_link_hash_entry.  */
+  union
+    {
+      bfd_signed_vma *refcounts;
+      bfd_vma *offsets;
+      struct got_entry **ents;
+    } local_got;
+
+  /* The linker ELF emulation code needs to let the backend ELF linker
+     know what filename should be used for a dynamic object if the
+     dynamic object is found using a search.  The emulation code then
+     sometimes needs to know what name was actually used.  Until the
+     file has been added to the linker symbol table, this field holds
+     the name the linker wants.  After it has been added, it holds the
+     name actually used, which will be the DT_SONAME entry if there is
+     one.  */
+  const char *dt_name;
+
+  /* The linker emulation needs to know what audit libs
+     are used by a dynamic object.  */
+  const char *dt_audit;
+
+  /* Records the result of `get_program_header_size'.  */
+  bfd_size_type program_header_size;
+
+  /* Used by find_nearest_line entry point.  */
+  void *line_info;
+
+  /* Used by MIPS ELF find_nearest_line entry point.  The structure
+     could be included directly in this one, but there's no point to
+     wasting the memory just for the infrequently called
+     find_nearest_line.  */
+  struct mips_elf_find_line *find_line_info;
+
+  /* A place to stash dwarf1 info for this bfd.  */
+  struct dwarf1_debug *dwarf1_find_line_info;
+
+  /* A place to stash dwarf2 info for this bfd.  */
+  void *dwarf2_find_line_info;
+
+  /* An array of stub sections indexed by symbol number, used by the
+     MIPS ELF linker.  FIXME: We should figure out some way to only
+     include this field for a MIPS ELF target.  */
+  asection **local_stubs;
+  asection **local_call_stubs;
+
+  /* Used to determine if PT_GNU_EH_FRAME segment header should be
+     created.  */
+  asection *eh_frame_hdr;
+
+  Elf_Internal_Shdr **group_sect_ptr;
+  int num_group;
+
+  /* Number of symbol version definitions we are about to emit.  */
+  unsigned int cverdefs;
+
+  /* Number of symbol version references we are about to emit.  */
+  unsigned int cverrefs;
+
+  /* Segment flags for the PT_GNU_STACK segment.  */
+  unsigned int stack_flags;
+
+  /* Symbol version definitions in external objects.  */
+  Elf_Internal_Verdef *verdef;
+
+  /* Symbol version references to external objects.  */
+  Elf_Internal_Verneed *verref;
+
+  /* The Irix 5 support uses two virtual sections, which represent
+     text/data symbols defined in dynamic objects.  */
+  asymbol *elf_data_symbol;
+  asymbol *elf_text_symbol;
+  asection *elf_data_section;
+  asection *elf_text_section;
+
+  /* A pointer to the .eh_frame section.  */
+  asection *eh_frame_section;
+
+  /* Whether a dyanmic object was specified normally on the linker
+     command line, or was specified when --as-needed was in effect,
+     or was found via a DT_NEEDED entry.  */
+  enum dynamic_lib_link_class dyn_lib_class;
+
+  /* This is set to TRUE if the object was created by the backend
+     linker.  */
+  bfd_boolean linker;
+
+  /* Irix 5 often screws up the symbol table, sorting local symbols
+     after global symbols.  This flag is set if the symbol table in
+     this BFD appears to be screwed up.  If it is, we ignore the
+     sh_info field in the symbol table header, and always read all the
+     symbols.  */
+  bfd_boolean bad_symtab;
+
+  /* Used to determine if the e_flags field has been initialized */
+  bfd_boolean flags_init;
+
+  /* Symbol buffer.  */
+  void *symbuf;
+
+  obj_attribute known_obj_attributes[2][NUM_KNOWN_OBJ_ATTRIBUTES];
+  obj_attribute_list *other_obj_attributes[2];
+
+  /* Called at the end of _bfd_elf_write_object_contents if not NULL.  */
+  bfd_boolean (*after_write_object_contents) (bfd *);
+  void *after_write_object_contents_info;
+
+  /* NT_GNU_BUILD_ID note type.  */
+  bfd_size_type build_id_size;
+  bfd_byte *build_id;
+
+  /* Linked-list containing information about every Systemtap section
+     found in the object file.  Each section corresponds to one entry
+     in the list.  */
+  struct sdt_note *sdt_note_head;
+
+  /* True if the bfd contains symbols that have the STT_GNU_IFUNC
+     symbol type or STB_GNU_UNIQUE binding.  Used to set the osabi
+     field in the ELF header structure.  */
+  bfd_boolean has_gnu_symbols;
+
+  /* An identifier used to distinguish different target
+     specific extensions to this structure.  */
+  enum elf_target_id object_id;
+};
+
+#define elf_tdata(bfd)		((bfd) -> tdata.elf_obj_data)
+
+#define elf_object_id(bfd)	(elf_tdata(bfd) -> object_id)
+#define elf_program_header_size(bfd) (elf_tdata(bfd) -> program_header_size)
+#define elf_elfheader(bfd)	(elf_tdata(bfd) -> elf_header)
+#define elf_elfsections(bfd)	(elf_tdata(bfd) -> elf_sect_ptr)
+#define elf_numsections(bfd)	(elf_tdata(bfd) -> num_elf_sections)
+#define elf_shstrtab(bfd)	(elf_tdata(bfd) -> strtab_ptr)
+#define elf_onesymtab(bfd)	(elf_tdata(bfd) -> symtab_section)
+#define elf_symtab_shndx(bfd)	(elf_tdata(bfd) -> symtab_shndx_section)
+#define elf_symtab_hdr(bfd)	(elf_tdata(bfd) -> symtab_hdr)
+#define elf_dynsymtab(bfd)	(elf_tdata(bfd) -> dynsymtab_section)
+#define elf_dynversym(bfd)	(elf_tdata(bfd) -> dynversym_section)
+#define elf_dynverdef(bfd)	(elf_tdata(bfd) -> dynverdef_section)
+#define elf_dynverref(bfd)	(elf_tdata(bfd) -> dynverref_section)
+#define elf_eh_frame_section(bfd) \
+				(elf_tdata(bfd) -> eh_frame_section)
+#define elf_num_locals(bfd)	(elf_tdata(bfd) -> num_locals)
+#define elf_num_globals(bfd)	(elf_tdata(bfd) -> num_globals)
+#define elf_section_syms(bfd)	(elf_tdata(bfd) -> section_syms)
+#define elf_num_section_syms(bfd) (elf_tdata(bfd) -> num_section_syms)
+#define core_prpsinfo(bfd)	(elf_tdata(bfd) -> prpsinfo)
+#define core_prstatus(bfd)	(elf_tdata(bfd) -> prstatus)
+#define elf_gp(bfd)		(elf_tdata(bfd) -> gp)
+#define elf_gp_size(bfd)	(elf_tdata(bfd) -> gp_size)
+#define elf_sym_hashes(bfd)	(elf_tdata(bfd) -> sym_hashes)
+#define elf_local_got_refcounts(bfd) (elf_tdata(bfd) -> local_got.refcounts)
+#define elf_local_got_offsets(bfd) (elf_tdata(bfd) -> local_got.offsets)
+#define elf_local_got_ents(bfd) (elf_tdata(bfd) -> local_got.ents)
+#define elf_dt_name(bfd)	(elf_tdata(bfd) -> dt_name)
+#define elf_dt_audit(bfd)	(elf_tdata(bfd) -> dt_audit)
+#define elf_dyn_lib_class(bfd)	(elf_tdata(bfd) -> dyn_lib_class)
+#define elf_bad_symtab(bfd)	(elf_tdata(bfd) -> bad_symtab)
+#define elf_flags_init(bfd)	(elf_tdata(bfd) -> flags_init)
+#define elf_known_obj_attributes(bfd) (elf_tdata (bfd) -> known_obj_attributes)
+#define elf_other_obj_attributes(bfd) (elf_tdata (bfd) -> other_obj_attributes)
+#define elf_known_obj_attributes_proc(bfd) \
+  (elf_known_obj_attributes (bfd) [OBJ_ATTR_PROC])
+#define elf_other_obj_attributes_proc(bfd) \
+  (elf_other_obj_attributes (bfd) [OBJ_ATTR_PROC])
+
+extern void _bfd_elf_swap_verdef_in
+  (bfd *, const Elf_External_Verdef *, Elf_Internal_Verdef *);
+extern void _bfd_elf_swap_verdef_out
+  (bfd *, const Elf_Internal_Verdef *, Elf_External_Verdef *);
+extern void _bfd_elf_swap_verdaux_in
+  (bfd *, const Elf_External_Verdaux *, Elf_Internal_Verdaux *);
+extern void _bfd_elf_swap_verdaux_out
+  (bfd *, const Elf_Internal_Verdaux *, Elf_External_Verdaux *);
+extern void _bfd_elf_swap_verneed_in
+  (bfd *, const Elf_External_Verneed *, Elf_Internal_Verneed *);
+extern void _bfd_elf_swap_verneed_out
+  (bfd *, const Elf_Internal_Verneed *, Elf_External_Verneed *);
+extern void _bfd_elf_swap_vernaux_in
+  (bfd *, const Elf_External_Vernaux *, Elf_Internal_Vernaux *);
+extern void _bfd_elf_swap_vernaux_out
+  (bfd *, const Elf_Internal_Vernaux *, Elf_External_Vernaux *);
+extern void _bfd_elf_swap_versym_in
+  (bfd *, const Elf_External_Versym *, Elf_Internal_Versym *);
+extern void _bfd_elf_swap_versym_out
+  (bfd *, const Elf_Internal_Versym *, Elf_External_Versym *);
+
+extern unsigned int _bfd_elf_section_from_bfd_section
+  (bfd *, asection *);
+extern char *bfd_elf_string_from_elf_section
+  (bfd *, unsigned, unsigned);
+extern Elf_Internal_Sym *bfd_elf_get_elf_syms
+  (bfd *, Elf_Internal_Shdr *, size_t, size_t, Elf_Internal_Sym *, void *,
+   Elf_External_Sym_Shndx *);
+extern const char *bfd_elf_sym_name
+  (bfd *, Elf_Internal_Shdr *, Elf_Internal_Sym *, asection *);
+
+extern bfd_boolean _bfd_elf_copy_private_bfd_data
+  (bfd *, bfd *);
+extern bfd_boolean _bfd_elf_print_private_bfd_data
+  (bfd *, void *);
+extern void bfd_elf_print_symbol
+  (bfd *, void *, asymbol *, bfd_print_symbol_type);
+
+extern unsigned int _bfd_elf_eh_frame_address_size
+  (bfd *, asection *);
+extern bfd_byte _bfd_elf_encode_eh_address
+  (bfd *abfd, struct bfd_link_info *info, asection *osec, bfd_vma offset,
+   asection *loc_sec, bfd_vma loc_offset, bfd_vma *encoded);
+extern bfd_boolean _bfd_elf_can_make_relative
+  (bfd *input_bfd, struct bfd_link_info *info, asection *eh_frame_section);
+
+extern enum elf_reloc_type_class _bfd_elf_reloc_type_class
+  (const Elf_Internal_Rela *);
+extern bfd_vma _bfd_elf_rela_local_sym
+  (bfd *, Elf_Internal_Sym *, asection **, Elf_Internal_Rela *);
+extern bfd_vma _bfd_elf_rel_local_sym
+  (bfd *, Elf_Internal_Sym *, asection **, bfd_vma);
+extern bfd_vma _bfd_elf_section_offset
+  (bfd *, struct bfd_link_info *, asection *, bfd_vma);
+
+extern unsigned long bfd_elf_hash
+  (const char *);
+extern unsigned long bfd_elf_gnu_hash
+  (const char *);
+
+extern bfd_reloc_status_type bfd_elf_generic_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+extern bfd_boolean bfd_elf_allocate_object
+  (bfd *, size_t, enum elf_target_id);
+extern bfd_boolean bfd_elf_make_object
+  (bfd *);
+extern bfd_boolean bfd_elf_mkcorefile
+  (bfd *);
+extern bfd_boolean _bfd_elf_make_section_from_shdr
+  (bfd *, Elf_Internal_Shdr *, const char *, int);
+extern bfd_boolean _bfd_elf_make_section_from_phdr
+  (bfd *, Elf_Internal_Phdr *, int, const char *);
+extern struct bfd_hash_entry *_bfd_elf_link_hash_newfunc
+  (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
+extern struct bfd_link_hash_table *_bfd_elf_link_hash_table_create
+  (bfd *);
+extern void _bfd_elf_link_hash_copy_indirect
+  (struct bfd_link_info *, struct elf_link_hash_entry *,
+   struct elf_link_hash_entry *);
+extern void _bfd_elf_link_hash_hide_symbol
+  (struct bfd_link_info *, struct elf_link_hash_entry *, bfd_boolean);
+extern bfd_boolean _bfd_elf_link_hash_fixup_symbol
+  (struct bfd_link_info *, struct elf_link_hash_entry *);
+extern bfd_boolean _bfd_elf_link_hash_table_init
+  (struct elf_link_hash_table *, bfd *,
+   struct bfd_hash_entry *(*)
+     (struct bfd_hash_entry *, struct bfd_hash_table *, const char *),
+   unsigned int, enum elf_target_id);
+extern bfd_boolean _bfd_elf_slurp_version_tables
+  (bfd *, bfd_boolean);
+extern bfd_boolean _bfd_elf_merge_sections
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_elf_match_sections_by_type
+  (bfd *, const asection *, bfd *, const asection *);
+extern bfd_boolean bfd_elf_is_group_section
+  (bfd *, const struct bfd_section *);
+extern bfd_boolean _bfd_elf_section_already_linked
+  (bfd *, asection *, struct bfd_link_info *);
+extern void bfd_elf_set_group_contents
+  (bfd *, asection *, void *);
+extern asection *_bfd_elf_check_kept_section
+  (asection *, struct bfd_link_info *);
+extern void _bfd_elf_link_just_syms
+  (asection *, struct bfd_link_info *);
+extern void _bfd_elf_copy_link_hash_symbol_type
+  (bfd *, struct bfd_link_hash_entry *, struct bfd_link_hash_entry *);
+extern bfd_boolean _bfd_elf_size_group_sections
+  (struct bfd_link_info *);
+extern bfd_boolean _bfd_elf_fixup_group_sections
+(bfd *, asection *);
+extern bfd_boolean _bfd_elf_copy_private_header_data
+  (bfd *, bfd *);
+extern bfd_boolean _bfd_elf_copy_private_symbol_data
+  (bfd *, asymbol *, bfd *, asymbol *);
+#define _bfd_generic_init_private_section_data \
+  _bfd_elf_init_private_section_data
+extern bfd_boolean _bfd_elf_init_private_section_data
+  (bfd *, asection *, bfd *, asection *, struct bfd_link_info *);
+extern bfd_boolean _bfd_elf_copy_private_section_data
+  (bfd *, asection *, bfd *, asection *);
+extern bfd_boolean _bfd_elf_write_object_contents
+  (bfd *);
+extern bfd_boolean _bfd_elf_write_corefile_contents
+  (bfd *);
+extern bfd_boolean _bfd_elf_set_section_contents
+  (bfd *, sec_ptr, const void *, file_ptr, bfd_size_type);
+extern long _bfd_elf_get_symtab_upper_bound
+  (bfd *);
+extern long _bfd_elf_canonicalize_symtab
+  (bfd *, asymbol **);
+extern long _bfd_elf_get_dynamic_symtab_upper_bound
+  (bfd *);
+extern long _bfd_elf_canonicalize_dynamic_symtab
+  (bfd *, asymbol **);
+extern long _bfd_elf_get_synthetic_symtab
+  (bfd *, long, asymbol **, long, asymbol **, asymbol **);
+extern long _bfd_elf_get_reloc_upper_bound
+  (bfd *, sec_ptr);
+extern long _bfd_elf_canonicalize_reloc
+  (bfd *, sec_ptr, arelent **, asymbol **);
+extern asection * _bfd_elf_get_dynamic_reloc_section
+  (bfd *, asection *, bfd_boolean);
+extern asection * _bfd_elf_make_dynamic_reloc_section
+  (asection *, bfd *, unsigned int, bfd *, bfd_boolean);
+extern long _bfd_elf_get_dynamic_reloc_upper_bound
+  (bfd *);
+extern long _bfd_elf_canonicalize_dynamic_reloc
+  (bfd *, arelent **, asymbol **);
+extern asymbol *_bfd_elf_make_empty_symbol
+  (bfd *);
+extern void _bfd_elf_get_symbol_info
+  (bfd *, asymbol *, symbol_info *);
+extern bfd_boolean _bfd_elf_is_local_label_name
+  (bfd *, const char *);
+extern alent *_bfd_elf_get_lineno
+  (bfd *, asymbol *);
+extern bfd_boolean _bfd_elf_set_arch_mach
+  (bfd *, enum bfd_architecture, unsigned long);
+extern bfd_boolean _bfd_elf_find_nearest_line
+  (bfd *, asection *, asymbol **, bfd_vma, const char **, const char **,
+   unsigned int *);
+extern bfd_boolean _bfd_elf_find_line
+  (bfd *, asymbol **, asymbol *, const char **, unsigned int *);
+#define _bfd_generic_find_line _bfd_elf_find_line
+extern bfd_boolean _bfd_elf_find_inliner_info
+  (bfd *, const char **, const char **, unsigned int *);
+#define _bfd_elf_read_minisymbols _bfd_generic_read_minisymbols
+#define _bfd_elf_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
+extern int _bfd_elf_sizeof_headers
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_elf_new_section_hook
+  (bfd *, asection *);
+extern bfd_boolean _bfd_elf_init_reloc_shdr
+  (bfd *, struct bfd_elf_section_reloc_data *, asection *, bfd_boolean);
+extern const struct bfd_elf_special_section *_bfd_elf_get_special_section
+  (const char *, const struct bfd_elf_special_section *, unsigned int);
+extern const struct bfd_elf_special_section *_bfd_elf_get_sec_type_attr
+  (bfd *, asection *);
+
+/* If the target doesn't have reloc handling written yet:  */
+extern void _bfd_elf_no_info_to_howto
+  (bfd *, arelent *, Elf_Internal_Rela *);
+
+extern bfd_boolean bfd_section_from_shdr
+  (bfd *, unsigned int shindex);
+extern bfd_boolean bfd_section_from_phdr
+  (bfd *, Elf_Internal_Phdr *, int);
+
+extern int _bfd_elf_symbol_from_bfd_symbol
+  (bfd *, asymbol **);
+
+extern Elf_Internal_Sym *bfd_sym_from_r_symndx
+  (struct sym_cache *, bfd *, unsigned long);
+extern asection *bfd_section_from_elf_index
+  (bfd *, unsigned int);
+extern struct bfd_strtab_hash *_bfd_elf_stringtab_init
+  (void);
+
+extern struct elf_strtab_hash * _bfd_elf_strtab_init
+  (void);
+extern void _bfd_elf_strtab_free
+  (struct elf_strtab_hash *);
+extern bfd_size_type _bfd_elf_strtab_add
+  (struct elf_strtab_hash *, const char *, bfd_boolean);
+extern void _bfd_elf_strtab_addref
+  (struct elf_strtab_hash *, bfd_size_type);
+extern void _bfd_elf_strtab_delref
+  (struct elf_strtab_hash *, bfd_size_type);
+extern void _bfd_elf_strtab_clear_all_refs
+  (struct elf_strtab_hash *);
+extern bfd_size_type _bfd_elf_strtab_size
+  (struct elf_strtab_hash *);
+extern bfd_size_type _bfd_elf_strtab_offset
+  (struct elf_strtab_hash *, bfd_size_type);
+extern bfd_boolean _bfd_elf_strtab_emit
+  (bfd *, struct elf_strtab_hash *);
+extern void _bfd_elf_strtab_finalize
+  (struct elf_strtab_hash *);
+
+extern void _bfd_elf_begin_eh_frame_parsing
+  (struct bfd_link_info *info);
+extern void _bfd_elf_parse_eh_frame
+  (bfd *, struct bfd_link_info *, asection *, struct elf_reloc_cookie *);
+extern void _bfd_elf_end_eh_frame_parsing
+  (struct bfd_link_info *info);
+
+extern bfd_boolean _bfd_elf_discard_section_eh_frame
+  (bfd *, struct bfd_link_info *, asection *,
+   bfd_boolean (*) (bfd_vma, void *), struct elf_reloc_cookie *);
+extern bfd_boolean _bfd_elf_discard_section_eh_frame_hdr
+  (bfd *, struct bfd_link_info *);
+extern bfd_vma _bfd_elf_eh_frame_section_offset
+  (bfd *, struct bfd_link_info *, asection *, bfd_vma);
+extern bfd_boolean _bfd_elf_write_section_eh_frame
+  (bfd *, struct bfd_link_info *, asection *, bfd_byte *);
+extern bfd_boolean _bfd_elf_write_section_eh_frame_hdr
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_elf_maybe_strip_eh_frame_hdr
+  (struct bfd_link_info *);
+
+extern bfd_boolean _bfd_elf_merge_symbol
+  (bfd *, struct bfd_link_info *, const char *, Elf_Internal_Sym *,
+   asection **, bfd_vma *, unsigned int *,
+   struct elf_link_hash_entry **, bfd_boolean *,
+   bfd_boolean *, bfd_boolean *, bfd_boolean *);
+
+extern bfd_boolean _bfd_elf_hash_symbol (struct elf_link_hash_entry *);
+
+extern long _bfd_elf_link_lookup_local_dynindx
+  (struct bfd_link_info *, bfd *, long);
+extern bfd_boolean _bfd_elf_compute_section_file_positions
+  (bfd *, struct bfd_link_info *);
+extern void _bfd_elf_assign_file_positions_for_relocs
+  (bfd *);
+extern file_ptr _bfd_elf_assign_file_position_for_section
+  (Elf_Internal_Shdr *, file_ptr, bfd_boolean);
+
+extern bfd_boolean _bfd_elf_validate_reloc
+  (bfd *, arelent *);
+
+extern bfd_boolean _bfd_elf_link_create_dynamic_sections
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_elf_link_omit_section_dynsym
+  (bfd *, struct bfd_link_info *, asection *);
+extern bfd_boolean _bfd_elf_create_dynamic_sections
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_elf_create_got_section
+  (bfd *, struct bfd_link_info *);
+extern struct elf_link_hash_entry *_bfd_elf_define_linkage_sym
+  (bfd *, struct bfd_link_info *, asection *, const char *);
+extern void _bfd_elf_init_1_index_section
+  (bfd *, struct bfd_link_info *);
+extern void _bfd_elf_init_2_index_sections
+  (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean _bfd_elfcore_make_pseudosection
+  (bfd *, char *, size_t, ufile_ptr);
+extern char *_bfd_elfcore_strndup
+  (bfd *, char *, size_t);
+
+extern Elf_Internal_Rela *_bfd_elf_link_read_relocs
+  (bfd *, asection *, void *, Elf_Internal_Rela *, bfd_boolean);
+
+extern bfd_boolean _bfd_elf_link_output_relocs
+  (bfd *, asection *, Elf_Internal_Shdr *, Elf_Internal_Rela *,
+   struct elf_link_hash_entry **);
+
+extern bfd_boolean _bfd_elf_adjust_dynamic_copy
+  (struct elf_link_hash_entry *, asection *);
+
+extern bfd_boolean _bfd_elf_dynamic_symbol_p
+  (struct elf_link_hash_entry *, struct bfd_link_info *, bfd_boolean);
+
+extern bfd_boolean _bfd_elf_symbol_refs_local_p
+  (struct elf_link_hash_entry *, struct bfd_link_info *, bfd_boolean);
+
+extern bfd_reloc_status_type bfd_elf_perform_complex_relocation
+  (bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, bfd_vma);
+
+extern bfd_boolean _bfd_elf_setup_sections
+  (bfd *);
+
+extern void _bfd_elf_set_osabi (bfd * , struct bfd_link_info *);
+
+extern const bfd_target *bfd_elf32_object_p
+  (bfd *);
+extern const bfd_target *bfd_elf32_core_file_p
+  (bfd *);
+extern char *bfd_elf32_core_file_failing_command
+  (bfd *);
+extern int bfd_elf32_core_file_failing_signal
+  (bfd *);
+extern bfd_boolean bfd_elf32_core_file_matches_executable_p
+  (bfd *, bfd *);
+extern int bfd_elf32_core_file_pid
+  (bfd *);
+
+extern bfd_boolean bfd_elf32_swap_symbol_in
+  (bfd *, const void *, const void *, Elf_Internal_Sym *);
+extern void bfd_elf32_swap_symbol_out
+  (bfd *, const Elf_Internal_Sym *, void *, void *);
+extern void bfd_elf32_swap_reloc_in
+  (bfd *, const bfd_byte *, Elf_Internal_Rela *);
+extern void bfd_elf32_swap_reloc_out
+  (bfd *, const Elf_Internal_Rela *, bfd_byte *);
+extern void bfd_elf32_swap_reloca_in
+  (bfd *, const bfd_byte *, Elf_Internal_Rela *);
+extern void bfd_elf32_swap_reloca_out
+  (bfd *, const Elf_Internal_Rela *, bfd_byte *);
+extern void bfd_elf32_swap_phdr_in
+  (bfd *, const Elf32_External_Phdr *, Elf_Internal_Phdr *);
+extern void bfd_elf32_swap_phdr_out
+  (bfd *, const Elf_Internal_Phdr *, Elf32_External_Phdr *);
+extern void bfd_elf32_swap_dyn_in
+  (bfd *, const void *, Elf_Internal_Dyn *);
+extern void bfd_elf32_swap_dyn_out
+  (bfd *, const Elf_Internal_Dyn *, void *);
+extern long bfd_elf32_slurp_symbol_table
+  (bfd *, asymbol **, bfd_boolean);
+extern bfd_boolean bfd_elf32_write_shdrs_and_ehdr
+  (bfd *);
+extern int bfd_elf32_write_out_phdrs
+  (bfd *, const Elf_Internal_Phdr *, unsigned int);
+extern bfd_boolean bfd_elf32_checksum_contents
+  (bfd * , void (*) (const void *, size_t, void *), void *);
+extern void bfd_elf32_write_relocs
+  (bfd *, asection *, void *);
+extern bfd_boolean bfd_elf32_slurp_reloc_table
+  (bfd *, asection *, asymbol **, bfd_boolean);
+
+extern const bfd_target *bfd_elf64_object_p
+  (bfd *);
+extern const bfd_target *bfd_elf64_core_file_p
+  (bfd *);
+extern char *bfd_elf64_core_file_failing_command
+  (bfd *);
+extern int bfd_elf64_core_file_failing_signal
+  (bfd *);
+extern bfd_boolean bfd_elf64_core_file_matches_executable_p
+  (bfd *, bfd *);
+extern int bfd_elf64_core_file_pid
+  (bfd *);
+
+extern bfd_boolean bfd_elf64_swap_symbol_in
+  (bfd *, const void *, const void *, Elf_Internal_Sym *);
+extern void bfd_elf64_swap_symbol_out
+  (bfd *, const Elf_Internal_Sym *, void *, void *);
+extern void bfd_elf64_swap_reloc_in
+  (bfd *, const bfd_byte *, Elf_Internal_Rela *);
+extern void bfd_elf64_swap_reloc_out
+  (bfd *, const Elf_Internal_Rela *, bfd_byte *);
+extern void bfd_elf64_swap_reloca_in
+  (bfd *, const bfd_byte *, Elf_Internal_Rela *);
+extern void bfd_elf64_swap_reloca_out
+  (bfd *, const Elf_Internal_Rela *, bfd_byte *);
+extern void bfd_elf64_swap_phdr_in
+  (bfd *, const Elf64_External_Phdr *, Elf_Internal_Phdr *);
+extern void bfd_elf64_swap_phdr_out
+  (bfd *, const Elf_Internal_Phdr *, Elf64_External_Phdr *);
+extern void bfd_elf64_swap_dyn_in
+  (bfd *, const void *, Elf_Internal_Dyn *);
+extern void bfd_elf64_swap_dyn_out
+  (bfd *, const Elf_Internal_Dyn *, void *);
+extern long bfd_elf64_slurp_symbol_table
+  (bfd *, asymbol **, bfd_boolean);
+extern bfd_boolean bfd_elf64_write_shdrs_and_ehdr
+  (bfd *);
+extern int bfd_elf64_write_out_phdrs
+  (bfd *, const Elf_Internal_Phdr *, unsigned int);
+extern bfd_boolean bfd_elf64_checksum_contents
+  (bfd * , void (*) (const void *, size_t, void *), void *);
+extern void bfd_elf64_write_relocs
+  (bfd *, asection *, void *);
+extern bfd_boolean bfd_elf64_slurp_reloc_table
+  (bfd *, asection *, asymbol **, bfd_boolean);
+
+extern bfd_boolean _bfd_elf_default_relocs_compatible
+  (const bfd_target *, const bfd_target *);
+
+extern bfd_boolean _bfd_elf_relocs_compatible
+  (const bfd_target *, const bfd_target *);
+
+extern struct elf_link_hash_entry *_bfd_elf_archive_symbol_lookup
+  (bfd *, struct bfd_link_info *, const char *);
+extern bfd_boolean bfd_elf_link_add_symbols
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_elf_add_dynamic_entry
+  (struct bfd_link_info *, bfd_vma, bfd_vma);
+
+extern bfd_boolean bfd_elf_link_record_dynamic_symbol
+  (struct bfd_link_info *, struct elf_link_hash_entry *);
+
+extern int bfd_elf_link_record_local_dynamic_symbol
+  (struct bfd_link_info *, bfd *, long);
+
+extern bfd_boolean _bfd_elf_close_and_cleanup
+  (bfd *);
+
+extern bfd_boolean _bfd_elf_common_definition
+  (Elf_Internal_Sym *);
+
+extern unsigned int _bfd_elf_common_section_index
+  (asection *);
+
+extern asection *_bfd_elf_common_section
+  (asection *);
+
+extern void _bfd_dwarf2_cleanup_debug_info
+  (bfd *);
+
+extern bfd_vma _bfd_elf_default_got_elt_size
+(bfd *, struct bfd_link_info *, struct elf_link_hash_entry *, bfd *,
+ unsigned long);
+
+extern bfd_reloc_status_type _bfd_elf_rel_vtable_reloc_fn
+  (bfd *, arelent *, struct bfd_symbol *, void *,
+   asection *, bfd *, char **);
+
+extern bfd_boolean bfd_elf_final_link
+  (bfd *, struct bfd_link_info *);
+
+extern void _bfd_elf_gc_keep
+  (struct bfd_link_info *info);
+
+extern bfd_boolean bfd_elf_gc_mark_dynamic_ref_symbol
+  (struct elf_link_hash_entry *h, void *inf);
+
+extern bfd_boolean bfd_elf_gc_sections
+  (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean bfd_elf_gc_record_vtinherit
+  (bfd *, asection *, struct elf_link_hash_entry *, bfd_vma);
+
+extern bfd_boolean bfd_elf_gc_record_vtentry
+  (bfd *, asection *, struct elf_link_hash_entry *, bfd_vma);
+
+extern asection *_bfd_elf_gc_mark_hook
+  (asection *, struct bfd_link_info *, Elf_Internal_Rela *,
+   struct elf_link_hash_entry *, Elf_Internal_Sym *);
+
+extern asection *_bfd_elf_gc_mark_rsec
+  (struct bfd_link_info *, asection *, elf_gc_mark_hook_fn,
+   struct elf_reloc_cookie *);
+
+extern bfd_boolean _bfd_elf_gc_mark_reloc
+  (struct bfd_link_info *, asection *, elf_gc_mark_hook_fn,
+   struct elf_reloc_cookie *);
+
+extern bfd_boolean _bfd_elf_gc_mark_fdes
+  (struct bfd_link_info *, asection *, asection *, elf_gc_mark_hook_fn,
+   struct elf_reloc_cookie *);
+
+extern bfd_boolean _bfd_elf_gc_mark
+  (struct bfd_link_info *, asection *, elf_gc_mark_hook_fn);
+
+extern bfd_boolean _bfd_elf_gc_mark_extra_sections
+  (struct bfd_link_info *, elf_gc_mark_hook_fn);
+
+extern bfd_boolean bfd_elf_gc_common_finalize_got_offsets
+  (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean bfd_elf_gc_common_final_link
+  (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean bfd_elf_reloc_symbol_deleted_p
+  (bfd_vma, void *);
+
+extern struct elf_segment_map * _bfd_elf_make_dynamic_segment
+  (bfd *, asection *);
+
+extern bfd_boolean _bfd_elf_map_sections_to_segments
+  (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean _bfd_elf_is_function_type (unsigned int);
+
+extern int bfd_elf_get_default_section_type (flagword);
+
+extern void bfd_elf_lookup_section_flags
+  (struct bfd_link_info *, struct flag_info *);
+
+extern Elf_Internal_Phdr * _bfd_elf_find_segment_containing_section
+  (bfd * abfd, asection * section);
+
+/* Exported interface for writing elf corefile notes. */
+extern char *elfcore_write_note
+  (bfd *, char *, int *, const char *, int, const void *, int);
+extern char *elfcore_write_prpsinfo
+  (bfd *, char *, int *, const char *, const char *);
+extern char *elfcore_write_prstatus
+  (bfd *, char *, int *, long, int, const void *);
+extern char * elfcore_write_pstatus
+  (bfd *, char *, int *, long, int, const void *);
+extern char *elfcore_write_prfpreg
+  (bfd *, char *, int *, const void *, int);
+extern char *elfcore_write_prxfpreg
+  (bfd *, char *, int *, const void *, int);
+extern char *elfcore_write_xstatereg
+  (bfd *, char *, int *, const void *, int);
+extern char *elfcore_write_ppc_vmx
+  (bfd *, char *, int *, const void *, int);
+extern char *elfcore_write_ppc_vsx
+  (bfd *, char *, int *, const void *, int);
+extern char *elfcore_write_s390_timer
+  (bfd *, char *, int *, const void *, int);
+extern char *elfcore_write_s390_todcmp
+  (bfd *, char *, int *, const void *, int);
+extern char *elfcore_write_s390_todpreg
+  (bfd *, char *, int *, const void *, int);
+extern char *elfcore_write_s390_ctrs
+  (bfd *, char *, int *, const void *, int);
+extern char *elfcore_write_s390_prefix
+  (bfd *, char *, int *, const void *, int);
+extern char *elfcore_write_arm_vfp
+  (bfd *, char *, int *, const void *, int);
+extern char *elfcore_write_lwpstatus
+  (bfd *, char *, int *, long, int, const void *);
+extern char *elfcore_write_register_note
+  (bfd *, char *, int *, const char *, const void *, int);
+
+extern bfd *_bfd_elf32_bfd_from_remote_memory
+  (bfd *templ, bfd_vma ehdr_vma, bfd_vma *loadbasep,
+   int (*target_read_memory) (bfd_vma, bfd_byte *, int));
+extern bfd *_bfd_elf64_bfd_from_remote_memory
+  (bfd *templ, bfd_vma ehdr_vma, bfd_vma *loadbasep,
+   int (*target_read_memory) (bfd_vma, bfd_byte *, int));
+
+extern bfd_vma bfd_elf_obj_attr_size (bfd *);
+extern void bfd_elf_set_obj_attr_contents (bfd *, bfd_byte *, bfd_vma);
+extern int bfd_elf_get_obj_attr_int (bfd *, int, int);
+extern void bfd_elf_add_obj_attr_int (bfd *, int, int, unsigned int);
+#define bfd_elf_add_proc_attr_int(BFD, TAG, VALUE) \
+  bfd_elf_add_obj_attr_int ((BFD), OBJ_ATTR_PROC, (TAG), (VALUE))
+extern void bfd_elf_add_obj_attr_string (bfd *, int, int, const char *);
+#define bfd_elf_add_proc_attr_string(BFD, TAG, VALUE) \
+  bfd_elf_add_obj_attr_string ((BFD), OBJ_ATTR_PROC, (TAG), (VALUE))
+extern void bfd_elf_add_obj_attr_int_string (bfd *, int, int, unsigned int,
+					     const char *);
+#define bfd_elf_add_proc_attr_int_string(BFD, TAG, INTVAL, STRVAL) \
+  bfd_elf_add_obj_attr_int_string ((BFD), OBJ_ATTR_PROC, (TAG), \
+				   (INTVAL), (STRVAL))
+
+extern char *_bfd_elf_attr_strdup (bfd *, const char *);
+extern void _bfd_elf_copy_obj_attributes (bfd *, bfd *);
+extern int _bfd_elf_obj_attrs_arg_type (bfd *, int, int);
+extern void _bfd_elf_parse_attributes (bfd *, Elf_Internal_Shdr *);
+extern bfd_boolean _bfd_elf_merge_object_attributes (bfd *, bfd *);
+extern bfd_boolean _bfd_elf_merge_unknown_attribute_low (bfd *, bfd *, int);
+extern bfd_boolean _bfd_elf_merge_unknown_attribute_list (bfd *, bfd *);
+extern Elf_Internal_Shdr *_bfd_elf_single_rel_hdr (asection *sec);
+
+/* The linker may need to keep track of the number of relocs that it
+   decides to copy as dynamic relocs in check_relocs for each symbol.
+   This is so that it can later discard them if they are found to be
+   unnecessary.  We can store the information in a field extending the
+   regular ELF linker hash table.  */
+
+struct elf_dyn_relocs
+{
+  struct elf_dyn_relocs *next;
+
+  /* The input section of the reloc.  */
+  asection *sec;
+
+  /* Total number of relocs copied for the input section.  */
+  bfd_size_type count;
+
+  /* Number of pc-relative relocs copied for the input section.  */
+  bfd_size_type pc_count;
+};
+
+extern bfd_boolean _bfd_elf_create_ifunc_sections
+  (bfd *, struct bfd_link_info *);
+extern asection * _bfd_elf_create_ifunc_dyn_reloc
+  (bfd *, struct bfd_link_info *, asection *sec, asection *sreloc,
+   struct elf_dyn_relocs **);
+extern bfd_boolean _bfd_elf_allocate_ifunc_dyn_relocs
+  (struct bfd_link_info *, struct elf_link_hash_entry *,
+   struct elf_dyn_relocs **, unsigned int, unsigned int);
+
+extern void elf_append_rela (bfd *, asection *, Elf_Internal_Rela *);
+extern void elf_append_rel (bfd *, asection *, Elf_Internal_Rela *);
+
+extern bfd_vma elf64_r_info (bfd_vma, bfd_vma);
+extern bfd_vma elf64_r_sym (bfd_vma);
+extern bfd_vma elf32_r_info (bfd_vma, bfd_vma);
+extern bfd_vma elf32_r_sym (bfd_vma);
+
+/* Large common section.  */
+extern asection _bfd_elf_large_com_section;
+
+/* Hash for local symbol with the first section id, ID, in the input
+   file and the local symbol index, SYM.  */
+#define ELF_LOCAL_SYMBOL_HASH(ID, SYM) \
+  (((((ID) & 0xff) << 24) | (((ID) & 0xff00) << 8)) \
+   ^ (SYM) ^ ((ID) >> 16))
+
+/* This is the condition under which finish_dynamic_symbol will be called.
+   If our finish_dynamic_symbol isn't called, we'll need to do something
+   about initializing any .plt and .got entries in relocate_section.  */
+#define WILL_CALL_FINISH_DYNAMIC_SYMBOL(DYN, SHARED, H) \
+  ((DYN)								\
+   && ((SHARED) || !(H)->forced_local)					\
+   && ((H)->dynindx != -1 || (H)->forced_local))
+
+/* This macro is to avoid lots of duplicated code in the body
+   of xxx_relocate_section() in the various elfxx-xxxx.c files.  */
+#define RELOC_FOR_GLOBAL_SYMBOL(info, input_bfd, input_section, rel,	\
+				r_symndx, symtab_hdr, sym_hashes,	\
+				h, sec, relocation,			\
+				unresolved_reloc, warned)		\
+  do									\
+    {									\
+      /* It seems this can happen with erroneous or unsupported		\
+	 input (mixing a.out and elf in an archive, for example.)  */	\
+      if (sym_hashes == NULL)						\
+	return FALSE;							\
+									\
+      h = sym_hashes[r_symndx - symtab_hdr->sh_info];			\
+									\
+      while (h->root.type == bfd_link_hash_indirect			\
+	     || h->root.type == bfd_link_hash_warning)			\
+	h = (struct elf_link_hash_entry *) h->root.u.i.link;		\
+									\
+      warned = FALSE;							\
+      unresolved_reloc = FALSE;						\
+      relocation = 0;							\
+      if (h->root.type == bfd_link_hash_defined				\
+	  || h->root.type == bfd_link_hash_defweak)			\
+	{								\
+	  sec = h->root.u.def.section;					\
+	  if (sec == NULL						\
+	      || sec->output_section == NULL)				\
+	    /* Set a flag that will be cleared later if we find a	\
+	       relocation value for this symbol.  output_section	\
+	       is typically NULL for symbols satisfied by a shared	\
+	       library.  */						\
+	    unresolved_reloc = TRUE;					\
+	  else								\
+	    relocation = (h->root.u.def.value				\
+			  + sec->output_section->vma			\
+			  + sec->output_offset);			\
+	}								\
+      else if (h->root.type == bfd_link_hash_undefweak)			\
+	;								\
+      else if (info->unresolved_syms_in_objects == RM_IGNORE		\
+	       && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT)		\
+	;								\
+      else if (!info->relocatable)					\
+	{								\
+	  bfd_boolean err;						\
+	  err = (info->unresolved_syms_in_objects == RM_GENERATE_ERROR	\
+		 || ELF_ST_VISIBILITY (h->other) != STV_DEFAULT);	\
+	  if (!info->callbacks->undefined_symbol (info,			\
+						  h->root.root.string,	\
+						  input_bfd,		\
+						  input_section,	\
+						  rel->r_offset, err))	\
+	    return FALSE;						\
+	  warned = TRUE;						\
+	}								\
+      (void) unresolved_reloc;						\
+      (void) warned;							\
+    }									\
+  while (0)
+
+/* This macro is to avoid lots of duplicated code in the body of the
+   loop over relocations in xxx_relocate_section() in the various
+   elfxx-xxxx.c files.
+
+   Handle relocations against symbols from removed linkonce sections,
+   or sections discarded by a linker script.  When doing a relocatable
+   link, we remove such relocations.  Otherwise, we just want the
+   section contents zeroed and avoid any special processing.  */
+#define RELOC_AGAINST_DISCARDED_SECTION(info, input_bfd, input_section,	\
+					rel, relend, howto, contents)	\
+  {									\
+    _bfd_clear_contents (howto, input_bfd, input_section,		\
+			 contents + rel->r_offset);			\
+									\
+    if (info->relocatable						\
+	&& (input_section->flags & SEC_DEBUGGING))			\
+      {									\
+	/* Only remove relocations in debug sections since other	\
+	   sections may require relocations.  */			\
+	Elf_Internal_Shdr *rel_hdr;					\
+									\
+	rel_hdr = _bfd_elf_single_rel_hdr (input_section->output_section); \
+									\
+	/* Avoid empty output section.  */				\
+	if (rel_hdr->sh_size > rel_hdr->sh_entsize)			\
+	  {								\
+	    rel_hdr->sh_size -= rel_hdr->sh_entsize;			\
+	    rel_hdr = _bfd_elf_single_rel_hdr (input_section);		\
+	    rel_hdr->sh_size -= rel_hdr->sh_entsize;			\
+									\
+	    memmove (rel, rel + 1, (relend - rel - 1) * sizeof (*rel));	\
+									\
+	    input_section->reloc_count--;				\
+	    relend--;							\
+	    rel--;							\
+	    continue;							\
+	  }								\
+      }									\
+									\
+    rel->r_info = 0;							\
+    rel->r_addend = 0;							\
+    continue;								\
+  }
+
+/* Will a symbol be bound to the the definition within the shared
+   library, if any.  A unique symbol can never be bound locally.  */
+#define SYMBOLIC_BIND(INFO, H) \
+    (!(H)->unique_global \
+     && ((INFO)->symbolic || ((INFO)->dynamic && !(H)->dynamic)))
+
+#endif /* _LIBELF_H_ */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf-eh-frame.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf-eh-frame.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf-eh-frame.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf-eh-frame.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1873 @@
+/* .eh_frame section optimization.
+   Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Jakub Jelinek <jakub@redhat.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "dwarf2.h"
+
+#define EH_FRAME_HDR_SIZE 8
+
+struct cie
+{
+  unsigned int length;
+  unsigned int hash;
+  unsigned char version;
+  unsigned char local_personality;
+  char augmentation[20];
+  bfd_vma code_align;
+  bfd_signed_vma data_align;
+  bfd_vma ra_column;
+  bfd_vma augmentation_size;
+  union {
+    struct elf_link_hash_entry *h;
+    bfd_vma val;
+    unsigned int reloc_index;
+  } personality;
+  asection *output_sec;
+  struct eh_cie_fde *cie_inf;
+  unsigned char per_encoding;
+  unsigned char lsda_encoding;
+  unsigned char fde_encoding;
+  unsigned char initial_insn_length;
+  unsigned char can_make_lsda_relative;
+  unsigned char initial_instructions[50];
+};
+
+
+
+/* If *ITER hasn't reached END yet, read the next byte into *RESULT and
+   move onto the next byte.  Return true on success.  */
+
+static inline bfd_boolean
+read_byte (bfd_byte **iter, bfd_byte *end, unsigned char *result)
+{
+  if (*iter >= end)
+    return FALSE;
+  *result = *((*iter)++);
+  return TRUE;
+}
+
+/* Move *ITER over LENGTH bytes, or up to END, whichever is closer.
+   Return true it was possible to move LENGTH bytes.  */
+
+static inline bfd_boolean
+skip_bytes (bfd_byte **iter, bfd_byte *end, bfd_size_type length)
+{
+  if ((bfd_size_type) (end - *iter) < length)
+    {
+      *iter = end;
+      return FALSE;
+    }
+  *iter += length;
+  return TRUE;
+}
+
+/* Move *ITER over an leb128, stopping at END.  Return true if the end
+   of the leb128 was found.  */
+
+static bfd_boolean
+skip_leb128 (bfd_byte **iter, bfd_byte *end)
+{
+  unsigned char byte;
+  do
+    if (!read_byte (iter, end, &byte))
+      return FALSE;
+  while (byte & 0x80);
+  return TRUE;
+}
+
+/* Like skip_leb128, but treat the leb128 as an unsigned value and
+   store it in *VALUE.  */
+
+static bfd_boolean
+read_uleb128 (bfd_byte **iter, bfd_byte *end, bfd_vma *value)
+{
+  bfd_byte *start, *p;
+
+  start = *iter;
+  if (!skip_leb128 (iter, end))
+    return FALSE;
+
+  p = *iter;
+  *value = *--p;
+  while (p > start)
+    *value = (*value << 7) | (*--p & 0x7f);
+
+  return TRUE;
+}
+
+/* Like read_uleb128, but for signed values.  */
+
+static bfd_boolean
+read_sleb128 (bfd_byte **iter, bfd_byte *end, bfd_signed_vma *value)
+{
+  bfd_byte *start, *p;
+
+  start = *iter;
+  if (!skip_leb128 (iter, end))
+    return FALSE;
+
+  p = *iter;
+  *value = ((*--p & 0x7f) ^ 0x40) - 0x40;
+  while (p > start)
+    *value = (*value << 7) | (*--p & 0x7f);
+
+  return TRUE;
+}
+
+/* Return 0 if either encoding is variable width, or not yet known to bfd.  */
+
+static
+int get_DW_EH_PE_width (int encoding, int ptr_size)
+{
+  /* DW_EH_PE_ values of 0x60 and 0x70 weren't defined at the time .eh_frame
+     was added to bfd.  */
+  if ((encoding & 0x60) == 0x60)
+    return 0;
+
+  switch (encoding & 7)
+    {
+    case DW_EH_PE_udata2: return 2;
+    case DW_EH_PE_udata4: return 4;
+    case DW_EH_PE_udata8: return 8;
+    case DW_EH_PE_absptr: return ptr_size;
+    default:
+      break;
+    }
+
+  return 0;
+}
+
+#define get_DW_EH_PE_signed(encoding) (((encoding) & DW_EH_PE_signed) != 0)
+
+/* Read a width sized value from memory.  */
+
+static bfd_vma
+read_value (bfd *abfd, bfd_byte *buf, int width, int is_signed)
+{
+  bfd_vma value;
+
+  switch (width)
+    {
+    case 2:
+      if (is_signed)
+	value = bfd_get_signed_16 (abfd, buf);
+      else
+	value = bfd_get_16 (abfd, buf);
+      break;
+    case 4:
+      if (is_signed)
+	value = bfd_get_signed_32 (abfd, buf);
+      else
+	value = bfd_get_32 (abfd, buf);
+      break;
+    case 8:
+      if (is_signed)
+	value = bfd_get_signed_64 (abfd, buf);
+      else
+	value = bfd_get_64 (abfd, buf);
+      break;
+    default:
+      BFD_FAIL ();
+      return 0;
+    }
+
+  return value;
+}
+
+/* Store a width sized value to memory.  */
+
+static void
+write_value (bfd *abfd, bfd_byte *buf, bfd_vma value, int width)
+{
+  switch (width)
+    {
+    case 2: bfd_put_16 (abfd, value, buf); break;
+    case 4: bfd_put_32 (abfd, value, buf); break;
+    case 8: bfd_put_64 (abfd, value, buf); break;
+    default: BFD_FAIL ();
+    }
+}
+
+/* Return one if C1 and C2 CIEs can be merged.  */
+
+static int
+cie_eq (const void *e1, const void *e2)
+{
+  const struct cie *c1 = (const struct cie *) e1;
+  const struct cie *c2 = (const struct cie *) e2;
+
+  if (c1->hash == c2->hash
+      && c1->length == c2->length
+      && c1->version == c2->version
+      && c1->local_personality == c2->local_personality
+      && strcmp (c1->augmentation, c2->augmentation) == 0
+      && strcmp (c1->augmentation, "eh") != 0
+      && c1->code_align == c2->code_align
+      && c1->data_align == c2->data_align
+      && c1->ra_column == c2->ra_column
+      && c1->augmentation_size == c2->augmentation_size
+      && memcmp (&c1->personality, &c2->personality,
+		 sizeof (c1->personality)) == 0
+      && c1->output_sec == c2->output_sec
+      && c1->per_encoding == c2->per_encoding
+      && c1->lsda_encoding == c2->lsda_encoding
+      && c1->fde_encoding == c2->fde_encoding
+      && c1->initial_insn_length == c2->initial_insn_length
+      && memcmp (c1->initial_instructions,
+		 c2->initial_instructions,
+		 c1->initial_insn_length) == 0)
+    return 1;
+
+  return 0;
+}
+
+static hashval_t
+cie_hash (const void *e)
+{
+  const struct cie *c = (const struct cie *) e;
+  return c->hash;
+}
+
+static hashval_t
+cie_compute_hash (struct cie *c)
+{
+  hashval_t h = 0;
+  h = iterative_hash_object (c->length, h);
+  h = iterative_hash_object (c->version, h);
+  h = iterative_hash (c->augmentation, strlen (c->augmentation) + 1, h);
+  h = iterative_hash_object (c->code_align, h);
+  h = iterative_hash_object (c->data_align, h);
+  h = iterative_hash_object (c->ra_column, h);
+  h = iterative_hash_object (c->augmentation_size, h);
+  h = iterative_hash_object (c->personality, h);
+  h = iterative_hash_object (c->output_sec, h);
+  h = iterative_hash_object (c->per_encoding, h);
+  h = iterative_hash_object (c->lsda_encoding, h);
+  h = iterative_hash_object (c->fde_encoding, h);
+  h = iterative_hash_object (c->initial_insn_length, h);
+  h = iterative_hash (c->initial_instructions, c->initial_insn_length, h);
+  c->hash = h;
+  return h;
+}
+
+/* Return the number of extra bytes that we'll be inserting into
+   ENTRY's augmentation string.  */
+
+static INLINE unsigned int
+extra_augmentation_string_bytes (struct eh_cie_fde *entry)
+{
+  unsigned int size = 0;
+  if (entry->cie)
+    {
+      if (entry->add_augmentation_size)
+	size++;
+      if (entry->u.cie.add_fde_encoding)
+	size++;
+    }
+  return size;
+}
+
+/* Likewise ENTRY's augmentation data.  */
+
+static INLINE unsigned int
+extra_augmentation_data_bytes (struct eh_cie_fde *entry)
+{
+  unsigned int size = 0;
+  if (entry->add_augmentation_size)
+    size++;
+  if (entry->cie && entry->u.cie.add_fde_encoding)
+    size++;
+  return size;
+}
+
+/* Return the size that ENTRY will have in the output.  ALIGNMENT is the
+   required alignment of ENTRY in bytes.  */
+
+static unsigned int
+size_of_output_cie_fde (struct eh_cie_fde *entry, unsigned int alignment)
+{
+  if (entry->removed)
+    return 0;
+  if (entry->size == 4)
+    return 4;
+  return (entry->size
+	  + extra_augmentation_string_bytes (entry)
+	  + extra_augmentation_data_bytes (entry)
+	  + alignment - 1) & -alignment;
+}
+
+/* Assume that the bytes between *ITER and END are CFA instructions.
+   Try to move *ITER past the first instruction and return true on
+   success.  ENCODED_PTR_WIDTH gives the width of pointer entries.  */
+
+static bfd_boolean
+skip_cfa_op (bfd_byte **iter, bfd_byte *end, unsigned int encoded_ptr_width)
+{
+  bfd_byte op;
+  bfd_vma length;
+
+  if (!read_byte (iter, end, &op))
+    return FALSE;
+
+  switch (op & 0xc0 ? op & 0xc0 : op)
+    {
+    case DW_CFA_nop:
+    case DW_CFA_advance_loc:
+    case DW_CFA_restore:
+    case DW_CFA_remember_state:
+    case DW_CFA_restore_state:
+    case DW_CFA_GNU_window_save:
+      /* No arguments.  */
+      return TRUE;
+
+    case DW_CFA_offset:
+    case DW_CFA_restore_extended:
+    case DW_CFA_undefined:
+    case DW_CFA_same_value:
+    case DW_CFA_def_cfa_register:
+    case DW_CFA_def_cfa_offset:
+    case DW_CFA_def_cfa_offset_sf:
+    case DW_CFA_GNU_args_size:
+      /* One leb128 argument.  */
+      return skip_leb128 (iter, end);
+
+    case DW_CFA_val_offset:
+    case DW_CFA_val_offset_sf:
+    case DW_CFA_offset_extended:
+    case DW_CFA_register:
+    case DW_CFA_def_cfa:
+    case DW_CFA_offset_extended_sf:
+    case DW_CFA_GNU_negative_offset_extended:
+    case DW_CFA_def_cfa_sf:
+      /* Two leb128 arguments.  */
+      return (skip_leb128 (iter, end)
+	      && skip_leb128 (iter, end));
+
+    case DW_CFA_def_cfa_expression:
+      /* A variable-length argument.  */
+      return (read_uleb128 (iter, end, &length)
+	      && skip_bytes (iter, end, length));
+
+    case DW_CFA_expression:
+    case DW_CFA_val_expression:
+      /* A leb128 followed by a variable-length argument.  */
+      return (skip_leb128 (iter, end)
+	      && read_uleb128 (iter, end, &length)
+	      && skip_bytes (iter, end, length));
+
+    case DW_CFA_set_loc:
+      return skip_bytes (iter, end, encoded_ptr_width);
+
+    case DW_CFA_advance_loc1:
+      return skip_bytes (iter, end, 1);
+
+    case DW_CFA_advance_loc2:
+      return skip_bytes (iter, end, 2);
+
+    case DW_CFA_advance_loc4:
+      return skip_bytes (iter, end, 4);
+
+    case DW_CFA_MIPS_advance_loc8:
+      return skip_bytes (iter, end, 8);
+
+    default:
+      return FALSE;
+    }
+}
+
+/* Try to interpret the bytes between BUF and END as CFA instructions.
+   If every byte makes sense, return a pointer to the first DW_CFA_nop
+   padding byte, or END if there is no padding.  Return null otherwise.
+   ENCODED_PTR_WIDTH is as for skip_cfa_op.  */
+
+static bfd_byte *
+skip_non_nops (bfd_byte *buf, bfd_byte *end, unsigned int encoded_ptr_width,
+	       unsigned int *set_loc_count)
+{
+  bfd_byte *last;
+
+  last = buf;
+  while (buf < end)
+    if (*buf == DW_CFA_nop)
+      buf++;
+    else
+      {
+	if (*buf == DW_CFA_set_loc)
+	  ++*set_loc_count;
+	if (!skip_cfa_op (&buf, end, encoded_ptr_width))
+	  return 0;
+	last = buf;
+      }
+  return last;
+}
+
+/* Convert absolute encoding ENCODING into PC-relative form.
+   SIZE is the size of a pointer.  */
+
+static unsigned char
+make_pc_relative (unsigned char encoding, unsigned int ptr_size)
+{
+  if ((encoding & 0x7f) == DW_EH_PE_absptr)
+    switch (ptr_size)
+      {
+      case 2:
+	encoding |= DW_EH_PE_sdata2;
+	break;
+      case 4:
+	encoding |= DW_EH_PE_sdata4;
+	break;
+      case 8:
+	encoding |= DW_EH_PE_sdata8;
+	break;
+      }
+  return encoding | DW_EH_PE_pcrel;
+}
+
+/* Called before calling _bfd_elf_parse_eh_frame on every input bfd's
+   .eh_frame section.  */
+
+void
+_bfd_elf_begin_eh_frame_parsing (struct bfd_link_info *info)
+{
+  struct eh_frame_hdr_info *hdr_info;
+
+  hdr_info = &elf_hash_table (info)->eh_info;
+  hdr_info->merge_cies = !info->relocatable;
+}
+
+/* Try to parse .eh_frame section SEC, which belongs to ABFD.  Store the
+   information in the section's sec_info field on success.  COOKIE
+   describes the relocations in SEC.  */
+
+void
+_bfd_elf_parse_eh_frame (bfd *abfd, struct bfd_link_info *info,
+			 asection *sec, struct elf_reloc_cookie *cookie)
+{
+#define REQUIRE(COND)					\
+  do							\
+    if (!(COND))					\
+      goto free_no_table;				\
+  while (0)
+
+  bfd_byte *ehbuf = NULL, *buf, *end;
+  bfd_byte *last_fde;
+  struct eh_cie_fde *this_inf;
+  unsigned int hdr_length, hdr_id;
+  unsigned int cie_count;
+  struct cie *cie, *local_cies = NULL;
+  struct elf_link_hash_table *htab;
+  struct eh_frame_hdr_info *hdr_info;
+  struct eh_frame_sec_info *sec_info = NULL;
+  unsigned int ptr_size;
+  unsigned int num_cies;
+  unsigned int num_entries;
+  elf_gc_mark_hook_fn gc_mark_hook;
+
+  htab = elf_hash_table (info);
+  hdr_info = &htab->eh_info;
+  if (hdr_info->parsed_eh_frames)
+    return;
+
+  if (sec->size == 0
+      || sec->sec_info_type != ELF_INFO_TYPE_NONE)
+    {
+      /* This file does not contain .eh_frame information.  */
+      return;
+    }
+
+  if (bfd_is_abs_section (sec->output_section))
+    {
+      /* At least one of the sections is being discarded from the
+	 link, so we should just ignore them.  */
+      return;
+    }
+
+  /* Read the frame unwind information from abfd.  */
+
+  REQUIRE (bfd_malloc_and_get_section (abfd, sec, &ehbuf));
+
+  if (sec->size >= 4
+      && bfd_get_32 (abfd, ehbuf) == 0
+      && cookie->rel == cookie->relend)
+    {
+      /* Empty .eh_frame section.  */
+      free (ehbuf);
+      return;
+    }
+
+  /* If .eh_frame section size doesn't fit into int, we cannot handle
+     it (it would need to use 64-bit .eh_frame format anyway).  */
+  REQUIRE (sec->size == (unsigned int) sec->size);
+
+  ptr_size = (get_elf_backend_data (abfd)
+	      ->elf_backend_eh_frame_address_size (abfd, sec));
+  REQUIRE (ptr_size != 0);
+
+  /* Go through the section contents and work out how many FDEs and
+     CIEs there are.  */
+  buf = ehbuf;
+  end = ehbuf + sec->size;
+  num_cies = 0;
+  num_entries = 0;
+  while (buf != end)
+    {
+      num_entries++;
+
+      /* Read the length of the entry.  */
+      REQUIRE (skip_bytes (&buf, end, 4));
+      hdr_length = bfd_get_32 (abfd, buf - 4);
+
+      /* 64-bit .eh_frame is not supported.  */
+      REQUIRE (hdr_length != 0xffffffff);
+      if (hdr_length == 0)
+	break;
+
+      REQUIRE (skip_bytes (&buf, end, 4));
+      hdr_id = bfd_get_32 (abfd, buf - 4);
+      if (hdr_id == 0)
+	num_cies++;
+
+      REQUIRE (skip_bytes (&buf, end, hdr_length - 4));
+    }
+
+  sec_info = (struct eh_frame_sec_info *)
+      bfd_zmalloc (sizeof (struct eh_frame_sec_info)
+                   + (num_entries - 1) * sizeof (struct eh_cie_fde));
+  REQUIRE (sec_info);
+
+  /* We need to have a "struct cie" for each CIE in this section.  */
+  local_cies = (struct cie *) bfd_zmalloc (num_cies * sizeof (*local_cies));
+  REQUIRE (local_cies);
+
+  /* FIXME: octets_per_byte.  */
+#define ENSURE_NO_RELOCS(buf)				\
+  REQUIRE (!(cookie->rel < cookie->relend		\
+	     && (cookie->rel->r_offset			\
+		 < (bfd_size_type) ((buf) - ehbuf))	\
+	     && cookie->rel->r_info != 0))
+
+  /* FIXME: octets_per_byte.  */
+#define SKIP_RELOCS(buf)				\
+  while (cookie->rel < cookie->relend			\
+	 && (cookie->rel->r_offset			\
+	     < (bfd_size_type) ((buf) - ehbuf)))	\
+    cookie->rel++
+
+  /* FIXME: octets_per_byte.  */
+#define GET_RELOC(buf)					\
+  ((cookie->rel < cookie->relend			\
+    && (cookie->rel->r_offset				\
+	== (bfd_size_type) ((buf) - ehbuf)))		\
+   ? cookie->rel : NULL)
+
+  buf = ehbuf;
+  cie_count = 0;
+  gc_mark_hook = get_elf_backend_data (abfd)->gc_mark_hook;
+  while ((bfd_size_type) (buf - ehbuf) != sec->size)
+    {
+      char *aug;
+      bfd_byte *start, *insns, *insns_end;
+      bfd_size_type length;
+      unsigned int set_loc_count;
+
+      this_inf = sec_info->entry + sec_info->count;
+      last_fde = buf;
+
+      /* Read the length of the entry.  */
+      REQUIRE (skip_bytes (&buf, ehbuf + sec->size, 4));
+      hdr_length = bfd_get_32 (abfd, buf - 4);
+
+      /* The CIE/FDE must be fully contained in this input section.  */
+      REQUIRE ((bfd_size_type) (buf - ehbuf) + hdr_length <= sec->size);
+      end = buf + hdr_length;
+
+      this_inf->offset = last_fde - ehbuf;
+      this_inf->size = 4 + hdr_length;
+      this_inf->reloc_index = cookie->rel - cookie->rels;
+
+      if (hdr_length == 0)
+	{
+	  /* A zero-length CIE should only be found at the end of
+	     the section.  */
+	  REQUIRE ((bfd_size_type) (buf - ehbuf) == sec->size);
+	  ENSURE_NO_RELOCS (buf);
+	  sec_info->count++;
+	  break;
+	}
+
+      REQUIRE (skip_bytes (&buf, end, 4));
+      hdr_id = bfd_get_32 (abfd, buf - 4);
+
+      if (hdr_id == 0)
+	{
+	  unsigned int initial_insn_length;
+
+	  /* CIE  */
+	  this_inf->cie = 1;
+
+	  /* Point CIE to one of the section-local cie structures.  */
+	  cie = local_cies + cie_count++;
+
+	  cie->cie_inf = this_inf;
+	  cie->length = hdr_length;
+	  cie->output_sec = sec->output_section;
+	  start = buf;
+	  REQUIRE (read_byte (&buf, end, &cie->version));
+
+	  /* Cannot handle unknown versions.  */
+	  REQUIRE (cie->version == 1
+		   || cie->version == 3
+		   || cie->version == 4);
+	  REQUIRE (strlen ((char *) buf) < sizeof (cie->augmentation));
+
+	  strcpy (cie->augmentation, (char *) buf);
+	  buf = (bfd_byte *) strchr ((char *) buf, '\0') + 1;
+	  ENSURE_NO_RELOCS (buf);
+	  if (buf[0] == 'e' && buf[1] == 'h')
+	    {
+	      /* GCC < 3.0 .eh_frame CIE */
+	      /* We cannot merge "eh" CIEs because __EXCEPTION_TABLE__
+		 is private to each CIE, so we don't need it for anything.
+		 Just skip it.  */
+	      REQUIRE (skip_bytes (&buf, end, ptr_size));
+	      SKIP_RELOCS (buf);
+	    }
+	  if (cie->version >= 4)
+	    {
+	      REQUIRE (buf + 1 < end);
+	      REQUIRE (buf[0] == ptr_size);
+	      REQUIRE (buf[1] == 0);
+	      buf += 2;
+	    }
+	  REQUIRE (read_uleb128 (&buf, end, &cie->code_align));
+	  REQUIRE (read_sleb128 (&buf, end, &cie->data_align));
+	  if (cie->version == 1)
+	    {
+	      REQUIRE (buf < end);
+	      cie->ra_column = *buf++;
+	    }
+	  else
+	    REQUIRE (read_uleb128 (&buf, end, &cie->ra_column));
+	  ENSURE_NO_RELOCS (buf);
+	  cie->lsda_encoding = DW_EH_PE_omit;
+	  cie->fde_encoding = DW_EH_PE_omit;
+	  cie->per_encoding = DW_EH_PE_omit;
+	  aug = cie->augmentation;
+	  if (aug[0] != 'e' || aug[1] != 'h')
+	    {
+	      if (*aug == 'z')
+		{
+		  aug++;
+		  REQUIRE (read_uleb128 (&buf, end, &cie->augmentation_size));
+	  	  ENSURE_NO_RELOCS (buf);
+		}
+
+	      while (*aug != '\0')
+		switch (*aug++)
+		  {
+		  case 'L':
+		    REQUIRE (read_byte (&buf, end, &cie->lsda_encoding));
+		    ENSURE_NO_RELOCS (buf);
+		    REQUIRE (get_DW_EH_PE_width (cie->lsda_encoding, ptr_size));
+		    break;
+		  case 'R':
+		    REQUIRE (read_byte (&buf, end, &cie->fde_encoding));
+		    ENSURE_NO_RELOCS (buf);
+		    REQUIRE (get_DW_EH_PE_width (cie->fde_encoding, ptr_size));
+		    break;
+		  case 'S':
+		    break;
+		  case 'P':
+		    {
+		      int per_width;
+
+		      REQUIRE (read_byte (&buf, end, &cie->per_encoding));
+		      per_width = get_DW_EH_PE_width (cie->per_encoding,
+						      ptr_size);
+		      REQUIRE (per_width);
+		      if ((cie->per_encoding & 0x70) == DW_EH_PE_aligned)
+			{
+			  length = -(buf - ehbuf) & (per_width - 1);
+			  REQUIRE (skip_bytes (&buf, end, length));
+			}
+		      this_inf->u.cie.personality_offset = buf - start;
+		      ENSURE_NO_RELOCS (buf);
+		      /* Ensure we have a reloc here.  */
+		      REQUIRE (GET_RELOC (buf));
+		      cie->personality.reloc_index
+			= cookie->rel - cookie->rels;
+		      /* Cope with MIPS-style composite relocations.  */
+		      do
+			cookie->rel++;
+		      while (GET_RELOC (buf) != NULL);
+		      REQUIRE (skip_bytes (&buf, end, per_width));
+		    }
+		    break;
+		  default:
+		    /* Unrecognized augmentation. Better bail out.  */
+		    goto free_no_table;
+		  }
+	    }
+
+	  /* For shared libraries, try to get rid of as many RELATIVE relocs
+	     as possible.  */
+	  if (info->shared
+	      && (get_elf_backend_data (abfd)
+		  ->elf_backend_can_make_relative_eh_frame
+		  (abfd, info, sec)))
+	    {
+	      if ((cie->fde_encoding & 0x70) == DW_EH_PE_absptr)
+		this_inf->make_relative = 1;
+	      /* If the CIE doesn't already have an 'R' entry, it's fairly
+		 easy to add one, provided that there's no aligned data
+		 after the augmentation string.  */
+	      else if (cie->fde_encoding == DW_EH_PE_omit
+		       && (cie->per_encoding & 0x70) != DW_EH_PE_aligned)
+		{
+		  if (*cie->augmentation == 0)
+		    this_inf->add_augmentation_size = 1;
+		  this_inf->u.cie.add_fde_encoding = 1;
+		  this_inf->make_relative = 1;
+		}
+
+	      if ((cie->lsda_encoding & 0x70) == DW_EH_PE_absptr)
+		cie->can_make_lsda_relative = 1;
+	    }
+
+	  /* If FDE encoding was not specified, it defaults to
+	     DW_EH_absptr.  */
+	  if (cie->fde_encoding == DW_EH_PE_omit)
+	    cie->fde_encoding = DW_EH_PE_absptr;
+
+	  initial_insn_length = end - buf;
+	  if (initial_insn_length <= sizeof (cie->initial_instructions))
+	    {
+	      cie->initial_insn_length = initial_insn_length;
+	      memcpy (cie->initial_instructions, buf, initial_insn_length);
+	    }
+	  insns = buf;
+	  buf += initial_insn_length;
+	  ENSURE_NO_RELOCS (buf);
+
+	  if (hdr_info->merge_cies)
+	    this_inf->u.cie.u.full_cie = cie;
+	  this_inf->u.cie.per_encoding_relative
+	    = (cie->per_encoding & 0x70) == DW_EH_PE_pcrel;
+	}
+      else
+	{
+	  /* Find the corresponding CIE.  */
+	  unsigned int cie_offset = this_inf->offset + 4 - hdr_id;
+	  for (cie = local_cies; cie < local_cies + cie_count; cie++)
+	    if (cie_offset == cie->cie_inf->offset)
+	      break;
+
+	  /* Ensure this FDE references one of the CIEs in this input
+	     section.  */
+	  REQUIRE (cie != local_cies + cie_count);
+	  this_inf->u.fde.cie_inf = cie->cie_inf;
+	  this_inf->make_relative = cie->cie_inf->make_relative;
+	  this_inf->add_augmentation_size
+	    = cie->cie_inf->add_augmentation_size;
+
+	  ENSURE_NO_RELOCS (buf);
+	  if ((sec->flags & SEC_LINKER_CREATED) == 0 || cookie->rels != NULL)
+	    {
+	      asection *rsec;
+
+	      REQUIRE (GET_RELOC (buf));
+
+	      /* Chain together the FDEs for each section.  */
+	      rsec = _bfd_elf_gc_mark_rsec (info, sec, gc_mark_hook, cookie);
+	      /* RSEC will be NULL if FDE was cleared out as it was belonging to
+		 a discarded SHT_GROUP.  */
+	      if (rsec)
+		{
+		  REQUIRE (rsec->owner == abfd);
+		  this_inf->u.fde.next_for_section = elf_fde_list (rsec);
+		  elf_fde_list (rsec) = this_inf;
+		}
+	    }
+
+	  /* Skip the initial location and address range.  */
+	  start = buf;
+	  length = get_DW_EH_PE_width (cie->fde_encoding, ptr_size);
+	  REQUIRE (skip_bytes (&buf, end, 2 * length));
+
+	  /* Skip the augmentation size, if present.  */
+	  if (cie->augmentation[0] == 'z')
+	    REQUIRE (read_uleb128 (&buf, end, &length));
+	  else
+	    length = 0;
+
+	  /* Of the supported augmentation characters above, only 'L'
+	     adds augmentation data to the FDE.  This code would need to
+	     be adjusted if any future augmentations do the same thing.  */
+	  if (cie->lsda_encoding != DW_EH_PE_omit)
+	    {
+	      SKIP_RELOCS (buf);
+	      if (cie->can_make_lsda_relative && GET_RELOC (buf))
+		cie->cie_inf->u.cie.make_lsda_relative = 1;
+	      this_inf->lsda_offset = buf - start;
+	      /* If there's no 'z' augmentation, we don't know where the
+		 CFA insns begin.  Assume no padding.  */
+	      if (cie->augmentation[0] != 'z')
+		length = end - buf;
+	    }
+
+	  /* Skip over the augmentation data.  */
+	  REQUIRE (skip_bytes (&buf, end, length));
+	  insns = buf;
+
+	  buf = last_fde + 4 + hdr_length;
+
+	  /* For NULL RSEC (cleared FDE belonging to a discarded section)
+	     the relocations are commonly cleared.  We do not sanity check if
+	     all these relocations are cleared as (1) relocations to
+	     .gcc_except_table will remain uncleared (they will get dropped
+	     with the drop of this unused FDE) and (2) BFD already safely drops
+	     relocations of any type to .eh_frame by
+	     elf_section_ignore_discarded_relocs.
+	     TODO: The .gcc_except_table entries should be also filtered as
+	     .eh_frame entries; or GCC could rather use COMDAT for them.  */
+	  SKIP_RELOCS (buf);
+	}
+
+      /* Try to interpret the CFA instructions and find the first
+	 padding nop.  Shrink this_inf's size so that it doesn't
+	 include the padding.  */
+      length = get_DW_EH_PE_width (cie->fde_encoding, ptr_size);
+      set_loc_count = 0;
+      insns_end = skip_non_nops (insns, end, length, &set_loc_count);
+      /* If we don't understand the CFA instructions, we can't know
+	 what needs to be adjusted there.  */
+      if (insns_end == NULL
+	  /* For the time being we don't support DW_CFA_set_loc in
+	     CIE instructions.  */
+	  || (set_loc_count && this_inf->cie))
+	goto free_no_table;
+      this_inf->size -= end - insns_end;
+      if (insns_end != end && this_inf->cie)
+	{
+	  cie->initial_insn_length -= end - insns_end;
+	  cie->length -= end - insns_end;
+	}
+      if (set_loc_count
+	  && ((cie->fde_encoding & 0x70) == DW_EH_PE_pcrel
+	      || this_inf->make_relative))
+	{
+	  unsigned int cnt;
+	  bfd_byte *p;
+
+	  this_inf->set_loc = (unsigned int *)
+              bfd_malloc ((set_loc_count + 1) * sizeof (unsigned int));
+	  REQUIRE (this_inf->set_loc);
+	  this_inf->set_loc[0] = set_loc_count;
+	  p = insns;
+	  cnt = 0;
+	  while (p < end)
+	    {
+	      if (*p == DW_CFA_set_loc)
+		this_inf->set_loc[++cnt] = p + 1 - start;
+	      REQUIRE (skip_cfa_op (&p, end, length));
+	    }
+	}
+
+      this_inf->removed = 1;
+      this_inf->fde_encoding = cie->fde_encoding;
+      this_inf->lsda_encoding = cie->lsda_encoding;
+      sec_info->count++;
+    }
+  BFD_ASSERT (sec_info->count == num_entries);
+  BFD_ASSERT (cie_count == num_cies);
+
+  elf_section_data (sec)->sec_info = sec_info;
+  sec->sec_info_type = ELF_INFO_TYPE_EH_FRAME;
+  if (hdr_info->merge_cies)
+    {
+      sec_info->cies = local_cies;
+      local_cies = NULL;
+    }
+  goto success;
+
+ free_no_table:
+  (*info->callbacks->einfo)
+    (_("%P: error in %B(%A); no .eh_frame_hdr table will be created.\n"),
+     abfd, sec);
+  hdr_info->table = FALSE;
+  if (sec_info)
+    free (sec_info);
+ success:
+  if (ehbuf)
+    free (ehbuf);
+  if (local_cies)
+    free (local_cies);
+#undef REQUIRE
+}
+
+/* Finish a pass over all .eh_frame sections.  */
+
+void
+_bfd_elf_end_eh_frame_parsing (struct bfd_link_info *info)
+{
+  struct eh_frame_hdr_info *hdr_info;
+
+  hdr_info = &elf_hash_table (info)->eh_info;
+  hdr_info->parsed_eh_frames = TRUE;
+}
+
+/* Mark all relocations against CIE or FDE ENT, which occurs in
+   .eh_frame section SEC.  COOKIE describes the relocations in SEC;
+   its "rel" field can be changed freely.  */
+
+static bfd_boolean
+mark_entry (struct bfd_link_info *info, asection *sec,
+	    struct eh_cie_fde *ent, elf_gc_mark_hook_fn gc_mark_hook,
+	    struct elf_reloc_cookie *cookie)
+{
+  /* FIXME: octets_per_byte.  */
+  for (cookie->rel = cookie->rels + ent->reloc_index;
+       cookie->rel < cookie->relend
+	 && cookie->rel->r_offset < ent->offset + ent->size;
+       cookie->rel++)
+    if (!_bfd_elf_gc_mark_reloc (info, sec, gc_mark_hook, cookie))
+      return FALSE;
+
+  return TRUE;
+}
+
+/* Mark all the relocations against FDEs that relate to code in input
+   section SEC.  The FDEs belong to .eh_frame section EH_FRAME, whose
+   relocations are described by COOKIE.  */
+
+bfd_boolean
+_bfd_elf_gc_mark_fdes (struct bfd_link_info *info, asection *sec,
+		       asection *eh_frame, elf_gc_mark_hook_fn gc_mark_hook,
+		       struct elf_reloc_cookie *cookie)
+{
+  struct eh_cie_fde *fde, *cie;
+
+  for (fde = elf_fde_list (sec); fde; fde = fde->u.fde.next_for_section)
+    {
+      if (!mark_entry (info, eh_frame, fde, gc_mark_hook, cookie))
+	return FALSE;
+
+      /* At this stage, all cie_inf fields point to local CIEs, so we
+	 can use the same cookie to refer to them.  */
+      cie = fde->u.fde.cie_inf;
+      if (!cie->u.cie.gc_mark)
+	{
+	  cie->u.cie.gc_mark = 1;
+	  if (!mark_entry (info, eh_frame, cie, gc_mark_hook, cookie))
+	    return FALSE;
+	}
+    }
+  return TRUE;
+}
+
+/* Input section SEC of ABFD is an .eh_frame section that contains the
+   CIE described by CIE_INF.  Return a version of CIE_INF that is going
+   to be kept in the output, adding CIE_INF to the output if necessary.
+
+   HDR_INFO is the .eh_frame_hdr information and COOKIE describes the
+   relocations in REL.  */
+
+static struct eh_cie_fde *
+find_merged_cie (bfd *abfd, struct bfd_link_info *info, asection *sec,
+		 struct eh_frame_hdr_info *hdr_info,
+		 struct elf_reloc_cookie *cookie,
+		 struct eh_cie_fde *cie_inf)
+{
+  unsigned long r_symndx;
+  struct cie *cie, *new_cie;
+  Elf_Internal_Rela *rel;
+  void **loc;
+
+  /* Use CIE_INF if we have already decided to keep it.  */
+  if (!cie_inf->removed)
+    return cie_inf;
+
+  /* If we have merged CIE_INF with another CIE, use that CIE instead.  */
+  if (cie_inf->u.cie.merged)
+    return cie_inf->u.cie.u.merged_with;
+
+  cie = cie_inf->u.cie.u.full_cie;
+
+  /* Assume we will need to keep CIE_INF.  */
+  cie_inf->removed = 0;
+  cie_inf->u.cie.u.sec = sec;
+
+  /* If we are not merging CIEs, use CIE_INF.  */
+  if (cie == NULL)
+    return cie_inf;
+
+  if (cie->per_encoding != DW_EH_PE_omit)
+    {
+      bfd_boolean per_binds_local;
+
+      /* Work out the address of personality routine, either as an absolute
+	 value or as a symbol.  */
+      rel = cookie->rels + cie->personality.reloc_index;
+      memset (&cie->personality, 0, sizeof (cie->personality));
+#ifdef BFD64
+      if (elf_elfheader (abfd)->e_ident[EI_CLASS] == ELFCLASS64)
+	r_symndx = ELF64_R_SYM (rel->r_info);
+      else
+#endif
+	r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx >= cookie->locsymcount
+	  || ELF_ST_BIND (cookie->locsyms[r_symndx].st_info) != STB_LOCAL)
+	{
+	  struct elf_link_hash_entry *h;
+
+	  r_symndx -= cookie->extsymoff;
+	  h = cookie->sym_hashes[r_symndx];
+
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+	  cie->personality.h = h;
+	  per_binds_local = SYMBOL_REFERENCES_LOCAL (info, h);
+	}
+      else
+	{
+	  Elf_Internal_Sym *sym;
+	  asection *sym_sec;
+
+	  sym = &cookie->locsyms[r_symndx];
+	  sym_sec = bfd_section_from_elf_index (abfd, sym->st_shndx);
+	  if (sym_sec == NULL)
+	    return cie_inf;
+
+	  if (sym_sec->kept_section != NULL)
+	    sym_sec = sym_sec->kept_section;
+	  if (sym_sec->output_section == NULL)
+	    return cie_inf;
+
+	  cie->local_personality = 1;
+	  cie->personality.val = (sym->st_value
+				  + sym_sec->output_offset
+				  + sym_sec->output_section->vma);
+	  per_binds_local = TRUE;
+	}
+
+      if (per_binds_local
+	  && info->shared
+	  && (cie->per_encoding & 0x70) == DW_EH_PE_absptr
+	  && (get_elf_backend_data (abfd)
+	      ->elf_backend_can_make_relative_eh_frame (abfd, info, sec)))
+	{
+	  cie_inf->u.cie.make_per_encoding_relative = 1;
+	  cie_inf->u.cie.per_encoding_relative = 1;
+	}
+    }
+
+  /* See if we can merge this CIE with an earlier one.  */
+  cie->output_sec = sec->output_section;
+  cie_compute_hash (cie);
+  if (hdr_info->cies == NULL)
+    {
+      hdr_info->cies = htab_try_create (1, cie_hash, cie_eq, free);
+      if (hdr_info->cies == NULL)
+	return cie_inf;
+    }
+  loc = htab_find_slot_with_hash (hdr_info->cies, cie, cie->hash, INSERT);
+  if (loc == NULL)
+    return cie_inf;
+
+  new_cie = (struct cie *) *loc;
+  if (new_cie == NULL)
+    {
+      /* Keep CIE_INF and record it in the hash table.  */
+      new_cie = (struct cie *) malloc (sizeof (struct cie));
+      if (new_cie == NULL)
+	return cie_inf;
+
+      memcpy (new_cie, cie, sizeof (struct cie));
+      *loc = new_cie;
+    }
+  else
+    {
+      /* Merge CIE_INF with NEW_CIE->CIE_INF.  */
+      cie_inf->removed = 1;
+      cie_inf->u.cie.merged = 1;
+      cie_inf->u.cie.u.merged_with = new_cie->cie_inf;
+      if (cie_inf->u.cie.make_lsda_relative)
+	new_cie->cie_inf->u.cie.make_lsda_relative = 1;
+    }
+  return new_cie->cie_inf;
+}
+
+/* This function is called for each input file before the .eh_frame
+   section is relocated.  It discards duplicate CIEs and FDEs for discarded
+   functions.  The function returns TRUE iff any entries have been
+   deleted.  */
+
+bfd_boolean
+_bfd_elf_discard_section_eh_frame
+   (bfd *abfd, struct bfd_link_info *info, asection *sec,
+    bfd_boolean (*reloc_symbol_deleted_p) (bfd_vma, void *),
+    struct elf_reloc_cookie *cookie)
+{
+  struct eh_cie_fde *ent;
+  struct eh_frame_sec_info *sec_info;
+  struct eh_frame_hdr_info *hdr_info;
+  unsigned int ptr_size, offset;
+
+  if (sec->sec_info_type != ELF_INFO_TYPE_EH_FRAME)
+    return FALSE;
+
+  sec_info = (struct eh_frame_sec_info *) elf_section_data (sec)->sec_info;
+  if (sec_info == NULL)
+    return FALSE;
+
+  ptr_size = (get_elf_backend_data (sec->owner)
+	      ->elf_backend_eh_frame_address_size (sec->owner, sec));
+
+  hdr_info = &elf_hash_table (info)->eh_info;
+  for (ent = sec_info->entry; ent < sec_info->entry + sec_info->count; ++ent)
+    if (ent->size == 4)
+      /* There should only be one zero terminator, on the last input
+	 file supplying .eh_frame (crtend.o).  Remove any others.  */
+      ent->removed = sec->map_head.s != NULL;
+    else if (!ent->cie)
+      {
+	bfd_boolean keep;
+	if ((sec->flags & SEC_LINKER_CREATED) != 0 && cookie->rels == NULL)
+	  {
+	    unsigned int width
+	      = get_DW_EH_PE_width (ent->fde_encoding, ptr_size);
+	    bfd_vma value
+	      = read_value (abfd, sec->contents + ent->offset + 8 + width,
+			    width, get_DW_EH_PE_signed (ent->fde_encoding));
+	    keep = value != 0;
+	  }
+	else
+	  {
+	    cookie->rel = cookie->rels + ent->reloc_index;
+	    /* FIXME: octets_per_byte.  */
+	    BFD_ASSERT (cookie->rel < cookie->relend
+			&& cookie->rel->r_offset == ent->offset + 8);
+	    keep = !(*reloc_symbol_deleted_p) (ent->offset + 8, cookie);
+	  }
+	if (keep)
+	  {
+	    if (info->shared
+		&& (((ent->fde_encoding & 0x70) == DW_EH_PE_absptr
+		     && ent->make_relative == 0)
+		    || (ent->fde_encoding & 0x70) == DW_EH_PE_aligned))
+	      {
+		/* If a shared library uses absolute pointers
+		   which we cannot turn into PC relative,
+		   don't create the binary search table,
+		   since it is affected by runtime relocations.  */
+		hdr_info->table = FALSE;
+		(*info->callbacks->einfo)
+		  (_("%P: fde encoding in %B(%A) prevents .eh_frame_hdr"
+		     " table being created.\n"), abfd, sec);
+	      }
+	    ent->removed = 0;
+	    hdr_info->fde_count++;
+	    ent->u.fde.cie_inf = find_merged_cie (abfd, info, sec, hdr_info,
+						  cookie, ent->u.fde.cie_inf);
+	  }
+      }
+
+  if (sec_info->cies)
+    {
+      free (sec_info->cies);
+      sec_info->cies = NULL;
+    }
+
+  offset = 0;
+  for (ent = sec_info->entry; ent < sec_info->entry + sec_info->count; ++ent)
+    if (!ent->removed)
+      {
+	ent->new_offset = offset;
+	offset += size_of_output_cie_fde (ent, ptr_size);
+      }
+
+  sec->rawsize = sec->size;
+  sec->size = offset;
+  return offset != sec->rawsize;
+}
+
+/* This function is called for .eh_frame_hdr section after
+   _bfd_elf_discard_section_eh_frame has been called on all .eh_frame
+   input sections.  It finalizes the size of .eh_frame_hdr section.  */
+
+bfd_boolean
+_bfd_elf_discard_section_eh_frame_hdr (bfd *abfd, struct bfd_link_info *info)
+{
+  struct elf_link_hash_table *htab;
+  struct eh_frame_hdr_info *hdr_info;
+  asection *sec;
+
+  htab = elf_hash_table (info);
+  hdr_info = &htab->eh_info;
+
+  if (hdr_info->cies != NULL)
+    {
+      htab_delete (hdr_info->cies);
+      hdr_info->cies = NULL;
+    }
+
+  sec = hdr_info->hdr_sec;
+  if (sec == NULL)
+    return FALSE;
+
+  sec->size = EH_FRAME_HDR_SIZE;
+  if (hdr_info->table)
+    sec->size += 4 + hdr_info->fde_count * 8;
+
+  elf_tdata (abfd)->eh_frame_hdr = sec;
+  return TRUE;
+}
+
+/* This function is called from size_dynamic_sections.
+   It needs to decide whether .eh_frame_hdr should be output or not,
+   because when the dynamic symbol table has been sized it is too late
+   to strip sections.  */
+
+bfd_boolean
+_bfd_elf_maybe_strip_eh_frame_hdr (struct bfd_link_info *info)
+{
+  asection *o;
+  bfd *abfd;
+  struct elf_link_hash_table *htab;
+  struct eh_frame_hdr_info *hdr_info;
+
+  htab = elf_hash_table (info);
+  hdr_info = &htab->eh_info;
+  if (hdr_info->hdr_sec == NULL)
+    return TRUE;
+
+  if (bfd_is_abs_section (hdr_info->hdr_sec->output_section))
+    {
+      hdr_info->hdr_sec = NULL;
+      return TRUE;
+    }
+
+  abfd = NULL;
+  if (info->eh_frame_hdr)
+    for (abfd = info->input_bfds; abfd != NULL; abfd = abfd->link_next)
+      {
+	/* Count only sections which have at least a single CIE or FDE.
+	   There cannot be any CIE or FDE <= 8 bytes.  */
+	o = bfd_get_section_by_name (abfd, ".eh_frame");
+	if (o && o->size > 8 && !bfd_is_abs_section (o->output_section))
+	  break;
+      }
+
+  if (abfd == NULL)
+    {
+      hdr_info->hdr_sec->flags |= SEC_EXCLUDE;
+      hdr_info->hdr_sec = NULL;
+      return TRUE;
+    }
+
+  hdr_info->table = TRUE;
+  return TRUE;
+}
+
+/* Adjust an address in the .eh_frame section.  Given OFFSET within
+   SEC, this returns the new offset in the adjusted .eh_frame section,
+   or -1 if the address refers to a CIE/FDE which has been removed
+   or to offset with dynamic relocation which is no longer needed.  */
+
+bfd_vma
+_bfd_elf_eh_frame_section_offset (bfd *output_bfd ATTRIBUTE_UNUSED,
+				  struct bfd_link_info *info ATTRIBUTE_UNUSED,
+				  asection *sec,
+				  bfd_vma offset)
+{
+  struct eh_frame_sec_info *sec_info;
+  unsigned int lo, hi, mid;
+
+  if (sec->sec_info_type != ELF_INFO_TYPE_EH_FRAME)
+    return offset;
+  sec_info = (struct eh_frame_sec_info *) elf_section_data (sec)->sec_info;
+
+  if (offset >= sec->rawsize)
+    return offset - sec->rawsize + sec->size;
+
+  lo = 0;
+  hi = sec_info->count;
+  mid = 0;
+  while (lo < hi)
+    {
+      mid = (lo + hi) / 2;
+      if (offset < sec_info->entry[mid].offset)
+	hi = mid;
+      else if (offset
+	       >= sec_info->entry[mid].offset + sec_info->entry[mid].size)
+	lo = mid + 1;
+      else
+	break;
+    }
+
+  BFD_ASSERT (lo < hi);
+
+  /* FDE or CIE was removed.  */
+  if (sec_info->entry[mid].removed)
+    return (bfd_vma) -1;
+
+  /* If converting personality pointers to DW_EH_PE_pcrel, there will be
+     no need for run-time relocation against the personality field.  */
+  if (sec_info->entry[mid].cie
+      && sec_info->entry[mid].u.cie.make_per_encoding_relative
+      && offset == (sec_info->entry[mid].offset + 8
+		    + sec_info->entry[mid].u.cie.personality_offset))
+    return (bfd_vma) -2;
+
+  /* If converting to DW_EH_PE_pcrel, there will be no need for run-time
+     relocation against FDE's initial_location field.  */
+  if (!sec_info->entry[mid].cie
+      && sec_info->entry[mid].make_relative
+      && offset == sec_info->entry[mid].offset + 8)
+    return (bfd_vma) -2;
+
+  /* If converting LSDA pointers to DW_EH_PE_pcrel, there will be no need
+     for run-time relocation against LSDA field.  */
+  if (!sec_info->entry[mid].cie
+      && sec_info->entry[mid].u.fde.cie_inf->u.cie.make_lsda_relative
+      && offset == (sec_info->entry[mid].offset + 8
+		    + sec_info->entry[mid].lsda_offset))
+    return (bfd_vma) -2;
+
+  /* If converting to DW_EH_PE_pcrel, there will be no need for run-time
+     relocation against DW_CFA_set_loc's arguments.  */
+  if (sec_info->entry[mid].set_loc
+      && sec_info->entry[mid].make_relative
+      && (offset >= sec_info->entry[mid].offset + 8
+		    + sec_info->entry[mid].set_loc[1]))
+    {
+      unsigned int cnt;
+
+      for (cnt = 1; cnt <= sec_info->entry[mid].set_loc[0]; cnt++)
+	if (offset == sec_info->entry[mid].offset + 8
+		      + sec_info->entry[mid].set_loc[cnt])
+	  return (bfd_vma) -2;
+    }
+
+  /* Any new augmentation bytes go before the first relocation.  */
+  return (offset + sec_info->entry[mid].new_offset
+	  - sec_info->entry[mid].offset
+	  + extra_augmentation_string_bytes (sec_info->entry + mid)
+	  + extra_augmentation_data_bytes (sec_info->entry + mid));
+}
+
+/* Write out .eh_frame section.  This is called with the relocated
+   contents.  */
+
+bfd_boolean
+_bfd_elf_write_section_eh_frame (bfd *abfd,
+				 struct bfd_link_info *info,
+				 asection *sec,
+				 bfd_byte *contents)
+{
+  struct eh_frame_sec_info *sec_info;
+  struct elf_link_hash_table *htab;
+  struct eh_frame_hdr_info *hdr_info;
+  unsigned int ptr_size;
+  struct eh_cie_fde *ent;
+
+  if (sec->sec_info_type != ELF_INFO_TYPE_EH_FRAME)
+    /* FIXME: octets_per_byte.  */
+    return bfd_set_section_contents (abfd, sec->output_section, contents,
+				     sec->output_offset, sec->size);
+
+  ptr_size = (get_elf_backend_data (abfd)
+	      ->elf_backend_eh_frame_address_size (abfd, sec));
+  BFD_ASSERT (ptr_size != 0);
+
+  sec_info = (struct eh_frame_sec_info *) elf_section_data (sec)->sec_info;
+  htab = elf_hash_table (info);
+  hdr_info = &htab->eh_info;
+
+  if (hdr_info->table && hdr_info->array == NULL)
+    hdr_info->array = (struct eh_frame_array_ent *)
+        bfd_malloc (hdr_info->fde_count * sizeof(*hdr_info->array));
+  if (hdr_info->array == NULL)
+    hdr_info = NULL;
+
+  /* The new offsets can be bigger or smaller than the original offsets.
+     We therefore need to make two passes over the section: one backward
+     pass to move entries up and one forward pass to move entries down.
+     The two passes won't interfere with each other because entries are
+     not reordered  */
+  for (ent = sec_info->entry + sec_info->count; ent-- != sec_info->entry;)
+    if (!ent->removed && ent->new_offset > ent->offset)
+      memmove (contents + ent->new_offset, contents + ent->offset, ent->size);
+
+  for (ent = sec_info->entry; ent < sec_info->entry + sec_info->count; ++ent)
+    if (!ent->removed && ent->new_offset < ent->offset)
+      memmove (contents + ent->new_offset, contents + ent->offset, ent->size);
+
+  for (ent = sec_info->entry; ent < sec_info->entry + sec_info->count; ++ent)
+    {
+      unsigned char *buf, *end;
+      unsigned int new_size;
+
+      if (ent->removed)
+	continue;
+
+      if (ent->size == 4)
+	{
+	  /* Any terminating FDE must be at the end of the section.  */
+	  BFD_ASSERT (ent == sec_info->entry + sec_info->count - 1);
+	  continue;
+	}
+
+      buf = contents + ent->new_offset;
+      end = buf + ent->size;
+      new_size = size_of_output_cie_fde (ent, ptr_size);
+
+      /* Update the size.  It may be shrinked.  */
+      bfd_put_32 (abfd, new_size - 4, buf);
+
+      /* Filling the extra bytes with DW_CFA_nops.  */
+      if (new_size != ent->size)
+	memset (end, 0, new_size - ent->size);
+
+      if (ent->cie)
+	{
+	  /* CIE */
+	  if (ent->make_relative
+	      || ent->u.cie.make_lsda_relative
+	      || ent->u.cie.per_encoding_relative)
+	    {
+	      char *aug;
+	      unsigned int action, extra_string, extra_data;
+	      unsigned int per_width, per_encoding;
+
+	      /* Need to find 'R' or 'L' augmentation's argument and modify
+		 DW_EH_PE_* value.  */
+	      action = ((ent->make_relative ? 1 : 0)
+			| (ent->u.cie.make_lsda_relative ? 2 : 0)
+			| (ent->u.cie.per_encoding_relative ? 4 : 0));
+	      extra_string = extra_augmentation_string_bytes (ent);
+	      extra_data = extra_augmentation_data_bytes (ent);
+
+	      /* Skip length, id and version.  */
+	      buf += 9;
+	      aug = (char *) buf;
+	      buf += strlen (aug) + 1;
+	      skip_leb128 (&buf, end);
+	      skip_leb128 (&buf, end);
+	      skip_leb128 (&buf, end);
+	      if (*aug == 'z')
+		{
+		  /* The uleb128 will always be a single byte for the kind
+		     of augmentation strings that we're prepared to handle.  */
+		  *buf++ += extra_data;
+		  aug++;
+		}
+
+	      /* Make room for the new augmentation string and data bytes.  */
+	      memmove (buf + extra_string + extra_data, buf, end - buf);
+	      memmove (aug + extra_string, aug, buf - (bfd_byte *) aug);
+	      buf += extra_string;
+	      end += extra_string + extra_data;
+
+	      if (ent->add_augmentation_size)
+		{
+		  *aug++ = 'z';
+		  *buf++ = extra_data - 1;
+		}
+	      if (ent->u.cie.add_fde_encoding)
+		{
+		  BFD_ASSERT (action & 1);
+		  *aug++ = 'R';
+		  *buf++ = make_pc_relative (DW_EH_PE_absptr, ptr_size);
+		  action &= ~1;
+		}
+
+	      while (action)
+		switch (*aug++)
+		  {
+		  case 'L':
+		    if (action & 2)
+		      {
+			BFD_ASSERT (*buf == ent->lsda_encoding);
+			*buf = make_pc_relative (*buf, ptr_size);
+			action &= ~2;
+		      }
+		    buf++;
+		    break;
+		  case 'P':
+		    if (ent->u.cie.make_per_encoding_relative)
+		      *buf = make_pc_relative (*buf, ptr_size);
+		    per_encoding = *buf++;
+		    per_width = get_DW_EH_PE_width (per_encoding, ptr_size);
+		    BFD_ASSERT (per_width != 0);
+		    BFD_ASSERT (((per_encoding & 0x70) == DW_EH_PE_pcrel)
+				== ent->u.cie.per_encoding_relative);
+		    if ((per_encoding & 0x70) == DW_EH_PE_aligned)
+		      buf = (contents
+			     + ((buf - contents + per_width - 1)
+				& ~((bfd_size_type) per_width - 1)));
+		    if (action & 4)
+		      {
+			bfd_vma val;
+
+			val = read_value (abfd, buf, per_width,
+					  get_DW_EH_PE_signed (per_encoding));
+			if (ent->u.cie.make_per_encoding_relative)
+			  val -= (sec->output_section->vma
+				  + sec->output_offset
+				  + (buf - contents));
+			else
+			  {
+			    val += (bfd_vma) ent->offset - ent->new_offset;
+			    val -= extra_string + extra_data;
+			  }
+			write_value (abfd, buf, val, per_width);
+			action &= ~4;
+		      }
+		    buf += per_width;
+		    break;
+		  case 'R':
+		    if (action & 1)
+		      {
+			BFD_ASSERT (*buf == ent->fde_encoding);
+			*buf = make_pc_relative (*buf, ptr_size);
+			action &= ~1;
+		      }
+		    buf++;
+		    break;
+		  case 'S':
+		    break;
+		  default:
+		    BFD_FAIL ();
+		  }
+	    }
+	}
+      else
+	{
+	  /* FDE */
+	  bfd_vma value, address;
+	  unsigned int width;
+	  bfd_byte *start;
+	  struct eh_cie_fde *cie;
+
+	  /* Skip length.  */
+	  cie = ent->u.fde.cie_inf;
+	  buf += 4;
+	  value = ((ent->new_offset + sec->output_offset + 4)
+		   - (cie->new_offset + cie->u.cie.u.sec->output_offset));
+	  bfd_put_32 (abfd, value, buf);
+	  buf += 4;
+	  width = get_DW_EH_PE_width (ent->fde_encoding, ptr_size);
+	  value = read_value (abfd, buf, width,
+			      get_DW_EH_PE_signed (ent->fde_encoding));
+	  address = value;
+	  if (value)
+	    {
+	      switch (ent->fde_encoding & 0x70)
+		{
+		case DW_EH_PE_textrel:
+		  BFD_ASSERT (hdr_info == NULL);
+		  break;
+		case DW_EH_PE_datarel:
+		  {
+		    switch (abfd->arch_info->arch)
+		      {
+		      case bfd_arch_ia64:
+			BFD_ASSERT (elf_gp (abfd) != 0);
+			address += elf_gp (abfd);
+			break;
+		      default:
+			(*info->callbacks->einfo)
+			  (_("%P: DW_EH_PE_datarel unspecified"
+			     " for this architecture.\n"));
+			/* Fall thru */
+		      case bfd_arch_frv:
+		      case bfd_arch_i386:
+			BFD_ASSERT (htab->hgot != NULL
+				    && ((htab->hgot->root.type
+					 == bfd_link_hash_defined)
+					|| (htab->hgot->root.type
+					    == bfd_link_hash_defweak)));
+			address
+			  += (htab->hgot->root.u.def.value
+			      + htab->hgot->root.u.def.section->output_offset
+			      + (htab->hgot->root.u.def.section->output_section
+				 ->vma));
+			break;
+		      }
+		  }
+		  break;
+		case DW_EH_PE_pcrel:
+		  value += (bfd_vma) ent->offset - ent->new_offset;
+		  address += (sec->output_section->vma
+			      + sec->output_offset
+			      + ent->offset + 8);
+		  break;
+		}
+	      if (ent->make_relative)
+		value -= (sec->output_section->vma
+			  + sec->output_offset
+			  + ent->new_offset + 8);
+	      write_value (abfd, buf, value, width);
+	    }
+
+	  start = buf;
+
+	  if (hdr_info)
+	    {
+	      /* The address calculation may overflow, giving us a
+		 value greater than 4G on a 32-bit target when
+		 dwarf_vma is 64-bit.  */
+	      if (sizeof (address) > 4 && ptr_size == 4)
+		address &= 0xffffffff;
+	      hdr_info->array[hdr_info->array_count].initial_loc = address;
+	      hdr_info->array[hdr_info->array_count++].fde
+		= (sec->output_section->vma
+		   + sec->output_offset
+		   + ent->new_offset);
+	    }
+
+	  if ((ent->lsda_encoding & 0x70) == DW_EH_PE_pcrel
+	      || cie->u.cie.make_lsda_relative)
+	    {
+	      buf += ent->lsda_offset;
+	      width = get_DW_EH_PE_width (ent->lsda_encoding, ptr_size);
+	      value = read_value (abfd, buf, width,
+				  get_DW_EH_PE_signed (ent->lsda_encoding));
+	      if (value)
+		{
+		  if ((ent->lsda_encoding & 0x70) == DW_EH_PE_pcrel)
+		    value += (bfd_vma) ent->offset - ent->new_offset;
+		  else if (cie->u.cie.make_lsda_relative)
+		    value -= (sec->output_section->vma
+			      + sec->output_offset
+			      + ent->new_offset + 8 + ent->lsda_offset);
+		  write_value (abfd, buf, value, width);
+		}
+	    }
+	  else if (ent->add_augmentation_size)
+	    {
+	      /* Skip the PC and length and insert a zero byte for the
+		 augmentation size.  */
+	      buf += width * 2;
+	      memmove (buf + 1, buf, end - buf);
+	      *buf = 0;
+	    }
+
+	  if (ent->set_loc)
+	    {
+	      /* Adjust DW_CFA_set_loc.  */
+	      unsigned int cnt;
+	      bfd_vma new_offset;
+
+	      width = get_DW_EH_PE_width (ent->fde_encoding, ptr_size);
+	      new_offset = ent->new_offset + 8
+			   + extra_augmentation_string_bytes (ent)
+			   + extra_augmentation_data_bytes (ent);
+
+	      for (cnt = 1; cnt <= ent->set_loc[0]; cnt++)
+		{
+		  buf = start + ent->set_loc[cnt];
+
+		  value = read_value (abfd, buf, width,
+				      get_DW_EH_PE_signed (ent->fde_encoding));
+		  if (!value)
+		    continue;
+
+		  if ((ent->fde_encoding & 0x70) == DW_EH_PE_pcrel)
+		    value += (bfd_vma) ent->offset + 8 - new_offset;
+		  if (ent->make_relative)
+		    value -= (sec->output_section->vma
+			      + sec->output_offset
+			      + new_offset + ent->set_loc[cnt]);
+		  write_value (abfd, buf, value, width);
+		}
+	    }
+	}
+    }
+
+  /* We don't align the section to its section alignment since the
+     runtime library only expects all CIE/FDE records aligned at
+     the pointer size. _bfd_elf_discard_section_eh_frame should
+     have padded CIE/FDE records to multiple of pointer size with
+     size_of_output_cie_fde.  */
+  if ((sec->size % ptr_size) != 0)
+    abort ();
+
+  /* FIXME: octets_per_byte.  */
+  return bfd_set_section_contents (abfd, sec->output_section,
+				   contents, (file_ptr) sec->output_offset,
+				   sec->size);
+}
+
+/* Helper function used to sort .eh_frame_hdr search table by increasing
+   VMA of FDE initial location.  */
+
+static int
+vma_compare (const void *a, const void *b)
+{
+  const struct eh_frame_array_ent *p = (const struct eh_frame_array_ent *) a;
+  const struct eh_frame_array_ent *q = (const struct eh_frame_array_ent *) b;
+  if (p->initial_loc > q->initial_loc)
+    return 1;
+  if (p->initial_loc < q->initial_loc)
+    return -1;
+  return 0;
+}
+
+/* Write out .eh_frame_hdr section.  This must be called after
+   _bfd_elf_write_section_eh_frame has been called on all input
+   .eh_frame sections.
+   .eh_frame_hdr format:
+   ubyte version		(currently 1)
+   ubyte eh_frame_ptr_enc  	(DW_EH_PE_* encoding of pointer to start of
+				 .eh_frame section)
+   ubyte fde_count_enc		(DW_EH_PE_* encoding of total FDE count
+				 number (or DW_EH_PE_omit if there is no
+				 binary search table computed))
+   ubyte table_enc		(DW_EH_PE_* encoding of binary search table,
+				 or DW_EH_PE_omit if not present.
+				 DW_EH_PE_datarel is using address of
+				 .eh_frame_hdr section start as base)
+   [encoded] eh_frame_ptr	(pointer to start of .eh_frame section)
+   optionally followed by:
+   [encoded] fde_count		(total number of FDEs in .eh_frame section)
+   fde_count x [encoded] initial_loc, fde
+				(array of encoded pairs containing
+				 FDE initial_location field and FDE address,
+				 sorted by increasing initial_loc).  */
+
+bfd_boolean
+_bfd_elf_write_section_eh_frame_hdr (bfd *abfd, struct bfd_link_info *info)
+{
+  struct elf_link_hash_table *htab;
+  struct eh_frame_hdr_info *hdr_info;
+  asection *sec;
+  bfd_byte *contents;
+  asection *eh_frame_sec;
+  bfd_size_type size;
+  bfd_boolean retval;
+  bfd_vma encoded_eh_frame;
+
+  htab = elf_hash_table (info);
+  hdr_info = &htab->eh_info;
+  sec = hdr_info->hdr_sec;
+  if (sec == NULL)
+    return TRUE;
+
+  size = EH_FRAME_HDR_SIZE;
+  if (hdr_info->array && hdr_info->array_count == hdr_info->fde_count)
+    size += 4 + hdr_info->fde_count * 8;
+  contents = (bfd_byte *) bfd_malloc (size);
+  if (contents == NULL)
+    return FALSE;
+
+  eh_frame_sec = bfd_get_section_by_name (abfd, ".eh_frame");
+  if (eh_frame_sec == NULL)
+    {
+      free (contents);
+      return FALSE;
+    }
+
+  memset (contents, 0, EH_FRAME_HDR_SIZE);
+  contents[0] = 1;				/* Version.  */
+  contents[1] = get_elf_backend_data (abfd)->elf_backend_encode_eh_address
+    (abfd, info, eh_frame_sec, 0, sec, 4,
+     &encoded_eh_frame);			/* .eh_frame offset.  */
+
+  if (hdr_info->array && hdr_info->array_count == hdr_info->fde_count)
+    {
+      contents[2] = DW_EH_PE_udata4;		/* FDE count encoding.  */
+      contents[3] = DW_EH_PE_datarel | DW_EH_PE_sdata4; /* Search table enc.  */
+    }
+  else
+    {
+      contents[2] = DW_EH_PE_omit;
+      contents[3] = DW_EH_PE_omit;
+    }
+  bfd_put_32 (abfd, encoded_eh_frame, contents + 4);
+
+  if (contents[2] != DW_EH_PE_omit)
+    {
+      unsigned int i;
+
+      bfd_put_32 (abfd, hdr_info->fde_count, contents + EH_FRAME_HDR_SIZE);
+      qsort (hdr_info->array, hdr_info->fde_count, sizeof (*hdr_info->array),
+	     vma_compare);
+      for (i = 0; i < hdr_info->fde_count; i++)
+	{
+	  bfd_put_32 (abfd,
+		      hdr_info->array[i].initial_loc
+		      - sec->output_section->vma,
+		      contents + EH_FRAME_HDR_SIZE + i * 8 + 4);
+	  bfd_put_32 (abfd,
+		      hdr_info->array[i].fde - sec->output_section->vma,
+		      contents + EH_FRAME_HDR_SIZE + i * 8 + 8);
+	}
+    }
+
+  /* FIXME: octets_per_byte.  */
+  retval = bfd_set_section_contents (abfd, sec->output_section,
+				     contents, (file_ptr) sec->output_offset,
+				     sec->size);
+  free (contents);
+  return retval;
+}
+
+/* Return the width of FDE addresses.  This is the default implementation.  */
+
+unsigned int
+_bfd_elf_eh_frame_address_size (bfd *abfd, asection *sec ATTRIBUTE_UNUSED)
+{
+  return elf_elfheader (abfd)->e_ident[EI_CLASS] == ELFCLASS64 ? 8 : 4;
+}
+
+/* Decide whether we can use a PC-relative encoding within the given
+   EH frame section.  This is the default implementation.  */
+
+bfd_boolean
+_bfd_elf_can_make_relative (bfd *input_bfd ATTRIBUTE_UNUSED,
+			    struct bfd_link_info *info ATTRIBUTE_UNUSED,
+			    asection *eh_frame_section ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+/* Select an encoding for the given address.  Preference is given to
+   PC-relative addressing modes.  */
+
+bfd_byte
+_bfd_elf_encode_eh_address (bfd *abfd ATTRIBUTE_UNUSED,
+			    struct bfd_link_info *info ATTRIBUTE_UNUSED,
+			    asection *osec, bfd_vma offset,
+			    asection *loc_sec, bfd_vma loc_offset,
+			    bfd_vma *encoded)
+{
+  *encoded = osec->vma + offset -
+    (loc_sec->output_section->vma + loc_sec->output_offset + loc_offset);
+  return DW_EH_PE_pcrel | DW_EH_PE_sdata4;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf-hppa.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf-hppa.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf-hppa.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf-hppa.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1221 @@
+/* Common code for PA ELF implementations.
+   Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+   2009, 2010
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define ELF_HOWTO_TABLE_SIZE       R_PARISC_UNIMPLEMENTED + 1
+
+/* This file is included by multiple PA ELF BFD backends with different
+   sizes.
+
+   Most of the routines are written to be size independent, but sometimes
+   external constraints require 32 or 64 bit specific code.  We remap
+   the definitions/functions as necessary here.  */
+#if ARCH_SIZE == 64
+#define ELF_R_TYPE(X)                 ELF64_R_TYPE(X)
+#define ELF_R_SYM(X)                  ELF64_R_SYM(X)
+#define elf_hppa_reloc_final_type     elf64_hppa_reloc_final_type
+#define _bfd_elf_hppa_gen_reloc_type  _bfd_elf64_hppa_gen_reloc_type
+#define elf_hppa_relocate_section     elf64_hppa_relocate_section
+#define elf_hppa_final_link           elf64_hppa_final_link
+#endif
+#if ARCH_SIZE == 32
+#define ELF_R_TYPE(X)                 ELF32_R_TYPE(X)
+#define ELF_R_SYM(X)                  ELF32_R_SYM(X)
+#define elf_hppa_reloc_final_type     elf32_hppa_reloc_final_type
+#define _bfd_elf_hppa_gen_reloc_type  _bfd_elf32_hppa_gen_reloc_type
+#define elf_hppa_relocate_section     elf32_hppa_relocate_section
+#define elf_hppa_final_link           elf32_hppa_final_link
+#endif
+
+/* ELF/PA relocation howto entries.  */
+
+static reloc_howto_type elf_hppa_howto_table[ELF_HOWTO_TABLE_SIZE] =
+{
+  { R_PARISC_NONE, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_NONE", FALSE, 0, 0, FALSE },
+
+  /* The values in DIR32 are to placate the check in
+     _bfd_stab_section_find_nearest_line.  */
+  { R_PARISC_DIR32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR32", FALSE, 0, 0xffffffff, FALSE },
+  { R_PARISC_DIR21L, 0, 2, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_DIR17R, 0, 2, 17, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR17R", FALSE, 0, 0, FALSE },
+  { R_PARISC_DIR17F, 0, 2, 17, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR17F", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_DIR14R, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_DIR14F, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR14F", FALSE, 0, 0, FALSE },
+  /* 8 */
+  { R_PARISC_PCREL12F, 0, 2, 12, TRUE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL12F", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL32, 0, 2, 32, TRUE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL32", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL21L, 0, 2, 21, TRUE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL17R, 0, 2, 17, TRUE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL17R", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL17F, 0, 2, 17, TRUE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL17F", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL17C, 0, 2, 17, TRUE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL17C", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL14R, 0, 2, 14, TRUE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL14F, 0, 2, 14, TRUE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL14F", FALSE, 0, 0, FALSE },
+  /* 16 */
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_DPREL21L, 0, 2, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DPREL21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_DPREL14WR, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DPREL14WR", FALSE, 0, 0, FALSE },
+  { R_PARISC_DPREL14DR, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DPREL14DR", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_DPREL14R, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DPREL14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_DPREL14F, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DPREL14F", FALSE, 0, 0, FALSE },
+  /* 24 */
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_DLTREL21L, 0, 2, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DLTREL21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_DLTREL14R, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DLTREL14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_DLTREL14F, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DLTREL14F", FALSE, 0, 0, FALSE },
+  /* 32 */
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_DLTIND21L, 0, 2, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DLTIND21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_DLTIND14R, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DLTIND14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_DLTIND14F, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DLTIND14F", FALSE, 0, 0, FALSE },
+  /* 40 */
+  { R_PARISC_SETBASE, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_SETBASE", FALSE, 0, 0, FALSE },
+  { R_PARISC_SECREL32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_SECREL32", FALSE, 0, 0xffffffff, FALSE },
+  { R_PARISC_BASEREL21L, 0, 2, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_BASEREL21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_BASEREL17R, 0, 2, 17, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_BASEREL17R", FALSE, 0, 0, FALSE },
+  { R_PARISC_BASEREL17F, 0, 2, 17, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_BASEREL17F", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_BASEREL14R, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_BASEREL14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_BASEREL14F, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_BASEREL14F", FALSE, 0, 0, FALSE },
+  /* 48 */
+  { R_PARISC_SEGBASE, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_SEGBASE", FALSE, 0, 0, FALSE },
+  { R_PARISC_SEGREL32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_SEGREL32", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLTOFF21L, 0, 2, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLTOFF21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLTOFF14R, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLTOFF14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLTOFF14F, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLTOFF14F", FALSE, 0, 0, FALSE },
+  /* 56 */
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_FPTR32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR32", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_FPTR21L, 0, 2, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_FPTR14R, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  /* 64 */
+  { R_PARISC_FPTR64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_FPTR64", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLABEL32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLABEL32", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLABEL21L, 0, 2, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLABEL21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLABEL14R, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLABEL14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  /* 72 */
+  { R_PARISC_PCREL64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL64", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL22C, 0, 2, 22, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL22C", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL22F, 0, 2, 22, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL22F", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL14WR, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL14WR", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL14DR, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL14DR", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL16F, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL16F", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL16WF, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL16WF", FALSE, 0, 0, FALSE },
+  { R_PARISC_PCREL16DF, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PCREL16DF", FALSE, 0, 0, FALSE },
+  /* 80 */
+  { R_PARISC_DIR64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR64", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_DIR14WR, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR14WR", FALSE, 0, 0, FALSE },
+  { R_PARISC_DIR14DR, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR14DR", FALSE, 0, 0, FALSE },
+  { R_PARISC_DIR16F, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR16F", FALSE, 0, 0, FALSE },
+  { R_PARISC_DIR16WF, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR16WF", FALSE, 0, 0, FALSE },
+  { R_PARISC_DIR16DF, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DIR16DF", FALSE, 0, 0, FALSE },
+  /* 88 */
+  { R_PARISC_GPREL64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_GPREL64", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_DLTREL14WR, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DLTREL14WR", FALSE, 0, 0, FALSE },
+  { R_PARISC_DLTREL14DR, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DLTREL14DR", FALSE, 0, 0, FALSE },
+  { R_PARISC_GPREL16F, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_GPREL16F", FALSE, 0, 0, FALSE },
+  { R_PARISC_GPREL16WF, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_GPREL16WF", FALSE, 0, 0, FALSE },
+  { R_PARISC_GPREL16DF, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_GPREL16DF", FALSE, 0, 0, FALSE },
+  /* 96 */
+  { R_PARISC_LTOFF64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF64", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_DLTIND14WR, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DLTIND14WR", FALSE, 0, 0, FALSE },
+  { R_PARISC_DLTIND14DR, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_DLTIND14DR", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF16F, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF16F", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF16WF, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF16DF", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF16DF, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF16DF", FALSE, 0, 0, FALSE },
+  /* 104 */
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_BASEREL14WR, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_BASEREL14WR", FALSE, 0, 0, FALSE },
+  { R_PARISC_BASEREL14DR, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_BASEREL14DR", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  /* 112 */
+  { R_PARISC_SEGREL64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_SEGREL64", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLTOFF14WR, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLTOFF14WR", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLTOFF14DR, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLTOFF14DR", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLTOFF16F, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLTOFF16F", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLTOFF16WF, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLTOFF16WF", FALSE, 0, 0, FALSE },
+  { R_PARISC_PLTOFF16DF, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_PLTOFF16DF", FALSE, 0, 0, FALSE },
+  /* 120 */
+  { R_PARISC_LTOFF_FPTR64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_FPTR14WR, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR14WR", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_FPTR14DR, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR14DR", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_FPTR16F, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR16F", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_FPTR16WF, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_FPTR16WF", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_FPTR16DF, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  /* 128 */
+  { R_PARISC_COPY, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_COPY", FALSE, 0, 0, FALSE },
+  { R_PARISC_IPLT, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_IPLT", FALSE, 0, 0, FALSE },
+  { R_PARISC_EPLT, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_EPLT", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  /* 136 */
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  /* 144 */
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  /* 152 */
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_TPREL32, 0, 2, 32, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_TPREL32", FALSE, 0, 0, FALSE },
+  { R_PARISC_TPREL21L, 0, 2, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_TPREL21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_TPREL14R, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_TPREL14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  /* 160 */
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_TP21L, 0, 2, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_TP14R, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_TP14F, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP14F", FALSE, 0, 0, FALSE },
+  /* 168 */
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  /* 176 */
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  /* 184 */
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  /* 192 */
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  /* 200 */
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  /* 208 */
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  /* 216 */
+  { R_PARISC_TPREL64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_TPREL64", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_TPREL14WR, 0, 2, 14, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_TPREL14WR", FALSE, 0, 0, FALSE },
+  { R_PARISC_TPREL14DR, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_TPREL14DR", FALSE, 0, 0, FALSE },
+  { R_PARISC_TPREL16F, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_TPREL16F", FALSE, 0, 0, FALSE },
+  { R_PARISC_TPREL16WF, 0, 2, 16, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_TPREL16WF", FALSE, 0, 0, FALSE },
+  { R_PARISC_TPREL16DF, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_TPREL16DF", FALSE, 0, 0, FALSE },
+  /* 224 */
+  { R_PARISC_LTOFF_TP64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP64", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_TP14WR, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP14WR", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_TP14DR, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP14DR", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_TP16F, 0, 2, 16, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP16F", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_TP16WF, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP16WF", FALSE, 0, 0, FALSE },
+  { R_PARISC_LTOFF_TP16DF, 0, 2, 16, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP16DF", FALSE, 0, 0, FALSE },
+  /* 232 */
+  { R_PARISC_GNU_VTENTRY, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_GNU_VTENTRY", FALSE, 0, 0, FALSE },
+  { R_PARISC_GNU_VTINHERIT, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_GNU_VTINHERIT", FALSE, 0, 0, FALSE },
+  { R_PARISC_TLS_GD21L, 0, 2, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_TLS_GD21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_TLS_GD14R, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_TLS_GD14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_TLS_GDCALL, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_TLS_GDCALL", FALSE, 0, 0, FALSE },
+  { R_PARISC_TLS_LDM21L, 0, 2, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_TLS_LDM21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_TLS_LDM14R, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_TLS_LDM14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_TLS_LDMCALL, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+    bfd_elf_generic_reloc, "R_PARISC_TLS_LDMCALL", FALSE, 0, 0, FALSE },
+  /* 240 */
+  { R_PARISC_TLS_LDO21L, 0, 2, 21, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_TLS_LDO21L", FALSE, 0, 0, FALSE },
+  { R_PARISC_TLS_LDO14R, 0, 2, 14, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_TLS_LDO14R", FALSE, 0, 0, FALSE },
+  { R_PARISC_TLS_DTPMOD32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_TLS_DTPMOD32", FALSE, 0, 0, FALSE },
+  { R_PARISC_TLS_DTPMOD64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_TLS_DTPMOD64", FALSE, 0, 0, FALSE },
+  { R_PARISC_TLS_DTPOFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_TLS_DTPOFF32", FALSE, 0, 0, FALSE },
+  { R_PARISC_TLS_DTPOFF64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+    bfd_elf_generic_reloc, "R_PARISC_TLS_DTPOFF64", FALSE, 0, 0, FALSE },
+};
+
+#define OFFSET_14R_FROM_21L 4
+#define OFFSET_14F_FROM_21L 5
+
+/* Return the final relocation type for the given base type, instruction
+   format, and field selector.  */
+
+elf_hppa_reloc_type
+elf_hppa_reloc_final_type (bfd *abfd,
+			   elf_hppa_reloc_type base_type,
+			   int format,
+			   unsigned int field)
+{
+  elf_hppa_reloc_type final_type = base_type;
+
+  /* Just a tangle of nested switch statements to deal with the braindamage
+     that a different field selector means a completely different relocation
+     for PA ELF.  */
+  switch (base_type)
+    {
+      /* We have been using generic relocation types.  However, that may not
+	 really make sense.  Anyway, we need to support both R_PARISC_DIR64
+	 and R_PARISC_DIR32 here.  */
+    case R_PARISC_DIR32:
+    case R_PARISC_DIR64:
+    case R_HPPA_ABS_CALL:
+      switch (format)
+	{
+	case 14:
+	  switch (field)
+	    {
+	    case e_fsel:
+	      final_type = R_PARISC_DIR14F;
+	      break;
+	    case e_rsel:
+	    case e_rrsel:
+	    case e_rdsel:
+	      final_type = R_PARISC_DIR14R;
+	      break;
+	    case e_rtsel:
+	      final_type = R_PARISC_DLTIND14R;
+	      break;
+	    case e_rtpsel:
+	      final_type = R_PARISC_LTOFF_FPTR14DR;
+	      break;
+	    case e_tsel:
+	      final_type = R_PARISC_DLTIND14F;
+	      break;
+	    case e_rpsel:
+	      final_type = R_PARISC_PLABEL14R;
+	      break;
+	    default:
+	      return R_PARISC_NONE;
+	    }
+	  break;
+
+	case 17:
+	  switch (field)
+	    {
+	    case e_fsel:
+	      final_type = R_PARISC_DIR17F;
+	      break;
+	    case e_rsel:
+	    case e_rrsel:
+	    case e_rdsel:
+	      final_type = R_PARISC_DIR17R;
+	      break;
+	    default:
+	      return R_PARISC_NONE;
+	    }
+	  break;
+
+	case 21:
+	  switch (field)
+	    {
+	    case e_lsel:
+	    case e_lrsel:
+	    case e_ldsel:
+	    case e_nlsel:
+	    case e_nlrsel:
+	      final_type = R_PARISC_DIR21L;
+	      break;
+	    case e_ltsel:
+	      final_type = R_PARISC_DLTIND21L;
+	      break;
+	    case e_ltpsel:
+	      final_type = R_PARISC_LTOFF_FPTR21L;
+	      break;
+	    case e_lpsel:
+	      final_type = R_PARISC_PLABEL21L;
+	      break;
+	    default:
+	      return R_PARISC_NONE;
+	    }
+	  break;
+
+	case 32:
+	  switch (field)
+	    {
+	    case e_fsel:
+	      final_type = R_PARISC_DIR32;
+	      /* When in 64bit mode, a 32bit relocation is supposed to
+		 be a section relative relocation.  Dwarf2 (for example)
+		 uses 32bit section relative relocations.  */
+	      if (bfd_arch_bits_per_address (abfd) != 32)
+		final_type = R_PARISC_SECREL32;
+	      break;
+	    case e_psel:
+	      final_type = R_PARISC_PLABEL32;
+	      break;
+	    default:
+	      return R_PARISC_NONE;
+	    }
+	  break;
+
+	case 64:
+	  switch (field)
+	    {
+	    case e_fsel:
+	      final_type = R_PARISC_DIR64;
+	      break;
+	    case e_psel:
+	      final_type = R_PARISC_FPTR64;
+	      break;
+	    default:
+	      return R_PARISC_NONE;
+	    }
+	  break;
+
+	default:
+	  return R_PARISC_NONE;
+	}
+      break;
+
+    case R_HPPA_GOTOFF:
+      switch (format)
+	{
+	case 14:
+	  switch (field)
+	    {
+	    case e_rsel:
+	    case e_rrsel:
+	    case e_rdsel:
+	      /* R_PARISC_DLTREL14R for elf64, R_PARISC_DPREL14R for elf32.  */
+	      final_type = base_type + OFFSET_14R_FROM_21L;
+	      break;
+	    case e_fsel:
+	      /* R_PARISC_DLTREL14F for elf64, R_PARISC_DPREL14F for elf32.  */
+	      final_type = base_type + OFFSET_14F_FROM_21L;
+	      break;
+	    default:
+	      return R_PARISC_NONE;
+	    }
+	  break;
+
+	case 21:
+	  switch (field)
+	    {
+	    case e_lsel:
+	    case e_lrsel:
+	    case e_ldsel:
+	    case e_nlsel:
+	    case e_nlrsel:
+	      /* R_PARISC_DLTREL21L for elf64, R_PARISC_DPREL21L for elf32.  */
+	      final_type = base_type;
+	      break;
+	    default:
+	      return R_PARISC_NONE;
+	    }
+	  break;
+
+	case 64:
+	  switch (field)
+	    {
+	    case e_fsel:
+	      final_type = R_PARISC_GPREL64;
+	      break;
+	    default:
+	      return R_PARISC_NONE;
+	    }
+	  break;
+
+	default:
+	  return R_PARISC_NONE;
+	}
+      break;
+
+    case R_HPPA_PCREL_CALL:
+      switch (format)
+	{
+	case 12:
+	  switch (field)
+	    {
+	    case e_fsel:
+	      final_type = R_PARISC_PCREL12F;
+	      break;
+	    default:
+	      return R_PARISC_NONE;
+	    }
+	  break;
+
+	case 14:
+	  /* Contrary to appearances, these are not calls of any sort.
+	     Rather, they are loads/stores with a pcrel reloc.  */
+	  switch (field)
+	    {
+	    case e_rsel:
+	    case e_rrsel:
+	    case e_rdsel:
+	      final_type = R_PARISC_PCREL14R;
+	      break;
+	    case e_fsel:
+	      if (bfd_get_mach (abfd) < 25)
+		final_type = R_PARISC_PCREL14F;
+	      else
+		final_type = R_PARISC_PCREL16F;
+	      break;
+	    default:
+	      return R_PARISC_NONE;
+	    }
+	  break;
+
+	case 17:
+	  switch (field)
+	    {
+	    case e_rsel:
+	    case e_rrsel:
+	    case e_rdsel:
+	      final_type = R_PARISC_PCREL17R;
+	      break;
+	    case e_fsel:
+	      final_type = R_PARISC_PCREL17F;
+	      break;
+	    default:
+	      return R_PARISC_NONE;
+	    }
+	  break;
+
+	case 21:
+	  switch (field)
+	    {
+	    case e_lsel:
+	    case e_lrsel:
+	    case e_ldsel:
+	    case e_nlsel:
+	    case e_nlrsel:
+	      final_type = R_PARISC_PCREL21L;
+	      break;
+	    default:
+	      return R_PARISC_NONE;
+	    }
+	  break;
+
+	case 22:
+	  switch (field)
+	    {
+	    case e_fsel:
+	      final_type = R_PARISC_PCREL22F;
+	      break;
+	    default:
+	      return R_PARISC_NONE;
+	    }
+	  break;
+
+	case 32:
+	  switch (field)
+	    {
+	    case e_fsel:
+	      final_type = R_PARISC_PCREL32;
+	      break;
+	    default:
+	      return R_PARISC_NONE;
+	    }
+	  break;
+
+	case 64:
+	  switch (field)
+	    {
+	    case e_fsel:
+	      final_type = R_PARISC_PCREL64;
+	      break;
+	    default:
+	      return R_PARISC_NONE;
+	    }
+	  break;
+
+	default:
+	  return R_PARISC_NONE;
+	}
+      break;
+
+    case R_PARISC_TLS_GD21L:
+      switch (field)
+	{
+	  case e_ltsel:
+	  case e_lrsel:
+	    final_type = R_PARISC_TLS_GD21L;
+	    break;
+	  case e_rtsel:
+	  case e_rrsel:
+	    final_type = R_PARISC_TLS_GD14R;
+	    break;
+	  default:
+	    return R_PARISC_NONE;
+	}
+      break;
+
+    case R_PARISC_TLS_LDM21L:
+      switch (field)
+	{
+	  case e_ltsel:
+	  case e_lrsel:
+	    final_type = R_PARISC_TLS_LDM21L;
+	    break;
+	  case e_rtsel:
+	  case e_rrsel:
+	    final_type = R_PARISC_TLS_LDM14R;
+	    break;
+	  default:
+	    return R_PARISC_NONE;
+	}
+      break;
+
+    case R_PARISC_TLS_LDO21L:
+      switch (field)
+	{
+	  case e_lrsel:
+	    final_type = R_PARISC_TLS_LDO21L;
+	    break;
+	  case e_rrsel:
+	    final_type = R_PARISC_TLS_LDO14R;
+	    break;
+	  default:
+	    return R_PARISC_NONE;
+	}
+      break;
+
+    case R_PARISC_TLS_IE21L:
+      switch (field)
+	{
+	  case e_ltsel:
+	  case e_lrsel:
+	    final_type = R_PARISC_TLS_IE21L;
+	    break;
+	  case e_rtsel:
+	  case e_rrsel:
+	    final_type = R_PARISC_TLS_IE14R;
+	    break;
+	  default:
+	    return R_PARISC_NONE;
+	}
+      break;
+
+    case R_PARISC_TLS_LE21L:
+      switch (field)
+	{
+	  case e_lrsel:
+	    final_type = R_PARISC_TLS_LE21L;
+	    break;
+	  case e_rrsel:
+	    final_type = R_PARISC_TLS_LE14R;
+	    break;
+	  default:
+	    return R_PARISC_NONE;
+	}
+      break;
+
+    case R_PARISC_SEGREL32:
+      switch (format)
+	{
+	case 32:
+	  switch (field)
+	    {
+	    case e_fsel:
+	      final_type = R_PARISC_SEGREL32;
+	      break;
+	    default:
+	      return R_PARISC_NONE;
+	    }
+	  break;
+
+	case 64:
+	  switch (field)
+	    {
+	    case e_fsel:
+	      final_type = R_PARISC_SEGREL64;
+	      break;
+	    default:
+	      return R_PARISC_NONE;
+	    }
+	  break;
+
+	default:
+	  return R_PARISC_NONE;
+	}
+      break;
+
+    case R_PARISC_GNU_VTENTRY:
+    case R_PARISC_GNU_VTINHERIT:
+    case R_PARISC_SEGBASE:
+      /* The defaults are fine for these cases.  */
+      break;
+
+    default:
+      return R_PARISC_NONE;
+    }
+
+  return final_type;
+}
+
+/* Return one (or more) BFD relocations which implement the base
+   relocation with modifications based on format and field.  */
+
+elf_hppa_reloc_type **
+_bfd_elf_hppa_gen_reloc_type (bfd *abfd,
+			      elf_hppa_reloc_type base_type,
+			      int format,
+			      unsigned int field,
+			      int ignore ATTRIBUTE_UNUSED,
+			      asymbol *sym ATTRIBUTE_UNUSED)
+{
+  elf_hppa_reloc_type *finaltype;
+  elf_hppa_reloc_type **final_types;
+  bfd_size_type amt = sizeof (elf_hppa_reloc_type *) * 2;
+
+  /* Allocate slots for the BFD relocation.  */
+  final_types = bfd_alloc (abfd, amt);
+  if (final_types == NULL)
+    return NULL;
+
+  /* Allocate space for the relocation itself.  */
+  amt = sizeof (elf_hppa_reloc_type);
+  finaltype = bfd_alloc (abfd, amt);
+  if (finaltype == NULL)
+    return NULL;
+
+  /* Some reasonable defaults.  */
+  final_types[0] = finaltype;
+  final_types[1] = NULL;
+
+  *finaltype = elf_hppa_reloc_final_type (abfd, base_type, format, field);
+
+  return final_types;
+}
+
+/* Translate from an elf into field into a howto relocation pointer.  */
+
+static void
+elf_hppa_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+			arelent *bfd_reloc,
+			Elf_Internal_Rela *elf_reloc)
+{
+  BFD_ASSERT (ELF_R_TYPE (elf_reloc->r_info)
+	      < (unsigned int) R_PARISC_UNIMPLEMENTED);
+  bfd_reloc->howto = &elf_hppa_howto_table[ELF_R_TYPE (elf_reloc->r_info)];
+}
+
+/* Translate from an elf into field into a howto relocation pointer.  */
+
+static void
+elf_hppa_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+			    arelent *bfd_reloc,
+			    Elf_Internal_Rela *elf_reloc)
+{
+  BFD_ASSERT (ELF_R_TYPE (elf_reloc->r_info)
+	      < (unsigned int) R_PARISC_UNIMPLEMENTED);
+  bfd_reloc->howto = &elf_hppa_howto_table[ELF_R_TYPE (elf_reloc->r_info)];
+}
+
+/* Return the address of the howto table entry to perform the CODE
+   relocation for an ARCH machine.  */
+
+static reloc_howto_type *
+elf_hppa_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    bfd_reloc_code_real_type code)
+{
+  if ((int) code < (int) R_PARISC_UNIMPLEMENTED)
+    {
+      BFD_ASSERT ((int) elf_hppa_howto_table[(int) code].type == (int) code);
+      return &elf_hppa_howto_table[(int) code];
+    }
+  return NULL;
+}
+
+static reloc_howto_type *
+elf_hppa_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (elf_hppa_howto_table) / sizeof (elf_hppa_howto_table[0]);
+       i++)
+    if (elf_hppa_howto_table[i].name != NULL
+	&& strcasecmp (elf_hppa_howto_table[i].name, r_name) == 0)
+      return &elf_hppa_howto_table[i];
+
+  return NULL;
+}
+
+/* Return TRUE if SYM represents a local label symbol.  */
+
+static bfd_boolean
+elf_hppa_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED, const char *name)
+{
+  if (name[0] == 'L' && name[1] == '$')
+    return TRUE;
+  return _bfd_elf_is_local_label_name (abfd, name);
+}
+
+/* Set the correct type for an ELF section.  We do this by the
+   section name, which is a hack, but ought to work.  */
+
+static bfd_boolean
+elf_hppa_fake_sections (bfd *abfd, Elf_Internal_Shdr *hdr, asection *sec)
+{
+  const char *name;
+
+  name = bfd_get_section_name (abfd, sec);
+
+  if (strcmp (name, ".PARISC.unwind") == 0)
+    {
+      int indx;
+      asection *asec;
+
+#if ARCH_SIZE == 64
+      hdr->sh_type = SHT_LOPROC + 1;
+#else
+      hdr->sh_type = 1;
+#endif
+      /* ?!? How are unwinds supposed to work for symbols in arbitrary
+	 sections?  Or what if we have multiple .text sections in a single
+	 .o file?  HP really messed up on this one.
+
+	 Ugh.  We can not use elf_section_data (sec)->this_idx at this
+	 point because it is not initialized yet.
+
+	 So we (gasp) recompute it here.  Hopefully nobody ever changes the
+	 way sections are numbered in elf.c!  */
+      for (asec = abfd->sections, indx = 1; asec; asec = asec->next, indx++)
+	{
+	  if (asec->name && strcmp (asec->name, ".text") == 0)
+	    {
+	      hdr->sh_info = indx;
+	      break;
+	    }
+	}
+
+      /* I have no idea if this is really necessary or what it means.  */
+      hdr->sh_entsize = 4;
+    }
+  return TRUE;
+}
+
+static void
+elf_hppa_final_write_processing (bfd *abfd,
+				 bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  int mach = bfd_get_mach (abfd);
+
+  elf_elfheader (abfd)->e_flags &= ~(EF_PARISC_ARCH | EF_PARISC_TRAPNIL
+				     | EF_PARISC_EXT | EF_PARISC_LSB
+				     | EF_PARISC_WIDE | EF_PARISC_NO_KABP
+				     | EF_PARISC_LAZYSWAP);
+
+  if (mach == 10)
+    elf_elfheader (abfd)->e_flags |= EFA_PARISC_1_0;
+  else if (mach == 11)
+    elf_elfheader (abfd)->e_flags |= EFA_PARISC_1_1;
+  else if (mach == 20)
+    elf_elfheader (abfd)->e_flags |= EFA_PARISC_2_0;
+  else if (mach == 25)
+    elf_elfheader (abfd)->e_flags |= (EF_PARISC_WIDE
+				      | EFA_PARISC_2_0
+				      /* The GNU tools have trapped without
+					 option since 1993, so need to take
+					 a step backwards with the ELF
+					 based toolchains.  */
+				      | EF_PARISC_TRAPNIL);
+}
+
+/* Comparison function for qsort to sort unwind section during a
+   final link.  */
+
+static int
+hppa_unwind_entry_compare (const void *a, const void *b)
+{
+  const bfd_byte *ap, *bp;
+  unsigned long av, bv;
+
+  ap = a;
+  av = (unsigned long) ap[0] << 24;
+  av |= (unsigned long) ap[1] << 16;
+  av |= (unsigned long) ap[2] << 8;
+  av |= (unsigned long) ap[3];
+
+  bp = b;
+  bv = (unsigned long) bp[0] << 24;
+  bv |= (unsigned long) bp[1] << 16;
+  bv |= (unsigned long) bp[2] << 8;
+  bv |= (unsigned long) bp[3];
+
+  return av < bv ? -1 : av > bv ? 1 : 0;
+}
+
+static bfd_boolean
+elf_hppa_sort_unwind (bfd *abfd)
+{
+  asection *s;
+
+  /* Magic section names, but this is much safer than having
+     relocate_section remember where SEGREL32 relocs occurred.
+     Consider what happens if someone inept creates a linker script
+     that puts unwind information in .text.  */
+  s = bfd_get_section_by_name (abfd, ".PARISC.unwind");
+  if (s != NULL)
+    {
+      bfd_size_type size;
+      bfd_byte *contents;
+
+      if (!bfd_malloc_and_get_section (abfd, s, &contents))
+	return FALSE;
+
+      size = s->size;
+      qsort (contents, (size_t) (size / 16), 16, hppa_unwind_entry_compare);
+
+      if (! bfd_set_section_contents (abfd, s, contents, (file_ptr) 0, size))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* What to do when ld finds relocations against symbols defined in
+   discarded sections.  */
+
+static unsigned int
+elf_hppa_action_discarded (asection *sec)
+{
+  if (strcmp (".PARISC.unwind", sec->name) == 0)
+    return 0;
+
+  return _bfd_elf_default_action_discarded (sec);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf-ifunc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf-ifunc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf-ifunc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf-ifunc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,323 @@
+/* ELF STT_GNU_IFUNC support.
+   Copyright 2009
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#define ARCH_SIZE 0
+#include "elf-bfd.h"
+#include "safe-ctype.h"
+#include "libiberty.h"
+#include "objalloc.h"
+
+/* Create sections needed by STT_GNU_IFUNC symbol.  */
+
+bfd_boolean
+_bfd_elf_create_ifunc_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  flagword flags, pltflags;
+  asection *s;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  struct elf_link_hash_table *htab = elf_hash_table (info);
+
+  if (htab->irelifunc != NULL || htab->iplt != NULL)
+    return TRUE;
+
+  flags = bed->dynamic_sec_flags;
+  pltflags = flags;
+  if (bed->plt_not_loaded)
+    /* We do not clear SEC_ALLOC here because we still want the OS to
+       allocate space for the section; it's just that there's nothing
+       to read in from the object file.  */
+    pltflags &= ~ (SEC_CODE | SEC_LOAD | SEC_HAS_CONTENTS);
+  else
+    pltflags |= SEC_ALLOC | SEC_CODE | SEC_LOAD;
+  if (bed->plt_readonly)
+    pltflags |= SEC_READONLY;
+
+  if (info->shared)
+    {
+      /* We need to create .rel[a].ifunc for shared objects.  */
+      const char *rel_sec = (bed->rela_plts_and_copies_p
+			     ? ".rela.ifunc" : ".rel.ifunc");
+
+      s = bfd_make_section_with_flags (abfd, rel_sec,
+				       flags | SEC_READONLY);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s,
+					  bed->s->log_file_align))
+	return FALSE;
+      htab->irelifunc = s;
+    }
+  else
+    {
+      /* We need to create .iplt, .rel[a].iplt, .igot and .igot.plt
+	 for static executables.   */
+      s = bfd_make_section_with_flags (abfd, ".iplt", pltflags);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, bed->plt_alignment))
+	return FALSE;
+      htab->iplt = s;
+
+      s = bfd_make_section_with_flags (abfd,
+				       (bed->rela_plts_and_copies_p
+					? ".rela.iplt" : ".rel.iplt"),
+				       flags | SEC_READONLY);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s,
+					  bed->s->log_file_align))
+	return FALSE;
+      htab->irelplt = s;
+
+      /* We don't need the .igot section if we have the .igot.plt
+	 section.  */
+      if (bed->want_got_plt)
+	s = bfd_make_section_with_flags (abfd, ".igot.plt", flags);
+      else
+	s = bfd_make_section_with_flags (abfd, ".igot", flags);
+      if (s == NULL
+	  || !bfd_set_section_alignment (abfd, s,
+					 bed->s->log_file_align))
+	return FALSE;
+      htab->igotplt = s;
+    }
+
+  return TRUE;
+}
+
+/* For a STT_GNU_IFUNC symbol, create a dynamic reloc section, SRELOC,
+   for the input section, SEC, and append this reloc to HEAD.  */
+
+asection *
+_bfd_elf_create_ifunc_dyn_reloc (bfd *abfd, struct bfd_link_info *info,
+				 asection *sec, asection *sreloc,
+				 struct elf_dyn_relocs **head)
+{
+  struct elf_dyn_relocs *p;
+  struct elf_link_hash_table *htab = elf_hash_table (info);
+
+  if (sreloc == NULL)
+    {
+      const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+
+      if (htab->dynobj == NULL)
+	htab->dynobj = abfd;
+
+      sreloc = _bfd_elf_make_dynamic_reloc_section (sec, htab->dynobj,
+						    bed->s->log_file_align,
+						    abfd,
+						    bed->rela_plts_and_copies_p); 
+      if (sreloc == NULL)
+	return NULL;
+    }
+		      
+  p = *head;
+  if (p == NULL || p->sec != sec)
+    {
+      bfd_size_type amt = sizeof *p;
+
+      p = ((struct elf_dyn_relocs *) bfd_alloc (htab->dynobj, amt));
+      if (p == NULL)
+	return NULL;
+      p->next = *head;
+      *head = p;
+      p->sec = sec;
+      p->count = 0;
+      p->pc_count = 0;
+    }
+  p->count += 1;
+
+  return sreloc;
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   dynamic relocs against a STT_GNU_IFUNC symbol definition.  */
+
+bfd_boolean
+_bfd_elf_allocate_ifunc_dyn_relocs (struct bfd_link_info *info,
+				    struct elf_link_hash_entry *h,
+				    struct elf_dyn_relocs **head,
+				    unsigned int plt_entry_size,
+				    unsigned int got_entry_size)
+{
+  asection *plt, *gotplt, *relplt;
+  struct elf_dyn_relocs *p;
+  unsigned int sizeof_reloc;
+  const struct elf_backend_data *bed;
+  struct elf_link_hash_table *htab;
+
+  /* When a shared library references a STT_GNU_IFUNC symbol defined
+     in executable, the address of the resolved function may be used.
+     But in non-shared executable, the address of its .plt slot may
+     be used.  Pointer equality may not work correctly.  PIE should
+     be used if pointer equality is required here.  */
+  if (!info->shared
+      && (h->dynindx != -1
+	  || info->export_dynamic)
+      && h->pointer_equality_needed)
+    {
+      info->callbacks->einfo 
+	(_("%F%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer "
+	   "equality in `%B' can not be used when making an "
+	   "executable; recompile with -fPIE and relink with -pie\n"),
+	 h->root.root.string,
+	 h->root.u.def.section->owner);
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  htab = elf_hash_table (info);
+
+  /* Support garbage collection against STT_GNU_IFUNC symbols.  */
+  if (h->plt.refcount <= 0 && h->got.refcount <= 0)
+    {
+      /* When building shared library, we need to handle the case
+         where it is marked with regular reference, but not non-GOT
+	 reference.  It may happen if we didn't see STT_GNU_IFUNC
+	 symbol at the time when checking relocations.  */
+      if (info->shared
+	  && !h->non_got_ref
+	  && h->ref_regular)
+	for (p = *head; p != NULL; p = p->next)
+	  if (p->count)
+	    {
+	      h->non_got_ref = 1;
+	      goto keep;
+	    }
+
+      h->got = htab->init_got_offset;
+      h->plt = htab->init_plt_offset;
+      *head = NULL;
+      return TRUE;
+    }
+
+  /* Return and discard space for dynamic relocations against it if
+     it is never referenced in a non-shared object.  */
+  if (!h->ref_regular)
+    {
+      if (h->plt.refcount > 0
+	  || h->got.refcount > 0)
+	abort ();
+      h->got = htab->init_got_offset;
+      h->plt = htab->init_plt_offset;
+      *head = NULL;
+      return TRUE;
+    }
+
+keep:
+  bed = get_elf_backend_data (info->output_bfd);
+  if (bed->rela_plts_and_copies_p)
+    sizeof_reloc = bed->s->sizeof_rela;
+  else
+    sizeof_reloc = bed->s->sizeof_rel;
+
+  /* When building a static executable, use .iplt, .igot.plt and
+     .rel[a].iplt sections for STT_GNU_IFUNC symbols.  */
+  if (htab->splt != NULL)
+    {
+      plt = htab->splt;
+      gotplt = htab->sgotplt;
+      relplt = htab->srelplt;
+
+      /* If this is the first .plt entry, make room for the special
+	 first entry.  */
+      if (plt->size == 0)
+	plt->size += plt_entry_size;
+    }
+  else
+    {
+      plt = htab->iplt;
+      gotplt = htab->igotplt;
+      relplt = htab->irelplt;
+    }
+
+  /* Don't update value of STT_GNU_IFUNC symbol to PLT.  We need
+     the original value for R_*_IRELATIVE.  */  
+  h->plt.offset = plt->size;
+
+  /* Make room for this entry in the .plt/.iplt section.  */
+  plt->size += plt_entry_size;
+
+  /* We also need to make an entry in the .got.plt/.got.iplt section,
+     which will be placed in the .got section by the linker script.  */
+  gotplt->size += got_entry_size;
+
+  /* We also need to make an entry in the .rel[a].plt/.rel[a].iplt
+     section.  */
+  relplt->size += sizeof_reloc;
+  relplt->reloc_count++;
+
+  /* We need dynamic relocation for STT_GNU_IFUNC symbol only when
+     there is a non-GOT reference in a shared object.  */
+  if (!info->shared
+      || !h->non_got_ref)
+    *head = NULL;
+
+  /* Finally, allocate space.  */
+  p = *head;
+  if (p != NULL)
+    {
+      bfd_size_type count = 0;
+      do
+	{
+	  count += p->count;
+	  p = p->next;
+	}
+      while (p != NULL);
+      htab->irelifunc->size += count * sizeof_reloc;
+    }
+
+  /* For STT_GNU_IFUNC symbol, .got.plt has the real function address
+     and .got has the PLT entry adddress.  We will load the GOT entry
+     with the PLT entry in finish_dynamic_symbol if it is used.  For
+     branch, it uses .got.plt.  For symbol value,
+     1. Use .got.plt in a shared object if it is forced local or not
+     dynamic.
+     2. Use .got.plt in a non-shared object if pointer equality isn't
+     needed.
+     3. Use .got.plt in PIE.
+     4. Use .got.plt if .got isn't used.
+     5. Otherwise use .got so that it can be shared among different
+     objects at run-time.
+     We only need to relocate .got entry in shared object.  */
+  if (h->got.refcount <= 0
+      || (info->shared
+	  && (h->dynindx == -1
+	      || h->forced_local))
+      || (!info->shared
+	  && !h->pointer_equality_needed)
+      || (info->executable && info->shared)
+      || htab->sgot == NULL)
+    {
+      /* Use .got.plt.  */
+      h->got.offset = (bfd_vma) -1;
+    }
+  else
+    {
+      h->got.offset = htab->sgot->size;
+      htab->sgot->size += got_entry_size;
+      if (info->shared)
+	htab->srelgot->size += sizeof_reloc;
+    }
+
+  return TRUE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf-m10200.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf-m10200.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf-m10200.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf-m10200.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1423 @@
+/* Matsushita 10200 specific support for 32-bit ELF
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2007, 2010
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+
+static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
+  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
+static void mn10200_info_to_howto
+  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
+static bfd_boolean mn10200_elf_relax_delete_bytes
+  PARAMS ((bfd *, asection *, bfd_vma, int));
+static bfd_boolean mn10200_elf_symbol_address_p
+  PARAMS ((bfd *, asection *, Elf_Internal_Sym *, bfd_vma));
+static bfd_reloc_status_type mn10200_elf_final_link_relocate
+  PARAMS ((reloc_howto_type *, bfd *, bfd *, asection *,
+	   bfd_byte *, bfd_vma, bfd_vma, bfd_vma,
+	   struct bfd_link_info *, asection *, int));
+static bfd_boolean mn10200_elf_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
+	   bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Sym *,
+	   asection **));
+static bfd_boolean mn10200_elf_relax_section
+  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
+static bfd_byte * mn10200_elf_get_relocated_section_contents
+  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
+	   bfd_byte *, bfd_boolean, asymbol **));
+
+enum reloc_type {
+  R_MN10200_NONE = 0,
+  R_MN10200_32,
+  R_MN10200_16,
+  R_MN10200_8,
+  R_MN10200_24,
+  R_MN10200_PCREL8,
+  R_MN10200_PCREL16,
+  R_MN10200_PCREL24,
+  R_MN10200_MAX
+};
+
+static reloc_howto_type elf_mn10200_howto_table[] = {
+  /* Dummy relocation.  Does nothing.  */
+  HOWTO (R_MN10200_NONE,
+	 0,
+	 2,
+	 16,
+	 FALSE,
+	 0,
+	 complain_overflow_bitfield,
+	 bfd_elf_generic_reloc,
+	 "R_MN10200_NONE",
+	 FALSE,
+	 0,
+	 0,
+	 FALSE),
+  /* Standard 32 bit reloc.  */
+  HOWTO (R_MN10200_32,
+	 0,
+	 2,
+	 32,
+	 FALSE,
+	 0,
+	 complain_overflow_bitfield,
+	 bfd_elf_generic_reloc,
+	 "R_MN10200_32",
+	 FALSE,
+	 0xffffffff,
+	 0xffffffff,
+	 FALSE),
+  /* Standard 16 bit reloc.  */
+  HOWTO (R_MN10200_16,
+	 0,
+	 1,
+	 16,
+	 FALSE,
+	 0,
+	 complain_overflow_bitfield,
+	 bfd_elf_generic_reloc,
+	 "R_MN10200_16",
+	 FALSE,
+	 0xffff,
+	 0xffff,
+	 FALSE),
+  /* Standard 8 bit reloc.  */
+  HOWTO (R_MN10200_8,
+	 0,
+	 0,
+	 8,
+	 FALSE,
+	 0,
+	 complain_overflow_bitfield,
+	 bfd_elf_generic_reloc,
+	 "R_MN10200_8",
+	 FALSE,
+	 0xff,
+	 0xff,
+	 FALSE),
+  /* Standard 24 bit reloc.  */
+  HOWTO (R_MN10200_24,
+	 0,
+	 2,
+	 24,
+	 FALSE,
+	 0,
+	 complain_overflow_bitfield,
+	 bfd_elf_generic_reloc,
+	 "R_MN10200_24",
+	 FALSE,
+	 0xffffff,
+	 0xffffff,
+	 FALSE),
+  /* Simple 8 pc-relative reloc.  */
+  HOWTO (R_MN10200_PCREL8,
+	 0,
+	 0,
+	 8,
+	 TRUE,
+	 0,
+	 complain_overflow_bitfield,
+	 bfd_elf_generic_reloc,
+	 "R_MN10200_PCREL8",
+	 FALSE,
+	 0xff,
+	 0xff,
+	 TRUE),
+  /* Simple 16 pc-relative reloc.  */
+  HOWTO (R_MN10200_PCREL16,
+	 0,
+	 1,
+	 16,
+	 TRUE,
+	 0,
+	 complain_overflow_bitfield,
+	 bfd_elf_generic_reloc,
+	 "R_MN10200_PCREL16",
+	 FALSE,
+	 0xffff,
+	 0xffff,
+	 TRUE),
+  /* Simple 32bit pc-relative reloc with a 1 byte adjustment
+     to get the pc-relative offset correct.  */
+  HOWTO (R_MN10200_PCREL24,
+	 0,
+	 2,
+	 24,
+	 TRUE,
+	 0,
+	 complain_overflow_bitfield,
+	 bfd_elf_generic_reloc,
+	 "R_MN10200_PCREL24",
+	 FALSE,
+	 0xffffff,
+	 0xffffff,
+	 TRUE),
+};
+
+struct mn10200_reloc_map {
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned char elf_reloc_val;
+};
+
+static const struct mn10200_reloc_map mn10200_reloc_map[] = {
+  { BFD_RELOC_NONE    , R_MN10200_NONE   , },
+  { BFD_RELOC_32      , R_MN10200_32     , },
+  { BFD_RELOC_16      , R_MN10200_16     , },
+  { BFD_RELOC_8       , R_MN10200_8      , },
+  { BFD_RELOC_24      , R_MN10200_24     , },
+  { BFD_RELOC_8_PCREL , R_MN10200_PCREL8 , },
+  { BFD_RELOC_16_PCREL, R_MN10200_PCREL16, },
+  { BFD_RELOC_24_PCREL, R_MN10200_PCREL24, },
+};
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_type_lookup (abfd, code)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     bfd_reloc_code_real_type code;
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (mn10200_reloc_map) / sizeof (struct mn10200_reloc_map);
+       i++)
+    {
+      if (mn10200_reloc_map[i].bfd_reloc_val == code)
+	return &elf_mn10200_howto_table[mn10200_reloc_map[i].elf_reloc_val];
+    }
+
+  return NULL;
+}
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (elf_mn10200_howto_table)
+	    / sizeof (elf_mn10200_howto_table[0]));
+       i++)
+    if (elf_mn10200_howto_table[i].name != NULL
+	&& strcasecmp (elf_mn10200_howto_table[i].name, r_name) == 0)
+      return &elf_mn10200_howto_table[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for an MN10200 ELF reloc.  */
+
+static void
+mn10200_info_to_howto (abfd, cache_ptr, dst)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *cache_ptr;
+     Elf_Internal_Rela *dst;
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_MN10200_MAX);
+  cache_ptr->howto = &elf_mn10200_howto_table[r_type];
+}
+
+/* Perform a relocation as part of a final link.  */
+
+static bfd_reloc_status_type
+mn10200_elf_final_link_relocate (howto, input_bfd, output_bfd,
+				 input_section, contents, offset, value,
+				 addend, info, sym_sec, is_local)
+     reloc_howto_type *howto;
+     bfd *input_bfd;
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     asection *input_section;
+     bfd_byte *contents;
+     bfd_vma offset;
+     bfd_vma value;
+     bfd_vma addend;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+     asection *sym_sec ATTRIBUTE_UNUSED;
+     int is_local ATTRIBUTE_UNUSED;
+{
+  unsigned long r_type = howto->type;
+  bfd_byte *hit_data = contents + offset;
+
+  switch (r_type)
+    {
+
+    case R_MN10200_NONE:
+      return bfd_reloc_ok;
+
+    case R_MN10200_32:
+      value += addend;
+      bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_MN10200_16:
+      value += addend;
+
+      if ((long) value > 0x7fff || (long) value < -0x8000)
+	return bfd_reloc_overflow;
+
+      bfd_put_16 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_MN10200_8:
+      value += addend;
+
+      if ((long) value > 0x7f || (long) value < -0x80)
+	return bfd_reloc_overflow;
+
+      bfd_put_8 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_MN10200_24:
+      value += addend;
+
+      if ((long) value > 0x7fffff || (long) value < -0x800000)
+	return bfd_reloc_overflow;
+
+      value &= 0xffffff;
+      value |= (bfd_get_32 (input_bfd, hit_data) & 0xff000000);
+      bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_MN10200_PCREL8:
+      value -= (input_section->output_section->vma
+		+ input_section->output_offset);
+      value -= (offset + 1);
+      value += addend;
+
+      if ((long) value > 0xff || (long) value < -0x100)
+	return bfd_reloc_overflow;
+
+      bfd_put_8 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_MN10200_PCREL16:
+      value -= (input_section->output_section->vma
+		+ input_section->output_offset);
+      value -= (offset + 2);
+      value += addend;
+
+      if ((long) value > 0xffff || (long) value < -0x10000)
+	return bfd_reloc_overflow;
+
+      bfd_put_16 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_MN10200_PCREL24:
+      value -= (input_section->output_section->vma
+		+ input_section->output_offset);
+      value -= (offset + 3);
+      value += addend;
+
+      if ((long) value > 0xffffff || (long) value < -0x1000000)
+	return bfd_reloc_overflow;
+
+      value &= 0xffffff;
+      value |= (bfd_get_32 (input_bfd, hit_data) & 0xff000000);
+      bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    default:
+      return bfd_reloc_notsupported;
+    }
+}
+
+/* Relocate an MN10200 ELF section.  */
+static bfd_boolean
+mn10200_elf_relocate_section (output_bfd, info, input_bfd, input_section,
+			      contents, relocs, local_syms, local_sections)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     Elf_Internal_Rela *relocs;
+     Elf_Internal_Sym *local_syms;
+     asection **local_sections;
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel, *relend;
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+      howto = elf_mn10200_howto_table + r_type;
+
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc, warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      r = mn10200_elf_final_link_relocate (howto, input_bfd, output_bfd,
+					   input_section,
+					   contents, rel->r_offset,
+					   relocation, rel->r_addend,
+					   info, sec, h == NULL);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char *name;
+	  const char *msg = (const char *) 0;
+
+	  if (h != NULL)
+	    name = h->root.root.string;
+	  else
+	    {
+	      name = (bfd_elf_string_from_elf_section
+		      (input_bfd, symtab_hdr->sh_link, sym->st_name));
+	      if (name == NULL || *name == '\0')
+		name = bfd_section_name (input_bfd, sec);
+	    }
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      if (! ((*info->callbacks->reloc_overflow)
+		     (info, (h ? &h->root : NULL), name, howto->name,
+		      (bfd_vma) 0, input_bfd, input_section,
+		      rel->r_offset)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_undefined:
+	      if (! ((*info->callbacks->undefined_symbol)
+		     (info, name, input_bfd, input_section,
+		      rel->r_offset, TRUE)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      goto common_error;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      goto common_error;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous error");
+	      goto common_error;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      /* fall through */
+
+	    common_error:
+	      if (!((*info->callbacks->warning)
+		    (info, msg, name, input_bfd, input_section,
+		     rel->r_offset)))
+		return FALSE;
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* This function handles relaxing for the mn10200.
+
+   There are quite a few relaxing opportunities available on the mn10200:
+
+	* jsr:24 -> jsr:16 					   2 bytes
+
+	* jmp:24 -> jmp:16					   2 bytes
+	* jmp:16 -> bra:8					   1 byte
+
+		* If the previous instruction is a conditional branch
+		around the jump/bra, we may be able to reverse its condition
+		and change its target to the jump's target.  The jump/bra
+		can then be deleted.				   2 bytes
+
+	* mov abs24 -> mov abs16	2 byte savings
+
+	* Most instructions which accept imm24 can relax to imm16  2 bytes
+	- Most instructions which accept imm16 can relax to imm8   1 byte
+
+	* Most instructions which accept d24 can relax to d16	   2 bytes
+	- Most instructions which accept d16 can relax to d8	   1 byte
+
+	abs24, imm24, d24 all look the same at the reloc level.  It
+	might make the code simpler if we had different relocs for
+	the various relaxable operand types.
+
+	We don't handle imm16->imm8 or d16->d8 as they're very rare
+	and somewhat more difficult to support.  */
+
+static bfd_boolean
+mn10200_elf_relax_section (abfd, sec, link_info, again)
+     bfd *abfd;
+     asection *sec;
+     struct bfd_link_info *link_info;
+     bfd_boolean *again;
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *internal_relocs;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_byte *contents = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+
+  /* Assume nothing changes.  */
+  *again = FALSE;
+
+  /* We don't have to do anything for a relocatable link, if
+     this section does not have relocs, or if this is not a
+     code section.  */
+  if (link_info->relocatable
+      || (sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0
+      || (sec->flags & SEC_CODE) == 0)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+
+  /* Get a copy of the native relocations.  */
+  internal_relocs = (_bfd_elf_link_read_relocs
+		     (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
+		      link_info->keep_memory));
+  if (internal_relocs == NULL)
+    goto error_return;
+
+  /* Walk through them looking for relaxing opportunities.  */
+  irelend = internal_relocs + sec->reloc_count;
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      bfd_vma symval;
+
+      /* If this isn't something that can be relaxed, then ignore
+	 this reloc.  */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10200_NONE
+	  || ELF32_R_TYPE (irel->r_info) == (int) R_MN10200_8
+	  || ELF32_R_TYPE (irel->r_info) == (int) R_MN10200_MAX)
+	continue;
+
+      /* Get the section contents if we haven't done so already.  */
+      if (contents == NULL)
+	{
+	  /* Get cached copy if it exists.  */
+	  if (elf_section_data (sec)->this_hdr.contents != NULL)
+	    contents = elf_section_data (sec)->this_hdr.contents;
+	  else
+	    {
+	      /* Go get them off disk.  */
+	      if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+		goto error_return;
+	    }
+	}
+
+      /* Read this BFD's local symbols if we haven't done so already.  */
+      if (isymbuf == NULL && symtab_hdr->sh_info != 0)
+	{
+	  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	  if (isymbuf == NULL)
+	    isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+					    symtab_hdr->sh_info, 0,
+					    NULL, NULL, NULL);
+	  if (isymbuf == NULL)
+	    goto error_return;
+	}
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+	{
+	  /* A local symbol.  */
+	  Elf_Internal_Sym *isym;
+	  asection *sym_sec;
+
+	  isym = isymbuf + ELF32_R_SYM (irel->r_info);
+	  if (isym->st_shndx == SHN_UNDEF)
+	    sym_sec = bfd_und_section_ptr;
+	  else if (isym->st_shndx == SHN_ABS)
+	    sym_sec = bfd_abs_section_ptr;
+	  else if (isym->st_shndx == SHN_COMMON)
+	    sym_sec = bfd_com_section_ptr;
+	  else
+	    sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+	  symval = (isym->st_value
+		    + sym_sec->output_section->vma
+		    + sym_sec->output_offset);
+	}
+      else
+	{
+	  unsigned long indx;
+	  struct elf_link_hash_entry *h;
+
+	  /* An external symbol.  */
+	  indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+	  h = elf_sym_hashes (abfd)[indx];
+	  BFD_ASSERT (h != NULL);
+	  if (h->root.type != bfd_link_hash_defined
+	      && h->root.type != bfd_link_hash_defweak)
+	    {
+	      /* This appears to be a reference to an undefined
+                 symbol.  Just ignore it--it will be caught by the
+                 regular reloc processing.  */
+	      continue;
+	    }
+
+	  symval = (h->root.u.def.value
+		    + h->root.u.def.section->output_section->vma
+		    + h->root.u.def.section->output_offset);
+	}
+
+      /* For simplicity of coding, we are going to modify the section
+	 contents, the section relocs, and the BFD symbol table.  We
+	 must tell the rest of the code not to free up this
+	 information.  It would be possible to instead create a table
+	 of changes which have to be made, as is done in coff-mips.c;
+	 that would be more work, but would require less memory when
+	 the linker is run.  */
+
+      /* Try to turn a 24bit pc-relative branch/call into a 16bit pc-relative
+	 branch/call.  */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10200_PCREL24)
+	{
+	  bfd_vma value = symval;
+
+	  /* Deal with pc-relative gunk.  */
+	  value -= (sec->output_section->vma + sec->output_offset);
+	  value -= (irel->r_offset + 3);
+	  value += irel->r_addend;
+
+	  /* See if the value will fit in 16 bits, note the high value is
+	     0x7fff + 2 as the target will be two bytes closer if we are
+	     able to relax.  */
+	  if ((long) value < 0x8001 && (long) value > -0x8000)
+	    {
+	      unsigned char code;
+
+	      /* Get the opcode.  */
+	      code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+	      if (code != 0xe0 && code != 0xe1)
+		continue;
+
+	      /* Note that we've changed the relocs, section contents, etc.  */
+	      elf_section_data (sec)->relocs = internal_relocs;
+	      elf_section_data (sec)->this_hdr.contents = contents;
+	      symtab_hdr->contents = (unsigned char *) isymbuf;
+
+	      /* Fix the opcode.  */
+	      if (code == 0xe0)
+		bfd_put_8 (abfd, 0xfc, contents + irel->r_offset - 2);
+	      else if (code == 0xe1)
+		bfd_put_8 (abfd, 0xfd, contents + irel->r_offset - 2);
+
+	      /* Fix the relocation's type.  */
+	      irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					   R_MN10200_PCREL16);
+
+	      /* The opcode got shorter too, so we have to fix the offset.  */
+	      irel->r_offset -= 1;
+
+	      /* Delete two bytes of data.  */
+	      if (!mn10200_elf_relax_delete_bytes (abfd, sec,
+						   irel->r_offset + 1, 2))
+		goto error_return;
+
+	      /* That will change things, so, we should relax again.
+		 Note that this is not required, and it may be slow.  */
+	      *again = TRUE;
+	    }
+	}
+
+      /* Try to turn a 16bit pc-relative branch into a 8bit pc-relative
+	 branch.  */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10200_PCREL16)
+	{
+	  bfd_vma value = symval;
+
+	  /* Deal with pc-relative gunk.  */
+	  value -= (sec->output_section->vma + sec->output_offset);
+	  value -= (irel->r_offset + 2);
+	  value += irel->r_addend;
+
+	  /* See if the value will fit in 8 bits, note the high value is
+	     0x7f + 1 as the target will be one bytes closer if we are
+	     able to relax.  */
+	  if ((long) value < 0x80 && (long) value > -0x80)
+	    {
+	      unsigned char code;
+
+	      /* Get the opcode.  */
+	      code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+	      if (code != 0xfc)
+		continue;
+
+	      /* Note that we've changed the relocs, section contents, etc.  */
+	      elf_section_data (sec)->relocs = internal_relocs;
+	      elf_section_data (sec)->this_hdr.contents = contents;
+	      symtab_hdr->contents = (unsigned char *) isymbuf;
+
+	      /* Fix the opcode.  */
+	      bfd_put_8 (abfd, 0xea, contents + irel->r_offset - 1);
+
+	      /* Fix the relocation's type.  */
+	      irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					   R_MN10200_PCREL8);
+
+	      /* Delete one byte of data.  */
+	      if (!mn10200_elf_relax_delete_bytes (abfd, sec,
+						   irel->r_offset + 1, 1))
+		goto error_return;
+
+	      /* That will change things, so, we should relax again.
+		 Note that this is not required, and it may be slow.  */
+	      *again = TRUE;
+	    }
+	}
+
+      /* Try to eliminate an unconditional 8 bit pc-relative branch
+	 which immediately follows a conditional 8 bit pc-relative
+	 branch around the unconditional branch.
+
+	    original:		new:
+	    bCC lab1		bCC' lab2
+	    bra lab2
+	   lab1:	       lab1:
+
+	 This happens when the bCC can't reach lab2 at assembly time,
+	 but due to other relaxations it can reach at link time.  */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10200_PCREL8)
+	{
+	  Elf_Internal_Rela *nrel;
+	  bfd_vma value = symval;
+	  unsigned char code;
+
+	  /* Deal with pc-relative gunk.  */
+	  value -= (sec->output_section->vma + sec->output_offset);
+	  value -= (irel->r_offset + 1);
+	  value += irel->r_addend;
+
+	  /* Do nothing if this reloc is the last byte in the section.  */
+	  if (irel->r_offset == sec->size)
+	    continue;
+
+	  /* See if the next instruction is an unconditional pc-relative
+	     branch, more often than not this test will fail, so we
+	     test it first to speed things up.  */
+	  code = bfd_get_8 (abfd, contents + irel->r_offset + 1);
+	  if (code != 0xea)
+	    continue;
+
+	  /* Also make sure the next relocation applies to the next
+	     instruction and that it's a pc-relative 8 bit branch.  */
+	  nrel = irel + 1;
+	  if (nrel == irelend
+	      || irel->r_offset + 2 != nrel->r_offset
+	      || ELF32_R_TYPE (nrel->r_info) != (int) R_MN10200_PCREL8)
+	    continue;
+
+	  /* Make sure our destination immediately follows the
+	     unconditional branch.  */
+	  if (symval != (sec->output_section->vma + sec->output_offset
+			 + irel->r_offset + 3))
+	    continue;
+
+	  /* Now make sure we are a conditional branch.  This may not
+	     be necessary, but why take the chance.
+
+	     Note these checks assume that R_MN10200_PCREL8 relocs
+	     only occur on bCC and bCCx insns.  If they occured
+	     elsewhere, we'd need to know the start of this insn
+	     for this check to be accurate.  */
+	  code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+	  if (code != 0xe0 && code != 0xe1 && code != 0xe2
+	      && code != 0xe3 && code != 0xe4 && code != 0xe5
+	      && code != 0xe6 && code != 0xe7 && code != 0xe8
+	      && code != 0xe9 && code != 0xec && code != 0xed
+	      && code != 0xee && code != 0xef && code != 0xfc
+	      && code != 0xfd && code != 0xfe && code != 0xff)
+	    continue;
+
+	  /* We also have to be sure there is no symbol/label
+	     at the unconditional branch.  */
+	  if (mn10200_elf_symbol_address_p (abfd, sec, isymbuf,
+					    irel->r_offset + 1))
+	    continue;
+
+	  /* Note that we've changed the relocs, section contents, etc.  */
+	  elf_section_data (sec)->relocs = internal_relocs;
+	  elf_section_data (sec)->this_hdr.contents = contents;
+	  symtab_hdr->contents = (unsigned char *) isymbuf;
+
+	  /* Reverse the condition of the first branch.  */
+	  switch (code)
+	    {
+	    case 0xfc:
+	      code = 0xfd;
+	      break;
+	    case 0xfd:
+	      code = 0xfc;
+	      break;
+	    case 0xfe:
+	      code = 0xff;
+	      break;
+	    case 0xff:
+	      code = 0xfe;
+	      break;
+	    case 0xe8:
+	      code = 0xe9;
+	      break;
+	    case 0xe9:
+	      code = 0xe8;
+	      break;
+	    case 0xe0:
+	      code = 0xe2;
+	      break;
+	    case 0xe2:
+	      code = 0xe0;
+	      break;
+	    case 0xe3:
+	      code = 0xe1;
+	      break;
+	    case 0xe1:
+	      code = 0xe3;
+	      break;
+	    case 0xe4:
+	      code = 0xe6;
+	      break;
+	    case 0xe6:
+	      code = 0xe4;
+	      break;
+	    case 0xe7:
+	      code = 0xe5;
+	      break;
+	    case 0xe5:
+	      code = 0xe7;
+	      break;
+	    case 0xec:
+	      code = 0xed;
+	      break;
+	    case 0xed:
+	      code = 0xec;
+	      break;
+	    case 0xee:
+	      code = 0xef;
+	      break;
+	    case 0xef:
+	      code = 0xee;
+	      break;
+	    }
+	  bfd_put_8 (abfd, code, contents + irel->r_offset - 1);
+
+	  /* Set the reloc type and symbol for the first branch
+	     from the second branch.  */
+	  irel->r_info = nrel->r_info;
+
+	  /* Make the reloc for the second branch a null reloc.  */
+	  nrel->r_info = ELF32_R_INFO (ELF32_R_SYM (nrel->r_info),
+				       R_MN10200_NONE);
+
+	  /* Delete two bytes of data.  */
+	  if (!mn10200_elf_relax_delete_bytes (abfd, sec,
+					       irel->r_offset + 1, 2))
+	    goto error_return;
+
+	  /* That will change things, so, we should relax again.
+	     Note that this is not required, and it may be slow.  */
+	  *again = TRUE;
+	}
+
+      /* Try to turn a 24bit immediate, displacement or absolute address
+	 into a 16bit immediate, displacement or absolute address.  */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10200_24)
+	{
+	  bfd_vma value = symval;
+
+	  /* See if the value will fit in 16 bits.
+	     We allow any 16bit match here.  We prune those we can't
+	     handle below.  */
+	  if ((long) value < 0x7fff && (long) value > -0x8000)
+	    {
+	      unsigned char code;
+
+	      /* All insns which have 24bit operands are 5 bytes long,
+		 the first byte will always be 0xf4, but we double check
+		 it just in case.  */
+
+	      /* Get the first opcode.  */
+	      code = bfd_get_8 (abfd, contents + irel->r_offset - 2);
+
+	      if (code != 0xf4)
+		continue;
+
+	      /* Get the second opcode.  */
+	      code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+	      switch (code & 0xfc)
+		{
+		/* mov imm24,dn -> mov imm16,dn */
+		case 0x70:
+		  /* Not safe if the high bit is on as relaxing may
+		     move the value out of high mem and thus not fit
+		     in a signed 16bit value.  */
+		  if (value & 0x8000)
+		    continue;
+
+		  /* Note that we've changed the relocation contents, etc.  */
+		  elf_section_data (sec)->relocs = internal_relocs;
+		  elf_section_data (sec)->this_hdr.contents = contents;
+		  symtab_hdr->contents = (unsigned char *) isymbuf;
+
+		  /* Fix the opcode.  */
+		  bfd_put_8 (abfd, 0xf8 + (code & 0x03),
+			     contents + irel->r_offset - 2);
+
+		  /* Fix the relocation's type.  */
+		  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					       R_MN10200_16);
+
+		  /* The opcode got shorter too, so we have to fix the
+		     offset.  */
+		  irel->r_offset -= 1;
+
+		  /* Delete two bytes of data.  */
+		  if (!mn10200_elf_relax_delete_bytes (abfd, sec,
+						       irel->r_offset + 1, 2))
+		    goto error_return;
+
+		  /* That will change things, so, we should relax again.
+		     Note that this is not required, and it may be slow.  */
+		  *again = TRUE;
+		  break;
+
+		/* mov imm24,an -> mov imm16,an
+		   cmp imm24,an -> cmp imm16,an
+		   mov (abs24),dn -> mov (abs16),dn
+		   mov dn,(abs24) -> mov dn,(abs16)
+		   movb dn,(abs24) -> movb dn,(abs16)
+		   movbu (abs24),dn -> movbu (abs16),dn */
+		case 0x74:
+		case 0x7c:
+		case 0xc0:
+		case 0x40:
+		case 0x44:
+		case 0xc8:
+		  /* Note that we've changed the relocation contents, etc.  */
+		  elf_section_data (sec)->relocs = internal_relocs;
+		  elf_section_data (sec)->this_hdr.contents = contents;
+		  symtab_hdr->contents = (unsigned char *) isymbuf;
+
+		  if ((code & 0xfc) == 0x74)
+		    code = 0xdc + (code & 0x03);
+		  else if ((code & 0xfc) == 0x7c)
+		    code = 0xec + (code & 0x03);
+		  else if ((code & 0xfc) == 0xc0)
+		    code = 0xc8 + (code & 0x03);
+		  else if ((code & 0xfc) == 0x40)
+		    code = 0xc0 + (code & 0x03);
+		  else if ((code & 0xfc) == 0x44)
+		    code = 0xc4 + (code & 0x03);
+		  else if ((code & 0xfc) == 0xc8)
+		    code = 0xcc + (code & 0x03);
+
+		  /* Fix the opcode.  */
+		  bfd_put_8 (abfd, code, contents + irel->r_offset - 2);
+
+		  /* Fix the relocation's type.  */
+		  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					       R_MN10200_16);
+
+		  /* The opcode got shorter too, so we have to fix the
+		     offset.  */
+		  irel->r_offset -= 1;
+
+		  /* Delete two bytes of data.  */
+		  if (!mn10200_elf_relax_delete_bytes (abfd, sec,
+						       irel->r_offset + 1, 2))
+		    goto error_return;
+
+		  /* That will change things, so, we should relax again.
+		     Note that this is not required, and it may be slow.  */
+		  *again = TRUE;
+		  break;
+
+		/* cmp imm24,dn -> cmp imm16,dn
+		   mov (abs24),an -> mov (abs16),an
+		   mov an,(abs24) -> mov an,(abs16)
+		   add imm24,dn -> add imm16,dn
+		   add imm24,an -> add imm16,an
+		   sub imm24,dn -> sub imm16,dn
+		   sub imm24,an -> sub imm16,an
+		   And all d24->d16 in memory ops.  */
+		case 0x78:
+		case 0xd0:
+		case 0x50:
+		case 0x60:
+		case 0x64:
+		case 0x68:
+		case 0x6c:
+		case 0x80:
+		case 0xf0:
+		case 0x00:
+		case 0x10:
+		case 0xb0:
+		case 0x30:
+		case 0xa0:
+		case 0x20:
+		case 0x90:
+		  /* Not safe if the high bit is on as relaxing may
+		     move the value out of high mem and thus not fit
+		     in a signed 16bit value.  */
+		  if (((code & 0xfc) == 0x78
+		       || (code & 0xfc) == 0x60
+		       || (code & 0xfc) == 0x64
+		       || (code & 0xfc) == 0x68
+		       || (code & 0xfc) == 0x6c
+		       || (code & 0xfc) == 0x80
+		       || (code & 0xfc) == 0xf0
+		       || (code & 0xfc) == 0x00
+		       || (code & 0xfc) == 0x10
+		       || (code & 0xfc) == 0xb0
+		       || (code & 0xfc) == 0x30
+		       || (code & 0xfc) == 0xa0
+		       || (code & 0xfc) == 0x20
+		       || (code & 0xfc) == 0x90)
+		      && (value & 0x8000) != 0)
+		    continue;
+
+		  /* Note that we've changed the relocation contents, etc.  */
+		  elf_section_data (sec)->relocs = internal_relocs;
+		  elf_section_data (sec)->this_hdr.contents = contents;
+		  symtab_hdr->contents = (unsigned char *) isymbuf;
+
+		  /* Fix the opcode.  */
+		  bfd_put_8 (abfd, 0xf7, contents + irel->r_offset - 2);
+
+		  if ((code & 0xfc) == 0x78)
+		    code = 0x48 + (code & 0x03);
+		  else if ((code & 0xfc) == 0xd0)
+		    code = 0x30 + (code & 0x03);
+		  else if ((code & 0xfc) == 0x50)
+		    code = 0x20 + (code & 0x03);
+		  else if ((code & 0xfc) == 0x60)
+		    code = 0x18 + (code & 0x03);
+		  else if ((code & 0xfc) == 0x64)
+		    code = 0x08 + (code & 0x03);
+		  else if ((code & 0xfc) == 0x68)
+		    code = 0x1c + (code & 0x03);
+		  else if ((code & 0xfc) == 0x6c)
+		    code = 0x0c + (code & 0x03);
+		  else if ((code & 0xfc) == 0x80)
+		    code = 0xc0 + (code & 0x07);
+		  else if ((code & 0xfc) == 0xf0)
+		    code = 0xb0 + (code & 0x07);
+		  else if ((code & 0xfc) == 0x00)
+		    code = 0x80 + (code & 0x07);
+		  else if ((code & 0xfc) == 0x10)
+		    code = 0xa0 + (code & 0x07);
+		  else if ((code & 0xfc) == 0xb0)
+		    code = 0x70 + (code & 0x07);
+		  else if ((code & 0xfc) == 0x30)
+		    code = 0x60 + (code & 0x07);
+		  else if ((code & 0xfc) == 0xa0)
+		    code = 0xd0 + (code & 0x07);
+		  else if ((code & 0xfc) == 0x20)
+		    code = 0x90 + (code & 0x07);
+		  else if ((code & 0xfc) == 0x90)
+		    code = 0x50 + (code & 0x07);
+
+		  bfd_put_8 (abfd, code, contents + irel->r_offset - 1);
+
+		  /* Fix the relocation's type.  */
+		  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					       R_MN10200_16);
+
+		  /* Delete one bytes of data.  */
+		  if (!mn10200_elf_relax_delete_bytes (abfd, sec,
+						       irel->r_offset + 2, 1))
+		    goto error_return;
+
+		  /* That will change things, so, we should relax again.
+		     Note that this is not required, and it may be slow.  */
+		  *again = TRUE;
+		  break;
+
+		/* movb (abs24),dn ->movbu (abs16),dn extxb bn */
+		case 0xc4:
+		  /* Note that we've changed the reldection contents, etc.  */
+		  elf_section_data (sec)->relocs = internal_relocs;
+		  elf_section_data (sec)->this_hdr.contents = contents;
+		  symtab_hdr->contents = (unsigned char *) isymbuf;
+
+		  bfd_put_8 (abfd, 0xcc + (code & 0x03),
+			     contents + irel->r_offset - 2);
+
+		  bfd_put_8 (abfd, 0xb8 + (code & 0x03),
+			     contents + irel->r_offset - 1);
+
+		  /* Fix the relocation's type.  */
+		  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					       R_MN10200_16);
+
+		  /* The reloc will be applied one byte in front of its
+		     current location.  */
+		  irel->r_offset -= 1;
+
+		  /* Delete one bytes of data.  */
+		  if (!mn10200_elf_relax_delete_bytes (abfd, sec,
+						       irel->r_offset + 2, 1))
+		    goto error_return;
+
+		  /* That will change things, so, we should relax again.
+		     Note that this is not required, and it may be slow.  */
+		  *again = TRUE;
+		  break;
+		}
+	    }
+	}
+    }
+
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    {
+      if (! link_info->keep_memory)
+	free (isymbuf);
+      else
+	{
+	  /* Cache the symbols for elf_link_input_bfd.  */
+	  symtab_hdr->contents = (unsigned char *) isymbuf;
+	}
+    }
+
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    {
+      if (! link_info->keep_memory)
+	free (contents);
+      else
+	{
+	  /* Cache the section contents for elf_link_input_bfd.  */
+	  elf_section_data (sec)->this_hdr.contents = contents;
+	}
+    }
+
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return TRUE;
+
+ error_return:
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    free (contents);
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return FALSE;
+}
+
+/* Delete some bytes from a section while relaxing.  */
+
+static bfd_boolean
+mn10200_elf_relax_delete_bytes (abfd, sec, addr, count)
+     bfd *abfd;
+     asection *sec;
+     bfd_vma addr;
+     int count;
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  unsigned int sec_shndx;
+  bfd_byte *contents;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_vma toaddr;
+  Elf_Internal_Sym *isym;
+  Elf_Internal_Sym *isymend;
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_link_hash_entry **end_hashes;
+  unsigned int symcount;
+
+  sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+  contents = elf_section_data (sec)->this_hdr.contents;
+
+  toaddr = sec->size;
+
+  irel = elf_section_data (sec)->relocs;
+  irelend = irel + sec->reloc_count;
+
+  /* Actually delete the bytes.  */
+  memmove (contents + addr, contents + addr + count,
+	   (size_t) (toaddr - addr - count));
+  sec->size -= count;
+
+  /* Adjust all the relocs.  */
+  for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
+    {
+      /* Get the new reloc address.  */
+      if ((irel->r_offset > addr
+	   && irel->r_offset < toaddr))
+	irel->r_offset -= count;
+    }
+
+  /* Adjust the local symbols defined in this section.  */
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  isym = (Elf_Internal_Sym *) symtab_hdr->contents;
+  for (isymend = isym + symtab_hdr->sh_info; isym < isymend; isym++)
+    {
+      if (isym->st_shndx == sec_shndx
+	  && isym->st_value > addr
+	  && isym->st_value < toaddr)
+	isym->st_value -= count;
+    }
+
+  /* Now adjust the global symbols defined in this section.  */
+  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+	      - symtab_hdr->sh_info);
+  sym_hashes = elf_sym_hashes (abfd);
+  end_hashes = sym_hashes + symcount;
+  for (; sym_hashes < end_hashes; sym_hashes++)
+    {
+      struct elf_link_hash_entry *sym_hash = *sym_hashes;
+      if ((sym_hash->root.type == bfd_link_hash_defined
+	   || sym_hash->root.type == bfd_link_hash_defweak)
+	  && sym_hash->root.u.def.section == sec
+	  && sym_hash->root.u.def.value > addr
+	  && sym_hash->root.u.def.value < toaddr)
+	{
+	  sym_hash->root.u.def.value -= count;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return TRUE if a symbol exists at the given address, else return
+   FALSE.  */
+static bfd_boolean
+mn10200_elf_symbol_address_p (abfd, sec, isym, addr)
+     bfd *abfd;
+     asection *sec;
+     Elf_Internal_Sym *isym;
+     bfd_vma addr;
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  unsigned int sec_shndx;
+  Elf_Internal_Sym *isymend;
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_link_hash_entry **end_hashes;
+  unsigned int symcount;
+
+  sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+  /* Examine all the local symbols.  */
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  for (isymend = isym + symtab_hdr->sh_info; isym < isymend; isym++)
+    {
+      if (isym->st_shndx == sec_shndx
+	  && isym->st_value == addr)
+	return TRUE;
+    }
+
+  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+	      - symtab_hdr->sh_info);
+  sym_hashes = elf_sym_hashes (abfd);
+  end_hashes = sym_hashes + symcount;
+  for (; sym_hashes < end_hashes; sym_hashes++)
+    {
+      struct elf_link_hash_entry *sym_hash = *sym_hashes;
+      if ((sym_hash->root.type == bfd_link_hash_defined
+	   || sym_hash->root.type == bfd_link_hash_defweak)
+	  && sym_hash->root.u.def.section == sec
+	  && sym_hash->root.u.def.value == addr)
+	return TRUE;
+    }
+
+  return FALSE;
+}
+
+/* This is a version of bfd_generic_get_relocated_section_contents
+   which uses mn10200_elf_relocate_section.  */
+
+static bfd_byte *
+mn10200_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
+					    data, relocatable, symbols)
+     bfd *output_bfd;
+     struct bfd_link_info *link_info;
+     struct bfd_link_order *link_order;
+     bfd_byte *data;
+     bfd_boolean relocatable;
+     asymbol **symbols;
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  asection *input_section = link_order->u.indirect.section;
+  bfd *input_bfd = input_section->owner;
+  asection **sections = NULL;
+  Elf_Internal_Rela *internal_relocs = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+
+  /* We only need to handle the case of relaxing, or of having a
+     particular set of section contents, specially.  */
+  if (relocatable
+      || elf_section_data (input_section)->this_hdr.contents == NULL)
+    return bfd_generic_get_relocated_section_contents (output_bfd, link_info,
+						       link_order, data,
+						       relocatable,
+						       symbols);
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+
+  memcpy (data, elf_section_data (input_section)->this_hdr.contents,
+	  (size_t) input_section->size);
+
+  if ((input_section->flags & SEC_RELOC) != 0
+      && input_section->reloc_count > 0)
+    {
+      Elf_Internal_Sym *isym;
+      Elf_Internal_Sym *isymend;
+      asection **secpp;
+      bfd_size_type amt;
+
+      internal_relocs = (_bfd_elf_link_read_relocs
+			 (input_bfd, input_section, (PTR) NULL,
+			  (Elf_Internal_Rela *) NULL, FALSE));
+      if (internal_relocs == NULL)
+	goto error_return;
+
+      if (symtab_hdr->sh_info != 0)
+	{
+	  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	  if (isymbuf == NULL)
+	    isymbuf = bfd_elf_get_elf_syms (input_bfd, symtab_hdr,
+					    symtab_hdr->sh_info, 0,
+					    NULL, NULL, NULL);
+	  if (isymbuf == NULL)
+	    goto error_return;
+	}
+
+      amt = symtab_hdr->sh_info;
+      amt *= sizeof (asection *);
+      sections = (asection **) bfd_malloc (amt);
+      if (sections == NULL && amt != 0)
+	goto error_return;
+
+      isymend = isymbuf + symtab_hdr->sh_info;
+      for (isym = isymbuf, secpp = sections; isym < isymend; ++isym, ++secpp)
+	{
+	  asection *isec;
+
+	  if (isym->st_shndx == SHN_UNDEF)
+	    isec = bfd_und_section_ptr;
+	  else if (isym->st_shndx == SHN_ABS)
+	    isec = bfd_abs_section_ptr;
+	  else if (isym->st_shndx == SHN_COMMON)
+	    isec = bfd_com_section_ptr;
+	  else
+	    isec = bfd_section_from_elf_index (input_bfd, isym->st_shndx);
+
+	  *secpp = isec;
+	}
+
+      if (! mn10200_elf_relocate_section (output_bfd, link_info, input_bfd,
+				     input_section, data, internal_relocs,
+				     isymbuf, sections))
+	goto error_return;
+
+      if (sections != NULL)
+	free (sections);
+      if (isymbuf != NULL
+	  && symtab_hdr->contents != (unsigned char *) isymbuf)
+	free (isymbuf);
+      if (elf_section_data (input_section)->relocs != internal_relocs)
+	free (internal_relocs);
+    }
+
+  return data;
+
+ error_return:
+  if (sections != NULL)
+    free (sections);
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (internal_relocs != NULL
+      && elf_section_data (input_section)->relocs != internal_relocs)
+    free (internal_relocs);
+  return NULL;
+}
+
+#define TARGET_LITTLE_SYM	bfd_elf32_mn10200_vec
+#define TARGET_LITTLE_NAME	"elf32-mn10200"
+#define ELF_ARCH		bfd_arch_mn10200
+#define ELF_MACHINE_CODE	EM_MN10200
+#define ELF_MACHINE_ALT1	EM_CYGNUS_MN10200
+#define ELF_MAXPAGESIZE		0x1000
+
+#define elf_backend_rela_normal 1
+#define elf_info_to_howto	mn10200_info_to_howto
+#define elf_info_to_howto_rel	0
+#define elf_backend_relocate_section mn10200_elf_relocate_section
+#define bfd_elf32_bfd_relax_section	mn10200_elf_relax_section
+#define bfd_elf32_bfd_get_relocated_section_contents \
+				mn10200_elf_get_relocated_section_contents
+
+#define elf_symbol_leading_char '_'
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf-m10300.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf-m10300.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf-m10300.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf-m10300.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4957 @@
+/* Matsushita 10300 specific support for 32-bit ELF
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/mn10300.h"
+#include "libiberty.h"
+
+/* The mn10300 linker needs to keep track of the number of relocs that
+   it decides to copy in check_relocs for each symbol.  This is so
+   that it can discard PC relative relocs if it doesn't need them when
+   linking with -Bsymbolic.  We store the information in a field
+   extending the regular ELF linker hash table.  */
+
+struct elf32_mn10300_link_hash_entry
+{
+  /* The basic elf link hash table entry.  */
+  struct elf_link_hash_entry root;
+
+  /* For function symbols, the number of times this function is
+     called directly (ie by name).  */
+  unsigned int direct_calls;
+
+  /* For function symbols, the size of this function's stack
+     (if <= 255 bytes).  We stuff this into "call" instructions
+     to this target when it's valid and profitable to do so.
+
+     This does not include stack allocated by movm!  */
+  unsigned char stack_size;
+
+  /* For function symbols, arguments (if any) for movm instruction
+     in the prologue.  We stuff this value into "call" instructions
+     to the target when it's valid and profitable to do so.  */
+  unsigned char movm_args;
+
+  /* For function symbols, the amount of stack space that would be allocated
+     by the movm instruction.  This is redundant with movm_args, but we
+     add it to the hash table to avoid computing it over and over.  */
+  unsigned char movm_stack_size;
+
+/* When set, convert all "call" instructions to this target into "calls"
+   instructions.  */
+#define MN10300_CONVERT_CALL_TO_CALLS 0x1
+
+/* Used to mark functions which have had redundant parts of their
+   prologue deleted.  */
+#define MN10300_DELETED_PROLOGUE_BYTES 0x2
+  unsigned char flags;
+
+  /* Calculated value.  */
+  bfd_vma value;
+};
+
+/* We derive a hash table from the main elf linker hash table so
+   we can store state variables and a secondary hash table without
+   resorting to global variables.  */
+struct elf32_mn10300_link_hash_table
+{
+  /* The main hash table.  */
+  struct elf_link_hash_table root;
+
+  /* A hash table for static functions.  We could derive a new hash table
+     instead of using the full elf32_mn10300_link_hash_table if we wanted
+     to save some memory.  */
+  struct elf32_mn10300_link_hash_table *static_hash_table;
+
+  /* Random linker state flags.  */
+#define MN10300_HASH_ENTRIES_INITIALIZED 0x1
+  char flags;
+};
+
+#ifndef streq
+#define streq(a, b) (strcmp ((a),(b)) == 0)
+#endif
+
+/* For MN10300 linker hash table.  */
+
+/* Get the MN10300 ELF linker hash table from a link_info structure.  */
+
+#define elf32_mn10300_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == MN10300_ELF_DATA ? ((struct elf32_mn10300_link_hash_table *) ((p)->hash)) : NULL)
+
+#define elf32_mn10300_link_hash_traverse(table, func, info)		\
+  (elf_link_hash_traverse						\
+   (&(table)->root,							\
+    (bfd_boolean (*) (struct elf_link_hash_entry *, void *)) (func),	\
+    (info)))
+
+static reloc_howto_type elf_mn10300_howto_table[] =
+{
+  /* Dummy relocation.  Does nothing.  */
+  HOWTO (R_MN10300_NONE,
+	 0,
+	 2,
+	 16,
+	 FALSE,
+	 0,
+	 complain_overflow_bitfield,
+	 bfd_elf_generic_reloc,
+	 "R_MN10300_NONE",
+	 FALSE,
+	 0,
+	 0,
+	 FALSE),
+  /* Standard 32 bit reloc.  */
+  HOWTO (R_MN10300_32,
+	 0,
+	 2,
+	 32,
+	 FALSE,
+	 0,
+	 complain_overflow_bitfield,
+	 bfd_elf_generic_reloc,
+	 "R_MN10300_32",
+	 FALSE,
+	 0xffffffff,
+	 0xffffffff,
+	 FALSE),
+  /* Standard 16 bit reloc.  */
+  HOWTO (R_MN10300_16,
+	 0,
+	 1,
+	 16,
+	 FALSE,
+	 0,
+	 complain_overflow_bitfield,
+	 bfd_elf_generic_reloc,
+	 "R_MN10300_16",
+	 FALSE,
+	 0xffff,
+	 0xffff,
+	 FALSE),
+  /* Standard 8 bit reloc.  */
+  HOWTO (R_MN10300_8,
+	 0,
+	 0,
+	 8,
+	 FALSE,
+	 0,
+	 complain_overflow_bitfield,
+	 bfd_elf_generic_reloc,
+	 "R_MN10300_8",
+	 FALSE,
+	 0xff,
+	 0xff,
+	 FALSE),
+  /* Standard 32bit pc-relative reloc.  */
+  HOWTO (R_MN10300_PCREL32,
+	 0,
+	 2,
+	 32,
+	 TRUE,
+	 0,
+	 complain_overflow_bitfield,
+	 bfd_elf_generic_reloc,
+	 "R_MN10300_PCREL32",
+	 FALSE,
+	 0xffffffff,
+	 0xffffffff,
+	 TRUE),
+  /* Standard 16bit pc-relative reloc.  */
+  HOWTO (R_MN10300_PCREL16,
+	 0,
+	 1,
+	 16,
+	 TRUE,
+	 0,
+	 complain_overflow_bitfield,
+	 bfd_elf_generic_reloc,
+	 "R_MN10300_PCREL16",
+	 FALSE,
+	 0xffff,
+	 0xffff,
+	 TRUE),
+  /* Standard 8 pc-relative reloc.  */
+  HOWTO (R_MN10300_PCREL8,
+	 0,
+	 0,
+	 8,
+	 TRUE,
+	 0,
+	 complain_overflow_bitfield,
+	 bfd_elf_generic_reloc,
+	 "R_MN10300_PCREL8",
+	 FALSE,
+	 0xff,
+	 0xff,
+	 TRUE),
+
+  /* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_MN10300_GNU_VTINHERIT, /* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_MN10300_GNU_VTINHERIT", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage */
+  HOWTO (R_MN10300_GNU_VTENTRY,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_MN10300_GNU_VTENTRY", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Standard 24 bit reloc.  */
+  HOWTO (R_MN10300_24,
+	 0,
+	 2,
+	 24,
+	 FALSE,
+	 0,
+	 complain_overflow_bitfield,
+	 bfd_elf_generic_reloc,
+	 "R_MN10300_24",
+	 FALSE,
+	 0xffffff,
+	 0xffffff,
+	 FALSE),
+  HOWTO (R_MN10300_GOTPC32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_MN10300_GOTPC32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MN10300_GOTPC16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_MN10300_GOTPC16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MN10300_GOTOFF32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_MN10300_GOTOFF32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MN10300_GOTOFF24,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_MN10300_GOTOFF24",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffff,		/* src_mask */
+	 0xffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MN10300_GOTOFF16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_MN10300_GOTOFF16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MN10300_PLT32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_MN10300_PLT32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MN10300_PLT16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_MN10300_PLT16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MN10300_GOT32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_MN10300_GOT32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MN10300_GOT24,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_MN10300_GOT24",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MN10300_GOT16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_MN10300_GOT16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MN10300_COPY,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_MN10300_COPY",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MN10300_GLOB_DAT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_MN10300_GLOB_DAT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MN10300_JMP_SLOT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_MN10300_JMP_SLOT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MN10300_RELATIVE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_MN10300_RELATIVE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (24),
+  EMPTY_HOWTO (25),
+  EMPTY_HOWTO (26),
+  EMPTY_HOWTO (27),
+  EMPTY_HOWTO (28),
+  EMPTY_HOWTO (29),
+  EMPTY_HOWTO (30),
+  EMPTY_HOWTO (31),
+  EMPTY_HOWTO (32),
+  
+  HOWTO (R_MN10300_SYM_DIFF,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 NULL, 			/* special handler.  */
+	 "R_MN10300_SYM_DIFF",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MN10300_ALIGN,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 NULL, 			/* special handler.  */
+	 "R_MN10300_ALIGN",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE)			/* pcrel_offset */
+};
+
+struct mn10300_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned char elf_reloc_val;
+};
+
+static const struct mn10300_reloc_map mn10300_reloc_map[] =
+{
+  { BFD_RELOC_NONE, R_MN10300_NONE, },
+  { BFD_RELOC_32, R_MN10300_32, },
+  { BFD_RELOC_16, R_MN10300_16, },
+  { BFD_RELOC_8, R_MN10300_8, },
+  { BFD_RELOC_32_PCREL, R_MN10300_PCREL32, },
+  { BFD_RELOC_16_PCREL, R_MN10300_PCREL16, },
+  { BFD_RELOC_8_PCREL, R_MN10300_PCREL8, },
+  { BFD_RELOC_24, R_MN10300_24, },
+  { BFD_RELOC_VTABLE_INHERIT, R_MN10300_GNU_VTINHERIT },
+  { BFD_RELOC_VTABLE_ENTRY, R_MN10300_GNU_VTENTRY },
+  { BFD_RELOC_32_GOT_PCREL, R_MN10300_GOTPC32 },
+  { BFD_RELOC_16_GOT_PCREL, R_MN10300_GOTPC16 },
+  { BFD_RELOC_32_GOTOFF, R_MN10300_GOTOFF32 },
+  { BFD_RELOC_MN10300_GOTOFF24, R_MN10300_GOTOFF24 },
+  { BFD_RELOC_16_GOTOFF, R_MN10300_GOTOFF16 },
+  { BFD_RELOC_32_PLT_PCREL, R_MN10300_PLT32 },
+  { BFD_RELOC_16_PLT_PCREL, R_MN10300_PLT16 },
+  { BFD_RELOC_MN10300_GOT32, R_MN10300_GOT32 },
+  { BFD_RELOC_MN10300_GOT24, R_MN10300_GOT24 },
+  { BFD_RELOC_MN10300_GOT16, R_MN10300_GOT16 },
+  { BFD_RELOC_MN10300_COPY, R_MN10300_COPY },
+  { BFD_RELOC_MN10300_GLOB_DAT, R_MN10300_GLOB_DAT },
+  { BFD_RELOC_MN10300_JMP_SLOT, R_MN10300_JMP_SLOT },
+  { BFD_RELOC_MN10300_RELATIVE, R_MN10300_RELATIVE },
+  { BFD_RELOC_MN10300_SYM_DIFF, R_MN10300_SYM_DIFF },
+  { BFD_RELOC_MN10300_ALIGN, R_MN10300_ALIGN }
+};
+
+/* Create the GOT section.  */
+
+static bfd_boolean
+_bfd_mn10300_elf_create_got_section (bfd * abfd,
+				     struct bfd_link_info * info)
+{
+  flagword   flags;
+  flagword   pltflags;
+  asection * s;
+  struct elf_link_hash_entry * h;
+  const struct elf_backend_data * bed = get_elf_backend_data (abfd);
+  int ptralign;
+
+  /* This function may be called more than once.  */
+  if (bfd_get_section_by_name (abfd, ".got") != NULL)
+    return TRUE;
+
+  switch (bed->s->arch_size)
+    {
+    case 32:
+      ptralign = 2;
+      break;
+
+    case 64:
+      ptralign = 3;
+      break;
+
+    default:
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	   | SEC_LINKER_CREATED);
+
+  pltflags = flags;
+  pltflags |= SEC_CODE;
+  if (bed->plt_not_loaded)
+    pltflags &= ~ (SEC_LOAD | SEC_HAS_CONTENTS);
+  if (bed->plt_readonly)
+    pltflags |= SEC_READONLY;
+
+  s = bfd_make_section_with_flags (abfd, ".plt", pltflags);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, bed->plt_alignment))
+    return FALSE;
+
+  /* Define the symbol _PROCEDURE_LINKAGE_TABLE_ at the start of the
+     .plt section.  */
+  if (bed->want_plt_sym)
+    {
+      h = _bfd_elf_define_linkage_sym (abfd, info, s,
+				       "_PROCEDURE_LINKAGE_TABLE_");
+      elf_hash_table (info)->hplt = h;
+      if (h == NULL)
+	return FALSE;
+    }
+
+  s = bfd_make_section_with_flags (abfd, ".got", flags);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, ptralign))
+    return FALSE;
+
+  if (bed->want_got_plt)
+    {
+      s = bfd_make_section_with_flags (abfd, ".got.plt", flags);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, ptralign))
+	return FALSE;
+    }
+
+  /* Define the symbol _GLOBAL_OFFSET_TABLE_ at the start of the .got
+     (or .got.plt) section.  We don't do this in the linker script
+     because we don't want to define the symbol if we are not creating
+     a global offset table.  */
+  h = _bfd_elf_define_linkage_sym (abfd, info, s, "_GLOBAL_OFFSET_TABLE_");
+  elf_hash_table (info)->hgot = h;
+  if (h == NULL)
+    return FALSE;
+
+  /* The first bit of the global offset table is the header.  */
+  s->size += bed->got_header_size;
+
+  return TRUE;
+}
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = ARRAY_SIZE (mn10300_reloc_map); i--;)
+    if (mn10300_reloc_map[i].bfd_reloc_val == code)
+      return &elf_mn10300_howto_table[mn10300_reloc_map[i].elf_reloc_val];
+
+  return NULL;
+}
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 const char *r_name)
+{
+  unsigned int i;
+
+  for (i = ARRAY_SIZE (elf_mn10300_howto_table); i--;)
+    if (elf_mn10300_howto_table[i].name != NULL
+	&& strcasecmp (elf_mn10300_howto_table[i].name, r_name) == 0)
+      return elf_mn10300_howto_table + i;
+
+  return NULL;
+}
+
+/* Set the howto pointer for an MN10300 ELF reloc.  */
+
+static void
+mn10300_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+		       arelent *cache_ptr,
+		       Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_MN10300_MAX);
+  cache_ptr->howto = elf_mn10300_howto_table + r_type;
+}
+
+/* Look through the relocs for a section during the first phase.
+   Since we don't do .gots or .plts, we just need to consider the
+   virtual table relocs for gc.  */
+
+static bfd_boolean
+mn10300_elf_check_relocs (bfd *abfd,
+			  struct bfd_link_info *info,
+			  asection *sec,
+			  const Elf_Internal_Rela *relocs)
+{
+  bfd_boolean sym_diff_reloc_seen;
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Sym * isymbuf = NULL;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  bfd *      dynobj;
+  bfd_vma *  local_got_offsets;
+  asection * sgot;
+  asection * srelgot;
+  asection * sreloc;
+  bfd_boolean result = FALSE;
+
+  sgot    = NULL;
+  srelgot = NULL;
+  sreloc  = NULL;
+
+  if (info->relocatable)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  dynobj = elf_hash_table (info)->dynobj;
+  local_got_offsets = elf_local_got_offsets (abfd);
+  rel_end = relocs + sec->reloc_count;
+  sym_diff_reloc_seen = FALSE;
+
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+      unsigned int r_type;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+	h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      /* Some relocs require a global offset table.  */
+      if (dynobj == NULL)
+	{
+	  switch (r_type)
+	    {
+	    case R_MN10300_GOT32:
+	    case R_MN10300_GOT24:
+	    case R_MN10300_GOT16:
+	    case R_MN10300_GOTOFF32:
+	    case R_MN10300_GOTOFF24:
+	    case R_MN10300_GOTOFF16:
+	    case R_MN10300_GOTPC32:
+	    case R_MN10300_GOTPC16:
+	      elf_hash_table (info)->dynobj = dynobj = abfd;
+	      if (! _bfd_mn10300_elf_create_got_section (dynobj, info))
+		goto fail;
+	      break;
+
+	    default:
+	      break;
+	    }
+	}
+
+      switch (r_type)
+	{
+	/* This relocation describes the C++ object vtable hierarchy.
+	   Reconstruct it for later use during GC.  */
+	case R_MN10300_GNU_VTINHERIT:
+	  if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+	    goto fail;
+	  break;
+
+	/* This relocation describes which C++ vtable entries are actually
+	   used.  Record for later use during GC.  */
+	case R_MN10300_GNU_VTENTRY:
+	  BFD_ASSERT (h != NULL);
+	  if (h != NULL
+	      && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+	    goto fail;
+	  break;
+
+	case R_MN10300_GOT32:
+	case R_MN10300_GOT24:
+	case R_MN10300_GOT16:
+	  /* This symbol requires a global offset table entry.  */
+
+	  if (sgot == NULL)
+	    {
+	      sgot = bfd_get_section_by_name (dynobj, ".got");
+	      BFD_ASSERT (sgot != NULL);
+	    }
+
+	  if (srelgot == NULL
+	      && (h != NULL || info->shared))
+	    {
+	      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+	      if (srelgot == NULL)
+		{
+		  srelgot = bfd_make_section_with_flags (dynobj,
+							 ".rela.got",
+							 (SEC_ALLOC
+							  | SEC_LOAD
+							  | SEC_HAS_CONTENTS
+							  | SEC_IN_MEMORY
+							  | SEC_LINKER_CREATED
+							  | SEC_READONLY));
+		  if (srelgot == NULL
+		      || ! bfd_set_section_alignment (dynobj, srelgot, 2))
+		    goto fail;
+		}
+	    }
+
+	  if (h != NULL)
+	    {
+	      if (h->got.offset != (bfd_vma) -1)
+		/* We have already allocated space in the .got.  */
+		break;
+
+	      h->got.offset = sgot->size;
+
+	      /* Make sure this symbol is output as a dynamic symbol.  */
+	      if (h->dynindx == -1)
+		{
+		  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		    goto fail;
+		}
+
+	      srelgot->size += sizeof (Elf32_External_Rela);
+	    }
+	  else
+	    {
+	      /* This is a global offset table entry for a local
+		 symbol.  */
+	      if (local_got_offsets == NULL)
+		{
+		  size_t       size;
+		  unsigned int i;
+
+		  size = symtab_hdr->sh_info * sizeof (bfd_vma);
+		  local_got_offsets = bfd_alloc (abfd, size);
+
+		  if (local_got_offsets == NULL)
+		    goto fail;
+
+		  elf_local_got_offsets (abfd) = local_got_offsets;
+
+		  for (i = 0; i < symtab_hdr->sh_info; i++)
+		    local_got_offsets[i] = (bfd_vma) -1;
+		}
+
+	      if (local_got_offsets[r_symndx] != (bfd_vma) -1)
+		/* We have already allocated space in the .got.  */
+		break;
+
+	      local_got_offsets[r_symndx] = sgot->size;
+
+	      if (info->shared)
+		/* If we are generating a shared object, we need to
+		   output a R_MN10300_RELATIVE reloc so that the dynamic
+		   linker can adjust this GOT entry.  */
+		srelgot->size += sizeof (Elf32_External_Rela);
+	    }
+
+	  sgot->size += 4;
+	  break;
+
+	case R_MN10300_PLT32:
+	case R_MN10300_PLT16:
+	  /* This symbol requires a procedure linkage table entry.  We
+	     actually build the entry in adjust_dynamic_symbol,
+	     because this might be a case of linking PIC code which is
+	     never referenced by a dynamic object, in which case we
+	     don't need to generate a procedure linkage table entry
+	     after all.  */
+
+	  /* If this is a local symbol, we resolve it directly without
+	     creating a procedure linkage table entry.  */
+	  if (h == NULL)
+	    continue;
+
+	  if (ELF_ST_VISIBILITY (h->other) == STV_INTERNAL
+	      || ELF_ST_VISIBILITY (h->other) == STV_HIDDEN)
+	    break;
+
+	  h->needs_plt = 1;
+	  break;
+
+	case R_MN10300_24:
+	case R_MN10300_16:
+	case R_MN10300_8:
+	case R_MN10300_PCREL32:
+	case R_MN10300_PCREL16:
+	case R_MN10300_PCREL8:
+	  if (h != NULL)
+	    h->non_got_ref = 1;
+	  break;
+
+	case R_MN10300_SYM_DIFF:
+	  sym_diff_reloc_seen = TRUE;
+	  break;
+
+	case R_MN10300_32:
+	  if (h != NULL)
+	    h->non_got_ref = 1;
+
+	  /* If we are creating a shared library, then we
+	     need to copy the reloc into the shared library.  */
+	  if (info->shared
+	      && (sec->flags & SEC_ALLOC) != 0
+	      /* Do not generate a dynamic reloc for a
+		 reloc associated with a SYM_DIFF operation.  */
+	      && ! sym_diff_reloc_seen)
+	    {
+	      asection * sym_section = NULL;
+
+	      /* Find the section containing the
+		 symbol involved in the relocation.  */
+	      if (h == NULL)
+		{
+		  Elf_Internal_Sym * isym;
+
+		  if (isymbuf == NULL)
+		    isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+						    symtab_hdr->sh_info, 0,
+						    NULL, NULL, NULL);
+		  if (isymbuf)
+		    {
+		      isym = isymbuf + r_symndx;
+		      /* All we care about is whether this local symbol is absolute.  */
+		      if (isym->st_shndx == SHN_ABS)
+			sym_section = bfd_abs_section_ptr;
+		    }
+		}
+	      else
+		{
+		  if (h->root.type == bfd_link_hash_defined
+		      || h->root.type == bfd_link_hash_defweak)
+		    sym_section = h->root.u.def.section;
+		}
+
+	      /* If the symbol is absolute then the relocation can
+		 be resolved during linking and there is no need for
+		 a dynamic reloc.  */
+	      if (sym_section != bfd_abs_section_ptr)
+		{
+		  /* When creating a shared object, we must copy these
+		     reloc types into the output file.  We create a reloc
+		     section in dynobj and make room for this reloc.  */
+		  if (sreloc == NULL)
+		    {
+		      sreloc = _bfd_elf_make_dynamic_reloc_section
+			(sec, dynobj, 2, abfd, /*rela?*/ TRUE);
+		      if (sreloc == NULL)
+			goto fail;
+		    }
+
+		  sreloc->size += sizeof (Elf32_External_Rela);
+		}
+	    }
+
+	  break;
+	}
+
+      if (ELF32_R_TYPE (rel->r_info) != R_MN10300_SYM_DIFF)
+	sym_diff_reloc_seen = FALSE;
+    }
+
+  result = TRUE;
+ fail:
+  if (isymbuf != NULL)
+    free (isymbuf);
+
+  return result;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+static asection *
+mn10300_elf_gc_mark_hook (asection *sec,
+			  struct bfd_link_info *info,
+			  Elf_Internal_Rela *rel,
+			  struct elf_link_hash_entry *h,
+			  Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_MN10300_GNU_VTINHERIT:
+      case R_MN10300_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Perform a relocation as part of a final link.  */
+
+static bfd_reloc_status_type
+mn10300_elf_final_link_relocate (reloc_howto_type *howto,
+				 bfd *input_bfd,
+				 bfd *output_bfd ATTRIBUTE_UNUSED,
+				 asection *input_section,
+				 bfd_byte *contents,
+				 bfd_vma offset,
+				 bfd_vma value,
+				 bfd_vma addend,
+				 struct elf_link_hash_entry * h,
+				 unsigned long symndx,
+				 struct bfd_link_info *info,
+				 asection *sym_sec ATTRIBUTE_UNUSED,
+				 int is_local ATTRIBUTE_UNUSED)
+{
+  static asection *  sym_diff_section;
+  static bfd_vma     sym_diff_value;
+  bfd_boolean is_sym_diff_reloc;
+  unsigned long r_type = howto->type;
+  bfd_byte * hit_data = contents + offset;
+  bfd *      dynobj;
+  asection * sgot;
+  asection * splt;
+  asection * sreloc;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  sgot   = NULL;
+  splt   = NULL;
+  sreloc = NULL;
+
+  switch (r_type)
+    {
+    case R_MN10300_24:
+    case R_MN10300_16:
+    case R_MN10300_8:
+    case R_MN10300_PCREL8:
+    case R_MN10300_PCREL16:
+    case R_MN10300_PCREL32:
+    case R_MN10300_GOTOFF32:
+    case R_MN10300_GOTOFF24:
+    case R_MN10300_GOTOFF16:
+      if (info->shared
+	  && (input_section->flags & SEC_ALLOC) != 0
+	  && h != NULL
+	  && ! SYMBOL_REFERENCES_LOCAL (info, h))
+	return bfd_reloc_dangerous;
+    }
+
+  is_sym_diff_reloc = FALSE;
+  if (sym_diff_section != NULL)
+    {
+      BFD_ASSERT (sym_diff_section == input_section);
+
+      switch (r_type)
+	{
+	case R_MN10300_32:
+	case R_MN10300_24:
+	case R_MN10300_16:
+	case R_MN10300_8:
+	  value -= sym_diff_value;
+	  /* If we are computing a 32-bit value for the location lists
+	     and the result is 0 then we add one to the value.  A zero
+	     value can result because of linker relaxation deleteing
+	     prologue instructions and using a value of 1 (for the begin
+	     and end offsets in the location list entry) results in a
+	     nul entry which does not prevent the following entries from
+	     being parsed.  */
+	  if (r_type == R_MN10300_32
+	      && value == 0
+	      && strcmp (input_section->name, ".debug_loc") == 0)
+	    value = 1;
+	  sym_diff_section = NULL;
+	  is_sym_diff_reloc = TRUE;
+	  break;
+
+	default:
+	  sym_diff_section = NULL;
+	  break;
+	}
+    }
+
+  switch (r_type)
+    {
+    case R_MN10300_SYM_DIFF:
+      BFD_ASSERT (addend == 0);
+      /* Cache the input section and value.
+	 The offset is unreliable, since relaxation may
+	 have reduced the following reloc's offset.  */
+      sym_diff_section = input_section;
+      sym_diff_value = value;
+      return bfd_reloc_ok;
+
+    case R_MN10300_ALIGN:
+    case R_MN10300_NONE:
+      return bfd_reloc_ok;
+
+    case R_MN10300_32:
+      if (info->shared
+	  /* Do not generate relocs when an R_MN10300_32 has been used
+	     with an R_MN10300_SYM_DIFF to compute a difference of two
+	     symbols.  */
+	  && is_sym_diff_reloc == FALSE
+	  /* Also, do not generate a reloc when the symbol associated
+	     with the R_MN10300_32 reloc is absolute - there is no
+	     need for a run time computation in this case.  */
+	  && sym_sec != bfd_abs_section_ptr
+	  /* If the section is not going to be allocated at load time
+	     then there is no need to generate relocs for it.  */
+	  && (input_section->flags & SEC_ALLOC) != 0)
+	{
+	  Elf_Internal_Rela outrel;
+	  bfd_boolean skip, relocate;
+
+	  /* When generating a shared object, these relocations are
+	     copied into the output file to be resolved at run
+	     time.  */
+	  if (sreloc == NULL)
+	    {
+	      sreloc = _bfd_elf_get_dynamic_reloc_section
+		(input_bfd, input_section, /*rela?*/ TRUE);
+	      if (sreloc == NULL)
+		return FALSE;
+	    }
+
+	  skip = FALSE;
+
+	  outrel.r_offset = _bfd_elf_section_offset (input_bfd, info,
+						     input_section, offset);
+	  if (outrel.r_offset == (bfd_vma) -1)
+	    skip = TRUE;
+
+	  outrel.r_offset += (input_section->output_section->vma
+			      + input_section->output_offset);
+
+	  if (skip)
+	    {
+	      memset (&outrel, 0, sizeof outrel);
+	      relocate = FALSE;
+	    }
+	  else
+	    {
+	      /* h->dynindx may be -1 if this symbol was marked to
+		 become local.  */
+	      if (h == NULL
+		  || SYMBOL_REFERENCES_LOCAL (info, h))
+		{
+		  relocate = TRUE;
+		  outrel.r_info = ELF32_R_INFO (0, R_MN10300_RELATIVE);
+		  outrel.r_addend = value + addend;
+		}
+	      else
+		{
+		  BFD_ASSERT (h->dynindx != -1);
+		  relocate = FALSE;
+		  outrel.r_info = ELF32_R_INFO (h->dynindx, R_MN10300_32);
+		  outrel.r_addend = value + addend;
+		}
+	    }
+
+	  bfd_elf32_swap_reloca_out (output_bfd, &outrel,
+				     (bfd_byte *) (((Elf32_External_Rela *) sreloc->contents)
+						   + sreloc->reloc_count));
+	  ++sreloc->reloc_count;
+
+	  /* If this reloc is against an external symbol, we do
+	     not want to fiddle with the addend.  Otherwise, we
+	     need to include the symbol value so that it becomes
+	     an addend for the dynamic reloc.  */
+	  if (! relocate)
+	    return bfd_reloc_ok;
+	}
+      value += addend;
+      bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_MN10300_24:
+      value += addend;
+
+      if ((long) value > 0x7fffff || (long) value < -0x800000)
+	return bfd_reloc_overflow;
+
+      bfd_put_8 (input_bfd, value & 0xff, hit_data);
+      bfd_put_8 (input_bfd, (value >> 8) & 0xff, hit_data + 1);
+      bfd_put_8 (input_bfd, (value >> 16) & 0xff, hit_data + 2);
+      return bfd_reloc_ok;
+
+    case R_MN10300_16:
+      value += addend;
+
+      if ((long) value > 0x7fff || (long) value < -0x8000)
+	return bfd_reloc_overflow;
+
+      bfd_put_16 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_MN10300_8:
+      value += addend;
+
+      if ((long) value > 0x7f || (long) value < -0x80)
+	return bfd_reloc_overflow;
+
+      bfd_put_8 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_MN10300_PCREL8:
+      value -= (input_section->output_section->vma
+		+ input_section->output_offset);
+      value -= offset;
+      value += addend;
+
+      if ((long) value > 0x7f || (long) value < -0x80)
+	return bfd_reloc_overflow;
+
+      bfd_put_8 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_MN10300_PCREL16:
+      value -= (input_section->output_section->vma
+		+ input_section->output_offset);
+      value -= offset;
+      value += addend;
+
+      if ((long) value > 0x7fff || (long) value < -0x8000)
+	return bfd_reloc_overflow;
+
+      bfd_put_16 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_MN10300_PCREL32:
+      value -= (input_section->output_section->vma
+		+ input_section->output_offset);
+      value -= offset;
+      value += addend;
+
+      bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_MN10300_GNU_VTINHERIT:
+    case R_MN10300_GNU_VTENTRY:
+      return bfd_reloc_ok;
+
+    case R_MN10300_GOTPC32:
+      /* Use global offset table as symbol value.  */
+      value = bfd_get_section_by_name (dynobj,
+				       ".got")->output_section->vma;
+      value -= (input_section->output_section->vma
+		+ input_section->output_offset);
+      value -= offset;
+      value += addend;
+
+      bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_MN10300_GOTPC16:
+      /* Use global offset table as symbol value.  */
+      value = bfd_get_section_by_name (dynobj,
+				       ".got")->output_section->vma;
+      value -= (input_section->output_section->vma
+		+ input_section->output_offset);
+      value -= offset;
+      value += addend;
+
+      if ((long) value > 0x7fff || (long) value < -0x8000)
+	return bfd_reloc_overflow;
+
+      bfd_put_16 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_MN10300_GOTOFF32:
+      value -= bfd_get_section_by_name (dynobj,
+					".got")->output_section->vma;
+      value += addend;
+
+      bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_MN10300_GOTOFF24:
+      value -= bfd_get_section_by_name (dynobj,
+					".got")->output_section->vma;
+      value += addend;
+
+      if ((long) value > 0x7fffff || (long) value < -0x800000)
+	return bfd_reloc_overflow;
+
+      bfd_put_8 (input_bfd, value, hit_data);
+      bfd_put_8 (input_bfd, (value >> 8) & 0xff, hit_data + 1);
+      bfd_put_8 (input_bfd, (value >> 16) & 0xff, hit_data + 2);
+      return bfd_reloc_ok;
+
+    case R_MN10300_GOTOFF16:
+      value -= bfd_get_section_by_name (dynobj,
+					".got")->output_section->vma;
+      value += addend;
+
+      if ((long) value > 0x7fff || (long) value < -0x8000)
+	return bfd_reloc_overflow;
+
+      bfd_put_16 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_MN10300_PLT32:
+      if (h != NULL
+	  && ELF_ST_VISIBILITY (h->other) != STV_INTERNAL
+	  && ELF_ST_VISIBILITY (h->other) != STV_HIDDEN
+	  && h->plt.offset != (bfd_vma) -1)
+	{
+	  splt = bfd_get_section_by_name (dynobj, ".plt");
+
+	  value = (splt->output_section->vma
+		   + splt->output_offset
+		   + h->plt.offset) - value;
+	}
+
+      value -= (input_section->output_section->vma
+		+ input_section->output_offset);
+      value -= offset;
+      value += addend;
+
+      bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_MN10300_PLT16:
+      if (h != NULL
+	  && ELF_ST_VISIBILITY (h->other) != STV_INTERNAL
+	  && ELF_ST_VISIBILITY (h->other) != STV_HIDDEN
+	  && h->plt.offset != (bfd_vma) -1)
+	{
+	  splt = bfd_get_section_by_name (dynobj, ".plt");
+
+	  value = (splt->output_section->vma
+		   + splt->output_offset
+		   + h->plt.offset) - value;
+	}
+
+      value -= (input_section->output_section->vma
+		+ input_section->output_offset);
+      value -= offset;
+      value += addend;
+
+      if ((long) value > 0x7fff || (long) value < -0x8000)
+	return bfd_reloc_overflow;
+
+      bfd_put_16 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_MN10300_GOT32:
+    case R_MN10300_GOT24:
+    case R_MN10300_GOT16:
+      {
+	sgot = bfd_get_section_by_name (dynobj, ".got");
+
+	  if (h != NULL)
+	    {
+	      bfd_vma off;
+
+	      off = h->got.offset;
+	      BFD_ASSERT (off != (bfd_vma) -1);
+
+	      if (! elf_hash_table (info)->dynamic_sections_created
+		  || SYMBOL_REFERENCES_LOCAL (info, h))
+		/* This is actually a static link, or it is a
+		   -Bsymbolic link and the symbol is defined
+		   locally, or the symbol was forced to be local
+		   because of a version file.  We must initialize
+		   this entry in the global offset table.
+
+		   When doing a dynamic link, we create a .rela.got
+		   relocation entry to initialize the value.  This
+		   is done in the finish_dynamic_symbol routine.  */
+		bfd_put_32 (output_bfd, value,
+			    sgot->contents + off);
+
+	      value = sgot->output_offset + off;
+	    }
+	  else
+	    {
+	      bfd_vma off;
+
+	      off = elf_local_got_offsets (input_bfd)[symndx];
+
+	      bfd_put_32 (output_bfd, value, sgot->contents + off);
+
+	      if (info->shared)
+		{
+		  asection * srelgot;
+		  Elf_Internal_Rela outrel;
+
+		  srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+		  BFD_ASSERT (srelgot != NULL);
+
+		  outrel.r_offset = (sgot->output_section->vma
+				     + sgot->output_offset
+				     + off);
+		  outrel.r_info = ELF32_R_INFO (0, R_MN10300_RELATIVE);
+		  outrel.r_addend = value;
+		  bfd_elf32_swap_reloca_out (output_bfd, &outrel,
+					     (bfd_byte *) (((Elf32_External_Rela *)
+							    srelgot->contents)
+							   + srelgot->reloc_count));
+		  ++ srelgot->reloc_count;
+		}
+
+	      value = sgot->output_offset + off;
+	    }
+      }
+
+      value += addend;
+
+      if (r_type == R_MN10300_GOT32)
+	{
+	  bfd_put_32 (input_bfd, value, hit_data);
+	  return bfd_reloc_ok;
+	}
+      else if (r_type == R_MN10300_GOT24)
+	{
+	  if ((long) value > 0x7fffff || (long) value < -0x800000)
+	    return bfd_reloc_overflow;
+
+	  bfd_put_8 (input_bfd, value & 0xff, hit_data);
+	  bfd_put_8 (input_bfd, (value >> 8) & 0xff, hit_data + 1);
+	  bfd_put_8 (input_bfd, (value >> 16) & 0xff, hit_data + 2);
+	  return bfd_reloc_ok;
+	}
+      else if (r_type == R_MN10300_GOT16)
+	{
+	  if ((long) value > 0x7fff || (long) value < -0x8000)
+	    return bfd_reloc_overflow;
+
+	  bfd_put_16 (input_bfd, value, hit_data);
+	  return bfd_reloc_ok;
+	}
+      /* Fall through.  */
+
+    default:
+      return bfd_reloc_notsupported;
+    }
+}
+
+/* Relocate an MN10300 ELF section.  */
+
+static bfd_boolean
+mn10300_elf_relocate_section (bfd *output_bfd,
+			      struct bfd_link_info *info,
+			      bfd *input_bfd,
+			      asection *input_section,
+			      bfd_byte *contents,
+			      Elf_Internal_Rela *relocs,
+			      Elf_Internal_Sym *local_syms,
+			      asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel, *relend;
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf32_mn10300_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+      howto = elf_mn10300_howto_table + r_type;
+
+      /* Just skip the vtable gc relocs.  */
+      if (r_type == R_MN10300_GNU_VTINHERIT
+	  || r_type == R_MN10300_GNU_VTENTRY)
+	continue;
+
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc;
+	  bfd_boolean warned;
+	  struct elf_link_hash_entry *hh;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   hh, sec, relocation,
+				   unresolved_reloc, warned);
+
+	  h = (struct elf32_mn10300_link_hash_entry *) hh;
+
+	  if ((h->root.root.type == bfd_link_hash_defined
+	      || h->root.root.type == bfd_link_hash_defweak)
+	      && (   r_type == R_MN10300_GOTPC32
+		  || r_type == R_MN10300_GOTPC16
+		  || ((   r_type == R_MN10300_PLT32
+		       || r_type == R_MN10300_PLT16)
+		      && ELF_ST_VISIBILITY (h->root.other) != STV_INTERNAL
+		      && ELF_ST_VISIBILITY (h->root.other) != STV_HIDDEN
+		      && h->root.plt.offset != (bfd_vma) -1)
+		  || ((   r_type == R_MN10300_GOT32
+		       || r_type == R_MN10300_GOT24
+		       || r_type == R_MN10300_GOT16)
+		      && elf_hash_table (info)->dynamic_sections_created
+		      && !SYMBOL_REFERENCES_LOCAL (info, hh))
+		  || (r_type == R_MN10300_32
+		      /* _32 relocs in executables force _COPY relocs,
+			 such that the address of the symbol ends up
+			 being local.  */
+		      && !info->executable
+		      && !SYMBOL_REFERENCES_LOCAL (info, hh)
+		      && ((input_section->flags & SEC_ALLOC) != 0
+			  /* DWARF will emit R_MN10300_32 relocations
+			     in its sections against symbols defined
+			     externally in shared libraries.  We can't
+			     do anything with them here.  */
+			  || ((input_section->flags & SEC_DEBUGGING) != 0
+			      && h->root.def_dynamic)))))
+	    /* In these cases, we don't need the relocation
+	       value.  We check specially because in some
+	       obscure cases sec->output_section will be NULL.  */
+	    relocation = 0;
+
+	  else if (!info->relocatable && unresolved_reloc)
+	    (*_bfd_error_handler)
+	      (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+	       input_bfd,
+	       input_section,
+	       (long) rel->r_offset,
+	       howto->name,
+	       h->root.root.root.string);
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      r = mn10300_elf_final_link_relocate (howto, input_bfd, output_bfd,
+					   input_section,
+					   contents, rel->r_offset,
+					   relocation, rel->r_addend,
+					   (struct elf_link_hash_entry *) h,
+					   r_symndx,
+					   info, sec, h == NULL);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char *name;
+	  const char *msg = NULL;
+
+	  if (h != NULL)
+	    name = h->root.root.root.string;
+	  else
+	    {
+	      name = (bfd_elf_string_from_elf_section
+		      (input_bfd, symtab_hdr->sh_link, sym->st_name));
+	      if (name == NULL || *name == '\0')
+		name = bfd_section_name (input_bfd, sec);
+	    }
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      if (! ((*info->callbacks->reloc_overflow)
+		     (info, (h ? &h->root.root : NULL), name,
+		      howto->name, (bfd_vma) 0, input_bfd,
+		      input_section, rel->r_offset)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_undefined:
+	      if (! ((*info->callbacks->undefined_symbol)
+		     (info, name, input_bfd, input_section,
+		      rel->r_offset, TRUE)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      goto common_error;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      goto common_error;
+
+	    case bfd_reloc_dangerous:
+	      if (r_type == R_MN10300_PCREL32)
+		msg = _("error: inappropriate relocation type for shared"
+			" library (did you forget -fpic?)");
+	      else
+		msg = _("internal error: suspicious relocation type used"
+			" in shared library");
+	      goto common_error;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      /* Fall through.  */
+
+	    common_error:
+	      if (!((*info->callbacks->warning)
+		    (info, msg, name, input_bfd, input_section,
+		     rel->r_offset)))
+		return FALSE;
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Finish initializing one hash table entry.  */
+
+static bfd_boolean
+elf32_mn10300_finish_hash_table_entry (struct bfd_hash_entry *gen_entry,
+				       void * in_args)
+{
+  struct elf32_mn10300_link_hash_entry *entry;
+  struct bfd_link_info *link_info = (struct bfd_link_info *) in_args;
+  unsigned int byte_count = 0;
+
+  entry = (struct elf32_mn10300_link_hash_entry *) gen_entry;
+
+  /* If we already know we want to convert "call" to "calls" for calls
+     to this symbol, then return now.  */
+  if (entry->flags == MN10300_CONVERT_CALL_TO_CALLS)
+    return TRUE;
+
+  /* If there are no named calls to this symbol, or there's nothing we
+     can move from the function itself into the "call" instruction,
+     then note that all "call" instructions should be converted into
+     "calls" instructions and return.  If a symbol is available for
+     dynamic symbol resolution (overridable or overriding), avoid
+     custom calling conventions.  */
+  if (entry->direct_calls == 0
+      || (entry->stack_size == 0 && entry->movm_args == 0)
+      || (elf_hash_table (link_info)->dynamic_sections_created
+	  && ELF_ST_VISIBILITY (entry->root.other) != STV_INTERNAL
+	  && ELF_ST_VISIBILITY (entry->root.other) != STV_HIDDEN))
+    {
+      /* Make a note that we should convert "call" instructions to "calls"
+	 instructions for calls to this symbol.  */
+      entry->flags |= MN10300_CONVERT_CALL_TO_CALLS;
+      return TRUE;
+    }
+
+  /* We may be able to move some instructions from the function itself into
+     the "call" instruction.  Count how many bytes we might be able to
+     eliminate in the function itself.  */
+
+  /* A movm instruction is two bytes.  */
+  if (entry->movm_args)
+    byte_count += 2;
+
+  /* Count the insn to allocate stack space too.  */
+  if (entry->stack_size > 0)
+    {
+      if (entry->stack_size <= 128)
+	byte_count += 3;
+      else
+	byte_count += 4;
+    }
+
+  /* If using "call" will result in larger code, then turn all
+     the associated "call" instructions into "calls" instructions.  */
+  if (byte_count < entry->direct_calls)
+    entry->flags |= MN10300_CONVERT_CALL_TO_CALLS;
+
+  /* This routine never fails.  */
+  return TRUE;
+}
+
+/* Used to count hash table entries.  */
+
+static bfd_boolean
+elf32_mn10300_count_hash_table_entries (struct bfd_hash_entry *gen_entry ATTRIBUTE_UNUSED,
+					void * in_args)
+{
+  int *count = (int *) in_args;
+
+  (*count) ++;
+  return TRUE;
+}
+
+/* Used to enumerate hash table entries into a linear array.  */
+
+static bfd_boolean
+elf32_mn10300_list_hash_table_entries (struct bfd_hash_entry *gen_entry,
+				       void * in_args)
+{
+  struct bfd_hash_entry ***ptr = (struct bfd_hash_entry ***) in_args;
+
+  **ptr = gen_entry;
+  (*ptr) ++;
+  return TRUE;
+}
+
+/* Used to sort the array created by the above.  */
+
+static int
+sort_by_value (const void *va, const void *vb)
+{
+  struct elf32_mn10300_link_hash_entry *a
+    = *(struct elf32_mn10300_link_hash_entry **) va;
+  struct elf32_mn10300_link_hash_entry *b
+    = *(struct elf32_mn10300_link_hash_entry **) vb;
+
+  return a->value - b->value;
+}
+
+/* Compute the stack size and movm arguments for the function
+   referred to by HASH at address ADDR in section with
+   contents CONTENTS, store the information in the hash table.  */
+
+static void
+compute_function_info (bfd *abfd,
+		       struct elf32_mn10300_link_hash_entry *hash,
+		       bfd_vma addr,
+		       unsigned char *contents)
+{
+  unsigned char byte1, byte2;
+  /* We only care about a very small subset of the possible prologue
+     sequences here.  Basically we look for:
+
+     movm [d2,d3,a2,a3],sp (optional)
+     add <size>,sp (optional, and only for sizes which fit in an unsigned
+		    8 bit number)
+
+     If we find anything else, we quit.  */
+
+  /* Look for movm [regs],sp.  */
+  byte1 = bfd_get_8 (abfd, contents + addr);
+  byte2 = bfd_get_8 (abfd, contents + addr + 1);
+
+  if (byte1 == 0xcf)
+    {
+      hash->movm_args = byte2;
+      addr += 2;
+      byte1 = bfd_get_8 (abfd, contents + addr);
+      byte2 = bfd_get_8 (abfd, contents + addr + 1);
+    }
+
+  /* Now figure out how much stack space will be allocated by the movm
+     instruction.  We need this kept separate from the function's normal
+     stack space.  */
+  if (hash->movm_args)
+    {
+      /* Space for d2.  */
+      if (hash->movm_args & 0x80)
+	hash->movm_stack_size += 4;
+
+      /* Space for d3.  */
+      if (hash->movm_args & 0x40)
+	hash->movm_stack_size += 4;
+
+      /* Space for a2.  */
+      if (hash->movm_args & 0x20)
+	hash->movm_stack_size += 4;
+
+      /* Space for a3.  */
+      if (hash->movm_args & 0x10)
+	hash->movm_stack_size += 4;
+
+      /* "other" space.  d0, d1, a0, a1, mdr, lir, lar, 4 byte pad.  */
+      if (hash->movm_args & 0x08)
+	hash->movm_stack_size += 8 * 4;
+
+      if (bfd_get_mach (abfd) == bfd_mach_am33
+	  || bfd_get_mach (abfd) == bfd_mach_am33_2)
+	{
+	  /* "exother" space.  e0, e1, mdrq, mcrh, mcrl, mcvf */
+	  if (hash->movm_args & 0x1)
+	    hash->movm_stack_size += 6 * 4;
+
+	  /* exreg1 space.  e4, e5, e6, e7 */
+	  if (hash->movm_args & 0x2)
+	    hash->movm_stack_size += 4 * 4;
+
+	  /* exreg0 space.  e2, e3  */
+	  if (hash->movm_args & 0x4)
+	    hash->movm_stack_size += 2 * 4;
+	}
+    }
+
+  /* Now look for the two stack adjustment variants.  */
+  if (byte1 == 0xf8 && byte2 == 0xfe)
+    {
+      int temp = bfd_get_8 (abfd, contents + addr + 2);
+      temp = ((temp & 0xff) ^ (~0x7f)) + 0x80;
+
+      hash->stack_size = -temp;
+    }
+  else if (byte1 == 0xfa && byte2 == 0xfe)
+    {
+      int temp = bfd_get_16 (abfd, contents + addr + 2);
+      temp = ((temp & 0xffff) ^ (~0x7fff)) + 0x8000;
+      temp = -temp;
+
+      if (temp < 255)
+	hash->stack_size = temp;
+    }
+
+  /* If the total stack to be allocated by the call instruction is more
+     than 255 bytes, then we can't remove the stack adjustment by using
+     "call" (we might still be able to remove the "movm" instruction.  */
+  if (hash->stack_size + hash->movm_stack_size > 255)
+    hash->stack_size = 0;
+}
+
+/* Delete some bytes from a section while relaxing.  */
+
+static bfd_boolean
+mn10300_elf_relax_delete_bytes (bfd *abfd,
+				asection *sec,
+				bfd_vma addr,
+				int count)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  unsigned int sec_shndx;
+  bfd_byte *contents;
+  Elf_Internal_Rela *irel, *irelend;
+  Elf_Internal_Rela *irelalign;
+  bfd_vma toaddr;
+  Elf_Internal_Sym *isym, *isymend;
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_link_hash_entry **end_hashes;
+  unsigned int symcount;
+
+  sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+  contents = elf_section_data (sec)->this_hdr.contents;
+
+  irelalign = NULL;
+  toaddr = sec->size;
+
+  irel = elf_section_data (sec)->relocs;
+  irelend = irel + sec->reloc_count;
+
+  if (sec->reloc_count > 0)
+    {
+      /* If there is an align reloc at the end of the section ignore it.
+	 GAS creates these relocs for reasons of its own, and they just
+	 serve to keep the section artifically inflated.  */
+      if (ELF32_R_TYPE ((irelend - 1)->r_info) == (int) R_MN10300_ALIGN)
+	--irelend;
+      
+      /* The deletion must stop at the next ALIGN reloc for an aligment
+	 power larger than, or not a multiple of, the number of bytes we
+	 are deleting.  */
+      for (; irel < irelend; irel++)
+	{
+	  int alignment = 1 << irel->r_addend;
+
+	  if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_ALIGN
+	      && irel->r_offset > addr
+	      && irel->r_offset < toaddr
+	      && (count < alignment
+		  || alignment % count != 0))
+	    {
+	      irelalign = irel;
+	      toaddr = irel->r_offset;
+	      break;
+	    }
+	}
+    }
+
+  /* Actually delete the bytes.  */
+  memmove (contents + addr, contents + addr + count,
+	   (size_t) (toaddr - addr - count));
+
+  /* Adjust the section's size if we are shrinking it, or else
+     pad the bytes between the end of the shrunken region and
+     the start of the next region with NOP codes.  */
+  if (irelalign == NULL)
+    {
+      sec->size -= count;
+      /* Include symbols at the end of the section, but
+	 not at the end of a sub-region of the section.  */
+      toaddr ++;
+    }
+  else
+    {
+      int i;
+
+#define NOP_OPCODE 0xcb
+
+      for (i = 0; i < count; i ++)
+	bfd_put_8 (abfd, (bfd_vma) NOP_OPCODE, contents + toaddr - count + i);
+    }
+
+  /* Adjust all the relocs.  */
+  for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
+    {
+      /* Get the new reloc address.  */
+      if ((irel->r_offset > addr
+	   && irel->r_offset < toaddr)
+	  || (ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_ALIGN
+	      && irel->r_offset == toaddr))
+	irel->r_offset -= count;
+    }
+
+  /* Adjust the local symbols in the section, reducing their value
+     by the number of bytes deleted.  Note - symbols within the deleted
+     region are moved to the address of the start of the region, which
+     actually means that they will address the byte beyond the end of
+     the region once the deletion has been completed.  */
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  isym = (Elf_Internal_Sym *) symtab_hdr->contents;
+  for (isymend = isym + symtab_hdr->sh_info; isym < isymend; isym++)
+    {
+      if (isym->st_shndx == sec_shndx
+	  && isym->st_value > addr
+	  && isym->st_value < toaddr)
+	{
+	  if (isym->st_value < addr + count)
+	    isym->st_value = addr;
+	  else
+	    isym->st_value -= count;
+	}
+      /* Adjust the function symbol's size as well.  */
+      else if (isym->st_shndx == sec_shndx
+	       && ELF_ST_TYPE (isym->st_info) == STT_FUNC
+	       && isym->st_value + isym->st_size > addr
+	       && isym->st_value + isym->st_size < toaddr)
+	isym->st_size -= count;
+    }
+
+  /* Now adjust the global symbols defined in this section.  */
+  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+	      - symtab_hdr->sh_info);
+  sym_hashes = elf_sym_hashes (abfd);
+  end_hashes = sym_hashes + symcount;
+  for (; sym_hashes < end_hashes; sym_hashes++)
+    {
+      struct elf_link_hash_entry *sym_hash = *sym_hashes;
+
+      if ((sym_hash->root.type == bfd_link_hash_defined
+	   || sym_hash->root.type == bfd_link_hash_defweak)
+	  && sym_hash->root.u.def.section == sec
+	  && sym_hash->root.u.def.value > addr
+	  && sym_hash->root.u.def.value < toaddr)
+	{
+	  if (sym_hash->root.u.def.value < addr + count)
+	    sym_hash->root.u.def.value = addr;
+	  else
+	    sym_hash->root.u.def.value -= count;
+	}
+      /* Adjust the function symbol's size as well.  */
+      else if (sym_hash->root.type == bfd_link_hash_defined
+	       && sym_hash->root.u.def.section == sec
+	       && sym_hash->type == STT_FUNC
+	       && sym_hash->root.u.def.value + sym_hash->size > addr
+	       && sym_hash->root.u.def.value + sym_hash->size < toaddr)
+	sym_hash->size -= count;
+    }
+
+  /* See if we can move the ALIGN reloc forward.
+     We have adjusted r_offset for it already.  */
+  if (irelalign != NULL)
+    {
+      bfd_vma alignto, alignaddr;
+
+      if ((int) irelalign->r_addend > 0)
+	{
+	  /* This is the old address.  */
+	  alignto = BFD_ALIGN (toaddr, 1 << irelalign->r_addend);
+	  /* This is where the align points to now.  */
+	  alignaddr = BFD_ALIGN (irelalign->r_offset,
+				 1 << irelalign->r_addend);
+	  if (alignaddr < alignto)
+	    /* Tail recursion.  */
+	    return mn10300_elf_relax_delete_bytes (abfd, sec, alignaddr,
+						   (int) (alignto - alignaddr));
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return TRUE if a symbol exists at the given address, else return
+   FALSE.  */
+
+static bfd_boolean
+mn10300_elf_symbol_address_p (bfd *abfd,
+			      asection *sec,
+			      Elf_Internal_Sym *isym,
+			      bfd_vma addr)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  unsigned int sec_shndx;
+  Elf_Internal_Sym *isymend;
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_link_hash_entry **end_hashes;
+  unsigned int symcount;
+
+  sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+  /* Examine all the symbols.  */
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  for (isymend = isym + symtab_hdr->sh_info; isym < isymend; isym++)
+    if (isym->st_shndx == sec_shndx
+	&& isym->st_value == addr)
+      return TRUE;
+
+  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+	      - symtab_hdr->sh_info);
+  sym_hashes = elf_sym_hashes (abfd);
+  end_hashes = sym_hashes + symcount;
+  for (; sym_hashes < end_hashes; sym_hashes++)
+    {
+      struct elf_link_hash_entry *sym_hash = *sym_hashes;
+
+      if ((sym_hash->root.type == bfd_link_hash_defined
+	   || sym_hash->root.type == bfd_link_hash_defweak)
+	  && sym_hash->root.u.def.section == sec
+	  && sym_hash->root.u.def.value == addr)
+	return TRUE;
+    }
+
+  return FALSE;
+}
+
+/* This function handles relaxing for the mn10300.
+
+   There are quite a few relaxing opportunities available on the mn10300:
+
+	* calls:32 -> calls:16 					   2 bytes
+	* call:32  -> call:16					   2 bytes
+
+	* call:32 -> calls:32					   1 byte
+	* call:16 -> calls:16					   1 byte
+		* These are done anytime using "calls" would result
+		in smaller code, or when necessary to preserve the
+		meaning of the program.
+
+	* call:32						   varies
+	* call:16
+		* In some circumstances we can move instructions
+		from a function prologue into a "call" instruction.
+		This is only done if the resulting code is no larger
+		than the original code.
+
+	* jmp:32 -> jmp:16					   2 bytes
+	* jmp:16 -> bra:8					   1 byte
+
+		* If the previous instruction is a conditional branch
+		around the jump/bra, we may be able to reverse its condition
+		and change its target to the jump's target.  The jump/bra
+		can then be deleted.				   2 bytes
+
+	* mov abs32 -> mov abs16				   1 or 2 bytes
+
+	* Most instructions which accept imm32 can relax to imm16  1 or 2 bytes
+	- Most instructions which accept imm16 can relax to imm8   1 or 2 bytes
+
+	* Most instructions which accept d32 can relax to d16	   1 or 2 bytes
+	- Most instructions which accept d16 can relax to d8	   1 or 2 bytes
+
+	We don't handle imm16->imm8 or d16->d8 as they're very rare
+	and somewhat more difficult to support.  */
+
+static bfd_boolean
+mn10300_elf_relax_section (bfd *abfd,
+			   asection *sec,
+			   struct bfd_link_info *link_info,
+			   bfd_boolean *again)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *internal_relocs = NULL;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_byte *contents = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+  struct elf32_mn10300_link_hash_table *hash_table;
+  asection *section = sec;
+  bfd_vma align_gap_adjustment;
+
+  if (link_info->relocatable)
+    (*link_info->callbacks->einfo)
+      (_("%P%F: --relax and -r may not be used together\n"));
+
+  /* Assume nothing changes.  */
+  *again = FALSE;
+
+  /* We need a pointer to the mn10300 specific hash table.  */
+  hash_table = elf32_mn10300_hash_table (link_info);
+  if (hash_table == NULL)
+    return FALSE;
+
+  /* Initialize fields in each hash table entry the first time through.  */
+  if ((hash_table->flags & MN10300_HASH_ENTRIES_INITIALIZED) == 0)
+    {
+      bfd *input_bfd;
+
+      /* Iterate over all the input bfds.  */
+      for (input_bfd = link_info->input_bfds;
+	   input_bfd != NULL;
+	   input_bfd = input_bfd->link_next)
+	{
+	  /* We're going to need all the symbols for each bfd.  */
+	  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+	  if (symtab_hdr->sh_info != 0)
+	    {
+	      isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	      if (isymbuf == NULL)
+		isymbuf = bfd_elf_get_elf_syms (input_bfd, symtab_hdr,
+						symtab_hdr->sh_info, 0,
+						NULL, NULL, NULL);
+	      if (isymbuf == NULL)
+		goto error_return;
+	    }
+
+	  /* Iterate over each section in this bfd.  */
+	  for (section = input_bfd->sections;
+	       section != NULL;
+	       section = section->next)
+	    {
+	      struct elf32_mn10300_link_hash_entry *hash;
+	      asection *sym_sec = NULL;
+	      const char *sym_name;
+	      char *new_name;
+
+	      /* If there's nothing to do in this section, skip it.  */
+	      if (! ((section->flags & SEC_RELOC) != 0
+		     && section->reloc_count != 0))
+		continue;
+	      if ((section->flags & SEC_ALLOC) == 0)
+		continue;
+
+	      /* Get cached copy of section contents if it exists.  */
+	      if (elf_section_data (section)->this_hdr.contents != NULL)
+		contents = elf_section_data (section)->this_hdr.contents;
+	      else if (section->size != 0)
+		{
+		  /* Go get them off disk.  */
+		  if (!bfd_malloc_and_get_section (input_bfd, section,
+						   &contents))
+		    goto error_return;
+		}
+	      else
+		contents = NULL;
+
+	      /* If there aren't any relocs, then there's nothing to do.  */
+	      if ((section->flags & SEC_RELOC) != 0
+		  && section->reloc_count != 0)
+		{
+		  /* Get a copy of the native relocations.  */
+		  internal_relocs = _bfd_elf_link_read_relocs (input_bfd, section,
+							       NULL, NULL,
+							       link_info->keep_memory);
+		  if (internal_relocs == NULL)
+		    goto error_return;
+
+		  /* Now examine each relocation.  */
+		  irel = internal_relocs;
+		  irelend = irel + section->reloc_count;
+		  for (; irel < irelend; irel++)
+		    {
+		      long r_type;
+		      unsigned long r_index;
+		      unsigned char code;
+
+		      r_type = ELF32_R_TYPE (irel->r_info);
+		      r_index = ELF32_R_SYM (irel->r_info);
+
+		      if (r_type < 0 || r_type >= (int) R_MN10300_MAX)
+			goto error_return;
+
+		      /* We need the name and hash table entry of the target
+			 symbol!  */
+		      hash = NULL;
+		      sym_sec = NULL;
+
+		      if (r_index < symtab_hdr->sh_info)
+			{
+			  /* A local symbol.  */
+			  Elf_Internal_Sym *isym;
+			  struct elf_link_hash_table *elftab;
+			  bfd_size_type amt;
+
+			  isym = isymbuf + r_index;
+			  if (isym->st_shndx == SHN_UNDEF)
+			    sym_sec = bfd_und_section_ptr;
+			  else if (isym->st_shndx == SHN_ABS)
+			    sym_sec = bfd_abs_section_ptr;
+			  else if (isym->st_shndx == SHN_COMMON)
+			    sym_sec = bfd_com_section_ptr;
+			  else
+			    sym_sec
+			      = bfd_section_from_elf_index (input_bfd,
+							    isym->st_shndx);
+
+			  sym_name
+			    = bfd_elf_string_from_elf_section (input_bfd,
+							       (symtab_hdr
+								->sh_link),
+							       isym->st_name);
+
+			  /* If it isn't a function, then we don't care
+			     about it.  */
+			  if (ELF_ST_TYPE (isym->st_info) != STT_FUNC)
+			    continue;
+
+			  /* Tack on an ID so we can uniquely identify this
+			     local symbol in the global hash table.  */
+			  amt = strlen (sym_name) + 10;
+			  new_name = bfd_malloc (amt);
+			  if (new_name == NULL)
+			    goto error_return;
+
+			  sprintf (new_name, "%s_%08x", sym_name, sym_sec->id);
+			  sym_name = new_name;
+
+			  elftab = &hash_table->static_hash_table->root;
+			  hash = ((struct elf32_mn10300_link_hash_entry *)
+				  elf_link_hash_lookup (elftab, sym_name,
+							TRUE, TRUE, FALSE));
+			  free (new_name);
+			}
+		      else
+			{
+			  r_index -= symtab_hdr->sh_info;
+			  hash = (struct elf32_mn10300_link_hash_entry *)
+				   elf_sym_hashes (input_bfd)[r_index];
+			}
+
+		      sym_name = hash->root.root.root.string;
+		      if ((section->flags & SEC_CODE) != 0)
+			{
+			  /* If this is not a "call" instruction, then we
+			     should convert "call" instructions to "calls"
+			     instructions.  */
+			  code = bfd_get_8 (input_bfd,
+					    contents + irel->r_offset - 1);
+			  if (code != 0xdd && code != 0xcd)
+			    hash->flags |= MN10300_CONVERT_CALL_TO_CALLS;
+			}
+
+		      /* If this is a jump/call, then bump the
+			 direct_calls counter.  Else force "call" to
+			 "calls" conversions.  */
+		      if (r_type == R_MN10300_PCREL32
+			  || r_type == R_MN10300_PLT32
+			  || r_type == R_MN10300_PLT16
+			  || r_type == R_MN10300_PCREL16)
+			hash->direct_calls++;
+		      else
+			hash->flags |= MN10300_CONVERT_CALL_TO_CALLS;
+		    }
+		}
+
+	      /* Now look at the actual contents to get the stack size,
+		 and a list of what registers were saved in the prologue
+		 (ie movm_args).  */
+	      if ((section->flags & SEC_CODE) != 0)
+		{
+		  Elf_Internal_Sym *isym, *isymend;
+		  unsigned int sec_shndx;
+		  struct elf_link_hash_entry **hashes;
+		  struct elf_link_hash_entry **end_hashes;
+		  unsigned int symcount;
+
+		  sec_shndx = _bfd_elf_section_from_bfd_section (input_bfd,
+								 section);
+
+		  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+			      - symtab_hdr->sh_info);
+		  hashes = elf_sym_hashes (input_bfd);
+		  end_hashes = hashes + symcount;
+
+		  /* Look at each function defined in this section and
+		     update info for that function.  */
+		  isymend = isymbuf + symtab_hdr->sh_info;
+		  for (isym = isymbuf; isym < isymend; isym++)
+		    {
+		      if (isym->st_shndx == sec_shndx
+			  && ELF_ST_TYPE (isym->st_info) == STT_FUNC)
+			{
+			  struct elf_link_hash_table *elftab;
+			  bfd_size_type amt;
+			  struct elf_link_hash_entry **lhashes = hashes;
+
+			  /* Skip a local symbol if it aliases a
+			     global one.  */
+			  for (; lhashes < end_hashes; lhashes++)
+			    {
+			      hash = (struct elf32_mn10300_link_hash_entry *) *lhashes;
+			      if ((hash->root.root.type == bfd_link_hash_defined
+				   || hash->root.root.type == bfd_link_hash_defweak)
+				  && hash->root.root.u.def.section == section
+				  && hash->root.type == STT_FUNC
+				  && hash->root.root.u.def.value == isym->st_value)
+				break;
+			    }
+			  if (lhashes != end_hashes)
+			    continue;
+
+			  if (isym->st_shndx == SHN_UNDEF)
+			    sym_sec = bfd_und_section_ptr;
+			  else if (isym->st_shndx == SHN_ABS)
+			    sym_sec = bfd_abs_section_ptr;
+			  else if (isym->st_shndx == SHN_COMMON)
+			    sym_sec = bfd_com_section_ptr;
+			  else
+			    sym_sec
+			      = bfd_section_from_elf_index (input_bfd,
+							    isym->st_shndx);
+
+			  sym_name = (bfd_elf_string_from_elf_section
+				      (input_bfd, symtab_hdr->sh_link,
+				       isym->st_name));
+
+			  /* Tack on an ID so we can uniquely identify this
+			     local symbol in the global hash table.  */
+			  amt = strlen (sym_name) + 10;
+			  new_name = bfd_malloc (amt);
+			  if (new_name == NULL)
+			    goto error_return;
+
+			  sprintf (new_name, "%s_%08x", sym_name, sym_sec->id);
+			  sym_name = new_name;
+
+			  elftab = &hash_table->static_hash_table->root;
+			  hash = ((struct elf32_mn10300_link_hash_entry *)
+				  elf_link_hash_lookup (elftab, sym_name,
+							TRUE, TRUE, FALSE));
+			  free (new_name);
+			  compute_function_info (input_bfd, hash,
+						 isym->st_value, contents);
+			  hash->value = isym->st_value;
+			}
+		    }
+
+		  for (; hashes < end_hashes; hashes++)
+		    {
+		      hash = (struct elf32_mn10300_link_hash_entry *) *hashes;
+		      if ((hash->root.root.type == bfd_link_hash_defined
+			   || hash->root.root.type == bfd_link_hash_defweak)
+			  && hash->root.root.u.def.section == section
+			  && hash->root.type == STT_FUNC)
+			compute_function_info (input_bfd, hash,
+					       (hash)->root.root.u.def.value,
+					       contents);
+		    }
+		}
+
+	      /* Cache or free any memory we allocated for the relocs.  */
+	      if (internal_relocs != NULL
+		  && elf_section_data (section)->relocs != internal_relocs)
+		free (internal_relocs);
+	      internal_relocs = NULL;
+
+	      /* Cache or free any memory we allocated for the contents.  */
+	      if (contents != NULL
+		  && elf_section_data (section)->this_hdr.contents != contents)
+		{
+		  if (! link_info->keep_memory)
+		    free (contents);
+		  else
+		    {
+		      /* Cache the section contents for elf_link_input_bfd.  */
+		      elf_section_data (section)->this_hdr.contents = contents;
+		    }
+		}
+	      contents = NULL;
+	    }
+
+	  /* Cache or free any memory we allocated for the symbols.  */
+	  if (isymbuf != NULL
+	      && symtab_hdr->contents != (unsigned char *) isymbuf)
+	    {
+	      if (! link_info->keep_memory)
+		free (isymbuf);
+	      else
+		{
+		  /* Cache the symbols for elf_link_input_bfd.  */
+		  symtab_hdr->contents = (unsigned char *) isymbuf;
+		}
+	    }
+	  isymbuf = NULL;
+	}
+
+      /* Now iterate on each symbol in the hash table and perform
+	 the final initialization steps on each.  */
+      elf32_mn10300_link_hash_traverse (hash_table,
+					elf32_mn10300_finish_hash_table_entry,
+					link_info);
+      elf32_mn10300_link_hash_traverse (hash_table->static_hash_table,
+					elf32_mn10300_finish_hash_table_entry,
+					link_info);
+
+      {
+	/* This section of code collects all our local symbols, sorts
+	   them by value, and looks for multiple symbols referring to
+	   the same address.  For those symbols, the flags are merged.
+	   At this point, the only flag that can be set is
+	   MN10300_CONVERT_CALL_TO_CALLS, so we simply OR the flags
+	   together.  */
+	int static_count = 0, i;
+	struct elf32_mn10300_link_hash_entry **entries;
+	struct elf32_mn10300_link_hash_entry **ptr;
+
+	elf32_mn10300_link_hash_traverse (hash_table->static_hash_table,
+					  elf32_mn10300_count_hash_table_entries,
+					  &static_count);
+
+	entries = bfd_malloc (static_count * sizeof (* ptr));
+
+	ptr = entries;
+	elf32_mn10300_link_hash_traverse (hash_table->static_hash_table,
+					  elf32_mn10300_list_hash_table_entries,
+					  & ptr);
+
+	qsort (entries, static_count, sizeof (entries[0]), sort_by_value);
+
+	for (i = 0; i < static_count - 1; i++)
+	  if (entries[i]->value && entries[i]->value == entries[i+1]->value)
+	    {
+	      int v = entries[i]->flags;
+	      int j;
+
+	      for (j = i + 1; j < static_count && entries[j]->value == entries[i]->value; j++)
+		v |= entries[j]->flags;
+
+	      for (j = i; j < static_count && entries[j]->value == entries[i]->value; j++)
+		entries[j]->flags = v;
+
+	      i = j - 1;
+	    }
+      }
+
+      /* All entries in the hash table are fully initialized.  */
+      hash_table->flags |= MN10300_HASH_ENTRIES_INITIALIZED;
+
+      /* Now that everything has been initialized, go through each
+	 code section and delete any prologue insns which will be
+	 redundant because their operations will be performed by
+	 a "call" instruction.  */
+      for (input_bfd = link_info->input_bfds;
+	   input_bfd != NULL;
+	   input_bfd = input_bfd->link_next)
+	{
+	  /* We're going to need all the local symbols for each bfd.  */
+	  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+	  if (symtab_hdr->sh_info != 0)
+	    {
+	      isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	      if (isymbuf == NULL)
+		isymbuf = bfd_elf_get_elf_syms (input_bfd, symtab_hdr,
+						symtab_hdr->sh_info, 0,
+						NULL, NULL, NULL);
+	      if (isymbuf == NULL)
+		goto error_return;
+	    }
+
+	  /* Walk over each section in this bfd.  */
+	  for (section = input_bfd->sections;
+	       section != NULL;
+	       section = section->next)
+	    {
+	      unsigned int sec_shndx;
+	      Elf_Internal_Sym *isym, *isymend;
+	      struct elf_link_hash_entry **hashes;
+	      struct elf_link_hash_entry **end_hashes;
+	      unsigned int symcount;
+
+	      /* Skip non-code sections and empty sections.  */
+	      if ((section->flags & SEC_CODE) == 0 || section->size == 0)
+		continue;
+
+	      if (section->reloc_count != 0)
+		{
+		  /* Get a copy of the native relocations.  */
+		  internal_relocs = _bfd_elf_link_read_relocs (input_bfd, section,
+							       NULL, NULL,
+							       link_info->keep_memory);
+		  if (internal_relocs == NULL)
+		    goto error_return;
+		}
+
+	      /* Get cached copy of section contents if it exists.  */
+	      if (elf_section_data (section)->this_hdr.contents != NULL)
+		contents = elf_section_data (section)->this_hdr.contents;
+	      else
+		{
+		  /* Go get them off disk.  */
+		  if (!bfd_malloc_and_get_section (input_bfd, section,
+						   &contents))
+		    goto error_return;
+		}
+
+	      sec_shndx = _bfd_elf_section_from_bfd_section (input_bfd,
+							     section);
+
+	      /* Now look for any function in this section which needs
+		 insns deleted from its prologue.  */
+	      isymend = isymbuf + symtab_hdr->sh_info;
+	      for (isym = isymbuf; isym < isymend; isym++)
+		{
+		  struct elf32_mn10300_link_hash_entry *sym_hash;
+		  asection *sym_sec = NULL;
+		  const char *sym_name;
+		  char *new_name;
+		  struct elf_link_hash_table *elftab;
+		  bfd_size_type amt;
+
+		  if (isym->st_shndx != sec_shndx)
+		    continue;
+
+		  if (isym->st_shndx == SHN_UNDEF)
+		    sym_sec = bfd_und_section_ptr;
+		  else if (isym->st_shndx == SHN_ABS)
+		    sym_sec = bfd_abs_section_ptr;
+		  else if (isym->st_shndx == SHN_COMMON)
+		    sym_sec = bfd_com_section_ptr;
+		  else
+		    sym_sec
+		      = bfd_section_from_elf_index (input_bfd, isym->st_shndx);
+
+		  sym_name
+		    = bfd_elf_string_from_elf_section (input_bfd,
+						       symtab_hdr->sh_link,
+						       isym->st_name);
+
+		  /* Tack on an ID so we can uniquely identify this
+		     local symbol in the global hash table.  */
+		  amt = strlen (sym_name) + 10;
+		  new_name = bfd_malloc (amt);
+		  if (new_name == NULL)
+		    goto error_return;
+		  sprintf (new_name, "%s_%08x", sym_name, sym_sec->id);
+		  sym_name = new_name;
+
+		  elftab = & hash_table->static_hash_table->root;
+		  sym_hash = (struct elf32_mn10300_link_hash_entry *)
+		    elf_link_hash_lookup (elftab, sym_name,
+					  FALSE, FALSE, FALSE);
+
+		  free (new_name);
+		  if (sym_hash == NULL)
+		    continue;
+
+		  if (! (sym_hash->flags & MN10300_CONVERT_CALL_TO_CALLS)
+		      && ! (sym_hash->flags & MN10300_DELETED_PROLOGUE_BYTES))
+		    {
+		      int bytes = 0;
+
+		      /* Note that we've changed things.  */
+		      elf_section_data (section)->relocs = internal_relocs;
+		      elf_section_data (section)->this_hdr.contents = contents;
+		      symtab_hdr->contents = (unsigned char *) isymbuf;
+
+		      /* Count how many bytes we're going to delete.  */
+		      if (sym_hash->movm_args)
+			bytes += 2;
+
+		      if (sym_hash->stack_size > 0)
+			{
+			  if (sym_hash->stack_size <= 128)
+			    bytes += 3;
+			  else
+			    bytes += 4;
+			}
+
+		      /* Note that we've deleted prologue bytes for this
+			 function.  */
+		      sym_hash->flags |= MN10300_DELETED_PROLOGUE_BYTES;
+
+		      /* Actually delete the bytes.  */
+		      if (!mn10300_elf_relax_delete_bytes (input_bfd,
+							   section,
+							   isym->st_value,
+							   bytes))
+			goto error_return;
+
+		      /* Something changed.  Not strictly necessary, but
+			 may lead to more relaxing opportunities.  */
+		      *again = TRUE;
+		    }
+		}
+
+	      /* Look for any global functions in this section which
+		 need insns deleted from their prologues.  */
+	      symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+			  - symtab_hdr->sh_info);
+	      hashes = elf_sym_hashes (input_bfd);
+	      end_hashes = hashes + symcount;
+	      for (; hashes < end_hashes; hashes++)
+		{
+		  struct elf32_mn10300_link_hash_entry *sym_hash;
+
+		  sym_hash = (struct elf32_mn10300_link_hash_entry *) *hashes;
+		  if ((sym_hash->root.root.type == bfd_link_hash_defined
+		       || sym_hash->root.root.type == bfd_link_hash_defweak)
+		      && sym_hash->root.root.u.def.section == section
+		      && ! (sym_hash->flags & MN10300_CONVERT_CALL_TO_CALLS)
+		      && ! (sym_hash->flags & MN10300_DELETED_PROLOGUE_BYTES))
+		    {
+		      int bytes = 0;
+		      bfd_vma symval;
+
+		      /* Note that we've changed things.  */
+		      elf_section_data (section)->relocs = internal_relocs;
+		      elf_section_data (section)->this_hdr.contents = contents;
+		      symtab_hdr->contents = (unsigned char *) isymbuf;
+
+		      /* Count how many bytes we're going to delete.  */
+		      if (sym_hash->movm_args)
+			bytes += 2;
+
+		      if (sym_hash->stack_size > 0)
+			{
+			  if (sym_hash->stack_size <= 128)
+			    bytes += 3;
+			  else
+			    bytes += 4;
+			}
+
+		      /* Note that we've deleted prologue bytes for this
+			 function.  */
+		      sym_hash->flags |= MN10300_DELETED_PROLOGUE_BYTES;
+
+		      /* Actually delete the bytes.  */
+		      symval = sym_hash->root.root.u.def.value;
+		      if (!mn10300_elf_relax_delete_bytes (input_bfd,
+							   section,
+							   symval,
+							   bytes))
+			goto error_return;
+
+		      /* Something changed.  Not strictly necessary, but
+			 may lead to more relaxing opportunities.  */
+		      *again = TRUE;
+		    }
+		}
+
+	      /* Cache or free any memory we allocated for the relocs.  */
+	      if (internal_relocs != NULL
+		  && elf_section_data (section)->relocs != internal_relocs)
+		free (internal_relocs);
+	      internal_relocs = NULL;
+
+	      /* Cache or free any memory we allocated for the contents.  */
+	      if (contents != NULL
+		  && elf_section_data (section)->this_hdr.contents != contents)
+		{
+		  if (! link_info->keep_memory)
+		    free (contents);
+		  else
+		    /* Cache the section contents for elf_link_input_bfd.  */
+		    elf_section_data (section)->this_hdr.contents = contents;
+		}
+	      contents = NULL;
+	    }
+
+	  /* Cache or free any memory we allocated for the symbols.  */
+	  if (isymbuf != NULL
+	      && symtab_hdr->contents != (unsigned char *) isymbuf)
+	    {
+	      if (! link_info->keep_memory)
+		free (isymbuf);
+	      else
+		/* Cache the symbols for elf_link_input_bfd.  */
+		symtab_hdr->contents = (unsigned char *) isymbuf;
+	    }
+	  isymbuf = NULL;
+	}
+    }
+
+  /* (Re)initialize for the basic instruction shortening/relaxing pass.  */
+  contents = NULL;
+  internal_relocs = NULL;
+  isymbuf = NULL;
+  /* For error_return.  */
+  section = sec;
+
+  /* We don't have to do anything for a relocatable link, if
+     this section does not have relocs, or if this is not a
+     code section.  */
+  if (link_info->relocatable
+      || (sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0
+      || (sec->flags & SEC_CODE) == 0)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+
+  /* Get a copy of the native relocations.  */
+  internal_relocs = _bfd_elf_link_read_relocs (abfd, sec, NULL, NULL,
+					       link_info->keep_memory);
+  if (internal_relocs == NULL)
+    goto error_return;
+
+  /* Scan for worst case alignment gap changes.  Note that this logic
+     is not ideal; what we should do is run this scan for every
+     opcode/address range and adjust accordingly, but that's
+     expensive.  Worst case is that for an alignment of N bytes, we
+     move by 2*N-N-1 bytes, assuming we have aligns of 1, 2, 4, 8, etc
+     all before it.  Plus, this still doesn't cover cross-section
+     jumps with section alignment.  */
+  irelend = internal_relocs + sec->reloc_count;
+  align_gap_adjustment = 0;
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_ALIGN)
+	{
+	  bfd_vma adj = 1 << irel->r_addend;
+	  bfd_vma aend = irel->r_offset;
+
+	  aend = BFD_ALIGN (aend, 1 << irel->r_addend);
+	  adj = 2 * adj - adj - 1;
+
+	  /* Record the biggest adjustmnet.  Skip any alignment at the
+	     end of our section.  */
+	  if (align_gap_adjustment < adj
+	      && aend < sec->output_section->vma + sec->output_offset + sec->size)
+	    align_gap_adjustment = adj;
+	}
+    }
+
+  /* Walk through them looking for relaxing opportunities.  */
+  irelend = internal_relocs + sec->reloc_count;
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      bfd_vma symval;
+      bfd_signed_vma jump_offset;
+      asection *sym_sec = NULL;
+      struct elf32_mn10300_link_hash_entry *h = NULL;
+
+      /* If this isn't something that can be relaxed, then ignore
+	 this reloc.  */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_NONE
+	  || ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_8
+	  || ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_MAX)
+	continue;
+
+      /* Get the section contents if we haven't done so already.  */
+      if (contents == NULL)
+	{
+	  /* Get cached copy if it exists.  */
+	  if (elf_section_data (sec)->this_hdr.contents != NULL)
+	    contents = elf_section_data (sec)->this_hdr.contents;
+	  else
+	    {
+	      /* Go get them off disk.  */
+	      if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+		goto error_return;
+	    }
+	}
+
+      /* Read this BFD's symbols if we haven't done so already.  */
+      if (isymbuf == NULL && symtab_hdr->sh_info != 0)
+	{
+	  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	  if (isymbuf == NULL)
+	    isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+					    symtab_hdr->sh_info, 0,
+					    NULL, NULL, NULL);
+	  if (isymbuf == NULL)
+	    goto error_return;
+	}
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+	{
+	  Elf_Internal_Sym *isym;
+	  const char *sym_name;
+	  char *new_name;
+
+	  /* A local symbol.  */
+	  isym = isymbuf + ELF32_R_SYM (irel->r_info);
+	  if (isym->st_shndx == SHN_UNDEF)
+	    sym_sec = bfd_und_section_ptr;
+	  else if (isym->st_shndx == SHN_ABS)
+	    sym_sec = bfd_abs_section_ptr;
+	  else if (isym->st_shndx == SHN_COMMON)
+	    sym_sec = bfd_com_section_ptr;
+	  else
+	    sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+
+	  sym_name = bfd_elf_string_from_elf_section (abfd,
+						      symtab_hdr->sh_link,
+						      isym->st_name);
+
+	  if ((sym_sec->flags & SEC_MERGE)
+	      && sym_sec->sec_info_type == ELF_INFO_TYPE_MERGE)
+	    {
+	      symval = isym->st_value;
+
+	      /* GAS may reduce relocations against symbols in SEC_MERGE
+		 sections to a relocation against the section symbol when
+		 the original addend was zero.  When the reloc is against
+		 a section symbol we should include the addend in the
+		 offset passed to _bfd_merged_section_offset, since the
+		 location of interest is the original symbol.  On the
+		 other hand, an access to "sym+addend" where "sym" is not
+		 a section symbol should not include the addend;  Such an
+		 access is presumed to be an offset from "sym";  The
+		 location of interest is just "sym".  */
+	      if (ELF_ST_TYPE (isym->st_info) == STT_SECTION)
+		symval += irel->r_addend;
+
+	      symval = _bfd_merged_section_offset (abfd, & sym_sec,
+						   elf_section_data (sym_sec)->sec_info,
+						   symval);
+
+	      if (ELF_ST_TYPE (isym->st_info) != STT_SECTION)
+		symval += irel->r_addend;
+
+	      symval += sym_sec->output_section->vma
+		+ sym_sec->output_offset - irel->r_addend;
+	    }
+	  else
+	    symval = (isym->st_value
+		      + sym_sec->output_section->vma
+		      + sym_sec->output_offset);
+
+	  /* Tack on an ID so we can uniquely identify this
+	     local symbol in the global hash table.  */
+	  new_name = bfd_malloc ((bfd_size_type) strlen (sym_name) + 10);
+	  if (new_name == NULL)
+	    goto error_return;
+	  sprintf (new_name, "%s_%08x", sym_name, sym_sec->id);
+	  sym_name = new_name;
+
+	  h = (struct elf32_mn10300_link_hash_entry *)
+		elf_link_hash_lookup (&hash_table->static_hash_table->root,
+				      sym_name, FALSE, FALSE, FALSE);
+	  free (new_name);
+	}
+      else
+	{
+	  unsigned long indx;
+
+	  /* An external symbol.  */
+	  indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+	  h = (struct elf32_mn10300_link_hash_entry *)
+		(elf_sym_hashes (abfd)[indx]);
+	  BFD_ASSERT (h != NULL);
+	  if (h->root.root.type != bfd_link_hash_defined
+	      && h->root.root.type != bfd_link_hash_defweak)
+	    /* This appears to be a reference to an undefined
+	       symbol.  Just ignore it--it will be caught by the
+	       regular reloc processing.  */
+	    continue;
+
+	  /* Check for a reference to a discarded symbol and ignore it.  */
+	  if (h->root.root.u.def.section->output_section == NULL)
+	    continue;
+
+	  sym_sec = h->root.root.u.def.section->output_section;
+
+	  symval = (h->root.root.u.def.value
+		    + h->root.root.u.def.section->output_section->vma
+		    + h->root.root.u.def.section->output_offset);
+	}
+
+      /* For simplicity of coding, we are going to modify the section
+	 contents, the section relocs, and the BFD symbol table.  We
+	 must tell the rest of the code not to free up this
+	 information.  It would be possible to instead create a table
+	 of changes which have to be made, as is done in coff-mips.c;
+	 that would be more work, but would require less memory when
+	 the linker is run.  */
+
+      /* Try to turn a 32bit pc-relative branch/call into a 16bit pc-relative
+	 branch/call, also deal with "call" -> "calls" conversions and
+	 insertion of prologue data into "call" instructions.  */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_PCREL32
+	  || ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_PLT32)
+	{
+	  bfd_vma value = symval;
+
+	  if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_PLT32
+	      && h != NULL
+	      && ELF_ST_VISIBILITY (h->root.other) != STV_INTERNAL
+	      && ELF_ST_VISIBILITY (h->root.other) != STV_HIDDEN
+	      && h->root.plt.offset != (bfd_vma) -1)
+	    {
+	      asection * splt;
+
+	      splt = bfd_get_section_by_name (elf_hash_table (link_info)
+					      ->dynobj, ".plt");
+
+	      value = ((splt->output_section->vma
+			+ splt->output_offset
+			+ h->root.plt.offset)
+		       - (sec->output_section->vma
+			  + sec->output_offset
+			  + irel->r_offset));
+	    }
+
+	  /* If we've got a "call" instruction that needs to be turned
+	     into a "calls" instruction, do so now.  It saves a byte.  */
+	  if (h && (h->flags & MN10300_CONVERT_CALL_TO_CALLS))
+	    {
+	      unsigned char code;
+
+	      /* Get the opcode.  */
+	      code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+	      /* Make sure we're working with a "call" instruction!  */
+	      if (code == 0xdd)
+		{
+		  /* Note that we've changed the relocs, section contents,
+		     etc.  */
+		  elf_section_data (sec)->relocs = internal_relocs;
+		  elf_section_data (sec)->this_hdr.contents = contents;
+		  symtab_hdr->contents = (unsigned char *) isymbuf;
+
+		  /* Fix the opcode.  */
+		  bfd_put_8 (abfd, 0xfc, contents + irel->r_offset - 1);
+		  bfd_put_8 (abfd, 0xff, contents + irel->r_offset);
+
+		  /* Fix irel->r_offset and irel->r_addend.  */
+		  irel->r_offset += 1;
+		  irel->r_addend += 1;
+
+		  /* Delete one byte of data.  */
+		  if (!mn10300_elf_relax_delete_bytes (abfd, sec,
+						       irel->r_offset + 3, 1))
+		    goto error_return;
+
+		  /* That will change things, so, we should relax again.
+		     Note that this is not required, and it may be slow.  */
+		  *again = TRUE;
+		}
+	    }
+	  else if (h)
+	    {
+	      /* We've got a "call" instruction which needs some data
+		 from target function filled in.  */
+	      unsigned char code;
+
+	      /* Get the opcode.  */
+	      code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+	      /* Insert data from the target function into the "call"
+		 instruction if needed.  */
+	      if (code == 0xdd)
+		{
+		  bfd_put_8 (abfd, h->movm_args, contents + irel->r_offset + 4);
+		  bfd_put_8 (abfd, h->stack_size + h->movm_stack_size,
+			     contents + irel->r_offset + 5);
+		}
+	    }
+
+	  /* Deal with pc-relative gunk.  */
+	  value -= (sec->output_section->vma + sec->output_offset);
+	  value -= irel->r_offset;
+	  value += irel->r_addend;
+
+	  /* See if the value will fit in 16 bits, note the high value is
+	     0x7fff + 2 as the target will be two bytes closer if we are
+	     able to relax, if it's in the same section.  */
+	  if (sec->output_section == sym_sec->output_section)
+	    jump_offset = 0x8001;
+	  else
+	    jump_offset = 0x7fff;
+
+	  /* Account for jumps across alignment boundaries using
+	     align_gap_adjustment.  */
+	  if ((bfd_signed_vma) value < jump_offset - (bfd_signed_vma) align_gap_adjustment
+	      && ((bfd_signed_vma) value > -0x8000 + (bfd_signed_vma) align_gap_adjustment))
+	    {
+	      unsigned char code;
+
+	      /* Get the opcode.  */
+	      code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+	      if (code != 0xdc && code != 0xdd && code != 0xff)
+		continue;
+
+	      /* Note that we've changed the relocs, section contents, etc.  */
+	      elf_section_data (sec)->relocs = internal_relocs;
+	      elf_section_data (sec)->this_hdr.contents = contents;
+	      symtab_hdr->contents = (unsigned char *) isymbuf;
+
+	      /* Fix the opcode.  */
+	      if (code == 0xdc)
+		bfd_put_8 (abfd, 0xcc, contents + irel->r_offset - 1);
+	      else if (code == 0xdd)
+		bfd_put_8 (abfd, 0xcd, contents + irel->r_offset - 1);
+	      else if (code == 0xff)
+		bfd_put_8 (abfd, 0xfa, contents + irel->r_offset - 2);
+
+	      /* Fix the relocation's type.  */
+	      irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					   (ELF32_R_TYPE (irel->r_info)
+					    == (int) R_MN10300_PLT32)
+					   ? R_MN10300_PLT16 :
+					   R_MN10300_PCREL16);
+
+	      /* Delete two bytes of data.  */
+	      if (!mn10300_elf_relax_delete_bytes (abfd, sec,
+						   irel->r_offset + 1, 2))
+		goto error_return;
+
+	      /* That will change things, so, we should relax again.
+		 Note that this is not required, and it may be slow.  */
+	      *again = TRUE;
+	    }
+	}
+
+      /* Try to turn a 16bit pc-relative branch into a 8bit pc-relative
+	 branch.  */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_PCREL16)
+	{
+	  bfd_vma value = symval;
+
+	  /* If we've got a "call" instruction that needs to be turned
+	     into a "calls" instruction, do so now.  It saves a byte.  */
+	  if (h && (h->flags & MN10300_CONVERT_CALL_TO_CALLS))
+	    {
+	      unsigned char code;
+
+	      /* Get the opcode.  */
+	      code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+	      /* Make sure we're working with a "call" instruction!  */
+	      if (code == 0xcd)
+		{
+		  /* Note that we've changed the relocs, section contents,
+		     etc.  */
+		  elf_section_data (sec)->relocs = internal_relocs;
+		  elf_section_data (sec)->this_hdr.contents = contents;
+		  symtab_hdr->contents = (unsigned char *) isymbuf;
+
+		  /* Fix the opcode.  */
+		  bfd_put_8 (abfd, 0xfa, contents + irel->r_offset - 1);
+		  bfd_put_8 (abfd, 0xff, contents + irel->r_offset);
+
+		  /* Fix irel->r_offset and irel->r_addend.  */
+		  irel->r_offset += 1;
+		  irel->r_addend += 1;
+
+		  /* Delete one byte of data.  */
+		  if (!mn10300_elf_relax_delete_bytes (abfd, sec,
+						       irel->r_offset + 1, 1))
+		    goto error_return;
+
+		  /* That will change things, so, we should relax again.
+		     Note that this is not required, and it may be slow.  */
+		  *again = TRUE;
+		}
+	    }
+	  else if (h)
+	    {
+	      unsigned char code;
+
+	      /* Get the opcode.  */
+	      code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+	      /* Insert data from the target function into the "call"
+		 instruction if needed.  */
+	      if (code == 0xcd)
+		{
+		  bfd_put_8 (abfd, h->movm_args, contents + irel->r_offset + 2);
+		  bfd_put_8 (abfd, h->stack_size + h->movm_stack_size,
+			     contents + irel->r_offset + 3);
+		}
+	    }
+
+	  /* Deal with pc-relative gunk.  */
+	  value -= (sec->output_section->vma + sec->output_offset);
+	  value -= irel->r_offset;
+	  value += irel->r_addend;
+
+	  /* See if the value will fit in 8 bits, note the high value is
+	     0x7f + 1 as the target will be one bytes closer if we are
+	     able to relax.  */
+	  if ((long) value < 0x80 && (long) value > -0x80)
+	    {
+	      unsigned char code;
+
+	      /* Get the opcode.  */
+	      code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+	      if (code != 0xcc)
+		continue;
+
+	      /* Note that we've changed the relocs, section contents, etc.  */
+	      elf_section_data (sec)->relocs = internal_relocs;
+	      elf_section_data (sec)->this_hdr.contents = contents;
+	      symtab_hdr->contents = (unsigned char *) isymbuf;
+
+	      /* Fix the opcode.  */
+	      bfd_put_8 (abfd, 0xca, contents + irel->r_offset - 1);
+
+	      /* Fix the relocation's type.  */
+	      irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					   R_MN10300_PCREL8);
+
+	      /* Delete one byte of data.  */
+	      if (!mn10300_elf_relax_delete_bytes (abfd, sec,
+						   irel->r_offset + 1, 1))
+		goto error_return;
+
+	      /* That will change things, so, we should relax again.
+		 Note that this is not required, and it may be slow.  */
+	      *again = TRUE;
+	    }
+	}
+
+      /* Try to eliminate an unconditional 8 bit pc-relative branch
+	 which immediately follows a conditional 8 bit pc-relative
+	 branch around the unconditional branch.
+
+	    original:		new:
+	    bCC lab1		bCC' lab2
+	    bra lab2
+	   lab1:	       lab1:
+
+	 This happens when the bCC can't reach lab2 at assembly time,
+	 but due to other relaxations it can reach at link time.  */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_PCREL8)
+	{
+	  Elf_Internal_Rela *nrel;
+	  bfd_vma value = symval;
+	  unsigned char code;
+
+	  /* Deal with pc-relative gunk.  */
+	  value -= (sec->output_section->vma + sec->output_offset);
+	  value -= irel->r_offset;
+	  value += irel->r_addend;
+
+	  /* Do nothing if this reloc is the last byte in the section.  */
+	  if (irel->r_offset == sec->size)
+	    continue;
+
+	  /* See if the next instruction is an unconditional pc-relative
+	     branch, more often than not this test will fail, so we
+	     test it first to speed things up.  */
+	  code = bfd_get_8 (abfd, contents + irel->r_offset + 1);
+	  if (code != 0xca)
+	    continue;
+
+	  /* Also make sure the next relocation applies to the next
+	     instruction and that it's a pc-relative 8 bit branch.  */
+	  nrel = irel + 1;
+	  if (nrel == irelend
+	      || irel->r_offset + 2 != nrel->r_offset
+	      || ELF32_R_TYPE (nrel->r_info) != (int) R_MN10300_PCREL8)
+	    continue;
+
+	  /* Make sure our destination immediately follows the
+	     unconditional branch.  */
+	  if (symval != (sec->output_section->vma + sec->output_offset
+			 + irel->r_offset + 3))
+	    continue;
+
+	  /* Now make sure we are a conditional branch.  This may not
+	     be necessary, but why take the chance.
+
+	     Note these checks assume that R_MN10300_PCREL8 relocs
+	     only occur on bCC and bCCx insns.  If they occured
+	     elsewhere, we'd need to know the start of this insn
+	     for this check to be accurate.  */
+	  code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+	  if (code != 0xc0 && code != 0xc1 && code != 0xc2
+	      && code != 0xc3 && code != 0xc4 && code != 0xc5
+	      && code != 0xc6 && code != 0xc7 && code != 0xc8
+	      && code != 0xc9 && code != 0xe8 && code != 0xe9
+	      && code != 0xea && code != 0xeb)
+	    continue;
+
+	  /* We also have to be sure there is no symbol/label
+	     at the unconditional branch.  */
+	  if (mn10300_elf_symbol_address_p (abfd, sec, isymbuf,
+					    irel->r_offset + 1))
+	    continue;
+
+	  /* Note that we've changed the relocs, section contents, etc.  */
+	  elf_section_data (sec)->relocs = internal_relocs;
+	  elf_section_data (sec)->this_hdr.contents = contents;
+	  symtab_hdr->contents = (unsigned char *) isymbuf;
+
+	  /* Reverse the condition of the first branch.  */
+	  switch (code)
+	    {
+	    case 0xc8:
+	      code = 0xc9;
+	      break;
+	    case 0xc9:
+	      code = 0xc8;
+	      break;
+	    case 0xc0:
+	      code = 0xc2;
+	      break;
+	    case 0xc2:
+	      code = 0xc0;
+	      break;
+	    case 0xc3:
+	      code = 0xc1;
+	      break;
+	    case 0xc1:
+	      code = 0xc3;
+	      break;
+	    case 0xc4:
+	      code = 0xc6;
+	      break;
+	    case 0xc6:
+	      code = 0xc4;
+	      break;
+	    case 0xc7:
+	      code = 0xc5;
+	      break;
+	    case 0xc5:
+	      code = 0xc7;
+	      break;
+	    case 0xe8:
+	      code = 0xe9;
+	      break;
+	    case 0x9d:
+	      code = 0xe8;
+	      break;
+	    case 0xea:
+	      code = 0xeb;
+	      break;
+	    case 0xeb:
+	      code = 0xea;
+	      break;
+	    }
+	  bfd_put_8 (abfd, code, contents + irel->r_offset - 1);
+
+	  /* Set the reloc type and symbol for the first branch
+	     from the second branch.  */
+	  irel->r_info = nrel->r_info;
+
+	  /* Make the reloc for the second branch a null reloc.  */
+	  nrel->r_info = ELF32_R_INFO (ELF32_R_SYM (nrel->r_info),
+				       R_MN10300_NONE);
+
+	  /* Delete two bytes of data.  */
+	  if (!mn10300_elf_relax_delete_bytes (abfd, sec,
+					       irel->r_offset + 1, 2))
+	    goto error_return;
+
+	  /* That will change things, so, we should relax again.
+	     Note that this is not required, and it may be slow.  */
+	  *again = TRUE;
+	}
+
+      /* Try to turn a 24 immediate, displacement or absolute address
+	 into a 8 immediate, displacement or absolute address.  */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_24)
+	{
+	  bfd_vma value = symval;
+	  value += irel->r_addend;
+
+	  /* See if the value will fit in 8 bits.  */
+	  if ((long) value < 0x7f && (long) value > -0x80)
+	    {
+	      unsigned char code;
+
+	      /* AM33 insns which have 24 operands are 6 bytes long and
+		 will have 0xfd as the first byte.  */
+
+	      /* Get the first opcode.  */
+	      code = bfd_get_8 (abfd, contents + irel->r_offset - 3);
+
+	      if (code == 0xfd)
+		{
+		  /* Get the second opcode.  */
+		  code = bfd_get_8 (abfd, contents + irel->r_offset - 2);
+
+		  /* We can not relax 0x6b, 0x7b, 0x8b, 0x9b as no 24bit
+		     equivalent instructions exists.  */
+		  if (code != 0x6b && code != 0x7b
+		      && code != 0x8b && code != 0x9b
+		      && ((code & 0x0f) == 0x09 || (code & 0x0f) == 0x08
+			  || (code & 0x0f) == 0x0a || (code & 0x0f) == 0x0b
+			  || (code & 0x0f) == 0x0e))
+		    {
+		      /* Not safe if the high bit is on as relaxing may
+			 move the value out of high mem and thus not fit
+			 in a signed 8bit value.  This is currently over
+			 conservative.  */
+		      if ((value & 0x80) == 0)
+			{
+			  /* Note that we've changed the relocation contents,
+			     etc.  */
+			  elf_section_data (sec)->relocs = internal_relocs;
+			  elf_section_data (sec)->this_hdr.contents = contents;
+			  symtab_hdr->contents = (unsigned char *) isymbuf;
+
+			  /* Fix the opcode.  */
+			  bfd_put_8 (abfd, 0xfb, contents + irel->r_offset - 3);
+			  bfd_put_8 (abfd, code, contents + irel->r_offset - 2);
+
+			  /* Fix the relocation's type.  */
+			  irel->r_info =
+			    ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					  R_MN10300_8);
+
+			  /* Delete two bytes of data.  */
+			  if (!mn10300_elf_relax_delete_bytes (abfd, sec,
+							       irel->r_offset + 1, 2))
+			    goto error_return;
+
+			  /* That will change things, so, we should relax
+			     again.  Note that this is not required, and it
+			     may be slow.  */
+			  *again = TRUE;
+			  break;
+			}
+		    }
+		}
+	    }
+	}
+
+      /* Try to turn a 32bit immediate, displacement or absolute address
+	 into a 16bit immediate, displacement or absolute address.  */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_32
+	  || ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_GOT32
+	  || ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_GOTOFF32)
+	{
+	  bfd_vma value = symval;
+
+	  if (ELF32_R_TYPE (irel->r_info) != (int) R_MN10300_32)
+	    {
+	      asection * sgot;
+
+	      sgot = bfd_get_section_by_name (elf_hash_table (link_info)
+					      ->dynobj, ".got");
+
+	      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_GOT32)
+		{
+		  value = sgot->output_offset;
+
+		  if (h)
+		    value += h->root.got.offset;
+		  else
+		    value += (elf_local_got_offsets
+			      (abfd)[ELF32_R_SYM (irel->r_info)]);
+		}
+	      else if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_GOTOFF32)
+		value -= sgot->output_section->vma;
+	      else if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_GOTPC32)
+		value = (sgot->output_section->vma
+			 - (sec->output_section->vma
+			    + sec->output_offset
+			    + irel->r_offset));
+	      else
+		abort ();
+	    }
+
+	  value += irel->r_addend;
+
+	  /* See if the value will fit in 24 bits.
+	     We allow any 16bit match here.  We prune those we can't
+	     handle below.  */
+	  if ((long) value < 0x7fffff && (long) value > -0x800000)
+	    {
+	      unsigned char code;
+
+	      /* AM33 insns which have 32bit operands are 7 bytes long and
+		 will have 0xfe as the first byte.  */
+
+	      /* Get the first opcode.  */
+	      code = bfd_get_8 (abfd, contents + irel->r_offset - 3);
+
+	      if (code == 0xfe)
+		{
+		  /* Get the second opcode.  */
+		  code = bfd_get_8 (abfd, contents + irel->r_offset - 2);
+
+		  /* All the am33 32 -> 24 relaxing possibilities.  */
+		  /* We can not relax 0x6b, 0x7b, 0x8b, 0x9b as no 24bit
+		     equivalent instructions exists.  */
+		  if (code != 0x6b && code != 0x7b
+		      && code != 0x8b && code != 0x9b
+		      && (ELF32_R_TYPE (irel->r_info)
+			  != (int) R_MN10300_GOTPC32)
+		      && ((code & 0x0f) == 0x09 || (code & 0x0f) == 0x08
+			  || (code & 0x0f) == 0x0a || (code & 0x0f) == 0x0b
+			  || (code & 0x0f) == 0x0e))
+		    {
+		      /* Not safe if the high bit is on as relaxing may
+			 move the value out of high mem and thus not fit
+			 in a signed 16bit value.  This is currently over
+			 conservative.  */
+		      if ((value & 0x8000) == 0)
+			{
+			  /* Note that we've changed the relocation contents,
+			     etc.  */
+			  elf_section_data (sec)->relocs = internal_relocs;
+			  elf_section_data (sec)->this_hdr.contents = contents;
+			  symtab_hdr->contents = (unsigned char *) isymbuf;
+
+			  /* Fix the opcode.  */
+			  bfd_put_8 (abfd, 0xfd, contents + irel->r_offset - 3);
+			  bfd_put_8 (abfd, code, contents + irel->r_offset - 2);
+
+			  /* Fix the relocation's type.  */
+			  irel->r_info =
+			    ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					  (ELF32_R_TYPE (irel->r_info)
+					   == (int) R_MN10300_GOTOFF32)
+					  ? R_MN10300_GOTOFF24
+					  : (ELF32_R_TYPE (irel->r_info)
+					     == (int) R_MN10300_GOT32)
+					  ? R_MN10300_GOT24 :
+					  R_MN10300_24);
+
+			  /* Delete one byte of data.  */
+			  if (!mn10300_elf_relax_delete_bytes (abfd, sec,
+							       irel->r_offset + 3, 1))
+			    goto error_return;
+
+			  /* That will change things, so, we should relax
+			     again.  Note that this is not required, and it
+			     may be slow.  */
+			  *again = TRUE;
+			  break;
+			}
+		    }
+		}
+	    }
+
+	  /* See if the value will fit in 16 bits.
+	     We allow any 16bit match here.  We prune those we can't
+	     handle below.  */
+	  if ((long) value < 0x7fff && (long) value > -0x8000)
+	    {
+	      unsigned char code;
+
+	      /* Most insns which have 32bit operands are 6 bytes long;
+		 exceptions are pcrel insns and bit insns.
+
+		 We handle pcrel insns above.  We don't bother trying
+		 to handle the bit insns here.
+
+		 The first byte of the remaining insns will be 0xfc.  */
+
+	      /* Get the first opcode.  */
+	      code = bfd_get_8 (abfd, contents + irel->r_offset - 2);
+
+	      if (code != 0xfc)
+		continue;
+
+	      /* Get the second opcode.  */
+	      code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+	      if ((code & 0xf0) < 0x80)
+		switch (code & 0xf0)
+		  {
+		  /* mov (d32,am),dn   -> mov (d32,am),dn
+		     mov dm,(d32,am)   -> mov dn,(d32,am)
+		     mov (d32,am),an   -> mov (d32,am),an
+		     mov dm,(d32,am)   -> mov dn,(d32,am)
+		     movbu (d32,am),dn -> movbu (d32,am),dn
+		     movbu dm,(d32,am) -> movbu dn,(d32,am)
+		     movhu (d32,am),dn -> movhu (d32,am),dn
+		     movhu dm,(d32,am) -> movhu dn,(d32,am) */
+		  case 0x00:
+		  case 0x10:
+		  case 0x20:
+		  case 0x30:
+		  case 0x40:
+		  case 0x50:
+		  case 0x60:
+		  case 0x70:
+		    /* Not safe if the high bit is on as relaxing may
+		       move the value out of high mem and thus not fit
+		       in a signed 16bit value.  */
+		    if (code == 0xcc
+			&& (value & 0x8000))
+		      continue;
+
+		    /* Note that we've changed the relocation contents, etc.  */
+		    elf_section_data (sec)->relocs = internal_relocs;
+		    elf_section_data (sec)->this_hdr.contents = contents;
+		    symtab_hdr->contents = (unsigned char *) isymbuf;
+
+		    /* Fix the opcode.  */
+		    bfd_put_8 (abfd, 0xfa, contents + irel->r_offset - 2);
+		    bfd_put_8 (abfd, code, contents + irel->r_offset - 1);
+
+		    /* Fix the relocation's type.  */
+		    irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+						 (ELF32_R_TYPE (irel->r_info)
+						  == (int) R_MN10300_GOTOFF32)
+						 ? R_MN10300_GOTOFF16
+						 : (ELF32_R_TYPE (irel->r_info)
+						    == (int) R_MN10300_GOT32)
+						 ? R_MN10300_GOT16
+						 : (ELF32_R_TYPE (irel->r_info)
+						    == (int) R_MN10300_GOTPC32)
+						 ? R_MN10300_GOTPC16 :
+						 R_MN10300_16);
+
+		    /* Delete two bytes of data.  */
+		    if (!mn10300_elf_relax_delete_bytes (abfd, sec,
+							 irel->r_offset + 2, 2))
+		      goto error_return;
+
+		    /* That will change things, so, we should relax again.
+		       Note that this is not required, and it may be slow.  */
+		    *again = TRUE;
+		    break;
+		  }
+	      else if ((code & 0xf0) == 0x80
+		       || (code & 0xf0) == 0x90)
+		switch (code & 0xf3)
+		  {
+		  /* mov dn,(abs32)   -> mov dn,(abs16)
+		     movbu dn,(abs32) -> movbu dn,(abs16)
+		     movhu dn,(abs32) -> movhu dn,(abs16)  */
+		  case 0x81:
+		  case 0x82:
+		  case 0x83:
+		    /* Note that we've changed the relocation contents, etc.  */
+		    elf_section_data (sec)->relocs = internal_relocs;
+		    elf_section_data (sec)->this_hdr.contents = contents;
+		    symtab_hdr->contents = (unsigned char *) isymbuf;
+
+		    if ((code & 0xf3) == 0x81)
+		      code = 0x01 + (code & 0x0c);
+		    else if ((code & 0xf3) == 0x82)
+		      code = 0x02 + (code & 0x0c);
+		    else if ((code & 0xf3) == 0x83)
+		      code = 0x03 + (code & 0x0c);
+		    else
+		      abort ();
+
+		    /* Fix the opcode.  */
+		    bfd_put_8 (abfd, code, contents + irel->r_offset - 2);
+
+		    /* Fix the relocation's type.  */
+		    irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+						 (ELF32_R_TYPE (irel->r_info)
+						  == (int) R_MN10300_GOTOFF32)
+						 ? R_MN10300_GOTOFF16
+						 : (ELF32_R_TYPE (irel->r_info)
+						    == (int) R_MN10300_GOT32)
+						 ? R_MN10300_GOT16
+						 : (ELF32_R_TYPE (irel->r_info)
+						    == (int) R_MN10300_GOTPC32)
+						 ? R_MN10300_GOTPC16 :
+						 R_MN10300_16);
+
+		    /* The opcode got shorter too, so we have to fix the
+		       addend and offset too!  */
+		    irel->r_offset -= 1;
+
+		    /* Delete three bytes of data.  */
+		    if (!mn10300_elf_relax_delete_bytes (abfd, sec,
+							 irel->r_offset + 1, 3))
+		      goto error_return;
+
+		    /* That will change things, so, we should relax again.
+		       Note that this is not required, and it may be slow.  */
+		    *again = TRUE;
+		    break;
+
+		  /* mov am,(abs32)    -> mov am,(abs16)
+		     mov am,(d32,sp)   -> mov am,(d16,sp)
+		     mov dm,(d32,sp)   -> mov dm,(d32,sp)
+		     movbu dm,(d32,sp) -> movbu dm,(d32,sp)
+		     movhu dm,(d32,sp) -> movhu dm,(d32,sp) */
+		  case 0x80:
+		  case 0x90:
+		  case 0x91:
+		  case 0x92:
+		  case 0x93:
+		    /* sp-based offsets are zero-extended.  */
+		    if (code >= 0x90 && code <= 0x93
+			&& (long) value < 0)
+		      continue;
+
+		    /* Note that we've changed the relocation contents, etc.  */
+		    elf_section_data (sec)->relocs = internal_relocs;
+		    elf_section_data (sec)->this_hdr.contents = contents;
+		    symtab_hdr->contents = (unsigned char *) isymbuf;
+
+		    /* Fix the opcode.  */
+		    bfd_put_8 (abfd, 0xfa, contents + irel->r_offset - 2);
+		    bfd_put_8 (abfd, code, contents + irel->r_offset - 1);
+
+		    /* Fix the relocation's type.  */
+		    irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+						 (ELF32_R_TYPE (irel->r_info)
+						  == (int) R_MN10300_GOTOFF32)
+						 ? R_MN10300_GOTOFF16
+						 : (ELF32_R_TYPE (irel->r_info)
+						    == (int) R_MN10300_GOT32)
+						 ? R_MN10300_GOT16
+						 : (ELF32_R_TYPE (irel->r_info)
+						    == (int) R_MN10300_GOTPC32)
+						 ? R_MN10300_GOTPC16 :
+						 R_MN10300_16);
+
+		    /* Delete two bytes of data.  */
+		    if (!mn10300_elf_relax_delete_bytes (abfd, sec,
+							 irel->r_offset + 2, 2))
+		      goto error_return;
+
+		    /* That will change things, so, we should relax again.
+		       Note that this is not required, and it may be slow.  */
+		    *again = TRUE;
+		    break;
+		  }
+	      else if ((code & 0xf0) < 0xf0)
+		switch (code & 0xfc)
+		  {
+		  /* mov imm32,dn     -> mov imm16,dn
+		     mov imm32,an     -> mov imm16,an
+		     mov (abs32),dn   -> mov (abs16),dn
+		     movbu (abs32),dn -> movbu (abs16),dn
+		     movhu (abs32),dn -> movhu (abs16),dn  */
+		  case 0xcc:
+		  case 0xdc:
+		  case 0xa4:
+		  case 0xa8:
+		  case 0xac:
+		    /* Not safe if the high bit is on as relaxing may
+		       move the value out of high mem and thus not fit
+		       in a signed 16bit value.  */
+		    if (code == 0xcc
+			&& (value & 0x8000))
+		      continue;
+
+		    /* mov imm16, an zero-extends the immediate.  */
+		    if (code == 0xdc
+			&& (long) value < 0)
+		      continue;
+
+		    /* Note that we've changed the relocation contents, etc.  */
+		    elf_section_data (sec)->relocs = internal_relocs;
+		    elf_section_data (sec)->this_hdr.contents = contents;
+		    symtab_hdr->contents = (unsigned char *) isymbuf;
+
+		    if ((code & 0xfc) == 0xcc)
+		      code = 0x2c + (code & 0x03);
+		    else if ((code & 0xfc) == 0xdc)
+		      code = 0x24 + (code & 0x03);
+		    else if ((code & 0xfc) == 0xa4)
+		      code = 0x30 + (code & 0x03);
+		    else if ((code & 0xfc) == 0xa8)
+		      code = 0x34 + (code & 0x03);
+		    else if ((code & 0xfc) == 0xac)
+		      code = 0x38 + (code & 0x03);
+		    else
+		      abort ();
+
+		    /* Fix the opcode.  */
+		    bfd_put_8 (abfd, code, contents + irel->r_offset - 2);
+
+		    /* Fix the relocation's type.  */
+		    irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+						 (ELF32_R_TYPE (irel->r_info)
+						  == (int) R_MN10300_GOTOFF32)
+						 ? R_MN10300_GOTOFF16
+						 : (ELF32_R_TYPE (irel->r_info)
+						    == (int) R_MN10300_GOT32)
+						 ? R_MN10300_GOT16
+						 : (ELF32_R_TYPE (irel->r_info)
+						    == (int) R_MN10300_GOTPC32)
+						 ? R_MN10300_GOTPC16 :
+						 R_MN10300_16);
+
+		    /* The opcode got shorter too, so we have to fix the
+		       addend and offset too!  */
+		    irel->r_offset -= 1;
+
+		    /* Delete three bytes of data.  */
+		    if (!mn10300_elf_relax_delete_bytes (abfd, sec,
+							 irel->r_offset + 1, 3))
+		      goto error_return;
+
+		    /* That will change things, so, we should relax again.
+		       Note that this is not required, and it may be slow.  */
+		    *again = TRUE;
+		    break;
+
+		  /* mov (abs32),an    -> mov (abs16),an
+		     mov (d32,sp),an   -> mov (d16,sp),an
+		     mov (d32,sp),dn   -> mov (d16,sp),dn
+		     movbu (d32,sp),dn -> movbu (d16,sp),dn
+		     movhu (d32,sp),dn -> movhu (d16,sp),dn
+		     add imm32,dn      -> add imm16,dn
+		     cmp imm32,dn      -> cmp imm16,dn
+		     add imm32,an      -> add imm16,an
+		     cmp imm32,an      -> cmp imm16,an
+		     and imm32,dn      -> and imm16,dn
+		     or imm32,dn       -> or imm16,dn
+		     xor imm32,dn      -> xor imm16,dn
+		     btst imm32,dn     -> btst imm16,dn */
+
+		  case 0xa0:
+		  case 0xb0:
+		  case 0xb1:
+		  case 0xb2:
+		  case 0xb3:
+		  case 0xc0:
+		  case 0xc8:
+
+		  case 0xd0:
+		  case 0xd8:
+		  case 0xe0:
+		  case 0xe1:
+		  case 0xe2:
+		  case 0xe3:
+		    /* cmp imm16, an zero-extends the immediate.  */
+		    if (code == 0xdc
+			&& (long) value < 0)
+		      continue;
+
+		    /* So do sp-based offsets.  */
+		    if (code >= 0xb0 && code <= 0xb3
+			&& (long) value < 0)
+		      continue;
+
+		    /* Note that we've changed the relocation contents, etc.  */
+		    elf_section_data (sec)->relocs = internal_relocs;
+		    elf_section_data (sec)->this_hdr.contents = contents;
+		    symtab_hdr->contents = (unsigned char *) isymbuf;
+
+		    /* Fix the opcode.  */
+		    bfd_put_8 (abfd, 0xfa, contents + irel->r_offset - 2);
+		    bfd_put_8 (abfd, code, contents + irel->r_offset - 1);
+
+		    /* Fix the relocation's type.  */
+		    irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+						 (ELF32_R_TYPE (irel->r_info)
+						  == (int) R_MN10300_GOTOFF32)
+						 ? R_MN10300_GOTOFF16
+						 : (ELF32_R_TYPE (irel->r_info)
+						    == (int) R_MN10300_GOT32)
+						 ? R_MN10300_GOT16
+						 : (ELF32_R_TYPE (irel->r_info)
+						    == (int) R_MN10300_GOTPC32)
+						 ? R_MN10300_GOTPC16 :
+						 R_MN10300_16);
+
+		    /* Delete two bytes of data.  */
+		    if (!mn10300_elf_relax_delete_bytes (abfd, sec,
+							 irel->r_offset + 2, 2))
+		      goto error_return;
+
+		    /* That will change things, so, we should relax again.
+		       Note that this is not required, and it may be slow.  */
+		    *again = TRUE;
+		    break;
+		  }
+	      else if (code == 0xfe)
+		{
+		  /* add imm32,sp -> add imm16,sp  */
+
+		  /* Note that we've changed the relocation contents, etc.  */
+		  elf_section_data (sec)->relocs = internal_relocs;
+		  elf_section_data (sec)->this_hdr.contents = contents;
+		  symtab_hdr->contents = (unsigned char *) isymbuf;
+
+		  /* Fix the opcode.  */
+		  bfd_put_8 (abfd, 0xfa, contents + irel->r_offset - 2);
+		  bfd_put_8 (abfd, 0xfe, contents + irel->r_offset - 1);
+
+		  /* Fix the relocation's type.  */
+		  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					       (ELF32_R_TYPE (irel->r_info)
+						== (int) R_MN10300_GOT32)
+					       ? R_MN10300_GOT16
+					       : (ELF32_R_TYPE (irel->r_info)
+						  == (int) R_MN10300_GOTOFF32)
+					       ? R_MN10300_GOTOFF16
+					       : (ELF32_R_TYPE (irel->r_info)
+						  == (int) R_MN10300_GOTPC32)
+					       ? R_MN10300_GOTPC16 :
+					       R_MN10300_16);
+
+		  /* Delete two bytes of data.  */
+		  if (!mn10300_elf_relax_delete_bytes (abfd, sec,
+						       irel->r_offset + 2, 2))
+		    goto error_return;
+
+		  /* That will change things, so, we should relax again.
+		     Note that this is not required, and it may be slow.  */
+		  *again = TRUE;
+		  break;
+		}
+	    }
+	}
+    }
+
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    {
+      if (! link_info->keep_memory)
+	free (isymbuf);
+      else
+	{
+	  /* Cache the symbols for elf_link_input_bfd.  */
+	  symtab_hdr->contents = (unsigned char *) isymbuf;
+	}
+    }
+
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    {
+      if (! link_info->keep_memory)
+	free (contents);
+      else
+	{
+	  /* Cache the section contents for elf_link_input_bfd.  */
+	  elf_section_data (sec)->this_hdr.contents = contents;
+	}
+    }
+
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return TRUE;
+
+ error_return:
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (contents != NULL
+      && elf_section_data (section)->this_hdr.contents != contents)
+    free (contents);
+  if (internal_relocs != NULL
+      && elf_section_data (section)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return FALSE;
+}
+
+/* This is a version of bfd_generic_get_relocated_section_contents
+   which uses mn10300_elf_relocate_section.  */
+
+static bfd_byte *
+mn10300_elf_get_relocated_section_contents (bfd *output_bfd,
+					    struct bfd_link_info *link_info,
+					    struct bfd_link_order *link_order,
+					    bfd_byte *data,
+					    bfd_boolean relocatable,
+					    asymbol **symbols)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  asection *input_section = link_order->u.indirect.section;
+  bfd *input_bfd = input_section->owner;
+  asection **sections = NULL;
+  Elf_Internal_Rela *internal_relocs = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+
+  /* We only need to handle the case of relaxing, or of having a
+     particular set of section contents, specially.  */
+  if (relocatable
+      || elf_section_data (input_section)->this_hdr.contents == NULL)
+    return bfd_generic_get_relocated_section_contents (output_bfd, link_info,
+						       link_order, data,
+						       relocatable,
+						       symbols);
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+
+  memcpy (data, elf_section_data (input_section)->this_hdr.contents,
+	  (size_t) input_section->size);
+
+  if ((input_section->flags & SEC_RELOC) != 0
+      && input_section->reloc_count > 0)
+    {
+      asection **secpp;
+      Elf_Internal_Sym *isym, *isymend;
+      bfd_size_type amt;
+
+      internal_relocs = _bfd_elf_link_read_relocs (input_bfd, input_section,
+						   NULL, NULL, FALSE);
+      if (internal_relocs == NULL)
+	goto error_return;
+
+      if (symtab_hdr->sh_info != 0)
+	{
+	  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	  if (isymbuf == NULL)
+	    isymbuf = bfd_elf_get_elf_syms (input_bfd, symtab_hdr,
+					    symtab_hdr->sh_info, 0,
+					    NULL, NULL, NULL);
+	  if (isymbuf == NULL)
+	    goto error_return;
+	}
+
+      amt = symtab_hdr->sh_info;
+      amt *= sizeof (asection *);
+      sections = bfd_malloc (amt);
+      if (sections == NULL && amt != 0)
+	goto error_return;
+
+      isymend = isymbuf + symtab_hdr->sh_info;
+      for (isym = isymbuf, secpp = sections; isym < isymend; ++isym, ++secpp)
+	{
+	  asection *isec;
+
+	  if (isym->st_shndx == SHN_UNDEF)
+	    isec = bfd_und_section_ptr;
+	  else if (isym->st_shndx == SHN_ABS)
+	    isec = bfd_abs_section_ptr;
+	  else if (isym->st_shndx == SHN_COMMON)
+	    isec = bfd_com_section_ptr;
+	  else
+	    isec = bfd_section_from_elf_index (input_bfd, isym->st_shndx);
+
+	  *secpp = isec;
+	}
+
+      if (! mn10300_elf_relocate_section (output_bfd, link_info, input_bfd,
+					  input_section, data, internal_relocs,
+					  isymbuf, sections))
+	goto error_return;
+
+      if (sections != NULL)
+	free (sections);
+      if (isymbuf != NULL && symtab_hdr->contents != (unsigned char *) isymbuf)
+	free (isymbuf);
+      if (internal_relocs != elf_section_data (input_section)->relocs)
+	free (internal_relocs);
+    }
+
+  return data;
+
+ error_return:
+  if (sections != NULL)
+    free (sections);
+  if (isymbuf != NULL && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (internal_relocs != NULL
+      && internal_relocs != elf_section_data (input_section)->relocs)
+    free (internal_relocs);
+  return NULL;
+}
+
+/* Assorted hash table functions.  */
+
+/* Initialize an entry in the link hash table.  */
+
+/* Create an entry in an MN10300 ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+elf32_mn10300_link_hash_newfunc (struct bfd_hash_entry *entry,
+				 struct bfd_hash_table *table,
+				 const char *string)
+{
+  struct elf32_mn10300_link_hash_entry *ret =
+    (struct elf32_mn10300_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = (struct elf32_mn10300_link_hash_entry *)
+	   bfd_hash_allocate (table, sizeof (* ret));
+  if (ret == NULL)
+    return (struct bfd_hash_entry *) ret;
+
+  /* Call the allocation method of the superclass.  */
+  ret = (struct elf32_mn10300_link_hash_entry *)
+	 _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
+				     table, string);
+  if (ret != NULL)
+    {
+      ret->direct_calls = 0;
+      ret->stack_size = 0;
+      ret->movm_args = 0;
+      ret->movm_stack_size = 0;
+      ret->flags = 0;
+      ret->value = 0;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Create an mn10300 ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+elf32_mn10300_link_hash_table_create (bfd *abfd)
+{
+  struct elf32_mn10300_link_hash_table *ret;
+  bfd_size_type amt = sizeof (* ret);
+
+  ret = bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->root, abfd,
+				      elf32_mn10300_link_hash_newfunc,
+				      sizeof (struct elf32_mn10300_link_hash_entry),
+				      MN10300_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  ret->flags = 0;
+  amt = sizeof (struct elf_link_hash_table);
+  ret->static_hash_table = bfd_malloc (amt);
+  if (ret->static_hash_table == NULL)
+    {
+      free (ret);
+      return NULL;
+    }
+
+  if (!_bfd_elf_link_hash_table_init (&ret->static_hash_table->root, abfd,
+				      elf32_mn10300_link_hash_newfunc,
+				      sizeof (struct elf32_mn10300_link_hash_entry),
+				      MN10300_ELF_DATA))
+    {
+      free (ret->static_hash_table);
+      free (ret);
+      return NULL;
+    }
+  return & ret->root.root;
+}
+
+/* Free an mn10300 ELF linker hash table.  */
+
+static void
+elf32_mn10300_link_hash_table_free (struct bfd_link_hash_table *hash)
+{
+  struct elf32_mn10300_link_hash_table *ret
+    = (struct elf32_mn10300_link_hash_table *) hash;
+
+  _bfd_generic_link_hash_table_free
+    ((struct bfd_link_hash_table *) ret->static_hash_table);
+  _bfd_generic_link_hash_table_free
+    ((struct bfd_link_hash_table *) ret);
+}
+
+static unsigned long
+elf_mn10300_mach (flagword flags)
+{
+  switch (flags & EF_MN10300_MACH)
+    {
+    case E_MN10300_MACH_MN10300:
+    default:
+      return bfd_mach_mn10300;
+
+    case E_MN10300_MACH_AM33:
+      return bfd_mach_am33;
+
+    case E_MN10300_MACH_AM33_2:
+      return bfd_mach_am33_2;
+    }
+}
+
+/* The final processing done just before writing out a MN10300 ELF object
+   file.  This gets the MN10300 architecture right based on the machine
+   number.  */
+
+static void
+_bfd_mn10300_elf_final_write_processing (bfd *abfd,
+					 bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  unsigned long val;
+
+  switch (bfd_get_mach (abfd))
+    {
+    default:
+    case bfd_mach_mn10300:
+      val = E_MN10300_MACH_MN10300;
+      break;
+
+    case bfd_mach_am33:
+      val = E_MN10300_MACH_AM33;
+      break;
+
+    case bfd_mach_am33_2:
+      val = E_MN10300_MACH_AM33_2;
+      break;
+    }
+
+  elf_elfheader (abfd)->e_flags &= ~ (EF_MN10300_MACH);
+  elf_elfheader (abfd)->e_flags |= val;
+}
+
+static bfd_boolean
+_bfd_mn10300_elf_object_p (bfd *abfd)
+{
+  bfd_default_set_arch_mach (abfd, bfd_arch_mn10300,
+			     elf_mn10300_mach (elf_elfheader (abfd)->e_flags));
+  return TRUE;
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+
+static bfd_boolean
+_bfd_mn10300_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
+      && bfd_get_mach (obfd) < bfd_get_mach (ibfd))
+    {
+      if (! bfd_set_arch_mach (obfd, bfd_get_arch (ibfd),
+			       bfd_get_mach (ibfd)))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+#define PLT0_ENTRY_SIZE     15
+#define PLT_ENTRY_SIZE      20
+#define PIC_PLT_ENTRY_SIZE  24
+
+static const bfd_byte elf_mn10300_plt0_entry[PLT0_ENTRY_SIZE] =
+{
+  0xfc, 0xa0, 0, 0, 0, 0,	/* mov	(.got+8),a0 */
+  0xfe, 0xe, 0x10, 0, 0, 0, 0,	/* mov	(.got+4),r1 */
+  0xf0, 0xf4,			/* jmp	(a0) */
+};
+
+static const bfd_byte elf_mn10300_plt_entry[PLT_ENTRY_SIZE] =
+{
+  0xfc, 0xa0, 0, 0, 0, 0,	/* mov	(nameN@GOT + .got),a0 */
+  0xf0, 0xf4,			/* jmp	(a0) */
+  0xfe, 8, 0, 0, 0, 0, 0,	/* mov	reloc-table-address,r0 */
+  0xdc, 0, 0, 0, 0,		/* jmp	.plt0 */
+};
+
+static const bfd_byte elf_mn10300_pic_plt_entry[PIC_PLT_ENTRY_SIZE] =
+{
+  0xfc, 0x22, 0, 0, 0, 0,	/* mov	(nameN@GOT,a2),a0 */
+  0xf0, 0xf4,			/* jmp	(a0) */
+  0xfe, 8, 0, 0, 0, 0, 0,	/* mov	reloc-table-address,r0 */
+  0xf8, 0x22, 8,		/* mov	(8,a2),a0 */
+  0xfb, 0xa, 0x1a, 4,		/* mov	(4,a2),r1 */
+  0xf0, 0xf4,			/* jmp	(a0) */
+};
+
+/* Return size of the first PLT entry.  */
+#define elf_mn10300_sizeof_plt0(info) \
+  (info->shared ? PIC_PLT_ENTRY_SIZE : PLT0_ENTRY_SIZE)
+
+/* Return size of a PLT entry.  */
+#define elf_mn10300_sizeof_plt(info) \
+  (info->shared ? PIC_PLT_ENTRY_SIZE : PLT_ENTRY_SIZE)
+
+/* Return offset of the PLT0 address in an absolute PLT entry.  */
+#define elf_mn10300_plt_plt0_offset(info) 16
+
+/* Return offset of the linker in PLT0 entry.  */
+#define elf_mn10300_plt0_linker_offset(info) 2
+
+/* Return offset of the GOT id in PLT0 entry.  */
+#define elf_mn10300_plt0_gotid_offset(info) 9
+
+/* Return offset of the temporary in PLT entry.  */
+#define elf_mn10300_plt_temp_offset(info) 8
+
+/* Return offset of the symbol in PLT entry.  */
+#define elf_mn10300_plt_symbol_offset(info) 2
+
+/* Return offset of the relocation in PLT entry.  */
+#define elf_mn10300_plt_reloc_offset(info) 11
+
+/* The name of the dynamic interpreter.  This is put in the .interp
+   section.  */
+
+#define ELF_DYNAMIC_INTERPRETER "/lib/ld.so.1"
+
+/* Create dynamic sections when linking against a dynamic object.  */
+
+static bfd_boolean
+_bfd_mn10300_elf_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  flagword   flags;
+  asection * s;
+  const struct elf_backend_data * bed = get_elf_backend_data (abfd);
+  int ptralign = 0;
+
+  switch (bed->s->arch_size)
+    {
+    case 32:
+      ptralign = 2;
+      break;
+
+    case 64:
+      ptralign = 3;
+      break;
+
+    default:
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  /* We need to create .plt, .rel[a].plt, .got, .got.plt, .dynbss, and
+     .rel[a].bss sections.  */
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	   | SEC_LINKER_CREATED);
+
+  s = bfd_make_section_with_flags (abfd,
+				   (bed->default_use_rela_p
+				    ? ".rela.plt" : ".rel.plt"),
+				   flags | SEC_READONLY);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, ptralign))
+    return FALSE;
+
+  if (! _bfd_mn10300_elf_create_got_section (abfd, info))
+    return FALSE;
+
+  {
+    const char * secname;
+    char *       relname;
+    flagword     secflags;
+    asection *   sec;
+
+    for (sec = abfd->sections; sec; sec = sec->next)
+      {
+	secflags = bfd_get_section_flags (abfd, sec);
+	if ((secflags & (SEC_DATA | SEC_LINKER_CREATED))
+	    || ((secflags & SEC_HAS_CONTENTS) != SEC_HAS_CONTENTS))
+	  continue;
+
+	secname = bfd_get_section_name (abfd, sec);
+	relname = bfd_malloc (strlen (secname) + 6);
+	strcpy (relname, ".rela");
+	strcat (relname, secname);
+
+	s = bfd_make_section_with_flags (abfd, relname,
+					 flags | SEC_READONLY);
+	if (s == NULL
+	    || ! bfd_set_section_alignment (abfd, s, ptralign))
+	  return FALSE;
+      }
+  }
+
+  if (bed->want_dynbss)
+    {
+      /* The .dynbss section is a place to put symbols which are defined
+	 by dynamic objects, are referenced by regular objects, and are
+	 not functions.  We must allocate space for them in the process
+	 image and use a R_*_COPY reloc to tell the dynamic linker to
+	 initialize them at run time.  The linker script puts the .dynbss
+	 section into the .bss section of the final image.  */
+      s = bfd_make_section_with_flags (abfd, ".dynbss",
+				       SEC_ALLOC | SEC_LINKER_CREATED);
+      if (s == NULL)
+	return FALSE;
+
+      /* The .rel[a].bss section holds copy relocs.  This section is not
+	 normally needed.  We need to create it here, though, so that the
+	 linker will map it to an output section.  We can't just create it
+	 only if we need it, because we will not know whether we need it
+	 until we have seen all the input files, and the first time the
+	 main linker code calls BFD after examining all the input files
+	 (size_dynamic_sections) the input sections have already been
+	 mapped to the output sections.  If the section turns out not to
+	 be needed, we can discard it later.  We will never need this
+	 section when generating a shared object, since they do not use
+	 copy relocs.  */
+      if (! info->shared)
+	{
+	  s = bfd_make_section_with_flags (abfd,
+					   (bed->default_use_rela_p
+					    ? ".rela.bss" : ".rel.bss"),
+					   flags | SEC_READONLY);
+	  if (s == NULL
+	      || ! bfd_set_section_alignment (abfd, s, ptralign))
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+_bfd_mn10300_elf_adjust_dynamic_symbol (struct bfd_link_info * info,
+					struct elf_link_hash_entry * h)
+{
+  bfd * dynobj;
+  asection * s;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (dynobj != NULL
+	      && (h->needs_plt
+		  || h->u.weakdef != NULL
+		  || (h->def_dynamic
+		      && h->ref_regular
+		      && !h->def_regular)));
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later,
+     when we know the address of the .got section.  */
+  if (h->type == STT_FUNC
+      || h->needs_plt)
+    {
+      if (! info->shared
+	  && !h->def_dynamic
+	  && !h->ref_dynamic)
+	{
+	  /* This case can occur if we saw a PLT reloc in an input
+	     file, but the symbol was never referred to by a dynamic
+	     object.  In such a case, we don't actually need to build
+	     a procedure linkage table, and we can just do a REL32
+	     reloc instead.  */
+	  BFD_ASSERT (h->needs_plt);
+	  return TRUE;
+	}
+
+      /* Make sure this symbol is output as a dynamic symbol.  */
+      if (h->dynindx == -1)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      s = bfd_get_section_by_name (dynobj, ".plt");
+      BFD_ASSERT (s != NULL);
+
+      /* If this is the first .plt entry, make room for the special
+	 first entry.  */
+      if (s->size == 0)
+	s->size += elf_mn10300_sizeof_plt0 (info);
+
+      /* If this symbol is not defined in a regular file, and we are
+	 not generating a shared library, then set the symbol to this
+	 location in the .plt.  This is required to make function
+	 pointers compare as equal between the normal executable and
+	 the shared library.  */
+      if (! info->shared
+	  && !h->def_regular)
+	{
+	  h->root.u.def.section = s;
+	  h->root.u.def.value = s->size;
+	}
+
+      h->plt.offset = s->size;
+
+      /* Make room for this entry.  */
+      s->size += elf_mn10300_sizeof_plt (info);
+
+      /* We also need to make an entry in the .got.plt section, which
+	 will be placed in the .got section by the linker script.  */
+      s = bfd_get_section_by_name (dynobj, ".got.plt");
+      BFD_ASSERT (s != NULL);
+      s->size += 4;
+
+      /* We also need to make an entry in the .rela.plt section.  */
+      s = bfd_get_section_by_name (dynobj, ".rela.plt");
+      BFD_ASSERT (s != NULL);
+      s->size += sizeof (Elf32_External_Rela);
+
+      return TRUE;
+    }
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if (!h->non_got_ref)
+    return TRUE;
+
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  s = bfd_get_section_by_name (dynobj, ".dynbss");
+  BFD_ASSERT (s != NULL);
+
+  /* We must generate a R_MN10300_COPY reloc to tell the dynamic linker to
+     copy the initial value out of the dynamic object and into the
+     runtime process image.  We need to remember the offset into the
+     .rela.bss section we are going to use.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      asection * srel;
+
+      srel = bfd_get_section_by_name (dynobj, ".rela.bss");
+      BFD_ASSERT (srel != NULL);
+      srel->size += sizeof (Elf32_External_Rela);
+      h->needs_copy = 1;
+    }
+
+  return _bfd_elf_adjust_dynamic_copy (h, s);
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+_bfd_mn10300_elf_size_dynamic_sections (bfd * output_bfd,
+					struct bfd_link_info * info)
+{
+  bfd * dynobj;
+  asection * s;
+  bfd_boolean plt;
+  bfd_boolean relocs;
+  bfd_boolean reltext;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (s != NULL);
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+  else
+    {
+      /* We may have created entries in the .rela.got section.
+	 However, if we are not creating the dynamic sections, we will
+	 not actually use these entries.  Reset the size of .rela.got,
+	 which will cause it to get stripped from the output file
+	 below.  */
+      s = bfd_get_section_by_name (dynobj, ".rela.got");
+      if (s != NULL)
+	s->size = 0;
+    }
+
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  plt = FALSE;
+  relocs = FALSE;
+  reltext = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      const char * name;
+
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      /* It's OK to base decisions on the section name, because none
+	 of the dynobj section names depend upon the input files.  */
+      name = bfd_get_section_name (dynobj, s);
+
+      if (streq (name, ".plt"))
+	{
+	  /* Remember whether there is a PLT.  */
+	  plt = s->size != 0;
+	}
+      else if (CONST_STRNEQ (name, ".rela"))
+	{
+	  if (s->size != 0)
+	    {
+	      asection * target;
+
+	      /* Remember whether there are any reloc sections other
+		 than .rela.plt.  */
+	      if (! streq (name, ".rela.plt"))
+		{
+		  const char * outname;
+
+		  relocs = TRUE;
+
+		  /* If this relocation section applies to a read only
+		     section, then we probably need a DT_TEXTREL
+		     entry.  The entries in the .rela.plt section
+		     really apply to the .got section, which we
+		     created ourselves and so know is not readonly.  */
+		  outname = bfd_get_section_name (output_bfd,
+						  s->output_section);
+		  target = bfd_get_section_by_name (output_bfd, outname + 5);
+		  if (target != NULL
+		      && (target->flags & SEC_READONLY) != 0
+		      && (target->flags & SEC_ALLOC) != 0)
+		    reltext = TRUE;
+		}
+
+	      /* We use the reloc_count field as a counter if we need
+		 to copy relocs into the output file.  */
+	      s->reloc_count = 0;
+	    }
+	}
+      else if (! CONST_STRNEQ (name, ".got")
+	       && ! streq (name, ".dynbss"))
+	/* It's not one of our sections, so don't allocate space.  */
+	continue;
+
+      if (s->size == 0)
+	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is mostly to handle .rela.bss and
+	     .rela.plt.  We must create both sections in
+	     create_dynamic_sections, because they must be created
+	     before the linker maps input sections to output
+	     sections.  The linker does that before
+	     adjust_dynamic_symbol is called, and it is that
+	     function which decides whether anything needs to go
+	     into these sections.  */
+	  s->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+	if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	  continue;
+
+      /* Allocate memory for the section contents.  We use bfd_zalloc
+	 here in case unused entries are not reclaimed before the
+	 section's contents are written out.  This should not happen,
+	 but this way if it does, we get a R_MN10300_NONE reloc
+	 instead of garbage.  */
+      s->contents = bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in _bfd_mn10300_elf_finish_dynamic_sections,
+	 but we must add the entries now so that we get the correct
+	 size for the .dynamic section.  The DT_DEBUG entry is filled
+	 in by the dynamic linker and used by the debugger.  */
+      if (! info->shared)
+	{
+	  if (!_bfd_elf_add_dynamic_entry (info, DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (plt)
+	{
+	  if (!_bfd_elf_add_dynamic_entry (info, DT_PLTGOT, 0)
+	      || !_bfd_elf_add_dynamic_entry (info, DT_PLTRELSZ, 0)
+	      || !_bfd_elf_add_dynamic_entry (info, DT_PLTREL, DT_RELA)
+	      || !_bfd_elf_add_dynamic_entry (info, DT_JMPREL, 0))
+	    return FALSE;
+	}
+
+      if (relocs)
+	{
+	  if (!_bfd_elf_add_dynamic_entry (info, DT_RELA, 0)
+	      || !_bfd_elf_add_dynamic_entry (info, DT_RELASZ, 0)
+	      || !_bfd_elf_add_dynamic_entry (info, DT_RELAENT,
+					      sizeof (Elf32_External_Rela)))
+	    return FALSE;
+	}
+
+      if (reltext)
+	{
+	  if (!_bfd_elf_add_dynamic_entry (info, DT_TEXTREL, 0))
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+_bfd_mn10300_elf_finish_dynamic_symbol (bfd * output_bfd,
+					struct bfd_link_info * info,
+					struct elf_link_hash_entry * h,
+					Elf_Internal_Sym * sym)
+{
+  bfd * dynobj;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      asection *        splt;
+      asection *        sgot;
+      asection *        srel;
+      bfd_vma           plt_index;
+      bfd_vma           got_offset;
+      Elf_Internal_Rela rel;
+
+      /* This symbol has an entry in the procedure linkage table.  Set
+	 it up.  */
+
+      BFD_ASSERT (h->dynindx != -1);
+
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      sgot = bfd_get_section_by_name (dynobj, ".got.plt");
+      srel = bfd_get_section_by_name (dynobj, ".rela.plt");
+      BFD_ASSERT (splt != NULL && sgot != NULL && srel != NULL);
+
+      /* Get the index in the procedure linkage table which
+	 corresponds to this symbol.  This is the index of this symbol
+	 in all the symbols for which we are making plt entries.  The
+	 first entry in the procedure linkage table is reserved.  */
+      plt_index = ((h->plt.offset - elf_mn10300_sizeof_plt0 (info))
+		   / elf_mn10300_sizeof_plt (info));
+
+      /* Get the offset into the .got table of the entry that
+	 corresponds to this function.  Each .got entry is 4 bytes.
+	 The first three are reserved.  */
+      got_offset = (plt_index + 3) * 4;
+
+      /* Fill in the entry in the procedure linkage table.  */
+      if (! info->shared)
+	{
+	  memcpy (splt->contents + h->plt.offset, elf_mn10300_plt_entry,
+		  elf_mn10300_sizeof_plt (info));
+	  bfd_put_32 (output_bfd,
+		      (sgot->output_section->vma
+		       + sgot->output_offset
+		       + got_offset),
+		      (splt->contents + h->plt.offset
+		       + elf_mn10300_plt_symbol_offset (info)));
+
+	  bfd_put_32 (output_bfd,
+		      (1 - h->plt.offset - elf_mn10300_plt_plt0_offset (info)),
+		      (splt->contents + h->plt.offset
+		       + elf_mn10300_plt_plt0_offset (info)));
+	}
+      else
+	{
+	  memcpy (splt->contents + h->plt.offset, elf_mn10300_pic_plt_entry,
+		  elf_mn10300_sizeof_plt (info));
+
+	  bfd_put_32 (output_bfd, got_offset,
+		      (splt->contents + h->plt.offset
+		       + elf_mn10300_plt_symbol_offset (info)));
+	}
+
+      bfd_put_32 (output_bfd, plt_index * sizeof (Elf32_External_Rela),
+		  (splt->contents + h->plt.offset
+		   + elf_mn10300_plt_reloc_offset (info)));
+
+      /* Fill in the entry in the global offset table.  */
+      bfd_put_32 (output_bfd,
+		  (splt->output_section->vma
+		   + splt->output_offset
+		   + h->plt.offset
+		   + elf_mn10300_plt_temp_offset (info)),
+		  sgot->contents + got_offset);
+
+      /* Fill in the entry in the .rela.plt section.  */
+      rel.r_offset = (sgot->output_section->vma
+		      + sgot->output_offset
+		      + got_offset);
+      rel.r_info = ELF32_R_INFO (h->dynindx, R_MN10300_JMP_SLOT);
+      rel.r_addend = 0;
+      bfd_elf32_swap_reloca_out (output_bfd, &rel,
+				 (bfd_byte *) ((Elf32_External_Rela *) srel->contents
+					       + plt_index));
+
+      if (!h->def_regular)
+	/* Mark the symbol as undefined, rather than as defined in
+	   the .plt section.  Leave the value alone.  */
+	sym->st_shndx = SHN_UNDEF;
+    }
+
+  if (h->got.offset != (bfd_vma) -1)
+    {
+      asection *        sgot;
+      asection *        srel;
+      Elf_Internal_Rela rel;
+
+      /* This symbol has an entry in the global offset table.  Set it up.  */
+      sgot = bfd_get_section_by_name (dynobj, ".got");
+      srel = bfd_get_section_by_name (dynobj, ".rela.got");
+      BFD_ASSERT (sgot != NULL && srel != NULL);
+
+      rel.r_offset = (sgot->output_section->vma
+		      + sgot->output_offset
+		      + (h->got.offset & ~1));
+
+      /* If this is a -Bsymbolic link, and the symbol is defined
+	 locally, we just want to emit a RELATIVE reloc.  Likewise if
+	 the symbol was forced to be local because of a version file.
+	 The entry in the global offset table will already have been
+	 initialized in the relocate_section function.  */
+      if (info->shared
+	  && (info->symbolic || h->dynindx == -1)
+	  && h->def_regular)
+	{
+	  rel.r_info = ELF32_R_INFO (0, R_MN10300_RELATIVE);
+	  rel.r_addend = (h->root.u.def.value
+			  + h->root.u.def.section->output_section->vma
+			  + h->root.u.def.section->output_offset);
+	}
+      else
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + h->got.offset);
+	  rel.r_info = ELF32_R_INFO (h->dynindx, R_MN10300_GLOB_DAT);
+	  rel.r_addend = 0;
+	}
+
+      bfd_elf32_swap_reloca_out (output_bfd, &rel,
+				 (bfd_byte *) ((Elf32_External_Rela *) srel->contents
+					       + srel->reloc_count));
+      ++ srel->reloc_count;
+    }
+
+  if (h->needs_copy)
+    {
+      asection *        s;
+      Elf_Internal_Rela rel;
+
+      /* This symbol needs a copy reloc.  Set it up.  */
+      BFD_ASSERT (h->dynindx != -1
+		  && (h->root.type == bfd_link_hash_defined
+		      || h->root.type == bfd_link_hash_defweak));
+
+      s = bfd_get_section_by_name (h->root.u.def.section->owner,
+				   ".rela.bss");
+      BFD_ASSERT (s != NULL);
+
+      rel.r_offset = (h->root.u.def.value
+		      + h->root.u.def.section->output_section->vma
+		      + h->root.u.def.section->output_offset);
+      rel.r_info = ELF32_R_INFO (h->dynindx, R_MN10300_COPY);
+      rel.r_addend = 0;
+      bfd_elf32_swap_reloca_out (output_bfd, & rel,
+				 (bfd_byte *) ((Elf32_External_Rela *) s->contents
+					       + s->reloc_count));
+      ++ s->reloc_count;
+    }
+
+  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
+  if (streq (h->root.root.string, "_DYNAMIC")
+      || h == elf_hash_table (info)->hgot)
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+_bfd_mn10300_elf_finish_dynamic_sections (bfd * output_bfd,
+					  struct bfd_link_info * info)
+{
+  bfd *      dynobj;
+  asection * sgot;
+  asection * sdyn;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  sgot = bfd_get_section_by_name (dynobj, ".got.plt");
+  BFD_ASSERT (sgot != NULL);
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      asection *           splt;
+      Elf32_External_Dyn * dyncon;
+      Elf32_External_Dyn * dynconend;
+
+      BFD_ASSERT (sdyn != NULL);
+
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+	  const char * name;
+	  asection * s;
+
+	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    default:
+	      break;
+
+	    case DT_PLTGOT:
+	      name = ".got";
+	      goto get_vma;
+
+	    case DT_JMPREL:
+	      name = ".rela.plt";
+	    get_vma:
+	      s = bfd_get_section_by_name (output_bfd, name);
+	      BFD_ASSERT (s != NULL);
+	      dyn.d_un.d_ptr = s->vma;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_PLTRELSZ:
+	      s = bfd_get_section_by_name (output_bfd, ".rela.plt");
+	      BFD_ASSERT (s != NULL);
+	      dyn.d_un.d_val = s->size;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_RELASZ:
+	      /* My reading of the SVR4 ABI indicates that the
+		 procedure linkage table relocs (DT_JMPREL) should be
+		 included in the overall relocs (DT_RELA).  This is
+		 what Solaris does.  However, UnixWare can not handle
+		 that case.  Therefore, we override the DT_RELASZ entry
+		 here to make it not include the JMPREL relocs.  Since
+		 the linker script arranges for .rela.plt to follow all
+		 other relocation sections, we don't have to worry
+		 about changing the DT_RELA entry.  */
+	      s = bfd_get_section_by_name (output_bfd, ".rela.plt");
+	      if (s != NULL)
+		dyn.d_un.d_val -= s->size;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+	    }
+	}
+
+      /* Fill in the first entry in the procedure linkage table.  */
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      if (splt && splt->size > 0)
+	{
+	  if (info->shared)
+	    {
+	      memcpy (splt->contents, elf_mn10300_pic_plt_entry,
+		      elf_mn10300_sizeof_plt (info));
+	    }
+	  else
+	    {
+	      memcpy (splt->contents, elf_mn10300_plt0_entry, PLT0_ENTRY_SIZE);
+	      bfd_put_32 (output_bfd,
+			  sgot->output_section->vma + sgot->output_offset + 4,
+			  splt->contents + elf_mn10300_plt0_gotid_offset (info));
+	      bfd_put_32 (output_bfd,
+			  sgot->output_section->vma + sgot->output_offset + 8,
+			  splt->contents + elf_mn10300_plt0_linker_offset (info));
+	    }
+
+	  /* UnixWare sets the entsize of .plt to 4, although that doesn't
+	     really seem like the right value.  */
+	  elf_section_data (splt->output_section)->this_hdr.sh_entsize = 4;
+	}
+    }
+
+  /* Fill in the first three entries in the global offset table.  */
+  if (sgot->size > 0)
+    {
+      if (sdyn == NULL)
+	bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents);
+      else
+	bfd_put_32 (output_bfd,
+		    sdyn->output_section->vma + sdyn->output_offset,
+		    sgot->contents);
+      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 4);
+      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 8);
+    }
+
+  elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
+
+  return TRUE;
+}
+
+/* Classify relocation types, such that combreloc can sort them
+   properly.  */
+
+static enum elf_reloc_type_class
+_bfd_mn10300_elf_reloc_type_class (const Elf_Internal_Rela *rela)
+{
+  switch ((int) ELF32_R_TYPE (rela->r_info))
+    {
+    case R_MN10300_RELATIVE:	return reloc_class_relative;
+    case R_MN10300_JMP_SLOT:	return reloc_class_plt;
+    case R_MN10300_COPY:	return reloc_class_copy;
+    default:			return reloc_class_normal;
+    }
+}
+
+/* Allocate space for an MN10300 extension to the bfd elf data structure.  */
+
+static bfd_boolean
+mn10300_elf_mkobject (bfd *abfd)
+{
+  /* We do not actually need any extra room in the bfd elf data structure.
+     But we do need the object_id of the structure to be set to
+     MN10300_ELF_DATA so that elflink.c:elf_link_add_object_symols() will call
+     our mn10300_elf_check_relocs function which will then allocate space in
+     the .got section for any GOT based relocs.  */
+  return bfd_elf_allocate_object (abfd, sizeof (struct elf_obj_tdata),
+				  MN10300_ELF_DATA);
+}
+
+#define bfd_elf32_mkobject	mn10300_elf_mkobject
+
+#ifndef ELF_ARCH
+#define TARGET_LITTLE_SYM	bfd_elf32_mn10300_vec
+#define TARGET_LITTLE_NAME	"elf32-mn10300"
+#define ELF_ARCH		bfd_arch_mn10300
+#define ELF_TARGET_ID		MN10300_ELF_DATA
+#define ELF_MACHINE_CODE	EM_MN10300
+#define ELF_MACHINE_ALT1	EM_CYGNUS_MN10300
+#define ELF_MAXPAGESIZE		0x1000
+#endif
+
+#define elf_info_to_howto		mn10300_info_to_howto
+#define elf_info_to_howto_rel		0
+#define elf_backend_can_gc_sections	1
+#define elf_backend_rela_normal		1
+#define elf_backend_check_relocs	mn10300_elf_check_relocs
+#define elf_backend_gc_mark_hook	mn10300_elf_gc_mark_hook
+#define elf_backend_relocate_section	mn10300_elf_relocate_section
+#define bfd_elf32_bfd_relax_section	mn10300_elf_relax_section
+#define bfd_elf32_bfd_get_relocated_section_contents \
+				mn10300_elf_get_relocated_section_contents
+#define bfd_elf32_bfd_link_hash_table_create \
+				elf32_mn10300_link_hash_table_create
+#define bfd_elf32_bfd_link_hash_table_free \
+				elf32_mn10300_link_hash_table_free
+
+#ifndef elf_symbol_leading_char
+#define elf_symbol_leading_char '_'
+#endif
+
+/* So we can set bits in e_flags.  */
+#define elf_backend_final_write_processing \
+					_bfd_mn10300_elf_final_write_processing
+#define elf_backend_object_p		_bfd_mn10300_elf_object_p
+
+#define bfd_elf32_bfd_merge_private_bfd_data \
+					_bfd_mn10300_elf_merge_private_bfd_data
+
+#define elf_backend_can_gc_sections	1
+#define elf_backend_create_dynamic_sections \
+  _bfd_mn10300_elf_create_dynamic_sections
+#define elf_backend_adjust_dynamic_symbol \
+  _bfd_mn10300_elf_adjust_dynamic_symbol
+#define elf_backend_size_dynamic_sections \
+  _bfd_mn10300_elf_size_dynamic_sections
+#define elf_backend_omit_section_dynsym \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true)
+#define elf_backend_finish_dynamic_symbol \
+  _bfd_mn10300_elf_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections \
+  _bfd_mn10300_elf_finish_dynamic_sections
+
+#define elf_backend_reloc_type_class \
+  _bfd_mn10300_elf_reloc_type_class
+
+#define elf_backend_want_got_plt	1
+#define elf_backend_plt_readonly	1
+#define elf_backend_want_plt_sym	0
+#define elf_backend_got_header_size	12
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf-strtab.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf-strtab.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf-strtab.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf-strtab.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,395 @@
+/* ELF strtab with GC and suffix merging support.
+   Copyright 2001, 2002, 2003, 2005, 2006, 2007, 2008
+   Free Software Foundation, Inc.
+   Written by Jakub Jelinek <jakub@redhat.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "hashtab.h"
+#include "libiberty.h"
+
+/* An entry in the strtab hash table.  */
+
+struct elf_strtab_hash_entry
+{
+  struct bfd_hash_entry root;
+  /* Length of this entry.  This includes the zero terminator.  */
+  int len;
+  unsigned int refcount;
+  union {
+    /* Index within the merged section.  */
+    bfd_size_type index;
+    /* Entry this is a suffix of (if len < 0).  */
+    struct elf_strtab_hash_entry *suffix;
+  } u;
+};
+
+/* The strtab hash table.  */
+
+struct elf_strtab_hash
+{
+  struct bfd_hash_table table;
+  /* Next available index.  */
+  bfd_size_type size;
+  /* Number of array entries alloced.  */
+  bfd_size_type alloced;
+  /* Final strtab size.  */
+  bfd_size_type sec_size;
+  /* Array of pointers to strtab entries.  */
+  struct elf_strtab_hash_entry **array;
+};
+
+/* Routine to create an entry in a section merge hashtab.  */
+
+static struct bfd_hash_entry *
+elf_strtab_hash_newfunc (struct bfd_hash_entry *entry,
+			 struct bfd_hash_table *table,
+			 const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    entry = (struct bfd_hash_entry *)
+        bfd_hash_allocate (table, sizeof (struct elf_strtab_hash_entry));
+  if (entry == NULL)
+    return NULL;
+
+  /* Call the allocation method of the superclass.  */
+  entry = bfd_hash_newfunc (entry, table, string);
+
+  if (entry)
+    {
+      /* Initialize the local fields.  */
+      struct elf_strtab_hash_entry *ret;
+
+      ret = (struct elf_strtab_hash_entry *) entry;
+      ret->u.index = -1;
+      ret->refcount = 0;
+      ret->len = 0;
+    }
+
+  return entry;
+}
+
+/* Create a new hash table.  */
+
+struct elf_strtab_hash *
+_bfd_elf_strtab_init (void)
+{
+  struct elf_strtab_hash *table;
+  bfd_size_type amt = sizeof (struct elf_strtab_hash);
+
+  table = (struct elf_strtab_hash *) bfd_malloc (amt);
+  if (table == NULL)
+    return NULL;
+
+  if (!bfd_hash_table_init (&table->table, elf_strtab_hash_newfunc,
+			    sizeof (struct elf_strtab_hash_entry)))
+    {
+      free (table);
+      return NULL;
+    }
+
+  table->sec_size = 0;
+  table->size = 1;
+  table->alloced = 64;
+  amt = sizeof (struct elf_strtab_hasn_entry *);
+  table->array = (struct elf_strtab_hash_entry **)
+      bfd_malloc (table->alloced * amt);
+  if (table->array == NULL)
+    {
+      free (table);
+      return NULL;
+    }
+
+  table->array[0] = NULL;
+
+  return table;
+}
+
+/* Free a strtab.  */
+
+void
+_bfd_elf_strtab_free (struct elf_strtab_hash *tab)
+{
+  bfd_hash_table_free (&tab->table);
+  free (tab->array);
+  free (tab);
+}
+
+/* Get the index of an entity in a hash table, adding it if it is not
+   already present.  */
+
+bfd_size_type
+_bfd_elf_strtab_add (struct elf_strtab_hash *tab,
+		     const char *str,
+		     bfd_boolean copy)
+{
+  register struct elf_strtab_hash_entry *entry;
+
+  /* We handle this specially, since we don't want to do refcounting
+     on it.  */
+  if (*str == '\0')
+    return 0;
+
+  BFD_ASSERT (tab->sec_size == 0);
+  entry = (struct elf_strtab_hash_entry *)
+	  bfd_hash_lookup (&tab->table, str, TRUE, copy);
+
+  if (entry == NULL)
+    return (bfd_size_type) -1;
+
+  entry->refcount++;
+  if (entry->len == 0)
+    {
+      entry->len = strlen (str) + 1;
+      /* 2G strings lose.  */
+      BFD_ASSERT (entry->len > 0);
+      if (tab->size == tab->alloced)
+	{
+	  bfd_size_type amt = sizeof (struct elf_strtab_hash_entry *);
+	  tab->alloced *= 2;
+	  tab->array = (struct elf_strtab_hash_entry **)
+              bfd_realloc_or_free (tab->array, tab->alloced * amt);
+	  if (tab->array == NULL)
+	    return (bfd_size_type) -1;
+	}
+
+      entry->u.index = tab->size++;
+      tab->array[entry->u.index] = entry;
+    }
+  return entry->u.index;
+}
+
+void
+_bfd_elf_strtab_addref (struct elf_strtab_hash *tab, bfd_size_type idx)
+{
+  if (idx == 0 || idx == (bfd_size_type) -1)
+    return;
+  BFD_ASSERT (tab->sec_size == 0);
+  BFD_ASSERT (idx < tab->size);
+  ++tab->array[idx]->refcount;
+}
+
+void
+_bfd_elf_strtab_delref (struct elf_strtab_hash *tab, bfd_size_type idx)
+{
+  if (idx == 0 || idx == (bfd_size_type) -1)
+    return;
+  BFD_ASSERT (tab->sec_size == 0);
+  BFD_ASSERT (idx < tab->size);
+  BFD_ASSERT (tab->array[idx]->refcount > 0);
+  --tab->array[idx]->refcount;
+}
+
+void
+_bfd_elf_strtab_clear_all_refs (struct elf_strtab_hash *tab)
+{
+  bfd_size_type idx;
+
+  for (idx = 1; idx < tab->size; ++idx)
+    tab->array[idx]->refcount = 0;
+}
+
+bfd_size_type
+_bfd_elf_strtab_size (struct elf_strtab_hash *tab)
+{
+  return tab->sec_size ? tab->sec_size : tab->size;
+}
+
+bfd_size_type
+_bfd_elf_strtab_offset (struct elf_strtab_hash *tab, bfd_size_type idx)
+{
+  struct elf_strtab_hash_entry *entry;
+
+  if (idx == 0)
+    return 0;
+  BFD_ASSERT (idx < tab->size);
+  BFD_ASSERT (tab->sec_size);
+  entry = tab->array[idx];
+  BFD_ASSERT (entry->refcount > 0);
+  entry->refcount--;
+  return tab->array[idx]->u.index;
+}
+
+bfd_boolean
+_bfd_elf_strtab_emit (register bfd *abfd, struct elf_strtab_hash *tab)
+{
+  bfd_size_type off = 1, i;
+
+  if (bfd_bwrite ("", 1, abfd) != 1)
+    return FALSE;
+
+  for (i = 1; i < tab->size; ++i)
+    {
+      register const char *str;
+      register unsigned int len;
+
+      BFD_ASSERT (tab->array[i]->refcount == 0);
+      len = tab->array[i]->len;
+      if ((int) len < 0)
+	continue;
+
+      str = tab->array[i]->root.string;
+      if (bfd_bwrite (str, len, abfd) != len)
+	return FALSE;
+
+      off += len;
+    }
+
+  BFD_ASSERT (off == tab->sec_size);
+  return TRUE;
+}
+
+/* Compare two elf_strtab_hash_entry structures.  Called via qsort.  */
+
+static int
+strrevcmp (const void *a, const void *b)
+{
+  struct elf_strtab_hash_entry *A = *(struct elf_strtab_hash_entry **) a;
+  struct elf_strtab_hash_entry *B = *(struct elf_strtab_hash_entry **) b;
+  unsigned int lenA = A->len;
+  unsigned int lenB = B->len;
+  const unsigned char *s = (const unsigned char *) A->root.string + lenA - 1;
+  const unsigned char *t = (const unsigned char *) B->root.string + lenB - 1;
+  int l = lenA < lenB ? lenA : lenB;
+
+  while (l)
+    {
+      if (*s != *t)
+	return (int) *s - (int) *t;
+      s--;
+      t--;
+      l--;
+    }
+  return lenA - lenB;
+}
+
+static inline int
+is_suffix (const struct elf_strtab_hash_entry *A,
+	   const struct elf_strtab_hash_entry *B)
+{
+  if (A->len <= B->len)
+    /* B cannot be a suffix of A unless A is equal to B, which is guaranteed
+       not to be equal by the hash table.  */
+    return 0;
+
+  return memcmp (A->root.string + (A->len - B->len),
+		 B->root.string, B->len - 1) == 0;
+}
+
+/* This function assigns final string table offsets for used strings,
+   merging strings matching suffixes of longer strings if possible.  */
+
+void
+_bfd_elf_strtab_finalize (struct elf_strtab_hash *tab)
+{
+  struct elf_strtab_hash_entry **array, **a, *e;
+  bfd_size_type size, amt;
+
+  /* GCC 2.91.66 (egcs-1.1.2) on i386 miscompiles this function when i is
+     a 64-bit bfd_size_type: a 64-bit target or --enable-64-bit-bfd.
+     Besides, indexing with a long long wouldn't give anything but extra
+     cycles.  */
+  size_t i;
+
+  /* Sort the strings by suffix and length.  */
+  amt = tab->size * sizeof (struct elf_strtab_hash_entry *);
+  array = (struct elf_strtab_hash_entry **) bfd_malloc (amt);
+  if (array == NULL)
+    goto alloc_failure;
+
+  for (i = 1, a = array; i < tab->size; ++i)
+    {
+      e = tab->array[i];
+      if (e->refcount)
+	{
+	  *a++ = e;
+	  /* Adjust the length to not include the zero terminator.  */
+	  e->len -= 1;
+	}
+      else
+	e->len = 0;
+    }
+
+  size = a - array;
+  if (size != 0)
+    {
+      qsort (array, size, sizeof (struct elf_strtab_hash_entry *), strrevcmp);
+
+      /* Loop over the sorted array and merge suffixes.  Start from the
+	 end because we want eg.
+
+	 s1 -> "d"
+	 s2 -> "bcd"
+	 s3 -> "abcd"
+
+	 to end up as
+
+	 s3 -> "abcd"
+	 s2 _____^
+	 s1 _______^
+
+	 ie. we don't want s1 pointing into the old s2.  */
+      e = *--a;
+      e->len += 1;
+      while (--a >= array)
+	{
+	  struct elf_strtab_hash_entry *cmp = *a;
+
+	  cmp->len += 1;
+	  if (is_suffix (e, cmp))
+	    {
+	      cmp->u.suffix = e;
+	      cmp->len = -cmp->len;
+	    }
+	  else
+	    e = cmp;
+	}
+    }
+
+alloc_failure:
+  if (array)
+    free (array);
+
+  /* Assign positions to the strings we want to keep.  */
+  size = 1;
+  for (i = 1; i < tab->size; ++i)
+    {
+      e = tab->array[i];
+      if (e->refcount && e->len > 0)
+	{
+	  e->u.index = size;
+	  size += e->len;
+	}
+    }
+
+  tab->sec_size = size;
+
+  /* Adjust the rest.  */
+  for (i = 1; i < tab->size; ++i)
+    {
+      e = tab->array[i];
+      if (e->refcount && e->len < 0)
+	e->u.index = e->u.suffix->u.index + (e->u.suffix->len + e->len);
+    }
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf-vxworks.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf-vxworks.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf-vxworks.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf-vxworks.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,299 @@
+/* VxWorks support for ELF
+   Copyright 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+   MA 02111-1307, USA.  */
+
+/* This file provides routines used by all VxWorks targets.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf-vxworks.h"
+#include "elf/vxworks.h"
+
+/* Return true if symbol NAME, as defined by ABFD, is one of the special
+   __GOTT_BASE__ or __GOTT_INDEX__ symbols.  */
+
+static bfd_boolean
+elf_vxworks_gott_symbol_p (bfd *abfd, const char *name)
+{
+  char leading;
+
+  leading = bfd_get_symbol_leading_char (abfd);
+  if (leading)
+    {
+      if (*name != leading)
+	return FALSE;
+      name++;
+    }
+  return (strcmp (name, "__GOTT_BASE__") == 0
+	  || strcmp (name, "__GOTT_INDEX__") == 0);
+}
+
+/* Tweak magic VxWorks symbols as they are loaded.  */
+bfd_boolean
+elf_vxworks_add_symbol_hook (bfd *abfd,
+			     struct bfd_link_info *info,
+			     Elf_Internal_Sym *sym,
+			     const char **namep,
+			     flagword *flagsp,
+			     asection **secp ATTRIBUTE_UNUSED,
+			     bfd_vma *valp ATTRIBUTE_UNUSED)
+{
+  /* Ideally these "magic" symbols would be exported by libc.so.1
+     which would be found via a DT_NEEDED tag, and then handled
+     specially by the linker at runtime.  Except shared libraries
+     don't even link to libc.so.1 by default...
+     If the symbol is imported from, or will be put in a shared library,
+     give the symbol weak binding to get the desired samantics.
+     This transformation will be undone in
+     elf_i386_vxworks_link_output_symbol_hook. */
+  if ((info->shared || abfd->flags & DYNAMIC)
+      && elf_vxworks_gott_symbol_p (abfd, *namep))
+    {
+      sym->st_info = ELF_ST_INFO (STB_WEAK, ELF_ST_TYPE (sym->st_info));
+      *flagsp |= BSF_WEAK;
+    }
+
+  return TRUE;
+}
+
+/* Perform VxWorks-specific handling of the create_dynamic_sections hook.
+   When creating an executable, set *SRELPLT2_OUT to the .rel(a).plt.unloaded
+   section.  */
+
+bfd_boolean
+elf_vxworks_create_dynamic_sections (bfd *dynobj, struct bfd_link_info *info,
+				     asection **srelplt2_out)
+{
+  struct elf_link_hash_table *htab;
+  const struct elf_backend_data *bed;
+  asection *s;
+
+  htab = elf_hash_table (info);
+  bed = get_elf_backend_data (dynobj);
+
+  if (!info->shared)
+    {
+      s = bfd_make_section_with_flags (dynobj,
+				       bed->default_use_rela_p
+				       ? ".rela.plt.unloaded"
+				       : ".rel.plt.unloaded",
+				       SEC_HAS_CONTENTS | SEC_IN_MEMORY
+				       | SEC_READONLY | SEC_LINKER_CREATED);
+      if (s == NULL
+	  || !bfd_set_section_alignment (dynobj, s, bed->s->log_file_align))
+	return FALSE;
+
+      *srelplt2_out = s;
+    }
+
+  /* Mark the GOT and PLT symbols as having relocations; they might
+     not, but we won't know for sure until we build the GOT in
+     finish_dynamic_symbol.  Also make sure that the GOT symbol
+     is entered into the dynamic symbol table; the loader uses it
+     to initialize __GOTT_BASE__[__GOTT_INDEX__].  */
+  if (htab->hgot)
+    {
+      htab->hgot->indx = -2;
+      htab->hgot->other &= ~ELF_ST_VISIBILITY (-1);
+      htab->hgot->forced_local = 0;
+      if (!bfd_elf_link_record_dynamic_symbol (info, htab->hgot))
+	return FALSE;
+    }
+  if (htab->hplt)
+    {
+      htab->hplt->indx = -2;
+      htab->hplt->type = STT_FUNC;
+    }
+
+  return TRUE;
+}
+
+/* Tweak magic VxWorks symbols as they are written to the output file.  */
+int
+elf_vxworks_link_output_symbol_hook (struct bfd_link_info *info
+				       ATTRIBUTE_UNUSED,
+				     const char *name,
+				     Elf_Internal_Sym *sym,
+				     asection *input_sec ATTRIBUTE_UNUSED,
+				     struct elf_link_hash_entry *h)
+{
+  /* Reverse the effects of the hack in elf_vxworks_add_symbol_hook.  */
+  if (h
+      && h->root.type == bfd_link_hash_undefweak
+      && elf_vxworks_gott_symbol_p (h->root.u.undef.abfd, name))
+    sym->st_info = ELF_ST_INFO (STB_GLOBAL, ELF_ST_TYPE (sym->st_info));
+
+  return 1;
+}
+
+/* Copy relocations into the output file.  Fixes up relocations against PLT
+   entries, then calls the generic routine.  */
+
+bfd_boolean
+elf_vxworks_emit_relocs (bfd *output_bfd,
+			 asection *input_section,
+			 Elf_Internal_Shdr *input_rel_hdr,
+			 Elf_Internal_Rela *internal_relocs,
+			 struct elf_link_hash_entry **rel_hash)
+{
+  const struct elf_backend_data *bed;
+  int j;
+
+  bed = get_elf_backend_data (output_bfd);
+
+  if (output_bfd->flags & (DYNAMIC|EXEC_P))
+    {
+      Elf_Internal_Rela *irela;
+      Elf_Internal_Rela *irelaend;
+      struct elf_link_hash_entry **hash_ptr;
+
+      for (irela = internal_relocs,
+	     irelaend = irela + (NUM_SHDR_ENTRIES (input_rel_hdr)
+				 * bed->s->int_rels_per_ext_rel),
+	     hash_ptr = rel_hash;
+	   irela < irelaend;
+	   irela += bed->s->int_rels_per_ext_rel,
+	     hash_ptr++)
+	{
+	  if (*hash_ptr
+	      && (*hash_ptr)->def_dynamic
+	      && !(*hash_ptr)->def_regular
+	      && ((*hash_ptr)->root.type == bfd_link_hash_defined
+		  || (*hash_ptr)->root.type == bfd_link_hash_defweak)
+	      && (*hash_ptr)->root.u.def.section->output_section != NULL)
+	    {
+	      /* This is a relocation from an executable or shared
+	         library against a symbol in a different shared
+	         library.  We are creating a definition in the output
+	         file but it does not come from any of our normal (.o)
+	         files. ie. a PLT stub.  Normally this would be a
+	         relocation against against SHN_UNDEF with the VMA of
+	         the PLT stub.  This upsets the VxWorks loader.
+	         Convert it to a section-relative relocation.  This
+	         gets some other symbols (for instance .dynbss), but
+	         is conservatively correct.  */
+	      for (j = 0; j < bed->s->int_rels_per_ext_rel; j++)
+		{
+		  asection *sec = (*hash_ptr)->root.u.def.section;
+		  int this_idx = sec->output_section->target_index;
+		  
+		  irela[j].r_info
+		    = ELF32_R_INFO (this_idx, ELF32_R_TYPE (irela[j].r_info));
+		  irela[j].r_addend += (*hash_ptr)->root.u.def.value;
+		  irela[j].r_addend += sec->output_offset;
+		}
+	      /* Stop the generic routine adjusting this entry.  */
+	      *hash_ptr = NULL;
+	    }
+	}
+    }
+  return _bfd_elf_link_output_relocs (output_bfd, input_section,
+				      input_rel_hdr, internal_relocs,
+				      rel_hash);
+}
+
+
+/* Set the sh_link and sh_info fields on the static plt relocation secton.  */
+
+void
+elf_vxworks_final_write_processing (bfd *abfd,
+				    bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  asection * sec;
+  struct bfd_elf_section_data *d;
+
+  sec = bfd_get_section_by_name (abfd, ".rel.plt.unloaded");
+  if (!sec)
+    sec = bfd_get_section_by_name (abfd, ".rela.plt.unloaded");
+  if (!sec)
+    return;
+  d = elf_section_data (sec);
+  d->this_hdr.sh_link = elf_tdata (abfd)->symtab_section;
+  sec = bfd_get_section_by_name (abfd, ".plt");
+  if (sec)
+    d->this_hdr.sh_info = elf_section_data (sec)->this_idx;
+}
+
+/* Add the dynamic entries required by VxWorks.  These point to the
+   tls sections.  */
+
+bfd_boolean
+elf_vxworks_add_dynamic_entries (bfd *output_bfd, struct bfd_link_info *info)
+{
+  if (bfd_get_section_by_name (output_bfd, ".tls_data"))
+    {
+      if (!_bfd_elf_add_dynamic_entry (info, DT_VX_WRS_TLS_DATA_START, 0)
+	  || !_bfd_elf_add_dynamic_entry (info, DT_VX_WRS_TLS_DATA_SIZE, 0)
+	  || !_bfd_elf_add_dynamic_entry (info, DT_VX_WRS_TLS_DATA_ALIGN, 0))
+	return FALSE;
+    }
+  if (bfd_get_section_by_name (output_bfd, ".tls_vars"))
+    {
+      if (!_bfd_elf_add_dynamic_entry (info, DT_VX_WRS_TLS_VARS_START, 0)
+	  || !_bfd_elf_add_dynamic_entry (info, DT_VX_WRS_TLS_VARS_SIZE, 0))
+	return FALSE;
+    }
+  return TRUE;
+}
+
+/* If *DYN is one of the VxWorks-specific dynamic entries, then fill
+   in the value now  and return TRUE.  Otherwise return FALSE.  */
+
+bfd_boolean
+elf_vxworks_finish_dynamic_entry (bfd *output_bfd, Elf_Internal_Dyn *dyn)
+{
+  asection *sec;
+  
+  switch (dyn->d_tag)
+    {
+    default:
+      return FALSE;
+      
+    case DT_VX_WRS_TLS_DATA_START:
+      sec = bfd_get_section_by_name (output_bfd, ".tls_data");
+      dyn->d_un.d_ptr = sec->vma;
+      break;
+      
+    case DT_VX_WRS_TLS_DATA_SIZE:
+      sec = bfd_get_section_by_name (output_bfd, ".tls_data");
+      dyn->d_un.d_val = sec->size;
+      break;
+      
+    case DT_VX_WRS_TLS_DATA_ALIGN:
+      sec = bfd_get_section_by_name (output_bfd, ".tls_data");
+      dyn->d_un.d_val
+	= (bfd_size_type)1 << bfd_get_section_alignment (abfd, sec);
+      break;
+      
+    case DT_VX_WRS_TLS_VARS_START:
+      sec = bfd_get_section_by_name (output_bfd, ".tls_vars");
+      dyn->d_un.d_ptr = sec->vma;
+      break;
+      
+    case DT_VX_WRS_TLS_VARS_SIZE:
+      sec = bfd_get_section_by_name (output_bfd, ".tls_vars");
+      dyn->d_un.d_val = sec->size;
+      break;
+    }
+  return TRUE;
+}
+
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf-vxworks.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf-vxworks.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf-vxworks.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf-vxworks.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,38 @@
+/* VxWorks support for ELF
+   Copyright 2005, 2006, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+   MA 02111-1307, USA.  */
+
+#include "elf/common.h"
+#include "elf/internal.h"
+
+bfd_boolean elf_vxworks_add_symbol_hook
+  (bfd *, struct bfd_link_info *, Elf_Internal_Sym *, const char **,
+   flagword *, asection **, bfd_vma *);
+bfd_boolean elf_vxworks_link_output_symbol_hook
+  (struct bfd_link_info *, const char *name, Elf_Internal_Sym *,
+   asection *, struct elf_link_hash_entry *);
+bfd_boolean elf_vxworks_emit_relocs
+  (bfd *, asection *, Elf_Internal_Shdr *, Elf_Internal_Rela *,
+   struct elf_link_hash_entry **);
+void elf_vxworks_final_write_processing (bfd *, bfd_boolean);
+bfd_boolean elf_vxworks_create_dynamic_sections
+  (bfd *, struct bfd_link_info *, asection **);
+bfd_boolean elf_vxworks_add_dynamic_entries (bfd *, struct bfd_link_info *);
+bfd_boolean elf_vxworks_finish_dynamic_entry (bfd *, Elf_Internal_Dyn *);
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,9630 @@
+/* ELF executable support for BFD.
+
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/*
+SECTION
+	ELF backends
+
+	BFD support for ELF formats is being worked on.
+	Currently, the best supported back ends are for sparc and i386
+	(running svr4 or Solaris 2).
+
+	Documentation of the internals of the support code still needs
+	to be written.  The code is changing quickly enough that we
+	haven't bothered yet.  */
+
+/* For sparc64-cross-sparc32.  */
+#define _SYSCALL32
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#define ARCH_SIZE 0
+#include "elf-bfd.h"
+#include "libiberty.h"
+#include "safe-ctype.h"
+
+#ifdef CORE_HEADER
+#include CORE_HEADER
+#endif
+
+static int elf_sort_sections (const void *, const void *);
+static bfd_boolean assign_file_positions_except_relocs (bfd *, struct bfd_link_info *);
+static bfd_boolean prep_headers (bfd *);
+static bfd_boolean swap_out_syms (bfd *, struct bfd_strtab_hash **, int) ;
+static bfd_boolean elf_read_notes (bfd *, file_ptr, bfd_size_type) ;
+static bfd_boolean elf_parse_notes (bfd *abfd, char *buf, size_t size,
+				    file_ptr offset);
+
+/* Swap version information in and out.  The version information is
+   currently size independent.  If that ever changes, this code will
+   need to move into elfcode.h.  */
+
+/* Swap in a Verdef structure.  */
+
+void
+_bfd_elf_swap_verdef_in (bfd *abfd,
+			 const Elf_External_Verdef *src,
+			 Elf_Internal_Verdef *dst)
+{
+  dst->vd_version = H_GET_16 (abfd, src->vd_version);
+  dst->vd_flags   = H_GET_16 (abfd, src->vd_flags);
+  dst->vd_ndx     = H_GET_16 (abfd, src->vd_ndx);
+  dst->vd_cnt     = H_GET_16 (abfd, src->vd_cnt);
+  dst->vd_hash    = H_GET_32 (abfd, src->vd_hash);
+  dst->vd_aux     = H_GET_32 (abfd, src->vd_aux);
+  dst->vd_next    = H_GET_32 (abfd, src->vd_next);
+}
+
+/* Swap out a Verdef structure.  */
+
+void
+_bfd_elf_swap_verdef_out (bfd *abfd,
+			  const Elf_Internal_Verdef *src,
+			  Elf_External_Verdef *dst)
+{
+  H_PUT_16 (abfd, src->vd_version, dst->vd_version);
+  H_PUT_16 (abfd, src->vd_flags, dst->vd_flags);
+  H_PUT_16 (abfd, src->vd_ndx, dst->vd_ndx);
+  H_PUT_16 (abfd, src->vd_cnt, dst->vd_cnt);
+  H_PUT_32 (abfd, src->vd_hash, dst->vd_hash);
+  H_PUT_32 (abfd, src->vd_aux, dst->vd_aux);
+  H_PUT_32 (abfd, src->vd_next, dst->vd_next);
+}
+
+/* Swap in a Verdaux structure.  */
+
+void
+_bfd_elf_swap_verdaux_in (bfd *abfd,
+			  const Elf_External_Verdaux *src,
+			  Elf_Internal_Verdaux *dst)
+{
+  dst->vda_name = H_GET_32 (abfd, src->vda_name);
+  dst->vda_next = H_GET_32 (abfd, src->vda_next);
+}
+
+/* Swap out a Verdaux structure.  */
+
+void
+_bfd_elf_swap_verdaux_out (bfd *abfd,
+			   const Elf_Internal_Verdaux *src,
+			   Elf_External_Verdaux *dst)
+{
+  H_PUT_32 (abfd, src->vda_name, dst->vda_name);
+  H_PUT_32 (abfd, src->vda_next, dst->vda_next);
+}
+
+/* Swap in a Verneed structure.  */
+
+void
+_bfd_elf_swap_verneed_in (bfd *abfd,
+			  const Elf_External_Verneed *src,
+			  Elf_Internal_Verneed *dst)
+{
+  dst->vn_version = H_GET_16 (abfd, src->vn_version);
+  dst->vn_cnt     = H_GET_16 (abfd, src->vn_cnt);
+  dst->vn_file    = H_GET_32 (abfd, src->vn_file);
+  dst->vn_aux     = H_GET_32 (abfd, src->vn_aux);
+  dst->vn_next    = H_GET_32 (abfd, src->vn_next);
+}
+
+/* Swap out a Verneed structure.  */
+
+void
+_bfd_elf_swap_verneed_out (bfd *abfd,
+			   const Elf_Internal_Verneed *src,
+			   Elf_External_Verneed *dst)
+{
+  H_PUT_16 (abfd, src->vn_version, dst->vn_version);
+  H_PUT_16 (abfd, src->vn_cnt, dst->vn_cnt);
+  H_PUT_32 (abfd, src->vn_file, dst->vn_file);
+  H_PUT_32 (abfd, src->vn_aux, dst->vn_aux);
+  H_PUT_32 (abfd, src->vn_next, dst->vn_next);
+}
+
+/* Swap in a Vernaux structure.  */
+
+void
+_bfd_elf_swap_vernaux_in (bfd *abfd,
+			  const Elf_External_Vernaux *src,
+			  Elf_Internal_Vernaux *dst)
+{
+  dst->vna_hash  = H_GET_32 (abfd, src->vna_hash);
+  dst->vna_flags = H_GET_16 (abfd, src->vna_flags);
+  dst->vna_other = H_GET_16 (abfd, src->vna_other);
+  dst->vna_name  = H_GET_32 (abfd, src->vna_name);
+  dst->vna_next  = H_GET_32 (abfd, src->vna_next);
+}
+
+/* Swap out a Vernaux structure.  */
+
+void
+_bfd_elf_swap_vernaux_out (bfd *abfd,
+			   const Elf_Internal_Vernaux *src,
+			   Elf_External_Vernaux *dst)
+{
+  H_PUT_32 (abfd, src->vna_hash, dst->vna_hash);
+  H_PUT_16 (abfd, src->vna_flags, dst->vna_flags);
+  H_PUT_16 (abfd, src->vna_other, dst->vna_other);
+  H_PUT_32 (abfd, src->vna_name, dst->vna_name);
+  H_PUT_32 (abfd, src->vna_next, dst->vna_next);
+}
+
+/* Swap in a Versym structure.  */
+
+void
+_bfd_elf_swap_versym_in (bfd *abfd,
+			 const Elf_External_Versym *src,
+			 Elf_Internal_Versym *dst)
+{
+  dst->vs_vers = H_GET_16 (abfd, src->vs_vers);
+}
+
+/* Swap out a Versym structure.  */
+
+void
+_bfd_elf_swap_versym_out (bfd *abfd,
+			  const Elf_Internal_Versym *src,
+			  Elf_External_Versym *dst)
+{
+  H_PUT_16 (abfd, src->vs_vers, dst->vs_vers);
+}
+
+/* Standard ELF hash function.  Do not change this function; you will
+   cause invalid hash tables to be generated.  */
+
+unsigned long
+bfd_elf_hash (const char *namearg)
+{
+  const unsigned char *name = (const unsigned char *) namearg;
+  unsigned long h = 0;
+  unsigned long g;
+  int ch;
+
+  while ((ch = *name++) != '\0')
+    {
+      h = (h << 4) + ch;
+      if ((g = (h & 0xf0000000)) != 0)
+	{
+	  h ^= g >> 24;
+	  /* The ELF ABI says `h &= ~g', but this is equivalent in
+	     this case and on some machines one insn instead of two.  */
+	  h ^= g;
+	}
+    }
+  return h & 0xffffffff;
+}
+
+/* DT_GNU_HASH hash function.  Do not change this function; you will
+   cause invalid hash tables to be generated.  */
+
+unsigned long
+bfd_elf_gnu_hash (const char *namearg)
+{
+  const unsigned char *name = (const unsigned char *) namearg;
+  unsigned long h = 5381;
+  unsigned char ch;
+
+  while ((ch = *name++) != '\0')
+    h = (h << 5) + h + ch;
+  return h & 0xffffffff;
+}
+
+/* Create a tdata field OBJECT_SIZE bytes in length, zeroed out and with
+   the object_id field of an elf_obj_tdata field set to OBJECT_ID.  */
+bfd_boolean
+bfd_elf_allocate_object (bfd *abfd,
+			 size_t object_size,
+			 enum elf_target_id object_id)
+{
+  BFD_ASSERT (object_size >= sizeof (struct elf_obj_tdata));
+  abfd->tdata.any = bfd_zalloc (abfd, object_size);
+  if (abfd->tdata.any == NULL)
+    return FALSE;
+
+  elf_object_id (abfd) = object_id;
+  elf_program_header_size (abfd) = (bfd_size_type) -1;
+  return TRUE;
+}
+
+
+bfd_boolean
+bfd_elf_make_object (bfd *abfd)
+{
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  return bfd_elf_allocate_object (abfd, sizeof (struct elf_obj_tdata),
+				  bed->target_id);
+}
+
+bfd_boolean
+bfd_elf_mkcorefile (bfd *abfd)
+{
+  /* I think this can be done just like an object file.  */
+  return abfd->xvec->_bfd_set_format[(int) bfd_object] (abfd);
+}
+
+static char *
+bfd_elf_get_str_section (bfd *abfd, unsigned int shindex)
+{
+  Elf_Internal_Shdr **i_shdrp;
+  bfd_byte *shstrtab = NULL;
+  file_ptr offset;
+  bfd_size_type shstrtabsize;
+
+  i_shdrp = elf_elfsections (abfd);
+  if (i_shdrp == 0
+      || shindex >= elf_numsections (abfd)
+      || i_shdrp[shindex] == 0)
+    return NULL;
+
+  shstrtab = i_shdrp[shindex]->contents;
+  if (shstrtab == NULL)
+    {
+      /* No cached one, attempt to read, and cache what we read.  */
+      offset = i_shdrp[shindex]->sh_offset;
+      shstrtabsize = i_shdrp[shindex]->sh_size;
+
+      /* Allocate and clear an extra byte at the end, to prevent crashes
+	 in case the string table is not terminated.  */
+      if (shstrtabsize + 1 <= 1
+	  || (shstrtab = (bfd_byte *) bfd_alloc (abfd, shstrtabsize + 1)) == NULL
+	  || bfd_seek (abfd, offset, SEEK_SET) != 0)
+	shstrtab = NULL;
+      else if (bfd_bread (shstrtab, shstrtabsize, abfd) != shstrtabsize)
+	{
+	  if (bfd_get_error () != bfd_error_system_call)
+	    bfd_set_error (bfd_error_file_truncated);
+	  shstrtab = NULL;
+	  /* Once we've failed to read it, make sure we don't keep
+	     trying.  Otherwise, we'll keep allocating space for
+	     the string table over and over.  */
+	  i_shdrp[shindex]->sh_size = 0;
+	}
+      else
+	shstrtab[shstrtabsize] = '\0';
+      i_shdrp[shindex]->contents = shstrtab;
+    }
+  return (char *) shstrtab;
+}
+
+char *
+bfd_elf_string_from_elf_section (bfd *abfd,
+				 unsigned int shindex,
+				 unsigned int strindex)
+{
+  Elf_Internal_Shdr *hdr;
+
+  if (strindex == 0)
+    return "";
+
+  if (elf_elfsections (abfd) == NULL || shindex >= elf_numsections (abfd))
+    return NULL;
+
+  hdr = elf_elfsections (abfd)[shindex];
+
+  if (hdr->contents == NULL
+      && bfd_elf_get_str_section (abfd, shindex) == NULL)
+    return NULL;
+
+  if (strindex >= hdr->sh_size)
+    {
+      unsigned int shstrndx = elf_elfheader(abfd)->e_shstrndx;
+      (*_bfd_error_handler)
+	(_("%B: invalid string offset %u >= %lu for section `%s'"),
+	 abfd, strindex, (unsigned long) hdr->sh_size,
+	 (shindex == shstrndx && strindex == hdr->sh_name
+	  ? ".shstrtab"
+	  : bfd_elf_string_from_elf_section (abfd, shstrndx, hdr->sh_name)));
+      return NULL;
+    }
+
+  return ((char *) hdr->contents) + strindex;
+}
+
+/* Read and convert symbols to internal format.
+   SYMCOUNT specifies the number of symbols to read, starting from
+   symbol SYMOFFSET.  If any of INTSYM_BUF, EXTSYM_BUF or EXTSHNDX_BUF
+   are non-NULL, they are used to store the internal symbols, external
+   symbols, and symbol section index extensions, respectively.
+   Returns a pointer to the internal symbol buffer (malloced if necessary)
+   or NULL if there were no symbols or some kind of problem.  */
+
+Elf_Internal_Sym *
+bfd_elf_get_elf_syms (bfd *ibfd,
+		      Elf_Internal_Shdr *symtab_hdr,
+		      size_t symcount,
+		      size_t symoffset,
+		      Elf_Internal_Sym *intsym_buf,
+		      void *extsym_buf,
+		      Elf_External_Sym_Shndx *extshndx_buf)
+{
+  Elf_Internal_Shdr *shndx_hdr;
+  void *alloc_ext;
+  const bfd_byte *esym;
+  Elf_External_Sym_Shndx *alloc_extshndx;
+  Elf_External_Sym_Shndx *shndx;
+  Elf_Internal_Sym *alloc_intsym;
+  Elf_Internal_Sym *isym;
+  Elf_Internal_Sym *isymend;
+  const struct elf_backend_data *bed;
+  size_t extsym_size;
+  bfd_size_type amt;
+  file_ptr pos;
+
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour)
+    abort ();
+
+  if (symcount == 0)
+    return intsym_buf;
+
+  /* Normal syms might have section extension entries.  */
+  shndx_hdr = NULL;
+  if (symtab_hdr == &elf_tdata (ibfd)->symtab_hdr)
+    shndx_hdr = &elf_tdata (ibfd)->symtab_shndx_hdr;
+
+  /* Read the symbols.  */
+  alloc_ext = NULL;
+  alloc_extshndx = NULL;
+  alloc_intsym = NULL;
+  bed = get_elf_backend_data (ibfd);
+  extsym_size = bed->s->sizeof_sym;
+  amt = symcount * extsym_size;
+  pos = symtab_hdr->sh_offset + symoffset * extsym_size;
+  if (extsym_buf == NULL)
+    {
+      alloc_ext = bfd_malloc2 (symcount, extsym_size);
+      extsym_buf = alloc_ext;
+    }
+  if (extsym_buf == NULL
+      || bfd_seek (ibfd, pos, SEEK_SET) != 0
+      || bfd_bread (extsym_buf, amt, ibfd) != amt)
+    {
+      intsym_buf = NULL;
+      goto out;
+    }
+
+  if (shndx_hdr == NULL || shndx_hdr->sh_size == 0)
+    extshndx_buf = NULL;
+  else
+    {
+      amt = symcount * sizeof (Elf_External_Sym_Shndx);
+      pos = shndx_hdr->sh_offset + symoffset * sizeof (Elf_External_Sym_Shndx);
+      if (extshndx_buf == NULL)
+	{
+	  alloc_extshndx = (Elf_External_Sym_Shndx *)
+              bfd_malloc2 (symcount, sizeof (Elf_External_Sym_Shndx));
+	  extshndx_buf = alloc_extshndx;
+	}
+      if (extshndx_buf == NULL
+	  || bfd_seek (ibfd, pos, SEEK_SET) != 0
+	  || bfd_bread (extshndx_buf, amt, ibfd) != amt)
+	{
+	  intsym_buf = NULL;
+	  goto out;
+	}
+    }
+
+  if (intsym_buf == NULL)
+    {
+      alloc_intsym = (Elf_Internal_Sym *)
+          bfd_malloc2 (symcount, sizeof (Elf_Internal_Sym));
+      intsym_buf = alloc_intsym;
+      if (intsym_buf == NULL)
+	goto out;
+    }
+
+  /* Convert the symbols to internal form.  */
+  isymend = intsym_buf + symcount;
+  for (esym = (const bfd_byte *) extsym_buf, isym = intsym_buf,
+           shndx = extshndx_buf;
+       isym < isymend;
+       esym += extsym_size, isym++, shndx = shndx != NULL ? shndx + 1 : NULL)
+    if (!(*bed->s->swap_symbol_in) (ibfd, esym, shndx, isym))
+      {
+	symoffset += (esym - (bfd_byte *) extsym_buf) / extsym_size;
+	(*_bfd_error_handler) (_("%B symbol number %lu references "
+				 "nonexistent SHT_SYMTAB_SHNDX section"),
+			       ibfd, (unsigned long) symoffset);
+	if (alloc_intsym != NULL)
+	  free (alloc_intsym);
+	intsym_buf = NULL;
+	goto out;
+      }
+
+ out:
+  if (alloc_ext != NULL)
+    free (alloc_ext);
+  if (alloc_extshndx != NULL)
+    free (alloc_extshndx);
+
+  return intsym_buf;
+}
+
+/* Look up a symbol name.  */
+const char *
+bfd_elf_sym_name (bfd *abfd,
+		  Elf_Internal_Shdr *symtab_hdr,
+		  Elf_Internal_Sym *isym,
+		  asection *sym_sec)
+{
+  const char *name;
+  unsigned int iname = isym->st_name;
+  unsigned int shindex = symtab_hdr->sh_link;
+
+  if (iname == 0 && ELF_ST_TYPE (isym->st_info) == STT_SECTION
+      /* Check for a bogus st_shndx to avoid crashing.  */
+      && isym->st_shndx < elf_numsections (abfd))
+    {
+      iname = elf_elfsections (abfd)[isym->st_shndx]->sh_name;
+      shindex = elf_elfheader (abfd)->e_shstrndx;
+    }
+
+  name = bfd_elf_string_from_elf_section (abfd, shindex, iname);
+  if (name == NULL)
+    name = "(null)";
+  else if (sym_sec && *name == '\0')
+    name = bfd_section_name (abfd, sym_sec);
+
+  return name;
+}
+
+/* Elf_Internal_Shdr->contents is an array of these for SHT_GROUP
+   sections.  The first element is the flags, the rest are section
+   pointers.  */
+
+typedef union elf_internal_group {
+  Elf_Internal_Shdr *shdr;
+  unsigned int flags;
+} Elf_Internal_Group;
+
+/* Return the name of the group signature symbol.  Why isn't the
+   signature just a string?  */
+
+static const char *
+group_signature (bfd *abfd, Elf_Internal_Shdr *ghdr)
+{
+  Elf_Internal_Shdr *hdr;
+  unsigned char esym[sizeof (Elf64_External_Sym)];
+  Elf_External_Sym_Shndx eshndx;
+  Elf_Internal_Sym isym;
+
+  /* First we need to ensure the symbol table is available.  Make sure
+     that it is a symbol table section.  */
+  if (ghdr->sh_link >= elf_numsections (abfd))
+    return NULL;
+  hdr = elf_elfsections (abfd) [ghdr->sh_link];
+  if (hdr->sh_type != SHT_SYMTAB
+      || ! bfd_section_from_shdr (abfd, ghdr->sh_link))
+    return NULL;
+
+  /* Go read the symbol.  */
+  hdr = &elf_tdata (abfd)->symtab_hdr;
+  if (bfd_elf_get_elf_syms (abfd, hdr, 1, ghdr->sh_info,
+			    &isym, esym, &eshndx) == NULL)
+    return NULL;
+
+  return bfd_elf_sym_name (abfd, hdr, &isym, NULL);
+}
+
+/* Set next_in_group list pointer, and group name for NEWSECT.  */
+
+static bfd_boolean
+setup_group (bfd *abfd, Elf_Internal_Shdr *hdr, asection *newsect)
+{
+  unsigned int num_group = elf_tdata (abfd)->num_group;
+
+  /* If num_group is zero, read in all SHT_GROUP sections.  The count
+     is set to -1 if there are no SHT_GROUP sections.  */
+  if (num_group == 0)
+    {
+      unsigned int i, shnum;
+
+      /* First count the number of groups.  If we have a SHT_GROUP
+	 section with just a flag word (ie. sh_size is 4), ignore it.  */
+      shnum = elf_numsections (abfd);
+      num_group = 0;
+
+#define IS_VALID_GROUP_SECTION_HEADER(shdr)		\
+	(   (shdr)->sh_type == SHT_GROUP		\
+	 && (shdr)->sh_size >= (2 * GRP_ENTRY_SIZE)	\
+	 && (shdr)->sh_entsize == GRP_ENTRY_SIZE	\
+	 && ((shdr)->sh_size % GRP_ENTRY_SIZE) == 0)
+
+      for (i = 0; i < shnum; i++)
+	{
+	  Elf_Internal_Shdr *shdr = elf_elfsections (abfd)[i];
+
+	  if (IS_VALID_GROUP_SECTION_HEADER (shdr))
+	    num_group += 1;
+	}
+
+      if (num_group == 0)
+	{
+	  num_group = (unsigned) -1;
+	  elf_tdata (abfd)->num_group = num_group;
+	}
+      else
+	{
+	  /* We keep a list of elf section headers for group sections,
+	     so we can find them quickly.  */
+	  bfd_size_type amt;
+
+	  elf_tdata (abfd)->num_group = num_group;
+	  elf_tdata (abfd)->group_sect_ptr = (Elf_Internal_Shdr **)
+              bfd_alloc2 (abfd, num_group, sizeof (Elf_Internal_Shdr *));
+	  if (elf_tdata (abfd)->group_sect_ptr == NULL)
+	    return FALSE;
+
+	  num_group = 0;
+	  for (i = 0; i < shnum; i++)
+	    {
+	      Elf_Internal_Shdr *shdr = elf_elfsections (abfd)[i];
+
+	      if (IS_VALID_GROUP_SECTION_HEADER (shdr))
+		{
+		  unsigned char *src;
+		  Elf_Internal_Group *dest;
+
+		  /* Add to list of sections.  */
+		  elf_tdata (abfd)->group_sect_ptr[num_group] = shdr;
+		  num_group += 1;
+
+		  /* Read the raw contents.  */
+		  BFD_ASSERT (sizeof (*dest) >= 4);
+		  amt = shdr->sh_size * sizeof (*dest) / 4;
+		  shdr->contents = (unsigned char *)
+                      bfd_alloc2 (abfd, shdr->sh_size, sizeof (*dest) / 4);
+		  /* PR binutils/4110: Handle corrupt group headers.  */
+		  if (shdr->contents == NULL)
+		    {
+		      _bfd_error_handler
+			(_("%B: Corrupt size field in group section header: 0x%lx"), abfd, shdr->sh_size);
+		      bfd_set_error (bfd_error_bad_value);
+		      return FALSE;
+		    }
+
+		  memset (shdr->contents, 0, amt);
+
+		  if (bfd_seek (abfd, shdr->sh_offset, SEEK_SET) != 0
+		      || (bfd_bread (shdr->contents, shdr->sh_size, abfd)
+			  != shdr->sh_size))
+		    return FALSE;
+
+		  /* Translate raw contents, a flag word followed by an
+		     array of elf section indices all in target byte order,
+		     to the flag word followed by an array of elf section
+		     pointers.  */
+		  src = shdr->contents + shdr->sh_size;
+		  dest = (Elf_Internal_Group *) (shdr->contents + amt);
+		  while (1)
+		    {
+		      unsigned int idx;
+
+		      src -= 4;
+		      --dest;
+		      idx = H_GET_32 (abfd, src);
+		      if (src == shdr->contents)
+			{
+			  dest->flags = idx;
+			  if (shdr->bfd_section != NULL && (idx & GRP_COMDAT))
+			    shdr->bfd_section->flags
+			      |= SEC_LINK_ONCE | SEC_LINK_DUPLICATES_DISCARD;
+			  break;
+			}
+		      if (idx >= shnum)
+			{
+			  ((*_bfd_error_handler)
+			   (_("%B: invalid SHT_GROUP entry"), abfd));
+			  idx = 0;
+			}
+		      dest->shdr = elf_elfsections (abfd)[idx];
+		    }
+		}
+	    }
+	}
+    }
+
+  if (num_group != (unsigned) -1)
+    {
+      unsigned int i;
+
+      for (i = 0; i < num_group; i++)
+	{
+	  Elf_Internal_Shdr *shdr = elf_tdata (abfd)->group_sect_ptr[i];
+	  Elf_Internal_Group *idx = (Elf_Internal_Group *) shdr->contents;
+	  unsigned int n_elt = shdr->sh_size / 4;
+
+	  /* Look through this group's sections to see if current
+	     section is a member.  */
+	  while (--n_elt != 0)
+	    if ((++idx)->shdr == hdr)
+	      {
+		asection *s = NULL;
+
+		/* We are a member of this group.  Go looking through
+		   other members to see if any others are linked via
+		   next_in_group.  */
+		idx = (Elf_Internal_Group *) shdr->contents;
+		n_elt = shdr->sh_size / 4;
+		while (--n_elt != 0)
+		  if ((s = (++idx)->shdr->bfd_section) != NULL
+		      && elf_next_in_group (s) != NULL)
+		    break;
+		if (n_elt != 0)
+		  {
+		    /* Snarf the group name from other member, and
+		       insert current section in circular list.  */
+		    elf_group_name (newsect) = elf_group_name (s);
+		    elf_next_in_group (newsect) = elf_next_in_group (s);
+		    elf_next_in_group (s) = newsect;
+		  }
+		else
+		  {
+		    const char *gname;
+
+		    gname = group_signature (abfd, shdr);
+		    if (gname == NULL)
+		      return FALSE;
+		    elf_group_name (newsect) = gname;
+
+		    /* Start a circular list with one element.  */
+		    elf_next_in_group (newsect) = newsect;
+		  }
+
+		/* If the group section has been created, point to the
+		   new member.  */
+		if (shdr->bfd_section != NULL)
+		  elf_next_in_group (shdr->bfd_section) = newsect;
+
+		i = num_group - 1;
+		break;
+	      }
+	}
+    }
+
+  if (elf_group_name (newsect) == NULL)
+    {
+      (*_bfd_error_handler) (_("%B: no group info for section %A"),
+			     abfd, newsect);
+    }
+  return TRUE;
+}
+
+bfd_boolean
+_bfd_elf_setup_sections (bfd *abfd)
+{
+  unsigned int i;
+  unsigned int num_group = elf_tdata (abfd)->num_group;
+  bfd_boolean result = TRUE;
+  asection *s;
+
+  /* Process SHF_LINK_ORDER.  */
+  for (s = abfd->sections; s != NULL; s = s->next)
+    {
+      Elf_Internal_Shdr *this_hdr = &elf_section_data (s)->this_hdr;
+      if ((this_hdr->sh_flags & SHF_LINK_ORDER) != 0)
+	{
+	  unsigned int elfsec = this_hdr->sh_link;
+	  /* FIXME: The old Intel compiler and old strip/objcopy may
+	     not set the sh_link or sh_info fields.  Hence we could
+	     get the situation where elfsec is 0.  */
+	  if (elfsec == 0)
+	    {
+	      const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+	      if (bed->link_order_error_handler)
+		bed->link_order_error_handler
+		  (_("%B: warning: sh_link not set for section `%A'"),
+		   abfd, s);
+	    }
+	  else
+	    {
+	      asection *linksec = NULL;
+
+	      if (elfsec < elf_numsections (abfd))
+		{
+		  this_hdr = elf_elfsections (abfd)[elfsec];
+		  linksec = this_hdr->bfd_section;
+		}
+
+	      /* PR 1991, 2008:
+		 Some strip/objcopy may leave an incorrect value in
+		 sh_link.  We don't want to proceed.  */
+	      if (linksec == NULL)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B: sh_link [%d] in section `%A' is incorrect"),
+		     s->owner, s, elfsec);
+		  result = FALSE;
+		}
+
+	      elf_linked_to_section (s) = linksec;
+	    }
+	}
+    }
+
+  /* Process section groups.  */
+  if (num_group == (unsigned) -1)
+    return result;
+
+  for (i = 0; i < num_group; i++)
+    {
+      Elf_Internal_Shdr *shdr = elf_tdata (abfd)->group_sect_ptr[i];
+      Elf_Internal_Group *idx = (Elf_Internal_Group *) shdr->contents;
+      unsigned int n_elt = shdr->sh_size / 4;
+
+      while (--n_elt != 0)
+	if ((++idx)->shdr->bfd_section)
+	  elf_sec_group (idx->shdr->bfd_section) = shdr->bfd_section;
+	else if (idx->shdr->sh_type == SHT_RELA
+		 || idx->shdr->sh_type == SHT_REL)
+	  /* We won't include relocation sections in section groups in
+	     output object files. We adjust the group section size here
+	     so that relocatable link will work correctly when
+	     relocation sections are in section group in input object
+	     files.  */
+	  shdr->bfd_section->size -= 4;
+	else
+	  {
+	    /* There are some unknown sections in the group.  */
+	    (*_bfd_error_handler)
+	      (_("%B: unknown [%d] section `%s' in group [%s]"),
+	       abfd,
+	       (unsigned int) idx->shdr->sh_type,
+	       bfd_elf_string_from_elf_section (abfd,
+						(elf_elfheader (abfd)
+						 ->e_shstrndx),
+						idx->shdr->sh_name),
+	       shdr->bfd_section->name);
+	    result = FALSE;
+	  }
+    }
+  return result;
+}
+
+bfd_boolean
+bfd_elf_is_group_section (bfd *abfd ATTRIBUTE_UNUSED, const asection *sec)
+{
+  return elf_next_in_group (sec) != NULL;
+}
+
+/* Make a BFD section from an ELF section.  We store a pointer to the
+   BFD section in the bfd_section field of the header.  */
+
+bfd_boolean
+_bfd_elf_make_section_from_shdr (bfd *abfd,
+				 Elf_Internal_Shdr *hdr,
+				 const char *name,
+				 int shindex)
+{
+  asection *newsect;
+  flagword flags;
+  const struct elf_backend_data *bed;
+
+  if (hdr->bfd_section != NULL)
+    return TRUE;
+
+  newsect = bfd_make_section_anyway (abfd, name);
+  if (newsect == NULL)
+    return FALSE;
+
+  hdr->bfd_section = newsect;
+  elf_section_data (newsect)->this_hdr = *hdr;
+  elf_section_data (newsect)->this_idx = shindex;
+
+  /* Always use the real type/flags.  */
+  elf_section_type (newsect) = hdr->sh_type;
+  elf_section_flags (newsect) = hdr->sh_flags;
+
+  newsect->filepos = hdr->sh_offset;
+
+  if (! bfd_set_section_vma (abfd, newsect, hdr->sh_addr)
+      || ! bfd_set_section_size (abfd, newsect, hdr->sh_size)
+      || ! bfd_set_section_alignment (abfd, newsect,
+				      bfd_log2 (hdr->sh_addralign)))
+    return FALSE;
+
+  flags = SEC_NO_FLAGS;
+  if (hdr->sh_type != SHT_NOBITS)
+    flags |= SEC_HAS_CONTENTS;
+  if (hdr->sh_type == SHT_GROUP)
+    flags |= SEC_GROUP | SEC_EXCLUDE;
+  if ((hdr->sh_flags & SHF_ALLOC) != 0)
+    {
+      flags |= SEC_ALLOC;
+      if (hdr->sh_type != SHT_NOBITS)
+	flags |= SEC_LOAD;
+    }
+  if ((hdr->sh_flags & SHF_WRITE) == 0)
+    flags |= SEC_READONLY;
+  if ((hdr->sh_flags & SHF_EXECINSTR) != 0)
+    flags |= SEC_CODE;
+  else if ((flags & SEC_LOAD) != 0)
+    flags |= SEC_DATA;
+  if ((hdr->sh_flags & SHF_MERGE) != 0)
+    {
+      flags |= SEC_MERGE;
+      newsect->entsize = hdr->sh_entsize;
+      if ((hdr->sh_flags & SHF_STRINGS) != 0)
+	flags |= SEC_STRINGS;
+    }
+  if (hdr->sh_flags & SHF_GROUP)
+    if (!setup_group (abfd, hdr, newsect))
+      return FALSE;
+  if ((hdr->sh_flags & SHF_TLS) != 0)
+    flags |= SEC_THREAD_LOCAL;
+  if ((hdr->sh_flags & SHF_EXCLUDE) != 0)
+    flags |= SEC_EXCLUDE;
+
+  if ((flags & SEC_ALLOC) == 0)
+    {
+      /* The debugging sections appear to be recognized only by name,
+	 not any sort of flag.  Their SEC_ALLOC bits are cleared.  */
+      static const struct
+	{
+	  const char *name;
+	  int len;
+	} debug_sections [] =
+	{
+	  { STRING_COMMA_LEN ("debug") },	/* 'd' */
+	  { NULL,		 0  },	/* 'e' */
+	  { NULL,		 0  },	/* 'f' */
+	  { STRING_COMMA_LEN ("gnu.linkonce.wi.") },	/* 'g' */
+	  { NULL,		 0  },	/* 'h' */
+	  { NULL,		 0  },	/* 'i' */
+	  { NULL,		 0  },	/* 'j' */
+	  { NULL,		 0  },	/* 'k' */
+	  { STRING_COMMA_LEN ("line") },	/* 'l' */
+	  { NULL,		 0  },	/* 'm' */
+	  { NULL,		 0  },	/* 'n' */
+	  { NULL,		 0  },	/* 'o' */
+	  { NULL,		 0  },	/* 'p' */
+	  { NULL,		 0  },	/* 'q' */
+	  { NULL,		 0  },	/* 'r' */
+	  { STRING_COMMA_LEN ("stab") },	/* 's' */
+	  { NULL,		 0  },	/* 't' */
+	  { NULL,		 0  },	/* 'u' */
+	  { NULL,		 0  },	/* 'v' */
+	  { NULL,		 0  },	/* 'w' */
+	  { NULL,		 0  },	/* 'x' */
+	  { NULL,		 0  },	/* 'y' */
+	  { STRING_COMMA_LEN ("zdebug") }	/* 'z' */
+	};
+
+      if (name [0] == '.')
+	{
+	  int i = name [1] - 'd';
+	  if (i >= 0
+	      && i < (int) ARRAY_SIZE (debug_sections)
+	      && debug_sections [i].name != NULL
+	      && strncmp (&name [1], debug_sections [i].name,
+			  debug_sections [i].len) == 0)
+	    flags |= SEC_DEBUGGING;
+	}
+    }
+
+  /* As a GNU extension, if the name begins with .gnu.linkonce, we
+     only link a single copy of the section.  This is used to support
+     g++.  g++ will emit each template expansion in its own section.
+     The symbols will be defined as weak, so that multiple definitions
+     are permitted.  The GNU linker extension is to actually discard
+     all but one of the sections.  */
+  if (CONST_STRNEQ (name, ".gnu.linkonce")
+      && elf_next_in_group (newsect) == NULL)
+    flags |= SEC_LINK_ONCE | SEC_LINK_DUPLICATES_DISCARD;
+
+  bed = get_elf_backend_data (abfd);
+  if (bed->elf_backend_section_flags)
+    if (! bed->elf_backend_section_flags (&flags, hdr))
+      return FALSE;
+
+  if (! bfd_set_section_flags (abfd, newsect, flags))
+    return FALSE;
+
+  /* We do not parse the PT_NOTE segments as we are interested even in the
+     separate debug info files which may have the segments offsets corrupted.
+     PT_NOTEs from the core files are currently not parsed using BFD.  */
+  if (hdr->sh_type == SHT_NOTE)
+    {
+      bfd_byte *contents;
+
+      if (!bfd_malloc_and_get_section (abfd, newsect, &contents))
+	return FALSE;
+
+      elf_parse_notes (abfd, (char *) contents, hdr->sh_size, -1);
+      free (contents);
+    }
+
+  if ((flags & SEC_ALLOC) != 0)
+    {
+      Elf_Internal_Phdr *phdr;
+      unsigned int i, nload;
+
+      /* Some ELF linkers produce binaries with all the program header
+	 p_paddr fields zero.  If we have such a binary with more than
+	 one PT_LOAD header, then leave the section lma equal to vma
+	 so that we don't create sections with overlapping lma.  */
+      phdr = elf_tdata (abfd)->phdr;
+      for (nload = 0, i = 0; i < elf_elfheader (abfd)->e_phnum; i++, phdr++)
+	if (phdr->p_paddr != 0)
+	  break;
+	else if (phdr->p_type == PT_LOAD && phdr->p_memsz != 0)
+	  ++nload;
+      if (i >= elf_elfheader (abfd)->e_phnum && nload > 1)
+	return TRUE;
+
+      phdr = elf_tdata (abfd)->phdr;
+      for (i = 0; i < elf_elfheader (abfd)->e_phnum; i++, phdr++)
+	{
+	  if (((phdr->p_type == PT_LOAD
+		&& (hdr->sh_flags & SHF_TLS) == 0)
+	       || phdr->p_type == PT_TLS)
+	      && ELF_SECTION_IN_SEGMENT (hdr, phdr))
+	    {
+	      if ((flags & SEC_LOAD) == 0)
+		newsect->lma = (phdr->p_paddr
+				+ hdr->sh_addr - phdr->p_vaddr);
+	      else
+		/* We used to use the same adjustment for SEC_LOAD
+		   sections, but that doesn't work if the segment
+		   is packed with code from multiple VMAs.
+		   Instead we calculate the section LMA based on
+		   the segment LMA.  It is assumed that the
+		   segment will contain sections with contiguous
+		   LMAs, even if the VMAs are not.  */
+		newsect->lma = (phdr->p_paddr
+				+ hdr->sh_offset - phdr->p_offset);
+
+	      /* With contiguous segments, we can't tell from file
+		 offsets whether a section with zero size should
+		 be placed at the end of one segment or the
+		 beginning of the next.  Decide based on vaddr.  */
+	      if (hdr->sh_addr >= phdr->p_vaddr
+		  && (hdr->sh_addr + hdr->sh_size
+		      <= phdr->p_vaddr + phdr->p_memsz))
+		break;
+	    }
+	}
+    }
+
+  /* Compress/decompress DWARF debug sections with names: .debug_* and
+     .zdebug_*, after the section flags is set.  */
+  if ((flags & SEC_DEBUGGING)
+      && ((name[1] == 'd' && name[6] == '_')
+	  || (name[1] == 'z' && name[7] == '_')))
+    {
+      enum { nothing, compress, decompress } action = nothing;
+      char *new_name;
+
+      if (bfd_is_section_compressed (abfd, newsect))
+	{
+	  /* Compressed section.  Check if we should decompress.  */
+	  if ((abfd->flags & BFD_DECOMPRESS))
+	    action = decompress;
+	}
+      else
+	{
+	  /* Normal section.  Check if we should compress.  */
+	  if ((abfd->flags & BFD_COMPRESS))
+	    action = compress;
+	}
+
+      new_name = NULL;
+      switch (action)
+	{
+	case nothing:
+	  break;
+	case compress:
+	  if (!bfd_init_section_compress_status (abfd, newsect))
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: unable to initialize commpress status for section %s"),
+		 abfd, name);
+	      return FALSE;
+	    }
+	  if (name[1] != 'z')
+	    {
+	      unsigned int len = strlen (name);
+
+	      new_name = bfd_alloc (abfd, len + 2);
+	      if (new_name == NULL)
+		return FALSE;
+	      new_name[0] = '.';
+	      new_name[1] = 'z';
+	      memcpy (new_name + 2, name + 1, len);
+	    }
+	  break;
+	case decompress:
+	  if (!bfd_init_section_decompress_status (abfd, newsect))
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: unable to initialize decommpress status for section %s"),
+		 abfd, name);
+	      return FALSE;
+	    }
+	  if (name[1] == 'z')
+	    {
+	      unsigned int len = strlen (name);
+
+	      new_name = bfd_alloc (abfd, len);
+	      if (new_name == NULL)
+		return FALSE;
+	      new_name[0] = '.';
+	      memcpy (new_name + 1, name + 2, len - 1);
+	    }
+	  break;
+	}
+      if (new_name != NULL)
+	bfd_rename_section (abfd, newsect, new_name);
+    }
+
+  return TRUE;
+}
+
+const char *const bfd_elf_section_type_names[] = {
+  "SHT_NULL", "SHT_PROGBITS", "SHT_SYMTAB", "SHT_STRTAB",
+  "SHT_RELA", "SHT_HASH", "SHT_DYNAMIC", "SHT_NOTE",
+  "SHT_NOBITS", "SHT_REL", "SHT_SHLIB", "SHT_DYNSYM",
+};
+
+/* ELF relocs are against symbols.  If we are producing relocatable
+   output, and the reloc is against an external symbol, and nothing
+   has given us any additional addend, the resulting reloc will also
+   be against the same symbol.  In such a case, we don't want to
+   change anything about the way the reloc is handled, since it will
+   all be done at final link time.  Rather than put special case code
+   into bfd_perform_relocation, all the reloc types use this howto
+   function.  It just short circuits the reloc if producing
+   relocatable output against an external symbol.  */
+
+bfd_reloc_status_type
+bfd_elf_generic_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+		       arelent *reloc_entry,
+		       asymbol *symbol,
+		       void *data ATTRIBUTE_UNUSED,
+		       asection *input_section,
+		       bfd *output_bfd,
+		       char **error_message ATTRIBUTE_UNUSED)
+{
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (! reloc_entry->howto->partial_inplace
+	  || reloc_entry->addend == 0))
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  return bfd_reloc_continue;
+}
+
+/* Copy the program header and other data from one object module to
+   another.  */
+
+bfd_boolean
+_bfd_elf_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  BFD_ASSERT (!elf_flags_init (obfd)
+	      || (elf_elfheader (obfd)->e_flags
+		  == elf_elfheader (ibfd)->e_flags));
+
+  elf_gp (obfd) = elf_gp (ibfd);
+  elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
+  elf_flags_init (obfd) = TRUE;
+
+  /* Copy object attributes.  */
+  _bfd_elf_copy_obj_attributes (ibfd, obfd);
+  return TRUE;
+}
+
+static const char *
+get_segment_type (unsigned int p_type)
+{
+  const char *pt;
+  switch (p_type)
+    {
+    case PT_NULL: pt = "NULL"; break;
+    case PT_LOAD: pt = "LOAD"; break;
+    case PT_DYNAMIC: pt = "DYNAMIC"; break;
+    case PT_INTERP: pt = "INTERP"; break;
+    case PT_NOTE: pt = "NOTE"; break;
+    case PT_SHLIB: pt = "SHLIB"; break;
+    case PT_PHDR: pt = "PHDR"; break;
+    case PT_TLS: pt = "TLS"; break;
+    case PT_GNU_EH_FRAME: pt = "EH_FRAME"; break;
+    case PT_GNU_STACK: pt = "STACK"; break;
+    case PT_GNU_RELRO: pt = "RELRO"; break;
+    default: pt = NULL; break;
+    }
+  return pt;
+}
+
+/* Print out the program headers.  */
+
+bfd_boolean
+_bfd_elf_print_private_bfd_data (bfd *abfd, void *farg)
+{
+  FILE *f = (FILE *) farg;
+  Elf_Internal_Phdr *p;
+  asection *s;
+  bfd_byte *dynbuf = NULL;
+
+  p = elf_tdata (abfd)->phdr;
+  if (p != NULL)
+    {
+      unsigned int i, c;
+
+      fprintf (f, _("\nProgram Header:\n"));
+      c = elf_elfheader (abfd)->e_phnum;
+      for (i = 0; i < c; i++, p++)
+	{
+	  const char *pt = get_segment_type (p->p_type);
+	  char buf[20];
+
+	  if (pt == NULL)
+	    {
+	      sprintf (buf, "0x%lx", p->p_type);
+	      pt = buf;
+	    }
+	  fprintf (f, "%8s off    0x", pt);
+	  bfd_fprintf_vma (abfd, f, p->p_offset);
+	  fprintf (f, " vaddr 0x");
+	  bfd_fprintf_vma (abfd, f, p->p_vaddr);
+	  fprintf (f, " paddr 0x");
+	  bfd_fprintf_vma (abfd, f, p->p_paddr);
+	  fprintf (f, " align 2**%u\n", bfd_log2 (p->p_align));
+	  fprintf (f, "         filesz 0x");
+	  bfd_fprintf_vma (abfd, f, p->p_filesz);
+	  fprintf (f, " memsz 0x");
+	  bfd_fprintf_vma (abfd, f, p->p_memsz);
+	  fprintf (f, " flags %c%c%c",
+		   (p->p_flags & PF_R) != 0 ? 'r' : '-',
+		   (p->p_flags & PF_W) != 0 ? 'w' : '-',
+		   (p->p_flags & PF_X) != 0 ? 'x' : '-');
+	  if ((p->p_flags &~ (unsigned) (PF_R | PF_W | PF_X)) != 0)
+	    fprintf (f, " %lx", p->p_flags &~ (unsigned) (PF_R | PF_W | PF_X));
+	  fprintf (f, "\n");
+	}
+    }
+
+  s = bfd_get_section_by_name (abfd, ".dynamic");
+  if (s != NULL)
+    {
+      unsigned int elfsec;
+      unsigned long shlink;
+      bfd_byte *extdyn, *extdynend;
+      size_t extdynsize;
+      void (*swap_dyn_in) (bfd *, const void *, Elf_Internal_Dyn *);
+
+      fprintf (f, _("\nDynamic Section:\n"));
+
+      if (!bfd_malloc_and_get_section (abfd, s, &dynbuf))
+	goto error_return;
+
+      elfsec = _bfd_elf_section_from_bfd_section (abfd, s);
+      if (elfsec == SHN_BAD)
+	goto error_return;
+      shlink = elf_elfsections (abfd)[elfsec]->sh_link;
+
+      extdynsize = get_elf_backend_data (abfd)->s->sizeof_dyn;
+      swap_dyn_in = get_elf_backend_data (abfd)->s->swap_dyn_in;
+
+      extdyn = dynbuf;
+      extdynend = extdyn + s->size;
+      for (; extdyn < extdynend; extdyn += extdynsize)
+	{
+	  Elf_Internal_Dyn dyn;
+	  const char *name = "";
+	  char ab[20];
+	  bfd_boolean stringp;
+	  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+
+	  (*swap_dyn_in) (abfd, extdyn, &dyn);
+
+	  if (dyn.d_tag == DT_NULL)
+	    break;
+
+	  stringp = FALSE;
+	  switch (dyn.d_tag)
+	    {
+	    default:
+	      if (bed->elf_backend_get_target_dtag)
+		name = (*bed->elf_backend_get_target_dtag) (dyn.d_tag);
+
+	      if (!strcmp (name, ""))
+		{
+		  sprintf (ab, "0x%lx", (unsigned long) dyn.d_tag);
+		  name = ab;
+		}
+	      break;
+
+	    case DT_NEEDED: name = "NEEDED"; stringp = TRUE; break;
+	    case DT_PLTRELSZ: name = "PLTRELSZ"; break;
+	    case DT_PLTGOT: name = "PLTGOT"; break;
+	    case DT_HASH: name = "HASH"; break;
+	    case DT_STRTAB: name = "STRTAB"; break;
+	    case DT_SYMTAB: name = "SYMTAB"; break;
+	    case DT_RELA: name = "RELA"; break;
+	    case DT_RELASZ: name = "RELASZ"; break;
+	    case DT_RELAENT: name = "RELAENT"; break;
+	    case DT_STRSZ: name = "STRSZ"; break;
+	    case DT_SYMENT: name = "SYMENT"; break;
+	    case DT_INIT: name = "INIT"; break;
+	    case DT_FINI: name = "FINI"; break;
+	    case DT_SONAME: name = "SONAME"; stringp = TRUE; break;
+	    case DT_RPATH: name = "RPATH"; stringp = TRUE; break;
+	    case DT_SYMBOLIC: name = "SYMBOLIC"; break;
+	    case DT_REL: name = "REL"; break;
+	    case DT_RELSZ: name = "RELSZ"; break;
+	    case DT_RELENT: name = "RELENT"; break;
+	    case DT_PLTREL: name = "PLTREL"; break;
+	    case DT_DEBUG: name = "DEBUG"; break;
+	    case DT_TEXTREL: name = "TEXTREL"; break;
+	    case DT_JMPREL: name = "JMPREL"; break;
+	    case DT_BIND_NOW: name = "BIND_NOW"; break;
+	    case DT_INIT_ARRAY: name = "INIT_ARRAY"; break;
+	    case DT_FINI_ARRAY: name = "FINI_ARRAY"; break;
+	    case DT_INIT_ARRAYSZ: name = "INIT_ARRAYSZ"; break;
+	    case DT_FINI_ARRAYSZ: name = "FINI_ARRAYSZ"; break;
+	    case DT_RUNPATH: name = "RUNPATH"; stringp = TRUE; break;
+	    case DT_FLAGS: name = "FLAGS"; break;
+	    case DT_PREINIT_ARRAY: name = "PREINIT_ARRAY"; break;
+	    case DT_PREINIT_ARRAYSZ: name = "PREINIT_ARRAYSZ"; break;
+	    case DT_CHECKSUM: name = "CHECKSUM"; break;
+	    case DT_PLTPADSZ: name = "PLTPADSZ"; break;
+	    case DT_MOVEENT: name = "MOVEENT"; break;
+	    case DT_MOVESZ: name = "MOVESZ"; break;
+	    case DT_FEATURE: name = "FEATURE"; break;
+	    case DT_POSFLAG_1: name = "POSFLAG_1"; break;
+	    case DT_SYMINSZ: name = "SYMINSZ"; break;
+	    case DT_SYMINENT: name = "SYMINENT"; break;
+	    case DT_CONFIG: name = "CONFIG"; stringp = TRUE; break;
+	    case DT_DEPAUDIT: name = "DEPAUDIT"; stringp = TRUE; break;
+	    case DT_AUDIT: name = "AUDIT"; stringp = TRUE; break;
+	    case DT_PLTPAD: name = "PLTPAD"; break;
+	    case DT_MOVETAB: name = "MOVETAB"; break;
+	    case DT_SYMINFO: name = "SYMINFO"; break;
+	    case DT_RELACOUNT: name = "RELACOUNT"; break;
+	    case DT_RELCOUNT: name = "RELCOUNT"; break;
+	    case DT_FLAGS_1: name = "FLAGS_1"; break;
+	    case DT_VERSYM: name = "VERSYM"; break;
+	    case DT_VERDEF: name = "VERDEF"; break;
+	    case DT_VERDEFNUM: name = "VERDEFNUM"; break;
+	    case DT_VERNEED: name = "VERNEED"; break;
+	    case DT_VERNEEDNUM: name = "VERNEEDNUM"; break;
+	    case DT_AUXILIARY: name = "AUXILIARY"; stringp = TRUE; break;
+	    case DT_USED: name = "USED"; break;
+	    case DT_FILTER: name = "FILTER"; stringp = TRUE; break;
+	    case DT_GNU_HASH: name = "GNU_HASH"; break;
+	    }
+
+	  fprintf (f, "  %-20s ", name);
+	  if (! stringp)
+	    {
+	      fprintf (f, "0x");
+	      bfd_fprintf_vma (abfd, f, dyn.d_un.d_val);
+	    }
+	  else
+	    {
+	      const char *string;
+	      unsigned int tagv = dyn.d_un.d_val;
+
+	      string = bfd_elf_string_from_elf_section (abfd, shlink, tagv);
+	      if (string == NULL)
+		goto error_return;
+	      fprintf (f, "%s", string);
+	    }
+	  fprintf (f, "\n");
+	}
+
+      free (dynbuf);
+      dynbuf = NULL;
+    }
+
+  if ((elf_dynverdef (abfd) != 0 && elf_tdata (abfd)->verdef == NULL)
+      || (elf_dynverref (abfd) != 0 && elf_tdata (abfd)->verref == NULL))
+    {
+      if (! _bfd_elf_slurp_version_tables (abfd, FALSE))
+	return FALSE;
+    }
+
+  if (elf_dynverdef (abfd) != 0)
+    {
+      Elf_Internal_Verdef *t;
+
+      fprintf (f, _("\nVersion definitions:\n"));
+      for (t = elf_tdata (abfd)->verdef; t != NULL; t = t->vd_nextdef)
+	{
+	  fprintf (f, "%d 0x%2.2x 0x%8.8lx %s\n", t->vd_ndx,
+		   t->vd_flags, t->vd_hash,
+		   t->vd_nodename ? t->vd_nodename : "<corrupt>");
+	  if (t->vd_auxptr != NULL && t->vd_auxptr->vda_nextptr != NULL)
+	    {
+	      Elf_Internal_Verdaux *a;
+
+	      fprintf (f, "\t");
+	      for (a = t->vd_auxptr->vda_nextptr;
+		   a != NULL;
+		   a = a->vda_nextptr)
+		fprintf (f, "%s ",
+			 a->vda_nodename ? a->vda_nodename : "<corrupt>");
+	      fprintf (f, "\n");
+	    }
+	}
+    }
+
+  if (elf_dynverref (abfd) != 0)
+    {
+      Elf_Internal_Verneed *t;
+
+      fprintf (f, _("\nVersion References:\n"));
+      for (t = elf_tdata (abfd)->verref; t != NULL; t = t->vn_nextref)
+	{
+	  Elf_Internal_Vernaux *a;
+
+	  fprintf (f, _("  required from %s:\n"),
+		   t->vn_filename ? t->vn_filename : "<corrupt>");
+	  for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr)
+	    fprintf (f, "    0x%8.8lx 0x%2.2x %2.2d %s\n", a->vna_hash,
+		     a->vna_flags, a->vna_other,
+		     a->vna_nodename ? a->vna_nodename : "<corrupt>");
+	}
+    }
+
+  return TRUE;
+
+ error_return:
+  if (dynbuf != NULL)
+    free (dynbuf);
+  return FALSE;
+}
+
+/* Display ELF-specific fields of a symbol.  */
+
+void
+bfd_elf_print_symbol (bfd *abfd,
+		      void *filep,
+		      asymbol *symbol,
+		      bfd_print_symbol_type how)
+{
+  FILE *file = (FILE *) filep;
+  switch (how)
+    {
+    case bfd_print_symbol_name:
+      fprintf (file, "%s", symbol->name);
+      break;
+    case bfd_print_symbol_more:
+      fprintf (file, "elf ");
+      bfd_fprintf_vma (abfd, file, symbol->value);
+      fprintf (file, " %lx", (unsigned long) symbol->flags);
+      break;
+    case bfd_print_symbol_all:
+      {
+	const char *section_name;
+	const char *name = NULL;
+	const struct elf_backend_data *bed;
+	unsigned char st_other;
+	bfd_vma val;
+
+	section_name = symbol->section ? symbol->section->name : "(*none*)";
+
+	bed = get_elf_backend_data (abfd);
+	if (bed->elf_backend_print_symbol_all)
+	  name = (*bed->elf_backend_print_symbol_all) (abfd, filep, symbol);
+
+	if (name == NULL)
+	  {
+	    name = symbol->name;
+	    bfd_print_symbol_vandf (abfd, file, symbol);
+	  }
+
+	fprintf (file, " %s\t", section_name);
+	/* Print the "other" value for a symbol.  For common symbols,
+	   we've already printed the size; now print the alignment.
+	   For other symbols, we have no specified alignment, and
+	   we've printed the address; now print the size.  */
+	if (symbol->section && bfd_is_com_section (symbol->section))
+	  val = ((elf_symbol_type *) symbol)->internal_elf_sym.st_value;
+	else
+	  val = ((elf_symbol_type *) symbol)->internal_elf_sym.st_size;
+	bfd_fprintf_vma (abfd, file, val);
+
+	/* If we have version information, print it.  */
+	if (elf_tdata (abfd)->dynversym_section != 0
+	    && (elf_tdata (abfd)->dynverdef_section != 0
+		|| elf_tdata (abfd)->dynverref_section != 0))
+	  {
+	    unsigned int vernum;
+	    const char *version_string;
+
+	    vernum = ((elf_symbol_type *) symbol)->version & VERSYM_VERSION;
+
+	    if (vernum == 0)
+	      version_string = "";
+	    else if (vernum == 1)
+	      version_string = "Base";
+	    else if (vernum <= elf_tdata (abfd)->cverdefs)
+	      version_string =
+		elf_tdata (abfd)->verdef[vernum - 1].vd_nodename;
+	    else
+	      {
+		Elf_Internal_Verneed *t;
+
+		version_string = "";
+		for (t = elf_tdata (abfd)->verref;
+		     t != NULL;
+		     t = t->vn_nextref)
+		  {
+		    Elf_Internal_Vernaux *a;
+
+		    for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr)
+		      {
+			if (a->vna_other == vernum)
+			  {
+			    version_string = a->vna_nodename;
+			    break;
+			  }
+		      }
+		  }
+	      }
+
+	    if ((((elf_symbol_type *) symbol)->version & VERSYM_HIDDEN) == 0)
+	      fprintf (file, "  %-11s", version_string);
+	    else
+	      {
+		int i;
+
+		fprintf (file, " (%s)", version_string);
+		for (i = 10 - strlen (version_string); i > 0; --i)
+		  putc (' ', file);
+	      }
+	  }
+
+	/* If the st_other field is not zero, print it.  */
+	st_other = ((elf_symbol_type *) symbol)->internal_elf_sym.st_other;
+
+	switch (st_other)
+	  {
+	  case 0: break;
+	  case STV_INTERNAL:  fprintf (file, " .internal");  break;
+	  case STV_HIDDEN:    fprintf (file, " .hidden");    break;
+	  case STV_PROTECTED: fprintf (file, " .protected"); break;
+	  default:
+	    /* Some other non-defined flags are also present, so print
+	       everything hex.  */
+	    fprintf (file, " 0x%02x", (unsigned int) st_other);
+	  }
+
+	fprintf (file, " %s", name);
+      }
+      break;
+    }
+}
+
+/* Allocate an ELF string table--force the first byte to be zero.  */
+
+struct bfd_strtab_hash *
+_bfd_elf_stringtab_init (void)
+{
+  struct bfd_strtab_hash *ret;
+
+  ret = _bfd_stringtab_init ();
+  if (ret != NULL)
+    {
+      bfd_size_type loc;
+
+      loc = _bfd_stringtab_add (ret, "", TRUE, FALSE);
+      BFD_ASSERT (loc == 0 || loc == (bfd_size_type) -1);
+      if (loc == (bfd_size_type) -1)
+	{
+	  _bfd_stringtab_free (ret);
+	  ret = NULL;
+	}
+    }
+  return ret;
+}
+
+/* ELF .o/exec file reading */
+
+/* Create a new bfd section from an ELF section header.  */
+
+bfd_boolean
+bfd_section_from_shdr (bfd *abfd, unsigned int shindex)
+{
+  Elf_Internal_Shdr *hdr;
+  Elf_Internal_Ehdr *ehdr;
+  const struct elf_backend_data *bed;
+  const char *name;
+
+  if (shindex >= elf_numsections (abfd))
+    return FALSE;
+
+  hdr = elf_elfsections (abfd)[shindex];
+  ehdr = elf_elfheader (abfd);
+  name = bfd_elf_string_from_elf_section (abfd, ehdr->e_shstrndx,
+					  hdr->sh_name);
+  if (name == NULL)
+    return FALSE;
+
+  bed = get_elf_backend_data (abfd);
+  switch (hdr->sh_type)
+    {
+    case SHT_NULL:
+      /* Inactive section. Throw it away.  */
+      return TRUE;
+
+    case SHT_PROGBITS:	/* Normal section with contents.  */
+    case SHT_NOBITS:	/* .bss section.  */
+    case SHT_HASH:	/* .hash section.  */
+    case SHT_NOTE:	/* .note section.  */
+    case SHT_INIT_ARRAY:	/* .init_array section.  */
+    case SHT_FINI_ARRAY:	/* .fini_array section.  */
+    case SHT_PREINIT_ARRAY:	/* .preinit_array section.  */
+    case SHT_GNU_LIBLIST:	/* .gnu.liblist section.  */
+    case SHT_GNU_HASH:		/* .gnu.hash section.  */
+      return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex);
+
+    case SHT_DYNAMIC:	/* Dynamic linking information.  */
+      if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex))
+	return FALSE;
+      if (hdr->sh_link > elf_numsections (abfd))
+	{
+	  /* PR 10478: Accept Solaris binaries with a sh_link
+	     field set to SHN_BEFORE or SHN_AFTER.  */
+	  switch (bfd_get_arch (abfd))
+	    {
+	    case bfd_arch_i386:
+	    case bfd_arch_sparc:
+	      if (hdr->sh_link == (SHN_LORESERVE & 0xffff) /* SHN_BEFORE */
+		  || hdr->sh_link == ((SHN_LORESERVE + 1) & 0xffff) /* SHN_AFTER */)
+		break;
+	      /* Otherwise fall through.  */
+	    default:
+	      return FALSE;
+	    }
+	}
+      else if (elf_elfsections (abfd)[hdr->sh_link] == NULL)
+	return FALSE;
+      else if (elf_elfsections (abfd)[hdr->sh_link]->sh_type != SHT_STRTAB)
+	{
+	  Elf_Internal_Shdr *dynsymhdr;
+
+	  /* The shared libraries distributed with hpux11 have a bogus
+	     sh_link field for the ".dynamic" section.  Find the
+	     string table for the ".dynsym" section instead.  */
+	  if (elf_dynsymtab (abfd) != 0)
+	    {
+	      dynsymhdr = elf_elfsections (abfd)[elf_dynsymtab (abfd)];
+	      hdr->sh_link = dynsymhdr->sh_link;
+	    }
+	  else
+	    {
+	      unsigned int i, num_sec;
+
+	      num_sec = elf_numsections (abfd);
+	      for (i = 1; i < num_sec; i++)
+		{
+		  dynsymhdr = elf_elfsections (abfd)[i];
+		  if (dynsymhdr->sh_type == SHT_DYNSYM)
+		    {
+		      hdr->sh_link = dynsymhdr->sh_link;
+		      break;
+		    }
+		}
+	    }
+	}
+      break;
+
+    case SHT_SYMTAB:		/* A symbol table */
+      if (elf_onesymtab (abfd) == shindex)
+	return TRUE;
+
+      if (hdr->sh_entsize != bed->s->sizeof_sym)
+	return FALSE;
+      if (hdr->sh_info * hdr->sh_entsize > hdr->sh_size)
+	return FALSE;
+      BFD_ASSERT (elf_onesymtab (abfd) == 0);
+      elf_onesymtab (abfd) = shindex;
+      elf_tdata (abfd)->symtab_hdr = *hdr;
+      elf_elfsections (abfd)[shindex] = hdr = &elf_tdata (abfd)->symtab_hdr;
+      abfd->flags |= HAS_SYMS;
+
+      /* Sometimes a shared object will map in the symbol table.  If
+	 SHF_ALLOC is set, and this is a shared object, then we also
+	 treat this section as a BFD section.  We can not base the
+	 decision purely on SHF_ALLOC, because that flag is sometimes
+	 set in a relocatable object file, which would confuse the
+	 linker.  */
+      if ((hdr->sh_flags & SHF_ALLOC) != 0
+	  && (abfd->flags & DYNAMIC) != 0
+	  && ! _bfd_elf_make_section_from_shdr (abfd, hdr, name,
+						shindex))
+	return FALSE;
+
+      /* Go looking for SHT_SYMTAB_SHNDX too, since if there is one we
+	 can't read symbols without that section loaded as well.  It
+	 is most likely specified by the next section header.  */
+      if (elf_elfsections (abfd)[elf_symtab_shndx (abfd)]->sh_link != shindex)
+	{
+	  unsigned int i, num_sec;
+
+	  num_sec = elf_numsections (abfd);
+	  for (i = shindex + 1; i < num_sec; i++)
+	    {
+	      Elf_Internal_Shdr *hdr2 = elf_elfsections (abfd)[i];
+	      if (hdr2->sh_type == SHT_SYMTAB_SHNDX
+		  && hdr2->sh_link == shindex)
+		break;
+	    }
+	  if (i == num_sec)
+	    for (i = 1; i < shindex; i++)
+	      {
+		Elf_Internal_Shdr *hdr2 = elf_elfsections (abfd)[i];
+		if (hdr2->sh_type == SHT_SYMTAB_SHNDX
+		    && hdr2->sh_link == shindex)
+		  break;
+	      }
+	  if (i != shindex)
+	    return bfd_section_from_shdr (abfd, i);
+	}
+      return TRUE;
+
+    case SHT_DYNSYM:		/* A dynamic symbol table */
+      if (elf_dynsymtab (abfd) == shindex)
+	return TRUE;
+
+      if (hdr->sh_entsize != bed->s->sizeof_sym)
+	return FALSE;
+      BFD_ASSERT (elf_dynsymtab (abfd) == 0);
+      elf_dynsymtab (abfd) = shindex;
+      elf_tdata (abfd)->dynsymtab_hdr = *hdr;
+      elf_elfsections (abfd)[shindex] = hdr = &elf_tdata (abfd)->dynsymtab_hdr;
+      abfd->flags |= HAS_SYMS;
+
+      /* Besides being a symbol table, we also treat this as a regular
+	 section, so that objcopy can handle it.  */
+      return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex);
+
+    case SHT_SYMTAB_SHNDX:	/* Symbol section indices when >64k sections */
+      if (elf_symtab_shndx (abfd) == shindex)
+	return TRUE;
+
+      BFD_ASSERT (elf_symtab_shndx (abfd) == 0);
+      elf_symtab_shndx (abfd) = shindex;
+      elf_tdata (abfd)->symtab_shndx_hdr = *hdr;
+      elf_elfsections (abfd)[shindex] = &elf_tdata (abfd)->symtab_shndx_hdr;
+      return TRUE;
+
+    case SHT_STRTAB:		/* A string table */
+      if (hdr->bfd_section != NULL)
+	return TRUE;
+      if (ehdr->e_shstrndx == shindex)
+	{
+	  elf_tdata (abfd)->shstrtab_hdr = *hdr;
+	  elf_elfsections (abfd)[shindex] = &elf_tdata (abfd)->shstrtab_hdr;
+	  return TRUE;
+	}
+      if (elf_elfsections (abfd)[elf_onesymtab (abfd)]->sh_link == shindex)
+	{
+	symtab_strtab:
+	  elf_tdata (abfd)->strtab_hdr = *hdr;
+	  elf_elfsections (abfd)[shindex] = &elf_tdata (abfd)->strtab_hdr;
+	  return TRUE;
+	}
+      if (elf_elfsections (abfd)[elf_dynsymtab (abfd)]->sh_link == shindex)
+	{
+	dynsymtab_strtab:
+	  elf_tdata (abfd)->dynstrtab_hdr = *hdr;
+	  hdr = &elf_tdata (abfd)->dynstrtab_hdr;
+	  elf_elfsections (abfd)[shindex] = hdr;
+	  /* We also treat this as a regular section, so that objcopy
+	     can handle it.  */
+	  return _bfd_elf_make_section_from_shdr (abfd, hdr, name,
+						  shindex);
+	}
+
+      /* If the string table isn't one of the above, then treat it as a
+	 regular section.  We need to scan all the headers to be sure,
+	 just in case this strtab section appeared before the above.  */
+      if (elf_onesymtab (abfd) == 0 || elf_dynsymtab (abfd) == 0)
+	{
+	  unsigned int i, num_sec;
+
+	  num_sec = elf_numsections (abfd);
+	  for (i = 1; i < num_sec; i++)
+	    {
+	      Elf_Internal_Shdr *hdr2 = elf_elfsections (abfd)[i];
+	      if (hdr2->sh_link == shindex)
+		{
+		  /* Prevent endless recursion on broken objects.  */
+		  if (i == shindex)
+		    return FALSE;
+		  if (! bfd_section_from_shdr (abfd, i))
+		    return FALSE;
+		  if (elf_onesymtab (abfd) == i)
+		    goto symtab_strtab;
+		  if (elf_dynsymtab (abfd) == i)
+		    goto dynsymtab_strtab;
+		}
+	    }
+	}
+      return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex);
+
+    case SHT_REL:
+    case SHT_RELA:
+      /* *These* do a lot of work -- but build no sections!  */
+      {
+	asection *target_sect;
+	Elf_Internal_Shdr *hdr2, **p_hdr;
+	unsigned int num_sec = elf_numsections (abfd);
+	struct bfd_elf_section_data *esdt;
+	bfd_size_type amt;
+
+	if (hdr->sh_entsize
+	    != (bfd_size_type) (hdr->sh_type == SHT_REL
+				? bed->s->sizeof_rel : bed->s->sizeof_rela))
+	  return FALSE;
+
+	/* Check for a bogus link to avoid crashing.  */
+	if (hdr->sh_link >= num_sec)
+	  {
+	    ((*_bfd_error_handler)
+	     (_("%B: invalid link %lu for reloc section %s (index %u)"),
+	      abfd, hdr->sh_link, name, shindex));
+	    return _bfd_elf_make_section_from_shdr (abfd, hdr, name,
+						    shindex);
+	  }
+
+	/* For some incomprehensible reason Oracle distributes
+	   libraries for Solaris in which some of the objects have
+	   bogus sh_link fields.  It would be nice if we could just
+	   reject them, but, unfortunately, some people need to use
+	   them.  We scan through the section headers; if we find only
+	   one suitable symbol table, we clobber the sh_link to point
+	   to it.  I hope this doesn't break anything.
+
+	   Don't do it on executable nor shared library.  */
+	if ((abfd->flags & (DYNAMIC | EXEC_P)) == 0
+	    && elf_elfsections (abfd)[hdr->sh_link]->sh_type != SHT_SYMTAB
+	    && elf_elfsections (abfd)[hdr->sh_link]->sh_type != SHT_DYNSYM)
+	  {
+	    unsigned int scan;
+	    int found;
+
+	    found = 0;
+	    for (scan = 1; scan < num_sec; scan++)
+	      {
+		if (elf_elfsections (abfd)[scan]->sh_type == SHT_SYMTAB
+		    || elf_elfsections (abfd)[scan]->sh_type == SHT_DYNSYM)
+		  {
+		    if (found != 0)
+		      {
+			found = 0;
+			break;
+		      }
+		    found = scan;
+		  }
+	      }
+	    if (found != 0)
+	      hdr->sh_link = found;
+	  }
+
+	/* Get the symbol table.  */
+	if ((elf_elfsections (abfd)[hdr->sh_link]->sh_type == SHT_SYMTAB
+	     || elf_elfsections (abfd)[hdr->sh_link]->sh_type == SHT_DYNSYM)
+	    && ! bfd_section_from_shdr (abfd, hdr->sh_link))
+	  return FALSE;
+
+	/* If this reloc section does not use the main symbol table we
+	   don't treat it as a reloc section.  BFD can't adequately
+	   represent such a section, so at least for now, we don't
+	   try.  We just present it as a normal section.  We also
+	   can't use it as a reloc section if it points to the null
+	   section, an invalid section, another reloc section, or its
+	   sh_link points to the null section.  */
+	if (hdr->sh_link != elf_onesymtab (abfd)
+	    || hdr->sh_link == SHN_UNDEF
+	    || hdr->sh_info == SHN_UNDEF
+	    || hdr->sh_info >= num_sec
+	    || elf_elfsections (abfd)[hdr->sh_info]->sh_type == SHT_REL
+	    || elf_elfsections (abfd)[hdr->sh_info]->sh_type == SHT_RELA)
+	  return _bfd_elf_make_section_from_shdr (abfd, hdr, name,
+						  shindex);
+
+	if (! bfd_section_from_shdr (abfd, hdr->sh_info))
+	  return FALSE;
+	target_sect = bfd_section_from_elf_index (abfd, hdr->sh_info);
+	if (target_sect == NULL)
+	  return FALSE;
+
+	esdt = elf_section_data (target_sect);
+	if (hdr->sh_type == SHT_RELA)
+	  p_hdr = &esdt->rela.hdr;
+	else
+	  p_hdr = &esdt->rel.hdr;
+
+	BFD_ASSERT (*p_hdr == NULL);
+	amt = sizeof (*hdr2);
+	hdr2 = (Elf_Internal_Shdr *) bfd_alloc (abfd, amt);
+	if (hdr2 == NULL)
+	  return FALSE;
+	*hdr2 = *hdr;
+	*p_hdr = hdr2;
+	elf_elfsections (abfd)[shindex] = hdr2;
+	target_sect->reloc_count += NUM_SHDR_ENTRIES (hdr);
+	target_sect->flags |= SEC_RELOC;
+	target_sect->relocation = NULL;
+	target_sect->rel_filepos = hdr->sh_offset;
+	/* In the section to which the relocations apply, mark whether
+	   its relocations are of the REL or RELA variety.  */
+	if (hdr->sh_size != 0)
+	  {
+	    if (hdr->sh_type == SHT_RELA)
+	      target_sect->use_rela_p = 1;
+	  }
+	abfd->flags |= HAS_RELOC;
+	return TRUE;
+      }
+
+    case SHT_GNU_verdef:
+      elf_dynverdef (abfd) = shindex;
+      elf_tdata (abfd)->dynverdef_hdr = *hdr;
+      return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex);
+
+    case SHT_GNU_versym:
+      if (hdr->sh_entsize != sizeof (Elf_External_Versym))
+	return FALSE;
+      elf_dynversym (abfd) = shindex;
+      elf_tdata (abfd)->dynversym_hdr = *hdr;
+      return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex);
+
+    case SHT_GNU_verneed:
+      elf_dynverref (abfd) = shindex;
+      elf_tdata (abfd)->dynverref_hdr = *hdr;
+      return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex);
+
+    case SHT_SHLIB:
+      return TRUE;
+
+    case SHT_GROUP:
+      if (! IS_VALID_GROUP_SECTION_HEADER (hdr))
+	return FALSE;
+      if (!_bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex))
+	return FALSE;
+      if (hdr->contents != NULL)
+	{
+	  Elf_Internal_Group *idx = (Elf_Internal_Group *) hdr->contents;
+	  unsigned int n_elt = hdr->sh_size / GRP_ENTRY_SIZE;
+	  asection *s;
+
+	  if (idx->flags & GRP_COMDAT)
+	    hdr->bfd_section->flags
+	      |= SEC_LINK_ONCE | SEC_LINK_DUPLICATES_DISCARD;
+
+	  /* We try to keep the same section order as it comes in.  */
+	  idx += n_elt;
+	  while (--n_elt != 0)
+	    {
+	      --idx;
+
+	      if (idx->shdr != NULL
+		  && (s = idx->shdr->bfd_section) != NULL
+		  && elf_next_in_group (s) != NULL)
+		{
+		  elf_next_in_group (hdr->bfd_section) = s;
+		  break;
+		}
+	    }
+	}
+      break;
+
+    default:
+      /* Possibly an attributes section.  */
+      if (hdr->sh_type == SHT_GNU_ATTRIBUTES
+	  || hdr->sh_type == bed->obj_attrs_section_type)
+	{
+	  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex))
+	    return FALSE;
+	  _bfd_elf_parse_attributes (abfd, hdr);
+	  return TRUE;
+	}
+
+      /* Check for any processor-specific section types.  */
+      if (bed->elf_backend_section_from_shdr (abfd, hdr, name, shindex))
+	return TRUE;
+
+      if (hdr->sh_type >= SHT_LOUSER && hdr->sh_type <= SHT_HIUSER)
+	{
+	  if ((hdr->sh_flags & SHF_ALLOC) != 0)
+	    /* FIXME: How to properly handle allocated section reserved
+	       for applications?  */
+	    (*_bfd_error_handler)
+	      (_("%B: don't know how to handle allocated, application "
+		 "specific section `%s' [0x%8x]"),
+	       abfd, name, hdr->sh_type);
+	  else
+	    /* Allow sections reserved for applications.  */
+	    return _bfd_elf_make_section_from_shdr (abfd, hdr, name,
+						    shindex);
+	}
+      else if (hdr->sh_type >= SHT_LOPROC
+	       && hdr->sh_type <= SHT_HIPROC)
+	/* FIXME: We should handle this section.  */
+	(*_bfd_error_handler)
+	  (_("%B: don't know how to handle processor specific section "
+	     "`%s' [0x%8x]"),
+	   abfd, name, hdr->sh_type);
+      else if (hdr->sh_type >= SHT_LOOS && hdr->sh_type <= SHT_HIOS)
+	{
+	  /* Unrecognised OS-specific sections.  */
+	  if ((hdr->sh_flags & SHF_OS_NONCONFORMING) != 0)
+	    /* SHF_OS_NONCONFORMING indicates that special knowledge is
+	       required to correctly process the section and the file should
+	       be rejected with an error message.  */
+	    (*_bfd_error_handler)
+	      (_("%B: don't know how to handle OS specific section "
+		 "`%s' [0x%8x]"),
+	       abfd, name, hdr->sh_type);
+	  else
+	    /* Otherwise it should be processed.  */
+	    return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex);
+	}
+      else
+	/* FIXME: We should handle this section.  */
+	(*_bfd_error_handler)
+	  (_("%B: don't know how to handle section `%s' [0x%8x]"),
+	   abfd, name, hdr->sh_type);
+
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Return the local symbol specified by ABFD, R_SYMNDX.  */
+
+Elf_Internal_Sym *
+bfd_sym_from_r_symndx (struct sym_cache *cache,
+		       bfd *abfd,
+		       unsigned long r_symndx)
+{
+  unsigned int ent = r_symndx % LOCAL_SYM_CACHE_SIZE;
+
+  if (cache->abfd != abfd || cache->indx[ent] != r_symndx)
+    {
+      Elf_Internal_Shdr *symtab_hdr;
+      unsigned char esym[sizeof (Elf64_External_Sym)];
+      Elf_External_Sym_Shndx eshndx;
+
+      symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+      if (bfd_elf_get_elf_syms (abfd, symtab_hdr, 1, r_symndx,
+				&cache->sym[ent], esym, &eshndx) == NULL)
+	return NULL;
+
+      if (cache->abfd != abfd)
+	{
+	  memset (cache->indx, -1, sizeof (cache->indx));
+	  cache->abfd = abfd;
+	}
+      cache->indx[ent] = r_symndx;
+    }
+
+  return &cache->sym[ent];
+}
+
+/* Given an ELF section number, retrieve the corresponding BFD
+   section.  */
+
+asection *
+bfd_section_from_elf_index (bfd *abfd, unsigned int sec_index)
+{
+  if (sec_index >= elf_numsections (abfd))
+    return NULL;
+  return elf_elfsections (abfd)[sec_index]->bfd_section;
+}
+
+static const struct bfd_elf_special_section special_sections_b[] =
+{
+  { STRING_COMMA_LEN (".bss"), -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE },
+  { NULL,                   0,  0, 0,            0 }
+};
+
+static const struct bfd_elf_special_section special_sections_c[] =
+{
+  { STRING_COMMA_LEN (".comment"), 0, SHT_PROGBITS, 0 },
+  { NULL,                       0, 0, 0,            0 }
+};
+
+static const struct bfd_elf_special_section special_sections_d[] =
+{
+  { STRING_COMMA_LEN (".data"),         -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".data1"),         0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".debug"),         0, SHT_PROGBITS, 0 },
+  { STRING_COMMA_LEN (".debug_line"),    0, SHT_PROGBITS, 0 },
+  { STRING_COMMA_LEN (".debug_info"),    0, SHT_PROGBITS, 0 },
+  { STRING_COMMA_LEN (".debug_abbrev"),  0, SHT_PROGBITS, 0 },
+  { STRING_COMMA_LEN (".debug_aranges"), 0, SHT_PROGBITS, 0 },
+  { STRING_COMMA_LEN (".dynamic"),       0, SHT_DYNAMIC,  SHF_ALLOC },
+  { STRING_COMMA_LEN (".dynstr"),        0, SHT_STRTAB,   SHF_ALLOC },
+  { STRING_COMMA_LEN (".dynsym"),        0, SHT_DYNSYM,   SHF_ALLOC },
+  { NULL,                      0,        0, 0,            0 }
+};
+
+static const struct bfd_elf_special_section special_sections_f[] =
+{
+  { STRING_COMMA_LEN (".fini"),       0, SHT_PROGBITS,   SHF_ALLOC + SHF_EXECINSTR },
+  { STRING_COMMA_LEN (".fini_array"), 0, SHT_FINI_ARRAY, SHF_ALLOC + SHF_WRITE },
+  { NULL,                          0, 0, 0,              0 }
+};
+
+static const struct bfd_elf_special_section special_sections_g[] =
+{
+  { STRING_COMMA_LEN (".gnu.linkonce.b"), -2, SHT_NOBITS,      SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".gnu.lto_"),       -1, SHT_PROGBITS,    SHF_EXCLUDE },
+  { STRING_COMMA_LEN (".got"),             0, SHT_PROGBITS,    SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".gnu.version"),     0, SHT_GNU_versym,  0 },
+  { STRING_COMMA_LEN (".gnu.version_d"),   0, SHT_GNU_verdef,  0 },
+  { STRING_COMMA_LEN (".gnu.version_r"),   0, SHT_GNU_verneed, 0 },
+  { STRING_COMMA_LEN (".gnu.liblist"),     0, SHT_GNU_LIBLIST, SHF_ALLOC },
+  { STRING_COMMA_LEN (".gnu.conflict"),    0, SHT_RELA,        SHF_ALLOC },
+  { STRING_COMMA_LEN (".gnu.hash"),        0, SHT_GNU_HASH,    SHF_ALLOC },
+  { NULL,                        0,        0, 0,               0 }
+};
+
+static const struct bfd_elf_special_section special_sections_h[] =
+{
+  { STRING_COMMA_LEN (".hash"), 0, SHT_HASH,     SHF_ALLOC },
+  { NULL,                    0, 0, 0,            0 }
+};
+
+static const struct bfd_elf_special_section special_sections_i[] =
+{
+  { STRING_COMMA_LEN (".init"),       0, SHT_PROGBITS,   SHF_ALLOC + SHF_EXECINSTR },
+  { STRING_COMMA_LEN (".init_array"), 0, SHT_INIT_ARRAY, SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".interp"),     0, SHT_PROGBITS,   0 },
+  { NULL,                      0,     0, 0,              0 }
+};
+
+static const struct bfd_elf_special_section special_sections_l[] =
+{
+  { STRING_COMMA_LEN (".line"), 0, SHT_PROGBITS, 0 },
+  { NULL,                    0, 0, 0,            0 }
+};
+
+static const struct bfd_elf_special_section special_sections_n[] =
+{
+  { STRING_COMMA_LEN (".note.GNU-stack"), 0, SHT_PROGBITS, 0 },
+  { STRING_COMMA_LEN (".note"),          -1, SHT_NOTE,     0 },
+  { NULL,                    0,           0, 0,            0 }
+};
+
+static const struct bfd_elf_special_section special_sections_p[] =
+{
+  { STRING_COMMA_LEN (".preinit_array"), 0, SHT_PREINIT_ARRAY, SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".plt"),           0, SHT_PROGBITS,      SHF_ALLOC + SHF_EXECINSTR },
+  { NULL,                   0,           0, 0,                 0 }
+};
+
+static const struct bfd_elf_special_section special_sections_r[] =
+{
+  { STRING_COMMA_LEN (".rodata"), -2, SHT_PROGBITS, SHF_ALLOC },
+  { STRING_COMMA_LEN (".rodata1"), 0, SHT_PROGBITS, SHF_ALLOC },
+  { STRING_COMMA_LEN (".rela"),   -1, SHT_RELA,     0 },
+  { STRING_COMMA_LEN (".rel"),    -1, SHT_REL,      0 },
+  { NULL,                   0,     0, 0,            0 }
+};
+
+static const struct bfd_elf_special_section special_sections_s[] =
+{
+  { STRING_COMMA_LEN (".shstrtab"), 0, SHT_STRTAB, 0 },
+  { STRING_COMMA_LEN (".strtab"),   0, SHT_STRTAB, 0 },
+  { STRING_COMMA_LEN (".symtab"),   0, SHT_SYMTAB, 0 },
+  /* See struct bfd_elf_special_section declaration for the semantics of
+     this special case where .prefix_length != strlen (.prefix).  */
+  { ".stabstr",			5,  3, SHT_STRTAB, 0 },
+  { NULL,                       0,  0, 0,          0 }
+};
+
+static const struct bfd_elf_special_section special_sections_t[] =
+{
+  { STRING_COMMA_LEN (".text"),  -2, SHT_PROGBITS, SHF_ALLOC + SHF_EXECINSTR },
+  { STRING_COMMA_LEN (".tbss"),  -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE + SHF_TLS },
+  { STRING_COMMA_LEN (".tdata"), -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_TLS },
+  { NULL,                     0,  0, 0,            0 }
+};
+
+static const struct bfd_elf_special_section special_sections_z[] =
+{
+  { STRING_COMMA_LEN (".zdebug_line"),    0, SHT_PROGBITS, 0 },
+  { STRING_COMMA_LEN (".zdebug_info"),    0, SHT_PROGBITS, 0 },
+  { STRING_COMMA_LEN (".zdebug_abbrev"),  0, SHT_PROGBITS, 0 },
+  { STRING_COMMA_LEN (".zdebug_aranges"), 0, SHT_PROGBITS, 0 },
+  { NULL,                     0,  0, 0,            0 }
+};
+
+static const struct bfd_elf_special_section * const special_sections[] =
+{
+  special_sections_b,		/* 'b' */
+  special_sections_c,		/* 'c' */
+  special_sections_d,		/* 'd' */
+  NULL,				/* 'e' */
+  special_sections_f,		/* 'f' */
+  special_sections_g,		/* 'g' */
+  special_sections_h,		/* 'h' */
+  special_sections_i,		/* 'i' */
+  NULL,				/* 'j' */
+  NULL,				/* 'k' */
+  special_sections_l,		/* 'l' */
+  NULL,				/* 'm' */
+  special_sections_n,		/* 'n' */
+  NULL,				/* 'o' */
+  special_sections_p,		/* 'p' */
+  NULL,				/* 'q' */
+  special_sections_r,		/* 'r' */
+  special_sections_s,		/* 's' */
+  special_sections_t,		/* 't' */
+  NULL,				/* 'u' */
+  NULL,				/* 'v' */
+  NULL,				/* 'w' */
+  NULL,				/* 'x' */
+  NULL,				/* 'y' */
+  special_sections_z		/* 'z' */
+};
+
+const struct bfd_elf_special_section *
+_bfd_elf_get_special_section (const char *name,
+			      const struct bfd_elf_special_section *spec,
+			      unsigned int rela)
+{
+  int i;
+  int len;
+
+  len = strlen (name);
+
+  for (i = 0; spec[i].prefix != NULL; i++)
+    {
+      int suffix_len;
+      int prefix_len = spec[i].prefix_length;
+
+      if (len < prefix_len)
+	continue;
+      if (memcmp (name, spec[i].prefix, prefix_len) != 0)
+	continue;
+
+      suffix_len = spec[i].suffix_length;
+      if (suffix_len <= 0)
+	{
+	  if (name[prefix_len] != 0)
+	    {
+	      if (suffix_len == 0)
+		continue;
+	      if (name[prefix_len] != '.'
+		  && (suffix_len == -2
+		      || (rela && spec[i].type == SHT_REL)))
+		continue;
+	    }
+	}
+      else
+	{
+	  if (len < prefix_len + suffix_len)
+	    continue;
+	  if (memcmp (name + len - suffix_len,
+		      spec[i].prefix + prefix_len,
+		      suffix_len) != 0)
+	    continue;
+	}
+      return &spec[i];
+    }
+
+  return NULL;
+}
+
+const struct bfd_elf_special_section *
+_bfd_elf_get_sec_type_attr (bfd *abfd, asection *sec)
+{
+  int i;
+  const struct bfd_elf_special_section *spec;
+  const struct elf_backend_data *bed;
+
+  /* See if this is one of the special sections.  */
+  if (sec->name == NULL)
+    return NULL;
+
+  bed = get_elf_backend_data (abfd);
+  spec = bed->special_sections;
+  if (spec)
+    {
+      spec = _bfd_elf_get_special_section (sec->name,
+					   bed->special_sections,
+					   sec->use_rela_p);
+      if (spec != NULL)
+	return spec;
+    }
+
+  if (sec->name[0] != '.')
+    return NULL;
+
+  i = sec->name[1] - 'b';
+  if (i < 0 || i > 'z' - 'b')
+    return NULL;
+
+  spec = special_sections[i];
+
+  if (spec == NULL)
+    return NULL;
+
+  return _bfd_elf_get_special_section (sec->name, spec, sec->use_rela_p);
+}
+
+bfd_boolean
+_bfd_elf_new_section_hook (bfd *abfd, asection *sec)
+{
+  struct bfd_elf_section_data *sdata;
+  const struct elf_backend_data *bed;
+  const struct bfd_elf_special_section *ssect;
+
+  sdata = (struct bfd_elf_section_data *) sec->used_by_bfd;
+  if (sdata == NULL)
+    {
+      sdata = (struct bfd_elf_section_data *) bfd_zalloc (abfd,
+                                                          sizeof (*sdata));
+      if (sdata == NULL)
+	return FALSE;
+      sec->used_by_bfd = sdata;
+    }
+
+  /* Indicate whether or not this section should use RELA relocations.  */
+  bed = get_elf_backend_data (abfd);
+  sec->use_rela_p = bed->default_use_rela_p;
+
+  /* When we read a file, we don't need to set ELF section type and
+     flags.  They will be overridden in _bfd_elf_make_section_from_shdr
+     anyway.  We will set ELF section type and flags for all linker
+     created sections.  If user specifies BFD section flags, we will
+     set ELF section type and flags based on BFD section flags in
+     elf_fake_sections.  Special handling for .init_array/.fini_array
+     output sections since they may contain .ctors/.dtors input
+     sections.  We don't want _bfd_elf_init_private_section_data to
+     copy ELF section type from .ctors/.dtors input sections.  */
+  if (abfd->direction != read_direction
+      || (sec->flags & SEC_LINKER_CREATED) != 0)
+    {
+      ssect = (*bed->get_sec_type_attr) (abfd, sec);
+      if (ssect != NULL
+	  && (!sec->flags
+	      || (sec->flags & SEC_LINKER_CREATED) != 0
+	      || ssect->type == SHT_INIT_ARRAY
+	      || ssect->type == SHT_FINI_ARRAY))
+	{
+	  elf_section_type (sec) = ssect->type;
+	  elf_section_flags (sec) = ssect->attr;
+	}
+    }
+
+  return _bfd_generic_new_section_hook (abfd, sec);
+}
+
+/* Create a new bfd section from an ELF program header.
+
+   Since program segments have no names, we generate a synthetic name
+   of the form segment<NUM>, where NUM is generally the index in the
+   program header table.  For segments that are split (see below) we
+   generate the names segment<NUM>a and segment<NUM>b.
+
+   Note that some program segments may have a file size that is different than
+   (less than) the memory size.  All this means is that at execution the
+   system must allocate the amount of memory specified by the memory size,
+   but only initialize it with the first "file size" bytes read from the
+   file.  This would occur for example, with program segments consisting
+   of combined data+bss.
+
+   To handle the above situation, this routine generates TWO bfd sections
+   for the single program segment.  The first has the length specified by
+   the file size of the segment, and the second has the length specified
+   by the difference between the two sizes.  In effect, the segment is split
+   into its initialized and uninitialized parts.
+
+ */
+
+bfd_boolean
+_bfd_elf_make_section_from_phdr (bfd *abfd,
+				 Elf_Internal_Phdr *hdr,
+				 int hdr_index,
+				 const char *type_name)
+{
+  asection *newsect;
+  char *name;
+  char namebuf[64];
+  size_t len;
+  int split;
+
+  split = ((hdr->p_memsz > 0)
+	    && (hdr->p_filesz > 0)
+	    && (hdr->p_memsz > hdr->p_filesz));
+
+  if (hdr->p_filesz > 0)
+    {
+      sprintf (namebuf, "%s%d%s", type_name, hdr_index, split ? "a" : "");
+      len = strlen (namebuf) + 1;
+      name = (char *) bfd_alloc (abfd, len);
+      if (!name)
+	return FALSE;
+      memcpy (name, namebuf, len);
+      newsect = bfd_make_section (abfd, name);
+      if (newsect == NULL)
+	return FALSE;
+      newsect->vma = hdr->p_vaddr;
+      newsect->lma = hdr->p_paddr;
+      newsect->size = hdr->p_filesz;
+      newsect->filepos = hdr->p_offset;
+      newsect->flags |= SEC_HAS_CONTENTS;
+      newsect->alignment_power = bfd_log2 (hdr->p_align);
+      if (hdr->p_type == PT_LOAD)
+	{
+	  newsect->flags |= SEC_ALLOC;
+	  newsect->flags |= SEC_LOAD;
+	  if (hdr->p_flags & PF_X)
+	    {
+	      /* FIXME: all we known is that it has execute PERMISSION,
+		 may be data.  */
+	      newsect->flags |= SEC_CODE;
+	    }
+	}
+      if (!(hdr->p_flags & PF_W))
+	{
+	  newsect->flags |= SEC_READONLY;
+	}
+    }
+
+  if (hdr->p_memsz > hdr->p_filesz)
+    {
+      bfd_vma align;
+
+      sprintf (namebuf, "%s%d%s", type_name, hdr_index, split ? "b" : "");
+      len = strlen (namebuf) + 1;
+      name = (char *) bfd_alloc (abfd, len);
+      if (!name)
+	return FALSE;
+      memcpy (name, namebuf, len);
+      newsect = bfd_make_section (abfd, name);
+      if (newsect == NULL)
+	return FALSE;
+      newsect->vma = hdr->p_vaddr + hdr->p_filesz;
+      newsect->lma = hdr->p_paddr + hdr->p_filesz;
+      newsect->size = hdr->p_memsz - hdr->p_filesz;
+      newsect->filepos = hdr->p_offset + hdr->p_filesz;
+      align = newsect->vma & -newsect->vma;
+      if (align == 0 || align > hdr->p_align)
+	align = hdr->p_align;
+      newsect->alignment_power = bfd_log2 (align);
+      if (hdr->p_type == PT_LOAD)
+	{
+	  /* Hack for gdb.  Segments that have not been modified do
+	     not have their contents written to a core file, on the
+	     assumption that a debugger can find the contents in the
+	     executable.  We flag this case by setting the fake
+	     section size to zero.  Note that "real" bss sections will
+	     always have their contents dumped to the core file.  */
+	  if (bfd_get_format (abfd) == bfd_core)
+	    newsect->size = 0;
+	  newsect->flags |= SEC_ALLOC;
+	  if (hdr->p_flags & PF_X)
+	    newsect->flags |= SEC_CODE;
+	}
+      if (!(hdr->p_flags & PF_W))
+	newsect->flags |= SEC_READONLY;
+    }
+
+  return TRUE;
+}
+
+bfd_boolean
+bfd_section_from_phdr (bfd *abfd, Elf_Internal_Phdr *hdr, int hdr_index)
+{
+  const struct elf_backend_data *bed;
+
+  switch (hdr->p_type)
+    {
+    case PT_NULL:
+      return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "null");
+
+    case PT_LOAD:
+      return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "load");
+
+    case PT_DYNAMIC:
+      return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "dynamic");
+
+    case PT_INTERP:
+      return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "interp");
+
+    case PT_NOTE:
+      if (! _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "note"))
+	return FALSE;
+      if (! elf_read_notes (abfd, hdr->p_offset, hdr->p_filesz))
+	return FALSE;
+      return TRUE;
+
+    case PT_SHLIB:
+      return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "shlib");
+
+    case PT_PHDR:
+      return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "phdr");
+
+    case PT_GNU_EH_FRAME:
+      return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index,
+					      "eh_frame_hdr");
+
+    case PT_GNU_STACK:
+      return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "stack");
+
+    case PT_GNU_RELRO:
+      return _bfd_elf_make_section_from_phdr (abfd, hdr, hdr_index, "relro");
+
+    default:
+      /* Check for any processor-specific program segment types.  */
+      bed = get_elf_backend_data (abfd);
+      return bed->elf_backend_section_from_phdr (abfd, hdr, hdr_index, "proc");
+    }
+}
+
+/* Return the REL_HDR for SEC, assuming there is only a single one, either
+   REL or RELA.  */
+
+Elf_Internal_Shdr *
+_bfd_elf_single_rel_hdr (asection *sec)
+{
+  if (elf_section_data (sec)->rel.hdr)
+    {
+      BFD_ASSERT (elf_section_data (sec)->rela.hdr == NULL);
+      return elf_section_data (sec)->rel.hdr;
+    }
+  else
+    return elf_section_data (sec)->rela.hdr;
+}
+
+/* Allocate and initialize a section-header for a new reloc section,
+   containing relocations against ASECT.  It is stored in RELDATA.  If
+   USE_RELA_P is TRUE, we use RELA relocations; otherwise, we use REL
+   relocations.  */
+
+bfd_boolean
+_bfd_elf_init_reloc_shdr (bfd *abfd,
+			  struct bfd_elf_section_reloc_data *reldata,
+			  asection *asect,
+			  bfd_boolean use_rela_p)
+{
+  Elf_Internal_Shdr *rel_hdr;
+  char *name;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  bfd_size_type amt;
+
+  amt = sizeof (Elf_Internal_Shdr);
+  BFD_ASSERT (reldata->hdr == NULL);
+  rel_hdr = bfd_zalloc (abfd, amt);
+  reldata->hdr = rel_hdr;
+
+  amt = sizeof ".rela" + strlen (asect->name);      
+  name = (char *) bfd_alloc (abfd, amt);
+  if (name == NULL)
+    return FALSE;
+  sprintf (name, "%s%s", use_rela_p ? ".rela" : ".rel", asect->name);
+  rel_hdr->sh_name =
+    (unsigned int) _bfd_elf_strtab_add (elf_shstrtab (abfd), name,
+					FALSE);
+  if (rel_hdr->sh_name == (unsigned int) -1)
+    return FALSE;
+  rel_hdr->sh_type = use_rela_p ? SHT_RELA : SHT_REL;
+  rel_hdr->sh_entsize = (use_rela_p
+			 ? bed->s->sizeof_rela
+			 : bed->s->sizeof_rel);
+  rel_hdr->sh_addralign = (bfd_vma) 1 << bed->s->log_file_align;
+  rel_hdr->sh_flags = 0;
+  rel_hdr->sh_addr = 0;
+  rel_hdr->sh_size = 0;
+  rel_hdr->sh_offset = 0;
+
+  return TRUE;
+}
+
+/* Return the default section type based on the passed in section flags.  */
+
+int
+bfd_elf_get_default_section_type (flagword flags)
+{
+  if ((flags & SEC_ALLOC) != 0
+      && (flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0)
+    return SHT_NOBITS;
+  return SHT_PROGBITS;
+}
+
+struct fake_section_arg
+{
+  struct bfd_link_info *link_info;
+  bfd_boolean failed;
+};
+
+/* Set up an ELF internal section header for a section.  */
+
+static void
+elf_fake_sections (bfd *abfd, asection *asect, void *fsarg)
+{
+  struct fake_section_arg *arg = (struct fake_section_arg *)fsarg;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  struct bfd_elf_section_data *esd = elf_section_data (asect);
+  Elf_Internal_Shdr *this_hdr;
+  unsigned int sh_type;
+
+  if (arg->failed)
+    {
+      /* We already failed; just get out of the bfd_map_over_sections
+	 loop.  */
+      return;
+    }
+
+  this_hdr = &esd->this_hdr;
+
+  this_hdr->sh_name = (unsigned int) _bfd_elf_strtab_add (elf_shstrtab (abfd),
+							  asect->name, FALSE);
+  if (this_hdr->sh_name == (unsigned int) -1)
+    {
+      arg->failed = TRUE;
+      return;
+    }
+
+  /* Don't clear sh_flags. Assembler may set additional bits.  */
+
+  if ((asect->flags & SEC_ALLOC) != 0
+      || asect->user_set_vma)
+    this_hdr->sh_addr = asect->vma;
+  else
+    this_hdr->sh_addr = 0;
+
+  this_hdr->sh_offset = 0;
+  this_hdr->sh_size = asect->size;
+  this_hdr->sh_link = 0;
+  this_hdr->sh_addralign = (bfd_vma) 1 << asect->alignment_power;
+  /* The sh_entsize and sh_info fields may have been set already by
+     copy_private_section_data.  */
+
+  this_hdr->bfd_section = asect;
+  this_hdr->contents = NULL;
+
+  /* If the section type is unspecified, we set it based on
+     asect->flags.  */
+  if ((asect->flags & SEC_GROUP) != 0)
+    sh_type = SHT_GROUP;
+  else
+    sh_type = bfd_elf_get_default_section_type (asect->flags);
+
+  if (this_hdr->sh_type == SHT_NULL)
+    this_hdr->sh_type = sh_type;
+  else if (this_hdr->sh_type == SHT_NOBITS
+	   && sh_type == SHT_PROGBITS
+	   && (asect->flags & SEC_ALLOC) != 0)
+    {
+      /* Warn if we are changing a NOBITS section to PROGBITS, but
+	 allow the link to proceed.  This can happen when users link
+	 non-bss input sections to bss output sections, or emit data
+	 to a bss output section via a linker script.  */
+      (*_bfd_error_handler)
+	(_("warning: section `%A' type changed to PROGBITS"), asect);
+      this_hdr->sh_type = sh_type;
+    }
+
+  switch (this_hdr->sh_type)
+    {
+    default:
+      break;
+
+    case SHT_STRTAB:
+    case SHT_INIT_ARRAY:
+    case SHT_FINI_ARRAY:
+    case SHT_PREINIT_ARRAY:
+    case SHT_NOTE:
+    case SHT_NOBITS:
+    case SHT_PROGBITS:
+      break;
+
+    case SHT_HASH:
+      this_hdr->sh_entsize = bed->s->sizeof_hash_entry;
+      break;
+
+    case SHT_DYNSYM:
+      this_hdr->sh_entsize = bed->s->sizeof_sym;
+      break;
+
+    case SHT_DYNAMIC:
+      this_hdr->sh_entsize = bed->s->sizeof_dyn;
+      break;
+
+    case SHT_RELA:
+      if (get_elf_backend_data (abfd)->may_use_rela_p)
+	this_hdr->sh_entsize = bed->s->sizeof_rela;
+      break;
+
+     case SHT_REL:
+      if (get_elf_backend_data (abfd)->may_use_rel_p)
+	this_hdr->sh_entsize = bed->s->sizeof_rel;
+      break;
+
+     case SHT_GNU_versym:
+      this_hdr->sh_entsize = sizeof (Elf_External_Versym);
+      break;
+
+     case SHT_GNU_verdef:
+      this_hdr->sh_entsize = 0;
+      /* objcopy or strip will copy over sh_info, but may not set
+	 cverdefs.  The linker will set cverdefs, but sh_info will be
+	 zero.  */
+      if (this_hdr->sh_info == 0)
+	this_hdr->sh_info = elf_tdata (abfd)->cverdefs;
+      else
+	BFD_ASSERT (elf_tdata (abfd)->cverdefs == 0
+		    || this_hdr->sh_info == elf_tdata (abfd)->cverdefs);
+      break;
+
+    case SHT_GNU_verneed:
+      this_hdr->sh_entsize = 0;
+      /* objcopy or strip will copy over sh_info, but may not set
+	 cverrefs.  The linker will set cverrefs, but sh_info will be
+	 zero.  */
+      if (this_hdr->sh_info == 0)
+	this_hdr->sh_info = elf_tdata (abfd)->cverrefs;
+      else
+	BFD_ASSERT (elf_tdata (abfd)->cverrefs == 0
+		    || this_hdr->sh_info == elf_tdata (abfd)->cverrefs);
+      break;
+
+    case SHT_GROUP:
+      this_hdr->sh_entsize = GRP_ENTRY_SIZE;
+      break;
+
+    case SHT_GNU_HASH:
+      this_hdr->sh_entsize = bed->s->arch_size == 64 ? 0 : 4;
+      break;
+    }
+
+  if ((asect->flags & SEC_ALLOC) != 0)
+    this_hdr->sh_flags |= SHF_ALLOC;
+  if ((asect->flags & SEC_READONLY) == 0)
+    this_hdr->sh_flags |= SHF_WRITE;
+  if ((asect->flags & SEC_CODE) != 0)
+    this_hdr->sh_flags |= SHF_EXECINSTR;
+  if ((asect->flags & SEC_MERGE) != 0)
+    {
+      this_hdr->sh_flags |= SHF_MERGE;
+      this_hdr->sh_entsize = asect->entsize;
+      if ((asect->flags & SEC_STRINGS) != 0)
+	this_hdr->sh_flags |= SHF_STRINGS;
+    }
+  if ((asect->flags & SEC_GROUP) == 0 && elf_group_name (asect) != NULL)
+    this_hdr->sh_flags |= SHF_GROUP;
+  if ((asect->flags & SEC_THREAD_LOCAL) != 0)
+    {
+      this_hdr->sh_flags |= SHF_TLS;
+      if (asect->size == 0
+	  && (asect->flags & SEC_HAS_CONTENTS) == 0)
+	{
+	  struct bfd_link_order *o = asect->map_tail.link_order;
+
+	  this_hdr->sh_size = 0;
+	  if (o != NULL)
+	    {
+	      this_hdr->sh_size = o->offset + o->size;
+	      if (this_hdr->sh_size != 0)
+		this_hdr->sh_type = SHT_NOBITS;
+	    }
+	}
+    }
+  if ((asect->flags & (SEC_GROUP | SEC_EXCLUDE)) == SEC_EXCLUDE)
+    this_hdr->sh_flags |= SHF_EXCLUDE;
+
+  /* If the section has relocs, set up a section header for the
+     SHT_REL[A] section.  If two relocation sections are required for
+     this section, it is up to the processor-specific back-end to
+     create the other.  */
+  if ((asect->flags & SEC_RELOC) != 0)
+    {
+      /* When doing a relocatable link, create both REL and RELA sections if
+	 needed.  */
+      if (arg->link_info
+	  /* Do the normal setup if we wouldn't create any sections here.  */
+	  && esd->rel.count + esd->rela.count > 0
+	  && (arg->link_info->relocatable || arg->link_info->emitrelocations))
+	{
+	  if (esd->rel.count && esd->rel.hdr == NULL
+	      && !_bfd_elf_init_reloc_shdr (abfd, &esd->rel, asect, FALSE))
+	    {
+	      arg->failed = TRUE;
+	      return;
+	    }
+	  if (esd->rela.count && esd->rela.hdr == NULL
+	      && !_bfd_elf_init_reloc_shdr (abfd, &esd->rela, asect, TRUE))
+	    {
+	      arg->failed = TRUE;
+	      return;
+	    }
+	}
+      else if (!_bfd_elf_init_reloc_shdr (abfd,
+					  (asect->use_rela_p
+					   ? &esd->rela : &esd->rel),
+					  asect,
+					  asect->use_rela_p))
+	  arg->failed = TRUE;
+    }
+
+  /* Check for processor-specific section types.  */
+  sh_type = this_hdr->sh_type;
+  if (bed->elf_backend_fake_sections
+      && !(*bed->elf_backend_fake_sections) (abfd, this_hdr, asect))
+    arg->failed = TRUE;
+
+  if (sh_type == SHT_NOBITS && asect->size != 0)
+    {
+      /* Don't change the header type from NOBITS if we are being
+	 called for objcopy --only-keep-debug.  */
+      this_hdr->sh_type = sh_type;
+    }
+}
+
+/* Fill in the contents of a SHT_GROUP section.  Called from
+   _bfd_elf_compute_section_file_positions for gas, objcopy, and
+   when ELF targets use the generic linker, ld.  Called for ld -r
+   from bfd_elf_final_link.  */
+
+void
+bfd_elf_set_group_contents (bfd *abfd, asection *sec, void *failedptrarg)
+{
+  bfd_boolean *failedptr = (bfd_boolean *) failedptrarg;
+  asection *elt, *first;
+  unsigned char *loc;
+  bfd_boolean gas;
+
+  /* Ignore linker created group section.  See elfNN_ia64_object_p in
+     elfxx-ia64.c.  */
+  if (((sec->flags & (SEC_GROUP | SEC_LINKER_CREATED)) != SEC_GROUP)
+      || *failedptr)
+    return;
+
+  if (elf_section_data (sec)->this_hdr.sh_info == 0)
+    {
+      unsigned long symindx = 0;
+
+      /* elf_group_id will have been set up by objcopy and the
+	 generic linker.  */
+      if (elf_group_id (sec) != NULL)
+	symindx = elf_group_id (sec)->udata.i;
+
+      if (symindx == 0)
+	{
+	  /* If called from the assembler, swap_out_syms will have set up
+	     elf_section_syms.  */
+	  BFD_ASSERT (elf_section_syms (abfd) != NULL);
+	  symindx = elf_section_syms (abfd)[sec->index]->udata.i;
+	}
+      elf_section_data (sec)->this_hdr.sh_info = symindx;
+    }
+  else if (elf_section_data (sec)->this_hdr.sh_info == (unsigned int) -2)
+    {
+      /* The ELF backend linker sets sh_info to -2 when the group
+	 signature symbol is global, and thus the index can't be
+	 set until all local symbols are output.  */
+      asection *igroup = elf_sec_group (elf_next_in_group (sec));
+      struct bfd_elf_section_data *sec_data = elf_section_data (igroup);
+      unsigned long symndx = sec_data->this_hdr.sh_info;
+      unsigned long extsymoff = 0;
+      struct elf_link_hash_entry *h;
+
+      if (!elf_bad_symtab (igroup->owner))
+	{
+	  Elf_Internal_Shdr *symtab_hdr;
+
+	  symtab_hdr = &elf_tdata (igroup->owner)->symtab_hdr;
+	  extsymoff = symtab_hdr->sh_info;
+	}
+      h = elf_sym_hashes (igroup->owner)[symndx - extsymoff];
+      while (h->root.type == bfd_link_hash_indirect
+	     || h->root.type == bfd_link_hash_warning)
+	h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+      elf_section_data (sec)->this_hdr.sh_info = h->indx;
+    }
+
+  /* The contents won't be allocated for "ld -r" or objcopy.  */
+  gas = TRUE;
+  if (sec->contents == NULL)
+    {
+      gas = FALSE;
+      sec->contents = (unsigned char *) bfd_alloc (abfd, sec->size);
+
+      /* Arrange for the section to be written out.  */
+      elf_section_data (sec)->this_hdr.contents = sec->contents;
+      if (sec->contents == NULL)
+	{
+	  *failedptr = TRUE;
+	  return;
+	}
+    }
+
+  loc = sec->contents + sec->size;
+
+  /* Get the pointer to the first section in the group that gas
+     squirreled away here.  objcopy arranges for this to be set to the
+     start of the input section group.  */
+  first = elt = elf_next_in_group (sec);
+
+  /* First element is a flag word.  Rest of section is elf section
+     indices for all the sections of the group.  Write them backwards
+     just to keep the group in the same order as given in .section
+     directives, not that it matters.  */
+  while (elt != NULL)
+    {
+      asection *s;
+
+      s = elt;
+      if (!gas)
+	s = s->output_section;
+      if (s != NULL
+	  && !bfd_is_abs_section (s))
+	{
+	  unsigned int idx = elf_section_data (s)->this_idx;
+
+	  loc -= 4;
+	  H_PUT_32 (abfd, idx, loc);
+	}
+      elt = elf_next_in_group (elt);
+      if (elt == first)
+	break;
+    }
+
+  if ((loc -= 4) != sec->contents)
+    abort ();
+
+  H_PUT_32 (abfd, sec->flags & SEC_LINK_ONCE ? GRP_COMDAT : 0, loc);
+}
+
+/* Assign all ELF section numbers.  The dummy first section is handled here
+   too.  The link/info pointers for the standard section types are filled
+   in here too, while we're at it.  */
+
+static bfd_boolean
+assign_section_numbers (bfd *abfd, struct bfd_link_info *link_info)
+{
+  struct elf_obj_tdata *t = elf_tdata (abfd);
+  asection *sec;
+  unsigned int section_number, secn;
+  Elf_Internal_Shdr **i_shdrp;
+  struct bfd_elf_section_data *d;
+  bfd_boolean need_symtab;
+
+  section_number = 1;
+
+  _bfd_elf_strtab_clear_all_refs (elf_shstrtab (abfd));
+
+  /* SHT_GROUP sections are in relocatable files only.  */
+  if (link_info == NULL || link_info->relocatable)
+    {
+      /* Put SHT_GROUP sections first.  */
+      for (sec = abfd->sections; sec != NULL; sec = sec->next)
+	{
+	  d = elf_section_data (sec);
+
+	  if (d->this_hdr.sh_type == SHT_GROUP)
+	    {
+	      if (sec->flags & SEC_LINKER_CREATED)
+		{
+		  /* Remove the linker created SHT_GROUP sections.  */
+		  bfd_section_list_remove (abfd, sec);
+		  abfd->section_count--;
+		}
+	      else
+		d->this_idx = section_number++;
+	    }
+	}
+    }
+
+  for (sec = abfd->sections; sec; sec = sec->next)
+    {
+      d = elf_section_data (sec);
+
+      if (d->this_hdr.sh_type != SHT_GROUP)
+	d->this_idx = section_number++;
+      _bfd_elf_strtab_addref (elf_shstrtab (abfd), d->this_hdr.sh_name);
+      if (d->rel.hdr)
+	{
+	  d->rel.idx = section_number++;
+	  _bfd_elf_strtab_addref (elf_shstrtab (abfd), d->rel.hdr->sh_name);
+	}
+      else
+	d->rel.idx = 0;
+
+      if (d->rela.hdr)
+	{
+	  d->rela.idx = section_number++;
+	  _bfd_elf_strtab_addref (elf_shstrtab (abfd), d->rela.hdr->sh_name);
+	}
+      else
+	d->rela.idx = 0;
+    }
+
+  t->shstrtab_section = section_number++;
+  _bfd_elf_strtab_addref (elf_shstrtab (abfd), t->shstrtab_hdr.sh_name);
+  elf_elfheader (abfd)->e_shstrndx = t->shstrtab_section;
+
+  need_symtab = (bfd_get_symcount (abfd) > 0
+		|| (link_info == NULL
+		    && ((abfd->flags & (EXEC_P | DYNAMIC | HAS_RELOC))
+			== HAS_RELOC)));
+  if (need_symtab)
+    {
+      t->symtab_section = section_number++;
+      _bfd_elf_strtab_addref (elf_shstrtab (abfd), t->symtab_hdr.sh_name);
+      if (section_number > ((SHN_LORESERVE - 2) & 0xFFFF))
+	{
+	  t->symtab_shndx_section = section_number++;
+	  t->symtab_shndx_hdr.sh_name
+	    = (unsigned int) _bfd_elf_strtab_add (elf_shstrtab (abfd),
+						  ".symtab_shndx", FALSE);
+	  if (t->symtab_shndx_hdr.sh_name == (unsigned int) -1)
+	    return FALSE;
+	}
+      t->strtab_section = section_number++;
+      _bfd_elf_strtab_addref (elf_shstrtab (abfd), t->strtab_hdr.sh_name);
+    }
+
+  _bfd_elf_strtab_finalize (elf_shstrtab (abfd));
+  t->shstrtab_hdr.sh_size = _bfd_elf_strtab_size (elf_shstrtab (abfd));
+
+  elf_numsections (abfd) = section_number;
+  elf_elfheader (abfd)->e_shnum = section_number;
+
+  /* Set up the list of section header pointers, in agreement with the
+     indices.  */
+  i_shdrp = (Elf_Internal_Shdr **) bfd_zalloc2 (abfd, section_number,
+                                                sizeof (Elf_Internal_Shdr *));
+  if (i_shdrp == NULL)
+    return FALSE;
+
+  i_shdrp[0] = (Elf_Internal_Shdr *) bfd_zalloc (abfd,
+                                                 sizeof (Elf_Internal_Shdr));
+  if (i_shdrp[0] == NULL)
+    {
+      bfd_release (abfd, i_shdrp);
+      return FALSE;
+    }
+
+  elf_elfsections (abfd) = i_shdrp;
+
+  i_shdrp[t->shstrtab_section] = &t->shstrtab_hdr;
+  if (need_symtab)
+    {
+      i_shdrp[t->symtab_section] = &t->symtab_hdr;
+      if (elf_numsections (abfd) > (SHN_LORESERVE & 0xFFFF))
+	{
+	  i_shdrp[t->symtab_shndx_section] = &t->symtab_shndx_hdr;
+	  t->symtab_shndx_hdr.sh_link = t->symtab_section;
+	}
+      i_shdrp[t->strtab_section] = &t->strtab_hdr;
+      t->symtab_hdr.sh_link = t->strtab_section;
+    }
+
+  for (sec = abfd->sections; sec; sec = sec->next)
+    {
+      asection *s;
+      const char *name;
+
+      d = elf_section_data (sec);
+
+      i_shdrp[d->this_idx] = &d->this_hdr;
+      if (d->rel.idx != 0)
+	i_shdrp[d->rel.idx] = d->rel.hdr;
+      if (d->rela.idx != 0)
+	i_shdrp[d->rela.idx] = d->rela.hdr;
+
+      /* Fill in the sh_link and sh_info fields while we're at it.  */
+
+      /* sh_link of a reloc section is the section index of the symbol
+	 table.  sh_info is the section index of the section to which
+	 the relocation entries apply.  */
+      if (d->rel.idx != 0)
+	{
+	  d->rel.hdr->sh_link = t->symtab_section;
+	  d->rel.hdr->sh_info = d->this_idx;
+	}
+      if (d->rela.idx != 0)
+	{
+	  d->rela.hdr->sh_link = t->symtab_section;
+	  d->rela.hdr->sh_info = d->this_idx;
+	}
+
+      /* We need to set up sh_link for SHF_LINK_ORDER.  */
+      if ((d->this_hdr.sh_flags & SHF_LINK_ORDER) != 0)
+	{
+	  s = elf_linked_to_section (sec);
+	  if (s)
+	    {
+	      /* elf_linked_to_section points to the input section.  */
+	      if (link_info != NULL)
+		{
+		  /* Check discarded linkonce section.  */
+		  if (elf_discarded_section (s))
+		    {
+		      asection *kept;
+		      (*_bfd_error_handler)
+			(_("%B: sh_link of section `%A' points to discarded section `%A' of `%B'"),
+			 abfd, d->this_hdr.bfd_section,
+			 s, s->owner);
+		      /* Point to the kept section if it has the same
+			 size as the discarded one.  */
+		      kept = _bfd_elf_check_kept_section (s, link_info);
+		      if (kept == NULL)
+			{
+			  bfd_set_error (bfd_error_bad_value);
+			  return FALSE;
+			}
+		      s = kept;
+		    }
+
+		  s = s->output_section;
+		  BFD_ASSERT (s != NULL);
+		}
+	      else
+		{
+		  /* Handle objcopy. */
+		  if (s->output_section == NULL)
+		    {
+		      (*_bfd_error_handler)
+			(_("%B: sh_link of section `%A' points to removed section `%A' of `%B'"),
+			 abfd, d->this_hdr.bfd_section, s, s->owner);
+		      bfd_set_error (bfd_error_bad_value);
+		      return FALSE;
+		    }
+		  s = s->output_section;
+		}
+	      d->this_hdr.sh_link = elf_section_data (s)->this_idx;
+	    }
+	  else
+	    {
+	      /* PR 290:
+		 The Intel C compiler generates SHT_IA_64_UNWIND with
+		 SHF_LINK_ORDER.  But it doesn't set the sh_link or
+		 sh_info fields.  Hence we could get the situation
+		 where s is NULL.  */
+	      const struct elf_backend_data *bed
+		= get_elf_backend_data (abfd);
+	      if (bed->link_order_error_handler)
+		bed->link_order_error_handler
+		  (_("%B: warning: sh_link not set for section `%A'"),
+		   abfd, sec);
+	    }
+	}
+
+      switch (d->this_hdr.sh_type)
+	{
+	case SHT_REL:
+	case SHT_RELA:
+	  /* A reloc section which we are treating as a normal BFD
+	     section.  sh_link is the section index of the symbol
+	     table.  sh_info is the section index of the section to
+	     which the relocation entries apply.  We assume that an
+	     allocated reloc section uses the dynamic symbol table.
+	     FIXME: How can we be sure?  */
+	  s = bfd_get_section_by_name (abfd, ".dynsym");
+	  if (s != NULL)
+	    d->this_hdr.sh_link = elf_section_data (s)->this_idx;
+
+	  /* We look up the section the relocs apply to by name.  */
+	  name = sec->name;
+	  if (d->this_hdr.sh_type == SHT_REL)
+	    name += 4;
+	  else
+	    name += 5;
+	  s = bfd_get_section_by_name (abfd, name);
+	  if (s != NULL)
+	    d->this_hdr.sh_info = elf_section_data (s)->this_idx;
+	  break;
+
+	case SHT_STRTAB:
+	  /* We assume that a section named .stab*str is a stabs
+	     string section.  We look for a section with the same name
+	     but without the trailing ``str'', and set its sh_link
+	     field to point to this section.  */
+	  if (CONST_STRNEQ (sec->name, ".stab")
+	      && strcmp (sec->name + strlen (sec->name) - 3, "str") == 0)
+	    {
+	      size_t len;
+	      char *alc;
+
+	      len = strlen (sec->name);
+	      alc = (char *) bfd_malloc (len - 2);
+	      if (alc == NULL)
+		return FALSE;
+	      memcpy (alc, sec->name, len - 3);
+	      alc[len - 3] = '\0';
+	      s = bfd_get_section_by_name (abfd, alc);
+	      free (alc);
+	      if (s != NULL)
+		{
+		  elf_section_data (s)->this_hdr.sh_link = d->this_idx;
+
+		  /* This is a .stab section.  */
+		  if (elf_section_data (s)->this_hdr.sh_entsize == 0)
+		    elf_section_data (s)->this_hdr.sh_entsize
+		      = 4 + 2 * bfd_get_arch_size (abfd) / 8;
+		}
+	    }
+	  break;
+
+	case SHT_DYNAMIC:
+	case SHT_DYNSYM:
+	case SHT_GNU_verneed:
+	case SHT_GNU_verdef:
+	  /* sh_link is the section header index of the string table
+	     used for the dynamic entries, or the symbol table, or the
+	     version strings.  */
+	  s = bfd_get_section_by_name (abfd, ".dynstr");
+	  if (s != NULL)
+	    d->this_hdr.sh_link = elf_section_data (s)->this_idx;
+	  break;
+
+	case SHT_GNU_LIBLIST:
+	  /* sh_link is the section header index of the prelink library
+	     list used for the dynamic entries, or the symbol table, or
+	     the version strings.  */
+	  s = bfd_get_section_by_name (abfd, (sec->flags & SEC_ALLOC)
+					     ? ".dynstr" : ".gnu.libstr");
+	  if (s != NULL)
+	    d->this_hdr.sh_link = elf_section_data (s)->this_idx;
+	  break;
+
+	case SHT_HASH:
+	case SHT_GNU_HASH:
+	case SHT_GNU_versym:
+	  /* sh_link is the section header index of the symbol table
+	     this hash table or version table is for.  */
+	  s = bfd_get_section_by_name (abfd, ".dynsym");
+	  if (s != NULL)
+	    d->this_hdr.sh_link = elf_section_data (s)->this_idx;
+	  break;
+
+	case SHT_GROUP:
+	  d->this_hdr.sh_link = t->symtab_section;
+	}
+    }
+
+  for (secn = 1; secn < section_number; ++secn)
+    if (i_shdrp[secn] == NULL)
+      i_shdrp[secn] = i_shdrp[0];
+    else
+      i_shdrp[secn]->sh_name = _bfd_elf_strtab_offset (elf_shstrtab (abfd),
+						       i_shdrp[secn]->sh_name);
+  return TRUE;
+}
+
+/* Map symbol from it's internal number to the external number, moving
+   all local symbols to be at the head of the list.  */
+
+static bfd_boolean
+sym_is_global (bfd *abfd, asymbol *sym)
+{
+  /* If the backend has a special mapping, use it.  */
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  if (bed->elf_backend_sym_is_global)
+    return (*bed->elf_backend_sym_is_global) (abfd, sym);
+
+  return ((sym->flags & (BSF_GLOBAL | BSF_WEAK | BSF_GNU_UNIQUE)) != 0
+	  || bfd_is_und_section (bfd_get_section (sym))
+	  || bfd_is_com_section (bfd_get_section (sym)));
+}
+
+/* Don't output section symbols for sections that are not going to be
+   output.  */
+
+static bfd_boolean
+ignore_section_sym (bfd *abfd, asymbol *sym)
+{
+  return ((sym->flags & BSF_SECTION_SYM) != 0
+	  && !(sym->section->owner == abfd
+	       || (sym->section->output_section->owner == abfd
+		   && sym->section->output_offset == 0)));
+}
+
+static bfd_boolean
+elf_map_symbols (bfd *abfd)
+{
+  unsigned int symcount = bfd_get_symcount (abfd);
+  asymbol **syms = bfd_get_outsymbols (abfd);
+  asymbol **sect_syms;
+  unsigned int num_locals = 0;
+  unsigned int num_globals = 0;
+  unsigned int num_locals2 = 0;
+  unsigned int num_globals2 = 0;
+  int max_index = 0;
+  unsigned int idx;
+  asection *asect;
+  asymbol **new_syms;
+
+#ifdef DEBUG
+  fprintf (stderr, "elf_map_symbols\n");
+  fflush (stderr);
+#endif
+
+  for (asect = abfd->sections; asect; asect = asect->next)
+    {
+      if (max_index < asect->index)
+	max_index = asect->index;
+    }
+
+  max_index++;
+  sect_syms = (asymbol **) bfd_zalloc2 (abfd, max_index, sizeof (asymbol *));
+  if (sect_syms == NULL)
+    return FALSE;
+  elf_section_syms (abfd) = sect_syms;
+  elf_num_section_syms (abfd) = max_index;
+
+  /* Init sect_syms entries for any section symbols we have already
+     decided to output.  */
+  for (idx = 0; idx < symcount; idx++)
+    {
+      asymbol *sym = syms[idx];
+
+      if ((sym->flags & BSF_SECTION_SYM) != 0
+	  && sym->value == 0
+	  && !ignore_section_sym (abfd, sym))
+	{
+	  asection *sec = sym->section;
+
+	  if (sec->owner != abfd)
+	    sec = sec->output_section;
+
+	  sect_syms[sec->index] = syms[idx];
+	}
+    }
+
+  /* Classify all of the symbols.  */
+  for (idx = 0; idx < symcount; idx++)
+    {
+      if (ignore_section_sym (abfd, syms[idx]))
+	continue;
+      if (!sym_is_global (abfd, syms[idx]))
+	num_locals++;
+      else
+	num_globals++;
+    }
+
+  /* We will be adding a section symbol for each normal BFD section.  Most
+     sections will already have a section symbol in outsymbols, but
+     eg. SHT_GROUP sections will not, and we need the section symbol mapped
+     at least in that case.  */
+  for (asect = abfd->sections; asect; asect = asect->next)
+    {
+      if (sect_syms[asect->index] == NULL)
+	{
+	  if (!sym_is_global (abfd, asect->symbol))
+	    num_locals++;
+	  else
+	    num_globals++;
+	}
+    }
+
+  /* Now sort the symbols so the local symbols are first.  */
+  new_syms = (asymbol **) bfd_alloc2 (abfd, num_locals + num_globals,
+                                      sizeof (asymbol *));
+
+  if (new_syms == NULL)
+    return FALSE;
+
+  for (idx = 0; idx < symcount; idx++)
+    {
+      asymbol *sym = syms[idx];
+      unsigned int i;
+
+      if (ignore_section_sym (abfd, sym))
+	continue;
+      if (!sym_is_global (abfd, sym))
+	i = num_locals2++;
+      else
+	i = num_locals + num_globals2++;
+      new_syms[i] = sym;
+      sym->udata.i = i + 1;
+    }
+  for (asect = abfd->sections; asect; asect = asect->next)
+    {
+      if (sect_syms[asect->index] == NULL)
+	{
+	  asymbol *sym = asect->symbol;
+	  unsigned int i;
+
+	  sect_syms[asect->index] = sym;
+	  if (!sym_is_global (abfd, sym))
+	    i = num_locals2++;
+	  else
+	    i = num_locals + num_globals2++;
+	  new_syms[i] = sym;
+	  sym->udata.i = i + 1;
+	}
+    }
+
+  bfd_set_symtab (abfd, new_syms, num_locals + num_globals);
+
+  elf_num_locals (abfd) = num_locals;
+  elf_num_globals (abfd) = num_globals;
+  return TRUE;
+}
+
+/* Align to the maximum file alignment that could be required for any
+   ELF data structure.  */
+
+static inline file_ptr
+align_file_position (file_ptr off, int align)
+{
+  return (off + align - 1) & ~(align - 1);
+}
+
+/* Assign a file position to a section, optionally aligning to the
+   required section alignment.  */
+
+file_ptr
+_bfd_elf_assign_file_position_for_section (Elf_Internal_Shdr *i_shdrp,
+					   file_ptr offset,
+					   bfd_boolean align)
+{
+  if (align && i_shdrp->sh_addralign > 1)
+    offset = BFD_ALIGN (offset, i_shdrp->sh_addralign);
+  i_shdrp->sh_offset = offset;
+  if (i_shdrp->bfd_section != NULL)
+    i_shdrp->bfd_section->filepos = offset;
+  if (i_shdrp->sh_type != SHT_NOBITS)
+    offset += i_shdrp->sh_size;
+  return offset;
+}
+
+/* Compute the file positions we are going to put the sections at, and
+   otherwise prepare to begin writing out the ELF file.  If LINK_INFO
+   is not NULL, this is being called by the ELF backend linker.  */
+
+bfd_boolean
+_bfd_elf_compute_section_file_positions (bfd *abfd,
+					 struct bfd_link_info *link_info)
+{
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  struct fake_section_arg fsargs;
+  bfd_boolean failed;
+  struct bfd_strtab_hash *strtab = NULL;
+  Elf_Internal_Shdr *shstrtab_hdr;
+  bfd_boolean need_symtab;
+
+  if (abfd->output_has_begun)
+    return TRUE;
+
+  /* Do any elf backend specific processing first.  */
+  if (bed->elf_backend_begin_write_processing)
+    (*bed->elf_backend_begin_write_processing) (abfd, link_info);
+
+  if (! prep_headers (abfd))
+    return FALSE;
+
+  /* Post process the headers if necessary.  */
+  if (bed->elf_backend_post_process_headers)
+    (*bed->elf_backend_post_process_headers) (abfd, link_info);
+
+  fsargs.failed = FALSE;
+  fsargs.link_info = link_info;
+  bfd_map_over_sections (abfd, elf_fake_sections, &fsargs);
+  if (fsargs.failed)
+    return FALSE;
+
+  if (!assign_section_numbers (abfd, link_info))
+    return FALSE;
+
+  /* The backend linker builds symbol table information itself.  */
+  need_symtab = (link_info == NULL
+		 && (bfd_get_symcount (abfd) > 0
+		     || ((abfd->flags & (EXEC_P | DYNAMIC | HAS_RELOC))
+			 == HAS_RELOC)));
+  if (need_symtab)
+    {
+      /* Non-zero if doing a relocatable link.  */
+      int relocatable_p = ! (abfd->flags & (EXEC_P | DYNAMIC));
+
+      if (! swap_out_syms (abfd, &strtab, relocatable_p))
+	return FALSE;
+    }
+
+  failed = FALSE;
+  if (link_info == NULL)
+    {
+      bfd_map_over_sections (abfd, bfd_elf_set_group_contents, &failed);
+      if (failed)
+	return FALSE;
+    }
+
+  shstrtab_hdr = &elf_tdata (abfd)->shstrtab_hdr;
+  /* sh_name was set in prep_headers.  */
+  shstrtab_hdr->sh_type = SHT_STRTAB;
+  shstrtab_hdr->sh_flags = 0;
+  shstrtab_hdr->sh_addr = 0;
+  shstrtab_hdr->sh_size = _bfd_elf_strtab_size (elf_shstrtab (abfd));
+  shstrtab_hdr->sh_entsize = 0;
+  shstrtab_hdr->sh_link = 0;
+  shstrtab_hdr->sh_info = 0;
+  /* sh_offset is set in assign_file_positions_except_relocs.  */
+  shstrtab_hdr->sh_addralign = 1;
+
+  if (!assign_file_positions_except_relocs (abfd, link_info))
+    return FALSE;
+
+  if (need_symtab)
+    {
+      file_ptr off;
+      Elf_Internal_Shdr *hdr;
+
+      off = elf_tdata (abfd)->next_file_pos;
+
+      hdr = &elf_tdata (abfd)->symtab_hdr;
+      off = _bfd_elf_assign_file_position_for_section (hdr, off, TRUE);
+
+      hdr = &elf_tdata (abfd)->symtab_shndx_hdr;
+      if (hdr->sh_size != 0)
+	off = _bfd_elf_assign_file_position_for_section (hdr, off, TRUE);
+
+      hdr = &elf_tdata (abfd)->strtab_hdr;
+      off = _bfd_elf_assign_file_position_for_section (hdr, off, TRUE);
+
+      elf_tdata (abfd)->next_file_pos = off;
+
+      /* Now that we know where the .strtab section goes, write it
+	 out.  */
+      if (bfd_seek (abfd, hdr->sh_offset, SEEK_SET) != 0
+	  || ! _bfd_stringtab_emit (abfd, strtab))
+	return FALSE;
+      _bfd_stringtab_free (strtab);
+    }
+
+  abfd->output_has_begun = TRUE;
+
+  return TRUE;
+}
+
+/* Make an initial estimate of the size of the program header.  If we
+   get the number wrong here, we'll redo section placement.  */
+
+static bfd_size_type
+get_program_header_size (bfd *abfd, struct bfd_link_info *info)
+{
+  size_t segs;
+  asection *s;
+  const struct elf_backend_data *bed;
+
+  /* Assume we will need exactly two PT_LOAD segments: one for text
+     and one for data.  */
+  segs = 2;
+
+  s = bfd_get_section_by_name (abfd, ".interp");
+  if (s != NULL && (s->flags & SEC_LOAD) != 0)
+    {
+      /* If we have a loadable interpreter section, we need a
+	 PT_INTERP segment.  In this case, assume we also need a
+	 PT_PHDR segment, although that may not be true for all
+	 targets.  */
+      segs += 2;
+    }
+
+  if (bfd_get_section_by_name (abfd, ".dynamic") != NULL)
+    {
+      /* We need a PT_DYNAMIC segment.  */
+      ++segs;
+    }
+
+  if (info != NULL && info->relro)
+    {
+      /* We need a PT_GNU_RELRO segment.  */
+      ++segs;
+    }
+
+  if (elf_tdata (abfd)->eh_frame_hdr)
+    {
+      /* We need a PT_GNU_EH_FRAME segment.  */
+      ++segs;
+    }
+
+  if (elf_tdata (abfd)->stack_flags)
+    {
+      /* We need a PT_GNU_STACK segment.  */
+      ++segs;
+    }
+
+  for (s = abfd->sections; s != NULL; s = s->next)
+    {
+      if ((s->flags & SEC_LOAD) != 0
+	  && CONST_STRNEQ (s->name, ".note"))
+	{
+	  /* We need a PT_NOTE segment.  */
+	  ++segs;
+	  /* Try to create just one PT_NOTE segment
+	     for all adjacent loadable .note* sections.
+	     gABI requires that within a PT_NOTE segment
+	     (and also inside of each SHT_NOTE section)
+	     each note is padded to a multiple of 4 size,
+	     so we check whether the sections are correctly
+	     aligned.  */
+	  if (s->alignment_power == 2)
+	    while (s->next != NULL
+		   && s->next->alignment_power == 2
+		   && (s->next->flags & SEC_LOAD) != 0
+		   && CONST_STRNEQ (s->next->name, ".note"))
+	      s = s->next;
+	}
+    }
+
+  for (s = abfd->sections; s != NULL; s = s->next)
+    {
+      if (s->flags & SEC_THREAD_LOCAL)
+	{
+	  /* We need a PT_TLS segment.  */
+	  ++segs;
+	  break;
+	}
+    }
+
+  /* Let the backend count up any program headers it might need.  */
+  bed = get_elf_backend_data (abfd);
+  if (bed->elf_backend_additional_program_headers)
+    {
+      int a;
+
+      a = (*bed->elf_backend_additional_program_headers) (abfd, info);
+      if (a == -1)
+	abort ();
+      segs += a;
+    }
+
+  return segs * bed->s->sizeof_phdr;
+}
+
+/* Find the segment that contains the output_section of section.  */
+
+Elf_Internal_Phdr *
+_bfd_elf_find_segment_containing_section (bfd * abfd, asection * section)
+{
+  struct elf_segment_map *m;
+  Elf_Internal_Phdr *p;
+
+  for (m = elf_tdata (abfd)->segment_map,
+	 p = elf_tdata (abfd)->phdr;
+       m != NULL;
+       m = m->next, p++)
+    {
+      int i;
+
+      for (i = m->count - 1; i >= 0; i--)
+	if (m->sections[i] == section)
+	  return p;
+    }
+
+  return NULL;
+}
+
+/* Create a mapping from a set of sections to a program segment.  */
+
+static struct elf_segment_map *
+make_mapping (bfd *abfd,
+	      asection **sections,
+	      unsigned int from,
+	      unsigned int to,
+	      bfd_boolean phdr)
+{
+  struct elf_segment_map *m;
+  unsigned int i;
+  asection **hdrpp;
+  bfd_size_type amt;
+
+  amt = sizeof (struct elf_segment_map);
+  amt += (to - from - 1) * sizeof (asection *);
+  m = (struct elf_segment_map *) bfd_zalloc (abfd, amt);
+  if (m == NULL)
+    return NULL;
+  m->next = NULL;
+  m->p_type = PT_LOAD;
+  for (i = from, hdrpp = sections + from; i < to; i++, hdrpp++)
+    m->sections[i - from] = *hdrpp;
+  m->count = to - from;
+
+  if (from == 0 && phdr)
+    {
+      /* Include the headers in the first PT_LOAD segment.  */
+      m->includes_filehdr = 1;
+      m->includes_phdrs = 1;
+    }
+
+  return m;
+}
+
+/* Create the PT_DYNAMIC segment, which includes DYNSEC.  Returns NULL
+   on failure.  */
+
+struct elf_segment_map *
+_bfd_elf_make_dynamic_segment (bfd *abfd, asection *dynsec)
+{
+  struct elf_segment_map *m;
+
+  m = (struct elf_segment_map *) bfd_zalloc (abfd,
+                                             sizeof (struct elf_segment_map));
+  if (m == NULL)
+    return NULL;
+  m->next = NULL;
+  m->p_type = PT_DYNAMIC;
+  m->count = 1;
+  m->sections[0] = dynsec;
+
+  return m;
+}
+
+/* Possibly add or remove segments from the segment map.  */
+
+static bfd_boolean
+elf_modify_segment_map (bfd *abfd,
+			struct bfd_link_info *info,
+			bfd_boolean remove_empty_load)
+{
+  struct elf_segment_map **m;
+  const struct elf_backend_data *bed;
+
+  /* The placement algorithm assumes that non allocated sections are
+     not in PT_LOAD segments.  We ensure this here by removing such
+     sections from the segment map.  We also remove excluded
+     sections.  Finally, any PT_LOAD segment without sections is
+     removed.  */
+  m = &elf_tdata (abfd)->segment_map;
+  while (*m)
+    {
+      unsigned int i, new_count;
+
+      for (new_count = 0, i = 0; i < (*m)->count; i++)
+	{
+	  if (((*m)->sections[i]->flags & SEC_EXCLUDE) == 0
+	      && (((*m)->sections[i]->flags & SEC_ALLOC) != 0
+		  || (*m)->p_type != PT_LOAD))
+	    {
+	      (*m)->sections[new_count] = (*m)->sections[i];
+	      new_count++;
+	    }
+	}
+      (*m)->count = new_count;
+
+      if (remove_empty_load && (*m)->p_type == PT_LOAD && (*m)->count == 0)
+	*m = (*m)->next;
+      else
+	m = &(*m)->next;
+    }
+
+  bed = get_elf_backend_data (abfd);
+  if (bed->elf_backend_modify_segment_map != NULL)
+    {
+      if (!(*bed->elf_backend_modify_segment_map) (abfd, info))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Set up a mapping from BFD sections to program segments.  */
+
+bfd_boolean
+_bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
+{
+  unsigned int count;
+  struct elf_segment_map *m;
+  asection **sections = NULL;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  bfd_boolean no_user_phdrs;
+
+  no_user_phdrs = elf_tdata (abfd)->segment_map == NULL;
+  if (no_user_phdrs && bfd_count_sections (abfd) != 0)
+    {
+      asection *s;
+      unsigned int i;
+      struct elf_segment_map *mfirst;
+      struct elf_segment_map **pm;
+      asection *last_hdr;
+      bfd_vma last_size;
+      unsigned int phdr_index;
+      bfd_vma maxpagesize;
+      asection **hdrpp;
+      bfd_boolean phdr_in_segment = TRUE;
+      bfd_boolean writable;
+      int tls_count = 0;
+      asection *first_tls = NULL;
+      asection *dynsec, *eh_frame_hdr;
+      bfd_size_type amt;
+      bfd_vma addr_mask, wrap_to = 0;
+
+      /* Select the allocated sections, and sort them.  */
+
+      sections = (asection **) bfd_malloc2 (bfd_count_sections (abfd),
+                                            sizeof (asection *));
+      if (sections == NULL)
+	goto error_return;
+
+      /* Calculate top address, avoiding undefined behaviour of shift
+	 left operator when shift count is equal to size of type
+	 being shifted.  */
+      addr_mask = ((bfd_vma) 1 << (bfd_arch_bits_per_address (abfd) - 1)) - 1;
+      addr_mask = (addr_mask << 1) + 1;
+
+      i = 0;
+      for (s = abfd->sections; s != NULL; s = s->next)
+	{
+	  if ((s->flags & SEC_ALLOC) != 0)
+	    {
+	      sections[i] = s;
+	      ++i;
+	      /* A wrapping section potentially clashes with header.  */
+	      if (((s->lma + s->size) & addr_mask) < (s->lma & addr_mask))
+		wrap_to = (s->lma + s->size) & addr_mask;
+	    }
+	}
+      BFD_ASSERT (i <= bfd_count_sections (abfd));
+      count = i;
+
+      qsort (sections, (size_t) count, sizeof (asection *), elf_sort_sections);
+
+      /* Build the mapping.  */
+
+      mfirst = NULL;
+      pm = &mfirst;
+
+      /* If we have a .interp section, then create a PT_PHDR segment for
+	 the program headers and a PT_INTERP segment for the .interp
+	 section.  */
+      s = bfd_get_section_by_name (abfd, ".interp");
+      if (s != NULL && (s->flags & SEC_LOAD) != 0)
+	{
+	  amt = sizeof (struct elf_segment_map);
+	  m = (struct elf_segment_map *) bfd_zalloc (abfd, amt);
+	  if (m == NULL)
+	    goto error_return;
+	  m->next = NULL;
+	  m->p_type = PT_PHDR;
+	  /* FIXME: UnixWare and Solaris set PF_X, Irix 5 does not.  */
+	  m->p_flags = PF_R | PF_X;
+	  m->p_flags_valid = 1;
+	  m->includes_phdrs = 1;
+
+	  *pm = m;
+	  pm = &m->next;
+
+	  amt = sizeof (struct elf_segment_map);
+	  m = (struct elf_segment_map *) bfd_zalloc (abfd, amt);
+	  if (m == NULL)
+	    goto error_return;
+	  m->next = NULL;
+	  m->p_type = PT_INTERP;
+	  m->count = 1;
+	  m->sections[0] = s;
+
+	  *pm = m;
+	  pm = &m->next;
+	}
+
+      /* Look through the sections.  We put sections in the same program
+	 segment when the start of the second section can be placed within
+	 a few bytes of the end of the first section.  */
+      last_hdr = NULL;
+      last_size = 0;
+      phdr_index = 0;
+      maxpagesize = bed->maxpagesize;
+      writable = FALSE;
+      dynsec = bfd_get_section_by_name (abfd, ".dynamic");
+      if (dynsec != NULL
+	  && (dynsec->flags & SEC_LOAD) == 0)
+	dynsec = NULL;
+
+      /* Deal with -Ttext or something similar such that the first section
+	 is not adjacent to the program headers.  This is an
+	 approximation, since at this point we don't know exactly how many
+	 program headers we will need.  */
+      if (count > 0)
+	{
+	  bfd_size_type phdr_size = elf_tdata (abfd)->program_header_size;
+
+	  if (phdr_size == (bfd_size_type) -1)
+	    phdr_size = get_program_header_size (abfd, info);
+	  if ((abfd->flags & D_PAGED) == 0
+	      || (sections[0]->lma & addr_mask) < phdr_size
+	      || ((sections[0]->lma & addr_mask) % maxpagesize
+		  < phdr_size % maxpagesize)
+	      || (sections[0]->lma & addr_mask & -maxpagesize) < wrap_to)
+	    phdr_in_segment = FALSE;
+	}
+
+      for (i = 0, hdrpp = sections; i < count; i++, hdrpp++)
+	{
+	  asection *hdr;
+	  bfd_boolean new_segment;
+
+	  hdr = *hdrpp;
+
+	  /* See if this section and the last one will fit in the same
+	     segment.  */
+
+	  if (last_hdr == NULL)
+	    {
+	      /* If we don't have a segment yet, then we don't need a new
+		 one (we build the last one after this loop).  */
+	      new_segment = FALSE;
+	    }
+	  else if (last_hdr->lma - last_hdr->vma != hdr->lma - hdr->vma)
+	    {
+	      /* If this section has a different relation between the
+		 virtual address and the load address, then we need a new
+		 segment.  */
+	      new_segment = TRUE;
+	    }
+	  else if (hdr->lma < last_hdr->lma + last_size
+		   || last_hdr->lma + last_size < last_hdr->lma)
+	    {
+	      /* If this section has a load address that makes it overlap
+		 the previous section, then we need a new segment.  */
+	      new_segment = TRUE;
+	    }
+	  /* In the next test we have to be careful when last_hdr->lma is close
+	     to the end of the address space.  If the aligned address wraps
+	     around to the start of the address space, then there are no more
+	     pages left in memory and it is OK to assume that the current
+	     section can be included in the current segment.  */
+	  else if ((BFD_ALIGN (last_hdr->lma + last_size, maxpagesize) + maxpagesize
+		    > last_hdr->lma)
+		   && (BFD_ALIGN (last_hdr->lma + last_size, maxpagesize) + maxpagesize
+		       <= hdr->lma))
+	    {
+	      /* If putting this section in this segment would force us to
+		 skip a page in the segment, then we need a new segment.  */
+	      new_segment = TRUE;
+	    }
+	  else if ((last_hdr->flags & (SEC_LOAD | SEC_THREAD_LOCAL)) == 0
+		   && (hdr->flags & (SEC_LOAD | SEC_THREAD_LOCAL)) != 0)
+	    {
+	      /* We don't want to put a loadable section after a
+		 nonloadable section in the same segment.
+		 Consider .tbss sections as loadable for this purpose.  */
+	      new_segment = TRUE;
+	    }
+	  else if ((abfd->flags & D_PAGED) == 0)
+	    {
+	      /* If the file is not demand paged, which means that we
+		 don't require the sections to be correctly aligned in the
+		 file, then there is no other reason for a new segment.  */
+	      new_segment = FALSE;
+	    }
+	  else if (! writable
+		   && (hdr->flags & SEC_READONLY) == 0
+		   && (((last_hdr->lma + last_size - 1) & -maxpagesize)
+		       != (hdr->lma & -maxpagesize)))
+	    {
+	      /* We don't want to put a writable section in a read only
+		 segment, unless they are on the same page in memory
+		 anyhow.  We already know that the last section does not
+		 bring us past the current section on the page, so the
+		 only case in which the new section is not on the same
+		 page as the previous section is when the previous section
+		 ends precisely on a page boundary.  */
+	      new_segment = TRUE;
+	    }
+	  else
+	    {
+	      /* Otherwise, we can use the same segment.  */
+	      new_segment = FALSE;
+	    }
+
+	  /* Allow interested parties a chance to override our decision.  */
+	  if (last_hdr != NULL
+	      && info != NULL
+	      && info->callbacks->override_segment_assignment != NULL)
+	    new_segment
+	      = info->callbacks->override_segment_assignment (info, abfd, hdr,
+							      last_hdr,
+							      new_segment);
+
+	  if (! new_segment)
+	    {
+	      if ((hdr->flags & SEC_READONLY) == 0)
+		writable = TRUE;
+	      last_hdr = hdr;
+	      /* .tbss sections effectively have zero size.  */
+	      if ((hdr->flags & (SEC_THREAD_LOCAL | SEC_LOAD))
+		  != SEC_THREAD_LOCAL)
+		last_size = hdr->size;
+	      else
+		last_size = 0;
+	      continue;
+	    }
+
+	  /* We need a new program segment.  We must create a new program
+	     header holding all the sections from phdr_index until hdr.  */
+
+	  m = make_mapping (abfd, sections, phdr_index, i, phdr_in_segment);
+	  if (m == NULL)
+	    goto error_return;
+
+	  *pm = m;
+	  pm = &m->next;
+
+	  if ((hdr->flags & SEC_READONLY) == 0)
+	    writable = TRUE;
+	  else
+	    writable = FALSE;
+
+	  last_hdr = hdr;
+	  /* .tbss sections effectively have zero size.  */
+	  if ((hdr->flags & (SEC_THREAD_LOCAL | SEC_LOAD)) != SEC_THREAD_LOCAL)
+	    last_size = hdr->size;
+	  else
+	    last_size = 0;
+	  phdr_index = i;
+	  phdr_in_segment = FALSE;
+	}
+
+      /* Create a final PT_LOAD program segment, but not if it's just
+	 for .tbss.  */
+      if (last_hdr != NULL
+	  && (i - phdr_index != 1
+	      || ((last_hdr->flags & (SEC_THREAD_LOCAL | SEC_LOAD))
+		  != SEC_THREAD_LOCAL)))
+	{
+	  m = make_mapping (abfd, sections, phdr_index, i, phdr_in_segment);
+	  if (m == NULL)
+	    goto error_return;
+
+	  *pm = m;
+	  pm = &m->next;
+	}
+
+      /* If there is a .dynamic section, throw in a PT_DYNAMIC segment.  */
+      if (dynsec != NULL)
+	{
+	  m = _bfd_elf_make_dynamic_segment (abfd, dynsec);
+	  if (m == NULL)
+	    goto error_return;
+	  *pm = m;
+	  pm = &m->next;
+	}
+
+      /* For each batch of consecutive loadable .note sections,
+	 add a PT_NOTE segment.  We don't use bfd_get_section_by_name,
+	 because if we link together nonloadable .note sections and
+	 loadable .note sections, we will generate two .note sections
+	 in the output file.  FIXME: Using names for section types is
+	 bogus anyhow.  */
+      for (s = abfd->sections; s != NULL; s = s->next)
+	{
+	  if ((s->flags & SEC_LOAD) != 0
+	      && CONST_STRNEQ (s->name, ".note"))
+	    {
+	      asection *s2;
+
+	      count = 1;
+	      amt = sizeof (struct elf_segment_map);
+	      if (s->alignment_power == 2)
+		for (s2 = s; s2->next != NULL; s2 = s2->next)
+		  {
+		    if (s2->next->alignment_power == 2
+			&& (s2->next->flags & SEC_LOAD) != 0
+			&& CONST_STRNEQ (s2->next->name, ".note")
+			&& align_power (s2->lma + s2->size, 2)
+			   == s2->next->lma)
+		      count++;
+		    else
+		      break;
+		  }
+	      amt += (count - 1) * sizeof (asection *);
+	      m = (struct elf_segment_map *) bfd_zalloc (abfd, amt);
+	      if (m == NULL)
+		goto error_return;
+	      m->next = NULL;
+	      m->p_type = PT_NOTE;
+	      m->count = count;
+	      while (count > 1)
+		{
+		  m->sections[m->count - count--] = s;
+		  BFD_ASSERT ((s->flags & SEC_THREAD_LOCAL) == 0);
+		  s = s->next;
+		}
+	      m->sections[m->count - 1] = s;
+	      BFD_ASSERT ((s->flags & SEC_THREAD_LOCAL) == 0);
+	      *pm = m;
+	      pm = &m->next;
+	    }
+	  if (s->flags & SEC_THREAD_LOCAL)
+	    {
+	      if (! tls_count)
+		first_tls = s;
+	      tls_count++;
+	    }
+	}
+
+      /* If there are any SHF_TLS output sections, add PT_TLS segment.  */
+      if (tls_count > 0)
+	{
+	  amt = sizeof (struct elf_segment_map);
+	  amt += (tls_count - 1) * sizeof (asection *);
+	  m = (struct elf_segment_map *) bfd_zalloc (abfd, amt);
+	  if (m == NULL)
+	    goto error_return;
+	  m->next = NULL;
+	  m->p_type = PT_TLS;
+	  m->count = tls_count;
+	  /* Mandated PF_R.  */
+	  m->p_flags = PF_R;
+	  m->p_flags_valid = 1;
+	  for (i = 0; i < (unsigned int) tls_count; ++i)
+	    {
+	      BFD_ASSERT (first_tls->flags & SEC_THREAD_LOCAL);
+	      m->sections[i] = first_tls;
+	      first_tls = first_tls->next;
+	    }
+
+	  *pm = m;
+	  pm = &m->next;
+	}
+
+      /* If there is a .eh_frame_hdr section, throw in a PT_GNU_EH_FRAME
+	 segment.  */
+      eh_frame_hdr = elf_tdata (abfd)->eh_frame_hdr;
+      if (eh_frame_hdr != NULL
+	  && (eh_frame_hdr->output_section->flags & SEC_LOAD) != 0)
+	{
+	  amt = sizeof (struct elf_segment_map);
+	  m = (struct elf_segment_map *) bfd_zalloc (abfd, amt);
+	  if (m == NULL)
+	    goto error_return;
+	  m->next = NULL;
+	  m->p_type = PT_GNU_EH_FRAME;
+	  m->count = 1;
+	  m->sections[0] = eh_frame_hdr->output_section;
+
+	  *pm = m;
+	  pm = &m->next;
+	}
+
+      if (elf_tdata (abfd)->stack_flags)
+	{
+	  amt = sizeof (struct elf_segment_map);
+	  m = (struct elf_segment_map *) bfd_zalloc (abfd, amt);
+	  if (m == NULL)
+	    goto error_return;
+	  m->next = NULL;
+	  m->p_type = PT_GNU_STACK;
+	  m->p_flags = elf_tdata (abfd)->stack_flags;
+	  m->p_flags_valid = 1;
+
+	  *pm = m;
+	  pm = &m->next;
+	}
+
+      if (info != NULL && info->relro)
+	{
+	  for (m = mfirst; m != NULL; m = m->next)
+	    {
+	      if (m->p_type == PT_LOAD)
+		{
+		  asection *last = m->sections[m->count - 1];
+		  bfd_vma vaddr = m->sections[0]->vma;
+		  bfd_vma filesz = last->vma - vaddr + last->size;
+
+		  if (vaddr < info->relro_end
+		      && vaddr >= info->relro_start
+		      && (vaddr + filesz) >= info->relro_end)
+		    break;
+		}
+	      }
+
+	  /* Make a PT_GNU_RELRO segment only when it isn't empty.  */
+	  if (m != NULL)
+	    {
+	      amt = sizeof (struct elf_segment_map);
+	      m = (struct elf_segment_map *) bfd_zalloc (abfd, amt);
+	      if (m == NULL)
+		goto error_return;
+	      m->next = NULL;
+	      m->p_type = PT_GNU_RELRO;
+	      m->p_flags = PF_R;
+	      m->p_flags_valid = 1;
+
+	      *pm = m;
+	      pm = &m->next;
+	    }
+	}
+
+      free (sections);
+      elf_tdata (abfd)->segment_map = mfirst;
+    }
+
+  if (!elf_modify_segment_map (abfd, info, no_user_phdrs))
+    return FALSE;
+
+  for (count = 0, m = elf_tdata (abfd)->segment_map; m != NULL; m = m->next)
+    ++count;
+  elf_tdata (abfd)->program_header_size = count * bed->s->sizeof_phdr;
+
+  return TRUE;
+
+ error_return:
+  if (sections != NULL)
+    free (sections);
+  return FALSE;
+}
+
+/* Sort sections by address.  */
+
+static int
+elf_sort_sections (const void *arg1, const void *arg2)
+{
+  const asection *sec1 = *(const asection **) arg1;
+  const asection *sec2 = *(const asection **) arg2;
+  bfd_size_type size1, size2;
+
+  /* Sort by LMA first, since this is the address used to
+     place the section into a segment.  */
+  if (sec1->lma < sec2->lma)
+    return -1;
+  else if (sec1->lma > sec2->lma)
+    return 1;
+
+  /* Then sort by VMA.  Normally the LMA and the VMA will be
+     the same, and this will do nothing.  */
+  if (sec1->vma < sec2->vma)
+    return -1;
+  else if (sec1->vma > sec2->vma)
+    return 1;
+
+  /* Put !SEC_LOAD sections after SEC_LOAD ones.  */
+
+#define TOEND(x) (((x)->flags & (SEC_LOAD | SEC_THREAD_LOCAL)) == 0)
+
+  if (TOEND (sec1))
+    {
+      if (TOEND (sec2))
+	{
+	  /* If the indicies are the same, do not return 0
+	     here, but continue to try the next comparison.  */
+	  if (sec1->target_index - sec2->target_index != 0)
+	    return sec1->target_index - sec2->target_index;
+	}
+      else
+	return 1;
+    }
+  else if (TOEND (sec2))
+    return -1;
+
+#undef TOEND
+
+  /* Sort by size, to put zero sized sections
+     before others at the same address.  */
+
+  size1 = (sec1->flags & SEC_LOAD) ? sec1->size : 0;
+  size2 = (sec2->flags & SEC_LOAD) ? sec2->size : 0;
+
+  if (size1 < size2)
+    return -1;
+  if (size1 > size2)
+    return 1;
+
+  return sec1->target_index - sec2->target_index;
+}
+
+/* Ian Lance Taylor writes:
+
+   We shouldn't be using % with a negative signed number.  That's just
+   not good.  We have to make sure either that the number is not
+   negative, or that the number has an unsigned type.  When the types
+   are all the same size they wind up as unsigned.  When file_ptr is a
+   larger signed type, the arithmetic winds up as signed long long,
+   which is wrong.
+
+   What we're trying to say here is something like ``increase OFF by
+   the least amount that will cause it to be equal to the VMA modulo
+   the page size.''  */
+/* In other words, something like:
+
+   vma_offset = m->sections[0]->vma % bed->maxpagesize;
+   off_offset = off % bed->maxpagesize;
+   if (vma_offset < off_offset)
+     adjustment = vma_offset + bed->maxpagesize - off_offset;
+   else
+     adjustment = vma_offset - off_offset;
+
+   which can can be collapsed into the expression below.  */
+
+static file_ptr
+vma_page_aligned_bias (bfd_vma vma, ufile_ptr off, bfd_vma maxpagesize)
+{
+  return ((vma - off) % maxpagesize);
+}
+
+static void
+print_segment_map (const struct elf_segment_map *m)
+{
+  unsigned int j;
+  const char *pt = get_segment_type (m->p_type);
+  char buf[32];
+
+  if (pt == NULL)
+    {
+      if (m->p_type >= PT_LOPROC && m->p_type <= PT_HIPROC)
+	sprintf (buf, "LOPROC+%7.7x",
+		 (unsigned int) (m->p_type - PT_LOPROC));
+      else if (m->p_type >= PT_LOOS && m->p_type <= PT_HIOS)
+	sprintf (buf, "LOOS+%7.7x",
+		 (unsigned int) (m->p_type - PT_LOOS));
+      else
+	snprintf (buf, sizeof (buf), "%8.8x",
+		  (unsigned int) m->p_type);
+      pt = buf;
+    }
+  fflush (stdout);
+  fprintf (stderr, "%s:", pt);
+  for (j = 0; j < m->count; j++)
+    fprintf (stderr, " %s", m->sections [j]->name);
+  putc ('\n',stderr);
+  fflush (stderr);
+}
+
+static bfd_boolean
+write_zeros (bfd *abfd, file_ptr pos, bfd_size_type len)
+{
+  void *buf;
+  bfd_boolean ret;
+
+  if (bfd_seek (abfd, pos, SEEK_SET) != 0)
+    return FALSE;
+  buf = bfd_zmalloc (len);
+  if (buf == NULL)
+    return FALSE;
+  ret = bfd_bwrite (buf, len, abfd) == len;
+  free (buf);
+  return ret;
+}
+
+/* Assign file positions to the sections based on the mapping from
+   sections to segments.  This function also sets up some fields in
+   the file header.  */
+
+static bfd_boolean
+assign_file_positions_for_load_sections (bfd *abfd,
+					 struct bfd_link_info *link_info)
+{
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  struct elf_segment_map *m;
+  Elf_Internal_Phdr *phdrs;
+  Elf_Internal_Phdr *p;
+  file_ptr off;
+  bfd_size_type maxpagesize;
+  unsigned int alloc;
+  unsigned int i, j;
+  bfd_vma header_pad = 0;
+
+  if (link_info == NULL
+      && !_bfd_elf_map_sections_to_segments (abfd, link_info))
+    return FALSE;
+
+  alloc = 0;
+  for (m = elf_tdata (abfd)->segment_map; m != NULL; m = m->next)
+    {
+      ++alloc;
+      if (m->header_size)
+	header_pad = m->header_size;
+    }
+
+  if (alloc)
+    {
+      elf_elfheader (abfd)->e_phoff = bed->s->sizeof_ehdr;
+      elf_elfheader (abfd)->e_phentsize = bed->s->sizeof_phdr;
+    }
+  else
+    {
+      /* PR binutils/12467.  */
+      elf_elfheader (abfd)->e_phoff = 0;
+      elf_elfheader (abfd)->e_phentsize = 0;
+    }
+  
+  elf_elfheader (abfd)->e_phnum = alloc;
+
+  if (elf_tdata (abfd)->program_header_size == (bfd_size_type) -1)
+    elf_tdata (abfd)->program_header_size = alloc * bed->s->sizeof_phdr;
+  else
+    BFD_ASSERT (elf_tdata (abfd)->program_header_size
+		>= alloc * bed->s->sizeof_phdr);
+
+  if (alloc == 0)
+    {
+      elf_tdata (abfd)->next_file_pos = bed->s->sizeof_ehdr;
+      return TRUE;
+    }
+
+  /* We're writing the size in elf_tdata (abfd)->program_header_size,
+     see assign_file_positions_except_relocs, so make sure we have
+     that amount allocated, with trailing space cleared.
+     The variable alloc contains the computed need, while elf_tdata
+     (abfd)->program_header_size contains the size used for the
+     layout.
+     See ld/emultempl/elf-generic.em:gld${EMULATION_NAME}_map_segments
+     where the layout is forced to according to a larger size in the
+     last iterations for the testcase ld-elf/header.  */
+  BFD_ASSERT (elf_tdata (abfd)->program_header_size % bed->s->sizeof_phdr
+	      == 0);
+  phdrs = (Elf_Internal_Phdr *)
+     bfd_zalloc2 (abfd,
+                  (elf_tdata (abfd)->program_header_size / bed->s->sizeof_phdr),
+                  sizeof (Elf_Internal_Phdr));
+  elf_tdata (abfd)->phdr = phdrs;
+  if (phdrs == NULL)
+    return FALSE;
+
+  maxpagesize = 1;
+  if ((abfd->flags & D_PAGED) != 0)
+    maxpagesize = bed->maxpagesize;
+
+  off = bed->s->sizeof_ehdr;
+  off += alloc * bed->s->sizeof_phdr;
+  if (header_pad < (bfd_vma) off)
+    header_pad = 0;
+  else
+    header_pad -= off;
+  off += header_pad;
+
+  for (m = elf_tdata (abfd)->segment_map, p = phdrs, j = 0;
+       m != NULL;
+       m = m->next, p++, j++)
+    {
+      asection **secpp;
+      bfd_vma off_adjust;
+      bfd_boolean no_contents;
+
+      /* If elf_segment_map is not from map_sections_to_segments, the
+	 sections may not be correctly ordered.  NOTE: sorting should
+	 not be done to the PT_NOTE section of a corefile, which may
+	 contain several pseudo-sections artificially created by bfd.
+	 Sorting these pseudo-sections breaks things badly.  */
+      if (m->count > 1
+	  && !(elf_elfheader (abfd)->e_type == ET_CORE
+	       && m->p_type == PT_NOTE))
+	qsort (m->sections, (size_t) m->count, sizeof (asection *),
+	       elf_sort_sections);
+
+      /* An ELF segment (described by Elf_Internal_Phdr) may contain a
+	 number of sections with contents contributing to both p_filesz
+	 and p_memsz, followed by a number of sections with no contents
+	 that just contribute to p_memsz.  In this loop, OFF tracks next
+	 available file offset for PT_LOAD and PT_NOTE segments.  */
+      p->p_type = m->p_type;
+      p->p_flags = m->p_flags;
+
+      if (m->count == 0)
+	p->p_vaddr = 0;
+      else
+	p->p_vaddr = m->sections[0]->vma - m->p_vaddr_offset;
+
+      if (m->p_paddr_valid)
+	p->p_paddr = m->p_paddr;
+      else if (m->count == 0)
+	p->p_paddr = 0;
+      else
+	p->p_paddr = m->sections[0]->lma - m->p_vaddr_offset;
+
+      if (p->p_type == PT_LOAD
+	  && (abfd->flags & D_PAGED) != 0)
+	{
+	  /* p_align in demand paged PT_LOAD segments effectively stores
+	     the maximum page size.  When copying an executable with
+	     objcopy, we set m->p_align from the input file.  Use this
+	     value for maxpagesize rather than bed->maxpagesize, which
+	     may be different.  Note that we use maxpagesize for PT_TLS
+	     segment alignment later in this function, so we are relying
+	     on at least one PT_LOAD segment appearing before a PT_TLS
+	     segment.  */
+	  if (m->p_align_valid)
+	    maxpagesize = m->p_align;
+
+	  p->p_align = maxpagesize;
+	}
+      else if (m->p_align_valid)
+	p->p_align = m->p_align;
+      else if (m->count == 0)
+	p->p_align = 1 << bed->s->log_file_align;
+      else
+	p->p_align = 0;
+
+      no_contents = FALSE;
+      off_adjust = 0;
+      if (p->p_type == PT_LOAD
+	  && m->count > 0)
+	{
+	  bfd_size_type align;
+	  unsigned int align_power = 0;
+
+	  if (m->p_align_valid)
+	    align = p->p_align;
+	  else
+	    {
+	      for (i = 0, secpp = m->sections; i < m->count; i++, secpp++)
+		{
+		  unsigned int secalign;
+
+		  secalign = bfd_get_section_alignment (abfd, *secpp);
+		  if (secalign > align_power)
+		    align_power = secalign;
+		}
+	      align = (bfd_size_type) 1 << align_power;
+	      if (align < maxpagesize)
+		align = maxpagesize;
+	    }
+
+	  for (i = 0; i < m->count; i++)
+	    if ((m->sections[i]->flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0)
+	      /* If we aren't making room for this section, then
+		 it must be SHT_NOBITS regardless of what we've
+		 set via struct bfd_elf_special_section.  */
+	      elf_section_type (m->sections[i]) = SHT_NOBITS;
+
+	  /* Find out whether this segment contains any loadable
+	     sections.  */
+	  no_contents = TRUE;
+	  for (i = 0; i < m->count; i++)
+	    if (elf_section_type (m->sections[i]) != SHT_NOBITS)
+	      {
+		no_contents = FALSE;
+		break;
+	      }
+
+	  off_adjust = vma_page_aligned_bias (p->p_vaddr, off, align);
+	  off += off_adjust;
+	  if (no_contents)
+	    {
+	      /* We shouldn't need to align the segment on disk since
+		 the segment doesn't need file space, but the gABI
+		 arguably requires the alignment and glibc ld.so
+		 checks it.  So to comply with the alignment
+		 requirement but not waste file space, we adjust
+		 p_offset for just this segment.  (OFF_ADJUST is
+		 subtracted from OFF later.)  This may put p_offset
+		 past the end of file, but that shouldn't matter.  */
+	    }
+	  else
+	    off_adjust = 0;
+	}
+      /* Make sure the .dynamic section is the first section in the
+	 PT_DYNAMIC segment.  */
+      else if (p->p_type == PT_DYNAMIC
+	       && m->count > 1
+	       && strcmp (m->sections[0]->name, ".dynamic") != 0)
+	{
+	  _bfd_error_handler
+	    (_("%B: The first section in the PT_DYNAMIC segment is not the .dynamic section"),
+	     abfd);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+      /* Set the note section type to SHT_NOTE.  */
+      else if (p->p_type == PT_NOTE)
+	for (i = 0; i < m->count; i++)
+	  elf_section_type (m->sections[i]) = SHT_NOTE;
+
+      p->p_offset = 0;
+      p->p_filesz = 0;
+      p->p_memsz = 0;
+
+      if (m->includes_filehdr)
+	{
+	  if (!m->p_flags_valid)
+	    p->p_flags |= PF_R;
+	  p->p_filesz = bed->s->sizeof_ehdr;
+	  p->p_memsz = bed->s->sizeof_ehdr;
+	  if (m->count > 0)
+	    {
+	      BFD_ASSERT (p->p_type == PT_LOAD);
+
+	      if (p->p_vaddr < (bfd_vma) off)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B: Not enough room for program headers, try linking with -N"),
+		     abfd);
+		  bfd_set_error (bfd_error_bad_value);
+		  return FALSE;
+		}
+
+	      p->p_vaddr -= off;
+	      if (!m->p_paddr_valid)
+		p->p_paddr -= off;
+	    }
+	}
+
+      if (m->includes_phdrs)
+	{
+	  if (!m->p_flags_valid)
+	    p->p_flags |= PF_R;
+
+	  if (!m->includes_filehdr)
+	    {
+	      p->p_offset = bed->s->sizeof_ehdr;
+
+	      if (m->count > 0)
+		{
+		  BFD_ASSERT (p->p_type == PT_LOAD);
+		  p->p_vaddr -= off - p->p_offset;
+		  if (!m->p_paddr_valid)
+		    p->p_paddr -= off - p->p_offset;
+		}
+	    }
+
+	  p->p_filesz += alloc * bed->s->sizeof_phdr;
+	  p->p_memsz += alloc * bed->s->sizeof_phdr;
+	  if (m->count)
+	    {
+	      p->p_filesz += header_pad;
+	      p->p_memsz += header_pad;
+	    }
+	}
+
+      if (p->p_type == PT_LOAD
+	  || (p->p_type == PT_NOTE && bfd_get_format (abfd) == bfd_core))
+	{
+	  if (!m->includes_filehdr && !m->includes_phdrs)
+	    p->p_offset = off;
+	  else
+	    {
+	      file_ptr adjust;
+
+	      adjust = off - (p->p_offset + p->p_filesz);
+	      if (!no_contents)
+		p->p_filesz += adjust;
+	      p->p_memsz += adjust;
+	    }
+	}
+
+      /* Set up p_filesz, p_memsz, p_align and p_flags from the section
+	 maps.  Set filepos for sections in PT_LOAD segments, and in
+	 core files, for sections in PT_NOTE segments.
+	 assign_file_positions_for_non_load_sections will set filepos
+	 for other sections and update p_filesz for other segments.  */
+      for (i = 0, secpp = m->sections; i < m->count; i++, secpp++)
+	{
+	  asection *sec;
+	  bfd_size_type align;
+	  Elf_Internal_Shdr *this_hdr;
+
+	  sec = *secpp;
+	  this_hdr = &elf_section_data (sec)->this_hdr;
+	  align = (bfd_size_type) 1 << bfd_get_section_alignment (abfd, sec);
+
+	  if ((p->p_type == PT_LOAD
+	       || p->p_type == PT_TLS)
+	      && (this_hdr->sh_type != SHT_NOBITS
+		  || ((this_hdr->sh_flags & SHF_ALLOC) != 0
+		      && ((this_hdr->sh_flags & SHF_TLS) == 0
+			  || p->p_type == PT_TLS))))
+	    {
+	      bfd_vma p_start = p->p_paddr;
+	      bfd_vma p_end = p_start + p->p_memsz;
+	      bfd_vma s_start = sec->lma;
+	      bfd_vma adjust = s_start - p_end;
+
+	      if (adjust != 0
+		  && (s_start < p_end
+		      || p_end < p_start))
+		{
+		  (*_bfd_error_handler)
+		    (_("%B: section %A lma %#lx adjusted to %#lx"), abfd, sec,
+		     (unsigned long) s_start, (unsigned long) p_end);
+		  adjust = 0;
+		  sec->lma = p_end;
+		}
+	      p->p_memsz += adjust;
+
+	      if (this_hdr->sh_type != SHT_NOBITS)
+		{
+		  if (p->p_filesz + adjust < p->p_memsz)
+		    {
+		      /* We have a PROGBITS section following NOBITS ones.
+		         Allocate file space for the NOBITS section(s) and
+			 zero it.  */
+		      adjust = p->p_memsz - p->p_filesz;
+		      if (!write_zeros (abfd, off, adjust))
+			return FALSE;
+		    }
+		  off += adjust;
+		  p->p_filesz += adjust;
+		}
+	    }
+
+	  if (p->p_type == PT_NOTE && bfd_get_format (abfd) == bfd_core)
+	    {
+	      /* The section at i == 0 is the one that actually contains
+		 everything.  */
+	      if (i == 0)
+		{
+		  this_hdr->sh_offset = sec->filepos = off;
+		  off += this_hdr->sh_size;
+		  p->p_filesz = this_hdr->sh_size;
+		  p->p_memsz = 0;
+		  p->p_align = 1;
+		}
+	      else
+		{
+		  /* The rest are fake sections that shouldn't be written.  */
+		  sec->filepos = 0;
+		  sec->size = 0;
+		  sec->flags = 0;
+		  continue;
+		}
+	    }
+	  else
+	    {
+	      if (p->p_type == PT_LOAD)
+		{
+		  this_hdr->sh_offset = sec->filepos = off;
+		  if (this_hdr->sh_type != SHT_NOBITS)
+		    off += this_hdr->sh_size;
+		}
+	      else if (this_hdr->sh_type == SHT_NOBITS
+		       && (this_hdr->sh_flags & SHF_TLS) != 0
+		       && this_hdr->sh_offset == 0)
+		{
+		  /* This is a .tbss section that didn't get a PT_LOAD.
+		     (See _bfd_elf_map_sections_to_segments "Create a
+		     final PT_LOAD".)  Set sh_offset to the value it
+		     would have if we had created a zero p_filesz and
+		     p_memsz PT_LOAD header for the section.  This
+		     also makes the PT_TLS header have the same
+		     p_offset value.  */
+		  bfd_vma adjust = vma_page_aligned_bias (this_hdr->sh_addr,
+							  off, align);
+		  this_hdr->sh_offset = sec->filepos = off + adjust;
+		}
+
+	      if (this_hdr->sh_type != SHT_NOBITS)
+		{
+		  p->p_filesz += this_hdr->sh_size;
+		  /* A load section without SHF_ALLOC is something like
+		     a note section in a PT_NOTE segment.  These take
+		     file space but are not loaded into memory.  */
+		  if ((this_hdr->sh_flags & SHF_ALLOC) != 0)
+		    p->p_memsz += this_hdr->sh_size;
+		}
+	      else if ((this_hdr->sh_flags & SHF_ALLOC) != 0)
+		{
+		  if (p->p_type == PT_TLS)
+		    p->p_memsz += this_hdr->sh_size;
+
+		  /* .tbss is special.  It doesn't contribute to p_memsz of
+		     normal segments.  */
+		  else if ((this_hdr->sh_flags & SHF_TLS) == 0)
+		    p->p_memsz += this_hdr->sh_size;
+		}
+
+	      if (align > p->p_align
+		  && !m->p_align_valid
+		  && (p->p_type != PT_LOAD
+		      || (abfd->flags & D_PAGED) == 0))
+		p->p_align = align;
+	    }
+
+	  if (!m->p_flags_valid)
+	    {
+	      p->p_flags |= PF_R;
+	      if ((this_hdr->sh_flags & SHF_EXECINSTR) != 0)
+		p->p_flags |= PF_X;
+	      if ((this_hdr->sh_flags & SHF_WRITE) != 0)
+		p->p_flags |= PF_W;
+	    }
+	}
+      off -= off_adjust;
+
+      /* Check that all sections are in a PT_LOAD segment.
+	 Don't check funky gdb generated core files.  */
+      if (p->p_type == PT_LOAD && bfd_get_format (abfd) != bfd_core)
+	{
+	  bfd_boolean check_vma = TRUE;
+
+	  for (i = 1; i < m->count; i++)
+	    if (m->sections[i]->vma == m->sections[i - 1]->vma
+		&& ELF_SECTION_SIZE (&(elf_section_data (m->sections[i])
+				       ->this_hdr), p) != 0
+		&& ELF_SECTION_SIZE (&(elf_section_data (m->sections[i - 1])
+				       ->this_hdr), p) != 0)
+	      {
+		/* Looks like we have overlays packed into the segment.  */
+		check_vma = FALSE;
+		break;
+	      }
+
+	  for (i = 0; i < m->count; i++)
+	    {
+	      Elf_Internal_Shdr *this_hdr;
+	      asection *sec;
+
+	      sec = m->sections[i];
+	      this_hdr = &(elf_section_data(sec)->this_hdr);
+	      if (!ELF_SECTION_IN_SEGMENT_1 (this_hdr, p, check_vma, 0)
+		  && !ELF_TBSS_SPECIAL (this_hdr, p))
+		{
+		  (*_bfd_error_handler)
+		    (_("%B: section `%A' can't be allocated in segment %d"),
+		     abfd, sec, j);
+		  print_segment_map (m);
+		}
+	    }
+	}
+    }
+
+  elf_tdata (abfd)->next_file_pos = off;
+  return TRUE;
+}
+
+/* Assign file positions for the other sections.  */
+
+static bfd_boolean
+assign_file_positions_for_non_load_sections (bfd *abfd,
+					     struct bfd_link_info *link_info)
+{
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  Elf_Internal_Shdr **i_shdrpp;
+  Elf_Internal_Shdr **hdrpp;
+  Elf_Internal_Phdr *phdrs;
+  Elf_Internal_Phdr *p;
+  struct elf_segment_map *m;
+  bfd_vma filehdr_vaddr, filehdr_paddr;
+  bfd_vma phdrs_vaddr, phdrs_paddr;
+  file_ptr off;
+  unsigned int num_sec;
+  unsigned int i;
+  unsigned int count;
+
+  i_shdrpp = elf_elfsections (abfd);
+  num_sec = elf_numsections (abfd);
+  off = elf_tdata (abfd)->next_file_pos;
+  for (i = 1, hdrpp = i_shdrpp + 1; i < num_sec; i++, hdrpp++)
+    {
+      struct elf_obj_tdata *tdata = elf_tdata (abfd);
+      Elf_Internal_Shdr *hdr;
+
+      hdr = *hdrpp;
+      if (hdr->bfd_section != NULL
+	  && (hdr->bfd_section->filepos != 0
+	      || (hdr->sh_type == SHT_NOBITS
+		  && hdr->contents == NULL)))
+	BFD_ASSERT (hdr->sh_offset == hdr->bfd_section->filepos);
+      else if ((hdr->sh_flags & SHF_ALLOC) != 0)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B: warning: allocated section `%s' not in segment"),
+	     abfd,
+	     (hdr->bfd_section == NULL
+	      ? "*unknown*"
+	      : hdr->bfd_section->name));
+	  /* We don't need to page align empty sections.  */
+	  if ((abfd->flags & D_PAGED) != 0 && hdr->sh_size != 0)
+	    off += vma_page_aligned_bias (hdr->sh_addr, off,
+					  bed->maxpagesize);
+	  else
+	    off += vma_page_aligned_bias (hdr->sh_addr, off,
+					  hdr->sh_addralign);
+	  off = _bfd_elf_assign_file_position_for_section (hdr, off,
+							   FALSE);
+	}
+      else if (((hdr->sh_type == SHT_REL || hdr->sh_type == SHT_RELA)
+		&& hdr->bfd_section == NULL)
+	       || hdr == i_shdrpp[tdata->symtab_section]
+	       || hdr == i_shdrpp[tdata->symtab_shndx_section]
+	       || hdr == i_shdrpp[tdata->strtab_section])
+	hdr->sh_offset = -1;
+      else
+	off = _bfd_elf_assign_file_position_for_section (hdr, off, TRUE);
+    }
+
+  /* Now that we have set the section file positions, we can set up
+     the file positions for the non PT_LOAD segments.  */
+  count = 0;
+  filehdr_vaddr = 0;
+  filehdr_paddr = 0;
+  phdrs_vaddr = bed->maxpagesize + bed->s->sizeof_ehdr;
+  phdrs_paddr = 0;
+  phdrs = elf_tdata (abfd)->phdr;
+  for (m = elf_tdata (abfd)->segment_map, p = phdrs;
+       m != NULL;
+       m = m->next, p++)
+    {
+      ++count;
+      if (p->p_type != PT_LOAD)
+	continue;
+
+      if (m->includes_filehdr)
+	{
+	  filehdr_vaddr = p->p_vaddr;
+	  filehdr_paddr = p->p_paddr;
+	}
+      if (m->includes_phdrs)
+	{
+	  phdrs_vaddr = p->p_vaddr;
+	  phdrs_paddr = p->p_paddr;
+	  if (m->includes_filehdr)
+	    {
+	      phdrs_vaddr += bed->s->sizeof_ehdr;
+	      phdrs_paddr += bed->s->sizeof_ehdr;
+	    }
+	}
+    }
+
+  for (m = elf_tdata (abfd)->segment_map, p = phdrs;
+       m != NULL;
+       m = m->next, p++)
+    {
+      if (p->p_type == PT_GNU_RELRO)
+	{
+	  const Elf_Internal_Phdr *lp;
+
+	  BFD_ASSERT (!m->includes_filehdr && !m->includes_phdrs);
+
+	  if (link_info != NULL)
+	    {
+	      /* During linking the range of the RELRO segment is passed
+		 in link_info.  */
+	      for (lp = phdrs; lp < phdrs + count; ++lp)
+		{
+		  if (lp->p_type == PT_LOAD
+		      && lp->p_vaddr >= link_info->relro_start
+		      && lp->p_vaddr < link_info->relro_end
+		      && lp->p_vaddr + lp->p_filesz >= link_info->relro_end)
+		    break;
+		}
+	    }
+	  else
+	    {
+	      /* Otherwise we are copying an executable or shared
+		 library, but we need to use the same linker logic.  */
+	      for (lp = phdrs; lp < phdrs + count; ++lp)
+		{
+		  if (lp->p_type == PT_LOAD
+		      && lp->p_paddr == p->p_paddr)
+		    break;
+		}
+	    }
+
+	  if (lp < phdrs + count)
+	    {
+	      p->p_vaddr = lp->p_vaddr;
+	      p->p_paddr = lp->p_paddr;
+	      p->p_offset = lp->p_offset;
+	      if (link_info != NULL)
+		p->p_filesz = link_info->relro_end - lp->p_vaddr;
+	      else if (m->p_size_valid)
+		p->p_filesz = m->p_size;
+	      else
+		abort ();
+	      p->p_memsz = p->p_filesz;
+	      p->p_align = 1;
+	      p->p_flags = (lp->p_flags & ~PF_W);
+	    }
+	  else
+	    {
+	      memset (p, 0, sizeof *p);
+	      p->p_type = PT_NULL;
+	    }
+	}
+      else if (m->count != 0)
+	{
+	  if (p->p_type != PT_LOAD
+	      && (p->p_type != PT_NOTE
+		  || bfd_get_format (abfd) != bfd_core))
+	    {
+	      BFD_ASSERT (!m->includes_filehdr && !m->includes_phdrs);
+
+	      p->p_filesz = 0;
+	      p->p_offset = m->sections[0]->filepos;
+	      for (i = m->count; i-- != 0;)
+		{
+		  asection *sect = m->sections[i];
+		  Elf_Internal_Shdr *hdr = &elf_section_data (sect)->this_hdr;
+		  if (hdr->sh_type != SHT_NOBITS)
+		    {
+		      p->p_filesz = (sect->filepos - m->sections[0]->filepos
+				     + hdr->sh_size);
+		      break;
+		    }
+		}
+	    }
+	}
+      else if (m->includes_filehdr)
+	{
+	  p->p_vaddr = filehdr_vaddr;
+	  if (! m->p_paddr_valid)
+	    p->p_paddr = filehdr_paddr;
+	}
+      else if (m->includes_phdrs)
+	{
+	  p->p_vaddr = phdrs_vaddr;
+	  if (! m->p_paddr_valid)
+	    p->p_paddr = phdrs_paddr;
+	}
+    }
+
+  elf_tdata (abfd)->next_file_pos = off;
+
+  return TRUE;
+}
+
+/* Work out the file positions of all the sections.  This is called by
+   _bfd_elf_compute_section_file_positions.  All the section sizes and
+   VMAs must be known before this is called.
+
+   Reloc sections come in two flavours: Those processed specially as
+   "side-channel" data attached to a section to which they apply, and
+   those that bfd doesn't process as relocations.  The latter sort are
+   stored in a normal bfd section by bfd_section_from_shdr.   We don't
+   consider the former sort here, unless they form part of the loadable
+   image.  Reloc sections not assigned here will be handled later by
+   assign_file_positions_for_relocs.
+
+   We also don't set the positions of the .symtab and .strtab here.  */
+
+static bfd_boolean
+assign_file_positions_except_relocs (bfd *abfd,
+				     struct bfd_link_info *link_info)
+{
+  struct elf_obj_tdata *tdata = elf_tdata (abfd);
+  Elf_Internal_Ehdr *i_ehdrp = elf_elfheader (abfd);
+  file_ptr off;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+
+  if ((abfd->flags & (EXEC_P | DYNAMIC)) == 0
+      && bfd_get_format (abfd) != bfd_core)
+    {
+      Elf_Internal_Shdr ** const i_shdrpp = elf_elfsections (abfd);
+      unsigned int num_sec = elf_numsections (abfd);
+      Elf_Internal_Shdr **hdrpp;
+      unsigned int i;
+
+      /* Start after the ELF header.  */
+      off = i_ehdrp->e_ehsize;
+
+      /* We are not creating an executable, which means that we are
+	 not creating a program header, and that the actual order of
+	 the sections in the file is unimportant.  */
+      for (i = 1, hdrpp = i_shdrpp + 1; i < num_sec; i++, hdrpp++)
+	{
+	  Elf_Internal_Shdr *hdr;
+
+	  hdr = *hdrpp;
+	  if (((hdr->sh_type == SHT_REL || hdr->sh_type == SHT_RELA)
+	       && hdr->bfd_section == NULL)
+	      || i == tdata->symtab_section
+	      || i == tdata->symtab_shndx_section
+	      || i == tdata->strtab_section)
+	    {
+	      hdr->sh_offset = -1;
+	    }
+	  else
+	    off = _bfd_elf_assign_file_position_for_section (hdr, off, TRUE);
+	}
+    }
+  else
+    {
+      unsigned int alloc;
+
+      /* Assign file positions for the loaded sections based on the
+	 assignment of sections to segments.  */
+      if (!assign_file_positions_for_load_sections (abfd, link_info))
+	return FALSE;
+
+      /* And for non-load sections.  */
+      if (!assign_file_positions_for_non_load_sections (abfd, link_info))
+	return FALSE;
+
+      if (bed->elf_backend_modify_program_headers != NULL)
+	{
+	  if (!(*bed->elf_backend_modify_program_headers) (abfd, link_info))
+	    return FALSE;
+	}
+
+      /* Write out the program headers.  */
+      alloc = tdata->program_header_size / bed->s->sizeof_phdr;
+      if (bfd_seek (abfd, (bfd_signed_vma) bed->s->sizeof_ehdr, SEEK_SET) != 0
+	  || bed->s->write_out_phdrs (abfd, tdata->phdr, alloc) != 0)
+	return FALSE;
+
+      off = tdata->next_file_pos;
+    }
+
+  /* Place the section headers.  */
+  off = align_file_position (off, 1 << bed->s->log_file_align);
+  i_ehdrp->e_shoff = off;
+  off += i_ehdrp->e_shnum * i_ehdrp->e_shentsize;
+
+  tdata->next_file_pos = off;
+
+  return TRUE;
+}
+
+static bfd_boolean
+prep_headers (bfd *abfd)
+{
+  Elf_Internal_Ehdr *i_ehdrp;	/* Elf file header, internal form.  */
+  struct elf_strtab_hash *shstrtab;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+
+  i_ehdrp = elf_elfheader (abfd);
+
+  shstrtab = _bfd_elf_strtab_init ();
+  if (shstrtab == NULL)
+    return FALSE;
+
+  elf_shstrtab (abfd) = shstrtab;
+
+  i_ehdrp->e_ident[EI_MAG0] = ELFMAG0;
+  i_ehdrp->e_ident[EI_MAG1] = ELFMAG1;
+  i_ehdrp->e_ident[EI_MAG2] = ELFMAG2;
+  i_ehdrp->e_ident[EI_MAG3] = ELFMAG3;
+
+  i_ehdrp->e_ident[EI_CLASS] = bed->s->elfclass;
+  i_ehdrp->e_ident[EI_DATA] =
+    bfd_big_endian (abfd) ? ELFDATA2MSB : ELFDATA2LSB;
+  i_ehdrp->e_ident[EI_VERSION] = bed->s->ev_current;
+
+  if ((abfd->flags & DYNAMIC) != 0)
+    i_ehdrp->e_type = ET_DYN;
+  else if ((abfd->flags & EXEC_P) != 0)
+    i_ehdrp->e_type = ET_EXEC;
+  else if (bfd_get_format (abfd) == bfd_core)
+    i_ehdrp->e_type = ET_CORE;
+  else
+    i_ehdrp->e_type = ET_REL;
+
+  switch (bfd_get_arch (abfd))
+    {
+    case bfd_arch_unknown:
+      i_ehdrp->e_machine = EM_NONE;
+      break;
+
+      /* There used to be a long list of cases here, each one setting
+	 e_machine to the same EM_* macro #defined as ELF_MACHINE_CODE
+	 in the corresponding bfd definition.  To avoid duplication,
+	 the switch was removed.  Machines that need special handling
+	 can generally do it in elf_backend_final_write_processing(),
+	 unless they need the information earlier than the final write.
+	 Such need can generally be supplied by replacing the tests for
+	 e_machine with the conditions used to determine it.  */
+    default:
+      i_ehdrp->e_machine = bed->elf_machine_code;
+    }
+
+  i_ehdrp->e_version = bed->s->ev_current;
+  i_ehdrp->e_ehsize = bed->s->sizeof_ehdr;
+
+  /* No program header, for now.  */
+  i_ehdrp->e_phoff = 0;
+  i_ehdrp->e_phentsize = 0;
+  i_ehdrp->e_phnum = 0;
+
+  /* Each bfd section is section header entry.  */
+  i_ehdrp->e_entry = bfd_get_start_address (abfd);
+  i_ehdrp->e_shentsize = bed->s->sizeof_shdr;
+
+  /* If we're building an executable, we'll need a program header table.  */
+  if (abfd->flags & EXEC_P)
+    /* It all happens later.  */
+    ;
+  else
+    {
+      i_ehdrp->e_phentsize = 0;
+      i_ehdrp->e_phoff = 0;
+    }
+
+  elf_tdata (abfd)->symtab_hdr.sh_name =
+    (unsigned int) _bfd_elf_strtab_add (shstrtab, ".symtab", FALSE);
+  elf_tdata (abfd)->strtab_hdr.sh_name =
+    (unsigned int) _bfd_elf_strtab_add (shstrtab, ".strtab", FALSE);
+  elf_tdata (abfd)->shstrtab_hdr.sh_name =
+    (unsigned int) _bfd_elf_strtab_add (shstrtab, ".shstrtab", FALSE);
+  if (elf_tdata (abfd)->symtab_hdr.sh_name == (unsigned int) -1
+      || elf_tdata (abfd)->symtab_hdr.sh_name == (unsigned int) -1
+      || elf_tdata (abfd)->shstrtab_hdr.sh_name == (unsigned int) -1)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Assign file positions for all the reloc sections which are not part
+   of the loadable file image.  */
+
+void
+_bfd_elf_assign_file_positions_for_relocs (bfd *abfd)
+{
+  file_ptr off;
+  unsigned int i, num_sec;
+  Elf_Internal_Shdr **shdrpp;
+
+  off = elf_tdata (abfd)->next_file_pos;
+
+  num_sec = elf_numsections (abfd);
+  for (i = 1, shdrpp = elf_elfsections (abfd) + 1; i < num_sec; i++, shdrpp++)
+    {
+      Elf_Internal_Shdr *shdrp;
+
+      shdrp = *shdrpp;
+      if ((shdrp->sh_type == SHT_REL || shdrp->sh_type == SHT_RELA)
+	  && shdrp->sh_offset == -1)
+	off = _bfd_elf_assign_file_position_for_section (shdrp, off, TRUE);
+    }
+
+  elf_tdata (abfd)->next_file_pos = off;
+}
+
+bfd_boolean
+_bfd_elf_write_object_contents (bfd *abfd)
+{
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  Elf_Internal_Shdr **i_shdrp;
+  bfd_boolean failed;
+  unsigned int count, num_sec;
+
+  if (! abfd->output_has_begun
+      && ! _bfd_elf_compute_section_file_positions (abfd, NULL))
+    return FALSE;
+
+  i_shdrp = elf_elfsections (abfd);
+
+  failed = FALSE;
+  bfd_map_over_sections (abfd, bed->s->write_relocs, &failed);
+  if (failed)
+    return FALSE;
+
+  _bfd_elf_assign_file_positions_for_relocs (abfd);
+
+  /* After writing the headers, we need to write the sections too...  */
+  num_sec = elf_numsections (abfd);
+  for (count = 1; count < num_sec; count++)
+    {
+      if (bed->elf_backend_section_processing)
+	(*bed->elf_backend_section_processing) (abfd, i_shdrp[count]);
+      if (i_shdrp[count]->contents)
+	{
+	  bfd_size_type amt = i_shdrp[count]->sh_size;
+
+	  if (bfd_seek (abfd, i_shdrp[count]->sh_offset, SEEK_SET) != 0
+	      || bfd_bwrite (i_shdrp[count]->contents, amt, abfd) != amt)
+	    return FALSE;
+	}
+    }
+
+  /* Write out the section header names.  */
+  if (elf_shstrtab (abfd) != NULL
+      && (bfd_seek (abfd, elf_tdata (abfd)->shstrtab_hdr.sh_offset, SEEK_SET) != 0
+	  || !_bfd_elf_strtab_emit (abfd, elf_shstrtab (abfd))))
+    return FALSE;
+
+  if (bed->elf_backend_final_write_processing)
+    (*bed->elf_backend_final_write_processing) (abfd,
+						elf_tdata (abfd)->linker);
+
+  if (!bed->s->write_shdrs_and_ehdr (abfd))
+    return FALSE;
+
+  /* This is last since write_shdrs_and_ehdr can touch i_shdrp[0].  */
+  if (elf_tdata (abfd)->after_write_object_contents)
+    return (*elf_tdata (abfd)->after_write_object_contents) (abfd);
+
+  return TRUE;
+}
+
+bfd_boolean
+_bfd_elf_write_corefile_contents (bfd *abfd)
+{
+  /* Hopefully this can be done just like an object file.  */
+  return _bfd_elf_write_object_contents (abfd);
+}
+
+/* Given a section, search the header to find them.  */
+
+unsigned int
+_bfd_elf_section_from_bfd_section (bfd *abfd, struct bfd_section *asect)
+{
+  const struct elf_backend_data *bed;
+  unsigned int sec_index;
+
+  if (elf_section_data (asect) != NULL
+      && elf_section_data (asect)->this_idx != 0)
+    return elf_section_data (asect)->this_idx;
+
+  if (bfd_is_abs_section (asect))
+    sec_index = SHN_ABS;
+  else if (bfd_is_com_section (asect))
+    sec_index = SHN_COMMON;
+  else if (bfd_is_und_section (asect))
+    sec_index = SHN_UNDEF;
+  else
+    sec_index = SHN_BAD;
+
+  bed = get_elf_backend_data (abfd);
+  if (bed->elf_backend_section_from_bfd_section)
+    {
+      int retval = sec_index;
+
+      if ((*bed->elf_backend_section_from_bfd_section) (abfd, asect, &retval))
+	return retval;
+    }
+
+  if (sec_index == SHN_BAD)
+    bfd_set_error (bfd_error_nonrepresentable_section);
+
+  return sec_index;
+}
+
+/* Given a BFD symbol, return the index in the ELF symbol table, or -1
+   on error.  */
+
+int
+_bfd_elf_symbol_from_bfd_symbol (bfd *abfd, asymbol **asym_ptr_ptr)
+{
+  asymbol *asym_ptr = *asym_ptr_ptr;
+  int idx;
+  flagword flags = asym_ptr->flags;
+
+  /* When gas creates relocations against local labels, it creates its
+     own symbol for the section, but does put the symbol into the
+     symbol chain, so udata is 0.  When the linker is generating
+     relocatable output, this section symbol may be for one of the
+     input sections rather than the output section.  */
+  if (asym_ptr->udata.i == 0
+      && (flags & BSF_SECTION_SYM)
+      && asym_ptr->section)
+    {
+      asection *sec;
+      int indx;
+
+      sec = asym_ptr->section;
+      if (sec->owner != abfd && sec->output_section != NULL)
+	sec = sec->output_section;
+      if (sec->owner == abfd
+	  && (indx = sec->index) < elf_num_section_syms (abfd)
+	  && elf_section_syms (abfd)[indx] != NULL)
+	asym_ptr->udata.i = elf_section_syms (abfd)[indx]->udata.i;
+    }
+
+  idx = asym_ptr->udata.i;
+
+  if (idx == 0)
+    {
+      /* This case can occur when using --strip-symbol on a symbol
+	 which is used in a relocation entry.  */
+      (*_bfd_error_handler)
+	(_("%B: symbol `%s' required but not present"),
+	 abfd, bfd_asymbol_name (asym_ptr));
+      bfd_set_error (bfd_error_no_symbols);
+      return -1;
+    }
+
+#if DEBUG & 4
+  {
+    fprintf (stderr,
+	     "elf_symbol_from_bfd_symbol 0x%.8lx, name = %s, sym num = %d, flags = 0x%.8lx\n",
+	     (long) asym_ptr, asym_ptr->name, idx, (long) flags);
+    fflush (stderr);
+  }
+#endif
+
+  return idx;
+}
+
+/* Rewrite program header information.  */
+
+static bfd_boolean
+rewrite_elf_program_header (bfd *ibfd, bfd *obfd)
+{
+  Elf_Internal_Ehdr *iehdr;
+  struct elf_segment_map *map;
+  struct elf_segment_map *map_first;
+  struct elf_segment_map **pointer_to_map;
+  Elf_Internal_Phdr *segment;
+  asection *section;
+  unsigned int i;
+  unsigned int num_segments;
+  bfd_boolean phdr_included = FALSE;
+  bfd_boolean p_paddr_valid;
+  bfd_vma maxpagesize;
+  struct elf_segment_map *phdr_adjust_seg = NULL;
+  unsigned int phdr_adjust_num = 0;
+  const struct elf_backend_data *bed;
+
+  bed = get_elf_backend_data (ibfd);
+  iehdr = elf_elfheader (ibfd);
+
+  map_first = NULL;
+  pointer_to_map = &map_first;
+
+  num_segments = elf_elfheader (ibfd)->e_phnum;
+  maxpagesize = get_elf_backend_data (obfd)->maxpagesize;
+
+  /* Returns the end address of the segment + 1.  */
+#define SEGMENT_END(segment, start)					\
+  (start + (segment->p_memsz > segment->p_filesz			\
+	    ? segment->p_memsz : segment->p_filesz))
+
+#define SECTION_SIZE(section, segment)					\
+  (((section->flags & (SEC_HAS_CONTENTS | SEC_THREAD_LOCAL))		\
+    != SEC_THREAD_LOCAL || segment->p_type == PT_TLS)			\
+   ? section->size : 0)
+
+  /* Returns TRUE if the given section is contained within
+     the given segment.  VMA addresses are compared.  */
+#define IS_CONTAINED_BY_VMA(section, segment)				\
+  (section->vma >= segment->p_vaddr					\
+   && (section->vma + SECTION_SIZE (section, segment)			\
+       <= (SEGMENT_END (segment, segment->p_vaddr))))
+
+  /* Returns TRUE if the given section is contained within
+     the given segment.  LMA addresses are compared.  */
+#define IS_CONTAINED_BY_LMA(section, segment, base)			\
+  (section->lma >= base							\
+   && (section->lma + SECTION_SIZE (section, segment)			\
+       <= SEGMENT_END (segment, base)))
+
+  /* Handle PT_NOTE segment.  */
+#define IS_NOTE(p, s)							\
+  (p->p_type == PT_NOTE							\
+   && elf_section_type (s) == SHT_NOTE					\
+   && (bfd_vma) s->filepos >= p->p_offset				\
+   && ((bfd_vma) s->filepos + s->size					\
+       <= p->p_offset + p->p_filesz))
+
+  /* Special case: corefile "NOTE" section containing regs, prpsinfo
+     etc.  */
+#define IS_COREFILE_NOTE(p, s)						\
+  (IS_NOTE (p, s)							\
+   && bfd_get_format (ibfd) == bfd_core					\
+   && s->vma == 0							\
+   && s->lma == 0)
+
+  /* The complicated case when p_vaddr is 0 is to handle the Solaris
+     linker, which generates a PT_INTERP section with p_vaddr and
+     p_memsz set to 0.  */
+#define IS_SOLARIS_PT_INTERP(p, s)					\
+  (p->p_vaddr == 0							\
+   && p->p_paddr == 0							\
+   && p->p_memsz == 0							\
+   && p->p_filesz > 0							\
+   && (s->flags & SEC_HAS_CONTENTS) != 0				\
+   && s->size > 0							\
+   && (bfd_vma) s->filepos >= p->p_offset				\
+   && ((bfd_vma) s->filepos + s->size					\
+       <= p->p_offset + p->p_filesz))
+
+  /* Decide if the given section should be included in the given segment.
+     A section will be included if:
+       1. It is within the address space of the segment -- we use the LMA
+	  if that is set for the segment and the VMA otherwise,
+       2. It is an allocated section or a NOTE section in a PT_NOTE
+	  segment.         
+       3. There is an output section associated with it,
+       4. The section has not already been allocated to a previous segment.
+       5. PT_GNU_STACK segments do not include any sections.
+       6. PT_TLS segment includes only SHF_TLS sections.
+       7. SHF_TLS sections are only in PT_TLS or PT_LOAD segments.
+       8. PT_DYNAMIC should not contain empty sections at the beginning
+	  (with the possible exception of .dynamic).  */
+#define IS_SECTION_IN_INPUT_SEGMENT(section, segment, bed)		\
+  ((((segment->p_paddr							\
+      ? IS_CONTAINED_BY_LMA (section, segment, segment->p_paddr)	\
+      : IS_CONTAINED_BY_VMA (section, segment))				\
+     && (section->flags & SEC_ALLOC) != 0)				\
+    || IS_NOTE (segment, section))					\
+   && segment->p_type != PT_GNU_STACK					\
+   && (segment->p_type != PT_TLS					\
+       || (section->flags & SEC_THREAD_LOCAL))				\
+   && (segment->p_type == PT_LOAD					\
+       || segment->p_type == PT_TLS					\
+       || (section->flags & SEC_THREAD_LOCAL) == 0)			\
+   && (segment->p_type != PT_DYNAMIC					\
+       || SECTION_SIZE (section, segment) > 0				\
+       || (segment->p_paddr						\
+	   ? segment->p_paddr != section->lma				\
+	   : segment->p_vaddr != section->vma)				\
+       || (strcmp (bfd_get_section_name (ibfd, section), ".dynamic")	\
+	   == 0))							\
+   && !section->segment_mark)
+
+/* If the output section of a section in the input segment is NULL,
+   it is removed from the corresponding output segment.   */
+#define INCLUDE_SECTION_IN_SEGMENT(section, segment, bed)		\
+  (IS_SECTION_IN_INPUT_SEGMENT (section, segment, bed)		\
+   && section->output_section != NULL)
+
+  /* Returns TRUE iff seg1 starts after the end of seg2.  */
+#define SEGMENT_AFTER_SEGMENT(seg1, seg2, field)			\
+  (seg1->field >= SEGMENT_END (seg2, seg2->field))
+
+  /* Returns TRUE iff seg1 and seg2 overlap. Segments overlap iff both
+     their VMA address ranges and their LMA address ranges overlap.
+     It is possible to have overlapping VMA ranges without overlapping LMA
+     ranges.  RedBoot images for example can have both .data and .bss mapped
+     to the same VMA range, but with the .data section mapped to a different
+     LMA.  */
+#define SEGMENT_OVERLAPS(seg1, seg2)					\
+  (   !(SEGMENT_AFTER_SEGMENT (seg1, seg2, p_vaddr)			\
+	|| SEGMENT_AFTER_SEGMENT (seg2, seg1, p_vaddr))			\
+   && !(SEGMENT_AFTER_SEGMENT (seg1, seg2, p_paddr)			\
+	|| SEGMENT_AFTER_SEGMENT (seg2, seg1, p_paddr)))
+
+  /* Initialise the segment mark field.  */
+  for (section = ibfd->sections; section != NULL; section = section->next)
+    section->segment_mark = FALSE;
+
+  /* The Solaris linker creates program headers in which all the
+     p_paddr fields are zero.  When we try to objcopy or strip such a
+     file, we get confused.  Check for this case, and if we find it
+     don't set the p_paddr_valid fields.  */
+  p_paddr_valid = FALSE;
+  for (i = 0, segment = elf_tdata (ibfd)->phdr;
+       i < num_segments;
+       i++, segment++)
+    if (segment->p_paddr != 0)
+      {
+	p_paddr_valid = TRUE;
+	break;
+      }
+
+  /* Scan through the segments specified in the program header
+     of the input BFD.  For this first scan we look for overlaps
+     in the loadable segments.  These can be created by weird
+     parameters to objcopy.  Also, fix some solaris weirdness.  */
+  for (i = 0, segment = elf_tdata (ibfd)->phdr;
+       i < num_segments;
+       i++, segment++)
+    {
+      unsigned int j;
+      Elf_Internal_Phdr *segment2;
+
+      if (segment->p_type == PT_INTERP)
+	for (section = ibfd->sections; section; section = section->next)
+	  if (IS_SOLARIS_PT_INTERP (segment, section))
+	    {
+	      /* Mininal change so that the normal section to segment
+		 assignment code will work.  */
+	      segment->p_vaddr = section->vma;
+	      break;
+	    }
+
+      if (segment->p_type != PT_LOAD)
+	{
+	  /* Remove PT_GNU_RELRO segment.  */
+	  if (segment->p_type == PT_GNU_RELRO)
+	    segment->p_type = PT_NULL;
+	  continue;
+	}
+
+      /* Determine if this segment overlaps any previous segments.  */
+      for (j = 0, segment2 = elf_tdata (ibfd)->phdr; j < i; j++, segment2++)
+	{
+	  bfd_signed_vma extra_length;
+
+	  if (segment2->p_type != PT_LOAD
+	      || !SEGMENT_OVERLAPS (segment, segment2))
+	    continue;
+
+	  /* Merge the two segments together.  */
+	  if (segment2->p_vaddr < segment->p_vaddr)
+	    {
+	      /* Extend SEGMENT2 to include SEGMENT and then delete
+		 SEGMENT.  */
+	      extra_length = (SEGMENT_END (segment, segment->p_vaddr)
+			      - SEGMENT_END (segment2, segment2->p_vaddr));
+
+	      if (extra_length > 0)
+		{
+		  segment2->p_memsz += extra_length;
+		  segment2->p_filesz += extra_length;
+		}
+
+	      segment->p_type = PT_NULL;
+
+	      /* Since we have deleted P we must restart the outer loop.  */
+	      i = 0;
+	      segment = elf_tdata (ibfd)->phdr;
+	      break;
+	    }
+	  else
+	    {
+	      /* Extend SEGMENT to include SEGMENT2 and then delete
+		 SEGMENT2.  */
+	      extra_length = (SEGMENT_END (segment2, segment2->p_vaddr)
+			      - SEGMENT_END (segment, segment->p_vaddr));
+
+	      if (extra_length > 0)
+		{
+		  segment->p_memsz += extra_length;
+		  segment->p_filesz += extra_length;
+		}
+
+	      segment2->p_type = PT_NULL;
+	    }
+	}
+    }
+
+  /* The second scan attempts to assign sections to segments.  */
+  for (i = 0, segment = elf_tdata (ibfd)->phdr;
+       i < num_segments;
+       i++, segment++)
+    {
+      unsigned int section_count;
+      asection **sections;
+      asection *output_section;
+      unsigned int isec;
+      bfd_vma matching_lma;
+      bfd_vma suggested_lma;
+      unsigned int j;
+      bfd_size_type amt;
+      asection *first_section;
+      bfd_boolean first_matching_lma;
+      bfd_boolean first_suggested_lma;
+
+      if (segment->p_type == PT_NULL)
+	continue;
+
+      first_section = NULL;
+      /* Compute how many sections might be placed into this segment.  */
+      for (section = ibfd->sections, section_count = 0;
+	   section != NULL;
+	   section = section->next)
+	{
+	  /* Find the first section in the input segment, which may be
+	     removed from the corresponding output segment.   */
+	  if (IS_SECTION_IN_INPUT_SEGMENT (section, segment, bed))
+	    {
+	      if (first_section == NULL)
+		first_section = section;
+	      if (section->output_section != NULL)
+		++section_count;
+	    }
+	}
+
+      /* Allocate a segment map big enough to contain
+	 all of the sections we have selected.  */
+      amt = sizeof (struct elf_segment_map);
+      amt += ((bfd_size_type) section_count - 1) * sizeof (asection *);
+      map = (struct elf_segment_map *) bfd_zalloc (obfd, amt);
+      if (map == NULL)
+	return FALSE;
+
+      /* Initialise the fields of the segment map.  Default to
+	 using the physical address of the segment in the input BFD.  */
+      map->next = NULL;
+      map->p_type = segment->p_type;
+      map->p_flags = segment->p_flags;
+      map->p_flags_valid = 1;
+
+      /* If the first section in the input segment is removed, there is
+	 no need to preserve segment physical address in the corresponding
+	 output segment.  */
+      if (!first_section || first_section->output_section != NULL)
+	{
+	  map->p_paddr = segment->p_paddr;
+	  map->p_paddr_valid = p_paddr_valid;
+	}
+
+      /* Determine if this segment contains the ELF file header
+	 and if it contains the program headers themselves.  */
+      map->includes_filehdr = (segment->p_offset == 0
+			       && segment->p_filesz >= iehdr->e_ehsize);
+      map->includes_phdrs = 0;
+
+      if (!phdr_included || segment->p_type != PT_LOAD)
+	{
+	  map->includes_phdrs =
+	    (segment->p_offset <= (bfd_vma) iehdr->e_phoff
+	     && (segment->p_offset + segment->p_filesz
+		 >= ((bfd_vma) iehdr->e_phoff
+		     + iehdr->e_phnum * iehdr->e_phentsize)));
+
+	  if (segment->p_type == PT_LOAD && map->includes_phdrs)
+	    phdr_included = TRUE;
+	}
+
+      if (section_count == 0)
+	{
+	  /* Special segments, such as the PT_PHDR segment, may contain
+	     no sections, but ordinary, loadable segments should contain
+	     something.  They are allowed by the ELF spec however, so only
+	     a warning is produced.  */
+	  if (segment->p_type == PT_LOAD)
+	    (*_bfd_error_handler) (_("%B: warning: Empty loadable segment"
+				     " detected, is this intentional ?\n"),
+				   ibfd);
+
+	  map->count = 0;
+	  *pointer_to_map = map;
+	  pointer_to_map = &map->next;
+
+	  continue;
+	}
+
+      /* Now scan the sections in the input BFD again and attempt
+	 to add their corresponding output sections to the segment map.
+	 The problem here is how to handle an output section which has
+	 been moved (ie had its LMA changed).  There are four possibilities:
+
+	 1. None of the sections have been moved.
+	    In this case we can continue to use the segment LMA from the
+	    input BFD.
+
+	 2. All of the sections have been moved by the same amount.
+	    In this case we can change the segment's LMA to match the LMA
+	    of the first section.
+
+	 3. Some of the sections have been moved, others have not.
+	    In this case those sections which have not been moved can be
+	    placed in the current segment which will have to have its size,
+	    and possibly its LMA changed, and a new segment or segments will
+	    have to be created to contain the other sections.
+
+	 4. The sections have been moved, but not by the same amount.
+	    In this case we can change the segment's LMA to match the LMA
+	    of the first section and we will have to create a new segment
+	    or segments to contain the other sections.
+
+	 In order to save time, we allocate an array to hold the section
+	 pointers that we are interested in.  As these sections get assigned
+	 to a segment, they are removed from this array.  */
+
+      sections = (asection **) bfd_malloc2 (section_count, sizeof (asection *));
+      if (sections == NULL)
+	return FALSE;
+
+      /* Step One: Scan for segment vs section LMA conflicts.
+	 Also add the sections to the section array allocated above.
+	 Also add the sections to the current segment.  In the common
+	 case, where the sections have not been moved, this means that
+	 we have completely filled the segment, and there is nothing
+	 more to do.  */
+      isec = 0;
+      matching_lma = 0;
+      suggested_lma = 0;
+      first_matching_lma = TRUE;
+      first_suggested_lma = TRUE;
+
+      for (section = ibfd->sections;
+	   section != NULL;
+	   section = section->next)
+	if (section == first_section)
+	  break;
+
+      for (j = 0; section != NULL; section = section->next)
+	{
+	  if (INCLUDE_SECTION_IN_SEGMENT (section, segment, bed))
+	    {
+	      output_section = section->output_section;
+
+	      sections[j++] = section;
+
+	      /* The Solaris native linker always sets p_paddr to 0.
+		 We try to catch that case here, and set it to the
+		 correct value.  Note - some backends require that
+		 p_paddr be left as zero.  */
+	      if (!p_paddr_valid
+		  && segment->p_vaddr != 0
+		  && !bed->want_p_paddr_set_to_zero
+		  && isec == 0
+		  && output_section->lma != 0
+		  && output_section->vma == (segment->p_vaddr
+					     + (map->includes_filehdr
+						? iehdr->e_ehsize
+						: 0)
+					     + (map->includes_phdrs
+						? (iehdr->e_phnum
+						   * iehdr->e_phentsize)
+						: 0)))
+		map->p_paddr = segment->p_vaddr;
+
+	      /* Match up the physical address of the segment with the
+		 LMA address of the output section.  */
+	      if (IS_CONTAINED_BY_LMA (output_section, segment, map->p_paddr)
+		  || IS_COREFILE_NOTE (segment, section)
+		  || (bed->want_p_paddr_set_to_zero
+		      && IS_CONTAINED_BY_VMA (output_section, segment)))
+		{
+		  if (first_matching_lma || output_section->lma < matching_lma)
+		    {
+		      matching_lma = output_section->lma;
+		      first_matching_lma = FALSE;
+		    }
+
+		  /* We assume that if the section fits within the segment
+		     then it does not overlap any other section within that
+		     segment.  */
+		  map->sections[isec++] = output_section;
+		}
+	      else if (first_suggested_lma)
+		{
+		  suggested_lma = output_section->lma;
+		  first_suggested_lma = FALSE;
+		}
+
+	      if (j == section_count)
+		break;
+	    }
+	}
+
+      BFD_ASSERT (j == section_count);
+
+      /* Step Two: Adjust the physical address of the current segment,
+	 if necessary.  */
+      if (isec == section_count)
+	{
+	  /* All of the sections fitted within the segment as currently
+	     specified.  This is the default case.  Add the segment to
+	     the list of built segments and carry on to process the next
+	     program header in the input BFD.  */
+	  map->count = section_count;
+	  *pointer_to_map = map;
+	  pointer_to_map = &map->next;
+
+	  if (p_paddr_valid
+	      && !bed->want_p_paddr_set_to_zero
+	      && matching_lma != map->p_paddr
+	      && !map->includes_filehdr
+	      && !map->includes_phdrs)
+	    /* There is some padding before the first section in the
+	       segment.  So, we must account for that in the output
+	       segment's vma.  */
+	    map->p_vaddr_offset = matching_lma - map->p_paddr;
+
+	  free (sections);
+	  continue;
+	}
+      else
+	{
+	  if (!first_matching_lma)
+	    {
+	      /* At least one section fits inside the current segment.
+		 Keep it, but modify its physical address to match the
+		 LMA of the first section that fitted.  */
+	      map->p_paddr = matching_lma;
+	    }
+	  else
+	    {
+	      /* None of the sections fitted inside the current segment.
+		 Change the current segment's physical address to match
+		 the LMA of the first section.  */
+	      map->p_paddr = suggested_lma;
+	    }
+
+	  /* Offset the segment physical address from the lma
+	     to allow for space taken up by elf headers.  */
+	  if (map->includes_filehdr)
+	    {
+	      if (map->p_paddr >= iehdr->e_ehsize)
+		map->p_paddr -= iehdr->e_ehsize;
+	      else
+		{
+		  map->includes_filehdr = FALSE;
+		  map->includes_phdrs = FALSE;
+		}
+	    }
+
+	  if (map->includes_phdrs)
+	    {
+	      if (map->p_paddr >= iehdr->e_phnum * iehdr->e_phentsize)
+		{
+		  map->p_paddr -= iehdr->e_phnum * iehdr->e_phentsize;
+
+		  /* iehdr->e_phnum is just an estimate of the number
+		     of program headers that we will need.  Make a note
+		     here of the number we used and the segment we chose
+		     to hold these headers, so that we can adjust the
+		     offset when we know the correct value.  */
+		  phdr_adjust_num = iehdr->e_phnum;
+		  phdr_adjust_seg = map;
+		}
+	      else
+		map->includes_phdrs = FALSE;
+	    }
+	}
+
+      /* Step Three: Loop over the sections again, this time assigning
+	 those that fit to the current segment and removing them from the
+	 sections array; but making sure not to leave large gaps.  Once all
+	 possible sections have been assigned to the current segment it is
+	 added to the list of built segments and if sections still remain
+	 to be assigned, a new segment is constructed before repeating
+	 the loop.  */
+      isec = 0;
+      do
+	{
+	  map->count = 0;
+	  suggested_lma = 0;
+	  first_suggested_lma = TRUE;
+
+	  /* Fill the current segment with sections that fit.  */
+	  for (j = 0; j < section_count; j++)
+	    {
+	      section = sections[j];
+
+	      if (section == NULL)
+		continue;
+
+	      output_section = section->output_section;
+
+	      BFD_ASSERT (output_section != NULL);
+
+	      if (IS_CONTAINED_BY_LMA (output_section, segment, map->p_paddr)
+		  || IS_COREFILE_NOTE (segment, section))
+		{
+		  if (map->count == 0)
+		    {
+		      /* If the first section in a segment does not start at
+			 the beginning of the segment, then something is
+			 wrong.  */
+		      if (output_section->lma
+			  != (map->p_paddr
+			      + (map->includes_filehdr ? iehdr->e_ehsize : 0)
+			      + (map->includes_phdrs
+				 ? iehdr->e_phnum * iehdr->e_phentsize
+				 : 0)))
+			abort ();
+		    }
+		  else
+		    {
+		      asection *prev_sec;
+
+		      prev_sec = map->sections[map->count - 1];
+
+		      /* If the gap between the end of the previous section
+			 and the start of this section is more than
+			 maxpagesize then we need to start a new segment.  */
+		      if ((BFD_ALIGN (prev_sec->lma + prev_sec->size,
+				      maxpagesize)
+			   < BFD_ALIGN (output_section->lma, maxpagesize))
+			  || (prev_sec->lma + prev_sec->size
+			      > output_section->lma))
+			{
+			  if (first_suggested_lma)
+			    {
+			      suggested_lma = output_section->lma;
+			      first_suggested_lma = FALSE;
+			    }
+
+			  continue;
+			}
+		    }
+
+		  map->sections[map->count++] = output_section;
+		  ++isec;
+		  sections[j] = NULL;
+		  section->segment_mark = TRUE;
+		}
+	      else if (first_suggested_lma)
+		{
+		  suggested_lma = output_section->lma;
+		  first_suggested_lma = FALSE;
+		}
+	    }
+
+	  BFD_ASSERT (map->count > 0);
+
+	  /* Add the current segment to the list of built segments.  */
+	  *pointer_to_map = map;
+	  pointer_to_map = &map->next;
+
+	  if (isec < section_count)
+	    {
+	      /* We still have not allocated all of the sections to
+		 segments.  Create a new segment here, initialise it
+		 and carry on looping.  */
+	      amt = sizeof (struct elf_segment_map);
+	      amt += ((bfd_size_type) section_count - 1) * sizeof (asection *);
+	      map = (struct elf_segment_map *) bfd_alloc (obfd, amt);
+	      if (map == NULL)
+		{
+		  free (sections);
+		  return FALSE;
+		}
+
+	      /* Initialise the fields of the segment map.  Set the physical
+		 physical address to the LMA of the first section that has
+		 not yet been assigned.  */
+	      map->next = NULL;
+	      map->p_type = segment->p_type;
+	      map->p_flags = segment->p_flags;
+	      map->p_flags_valid = 1;
+	      map->p_paddr = suggested_lma;
+	      map->p_paddr_valid = p_paddr_valid;
+	      map->includes_filehdr = 0;
+	      map->includes_phdrs = 0;
+	    }
+	}
+      while (isec < section_count);
+
+      free (sections);
+    }
+
+  elf_tdata (obfd)->segment_map = map_first;
+
+  /* If we had to estimate the number of program headers that were
+     going to be needed, then check our estimate now and adjust
+     the offset if necessary.  */
+  if (phdr_adjust_seg != NULL)
+    {
+      unsigned int count;
+
+      for (count = 0, map = map_first; map != NULL; map = map->next)
+	count++;
+
+      if (count > phdr_adjust_num)
+	phdr_adjust_seg->p_paddr
+	  -= (count - phdr_adjust_num) * iehdr->e_phentsize;
+    }
+
+#undef SEGMENT_END
+#undef SECTION_SIZE
+#undef IS_CONTAINED_BY_VMA
+#undef IS_CONTAINED_BY_LMA
+#undef IS_NOTE
+#undef IS_COREFILE_NOTE
+#undef IS_SOLARIS_PT_INTERP
+#undef IS_SECTION_IN_INPUT_SEGMENT
+#undef INCLUDE_SECTION_IN_SEGMENT
+#undef SEGMENT_AFTER_SEGMENT
+#undef SEGMENT_OVERLAPS
+  return TRUE;
+}
+
+/* Copy ELF program header information.  */
+
+static bfd_boolean
+copy_elf_program_header (bfd *ibfd, bfd *obfd)
+{
+  Elf_Internal_Ehdr *iehdr;
+  struct elf_segment_map *map;
+  struct elf_segment_map *map_first;
+  struct elf_segment_map **pointer_to_map;
+  Elf_Internal_Phdr *segment;
+  unsigned int i;
+  unsigned int num_segments;
+  bfd_boolean phdr_included = FALSE;
+  bfd_boolean p_paddr_valid;
+
+  iehdr = elf_elfheader (ibfd);
+
+  map_first = NULL;
+  pointer_to_map = &map_first;
+
+  /* If all the segment p_paddr fields are zero, don't set
+     map->p_paddr_valid.  */
+  p_paddr_valid = FALSE;
+  num_segments = elf_elfheader (ibfd)->e_phnum;
+  for (i = 0, segment = elf_tdata (ibfd)->phdr;
+       i < num_segments;
+       i++, segment++)
+    if (segment->p_paddr != 0)
+      {
+	p_paddr_valid = TRUE;
+	break;
+      }
+
+  for (i = 0, segment = elf_tdata (ibfd)->phdr;
+       i < num_segments;
+       i++, segment++)
+    {
+      asection *section;
+      unsigned int section_count;
+      bfd_size_type amt;
+      Elf_Internal_Shdr *this_hdr;
+      asection *first_section = NULL;
+      asection *lowest_section;
+
+      /* Compute how many sections are in this segment.  */
+      for (section = ibfd->sections, section_count = 0;
+	   section != NULL;
+	   section = section->next)
+	{
+	  this_hdr = &(elf_section_data(section)->this_hdr);
+	  if (ELF_SECTION_IN_SEGMENT (this_hdr, segment))
+	    {
+	      if (first_section == NULL)
+		first_section = section;
+	      section_count++;
+	    }
+	}
+
+      /* Allocate a segment map big enough to contain
+	 all of the sections we have selected.  */
+      amt = sizeof (struct elf_segment_map);
+      if (section_count != 0)
+	amt += ((bfd_size_type) section_count - 1) * sizeof (asection *);
+      map = (struct elf_segment_map *) bfd_zalloc (obfd, amt);
+      if (map == NULL)
+	return FALSE;
+
+      /* Initialize the fields of the output segment map with the
+	 input segment.  */
+      map->next = NULL;
+      map->p_type = segment->p_type;
+      map->p_flags = segment->p_flags;
+      map->p_flags_valid = 1;
+      map->p_paddr = segment->p_paddr;
+      map->p_paddr_valid = p_paddr_valid;
+      map->p_align = segment->p_align;
+      map->p_align_valid = 1;
+      map->p_vaddr_offset = 0;
+
+      if (map->p_type == PT_GNU_RELRO)
+	{
+	  /* The PT_GNU_RELRO segment may contain the first a few
+	     bytes in the .got.plt section even if the whole .got.plt
+	     section isn't in the PT_GNU_RELRO segment.  We won't
+	     change the size of the PT_GNU_RELRO segment.  */
+	  map->p_size = segment->p_memsz;
+	  map->p_size_valid = 1;
+	}
+
+      /* Determine if this segment contains the ELF file header
+	 and if it contains the program headers themselves.  */
+      map->includes_filehdr = (segment->p_offset == 0
+			       && segment->p_filesz >= iehdr->e_ehsize);
+
+      map->includes_phdrs = 0;
+      if (! phdr_included || segment->p_type != PT_LOAD)
+	{
+	  map->includes_phdrs =
+	    (segment->p_offset <= (bfd_vma) iehdr->e_phoff
+	     && (segment->p_offset + segment->p_filesz
+		 >= ((bfd_vma) iehdr->e_phoff
+		     + iehdr->e_phnum * iehdr->e_phentsize)));
+
+	  if (segment->p_type == PT_LOAD && map->includes_phdrs)
+	    phdr_included = TRUE;
+	}
+
+      lowest_section = first_section;
+      if (section_count != 0)
+	{
+	  unsigned int isec = 0;
+
+	  for (section = first_section;
+	       section != NULL;
+	       section = section->next)
+	    {
+	      this_hdr = &(elf_section_data(section)->this_hdr);
+	      if (ELF_SECTION_IN_SEGMENT (this_hdr, segment))
+		{
+		  map->sections[isec++] = section->output_section;
+		  if (section->lma < lowest_section->lma)
+		    lowest_section = section;
+		  if ((section->flags & SEC_ALLOC) != 0)
+		    {
+		      bfd_vma seg_off;
+
+		      /* Section lmas are set up from PT_LOAD header
+			 p_paddr in _bfd_elf_make_section_from_shdr.
+			 If this header has a p_paddr that disagrees
+			 with the section lma, flag the p_paddr as
+			 invalid.  */
+		      if ((section->flags & SEC_LOAD) != 0)
+			seg_off = this_hdr->sh_offset - segment->p_offset;
+		      else
+			seg_off = this_hdr->sh_addr - segment->p_vaddr;
+		      if (section->lma - segment->p_paddr != seg_off)
+			map->p_paddr_valid = FALSE;
+		    }
+		  if (isec == section_count)
+		    break;
+		}
+	    }
+	}
+
+      if (map->includes_filehdr && lowest_section != NULL)
+	/* We need to keep the space used by the headers fixed.  */
+	map->header_size = lowest_section->vma - segment->p_vaddr;
+      
+      if (!map->includes_phdrs
+	  && !map->includes_filehdr
+	  && map->p_paddr_valid)
+	/* There is some other padding before the first section.  */
+	map->p_vaddr_offset = ((lowest_section ? lowest_section->lma : 0)
+			       - segment->p_paddr);
+
+      map->count = section_count;
+      *pointer_to_map = map;
+      pointer_to_map = &map->next;
+    }
+
+  elf_tdata (obfd)->segment_map = map_first;
+  return TRUE;
+}
+
+/* Copy private BFD data.  This copies or rewrites ELF program header
+   information.  */
+
+static bfd_boolean
+copy_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  if (elf_tdata (ibfd)->phdr == NULL)
+    return TRUE;
+
+  if (ibfd->xvec == obfd->xvec)
+    {
+      /* Check to see if any sections in the input BFD
+	 covered by ELF program header have changed.  */
+      Elf_Internal_Phdr *segment;
+      asection *section, *osec;
+      unsigned int i, num_segments;
+      Elf_Internal_Shdr *this_hdr;
+      const struct elf_backend_data *bed;
+
+      bed = get_elf_backend_data (ibfd);
+
+      /* Regenerate the segment map if p_paddr is set to 0.  */
+      if (bed->want_p_paddr_set_to_zero)
+	goto rewrite;
+
+      /* Initialize the segment mark field.  */
+      for (section = obfd->sections; section != NULL;
+	   section = section->next)
+	section->segment_mark = FALSE;
+
+      num_segments = elf_elfheader (ibfd)->e_phnum;
+      for (i = 0, segment = elf_tdata (ibfd)->phdr;
+	   i < num_segments;
+	   i++, segment++)
+	{
+	  /* PR binutils/3535.  The Solaris linker always sets the p_paddr
+	     and p_memsz fields of special segments (DYNAMIC, INTERP) to 0
+	     which severly confuses things, so always regenerate the segment
+	     map in this case.  */
+	  if (segment->p_paddr == 0
+	      && segment->p_memsz == 0
+	      && (segment->p_type == PT_INTERP || segment->p_type == PT_DYNAMIC))
+	    goto rewrite;
+
+	  for (section = ibfd->sections;
+	       section != NULL; section = section->next)
+	    {
+	      /* We mark the output section so that we know it comes
+		 from the input BFD.  */
+	      osec = section->output_section;
+	      if (osec)
+		osec->segment_mark = TRUE;
+
+	      /* Check if this section is covered by the segment.  */
+	      this_hdr = &(elf_section_data(section)->this_hdr);
+	      if (ELF_SECTION_IN_SEGMENT (this_hdr, segment))
+		{
+		  /* FIXME: Check if its output section is changed or
+		     removed.  What else do we need to check?  */
+		  if (osec == NULL
+		      || section->flags != osec->flags
+		      || section->lma != osec->lma
+		      || section->vma != osec->vma
+		      || section->size != osec->size
+		      || section->rawsize != osec->rawsize
+		      || section->alignment_power != osec->alignment_power)
+		    goto rewrite;
+		}
+	    }
+	}
+
+      /* Check to see if any output section do not come from the
+	 input BFD.  */
+      for (section = obfd->sections; section != NULL;
+	   section = section->next)
+	{
+	  if (section->segment_mark == FALSE)
+	    goto rewrite;
+	  else
+	    section->segment_mark = FALSE;
+	}
+
+      return copy_elf_program_header (ibfd, obfd);
+    }
+
+rewrite:
+  return rewrite_elf_program_header (ibfd, obfd);
+}
+
+/* Initialize private output section information from input section.  */
+
+bfd_boolean
+_bfd_elf_init_private_section_data (bfd *ibfd,
+				    asection *isec,
+				    bfd *obfd,
+				    asection *osec,
+				    struct bfd_link_info *link_info)
+
+{
+  Elf_Internal_Shdr *ihdr, *ohdr;
+  bfd_boolean final_link = link_info != NULL && !link_info->relocatable;
+
+  if (ibfd->xvec->flavour != bfd_target_elf_flavour
+      || obfd->xvec->flavour != bfd_target_elf_flavour)
+    return TRUE;
+
+  BFD_ASSERT (elf_section_data (osec) != NULL);
+
+  /* For objcopy and relocatable link, don't copy the output ELF
+     section type from input if the output BFD section flags have been
+     set to something different.  For a final link allow some flags
+     that the linker clears to differ.  */
+  if (elf_section_type (osec) == SHT_NULL
+      && (osec->flags == isec->flags
+	  || (final_link
+	      && ((osec->flags ^ isec->flags)
+		  & ~(SEC_LINK_ONCE | SEC_LINK_DUPLICATES | SEC_RELOC)) == 0)))
+    elf_section_type (osec) = elf_section_type (isec);
+
+  /* FIXME: Is this correct for all OS/PROC specific flags?  */
+  elf_section_flags (osec) |= (elf_section_flags (isec)
+			       & (SHF_MASKOS | SHF_MASKPROC));
+
+  /* Set things up for objcopy and relocatable link.  The output
+     SHT_GROUP section will have its elf_next_in_group pointing back
+     to the input group members.  Ignore linker created group section.
+     See elfNN_ia64_object_p in elfxx-ia64.c.  */
+  if (!final_link)
+    {
+      if (elf_sec_group (isec) == NULL
+	  || (elf_sec_group (isec)->flags & SEC_LINKER_CREATED) == 0)
+	{
+	  if (elf_section_flags (isec) & SHF_GROUP)
+	    elf_section_flags (osec) |= SHF_GROUP;
+	  elf_next_in_group (osec) = elf_next_in_group (isec);
+	  elf_section_data (osec)->group = elf_section_data (isec)->group;
+	}
+    }
+
+  ihdr = &elf_section_data (isec)->this_hdr;
+
+  /* We need to handle elf_linked_to_section for SHF_LINK_ORDER. We
+     don't use the output section of the linked-to section since it
+     may be NULL at this point.  */
+  if ((ihdr->sh_flags & SHF_LINK_ORDER) != 0)
+    {
+      ohdr = &elf_section_data (osec)->this_hdr;
+      ohdr->sh_flags |= SHF_LINK_ORDER;
+      elf_linked_to_section (osec) = elf_linked_to_section (isec);
+    }
+
+  osec->use_rela_p = isec->use_rela_p;
+
+  return TRUE;
+}
+
+/* Copy private section information.  This copies over the entsize
+   field, and sometimes the info field.  */
+
+bfd_boolean
+_bfd_elf_copy_private_section_data (bfd *ibfd,
+				    asection *isec,
+				    bfd *obfd,
+				    asection *osec)
+{
+  Elf_Internal_Shdr *ihdr, *ohdr;
+
+  if (ibfd->xvec->flavour != bfd_target_elf_flavour
+      || obfd->xvec->flavour != bfd_target_elf_flavour)
+    return TRUE;
+
+  ihdr = &elf_section_data (isec)->this_hdr;
+  ohdr = &elf_section_data (osec)->this_hdr;
+
+  ohdr->sh_entsize = ihdr->sh_entsize;
+
+  if (ihdr->sh_type == SHT_SYMTAB
+      || ihdr->sh_type == SHT_DYNSYM
+      || ihdr->sh_type == SHT_GNU_verneed
+      || ihdr->sh_type == SHT_GNU_verdef)
+    ohdr->sh_info = ihdr->sh_info;
+
+  return _bfd_elf_init_private_section_data (ibfd, isec, obfd, osec,
+					     NULL);
+}
+
+/* Look at all the SHT_GROUP sections in IBFD, making any adjustments
+   necessary if we are removing either the SHT_GROUP section or any of
+   the group member sections.  DISCARDED is the value that a section's
+   output_section has if the section will be discarded, NULL when this
+   function is called from objcopy, bfd_abs_section_ptr when called
+   from the linker.  */
+
+bfd_boolean
+_bfd_elf_fixup_group_sections (bfd *ibfd, asection *discarded)
+{
+  asection *isec;
+
+  for (isec = ibfd->sections; isec != NULL; isec = isec->next)
+    if (elf_section_type (isec) == SHT_GROUP)
+      {
+	asection *first = elf_next_in_group (isec);
+	asection *s = first;
+	bfd_size_type removed = 0;
+
+	while (s != NULL)
+	  {
+	    /* If this member section is being output but the
+	       SHT_GROUP section is not, then clear the group info
+	       set up by _bfd_elf_copy_private_section_data.  */
+	    if (s->output_section != discarded
+		&& isec->output_section == discarded)
+	      {
+		elf_section_flags (s->output_section) &= ~SHF_GROUP;
+		elf_group_name (s->output_section) = NULL;
+	      }
+	    /* Conversely, if the member section is not being output
+	       but the SHT_GROUP section is, then adjust its size.  */
+	    else if (s->output_section == discarded
+		     && isec->output_section != discarded)
+	      removed += 4;
+	    s = elf_next_in_group (s);
+	    if (s == first)
+	      break;
+	  }
+	if (removed != 0)
+	  {
+	    if (discarded != NULL)
+	      {
+		/* If we've been called for ld -r, then we need to
+		   adjust the input section size.  This function may
+		   be called multiple times, so save the original
+		   size.  */
+		if (isec->rawsize == 0)
+		  isec->rawsize = isec->size;
+		isec->size = isec->rawsize - removed;
+	      }
+	    else
+	      {
+		/* Adjust the output section size when called from
+		   objcopy. */
+		isec->output_section->size -= removed;
+	      }
+	  }
+      }
+
+  return TRUE;
+}
+
+/* Copy private header information.  */
+
+bfd_boolean
+_bfd_elf_copy_private_header_data (bfd *ibfd, bfd *obfd)
+{
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  /* Copy over private BFD data if it has not already been copied.
+     This must be done here, rather than in the copy_private_bfd_data
+     entry point, because the latter is called after the section
+     contents have been set, which means that the program headers have
+     already been worked out.  */
+  if (elf_tdata (obfd)->segment_map == NULL && elf_tdata (ibfd)->phdr != NULL)
+    {
+      if (! copy_private_bfd_data (ibfd, obfd))
+	return FALSE;
+    }
+
+  return _bfd_elf_fixup_group_sections (ibfd, NULL);
+}
+
+/* Copy private symbol information.  If this symbol is in a section
+   which we did not map into a BFD section, try to map the section
+   index correctly.  We use special macro definitions for the mapped
+   section indices; these definitions are interpreted by the
+   swap_out_syms function.  */
+
+#define MAP_ONESYMTAB (SHN_HIOS + 1)
+#define MAP_DYNSYMTAB (SHN_HIOS + 2)
+#define MAP_STRTAB    (SHN_HIOS + 3)
+#define MAP_SHSTRTAB  (SHN_HIOS + 4)
+#define MAP_SYM_SHNDX (SHN_HIOS + 5)
+
+bfd_boolean
+_bfd_elf_copy_private_symbol_data (bfd *ibfd,
+				   asymbol *isymarg,
+				   bfd *obfd,
+				   asymbol *osymarg)
+{
+  elf_symbol_type *isym, *osym;
+
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  isym = elf_symbol_from (ibfd, isymarg);
+  osym = elf_symbol_from (obfd, osymarg);
+
+  if (isym != NULL
+      && isym->internal_elf_sym.st_shndx != 0
+      && osym != NULL
+      && bfd_is_abs_section (isym->symbol.section))
+    {
+      unsigned int shndx;
+
+      shndx = isym->internal_elf_sym.st_shndx;
+      if (shndx == elf_onesymtab (ibfd))
+	shndx = MAP_ONESYMTAB;
+      else if (shndx == elf_dynsymtab (ibfd))
+	shndx = MAP_DYNSYMTAB;
+      else if (shndx == elf_tdata (ibfd)->strtab_section)
+	shndx = MAP_STRTAB;
+      else if (shndx == elf_tdata (ibfd)->shstrtab_section)
+	shndx = MAP_SHSTRTAB;
+      else if (shndx == elf_tdata (ibfd)->symtab_shndx_section)
+	shndx = MAP_SYM_SHNDX;
+      osym->internal_elf_sym.st_shndx = shndx;
+    }
+
+  return TRUE;
+}
+
+/* Swap out the symbols.  */
+
+static bfd_boolean
+swap_out_syms (bfd *abfd,
+	       struct bfd_strtab_hash **sttp,
+	       int relocatable_p)
+{
+  const struct elf_backend_data *bed;
+  int symcount;
+  asymbol **syms;
+  struct bfd_strtab_hash *stt;
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Shdr *symtab_shndx_hdr;
+  Elf_Internal_Shdr *symstrtab_hdr;
+  bfd_byte *outbound_syms;
+  bfd_byte *outbound_shndx;
+  int idx;
+  bfd_size_type amt;
+  bfd_boolean name_local_sections;
+
+  if (!elf_map_symbols (abfd))
+    return FALSE;
+
+  /* Dump out the symtabs.  */
+  stt = _bfd_elf_stringtab_init ();
+  if (stt == NULL)
+    return FALSE;
+
+  bed = get_elf_backend_data (abfd);
+  symcount = bfd_get_symcount (abfd);
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  symtab_hdr->sh_type = SHT_SYMTAB;
+  symtab_hdr->sh_entsize = bed->s->sizeof_sym;
+  symtab_hdr->sh_size = symtab_hdr->sh_entsize * (symcount + 1);
+  symtab_hdr->sh_info = elf_num_locals (abfd) + 1;
+  symtab_hdr->sh_addralign = (bfd_vma) 1 << bed->s->log_file_align;
+
+  symstrtab_hdr = &elf_tdata (abfd)->strtab_hdr;
+  symstrtab_hdr->sh_type = SHT_STRTAB;
+
+  outbound_syms = (bfd_byte *) bfd_alloc2 (abfd, 1 + symcount,
+                                           bed->s->sizeof_sym);
+  if (outbound_syms == NULL)
+    {
+      _bfd_stringtab_free (stt);
+      return FALSE;
+    }
+  symtab_hdr->contents = outbound_syms;
+
+  outbound_shndx = NULL;
+  symtab_shndx_hdr = &elf_tdata (abfd)->symtab_shndx_hdr;
+  if (symtab_shndx_hdr->sh_name != 0)
+    {
+      amt = (bfd_size_type) (1 + symcount) * sizeof (Elf_External_Sym_Shndx);
+      outbound_shndx =  (bfd_byte *)
+          bfd_zalloc2 (abfd, 1 + symcount, sizeof (Elf_External_Sym_Shndx));
+      if (outbound_shndx == NULL)
+	{
+	  _bfd_stringtab_free (stt);
+	  return FALSE;
+	}
+
+      symtab_shndx_hdr->contents = outbound_shndx;
+      symtab_shndx_hdr->sh_type = SHT_SYMTAB_SHNDX;
+      symtab_shndx_hdr->sh_size = amt;
+      symtab_shndx_hdr->sh_addralign = sizeof (Elf_External_Sym_Shndx);
+      symtab_shndx_hdr->sh_entsize = sizeof (Elf_External_Sym_Shndx);
+    }
+
+  /* Now generate the data (for "contents").  */
+  {
+    /* Fill in zeroth symbol and swap it out.  */
+    Elf_Internal_Sym sym;
+    sym.st_name = 0;
+    sym.st_value = 0;
+    sym.st_size = 0;
+    sym.st_info = 0;
+    sym.st_other = 0;
+    sym.st_shndx = SHN_UNDEF;
+    sym.st_target_internal = 0;
+    bed->s->swap_symbol_out (abfd, &sym, outbound_syms, outbound_shndx);
+    outbound_syms += bed->s->sizeof_sym;
+    if (outbound_shndx != NULL)
+      outbound_shndx += sizeof (Elf_External_Sym_Shndx);
+  }
+
+  name_local_sections
+    = (bed->elf_backend_name_local_section_symbols
+       && bed->elf_backend_name_local_section_symbols (abfd));
+
+  syms = bfd_get_outsymbols (abfd);
+  for (idx = 0; idx < symcount; idx++)
+    {
+      Elf_Internal_Sym sym;
+      bfd_vma value = syms[idx]->value;
+      elf_symbol_type *type_ptr;
+      flagword flags = syms[idx]->flags;
+      int type;
+
+      if (!name_local_sections
+	  && (flags & (BSF_SECTION_SYM | BSF_GLOBAL)) == BSF_SECTION_SYM)
+	{
+	  /* Local section symbols have no name.  */
+	  sym.st_name = 0;
+	}
+      else
+	{
+	  sym.st_name = (unsigned long) _bfd_stringtab_add (stt,
+							    syms[idx]->name,
+							    TRUE, FALSE);
+	  if (sym.st_name == (unsigned long) -1)
+	    {
+	      _bfd_stringtab_free (stt);
+	      return FALSE;
+	    }
+	}
+
+      type_ptr = elf_symbol_from (abfd, syms[idx]);
+
+      if ((flags & BSF_SECTION_SYM) == 0
+	  && bfd_is_com_section (syms[idx]->section))
+	{
+	  /* ELF common symbols put the alignment into the `value' field,
+	     and the size into the `size' field.  This is backwards from
+	     how BFD handles it, so reverse it here.  */
+	  sym.st_size = value;
+	  if (type_ptr == NULL
+	      || type_ptr->internal_elf_sym.st_value == 0)
+	    sym.st_value = value >= 16 ? 16 : (1 << bfd_log2 (value));
+	  else
+	    sym.st_value = type_ptr->internal_elf_sym.st_value;
+	  sym.st_shndx = _bfd_elf_section_from_bfd_section
+	    (abfd, syms[idx]->section);
+	}
+      else
+	{
+	  asection *sec = syms[idx]->section;
+	  unsigned int shndx;
+
+	  if (sec->output_section)
+	    {
+	      value += sec->output_offset;
+	      sec = sec->output_section;
+	    }
+
+	  /* Don't add in the section vma for relocatable output.  */
+	  if (! relocatable_p)
+	    value += sec->vma;
+	  sym.st_value = value;
+	  sym.st_size = type_ptr ? type_ptr->internal_elf_sym.st_size : 0;
+
+	  if (bfd_is_abs_section (sec)
+	      && type_ptr != NULL
+	      && type_ptr->internal_elf_sym.st_shndx != 0)
+	    {
+	      /* This symbol is in a real ELF section which we did
+		 not create as a BFD section.  Undo the mapping done
+		 by copy_private_symbol_data.  */
+	      shndx = type_ptr->internal_elf_sym.st_shndx;
+	      switch (shndx)
+		{
+		case MAP_ONESYMTAB:
+		  shndx = elf_onesymtab (abfd);
+		  break;
+		case MAP_DYNSYMTAB:
+		  shndx = elf_dynsymtab (abfd);
+		  break;
+		case MAP_STRTAB:
+		  shndx = elf_tdata (abfd)->strtab_section;
+		  break;
+		case MAP_SHSTRTAB:
+		  shndx = elf_tdata (abfd)->shstrtab_section;
+		  break;
+		case MAP_SYM_SHNDX:
+		  shndx = elf_tdata (abfd)->symtab_shndx_section;
+		  break;
+		default:
+		  break;
+		}
+	    }
+	  else
+	    {
+	      shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+	      if (shndx == SHN_BAD)
+		{
+		  asection *sec2;
+
+		  /* Writing this would be a hell of a lot easier if
+		     we had some decent documentation on bfd, and
+		     knew what to expect of the library, and what to
+		     demand of applications.  For example, it
+		     appears that `objcopy' might not set the
+		     section of a symbol to be a section that is
+		     actually in the output file.  */
+		  sec2 = bfd_get_section_by_name (abfd, sec->name);
+		  if (sec2 == NULL)
+		    {
+		      _bfd_error_handler (_("\
+Unable to find equivalent output section for symbol '%s' from section '%s'"),
+					  syms[idx]->name ? syms[idx]->name : "<Local sym>",
+					  sec->name);
+		      bfd_set_error (bfd_error_invalid_operation);
+		      _bfd_stringtab_free (stt);
+		      return FALSE;
+		    }
+
+		  shndx = _bfd_elf_section_from_bfd_section (abfd, sec2);
+		  BFD_ASSERT (shndx != SHN_BAD);
+		}
+	    }
+
+	  sym.st_shndx = shndx;
+	}
+
+      if ((flags & BSF_THREAD_LOCAL) != 0)
+	type = STT_TLS;
+      else if ((flags & BSF_GNU_INDIRECT_FUNCTION) != 0)
+	type = STT_GNU_IFUNC;
+      else if ((flags & BSF_FUNCTION) != 0)
+	type = STT_FUNC;
+      else if ((flags & BSF_OBJECT) != 0)
+	type = STT_OBJECT;
+      else if ((flags & BSF_RELC) != 0)
+	type = STT_RELC;
+      else if ((flags & BSF_SRELC) != 0)
+	type = STT_SRELC;
+      else
+	type = STT_NOTYPE;
+
+      if (syms[idx]->section->flags & SEC_THREAD_LOCAL)
+	type = STT_TLS;
+
+      /* Processor-specific types.  */
+      if (type_ptr != NULL
+	  && bed->elf_backend_get_symbol_type)
+	type = ((*bed->elf_backend_get_symbol_type)
+		(&type_ptr->internal_elf_sym, type));
+
+      if (flags & BSF_SECTION_SYM)
+	{
+	  if (flags & BSF_GLOBAL)
+	    sym.st_info = ELF_ST_INFO (STB_GLOBAL, STT_SECTION);
+	  else
+	    sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_SECTION);
+	}
+      else if (bfd_is_com_section (syms[idx]->section))
+	{
+#ifdef USE_STT_COMMON
+	  if (type == STT_OBJECT)
+	    sym.st_info = ELF_ST_INFO (STB_GLOBAL, STT_COMMON);
+	  else
+#endif
+	    sym.st_info = ELF_ST_INFO (STB_GLOBAL, type);
+	}
+      else if (bfd_is_und_section (syms[idx]->section))
+	sym.st_info = ELF_ST_INFO (((flags & BSF_WEAK)
+				    ? STB_WEAK
+				    : STB_GLOBAL),
+				   type);
+      else if (flags & BSF_FILE)
+	sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_FILE);
+      else
+	{
+	  int bind = STB_LOCAL;
+
+	  if (flags & BSF_LOCAL)
+	    bind = STB_LOCAL;
+	  else if (flags & BSF_GNU_UNIQUE)
+	    bind = STB_GNU_UNIQUE;
+	  else if (flags & BSF_WEAK)
+	    bind = STB_WEAK;
+	  else if (flags & BSF_GLOBAL)
+	    bind = STB_GLOBAL;
+
+	  sym.st_info = ELF_ST_INFO (bind, type);
+	}
+
+      if (type_ptr != NULL)
+	{
+	  sym.st_other = type_ptr->internal_elf_sym.st_other;
+	  sym.st_target_internal
+	    = type_ptr->internal_elf_sym.st_target_internal;
+	}
+      else
+	{
+	  sym.st_other = 0;
+	  sym.st_target_internal = 0;
+	}
+
+      bed->s->swap_symbol_out (abfd, &sym, outbound_syms, outbound_shndx);
+      outbound_syms += bed->s->sizeof_sym;
+      if (outbound_shndx != NULL)
+	outbound_shndx += sizeof (Elf_External_Sym_Shndx);
+    }
+
+  *sttp = stt;
+  symstrtab_hdr->sh_size = _bfd_stringtab_size (stt);
+  symstrtab_hdr->sh_type = SHT_STRTAB;
+
+  symstrtab_hdr->sh_flags = 0;
+  symstrtab_hdr->sh_addr = 0;
+  symstrtab_hdr->sh_entsize = 0;
+  symstrtab_hdr->sh_link = 0;
+  symstrtab_hdr->sh_info = 0;
+  symstrtab_hdr->sh_addralign = 1;
+
+  return TRUE;
+}
+
+/* Return the number of bytes required to hold the symtab vector.
+
+   Note that we base it on the count plus 1, since we will null terminate
+   the vector allocated based on this size.  However, the ELF symbol table
+   always has a dummy entry as symbol #0, so it ends up even.  */
+
+long
+_bfd_elf_get_symtab_upper_bound (bfd *abfd)
+{
+  long symcount;
+  long symtab_size;
+  Elf_Internal_Shdr *hdr = &elf_tdata (abfd)->symtab_hdr;
+
+  symcount = hdr->sh_size / get_elf_backend_data (abfd)->s->sizeof_sym;
+  symtab_size = (symcount + 1) * (sizeof (asymbol *));
+  if (symcount > 0)
+    symtab_size -= sizeof (asymbol *);
+
+  return symtab_size;
+}
+
+long
+_bfd_elf_get_dynamic_symtab_upper_bound (bfd *abfd)
+{
+  long symcount;
+  long symtab_size;
+  Elf_Internal_Shdr *hdr = &elf_tdata (abfd)->dynsymtab_hdr;
+
+  if (elf_dynsymtab (abfd) == 0)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return -1;
+    }
+
+  symcount = hdr->sh_size / get_elf_backend_data (abfd)->s->sizeof_sym;
+  symtab_size = (symcount + 1) * (sizeof (asymbol *));
+  if (symcount > 0)
+    symtab_size -= sizeof (asymbol *);
+
+  return symtab_size;
+}
+
+long
+_bfd_elf_get_reloc_upper_bound (bfd *abfd ATTRIBUTE_UNUSED,
+				sec_ptr asect)
+{
+  return (asect->reloc_count + 1) * sizeof (arelent *);
+}
+
+/* Canonicalize the relocs.  */
+
+long
+_bfd_elf_canonicalize_reloc (bfd *abfd,
+			     sec_ptr section,
+			     arelent **relptr,
+			     asymbol **symbols)
+{
+  arelent *tblptr;
+  unsigned int i;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+
+  if (! bed->s->slurp_reloc_table (abfd, section, symbols, FALSE))
+    return -1;
+
+  tblptr = section->relocation;
+  for (i = 0; i < section->reloc_count; i++)
+    *relptr++ = tblptr++;
+
+  *relptr = NULL;
+
+  return section->reloc_count;
+}
+
+long
+_bfd_elf_canonicalize_symtab (bfd *abfd, asymbol **allocation)
+{
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  long symcount = bed->s->slurp_symbol_table (abfd, allocation, FALSE);
+
+  if (symcount >= 0)
+    bfd_get_symcount (abfd) = symcount;
+  return symcount;
+}
+
+long
+_bfd_elf_canonicalize_dynamic_symtab (bfd *abfd,
+				      asymbol **allocation)
+{
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  long symcount = bed->s->slurp_symbol_table (abfd, allocation, TRUE);
+
+  if (symcount >= 0)
+    bfd_get_dynamic_symcount (abfd) = symcount;
+  return symcount;
+}
+
+/* Return the size required for the dynamic reloc entries.  Any loadable
+   section that was actually installed in the BFD, and has type SHT_REL
+   or SHT_RELA, and uses the dynamic symbol table, is considered to be a
+   dynamic reloc section.  */
+
+long
+_bfd_elf_get_dynamic_reloc_upper_bound (bfd *abfd)
+{
+  long ret;
+  asection *s;
+
+  if (elf_dynsymtab (abfd) == 0)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return -1;
+    }
+
+  ret = sizeof (arelent *);
+  for (s = abfd->sections; s != NULL; s = s->next)
+    if (elf_section_data (s)->this_hdr.sh_link == elf_dynsymtab (abfd)
+	&& (elf_section_data (s)->this_hdr.sh_type == SHT_REL
+	    || elf_section_data (s)->this_hdr.sh_type == SHT_RELA))
+      ret += ((s->size / elf_section_data (s)->this_hdr.sh_entsize)
+	      * sizeof (arelent *));
+
+  return ret;
+}
+
+/* Canonicalize the dynamic relocation entries.  Note that we return the
+   dynamic relocations as a single block, although they are actually
+   associated with particular sections; the interface, which was
+   designed for SunOS style shared libraries, expects that there is only
+   one set of dynamic relocs.  Any loadable section that was actually
+   installed in the BFD, and has type SHT_REL or SHT_RELA, and uses the
+   dynamic symbol table, is considered to be a dynamic reloc section.  */
+
+long
+_bfd_elf_canonicalize_dynamic_reloc (bfd *abfd,
+				     arelent **storage,
+				     asymbol **syms)
+{
+  bfd_boolean (*slurp_relocs) (bfd *, asection *, asymbol **, bfd_boolean);
+  asection *s;
+  long ret;
+
+  if (elf_dynsymtab (abfd) == 0)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return -1;
+    }
+
+  slurp_relocs = get_elf_backend_data (abfd)->s->slurp_reloc_table;
+  ret = 0;
+  for (s = abfd->sections; s != NULL; s = s->next)
+    {
+      if (elf_section_data (s)->this_hdr.sh_link == elf_dynsymtab (abfd)
+	  && (elf_section_data (s)->this_hdr.sh_type == SHT_REL
+	      || elf_section_data (s)->this_hdr.sh_type == SHT_RELA))
+	{
+	  arelent *p;
+	  long count, i;
+
+	  if (! (*slurp_relocs) (abfd, s, syms, TRUE))
+	    return -1;
+	  count = s->size / elf_section_data (s)->this_hdr.sh_entsize;
+	  p = s->relocation;
+	  for (i = 0; i < count; i++)
+	    *storage++ = p++;
+	  ret += count;
+	}
+    }
+
+  *storage = NULL;
+
+  return ret;
+}
+
+/* Read in the version information.  */
+
+bfd_boolean
+_bfd_elf_slurp_version_tables (bfd *abfd, bfd_boolean default_imported_symver)
+{
+  bfd_byte *contents = NULL;
+  unsigned int freeidx = 0;
+
+  if (elf_dynverref (abfd) != 0)
+    {
+      Elf_Internal_Shdr *hdr;
+      Elf_External_Verneed *everneed;
+      Elf_Internal_Verneed *iverneed;
+      unsigned int i;
+      bfd_byte *contents_end;
+
+      hdr = &elf_tdata (abfd)->dynverref_hdr;
+
+      elf_tdata (abfd)->verref = (Elf_Internal_Verneed *)
+          bfd_zalloc2 (abfd, hdr->sh_info, sizeof (Elf_Internal_Verneed));
+      if (elf_tdata (abfd)->verref == NULL)
+	goto error_return;
+
+      elf_tdata (abfd)->cverrefs = hdr->sh_info;
+
+      contents = (bfd_byte *) bfd_malloc (hdr->sh_size);
+      if (contents == NULL)
+	{
+error_return_verref:
+	  elf_tdata (abfd)->verref = NULL;
+	  elf_tdata (abfd)->cverrefs = 0;
+	  goto error_return;
+	}
+      if (bfd_seek (abfd, hdr->sh_offset, SEEK_SET) != 0
+	  || bfd_bread (contents, hdr->sh_size, abfd) != hdr->sh_size)
+	goto error_return_verref;
+
+      if (hdr->sh_info && hdr->sh_size < sizeof (Elf_External_Verneed))
+	goto error_return_verref;
+
+      BFD_ASSERT (sizeof (Elf_External_Verneed)
+		  == sizeof (Elf_External_Vernaux));
+      contents_end = contents + hdr->sh_size - sizeof (Elf_External_Verneed);
+      everneed = (Elf_External_Verneed *) contents;
+      iverneed = elf_tdata (abfd)->verref;
+      for (i = 0; i < hdr->sh_info; i++, iverneed++)
+	{
+	  Elf_External_Vernaux *evernaux;
+	  Elf_Internal_Vernaux *ivernaux;
+	  unsigned int j;
+
+	  _bfd_elf_swap_verneed_in (abfd, everneed, iverneed);
+
+	  iverneed->vn_bfd = abfd;
+
+	  iverneed->vn_filename =
+	    bfd_elf_string_from_elf_section (abfd, hdr->sh_link,
+					     iverneed->vn_file);
+	  if (iverneed->vn_filename == NULL)
+	    goto error_return_verref;
+
+	  if (iverneed->vn_cnt == 0)
+	    iverneed->vn_auxptr = NULL;
+	  else
+	    {
+	      iverneed->vn_auxptr = (struct elf_internal_vernaux *)
+                  bfd_alloc2 (abfd, iverneed->vn_cnt,
+                              sizeof (Elf_Internal_Vernaux));
+	      if (iverneed->vn_auxptr == NULL)
+		goto error_return_verref;
+	    }
+
+	  if (iverneed->vn_aux
+	      > (size_t) (contents_end - (bfd_byte *) everneed))
+	    goto error_return_verref;
+
+	  evernaux = ((Elf_External_Vernaux *)
+		      ((bfd_byte *) everneed + iverneed->vn_aux));
+	  ivernaux = iverneed->vn_auxptr;
+	  for (j = 0; j < iverneed->vn_cnt; j++, ivernaux++)
+	    {
+	      _bfd_elf_swap_vernaux_in (abfd, evernaux, ivernaux);
+
+	      ivernaux->vna_nodename =
+		bfd_elf_string_from_elf_section (abfd, hdr->sh_link,
+						 ivernaux->vna_name);
+	      if (ivernaux->vna_nodename == NULL)
+		goto error_return_verref;
+
+	      if (j + 1 < iverneed->vn_cnt)
+		ivernaux->vna_nextptr = ivernaux + 1;
+	      else
+		ivernaux->vna_nextptr = NULL;
+
+	      if (ivernaux->vna_next
+		  > (size_t) (contents_end - (bfd_byte *) evernaux))
+		goto error_return_verref;
+
+	      evernaux = ((Elf_External_Vernaux *)
+			  ((bfd_byte *) evernaux + ivernaux->vna_next));
+
+	      if (ivernaux->vna_other > freeidx)
+		freeidx = ivernaux->vna_other;
+	    }
+
+	  if (i + 1 < hdr->sh_info)
+	    iverneed->vn_nextref = iverneed + 1;
+	  else
+	    iverneed->vn_nextref = NULL;
+
+	  if (iverneed->vn_next
+	      > (size_t) (contents_end - (bfd_byte *) everneed))
+	    goto error_return_verref;
+
+	  everneed = ((Elf_External_Verneed *)
+		      ((bfd_byte *) everneed + iverneed->vn_next));
+	}
+
+      free (contents);
+      contents = NULL;
+    }
+
+  if (elf_dynverdef (abfd) != 0)
+    {
+      Elf_Internal_Shdr *hdr;
+      Elf_External_Verdef *everdef;
+      Elf_Internal_Verdef *iverdef;
+      Elf_Internal_Verdef *iverdefarr;
+      Elf_Internal_Verdef iverdefmem;
+      unsigned int i;
+      unsigned int maxidx;
+      bfd_byte *contents_end_def, *contents_end_aux;
+
+      hdr = &elf_tdata (abfd)->dynverdef_hdr;
+
+      contents = (bfd_byte *) bfd_malloc (hdr->sh_size);
+      if (contents == NULL)
+	goto error_return;
+      if (bfd_seek (abfd, hdr->sh_offset, SEEK_SET) != 0
+	  || bfd_bread (contents, hdr->sh_size, abfd) != hdr->sh_size)
+	goto error_return;
+
+      if (hdr->sh_info && hdr->sh_size < sizeof (Elf_External_Verdef))
+	goto error_return;
+
+      BFD_ASSERT (sizeof (Elf_External_Verdef)
+		  >= sizeof (Elf_External_Verdaux));
+      contents_end_def = contents + hdr->sh_size
+			 - sizeof (Elf_External_Verdef);
+      contents_end_aux = contents + hdr->sh_size
+			 - sizeof (Elf_External_Verdaux);
+
+      /* We know the number of entries in the section but not the maximum
+	 index.  Therefore we have to run through all entries and find
+	 the maximum.  */
+      everdef = (Elf_External_Verdef *) contents;
+      maxidx = 0;
+      for (i = 0; i < hdr->sh_info; ++i)
+	{
+	  _bfd_elf_swap_verdef_in (abfd, everdef, &iverdefmem);
+
+	  if ((iverdefmem.vd_ndx & ((unsigned) VERSYM_VERSION)) > maxidx)
+	    maxidx = iverdefmem.vd_ndx & ((unsigned) VERSYM_VERSION);
+
+	  if (iverdefmem.vd_next
+	      > (size_t) (contents_end_def - (bfd_byte *) everdef))
+	    goto error_return;
+
+	  everdef = ((Elf_External_Verdef *)
+		     ((bfd_byte *) everdef + iverdefmem.vd_next));
+	}
+
+      if (default_imported_symver)
+	{
+	  if (freeidx > maxidx)
+	    maxidx = ++freeidx;
+	  else
+	    freeidx = ++maxidx;
+	}
+      elf_tdata (abfd)->verdef = (Elf_Internal_Verdef *)
+          bfd_zalloc2 (abfd, maxidx, sizeof (Elf_Internal_Verdef));
+      if (elf_tdata (abfd)->verdef == NULL)
+	goto error_return;
+
+      elf_tdata (abfd)->cverdefs = maxidx;
+
+      everdef = (Elf_External_Verdef *) contents;
+      iverdefarr = elf_tdata (abfd)->verdef;
+      for (i = 0; i < hdr->sh_info; i++)
+	{
+	  Elf_External_Verdaux *everdaux;
+	  Elf_Internal_Verdaux *iverdaux;
+	  unsigned int j;
+
+	  _bfd_elf_swap_verdef_in (abfd, everdef, &iverdefmem);
+
+	  if ((iverdefmem.vd_ndx & VERSYM_VERSION) == 0)
+	    {
+error_return_verdef:
+	      elf_tdata (abfd)->verdef = NULL;
+	      elf_tdata (abfd)->cverdefs = 0;
+	      goto error_return;
+	    }
+
+	  iverdef = &iverdefarr[(iverdefmem.vd_ndx & VERSYM_VERSION) - 1];
+	  memcpy (iverdef, &iverdefmem, sizeof (Elf_Internal_Verdef));
+
+	  iverdef->vd_bfd = abfd;
+
+	  if (iverdef->vd_cnt == 0)
+	    iverdef->vd_auxptr = NULL;
+	  else
+	    {
+	      iverdef->vd_auxptr = (struct elf_internal_verdaux *)
+                  bfd_alloc2 (abfd, iverdef->vd_cnt,
+                              sizeof (Elf_Internal_Verdaux));
+	      if (iverdef->vd_auxptr == NULL)
+		goto error_return_verdef;
+	    }
+
+	  if (iverdef->vd_aux
+	      > (size_t) (contents_end_aux - (bfd_byte *) everdef))
+	    goto error_return_verdef;
+
+	  everdaux = ((Elf_External_Verdaux *)
+		      ((bfd_byte *) everdef + iverdef->vd_aux));
+	  iverdaux = iverdef->vd_auxptr;
+	  for (j = 0; j < iverdef->vd_cnt; j++, iverdaux++)
+	    {
+	      _bfd_elf_swap_verdaux_in (abfd, everdaux, iverdaux);
+
+	      iverdaux->vda_nodename =
+		bfd_elf_string_from_elf_section (abfd, hdr->sh_link,
+						 iverdaux->vda_name);
+	      if (iverdaux->vda_nodename == NULL)
+		goto error_return_verdef;
+
+	      if (j + 1 < iverdef->vd_cnt)
+		iverdaux->vda_nextptr = iverdaux + 1;
+	      else
+		iverdaux->vda_nextptr = NULL;
+
+	      if (iverdaux->vda_next
+		  > (size_t) (contents_end_aux - (bfd_byte *) everdaux))
+		goto error_return_verdef;
+
+	      everdaux = ((Elf_External_Verdaux *)
+			  ((bfd_byte *) everdaux + iverdaux->vda_next));
+	    }
+
+	  if (iverdef->vd_cnt)
+	    iverdef->vd_nodename = iverdef->vd_auxptr->vda_nodename;
+
+	  if ((size_t) (iverdef - iverdefarr) + 1 < maxidx)
+	    iverdef->vd_nextdef = iverdef + 1;
+	  else
+	    iverdef->vd_nextdef = NULL;
+
+	  everdef = ((Elf_External_Verdef *)
+		     ((bfd_byte *) everdef + iverdef->vd_next));
+	}
+
+      free (contents);
+      contents = NULL;
+    }
+  else if (default_imported_symver)
+    {
+      if (freeidx < 3)
+	freeidx = 3;
+      else
+	freeidx++;
+
+      elf_tdata (abfd)->verdef = (Elf_Internal_Verdef *)
+          bfd_zalloc2 (abfd, freeidx, sizeof (Elf_Internal_Verdef));
+      if (elf_tdata (abfd)->verdef == NULL)
+	goto error_return;
+
+      elf_tdata (abfd)->cverdefs = freeidx;
+    }
+
+  /* Create a default version based on the soname.  */
+  if (default_imported_symver)
+    {
+      Elf_Internal_Verdef *iverdef;
+      Elf_Internal_Verdaux *iverdaux;
+
+      iverdef = &elf_tdata (abfd)->verdef[freeidx - 1];;
+
+      iverdef->vd_version = VER_DEF_CURRENT;
+      iverdef->vd_flags = 0;
+      iverdef->vd_ndx = freeidx;
+      iverdef->vd_cnt = 1;
+
+      iverdef->vd_bfd = abfd;
+
+      iverdef->vd_nodename = bfd_elf_get_dt_soname (abfd);
+      if (iverdef->vd_nodename == NULL)
+	goto error_return_verdef;
+      iverdef->vd_nextdef = NULL;
+      iverdef->vd_auxptr = (struct elf_internal_verdaux *)
+          bfd_alloc (abfd, sizeof (Elf_Internal_Verdaux));
+      if (iverdef->vd_auxptr == NULL)
+	goto error_return_verdef;
+
+      iverdaux = iverdef->vd_auxptr;
+      iverdaux->vda_nodename = iverdef->vd_nodename;
+      iverdaux->vda_nextptr = NULL;
+    }
+
+  return TRUE;
+
+ error_return:
+  if (contents != NULL)
+    free (contents);
+  return FALSE;
+}
+
+asymbol *
+_bfd_elf_make_empty_symbol (bfd *abfd)
+{
+  elf_symbol_type *newsym;
+  bfd_size_type amt = sizeof (elf_symbol_type);
+
+  newsym = (elf_symbol_type *) bfd_zalloc (abfd, amt);
+  if (!newsym)
+    return NULL;
+  else
+    {
+      newsym->symbol.the_bfd = abfd;
+      return &newsym->symbol;
+    }
+}
+
+void
+_bfd_elf_get_symbol_info (bfd *abfd ATTRIBUTE_UNUSED,
+			  asymbol *symbol,
+			  symbol_info *ret)
+{
+  bfd_symbol_info (symbol, ret);
+}
+
+/* Return whether a symbol name implies a local symbol.  Most targets
+   use this function for the is_local_label_name entry point, but some
+   override it.  */
+
+bfd_boolean
+_bfd_elf_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED,
+			      const char *name)
+{
+  /* Normal local symbols start with ``.L''.  */
+  if (name[0] == '.' && name[1] == 'L')
+    return TRUE;
+
+  /* At least some SVR4 compilers (e.g., UnixWare 2.1 cc) generate
+     DWARF debugging symbols starting with ``..''.  */
+  if (name[0] == '.' && name[1] == '.')
+    return TRUE;
+
+  /* gcc will sometimes generate symbols beginning with ``_.L_'' when
+     emitting DWARF debugging output.  I suspect this is actually a
+     small bug in gcc (it calls ASM_OUTPUT_LABEL when it should call
+     ASM_GENERATE_INTERNAL_LABEL, and this causes the leading
+     underscore to be emitted on some ELF targets).  For ease of use,
+     we treat such symbols as local.  */
+  if (name[0] == '_' && name[1] == '.' && name[2] == 'L' && name[3] == '_')
+    return TRUE;
+
+  return FALSE;
+}
+
+alent *
+_bfd_elf_get_lineno (bfd *abfd ATTRIBUTE_UNUSED,
+		     asymbol *symbol ATTRIBUTE_UNUSED)
+{
+  abort ();
+  return NULL;
+}
+
+bfd_boolean
+_bfd_elf_set_arch_mach (bfd *abfd,
+			enum bfd_architecture arch,
+			unsigned long machine)
+{
+  /* If this isn't the right architecture for this backend, and this
+     isn't the generic backend, fail.  */
+  if (arch != get_elf_backend_data (abfd)->arch
+      && arch != bfd_arch_unknown
+      && get_elf_backend_data (abfd)->arch != bfd_arch_unknown)
+    return FALSE;
+
+  return bfd_default_set_arch_mach (abfd, arch, machine);
+}
+
+/* Find the function to a particular section and offset,
+   for error reporting.  */
+
+static bfd_boolean
+elf_find_function (bfd *abfd,
+		   asection *section,
+		   asymbol **symbols,
+		   bfd_vma offset,
+		   const char **filename_ptr,
+		   const char **functionname_ptr)
+{
+  const char *filename;
+  asymbol *func, *file;
+  bfd_vma low_func;
+  asymbol **p;
+  /* ??? Given multiple file symbols, it is impossible to reliably
+     choose the right file name for global symbols.  File symbols are
+     local symbols, and thus all file symbols must sort before any
+     global symbols.  The ELF spec may be interpreted to say that a
+     file symbol must sort before other local symbols, but currently
+     ld -r doesn't do this.  So, for ld -r output, it is possible to
+     make a better choice of file name for local symbols by ignoring
+     file symbols appearing after a given local symbol.  */
+  enum { nothing_seen, symbol_seen, file_after_symbol_seen } state;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+
+  if (symbols == NULL)
+    return FALSE;
+
+  filename = NULL;
+  func = NULL;
+  file = NULL;
+  low_func = 0;
+  state = nothing_seen;
+
+  for (p = symbols; *p != NULL; p++)
+    {
+      elf_symbol_type *q;
+      unsigned int type;
+
+      q = (elf_symbol_type *) *p;
+
+      type = ELF_ST_TYPE (q->internal_elf_sym.st_info);
+      switch (type)
+	{
+	case STT_FILE:
+	  file = &q->symbol;
+	  if (state == symbol_seen)
+	    state = file_after_symbol_seen;
+	  continue;
+	default:
+	  if (!bed->is_function_type (type))
+	    break;
+	case STT_NOTYPE:
+	  if (bfd_get_section (&q->symbol) == section
+	      && q->symbol.value >= low_func
+	      && q->symbol.value <= offset)
+	    {
+	      func = (asymbol *) q;
+	      low_func = q->symbol.value;
+	      filename = NULL;
+	      if (file != NULL
+		  && (ELF_ST_BIND (q->internal_elf_sym.st_info) == STB_LOCAL
+		      || state != file_after_symbol_seen))
+		filename = bfd_asymbol_name (file);
+	    }
+	  break;
+	}
+      if (state == nothing_seen)
+	state = symbol_seen;
+    }
+
+  if (func == NULL)
+    return FALSE;
+
+  if (filename_ptr)
+    *filename_ptr = filename;
+  if (functionname_ptr)
+    *functionname_ptr = bfd_asymbol_name (func);
+
+  return TRUE;
+}
+
+/* Find the nearest line to a particular section and offset,
+   for error reporting.  */
+
+bfd_boolean
+_bfd_elf_find_nearest_line (bfd *abfd,
+			    asection *section,
+			    asymbol **symbols,
+			    bfd_vma offset,
+			    const char **filename_ptr,
+			    const char **functionname_ptr,
+			    unsigned int *line_ptr)
+{
+  bfd_boolean found;
+
+  if (_bfd_dwarf1_find_nearest_line (abfd, section, symbols, offset,
+				     filename_ptr, functionname_ptr,
+				     line_ptr))
+    {
+      if (!*functionname_ptr)
+	elf_find_function (abfd, section, symbols, offset,
+			   *filename_ptr ? NULL : filename_ptr,
+			   functionname_ptr);
+
+      return TRUE;
+    }
+
+  if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
+				     filename_ptr, functionname_ptr,
+				     line_ptr, 0,
+				     &elf_tdata (abfd)->dwarf2_find_line_info))
+    {
+      if (!*functionname_ptr)
+	elf_find_function (abfd, section, symbols, offset,
+			   *filename_ptr ? NULL : filename_ptr,
+			   functionname_ptr);
+
+      return TRUE;
+    }
+
+  if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset,
+					     &found, filename_ptr,
+					     functionname_ptr, line_ptr,
+					     &elf_tdata (abfd)->line_info))
+    return FALSE;
+  if (found && (*functionname_ptr || *line_ptr))
+    return TRUE;
+
+  if (symbols == NULL)
+    return FALSE;
+
+  if (! elf_find_function (abfd, section, symbols, offset,
+			   filename_ptr, functionname_ptr))
+    return FALSE;
+
+  *line_ptr = 0;
+  return TRUE;
+}
+
+/* Find the line for a symbol.  */
+
+bfd_boolean
+_bfd_elf_find_line (bfd *abfd, asymbol **symbols, asymbol *symbol,
+		    const char **filename_ptr, unsigned int *line_ptr)
+{
+  return _bfd_dwarf2_find_line (abfd, symbols, symbol,
+				filename_ptr, line_ptr, 0,
+				&elf_tdata (abfd)->dwarf2_find_line_info);
+}
+
+/* After a call to bfd_find_nearest_line, successive calls to
+   bfd_find_inliner_info can be used to get source information about
+   each level of function inlining that terminated at the address
+   passed to bfd_find_nearest_line.  Currently this is only supported
+   for DWARF2 with appropriate DWARF3 extensions. */
+
+bfd_boolean
+_bfd_elf_find_inliner_info (bfd *abfd,
+			    const char **filename_ptr,
+			    const char **functionname_ptr,
+			    unsigned int *line_ptr)
+{
+  bfd_boolean found;
+  found = _bfd_dwarf2_find_inliner_info (abfd, filename_ptr,
+					 functionname_ptr, line_ptr,
+					 & elf_tdata (abfd)->dwarf2_find_line_info);
+  return found;
+}
+
+int
+_bfd_elf_sizeof_headers (bfd *abfd, struct bfd_link_info *info)
+{
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  int ret = bed->s->sizeof_ehdr;
+
+  if (!info->relocatable)
+    {
+      bfd_size_type phdr_size = elf_tdata (abfd)->program_header_size;
+
+      if (phdr_size == (bfd_size_type) -1)
+	{
+	  struct elf_segment_map *m;
+
+	  phdr_size = 0;
+	  for (m = elf_tdata (abfd)->segment_map; m != NULL; m = m->next)
+	    phdr_size += bed->s->sizeof_phdr;
+
+	  if (phdr_size == 0)
+	    phdr_size = get_program_header_size (abfd, info);
+	}
+
+      elf_tdata (abfd)->program_header_size = phdr_size;
+      ret += phdr_size;
+    }
+
+  return ret;
+}
+
+bfd_boolean
+_bfd_elf_set_section_contents (bfd *abfd,
+			       sec_ptr section,
+			       const void *location,
+			       file_ptr offset,
+			       bfd_size_type count)
+{
+  Elf_Internal_Shdr *hdr;
+  bfd_signed_vma pos;
+
+  if (! abfd->output_has_begun
+      && ! _bfd_elf_compute_section_file_positions (abfd, NULL))
+    return FALSE;
+
+  hdr = &elf_section_data (section)->this_hdr;
+  pos = hdr->sh_offset + offset;
+  if (bfd_seek (abfd, pos, SEEK_SET) != 0
+      || bfd_bwrite (location, count, abfd) != count)
+    return FALSE;
+
+  return TRUE;
+}
+
+void
+_bfd_elf_no_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+			   arelent *cache_ptr ATTRIBUTE_UNUSED,
+			   Elf_Internal_Rela *dst ATTRIBUTE_UNUSED)
+{
+  abort ();
+}
+
+/* Try to convert a non-ELF reloc into an ELF one.  */
+
+bfd_boolean
+_bfd_elf_validate_reloc (bfd *abfd, arelent *areloc)
+{
+  /* Check whether we really have an ELF howto.  */
+
+  if ((*areloc->sym_ptr_ptr)->the_bfd->xvec != abfd->xvec)
+    {
+      bfd_reloc_code_real_type code;
+      reloc_howto_type *howto;
+
+      /* Alien reloc: Try to determine its type to replace it with an
+	 equivalent ELF reloc.  */
+
+      if (areloc->howto->pc_relative)
+	{
+	  switch (areloc->howto->bitsize)
+	    {
+	    case 8:
+	      code = BFD_RELOC_8_PCREL;
+	      break;
+	    case 12:
+	      code = BFD_RELOC_12_PCREL;
+	      break;
+	    case 16:
+	      code = BFD_RELOC_16_PCREL;
+	      break;
+	    case 24:
+	      code = BFD_RELOC_24_PCREL;
+	      break;
+	    case 32:
+	      code = BFD_RELOC_32_PCREL;
+	      break;
+	    case 64:
+	      code = BFD_RELOC_64_PCREL;
+	      break;
+	    default:
+	      goto fail;
+	    }
+
+	  howto = bfd_reloc_type_lookup (abfd, code);
+
+	  if (areloc->howto->pcrel_offset != howto->pcrel_offset)
+	    {
+	      if (howto->pcrel_offset)
+		areloc->addend += areloc->address;
+	      else
+		areloc->addend -= areloc->address; /* addend is unsigned!! */
+	    }
+	}
+      else
+	{
+	  switch (areloc->howto->bitsize)
+	    {
+	    case 8:
+	      code = BFD_RELOC_8;
+	      break;
+	    case 14:
+	      code = BFD_RELOC_14;
+	      break;
+	    case 16:
+	      code = BFD_RELOC_16;
+	      break;
+	    case 26:
+	      code = BFD_RELOC_26;
+	      break;
+	    case 32:
+	      code = BFD_RELOC_32;
+	      break;
+	    case 64:
+	      code = BFD_RELOC_64;
+	      break;
+	    default:
+	      goto fail;
+	    }
+
+	  howto = bfd_reloc_type_lookup (abfd, code);
+	}
+
+      if (howto)
+	areloc->howto = howto;
+      else
+	goto fail;
+    }
+
+  return TRUE;
+
+ fail:
+  (*_bfd_error_handler)
+    (_("%B: unsupported relocation type %s"),
+     abfd, areloc->howto->name);
+  bfd_set_error (bfd_error_bad_value);
+  return FALSE;
+}
+
+bfd_boolean
+_bfd_elf_close_and_cleanup (bfd *abfd)
+{
+  if (bfd_get_format (abfd) == bfd_object)
+    {
+      if (elf_tdata (abfd) != NULL && elf_shstrtab (abfd) != NULL)
+	_bfd_elf_strtab_free (elf_shstrtab (abfd));
+      _bfd_dwarf2_cleanup_debug_info (abfd);
+    }
+
+  return _bfd_generic_close_and_cleanup (abfd);
+}
+
+/* For Rel targets, we encode meaningful data for BFD_RELOC_VTABLE_ENTRY
+   in the relocation's offset.  Thus we cannot allow any sort of sanity
+   range-checking to interfere.  There is nothing else to do in processing
+   this reloc.  */
+
+bfd_reloc_status_type
+_bfd_elf_rel_vtable_reloc_fn
+  (bfd *abfd ATTRIBUTE_UNUSED, arelent *re ATTRIBUTE_UNUSED,
+   struct bfd_symbol *symbol ATTRIBUTE_UNUSED,
+   void *data ATTRIBUTE_UNUSED, asection *is ATTRIBUTE_UNUSED,
+   bfd *obfd ATTRIBUTE_UNUSED, char **errmsg ATTRIBUTE_UNUSED)
+{
+  return bfd_reloc_ok;
+}
+
+/* Elf core file support.  Much of this only works on native
+   toolchains, since we rely on knowing the
+   machine-dependent procfs structure in order to pick
+   out details about the corefile.  */
+
+#ifdef HAVE_SYS_PROCFS_H
+/* Needed for new procfs interface on sparc-solaris.  */
+# define _STRUCTURED_PROC 1
+# include <sys/procfs.h>
+#endif
+
+/* Return a PID that identifies a "thread" for threaded cores, or the
+   PID of the main process for non-threaded cores.  */
+
+static int
+elfcore_make_pid (bfd *abfd)
+{
+  int pid;
+
+  pid = elf_tdata (abfd)->core_lwpid;
+  if (pid == 0)
+    pid = elf_tdata (abfd)->core_pid;
+
+  return pid;
+}
+
+/* If there isn't a section called NAME, make one, using
+   data from SECT.  Note, this function will generate a
+   reference to NAME, so you shouldn't deallocate or
+   overwrite it.  */
+
+static bfd_boolean
+elfcore_maybe_make_sect (bfd *abfd, char *name, asection *sect)
+{
+  asection *sect2;
+
+  if (bfd_get_section_by_name (abfd, name) != NULL)
+    return TRUE;
+
+  sect2 = bfd_make_section_with_flags (abfd, name, sect->flags);
+  if (sect2 == NULL)
+    return FALSE;
+
+  sect2->size = sect->size;
+  sect2->filepos = sect->filepos;
+  sect2->alignment_power = sect->alignment_power;
+  return TRUE;
+}
+
+/* Create a pseudosection containing SIZE bytes at FILEPOS.  This
+   actually creates up to two pseudosections:
+   - For the single-threaded case, a section named NAME, unless
+     such a section already exists.
+   - For the multi-threaded case, a section named "NAME/PID", where
+     PID is elfcore_make_pid (abfd).
+   Both pseudosections have identical contents. */
+bfd_boolean
+_bfd_elfcore_make_pseudosection (bfd *abfd,
+				 char *name,
+				 size_t size,
+				 ufile_ptr filepos)
+{
+  char buf[100];
+  char *threaded_name;
+  size_t len;
+  asection *sect;
+
+  /* Build the section name.  */
+
+  sprintf (buf, "%s/%d", name, elfcore_make_pid (abfd));
+  len = strlen (buf) + 1;
+  threaded_name = (char *) bfd_alloc (abfd, len);
+  if (threaded_name == NULL)
+    return FALSE;
+  memcpy (threaded_name, buf, len);
+
+  sect = bfd_make_section_anyway_with_flags (abfd, threaded_name,
+					     SEC_HAS_CONTENTS);
+  if (sect == NULL)
+    return FALSE;
+  sect->size = size;
+  sect->filepos = filepos;
+  sect->alignment_power = 2;
+
+  return elfcore_maybe_make_sect (abfd, name, sect);
+}
+
+/* prstatus_t exists on:
+     solaris 2.5+
+     linux 2.[01] + glibc
+     unixware 4.2
+*/
+
+#if defined (HAVE_PRSTATUS_T)
+
+static bfd_boolean
+elfcore_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  size_t size;
+  int offset;
+
+  if (note->descsz == sizeof (prstatus_t))
+    {
+      prstatus_t prstat;
+
+      size = sizeof (prstat.pr_reg);
+      offset   = offsetof (prstatus_t, pr_reg);
+      memcpy (&prstat, note->descdata, sizeof (prstat));
+
+      /* Do not overwrite the core signal if it
+	 has already been set by another thread.  */
+      if (elf_tdata (abfd)->core_signal == 0)
+	elf_tdata (abfd)->core_signal = prstat.pr_cursig;
+      if (elf_tdata (abfd)->core_pid == 0)
+	elf_tdata (abfd)->core_pid = prstat.pr_pid;
+
+      /* pr_who exists on:
+	 solaris 2.5+
+	 unixware 4.2
+	 pr_who doesn't exist on:
+	 linux 2.[01]
+	 */
+#if defined (HAVE_PRSTATUS_T_PR_WHO)
+      elf_tdata (abfd)->core_lwpid = prstat.pr_who;
+#else
+      elf_tdata (abfd)->core_lwpid = prstat.pr_pid;
+#endif
+    }
+#if defined (HAVE_PRSTATUS32_T)
+  else if (note->descsz == sizeof (prstatus32_t))
+    {
+      /* 64-bit host, 32-bit corefile */
+      prstatus32_t prstat;
+
+      size = sizeof (prstat.pr_reg);
+      offset   = offsetof (prstatus32_t, pr_reg);
+      memcpy (&prstat, note->descdata, sizeof (prstat));
+
+      /* Do not overwrite the core signal if it
+	 has already been set by another thread.  */
+      if (elf_tdata (abfd)->core_signal == 0)
+	elf_tdata (abfd)->core_signal = prstat.pr_cursig;
+      if (elf_tdata (abfd)->core_pid == 0)
+	elf_tdata (abfd)->core_pid = prstat.pr_pid;
+
+      /* pr_who exists on:
+	 solaris 2.5+
+	 unixware 4.2
+	 pr_who doesn't exist on:
+	 linux 2.[01]
+	 */
+#if defined (HAVE_PRSTATUS32_T_PR_WHO)
+      elf_tdata (abfd)->core_lwpid = prstat.pr_who;
+#else
+      elf_tdata (abfd)->core_lwpid = prstat.pr_pid;
+#endif
+    }
+#endif /* HAVE_PRSTATUS32_T */
+  else
+    {
+      /* Fail - we don't know how to handle any other
+	 note size (ie. data object type).  */
+      return TRUE;
+    }
+
+  /* Make a ".reg/999" section and a ".reg" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg",
+					  size, note->descpos + offset);
+}
+#endif /* defined (HAVE_PRSTATUS_T) */
+
+/* Create a pseudosection containing the exact contents of NOTE.  */
+static bfd_boolean
+elfcore_make_note_pseudosection (bfd *abfd,
+				 char *name,
+				 Elf_Internal_Note *note)
+{
+  return _bfd_elfcore_make_pseudosection (abfd, name,
+					  note->descsz, note->descpos);
+}
+
+/* There isn't a consistent prfpregset_t across platforms,
+   but it doesn't matter, because we don't have to pick this
+   data structure apart.  */
+
+static bfd_boolean
+elfcore_grok_prfpreg (bfd *abfd, Elf_Internal_Note *note)
+{
+  return elfcore_make_note_pseudosection (abfd, ".reg2", note);
+}
+
+/* Linux dumps the Intel SSE regs in a note named "LINUX" with a note
+   type of NT_PRXFPREG.  Just include the whole note's contents
+   literally.  */
+
+static bfd_boolean
+elfcore_grok_prxfpreg (bfd *abfd, Elf_Internal_Note *note)
+{
+  return elfcore_make_note_pseudosection (abfd, ".reg-xfp", note);
+}
+
+/* Linux dumps the Intel XSAVE extended state in a note named "LINUX"
+   with a note type of NT_X86_XSTATE.  Just include the whole note's
+   contents literally.  */
+
+static bfd_boolean
+elfcore_grok_xstatereg (bfd *abfd, Elf_Internal_Note *note)
+{
+  return elfcore_make_note_pseudosection (abfd, ".reg-xstate", note);
+}
+
+static bfd_boolean
+elfcore_grok_ppc_vmx (bfd *abfd, Elf_Internal_Note *note)
+{
+  return elfcore_make_note_pseudosection (abfd, ".reg-ppc-vmx", note);
+}
+
+static bfd_boolean
+elfcore_grok_ppc_vsx (bfd *abfd, Elf_Internal_Note *note)
+{
+  return elfcore_make_note_pseudosection (abfd, ".reg-ppc-vsx", note);
+}
+
+static bfd_boolean
+elfcore_grok_s390_high_gprs (bfd *abfd, Elf_Internal_Note *note)
+{
+  return elfcore_make_note_pseudosection (abfd, ".reg-s390-high-gprs", note);
+}
+
+static bfd_boolean
+elfcore_grok_s390_timer (bfd *abfd, Elf_Internal_Note *note)
+{
+  return elfcore_make_note_pseudosection (abfd, ".reg-s390-timer", note);
+}
+
+static bfd_boolean
+elfcore_grok_s390_todcmp (bfd *abfd, Elf_Internal_Note *note)
+{
+  return elfcore_make_note_pseudosection (abfd, ".reg-s390-todcmp", note);
+}
+
+static bfd_boolean
+elfcore_grok_s390_todpreg (bfd *abfd, Elf_Internal_Note *note)
+{
+  return elfcore_make_note_pseudosection (abfd, ".reg-s390-todpreg", note);
+}
+
+static bfd_boolean
+elfcore_grok_s390_ctrs (bfd *abfd, Elf_Internal_Note *note)
+{
+  return elfcore_make_note_pseudosection (abfd, ".reg-s390-ctrs", note);
+}
+
+static bfd_boolean
+elfcore_grok_s390_prefix (bfd *abfd, Elf_Internal_Note *note)
+{
+  return elfcore_make_note_pseudosection (abfd, ".reg-s390-prefix", note);
+}
+
+static bfd_boolean
+elfcore_grok_arm_vfp (bfd *abfd, Elf_Internal_Note *note)
+{
+  return elfcore_make_note_pseudosection (abfd, ".reg-arm-vfp", note);
+}
+
+#if defined (HAVE_PRPSINFO_T)
+typedef prpsinfo_t   elfcore_psinfo_t;
+#if defined (HAVE_PRPSINFO32_T)		/* Sparc64 cross Sparc32 */
+typedef prpsinfo32_t elfcore_psinfo32_t;
+#endif
+#endif
+
+#if defined (HAVE_PSINFO_T)
+typedef psinfo_t   elfcore_psinfo_t;
+#if defined (HAVE_PSINFO32_T)		/* Sparc64 cross Sparc32 */
+typedef psinfo32_t elfcore_psinfo32_t;
+#endif
+#endif
+
+/* return a malloc'ed copy of a string at START which is at
+   most MAX bytes long, possibly without a terminating '\0'.
+   the copy will always have a terminating '\0'.  */
+
+char *
+_bfd_elfcore_strndup (bfd *abfd, char *start, size_t max)
+{
+  char *dups;
+  char *end = (char *) memchr (start, '\0', max);
+  size_t len;
+
+  if (end == NULL)
+    len = max;
+  else
+    len = end - start;
+
+  dups = (char *) bfd_alloc (abfd, len + 1);
+  if (dups == NULL)
+    return NULL;
+
+  memcpy (dups, start, len);
+  dups[len] = '\0';
+
+  return dups;
+}
+
+#if defined (HAVE_PRPSINFO_T) || defined (HAVE_PSINFO_T)
+static bfd_boolean
+elfcore_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  if (note->descsz == sizeof (elfcore_psinfo_t))
+    {
+      elfcore_psinfo_t psinfo;
+
+      memcpy (&psinfo, note->descdata, sizeof (psinfo));
+
+#if defined (HAVE_PSINFO_T_PR_PID) || defined (HAVE_PRPSINFO_T_PR_PID)
+      elf_tdata (abfd)->core_pid = psinfo.pr_pid;
+#endif
+      elf_tdata (abfd)->core_program
+	= _bfd_elfcore_strndup (abfd, psinfo.pr_fname,
+				sizeof (psinfo.pr_fname));
+
+      elf_tdata (abfd)->core_command
+	= _bfd_elfcore_strndup (abfd, psinfo.pr_psargs,
+				sizeof (psinfo.pr_psargs));
+    }
+#if defined (HAVE_PRPSINFO32_T) || defined (HAVE_PSINFO32_T)
+  else if (note->descsz == sizeof (elfcore_psinfo32_t))
+    {
+      /* 64-bit host, 32-bit corefile */
+      elfcore_psinfo32_t psinfo;
+
+      memcpy (&psinfo, note->descdata, sizeof (psinfo));
+
+#if defined (HAVE_PSINFO32_T_PR_PID) || defined (HAVE_PRPSINFO32_T_PR_PID)
+      elf_tdata (abfd)->core_pid = psinfo.pr_pid;
+#endif
+      elf_tdata (abfd)->core_program
+	= _bfd_elfcore_strndup (abfd, psinfo.pr_fname,
+				sizeof (psinfo.pr_fname));
+
+      elf_tdata (abfd)->core_command
+	= _bfd_elfcore_strndup (abfd, psinfo.pr_psargs,
+				sizeof (psinfo.pr_psargs));
+    }
+#endif
+
+  else
+    {
+      /* Fail - we don't know how to handle any other
+	 note size (ie. data object type).  */
+      return TRUE;
+    }
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+
+  {
+    char *command = elf_tdata (abfd)->core_command;
+    int n = strlen (command);
+
+    if (0 < n && command[n - 1] == ' ')
+      command[n - 1] = '\0';
+  }
+
+  return TRUE;
+}
+#endif /* defined (HAVE_PRPSINFO_T) || defined (HAVE_PSINFO_T) */
+
+#if defined (HAVE_PSTATUS_T)
+static bfd_boolean
+elfcore_grok_pstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  if (note->descsz == sizeof (pstatus_t)
+#if defined (HAVE_PXSTATUS_T)
+      || note->descsz == sizeof (pxstatus_t)
+#endif
+      )
+    {
+      pstatus_t pstat;
+
+      memcpy (&pstat, note->descdata, sizeof (pstat));
+
+      elf_tdata (abfd)->core_pid = pstat.pr_pid;
+    }
+#if defined (HAVE_PSTATUS32_T)
+  else if (note->descsz == sizeof (pstatus32_t))
+    {
+      /* 64-bit host, 32-bit corefile */
+      pstatus32_t pstat;
+
+      memcpy (&pstat, note->descdata, sizeof (pstat));
+
+      elf_tdata (abfd)->core_pid = pstat.pr_pid;
+    }
+#endif
+  /* Could grab some more details from the "representative"
+     lwpstatus_t in pstat.pr_lwp, but we'll catch it all in an
+     NT_LWPSTATUS note, presumably.  */
+
+  return TRUE;
+}
+#endif /* defined (HAVE_PSTATUS_T) */
+
+#if defined (HAVE_LWPSTATUS_T)
+static bfd_boolean
+elfcore_grok_lwpstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  lwpstatus_t lwpstat;
+  char buf[100];
+  char *name;
+  size_t len;
+  asection *sect;
+
+  if (note->descsz != sizeof (lwpstat)
+#if defined (HAVE_LWPXSTATUS_T)
+      && note->descsz != sizeof (lwpxstatus_t)
+#endif
+      )
+    return TRUE;
+
+  memcpy (&lwpstat, note->descdata, sizeof (lwpstat));
+
+  elf_tdata (abfd)->core_lwpid = lwpstat.pr_lwpid;
+  /* Do not overwrite the core signal if it has already been set by
+     another thread.  */
+  if (elf_tdata (abfd)->core_signal == 0)
+    elf_tdata (abfd)->core_signal = lwpstat.pr_cursig;
+
+  /* Make a ".reg/999" section.  */
+
+  sprintf (buf, ".reg/%d", elfcore_make_pid (abfd));
+  len = strlen (buf) + 1;
+  name = bfd_alloc (abfd, len);
+  if (name == NULL)
+    return FALSE;
+  memcpy (name, buf, len);
+
+  sect = bfd_make_section_anyway_with_flags (abfd, name, SEC_HAS_CONTENTS);
+  if (sect == NULL)
+    return FALSE;
+
+#if defined (HAVE_LWPSTATUS_T_PR_CONTEXT)
+  sect->size = sizeof (lwpstat.pr_context.uc_mcontext.gregs);
+  sect->filepos = note->descpos
+    + offsetof (lwpstatus_t, pr_context.uc_mcontext.gregs);
+#endif
+
+#if defined (HAVE_LWPSTATUS_T_PR_REG)
+  sect->size = sizeof (lwpstat.pr_reg);
+  sect->filepos = note->descpos + offsetof (lwpstatus_t, pr_reg);
+#endif
+
+  sect->alignment_power = 2;
+
+  if (!elfcore_maybe_make_sect (abfd, ".reg", sect))
+    return FALSE;
+
+  /* Make a ".reg2/999" section */
+
+  sprintf (buf, ".reg2/%d", elfcore_make_pid (abfd));
+  len = strlen (buf) + 1;
+  name = bfd_alloc (abfd, len);
+  if (name == NULL)
+    return FALSE;
+  memcpy (name, buf, len);
+
+  sect = bfd_make_section_anyway_with_flags (abfd, name, SEC_HAS_CONTENTS);
+  if (sect == NULL)
+    return FALSE;
+
+#if defined (HAVE_LWPSTATUS_T_PR_CONTEXT)
+  sect->size = sizeof (lwpstat.pr_context.uc_mcontext.fpregs);
+  sect->filepos = note->descpos
+    + offsetof (lwpstatus_t, pr_context.uc_mcontext.fpregs);
+#endif
+
+#if defined (HAVE_LWPSTATUS_T_PR_FPREG)
+  sect->size = sizeof (lwpstat.pr_fpreg);
+  sect->filepos = note->descpos + offsetof (lwpstatus_t, pr_fpreg);
+#endif
+
+  sect->alignment_power = 2;
+
+  return elfcore_maybe_make_sect (abfd, ".reg2", sect);
+}
+#endif /* defined (HAVE_LWPSTATUS_T) */
+
+static bfd_boolean
+elfcore_grok_win32pstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  char buf[30];
+  char *name;
+  size_t len;
+  asection *sect;
+  int type;
+  int is_active_thread;
+  bfd_vma base_addr;
+
+  if (note->descsz < 728)
+    return TRUE;
+
+  if (! CONST_STRNEQ (note->namedata, "win32"))
+    return TRUE;
+
+  type = bfd_get_32 (abfd, note->descdata);
+
+  switch (type)
+    {
+    case 1 /* NOTE_INFO_PROCESS */:
+      /* FIXME: need to add ->core_command.  */
+      /* process_info.pid */
+      elf_tdata (abfd)->core_pid = bfd_get_32 (abfd, note->descdata + 8);
+      /* process_info.signal */
+      elf_tdata (abfd)->core_signal = bfd_get_32 (abfd, note->descdata + 12);
+      break;
+
+    case 2 /* NOTE_INFO_THREAD */:
+      /* Make a ".reg/999" section.  */
+      /* thread_info.tid */
+      sprintf (buf, ".reg/%ld", (long) bfd_get_32 (abfd, note->descdata + 8));
+
+      len = strlen (buf) + 1;
+      name = (char *) bfd_alloc (abfd, len);
+      if (name == NULL)
+	return FALSE;
+
+      memcpy (name, buf, len);
+
+      sect = bfd_make_section_anyway_with_flags (abfd, name, SEC_HAS_CONTENTS);
+      if (sect == NULL)
+	return FALSE;
+
+      /* sizeof (thread_info.thread_context) */
+      sect->size = 716;
+      /* offsetof (thread_info.thread_context) */
+      sect->filepos = note->descpos + 12;
+      sect->alignment_power = 2;
+
+      /* thread_info.is_active_thread */
+      is_active_thread = bfd_get_32 (abfd, note->descdata + 8);
+
+      if (is_active_thread)
+	if (! elfcore_maybe_make_sect (abfd, ".reg", sect))
+	  return FALSE;
+      break;
+
+    case 3 /* NOTE_INFO_MODULE */:
+      /* Make a ".module/xxxxxxxx" section.  */
+      /* module_info.base_address */
+      base_addr = bfd_get_32 (abfd, note->descdata + 4);
+      sprintf (buf, ".module/%08lx", (unsigned long) base_addr);
+
+      len = strlen (buf) + 1;
+      name = (char *) bfd_alloc (abfd, len);
+      if (name == NULL)
+	return FALSE;
+
+      memcpy (name, buf, len);
+
+      sect = bfd_make_section_anyway_with_flags (abfd, name, SEC_HAS_CONTENTS);
+
+      if (sect == NULL)
+	return FALSE;
+
+      sect->size = note->descsz;
+      sect->filepos = note->descpos;
+      sect->alignment_power = 2;
+      break;
+
+    default:
+      return TRUE;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+elfcore_grok_note (bfd *abfd, Elf_Internal_Note *note)
+{
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+
+  switch (note->type)
+    {
+    default:
+      return TRUE;
+
+    case NT_PRSTATUS:
+      if (bed->elf_backend_grok_prstatus)
+	if ((*bed->elf_backend_grok_prstatus) (abfd, note))
+	  return TRUE;
+#if defined (HAVE_PRSTATUS_T)
+      return elfcore_grok_prstatus (abfd, note);
+#else
+      return TRUE;
+#endif
+
+#if defined (HAVE_PSTATUS_T)
+    case NT_PSTATUS:
+      return elfcore_grok_pstatus (abfd, note);
+#endif
+
+#if defined (HAVE_LWPSTATUS_T)
+    case NT_LWPSTATUS:
+      return elfcore_grok_lwpstatus (abfd, note);
+#endif
+
+    case NT_FPREGSET:		/* FIXME: rename to NT_PRFPREG */
+      return elfcore_grok_prfpreg (abfd, note);
+
+    case NT_WIN32PSTATUS:
+      return elfcore_grok_win32pstatus (abfd, note);
+
+    case NT_PRXFPREG:		/* Linux SSE extension */
+      if (note->namesz == 6
+	  && strcmp (note->namedata, "LINUX") == 0)
+	return elfcore_grok_prxfpreg (abfd, note);
+      else
+	return TRUE;
+
+    case NT_X86_XSTATE:		/* Linux XSAVE extension */
+      if (note->namesz == 6
+	  && strcmp (note->namedata, "LINUX") == 0)
+	return elfcore_grok_xstatereg (abfd, note);
+      else
+	return TRUE;
+
+    case NT_PPC_VMX:
+      if (note->namesz == 6
+	  && strcmp (note->namedata, "LINUX") == 0)
+	return elfcore_grok_ppc_vmx (abfd, note);
+      else
+	return TRUE;
+
+    case NT_PPC_VSX:
+      if (note->namesz == 6
+          && strcmp (note->namedata, "LINUX") == 0)
+        return elfcore_grok_ppc_vsx (abfd, note);
+      else
+        return TRUE;
+
+    case NT_S390_HIGH_GPRS:
+      if (note->namesz == 6
+          && strcmp (note->namedata, "LINUX") == 0)
+        return elfcore_grok_s390_high_gprs (abfd, note);
+      else
+        return TRUE;
+
+    case NT_S390_TIMER:
+      if (note->namesz == 6
+          && strcmp (note->namedata, "LINUX") == 0)
+        return elfcore_grok_s390_timer (abfd, note);
+      else
+        return TRUE;
+
+    case NT_S390_TODCMP:
+      if (note->namesz == 6
+          && strcmp (note->namedata, "LINUX") == 0)
+        return elfcore_grok_s390_todcmp (abfd, note);
+      else
+        return TRUE;
+
+    case NT_S390_TODPREG:
+      if (note->namesz == 6
+          && strcmp (note->namedata, "LINUX") == 0)
+        return elfcore_grok_s390_todpreg (abfd, note);
+      else
+        return TRUE;
+
+    case NT_S390_CTRS:
+      if (note->namesz == 6
+          && strcmp (note->namedata, "LINUX") == 0)
+        return elfcore_grok_s390_ctrs (abfd, note);
+      else
+        return TRUE;
+
+    case NT_S390_PREFIX:
+      if (note->namesz == 6
+          && strcmp (note->namedata, "LINUX") == 0)
+        return elfcore_grok_s390_prefix (abfd, note);
+      else
+        return TRUE;
+
+    case NT_ARM_VFP:
+      if (note->namesz == 6
+	  && strcmp (note->namedata, "LINUX") == 0)
+	return elfcore_grok_arm_vfp (abfd, note);
+      else
+	return TRUE;
+
+    case NT_PRPSINFO:
+    case NT_PSINFO:
+      if (bed->elf_backend_grok_psinfo)
+	if ((*bed->elf_backend_grok_psinfo) (abfd, note))
+	  return TRUE;
+#if defined (HAVE_PRPSINFO_T) || defined (HAVE_PSINFO_T)
+      return elfcore_grok_psinfo (abfd, note);
+#else
+      return TRUE;
+#endif
+
+    case NT_AUXV:
+      {
+	asection *sect = bfd_make_section_anyway_with_flags (abfd, ".auxv",
+							     SEC_HAS_CONTENTS);
+
+	if (sect == NULL)
+	  return FALSE;
+	sect->size = note->descsz;
+	sect->filepos = note->descpos;
+	sect->alignment_power = 1 + bfd_get_arch_size (abfd) / 32;
+
+	return TRUE;
+      }
+    }
+}
+
+static bfd_boolean
+elfobj_grok_gnu_build_id (bfd *abfd, Elf_Internal_Note *note)
+{
+  elf_tdata (abfd)->build_id_size = note->descsz;
+  elf_tdata (abfd)->build_id = (bfd_byte *) bfd_alloc (abfd, note->descsz);
+  if (elf_tdata (abfd)->build_id == NULL)
+    return FALSE;
+
+  memcpy (elf_tdata (abfd)->build_id, note->descdata, note->descsz);
+
+  return TRUE;
+}
+
+static bfd_boolean
+elfobj_grok_gnu_note (bfd *abfd, Elf_Internal_Note *note)
+{
+  switch (note->type)
+    {
+    default:
+      return TRUE;
+
+    case NT_GNU_BUILD_ID:
+      return elfobj_grok_gnu_build_id (abfd, note);
+    }
+}
+
+static bfd_boolean
+elfobj_grok_stapsdt_note_1 (bfd *abfd, Elf_Internal_Note *note)
+{
+  struct sdt_note *cur =
+    (struct sdt_note *) bfd_alloc (abfd, sizeof (struct sdt_note)
+				   + note->descsz);
+
+  cur->next = (struct sdt_note *) (elf_tdata (abfd))->sdt_note_head;
+  cur->size = (bfd_size_type) note->descsz;
+  memcpy (cur->data, note->descdata, note->descsz);
+
+  elf_tdata (abfd)->sdt_note_head = cur;
+
+  return TRUE;
+}
+
+static bfd_boolean
+elfobj_grok_stapsdt_note (bfd *abfd, Elf_Internal_Note *note)
+{
+  switch (note->type)
+    {
+    case NT_STAPSDT:
+      return elfobj_grok_stapsdt_note_1 (abfd, note);
+
+    default:
+      return TRUE;
+    }
+}
+
+static bfd_boolean
+elfcore_netbsd_get_lwpid (Elf_Internal_Note *note, int *lwpidp)
+{
+  char *cp;
+
+  cp = strchr (note->namedata, '@');
+  if (cp != NULL)
+    {
+      *lwpidp = atoi(cp + 1);
+      return TRUE;
+    }
+  return FALSE;
+}
+
+static bfd_boolean
+elfcore_grok_netbsd_procinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  /* Signal number at offset 0x08. */
+  elf_tdata (abfd)->core_signal
+    = bfd_h_get_32 (abfd, (bfd_byte *) note->descdata + 0x08);
+
+  /* Process ID at offset 0x50. */
+  elf_tdata (abfd)->core_pid
+    = bfd_h_get_32 (abfd, (bfd_byte *) note->descdata + 0x50);
+
+  /* Command name at 0x7c (max 32 bytes, including nul). */
+  elf_tdata (abfd)->core_command
+    = _bfd_elfcore_strndup (abfd, note->descdata + 0x7c, 31);
+
+  return elfcore_make_note_pseudosection (abfd, ".note.netbsdcore.procinfo",
+					  note);
+}
+
+static bfd_boolean
+elfcore_grok_netbsd_note (bfd *abfd, Elf_Internal_Note *note)
+{
+  int lwp;
+
+  if (elfcore_netbsd_get_lwpid (note, &lwp))
+    elf_tdata (abfd)->core_lwpid = lwp;
+
+  if (note->type == NT_NETBSDCORE_PROCINFO)
+    {
+      /* NetBSD-specific core "procinfo".  Note that we expect to
+	 find this note before any of the others, which is fine,
+	 since the kernel writes this note out first when it
+	 creates a core file.  */
+
+      return elfcore_grok_netbsd_procinfo (abfd, note);
+    }
+
+  /* As of Jan 2002 there are no other machine-independent notes
+     defined for NetBSD core files.  If the note type is less
+     than the start of the machine-dependent note types, we don't
+     understand it.  */
+
+  if (note->type < NT_NETBSDCORE_FIRSTMACH)
+    return TRUE;
+
+
+  switch (bfd_get_arch (abfd))
+    {
+      /* On the Alpha, SPARC (32-bit and 64-bit), PT_GETREGS == mach+0 and
+	 PT_GETFPREGS == mach+2.  */
+
+    case bfd_arch_alpha:
+    case bfd_arch_sparc:
+      switch (note->type)
+	{
+	case NT_NETBSDCORE_FIRSTMACH+0:
+	  return elfcore_make_note_pseudosection (abfd, ".reg", note);
+
+	case NT_NETBSDCORE_FIRSTMACH+2:
+	  return elfcore_make_note_pseudosection (abfd, ".reg2", note);
+
+	default:
+	  return TRUE;
+	}
+
+      /* On all other arch's, PT_GETREGS == mach+1 and
+	 PT_GETFPREGS == mach+3.  */
+
+    default:
+      switch (note->type)
+	{
+	case NT_NETBSDCORE_FIRSTMACH+1:
+	  return elfcore_make_note_pseudosection (abfd, ".reg", note);
+
+	case NT_NETBSDCORE_FIRSTMACH+3:
+	  return elfcore_make_note_pseudosection (abfd, ".reg2", note);
+
+	default:
+	  return TRUE;
+	}
+    }
+    /* NOTREACHED */
+}
+
+static bfd_boolean
+elfcore_grok_openbsd_procinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  /* Signal number at offset 0x08. */
+  elf_tdata (abfd)->core_signal
+    = bfd_h_get_32 (abfd, (bfd_byte *) note->descdata + 0x08);
+
+  /* Process ID at offset 0x20. */
+  elf_tdata (abfd)->core_pid
+    = bfd_h_get_32 (abfd, (bfd_byte *) note->descdata + 0x20);
+
+  /* Command name at 0x48 (max 32 bytes, including nul). */
+  elf_tdata (abfd)->core_command
+    = _bfd_elfcore_strndup (abfd, note->descdata + 0x48, 31);
+
+  return TRUE;
+}
+
+static bfd_boolean
+elfcore_grok_openbsd_note (bfd *abfd, Elf_Internal_Note *note)
+{
+  if (note->type == NT_OPENBSD_PROCINFO)
+    return elfcore_grok_openbsd_procinfo (abfd, note);
+
+  if (note->type == NT_OPENBSD_REGS)
+    return elfcore_make_note_pseudosection (abfd, ".reg", note);
+
+  if (note->type == NT_OPENBSD_FPREGS)
+    return elfcore_make_note_pseudosection (abfd, ".reg2", note);
+
+  if (note->type == NT_OPENBSD_XFPREGS)
+    return elfcore_make_note_pseudosection (abfd, ".reg-xfp", note);
+
+  if (note->type == NT_OPENBSD_AUXV)
+    {
+      asection *sect = bfd_make_section_anyway_with_flags (abfd, ".auxv",
+							   SEC_HAS_CONTENTS);
+
+      if (sect == NULL)
+	return FALSE;
+      sect->size = note->descsz;
+      sect->filepos = note->descpos;
+      sect->alignment_power = 1 + bfd_get_arch_size (abfd) / 32;
+
+      return TRUE;
+    }
+
+  if (note->type == NT_OPENBSD_WCOOKIE)
+    {
+      asection *sect = bfd_make_section_anyway_with_flags (abfd, ".wcookie",
+							   SEC_HAS_CONTENTS);
+
+      if (sect == NULL)
+	return FALSE;
+      sect->size = note->descsz;
+      sect->filepos = note->descpos;
+      sect->alignment_power = 1 + bfd_get_arch_size (abfd) / 32;
+
+      return TRUE;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+elfcore_grok_nto_status (bfd *abfd, Elf_Internal_Note *note, long *tid)
+{
+  void *ddata = note->descdata;
+  char buf[100];
+  char *name;
+  asection *sect;
+  short sig;
+  unsigned flags;
+
+  /* nto_procfs_status 'pid' field is at offset 0.  */
+  elf_tdata (abfd)->core_pid = bfd_get_32 (abfd, (bfd_byte *) ddata);
+
+  /* nto_procfs_status 'tid' field is at offset 4.  Pass it back.  */
+  *tid = bfd_get_32 (abfd, (bfd_byte *) ddata + 4);
+
+  /* nto_procfs_status 'flags' field is at offset 8.  */
+  flags = bfd_get_32 (abfd, (bfd_byte *) ddata + 8);
+
+  /* nto_procfs_status 'what' field is at offset 14.  */
+  if ((sig = bfd_get_16 (abfd, (bfd_byte *) ddata + 14)) > 0)
+    {
+      elf_tdata (abfd)->core_signal = sig;
+      elf_tdata (abfd)->core_lwpid = *tid;
+    }
+
+  /* _DEBUG_FLAG_CURTID (current thread) is 0x80.  Some cores
+     do not come from signals so we make sure we set the current
+     thread just in case.  */
+  if (flags & 0x00000080)
+    elf_tdata (abfd)->core_lwpid = *tid;
+
+  /* Make a ".qnx_core_status/%d" section.  */
+  sprintf (buf, ".qnx_core_status/%ld", *tid);
+
+  name = (char *) bfd_alloc (abfd, strlen (buf) + 1);
+  if (name == NULL)
+    return FALSE;
+  strcpy (name, buf);
+
+  sect = bfd_make_section_anyway_with_flags (abfd, name, SEC_HAS_CONTENTS);
+  if (sect == NULL)
+    return FALSE;
+
+  sect->size            = note->descsz;
+  sect->filepos         = note->descpos;
+  sect->alignment_power = 2;
+
+  return (elfcore_maybe_make_sect (abfd, ".qnx_core_status", sect));
+}
+
+static bfd_boolean
+elfcore_grok_nto_regs (bfd *abfd,
+		       Elf_Internal_Note *note,
+		       long tid,
+		       char *base)
+{
+  char buf[100];
+  char *name;
+  asection *sect;
+
+  /* Make a "(base)/%d" section.  */
+  sprintf (buf, "%s/%ld", base, tid);
+
+  name = (char *) bfd_alloc (abfd, strlen (buf) + 1);
+  if (name == NULL)
+    return FALSE;
+  strcpy (name, buf);
+
+  sect = bfd_make_section_anyway_with_flags (abfd, name, SEC_HAS_CONTENTS);
+  if (sect == NULL)
+    return FALSE;
+
+  sect->size            = note->descsz;
+  sect->filepos         = note->descpos;
+  sect->alignment_power = 2;
+
+  /* This is the current thread.  */
+  if (elf_tdata (abfd)->core_lwpid == tid)
+    return elfcore_maybe_make_sect (abfd, base, sect);
+
+  return TRUE;
+}
+
+#define BFD_QNT_CORE_INFO	7
+#define BFD_QNT_CORE_STATUS	8
+#define BFD_QNT_CORE_GREG	9
+#define BFD_QNT_CORE_FPREG	10
+
+static bfd_boolean
+elfcore_grok_nto_note (bfd *abfd, Elf_Internal_Note *note)
+{
+  /* Every GREG section has a STATUS section before it.  Store the
+     tid from the previous call to pass down to the next gregs
+     function.  */
+  static long tid = 1;
+
+  switch (note->type)
+    {
+    case BFD_QNT_CORE_INFO:
+      return elfcore_make_note_pseudosection (abfd, ".qnx_core_info", note);
+    case BFD_QNT_CORE_STATUS:
+      return elfcore_grok_nto_status (abfd, note, &tid);
+    case BFD_QNT_CORE_GREG:
+      return elfcore_grok_nto_regs (abfd, note, tid, ".reg");
+    case BFD_QNT_CORE_FPREG:
+      return elfcore_grok_nto_regs (abfd, note, tid, ".reg2");
+    default:
+      return TRUE;
+    }
+}
+
+static bfd_boolean
+elfcore_grok_spu_note (bfd *abfd, Elf_Internal_Note *note)
+{
+  char *name;
+  asection *sect;
+  size_t len;
+
+  /* Use note name as section name.  */
+  len = note->namesz;
+  name = (char *) bfd_alloc (abfd, len);
+  if (name == NULL)
+    return FALSE;
+  memcpy (name, note->namedata, len);
+  name[len - 1] = '\0';
+
+  sect = bfd_make_section_anyway_with_flags (abfd, name, SEC_HAS_CONTENTS);
+  if (sect == NULL)
+    return FALSE;
+
+  sect->size            = note->descsz;
+  sect->filepos         = note->descpos;
+  sect->alignment_power = 1;
+
+  return TRUE;
+}
+
+/* Function: elfcore_write_note
+
+   Inputs:
+     buffer to hold note, and current size of buffer
+     name of note
+     type of note
+     data for note
+     size of data for note
+
+   Writes note to end of buffer.  ELF64 notes are written exactly as
+   for ELF32, despite the current (as of 2006) ELF gabi specifying
+   that they ought to have 8-byte namesz and descsz field, and have
+   8-byte alignment.  Other writers, eg. Linux kernel, do the same.
+
+   Return:
+   Pointer to realloc'd buffer, *BUFSIZ updated.  */
+
+char *
+elfcore_write_note (bfd *abfd,
+		    char *buf,
+		    int *bufsiz,
+		    const char *name,
+		    int type,
+		    const void *input,
+		    int size)
+{
+  Elf_External_Note *xnp;
+  size_t namesz;
+  size_t newspace;
+  char *dest;
+
+  namesz = 0;
+  if (name != NULL)
+    namesz = strlen (name) + 1;
+
+  newspace = 12 + ((namesz + 3) & -4) + ((size + 3) & -4);
+
+  buf = (char *) realloc (buf, *bufsiz + newspace);
+  if (buf == NULL)
+    return buf;
+  dest = buf + *bufsiz;
+  *bufsiz += newspace;
+  xnp = (Elf_External_Note *) dest;
+  H_PUT_32 (abfd, namesz, xnp->namesz);
+  H_PUT_32 (abfd, size, xnp->descsz);
+  H_PUT_32 (abfd, type, xnp->type);
+  dest = xnp->name;
+  if (name != NULL)
+    {
+      memcpy (dest, name, namesz);
+      dest += namesz;
+      while (namesz & 3)
+	{
+	  *dest++ = '\0';
+	  ++namesz;
+	}
+    }
+  memcpy (dest, input, size);
+  dest += size;
+  while (size & 3)
+    {
+      *dest++ = '\0';
+      ++size;
+    }
+  return buf;
+}
+
+#if defined (HAVE_PRPSINFO_T) || defined (HAVE_PSINFO_T)
+char *
+elfcore_write_prpsinfo (bfd  *abfd,
+			char *buf,
+			int  *bufsiz,
+			const char *fname,
+			const char *psargs)
+{
+  const char *note_name = "CORE";
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+
+  if (bed->elf_backend_write_core_note != NULL)
+    {
+      char *ret;
+      ret = (*bed->elf_backend_write_core_note) (abfd, buf, bufsiz,
+						 NT_PRPSINFO, fname, psargs);
+      if (ret != NULL)
+	return ret;
+    }
+
+#if defined (HAVE_PRPSINFO32_T) || defined (HAVE_PSINFO32_T)
+  if (bed->s->elfclass == ELFCLASS32)
+    {
+#if defined (HAVE_PSINFO32_T)
+      psinfo32_t data;
+      int note_type = NT_PSINFO;
+#else
+      prpsinfo32_t data;
+      int note_type = NT_PRPSINFO;
+#endif
+
+      memset (&data, 0, sizeof (data));
+      strncpy (data.pr_fname, fname, sizeof (data.pr_fname));
+      strncpy (data.pr_psargs, psargs, sizeof (data.pr_psargs));
+      return elfcore_write_note (abfd, buf, bufsiz,
+				 note_name, note_type, &data, sizeof (data));
+    }
+  else
+#endif
+    {
+#if defined (HAVE_PSINFO_T)
+      psinfo_t data;
+      int note_type = NT_PSINFO;
+#else
+      prpsinfo_t data;
+      int note_type = NT_PRPSINFO;
+#endif
+
+      memset (&data, 0, sizeof (data));
+      strncpy (data.pr_fname, fname, sizeof (data.pr_fname));
+      strncpy (data.pr_psargs, psargs, sizeof (data.pr_psargs));
+      return elfcore_write_note (abfd, buf, bufsiz,
+				 note_name, note_type, &data, sizeof (data));
+    }
+}
+#endif	/* PSINFO_T or PRPSINFO_T */
+
+#if defined (HAVE_PRSTATUS_T)
+char *
+elfcore_write_prstatus (bfd *abfd,
+			char *buf,
+			int *bufsiz,
+			long pid,
+			int cursig,
+			const void *gregs)
+{
+  const char *note_name = "CORE";
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+
+  if (bed->elf_backend_write_core_note != NULL)
+    {
+      char *ret;
+      ret = (*bed->elf_backend_write_core_note) (abfd, buf, bufsiz,
+						 NT_PRSTATUS,
+						 pid, cursig, gregs);
+      if (ret != NULL)
+	return ret;
+    }
+
+#if defined (HAVE_PRSTATUS32_T)
+  if (bed->s->elfclass == ELFCLASS32)
+    {
+      prstatus32_t prstat;
+
+      memset (&prstat, 0, sizeof (prstat));
+      prstat.pr_pid = pid;
+      prstat.pr_cursig = cursig;
+      memcpy (&prstat.pr_reg, gregs, sizeof (prstat.pr_reg));
+      return elfcore_write_note (abfd, buf, bufsiz, note_name,
+				 NT_PRSTATUS, &prstat, sizeof (prstat));
+    }
+  else
+#endif
+    {
+      prstatus_t prstat;
+
+      memset (&prstat, 0, sizeof (prstat));
+      prstat.pr_pid = pid;
+      prstat.pr_cursig = cursig;
+      memcpy (&prstat.pr_reg, gregs, sizeof (prstat.pr_reg));
+      return elfcore_write_note (abfd, buf, bufsiz, note_name,
+				 NT_PRSTATUS, &prstat, sizeof (prstat));
+    }
+}
+#endif /* HAVE_PRSTATUS_T */
+
+#if defined (HAVE_LWPSTATUS_T)
+char *
+elfcore_write_lwpstatus (bfd *abfd,
+			 char *buf,
+			 int *bufsiz,
+			 long pid,
+			 int cursig,
+			 const void *gregs)
+{
+  lwpstatus_t lwpstat;
+  const char *note_name = "CORE";
+
+  memset (&lwpstat, 0, sizeof (lwpstat));
+  lwpstat.pr_lwpid  = pid >> 16;
+  lwpstat.pr_cursig = cursig;
+#if defined (HAVE_LWPSTATUS_T_PR_REG)
+  memcpy (lwpstat.pr_reg, gregs, sizeof (lwpstat.pr_reg));
+#elif defined (HAVE_LWPSTATUS_T_PR_CONTEXT)
+#if !defined(gregs)
+  memcpy (lwpstat.pr_context.uc_mcontext.gregs,
+	  gregs, sizeof (lwpstat.pr_context.uc_mcontext.gregs));
+#else
+  memcpy (lwpstat.pr_context.uc_mcontext.__gregs,
+	  gregs, sizeof (lwpstat.pr_context.uc_mcontext.__gregs));
+#endif
+#endif
+  return elfcore_write_note (abfd, buf, bufsiz, note_name,
+			     NT_LWPSTATUS, &lwpstat, sizeof (lwpstat));
+}
+#endif /* HAVE_LWPSTATUS_T */
+
+#if defined (HAVE_PSTATUS_T)
+char *
+elfcore_write_pstatus (bfd *abfd,
+		       char *buf,
+		       int *bufsiz,
+		       long pid,
+		       int cursig ATTRIBUTE_UNUSED,
+		       const void *gregs ATTRIBUTE_UNUSED)
+{
+  const char *note_name = "CORE";
+#if defined (HAVE_PSTATUS32_T)
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+
+  if (bed->s->elfclass == ELFCLASS32)
+    {
+      pstatus32_t pstat;
+
+      memset (&pstat, 0, sizeof (pstat));
+      pstat.pr_pid = pid & 0xffff;
+      buf = elfcore_write_note (abfd, buf, bufsiz, note_name,
+				NT_PSTATUS, &pstat, sizeof (pstat));
+      return buf;
+    }
+  else
+#endif
+    {
+      pstatus_t pstat;
+
+      memset (&pstat, 0, sizeof (pstat));
+      pstat.pr_pid = pid & 0xffff;
+      buf = elfcore_write_note (abfd, buf, bufsiz, note_name,
+				NT_PSTATUS, &pstat, sizeof (pstat));
+      return buf;
+    }
+}
+#endif /* HAVE_PSTATUS_T */
+
+char *
+elfcore_write_prfpreg (bfd *abfd,
+		       char *buf,
+		       int *bufsiz,
+		       const void *fpregs,
+		       int size)
+{
+  const char *note_name = "CORE";
+  return elfcore_write_note (abfd, buf, bufsiz,
+			     note_name, NT_FPREGSET, fpregs, size);
+}
+
+char *
+elfcore_write_prxfpreg (bfd *abfd,
+			char *buf,
+			int *bufsiz,
+			const void *xfpregs,
+			int size)
+{
+  char *note_name = "LINUX";
+  return elfcore_write_note (abfd, buf, bufsiz,
+			     note_name, NT_PRXFPREG, xfpregs, size);
+}
+
+char *
+elfcore_write_xstatereg (bfd *abfd, char *buf, int *bufsiz,
+			 const void *xfpregs, int size)
+{
+  char *note_name = "LINUX";
+  return elfcore_write_note (abfd, buf, bufsiz,
+			     note_name, NT_X86_XSTATE, xfpregs, size);
+}
+
+char *
+elfcore_write_ppc_vmx (bfd *abfd,
+		       char *buf,
+		       int *bufsiz,
+		       const void *ppc_vmx,
+		       int size)
+{
+  char *note_name = "LINUX";
+  return elfcore_write_note (abfd, buf, bufsiz,
+			     note_name, NT_PPC_VMX, ppc_vmx, size);
+}
+
+char *
+elfcore_write_ppc_vsx (bfd *abfd,
+                       char *buf,
+                       int *bufsiz,
+                       const void *ppc_vsx,
+                       int size)
+{
+  char *note_name = "LINUX";
+  return elfcore_write_note (abfd, buf, bufsiz,
+                             note_name, NT_PPC_VSX, ppc_vsx, size);
+}
+
+static char *
+elfcore_write_s390_high_gprs (bfd *abfd,
+			      char *buf,
+			      int *bufsiz,
+			      const void *s390_high_gprs,
+			      int size)
+{
+  char *note_name = "LINUX";
+  return elfcore_write_note (abfd, buf, bufsiz,
+                             note_name, NT_S390_HIGH_GPRS,
+			     s390_high_gprs, size);
+}
+
+char *
+elfcore_write_s390_timer (bfd *abfd,
+                          char *buf,
+                          int *bufsiz,
+                          const void *s390_timer,
+                          int size)
+{
+  char *note_name = "LINUX";
+  return elfcore_write_note (abfd, buf, bufsiz,
+                             note_name, NT_S390_TIMER, s390_timer, size);
+}
+
+char *
+elfcore_write_s390_todcmp (bfd *abfd,
+                           char *buf,
+                           int *bufsiz,
+                           const void *s390_todcmp,
+                           int size)
+{
+  char *note_name = "LINUX";
+  return elfcore_write_note (abfd, buf, bufsiz,
+                             note_name, NT_S390_TODCMP, s390_todcmp, size);
+}
+
+char *
+elfcore_write_s390_todpreg (bfd *abfd,
+                            char *buf,
+                            int *bufsiz,
+                            const void *s390_todpreg,
+                            int size)
+{
+  char *note_name = "LINUX";
+  return elfcore_write_note (abfd, buf, bufsiz,
+                             note_name, NT_S390_TODPREG, s390_todpreg, size);
+}
+
+char *
+elfcore_write_s390_ctrs (bfd *abfd,
+                         char *buf,
+                         int *bufsiz,
+                         const void *s390_ctrs,
+                         int size)
+{
+  char *note_name = "LINUX";
+  return elfcore_write_note (abfd, buf, bufsiz,
+                             note_name, NT_S390_CTRS, s390_ctrs, size);
+}
+
+char *
+elfcore_write_s390_prefix (bfd *abfd,
+                           char *buf,
+                           int *bufsiz,
+                           const void *s390_prefix,
+                           int size)
+{
+  char *note_name = "LINUX";
+  return elfcore_write_note (abfd, buf, bufsiz,
+                             note_name, NT_S390_PREFIX, s390_prefix, size);
+}
+
+char *
+elfcore_write_arm_vfp (bfd *abfd,
+		       char *buf,
+		       int *bufsiz,
+		       const void *arm_vfp,
+		       int size)
+{
+  char *note_name = "LINUX";
+  return elfcore_write_note (abfd, buf, bufsiz,
+			     note_name, NT_ARM_VFP, arm_vfp, size);
+}
+
+char *
+elfcore_write_register_note (bfd *abfd,
+			     char *buf,
+			     int *bufsiz,
+			     const char *section,
+			     const void *data,
+			     int size)
+{
+  if (strcmp (section, ".reg2") == 0)
+    return elfcore_write_prfpreg (abfd, buf, bufsiz, data, size);
+  if (strcmp (section, ".reg-xfp") == 0)
+    return elfcore_write_prxfpreg (abfd, buf, bufsiz, data, size);
+  if (strcmp (section, ".reg-xstate") == 0)
+    return elfcore_write_xstatereg (abfd, buf, bufsiz, data, size);
+  if (strcmp (section, ".reg-ppc-vmx") == 0)
+    return elfcore_write_ppc_vmx (abfd, buf, bufsiz, data, size);
+  if (strcmp (section, ".reg-ppc-vsx") == 0)
+    return elfcore_write_ppc_vsx (abfd, buf, bufsiz, data, size);
+  if (strcmp (section, ".reg-s390-high-gprs") == 0)
+    return elfcore_write_s390_high_gprs (abfd, buf, bufsiz, data, size);
+  if (strcmp (section, ".reg-s390-timer") == 0)
+    return elfcore_write_s390_timer (abfd, buf, bufsiz, data, size);
+  if (strcmp (section, ".reg-s390-todcmp") == 0)
+    return elfcore_write_s390_todcmp (abfd, buf, bufsiz, data, size);
+  if (strcmp (section, ".reg-s390-todpreg") == 0)
+    return elfcore_write_s390_todpreg (abfd, buf, bufsiz, data, size);
+  if (strcmp (section, ".reg-s390-ctrs") == 0)
+    return elfcore_write_s390_ctrs (abfd, buf, bufsiz, data, size);
+  if (strcmp (section, ".reg-s390-prefix") == 0)
+    return elfcore_write_s390_prefix (abfd, buf, bufsiz, data, size);
+  if (strcmp (section, ".reg-arm-vfp") == 0)
+    return elfcore_write_arm_vfp (abfd, buf, bufsiz, data, size);
+  return NULL;
+}
+
+static bfd_boolean
+elf_parse_notes (bfd *abfd, char *buf, size_t size, file_ptr offset)
+{
+  char *p;
+
+  p = buf;
+  while (p < buf + size)
+    {
+      /* FIXME: bad alignment assumption.  */
+      Elf_External_Note *xnp = (Elf_External_Note *) p;
+      Elf_Internal_Note in;
+
+      if (offsetof (Elf_External_Note, name) > buf - p + size)
+	return FALSE;
+
+      in.type = H_GET_32 (abfd, xnp->type);
+
+      in.namesz = H_GET_32 (abfd, xnp->namesz);
+      in.namedata = xnp->name;
+      if (in.namesz > buf - in.namedata + size)
+	return FALSE;
+
+      in.descsz = H_GET_32 (abfd, xnp->descsz);
+      in.descdata = in.namedata + BFD_ALIGN (in.namesz, 4);
+      in.descpos = offset + (in.descdata - buf);
+      if (in.descsz != 0
+	  && (in.descdata >= buf + size
+	      || in.descsz > buf - in.descdata + size))
+	return FALSE;
+
+      switch (bfd_get_format (abfd))
+        {
+	default:
+	  return TRUE;
+
+	case bfd_core:
+	  if (CONST_STRNEQ (in.namedata, "NetBSD-CORE"))
+	    {
+	      if (! elfcore_grok_netbsd_note (abfd, &in))
+		return FALSE;
+	    }
+	  else if (CONST_STRNEQ (in.namedata, "OpenBSD"))
+	    {
+	      if (! elfcore_grok_openbsd_note (abfd, &in))
+		return FALSE;
+	    }
+	  else if (CONST_STRNEQ (in.namedata, "QNX"))
+	    {
+	      if (! elfcore_grok_nto_note (abfd, &in))
+		return FALSE;
+	    }
+	  else if (CONST_STRNEQ (in.namedata, "SPU/"))
+	    {
+	      if (! elfcore_grok_spu_note (abfd, &in))
+		return FALSE;
+	    }
+	  else
+	    {
+	      if (! elfcore_grok_note (abfd, &in))
+		return FALSE;
+	    }
+	  break;
+
+	case bfd_object:
+	  if (in.namesz == sizeof "GNU" && strcmp (in.namedata, "GNU") == 0)
+	    {
+	      if (! elfobj_grok_gnu_note (abfd, &in))
+		return FALSE;
+	    }
+	  else if (in.namesz == sizeof "stapsdt"
+		   && strcmp (in.namedata, "stapsdt") == 0)
+	    {
+	      if (! elfobj_grok_stapsdt_note (abfd, &in))
+		return FALSE;
+	    }
+	  break;
+	}
+
+      p = in.descdata + BFD_ALIGN (in.descsz, 4);
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf_read_notes (bfd *abfd, file_ptr offset, bfd_size_type size)
+{
+  char *buf;
+
+  if (size <= 0)
+    return TRUE;
+
+  if (bfd_seek (abfd, offset, SEEK_SET) != 0)
+    return FALSE;
+
+  buf = (char *) bfd_malloc (size);
+  if (buf == NULL)
+    return FALSE;
+
+  if (bfd_bread (buf, size, abfd) != size
+      || !elf_parse_notes (abfd, buf, size, offset))
+    {
+      free (buf);
+      return FALSE;
+    }
+
+  free (buf);
+  return TRUE;
+}
+
+/* Providing external access to the ELF program header table.  */
+
+/* Return an upper bound on the number of bytes required to store a
+   copy of ABFD's program header table entries.  Return -1 if an error
+   occurs; bfd_get_error will return an appropriate code.  */
+
+long
+bfd_get_elf_phdr_upper_bound (bfd *abfd)
+{
+  if (abfd->xvec->flavour != bfd_target_elf_flavour)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return -1;
+    }
+
+  return elf_elfheader (abfd)->e_phnum * sizeof (Elf_Internal_Phdr);
+}
+
+/* Copy ABFD's program header table entries to *PHDRS.  The entries
+   will be stored as an array of Elf_Internal_Phdr structures, as
+   defined in include/elf/internal.h.  To find out how large the
+   buffer needs to be, call bfd_get_elf_phdr_upper_bound.
+
+   Return the number of program header table entries read, or -1 if an
+   error occurs; bfd_get_error will return an appropriate code.  */
+
+int
+bfd_get_elf_phdrs (bfd *abfd, void *phdrs)
+{
+  int num_phdrs;
+
+  if (abfd->xvec->flavour != bfd_target_elf_flavour)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return -1;
+    }
+
+  num_phdrs = elf_elfheader (abfd)->e_phnum;
+  memcpy (phdrs, elf_tdata (abfd)->phdr,
+	  num_phdrs * sizeof (Elf_Internal_Phdr));
+
+  return num_phdrs;
+}
+
+enum elf_reloc_type_class
+_bfd_elf_reloc_type_class (const Elf_Internal_Rela *rela ATTRIBUTE_UNUSED)
+{
+  return reloc_class_normal;
+}
+
+/* For RELA architectures, return the relocation value for a
+   relocation against a local symbol.  */
+
+bfd_vma
+_bfd_elf_rela_local_sym (bfd *abfd,
+			 Elf_Internal_Sym *sym,
+			 asection **psec,
+			 Elf_Internal_Rela *rel)
+{
+  asection *sec = *psec;
+  bfd_vma relocation;
+
+  relocation = (sec->output_section->vma
+		+ sec->output_offset
+		+ sym->st_value);
+  if ((sec->flags & SEC_MERGE)
+      && ELF_ST_TYPE (sym->st_info) == STT_SECTION
+      && sec->sec_info_type == ELF_INFO_TYPE_MERGE)
+    {
+      rel->r_addend =
+	_bfd_merged_section_offset (abfd, psec,
+				    elf_section_data (sec)->sec_info,
+				    sym->st_value + rel->r_addend);
+      if (sec != *psec)
+	{
+	  /* If we have changed the section, and our original section is
+	     marked with SEC_EXCLUDE, it means that the original
+	     SEC_MERGE section has been completely subsumed in some
+	     other SEC_MERGE section.  In this case, we need to leave
+	     some info around for --emit-relocs.  */
+	  if ((sec->flags & SEC_EXCLUDE) != 0)
+	    sec->kept_section = *psec;
+	  sec = *psec;
+	}
+      rel->r_addend -= relocation;
+      rel->r_addend += sec->output_section->vma + sec->output_offset;
+    }
+  return relocation;
+}
+
+bfd_vma
+_bfd_elf_rel_local_sym (bfd *abfd,
+			Elf_Internal_Sym *sym,
+			asection **psec,
+			bfd_vma addend)
+{
+  asection *sec = *psec;
+
+  if (sec->sec_info_type != ELF_INFO_TYPE_MERGE)
+    return sym->st_value + addend;
+
+  return _bfd_merged_section_offset (abfd, psec,
+				     elf_section_data (sec)->sec_info,
+				     sym->st_value + addend);
+}
+
+bfd_vma
+_bfd_elf_section_offset (bfd *abfd,
+			 struct bfd_link_info *info,
+			 asection *sec,
+			 bfd_vma offset)
+{
+  switch (sec->sec_info_type)
+    {
+    case ELF_INFO_TYPE_STABS:
+      return _bfd_stab_section_offset (sec, elf_section_data (sec)->sec_info,
+				       offset);
+    case ELF_INFO_TYPE_EH_FRAME:
+      return _bfd_elf_eh_frame_section_offset (abfd, info, sec, offset);
+    default:
+      if ((sec->flags & SEC_ELF_REVERSE_COPY) != 0)
+	{
+	  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+	  bfd_size_type address_size = bed->s->arch_size / 8;
+	  offset = sec->size - offset - address_size;
+	}
+      return offset;
+    }
+}
+
+/* Create a new BFD as if by bfd_openr.  Rather than opening a file,
+   reconstruct an ELF file by reading the segments out of remote memory
+   based on the ELF file header at EHDR_VMA and the ELF program headers it
+   points to.  If not null, *LOADBASEP is filled in with the difference
+   between the VMAs from which the segments were read, and the VMAs the
+   file headers (and hence BFD's idea of each section's VMA) put them at.
+
+   The function TARGET_READ_MEMORY is called to copy LEN bytes from the
+   remote memory at target address VMA into the local buffer at MYADDR; it
+   should return zero on success or an `errno' code on failure.  TEMPL must
+   be a BFD for an ELF target with the word size and byte order found in
+   the remote memory.  */
+
+bfd *
+bfd_elf_bfd_from_remote_memory
+  (bfd *templ,
+   bfd_vma ehdr_vma,
+   bfd_vma *loadbasep,
+   int (*target_read_memory) (bfd_vma, bfd_byte *, int))
+{
+  return (*get_elf_backend_data (templ)->elf_backend_bfd_from_remote_memory)
+    (templ, ehdr_vma, loadbasep, target_read_memory);
+}
+
+long
+_bfd_elf_get_synthetic_symtab (bfd *abfd,
+			       long symcount ATTRIBUTE_UNUSED,
+			       asymbol **syms ATTRIBUTE_UNUSED,
+			       long dynsymcount,
+			       asymbol **dynsyms,
+			       asymbol **ret)
+{
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  asection *relplt;
+  asymbol *s;
+  const char *relplt_name;
+  bfd_boolean (*slurp_relocs) (bfd *, asection *, asymbol **, bfd_boolean);
+  arelent *p;
+  long count, i, n;
+  size_t size;
+  Elf_Internal_Shdr *hdr;
+  char *names;
+  asection *plt;
+
+  *ret = NULL;
+
+  if ((abfd->flags & (DYNAMIC | EXEC_P)) == 0)
+    return 0;
+
+  if (dynsymcount <= 0)
+    return 0;
+
+  if (!bed->plt_sym_val)
+    return 0;
+
+  relplt_name = bed->relplt_name;
+  if (relplt_name == NULL)
+    relplt_name = bed->rela_plts_and_copies_p ? ".rela.plt" : ".rel.plt";
+  relplt = bfd_get_section_by_name (abfd, relplt_name);
+  if (relplt == NULL)
+    return 0;
+
+  hdr = &elf_section_data (relplt)->this_hdr;
+  if (hdr->sh_link != elf_dynsymtab (abfd)
+      || (hdr->sh_type != SHT_REL && hdr->sh_type != SHT_RELA))
+    return 0;
+
+  plt = bfd_get_section_by_name (abfd, ".plt");
+  if (plt == NULL)
+    return 0;
+
+  slurp_relocs = get_elf_backend_data (abfd)->s->slurp_reloc_table;
+  if (! (*slurp_relocs) (abfd, relplt, dynsyms, TRUE))
+    return -1;
+
+  count = relplt->size / hdr->sh_entsize;
+  size = count * sizeof (asymbol);
+  p = relplt->relocation;
+  for (i = 0; i < count; i++, p += bed->s->int_rels_per_ext_rel)
+    {
+      size += strlen ((*p->sym_ptr_ptr)->name) + sizeof ("@plt");
+      if (p->addend != 0)
+	{
+#ifdef BFD64
+	  size += sizeof ("+0x") - 1 + 8 + 8 * (bed->s->elfclass == ELFCLASS64);
+#else
+	  size += sizeof ("+0x") - 1 + 8;
+#endif
+	}
+    }
+
+  s = *ret = (asymbol *) bfd_malloc (size);
+  if (s == NULL)
+    return -1;
+
+  names = (char *) (s + count);
+  p = relplt->relocation;
+  n = 0;
+  for (i = 0; i < count; i++, p += bed->s->int_rels_per_ext_rel)
+    {
+      size_t len;
+      bfd_vma addr;
+
+      addr = bed->plt_sym_val (i, plt, p);
+      if (addr == (bfd_vma) -1)
+	continue;
+
+      *s = **p->sym_ptr_ptr;
+      /* Undefined syms won't have BSF_LOCAL or BSF_GLOBAL set.  Since
+	 we are defining a symbol, ensure one of them is set.  */
+      if ((s->flags & BSF_LOCAL) == 0)
+	s->flags |= BSF_GLOBAL;
+      s->flags |= BSF_SYNTHETIC;
+      s->section = plt;
+      s->value = addr - plt->vma;
+      s->name = names;
+      s->udata.p = NULL;
+      len = strlen ((*p->sym_ptr_ptr)->name);
+      memcpy (names, (*p->sym_ptr_ptr)->name, len);
+      names += len;
+      if (p->addend != 0)
+	{
+	  char buf[30], *a;
+	  
+	  memcpy (names, "+0x", sizeof ("+0x") - 1);
+	  names += sizeof ("+0x") - 1;
+	  bfd_sprintf_vma (abfd, buf, p->addend);
+	  for (a = buf; *a == '0'; ++a)
+	    ;
+	  len = strlen (a);
+	  memcpy (names, a, len);
+	  names += len;
+	}
+      memcpy (names, "@plt", sizeof ("@plt"));
+      names += sizeof ("@plt");
+      ++s, ++n;
+    }
+
+  return n;
+}
+
+/* It is only used by x86-64 so far.  */
+asection _bfd_elf_large_com_section
+  = BFD_FAKE_SECTION (_bfd_elf_large_com_section,
+		      SEC_IS_COMMON, NULL, "LARGE_COMMON", 0);
+
+void
+_bfd_elf_set_osabi (bfd * abfd,
+		    struct bfd_link_info * link_info ATTRIBUTE_UNUSED)
+{
+  Elf_Internal_Ehdr * i_ehdrp;	/* ELF file header, internal form.  */
+
+  i_ehdrp = elf_elfheader (abfd);
+
+  i_ehdrp->e_ident[EI_OSABI] = get_elf_backend_data (abfd)->elf_osabi;
+
+  /* To make things simpler for the loader on Linux systems we set the
+     osabi field to ELFOSABI_GNU if the binary contains symbols of
+     the STT_GNU_IFUNC type or STB_GNU_UNIQUE binding.  */
+  if (i_ehdrp->e_ident[EI_OSABI] == ELFOSABI_NONE
+      && elf_tdata (abfd)->has_gnu_symbols)
+    i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_GNU;
+}
+
+
+/* Return TRUE for ELF symbol types that represent functions.
+   This is the default version of this function, which is sufficient for
+   most targets.  It returns true if TYPE is STT_FUNC or STT_GNU_IFUNC.  */
+
+bfd_boolean
+_bfd_elf_is_function_type (unsigned int type)
+{
+  return (type == STT_FUNC
+	  || type == STT_GNU_IFUNC);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-am33lin.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-am33lin.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-am33lin.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-am33lin.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,105 @@
+/* Matsushita AM33/2.0 support for 32-bit GNU/Linux ELF
+   Copyright 2003, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "elf-bfd.h"
+#include "elf/mn10300.h"
+
+#define elf_symbol_leading_char 0
+
+#define TARGET_LITTLE_SYM	bfd_elf32_am33lin_vec
+#define TARGET_LITTLE_NAME	"elf32-am33lin"
+#define ELF_ARCH		bfd_arch_mn10300
+#define ELF_MACHINE_CODE	EM_MN10300
+#define ELF_MACHINE_ALT1	EM_CYGNUS_MN10300
+#define ELF_MAXPAGESIZE		0x1000
+
+/* Rename global functions.  */
+#define _bfd_mn10300_elf_merge_private_bfd_data  _bfd_am33_elf_merge_private_bfd_data
+#define _bfd_mn10300_elf_object_p                _bfd_am33_elf_object_p
+#define _bfd_mn10300_elf_final_write_processing  _bfd_am33_elf_final_write_processing
+
+/* Support for core dump NOTE sections.  */
+static bfd_boolean
+elf32_am33lin_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  int offset;
+  unsigned int size;
+
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      case 188:		/* Linux/am33 */
+	/* pr_cursig */
+	elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12);
+
+	/* pr_pid */
+	elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 24);
+
+	/* pr_reg */
+	offset = 72;
+	size = 112;
+
+	break;
+    }
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg", size,
+					  note->descpos + offset);
+}
+
+static bfd_boolean
+elf32_am33lin_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      case 124:		/* Linux/am33 elf_prpsinfo */
+	elf_tdata (abfd)->core_program
+	 = _bfd_elfcore_strndup (abfd, note->descdata + 28, 16);
+	elf_tdata (abfd)->core_command
+	 = _bfd_elfcore_strndup (abfd, note->descdata + 44, 80);
+    }
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+
+  {
+    char *command = elf_tdata (abfd)->core_command;
+    int n = strlen (command);
+
+    if (0 < n && command[n - 1] == ' ')
+      command[n - 1] = '\0';
+  }
+
+  return TRUE;
+}
+
+#define elf_backend_grok_prstatus	elf32_am33lin_grok_prstatus
+#define elf_backend_grok_psinfo		elf32_am33lin_grok_psinfo
+
+#include "elf-m10300.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-arc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-arc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-arc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-arc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,253 @@
+/* ARC-specific support for 32-bit ELF
+   Copyright 1994, 1995, 1997, 1999, 2001, 2002, 2005, 2007
+   Free Software Foundation, Inc.
+   Contributed by Doug Evans (dje@cygnus.com).
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/arc.h"
+#include "libiberty.h"
+
+/* Try to minimize the amount of space occupied by relocation tables
+   on the ROM (not that the ROM won't be swamped by other ELF overhead).  */
+
+#define USE_REL	1
+
+static bfd_reloc_status_type
+arc_elf_b22_pcrel (bfd * abfd,
+		   arelent * reloc_entry,
+		   asymbol * symbol,
+		   void * data,
+		   asection * input_section,
+		   bfd * output_bfd,
+		   char ** error_message)
+{
+  /* If linking, back up the final symbol address by the address of the
+     reloc.  This cannot be accomplished by setting the pcrel_offset
+     field to TRUE, as bfd_install_relocation will detect this and refuse
+     to install the offset in the first place, but bfd_perform_relocation
+     will still insist on removing it.  */
+  if (output_bfd == NULL)
+    reloc_entry->addend -= reloc_entry->address;
+
+  /* Fall through to the default elf reloc handler.  */
+  return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+				input_section, output_bfd, error_message);
+}
+
+static reloc_howto_type elf_arc_howto_table[] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_ARC_NONE,		/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc,	/* Special_function.  */
+	 "R_ARC_NONE",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 0,			/* Src_mask.  */
+	 0,			/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* A standard 32 bit relocation.  */
+  HOWTO (R_ARC_32,		/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc,	/* Special_function.  */
+	 "R_ARC_32",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Src_mask.  */
+	 0xffffffff,		/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* A 26 bit absolute branch, right shifted by 2.  */
+  HOWTO (R_ARC_B26,		/* Type.  */
+	 2,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 26,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc,	/* Special_function.  */
+	 "R_ARC_B26",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 0x00ffffff,		/* Src_mask.  */
+	 0x00ffffff,		/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* A relative 22 bit branch; bits 21-2 are stored in bits 26-7.  */
+  HOWTO (R_ARC_B22_PCREL,	/* Type.  */
+	 2,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 22,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 7,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 arc_elf_b22_pcrel,	/* Special_function.  */
+	 "R_ARC_B22_PCREL",	/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 0x07ffff80,		/* Src_mask.  */
+	 0x07ffff80,		/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+};
+
+/* Map BFD reloc types to ARC ELF reloc types.  */
+
+struct arc_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned char elf_reloc_val;
+};
+
+static const struct arc_reloc_map arc_reloc_map[] =
+{
+  { BFD_RELOC_NONE, R_ARC_NONE, },
+  { BFD_RELOC_32, R_ARC_32 },
+  { BFD_RELOC_CTOR, R_ARC_32 },
+  { BFD_RELOC_ARC_B26, R_ARC_B26 },
+  { BFD_RELOC_ARC_B22_PCREL, R_ARC_B22_PCREL },
+};
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = ARRAY_SIZE (arc_reloc_map); i--;)
+    if (arc_reloc_map[i].bfd_reloc_val == code)
+      return elf_arc_howto_table + arc_reloc_map[i].elf_reloc_val;
+
+  return NULL;
+}
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (elf_arc_howto_table) / sizeof (elf_arc_howto_table[0]);
+       i++)
+    if (elf_arc_howto_table[i].name != NULL
+	&& strcasecmp (elf_arc_howto_table[i].name, r_name) == 0)
+      return &elf_arc_howto_table[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for an ARC ELF reloc.  */
+
+static void
+arc_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+		       arelent *cache_ptr,
+		       Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_ARC_max);
+  cache_ptr->howto = &elf_arc_howto_table[r_type];
+}
+
+/* Set the right machine number for an ARC ELF file.  */
+
+static bfd_boolean
+arc_elf_object_p (bfd *abfd)
+{
+  unsigned int mach = bfd_mach_arc_6;
+
+  if (elf_elfheader(abfd)->e_machine == EM_ARC)
+    {
+      unsigned long arch = elf_elfheader (abfd)->e_flags & EF_ARC_MACH;
+
+      switch (arch)
+	{
+	case E_ARC_MACH_ARC5:
+	  mach = bfd_mach_arc_5;
+	  break;
+	default:
+	case E_ARC_MACH_ARC6:
+	  mach = bfd_mach_arc_6;
+	  break;
+	case E_ARC_MACH_ARC7:
+	  mach = bfd_mach_arc_7;
+	  break;
+	case E_ARC_MACH_ARC8:
+	  mach = bfd_mach_arc_8;
+	  break;
+	}
+    }
+  return bfd_default_set_arch_mach (abfd, bfd_arch_arc, mach);
+}
+
+/* The final processing done just before writing out an ARC ELF object file.
+   This gets the ARC architecture right based on the machine number.  */
+
+static void
+arc_elf_final_write_processing (bfd *abfd,
+				bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  unsigned long val;
+
+  switch (bfd_get_mach (abfd))
+    {
+    case bfd_mach_arc_5:
+      val = E_ARC_MACH_ARC5;
+      break;
+    default:
+    case bfd_mach_arc_6:
+      val = E_ARC_MACH_ARC6;
+      break;
+    case bfd_mach_arc_7:
+      val = E_ARC_MACH_ARC7;
+      break;
+    case bfd_mach_arc_8:
+      val = E_ARC_MACH_ARC8;
+      break;
+    }
+  elf_elfheader (abfd)->e_flags &=~ EF_ARC_MACH;
+  elf_elfheader (abfd)->e_flags |= val;
+}
+
+#define TARGET_LITTLE_SYM   bfd_elf32_littlearc_vec
+#define TARGET_LITTLE_NAME  "elf32-littlearc"
+#define TARGET_BIG_SYM      bfd_elf32_bigarc_vec
+#define TARGET_BIG_NAME	    "elf32-bigarc"
+#define ELF_ARCH            bfd_arch_arc
+#define ELF_MACHINE_CODE    EM_ARC
+#define ELF_MAXPAGESIZE     0x1000
+
+#define elf_info_to_howto                   0
+#define elf_info_to_howto_rel               arc_info_to_howto_rel
+#define elf_backend_object_p                arc_elf_object_p
+#define elf_backend_final_write_processing  arc_elf_final_write_processing
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-arm.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-arm.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-arm.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-arm.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,15838 @@
+/* 32-bit ELF support for ARM
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+   2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include <limits.h>
+
+#include "bfd.h"
+#include "libiberty.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf-vxworks.h"
+#include "elf/arm.h"
+
+/* Return the relocation section associated with NAME.  HTAB is the
+   bfd's elf32_arm_link_hash_entry.  */
+#define RELOC_SECTION(HTAB, NAME) \
+  ((HTAB)->use_rel ? ".rel" NAME : ".rela" NAME)
+
+/* Return size of a relocation entry.  HTAB is the bfd's
+   elf32_arm_link_hash_entry.  */
+#define RELOC_SIZE(HTAB) \
+  ((HTAB)->use_rel \
+   ? sizeof (Elf32_External_Rel) \
+   : sizeof (Elf32_External_Rela))
+
+/* Return function to swap relocations in.  HTAB is the bfd's
+   elf32_arm_link_hash_entry.  */
+#define SWAP_RELOC_IN(HTAB) \
+  ((HTAB)->use_rel \
+   ? bfd_elf32_swap_reloc_in \
+   : bfd_elf32_swap_reloca_in)
+
+/* Return function to swap relocations out.  HTAB is the bfd's
+   elf32_arm_link_hash_entry.  */
+#define SWAP_RELOC_OUT(HTAB) \
+  ((HTAB)->use_rel \
+   ? bfd_elf32_swap_reloc_out \
+   : bfd_elf32_swap_reloca_out)
+
+#define elf_info_to_howto               0
+#define elf_info_to_howto_rel           elf32_arm_info_to_howto
+
+#define ARM_ELF_ABI_VERSION		0
+#define ARM_ELF_OS_ABI_VERSION		ELFOSABI_ARM
+
+static bfd_boolean elf32_arm_write_section (bfd *output_bfd,
+					    struct bfd_link_info *link_info,
+					    asection *sec,
+					    bfd_byte *contents);
+
+/* Note: code such as elf32_arm_reloc_type_lookup expect to use e.g.
+   R_ARM_PC24 as an index into this, and find the R_ARM_PC24 HOWTO
+   in that slot.  */
+
+static reloc_howto_type elf32_arm_howto_table_1[] =
+{
+  /* No relocation.  */
+  HOWTO (R_ARM_NONE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_PC24,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_PC24",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00ffffff,		/* src_mask */
+	 0x00ffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 32 bit absolute */
+  HOWTO (R_ARM_ABS32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ABS32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* standard 32bit pc-relative reloc */
+  HOWTO (R_ARM_REL32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_REL32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 8 bit absolute - R_ARM_LDR_PC_G0 in AAELF */
+  HOWTO (R_ARM_LDR_PC_G0,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_LDR_PC_G0",     /* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+   /* 16 bit absolute */
+  HOWTO (R_ARM_ABS16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ABS16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 12 bit absolute */
+  HOWTO (R_ARM_ABS12,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ABS12",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000fff,		/* src_mask */
+	 0x00000fff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_THM_ABS5,	/* type */
+	 6,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 5,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_THM_ABS5",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x000007e0,		/* src_mask */
+	 0x000007e0,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 8 bit absolute */
+  HOWTO (R_ARM_ABS8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ABS8",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x000000ff,		/* src_mask */
+	 0x000000ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_SBREL32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_SBREL32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_THM_CALL,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_THM_CALL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x07ff2fff,		/* src_mask */
+	 0x07ff2fff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_THM_PC8,	        /* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_THM_PC8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x000000ff,		/* src_mask */
+	 0x000000ff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_BREL_ADJ,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_BREL_ADJ",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_TLS_DESC,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_TLS_DESC",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_THM_SWI8,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_SWI8",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000000,		/* src_mask */
+	 0x00000000,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* BLX instruction for the ARM.  */
+  HOWTO (R_ARM_XPC25,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_XPC25",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00ffffff,		/* src_mask */
+	 0x00ffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* BLX instruction for the Thumb.  */
+  HOWTO (R_ARM_THM_XPC22,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_THM_XPC22",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x07ff2fff,		/* src_mask */
+	 0x07ff2fff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Dynamic TLS relocations.  */
+
+  HOWTO (R_ARM_TLS_DTPMOD32,	/* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_ARM_TLS_DTPMOD32",	/* name */
+         TRUE,			/* partial_inplace */
+         0xffffffff,		/* src_mask */
+         0xffffffff,		/* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  HOWTO (R_ARM_TLS_DTPOFF32,	/* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_ARM_TLS_DTPOFF32",	/* name */
+         TRUE,			/* partial_inplace */
+         0xffffffff,		/* src_mask */
+         0xffffffff,		/* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  HOWTO (R_ARM_TLS_TPOFF32,	/* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_ARM_TLS_TPOFF32",	/* name */
+         TRUE,			/* partial_inplace */
+         0xffffffff,		/* src_mask */
+         0xffffffff,		/* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* Relocs used in ARM Linux */
+
+  HOWTO (R_ARM_COPY,		/* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_ARM_COPY",		/* name */
+         TRUE,			/* partial_inplace */
+         0xffffffff,		/* src_mask */
+         0xffffffff,		/* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  HOWTO (R_ARM_GLOB_DAT,	/* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_ARM_GLOB_DAT",	/* name */
+         TRUE,			/* partial_inplace */
+         0xffffffff,		/* src_mask */
+         0xffffffff,		/* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  HOWTO (R_ARM_JUMP_SLOT,	/* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_ARM_JUMP_SLOT",	/* name */
+         TRUE,			/* partial_inplace */
+         0xffffffff,		/* src_mask */
+         0xffffffff,		/* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  HOWTO (R_ARM_RELATIVE,	/* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_ARM_RELATIVE",	/* name */
+         TRUE,			/* partial_inplace */
+         0xffffffff,		/* src_mask */
+         0xffffffff,		/* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  HOWTO (R_ARM_GOTOFF32,	/* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_ARM_GOTOFF32",	/* name */
+         TRUE,			/* partial_inplace */
+         0xffffffff,		/* src_mask */
+         0xffffffff,		/* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  HOWTO (R_ARM_GOTPC,		/* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         TRUE,			/* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_ARM_GOTPC",		/* name */
+         TRUE,			/* partial_inplace */
+         0xffffffff,		/* src_mask */
+         0xffffffff,		/* dst_mask */
+         TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_GOT32,		/* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,			/* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_ARM_GOT32",		/* name */
+         TRUE,			/* partial_inplace */
+         0xffffffff,		/* src_mask */
+         0xffffffff,		/* dst_mask */
+         FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_PLT32,		/* type */
+         2,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         24,                    /* bitsize */
+         TRUE,			/* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_ARM_PLT32",		/* name */
+         FALSE,			/* partial_inplace */
+         0x00ffffff,		/* src_mask */
+         0x00ffffff,		/* dst_mask */
+         TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_CALL,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_CALL",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00ffffff,		/* src_mask */
+	 0x00ffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_JUMP24,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_JUMP24",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00ffffff,		/* src_mask */
+	 0x00ffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_THM_JUMP24,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_THM_JUMP24",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x07ff2fff,		/* src_mask */
+	 0x07ff2fff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_BASE_ABS,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_BASE_ABS",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_ALU_PCREL7_0,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ALU_PCREL_7_0",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000fff,		/* src_mask */
+	 0x00000fff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_ALU_PCREL15_8,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 8,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ALU_PCREL_15_8",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000fff,		/* src_mask */
+	 0x00000fff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_ALU_PCREL23_15,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 16,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ALU_PCREL_23_15",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000fff,		/* src_mask */
+	 0x00000fff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_LDR_SBREL_11_0,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_LDR_SBREL_11_0",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000fff,		/* src_mask */
+	 0x00000fff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_ALU_SBREL_19_12,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 12,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ALU_SBREL_19_12",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x000ff000,		/* src_mask */
+	 0x000ff000,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_ALU_SBREL_27_20,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 20,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ALU_SBREL_27_20",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0ff00000,		/* src_mask */
+	 0x0ff00000,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_TARGET1,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_TARGET1",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_ROSEGREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ROSEGREL32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_V4BX,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_V4BX",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_TARGET2,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_TARGET2",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_PREL31,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 31,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_PREL31",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x7fffffff,		/* src_mask */
+	 0x7fffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_MOVW_ABS_NC,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_MOVW_ABS_NC",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x000f0fff,		/* src_mask */
+	 0x000f0fff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_MOVT_ABS,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_MOVT_ABS",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x000f0fff,		/* src_mask */
+	 0x000f0fff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_MOVW_PREL_NC,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_MOVW_PREL_NC",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x000f0fff,		/* src_mask */
+	 0x000f0fff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_MOVT_PREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_MOVT_PREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x000f0fff,		/* src_mask */
+	 0x000f0fff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_THM_MOVW_ABS_NC,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_THM_MOVW_ABS_NC",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x040f70ff,		/* src_mask */
+	 0x040f70ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_THM_MOVT_ABS,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_THM_MOVT_ABS",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x040f70ff,		/* src_mask */
+	 0x040f70ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_THM_MOVW_PREL_NC,/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_THM_MOVW_PREL_NC",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x040f70ff,		/* src_mask */
+	 0x040f70ff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_THM_MOVT_PREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_THM_MOVT_PREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x040f70ff,		/* src_mask */
+	 0x040f70ff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_THM_JUMP19,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 19,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_ARM_THM_JUMP19",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x043f2fff,		/* src_mask */
+	 0x043f2fff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_THM_JUMP6,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 6,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_THM_JUMP6",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x02f8,		/* src_mask */
+	 0x02f8,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* These are declared as 13-bit signed relocations because we can
+     address -4095 .. 4095(base) by altering ADDW to SUBW or vice
+     versa.  */
+  HOWTO (R_ARM_THM_ALU_PREL_11_0,/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 13,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_THM_ALU_PREL_11_0",/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_THM_PC12,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 13,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_THM_PC12",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_ABS32_NOI,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ABS32_NOI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_REL32_NOI,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_REL32_NOI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Group relocations.  */
+
+  HOWTO (R_ARM_ALU_PC_G0_NC,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ALU_PC_G0_NC",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_ALU_PC_G0,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ALU_PC_G0",   	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_ALU_PC_G1_NC,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ALU_PC_G1_NC",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_ALU_PC_G1,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ALU_PC_G1",   	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_ALU_PC_G2,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ALU_PC_G2",   	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_LDR_PC_G1,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_LDR_PC_G1",   	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_LDR_PC_G2,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_LDR_PC_G2",   	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_LDRS_PC_G0,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_LDRS_PC_G0",   	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_LDRS_PC_G1,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_LDRS_PC_G1",   	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_LDRS_PC_G2,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_LDRS_PC_G2",   	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_LDC_PC_G0,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_LDC_PC_G0",   	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_LDC_PC_G1,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_LDC_PC_G1",   	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_LDC_PC_G2,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_LDC_PC_G2",   	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_ALU_SB_G0_NC,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ALU_SB_G0_NC", 	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_ALU_SB_G0,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ALU_SB_G0", 	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_ALU_SB_G1_NC,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ALU_SB_G1_NC", 	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_ALU_SB_G1,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ALU_SB_G1", 	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_ALU_SB_G2,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_ALU_SB_G2", 	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_LDR_SB_G0,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_LDR_SB_G0", 	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_LDR_SB_G1,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_LDR_SB_G1", 	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_LDR_SB_G2,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_LDR_SB_G2", 	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_LDRS_SB_G0,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_LDRS_SB_G0", 	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_LDRS_SB_G1,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_LDRS_SB_G1", 	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_LDRS_SB_G2,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_LDRS_SB_G2", 	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_LDC_SB_G0,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_LDC_SB_G0", 	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_LDC_SB_G1,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_LDC_SB_G1", 	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_LDC_SB_G2,   	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_LDC_SB_G2", 	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* End of group relocations.  */
+
+  HOWTO (R_ARM_MOVW_BREL_NC,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_MOVW_BREL_NC",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_MOVT_BREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_MOVT_BREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_MOVW_BREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_MOVW_BREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_THM_MOVW_BREL_NC,/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_THM_MOVW_BREL_NC",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x040f70ff,		/* src_mask */
+	 0x040f70ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_THM_MOVT_BREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_THM_MOVT_BREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x040f70ff,		/* src_mask */
+	 0x040f70ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_THM_MOVW_BREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_THM_MOVW_BREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x040f70ff,		/* src_mask */
+	 0x040f70ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_TLS_GOTDESC,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_ARM_TLS_GOTDESC",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_TLS_CALL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_TLS_CALL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00ffffff,		/* src_mask */
+	 0x00ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_TLS_DESCSEQ,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_TLS_DESCSEQ",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000000,		/* src_mask */
+	 0x00000000,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_THM_TLS_CALL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_THM_TLS_CALL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x07ff07ff,		/* src_mask */
+	 0x07ff07ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_PLT32_ABS,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_PLT32_ABS",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_GOT_ABS,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_GOT_ABS",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_GOT_PREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_GOT_PREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_GOT_BREL12,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_GOT_BREL12",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000fff,		/* src_mask */
+	 0x00000fff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_GOTOFF12,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_GOTOFF12",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000fff,		/* src_mask */
+	 0x00000fff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (R_ARM_GOTRELAX),  /* reserved for future GOT-load optimizations */
+
+  /* GNU extension to record C++ vtable member usage */
+  HOWTO (R_ARM_GNU_VTENTRY,     /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
+         "R_ARM_GNU_VTENTRY",   /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* GNU extension to record C++ vtable hierarchy */
+  HOWTO (R_ARM_GNU_VTINHERIT, /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         NULL,                  /* special_function */
+         "R_ARM_GNU_VTINHERIT", /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  HOWTO (R_ARM_THM_JUMP11,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 11,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_THM_JUMP11",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x000007ff,		/* src_mask */
+	 0x000007ff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_ARM_THM_JUMP8,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_THM_JUMP8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x000000ff,		/* src_mask */
+	 0x000000ff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* TLS relocations */
+  HOWTO (R_ARM_TLS_GD32,	/* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         NULL,			/* special_function */
+         "R_ARM_TLS_GD32",	/* name */
+         TRUE,			/* partial_inplace */
+         0xffffffff,		/* src_mask */
+         0xffffffff,		/* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  HOWTO (R_ARM_TLS_LDM32,	/* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_ARM_TLS_LDM32",	/* name */
+         TRUE,			/* partial_inplace */
+         0xffffffff,		/* src_mask */
+         0xffffffff,		/* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  HOWTO (R_ARM_TLS_LDO32,	/* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_ARM_TLS_LDO32",	/* name */
+         TRUE,			/* partial_inplace */
+         0xffffffff,		/* src_mask */
+         0xffffffff,		/* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  HOWTO (R_ARM_TLS_IE32,	/* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                  /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         NULL,			/* special_function */
+         "R_ARM_TLS_IE32",	/* name */
+         TRUE,			/* partial_inplace */
+         0xffffffff,		/* src_mask */
+         0xffffffff,		/* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  HOWTO (R_ARM_TLS_LE32,	/* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_ARM_TLS_LE32",	/* name */
+         TRUE,			/* partial_inplace */
+         0xffffffff,		/* src_mask */
+         0xffffffff,		/* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  HOWTO (R_ARM_TLS_LDO12,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_TLS_LDO12",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000fff,		/* src_mask */
+	 0x00000fff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_TLS_LE12,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_TLS_LE12",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000fff,		/* src_mask */
+	 0x00000fff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_TLS_IE12GP,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_TLS_IE12GP",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000fff,		/* src_mask */
+	 0x00000fff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 112-127 private relocations.  */
+  EMPTY_HOWTO (112),
+  EMPTY_HOWTO (113),
+  EMPTY_HOWTO (114),
+  EMPTY_HOWTO (115),
+  EMPTY_HOWTO (116),
+  EMPTY_HOWTO (117),
+  EMPTY_HOWTO (118),
+  EMPTY_HOWTO (119),
+  EMPTY_HOWTO (120),
+  EMPTY_HOWTO (121),
+  EMPTY_HOWTO (122),
+  EMPTY_HOWTO (123),
+  EMPTY_HOWTO (124),
+  EMPTY_HOWTO (125),
+  EMPTY_HOWTO (126),
+  EMPTY_HOWTO (127),
+
+  /* R_ARM_ME_TOO, obsolete.  */
+  EMPTY_HOWTO (128),
+
+  HOWTO (R_ARM_THM_TLS_DESCSEQ,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_THM_TLS_DESCSEQ",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000000,		/* src_mask */
+	 0x00000000,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+/* 160 onwards: */
+static reloc_howto_type elf32_arm_howto_table_2[1] =
+{
+  HOWTO (R_ARM_IRELATIVE,	/* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_ARM_IRELATIVE",	/* name */
+         TRUE,			/* partial_inplace */
+         0xffffffff,		/* src_mask */
+         0xffffffff,		/* dst_mask */
+         FALSE)			/* pcrel_offset */
+};
+
+/* 249-255 extended, currently unused, relocations:  */
+static reloc_howto_type elf32_arm_howto_table_3[4] =
+{
+  HOWTO (R_ARM_RREL32,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_RREL32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_RABS32,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_RABS32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_RPC24,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_RPC24",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_ARM_RBASE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_ARM_RBASE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE)			/* pcrel_offset */
+};
+
+static reloc_howto_type *
+elf32_arm_howto_from_type (unsigned int r_type)
+{
+  if (r_type < ARRAY_SIZE (elf32_arm_howto_table_1))
+    return &elf32_arm_howto_table_1[r_type];
+
+  if (r_type == R_ARM_IRELATIVE)
+    return &elf32_arm_howto_table_2[r_type - R_ARM_IRELATIVE];
+
+  if (r_type >= R_ARM_RREL32
+      && r_type < R_ARM_RREL32 + ARRAY_SIZE (elf32_arm_howto_table_3))
+    return &elf32_arm_howto_table_3[r_type - R_ARM_RREL32];
+
+  return NULL;
+}
+
+static void
+elf32_arm_info_to_howto (bfd * abfd ATTRIBUTE_UNUSED, arelent * bfd_reloc,
+			 Elf_Internal_Rela * elf_reloc)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (elf_reloc->r_info);
+  bfd_reloc->howto = elf32_arm_howto_from_type (r_type);
+}
+
+struct elf32_arm_reloc_map
+  {
+    bfd_reloc_code_real_type  bfd_reloc_val;
+    unsigned char             elf_reloc_val;
+  };
+
+/* All entries in this list must also be present in elf32_arm_howto_table.  */
+static const struct elf32_arm_reloc_map elf32_arm_reloc_map[] =
+  {
+    {BFD_RELOC_NONE,                 R_ARM_NONE},
+    {BFD_RELOC_ARM_PCREL_BRANCH,     R_ARM_PC24},
+    {BFD_RELOC_ARM_PCREL_CALL,	     R_ARM_CALL},
+    {BFD_RELOC_ARM_PCREL_JUMP,	     R_ARM_JUMP24},
+    {BFD_RELOC_ARM_PCREL_BLX,        R_ARM_XPC25},
+    {BFD_RELOC_THUMB_PCREL_BLX,      R_ARM_THM_XPC22},
+    {BFD_RELOC_32,                   R_ARM_ABS32},
+    {BFD_RELOC_32_PCREL,             R_ARM_REL32},
+    {BFD_RELOC_8,                    R_ARM_ABS8},
+    {BFD_RELOC_16,                   R_ARM_ABS16},
+    {BFD_RELOC_ARM_OFFSET_IMM,       R_ARM_ABS12},
+    {BFD_RELOC_ARM_THUMB_OFFSET,     R_ARM_THM_ABS5},
+    {BFD_RELOC_THUMB_PCREL_BRANCH25, R_ARM_THM_JUMP24},
+    {BFD_RELOC_THUMB_PCREL_BRANCH23, R_ARM_THM_CALL},
+    {BFD_RELOC_THUMB_PCREL_BRANCH12, R_ARM_THM_JUMP11},
+    {BFD_RELOC_THUMB_PCREL_BRANCH20, R_ARM_THM_JUMP19},
+    {BFD_RELOC_THUMB_PCREL_BRANCH9,  R_ARM_THM_JUMP8},
+    {BFD_RELOC_THUMB_PCREL_BRANCH7,  R_ARM_THM_JUMP6},
+    {BFD_RELOC_ARM_GLOB_DAT,         R_ARM_GLOB_DAT},
+    {BFD_RELOC_ARM_JUMP_SLOT,        R_ARM_JUMP_SLOT},
+    {BFD_RELOC_ARM_RELATIVE,         R_ARM_RELATIVE},
+    {BFD_RELOC_ARM_GOTOFF,           R_ARM_GOTOFF32},
+    {BFD_RELOC_ARM_GOTPC,            R_ARM_GOTPC},
+    {BFD_RELOC_ARM_GOT_PREL,         R_ARM_GOT_PREL},
+    {BFD_RELOC_ARM_GOT32,            R_ARM_GOT32},
+    {BFD_RELOC_ARM_PLT32,            R_ARM_PLT32},
+    {BFD_RELOC_ARM_TARGET1,	     R_ARM_TARGET1},
+    {BFD_RELOC_ARM_ROSEGREL32,	     R_ARM_ROSEGREL32},
+    {BFD_RELOC_ARM_SBREL32,	     R_ARM_SBREL32},
+    {BFD_RELOC_ARM_PREL31,	     R_ARM_PREL31},
+    {BFD_RELOC_ARM_TARGET2,	     R_ARM_TARGET2},
+    {BFD_RELOC_ARM_PLT32,            R_ARM_PLT32},
+    {BFD_RELOC_ARM_TLS_GOTDESC,      R_ARM_TLS_GOTDESC},
+    {BFD_RELOC_ARM_TLS_CALL,         R_ARM_TLS_CALL},
+    {BFD_RELOC_ARM_THM_TLS_CALL,     R_ARM_THM_TLS_CALL},
+    {BFD_RELOC_ARM_TLS_DESCSEQ,      R_ARM_TLS_DESCSEQ},
+    {BFD_RELOC_ARM_THM_TLS_DESCSEQ,  R_ARM_THM_TLS_DESCSEQ},
+    {BFD_RELOC_ARM_TLS_DESC,         R_ARM_TLS_DESC},
+    {BFD_RELOC_ARM_TLS_GD32,	     R_ARM_TLS_GD32},
+    {BFD_RELOC_ARM_TLS_LDO32,	     R_ARM_TLS_LDO32},
+    {BFD_RELOC_ARM_TLS_LDM32,	     R_ARM_TLS_LDM32},
+    {BFD_RELOC_ARM_TLS_DTPMOD32,     R_ARM_TLS_DTPMOD32},
+    {BFD_RELOC_ARM_TLS_DTPOFF32,     R_ARM_TLS_DTPOFF32},
+    {BFD_RELOC_ARM_TLS_TPOFF32,      R_ARM_TLS_TPOFF32},
+    {BFD_RELOC_ARM_TLS_IE32,         R_ARM_TLS_IE32},
+    {BFD_RELOC_ARM_TLS_LE32,         R_ARM_TLS_LE32},
+    {BFD_RELOC_ARM_IRELATIVE,        R_ARM_IRELATIVE},
+    {BFD_RELOC_VTABLE_INHERIT,	     R_ARM_GNU_VTINHERIT},
+    {BFD_RELOC_VTABLE_ENTRY,	     R_ARM_GNU_VTENTRY},
+    {BFD_RELOC_ARM_MOVW,	     R_ARM_MOVW_ABS_NC},
+    {BFD_RELOC_ARM_MOVT,	     R_ARM_MOVT_ABS},
+    {BFD_RELOC_ARM_MOVW_PCREL,	     R_ARM_MOVW_PREL_NC},
+    {BFD_RELOC_ARM_MOVT_PCREL,	     R_ARM_MOVT_PREL},
+    {BFD_RELOC_ARM_THUMB_MOVW,	     R_ARM_THM_MOVW_ABS_NC},
+    {BFD_RELOC_ARM_THUMB_MOVT,	     R_ARM_THM_MOVT_ABS},
+    {BFD_RELOC_ARM_THUMB_MOVW_PCREL, R_ARM_THM_MOVW_PREL_NC},
+    {BFD_RELOC_ARM_THUMB_MOVT_PCREL, R_ARM_THM_MOVT_PREL},
+    {BFD_RELOC_ARM_ALU_PC_G0_NC, R_ARM_ALU_PC_G0_NC},
+    {BFD_RELOC_ARM_ALU_PC_G0, R_ARM_ALU_PC_G0},
+    {BFD_RELOC_ARM_ALU_PC_G1_NC, R_ARM_ALU_PC_G1_NC},
+    {BFD_RELOC_ARM_ALU_PC_G1, R_ARM_ALU_PC_G1},
+    {BFD_RELOC_ARM_ALU_PC_G2, R_ARM_ALU_PC_G2},
+    {BFD_RELOC_ARM_LDR_PC_G0, R_ARM_LDR_PC_G0},
+    {BFD_RELOC_ARM_LDR_PC_G1, R_ARM_LDR_PC_G1},
+    {BFD_RELOC_ARM_LDR_PC_G2, R_ARM_LDR_PC_G2},
+    {BFD_RELOC_ARM_LDRS_PC_G0, R_ARM_LDRS_PC_G0},
+    {BFD_RELOC_ARM_LDRS_PC_G1, R_ARM_LDRS_PC_G1},
+    {BFD_RELOC_ARM_LDRS_PC_G2, R_ARM_LDRS_PC_G2},
+    {BFD_RELOC_ARM_LDC_PC_G0, R_ARM_LDC_PC_G0},
+    {BFD_RELOC_ARM_LDC_PC_G1, R_ARM_LDC_PC_G1},
+    {BFD_RELOC_ARM_LDC_PC_G2, R_ARM_LDC_PC_G2},
+    {BFD_RELOC_ARM_ALU_SB_G0_NC, R_ARM_ALU_SB_G0_NC},
+    {BFD_RELOC_ARM_ALU_SB_G0, R_ARM_ALU_SB_G0},
+    {BFD_RELOC_ARM_ALU_SB_G1_NC, R_ARM_ALU_SB_G1_NC},
+    {BFD_RELOC_ARM_ALU_SB_G1, R_ARM_ALU_SB_G1},
+    {BFD_RELOC_ARM_ALU_SB_G2, R_ARM_ALU_SB_G2},
+    {BFD_RELOC_ARM_LDR_SB_G0, R_ARM_LDR_SB_G0},
+    {BFD_RELOC_ARM_LDR_SB_G1, R_ARM_LDR_SB_G1},
+    {BFD_RELOC_ARM_LDR_SB_G2, R_ARM_LDR_SB_G2},
+    {BFD_RELOC_ARM_LDRS_SB_G0, R_ARM_LDRS_SB_G0},
+    {BFD_RELOC_ARM_LDRS_SB_G1, R_ARM_LDRS_SB_G1},
+    {BFD_RELOC_ARM_LDRS_SB_G2, R_ARM_LDRS_SB_G2},
+    {BFD_RELOC_ARM_LDC_SB_G0, R_ARM_LDC_SB_G0},
+    {BFD_RELOC_ARM_LDC_SB_G1, R_ARM_LDC_SB_G1},
+    {BFD_RELOC_ARM_LDC_SB_G2, R_ARM_LDC_SB_G2},
+    {BFD_RELOC_ARM_V4BX,	     R_ARM_V4BX}
+  };
+
+static reloc_howto_type *
+elf32_arm_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			     bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0; i < ARRAY_SIZE (elf32_arm_reloc_map); i ++)
+    if (elf32_arm_reloc_map[i].bfd_reloc_val == code)
+      return elf32_arm_howto_from_type (elf32_arm_reloc_map[i].elf_reloc_val);
+
+  return NULL;
+}
+
+static reloc_howto_type *
+elf32_arm_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			     const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0; i < ARRAY_SIZE (elf32_arm_howto_table_1); i++)
+    if (elf32_arm_howto_table_1[i].name != NULL
+	&& strcasecmp (elf32_arm_howto_table_1[i].name, r_name) == 0)
+      return &elf32_arm_howto_table_1[i];
+
+  for (i = 0; i < ARRAY_SIZE (elf32_arm_howto_table_2); i++)
+    if (elf32_arm_howto_table_2[i].name != NULL
+	&& strcasecmp (elf32_arm_howto_table_2[i].name, r_name) == 0)
+      return &elf32_arm_howto_table_2[i];
+
+  for (i = 0; i < ARRAY_SIZE (elf32_arm_howto_table_3); i++)
+    if (elf32_arm_howto_table_3[i].name != NULL
+	&& strcasecmp (elf32_arm_howto_table_3[i].name, r_name) == 0)
+      return &elf32_arm_howto_table_3[i];
+
+  return NULL;
+}
+
+/* Support for core dump NOTE sections.  */
+
+static bfd_boolean
+elf32_arm_nabi_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  int offset;
+  size_t size;
+
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      case 148:		/* Linux/ARM 32-bit.  */
+	/* pr_cursig */
+	elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12);
+
+	/* pr_pid */
+	elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 24);
+
+	/* pr_reg */
+	offset = 72;
+	size = 72;
+
+	break;
+    }
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg",
+					  size, note->descpos + offset);
+}
+
+static bfd_boolean
+elf32_arm_nabi_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      case 124:		/* Linux/ARM elf_prpsinfo.  */
+	elf_tdata (abfd)->core_program
+	 = _bfd_elfcore_strndup (abfd, note->descdata + 28, 16);
+	elf_tdata (abfd)->core_command
+	 = _bfd_elfcore_strndup (abfd, note->descdata + 44, 80);
+    }
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+  {
+    char *command = elf_tdata (abfd)->core_command;
+    int n = strlen (command);
+
+    if (0 < n && command[n - 1] == ' ')
+      command[n - 1] = '\0';
+  }
+
+  return TRUE;
+}
+
+#define TARGET_LITTLE_SYM               bfd_elf32_littlearm_vec
+#define TARGET_LITTLE_NAME              "elf32-littlearm"
+#define TARGET_BIG_SYM                  bfd_elf32_bigarm_vec
+#define TARGET_BIG_NAME                 "elf32-bigarm"
+
+#define elf_backend_grok_prstatus	elf32_arm_nabi_grok_prstatus
+#define elf_backend_grok_psinfo		elf32_arm_nabi_grok_psinfo
+
+typedef unsigned long int insn32;
+typedef unsigned short int insn16;
+
+/* In lieu of proper flags, assume all EABIv4 or later objects are
+   interworkable.  */
+#define INTERWORK_FLAG(abfd)  \
+  (EF_ARM_EABI_VERSION (elf_elfheader (abfd)->e_flags) >= EF_ARM_EABI_VER4 \
+  || (elf_elfheader (abfd)->e_flags & EF_ARM_INTERWORK) \
+  || ((abfd)->flags & BFD_LINKER_CREATED))
+
+/* The linker script knows the section names for placement.
+   The entry_names are used to do simple name mangling on the stubs.
+   Given a function name, and its type, the stub can be found. The
+   name can be changed. The only requirement is the %s be present.  */
+#define THUMB2ARM_GLUE_SECTION_NAME ".glue_7t"
+#define THUMB2ARM_GLUE_ENTRY_NAME   "__%s_from_thumb"
+
+#define ARM2THUMB_GLUE_SECTION_NAME ".glue_7"
+#define ARM2THUMB_GLUE_ENTRY_NAME   "__%s_from_arm"
+
+#define VFP11_ERRATUM_VENEER_SECTION_NAME ".vfp11_veneer"
+#define VFP11_ERRATUM_VENEER_ENTRY_NAME   "__vfp11_veneer_%x"
+
+#define ARM_BX_GLUE_SECTION_NAME ".v4_bx"
+#define ARM_BX_GLUE_ENTRY_NAME   "__bx_r%d"
+
+#define STUB_ENTRY_NAME   "__%s_veneer"
+
+/* The name of the dynamic interpreter.  This is put in the .interp
+   section.  */
+#define ELF_DYNAMIC_INTERPRETER     "/usr/lib/ld.so.1"
+
+static const unsigned long tls_trampoline [] =
+  {
+    0xe08e0000,		/* add r0, lr, r0 */
+    0xe5901004,		/* ldr r1, [r0,#4] */
+    0xe12fff11,		/* bx  r1 */
+  };
+
+static const unsigned long dl_tlsdesc_lazy_trampoline [] =
+  {
+    0xe52d2004, /*	push    {r2}			*/
+    0xe59f200c, /*      ldr     r2, [pc, #3f - . - 8]	*/
+    0xe59f100c, /*      ldr     r1, [pc, #4f - . - 8]	*/
+    0xe79f2002, /* 1:   ldr     r2, [pc, r2]		*/
+    0xe081100f, /* 2:   add     r1, pc			*/
+    0xe12fff12, /*      bx      r2			*/
+    0x00000014, /* 3:   .word  _GLOBAL_OFFSET_TABLE_ - 1b - 8
+		   		+ dl_tlsdesc_lazy_resolver(GOT)   */
+    0x00000018, /* 4:   .word  _GLOBAL_OFFSET_TABLE_ - 2b - 8 */ 
+  };
+
+#ifdef FOUR_WORD_PLT
+
+/* The first entry in a procedure linkage table looks like
+   this.  It is set up so that any shared library function that is
+   called before the relocation has been set up calls the dynamic
+   linker first.  */
+static const bfd_vma elf32_arm_plt0_entry [] =
+  {
+    0xe52de004,		/* str   lr, [sp, #-4]! */
+    0xe59fe010,		/* ldr   lr, [pc, #16]  */
+    0xe08fe00e,		/* add   lr, pc, lr     */
+    0xe5bef008,		/* ldr   pc, [lr, #8]!  */
+  };
+
+/* Subsequent entries in a procedure linkage table look like
+   this.  */
+static const bfd_vma elf32_arm_plt_entry [] =
+  {
+    0xe28fc600,		/* add   ip, pc, #NN	*/
+    0xe28cca00,		/* add	 ip, ip, #NN	*/
+    0xe5bcf000,		/* ldr	 pc, [ip, #NN]! */
+    0x00000000,		/* unused		*/
+  };
+
+#else
+
+/* The first entry in a procedure linkage table looks like
+   this.  It is set up so that any shared library function that is
+   called before the relocation has been set up calls the dynamic
+   linker first.  */
+static const bfd_vma elf32_arm_plt0_entry [] =
+  {
+    0xe52de004,		/* str   lr, [sp, #-4]! */
+    0xe59fe004,		/* ldr   lr, [pc, #4]   */
+    0xe08fe00e,		/* add   lr, pc, lr     */
+    0xe5bef008,		/* ldr   pc, [lr, #8]!  */
+    0x00000000,		/* &GOT[0] - .          */
+  };
+
+/* Subsequent entries in a procedure linkage table look like
+   this.  */
+static const bfd_vma elf32_arm_plt_entry [] =
+  {
+    0xe28fc600,		/* add   ip, pc, #0xNN00000 */
+    0xe28cca00,		/* add	 ip, ip, #0xNN000   */
+    0xe5bcf000,		/* ldr	 pc, [ip, #0xNNN]!  */
+  };
+
+#endif
+
+/* The format of the first entry in the procedure linkage table
+   for a VxWorks executable.  */
+static const bfd_vma elf32_arm_vxworks_exec_plt0_entry[] =
+  {
+    0xe52dc008,	        /* str    ip,[sp,#-8]!			*/
+    0xe59fc000,         /* ldr    ip,[pc]			*/
+    0xe59cf008,         /* ldr    pc,[ip,#8]			*/
+    0x00000000,         /* .long  _GLOBAL_OFFSET_TABLE_		*/
+  };
+
+/* The format of subsequent entries in a VxWorks executable.  */
+static const bfd_vma elf32_arm_vxworks_exec_plt_entry[] =
+  {
+    0xe59fc000,         /* ldr    ip,[pc]			*/
+    0xe59cf000,         /* ldr    pc,[ip]			*/
+    0x00000000,         /* .long  @got				*/
+    0xe59fc000,         /* ldr    ip,[pc]			*/
+    0xea000000,         /* b      _PLT				*/
+    0x00000000,         /* .long  @pltindex*sizeof(Elf32_Rela)	*/
+  };
+
+/* The format of entries in a VxWorks shared library.  */
+static const bfd_vma elf32_arm_vxworks_shared_plt_entry[] =
+  {
+    0xe59fc000,         /* ldr    ip,[pc]			*/
+    0xe79cf009,         /* ldr    pc,[ip,r9]			*/
+    0x00000000,         /* .long  @got				*/
+    0xe59fc000,         /* ldr    ip,[pc]			*/
+    0xe599f008,         /* ldr    pc,[r9,#8]			*/
+    0x00000000,         /* .long  @pltindex*sizeof(Elf32_Rela)	*/
+  };
+
+/* An initial stub used if the PLT entry is referenced from Thumb code.  */
+#define PLT_THUMB_STUB_SIZE 4
+static const bfd_vma elf32_arm_plt_thumb_stub [] =
+  {
+    0x4778,		/* bx pc */
+    0x46c0		/* nop   */
+  };
+
+/* The entries in a PLT when using a DLL-based target with multiple
+   address spaces.  */
+static const bfd_vma elf32_arm_symbian_plt_entry [] =
+  {
+    0xe51ff004,         /* ldr   pc, [pc, #-4] */
+    0x00000000,         /* dcd   R_ARM_GLOB_DAT(X) */
+  };
+
+#define ARM_MAX_FWD_BRANCH_OFFSET  ((((1 << 23) - 1) << 2) + 8)
+#define ARM_MAX_BWD_BRANCH_OFFSET  ((-((1 << 23) << 2)) + 8)
+#define THM_MAX_FWD_BRANCH_OFFSET  ((1 << 22) -2 + 4)
+#define THM_MAX_BWD_BRANCH_OFFSET  (-(1 << 22) + 4)
+#define THM2_MAX_FWD_BRANCH_OFFSET (((1 << 24) - 2) + 4)
+#define THM2_MAX_BWD_BRANCH_OFFSET (-(1 << 24) + 4)
+
+enum stub_insn_type
+  {
+    THUMB16_TYPE = 1,
+    THUMB32_TYPE,
+    ARM_TYPE,
+    DATA_TYPE
+  };
+
+#define THUMB16_INSN(X)		{(X), THUMB16_TYPE, R_ARM_NONE, 0}
+/* A bit of a hack.  A Thumb conditional branch, in which the proper condition
+   is inserted in arm_build_one_stub().  */
+#define THUMB16_BCOND_INSN(X)	{(X), THUMB16_TYPE, R_ARM_NONE, 1}
+#define THUMB32_INSN(X)		{(X), THUMB32_TYPE, R_ARM_NONE, 0}
+#define THUMB32_B_INSN(X, Z)	{(X), THUMB32_TYPE, R_ARM_THM_JUMP24, (Z)}
+#define ARM_INSN(X)		{(X), ARM_TYPE, R_ARM_NONE, 0}
+#define ARM_REL_INSN(X, Z)	{(X), ARM_TYPE, R_ARM_JUMP24, (Z)}
+#define DATA_WORD(X,Y,Z)	{(X), DATA_TYPE, (Y), (Z)}
+
+typedef struct
+{
+  bfd_vma data;
+  enum stub_insn_type type;
+  unsigned int r_type;
+  int reloc_addend;
+}  insn_sequence;
+
+/* Arm/Thumb -> Arm/Thumb long branch stub. On V5T and above, use blx
+   to reach the stub if necessary.  */
+static const insn_sequence elf32_arm_stub_long_branch_any_any[] =
+  {
+    ARM_INSN(0xe51ff004),            /* ldr   pc, [pc, #-4] */
+    DATA_WORD(0, R_ARM_ABS32, 0),    /* dcd   R_ARM_ABS32(X) */
+  };
+
+/* V4T Arm -> Thumb long branch stub. Used on V4T where blx is not
+   available.  */
+static const insn_sequence elf32_arm_stub_long_branch_v4t_arm_thumb[] =
+  {
+    ARM_INSN(0xe59fc000),            /* ldr   ip, [pc, #0] */
+    ARM_INSN(0xe12fff1c),            /* bx    ip */
+    DATA_WORD(0, R_ARM_ABS32, 0),    /* dcd   R_ARM_ABS32(X) */
+  };
+
+/* Thumb -> Thumb long branch stub. Used on M-profile architectures.  */
+static const insn_sequence elf32_arm_stub_long_branch_thumb_only[] =
+  {
+    THUMB16_INSN(0xb401),             /* push {r0} */
+    THUMB16_INSN(0x4802),             /* ldr  r0, [pc, #8] */
+    THUMB16_INSN(0x4684),             /* mov  ip, r0 */
+    THUMB16_INSN(0xbc01),             /* pop  {r0} */
+    THUMB16_INSN(0x4760),             /* bx   ip */
+    THUMB16_INSN(0xbf00),             /* nop */
+    DATA_WORD(0, R_ARM_ABS32, 0),     /* dcd  R_ARM_ABS32(X) */
+  };
+
+/* V4T Thumb -> Thumb long branch stub. Using the stack is not
+   allowed.  */
+static const insn_sequence elf32_arm_stub_long_branch_v4t_thumb_thumb[] =
+  {
+    THUMB16_INSN(0x4778),             /* bx   pc */
+    THUMB16_INSN(0x46c0),             /* nop */
+    ARM_INSN(0xe59fc000),             /* ldr  ip, [pc, #0] */
+    ARM_INSN(0xe12fff1c),             /* bx   ip */
+    DATA_WORD(0, R_ARM_ABS32, 0),     /* dcd  R_ARM_ABS32(X) */
+  };
+
+/* V4T Thumb -> ARM long branch stub. Used on V4T where blx is not
+   available.  */
+static const insn_sequence elf32_arm_stub_long_branch_v4t_thumb_arm[] =
+  {
+    THUMB16_INSN(0x4778),             /* bx   pc */
+    THUMB16_INSN(0x46c0),             /* nop   */
+    ARM_INSN(0xe51ff004),             /* ldr   pc, [pc, #-4] */
+    DATA_WORD(0, R_ARM_ABS32, 0),     /* dcd   R_ARM_ABS32(X) */
+  };
+
+/* V4T Thumb -> ARM short branch stub. Shorter variant of the above
+   one, when the destination is close enough.  */
+static const insn_sequence elf32_arm_stub_short_branch_v4t_thumb_arm[] =
+  {
+    THUMB16_INSN(0x4778),             /* bx   pc */
+    THUMB16_INSN(0x46c0),             /* nop   */
+    ARM_REL_INSN(0xea000000, -8),     /* b    (X-8) */
+  };
+
+/* ARM/Thumb -> ARM long branch stub, PIC.  On V5T and above, use
+   blx to reach the stub if necessary.  */
+static const insn_sequence elf32_arm_stub_long_branch_any_arm_pic[] =
+  {
+    ARM_INSN(0xe59fc000),             /* ldr   ip, [pc] */
+    ARM_INSN(0xe08ff00c),             /* add   pc, pc, ip */
+    DATA_WORD(0, R_ARM_REL32, -4),    /* dcd   R_ARM_REL32(X-4) */
+  };
+
+/* ARM/Thumb -> Thumb long branch stub, PIC.  On V5T and above, use
+   blx to reach the stub if necessary.  We can not add into pc;
+   it is not guaranteed to mode switch (different in ARMv6 and
+   ARMv7).  */
+static const insn_sequence elf32_arm_stub_long_branch_any_thumb_pic[] =
+  {
+    ARM_INSN(0xe59fc004),             /* ldr   ip, [pc, #4] */
+    ARM_INSN(0xe08fc00c),             /* add   ip, pc, ip */
+    ARM_INSN(0xe12fff1c),             /* bx    ip */
+    DATA_WORD(0, R_ARM_REL32, 0),     /* dcd   R_ARM_REL32(X) */
+  };
+
+/* V4T ARM -> ARM long branch stub, PIC.  */
+static const insn_sequence elf32_arm_stub_long_branch_v4t_arm_thumb_pic[] =
+  {
+    ARM_INSN(0xe59fc004),             /* ldr   ip, [pc, #4] */
+    ARM_INSN(0xe08fc00c),             /* add   ip, pc, ip */
+    ARM_INSN(0xe12fff1c),             /* bx    ip */
+    DATA_WORD(0, R_ARM_REL32, 0),     /* dcd   R_ARM_REL32(X) */
+  };
+
+/* V4T Thumb -> ARM long branch stub, PIC.  */
+static const insn_sequence elf32_arm_stub_long_branch_v4t_thumb_arm_pic[] =
+  {
+    THUMB16_INSN(0x4778),             /* bx   pc */
+    THUMB16_INSN(0x46c0),             /* nop  */
+    ARM_INSN(0xe59fc000),             /* ldr  ip, [pc, #0] */
+    ARM_INSN(0xe08cf00f),             /* add  pc, ip, pc */
+    DATA_WORD(0, R_ARM_REL32, -4),     /* dcd  R_ARM_REL32(X) */
+  };
+
+/* Thumb -> Thumb long branch stub, PIC. Used on M-profile
+   architectures.  */
+static const insn_sequence elf32_arm_stub_long_branch_thumb_only_pic[] =
+  {
+    THUMB16_INSN(0xb401),             /* push {r0} */
+    THUMB16_INSN(0x4802),             /* ldr  r0, [pc, #8] */
+    THUMB16_INSN(0x46fc),             /* mov  ip, pc */
+    THUMB16_INSN(0x4484),             /* add  ip, r0 */
+    THUMB16_INSN(0xbc01),             /* pop  {r0} */
+    THUMB16_INSN(0x4760),             /* bx   ip */
+    DATA_WORD(0, R_ARM_REL32, 4),     /* dcd  R_ARM_REL32(X) */
+  };
+
+/* V4T Thumb -> Thumb long branch stub, PIC. Using the stack is not
+   allowed.  */
+static const insn_sequence elf32_arm_stub_long_branch_v4t_thumb_thumb_pic[] =
+  {
+    THUMB16_INSN(0x4778),             /* bx   pc */
+    THUMB16_INSN(0x46c0),             /* nop */
+    ARM_INSN(0xe59fc004),             /* ldr  ip, [pc, #4] */
+    ARM_INSN(0xe08fc00c),             /* add   ip, pc, ip */
+    ARM_INSN(0xe12fff1c),             /* bx   ip */
+    DATA_WORD(0, R_ARM_REL32, 0),     /* dcd  R_ARM_REL32(X) */
+  };
+
+/* Thumb2/ARM -> TLS trampoline.  Lowest common denominator, which is a
+   long PIC stub.  We can use r1 as a scratch -- and cannot use ip.  */
+static const insn_sequence elf32_arm_stub_long_branch_any_tls_pic[] =
+{
+    ARM_INSN(0xe59f1000),             /* ldr   r1, [pc] */
+    ARM_INSN(0xe08ff001),             /* add   pc, pc, r1 */
+    DATA_WORD(0, R_ARM_REL32, -4),    /* dcd   R_ARM_REL32(X-4) */
+};
+
+/* V4T Thumb -> TLS trampoline.  lowest common denominator, which is a
+   long PIC stub.  We can use r1 as a scratch -- and cannot use ip.  */
+static const insn_sequence elf32_arm_stub_long_branch_v4t_thumb_tls_pic[] =
+{
+    THUMB16_INSN(0x4778),             /* bx   pc */
+    THUMB16_INSN(0x46c0),             /* nop */
+    ARM_INSN(0xe59f1000),             /* ldr  r1, [pc, #0] */
+    ARM_INSN(0xe081f00f),             /* add  pc, r1, pc */
+    DATA_WORD(0, R_ARM_REL32, -4),    /* dcd  R_ARM_REL32(X) */
+};
+
+/* Cortex-A8 erratum-workaround stubs.  */
+
+/* Stub used for conditional branches (which may be beyond +/-1MB away, so we
+   can't use a conditional branch to reach this stub).  */
+
+static const insn_sequence elf32_arm_stub_a8_veneer_b_cond[] =
+  {
+    THUMB16_BCOND_INSN(0xd001),         /* b<cond>.n true.  */
+    THUMB32_B_INSN(0xf000b800, -4),     /* b.w insn_after_original_branch.  */
+    THUMB32_B_INSN(0xf000b800, -4)      /* true: b.w original_branch_dest.  */
+  };
+
+/* Stub used for b.w and bl.w instructions.  */
+
+static const insn_sequence elf32_arm_stub_a8_veneer_b[] =
+  {
+    THUMB32_B_INSN(0xf000b800, -4)	/* b.w original_branch_dest.  */
+  };
+
+static const insn_sequence elf32_arm_stub_a8_veneer_bl[] =
+  {
+    THUMB32_B_INSN(0xf000b800, -4)	/* b.w original_branch_dest.  */
+  };
+
+/* Stub used for Thumb-2 blx.w instructions.  We modified the original blx.w
+   instruction (which switches to ARM mode) to point to this stub.  Jump to the
+   real destination using an ARM-mode branch.  */
+
+static const insn_sequence elf32_arm_stub_a8_veneer_blx[] =
+  {
+    ARM_REL_INSN(0xea000000, -8)	/* b original_branch_dest.  */
+  };
+
+/* Section name for stubs is the associated section name plus this
+   string.  */
+#define STUB_SUFFIX ".stub"
+
+/* One entry per long/short branch stub defined above.  */
+#define DEF_STUBS \
+  DEF_STUB(long_branch_any_any)	\
+  DEF_STUB(long_branch_v4t_arm_thumb) \
+  DEF_STUB(long_branch_thumb_only) \
+  DEF_STUB(long_branch_v4t_thumb_thumb)	\
+  DEF_STUB(long_branch_v4t_thumb_arm) \
+  DEF_STUB(short_branch_v4t_thumb_arm) \
+  DEF_STUB(long_branch_any_arm_pic) \
+  DEF_STUB(long_branch_any_thumb_pic) \
+  DEF_STUB(long_branch_v4t_thumb_thumb_pic) \
+  DEF_STUB(long_branch_v4t_arm_thumb_pic) \
+  DEF_STUB(long_branch_v4t_thumb_arm_pic) \
+  DEF_STUB(long_branch_thumb_only_pic) \
+  DEF_STUB(long_branch_any_tls_pic) \
+  DEF_STUB(long_branch_v4t_thumb_tls_pic) \
+  DEF_STUB(a8_veneer_b_cond) \
+  DEF_STUB(a8_veneer_b) \
+  DEF_STUB(a8_veneer_bl) \
+  DEF_STUB(a8_veneer_blx)
+
+#define DEF_STUB(x) arm_stub_##x,
+enum elf32_arm_stub_type {
+  arm_stub_none,
+  DEF_STUBS
+  /* Note the first a8_veneer type */
+  arm_stub_a8_veneer_lwm = arm_stub_a8_veneer_b_cond
+};
+#undef DEF_STUB
+
+typedef struct
+{
+  const insn_sequence* template_sequence;
+  int template_size;
+} stub_def;
+
+#define DEF_STUB(x) {elf32_arm_stub_##x, ARRAY_SIZE(elf32_arm_stub_##x)},
+static const stub_def stub_definitions[] = {
+  {NULL, 0},
+  DEF_STUBS
+};
+
+struct elf32_arm_stub_hash_entry
+{
+  /* Base hash table entry structure.  */
+  struct bfd_hash_entry root;
+
+  /* The stub section.  */
+  asection *stub_sec;
+
+  /* Offset within stub_sec of the beginning of this stub.  */
+  bfd_vma stub_offset;
+
+  /* Given the symbol's value and its section we can determine its final
+     value when building the stubs (so the stub knows where to jump).  */
+  bfd_vma target_value;
+  asection *target_section;
+
+  /* Offset to apply to relocation referencing target_value.  */
+  bfd_vma target_addend;
+
+  /* The instruction which caused this stub to be generated (only valid for
+     Cortex-A8 erratum workaround stubs at present).  */
+  unsigned long orig_insn;
+
+  /* The stub type.  */
+  enum elf32_arm_stub_type stub_type;
+  /* Its encoding size in bytes.  */
+  int stub_size;
+  /* Its template.  */
+  const insn_sequence *stub_template;
+  /* The size of the template (number of entries).  */
+  int stub_template_size;
+
+  /* The symbol table entry, if any, that this was derived from.  */
+  struct elf32_arm_link_hash_entry *h;
+
+  /* Type of branch.  */
+  enum arm_st_branch_type branch_type;
+
+  /* Where this stub is being called from, or, in the case of combined
+     stub sections, the first input section in the group.  */
+  asection *id_sec;
+
+  /* The name for the local symbol at the start of this stub.  The
+     stub name in the hash table has to be unique; this does not, so
+     it can be friendlier.  */
+  char *output_name;
+};
+
+/* Used to build a map of a section.  This is required for mixed-endian
+   code/data.  */
+
+typedef struct elf32_elf_section_map
+{
+  bfd_vma vma;
+  char type;
+}
+elf32_arm_section_map;
+
+/* Information about a VFP11 erratum veneer, or a branch to such a veneer.  */
+
+typedef enum
+{
+  VFP11_ERRATUM_BRANCH_TO_ARM_VENEER,
+  VFP11_ERRATUM_BRANCH_TO_THUMB_VENEER,
+  VFP11_ERRATUM_ARM_VENEER,
+  VFP11_ERRATUM_THUMB_VENEER
+}
+elf32_vfp11_erratum_type;
+
+typedef struct elf32_vfp11_erratum_list
+{
+  struct elf32_vfp11_erratum_list *next;
+  bfd_vma vma;
+  union
+  {
+    struct
+    {
+      struct elf32_vfp11_erratum_list *veneer;
+      unsigned int vfp_insn;
+    } b;
+    struct
+    {
+      struct elf32_vfp11_erratum_list *branch;
+      unsigned int id;
+    } v;
+  } u;
+  elf32_vfp11_erratum_type type;
+}
+elf32_vfp11_erratum_list;
+
+typedef enum
+{
+  DELETE_EXIDX_ENTRY,
+  INSERT_EXIDX_CANTUNWIND_AT_END
+}
+arm_unwind_edit_type;
+
+/* A (sorted) list of edits to apply to an unwind table.  */
+typedef struct arm_unwind_table_edit
+{
+  arm_unwind_edit_type type;
+  /* Note: we sometimes want to insert an unwind entry corresponding to a
+     section different from the one we're currently writing out, so record the
+     (text) section this edit relates to here.  */
+  asection *linked_section;
+  unsigned int index;
+  struct arm_unwind_table_edit *next;
+}
+arm_unwind_table_edit;
+
+typedef struct _arm_elf_section_data
+{
+  /* Information about mapping symbols.  */
+  struct bfd_elf_section_data elf;
+  unsigned int mapcount;
+  unsigned int mapsize;
+  elf32_arm_section_map *map;
+  /* Information about CPU errata.  */
+  unsigned int erratumcount;
+  elf32_vfp11_erratum_list *erratumlist;
+  /* Information about unwind tables.  */
+  union
+  {
+    /* Unwind info attached to a text section.  */
+    struct
+    {
+      asection *arm_exidx_sec;
+    } text;
+
+    /* Unwind info attached to an .ARM.exidx section.  */
+    struct
+    {
+      arm_unwind_table_edit *unwind_edit_list;
+      arm_unwind_table_edit *unwind_edit_tail;
+    } exidx;
+  } u;
+}
+_arm_elf_section_data;
+
+#define elf32_arm_section_data(sec) \
+  ((_arm_elf_section_data *) elf_section_data (sec))
+
+/* A fix which might be required for Cortex-A8 Thumb-2 branch/TLB erratum.
+   These fixes are subject to a relaxation procedure (in elf32_arm_size_stubs),
+   so may be created multiple times: we use an array of these entries whilst
+   relaxing which we can refresh easily, then create stubs for each potentially
+   erratum-triggering instruction once we've settled on a solution.  */
+
+struct a8_erratum_fix {
+  bfd *input_bfd;
+  asection *section;
+  bfd_vma offset;
+  bfd_vma addend;
+  unsigned long orig_insn;
+  char *stub_name;
+  enum elf32_arm_stub_type stub_type;
+  enum arm_st_branch_type branch_type;
+};
+
+/* A table of relocs applied to branches which might trigger Cortex-A8
+   erratum.  */
+
+struct a8_erratum_reloc {
+  bfd_vma from;
+  bfd_vma destination;
+  struct elf32_arm_link_hash_entry *hash;
+  const char *sym_name;
+  unsigned int r_type;
+  enum arm_st_branch_type branch_type;
+  bfd_boolean non_a8_stub;
+};
+
+/* The size of the thread control block.  */
+#define TCB_SIZE	8
+
+/* ARM-specific information about a PLT entry, over and above the usual
+   gotplt_union.  */
+struct arm_plt_info {
+  /* We reference count Thumb references to a PLT entry separately,
+     so that we can emit the Thumb trampoline only if needed.  */
+  bfd_signed_vma thumb_refcount;
+
+  /* Some references from Thumb code may be eliminated by BL->BLX
+     conversion, so record them separately.  */
+  bfd_signed_vma maybe_thumb_refcount;
+
+  /* How many of the recorded PLT accesses were from non-call relocations.
+     This information is useful when deciding whether anything takes the
+     address of an STT_GNU_IFUNC PLT.  A value of 0 means that all
+     non-call references to the function should resolve directly to the
+     real runtime target.  */
+  unsigned int noncall_refcount;
+
+  /* Since PLT entries have variable size if the Thumb prologue is
+     used, we need to record the index into .got.plt instead of
+     recomputing it from the PLT offset.  */
+  bfd_signed_vma got_offset;
+};
+
+/* Information about an .iplt entry for a local STT_GNU_IFUNC symbol.  */
+struct arm_local_iplt_info {
+  /* The information that is usually found in the generic ELF part of
+     the hash table entry.  */
+  union gotplt_union root;
+
+  /* The information that is usually found in the ARM-specific part of
+     the hash table entry.  */
+  struct arm_plt_info arm;
+
+  /* A list of all potential dynamic relocations against this symbol.  */
+  struct elf_dyn_relocs *dyn_relocs;
+};
+
+struct elf_arm_obj_tdata
+{
+  struct elf_obj_tdata root;
+
+  /* tls_type for each local got entry.  */
+  char *local_got_tls_type;
+
+  /* GOTPLT entries for TLS descriptors.  */
+  bfd_vma *local_tlsdesc_gotent;
+
+  /* Information for local symbols that need entries in .iplt.  */
+  struct arm_local_iplt_info **local_iplt;
+
+  /* Zero to warn when linking objects with incompatible enum sizes.  */
+  int no_enum_size_warning;
+
+  /* Zero to warn when linking objects with incompatible wchar_t sizes.  */
+  int no_wchar_size_warning;
+};
+
+#define elf_arm_tdata(bfd) \
+  ((struct elf_arm_obj_tdata *) (bfd)->tdata.any)
+
+#define elf32_arm_local_got_tls_type(bfd) \
+  (elf_arm_tdata (bfd)->local_got_tls_type)
+
+#define elf32_arm_local_tlsdesc_gotent(bfd) \
+  (elf_arm_tdata (bfd)->local_tlsdesc_gotent)
+
+#define elf32_arm_local_iplt(bfd) \
+  (elf_arm_tdata (bfd)->local_iplt)
+
+#define is_arm_elf(bfd) \
+  (bfd_get_flavour (bfd) == bfd_target_elf_flavour \
+   && elf_tdata (bfd) != NULL \
+   && elf_object_id (bfd) == ARM_ELF_DATA)
+
+static bfd_boolean
+elf32_arm_mkobject (bfd *abfd)
+{
+  return bfd_elf_allocate_object (abfd, sizeof (struct elf_arm_obj_tdata),
+				  ARM_ELF_DATA);
+}
+
+#define elf32_arm_hash_entry(ent) ((struct elf32_arm_link_hash_entry *)(ent))
+
+/* Arm ELF linker hash entry.  */
+struct elf32_arm_link_hash_entry
+  {
+    struct elf_link_hash_entry root;
+
+    /* Track dynamic relocs copied for this symbol.  */
+    struct elf_dyn_relocs *dyn_relocs;
+
+    /* ARM-specific PLT information.  */
+    struct arm_plt_info plt;
+
+#define GOT_UNKNOWN	0
+#define GOT_NORMAL	1
+#define GOT_TLS_GD	2
+#define GOT_TLS_IE	4
+#define GOT_TLS_GDESC	8
+#define GOT_TLS_GD_ANY_P(type)	((type & GOT_TLS_GD) || (type & GOT_TLS_GDESC))
+    unsigned int tls_type : 8;
+
+    /* True if the symbol's PLT entry is in .iplt rather than .plt.  */
+    unsigned int is_iplt : 1;
+
+    unsigned int unused : 23;
+
+    /* Offset of the GOTPLT entry reserved for the TLS descriptor,
+       starting at the end of the jump table.  */
+    bfd_vma tlsdesc_got;
+
+    /* The symbol marking the real symbol location for exported thumb
+       symbols with Arm stubs.  */
+    struct elf_link_hash_entry *export_glue;
+
+   /* A pointer to the most recently used stub hash entry against this
+     symbol.  */
+    struct elf32_arm_stub_hash_entry *stub_cache;
+  };
+
+/* Traverse an arm ELF linker hash table.  */
+#define elf32_arm_link_hash_traverse(table, func, info)			\
+  (elf_link_hash_traverse						\
+   (&(table)->root,							\
+    (bfd_boolean (*) (struct elf_link_hash_entry *, void *)) (func),	\
+    (info)))
+
+/* Get the ARM elf linker hash table from a link_info structure.  */
+#define elf32_arm_hash_table(info) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((info)->hash)) \
+  == ARM_ELF_DATA ? ((struct elf32_arm_link_hash_table *) ((info)->hash)) : NULL)
+
+#define arm_stub_hash_lookup(table, string, create, copy) \
+  ((struct elf32_arm_stub_hash_entry *) \
+   bfd_hash_lookup ((table), (string), (create), (copy)))
+
+/* Array to keep track of which stub sections have been created, and
+   information on stub grouping.  */
+struct map_stub
+{
+  /* This is the section to which stubs in the group will be
+     attached.  */
+  asection *link_sec;
+  /* The stub section.  */
+  asection *stub_sec;
+};
+
+#define elf32_arm_compute_jump_table_size(htab) \
+  ((htab)->next_tls_desc_index * 4)
+
+/* ARM ELF linker hash table.  */
+struct elf32_arm_link_hash_table
+{
+  /* The main hash table.  */
+  struct elf_link_hash_table root;
+
+  /* The size in bytes of the section containing the Thumb-to-ARM glue.  */
+  bfd_size_type thumb_glue_size;
+
+  /* The size in bytes of the section containing the ARM-to-Thumb glue.  */
+  bfd_size_type arm_glue_size;
+
+  /* The size in bytes of section containing the ARMv4 BX veneers.  */
+  bfd_size_type bx_glue_size;
+
+  /* Offsets of ARMv4 BX veneers.  Bit1 set if present, and Bit0 set when
+     veneer has been populated.  */
+  bfd_vma bx_glue_offset[15];
+
+  /* The size in bytes of the section containing glue for VFP11 erratum
+     veneers.  */
+  bfd_size_type vfp11_erratum_glue_size;
+
+  /* A table of fix locations for Cortex-A8 Thumb-2 branch/TLB erratum.  This
+     holds Cortex-A8 erratum fix locations between elf32_arm_size_stubs() and
+     elf32_arm_write_section().  */
+  struct a8_erratum_fix *a8_erratum_fixes;
+  unsigned int num_a8_erratum_fixes;
+
+  /* An arbitrary input BFD chosen to hold the glue sections.  */
+  bfd * bfd_of_glue_owner;
+
+  /* Nonzero to output a BE8 image.  */
+  int byteswap_code;
+
+  /* Zero if R_ARM_TARGET1 means R_ARM_ABS32.
+     Nonzero if R_ARM_TARGET1 means R_ARM_REL32.  */
+  int target1_is_rel;
+
+  /* The relocation to use for R_ARM_TARGET2 relocations.  */
+  int target2_reloc;
+
+  /* 0 = Ignore R_ARM_V4BX.
+     1 = Convert BX to MOV PC.
+     2 = Generate v4 interworing stubs.  */
+  int fix_v4bx;
+
+  /* Whether we should fix the Cortex-A8 Thumb-2 branch/TLB erratum.  */
+  int fix_cortex_a8;
+
+  /* Whether we should fix the ARM1176 BLX immediate issue.  */
+  int fix_arm1176;
+
+  /* Nonzero if the ARM/Thumb BLX instructions are available for use.  */
+  int use_blx;
+
+  /* What sort of code sequences we should look for which may trigger the
+     VFP11 denorm erratum.  */
+  bfd_arm_vfp11_fix vfp11_fix;
+
+  /* Global counter for the number of fixes we have emitted.  */
+  int num_vfp11_fixes;
+
+  /* Nonzero to force PIC branch veneers.  */
+  int pic_veneer;
+
+  /* The number of bytes in the initial entry in the PLT.  */
+  bfd_size_type plt_header_size;
+
+  /* The number of bytes in the subsequent PLT etries.  */
+  bfd_size_type plt_entry_size;
+
+  /* True if the target system is VxWorks.  */
+  int vxworks_p;
+
+  /* True if the target system is Symbian OS.  */
+  int symbian_p;
+
+  /* True if the target uses REL relocations.  */
+  int use_rel;
+
+  /* The index of the next unused R_ARM_TLS_DESC slot in .rel.plt.  */
+  bfd_vma next_tls_desc_index;
+
+  /* How many R_ARM_TLS_DESC relocations were generated so far.  */
+  bfd_vma num_tls_desc;
+
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *sdynbss;
+  asection *srelbss;
+
+  /* The (unloaded but important) VxWorks .rela.plt.unloaded section.  */
+  asection *srelplt2;
+
+  /* The offset into splt of the PLT entry for the TLS descriptor
+     resolver.  Special values are 0, if not necessary (or not found
+     to be necessary yet), and -1 if needed but not determined
+     yet.  */
+  bfd_vma dt_tlsdesc_plt;
+
+  /* The offset into sgot of the GOT entry used by the PLT entry
+     above.  */
+  bfd_vma dt_tlsdesc_got;    
+
+  /* Offset in .plt section of tls_arm_trampoline.  */
+  bfd_vma tls_trampoline;
+
+  /* Data for R_ARM_TLS_LDM32 relocations.  */
+  union
+  {
+    bfd_signed_vma refcount;
+    bfd_vma offset;
+  } tls_ldm_got;
+
+  /* Small local sym cache.  */
+  struct sym_cache sym_cache;
+
+  /* For convenience in allocate_dynrelocs.  */
+  bfd * obfd;
+
+  /* The amount of space used by the reserved portion of the sgotplt
+     section, plus whatever space is used by the jump slots.  */
+  bfd_vma sgotplt_jump_table_size;
+
+  /* The stub hash table.  */
+  struct bfd_hash_table stub_hash_table;
+
+  /* Linker stub bfd.  */
+  bfd *stub_bfd;
+
+  /* Linker call-backs.  */
+  asection * (*add_stub_section) (const char *, asection *);
+  void (*layout_sections_again) (void);
+
+  /* Array to keep track of which stub sections have been created, and
+     information on stub grouping.  */
+  struct map_stub *stub_group;
+
+  /* Number of elements in stub_group.  */
+  int top_id;
+
+  /* Assorted information used by elf32_arm_size_stubs.  */
+  unsigned int bfd_count;
+  int top_index;
+  asection **input_list;
+};
+
+/* Create an entry in an ARM ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+elf32_arm_link_hash_newfunc (struct bfd_hash_entry * entry,
+                             struct bfd_hash_table * table,
+                             const char * string)
+{
+  struct elf32_arm_link_hash_entry * ret =
+    (struct elf32_arm_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = (struct elf32_arm_link_hash_entry *)
+        bfd_hash_allocate (table, sizeof (struct elf32_arm_link_hash_entry));
+  if (ret == NULL)
+    return (struct bfd_hash_entry *) ret;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct elf32_arm_link_hash_entry *)
+	 _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
+				     table, string));
+  if (ret != NULL)
+    {
+      ret->dyn_relocs = NULL;
+      ret->tls_type = GOT_UNKNOWN;
+      ret->tlsdesc_got = (bfd_vma) -1;
+      ret->plt.thumb_refcount = 0;
+      ret->plt.maybe_thumb_refcount = 0;
+      ret->plt.noncall_refcount = 0;
+      ret->plt.got_offset = -1;
+      ret->is_iplt = FALSE;
+      ret->export_glue = NULL;
+
+      ret->stub_cache = NULL;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Ensure that we have allocated bookkeeping structures for ABFD's local
+   symbols.  */
+
+static bfd_boolean
+elf32_arm_allocate_local_sym_info (bfd *abfd)
+{
+  if (elf_local_got_refcounts (abfd) == NULL)
+    {
+      bfd_size_type num_syms;
+      bfd_size_type size;
+      char *data;
+
+      num_syms = elf_tdata (abfd)->symtab_hdr.sh_info;
+      size = num_syms * (sizeof (bfd_signed_vma)
+			 + sizeof (struct arm_local_iplt_info *)
+			 + sizeof (bfd_vma)
+			 + sizeof (char));
+      data = bfd_zalloc (abfd, size);
+      if (data == NULL)
+	return FALSE;
+
+      elf_local_got_refcounts (abfd) = (bfd_signed_vma *) data;
+      data += num_syms * sizeof (bfd_signed_vma);
+
+      elf32_arm_local_iplt (abfd) = (struct arm_local_iplt_info **) data;
+      data += num_syms * sizeof (struct arm_local_iplt_info *);
+
+      elf32_arm_local_tlsdesc_gotent (abfd) = (bfd_vma *) data;
+      data += num_syms * sizeof (bfd_vma);
+
+      elf32_arm_local_got_tls_type (abfd) = data;
+    }
+  return TRUE;
+}
+
+/* Return the .iplt information for local symbol R_SYMNDX, which belongs
+   to input bfd ABFD.  Create the information if it doesn't already exist.
+   Return null if an allocation fails.  */
+
+static struct arm_local_iplt_info *
+elf32_arm_create_local_iplt (bfd *abfd, unsigned long r_symndx)
+{
+  struct arm_local_iplt_info **ptr;
+
+  if (!elf32_arm_allocate_local_sym_info (abfd))
+    return NULL;
+
+  BFD_ASSERT (r_symndx < elf_tdata (abfd)->symtab_hdr.sh_info);
+  ptr = &elf32_arm_local_iplt (abfd)[r_symndx];
+  if (*ptr == NULL)
+    *ptr = bfd_zalloc (abfd, sizeof (**ptr));
+  return *ptr;
+}
+
+/* Try to obtain PLT information for the symbol with index R_SYMNDX
+   in ABFD's symbol table.  If the symbol is global, H points to its
+   hash table entry, otherwise H is null.
+
+   Return true if the symbol does have PLT information.  When returning
+   true, point *ROOT_PLT at the target-independent reference count/offset
+   union and *ARM_PLT at the ARM-specific information.  */
+
+static bfd_boolean
+elf32_arm_get_plt_info (bfd *abfd, struct elf32_arm_link_hash_entry *h,
+			unsigned long r_symndx, union gotplt_union **root_plt,
+			struct arm_plt_info **arm_plt)
+{
+  struct arm_local_iplt_info *local_iplt;
+
+  if (h != NULL)
+    {
+      *root_plt = &h->root.plt;
+      *arm_plt = &h->plt;
+      return TRUE;
+    }
+
+  if (elf32_arm_local_iplt (abfd) == NULL)
+    return FALSE;
+
+  local_iplt = elf32_arm_local_iplt (abfd)[r_symndx];
+  if (local_iplt == NULL)
+    return FALSE;
+
+  *root_plt = &local_iplt->root;
+  *arm_plt = &local_iplt->arm;
+  return TRUE;
+}
+
+/* Return true if the PLT described by ARM_PLT requires a Thumb stub
+   before it.  */
+
+static bfd_boolean
+elf32_arm_plt_needs_thumb_stub_p (struct bfd_link_info *info,
+				  struct arm_plt_info *arm_plt)
+{
+  struct elf32_arm_link_hash_table *htab;
+
+  htab = elf32_arm_hash_table (info);
+  return (arm_plt->thumb_refcount != 0
+	  || (!htab->use_blx && arm_plt->maybe_thumb_refcount != 0));
+}
+
+/* Return a pointer to the head of the dynamic reloc list that should
+   be used for local symbol ISYM, which is symbol number R_SYMNDX in
+   ABFD's symbol table.  Return null if an error occurs.  */
+
+static struct elf_dyn_relocs **
+elf32_arm_get_local_dynreloc_list (bfd *abfd, unsigned long r_symndx,
+				   Elf_Internal_Sym *isym)
+{
+  if (ELF32_ST_TYPE (isym->st_info) == STT_GNU_IFUNC)
+    {
+      struct arm_local_iplt_info *local_iplt;
+
+      local_iplt = elf32_arm_create_local_iplt (abfd, r_symndx);
+      if (local_iplt == NULL)
+	return NULL;
+      return &local_iplt->dyn_relocs;
+    }
+  else
+    {
+      /* Track dynamic relocs needed for local syms too.
+	 We really need local syms available to do this
+	 easily.  Oh well.  */
+      asection *s;
+      void *vpp;
+
+      s = bfd_section_from_elf_index (abfd, isym->st_shndx);
+      if (s == NULL)
+	abort ();
+
+      vpp = &elf_section_data (s)->local_dynrel;
+      return (struct elf_dyn_relocs **) vpp;
+    }
+}
+
+/* Initialize an entry in the stub hash table.  */
+
+static struct bfd_hash_entry *
+stub_hash_newfunc (struct bfd_hash_entry *entry,
+		   struct bfd_hash_table *table,
+		   const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = (struct bfd_hash_entry *)
+          bfd_hash_allocate (table, sizeof (struct elf32_arm_stub_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = bfd_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct elf32_arm_stub_hash_entry *eh;
+
+      /* Initialize the local fields.  */
+      eh = (struct elf32_arm_stub_hash_entry *) entry;
+      eh->stub_sec = NULL;
+      eh->stub_offset = 0;
+      eh->target_value = 0;
+      eh->target_section = NULL;
+      eh->target_addend = 0;
+      eh->orig_insn = 0;
+      eh->stub_type = arm_stub_none;
+      eh->stub_size = 0;
+      eh->stub_template = NULL;
+      eh->stub_template_size = 0;
+      eh->h = NULL;
+      eh->id_sec = NULL;
+      eh->output_name = NULL;
+    }
+
+  return entry;
+}
+
+/* Create .got, .gotplt, and .rel(a).got sections in DYNOBJ, and set up
+   shortcuts to them in our hash table.  */
+
+static bfd_boolean
+create_got_section (bfd *dynobj, struct bfd_link_info *info)
+{
+  struct elf32_arm_link_hash_table *htab;
+
+  htab = elf32_arm_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* BPABI objects never have a GOT, or associated sections.  */
+  if (htab->symbian_p)
+    return TRUE;
+
+  if (! _bfd_elf_create_got_section (dynobj, info))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Create the .iplt, .rel(a).iplt and .igot.plt sections.  */
+
+static bfd_boolean
+create_ifunc_sections (struct bfd_link_info *info)
+{
+  struct elf32_arm_link_hash_table *htab;
+  const struct elf_backend_data *bed;
+  bfd *dynobj;
+  asection *s;
+  flagword flags;
+  
+  htab = elf32_arm_hash_table (info);
+  dynobj = htab->root.dynobj;
+  bed = get_elf_backend_data (dynobj);
+  flags = bed->dynamic_sec_flags;
+
+  if (htab->root.iplt == NULL)
+    {
+      s = bfd_make_section_with_flags (dynobj, ".iplt",
+				       flags | SEC_READONLY | SEC_CODE);
+      if (s == NULL
+	  || !bfd_set_section_alignment (abfd, s, bed->plt_alignment))
+	return FALSE;
+      htab->root.iplt = s;
+    }
+
+  if (htab->root.irelplt == NULL)
+    {
+      s = bfd_make_section_with_flags (dynobj, RELOC_SECTION (htab, ".iplt"),
+				       flags | SEC_READONLY);
+      if (s == NULL
+	  || !bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+	return FALSE;
+      htab->root.irelplt = s;
+    }
+
+  if (htab->root.igotplt == NULL)
+    {
+      s = bfd_make_section_with_flags (dynobj, ".igot.plt", flags);
+      if (s == NULL
+	  || !bfd_set_section_alignment (dynobj, s, bed->s->log_file_align))
+	return FALSE;
+      htab->root.igotplt = s;
+    }
+  return TRUE;
+}
+
+/* Create .plt, .rel(a).plt, .got, .got.plt, .rel(a).got, .dynbss, and
+   .rel(a).bss sections in DYNOBJ, and set up shortcuts to them in our
+   hash table.  */
+
+static bfd_boolean
+elf32_arm_create_dynamic_sections (bfd *dynobj, struct bfd_link_info *info)
+{
+  struct elf32_arm_link_hash_table *htab;
+
+  htab = elf32_arm_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (!htab->root.sgot && !create_got_section (dynobj, info))
+    return FALSE;
+
+  if (!_bfd_elf_create_dynamic_sections (dynobj, info))
+    return FALSE;
+
+  htab->sdynbss = bfd_get_section_by_name (dynobj, ".dynbss");
+  if (!info->shared)
+    htab->srelbss = bfd_get_section_by_name (dynobj,
+					     RELOC_SECTION (htab, ".bss"));
+
+  if (htab->vxworks_p)
+    {
+      if (!elf_vxworks_create_dynamic_sections (dynobj, info, &htab->srelplt2))
+	return FALSE;
+
+      if (info->shared)
+	{
+	  htab->plt_header_size = 0;
+	  htab->plt_entry_size
+	    = 4 * ARRAY_SIZE (elf32_arm_vxworks_shared_plt_entry);
+	}
+      else
+	{
+	  htab->plt_header_size
+	    = 4 * ARRAY_SIZE (elf32_arm_vxworks_exec_plt0_entry);
+	  htab->plt_entry_size
+	    = 4 * ARRAY_SIZE (elf32_arm_vxworks_exec_plt_entry);
+	}
+    }
+
+  if (!htab->root.splt
+      || !htab->root.srelplt
+      || !htab->sdynbss
+      || (!info->shared && !htab->srelbss))
+    abort ();
+
+  return TRUE;
+}
+
+/* Copy the extra info we tack onto an elf_link_hash_entry.  */
+
+static void
+elf32_arm_copy_indirect_symbol (struct bfd_link_info *info,
+				struct elf_link_hash_entry *dir,
+				struct elf_link_hash_entry *ind)
+{
+  struct elf32_arm_link_hash_entry *edir, *eind;
+
+  edir = (struct elf32_arm_link_hash_entry *) dir;
+  eind = (struct elf32_arm_link_hash_entry *) ind;
+
+  if (eind->dyn_relocs != NULL)
+    {
+      if (edir->dyn_relocs != NULL)
+	{
+	  struct elf_dyn_relocs **pp;
+	  struct elf_dyn_relocs *p;
+
+	  /* Add reloc counts against the indirect sym to the direct sym
+	     list.  Merge any entries against the same section.  */
+	  for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      struct elf_dyn_relocs *q;
+
+	      for (q = edir->dyn_relocs; q != NULL; q = q->next)
+		if (q->sec == p->sec)
+		  {
+		    q->pc_count += p->pc_count;
+		    q->count += p->count;
+		    *pp = p->next;
+		    break;
+		  }
+	      if (q == NULL)
+		pp = &p->next;
+	    }
+	  *pp = edir->dyn_relocs;
+	}
+
+      edir->dyn_relocs = eind->dyn_relocs;
+      eind->dyn_relocs = NULL;
+    }
+
+  if (ind->root.type == bfd_link_hash_indirect)
+    {
+      /* Copy over PLT info.  */
+      edir->plt.thumb_refcount += eind->plt.thumb_refcount;
+      eind->plt.thumb_refcount = 0;
+      edir->plt.maybe_thumb_refcount += eind->plt.maybe_thumb_refcount;
+      eind->plt.maybe_thumb_refcount = 0;
+      edir->plt.noncall_refcount += eind->plt.noncall_refcount;
+      eind->plt.noncall_refcount = 0;
+
+      /* We should only allocate a function to .iplt once the final
+	 symbol information is known.  */
+      BFD_ASSERT (!eind->is_iplt);
+
+      if (dir->got.refcount <= 0)
+	{
+	  edir->tls_type = eind->tls_type;
+	  eind->tls_type = GOT_UNKNOWN;
+	}
+    }
+
+  _bfd_elf_link_hash_copy_indirect (info, dir, ind);
+}
+
+/* Create an ARM elf linker hash table.  */
+
+static struct bfd_link_hash_table *
+elf32_arm_link_hash_table_create (bfd *abfd)
+{
+  struct elf32_arm_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct elf32_arm_link_hash_table);
+
+  ret = (struct elf32_arm_link_hash_table *) bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (& ret->root, abfd,
+				      elf32_arm_link_hash_newfunc,
+				      sizeof (struct elf32_arm_link_hash_entry),
+				      ARM_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  ret->sdynbss = NULL;
+  ret->srelbss = NULL;
+  ret->srelplt2 = NULL;
+  ret->dt_tlsdesc_plt = 0;
+  ret->dt_tlsdesc_got = 0;
+  ret->tls_trampoline = 0;
+  ret->next_tls_desc_index = 0;
+  ret->num_tls_desc = 0;
+  ret->thumb_glue_size = 0;
+  ret->arm_glue_size = 0;
+  ret->bx_glue_size = 0;
+  memset (ret->bx_glue_offset, 0, sizeof (ret->bx_glue_offset));
+  ret->vfp11_fix = BFD_ARM_VFP11_FIX_NONE;
+  ret->vfp11_erratum_glue_size = 0;
+  ret->num_vfp11_fixes = 0;
+  ret->fix_cortex_a8 = 0;
+  ret->fix_arm1176 = 0;
+  ret->bfd_of_glue_owner = NULL;
+  ret->byteswap_code = 0;
+  ret->target1_is_rel = 0;
+  ret->target2_reloc = R_ARM_NONE;
+#ifdef FOUR_WORD_PLT
+  ret->plt_header_size = 16;
+  ret->plt_entry_size = 16;
+#else
+  ret->plt_header_size = 20;
+  ret->plt_entry_size = 12;
+#endif
+  ret->fix_v4bx = 0;
+  ret->use_blx = 0;
+  ret->vxworks_p = 0;
+  ret->symbian_p = 0;
+  ret->use_rel = 1;
+  ret->sym_cache.abfd = NULL;
+  ret->obfd = abfd;
+  ret->tls_ldm_got.refcount = 0;
+  ret->stub_bfd = NULL;
+  ret->add_stub_section = NULL;
+  ret->layout_sections_again = NULL;
+  ret->stub_group = NULL;
+  ret->top_id = 0;
+  ret->bfd_count = 0;
+  ret->top_index = 0;
+  ret->input_list = NULL;
+
+  if (!bfd_hash_table_init (&ret->stub_hash_table, stub_hash_newfunc,
+			    sizeof (struct elf32_arm_stub_hash_entry)))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  return &ret->root.root;
+}
+
+/* Free the derived linker hash table.  */
+
+static void
+elf32_arm_hash_table_free (struct bfd_link_hash_table *hash)
+{
+  struct elf32_arm_link_hash_table *ret
+    = (struct elf32_arm_link_hash_table *) hash;
+
+  bfd_hash_table_free (&ret->stub_hash_table);
+  _bfd_generic_link_hash_table_free (hash);
+}
+
+/* Determine if we're dealing with a Thumb only architecture.  */
+
+static bfd_boolean
+using_thumb_only (struct elf32_arm_link_hash_table *globals)
+{
+  int arch = bfd_elf_get_obj_attr_int (globals->obfd, OBJ_ATTR_PROC,
+				       Tag_CPU_arch);
+  int profile;
+
+  if (arch == TAG_CPU_ARCH_V6_M || arch == TAG_CPU_ARCH_V6S_M)
+    return TRUE;
+
+  if (arch != TAG_CPU_ARCH_V7 && arch != TAG_CPU_ARCH_V7E_M)
+    return FALSE;
+
+  profile = bfd_elf_get_obj_attr_int (globals->obfd, OBJ_ATTR_PROC,
+				      Tag_CPU_arch_profile);
+
+  return profile == 'M';
+}
+
+/* Determine if we're dealing with a Thumb-2 object.  */
+
+static bfd_boolean
+using_thumb2 (struct elf32_arm_link_hash_table *globals)
+{
+  int arch = bfd_elf_get_obj_attr_int (globals->obfd, OBJ_ATTR_PROC,
+				       Tag_CPU_arch);
+  return arch == TAG_CPU_ARCH_V6T2 || arch >= TAG_CPU_ARCH_V7;
+}
+
+/* Determine what kind of NOPs are available.  */
+
+static bfd_boolean
+arch_has_arm_nop (struct elf32_arm_link_hash_table *globals)
+{
+  const int arch = bfd_elf_get_obj_attr_int (globals->obfd, OBJ_ATTR_PROC,
+					     Tag_CPU_arch);
+  return arch == TAG_CPU_ARCH_V6T2
+	 || arch == TAG_CPU_ARCH_V6K
+	 || arch == TAG_CPU_ARCH_V7
+	 || arch == TAG_CPU_ARCH_V7E_M;
+}
+
+static bfd_boolean
+arch_has_thumb2_nop (struct elf32_arm_link_hash_table *globals)
+{
+  const int arch = bfd_elf_get_obj_attr_int (globals->obfd, OBJ_ATTR_PROC,
+					     Tag_CPU_arch);
+  return (arch == TAG_CPU_ARCH_V6T2 || arch == TAG_CPU_ARCH_V7
+	  || arch == TAG_CPU_ARCH_V7E_M);
+}
+
+static bfd_boolean
+arm_stub_is_thumb (enum elf32_arm_stub_type stub_type)
+{
+  switch (stub_type)
+    {
+    case arm_stub_long_branch_thumb_only:
+    case arm_stub_long_branch_v4t_thumb_arm:
+    case arm_stub_short_branch_v4t_thumb_arm:
+    case arm_stub_long_branch_v4t_thumb_arm_pic:
+    case arm_stub_long_branch_v4t_thumb_tls_pic:
+    case arm_stub_long_branch_thumb_only_pic:
+      return TRUE;
+    case arm_stub_none:
+      BFD_FAIL ();
+      return FALSE;
+      break;
+    default:
+      return FALSE;
+    }
+}
+
+/* Determine the type of stub needed, if any, for a call.  */
+
+static enum elf32_arm_stub_type
+arm_type_of_stub (struct bfd_link_info *info,
+		  asection *input_sec,
+		  const Elf_Internal_Rela *rel,
+		  unsigned char st_type,
+		  enum arm_st_branch_type *actual_branch_type,
+		  struct elf32_arm_link_hash_entry *hash,
+		  bfd_vma destination,
+		  asection *sym_sec,
+		  bfd *input_bfd,
+		  const char *name)
+{
+  bfd_vma location;
+  bfd_signed_vma branch_offset;
+  unsigned int r_type;
+  struct elf32_arm_link_hash_table * globals;
+  int thumb2;
+  int thumb_only;
+  enum elf32_arm_stub_type stub_type = arm_stub_none;
+  int use_plt = 0;
+  enum arm_st_branch_type branch_type = *actual_branch_type;
+  union gotplt_union *root_plt;
+  struct arm_plt_info *arm_plt;
+
+  if (branch_type == ST_BRANCH_LONG)
+    return stub_type;
+
+  globals = elf32_arm_hash_table (info);
+  if (globals == NULL)
+    return stub_type;
+
+  thumb_only = using_thumb_only (globals);
+
+  thumb2 = using_thumb2 (globals);
+
+  /* Determine where the call point is.  */
+  location = (input_sec->output_offset
+	      + input_sec->output_section->vma
+	      + rel->r_offset);
+
+  r_type = ELF32_R_TYPE (rel->r_info);
+
+  /* For TLS call relocs, it is the caller's responsibility to provide
+     the address of the appropriate trampoline.  */
+  if (r_type != R_ARM_TLS_CALL
+      && r_type != R_ARM_THM_TLS_CALL
+      && elf32_arm_get_plt_info (input_bfd, hash, ELF32_R_SYM (rel->r_info),
+				 &root_plt, &arm_plt)
+      && root_plt->offset != (bfd_vma) -1)
+    {
+      asection *splt;
+
+      if (hash == NULL || hash->is_iplt)
+	splt = globals->root.iplt;
+      else
+	splt = globals->root.splt;
+      if (splt != NULL)
+	{	
+	  use_plt = 1;
+
+	  /* Note when dealing with PLT entries: the main PLT stub is in
+	     ARM mode, so if the branch is in Thumb mode, another
+	     Thumb->ARM stub will be inserted later just before the ARM
+	     PLT stub. We don't take this extra distance into account
+	     here, because if a long branch stub is needed, we'll add a
+	     Thumb->Arm one and branch directly to the ARM PLT entry
+	     because it avoids spreading offset corrections in several
+	     places.  */
+
+	  destination = (splt->output_section->vma
+			 + splt->output_offset
+			 + root_plt->offset);
+	  st_type = STT_FUNC;
+	  branch_type = ST_BRANCH_TO_ARM;
+	}
+    }
+  /* Calls to STT_GNU_IFUNC symbols should go through a PLT.  */
+  BFD_ASSERT (st_type != STT_GNU_IFUNC);
+
+  branch_offset = (bfd_signed_vma)(destination - location);
+
+  if (r_type == R_ARM_THM_CALL || r_type == R_ARM_THM_JUMP24
+      || r_type == R_ARM_THM_TLS_CALL)
+    {
+      /* Handle cases where:
+	 - this call goes too far (different Thumb/Thumb2 max
+           distance)
+	 - it's a Thumb->Arm call and blx is not available, or it's a
+           Thumb->Arm branch (not bl). A stub is needed in this case,
+           but only if this call is not through a PLT entry. Indeed,
+           PLT stubs handle mode switching already.
+      */
+      if ((!thumb2
+	    && (branch_offset > THM_MAX_FWD_BRANCH_OFFSET
+		|| (branch_offset < THM_MAX_BWD_BRANCH_OFFSET)))
+	  || (thumb2
+	      && (branch_offset > THM2_MAX_FWD_BRANCH_OFFSET
+		  || (branch_offset < THM2_MAX_BWD_BRANCH_OFFSET)))
+	  || (branch_type == ST_BRANCH_TO_ARM
+	      && (((r_type == R_ARM_THM_CALL
+		    || r_type == R_ARM_THM_TLS_CALL) && !globals->use_blx)
+		  || (r_type == R_ARM_THM_JUMP24))
+	      && !use_plt))
+	{
+	  if (branch_type == ST_BRANCH_TO_THUMB)
+	    {
+	      /* Thumb to thumb.  */
+	      if (!thumb_only)
+		{
+		  stub_type = (info->shared | globals->pic_veneer)
+		    /* PIC stubs.  */
+		    ? ((globals->use_blx
+			&& (r_type ==R_ARM_THM_CALL))
+		       /* V5T and above. Stub starts with ARM code, so
+			  we must be able to switch mode before
+			  reaching it, which is only possible for 'bl'
+			  (ie R_ARM_THM_CALL relocation).  */
+		       ? arm_stub_long_branch_any_thumb_pic
+		       /* On V4T, use Thumb code only.  */
+		       : arm_stub_long_branch_v4t_thumb_thumb_pic)
+
+		    /* non-PIC stubs.  */
+		    : ((globals->use_blx
+			&& (r_type ==R_ARM_THM_CALL))
+		       /* V5T and above.  */
+		       ? arm_stub_long_branch_any_any
+		       /* V4T.  */
+		       : arm_stub_long_branch_v4t_thumb_thumb);
+		}
+	      else
+		{
+		  stub_type = (info->shared | globals->pic_veneer)
+		    /* PIC stub.  */
+		    ? arm_stub_long_branch_thumb_only_pic
+		    /* non-PIC stub.  */
+		    : arm_stub_long_branch_thumb_only;
+		}
+	    }
+	  else
+	    {
+	      /* Thumb to arm.  */
+	      if (sym_sec != NULL
+		  && sym_sec->owner != NULL
+		  && !INTERWORK_FLAG (sym_sec->owner))
+		{
+		  (*_bfd_error_handler)
+		    (_("%B(%s): warning: interworking not enabled.\n"
+		       "  first occurrence: %B: Thumb call to ARM"),
+		     sym_sec->owner, input_bfd, name);
+		}
+
+	      stub_type =
+		(info->shared | globals->pic_veneer)
+		/* PIC stubs.  */
+		? (r_type == R_ARM_THM_TLS_CALL
+		   /* TLS PIC stubs */
+		   ? (globals->use_blx ? arm_stub_long_branch_any_tls_pic
+		      : arm_stub_long_branch_v4t_thumb_tls_pic)
+		   : ((globals->use_blx && r_type == R_ARM_THM_CALL)
+		      /* V5T PIC and above.  */
+		      ? arm_stub_long_branch_any_arm_pic
+		      /* V4T PIC stub.  */
+		      : arm_stub_long_branch_v4t_thumb_arm_pic))
+
+		/* non-PIC stubs.  */
+		: ((globals->use_blx && r_type == R_ARM_THM_CALL)
+		   /* V5T and above.  */
+		   ? arm_stub_long_branch_any_any
+		   /* V4T.  */
+		   : arm_stub_long_branch_v4t_thumb_arm);
+
+	      /* Handle v4t short branches.  */
+	      if ((stub_type == arm_stub_long_branch_v4t_thumb_arm)
+		  && (branch_offset <= THM_MAX_FWD_BRANCH_OFFSET)
+		  && (branch_offset >= THM_MAX_BWD_BRANCH_OFFSET))
+		stub_type = arm_stub_short_branch_v4t_thumb_arm;
+	    }
+	}
+    }
+  else if (r_type == R_ARM_CALL
+	   || r_type == R_ARM_JUMP24
+	   || r_type == R_ARM_PLT32
+	   || r_type == R_ARM_TLS_CALL)
+    {
+      if (branch_type == ST_BRANCH_TO_THUMB)
+	{
+	  /* Arm to thumb.  */
+
+	  if (sym_sec != NULL
+	      && sym_sec->owner != NULL
+	      && !INTERWORK_FLAG (sym_sec->owner))
+	    {
+	      (*_bfd_error_handler)
+		(_("%B(%s): warning: interworking not enabled.\n"
+		   "  first occurrence: %B: ARM call to Thumb"),
+		 sym_sec->owner, input_bfd, name);
+	    }
+
+	  /* We have an extra 2-bytes reach because of
+	     the mode change (bit 24 (H) of BLX encoding).  */
+	  if (branch_offset > (ARM_MAX_FWD_BRANCH_OFFSET + 2)
+	      || (branch_offset < ARM_MAX_BWD_BRANCH_OFFSET)
+	      || (r_type == R_ARM_CALL && !globals->use_blx)
+	      || (r_type == R_ARM_JUMP24)
+	      || (r_type == R_ARM_PLT32))
+	    {
+	      stub_type = (info->shared | globals->pic_veneer)
+		/* PIC stubs.  */
+		? ((globals->use_blx)
+		   /* V5T and above.  */
+		   ? arm_stub_long_branch_any_thumb_pic
+		   /* V4T stub.  */
+		   : arm_stub_long_branch_v4t_arm_thumb_pic)
+
+		/* non-PIC stubs.  */
+		: ((globals->use_blx)
+		   /* V5T and above.  */
+		   ? arm_stub_long_branch_any_any
+		   /* V4T.  */
+		   : arm_stub_long_branch_v4t_arm_thumb);
+	    }
+	}
+      else
+	{
+	  /* Arm to arm.  */
+	  if (branch_offset > ARM_MAX_FWD_BRANCH_OFFSET
+	      || (branch_offset < ARM_MAX_BWD_BRANCH_OFFSET))
+	    {
+	      stub_type =
+		(info->shared | globals->pic_veneer)
+		/* PIC stubs.  */
+		? (r_type == R_ARM_TLS_CALL
+		   /* TLS PIC Stub */
+		   ? arm_stub_long_branch_any_tls_pic
+		   : arm_stub_long_branch_any_arm_pic)
+		/* non-PIC stubs.  */
+		: arm_stub_long_branch_any_any;
+	    }
+	}
+    }
+
+  /* If a stub is needed, record the actual destination type.  */
+  if (stub_type != arm_stub_none)
+    *actual_branch_type = branch_type;
+
+  return stub_type;
+}
+
+/* Build a name for an entry in the stub hash table.  */
+
+static char *
+elf32_arm_stub_name (const asection *input_section,
+		     const asection *sym_sec,
+		     const struct elf32_arm_link_hash_entry *hash,
+		     const Elf_Internal_Rela *rel,
+		     enum elf32_arm_stub_type stub_type)
+{
+  char *stub_name;
+  bfd_size_type len;
+
+  if (hash)
+    {
+      len = 8 + 1 + strlen (hash->root.root.root.string) + 1 + 8 + 1 + 2 + 1;
+      stub_name = (char *) bfd_malloc (len);
+      if (stub_name != NULL)
+	sprintf (stub_name, "%08x_%s+%x_%d",
+		 input_section->id & 0xffffffff,
+		 hash->root.root.root.string,
+		 (int) rel->r_addend & 0xffffffff,
+		 (int) stub_type);
+    }
+  else
+    {
+      len = 8 + 1 + 8 + 1 + 8 + 1 + 8 + 1 + 2 + 1;
+      stub_name = (char *) bfd_malloc (len);
+      if (stub_name != NULL)
+	sprintf (stub_name, "%08x_%x:%x+%x_%d",
+		 input_section->id & 0xffffffff,
+		 sym_sec->id & 0xffffffff,
+		 ELF32_R_TYPE (rel->r_info) == R_ARM_TLS_CALL
+		 || ELF32_R_TYPE (rel->r_info) == R_ARM_THM_TLS_CALL
+		 ? 0 : (int) ELF32_R_SYM (rel->r_info) & 0xffffffff,
+		 (int) rel->r_addend & 0xffffffff,
+		 (int) stub_type);
+    }
+
+  return stub_name;
+}
+
+/* Look up an entry in the stub hash.  Stub entries are cached because
+   creating the stub name takes a bit of time.  */
+
+static struct elf32_arm_stub_hash_entry *
+elf32_arm_get_stub_entry (const asection *input_section,
+			  const asection *sym_sec,
+			  struct elf_link_hash_entry *hash,
+			  const Elf_Internal_Rela *rel,
+			  struct elf32_arm_link_hash_table *htab,
+			  enum elf32_arm_stub_type stub_type)
+{
+  struct elf32_arm_stub_hash_entry *stub_entry;
+  struct elf32_arm_link_hash_entry *h = (struct elf32_arm_link_hash_entry *) hash;
+  const asection *id_sec;
+
+  if ((input_section->flags & SEC_CODE) == 0)
+    return NULL;
+
+  /* If this input section is part of a group of sections sharing one
+     stub section, then use the id of the first section in the group.
+     Stub names need to include a section id, as there may well be
+     more than one stub used to reach say, printf, and we need to
+     distinguish between them.  */
+  id_sec = htab->stub_group[input_section->id].link_sec;
+
+  if (h != NULL && h->stub_cache != NULL
+      && h->stub_cache->h == h
+      && h->stub_cache->id_sec == id_sec
+      && h->stub_cache->stub_type == stub_type)
+    {
+      stub_entry = h->stub_cache;
+    }
+  else
+    {
+      char *stub_name;
+
+      stub_name = elf32_arm_stub_name (id_sec, sym_sec, h, rel, stub_type);
+      if (stub_name == NULL)
+	return NULL;
+
+      stub_entry = arm_stub_hash_lookup (&htab->stub_hash_table,
+					stub_name, FALSE, FALSE);
+      if (h != NULL)
+	h->stub_cache = stub_entry;
+
+      free (stub_name);
+    }
+
+  return stub_entry;
+}
+
+/* Find or create a stub section.  Returns a pointer to the stub section, and
+   the section to which the stub section will be attached (in *LINK_SEC_P). 
+   LINK_SEC_P may be NULL.  */
+
+static asection *
+elf32_arm_create_or_find_stub_sec (asection **link_sec_p, asection *section,
+				   struct elf32_arm_link_hash_table *htab)
+{
+  asection *link_sec;
+  asection *stub_sec;
+
+  link_sec = htab->stub_group[section->id].link_sec;
+  stub_sec = htab->stub_group[section->id].stub_sec;
+  if (stub_sec == NULL)
+    {
+      stub_sec = htab->stub_group[link_sec->id].stub_sec;
+      if (stub_sec == NULL)
+	{
+	  size_t namelen;
+	  bfd_size_type len;
+	  char *s_name;
+
+	  namelen = strlen (link_sec->name);
+	  len = namelen + sizeof (STUB_SUFFIX);
+	  s_name = (char *) bfd_alloc (htab->stub_bfd, len);
+	  if (s_name == NULL)
+	    return NULL;
+
+	  memcpy (s_name, link_sec->name, namelen);
+	  memcpy (s_name + namelen, STUB_SUFFIX, sizeof (STUB_SUFFIX));
+	  stub_sec = (*htab->add_stub_section) (s_name, link_sec);
+	  if (stub_sec == NULL)
+	    return NULL;
+	  htab->stub_group[link_sec->id].stub_sec = stub_sec;
+	}
+      htab->stub_group[section->id].stub_sec = stub_sec;
+    }
+  
+  if (link_sec_p)
+    *link_sec_p = link_sec;
+  
+  return stub_sec;
+}
+
+/* Add a new stub entry to the stub hash.  Not all fields of the new
+   stub entry are initialised.  */
+
+static struct elf32_arm_stub_hash_entry *
+elf32_arm_add_stub (const char *stub_name,
+		    asection *section,
+		    struct elf32_arm_link_hash_table *htab)
+{
+  asection *link_sec;
+  asection *stub_sec;
+  struct elf32_arm_stub_hash_entry *stub_entry;
+
+  stub_sec = elf32_arm_create_or_find_stub_sec (&link_sec, section, htab);
+  if (stub_sec == NULL)
+    return NULL;
+
+  /* Enter this entry into the linker stub hash table.  */
+  stub_entry = arm_stub_hash_lookup (&htab->stub_hash_table, stub_name,
+				     TRUE, FALSE);
+  if (stub_entry == NULL)
+    {
+      (*_bfd_error_handler) (_("%s: cannot create stub entry %s"),
+			     section->owner,
+			     stub_name);
+      return NULL;
+    }
+
+  stub_entry->stub_sec = stub_sec;
+  stub_entry->stub_offset = 0;
+  stub_entry->id_sec = link_sec;
+
+  return stub_entry;
+}
+
+/* Store an Arm insn into an output section not processed by
+   elf32_arm_write_section.  */
+
+static void
+put_arm_insn (struct elf32_arm_link_hash_table * htab,
+	      bfd * output_bfd, bfd_vma val, void * ptr)
+{
+  if (htab->byteswap_code != bfd_little_endian (output_bfd))
+    bfd_putl32 (val, ptr);
+  else
+    bfd_putb32 (val, ptr);
+}
+
+/* Store a 16-bit Thumb insn into an output section not processed by
+   elf32_arm_write_section.  */
+
+static void
+put_thumb_insn (struct elf32_arm_link_hash_table * htab,
+		bfd * output_bfd, bfd_vma val, void * ptr)
+{
+  if (htab->byteswap_code != bfd_little_endian (output_bfd))
+    bfd_putl16 (val, ptr);
+  else
+    bfd_putb16 (val, ptr);
+}
+
+/* If it's possible to change R_TYPE to a more efficient access
+   model, return the new reloc type.  */
+
+static unsigned
+elf32_arm_tls_transition (struct bfd_link_info *info, int r_type, 
+			  struct elf_link_hash_entry *h)
+{
+  int is_local = (h == NULL);
+
+  if (info->shared || (h && h->root.type == bfd_link_hash_undefweak))
+    return r_type;
+
+  /* We do not support relaxations for Old TLS models.  */ 
+  switch (r_type)
+    {
+    case R_ARM_TLS_GOTDESC:
+    case R_ARM_TLS_CALL:
+    case R_ARM_THM_TLS_CALL:
+    case R_ARM_TLS_DESCSEQ:
+    case R_ARM_THM_TLS_DESCSEQ:
+      return is_local ? R_ARM_TLS_LE32 : R_ARM_TLS_IE32;
+    }
+
+  return r_type;
+}
+
+static bfd_reloc_status_type elf32_arm_final_link_relocate
+  (reloc_howto_type *, bfd *, bfd *, asection *, bfd_byte *,
+   Elf_Internal_Rela *, bfd_vma, struct bfd_link_info *, asection *,
+   const char *, unsigned char, enum arm_st_branch_type,
+   struct elf_link_hash_entry *, bfd_boolean *, char **);
+
+static unsigned int
+arm_stub_required_alignment (enum elf32_arm_stub_type stub_type)
+{
+  switch (stub_type)
+    {
+    case arm_stub_a8_veneer_b_cond:
+    case arm_stub_a8_veneer_b:
+    case arm_stub_a8_veneer_bl:
+      return 2;
+
+    case arm_stub_long_branch_any_any:
+    case arm_stub_long_branch_v4t_arm_thumb:
+    case arm_stub_long_branch_thumb_only:
+    case arm_stub_long_branch_v4t_thumb_thumb:
+    case arm_stub_long_branch_v4t_thumb_arm:
+    case arm_stub_short_branch_v4t_thumb_arm:
+    case arm_stub_long_branch_any_arm_pic:
+    case arm_stub_long_branch_any_thumb_pic:
+    case arm_stub_long_branch_v4t_thumb_thumb_pic:
+    case arm_stub_long_branch_v4t_arm_thumb_pic:
+    case arm_stub_long_branch_v4t_thumb_arm_pic:
+    case arm_stub_long_branch_thumb_only_pic:
+    case arm_stub_long_branch_any_tls_pic:
+    case arm_stub_long_branch_v4t_thumb_tls_pic:
+    case arm_stub_a8_veneer_blx:
+      return 4;
+    
+    default:
+      abort ();  /* Should be unreachable.  */
+    }
+}
+
+static bfd_boolean
+arm_build_one_stub (struct bfd_hash_entry *gen_entry,
+		    void * in_arg)
+{
+#define MAXRELOCS 2
+  struct elf32_arm_stub_hash_entry *stub_entry;
+  struct elf32_arm_link_hash_table *globals;
+  struct bfd_link_info *info;
+  asection *stub_sec;
+  bfd *stub_bfd;
+  bfd_byte *loc;
+  bfd_vma sym_value;
+  int template_size;
+  int size;
+  const insn_sequence *template_sequence;
+  int i;
+  int stub_reloc_idx[MAXRELOCS] = {-1, -1};
+  int stub_reloc_offset[MAXRELOCS] = {0, 0};
+  int nrelocs = 0;
+
+  /* Massage our args to the form they really have.  */
+  stub_entry = (struct elf32_arm_stub_hash_entry *) gen_entry;
+  info = (struct bfd_link_info *) in_arg;
+
+  globals = elf32_arm_hash_table (info);
+  if (globals == NULL)
+    return FALSE;
+
+  stub_sec = stub_entry->stub_sec;
+
+  if ((globals->fix_cortex_a8 < 0)
+      != (arm_stub_required_alignment (stub_entry->stub_type) == 2))
+    /* We have to do less-strictly-aligned fixes last.  */
+    return TRUE;
+
+  /* Make a note of the offset within the stubs for this entry.  */
+  stub_entry->stub_offset = stub_sec->size;
+  loc = stub_sec->contents + stub_entry->stub_offset;
+
+  stub_bfd = stub_sec->owner;
+
+  /* This is the address of the stub destination.  */
+  sym_value = (stub_entry->target_value
+	       + stub_entry->target_section->output_offset
+	       + stub_entry->target_section->output_section->vma);
+
+  template_sequence = stub_entry->stub_template;
+  template_size = stub_entry->stub_template_size;
+
+  size = 0;
+  for (i = 0; i < template_size; i++)
+    {
+      switch (template_sequence[i].type)
+	{
+	case THUMB16_TYPE:
+	  {
+	    bfd_vma data = (bfd_vma) template_sequence[i].data;
+	    if (template_sequence[i].reloc_addend != 0)
+	      {
+                /* We've borrowed the reloc_addend field to mean we should
+                   insert a condition code into this (Thumb-1 branch)
+                   instruction.  See THUMB16_BCOND_INSN.  */
+                BFD_ASSERT ((data & 0xff00) == 0xd000);
+                data |= ((stub_entry->orig_insn >> 22) & 0xf) << 8;
+	      }
+	    bfd_put_16 (stub_bfd, data, loc + size);
+	    size += 2;
+	  }
+	  break;
+
+	case THUMB32_TYPE:
+	  bfd_put_16 (stub_bfd,
+		      (template_sequence[i].data >> 16) & 0xffff,
+		      loc + size);
+	  bfd_put_16 (stub_bfd, template_sequence[i].data & 0xffff,
+		      loc + size + 2);
+          if (template_sequence[i].r_type != R_ARM_NONE)
+            {
+              stub_reloc_idx[nrelocs] = i;
+              stub_reloc_offset[nrelocs++] = size;
+            }
+          size += 4;
+          break;
+
+	case ARM_TYPE:
+	  bfd_put_32 (stub_bfd, template_sequence[i].data,
+		      loc + size);
+	  /* Handle cases where the target is encoded within the
+	     instruction.  */
+	  if (template_sequence[i].r_type == R_ARM_JUMP24)
+	    {
+	      stub_reloc_idx[nrelocs] = i;
+	      stub_reloc_offset[nrelocs++] = size;
+	    }
+	  size += 4;
+	  break;
+
+	case DATA_TYPE:
+	  bfd_put_32 (stub_bfd, template_sequence[i].data, loc + size);
+	  stub_reloc_idx[nrelocs] = i;
+	  stub_reloc_offset[nrelocs++] = size;
+	  size += 4;
+	  break;
+
+	default:
+	  BFD_FAIL ();
+	  return FALSE;
+	}
+    }
+
+  stub_sec->size += size;
+
+  /* Stub size has already been computed in arm_size_one_stub. Check
+     consistency.  */
+  BFD_ASSERT (size == stub_entry->stub_size);
+
+  /* Destination is Thumb. Force bit 0 to 1 to reflect this.  */
+  if (stub_entry->branch_type == ST_BRANCH_TO_THUMB)
+    sym_value |= 1;
+
+  /* Assume there is at least one and at most MAXRELOCS entries to relocate
+     in each stub.  */
+  BFD_ASSERT (nrelocs != 0 && nrelocs <= MAXRELOCS);
+
+  for (i = 0; i < nrelocs; i++)
+    if (template_sequence[stub_reloc_idx[i]].r_type == R_ARM_THM_JUMP24
+	|| template_sequence[stub_reloc_idx[i]].r_type == R_ARM_THM_JUMP19
+	|| template_sequence[stub_reloc_idx[i]].r_type == R_ARM_THM_CALL
+	|| template_sequence[stub_reloc_idx[i]].r_type == R_ARM_THM_XPC22)
+      {
+	Elf_Internal_Rela rel;
+	bfd_boolean unresolved_reloc;
+	char *error_message;
+	enum arm_st_branch_type branch_type
+	  = (template_sequence[stub_reloc_idx[i]].r_type != R_ARM_THM_XPC22
+	     ? ST_BRANCH_TO_THUMB : ST_BRANCH_TO_ARM);
+	bfd_vma points_to = sym_value + stub_entry->target_addend;
+
+	rel.r_offset = stub_entry->stub_offset + stub_reloc_offset[i];
+	rel.r_info = ELF32_R_INFO (0,
+                                   template_sequence[stub_reloc_idx[i]].r_type);
+	rel.r_addend = template_sequence[stub_reloc_idx[i]].reloc_addend;
+
+	if (stub_entry->stub_type == arm_stub_a8_veneer_b_cond && i == 0)
+	  /* The first relocation in the elf32_arm_stub_a8_veneer_b_cond[]
+	     template should refer back to the instruction after the original
+	     branch.  */
+	  points_to = sym_value;
+
+	/* There may be unintended consequences if this is not true.  */
+	BFD_ASSERT (stub_entry->h == NULL);
+
+	/* Note: _bfd_final_link_relocate doesn't handle these relocations
+	   properly.  We should probably use this function unconditionally,
+	   rather than only for certain relocations listed in the enclosing
+	   conditional, for the sake of consistency.  */
+	elf32_arm_final_link_relocate (elf32_arm_howto_from_type
+	    (template_sequence[stub_reloc_idx[i]].r_type),
+	  stub_bfd, info->output_bfd, stub_sec, stub_sec->contents, &rel,
+	  points_to, info, stub_entry->target_section, "", STT_FUNC,
+	  branch_type, (struct elf_link_hash_entry *) stub_entry->h,
+	  &unresolved_reloc, &error_message);
+      }
+    else
+      {
+	Elf_Internal_Rela rel;
+	bfd_boolean unresolved_reloc;
+	char *error_message;
+	bfd_vma points_to = sym_value + stub_entry->target_addend
+	  + template_sequence[stub_reloc_idx[i]].reloc_addend;
+
+	rel.r_offset = stub_entry->stub_offset + stub_reloc_offset[i];
+	rel.r_info = ELF32_R_INFO (0,
+                                   template_sequence[stub_reloc_idx[i]].r_type);
+	rel.r_addend = 0;
+
+	elf32_arm_final_link_relocate (elf32_arm_howto_from_type
+	    (template_sequence[stub_reloc_idx[i]].r_type),
+	  stub_bfd, info->output_bfd, stub_sec, stub_sec->contents, &rel,
+	  points_to, info, stub_entry->target_section, "", STT_FUNC,
+	  stub_entry->branch_type,
+	  (struct elf_link_hash_entry *) stub_entry->h, &unresolved_reloc,
+	  &error_message);
+      }
+
+  return TRUE;
+#undef MAXRELOCS
+}
+
+/* Calculate the template, template size and instruction size for a stub.
+   Return value is the instruction size.  */
+
+static unsigned int
+find_stub_size_and_template (enum elf32_arm_stub_type stub_type,
+			     const insn_sequence **stub_template,
+			     int *stub_template_size)
+{
+  const insn_sequence *template_sequence = NULL;
+  int template_size = 0, i;
+  unsigned int size;
+
+  template_sequence = stub_definitions[stub_type].template_sequence;
+  if (stub_template)
+    *stub_template = template_sequence;
+
+  template_size = stub_definitions[stub_type].template_size;
+  if (stub_template_size)
+    *stub_template_size = template_size;
+
+  size = 0;
+  for (i = 0; i < template_size; i++)
+    {
+      switch (template_sequence[i].type)
+	{
+	case THUMB16_TYPE:
+	  size += 2;
+	  break;
+
+	case ARM_TYPE:
+	case THUMB32_TYPE:
+	case DATA_TYPE:
+	  size += 4;
+	  break;
+
+	default:
+	  BFD_FAIL ();
+	  return 0;
+	}
+    }
+
+  return size;
+}
+
+/* As above, but don't actually build the stub.  Just bump offset so
+   we know stub section sizes.  */
+
+static bfd_boolean
+arm_size_one_stub (struct bfd_hash_entry *gen_entry,
+		   void *in_arg ATTRIBUTE_UNUSED)
+{
+  struct elf32_arm_stub_hash_entry *stub_entry;
+  const insn_sequence *template_sequence;
+  int template_size, size;
+
+  /* Massage our args to the form they really have.  */
+  stub_entry = (struct elf32_arm_stub_hash_entry *) gen_entry;
+
+  BFD_ASSERT((stub_entry->stub_type > arm_stub_none)
+	     && stub_entry->stub_type < ARRAY_SIZE(stub_definitions));
+
+  size = find_stub_size_and_template (stub_entry->stub_type, &template_sequence,
+				      &template_size);
+
+  stub_entry->stub_size = size;
+  stub_entry->stub_template = template_sequence;
+  stub_entry->stub_template_size = template_size;
+
+  size = (size + 7) & ~7;
+  stub_entry->stub_sec->size += size;
+
+  return TRUE;
+}
+
+/* External entry points for sizing and building linker stubs.  */
+
+/* Set up various things so that we can make a list of input sections
+   for each output section included in the link.  Returns -1 on error,
+   0 when no stubs will be needed, and 1 on success.  */
+
+int
+elf32_arm_setup_section_lists (bfd *output_bfd,
+			       struct bfd_link_info *info)
+{
+  bfd *input_bfd;
+  unsigned int bfd_count;
+  int top_id, top_index;
+  asection *section;
+  asection **input_list, **list;
+  bfd_size_type amt;
+  struct elf32_arm_link_hash_table *htab = elf32_arm_hash_table (info);
+
+  if (htab == NULL)
+    return 0;
+  if (! is_elf_hash_table (htab))
+    return 0;
+
+  /* Count the number of input BFDs and find the top input section id.  */
+  for (input_bfd = info->input_bfds, bfd_count = 0, top_id = 0;
+       input_bfd != NULL;
+       input_bfd = input_bfd->link_next)
+    {
+      bfd_count += 1;
+      for (section = input_bfd->sections;
+	   section != NULL;
+	   section = section->next)
+	{
+	  if (top_id < section->id)
+	    top_id = section->id;
+	}
+    }
+  htab->bfd_count = bfd_count;
+
+  amt = sizeof (struct map_stub) * (top_id + 1);
+  htab->stub_group = (struct map_stub *) bfd_zmalloc (amt);
+  if (htab->stub_group == NULL)
+    return -1;
+  htab->top_id = top_id;
+
+  /* We can't use output_bfd->section_count here to find the top output
+     section index as some sections may have been removed, and
+     _bfd_strip_section_from_output doesn't renumber the indices.  */
+  for (section = output_bfd->sections, top_index = 0;
+       section != NULL;
+       section = section->next)
+    {
+      if (top_index < section->index)
+	top_index = section->index;
+    }
+
+  htab->top_index = top_index;
+  amt = sizeof (asection *) * (top_index + 1);
+  input_list = (asection **) bfd_malloc (amt);
+  htab->input_list = input_list;
+  if (input_list == NULL)
+    return -1;
+
+  /* For sections we aren't interested in, mark their entries with a
+     value we can check later.  */
+  list = input_list + top_index;
+  do
+    *list = bfd_abs_section_ptr;
+  while (list-- != input_list);
+
+  for (section = output_bfd->sections;
+       section != NULL;
+       section = section->next)
+    {
+      if ((section->flags & SEC_CODE) != 0)
+	input_list[section->index] = NULL;
+    }
+
+  return 1;
+}
+
+/* The linker repeatedly calls this function for each input section,
+   in the order that input sections are linked into output sections.
+   Build lists of input sections to determine groupings between which
+   we may insert linker stubs.  */
+
+void
+elf32_arm_next_input_section (struct bfd_link_info *info,
+			      asection *isec)
+{
+  struct elf32_arm_link_hash_table *htab = elf32_arm_hash_table (info);
+
+  if (htab == NULL)
+    return;
+
+  if (isec->output_section->index <= htab->top_index)
+    {
+      asection **list = htab->input_list + isec->output_section->index;
+
+      if (*list != bfd_abs_section_ptr && (isec->flags & SEC_CODE) != 0)
+	{
+	  /* Steal the link_sec pointer for our list.  */
+#define PREV_SEC(sec) (htab->stub_group[(sec)->id].link_sec)
+	  /* This happens to make the list in reverse order,
+	     which we reverse later.  */
+	  PREV_SEC (isec) = *list;
+	  *list = isec;
+	}
+    }
+}
+
+/* See whether we can group stub sections together.  Grouping stub
+   sections may result in fewer stubs.  More importantly, we need to
+   put all .init* and .fini* stubs at the end of the .init or
+   .fini output sections respectively, because glibc splits the
+   _init and _fini functions into multiple parts.  Putting a stub in
+   the middle of a function is not a good idea.  */
+
+static void
+group_sections (struct elf32_arm_link_hash_table *htab,
+		bfd_size_type stub_group_size,
+		bfd_boolean stubs_always_after_branch)
+{
+  asection **list = htab->input_list;
+
+  do
+    {
+      asection *tail = *list;
+      asection *head;
+
+      if (tail == bfd_abs_section_ptr)
+	continue;
+
+      /* Reverse the list: we must avoid placing stubs at the
+	 beginning of the section because the beginning of the text
+	 section may be required for an interrupt vector in bare metal
+	 code.  */
+#define NEXT_SEC PREV_SEC
+      head = NULL;
+      while (tail != NULL)
+        {
+          /* Pop from tail.  */
+          asection *item = tail;
+          tail = PREV_SEC (item);
+
+          /* Push on head.  */
+          NEXT_SEC (item) = head;
+          head = item;
+        }
+
+      while (head != NULL)
+	{
+	  asection *curr;
+	  asection *next;
+	  bfd_vma stub_group_start = head->output_offset;
+	  bfd_vma end_of_next;
+
+	  curr = head;
+	  while (NEXT_SEC (curr) != NULL)
+	    {
+	      next = NEXT_SEC (curr);
+	      end_of_next = next->output_offset + next->size;
+	      if (end_of_next - stub_group_start >= stub_group_size)
+		/* End of NEXT is too far from start, so stop.  */
+		break;
+	      /* Add NEXT to the group.  */
+	      curr = next;
+	    }
+
+	  /* OK, the size from the start to the start of CURR is less
+	     than stub_group_size and thus can be handled by one stub
+	     section.  (Or the head section is itself larger than
+	     stub_group_size, in which case we may be toast.)
+	     We should really be keeping track of the total size of
+	     stubs added here, as stubs contribute to the final output
+	     section size.  */
+	  do
+	    {
+	      next = NEXT_SEC (head);
+	      /* Set up this stub group.  */
+	      htab->stub_group[head->id].link_sec = curr;
+	    }
+	  while (head != curr && (head = next) != NULL);
+
+	  /* But wait, there's more!  Input sections up to stub_group_size
+	     bytes after the stub section can be handled by it too.  */
+	  if (!stubs_always_after_branch)
+	    {
+	      stub_group_start = curr->output_offset + curr->size;
+
+	      while (next != NULL)
+		{
+		  end_of_next = next->output_offset + next->size;
+		  if (end_of_next - stub_group_start >= stub_group_size)
+		    /* End of NEXT is too far from stubs, so stop.  */
+		    break;
+		  /* Add NEXT to the stub group.  */
+		  head = next;
+		  next = NEXT_SEC (head);
+		  htab->stub_group[head->id].link_sec = curr;
+		}
+	    }
+	  head = next;
+	}
+    }
+  while (list++ != htab->input_list + htab->top_index);
+
+  free (htab->input_list);
+#undef PREV_SEC
+#undef NEXT_SEC
+}
+
+/* Comparison function for sorting/searching relocations relating to Cortex-A8
+   erratum fix.  */
+
+static int
+a8_reloc_compare (const void *a, const void *b)
+{
+  const struct a8_erratum_reloc *ra = (const struct a8_erratum_reloc *) a;
+  const struct a8_erratum_reloc *rb = (const struct a8_erratum_reloc *) b;
+
+  if (ra->from < rb->from)
+    return -1;
+  else if (ra->from > rb->from)
+    return 1;
+  else
+    return 0;
+}
+
+static struct elf_link_hash_entry *find_thumb_glue (struct bfd_link_info *,
+						    const char *, char **);
+
+/* Helper function to scan code for sequences which might trigger the Cortex-A8
+   branch/TLB erratum.  Fill in the table described by A8_FIXES_P,
+   NUM_A8_FIXES_P, A8_FIX_TABLE_SIZE_P.  Returns true if an error occurs, false
+   otherwise.  */
+
+static bfd_boolean
+cortex_a8_erratum_scan (bfd *input_bfd,
+			struct bfd_link_info *info,
+			struct a8_erratum_fix **a8_fixes_p,
+			unsigned int *num_a8_fixes_p,
+			unsigned int *a8_fix_table_size_p,
+			struct a8_erratum_reloc *a8_relocs,
+			unsigned int num_a8_relocs,
+			unsigned prev_num_a8_fixes,
+			bfd_boolean *stub_changed_p)
+{
+  asection *section;
+  struct elf32_arm_link_hash_table *htab = elf32_arm_hash_table (info);
+  struct a8_erratum_fix *a8_fixes = *a8_fixes_p;
+  unsigned int num_a8_fixes = *num_a8_fixes_p;
+  unsigned int a8_fix_table_size = *a8_fix_table_size_p;
+
+  if (htab == NULL)
+    return FALSE;
+
+  for (section = input_bfd->sections;
+       section != NULL;
+       section = section->next)
+    {
+      bfd_byte *contents = NULL;
+      struct _arm_elf_section_data *sec_data;
+      unsigned int span;
+      bfd_vma base_vma;
+
+      if (elf_section_type (section) != SHT_PROGBITS
+          || (elf_section_flags (section) & SHF_EXECINSTR) == 0
+          || (section->flags & SEC_EXCLUDE) != 0
+          || (section->sec_info_type == ELF_INFO_TYPE_JUST_SYMS)
+          || (section->output_section == bfd_abs_section_ptr))
+        continue;
+
+      base_vma = section->output_section->vma + section->output_offset;
+
+      if (elf_section_data (section)->this_hdr.contents != NULL)
+        contents = elf_section_data (section)->this_hdr.contents;
+      else if (! bfd_malloc_and_get_section (input_bfd, section, &contents))
+        return TRUE;
+
+      sec_data = elf32_arm_section_data (section);
+
+      for (span = 0; span < sec_data->mapcount; span++)
+        {
+          unsigned int span_start = sec_data->map[span].vma;
+          unsigned int span_end = (span == sec_data->mapcount - 1)
+            ? section->size : sec_data->map[span + 1].vma;
+          unsigned int i;
+          char span_type = sec_data->map[span].type;
+          bfd_boolean last_was_32bit = FALSE, last_was_branch = FALSE;
+
+          if (span_type != 't')
+            continue;
+
+          /* Span is entirely within a single 4KB region: skip scanning.  */
+          if (((base_vma + span_start) & ~0xfff)
+	      == ((base_vma + span_end) & ~0xfff))
+            continue;
+
+          /* Scan for 32-bit Thumb-2 branches which span two 4K regions, where:
+
+               * The opcode is BLX.W, BL.W, B.W, Bcc.W
+               * The branch target is in the same 4KB region as the
+                 first half of the branch.
+               * The instruction before the branch is a 32-bit
+                 length non-branch instruction.  */
+          for (i = span_start; i < span_end;)
+            {
+              unsigned int insn = bfd_getl16 (&contents[i]);
+              bfd_boolean insn_32bit = FALSE, is_blx = FALSE, is_b = FALSE;
+	      bfd_boolean is_bl = FALSE, is_bcc = FALSE, is_32bit_branch;
+
+              if ((insn & 0xe000) == 0xe000 && (insn & 0x1800) != 0x0000)
+                insn_32bit = TRUE;
+
+	      if (insn_32bit)
+	        {
+                  /* Load the rest of the insn (in manual-friendly order).  */
+                  insn = (insn << 16) | bfd_getl16 (&contents[i + 2]);
+
+        	  /* Encoding T4: B<c>.W.  */
+        	  is_b = (insn & 0xf800d000) == 0xf0009000;
+        	  /* Encoding T1: BL<c>.W.  */
+        	  is_bl = (insn & 0xf800d000) == 0xf000d000;
+        	  /* Encoding T2: BLX<c>.W.  */
+        	  is_blx = (insn & 0xf800d000) == 0xf000c000;
+		  /* Encoding T3: B<c>.W (not permitted in IT block).  */
+		  is_bcc = (insn & 0xf800d000) == 0xf0008000
+			   && (insn & 0x07f00000) != 0x03800000;
+		}
+
+	      is_32bit_branch = is_b || is_bl || is_blx || is_bcc;
+
+              if (((base_vma + i) & 0xfff) == 0xffe
+		  && insn_32bit
+		  && is_32bit_branch
+		  && last_was_32bit
+		  && ! last_was_branch)
+                {
+                  bfd_signed_vma offset = 0;
+                  bfd_boolean force_target_arm = FALSE;
+		  bfd_boolean force_target_thumb = FALSE;
+                  bfd_vma target;
+                  enum elf32_arm_stub_type stub_type = arm_stub_none;
+                  struct a8_erratum_reloc key, *found;
+                  bfd_boolean use_plt = FALSE;
+
+                  key.from = base_vma + i;
+                  found = (struct a8_erratum_reloc *)
+                      bsearch (&key, a8_relocs, num_a8_relocs,
+                               sizeof (struct a8_erratum_reloc),
+                               &a8_reloc_compare);
+
+		  if (found)
+		    {
+		      char *error_message = NULL;
+		      struct elf_link_hash_entry *entry;
+
+		      /* We don't care about the error returned from this
+		         function, only if there is glue or not.  */
+		      entry = find_thumb_glue (info, found->sym_name,
+					       &error_message);
+
+		      if (entry)
+			found->non_a8_stub = TRUE;
+
+		      /* Keep a simpler condition, for the sake of clarity.  */
+		      if (htab->root.splt != NULL && found->hash != NULL
+			  && found->hash->root.plt.offset != (bfd_vma) -1)
+			use_plt = TRUE;
+
+		      if (found->r_type == R_ARM_THM_CALL)
+			{
+			  if (found->branch_type == ST_BRANCH_TO_ARM
+			      || use_plt)
+			    force_target_arm = TRUE;
+			  else
+			    force_target_thumb = TRUE;
+			}
+		    }
+
+                  /* Check if we have an offending branch instruction.  */
+
+		  if (found && found->non_a8_stub)
+		    /* We've already made a stub for this instruction, e.g.
+		       it's a long branch or a Thumb->ARM stub.  Assume that
+		       stub will suffice to work around the A8 erratum (see
+		       setting of always_after_branch above).  */
+		    ;
+                  else if (is_bcc)
+                    {
+                      offset = (insn & 0x7ff) << 1;
+                      offset |= (insn & 0x3f0000) >> 4;
+                      offset |= (insn & 0x2000) ? 0x40000 : 0;
+                      offset |= (insn & 0x800) ? 0x80000 : 0;
+                      offset |= (insn & 0x4000000) ? 0x100000 : 0;
+                      if (offset & 0x100000)
+                        offset |= ~ ((bfd_signed_vma) 0xfffff);
+                      stub_type = arm_stub_a8_veneer_b_cond;
+                    }
+                  else if (is_b || is_bl || is_blx)
+                    {
+                      int s = (insn & 0x4000000) != 0;
+                      int j1 = (insn & 0x2000) != 0;
+                      int j2 = (insn & 0x800) != 0;
+                      int i1 = !(j1 ^ s);
+                      int i2 = !(j2 ^ s);
+
+                      offset = (insn & 0x7ff) << 1;
+                      offset |= (insn & 0x3ff0000) >> 4;
+                      offset |= i2 << 22;
+                      offset |= i1 << 23;
+                      offset |= s << 24;
+                      if (offset & 0x1000000)
+                        offset |= ~ ((bfd_signed_vma) 0xffffff);
+
+                      if (is_blx)
+                        offset &= ~ ((bfd_signed_vma) 3);
+
+                      stub_type = is_blx ? arm_stub_a8_veneer_blx :
+                        is_bl ? arm_stub_a8_veneer_bl : arm_stub_a8_veneer_b;
+                    }
+
+                  if (stub_type != arm_stub_none)
+                    {
+                      bfd_vma pc_for_insn = base_vma + i + 4;
+
+		      /* The original instruction is a BL, but the target is
+		         an ARM instruction.  If we were not making a stub,
+			 the BL would have been converted to a BLX.  Use the
+			 BLX stub instead in that case.  */
+		      if (htab->use_blx && force_target_arm
+			  && stub_type == arm_stub_a8_veneer_bl)
+			{
+			  stub_type = arm_stub_a8_veneer_blx;
+			  is_blx = TRUE;
+			  is_bl = FALSE;
+			}
+		      /* Conversely, if the original instruction was
+			 BLX but the target is Thumb mode, use the BL
+			 stub.  */
+		      else if (force_target_thumb
+			       && stub_type == arm_stub_a8_veneer_blx)
+			{
+			  stub_type = arm_stub_a8_veneer_bl;
+			  is_blx = FALSE;
+			  is_bl = TRUE;
+			}
+
+                      if (is_blx)
+                        pc_for_insn &= ~ ((bfd_vma) 3);
+
+                      /* If we found a relocation, use the proper destination,
+		         not the offset in the (unrelocated) instruction.
+			 Note this is always done if we switched the stub type
+			 above.  */
+                      if (found)
+                        offset =
+			  (bfd_signed_vma) (found->destination - pc_for_insn);
+
+                      /* If the stub will use a Thumb-mode branch to a
+                         PLT target, redirect it to the preceding Thumb
+                         entry point.  */
+                      if (stub_type != arm_stub_a8_veneer_blx && use_plt)
+                        offset -= PLT_THUMB_STUB_SIZE;
+
+                      target = pc_for_insn + offset;
+
+                      /* The BLX stub is ARM-mode code.  Adjust the offset to
+		         take the different PC value (+8 instead of +4) into
+			 account.  */
+                      if (stub_type == arm_stub_a8_veneer_blx)
+                        offset += 4;
+
+                      if (((base_vma + i) & ~0xfff) == (target & ~0xfff))
+                        {
+                          char *stub_name = NULL;
+
+                          if (num_a8_fixes == a8_fix_table_size)
+                            {
+                              a8_fix_table_size *= 2;
+                              a8_fixes = (struct a8_erratum_fix *)
+                                  bfd_realloc (a8_fixes,
+                                               sizeof (struct a8_erratum_fix)
+                                               * a8_fix_table_size);
+                            }
+
+			  if (num_a8_fixes < prev_num_a8_fixes)
+			    {
+			      /* If we're doing a subsequent scan,
+				 check if we've found the same fix as
+				 before, and try and reuse the stub
+				 name.  */
+			      stub_name = a8_fixes[num_a8_fixes].stub_name;
+			      if ((a8_fixes[num_a8_fixes].section != section)
+				  || (a8_fixes[num_a8_fixes].offset != i))
+				{
+				  free (stub_name);
+				  stub_name = NULL;
+				  *stub_changed_p = TRUE;
+				}
+			    }
+
+			  if (!stub_name)
+			    {
+			      stub_name = (char *) bfd_malloc (8 + 1 + 8 + 1);
+			      if (stub_name != NULL)
+				sprintf (stub_name, "%x:%x", section->id, i);
+			    }
+
+                          a8_fixes[num_a8_fixes].input_bfd = input_bfd;
+                          a8_fixes[num_a8_fixes].section = section;
+                          a8_fixes[num_a8_fixes].offset = i;
+                          a8_fixes[num_a8_fixes].addend = offset;
+                          a8_fixes[num_a8_fixes].orig_insn = insn;
+                          a8_fixes[num_a8_fixes].stub_name = stub_name;
+                          a8_fixes[num_a8_fixes].stub_type = stub_type;
+                          a8_fixes[num_a8_fixes].branch_type =
+			    is_blx ? ST_BRANCH_TO_ARM : ST_BRANCH_TO_THUMB;
+
+                          num_a8_fixes++;
+                        }
+                    }
+                }
+
+              i += insn_32bit ? 4 : 2;
+              last_was_32bit = insn_32bit;
+	      last_was_branch = is_32bit_branch;
+            }
+        }
+
+      if (elf_section_data (section)->this_hdr.contents == NULL)
+        free (contents);
+    }
+
+  *a8_fixes_p = a8_fixes;
+  *num_a8_fixes_p = num_a8_fixes;
+  *a8_fix_table_size_p = a8_fix_table_size;
+
+  return FALSE;
+}
+
+/* Determine and set the size of the stub section for a final link.
+
+   The basic idea here is to examine all the relocations looking for
+   PC-relative calls to a target that is unreachable with a "bl"
+   instruction.  */
+
+bfd_boolean
+elf32_arm_size_stubs (bfd *output_bfd,
+		      bfd *stub_bfd,
+		      struct bfd_link_info *info,
+		      bfd_signed_vma group_size,
+		      asection * (*add_stub_section) (const char *, asection *),
+		      void (*layout_sections_again) (void))
+{
+  bfd_size_type stub_group_size;
+  bfd_boolean stubs_always_after_branch;
+  struct elf32_arm_link_hash_table *htab = elf32_arm_hash_table (info);
+  struct a8_erratum_fix *a8_fixes = NULL;
+  unsigned int num_a8_fixes = 0, a8_fix_table_size = 10;
+  struct a8_erratum_reloc *a8_relocs = NULL;
+  unsigned int num_a8_relocs = 0, a8_reloc_table_size = 10, i;
+
+  if (htab == NULL)
+    return FALSE;
+
+  if (htab->fix_cortex_a8)
+    {
+      a8_fixes = (struct a8_erratum_fix *)
+          bfd_zmalloc (sizeof (struct a8_erratum_fix) * a8_fix_table_size);
+      a8_relocs = (struct a8_erratum_reloc *)
+          bfd_zmalloc (sizeof (struct a8_erratum_reloc) * a8_reloc_table_size);
+    }
+
+  /* Propagate mach to stub bfd, because it may not have been
+     finalized when we created stub_bfd.  */
+  bfd_set_arch_mach (stub_bfd, bfd_get_arch (output_bfd),
+		     bfd_get_mach (output_bfd));
+
+  /* Stash our params away.  */
+  htab->stub_bfd = stub_bfd;
+  htab->add_stub_section = add_stub_section;
+  htab->layout_sections_again = layout_sections_again;
+  stubs_always_after_branch = group_size < 0;
+
+  /* The Cortex-A8 erratum fix depends on stubs not being in the same 4K page
+     as the first half of a 32-bit branch straddling two 4K pages.  This is a
+     crude way of enforcing that.  */
+  if (htab->fix_cortex_a8)
+    stubs_always_after_branch = 1;
+
+  if (group_size < 0)
+    stub_group_size = -group_size;
+  else
+    stub_group_size = group_size;
+
+  if (stub_group_size == 1)
+    {
+      /* Default values.  */
+      /* Thumb branch range is +-4MB has to be used as the default
+	 maximum size (a given section can contain both ARM and Thumb
+	 code, so the worst case has to be taken into account).
+
+	 This value is 24K less than that, which allows for 2025
+	 12-byte stubs.  If we exceed that, then we will fail to link.
+	 The user will have to relink with an explicit group size
+	 option.  */
+      stub_group_size = 4170000;
+    }
+
+  group_sections (htab, stub_group_size, stubs_always_after_branch);
+
+  /* If we're applying the cortex A8 fix, we need to determine the
+     program header size now, because we cannot change it later --
+     that could alter section placements.  Notice the A8 erratum fix
+     ends up requiring the section addresses to remain unchanged
+     modulo the page size.  That's something we cannot represent
+     inside BFD, and we don't want to force the section alignment to
+     be the page size.  */
+  if (htab->fix_cortex_a8)
+    (*htab->layout_sections_again) ();
+
+  while (1)
+    {
+      bfd *input_bfd;
+      unsigned int bfd_indx;
+      asection *stub_sec;
+      bfd_boolean stub_changed = FALSE;
+      unsigned prev_num_a8_fixes = num_a8_fixes;
+
+      num_a8_fixes = 0;
+      for (input_bfd = info->input_bfds, bfd_indx = 0;
+	   input_bfd != NULL;
+	   input_bfd = input_bfd->link_next, bfd_indx++)
+	{
+	  Elf_Internal_Shdr *symtab_hdr;
+	  asection *section;
+	  Elf_Internal_Sym *local_syms = NULL;
+
+	  num_a8_relocs = 0;
+
+	  /* We'll need the symbol table in a second.  */
+	  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+	  if (symtab_hdr->sh_info == 0)
+	    continue;
+
+	  /* Walk over each section attached to the input bfd.  */
+	  for (section = input_bfd->sections;
+	       section != NULL;
+	       section = section->next)
+	    {
+	      Elf_Internal_Rela *internal_relocs, *irelaend, *irela;
+
+	      /* If there aren't any relocs, then there's nothing more
+		 to do.  */
+	      if ((section->flags & SEC_RELOC) == 0
+		  || section->reloc_count == 0
+		  || (section->flags & SEC_CODE) == 0)
+		continue;
+
+	      /* If this section is a link-once section that will be
+		 discarded, then don't create any stubs.  */
+	      if (section->output_section == NULL
+		  || section->output_section->owner != output_bfd)
+		continue;
+
+	      /* Get the relocs.  */
+	      internal_relocs
+		= _bfd_elf_link_read_relocs (input_bfd, section, NULL,
+					     NULL, info->keep_memory);
+	      if (internal_relocs == NULL)
+		goto error_ret_free_local;
+
+	      /* Now examine each relocation.  */
+	      irela = internal_relocs;
+	      irelaend = irela + section->reloc_count;
+	      for (; irela < irelaend; irela++)
+		{
+		  unsigned int r_type, r_indx;
+		  enum elf32_arm_stub_type stub_type;
+		  struct elf32_arm_stub_hash_entry *stub_entry;
+		  asection *sym_sec;
+		  bfd_vma sym_value;
+		  bfd_vma destination;
+		  struct elf32_arm_link_hash_entry *hash;
+		  const char *sym_name;
+		  char *stub_name;
+		  const asection *id_sec;
+		  unsigned char st_type;
+		  enum arm_st_branch_type branch_type;
+		  bfd_boolean created_stub = FALSE;
+
+		  r_type = ELF32_R_TYPE (irela->r_info);
+		  r_indx = ELF32_R_SYM (irela->r_info);
+
+		  if (r_type >= (unsigned int) R_ARM_max)
+		    {
+		      bfd_set_error (bfd_error_bad_value);
+		    error_ret_free_internal:
+		      if (elf_section_data (section)->relocs == NULL)
+			free (internal_relocs);
+		      goto error_ret_free_local;
+		    }
+		  
+		  hash = NULL;
+		  if (r_indx >= symtab_hdr->sh_info)
+		    hash = elf32_arm_hash_entry
+		      (elf_sym_hashes (input_bfd)
+		       [r_indx - symtab_hdr->sh_info]);
+		  
+		  /* Only look for stubs on branch instructions, or
+		     non-relaxed TLSCALL  */
+		  if ((r_type != (unsigned int) R_ARM_CALL)
+		      && (r_type != (unsigned int) R_ARM_THM_CALL)
+		      && (r_type != (unsigned int) R_ARM_JUMP24)
+		      && (r_type != (unsigned int) R_ARM_THM_JUMP19)
+		      && (r_type != (unsigned int) R_ARM_THM_XPC22)
+		      && (r_type != (unsigned int) R_ARM_THM_JUMP24)
+		      && (r_type != (unsigned int) R_ARM_PLT32)
+		      && !((r_type == (unsigned int) R_ARM_TLS_CALL
+			    || r_type == (unsigned int) R_ARM_THM_TLS_CALL)
+			   && r_type == elf32_arm_tls_transition
+			       (info, r_type, &hash->root)
+			   && ((hash ? hash->tls_type
+				: (elf32_arm_local_got_tls_type
+				   (input_bfd)[r_indx]))
+			       & GOT_TLS_GDESC) != 0))
+		    continue;
+
+		  /* Now determine the call target, its name, value,
+		     section.  */
+		  sym_sec = NULL;
+		  sym_value = 0;
+		  destination = 0;
+		  sym_name = NULL;
+		  
+		  if (r_type == (unsigned int) R_ARM_TLS_CALL
+		      || r_type == (unsigned int) R_ARM_THM_TLS_CALL)
+		    {
+		      /* A non-relaxed TLS call.  The target is the
+			 plt-resident trampoline and nothing to do
+			 with the symbol.  */
+		      BFD_ASSERT (htab->tls_trampoline > 0);
+		      sym_sec = htab->root.splt;
+		      sym_value = htab->tls_trampoline;
+		      hash = 0;
+		      st_type = STT_FUNC;
+		      branch_type = ST_BRANCH_TO_ARM;
+		    }
+		  else if (!hash)
+		    {
+		      /* It's a local symbol.  */
+		      Elf_Internal_Sym *sym;
+
+		      if (local_syms == NULL)
+			{
+			  local_syms
+			    = (Elf_Internal_Sym *) symtab_hdr->contents;
+			  if (local_syms == NULL)
+			    local_syms
+			      = bfd_elf_get_elf_syms (input_bfd, symtab_hdr,
+						      symtab_hdr->sh_info, 0,
+						      NULL, NULL, NULL);
+			  if (local_syms == NULL)
+			    goto error_ret_free_internal;
+			}
+
+		      sym = local_syms + r_indx;
+		      if (sym->st_shndx == SHN_UNDEF)
+			sym_sec = bfd_und_section_ptr;
+		      else if (sym->st_shndx == SHN_ABS)
+			sym_sec = bfd_abs_section_ptr;
+		      else if (sym->st_shndx == SHN_COMMON)
+			sym_sec = bfd_com_section_ptr;
+		      else
+			sym_sec =
+			  bfd_section_from_elf_index (input_bfd, sym->st_shndx);
+
+		      if (!sym_sec)
+			/* This is an undefined symbol.  It can never
+			   be resolved. */
+			continue;
+
+		      if (ELF_ST_TYPE (sym->st_info) != STT_SECTION)
+			sym_value = sym->st_value;
+		      destination = (sym_value + irela->r_addend
+				     + sym_sec->output_offset
+				     + sym_sec->output_section->vma);
+		      st_type = ELF_ST_TYPE (sym->st_info);
+		      branch_type = ARM_SYM_BRANCH_TYPE (sym);
+		      sym_name
+			= bfd_elf_string_from_elf_section (input_bfd,
+							   symtab_hdr->sh_link,
+							   sym->st_name);
+		    }
+		  else
+		    {
+		      /* It's an external symbol.  */
+		      while (hash->root.root.type == bfd_link_hash_indirect
+			     || hash->root.root.type == bfd_link_hash_warning)
+			hash = ((struct elf32_arm_link_hash_entry *)
+				hash->root.root.u.i.link);
+
+		      if (hash->root.root.type == bfd_link_hash_defined
+			  || hash->root.root.type == bfd_link_hash_defweak)
+			{
+			  sym_sec = hash->root.root.u.def.section;
+			  sym_value = hash->root.root.u.def.value;
+
+			  struct elf32_arm_link_hash_table *globals =
+						  elf32_arm_hash_table (info);
+
+			  /* For a destination in a shared library,
+			     use the PLT stub as target address to
+			     decide whether a branch stub is
+			     needed.  */
+			  if (globals != NULL
+			      && globals->root.splt != NULL
+			      && hash != NULL
+			      && hash->root.plt.offset != (bfd_vma) -1)
+			    {
+			      sym_sec = globals->root.splt;
+			      sym_value = hash->root.plt.offset;
+			      if (sym_sec->output_section != NULL)
+				destination = (sym_value
+					       + sym_sec->output_offset
+					       + sym_sec->output_section->vma);
+			    }
+			  else if (sym_sec->output_section != NULL)
+			    destination = (sym_value + irela->r_addend
+					   + sym_sec->output_offset
+					   + sym_sec->output_section->vma);
+			}
+		      else if ((hash->root.root.type == bfd_link_hash_undefined)
+			       || (hash->root.root.type == bfd_link_hash_undefweak))
+			{
+			  /* For a shared library, use the PLT stub as
+			     target address to decide whether a long
+			     branch stub is needed.
+			     For absolute code, they cannot be handled.  */
+			  struct elf32_arm_link_hash_table *globals =
+			    elf32_arm_hash_table (info);
+
+			  if (globals != NULL
+			      && globals->root.splt != NULL
+			      && hash != NULL
+			      && hash->root.plt.offset != (bfd_vma) -1)
+			    {
+			      sym_sec = globals->root.splt;
+			      sym_value = hash->root.plt.offset;
+			      if (sym_sec->output_section != NULL)
+				destination = (sym_value
+					       + sym_sec->output_offset
+					       + sym_sec->output_section->vma);
+			    }
+			  else
+			    continue;
+			}
+		      else
+			{
+			  bfd_set_error (bfd_error_bad_value);
+			  goto error_ret_free_internal;
+			}
+		      st_type = hash->root.type;
+		      branch_type = hash->root.target_internal;
+		      sym_name = hash->root.root.root.string;
+		    }
+
+		  do
+		    {
+		      /* Determine what (if any) linker stub is needed.  */
+		      stub_type = arm_type_of_stub (info, section, irela,
+						    st_type, &branch_type,
+						    hash, destination, sym_sec,
+						    input_bfd, sym_name);
+		      if (stub_type == arm_stub_none)
+			break;
+
+		      /* Support for grouping stub sections.  */
+		      id_sec = htab->stub_group[section->id].link_sec;
+
+		      /* Get the name of this stub.  */
+		      stub_name = elf32_arm_stub_name (id_sec, sym_sec, hash,
+						       irela, stub_type);
+		      if (!stub_name)
+			goto error_ret_free_internal;
+
+		      /* We've either created a stub for this reloc already,
+			 or we are about to.  */
+		      created_stub = TRUE;
+
+		      stub_entry = arm_stub_hash_lookup
+				     (&htab->stub_hash_table, stub_name,
+				      FALSE, FALSE);
+		      if (stub_entry != NULL)
+			{
+			  /* The proper stub has already been created.  */
+			  free (stub_name);
+			  stub_entry->target_value = sym_value;
+			  break;
+			}
+
+		      stub_entry = elf32_arm_add_stub (stub_name, section,
+						       htab);
+		      if (stub_entry == NULL)
+			{
+			  free (stub_name);
+			  goto error_ret_free_internal;
+			}
+
+                      stub_entry->target_value = sym_value;
+                      stub_entry->target_section = sym_sec;
+                      stub_entry->stub_type = stub_type;
+                      stub_entry->h = hash;
+                      stub_entry->branch_type = branch_type;
+
+                      if (sym_name == NULL)
+                	sym_name = "unnamed";
+                      stub_entry->output_name = (char *)
+                          bfd_alloc (htab->stub_bfd,
+                                     sizeof (THUMB2ARM_GLUE_ENTRY_NAME)
+                                     + strlen (sym_name));
+                      if (stub_entry->output_name == NULL)
+                	{
+                          free (stub_name);
+                          goto error_ret_free_internal;
+                	}
+
+                      /* For historical reasons, use the existing names for
+                	 ARM-to-Thumb and Thumb-to-ARM stubs.  */
+                      if ((r_type == (unsigned int) R_ARM_THM_CALL
+			   || r_type == (unsigned int) R_ARM_THM_JUMP24)
+			  && branch_type == ST_BRANCH_TO_ARM)
+                	sprintf (stub_entry->output_name,
+                        	 THUMB2ARM_GLUE_ENTRY_NAME, sym_name);
+                      else if ((r_type == (unsigned int) R_ARM_CALL
+			       || r_type == (unsigned int) R_ARM_JUMP24)
+			       && branch_type == ST_BRANCH_TO_THUMB)
+                	sprintf (stub_entry->output_name,
+                        	 ARM2THUMB_GLUE_ENTRY_NAME, sym_name);
+                      else
+                	sprintf (stub_entry->output_name, STUB_ENTRY_NAME,
+                        	 sym_name);
+
+                      stub_changed = TRUE;
+                    }
+                  while (0);
+
+                  /* Look for relocations which might trigger Cortex-A8
+                     erratum.  */
+                  if (htab->fix_cortex_a8
+                      && (r_type == (unsigned int) R_ARM_THM_JUMP24
+                          || r_type == (unsigned int) R_ARM_THM_JUMP19
+                          || r_type == (unsigned int) R_ARM_THM_CALL
+                          || r_type == (unsigned int) R_ARM_THM_XPC22))
+                    {
+                      bfd_vma from = section->output_section->vma
+                                     + section->output_offset
+                                     + irela->r_offset;
+
+                      if ((from & 0xfff) == 0xffe)
+                        {
+                          /* Found a candidate.  Note we haven't checked the
+                             destination is within 4K here: if we do so (and
+                             don't create an entry in a8_relocs) we can't tell
+                             that a branch should have been relocated when
+                             scanning later.  */
+                          if (num_a8_relocs == a8_reloc_table_size)
+                            {
+                              a8_reloc_table_size *= 2;
+                              a8_relocs = (struct a8_erratum_reloc *)
+                                  bfd_realloc (a8_relocs,
+                                               sizeof (struct a8_erratum_reloc)
+                                               * a8_reloc_table_size);
+                            }
+
+                          a8_relocs[num_a8_relocs].from = from;
+                          a8_relocs[num_a8_relocs].destination = destination;
+                          a8_relocs[num_a8_relocs].r_type = r_type;
+                          a8_relocs[num_a8_relocs].branch_type = branch_type;
+                          a8_relocs[num_a8_relocs].sym_name = sym_name;
+                          a8_relocs[num_a8_relocs].non_a8_stub = created_stub;
+                          a8_relocs[num_a8_relocs].hash = hash;
+
+                          num_a8_relocs++;
+                        }
+                    }
+		}
+
+              /* We're done with the internal relocs, free them.  */
+              if (elf_section_data (section)->relocs == NULL)
+                free (internal_relocs);
+            }
+
+          if (htab->fix_cortex_a8)
+	    {
+              /* Sort relocs which might apply to Cortex-A8 erratum.  */
+              qsort (a8_relocs, num_a8_relocs,
+		     sizeof (struct a8_erratum_reloc),
+                     &a8_reloc_compare);
+
+              /* Scan for branches which might trigger Cortex-A8 erratum.  */
+              if (cortex_a8_erratum_scan (input_bfd, info, &a8_fixes,
+					  &num_a8_fixes, &a8_fix_table_size,
+					  a8_relocs, num_a8_relocs,
+					  prev_num_a8_fixes, &stub_changed)
+		  != 0)
+		goto error_ret_free_local;
+	    }
+	}
+
+      if (prev_num_a8_fixes != num_a8_fixes)
+        stub_changed = TRUE;
+
+      if (!stub_changed)
+	break;
+
+      /* OK, we've added some stubs.  Find out the new size of the
+	 stub sections.  */
+      for (stub_sec = htab->stub_bfd->sections;
+	   stub_sec != NULL;
+	   stub_sec = stub_sec->next)
+	{
+	  /* Ignore non-stub sections.  */
+	  if (!strstr (stub_sec->name, STUB_SUFFIX))
+	    continue;
+
+	  stub_sec->size = 0;
+	}
+
+      bfd_hash_traverse (&htab->stub_hash_table, arm_size_one_stub, htab);
+
+      /* Add Cortex-A8 erratum veneers to stub section sizes too.  */
+      if (htab->fix_cortex_a8)
+        for (i = 0; i < num_a8_fixes; i++)
+          {
+	    stub_sec = elf32_arm_create_or_find_stub_sec (NULL,
+			 a8_fixes[i].section, htab);
+
+	    if (stub_sec == NULL)
+	      goto error_ret_free_local;
+
+            stub_sec->size
+              += find_stub_size_and_template (a8_fixes[i].stub_type, NULL,
+                                              NULL);
+          }
+
+
+      /* Ask the linker to do its stuff.  */
+      (*htab->layout_sections_again) ();
+    }
+
+  /* Add stubs for Cortex-A8 erratum fixes now.  */
+  if (htab->fix_cortex_a8)
+    {
+      for (i = 0; i < num_a8_fixes; i++)
+        {
+          struct elf32_arm_stub_hash_entry *stub_entry;
+          char *stub_name = a8_fixes[i].stub_name;
+          asection *section = a8_fixes[i].section;
+          unsigned int section_id = a8_fixes[i].section->id;
+          asection *link_sec = htab->stub_group[section_id].link_sec;
+          asection *stub_sec = htab->stub_group[section_id].stub_sec;
+          const insn_sequence *template_sequence;
+          int template_size, size = 0;
+
+          stub_entry = arm_stub_hash_lookup (&htab->stub_hash_table, stub_name,
+                                             TRUE, FALSE);
+          if (stub_entry == NULL)
+            {
+              (*_bfd_error_handler) (_("%s: cannot create stub entry %s"),
+                                     section->owner,
+                                     stub_name);
+              return FALSE;
+            }
+
+          stub_entry->stub_sec = stub_sec;
+          stub_entry->stub_offset = 0;
+          stub_entry->id_sec = link_sec;
+          stub_entry->stub_type = a8_fixes[i].stub_type;
+          stub_entry->target_section = a8_fixes[i].section;
+          stub_entry->target_value = a8_fixes[i].offset;
+          stub_entry->target_addend = a8_fixes[i].addend;
+          stub_entry->orig_insn = a8_fixes[i].orig_insn;
+	  stub_entry->branch_type = a8_fixes[i].branch_type;
+
+          size = find_stub_size_and_template (a8_fixes[i].stub_type,
+                                              &template_sequence,
+                                              &template_size);
+
+          stub_entry->stub_size = size;
+          stub_entry->stub_template = template_sequence;
+          stub_entry->stub_template_size = template_size;
+        }
+
+      /* Stash the Cortex-A8 erratum fix array for use later in
+         elf32_arm_write_section().  */
+      htab->a8_erratum_fixes = a8_fixes;
+      htab->num_a8_erratum_fixes = num_a8_fixes;
+    }
+  else
+    {
+      htab->a8_erratum_fixes = NULL;
+      htab->num_a8_erratum_fixes = 0;
+    }
+  return TRUE;
+
+ error_ret_free_local:
+  return FALSE;
+}
+
+/* Build all the stubs associated with the current output file.  The
+   stubs are kept in a hash table attached to the main linker hash
+   table.  We also set up the .plt entries for statically linked PIC
+   functions here.  This function is called via arm_elf_finish in the
+   linker.  */
+
+bfd_boolean
+elf32_arm_build_stubs (struct bfd_link_info *info)
+{
+  asection *stub_sec;
+  struct bfd_hash_table *table;
+  struct elf32_arm_link_hash_table *htab;
+
+  htab = elf32_arm_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  for (stub_sec = htab->stub_bfd->sections;
+       stub_sec != NULL;
+       stub_sec = stub_sec->next)
+    {
+      bfd_size_type size;
+
+      /* Ignore non-stub sections.  */
+      if (!strstr (stub_sec->name, STUB_SUFFIX))
+	continue;
+
+      /* Allocate memory to hold the linker stubs.  */
+      size = stub_sec->size;
+      stub_sec->contents = (unsigned char *) bfd_zalloc (htab->stub_bfd, size);
+      if (stub_sec->contents == NULL && size != 0)
+	return FALSE;
+      stub_sec->size = 0;
+    }
+
+  /* Build the stubs as directed by the stub hash table.  */
+  table = &htab->stub_hash_table;
+  bfd_hash_traverse (table, arm_build_one_stub, info);
+  if (htab->fix_cortex_a8)
+    {
+      /* Place the cortex a8 stubs last.  */
+      htab->fix_cortex_a8 = -1;
+      bfd_hash_traverse (table, arm_build_one_stub, info);
+    }
+
+  return TRUE;
+}
+
+/* Locate the Thumb encoded calling stub for NAME.  */
+
+static struct elf_link_hash_entry *
+find_thumb_glue (struct bfd_link_info *link_info,
+		 const char *name,
+		 char **error_message)
+{
+  char *tmp_name;
+  struct elf_link_hash_entry *hash;
+  struct elf32_arm_link_hash_table *hash_table;
+
+  /* We need a pointer to the armelf specific hash table.  */
+  hash_table = elf32_arm_hash_table (link_info);
+  if (hash_table == NULL)
+    return NULL;
+
+  tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen (name)
+                                  + strlen (THUMB2ARM_GLUE_ENTRY_NAME) + 1);
+
+  BFD_ASSERT (tmp_name);
+
+  sprintf (tmp_name, THUMB2ARM_GLUE_ENTRY_NAME, name);
+
+  hash = elf_link_hash_lookup
+    (&(hash_table)->root, tmp_name, FALSE, FALSE, TRUE);
+
+  if (hash == NULL
+      && asprintf (error_message, _("unable to find THUMB glue '%s' for '%s'"),
+		   tmp_name, name) == -1)
+    *error_message = (char *) bfd_errmsg (bfd_error_system_call);
+
+  free (tmp_name);
+
+  return hash;
+}
+
+/* Locate the ARM encoded calling stub for NAME.  */
+
+static struct elf_link_hash_entry *
+find_arm_glue (struct bfd_link_info *link_info,
+	       const char *name,
+	       char **error_message)
+{
+  char *tmp_name;
+  struct elf_link_hash_entry *myh;
+  struct elf32_arm_link_hash_table *hash_table;
+
+  /* We need a pointer to the elfarm specific hash table.  */
+  hash_table = elf32_arm_hash_table (link_info);
+  if (hash_table == NULL)
+    return NULL;
+
+  tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen (name)
+                                  + strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1);
+
+  BFD_ASSERT (tmp_name);
+
+  sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name);
+
+  myh = elf_link_hash_lookup
+    (&(hash_table)->root, tmp_name, FALSE, FALSE, TRUE);
+
+  if (myh == NULL
+      && asprintf (error_message, _("unable to find ARM glue '%s' for '%s'"),
+		   tmp_name, name) == -1)
+    *error_message = (char *) bfd_errmsg (bfd_error_system_call);
+
+  free (tmp_name);
+
+  return myh;
+}
+
+/* ARM->Thumb glue (static images):
+
+   .arm
+   __func_from_arm:
+   ldr r12, __func_addr
+   bx  r12
+   __func_addr:
+   .word func    @ behave as if you saw a ARM_32 reloc.
+
+   (v5t static images)
+   .arm
+   __func_from_arm:
+   ldr pc, __func_addr
+   __func_addr:
+   .word func    @ behave as if you saw a ARM_32 reloc.
+
+   (relocatable images)
+   .arm
+   __func_from_arm:
+   ldr r12, __func_offset
+   add r12, r12, pc
+   bx  r12
+   __func_offset:
+   .word func - .   */
+
+#define ARM2THUMB_STATIC_GLUE_SIZE 12
+static const insn32 a2t1_ldr_insn = 0xe59fc000;
+static const insn32 a2t2_bx_r12_insn = 0xe12fff1c;
+static const insn32 a2t3_func_addr_insn = 0x00000001;
+
+#define ARM2THUMB_V5_STATIC_GLUE_SIZE 8
+static const insn32 a2t1v5_ldr_insn = 0xe51ff004;
+static const insn32 a2t2v5_func_addr_insn = 0x00000001;
+
+#define ARM2THUMB_PIC_GLUE_SIZE 16
+static const insn32 a2t1p_ldr_insn = 0xe59fc004;
+static const insn32 a2t2p_add_pc_insn = 0xe08cc00f;
+static const insn32 a2t3p_bx_r12_insn = 0xe12fff1c;
+
+/* Thumb->ARM:                          Thumb->(non-interworking aware) ARM
+
+     .thumb                             .thumb
+     .align 2                           .align 2
+ __func_from_thumb:                 __func_from_thumb:
+     bx pc                              push {r6, lr}
+     nop                                ldr  r6, __func_addr
+     .arm                               mov  lr, pc
+     b func                             bx   r6
+                                        .arm
+		 		    ;; back_to_thumb       
+                 		        ldmia r13! {r6, lr}
+ 				        bx    lr           
+                                    __func_addr:
+                                        .word        func  */
+
+#define THUMB2ARM_GLUE_SIZE 8
+static const insn16 t2a1_bx_pc_insn = 0x4778;
+static const insn16 t2a2_noop_insn = 0x46c0;
+static const insn32 t2a3_b_insn = 0xea000000;
+
+#define VFP11_ERRATUM_VENEER_SIZE 8
+
+#define ARM_BX_VENEER_SIZE 12
+static const insn32 armbx1_tst_insn = 0xe3100001;
+static const insn32 armbx2_moveq_insn = 0x01a0f000;
+static const insn32 armbx3_bx_insn = 0xe12fff10;
+
+#ifndef ELFARM_NABI_C_INCLUDED
+static void
+arm_allocate_glue_section_space (bfd * abfd, bfd_size_type size, const char * name)
+{
+  asection * s;
+  bfd_byte * contents;
+
+  if (size == 0)
+    {
+      /* Do not include empty glue sections in the output.  */
+      if (abfd != NULL)
+	{
+	  s = bfd_get_section_by_name (abfd, name);
+	  if (s != NULL)
+	    s->flags |= SEC_EXCLUDE;
+	}
+      return;
+    }
+
+  BFD_ASSERT (abfd != NULL);
+
+  s = bfd_get_section_by_name (abfd, name);
+  BFD_ASSERT (s != NULL);
+
+  contents = (bfd_byte *) bfd_alloc (abfd, size);
+
+  BFD_ASSERT (s->size == size);
+  s->contents = contents;
+}
+
+bfd_boolean
+bfd_elf32_arm_allocate_interworking_sections (struct bfd_link_info * info)
+{
+  struct elf32_arm_link_hash_table * globals;
+
+  globals = elf32_arm_hash_table (info);
+  BFD_ASSERT (globals != NULL);
+
+  arm_allocate_glue_section_space (globals->bfd_of_glue_owner,
+				   globals->arm_glue_size,
+				   ARM2THUMB_GLUE_SECTION_NAME);
+
+  arm_allocate_glue_section_space (globals->bfd_of_glue_owner,
+				   globals->thumb_glue_size,
+				   THUMB2ARM_GLUE_SECTION_NAME);
+
+  arm_allocate_glue_section_space (globals->bfd_of_glue_owner,
+				   globals->vfp11_erratum_glue_size,
+				   VFP11_ERRATUM_VENEER_SECTION_NAME);
+
+  arm_allocate_glue_section_space (globals->bfd_of_glue_owner,
+				   globals->bx_glue_size,
+				   ARM_BX_GLUE_SECTION_NAME);
+
+  return TRUE;
+}
+
+/* Allocate space and symbols for calling a Thumb function from Arm mode.
+   returns the symbol identifying the stub.  */
+
+static struct elf_link_hash_entry *
+record_arm_to_thumb_glue (struct bfd_link_info * link_info,
+			  struct elf_link_hash_entry * h)
+{
+  const char * name = h->root.root.string;
+  asection * s;
+  char * tmp_name;
+  struct elf_link_hash_entry * myh;
+  struct bfd_link_hash_entry * bh;
+  struct elf32_arm_link_hash_table * globals;
+  bfd_vma val;
+  bfd_size_type size;
+
+  globals = elf32_arm_hash_table (link_info);
+  BFD_ASSERT (globals != NULL);
+  BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
+
+  s = bfd_get_section_by_name
+    (globals->bfd_of_glue_owner, ARM2THUMB_GLUE_SECTION_NAME);
+
+  BFD_ASSERT (s != NULL);
+
+  tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen (name)
+                                  + strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1);
+
+  BFD_ASSERT (tmp_name);
+
+  sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name);
+
+  myh = elf_link_hash_lookup
+    (&(globals)->root, tmp_name, FALSE, FALSE, TRUE);
+
+  if (myh != NULL)
+    {
+      /* We've already seen this guy.  */
+      free (tmp_name);
+      return myh;
+    }
+
+  /* The only trick here is using hash_table->arm_glue_size as the value.
+     Even though the section isn't allocated yet, this is where we will be
+     putting it.  The +1 on the value marks that the stub has not been
+     output yet - not that it is a Thumb function.  */
+  bh = NULL;
+  val = globals->arm_glue_size + 1;
+  _bfd_generic_link_add_one_symbol (link_info, globals->bfd_of_glue_owner,
+				    tmp_name, BSF_GLOBAL, s, val,
+				    NULL, TRUE, FALSE, &bh);
+
+  myh = (struct elf_link_hash_entry *) bh;
+  myh->type = ELF_ST_INFO (STB_LOCAL, STT_FUNC);
+  myh->forced_local = 1;
+
+  free (tmp_name);
+
+  if (link_info->shared || globals->root.is_relocatable_executable
+      || globals->pic_veneer)
+    size = ARM2THUMB_PIC_GLUE_SIZE;
+  else if (globals->use_blx)
+    size = ARM2THUMB_V5_STATIC_GLUE_SIZE;
+  else
+    size = ARM2THUMB_STATIC_GLUE_SIZE;
+
+  s->size += size;
+  globals->arm_glue_size += size;
+
+  return myh;
+}
+
+/* Allocate space for ARMv4 BX veneers.  */
+
+static void
+record_arm_bx_glue (struct bfd_link_info * link_info, int reg)
+{
+  asection * s;
+  struct elf32_arm_link_hash_table *globals;
+  char *tmp_name;
+  struct elf_link_hash_entry *myh;
+  struct bfd_link_hash_entry *bh;
+  bfd_vma val;
+
+  /* BX PC does not need a veneer.  */
+  if (reg == 15)
+    return;
+
+  globals = elf32_arm_hash_table (link_info);
+  BFD_ASSERT (globals != NULL);
+  BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
+
+  /* Check if this veneer has already been allocated.  */
+  if (globals->bx_glue_offset[reg])
+    return;
+
+  s = bfd_get_section_by_name
+    (globals->bfd_of_glue_owner, ARM_BX_GLUE_SECTION_NAME);
+
+  BFD_ASSERT (s != NULL);
+
+  /* Add symbol for veneer.  */
+  tmp_name = (char *)
+      bfd_malloc ((bfd_size_type) strlen (ARM_BX_GLUE_ENTRY_NAME) + 1);
+
+  BFD_ASSERT (tmp_name);
+
+  sprintf (tmp_name, ARM_BX_GLUE_ENTRY_NAME, reg);
+
+  myh = elf_link_hash_lookup
+    (&(globals)->root, tmp_name, FALSE, FALSE, FALSE);
+
+  BFD_ASSERT (myh == NULL);
+
+  bh = NULL;
+  val = globals->bx_glue_size;
+  _bfd_generic_link_add_one_symbol (link_info, globals->bfd_of_glue_owner,
+                                    tmp_name, BSF_FUNCTION | BSF_LOCAL, s, val,
+                                    NULL, TRUE, FALSE, &bh);
+
+  myh = (struct elf_link_hash_entry *) bh;
+  myh->type = ELF_ST_INFO (STB_LOCAL, STT_FUNC);
+  myh->forced_local = 1;
+
+  s->size += ARM_BX_VENEER_SIZE;
+  globals->bx_glue_offset[reg] = globals->bx_glue_size | 2;
+  globals->bx_glue_size += ARM_BX_VENEER_SIZE;
+}
+
+
+/* Add an entry to the code/data map for section SEC.  */
+
+static void
+elf32_arm_section_map_add (asection *sec, char type, bfd_vma vma)
+{
+  struct _arm_elf_section_data *sec_data = elf32_arm_section_data (sec);
+  unsigned int newidx;
+
+  if (sec_data->map == NULL)
+    {
+      sec_data->map = (elf32_arm_section_map *)
+          bfd_malloc (sizeof (elf32_arm_section_map));
+      sec_data->mapcount = 0;
+      sec_data->mapsize = 1;
+    }
+
+  newidx = sec_data->mapcount++;
+
+  if (sec_data->mapcount > sec_data->mapsize)
+    {
+      sec_data->mapsize *= 2;
+      sec_data->map = (elf32_arm_section_map *)
+          bfd_realloc_or_free (sec_data->map, sec_data->mapsize
+                               * sizeof (elf32_arm_section_map));
+    }
+
+  if (sec_data->map)
+    {
+      sec_data->map[newidx].vma = vma;
+      sec_data->map[newidx].type = type;
+    }
+}
+
+
+/* Record information about a VFP11 denorm-erratum veneer.  Only ARM-mode
+   veneers are handled for now.  */
+
+static bfd_vma
+record_vfp11_erratum_veneer (struct bfd_link_info *link_info,
+                             elf32_vfp11_erratum_list *branch,
+                             bfd *branch_bfd,
+                             asection *branch_sec,
+                             unsigned int offset)
+{
+  asection *s;
+  struct elf32_arm_link_hash_table *hash_table;
+  char *tmp_name;
+  struct elf_link_hash_entry *myh;
+  struct bfd_link_hash_entry *bh;
+  bfd_vma val;
+  struct _arm_elf_section_data *sec_data;
+  elf32_vfp11_erratum_list *newerr;
+
+  hash_table = elf32_arm_hash_table (link_info);
+  BFD_ASSERT (hash_table != NULL);
+  BFD_ASSERT (hash_table->bfd_of_glue_owner != NULL);
+
+  s = bfd_get_section_by_name
+    (hash_table->bfd_of_glue_owner, VFP11_ERRATUM_VENEER_SECTION_NAME);
+
+  sec_data = elf32_arm_section_data (s);
+
+  BFD_ASSERT (s != NULL);
+
+  tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen
+                                  (VFP11_ERRATUM_VENEER_ENTRY_NAME) + 10);
+
+  BFD_ASSERT (tmp_name);
+
+  sprintf (tmp_name, VFP11_ERRATUM_VENEER_ENTRY_NAME,
+	   hash_table->num_vfp11_fixes);
+
+  myh = elf_link_hash_lookup
+    (&(hash_table)->root, tmp_name, FALSE, FALSE, FALSE);
+
+  BFD_ASSERT (myh == NULL);
+
+  bh = NULL;
+  val = hash_table->vfp11_erratum_glue_size;
+  _bfd_generic_link_add_one_symbol (link_info, hash_table->bfd_of_glue_owner,
+                                    tmp_name, BSF_FUNCTION | BSF_LOCAL, s, val,
+                                    NULL, TRUE, FALSE, &bh);
+
+  myh = (struct elf_link_hash_entry *) bh;
+  myh->type = ELF_ST_INFO (STB_LOCAL, STT_FUNC);
+  myh->forced_local = 1;
+
+  /* Link veneer back to calling location.  */
+  sec_data->erratumcount += 1;
+  newerr = (elf32_vfp11_erratum_list *)
+      bfd_zmalloc (sizeof (elf32_vfp11_erratum_list));
+
+  newerr->type = VFP11_ERRATUM_ARM_VENEER;
+  newerr->vma = -1;
+  newerr->u.v.branch = branch;
+  newerr->u.v.id = hash_table->num_vfp11_fixes;
+  branch->u.b.veneer = newerr;
+
+  newerr->next = sec_data->erratumlist;
+  sec_data->erratumlist = newerr;
+
+  /* A symbol for the return from the veneer.  */
+  sprintf (tmp_name, VFP11_ERRATUM_VENEER_ENTRY_NAME "_r",
+	   hash_table->num_vfp11_fixes);
+
+  myh = elf_link_hash_lookup
+    (&(hash_table)->root, tmp_name, FALSE, FALSE, FALSE);
+
+  if (myh != NULL)
+    abort ();
+
+  bh = NULL;
+  val = offset + 4;
+  _bfd_generic_link_add_one_symbol (link_info, branch_bfd, tmp_name, BSF_LOCAL,
+				    branch_sec, val, NULL, TRUE, FALSE, &bh);
+
+  myh = (struct elf_link_hash_entry *) bh;
+  myh->type = ELF_ST_INFO (STB_LOCAL, STT_FUNC);
+  myh->forced_local = 1;
+
+  free (tmp_name);
+
+  /* Generate a mapping symbol for the veneer section, and explicitly add an
+     entry for that symbol to the code/data map for the section.  */
+  if (hash_table->vfp11_erratum_glue_size == 0)
+    {
+      bh = NULL;
+      /* FIXME: Creates an ARM symbol.  Thumb mode will need attention if it
+         ever requires this erratum fix.  */
+      _bfd_generic_link_add_one_symbol (link_info,
+					hash_table->bfd_of_glue_owner, "$a",
+					BSF_LOCAL, s, 0, NULL,
+                                        TRUE, FALSE, &bh);
+
+      myh = (struct elf_link_hash_entry *) bh;
+      myh->type = ELF_ST_INFO (STB_LOCAL, STT_NOTYPE);
+      myh->forced_local = 1;
+
+      /* The elf32_arm_init_maps function only cares about symbols from input
+         BFDs.  We must make a note of this generated mapping symbol
+         ourselves so that code byteswapping works properly in
+         elf32_arm_write_section.  */
+      elf32_arm_section_map_add (s, 'a', 0);
+    }
+
+  s->size += VFP11_ERRATUM_VENEER_SIZE;
+  hash_table->vfp11_erratum_glue_size += VFP11_ERRATUM_VENEER_SIZE;
+  hash_table->num_vfp11_fixes++;
+
+  /* The offset of the veneer.  */
+  return val;
+}
+
+#define ARM_GLUE_SECTION_FLAGS \
+  (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_CODE \
+   | SEC_READONLY | SEC_LINKER_CREATED)
+
+/* Create a fake section for use by the ARM backend of the linker.  */
+
+static bfd_boolean
+arm_make_glue_section (bfd * abfd, const char * name)
+{
+  asection * sec;
+
+  sec = bfd_get_section_by_name (abfd, name);
+  if (sec != NULL)
+    /* Already made.  */
+    return TRUE;
+
+  sec = bfd_make_section_with_flags (abfd, name, ARM_GLUE_SECTION_FLAGS);
+
+  if (sec == NULL
+      || !bfd_set_section_alignment (abfd, sec, 2))
+    return FALSE;
+
+  /* Set the gc mark to prevent the section from being removed by garbage
+     collection, despite the fact that no relocs refer to this section.  */
+  sec->gc_mark = 1;
+
+  return TRUE;
+}
+
+/* Add the glue sections to ABFD.  This function is called from the
+   linker scripts in ld/emultempl/{armelf}.em.  */
+
+bfd_boolean
+bfd_elf32_arm_add_glue_sections_to_bfd (bfd *abfd,
+					struct bfd_link_info *info)
+{
+  /* If we are only performing a partial
+     link do not bother adding the glue.  */
+  if (info->relocatable)
+    return TRUE;
+
+  return arm_make_glue_section (abfd, ARM2THUMB_GLUE_SECTION_NAME)
+    && arm_make_glue_section (abfd, THUMB2ARM_GLUE_SECTION_NAME)
+    && arm_make_glue_section (abfd, VFP11_ERRATUM_VENEER_SECTION_NAME)
+    && arm_make_glue_section (abfd, ARM_BX_GLUE_SECTION_NAME);
+}
+
+/* Select a BFD to be used to hold the sections used by the glue code.
+   This function is called from the linker scripts in ld/emultempl/
+   {armelf/pe}.em.  */
+
+bfd_boolean
+bfd_elf32_arm_get_bfd_for_interworking (bfd *abfd, struct bfd_link_info *info)
+{
+  struct elf32_arm_link_hash_table *globals;
+
+  /* If we are only performing a partial link
+     do not bother getting a bfd to hold the glue.  */
+  if (info->relocatable)
+    return TRUE;
+
+  /* Make sure we don't attach the glue sections to a dynamic object.  */
+  BFD_ASSERT (!(abfd->flags & DYNAMIC));
+
+  globals = elf32_arm_hash_table (info);
+  BFD_ASSERT (globals != NULL);
+
+  if (globals->bfd_of_glue_owner != NULL)
+    return TRUE;
+
+  /* Save the bfd for later use.  */
+  globals->bfd_of_glue_owner = abfd;
+
+  return TRUE;
+}
+
+static void
+check_use_blx (struct elf32_arm_link_hash_table *globals)
+{
+  int cpu_arch;
+
+  cpu_arch = bfd_elf_get_obj_attr_int (globals->obfd, OBJ_ATTR_PROC, 
+				       Tag_CPU_arch);
+
+  if (globals->fix_arm1176)
+    {
+      if (cpu_arch == TAG_CPU_ARCH_V6T2 || cpu_arch > TAG_CPU_ARCH_V6K)
+	globals->use_blx = 1;
+    }
+  else
+    {
+      if (cpu_arch > TAG_CPU_ARCH_V4T)
+	globals->use_blx = 1;
+    }
+}
+
+bfd_boolean
+bfd_elf32_arm_process_before_allocation (bfd *abfd,
+					 struct bfd_link_info *link_info)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *internal_relocs = NULL;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_byte *contents = NULL;
+
+  asection *sec;
+  struct elf32_arm_link_hash_table *globals;
+
+  /* If we are only performing a partial link do not bother
+     to construct any glue.  */
+  if (link_info->relocatable)
+    return TRUE;
+
+  /* Here we have a bfd that is to be included on the link.  We have a
+     hook to do reloc rummaging, before section sizes are nailed down.  */
+  globals = elf32_arm_hash_table (link_info);
+  BFD_ASSERT (globals != NULL);
+
+  check_use_blx (globals);
+
+  if (globals->byteswap_code && !bfd_big_endian (abfd))
+    {
+      _bfd_error_handler (_("%B: BE8 images only valid in big-endian mode."),
+			  abfd);
+      return FALSE;
+    }
+
+  /* PR 5398: If we have not decided to include any loadable sections in
+     the output then we will not have a glue owner bfd.  This is OK, it
+     just means that there is nothing else for us to do here.  */
+  if (globals->bfd_of_glue_owner == NULL)
+    return TRUE;
+
+  /* Rummage around all the relocs and map the glue vectors.  */
+  sec = abfd->sections;
+
+  if (sec == NULL)
+    return TRUE;
+
+  for (; sec != NULL; sec = sec->next)
+    {
+      if (sec->reloc_count == 0)
+	continue;
+
+      if ((sec->flags & SEC_EXCLUDE) != 0)
+	continue;
+
+      symtab_hdr = & elf_symtab_hdr (abfd);
+
+      /* Load the relocs.  */
+      internal_relocs
+	= _bfd_elf_link_read_relocs (abfd, sec, NULL, NULL, FALSE);
+
+      if (internal_relocs == NULL)
+	goto error_return;
+
+      irelend = internal_relocs + sec->reloc_count;
+      for (irel = internal_relocs; irel < irelend; irel++)
+	{
+	  long r_type;
+	  unsigned long r_index;
+
+	  struct elf_link_hash_entry *h;
+
+	  r_type = ELF32_R_TYPE (irel->r_info);
+	  r_index = ELF32_R_SYM (irel->r_info);
+
+	  /* These are the only relocation types we care about.  */
+	  if (   r_type != R_ARM_PC24
+	      && (r_type != R_ARM_V4BX || globals->fix_v4bx < 2))
+	    continue;
+
+	  /* Get the section contents if we haven't done so already.  */
+	  if (contents == NULL)
+	    {
+	      /* Get cached copy if it exists.  */
+	      if (elf_section_data (sec)->this_hdr.contents != NULL)
+		contents = elf_section_data (sec)->this_hdr.contents;
+	      else
+		{
+		  /* Go get them off disk.  */
+		  if (! bfd_malloc_and_get_section (abfd, sec, &contents))
+		    goto error_return;
+		}
+	    }
+
+	  if (r_type == R_ARM_V4BX)
+	    {
+	      int reg;
+
+	      reg = bfd_get_32 (abfd, contents + irel->r_offset) & 0xf;
+	      record_arm_bx_glue (link_info, reg);
+	      continue;
+	    }
+
+	  /* If the relocation is not against a symbol it cannot concern us.  */
+	  h = NULL;
+
+	  /* We don't care about local symbols.  */
+	  if (r_index < symtab_hdr->sh_info)
+	    continue;
+
+	  /* This is an external symbol.  */
+	  r_index -= symtab_hdr->sh_info;
+	  h = (struct elf_link_hash_entry *)
+	    elf_sym_hashes (abfd)[r_index];
+
+	  /* If the relocation is against a static symbol it must be within
+	     the current section and so cannot be a cross ARM/Thumb relocation.  */
+	  if (h == NULL)
+	    continue;
+
+	  /* If the call will go through a PLT entry then we do not need
+	     glue.  */
+	  if (globals->root.splt != NULL && h->plt.offset != (bfd_vma) -1)
+	    continue;
+
+	  switch (r_type)
+	    {
+	    case R_ARM_PC24:
+	      /* This one is a call from arm code.  We need to look up
+	         the target of the call.  If it is a thumb target, we
+	         insert glue.  */
+	      if (h->target_internal == ST_BRANCH_TO_THUMB)
+		record_arm_to_thumb_glue (link_info, h);
+	      break;
+
+	    default:
+	      abort ();
+	    }
+	}
+
+      if (contents != NULL
+	  && elf_section_data (sec)->this_hdr.contents != contents)
+	free (contents);
+      contents = NULL;
+
+      if (internal_relocs != NULL
+	  && elf_section_data (sec)->relocs != internal_relocs)
+	free (internal_relocs);
+      internal_relocs = NULL;
+    }
+
+  return TRUE;
+
+error_return:
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    free (contents);
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return FALSE;
+}
+#endif
+
+
+/* Initialise maps of ARM/Thumb/data for input BFDs.  */
+
+void
+bfd_elf32_arm_init_maps (bfd *abfd)
+{
+  Elf_Internal_Sym *isymbuf;
+  Elf_Internal_Shdr *hdr;
+  unsigned int i, localsyms;
+
+  /* PR 7093: Make sure that we are dealing with an arm elf binary.  */
+  if (! is_arm_elf (abfd))
+    return;
+
+  if ((abfd->flags & DYNAMIC) != 0)
+    return;
+
+  hdr = & elf_symtab_hdr (abfd);
+  localsyms = hdr->sh_info;
+
+  /* Obtain a buffer full of symbols for this BFD. The hdr->sh_info field
+     should contain the number of local symbols, which should come before any
+     global symbols.  Mapping symbols are always local.  */
+  isymbuf = bfd_elf_get_elf_syms (abfd, hdr, localsyms, 0, NULL, NULL,
+				  NULL);
+
+  /* No internal symbols read?  Skip this BFD.  */
+  if (isymbuf == NULL)
+    return;
+
+  for (i = 0; i < localsyms; i++)
+    {
+      Elf_Internal_Sym *isym = &isymbuf[i];
+      asection *sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+      const char *name;
+
+      if (sec != NULL
+          && ELF_ST_BIND (isym->st_info) == STB_LOCAL)
+        {
+          name = bfd_elf_string_from_elf_section (abfd,
+            hdr->sh_link, isym->st_name);
+
+          if (bfd_is_arm_special_symbol_name (name,
+					      BFD_ARM_SPECIAL_SYM_TYPE_MAP))
+            elf32_arm_section_map_add (sec, name[1], isym->st_value);
+        }
+    }
+}
+
+
+/* Auto-select enabling of Cortex-A8 erratum fix if the user didn't explicitly
+   say what they wanted.  */
+
+void
+bfd_elf32_arm_set_cortex_a8_fix (bfd *obfd, struct bfd_link_info *link_info)
+{
+  struct elf32_arm_link_hash_table *globals = elf32_arm_hash_table (link_info);
+  obj_attribute *out_attr = elf_known_obj_attributes_proc (obfd);
+
+  if (globals == NULL)
+    return;
+
+  if (globals->fix_cortex_a8 == -1)
+    {
+      /* Turn on Cortex-A8 erratum workaround for ARMv7-A.  */
+      if (out_attr[Tag_CPU_arch].i == TAG_CPU_ARCH_V7
+	  && (out_attr[Tag_CPU_arch_profile].i == 'A'
+	      || out_attr[Tag_CPU_arch_profile].i == 0))
+	globals->fix_cortex_a8 = 1;
+      else
+	globals->fix_cortex_a8 = 0;
+    }
+}
+
+
+void
+bfd_elf32_arm_set_vfp11_fix (bfd *obfd, struct bfd_link_info *link_info)
+{
+  struct elf32_arm_link_hash_table *globals = elf32_arm_hash_table (link_info);
+  obj_attribute *out_attr = elf_known_obj_attributes_proc (obfd);
+
+  if (globals == NULL)
+    return;
+  /* We assume that ARMv7+ does not need the VFP11 denorm erratum fix.  */
+  if (out_attr[Tag_CPU_arch].i >= TAG_CPU_ARCH_V7)
+    {
+      switch (globals->vfp11_fix)
+        {
+        case BFD_ARM_VFP11_FIX_DEFAULT:
+        case BFD_ARM_VFP11_FIX_NONE:
+          globals->vfp11_fix = BFD_ARM_VFP11_FIX_NONE;
+          break;
+
+        default:
+          /* Give a warning, but do as the user requests anyway.  */
+          (*_bfd_error_handler) (_("%B: warning: selected VFP11 erratum "
+            "workaround is not necessary for target architecture"), obfd);
+        }
+    }
+  else if (globals->vfp11_fix == BFD_ARM_VFP11_FIX_DEFAULT)
+    /* For earlier architectures, we might need the workaround, but do not
+       enable it by default.  If users is running with broken hardware, they
+       must enable the erratum fix explicitly.  */
+    globals->vfp11_fix = BFD_ARM_VFP11_FIX_NONE;
+}
+
+
+enum bfd_arm_vfp11_pipe
+{
+  VFP11_FMAC,
+  VFP11_LS,
+  VFP11_DS,
+  VFP11_BAD
+};
+
+/* Return a VFP register number.  This is encoded as RX:X for single-precision
+   registers, or X:RX for double-precision registers, where RX is the group of
+   four bits in the instruction encoding and X is the single extension bit.
+   RX and X fields are specified using their lowest (starting) bit.  The return
+   value is:
+
+     0...31: single-precision registers s0...s31
+     32...63: double-precision registers d0...d31.
+
+   Although X should be zero for VFP11 (encoding d0...d15 only), we might
+   encounter VFP3 instructions, so we allow the full range for DP registers.  */
+
+static unsigned int
+bfd_arm_vfp11_regno (unsigned int insn, bfd_boolean is_double, unsigned int rx,
+                     unsigned int x)
+{
+  if (is_double)
+    return (((insn >> rx) & 0xf) | (((insn >> x) & 1) << 4)) + 32;
+  else
+    return (((insn >> rx) & 0xf) << 1) | ((insn >> x) & 1);
+}
+
+/* Set bits in *WMASK according to a register number REG as encoded by
+   bfd_arm_vfp11_regno().  Ignore d16-d31.  */
+
+static void
+bfd_arm_vfp11_write_mask (unsigned int *wmask, unsigned int reg)
+{
+  if (reg < 32)
+    *wmask |= 1 << reg;
+  else if (reg < 48)
+    *wmask |= 3 << ((reg - 32) * 2);
+}
+
+/* Return TRUE if WMASK overwrites anything in REGS.  */
+
+static bfd_boolean
+bfd_arm_vfp11_antidependency (unsigned int wmask, int *regs, int numregs)
+{
+  int i;
+
+  for (i = 0; i < numregs; i++)
+    {
+      unsigned int reg = regs[i];
+
+      if (reg < 32 && (wmask & (1 << reg)) != 0)
+        return TRUE;
+
+      reg -= 32;
+
+      if (reg >= 16)
+        continue;
+
+      if ((wmask & (3 << (reg * 2))) != 0)
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+/* In this function, we're interested in two things: finding input registers
+   for VFP data-processing instructions, and finding the set of registers which
+   arbitrary VFP instructions may write to.  We use a 32-bit unsigned int to
+   hold the written set, so FLDM etc. are easy to deal with (we're only
+   interested in 32 SP registers or 16 dp registers, due to the VFP version
+   implemented by the chip in question).  DP registers are marked by setting
+   both SP registers in the write mask).  */
+
+static enum bfd_arm_vfp11_pipe
+bfd_arm_vfp11_insn_decode (unsigned int insn, unsigned int *destmask, int *regs,
+                           int *numregs)
+{
+  enum bfd_arm_vfp11_pipe vpipe = VFP11_BAD;
+  bfd_boolean is_double = ((insn & 0xf00) == 0xb00) ? 1 : 0;
+
+  if ((insn & 0x0f000e10) == 0x0e000a00)  /* A data-processing insn.  */
+    {
+      unsigned int pqrs;
+      unsigned int fd = bfd_arm_vfp11_regno (insn, is_double, 12, 22);
+      unsigned int fm = bfd_arm_vfp11_regno (insn, is_double, 0, 5);
+
+      pqrs = ((insn & 0x00800000) >> 20)
+           | ((insn & 0x00300000) >> 19)
+           | ((insn & 0x00000040) >> 6);
+
+      switch (pqrs)
+        {
+        case 0: /* fmac[sd].  */
+        case 1: /* fnmac[sd].  */
+        case 2: /* fmsc[sd].  */
+        case 3: /* fnmsc[sd].  */
+          vpipe = VFP11_FMAC;
+          bfd_arm_vfp11_write_mask (destmask, fd);
+          regs[0] = fd;
+          regs[1] = bfd_arm_vfp11_regno (insn, is_double, 16, 7);  /* Fn.  */
+          regs[2] = fm;
+          *numregs = 3;
+          break;
+
+        case 4: /* fmul[sd].  */
+        case 5: /* fnmul[sd].  */
+        case 6: /* fadd[sd].  */
+        case 7: /* fsub[sd].  */
+          vpipe = VFP11_FMAC;
+          goto vfp_binop;
+
+        case 8: /* fdiv[sd].  */
+          vpipe = VFP11_DS;
+          vfp_binop:
+          bfd_arm_vfp11_write_mask (destmask, fd);
+          regs[0] = bfd_arm_vfp11_regno (insn, is_double, 16, 7);   /* Fn.  */
+          regs[1] = fm;
+          *numregs = 2;
+          break;
+
+        case 15: /* extended opcode.  */
+          {
+            unsigned int extn = ((insn >> 15) & 0x1e)
+                              | ((insn >> 7) & 1);
+
+            switch (extn)
+              {
+              case 0: /* fcpy[sd].  */
+              case 1: /* fabs[sd].  */
+              case 2: /* fneg[sd].  */
+              case 8: /* fcmp[sd].  */
+              case 9: /* fcmpe[sd].  */
+              case 10: /* fcmpz[sd].  */
+              case 11: /* fcmpez[sd].  */
+              case 16: /* fuito[sd].  */
+              case 17: /* fsito[sd].  */
+              case 24: /* ftoui[sd].  */
+              case 25: /* ftouiz[sd].  */
+              case 26: /* ftosi[sd].  */
+              case 27: /* ftosiz[sd].  */
+                /* These instructions will not bounce due to underflow.  */
+                *numregs = 0;
+                vpipe = VFP11_FMAC;
+                break;
+
+              case 3: /* fsqrt[sd].  */
+                /* fsqrt cannot underflow, but it can (perhaps) overwrite
+                   registers to cause the erratum in previous instructions.  */
+                bfd_arm_vfp11_write_mask (destmask, fd);
+                vpipe = VFP11_DS;
+                break;
+
+              case 15: /* fcvt{ds,sd}.  */
+                {
+                  int rnum = 0;
+
+                  bfd_arm_vfp11_write_mask (destmask, fd);
+
+		  /* Only FCVTSD can underflow.  */
+                  if ((insn & 0x100) != 0)
+                    regs[rnum++] = fm;
+
+                  *numregs = rnum;
+
+                  vpipe = VFP11_FMAC;
+                }
+                break;
+
+              default:
+                return VFP11_BAD;
+              }
+          }
+          break;
+
+        default:
+          return VFP11_BAD;
+        }
+    }
+  /* Two-register transfer.  */
+  else if ((insn & 0x0fe00ed0) == 0x0c400a10)
+    {
+      unsigned int fm = bfd_arm_vfp11_regno (insn, is_double, 0, 5);
+
+      if ((insn & 0x100000) == 0)
+	{
+          if (is_double)
+            bfd_arm_vfp11_write_mask (destmask, fm);
+          else
+            {
+              bfd_arm_vfp11_write_mask (destmask, fm);
+              bfd_arm_vfp11_write_mask (destmask, fm + 1);
+            }
+	}
+
+      vpipe = VFP11_LS;
+    }
+  else if ((insn & 0x0e100e00) == 0x0c100a00)  /* A load insn.  */
+    {
+      int fd = bfd_arm_vfp11_regno (insn, is_double, 12, 22);
+      unsigned int puw = ((insn >> 21) & 0x1) | (((insn >> 23) & 3) << 1);
+
+      switch (puw)
+        {
+        case 0: /* Two-reg transfer.  We should catch these above.  */
+          abort ();
+
+        case 2: /* fldm[sdx].  */
+        case 3:
+        case 5:
+          {
+            unsigned int i, offset = insn & 0xff;
+
+            if (is_double)
+              offset >>= 1;
+
+            for (i = fd; i < fd + offset; i++)
+              bfd_arm_vfp11_write_mask (destmask, i);
+          }
+          break;
+
+        case 4: /* fld[sd].  */
+        case 6:
+          bfd_arm_vfp11_write_mask (destmask, fd);
+          break;
+
+        default:
+          return VFP11_BAD;
+        }
+
+      vpipe = VFP11_LS;
+    }
+  /* Single-register transfer. Note L==0.  */
+  else if ((insn & 0x0f100e10) == 0x0e000a10)
+    {
+      unsigned int opcode = (insn >> 21) & 7;
+      unsigned int fn = bfd_arm_vfp11_regno (insn, is_double, 16, 7);
+
+      switch (opcode)
+        {
+        case 0: /* fmsr/fmdlr.  */
+        case 1: /* fmdhr.  */
+          /* Mark fmdhr and fmdlr as writing to the whole of the DP
+             destination register.  I don't know if this is exactly right,
+             but it is the conservative choice.  */
+          bfd_arm_vfp11_write_mask (destmask, fn);
+          break;
+
+        case 7: /* fmxr.  */
+          break;
+        }
+
+      vpipe = VFP11_LS;
+    }
+
+  return vpipe;
+}
+
+
+static int elf32_arm_compare_mapping (const void * a, const void * b);
+
+
+/* Look for potentially-troublesome code sequences which might trigger the
+   VFP11 denormal/antidependency erratum.  See, e.g., the ARM1136 errata sheet
+   (available from ARM) for details of the erratum.  A short version is
+   described in ld.texinfo.  */
+
+bfd_boolean
+bfd_elf32_arm_vfp11_erratum_scan (bfd *abfd, struct bfd_link_info *link_info)
+{
+  asection *sec;
+  bfd_byte *contents = NULL;
+  int state = 0;
+  int regs[3], numregs = 0;
+  struct elf32_arm_link_hash_table *globals = elf32_arm_hash_table (link_info);
+  int use_vector = (globals->vfp11_fix == BFD_ARM_VFP11_FIX_VECTOR);
+
+  if (globals == NULL)
+    return FALSE;
+
+  /* We use a simple FSM to match troublesome VFP11 instruction sequences.
+     The states transition as follows:
+
+       0 -> 1 (vector) or 0 -> 2 (scalar)
+           A VFP FMAC-pipeline instruction has been seen. Fill
+           regs[0]..regs[numregs-1] with its input operands. Remember this
+           instruction in 'first_fmac'.
+
+       1 -> 2
+           Any instruction, except for a VFP instruction which overwrites
+           regs[*].
+
+       1 -> 3 [ -> 0 ]  or
+       2 -> 3 [ -> 0 ]
+           A VFP instruction has been seen which overwrites any of regs[*].
+           We must make a veneer!  Reset state to 0 before examining next
+           instruction.
+
+       2 -> 0
+           If we fail to match anything in state 2, reset to state 0 and reset
+           the instruction pointer to the instruction after 'first_fmac'.
+
+     If the VFP11 vector mode is in use, there must be at least two unrelated
+     instructions between anti-dependent VFP11 instructions to properly avoid
+     triggering the erratum, hence the use of the extra state 1.  */
+
+  /* If we are only performing a partial link do not bother
+     to construct any glue.  */
+  if (link_info->relocatable)
+    return TRUE;
+
+  /* Skip if this bfd does not correspond to an ELF image.  */
+  if (! is_arm_elf (abfd))
+    return TRUE;
+
+  /* We should have chosen a fix type by the time we get here.  */
+  BFD_ASSERT (globals->vfp11_fix != BFD_ARM_VFP11_FIX_DEFAULT);
+
+  if (globals->vfp11_fix == BFD_ARM_VFP11_FIX_NONE)
+    return TRUE;
+
+  /* Skip this BFD if it corresponds to an executable or dynamic object.  */
+  if ((abfd->flags & (EXEC_P | DYNAMIC)) != 0)
+    return TRUE;
+
+  for (sec = abfd->sections; sec != NULL; sec = sec->next)
+    {
+      unsigned int i, span, first_fmac = 0, veneer_of_insn = 0;
+      struct _arm_elf_section_data *sec_data;
+
+      /* If we don't have executable progbits, we're not interested in this
+         section.  Also skip if section is to be excluded.  */
+      if (elf_section_type (sec) != SHT_PROGBITS
+          || (elf_section_flags (sec) & SHF_EXECINSTR) == 0
+          || (sec->flags & SEC_EXCLUDE) != 0
+	  || sec->sec_info_type == ELF_INFO_TYPE_JUST_SYMS
+	  || sec->output_section == bfd_abs_section_ptr
+          || strcmp (sec->name, VFP11_ERRATUM_VENEER_SECTION_NAME) == 0)
+        continue;
+
+      sec_data = elf32_arm_section_data (sec);
+
+      if (sec_data->mapcount == 0)
+        continue;
+
+      if (elf_section_data (sec)->this_hdr.contents != NULL)
+	contents = elf_section_data (sec)->this_hdr.contents;
+      else if (! bfd_malloc_and_get_section (abfd, sec, &contents))
+	goto error_return;
+
+      qsort (sec_data->map, sec_data->mapcount, sizeof (elf32_arm_section_map),
+	     elf32_arm_compare_mapping);
+
+      for (span = 0; span < sec_data->mapcount; span++)
+        {
+          unsigned int span_start = sec_data->map[span].vma;
+          unsigned int span_end = (span == sec_data->mapcount - 1)
+				  ? sec->size : sec_data->map[span + 1].vma;
+          char span_type = sec_data->map[span].type;
+
+          /* FIXME: Only ARM mode is supported at present.  We may need to
+             support Thumb-2 mode also at some point.  */
+          if (span_type != 'a')
+            continue;
+
+          for (i = span_start; i < span_end;)
+            {
+              unsigned int next_i = i + 4;
+              unsigned int insn = bfd_big_endian (abfd)
+                ? (contents[i] << 24)
+                  | (contents[i + 1] << 16)
+                  | (contents[i + 2] << 8)
+                  | contents[i + 3]
+                : (contents[i + 3] << 24)
+                  | (contents[i + 2] << 16)
+                  | (contents[i + 1] << 8)
+                  | contents[i];
+              unsigned int writemask = 0;
+              enum bfd_arm_vfp11_pipe vpipe;
+
+              switch (state)
+                {
+                case 0:
+                  vpipe = bfd_arm_vfp11_insn_decode (insn, &writemask, regs,
+                                                    &numregs);
+                  /* I'm assuming the VFP11 erratum can trigger with denorm
+                     operands on either the FMAC or the DS pipeline. This might
+                     lead to slightly overenthusiastic veneer insertion.  */
+                  if (vpipe == VFP11_FMAC || vpipe == VFP11_DS)
+                    {
+                      state = use_vector ? 1 : 2;
+                      first_fmac = i;
+                      veneer_of_insn = insn;
+                    }
+                  break;
+
+                case 1:
+                  {
+                    int other_regs[3], other_numregs;
+                    vpipe = bfd_arm_vfp11_insn_decode (insn, &writemask,
+						      other_regs,
+                                                      &other_numregs);
+                    if (vpipe != VFP11_BAD
+                        && bfd_arm_vfp11_antidependency (writemask, regs,
+							 numregs))
+                      state = 3;
+                    else
+                      state = 2;
+                  }
+                  break;
+
+                case 2:
+                  {
+                    int other_regs[3], other_numregs;
+                    vpipe = bfd_arm_vfp11_insn_decode (insn, &writemask,
+						      other_regs,
+                                                      &other_numregs);
+                    if (vpipe != VFP11_BAD
+                        && bfd_arm_vfp11_antidependency (writemask, regs,
+							 numregs))
+                      state = 3;
+                    else
+                      {
+                        state = 0;
+                        next_i = first_fmac + 4;
+                      }
+                  }
+                  break;
+
+                case 3:
+                  abort ();  /* Should be unreachable.  */
+                }
+
+              if (state == 3)
+                {
+                  elf32_vfp11_erratum_list *newerr =(elf32_vfp11_erratum_list *)
+                      bfd_zmalloc (sizeof (elf32_vfp11_erratum_list));
+
+                  elf32_arm_section_data (sec)->erratumcount += 1;
+
+                  newerr->u.b.vfp_insn = veneer_of_insn;
+
+                  switch (span_type)
+                    {
+                    case 'a':
+                      newerr->type = VFP11_ERRATUM_BRANCH_TO_ARM_VENEER;
+                      break;
+
+                    default:
+                      abort ();
+                    }
+
+                  record_vfp11_erratum_veneer (link_info, newerr, abfd, sec,
+					       first_fmac);
+
+                  newerr->vma = -1;
+
+                  newerr->next = sec_data->erratumlist;
+                  sec_data->erratumlist = newerr;
+
+                  state = 0;
+                }
+
+              i = next_i;
+            }
+        }
+
+      if (contents != NULL
+          && elf_section_data (sec)->this_hdr.contents != contents)
+        free (contents);
+      contents = NULL;
+    }
+
+  return TRUE;
+
+error_return:
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    free (contents);
+
+  return FALSE;
+}
+
+/* Find virtual-memory addresses for VFP11 erratum veneers and return locations
+   after sections have been laid out, using specially-named symbols.  */
+
+void
+bfd_elf32_arm_vfp11_fix_veneer_locations (bfd *abfd,
+					  struct bfd_link_info *link_info)
+{
+  asection *sec;
+  struct elf32_arm_link_hash_table *globals;
+  char *tmp_name;
+
+  if (link_info->relocatable)
+    return;
+
+  /* Skip if this bfd does not correspond to an ELF image.  */
+  if (! is_arm_elf (abfd))
+    return;
+
+  globals = elf32_arm_hash_table (link_info);
+  if (globals == NULL)
+    return;
+
+  tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen
+                                  (VFP11_ERRATUM_VENEER_ENTRY_NAME) + 10);
+
+  for (sec = abfd->sections; sec != NULL; sec = sec->next)
+    {
+      struct _arm_elf_section_data *sec_data = elf32_arm_section_data (sec);
+      elf32_vfp11_erratum_list *errnode = sec_data->erratumlist;
+
+      for (; errnode != NULL; errnode = errnode->next)
+        {
+          struct elf_link_hash_entry *myh;
+          bfd_vma vma;
+
+          switch (errnode->type)
+            {
+            case VFP11_ERRATUM_BRANCH_TO_ARM_VENEER:
+            case VFP11_ERRATUM_BRANCH_TO_THUMB_VENEER:
+              /* Find veneer symbol.  */
+              sprintf (tmp_name, VFP11_ERRATUM_VENEER_ENTRY_NAME,
+		       errnode->u.b.veneer->u.v.id);
+
+              myh = elf_link_hash_lookup
+                (&(globals)->root, tmp_name, FALSE, FALSE, TRUE);
+
+              if (myh == NULL)
+                (*_bfd_error_handler) (_("%B: unable to find VFP11 veneer "
+                			 "`%s'"), abfd, tmp_name);
+
+              vma = myh->root.u.def.section->output_section->vma
+                    + myh->root.u.def.section->output_offset
+                    + myh->root.u.def.value;
+
+              errnode->u.b.veneer->vma = vma;
+              break;
+
+	    case VFP11_ERRATUM_ARM_VENEER:
+            case VFP11_ERRATUM_THUMB_VENEER:
+              /* Find return location.  */
+              sprintf (tmp_name, VFP11_ERRATUM_VENEER_ENTRY_NAME "_r",
+                       errnode->u.v.id);
+
+              myh = elf_link_hash_lookup
+                (&(globals)->root, tmp_name, FALSE, FALSE, TRUE);
+
+              if (myh == NULL)
+                (*_bfd_error_handler) (_("%B: unable to find VFP11 veneer "
+					 "`%s'"), abfd, tmp_name);
+
+              vma = myh->root.u.def.section->output_section->vma
+                    + myh->root.u.def.section->output_offset
+                    + myh->root.u.def.value;
+
+              errnode->u.v.branch->vma = vma;
+              break;
+
+            default:
+              abort ();
+            }
+        }
+    }
+
+  free (tmp_name);
+}
+
+
+/* Set target relocation values needed during linking.  */
+
+void
+bfd_elf32_arm_set_target_relocs (struct bfd *output_bfd,
+				 struct bfd_link_info *link_info,
+				 int target1_is_rel,
+				 char * target2_type,
+                                 int fix_v4bx,
+				 int use_blx,
+                                 bfd_arm_vfp11_fix vfp11_fix,
+				 int no_enum_warn, int no_wchar_warn,
+				 int pic_veneer, int fix_cortex_a8,
+				 int fix_arm1176)
+{
+  struct elf32_arm_link_hash_table *globals;
+
+  globals = elf32_arm_hash_table (link_info);
+  if (globals == NULL)
+    return;
+
+  globals->target1_is_rel = target1_is_rel;
+  if (strcmp (target2_type, "rel") == 0)
+    globals->target2_reloc = R_ARM_REL32;
+  else if (strcmp (target2_type, "abs") == 0)
+    globals->target2_reloc = R_ARM_ABS32;
+  else if (strcmp (target2_type, "got-rel") == 0)
+    globals->target2_reloc = R_ARM_GOT_PREL;
+  else
+    {
+      _bfd_error_handler (_("Invalid TARGET2 relocation type '%s'."),
+			  target2_type);
+    }
+  globals->fix_v4bx = fix_v4bx;
+  globals->use_blx |= use_blx;
+  globals->vfp11_fix = vfp11_fix;
+  globals->pic_veneer = pic_veneer;
+  globals->fix_cortex_a8 = fix_cortex_a8;
+  globals->fix_arm1176 = fix_arm1176;
+
+  BFD_ASSERT (is_arm_elf (output_bfd));
+  elf_arm_tdata (output_bfd)->no_enum_size_warning = no_enum_warn;
+  elf_arm_tdata (output_bfd)->no_wchar_size_warning = no_wchar_warn;
+}
+
+/* Replace the target offset of a Thumb bl or b.w instruction.  */
+
+static void
+insert_thumb_branch (bfd *abfd, long int offset, bfd_byte *insn)
+{
+  bfd_vma upper;
+  bfd_vma lower;
+  int reloc_sign;
+
+  BFD_ASSERT ((offset & 1) == 0);
+
+  upper = bfd_get_16 (abfd, insn);
+  lower = bfd_get_16 (abfd, insn + 2);
+  reloc_sign = (offset < 0) ? 1 : 0;
+  upper = (upper & ~(bfd_vma) 0x7ff)
+	  | ((offset >> 12) & 0x3ff)
+	  | (reloc_sign << 10);
+  lower = (lower & ~(bfd_vma) 0x2fff)
+	  | (((!((offset >> 23) & 1)) ^ reloc_sign) << 13)
+	  | (((!((offset >> 22) & 1)) ^ reloc_sign) << 11)
+	  | ((offset >> 1) & 0x7ff);
+  bfd_put_16 (abfd, upper, insn);
+  bfd_put_16 (abfd, lower, insn + 2);
+}
+
+/* Thumb code calling an ARM function.  */
+
+static int
+elf32_thumb_to_arm_stub (struct bfd_link_info * info,
+			 const char *           name,
+			 bfd *                  input_bfd,
+			 bfd *                  output_bfd,
+			 asection *             input_section,
+			 bfd_byte *             hit_data,
+			 asection *             sym_sec,
+			 bfd_vma                offset,
+			 bfd_signed_vma         addend,
+			 bfd_vma                val,
+			 char **error_message)
+{
+  asection * s = 0;
+  bfd_vma my_offset;
+  long int ret_offset;
+  struct elf_link_hash_entry * myh;
+  struct elf32_arm_link_hash_table * globals;
+
+  myh = find_thumb_glue (info, name, error_message);
+  if (myh == NULL)
+    return FALSE;
+
+  globals = elf32_arm_hash_table (info);
+  BFD_ASSERT (globals != NULL);
+  BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
+
+  my_offset = myh->root.u.def.value;
+
+  s = bfd_get_section_by_name (globals->bfd_of_glue_owner,
+			       THUMB2ARM_GLUE_SECTION_NAME);
+
+  BFD_ASSERT (s != NULL);
+  BFD_ASSERT (s->contents != NULL);
+  BFD_ASSERT (s->output_section != NULL);
+
+  if ((my_offset & 0x01) == 0x01)
+    {
+      if (sym_sec != NULL
+	  && sym_sec->owner != NULL
+	  && !INTERWORK_FLAG (sym_sec->owner))
+	{
+	  (*_bfd_error_handler)
+	    (_("%B(%s): warning: interworking not enabled.\n"
+	       "  first occurrence: %B: thumb call to arm"),
+	     sym_sec->owner, input_bfd, name);
+
+	  return FALSE;
+	}
+
+      --my_offset;
+      myh->root.u.def.value = my_offset;
+
+      put_thumb_insn (globals, output_bfd, (bfd_vma) t2a1_bx_pc_insn,
+		      s->contents + my_offset);
+
+      put_thumb_insn (globals, output_bfd, (bfd_vma) t2a2_noop_insn,
+		      s->contents + my_offset + 2);
+
+      ret_offset =
+	/* Address of destination of the stub.  */
+	((bfd_signed_vma) val)
+	- ((bfd_signed_vma)
+	   /* Offset from the start of the current section
+	      to the start of the stubs.  */
+	   (s->output_offset
+	    /* Offset of the start of this stub from the start of the stubs.  */
+	    + my_offset
+	    /* Address of the start of the current section.  */
+	    + s->output_section->vma)
+	   /* The branch instruction is 4 bytes into the stub.  */
+	   + 4
+	   /* ARM branches work from the pc of the instruction + 8.  */
+	   + 8);
+
+      put_arm_insn (globals, output_bfd,
+		    (bfd_vma) t2a3_b_insn | ((ret_offset >> 2) & 0x00FFFFFF),
+		    s->contents + my_offset + 4);
+    }
+
+  BFD_ASSERT (my_offset <= globals->thumb_glue_size);
+
+  /* Now go back and fix up the original BL insn to point to here.  */
+  ret_offset =
+    /* Address of where the stub is located.  */
+    (s->output_section->vma + s->output_offset + my_offset)
+     /* Address of where the BL is located.  */
+    - (input_section->output_section->vma + input_section->output_offset
+       + offset)
+    /* Addend in the relocation.  */
+    - addend
+    /* Biassing for PC-relative addressing.  */
+    - 8;
+
+  insert_thumb_branch (input_bfd, ret_offset, hit_data - input_section->vma);
+
+  return TRUE;
+}
+
+/* Populate an Arm to Thumb stub.  Returns the stub symbol.  */
+
+static struct elf_link_hash_entry *
+elf32_arm_create_thumb_stub (struct bfd_link_info * info,
+			     const char *           name,
+			     bfd *                  input_bfd,
+			     bfd *                  output_bfd,
+			     asection *             sym_sec,
+			     bfd_vma                val,
+			     asection *             s,
+			     char **                error_message)
+{
+  bfd_vma my_offset;
+  long int ret_offset;
+  struct elf_link_hash_entry * myh;
+  struct elf32_arm_link_hash_table * globals;
+
+  myh = find_arm_glue (info, name, error_message);
+  if (myh == NULL)
+    return NULL;
+
+  globals = elf32_arm_hash_table (info);
+  BFD_ASSERT (globals != NULL);
+  BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
+
+  my_offset = myh->root.u.def.value;
+
+  if ((my_offset & 0x01) == 0x01)
+    {
+      if (sym_sec != NULL
+	  && sym_sec->owner != NULL
+	  && !INTERWORK_FLAG (sym_sec->owner))
+	{
+	  (*_bfd_error_handler)
+	    (_("%B(%s): warning: interworking not enabled.\n"
+	       "  first occurrence: %B: arm call to thumb"),
+	     sym_sec->owner, input_bfd, name);
+	}
+
+      --my_offset;
+      myh->root.u.def.value = my_offset;
+
+      if (info->shared || globals->root.is_relocatable_executable
+	  || globals->pic_veneer)
+	{
+	  /* For relocatable objects we can't use absolute addresses,
+	     so construct the address from a relative offset.  */
+	  /* TODO: If the offset is small it's probably worth
+	     constructing the address with adds.  */
+	  put_arm_insn (globals, output_bfd, (bfd_vma) a2t1p_ldr_insn,
+			s->contents + my_offset);
+	  put_arm_insn (globals, output_bfd, (bfd_vma) a2t2p_add_pc_insn,
+			s->contents + my_offset + 4);
+	  put_arm_insn (globals, output_bfd, (bfd_vma) a2t3p_bx_r12_insn,
+			s->contents + my_offset + 8);
+	  /* Adjust the offset by 4 for the position of the add,
+	     and 8 for the pipeline offset.  */
+	  ret_offset = (val - (s->output_offset
+			       + s->output_section->vma
+			       + my_offset + 12))
+		       | 1;
+	  bfd_put_32 (output_bfd, ret_offset,
+		      s->contents + my_offset + 12);
+	}
+      else if (globals->use_blx)
+	{
+	  put_arm_insn (globals, output_bfd, (bfd_vma) a2t1v5_ldr_insn,
+			s->contents + my_offset);
+
+	  /* It's a thumb address.  Add the low order bit.  */
+	  bfd_put_32 (output_bfd, val | a2t2v5_func_addr_insn,
+		      s->contents + my_offset + 4);
+	}
+      else
+	{
+	  put_arm_insn (globals, output_bfd, (bfd_vma) a2t1_ldr_insn,
+			s->contents + my_offset);
+
+	  put_arm_insn (globals, output_bfd, (bfd_vma) a2t2_bx_r12_insn,
+			s->contents + my_offset + 4);
+
+	  /* It's a thumb address.  Add the low order bit.  */
+	  bfd_put_32 (output_bfd, val | a2t3_func_addr_insn,
+		      s->contents + my_offset + 8);
+
+	  my_offset += 12;
+	}
+    }
+
+  BFD_ASSERT (my_offset <= globals->arm_glue_size);
+
+  return myh;
+}
+
+/* Arm code calling a Thumb function.  */
+
+static int
+elf32_arm_to_thumb_stub (struct bfd_link_info * info,
+			 const char *           name,
+			 bfd *                  input_bfd,
+			 bfd *                  output_bfd,
+			 asection *             input_section,
+			 bfd_byte *             hit_data,
+			 asection *             sym_sec,
+			 bfd_vma                offset,
+			 bfd_signed_vma         addend,
+			 bfd_vma                val,
+			 char **error_message)
+{
+  unsigned long int tmp;
+  bfd_vma my_offset;
+  asection * s;
+  long int ret_offset;
+  struct elf_link_hash_entry * myh;
+  struct elf32_arm_link_hash_table * globals;
+
+  globals = elf32_arm_hash_table (info);
+  BFD_ASSERT (globals != NULL);
+  BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
+
+  s = bfd_get_section_by_name (globals->bfd_of_glue_owner,
+			       ARM2THUMB_GLUE_SECTION_NAME);
+  BFD_ASSERT (s != NULL);
+  BFD_ASSERT (s->contents != NULL);
+  BFD_ASSERT (s->output_section != NULL);
+
+  myh = elf32_arm_create_thumb_stub (info, name, input_bfd, output_bfd,
+				     sym_sec, val, s, error_message);
+  if (!myh)
+    return FALSE;
+
+  my_offset = myh->root.u.def.value;
+  tmp = bfd_get_32 (input_bfd, hit_data);
+  tmp = tmp & 0xFF000000;
+
+  /* Somehow these are both 4 too far, so subtract 8.  */
+  ret_offset = (s->output_offset
+		+ my_offset
+		+ s->output_section->vma
+		- (input_section->output_offset
+		   + input_section->output_section->vma
+		   + offset + addend)
+		- 8);
+
+  tmp = tmp | ((ret_offset >> 2) & 0x00FFFFFF);
+
+  bfd_put_32 (output_bfd, (bfd_vma) tmp, hit_data - input_section->vma);
+
+  return TRUE;
+}
+
+/* Populate Arm stub for an exported Thumb function.  */
+
+static bfd_boolean
+elf32_arm_to_thumb_export_stub (struct elf_link_hash_entry *h, void * inf)
+{
+  struct bfd_link_info * info = (struct bfd_link_info *) inf;
+  asection * s;
+  struct elf_link_hash_entry * myh;
+  struct elf32_arm_link_hash_entry *eh;
+  struct elf32_arm_link_hash_table * globals;
+  asection *sec;
+  bfd_vma val;
+  char *error_message;
+
+  eh = elf32_arm_hash_entry (h);
+  /* Allocate stubs for exported Thumb functions on v4t.  */
+  if (eh->export_glue == NULL)
+    return TRUE;
+
+  globals = elf32_arm_hash_table (info);
+  BFD_ASSERT (globals != NULL);
+  BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
+
+  s = bfd_get_section_by_name (globals->bfd_of_glue_owner,
+			       ARM2THUMB_GLUE_SECTION_NAME);
+  BFD_ASSERT (s != NULL);
+  BFD_ASSERT (s->contents != NULL);
+  BFD_ASSERT (s->output_section != NULL);
+
+  sec = eh->export_glue->root.u.def.section;
+
+  BFD_ASSERT (sec->output_section != NULL);
+
+  val = eh->export_glue->root.u.def.value + sec->output_offset
+	+ sec->output_section->vma;
+
+  myh = elf32_arm_create_thumb_stub (info, h->root.root.string,
+				     h->root.u.def.section->owner,
+				     globals->obfd, sec, val, s,
+				     &error_message);
+  BFD_ASSERT (myh);
+  return TRUE;
+}
+
+/* Populate ARMv4 BX veneers.  Returns the absolute adress of the veneer.  */
+
+static bfd_vma
+elf32_arm_bx_glue (struct bfd_link_info * info, int reg)
+{
+  bfd_byte *p;
+  bfd_vma glue_addr;
+  asection *s;
+  struct elf32_arm_link_hash_table *globals;
+
+  globals = elf32_arm_hash_table (info);
+  BFD_ASSERT (globals != NULL);
+  BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
+
+  s = bfd_get_section_by_name (globals->bfd_of_glue_owner,
+			       ARM_BX_GLUE_SECTION_NAME);
+  BFD_ASSERT (s != NULL);
+  BFD_ASSERT (s->contents != NULL);
+  BFD_ASSERT (s->output_section != NULL);
+
+  BFD_ASSERT (globals->bx_glue_offset[reg] & 2);
+
+  glue_addr = globals->bx_glue_offset[reg] & ~(bfd_vma)3;
+
+  if ((globals->bx_glue_offset[reg] & 1) == 0)
+    {
+      p = s->contents + glue_addr;
+      bfd_put_32 (globals->obfd, armbx1_tst_insn + (reg << 16), p);
+      bfd_put_32 (globals->obfd, armbx2_moveq_insn + reg, p + 4);
+      bfd_put_32 (globals->obfd, armbx3_bx_insn + reg, p + 8);
+      globals->bx_glue_offset[reg] |= 1;
+    }
+
+  return glue_addr + s->output_section->vma + s->output_offset;
+}
+
+/* Generate Arm stubs for exported Thumb symbols.  */
+static void
+elf32_arm_begin_write_processing (bfd *abfd ATTRIBUTE_UNUSED,
+				  struct bfd_link_info *link_info)
+{
+  struct elf32_arm_link_hash_table * globals;
+
+  if (link_info == NULL)
+    /* Ignore this if we are not called by the ELF backend linker.  */
+    return;
+
+  globals = elf32_arm_hash_table (link_info);
+  if (globals == NULL)
+    return;
+
+  /* If blx is available then exported Thumb symbols are OK and there is
+     nothing to do.  */
+  if (globals->use_blx)
+    return;
+
+  elf_link_hash_traverse (&globals->root, elf32_arm_to_thumb_export_stub,
+			  link_info);
+}
+
+/* Reserve space for COUNT dynamic relocations in relocation selection
+   SRELOC.  */
+
+static void
+elf32_arm_allocate_dynrelocs (struct bfd_link_info *info, asection *sreloc,
+			      bfd_size_type count)
+{
+  struct elf32_arm_link_hash_table *htab;
+
+  htab = elf32_arm_hash_table (info);
+  BFD_ASSERT (htab->root.dynamic_sections_created);
+  if (sreloc == NULL)
+    abort ();
+  sreloc->size += RELOC_SIZE (htab) * count;
+}
+
+/* Reserve space for COUNT R_ARM_IRELATIVE relocations.  If the link is
+   dynamic, the relocations should go in SRELOC, otherwise they should
+   go in the special .rel.iplt section.  */
+
+static void
+elf32_arm_allocate_irelocs (struct bfd_link_info *info, asection *sreloc,
+			    bfd_size_type count)
+{
+  struct elf32_arm_link_hash_table *htab;
+
+  htab = elf32_arm_hash_table (info);
+  if (!htab->root.dynamic_sections_created)
+    htab->root.irelplt->size += RELOC_SIZE (htab) * count;
+  else
+    {
+      BFD_ASSERT (sreloc != NULL);
+      sreloc->size += RELOC_SIZE (htab) * count;
+    }
+}
+
+/* Add relocation REL to the end of relocation section SRELOC.  */
+
+static void
+elf32_arm_add_dynreloc (bfd *output_bfd, struct bfd_link_info *info,
+			asection *sreloc, Elf_Internal_Rela *rel)
+{
+  bfd_byte *loc;
+  struct elf32_arm_link_hash_table *htab;
+
+  htab = elf32_arm_hash_table (info);
+  if (!htab->root.dynamic_sections_created
+      && ELF32_R_TYPE (rel->r_info) == R_ARM_IRELATIVE)
+    sreloc = htab->root.irelplt;
+  if (sreloc == NULL)
+    abort ();
+  loc = sreloc->contents;
+  loc += sreloc->reloc_count++ * RELOC_SIZE (htab);
+  if (sreloc->reloc_count * RELOC_SIZE (htab) > sreloc->size)
+    abort ();
+  SWAP_RELOC_OUT (htab) (output_bfd, rel, loc);
+}
+
+/* Allocate room for a PLT entry described by ROOT_PLT and ARM_PLT.
+   IS_IPLT_ENTRY says whether the entry belongs to .iplt rather than
+   to .plt.  */
+
+static void
+elf32_arm_allocate_plt_entry (struct bfd_link_info *info,
+			      bfd_boolean is_iplt_entry,
+			      union gotplt_union *root_plt,
+			      struct arm_plt_info *arm_plt)
+{
+  struct elf32_arm_link_hash_table *htab;
+  asection *splt;
+  asection *sgotplt;
+
+  htab = elf32_arm_hash_table (info);
+
+  if (is_iplt_entry)
+    {
+      splt = htab->root.iplt;
+      sgotplt = htab->root.igotplt;
+
+      /* Allocate room for an R_ARM_IRELATIVE relocation in .rel.iplt.  */
+      elf32_arm_allocate_irelocs (info, htab->root.irelplt, 1);
+    }
+  else
+    {
+      splt = htab->root.splt;
+      sgotplt = htab->root.sgotplt;
+
+      /* Allocate room for an R_JUMP_SLOT relocation in .rel.plt.  */
+      elf32_arm_allocate_dynrelocs (info, htab->root.srelplt, 1);
+
+      /* If this is the first .plt entry, make room for the special
+	 first entry.  */
+      if (splt->size == 0)
+	splt->size += htab->plt_header_size;
+    }
+
+  /* Allocate the PLT entry itself, including any leading Thumb stub.  */
+  if (elf32_arm_plt_needs_thumb_stub_p (info, arm_plt))
+    splt->size += PLT_THUMB_STUB_SIZE;
+  root_plt->offset = splt->size;
+  splt->size += htab->plt_entry_size;
+
+  if (!htab->symbian_p)
+    {
+      /* We also need to make an entry in the .got.plt section, which
+	 will be placed in the .got section by the linker script.  */
+      arm_plt->got_offset = sgotplt->size - 8 * htab->num_tls_desc;
+      sgotplt->size += 4;
+    }
+}
+
+/* Fill in a PLT entry and its associated GOT slot.  If DYNINDX == -1,
+   the entry lives in .iplt and resolves to (*SYM_VALUE)().
+   Otherwise, DYNINDX is the index of the symbol in the dynamic
+   symbol table and SYM_VALUE is undefined.
+
+   ROOT_PLT points to the offset of the PLT entry from the start of its
+   section (.iplt or .plt).  ARM_PLT points to the symbol's ARM-specific
+   bookkeeping information.  */
+
+static void
+elf32_arm_populate_plt_entry (bfd *output_bfd, struct bfd_link_info *info,
+			      union gotplt_union *root_plt,
+			      struct arm_plt_info *arm_plt,
+			      int dynindx, bfd_vma sym_value)
+{
+  struct elf32_arm_link_hash_table *htab;
+  asection *sgot;
+  asection *splt;
+  asection *srel;
+  bfd_byte *loc;
+  bfd_vma plt_index;
+  Elf_Internal_Rela rel;
+  bfd_vma plt_header_size;
+  bfd_vma got_header_size;
+
+  htab = elf32_arm_hash_table (info);
+
+  /* Pick the appropriate sections and sizes.  */
+  if (dynindx == -1)
+    {
+      splt = htab->root.iplt;
+      sgot = htab->root.igotplt;
+      srel = htab->root.irelplt;
+
+      /* There are no reserved entries in .igot.plt, and no special
+	 first entry in .iplt.  */
+      got_header_size = 0;
+      plt_header_size = 0;
+    }
+  else
+    {
+      splt = htab->root.splt;
+      sgot = htab->root.sgotplt;
+      srel = htab->root.srelplt;
+
+      got_header_size = get_elf_backend_data (output_bfd)->got_header_size;
+      plt_header_size = htab->plt_header_size;
+    }
+  BFD_ASSERT (splt != NULL && srel != NULL);
+
+  /* Fill in the entry in the procedure linkage table.  */
+  if (htab->symbian_p)
+    {
+      BFD_ASSERT (dynindx >= 0);
+      put_arm_insn (htab, output_bfd,
+		    elf32_arm_symbian_plt_entry[0],
+		    splt->contents + root_plt->offset);
+      bfd_put_32 (output_bfd,
+		  elf32_arm_symbian_plt_entry[1],
+		  splt->contents + root_plt->offset + 4);
+
+      /* Fill in the entry in the .rel.plt section.  */
+      rel.r_offset = (splt->output_section->vma
+		      + splt->output_offset
+		      + root_plt->offset + 4);
+      rel.r_info = ELF32_R_INFO (dynindx, R_ARM_GLOB_DAT);
+
+      /* Get the index in the procedure linkage table which
+	 corresponds to this symbol.  This is the index of this symbol
+	 in all the symbols for which we are making plt entries.  The
+	 first entry in the procedure linkage table is reserved.  */
+      plt_index = ((root_plt->offset - plt_header_size)
+		   / htab->plt_entry_size);
+    }
+  else
+    {
+      bfd_vma got_offset, got_address, plt_address;
+      bfd_vma got_displacement, initial_got_entry;
+      bfd_byte * ptr;
+
+      BFD_ASSERT (sgot != NULL);
+
+      /* Get the offset into the .(i)got.plt table of the entry that
+	 corresponds to this function.  */
+      got_offset = (arm_plt->got_offset & -2);
+
+      /* Get the index in the procedure linkage table which
+	 corresponds to this symbol.  This is the index of this symbol
+	 in all the symbols for which we are making plt entries.
+	 After the reserved .got.plt entries, all symbols appear in
+	 the same order as in .plt.  */
+      plt_index = (got_offset - got_header_size) / 4;
+
+      /* Calculate the address of the GOT entry.  */
+      got_address = (sgot->output_section->vma
+		     + sgot->output_offset
+		     + got_offset);
+
+      /* ...and the address of the PLT entry.  */
+      plt_address = (splt->output_section->vma
+		     + splt->output_offset
+		     + root_plt->offset);
+
+      ptr = splt->contents + root_plt->offset;
+      if (htab->vxworks_p && info->shared)
+	{
+	  unsigned int i;
+	  bfd_vma val;
+
+	  for (i = 0; i != htab->plt_entry_size / 4; i++, ptr += 4)
+	    {
+	      val = elf32_arm_vxworks_shared_plt_entry[i];
+	      if (i == 2)
+		val |= got_address - sgot->output_section->vma;
+	      if (i == 5)
+		val |= plt_index * RELOC_SIZE (htab);
+	      if (i == 2 || i == 5)
+		bfd_put_32 (output_bfd, val, ptr);
+	      else
+		put_arm_insn (htab, output_bfd, val, ptr);
+	    }
+	}
+      else if (htab->vxworks_p)
+	{
+	  unsigned int i;
+	  bfd_vma val;
+
+	  for (i = 0; i != htab->plt_entry_size / 4; i++, ptr += 4)
+	    {
+	      val = elf32_arm_vxworks_exec_plt_entry[i];
+	      if (i == 2)
+		val |= got_address;
+	      if (i == 4)
+		val |= 0xffffff & -((root_plt->offset + i * 4 + 8) >> 2);
+	      if (i == 5)
+		val |= plt_index * RELOC_SIZE (htab);
+	      if (i == 2 || i == 5)
+		bfd_put_32 (output_bfd, val, ptr);
+	      else
+		put_arm_insn (htab, output_bfd, val, ptr);
+	    }
+
+	  loc = (htab->srelplt2->contents
+		 + (plt_index * 2 + 1) * RELOC_SIZE (htab));
+
+	  /* Create the .rela.plt.unloaded R_ARM_ABS32 relocation
+	     referencing the GOT for this PLT entry.  */
+	  rel.r_offset = plt_address + 8;
+	  rel.r_info = ELF32_R_INFO (htab->root.hgot->indx, R_ARM_ABS32);
+	  rel.r_addend = got_offset;
+	  SWAP_RELOC_OUT (htab) (output_bfd, &rel, loc);
+	  loc += RELOC_SIZE (htab);
+
+	  /* Create the R_ARM_ABS32 relocation referencing the
+	     beginning of the PLT for this GOT entry.  */
+	  rel.r_offset = got_address;
+	  rel.r_info = ELF32_R_INFO (htab->root.hplt->indx, R_ARM_ABS32);
+	  rel.r_addend = 0;
+	  SWAP_RELOC_OUT (htab) (output_bfd, &rel, loc);
+	}
+      else
+	{
+	  /* Calculate the displacement between the PLT slot and the
+	     entry in the GOT.  The eight-byte offset accounts for the
+	     value produced by adding to pc in the first instruction
+	     of the PLT stub.  */
+	  got_displacement = got_address - (plt_address + 8);
+
+	  BFD_ASSERT ((got_displacement & 0xf0000000) == 0);
+
+	  if (elf32_arm_plt_needs_thumb_stub_p (info, arm_plt))
+	    {
+	      put_thumb_insn (htab, output_bfd,
+			      elf32_arm_plt_thumb_stub[0], ptr - 4);
+	      put_thumb_insn (htab, output_bfd,
+			      elf32_arm_plt_thumb_stub[1], ptr - 2);
+	    }
+
+	  put_arm_insn (htab, output_bfd,
+			elf32_arm_plt_entry[0]
+			| ((got_displacement & 0x0ff00000) >> 20),
+			ptr + 0);
+	  put_arm_insn (htab, output_bfd,
+			elf32_arm_plt_entry[1]
+			| ((got_displacement & 0x000ff000) >> 12),
+			ptr+ 4);
+	  put_arm_insn (htab, output_bfd,
+			elf32_arm_plt_entry[2]
+			| (got_displacement & 0x00000fff),
+			ptr + 8);
+#ifdef FOUR_WORD_PLT
+	  bfd_put_32 (output_bfd, elf32_arm_plt_entry[3], ptr + 12);
+#endif
+	}
+
+      /* Fill in the entry in the .rel(a).(i)plt section.  */
+      rel.r_offset = got_address;
+      rel.r_addend = 0;
+      if (dynindx == -1)
+	{
+	  /* .igot.plt entries use IRELATIVE relocations against SYM_VALUE.
+	     The dynamic linker or static executable then calls SYM_VALUE
+	     to determine the correct run-time value of the .igot.plt entry.  */
+	  rel.r_info = ELF32_R_INFO (0, R_ARM_IRELATIVE);
+	  initial_got_entry = sym_value;
+	}
+      else
+	{
+	  rel.r_info = ELF32_R_INFO (dynindx, R_ARM_JUMP_SLOT);
+	  initial_got_entry = (splt->output_section->vma
+			       + splt->output_offset);
+	}
+
+      /* Fill in the entry in the global offset table.  */
+      bfd_put_32 (output_bfd, initial_got_entry,
+		  sgot->contents + got_offset);
+    }
+
+  loc = srel->contents + plt_index * RELOC_SIZE (htab);
+  SWAP_RELOC_OUT (htab) (output_bfd, &rel, loc);
+}
+
+/* Some relocations map to different relocations depending on the
+   target.  Return the real relocation.  */
+
+static int
+arm_real_reloc_type (struct elf32_arm_link_hash_table * globals,
+		     int r_type)
+{
+  switch (r_type)
+    {
+    case R_ARM_TARGET1:
+      if (globals->target1_is_rel)
+	return R_ARM_REL32;
+      else
+	return R_ARM_ABS32;
+
+    case R_ARM_TARGET2:
+      return globals->target2_reloc;
+
+    default:
+      return r_type;
+    }
+}
+
+/* Return the base VMA address which should be subtracted from real addresses
+   when resolving @dtpoff relocation.
+   This is PT_TLS segment p_vaddr.  */
+
+static bfd_vma
+dtpoff_base (struct bfd_link_info *info)
+{
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (elf_hash_table (info)->tls_sec == NULL)
+    return 0;
+  return elf_hash_table (info)->tls_sec->vma;
+}
+
+/* Return the relocation value for @tpoff relocation
+   if STT_TLS virtual address is ADDRESS.  */
+
+static bfd_vma
+tpoff (struct bfd_link_info *info, bfd_vma address)
+{
+  struct elf_link_hash_table *htab = elf_hash_table (info);
+  bfd_vma base;
+
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (htab->tls_sec == NULL)
+    return 0;
+  base = align_power ((bfd_vma) TCB_SIZE, htab->tls_sec->alignment_power);
+  return address - htab->tls_sec->vma + base;
+}
+
+/* Perform an R_ARM_ABS12 relocation on the field pointed to by DATA.
+   VALUE is the relocation value.  */
+
+static bfd_reloc_status_type
+elf32_arm_abs12_reloc (bfd *abfd, void *data, bfd_vma value)
+{
+  if (value > 0xfff)
+    return bfd_reloc_overflow;
+
+  value |= bfd_get_32 (abfd, data) & 0xfffff000;
+  bfd_put_32 (abfd, value, data);
+  return bfd_reloc_ok;
+}
+
+/* Handle TLS relaxations.  Relaxing is possible for symbols that use
+   R_ARM_GOTDESC, R_ARM_{,THM_}TLS_CALL or
+   R_ARM_{,THM_}TLS_DESCSEQ relocations, during a static link.
+
+   Return bfd_reloc_ok if we're done, bfd_reloc_continue if the caller
+   is to then call final_link_relocate.  Return other values in the
+   case of error.
+
+   FIXME:When --emit-relocs is in effect, we'll emit relocs describing
+   the pre-relaxed code.  It would be nice if the relocs were updated
+   to match the optimization.   */
+
+static bfd_reloc_status_type 
+elf32_arm_tls_relax (struct elf32_arm_link_hash_table *globals,
+		     bfd *input_bfd, asection *input_sec, bfd_byte *contents, 
+		     Elf_Internal_Rela *rel, unsigned long is_local)
+{
+  unsigned long insn;
+  
+  switch (ELF32_R_TYPE (rel->r_info))
+    {
+    default:
+      return bfd_reloc_notsupported;
+      
+    case R_ARM_TLS_GOTDESC:
+      if (is_local)
+	insn = 0;
+      else
+	{
+	  insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+	  if (insn & 1)
+	    insn -= 5; /* THUMB */
+	  else
+	    insn -= 8; /* ARM */
+	}
+      bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+      return bfd_reloc_continue;
+
+    case R_ARM_THM_TLS_DESCSEQ:
+      /* Thumb insn.  */
+      insn = bfd_get_16 (input_bfd, contents + rel->r_offset);
+      if ((insn & 0xff78) == 0x4478)	  /* add rx, pc */
+	{
+	  if (is_local)
+	    /* nop */
+	    bfd_put_16 (input_bfd, 0x46c0, contents + rel->r_offset);
+	}
+      else if ((insn & 0xffc0) == 0x6840)  /* ldr rx,[ry,#4] */
+	{
+	  if (is_local)
+	    /* nop */
+	    bfd_put_16 (input_bfd, 0x46c0, contents + rel->r_offset);
+	  else
+	    /* ldr rx,[ry] */
+	    bfd_put_16 (input_bfd, insn & 0xf83f, contents + rel->r_offset);
+	}
+      else if ((insn & 0xff87) == 0x4780)  /* blx rx */
+	{
+	  if (is_local)
+	    /* nop */
+	    bfd_put_16 (input_bfd, 0x46c0, contents + rel->r_offset);
+	  else
+	    /* mov r0, rx */
+	    bfd_put_16 (input_bfd, 0x4600 | (insn & 0x78),
+			contents + rel->r_offset);
+	}
+      else
+	{
+	  if ((insn & 0xf000) == 0xf000 || (insn & 0xf800) == 0xe800)
+	    /* It's a 32 bit instruction, fetch the rest of it for
+	       error generation.  */
+	    insn = (insn << 16)
+	      | bfd_get_16 (input_bfd, contents + rel->r_offset + 2);
+	  (*_bfd_error_handler)
+	    (_("%B(%A+0x%lx):unexpected Thumb instruction '0x%x' in TLS trampoline"),
+	     input_bfd, input_sec, (unsigned long)rel->r_offset, insn);
+	  return bfd_reloc_notsupported;
+	}
+      break;
+      
+    case R_ARM_TLS_DESCSEQ:
+      /* arm insn.  */
+      insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+      if ((insn & 0xffff0ff0) == 0xe08f0000) /* add rx,pc,ry */
+	{
+	  if (is_local)
+	    /* mov rx, ry */
+	    bfd_put_32 (input_bfd, 0xe1a00000 | (insn & 0xffff),
+			contents + rel->r_offset);
+	}
+      else if ((insn & 0xfff00fff) == 0xe5900004) /* ldr rx,[ry,#4]*/
+	{
+	  if (is_local)
+	    /* nop */
+	    bfd_put_32 (input_bfd, 0xe1a00000, contents + rel->r_offset);
+	  else
+	    /* ldr rx,[ry] */
+	    bfd_put_32 (input_bfd, insn & 0xfffff000,
+			contents + rel->r_offset);
+	}
+      else if ((insn & 0xfffffff0) == 0xe12fff30) /* blx rx */
+	{
+	  if (is_local)
+	    /* nop */
+	    bfd_put_32 (input_bfd, 0xe1a00000, contents + rel->r_offset);
+	  else
+	    /* mov r0, rx */
+	    bfd_put_32 (input_bfd, 0xe1a00000 | (insn & 0xf),
+			contents + rel->r_offset);
+	}
+      else
+	{
+	  (*_bfd_error_handler)
+	    (_("%B(%A+0x%lx):unexpected ARM instruction '0x%x' in TLS trampoline"),
+	     input_bfd, input_sec, (unsigned long)rel->r_offset, insn);
+	  return bfd_reloc_notsupported;
+	}
+      break;
+
+    case R_ARM_TLS_CALL:
+      /* GD->IE relaxation, turn the instruction into 'nop' or
+	 'ldr r0, [pc,r0]'  */
+      insn = is_local ? 0xe1a00000 : 0xe79f0000;
+      bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+      break;
+      
+    case R_ARM_THM_TLS_CALL:
+      /* GD->IE relaxation */
+      if (!is_local)
+	/* add r0,pc; ldr r0, [r0]  */
+	insn = 0x44786800;
+      else if (arch_has_thumb2_nop (globals))
+	/* nop.w */
+	insn = 0xf3af8000;
+      else
+	/* nop; nop */
+	insn = 0xbf00bf00;
+	
+      bfd_put_16 (input_bfd, insn >> 16, contents + rel->r_offset);
+      bfd_put_16 (input_bfd, insn & 0xffff, contents + rel->r_offset + 2);
+      break;
+    }
+  return bfd_reloc_ok;
+}
+
+/* For a given value of n, calculate the value of G_n as required to
+   deal with group relocations.  We return it in the form of an
+   encoded constant-and-rotation, together with the final residual.  If n is
+   specified as less than zero, then final_residual is filled with the
+   input value and no further action is performed.  */
+
+static bfd_vma
+calculate_group_reloc_mask (bfd_vma value, int n, bfd_vma *final_residual)
+{
+  int current_n;
+  bfd_vma g_n;
+  bfd_vma encoded_g_n = 0;
+  bfd_vma residual = value; /* Also known as Y_n.  */
+
+  for (current_n = 0; current_n <= n; current_n++)
+    {
+      int shift;
+
+      /* Calculate which part of the value to mask.  */
+      if (residual == 0)
+        shift = 0;
+      else
+        {
+          int msb;
+
+          /* Determine the most significant bit in the residual and
+             align the resulting value to a 2-bit boundary.  */
+          for (msb = 30; msb >= 0; msb -= 2)
+            if (residual & (3 << msb))
+              break;
+
+          /* The desired shift is now (msb - 6), or zero, whichever
+             is the greater.  */
+          shift = msb - 6;
+          if (shift < 0)
+            shift = 0;
+        }
+
+      /* Calculate g_n in 32-bit as well as encoded constant+rotation form.  */
+      g_n = residual & (0xff << shift);
+      encoded_g_n = (g_n >> shift)
+                    | ((g_n <= 0xff ? 0 : (32 - shift) / 2) << 8);
+
+      /* Calculate the residual for the next time around.  */
+      residual &= ~g_n;
+    }
+
+  *final_residual = residual;
+
+  return encoded_g_n;
+}
+
+/* Given an ARM instruction, determine whether it is an ADD or a SUB.
+   Returns 1 if it is an ADD, -1 if it is a SUB, and 0 otherwise.  */
+
+static int
+identify_add_or_sub (bfd_vma insn)
+{
+  int opcode = insn & 0x1e00000;
+
+  if (opcode == 1 << 23) /* ADD */
+    return 1;
+
+  if (opcode == 1 << 22) /* SUB */
+    return -1;
+
+  return 0;
+}
+
+/* Perform a relocation as part of a final link.  */
+
+static bfd_reloc_status_type
+elf32_arm_final_link_relocate (reloc_howto_type *           howto,
+			       bfd *                        input_bfd,
+			       bfd *                        output_bfd,
+			       asection *                   input_section,
+			       bfd_byte *                   contents,
+			       Elf_Internal_Rela *          rel,
+			       bfd_vma                      value,
+			       struct bfd_link_info *       info,
+			       asection *                   sym_sec,
+			       const char *                 sym_name,
+			       unsigned char                st_type,
+			       enum arm_st_branch_type      branch_type,
+			       struct elf_link_hash_entry * h,
+			       bfd_boolean *                unresolved_reloc_p,
+			       char **                      error_message)
+{
+  unsigned long                 r_type = howto->type;
+  unsigned long                 r_symndx;
+  bfd_byte *                    hit_data = contents + rel->r_offset;
+  bfd_vma *                     local_got_offsets;
+  bfd_vma *                     local_tlsdesc_gotents;
+  asection *                    sgot;
+  asection *                    splt;
+  asection *                    sreloc = NULL;
+  asection *                    srelgot;
+  bfd_vma                       addend;
+  bfd_signed_vma                signed_addend;
+  unsigned char                 dynreloc_st_type;
+  bfd_vma                       dynreloc_value;
+  struct elf32_arm_link_hash_table * globals;
+  struct elf32_arm_link_hash_entry *eh;
+  union gotplt_union           *root_plt;
+  struct arm_plt_info          *arm_plt;
+  bfd_vma                       plt_offset;
+  bfd_vma                       gotplt_offset;
+  bfd_boolean                   has_iplt_entry;
+
+  globals = elf32_arm_hash_table (info);
+  if (globals == NULL)
+    return bfd_reloc_notsupported;
+
+  BFD_ASSERT (is_arm_elf (input_bfd));
+
+  /* Some relocation types map to different relocations depending on the
+     target.  We pick the right one here.  */
+  r_type = arm_real_reloc_type (globals, r_type);
+
+  /* It is possible to have linker relaxations on some TLS access
+     models.  Update our information here.  */
+  r_type = elf32_arm_tls_transition (info, r_type, h);
+
+  if (r_type != howto->type)
+    howto = elf32_arm_howto_from_type (r_type);
+
+  /* If the start address has been set, then set the EF_ARM_HASENTRY
+     flag.  Setting this more than once is redundant, but the cost is
+     not too high, and it keeps the code simple.
+
+     The test is done  here, rather than somewhere else, because the
+     start address is only set just before the final link commences.
+
+     Note - if the user deliberately sets a start address of 0, the
+     flag will not be set.  */
+  if (bfd_get_start_address (output_bfd) != 0)
+    elf_elfheader (output_bfd)->e_flags |= EF_ARM_HASENTRY;
+
+  eh = (struct elf32_arm_link_hash_entry *) h;
+  sgot = globals->root.sgot;
+  local_got_offsets = elf_local_got_offsets (input_bfd);
+  local_tlsdesc_gotents = elf32_arm_local_tlsdesc_gotent (input_bfd);
+
+  if (globals->root.dynamic_sections_created)
+    srelgot = globals->root.srelgot;
+  else
+    srelgot = NULL;
+
+  r_symndx = ELF32_R_SYM (rel->r_info);
+
+  if (globals->use_rel)
+    {
+      addend = bfd_get_32 (input_bfd, hit_data) & howto->src_mask;
+
+      if (addend & ((howto->src_mask + 1) >> 1))
+	{
+	  signed_addend = -1;
+	  signed_addend &= ~ howto->src_mask;
+	  signed_addend |= addend;
+	}
+      else
+	signed_addend = addend;
+    }
+  else
+    addend = signed_addend = rel->r_addend;
+
+  /* Record the symbol information that should be used in dynamic
+     relocations.  */
+  dynreloc_st_type = st_type;
+  dynreloc_value = value;
+  if (branch_type == ST_BRANCH_TO_THUMB)
+    dynreloc_value |= 1;
+
+  /* Find out whether the symbol has a PLT.  Set ST_VALUE, BRANCH_TYPE and
+     VALUE appropriately for relocations that we resolve at link time.  */
+  has_iplt_entry = FALSE;
+  if (elf32_arm_get_plt_info (input_bfd, eh, r_symndx, &root_plt, &arm_plt)
+      && root_plt->offset != (bfd_vma) -1)
+    {
+      plt_offset = root_plt->offset;
+      gotplt_offset = arm_plt->got_offset;
+
+      if (h == NULL || eh->is_iplt)
+	{
+	  has_iplt_entry = TRUE;
+	  splt = globals->root.iplt;
+
+	  /* Populate .iplt entries here, because not all of them will
+	     be seen by finish_dynamic_symbol.  The lower bit is set if
+	     we have already populated the entry.  */
+	  if (plt_offset & 1)
+	    plt_offset--;
+	  else
+	    {
+	      elf32_arm_populate_plt_entry (output_bfd, info, root_plt, arm_plt,
+					    -1, dynreloc_value);
+	      root_plt->offset |= 1;
+	    }
+
+	  /* Static relocations always resolve to the .iplt entry.  */
+	  st_type = STT_FUNC;
+	  value = (splt->output_section->vma
+		   + splt->output_offset
+		   + plt_offset);
+	  branch_type = ST_BRANCH_TO_ARM;
+
+	  /* If there are non-call relocations that resolve to the .iplt
+	     entry, then all dynamic ones must too.  */
+	  if (arm_plt->noncall_refcount != 0)
+	    {
+	      dynreloc_st_type = st_type;
+	      dynreloc_value = value;
+	    }
+	}
+      else
+	/* We populate the .plt entry in finish_dynamic_symbol.  */
+	splt = globals->root.splt;
+    }
+  else
+    {
+      splt = NULL;
+      plt_offset = (bfd_vma) -1;
+      gotplt_offset = (bfd_vma) -1;
+    }
+
+  switch (r_type)
+    {
+    case R_ARM_NONE:
+      /* We don't need to find a value for this symbol.  It's just a
+	 marker.  */
+      *unresolved_reloc_p = FALSE;
+      return bfd_reloc_ok;
+
+    case R_ARM_ABS12:
+      if (!globals->vxworks_p)
+	return elf32_arm_abs12_reloc (input_bfd, hit_data, value + addend);
+
+    case R_ARM_PC24:
+    case R_ARM_ABS32:
+    case R_ARM_ABS32_NOI:
+    case R_ARM_REL32:
+    case R_ARM_REL32_NOI:
+    case R_ARM_CALL:
+    case R_ARM_JUMP24:
+    case R_ARM_XPC25:
+    case R_ARM_PREL31:
+    case R_ARM_PLT32:
+      /* Handle relocations which should use the PLT entry.  ABS32/REL32
+	 will use the symbol's value, which may point to a PLT entry, but we
+	 don't need to handle that here.  If we created a PLT entry, all
+	 branches in this object should go to it, except if the PLT is too
+	 far away, in which case a long branch stub should be inserted.  */
+      if ((r_type != R_ARM_ABS32 && r_type != R_ARM_REL32
+           && r_type != R_ARM_ABS32_NOI && r_type != R_ARM_REL32_NOI
+	   && r_type != R_ARM_CALL
+	   && r_type != R_ARM_JUMP24
+	   && r_type != R_ARM_PLT32)
+	  && plt_offset != (bfd_vma) -1)
+	{
+	  /* If we've created a .plt section, and assigned a PLT entry
+	     to this function, it must either be a STT_GNU_IFUNC reference
+	     or not be known to bind locally.  In other cases, we should
+	     have cleared the PLT entry by now.  */
+	  BFD_ASSERT (has_iplt_entry || !SYMBOL_CALLS_LOCAL (info, h));
+
+	  value = (splt->output_section->vma
+		   + splt->output_offset
+		   + plt_offset);
+	  *unresolved_reloc_p = FALSE;
+	  return _bfd_final_link_relocate (howto, input_bfd, input_section,
+					   contents, rel->r_offset, value,
+					   rel->r_addend);
+	}
+
+      /* When generating a shared object or relocatable executable, these
+	 relocations are copied into the output file to be resolved at
+	 run time.  */
+      if ((info->shared || globals->root.is_relocatable_executable)
+	  && (input_section->flags & SEC_ALLOC)
+	  && !(globals->vxworks_p
+	       && strcmp (input_section->output_section->name,
+			  ".tls_vars") == 0)
+	  && ((r_type != R_ARM_REL32 && r_type != R_ARM_REL32_NOI)
+	      || !SYMBOL_CALLS_LOCAL (info, h))
+	  && (!strstr (input_section->name, STUB_SUFFIX))
+	  && (h == NULL
+	      || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+	      || h->root.type != bfd_link_hash_undefweak)
+	  && r_type != R_ARM_PC24
+	  && r_type != R_ARM_CALL
+	  && r_type != R_ARM_JUMP24
+	  && r_type != R_ARM_PREL31
+	  && r_type != R_ARM_PLT32)
+	{
+	  Elf_Internal_Rela outrel;
+	  bfd_boolean skip, relocate;
+
+	  *unresolved_reloc_p = FALSE;
+
+	  if (sreloc == NULL && globals->root.dynamic_sections_created)
+	    {
+	      sreloc = _bfd_elf_get_dynamic_reloc_section (input_bfd, input_section,
+							   ! globals->use_rel);
+
+	      if (sreloc == NULL)
+		return bfd_reloc_notsupported;
+	    }
+
+	  skip = FALSE;
+	  relocate = FALSE;
+
+	  outrel.r_addend = addend;
+	  outrel.r_offset =
+	    _bfd_elf_section_offset (output_bfd, info, input_section,
+				     rel->r_offset);
+	  if (outrel.r_offset == (bfd_vma) -1)
+	    skip = TRUE;
+	  else if (outrel.r_offset == (bfd_vma) -2)
+	    skip = TRUE, relocate = TRUE;
+	  outrel.r_offset += (input_section->output_section->vma
+			      + input_section->output_offset);
+
+	  if (skip)
+	    memset (&outrel, 0, sizeof outrel);
+	  else if (h != NULL
+		   && h->dynindx != -1
+		   && (!info->shared
+		       || !info->symbolic
+		       || !h->def_regular))
+	    outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
+	  else
+	    {
+	      int symbol;
+
+	      /* This symbol is local, or marked to become local.  */
+	      BFD_ASSERT (r_type == R_ARM_ABS32 || r_type == R_ARM_ABS32_NOI);
+	      if (globals->symbian_p)
+		{
+		  asection *osec;
+
+		  /* On Symbian OS, the data segment and text segement
+		     can be relocated independently.  Therefore, we
+		     must indicate the segment to which this
+		     relocation is relative.  The BPABI allows us to
+		     use any symbol in the right segment; we just use
+		     the section symbol as it is convenient.  (We
+		     cannot use the symbol given by "h" directly as it
+		     will not appear in the dynamic symbol table.)
+
+		     Note that the dynamic linker ignores the section
+		     symbol value, so we don't subtract osec->vma
+		     from the emitted reloc addend.  */
+		  if (sym_sec)
+		    osec = sym_sec->output_section;
+		  else
+		    osec = input_section->output_section;
+		  symbol = elf_section_data (osec)->dynindx;
+		  if (symbol == 0)
+		    {
+		      struct elf_link_hash_table *htab = elf_hash_table (info);
+
+		      if ((osec->flags & SEC_READONLY) == 0
+			  && htab->data_index_section != NULL)
+			osec = htab->data_index_section;
+		      else
+			osec = htab->text_index_section;
+		      symbol = elf_section_data (osec)->dynindx;
+		    }
+		  BFD_ASSERT (symbol != 0);
+		}
+	      else
+		/* On SVR4-ish systems, the dynamic loader cannot
+		   relocate the text and data segments independently,
+		   so the symbol does not matter.  */
+		symbol = 0;
+	      if (dynreloc_st_type == STT_GNU_IFUNC)
+		/* We have an STT_GNU_IFUNC symbol that doesn't resolve
+		   to the .iplt entry.  Instead, every non-call reference
+		   must use an R_ARM_IRELATIVE relocation to obtain the
+		   correct run-time address.  */
+		outrel.r_info = ELF32_R_INFO (symbol, R_ARM_IRELATIVE);
+	      else
+		outrel.r_info = ELF32_R_INFO (symbol, R_ARM_RELATIVE);
+	      if (globals->use_rel)
+		relocate = TRUE;
+	      else
+		outrel.r_addend += dynreloc_value;
+	    }
+
+	  elf32_arm_add_dynreloc (output_bfd, info, sreloc, &outrel);
+
+	  /* If this reloc is against an external symbol, we do not want to
+	     fiddle with the addend.  Otherwise, we need to include the symbol
+	     value so that it becomes an addend for the dynamic reloc.  */
+	  if (! relocate)
+	    return bfd_reloc_ok;
+
+	  return _bfd_final_link_relocate (howto, input_bfd, input_section,
+					   contents, rel->r_offset,
+					   dynreloc_value, (bfd_vma) 0);
+	}
+      else switch (r_type)
+	{
+	case R_ARM_ABS12:
+	  return elf32_arm_abs12_reloc (input_bfd, hit_data, value + addend);
+
+	case R_ARM_XPC25:	  /* Arm BLX instruction.  */
+	case R_ARM_CALL:
+	case R_ARM_JUMP24:
+	case R_ARM_PC24:	  /* Arm B/BL instruction.  */
+	case R_ARM_PLT32:
+	  {
+	  struct elf32_arm_stub_hash_entry *stub_entry = NULL;
+
+	  if (r_type == R_ARM_XPC25)
+	    {
+	      /* Check for Arm calling Arm function.  */
+	      /* FIXME: Should we translate the instruction into a BL
+		 instruction instead ?  */
+	      if (branch_type != ST_BRANCH_TO_THUMB)
+		(*_bfd_error_handler)
+		  (_("\%B: Warning: Arm BLX instruction targets Arm function '%s'."),
+		   input_bfd,
+		   h ? h->root.root.string : "(local)");
+	    }
+	  else if (r_type == R_ARM_PC24)
+	    {
+	      /* Check for Arm calling Thumb function.  */
+	      if (branch_type == ST_BRANCH_TO_THUMB)
+		{
+		  if (elf32_arm_to_thumb_stub (info, sym_name, input_bfd,
+					       output_bfd, input_section,
+					       hit_data, sym_sec, rel->r_offset,
+					       signed_addend, value,
+					       error_message))
+		    return bfd_reloc_ok;
+		  else
+		    return bfd_reloc_dangerous;
+		}
+	    }
+
+	  /* Check if a stub has to be inserted because the
+	     destination is too far or we are changing mode.  */
+	  if (   r_type == R_ARM_CALL
+	      || r_type == R_ARM_JUMP24
+	      || r_type == R_ARM_PLT32)
+	    {
+	      enum elf32_arm_stub_type stub_type = arm_stub_none;
+	      struct elf32_arm_link_hash_entry *hash;
+
+	      hash = (struct elf32_arm_link_hash_entry *) h;
+	      stub_type = arm_type_of_stub (info, input_section, rel,
+					    st_type, &branch_type,
+					    hash, value, sym_sec,
+					    input_bfd, sym_name);
+
+	      if (stub_type != arm_stub_none)
+		{
+		  /* The target is out of reach, so redirect the
+		     branch to the local stub for this function.  */
+
+		  stub_entry = elf32_arm_get_stub_entry (input_section,
+							 sym_sec, h,
+							 rel, globals,
+							 stub_type);
+		  {
+		    if (stub_entry != NULL)
+		      value = (stub_entry->stub_offset
+			       + stub_entry->stub_sec->output_offset
+			       + stub_entry->stub_sec->output_section->vma);
+
+		    if (plt_offset != (bfd_vma) -1)
+		      *unresolved_reloc_p = FALSE;
+		  }
+		}
+	      else
+		{
+		  /* If the call goes through a PLT entry, make sure to
+		     check distance to the right destination address.  */
+		  if (plt_offset != (bfd_vma) -1)
+		    {
+		      value = (splt->output_section->vma
+			       + splt->output_offset
+			       + plt_offset);
+		      *unresolved_reloc_p = FALSE;
+		      /* The PLT entry is in ARM mode, regardless of the
+			 target function.  */
+		      branch_type = ST_BRANCH_TO_ARM;
+		    }
+		}
+	    }
+
+	  /* The ARM ELF ABI says that this reloc is computed as: S - P + A
+	     where:
+	      S is the address of the symbol in the relocation.
+	      P is address of the instruction being relocated.
+	      A is the addend (extracted from the instruction) in bytes.
+
+	     S is held in 'value'.
+	     P is the base address of the section containing the
+	       instruction plus the offset of the reloc into that
+	       section, ie:
+		 (input_section->output_section->vma +
+		  input_section->output_offset +
+		  rel->r_offset).
+	     A is the addend, converted into bytes, ie:
+		 (signed_addend * 4)
+
+	     Note: None of these operations have knowledge of the pipeline
+	     size of the processor, thus it is up to the assembler to
+	     encode this information into the addend.  */
+	  value -= (input_section->output_section->vma
+		    + input_section->output_offset);
+	  value -= rel->r_offset;
+	  if (globals->use_rel)
+	    value += (signed_addend << howto->size);
+	  else
+	    /* RELA addends do not have to be adjusted by howto->size.  */
+	    value += signed_addend;
+
+	  signed_addend = value;
+	  signed_addend >>= howto->rightshift;
+
+	  /* A branch to an undefined weak symbol is turned into a jump to
+	     the next instruction unless a PLT entry will be created.
+	     Do the same for local undefined symbols (but not for STN_UNDEF).
+	     The jump to the next instruction is optimized as a NOP depending
+	     on the architecture.  */
+	  if (h ? (h->root.type == bfd_link_hash_undefweak
+		   && plt_offset == (bfd_vma) -1)
+	      : r_symndx != STN_UNDEF && bfd_is_und_section (sym_sec))
+	    {
+	      value = (bfd_get_32 (input_bfd, hit_data) & 0xf0000000);
+
+	      if (arch_has_arm_nop (globals))
+		value |= 0x0320f000;
+	      else
+		value |= 0x01a00000; /* Using pre-UAL nop: mov r0, r0.  */
+	    }
+	  else
+	    {
+	      /* Perform a signed range check.  */
+	      if (   signed_addend >   ((bfd_signed_vma)  (howto->dst_mask >> 1))
+		  || signed_addend < - ((bfd_signed_vma) ((howto->dst_mask + 1) >> 1)))
+		return bfd_reloc_overflow;
+
+	      addend = (value & 2);
+
+	      value = (signed_addend & howto->dst_mask)
+		| (bfd_get_32 (input_bfd, hit_data) & (~ howto->dst_mask));
+
+	      if (r_type == R_ARM_CALL)
+		{
+		  /* Set the H bit in the BLX instruction.  */
+		  if (branch_type == ST_BRANCH_TO_THUMB)
+		    {
+		      if (addend)
+			value |= (1 << 24);
+		      else
+			value &= ~(bfd_vma)(1 << 24);
+		    }
+
+		  /* Select the correct instruction (BL or BLX).  */
+		  /* Only if we are not handling a BL to a stub. In this
+		     case, mode switching is performed by the stub.  */
+		  if (branch_type == ST_BRANCH_TO_THUMB && !stub_entry)
+		    value |= (1 << 28);
+		  else if (stub_entry || branch_type != ST_BRANCH_UNKNOWN)
+		    {
+		      value &= ~(bfd_vma)(1 << 28);
+		      value |= (1 << 24);
+		    }
+		}
+	    }
+	  }
+	  break;
+
+	case R_ARM_ABS32:
+	  value += addend;
+	  if (branch_type == ST_BRANCH_TO_THUMB)
+	    value |= 1;
+	  break;
+
+	case R_ARM_ABS32_NOI:
+	  value += addend;
+	  break;
+
+	case R_ARM_REL32:
+	  value += addend;
+	  if (branch_type == ST_BRANCH_TO_THUMB)
+	    value |= 1;
+	  value -= (input_section->output_section->vma
+		    + input_section->output_offset + rel->r_offset);
+	  break;
+
+	case R_ARM_REL32_NOI:
+	  value += addend;
+	  value -= (input_section->output_section->vma
+		    + input_section->output_offset + rel->r_offset);
+	  break;
+
+	case R_ARM_PREL31:
+	  value -= (input_section->output_section->vma
+		    + input_section->output_offset + rel->r_offset);
+	  value += signed_addend;
+	  if (! h || h->root.type != bfd_link_hash_undefweak)
+	    {
+	      /* Check for overflow.  */
+	      if ((value ^ (value >> 1)) & (1 << 30))
+		return bfd_reloc_overflow;
+	    }
+	  value &= 0x7fffffff;
+	  value |= (bfd_get_32 (input_bfd, hit_data) & 0x80000000);
+	  if (branch_type == ST_BRANCH_TO_THUMB)
+	    value |= 1;
+	  break;
+	}
+
+      bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_ARM_ABS8:
+      value += addend;
+
+      /* There is no way to tell whether the user intended to use a signed or
+	 unsigned addend.  When checking for overflow we accept either,
+	 as specified by the AAELF.  */
+      if ((long) value > 0xff || (long) value < -0x80)
+	return bfd_reloc_overflow;
+
+      bfd_put_8 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_ARM_ABS16:
+      value += addend;
+
+      /* See comment for R_ARM_ABS8.  */
+      if ((long) value > 0xffff || (long) value < -0x8000)
+	return bfd_reloc_overflow;
+
+      bfd_put_16 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_ARM_THM_ABS5:
+      /* Support ldr and str instructions for the thumb.  */
+      if (globals->use_rel)
+	{
+	  /* Need to refetch addend.  */
+	  addend = bfd_get_16 (input_bfd, hit_data) & howto->src_mask;
+	  /* ??? Need to determine shift amount from operand size.  */
+	  addend >>= howto->rightshift;
+	}
+      value += addend;
+
+      /* ??? Isn't value unsigned?  */
+      if ((long) value > 0x1f || (long) value < -0x10)
+	return bfd_reloc_overflow;
+
+      /* ??? Value needs to be properly shifted into place first.  */
+      value |= bfd_get_16 (input_bfd, hit_data) & 0xf83f;
+      bfd_put_16 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_ARM_THM_ALU_PREL_11_0:
+      /* Corresponds to: addw.w reg, pc, #offset (and similarly for subw).  */
+      {
+	bfd_vma insn;
+	bfd_signed_vma relocation;
+
+	insn = (bfd_get_16 (input_bfd, hit_data) << 16)
+             | bfd_get_16 (input_bfd, hit_data + 2);
+
+        if (globals->use_rel)
+          {
+            signed_addend = (insn & 0xff) | ((insn & 0x7000) >> 4)
+                          | ((insn & (1 << 26)) >> 15);
+            if (insn & 0xf00000)
+              signed_addend = -signed_addend;
+          }
+
+	relocation = value + signed_addend;
+	relocation -= (input_section->output_section->vma
+		       + input_section->output_offset
+		       + rel->r_offset);
+
+        value = abs (relocation);
+
+        if (value >= 0x1000)
+          return bfd_reloc_overflow;
+
+	insn = (insn & 0xfb0f8f00) | (value & 0xff)
+             | ((value & 0x700) << 4)
+             | ((value & 0x800) << 15);
+        if (relocation < 0)
+          insn |= 0xa00000;
+
+	bfd_put_16 (input_bfd, insn >> 16, hit_data);
+	bfd_put_16 (input_bfd, insn & 0xffff, hit_data + 2);
+
+        return bfd_reloc_ok;
+      }
+
+    case R_ARM_THM_PC8:
+      /* PR 10073:  This reloc is not generated by the GNU toolchain,
+	 but it is supported for compatibility with third party libraries
+	 generated by other compilers, specifically the ARM/IAR.  */
+      {
+	bfd_vma insn;
+	bfd_signed_vma relocation;
+
+	insn = bfd_get_16 (input_bfd, hit_data);
+
+        if (globals->use_rel)
+	  addend = (insn & 0x00ff) << 2;
+
+	relocation = value + addend;
+	relocation -= (input_section->output_section->vma
+		       + input_section->output_offset
+		       + rel->r_offset);
+
+        value = abs (relocation);
+
+	/* We do not check for overflow of this reloc.  Although strictly
+	   speaking this is incorrect, it appears to be necessary in order
+	   to work with IAR generated relocs.  Since GCC and GAS do not
+	   generate R_ARM_THM_PC8 relocs, the lack of a check should not be
+	   a problem for them.  */
+	value &= 0x3fc;
+
+	insn = (insn & 0xff00) | (value >> 2);
+
+	bfd_put_16 (input_bfd, insn, hit_data);
+
+        return bfd_reloc_ok;
+      }
+
+    case R_ARM_THM_PC12:
+      /* Corresponds to: ldr.w reg, [pc, #offset].  */
+      {
+	bfd_vma insn;
+	bfd_signed_vma relocation;
+
+	insn = (bfd_get_16 (input_bfd, hit_data) << 16)
+             | bfd_get_16 (input_bfd, hit_data + 2);
+
+        if (globals->use_rel)
+          {
+            signed_addend = insn & 0xfff;
+            if (!(insn & (1 << 23)))
+              signed_addend = -signed_addend;
+          }
+
+	relocation = value + signed_addend;
+	relocation -= (input_section->output_section->vma
+		       + input_section->output_offset
+		       + rel->r_offset);
+
+        value = abs (relocation);
+
+        if (value >= 0x1000)
+          return bfd_reloc_overflow;
+
+	insn = (insn & 0xff7ff000) | value;
+        if (relocation >= 0)
+          insn |= (1 << 23);
+
+	bfd_put_16 (input_bfd, insn >> 16, hit_data);
+	bfd_put_16 (input_bfd, insn & 0xffff, hit_data + 2);
+
+        return bfd_reloc_ok;
+      }
+
+    case R_ARM_THM_XPC22:
+    case R_ARM_THM_CALL:
+    case R_ARM_THM_JUMP24:
+      /* Thumb BL (branch long instruction).  */
+      {
+	bfd_vma relocation;
+        bfd_vma reloc_sign;
+	bfd_boolean overflow = FALSE;
+	bfd_vma upper_insn = bfd_get_16 (input_bfd, hit_data);
+	bfd_vma lower_insn = bfd_get_16 (input_bfd, hit_data + 2);
+	bfd_signed_vma reloc_signed_max;
+	bfd_signed_vma reloc_signed_min;
+	bfd_vma check;
+	bfd_signed_vma signed_check;
+	int bitsize;
+	const int thumb2 = using_thumb2 (globals);
+
+	/* A branch to an undefined weak symbol is turned into a jump to
+	   the next instruction unless a PLT entry will be created.
+	   The jump to the next instruction is optimized as a NOP.W for
+	   Thumb-2 enabled architectures.  */
+	if (h && h->root.type == bfd_link_hash_undefweak
+	    && plt_offset == (bfd_vma) -1)
+	  {
+	    if (arch_has_thumb2_nop (globals))
+	      {
+		bfd_put_16 (input_bfd, 0xf3af, hit_data);
+		bfd_put_16 (input_bfd, 0x8000, hit_data + 2);
+	      }
+	    else
+	      {
+		bfd_put_16 (input_bfd, 0xe000, hit_data);
+		bfd_put_16 (input_bfd, 0xbf00, hit_data + 2);
+	      }
+	    return bfd_reloc_ok;
+	  }
+
+	/* Fetch the addend.  We use the Thumb-2 encoding (backwards compatible
+           with Thumb-1) involving the J1 and J2 bits.  */
+	if (globals->use_rel)
+	  {
+            bfd_vma s = (upper_insn & (1 << 10)) >> 10;
+            bfd_vma upper = upper_insn & 0x3ff;
+            bfd_vma lower = lower_insn & 0x7ff;
+	    bfd_vma j1 = (lower_insn & (1 << 13)) >> 13;
+	    bfd_vma j2 = (lower_insn & (1 << 11)) >> 11;
+            bfd_vma i1 = j1 ^ s ? 0 : 1;
+            bfd_vma i2 = j2 ^ s ? 0 : 1;
+
+            addend = (i1 << 23) | (i2 << 22) | (upper << 12) | (lower << 1);
+            /* Sign extend.  */
+            addend = (addend | ((s ? 0 : 1) << 24)) - (1 << 24);
+
+	    signed_addend = addend;
+	  }
+
+	if (r_type == R_ARM_THM_XPC22)
+	  {
+	    /* Check for Thumb to Thumb call.  */
+	    /* FIXME: Should we translate the instruction into a BL
+	       instruction instead ?  */
+	    if (branch_type == ST_BRANCH_TO_THUMB)
+	      (*_bfd_error_handler)
+		(_("%B: Warning: Thumb BLX instruction targets thumb function '%s'."),
+		 input_bfd,
+		 h ? h->root.root.string : "(local)");
+	  }
+	else
+	  {
+	    /* If it is not a call to Thumb, assume call to Arm.
+	       If it is a call relative to a section name, then it is not a
+	       function call at all, but rather a long jump.  Calls through
+	       the PLT do not require stubs.  */
+	    if (branch_type == ST_BRANCH_TO_ARM && plt_offset == (bfd_vma) -1)
+	      {
+		if (globals->use_blx && r_type == R_ARM_THM_CALL)
+		  {
+		    /* Convert BL to BLX.  */
+		    lower_insn = (lower_insn & ~0x1000) | 0x0800;
+		  }
+		else if ((   r_type != R_ARM_THM_CALL)
+			 && (r_type != R_ARM_THM_JUMP24))
+		  {
+		    if (elf32_thumb_to_arm_stub
+			(info, sym_name, input_bfd, output_bfd, input_section,
+			 hit_data, sym_sec, rel->r_offset, signed_addend, value,
+			 error_message))
+		      return bfd_reloc_ok;
+		    else
+		      return bfd_reloc_dangerous;
+		  }
+	      }
+	    else if (branch_type == ST_BRANCH_TO_THUMB
+		     && globals->use_blx
+		     && r_type == R_ARM_THM_CALL)
+	      {
+		/* Make sure this is a BL.  */
+		lower_insn |= 0x1800;
+	      }
+	  }
+
+	enum elf32_arm_stub_type stub_type = arm_stub_none;
+	if (r_type == R_ARM_THM_CALL || r_type == R_ARM_THM_JUMP24)
+	  {
+	    /* Check if a stub has to be inserted because the destination
+	       is too far.  */
+	    struct elf32_arm_stub_hash_entry *stub_entry;
+	    struct elf32_arm_link_hash_entry *hash;
+
+	    hash = (struct elf32_arm_link_hash_entry *) h;
+
+	    stub_type = arm_type_of_stub (info, input_section, rel,
+					  st_type, &branch_type,
+					  hash, value, sym_sec,
+					  input_bfd, sym_name);
+
+	    if (stub_type != arm_stub_none)
+	      {
+		/* The target is out of reach or we are changing modes, so
+		   redirect the branch to the local stub for this
+		   function.  */
+		stub_entry = elf32_arm_get_stub_entry (input_section,
+						       sym_sec, h,
+						       rel, globals,
+						       stub_type);
+		if (stub_entry != NULL)
+		  {
+		    value = (stub_entry->stub_offset
+			     + stub_entry->stub_sec->output_offset
+			     + stub_entry->stub_sec->output_section->vma);
+
+		    if (plt_offset != (bfd_vma) -1)
+		      *unresolved_reloc_p = FALSE;
+		  }
+
+		/* If this call becomes a call to Arm, force BLX.  */
+		if (globals->use_blx && (r_type == R_ARM_THM_CALL))
+		  {
+		    if ((stub_entry
+			 && !arm_stub_is_thumb (stub_entry->stub_type))
+			|| branch_type != ST_BRANCH_TO_THUMB)
+		      lower_insn = (lower_insn & ~0x1000) | 0x0800;
+		  }
+	      }
+	  }
+
+	/* Handle calls via the PLT.  */
+	if (stub_type == arm_stub_none && plt_offset != (bfd_vma) -1)
+	  {
+	    value = (splt->output_section->vma
+		     + splt->output_offset
+		     + plt_offset);
+
+	    if (globals->use_blx && r_type == R_ARM_THM_CALL)
+	      {
+		/* If the Thumb BLX instruction is available, convert
+		   the BL to a BLX instruction to call the ARM-mode
+		   PLT entry.  */
+		lower_insn = (lower_insn & ~0x1000) | 0x0800;
+		branch_type = ST_BRANCH_TO_ARM;
+	      }
+	    else
+	      {
+		/* Target the Thumb stub before the ARM PLT entry.  */
+		value -= PLT_THUMB_STUB_SIZE;
+		branch_type = ST_BRANCH_TO_THUMB;
+	      }
+	    *unresolved_reloc_p = FALSE;
+	  }
+
+	relocation = value + signed_addend;
+
+	relocation -= (input_section->output_section->vma
+		       + input_section->output_offset
+		       + rel->r_offset);
+
+	check = relocation >> howto->rightshift;
+
+	/* If this is a signed value, the rightshift just dropped
+	   leading 1 bits (assuming twos complement).  */
+	if ((bfd_signed_vma) relocation >= 0)
+	  signed_check = check;
+	else
+	  signed_check = check | ~((bfd_vma) -1 >> howto->rightshift);
+
+	/* Calculate the permissable maximum and minimum values for
+	   this relocation according to whether we're relocating for
+	   Thumb-2 or not.  */
+	bitsize = howto->bitsize;
+	if (!thumb2)
+	  bitsize -= 2;
+	reloc_signed_max = (1 << (bitsize - 1)) - 1;
+	reloc_signed_min = ~reloc_signed_max;
+
+	/* Assumes two's complement.  */
+	if (signed_check > reloc_signed_max || signed_check < reloc_signed_min)
+	  overflow = TRUE;
+
+	if ((lower_insn & 0x5000) == 0x4000)
+	  /* For a BLX instruction, make sure that the relocation is rounded up
+	     to a word boundary.  This follows the semantics of the instruction
+	     which specifies that bit 1 of the target address will come from bit
+	     1 of the base address.  */
+	  relocation = (relocation + 2) & ~ 3;
+
+	/* Put RELOCATION back into the insn.  Assumes two's complement.
+	   We use the Thumb-2 encoding, which is safe even if dealing with
+	   a Thumb-1 instruction by virtue of our overflow check above.  */
+        reloc_sign = (signed_check < 0) ? 1 : 0;
+	upper_insn = (upper_insn & ~(bfd_vma) 0x7ff)
+                     | ((relocation >> 12) & 0x3ff)
+                     | (reloc_sign << 10);
+	lower_insn = (lower_insn & ~(bfd_vma) 0x2fff)
+                     | (((!((relocation >> 23) & 1)) ^ reloc_sign) << 13)
+                     | (((!((relocation >> 22) & 1)) ^ reloc_sign) << 11)
+                     | ((relocation >> 1) & 0x7ff);
+
+	/* Put the relocated value back in the object file:  */
+	bfd_put_16 (input_bfd, upper_insn, hit_data);
+	bfd_put_16 (input_bfd, lower_insn, hit_data + 2);
+
+	return (overflow ? bfd_reloc_overflow : bfd_reloc_ok);
+      }
+      break;
+
+    case R_ARM_THM_JUMP19:
+      /* Thumb32 conditional branch instruction.  */
+      {
+	bfd_vma relocation;
+	bfd_boolean overflow = FALSE;
+	bfd_vma upper_insn = bfd_get_16 (input_bfd, hit_data);
+	bfd_vma lower_insn = bfd_get_16 (input_bfd, hit_data + 2);
+	bfd_signed_vma reloc_signed_max = 0xffffe;
+	bfd_signed_vma reloc_signed_min = -0x100000;
+	bfd_signed_vma signed_check;
+
+	/* Need to refetch the addend, reconstruct the top three bits,
+	   and squish the two 11 bit pieces together.  */
+	if (globals->use_rel)
+	  {
+	    bfd_vma S     = (upper_insn & 0x0400) >> 10;
+	    bfd_vma upper = (upper_insn & 0x003f);
+	    bfd_vma J1    = (lower_insn & 0x2000) >> 13;
+	    bfd_vma J2    = (lower_insn & 0x0800) >> 11;
+	    bfd_vma lower = (lower_insn & 0x07ff);
+
+	    upper |= J1 << 6;
+	    upper |= J2 << 7;
+	    upper |= (!S) << 8;
+	    upper -= 0x0100; /* Sign extend.  */
+
+	    addend = (upper << 12) | (lower << 1);
+	    signed_addend = addend;
+	  }
+
+	/* Handle calls via the PLT.  */
+	if (plt_offset != (bfd_vma) -1)
+	  {
+	    value = (splt->output_section->vma
+		     + splt->output_offset
+		     + plt_offset);
+	    /* Target the Thumb stub before the ARM PLT entry.  */
+	    value -= PLT_THUMB_STUB_SIZE;
+	    *unresolved_reloc_p = FALSE;
+	  }
+
+	/* ??? Should handle interworking?  GCC might someday try to
+	   use this for tail calls.  */
+
+      	relocation = value + signed_addend;
+	relocation -= (input_section->output_section->vma
+		       + input_section->output_offset
+		       + rel->r_offset);
+	signed_check = (bfd_signed_vma) relocation;
+
+	if (signed_check > reloc_signed_max || signed_check < reloc_signed_min)
+	  overflow = TRUE;
+
+	/* Put RELOCATION back into the insn.  */
+	{
+	  bfd_vma S  = (relocation & 0x00100000) >> 20;
+	  bfd_vma J2 = (relocation & 0x00080000) >> 19;
+	  bfd_vma J1 = (relocation & 0x00040000) >> 18;
+	  bfd_vma hi = (relocation & 0x0003f000) >> 12;
+	  bfd_vma lo = (relocation & 0x00000ffe) >>  1;
+
+	  upper_insn = (upper_insn & 0xfbc0) | (S << 10) | hi;
+	  lower_insn = (lower_insn & 0xd000) | (J1 << 13) | (J2 << 11) | lo;
+	}
+
+	/* Put the relocated value back in the object file:  */
+	bfd_put_16 (input_bfd, upper_insn, hit_data);
+	bfd_put_16 (input_bfd, lower_insn, hit_data + 2);
+
+	return (overflow ? bfd_reloc_overflow : bfd_reloc_ok);
+      }
+
+    case R_ARM_THM_JUMP11:
+    case R_ARM_THM_JUMP8:
+    case R_ARM_THM_JUMP6:
+      /* Thumb B (branch) instruction).  */
+      {
+	bfd_signed_vma relocation;
+	bfd_signed_vma reloc_signed_max = (1 << (howto->bitsize - 1)) - 1;
+	bfd_signed_vma reloc_signed_min = ~ reloc_signed_max;
+	bfd_signed_vma signed_check;
+
+	/* CZB cannot jump backward.  */
+	if (r_type == R_ARM_THM_JUMP6)
+	  reloc_signed_min = 0;
+
+	if (globals->use_rel)
+	  {
+	    /* Need to refetch addend.  */
+	    addend = bfd_get_16 (input_bfd, hit_data) & howto->src_mask;
+	    if (addend & ((howto->src_mask + 1) >> 1))
+	      {
+		signed_addend = -1;
+		signed_addend &= ~ howto->src_mask;
+		signed_addend |= addend;
+	      }
+	    else
+	      signed_addend = addend;
+	    /* The value in the insn has been right shifted.  We need to
+	       undo this, so that we can perform the address calculation
+	       in terms of bytes.  */
+	    signed_addend <<= howto->rightshift;
+	  }
+	relocation = value + signed_addend;
+
+	relocation -= (input_section->output_section->vma
+		       + input_section->output_offset
+		       + rel->r_offset);
+
+	relocation >>= howto->rightshift;
+	signed_check = relocation;
+
+	if (r_type == R_ARM_THM_JUMP6)
+	  relocation = ((relocation & 0x0020) << 4) | ((relocation & 0x001f) << 3);
+	else
+	  relocation &= howto->dst_mask;
+	relocation |= (bfd_get_16 (input_bfd, hit_data) & (~ howto->dst_mask));
+
+	bfd_put_16 (input_bfd, relocation, hit_data);
+
+	/* Assumes two's complement.  */
+	if (signed_check > reloc_signed_max || signed_check < reloc_signed_min)
+	  return bfd_reloc_overflow;
+
+	return bfd_reloc_ok;
+      }
+
+    case R_ARM_ALU_PCREL7_0:
+    case R_ARM_ALU_PCREL15_8:
+    case R_ARM_ALU_PCREL23_15:
+      {
+	bfd_vma insn;
+	bfd_vma relocation;
+
+	insn = bfd_get_32 (input_bfd, hit_data);
+	if (globals->use_rel)
+	  {
+	    /* Extract the addend.  */
+	    addend = (insn & 0xff) << ((insn & 0xf00) >> 7);
+	    signed_addend = addend;
+	  }
+	relocation = value + signed_addend;
+
+	relocation -= (input_section->output_section->vma
+		       + input_section->output_offset
+		       + rel->r_offset);
+	insn = (insn & ~0xfff)
+	       | ((howto->bitpos << 7) & 0xf00)
+	       | ((relocation >> howto->bitpos) & 0xff);
+	bfd_put_32 (input_bfd, value, hit_data);
+      }
+      return bfd_reloc_ok;
+
+    case R_ARM_GNU_VTINHERIT:
+    case R_ARM_GNU_VTENTRY:
+      return bfd_reloc_ok;
+
+    case R_ARM_GOTOFF32:
+      /* Relocation is relative to the start of the
+         global offset table.  */
+
+      BFD_ASSERT (sgot != NULL);
+      if (sgot == NULL)
+        return bfd_reloc_notsupported;
+
+      /* If we are addressing a Thumb function, we need to adjust the
+	 address by one, so that attempts to call the function pointer will
+	 correctly interpret it as Thumb code.  */
+      if (branch_type == ST_BRANCH_TO_THUMB)
+	value += 1;
+
+      /* Note that sgot->output_offset is not involved in this
+         calculation.  We always want the start of .got.  If we
+         define _GLOBAL_OFFSET_TABLE in a different way, as is
+         permitted by the ABI, we might have to change this
+         calculation.  */
+      value -= sgot->output_section->vma;
+      return _bfd_final_link_relocate (howto, input_bfd, input_section,
+				       contents, rel->r_offset, value,
+				       rel->r_addend);
+
+    case R_ARM_GOTPC:
+      /* Use global offset table as symbol value.  */
+      BFD_ASSERT (sgot != NULL);
+
+      if (sgot == NULL)
+        return bfd_reloc_notsupported;
+
+      *unresolved_reloc_p = FALSE;
+      value = sgot->output_section->vma;
+      return _bfd_final_link_relocate (howto, input_bfd, input_section,
+				       contents, rel->r_offset, value,
+				       rel->r_addend);
+
+    case R_ARM_GOT32:
+    case R_ARM_GOT_PREL:
+      /* Relocation is to the entry for this symbol in the
+         global offset table.  */
+      if (sgot == NULL)
+	return bfd_reloc_notsupported;
+
+      if (dynreloc_st_type == STT_GNU_IFUNC
+	  && plt_offset != (bfd_vma) -1
+	  && (h == NULL || SYMBOL_REFERENCES_LOCAL (info, h)))
+	{
+	  /* We have a relocation against a locally-binding STT_GNU_IFUNC
+	     symbol, and the relocation resolves directly to the runtime
+	     target rather than to the .iplt entry.  This means that any
+	     .got entry would be the same value as the .igot.plt entry,
+	     so there's no point creating both.  */
+	  sgot = globals->root.igotplt;
+	  value = sgot->output_offset + gotplt_offset;
+	}
+      else if (h != NULL)
+	{
+	  bfd_vma off;
+
+	  off = h->got.offset;
+	  BFD_ASSERT (off != (bfd_vma) -1);
+	  if ((off & 1) != 0)
+	    {
+	      /* We have already processsed one GOT relocation against
+		 this symbol.  */
+	      off &= ~1;
+	      if (globals->root.dynamic_sections_created
+		  && !SYMBOL_REFERENCES_LOCAL (info, h))
+		*unresolved_reloc_p = FALSE;
+	    }
+	  else
+	    {
+	      Elf_Internal_Rela outrel;
+
+	      if (!SYMBOL_REFERENCES_LOCAL (info, h))
+		{
+		  /* If the symbol doesn't resolve locally in a static
+		     object, we have an undefined reference.  If the
+		     symbol doesn't resolve locally in a dynamic object,
+		     it should be resolved by the dynamic linker.  */
+		  if (globals->root.dynamic_sections_created)
+		    {
+		      outrel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_GLOB_DAT);
+		      *unresolved_reloc_p = FALSE;
+		    }
+		  else
+		    outrel.r_info = 0;
+		  outrel.r_addend = 0;
+		}
+	      else
+		{
+		  if (dynreloc_st_type == STT_GNU_IFUNC)
+ 		    outrel.r_info = ELF32_R_INFO (0, R_ARM_IRELATIVE);
+		  else if (info->shared)
+ 		    outrel.r_info = ELF32_R_INFO (0, R_ARM_RELATIVE);
+ 		  else
+ 		    outrel.r_info = 0;
+		  outrel.r_addend = dynreloc_value;
+		}
+
+	      /* The GOT entry is initialized to zero by default.
+		 See if we should install a different value.  */
+	      if (outrel.r_addend != 0
+		  && (outrel.r_info == 0 || globals->use_rel))
+		{
+		  bfd_put_32 (output_bfd, outrel.r_addend,
+			      sgot->contents + off);
+		  outrel.r_addend = 0;
+		}
+
+	      if (outrel.r_info != 0)
+		{
+		  outrel.r_offset = (sgot->output_section->vma
+				     + sgot->output_offset
+				     + off);
+		  elf32_arm_add_dynreloc (output_bfd, info, srelgot, &outrel);
+		}
+	      h->got.offset |= 1;
+	    }
+	  value = sgot->output_offset + off;
+	}
+      else
+	{
+	  bfd_vma off;
+
+	  BFD_ASSERT (local_got_offsets != NULL &&
+		      local_got_offsets[r_symndx] != (bfd_vma) -1);
+
+	  off = local_got_offsets[r_symndx];
+
+	  /* The offset must always be a multiple of 4.  We use the
+	     least significant bit to record whether we have already
+	     generated the necessary reloc.  */
+	  if ((off & 1) != 0)
+	    off &= ~1;
+	  else
+	    {
+	      if (globals->use_rel)
+		bfd_put_32 (output_bfd, dynreloc_value, sgot->contents + off);
+
+	      if (info->shared || dynreloc_st_type == STT_GNU_IFUNC)
+		{
+		  Elf_Internal_Rela outrel;
+
+		  outrel.r_addend = addend + dynreloc_value;
+		  outrel.r_offset = (sgot->output_section->vma
+				     + sgot->output_offset
+				     + off);
+		  if (dynreloc_st_type == STT_GNU_IFUNC)
+ 		    outrel.r_info = ELF32_R_INFO (0, R_ARM_IRELATIVE);
+		  else
+		    outrel.r_info = ELF32_R_INFO (0, R_ARM_RELATIVE);
+		  elf32_arm_add_dynreloc (output_bfd, info, srelgot, &outrel);
+		}
+
+	      local_got_offsets[r_symndx] |= 1;
+	    }
+
+	  value = sgot->output_offset + off;
+	}
+      if (r_type != R_ARM_GOT32)
+	value += sgot->output_section->vma;
+
+      return _bfd_final_link_relocate (howto, input_bfd, input_section,
+				       contents, rel->r_offset, value,
+				       rel->r_addend);
+
+    case R_ARM_TLS_LDO32:
+      value = value - dtpoff_base (info);
+
+      return _bfd_final_link_relocate (howto, input_bfd, input_section,
+				       contents, rel->r_offset, value,
+				       rel->r_addend);
+
+    case R_ARM_TLS_LDM32:
+      {
+	bfd_vma off;
+
+	if (sgot == NULL)
+	  abort ();
+
+	off = globals->tls_ldm_got.offset;
+
+	if ((off & 1) != 0)
+	  off &= ~1;
+	else
+	  {
+	    /* If we don't know the module number, create a relocation
+	       for it.  */
+	    if (info->shared)
+	      {
+		Elf_Internal_Rela outrel;
+
+		if (srelgot == NULL)
+		  abort ();
+
+		outrel.r_addend = 0;
+		outrel.r_offset = (sgot->output_section->vma
+				   + sgot->output_offset + off);
+		outrel.r_info = ELF32_R_INFO (0, R_ARM_TLS_DTPMOD32);
+
+		if (globals->use_rel)
+		  bfd_put_32 (output_bfd, outrel.r_addend,
+			      sgot->contents + off);
+
+		elf32_arm_add_dynreloc (output_bfd, info, srelgot, &outrel);
+	      }
+	    else
+	      bfd_put_32 (output_bfd, 1, sgot->contents + off);
+
+	    globals->tls_ldm_got.offset |= 1;
+	  }
+
+	value = sgot->output_section->vma + sgot->output_offset + off
+	  - (input_section->output_section->vma + input_section->output_offset + rel->r_offset);
+
+	return _bfd_final_link_relocate (howto, input_bfd, input_section,
+					 contents, rel->r_offset, value,
+					 rel->r_addend);
+      }
+
+    case R_ARM_TLS_CALL:
+    case R_ARM_THM_TLS_CALL:
+    case R_ARM_TLS_GD32:
+    case R_ARM_TLS_IE32:
+    case R_ARM_TLS_GOTDESC:
+    case R_ARM_TLS_DESCSEQ:
+    case R_ARM_THM_TLS_DESCSEQ:
+      {
+	bfd_vma off, offplt;
+	int indx = 0;
+	char tls_type;
+
+	BFD_ASSERT (sgot != NULL);
+
+	if (h != NULL)
+	  {
+	    bfd_boolean dyn;
+	    dyn = globals->root.dynamic_sections_created;
+	    if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+		&& (!info->shared
+		    || !SYMBOL_REFERENCES_LOCAL (info, h)))
+	      {
+		*unresolved_reloc_p = FALSE;
+		indx = h->dynindx;
+	      }
+	    off = h->got.offset;
+	    offplt = elf32_arm_hash_entry (h)->tlsdesc_got;
+	    tls_type = ((struct elf32_arm_link_hash_entry *) h)->tls_type;
+	  }
+	else
+	  {
+	    BFD_ASSERT (local_got_offsets != NULL);
+	    off = local_got_offsets[r_symndx];
+	    offplt = local_tlsdesc_gotents[r_symndx];
+	    tls_type = elf32_arm_local_got_tls_type (input_bfd)[r_symndx];
+	  }
+
+	/* Linker relaxations happens from one of the
+	   R_ARM_{GOTDESC,CALL,DESCSEQ} relocations to IE or LE.  */ 
+	if (ELF32_R_TYPE(rel->r_info) != r_type)
+	  tls_type = GOT_TLS_IE; 
+
+	BFD_ASSERT (tls_type != GOT_UNKNOWN);
+
+	if ((off & 1) != 0)
+	  off &= ~1;
+	else
+	  {
+	    bfd_boolean need_relocs = FALSE;
+	    Elf_Internal_Rela outrel;
+	    int cur_off = off;
+
+	    /* The GOT entries have not been initialized yet.  Do it
+	       now, and emit any relocations.  If both an IE GOT and a
+	       GD GOT are necessary, we emit the GD first.  */
+
+	    if ((info->shared || indx != 0)
+		&& (h == NULL
+		    || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		    || h->root.type != bfd_link_hash_undefweak))
+	      {
+		need_relocs = TRUE;
+		BFD_ASSERT (srelgot != NULL);
+	      }
+
+	    if (tls_type & GOT_TLS_GDESC)
+	      {
+		bfd_byte *loc;
+
+		/* We should have relaxed, unless this is an undefined
+		   weak symbol.  */
+		BFD_ASSERT ((h && (h->root.type == bfd_link_hash_undefweak))
+			    || info->shared);
+		BFD_ASSERT (globals->sgotplt_jump_table_size + offplt + 8
+                            <= globals->root.sgotplt->size);
+
+		outrel.r_addend = 0;
+		outrel.r_offset = (globals->root.sgotplt->output_section->vma
+				   + globals->root.sgotplt->output_offset
+				   + offplt
+				   + globals->sgotplt_jump_table_size);
+		
+		outrel.r_info = ELF32_R_INFO (indx, R_ARM_TLS_DESC);
+		sreloc = globals->root.srelplt;
+		loc = sreloc->contents;
+		loc += globals->next_tls_desc_index++ * RELOC_SIZE (globals);
+		BFD_ASSERT (loc + RELOC_SIZE (globals)
+		   	   <= sreloc->contents + sreloc->size);
+
+		SWAP_RELOC_OUT (globals) (output_bfd, &outrel, loc);
+
+		/* For globals, the first word in the relocation gets
+		   the relocation index and the top bit set, or zero,
+		   if we're binding now.  For locals, it gets the
+		   symbol's offset in the tls section.  */
+	    	bfd_put_32 (output_bfd,
+			    !h ? value - elf_hash_table (info)->tls_sec->vma
+			    : info->flags & DF_BIND_NOW ? 0
+			    : 0x80000000 | ELF32_R_SYM (outrel.r_info),
+			    globals->root.sgotplt->contents + offplt +
+			    globals->sgotplt_jump_table_size);
+		
+		/* Second word in the relocation is always zero.  */
+	    	bfd_put_32 (output_bfd, 0,
+			    globals->root.sgotplt->contents + offplt +
+			    globals->sgotplt_jump_table_size + 4);
+	      }
+	    if (tls_type & GOT_TLS_GD)
+	      {
+		if (need_relocs)
+		  {
+		    outrel.r_addend = 0;
+		    outrel.r_offset = (sgot->output_section->vma
+				       + sgot->output_offset
+				       + cur_off);
+		    outrel.r_info = ELF32_R_INFO (indx, R_ARM_TLS_DTPMOD32);
+
+		    if (globals->use_rel)
+		      bfd_put_32 (output_bfd, outrel.r_addend,
+				  sgot->contents + cur_off);
+
+		    elf32_arm_add_dynreloc (output_bfd, info, srelgot, &outrel);
+
+		    if (indx == 0)
+		      bfd_put_32 (output_bfd, value - dtpoff_base (info),
+				  sgot->contents + cur_off + 4);
+		    else
+		      {
+			outrel.r_addend = 0;
+			outrel.r_info = ELF32_R_INFO (indx,
+						      R_ARM_TLS_DTPOFF32);
+			outrel.r_offset += 4;
+
+			if (globals->use_rel)
+			  bfd_put_32 (output_bfd, outrel.r_addend,
+				      sgot->contents + cur_off + 4);
+
+			elf32_arm_add_dynreloc (output_bfd, info,
+						srelgot, &outrel);
+		      }
+		  }
+		else
+		  {
+		    /* If we are not emitting relocations for a
+		       general dynamic reference, then we must be in a
+		       static link or an executable link with the
+		       symbol binding locally.  Mark it as belonging
+		       to module 1, the executable.  */
+		    bfd_put_32 (output_bfd, 1,
+				sgot->contents + cur_off);
+		    bfd_put_32 (output_bfd, value - dtpoff_base (info),
+				sgot->contents + cur_off + 4);
+		  }
+
+		cur_off += 8;
+	      }
+
+	    if (tls_type & GOT_TLS_IE)
+	      {
+		if (need_relocs)
+		  {
+		    if (indx == 0)
+		      outrel.r_addend = value - dtpoff_base (info);
+		    else
+		      outrel.r_addend = 0;
+		    outrel.r_offset = (sgot->output_section->vma
+				       + sgot->output_offset
+				       + cur_off);
+		    outrel.r_info = ELF32_R_INFO (indx, R_ARM_TLS_TPOFF32);
+
+		    if (globals->use_rel)
+		      bfd_put_32 (output_bfd, outrel.r_addend,
+				  sgot->contents + cur_off);
+
+		    elf32_arm_add_dynreloc (output_bfd, info, srelgot, &outrel);
+		  }
+		else
+		  bfd_put_32 (output_bfd, tpoff (info, value),
+			      sgot->contents + cur_off);
+		cur_off += 4;
+	      }
+
+	    if (h != NULL)
+	      h->got.offset |= 1;
+	    else
+	      local_got_offsets[r_symndx] |= 1;
+	  }
+
+	if ((tls_type & GOT_TLS_GD) && r_type != R_ARM_TLS_GD32)
+	  off += 8;
+	else if (tls_type & GOT_TLS_GDESC)
+	  off = offplt;
+
+	if (ELF32_R_TYPE(rel->r_info) == R_ARM_TLS_CALL
+	    || ELF32_R_TYPE(rel->r_info) == R_ARM_THM_TLS_CALL)
+	  {
+	    bfd_signed_vma offset;
+	    /* TLS stubs are arm mode.  The original symbol is a
+	       data object, so branch_type is bogus.  */
+	    branch_type = ST_BRANCH_TO_ARM;
+	    enum elf32_arm_stub_type stub_type
+	      = arm_type_of_stub (info, input_section, rel,
+				  st_type, &branch_type,
+				  (struct elf32_arm_link_hash_entry *)h,
+				  globals->tls_trampoline, globals->root.splt,
+				  input_bfd, sym_name);
+
+	    if (stub_type != arm_stub_none)
+	      {
+		struct elf32_arm_stub_hash_entry *stub_entry
+		  = elf32_arm_get_stub_entry
+		  (input_section, globals->root.splt, 0, rel,
+		   globals, stub_type);
+		offset = (stub_entry->stub_offset
+			  + stub_entry->stub_sec->output_offset
+			  + stub_entry->stub_sec->output_section->vma);
+	      }
+	    else
+	      offset = (globals->root.splt->output_section->vma
+			+ globals->root.splt->output_offset
+			+ globals->tls_trampoline);
+
+	    if (ELF32_R_TYPE(rel->r_info) == R_ARM_TLS_CALL)
+	      {
+		unsigned long inst;
+		
+		offset -= (input_section->output_section->vma +
+			   input_section->output_offset + rel->r_offset + 8);
+
+		inst = offset >> 2;
+		inst &= 0x00ffffff;
+		value = inst | (globals->use_blx ? 0xfa000000 : 0xeb000000);
+	      }
+	    else
+	      {
+		/* Thumb blx encodes the offset in a complicated
+		   fashion.  */
+		unsigned upper_insn, lower_insn;
+		unsigned neg;
+
+		offset -= (input_section->output_section->vma + 
+			   input_section->output_offset
+			   + rel->r_offset + 4);
+	    
+		if (stub_type != arm_stub_none
+		    && arm_stub_is_thumb (stub_type))
+		  {
+		    lower_insn = 0xd000;
+		  }
+		else
+		  {
+		    lower_insn = 0xc000;
+		    /* Round up the offset to a word boundary */
+		    offset = (offset + 2) & ~2;
+		  }
+
+		neg = offset < 0;
+		upper_insn = (0xf000
+			      | ((offset >> 12) & 0x3ff)
+			      | (neg << 10));
+		lower_insn |= (((!((offset >> 23) & 1)) ^ neg) << 13)
+			      | (((!((offset >> 22) & 1)) ^ neg) << 11)
+			      | ((offset >> 1) & 0x7ff);
+		bfd_put_16 (input_bfd, upper_insn, hit_data);
+		bfd_put_16 (input_bfd, lower_insn, hit_data + 2);
+		return bfd_reloc_ok;
+	      }
+	  }
+	/* These relocations needs special care, as besides the fact
+	   they point somewhere in .gotplt, the addend must be
+	   adjusted accordingly depending on the type of instruction
+	   we refer to */
+	else if ((r_type == R_ARM_TLS_GOTDESC) && (tls_type & GOT_TLS_GDESC))
+	  {
+	    unsigned long data, insn;
+	    unsigned thumb;
+	    
+	    data = bfd_get_32 (input_bfd, hit_data);
+	    thumb = data & 1;
+	    data &= ~1u;
+	    
+	    if (thumb)
+	      {
+		insn = bfd_get_16 (input_bfd, contents + rel->r_offset - data);
+		if ((insn & 0xf000) == 0xf000 || (insn & 0xf800) == 0xe800)
+		  insn = (insn << 16)
+		    | bfd_get_16 (input_bfd,
+				  contents + rel->r_offset - data + 2);
+		if ((insn & 0xf800c000) == 0xf000c000)
+		  /* bl/blx */
+		  value = -6;
+		else if ((insn & 0xffffff00) == 0x4400)
+		  /* add */
+		  value = -5;
+		else
+		  {
+		    (*_bfd_error_handler)
+		      (_("%B(%A+0x%lx):unexpected Thumb instruction '0x%x' referenced by TLS_GOTDESC"),
+		       input_bfd, input_section,
+		       (unsigned long)rel->r_offset, insn);
+		    return bfd_reloc_notsupported;
+		  }
+	      }
+	    else
+	      {
+		insn = bfd_get_32 (input_bfd, contents + rel->r_offset - data);
+
+		switch (insn >> 24)
+		  {
+		  case 0xeb:  /* bl */
+		  case 0xfa:  /* blx */
+		    value = -4;
+		    break;
+
+		  case 0xe0:	/* add */
+		    value = -8;
+		    break;
+		    
+		  default:
+		    (*_bfd_error_handler)
+		      (_("%B(%A+0x%lx):unexpected ARM instruction '0x%x' referenced by TLS_GOTDESC"),
+		       input_bfd, input_section,
+		       (unsigned long)rel->r_offset, insn);
+		    return bfd_reloc_notsupported;
+		  }
+	      }
+ 
+	    value += ((globals->root.sgotplt->output_section->vma
+		       + globals->root.sgotplt->output_offset + off)
+		      - (input_section->output_section->vma
+			 + input_section->output_offset
+			 + rel->r_offset)
+		      + globals->sgotplt_jump_table_size);
+	  }
+	else
+	  value = ((globals->root.sgot->output_section->vma
+		    + globals->root.sgot->output_offset + off)
+		   - (input_section->output_section->vma
+		      + input_section->output_offset + rel->r_offset));
+
+	return _bfd_final_link_relocate (howto, input_bfd, input_section,
+					 contents, rel->r_offset, value,
+					 rel->r_addend);
+      }
+
+    case R_ARM_TLS_LE32:
+      if (info->shared && !info->pie)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B(%A+0x%lx): R_ARM_TLS_LE32 relocation not permitted in shared object"),
+	     input_bfd, input_section,
+	     (long) rel->r_offset, howto->name);
+	  return (bfd_reloc_status_type) FALSE;
+	}
+      else
+	value = tpoff (info, value);
+
+      return _bfd_final_link_relocate (howto, input_bfd, input_section,
+				       contents, rel->r_offset, value,
+				       rel->r_addend);
+
+    case R_ARM_V4BX:
+      if (globals->fix_v4bx)
+	{
+	  bfd_vma insn = bfd_get_32 (input_bfd, hit_data);
+
+	  /* Ensure that we have a BX instruction.  */
+	  BFD_ASSERT ((insn & 0x0ffffff0) == 0x012fff10);
+
+	  if (globals->fix_v4bx == 2 && (insn & 0xf) != 0xf)
+	    {
+	      /* Branch to veneer.  */
+	      bfd_vma glue_addr;
+	      glue_addr = elf32_arm_bx_glue (info, insn & 0xf);
+	      glue_addr -= input_section->output_section->vma
+			   + input_section->output_offset
+			   + rel->r_offset + 8;
+	      insn = (insn & 0xf0000000) | 0x0a000000
+		     | ((glue_addr >> 2) & 0x00ffffff);
+	    }
+	  else
+	    {
+	      /* Preserve Rm (lowest four bits) and the condition code
+		 (highest four bits). Other bits encode MOV PC,Rm.  */
+	      insn = (insn & 0xf000000f) | 0x01a0f000;
+	    }
+
+	  bfd_put_32 (input_bfd, insn, hit_data);
+	}
+      return bfd_reloc_ok;
+
+    case R_ARM_MOVW_ABS_NC:
+    case R_ARM_MOVT_ABS:
+    case R_ARM_MOVW_PREL_NC:
+    case R_ARM_MOVT_PREL:
+    /* Until we properly support segment-base-relative addressing then
+       we assume the segment base to be zero, as for the group relocations.
+       Thus R_ARM_MOVW_BREL_NC has the same semantics as R_ARM_MOVW_ABS_NC
+       and R_ARM_MOVT_BREL has the same semantics as R_ARM_MOVT_ABS.  */
+    case R_ARM_MOVW_BREL_NC:
+    case R_ARM_MOVW_BREL:
+    case R_ARM_MOVT_BREL:
+      {
+	bfd_vma insn = bfd_get_32 (input_bfd, hit_data);
+
+	if (globals->use_rel)
+	  {
+	    addend = ((insn >> 4) & 0xf000) | (insn & 0xfff);
+	    signed_addend = (addend ^ 0x8000) - 0x8000;
+	  }
+
+	value += signed_addend;
+
+	if (r_type == R_ARM_MOVW_PREL_NC || r_type == R_ARM_MOVT_PREL)
+	  value -= (input_section->output_section->vma
+		    + input_section->output_offset + rel->r_offset);
+
+	if (r_type == R_ARM_MOVW_BREL && value >= 0x10000)
+          return bfd_reloc_overflow;
+
+	if (branch_type == ST_BRANCH_TO_THUMB)
+	  value |= 1;
+
+	if (r_type == R_ARM_MOVT_ABS || r_type == R_ARM_MOVT_PREL
+            || r_type == R_ARM_MOVT_BREL)
+	  value >>= 16;
+
+	insn &= 0xfff0f000;
+	insn |= value & 0xfff;
+	insn |= (value & 0xf000) << 4;
+	bfd_put_32 (input_bfd, insn, hit_data);
+      }
+      return bfd_reloc_ok;
+
+    case R_ARM_THM_MOVW_ABS_NC:
+    case R_ARM_THM_MOVT_ABS:
+    case R_ARM_THM_MOVW_PREL_NC:
+    case R_ARM_THM_MOVT_PREL:
+    /* Until we properly support segment-base-relative addressing then
+       we assume the segment base to be zero, as for the above relocations.
+       Thus R_ARM_THM_MOVW_BREL_NC has the same semantics as
+       R_ARM_THM_MOVW_ABS_NC and R_ARM_THM_MOVT_BREL has the same semantics
+       as R_ARM_THM_MOVT_ABS.  */
+    case R_ARM_THM_MOVW_BREL_NC:
+    case R_ARM_THM_MOVW_BREL:
+    case R_ARM_THM_MOVT_BREL:
+      {
+	bfd_vma insn;
+
+	insn = bfd_get_16 (input_bfd, hit_data) << 16;
+	insn |= bfd_get_16 (input_bfd, hit_data + 2);
+
+	if (globals->use_rel)
+	  {
+	    addend = ((insn >> 4)  & 0xf000)
+		   | ((insn >> 15) & 0x0800)
+		   | ((insn >> 4)  & 0x0700)
+		   | (insn         & 0x00ff);
+	    signed_addend = (addend ^ 0x8000) - 0x8000;
+	  }
+
+	value += signed_addend;
+
+	if (r_type == R_ARM_THM_MOVW_PREL_NC || r_type == R_ARM_THM_MOVT_PREL)
+	  value -= (input_section->output_section->vma
+		    + input_section->output_offset + rel->r_offset);
+
+	if (r_type == R_ARM_THM_MOVW_BREL && value >= 0x10000)
+          return bfd_reloc_overflow;
+
+	if (branch_type == ST_BRANCH_TO_THUMB)
+	  value |= 1;
+
+	if (r_type == R_ARM_THM_MOVT_ABS || r_type == R_ARM_THM_MOVT_PREL
+            || r_type == R_ARM_THM_MOVT_BREL)
+	  value >>= 16;
+
+	insn &= 0xfbf08f00;
+	insn |= (value & 0xf000) << 4;
+	insn |= (value & 0x0800) << 15;
+	insn |= (value & 0x0700) << 4;
+	insn |= (value & 0x00ff);
+
+	bfd_put_16 (input_bfd, insn >> 16, hit_data);
+	bfd_put_16 (input_bfd, insn & 0xffff, hit_data + 2);
+      }
+      return bfd_reloc_ok;
+
+    case R_ARM_ALU_PC_G0_NC:
+    case R_ARM_ALU_PC_G1_NC:
+    case R_ARM_ALU_PC_G0:
+    case R_ARM_ALU_PC_G1:
+    case R_ARM_ALU_PC_G2:
+    case R_ARM_ALU_SB_G0_NC:
+    case R_ARM_ALU_SB_G1_NC:
+    case R_ARM_ALU_SB_G0:
+    case R_ARM_ALU_SB_G1:
+    case R_ARM_ALU_SB_G2:
+      {
+	bfd_vma insn = bfd_get_32 (input_bfd, hit_data);
+        bfd_vma pc = input_section->output_section->vma
+		     + input_section->output_offset + rel->r_offset;
+        /* sb should be the origin of the *segment* containing the symbol.
+           It is not clear how to obtain this OS-dependent value, so we
+           make an arbitrary choice of zero.  */
+        bfd_vma sb = 0;
+        bfd_vma residual;
+        bfd_vma g_n;
+	bfd_signed_vma signed_value;
+        int group = 0;
+
+        /* Determine which group of bits to select.  */
+        switch (r_type)
+          {
+          case R_ARM_ALU_PC_G0_NC:
+          case R_ARM_ALU_PC_G0:
+          case R_ARM_ALU_SB_G0_NC:
+          case R_ARM_ALU_SB_G0:
+            group = 0;
+            break;
+
+          case R_ARM_ALU_PC_G1_NC:
+          case R_ARM_ALU_PC_G1:
+          case R_ARM_ALU_SB_G1_NC:
+          case R_ARM_ALU_SB_G1:
+            group = 1;
+            break;
+
+          case R_ARM_ALU_PC_G2:
+          case R_ARM_ALU_SB_G2:
+            group = 2;
+            break;
+
+          default:
+            abort ();
+          }
+
+        /* If REL, extract the addend from the insn.  If RELA, it will
+           have already been fetched for us.  */
+	if (globals->use_rel)
+          {
+            int negative;
+            bfd_vma constant = insn & 0xff;
+            bfd_vma rotation = (insn & 0xf00) >> 8;
+
+            if (rotation == 0)
+              signed_addend = constant;
+            else
+              {
+                /* Compensate for the fact that in the instruction, the
+                   rotation is stored in multiples of 2 bits.  */
+                rotation *= 2;
+
+                /* Rotate "constant" right by "rotation" bits.  */
+                signed_addend = (constant >> rotation) |
+                                (constant << (8 * sizeof (bfd_vma) - rotation));
+              }
+
+            /* Determine if the instruction is an ADD or a SUB.
+               (For REL, this determines the sign of the addend.)  */
+            negative = identify_add_or_sub (insn);
+            if (negative == 0)
+              {
+                (*_bfd_error_handler)
+                  (_("%B(%A+0x%lx): Only ADD or SUB instructions are allowed for ALU group relocations"),
+                  input_bfd, input_section,
+                  (long) rel->r_offset, howto->name);
+                return bfd_reloc_overflow;
+    	      }
+
+            signed_addend *= negative;
+          }
+
+	/* Compute the value (X) to go in the place.  */
+        if (r_type == R_ARM_ALU_PC_G0_NC
+            || r_type == R_ARM_ALU_PC_G1_NC
+            || r_type == R_ARM_ALU_PC_G0
+            || r_type == R_ARM_ALU_PC_G1
+            || r_type == R_ARM_ALU_PC_G2)
+          /* PC relative.  */
+          signed_value = value - pc + signed_addend;
+        else
+          /* Section base relative.  */
+          signed_value = value - sb + signed_addend;
+
+        /* If the target symbol is a Thumb function, then set the
+           Thumb bit in the address.  */
+	if (branch_type == ST_BRANCH_TO_THUMB)
+	  signed_value |= 1;
+
+        /* Calculate the value of the relevant G_n, in encoded
+           constant-with-rotation format.  */
+        g_n = calculate_group_reloc_mask (abs (signed_value), group,
+                                          &residual);
+
+        /* Check for overflow if required.  */
+        if ((r_type == R_ARM_ALU_PC_G0
+             || r_type == R_ARM_ALU_PC_G1
+             || r_type == R_ARM_ALU_PC_G2
+             || r_type == R_ARM_ALU_SB_G0
+             || r_type == R_ARM_ALU_SB_G1
+             || r_type == R_ARM_ALU_SB_G2) && residual != 0)
+          {
+            (*_bfd_error_handler)
+              (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"),
+              input_bfd, input_section,
+              (long) rel->r_offset, abs (signed_value), howto->name);
+            return bfd_reloc_overflow;
+          }
+
+        /* Mask out the value and the ADD/SUB part of the opcode; take care
+           not to destroy the S bit.  */
+        insn &= 0xff1ff000;
+
+        /* Set the opcode according to whether the value to go in the
+           place is negative.  */
+        if (signed_value < 0)
+          insn |= 1 << 22;
+        else
+          insn |= 1 << 23;
+
+        /* Encode the offset.  */
+        insn |= g_n;
+
+	bfd_put_32 (input_bfd, insn, hit_data);
+      }
+      return bfd_reloc_ok;
+
+    case R_ARM_LDR_PC_G0:
+    case R_ARM_LDR_PC_G1:
+    case R_ARM_LDR_PC_G2:
+    case R_ARM_LDR_SB_G0:
+    case R_ARM_LDR_SB_G1:
+    case R_ARM_LDR_SB_G2:
+      {
+	bfd_vma insn = bfd_get_32 (input_bfd, hit_data);
+        bfd_vma pc = input_section->output_section->vma
+		     + input_section->output_offset + rel->r_offset;
+        bfd_vma sb = 0; /* See note above.  */
+        bfd_vma residual;
+	bfd_signed_vma signed_value;
+        int group = 0;
+
+        /* Determine which groups of bits to calculate.  */
+        switch (r_type)
+          {
+          case R_ARM_LDR_PC_G0:
+          case R_ARM_LDR_SB_G0:
+            group = 0;
+            break;
+
+          case R_ARM_LDR_PC_G1:
+          case R_ARM_LDR_SB_G1:
+            group = 1;
+            break;
+
+          case R_ARM_LDR_PC_G2:
+          case R_ARM_LDR_SB_G2:
+            group = 2;
+            break;
+
+          default:
+            abort ();
+          }
+
+        /* If REL, extract the addend from the insn.  If RELA, it will
+           have already been fetched for us.  */
+	if (globals->use_rel)
+          {
+            int negative = (insn & (1 << 23)) ? 1 : -1;
+            signed_addend = negative * (insn & 0xfff);
+          }
+
+	/* Compute the value (X) to go in the place.  */
+        if (r_type == R_ARM_LDR_PC_G0
+            || r_type == R_ARM_LDR_PC_G1
+            || r_type == R_ARM_LDR_PC_G2)
+          /* PC relative.  */
+          signed_value = value - pc + signed_addend;
+        else
+          /* Section base relative.  */
+          signed_value = value - sb + signed_addend;
+
+        /* Calculate the value of the relevant G_{n-1} to obtain
+           the residual at that stage.  */
+        calculate_group_reloc_mask (abs (signed_value), group - 1, &residual);
+
+        /* Check for overflow.  */
+        if (residual >= 0x1000)
+          {
+            (*_bfd_error_handler)
+              (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"),
+              input_bfd, input_section,
+              (long) rel->r_offset, abs (signed_value), howto->name);
+            return bfd_reloc_overflow;
+          }
+
+        /* Mask out the value and U bit.  */
+        insn &= 0xff7ff000;
+
+        /* Set the U bit if the value to go in the place is non-negative.  */
+        if (signed_value >= 0)
+          insn |= 1 << 23;
+
+        /* Encode the offset.  */
+        insn |= residual;
+
+	bfd_put_32 (input_bfd, insn, hit_data);
+      }
+      return bfd_reloc_ok;
+
+    case R_ARM_LDRS_PC_G0:
+    case R_ARM_LDRS_PC_G1:
+    case R_ARM_LDRS_PC_G2:
+    case R_ARM_LDRS_SB_G0:
+    case R_ARM_LDRS_SB_G1:
+    case R_ARM_LDRS_SB_G2:
+      {
+	bfd_vma insn = bfd_get_32 (input_bfd, hit_data);
+        bfd_vma pc = input_section->output_section->vma
+		     + input_section->output_offset + rel->r_offset;
+        bfd_vma sb = 0; /* See note above.  */
+        bfd_vma residual;
+	bfd_signed_vma signed_value;
+        int group = 0;
+
+        /* Determine which groups of bits to calculate.  */
+        switch (r_type)
+          {
+          case R_ARM_LDRS_PC_G0:
+          case R_ARM_LDRS_SB_G0:
+            group = 0;
+            break;
+
+          case R_ARM_LDRS_PC_G1:
+          case R_ARM_LDRS_SB_G1:
+            group = 1;
+            break;
+
+          case R_ARM_LDRS_PC_G2:
+          case R_ARM_LDRS_SB_G2:
+            group = 2;
+            break;
+
+          default:
+            abort ();
+          }
+
+        /* If REL, extract the addend from the insn.  If RELA, it will
+           have already been fetched for us.  */
+	if (globals->use_rel)
+          {
+            int negative = (insn & (1 << 23)) ? 1 : -1;
+            signed_addend = negative * (((insn & 0xf00) >> 4) + (insn & 0xf));
+          }
+
+	/* Compute the value (X) to go in the place.  */
+        if (r_type == R_ARM_LDRS_PC_G0
+            || r_type == R_ARM_LDRS_PC_G1
+            || r_type == R_ARM_LDRS_PC_G2)
+          /* PC relative.  */
+          signed_value = value - pc + signed_addend;
+        else
+          /* Section base relative.  */
+          signed_value = value - sb + signed_addend;
+
+        /* Calculate the value of the relevant G_{n-1} to obtain
+           the residual at that stage.  */
+        calculate_group_reloc_mask (abs (signed_value), group - 1, &residual);
+
+        /* Check for overflow.  */
+        if (residual >= 0x100)
+          {
+            (*_bfd_error_handler)
+              (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"),
+              input_bfd, input_section,
+              (long) rel->r_offset, abs (signed_value), howto->name);
+            return bfd_reloc_overflow;
+          }
+
+        /* Mask out the value and U bit.  */
+        insn &= 0xff7ff0f0;
+
+        /* Set the U bit if the value to go in the place is non-negative.  */
+        if (signed_value >= 0)
+          insn |= 1 << 23;
+
+        /* Encode the offset.  */
+        insn |= ((residual & 0xf0) << 4) | (residual & 0xf);
+
+	bfd_put_32 (input_bfd, insn, hit_data);
+      }
+      return bfd_reloc_ok;
+
+    case R_ARM_LDC_PC_G0:
+    case R_ARM_LDC_PC_G1:
+    case R_ARM_LDC_PC_G2:
+    case R_ARM_LDC_SB_G0:
+    case R_ARM_LDC_SB_G1:
+    case R_ARM_LDC_SB_G2:
+      {
+	bfd_vma insn = bfd_get_32 (input_bfd, hit_data);
+        bfd_vma pc = input_section->output_section->vma
+		     + input_section->output_offset + rel->r_offset;
+        bfd_vma sb = 0; /* See note above.  */
+        bfd_vma residual;
+	bfd_signed_vma signed_value;
+        int group = 0;
+
+        /* Determine which groups of bits to calculate.  */
+        switch (r_type)
+          {
+          case R_ARM_LDC_PC_G0:
+          case R_ARM_LDC_SB_G0:
+            group = 0;
+            break;
+
+          case R_ARM_LDC_PC_G1:
+          case R_ARM_LDC_SB_G1:
+            group = 1;
+            break;
+
+          case R_ARM_LDC_PC_G2:
+          case R_ARM_LDC_SB_G2:
+            group = 2;
+            break;
+
+          default:
+            abort ();
+          }
+
+        /* If REL, extract the addend from the insn.  If RELA, it will
+           have already been fetched for us.  */
+	if (globals->use_rel)
+          {
+            int negative = (insn & (1 << 23)) ? 1 : -1;
+            signed_addend = negative * ((insn & 0xff) << 2);
+          }
+
+	/* Compute the value (X) to go in the place.  */
+        if (r_type == R_ARM_LDC_PC_G0
+            || r_type == R_ARM_LDC_PC_G1
+            || r_type == R_ARM_LDC_PC_G2)
+          /* PC relative.  */
+          signed_value = value - pc + signed_addend;
+        else
+          /* Section base relative.  */
+          signed_value = value - sb + signed_addend;
+
+        /* Calculate the value of the relevant G_{n-1} to obtain
+           the residual at that stage.  */
+        calculate_group_reloc_mask (abs (signed_value), group - 1, &residual);
+
+        /* Check for overflow.  (The absolute value to go in the place must be
+           divisible by four and, after having been divided by four, must
+           fit in eight bits.)  */
+        if ((residual & 0x3) != 0 || residual >= 0x400)
+          {
+            (*_bfd_error_handler)
+              (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"),
+              input_bfd, input_section,
+              (long) rel->r_offset, abs (signed_value), howto->name);
+            return bfd_reloc_overflow;
+          }
+
+        /* Mask out the value and U bit.  */
+        insn &= 0xff7fff00;
+
+        /* Set the U bit if the value to go in the place is non-negative.  */
+        if (signed_value >= 0)
+          insn |= 1 << 23;
+
+        /* Encode the offset.  */
+        insn |= residual >> 2;
+
+	bfd_put_32 (input_bfd, insn, hit_data);
+      }
+      return bfd_reloc_ok;
+
+    default:
+      return bfd_reloc_notsupported;
+    }
+}
+
+/* Add INCREMENT to the reloc (of type HOWTO) at ADDRESS.  */
+static void
+arm_add_to_rel (bfd *              abfd,
+		bfd_byte *         address,
+		reloc_howto_type * howto,
+		bfd_signed_vma     increment)
+{
+  bfd_signed_vma addend;
+
+  if (howto->type == R_ARM_THM_CALL
+      || howto->type == R_ARM_THM_JUMP24)
+    {
+      int upper_insn, lower_insn;
+      int upper, lower;
+
+      upper_insn = bfd_get_16 (abfd, address);
+      lower_insn = bfd_get_16 (abfd, address + 2);
+      upper = upper_insn & 0x7ff;
+      lower = lower_insn & 0x7ff;
+
+      addend = (upper << 12) | (lower << 1);
+      addend += increment;
+      addend >>= 1;
+
+      upper_insn = (upper_insn & 0xf800) | ((addend >> 11) & 0x7ff);
+      lower_insn = (lower_insn & 0xf800) | (addend & 0x7ff);
+
+      bfd_put_16 (abfd, (bfd_vma) upper_insn, address);
+      bfd_put_16 (abfd, (bfd_vma) lower_insn, address + 2);
+    }
+  else
+    {
+      bfd_vma        contents;
+
+      contents = bfd_get_32 (abfd, address);
+
+      /* Get the (signed) value from the instruction.  */
+      addend = contents & howto->src_mask;
+      if (addend & ((howto->src_mask + 1) >> 1))
+	{
+	  bfd_signed_vma mask;
+
+	  mask = -1;
+	  mask &= ~ howto->src_mask;
+	  addend |= mask;
+	}
+
+      /* Add in the increment, (which is a byte value).  */
+      switch (howto->type)
+	{
+	default:
+	  addend += increment;
+	  break;
+
+	case R_ARM_PC24:
+	case R_ARM_PLT32:
+	case R_ARM_CALL:
+	case R_ARM_JUMP24:
+	  addend <<= howto->size;
+	  addend += increment;
+
+	  /* Should we check for overflow here ?  */
+
+	  /* Drop any undesired bits.  */
+	  addend >>= howto->rightshift;
+	  break;
+	}
+
+      contents = (contents & ~ howto->dst_mask) | (addend & howto->dst_mask);
+
+      bfd_put_32 (abfd, contents, address);
+    }
+}
+
+#define IS_ARM_TLS_RELOC(R_TYPE)	\
+  ((R_TYPE) == R_ARM_TLS_GD32		\
+   || (R_TYPE) == R_ARM_TLS_LDO32	\
+   || (R_TYPE) == R_ARM_TLS_LDM32	\
+   || (R_TYPE) == R_ARM_TLS_DTPOFF32	\
+   || (R_TYPE) == R_ARM_TLS_DTPMOD32	\
+   || (R_TYPE) == R_ARM_TLS_TPOFF32	\
+   || (R_TYPE) == R_ARM_TLS_LE32	\
+   || (R_TYPE) == R_ARM_TLS_IE32	\
+   || IS_ARM_TLS_GNU_RELOC (R_TYPE))
+
+/* Specific set of relocations for the gnu tls dialect.  */
+#define IS_ARM_TLS_GNU_RELOC(R_TYPE)	\
+  ((R_TYPE) == R_ARM_TLS_GOTDESC	\
+   || (R_TYPE) == R_ARM_TLS_CALL	\
+   || (R_TYPE) == R_ARM_THM_TLS_CALL	\
+   || (R_TYPE) == R_ARM_TLS_DESCSEQ	\
+   || (R_TYPE) == R_ARM_THM_TLS_DESCSEQ)
+
+/* Relocate an ARM ELF section.  */
+
+static bfd_boolean
+elf32_arm_relocate_section (bfd *                  output_bfd,
+			    struct bfd_link_info * info,
+			    bfd *                  input_bfd,
+			    asection *             input_section,
+			    bfd_byte *             contents,
+			    Elf_Internal_Rela *    relocs,
+			    Elf_Internal_Sym *     local_syms,
+			    asection **            local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  const char *name;
+  struct elf32_arm_link_hash_table * globals;
+
+  globals = elf32_arm_hash_table (info);
+  if (globals == NULL)
+    return FALSE;
+
+  symtab_hdr = & elf_symtab_hdr (input_bfd);
+  sym_hashes = elf_sym_hashes (input_bfd);
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      int                          r_type;
+      reloc_howto_type *           howto;
+      unsigned long                r_symndx;
+      Elf_Internal_Sym *           sym;
+      asection *                   sec;
+      struct elf_link_hash_entry * h;
+      bfd_vma                      relocation;
+      bfd_reloc_status_type        r;
+      arelent                      bfd_reloc;
+      char                         sym_type;
+      bfd_boolean                  unresolved_reloc = FALSE;
+      char *error_message = NULL;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type   = ELF32_R_TYPE (rel->r_info);
+      r_type   = arm_real_reloc_type (globals, r_type);
+
+      if (   r_type == R_ARM_GNU_VTENTRY
+          || r_type == R_ARM_GNU_VTINHERIT)
+        continue;
+
+      bfd_reloc.howto = elf32_arm_howto_from_type (r_type);
+      howto = bfd_reloc.howto;
+
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sym_type = ELF32_ST_TYPE (sym->st_info);
+	  sec = local_sections[r_symndx];
+
+	  /* An object file might have a reference to a local
+	     undefined symbol.  This is a daft object file, but we
+	     should at least do something about it.  V4BX & NONE
+	     relocations do not use the symbol and are explicitly
+	     allowed to use the undefined symbol, so allow those.
+	     Likewise for relocations against STN_UNDEF.  */
+	  if (r_type != R_ARM_V4BX
+	      && r_type != R_ARM_NONE
+	      && r_symndx != STN_UNDEF
+	      && bfd_is_und_section (sec)
+	      && ELF_ST_BIND (sym->st_info) != STB_WEAK)
+	    {
+	      if (!info->callbacks->undefined_symbol
+		  (info, bfd_elf_string_from_elf_section
+		   (input_bfd, symtab_hdr->sh_link, sym->st_name),
+		   input_bfd, input_section,
+		   rel->r_offset, TRUE))
+		return FALSE;
+	    }
+	  
+	  if (globals->use_rel)
+	    {
+	      relocation = (sec->output_section->vma
+			    + sec->output_offset
+			    + sym->st_value);
+	      if (!info->relocatable
+		  && (sec->flags & SEC_MERGE)
+		  && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+		{
+		  asection *msec;
+		  bfd_vma addend, value;
+
+		  switch (r_type)
+		    {
+		    case R_ARM_MOVW_ABS_NC:
+		    case R_ARM_MOVT_ABS:
+		      value = bfd_get_32 (input_bfd, contents + rel->r_offset);
+		      addend = ((value & 0xf0000) >> 4) | (value & 0xfff);
+		      addend = (addend ^ 0x8000) - 0x8000;
+		      break;
+
+		    case R_ARM_THM_MOVW_ABS_NC:
+		    case R_ARM_THM_MOVT_ABS:
+		      value = bfd_get_16 (input_bfd, contents + rel->r_offset)
+			      << 16;
+		      value |= bfd_get_16 (input_bfd,
+					   contents + rel->r_offset + 2);
+		      addend = ((value & 0xf7000) >> 4) | (value & 0xff)
+			       | ((value & 0x04000000) >> 15);
+		      addend = (addend ^ 0x8000) - 0x8000;
+		      break;
+
+		    default:
+		      if (howto->rightshift
+			  || (howto->src_mask & (howto->src_mask + 1)))
+			{
+			  (*_bfd_error_handler)
+			    (_("%B(%A+0x%lx): %s relocation against SEC_MERGE section"),
+			     input_bfd, input_section,
+			     (long) rel->r_offset, howto->name);
+			  return FALSE;
+			}
+
+		      value = bfd_get_32 (input_bfd, contents + rel->r_offset);
+
+		      /* Get the (signed) value from the instruction.  */
+		      addend = value & howto->src_mask;
+		      if (addend & ((howto->src_mask + 1) >> 1))
+			{
+			  bfd_signed_vma mask;
+
+			  mask = -1;
+			  mask &= ~ howto->src_mask;
+			  addend |= mask;
+			}
+		      break;
+		    }
+
+		  msec = sec;
+		  addend =
+		    _bfd_elf_rel_local_sym (output_bfd, sym, &msec, addend)
+		    - relocation;
+		  addend += msec->output_section->vma + msec->output_offset;
+
+		  /* Cases here must match those in the preceding
+		     switch statement.  */
+		  switch (r_type)
+		    {
+		    case R_ARM_MOVW_ABS_NC:
+		    case R_ARM_MOVT_ABS:
+		      value = (value & 0xfff0f000) | ((addend & 0xf000) << 4)
+			      | (addend & 0xfff);
+		      bfd_put_32 (input_bfd, value, contents + rel->r_offset);
+		      break;
+
+		    case R_ARM_THM_MOVW_ABS_NC:
+		    case R_ARM_THM_MOVT_ABS:
+		      value = (value & 0xfbf08f00) | ((addend & 0xf700) << 4)
+			      | (addend & 0xff) | ((addend & 0x0800) << 15);
+		      bfd_put_16 (input_bfd, value >> 16,
+				  contents + rel->r_offset);
+		      bfd_put_16 (input_bfd, value,
+				  contents + rel->r_offset + 2);
+		      break;
+
+		    default:
+		      value = (value & ~ howto->dst_mask)
+			      | (addend & howto->dst_mask);
+		      bfd_put_32 (input_bfd, value, contents + rel->r_offset);
+		      break;
+		    }
+		}
+	    }
+	  else
+	    relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+      else
+	{
+	  bfd_boolean warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+
+	  sym_type = h->type;
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	{
+	  /* This is a relocatable link.  We don't have to change
+	     anything, unless the reloc is against a section symbol,
+	     in which case we have to adjust according to where the
+	     section symbol winds up in the output section.  */
+	  if (sym != NULL && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+	    {
+	      if (globals->use_rel)
+		arm_add_to_rel (input_bfd, contents + rel->r_offset,
+				howto, (bfd_signed_vma) sec->output_offset);
+	      else
+		rel->r_addend += sec->output_offset;
+	    }
+	  continue;
+	}
+
+      if (h != NULL)
+	name = h->root.root.string;
+      else
+	{
+	  name = (bfd_elf_string_from_elf_section
+		  (input_bfd, symtab_hdr->sh_link, sym->st_name));
+	  if (name == NULL || *name == '\0')
+	    name = bfd_section_name (input_bfd, sec);
+	}
+
+      if (r_symndx != STN_UNDEF
+	  && r_type != R_ARM_NONE
+	  && (h == NULL
+	      || h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	  && IS_ARM_TLS_RELOC (r_type) != (sym_type == STT_TLS))
+	{
+	  (*_bfd_error_handler)
+	    ((sym_type == STT_TLS
+	      ? _("%B(%A+0x%lx): %s used with TLS symbol %s")
+	      : _("%B(%A+0x%lx): %s used with non-TLS symbol %s")),
+	     input_bfd,
+	     input_section,
+	     (long) rel->r_offset,
+	     howto->name,
+	     name);
+	}
+
+      /* We call elf32_arm_final_link_relocate unless we're completely
+         done, i.e., the relaxation produced the final output we want,
+         and we won't let anybody mess with it. Also, we have to do
+         addend adjustments in case of a R_ARM_TLS_GOTDESC relocation
+         both in relaxed and non-relaxed cases */
+     if ((elf32_arm_tls_transition (info, r_type, h) != (unsigned)r_type)
+	 || (IS_ARM_TLS_GNU_RELOC (r_type)
+	     && !((h ? elf32_arm_hash_entry (h)->tls_type : 
+		   elf32_arm_local_got_tls_type (input_bfd)[r_symndx])
+		  & GOT_TLS_GDESC)))
+       {
+	 r = elf32_arm_tls_relax (globals, input_bfd, input_section,
+				  contents, rel, h == NULL);
+	 /* This may have been marked unresolved because it came from
+	    a shared library.  But we've just dealt with that.  */
+	 unresolved_reloc = 0;
+       }
+     else
+       r = bfd_reloc_continue;
+     
+     if (r == bfd_reloc_continue)
+       r = elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
+					  input_section, contents, rel,
+					  relocation, info, sec, name, sym_type,
+					  (h ? h->target_internal
+					   : ARM_SYM_BRANCH_TYPE (sym)), h,
+					  &unresolved_reloc, &error_message);
+
+      /* Dynamic relocs are not propagated for SEC_DEBUGGING sections
+	 because such sections are not SEC_ALLOC and thus ld.so will
+	 not process them.  */
+      if (unresolved_reloc
+          && !((input_section->flags & SEC_DEBUGGING) != 0
+               && h->def_dynamic))
+	{
+	  (*_bfd_error_handler)
+	    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+	     input_bfd,
+	     input_section,
+	     (long) rel->r_offset,
+	     howto->name,
+	     h->root.root.string);
+	  return FALSE;
+	}
+
+      if (r != bfd_reloc_ok)
+	{
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      /* If the overflowing reloc was to an undefined symbol,
+		 we have already printed one error message and there
+		 is no point complaining again.  */
+	      if ((! h ||
+		   h->root.type != bfd_link_hash_undefined)
+		  && (!((*info->callbacks->reloc_overflow)
+			(info, (h ? &h->root : NULL), name, howto->name,
+			 (bfd_vma) 0, input_bfd, input_section,
+			 rel->r_offset))))
+		  return FALSE;
+	      break;
+
+	    case bfd_reloc_undefined:
+	      if (!((*info->callbacks->undefined_symbol)
+		    (info, name, input_bfd, input_section,
+		     rel->r_offset, TRUE)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      error_message = _("out of range");
+	      goto common_error;
+
+	    case bfd_reloc_notsupported:
+	      error_message = _("unsupported relocation");
+	      goto common_error;
+
+	    case bfd_reloc_dangerous:
+	      /* error_message should already be set.  */
+	      goto common_error;
+
+	    default:
+	      error_message = _("unknown error");
+	      /* Fall through.  */
+
+	    common_error:
+	      BFD_ASSERT (error_message != NULL);
+	      if (!((*info->callbacks->reloc_dangerous)
+		    (info, error_message, input_bfd, input_section,
+		     rel->r_offset)))
+		return FALSE;
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Add a new unwind edit to the list described by HEAD, TAIL.  If TINDEX is zero,
+   adds the edit to the start of the list.  (The list must be built in order of
+   ascending TINDEX: the function's callers are primarily responsible for
+   maintaining that condition).  */
+
+static void
+add_unwind_table_edit (arm_unwind_table_edit **head,
+		       arm_unwind_table_edit **tail,
+		       arm_unwind_edit_type type,
+		       asection *linked_section,
+		       unsigned int tindex)
+{
+  arm_unwind_table_edit *new_edit = (arm_unwind_table_edit *)
+      xmalloc (sizeof (arm_unwind_table_edit));
+  
+  new_edit->type = type;
+  new_edit->linked_section = linked_section;
+  new_edit->index = tindex;
+  
+  if (tindex > 0)
+    {
+      new_edit->next = NULL;
+
+      if (*tail)
+	(*tail)->next = new_edit;
+
+      (*tail) = new_edit;
+
+      if (!*head)
+	(*head) = new_edit;
+    }
+  else
+    {
+      new_edit->next = *head;
+
+      if (!*tail)
+	*tail = new_edit;
+
+      *head = new_edit;
+    }
+}
+
+static _arm_elf_section_data *get_arm_elf_section_data (asection *);
+
+/* Increase the size of EXIDX_SEC by ADJUST bytes.  ADJUST mau be negative.  */
+static void
+adjust_exidx_size(asection *exidx_sec, int adjust)
+{
+  asection *out_sec;
+
+  if (!exidx_sec->rawsize)
+    exidx_sec->rawsize = exidx_sec->size;
+
+  bfd_set_section_size (exidx_sec->owner, exidx_sec, exidx_sec->size + adjust);
+  out_sec = exidx_sec->output_section;
+  /* Adjust size of output section.  */
+  bfd_set_section_size (out_sec->owner, out_sec, out_sec->size +adjust);
+}
+
+/* Insert an EXIDX_CANTUNWIND marker at the end of a section.  */
+static void
+insert_cantunwind_after(asection *text_sec, asection *exidx_sec)
+{
+  struct _arm_elf_section_data *exidx_arm_data;
+
+  exidx_arm_data = get_arm_elf_section_data (exidx_sec);
+  add_unwind_table_edit (
+    &exidx_arm_data->u.exidx.unwind_edit_list,
+    &exidx_arm_data->u.exidx.unwind_edit_tail,
+    INSERT_EXIDX_CANTUNWIND_AT_END, text_sec, UINT_MAX);
+
+  adjust_exidx_size(exidx_sec, 8);
+}
+
+/* Scan .ARM.exidx tables, and create a list describing edits which should be
+   made to those tables, such that:
+   
+     1. Regions without unwind data are marked with EXIDX_CANTUNWIND entries.
+     2. Duplicate entries are merged together (EXIDX_CANTUNWIND, or unwind
+        codes which have been inlined into the index).
+
+   If MERGE_EXIDX_ENTRIES is false, duplicate entries are not merged.
+
+   The edits are applied when the tables are written
+   (in elf32_arm_write_section).
+*/
+
+bfd_boolean
+elf32_arm_fix_exidx_coverage (asection **text_section_order,
+			      unsigned int num_text_sections,
+			      struct bfd_link_info *info,
+			      bfd_boolean merge_exidx_entries)
+{
+  bfd *inp;
+  unsigned int last_second_word = 0, i;
+  asection *last_exidx_sec = NULL;
+  asection *last_text_sec = NULL;
+  int last_unwind_type = -1;
+
+  /* Walk over all EXIDX sections, and create backlinks from the corrsponding
+     text sections.  */
+  for (inp = info->input_bfds; inp != NULL; inp = inp->link_next)
+    {
+      asection *sec;
+      
+      for (sec = inp->sections; sec != NULL; sec = sec->next)
+        {
+	  struct bfd_elf_section_data *elf_sec = elf_section_data (sec);
+	  Elf_Internal_Shdr *hdr = &elf_sec->this_hdr;
+	  
+	  if (!hdr || hdr->sh_type != SHT_ARM_EXIDX)
+	    continue;
+	  
+	  if (elf_sec->linked_to)
+	    {
+	      Elf_Internal_Shdr *linked_hdr
+	        = &elf_section_data (elf_sec->linked_to)->this_hdr;
+	      struct _arm_elf_section_data *linked_sec_arm_data
+	        = get_arm_elf_section_data (linked_hdr->bfd_section);
+
+	      if (linked_sec_arm_data == NULL)
+	        continue;
+
+	      /* Link this .ARM.exidx section back from the text section it
+	         describes.  */
+	      linked_sec_arm_data->u.text.arm_exidx_sec = sec;
+	    }
+	}
+    }
+
+  /* Walk all text sections in order of increasing VMA.  Eilminate duplicate
+     index table entries (EXIDX_CANTUNWIND and inlined unwind opcodes),
+     and add EXIDX_CANTUNWIND entries for sections with no unwind table data.  */
+
+  for (i = 0; i < num_text_sections; i++)
+    {
+      asection *sec = text_section_order[i];
+      asection *exidx_sec;
+      struct _arm_elf_section_data *arm_data = get_arm_elf_section_data (sec);
+      struct _arm_elf_section_data *exidx_arm_data;
+      bfd_byte *contents = NULL;
+      int deleted_exidx_bytes = 0;
+      bfd_vma j;
+      arm_unwind_table_edit *unwind_edit_head = NULL;
+      arm_unwind_table_edit *unwind_edit_tail = NULL;
+      Elf_Internal_Shdr *hdr;
+      bfd *ibfd;
+
+      if (arm_data == NULL)
+        continue;
+
+      exidx_sec = arm_data->u.text.arm_exidx_sec;
+      if (exidx_sec == NULL)
+	{
+	  /* Section has no unwind data.  */
+	  if (last_unwind_type == 0 || !last_exidx_sec)
+	    continue;
+
+	  /* Ignore zero sized sections.  */
+	  if (sec->size == 0)
+	    continue;
+
+	  insert_cantunwind_after(last_text_sec, last_exidx_sec);
+	  last_unwind_type = 0;
+	  continue;
+	}
+
+      /* Skip /DISCARD/ sections.  */
+      if (bfd_is_abs_section (exidx_sec->output_section))
+	continue;
+
+      hdr = &elf_section_data (exidx_sec)->this_hdr;
+      if (hdr->sh_type != SHT_ARM_EXIDX)
+        continue;
+      
+      exidx_arm_data = get_arm_elf_section_data (exidx_sec);
+      if (exidx_arm_data == NULL)
+        continue;
+      
+      ibfd = exidx_sec->owner;
+	  
+      if (hdr->contents != NULL)
+	contents = hdr->contents;
+      else if (! bfd_malloc_and_get_section (ibfd, exidx_sec, &contents))
+	/* An error?  */
+	continue;
+
+      for (j = 0; j < hdr->sh_size; j += 8)
+	{
+	  unsigned int second_word = bfd_get_32 (ibfd, contents + j + 4);
+	  int unwind_type;
+	  int elide = 0;
+
+	  /* An EXIDX_CANTUNWIND entry.  */
+	  if (second_word == 1)
+	    {
+	      if (last_unwind_type == 0)
+		elide = 1;
+	      unwind_type = 0;
+	    }
+	  /* Inlined unwinding data.  Merge if equal to previous.  */
+	  else if ((second_word & 0x80000000) != 0)
+	    {
+	      if (merge_exidx_entries
+		   && last_second_word == second_word && last_unwind_type == 1)
+		elide = 1;
+	      unwind_type = 1;
+	      last_second_word = second_word;
+	    }
+	  /* Normal table entry.  In theory we could merge these too,
+	     but duplicate entries are likely to be much less common.  */
+	  else
+	    unwind_type = 2;
+
+	  if (elide)
+	    {
+	      add_unwind_table_edit (&unwind_edit_head, &unwind_edit_tail,
+				     DELETE_EXIDX_ENTRY, NULL, j / 8);
+
+	      deleted_exidx_bytes += 8;
+	    }
+
+	  last_unwind_type = unwind_type;
+	}
+
+      /* Free contents if we allocated it ourselves.  */
+      if (contents != hdr->contents)
+        free (contents);
+
+      /* Record edits to be applied later (in elf32_arm_write_section).  */
+      exidx_arm_data->u.exidx.unwind_edit_list = unwind_edit_head;
+      exidx_arm_data->u.exidx.unwind_edit_tail = unwind_edit_tail;
+	  
+      if (deleted_exidx_bytes > 0)
+	adjust_exidx_size(exidx_sec, -deleted_exidx_bytes);
+
+      last_exidx_sec = exidx_sec;
+      last_text_sec = sec;
+    }
+
+  /* Add terminating CANTUNWIND entry.  */
+  if (last_exidx_sec && last_unwind_type != 0)
+    insert_cantunwind_after(last_text_sec, last_exidx_sec);
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf32_arm_output_glue_section (struct bfd_link_info *info, bfd *obfd,
+			       bfd *ibfd, const char *name)
+{
+  asection *sec, *osec;
+
+  sec = bfd_get_section_by_name (ibfd, name);
+  if (sec == NULL || (sec->flags & SEC_EXCLUDE) != 0)
+    return TRUE;
+
+  osec = sec->output_section;
+  if (elf32_arm_write_section (obfd, info, sec, sec->contents))
+    return TRUE;
+
+  if (! bfd_set_section_contents (obfd, osec, sec->contents,
+				  sec->output_offset, sec->size))
+    return FALSE;
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf32_arm_final_link (bfd *abfd, struct bfd_link_info *info)
+{
+  struct elf32_arm_link_hash_table *globals = elf32_arm_hash_table (info);
+  asection *sec, *osec;
+
+  if (globals == NULL)
+    return FALSE;
+
+  /* Invoke the regular ELF backend linker to do all the work.  */
+  if (!bfd_elf_final_link (abfd, info))
+    return FALSE;
+
+  /* Process stub sections (eg BE8 encoding, ...).  */
+  struct elf32_arm_link_hash_table *htab = elf32_arm_hash_table (info);
+  int i;
+  for (i=0; i<htab->top_id; i++)
+    {
+      sec = htab->stub_group[i].stub_sec;
+      /* Only process it once, in its link_sec slot.  */
+      if (sec && i == htab->stub_group[i].link_sec->id)
+	{
+	  osec = sec->output_section;
+	  elf32_arm_write_section (abfd, info, sec, sec->contents);
+	  if (! bfd_set_section_contents (abfd, osec, sec->contents,
+					  sec->output_offset, sec->size))
+	    return FALSE;
+	}
+    }
+
+  /* Write out any glue sections now that we have created all the
+     stubs.  */
+  if (globals->bfd_of_glue_owner != NULL)
+    {
+      if (! elf32_arm_output_glue_section (info, abfd,
+					   globals->bfd_of_glue_owner,
+					   ARM2THUMB_GLUE_SECTION_NAME))
+	return FALSE;
+
+      if (! elf32_arm_output_glue_section (info, abfd,
+					   globals->bfd_of_glue_owner,
+					   THUMB2ARM_GLUE_SECTION_NAME))
+	return FALSE;
+
+      if (! elf32_arm_output_glue_section (info, abfd,
+					   globals->bfd_of_glue_owner,
+					   VFP11_ERRATUM_VENEER_SECTION_NAME))
+	return FALSE;
+
+      if (! elf32_arm_output_glue_section (info, abfd,
+					   globals->bfd_of_glue_owner,
+					   ARM_BX_GLUE_SECTION_NAME))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Set the right machine number.  */
+
+static bfd_boolean
+elf32_arm_object_p (bfd *abfd)
+{
+  unsigned int mach;
+
+  mach = bfd_arm_get_mach_from_notes (abfd, ARM_NOTE_SECTION);
+
+  if (mach != bfd_mach_arm_unknown)
+    bfd_default_set_arch_mach (abfd, bfd_arch_arm, mach);
+
+  else if (elf_elfheader (abfd)->e_flags & EF_ARM_MAVERICK_FLOAT)
+    bfd_default_set_arch_mach (abfd, bfd_arch_arm, bfd_mach_arm_ep9312);
+
+  else
+    bfd_default_set_arch_mach (abfd, bfd_arch_arm, mach);
+
+  return TRUE;
+}
+
+/* Function to keep ARM specific flags in the ELF header.  */
+
+static bfd_boolean
+elf32_arm_set_private_flags (bfd *abfd, flagword flags)
+{
+  if (elf_flags_init (abfd)
+      && elf_elfheader (abfd)->e_flags != flags)
+    {
+      if (EF_ARM_EABI_VERSION (flags) == EF_ARM_EABI_UNKNOWN)
+	{
+	  if (flags & EF_ARM_INTERWORK)
+	    (*_bfd_error_handler)
+	      (_("Warning: Not setting interworking flag of %B since it has already been specified as non-interworking"),
+	       abfd);
+	  else
+	    _bfd_error_handler
+	      (_("Warning: Clearing the interworking flag of %B due to outside request"),
+	       abfd);
+	}
+    }
+  else
+    {
+      elf_elfheader (abfd)->e_flags = flags;
+      elf_flags_init (abfd) = TRUE;
+    }
+
+  return TRUE;
+}
+
+/* Copy backend specific data from one object module to another.  */
+
+static bfd_boolean
+elf32_arm_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  flagword in_flags;
+  flagword out_flags;
+
+  if (! is_arm_elf (ibfd) || ! is_arm_elf (obfd))
+    return TRUE;
+
+  in_flags  = elf_elfheader (ibfd)->e_flags;
+  out_flags = elf_elfheader (obfd)->e_flags;
+
+  if (elf_flags_init (obfd)
+      && EF_ARM_EABI_VERSION (out_flags) == EF_ARM_EABI_UNKNOWN
+      && in_flags != out_flags)
+    {
+      /* Cannot mix APCS26 and APCS32 code.  */
+      if ((in_flags & EF_ARM_APCS_26) != (out_flags & EF_ARM_APCS_26))
+	return FALSE;
+
+      /* Cannot mix float APCS and non-float APCS code.  */
+      if ((in_flags & EF_ARM_APCS_FLOAT) != (out_flags & EF_ARM_APCS_FLOAT))
+	return FALSE;
+
+      /* If the src and dest have different interworking flags
+         then turn off the interworking bit.  */
+      if ((in_flags & EF_ARM_INTERWORK) != (out_flags & EF_ARM_INTERWORK))
+	{
+	  if (out_flags & EF_ARM_INTERWORK)
+	    _bfd_error_handler
+	      (_("Warning: Clearing the interworking flag of %B because non-interworking code in %B has been linked with it"),
+	       obfd, ibfd);
+
+	  in_flags &= ~EF_ARM_INTERWORK;
+	}
+
+      /* Likewise for PIC, though don't warn for this case.  */
+      if ((in_flags & EF_ARM_PIC) != (out_flags & EF_ARM_PIC))
+	in_flags &= ~EF_ARM_PIC;
+    }
+
+  elf_elfheader (obfd)->e_flags = in_flags;
+  elf_flags_init (obfd) = TRUE;
+
+  /* Also copy the EI_OSABI field.  */
+  elf_elfheader (obfd)->e_ident[EI_OSABI] =
+    elf_elfheader (ibfd)->e_ident[EI_OSABI];
+
+  /* Copy object attributes.  */
+  _bfd_elf_copy_obj_attributes (ibfd, obfd);
+
+  return TRUE;
+}
+
+/* Values for Tag_ABI_PCS_R9_use.  */
+enum
+{
+  AEABI_R9_V6,
+  AEABI_R9_SB,
+  AEABI_R9_TLS,
+  AEABI_R9_unused
+};
+
+/* Values for Tag_ABI_PCS_RW_data.  */
+enum
+{
+  AEABI_PCS_RW_data_absolute,
+  AEABI_PCS_RW_data_PCrel,
+  AEABI_PCS_RW_data_SBrel,
+  AEABI_PCS_RW_data_unused
+};
+
+/* Values for Tag_ABI_enum_size.  */
+enum
+{
+  AEABI_enum_unused,
+  AEABI_enum_short,
+  AEABI_enum_wide,
+  AEABI_enum_forced_wide
+};
+
+/* Determine whether an object attribute tag takes an integer, a
+   string or both.  */
+
+static int
+elf32_arm_obj_attrs_arg_type (int tag)
+{
+  if (tag == Tag_compatibility)
+    return ATTR_TYPE_FLAG_INT_VAL | ATTR_TYPE_FLAG_STR_VAL;
+  else if (tag == Tag_nodefaults)
+    return ATTR_TYPE_FLAG_INT_VAL | ATTR_TYPE_FLAG_NO_DEFAULT;
+  else if (tag == Tag_CPU_raw_name || tag == Tag_CPU_name)
+    return ATTR_TYPE_FLAG_STR_VAL;
+  else if (tag < 32)
+    return ATTR_TYPE_FLAG_INT_VAL;
+  else
+    return (tag & 1) != 0 ? ATTR_TYPE_FLAG_STR_VAL : ATTR_TYPE_FLAG_INT_VAL;
+}
+
+/* The ABI defines that Tag_conformance should be emitted first, and that
+   Tag_nodefaults should be second (if either is defined).  This sets those
+   two positions, and bumps up the position of all the remaining tags to
+   compensate.  */
+static int
+elf32_arm_obj_attrs_order (int num)
+{
+  if (num == LEAST_KNOWN_OBJ_ATTRIBUTE)
+    return Tag_conformance;
+  if (num == LEAST_KNOWN_OBJ_ATTRIBUTE + 1)
+    return Tag_nodefaults;
+  if ((num - 2) < Tag_nodefaults)
+    return num - 2;
+  if ((num - 1) < Tag_conformance)
+    return num - 1;
+  return num;
+}
+
+/* Attribute numbers >=64 (mod 128) can be safely ignored.  */
+static bfd_boolean
+elf32_arm_obj_attrs_handle_unknown (bfd *abfd, int tag)
+{
+  if ((tag & 127) < 64)
+    {
+      _bfd_error_handler
+	(_("%B: Unknown mandatory EABI object attribute %d"),
+	 abfd, tag);
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+  else
+    {
+      _bfd_error_handler
+	(_("Warning: %B: Unknown EABI object attribute %d"),
+	 abfd, tag);
+      return TRUE;
+    }
+}
+
+/* Read the architecture from the Tag_also_compatible_with attribute, if any.
+   Returns -1 if no architecture could be read.  */
+
+static int
+get_secondary_compatible_arch (bfd *abfd)
+{
+  obj_attribute *attr =
+    &elf_known_obj_attributes_proc (abfd)[Tag_also_compatible_with];
+
+  /* Note: the tag and its argument below are uleb128 values, though
+     currently-defined values fit in one byte for each.  */
+  if (attr->s
+      && attr->s[0] == Tag_CPU_arch
+      && (attr->s[1] & 128) != 128
+      && attr->s[2] == 0)
+   return attr->s[1];
+
+  /* This tag is "safely ignorable", so don't complain if it looks funny.  */
+  return -1;
+}
+
+/* Set, or unset, the architecture of the Tag_also_compatible_with attribute.
+   The tag is removed if ARCH is -1.  */
+
+static void
+set_secondary_compatible_arch (bfd *abfd, int arch)
+{
+  obj_attribute *attr =
+    &elf_known_obj_attributes_proc (abfd)[Tag_also_compatible_with];
+
+  if (arch == -1)
+    {
+      attr->s = NULL;
+      return;
+    }
+
+  /* Note: the tag and its argument below are uleb128 values, though
+     currently-defined values fit in one byte for each.  */
+  if (!attr->s)
+    attr->s = (char *) bfd_alloc (abfd, 3);
+  attr->s[0] = Tag_CPU_arch;
+  attr->s[1] = arch;
+  attr->s[2] = '\0';
+}
+
+/* Combine two values for Tag_CPU_arch, taking secondary compatibility tags
+   into account.  */
+
+static int
+tag_cpu_arch_combine (bfd *ibfd, int oldtag, int *secondary_compat_out,
+		      int newtag, int secondary_compat)
+{
+#define T(X) TAG_CPU_ARCH_##X
+  int tagl, tagh, result;
+  const int v6t2[] =
+    {
+      T(V6T2),   /* PRE_V4.  */
+      T(V6T2),   /* V4.  */
+      T(V6T2),   /* V4T.  */
+      T(V6T2),   /* V5T.  */
+      T(V6T2),   /* V5TE.  */
+      T(V6T2),   /* V5TEJ.  */
+      T(V6T2),   /* V6.  */
+      T(V7),     /* V6KZ.  */
+      T(V6T2)    /* V6T2.  */
+    };
+  const int v6k[] =
+    {
+      T(V6K),    /* PRE_V4.  */
+      T(V6K),    /* V4.  */
+      T(V6K),    /* V4T.  */
+      T(V6K),    /* V5T.  */
+      T(V6K),    /* V5TE.  */
+      T(V6K),    /* V5TEJ.  */
+      T(V6K),    /* V6.  */
+      T(V6KZ),   /* V6KZ.  */
+      T(V7),     /* V6T2.  */
+      T(V6K)     /* V6K.  */
+    };
+  const int v7[] =
+    {
+      T(V7),     /* PRE_V4.  */
+      T(V7),     /* V4.  */
+      T(V7),     /* V4T.  */
+      T(V7),     /* V5T.  */
+      T(V7),     /* V5TE.  */
+      T(V7),     /* V5TEJ.  */
+      T(V7),     /* V6.  */
+      T(V7),     /* V6KZ.  */
+      T(V7),     /* V6T2.  */
+      T(V7),     /* V6K.  */
+      T(V7)      /* V7.  */
+    };
+  const int v6_m[] =
+    {
+      -1,        /* PRE_V4.  */
+      -1,        /* V4.  */
+      T(V6K),    /* V4T.  */
+      T(V6K),    /* V5T.  */
+      T(V6K),    /* V5TE.  */
+      T(V6K),    /* V5TEJ.  */
+      T(V6K),    /* V6.  */
+      T(V6KZ),   /* V6KZ.  */
+      T(V7),     /* V6T2.  */
+      T(V6K),    /* V6K.  */
+      T(V7),     /* V7.  */
+      T(V6_M)    /* V6_M.  */
+    };
+  const int v6s_m[] =
+    {
+      -1,        /* PRE_V4.  */
+      -1,        /* V4.  */
+      T(V6K),    /* V4T.  */
+      T(V6K),    /* V5T.  */
+      T(V6K),    /* V5TE.  */
+      T(V6K),    /* V5TEJ.  */
+      T(V6K),    /* V6.  */
+      T(V6KZ),   /* V6KZ.  */
+      T(V7),     /* V6T2.  */
+      T(V6K),    /* V6K.  */
+      T(V7),     /* V7.  */
+      T(V6S_M),  /* V6_M.  */
+      T(V6S_M)   /* V6S_M.  */
+    };
+  const int v7e_m[] =
+    {
+      -1,        /* PRE_V4.  */
+      -1,        /* V4.  */
+      T(V7E_M),  /* V4T.  */
+      T(V7E_M),  /* V5T.  */
+      T(V7E_M),  /* V5TE.  */
+      T(V7E_M),  /* V5TEJ.  */
+      T(V7E_M),  /* V6.  */
+      T(V7E_M),  /* V6KZ.  */
+      T(V7E_M),  /* V6T2.  */
+      T(V7E_M),  /* V6K.  */
+      T(V7E_M),  /* V7.  */
+      T(V7E_M),  /* V6_M.  */
+      T(V7E_M),  /* V6S_M.  */
+      T(V7E_M)   /* V7E_M.  */
+    };
+  const int v4t_plus_v6_m[] =
+    {
+      -1,		/* PRE_V4.  */
+      -1,		/* V4.  */
+      T(V4T),		/* V4T.  */
+      T(V5T),		/* V5T.  */
+      T(V5TE),		/* V5TE.  */
+      T(V5TEJ),		/* V5TEJ.  */
+      T(V6),		/* V6.  */
+      T(V6KZ),		/* V6KZ.  */
+      T(V6T2),		/* V6T2.  */
+      T(V6K),		/* V6K.  */
+      T(V7),		/* V7.  */
+      T(V6_M),		/* V6_M.  */
+      T(V6S_M),		/* V6S_M.  */
+      T(V7E_M),		/* V7E_M.  */
+      T(V4T_PLUS_V6_M)	/* V4T plus V6_M.  */
+    };
+  const int *comb[] =
+    {
+      v6t2,
+      v6k,
+      v7,
+      v6_m,
+      v6s_m,
+      v7e_m,
+      /* Pseudo-architecture.  */
+      v4t_plus_v6_m
+    };
+
+  /* Check we've not got a higher architecture than we know about.  */
+
+  if (oldtag > MAX_TAG_CPU_ARCH || newtag > MAX_TAG_CPU_ARCH)
+    {
+      _bfd_error_handler (_("error: %B: Unknown CPU architecture"), ibfd);
+      return -1;
+    }
+
+  /* Override old tag if we have a Tag_also_compatible_with on the output.  */
+
+  if ((oldtag == T(V6_M) && *secondary_compat_out == T(V4T))
+      || (oldtag == T(V4T) && *secondary_compat_out == T(V6_M)))
+    oldtag = T(V4T_PLUS_V6_M);
+
+  /* And override the new tag if we have a Tag_also_compatible_with on the
+     input.  */
+
+  if ((newtag == T(V6_M) && secondary_compat == T(V4T))
+      || (newtag == T(V4T) && secondary_compat == T(V6_M)))
+    newtag = T(V4T_PLUS_V6_M);
+
+  tagl = (oldtag < newtag) ? oldtag : newtag;
+  result = tagh = (oldtag > newtag) ? oldtag : newtag;
+
+  /* Architectures before V6KZ add features monotonically.  */
+  if (tagh <= TAG_CPU_ARCH_V6KZ)
+    return result;
+
+  result = comb[tagh - T(V6T2)][tagl];
+
+  /* Use Tag_CPU_arch == V4T and Tag_also_compatible_with (Tag_CPU_arch V6_M)
+     as the canonical version.  */
+  if (result == T(V4T_PLUS_V6_M))
+    {
+      result = T(V4T);
+      *secondary_compat_out = T(V6_M);
+    }
+  else
+    *secondary_compat_out = -1;
+
+  if (result == -1)
+    {
+      _bfd_error_handler (_("error: %B: Conflicting CPU architectures %d/%d"),
+			  ibfd, oldtag, newtag);
+      return -1;
+    }
+
+  return result;
+#undef T
+}
+
+/* Merge EABI object attributes from IBFD into OBFD.  Raise an error if there
+   are conflicting attributes.  */
+
+static bfd_boolean
+elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd)
+{
+  obj_attribute *in_attr;
+  obj_attribute *out_attr;
+  /* Some tags have 0 = don't care, 1 = strong requirement,
+     2 = weak requirement.  */
+  static const int order_021[3] = {0, 2, 1};
+  int i;
+  bfd_boolean result = TRUE;
+
+  /* Skip the linker stubs file.  This preserves previous behavior
+     of accepting unknown attributes in the first input file - but
+     is that a bug?  */
+  if (ibfd->flags & BFD_LINKER_CREATED)
+    return TRUE;
+
+  if (!elf_known_obj_attributes_proc (obfd)[0].i)
+    {
+      /* This is the first object.  Copy the attributes.  */
+      _bfd_elf_copy_obj_attributes (ibfd, obfd);
+
+      out_attr = elf_known_obj_attributes_proc (obfd);
+
+      /* Use the Tag_null value to indicate the attributes have been
+	 initialized.  */
+      out_attr[0].i = 1;
+
+      /* We do not output objects with Tag_MPextension_use_legacy - we move
+	 the attribute's value to Tag_MPextension_use.  */
+      if (out_attr[Tag_MPextension_use_legacy].i != 0)
+	{
+	  if (out_attr[Tag_MPextension_use].i != 0
+	      && out_attr[Tag_MPextension_use_legacy].i
+	        != out_attr[Tag_MPextension_use].i)
+	    {
+	      _bfd_error_handler
+		(_("Error: %B has both the current and legacy "
+		   "Tag_MPextension_use attributes"), ibfd);
+	      result = FALSE;
+	    }
+
+	  out_attr[Tag_MPextension_use] =
+	    out_attr[Tag_MPextension_use_legacy];
+	  out_attr[Tag_MPextension_use_legacy].type = 0;
+	  out_attr[Tag_MPextension_use_legacy].i = 0;
+	}
+
+      return result;
+    }
+
+  in_attr = elf_known_obj_attributes_proc (ibfd);
+  out_attr = elf_known_obj_attributes_proc (obfd);
+  /* This needs to happen before Tag_ABI_FP_number_model is merged.  */
+  if (in_attr[Tag_ABI_VFP_args].i != out_attr[Tag_ABI_VFP_args].i)
+    {
+      /* Ignore mismatches if the object doesn't use floating point.  */
+      if (out_attr[Tag_ABI_FP_number_model].i == 0)
+	out_attr[Tag_ABI_VFP_args].i = in_attr[Tag_ABI_VFP_args].i;
+      else if (in_attr[Tag_ABI_FP_number_model].i != 0)
+	{
+	  _bfd_error_handler
+	    (_("error: %B uses VFP register arguments, %B does not"),
+	     in_attr[Tag_ABI_VFP_args].i ? ibfd : obfd,
+	     in_attr[Tag_ABI_VFP_args].i ? obfd : ibfd);
+	  result = FALSE;
+	}
+    }
+
+  for (i = LEAST_KNOWN_OBJ_ATTRIBUTE; i < NUM_KNOWN_OBJ_ATTRIBUTES; i++)
+    {
+      /* Merge this attribute with existing attributes.  */
+      switch (i)
+	{
+	case Tag_CPU_raw_name:
+	case Tag_CPU_name:
+	  /* These are merged after Tag_CPU_arch. */
+	  break;
+
+	case Tag_ABI_optimization_goals:
+	case Tag_ABI_FP_optimization_goals:
+	  /* Use the first value seen.  */
+	  break;
+
+	case Tag_CPU_arch:
+	  {
+	    int secondary_compat = -1, secondary_compat_out = -1;
+	    unsigned int saved_out_attr = out_attr[i].i;
+	    static const char *name_table[] = {
+		/* These aren't real CPU names, but we can't guess
+		   that from the architecture version alone.  */
+		"Pre v4",
+		"ARM v4",
+		"ARM v4T",
+		"ARM v5T",
+		"ARM v5TE",
+		"ARM v5TEJ",
+		"ARM v6",
+		"ARM v6KZ",
+		"ARM v6T2",
+		"ARM v6K",
+		"ARM v7",
+		"ARM v6-M",
+		"ARM v6S-M"
+	    };
+
+	    /* Merge Tag_CPU_arch and Tag_also_compatible_with.  */
+	    secondary_compat = get_secondary_compatible_arch (ibfd);
+	    secondary_compat_out = get_secondary_compatible_arch (obfd);
+	    out_attr[i].i = tag_cpu_arch_combine (ibfd, out_attr[i].i,
+						  &secondary_compat_out,
+						  in_attr[i].i,
+						  secondary_compat);
+	    set_secondary_compatible_arch (obfd, secondary_compat_out);
+
+	    /* Merge Tag_CPU_name and Tag_CPU_raw_name.  */
+	    if (out_attr[i].i == saved_out_attr)
+	      ; /* Leave the names alone.  */
+	    else if (out_attr[i].i == in_attr[i].i)
+	      {
+		/* The output architecture has been changed to match the
+		   input architecture.  Use the input names.  */
+		out_attr[Tag_CPU_name].s = in_attr[Tag_CPU_name].s
+		  ? _bfd_elf_attr_strdup (obfd, in_attr[Tag_CPU_name].s)
+		  : NULL;
+		out_attr[Tag_CPU_raw_name].s = in_attr[Tag_CPU_raw_name].s
+		  ? _bfd_elf_attr_strdup (obfd, in_attr[Tag_CPU_raw_name].s)
+		  : NULL;
+	      }
+	    else
+	      {
+		out_attr[Tag_CPU_name].s = NULL;
+		out_attr[Tag_CPU_raw_name].s = NULL;
+	      }
+
+	    /* If we still don't have a value for Tag_CPU_name,
+	       make one up now.  Tag_CPU_raw_name remains blank.  */
+	    if (out_attr[Tag_CPU_name].s == NULL
+		&& out_attr[i].i < ARRAY_SIZE (name_table))
+	      out_attr[Tag_CPU_name].s =
+		_bfd_elf_attr_strdup (obfd, name_table[out_attr[i].i]);
+	  }
+	  break;
+
+	case Tag_ARM_ISA_use:
+	case Tag_THUMB_ISA_use:
+	case Tag_WMMX_arch:
+	case Tag_Advanced_SIMD_arch:
+	  /* ??? Do Advanced_SIMD (NEON) and WMMX conflict?  */
+	case Tag_ABI_FP_rounding:
+	case Tag_ABI_FP_exceptions:
+	case Tag_ABI_FP_user_exceptions:
+	case Tag_ABI_FP_number_model:
+	case Tag_FP_HP_extension:
+	case Tag_CPU_unaligned_access:
+	case Tag_T2EE_use:
+	case Tag_MPextension_use:
+	  /* Use the largest value specified.  */
+	  if (in_attr[i].i > out_attr[i].i)
+	    out_attr[i].i = in_attr[i].i;
+	  break;
+
+	case Tag_ABI_align_preserved:
+	case Tag_ABI_PCS_RO_data:
+	  /* Use the smallest value specified.  */
+	  if (in_attr[i].i < out_attr[i].i)
+	    out_attr[i].i = in_attr[i].i;
+	  break;
+
+	case Tag_ABI_align_needed:
+	  if ((in_attr[i].i > 0 || out_attr[i].i > 0)
+	      && (in_attr[Tag_ABI_align_preserved].i == 0
+		  || out_attr[Tag_ABI_align_preserved].i == 0))
+	    {
+	      /* This error message should be enabled once all non-conformant
+		 binaries in the toolchain have had the attributes set
+		 properly.
+	      _bfd_error_handler
+		(_("error: %B: 8-byte data alignment conflicts with %B"),
+		 obfd, ibfd);
+	      result = FALSE; */
+	    }
+	  /* Fall through.  */
+	case Tag_ABI_FP_denormal:
+	case Tag_ABI_PCS_GOT_use:
+	  /* Use the "greatest" from the sequence 0, 2, 1, or the largest
+	     value if greater than 2 (for future-proofing).  */
+	  if ((in_attr[i].i > 2 && in_attr[i].i > out_attr[i].i)
+	      || (in_attr[i].i <= 2 && out_attr[i].i <= 2
+		  && order_021[in_attr[i].i] > order_021[out_attr[i].i]))
+	    out_attr[i].i = in_attr[i].i;
+	  break;
+
+	case Tag_Virtualization_use:
+	  /* The virtualization tag effectively stores two bits of
+	     information: the intended use of TrustZone (in bit 0), and the
+	     intended use of Virtualization (in bit 1).  */
+	  if (out_attr[i].i == 0)
+	    out_attr[i].i = in_attr[i].i;
+	  else if (in_attr[i].i != 0
+		   && in_attr[i].i != out_attr[i].i)
+	    {
+	      if (in_attr[i].i <= 3 && out_attr[i].i <= 3)
+		out_attr[i].i = 3;
+	      else
+		{
+		  _bfd_error_handler
+		    (_("error: %B: unable to merge virtualization attributes "
+		       "with %B"),
+		     obfd, ibfd);
+		  result = FALSE;
+		}
+	    }
+	  break;
+
+	case Tag_CPU_arch_profile:
+	  if (out_attr[i].i != in_attr[i].i)
+	    {
+	      /* 0 will merge with anything.
+		 'A' and 'S' merge to 'A'.
+		 'R' and 'S' merge to 'R'.
+	         'M' and 'A|R|S' is an error.  */
+	      if (out_attr[i].i == 0
+		  || (out_attr[i].i == 'S'
+		      && (in_attr[i].i == 'A' || in_attr[i].i == 'R')))
+		out_attr[i].i = in_attr[i].i;
+	      else if (in_attr[i].i == 0
+		       || (in_attr[i].i == 'S'
+			   && (out_attr[i].i == 'A' || out_attr[i].i == 'R')))
+		; /* Do nothing. */
+	      else
+		{
+		  _bfd_error_handler
+		    (_("error: %B: Conflicting architecture profiles %c/%c"),
+		     ibfd,
+		     in_attr[i].i ? in_attr[i].i : '0',
+		     out_attr[i].i ? out_attr[i].i : '0');
+		  result = FALSE;
+		}
+	    }
+	  break;
+	case Tag_FP_arch:
+	    {
+	      /* Tag_ABI_HardFP_use is handled along with Tag_FP_arch since
+		 the meaning of Tag_ABI_HardFP_use depends on Tag_FP_arch
+		 when it's 0.  It might mean absence of FP hardware if
+		 Tag_FP_arch is zero, otherwise it is effectively SP + DP.  */
+
+	      static const struct
+	      {
+		  int ver;
+		  int regs;
+	      } vfp_versions[7] =
+		{
+		  {0, 0},
+		  {1, 16},
+		  {2, 16},
+		  {3, 32},
+		  {3, 16},
+		  {4, 32},
+		  {4, 16}
+		};
+	      int ver;
+	      int regs;
+	      int newval;
+
+	      /* If the output has no requirement about FP hardware,
+		 follow the requirement of the input.  */
+	      if (out_attr[i].i == 0)
+		{
+		  BFD_ASSERT (out_attr[Tag_ABI_HardFP_use].i == 0);
+		  out_attr[i].i = in_attr[i].i;
+		  out_attr[Tag_ABI_HardFP_use].i
+		    = in_attr[Tag_ABI_HardFP_use].i;
+		  break;
+		}
+	      /* If the input has no requirement about FP hardware, do
+		 nothing.  */
+	      else if (in_attr[i].i == 0)
+		{
+		  BFD_ASSERT (in_attr[Tag_ABI_HardFP_use].i == 0);
+		  break;
+		}
+
+	      /* Both the input and the output have nonzero Tag_FP_arch.
+		 So Tag_ABI_HardFP_use is (SP & DP) when it's zero.  */
+
+	      /* If both the input and the output have zero Tag_ABI_HardFP_use,
+		 do nothing.  */
+	      if (in_attr[Tag_ABI_HardFP_use].i == 0
+		  && out_attr[Tag_ABI_HardFP_use].i == 0)
+		;
+	      /* If the input and the output have different Tag_ABI_HardFP_use,
+		 the combination of them is 3 (SP & DP).  */
+	      else if (in_attr[Tag_ABI_HardFP_use].i
+		       != out_attr[Tag_ABI_HardFP_use].i)
+		out_attr[Tag_ABI_HardFP_use].i = 3;
+
+	      /* Now we can handle Tag_FP_arch.  */
+
+	      /* Values greater than 6 aren't defined, so just pick the
+	         biggest */
+	      if (in_attr[i].i > 6 && in_attr[i].i > out_attr[i].i)
+		{
+		  out_attr[i] = in_attr[i];
+		  break;
+		}
+	      /* The output uses the superset of input features
+		 (ISA version) and registers.  */
+	      ver = vfp_versions[in_attr[i].i].ver;
+	      if (ver < vfp_versions[out_attr[i].i].ver)
+		ver = vfp_versions[out_attr[i].i].ver;
+	      regs = vfp_versions[in_attr[i].i].regs;
+	      if (regs < vfp_versions[out_attr[i].i].regs)
+		regs = vfp_versions[out_attr[i].i].regs;
+	      /* This assumes all possible supersets are also a valid
+	         options.  */
+	      for (newval = 6; newval > 0; newval--)
+		{
+		  if (regs == vfp_versions[newval].regs
+		      && ver == vfp_versions[newval].ver)
+		    break;
+		}
+	      out_attr[i].i = newval;
+	    }
+	  break;
+	case Tag_PCS_config:
+	  if (out_attr[i].i == 0)
+	    out_attr[i].i = in_attr[i].i;
+	  else if (in_attr[i].i != 0 && out_attr[i].i != 0)
+	    {
+	      /* It's sometimes ok to mix different configs, so this is only
+	         a warning.  */
+	      _bfd_error_handler
+		(_("Warning: %B: Conflicting platform configuration"), ibfd);
+	    }
+	  break;
+	case Tag_ABI_PCS_R9_use:
+	  if (in_attr[i].i != out_attr[i].i
+	      && out_attr[i].i != AEABI_R9_unused
+	      && in_attr[i].i != AEABI_R9_unused)
+	    {
+	      _bfd_error_handler
+		(_("error: %B: Conflicting use of R9"), ibfd);
+	      result = FALSE;
+	    }
+	  if (out_attr[i].i == AEABI_R9_unused)
+	    out_attr[i].i = in_attr[i].i;
+	  break;
+	case Tag_ABI_PCS_RW_data:
+	  if (in_attr[i].i == AEABI_PCS_RW_data_SBrel
+	      && out_attr[Tag_ABI_PCS_R9_use].i != AEABI_R9_SB
+	      && out_attr[Tag_ABI_PCS_R9_use].i != AEABI_R9_unused)
+	    {
+	      _bfd_error_handler
+		(_("error: %B: SB relative addressing conflicts with use of R9"),
+		 ibfd);
+	      result = FALSE;
+	    }
+	  /* Use the smallest value specified.  */
+	  if (in_attr[i].i < out_attr[i].i)
+	    out_attr[i].i = in_attr[i].i;
+	  break;
+	case Tag_ABI_PCS_wchar_t:
+	  if (out_attr[i].i && in_attr[i].i && out_attr[i].i != in_attr[i].i
+	      && !elf_arm_tdata (obfd)->no_wchar_size_warning)
+	    {
+	      _bfd_error_handler
+		(_("warning: %B uses %u-byte wchar_t yet the output is to use %u-byte wchar_t; use of wchar_t values across objects may fail"),
+		 ibfd, in_attr[i].i, out_attr[i].i);
+	    }
+	  else if (in_attr[i].i && !out_attr[i].i)
+	    out_attr[i].i = in_attr[i].i;
+	  break;
+	case Tag_ABI_enum_size:
+	  if (in_attr[i].i != AEABI_enum_unused)
+	    {
+	      if (out_attr[i].i == AEABI_enum_unused
+		  || out_attr[i].i == AEABI_enum_forced_wide)
+		{
+		  /* The existing object is compatible with anything.
+		     Use whatever requirements the new object has.  */
+		  out_attr[i].i = in_attr[i].i;
+		}
+	      else if (in_attr[i].i != AEABI_enum_forced_wide
+		       && out_attr[i].i != in_attr[i].i
+		       && !elf_arm_tdata (obfd)->no_enum_size_warning)
+		{
+		  static const char *aeabi_enum_names[] =
+		    { "", "variable-size", "32-bit", "" };
+		  const char *in_name =
+		    in_attr[i].i < ARRAY_SIZE(aeabi_enum_names)
+		    ? aeabi_enum_names[in_attr[i].i]
+		    : "<unknown>";
+		  const char *out_name =
+		    out_attr[i].i < ARRAY_SIZE(aeabi_enum_names)
+		    ? aeabi_enum_names[out_attr[i].i]
+		    : "<unknown>";
+		  _bfd_error_handler
+		    (_("warning: %B uses %s enums yet the output is to use %s enums; use of enum values across objects may fail"),
+		     ibfd, in_name, out_name);
+		}
+	    }
+	  break;
+	case Tag_ABI_VFP_args:
+	  /* Aready done.  */
+	  break;
+	case Tag_ABI_WMMX_args:
+	  if (in_attr[i].i != out_attr[i].i)
+	    {
+	      _bfd_error_handler
+		(_("error: %B uses iWMMXt register arguments, %B does not"),
+		 ibfd, obfd);
+	      result = FALSE;
+	    }
+	  break;
+	case Tag_compatibility:
+	  /* Merged in target-independent code.  */
+	  break;
+	case Tag_ABI_HardFP_use:
+	  /* This is handled along with Tag_FP_arch.  */
+	  break;
+	case Tag_ABI_FP_16bit_format:
+	  if (in_attr[i].i != 0 && out_attr[i].i != 0)
+	    {
+	      if (in_attr[i].i != out_attr[i].i)
+		{
+		  _bfd_error_handler
+		    (_("error: fp16 format mismatch between %B and %B"),
+		     ibfd, obfd);
+		  result = FALSE;
+		}
+	    }
+	  if (in_attr[i].i != 0)
+	    out_attr[i].i = in_attr[i].i;
+	  break;
+
+	case Tag_DIV_use:
+	  /* This tag is set to zero if we can use UDIV and SDIV in Thumb
+	     mode on a v7-M or v7-R CPU; to one if we can not use UDIV or
+	     SDIV at all; and to two if we can use UDIV or SDIV on a v7-A
+	     CPU.  We will merge as follows: If the input attribute's value
+	     is one then the output attribute's value remains unchanged.  If
+	     the input attribute's value is zero or two then if the output
+	     attribute's value is one the output value is set to the input
+	     value, otherwise the output value must be the same as the
+	     inputs.  */ 
+	  if (in_attr[i].i != 1 && out_attr[i].i != 1) 
+	    { 
+	      if (in_attr[i].i != out_attr[i].i)
+		{
+		  _bfd_error_handler
+		    (_("DIV usage mismatch between %B and %B"),
+		     ibfd, obfd); 
+		  result = FALSE;
+		}
+	    } 
+
+	  if (in_attr[i].i != 1)
+	    out_attr[i].i = in_attr[i].i; 
+	  
+	  break;
+
+	case Tag_MPextension_use_legacy:
+	  /* We don't output objects with Tag_MPextension_use_legacy - we
+	     move the value to Tag_MPextension_use.  */
+	  if (in_attr[i].i != 0 && in_attr[Tag_MPextension_use].i != 0)
+	    {
+	      if (in_attr[Tag_MPextension_use].i != in_attr[i].i)
+		{
+		  _bfd_error_handler
+		    (_("%B has has both the current and legacy "
+		       "Tag_MPextension_use attributes"), 
+		     ibfd);
+		  result = FALSE;
+		}
+	    }
+
+	  if (in_attr[i].i > out_attr[Tag_MPextension_use].i)
+	    out_attr[Tag_MPextension_use] = in_attr[i];
+
+	  break;
+
+	case Tag_nodefaults:
+	  /* This tag is set if it exists, but the value is unused (and is
+	     typically zero).  We don't actually need to do anything here -
+	     the merge happens automatically when the type flags are merged
+	     below.  */
+	  break;
+	case Tag_also_compatible_with:
+	  /* Already done in Tag_CPU_arch.  */
+	  break;
+	case Tag_conformance:
+	  /* Keep the attribute if it matches.  Throw it away otherwise.
+	     No attribute means no claim to conform.  */
+	  if (!in_attr[i].s || !out_attr[i].s
+	      || strcmp (in_attr[i].s, out_attr[i].s) != 0)
+	    out_attr[i].s = NULL;
+	  break;
+
+	default:
+	  result
+	    = result && _bfd_elf_merge_unknown_attribute_low (ibfd, obfd, i);
+	}
+
+      /* If out_attr was copied from in_attr then it won't have a type yet.  */
+      if (in_attr[i].type && !out_attr[i].type)
+	out_attr[i].type = in_attr[i].type;
+    }
+
+  /* Merge Tag_compatibility attributes and any common GNU ones.  */
+  if (!_bfd_elf_merge_object_attributes (ibfd, obfd))
+    return FALSE;
+
+  /* Check for any attributes not known on ARM.  */
+  result &= _bfd_elf_merge_unknown_attribute_list (ibfd, obfd);
+
+  return result;
+}
+
+
+/* Return TRUE if the two EABI versions are incompatible.  */
+
+static bfd_boolean
+elf32_arm_versions_compatible (unsigned iver, unsigned over)
+{
+  /* v4 and v5 are the same spec before and after it was released,
+     so allow mixing them.  */
+  if ((iver == EF_ARM_EABI_VER4 && over == EF_ARM_EABI_VER5)
+      || (iver == EF_ARM_EABI_VER5 && over == EF_ARM_EABI_VER4))
+    return TRUE;
+
+  return (iver == over);
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+
+static bfd_boolean
+elf32_arm_merge_private_bfd_data (bfd * ibfd, bfd * obfd);
+
+/* Display the flags field.  */
+
+static bfd_boolean
+elf32_arm_print_private_bfd_data (bfd *abfd, void * ptr)
+{
+  FILE * file = (FILE *) ptr;
+  unsigned long flags;
+
+  BFD_ASSERT (abfd != NULL && ptr != NULL);
+
+  /* Print normal ELF private data.  */
+  _bfd_elf_print_private_bfd_data (abfd, ptr);
+
+  flags = elf_elfheader (abfd)->e_flags;
+  /* Ignore init flag - it may not be set, despite the flags field
+     containing valid data.  */
+
+  /* xgettext:c-format */
+  fprintf (file, _("private flags = %lx:"), elf_elfheader (abfd)->e_flags);
+
+  switch (EF_ARM_EABI_VERSION (flags))
+    {
+    case EF_ARM_EABI_UNKNOWN:
+      /* The following flag bits are GNU extensions and not part of the
+	 official ARM ELF extended ABI.  Hence they are only decoded if
+	 the EABI version is not set.  */
+      if (flags & EF_ARM_INTERWORK)
+	fprintf (file, _(" [interworking enabled]"));
+
+      if (flags & EF_ARM_APCS_26)
+	fprintf (file, " [APCS-26]");
+      else
+	fprintf (file, " [APCS-32]");
+
+      if (flags & EF_ARM_VFP_FLOAT)
+	fprintf (file, _(" [VFP float format]"));
+      else if (flags & EF_ARM_MAVERICK_FLOAT)
+	fprintf (file, _(" [Maverick float format]"));
+      else
+	fprintf (file, _(" [FPA float format]"));
+
+      if (flags & EF_ARM_APCS_FLOAT)
+	fprintf (file, _(" [floats passed in float registers]"));
+
+      if (flags & EF_ARM_PIC)
+	fprintf (file, _(" [position independent]"));
+
+      if (flags & EF_ARM_NEW_ABI)
+	fprintf (file, _(" [new ABI]"));
+
+      if (flags & EF_ARM_OLD_ABI)
+	fprintf (file, _(" [old ABI]"));
+
+      if (flags & EF_ARM_SOFT_FLOAT)
+	fprintf (file, _(" [software FP]"));
+
+      flags &= ~(EF_ARM_INTERWORK | EF_ARM_APCS_26 | EF_ARM_APCS_FLOAT
+		 | EF_ARM_PIC | EF_ARM_NEW_ABI | EF_ARM_OLD_ABI
+		 | EF_ARM_SOFT_FLOAT | EF_ARM_VFP_FLOAT
+		 | EF_ARM_MAVERICK_FLOAT);
+      break;
+
+    case EF_ARM_EABI_VER1:
+      fprintf (file, _(" [Version1 EABI]"));
+
+      if (flags & EF_ARM_SYMSARESORTED)
+	fprintf (file, _(" [sorted symbol table]"));
+      else
+	fprintf (file, _(" [unsorted symbol table]"));
+
+      flags &= ~ EF_ARM_SYMSARESORTED;
+      break;
+
+    case EF_ARM_EABI_VER2:
+      fprintf (file, _(" [Version2 EABI]"));
+
+      if (flags & EF_ARM_SYMSARESORTED)
+	fprintf (file, _(" [sorted symbol table]"));
+      else
+	fprintf (file, _(" [unsorted symbol table]"));
+
+      if (flags & EF_ARM_DYNSYMSUSESEGIDX)
+	fprintf (file, _(" [dynamic symbols use segment index]"));
+
+      if (flags & EF_ARM_MAPSYMSFIRST)
+	fprintf (file, _(" [mapping symbols precede others]"));
+
+      flags &= ~(EF_ARM_SYMSARESORTED | EF_ARM_DYNSYMSUSESEGIDX
+		 | EF_ARM_MAPSYMSFIRST);
+      break;
+
+    case EF_ARM_EABI_VER3:
+      fprintf (file, _(" [Version3 EABI]"));
+      break;
+
+    case EF_ARM_EABI_VER4:
+      fprintf (file, _(" [Version4 EABI]"));
+      goto eabi;
+
+    case EF_ARM_EABI_VER5:
+      fprintf (file, _(" [Version5 EABI]"));
+    eabi:
+      if (flags & EF_ARM_BE8)
+	fprintf (file, _(" [BE8]"));
+
+      if (flags & EF_ARM_LE8)
+	fprintf (file, _(" [LE8]"));
+
+      flags &= ~(EF_ARM_LE8 | EF_ARM_BE8);
+      break;
+
+    default:
+      fprintf (file, _(" <EABI version unrecognised>"));
+      break;
+    }
+
+  flags &= ~ EF_ARM_EABIMASK;
+
+  if (flags & EF_ARM_RELEXEC)
+    fprintf (file, _(" [relocatable executable]"));
+
+  if (flags & EF_ARM_HASENTRY)
+    fprintf (file, _(" [has entry point]"));
+
+  flags &= ~ (EF_ARM_RELEXEC | EF_ARM_HASENTRY);
+
+  if (flags)
+    fprintf (file, _("<Unrecognised flag bits set>"));
+
+  fputc ('\n', file);
+
+  return TRUE;
+}
+
+static int
+elf32_arm_get_symbol_type (Elf_Internal_Sym * elf_sym, int type)
+{
+  switch (ELF_ST_TYPE (elf_sym->st_info))
+    {
+    case STT_ARM_TFUNC:
+      return ELF_ST_TYPE (elf_sym->st_info);
+
+    case STT_ARM_16BIT:
+      /* If the symbol is not an object, return the STT_ARM_16BIT flag.
+	 This allows us to distinguish between data used by Thumb instructions
+	 and non-data (which is probably code) inside Thumb regions of an
+	 executable.  */
+      if (type != STT_OBJECT && type != STT_TLS)
+	return ELF_ST_TYPE (elf_sym->st_info);
+      break;
+
+    default:
+      break;
+    }
+
+  return type;
+}
+
+static asection *
+elf32_arm_gc_mark_hook (asection *sec,
+			struct bfd_link_info *info,
+			Elf_Internal_Rela *rel,
+			struct elf_link_hash_entry *h,
+			Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_ARM_GNU_VTINHERIT:
+      case R_ARM_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Update the got entry reference counts for the section being removed.  */
+
+static bfd_boolean
+elf32_arm_gc_sweep_hook (bfd *                     abfd,
+			 struct bfd_link_info *    info,
+			 asection *                sec,
+			 const Elf_Internal_Rela * relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  const Elf_Internal_Rela *rel, *relend;
+  struct elf32_arm_link_hash_table * globals;
+
+  if (info->relocatable)
+    return TRUE;
+
+  globals = elf32_arm_hash_table (info);
+  if (globals == NULL)
+    return FALSE;
+
+  elf_section_data (sec)->local_dynrel = NULL;
+
+  symtab_hdr = & elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+
+  check_use_blx (globals);
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h = NULL;
+      struct elf32_arm_link_hash_entry *eh;
+      int r_type;
+      bfd_boolean call_reloc_p;
+      bfd_boolean may_become_dynamic_p;
+      bfd_boolean may_need_local_target_p;
+      union gotplt_union *root_plt;
+      struct arm_plt_info *arm_plt;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+      eh = (struct elf32_arm_link_hash_entry *) h;
+
+      call_reloc_p = FALSE;
+      may_become_dynamic_p = FALSE;
+      may_need_local_target_p = FALSE;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      r_type = arm_real_reloc_type (globals, r_type);
+      switch (r_type)
+	{
+	case R_ARM_GOT32:
+	case R_ARM_GOT_PREL:
+	case R_ARM_TLS_GD32:
+	case R_ARM_TLS_IE32:
+	  if (h != NULL)
+	    {
+	      if (h->got.refcount > 0)
+		h->got.refcount -= 1;
+	    }
+	  else if (local_got_refcounts != NULL)
+	    {
+	      if (local_got_refcounts[r_symndx] > 0)
+		local_got_refcounts[r_symndx] -= 1;
+	    }
+	  break;
+
+	case R_ARM_TLS_LDM32:
+	  globals->tls_ldm_got.refcount -= 1;
+	  break;
+
+	case R_ARM_PC24:
+	case R_ARM_PLT32:
+	case R_ARM_CALL:
+	case R_ARM_JUMP24:
+	case R_ARM_PREL31:
+	case R_ARM_THM_CALL:
+	case R_ARM_THM_JUMP24:
+	case R_ARM_THM_JUMP19:
+	  call_reloc_p = TRUE;
+	  may_need_local_target_p = TRUE;
+	  break;
+
+	case R_ARM_ABS12:
+	  if (!globals->vxworks_p)
+	    {
+	      may_need_local_target_p = TRUE;
+	      break;
+	    }
+	  /* Fall through.  */
+	case R_ARM_ABS32:
+	case R_ARM_ABS32_NOI:
+	case R_ARM_REL32:
+	case R_ARM_REL32_NOI:
+	case R_ARM_MOVW_ABS_NC:
+	case R_ARM_MOVT_ABS:
+	case R_ARM_MOVW_PREL_NC:
+	case R_ARM_MOVT_PREL:
+	case R_ARM_THM_MOVW_ABS_NC:
+	case R_ARM_THM_MOVT_ABS:
+	case R_ARM_THM_MOVW_PREL_NC:
+	case R_ARM_THM_MOVT_PREL:
+	  /* Should the interworking branches be here also?  */
+	  if ((info->shared || globals->root.is_relocatable_executable)
+	      && (sec->flags & SEC_ALLOC) != 0)
+	    {
+	      if (h == NULL
+		  && (r_type == R_ARM_REL32 || r_type == R_ARM_REL32_NOI))
+		{
+		  call_reloc_p = TRUE;
+		  may_need_local_target_p = TRUE;
+		}
+	      else
+		may_become_dynamic_p = TRUE;
+	    }
+	  else
+	    may_need_local_target_p = TRUE;
+	  break;
+
+	default:
+	  break;
+	}
+
+      if (may_need_local_target_p
+	  && elf32_arm_get_plt_info (abfd, eh, r_symndx, &root_plt, &arm_plt))
+	{
+	  BFD_ASSERT (root_plt->refcount > 0);
+	  root_plt->refcount -= 1;
+
+	  if (!call_reloc_p)
+	    arm_plt->noncall_refcount--;
+
+	  if (r_type == R_ARM_THM_CALL)
+	    arm_plt->maybe_thumb_refcount--;
+
+	  if (r_type == R_ARM_THM_JUMP24
+	      || r_type == R_ARM_THM_JUMP19)
+	    arm_plt->thumb_refcount--;
+	}
+
+      if (may_become_dynamic_p)
+	{
+	  struct elf_dyn_relocs **pp;
+	  struct elf_dyn_relocs *p;
+
+	  if (h != NULL)
+	    pp = &(eh->dyn_relocs);
+	  else
+	    {
+	      Elf_Internal_Sym *isym;
+
+	      isym = bfd_sym_from_r_symndx (&globals->sym_cache,
+					    abfd, r_symndx);
+	      if (isym == NULL)
+		return FALSE;
+	      pp = elf32_arm_get_local_dynreloc_list (abfd, r_symndx, isym);
+	      if (pp == NULL)
+		return FALSE;
+	    }
+	  for (; (p = *pp) != NULL; pp = &p->next)
+	    if (p->sec == sec)
+	      {
+		/* Everything must go for SEC.  */
+		*pp = p->next;
+		break;
+	      }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Look through the relocs for a section during the first phase.  */
+
+static bfd_boolean
+elf32_arm_check_relocs (bfd *abfd, struct bfd_link_info *info,
+			asection *sec, const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  bfd *dynobj;
+  asection *sreloc;
+  struct elf32_arm_link_hash_table *htab;
+  bfd_boolean call_reloc_p;
+  bfd_boolean may_become_dynamic_p;
+  bfd_boolean may_need_local_target_p;
+  unsigned long nsyms;
+
+  if (info->relocatable)
+    return TRUE;
+
+  BFD_ASSERT (is_arm_elf (abfd));
+
+  htab = elf32_arm_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  sreloc = NULL;
+
+  /* Create dynamic sections for relocatable executables so that we can
+     copy relocations.  */
+  if (htab->root.is_relocatable_executable
+      && ! htab->root.dynamic_sections_created)
+    {
+      if (! _bfd_elf_link_create_dynamic_sections (abfd, info))
+	return FALSE;
+    }
+
+  if (htab->root.dynobj == NULL)
+    htab->root.dynobj = abfd;
+  if (!create_ifunc_sections (info))
+    return FALSE;
+
+  dynobj = htab->root.dynobj;
+
+  symtab_hdr = & elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+  nsyms = NUM_SHDR_ENTRIES (symtab_hdr);
+  
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      Elf_Internal_Sym *isym;
+      struct elf_link_hash_entry *h;
+      struct elf32_arm_link_hash_entry *eh;
+      unsigned long r_symndx;
+      int r_type;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+      r_type = arm_real_reloc_type (htab, r_type);
+
+      if (r_symndx >= nsyms
+	  /* PR 9934: It is possible to have relocations that do not
+	     refer to symbols, thus it is also possible to have an
+	     object file containing relocations but no symbol table.  */
+	  && (r_symndx > STN_UNDEF || nsyms > 0))
+	{
+	  (*_bfd_error_handler) (_("%B: bad symbol index: %d"), abfd,
+				   r_symndx);
+	  return FALSE;
+	}
+
+      h = NULL;
+      isym = NULL;
+      if (nsyms > 0)
+	{
+	  if (r_symndx < symtab_hdr->sh_info)
+	    {
+	      /* A local symbol.  */
+	      isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+					    abfd, r_symndx);
+	      if (isym == NULL)
+		return FALSE;
+	    }
+	  else
+	    {
+	      h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	      while (h->root.type == bfd_link_hash_indirect
+		     || h->root.type == bfd_link_hash_warning)
+		h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	    }
+	}
+
+      eh = (struct elf32_arm_link_hash_entry *) h;
+
+      call_reloc_p = FALSE;
+      may_become_dynamic_p = FALSE;
+      may_need_local_target_p = FALSE;
+
+      /* Could be done earlier, if h were already available.  */
+      r_type = elf32_arm_tls_transition (info, r_type, h);
+      switch (r_type)
+        {
+	  case R_ARM_GOT32:
+	  case R_ARM_GOT_PREL:
+	  case R_ARM_TLS_GD32:
+	  case R_ARM_TLS_IE32:
+	  case R_ARM_TLS_GOTDESC:
+	  case R_ARM_TLS_DESCSEQ:
+	  case R_ARM_THM_TLS_DESCSEQ:
+	  case R_ARM_TLS_CALL:
+	  case R_ARM_THM_TLS_CALL:
+	    /* This symbol requires a global offset table entry.  */
+	    {
+	      int tls_type, old_tls_type;
+
+	      switch (r_type)
+		{
+		case R_ARM_TLS_GD32: tls_type = GOT_TLS_GD; break;
+		  
+		case R_ARM_TLS_IE32: tls_type = GOT_TLS_IE; break;
+		  
+		case R_ARM_TLS_GOTDESC:
+		case R_ARM_TLS_CALL: case R_ARM_THM_TLS_CALL:
+		case R_ARM_TLS_DESCSEQ: case R_ARM_THM_TLS_DESCSEQ:
+		  tls_type = GOT_TLS_GDESC; break;
+		  
+		default: tls_type = GOT_NORMAL; break;
+		}
+
+	      if (h != NULL)
+		{
+		  h->got.refcount++;
+		  old_tls_type = elf32_arm_hash_entry (h)->tls_type;
+		}
+	      else
+		{
+		  /* This is a global offset table entry for a local symbol.  */
+		  if (!elf32_arm_allocate_local_sym_info (abfd))
+		    return FALSE;
+		  elf_local_got_refcounts (abfd)[r_symndx] += 1;
+		  old_tls_type = elf32_arm_local_got_tls_type (abfd) [r_symndx];
+		}
+
+	      /* If a variable is accessed with both tls methods, two
+	         slots may be created.  */
+	      if (GOT_TLS_GD_ANY_P (old_tls_type)
+		  && GOT_TLS_GD_ANY_P (tls_type))
+		tls_type |= old_tls_type;
+
+	      /* We will already have issued an error message if there
+		 is a TLS/non-TLS mismatch, based on the symbol
+		 type.  So just combine any TLS types needed.  */
+	      if (old_tls_type != GOT_UNKNOWN && old_tls_type != GOT_NORMAL
+		  && tls_type != GOT_NORMAL)
+		tls_type |= old_tls_type;
+
+	      /* If the symbol is accessed in both IE and GDESC
+	         method, we're able to relax. Turn off the GDESC flag,
+	         without messing up with any other kind of tls types
+	         that may be involved */
+	      if ((tls_type & GOT_TLS_IE) && (tls_type & GOT_TLS_GDESC))
+		tls_type &= ~GOT_TLS_GDESC;
+
+	      if (old_tls_type != tls_type)
+		{
+		  if (h != NULL)
+		    elf32_arm_hash_entry (h)->tls_type = tls_type;
+		  else
+		    elf32_arm_local_got_tls_type (abfd) [r_symndx] = tls_type;
+		}
+	    }
+	    /* Fall through.  */
+
+	  case R_ARM_TLS_LDM32:
+	    if (r_type == R_ARM_TLS_LDM32)
+		htab->tls_ldm_got.refcount++;
+	    /* Fall through.  */
+
+	  case R_ARM_GOTOFF32:
+	  case R_ARM_GOTPC:
+	    if (htab->root.sgot == NULL
+		&& !create_got_section (htab->root.dynobj, info))
+	      return FALSE;
+	    break;
+
+	  case R_ARM_PC24:
+	  case R_ARM_PLT32:
+	  case R_ARM_CALL:
+	  case R_ARM_JUMP24:
+	  case R_ARM_PREL31:
+	  case R_ARM_THM_CALL:
+	  case R_ARM_THM_JUMP24:
+	  case R_ARM_THM_JUMP19:
+	    call_reloc_p = TRUE;
+	    may_need_local_target_p = TRUE;
+	    break;
+
+	  case R_ARM_ABS12:
+	    /* VxWorks uses dynamic R_ARM_ABS12 relocations for
+	       ldr __GOTT_INDEX__ offsets.  */
+	    if (!htab->vxworks_p)
+	      {
+		may_need_local_target_p = TRUE;
+		break;
+	      }
+	    /* Fall through.  */
+
+	  case R_ARM_MOVW_ABS_NC:
+	  case R_ARM_MOVT_ABS:
+	  case R_ARM_THM_MOVW_ABS_NC:
+	  case R_ARM_THM_MOVT_ABS:
+	    if (info->shared)
+	      {
+		(*_bfd_error_handler)
+		  (_("%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"),
+		   abfd, elf32_arm_howto_table_1[r_type].name,
+		   (h) ? h->root.root.string : "a local symbol");
+		bfd_set_error (bfd_error_bad_value);
+		return FALSE;
+	      }
+
+	    /* Fall through.  */
+	  case R_ARM_ABS32:
+	  case R_ARM_ABS32_NOI:
+	  case R_ARM_REL32:
+	  case R_ARM_REL32_NOI:
+	  case R_ARM_MOVW_PREL_NC:
+	  case R_ARM_MOVT_PREL:
+	  case R_ARM_THM_MOVW_PREL_NC:
+	  case R_ARM_THM_MOVT_PREL:
+
+	    /* Should the interworking branches be listed here?  */
+	    if ((info->shared || htab->root.is_relocatable_executable)
+		&& (sec->flags & SEC_ALLOC) != 0)
+	      {
+		if (h == NULL
+		    && (r_type == R_ARM_REL32 || r_type == R_ARM_REL32_NOI))
+		  {
+		    /* In shared libraries and relocatable executables,
+		       we treat local relative references as calls;
+		       see the related SYMBOL_CALLS_LOCAL code in
+		       allocate_dynrelocs.  */
+		    call_reloc_p = TRUE;
+		    may_need_local_target_p = TRUE;
+		  }
+		else
+		  /* We are creating a shared library or relocatable
+		     executable, and this is a reloc against a global symbol,
+		     or a non-PC-relative reloc against a local symbol.
+		     We may need to copy the reloc into the output.  */
+		  may_become_dynamic_p = TRUE;
+	      }
+	    else
+	      may_need_local_target_p = TRUE;
+	    break;
+
+        /* This relocation describes the C++ object vtable hierarchy.
+           Reconstruct it for later use during GC.  */
+        case R_ARM_GNU_VTINHERIT:
+          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+
+        /* This relocation describes which C++ vtable entries are actually
+           used.  Record for later use during GC.  */
+        case R_ARM_GNU_VTENTRY:
+          BFD_ASSERT (h != NULL);
+          if (h != NULL
+              && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+        }
+
+      if (h != NULL)
+	{
+	  if (call_reloc_p)
+	    /* We may need a .plt entry if the function this reloc
+	       refers to is in a different object, regardless of the
+	       symbol's type.  We can't tell for sure yet, because
+	       something later might force the symbol local.  */
+	    h->needs_plt = 1;
+	  else if (may_need_local_target_p)
+	    /* If this reloc is in a read-only section, we might
+	       need a copy reloc.  We can't check reliably at this
+	       stage whether the section is read-only, as input
+	       sections have not yet been mapped to output sections.
+	       Tentatively set the flag for now, and correct in
+	       adjust_dynamic_symbol.  */
+	    h->non_got_ref = 1;
+	}
+
+      if (may_need_local_target_p
+	  && (h != NULL || ELF32_ST_TYPE (isym->st_info) == STT_GNU_IFUNC))
+	{
+	  union gotplt_union *root_plt;
+	  struct arm_plt_info *arm_plt;
+	  struct arm_local_iplt_info *local_iplt;
+
+	  if (h != NULL)
+	    {
+	      root_plt = &h->plt;
+	      arm_plt = &eh->plt;
+	    }
+	  else
+	    {
+	      local_iplt = elf32_arm_create_local_iplt (abfd, r_symndx);
+	      if (local_iplt == NULL)
+		return FALSE;
+	      root_plt = &local_iplt->root;
+	      arm_plt = &local_iplt->arm;
+	    }
+
+	  /* If the symbol is a function that doesn't bind locally,
+	     this relocation will need a PLT entry.  */
+	  root_plt->refcount += 1;
+
+	  if (!call_reloc_p)
+	    arm_plt->noncall_refcount++;
+
+	  /* It's too early to use htab->use_blx here, so we have to
+	     record possible blx references separately from
+	     relocs that definitely need a thumb stub.  */
+
+	  if (r_type == R_ARM_THM_CALL)
+	    arm_plt->maybe_thumb_refcount += 1;
+
+	  if (r_type == R_ARM_THM_JUMP24
+	      || r_type == R_ARM_THM_JUMP19)
+	    arm_plt->thumb_refcount += 1;
+	}
+
+      if (may_become_dynamic_p)
+	{
+	  struct elf_dyn_relocs *p, **head;
+
+	  /* Create a reloc section in dynobj.  */
+	  if (sreloc == NULL)
+	    {
+	      sreloc = _bfd_elf_make_dynamic_reloc_section
+		(sec, dynobj, 2, abfd, ! htab->use_rel);
+
+	      if (sreloc == NULL)
+		return FALSE;
+
+	      /* BPABI objects never have dynamic relocations mapped.  */
+	      if (htab->symbian_p)
+		{
+		  flagword flags;
+
+		  flags = bfd_get_section_flags (dynobj, sreloc);
+		  flags &= ~(SEC_LOAD | SEC_ALLOC);
+		  bfd_set_section_flags (dynobj, sreloc, flags);
+		}
+	    }
+
+	  /* If this is a global symbol, count the number of
+	     relocations we need for this symbol.  */
+	  if (h != NULL)
+	    head = &((struct elf32_arm_link_hash_entry *) h)->dyn_relocs;
+	  else
+	    {
+	      head = elf32_arm_get_local_dynreloc_list (abfd, r_symndx, isym);
+	      if (head == NULL)
+		return FALSE;
+	    }
+
+	  p = *head;
+	  if (p == NULL || p->sec != sec)
+	    {
+	      bfd_size_type amt = sizeof *p;
+
+	      p = (struct elf_dyn_relocs *) bfd_alloc (htab->root.dynobj, amt);
+	      if (p == NULL)
+		return FALSE;
+	      p->next = *head;
+	      *head = p;
+	      p->sec = sec;
+	      p->count = 0;
+	      p->pc_count = 0;
+	    }
+
+	  if (r_type == R_ARM_REL32 || r_type == R_ARM_REL32_NOI)
+	    p->pc_count += 1;
+	  p->count += 1;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Unwinding tables are not referenced directly.  This pass marks them as
+   required if the corresponding code section is marked.  */
+
+static bfd_boolean
+elf32_arm_gc_mark_extra_sections (struct bfd_link_info *info,
+				  elf_gc_mark_hook_fn gc_mark_hook)
+{
+  bfd *sub;
+  Elf_Internal_Shdr **elf_shdrp;
+  bfd_boolean again;
+
+  _bfd_elf_gc_mark_extra_sections (info, gc_mark_hook);
+
+  /* Marking EH data may cause additional code sections to be marked,
+     requiring multiple passes.  */
+  again = TRUE;
+  while (again)
+    {
+      again = FALSE;
+      for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+	{
+	  asection *o;
+
+	  if (! is_arm_elf (sub))
+	    continue;
+
+	  elf_shdrp = elf_elfsections (sub);
+	  for (o = sub->sections; o != NULL; o = o->next)
+	    {
+	      Elf_Internal_Shdr *hdr;
+
+	      hdr = &elf_section_data (o)->this_hdr;
+	      if (hdr->sh_type == SHT_ARM_EXIDX
+		  && hdr->sh_link
+		  && hdr->sh_link < elf_numsections (sub)
+		  && !o->gc_mark
+		  && elf_shdrp[hdr->sh_link]->bfd_section->gc_mark)
+		{
+		  again = TRUE;
+		  if (!_bfd_elf_gc_mark (info, o, gc_mark_hook))
+		    return FALSE;
+		}
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Treat mapping symbols as special target symbols.  */
+
+static bfd_boolean
+elf32_arm_is_target_special_symbol (bfd * abfd ATTRIBUTE_UNUSED, asymbol * sym)
+{
+  return bfd_is_arm_special_symbol_name (sym->name,
+					 BFD_ARM_SPECIAL_SYM_TYPE_ANY);
+}
+
+/* This is a copy of elf_find_function() from elf.c except that
+   ARM mapping symbols are ignored when looking for function names
+   and STT_ARM_TFUNC is considered to a function type.  */
+
+static bfd_boolean
+arm_elf_find_function (bfd *         abfd ATTRIBUTE_UNUSED,
+		       asection *    section,
+		       asymbol **    symbols,
+		       bfd_vma       offset,
+		       const char ** filename_ptr,
+		       const char ** functionname_ptr)
+{
+  const char * filename = NULL;
+  asymbol * func = NULL;
+  bfd_vma low_func = 0;
+  asymbol ** p;
+
+  for (p = symbols; *p != NULL; p++)
+    {
+      elf_symbol_type *q;
+
+      q = (elf_symbol_type *) *p;
+
+      switch (ELF_ST_TYPE (q->internal_elf_sym.st_info))
+	{
+	default:
+	  break;
+	case STT_FILE:
+	  filename = bfd_asymbol_name (&q->symbol);
+	  break;
+	case STT_FUNC:
+	case STT_ARM_TFUNC:
+	case STT_NOTYPE:
+	  /* Skip mapping symbols.  */
+	  if ((q->symbol.flags & BSF_LOCAL)
+	      && bfd_is_arm_special_symbol_name (q->symbol.name,
+		    BFD_ARM_SPECIAL_SYM_TYPE_ANY))
+	    continue;
+	  /* Fall through.  */
+	  if (bfd_get_section (&q->symbol) == section
+	      && q->symbol.value >= low_func
+	      && q->symbol.value <= offset)
+	    {
+	      func = (asymbol *) q;
+	      low_func = q->symbol.value;
+	    }
+	  break;
+	}
+    }
+
+  if (func == NULL)
+    return FALSE;
+
+  if (filename_ptr)
+    *filename_ptr = filename;
+  if (functionname_ptr)
+    *functionname_ptr = bfd_asymbol_name (func);
+
+  return TRUE;
+}
+
+
+/* Find the nearest line to a particular section and offset, for error
+   reporting.   This code is a duplicate of the code in elf.c, except
+   that it uses arm_elf_find_function.  */
+
+static bfd_boolean
+elf32_arm_find_nearest_line (bfd *          abfd,
+			     asection *     section,
+			     asymbol **     symbols,
+			     bfd_vma        offset,
+			     const char **  filename_ptr,
+			     const char **  functionname_ptr,
+			     unsigned int * line_ptr)
+{
+  bfd_boolean found = FALSE;
+
+  /* We skip _bfd_dwarf1_find_nearest_line since no known ARM toolchain uses it.  */
+
+  if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
+				     filename_ptr, functionname_ptr,
+				     line_ptr, 0,
+				     & elf_tdata (abfd)->dwarf2_find_line_info))
+    {
+      if (!*functionname_ptr)
+	arm_elf_find_function (abfd, section, symbols, offset,
+			       *filename_ptr ? NULL : filename_ptr,
+			       functionname_ptr);
+
+      return TRUE;
+    }
+
+  if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset,
+					     & found, filename_ptr,
+					     functionname_ptr, line_ptr,
+					     & elf_tdata (abfd)->line_info))
+    return FALSE;
+
+  if (found && (*functionname_ptr || *line_ptr))
+    return TRUE;
+
+  if (symbols == NULL)
+    return FALSE;
+
+  if (! arm_elf_find_function (abfd, section, symbols, offset,
+			       filename_ptr, functionname_ptr))
+    return FALSE;
+
+  *line_ptr = 0;
+  return TRUE;
+}
+
+static bfd_boolean
+elf32_arm_find_inliner_info (bfd *          abfd,
+			     const char **  filename_ptr,
+			     const char **  functionname_ptr,
+			     unsigned int * line_ptr)
+{
+  bfd_boolean found;
+  found = _bfd_dwarf2_find_inliner_info (abfd, filename_ptr,
+					 functionname_ptr, line_ptr,
+					 & elf_tdata (abfd)->dwarf2_find_line_info);
+  return found;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info,
+				 struct elf_link_hash_entry * h)
+{
+  bfd * dynobj;
+  asection * s;
+  struct elf32_arm_link_hash_entry * eh;
+  struct elf32_arm_link_hash_table *globals;
+
+  globals = elf32_arm_hash_table (info);
+  if (globals == NULL)
+    return FALSE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (dynobj != NULL
+	      && (h->needs_plt
+		  || h->type == STT_GNU_IFUNC
+		  || h->u.weakdef != NULL
+		  || (h->def_dynamic
+		      && h->ref_regular
+		      && !h->def_regular)));
+
+  eh = (struct elf32_arm_link_hash_entry *) h;
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later,
+     when we know the address of the .got section.  */
+  if (h->type == STT_FUNC || h->type == STT_GNU_IFUNC || h->needs_plt)
+    {
+      /* Calls to STT_GNU_IFUNC symbols always use a PLT, even if the
+	 symbol binds locally.  */
+      if (h->plt.refcount <= 0
+	  || (h->type != STT_GNU_IFUNC
+	      && (SYMBOL_CALLS_LOCAL (info, h)
+		  || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+		      && h->root.type == bfd_link_hash_undefweak))))
+	{
+	  /* This case can occur if we saw a PLT32 reloc in an input
+	     file, but the symbol was never referred to by a dynamic
+	     object, or if all references were garbage collected.  In
+	     such a case, we don't actually need to build a procedure
+	     linkage table, and we can just do a PC24 reloc instead.  */
+	  h->plt.offset = (bfd_vma) -1;
+	  eh->plt.thumb_refcount = 0;
+	  eh->plt.maybe_thumb_refcount = 0;
+	  eh->plt.noncall_refcount = 0;
+	  h->needs_plt = 0;
+	}
+
+      return TRUE;
+    }
+  else
+    {
+      /* It's possible that we incorrectly decided a .plt reloc was
+	 needed for an R_ARM_PC24 or similar reloc to a non-function sym
+	 in check_relocs.  We can't decide accurately between function
+	 and non-function syms in check-relocs; Objects loaded later in
+	 the link may change h->type.  So fix it now.  */
+      h->plt.offset = (bfd_vma) -1;
+      eh->plt.thumb_refcount = 0;
+      eh->plt.maybe_thumb_refcount = 0;
+      eh->plt.noncall_refcount = 0;
+    }
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* If there are no non-GOT references, we do not need a copy
+     relocation.  */
+  if (!h->non_got_ref)
+    return TRUE;
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  Relocatable executables
+     can reference data in shared objects directly, so we don't need to
+     do anything here.  */
+  if (info->shared || globals->root.is_relocatable_executable)
+    return TRUE;
+
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+  s = bfd_get_section_by_name (dynobj, ".dynbss");
+  BFD_ASSERT (s != NULL);
+
+  /* We must generate a R_ARM_COPY reloc to tell the dynamic linker to
+     copy the initial value out of the dynamic object and into the
+     runtime process image.  We need to remember the offset into the
+     .rel(a).bss section we are going to use.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      asection *srel;
+
+      srel = bfd_get_section_by_name (dynobj, RELOC_SECTION (globals, ".bss"));
+      elf32_arm_allocate_dynrelocs (info, srel, 1);
+      h->needs_copy = 1;
+    }
+
+  return _bfd_elf_adjust_dynamic_copy (h, s);
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   dynamic relocs.  */
+
+static bfd_boolean
+allocate_dynrelocs_for_symbol (struct elf_link_hash_entry *h, void * inf)
+{
+  struct bfd_link_info *info;
+  struct elf32_arm_link_hash_table *htab;
+  struct elf32_arm_link_hash_entry *eh;
+  struct elf_dyn_relocs *p;
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  eh = (struct elf32_arm_link_hash_entry *) h;
+
+  info = (struct bfd_link_info *) inf;
+  htab = elf32_arm_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if ((htab->root.dynamic_sections_created || h->type == STT_GNU_IFUNC)
+      && h->plt.refcount > 0)
+    {
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      /* If the call in the PLT entry binds locally, the associated
+	 GOT entry should use an R_ARM_IRELATIVE relocation instead of
+	 the usual R_ARM_JUMP_SLOT.  Put it in the .iplt section rather
+	 than the .plt section.  */
+      if (h->type == STT_GNU_IFUNC && SYMBOL_CALLS_LOCAL (info, h))
+	{
+	  eh->is_iplt = 1;
+	  if (eh->plt.noncall_refcount == 0
+	      && SYMBOL_REFERENCES_LOCAL (info, h))
+	    /* All non-call references can be resolved directly.
+	       This means that they can (and in some cases, must)
+	       resolve directly to the run-time target, rather than
+	       to the PLT.  That in turns means that any .got entry
+	       would be equal to the .igot.plt entry, so there's
+	       no point having both.  */
+	    h->got.refcount = 0;
+	}
+
+      if (info->shared
+	  || eh->is_iplt
+	  || WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, 0, h))
+	{
+	  elf32_arm_allocate_plt_entry (info, eh->is_iplt, &h->plt, &eh->plt);
+
+	  /* If this symbol is not defined in a regular file, and we are
+	     not generating a shared library, then set the symbol to this
+	     location in the .plt.  This is required to make function
+	     pointers compare as equal between the normal executable and
+	     the shared library.  */
+	  if (! info->shared
+	      && !h->def_regular)
+	    {
+	      h->root.u.def.section = htab->root.splt;
+	      h->root.u.def.value = h->plt.offset;
+
+	      /* Make sure the function is not marked as Thumb, in case
+		 it is the target of an ABS32 relocation, which will
+		 point to the PLT entry.  */
+	      h->target_internal = ST_BRANCH_TO_ARM;
+	    }
+
+	  htab->next_tls_desc_index++;
+
+	  /* VxWorks executables have a second set of relocations for
+	     each PLT entry.  They go in a separate relocation section,
+	     which is processed by the kernel loader.  */
+	  if (htab->vxworks_p && !info->shared)
+	    {
+	      /* There is a relocation for the initial PLT entry:
+		 an R_ARM_32 relocation for _GLOBAL_OFFSET_TABLE_.  */
+	      if (h->plt.offset == htab->plt_header_size)
+		elf32_arm_allocate_dynrelocs (info, htab->srelplt2, 1);
+
+	      /* There are two extra relocations for each subsequent
+		 PLT entry: an R_ARM_32 relocation for the GOT entry,
+		 and an R_ARM_32 relocation for the PLT entry.  */
+	      elf32_arm_allocate_dynrelocs (info, htab->srelplt2, 2);
+	    }
+	}
+      else
+	{
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	}
+    }
+  else
+    {
+      h->plt.offset = (bfd_vma) -1;
+      h->needs_plt = 0;
+    }
+
+  eh = (struct elf32_arm_link_hash_entry *) h;
+  eh->tlsdesc_got = (bfd_vma) -1;
+
+  if (h->got.refcount > 0)
+    {
+      asection *s;
+      bfd_boolean dyn;
+      int tls_type = elf32_arm_hash_entry (h)->tls_type;
+      int indx;
+
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      if (!htab->symbian_p)
+	{
+	  s = htab->root.sgot;
+	  h->got.offset = s->size;
+
+	  if (tls_type == GOT_UNKNOWN)
+	    abort ();
+
+	  if (tls_type == GOT_NORMAL)
+	    /* Non-TLS symbols need one GOT slot.  */
+	    s->size += 4;
+	  else
+	    {
+              if (tls_type & GOT_TLS_GDESC)
+	        {
+		  /* R_ARM_TLS_DESC needs 2 GOT slots.  */
+	          eh->tlsdesc_got
+		    = (htab->root.sgotplt->size
+		       - elf32_arm_compute_jump_table_size (htab));
+	          htab->root.sgotplt->size += 8;
+	          h->got.offset = (bfd_vma) -2;
+		  /* plt.got_offset needs to know there's a TLS_DESC
+		     reloc in the middle of .got.plt.  */
+                  htab->num_tls_desc++;
+	        }
+
+	      if (tls_type & GOT_TLS_GD)
+		{
+		  /* R_ARM_TLS_GD32 needs 2 consecutive GOT slots.  If
+		     the symbol is both GD and GDESC, got.offset may
+		     have been overwritten.  */
+		  h->got.offset = s->size;
+		  s->size += 8;
+		}
+
+	      if (tls_type & GOT_TLS_IE)
+		/* R_ARM_TLS_IE32 needs one GOT slot.  */
+		s->size += 4;
+	    }
+
+	  dyn = htab->root.dynamic_sections_created;
+
+	  indx = 0;
+	  if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+	      && (!info->shared
+		  || !SYMBOL_REFERENCES_LOCAL (info, h)))
+	    indx = h->dynindx;
+
+	  if (tls_type != GOT_NORMAL
+	      && (info->shared || indx != 0)
+	      && (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		  || h->root.type != bfd_link_hash_undefweak))
+	    {
+	      if (tls_type & GOT_TLS_IE)
+		elf32_arm_allocate_dynrelocs (info, htab->root.srelgot, 1);
+
+	      if (tls_type & GOT_TLS_GD)
+		elf32_arm_allocate_dynrelocs (info, htab->root.srelgot, 1);
+
+	      if (tls_type & GOT_TLS_GDESC) 
+		{
+		  elf32_arm_allocate_dynrelocs (info, htab->root.srelplt, 1);
+		  /* GDESC needs a trampoline to jump to.  */
+		  htab->tls_trampoline = -1;
+		}
+
+	      /* Only GD needs it.  GDESC just emits one relocation per
+		 2 entries.  */
+	      if ((tls_type & GOT_TLS_GD) && indx != 0)  
+		elf32_arm_allocate_dynrelocs (info, htab->root.srelgot, 1);
+	    }
+	  else if (!SYMBOL_REFERENCES_LOCAL (info, h))
+	    {
+	      if (htab->root.dynamic_sections_created)
+		/* Reserve room for the GOT entry's R_ARM_GLOB_DAT relocation.  */
+		elf32_arm_allocate_dynrelocs (info, htab->root.srelgot, 1);
+	    }
+	  else if (h->type == STT_GNU_IFUNC
+		   && eh->plt.noncall_refcount == 0)
+	    /* No non-call references resolve the STT_GNU_IFUNC's PLT entry;
+	       they all resolve dynamically instead.  Reserve room for the
+	       GOT entry's R_ARM_IRELATIVE relocation.  */
+	    elf32_arm_allocate_irelocs (info, htab->root.srelgot, 1);
+	  else if (info->shared)
+	    /* Reserve room for the GOT entry's R_ARM_RELATIVE relocation.  */
+	    elf32_arm_allocate_dynrelocs (info, htab->root.srelgot, 1);
+	}
+    }
+  else
+    h->got.offset = (bfd_vma) -1;
+
+  /* Allocate stubs for exported Thumb functions on v4t.  */
+  if (!htab->use_blx && h->dynindx != -1
+      && h->def_regular
+      && h->target_internal == ST_BRANCH_TO_THUMB
+      && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT)
+    {
+      struct elf_link_hash_entry * th;
+      struct bfd_link_hash_entry * bh;
+      struct elf_link_hash_entry * myh;
+      char name[1024];
+      asection *s;
+      bh = NULL;
+      /* Create a new symbol to regist the real location of the function.  */
+      s = h->root.u.def.section;
+      sprintf (name, "__real_%s", h->root.root.string);
+      _bfd_generic_link_add_one_symbol (info, s->owner,
+					name, BSF_GLOBAL, s,
+					h->root.u.def.value,
+					NULL, TRUE, FALSE, &bh);
+
+      myh = (struct elf_link_hash_entry *) bh;
+      myh->type = ELF_ST_INFO (STB_LOCAL, STT_FUNC);
+      myh->forced_local = 1;
+      myh->target_internal = ST_BRANCH_TO_THUMB;
+      eh->export_glue = myh;
+      th = record_arm_to_thumb_glue (info, h);
+      /* Point the symbol at the stub.  */
+      h->type = ELF_ST_INFO (ELF_ST_BIND (h->type), STT_FUNC);
+      h->target_internal = ST_BRANCH_TO_ARM;
+      h->root.u.def.section = th->root.u.def.section;
+      h->root.u.def.value = th->root.u.def.value & ~1;
+    }
+
+  if (eh->dyn_relocs == NULL)
+    return TRUE;
+
+  /* In the shared -Bsymbolic case, discard space allocated for
+     dynamic pc-relative relocs against symbols which turn out to be
+     defined in regular objects.  For the normal shared case, discard
+     space for pc-relative relocs that have become local due to symbol
+     visibility changes.  */
+
+  if (info->shared || htab->root.is_relocatable_executable)
+    {
+      /* The only relocs that use pc_count are R_ARM_REL32 and
+         R_ARM_REL32_NOI, which will appear on something like
+         ".long foo - .".  We want calls to protected symbols to resolve
+         directly to the function rather than going via the plt.  If people
+         want function pointer comparisons to work as expected then they
+         should avoid writing assembly like ".long foo - .".  */
+      if (SYMBOL_CALLS_LOCAL (info, h))
+	{
+	  struct elf_dyn_relocs **pp;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      p->count -= p->pc_count;
+	      p->pc_count = 0;
+	      if (p->count == 0)
+		*pp = p->next;
+	      else
+		pp = &p->next;
+	    }
+	}
+
+      if (htab->vxworks_p)
+	{
+	  struct elf_dyn_relocs **pp;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      if (strcmp (p->sec->output_section->name, ".tls_vars") == 0)
+		*pp = p->next;
+	      else
+		pp = &p->next;
+	    }
+	}
+
+      /* Also discard relocs on undefined weak syms with non-default
+         visibility.  */
+      if (eh->dyn_relocs != NULL
+	  && h->root.type == bfd_link_hash_undefweak)
+	{
+	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	    eh->dyn_relocs = NULL;
+
+	  /* Make sure undefined weak symbols are output as a dynamic
+	     symbol in PIEs.  */
+	  else if (h->dynindx == -1
+		   && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+	}
+
+      else if (htab->root.is_relocatable_executable && h->dynindx == -1
+	       && h->root.type == bfd_link_hash_new)
+	{
+	  /* Output absolute symbols so that we can create relocations
+	     against them.  For normal symbols we output a relocation
+	     against the section that contains them.  */
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+    }
+  else
+    {
+      /* For the non-shared case, discard space for relocs against
+	 symbols which turn out to need copy relocs or are not
+	 dynamic.  */
+
+      if (!h->non_got_ref
+	  && ((h->def_dynamic
+	       && !h->def_regular)
+	      || (htab->root.dynamic_sections_created
+		  && (h->root.type == bfd_link_hash_undefweak
+		      || h->root.type == bfd_link_hash_undefined))))
+	{
+	  /* Make sure this symbol is output as a dynamic symbol.
+	     Undefined weak syms won't yet be marked as dynamic.  */
+	  if (h->dynindx == -1
+	      && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+
+	  /* If that succeeded, we know we'll be keeping all the
+	     relocs.  */
+	  if (h->dynindx != -1)
+	    goto keep;
+	}
+
+      eh->dyn_relocs = NULL;
+
+    keep: ;
+    }
+
+  /* Finally, allocate space.  */
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *sreloc = elf_section_data (p->sec)->sreloc;
+      if (h->type == STT_GNU_IFUNC
+	  && eh->plt.noncall_refcount == 0
+	  && SYMBOL_REFERENCES_LOCAL (info, h))
+	elf32_arm_allocate_irelocs (info, sreloc, p->count);
+      else
+	elf32_arm_allocate_dynrelocs (info, sreloc, p->count);
+    }
+
+  return TRUE;
+}
+
+/* Find any dynamic relocs that apply to read-only sections.  */
+
+static bfd_boolean
+elf32_arm_readonly_dynrelocs (struct elf_link_hash_entry * h, void * inf)
+{
+  struct elf32_arm_link_hash_entry * eh;
+  struct elf_dyn_relocs * p;
+
+  eh = (struct elf32_arm_link_hash_entry *) h;
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *s = p->sec;
+
+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
+	{
+	  struct bfd_link_info *info = (struct bfd_link_info *) inf;
+
+	  info->flags |= DF_TEXTREL;
+
+	  /* Not an error, just cut short the traversal.  */
+	  return FALSE;
+	}
+    }
+  return TRUE;
+}
+
+void
+bfd_elf32_arm_set_byteswap_code (struct bfd_link_info *info,
+				 int byteswap_code)
+{
+  struct elf32_arm_link_hash_table *globals;
+
+  globals = elf32_arm_hash_table (info);
+  if (globals == NULL)
+    return;
+
+  globals->byteswap_code = byteswap_code;
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+elf32_arm_size_dynamic_sections (bfd * output_bfd ATTRIBUTE_UNUSED,
+				 struct bfd_link_info * info)
+{
+  bfd * dynobj;
+  asection * s;
+  bfd_boolean plt;
+  bfd_boolean relocs;
+  bfd *ibfd;
+  struct elf32_arm_link_hash_table *htab;
+
+  htab = elf32_arm_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  BFD_ASSERT (dynobj != NULL);
+  check_use_blx (htab);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (s != NULL);
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+
+  /* Set up .got offsets for local syms, and space for local dynamic
+     relocs.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      bfd_signed_vma *local_got;
+      bfd_signed_vma *end_local_got;
+      struct arm_local_iplt_info **local_iplt_ptr, *local_iplt;
+      char *local_tls_type;
+      bfd_vma *local_tlsdesc_gotent;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *srel;
+      bfd_boolean is_vxworks = htab->vxworks_p;
+      unsigned int symndx;
+
+      if (! is_arm_elf (ibfd))
+	continue;
+
+      for (s = ibfd->sections; s != NULL; s = s->next)
+	{
+	  struct elf_dyn_relocs *p;
+
+	  for (p = (struct elf_dyn_relocs *)
+                   elf_section_data (s)->local_dynrel; p != NULL; p = p->next)
+	    {
+	      if (!bfd_is_abs_section (p->sec)
+		  && bfd_is_abs_section (p->sec->output_section))
+		{
+		  /* Input section has been discarded, either because
+		     it is a copy of a linkonce section or due to
+		     linker script /DISCARD/, so we'll be discarding
+		     the relocs too.  */
+		}
+	      else if (is_vxworks
+		       && strcmp (p->sec->output_section->name,
+				  ".tls_vars") == 0)
+		{
+		  /* Relocations in vxworks .tls_vars sections are
+		     handled specially by the loader.  */
+		}
+	      else if (p->count != 0)
+		{
+		  srel = elf_section_data (p->sec)->sreloc;
+		  elf32_arm_allocate_dynrelocs (info, srel, p->count);
+		  if ((p->sec->output_section->flags & SEC_READONLY) != 0)
+		    info->flags |= DF_TEXTREL;
+		}
+	    }
+	}
+
+      local_got = elf_local_got_refcounts (ibfd);
+      if (!local_got)
+	continue;
+
+      symtab_hdr = & elf_symtab_hdr (ibfd);
+      locsymcount = symtab_hdr->sh_info;
+      end_local_got = local_got + locsymcount;
+      local_iplt_ptr = elf32_arm_local_iplt (ibfd);
+      local_tls_type = elf32_arm_local_got_tls_type (ibfd);
+      local_tlsdesc_gotent = elf32_arm_local_tlsdesc_gotent (ibfd);
+      symndx = 0;
+      s = htab->root.sgot;
+      srel = htab->root.srelgot;
+      for (; local_got < end_local_got;
+	   ++local_got, ++local_iplt_ptr, ++local_tls_type,
+	   ++local_tlsdesc_gotent, ++symndx)
+	{
+	  *local_tlsdesc_gotent = (bfd_vma) -1;
+	  local_iplt = *local_iplt_ptr;
+	  if (local_iplt != NULL)
+	    {
+	      struct elf_dyn_relocs *p;
+
+	      if (local_iplt->root.refcount > 0)
+		{
+		  elf32_arm_allocate_plt_entry (info, TRUE,
+						&local_iplt->root,
+						&local_iplt->arm);
+		  if (local_iplt->arm.noncall_refcount == 0)
+		    /* All references to the PLT are calls, so all
+		       non-call references can resolve directly to the
+		       run-time target.  This means that the .got entry
+		       would be the same as the .igot.plt entry, so there's
+		       no point creating both.  */
+		    *local_got = 0;
+		}
+	      else
+		{
+		  BFD_ASSERT (local_iplt->arm.noncall_refcount == 0);
+		  local_iplt->root.offset = (bfd_vma) -1;
+		}
+
+	      for (p = local_iplt->dyn_relocs; p != NULL; p = p->next)
+		{
+		  asection *psrel;
+
+		  psrel = elf_section_data (p->sec)->sreloc;
+		  if (local_iplt->arm.noncall_refcount == 0)
+		    elf32_arm_allocate_irelocs (info, psrel, p->count);
+		  else
+		    elf32_arm_allocate_dynrelocs (info, psrel, p->count);
+		}
+	    }
+	  if (*local_got > 0)
+	    {
+	      Elf_Internal_Sym *isym;
+
+	      *local_got = s->size;
+	      if (*local_tls_type & GOT_TLS_GD)
+		/* TLS_GD relocs need an 8-byte structure in the GOT.  */
+		s->size += 8;
+	      if (*local_tls_type & GOT_TLS_GDESC)
+		{
+		  *local_tlsdesc_gotent = htab->root.sgotplt->size
+		    - elf32_arm_compute_jump_table_size (htab);
+		  htab->root.sgotplt->size += 8;
+		  *local_got = (bfd_vma) -2;
+		  /* plt.got_offset needs to know there's a TLS_DESC
+		     reloc in the middle of .got.plt.  */
+                  htab->num_tls_desc++;
+		}
+	      if (*local_tls_type & GOT_TLS_IE)
+		s->size += 4;
+
+	      if (*local_tls_type & GOT_NORMAL)
+		{
+		  /* If the symbol is both GD and GDESC, *local_got
+		     may have been overwritten.  */
+		  *local_got = s->size;
+		  s->size += 4;
+		}
+
+	      isym = bfd_sym_from_r_symndx (&htab->sym_cache, ibfd, symndx);
+	      if (isym == NULL)
+		return FALSE;
+
+	      /* If all references to an STT_GNU_IFUNC PLT are calls,
+		 then all non-call references, including this GOT entry,
+		 resolve directly to the run-time target.  */
+	      if (ELF32_ST_TYPE (isym->st_info) == STT_GNU_IFUNC
+		  && (local_iplt == NULL
+		      || local_iplt->arm.noncall_refcount == 0))
+		elf32_arm_allocate_irelocs (info, srel, 1);
+	      else if ((info->shared && !(*local_tls_type & GOT_TLS_GDESC))
+		       || *local_tls_type & GOT_TLS_GD)
+		elf32_arm_allocate_dynrelocs (info, srel, 1);
+
+	      if (info->shared && *local_tls_type & GOT_TLS_GDESC)
+		{
+		  elf32_arm_allocate_dynrelocs (info, htab->root.srelplt, 1);
+		  htab->tls_trampoline = -1;
+		}
+	    }
+	  else
+	    *local_got = (bfd_vma) -1;
+	}
+    }
+
+  if (htab->tls_ldm_got.refcount > 0)
+    {
+      /* Allocate two GOT entries and one dynamic relocation (if necessary)
+	 for R_ARM_TLS_LDM32 relocations.  */
+      htab->tls_ldm_got.offset = htab->root.sgot->size;
+      htab->root.sgot->size += 8;
+      if (info->shared)
+	elf32_arm_allocate_dynrelocs (info, htab->root.srelgot, 1);
+    }
+  else
+    htab->tls_ldm_got.offset = -1;
+
+  /* Allocate global sym .plt and .got entries, and space for global
+     sym dynamic relocs.  */
+  elf_link_hash_traverse (& htab->root, allocate_dynrelocs_for_symbol, info);
+
+  /* Here we rummage through the found bfds to collect glue information.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      if (! is_arm_elf (ibfd))
+	continue;
+
+      /* Initialise mapping tables for code/data.  */
+      bfd_elf32_arm_init_maps (ibfd);
+
+      if (!bfd_elf32_arm_process_before_allocation (ibfd, info)
+	  || !bfd_elf32_arm_vfp11_erratum_scan (ibfd, info))
+        /* xgettext:c-format */
+        _bfd_error_handler (_("Errors encountered processing file %s"),
+			    ibfd->filename);
+    }
+
+  /* Allocate space for the glue sections now that we've sized them.  */
+  bfd_elf32_arm_allocate_interworking_sections (info);
+
+  /* For every jump slot reserved in the sgotplt, reloc_count is
+     incremented.  However, when we reserve space for TLS descriptors,
+     it's not incremented, so in order to compute the space reserved
+     for them, it suffices to multiply the reloc count by the jump
+     slot size.  */
+  if (htab->root.srelplt)
+    htab->sgotplt_jump_table_size = elf32_arm_compute_jump_table_size(htab);
+
+  if (htab->tls_trampoline)
+    {
+      if (htab->root.splt->size == 0)
+	htab->root.splt->size += htab->plt_header_size;
+      
+      htab->tls_trampoline = htab->root.splt->size;
+      htab->root.splt->size += htab->plt_entry_size;
+      
+      /* If we're not using lazy TLS relocations, don't generate the
+         PLT and GOT entries they require.  */
+      if (!(info->flags & DF_BIND_NOW))
+	{
+	  htab->dt_tlsdesc_got = htab->root.sgot->size;
+	  htab->root.sgot->size += 4;
+
+	  htab->dt_tlsdesc_plt = htab->root.splt->size;
+	  htab->root.splt->size += 4 * ARRAY_SIZE (dl_tlsdesc_lazy_trampoline);
+	}
+    }
+
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  plt = FALSE;
+  relocs = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      const char * name;
+
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      /* It's OK to base decisions on the section name, because none
+	 of the dynobj section names depend upon the input files.  */
+      name = bfd_get_section_name (dynobj, s);
+
+      if (s == htab->root.splt)
+	{
+	  /* Remember whether there is a PLT.  */
+	  plt = s->size != 0;
+	}
+      else if (CONST_STRNEQ (name, ".rel"))
+	{
+	  if (s->size != 0)
+	    {
+	      /* Remember whether there are any reloc sections other
+		 than .rel(a).plt and .rela.plt.unloaded.  */
+	      if (s != htab->root.srelplt && s != htab->srelplt2)
+		relocs = TRUE;
+
+	      /* We use the reloc_count field as a counter if we need
+		 to copy relocs into the output file.  */
+	      s->reloc_count = 0;
+	    }
+	}
+      else if (s != htab->root.sgot
+	       && s != htab->root.sgotplt
+	       && s != htab->root.iplt
+	       && s != htab->root.igotplt
+	       && s != htab->sdynbss)
+	{
+	  /* It's not one of our sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (s->size == 0)
+	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is mostly to handle .rel(a).bss and
+	     .rel(a).plt.  We must create both sections in
+	     create_dynamic_sections, because they must be created
+	     before the linker maps input sections to output
+	     sections.  The linker does that before
+	     adjust_dynamic_symbol is called, and it is that
+	     function which decides whether anything needs to go
+	     into these sections.  */
+	  s->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents.  */
+      s->contents = (unsigned char *) bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in elf32_arm_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+     if (info->executable)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (plt)
+	{
+	  if (   !add_dynamic_entry (DT_PLTGOT, 0)
+	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL,
+				     htab->use_rel ? DT_REL : DT_RELA)
+	      || !add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+
+	  if (htab->dt_tlsdesc_plt &&
+		(!add_dynamic_entry (DT_TLSDESC_PLT,0) 
+		 || !add_dynamic_entry (DT_TLSDESC_GOT,0)))
+	    return FALSE; 
+	}
+
+      if (relocs)
+	{
+	  if (htab->use_rel)
+	    {
+	      if (!add_dynamic_entry (DT_REL, 0)
+		  || !add_dynamic_entry (DT_RELSZ, 0)
+		  || !add_dynamic_entry (DT_RELENT, RELOC_SIZE (htab)))
+		return FALSE;
+	    }
+	  else
+	    {
+	      if (!add_dynamic_entry (DT_RELA, 0)
+		  || !add_dynamic_entry (DT_RELASZ, 0)
+		  || !add_dynamic_entry (DT_RELAENT, RELOC_SIZE (htab)))
+		return FALSE;
+	    }
+	}
+
+      /* If any dynamic relocs apply to a read-only section,
+	 then we need a DT_TEXTREL entry.  */
+      if ((info->flags & DF_TEXTREL) == 0)
+	elf_link_hash_traverse (& htab->root, elf32_arm_readonly_dynrelocs,
+				info);
+
+      if ((info->flags & DF_TEXTREL) != 0)
+	{
+	  if (!add_dynamic_entry (DT_TEXTREL, 0))
+	    return FALSE;
+	}
+      if (htab->vxworks_p
+	  && !elf_vxworks_add_dynamic_entries (output_bfd, info))
+	return FALSE;
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+/* Size sections even though they're not dynamic.  We use it to setup
+   _TLS_MODULE_BASE_, if needed.  */
+
+static bfd_boolean
+elf32_arm_always_size_sections (bfd *output_bfd,
+	                        struct bfd_link_info *info)
+{
+  asection *tls_sec;
+
+  if (info->relocatable)
+    return TRUE;
+
+  tls_sec = elf_hash_table (info)->tls_sec;
+
+  if (tls_sec)
+    {
+      struct elf_link_hash_entry *tlsbase;
+
+      tlsbase = elf_link_hash_lookup
+	(elf_hash_table (info), "_TLS_MODULE_BASE_", TRUE, TRUE, FALSE);
+
+      if (tlsbase)
+        {
+          struct bfd_link_hash_entry *bh = NULL;
+	  const struct elf_backend_data *bed
+            = get_elf_backend_data (output_bfd);
+
+          if (!(_bfd_generic_link_add_one_symbol
+		(info, output_bfd, "_TLS_MODULE_BASE_", BSF_LOCAL,
+		 tls_sec, 0, NULL, FALSE,
+		 bed->collect, &bh)))
+	    return FALSE;
+	  
+      	  tlsbase->type = STT_TLS;
+          tlsbase = (struct elf_link_hash_entry *)bh;
+          tlsbase->def_regular = 1;
+          tlsbase->other = STV_HIDDEN;
+          (*bed->elf_backend_hide_symbol) (info, tlsbase, TRUE);
+	}
+    }
+  return TRUE;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+elf32_arm_finish_dynamic_symbol (bfd * output_bfd,
+				 struct bfd_link_info * info,
+				 struct elf_link_hash_entry * h,
+				 Elf_Internal_Sym * sym)
+{
+  struct elf32_arm_link_hash_table *htab;
+  struct elf32_arm_link_hash_entry *eh;
+
+  htab = elf32_arm_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  eh = (struct elf32_arm_link_hash_entry *) h;
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      if (!eh->is_iplt)
+	{
+	  BFD_ASSERT (h->dynindx != -1);
+	  elf32_arm_populate_plt_entry (output_bfd, info, &h->plt, &eh->plt,
+					h->dynindx, 0);
+	}
+
+      if (!h->def_regular)
+	{
+	  /* Mark the symbol as undefined, rather than as defined in
+	     the .plt section.  Leave the value alone.  */
+	  sym->st_shndx = SHN_UNDEF;
+	  /* If the symbol is weak, we do need to clear the value.
+	     Otherwise, the PLT entry would provide a definition for
+	     the symbol even if the symbol wasn't defined anywhere,
+	     and so the symbol would never be NULL.  */
+	  if (!h->ref_regular_nonweak)
+	    sym->st_value = 0;
+	}
+      else if (eh->is_iplt && eh->plt.noncall_refcount != 0)
+	{
+	  /* At least one non-call relocation references this .iplt entry,
+	     so the .iplt entry is the function's canonical address.  */
+	  sym->st_info = ELF_ST_INFO (ELF_ST_BIND (sym->st_info), STT_FUNC);
+	  sym->st_target_internal = ST_BRANCH_TO_ARM;
+	  sym->st_shndx = (_bfd_elf_section_from_bfd_section
+			   (output_bfd, htab->root.iplt->output_section));
+	  sym->st_value = (h->plt.offset
+			   + htab->root.iplt->output_section->vma
+			   + htab->root.iplt->output_offset);
+	}
+    }
+
+  if (h->needs_copy)
+    {
+      asection * s;
+      Elf_Internal_Rela rel;
+
+      /* This symbol needs a copy reloc.  Set it up.  */
+      BFD_ASSERT (h->dynindx != -1
+		  && (h->root.type == bfd_link_hash_defined
+		      || h->root.type == bfd_link_hash_defweak));
+
+      s = htab->srelbss;
+      BFD_ASSERT (s != NULL);
+
+      rel.r_addend = 0;
+      rel.r_offset = (h->root.u.def.value
+		      + h->root.u.def.section->output_section->vma
+		      + h->root.u.def.section->output_offset);
+      rel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_COPY);
+      elf32_arm_add_dynreloc (output_bfd, info, s, &rel);
+    }
+
+  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  On VxWorks,
+     the _GLOBAL_OFFSET_TABLE_ symbol is not absolute: it is relative
+     to the ".got" section.  */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+      || (!htab->vxworks_p && h == htab->root.hgot))
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+static void
+arm_put_trampoline (struct elf32_arm_link_hash_table *htab, bfd *output_bfd,
+		    void *contents,
+		    const unsigned long *template, unsigned count)
+{
+  unsigned ix;
+  
+  for (ix = 0; ix != count; ix++)
+    {
+      unsigned long insn = template[ix];
+
+      /* Emit mov pc,rx if bx is not permitted.  */
+      if (htab->fix_v4bx == 1 && (insn & 0x0ffffff0) == 0x012fff10)
+	insn = (insn & 0xf000000f) | 0x01a0f000;
+      put_arm_insn (htab, output_bfd, insn, (char *)contents + ix*4);
+    }
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+elf32_arm_finish_dynamic_sections (bfd * output_bfd, struct bfd_link_info * info)
+{
+  bfd * dynobj;
+  asection * sgot;
+  asection * sdyn;
+  struct elf32_arm_link_hash_table *htab;
+
+  htab = elf32_arm_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  sgot = htab->root.sgotplt;
+  /* A broken linker script might have discarded the dynamic sections.
+     Catch this here so that we do not seg-fault later on.  */
+  if (sgot != NULL && bfd_is_abs_section (sgot->output_section))
+    return FALSE;
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      asection *splt;
+      Elf32_External_Dyn *dyncon, *dynconend;
+
+      splt = htab->root.splt;
+      BFD_ASSERT (splt != NULL && sdyn != NULL);
+      BFD_ASSERT (htab->symbian_p || sgot != NULL);
+
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+	  const char * name;
+	  asection * s;
+
+	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	      unsigned int type;
+
+	    default:
+	      if (htab->vxworks_p
+		  && elf_vxworks_finish_dynamic_entry (output_bfd, &dyn))
+		bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_HASH:
+	      name = ".hash";
+	      goto get_vma_if_bpabi;
+	    case DT_STRTAB:
+	      name = ".dynstr";
+	      goto get_vma_if_bpabi;
+	    case DT_SYMTAB:
+	      name = ".dynsym";
+	      goto get_vma_if_bpabi;
+	    case DT_VERSYM:
+	      name = ".gnu.version";
+	      goto get_vma_if_bpabi;
+	    case DT_VERDEF:
+	      name = ".gnu.version_d";
+	      goto get_vma_if_bpabi;
+	    case DT_VERNEED:
+	      name = ".gnu.version_r";
+	      goto get_vma_if_bpabi;
+
+	    case DT_PLTGOT:
+	      name = ".got";
+	      goto get_vma;
+	    case DT_JMPREL:
+	      name = RELOC_SECTION (htab, ".plt");
+	    get_vma:
+	      s = bfd_get_section_by_name (output_bfd, name);
+	      BFD_ASSERT (s != NULL);
+	      if (!htab->symbian_p)
+		dyn.d_un.d_ptr = s->vma;
+	      else
+		/* In the BPABI, tags in the PT_DYNAMIC section point
+		   at the file offset, not the memory address, for the
+		   convenience of the post linker.  */
+		dyn.d_un.d_ptr = s->filepos;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    get_vma_if_bpabi:
+	      if (htab->symbian_p)
+		goto get_vma;
+	      break;
+
+	    case DT_PLTRELSZ:
+	      s = htab->root.srelplt;
+	      BFD_ASSERT (s != NULL);
+	      dyn.d_un.d_val = s->size;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_RELSZ:
+	    case DT_RELASZ:
+	      if (!htab->symbian_p)
+		{
+		  /* My reading of the SVR4 ABI indicates that the
+		     procedure linkage table relocs (DT_JMPREL) should be
+		     included in the overall relocs (DT_REL).  This is
+		     what Solaris does.  However, UnixWare can not handle
+		     that case.  Therefore, we override the DT_RELSZ entry
+		     here to make it not include the JMPREL relocs.  Since
+		     the linker script arranges for .rel(a).plt to follow all
+		     other relocation sections, we don't have to worry
+		     about changing the DT_REL entry.  */
+		  s = htab->root.srelplt;
+		  if (s != NULL)
+		    dyn.d_un.d_val -= s->size;
+		  bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+		  break;
+		}
+	      /* Fall through.  */
+
+	    case DT_REL:
+	    case DT_RELA:
+	      /* In the BPABI, the DT_REL tag must point at the file
+		 offset, not the VMA, of the first relocation
+		 section.  So, we use code similar to that in
+		 elflink.c, but do not check for SHF_ALLOC on the
+		 relcoation section, since relocations sections are
+		 never allocated under the BPABI.  The comments above
+		 about Unixware notwithstanding, we include all of the
+		 relocations here.  */
+	      if (htab->symbian_p)
+		{
+		  unsigned int i;
+		  type = ((dyn.d_tag == DT_REL || dyn.d_tag == DT_RELSZ)
+			  ? SHT_REL : SHT_RELA);
+		  dyn.d_un.d_val = 0;
+		  for (i = 1; i < elf_numsections (output_bfd); i++)
+		    {
+		      Elf_Internal_Shdr *hdr
+			= elf_elfsections (output_bfd)[i];
+		      if (hdr->sh_type == type)
+			{
+			  if (dyn.d_tag == DT_RELSZ
+			      || dyn.d_tag == DT_RELASZ)
+			    dyn.d_un.d_val += hdr->sh_size;
+			  else if ((ufile_ptr) hdr->sh_offset
+				   <= dyn.d_un.d_val - 1)
+			    dyn.d_un.d_val = hdr->sh_offset;
+			}
+		    }
+		  bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+		}
+	      break;
+
+	    case DT_TLSDESC_PLT:
+              s = htab->root.splt;
+	      dyn.d_un.d_ptr = (s->output_section->vma + s->output_offset
+				+ htab->dt_tlsdesc_plt);
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_TLSDESC_GOT:
+              s = htab->root.sgot;
+	      dyn.d_un.d_ptr = (s->output_section->vma + s->output_offset
+		      		+ htab->dt_tlsdesc_got);
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	      /* Set the bottom bit of DT_INIT/FINI if the
+		 corresponding function is Thumb.  */
+	    case DT_INIT:
+	      name = info->init_function;
+	      goto get_sym;
+	    case DT_FINI:
+	      name = info->fini_function;
+	    get_sym:
+	      /* If it wasn't set by elf_bfd_final_link
+		 then there is nothing to adjust.  */
+	      if (dyn.d_un.d_val != 0)
+		{
+		  struct elf_link_hash_entry * eh;
+
+		  eh = elf_link_hash_lookup (elf_hash_table (info), name,
+					     FALSE, FALSE, TRUE);
+		  if (eh != NULL && eh->target_internal == ST_BRANCH_TO_THUMB)
+		    {
+		      dyn.d_un.d_val |= 1;
+		      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+		    }
+		}
+	      break;
+	    }
+	}
+
+      /* Fill in the first entry in the procedure linkage table.  */
+      if (splt->size > 0 && htab->plt_header_size)
+	{
+	  const bfd_vma *plt0_entry;
+	  bfd_vma got_address, plt_address, got_displacement;
+
+	  /* Calculate the addresses of the GOT and PLT.  */
+	  got_address = sgot->output_section->vma + sgot->output_offset;
+	  plt_address = splt->output_section->vma + splt->output_offset;
+
+	  if (htab->vxworks_p)
+	    {
+	      /* The VxWorks GOT is relocated by the dynamic linker.
+		 Therefore, we must emit relocations rather than simply
+		 computing the values now.  */
+	      Elf_Internal_Rela rel;
+
+	      plt0_entry = elf32_arm_vxworks_exec_plt0_entry;
+	      put_arm_insn (htab, output_bfd, plt0_entry[0],
+			    splt->contents + 0);
+	      put_arm_insn (htab, output_bfd, plt0_entry[1],
+			    splt->contents + 4);
+	      put_arm_insn (htab, output_bfd, plt0_entry[2],
+			    splt->contents + 8);
+	      bfd_put_32 (output_bfd, got_address, splt->contents + 12);
+
+	      /* Generate a relocation for _GLOBAL_OFFSET_TABLE_.  */
+	      rel.r_offset = plt_address + 12;
+	      rel.r_info = ELF32_R_INFO (htab->root.hgot->indx, R_ARM_ABS32);
+	      rel.r_addend = 0;
+	      SWAP_RELOC_OUT (htab) (output_bfd, &rel,
+				     htab->srelplt2->contents);
+	    }
+	  else
+	    {
+	      got_displacement = got_address - (plt_address + 16);
+
+	      plt0_entry = elf32_arm_plt0_entry;
+	      put_arm_insn (htab, output_bfd, plt0_entry[0],
+			    splt->contents + 0);
+	      put_arm_insn (htab, output_bfd, plt0_entry[1],
+			    splt->contents + 4);
+	      put_arm_insn (htab, output_bfd, plt0_entry[2],
+			    splt->contents + 8);
+	      put_arm_insn (htab, output_bfd, plt0_entry[3],
+			    splt->contents + 12);
+
+#ifdef FOUR_WORD_PLT
+	      /* The displacement value goes in the otherwise-unused
+		 last word of the second entry.  */
+	      bfd_put_32 (output_bfd, got_displacement, splt->contents + 28);
+#else
+	      bfd_put_32 (output_bfd, got_displacement, splt->contents + 16);
+#endif
+	    }
+	}
+
+      /* UnixWare sets the entsize of .plt to 4, although that doesn't
+	 really seem like the right value.  */
+      if (splt->output_section->owner == output_bfd)
+	elf_section_data (splt->output_section)->this_hdr.sh_entsize = 4;
+
+      if (htab->dt_tlsdesc_plt)
+	{
+	  bfd_vma got_address
+	    = sgot->output_section->vma + sgot->output_offset;
+	  bfd_vma gotplt_address = (htab->root.sgot->output_section->vma
+				    + htab->root.sgot->output_offset);
+	  bfd_vma plt_address
+	    = splt->output_section->vma + splt->output_offset;
+
+	  arm_put_trampoline (htab, output_bfd, 
+			      splt->contents + htab->dt_tlsdesc_plt,
+			      dl_tlsdesc_lazy_trampoline, 6);
+
+	  bfd_put_32 (output_bfd,
+		      gotplt_address + htab->dt_tlsdesc_got
+		      - (plt_address + htab->dt_tlsdesc_plt)
+		      - dl_tlsdesc_lazy_trampoline[6],
+		      splt->contents + htab->dt_tlsdesc_plt + 24);
+	  bfd_put_32 (output_bfd,
+		      got_address - (plt_address + htab->dt_tlsdesc_plt)
+		      - dl_tlsdesc_lazy_trampoline[7],
+		      splt->contents + htab->dt_tlsdesc_plt + 24 + 4);
+	}
+
+      if (htab->tls_trampoline)
+	{
+	  arm_put_trampoline (htab, output_bfd, 
+			      splt->contents + htab->tls_trampoline,
+			      tls_trampoline, 3);
+#ifdef FOUR_WORD_PLT
+	  bfd_put_32 (output_bfd, 0x00000000,
+		      splt->contents + htab->tls_trampoline + 12);
+#endif 
+	}
+
+      if (htab->vxworks_p && !info->shared && htab->root.splt->size > 0)
+	{
+	  /* Correct the .rel(a).plt.unloaded relocations.  They will have
+	     incorrect symbol indexes.  */
+	  int num_plts;
+	  unsigned char *p;
+
+	  num_plts = ((htab->root.splt->size - htab->plt_header_size)
+		      / htab->plt_entry_size);
+	  p = htab->srelplt2->contents + RELOC_SIZE (htab);
+
+	  for (; num_plts; num_plts--)
+	    {
+	      Elf_Internal_Rela rel;
+
+	      SWAP_RELOC_IN (htab) (output_bfd, p, &rel);
+	      rel.r_info = ELF32_R_INFO (htab->root.hgot->indx, R_ARM_ABS32);
+	      SWAP_RELOC_OUT (htab) (output_bfd, &rel, p);
+	      p += RELOC_SIZE (htab);
+
+	      SWAP_RELOC_IN (htab) (output_bfd, p, &rel);
+	      rel.r_info = ELF32_R_INFO (htab->root.hplt->indx, R_ARM_ABS32);
+	      SWAP_RELOC_OUT (htab) (output_bfd, &rel, p);
+	      p += RELOC_SIZE (htab);
+	    }
+	}
+    }
+
+  /* Fill in the first three entries in the global offset table.  */
+  if (sgot)
+    {
+      if (sgot->size > 0)
+	{
+	  if (sdyn == NULL)
+	    bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents);
+	  else
+	    bfd_put_32 (output_bfd,
+			sdyn->output_section->vma + sdyn->output_offset,
+			sgot->contents);
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 4);
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 8);
+	}
+
+      elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
+    }
+
+  return TRUE;
+}
+
+static void
+elf32_arm_post_process_headers (bfd * abfd, struct bfd_link_info * link_info ATTRIBUTE_UNUSED)
+{
+  Elf_Internal_Ehdr * i_ehdrp;	/* ELF file header, internal form.  */
+  struct elf32_arm_link_hash_table *globals;
+
+  i_ehdrp = elf_elfheader (abfd);
+
+  if (EF_ARM_EABI_VERSION (i_ehdrp->e_flags) == EF_ARM_EABI_UNKNOWN)
+    i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_ARM;
+  else
+    i_ehdrp->e_ident[EI_OSABI] = 0;
+  i_ehdrp->e_ident[EI_ABIVERSION] = ARM_ELF_ABI_VERSION;
+
+  if (link_info)
+    {
+      globals = elf32_arm_hash_table (link_info);
+      if (globals != NULL && globals->byteswap_code)
+	i_ehdrp->e_flags |= EF_ARM_BE8;
+    }
+}
+
+static enum elf_reloc_type_class
+elf32_arm_reloc_type_class (const Elf_Internal_Rela *rela)
+{
+  switch ((int) ELF32_R_TYPE (rela->r_info))
+    {
+    case R_ARM_RELATIVE:
+      return reloc_class_relative;
+    case R_ARM_JUMP_SLOT:
+      return reloc_class_plt;
+    case R_ARM_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+static void
+elf32_arm_final_write_processing (bfd *abfd, bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  bfd_arm_update_notes (abfd, ARM_NOTE_SECTION);
+}
+
+/* Return TRUE if this is an unwinding table entry.  */
+
+static bfd_boolean
+is_arm_elf_unwind_section_name (bfd * abfd ATTRIBUTE_UNUSED, const char * name)
+{
+  return (CONST_STRNEQ (name, ELF_STRING_ARM_unwind)
+	  || CONST_STRNEQ (name, ELF_STRING_ARM_unwind_once));
+}
+
+
+/* Set the type and flags for an ARM section.  We do this by
+   the section name, which is a hack, but ought to work.  */
+
+static bfd_boolean
+elf32_arm_fake_sections (bfd * abfd, Elf_Internal_Shdr * hdr, asection * sec)
+{
+  const char * name;
+
+  name = bfd_get_section_name (abfd, sec);
+
+  if (is_arm_elf_unwind_section_name (abfd, name))
+    {
+      hdr->sh_type = SHT_ARM_EXIDX;
+      hdr->sh_flags |= SHF_LINK_ORDER;
+    }
+  return TRUE;
+}
+
+/* Handle an ARM specific section when reading an object file.  This is
+   called when bfd_section_from_shdr finds a section with an unknown
+   type.  */
+
+static bfd_boolean
+elf32_arm_section_from_shdr (bfd *abfd,
+			     Elf_Internal_Shdr * hdr,
+			     const char *name,
+			     int shindex)
+{
+  /* There ought to be a place to keep ELF backend specific flags, but
+     at the moment there isn't one.  We just keep track of the
+     sections by their name, instead.  Fortunately, the ABI gives
+     names for all the ARM specific sections, so we will probably get
+     away with this.  */
+  switch (hdr->sh_type)
+    {
+    case SHT_ARM_EXIDX:
+    case SHT_ARM_PREEMPTMAP:
+    case SHT_ARM_ATTRIBUTES:
+      break;
+
+    default:
+      return FALSE;
+    }
+
+  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex))
+    return FALSE;
+
+  return TRUE;
+}
+
+static _arm_elf_section_data *
+get_arm_elf_section_data (asection * sec)
+{
+  if (sec && sec->owner && is_arm_elf (sec->owner))
+    return elf32_arm_section_data (sec);
+  else
+    return NULL;
+}
+
+typedef struct
+{
+  void *finfo;
+  struct bfd_link_info *info;
+  asection *sec;
+  int sec_shndx;
+  int (*func) (void *, const char *, Elf_Internal_Sym *,
+	       asection *, struct elf_link_hash_entry *);
+} output_arch_syminfo;
+
+enum map_symbol_type
+{
+  ARM_MAP_ARM,
+  ARM_MAP_THUMB,
+  ARM_MAP_DATA
+};
+
+
+/* Output a single mapping symbol.  */
+
+static bfd_boolean
+elf32_arm_output_map_sym (output_arch_syminfo *osi,
+			  enum map_symbol_type type,
+			  bfd_vma offset)
+{
+  static const char *names[3] = {"$a", "$t", "$d"};
+  Elf_Internal_Sym sym;
+
+  sym.st_value = osi->sec->output_section->vma
+		 + osi->sec->output_offset
+		 + offset;
+  sym.st_size = 0;
+  sym.st_other = 0;
+  sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_NOTYPE);
+  sym.st_shndx = osi->sec_shndx;
+  sym.st_target_internal = 0;
+  elf32_arm_section_map_add (osi->sec, names[type][1], offset);
+  return osi->func (osi->finfo, names[type], &sym, osi->sec, NULL) == 1;
+}
+
+/* Output mapping symbols for the PLT entry described by ROOT_PLT and ARM_PLT.
+   IS_IPLT_ENTRY_P says whether the PLT is in .iplt rather than .plt.  */
+
+static bfd_boolean
+elf32_arm_output_plt_map_1 (output_arch_syminfo *osi,
+			    bfd_boolean is_iplt_entry_p,
+			    union gotplt_union *root_plt,
+			    struct arm_plt_info *arm_plt)
+{
+  struct elf32_arm_link_hash_table *htab;
+  bfd_vma addr, plt_header_size;
+
+  if (root_plt->offset == (bfd_vma) -1)
+    return TRUE;
+
+  htab = elf32_arm_hash_table (osi->info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (is_iplt_entry_p)
+    {
+      osi->sec = htab->root.iplt;
+      plt_header_size = 0;
+    }
+  else
+    {
+      osi->sec = htab->root.splt;
+      plt_header_size = htab->plt_header_size;
+    }
+  osi->sec_shndx = (_bfd_elf_section_from_bfd_section
+		    (osi->info->output_bfd, osi->sec->output_section));
+
+  addr = root_plt->offset & -2;
+  if (htab->symbian_p)
+    {
+      if (!elf32_arm_output_map_sym (osi, ARM_MAP_ARM, addr))
+	return FALSE;
+      if (!elf32_arm_output_map_sym (osi, ARM_MAP_DATA, addr + 4))
+	return FALSE;
+    }
+  else if (htab->vxworks_p)
+    {
+      if (!elf32_arm_output_map_sym (osi, ARM_MAP_ARM, addr))
+	return FALSE;
+      if (!elf32_arm_output_map_sym (osi, ARM_MAP_DATA, addr + 8))
+	return FALSE;
+      if (!elf32_arm_output_map_sym (osi, ARM_MAP_ARM, addr + 12))
+	return FALSE;
+      if (!elf32_arm_output_map_sym (osi, ARM_MAP_DATA, addr + 20))
+	return FALSE;
+    }
+  else
+    {
+      bfd_boolean thumb_stub_p;
+
+      thumb_stub_p = elf32_arm_plt_needs_thumb_stub_p (osi->info, arm_plt);
+      if (thumb_stub_p)
+	{
+	  if (!elf32_arm_output_map_sym (osi, ARM_MAP_THUMB, addr - 4))
+	    return FALSE;
+	}
+#ifdef FOUR_WORD_PLT
+      if (!elf32_arm_output_map_sym (osi, ARM_MAP_ARM, addr))
+	return FALSE;
+      if (!elf32_arm_output_map_sym (osi, ARM_MAP_DATA, addr + 12))
+	return FALSE;
+#else
+      /* A three-word PLT with no Thumb thunk contains only Arm code,
+	 so only need to output a mapping symbol for the first PLT entry and
+	 entries with thumb thunks.  */
+      if (thumb_stub_p || addr == plt_header_size)
+	{
+	  if (!elf32_arm_output_map_sym (osi, ARM_MAP_ARM, addr))
+	    return FALSE;
+	}
+#endif
+    }
+
+  return TRUE;
+}
+
+/* Output mapping symbols for PLT entries associated with H.  */
+
+static bfd_boolean
+elf32_arm_output_plt_map (struct elf_link_hash_entry *h, void *inf)
+{
+  output_arch_syminfo *osi = (output_arch_syminfo *) inf;
+  struct elf32_arm_link_hash_entry *eh;
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  if (h->root.type == bfd_link_hash_warning)
+    /* When warning symbols are created, they **replace** the "real"
+       entry in the hash table, thus we never get to see the real
+       symbol in a hash traversal.  So look at it now.  */
+    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+  eh = (struct elf32_arm_link_hash_entry *) h;
+  return elf32_arm_output_plt_map_1 (osi, SYMBOL_CALLS_LOCAL (osi->info, h),
+				     &h->plt, &eh->plt);
+}
+
+/* Output a single local symbol for a generated stub.  */
+
+static bfd_boolean
+elf32_arm_output_stub_sym (output_arch_syminfo *osi, const char *name,
+			   bfd_vma offset, bfd_vma size)
+{
+  Elf_Internal_Sym sym;
+
+  sym.st_value = osi->sec->output_section->vma
+		 + osi->sec->output_offset
+		 + offset;
+  sym.st_size = size;
+  sym.st_other = 0;
+  sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_FUNC);
+  sym.st_shndx = osi->sec_shndx;
+  sym.st_target_internal = 0;
+  return osi->func (osi->finfo, name, &sym, osi->sec, NULL) == 1;
+}
+
+static bfd_boolean
+arm_map_one_stub (struct bfd_hash_entry * gen_entry,
+		  void * in_arg)
+{
+  struct elf32_arm_stub_hash_entry *stub_entry;
+  asection *stub_sec;
+  bfd_vma addr;
+  char *stub_name;
+  output_arch_syminfo *osi;
+  const insn_sequence *template_sequence;
+  enum stub_insn_type prev_type;
+  int size;
+  int i;
+  enum map_symbol_type sym_type;
+
+  /* Massage our args to the form they really have.  */
+  stub_entry = (struct elf32_arm_stub_hash_entry *) gen_entry;
+  osi = (output_arch_syminfo *) in_arg;
+
+  stub_sec = stub_entry->stub_sec;
+
+  /* Ensure this stub is attached to the current section being
+     processed.  */
+  if (stub_sec != osi->sec)
+    return TRUE;
+
+  addr = (bfd_vma) stub_entry->stub_offset;
+  stub_name = stub_entry->output_name;
+
+  template_sequence = stub_entry->stub_template;
+  switch (template_sequence[0].type)
+    {
+    case ARM_TYPE:
+      if (!elf32_arm_output_stub_sym (osi, stub_name, addr, stub_entry->stub_size))
+	return FALSE;
+      break;
+    case THUMB16_TYPE:
+    case THUMB32_TYPE:
+      if (!elf32_arm_output_stub_sym (osi, stub_name, addr | 1,
+				      stub_entry->stub_size))
+	return FALSE;
+      break;
+    default:
+      BFD_FAIL ();
+      return 0;
+    }
+
+  prev_type = DATA_TYPE;
+  size = 0;
+  for (i = 0; i < stub_entry->stub_template_size; i++)
+    {
+      switch (template_sequence[i].type)
+	{
+	case ARM_TYPE:
+	  sym_type = ARM_MAP_ARM;
+	  break;
+
+	case THUMB16_TYPE:
+	case THUMB32_TYPE:
+	  sym_type = ARM_MAP_THUMB;
+	  break;
+
+	case DATA_TYPE:
+	  sym_type = ARM_MAP_DATA;
+	  break;
+
+	default:
+	  BFD_FAIL ();
+	  return FALSE;
+	}
+
+      if (template_sequence[i].type != prev_type)
+	{
+	  prev_type = template_sequence[i].type;
+	  if (!elf32_arm_output_map_sym (osi, sym_type, addr + size))
+	    return FALSE;
+	}
+
+      switch (template_sequence[i].type)
+	{
+	case ARM_TYPE:
+	case THUMB32_TYPE:
+	  size += 4;
+	  break;
+
+	case THUMB16_TYPE:
+	  size += 2;
+	  break;
+
+	case DATA_TYPE:
+	  size += 4;
+	  break;
+
+	default:
+	  BFD_FAIL ();
+	  return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Output mapping symbols for linker generated sections,
+   and for those data-only sections that do not have a
+   $d.  */
+
+static bfd_boolean
+elf32_arm_output_arch_local_syms (bfd *output_bfd,
+				  struct bfd_link_info *info,
+				  void *finfo,
+				  int (*func) (void *, const char *,
+					       Elf_Internal_Sym *,
+					       asection *,
+					       struct elf_link_hash_entry *))
+{
+  output_arch_syminfo osi;
+  struct elf32_arm_link_hash_table *htab;
+  bfd_vma offset;
+  bfd_size_type size;
+  bfd *input_bfd;
+
+  htab = elf32_arm_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  check_use_blx (htab);
+
+  osi.finfo = finfo;
+  osi.info = info;
+  osi.func = func;
+
+  /* Add a $d mapping symbol to data-only sections that
+     don't have any mapping symbol.  This may result in (harmless) redundant
+     mapping symbols.  */
+  for (input_bfd = info->input_bfds;
+       input_bfd != NULL;
+       input_bfd = input_bfd->link_next)
+    {
+      if ((input_bfd->flags & (BFD_LINKER_CREATED | HAS_SYMS)) == HAS_SYMS)
+	for (osi.sec = input_bfd->sections;
+	     osi.sec != NULL;
+	     osi.sec = osi.sec->next)
+	  {
+	    if (osi.sec->output_section != NULL
+		&& ((osi.sec->output_section->flags & (SEC_ALLOC | SEC_CODE))
+		    != 0)
+		&& (osi.sec->flags & (SEC_HAS_CONTENTS | SEC_LINKER_CREATED))
+		   == SEC_HAS_CONTENTS
+		&& get_arm_elf_section_data (osi.sec) != NULL
+		&& get_arm_elf_section_data (osi.sec)->mapcount == 0
+		&& osi.sec->size > 0
+		&& (osi.sec->flags & SEC_EXCLUDE) == 0)
+	      {
+		osi.sec_shndx = _bfd_elf_section_from_bfd_section
+		  (output_bfd, osi.sec->output_section);
+		if (osi.sec_shndx != (int)SHN_BAD)
+		  elf32_arm_output_map_sym (&osi, ARM_MAP_DATA, 0);
+	      }
+	  }
+    }
+
+  /* ARM->Thumb glue.  */
+  if (htab->arm_glue_size > 0)
+    {
+      osi.sec = bfd_get_section_by_name (htab->bfd_of_glue_owner,
+					 ARM2THUMB_GLUE_SECTION_NAME);
+
+      osi.sec_shndx = _bfd_elf_section_from_bfd_section
+	  (output_bfd, osi.sec->output_section);
+      if (info->shared || htab->root.is_relocatable_executable
+	  || htab->pic_veneer)
+	size = ARM2THUMB_PIC_GLUE_SIZE;
+      else if (htab->use_blx)
+	size = ARM2THUMB_V5_STATIC_GLUE_SIZE;
+      else
+	size = ARM2THUMB_STATIC_GLUE_SIZE;
+
+      for (offset = 0; offset < htab->arm_glue_size; offset += size)
+	{
+	  elf32_arm_output_map_sym (&osi, ARM_MAP_ARM, offset);
+	  elf32_arm_output_map_sym (&osi, ARM_MAP_DATA, offset + size - 4);
+	}
+    }
+
+  /* Thumb->ARM glue.  */
+  if (htab->thumb_glue_size > 0)
+    {
+      osi.sec = bfd_get_section_by_name (htab->bfd_of_glue_owner,
+					 THUMB2ARM_GLUE_SECTION_NAME);
+
+      osi.sec_shndx = _bfd_elf_section_from_bfd_section
+	  (output_bfd, osi.sec->output_section);
+      size = THUMB2ARM_GLUE_SIZE;
+
+      for (offset = 0; offset < htab->thumb_glue_size; offset += size)
+	{
+	  elf32_arm_output_map_sym (&osi, ARM_MAP_THUMB, offset);
+	  elf32_arm_output_map_sym (&osi, ARM_MAP_ARM, offset + 4);
+	}
+    }
+
+  /* ARMv4 BX veneers.  */
+  if (htab->bx_glue_size > 0)
+    {
+      osi.sec = bfd_get_section_by_name (htab->bfd_of_glue_owner,
+					 ARM_BX_GLUE_SECTION_NAME);
+
+      osi.sec_shndx = _bfd_elf_section_from_bfd_section
+	  (output_bfd, osi.sec->output_section);
+
+      elf32_arm_output_map_sym (&osi, ARM_MAP_ARM, 0);
+    }
+
+  /* Long calls stubs.  */
+  if (htab->stub_bfd && htab->stub_bfd->sections)
+    {
+      asection* stub_sec;
+
+      for (stub_sec = htab->stub_bfd->sections;
+	   stub_sec != NULL;
+	   stub_sec = stub_sec->next)
+	{
+	  /* Ignore non-stub sections.  */
+	  if (!strstr (stub_sec->name, STUB_SUFFIX))
+	    continue;
+
+	  osi.sec = stub_sec;
+
+	  osi.sec_shndx = _bfd_elf_section_from_bfd_section
+	    (output_bfd, osi.sec->output_section);
+
+	  bfd_hash_traverse (&htab->stub_hash_table, arm_map_one_stub, &osi);
+	}
+    }
+
+  /* Finally, output mapping symbols for the PLT.  */
+  if (htab->root.splt && htab->root.splt->size > 0)
+    {
+      osi.sec = htab->root.splt;
+      osi.sec_shndx = (_bfd_elf_section_from_bfd_section
+		       (output_bfd, osi.sec->output_section));
+
+      /* Output mapping symbols for the plt header.  SymbianOS does not have a
+	 plt header.  */
+      if (htab->vxworks_p)
+	{
+	  /* VxWorks shared libraries have no PLT header.  */
+	  if (!info->shared)
+	    {
+	      if (!elf32_arm_output_map_sym (&osi, ARM_MAP_ARM, 0))
+		return FALSE;
+	      if (!elf32_arm_output_map_sym (&osi, ARM_MAP_DATA, 12))
+		return FALSE;
+	    }
+	}
+      else if (!htab->symbian_p)
+	{
+	  if (!elf32_arm_output_map_sym (&osi, ARM_MAP_ARM, 0))
+	    return FALSE;
+#ifndef FOUR_WORD_PLT
+	  if (!elf32_arm_output_map_sym (&osi, ARM_MAP_DATA, 16))
+	    return FALSE;
+#endif
+	}
+    }
+  if ((htab->root.splt && htab->root.splt->size > 0)
+      || (htab->root.iplt && htab->root.iplt->size > 0))
+    {
+      elf_link_hash_traverse (&htab->root, elf32_arm_output_plt_map, &osi);
+      for (input_bfd = info->input_bfds;
+	   input_bfd != NULL;
+	   input_bfd = input_bfd->link_next)
+	{
+	  struct arm_local_iplt_info **local_iplt;
+	  unsigned int i, num_syms;
+
+	  local_iplt = elf32_arm_local_iplt (input_bfd);
+	  if (local_iplt != NULL)
+	    {
+	      num_syms = elf_symtab_hdr (input_bfd).sh_info;
+	      for (i = 0; i < num_syms; i++)
+		if (local_iplt[i] != NULL
+		    && !elf32_arm_output_plt_map_1 (&osi, TRUE,
+						    &local_iplt[i]->root,
+						    &local_iplt[i]->arm))
+		  return FALSE;
+	    }
+	}
+    }
+  if (htab->dt_tlsdesc_plt != 0)
+    {
+      /* Mapping symbols for the lazy tls trampoline.  */
+      if (!elf32_arm_output_map_sym (&osi, ARM_MAP_ARM, htab->dt_tlsdesc_plt))
+	return FALSE;
+       
+      if (!elf32_arm_output_map_sym (&osi, ARM_MAP_DATA,
+				     htab->dt_tlsdesc_plt + 24))
+	return FALSE;
+    }
+  if (htab->tls_trampoline != 0)
+    {
+      /* Mapping symbols for the tls trampoline.  */
+      if (!elf32_arm_output_map_sym (&osi, ARM_MAP_ARM, htab->tls_trampoline))
+	return FALSE;
+#ifdef FOUR_WORD_PLT
+      if (!elf32_arm_output_map_sym (&osi, ARM_MAP_DATA,
+				     htab->tls_trampoline + 12))
+	return FALSE;
+#endif 
+    }
+  
+  return TRUE;
+}
+
+/* Allocate target specific section data.  */
+
+static bfd_boolean
+elf32_arm_new_section_hook (bfd *abfd, asection *sec)
+{
+  if (!sec->used_by_bfd)
+    {
+      _arm_elf_section_data *sdata;
+      bfd_size_type amt = sizeof (*sdata);
+
+      sdata = (_arm_elf_section_data *) bfd_zalloc (abfd, amt);
+      if (sdata == NULL)
+	return FALSE;
+      sec->used_by_bfd = sdata;
+    }
+
+  return _bfd_elf_new_section_hook (abfd, sec);
+}
+
+
+/* Used to order a list of mapping symbols by address.  */
+
+static int
+elf32_arm_compare_mapping (const void * a, const void * b)
+{
+  const elf32_arm_section_map *amap = (const elf32_arm_section_map *) a;
+  const elf32_arm_section_map *bmap = (const elf32_arm_section_map *) b;
+
+  if (amap->vma > bmap->vma)
+    return 1;
+  else if (amap->vma < bmap->vma)
+    return -1;
+  else if (amap->type > bmap->type)
+    /* Ensure results do not depend on the host qsort for objects with
+       multiple mapping symbols at the same address by sorting on type
+       after vma.  */
+    return 1;
+  else if (amap->type < bmap->type)
+    return -1;
+  else
+    return 0;
+}
+
+/* Add OFFSET to lower 31 bits of ADDR, leaving other bits unmodified.  */
+
+static unsigned long
+offset_prel31 (unsigned long addr, bfd_vma offset)
+{
+  return (addr & ~0x7ffffffful) | ((addr + offset) & 0x7ffffffful);
+}
+
+/* Copy an .ARM.exidx table entry, adding OFFSET to (applied) PREL31
+   relocations.  */
+
+static void
+copy_exidx_entry (bfd *output_bfd, bfd_byte *to, bfd_byte *from, bfd_vma offset)
+{
+  unsigned long first_word = bfd_get_32 (output_bfd, from);
+  unsigned long second_word = bfd_get_32 (output_bfd, from + 4);
+  
+  /* High bit of first word is supposed to be zero.  */
+  if ((first_word & 0x80000000ul) == 0)
+    first_word = offset_prel31 (first_word, offset);
+  
+  /* If the high bit of the first word is clear, and the bit pattern is not 0x1
+     (EXIDX_CANTUNWIND), this is an offset to an .ARM.extab entry.  */
+  if ((second_word != 0x1) && ((second_word & 0x80000000ul) == 0))
+    second_word = offset_prel31 (second_word, offset);
+  
+  bfd_put_32 (output_bfd, first_word, to);
+  bfd_put_32 (output_bfd, second_word, to + 4);
+}
+
+/* Data for make_branch_to_a8_stub().  */
+
+struct a8_branch_to_stub_data {
+  asection *writing_section;
+  bfd_byte *contents;
+};
+
+
+/* Helper to insert branches to Cortex-A8 erratum stubs in the right
+   places for a particular section.  */
+
+static bfd_boolean
+make_branch_to_a8_stub (struct bfd_hash_entry *gen_entry,
+                       void *in_arg)
+{
+  struct elf32_arm_stub_hash_entry *stub_entry;
+  struct a8_branch_to_stub_data *data;
+  bfd_byte *contents;
+  unsigned long branch_insn;
+  bfd_vma veneered_insn_loc, veneer_entry_loc;
+  bfd_signed_vma branch_offset;
+  bfd *abfd;
+  unsigned int target;
+
+  stub_entry = (struct elf32_arm_stub_hash_entry *) gen_entry;
+  data = (struct a8_branch_to_stub_data *) in_arg;
+
+  if (stub_entry->target_section != data->writing_section
+      || stub_entry->stub_type < arm_stub_a8_veneer_lwm)
+    return TRUE;
+
+  contents = data->contents;
+
+  veneered_insn_loc = stub_entry->target_section->output_section->vma
+		      + stub_entry->target_section->output_offset
+		      + stub_entry->target_value;
+
+  veneer_entry_loc = stub_entry->stub_sec->output_section->vma
+		     + stub_entry->stub_sec->output_offset
+		     + stub_entry->stub_offset;
+
+  if (stub_entry->stub_type == arm_stub_a8_veneer_blx)
+    veneered_insn_loc &= ~3u;
+
+  branch_offset = veneer_entry_loc - veneered_insn_loc - 4;
+
+  abfd = stub_entry->target_section->owner;
+  target = stub_entry->target_value;
+
+  /* We attempt to avoid this condition by setting stubs_always_after_branch
+     in elf32_arm_size_stubs if we've enabled the Cortex-A8 erratum workaround.
+     This check is just to be on the safe side...  */
+  if ((veneered_insn_loc & ~0xfff) == (veneer_entry_loc & ~0xfff))
+    {
+      (*_bfd_error_handler) (_("%B: error: Cortex-A8 erratum stub is "
+			       "allocated in unsafe location"), abfd);
+      return FALSE;
+    }
+
+  switch (stub_entry->stub_type)
+    {
+    case arm_stub_a8_veneer_b:
+    case arm_stub_a8_veneer_b_cond:
+      branch_insn = 0xf0009000;
+      goto jump24;
+
+    case arm_stub_a8_veneer_blx:
+      branch_insn = 0xf000e800;
+      goto jump24;
+
+    case arm_stub_a8_veneer_bl:
+      {
+	unsigned int i1, j1, i2, j2, s;
+
+	branch_insn = 0xf000d000;
+
+      jump24:
+	if (branch_offset < -16777216 || branch_offset > 16777214)
+	  {
+	    /* There's not much we can do apart from complain if this
+	       happens.  */
+	    (*_bfd_error_handler) (_("%B: error: Cortex-A8 erratum stub out "
+				     "of range (input file too large)"), abfd);
+	    return FALSE;
+	  }
+
+	/* i1 = not(j1 eor s), so:
+	   not i1 = j1 eor s
+	   j1 = (not i1) eor s.  */
+
+	branch_insn |= (branch_offset >> 1) & 0x7ff;
+	branch_insn |= ((branch_offset >> 12) & 0x3ff) << 16;
+	i2 = (branch_offset >> 22) & 1;
+	i1 = (branch_offset >> 23) & 1;
+	s = (branch_offset >> 24) & 1;
+	j1 = (!i1) ^ s;
+	j2 = (!i2) ^ s;
+	branch_insn |= j2 << 11;
+	branch_insn |= j1 << 13;
+	branch_insn |= s << 26;
+      }
+      break;
+
+    default:
+      BFD_FAIL ();
+      return FALSE;
+    }
+
+  bfd_put_16 (abfd, (branch_insn >> 16) & 0xffff, &contents[target]);
+  bfd_put_16 (abfd, branch_insn & 0xffff, &contents[target + 2]);
+
+  return TRUE;
+}
+
+/* Do code byteswapping.  Return FALSE afterwards so that the section is
+   written out as normal.  */
+
+static bfd_boolean
+elf32_arm_write_section (bfd *output_bfd,
+			 struct bfd_link_info *link_info,
+			 asection *sec,
+			 bfd_byte *contents)
+{
+  unsigned int mapcount, errcount;
+  _arm_elf_section_data *arm_data;
+  struct elf32_arm_link_hash_table *globals = elf32_arm_hash_table (link_info);
+  elf32_arm_section_map *map;
+  elf32_vfp11_erratum_list *errnode;
+  bfd_vma ptr;
+  bfd_vma end;
+  bfd_vma offset = sec->output_section->vma + sec->output_offset;
+  bfd_byte tmp;
+  unsigned int i;
+
+  if (globals == NULL)
+    return FALSE;
+
+  /* If this section has not been allocated an _arm_elf_section_data
+     structure then we cannot record anything.  */
+  arm_data = get_arm_elf_section_data (sec);
+  if (arm_data == NULL)
+    return FALSE;
+
+  mapcount = arm_data->mapcount;
+  map = arm_data->map;
+  errcount = arm_data->erratumcount;
+
+  if (errcount != 0)
+    {
+      unsigned int endianflip = bfd_big_endian (output_bfd) ? 3 : 0;
+
+      for (errnode = arm_data->erratumlist; errnode != 0;
+           errnode = errnode->next)
+        {
+          bfd_vma target = errnode->vma - offset;
+
+          switch (errnode->type)
+            {
+            case VFP11_ERRATUM_BRANCH_TO_ARM_VENEER:
+              {
+                bfd_vma branch_to_veneer;
+                /* Original condition code of instruction, plus bit mask for
+                   ARM B instruction.  */
+                unsigned int insn = (errnode->u.b.vfp_insn & 0xf0000000)
+                                  | 0x0a000000;
+
+		/* The instruction is before the label.  */
+		target -= 4;
+
+		/* Above offset included in -4 below.  */
+		branch_to_veneer = errnode->u.b.veneer->vma
+                                   - errnode->vma - 4;
+
+		if ((signed) branch_to_veneer < -(1 << 25)
+		    || (signed) branch_to_veneer >= (1 << 25))
+		  (*_bfd_error_handler) (_("%B: error: VFP11 veneer out of "
+					   "range"), output_bfd);
+
+                insn |= (branch_to_veneer >> 2) & 0xffffff;
+                contents[endianflip ^ target] = insn & 0xff;
+                contents[endianflip ^ (target + 1)] = (insn >> 8) & 0xff;
+                contents[endianflip ^ (target + 2)] = (insn >> 16) & 0xff;
+                contents[endianflip ^ (target + 3)] = (insn >> 24) & 0xff;
+              }
+              break;
+
+	    case VFP11_ERRATUM_ARM_VENEER:
+              {
+                bfd_vma branch_from_veneer;
+                unsigned int insn;
+
+                /* Take size of veneer into account.  */
+                branch_from_veneer = errnode->u.v.branch->vma
+                                     - errnode->vma - 12;
+
+		if ((signed) branch_from_veneer < -(1 << 25)
+		    || (signed) branch_from_veneer >= (1 << 25))
+		  (*_bfd_error_handler) (_("%B: error: VFP11 veneer out of "
+					   "range"), output_bfd);
+
+                /* Original instruction.  */
+                insn = errnode->u.v.branch->u.b.vfp_insn;
+                contents[endianflip ^ target] = insn & 0xff;
+                contents[endianflip ^ (target + 1)] = (insn >> 8) & 0xff;
+                contents[endianflip ^ (target + 2)] = (insn >> 16) & 0xff;
+                contents[endianflip ^ (target + 3)] = (insn >> 24) & 0xff;
+
+                /* Branch back to insn after original insn.  */
+                insn = 0xea000000 | ((branch_from_veneer >> 2) & 0xffffff);
+                contents[endianflip ^ (target + 4)] = insn & 0xff;
+                contents[endianflip ^ (target + 5)] = (insn >> 8) & 0xff;
+                contents[endianflip ^ (target + 6)] = (insn >> 16) & 0xff;
+                contents[endianflip ^ (target + 7)] = (insn >> 24) & 0xff;
+              }
+              break;
+
+            default:
+              abort ();
+            }
+        }
+    }
+
+  if (arm_data->elf.this_hdr.sh_type == SHT_ARM_EXIDX)
+    {
+      arm_unwind_table_edit *edit_node
+        = arm_data->u.exidx.unwind_edit_list;
+      /* Now, sec->size is the size of the section we will write.  The original
+         size (before we merged duplicate entries and inserted EXIDX_CANTUNWIND
+	 markers) was sec->rawsize.  (This isn't the case if we perform no
+	 edits, then rawsize will be zero and we should use size).  */
+      bfd_byte *edited_contents = (bfd_byte *) bfd_malloc (sec->size);
+      unsigned int input_size = sec->rawsize ? sec->rawsize : sec->size;
+      unsigned int in_index, out_index;
+      bfd_vma add_to_offsets = 0;
+
+      for (in_index = 0, out_index = 0; in_index * 8 < input_size || edit_node;)
+        {
+	  if (edit_node)
+	    {
+	      unsigned int edit_index = edit_node->index;
+	      
+	      if (in_index < edit_index && in_index * 8 < input_size)
+	        {
+		  copy_exidx_entry (output_bfd, edited_contents + out_index * 8,
+				    contents + in_index * 8, add_to_offsets);
+		  out_index++;
+		  in_index++;
+		}
+	      else if (in_index == edit_index
+		       || (in_index * 8 >= input_size
+			   && edit_index == UINT_MAX))
+	        {
+		  switch (edit_node->type)
+		    {
+		    case DELETE_EXIDX_ENTRY:
+		      in_index++;
+		      add_to_offsets += 8;
+		      break;
+		    
+		    case INSERT_EXIDX_CANTUNWIND_AT_END:
+		      {
+		        asection *text_sec = edit_node->linked_section;
+			bfd_vma text_offset = text_sec->output_section->vma
+					      + text_sec->output_offset
+					      + text_sec->size;
+			bfd_vma exidx_offset = offset + out_index * 8;
+		        unsigned long prel31_offset;
+
+			/* Note: this is meant to be equivalent to an
+			   R_ARM_PREL31 relocation.  These synthetic
+			   EXIDX_CANTUNWIND markers are not relocated by the
+			   usual BFD method.  */
+			prel31_offset = (text_offset - exidx_offset)
+					& 0x7ffffffful;
+
+			/* First address we can't unwind.  */
+			bfd_put_32 (output_bfd, prel31_offset,
+				    &edited_contents[out_index * 8]);
+
+			/* Code for EXIDX_CANTUNWIND.  */
+			bfd_put_32 (output_bfd, 0x1,
+				    &edited_contents[out_index * 8 + 4]);
+
+			out_index++;
+			add_to_offsets -= 8;
+		      }
+		      break;
+		    }
+		  
+		  edit_node = edit_node->next;
+		}
+	    }
+	  else
+	    {
+	      /* No more edits, copy remaining entries verbatim.  */
+	      copy_exidx_entry (output_bfd, edited_contents + out_index * 8,
+				contents + in_index * 8, add_to_offsets);
+	      out_index++;
+	      in_index++;
+	    }
+	}
+
+      if (!(sec->flags & SEC_EXCLUDE) && !(sec->flags & SEC_NEVER_LOAD))
+	bfd_set_section_contents (output_bfd, sec->output_section,
+				  edited_contents,
+				  (file_ptr) sec->output_offset, sec->size);
+
+      return TRUE;
+    }
+
+  /* Fix code to point to Cortex-A8 erratum stubs.  */
+  if (globals->fix_cortex_a8)
+    {
+      struct a8_branch_to_stub_data data;
+
+      data.writing_section = sec;
+      data.contents = contents;
+
+      bfd_hash_traverse (&globals->stub_hash_table, make_branch_to_a8_stub,
+			 &data);
+    }
+
+  if (mapcount == 0)
+    return FALSE;
+
+  if (globals->byteswap_code)
+    {
+      qsort (map, mapcount, sizeof (* map), elf32_arm_compare_mapping);
+
+      ptr = map[0].vma;
+      for (i = 0; i < mapcount; i++)
+        {
+          if (i == mapcount - 1)
+	    end = sec->size;
+          else
+            end = map[i + 1].vma;
+
+          switch (map[i].type)
+	    {
+	    case 'a':
+	      /* Byte swap code words.  */
+	      while (ptr + 3 < end)
+	        {
+	          tmp = contents[ptr];
+	          contents[ptr] = contents[ptr + 3];
+	          contents[ptr + 3] = tmp;
+	          tmp = contents[ptr + 1];
+	          contents[ptr + 1] = contents[ptr + 2];
+	          contents[ptr + 2] = tmp;
+	          ptr += 4;
+	        }
+	      break;
+
+	    case 't':
+	      /* Byte swap code halfwords.  */
+	      while (ptr + 1 < end)
+	        {
+	          tmp = contents[ptr];
+	          contents[ptr] = contents[ptr + 1];
+	          contents[ptr + 1] = tmp;
+	          ptr += 2;
+	        }
+	      break;
+
+	    case 'd':
+	      /* Leave data alone.  */
+	      break;
+	    }
+          ptr = end;
+        }
+    }
+
+  free (map);
+  arm_data->mapcount = -1;
+  arm_data->mapsize = 0;
+  arm_data->map = NULL;
+
+  return FALSE;
+}
+
+/* Mangle thumb function symbols as we read them in.  */
+
+static bfd_boolean
+elf32_arm_swap_symbol_in (bfd * abfd,
+			  const void *psrc,
+			  const void *pshn,
+			  Elf_Internal_Sym *dst)
+{
+  if (!bfd_elf32_swap_symbol_in (abfd, psrc, pshn, dst))
+    return FALSE;
+
+  /* New EABI objects mark thumb function symbols by setting the low bit of
+     the address.  */
+  if (ELF_ST_TYPE (dst->st_info) == STT_FUNC
+      || ELF_ST_TYPE (dst->st_info) == STT_GNU_IFUNC)
+    {
+      if (dst->st_value & 1)
+	{
+	  dst->st_value &= ~(bfd_vma) 1;
+	  dst->st_target_internal = ST_BRANCH_TO_THUMB;
+	}
+      else
+	dst->st_target_internal = ST_BRANCH_TO_ARM;
+    }
+  else if (ELF_ST_TYPE (dst->st_info) == STT_ARM_TFUNC)
+    {
+      dst->st_info = ELF_ST_INFO (ELF_ST_BIND (dst->st_info), STT_FUNC);
+      dst->st_target_internal = ST_BRANCH_TO_THUMB;
+    }
+  else if (ELF_ST_TYPE (dst->st_info) == STT_SECTION)
+    dst->st_target_internal = ST_BRANCH_LONG;
+  else
+    dst->st_target_internal = ST_BRANCH_UNKNOWN;
+
+  return TRUE;
+}
+
+
+/* Mangle thumb function symbols as we write them out.  */
+
+static void
+elf32_arm_swap_symbol_out (bfd *abfd,
+			   const Elf_Internal_Sym *src,
+			   void *cdst,
+			   void *shndx)
+{
+  Elf_Internal_Sym newsym;
+
+  /* We convert STT_ARM_TFUNC symbols into STT_FUNC with the low bit
+     of the address set, as per the new EABI.  We do this unconditionally
+     because objcopy does not set the elf header flags until after
+     it writes out the symbol table.  */
+  if (src->st_target_internal == ST_BRANCH_TO_THUMB)
+    {
+      newsym = *src;
+      if (ELF_ST_TYPE (src->st_info) != STT_GNU_IFUNC)
+	newsym.st_info = ELF_ST_INFO (ELF_ST_BIND (src->st_info), STT_FUNC);
+      if (newsym.st_shndx != SHN_UNDEF)
+        {
+          /* Do this only for defined symbols. At link type, the static
+             linker will simulate the work of dynamic linker of resolving
+             symbols and will carry over the thumbness of found symbols to
+             the output symbol table. It's not clear how it happens, but
+             the thumbness of undefined symbols can well be different at
+             runtime, and writing '1' for them will be confusing for users
+             and possibly for dynamic linker itself.
+          */
+          newsym.st_value |= 1;
+        }
+
+      src = &newsym;
+    }
+  bfd_elf32_swap_symbol_out (abfd, src, cdst, shndx);
+}
+
+/* Add the PT_ARM_EXIDX program header.  */
+
+static bfd_boolean
+elf32_arm_modify_segment_map (bfd *abfd,
+			      struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  struct elf_segment_map *m;
+  asection *sec;
+
+  sec = bfd_get_section_by_name (abfd, ".ARM.exidx");
+  if (sec != NULL && (sec->flags & SEC_LOAD) != 0)
+    {
+      /* If there is already a PT_ARM_EXIDX header, then we do not
+	 want to add another one.  This situation arises when running
+	 "strip"; the input binary already has the header.  */
+      m = elf_tdata (abfd)->segment_map;
+      while (m && m->p_type != PT_ARM_EXIDX)
+	m = m->next;
+      if (!m)
+	{
+	  m = (struct elf_segment_map *)
+              bfd_zalloc (abfd, sizeof (struct elf_segment_map));
+	  if (m == NULL)
+	    return FALSE;
+	  m->p_type = PT_ARM_EXIDX;
+	  m->count = 1;
+	  m->sections[0] = sec;
+
+	  m->next = elf_tdata (abfd)->segment_map;
+	  elf_tdata (abfd)->segment_map = m;
+	}
+    }
+
+  return TRUE;
+}
+
+/* We may add a PT_ARM_EXIDX program header.  */
+
+static int
+elf32_arm_additional_program_headers (bfd *abfd,
+				      struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  asection *sec;
+
+  sec = bfd_get_section_by_name (abfd, ".ARM.exidx");
+  if (sec != NULL && (sec->flags & SEC_LOAD) != 0)
+    return 1;
+  else
+    return 0;
+}
+
+/* Hook called by the linker routine which adds symbols from an object
+   file.  */
+
+static bfd_boolean
+elf32_arm_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
+			   Elf_Internal_Sym *sym, const char **namep,
+			   flagword *flagsp, asection **secp, bfd_vma *valp)
+{
+  if ((abfd->flags & DYNAMIC) == 0
+      && (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC
+	  || ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE))
+    elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE;
+
+  if (elf32_arm_hash_table (info)->vxworks_p
+      && !elf_vxworks_add_symbol_hook (abfd, info, sym, namep,
+				       flagsp, secp, valp))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* We use this to override swap_symbol_in and swap_symbol_out.  */
+const struct elf_size_info elf32_arm_size_info =
+{
+  sizeof (Elf32_External_Ehdr),
+  sizeof (Elf32_External_Phdr),
+  sizeof (Elf32_External_Shdr),
+  sizeof (Elf32_External_Rel),
+  sizeof (Elf32_External_Rela),
+  sizeof (Elf32_External_Sym),
+  sizeof (Elf32_External_Dyn),
+  sizeof (Elf_External_Note),
+  4,
+  1,
+  32, 2,
+  ELFCLASS32, EV_CURRENT,
+  bfd_elf32_write_out_phdrs,
+  bfd_elf32_write_shdrs_and_ehdr,
+  bfd_elf32_checksum_contents,
+  bfd_elf32_write_relocs,
+  elf32_arm_swap_symbol_in,
+  elf32_arm_swap_symbol_out,
+  bfd_elf32_slurp_reloc_table,
+  bfd_elf32_slurp_symbol_table,
+  bfd_elf32_swap_dyn_in,
+  bfd_elf32_swap_dyn_out,
+  bfd_elf32_swap_reloc_in,
+  bfd_elf32_swap_reloc_out,
+  bfd_elf32_swap_reloca_in,
+  bfd_elf32_swap_reloca_out
+};
+
+#define ELF_ARCH			bfd_arch_arm
+#define ELF_TARGET_ID			ARM_ELF_DATA
+#define ELF_MACHINE_CODE		EM_ARM
+#ifdef __QNXTARGET__
+#define ELF_MAXPAGESIZE			0x1000
+#else
+#define ELF_MAXPAGESIZE			0x8000
+#endif
+#define ELF_MINPAGESIZE			0x1000
+#define ELF_COMMONPAGESIZE		0x1000
+
+#define bfd_elf32_mkobject		        elf32_arm_mkobject
+
+#define bfd_elf32_bfd_copy_private_bfd_data	elf32_arm_copy_private_bfd_data
+#define bfd_elf32_bfd_merge_private_bfd_data	elf32_arm_merge_private_bfd_data
+#define bfd_elf32_bfd_set_private_flags		elf32_arm_set_private_flags
+#define bfd_elf32_bfd_print_private_bfd_data	elf32_arm_print_private_bfd_data
+#define bfd_elf32_bfd_link_hash_table_create    elf32_arm_link_hash_table_create
+#define bfd_elf32_bfd_link_hash_table_free      elf32_arm_hash_table_free
+#define bfd_elf32_bfd_reloc_type_lookup		elf32_arm_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup	elf32_arm_reloc_name_lookup
+#define bfd_elf32_find_nearest_line	        elf32_arm_find_nearest_line
+#define bfd_elf32_find_inliner_info	        elf32_arm_find_inliner_info
+#define bfd_elf32_new_section_hook		elf32_arm_new_section_hook
+#define bfd_elf32_bfd_is_target_special_symbol	elf32_arm_is_target_special_symbol
+#define bfd_elf32_bfd_final_link		elf32_arm_final_link
+
+#define elf_backend_get_symbol_type             elf32_arm_get_symbol_type
+#define elf_backend_gc_mark_hook                elf32_arm_gc_mark_hook
+#define elf_backend_gc_mark_extra_sections	elf32_arm_gc_mark_extra_sections
+#define elf_backend_gc_sweep_hook               elf32_arm_gc_sweep_hook
+#define elf_backend_check_relocs                elf32_arm_check_relocs
+#define elf_backend_relocate_section		elf32_arm_relocate_section
+#define elf_backend_write_section		elf32_arm_write_section
+#define elf_backend_adjust_dynamic_symbol	elf32_arm_adjust_dynamic_symbol
+#define elf_backend_create_dynamic_sections     elf32_arm_create_dynamic_sections
+#define elf_backend_finish_dynamic_symbol	elf32_arm_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections	elf32_arm_finish_dynamic_sections
+#define elf_backend_size_dynamic_sections	elf32_arm_size_dynamic_sections
+#define elf_backend_always_size_sections	elf32_arm_always_size_sections
+#define elf_backend_init_index_section		_bfd_elf_init_2_index_sections
+#define elf_backend_post_process_headers	elf32_arm_post_process_headers
+#define elf_backend_reloc_type_class		elf32_arm_reloc_type_class
+#define elf_backend_object_p			elf32_arm_object_p
+#define elf_backend_fake_sections  		elf32_arm_fake_sections
+#define elf_backend_section_from_shdr  		elf32_arm_section_from_shdr
+#define elf_backend_final_write_processing      elf32_arm_final_write_processing
+#define elf_backend_copy_indirect_symbol        elf32_arm_copy_indirect_symbol
+#define elf_backend_size_info			elf32_arm_size_info
+#define elf_backend_modify_segment_map		elf32_arm_modify_segment_map
+#define elf_backend_additional_program_headers  elf32_arm_additional_program_headers
+#define elf_backend_output_arch_local_syms      elf32_arm_output_arch_local_syms
+#define elf_backend_begin_write_processing      elf32_arm_begin_write_processing
+#define elf_backend_add_symbol_hook		elf32_arm_add_symbol_hook
+
+#define elf_backend_can_refcount       1
+#define elf_backend_can_gc_sections    1
+#define elf_backend_plt_readonly       1
+#define elf_backend_want_got_plt       1
+#define elf_backend_want_plt_sym       0
+#define elf_backend_may_use_rel_p      1
+#define elf_backend_may_use_rela_p     0
+#define elf_backend_default_use_rela_p 0
+
+#define elf_backend_got_header_size	12
+
+#undef  elf_backend_obj_attrs_vendor
+#define elf_backend_obj_attrs_vendor		"aeabi"
+#undef  elf_backend_obj_attrs_section
+#define elf_backend_obj_attrs_section		".ARM.attributes"
+#undef  elf_backend_obj_attrs_arg_type
+#define elf_backend_obj_attrs_arg_type		elf32_arm_obj_attrs_arg_type
+#undef  elf_backend_obj_attrs_section_type
+#define elf_backend_obj_attrs_section_type	SHT_ARM_ATTRIBUTES
+#define elf_backend_obj_attrs_order	elf32_arm_obj_attrs_order
+#define elf_backend_obj_attrs_handle_unknown elf32_arm_obj_attrs_handle_unknown
+
+#include "elf32-target.h"
+
+/* VxWorks Targets.  */
+
+#undef  TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM               bfd_elf32_littlearm_vxworks_vec
+#undef  TARGET_LITTLE_NAME
+#define TARGET_LITTLE_NAME              "elf32-littlearm-vxworks"
+#undef  TARGET_BIG_SYM
+#define TARGET_BIG_SYM                  bfd_elf32_bigarm_vxworks_vec
+#undef  TARGET_BIG_NAME
+#define TARGET_BIG_NAME                 "elf32-bigarm-vxworks"
+
+/* Like elf32_arm_link_hash_table_create -- but overrides
+   appropriately for VxWorks.  */
+
+static struct bfd_link_hash_table *
+elf32_arm_vxworks_link_hash_table_create (bfd *abfd)
+{
+  struct bfd_link_hash_table *ret;
+
+  ret = elf32_arm_link_hash_table_create (abfd);
+  if (ret)
+    {
+      struct elf32_arm_link_hash_table *htab
+	= (struct elf32_arm_link_hash_table *) ret;
+      htab->use_rel = 0;
+      htab->vxworks_p = 1;
+    }
+  return ret;
+}
+
+static void
+elf32_arm_vxworks_final_write_processing (bfd *abfd, bfd_boolean linker)
+{
+  elf32_arm_final_write_processing (abfd, linker);
+  elf_vxworks_final_write_processing (abfd, linker);
+}
+
+#undef  elf32_bed
+#define elf32_bed elf32_arm_vxworks_bed
+
+#undef  bfd_elf32_bfd_link_hash_table_create
+#define bfd_elf32_bfd_link_hash_table_create	elf32_arm_vxworks_link_hash_table_create
+#undef  elf_backend_final_write_processing
+#define elf_backend_final_write_processing	elf32_arm_vxworks_final_write_processing
+#undef  elf_backend_emit_relocs
+#define elf_backend_emit_relocs			elf_vxworks_emit_relocs
+
+#undef  elf_backend_may_use_rel_p
+#define elf_backend_may_use_rel_p	0
+#undef  elf_backend_may_use_rela_p
+#define elf_backend_may_use_rela_p	1
+#undef  elf_backend_default_use_rela_p
+#define elf_backend_default_use_rela_p	1
+#undef  elf_backend_want_plt_sym
+#define elf_backend_want_plt_sym	1
+#undef  ELF_MAXPAGESIZE
+#define ELF_MAXPAGESIZE			0x1000
+
+#include "elf32-target.h"
+
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+
+static bfd_boolean
+elf32_arm_merge_private_bfd_data (bfd * ibfd, bfd * obfd)
+{
+  flagword out_flags;
+  flagword in_flags;
+  bfd_boolean flags_compatible = TRUE;
+  asection *sec;
+
+  /* Check if we have the same endianness.  */
+  if (! _bfd_generic_verify_endian_match (ibfd, obfd))
+    return FALSE;
+
+  if (! is_arm_elf (ibfd) || ! is_arm_elf (obfd))
+    return TRUE;
+
+  if (!elf32_arm_merge_eabi_attributes (ibfd, obfd))
+    return FALSE;
+
+  /* The input BFD must have had its flags initialised.  */
+  /* The following seems bogus to me -- The flags are initialized in
+     the assembler but I don't think an elf_flags_init field is
+     written into the object.  */
+  /* BFD_ASSERT (elf_flags_init (ibfd)); */
+
+  in_flags  = elf_elfheader (ibfd)->e_flags;
+  out_flags = elf_elfheader (obfd)->e_flags;
+
+  /* In theory there is no reason why we couldn't handle this.  However
+     in practice it isn't even close to working and there is no real
+     reason to want it.  */
+  if (EF_ARM_EABI_VERSION (in_flags) >= EF_ARM_EABI_VER4
+      && !(ibfd->flags & DYNAMIC)
+      && (in_flags & EF_ARM_BE8))
+    {
+      _bfd_error_handler (_("error: %B is already in final BE8 format"),
+			  ibfd);
+      return FALSE;
+    }
+
+  if (!elf_flags_init (obfd))
+    {
+      /* If the input is the default architecture and had the default
+	 flags then do not bother setting the flags for the output
+	 architecture, instead allow future merges to do this.  If no
+	 future merges ever set these flags then they will retain their
+         uninitialised values, which surprise surprise, correspond
+         to the default values.  */
+      if (bfd_get_arch_info (ibfd)->the_default
+	  && elf_elfheader (ibfd)->e_flags == 0)
+	return TRUE;
+
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = in_flags;
+
+      if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
+	  && bfd_get_arch_info (obfd)->the_default)
+	return bfd_set_arch_mach (obfd, bfd_get_arch (ibfd), bfd_get_mach (ibfd));
+
+      return TRUE;
+    }
+
+  /* Determine what should happen if the input ARM architecture
+     does not match the output ARM architecture.  */
+  if (! bfd_arm_merge_machines (ibfd, obfd))
+    return FALSE;
+
+  /* Identical flags must be compatible.  */
+  if (in_flags == out_flags)
+    return TRUE;
+
+  /* Check to see if the input BFD actually contains any sections.  If
+     not, its flags may not have been initialised either, but it
+     cannot actually cause any incompatiblity.  Do not short-circuit
+     dynamic objects; their section list may be emptied by
+    elf_link_add_object_symbols.
+
+    Also check to see if there are no code sections in the input.
+    In this case there is no need to check for code specific flags.
+    XXX - do we need to worry about floating-point format compatability
+    in data sections ?  */
+  if (!(ibfd->flags & DYNAMIC))
+    {
+      bfd_boolean null_input_bfd = TRUE;
+      bfd_boolean only_data_sections = TRUE;
+
+      for (sec = ibfd->sections; sec != NULL; sec = sec->next)
+	{
+	  /* Ignore synthetic glue sections.  */
+	  if (strcmp (sec->name, ".glue_7")
+	      && strcmp (sec->name, ".glue_7t"))
+	    {
+	      if ((bfd_get_section_flags (ibfd, sec)
+		   & (SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS))
+		  == (SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS))
+	    	only_data_sections = FALSE;
+
+	      null_input_bfd = FALSE;
+	      break;
+	    }
+	}
+
+      if (null_input_bfd || only_data_sections)
+	return TRUE;
+    }
+
+  /* Complain about various flag mismatches.  */
+  if (!elf32_arm_versions_compatible (EF_ARM_EABI_VERSION (in_flags),
+				      EF_ARM_EABI_VERSION (out_flags)))
+    {
+      _bfd_error_handler
+	(_("error: Source object %B has EABI version %d, but target %B has EABI version %d"),
+	 ibfd, obfd,
+	 (in_flags & EF_ARM_EABIMASK) >> 24,
+	 (out_flags & EF_ARM_EABIMASK) >> 24);
+      return FALSE;
+    }
+
+  /* Not sure what needs to be checked for EABI versions >= 1.  */
+  /* VxWorks libraries do not use these flags.  */
+  if (get_elf_backend_data (obfd) != &elf32_arm_vxworks_bed
+      && get_elf_backend_data (ibfd) != &elf32_arm_vxworks_bed
+      && EF_ARM_EABI_VERSION (in_flags) == EF_ARM_EABI_UNKNOWN)
+    {
+      if ((in_flags & EF_ARM_APCS_26) != (out_flags & EF_ARM_APCS_26))
+	{
+	  _bfd_error_handler
+	    (_("error: %B is compiled for APCS-%d, whereas target %B uses APCS-%d"),
+	     ibfd, obfd,
+	     in_flags & EF_ARM_APCS_26 ? 26 : 32,
+	     out_flags & EF_ARM_APCS_26 ? 26 : 32);
+	  flags_compatible = FALSE;
+	}
+
+      if ((in_flags & EF_ARM_APCS_FLOAT) != (out_flags & EF_ARM_APCS_FLOAT))
+	{
+	  if (in_flags & EF_ARM_APCS_FLOAT)
+	    _bfd_error_handler
+	      (_("error: %B passes floats in float registers, whereas %B passes them in integer registers"),
+	       ibfd, obfd);
+	  else
+	    _bfd_error_handler
+	      (_("error: %B passes floats in integer registers, whereas %B passes them in float registers"),
+	       ibfd, obfd);
+
+	  flags_compatible = FALSE;
+	}
+
+      if ((in_flags & EF_ARM_VFP_FLOAT) != (out_flags & EF_ARM_VFP_FLOAT))
+	{
+	  if (in_flags & EF_ARM_VFP_FLOAT)
+	    _bfd_error_handler
+	      (_("error: %B uses VFP instructions, whereas %B does not"),
+	       ibfd, obfd);
+	  else
+	    _bfd_error_handler
+	      (_("error: %B uses FPA instructions, whereas %B does not"),
+	       ibfd, obfd);
+
+	  flags_compatible = FALSE;
+	}
+
+      if ((in_flags & EF_ARM_MAVERICK_FLOAT) != (out_flags & EF_ARM_MAVERICK_FLOAT))
+	{
+	  if (in_flags & EF_ARM_MAVERICK_FLOAT)
+	    _bfd_error_handler
+	      (_("error: %B uses Maverick instructions, whereas %B does not"),
+	       ibfd, obfd);
+	  else
+	    _bfd_error_handler
+	      (_("error: %B does not use Maverick instructions, whereas %B does"),
+	       ibfd, obfd);
+
+	  flags_compatible = FALSE;
+	}
+
+#ifdef EF_ARM_SOFT_FLOAT
+      if ((in_flags & EF_ARM_SOFT_FLOAT) != (out_flags & EF_ARM_SOFT_FLOAT))
+	{
+	  /* We can allow interworking between code that is VFP format
+	     layout, and uses either soft float or integer regs for
+	     passing floating point arguments and results.  We already
+	     know that the APCS_FLOAT flags match; similarly for VFP
+	     flags.  */
+	  if ((in_flags & EF_ARM_APCS_FLOAT) != 0
+	      || (in_flags & EF_ARM_VFP_FLOAT) == 0)
+	    {
+	      if (in_flags & EF_ARM_SOFT_FLOAT)
+		_bfd_error_handler
+		  (_("error: %B uses software FP, whereas %B uses hardware FP"),
+		   ibfd, obfd);
+	      else
+		_bfd_error_handler
+		  (_("error: %B uses hardware FP, whereas %B uses software FP"),
+		   ibfd, obfd);
+
+	      flags_compatible = FALSE;
+	    }
+	}
+#endif
+
+      /* Interworking mismatch is only a warning.  */
+      if ((in_flags & EF_ARM_INTERWORK) != (out_flags & EF_ARM_INTERWORK))
+	{
+	  if (in_flags & EF_ARM_INTERWORK)
+	    {
+	      _bfd_error_handler
+		(_("Warning: %B supports interworking, whereas %B does not"),
+		 ibfd, obfd);
+	    }
+	  else
+	    {
+	      _bfd_error_handler
+		(_("Warning: %B does not support interworking, whereas %B does"),
+		 ibfd, obfd);
+	    }
+	}
+    }
+
+  return flags_compatible;
+}
+
+
+/* Symbian OS Targets.  */
+
+#undef  TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM               bfd_elf32_littlearm_symbian_vec
+#undef  TARGET_LITTLE_NAME
+#define TARGET_LITTLE_NAME              "elf32-littlearm-symbian"
+#undef  TARGET_BIG_SYM
+#define TARGET_BIG_SYM                  bfd_elf32_bigarm_symbian_vec
+#undef  TARGET_BIG_NAME
+#define TARGET_BIG_NAME                 "elf32-bigarm-symbian"
+
+/* Like elf32_arm_link_hash_table_create -- but overrides
+   appropriately for Symbian OS.  */
+
+static struct bfd_link_hash_table *
+elf32_arm_symbian_link_hash_table_create (bfd *abfd)
+{
+  struct bfd_link_hash_table *ret;
+
+  ret = elf32_arm_link_hash_table_create (abfd);
+  if (ret)
+    {
+      struct elf32_arm_link_hash_table *htab
+	= (struct elf32_arm_link_hash_table *)ret;
+      /* There is no PLT header for Symbian OS.  */
+      htab->plt_header_size = 0;
+      /* The PLT entries are each one instruction and one word.  */
+      htab->plt_entry_size = 4 * ARRAY_SIZE (elf32_arm_symbian_plt_entry);
+      htab->symbian_p = 1;
+      /* Symbian uses armv5t or above, so use_blx is always true.  */
+      htab->use_blx = 1;
+      htab->root.is_relocatable_executable = 1;
+    }
+  return ret;
+}
+
+static const struct bfd_elf_special_section
+elf32_arm_symbian_special_sections[] =
+{
+  /* In a BPABI executable, the dynamic linking sections do not go in
+     the loadable read-only segment.  The post-linker may wish to
+     refer to these sections, but they are not part of the final
+     program image.  */
+  { STRING_COMMA_LEN (".dynamic"),       0, SHT_DYNAMIC,  0 },
+  { STRING_COMMA_LEN (".dynstr"),        0, SHT_STRTAB,   0 },
+  { STRING_COMMA_LEN (".dynsym"),        0, SHT_DYNSYM,   0 },
+  { STRING_COMMA_LEN (".got"),           0, SHT_PROGBITS, 0 },
+  { STRING_COMMA_LEN (".hash"),          0, SHT_HASH,     0 },
+  /* These sections do not need to be writable as the SymbianOS
+     postlinker will arrange things so that no dynamic relocation is
+     required.  */
+  { STRING_COMMA_LEN (".init_array"),    0, SHT_INIT_ARRAY,    SHF_ALLOC },
+  { STRING_COMMA_LEN (".fini_array"),    0, SHT_FINI_ARRAY,    SHF_ALLOC },
+  { STRING_COMMA_LEN (".preinit_array"), 0, SHT_PREINIT_ARRAY, SHF_ALLOC },
+  { NULL,                             0, 0, 0,                 0 }
+};
+
+static void
+elf32_arm_symbian_begin_write_processing (bfd *abfd,
+					  struct bfd_link_info *link_info)
+{
+  /* BPABI objects are never loaded directly by an OS kernel; they are
+     processed by a postlinker first, into an OS-specific format.  If
+     the D_PAGED bit is set on the file, BFD will align segments on
+     page boundaries, so that an OS can directly map the file.  With
+     BPABI objects, that just results in wasted space.  In addition,
+     because we clear the D_PAGED bit, map_sections_to_segments will
+     recognize that the program headers should not be mapped into any
+     loadable segment.  */
+  abfd->flags &= ~D_PAGED;
+  elf32_arm_begin_write_processing (abfd, link_info);
+}
+
+static bfd_boolean
+elf32_arm_symbian_modify_segment_map (bfd *abfd,
+				      struct bfd_link_info *info)
+{
+  struct elf_segment_map *m;
+  asection *dynsec;
+
+  /* BPABI shared libraries and executables should have a PT_DYNAMIC
+     segment.  However, because the .dynamic section is not marked
+     with SEC_LOAD, the generic ELF code will not create such a
+     segment.  */
+  dynsec = bfd_get_section_by_name (abfd, ".dynamic");
+  if (dynsec)
+    {
+      for (m = elf_tdata (abfd)->segment_map; m != NULL; m = m->next)
+	if (m->p_type == PT_DYNAMIC)
+	  break;
+
+      if (m == NULL)
+	{
+	  m = _bfd_elf_make_dynamic_segment (abfd, dynsec);
+	  m->next = elf_tdata (abfd)->segment_map;
+	  elf_tdata (abfd)->segment_map = m;
+	}
+    }
+
+  /* Also call the generic arm routine.  */
+  return elf32_arm_modify_segment_map (abfd, info);
+}
+
+/* Return address for Ith PLT stub in section PLT, for relocation REL
+   or (bfd_vma) -1 if it should not be included.  */
+
+static bfd_vma
+elf32_arm_symbian_plt_sym_val (bfd_vma i, const asection *plt,
+			       const arelent *rel ATTRIBUTE_UNUSED)
+{
+  return plt->vma + 4 * ARRAY_SIZE (elf32_arm_symbian_plt_entry) * i;
+}
+
+
+#undef  elf32_bed
+#define elf32_bed elf32_arm_symbian_bed
+
+/* The dynamic sections are not allocated on SymbianOS; the postlinker
+   will process them and then discard them.  */
+#undef  ELF_DYNAMIC_SEC_FLAGS
+#define ELF_DYNAMIC_SEC_FLAGS \
+  (SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED)
+
+#undef elf_backend_emit_relocs
+
+#undef  bfd_elf32_bfd_link_hash_table_create
+#define bfd_elf32_bfd_link_hash_table_create	elf32_arm_symbian_link_hash_table_create
+#undef  elf_backend_special_sections
+#define elf_backend_special_sections 		elf32_arm_symbian_special_sections
+#undef  elf_backend_begin_write_processing
+#define elf_backend_begin_write_processing	elf32_arm_symbian_begin_write_processing
+#undef  elf_backend_final_write_processing
+#define elf_backend_final_write_processing	elf32_arm_final_write_processing
+
+#undef  elf_backend_modify_segment_map
+#define elf_backend_modify_segment_map elf32_arm_symbian_modify_segment_map
+
+/* There is no .got section for BPABI objects, and hence no header.  */
+#undef  elf_backend_got_header_size
+#define elf_backend_got_header_size 0
+
+/* Similarly, there is no .got.plt section.  */
+#undef  elf_backend_want_got_plt
+#define elf_backend_want_got_plt 0
+
+#undef  elf_backend_plt_sym_val
+#define elf_backend_plt_sym_val		elf32_arm_symbian_plt_sym_val
+
+#undef  elf_backend_may_use_rel_p
+#define elf_backend_may_use_rel_p	1
+#undef  elf_backend_may_use_rela_p
+#define elf_backend_may_use_rela_p	0
+#undef  elf_backend_default_use_rela_p
+#define elf_backend_default_use_rela_p	0
+#undef  elf_backend_want_plt_sym
+#define elf_backend_want_plt_sym	0
+#undef  ELF_MAXPAGESIZE
+#define ELF_MAXPAGESIZE			0x8000
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-avr.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-avr.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-avr.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-avr.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3026 @@
+/* AVR-specific support for 32-bit ELF
+   Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+   2010, 2011  Free Software Foundation, Inc.
+   Contributed by Denis Chertykov <denisc@overta.ru>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/avr.h"
+#include "elf32-avr.h"
+
+/* Enable debugging printout at stdout with this variable.  */
+static bfd_boolean debug_relax = FALSE;
+
+/* Enable debugging printout at stdout with this variable.  */
+static bfd_boolean debug_stubs = FALSE;
+
+/* Hash table initialization and handling.  Code is taken from the hppa port
+   and adapted to the needs of AVR.  */
+
+/* We use two hash tables to hold information for linking avr objects.
+
+   The first is the elf32_avr_link_hash_table which is derived from the
+   stanard ELF linker hash table.  We use this as a place to attach the other
+   hash table and some static information.
+
+   The second is the stub hash table which is derived from the base BFD
+   hash table.  The stub hash table holds the information on the linker
+   stubs.  */
+
+struct elf32_avr_stub_hash_entry
+{
+  /* Base hash table entry structure.  */
+  struct bfd_hash_entry bh_root;
+
+  /* Offset within stub_sec of the beginning of this stub.  */
+  bfd_vma stub_offset;
+
+  /* Given the symbol's value and its section we can determine its final
+     value when building the stubs (so the stub knows where to jump).  */
+  bfd_vma target_value;
+
+  /* This way we could mark stubs to be no longer necessary.  */
+  bfd_boolean is_actually_needed;
+};
+
+struct elf32_avr_link_hash_table
+{
+  /* The main hash table.  */
+  struct elf_link_hash_table etab;
+
+  /* The stub hash table.  */
+  struct bfd_hash_table bstab;
+
+  bfd_boolean no_stubs;
+
+  /* Linker stub bfd.  */
+  bfd *stub_bfd;
+
+  /* The stub section.  */
+  asection *stub_sec;
+
+  /* Usually 0, unless we are generating code for a bootloader.  Will
+     be initialized by elf32_avr_size_stubs to the vma offset of the
+     output section associated with the stub section.  */
+  bfd_vma vector_base;
+
+  /* Assorted information used by elf32_avr_size_stubs.  */
+  unsigned int        bfd_count;
+  int                 top_index;
+  asection **         input_list;
+  Elf_Internal_Sym ** all_local_syms;
+
+  /* Tables for mapping vma beyond the 128k boundary to the address of the
+     corresponding stub.  (AMT)
+     "amt_max_entry_cnt" reflects the number of entries that memory is allocated
+     for in the "amt_stub_offsets" and "amt_destination_addr" arrays.
+     "amt_entry_cnt" informs how many of these entries actually contain
+     useful data.  */
+  unsigned int amt_entry_cnt;
+  unsigned int amt_max_entry_cnt;
+  bfd_vma *    amt_stub_offsets;
+  bfd_vma *    amt_destination_addr;
+};
+
+/* Various hash macros and functions.  */
+#define avr_link_hash_table(p) \
+  /* PR 3874: Check that we have an AVR style hash table before using it.  */\
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == AVR_ELF_DATA ? ((struct elf32_avr_link_hash_table *) ((p)->hash)) : NULL)
+
+#define avr_stub_hash_entry(ent) \
+  ((struct elf32_avr_stub_hash_entry *)(ent))
+
+#define avr_stub_hash_lookup(table, string, create, copy) \
+  ((struct elf32_avr_stub_hash_entry *) \
+   bfd_hash_lookup ((table), (string), (create), (copy)))
+
+static reloc_howto_type elf_avr_howto_table[] =
+{
+  HOWTO (R_AVR_NONE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_AVR_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 7 bit PC relative relocation.  */
+  HOWTO (R_AVR_7_PCREL,		/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 7,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 3,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_AVR_7_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 13 bit PC relative relocation.  */
+  HOWTO (R_AVR_13_PCREL,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 13,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_AVR_13_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xfff,			/* src_mask */
+	 0xfff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 16 bit absolute relocation.  */
+  HOWTO (R_AVR_16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit absolute relocation for command address
+     Will be changed when linker stubs are needed.  */
+  HOWTO (R_AVR_16_PM,		/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_16_PM",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  /* A low 8 bit absolute relocation of 16 bit address.
+     For LDI command.  */
+  HOWTO (R_AVR_LO8_LDI,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_LO8_LDI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  /* A high 8 bit absolute relocation of 16 bit address.
+     For LDI command.  */
+  HOWTO (R_AVR_HI8_LDI,		/* type */
+	 8,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_HI8_LDI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  /* A high 6 bit absolute relocation of 22 bit address.
+     For LDI command.  As well second most significant 8 bit value of
+     a 32 bit link-time constant.  */
+  HOWTO (R_AVR_HH8_LDI,		/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_HH8_LDI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  /* A negative low 8 bit absolute relocation of 16 bit address.
+     For LDI command.  */
+  HOWTO (R_AVR_LO8_LDI_NEG,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_LO8_LDI_NEG",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  /* A negative high 8 bit absolute relocation of 16 bit address.
+     For LDI command.  */
+  HOWTO (R_AVR_HI8_LDI_NEG,	/* type */
+	 8,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_HI8_LDI_NEG",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  /* A negative high 6 bit absolute relocation of 22 bit address.
+     For LDI command.  */
+  HOWTO (R_AVR_HH8_LDI_NEG,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_HH8_LDI_NEG",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  /* A low 8 bit absolute relocation of 24 bit program memory address.
+     For LDI command.  Will not be changed when linker stubs are needed. */
+  HOWTO (R_AVR_LO8_LDI_PM,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_LO8_LDI_PM",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  /* A low 8 bit absolute relocation of 24 bit program memory address.
+     For LDI command.  Will not be changed when linker stubs are needed. */
+  HOWTO (R_AVR_HI8_LDI_PM,	/* type */
+	 9,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_HI8_LDI_PM",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  /* A low 8 bit absolute relocation of 24 bit program memory address.
+     For LDI command.  Will not be changed when linker stubs are needed. */
+  HOWTO (R_AVR_HH8_LDI_PM,	/* type */
+	 17,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_HH8_LDI_PM",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  /* A low 8 bit absolute relocation of 24 bit program memory address.
+     For LDI command.  Will not be changed when linker stubs are needed. */
+  HOWTO (R_AVR_LO8_LDI_PM_NEG,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_LO8_LDI_PM_NEG", /* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  /* A low 8 bit absolute relocation of 24 bit program memory address.
+     For LDI command.  Will not be changed when linker stubs are needed. */
+  HOWTO (R_AVR_HI8_LDI_PM_NEG,	/* type */
+	 9,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_HI8_LDI_PM_NEG", /* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  /* A low 8 bit absolute relocation of 24 bit program memory address.
+     For LDI command.  Will not be changed when linker stubs are needed. */
+  HOWTO (R_AVR_HH8_LDI_PM_NEG,	/* type */
+	 17,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_HH8_LDI_PM_NEG", /* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  /* Relocation for CALL command in ATmega.  */
+  HOWTO (R_AVR_CALL,		/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 23,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_CALL",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),			/* pcrel_offset */
+  /* A 16 bit absolute relocation of 16 bit address.
+     For LDI command.  */
+  HOWTO (R_AVR_LDI,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_LDI",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  /* A 6 bit absolute relocation of 6 bit offset.
+     For ldd/sdd command.  */
+  HOWTO (R_AVR_6,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 6,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_6",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  /* A 6 bit absolute relocation of 6 bit offset.
+     For sbiw/adiw command.  */
+  HOWTO (R_AVR_6_ADIW,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 6,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_6_ADIW",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  /* Most significant 8 bit value of a 32 bit link-time constant.  */
+  HOWTO (R_AVR_MS8_LDI,		/* type */
+	 24,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_MS8_LDI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  /* Negative most significant 8 bit value of a 32 bit link-time constant.  */
+  HOWTO (R_AVR_MS8_LDI_NEG,	/* type */
+	 24,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_MS8_LDI_NEG",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE), 		/* pcrel_offset */
+  /* A low 8 bit absolute relocation of 24 bit program memory address.
+     For LDI command.  Will be changed when linker stubs are needed.  */
+  HOWTO (R_AVR_LO8_LDI_GS,      /* type */
+         1,                     /* rightshift */
+         1,                     /* size (0 = byte, 1 = short, 2 = long) */
+         8,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_AVR_LO8_LDI_GS",    /* name */
+         FALSE,                 /* partial_inplace */
+         0xffff,                /* src_mask */
+         0xffff,                /* dst_mask */
+         FALSE),                /* pcrel_offset */
+  /* A low 8 bit absolute relocation of 24 bit program memory address.
+     For LDI command.  Will be changed when linker stubs are needed.  */
+  HOWTO (R_AVR_HI8_LDI_GS,      /* type */
+         9,                     /* rightshift */
+         1,                     /* size (0 = byte, 1 = short, 2 = long) */
+         8,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_AVR_HI8_LDI_GS",    /* name */
+         FALSE,                 /* partial_inplace */
+         0xffff,                /* src_mask */
+         0xffff,                /* dst_mask */
+         FALSE),                /* pcrel_offset */
+  /* 8 bit offset.  */
+  HOWTO (R_AVR_8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_AVR_8",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x000000ff,		/* src_mask */
+	 0x000000ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+/* Map BFD reloc types to AVR ELF reloc types.  */
+
+struct avr_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned int elf_reloc_val;
+};
+
+static const struct avr_reloc_map avr_reloc_map[] =
+{
+  { BFD_RELOC_NONE,                 R_AVR_NONE },
+  { BFD_RELOC_32,                   R_AVR_32 },
+  { BFD_RELOC_AVR_7_PCREL,          R_AVR_7_PCREL },
+  { BFD_RELOC_AVR_13_PCREL,         R_AVR_13_PCREL },
+  { BFD_RELOC_16,                   R_AVR_16 },
+  { BFD_RELOC_AVR_16_PM,            R_AVR_16_PM },
+  { BFD_RELOC_AVR_LO8_LDI,          R_AVR_LO8_LDI},
+  { BFD_RELOC_AVR_HI8_LDI,          R_AVR_HI8_LDI },
+  { BFD_RELOC_AVR_HH8_LDI,          R_AVR_HH8_LDI },
+  { BFD_RELOC_AVR_MS8_LDI,          R_AVR_MS8_LDI },
+  { BFD_RELOC_AVR_LO8_LDI_NEG,      R_AVR_LO8_LDI_NEG },
+  { BFD_RELOC_AVR_HI8_LDI_NEG,      R_AVR_HI8_LDI_NEG },
+  { BFD_RELOC_AVR_HH8_LDI_NEG,      R_AVR_HH8_LDI_NEG },
+  { BFD_RELOC_AVR_MS8_LDI_NEG,      R_AVR_MS8_LDI_NEG },
+  { BFD_RELOC_AVR_LO8_LDI_PM,       R_AVR_LO8_LDI_PM },
+  { BFD_RELOC_AVR_LO8_LDI_GS,       R_AVR_LO8_LDI_GS },
+  { BFD_RELOC_AVR_HI8_LDI_PM,       R_AVR_HI8_LDI_PM },
+  { BFD_RELOC_AVR_HI8_LDI_GS,       R_AVR_HI8_LDI_GS },
+  { BFD_RELOC_AVR_HH8_LDI_PM,       R_AVR_HH8_LDI_PM },
+  { BFD_RELOC_AVR_LO8_LDI_PM_NEG,   R_AVR_LO8_LDI_PM_NEG },
+  { BFD_RELOC_AVR_HI8_LDI_PM_NEG,   R_AVR_HI8_LDI_PM_NEG },
+  { BFD_RELOC_AVR_HH8_LDI_PM_NEG,   R_AVR_HH8_LDI_PM_NEG },
+  { BFD_RELOC_AVR_CALL,             R_AVR_CALL },
+  { BFD_RELOC_AVR_LDI,              R_AVR_LDI  },
+  { BFD_RELOC_AVR_6,                R_AVR_6    },
+  { BFD_RELOC_AVR_6_ADIW,           R_AVR_6_ADIW },
+  { BFD_RELOC_8,                    R_AVR_8 }
+};
+
+/* Meant to be filled one day with the wrap around address for the
+   specific device.  I.e. should get the value 0x4000 for 16k devices,
+   0x8000 for 32k devices and so on.
+
+   We initialize it here with a value of 0x1000000 resulting in
+   that we will never suggest a wrap-around jump during relaxation.
+   The logic of the source code later on assumes that in
+   avr_pc_wrap_around one single bit is set.  */
+static bfd_vma avr_pc_wrap_around = 0x10000000;
+
+/* If this variable holds a value different from zero, the linker relaxation
+   machine will try to optimize call/ret sequences by a single jump
+   instruction. This option could be switched off by a linker switch.  */
+static int avr_replace_call_ret_sequences = 1;
+
+/* Initialize an entry in the stub hash table.  */
+
+static struct bfd_hash_entry *
+stub_hash_newfunc (struct bfd_hash_entry *entry,
+                   struct bfd_hash_table *table,
+                   const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table,
+                                 sizeof (struct elf32_avr_stub_hash_entry));
+      if (entry == NULL)
+        return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = bfd_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct elf32_avr_stub_hash_entry *hsh;
+
+      /* Initialize the local fields.  */
+      hsh = avr_stub_hash_entry (entry);
+      hsh->stub_offset = 0;
+      hsh->target_value = 0;
+    }
+
+  return entry;
+}
+
+/* This function is just a straight passthrough to the real
+   function in linker.c.  Its prupose is so that its address
+   can be compared inside the avr_link_hash_table macro.  */
+
+static struct bfd_hash_entry *
+elf32_avr_link_hash_newfunc (struct bfd_hash_entry * entry,
+			     struct bfd_hash_table * table,
+			     const char * string)
+{
+  return _bfd_elf_link_hash_newfunc (entry, table, string);
+}
+
+/* Create the derived linker hash table.  The AVR ELF port uses the derived
+   hash table to keep information specific to the AVR ELF linker (without
+   using static variables).  */
+
+static struct bfd_link_hash_table *
+elf32_avr_link_hash_table_create (bfd *abfd)
+{
+  struct elf32_avr_link_hash_table *htab;
+  bfd_size_type amt = sizeof (*htab);
+
+  htab = bfd_malloc (amt);
+  if (htab == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&htab->etab, abfd,
+                                      elf32_avr_link_hash_newfunc,
+                                      sizeof (struct elf_link_hash_entry),
+				      AVR_ELF_DATA))
+    {
+      free (htab);
+      return NULL;
+    }
+
+  /* Init the stub hash table too.  */
+  if (!bfd_hash_table_init (&htab->bstab, stub_hash_newfunc,
+                            sizeof (struct elf32_avr_stub_hash_entry)))
+    return NULL;
+
+  htab->stub_bfd = NULL;
+  htab->stub_sec = NULL;
+
+  /* Initialize the address mapping table.  */
+  htab->amt_stub_offsets = NULL;
+  htab->amt_destination_addr = NULL;
+  htab->amt_entry_cnt = 0;
+  htab->amt_max_entry_cnt = 0;
+
+  return &htab->etab.root;
+}
+
+/* Free the derived linker hash table.  */
+
+static void
+elf32_avr_link_hash_table_free (struct bfd_link_hash_table *btab)
+{
+  struct elf32_avr_link_hash_table *htab
+    = (struct elf32_avr_link_hash_table *) btab;
+
+  /* Free the address mapping table.  */
+  if (htab->amt_stub_offsets != NULL)
+    free (htab->amt_stub_offsets);
+  if (htab->amt_destination_addr != NULL)
+    free (htab->amt_destination_addr);
+
+  bfd_hash_table_free (&htab->bstab);
+  _bfd_generic_link_hash_table_free (btab);
+}
+
+/* Calculates the effective distance of a pc relative jump/call.  */
+
+static int
+avr_relative_distance_considering_wrap_around (unsigned int distance)
+{
+  unsigned int wrap_around_mask = avr_pc_wrap_around - 1;
+  int dist_with_wrap_around = distance & wrap_around_mask;
+
+  if (dist_with_wrap_around > ((int) (avr_pc_wrap_around >> 1)))
+    dist_with_wrap_around -= avr_pc_wrap_around;
+
+  return dist_with_wrap_around;
+}
+
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (avr_reloc_map) / sizeof (struct avr_reloc_map);
+       i++)
+    if (avr_reloc_map[i].bfd_reloc_val == code)
+      return &elf_avr_howto_table[avr_reloc_map[i].elf_reloc_val];
+
+  return NULL;
+}
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (elf_avr_howto_table) / sizeof (elf_avr_howto_table[0]);
+       i++)
+    if (elf_avr_howto_table[i].name != NULL
+	&& strcasecmp (elf_avr_howto_table[i].name, r_name) == 0)
+      return &elf_avr_howto_table[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for an AVR ELF reloc.  */
+
+static void
+avr_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
+			arelent *cache_ptr,
+			Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_AVR_max);
+  cache_ptr->howto = &elf_avr_howto_table[r_type];
+}
+
+static bfd_boolean
+avr_stub_is_required_for_16_bit_reloc (bfd_vma relocation)
+{
+  return (relocation >= 0x020000);
+}
+
+/* Returns the address of the corresponding stub if there is one.
+   Returns otherwise an address above 0x020000.  This function
+   could also be used, if there is no knowledge on the section where
+   the destination is found.  */
+
+static bfd_vma
+avr_get_stub_addr (bfd_vma srel,
+                   struct elf32_avr_link_hash_table *htab)
+{
+  unsigned int sindex;
+  bfd_vma stub_sec_addr =
+              (htab->stub_sec->output_section->vma +
+	       htab->stub_sec->output_offset);
+
+  for (sindex = 0; sindex < htab->amt_max_entry_cnt; sindex ++)
+    if (htab->amt_destination_addr[sindex] == srel)
+      return htab->amt_stub_offsets[sindex] + stub_sec_addr;
+
+  /* Return an address that could not be reached by 16 bit relocs.  */
+  return 0x020000;
+}
+
+/* Perform a single relocation.  By default we use the standard BFD
+   routines, but a few relocs, we have to do them ourselves.  */
+
+static bfd_reloc_status_type
+avr_final_link_relocate (reloc_howto_type *                 howto,
+			 bfd *                              input_bfd,
+			 asection *                         input_section,
+			 bfd_byte *                         contents,
+			 Elf_Internal_Rela *                rel,
+                         bfd_vma                            relocation,
+                         struct elf32_avr_link_hash_table * htab)
+{
+  bfd_reloc_status_type r = bfd_reloc_ok;
+  bfd_vma               x;
+  bfd_signed_vma	srel;
+  bfd_signed_vma	reloc_addr;
+  bfd_boolean           use_stubs = FALSE;
+  /* Usually is 0, unless we are generating code for a bootloader.  */
+  bfd_signed_vma        base_addr = htab->vector_base;
+
+  /* Absolute addr of the reloc in the final excecutable.  */
+  reloc_addr = rel->r_offset + input_section->output_section->vma
+	       + input_section->output_offset;
+
+  switch (howto->type)
+    {
+    case R_AVR_7_PCREL:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation;
+      srel += rel->r_addend;
+      srel -= rel->r_offset;
+      srel -= 2;	/* Branch instructions add 2 to the PC...  */
+      srel -= (input_section->output_section->vma +
+	       input_section->output_offset);
+
+      if (srel & 1)
+	return bfd_reloc_outofrange;
+      if (srel > ((1 << 7) - 1) || (srel < - (1 << 7)))
+	return bfd_reloc_overflow;
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xfc07) | (((srel >> 1) << 3) & 0x3f8);
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    case R_AVR_13_PCREL:
+      contents   += rel->r_offset;
+      srel = (bfd_signed_vma) relocation;
+      srel += rel->r_addend;
+      srel -= rel->r_offset;
+      srel -= 2;	/* Branch instructions add 2 to the PC...  */
+      srel -= (input_section->output_section->vma +
+	       input_section->output_offset);
+
+      if (srel & 1)
+	return bfd_reloc_outofrange;
+
+      srel = avr_relative_distance_considering_wrap_around (srel);
+
+      /* AVR addresses commands as words.  */
+      srel >>= 1;
+
+      /* Check for overflow.  */
+      if (srel < -2048 || srel > 2047)
+	{
+          /* Relative distance is too large.  */
+
+	  /* Always apply WRAPAROUND for avr2, avr25, and avr4.  */
+	  switch (bfd_get_mach (input_bfd))
+	    {
+	    case bfd_mach_avr2:
+	    case bfd_mach_avr25:
+	    case bfd_mach_avr4:
+	      break;
+
+	    default:
+	      return bfd_reloc_overflow;
+	    }
+	}
+
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xf000) | (srel & 0xfff);
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    case R_AVR_LO8_LDI:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation + rel->r_addend;
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    case R_AVR_LDI:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation + rel->r_addend;
+      if (((srel > 0) && (srel & 0xffff) > 255)
+	  || ((srel < 0) && ((-srel) & 0xffff) > 128))
+        /* Remove offset for data/eeprom section.  */
+        return bfd_reloc_overflow;
+
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    case R_AVR_6:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation + rel->r_addend;
+      if (((srel & 0xffff) > 63) || (srel < 0))
+	/* Remove offset for data/eeprom section.  */
+	return bfd_reloc_overflow;
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xd3f8) | ((srel & 7) | ((srel & (3 << 3)) << 7)
+                       | ((srel & (1 << 5)) << 8));
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    case R_AVR_6_ADIW:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation + rel->r_addend;
+      if (((srel & 0xffff) > 63) || (srel < 0))
+	/* Remove offset for data/eeprom section.  */
+	return bfd_reloc_overflow;
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xff30) | (srel & 0xf) | ((srel & 0x30) << 2);
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    case R_AVR_HI8_LDI:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation + rel->r_addend;
+      srel = (srel >> 8) & 0xff;
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    case R_AVR_HH8_LDI:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation + rel->r_addend;
+      srel = (srel >> 16) & 0xff;
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    case R_AVR_MS8_LDI:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation + rel->r_addend;
+      srel = (srel >> 24) & 0xff;
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    case R_AVR_LO8_LDI_NEG:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation + rel->r_addend;
+      srel = -srel;
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    case R_AVR_HI8_LDI_NEG:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation + rel->r_addend;
+      srel = -srel;
+      srel = (srel >> 8) & 0xff;
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    case R_AVR_HH8_LDI_NEG:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation + rel->r_addend;
+      srel = -srel;
+      srel = (srel >> 16) & 0xff;
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    case R_AVR_MS8_LDI_NEG:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation + rel->r_addend;
+      srel = -srel;
+      srel = (srel >> 24) & 0xff;
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    case R_AVR_LO8_LDI_GS:
+      use_stubs = (!htab->no_stubs);
+      /* Fall through.  */
+    case R_AVR_LO8_LDI_PM:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation + rel->r_addend;
+
+      if (use_stubs
+          && avr_stub_is_required_for_16_bit_reloc (srel - base_addr))
+        {
+          bfd_vma old_srel = srel;
+
+          /* We need to use the address of the stub instead.  */
+          srel = avr_get_stub_addr (srel, htab);
+          if (debug_stubs)
+            printf ("LD: Using jump stub (at 0x%x) with destination 0x%x for "
+                    "reloc at address 0x%x.\n",
+                    (unsigned int) srel,
+                    (unsigned int) old_srel,
+                    (unsigned int) reloc_addr);
+
+	  if (avr_stub_is_required_for_16_bit_reloc (srel - base_addr))
+	    return bfd_reloc_outofrange;
+        }
+
+      if (srel & 1)
+	return bfd_reloc_outofrange;
+      srel = srel >> 1;
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    case R_AVR_HI8_LDI_GS:
+      use_stubs = (!htab->no_stubs);
+      /* Fall through.  */
+    case R_AVR_HI8_LDI_PM:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation + rel->r_addend;
+
+      if (use_stubs
+          && avr_stub_is_required_for_16_bit_reloc (srel - base_addr))
+        {
+          bfd_vma old_srel = srel;
+
+          /* We need to use the address of the stub instead.  */
+          srel = avr_get_stub_addr (srel, htab);
+          if (debug_stubs)
+            printf ("LD: Using jump stub (at 0x%x) with destination 0x%x for "
+                    "reloc at address 0x%x.\n",
+                    (unsigned int) srel,
+                    (unsigned int) old_srel,
+                    (unsigned int) reloc_addr);
+
+	  if (avr_stub_is_required_for_16_bit_reloc (srel - base_addr))
+	    return bfd_reloc_outofrange;
+        }
+
+      if (srel & 1)
+	return bfd_reloc_outofrange;
+      srel = srel >> 1;
+      srel = (srel >> 8) & 0xff;
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    case R_AVR_HH8_LDI_PM:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation + rel->r_addend;
+      if (srel & 1)
+	return bfd_reloc_outofrange;
+      srel = srel >> 1;
+      srel = (srel >> 16) & 0xff;
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    case R_AVR_LO8_LDI_PM_NEG:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation + rel->r_addend;
+      srel = -srel;
+      if (srel & 1)
+	return bfd_reloc_outofrange;
+      srel = srel >> 1;
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    case R_AVR_HI8_LDI_PM_NEG:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation + rel->r_addend;
+      srel = -srel;
+      if (srel & 1)
+	return bfd_reloc_outofrange;
+      srel = srel >> 1;
+      srel = (srel >> 8) & 0xff;
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    case R_AVR_HH8_LDI_PM_NEG:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation + rel->r_addend;
+      srel = -srel;
+      if (srel & 1)
+	return bfd_reloc_outofrange;
+      srel = srel >> 1;
+      srel = (srel >> 16) & 0xff;
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xf0f0) | (srel & 0xf) | ((srel << 4) & 0xf00);
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    case R_AVR_CALL:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation + rel->r_addend;
+      if (srel & 1)
+	return bfd_reloc_outofrange;
+      srel = srel >> 1;
+      x = bfd_get_16 (input_bfd, contents);
+      x |= ((srel & 0x10000) | ((srel << 3) & 0x1f00000)) >> 16;
+      bfd_put_16 (input_bfd, x, contents);
+      bfd_put_16 (input_bfd, (bfd_vma) srel & 0xffff, contents+2);
+      break;
+
+    case R_AVR_16_PM:
+      use_stubs = (!htab->no_stubs);
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation + rel->r_addend;
+
+      if (use_stubs
+          && avr_stub_is_required_for_16_bit_reloc (srel - base_addr))
+        {
+          bfd_vma old_srel = srel;
+
+          /* We need to use the address of the stub instead.  */
+          srel = avr_get_stub_addr (srel,htab);
+          if (debug_stubs)
+            printf ("LD: Using jump stub (at 0x%x) with destination 0x%x for "
+                    "reloc at address 0x%x.\n",
+                    (unsigned int) srel,
+                    (unsigned int) old_srel,
+                    (unsigned int) reloc_addr);
+
+	  if (avr_stub_is_required_for_16_bit_reloc (srel - base_addr))
+	    return bfd_reloc_outofrange;
+        }
+
+      if (srel & 1)
+	return bfd_reloc_outofrange;
+      srel = srel >> 1;
+      bfd_put_16 (input_bfd, (bfd_vma) srel &0x00ffff, contents);
+      break;
+
+    default:
+      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+				    contents, rel->r_offset,
+				    relocation, rel->r_addend);
+    }
+
+  return r;
+}
+
+/* Relocate an AVR ELF section.  */
+
+static bfd_boolean
+elf32_avr_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
+			    struct bfd_link_info *info,
+			    bfd *input_bfd,
+			    asection *input_section,
+			    bfd_byte *contents,
+			    Elf_Internal_Rela *relocs,
+			    Elf_Internal_Sym *local_syms,
+			    asection **local_sections)
+{
+  Elf_Internal_Shdr *           symtab_hdr;
+  struct elf_link_hash_entry ** sym_hashes;
+  Elf_Internal_Rela *           rel;
+  Elf_Internal_Rela *           relend;
+  struct elf32_avr_link_hash_table * htab = avr_link_hash_table (info);
+
+  if (htab == NULL)
+    return FALSE;
+
+  symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+  relend     = relocs + input_section->reloc_count;
+
+  for (rel = relocs; rel < relend; rel ++)
+    {
+      reloc_howto_type *           howto;
+      unsigned long                r_symndx;
+      Elf_Internal_Sym *           sym;
+      asection *                   sec;
+      struct elf_link_hash_entry * h;
+      bfd_vma                      relocation;
+      bfd_reloc_status_type        r;
+      const char *                 name;
+      int                          r_type;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      howto  = elf_avr_howto_table + r_type;
+      h      = NULL;
+      sym    = NULL;
+      sec    = NULL;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections [r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+
+	  name = bfd_elf_string_from_elf_section
+	    (input_bfd, symtab_hdr->sh_link, sym->st_name);
+	  name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name;
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc, warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+
+	  name = h->root.root.string;
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      r = avr_final_link_relocate (howto, input_bfd, input_section,
+				   contents, rel, relocation, htab);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char * msg = (const char *) NULL;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      r = info->callbacks->reloc_overflow
+		(info, (h ? &h->root : NULL),
+		 name, howto->name, (bfd_vma) 0,
+		 input_bfd, input_section, rel->r_offset);
+	      break;
+
+	    case bfd_reloc_undefined:
+	      r = info->callbacks->undefined_symbol
+		(info, name, input_bfd, input_section, rel->r_offset, TRUE);
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      break;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      break;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous relocation");
+	      break;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      break;
+	    }
+
+	  if (msg)
+	    r = info->callbacks->warning
+	      (info, msg, name, input_bfd, input_section, rel->r_offset);
+
+	  if (! r)
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* The final processing done just before writing out a AVR ELF object
+   file.  This gets the AVR architecture right based on the machine
+   number.  */
+
+static void
+bfd_elf_avr_final_write_processing (bfd *abfd,
+				    bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  unsigned long val;
+
+  switch (bfd_get_mach (abfd))
+    {
+    default:
+    case bfd_mach_avr2:
+      val = E_AVR_MACH_AVR2;
+      break;
+
+    case bfd_mach_avr1:
+      val = E_AVR_MACH_AVR1;
+      break;
+
+    case bfd_mach_avr25:
+      val = E_AVR_MACH_AVR25;
+      break;
+
+    case bfd_mach_avr3:
+      val = E_AVR_MACH_AVR3;
+      break;
+
+    case bfd_mach_avr31:
+      val = E_AVR_MACH_AVR31;
+      break;
+
+    case bfd_mach_avr35:
+      val = E_AVR_MACH_AVR35;
+      break;
+
+    case bfd_mach_avr4:
+      val = E_AVR_MACH_AVR4;
+      break;
+
+    case bfd_mach_avr5:
+      val = E_AVR_MACH_AVR5;
+      break;
+
+    case bfd_mach_avr51:
+      val = E_AVR_MACH_AVR51;
+      break;
+
+    case bfd_mach_avr6:
+      val = E_AVR_MACH_AVR6;
+      break;
+
+    case bfd_mach_avrxmega1:
+      val = E_AVR_MACH_XMEGA1;
+      break;
+
+    case bfd_mach_avrxmega2:
+      val = E_AVR_MACH_XMEGA2;
+      break;
+
+    case bfd_mach_avrxmega3:
+      val = E_AVR_MACH_XMEGA3;
+      break;
+
+    case bfd_mach_avrxmega4:
+      val = E_AVR_MACH_XMEGA4;
+      break;
+
+    case bfd_mach_avrxmega5:
+      val = E_AVR_MACH_XMEGA5;
+      break;
+
+    case bfd_mach_avrxmega6:
+      val = E_AVR_MACH_XMEGA6;
+      break;
+
+    case bfd_mach_avrxmega7:
+      val = E_AVR_MACH_XMEGA7;
+      break;
+    }
+
+  elf_elfheader (abfd)->e_machine = EM_AVR;
+  elf_elfheader (abfd)->e_flags &= ~ EF_AVR_MACH;
+  elf_elfheader (abfd)->e_flags |= val;
+  elf_elfheader (abfd)->e_flags |= EF_AVR_LINKRELAX_PREPARED;
+}
+
+/* Set the right machine number.  */
+
+static bfd_boolean
+elf32_avr_object_p (bfd *abfd)
+{
+  unsigned int e_set = bfd_mach_avr2;
+
+  if (elf_elfheader (abfd)->e_machine == EM_AVR
+      || elf_elfheader (abfd)->e_machine == EM_AVR_OLD)
+    {
+      int e_mach = elf_elfheader (abfd)->e_flags & EF_AVR_MACH;
+
+      switch (e_mach)
+	{
+	default:
+	case E_AVR_MACH_AVR2:
+	  e_set = bfd_mach_avr2;
+	  break;
+
+	case E_AVR_MACH_AVR1:
+	  e_set = bfd_mach_avr1;
+	  break;
+
+	case E_AVR_MACH_AVR25:
+	  e_set = bfd_mach_avr25;
+	  break;
+
+	case E_AVR_MACH_AVR3:
+	  e_set = bfd_mach_avr3;
+	  break;
+
+	case E_AVR_MACH_AVR31:
+	  e_set = bfd_mach_avr31;
+	  break;
+
+	case E_AVR_MACH_AVR35:
+	  e_set = bfd_mach_avr35;
+	  break;
+
+	case E_AVR_MACH_AVR4:
+	  e_set = bfd_mach_avr4;
+	  break;
+
+	case E_AVR_MACH_AVR5:
+	  e_set = bfd_mach_avr5;
+	  break;
+
+	case E_AVR_MACH_AVR51:
+	  e_set = bfd_mach_avr51;
+	  break;
+
+	case E_AVR_MACH_AVR6:
+	  e_set = bfd_mach_avr6;
+	  break;
+
+	case E_AVR_MACH_XMEGA1:
+	  e_set = bfd_mach_avrxmega1;
+	  break;
+
+	case E_AVR_MACH_XMEGA2:
+	  e_set = bfd_mach_avrxmega2;
+	  break;
+
+	case E_AVR_MACH_XMEGA3:
+	  e_set = bfd_mach_avrxmega3;
+	  break;
+
+	case E_AVR_MACH_XMEGA4:
+	  e_set = bfd_mach_avrxmega4;
+	  break;
+
+	case E_AVR_MACH_XMEGA5:
+	  e_set = bfd_mach_avrxmega5;
+	  break;
+
+	case E_AVR_MACH_XMEGA6:
+	  e_set = bfd_mach_avrxmega6;
+	  break;
+
+	case E_AVR_MACH_XMEGA7:
+	  e_set = bfd_mach_avrxmega7;
+	  break;
+	}
+    }
+  return bfd_default_set_arch_mach (abfd, bfd_arch_avr,
+				    e_set);
+}
+
+
+/* Delete some bytes from a section while changing the size of an instruction.
+   The parameter "addr" denotes the section-relative offset pointing just
+   behind the shrinked instruction. "addr+count" point at the first
+   byte just behind the original unshrinked instruction.  */
+
+static bfd_boolean
+elf32_avr_relax_delete_bytes (bfd *abfd,
+                              asection *sec,
+                              bfd_vma addr,
+                              int count)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  unsigned int sec_shndx;
+  bfd_byte *contents;
+  Elf_Internal_Rela *irel, *irelend;
+  Elf_Internal_Sym *isym;
+  Elf_Internal_Sym *isymbuf = NULL;
+  bfd_vma toaddr;
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_link_hash_entry **end_hashes;
+  unsigned int symcount;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+  contents = elf_section_data (sec)->this_hdr.contents;
+
+  toaddr = sec->size;
+
+  irel = elf_section_data (sec)->relocs;
+  irelend = irel + sec->reloc_count;
+
+  /* Actually delete the bytes.  */
+  if (toaddr - addr - count > 0)
+    memmove (contents + addr, contents + addr + count,
+             (size_t) (toaddr - addr - count));
+  sec->size -= count;
+
+  /* Adjust all the reloc addresses.  */
+  for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
+    {
+      bfd_vma old_reloc_address;
+
+      old_reloc_address = (sec->output_section->vma
+                           + sec->output_offset + irel->r_offset);
+
+      /* Get the new reloc address.  */
+      if ((irel->r_offset > addr
+           && irel->r_offset < toaddr))
+        {
+          if (debug_relax)
+            printf ("Relocation at address 0x%x needs to be moved.\n"
+                    "Old section offset: 0x%x, New section offset: 0x%x \n",
+                    (unsigned int) old_reloc_address,
+                    (unsigned int) irel->r_offset,
+                    (unsigned int) ((irel->r_offset) - count));
+
+          irel->r_offset -= count;
+        }
+
+    }
+
+   /* The reloc's own addresses are now ok. However, we need to readjust
+      the reloc's addend, i.e. the reloc's value if two conditions are met:
+      1.) the reloc is relative to a symbol in this section that
+          is located in front of the shrinked instruction
+      2.) symbol plus addend end up behind the shrinked instruction.
+
+      The most common case where this happens are relocs relative to
+      the section-start symbol.
+
+      This step needs to be done for all of the sections of the bfd.  */
+
+  {
+    struct bfd_section *isec;
+
+    for (isec = abfd->sections; isec; isec = isec->next)
+     {
+       bfd_vma symval;
+       bfd_vma shrinked_insn_address;
+
+       shrinked_insn_address = (sec->output_section->vma
+                                + sec->output_offset + addr - count);
+
+       irelend = elf_section_data (isec)->relocs + isec->reloc_count;
+       for (irel = elf_section_data (isec)->relocs;
+            irel < irelend;
+            irel++)
+         {
+           /* Read this BFD's local symbols if we haven't done
+              so already.  */
+           if (isymbuf == NULL && symtab_hdr->sh_info != 0)
+             {
+               isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+               if (isymbuf == NULL)
+                 isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+                                                 symtab_hdr->sh_info, 0,
+                                                 NULL, NULL, NULL);
+               if (isymbuf == NULL)
+                 return FALSE;
+             }
+
+           /* Get the value of the symbol referred to by the reloc.  */
+           if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+             {
+               /* A local symbol.  */
+               asection *sym_sec;
+
+               isym = isymbuf + ELF32_R_SYM (irel->r_info);
+               sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+               symval = isym->st_value;
+               /* If the reloc is absolute, it will not have
+                  a symbol or section associated with it.  */
+               if (sym_sec == sec)
+                 {
+                   symval += sym_sec->output_section->vma
+                             + sym_sec->output_offset;
+
+                   if (debug_relax)
+                     printf ("Checking if the relocation's "
+                             "addend needs corrections.\n"
+                             "Address of anchor symbol: 0x%x \n"
+                             "Address of relocation target: 0x%x \n"
+                             "Address of relaxed insn: 0x%x \n",
+                             (unsigned int) symval,
+                             (unsigned int) (symval + irel->r_addend),
+                             (unsigned int) shrinked_insn_address);
+
+                   if (symval <= shrinked_insn_address
+                       && (symval + irel->r_addend) > shrinked_insn_address)
+                     {
+                       irel->r_addend -= count;
+
+                       if (debug_relax)
+                         printf ("Relocation's addend needed to be fixed \n");
+                     }
+                 }
+	       /* else...Reference symbol is absolute.  No adjustment needed.  */
+	     }
+	   /* else...Reference symbol is extern.  No need for adjusting
+	      the addend.  */
+	 }
+     }
+  }
+
+  /* Adjust the local symbols defined in this section.  */
+  isym = (Elf_Internal_Sym *) symtab_hdr->contents;
+  /* Fix PR 9841, there may be no local symbols.  */
+  if (isym != NULL)
+    {
+      Elf_Internal_Sym *isymend;
+
+      isymend = isym + symtab_hdr->sh_info;
+      for (; isym < isymend; isym++)
+	{
+	  if (isym->st_shndx == sec_shndx
+	      && isym->st_value > addr
+	      && isym->st_value < toaddr)
+	    isym->st_value -= count;
+	}
+    }
+
+  /* Now adjust the global symbols defined in this section.  */
+  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+              - symtab_hdr->sh_info);
+  sym_hashes = elf_sym_hashes (abfd);
+  end_hashes = sym_hashes + symcount;
+  for (; sym_hashes < end_hashes; sym_hashes++)
+    {
+      struct elf_link_hash_entry *sym_hash = *sym_hashes;
+      if ((sym_hash->root.type == bfd_link_hash_defined
+           || sym_hash->root.type == bfd_link_hash_defweak)
+          && sym_hash->root.u.def.section == sec
+          && sym_hash->root.u.def.value > addr
+          && sym_hash->root.u.def.value < toaddr)
+        {
+          sym_hash->root.u.def.value -= count;
+        }
+    }
+
+  return TRUE;
+}
+
+/* This function handles relaxing for the avr.
+   Many important relaxing opportunities within functions are already
+   realized by the compiler itself.
+   Here we try to replace  call (4 bytes) ->  rcall (2 bytes)
+   and jump -> rjmp (safes also 2 bytes).
+   As well we now optimize seqences of
+     - call/rcall function
+     - ret
+   to yield
+     - jmp/rjmp function
+     - ret
+   . In case that within a sequence
+     - jmp/rjmp label
+     - ret
+   the ret could no longer be reached it is optimized away. In order
+   to check if the ret is no longer needed, it is checked that the ret's address
+   is not the target of a branch or jump within the same section, it is checked
+   that there is no skip instruction before the jmp/rjmp and that there
+   is no local or global label place at the address of the ret.
+
+   We refrain from relaxing within sections ".vectors" and
+   ".jumptables" in order to maintain the position of the instructions.
+   There, however, we substitute jmp/call by a sequence rjmp,nop/rcall,nop
+   if possible. (In future one could possibly use the space of the nop
+   for the first instruction of the irq service function.
+
+   The .jumptables sections is meant to be used for a future tablejump variant
+   for the devices with 3-byte program counter where the table itself
+   contains 4-byte jump instructions whose relative offset must not
+   be changed.  */
+
+static bfd_boolean
+elf32_avr_relax_section (bfd *abfd,
+			 asection *sec,
+                         struct bfd_link_info *link_info,
+                         bfd_boolean *again)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *internal_relocs;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_byte *contents = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+  struct elf32_avr_link_hash_table *htab;
+
+  if (link_info->relocatable)
+    (*link_info->callbacks->einfo)
+      (_("%P%F: --relax and -r may not be used together\n"));
+
+  htab = avr_link_hash_table (link_info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* Assume nothing changes.  */
+  *again = FALSE;
+
+  if ((!htab->no_stubs) && (sec == htab->stub_sec))
+    {
+      /* We are just relaxing the stub section.
+	 Let's calculate the size needed again.  */
+      bfd_size_type last_estimated_stub_section_size = htab->stub_sec->size;
+
+      if (debug_relax)
+        printf ("Relaxing the stub section. Size prior to this pass: %i\n",
+                (int) last_estimated_stub_section_size);
+
+      elf32_avr_size_stubs (htab->stub_sec->output_section->owner,
+                            link_info, FALSE);
+
+      /* Check if the number of trampolines changed.  */
+      if (last_estimated_stub_section_size != htab->stub_sec->size)
+        *again = TRUE;
+
+      if (debug_relax)
+        printf ("Size of stub section after this pass: %i\n",
+                (int) htab->stub_sec->size);
+
+      return TRUE;
+    }
+
+  /* We don't have to do anything for a relocatable link, if
+     this section does not have relocs, or if this is not a
+     code section.  */
+  if (link_info->relocatable
+      || (sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0
+      || (sec->flags & SEC_CODE) == 0)
+    return TRUE;
+
+  /* Check if the object file to relax uses internal symbols so that we
+     could fix up the relocations.  */
+  if (!(elf_elfheader (abfd)->e_flags & EF_AVR_LINKRELAX_PREPARED))
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+
+  /* Get a copy of the native relocations.  */
+  internal_relocs = (_bfd_elf_link_read_relocs
+                     (abfd, sec, NULL, NULL, link_info->keep_memory));
+  if (internal_relocs == NULL)
+    goto error_return;
+
+  /* Walk through the relocs looking for relaxing opportunities.  */
+  irelend = internal_relocs + sec->reloc_count;
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      bfd_vma symval;
+
+      if (   ELF32_R_TYPE (irel->r_info) != R_AVR_13_PCREL
+	     && ELF32_R_TYPE (irel->r_info) != R_AVR_7_PCREL
+	     && ELF32_R_TYPE (irel->r_info) != R_AVR_CALL)
+        continue;
+
+      /* Get the section contents if we haven't done so already.  */
+      if (contents == NULL)
+        {
+          /* Get cached copy if it exists.  */
+          if (elf_section_data (sec)->this_hdr.contents != NULL)
+            contents = elf_section_data (sec)->this_hdr.contents;
+          else
+            {
+              /* Go get them off disk.  */
+              if (! bfd_malloc_and_get_section (abfd, sec, &contents))
+                goto error_return;
+            }
+        }
+
+      /* Read this BFD's local symbols if we haven't done so already.  */
+      if (isymbuf == NULL && symtab_hdr->sh_info != 0)
+        {
+          isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+          if (isymbuf == NULL)
+            isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+                                            symtab_hdr->sh_info, 0,
+                                            NULL, NULL, NULL);
+          if (isymbuf == NULL)
+            goto error_return;
+        }
+
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+        {
+          /* A local symbol.  */
+          Elf_Internal_Sym *isym;
+          asection *sym_sec;
+
+          isym = isymbuf + ELF32_R_SYM (irel->r_info);
+          sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+          symval = isym->st_value;
+          /* If the reloc is absolute, it will not have
+             a symbol or section associated with it.  */
+          if (sym_sec)
+            symval += sym_sec->output_section->vma
+              + sym_sec->output_offset;
+        }
+      else
+        {
+          unsigned long indx;
+          struct elf_link_hash_entry *h;
+
+          /* An external symbol.  */
+          indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+          h = elf_sym_hashes (abfd)[indx];
+          BFD_ASSERT (h != NULL);
+          if (h->root.type != bfd_link_hash_defined
+              && h->root.type != bfd_link_hash_defweak)
+	    /* This appears to be a reference to an undefined
+	       symbol.  Just ignore it--it will be caught by the
+	       regular reloc processing.  */
+	    continue;
+
+          symval = (h->root.u.def.value
+                    + h->root.u.def.section->output_section->vma
+                    + h->root.u.def.section->output_offset);
+        }
+
+      /* For simplicity of coding, we are going to modify the section
+         contents, the section relocs, and the BFD symbol table.  We
+         must tell the rest of the code not to free up this
+         information.  It would be possible to instead create a table
+         of changes which have to be made, as is done in coff-mips.c;
+         that would be more work, but would require less memory when
+         the linker is run.  */
+      switch (ELF32_R_TYPE (irel->r_info))
+        {
+	  /* Try to turn a 22-bit absolute call/jump into an 13-bit
+	     pc-relative rcall/rjmp.  */
+	case R_AVR_CALL:
+          {
+            bfd_vma value = symval + irel->r_addend;
+            bfd_vma dot, gap;
+            int distance_short_enough = 0;
+
+            /* Get the address of this instruction.  */
+            dot = (sec->output_section->vma
+                   + sec->output_offset + irel->r_offset);
+
+            /* Compute the distance from this insn to the branch target.  */
+            gap = value - dot;
+
+            /* If the distance is within -4094..+4098 inclusive, then we can
+               relax this jump/call.  +4098 because the call/jump target
+               will be closer after the relaxation.  */
+            if ((int) gap >= -4094 && (int) gap <= 4098)
+              distance_short_enough = 1;
+
+            /* Here we handle the wrap-around case.  E.g. for a 16k device
+               we could use a rjmp to jump from address 0x100 to 0x3d00!
+               In order to make this work properly, we need to fill the
+               vaiable avr_pc_wrap_around with the appropriate value.
+               I.e. 0x4000 for a 16k device.  */
+            {
+	      /* Shrinking the code size makes the gaps larger in the
+		 case of wrap-arounds.  So we use a heuristical safety
+		 margin to avoid that during relax the distance gets
+		 again too large for the short jumps.  Let's assume
+		 a typical code-size reduction due to relax for a
+		 16k device of 600 bytes.  So let's use twice the
+		 typical value as safety margin.  */
+	      int rgap;
+	      int safety_margin;
+
+	      int assumed_shrink = 600;
+	      if (avr_pc_wrap_around > 0x4000)
+		assumed_shrink = 900;
+
+	      safety_margin = 2 * assumed_shrink;
+
+	      rgap = avr_relative_distance_considering_wrap_around (gap);
+
+	      if (rgap >= (-4092 + safety_margin)
+		  && rgap <= (4094 - safety_margin))
+		distance_short_enough = 1;
+            }
+
+            if (distance_short_enough)
+              {
+                unsigned char code_msb;
+                unsigned char code_lsb;
+
+                if (debug_relax)
+                  printf ("shrinking jump/call instruction at address 0x%x"
+                          " in section %s\n\n",
+                          (int) dot, sec->name);
+
+                /* Note that we've changed the relocs, section contents,
+                   etc.  */
+                elf_section_data (sec)->relocs = internal_relocs;
+                elf_section_data (sec)->this_hdr.contents = contents;
+                symtab_hdr->contents = (unsigned char *) isymbuf;
+
+                /* Get the instruction code for relaxing.  */
+                code_lsb = bfd_get_8 (abfd, contents + irel->r_offset);
+                code_msb = bfd_get_8 (abfd, contents + irel->r_offset + 1);
+
+                /* Mask out the relocation bits.  */
+                code_msb &= 0x94;
+                code_lsb &= 0x0E;
+                if (code_msb == 0x94 && code_lsb == 0x0E)
+                  {
+                    /* we are changing call -> rcall .  */
+                    bfd_put_8 (abfd, 0x00, contents + irel->r_offset);
+                    bfd_put_8 (abfd, 0xD0, contents + irel->r_offset + 1);
+                  }
+                else if (code_msb == 0x94 && code_lsb == 0x0C)
+                  {
+                    /* we are changeing jump -> rjmp.  */
+                    bfd_put_8 (abfd, 0x00, contents + irel->r_offset);
+                    bfd_put_8 (abfd, 0xC0, contents + irel->r_offset + 1);
+                  }
+                else
+                  abort ();
+
+                /* Fix the relocation's type.  */
+                irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                             R_AVR_13_PCREL);
+
+                /* Check for the vector section. There we don't want to
+                   modify the ordering!  */
+
+                if (!strcmp (sec->name,".vectors")
+                    || !strcmp (sec->name,".jumptables"))
+                  {
+                    /* Let's insert a nop.  */
+                    bfd_put_8 (abfd, 0x00, contents + irel->r_offset + 2);
+                    bfd_put_8 (abfd, 0x00, contents + irel->r_offset + 3);
+                  }
+                else
+                  {
+                    /* Delete two bytes of data.  */
+                    if (!elf32_avr_relax_delete_bytes (abfd, sec,
+                                                       irel->r_offset + 2, 2))
+                      goto error_return;
+
+                    /* That will change things, so, we should relax again.
+                       Note that this is not required, and it may be slow.  */
+                    *again = TRUE;
+                  }
+              }
+          }
+
+        default:
+          {
+            unsigned char code_msb;
+            unsigned char code_lsb;
+            bfd_vma dot;
+
+            code_msb = bfd_get_8 (abfd, contents + irel->r_offset + 1);
+            code_lsb = bfd_get_8 (abfd, contents + irel->r_offset + 0);
+
+            /* Get the address of this instruction.  */
+            dot = (sec->output_section->vma
+                   + sec->output_offset + irel->r_offset);
+
+            /* Here we look for rcall/ret or call/ret sequences that could be
+               safely replaced by rjmp/ret or jmp/ret.  */
+            if (((code_msb & 0xf0) == 0xd0)
+                && avr_replace_call_ret_sequences)
+              {
+                /* This insn is a rcall.  */
+                unsigned char next_insn_msb = 0;
+                unsigned char next_insn_lsb = 0;
+
+                if (irel->r_offset + 3 < sec->size)
+                  {
+                    next_insn_msb =
+		      bfd_get_8 (abfd, contents + irel->r_offset + 3);
+                    next_insn_lsb =
+		      bfd_get_8 (abfd, contents + irel->r_offset + 2);
+                  }
+
+		if ((0x95 == next_insn_msb) && (0x08 == next_insn_lsb))
+                  {
+                    /* The next insn is a ret. We now convert the rcall insn
+                       into a rjmp instruction.  */
+                    code_msb &= 0xef;
+                    bfd_put_8 (abfd, code_msb, contents + irel->r_offset + 1);
+                    if (debug_relax)
+                      printf ("converted rcall/ret sequence at address 0x%x"
+                              " into rjmp/ret sequence. Section is %s\n\n",
+                              (int) dot, sec->name);
+                    *again = TRUE;
+                    break;
+                  }
+              }
+            else if ((0x94 == (code_msb & 0xfe))
+		     && (0x0e == (code_lsb & 0x0e))
+		     && avr_replace_call_ret_sequences)
+              {
+                /* This insn is a call.  */
+                unsigned char next_insn_msb = 0;
+                unsigned char next_insn_lsb = 0;
+
+                if (irel->r_offset + 5 < sec->size)
+                  {
+                    next_insn_msb =
+		      bfd_get_8 (abfd, contents + irel->r_offset + 5);
+                    next_insn_lsb =
+		      bfd_get_8 (abfd, contents + irel->r_offset + 4);
+                  }
+
+                if ((0x95 == next_insn_msb) && (0x08 == next_insn_lsb))
+                  {
+                    /* The next insn is a ret. We now convert the call insn
+                       into a jmp instruction.  */
+
+                    code_lsb &= 0xfd;
+                    bfd_put_8 (abfd, code_lsb, contents + irel->r_offset);
+                    if (debug_relax)
+                      printf ("converted call/ret sequence at address 0x%x"
+                              " into jmp/ret sequence. Section is %s\n\n",
+                              (int) dot, sec->name);
+                    *again = TRUE;
+                    break;
+                  }
+              }
+            else if ((0xc0 == (code_msb & 0xf0))
+                     || ((0x94 == (code_msb & 0xfe))
+                         && (0x0c == (code_lsb & 0x0e))))
+              {
+                /* This insn is a rjmp or a jmp.  */
+                unsigned char next_insn_msb = 0;
+                unsigned char next_insn_lsb = 0;
+                int insn_size;
+
+                if (0xc0 == (code_msb & 0xf0))
+                  insn_size = 2; /* rjmp insn */
+                else
+                  insn_size = 4; /* jmp insn */
+
+                if (irel->r_offset + insn_size + 1 < sec->size)
+                  {
+                    next_insn_msb =
+		      bfd_get_8 (abfd, contents + irel->r_offset
+				 + insn_size + 1);
+                    next_insn_lsb =
+		      bfd_get_8 (abfd, contents + irel->r_offset
+				 + insn_size);
+                  }
+
+                if ((0x95 == next_insn_msb) && (0x08 == next_insn_lsb))
+                  {
+                    /* The next insn is a ret. We possibly could delete
+                       this ret. First we need to check for preceding
+                       sbis/sbic/sbrs or cpse "skip" instructions.  */
+
+                    int there_is_preceding_non_skip_insn = 1;
+                    bfd_vma address_of_ret;
+
+                    address_of_ret = dot + insn_size;
+
+                    if (debug_relax && (insn_size == 2))
+                      printf ("found rjmp / ret sequence at address 0x%x\n",
+                              (int) dot);
+                    if (debug_relax && (insn_size == 4))
+                      printf ("found jmp / ret sequence at address 0x%x\n",
+                              (int) dot);
+
+                    /* We have to make sure that there is a preceding insn.  */
+                    if (irel->r_offset >= 2)
+                      {
+                        unsigned char preceding_msb;
+                        unsigned char preceding_lsb;
+
+                        preceding_msb =
+			  bfd_get_8 (abfd, contents + irel->r_offset - 1);
+                        preceding_lsb =
+			  bfd_get_8 (abfd, contents + irel->r_offset - 2);
+
+                        /* sbic.  */
+                        if (0x99 == preceding_msb)
+                          there_is_preceding_non_skip_insn = 0;
+
+                        /* sbis.  */
+                        if (0x9b == preceding_msb)
+                          there_is_preceding_non_skip_insn = 0;
+
+                        /* sbrc */
+                        if ((0xfc == (preceding_msb & 0xfe)
+			     && (0x00 == (preceding_lsb & 0x08))))
+                          there_is_preceding_non_skip_insn = 0;
+
+                        /* sbrs */
+                        if ((0xfe == (preceding_msb & 0xfe)
+			     && (0x00 == (preceding_lsb & 0x08))))
+                          there_is_preceding_non_skip_insn = 0;
+
+                        /* cpse */
+                        if (0x10 == (preceding_msb & 0xfc))
+                          there_is_preceding_non_skip_insn = 0;
+
+                        if (there_is_preceding_non_skip_insn == 0)
+                          if (debug_relax)
+                            printf ("preceding skip insn prevents deletion of"
+                                    " ret insn at Addy 0x%x in section %s\n",
+                                    (int) dot + 2, sec->name);
+                      }
+                    else
+                      {
+                        /* There is no previous instruction.  */
+                        there_is_preceding_non_skip_insn = 0;
+                      }
+
+                    if (there_is_preceding_non_skip_insn)
+                      {
+                        /* We now only have to make sure that there is no
+                           local label defined at the address of the ret
+                           instruction and that there is no local relocation
+                           in this section pointing to the ret.  */
+
+                        int deleting_ret_is_safe = 1;
+                        unsigned int section_offset_of_ret_insn =
+			  irel->r_offset + insn_size;
+                        Elf_Internal_Sym *isym, *isymend;
+                        unsigned int sec_shndx;
+
+                        sec_shndx =
+			  _bfd_elf_section_from_bfd_section (abfd, sec);
+
+                        /* Check for local symbols.  */
+                        isym = (Elf_Internal_Sym *) symtab_hdr->contents;
+                        isymend = isym + symtab_hdr->sh_info;
+			/* PR 6019: There may not be any local symbols.  */
+                        for (; isym != NULL && isym < isymend; isym++)
+			  {
+			    if (isym->st_value == section_offset_of_ret_insn
+				&& isym->st_shndx == sec_shndx)
+			      {
+				deleting_ret_is_safe = 0;
+				if (debug_relax)
+				  printf ("local label prevents deletion of ret "
+					  "insn at address 0x%x\n",
+					  (int) dot + insn_size);
+			      }
+			  }
+
+			/* Now check for global symbols.  */
+			{
+			  int symcount;
+			  struct elf_link_hash_entry **sym_hashes;
+			  struct elf_link_hash_entry **end_hashes;
+
+			  symcount = (symtab_hdr->sh_size
+				      / sizeof (Elf32_External_Sym)
+				      - symtab_hdr->sh_info);
+			  sym_hashes = elf_sym_hashes (abfd);
+			  end_hashes = sym_hashes + symcount;
+			  for (; sym_hashes < end_hashes; sym_hashes++)
+			    {
+			      struct elf_link_hash_entry *sym_hash =
+				*sym_hashes;
+			      if ((sym_hash->root.type == bfd_link_hash_defined
+				   || sym_hash->root.type ==
+				   bfd_link_hash_defweak)
+				  && sym_hash->root.u.def.section == sec
+				  && sym_hash->root.u.def.value == section_offset_of_ret_insn)
+				{
+				  deleting_ret_is_safe = 0;
+				  if (debug_relax)
+				    printf ("global label prevents deletion of "
+					    "ret insn at address 0x%x\n",
+					    (int) dot + insn_size);
+				}
+			    }
+			}
+			/* Now we check for relocations pointing to ret.  */
+			{
+			  Elf_Internal_Rela *rel;
+			  Elf_Internal_Rela *relend;
+
+			  relend = elf_section_data (sec)->relocs
+			    + sec->reloc_count;
+
+			  for (rel = elf_section_data (sec)->relocs;
+			       rel < relend; rel++)
+			    {
+			      bfd_vma reloc_target = 0;
+
+			      /* Read this BFD's local symbols if we haven't
+				 done so already.  */
+			      if (isymbuf == NULL && symtab_hdr->sh_info != 0)
+				{
+				  isymbuf = (Elf_Internal_Sym *)
+				    symtab_hdr->contents;
+				  if (isymbuf == NULL)
+				    isymbuf = bfd_elf_get_elf_syms
+				      (abfd,
+				       symtab_hdr,
+				       symtab_hdr->sh_info, 0,
+				       NULL, NULL, NULL);
+				  if (isymbuf == NULL)
+				    break;
+				}
+
+			      /* Get the value of the symbol referred to
+				 by the reloc.  */
+			      if (ELF32_R_SYM (rel->r_info)
+				  < symtab_hdr->sh_info)
+				{
+				  /* A local symbol.  */
+				  asection *sym_sec;
+
+				  isym = isymbuf
+				    + ELF32_R_SYM (rel->r_info);
+				  sym_sec = bfd_section_from_elf_index
+				    (abfd, isym->st_shndx);
+				  symval = isym->st_value;
+
+				  /* If the reloc is absolute, it will not
+				     have a symbol or section associated
+				     with it.  */
+
+				  if (sym_sec)
+				    {
+				      symval +=
+					sym_sec->output_section->vma
+					+ sym_sec->output_offset;
+				      reloc_target = symval + rel->r_addend;
+				    }
+				  else
+				    {
+				      reloc_target = symval + rel->r_addend;
+				      /* Reference symbol is absolute.  */
+				    }
+				}
+			      /* else ... reference symbol is extern.  */
+
+			      if (address_of_ret == reloc_target)
+				{
+				  deleting_ret_is_safe = 0;
+				  if (debug_relax)
+				    printf ("ret from "
+					    "rjmp/jmp ret sequence at address"
+					    " 0x%x could not be deleted. ret"
+					    " is target of a relocation.\n",
+					    (int) address_of_ret);
+				}
+			    }
+			}
+
+			if (deleting_ret_is_safe)
+			  {
+			    if (debug_relax)
+			      printf ("unreachable ret instruction "
+				      "at address 0x%x deleted.\n",
+				      (int) dot + insn_size);
+
+			    /* Delete two bytes of data.  */
+			    if (!elf32_avr_relax_delete_bytes (abfd, sec,
+							       irel->r_offset + insn_size, 2))
+			      goto error_return;
+
+			    /* That will change things, so, we should relax
+			       again. Note that this is not required, and it
+			       may be slow.  */
+			    *again = TRUE;
+			    break;
+			  }
+                      }
+
+                  }
+              }
+            break;
+          }
+        }
+    }
+
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    {
+      if (! link_info->keep_memory)
+        free (contents);
+      else
+        {
+          /* Cache the section contents for elf_link_input_bfd.  */
+          elf_section_data (sec)->this_hdr.contents = contents;
+        }
+    }
+
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return TRUE;
+
+ error_return:
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    free (contents);
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return FALSE;
+}
+
+/* This is a version of bfd_generic_get_relocated_section_contents
+   which uses elf32_avr_relocate_section.
+
+   For avr it's essentially a cut and paste taken from the H8300 port.
+   The author of the relaxation support patch for avr had absolutely no
+   clue what is happening here but found out that this part of the code
+   seems to be important.  */
+
+static bfd_byte *
+elf32_avr_get_relocated_section_contents (bfd *output_bfd,
+                                          struct bfd_link_info *link_info,
+                                          struct bfd_link_order *link_order,
+                                          bfd_byte *data,
+                                          bfd_boolean relocatable,
+                                          asymbol **symbols)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  asection *input_section = link_order->u.indirect.section;
+  bfd *input_bfd = input_section->owner;
+  asection **sections = NULL;
+  Elf_Internal_Rela *internal_relocs = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+
+  /* We only need to handle the case of relaxing, or of having a
+     particular set of section contents, specially.  */
+  if (relocatable
+      || elf_section_data (input_section)->this_hdr.contents == NULL)
+    return bfd_generic_get_relocated_section_contents (output_bfd, link_info,
+                                                       link_order, data,
+                                                       relocatable,
+                                                       symbols);
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+
+  memcpy (data, elf_section_data (input_section)->this_hdr.contents,
+          (size_t) input_section->size);
+
+  if ((input_section->flags & SEC_RELOC) != 0
+      && input_section->reloc_count > 0)
+    {
+      asection **secpp;
+      Elf_Internal_Sym *isym, *isymend;
+      bfd_size_type amt;
+
+      internal_relocs = (_bfd_elf_link_read_relocs
+                         (input_bfd, input_section, NULL, NULL, FALSE));
+      if (internal_relocs == NULL)
+        goto error_return;
+
+      if (symtab_hdr->sh_info != 0)
+        {
+          isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+          if (isymbuf == NULL)
+            isymbuf = bfd_elf_get_elf_syms (input_bfd, symtab_hdr,
+                                            symtab_hdr->sh_info, 0,
+                                            NULL, NULL, NULL);
+          if (isymbuf == NULL)
+            goto error_return;
+        }
+
+      amt = symtab_hdr->sh_info;
+      amt *= sizeof (asection *);
+      sections = bfd_malloc (amt);
+      if (sections == NULL && amt != 0)
+        goto error_return;
+
+      isymend = isymbuf + symtab_hdr->sh_info;
+      for (isym = isymbuf, secpp = sections; isym < isymend; ++isym, ++secpp)
+        {
+          asection *isec;
+
+          if (isym->st_shndx == SHN_UNDEF)
+            isec = bfd_und_section_ptr;
+          else if (isym->st_shndx == SHN_ABS)
+            isec = bfd_abs_section_ptr;
+          else if (isym->st_shndx == SHN_COMMON)
+            isec = bfd_com_section_ptr;
+          else
+            isec = bfd_section_from_elf_index (input_bfd, isym->st_shndx);
+
+          *secpp = isec;
+        }
+
+      if (! elf32_avr_relocate_section (output_bfd, link_info, input_bfd,
+                                        input_section, data, internal_relocs,
+                                        isymbuf, sections))
+        goto error_return;
+
+      if (sections != NULL)
+        free (sections);
+      if (isymbuf != NULL
+          && symtab_hdr->contents != (unsigned char *) isymbuf)
+        free (isymbuf);
+      if (elf_section_data (input_section)->relocs != internal_relocs)
+        free (internal_relocs);
+    }
+
+  return data;
+
+ error_return:
+  if (sections != NULL)
+    free (sections);
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (internal_relocs != NULL
+      && elf_section_data (input_section)->relocs != internal_relocs)
+    free (internal_relocs);
+  return NULL;
+}
+
+
+/* Determines the hash entry name for a particular reloc. It consists of
+   the identifier of the symbol section and the added reloc addend and
+   symbol offset relative to the section the symbol is attached to.  */
+
+static char *
+avr_stub_name (const asection *symbol_section,
+               const bfd_vma symbol_offset,
+               const Elf_Internal_Rela *rela)
+{
+  char *stub_name;
+  bfd_size_type len;
+
+  len = 8 + 1 + 8 + 1 + 1;
+  stub_name = bfd_malloc (len);
+
+  sprintf (stub_name, "%08x+%08x",
+           symbol_section->id & 0xffffffff,
+           (unsigned int) ((rela->r_addend & 0xffffffff) + symbol_offset));
+
+  return stub_name;
+}
+
+
+/* Add a new stub entry to the stub hash.  Not all fields of the new
+   stub entry are initialised.  */
+
+static struct elf32_avr_stub_hash_entry *
+avr_add_stub (const char *stub_name,
+              struct elf32_avr_link_hash_table *htab)
+{
+  struct elf32_avr_stub_hash_entry *hsh;
+
+  /* Enter this entry into the linker stub hash table.  */
+  hsh = avr_stub_hash_lookup (&htab->bstab, stub_name, TRUE, FALSE);
+
+  if (hsh == NULL)
+    {
+      (*_bfd_error_handler) (_("%B: cannot create stub entry %s"),
+                             NULL, stub_name);
+      return NULL;
+    }
+
+  hsh->stub_offset = 0;
+  return hsh;
+}
+
+/* We assume that there is already space allocated for the stub section
+   contents and that before building the stubs the section size is
+   initialized to 0.  We assume that within the stub hash table entry,
+   the absolute position of the jmp target has been written in the
+   target_value field.  We write here the offset of the generated jmp insn
+   relative to the trampoline section start to the stub_offset entry in
+   the stub hash table entry.  */
+
+static  bfd_boolean
+avr_build_one_stub (struct bfd_hash_entry *bh, void *in_arg)
+{
+  struct elf32_avr_stub_hash_entry *hsh;
+  struct bfd_link_info *info;
+  struct elf32_avr_link_hash_table *htab;
+  bfd *stub_bfd;
+  bfd_byte *loc;
+  bfd_vma target;
+  bfd_vma starget;
+
+  /* Basic opcode */
+  bfd_vma jmp_insn = 0x0000940c;
+
+  /* Massage our args to the form they really have.  */
+  hsh = avr_stub_hash_entry (bh);
+
+  if (!hsh->is_actually_needed)
+    return TRUE;
+
+  info = (struct bfd_link_info *) in_arg;
+
+  htab = avr_link_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  target = hsh->target_value;
+
+  /* Make a note of the offset within the stubs for this entry.  */
+  hsh->stub_offset = htab->stub_sec->size;
+  loc = htab->stub_sec->contents + hsh->stub_offset;
+
+  stub_bfd = htab->stub_sec->owner;
+
+  if (debug_stubs)
+    printf ("Building one Stub. Address: 0x%x, Offset: 0x%x\n",
+             (unsigned int) target,
+             (unsigned int) hsh->stub_offset);
+
+  /* We now have to add the information on the jump target to the bare
+     opcode bits already set in jmp_insn.  */
+
+  /* Check for the alignment of the address.  */
+  if (target & 1)
+     return FALSE;
+
+  starget = target >> 1;
+  jmp_insn |= ((starget & 0x10000) | ((starget << 3) & 0x1f00000)) >> 16;
+  bfd_put_16 (stub_bfd, jmp_insn, loc);
+  bfd_put_16 (stub_bfd, (bfd_vma) starget & 0xffff, loc + 2);
+
+  htab->stub_sec->size += 4;
+
+  /* Now add the entries in the address mapping table if there is still
+     space left.  */
+  {
+    unsigned int nr;
+
+    nr = htab->amt_entry_cnt + 1;
+    if (nr <= htab->amt_max_entry_cnt)
+      {
+        htab->amt_entry_cnt = nr;
+
+        htab->amt_stub_offsets[nr - 1] = hsh->stub_offset;
+        htab->amt_destination_addr[nr - 1] = target;
+      }
+  }
+
+  return TRUE;
+}
+
+static bfd_boolean
+avr_mark_stub_not_to_be_necessary (struct bfd_hash_entry *bh,
+                                   void *in_arg ATTRIBUTE_UNUSED)
+{
+  struct elf32_avr_stub_hash_entry *hsh;
+
+  hsh = avr_stub_hash_entry (bh);
+  hsh->is_actually_needed = FALSE;
+
+  return TRUE;
+}
+
+static bfd_boolean
+avr_size_one_stub (struct bfd_hash_entry *bh, void *in_arg)
+{
+  struct elf32_avr_stub_hash_entry *hsh;
+  struct elf32_avr_link_hash_table *htab;
+  int size;
+
+  /* Massage our args to the form they really have.  */
+  hsh = avr_stub_hash_entry (bh);
+  htab = in_arg;
+
+  if (hsh->is_actually_needed)
+    size = 4;
+  else
+    size = 0;
+
+  htab->stub_sec->size += size;
+  return TRUE;
+}
+
+void
+elf32_avr_setup_params (struct bfd_link_info *info,
+                        bfd *avr_stub_bfd,
+                        asection *avr_stub_section,
+                        bfd_boolean no_stubs,
+                        bfd_boolean deb_stubs,
+                        bfd_boolean deb_relax,
+                        bfd_vma pc_wrap_around,
+                        bfd_boolean call_ret_replacement)
+{
+  struct elf32_avr_link_hash_table *htab = avr_link_hash_table (info);
+
+  if (htab == NULL)
+    return;
+  htab->stub_sec = avr_stub_section;
+  htab->stub_bfd = avr_stub_bfd;
+  htab->no_stubs = no_stubs;
+
+  debug_relax = deb_relax;
+  debug_stubs = deb_stubs;
+  avr_pc_wrap_around = pc_wrap_around;
+  avr_replace_call_ret_sequences = call_ret_replacement;
+}
+
+
+/* Set up various things so that we can make a list of input sections
+   for each output section included in the link.  Returns -1 on error,
+   0 when no stubs will be needed, and 1 on success.  It also sets
+   information on the stubs bfd and the stub section in the info
+   struct.  */
+
+int
+elf32_avr_setup_section_lists (bfd *output_bfd,
+                               struct bfd_link_info *info)
+{
+  bfd *input_bfd;
+  unsigned int bfd_count;
+  int top_id, top_index;
+  asection *section;
+  asection **input_list, **list;
+  bfd_size_type amt;
+  struct elf32_avr_link_hash_table *htab = avr_link_hash_table (info);
+
+  if (htab == NULL || htab->no_stubs)
+    return 0;
+
+  /* Count the number of input BFDs and find the top input section id.  */
+  for (input_bfd = info->input_bfds, bfd_count = 0, top_id = 0;
+       input_bfd != NULL;
+       input_bfd = input_bfd->link_next)
+    {
+      bfd_count += 1;
+      for (section = input_bfd->sections;
+           section != NULL;
+           section = section->next)
+	if (top_id < section->id)
+	  top_id = section->id;
+    }
+
+  htab->bfd_count = bfd_count;
+
+  /* We can't use output_bfd->section_count here to find the top output
+     section index as some sections may have been removed, and
+     strip_excluded_output_sections doesn't renumber the indices.  */
+  for (section = output_bfd->sections, top_index = 0;
+       section != NULL;
+       section = section->next)
+    if (top_index < section->index)
+      top_index = section->index;
+
+  htab->top_index = top_index;
+  amt = sizeof (asection *) * (top_index + 1);
+  input_list = bfd_malloc (amt);
+  htab->input_list = input_list;
+  if (input_list == NULL)
+    return -1;
+
+  /* For sections we aren't interested in, mark their entries with a
+     value we can check later.  */
+  list = input_list + top_index;
+  do
+    *list = bfd_abs_section_ptr;
+  while (list-- != input_list);
+
+  for (section = output_bfd->sections;
+       section != NULL;
+       section = section->next)
+    if ((section->flags & SEC_CODE) != 0)
+      input_list[section->index] = NULL;
+
+  return 1;
+}
+
+
+/* Read in all local syms for all input bfds, and create hash entries
+   for export stubs if we are building a multi-subspace shared lib.
+   Returns -1 on error, 0 otherwise.  */
+
+static int
+get_local_syms (bfd *input_bfd, struct bfd_link_info *info)
+{
+  unsigned int bfd_indx;
+  Elf_Internal_Sym *local_syms, **all_local_syms;
+  struct elf32_avr_link_hash_table *htab = avr_link_hash_table (info);
+  bfd_size_type amt;
+
+  if (htab == NULL)
+    return -1;
+
+  /* We want to read in symbol extension records only once.  To do this
+     we need to read in the local symbols in parallel and save them for
+     later use; so hold pointers to the local symbols in an array.  */
+  amt = sizeof (Elf_Internal_Sym *) * htab->bfd_count;
+  all_local_syms = bfd_zmalloc (amt);
+  htab->all_local_syms = all_local_syms;
+  if (all_local_syms == NULL)
+    return -1;
+
+  /* Walk over all the input BFDs, swapping in local symbols.
+     If we are creating a shared library, create hash entries for the
+     export stubs.  */
+  for (bfd_indx = 0;
+       input_bfd != NULL;
+       input_bfd = input_bfd->link_next, bfd_indx++)
+    {
+      Elf_Internal_Shdr *symtab_hdr;
+
+      /* We'll need the symbol table in a second.  */
+      symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+      if (symtab_hdr->sh_info == 0)
+	continue;
+
+      /* We need an array of the local symbols attached to the input bfd.  */
+      local_syms = (Elf_Internal_Sym *) symtab_hdr->contents;
+      if (local_syms == NULL)
+	{
+	  local_syms = bfd_elf_get_elf_syms (input_bfd, symtab_hdr,
+					     symtab_hdr->sh_info, 0,
+					     NULL, NULL, NULL);
+	  /* Cache them for elf_link_input_bfd.  */
+	  symtab_hdr->contents = (unsigned char *) local_syms;
+	}
+      if (local_syms == NULL)
+	return -1;
+
+      all_local_syms[bfd_indx] = local_syms;
+    }
+
+  return 0;
+}
+
+#define ADD_DUMMY_STUBS_FOR_DEBUGGING 0
+
+bfd_boolean
+elf32_avr_size_stubs (bfd *output_bfd,
+                      struct bfd_link_info *info,
+                      bfd_boolean is_prealloc_run)
+{
+  struct elf32_avr_link_hash_table *htab;
+  int stub_changed = 0;
+
+  htab = avr_link_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* At this point we initialize htab->vector_base
+     To the start of the text output section.  */
+  htab->vector_base = htab->stub_sec->output_section->vma;
+
+  if (get_local_syms (info->input_bfds, info))
+    {
+      if (htab->all_local_syms)
+	goto error_ret_free_local;
+      return FALSE;
+    }
+
+  if (ADD_DUMMY_STUBS_FOR_DEBUGGING)
+    {
+      struct elf32_avr_stub_hash_entry *test;
+
+      test = avr_add_stub ("Hugo",htab);
+      test->target_value = 0x123456;
+      test->stub_offset = 13;
+
+      test = avr_add_stub ("Hugo2",htab);
+      test->target_value = 0x84210;
+      test->stub_offset = 14;
+    }
+
+  while (1)
+    {
+      bfd *input_bfd;
+      unsigned int bfd_indx;
+
+      /* We will have to re-generate the stub hash table each time anything
+         in memory has changed.  */
+
+      bfd_hash_traverse (&htab->bstab, avr_mark_stub_not_to_be_necessary, htab);
+      for (input_bfd = info->input_bfds, bfd_indx = 0;
+           input_bfd != NULL;
+           input_bfd = input_bfd->link_next, bfd_indx++)
+        {
+          Elf_Internal_Shdr *symtab_hdr;
+          asection *section;
+          Elf_Internal_Sym *local_syms;
+
+          /* We'll need the symbol table in a second.  */
+          symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+          if (symtab_hdr->sh_info == 0)
+            continue;
+
+          local_syms = htab->all_local_syms[bfd_indx];
+
+          /* Walk over each section attached to the input bfd.  */
+          for (section = input_bfd->sections;
+               section != NULL;
+               section = section->next)
+            {
+              Elf_Internal_Rela *internal_relocs, *irelaend, *irela;
+
+              /* If there aren't any relocs, then there's nothing more
+                 to do.  */
+              if ((section->flags & SEC_RELOC) == 0
+                  || section->reloc_count == 0)
+                continue;
+
+              /* If this section is a link-once section that will be
+                 discarded, then don't create any stubs.  */
+              if (section->output_section == NULL
+                  || section->output_section->owner != output_bfd)
+                continue;
+
+              /* Get the relocs.  */
+              internal_relocs
+                = _bfd_elf_link_read_relocs (input_bfd, section, NULL, NULL,
+                                             info->keep_memory);
+              if (internal_relocs == NULL)
+                goto error_ret_free_local;
+
+              /* Now examine each relocation.  */
+              irela = internal_relocs;
+              irelaend = irela + section->reloc_count;
+              for (; irela < irelaend; irela++)
+                {
+                  unsigned int r_type, r_indx;
+                  struct elf32_avr_stub_hash_entry *hsh;
+                  asection *sym_sec;
+                  bfd_vma sym_value;
+                  bfd_vma destination;
+                  struct elf_link_hash_entry *hh;
+                  char *stub_name;
+
+                  r_type = ELF32_R_TYPE (irela->r_info);
+                  r_indx = ELF32_R_SYM (irela->r_info);
+
+                  /* Only look for 16 bit GS relocs. No other reloc will need a
+                     stub.  */
+                  if (!((r_type == R_AVR_16_PM)
+                        || (r_type == R_AVR_LO8_LDI_GS)
+                        || (r_type == R_AVR_HI8_LDI_GS)))
+                    continue;
+
+                  /* Now determine the call target, its name, value,
+                     section.  */
+                  sym_sec = NULL;
+                  sym_value = 0;
+                  destination = 0;
+                  hh = NULL;
+                  if (r_indx < symtab_hdr->sh_info)
+                    {
+                      /* It's a local symbol.  */
+                      Elf_Internal_Sym *sym;
+                      Elf_Internal_Shdr *hdr;
+		      unsigned int shndx;
+
+                      sym = local_syms + r_indx;
+                      if (ELF_ST_TYPE (sym->st_info) != STT_SECTION)
+                        sym_value = sym->st_value;
+		      shndx = sym->st_shndx;
+		      if (shndx < elf_numsections (input_bfd))
+			{
+			  hdr = elf_elfsections (input_bfd)[shndx];
+			  sym_sec = hdr->bfd_section;
+			  destination = (sym_value + irela->r_addend
+					 + sym_sec->output_offset
+					 + sym_sec->output_section->vma);
+			}
+                    }
+                  else
+                    {
+                      /* It's an external symbol.  */
+                      int e_indx;
+
+                      e_indx = r_indx - symtab_hdr->sh_info;
+                      hh = elf_sym_hashes (input_bfd)[e_indx];
+
+                      while (hh->root.type == bfd_link_hash_indirect
+                             || hh->root.type == bfd_link_hash_warning)
+                        hh = (struct elf_link_hash_entry *)
+                              (hh->root.u.i.link);
+
+                      if (hh->root.type == bfd_link_hash_defined
+                          || hh->root.type == bfd_link_hash_defweak)
+                        {
+                          sym_sec = hh->root.u.def.section;
+                          sym_value = hh->root.u.def.value;
+                          if (sym_sec->output_section != NULL)
+                          destination = (sym_value + irela->r_addend
+                                         + sym_sec->output_offset
+                                         + sym_sec->output_section->vma);
+                        }
+                      else if (hh->root.type == bfd_link_hash_undefweak)
+                        {
+                          if (! info->shared)
+                            continue;
+                        }
+                      else if (hh->root.type == bfd_link_hash_undefined)
+                        {
+                          if (! (info->unresolved_syms_in_objects == RM_IGNORE
+                                 && (ELF_ST_VISIBILITY (hh->other)
+                                     == STV_DEFAULT)))
+                             continue;
+                        }
+                      else
+                        {
+                          bfd_set_error (bfd_error_bad_value);
+
+                          error_ret_free_internal:
+                          if (elf_section_data (section)->relocs == NULL)
+                            free (internal_relocs);
+                          goto error_ret_free_local;
+                        }
+                    }
+
+                  if (! avr_stub_is_required_for_16_bit_reloc
+		      (destination - htab->vector_base))
+                    {
+                      if (!is_prealloc_run)
+			/* We are having a reloc that does't need a stub.  */
+			continue;
+
+		      /* We don't right now know if a stub will be needed.
+			 Let's rather be on the safe side.  */
+                    }
+
+                  /* Get the name of this stub.  */
+                  stub_name = avr_stub_name (sym_sec, sym_value, irela);
+
+                  if (!stub_name)
+                    goto error_ret_free_internal;
+
+
+                  hsh = avr_stub_hash_lookup (&htab->bstab,
+                                              stub_name,
+                                              FALSE, FALSE);
+                  if (hsh != NULL)
+                    {
+                      /* The proper stub has already been created.  Mark it
+                         to be used and write the possibly changed destination
+                         value.  */
+                      hsh->is_actually_needed = TRUE;
+                      hsh->target_value = destination;
+                      free (stub_name);
+                      continue;
+                    }
+
+                  hsh = avr_add_stub (stub_name, htab);
+                  if (hsh == NULL)
+                    {
+                      free (stub_name);
+                      goto error_ret_free_internal;
+                    }
+
+                  hsh->is_actually_needed = TRUE;
+                  hsh->target_value = destination;
+
+                  if (debug_stubs)
+                    printf ("Adding stub with destination 0x%x to the"
+                            " hash table.\n", (unsigned int) destination);
+                  if (debug_stubs)
+                    printf ("(Pre-Alloc run: %i)\n", is_prealloc_run);
+
+                  stub_changed = TRUE;
+                }
+
+              /* We're done with the internal relocs, free them.  */
+              if (elf_section_data (section)->relocs == NULL)
+                free (internal_relocs);
+            }
+        }
+
+      /* Re-Calculate the number of needed stubs.  */
+      htab->stub_sec->size = 0;
+      bfd_hash_traverse (&htab->bstab, avr_size_one_stub, htab);
+
+      if (!stub_changed)
+        break;
+
+      stub_changed = FALSE;
+    }
+
+  free (htab->all_local_syms);
+  return TRUE;
+
+ error_ret_free_local:
+  free (htab->all_local_syms);
+  return FALSE;
+}
+
+
+/* Build all the stubs associated with the current output file.  The
+   stubs are kept in a hash table attached to the main linker hash
+   table.  We also set up the .plt entries for statically linked PIC
+   functions here.  This function is called via hppaelf_finish in the
+   linker.  */
+
+bfd_boolean
+elf32_avr_build_stubs (struct bfd_link_info *info)
+{
+  asection *stub_sec;
+  struct bfd_hash_table *table;
+  struct elf32_avr_link_hash_table *htab;
+  bfd_size_type total_size = 0;
+
+  htab = avr_link_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* In case that there were several stub sections:  */
+  for (stub_sec = htab->stub_bfd->sections;
+       stub_sec != NULL;
+       stub_sec = stub_sec->next)
+    {
+      bfd_size_type size;
+
+      /* Allocate memory to hold the linker stubs.  */
+      size = stub_sec->size;
+      total_size += size;
+
+      stub_sec->contents = bfd_zalloc (htab->stub_bfd, size);
+      if (stub_sec->contents == NULL && size != 0)
+	return FALSE;
+      stub_sec->size = 0;
+    }
+
+  /* Allocate memory for the adress mapping table.  */
+  htab->amt_entry_cnt = 0;
+  htab->amt_max_entry_cnt = total_size / 4;
+  htab->amt_stub_offsets = bfd_malloc (sizeof (bfd_vma)
+                                       * htab->amt_max_entry_cnt);
+  htab->amt_destination_addr = bfd_malloc (sizeof (bfd_vma)
+					   * htab->amt_max_entry_cnt );
+
+  if (debug_stubs)
+    printf ("Allocating %i entries in the AMT\n", htab->amt_max_entry_cnt);
+
+  /* Build the stubs as directed by the stub hash table.  */
+  table = &htab->bstab;
+  bfd_hash_traverse (table, avr_build_one_stub, info);
+
+  if (debug_stubs)
+    printf ("Final Stub section Size: %i\n", (int) htab->stub_sec->size);
+
+  return TRUE;
+}
+
+#define ELF_ARCH		bfd_arch_avr
+#define ELF_TARGET_ID		AVR_ELF_DATA
+#define ELF_MACHINE_CODE	EM_AVR
+#define ELF_MACHINE_ALT1	EM_AVR_OLD
+#define ELF_MAXPAGESIZE		1
+
+#define TARGET_LITTLE_SYM       bfd_elf32_avr_vec
+#define TARGET_LITTLE_NAME	"elf32-avr"
+
+#define bfd_elf32_bfd_link_hash_table_create elf32_avr_link_hash_table_create
+#define bfd_elf32_bfd_link_hash_table_free   elf32_avr_link_hash_table_free
+
+#define elf_info_to_howto	             avr_info_to_howto_rela
+#define elf_info_to_howto_rel	             NULL
+#define elf_backend_relocate_section         elf32_avr_relocate_section
+#define elf_backend_can_gc_sections          1
+#define elf_backend_rela_normal		     1
+#define elf_backend_final_write_processing \
+					bfd_elf_avr_final_write_processing
+#define elf_backend_object_p		elf32_avr_object_p
+
+#define bfd_elf32_bfd_relax_section elf32_avr_relax_section
+#define bfd_elf32_bfd_get_relocated_section_contents \
+                                        elf32_avr_get_relocated_section_contents
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-avr.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-avr.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-avr.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-avr.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,38 @@
+/* AVR-specific support for 32-bit ELF.
+   Copyright 2006, 2007 Free Software Foundation, Inc.
+
+   Written by Bjoern Haase <bjoern.m.haase@web.de>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, 
+   Boston, MA 02110-1301, USA.  */
+
+
+/* These four functions will be called from the ld back-end.  */
+
+extern void
+elf32_avr_setup_params (struct bfd_link_info *, bfd *, asection *,
+                        bfd_boolean, bfd_boolean, bfd_boolean,
+                        bfd_vma, bfd_boolean);
+
+extern int
+elf32_avr_setup_section_lists (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean
+elf32_avr_size_stubs (bfd *, struct bfd_link_info *, bfd_boolean);
+
+extern bfd_boolean
+elf32_avr_build_stubs (struct bfd_link_info *);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-bfin.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-bfin.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-bfin.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-bfin.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,5889 @@
+/* ADI Blackfin BFD support for 32-bit ELF.
+   Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/bfin.h"
+#include "dwarf2.h"
+#include "hashtab.h"
+
+/* FUNCTION : bfin_pltpc_reloc
+   ABSTRACT : TODO : figure out how to handle pltpc relocs.  */
+static bfd_reloc_status_type
+bfin_pltpc_reloc (
+     bfd *abfd ATTRIBUTE_UNUSED,
+     arelent *reloc_entry ATTRIBUTE_UNUSED,
+     asymbol *symbol ATTRIBUTE_UNUSED,
+     PTR data ATTRIBUTE_UNUSED,
+     asection *input_section ATTRIBUTE_UNUSED,
+     bfd *output_bfd ATTRIBUTE_UNUSED,
+     char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_reloc_status_type flag = bfd_reloc_ok;
+  return flag;
+}
+
+
+static bfd_reloc_status_type
+bfin_pcrel24_reloc (bfd *abfd,
+                    arelent *reloc_entry,
+                    asymbol *symbol,
+                    PTR data,
+                    asection *input_section,
+                    bfd *output_bfd,
+                    char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma relocation;
+  bfd_size_type addr = reloc_entry->address;
+  bfd_vma output_base = 0;
+  reloc_howto_type *howto = reloc_entry->howto;
+  asection *output_section;
+  bfd_boolean relocatable = (output_bfd != NULL);
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  if (bfd_is_und_section (symbol->section)
+      && (symbol->flags & BSF_WEAK) == 0
+      && !relocatable)
+    return bfd_reloc_undefined;
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  output_section = symbol->section->output_section;
+
+  if (relocatable)
+    output_base = 0;
+  else
+    output_base = output_section->vma;
+
+  if (!relocatable || !strcmp (symbol->name, symbol->section->name))
+    relocation += output_base + symbol->section->output_offset;
+
+  if (!relocatable && !strcmp (symbol->name, symbol->section->name))
+    relocation += reloc_entry->addend;
+
+  relocation -= input_section->output_section->vma + input_section->output_offset;
+  relocation -= reloc_entry->address;
+
+  if (howto->complain_on_overflow != complain_overflow_dont)
+    {
+      bfd_reloc_status_type status;
+      status = bfd_check_overflow (howto->complain_on_overflow,
+				   howto->bitsize,
+				   howto->rightshift,
+				   bfd_arch_bits_per_address(abfd),
+				   relocation);
+      if (status != bfd_reloc_ok)
+	return status;
+    }
+
+  /* if rightshift is 1 and the number odd, return error.  */
+  if (howto->rightshift && (relocation & 0x01))
+    {
+      (*_bfd_error_handler) (_("relocation should be even number"));
+      return bfd_reloc_overflow;
+    }
+
+  relocation >>= (bfd_vma) howto->rightshift;
+  /* Shift everything up to where it's going to be used.  */
+
+  relocation <<= (bfd_vma) howto->bitpos;
+
+  if (relocatable)
+    {
+      reloc_entry->address += input_section->output_offset;
+      reloc_entry->addend += symbol->section->output_offset;
+    }
+
+  {
+    short x;
+
+    /* We are getting reloc_entry->address 2 byte off from
+       the start of instruction. Assuming absolute postion
+       of the reloc data. But, following code had been written assuming
+       reloc address is starting at begining of instruction.
+       To compensate that I have increased the value of
+       relocation by 1 (effectively 2) and used the addr -2 instead of addr.  */
+
+    relocation += 1;
+    x = bfd_get_16 (abfd, (bfd_byte *) data + addr - 2);
+    x = (x & 0xff00) | ((relocation >> 16) & 0xff);
+    bfd_put_16 (abfd, x, (unsigned char *) data + addr - 2);
+
+    x = bfd_get_16 (abfd, (bfd_byte *) data + addr);
+    x = relocation & 0xFFFF;
+    bfd_put_16 (abfd, x, (unsigned char *) data + addr );
+  }
+  return bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type
+bfin_imm16_reloc (bfd *abfd,
+     		  arelent *reloc_entry,
+     		  asymbol *symbol,
+     		  PTR data,
+     		  asection *input_section,
+     		  bfd *output_bfd,
+     		  char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma relocation, x;
+  bfd_size_type reloc_addr = reloc_entry->address;
+  bfd_vma output_base = 0;
+  reloc_howto_type *howto = reloc_entry->howto;
+  asection *output_section;
+  bfd_boolean relocatable = (output_bfd != NULL);
+
+  /* Is the address of the relocation really within the section?  */
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  if (bfd_is_und_section (symbol->section)
+      && (symbol->flags & BSF_WEAK) == 0
+      && !relocatable)
+    return bfd_reloc_undefined;
+
+  output_section = symbol->section->output_section;
+  relocation = symbol->value;
+
+  /* Convert input-section-relative symbol value to absolute.  */
+  if (relocatable)
+    output_base = 0;
+  else
+    output_base = output_section->vma;
+
+  if (!relocatable || !strcmp (symbol->name, symbol->section->name))
+    relocation += output_base + symbol->section->output_offset;
+
+  /* Add in supplied addend.  */
+  relocation += reloc_entry->addend;
+
+  if (relocatable)
+    {
+      reloc_entry->address += input_section->output_offset;
+      reloc_entry->addend += symbol->section->output_offset;
+    }
+  else
+    {
+      reloc_entry->addend = 0;
+    }
+
+  if (howto->complain_on_overflow != complain_overflow_dont)
+    {
+      bfd_reloc_status_type flag;
+      flag = bfd_check_overflow (howto->complain_on_overflow,
+				 howto->bitsize,
+				 howto->rightshift,
+				 bfd_arch_bits_per_address(abfd),
+				 relocation);
+      if (flag != bfd_reloc_ok)
+	return flag;
+    }
+
+  /* Here the variable relocation holds the final address of the
+     symbol we are relocating against, plus any addend.  */
+
+  relocation >>= (bfd_vma) howto->rightshift;
+  x = relocation;
+  bfd_put_16 (abfd, x, (unsigned char *) data + reloc_addr);
+  return bfd_reloc_ok;
+}
+
+
+static bfd_reloc_status_type
+bfin_byte4_reloc (bfd *abfd,
+                  arelent *reloc_entry,
+                  asymbol *symbol,
+                  PTR data,
+                  asection *input_section,
+                  bfd *output_bfd,
+                  char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma relocation, x;
+  bfd_size_type addr = reloc_entry->address;
+  bfd_vma output_base = 0;
+  asection *output_section;
+  bfd_boolean relocatable = (output_bfd != NULL);
+
+  /* Is the address of the relocation really within the section?  */
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  if (bfd_is_und_section (symbol->section)
+      && (symbol->flags & BSF_WEAK) == 0
+      && !relocatable)
+    return bfd_reloc_undefined;
+
+  output_section = symbol->section->output_section;
+  relocation = symbol->value;
+  /* Convert input-section-relative symbol value to absolute.  */
+  if (relocatable)
+    output_base = 0;
+  else
+    output_base = output_section->vma;
+
+  if ((symbol->name
+       && symbol->section->name
+       && !strcmp (symbol->name, symbol->section->name))
+      || !relocatable)
+    {
+      relocation += output_base + symbol->section->output_offset;
+    }
+
+  relocation += reloc_entry->addend;
+
+  if (relocatable)
+    {
+      /* This output will be relocatable ... like ld -r. */
+      reloc_entry->address += input_section->output_offset;
+      reloc_entry->addend += symbol->section->output_offset;
+    }
+  else
+    {
+      reloc_entry->addend = 0;
+    }
+
+  /* Here the variable relocation holds the final address of the
+     symbol we are relocating against, plus any addend.  */
+  x = relocation & 0xFFFF0000;
+  x >>=16;
+  bfd_put_16 (abfd, x, (unsigned char *) data + addr + 2);
+
+  x = relocation & 0x0000FFFF;
+  bfd_put_16 (abfd, x, (unsigned char *) data + addr);
+  return bfd_reloc_ok;
+}
+
+/* bfin_bfd_reloc handles the blackfin arithmetic relocations.
+   Use this instead of bfd_perform_relocation.  */
+static bfd_reloc_status_type
+bfin_bfd_reloc (bfd *abfd,
+		arelent *reloc_entry,
+     		asymbol *symbol,
+     		PTR data,
+     		asection *input_section,
+     		bfd *output_bfd,
+     		char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma relocation;
+  bfd_size_type addr = reloc_entry->address;
+  bfd_vma output_base = 0;
+  reloc_howto_type *howto = reloc_entry->howto;
+  asection *output_section;
+  bfd_boolean relocatable = (output_bfd != NULL);
+
+  /* Is the address of the relocation really within the section?  */
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  if (bfd_is_und_section (symbol->section)
+      && (symbol->flags & BSF_WEAK) == 0
+      && !relocatable)
+    return bfd_reloc_undefined;
+
+  /* Get symbol value.  (Common symbols are special.)  */
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  output_section = symbol->section->output_section;
+
+  /* Convert input-section-relative symbol value to absolute.  */
+  if (relocatable)
+    output_base = 0;
+  else
+    output_base = output_section->vma;
+
+  if (!relocatable || !strcmp (symbol->name, symbol->section->name))
+    relocation += output_base + symbol->section->output_offset;
+
+  if (!relocatable && !strcmp (symbol->name, symbol->section->name))
+    {
+      /* Add in supplied addend.  */
+      relocation += reloc_entry->addend;
+    }
+
+  /* Here the variable relocation holds the final address of the
+     symbol we are relocating against, plus any addend.  */
+
+  if (howto->pc_relative == TRUE)
+    {
+      relocation -= input_section->output_section->vma + input_section->output_offset;
+
+      if (howto->pcrel_offset == TRUE)
+        relocation -= reloc_entry->address;
+    }
+
+  if (relocatable)
+    {
+      reloc_entry->address += input_section->output_offset;
+      reloc_entry->addend += symbol->section->output_offset;
+    }
+
+  if (howto->complain_on_overflow != complain_overflow_dont)
+    {
+      bfd_reloc_status_type status;
+
+      status = bfd_check_overflow (howto->complain_on_overflow,
+                                  howto->bitsize,
+                                  howto->rightshift,
+                                  bfd_arch_bits_per_address(abfd),
+                                  relocation);
+      if (status != bfd_reloc_ok)
+	return status;
+    }
+
+  /* If rightshift is 1 and the number odd, return error.  */
+  if (howto->rightshift && (relocation & 0x01))
+    {
+      (*_bfd_error_handler) (_("relocation should be even number"));
+      return bfd_reloc_overflow;
+    }
+
+  relocation >>= (bfd_vma) howto->rightshift;
+
+  /* Shift everything up to where it's going to be used.  */
+
+  relocation <<= (bfd_vma) howto->bitpos;
+
+#define DOIT(x)								\
+  x = ( (x & ~howto->dst_mask) | (relocation & howto->dst_mask))
+
+  /* handle 8 and 16 bit relocations here. */
+  switch (howto->size)
+    {
+    case 0:
+      {
+        char x = bfd_get_8 (abfd, (char *) data + addr);
+        DOIT (x);
+        bfd_put_8 (abfd, x, (unsigned char *) data + addr);
+      }
+      break;
+
+    case 1:
+      {
+        unsigned short x = bfd_get_16 (abfd, (bfd_byte *) data + addr);
+        DOIT (x);
+        bfd_put_16 (abfd, (bfd_vma) x, (unsigned char *) data + addr);
+      }
+      break;
+
+    default:
+      return bfd_reloc_other;
+    }
+
+  return bfd_reloc_ok;
+}
+
+/* HOWTO Table for blackfin.
+   Blackfin relocations are fairly complicated.
+   Some of the salient features are
+   a. Even numbered offsets. A number of (not all) relocations are
+      even numbered. This means that the rightmost bit is not stored.
+      Needs to right shift by 1 and check to see if value is not odd
+   b. A relocation can be an expression. An expression takes on
+      a variety of relocations arranged in a stack.
+   As a result, we cannot use the standard generic function as special
+   function. We will have our own, which is very similar to the standard
+   generic function except that it understands how to get the value from
+   the relocation stack. .  */
+
+#define BFIN_RELOC_MIN 0
+#define BFIN_RELOC_MAX 0x21
+#define BFIN_GNUEXT_RELOC_MIN 0x40
+#define BFIN_GNUEXT_RELOC_MAX 0x43
+#define BFIN_ARELOC_MIN 0xE0
+#define BFIN_ARELOC_MAX 0xF3
+
+static reloc_howto_type bfin_howto_table [] =
+{
+  /* This reloc does nothing. .  */
+  HOWTO (R_BFIN_UNUSED0,	/* type.  */
+	 0,			/* rightshift.  */
+	 2,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* bitsize.  */
+	 FALSE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_bitfield, /* complain_on_overflow.  */
+	 bfd_elf_generic_reloc,	/* special_function.  */
+	 "R_BFIN_UNUSED0",	/* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0,			/* dst_mask.  */
+	 FALSE),		/* pcrel_offset.  */
+
+  HOWTO (R_BFIN_PCREL5M2,	/* type.  */
+	 1,			/* rightshift.  */
+	 1,			/* size (0 = byte, 1 = short, 2 = long)..  */
+	 4,			/* bitsize.  */
+	 TRUE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_unsigned, /* complain_on_overflow.  */
+	 bfin_bfd_reloc,	/* special_function.  */
+	 "R_BFIN_PCREL5M2",	/* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0x0000000F,		/* dst_mask.  */
+	 FALSE),		/* pcrel_offset.  */
+
+  HOWTO (R_BFIN_UNUSED1,	/* type.  */
+	 0,			/* rightshift.  */
+	 2,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* bitsize.  */
+	 FALSE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_bitfield, /* complain_on_overflow.  */
+	 bfd_elf_generic_reloc,	/* special_function.  */
+	 "R_BFIN_UNUSED1",	/* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0,			/* dst_mask.  */
+	 FALSE),		/* pcrel_offset.  */
+
+  HOWTO (R_BFIN_PCREL10,	/* type.  */
+	 1,			/* rightshift.  */
+	 1,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 10,			/* bitsize.  */
+	 TRUE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_signed, /* complain_on_overflow.  */
+	 bfin_bfd_reloc,	/* special_function.  */
+	 "R_BFIN_PCREL10",	/* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0x000003FF,		/* dst_mask.  */
+	 TRUE),			/* pcrel_offset.  */
+
+  HOWTO (R_BFIN_PCREL12_JUMP,	/* type.  */
+	 1,			/* rightshift.  */
+				/* the offset is actually 13 bit
+				   aligned on a word boundary so
+				   only 12 bits have to be used.
+				   Right shift the rightmost bit..  */
+	 1,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 12,			/* bitsize.  */
+	 TRUE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_signed, /* complain_on_overflow.  */
+	 bfin_bfd_reloc,	/* special_function.  */
+	 "R_BFIN_PCREL12_JUMP",	/* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0x0FFF,		/* dst_mask.  */
+	 TRUE),			/* pcrel_offset.  */
+
+  HOWTO (R_BFIN_RIMM16,		/* type.  */
+	 0,			/* rightshift.  */
+	 1,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 16,			/* bitsize.  */
+	 FALSE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_signed, /* complain_on_overflow.  */
+	 bfin_imm16_reloc,	/* special_function.  */
+	 "R_BFIN_RIMM16",	/* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0x0000FFFF,		/* dst_mask.  */
+	 TRUE),			/* pcrel_offset.  */
+
+  HOWTO (R_BFIN_LUIMM16,	/* type.  */
+	 0,			/* rightshift.  */
+	 1,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 16,			/* bitsize.  */
+	 FALSE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_dont, /* complain_on_overflow.  */
+	 bfin_imm16_reloc,	/* special_function.  */
+	 "R_BFIN_LUIMM16",	/* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0x0000FFFF,		/* dst_mask.  */
+	 TRUE),			/* pcrel_offset.  */
+
+  HOWTO (R_BFIN_HUIMM16,	/* type.  */
+	 16,			/* rightshift.  */
+	 1,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 16,			/* bitsize.  */
+	 FALSE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_unsigned, /* complain_on_overflow.  */
+	 bfin_imm16_reloc,	/* special_function.  */
+	 "R_BFIN_HUIMM16",	/* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0x0000FFFF,		/* dst_mask.  */
+	 TRUE),			/* pcrel_offset.  */
+
+  HOWTO (R_BFIN_PCREL12_JUMP_S,	/* type.  */
+	 1,			/* rightshift.  */
+	 1,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 12,			/* bitsize.  */
+	 TRUE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_signed, /* complain_on_overflow.  */
+	 bfin_bfd_reloc,	/* special_function.  */
+	 "R_BFIN_PCREL12_JUMP_S", /* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0x00000FFF,		/* dst_mask.  */
+	 TRUE),			/* pcrel_offset.  */
+
+  HOWTO (R_BFIN_PCREL24_JUMP_X,	/* type.  */
+         1,			/* rightshift.  */
+         2,			/* size (0 = byte, 1 = short, 2 = long).  */
+         24,			/* bitsize.  */
+         TRUE,			/* pc_relative.  */
+         0,			/* bitpos.  */
+         complain_overflow_signed, /* complain_on_overflow.  */
+         bfin_pcrel24_reloc,	/* special_function.  */
+	"R_BFIN_PCREL24_JUMP_X", /* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0x00FFFFFF,		/* dst_mask.  */
+	 TRUE),			/* pcrel_offset.  */
+
+  HOWTO (R_BFIN_PCREL24,	/* type.  */
+	 1,			/* rightshift.  */
+	 2,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 24,			/* bitsize.  */
+	 TRUE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_signed, /* complain_on_overflow.  */
+	 bfin_pcrel24_reloc,	/* special_function.  */
+	 "R_BFIN_PCREL24",	/* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0x00FFFFFF,		/* dst_mask.  */
+	 TRUE),			/* pcrel_offset.  */
+
+  HOWTO (R_BFIN_UNUSEDB,	/* type.  */
+	 0,			/* rightshift.  */
+	 2,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* bitsize.  */
+	 FALSE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_dont, /* complain_on_overflow.  */
+	 bfd_elf_generic_reloc,	/* special_function.  */
+	 "R_BFIN_UNUSEDB",	/* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0,			/* dst_mask.  */
+	 FALSE),		/* pcrel_offset.  */
+
+  HOWTO (R_BFIN_UNUSEDC,	/* type.  */
+	 0,			/* rightshift.  */
+	 2,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* bitsize.  */
+	 FALSE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_dont, /* complain_on_overflow.  */
+	 bfd_elf_generic_reloc,	/* special_function.  */
+	 "R_BFIN_UNUSEDC",	/* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0,			/* dst_mask.  */
+	 FALSE),		/* pcrel_offset.  */
+
+  HOWTO (R_BFIN_PCREL24_JUMP_L,	/* type.  */
+	 1,			/* rightshift.  */
+	 2,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 24,			/* bitsize.  */
+	 TRUE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_signed, /* complain_on_overflow.  */
+	 bfin_pcrel24_reloc,	/* special_function.  */
+	 "R_BFIN_PCREL24_JUMP_L", /* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0x00FFFFFF,		/* dst_mask.  */
+	 TRUE),			/* pcrel_offset.  */
+
+  HOWTO (R_BFIN_PCREL24_CALL_X,	/* type.  */
+	 1,			/* rightshift.  */
+	 2,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 24,			/* bitsize.  */
+	 TRUE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_signed, /* complain_on_overflow.  */
+	 bfin_pcrel24_reloc,	/* special_function.  */
+	 "R_BFIN_PCREL24_CALL_X", /* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0x00FFFFFF,		/* dst_mask.  */
+	 TRUE),			/* pcrel_offset.  */
+
+  HOWTO (R_BFIN_VAR_EQ_SYMB,	/* type.  */
+	 0,			/* rightshift.  */
+	 2,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* bitsize.  */
+	 FALSE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_bitfield, /* complain_on_overflow.  */
+	 bfin_bfd_reloc,	/* special_function.  */
+	 "R_BFIN_VAR_EQ_SYMB",	/* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0,			/* dst_mask.  */
+	 FALSE),		/* pcrel_offset.  */
+
+  HOWTO (R_BFIN_BYTE_DATA,	/* type.  */
+	 0,			/* rightshift.  */
+	 0,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 8,			/* bitsize.  */
+	 FALSE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_unsigned, /* complain_on_overflow.  */
+	 bfin_bfd_reloc,	/* special_function.  */
+	 "R_BFIN_BYTE_DATA",	/* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0xFF,			/* dst_mask.  */
+	 TRUE),			/* pcrel_offset.  */
+
+  HOWTO (R_BFIN_BYTE2_DATA,	/* type.  */
+	 0,			/* rightshift.  */
+	 1,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 16,			/* bitsize.  */
+	 FALSE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_signed, /* complain_on_overflow.  */
+	 bfin_bfd_reloc,	/* special_function.  */
+	 "R_BFIN_BYTE2_DATA",	/* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0xFFFF,		/* dst_mask.  */
+	 TRUE),			/* pcrel_offset.  */
+
+  HOWTO (R_BFIN_BYTE4_DATA,	/* type.  */
+	 0,			/* rightshift.  */
+	 2,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* bitsize.  */
+	 FALSE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_unsigned, /* complain_on_overflow.  */
+	 bfin_byte4_reloc,	/* special_function.  */
+	 "R_BFIN_BYTE4_DATA",	/* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0xFFFFFFFF,		/* dst_mask.  */
+	 TRUE),			/* pcrel_offset.  */
+
+  HOWTO (R_BFIN_PCREL11,	/* type.  */
+	 1,			/* rightshift.  */
+	 1,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 10,			/* bitsize.  */
+	 TRUE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_unsigned, /* complain_on_overflow.  */
+	 bfin_bfd_reloc,	/* special_function.  */
+	 "R_BFIN_PCREL11",	/* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0x000003FF,		/* dst_mask.  */
+	 FALSE),		/* pcrel_offset.  */
+
+
+  /* A 18-bit signed operand with the GOT offset for the address of
+     the symbol.  */
+  HOWTO (R_BFIN_GOT17M4,        /* type */
+	 2,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_BFIN_GOT17M4",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,	        /* src_mask */
+	 0xffff,	        /* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  /* The upper 16 bits of the GOT offset for the address of the
+     symbol.  */
+  HOWTO (R_BFIN_GOTHI,	        /* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_BFIN_GOTHI",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		        /* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  /* The lower 16 bits of the GOT offset for the address of the
+     symbol.  */
+  HOWTO (R_BFIN_GOTLO,	        /* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_BFIN_GOTLO",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  /* The 32-bit address of the canonical descriptor of a function.  */
+  HOWTO (R_BFIN_FUNCDESC,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_BFIN_FUNCDESC",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 12-bit signed operand with the GOT offset for the address of
+     canonical descriptor of a function.  */
+  HOWTO (R_BFIN_FUNCDESC_GOT17M4,	/* type */
+	 2,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_BFIN_FUNCDESC_GOT17M4", /* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,	        /* src_mask */
+	 0xffff,	        /* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  /* The upper 16 bits of the GOT offset for the address of the
+     canonical descriptor of a function.  */
+  HOWTO (R_BFIN_FUNCDESC_GOTHI,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_BFIN_FUNCDESC_GOTHI", /* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  /* The lower 16 bits of the GOT offset for the address of the
+     canonical descriptor of a function.  */
+  HOWTO (R_BFIN_FUNCDESC_GOTLO,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_BFIN_FUNCDESC_GOTLO", /* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  /* The 32-bit address of the canonical descriptor of a function.  */
+  HOWTO (R_BFIN_FUNCDESC_VALUE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_BFIN_FUNCDESC_VALUE", /* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 12-bit signed operand with the GOT offset for the address of
+     canonical descriptor of a function.  */
+  HOWTO (R_BFIN_FUNCDESC_GOTOFF17M4, /* type */
+	 2,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_BFIN_FUNCDESC_GOTOFF17M4", /* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,	        /* src_mask */
+	 0xffff,	        /* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  /* The upper 16 bits of the GOT offset for the address of the
+     canonical descriptor of a function.  */
+  HOWTO (R_BFIN_FUNCDESC_GOTOFFHI, /* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_BFIN_FUNCDESC_GOTOFFHI", /* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  /* The lower 16 bits of the GOT offset for the address of the
+     canonical descriptor of a function.  */
+  HOWTO (R_BFIN_FUNCDESC_GOTOFFLO, /* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_BFIN_FUNCDESC_GOTOFFLO", /* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  /* A 12-bit signed operand with the GOT offset for the address of
+     the symbol.  */
+  HOWTO (R_BFIN_GOTOFF17M4,     /* type */
+	 2,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_BFIN_GOTOFF17M4",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,	        /* src_mask */
+	 0xffff,	        /* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  /* The upper 16 bits of the GOT offset for the address of the
+     symbol.  */
+  HOWTO (R_BFIN_GOTOFFHI,        /* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_BFIN_GOTOFFHI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  /* The lower 16 bits of the GOT offset for the address of the
+     symbol.  */
+  HOWTO (R_BFIN_GOTOFFLO,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_BFIN_GOTOFFLO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+};
+
+static reloc_howto_type bfin_gnuext_howto_table [] =
+{
+  HOWTO (R_BFIN_PLTPC,		/* type.  */
+	 0,			/* rightshift.  */
+	 1,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 16,			/* bitsize.  */
+	 FALSE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_bitfield, /* complain_on_overflow.  */
+	 bfin_pltpc_reloc,	/* special_function.  */
+	 "R_BFIN_PLTPC",	/* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0xffff,		/* src_mask.  */
+	 0xffff,		/* dst_mask.  */
+	 FALSE),		/* pcrel_offset.  */
+
+  HOWTO (R_BFIN_GOT,		/* type.  */
+	 0,			/* rightshift.  */
+	 1,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 16,			/* bitsize.  */
+	 FALSE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_bitfield, /* complain_on_overflow.  */
+	 bfd_elf_generic_reloc,	/* special_function.  */
+	 "R_BFIN_GOT",		/* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0x7fff,		/* src_mask.  */
+	 0x7fff,		/* dst_mask.  */
+	 FALSE),		/* pcrel_offset.  */
+
+/* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_BFIN_GNU_VTINHERIT, /* type.  */
+         0,                     /* rightshift.  */
+         2,                     /* size (0 = byte, 1 = short, 2 = long).  */
+         0,                     /* bitsize.  */
+         FALSE,                 /* pc_relative.  */
+         0,                     /* bitpos.  */
+         complain_overflow_dont, /* complain_on_overflow.  */
+         NULL,                  /* special_function.  */
+         "R_BFIN_GNU_VTINHERIT", /* name.  */
+         FALSE,                 /* partial_inplace.  */
+         0,                     /* src_mask.  */
+         0,                     /* dst_mask.  */
+         FALSE),                /* pcrel_offset.  */
+
+/* GNU extension to record C++ vtable member usage.  */
+  HOWTO (R_BFIN_GNU_VTENTRY,	/* type.  */
+         0,                     /* rightshift.  */
+         2,                     /* size (0 = byte, 1 = short, 2 = long).  */
+         0,                     /* bitsize.  */
+         FALSE,                 /* pc_relative.  */
+         0,			/* bitpos.  */
+         complain_overflow_dont, /* complain_on_overflow.  */
+         _bfd_elf_rel_vtable_reloc_fn, /* special_function.  */
+         "R_BFIN_GNU_VTENTRY",	/* name.  */
+         FALSE,                 /* partial_inplace.  */
+         0,                     /* src_mask.  */
+         0,                     /* dst_mask.  */
+         FALSE)                 /* pcrel_offset.  */
+};
+
+struct bfin_reloc_map
+{
+  bfd_reloc_code_real_type 	bfd_reloc_val;
+  unsigned int			bfin_reloc_val;
+};
+
+static const struct bfin_reloc_map bfin_reloc_map [] =
+{
+  { BFD_RELOC_NONE,			R_BFIN_UNUSED0 },
+  { BFD_RELOC_BFIN_5_PCREL,		R_BFIN_PCREL5M2 },
+  { BFD_RELOC_NONE,			R_BFIN_UNUSED1 },
+  { BFD_RELOC_BFIN_10_PCREL,		R_BFIN_PCREL10 },
+  { BFD_RELOC_BFIN_12_PCREL_JUMP,	R_BFIN_PCREL12_JUMP },
+  { BFD_RELOC_BFIN_16_IMM,		R_BFIN_RIMM16 },
+  { BFD_RELOC_BFIN_16_LOW,		R_BFIN_LUIMM16 },
+  { BFD_RELOC_BFIN_16_HIGH,		R_BFIN_HUIMM16 },
+  { BFD_RELOC_BFIN_12_PCREL_JUMP_S,	R_BFIN_PCREL12_JUMP_S },
+  { BFD_RELOC_24_PCREL,			R_BFIN_PCREL24 },
+  { BFD_RELOC_24_PCREL,			R_BFIN_PCREL24 },
+  { BFD_RELOC_BFIN_24_PCREL_JUMP_L,	R_BFIN_PCREL24_JUMP_L },
+  { BFD_RELOC_NONE,			R_BFIN_UNUSEDB },
+  { BFD_RELOC_NONE,			R_BFIN_UNUSEDC },
+  { BFD_RELOC_BFIN_24_PCREL_CALL_X,	R_BFIN_PCREL24_CALL_X },
+  { BFD_RELOC_8,			R_BFIN_BYTE_DATA },
+  { BFD_RELOC_16,			R_BFIN_BYTE2_DATA },
+  { BFD_RELOC_32,			R_BFIN_BYTE4_DATA },
+  { BFD_RELOC_BFIN_11_PCREL,		R_BFIN_PCREL11 },
+  { BFD_RELOC_BFIN_GOT,			R_BFIN_GOT },
+  { BFD_RELOC_BFIN_PLTPC,		R_BFIN_PLTPC },
+
+  { BFD_RELOC_BFIN_GOT17M4,      R_BFIN_GOT17M4 },
+  { BFD_RELOC_BFIN_GOTHI,      R_BFIN_GOTHI },
+  { BFD_RELOC_BFIN_GOTLO,      R_BFIN_GOTLO },
+  { BFD_RELOC_BFIN_FUNCDESC,   R_BFIN_FUNCDESC },
+  { BFD_RELOC_BFIN_FUNCDESC_GOT17M4, R_BFIN_FUNCDESC_GOT17M4 },
+  { BFD_RELOC_BFIN_FUNCDESC_GOTHI, R_BFIN_FUNCDESC_GOTHI },
+  { BFD_RELOC_BFIN_FUNCDESC_GOTLO, R_BFIN_FUNCDESC_GOTLO },
+  { BFD_RELOC_BFIN_FUNCDESC_VALUE, R_BFIN_FUNCDESC_VALUE },
+  { BFD_RELOC_BFIN_FUNCDESC_GOTOFF17M4, R_BFIN_FUNCDESC_GOTOFF17M4 },
+  { BFD_RELOC_BFIN_FUNCDESC_GOTOFFHI, R_BFIN_FUNCDESC_GOTOFFHI },
+  { BFD_RELOC_BFIN_FUNCDESC_GOTOFFLO, R_BFIN_FUNCDESC_GOTOFFLO },
+  { BFD_RELOC_BFIN_GOTOFF17M4,   R_BFIN_GOTOFF17M4 },
+  { BFD_RELOC_BFIN_GOTOFFHI,   R_BFIN_GOTOFFHI },
+  { BFD_RELOC_BFIN_GOTOFFLO,   R_BFIN_GOTOFFLO },
+
+  { BFD_RELOC_VTABLE_INHERIT,		R_BFIN_GNU_VTINHERIT },
+  { BFD_RELOC_VTABLE_ENTRY,		R_BFIN_GNU_VTENTRY },
+};
+
+
+static void
+bfin_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+                    arelent *cache_ptr,
+                    Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+
+  if (r_type <= BFIN_RELOC_MAX)
+    cache_ptr->howto = &bfin_howto_table [r_type];
+
+  else if (r_type >= BFIN_GNUEXT_RELOC_MIN && r_type <= BFIN_GNUEXT_RELOC_MAX)
+    cache_ptr->howto = &bfin_gnuext_howto_table [r_type - BFIN_GNUEXT_RELOC_MIN];
+
+  else
+    cache_ptr->howto = (reloc_howto_type *) NULL;
+}
+
+/* Given a BFD reloc type, return the howto.  */
+static reloc_howto_type *
+bfin_bfd_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
+			    bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+  unsigned int r_type = BFIN_RELOC_MIN;
+
+  for (i = sizeof (bfin_reloc_map) / sizeof (bfin_reloc_map[0]); --i;)
+    if (bfin_reloc_map[i].bfd_reloc_val == code)
+      r_type = bfin_reloc_map[i].bfin_reloc_val;
+
+  if (r_type <= BFIN_RELOC_MAX && r_type > BFIN_RELOC_MIN)
+    return &bfin_howto_table [r_type];
+
+  else if (r_type >= BFIN_GNUEXT_RELOC_MIN && r_type <= BFIN_GNUEXT_RELOC_MAX)
+   return &bfin_gnuext_howto_table [r_type - BFIN_GNUEXT_RELOC_MIN];
+
+  return (reloc_howto_type *) NULL;
+}
+
+static reloc_howto_type *
+bfin_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (bfin_howto_table)
+	    / sizeof (bfin_howto_table[0]));
+       i++)
+    if (bfin_howto_table[i].name != NULL
+	&& strcasecmp (bfin_howto_table[i].name, r_name) == 0)
+      return &bfin_howto_table[i];
+
+  for (i = 0;
+       i < (sizeof (bfin_gnuext_howto_table)
+	    / sizeof (bfin_gnuext_howto_table[0]));
+       i++)
+    if (bfin_gnuext_howto_table[i].name != NULL
+	&& strcasecmp (bfin_gnuext_howto_table[i].name, r_name) == 0)
+      return &bfin_gnuext_howto_table[i];
+
+  return NULL;
+}
+
+/* Given a bfin relocation type, return the howto.  */
+static reloc_howto_type *
+bfin_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
+			    unsigned int r_type)
+{
+  if (r_type <= BFIN_RELOC_MAX)
+    return &bfin_howto_table [r_type];
+
+  else if (r_type >= BFIN_GNUEXT_RELOC_MIN && r_type <= BFIN_GNUEXT_RELOC_MAX)
+   return &bfin_gnuext_howto_table [r_type - BFIN_GNUEXT_RELOC_MIN];
+
+  return (reloc_howto_type *) NULL;
+}
+
+/* Set by ld emulation if --code-in-l1.  */
+bfd_boolean elf32_bfin_code_in_l1 = 0;
+
+/* Set by ld emulation if --data-in-l1.  */
+bfd_boolean elf32_bfin_data_in_l1 = 0;
+
+static void
+elf32_bfin_final_write_processing (bfd *abfd,
+				   bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  if (elf32_bfin_code_in_l1)
+    elf_elfheader (abfd)->e_flags |= EF_BFIN_CODE_IN_L1;
+  if (elf32_bfin_data_in_l1)
+    elf_elfheader (abfd)->e_flags |= EF_BFIN_DATA_IN_L1;
+}
+
+/* Return TRUE if the name is a local label.
+   bfin local labels begin with L$.  */
+static bfd_boolean
+bfin_is_local_label_name (
+     bfd *abfd,
+     const char *label)
+{
+  if (label[0] == 'L' && label[1] == '$' )
+    return TRUE;
+
+  return _bfd_elf_is_local_label_name (abfd, label);
+}
+
+/* Look through the relocs for a section during the first phase, and
+   allocate space in the global offset table or procedure linkage
+   table.  */
+
+static bfd_boolean
+bfin_check_relocs (bfd * abfd,
+		   struct bfd_link_info *info,
+		   asection *sec,
+                   const Elf_Internal_Rela *relocs)
+{
+  bfd *dynobj;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  asection *sgot;
+  asection *srelgot;
+  if (info->relocatable)
+    return TRUE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+
+  sgot = NULL;
+  srelgot = NULL;
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+	h = NULL;
+      else
+	h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+
+      switch (ELF32_R_TYPE (rel->r_info))
+	{
+       /* This relocation describes the C++ object vtable hierarchy.
+           Reconstruct it for later use during GC.  */
+        case R_BFIN_GNU_VTINHERIT:
+          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+
+        /* This relocation describes which C++ vtable entries
+           are actually used.  Record for later use during GC.  */
+        case R_BFIN_GNU_VTENTRY:
+          BFD_ASSERT (h != NULL);
+          if (h != NULL
+              && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+            return FALSE;
+          break;
+
+	case R_BFIN_GOT:
+	  if (h != NULL
+	      && strcmp (h->root.root.string, "__GLOBAL_OFFSET_TABLE_") == 0)
+	    break;
+	  /* Fall through.  */
+
+	  if (dynobj == NULL)
+	    {
+	      /* Create the .got section.  */
+	      elf_hash_table (info)->dynobj = dynobj = abfd;
+	      if (!_bfd_elf_create_got_section (dynobj, info))
+		return FALSE;
+	    }
+
+	  if (sgot == NULL)
+	    {
+	      sgot = bfd_get_section_by_name (dynobj, ".got");
+	      BFD_ASSERT (sgot != NULL);
+	    }
+
+	  if (srelgot == NULL && (h != NULL || info->shared))
+	    {
+	      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+	      if (srelgot == NULL)
+		{
+		  flagword flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
+				    | SEC_IN_MEMORY | SEC_LINKER_CREATED
+				    | SEC_READONLY);
+		  srelgot = bfd_make_section_with_flags (dynobj, ".rela.got",
+							 flags);
+		  if (srelgot == NULL
+		      || !bfd_set_section_alignment (dynobj, srelgot, 2))
+		    return FALSE;
+		}
+	    }
+
+	  if (h != NULL)
+	    {
+	      if (h->got.refcount == 0)
+		{
+		  /* Make sure this symbol is output as a dynamic symbol.  */
+		  if (h->dynindx == -1 && !h->forced_local)
+		    {
+		      if (!bfd_elf_link_record_dynamic_symbol (info, h))
+			return FALSE;
+		    }
+
+		  /* Allocate space in the .got section.  */
+		  sgot->size += 4;
+		  /* Allocate relocation space.  */
+		  srelgot->size += sizeof (Elf32_External_Rela);
+		}
+	      h->got.refcount++;
+	    }
+	  else
+	    {
+	      /* This is a global offset table entry for a local symbol.  */
+	      if (local_got_refcounts == NULL)
+		{
+		  bfd_size_type size;
+
+		  size = symtab_hdr->sh_info;
+		  size *= sizeof (bfd_signed_vma);
+		  local_got_refcounts = ((bfd_signed_vma *)
+					 bfd_zalloc (abfd, size));
+		  if (local_got_refcounts == NULL)
+		    return FALSE;
+		  elf_local_got_refcounts (abfd) = local_got_refcounts;
+		}
+	      if (local_got_refcounts[r_symndx] == 0)
+		{
+		  sgot->size += 4;
+		  if (info->shared)
+		    {
+		      /* If we are generating a shared object, we need to
+		         output a R_68K_RELATIVE reloc so that the dynamic
+		         linker can adjust this GOT entry.  */
+		      srelgot->size += sizeof (Elf32_External_Rela);
+		    }
+		}
+	      local_got_refcounts[r_symndx]++;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+static enum elf_reloc_type_class
+elf32_bfin_reloc_type_class (const Elf_Internal_Rela * rela)
+{
+  switch ((int) ELF32_R_TYPE (rela->r_info))
+    {
+    default:
+      return reloc_class_normal;
+    }
+}
+
+static bfd_reloc_status_type
+bfin_final_link_relocate (Elf_Internal_Rela *rel, reloc_howto_type *howto,
+			  bfd *input_bfd, asection *input_section,
+			  bfd_byte *contents, bfd_vma address,
+			  bfd_vma value, bfd_vma addend)
+{
+  int r_type = ELF32_R_TYPE (rel->r_info);
+
+  if (r_type == R_BFIN_PCREL24 || r_type == R_BFIN_PCREL24_JUMP_L)
+    {
+      bfd_reloc_status_type r = bfd_reloc_ok;
+      bfd_vma x;
+
+      if (address > bfd_get_section_limit (input_bfd, input_section))
+	return bfd_reloc_outofrange;
+
+      value += addend;
+
+      /* Perform usual pc-relative correction.  */
+      value -= input_section->output_section->vma + input_section->output_offset;
+      value -= address;
+
+      /* We are getting reloc_entry->address 2 byte off from
+	 the start of instruction. Assuming absolute postion
+	 of the reloc data. But, following code had been written assuming
+	 reloc address is starting at begining of instruction.
+	 To compensate that I have increased the value of
+	 relocation by 1 (effectively 2) and used the addr -2 instead of addr.  */
+
+      value += 2;
+      address -= 2;
+
+      if ((value & 0xFF000000) != 0
+	  && (value & 0xFF000000) != 0xFF000000)
+	r = bfd_reloc_overflow;
+
+      value >>= 1;
+
+      x = bfd_get_16 (input_bfd, contents + address);
+      x = (x & 0xff00) | ((value >> 16) & 0xff);
+      bfd_put_16 (input_bfd, x, contents + address);
+
+      x = bfd_get_16 (input_bfd, contents + address + 2);
+      x = value & 0xFFFF;
+      bfd_put_16 (input_bfd, x, contents + address + 2);
+      return r;
+    }
+
+  return _bfd_final_link_relocate (howto, input_bfd, input_section, contents,
+				   rel->r_offset, value, addend);
+
+}
+
+static bfd_boolean
+bfin_relocate_section (bfd * output_bfd,
+		       struct bfd_link_info *info,
+		       bfd * input_bfd,
+		       asection * input_section,
+		       bfd_byte * contents,
+		       Elf_Internal_Rela * relocs,
+		       Elf_Internal_Sym * local_syms,
+		       asection ** local_sections)
+{
+  bfd *dynobj;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_vma *local_got_offsets;
+  asection *sgot;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  int i = 0;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+  local_got_offsets = elf_local_got_offsets (input_bfd);
+
+  sgot = NULL;
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++, i++)
+    {
+      int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      bfd_vma relocation = 0;
+      bfd_boolean unresolved_reloc;
+      bfd_reloc_status_type r;
+      bfd_vma address;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      if (r_type < 0 || r_type >= 243)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      if (r_type == R_BFIN_GNU_VTENTRY
+          || r_type == R_BFIN_GNU_VTINHERIT)
+	continue;
+
+      howto = bfin_reloc_type_lookup (input_bfd, r_type);
+      if (howto == NULL)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      unresolved_reloc = FALSE;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+      else
+	{
+	  bfd_boolean warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      address = rel->r_offset;
+
+      /* Then, process normally.  */
+      switch (r_type)
+	{
+	case R_BFIN_GNU_VTINHERIT:
+	case R_BFIN_GNU_VTENTRY:
+	  return bfd_reloc_ok;
+
+	case R_BFIN_GOT:
+	  /* Relocation is to the address of the entry for this symbol
+	     in the global offset table.  */
+	  if (h != NULL
+	      && strcmp (h->root.root.string, "__GLOBAL_OFFSET_TABLE_") == 0)
+	    goto do_default;
+	  /* Fall through.  */
+	  /* Relocation is the offset of the entry for this symbol in
+	     the global offset table.  */
+
+	  {
+	    bfd_vma off;
+
+	  if (dynobj == NULL)
+	    {
+	      /* Create the .got section.  */
+	      elf_hash_table (info)->dynobj = dynobj = output_bfd;
+	      if (!_bfd_elf_create_got_section (dynobj, info))
+		return FALSE;
+	    }
+
+	    if (sgot == NULL)
+	      {
+		sgot = bfd_get_section_by_name (dynobj, ".got");
+		BFD_ASSERT (sgot != NULL);
+	      }
+
+	    if (h != NULL)
+	      {
+		bfd_boolean dyn;
+
+		off = h->got.offset;
+		BFD_ASSERT (off != (bfd_vma) - 1);
+		dyn = elf_hash_table (info)->dynamic_sections_created;
+
+		if (!WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+		    || (info->shared
+			&& (info->symbolic
+			    || h->dynindx == -1
+			    || h->forced_local)
+			&& h->def_regular))
+		  {
+		    /* This is actually a static link, or it is a
+		       -Bsymbolic link and the symbol is defined
+		       locally, or the symbol was forced to be local
+		       because of a version file..  We must initialize
+		       this entry in the global offset table.  Since
+		       the offset must always be a multiple of 4, we
+		       use the least significant bit to record whether
+		       we have initialized it already.
+
+		       When doing a dynamic link, we create a .rela.got
+		       relocation entry to initialize the value.  This
+		       is done in the finish_dynamic_symbol routine.  */
+		    if ((off & 1) != 0)
+		      off &= ~1;
+		    else
+		      {
+			bfd_put_32 (output_bfd, relocation,
+				    sgot->contents + off);
+			h->got.offset |= 1;
+		      }
+		  }
+		else
+		  unresolved_reloc = FALSE;
+	      }
+	    else
+	      {
+		BFD_ASSERT (local_got_offsets != NULL);
+		off = local_got_offsets[r_symndx];
+		BFD_ASSERT (off != (bfd_vma) - 1);
+
+		/* The offset must always be a multiple of 4.  We use
+		   the least significant bit to record whether we have
+		   already generated the necessary reloc.  */
+		if ((off & 1) != 0)
+		  off &= ~1;
+		else
+		  {
+		    bfd_put_32 (output_bfd, relocation, sgot->contents + off);
+
+		    if (info->shared)
+		      {
+			asection *s;
+			Elf_Internal_Rela outrel;
+			bfd_byte *loc;
+
+			s = bfd_get_section_by_name (dynobj, ".rela.got");
+			BFD_ASSERT (s != NULL);
+
+			outrel.r_offset = (sgot->output_section->vma
+					   + sgot->output_offset + off);
+			outrel.r_info =
+			  ELF32_R_INFO (0, R_BFIN_PCREL24);
+			outrel.r_addend = relocation;
+			loc = s->contents;
+			loc +=
+			  s->reloc_count++ * sizeof (Elf32_External_Rela);
+			bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+		      }
+
+		    local_got_offsets[r_symndx] |= 1;
+		  }
+	      }
+
+	    relocation = sgot->output_offset + off;
+	    rel->r_addend = 0;
+            /* bfin : preg = [preg + 17bitdiv4offset] relocation is div by 4.  */
+            relocation /= 4;
+	  }
+	  goto do_default;
+
+	default:
+	do_default:
+	  r = bfin_final_link_relocate (rel, howto, input_bfd, input_section,
+					contents, address,
+					relocation, rel->r_addend);
+
+	  break;
+	}
+
+      /* Dynamic relocs are not propagated for SEC_DEBUGGING sections
+         because such sections are not SEC_ALLOC and thus ld.so will
+         not process them.  */
+      if (unresolved_reloc
+	  && !((input_section->flags & SEC_DEBUGGING) != 0 && h->def_dynamic))
+	{
+	  (*_bfd_error_handler)
+	    (_("%B(%A+0x%lx): unresolvable relocation against symbol `%s'"),
+	     input_bfd,
+	     input_section, (long) rel->r_offset, h->root.root.string);
+	  return FALSE;
+	}
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char *name;
+
+	  if (h != NULL)
+	    name = h->root.root.string;
+	  else
+	    {
+	      name = bfd_elf_string_from_elf_section (input_bfd,
+						      symtab_hdr->sh_link,
+						      sym->st_name);
+	      if (name == NULL)
+		return FALSE;
+	      if (*name == '\0')
+		name = bfd_section_name (input_bfd, sec);
+	    }
+
+	  if (r == bfd_reloc_overflow)
+	    {
+	      if (!(info->callbacks->reloc_overflow
+		    (info, (h ? &h->root : NULL), name, howto->name,
+		     (bfd_vma) 0, input_bfd, input_section, rel->r_offset)))
+		return FALSE;
+	    }
+	  else
+	    {
+	      (*_bfd_error_handler)
+		(_("%B(%A+0x%lx): reloc against `%s': error %d"),
+		 input_bfd, input_section,
+		 (long) rel->r_offset, name, (int) r);
+	      return FALSE;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+static asection *
+bfin_gc_mark_hook (asection * sec,
+		   struct bfd_link_info *info,
+		   Elf_Internal_Rela * rel,
+		   struct elf_link_hash_entry *h,
+                   Elf_Internal_Sym * sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_BFIN_GNU_VTINHERIT:
+      case R_BFIN_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Update the got entry reference counts for the section being removed.  */
+
+static bfd_boolean
+bfin_gc_sweep_hook (bfd * abfd,
+		    struct bfd_link_info *info,
+		    asection * sec,
+                    const Elf_Internal_Rela * relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  const Elf_Internal_Rela *rel, *relend;
+  bfd *dynobj;
+  asection *sgot;
+  asection *srelgot;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  if (dynobj == NULL)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+
+  sgot = bfd_get_section_by_name (dynobj, ".got");
+  srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+
+      switch (ELF32_R_TYPE (rel->r_info))
+	{
+	case R_BFIN_GOT:
+	  r_symndx = ELF32_R_SYM (rel->r_info);
+	  if (r_symndx >= symtab_hdr->sh_info)
+	    {
+	      h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	      if (h->got.refcount > 0)
+		{
+		  --h->got.refcount;
+		  if (h->got.refcount == 0)
+		    {
+		      /* We don't need the .got entry any more.  */
+		      sgot->size -= 4;
+		      srelgot->size -= sizeof (Elf32_External_Rela);
+		    }
+		}
+	    }
+	  else if (local_got_refcounts != NULL)
+	    {
+	      if (local_got_refcounts[r_symndx] > 0)
+		{
+		  --local_got_refcounts[r_symndx];
+		  if (local_got_refcounts[r_symndx] == 0)
+		    {
+		      /* We don't need the .got entry any more.  */
+		      sgot->size -= 4;
+		      if (info->shared)
+			srelgot->size -= sizeof (Elf32_External_Rela);
+		    }
+		}
+	    }
+	  break;
+	default:
+	  break;
+	}
+    }
+  return TRUE;
+}
+
+extern const bfd_target bfd_elf32_bfinfdpic_vec;
+#define IS_FDPIC(bfd) ((bfd)->xvec == &bfd_elf32_bfinfdpic_vec)
+
+/* An extension of the elf hash table data structure,
+   containing some additional Blackfin-specific data.  */
+struct bfinfdpic_elf_link_hash_table
+{
+  struct elf_link_hash_table elf;
+
+  /* A pointer to the .got section.  */
+  asection *sgot;
+  /* A pointer to the .rel.got section.  */
+  asection *sgotrel;
+  /* A pointer to the .rofixup section.  */
+  asection *sgotfixup;
+  /* A pointer to the .plt section.  */
+  asection *splt;
+  /* A pointer to the .rel.plt section.  */
+  asection *spltrel;
+  /* GOT base offset.  */
+  bfd_vma got0;
+  /* Location of the first non-lazy PLT entry, i.e., the number of
+     bytes taken by lazy PLT entries.  */
+  bfd_vma plt0;
+  /* A hash table holding information about which symbols were
+     referenced with which PIC-related relocations.  */
+  struct htab *relocs_info;
+  /* Summary reloc information collected by
+     _bfinfdpic_count_got_plt_entries.  */
+  struct _bfinfdpic_dynamic_got_info *g;
+};
+
+/* Get the Blackfin ELF linker hash table from a link_info structure.  */
+
+#define bfinfdpic_hash_table(info) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((info)->hash)) \
+  == BFIN_ELF_DATA ? ((struct bfinfdpic_elf_link_hash_table *) ((info)->hash)) : NULL)
+
+#define bfinfdpic_got_section(info) \
+  (bfinfdpic_hash_table (info)->sgot)
+#define bfinfdpic_gotrel_section(info) \
+  (bfinfdpic_hash_table (info)->sgotrel)
+#define bfinfdpic_gotfixup_section(info) \
+  (bfinfdpic_hash_table (info)->sgotfixup)
+#define bfinfdpic_plt_section(info) \
+  (bfinfdpic_hash_table (info)->splt)
+#define bfinfdpic_pltrel_section(info) \
+  (bfinfdpic_hash_table (info)->spltrel)
+#define bfinfdpic_relocs_info(info) \
+  (bfinfdpic_hash_table (info)->relocs_info)
+#define bfinfdpic_got_initial_offset(info) \
+  (bfinfdpic_hash_table (info)->got0)
+#define bfinfdpic_plt_initial_offset(info) \
+  (bfinfdpic_hash_table (info)->plt0)
+#define bfinfdpic_dynamic_got_plt_info(info) \
+  (bfinfdpic_hash_table (info)->g)
+
+/* The name of the dynamic interpreter.  This is put in the .interp
+   section.  */
+
+#define ELF_DYNAMIC_INTERPRETER "/lib/ld.so.1"
+
+#define DEFAULT_STACK_SIZE 0x20000
+
+/* This structure is used to collect the number of entries present in
+   each addressable range of the got.  */
+struct _bfinfdpic_dynamic_got_info
+{
+  /* Several bits of information about the current link.  */
+  struct bfd_link_info *info;
+  /* Total size needed for GOT entries within the 18- or 32-bit
+     ranges.  */
+  bfd_vma got17m4, gothilo;
+  /* Total size needed for function descriptor entries within the 18-
+     or 32-bit ranges.  */
+  bfd_vma fd17m4, fdhilo;
+  /* Total size needed function descriptor entries referenced in PLT
+     entries, that would be profitable to place in offsets close to
+     the PIC register.  */
+  bfd_vma fdplt;
+  /* Total size needed by lazy PLT entries.  */
+  bfd_vma lzplt;
+  /* Number of relocations carried over from input object files.  */
+  unsigned long relocs;
+  /* Number of fixups introduced by relocations in input object files.  */
+  unsigned long fixups;
+};
+
+/* Create a Blackfin ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+bfinfdpic_elf_link_hash_table_create (bfd *abfd)
+{
+  struct bfinfdpic_elf_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct bfinfdpic_elf_link_hash_table);
+
+  ret = bfd_zalloc (abfd, amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd,
+				      _bfd_elf_link_hash_newfunc,
+				      sizeof (struct elf_link_hash_entry),
+				      BFIN_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  return &ret->elf.root;
+}
+
+/* Decide whether a reference to a symbol can be resolved locally or
+   not.  If the symbol is protected, we want the local address, but
+   its function descriptor must be assigned by the dynamic linker.  */
+#define BFINFDPIC_SYM_LOCAL(INFO, H) \
+  (_bfd_elf_symbol_refs_local_p ((H), (INFO), 1) \
+   || ! elf_hash_table (INFO)->dynamic_sections_created)
+#define BFINFDPIC_FUNCDESC_LOCAL(INFO, H) \
+  ((H)->dynindx == -1 || ! elf_hash_table (INFO)->dynamic_sections_created)
+
+/* This structure collects information on what kind of GOT, PLT or
+   function descriptors are required by relocations that reference a
+   certain symbol.  */
+struct bfinfdpic_relocs_info
+{
+  /* The index of the symbol, as stored in the relocation r_info, if
+     we have a local symbol; -1 otherwise.  */
+  long symndx;
+  union
+  {
+    /* The input bfd in which the symbol is defined, if it's a local
+       symbol.  */
+    bfd *abfd;
+    /* If symndx == -1, the hash table entry corresponding to a global
+       symbol (even if it turns out to bind locally, in which case it
+       should ideally be replaced with section's symndx + addend).  */
+    struct elf_link_hash_entry *h;
+  } d;
+  /* The addend of the relocation that references the symbol.  */
+  bfd_vma addend;
+
+  /* The fields above are used to identify an entry.  The fields below
+     contain information on how an entry is used and, later on, which
+     locations it was assigned.  */
+  /* The following 2 fields record whether the symbol+addend above was
+     ever referenced with a GOT relocation.  The 17M4 suffix indicates a
+     GOT17M4 relocation; hilo is used for GOTLO/GOTHI pairs.  */
+  unsigned got17m4;
+  unsigned gothilo;
+  /* Whether a FUNCDESC relocation references symbol+addend.  */
+  unsigned fd;
+  /* Whether a FUNCDESC_GOT relocation references symbol+addend.  */
+  unsigned fdgot17m4;
+  unsigned fdgothilo;
+  /* Whether a FUNCDESC_GOTOFF relocation references symbol+addend.  */
+  unsigned fdgoff17m4;
+  unsigned fdgoffhilo;
+  /* Whether symbol+addend is referenced with GOTOFF17M4, GOTOFFLO or
+     GOTOFFHI relocations.  The addend doesn't really matter, since we
+     envision that this will only be used to check whether the symbol
+     is mapped to the same segment as the got.  */
+  unsigned gotoff;
+  /* Whether symbol+addend is referenced by a LABEL24 relocation.  */
+  unsigned call;
+  /* Whether symbol+addend is referenced by a 32 or FUNCDESC_VALUE
+     relocation.  */
+  unsigned sym;
+  /* Whether we need a PLT entry for a symbol.  Should be implied by
+     something like:
+     (call && symndx == -1 && ! BFINFDPIC_SYM_LOCAL (info, d.h))  */
+  unsigned plt:1;
+  /* Whether a function descriptor should be created in this link unit
+     for symbol+addend.  Should be implied by something like:
+     (plt || fdgotoff17m4 || fdgotofflohi
+      || ((fd || fdgot17m4 || fdgothilo)
+          && (symndx != -1 || BFINFDPIC_FUNCDESC_LOCAL (info, d.h))))  */
+  unsigned privfd:1;
+  /* Whether a lazy PLT entry is needed for this symbol+addend.
+     Should be implied by something like:
+     (privfd && symndx == -1 && ! BFINFDPIC_SYM_LOCAL (info, d.h)
+      && ! (info->flags & DF_BIND_NOW))  */
+  unsigned lazyplt:1;
+  /* Whether we've already emitted GOT relocations and PLT entries as
+     needed for this symbol.  */
+  unsigned done:1;
+
+  /* The number of R_BFIN_BYTE4_DATA, R_BFIN_FUNCDESC and R_BFIN_FUNCDESC_VALUE
+     relocations referencing the symbol.  */
+  unsigned relocs32, relocsfd, relocsfdv;
+
+  /* The number of .rofixups entries and dynamic relocations allocated
+     for this symbol, minus any that might have already been used.  */
+  unsigned fixups, dynrelocs;
+
+  /* The offsets of the GOT entries assigned to symbol+addend, to the
+     function descriptor's address, and to a function descriptor,
+     respectively.  Should be zero if unassigned.  The offsets are
+     counted from the value that will be assigned to the PIC register,
+     not from the beginning of the .got section.  */
+  bfd_signed_vma got_entry, fdgot_entry, fd_entry;
+  /* The offsets of the PLT entries assigned to symbol+addend,
+     non-lazy and lazy, respectively.  If unassigned, should be
+     (bfd_vma)-1.  */
+  bfd_vma plt_entry, lzplt_entry;
+};
+
+/* Compute a hash with the key fields of an bfinfdpic_relocs_info entry.  */
+static hashval_t
+bfinfdpic_relocs_info_hash (const void *entry_)
+{
+  const struct bfinfdpic_relocs_info *entry = entry_;
+
+  return (entry->symndx == -1
+	  ? (long) entry->d.h->root.root.hash
+	  : entry->symndx + (long) entry->d.abfd->id * 257) + entry->addend;
+}
+
+/* Test whether the key fields of two bfinfdpic_relocs_info entries are
+   identical.  */
+static int
+bfinfdpic_relocs_info_eq (const void *entry1, const void *entry2)
+{
+  const struct bfinfdpic_relocs_info *e1 = entry1;
+  const struct bfinfdpic_relocs_info *e2 = entry2;
+
+  return e1->symndx == e2->symndx && e1->addend == e2->addend
+    && (e1->symndx == -1 ? e1->d.h == e2->d.h : e1->d.abfd == e2->d.abfd);
+}
+
+/* Find or create an entry in a hash table HT that matches the key
+   fields of the given ENTRY.  If it's not found, memory for a new
+   entry is allocated in ABFD's obstack.  */
+static struct bfinfdpic_relocs_info *
+bfinfdpic_relocs_info_find (struct htab *ht,
+			   bfd *abfd,
+			   const struct bfinfdpic_relocs_info *entry,
+			   enum insert_option insert)
+{
+  struct bfinfdpic_relocs_info **loc;
+
+  if (!ht)
+    return NULL;
+
+  loc = (struct bfinfdpic_relocs_info **) htab_find_slot (ht, entry, insert);
+
+  if (! loc)
+    return NULL;
+
+  if (*loc)
+    return *loc;
+
+  *loc = bfd_zalloc (abfd, sizeof (**loc));
+
+  if (! *loc)
+    return *loc;
+
+  (*loc)->symndx = entry->symndx;
+  (*loc)->d = entry->d;
+  (*loc)->addend = entry->addend;
+  (*loc)->plt_entry = (bfd_vma)-1;
+  (*loc)->lzplt_entry = (bfd_vma)-1;
+
+  return *loc;
+}
+
+/* Obtain the address of the entry in HT associated with H's symbol +
+   addend, creating a new entry if none existed.  ABFD is only used
+   for memory allocation purposes.  */
+inline static struct bfinfdpic_relocs_info *
+bfinfdpic_relocs_info_for_global (struct htab *ht,
+				 bfd *abfd,
+				 struct elf_link_hash_entry *h,
+				 bfd_vma addend,
+				 enum insert_option insert)
+{
+  struct bfinfdpic_relocs_info entry;
+
+  entry.symndx = -1;
+  entry.d.h = h;
+  entry.addend = addend;
+
+  return bfinfdpic_relocs_info_find (ht, abfd, &entry, insert);
+}
+
+/* Obtain the address of the entry in HT associated with the SYMNDXth
+   local symbol of the input bfd ABFD, plus the addend, creating a new
+   entry if none existed.  */
+inline static struct bfinfdpic_relocs_info *
+bfinfdpic_relocs_info_for_local (struct htab *ht,
+				bfd *abfd,
+				long symndx,
+				bfd_vma addend,
+				enum insert_option insert)
+{
+  struct bfinfdpic_relocs_info entry;
+
+  entry.symndx = symndx;
+  entry.d.abfd = abfd;
+  entry.addend = addend;
+
+  return bfinfdpic_relocs_info_find (ht, abfd, &entry, insert);
+}
+
+/* Merge fields set by check_relocs() of two entries that end up being
+   mapped to the same (presumably global) symbol.  */
+
+inline static void
+bfinfdpic_pic_merge_early_relocs_info (struct bfinfdpic_relocs_info *e2,
+				      struct bfinfdpic_relocs_info const *e1)
+{
+  e2->got17m4 |= e1->got17m4;
+  e2->gothilo |= e1->gothilo;
+  e2->fd |= e1->fd;
+  e2->fdgot17m4 |= e1->fdgot17m4;
+  e2->fdgothilo |= e1->fdgothilo;
+  e2->fdgoff17m4 |= e1->fdgoff17m4;
+  e2->fdgoffhilo |= e1->fdgoffhilo;
+  e2->gotoff |= e1->gotoff;
+  e2->call |= e1->call;
+  e2->sym |= e1->sym;
+}
+
+/* Every block of 65535 lazy PLT entries shares a single call to the
+   resolver, inserted in the 32768th lazy PLT entry (i.e., entry #
+   32767, counting from 0).  All other lazy PLT entries branch to it
+   in a single instruction.  */
+
+#define LZPLT_RESOLVER_EXTRA 10
+#define LZPLT_NORMAL_SIZE 6
+#define LZPLT_ENTRIES 1362
+
+#define BFINFDPIC_LZPLT_BLOCK_SIZE ((bfd_vma) LZPLT_NORMAL_SIZE * LZPLT_ENTRIES + LZPLT_RESOLVER_EXTRA)
+#define BFINFDPIC_LZPLT_RESOLV_LOC (LZPLT_NORMAL_SIZE * LZPLT_ENTRIES / 2)
+
+/* Add a dynamic relocation to the SRELOC section.  */
+
+inline static bfd_vma
+_bfinfdpic_add_dyn_reloc (bfd *output_bfd, asection *sreloc, bfd_vma offset,
+			 int reloc_type, long dynindx, bfd_vma addend,
+			 struct bfinfdpic_relocs_info *entry)
+{
+  Elf_Internal_Rela outrel;
+  bfd_vma reloc_offset;
+
+  outrel.r_offset = offset;
+  outrel.r_info = ELF32_R_INFO (dynindx, reloc_type);
+  outrel.r_addend = addend;
+
+  reloc_offset = sreloc->reloc_count * sizeof (Elf32_External_Rel);
+  BFD_ASSERT (reloc_offset < sreloc->size);
+  bfd_elf32_swap_reloc_out (output_bfd, &outrel,
+			    sreloc->contents + reloc_offset);
+  sreloc->reloc_count++;
+
+  /* If the entry's index is zero, this relocation was probably to a
+     linkonce section that got discarded.  We reserved a dynamic
+     relocation, but it was for another entry than the one we got at
+     the time of emitting the relocation.  Unfortunately there's no
+     simple way for us to catch this situation, since the relocation
+     is cleared right before calling relocate_section, at which point
+     we no longer know what the relocation used to point to.  */
+  if (entry->symndx)
+    {
+      BFD_ASSERT (entry->dynrelocs > 0);
+      entry->dynrelocs--;
+    }
+
+  return reloc_offset;
+}
+
+/* Add a fixup to the ROFIXUP section.  */
+
+static bfd_vma
+_bfinfdpic_add_rofixup (bfd *output_bfd, asection *rofixup, bfd_vma offset,
+		       struct bfinfdpic_relocs_info *entry)
+{
+  bfd_vma fixup_offset;
+
+  if (rofixup->flags & SEC_EXCLUDE)
+    return -1;
+
+  fixup_offset = rofixup->reloc_count * 4;
+  if (rofixup->contents)
+    {
+      BFD_ASSERT (fixup_offset < rofixup->size);
+      bfd_put_32 (output_bfd, offset, rofixup->contents + fixup_offset);
+    }
+  rofixup->reloc_count++;
+
+  if (entry && entry->symndx)
+    {
+      /* See discussion about symndx == 0 in _bfinfdpic_add_dyn_reloc
+	 above.  */
+      BFD_ASSERT (entry->fixups > 0);
+      entry->fixups--;
+    }
+
+  return fixup_offset;
+}
+
+/* Find the segment number in which OSEC, and output section, is
+   located.  */
+
+static unsigned
+_bfinfdpic_osec_to_segment (bfd *output_bfd, asection *osec)
+{
+  Elf_Internal_Phdr *p = _bfd_elf_find_segment_containing_section (output_bfd, osec);
+
+  return (p != NULL) ? p - elf_tdata (output_bfd)->phdr : -1;
+}
+
+inline static bfd_boolean
+_bfinfdpic_osec_readonly_p (bfd *output_bfd, asection *osec)
+{
+  unsigned seg = _bfinfdpic_osec_to_segment (output_bfd, osec);
+
+  return ! (elf_tdata (output_bfd)->phdr[seg].p_flags & PF_W);
+}
+
+/* Generate relocations for GOT entries, function descriptors, and
+   code for PLT and lazy PLT entries.  */
+
+inline static bfd_boolean
+_bfinfdpic_emit_got_relocs_plt_entries (struct bfinfdpic_relocs_info *entry,
+					bfd *output_bfd,
+					struct bfd_link_info *info,
+					asection *sec,
+					Elf_Internal_Sym *sym,
+					bfd_vma addend)
+
+{
+  bfd_vma fd_lazy_rel_offset = (bfd_vma)-1;
+  int dynindx = -1;
+
+  if (entry->done)
+    return TRUE;
+  entry->done = 1;
+
+  if (entry->got_entry || entry->fdgot_entry || entry->fd_entry)
+    {
+      /* If the symbol is dynamic, consider it for dynamic
+	 relocations, otherwise decay to section + offset.  */
+      if (entry->symndx == -1 && entry->d.h->dynindx != -1)
+	dynindx = entry->d.h->dynindx;
+      else
+	{
+	  if (sec
+	      && sec->output_section
+	      && ! bfd_is_abs_section (sec->output_section)
+	      && ! bfd_is_und_section (sec->output_section))
+	    dynindx = elf_section_data (sec->output_section)->dynindx;
+	  else
+	    dynindx = 0;
+	}
+    }
+
+  /* Generate relocation for GOT entry pointing to the symbol.  */
+  if (entry->got_entry)
+    {
+      int idx = dynindx;
+      bfd_vma ad = addend;
+
+      /* If the symbol is dynamic but binds locally, use
+	 section+offset.  */
+      if (sec && (entry->symndx != -1
+		  || BFINFDPIC_SYM_LOCAL (info, entry->d.h)))
+	{
+	  if (entry->symndx == -1)
+	    ad += entry->d.h->root.u.def.value;
+	  else
+	    ad += sym->st_value;
+	  ad += sec->output_offset;
+	  if (sec->output_section && elf_section_data (sec->output_section))
+	    idx = elf_section_data (sec->output_section)->dynindx;
+	  else
+	    idx = 0;
+	}
+
+      /* If we're linking an executable at a fixed address, we can
+	 omit the dynamic relocation as long as the symbol is local to
+	 this module.  */
+      if (info->executable && !info->pie
+	  && (entry->symndx != -1
+	      || BFINFDPIC_SYM_LOCAL (info, entry->d.h)))
+	{
+	  if (sec)
+	    ad += sec->output_section->vma;
+	  if (entry->symndx != -1
+	      || entry->d.h->root.type != bfd_link_hash_undefweak)
+	    _bfinfdpic_add_rofixup (output_bfd,
+				   bfinfdpic_gotfixup_section (info),
+				   bfinfdpic_got_section (info)->output_section
+				   ->vma
+				   + bfinfdpic_got_section (info)->output_offset
+				   + bfinfdpic_got_initial_offset (info)
+				   + entry->got_entry, entry);
+	}
+      else
+	_bfinfdpic_add_dyn_reloc (output_bfd, bfinfdpic_gotrel_section (info),
+				 _bfd_elf_section_offset
+				 (output_bfd, info,
+				  bfinfdpic_got_section (info),
+				  bfinfdpic_got_initial_offset (info)
+				  + entry->got_entry)
+				 + bfinfdpic_got_section (info)
+				 ->output_section->vma
+				 + bfinfdpic_got_section (info)->output_offset,
+				 R_BFIN_BYTE4_DATA, idx, ad, entry);
+
+      bfd_put_32 (output_bfd, ad,
+		  bfinfdpic_got_section (info)->contents
+		  + bfinfdpic_got_initial_offset (info)
+		  + entry->got_entry);
+    }
+
+  /* Generate relocation for GOT entry pointing to a canonical
+     function descriptor.  */
+  if (entry->fdgot_entry)
+    {
+      int reloc, idx;
+      bfd_vma ad = 0;
+
+      if (! (entry->symndx == -1
+	     && entry->d.h->root.type == bfd_link_hash_undefweak
+	     && BFINFDPIC_SYM_LOCAL (info, entry->d.h)))
+	{
+	  /* If the symbol is dynamic and there may be dynamic symbol
+	     resolution because we are, or are linked with, a shared
+	     library, emit a FUNCDESC relocation such that the dynamic
+	     linker will allocate the function descriptor.  If the
+	     symbol needs a non-local function descriptor but binds
+	     locally (e.g., its visibility is protected, emit a
+	     dynamic relocation decayed to section+offset.  */
+	  if (entry->symndx == -1
+	      && ! BFINFDPIC_FUNCDESC_LOCAL (info, entry->d.h)
+	      && BFINFDPIC_SYM_LOCAL (info, entry->d.h)
+	      && !(info->executable && !info->pie))
+	    {
+	      reloc = R_BFIN_FUNCDESC;
+	      idx = elf_section_data (entry->d.h->root.u.def.section
+				      ->output_section)->dynindx;
+	      ad = entry->d.h->root.u.def.section->output_offset
+		+ entry->d.h->root.u.def.value;
+	    }
+	  else if (entry->symndx == -1
+		   && ! BFINFDPIC_FUNCDESC_LOCAL (info, entry->d.h))
+	    {
+	      reloc = R_BFIN_FUNCDESC;
+	      idx = dynindx;
+	      ad = addend;
+	      if (ad)
+		return FALSE;
+	    }
+	  else
+	    {
+	      /* Otherwise, we know we have a private function descriptor,
+		 so reference it directly.  */
+	      if (elf_hash_table (info)->dynamic_sections_created)
+		BFD_ASSERT (entry->privfd);
+	      reloc = R_BFIN_BYTE4_DATA;
+	      idx = elf_section_data (bfinfdpic_got_section (info)
+				      ->output_section)->dynindx;
+	      ad = bfinfdpic_got_section (info)->output_offset
+		+ bfinfdpic_got_initial_offset (info) + entry->fd_entry;
+	    }
+
+	  /* If there is room for dynamic symbol resolution, emit the
+	     dynamic relocation.  However, if we're linking an
+	     executable at a fixed location, we won't have emitted a
+	     dynamic symbol entry for the got section, so idx will be
+	     zero, which means we can and should compute the address
+	     of the private descriptor ourselves.  */
+	  if (info->executable && !info->pie
+	      && (entry->symndx != -1
+		  || BFINFDPIC_FUNCDESC_LOCAL (info, entry->d.h)))
+	    {
+	      ad += bfinfdpic_got_section (info)->output_section->vma;
+	      _bfinfdpic_add_rofixup (output_bfd,
+				     bfinfdpic_gotfixup_section (info),
+				     bfinfdpic_got_section (info)
+				     ->output_section->vma
+				     + bfinfdpic_got_section (info)
+				     ->output_offset
+				     + bfinfdpic_got_initial_offset (info)
+				     + entry->fdgot_entry, entry);
+	    }
+	  else
+	    _bfinfdpic_add_dyn_reloc (output_bfd,
+				     bfinfdpic_gotrel_section (info),
+				     _bfd_elf_section_offset
+				     (output_bfd, info,
+				      bfinfdpic_got_section (info),
+				      bfinfdpic_got_initial_offset (info)
+				      + entry->fdgot_entry)
+				     + bfinfdpic_got_section (info)
+				     ->output_section->vma
+				     + bfinfdpic_got_section (info)
+				     ->output_offset,
+				     reloc, idx, ad, entry);
+	}
+
+      bfd_put_32 (output_bfd, ad,
+		  bfinfdpic_got_section (info)->contents
+		  + bfinfdpic_got_initial_offset (info)
+		  + entry->fdgot_entry);
+    }
+
+  /* Generate relocation to fill in a private function descriptor in
+     the GOT.  */
+  if (entry->fd_entry)
+    {
+      int idx = dynindx;
+      bfd_vma ad = addend;
+      bfd_vma ofst;
+      long lowword, highword;
+
+      /* If the symbol is dynamic but binds locally, use
+	 section+offset.  */
+      if (sec && (entry->symndx != -1
+		  || BFINFDPIC_SYM_LOCAL (info, entry->d.h)))
+	{
+	  if (entry->symndx == -1)
+	    ad += entry->d.h->root.u.def.value;
+	  else
+	    ad += sym->st_value;
+	  ad += sec->output_offset;
+	  if (sec->output_section && elf_section_data (sec->output_section))
+	    idx = elf_section_data (sec->output_section)->dynindx;
+	  else
+	    idx = 0;
+	}
+
+      /* If we're linking an executable at a fixed address, we can
+	 omit the dynamic relocation as long as the symbol is local to
+	 this module.  */
+      if (info->executable && !info->pie
+	  && (entry->symndx != -1 || BFINFDPIC_SYM_LOCAL (info, entry->d.h)))
+	{
+	  if (sec)
+	    ad += sec->output_section->vma;
+	  ofst = 0;
+	  if (entry->symndx != -1
+	      || entry->d.h->root.type != bfd_link_hash_undefweak)
+	    {
+	      _bfinfdpic_add_rofixup (output_bfd,
+				     bfinfdpic_gotfixup_section (info),
+				     bfinfdpic_got_section (info)
+				     ->output_section->vma
+				     + bfinfdpic_got_section (info)
+				     ->output_offset
+				     + bfinfdpic_got_initial_offset (info)
+				     + entry->fd_entry, entry);
+	      _bfinfdpic_add_rofixup (output_bfd,
+				     bfinfdpic_gotfixup_section (info),
+				     bfinfdpic_got_section (info)
+				     ->output_section->vma
+				     + bfinfdpic_got_section (info)
+				     ->output_offset
+				     + bfinfdpic_got_initial_offset (info)
+				     + entry->fd_entry + 4, entry);
+	    }
+	}
+      else
+	{
+	  ofst
+	    = _bfinfdpic_add_dyn_reloc (output_bfd,
+					entry->lazyplt
+					? bfinfdpic_pltrel_section (info)
+					: bfinfdpic_gotrel_section (info),
+					_bfd_elf_section_offset
+					(output_bfd, info,
+					 bfinfdpic_got_section (info),
+					 bfinfdpic_got_initial_offset (info)
+					 + entry->fd_entry)
+					+ bfinfdpic_got_section (info)
+					->output_section->vma
+					+ bfinfdpic_got_section (info)
+					->output_offset,
+					R_BFIN_FUNCDESC_VALUE, idx, ad, entry);
+	}
+
+      /* If we've omitted the dynamic relocation, just emit the fixed
+	 addresses of the symbol and of the local GOT base offset.  */
+      if (info->executable && !info->pie && sec && sec->output_section)
+	{
+	  lowword = ad;
+	  highword = bfinfdpic_got_section (info)->output_section->vma
+	    + bfinfdpic_got_section (info)->output_offset
+	    + bfinfdpic_got_initial_offset (info);
+	}
+      else if (entry->lazyplt)
+	{
+	  if (ad)
+	    return FALSE;
+
+	  fd_lazy_rel_offset = ofst;
+
+	  /* A function descriptor used for lazy or local resolving is
+	     initialized such that its high word contains the output
+	     section index in which the PLT entries are located, and
+	     the low word contains the address of the lazy PLT entry
+	     entry point, that must be within the memory region
+	     assigned to that section.  */
+	  lowword = entry->lzplt_entry + 4
+	    + bfinfdpic_plt_section (info)->output_offset
+	    + bfinfdpic_plt_section (info)->output_section->vma;
+	  highword = _bfinfdpic_osec_to_segment
+	    (output_bfd, bfinfdpic_plt_section (info)->output_section);
+	}
+      else
+	{
+	  /* A function descriptor for a local function gets the index
+	     of the section.  For a non-local function, it's
+	     disregarded.  */
+	  lowword = ad;
+	  if (sec == NULL
+	      || (entry->symndx == -1 && entry->d.h->dynindx != -1
+		  && entry->d.h->dynindx == idx))
+	    highword = 0;
+	  else
+	    highword = _bfinfdpic_osec_to_segment
+	      (output_bfd, sec->output_section);
+	}
+
+      bfd_put_32 (output_bfd, lowword,
+		  bfinfdpic_got_section (info)->contents
+		  + bfinfdpic_got_initial_offset (info)
+		  + entry->fd_entry);
+      bfd_put_32 (output_bfd, highword,
+		  bfinfdpic_got_section (info)->contents
+		  + bfinfdpic_got_initial_offset (info)
+		  + entry->fd_entry + 4);
+    }
+
+  /* Generate code for the PLT entry.  */
+  if (entry->plt_entry != (bfd_vma) -1)
+    {
+      bfd_byte *plt_code = bfinfdpic_plt_section (info)->contents
+	+ entry->plt_entry;
+
+      BFD_ASSERT (entry->fd_entry);
+
+      /* Figure out what kind of PLT entry we need, depending on the
+	 location of the function descriptor within the GOT.  */
+      if (entry->fd_entry >= -(1 << (18 - 1))
+	  && entry->fd_entry + 4 < (1 << (18 - 1)))
+	{
+	  /* P1 = [P3 + fd_entry]; P3 = [P3 + fd_entry + 4] */
+	  bfd_put_32 (output_bfd,
+		      0xe519 | ((entry->fd_entry << 14) & 0xFFFF0000),
+		      plt_code);
+	  bfd_put_32 (output_bfd,
+		      0xe51b | (((entry->fd_entry + 4) << 14) & 0xFFFF0000),
+		      plt_code + 4);
+	  plt_code += 8;
+	}
+      else
+	{
+	  /* P1.L = fd_entry; P1.H = fd_entry;
+	     P3 = P3 + P1;
+	     P1 = [P3];
+	     P3 = [P3 + 4];  */
+	  bfd_put_32 (output_bfd,
+		      0xe109 | (entry->fd_entry << 16),
+		      plt_code);
+	  bfd_put_32 (output_bfd,
+		      0xe149 | (entry->fd_entry & 0xFFFF0000),
+		      plt_code + 4);
+	  bfd_put_16 (output_bfd, 0x5ad9, plt_code + 8);
+	  bfd_put_16 (output_bfd, 0x9159, plt_code + 10);
+	  bfd_put_16 (output_bfd, 0xac5b, plt_code + 12);
+	  plt_code += 14;
+	}
+      /* JUMP (P1) */
+      bfd_put_16 (output_bfd, 0x0051, plt_code);
+    }
+
+  /* Generate code for the lazy PLT entry.  */
+  if (entry->lzplt_entry != (bfd_vma) -1)
+    {
+      bfd_byte *lzplt_code = bfinfdpic_plt_section (info)->contents
+	+ entry->lzplt_entry;
+      bfd_vma resolverStub_addr;
+
+      bfd_put_32 (output_bfd, fd_lazy_rel_offset, lzplt_code);
+      lzplt_code += 4;
+
+      resolverStub_addr = entry->lzplt_entry / BFINFDPIC_LZPLT_BLOCK_SIZE
+	* BFINFDPIC_LZPLT_BLOCK_SIZE + BFINFDPIC_LZPLT_RESOLV_LOC;
+      if (resolverStub_addr >= bfinfdpic_plt_initial_offset (info))
+	resolverStub_addr = bfinfdpic_plt_initial_offset (info) - LZPLT_NORMAL_SIZE - LZPLT_RESOLVER_EXTRA;
+
+      if (entry->lzplt_entry == resolverStub_addr)
+	{
+	  /* This is a lazy PLT entry that includes a resolver call.
+	     P2 = [P3];
+	     R3 = [P3 + 4];
+	     JUMP (P2);  */
+	  bfd_put_32 (output_bfd,
+		      0xa05b915a,
+		      lzplt_code);
+	  bfd_put_16 (output_bfd, 0x0052, lzplt_code + 4);
+	}
+      else
+	{
+	  /* JUMP.S  resolverStub */
+	  bfd_put_16 (output_bfd,
+		      0x2000
+		      | (((resolverStub_addr - entry->lzplt_entry)
+			  / 2) & (((bfd_vma)1 << 12) - 1)),
+		      lzplt_code);
+	}
+    }
+
+  return TRUE;
+}
+
+/* Relocate an Blackfin ELF section.
+
+   The RELOCATE_SECTION function is called by the new ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures; if the section
+   actually uses Rel structures, the r_addend field will always be
+   zero.
+
+   This function is responsible for adjusting the section contents as
+   necessary, and (if using Rela relocs and generating a relocatable
+   output file) adjusting the reloc addend as necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.  */
+
+static bfd_boolean
+bfinfdpic_relocate_section (bfd * output_bfd,
+			    struct bfd_link_info *info,
+			    bfd * input_bfd,
+			    asection * input_section,
+			    bfd_byte * contents,
+			    Elf_Internal_Rela * relocs,
+			    Elf_Internal_Sym * local_syms,
+			    asection ** local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  unsigned isec_segment, got_segment, plt_segment,
+    check_segment[2];
+  int silence_segment_error = !(info->shared || info->pie);
+
+  symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+  relend     = relocs + input_section->reloc_count;
+
+  isec_segment = _bfinfdpic_osec_to_segment (output_bfd,
+					     input_section->output_section);
+  if (IS_FDPIC (output_bfd) && bfinfdpic_got_section (info))
+    got_segment = _bfinfdpic_osec_to_segment (output_bfd,
+					      bfinfdpic_got_section (info)
+					      ->output_section);
+  else
+    got_segment = -1;
+  if (IS_FDPIC (output_bfd) && elf_hash_table (info)->dynamic_sections_created)
+    plt_segment = _bfinfdpic_osec_to_segment (output_bfd,
+					      bfinfdpic_plt_section (info)
+					      ->output_section);
+  else
+    plt_segment = -1;
+
+  for (rel = relocs; rel < relend; rel ++)
+    {
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+      const char * name = NULL;
+      int r_type;
+      asection *osec;
+      struct bfinfdpic_relocs_info *picrel;
+      bfd_vma orig_addend = rel->r_addend;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      if (r_type == R_BFIN_GNU_VTINHERIT
+	  || r_type == R_BFIN_GNU_VTENTRY)
+	continue;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      howto = bfin_reloc_type_lookup (input_bfd, r_type);
+      if (howto == NULL)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      h      = NULL;
+      sym    = NULL;
+      sec    = NULL;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  osec = sec = local_sections [r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+
+	  name = bfd_elf_string_from_elf_section
+	    (input_bfd, symtab_hdr->sh_link, sym->st_name);
+	  name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name;
+	}
+      else
+	{
+	  bfd_boolean warned;
+	  bfd_boolean unresolved_reloc;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	  osec = sec;
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      if (h != NULL
+	  && (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	  && !BFINFDPIC_SYM_LOCAL (info, h))
+	{
+	  osec = sec = NULL;
+	  relocation = 0;
+	}
+
+      switch (r_type)
+	{
+	case R_BFIN_PCREL24:
+	case R_BFIN_PCREL24_JUMP_L:
+	case R_BFIN_BYTE4_DATA:
+	  if (! IS_FDPIC (output_bfd))
+	    goto non_fdpic;
+
+	case R_BFIN_GOT17M4:
+	case R_BFIN_GOTHI:
+	case R_BFIN_GOTLO:
+	case R_BFIN_FUNCDESC_GOT17M4:
+	case R_BFIN_FUNCDESC_GOTHI:
+	case R_BFIN_FUNCDESC_GOTLO:
+	case R_BFIN_GOTOFF17M4:
+	case R_BFIN_GOTOFFHI:
+	case R_BFIN_GOTOFFLO:
+	case R_BFIN_FUNCDESC_GOTOFF17M4:
+	case R_BFIN_FUNCDESC_GOTOFFHI:
+	case R_BFIN_FUNCDESC_GOTOFFLO:
+	case R_BFIN_FUNCDESC:
+	case R_BFIN_FUNCDESC_VALUE:
+	  if (h != NULL)
+	    picrel = bfinfdpic_relocs_info_for_global (bfinfdpic_relocs_info
+						       (info), input_bfd, h,
+						       orig_addend, INSERT);
+	  else
+	    /* In order to find the entry we created before, we must
+	       use the original addend, not the one that may have been
+	       modified by _bfd_elf_rela_local_sym().  */
+	    picrel = bfinfdpic_relocs_info_for_local (bfinfdpic_relocs_info
+						      (info), input_bfd, r_symndx,
+						      orig_addend, INSERT);
+	  if (! picrel)
+	    return FALSE;
+
+	  if (!_bfinfdpic_emit_got_relocs_plt_entries (picrel, output_bfd, info,
+						       osec, sym,
+						       rel->r_addend))
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: relocation at `%A+0x%x' references symbol `%s' with nonzero addend"),
+		 input_bfd, input_section, rel->r_offset, name);
+	      return FALSE;
+
+	    }
+
+	  break;
+
+	default:
+	non_fdpic:
+	  picrel = NULL;
+	  if (h && ! BFINFDPIC_SYM_LOCAL (info, h))
+	    {
+	      info->callbacks->warning
+		(info, _("relocation references symbol not defined in the module"),
+		 name, input_bfd, input_section, rel->r_offset);
+	      return FALSE;
+	    }
+	  break;
+	}
+
+      switch (r_type)
+	{
+	case R_BFIN_PCREL24:
+	case R_BFIN_PCREL24_JUMP_L:
+	  check_segment[0] = isec_segment;
+	  if (! IS_FDPIC (output_bfd))
+	    check_segment[1] = isec_segment;
+	  else if (picrel->plt)
+	    {
+	      relocation = bfinfdpic_plt_section (info)->output_section->vma
+		+ bfinfdpic_plt_section (info)->output_offset
+		+ picrel->plt_entry;
+	      check_segment[1] = plt_segment;
+	    }
+	  /* We don't want to warn on calls to undefined weak symbols,
+	     as calls to them must be protected by non-NULL tests
+	     anyway, and unprotected calls would invoke undefined
+	     behavior.  */
+	  else if (picrel->symndx == -1
+		   && picrel->d.h->root.type == bfd_link_hash_undefweak)
+	    check_segment[1] = check_segment[0];
+	  else
+	    check_segment[1] = sec
+	      ? _bfinfdpic_osec_to_segment (output_bfd, sec->output_section)
+	      : (unsigned)-1;
+	  break;
+
+	case R_BFIN_GOT17M4:
+	case R_BFIN_GOTHI:
+	case R_BFIN_GOTLO:
+	  relocation = picrel->got_entry;
+	  check_segment[0] = check_segment[1] = got_segment;
+	  break;
+
+	case R_BFIN_FUNCDESC_GOT17M4:
+	case R_BFIN_FUNCDESC_GOTHI:
+	case R_BFIN_FUNCDESC_GOTLO:
+	  relocation = picrel->fdgot_entry;
+	  check_segment[0] = check_segment[1] = got_segment;
+	  break;
+
+	case R_BFIN_GOTOFFHI:
+	case R_BFIN_GOTOFF17M4:
+	case R_BFIN_GOTOFFLO:
+	  relocation -= bfinfdpic_got_section (info)->output_section->vma
+	    + bfinfdpic_got_section (info)->output_offset
+	    + bfinfdpic_got_initial_offset (info);
+	  check_segment[0] = got_segment;
+	  check_segment[1] = sec
+	    ? _bfinfdpic_osec_to_segment (output_bfd, sec->output_section)
+	    : (unsigned)-1;
+	  break;
+
+	case R_BFIN_FUNCDESC_GOTOFF17M4:
+	case R_BFIN_FUNCDESC_GOTOFFHI:
+	case R_BFIN_FUNCDESC_GOTOFFLO:
+	  relocation = picrel->fd_entry;
+	  check_segment[0] = check_segment[1] = got_segment;
+	  break;
+
+	case R_BFIN_FUNCDESC:
+	  {
+	    int dynindx;
+	    bfd_vma addend = rel->r_addend;
+
+	    if (! (h && h->root.type == bfd_link_hash_undefweak
+		   && BFINFDPIC_SYM_LOCAL (info, h)))
+	      {
+		/* If the symbol is dynamic and there may be dynamic
+		   symbol resolution because we are or are linked with a
+		   shared library, emit a FUNCDESC relocation such that
+		   the dynamic linker will allocate the function
+		   descriptor.  If the symbol needs a non-local function
+		   descriptor but binds locally (e.g., its visibility is
+		   protected, emit a dynamic relocation decayed to
+		   section+offset.  */
+		if (h && ! BFINFDPIC_FUNCDESC_LOCAL (info, h)
+		    && BFINFDPIC_SYM_LOCAL (info, h)
+		    && !(info->executable && !info->pie))
+		  {
+		    dynindx = elf_section_data (h->root.u.def.section
+						->output_section)->dynindx;
+		    addend += h->root.u.def.section->output_offset
+		      + h->root.u.def.value;
+		  }
+		else if (h && ! BFINFDPIC_FUNCDESC_LOCAL (info, h))
+		  {
+		    if (addend)
+		      {
+			info->callbacks->warning
+			  (info, _("R_BFIN_FUNCDESC references dynamic symbol with nonzero addend"),
+			   name, input_bfd, input_section, rel->r_offset);
+			return FALSE;
+		      }
+		    dynindx = h->dynindx;
+		  }
+		else
+		  {
+		    /* Otherwise, we know we have a private function
+		       descriptor, so reference it directly.  */
+		    BFD_ASSERT (picrel->privfd);
+		    r_type = R_BFIN_BYTE4_DATA;
+		    dynindx = elf_section_data (bfinfdpic_got_section (info)
+						->output_section)->dynindx;
+		    addend = bfinfdpic_got_section (info)->output_offset
+		      + bfinfdpic_got_initial_offset (info)
+		      + picrel->fd_entry;
+		  }
+
+		/* If there is room for dynamic symbol resolution, emit
+		   the dynamic relocation.  However, if we're linking an
+		   executable at a fixed location, we won't have emitted a
+		   dynamic symbol entry for the got section, so idx will
+		   be zero, which means we can and should compute the
+		   address of the private descriptor ourselves.  */
+		if (info->executable && !info->pie
+		    && (!h || BFINFDPIC_FUNCDESC_LOCAL (info, h)))
+		  {
+		    bfd_vma offset;
+
+		    addend += bfinfdpic_got_section (info)->output_section->vma;
+		    if ((bfd_get_section_flags (output_bfd,
+						input_section->output_section)
+			 & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD))
+		      {
+			if (_bfinfdpic_osec_readonly_p (output_bfd,
+						       input_section
+						       ->output_section))
+			  {
+			    info->callbacks->warning
+			      (info,
+			       _("cannot emit fixups in read-only section"),
+			       name, input_bfd, input_section, rel->r_offset);
+			    return FALSE;
+			  }
+
+			offset = _bfd_elf_section_offset
+			  (output_bfd, info,
+			   input_section, rel->r_offset);
+
+			if (offset != (bfd_vma)-1)
+			  _bfinfdpic_add_rofixup (output_bfd,
+						  bfinfdpic_gotfixup_section
+						  (info),
+						  offset + input_section
+						  ->output_section->vma
+						  + input_section->output_offset,
+						  picrel);
+		      }
+		  }
+		else if ((bfd_get_section_flags (output_bfd,
+						 input_section->output_section)
+			  & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD))
+		  {
+		    bfd_vma offset;
+
+		    if (_bfinfdpic_osec_readonly_p (output_bfd,
+						   input_section
+						   ->output_section))
+		      {
+			info->callbacks->warning
+			  (info,
+			   _("cannot emit dynamic relocations in read-only section"),
+			   name, input_bfd, input_section, rel->r_offset);
+			return FALSE;
+		      }
+		    offset = _bfd_elf_section_offset (output_bfd, info,
+						      input_section, rel->r_offset);
+
+		    if (offset != (bfd_vma)-1)
+		      _bfinfdpic_add_dyn_reloc (output_bfd,
+						bfinfdpic_gotrel_section (info),
+						offset + input_section
+						->output_section->vma
+						+ input_section->output_offset,
+						r_type,
+						dynindx, addend, picrel);
+		  }
+		else
+		  addend += bfinfdpic_got_section (info)->output_section->vma;
+	      }
+
+	    /* We want the addend in-place because dynamic
+	       relocations are REL.  Setting relocation to it should
+	       arrange for it to be installed.  */
+	    relocation = addend - rel->r_addend;
+	  }
+	  check_segment[0] = check_segment[1] = got_segment;
+	  break;
+
+	case R_BFIN_BYTE4_DATA:
+	  if (! IS_FDPIC (output_bfd))
+	    {
+	      check_segment[0] = check_segment[1] = -1;
+	      break;
+	    }
+	  /* Fall through.  */
+	case R_BFIN_FUNCDESC_VALUE:
+	  {
+	    int dynindx;
+	    bfd_vma addend = rel->r_addend;
+	    bfd_vma offset;
+	    offset = _bfd_elf_section_offset (output_bfd, info,
+					      input_section, rel->r_offset);
+
+	    /* If the symbol is dynamic but binds locally, use
+	       section+offset.  */
+	    if (h && ! BFINFDPIC_SYM_LOCAL (info, h))
+	      {
+		if (addend && r_type == R_BFIN_FUNCDESC_VALUE)
+		  {
+		    info->callbacks->warning
+		      (info, _("R_BFIN_FUNCDESC_VALUE references dynamic symbol with nonzero addend"),
+		       name, input_bfd, input_section, rel->r_offset);
+		    return FALSE;
+		  }
+		dynindx = h->dynindx;
+	      }
+	    else
+	      {
+		if (h)
+		  addend += h->root.u.def.value;
+		else
+		  addend += sym->st_value;
+		if (osec)
+		  addend += osec->output_offset;
+		if (osec && osec->output_section
+		    && ! bfd_is_abs_section (osec->output_section)
+		    && ! bfd_is_und_section (osec->output_section))
+		  dynindx = elf_section_data (osec->output_section)->dynindx;
+		else
+		  dynindx = 0;
+	      }
+
+	    /* If we're linking an executable at a fixed address, we
+	       can omit the dynamic relocation as long as the symbol
+	       is defined in the current link unit (which is implied
+	       by its output section not being NULL).  */
+	    if (info->executable && !info->pie
+		&& (!h || BFINFDPIC_SYM_LOCAL (info, h)))
+	      {
+		if (osec)
+		  addend += osec->output_section->vma;
+		if (IS_FDPIC (input_bfd)
+		    && (bfd_get_section_flags (output_bfd,
+					       input_section->output_section)
+			& (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD))
+		  {
+		    if (_bfinfdpic_osec_readonly_p (output_bfd,
+						   input_section
+						   ->output_section))
+		      {
+			info->callbacks->warning
+			  (info,
+			   _("cannot emit fixups in read-only section"),
+			   name, input_bfd, input_section, rel->r_offset);
+			return FALSE;
+		      }
+		    if (!h || h->root.type != bfd_link_hash_undefweak)
+		      {
+			if (offset != (bfd_vma)-1)
+			  {
+			    _bfinfdpic_add_rofixup (output_bfd,
+						    bfinfdpic_gotfixup_section
+						    (info),
+						    offset + input_section
+						    ->output_section->vma
+						    + input_section->output_offset,
+						    picrel);
+
+			    if (r_type == R_BFIN_FUNCDESC_VALUE)
+			      _bfinfdpic_add_rofixup
+				(output_bfd,
+				 bfinfdpic_gotfixup_section (info),
+				 offset + input_section->output_section->vma
+				 + input_section->output_offset + 4, picrel);
+			  }
+		      }
+		  }
+	      }
+	    else
+	      {
+		if ((bfd_get_section_flags (output_bfd,
+					    input_section->output_section)
+		     & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD))
+		  {
+		    if (_bfinfdpic_osec_readonly_p (output_bfd,
+						   input_section
+						   ->output_section))
+		      {
+			info->callbacks->warning
+			  (info,
+			   _("cannot emit dynamic relocations in read-only section"),
+			   name, input_bfd, input_section, rel->r_offset);
+			return FALSE;
+		      }
+
+		    if (offset != (bfd_vma)-1)
+		      _bfinfdpic_add_dyn_reloc (output_bfd,
+						bfinfdpic_gotrel_section (info),
+						offset
+						+ input_section->output_section->vma
+						+ input_section->output_offset,
+						r_type, dynindx, addend, picrel);
+		  }
+		else if (osec)
+		  addend += osec->output_section->vma;
+		/* We want the addend in-place because dynamic
+		   relocations are REL.  Setting relocation to it
+		   should arrange for it to be installed.  */
+		relocation = addend - rel->r_addend;
+	      }
+
+	    if (r_type == R_BFIN_FUNCDESC_VALUE)
+	      {
+		/* If we've omitted the dynamic relocation, just emit
+		   the fixed addresses of the symbol and of the local
+		   GOT base offset.  */
+		if (info->executable && !info->pie
+		    && (!h || BFINFDPIC_SYM_LOCAL (info, h)))
+		  bfd_put_32 (output_bfd,
+			      bfinfdpic_got_section (info)->output_section->vma
+			      + bfinfdpic_got_section (info)->output_offset
+			      + bfinfdpic_got_initial_offset (info),
+			      contents + rel->r_offset + 4);
+		else
+		  /* A function descriptor used for lazy or local
+		     resolving is initialized such that its high word
+		     contains the output section index in which the
+		     PLT entries are located, and the low word
+		     contains the offset of the lazy PLT entry entry
+		     point into that section.  */
+		  bfd_put_32 (output_bfd,
+			      h && ! BFINFDPIC_SYM_LOCAL (info, h)
+			      ? 0
+			      : _bfinfdpic_osec_to_segment (output_bfd,
+							    sec
+							    ->output_section),
+			      contents + rel->r_offset + 4);
+	      }
+	  }
+	  check_segment[0] = check_segment[1] = got_segment;
+	  break;
+
+	default:
+	  check_segment[0] = isec_segment;
+	  check_segment[1] = sec
+	    ? _bfinfdpic_osec_to_segment (output_bfd, sec->output_section)
+	    : (unsigned)-1;
+	  break;
+	}
+
+      if (check_segment[0] != check_segment[1] && IS_FDPIC (output_bfd))
+	{
+#if 1 /* If you take this out, remove the #error from fdpic-static-6.d
+	 in the ld testsuite.  */
+	  /* This helps catch problems in GCC while we can't do more
+	     than static linking.  The idea is to test whether the
+	     input file basename is crt0.o only once.  */
+	  if (silence_segment_error == 1)
+	    silence_segment_error =
+	      (strlen (input_bfd->filename) == 6
+	       && filename_cmp (input_bfd->filename, "crt0.o") == 0)
+	      || (strlen (input_bfd->filename) > 6
+		  && filename_cmp (input_bfd->filename
+				   + strlen (input_bfd->filename) - 7,
+			     "/crt0.o") == 0)
+	      ? -1 : 0;
+#endif
+	  if (!silence_segment_error
+	      /* We don't want duplicate errors for undefined
+		 symbols.  */
+	      && !(picrel && picrel->symndx == -1
+		   && picrel->d.h->root.type == bfd_link_hash_undefined))
+	    info->callbacks->warning
+	      (info,
+	       (info->shared || info->pie)
+	       ? _("relocations between different segments are not supported")
+	       : _("warning: relocation references a different segment"),
+	       name, input_bfd, input_section, rel->r_offset);
+	  if (!silence_segment_error && (info->shared || info->pie))
+	    return FALSE;
+	  elf_elfheader (output_bfd)->e_flags |= EF_BFIN_PIC;
+	}
+
+      switch (r_type)
+	{
+	case R_BFIN_GOTOFFHI:
+	  /* We need the addend to be applied before we shift the
+	     value right.  */
+	  relocation += rel->r_addend;
+	  /* Fall through.  */
+	case R_BFIN_GOTHI:
+	case R_BFIN_FUNCDESC_GOTHI:
+	case R_BFIN_FUNCDESC_GOTOFFHI:
+	  relocation >>= 16;
+	  /* Fall through.  */
+
+	case R_BFIN_GOTLO:
+	case R_BFIN_FUNCDESC_GOTLO:
+	case R_BFIN_GOTOFFLO:
+	case R_BFIN_FUNCDESC_GOTOFFLO:
+	  relocation &= 0xffff;
+	  break;
+
+	default:
+	  break;
+	}
+
+      switch (r_type)
+	{
+	case R_BFIN_PCREL24:
+	case R_BFIN_PCREL24_JUMP_L:
+	  if (! IS_FDPIC (output_bfd) || ! picrel->plt)
+	    break;
+	  /* Fall through.  */
+
+	  /* When referencing a GOT entry, a function descriptor or a
+	     PLT, we don't want the addend to apply to the reference,
+	     but rather to the referenced symbol.  The actual entry
+	     will have already been created taking the addend into
+	     account, so cancel it out here.  */
+	case R_BFIN_GOT17M4:
+	case R_BFIN_GOTHI:
+	case R_BFIN_GOTLO:
+	case R_BFIN_FUNCDESC_GOT17M4:
+	case R_BFIN_FUNCDESC_GOTHI:
+	case R_BFIN_FUNCDESC_GOTLO:
+	case R_BFIN_FUNCDESC_GOTOFF17M4:
+	case R_BFIN_FUNCDESC_GOTOFFHI:
+	case R_BFIN_FUNCDESC_GOTOFFLO:
+	  /* Note that we only want GOTOFFHI, not GOTOFFLO or GOTOFF17M4
+	     here, since we do want to apply the addend to the others.
+	     Note that we've applied the addend to GOTOFFHI before we
+	     shifted it right.  */
+	case R_BFIN_GOTOFFHI:
+	  relocation -= rel->r_addend;
+	  break;
+
+	default:
+	  break;
+	}
+
+      r = bfin_final_link_relocate (rel, howto, input_bfd, input_section,
+				    contents, rel->r_offset,
+				    relocation, rel->r_addend);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char * msg = (const char *) NULL;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      r = info->callbacks->reloc_overflow
+		(info, (h ? &h->root : NULL), name, howto->name,
+		 (bfd_vma) 0, input_bfd, input_section, rel->r_offset);
+	      break;
+
+	    case bfd_reloc_undefined:
+	      r = info->callbacks->undefined_symbol
+		(info, name, input_bfd, input_section, rel->r_offset, TRUE);
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      break;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      break;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous relocation");
+	      break;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      break;
+	    }
+
+	  if (msg)
+	    r = info->callbacks->warning
+	      (info, msg, name, input_bfd, input_section, rel->r_offset);
+
+	  if (! r)
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Update the relocation information for the relocations of the section
+   being removed.  */
+
+static bfd_boolean
+bfinfdpic_gc_sweep_hook (bfd *abfd,
+			 struct bfd_link_info *info,
+			 asection *sec,
+			 const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes, **sym_hashes_end;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  struct bfinfdpic_relocs_info *picrel;
+
+  BFD_ASSERT (IS_FDPIC (abfd));
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  sym_hashes_end = sym_hashes + symtab_hdr->sh_size/sizeof(Elf32_External_Sym);
+  if (!elf_bad_symtab (abfd))
+    sym_hashes_end -= symtab_hdr->sh_info;
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+        h = NULL;
+      else
+        h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+
+      if (h != NULL)
+	picrel = bfinfdpic_relocs_info_for_global (bfinfdpic_relocs_info (info),
+						   abfd, h,
+						   rel->r_addend, NO_INSERT);
+      else
+	picrel = bfinfdpic_relocs_info_for_local (bfinfdpic_relocs_info
+						  (info), abfd, r_symndx,
+						  rel->r_addend, NO_INSERT);
+
+      if (!picrel)
+	return TRUE;
+
+      switch (ELF32_R_TYPE (rel->r_info))
+        {
+	case R_BFIN_PCREL24:
+	case R_BFIN_PCREL24_JUMP_L:
+	  picrel->call--;
+	  break;
+
+	case R_BFIN_FUNCDESC_VALUE:
+	  picrel->relocsfdv--;
+	  if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)
+	    picrel->relocs32++;
+	  /* Fall through.  */
+
+	case R_BFIN_BYTE4_DATA:
+	  picrel->sym--;
+	  if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)
+	    picrel->relocs32--;
+	  break;
+
+	case R_BFIN_GOT17M4:
+	  picrel->got17m4--;
+	  break;
+
+	case R_BFIN_GOTHI:
+	case R_BFIN_GOTLO:
+	  picrel->gothilo--;
+	  break;
+
+	case R_BFIN_FUNCDESC_GOT17M4:
+	  picrel->fdgot17m4--;
+	  break;
+
+	case R_BFIN_FUNCDESC_GOTHI:
+	case R_BFIN_FUNCDESC_GOTLO:
+	  picrel->fdgothilo--;
+	  break;
+
+	case R_BFIN_GOTOFF17M4:
+	case R_BFIN_GOTOFFHI:
+	case R_BFIN_GOTOFFLO:
+	  picrel->gotoff--;
+	  break;
+
+	case R_BFIN_FUNCDESC_GOTOFF17M4:
+	  picrel->fdgoff17m4--;
+	  break;
+
+	case R_BFIN_FUNCDESC_GOTOFFHI:
+	case R_BFIN_FUNCDESC_GOTOFFLO:
+	  picrel->fdgoffhilo--;
+	  break;
+
+	case R_BFIN_FUNCDESC:
+	  picrel->fd--;
+	  picrel->relocsfd--;
+	  break;
+
+	default:
+	  break;
+        }
+    }
+
+  return TRUE;
+}
+
+/* We need dynamic symbols for every section, since segments can
+   relocate independently.  */
+static bfd_boolean
+_bfinfdpic_link_omit_section_dynsym (bfd *output_bfd ATTRIBUTE_UNUSED,
+				    struct bfd_link_info *info ATTRIBUTE_UNUSED,
+				    asection *p)
+{
+  switch (elf_section_data (p)->this_hdr.sh_type)
+    {
+    case SHT_PROGBITS:
+    case SHT_NOBITS:
+      /* If sh_type is yet undecided, assume it could be
+	 SHT_PROGBITS/SHT_NOBITS.  */
+    case SHT_NULL:
+      return FALSE;
+
+      /* There shouldn't be section relative relocations
+	 against any other section.  */
+    default:
+      return TRUE;
+    }
+}
+
+/* Create  a .got section, as well as its additional info field.  This
+   is almost entirely copied from
+   elflink.c:_bfd_elf_create_got_section().  */
+
+static bfd_boolean
+_bfin_create_got_section (bfd *abfd, struct bfd_link_info *info)
+{
+  flagword flags, pltflags;
+  asection *s;
+  struct elf_link_hash_entry *h;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  int ptralign;
+
+  /* This function may be called more than once.  */
+  s = bfd_get_section_by_name (abfd, ".got");
+  if (s != NULL && (s->flags & SEC_LINKER_CREATED) != 0)
+    return TRUE;
+
+  /* Machine specific: although pointers are 32-bits wide, we want the
+     GOT to be aligned to a 64-bit boundary, such that function
+     descriptors in it can be accessed with 64-bit loads and
+     stores.  */
+  ptralign = 3;
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	   | SEC_LINKER_CREATED);
+  pltflags = flags;
+
+  s = bfd_make_section_with_flags (abfd, ".got", flags);
+  if (s == NULL
+      || !bfd_set_section_alignment (abfd, s, ptralign))
+    return FALSE;
+
+  if (bed->want_got_plt)
+    {
+      s = bfd_make_section_with_flags (abfd, ".got.plt", flags);
+      if (s == NULL
+	  || !bfd_set_section_alignment (abfd, s, ptralign))
+	return FALSE;
+    }
+
+  if (bed->want_got_sym)
+    {
+      /* Define the symbol _GLOBAL_OFFSET_TABLE_ at the start of the .got
+	 (or .got.plt) section.  We don't do this in the linker script
+	 because we don't want to define the symbol if we are not creating
+	 a global offset table.  */
+      h = _bfd_elf_define_linkage_sym (abfd, info, s, "__GLOBAL_OFFSET_TABLE_");
+      elf_hash_table (info)->hgot = h;
+      if (h == NULL)
+	return FALSE;
+
+      /* Machine-specific: we want the symbol for executables as
+	 well.  */
+      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	return FALSE;
+    }
+
+  /* The first bit of the global offset table is the header.  */
+  s->size += bed->got_header_size;
+
+  /* This is the machine-specific part.  Create and initialize section
+     data for the got.  */
+  if (IS_FDPIC (abfd))
+    {
+      bfinfdpic_got_section (info) = s;
+      bfinfdpic_relocs_info (info) = htab_try_create (1,
+						      bfinfdpic_relocs_info_hash,
+						      bfinfdpic_relocs_info_eq,
+						      (htab_del) NULL);
+      if (! bfinfdpic_relocs_info (info))
+	return FALSE;
+
+      s = bfd_make_section_with_flags (abfd, ".rel.got",
+				       (flags | SEC_READONLY));
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, 2))
+	return FALSE;
+
+      bfinfdpic_gotrel_section (info) = s;
+
+      /* Machine-specific.  */
+      s = bfd_make_section_with_flags (abfd, ".rofixup",
+				       (flags | SEC_READONLY));
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, 2))
+	return FALSE;
+
+      bfinfdpic_gotfixup_section (info) = s;
+    }
+
+  pltflags |= SEC_CODE;
+  if (bed->plt_not_loaded)
+    pltflags &= ~ (SEC_CODE | SEC_LOAD | SEC_HAS_CONTENTS);
+  if (bed->plt_readonly)
+    pltflags |= SEC_READONLY;
+
+  s = bfd_make_section_with_flags (abfd, ".plt", pltflags);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, bed->plt_alignment))
+    return FALSE;
+  /* Blackfin-specific: remember it.  */
+  bfinfdpic_plt_section (info) = s;
+
+  if (bed->want_plt_sym)
+    {
+      /* Define the symbol _PROCEDURE_LINKAGE_TABLE_ at the start of the
+	 .plt section.  */
+      struct bfd_link_hash_entry *bh = NULL;
+
+      if (! (_bfd_generic_link_add_one_symbol
+	     (info, abfd, "__PROCEDURE_LINKAGE_TABLE_", BSF_GLOBAL, s, 0, NULL,
+	      FALSE, get_elf_backend_data (abfd)->collect, &bh)))
+	return FALSE;
+      h = (struct elf_link_hash_entry *) bh;
+      h->def_regular = 1;
+      h->type = STT_OBJECT;
+
+      if (! info->executable
+	  && ! bfd_elf_link_record_dynamic_symbol (info, h))
+	return FALSE;
+    }
+
+  /* Blackfin-specific: we want rel relocations for the plt.  */
+  s = bfd_make_section_with_flags (abfd, ".rel.plt", flags | SEC_READONLY);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+    return FALSE;
+  /* Blackfin-specific: remember it.  */
+  bfinfdpic_pltrel_section (info) = s;
+
+  return TRUE;
+}
+
+/* Make sure the got and plt sections exist, and that our pointers in
+   the link hash table point to them.  */
+
+static bfd_boolean
+elf32_bfinfdpic_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  /* This is mostly copied from
+     elflink.c:_bfd_elf_create_dynamic_sections().  */
+  flagword flags;
+  asection *s;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	   | SEC_LINKER_CREATED);
+
+  /* We need to create .plt, .rel[a].plt, .got, .got.plt, .dynbss, and
+     .rel[a].bss sections.  */
+
+  /* Blackfin-specific: we want to create the GOT in the Blackfin way.  */
+  if (! _bfin_create_got_section (abfd, info))
+    return FALSE;
+
+  /* Blackfin-specific: make sure we created everything we wanted.  */
+  BFD_ASSERT (bfinfdpic_got_section (info) && bfinfdpic_gotrel_section (info)
+	      /* && bfinfdpic_gotfixup_section (info) */
+	      && bfinfdpic_plt_section (info)
+	      && bfinfdpic_pltrel_section (info));
+
+  if (bed->want_dynbss)
+    {
+      /* The .dynbss section is a place to put symbols which are defined
+	 by dynamic objects, are referenced by regular objects, and are
+	 not functions.  We must allocate space for them in the process
+	 image and use a R_*_COPY reloc to tell the dynamic linker to
+	 initialize them at run time.  The linker script puts the .dynbss
+	 section into the .bss section of the final image.  */
+      s = bfd_make_section_with_flags (abfd, ".dynbss",
+				       SEC_ALLOC | SEC_LINKER_CREATED);
+      if (s == NULL)
+	return FALSE;
+
+      /* The .rel[a].bss section holds copy relocs.  This section is not
+     normally needed.  We need to create it here, though, so that the
+     linker will map it to an output section.  We can't just create it
+     only if we need it, because we will not know whether we need it
+     until we have seen all the input files, and the first time the
+     main linker code calls BFD after examining all the input files
+     (size_dynamic_sections) the input sections have already been
+     mapped to the output sections.  If the section turns out not to
+     be needed, we can discard it later.  We will never need this
+     section when generating a shared object, since they do not use
+     copy relocs.  */
+      if (! info->shared)
+	{
+	  s = bfd_make_section_with_flags (abfd,
+					   ".rela.bss",
+					   flags | SEC_READONLY);
+	  if (s == NULL
+	      || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Compute the total GOT size required by each symbol in each range.
+   Symbols may require up to 4 words in the GOT: an entry pointing to
+   the symbol, an entry pointing to its function descriptor, and a
+   private function descriptors taking two words.  */
+
+static void
+_bfinfdpic_count_nontls_entries (struct bfinfdpic_relocs_info *entry,
+				 struct _bfinfdpic_dynamic_got_info *dinfo)
+{
+  /* Allocate space for a GOT entry pointing to the symbol.  */
+  if (entry->got17m4)
+    dinfo->got17m4 += 4;
+  else if (entry->gothilo)
+    dinfo->gothilo += 4;
+  else
+    entry->relocs32--;
+  entry->relocs32++;
+
+  /* Allocate space for a GOT entry pointing to the function
+     descriptor.  */
+  if (entry->fdgot17m4)
+    dinfo->got17m4 += 4;
+  else if (entry->fdgothilo)
+    dinfo->gothilo += 4;
+  else
+    entry->relocsfd--;
+  entry->relocsfd++;
+
+  /* Decide whether we need a PLT entry, a function descriptor in the
+     GOT, and a lazy PLT entry for this symbol.  */
+  entry->plt = entry->call
+    && entry->symndx == -1 && ! BFINFDPIC_SYM_LOCAL (dinfo->info, entry->d.h)
+    && elf_hash_table (dinfo->info)->dynamic_sections_created;
+  entry->privfd = entry->plt
+    || entry->fdgoff17m4 || entry->fdgoffhilo
+    || ((entry->fd || entry->fdgot17m4 || entry->fdgothilo)
+	&& (entry->symndx != -1
+	    || BFINFDPIC_FUNCDESC_LOCAL (dinfo->info, entry->d.h)));
+  entry->lazyplt = entry->privfd
+    && entry->symndx == -1 && ! BFINFDPIC_SYM_LOCAL (dinfo->info, entry->d.h)
+    && ! (dinfo->info->flags & DF_BIND_NOW)
+    && elf_hash_table (dinfo->info)->dynamic_sections_created;
+
+  /* Allocate space for a function descriptor.  */
+  if (entry->fdgoff17m4)
+    dinfo->fd17m4 += 8;
+  else if (entry->privfd && entry->plt)
+    dinfo->fdplt += 8;
+  else if (entry->privfd)
+    dinfo->fdhilo += 8;
+  else
+    entry->relocsfdv--;
+  entry->relocsfdv++;
+
+  if (entry->lazyplt)
+    dinfo->lzplt += LZPLT_NORMAL_SIZE;
+}
+
+/* Compute the number of dynamic relocations and fixups that a symbol
+   requires, and add (or subtract) from the grand and per-symbol
+   totals.  */
+
+static void
+_bfinfdpic_count_relocs_fixups (struct bfinfdpic_relocs_info *entry,
+				struct _bfinfdpic_dynamic_got_info *dinfo,
+				bfd_boolean subtract)
+{
+  bfd_vma relocs = 0, fixups = 0;
+
+  if (!dinfo->info->executable || dinfo->info->pie)
+    relocs = entry->relocs32 + entry->relocsfd + entry->relocsfdv;
+  else
+    {
+      if (entry->symndx != -1 || BFINFDPIC_SYM_LOCAL (dinfo->info, entry->d.h))
+	{
+	  if (entry->symndx != -1
+	      || entry->d.h->root.type != bfd_link_hash_undefweak)
+	    fixups += entry->relocs32 + 2 * entry->relocsfdv;
+	}
+      else
+	relocs += entry->relocs32 + entry->relocsfdv;
+
+      if (entry->symndx != -1
+	  || BFINFDPIC_FUNCDESC_LOCAL (dinfo->info, entry->d.h))
+	{
+	  if (entry->symndx != -1
+	      || entry->d.h->root.type != bfd_link_hash_undefweak)
+	    fixups += entry->relocsfd;
+	}
+      else
+	relocs += entry->relocsfd;
+    }
+
+  if (subtract)
+    {
+      relocs = - relocs;
+      fixups = - fixups;
+    }
+
+  entry->dynrelocs += relocs;
+  entry->fixups += fixups;
+  dinfo->relocs += relocs;
+  dinfo->fixups += fixups;
+}
+
+/* Compute the total GOT and PLT size required by each symbol in each range. *
+   Symbols may require up to 4 words in the GOT: an entry pointing to
+   the symbol, an entry pointing to its function descriptor, and a
+   private function descriptors taking two words.  */
+
+static int
+_bfinfdpic_count_got_plt_entries (void **entryp, void *dinfo_)
+{
+  struct bfinfdpic_relocs_info *entry = *entryp;
+  struct _bfinfdpic_dynamic_got_info *dinfo = dinfo_;
+
+  _bfinfdpic_count_nontls_entries (entry, dinfo);
+
+  _bfinfdpic_count_relocs_fixups (entry, dinfo, FALSE);
+
+  return 1;
+}
+
+/* This structure is used to assign offsets to got entries, function
+   descriptors, plt entries and lazy plt entries.  */
+
+struct _bfinfdpic_dynamic_got_plt_info
+{
+  /* Summary information collected with _bfinfdpic_count_got_plt_entries.  */
+  struct _bfinfdpic_dynamic_got_info g;
+
+  /* For each addressable range, we record a MAX (positive) and MIN
+     (negative) value.  CUR is used to assign got entries, and it's
+     incremented from an initial positive value to MAX, then from MIN
+     to FDCUR (unless FDCUR wraps around first).  FDCUR is used to
+     assign function descriptors, and it's decreased from an initial
+     non-positive value to MIN, then from MAX down to CUR (unless CUR
+     wraps around first).  All of MIN, MAX, CUR and FDCUR always point
+     to even words.  ODD, if non-zero, indicates an odd word to be
+     used for the next got entry, otherwise CUR is used and
+     incremented by a pair of words, wrapping around when it reaches
+     MAX.  FDCUR is decremented (and wrapped) before the next function
+     descriptor is chosen.  FDPLT indicates the number of remaining
+     slots that can be used for function descriptors used only by PLT
+     entries.  */
+  struct _bfinfdpic_dynamic_got_alloc_data
+  {
+    bfd_signed_vma max, cur, odd, fdcur, min;
+    bfd_vma fdplt;
+  } got17m4, gothilo;
+};
+
+/* Determine the positive and negative ranges to be used by each
+   offset range in the GOT.  FDCUR and CUR, that must be aligned to a
+   double-word boundary, are the minimum (negative) and maximum
+   (positive) GOT offsets already used by previous ranges, except for
+   an ODD entry that may have been left behind.  GOT and FD indicate
+   the size of GOT entries and function descriptors that must be
+   placed within the range from -WRAP to WRAP.  If there's room left,
+   up to FDPLT bytes should be reserved for additional function
+   descriptors.  */
+
+inline static bfd_signed_vma
+_bfinfdpic_compute_got_alloc_data (struct _bfinfdpic_dynamic_got_alloc_data *gad,
+				   bfd_signed_vma fdcur,
+				   bfd_signed_vma odd,
+				   bfd_signed_vma cur,
+				   bfd_vma got,
+				   bfd_vma fd,
+				   bfd_vma fdplt,
+				   bfd_vma wrap)
+{
+  bfd_signed_vma wrapmin = -wrap;
+
+  /* Start at the given initial points.  */
+  gad->fdcur = fdcur;
+  gad->cur = cur;
+
+  /* If we had an incoming odd word and we have any got entries that
+     are going to use it, consume it, otherwise leave gad->odd at
+     zero.  We might force gad->odd to zero and return the incoming
+     odd such that it is used by the next range, but then GOT entries
+     might appear to be out of order and we wouldn't be able to
+     shorten the GOT by one word if it turns out to end with an
+     unpaired GOT entry.  */
+  if (odd && got)
+    {
+      gad->odd = odd;
+      got -= 4;
+      odd = 0;
+    }
+  else
+    gad->odd = 0;
+
+  /* If we're left with an unpaired GOT entry, compute its location
+     such that we can return it.  Otherwise, if got doesn't require an
+     odd number of words here, either odd was already zero in the
+     block above, or it was set to zero because got was non-zero, or
+     got was already zero.  In the latter case, we want the value of
+     odd to carry over to the return statement, so we don't want to
+     reset odd unless the condition below is true.  */
+  if (got & 4)
+    {
+      odd = cur + got;
+      got += 4;
+    }
+
+  /* Compute the tentative boundaries of this range.  */
+  gad->max = cur + got;
+  gad->min = fdcur - fd;
+  gad->fdplt = 0;
+
+  /* If function descriptors took too much space, wrap some of them
+     around.  */
+  if (gad->min < wrapmin)
+    {
+      gad->max += wrapmin - gad->min;
+      gad->min = wrapmin;
+    }
+  /* If there is space left and we have function descriptors
+     referenced in PLT entries that could take advantage of shorter
+     offsets, place them here.  */
+  else if (fdplt && gad->min > wrapmin)
+    {
+      bfd_vma fds;
+      if ((bfd_vma) (gad->min - wrapmin) < fdplt)
+	fds = gad->min - wrapmin;
+      else
+	fds = fdplt;
+
+      fdplt -= fds;
+      gad->min -= fds;
+      gad->fdplt += fds;
+    }
+
+  /* If GOT entries took too much space, wrap some of them around.
+     This may well cause gad->min to become lower than wrapmin.  This
+     will cause a relocation overflow later on, so we don't have to
+     report it here . */
+  if ((bfd_vma) gad->max > wrap)
+    {
+      gad->min -= gad->max - wrap;
+      gad->max = wrap;
+    }
+  /* If there is more space left, try to place some more function
+     descriptors for PLT entries.  */
+  else if (fdplt && (bfd_vma) gad->max < wrap)
+    {
+      bfd_vma fds;
+      if ((bfd_vma) (wrap - gad->max) < fdplt)
+	fds = wrap - gad->max;
+      else
+	fds = fdplt;
+
+      fdplt -= fds;
+      gad->max += fds;
+      gad->fdplt += fds;
+    }
+
+  /* If odd was initially computed as an offset past the wrap point,
+     wrap it around.  */
+  if (odd > gad->max)
+    odd = gad->min + odd - gad->max;
+
+  /* _bfinfdpic_get_got_entry() below will always wrap gad->cur if needed
+     before returning, so do it here too.  This guarantees that,
+     should cur and fdcur meet at the wrap point, they'll both be
+     equal to min.  */
+  if (gad->cur == gad->max)
+    gad->cur = gad->min;
+
+  return odd;
+}
+
+/* Compute the location of the next GOT entry, given the allocation
+   data for a range.  */
+
+inline static bfd_signed_vma
+_bfinfdpic_get_got_entry (struct _bfinfdpic_dynamic_got_alloc_data *gad)
+{
+  bfd_signed_vma ret;
+
+  if (gad->odd)
+    {
+      /* If there was an odd word left behind, use it.  */
+      ret = gad->odd;
+      gad->odd = 0;
+    }
+  else
+    {
+      /* Otherwise, use the word pointed to by cur, reserve the next
+	 as an odd word, and skip to the next pair of words, possibly
+	 wrapping around.  */
+      ret = gad->cur;
+      gad->odd = gad->cur + 4;
+      gad->cur += 8;
+      if (gad->cur == gad->max)
+	gad->cur = gad->min;
+    }
+
+  return ret;
+}
+
+/* Compute the location of the next function descriptor entry in the
+   GOT, given the allocation data for a range.  */
+
+inline static bfd_signed_vma
+_bfinfdpic_get_fd_entry (struct _bfinfdpic_dynamic_got_alloc_data *gad)
+{
+  /* If we're at the bottom, wrap around, and only then allocate the
+     next pair of words.  */
+  if (gad->fdcur == gad->min)
+    gad->fdcur = gad->max;
+  return gad->fdcur -= 8;
+}
+
+/* Assign GOT offsets for every GOT entry and function descriptor.
+   Doing everything in a single pass is tricky.  */
+
+static int
+_bfinfdpic_assign_got_entries (void **entryp, void *info_)
+{
+  struct bfinfdpic_relocs_info *entry = *entryp;
+  struct _bfinfdpic_dynamic_got_plt_info *dinfo = info_;
+
+  if (entry->got17m4)
+    entry->got_entry = _bfinfdpic_get_got_entry (&dinfo->got17m4);
+  else if (entry->gothilo)
+    entry->got_entry = _bfinfdpic_get_got_entry (&dinfo->gothilo);
+
+  if (entry->fdgot17m4)
+    entry->fdgot_entry = _bfinfdpic_get_got_entry (&dinfo->got17m4);
+  else if (entry->fdgothilo)
+    entry->fdgot_entry = _bfinfdpic_get_got_entry (&dinfo->gothilo);
+
+  if (entry->fdgoff17m4)
+    entry->fd_entry = _bfinfdpic_get_fd_entry (&dinfo->got17m4);
+  else if (entry->plt && dinfo->got17m4.fdplt)
+    {
+      dinfo->got17m4.fdplt -= 8;
+      entry->fd_entry = _bfinfdpic_get_fd_entry (&dinfo->got17m4);
+    }
+  else if (entry->plt)
+    {
+      dinfo->gothilo.fdplt -= 8;
+      entry->fd_entry = _bfinfdpic_get_fd_entry (&dinfo->gothilo);
+    }
+  else if (entry->privfd)
+    entry->fd_entry = _bfinfdpic_get_fd_entry (&dinfo->gothilo);
+
+  return 1;
+}
+
+/* Assign GOT offsets to private function descriptors used by PLT
+   entries (or referenced by 32-bit offsets), as well as PLT entries
+   and lazy PLT entries.  */
+
+static int
+_bfinfdpic_assign_plt_entries (void **entryp, void *info_)
+{
+  struct bfinfdpic_relocs_info *entry = *entryp;
+  struct _bfinfdpic_dynamic_got_plt_info *dinfo = info_;
+
+  /* If this symbol requires a local function descriptor, allocate
+     one.  */
+  if (entry->privfd && entry->fd_entry == 0)
+    {
+      if (dinfo->got17m4.fdplt)
+	{
+	  entry->fd_entry = _bfinfdpic_get_fd_entry (&dinfo->got17m4);
+	  dinfo->got17m4.fdplt -= 8;
+	}
+      else
+	{
+	  BFD_ASSERT (dinfo->gothilo.fdplt);
+	  entry->fd_entry = _bfinfdpic_get_fd_entry (&dinfo->gothilo);
+	  dinfo->gothilo.fdplt -= 8;
+	}
+    }
+
+  if (entry->plt)
+    {
+      int size;
+
+      /* We use the section's raw size to mark the location of the
+	 next PLT entry.  */
+      entry->plt_entry = bfinfdpic_plt_section (dinfo->g.info)->size;
+
+      /* Figure out the length of this PLT entry based on the
+	 addressing mode we need to reach the function descriptor.  */
+      BFD_ASSERT (entry->fd_entry);
+      if (entry->fd_entry >= -(1 << (18 - 1))
+	  && entry->fd_entry + 4 < (1 << (18 - 1)))
+	size = 10;
+      else
+	size = 16;
+
+      bfinfdpic_plt_section (dinfo->g.info)->size += size;
+    }
+
+  if (entry->lazyplt)
+    {
+      entry->lzplt_entry = dinfo->g.lzplt;
+      dinfo->g.lzplt += LZPLT_NORMAL_SIZE;
+      /* If this entry is the one that gets the resolver stub, account
+	 for the additional instruction.  */
+      if (entry->lzplt_entry % BFINFDPIC_LZPLT_BLOCK_SIZE
+	  == BFINFDPIC_LZPLT_RESOLV_LOC)
+	dinfo->g.lzplt += LZPLT_RESOLVER_EXTRA;
+    }
+
+  return 1;
+}
+
+/* Cancel out any effects of calling _bfinfdpic_assign_got_entries and
+   _bfinfdpic_assign_plt_entries.  */
+
+static int
+_bfinfdpic_reset_got_plt_entries (void **entryp, void *ignore ATTRIBUTE_UNUSED)
+{
+  struct bfinfdpic_relocs_info *entry = *entryp;
+
+  entry->got_entry = 0;
+  entry->fdgot_entry = 0;
+  entry->fd_entry = 0;
+  entry->plt_entry = (bfd_vma)-1;
+  entry->lzplt_entry = (bfd_vma)-1;
+
+  return 1;
+}
+
+/* Follow indirect and warning hash entries so that each got entry
+   points to the final symbol definition.  P must point to a pointer
+   to the hash table we're traversing.  Since this traversal may
+   modify the hash table, we set this pointer to NULL to indicate
+   we've made a potentially-destructive change to the hash table, so
+   the traversal must be restarted.  */
+static int
+_bfinfdpic_resolve_final_relocs_info (void **entryp, void *p)
+{
+  struct bfinfdpic_relocs_info *entry = *entryp;
+  htab_t *htab = p;
+
+  if (entry->symndx == -1)
+    {
+      struct elf_link_hash_entry *h = entry->d.h;
+      struct bfinfdpic_relocs_info *oentry;
+
+      while (h->root.type == bfd_link_hash_indirect
+	     || h->root.type == bfd_link_hash_warning)
+	h = (struct elf_link_hash_entry *)h->root.u.i.link;
+
+      if (entry->d.h == h)
+	return 1;
+
+      oentry = bfinfdpic_relocs_info_for_global (*htab, 0, h, entry->addend,
+						NO_INSERT);
+
+      if (oentry)
+	{
+	  /* Merge the two entries.  */
+	  bfinfdpic_pic_merge_early_relocs_info (oentry, entry);
+	  htab_clear_slot (*htab, entryp);
+	  return 1;
+	}
+
+      entry->d.h = h;
+
+      /* If we can't find this entry with the new bfd hash, re-insert
+	 it, and get the traversal restarted.  */
+      if (! htab_find (*htab, entry))
+	{
+	  htab_clear_slot (*htab, entryp);
+	  entryp = htab_find_slot (*htab, entry, INSERT);
+	  if (! *entryp)
+	    *entryp = entry;
+	  /* Abort the traversal, since the whole table may have
+	     moved, and leave it up to the parent to restart the
+	     process.  */
+	  *(htab_t *)p = NULL;
+	  return 0;
+	}
+    }
+
+  return 1;
+}
+
+/* Compute the total size of the GOT, the PLT, the dynamic relocations
+   section and the rofixup section.  Assign locations for GOT and PLT
+   entries.  */
+
+static bfd_boolean
+_bfinfdpic_size_got_plt (bfd *output_bfd,
+			 struct _bfinfdpic_dynamic_got_plt_info *gpinfop)
+{
+  bfd_signed_vma odd;
+  bfd_vma limit;
+  struct bfd_link_info *info = gpinfop->g.info;
+  bfd *dynobj = elf_hash_table (info)->dynobj;
+
+  memcpy (bfinfdpic_dynamic_got_plt_info (info), &gpinfop->g,
+	  sizeof (gpinfop->g));
+
+  odd = 12;
+  /* Compute the total size taken by entries in the 18-bit range,
+     to tell how many PLT function descriptors we can bring into it
+     without causing it to overflow.  */
+  limit = odd + gpinfop->g.got17m4 + gpinfop->g.fd17m4;
+  if (limit < (bfd_vma)1 << 18)
+    limit = ((bfd_vma)1 << 18) - limit;
+  else
+    limit = 0;
+  if (gpinfop->g.fdplt < limit)
+    limit = gpinfop->g.fdplt;
+
+  /* Determine the ranges of GOT offsets that we can use for each
+     range of addressing modes.  */
+  odd = _bfinfdpic_compute_got_alloc_data (&gpinfop->got17m4,
+					  0,
+					  odd,
+					  16,
+					  gpinfop->g.got17m4,
+					  gpinfop->g.fd17m4,
+					  limit,
+					  (bfd_vma)1 << (18-1));
+  odd = _bfinfdpic_compute_got_alloc_data (&gpinfop->gothilo,
+					  gpinfop->got17m4.min,
+					  odd,
+					  gpinfop->got17m4.max,
+					  gpinfop->g.gothilo,
+					  gpinfop->g.fdhilo,
+					  gpinfop->g.fdplt - gpinfop->got17m4.fdplt,
+					  (bfd_vma)1 << (32-1));
+
+  /* Now assign (most) GOT offsets.  */
+  htab_traverse (bfinfdpic_relocs_info (info), _bfinfdpic_assign_got_entries,
+		 gpinfop);
+
+  bfinfdpic_got_section (info)->size = gpinfop->gothilo.max
+    - gpinfop->gothilo.min
+    /* If an odd word is the last word of the GOT, we don't need this
+       word to be part of the GOT.  */
+    - (odd + 4 == gpinfop->gothilo.max ? 4 : 0);
+  if (bfinfdpic_got_section (info)->size == 0)
+    bfinfdpic_got_section (info)->flags |= SEC_EXCLUDE;
+  else if (bfinfdpic_got_section (info)->size == 12
+	   && ! elf_hash_table (info)->dynamic_sections_created)
+    {
+      bfinfdpic_got_section (info)->flags |= SEC_EXCLUDE;
+      bfinfdpic_got_section (info)->size = 0;
+    }
+  else
+    {
+      bfinfdpic_got_section (info)->contents =
+	(bfd_byte *) bfd_zalloc (dynobj,
+				 bfinfdpic_got_section (info)->size);
+      if (bfinfdpic_got_section (info)->contents == NULL)
+	return FALSE;
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    /* Subtract the number of lzplt entries, since those will generate
+       relocations in the pltrel section.  */
+    bfinfdpic_gotrel_section (info)->size =
+      (gpinfop->g.relocs - gpinfop->g.lzplt / LZPLT_NORMAL_SIZE)
+      * get_elf_backend_data (output_bfd)->s->sizeof_rel;
+  else
+    BFD_ASSERT (gpinfop->g.relocs == 0);
+  if (bfinfdpic_gotrel_section (info)->size == 0)
+    bfinfdpic_gotrel_section (info)->flags |= SEC_EXCLUDE;
+  else
+    {
+      bfinfdpic_gotrel_section (info)->contents =
+	(bfd_byte *) bfd_zalloc (dynobj,
+				 bfinfdpic_gotrel_section (info)->size);
+      if (bfinfdpic_gotrel_section (info)->contents == NULL)
+	return FALSE;
+    }
+
+  bfinfdpic_gotfixup_section (info)->size = (gpinfop->g.fixups + 1) * 4;
+  if (bfinfdpic_gotfixup_section (info)->size == 0)
+    bfinfdpic_gotfixup_section (info)->flags |= SEC_EXCLUDE;
+  else
+    {
+      bfinfdpic_gotfixup_section (info)->contents =
+	(bfd_byte *) bfd_zalloc (dynobj,
+				 bfinfdpic_gotfixup_section (info)->size);
+      if (bfinfdpic_gotfixup_section (info)->contents == NULL)
+	return FALSE;
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    bfinfdpic_pltrel_section (info)->size =
+      gpinfop->g.lzplt / LZPLT_NORMAL_SIZE * get_elf_backend_data (output_bfd)->s->sizeof_rel;
+  if (bfinfdpic_pltrel_section (info)->size == 0)
+    bfinfdpic_pltrel_section (info)->flags |= SEC_EXCLUDE;
+  else
+    {
+      bfinfdpic_pltrel_section (info)->contents =
+	(bfd_byte *) bfd_zalloc (dynobj,
+				 bfinfdpic_pltrel_section (info)->size);
+      if (bfinfdpic_pltrel_section (info)->contents == NULL)
+	return FALSE;
+    }
+
+  /* Add 4 bytes for every block of at most 65535 lazy PLT entries,
+     such that there's room for the additional instruction needed to
+     call the resolver.  Since _bfinfdpic_assign_got_entries didn't
+     account for them, our block size is 4 bytes smaller than the real
+     block size.  */
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      bfinfdpic_plt_section (info)->size = gpinfop->g.lzplt
+	+ ((gpinfop->g.lzplt + (BFINFDPIC_LZPLT_BLOCK_SIZE - 4) - LZPLT_NORMAL_SIZE)
+	   / (BFINFDPIC_LZPLT_BLOCK_SIZE - 4) * LZPLT_RESOLVER_EXTRA);
+    }
+
+  /* Reset it, such that _bfinfdpic_assign_plt_entries() can use it to
+     actually assign lazy PLT entries addresses.  */
+  gpinfop->g.lzplt = 0;
+
+  /* Save information that we're going to need to generate GOT and PLT
+     entries.  */
+  bfinfdpic_got_initial_offset (info) = -gpinfop->gothilo.min;
+
+  if (get_elf_backend_data (output_bfd)->want_got_sym)
+    elf_hash_table (info)->hgot->root.u.def.value
+      = bfinfdpic_got_initial_offset (info);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    bfinfdpic_plt_initial_offset (info) =
+      bfinfdpic_plt_section (info)->size;
+
+  htab_traverse (bfinfdpic_relocs_info (info), _bfinfdpic_assign_plt_entries,
+		 gpinfop);
+
+  /* Allocate the PLT section contents only after
+     _bfinfdpic_assign_plt_entries has a chance to add the size of the
+     non-lazy PLT entries.  */
+  if (bfinfdpic_plt_section (info)->size == 0)
+    bfinfdpic_plt_section (info)->flags |= SEC_EXCLUDE;
+  else
+    {
+      bfinfdpic_plt_section (info)->contents =
+	(bfd_byte *) bfd_zalloc (dynobj,
+				 bfinfdpic_plt_section (info)->size);
+      if (bfinfdpic_plt_section (info)->contents == NULL)
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+elf32_bfinfdpic_size_dynamic_sections (bfd *output_bfd,
+				      struct bfd_link_info *info)
+{
+  struct elf_link_hash_table *htab;
+  bfd *dynobj;
+  asection *s;
+  struct _bfinfdpic_dynamic_got_plt_info gpinfo;
+
+  htab = elf_hash_table (info);
+  dynobj = htab->dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  if (htab->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (s != NULL);
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (bfd_byte *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+
+  memset (&gpinfo, 0, sizeof (gpinfo));
+  gpinfo.g.info = info;
+
+  for (;;)
+    {
+      htab_t relocs = bfinfdpic_relocs_info (info);
+
+      htab_traverse (relocs, _bfinfdpic_resolve_final_relocs_info, &relocs);
+
+      if (relocs == bfinfdpic_relocs_info (info))
+	break;
+    }
+
+  htab_traverse (bfinfdpic_relocs_info (info), _bfinfdpic_count_got_plt_entries,
+		 &gpinfo.g);
+
+  /* Allocate space to save the summary information, we're going to
+     use it if we're doing relaxations.  */
+  bfinfdpic_dynamic_got_plt_info (info) = bfd_alloc (dynobj, sizeof (gpinfo.g));
+
+  if (!_bfinfdpic_size_got_plt (output_bfd, &gpinfo))
+      return FALSE;
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      if (bfinfdpic_got_section (info)->size)
+	if (!_bfd_elf_add_dynamic_entry (info, DT_PLTGOT, 0))
+	  return FALSE;
+
+      if (bfinfdpic_pltrel_section (info)->size)
+	if (!_bfd_elf_add_dynamic_entry (info, DT_PLTRELSZ, 0)
+	    || !_bfd_elf_add_dynamic_entry (info, DT_PLTREL, DT_REL)
+	    || !_bfd_elf_add_dynamic_entry (info, DT_JMPREL, 0))
+	  return FALSE;
+
+      if (bfinfdpic_gotrel_section (info)->size)
+	if (!_bfd_elf_add_dynamic_entry (info, DT_REL, 0)
+	    || !_bfd_elf_add_dynamic_entry (info, DT_RELSZ, 0)
+	    || !_bfd_elf_add_dynamic_entry (info, DT_RELENT,
+					    sizeof (Elf32_External_Rel)))
+	  return FALSE;
+    }
+
+  s = bfd_get_section_by_name (dynobj, ".dynbss");
+  if (s && s->size == 0)
+    s->flags |= SEC_EXCLUDE;
+
+  s = bfd_get_section_by_name (dynobj, ".rela.bss");
+  if (s && s->size == 0)
+    s->flags |= SEC_EXCLUDE;
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf32_bfinfdpic_always_size_sections (bfd *output_bfd,
+				     struct bfd_link_info *info)
+{
+  if (!info->relocatable)
+    {
+      struct elf_link_hash_entry *h;
+
+      /* Force a PT_GNU_STACK segment to be created.  */
+      if (! elf_tdata (output_bfd)->stack_flags)
+	elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
+
+      /* Define __stacksize if it's not defined yet.  */
+      h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
+				FALSE, FALSE, FALSE);
+      if (! h || h->root.type != bfd_link_hash_defined
+	  || h->type != STT_OBJECT
+	  || !h->def_regular)
+	{
+	  struct bfd_link_hash_entry *bh = NULL;
+
+	  if (!(_bfd_generic_link_add_one_symbol
+		(info, output_bfd, "__stacksize",
+		 BSF_GLOBAL, bfd_abs_section_ptr, DEFAULT_STACK_SIZE,
+		 (const char *) NULL, FALSE,
+		 get_elf_backend_data (output_bfd)->collect, &bh)))
+	    return FALSE;
+
+	  h = (struct elf_link_hash_entry *) bh;
+	  h->def_regular = 1;
+	  h->type = STT_OBJECT;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Check whether any of the relocations was optimized away, and
+   subtract it from the relocation or fixup count.  */
+static bfd_boolean
+_bfinfdpic_check_discarded_relocs (bfd *abfd, asection *sec,
+				  struct bfd_link_info *info,
+				  
+				  bfd_boolean *changed)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes, **sym_hashes_end;
+  Elf_Internal_Rela *rel, *erel;
+
+  if ((sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  sym_hashes_end = sym_hashes + symtab_hdr->sh_size/sizeof(Elf32_External_Sym);
+  if (!elf_bad_symtab (abfd))
+    sym_hashes_end -= symtab_hdr->sh_info;
+
+  rel = elf_section_data (sec)->relocs;
+
+  /* Now examine each relocation.  */
+  for (erel = rel + sec->reloc_count; rel < erel; rel++)
+    {
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+      struct bfinfdpic_relocs_info *picrel;
+      struct _bfinfdpic_dynamic_got_info *dinfo;
+
+      if (ELF32_R_TYPE (rel->r_info) != R_BFIN_BYTE4_DATA
+	  && ELF32_R_TYPE (rel->r_info) != R_BFIN_FUNCDESC)
+	continue;
+
+      if (_bfd_elf_section_offset (sec->output_section->owner,
+				   info, sec, rel->r_offset)
+	  != (bfd_vma)-1)
+	continue;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+	h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *)h->root.u.i.link;
+	}
+
+      if (h != NULL)
+	picrel = bfinfdpic_relocs_info_for_global (bfinfdpic_relocs_info (info),
+						  abfd, h,
+						  rel->r_addend, NO_INSERT);
+      else
+	picrel = bfinfdpic_relocs_info_for_local (bfinfdpic_relocs_info (info),
+						 abfd, r_symndx,
+						 rel->r_addend, NO_INSERT);
+
+      if (! picrel)
+	return FALSE;
+
+      *changed = TRUE;
+      dinfo = bfinfdpic_dynamic_got_plt_info (info);
+
+      _bfinfdpic_count_relocs_fixups (picrel, dinfo, TRUE);
+      if (ELF32_R_TYPE (rel->r_info) == R_BFIN_BYTE4_DATA)
+	picrel->relocs32--;
+      else /* we know (ELF32_R_TYPE (rel->r_info) == R_BFIN_FUNCDESC) */
+	picrel->relocsfd--;
+      _bfinfdpic_count_relocs_fixups (picrel, dinfo, FALSE);
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+bfinfdpic_elf_discard_info (bfd *ibfd,
+			   struct elf_reloc_cookie *cookie ATTRIBUTE_UNUSED,
+			   struct bfd_link_info *info)
+{
+  bfd_boolean changed = FALSE;
+  asection *s;
+  bfd *obfd = NULL;
+
+  /* Account for relaxation of .eh_frame section.  */
+  for (s = ibfd->sections; s; s = s->next)
+    if (s->sec_info_type == ELF_INFO_TYPE_EH_FRAME)
+      {
+	if (!_bfinfdpic_check_discarded_relocs (ibfd, s, info, &changed))
+	  return FALSE;
+	obfd = s->output_section->owner;
+      }
+
+  if (changed)
+    {
+      struct _bfinfdpic_dynamic_got_plt_info gpinfo;
+
+      memset (&gpinfo, 0, sizeof (gpinfo));
+      memcpy (&gpinfo.g, bfinfdpic_dynamic_got_plt_info (info),
+	      sizeof (gpinfo.g));
+
+      /* Clear GOT and PLT assignments.  */
+      htab_traverse (bfinfdpic_relocs_info (info),
+		     _bfinfdpic_reset_got_plt_entries,
+		     NULL);
+
+      if (!_bfinfdpic_size_got_plt (obfd, &gpinfo))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf32_bfinfdpic_modify_program_headers (bfd *output_bfd,
+					struct bfd_link_info *info)
+{
+  struct elf_obj_tdata *tdata = elf_tdata (output_bfd);
+  struct elf_segment_map *m;
+  Elf_Internal_Phdr *p;
+
+  /* objcopy and strip preserve what's already there using
+     elf32_bfinfdpic_copy_private_bfd_data ().  */
+  if (! info)
+    return TRUE;
+
+  for (p = tdata->phdr, m = tdata->segment_map; m != NULL; m = m->next, p++)
+    if (m->p_type == PT_GNU_STACK)
+      break;
+
+  if (m)
+    {
+      struct elf_link_hash_entry *h;
+
+      /* Obtain the pointer to the __stacksize symbol.  */
+      h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
+				FALSE, FALSE, FALSE);
+      if (h)
+	{
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	  BFD_ASSERT (h->root.type == bfd_link_hash_defined);
+	}
+
+      /* Set the header p_memsz from the symbol value.  We
+	 intentionally ignore the symbol section.  */
+      if (h && h->root.type == bfd_link_hash_defined)
+	p->p_memsz = h->root.u.def.value;
+      else
+	p->p_memsz = DEFAULT_STACK_SIZE;
+
+      p->p_align = 8;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf32_bfinfdpic_finish_dynamic_sections (bfd *output_bfd,
+					struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *sdyn;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  if (bfinfdpic_got_section (info))
+    {
+      BFD_ASSERT (bfinfdpic_gotrel_section (info)->size
+		  == (bfinfdpic_gotrel_section (info)->reloc_count
+		      * sizeof (Elf32_External_Rel)));
+
+      if (bfinfdpic_gotfixup_section (info))
+	{
+	  struct elf_link_hash_entry *hgot = elf_hash_table (info)->hgot;
+	  bfd_vma got_value = hgot->root.u.def.value
+	    + hgot->root.u.def.section->output_section->vma
+	    + hgot->root.u.def.section->output_offset;
+
+	  _bfinfdpic_add_rofixup (output_bfd, bfinfdpic_gotfixup_section (info),
+				 got_value, 0);
+
+	  if (bfinfdpic_gotfixup_section (info)->size
+	      != (bfinfdpic_gotfixup_section (info)->reloc_count * 4))
+	    {
+	      (*_bfd_error_handler)
+		("LINKER BUG: .rofixup section size mismatch");
+	      return FALSE;
+	    }
+	}
+    }
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      BFD_ASSERT (bfinfdpic_pltrel_section (info)->size
+		  == (bfinfdpic_pltrel_section (info)->reloc_count
+		      * sizeof (Elf32_External_Rel)));
+    }
+
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      Elf32_External_Dyn * dyncon;
+      Elf32_External_Dyn * dynconend;
+
+      BFD_ASSERT (sdyn != NULL);
+
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+
+	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    default:
+	      break;
+
+	    case DT_PLTGOT:
+	      dyn.d_un.d_ptr = bfinfdpic_got_section (info)->output_section->vma
+		+ bfinfdpic_got_section (info)->output_offset
+		+ bfinfdpic_got_initial_offset (info);
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_JMPREL:
+	      dyn.d_un.d_ptr = bfinfdpic_pltrel_section (info)
+		->output_section->vma
+		+ bfinfdpic_pltrel_section (info)->output_offset;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_PLTRELSZ:
+	      dyn.d_un.d_val = bfinfdpic_pltrel_section (info)->size;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  */
+
+static bfd_boolean
+elf32_bfinfdpic_adjust_dynamic_symbol
+(struct bfd_link_info *info,
+ struct elf_link_hash_entry *h)
+{
+  bfd * dynobj;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (dynobj != NULL
+	      && (h->u.weakdef != NULL
+		  || (h->def_dynamic
+		      && h->ref_regular
+		      && !h->def_regular)));
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+    }
+
+  return TRUE;
+}
+
+/* Perform any actions needed for dynamic symbols.  */
+
+static bfd_boolean
+elf32_bfinfdpic_finish_dynamic_symbol
+(bfd *output_bfd ATTRIBUTE_UNUSED,
+ struct bfd_link_info *info ATTRIBUTE_UNUSED,
+ struct elf_link_hash_entry *h ATTRIBUTE_UNUSED,
+ Elf_Internal_Sym *sym ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+/* Decide whether to attempt to turn absptr or lsda encodings in
+   shared libraries into pcrel within the given input section.  */
+
+static bfd_boolean
+bfinfdpic_elf_use_relative_eh_frame
+(bfd *input_bfd ATTRIBUTE_UNUSED,
+ struct bfd_link_info *info ATTRIBUTE_UNUSED,
+ asection *eh_frame_section ATTRIBUTE_UNUSED)
+{
+  /* We can't use PC-relative encodings in FDPIC binaries, in general.  */
+  return FALSE;
+}
+
+/* Adjust the contents of an eh_frame_hdr section before they're output.  */
+
+static bfd_byte
+bfinfdpic_elf_encode_eh_address (bfd *abfd,
+				struct bfd_link_info *info,
+				asection *osec, bfd_vma offset,
+				asection *loc_sec, bfd_vma loc_offset,
+				bfd_vma *encoded)
+{
+  struct elf_link_hash_entry *h;
+
+  h = elf_hash_table (info)->hgot;
+  BFD_ASSERT (h && h->root.type == bfd_link_hash_defined);
+
+  if (! h || (_bfinfdpic_osec_to_segment (abfd, osec)
+	      == _bfinfdpic_osec_to_segment (abfd, loc_sec->output_section)))
+    return _bfd_elf_encode_eh_address (abfd, info, osec, offset,
+				       loc_sec, loc_offset, encoded);
+
+  BFD_ASSERT (_bfinfdpic_osec_to_segment (abfd, osec)
+	      == (_bfinfdpic_osec_to_segment
+		  (abfd, h->root.u.def.section->output_section)));
+
+  *encoded = osec->vma + offset
+    - (h->root.u.def.value
+       + h->root.u.def.section->output_section->vma
+       + h->root.u.def.section->output_offset);
+
+  return DW_EH_PE_datarel | DW_EH_PE_sdata4;
+}
+
+
+
+/* Look through the relocs for a section during the first phase.
+
+   Besides handling virtual table relocs for gc, we have to deal with
+   all sorts of PIC-related relocations.  We describe below the
+   general plan on how to handle such relocations, even though we only
+   collect information at this point, storing them in hash tables for
+   perusal of later passes.
+
+   32 relocations are propagated to the linker output when creating
+   position-independent output.  LO16 and HI16 relocations are not
+   supposed to be encountered in this case.
+
+   LABEL16 should always be resolvable by the linker, since it's only
+   used by branches.
+
+   LABEL24, on the other hand, is used by calls.  If it turns out that
+   the target of a call is a dynamic symbol, a PLT entry must be
+   created for it, which triggers the creation of a private function
+   descriptor and, unless lazy binding is disabled, a lazy PLT entry.
+
+   GPREL relocations require the referenced symbol to be in the same
+   segment as _gp, but this can only be checked later.
+
+   All GOT, GOTOFF and FUNCDESC relocations require a .got section to
+   exist.  LABEL24 might as well, since it may require a PLT entry,
+   that will require a got.
+
+   Non-FUNCDESC GOT relocations require a GOT entry to be created
+   regardless of whether the symbol is dynamic.  However, since a
+   global symbol that turns out to not be exported may have the same
+   address of a non-dynamic symbol, we don't assign GOT entries at
+   this point, such that we can share them in this case.  A relocation
+   for the GOT entry always has to be created, be it to offset a
+   private symbol by the section load address, be it to get the symbol
+   resolved dynamically.
+
+   FUNCDESC GOT relocations require a GOT entry to be created, and
+   handled as if a FUNCDESC relocation was applied to the GOT entry in
+   an object file.
+
+   FUNCDESC relocations referencing a symbol that turns out to NOT be
+   dynamic cause a private function descriptor to be created.  The
+   FUNCDESC relocation then decays to a 32 relocation that points at
+   the private descriptor.  If the symbol is dynamic, the FUNCDESC
+   relocation is propagated to the linker output, such that the
+   dynamic linker creates the canonical descriptor, pointing to the
+   dynamically-resolved definition of the function.
+
+   Non-FUNCDESC GOTOFF relocations must always refer to non-dynamic
+   symbols that are assigned to the same segment as the GOT, but we
+   can only check this later, after we know the complete set of
+   symbols defined and/or exported.
+
+   FUNCDESC GOTOFF relocations require a function descriptor to be
+   created and, unless lazy binding is disabled or the symbol is not
+   dynamic, a lazy PLT entry.  Since we can't tell at this point
+   whether a symbol is going to be dynamic, we have to decide later
+   whether to create a lazy PLT entry or bind the descriptor directly
+   to the private function.
+
+   FUNCDESC_VALUE relocations are not supposed to be present in object
+   files, but they may very well be simply propagated to the linker
+   output, since they have no side effect.
+
+
+   A function descriptor always requires a FUNCDESC_VALUE relocation.
+   Whether it's in .plt.rel or not depends on whether lazy binding is
+   enabled and on whether the referenced symbol is dynamic.
+
+   The existence of a lazy PLT requires the resolverStub lazy PLT
+   entry to be present.
+
+
+   As for assignment of GOT, PLT and lazy PLT entries, and private
+   descriptors, we might do them all sequentially, but we can do
+   better than that.  For example, we can place GOT entries and
+   private function descriptors referenced using 12-bit operands
+   closer to the PIC register value, such that these relocations don't
+   overflow.  Those that are only referenced with LO16 relocations
+   could come next, but we may as well place PLT-required function
+   descriptors in the 12-bit range to make them shorter.  Symbols
+   referenced with LO16/HI16 may come next, but we may place
+   additional function descriptors in the 16-bit range if we can
+   reliably tell that we've already placed entries that are ever
+   referenced with only LO16.  PLT entries are therefore generated as
+   small as possible, while not introducing relocation overflows in
+   GOT or FUNCDESC_GOTOFF relocations.  Lazy PLT entries could be
+   generated before or after PLT entries, but not intermingled with
+   them, such that we can have more lazy PLT entries in range for a
+   branch to the resolverStub.  The resolverStub should be emitted at
+   the most distant location from the first lazy PLT entry such that
+   it's still in range for a branch, or closer, if there isn't a need
+   for so many lazy PLT entries.  Additional lazy PLT entries may be
+   emitted after the resolverStub, as long as branches are still in
+   range.  If the branch goes out of range, longer lazy PLT entries
+   are emitted.
+
+   We could further optimize PLT and lazy PLT entries by giving them
+   priority in assignment to closer-to-gr17 locations depending on the
+   number of occurrences of references to them (assuming a function
+   that's called more often is more important for performance, so its
+   PLT entry should be faster), or taking hints from the compiler.
+   Given infinite time and money... :-)  */
+
+static bfd_boolean
+bfinfdpic_check_relocs (bfd *abfd, struct bfd_link_info *info,
+			asection *sec, const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  bfd *dynobj;
+  struct bfinfdpic_relocs_info *picrel;
+
+  if (info->relocatable)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  dynobj = elf_hash_table (info)->dynobj;
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+        h = NULL;
+      else
+        h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+
+      switch (ELF32_R_TYPE (rel->r_info))
+	{
+	case R_BFIN_GOT17M4:
+	case R_BFIN_GOTHI:
+	case R_BFIN_GOTLO:
+	case R_BFIN_FUNCDESC_GOT17M4:
+	case R_BFIN_FUNCDESC_GOTHI:
+	case R_BFIN_FUNCDESC_GOTLO:
+	case R_BFIN_GOTOFF17M4:
+	case R_BFIN_GOTOFFHI:
+	case R_BFIN_GOTOFFLO:
+	case R_BFIN_FUNCDESC_GOTOFF17M4:
+	case R_BFIN_FUNCDESC_GOTOFFHI:
+	case R_BFIN_FUNCDESC_GOTOFFLO:
+	case R_BFIN_FUNCDESC:
+	case R_BFIN_FUNCDESC_VALUE:
+	  if (! IS_FDPIC (abfd))
+	    goto bad_reloc;
+	  /* Fall through.  */
+	case R_BFIN_PCREL24:
+	case R_BFIN_PCREL24_JUMP_L:
+	case R_BFIN_BYTE4_DATA:
+	  if (IS_FDPIC (abfd) && ! dynobj)
+	    {
+	      elf_hash_table (info)->dynobj = dynobj = abfd;
+	      if (! _bfin_create_got_section (abfd, info))
+		return FALSE;
+	    }
+	  if (! IS_FDPIC (abfd))
+	    {
+	      picrel = NULL;
+	      break;
+	    }
+	  if (h != NULL)
+	    {
+	      if (h->dynindx == -1)
+		switch (ELF_ST_VISIBILITY (h->other))
+		  {
+		  case STV_INTERNAL:
+		  case STV_HIDDEN:
+		    break;
+		  default:
+		    bfd_elf_link_record_dynamic_symbol (info, h);
+		    break;
+		  }
+	      picrel
+		= bfinfdpic_relocs_info_for_global (bfinfdpic_relocs_info (info),
+						   abfd, h,
+						   rel->r_addend, INSERT);
+	    }
+	  else
+	    picrel = bfinfdpic_relocs_info_for_local (bfinfdpic_relocs_info
+						     (info), abfd, r_symndx,
+						     rel->r_addend, INSERT);
+	  if (! picrel)
+	    return FALSE;
+	  break;
+
+	default:
+	  picrel = NULL;
+	  break;
+	}
+
+      switch (ELF32_R_TYPE (rel->r_info))
+        {
+	case R_BFIN_PCREL24:
+	case R_BFIN_PCREL24_JUMP_L:
+	  if (IS_FDPIC (abfd))
+	    picrel->call++;
+	  break;
+
+	case R_BFIN_FUNCDESC_VALUE:
+	  picrel->relocsfdv++;
+	  if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)
+	    picrel->relocs32--;
+	  /* Fall through.  */
+
+	case R_BFIN_BYTE4_DATA:
+	  if (! IS_FDPIC (abfd))
+	    break;
+
+	  picrel->sym++;
+	  if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)
+	    picrel->relocs32++;
+	  break;
+
+	case R_BFIN_GOT17M4:
+	  picrel->got17m4++;
+	  break;
+
+	case R_BFIN_GOTHI:
+	case R_BFIN_GOTLO:
+	  picrel->gothilo++;
+	  break;
+
+	case R_BFIN_FUNCDESC_GOT17M4:
+	  picrel->fdgot17m4++;
+	  break;
+
+	case R_BFIN_FUNCDESC_GOTHI:
+	case R_BFIN_FUNCDESC_GOTLO:
+	  picrel->fdgothilo++;
+	  break;
+
+	case R_BFIN_GOTOFF17M4:
+	case R_BFIN_GOTOFFHI:
+	case R_BFIN_GOTOFFLO:
+	  picrel->gotoff++;
+	  break;
+
+	case R_BFIN_FUNCDESC_GOTOFF17M4:
+	  picrel->fdgoff17m4++;
+	  break;
+
+	case R_BFIN_FUNCDESC_GOTOFFHI:
+	case R_BFIN_FUNCDESC_GOTOFFLO:
+	  picrel->fdgoffhilo++;
+	  break;
+
+	case R_BFIN_FUNCDESC:
+	  picrel->fd++;
+	  picrel->relocsfd++;
+	  break;
+
+        /* This relocation describes the C++ object vtable hierarchy.
+           Reconstruct it for later use during GC.  */
+        case R_BFIN_GNU_VTINHERIT:
+          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+
+        /* This relocation describes which C++ vtable entries are actually
+           used.  Record for later use during GC.  */
+        case R_BFIN_GNU_VTENTRY:
+          BFD_ASSERT (h != NULL);
+          if (h != NULL
+              && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+            return FALSE;
+          break;
+
+	case R_BFIN_HUIMM16:
+	case R_BFIN_LUIMM16:
+	case R_BFIN_PCREL12_JUMP_S:
+	case R_BFIN_PCREL10:
+	  break;
+
+	default:
+	bad_reloc:
+	  (*_bfd_error_handler)
+	    (_("%B: unsupported relocation type %i"),
+	     abfd, ELF32_R_TYPE (rel->r_info));
+	  return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+/* Set the right machine number for a Blackfin ELF file.  */
+
+static bfd_boolean
+elf32_bfin_object_p (bfd *abfd)
+{
+  bfd_default_set_arch_mach (abfd, bfd_arch_bfin, 0);
+  return (((elf_elfheader (abfd)->e_flags & EF_BFIN_FDPIC) != 0)
+	  == (IS_FDPIC (abfd)));
+}
+
+static bfd_boolean
+elf32_bfin_set_private_flags (bfd * abfd, flagword flags)
+{
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
+}
+
+/* Copy backend specific data from one object module to another.  */
+
+static bfd_boolean
+bfin_elf_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  BFD_ASSERT (!elf_flags_init (obfd)
+	      || elf_elfheader (obfd)->e_flags == elf_elfheader (ibfd)->e_flags);
+
+  elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
+  elf_flags_init (obfd) = TRUE;
+
+  /* Copy object attributes.  */
+  _bfd_elf_copy_obj_attributes (ibfd, obfd);
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf32_bfinfdpic_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  unsigned i;
+
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  if (! bfin_elf_copy_private_bfd_data (ibfd, obfd))
+    return FALSE;
+
+  if (! elf_tdata (ibfd) || ! elf_tdata (ibfd)->phdr
+      || ! elf_tdata (obfd) || ! elf_tdata (obfd)->phdr)
+    return TRUE;
+
+  /* Copy the stack size.  */
+  for (i = 0; i < elf_elfheader (ibfd)->e_phnum; i++)
+    if (elf_tdata (ibfd)->phdr[i].p_type == PT_GNU_STACK)
+      {
+	Elf_Internal_Phdr *iphdr = &elf_tdata (ibfd)->phdr[i];
+
+	for (i = 0; i < elf_elfheader (obfd)->e_phnum; i++)
+	  if (elf_tdata (obfd)->phdr[i].p_type == PT_GNU_STACK)
+	    {
+	      memcpy (&elf_tdata (obfd)->phdr[i], iphdr, sizeof (*iphdr));
+
+	      /* Rewrite the phdrs, since we're only called after they
+		 were first written.  */
+	      if (bfd_seek (obfd, (bfd_signed_vma) get_elf_backend_data (obfd)
+			    ->s->sizeof_ehdr, SEEK_SET) != 0
+		  || get_elf_backend_data (obfd)->s
+		  ->write_out_phdrs (obfd, elf_tdata (obfd)->phdr,
+				     elf_elfheader (obfd)->e_phnum) != 0)
+		return FALSE;
+	      break;
+	    }
+
+	break;
+      }
+
+  return TRUE;
+}
+
+
+/* Display the flags field.  */
+static bfd_boolean
+elf32_bfin_print_private_bfd_data (bfd * abfd, PTR ptr)
+{
+  FILE *file = (FILE *) ptr;
+  flagword flags;
+
+  BFD_ASSERT (abfd != NULL && ptr != NULL);
+
+  /* Print normal ELF private data.  */
+  _bfd_elf_print_private_bfd_data (abfd, ptr);
+
+  flags = elf_elfheader (abfd)->e_flags;
+
+  /* xgettext:c-format */
+  fprintf (file, _("private flags = %lx:"), elf_elfheader (abfd)->e_flags);
+
+  if (flags & EF_BFIN_PIC)
+    fprintf (file, " -fpic");
+
+  if (flags & EF_BFIN_FDPIC)
+    fprintf (file, " -mfdpic");
+
+  fputc ('\n', file);
+
+  return TRUE;
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+
+static bfd_boolean
+elf32_bfin_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  flagword old_flags, new_flags;
+  bfd_boolean error = FALSE;
+
+  new_flags = elf_elfheader (ibfd)->e_flags;
+  old_flags = elf_elfheader (obfd)->e_flags;
+
+  if (new_flags & EF_BFIN_FDPIC)
+    new_flags &= ~EF_BFIN_PIC;
+
+#ifndef DEBUG
+  if (0)
+#endif
+  (*_bfd_error_handler) ("old_flags = 0x%.8lx, new_flags = 0x%.8lx, init = %s, filename = %s",
+			 old_flags, new_flags, elf_flags_init (obfd) ? "yes" : "no",
+			 bfd_get_filename (ibfd));
+
+  if (!elf_flags_init (obfd))			/* First call, no flags set.  */
+    {
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = new_flags;
+    }
+
+  if (((new_flags & EF_BFIN_FDPIC) == 0) != (! IS_FDPIC (obfd)))
+    {
+      error = TRUE;
+      if (IS_FDPIC (obfd))
+	(*_bfd_error_handler)
+	  (_("%s: cannot link non-fdpic object file into fdpic executable"),
+	   bfd_get_filename (ibfd));
+      else
+	(*_bfd_error_handler)
+	  (_("%s: cannot link fdpic object file into non-fdpic executable"),
+	   bfd_get_filename (ibfd));
+    }
+
+  if (error)
+    bfd_set_error (bfd_error_bad_value);
+
+  return !error;
+}
+
+/* bfin ELF linker hash entry.  */
+
+struct bfin_link_hash_entry
+{
+  struct elf_link_hash_entry root;
+
+  /* Number of PC relative relocs copied for this symbol.  */
+  struct bfin_pcrel_relocs_copied *pcrel_relocs_copied;
+};
+
+/* bfin ELF linker hash table.  */
+
+struct bfin_link_hash_table
+{
+  struct elf_link_hash_table root;
+
+  /* Small local sym cache.  */
+  struct sym_cache sym_cache;
+};
+
+#define bfin_hash_entry(ent) ((struct bfin_link_hash_entry *) (ent))
+
+static struct bfd_hash_entry *
+bfin_link_hash_newfunc (struct bfd_hash_entry *entry,
+			struct bfd_hash_table *table, const char *string)
+{
+  struct bfd_hash_entry *ret = entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = bfd_hash_allocate (table, sizeof (struct bfin_link_hash_entry));
+  if (ret == NULL)
+    return ret;
+
+  /* Call the allocation method of the superclass.  */
+  ret = _bfd_elf_link_hash_newfunc (ret, table, string);
+  if (ret != NULL)
+    bfin_hash_entry (ret)->pcrel_relocs_copied = NULL;
+
+  return ret;
+}
+
+/* Create an bfin ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+bfin_link_hash_table_create (bfd * abfd)
+{
+  struct bfin_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct bfin_link_hash_table);
+
+  ret = bfd_zalloc (abfd, amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->root, abfd,
+				      bfin_link_hash_newfunc,
+				      sizeof (struct elf_link_hash_entry),
+				      BFIN_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  ret->sym_cache.abfd = NULL;
+
+  return &ret->root.root;
+}
+
+/* The size in bytes of an entry in the procedure linkage table.  */
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+bfin_finish_dynamic_sections (bfd * output_bfd ATTRIBUTE_UNUSED,
+				  struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *sdyn;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      Elf32_External_Dyn *dyncon, *dynconend;
+
+      BFD_ASSERT (sdyn != NULL);
+
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+
+	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	}
+
+    }
+  return TRUE;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+bfin_finish_dynamic_symbol (bfd * output_bfd,
+				struct bfd_link_info *info,
+				struct elf_link_hash_entry *h,
+				Elf_Internal_Sym * sym)
+{
+  bfd *dynobj;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  if (h->got.offset != (bfd_vma) - 1)
+    {
+      asection *sgot;
+      asection *srela;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+
+      /* This symbol has an entry in the global offset table.
+         Set it up.  */
+
+      sgot = bfd_get_section_by_name (dynobj, ".got");
+      srela = bfd_get_section_by_name (dynobj, ".rela.got");
+      BFD_ASSERT (sgot != NULL && srela != NULL);
+
+      rela.r_offset = (sgot->output_section->vma
+		       + sgot->output_offset
+		       + (h->got.offset & ~(bfd_vma) 1));
+
+      /* If this is a -Bsymbolic link, and the symbol is defined
+         locally, we just want to emit a RELATIVE reloc.  Likewise if
+         the symbol was forced to be local because of a version file.
+         The entry in the global offset table will already have been
+         initialized in the relocate_section function.  */
+      if (info->shared
+	  && (info->symbolic
+	      || h->dynindx == -1 || h->forced_local) && h->def_regular)
+	{
+	  (*_bfd_error_handler) (_("*** check this relocation %s"),
+				 __FUNCTION__);
+	  rela.r_info = ELF32_R_INFO (0, R_BFIN_PCREL24);
+	  rela.r_addend = bfd_get_signed_32 (output_bfd,
+					     (sgot->contents
+					      +
+					      (h->got.
+					       offset & ~(bfd_vma) 1)));
+	}
+      else
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) 0,
+		      sgot->contents + (h->got.offset & ~(bfd_vma) 1));
+	  rela.r_info = ELF32_R_INFO (h->dynindx, R_BFIN_GOT);
+	  rela.r_addend = 0;
+	}
+
+      loc = srela->contents;
+      loc += srela->reloc_count++ * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+    }
+
+  if (h->needs_copy)
+    {
+      BFD_ASSERT (0);
+    }
+  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
+  if (strcmp (h->root.root.string, "__DYNAMIC") == 0
+      || h == elf_hash_table (info)->hgot)
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+bfin_adjust_dynamic_symbol (struct bfd_link_info *info,
+				struct elf_link_hash_entry *h)
+{
+  bfd *dynobj;
+  asection *s;
+  unsigned int power_of_two;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (dynobj != NULL
+	      && (h->needs_plt
+		  || h->u.weakdef != NULL
+		  || (h->def_dynamic && h->ref_regular && !h->def_regular)));
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later,
+     when we know the address of the .got section.  */
+  if (h->type == STT_FUNC || h->needs_plt)
+    {
+      BFD_ASSERT(0);
+    }
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  s = bfd_get_section_by_name (dynobj, ".dynbss");
+  BFD_ASSERT (s != NULL);
+
+  /* We must generate a R_68K_COPY reloc to tell the dynamic linker to
+     copy the initial value out of the dynamic object and into the
+     runtime process image.  We need to remember the offset into the
+     .rela.bss section we are going to use.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      asection *srel;
+
+      srel = bfd_get_section_by_name (dynobj, ".rela.bss");
+      BFD_ASSERT (srel != NULL);
+      srel->size += sizeof (Elf32_External_Rela);
+      h->needs_copy = 1;
+    }
+
+  /* We need to figure out the alignment required for this symbol.  I
+     have no idea how ELF linkers handle this.  */
+  power_of_two = bfd_log2 (h->size);
+  if (power_of_two > 3)
+    power_of_two = 3;
+
+  /* Apply the required alignment.  */
+  s->size = BFD_ALIGN (s->size, (bfd_size_type) (1 << power_of_two));
+  if (power_of_two > bfd_get_section_alignment (dynobj, s))
+    {
+      if (!bfd_set_section_alignment (dynobj, s, power_of_two))
+	return FALSE;
+    }
+
+  /* Define the symbol as being at this point in the section.  */
+  h->root.u.def.section = s;
+  h->root.u.def.value = s->size;
+
+  /* Increment the section size to make room for the symbol.  */
+  s->size += h->size;
+
+  return TRUE;
+}
+
+/* The bfin linker needs to keep track of the number of relocs that it
+   decides to copy in check_relocs for each symbol.  This is so that it
+   can discard PC relative relocs if it doesn't need them when linking
+   with -Bsymbolic.  We store the information in a field extending the
+   regular ELF linker hash table.  */
+
+/* This structure keeps track of the number of PC relative relocs we have
+   copied for a given symbol.  */
+
+struct bfin_pcrel_relocs_copied
+{
+  /* Next section.  */
+  struct bfin_pcrel_relocs_copied *next;
+  /* A section in dynobj.  */
+  asection *section;
+  /* Number of relocs copied in this section.  */
+  bfd_size_type count;
+};
+
+/* This function is called via elf_link_hash_traverse if we are
+   creating a shared object.  In the -Bsymbolic case it discards the
+   space allocated to copy PC relative relocs against symbols which
+   are defined in regular objects.  For the normal shared case, it
+   discards space for pc-relative relocs that have become local due to
+   symbol visibility changes.  We allocated space for them in the
+   check_relocs routine, but we won't fill them in in the
+   relocate_section routine.
+
+   We also check whether any of the remaining relocations apply
+   against a readonly section, and set the DF_TEXTREL flag in this
+   case.  */
+
+static bfd_boolean
+bfin_discard_copies (struct elf_link_hash_entry *h, PTR inf)
+{
+  struct bfd_link_info *info = (struct bfd_link_info *) inf;
+  struct bfin_pcrel_relocs_copied *s;
+
+  if (!h->def_regular || (!info->symbolic && !h->forced_local))
+    {
+      if ((info->flags & DF_TEXTREL) == 0)
+	{
+	  /* Look for relocations against read-only sections.  */
+	  for (s = bfin_hash_entry (h)->pcrel_relocs_copied;
+	       s != NULL; s = s->next)
+	    if ((s->section->flags & SEC_READONLY) != 0)
+	      {
+		info->flags |= DF_TEXTREL;
+		break;
+	      }
+	}
+
+      return TRUE;
+    }
+
+  for (s = bfin_hash_entry (h)->pcrel_relocs_copied;
+       s != NULL; s = s->next)
+    s->section->size -= s->count * sizeof (Elf32_External_Rela);
+
+  return TRUE;
+}
+
+static bfd_boolean
+bfin_size_dynamic_sections (bfd * output_bfd ATTRIBUTE_UNUSED,
+				struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *s;
+  bfd_boolean relocs;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (s != NULL);
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+  else
+    {
+      /* We may have created entries in the .rela.got section.
+         However, if we are not creating the dynamic sections, we will
+         not actually use these entries.  Reset the size of .rela.got,
+         which will cause it to get stripped from the output file
+         below.  */
+      s = bfd_get_section_by_name (dynobj, ".rela.got");
+      if (s != NULL)
+	s->size = 0;
+    }
+
+  /* If this is a -Bsymbolic shared link, then we need to discard all
+     PC relative relocs against symbols defined in a regular object.
+     For the normal shared case we discard the PC relative relocs
+     against symbols that have become local due to visibility changes.
+     We allocated space for them in the check_relocs routine, but we
+     will not fill them in in the relocate_section routine.  */
+  if (info->shared)
+    elf_link_hash_traverse (elf_hash_table (info),
+			    bfin_discard_copies, (PTR) info);
+
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  relocs = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      const char *name;
+      bfd_boolean strip;
+
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      /* It's OK to base decisions on the section name, because none
+         of the dynobj section names depend upon the input files.  */
+      name = bfd_get_section_name (dynobj, s);
+
+      strip = FALSE;
+
+       if (CONST_STRNEQ (name, ".rela"))
+	{
+	  if (s->size == 0)
+	    {
+	      /* If we don't need this section, strip it from the
+	         output file.  This is mostly to handle .rela.bss and
+	         .rela.plt.  We must create both sections in
+	         create_dynamic_sections, because they must be created
+	         before the linker maps input sections to output
+	         sections.  The linker does that before
+	         adjust_dynamic_symbol is called, and it is that
+	         function which decides whether anything needs to go
+	         into these sections.  */
+	      strip = TRUE;
+	    }
+	  else
+	    {
+	      relocs = TRUE;
+
+	      /* We use the reloc_count field as a counter if we need
+	         to copy relocs into the output file.  */
+	      s->reloc_count = 0;
+	    }
+	}
+      else if (! CONST_STRNEQ (name, ".got"))
+	{
+	  /* It's not one of our sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (strip)
+	{
+	  s->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      /* Allocate memory for the section contents.  */
+      /* FIXME: This should be a call to bfd_alloc not bfd_zalloc.
+         Unused entries should be reclaimed before the section's contents
+         are written out, but at the moment this does not happen.  Thus in
+         order to prevent writing out garbage, we initialise the section's
+         contents to zero.  */
+      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL && s->size != 0)
+	return FALSE;
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+         values later, in bfin_finish_dynamic_sections, but we
+         must add the entries now so that we get the correct size for
+         the .dynamic section.  The DT_DEBUG entry is filled in by the
+         dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (!info->shared)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+
+      if (relocs)
+	{
+	  if (!add_dynamic_entry (DT_RELA, 0)
+	      || !add_dynamic_entry (DT_RELASZ, 0)
+	      || !add_dynamic_entry (DT_RELAENT,
+				     sizeof (Elf32_External_Rela)))
+	    return FALSE;
+	}
+
+      if ((info->flags & DF_TEXTREL) != 0)
+	{
+	  if (!add_dynamic_entry (DT_TEXTREL, 0))
+	    return FALSE;
+	}
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+/* Given a .data section and a .emreloc in-memory section, store
+   relocation information into the .emreloc section which can be
+   used at runtime to relocate the section.  This is called by the
+   linker when the --embedded-relocs switch is used.  This is called
+   after the add_symbols entry point has been called for all the
+   objects, and before the final_link entry point is called.  */
+
+bfd_boolean bfd_bfin_elf32_create_embedded_relocs
+  PARAMS ((bfd *, struct bfd_link_info *, asection *, asection *, char **));
+
+bfd_boolean
+bfd_bfin_elf32_create_embedded_relocs (
+     bfd *abfd,
+     struct bfd_link_info *info,
+     asection *datasec,
+     asection *relsec,
+     char **errmsg)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Sym *isymbuf = NULL;
+  Elf_Internal_Rela *internal_relocs = NULL;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_byte *p;
+  bfd_size_type amt;
+
+  BFD_ASSERT (! info->relocatable);
+
+  *errmsg = NULL;
+
+  if (datasec->reloc_count == 0)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+
+  /* Get a copy of the native relocations.  */
+  internal_relocs = (_bfd_elf_link_read_relocs
+		     (abfd, datasec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
+		      info->keep_memory));
+  if (internal_relocs == NULL)
+    goto error_return;
+
+  amt = (bfd_size_type) datasec->reloc_count * 12;
+  relsec->contents = (bfd_byte *) bfd_alloc (abfd, amt);
+  if (relsec->contents == NULL)
+    goto error_return;
+
+  p = relsec->contents;
+
+  irelend = internal_relocs + datasec->reloc_count;
+  for (irel = internal_relocs; irel < irelend; irel++, p += 12)
+    {
+      asection *targetsec;
+
+      /* We are going to write a four byte longword into the runtime
+       reloc section.  The longword will be the address in the data
+       section which must be relocated.  It is followed by the name
+       of the target section NUL-padded or truncated to 8
+       characters.  */
+
+      /* We can only relocate absolute longword relocs at run time.  */
+      if (ELF32_R_TYPE (irel->r_info) != (int) R_BFIN_BYTE4_DATA)
+	{
+	  *errmsg = _("unsupported reloc type");
+	  bfd_set_error (bfd_error_bad_value);
+	  goto error_return;
+	}
+
+      /* Get the target section referred to by the reloc.  */
+      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+	{
+	  /* A local symbol.  */
+	  Elf_Internal_Sym *isym;
+
+	  /* Read this BFD's local symbols if we haven't done so already.  */
+	  if (isymbuf == NULL)
+	    {
+	      isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	      if (isymbuf == NULL)
+		isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+						symtab_hdr->sh_info, 0,
+						NULL, NULL, NULL);
+	      if (isymbuf == NULL)
+		goto error_return;
+	    }
+
+	  isym = isymbuf + ELF32_R_SYM (irel->r_info);
+	  targetsec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+	}
+      else
+	{
+	  unsigned long indx;
+	  struct elf_link_hash_entry *h;
+
+	  /* An external symbol.  */
+	  indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+	  h = elf_sym_hashes (abfd)[indx];
+	  BFD_ASSERT (h != NULL);
+	  if (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	    targetsec = h->root.u.def.section;
+	  else
+	    targetsec = NULL;
+	}
+
+      bfd_put_32 (abfd, irel->r_offset + datasec->output_offset, p);
+      memset (p + 4, 0, 8);
+      if (targetsec != NULL)
+	strncpy ((char *) p + 4, targetsec->output_section->name, 8);
+    }
+
+  if (isymbuf != NULL && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (internal_relocs != NULL
+      && elf_section_data (datasec)->relocs != internal_relocs)
+    free (internal_relocs);
+  return TRUE;
+
+error_return:
+  if (isymbuf != NULL && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (internal_relocs != NULL
+      && elf_section_data (datasec)->relocs != internal_relocs)
+    free (internal_relocs);
+  return FALSE;
+}
+
+struct bfd_elf_special_section const elf32_bfin_special_sections[] =
+{
+  { ".l1.text",		8, -2, SHT_PROGBITS, SHF_ALLOC + SHF_EXECINSTR },
+  { ".l1.data",		8, -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
+  { NULL,		0,  0, 0,            0 }
+};
+
+
+#define TARGET_LITTLE_SYM		bfd_elf32_bfin_vec
+#define TARGET_LITTLE_NAME		"elf32-bfin"
+#define ELF_ARCH			bfd_arch_bfin
+#define ELF_TARGET_ID			BFIN_ELF_DATA
+#define ELF_MACHINE_CODE		EM_BLACKFIN
+#define ELF_MAXPAGESIZE			0x1000
+#define elf_symbol_leading_char		'_'
+
+#define bfd_elf32_bfd_reloc_type_lookup	bfin_bfd_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup \
+					bfin_bfd_reloc_name_lookup
+#define elf_info_to_howto		bfin_info_to_howto
+#define elf_info_to_howto_rel		0
+#define elf_backend_object_p		elf32_bfin_object_p
+
+#define bfd_elf32_bfd_is_local_label_name \
+                                        bfin_is_local_label_name
+#define bfin_hash_table(p) \
+  ((struct bfin_link_hash_table *) (p)->hash)
+
+
+
+#define elf_backend_create_dynamic_sections \
+                                        _bfd_elf_create_dynamic_sections
+#define bfd_elf32_bfd_link_hash_table_create \
+                                        bfin_link_hash_table_create
+#define bfd_elf32_bfd_final_link        bfd_elf_gc_common_final_link
+
+#define elf_backend_check_relocs        bfin_check_relocs
+#define elf_backend_adjust_dynamic_symbol \
+                                        bfin_adjust_dynamic_symbol
+#define elf_backend_size_dynamic_sections \
+                                        bfin_size_dynamic_sections
+#define elf_backend_relocate_section    bfin_relocate_section
+#define elf_backend_finish_dynamic_symbol \
+                                        bfin_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections \
+                                        bfin_finish_dynamic_sections
+#define elf_backend_gc_mark_hook        bfin_gc_mark_hook
+#define elf_backend_gc_sweep_hook       bfin_gc_sweep_hook
+#define bfd_elf32_bfd_merge_private_bfd_data \
+                                        elf32_bfin_merge_private_bfd_data
+#define bfd_elf32_bfd_set_private_flags \
+                                        elf32_bfin_set_private_flags
+#define bfd_elf32_bfd_print_private_bfd_data \
+                                        elf32_bfin_print_private_bfd_data
+#define elf_backend_final_write_processing \
+                                        elf32_bfin_final_write_processing
+#define elf_backend_reloc_type_class    elf32_bfin_reloc_type_class
+#define elf_backend_can_gc_sections 1
+#define elf_backend_special_sections	elf32_bfin_special_sections
+#define elf_backend_can_refcount 1
+#define elf_backend_want_got_plt 0
+#define elf_backend_plt_readonly 1
+#define elf_backend_want_plt_sym 0
+#define elf_backend_got_header_size     12
+#define elf_backend_rela_normal         1
+
+#include "elf32-target.h"
+
+#undef TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM          bfd_elf32_bfinfdpic_vec
+#undef TARGET_LITTLE_NAME
+#define TARGET_LITTLE_NAME		"elf32-bfinfdpic"
+#undef	elf32_bed
+#define	elf32_bed		elf32_bfinfdpic_bed
+
+#undef elf_backend_gc_sweep_hook
+#define elf_backend_gc_sweep_hook       bfinfdpic_gc_sweep_hook
+
+#undef elf_backend_got_header_size
+#define elf_backend_got_header_size     0
+
+#undef elf_backend_relocate_section
+#define elf_backend_relocate_section    bfinfdpic_relocate_section
+#undef elf_backend_check_relocs
+#define elf_backend_check_relocs        bfinfdpic_check_relocs
+
+#undef bfd_elf32_bfd_link_hash_table_create
+#define bfd_elf32_bfd_link_hash_table_create \
+		bfinfdpic_elf_link_hash_table_create
+#undef elf_backend_always_size_sections
+#define elf_backend_always_size_sections \
+		elf32_bfinfdpic_always_size_sections
+#undef elf_backend_modify_program_headers
+#define elf_backend_modify_program_headers \
+		elf32_bfinfdpic_modify_program_headers
+#undef bfd_elf32_bfd_copy_private_bfd_data
+#define bfd_elf32_bfd_copy_private_bfd_data \
+		elf32_bfinfdpic_copy_private_bfd_data
+
+#undef elf_backend_create_dynamic_sections
+#define elf_backend_create_dynamic_sections \
+		elf32_bfinfdpic_create_dynamic_sections
+#undef elf_backend_adjust_dynamic_symbol
+#define elf_backend_adjust_dynamic_symbol \
+		elf32_bfinfdpic_adjust_dynamic_symbol
+#undef elf_backend_size_dynamic_sections
+#define elf_backend_size_dynamic_sections \
+		elf32_bfinfdpic_size_dynamic_sections
+#undef elf_backend_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_symbol \
+		elf32_bfinfdpic_finish_dynamic_symbol
+#undef elf_backend_finish_dynamic_sections
+#define elf_backend_finish_dynamic_sections \
+		elf32_bfinfdpic_finish_dynamic_sections
+
+#undef elf_backend_discard_info
+#define elf_backend_discard_info \
+		bfinfdpic_elf_discard_info
+#undef elf_backend_can_make_relative_eh_frame
+#define elf_backend_can_make_relative_eh_frame \
+		bfinfdpic_elf_use_relative_eh_frame
+#undef elf_backend_can_make_lsda_relative_eh_frame
+#define elf_backend_can_make_lsda_relative_eh_frame \
+		bfinfdpic_elf_use_relative_eh_frame
+#undef elf_backend_encode_eh_address
+#define elf_backend_encode_eh_address \
+		bfinfdpic_elf_encode_eh_address
+
+#undef elf_backend_may_use_rel_p
+#define elf_backend_may_use_rel_p       1
+#undef elf_backend_may_use_rela_p
+#define elf_backend_may_use_rela_p      1
+/* We use REL for dynamic relocations only.  */
+#undef elf_backend_default_use_rela_p
+#define elf_backend_default_use_rela_p  1
+
+#undef elf_backend_omit_section_dynsym
+#define elf_backend_omit_section_dynsym _bfinfdpic_link_omit_section_dynsym
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-cr16.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-cr16.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-cr16.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-cr16.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3036 @@
+/* BFD back-end for National Semiconductor's CR16 ELF
+   Copyright 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Written by M R Swami Reddy.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "libiberty.h"
+#include "elf-bfd.h"
+#include "elf/cr16.h"
+
+/* The cr16 linker needs to keep track of the number of relocs that
+   it decides to copy in check_relocs for each symbol.  This is so
+   that it can discard PC relative relocs if it doesn't need them when
+   linking with -Bsymbolic.  We store the information in a field
+   extending the regular ELF linker hash table.  */
+
+struct elf32_cr16_link_hash_entry
+{
+  /* The basic elf link hash table entry.  */
+  struct elf_link_hash_entry root;
+
+  /* For function symbols, the number of times this function is
+     called directly (ie by name).  */
+  unsigned int direct_calls;
+
+  /* For function symbols, the size of this function's stack
+     (if <= 255 bytes).  We stuff this into "call" instructions
+     to this target when it's valid and profitable to do so.
+
+     This does not include stack allocated by movm!  */
+  unsigned char stack_size;
+
+  /* For function symbols, arguments (if any) for movm instruction
+     in the prologue.  We stuff this value into "call" instructions
+     to the target when it's valid and profitable to do so.  */
+  unsigned char movm_args;
+
+  /* For function symbols, the amount of stack space that would be allocated
+     by the movm instruction.  This is redundant with movm_args, but we
+     add it to the hash table to avoid computing it over and over.  */
+  unsigned char movm_stack_size;
+
+/* Used to mark functions which have had redundant parts of their
+   prologue deleted.  */
+#define CR16_DELETED_PROLOGUE_BYTES 0x1
+  unsigned char flags;
+
+  /* Calculated value.  */
+  bfd_vma value;
+};
+
+/* cr16_reloc_map array maps BFD relocation enum into a CRGAS relocation type.  */
+
+struct cr16_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_enum; /* BFD relocation enum.  */
+  unsigned short cr16_reloc_type;          /* CR16 relocation type.  */
+};
+
+static const struct cr16_reloc_map cr16_reloc_map[R_CR16_MAX] =
+{
+  {BFD_RELOC_NONE,           R_CR16_NONE},
+  {BFD_RELOC_CR16_NUM8,      R_CR16_NUM8},
+  {BFD_RELOC_CR16_NUM16,     R_CR16_NUM16},
+  {BFD_RELOC_CR16_NUM32,     R_CR16_NUM32},
+  {BFD_RELOC_CR16_NUM32a,    R_CR16_NUM32a},
+  {BFD_RELOC_CR16_REGREL4,   R_CR16_REGREL4},
+  {BFD_RELOC_CR16_REGREL4a,  R_CR16_REGREL4a},
+  {BFD_RELOC_CR16_REGREL14,  R_CR16_REGREL14},
+  {BFD_RELOC_CR16_REGREL14a, R_CR16_REGREL14a},
+  {BFD_RELOC_CR16_REGREL16,  R_CR16_REGREL16},
+  {BFD_RELOC_CR16_REGREL20,  R_CR16_REGREL20},
+  {BFD_RELOC_CR16_REGREL20a, R_CR16_REGREL20a},
+  {BFD_RELOC_CR16_ABS20,     R_CR16_ABS20},
+  {BFD_RELOC_CR16_ABS24,     R_CR16_ABS24},
+  {BFD_RELOC_CR16_IMM4,      R_CR16_IMM4},
+  {BFD_RELOC_CR16_IMM8,      R_CR16_IMM8},
+  {BFD_RELOC_CR16_IMM16,     R_CR16_IMM16},
+  {BFD_RELOC_CR16_IMM20,     R_CR16_IMM20},
+  {BFD_RELOC_CR16_IMM24,     R_CR16_IMM24},
+  {BFD_RELOC_CR16_IMM32,     R_CR16_IMM32},
+  {BFD_RELOC_CR16_IMM32a,    R_CR16_IMM32a},
+  {BFD_RELOC_CR16_DISP4,     R_CR16_DISP4},
+  {BFD_RELOC_CR16_DISP8,     R_CR16_DISP8},
+  {BFD_RELOC_CR16_DISP16,    R_CR16_DISP16},
+  {BFD_RELOC_CR16_DISP24,    R_CR16_DISP24},
+  {BFD_RELOC_CR16_DISP24a,   R_CR16_DISP24a},
+  {BFD_RELOC_CR16_SWITCH8,   R_CR16_SWITCH8},
+  {BFD_RELOC_CR16_SWITCH16,  R_CR16_SWITCH16},
+  {BFD_RELOC_CR16_SWITCH32,  R_CR16_SWITCH32},
+  {BFD_RELOC_CR16_GOT_REGREL20, R_CR16_GOT_REGREL20},
+  {BFD_RELOC_CR16_GOTC_REGREL20, R_CR16_GOTC_REGREL20},
+  {BFD_RELOC_CR16_GLOB_DAT,  R_CR16_GLOB_DAT}
+};
+
+static reloc_howto_type cr16_elf_howto_table[] =
+{
+  HOWTO (R_CR16_NONE,              /* type */
+         0,                        /* rightshift */
+         2,                        /* size */
+         32,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_dont,   /* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_NONE",            /* name */
+         FALSE,                    /* partial_inplace */
+         0,                        /* src_mask */
+         0,                        /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_NUM8,              /* type */
+         0,                        /* rightshift */
+         0,                        /* size */
+         8,                        /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_NUM8",            /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xff,                     /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_NUM16,             /* type */
+         0,                        /* rightshift */
+         1,                        /* size */
+         16,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_NUM16",           /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xffff,                   /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_NUM32,             /* type */
+         0,                        /* rightshift */
+         2,                        /* size */
+         32,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_NUM32",           /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xffffffff,               /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_NUM32a,            /* type */
+         1,                        /* rightshift */
+         2,                        /* size */
+         32,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_NUM32a",          /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xffffffff,               /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_REGREL4,           /* type */
+         0,                        /* rightshift */
+         0,                        /* size */
+         4,                        /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_REGREL4",         /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xf,                      /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_REGREL4a,          /* type */
+         0,                        /* rightshift */
+         0,                        /* size */
+         4,                        /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_REGREL4a",        /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xf,                      /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_REGREL14,          /* type */
+         0,                        /* rightshift */
+         1,                        /* size */
+         14,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_REGREL14",        /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0x3fff,                   /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_REGREL14a,         /* type */
+         0,                        /* rightshift */
+         1,                        /* size */
+         14,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_REGREL14a",       /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0x3fff,                   /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_REGREL16,          /* type */
+         0,                        /* rightshift */
+         1,                        /* size */
+         16,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_REGREL16",        /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xffff,                   /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_REGREL20,          /* type */
+         0,                        /* rightshift */
+         2,                        /* size */
+         20,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_REGREL20",        /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xfffff,                  /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_REGREL20a,         /* type */
+         0,                        /* rightshift */
+         2,                        /* size */
+         20,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_REGREL20a",       /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xfffff,                  /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_ABS20,             /* type */
+         0,                        /* rightshift */
+         2,                        /* size */
+         20,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_ABS20",           /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xfffff,                  /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_ABS24,             /* type */
+         0,                        /* rightshift */
+         2,                        /* size */
+         24,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_ABS24",           /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xffffff,                 /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_IMM4,              /* type */
+         0,                        /* rightshift */
+         0,                        /* size */
+         4,                        /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_IMM4",            /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xf,                      /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_IMM8,              /* type */
+         0,                        /* rightshift */
+         0,                        /* size */
+         8,                        /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_IMM8",            /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xff,                     /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_IMM16,             /* type */
+         0,                        /* rightshift */
+         1,                        /* size */
+         16,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_IMM16",           /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xffff,                   /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_IMM20,             /* type */
+         0,                        /* rightshift */
+         2,                        /* size */
+         20,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_IMM20",           /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xfffff,                  /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_IMM24,             /* type */
+         0,                        /* rightshift */
+         2,                        /* size */
+         24,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_IMM24",           /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xffffff,                 /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_IMM32,             /* type */
+         0,                        /* rightshift */
+         2,                        /* size */
+         32,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_IMM32",           /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xffffffff,               /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_IMM32a,            /* type */
+         1,                        /* rightshift */
+         2,                        /* size */
+         32,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_IMM32a",          /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xffffffff,               /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_DISP4,             /* type */
+         1,                        /* rightshift */
+         0,                        /* size (0 = byte, 1 = short, 2 = long) */
+         4,                        /* bitsize */
+         TRUE,                     /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_unsigned, /* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_DISP4",           /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xf,                      /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_DISP8,             /* type */
+         1,                        /* rightshift */
+         0,                        /* size (0 = byte, 1 = short, 2 = long) */
+         8,                        /* bitsize */
+         TRUE,                     /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_unsigned, /* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_DISP8",           /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0x1ff,                    /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_DISP16,            /* type */
+         0,                        /* rightshift REVIITS: To sync with WinIDEA*/
+         1,                        /* size (0 = byte, 1 = short, 2 = long) */
+         16,                       /* bitsize */
+         TRUE,                     /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_unsigned, /* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_DISP16",          /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0x1ffff,                  /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+  /* REVISIT: DISP24 should be left-shift by 2 as per ISA doc
+     but its not done, to sync with WinIDEA and CR16 4.1 tools */
+  HOWTO (R_CR16_DISP24,            /* type */
+         0,                        /* rightshift */
+         2,                        /* size (0 = byte, 1 = short, 2 = long) */
+         24,                       /* bitsize */
+         TRUE,                     /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_unsigned, /* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_DISP24",          /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0x1ffffff,                /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_DISP24a,           /* type */
+         0,                        /* rightshift */
+         2,                        /* size (0 = byte, 1 = short, 2 = long) */
+         24,                       /* bitsize */
+         TRUE,                     /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_unsigned, /* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_DISP24a",         /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xffffff,                 /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  /* An 8 bit switch table entry.  This is generated for an expression
+     such as ``.byte L1 - L2''.  The offset holds the difference
+     between the reloc address and L2.  */
+  HOWTO (R_CR16_SWITCH8,           /* type */
+         0,                        /* rightshift */
+         0,                        /* size (0 = byte, 1 = short, 2 = long) */
+         8,                        /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_unsigned, /* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_SWITCH8",         /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xff,                     /* dst_mask */
+         TRUE),                    /* pcrel_offset */
+
+  /* A 16 bit switch table entry.  This is generated for an expression
+     such as ``.word L1 - L2''.  The offset holds the difference
+     between the reloc address and L2.  */
+  HOWTO (R_CR16_SWITCH16,          /* type */
+         0,                        /* rightshift */
+         1,                        /* size (0 = byte, 1 = short, 2 = long) */
+         16,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_unsigned, /* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_SWITCH16",        /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xffff,                   /* dst_mask */
+         TRUE),                    /* pcrel_offset */
+
+  /* A 32 bit switch table entry.  This is generated for an expression
+     such as ``.long L1 - L2''.  The offset holds the difference
+     between the reloc address and L2.  */
+  HOWTO (R_CR16_SWITCH32,          /* type */
+         0,                        /* rightshift */
+         2,                        /* size (0 = byte, 1 = short, 2 = long) */
+         32,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_unsigned, /* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_SWITCH32",        /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xffffffff,               /* dst_mask */
+         TRUE),                    /* pcrel_offset */
+
+  HOWTO (R_CR16_GOT_REGREL20,      /* type */
+         0,                        /* rightshift */
+         2,                        /* size */
+         20,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_GOT_REGREL20",    /* name */
+         TRUE,                     /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xfffff,                  /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_GOTC_REGREL20,     /* type */
+         0,                        /* rightshift */
+         2,                        /* size */
+         20,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_GOTC_REGREL20",   /* name */
+         TRUE,                     /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xfffff,                  /* dst_mask */
+         FALSE),                   /* pcrel_offset */
+
+  HOWTO (R_CR16_GLOB_DAT,          /* type */
+         0,                        /* rightshift */
+         2,                        /* size (0 = byte, 1 = short, 2 = long) */
+         32,                       /* bitsize */
+         FALSE,                    /* pc_relative */
+         0,                        /* bitpos */
+         complain_overflow_unsigned, /* complain_on_overflow */
+         bfd_elf_generic_reloc,    /* special_function */
+         "R_CR16_GLOB_DAT",        /* name */
+         FALSE,                    /* partial_inplace */
+         0x0,                      /* src_mask */
+         0xffffffff,               /* dst_mask */
+         TRUE)                     /* pcrel_offset */
+};
+
+
+/* Create the GOT section.  */
+
+static bfd_boolean
+_bfd_cr16_elf_create_got_section (bfd * abfd, struct bfd_link_info * info)
+{
+  flagword   flags;
+  asection * s;
+  struct elf_link_hash_entry * h;
+  const struct elf_backend_data * bed = get_elf_backend_data (abfd);
+  int ptralign;
+
+  /* This function may be called more than once.  */
+  if (bfd_get_section_by_name (abfd, ".got") != NULL)
+    return TRUE;
+
+  switch (bed->s->arch_size)
+    {
+    case 16:
+      ptralign = 1;
+      break;
+
+    case 32:
+      ptralign = 2;
+      break;
+
+    default:
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+           | SEC_LINKER_CREATED);
+
+  s = bfd_make_section_with_flags (abfd, ".got", flags);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, ptralign))
+    return FALSE;
+
+  if (bed->want_got_plt)
+    {
+      s = bfd_make_section_with_flags (abfd, ".got.plt", flags);
+      if (s == NULL
+          || ! bfd_set_section_alignment (abfd, s, ptralign))
+        return FALSE;
+    }
+
+  /* Define the symbol _GLOBAL_OFFSET_TABLE_ at the start of the .got
+     (or .got.plt) section.  We don't do this in the linker script
+     because we don't want to define the symbol if we are not creating
+     a global offset table.  */
+  h = _bfd_elf_define_linkage_sym (abfd, info, s, "_GLOBAL_OFFSET_TABLE_");
+  elf_hash_table (info)->hgot = h;
+  if (h == NULL)
+    return FALSE;
+
+  /* The first bit of the global offset table is the header.  */
+  s->size += bed->got_header_size;
+
+  return TRUE;
+}
+
+
+/* Retrieve a howto ptr using a BFD reloc_code.  */
+
+static reloc_howto_type *
+elf_cr16_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                            bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0; i < R_CR16_MAX; i++)
+    if (code == cr16_reloc_map[i].bfd_reloc_enum)
+      return &cr16_elf_howto_table[cr16_reloc_map[i].cr16_reloc_type];
+
+  _bfd_error_handler ("Unsupported CR16 relocation type: 0x%x\n", code);
+  return NULL;
+}
+
+static reloc_howto_type *
+elf_cr16_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                            const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0; ARRAY_SIZE (cr16_elf_howto_table); i++)
+    if (cr16_elf_howto_table[i].name != NULL
+        && strcasecmp (cr16_elf_howto_table[i].name, r_name) == 0)
+      return cr16_elf_howto_table + i;
+
+  return NULL;
+}
+
+/* Retrieve a howto ptr using an internal relocation entry.  */
+
+static void
+elf_cr16_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr,
+                        Elf_Internal_Rela *dst)
+{
+  unsigned int r_type = ELF32_R_TYPE (dst->r_info);
+
+  BFD_ASSERT (r_type < (unsigned int) R_CR16_MAX);
+  cache_ptr->howto = cr16_elf_howto_table + r_type;
+}
+
+/* Look through the relocs for a section during the first phase.
+   Since we don't do .gots or .plts, we just need to consider the
+   virtual table relocs for gc.  */
+
+static bfd_boolean
+cr16_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
+                       const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Sym * isymbuf = NULL;
+  struct elf_link_hash_entry **sym_hashes, **sym_hashes_end;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  bfd *      dynobj;
+  bfd_vma *  local_got_offsets;
+  asection * sgot;
+  asection * srelgot;
+
+  sgot    = NULL;
+  srelgot = NULL;
+  bfd_boolean result = FALSE;
+
+  if (info->relocatable)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  sym_hashes_end = sym_hashes + symtab_hdr->sh_size/sizeof (Elf32_External_Sym);
+  if (!elf_bad_symtab (abfd))
+    sym_hashes_end -= symtab_hdr->sh_info;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  local_got_offsets = elf_local_got_offsets (abfd);
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+        h = NULL;
+      else
+        {
+          h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+          while (h->root.type == bfd_link_hash_indirect
+                 || h->root.type == bfd_link_hash_warning)
+            h = (struct elf_link_hash_entry *) h->root.u.i.link;
+        }
+
+      /* Some relocs require a global offset table.  */
+      if (dynobj == NULL)
+        {
+          switch (ELF32_R_TYPE (rel->r_info))
+            {
+            case R_CR16_GOT_REGREL20:
+            case R_CR16_GOTC_REGREL20:
+              elf_hash_table (info)->dynobj = dynobj = abfd;
+              if (! _bfd_cr16_elf_create_got_section (dynobj, info))
+                goto fail;
+              break;
+
+            default:
+              break;
+            }
+        }
+
+      switch (ELF32_R_TYPE (rel->r_info))
+        {
+        case R_CR16_GOT_REGREL20:
+        case R_CR16_GOTC_REGREL20:
+          /* This symbol requires a global offset table entry.  */
+
+          if (sgot == NULL)
+            {
+              sgot = bfd_get_section_by_name (dynobj, ".got");
+              BFD_ASSERT (sgot != NULL);
+            }
+
+          if (srelgot == NULL
+              && (h != NULL || info->executable))
+            {
+              srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+              if (srelgot == NULL)
+                {
+                  srelgot = bfd_make_section_with_flags (dynobj,
+                                                         ".rela.got",
+                                                         (SEC_ALLOC
+                                                          | SEC_LOAD
+                                                          | SEC_HAS_CONTENTS
+                                                          | SEC_IN_MEMORY
+                                                          | SEC_LINKER_CREATED
+                                                          | SEC_READONLY));
+                  if (srelgot == NULL
+                      || ! bfd_set_section_alignment (dynobj, srelgot, 2))
+                    goto fail;
+                }
+            }
+
+          if (h != NULL)
+            {
+              if (h->got.offset != (bfd_vma) -1)
+                /* We have already allocated space in the .got.  */
+                break;
+
+              h->got.offset = sgot->size;
+
+              /* Make sure this symbol is output as a dynamic symbol.  */
+              if (h->dynindx == -1)
+                {
+                  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+                    goto fail;
+                }
+
+              srelgot->size += sizeof (Elf32_External_Rela);
+            }
+          else
+            {
+              /* This is a global offset table entry for a local
+                 symbol.  */
+              if (local_got_offsets == NULL)
+                {
+                  size_t       size;
+                  unsigned int i;
+
+                  size = symtab_hdr->sh_info * sizeof (bfd_vma);
+                  local_got_offsets = (bfd_vma *) bfd_alloc (abfd, size);
+
+                  if (local_got_offsets == NULL)
+                    goto fail;
+
+                  elf_local_got_offsets (abfd) = local_got_offsets;
+
+                  for (i = 0; i < symtab_hdr->sh_info; i++)
+                    local_got_offsets[i] = (bfd_vma) -1;
+                }
+
+              if (local_got_offsets[r_symndx] != (bfd_vma) -1)
+                /* We have already allocated space in the .got.  */
+                break;
+
+              local_got_offsets[r_symndx] = sgot->size;
+
+              if (info->executable)
+                /* If we are generating a shared object, we need to
+                   output a R_CR16_RELATIVE reloc so that the dynamic
+                   linker can adjust this GOT entry.  */
+                srelgot->size += sizeof (Elf32_External_Rela);
+            }
+
+          sgot->size += 4;
+          break;
+
+        }
+    }
+
+   result = TRUE;
+  fail:
+    if (isymbuf != NULL)
+      free (isymbuf);
+
+  return result;
+}
+
+/* Perform a relocation as part of a final link.  */
+
+static bfd_reloc_status_type
+cr16_elf_final_link_relocate (reloc_howto_type *howto,
+                              bfd *input_bfd,
+                              bfd *output_bfd ATTRIBUTE_UNUSED,
+                              asection *input_section,
+                              bfd_byte *contents,
+                              bfd_vma offset,
+                              bfd_vma Rvalue,
+                              bfd_vma addend,
+                              struct elf_link_hash_entry * h,
+                              unsigned long symndx  ATTRIBUTE_UNUSED,
+                              struct bfd_link_info *info ATTRIBUTE_UNUSED,
+                              asection *sec ATTRIBUTE_UNUSED,
+                              int is_local ATTRIBUTE_UNUSED)
+{
+  unsigned short r_type = howto->type;
+  bfd_byte *hit_data = contents + offset;
+  bfd_vma reloc_bits, check, Rvalue1;
+  bfd *      dynobj;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  switch (r_type)
+    {
+     case R_CR16_IMM4:
+     case R_CR16_IMM20:
+     case R_CR16_ABS20:
+       break;
+
+     case R_CR16_IMM8:
+     case R_CR16_IMM16:
+     case R_CR16_IMM32:
+     case R_CR16_IMM32a:
+     case R_CR16_REGREL4:
+     case R_CR16_REGREL4a:
+     case R_CR16_REGREL14:
+     case R_CR16_REGREL14a:
+     case R_CR16_REGREL16:
+     case R_CR16_REGREL20:
+     case R_CR16_REGREL20a:
+     case R_CR16_GOT_REGREL20:
+     case R_CR16_GOTC_REGREL20:
+     case R_CR16_ABS24:
+     case R_CR16_DISP16:
+     case R_CR16_DISP24:
+       /* 'hit_data' is relative to the start of the instruction, not the
+           relocation offset. Advance it to account for the exact offset.  */
+       hit_data += 2;
+       break;
+
+     case R_CR16_NONE:
+       return bfd_reloc_ok;
+       break;
+
+     case R_CR16_DISP4:
+       if (is_local)
+        Rvalue += -1;
+       break;
+
+     case R_CR16_DISP8:
+     case R_CR16_DISP24a:
+       if (is_local)
+        Rvalue -= -1;
+       break;
+
+     case R_CR16_SWITCH8:
+     case R_CR16_SWITCH16:
+     case R_CR16_SWITCH32:
+       /* We only care about the addend, where the difference between
+          expressions is kept.  */
+       Rvalue = 0;
+       
+     default:
+       break;
+    }
+
+  if (howto->pc_relative)
+    {
+      /* Subtract the address of the section containing the location.  */
+      Rvalue -= (input_section->output_section->vma
+                 + input_section->output_offset);
+      /* Subtract the position of the location within the section.  */
+      Rvalue -= offset;
+    }
+
+  /* Add in supplied addend.  */
+  Rvalue += addend;
+
+  /* Complain if the bitfield overflows, whether it is considered
+     as signed or unsigned.  */
+  check = Rvalue >> howto->rightshift;
+
+  /* Assumes two's complement.  This expression avoids
+     overflow if howto->bitsize is the number of bits in
+     bfd_vma.  */
+  reloc_bits = (((1 << (howto->bitsize - 1)) - 1) << 1) | 1;
+
+  /* For GOT and GOTC relocs no boundary checks applied.  */
+  if (!((r_type == R_CR16_GOT_REGREL20)
+      || (r_type == R_CR16_GOTC_REGREL20)))
+    {
+      if (((bfd_vma) check & ~reloc_bits) != 0
+          && (((bfd_vma) check & ~reloc_bits)
+          != (-(bfd_vma) 1 & ~reloc_bits)))
+        {
+          /* The above right shift is incorrect for a signed
+             value.  See if turning on the upper bits fixes the
+             overflow.  */
+          if (howto->rightshift && (bfd_signed_vma) Rvalue < 0)
+            {
+              check |= ((bfd_vma) - 1
+                        & ~((bfd_vma) - 1
+                         >> howto->rightshift));
+
+              if (((bfd_vma) check & ~reloc_bits)
+                  != (-(bfd_vma) 1 & ~reloc_bits))
+                 return bfd_reloc_overflow;
+            }
+          else
+            return bfd_reloc_overflow;
+        }
+
+      /* Drop unwanted bits from the value we are relocating to.  */
+      Rvalue >>= (bfd_vma) howto->rightshift;
+
+      /* Apply dst_mask to select only relocatable part of the insn.  */
+      Rvalue &= howto->dst_mask;
+    }
+
+  switch (howto->size)
+    {
+      case 0:
+        if (r_type == R_CR16_DISP8)
+          {
+             Rvalue1 = bfd_get_16 (input_bfd, hit_data);
+             Rvalue = ((Rvalue1 & 0xf000) | ((Rvalue << 4) & 0xf00)
+                       | (Rvalue1 & 0x00f0) | (Rvalue & 0xf));
+             bfd_put_16 (input_bfd, Rvalue, hit_data);
+          }
+        else if (r_type == R_CR16_IMM4)
+          {
+             Rvalue1 = bfd_get_16 (input_bfd, hit_data);
+             Rvalue = (((Rvalue1 & 0xff) << 8) | ((Rvalue << 4) & 0xf0)
+                       | ((Rvalue1 & 0x0f00) >> 8));
+             bfd_put_16 (input_bfd, Rvalue, hit_data);
+          }
+        else if (r_type == R_CR16_DISP4)
+          {
+             Rvalue1 = bfd_get_16 (input_bfd, hit_data);
+             Rvalue = (Rvalue1 | ((Rvalue & 0xf) << 4));
+             bfd_put_16 (input_bfd, Rvalue, hit_data);
+          }
+        else
+          {
+             bfd_put_8 (input_bfd, (unsigned char) Rvalue, hit_data);
+          }
+        break;
+
+      case 1:
+        if (r_type == R_CR16_DISP16)
+          {
+            Rvalue |= (bfd_get_16 (input_bfd, hit_data));
+            Rvalue = ((Rvalue & 0xfffe) | ((Rvalue >> 16) & 0x1));
+          }
+        if (r_type == R_CR16_IMM16)
+          {
+            Rvalue1 = bfd_get_16 (input_bfd, hit_data);
+
+            /* Add or subtract the offset value.  */
+            if (Rvalue1 & 0x8000)
+              Rvalue -= (~Rvalue1 + 1) & 0xffff;
+            else
+              Rvalue += Rvalue1;
+
+             /* Check for range.  */
+             if ((long) Rvalue > 0xffff || (long) Rvalue < 0x0)
+              return bfd_reloc_overflow;
+          }
+
+        bfd_put_16 (input_bfd, Rvalue, hit_data);
+        break;
+
+      case 2:
+        if ((r_type == R_CR16_ABS20) || (r_type == R_CR16_IMM20))
+          {
+             Rvalue1 = (bfd_get_16 (input_bfd, hit_data + 2)
+                        | (((bfd_get_16 (input_bfd, hit_data) & 0xf) <<16)));
+
+             /* Add or subtract the offset value.  */
+             if (Rvalue1 & 0x80000)
+                Rvalue -= (~Rvalue1 + 1) & 0xfffff;
+              else
+                Rvalue += Rvalue1;
+
+              /* Check for range.  */
+              if ((long) Rvalue > 0xfffff || (long) Rvalue < 0x0)
+               return bfd_reloc_overflow;
+
+            bfd_put_16 (input_bfd, ((bfd_get_16 (input_bfd, hit_data) & 0xfff0)
+                        | ((Rvalue >> 16) & 0xf)), hit_data);
+            bfd_put_16 (input_bfd, (Rvalue) & 0xffff, hit_data + 2);
+          }
+        else if (r_type == R_CR16_GOT_REGREL20) 
+          {
+            asection * sgot = bfd_get_section_by_name (dynobj, ".got");
+
+            if (h != NULL)
+              {
+                bfd_vma off;
+
+                off = h->got.offset;
+                BFD_ASSERT (off != (bfd_vma) -1);
+
+                if (! elf_hash_table (info)->dynamic_sections_created
+                     || SYMBOL_REFERENCES_LOCAL (info, h))
+                    /* This is actually a static link, or it is a
+                       -Bsymbolic link and the symbol is defined
+                       locally, or the symbol was forced to be local
+                       because of a version file.  We must initialize
+                       this entry in the global offset table. 
+                       When doing a dynamic link, we create a .rela.got
+                       relocation entry to initialize the value.  This
+                       is done in the finish_dynamic_symbol routine.  */
+                  bfd_put_32 (output_bfd, Rvalue, sgot->contents + off);
+
+                  Rvalue = sgot->output_offset + off;
+                }
+              else
+                {
+                   bfd_vma off;
+
+                   off = elf_local_got_offsets (input_bfd)[symndx];
+                   bfd_put_32 (output_bfd,Rvalue, sgot->contents + off);
+
+                   Rvalue = sgot->output_offset + off;
+                }
+
+             Rvalue += addend;
+
+             /* REVISIT: if ((long) Rvalue > 0xffffff || 
+                                    (long) Rvalue < -0x800000).  */
+             if ((long) Rvalue > 0xffffff || (long) Rvalue < 0)
+               return bfd_reloc_overflow;
+
+
+             bfd_put_16 (input_bfd, (bfd_get_16 (input_bfd, hit_data))
+                         | (((Rvalue >> 16) & 0xf) << 8), hit_data);
+             bfd_put_16 (input_bfd, (Rvalue) & 0xffff, hit_data + 2);
+
+          }
+        else if (r_type == R_CR16_GOTC_REGREL20)
+          {
+             asection * sgot;
+             sgot = bfd_get_section_by_name (dynobj, ".got");
+
+             if (h != NULL)
+               {
+                 bfd_vma off;
+
+                 off = h->got.offset;
+                 BFD_ASSERT (off != (bfd_vma) -1);
+
+                  Rvalue >>=1; /* For code symbols.  */
+
+                 if (! elf_hash_table (info)->dynamic_sections_created
+                      || SYMBOL_REFERENCES_LOCAL (info, h))
+                 /* This is actually a static link, or it is a
+                    -Bsymbolic link and the symbol is defined
+                     locally, or the symbol was forced to be local
+                     because of a version file.  We must initialize
+                     this entry in the global offset table. 
+                     When doing a dynamic link, we create a .rela.got
+                     relocation entry to initialize the value.  This
+                     is done in the finish_dynamic_symbol routine.  */
+                  bfd_put_32 (output_bfd, Rvalue, sgot->contents + off);
+
+                  Rvalue = sgot->output_offset + off;
+               }
+             else
+               {
+                  bfd_vma off;
+
+                  off = elf_local_got_offsets (input_bfd)[symndx];
+                  Rvalue >>= 1;
+                  bfd_put_32 (output_bfd,Rvalue, sgot->contents + off);
+                  Rvalue = sgot->output_offset + off;
+               }
+
+             Rvalue += addend;
+
+             /* Check if any value in DISP.  */
+             Rvalue1 =((bfd_get_32 (input_bfd, hit_data) >>16)
+                       | (((bfd_get_32 (input_bfd, hit_data) & 0xfff) >> 8) <<16));
+
+             /* Add or subtract the offset value.  */
+             if (Rvalue1 & 0x80000)
+               Rvalue -= (~Rvalue1 + 1) & 0xfffff;
+             else
+               Rvalue += Rvalue1;
+
+              /* Check for range.  */
+             /* REVISIT: if ((long) Rvalue > 0xffffff 
+                             || (long) Rvalue < -0x800000).  */
+             if ((long) Rvalue > 0xffffff || (long) Rvalue < 0)
+               return bfd_reloc_overflow;
+
+             bfd_put_16 (input_bfd, (bfd_get_16 (input_bfd, hit_data))
+                         | (((Rvalue >> 16) & 0xf) << 8), hit_data);
+             bfd_put_16 (input_bfd, (Rvalue) & 0xffff, hit_data + 2);
+          }
+        else
+          {
+             if (r_type == R_CR16_ABS24)
+               {
+                  Rvalue1 = ((bfd_get_32 (input_bfd, hit_data) >> 16)
+                             | (((bfd_get_32 (input_bfd, hit_data) & 0xfff) >> 8) <<16)
+                             | (((bfd_get_32 (input_bfd, hit_data) & 0xf) <<20)));
+
+                  /* Add or subtract the offset value.  */
+                  if (Rvalue1 & 0x800000)
+                    Rvalue -= (~Rvalue1 + 1) & 0xffffff;
+                  else
+                    Rvalue += Rvalue1;
+
+                 /* Check for Range.  */
+                 if ((long) Rvalue > 0xffffff || (long) Rvalue < 0x0)
+                   return bfd_reloc_overflow;
+
+                 Rvalue = ((((Rvalue >> 20) & 0xf) | (((Rvalue >> 16) & 0xf)<<8)
+                           | (bfd_get_32 (input_bfd, hit_data) & 0xf0f0))
+                           | ((Rvalue & 0xffff) << 16));
+               }
+             else if (r_type == R_CR16_DISP24)
+               {
+                  Rvalue = ((((Rvalue >> 20)& 0xf) | (((Rvalue >>16) & 0xf)<<8)
+                            | (bfd_get_16 (input_bfd, hit_data)))
+                            | (((Rvalue & 0xfffe) | ((Rvalue >> 24) & 0x1)) << 16));
+               }
+             else if ((r_type == R_CR16_IMM32) || (r_type == R_CR16_IMM32a))
+               {
+                  Rvalue1 =((((bfd_get_32 (input_bfd, hit_data)) >> 16) &0xffff)
+                            | (((bfd_get_32 (input_bfd, hit_data)) &0xffff)) << 16);
+
+                 /* Add or subtract the offset value.  */
+                 if (Rvalue1 & 0x80000000)
+                   Rvalue -= (~Rvalue1 + 1) & 0xffffffff;
+                 else
+                   Rvalue += Rvalue1;
+
+                 /* Check for range.  */
+                 if (Rvalue > 0xffffffff || (long) Rvalue < 0x0)
+                   return bfd_reloc_overflow;
+
+                 Rvalue = (((Rvalue >> 16)& 0xffff) | (Rvalue & 0xffff) << 16);
+               }
+             else if (r_type == R_CR16_DISP24a)
+               {
+                  Rvalue = (((Rvalue & 0xfffffe) | (Rvalue >> 23)));
+                  Rvalue = ((Rvalue >> 16) & 0xff) | ((Rvalue & 0xffff) << 16)
+                            | (bfd_get_32 (input_bfd, hit_data));
+               }
+             else if ((r_type == R_CR16_REGREL20)
+                      || (r_type == R_CR16_REGREL20a))
+               {
+                  Rvalue1 = ((bfd_get_32 (input_bfd, hit_data) >> 16)
+                             | (((bfd_get_32 (input_bfd, hit_data) & 0xfff) >> 8) <<16));
+                  /* Add or subtract the offset value.  */
+                  if (Rvalue1 & 0x80000)
+                     Rvalue -= (~Rvalue1 + 1) & 0xfffff;
+                  else
+                     Rvalue += Rvalue1;
+
+                  /* Check for range.  */
+                  if ((long) Rvalue > 0xfffff || (long) Rvalue < 0x0)
+                    return bfd_reloc_overflow;
+
+                  Rvalue = (((((Rvalue >> 20)& 0xf) | (((Rvalue >>16) & 0xf)<<8)
+                            | ((Rvalue & 0xffff) << 16)))
+                            | (bfd_get_32 (input_bfd, hit_data) & 0xf0ff));
+
+              }
+            else if (r_type == R_CR16_NUM32)
+              {
+                 Rvalue1 = (bfd_get_32 (input_bfd, hit_data)); 
+
+                 /* Add or subtract the offset value */
+                 if (Rvalue1 & 0x80000000)
+                   Rvalue -= (~Rvalue1 + 1) & 0xffffffff;
+                 else
+                   Rvalue += Rvalue1;
+
+                /* Check for Ranga */
+                if (Rvalue > 0xffffffff)
+                  return bfd_reloc_overflow;
+              }
+
+            bfd_put_32 (input_bfd, Rvalue, hit_data);
+          }
+        break;
+
+      default:
+        return bfd_reloc_notsupported;
+    }
+
+  return bfd_reloc_ok;
+}
+
+/* Delete some bytes from a section while relaxing.  */
+
+static bfd_boolean
+elf32_cr16_relax_delete_bytes (struct bfd_link_info *link_info, bfd *abfd,
+                               asection *sec, bfd_vma addr, int count)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  unsigned int sec_shndx;
+  bfd_byte *contents;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_vma toaddr;
+  Elf_Internal_Sym *isym;
+  Elf_Internal_Sym *isymend;
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_link_hash_entry **end_hashes;
+  struct elf_link_hash_entry **start_hashes;
+  unsigned int symcount;
+
+  sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+  contents = elf_section_data (sec)->this_hdr.contents;
+
+  toaddr = sec->size;
+
+  irel = elf_section_data (sec)->relocs;
+  irelend = irel + sec->reloc_count;
+
+  /* Actually delete the bytes.  */
+  memmove (contents + addr, contents + addr + count,
+           (size_t) (toaddr - addr - count));
+  sec->size -= count;
+
+  /* Adjust all the relocs.  */
+  for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
+    /* Get the new reloc address.  */
+    if ((irel->r_offset > addr && irel->r_offset < toaddr))
+        irel->r_offset -= count;
+
+  /* Adjust the local symbols defined in this section.  */
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  isym = (Elf_Internal_Sym *) symtab_hdr->contents;
+  for (isymend = isym + symtab_hdr->sh_info; isym < isymend; isym++)
+    {
+      if (isym->st_shndx == sec_shndx
+          && isym->st_value > addr
+          && isym->st_value < toaddr)
+        {
+          /* Adjust the addend of SWITCH relocations in this section,
+             which reference this local symbol.  */
+#if 0
+          for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
+            {
+              unsigned long r_symndx;
+              Elf_Internal_Sym *rsym;
+              bfd_vma addsym, subsym;
+
+              /* Skip if not a SWITCH relocation.  */
+              if (ELF32_R_TYPE (irel->r_info) != (int) R_CR16_SWITCH8
+                  && ELF32_R_TYPE (irel->r_info) != (int) R_CR16_SWITCH16
+                  && ELF32_R_TYPE (irel->r_info) != (int) R_CR16_SWITCH32)
+                 continue;
+        
+              r_symndx = ELF32_R_SYM (irel->r_info);
+              rsym = (Elf_Internal_Sym *) symtab_hdr->contents + r_symndx;
+
+              /* Skip if not the local adjusted symbol.  */
+              if (rsym != isym)
+                continue;
+
+              addsym = isym->st_value;
+              subsym = addsym - irel->r_addend;
+
+              /* Fix the addend only when -->> (addsym > addr >= subsym).  */
+              if (subsym <= addr)
+                irel->r_addend -= count;
+              else
+                continue;
+            }
+#endif
+
+          isym->st_value -= count;
+        }
+    }
+
+  /* Now adjust the global symbols defined in this section.  */
+  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+               - symtab_hdr->sh_info);
+  sym_hashes = start_hashes = elf_sym_hashes (abfd);
+  end_hashes = sym_hashes + symcount;
+
+  for (; sym_hashes < end_hashes; sym_hashes++)
+    {
+      struct elf_link_hash_entry *sym_hash = *sym_hashes;
+
+      /* The '--wrap SYMBOL' option is causing a pain when the object file,
+         containing the definition of __wrap_SYMBOL, includes a direct
+         call to SYMBOL as well. Since both __wrap_SYMBOL and SYMBOL reference
+         the same symbol (which is __wrap_SYMBOL), but still exist as two
+         different symbols in 'sym_hashes', we don't want to adjust
+         the global symbol __wrap_SYMBOL twice.
+         This check is only relevant when symbols are being wrapped.  */
+      if (link_info->wrap_hash != NULL)
+        {
+          struct elf_link_hash_entry **cur_sym_hashes;
+
+          /* Loop only over the symbols whom been already checked.  */
+          for (cur_sym_hashes = start_hashes; cur_sym_hashes < sym_hashes;
+               cur_sym_hashes++)
+            /* If the current symbol is identical to 'sym_hash', that means
+               the symbol was already adjusted (or at least checked).  */
+            if (*cur_sym_hashes == sym_hash)
+              break;
+
+          /* Don't adjust the symbol again.  */
+          if (cur_sym_hashes < sym_hashes)
+            continue;
+        }
+
+      if ((sym_hash->root.type == bfd_link_hash_defined
+          || sym_hash->root.type == bfd_link_hash_defweak)
+          && sym_hash->root.u.def.section == sec
+          && sym_hash->root.u.def.value > addr
+          && sym_hash->root.u.def.value < toaddr)
+        sym_hash->root.u.def.value -= count;
+    }
+
+  return TRUE;
+}
+
+/* Relocate a CR16 ELF section.  */
+
+static bfd_boolean
+elf32_cr16_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
+                             bfd *input_bfd, asection *input_section,
+                             bfd_byte *contents, Elf_Internal_Rela *relocs,
+                             Elf_Internal_Sym *local_syms,
+                             asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel, *relend;
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+      howto = cr16_elf_howto_table + (r_type);
+
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      if (r_symndx < symtab_hdr->sh_info)
+        {
+          sym = local_syms + r_symndx;
+          sec = local_sections[r_symndx];
+          relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+        }
+      else
+        {
+          bfd_boolean unresolved_reloc, warned;
+
+          RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+                                   r_symndx, symtab_hdr, sym_hashes,
+                                   h, sec, relocation,
+                                   unresolved_reloc, warned);
+        }
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+        continue;
+
+      r = cr16_elf_final_link_relocate (howto, input_bfd, output_bfd,
+                                        input_section,
+                                        contents, rel->r_offset,
+                                        relocation, rel->r_addend,
+                                        (struct elf_link_hash_entry *) h,
+                                        r_symndx,
+                                        info, sec, h == NULL);
+
+      if (r != bfd_reloc_ok)
+        {
+          const char *name;
+          const char *msg = NULL;
+
+          if (h != NULL)
+            name = h->root.root.string;
+          else
+            {
+              name = (bfd_elf_string_from_elf_section
+                      (input_bfd, symtab_hdr->sh_link, sym->st_name));
+              if (name == NULL || *name == '\0')
+                name = bfd_section_name (input_bfd, sec);
+            }
+
+          switch (r)
+            {
+             case bfd_reloc_overflow:
+               if (!((*info->callbacks->reloc_overflow)
+                     (info, (h ? &h->root : NULL), name, howto->name,
+                      (bfd_vma) 0, input_bfd, input_section,
+                      rel->r_offset)))
+                 return FALSE;
+               break;
+
+             case bfd_reloc_undefined:
+               if (!((*info->callbacks->undefined_symbol)
+                     (info, name, input_bfd, input_section,
+                      rel->r_offset, TRUE)))
+                 return FALSE;
+               break;
+
+             case bfd_reloc_outofrange:
+               msg = _("internal error: out of range error");
+               goto common_error;
+
+             case bfd_reloc_notsupported:
+               msg = _("internal error: unsupported relocation error");
+               goto common_error;
+
+             case bfd_reloc_dangerous:
+               msg = _("internal error: dangerous error");
+               goto common_error;
+
+             default:
+               msg = _("internal error: unknown error");
+               /* Fall through.  */
+
+             common_error:
+               if (!((*info->callbacks->warning)
+                     (info, msg, name, input_bfd, input_section,
+                      rel->r_offset)))
+                 return FALSE;
+               break;
+            }
+        }
+    }
+
+  return TRUE;
+}
+
+/* This is a version of bfd_generic_get_relocated_section_contents
+   which uses elf32_cr16_relocate_section.  */
+
+static bfd_byte *
+elf32_cr16_get_relocated_section_contents (bfd *output_bfd,
+                                           struct bfd_link_info *link_info,
+                                           struct bfd_link_order *link_order,
+                                           bfd_byte *data,
+                                           bfd_boolean relocatable,
+                                           asymbol **symbols)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  asection *input_section = link_order->u.indirect.section;
+  bfd *input_bfd = input_section->owner;
+  asection **sections = NULL;
+  Elf_Internal_Rela *internal_relocs = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+
+  /* We only need to handle the case of relaxing, or of having a
+     particular set of section contents, specially.  */
+  if (relocatable
+      || elf_section_data (input_section)->this_hdr.contents == NULL)
+    return bfd_generic_get_relocated_section_contents (output_bfd, link_info,
+                                                       link_order, data,
+                                                       relocatable,
+                                                       symbols);
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+
+  memcpy (data, elf_section_data (input_section)->this_hdr.contents,
+          (size_t) input_section->size);
+
+  if ((input_section->flags & SEC_RELOC) != 0
+      && input_section->reloc_count > 0)
+    {
+      Elf_Internal_Sym *isym;
+      Elf_Internal_Sym *isymend;
+      asection **secpp;
+      bfd_size_type amt;
+
+      internal_relocs = _bfd_elf_link_read_relocs (input_bfd, input_section,
+                                                   NULL, NULL, FALSE);
+      if (internal_relocs == NULL)
+        goto error_return;
+
+      if (symtab_hdr->sh_info != 0)
+        {
+          isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+          if (isymbuf == NULL)
+            isymbuf = bfd_elf_get_elf_syms (input_bfd, symtab_hdr,
+                                            symtab_hdr->sh_info, 0,
+                                            NULL, NULL, NULL);
+          if (isymbuf == NULL)
+            goto error_return;
+        }
+
+      amt = symtab_hdr->sh_info;
+      amt *= sizeof (asection *);
+      sections = bfd_malloc (amt);
+      if (sections == NULL && amt != 0)
+        goto error_return;
+
+      isymend = isymbuf + symtab_hdr->sh_info;
+      for (isym = isymbuf, secpp = sections; isym < isymend; ++isym, ++secpp)
+        {
+          asection *isec;
+
+          if (isym->st_shndx == SHN_UNDEF)
+            isec = bfd_und_section_ptr;
+          else if (isym->st_shndx == SHN_ABS)
+            isec = bfd_abs_section_ptr;
+          else if (isym->st_shndx == SHN_COMMON)
+            isec = bfd_com_section_ptr;
+          else
+            isec = bfd_section_from_elf_index (input_bfd, isym->st_shndx);
+
+          *secpp = isec;
+        }
+
+      if (! elf32_cr16_relocate_section (output_bfd, link_info, input_bfd,
+                                     input_section, data, internal_relocs,
+                                     isymbuf, sections))
+        goto error_return;
+
+      if (sections != NULL)
+        free (sections);
+      if (isymbuf != NULL
+          && symtab_hdr->contents != (unsigned char *) isymbuf)
+        free (isymbuf);
+      if (elf_section_data (input_section)->relocs != internal_relocs)
+        free (internal_relocs);
+    }
+
+  return data;
+
+ error_return:
+  if (sections != NULL)
+    free (sections);
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (internal_relocs != NULL
+      && elf_section_data (input_section)->relocs != internal_relocs)
+    free (internal_relocs);
+  return NULL;
+}
+
+/* Assorted hash table functions.  */
+
+/* Initialize an entry in the link hash table.  */
+
+/* Create an entry in an CR16 ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+elf32_cr16_link_hash_newfunc (struct bfd_hash_entry *entry,
+                              struct bfd_hash_table *table,
+                              const char *string)
+{
+  struct elf32_cr16_link_hash_entry *ret =
+    (struct elf32_cr16_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == (struct elf32_cr16_link_hash_entry *) NULL)
+    ret = ((struct elf32_cr16_link_hash_entry *)
+           bfd_hash_allocate (table,
+                              sizeof (struct elf32_cr16_link_hash_entry)));
+  if (ret == (struct elf32_cr16_link_hash_entry *) NULL)
+    return (struct bfd_hash_entry *) ret;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct elf32_cr16_link_hash_entry *)
+         _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
+                                     table, string));
+  if (ret != (struct elf32_cr16_link_hash_entry *) NULL)
+    {
+      ret->direct_calls = 0;
+      ret->stack_size = 0;
+      ret->movm_args = 0;
+      ret->movm_stack_size = 0;
+      ret->flags = 0;
+      ret->value = 0;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Create an cr16 ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+elf32_cr16_link_hash_table_create (bfd *abfd)
+{
+  struct elf_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct elf_link_hash_table);
+
+  ret = (struct elf_link_hash_table *) bfd_malloc (amt);
+  if (ret == (struct elf_link_hash_table *) NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (ret, abfd,
+                                      elf32_cr16_link_hash_newfunc,
+                                      sizeof (struct elf32_cr16_link_hash_entry),
+				      GENERIC_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  return &ret->root;
+}
+
+/* Free an cr16 ELF linker hash table.  */
+
+static void
+elf32_cr16_link_hash_table_free (struct bfd_link_hash_table *hash)
+{
+  struct elf_link_hash_table *ret
+    = (struct elf_link_hash_table *) hash;
+
+  _bfd_generic_link_hash_table_free
+    ((struct bfd_link_hash_table *) ret);
+}
+
+static unsigned long
+elf_cr16_mach (flagword flags)
+{
+  switch (flags)
+    {
+      case EM_CR16:
+      default:
+      return bfd_mach_cr16;
+    }
+}
+
+/* The final processing done just before writing out a CR16 ELF object
+   file.  This gets the CR16 architecture right based on the machine
+   number.  */
+
+static void
+_bfd_cr16_elf_final_write_processing (bfd *abfd,
+                                      bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  unsigned long val;
+  switch (bfd_get_mach (abfd))
+    {
+     default:
+     case bfd_mach_cr16:
+        val = EM_CR16;
+        break;
+    }
+
+
+ elf_elfheader (abfd)->e_flags |= val;
+}
+
+
+static bfd_boolean
+_bfd_cr16_elf_object_p (bfd *abfd)
+{
+  bfd_default_set_arch_mach (abfd, bfd_arch_cr16,
+                             elf_cr16_mach (elf_elfheader (abfd)->e_flags));
+  return TRUE;
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+
+static bfd_boolean
+_bfd_cr16_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
+      && bfd_get_mach (obfd) < bfd_get_mach (ibfd))
+    {
+      if (! bfd_set_arch_mach (obfd, bfd_get_arch (ibfd),
+                               bfd_get_mach (ibfd)))
+         return FALSE;
+     }
+
+  return TRUE;
+}
+
+
+/* This function handles relaxing for the CR16.
+
+   There's quite a few relaxing opportunites available on the CR16:
+
+        * bcond:24 -> bcond:16                                1 byte
+        * bcond:16 -> bcond:8                                 1 byte
+        * arithmetic imm32 -> arithmetic imm20                12 bits
+        * arithmetic imm20/imm16 -> arithmetic imm4           12/16 bits
+
+   Symbol- and reloc-reading infrastructure copied from elf-m10200.c.  */
+
+static bfd_boolean
+elf32_cr16_relax_section (bfd *abfd, asection *sec,
+                          struct bfd_link_info *link_info, bfd_boolean *again)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *internal_relocs;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_byte *contents = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+
+  /* Assume nothing changes.  */
+  *again = FALSE;
+
+  /* We don't have to do anything for a relocatable link, if
+     this section does not have relocs, or if this is not a
+     code section.  */
+  if (link_info->relocatable
+      || (sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0
+      || (sec->flags & SEC_CODE) == 0)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+
+  /* Get a copy of the native relocations.  */
+  internal_relocs = _bfd_elf_link_read_relocs (abfd, sec, NULL, NULL,
+                                               link_info->keep_memory);
+  if (internal_relocs == NULL)
+    goto error_return;
+
+  /* Walk through them looking for relaxing opportunities.  */
+  irelend = internal_relocs + sec->reloc_count;
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      bfd_vma symval;
+
+      /* If this isn't something that can be relaxed, then ignore
+         this reloc.  */
+      if (ELF32_R_TYPE (irel->r_info) != (int) R_CR16_DISP16
+          && ELF32_R_TYPE (irel->r_info) != (int) R_CR16_DISP24
+          && ELF32_R_TYPE (irel->r_info) != (int) R_CR16_IMM32
+          && ELF32_R_TYPE (irel->r_info) != (int) R_CR16_IMM20
+          && ELF32_R_TYPE (irel->r_info) != (int) R_CR16_IMM16)
+        continue;
+
+      /* Get the section contents if we haven't done so already.  */
+      if (contents == NULL)
+        {
+          /* Get cached copy if it exists.  */
+          if (elf_section_data (sec)->this_hdr.contents != NULL)
+            contents = elf_section_data (sec)->this_hdr.contents;
+          /* Go get them off disk.  */
+          else if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+            goto error_return;
+        }
+
+      /* Read this BFD's local symbols if we haven't done so already.  */
+      if (isymbuf == NULL && symtab_hdr->sh_info != 0)
+        {
+          isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+          if (isymbuf == NULL)
+            isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+                                            symtab_hdr->sh_info, 0,
+                                            NULL, NULL, NULL);
+          if (isymbuf == NULL)
+            goto error_return;
+        }
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+        {
+          /* A local symbol.  */
+          Elf_Internal_Sym *isym;
+          asection *sym_sec;
+
+          isym = isymbuf + ELF32_R_SYM (irel->r_info);
+          if (isym->st_shndx == SHN_UNDEF)
+            sym_sec = bfd_und_section_ptr;
+          else if (isym->st_shndx == SHN_ABS)
+            sym_sec = bfd_abs_section_ptr;
+          else if (isym->st_shndx == SHN_COMMON)
+            sym_sec = bfd_com_section_ptr;
+          else
+            sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+          symval = (isym->st_value
+                    + sym_sec->output_section->vma
+                    + sym_sec->output_offset);
+        }
+      else
+        {
+          unsigned long indx;
+          struct elf_link_hash_entry *h;
+
+          /* An external symbol.  */
+          indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+          h = elf_sym_hashes (abfd)[indx];
+          BFD_ASSERT (h != NULL);
+
+          if (h->root.type != bfd_link_hash_defined
+              && h->root.type != bfd_link_hash_defweak)
+            /* This appears to be a reference to an undefined
+               symbol.  Just ignore it--it will be caught by the
+               regular reloc processing.  */
+            continue;
+
+          symval = (h->root.u.def.value
+                    + h->root.u.def.section->output_section->vma
+                    + h->root.u.def.section->output_offset);
+        }
+
+      /* For simplicity of coding, we are going to modify the section
+         contents, the section relocs, and the BFD symbol table.  We
+         must tell the rest of the code not to free up this
+         information.  It would be possible to instead create a table
+         of changes which have to be made, as is done in coff-mips.c;
+         that would be more work, but would require less memory when
+         the linker is run.  */
+
+      /* Try to turn a 24  branch/call into a 16bit relative
+         branch/call.  */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_CR16_DISP24)
+        {
+          bfd_vma value = symval;
+
+          /* Deal with pc-relative gunk.  */
+          value -= (sec->output_section->vma + sec->output_offset);
+          value -= irel->r_offset;
+          value += irel->r_addend;
+
+          /* See if the value will fit in 16 bits, note the high value is
+             0xfffe + 2 as the target will be two bytes closer if we are
+             able to relax.  */
+          if ((long) value < 0x10000 && (long) value > -0x10002)
+            {
+              unsigned int code;
+
+              /* Get the opcode.  */
+              code = (unsigned int) bfd_get_32 (abfd, contents + irel->r_offset);
+
+              /* Verify it's a 'bcond' and fix the opcode.  */
+              if ((code  & 0xffff) == 0x0010)
+                bfd_put_16 (abfd, 0x1800 | ((0xf & (code >> 20)) << 4), contents + irel->r_offset);
+              else
+                continue;
+
+              /* Note that we've changed the relocs, section contents, etc.  */
+              elf_section_data (sec)->relocs = internal_relocs;
+              elf_section_data (sec)->this_hdr.contents = contents;
+              symtab_hdr->contents = (unsigned char *) isymbuf;
+
+              /* Fix the relocation's type.  */
+              irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                           R_CR16_DISP16);
+
+              /* Delete two bytes of data.  */
+              if (!elf32_cr16_relax_delete_bytes (link_info, abfd, sec,
+                                                   irel->r_offset + 2, 2))
+                goto error_return;
+
+              /* That will change things, so, we should relax again.
+                 Note that this is not required, and it may be slow.  */
+              *again = TRUE;
+            }
+        }
+
+      /* Try to turn a 16bit pc-relative branch into an
+         8bit pc-relative branch.  */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_CR16_DISP16)
+        {
+          bfd_vma value = symval;
+
+          /* Deal with pc-relative gunk.  */
+          value -= (sec->output_section->vma + sec->output_offset);
+          value -= irel->r_offset;
+          value += irel->r_addend;
+
+          /* See if the value will fit in 8 bits, note the high value is
+             0xfc + 2 as the target will be two bytes closer if we are
+             able to relax.  */
+          /*if ((long) value < 0x1fa && (long) value > -0x100) REVISIT:range */
+          if ((long) value < 0xfa && (long) value > -0x100)
+            {
+              unsigned short code;
+
+              /* Get the opcode.  */
+              code = (unsigned short) bfd_get_16 (abfd, contents + irel->r_offset);
+
+              /* Verify it's a 'bcond' and fix the opcode.  */
+              if ((code & 0xff0f) == 0x1800)
+                bfd_put_16 (abfd, (code & 0xf0f0), contents + irel->r_offset);
+              else
+                continue;
+
+              /* Note that we've changed the relocs, section contents, etc.  */
+              elf_section_data (sec)->relocs = internal_relocs;
+              elf_section_data (sec)->this_hdr.contents = contents;
+              symtab_hdr->contents = (unsigned char *) isymbuf;
+
+              /* Fix the relocation's type.  */
+              irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                           R_CR16_DISP8);
+
+              /* Delete two bytes of data.  */
+              if (!elf32_cr16_relax_delete_bytes (link_info, abfd, sec,
+                                                   irel->r_offset + 2, 2))
+                goto error_return;
+
+              /* That will change things, so, we should relax again.
+                 Note that this is not required, and it may be slow.  */
+              *again = TRUE;
+            }
+        }
+
+      /* Try to turn a 32-bit IMM address into a 20/16-bit IMM address */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_CR16_IMM32)
+        {
+          bfd_vma value = symval;
+          unsigned short is_add_mov = 0;
+          bfd_vma value1 = 0;
+          
+          /* Get the existing value from the mcode */
+          value1 = ((bfd_get_32 (abfd, contents + irel->r_offset + 2) >> 16)
+                   |(((bfd_get_32 (abfd, contents + irel->r_offset + 2) & 0xffff) << 16)));
+
+          /* See if the value will fit in 20 bits.  */
+          if ((long) (value + value1) < 0xfffff && (long) (value + value1) > 0)
+            {
+              unsigned short code;
+
+              /* Get the opcode.  */
+              code = (unsigned short) bfd_get_16 (abfd, contents + irel->r_offset);
+
+              /* Verify it's a 'arithmetic ADDD or MOVD instruction'.
+                 For ADDD and MOVD only, convert to IMM32 -> IMM20.  */
+     
+              if (((code & 0xfff0) == 0x0070) || ((code & 0xfff0) == 0x0020))
+                 is_add_mov = 1;
+
+              if (is_add_mov)
+                {
+                  /* Note that we've changed the relocs, section contents,
+                     etc.  */
+                  elf_section_data (sec)->relocs = internal_relocs;
+                  elf_section_data (sec)->this_hdr.contents = contents;
+                  symtab_hdr->contents = (unsigned char *) isymbuf;
+
+                  /* Fix the opcode.  */
+                  if ((code & 0xfff0) == 0x0070) /* For movd.  */
+                    bfd_put_8 (abfd, 0x05, contents + irel->r_offset + 1);
+                  else                           /* code == 0x0020 for addd.  */
+                    bfd_put_8 (abfd, 0x04, contents + irel->r_offset + 1);
+
+                  bfd_put_8 (abfd, (code & 0xf) << 4, contents + irel->r_offset);
+
+                  /* If existing value is nagavive adjust approriately 
+                     place the 16-20bits (ie 4 bit) in new opcode,
+                     as the 0xffffxxxx, the higher 2 byte values removed. */
+                  if (value1 & 0x80000000)
+                    bfd_put_8 (abfd, (0x0f | (bfd_get_8(abfd, contents + irel->r_offset))), contents + irel->r_offset);
+                  else
+                    bfd_put_8 (abfd, (((value1 >> 16)&0xf) | (bfd_get_8(abfd, contents + irel->r_offset))), contents + irel->r_offset);
+
+                  /* Fix the relocation's type.  */
+                  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                               R_CR16_IMM20);
+
+                  /* Delete two bytes of data.  */
+                  if (!elf32_cr16_relax_delete_bytes (link_info, abfd, sec,
+                                                      irel->r_offset + 2, 2))
+                    goto error_return;
+
+                  /* That will change things, so, we should relax again.
+                     Note that this is not required, and it may be slow.  */
+                  *again = TRUE;
+                }
+            }
+
+          /* See if the value will fit in 16 bits.  */
+          if ((!is_add_mov) 
+              && ((long)(value + value1) < 0x7fff && (long)(value + value1) > 0))
+            {
+              unsigned short code;
+
+              /* Get the opcode.  */
+              code = (unsigned short) bfd_get_16 (abfd, contents + irel->r_offset);
+
+              /* Note that we've changed the relocs, section contents, etc.  */
+              elf_section_data (sec)->relocs = internal_relocs;
+              elf_section_data (sec)->this_hdr.contents = contents;
+              symtab_hdr->contents = (unsigned char *) isymbuf;
+
+              /* Fix the opcode.  */
+              if ((code & 0xf0) == 0x70)          /* For movd.  */
+                bfd_put_8 (abfd, 0x54, contents + irel->r_offset + 1);
+              else if ((code & 0xf0) == 0x20)     /* For addd.  */
+                bfd_put_8 (abfd, 0x60, contents + irel->r_offset + 1);
+              else if ((code & 0xf0) == 0x90)     /* For cmpd.  */
+                bfd_put_8 (abfd, 0x56, contents + irel->r_offset + 1);
+              else
+                continue;
+
+              bfd_put_8 (abfd, 0xb0 | (code & 0xf), contents + irel->r_offset);
+
+              /* If existing value is nagavive adjust approriately 
+                 place the 12-16bits (ie 4 bit) in new opcode,
+                 as the 0xfffffxxx, the higher 2 byte values removed. */
+              if (value1 & 0x80000000)
+                bfd_put_8 (abfd, (0x0f | (bfd_get_8(abfd, contents + irel->r_offset))), contents + irel->r_offset);
+              else
+                bfd_put_16 (abfd, value1, contents + irel->r_offset + 2);
+
+
+              /* Fix the relocation's type.  */
+              irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                           R_CR16_IMM16);
+
+              /* Delete two bytes of data.  */
+              if (!elf32_cr16_relax_delete_bytes (link_info, abfd, sec,
+                                                  irel->r_offset + 2, 2))
+                goto error_return;
+
+              /* That will change things, so, we should relax again.
+                 Note that this is not required, and it may be slow.  */
+              *again = TRUE;
+            }
+        }
+
+#if 0
+      /* Try to turn a 16bit immediate address into a 4bit
+         immediate address.  */
+      if ((ELF32_R_TYPE (irel->r_info) == (int) R_CR16_IMM20) 
+          || (ELF32_R_TYPE (irel->r_info) == (int) R_CR16_IMM16))
+        {
+          bfd_vma value = symval;
+          bfd_vma value1 = 0;
+
+          /* Get the existing value from the mcode */
+          value1 = ((bfd_get_16 (abfd, contents + irel->r_offset + 2) & 0xffff));
+
+          if (ELF32_R_TYPE (irel->r_info) == (int) R_CR16_IMM20)
+            {
+              value1 |= ((bfd_get_16 (abfd, contents + irel->r_offset + 1) & 0xf000) << 0x4);
+            }
+
+          /* See if the value will fit in 4 bits.  */
+          if ((((long) (value + value1)) < 0xf)
+              && (((long) (value + value1)) > 0))
+            {
+              unsigned short code;
+
+              /* Get the opcode.  */
+              code = (unsigned short) bfd_get_16 (abfd, contents + irel->r_offset);
+
+              /* Note that we've changed the relocs, section contents, etc.  */
+              elf_section_data (sec)->relocs = internal_relocs;
+              elf_section_data (sec)->this_hdr.contents = contents;
+              symtab_hdr->contents = (unsigned char *) isymbuf;
+
+              /* Fix the opcode.  */
+              if (((code & 0x0f00) == 0x0400) || ((code & 0x0f00) == 0x0500))
+                {
+                  if ((code & 0x0f00) == 0x0400)      /* For movd imm20.  */
+                    bfd_put_8 (abfd, 0x60, contents + irel->r_offset);
+                  else                                /* For addd imm20.  */
+                    bfd_put_8 (abfd, 0x54, contents + irel->r_offset);
+                  bfd_put_8 (abfd, (code & 0xf0) >> 4, contents + irel->r_offset + 1);
+                }
+              else
+                {
+                  if ((code & 0xfff0) == 0x56b0)       /*  For cmpd imm16.  */
+                    bfd_put_8 (abfd, 0x56, contents + irel->r_offset);
+                  else if ((code & 0xfff0) == 0x54b0)  /*  For movd imm16.  */
+                    bfd_put_8 (abfd, 0x54, contents + irel->r_offset);
+                  else if ((code & 0xfff0) == 0x58b0)  /*  For movb imm16.  */
+                    bfd_put_8 (abfd, 0x58, contents + irel->r_offset);
+                  else if ((code & 0xfff0) == 0x5Ab0)  /*  For movw imm16.  */
+                    bfd_put_8 (abfd, 0x5A, contents + irel->r_offset);
+                  else if ((code & 0xfff0) == 0x60b0)  /*  For addd imm16.  */
+                    bfd_put_8 (abfd, 0x60, contents + irel->r_offset);
+                  else if ((code & 0xfff0) == 0x30b0)  /*  For addb imm16.  */
+                    bfd_put_8 (abfd, 0x30, contents + irel->r_offset);
+                  else if ((code & 0xfff0) == 0x2Cb0)  /*  For addub imm16.  */
+                    bfd_put_8 (abfd, 0x2C, contents + irel->r_offset);
+                  else if ((code & 0xfff0) == 0x32b0)  /*  For adduw imm16.  */
+                    bfd_put_8 (abfd, 0x32, contents + irel->r_offset);
+                  else if ((code & 0xfff0) == 0x38b0)  /*  For subb imm16.  */
+                    bfd_put_8 (abfd, 0x38, contents + irel->r_offset);
+                  else if ((code & 0xfff0) == 0x3Cb0)  /*  For subcb imm16.  */
+                    bfd_put_8 (abfd, 0x3C, contents + irel->r_offset);
+                  else if ((code & 0xfff0) == 0x3Fb0)  /*  For subcw imm16.  */
+                    bfd_put_8 (abfd, 0x3F, contents + irel->r_offset);
+                  else if ((code & 0xfff0) == 0x3Ab0)  /*  For subw imm16.  */
+                    bfd_put_8 (abfd, 0x3A, contents + irel->r_offset);
+                  else if ((code & 0xfff0) == 0x50b0)  /*  For cmpb imm16.  */
+                    bfd_put_8 (abfd, 0x50, contents + irel->r_offset);
+                  else if ((code & 0xfff0) == 0x52b0)  /*  For cmpw imm16.  */
+                    bfd_put_8 (abfd, 0x52, contents + irel->r_offset);
+                  else
+                    continue;
+
+                  bfd_put_8 (abfd, (code & 0xf), contents + irel->r_offset + 1);
+                }
+
+              /* Fix the relocation's type.  */
+              irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                           R_CR16_IMM4);
+
+              /* Delete two bytes of data.  */
+              if (!elf32_cr16_relax_delete_bytes (link_info, abfd, sec,
+                                                  irel->r_offset + 2, 2))
+                goto error_return;
+
+              /* That will change things, so, we should relax again.
+                 Note that this is not required, and it may be slow.  */
+              *again = TRUE;
+            }
+        }
+#endif
+    }
+
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    {
+      if (! link_info->keep_memory)
+        free (isymbuf);
+      else
+       /* Cache the symbols for elf_link_input_bfd.  */
+       symtab_hdr->contents = (unsigned char *) isymbuf;
+    }
+
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    {
+      if (! link_info->keep_memory)
+        free (contents);
+      else
+       /* Cache the section contents for elf_link_input_bfd.  */
+       elf_section_data (sec)->this_hdr.contents = contents;
+       
+    }
+
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return TRUE;
+
+ error_return:
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    free (contents);
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return FALSE;
+}
+
+static asection *
+elf32_cr16_gc_mark_hook (asection *sec,
+                         struct bfd_link_info *info,
+                         Elf_Internal_Rela *rel,
+                         struct elf_link_hash_entry *h,
+                         Elf_Internal_Sym *sym)
+{
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Update the got entry reference counts for the section being removed.  */
+
+static bfd_boolean
+elf32_cr16_gc_sweep_hook (bfd *abfd ATTRIBUTE_UNUSED,
+                          struct bfd_link_info *info ATTRIBUTE_UNUSED,
+                          asection *sec ATTRIBUTE_UNUSED,
+                          const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED)
+{
+  /* We don't support garbage collection of GOT and PLT relocs yet.  */
+  return TRUE;
+}
+
+/* Create dynamic sections when linking against a dynamic object.  */
+
+static bfd_boolean
+_bfd_cr16_elf_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  flagword   flags;
+  asection * s;
+  const struct elf_backend_data * bed = get_elf_backend_data (abfd);
+  int ptralign = 0;
+
+  switch (bed->s->arch_size)
+    {
+    case 16:
+      ptralign = 1;
+      break;
+
+    case 32:
+      ptralign = 2;
+      break;
+
+    default:
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  /* We need to create .plt, .rel[a].plt, .got, .got.plt, .dynbss, and
+     .rel[a].bss sections.  */
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+           | SEC_LINKER_CREATED);
+
+  s = bfd_make_section_with_flags (abfd,
+                                   (bed->default_use_rela_p
+                                    ? ".rela.plt" : ".rel.plt"),
+                                   flags | SEC_READONLY);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, ptralign))
+    return FALSE;
+
+  if (! _bfd_cr16_elf_create_got_section (abfd, info))
+    return FALSE;
+
+  {
+    const char * secname;
+    char *       relname;
+    flagword     secflags;
+    asection *   sec;
+
+    for (sec = abfd->sections; sec; sec = sec->next)
+      {
+        secflags = bfd_get_section_flags (abfd, sec);
+        if ((secflags & (SEC_DATA | SEC_LINKER_CREATED))
+            || ((secflags & SEC_HAS_CONTENTS) != SEC_HAS_CONTENTS))
+          continue;
+
+        secname = bfd_get_section_name (abfd, sec);
+        relname = (char *) bfd_malloc (strlen (secname) + 6);
+        strcpy (relname, ".rela");
+        strcat (relname, secname);
+
+        s = bfd_make_section_with_flags (abfd, relname,
+                                         flags | SEC_READONLY);
+        if (s == NULL
+            || ! bfd_set_section_alignment (abfd, s, ptralign))
+          return FALSE;
+      }
+  }
+
+  if (bed->want_dynbss)
+    {
+      /* The .dynbss section is a place to put symbols which are defined
+         by dynamic objects, are referenced by regular objects, and are
+         not functions.  We must allocate space for them in the process
+         image and use a R_*_COPY reloc to tell the dynamic linker to
+         initialize them at run time.  The linker script puts the .dynbss
+         section into the .bss section of the final image.  */
+      s = bfd_make_section_with_flags (abfd, ".dynbss",
+                                       SEC_ALLOC | SEC_LINKER_CREATED);
+      if (s == NULL)
+        return FALSE;
+
+      /* The .rel[a].bss section holds copy relocs.  This section is not
+         normally needed.  We need to create it here, though, so that the
+         linker will map it to an output section.  We can't just create it
+         only if we need it, because we will not know whether we need it
+         until we have seen all the input files, and the first time the
+         main linker code calls BFD after examining all the input files
+         (size_dynamic_sections) the input sections have already been
+         mapped to the output sections.  If the section turns out not to
+         be needed, we can discard it later.  We will never need this
+         section when generating a shared object, since they do not use
+         copy relocs.  */
+      if (! info->executable)
+        {
+          s = bfd_make_section_with_flags (abfd,
+                                           (bed->default_use_rela_p
+                                            ? ".rela.bss" : ".rel.bss"),
+                                           flags | SEC_READONLY);
+          if (s == NULL
+              || ! bfd_set_section_alignment (abfd, s, ptralign))
+            return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+_bfd_cr16_elf_adjust_dynamic_symbol (struct bfd_link_info * info,
+                                     struct elf_link_hash_entry * h)
+{
+  bfd * dynobj;
+  asection * s;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (dynobj != NULL
+              && (h->needs_plt
+                  || h->u.weakdef != NULL
+                  || (h->def_dynamic
+                      && h->ref_regular
+                      && !h->def_regular)));
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later,
+     when we know the address of the .got section.  */
+  if (h->type == STT_FUNC
+      || h->needs_plt)
+    {
+      if (! info->executable
+          && !h->def_dynamic
+          && !h->ref_dynamic)
+        {
+          /* This case can occur if we saw a PLT reloc in an input
+             file, but the symbol was never referred to by a dynamic
+             object.  In such a case, we don't actually need to build
+             a procedure linkage table, and we can just do a REL32
+             reloc instead.  */
+          BFD_ASSERT (h->needs_plt);
+          return TRUE;
+        }
+
+      /* Make sure this symbol is output as a dynamic symbol.  */
+      if (h->dynindx == -1)
+        {
+          if (! bfd_elf_link_record_dynamic_symbol (info, h))
+            return FALSE;
+        }
+
+      /* We also need to make an entry in the .got.plt section, which
+         will be placed in the .got section by the linker script.  */
+
+      s = bfd_get_section_by_name (dynobj, ".got.plt");
+      BFD_ASSERT (s != NULL);
+      s->size += 4;
+
+      /* We also need to make an entry in the .rela.plt section.  */
+
+      s = bfd_get_section_by_name (dynobj, ".rela.plt");
+      BFD_ASSERT (s != NULL);
+      s->size += sizeof (Elf32_External_Rela);
+
+      return TRUE;
+    }
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+                  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->executable)
+    return TRUE;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if (!h->non_got_ref)
+    return TRUE;
+
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+                             h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  s = bfd_get_section_by_name (dynobj, ".dynbss");
+  BFD_ASSERT (s != NULL);
+
+  /* We must generate a R_CR16_COPY reloc to tell the dynamic linker to
+     copy the initial value out of the dynamic object and into the
+     runtime process image.  We need to remember the offset into the
+     .rela.bss section we are going to use.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      asection * srel;
+
+      srel = bfd_get_section_by_name (dynobj, ".rela.bss");
+      BFD_ASSERT (srel != NULL);
+      srel->size += sizeof (Elf32_External_Rela);
+      h->needs_copy = 1;
+    }
+
+  return _bfd_elf_adjust_dynamic_copy (h, s);
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+_bfd_cr16_elf_size_dynamic_sections (bfd * output_bfd,
+                                     struct bfd_link_info * info)
+{
+  bfd * dynobj;
+  asection * s;
+  bfd_boolean plt;
+  bfd_boolean relocs;
+  bfd_boolean reltext;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+        {
+#if 0
+          s = bfd_get_section_by_name (dynobj, ".interp");
+          BFD_ASSERT (s != NULL);
+          s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+          s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+#endif
+        }
+    }
+  else
+    {
+      /* We may have created entries in the .rela.got section.
+         However, if we are not creating the dynamic sections, we will
+         not actually use these entries.  Reset the size of .rela.got,
+         which will cause it to get stripped from the output file
+         below.  */
+      s = bfd_get_section_by_name (dynobj, ".rela.got");
+      if (s != NULL)
+        s->size = 0;
+    }
+
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  plt = FALSE;
+  relocs = FALSE;
+  reltext = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      const char * name;
+
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+        continue;
+
+      /* It's OK to base decisions on the section name, because none
+         of the dynobj section names depend upon the input files.  */
+      name = bfd_get_section_name (dynobj, s);
+
+      if (strcmp (name, ".plt") == 0)
+        {
+          /* Remember whether there is a PLT.  */
+          plt = s->size != 0;
+        }
+      else if (CONST_STRNEQ (name, ".rela"))
+        {
+          if (s->size != 0)
+            {
+              asection * target;
+
+              /* Remember whether there are any reloc sections other
+                 than .rela.plt.  */
+              if (strcmp (name, ".rela.plt") != 0)
+                {
+                  const char * outname;
+
+                  relocs = TRUE;
+
+                  /* If this relocation section applies to a read only
+                     section, then we probably need a DT_TEXTREL
+                     entry.  The entries in the .rela.plt section
+                     really apply to the .got section, which we
+                     created ourselves and so know is not readonly.  */
+                  outname = bfd_get_section_name (output_bfd,
+                                                  s->output_section);
+                  target = bfd_get_section_by_name (output_bfd, outname + 5);
+                  if (target != NULL
+                      && (target->flags & SEC_READONLY) != 0
+                      && (target->flags & SEC_ALLOC) != 0)
+                    reltext = TRUE;
+                }
+
+              /* We use the reloc_count field as a counter if we need
+                 to copy relocs into the output file.  */
+              s->reloc_count = 0;
+            }
+        }
+      else if (! CONST_STRNEQ (name, ".got")
+               && strcmp (name, ".dynbss") != 0)
+        /* It's not one of our sections, so don't allocate space.  */
+        continue;
+
+      if (s->size == 0)
+        {
+          /* If we don't need this section, strip it from the
+             output file.  This is mostly to handle .rela.bss and
+             .rela.plt.  We must create both sections in
+             create_dynamic_sections, because they must be created
+             before the linker maps input sections to output
+             sections.  The linker does that before
+             adjust_dynamic_symbol is called, and it is that
+             function which decides whether anything needs to go
+             into these sections.  */
+          s->flags |= SEC_EXCLUDE;
+          continue;
+        }
+
+        if ((s->flags & SEC_HAS_CONTENTS) == 0)
+          continue;
+
+      /* Allocate memory for the section contents.  We use bfd_zalloc
+         here in case unused entries are not reclaimed before the
+         section's contents are written out.  This should not happen,
+         but this way if it does, we get a R_CR16_NONE reloc
+         instead of garbage.  */
+      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL)
+        return FALSE;
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+         values later, in _bfd_cr16_elf_finish_dynamic_sections,
+         but we must add the entries now so that we get the correct
+         size for the .dynamic section.  The DT_DEBUG entry is filled
+         in by the dynamic linker and used by the debugger.  */
+      if (! info->executable)
+        {
+          if (!_bfd_elf_add_dynamic_entry (info, DT_DEBUG, 0))
+            return FALSE;
+        }
+
+      if (plt)
+        {
+          if (!_bfd_elf_add_dynamic_entry (info, DT_PLTGOT, 0)
+              || !_bfd_elf_add_dynamic_entry (info, DT_PLTRELSZ, 0)
+              || !_bfd_elf_add_dynamic_entry (info, DT_PLTREL, DT_RELA)
+              || !_bfd_elf_add_dynamic_entry (info, DT_JMPREL, 0))
+            return FALSE;
+        }
+
+      if (relocs)
+        {
+          if (!_bfd_elf_add_dynamic_entry (info, DT_RELA, 0)
+              || !_bfd_elf_add_dynamic_entry (info, DT_RELASZ, 0)
+              || !_bfd_elf_add_dynamic_entry (info, DT_RELAENT,
+                                              sizeof (Elf32_External_Rela)))
+            return FALSE;
+        }
+
+      if (reltext)
+        {
+          if (!_bfd_elf_add_dynamic_entry (info, DT_TEXTREL, 0))
+            return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+_bfd_cr16_elf_finish_dynamic_symbol (bfd * output_bfd,
+                                     struct bfd_link_info * info,
+                                     struct elf_link_hash_entry * h,
+                                     Elf_Internal_Sym * sym)
+{
+  bfd * dynobj;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  if (h->got.offset != (bfd_vma) -1)
+    {
+      asection *        sgot;
+      asection *        srel;
+      Elf_Internal_Rela rel;
+
+      /* This symbol has an entry in the global offset table.  Set it up.  */
+
+      sgot = bfd_get_section_by_name (dynobj, ".got");
+      srel = bfd_get_section_by_name (dynobj, ".rela.got");
+      BFD_ASSERT (sgot != NULL && srel != NULL);
+
+      rel.r_offset = (sgot->output_section->vma
+                      + sgot->output_offset
+                      + (h->got.offset & ~1));
+
+      /* If this is a -Bsymbolic link, and the symbol is defined
+         locally, we just want to emit a RELATIVE reloc.  Likewise if
+         the symbol was forced to be local because of a version file.
+         The entry in the global offset table will already have been
+         initialized in the relocate_section function.  */
+      if (info->executable
+          && (info->symbolic || h->dynindx == -1)
+          && h->def_regular)
+        {
+          rel.r_info = ELF32_R_INFO (0, R_CR16_GOT_REGREL20);
+          rel.r_addend = (h->root.u.def.value
+                          + h->root.u.def.section->output_section->vma
+                          + h->root.u.def.section->output_offset);
+        }
+      else
+        {
+          bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + h->got.offset);
+          rel.r_info = ELF32_R_INFO (h->dynindx, R_CR16_GOT_REGREL20);
+          rel.r_addend = 0;
+        }
+
+      bfd_elf32_swap_reloca_out (output_bfd, &rel,
+                                 (bfd_byte *) ((Elf32_External_Rela *) srel->contents
+                                               + srel->reloc_count));
+      ++ srel->reloc_count;
+    }
+
+  if (h->needs_copy)
+    {
+      asection *        s;
+      Elf_Internal_Rela rel;
+
+      /* This symbol needs a copy reloc.  Set it up.  */
+      BFD_ASSERT (h->dynindx != -1
+                  && (h->root.type == bfd_link_hash_defined
+                      || h->root.type == bfd_link_hash_defweak));
+
+      s = bfd_get_section_by_name (h->root.u.def.section->owner,
+                                   ".rela.bss");
+      BFD_ASSERT (s != NULL);
+
+      rel.r_offset = (h->root.u.def.value
+                      + h->root.u.def.section->output_section->vma
+                      + h->root.u.def.section->output_offset);
+      rel.r_info = ELF32_R_INFO (h->dynindx, R_CR16_GOT_REGREL20);
+      rel.r_addend = 0;
+      bfd_elf32_swap_reloca_out (output_bfd, &rel,
+                                 (bfd_byte *) ((Elf32_External_Rela *) s->contents
+                                               + s->reloc_count));
+     ++ s->reloc_count;
+    }
+
+  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+      || h == elf_hash_table (info)->hgot)
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+_bfd_cr16_elf_finish_dynamic_sections (bfd * output_bfd,
+                                       struct bfd_link_info * info)
+{
+  bfd *      dynobj;
+  asection * sgot;
+  asection * sdyn;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  sgot = bfd_get_section_by_name (dynobj, ".got.plt");
+  BFD_ASSERT (sgot != NULL);
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      Elf32_External_Dyn * dyncon;
+      Elf32_External_Dyn * dynconend;
+
+      BFD_ASSERT (sdyn != NULL);
+
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+
+      for (; dyncon < dynconend; dyncon++)
+        {
+          Elf_Internal_Dyn dyn;
+          const char * name;
+          asection * s;
+
+          bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+          switch (dyn.d_tag)
+            {
+            default:
+              break;
+
+            case DT_PLTGOT:
+              name = ".got";
+              goto get_vma;
+
+            case DT_JMPREL:
+              name = ".rela.plt";
+            get_vma:
+              s = bfd_get_section_by_name (output_bfd, name);
+              BFD_ASSERT (s != NULL);
+              dyn.d_un.d_ptr = s->vma;
+              bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+              break;
+
+            case DT_PLTRELSZ:
+              s = bfd_get_section_by_name (output_bfd, ".rela.plt");
+              BFD_ASSERT (s != NULL);
+              dyn.d_un.d_val = s->size;
+              bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+              break;
+
+            case DT_RELASZ:
+              /* My reading of the SVR4 ABI indicates that the
+                 procedure linkage table relocs (DT_JMPREL) should be
+                 included in the overall relocs (DT_RELA).  This is
+                 what Solaris does.  However, UnixWare can not handle
+                 that case.  Therefore, we override the DT_RELASZ entry
+                 here to make it not include the JMPREL relocs.  Since
+                 the linker script arranges for .rela.plt to follow all
+                 other relocation sections, we don't have to worry
+                 about changing the DT_RELA entry.  */
+              s = bfd_get_section_by_name (output_bfd, ".rela.plt");
+              if (s != NULL)
+                dyn.d_un.d_val -= s->size;
+              bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+              break;
+            }
+        }
+
+    }
+
+  /* Fill in the first three entries in the global offset table.  */
+  if (sgot->size > 0)
+    {
+      if (sdyn == NULL)
+        bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents);
+      else
+        bfd_put_32 (output_bfd,
+                    sdyn->output_section->vma + sdyn->output_offset,
+                    sgot->contents);
+    }
+
+  elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
+
+  return TRUE;
+}
+
+/* Given a .data.rel section and a .emreloc in-memory section, store
+   relocation information into the .emreloc section which can be
+   used at runtime to relocate the section.  This is called by the
+   linker when the --embedded-relocs switch is used.  This is called
+   after the add_symbols entry point has been called for all the
+   objects, and before the final_link entry point is called.  */
+
+bfd_boolean
+bfd_cr16_elf32_create_embedded_relocs (bfd *abfd,
+                                       struct bfd_link_info *info,
+                                       asection *datasec,
+                                       asection *relsec,
+                                       char **errmsg)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Sym *isymbuf = NULL;
+  Elf_Internal_Rela *internal_relocs = NULL;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_byte *p;
+  bfd_size_type amt;
+
+  BFD_ASSERT (! info->relocatable);
+
+  *errmsg = NULL;
+
+  if (datasec->reloc_count == 0)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+
+  /* Get a copy of the native relocations.  */
+  internal_relocs = (_bfd_elf_link_read_relocs
+                     (abfd, datasec, NULL, NULL, info->keep_memory));
+  if (internal_relocs == NULL)
+    goto error_return;
+
+  amt = (bfd_size_type) datasec->reloc_count * 8;
+  relsec->contents = (bfd_byte *) bfd_alloc (abfd, amt);
+  if (relsec->contents == NULL)
+    goto error_return;
+
+  p = relsec->contents;
+
+  irelend = internal_relocs + datasec->reloc_count;
+  for (irel = internal_relocs; irel < irelend; irel++, p += 8)
+    {
+      asection *targetsec;
+
+      /* We are going to write a four byte longword into the runtime
+       reloc section.  The longword will be the address in the data
+       section which must be relocated.  It is followed by the name
+       of the target section NUL-padded or truncated to 8
+       characters.  */
+
+      /* We can only relocate absolute longword relocs at run time.  */
+      if (!((ELF32_R_TYPE (irel->r_info) == (int) R_CR16_NUM32a)
+          || (ELF32_R_TYPE (irel->r_info) == (int) R_CR16_NUM32)))
+        {
+          *errmsg = _("unsupported reloc type");
+          bfd_set_error (bfd_error_bad_value);
+          goto error_return;
+        }
+
+      /* Get the target section referred to by the reloc.  */
+      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+        {
+          /* A local symbol.  */
+          Elf_Internal_Sym *isym;
+
+          /* Read this BFD's local symbols if we haven't done so already.  */
+          if (isymbuf == NULL)
+            {
+              isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+              if (isymbuf == NULL)
+                isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+                                                symtab_hdr->sh_info, 0,
+                                                NULL, NULL, NULL);
+              if (isymbuf == NULL)
+                goto error_return;
+            }
+
+          isym = isymbuf + ELF32_R_SYM (irel->r_info);
+          targetsec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+        }
+      else
+        {
+          unsigned long indx;
+          struct elf_link_hash_entry *h;
+
+          /* An external symbol.  */
+          indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+          h = elf_sym_hashes (abfd)[indx];
+          BFD_ASSERT (h != NULL);
+          if (h->root.type == bfd_link_hash_defined
+              || h->root.type == bfd_link_hash_defweak)
+            targetsec = h->root.u.def.section;
+          else
+            targetsec = NULL;
+        }
+
+      bfd_put_32 (abfd, irel->r_offset + datasec->output_offset, p);
+      memset (p + 4, 0, 4);
+      if ((ELF32_R_TYPE (irel->r_info) == (int) R_CR16_NUM32a)
+          && (targetsec != NULL) )
+         strncpy ((char *) p + 4, targetsec->output_section->name, 4);
+    }
+
+  if (isymbuf != NULL && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (internal_relocs != NULL
+      && elf_section_data (datasec)->relocs != internal_relocs)
+    free (internal_relocs);
+  return TRUE;
+
+error_return:
+  if (isymbuf != NULL && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (internal_relocs != NULL
+      && elf_section_data (datasec)->relocs != internal_relocs)
+    free (internal_relocs);
+  return FALSE;
+}
+
+
+/* Classify relocation types, such that combreloc can sort them
+   properly.  */
+
+static enum elf_reloc_type_class
+_bfd_cr16_elf_reloc_type_class (const Elf_Internal_Rela *rela)
+{
+  switch ((int) ELF32_R_TYPE (rela->r_info))
+    {
+    case R_CR16_GOT_REGREL20:
+    case R_CR16_GOTC_REGREL20:
+      return reloc_class_relative;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+/* Definitions for setting CR16 target vector.  */
+#define TARGET_LITTLE_SYM                 bfd_elf32_cr16_vec
+#define TARGET_LITTLE_NAME                "elf32-cr16"
+#define ELF_ARCH                          bfd_arch_cr16
+#define ELF_MACHINE_CODE                  EM_CR16
+#define ELF_MACHINE_ALT1                  EM_CR16_OLD
+#define ELF_MAXPAGESIZE                   0x1
+#define elf_symbol_leading_char           '_'
+
+#define bfd_elf32_bfd_reloc_type_lookup   elf_cr16_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup   elf_cr16_reloc_name_lookup
+#define elf_info_to_howto                 elf_cr16_info_to_howto
+#define elf_info_to_howto_rel             0
+#define elf_backend_relocate_section      elf32_cr16_relocate_section
+#define bfd_elf32_bfd_relax_section       elf32_cr16_relax_section
+#define bfd_elf32_bfd_get_relocated_section_contents \
+                                elf32_cr16_get_relocated_section_contents
+#define elf_backend_gc_mark_hook          elf32_cr16_gc_mark_hook
+#define elf_backend_gc_sweep_hook         elf32_cr16_gc_sweep_hook
+#define elf_backend_can_gc_sections       1
+#define elf_backend_rela_normal           1
+#define elf_backend_check_relocs          cr16_elf_check_relocs
+/* So we can set bits in e_flags.  */
+#define elf_backend_final_write_processing \
+                                 _bfd_cr16_elf_final_write_processing
+#define elf_backend_object_p     _bfd_cr16_elf_object_p
+
+#define bfd_elf32_bfd_merge_private_bfd_data \
+                                 _bfd_cr16_elf_merge_private_bfd_data
+
+
+#define bfd_elf32_bfd_link_hash_table_create \
+                                  elf32_cr16_link_hash_table_create
+#define bfd_elf32_bfd_link_hash_table_free \
+                                  elf32_cr16_link_hash_table_free
+
+#define elf_backend_create_dynamic_sections \
+                                  _bfd_cr16_elf_create_dynamic_sections
+#define elf_backend_adjust_dynamic_symbol \
+                                  _bfd_cr16_elf_adjust_dynamic_symbol
+#define elf_backend_size_dynamic_sections \
+                                  _bfd_cr16_elf_size_dynamic_sections
+#define elf_backend_omit_section_dynsym \
+      ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true)
+#define elf_backend_finish_dynamic_symbol \
+                                   _bfd_cr16_elf_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections \
+                                   _bfd_cr16_elf_finish_dynamic_sections
+
+#define elf_backend_reloc_type_class   _bfd_cr16_elf_reloc_type_class
+
+
+#define elf_backend_want_got_plt        1
+#define elf_backend_plt_readonly        1
+#define elf_backend_want_plt_sym        0
+#define elf_backend_got_header_size     12
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-cr16c.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-cr16c.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-cr16c.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-cr16c.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,962 @@
+/* BFD back-end for National Semiconductor's CR16C ELF
+   Copyright 2004, 2005, 2006, 2007, 2009, 2010
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "bfdlink.h"
+#include "elf/cr16c.h"
+#include "elf-bfd.h"
+
+
+#define USE_REL	1	/* CR16C uses REL relocations instead of RELA.  */
+
+/* The following definition is based on EMPTY_HOWTO macro, 
+   but also initiates the "name" field in HOWTO struct.  */
+#define ONLY_NAME_HOWTO(C) \
+  HOWTO ((C), 0, 0, 0, FALSE, 0, complain_overflow_dont, NULL, \
+	  STRINGX(C), FALSE, 0, 0, FALSE)
+
+/* reloc_map_index array maps CRASM relocation type into a BFD
+   relocation enum. The array's indices are synchronized with 
+   RINDEX_16C_* indices, created in include/elf/cr16c.h.
+   The array is used in:
+   1. elf32-cr16c.c : elf_cr16c_reloc_type_lookup().
+   2. asreloc.c : find_reloc_type(). */
+
+RELOC_MAP reloc_map_index[RINDEX_16C_MAX] =
+{
+  {R_16C_NUM08,     BFD_RELOC_16C_NUM08},
+  {R_16C_NUM08_C,   BFD_RELOC_16C_NUM08_C},
+  {R_16C_NUM16,     BFD_RELOC_16C_NUM16},
+  {R_16C_NUM16_C,   BFD_RELOC_16C_NUM16_C},
+  {R_16C_NUM32,     BFD_RELOC_16C_NUM32},
+  {R_16C_NUM32_C,   BFD_RELOC_16C_NUM32_C},
+  {R_16C_DISP04,    BFD_RELOC_16C_DISP04},
+  {R_16C_DISP04_C,  BFD_RELOC_16C_DISP04_C},
+  {R_16C_DISP08,    BFD_RELOC_16C_DISP08},
+  {R_16C_DISP08_C,  BFD_RELOC_16C_DISP08_C},
+  {R_16C_DISP16,    BFD_RELOC_16C_DISP16},
+  {R_16C_DISP16_C,  BFD_RELOC_16C_DISP16_C},
+  {R_16C_DISP24,    BFD_RELOC_16C_DISP24},
+  {R_16C_DISP24_C,  BFD_RELOC_16C_DISP24_C},
+  {R_16C_DISP24a,   BFD_RELOC_16C_DISP24a},
+  {R_16C_DISP24a_C, BFD_RELOC_16C_DISP24a_C},
+  {R_16C_REG04,     BFD_RELOC_16C_REG04},
+  {R_16C_REG04_C,   BFD_RELOC_16C_REG04_C},
+  {R_16C_REG04a,    BFD_RELOC_16C_REG04a},
+  {R_16C_REG04a_C,  BFD_RELOC_16C_REG04a_C},
+  {R_16C_REG14,     BFD_RELOC_16C_REG14},
+  {R_16C_REG14_C,   BFD_RELOC_16C_REG14_C},
+  {R_16C_REG16,     BFD_RELOC_16C_REG16},
+  {R_16C_REG16_C,   BFD_RELOC_16C_REG16_C},
+  {R_16C_REG20,     BFD_RELOC_16C_REG20},
+  {R_16C_REG20_C,   BFD_RELOC_16C_REG20_C},
+  {R_16C_ABS20,     BFD_RELOC_16C_ABS20},
+  {R_16C_ABS20_C,   BFD_RELOC_16C_ABS20_C},
+  {R_16C_ABS24,     BFD_RELOC_16C_ABS24},
+  {R_16C_ABS24_C,   BFD_RELOC_16C_ABS24_C},
+  {R_16C_IMM04,     BFD_RELOC_16C_IMM04},
+  {R_16C_IMM04_C,   BFD_RELOC_16C_IMM04_C},
+  {R_16C_IMM16,     BFD_RELOC_16C_IMM16},
+  {R_16C_IMM16_C,   BFD_RELOC_16C_IMM16_C},
+  {R_16C_IMM20,     BFD_RELOC_16C_IMM20},
+  {R_16C_IMM20_C,   BFD_RELOC_16C_IMM20_C},
+  {R_16C_IMM24,     BFD_RELOC_16C_IMM24},
+  {R_16C_IMM24_C,   BFD_RELOC_16C_IMM24_C},
+  {R_16C_IMM32,     BFD_RELOC_16C_IMM32},
+  {R_16C_IMM32_C,   BFD_RELOC_16C_IMM32_C}
+};
+
+static reloc_howto_type elf_howto_table[] =
+{
+  /* 00 */ ONLY_NAME_HOWTO (RINDEX_16C_NUM08),
+  /* 01 */ ONLY_NAME_HOWTO (RINDEX_16C_NUM08_C),
+  /* 02 */ ONLY_NAME_HOWTO (RINDEX_16C_NUM16),
+  /* 03 */ ONLY_NAME_HOWTO (RINDEX_16C_NUM16_C),
+  /* 04 */ ONLY_NAME_HOWTO (RINDEX_16C_NUM32),
+  /* 05 */ ONLY_NAME_HOWTO (RINDEX_16C_NUM32_C),
+  /* 06 */ ONLY_NAME_HOWTO (RINDEX_16C_DISP04),
+  /* 07 */ ONLY_NAME_HOWTO (RINDEX_16C_DISP04_C),
+  /* 08 */ ONLY_NAME_HOWTO (RINDEX_16C_DISP08),
+  /* 09 */ ONLY_NAME_HOWTO (RINDEX_16C_DISP08_C),
+  /* 10 */ ONLY_NAME_HOWTO (RINDEX_16C_DISP16),
+  /* 11 */ ONLY_NAME_HOWTO (RINDEX_16C_DISP16_C),
+  /* 12 */ ONLY_NAME_HOWTO (RINDEX_16C_DISP24),
+  /* 13 */ ONLY_NAME_HOWTO (RINDEX_16C_DISP24_C),
+  /* 14 */ ONLY_NAME_HOWTO (RINDEX_16C_DISP24a),
+  /* 15 */ ONLY_NAME_HOWTO (RINDEX_16C_DISP24a_C),
+  /* 16 */ ONLY_NAME_HOWTO (RINDEX_16C_REG04),
+  /* 17 */ ONLY_NAME_HOWTO (RINDEX_16C_REG04_C),
+  /* 18 */ ONLY_NAME_HOWTO (RINDEX_16C_REG04a),
+  /* 19 */ ONLY_NAME_HOWTO (RINDEX_16C_REG04a_C),
+  /* 20 */ ONLY_NAME_HOWTO (RINDEX_16C_REG14),
+  /* 21 */ ONLY_NAME_HOWTO (RINDEX_16C_REG14_C),
+  /* 22 */ ONLY_NAME_HOWTO (RINDEX_16C_REG16),
+  /* 23 */ ONLY_NAME_HOWTO (RINDEX_16C_REG16_C),
+  /* 24 */ ONLY_NAME_HOWTO (RINDEX_16C_REG20),
+  /* 25 */ ONLY_NAME_HOWTO (RINDEX_16C_REG20_C),
+  /* 26 */ ONLY_NAME_HOWTO (RINDEX_16C_ABS20),
+  /* 27 */ ONLY_NAME_HOWTO (RINDEX_16C_ABS20_C),
+  /* 28 */ ONLY_NAME_HOWTO (RINDEX_16C_ABS24),
+  /* 29 */ ONLY_NAME_HOWTO (RINDEX_16C_ABS24_C),
+  /* 30 */ ONLY_NAME_HOWTO (RINDEX_16C_IMM04),
+  /* 31 */ ONLY_NAME_HOWTO (RINDEX_16C_IMM04_C),
+  /* 32 */ ONLY_NAME_HOWTO (RINDEX_16C_IMM16),
+  /* 33 */ ONLY_NAME_HOWTO (RINDEX_16C_IMM16_C),
+  /* 34 */ ONLY_NAME_HOWTO (RINDEX_16C_IMM20),
+  /* 35 */ ONLY_NAME_HOWTO (RINDEX_16C_IMM20_C),
+  /* 36 */ ONLY_NAME_HOWTO (RINDEX_16C_IMM24),
+  /* 37 */ ONLY_NAME_HOWTO (RINDEX_16C_IMM24_C),
+  /* 38 */ ONLY_NAME_HOWTO (RINDEX_16C_IMM32),
+  /* 39 */ ONLY_NAME_HOWTO (RINDEX_16C_IMM32_C)
+};
+
+
+/* Code to turn a code_type into a howto ptr, uses the above howto table.  */
+
+static reloc_howto_type *
+elf_cr16c_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			     bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0; i < RINDEX_16C_MAX; i++)
+    {
+      if (code == reloc_map_index[i].bfd_reloc_enum)
+	{
+	  /* printf ("CR16C Relocation Type is - %x\n", code); */
+	  return & elf_howto_table[i];
+	}
+    }
+
+  /* printf ("This relocation Type is not supported - %x\n", code); */
+  return 0;
+}
+
+static reloc_howto_type *
+elf_cr16c_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			     const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (elf_howto_table) / sizeof (elf_howto_table[0]); i++)
+    if (elf_howto_table[i].name != NULL
+	&& strcasecmp (elf_howto_table[i].name, r_name) == 0)
+      return &elf_howto_table[i];
+
+  return NULL;
+}
+
+static void
+elf_cr16c_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+			 arelent *cache_ptr ATTRIBUTE_UNUSED,
+			 Elf_Internal_Rela *dst ATTRIBUTE_UNUSED)
+{
+  abort ();
+}
+
+static void
+elf_cr16c_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+			     arelent *cache_ptr,
+			     Elf_Internal_Rela *dst)
+{
+  unsigned int r_type = ELF32_R_TYPE (dst->r_info);
+
+  BFD_ASSERT (r_type < (unsigned int) RINDEX_16C_MAX);
+  cache_ptr->howto = &elf_howto_table[r_type];
+}
+
+/* Perform a relocation as part of a final link.  */
+
+static bfd_reloc_status_type
+cr16c_elf_final_link_relocate (reloc_howto_type *howto,
+			       bfd *abfd,
+			       bfd *output_bfd ATTRIBUTE_UNUSED,
+			       asection *input_section,
+			       bfd_byte *data,
+			       bfd_vma octets,
+			       bfd_vma Rvalue,
+			       bfd_vma addend ATTRIBUTE_UNUSED,
+			       struct bfd_link_info *info ATTRIBUTE_UNUSED,
+			       asection *sym_sec ATTRIBUTE_UNUSED,
+			       int is_local ATTRIBUTE_UNUSED)
+{
+  long value;
+  short sword;			/* Extracted from the hole and put back.  */
+  unsigned long format, addr_type, code_factor;
+  unsigned short size;
+  unsigned short r_type;
+
+  unsigned long disp20_opcod;
+  char neg = 0;
+  char neg2pos = 0;
+
+  long left_val = 0;
+  long plus_factor = 0;		/* To be added to the hole.  */
+
+#define MIN_BYTE	((int) 0xFFFFFF80)
+#define MIN_WORD	((int) 0xFFFF8000)
+#define	MAX_UWORD	((unsigned) 0x0000FFFF)
+#define	MAX_UBYTE	((unsigned) 0x000000FF)
+
+  r_type = reloc_map_index[howto->type].cr_reloc_type;
+  format = r_type & R_FORMAT;
+  size = r_type & R_SIZESP;
+  addr_type = r_type & R_ADDRTYPE;
+  code_factor = ((addr_type == R_CODE_ADDR) ? 1 : 0);
+
+  switch (format)
+    {
+    case R_NUMBER:
+      switch (size)
+	{
+	case R_S_16C_08: 	/* One byte.  */
+	  value = bfd_get_8 (abfd, (char *) data + octets);
+	  break;
+	case R_S_16C_16: 	/* Two bytes. */
+	  sword = bfd_get_16 (abfd, (bfd_byte *) data + octets);
+	  value = sword;
+	  break;
+	case R_S_16C_32:	/* Four bytes.  */
+	  value = bfd_get_32 (abfd, (bfd_byte *) data + octets);
+	  break;
+	default:
+	  return bfd_reloc_notsupported;
+	}
+      break;
+
+    case R_16C_DISPL:
+      switch (size)
+	{
+	case R_S_16C_04:    /* word1(4-7).  */
+	  value = bfd_get_8 (abfd, (char *) data + octets);
+	  left_val = value & 0xF;
+	  value = (value & 0xF0) >> 4;
+	  value++;
+	  value <<= 1;
+	  break;
+	case R_S_16C_08:    /* word1(0-3,8-11).  */
+	  sword = bfd_get_16 (abfd, (char *) data + octets);
+	  value = sword & 0x000F;
+	  value |= ((sword & 0x0F00) >> 4);
+	  left_val = sword & 0xF0F0;
+	  value <<= 1;
+	  if (value & 0x100)
+	    value |= 0xFFFFFF00;
+	  break;
+	case R_S_16C_16:    /* word2.  */
+	  sword = bfd_get_16 (abfd, (bfd_byte *) data + octets);
+	  value = sword;
+	  value = ((value & 0xFFFE) >> 1) | ((value & 0x1) << 15);
+	  value <<= 1;
+	  if (value & 0x10000)
+	    value |= 0xFFFF0000;
+	  break;
+	case R_S_16C_24_a:	/* word1(0-7),word2.  */
+	  value = bfd_get_32 (abfd, (bfd_byte *) data + octets);
+	  left_val = value & 0x0000FF00;
+	  value = ((value & 0xFFFE0000) >> 17) |
+	    ((value & 0x00010000) << 7) | ((value & 0x000000FF) << 15);
+	  value <<= 1;
+	  if (value & 0x1000000)
+	    value |= 0xFE000000;
+	  break;
+	case R_S_16C_24:    /* word2(0-3,8-11),word3.  */
+	  value = bfd_get_32 (abfd, (bfd_byte *) data + octets);
+	  left_val = value & 0x0000F0F0;
+	  value = ((value >> 16) & 0x0000FFFF) |
+	    ((value & 0x00000F00) << 8) | ((value & 0x0000000F) << 20);
+
+	  value = ((value & 0x00FFFFFE) >> 1) | ((value & 0x00000001) << 23);
+
+	  value <<= 1;
+	  if (value & 0x1000000)
+	    value |= 0xFE000000;
+	  break;
+	default:
+	  return bfd_reloc_notsupported;
+	}
+      break;
+
+    case R_16C_REGREL:
+      switch (size)
+	{
+	case R_S_16C_04:    /* word1(12-15) not scaled.  */
+	  value = bfd_get_8 (abfd, (char *) data + octets);
+	  left_val = value & 0xF0;
+	  value = value & 0xF;
+	  break;
+	case R_S_16C_04_a:	/* word1(12-15) scaled by 2.  */
+	  value = bfd_get_8 (abfd, (char *) data + octets);
+	  left_val = value & 0xF0;
+	  value = value & 0xF;
+	  value <<= 1;
+	  break;
+	case R_S_16C_14:    /* word1(4-5),word2(0-3,8-15).  */
+	  value = bfd_get_32 (abfd, (bfd_byte *) data + octets);
+	  left_val = value & 0x00F0FFCF;
+	  value = ((value & 0xc0000000) >> 24) |
+	    ((value & 0x3F000000) >> 16) |
+	    ((value & 0x000F0000) >> 16) | (value & 0x00000030);
+	  break;
+	case R_S_16C_16:    /* word2.  */
+	  sword = bfd_get_16 (abfd, (bfd_byte *) data + octets);
+	  value = sword;
+	  break;
+	case R_S_16C_20:    /* word2(8-11),word3.  */
+	  value = bfd_get_32 (abfd, (bfd_byte *) data + octets);
+	  left_val = value & 0xF0;
+	  value = (value & 0xF) << 16;
+	  sword = bfd_get_16 (abfd, (bfd_byte *) data + octets + 1);
+	  value = value | (unsigned short) sword;
+	  disp20_opcod = bfd_get_32 (abfd, (bfd_byte *) data + octets - 3);
+	  disp20_opcod |= 0x0FFF0000;
+	  if ((disp20_opcod == 0x4FFF0018) ||	/* loadb -disp20(reg) */
+	      (disp20_opcod == 0x5FFF0018) ||	/* loadb -disp20(rp)  */
+	      (disp20_opcod == 0x8FFF0018) ||	/* loadd -disp20(reg) */
+	      (disp20_opcod == 0x9FFF0018) ||	/* loadd -disp20(rp)  */
+	      (disp20_opcod == 0xCFFF0018) ||	/* loadw -disp20(reg) */
+	      (disp20_opcod == 0xDFFF0018) ||	/* loadw -disp20(rp)  */
+	      (disp20_opcod == 0x4FFF0019) ||	/* storb -disp20(reg) */
+	      (disp20_opcod == 0x5FFF0019) ||	/* storb -disp20(rp)  */
+	      (disp20_opcod == 0x8FFF0019) ||	/* stord -disp20(reg) */
+	      (disp20_opcod == 0x9FFF0019) ||	/* stord -disp20(rp)  */
+	      (disp20_opcod == 0xCFFF0019) ||	/* storw -disp20(reg) */
+	      (disp20_opcod == 0xDFFF0019))
+	    {	/* storw -disp20(rp).  */
+	      neg = 1;
+	      value |= 0xFFF00000;
+	    }
+
+	  break;
+	default:
+	  return bfd_reloc_notsupported;
+	}
+      break;
+
+    case R_16C_ABS:
+      switch (size)
+	{
+	case R_S_16C_20:    /* word1(0-3),word2.  */
+	  value = bfd_get_32 (abfd, (bfd_byte *) data + octets);
+	  left_val = value & 0x0000FFF0;
+	  value = ((value & 0xFFFF0000) >> 16) |
+	    ((value & 0x0000000F) << 16);
+	  break;
+	case R_S_16C_24:   /* word2(0-3,8-11),word3.  */
+	  value = bfd_get_32 (abfd, (bfd_byte *) data + octets);
+	  left_val = value & 0x0000F0F0;
+	  value = ((value & 0xFFFF0000) >> 16) |
+	    ((value & 0x00000F00) << 8) | ((value & 0x0000000F) << 20);
+	  break;
+	default:
+	  return bfd_reloc_notsupported;
+	}
+      break;
+
+    case R_16C_IMMED:
+      switch (size)
+	{
+	case R_S_16C_04:    /* word1/2(4-7).  */
+	  value = bfd_get_8 (abfd, (char *) data + octets);
+	  left_val = value & 0xF;
+	  value = (value & 0xF0) >> 4;
+	  break;
+	case R_S_16C_16:    /* word2.  */
+	  sword = bfd_get_16 (abfd, (bfd_byte *) data + octets);
+	  value = sword;
+	  break;
+	case R_S_16C_20:    /* word1(0-3),word2.  */
+	  value = bfd_get_32 (abfd, (bfd_byte *) data + octets);
+	  left_val = value & 0x0000FFF0;
+	  value = ((value & 0xFFFF0000) >> 16) |
+	    ((value & 0x0000000F) << 16);
+	  break;
+	case R_S_16C_32:    /* word2, word3.  */
+	  value = bfd_get_32 (abfd, (bfd_byte *) data + octets);
+	  value = ((value & 0x0000FFFF) << 16) |
+	    ((value & 0xFFFF0000) >> 16);
+	  break;
+	default:
+	  return bfd_reloc_notsupported;
+	}
+      break;
+    default:
+      return bfd_reloc_notsupported;
+    }
+
+  switch ((r_type & R_RELTO) >> 4)
+    {
+
+    case 0:	/* R_ABS.  */
+      plus_factor = Rvalue;
+      break;
+    case 1:	/* R_PCREL.  */
+      plus_factor = Rvalue -
+	(input_section->output_section->vma + input_section->output_offset);
+      break;
+    default:
+      return bfd_reloc_notsupported;
+    }
+
+  if (neg)
+    {
+      if (plus_factor >= -value)
+	neg2pos = 1;
+      /* We need to change load/stor with negative
+	 displ opcode to positive disp opcode (CR16C).  */
+    }
+
+  value = value + (plus_factor >> code_factor);
+
+  switch (format)
+    {
+    case R_NUMBER:
+      switch (size)
+	{
+	case R_S_16C_08: 	/* One byte.  */
+	  if (value > (int) MAX_UBYTE || value < MIN_BYTE)
+	    return bfd_reloc_overflow;
+	  value &= 0xFF;
+	  bfd_put_8 (abfd, (bfd_vma) value, (unsigned char *) data + octets);
+	  break;
+
+	case R_S_16C_16:	/* Two bytes.  */
+	  if (value > (int) MAX_UWORD || value < MIN_WORD)
+	    return bfd_reloc_overflow;
+	  value &= 0xFFFF;
+	  sword = value;
+	  bfd_put_16 (abfd, (bfd_vma) sword,
+		      (unsigned char *) data + octets);
+	  break;
+
+	case R_S_16C_32:	/* Four bytes.  */
+	  value &= 0xFFFFFFFF;
+	  bfd_put_32 (abfd, (bfd_vma) value, (bfd_byte *) data + octets);
+	  break;
+
+	default:
+	  return bfd_reloc_notsupported;
+	}
+      break;
+
+    case R_16C_DISPL:
+      switch (size)
+	{
+	case R_S_16C_04:	/* word1(4-7).  */
+	  if ((value - 32) > 32 || value < 2)
+	    return bfd_reloc_overflow;
+	  value >>= 1;
+	  value--;
+	  value &= 0xF;
+	  value <<= 4;
+	  value |= left_val;
+	  bfd_put_8 (abfd, (bfd_vma) value, (unsigned char *) data + octets);
+	  break;
+
+	case R_S_16C_08:    /* word1(0-3,8-11).  */
+	  if (value > 255 || value < -256 || value == 0x80)
+	    return bfd_reloc_overflow;
+	  value &= 0x1FF;
+	  value >>= 1;
+	  sword = value & 0x000F;
+	  sword |= (value & 0x00F0) << 4;
+	  sword |= left_val;
+	  bfd_put_16 (abfd, (bfd_vma) sword,
+		      (unsigned char *) data + octets);
+	  break;
+
+	case R_S_16C_16:    /* word2.  */
+	  if (value > 65535 || value < -65536)
+	    return bfd_reloc_overflow;
+	  value >>= 1;
+	  value &= 0xFFFF;
+	  value = ((value & 0x8000) >> 15) | ((value & 0x7FFF) << 1);
+	  sword = value;
+	  bfd_put_16 (abfd, (bfd_vma) sword,
+		      (unsigned char *) data + octets);
+	  break;
+
+	case R_S_16C_24_a:	/* word1(0-7),word2.  */
+	  if (value > 16777215 || value < -16777216)
+	    return bfd_reloc_overflow;
+	  value &= 0x1FFFFFF;
+	  value >>= 1;
+	  value = ((value & 0x00007FFF) << 17) |
+	    ((value & 0x00800000) >> 7) | ((value & 0x007F8000) >> 15);
+	  value |= left_val;
+	  bfd_put_32 (abfd, (bfd_vma) value, (bfd_byte *) data + octets);
+	  break;
+
+	case R_S_16C_24:    /* word2(0-3,8-11),word3.  */
+	  if (value > 16777215 || value < -16777216)
+	    return bfd_reloc_overflow;
+	  value &= 0x1FFFFFF;
+	  value >>= 1;
+
+	  value = ((value & 0x007FFFFF) << 1) | ((value & 0x00800000) >> 23);
+
+	  value = ((value & 0x0000FFFF) << 16) |
+	    ((value & 0x000F0000) >> 8) | ((value & 0x00F00000) >> 20);
+	  value |= left_val;
+	  bfd_put_32 (abfd, (bfd_vma) value, (bfd_byte *) data + octets);
+	  break;
+
+	default:
+	  return bfd_reloc_notsupported;
+	}
+      break;
+
+    case R_16C_REGREL:
+      switch (size)
+	{
+	case R_S_16C_04:	/* word1(12-15) not scaled.  */
+	  if (value > 13 || value < 0)
+	    return bfd_reloc_overflow;
+	  value &= 0xF;
+	  value |= left_val;
+	  bfd_put_8 (abfd, (bfd_vma) value, (unsigned char *) data + octets);
+	  break;
+
+	case R_S_16C_04_a:	/* word1(12-15) not scaled.  */
+	  if (value > 26 || value < 0)
+	    return bfd_reloc_overflow;
+	  value &= 0x1F;
+	  value >>= 1;
+	  value |= left_val;
+	  bfd_put_8 (abfd, (bfd_vma) value, (unsigned char *) data + octets);
+	  break;
+
+	case R_S_16C_14:	/* word1(4-5),word2(0-3,8-15).  */
+	  if (value < 0 || value > 16383)
+	    return bfd_reloc_overflow;
+	  value &= 0x3FFF;
+	  value = ((value & 0x000000c0) << 24) |
+	    ((value & 0x00003F00) << 16) |
+	    ((value & 0x0000000F) << 16) | (value & 0x00000030);
+	  value |= left_val;
+	  bfd_put_32 (abfd, (bfd_vma) value, (bfd_byte *) data + octets);
+	  break;
+
+	case R_S_16C_16:	/* word2.  */
+	  if (value > 65535 || value < 0)
+	    return bfd_reloc_overflow;
+	  value &= 0xFFFF;
+	  sword = value;
+	  bfd_put_16 (abfd, (bfd_vma) sword,
+		      (unsigned char *) data + octets);
+	  break;
+
+	case R_S_16C_20:	/* word2(8-11),word3.  */
+	  /* if (value > 1048575 || value < 0) RELOC_ERROR(1); */
+	  value &= 0xFFFFF;
+	  sword = value & 0x0000FFFF;
+	  value = (value & 0x000F0000) >> 16;
+	  value |= left_val;
+	  bfd_put_8 (abfd, (bfd_vma) value, (unsigned char *) data + octets);
+	  bfd_put_16 (abfd, (bfd_vma) sword,
+		      (unsigned char *) data + octets + 1);
+	  if (neg2pos)
+	    {
+	      /* Change load/stor negative displ opcode
+	         to load/stor positive displ opcode.  */
+	      value = bfd_get_8 (abfd, (char *) data + octets - 3);
+	      value &= 0xF7;
+	      value |= 0x2;
+	      bfd_put_8 (abfd, (bfd_vma) value,
+			 (unsigned char *) data + octets - 3);
+	    }
+	  break;
+
+	default:
+	  return bfd_reloc_notsupported;
+	}
+      break;
+
+    case R_16C_ABS:
+      switch (size)
+	{
+	case R_S_16C_20:	/* word1(0-3),word2.  */
+	  if (value > 1048575 || value < 0)
+	    return bfd_reloc_overflow;
+	  value &= 0xFFFFF;
+	  value = ((value & 0x0000FFFF) << 16) |
+	    ((value & 0x000F0000) >> 16);
+	  value |= left_val;
+	  bfd_put_32 (abfd, (bfd_vma) value, (bfd_byte *) data + octets);
+	  break;
+
+	case R_S_16C_24:	/* word2(0-3,8-11),word3.  */
+	  /* if (value > 16777215 || value < 0) RELOC_ERROR(1); */
+	  value &= 0xFFFFFF;
+	  value = ((value & 0x0000FFFF) << 16) |
+	    ((value & 0x000F0000) >> 8) | ((value & 0x00F00000) >> 20);
+	  value |= left_val;
+	  bfd_put_32 (abfd, (bfd_vma) value, (bfd_byte *) data + octets);
+	  break;
+
+	default:
+	  return bfd_reloc_notsupported;
+	}
+      break;
+
+    case R_16C_IMMED:
+      switch (size)
+	{
+	case R_S_16C_04:	/* word1/2(4-7).  */
+	  if (value > 15 || value < -1)
+	    return bfd_reloc_overflow;
+	  value &= 0xF;
+	  value <<= 4;
+	  value |= left_val;
+	  bfd_put_8 (abfd, (bfd_vma) value, (unsigned char *) data + octets);
+	  break;
+
+	case R_S_16C_16:	/* word2.  */
+	  if (value > 32767 || value < -32768)
+	    return bfd_reloc_overflow;
+	  value &= 0xFFFF;
+	  sword = value;
+	  bfd_put_16 (abfd, (bfd_vma) sword,
+		      (unsigned char *) data + octets);
+	  break;
+
+	case R_S_16C_20:	/* word1(0-3),word2.  */
+	  if (value > 1048575 || value < 0)
+	    return bfd_reloc_overflow;
+	  value &= 0xFFFFF;
+	  value = ((value & 0x0000FFFF) << 16) |
+	    ((value & 0x000F0000) >> 16);
+	  value |= left_val;
+	  bfd_put_32 (abfd, (bfd_vma) value, (bfd_byte *) data + octets);
+	  break;
+
+	case R_S_16C_32:	/* word2, word3.  */
+	  value &= 0xFFFFFFFF;
+	  value = ((value & 0x0000FFFF) << 16) |
+	    ((value & 0xFFFF0000) >> 16);
+	  bfd_put_32 (abfd, (bfd_vma) value, (bfd_byte *) data + octets);
+	  break;
+
+	default:
+	  return bfd_reloc_notsupported;
+	}
+      break;
+    default:
+      return bfd_reloc_notsupported;
+    }
+
+  return bfd_reloc_ok;
+}
+
+/* Relocate a CR16C ELF section.  */
+
+static bfd_boolean
+elf32_cr16c_relocate_section (bfd *output_bfd,
+			      struct bfd_link_info *info,
+			      bfd *input_bfd,
+			      asection *input_section,
+			      bfd_byte *contents,
+			      Elf_Internal_Rela *relocs,
+			      Elf_Internal_Sym *local_syms,
+			      asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel, *relend;
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+      howto = elf_howto_table + r_type;
+
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc, warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	{
+	  /* This is a relocatable link.  We don't have to change
+	     anything, unless the reloc is against a section symbol,
+	     in which case we have to adjust according to where the
+	     section symbol winds up in the output section.  */
+	  if (sym != NULL && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+	    rel->r_addend += sec->output_offset;
+	  continue;
+	}
+
+      r = cr16c_elf_final_link_relocate (howto, input_bfd, output_bfd,
+					 input_section,
+					 contents, rel->r_offset,
+					 relocation, rel->r_addend,
+					 info, sec, h == NULL);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char *name;
+	  const char *msg = (const char *) 0;
+
+	  if (h != NULL)
+	    name = h->root.root.string;
+	  else
+	    {
+	      name = (bfd_elf_string_from_elf_section
+		      (input_bfd, symtab_hdr->sh_link, sym->st_name));
+	      if (name == NULL || *name == '\0')
+		name = bfd_section_name (input_bfd, sec);
+	    }
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      if (!((*info->callbacks->reloc_overflow)
+		    (info, (h ? &h->root : NULL), name, howto->name,
+		     (bfd_vma) 0, input_bfd, input_section,
+		     rel->r_offset)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_undefined:
+	      if (!((*info->callbacks->undefined_symbol)
+		    (info, name, input_bfd, input_section,
+		     rel->r_offset, TRUE)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      goto common_error;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      goto common_error;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous error");
+	      goto common_error;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      /* fall through */
+
+	    common_error:
+	      if (!((*info->callbacks->warning)
+		    (info, msg, name, input_bfd, input_section,
+		     rel->r_offset)))
+		return FALSE;
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* CR16C ELF uses three common sections:
+   One is for default common symbols (placed in usual common section).
+   Second is for near common symbols (placed in "ncommon" section).
+   Third is for far common symbols (placed in "fcommon" section).
+   The following implementation is based on elf32-mips architecture */
+
+static asection  cr16c_elf_fcom_section;
+static asymbol   cr16c_elf_fcom_symbol;
+static asymbol * cr16c_elf_fcom_symbol_ptr;
+static asection  cr16c_elf_ncom_section;
+static asymbol   cr16c_elf_ncom_symbol;
+static asymbol * cr16c_elf_ncom_symbol_ptr;
+
+/* Given a BFD section, try to locate the
+   corresponding ELF section index.  */
+
+static bfd_boolean
+elf32_cr16c_section_from_bfd_section (bfd *abfd ATTRIBUTE_UNUSED,
+				      asection *sec,
+				      int *retval)
+{
+  if (strcmp (bfd_get_section_name (abfd, sec), ".fcommon") == 0)
+    *retval = SHN_CR16C_FCOMMON;
+  else if (strcmp (bfd_get_section_name (abfd, sec), ".ncommon") == 0)
+    *retval = SHN_CR16C_NCOMMON;
+  else
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Handle the special CR16C section numbers that a symbol may use.  */
+
+static void
+elf32_cr16c_symbol_processing (bfd *abfd ATTRIBUTE_UNUSED,
+			       asymbol *asym)
+{
+  elf_symbol_type *elfsym = (elf_symbol_type *) asym;
+  unsigned int indx;
+
+  indx = elfsym->internal_elf_sym.st_shndx;
+
+  switch (indx)
+    {
+    case SHN_CR16C_FCOMMON:
+      if (cr16c_elf_fcom_section.name == NULL)
+	{
+	  /* Initialize the far common section.  */
+	  cr16c_elf_fcom_section.name = ".fcommon";
+	  cr16c_elf_fcom_section.flags = SEC_IS_COMMON | SEC_ALLOC;
+	  cr16c_elf_fcom_section.output_section = &cr16c_elf_fcom_section;
+	  cr16c_elf_fcom_section.symbol = &cr16c_elf_fcom_symbol;
+	  cr16c_elf_fcom_section.symbol_ptr_ptr = &cr16c_elf_fcom_symbol_ptr;
+	  cr16c_elf_fcom_symbol.name = ".fcommon";
+	  cr16c_elf_fcom_symbol.flags = BSF_SECTION_SYM;
+	  cr16c_elf_fcom_symbol.section = &cr16c_elf_fcom_section;
+	  cr16c_elf_fcom_symbol_ptr = &cr16c_elf_fcom_symbol;
+	}
+      asym->section = &cr16c_elf_fcom_section;
+      asym->value = elfsym->internal_elf_sym.st_size;
+      break;
+    case SHN_CR16C_NCOMMON:
+      if (cr16c_elf_ncom_section.name == NULL)
+	{
+	  /* Initialize the far common section.  */
+	  cr16c_elf_ncom_section.name = ".ncommon";
+	  cr16c_elf_ncom_section.flags = SEC_IS_COMMON | SEC_ALLOC;
+	  cr16c_elf_ncom_section.output_section = &cr16c_elf_ncom_section;
+	  cr16c_elf_ncom_section.symbol = &cr16c_elf_ncom_symbol;
+	  cr16c_elf_ncom_section.symbol_ptr_ptr = &cr16c_elf_ncom_symbol_ptr;
+	  cr16c_elf_ncom_symbol.name = ".ncommon";
+	  cr16c_elf_ncom_symbol.flags = BSF_SECTION_SYM;
+	  cr16c_elf_ncom_symbol.section = &cr16c_elf_ncom_section;
+	  cr16c_elf_ncom_symbol_ptr = &cr16c_elf_ncom_symbol;
+	}
+      asym->section = &cr16c_elf_ncom_section;
+      asym->value = elfsym->internal_elf_sym.st_size;
+      break;
+    }
+}
+
+/* Hook called by the linker routine which adds symbols from an object
+   file.  We must handle the special cr16c section numbers here.  */
+
+static bfd_boolean
+elf32_cr16c_add_symbol_hook (bfd *abfd,
+			     struct bfd_link_info *info ATTRIBUTE_UNUSED,
+			     Elf_Internal_Sym *sym,
+			     const char **namep ATTRIBUTE_UNUSED,
+			     flagword *flagsp ATTRIBUTE_UNUSED,
+			     asection **secp,
+			     bfd_vma *valp)
+{
+  unsigned int indx = sym->st_shndx;
+
+  switch (indx)
+    {
+    case SHN_CR16C_FCOMMON:
+      *secp = bfd_make_section_old_way (abfd, ".fcommon");
+      (*secp)->flags |= SEC_IS_COMMON;
+      *valp = sym->st_size;
+      break;
+    case SHN_CR16C_NCOMMON:
+      *secp = bfd_make_section_old_way (abfd, ".ncommon");
+      (*secp)->flags |= SEC_IS_COMMON;
+      *valp = sym->st_size;
+      break;
+    }
+
+  return TRUE;
+}
+
+static int
+elf32_cr16c_link_output_symbol_hook (struct bfd_link_info *info ATTRIBUTE_UNUSED,
+				     const char *name ATTRIBUTE_UNUSED,
+				     Elf_Internal_Sym *sym,
+				     asection *input_sec,
+				     struct elf_link_hash_entry *h ATTRIBUTE_UNUSED)
+{
+  /* If we see a common symbol, which implies a relocatable link, then
+     if a symbol was in a special common section in an input file, mark
+     it as a special common in the output file.  */
+
+  if (sym->st_shndx == SHN_COMMON)
+    {
+      if (strcmp (input_sec->name, ".fcommon") == 0)
+	sym->st_shndx = SHN_CR16C_FCOMMON;
+      else if (strcmp (input_sec->name, ".ncommon") == 0)
+	sym->st_shndx = SHN_CR16C_NCOMMON;
+    }
+
+  return 1;
+}
+
+/* Definitions for setting CR16C target vector.  */
+#define TARGET_LITTLE_SYM		bfd_elf32_cr16c_vec
+#define TARGET_LITTLE_NAME		"elf32-cr16c"
+#define ELF_ARCH			bfd_arch_cr16c
+#define ELF_MACHINE_CODE		EM_CR
+#define ELF_MAXPAGESIZE			0x1
+#define elf_symbol_leading_char		'_'
+
+#define bfd_elf32_bfd_reloc_type_lookup		elf_cr16c_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup	elf_cr16c_reloc_name_lookup
+#define elf_info_to_howto			elf_cr16c_info_to_howto
+#define elf_info_to_howto_rel			elf_cr16c_info_to_howto_rel
+#define elf_backend_relocate_section		elf32_cr16c_relocate_section
+#define elf_backend_symbol_processing		elf32_cr16c_symbol_processing
+#define elf_backend_section_from_bfd_section 	elf32_cr16c_section_from_bfd_section
+#define elf_backend_add_symbol_hook		elf32_cr16c_add_symbol_hook
+#define elf_backend_link_output_symbol_hook 	elf32_cr16c_link_output_symbol_hook
+
+#define elf_backend_can_gc_sections     1
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-cris.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-cris.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-cris.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-cris.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4442 @@
+/* CRIS-specific support for 32-bit ELF.
+   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+   2010, 2011 Free Software Foundation, Inc.
+   Contributed by Axis Communications AB.
+   Written by Hans-Peter Nilsson, based on elf32-fr30.c
+   PIC and shlib bits based primarily on elf32-m68k.c and elf32-i386.c.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/cris.h"
+#include <limits.h>
+
+/* Forward declarations.  */
+static reloc_howto_type * cris_reloc_type_lookup
+  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
+
+static void cris_info_to_howto_rela
+  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
+
+static bfd_reloc_status_type cris_elf_pcrel_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+
+static bfd_boolean cris_elf_grok_prstatus
+  PARAMS ((bfd *abfd, Elf_Internal_Note *note));
+
+static bfd_boolean cris_elf_grok_psinfo
+  PARAMS ((bfd *abfd, Elf_Internal_Note *note));
+
+static bfd_boolean cris_elf_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
+
+static bfd_reloc_status_type cris_final_link_relocate
+  PARAMS ((reloc_howto_type *, bfd *, asection *, bfd_byte *,
+	   Elf_Internal_Rela *, bfd_vma));
+
+static bfd_boolean cris_elf_object_p PARAMS ((bfd *));
+
+static void cris_elf_final_write_processing PARAMS ((bfd *, bfd_boolean));
+
+static bfd_boolean cris_elf_set_mach_from_flags
+  PARAMS ((bfd *, unsigned long int));
+
+static bfd_boolean cris_elf_print_private_bfd_data PARAMS ((bfd *, PTR));
+
+static bfd_boolean cris_elf_merge_private_bfd_data PARAMS ((bfd *, bfd *));
+static bfd_boolean cris_elf_copy_private_bfd_data PARAMS ((bfd *, bfd *));
+
+struct elf_cris_link_hash_entry;
+static bfd_boolean elf_cris_discard_excess_dso_dynamics
+  PARAMS ((struct elf_cris_link_hash_entry *, PTR));
+static bfd_boolean elf_cris_discard_excess_program_dynamics
+  PARAMS ((struct elf_cris_link_hash_entry *, PTR));
+static bfd_boolean elf_cris_adjust_gotplt_to_got
+  PARAMS ((struct elf_cris_link_hash_entry *, PTR));
+static bfd_boolean elf_cris_try_fold_plt_to_got
+  PARAMS ((struct elf_cris_link_hash_entry *, PTR));
+static struct bfd_hash_entry *elf_cris_link_hash_newfunc
+  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
+static struct bfd_link_hash_table *elf_cris_link_hash_table_create
+  PARAMS ((bfd *));
+static bfd_boolean elf_cris_adjust_dynamic_symbol
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
+static bfd_boolean cris_elf_check_relocs
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+	   const Elf_Internal_Rela *));
+
+static bfd_boolean elf_cris_size_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean elf_cris_finish_dynamic_symbol
+  PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
+	   Elf_Internal_Sym *));
+static bfd_boolean elf_cris_finish_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
+static void elf_cris_hide_symbol
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *, bfd_boolean));
+static enum elf_reloc_type_class elf_cris_reloc_type_class
+  PARAMS ((const Elf_Internal_Rela *));
+
+static reloc_howto_type cris_elf_howto_table [] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_CRIS_NONE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRIS_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An 8 bit absolute relocation.  */
+  HOWTO (R_CRIS_8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRIS_8",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000,		/* src_mask */
+	 0x00ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit absolute relocation.  */
+  HOWTO (R_CRIS_16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRIS_16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000000,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32 bit absolute relocation.  */
+  HOWTO (R_CRIS_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 /* We don't want overflow complaints for 64-bit vma builds
+	    for e.g. sym+0x40000000 (or actually sym-0xc0000000 in
+	    32-bit ELF) where sym=0xc0001234.
+	    Don't do this for the PIC relocs, as we don't expect to
+	    see them with large offsets.  */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRIS_32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000000,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An 8 bit PC-relative relocation.  */
+  HOWTO (R_CRIS_8_PCREL,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 cris_elf_pcrel_reloc,	/* special_function */
+	 "R_CRIS_8_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000,		/* src_mask */
+	 0x00ff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 16 bit PC-relative relocation.  */
+  HOWTO (R_CRIS_16_PCREL,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 cris_elf_pcrel_reloc,	/* special_function */
+	 "R_CRIS_16_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000000,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 32 bit PC-relative relocation.  */
+  HOWTO (R_CRIS_32_PCREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 cris_elf_pcrel_reloc,	/* special_function */
+	 "R_CRIS_32_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000000,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_CRIS_GNU_VTINHERIT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_CRIS_GNU_VTINHERIT", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage.  */
+  HOWTO (R_CRIS_GNU_VTENTRY,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_elf_rel_vtable_reloc_fn,	/* special_function */
+	 "R_CRIS_GNU_VTENTRY",	 /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* This is used only by the dynamic linker.  The symbol should exist
+     both in the object being run and in some shared library.  The
+     dynamic linker copies the data addressed by the symbol from the
+     shared library into the object, because the object being
+     run has to have the data at some particular address.  */
+  HOWTO (R_CRIS_COPY,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRIS_COPY",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_CRIS_32, but used when setting global offset table entries.  */
+  HOWTO (R_CRIS_GLOB_DAT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRIS_GLOB_DAT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Marks a procedure linkage table entry for a symbol.  */
+  HOWTO (R_CRIS_JUMP_SLOT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRIS_JUMP_SLOT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used only by the dynamic linker.  When the object is run, this
+     longword is set to the load address of the object, plus the
+     addend.  */
+  HOWTO (R_CRIS_RELATIVE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRIS_RELATIVE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_CRIS_32, but referring to the GOT table entry for the symbol.  */
+  HOWTO (R_CRIS_16_GOT,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRIS_16_GOT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_CRIS_32_GOT,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRIS_32_GOT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_CRIS_32_GOT, but referring to (and requesting a) PLT part of
+     the GOT table for the symbol.  */
+  HOWTO (R_CRIS_16_GOTPLT,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRIS_16_GOTPLT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_CRIS_32_GOTPLT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRIS_32_GOTPLT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32-bit offset from GOT to (local const) symbol: no GOT entry should
+     be necessary.  */
+  HOWTO (R_CRIS_32_GOTREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRIS_32_GOTREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32-bit offset from GOT to entry for this symbol in PLT and request
+     to create PLT entry for symbol.  */
+  HOWTO (R_CRIS_32_PLT_GOTREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRIS_32_PLT_GOTREL", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32-bit offset from PC (location after the relocation) + addend to
+     entry for this symbol in PLT and request to create PLT entry for
+     symbol.  */
+  HOWTO (R_CRIS_32_PLT_PCREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 cris_elf_pcrel_reloc,	/* special_function */
+	 "R_CRIS_32_PLT_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* We don't handle these in any special manner and cross-format
+     linking is not supported; just recognize them enough to pass them
+     around.  FIXME: do the same for most PIC relocs and add sanity
+     tests to actually refuse gracefully to handle these and PIC
+     relocs for cross-format linking.  */
+#define TLSHOWTO32(name) \
+ HOWTO (name, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, \
+        bfd_elf_generic_reloc, #name, FALSE, 0, 0xffffffff, FALSE)
+#define TLSHOWTO16X(name, X)	     \
+ HOWTO (name, 0, 1, 16, FALSE, 0, complain_overflow_ ## X, \
+        bfd_elf_generic_reloc, #name, FALSE, 0, 0xffff, FALSE)
+#define TLSHOWTO16(name) TLSHOWTO16X(name, unsigned)
+#define TLSHOWTO16S(name) TLSHOWTO16X(name, signed)
+
+  TLSHOWTO32 (R_CRIS_32_GOT_GD),
+  TLSHOWTO16 (R_CRIS_16_GOT_GD),
+  TLSHOWTO32 (R_CRIS_32_GD),
+  TLSHOWTO32 (R_CRIS_DTP),
+  TLSHOWTO32 (R_CRIS_32_DTPREL),
+  TLSHOWTO16S (R_CRIS_16_DTPREL),
+  TLSHOWTO32 (R_CRIS_32_GOT_TPREL),
+  TLSHOWTO16S (R_CRIS_16_GOT_TPREL),
+  TLSHOWTO32 (R_CRIS_32_TPREL),
+  TLSHOWTO16S (R_CRIS_16_TPREL),
+  TLSHOWTO32 (R_CRIS_DTPMOD),
+  TLSHOWTO32 (R_CRIS_32_IE)
+};
+
+/* Map BFD reloc types to CRIS ELF reloc types.  */
+
+struct cris_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned int cris_reloc_val;
+};
+
+static const struct cris_reloc_map cris_reloc_map [] =
+{
+  { BFD_RELOC_NONE,		R_CRIS_NONE },
+  { BFD_RELOC_8,		R_CRIS_8 },
+  { BFD_RELOC_16,		R_CRIS_16 },
+  { BFD_RELOC_32,		R_CRIS_32 },
+  { BFD_RELOC_8_PCREL,		R_CRIS_8_PCREL },
+  { BFD_RELOC_16_PCREL,		R_CRIS_16_PCREL },
+  { BFD_RELOC_32_PCREL,		R_CRIS_32_PCREL },
+  { BFD_RELOC_VTABLE_INHERIT,	R_CRIS_GNU_VTINHERIT },
+  { BFD_RELOC_VTABLE_ENTRY,	R_CRIS_GNU_VTENTRY },
+  { BFD_RELOC_CRIS_COPY,	R_CRIS_COPY },
+  { BFD_RELOC_CRIS_GLOB_DAT,	R_CRIS_GLOB_DAT },
+  { BFD_RELOC_CRIS_JUMP_SLOT,	R_CRIS_JUMP_SLOT },
+  { BFD_RELOC_CRIS_RELATIVE,	R_CRIS_RELATIVE },
+  { BFD_RELOC_CRIS_16_GOT,	R_CRIS_16_GOT },
+  { BFD_RELOC_CRIS_32_GOT,	R_CRIS_32_GOT },
+  { BFD_RELOC_CRIS_16_GOTPLT,	R_CRIS_16_GOTPLT },
+  { BFD_RELOC_CRIS_32_GOTPLT,	R_CRIS_32_GOTPLT },
+  { BFD_RELOC_CRIS_32_GOTREL,	R_CRIS_32_GOTREL },
+  { BFD_RELOC_CRIS_32_PLT_GOTREL, R_CRIS_32_PLT_GOTREL },
+  { BFD_RELOC_CRIS_32_PLT_PCREL, R_CRIS_32_PLT_PCREL },
+  { BFD_RELOC_CRIS_32_GOT_GD,	R_CRIS_32_GOT_GD },
+  { BFD_RELOC_CRIS_16_GOT_GD,	R_CRIS_16_GOT_GD },
+  { BFD_RELOC_CRIS_32_GD,	R_CRIS_32_GD },
+  { BFD_RELOC_CRIS_DTP,	R_CRIS_DTP },
+  { BFD_RELOC_CRIS_32_DTPREL,	R_CRIS_32_DTPREL },
+  { BFD_RELOC_CRIS_16_DTPREL,	R_CRIS_16_DTPREL },
+  { BFD_RELOC_CRIS_32_GOT_TPREL, R_CRIS_32_GOT_TPREL },
+  { BFD_RELOC_CRIS_16_GOT_TPREL, R_CRIS_16_GOT_TPREL },
+  { BFD_RELOC_CRIS_32_TPREL,	R_CRIS_32_TPREL },
+  { BFD_RELOC_CRIS_16_TPREL,	R_CRIS_16_TPREL },
+  { BFD_RELOC_CRIS_DTPMOD,	R_CRIS_DTPMOD },
+  { BFD_RELOC_CRIS_32_IE,	R_CRIS_32_IE }
+};
+
+static reloc_howto_type *
+cris_reloc_type_lookup (abfd, code)
+     bfd * abfd ATTRIBUTE_UNUSED;
+     bfd_reloc_code_real_type code;
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (cris_reloc_map) / sizeof (cris_reloc_map[0]); i++)
+    if (cris_reloc_map [i].bfd_reloc_val == code)
+      return & cris_elf_howto_table [cris_reloc_map[i].cris_reloc_val];
+
+  return NULL;
+}
+
+static reloc_howto_type *
+cris_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (cris_elf_howto_table) / sizeof (cris_elf_howto_table[0]);
+       i++)
+    if (cris_elf_howto_table[i].name != NULL
+	&& strcasecmp (cris_elf_howto_table[i].name, r_name) == 0)
+      return &cris_elf_howto_table[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for an CRIS ELF reloc.  */
+
+static void
+cris_info_to_howto_rela (abfd, cache_ptr, dst)
+     bfd * abfd ATTRIBUTE_UNUSED;
+     arelent * cache_ptr;
+     Elf_Internal_Rela * dst;
+{
+  enum elf_cris_reloc_type r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_CRIS_max);
+  cache_ptr->howto = & cris_elf_howto_table [r_type];
+}
+
+bfd_reloc_status_type
+cris_elf_pcrel_reloc (abfd, reloc_entry, symbol, data, input_section,
+		      output_bfd, error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry;
+     asymbol *symbol;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  /* By default (using only bfd_elf_generic_reloc when linking to
+     non-ELF formats) PC-relative relocs are relative to the beginning
+     of the reloc.  CRIS PC-relative relocs are relative to the position
+     *after* the reloc because that's what pre-CRISv32 PC points to
+     after reading an insn field with that reloc.  (For CRISv32, PC is
+     actually relative to the start of the insn, but we keep the old
+     definition.)  Still, we use as much generic machinery as we can.
+
+     Only adjust when doing a final link.  */
+  if (output_bfd == (bfd *) NULL)
+    reloc_entry->addend -= 1 << reloc_entry->howto->size;
+
+  return
+    bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+			   input_section, output_bfd, error_message);
+}
+
+/* Support for core dump NOTE sections.
+   The slightly unintuitive code layout is an attempt to keep at least
+   some similarities with other ports, hoping to simplify general
+   changes, while still keeping Linux/CRIS and Linux/CRISv32 code apart.  */
+
+static bfd_boolean
+cris_elf_grok_prstatus (abfd, note)
+     bfd *abfd;
+     Elf_Internal_Note *note;
+{
+  int offset;
+  size_t size;
+
+  if (bfd_get_mach (abfd) == bfd_mach_cris_v32)
+    switch (note->descsz)
+      {
+      default:
+	return FALSE;
+
+      case 202:		/* Linux/CRISv32 */
+	/* pr_cursig */
+	elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12);
+
+	/* pr_pid */
+	elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 22);
+
+	/* pr_reg */
+	offset = 70;
+	size = 128;
+
+	break;
+      }
+  else
+    switch (note->descsz)
+      {
+      default:
+	return FALSE;
+
+      case 214:		/* Linux/CRIS */
+	/* pr_cursig */
+	elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12);
+
+	/* pr_pid */
+	elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 22);
+
+	/* pr_reg */
+	offset = 70;
+	size = 140;
+
+	break;
+      }
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg",
+					  size, note->descpos + offset);
+}
+
+static bfd_boolean
+cris_elf_grok_psinfo (abfd, note)
+     bfd *abfd;
+     Elf_Internal_Note *note;
+{
+  if (bfd_get_mach (abfd) == bfd_mach_cris_v32)
+    switch (note->descsz)
+      {
+      default:
+	return FALSE;
+
+      case 124:		/* Linux/CRISv32 elf_prpsinfo */
+	elf_tdata (abfd)->core_program
+	  = _bfd_elfcore_strndup (abfd, note->descdata + 28, 16);
+	elf_tdata (abfd)->core_command
+	  = _bfd_elfcore_strndup (abfd, note->descdata + 44, 80);
+      }
+  else
+    switch (note->descsz)
+      {
+      default:
+	return FALSE;
+
+      case 124:		/* Linux/CRIS elf_prpsinfo */
+	elf_tdata (abfd)->core_program
+	  = _bfd_elfcore_strndup (abfd, note->descdata + 28, 16);
+	elf_tdata (abfd)->core_command
+	  = _bfd_elfcore_strndup (abfd, note->descdata + 44, 80);
+      }
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+
+  {
+    char *command = elf_tdata (abfd)->core_command;
+    int n = strlen (command);
+
+    if (0 < n && command[n - 1] == ' ')
+      command[n - 1] = '\0';
+  }
+
+  return TRUE;
+}
+
+/* The name of the dynamic interpreter.  This is put in the .interp
+   section.  */
+
+#define ELF_DYNAMIC_INTERPRETER "/lib/ld.so.1"
+
+/* The size in bytes of an entry in the procedure linkage table.  */
+
+#define PLT_ENTRY_SIZE 20
+#define PLT_ENTRY_SIZE_V32 26
+
+/* The first entry in an absolute procedure linkage table looks like this.  */
+
+static const bfd_byte elf_cris_plt0_entry[PLT_ENTRY_SIZE] =
+{
+  0xfc, 0xe1,
+  0x7e, 0x7e,	/* push mof.  */
+  0x7f, 0x0d,   /*  (dip [pc+]) */
+  0, 0, 0, 0,	/*  Replaced with address of .got + 4.  */
+  0x30, 0x7a,	/* move [...],mof */
+  0x7f, 0x0d,   /*  (dip [pc+]) */
+  0, 0, 0, 0,	/*  Replaced with address of .got + 8.  */
+  0x30, 0x09	/* jump [...] */
+};
+
+static const bfd_byte elf_cris_plt0_entry_v32[PLT_ENTRY_SIZE_V32] =
+{
+  0x84, 0xe2,	/* subq 4,$sp */
+  0x6f, 0xfe,	/* move.d 0,$acr */
+  0, 0, 0, 0,	/*  Replaced by address of .got + 4.  */
+  0x7e, 0x7a,	/* move $mof,[$sp] */
+  0x3f, 0x7a,	/* move [$acr],$mof */
+  0x04, 0xf2,	/* addq 4,acr */
+  0x6f, 0xfa,	/* move.d [$acr],$acr */
+  0xbf, 0x09,	/* jump $acr */
+  0xb0, 0x05,	/* nop */
+  0, 0		/*  Pad out to 26 bytes.  */
+};
+
+/* Subsequent entries in an absolute procedure linkage table look like
+   this.  */
+
+static const bfd_byte elf_cris_plt_entry[PLT_ENTRY_SIZE] =
+{
+  0x7f, 0x0d,   /*  (dip [pc+]) */
+  0, 0, 0, 0,	/*  Replaced with address of this symbol in .got.  */
+  0x30, 0x09,	/* jump [...] */
+  0x3f,	 0x7e,	/* move [pc+],mof */
+  0, 0, 0, 0,	/*  Replaced with offset into relocation table.  */
+  0x2f, 0xfe,	/* add.d [pc+],pc */
+  0xec, 0xff,
+  0xff, 0xff	/*  Replaced with offset to start of .plt.  */
+};
+
+static const bfd_byte elf_cris_plt_entry_v32[PLT_ENTRY_SIZE_V32] =
+{
+  0x6f, 0xfe,	/* move.d 0,$acr */
+  0, 0, 0, 0,	/*  Replaced with address of this symbol in .got.  */
+  0x6f, 0xfa,   /* move.d [$acr],$acr */
+  0xbf, 0x09,   /* jump $acr */
+  0xb0, 0x05,	/* nop */
+  0x3f, 0x7e,	/* move 0,mof */
+  0, 0, 0, 0,	/*  Replaced with offset into relocation table. */
+  0xbf, 0x0e,	/* ba start_of_plt0_entry */
+  0, 0, 0, 0,	/*  Replaced with offset to plt0 entry.  */
+  0xb0, 0x05	/* nop */
+};
+
+/* The first entry in a PIC procedure linkage table looks like this.  */
+
+static const bfd_byte elf_cris_pic_plt0_entry[PLT_ENTRY_SIZE] =
+{
+  0xfc, 0xe1, 0x7e, 0x7e,	/* push mof */
+  0x04, 0x01, 0x30, 0x7a,	/* move [r0+4],mof */
+  0x08, 0x01, 0x30, 0x09,	/* jump [r0+8] */
+  0, 0, 0, 0, 0, 0, 0, 0,	/*  Pad out to 20 bytes.  */
+};
+
+static const bfd_byte elf_cris_pic_plt0_entry_v32[PLT_ENTRY_SIZE_V32] =
+{
+  0x84, 0xe2,	/* subq 4,$sp */
+  0x04, 0x01,	/* addoq 4,$r0,$acr */
+  0x7e, 0x7a,	/* move $mof,[$sp] */
+  0x3f, 0x7a,	/* move [$acr],$mof */
+  0x04, 0xf2,	/* addq 4,$acr */
+  0x6f, 0xfa,	/* move.d [$acr],$acr */
+  0xbf, 0x09,	/* jump $acr */
+  0xb0, 0x05,	/* nop */
+  0, 0,		/*  Pad out to 26 bytes.  */
+  0, 0, 0, 0,
+  0, 0, 0, 0
+};
+
+/* Subsequent entries in a PIC procedure linkage table look like this.  */
+
+static const bfd_byte elf_cris_pic_plt_entry[PLT_ENTRY_SIZE] =
+{
+  0x6f, 0x0d,   /*  (bdap [pc+].d,r0) */
+  0, 0, 0, 0,	/*  Replaced with offset of this symbol in .got.  */
+  0x30, 0x09,	/* jump [...] */
+  0x3f, 0x7e,	/* move [pc+],mof */
+  0, 0, 0, 0,	/*  Replaced with offset into relocation table.  */
+  0x2f, 0xfe,	/* add.d [pc+],pc */
+  0xec, 0xff,	/*  Replaced with offset to start of .plt.  */
+  0xff, 0xff
+};
+
+static const bfd_byte elf_cris_pic_plt_entry_v32[PLT_ENTRY_SIZE_V32] =
+{
+  0x6f, 0x0d,	/* addo.d 0,$r0,$acr */
+  0, 0, 0, 0,	/*  Replaced with offset of this symbol in .got.  */
+  0x6f, 0xfa,	/* move.d [$acr],$acr */
+  0xbf, 0x09,	/* jump $acr */
+  0xb0, 0x05,	/* nop */
+  0x3f, 0x7e,	/* move relocoffs,$mof */
+  0, 0, 0, 0,	/*  Replaced with offset into relocation table.  */
+  0xbf, 0x0e,	/* ba start_of_plt */
+  0, 0, 0, 0,	/*  Replaced with offset to start of .plt.  */
+  0xb0, 0x05	/* nop */
+};
+
+/* We copy elf32-m68k.c and elf32-i386.c for the basic linker hash bits
+   (and most other PIC/shlib stuff).  Check that we don't drift away
+   without reason.
+
+   The CRIS linker, like the m68k and i386 linkers (and probably the rest
+   too) needs to keep track of the number of relocs that it decides to
+   copy in check_relocs for each symbol.  This is so that it can discard
+   PC relative relocs if it doesn't need them when linking with
+   -Bsymbolic.  We store the information in a field extending the regular
+   ELF linker hash table.  */
+
+/* This structure keeps track of the number of PC relative relocs we have
+   copied for a given symbol.  */
+
+struct elf_cris_pcrel_relocs_copied
+{
+  /* Next section.  */
+  struct elf_cris_pcrel_relocs_copied *next;
+
+  /* A section in dynobj.  */
+  asection *section;
+
+  /* Number of relocs copied in this section.  */
+  bfd_size_type count;
+
+  /* Example of reloc being copied, for message.  */
+  enum elf_cris_reloc_type r_type;
+};
+
+/* CRIS ELF linker hash entry.  */
+
+struct elf_cris_link_hash_entry
+{
+  struct elf_link_hash_entry root;
+
+  /* Number of PC relative relocs copied for this symbol.  */
+  struct elf_cris_pcrel_relocs_copied *pcrel_relocs_copied;
+
+  /* The GOTPLT references are CRIS-specific; the goal is to avoid having
+     both a general GOT and a PLT-specific GOT entry for the same symbol,
+     when it is referenced both as a function and as a function pointer.
+
+     Number of GOTPLT references for a function.  */
+  bfd_signed_vma gotplt_refcount;
+
+  /* Actual GOTPLT index for this symbol, if applicable, or zero if not
+     (zero is never used as an index).  FIXME: We should be able to fold
+     this with gotplt_refcount in a union, like the got and plt unions in
+     elf_link_hash_entry.  */
+  bfd_size_type gotplt_offset;
+
+  /* The root.got.refcount is the sum of the regular reference counts
+     (this) and those members below.  We have to keep a separate count
+     to track when we've found the first (or last) reference to a
+     regular got entry.  The offset is in root.got.offset.  */
+  bfd_signed_vma reg_got_refcount;
+
+  /* Similar to the above, the number of reloc references to this
+     symbols that need a R_CRIS_32_TPREL slot.  The offset is in
+     root.got.offset, because this and .dtp_refcount can't validly
+     happen when there's also a regular GOT entry; that's invalid
+     input for which an error is emitted.  */
+  bfd_signed_vma tprel_refcount;
+
+  /* Similar to the above, the number of reloc references to this
+     symbols that need a R_CRIS_DTP slot.  The offset is in
+     root.got.offset; plus 4 if .tprel_refcount > 0.  */
+  bfd_signed_vma dtp_refcount;
+};
+
+/* The local_got_refcounts and local_got_offsets are a multiple of
+   LSNUM in size, namely LGOT_ALLOC_NELTS_FOR(LSNUM) (plus one for the
+   refcount for GOT itself, see code), with the summary / group offset
+   for local symbols located at offset N, reference counts for
+   ordinary (address) relocs at offset N + LSNUM, for R_CRIS_DTP
+   relocs at offset N + 2*LSNUM, and for R_CRIS_32_TPREL relocs at N +
+   3*LSNUM.  */
+
+#define LGOT_REG_NDX(x) ((x) + symtab_hdr->sh_info)
+#define LGOT_DTP_NDX(x) ((x) + 2 * symtab_hdr->sh_info)
+#define LGOT_TPREL_NDX(x) ((x) + 3 * symtab_hdr->sh_info)
+#define LGOT_ALLOC_NELTS_FOR(x) ((x) * 4)
+
+/* CRIS ELF linker hash table.  */
+
+struct elf_cris_link_hash_table
+{
+  struct elf_link_hash_table root;
+
+  /* We can't use the PLT offset and calculate to get the GOTPLT offset,
+     since we try and avoid creating GOTPLT:s when there's already a GOT.
+     Instead, we keep and update the next available index here.  */
+  bfd_size_type next_gotplt_entry;
+
+  /* The number of R_CRIS_32_DTPREL and R_CRIS_16_DTPREL that have
+     been seen for any input; if != 0, then the constant-offset
+     R_CRIS_DTPMOD is needed for this DSO/executable.  This turns
+     negative at relocation, so that we don't need an extra flag for
+     when the reloc is output.  */
+  bfd_signed_vma dtpmod_refcount;
+};
+
+/* Traverse a CRIS ELF linker hash table.  */
+
+#define elf_cris_link_hash_traverse(table, func, info)			\
+  (elf_link_hash_traverse						\
+   (&(table)->root,							\
+    (bfd_boolean (*) (struct elf_link_hash_entry *, void *)) (func),	\
+    (info)))
+
+/* Get the CRIS ELF linker hash table from a link_info structure.  */
+
+#define elf_cris_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == CRIS_ELF_DATA ? ((struct elf_cris_link_hash_table *) ((p)->hash)) : NULL)
+
+/* Get the CRIS ELF linker hash entry from a regular hash entry (the
+   "parent class").  The .root reference is just a simple type
+   check on the argument.  */
+
+#define elf_cris_hash_entry(p) \
+ ((struct elf_cris_link_hash_entry *) (&(p)->root))
+
+/* Create an entry in a CRIS ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+elf_cris_link_hash_newfunc (struct bfd_hash_entry *entry,
+			    struct bfd_hash_table *table,
+			    const char *string)
+{
+  struct elf_cris_link_hash_entry *ret =
+    (struct elf_cris_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == (struct elf_cris_link_hash_entry *) NULL)
+    ret = ((struct elf_cris_link_hash_entry *)
+	   bfd_hash_allocate (table,
+			      sizeof (struct elf_cris_link_hash_entry)));
+  if (ret == (struct elf_cris_link_hash_entry *) NULL)
+    return (struct bfd_hash_entry *) ret;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct elf_cris_link_hash_entry *)
+	 _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
+				     table, string));
+  if (ret != (struct elf_cris_link_hash_entry *) NULL)
+    {
+      ret->pcrel_relocs_copied = NULL;
+      ret->gotplt_refcount = 0;
+      ret->gotplt_offset = 0;
+      ret->dtp_refcount = 0;
+      ret->tprel_refcount = 0;
+      ret->reg_got_refcount = 0;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Create a CRIS ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+elf_cris_link_hash_table_create (bfd *abfd)
+{
+  struct elf_cris_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct elf_cris_link_hash_table);
+
+  ret = ((struct elf_cris_link_hash_table *) bfd_malloc (amt));
+  if (ret == (struct elf_cris_link_hash_table *) NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->root, abfd,
+				      elf_cris_link_hash_newfunc,
+				      sizeof (struct elf_cris_link_hash_entry),
+				      CRIS_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  /* Initialize to skip over the first three entries in the gotplt; they
+     are used for run-time symbol evaluation.  */
+  ret->next_gotplt_entry = 12;
+
+  /* We haven't seen any R_CRIS_nn_GOT_TPREL initially.  */
+  ret->dtpmod_refcount = 0;
+
+  return &ret->root.root;
+}
+
+/* Perform a single relocation.  By default we use the standard BFD
+   routines, with a few tweaks.  */
+
+static bfd_reloc_status_type
+cris_final_link_relocate (howto, input_bfd, input_section, contents, rel,
+			  relocation)
+     reloc_howto_type *  howto;
+     bfd *               input_bfd;
+     asection *          input_section;
+     bfd_byte *          contents;
+     Elf_Internal_Rela * rel;
+     bfd_vma             relocation;
+{
+  bfd_reloc_status_type r;
+  enum elf_cris_reloc_type r_type = ELF32_R_TYPE (rel->r_info);
+
+  /* PC-relative relocations are relative to the position *after*
+     the reloc.  Note that for R_CRIS_8_PCREL the adjustment is
+     not a single byte, since PC must be 16-bit-aligned.  */
+  switch (r_type)
+    {
+      /* Check that the 16-bit GOT relocs are positive.  */
+    case R_CRIS_16_GOTPLT:
+    case R_CRIS_16_GOT:
+      if ((bfd_signed_vma) relocation < 0)
+	return bfd_reloc_overflow;
+      break;
+
+    case R_CRIS_32_PLT_PCREL:
+    case R_CRIS_32_PCREL:
+      relocation -= 2;
+      /* Fall through.  */
+    case R_CRIS_8_PCREL:
+    case R_CRIS_16_PCREL:
+      relocation -= 2;
+      break;
+
+    default:
+      break;
+    }
+
+  r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+				contents, rel->r_offset,
+				relocation, rel->r_addend);
+  return r;
+}
+
+
+/* The number of errors left before we stop outputting reloc-specific
+   explanatory messages.  By coincidence, this works nicely together
+   with the default number of messages you'll get from LD about
+   "relocation truncated to fit" messages before you get an
+   "additional relocation overflows omitted from the output".  */
+static int additional_relocation_error_msg_count = 10;
+
+/* Relocate an CRIS ELF section.  See elf32-fr30.c, from where this was
+   copied, for further comments.  */
+
+static bfd_boolean
+cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
+			   struct bfd_link_info *info,
+			   bfd *input_bfd,
+			   asection *input_section,
+			   bfd_byte *contents,
+			   Elf_Internal_Rela *relocs,
+			   Elf_Internal_Sym *local_syms,
+			   asection **local_sections)
+{
+  struct elf_cris_link_hash_table * htab;
+  bfd *dynobj;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_vma *local_got_offsets;
+  asection *sgot;
+  asection *splt;
+  asection *sreloc;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  asection *srelgot;
+
+  htab = elf_cris_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  local_got_offsets = elf_local_got_offsets (input_bfd);
+  symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+  relend     = relocs + input_section->reloc_count;
+
+  sgot = NULL;
+  splt = NULL;
+  sreloc = NULL;
+  srelgot = NULL;
+
+  if (dynobj != NULL)
+    {
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      sgot = bfd_get_section_by_name (dynobj, ".got");
+    }
+
+  for (rel = relocs; rel < relend; rel ++)
+    {
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+      const char *symname = NULL;
+      enum elf_cris_reloc_type r_type;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      if (   r_type == R_CRIS_GNU_VTINHERIT
+	  || r_type == R_CRIS_GNU_VTENTRY)
+	continue;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      howto  = cris_elf_howto_table + r_type;
+      h      = NULL;
+      sym    = NULL;
+      sec    = NULL;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections [r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+
+	  symname = (bfd_elf_string_from_elf_section
+		     (input_bfd, symtab_hdr->sh_link, sym->st_name));
+	  if (symname == NULL)
+	    symname = bfd_section_name (input_bfd, sec);
+	}
+      else
+	{
+	  bfd_boolean warned;
+	  bfd_boolean unresolved_reloc;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+
+	  symname = h->root.root.string;
+
+	  if (unresolved_reloc
+	      /* Perhaps we should detect the cases that
+		 sec->output_section is expected to be NULL like i386 and
+		 m68k, but apparently (and according to elfxx-ia64.c) all
+		 valid cases are where the symbol is defined in a shared
+		 object which we link dynamically against.  This includes
+		 PLT relocs for which we've created a PLT entry and other
+		 relocs for which we're prepared to create dynamic
+		 relocations.
+
+		 For now, new situations cause us to just err when
+		 sec->output_offset is NULL but the object with the symbol
+		 is *not* dynamically linked against.  Thus this will
+		 automatically remind us so we can see if there are other
+		 valid cases we need to revisit.  */
+	      && (sec->owner->flags & DYNAMIC) != 0)
+	    relocation = 0;
+
+	  else if (h->root.type == bfd_link_hash_defined
+		   || h->root.type == bfd_link_hash_defweak)
+	    {
+	      /* Here follow the cases where the relocation value must
+		 be zero (or when further handling is simplified when
+		 zero).  I can't claim to understand the various
+		 conditions and they weren't described in the files
+		 where I copied them from (elf32-m68k.c and
+		 elf32-i386.c), but let's mention examples of where
+		 they happen.  FIXME: Perhaps define and use a
+		 dynamic_symbol_p function like ia64.
+
+		 - When creating a shared library, we can have an
+		 ordinary relocation for a symbol defined in a shared
+		 library (perhaps the one we create).  We then make
+		 the relocation value zero, as the value seen now will
+		 be added into the relocation addend in this shared
+		 library, but must be handled only at dynamic-link
+		 time.  FIXME: Not sure this example covers the
+		 h->elf_link_hash_flags test, though it's there in
+		 other targets.  */
+	      if (info->shared
+		  && ((! info->symbolic && h->dynindx != -1)
+		      || !h->def_regular)
+		  && (input_section->flags & SEC_ALLOC) != 0
+		  && (r_type == R_CRIS_8
+		      || r_type == R_CRIS_16
+		      || r_type == R_CRIS_32
+		      || r_type == R_CRIS_8_PCREL
+		      || r_type == R_CRIS_16_PCREL
+		      || r_type == R_CRIS_32_PCREL))
+		relocation = 0;
+	      else if (!info->relocatable && unresolved_reloc)
+		{
+		  _bfd_error_handler
+		    (_("%B, section %A: unresolvable relocation %s against symbol `%s'"),
+		     input_bfd,
+		     input_section,
+		     cris_elf_howto_table[r_type].name,
+		     symname);
+		  bfd_set_error (bfd_error_bad_value);
+		  return FALSE;
+		}
+	    }
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      switch (r_type)
+	{
+	case R_CRIS_16_GOTPLT:
+	case R_CRIS_32_GOTPLT:
+	  /* This is like the case for R_CRIS_32_GOT and R_CRIS_16_GOT,
+	     but we require a PLT, and the PLT handling will take care of
+	     filling in the PLT-specific GOT entry.  For the GOT offset,
+	     calculate it as we do when filling it in for the .got.plt
+	     section.  If we don't have a PLT, punt to GOT handling.  */
+	  if (h != NULL
+	      && ((struct elf_cris_link_hash_entry *) h)->gotplt_offset != 0)
+	    {
+	      asection *sgotplt
+		= bfd_get_section_by_name (dynobj, ".got.plt");
+	      bfd_vma got_offset;
+
+	      BFD_ASSERT (h->dynindx != -1);
+	      BFD_ASSERT (sgotplt != NULL);
+
+	      got_offset
+		= ((struct elf_cris_link_hash_entry *) h)->gotplt_offset;
+
+	      relocation = got_offset;
+	      break;
+	    }
+
+	  /* We didn't make a PLT entry for this symbol.  Maybe everything is
+	     folded into the GOT.  Other than folding, this happens when
+	     statically linking PIC code, or when using -Bsymbolic.  Check
+	     that we instead have a GOT entry as done for us by
+	     elf_cris_adjust_dynamic_symbol, and drop through into the
+	     ordinary GOT cases.  This must not happen for the
+	     executable, because any reference it does to a function
+	     that is satisfied by a DSO must generate a PLT.  We assume
+	     these call-specific relocs don't address non-functions.  */
+	  if (h != NULL
+	      && (h->got.offset == (bfd_vma) -1
+		  || (!info->shared
+		      && !(h->def_regular
+			   || (!h->def_dynamic
+			       && h->root.type == bfd_link_hash_undefweak)))))
+	    {
+	      (*_bfd_error_handler)
+		((h->got.offset == (bfd_vma) -1)
+		 ? _("%B, section %A: No PLT nor GOT for relocation %s"
+		     " against symbol `%s'")
+		 : _("%B, section %A: No PLT for relocation %s"
+		     " against symbol `%s'"),
+		 input_bfd,
+		 input_section,
+		 cris_elf_howto_table[r_type].name,
+		 (symname != NULL && symname[0] != '\0'
+		  ? symname : _("[whose name is lost]")));
+
+	      /* FIXME: Perhaps blaming input is not the right thing to
+		 do; this is probably an internal error.  But it is true
+		 that we didn't like that particular input.  */
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	  /* Fall through.  */
+
+	  /* The size of the actual relocation is not used here; we only
+	     fill in the GOT table here.  */
+	case R_CRIS_16_GOT:
+	case R_CRIS_32_GOT:
+	  {
+	    bfd_vma off;
+
+	    /* Note that despite using RELA relocations, the .got contents
+	       is always filled in with the link-relative relocation
+	       value; the addend.  */
+
+	    if (h != NULL)
+	      {
+		off = h->got.offset;
+		BFD_ASSERT (off != (bfd_vma) -1);
+
+		if (!elf_hash_table (info)->dynamic_sections_created
+		    || (! info->shared
+			&& (h->def_regular
+			    || h->type == STT_FUNC
+			    || h->needs_plt))
+		    || (info->shared
+			&& (info->symbolic || h->dynindx == -1)
+			&& h->def_regular))
+		  {
+		    /* This wasn't checked above for ! info->shared, but
+		       must hold there if we get here; the symbol must
+		       be defined in the regular program or be undefweak
+		       or be a function or otherwise need a PLT.  */
+		    BFD_ASSERT (!elf_hash_table (info)->dynamic_sections_created
+				|| info->shared
+				|| h->def_regular
+				|| h->type == STT_FUNC
+				|| h->needs_plt
+				|| h->root.type == bfd_link_hash_undefweak);
+
+		    /* This is actually a static link, or it is a
+		       -Bsymbolic link and the symbol is defined locally,
+		       or is undefweak, or the symbol was forced to be
+		       local because of a version file, or we're not
+		       creating a dynamic object.  We must initialize this
+		       entry in the global offset table.  Since the offset
+		       must always be a multiple of 4, we use the least
+		       significant bit to record whether we have
+		       initialized it already.
+
+		       If this GOT entry should be runtime-initialized, we
+		       will create a .rela.got relocation entry to
+		       initialize the value.  This is done in the
+		       finish_dynamic_symbol routine.  */
+		    if ((off & 1) != 0)
+		      off &= ~1;
+		    else
+		      {
+			bfd_put_32 (output_bfd, relocation,
+				    sgot->contents + off);
+			h->got.offset |= 1;
+		      }
+		  }
+	      }
+	    else
+	      {
+		BFD_ASSERT (local_got_offsets != NULL
+			    && local_got_offsets[r_symndx] != (bfd_vma) -1);
+
+		off = local_got_offsets[r_symndx];
+
+		/* The offset must always be a multiple of 4.  We use
+		   the least significant bit to record whether we have
+		   already generated the necessary reloc.  */
+		if ((off & 1) != 0)
+		  off &= ~1;
+		else
+		  {
+		    bfd_put_32 (output_bfd, relocation, sgot->contents + off);
+
+		    if (info->shared)
+		      {
+			Elf_Internal_Rela outrel;
+			bfd_byte *loc;
+
+			if (srelgot == NULL)
+			  srelgot
+			    = bfd_get_section_by_name (dynobj, ".rela.got");
+			BFD_ASSERT (srelgot != NULL);
+
+			outrel.r_offset = (sgot->output_section->vma
+					   + sgot->output_offset
+					   + off);
+			outrel.r_info = ELF32_R_INFO (0, R_CRIS_RELATIVE);
+			outrel.r_addend = relocation;
+			loc = srelgot->contents;
+			loc += srelgot->reloc_count++ * sizeof (Elf32_External_Rela);
+			bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+		      }
+
+		    local_got_offsets[r_symndx] |= 1;
+		  }
+	      }
+
+	    relocation = sgot->output_offset + off;
+	    if (rel->r_addend != 0)
+	      {
+		/* We can't do anything for a relocation which is against
+		   a symbol *plus offset*.  GOT holds relocations for
+		   symbols.  Make this an error; the compiler isn't
+		   allowed to pass us these kinds of things.  */
+		if (h == NULL)
+		  (*_bfd_error_handler)
+		    (_("%B, section %A: relocation %s with non-zero addend %d"
+		       " against local symbol"),
+		     input_bfd,
+		     input_section,
+		     cris_elf_howto_table[r_type].name,
+		     rel->r_addend);
+		else
+		  (*_bfd_error_handler)
+		    (_("%B, section %A: relocation %s with non-zero addend %d"
+		       " against symbol `%s'"),
+		     input_bfd,
+		     input_section,
+		     cris_elf_howto_table[r_type].name,
+		     rel->r_addend,
+		     symname[0] != '\0' ? symname : _("[whose name is lost]"));
+
+		bfd_set_error (bfd_error_bad_value);
+		return FALSE;
+	      }
+	  }
+	  break;
+
+	case R_CRIS_32_GOTREL:
+	  /* This relocation must only be performed against local symbols.
+	     It's also ok when we link a program and the symbol is either
+	     defined in an ordinary (non-DSO) object or is undefined weak.  */
+	  if (h != NULL
+	      && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+	      && !(!info->shared
+		   && (h->def_regular
+		       || (!h->def_dynamic
+			   && h->root.type == bfd_link_hash_undefweak))))
+	    {
+	      (*_bfd_error_handler)
+		(_("%B, section %A: relocation %s is"
+		   " not allowed for global symbol: `%s'"),
+		 input_bfd,
+		 input_section,
+		 cris_elf_howto_table[r_type].name,
+		 symname);
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+
+	  /* This can happen if we get a link error with the input ELF
+	     variant mismatching the output variant.  Emit an error so
+	     it's noticed if it happens elsewhere.  */
+	  if (sgot == NULL)
+	    {
+	      (*_bfd_error_handler)
+		(_("%B, section %A: relocation %s with no GOT created"),
+		 input_bfd,
+		 input_section,
+		 cris_elf_howto_table[r_type].name);
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+
+	  /* This relocation is like a PC-relative one, except the
+	     reference point is the location of GOT.  Note that
+	     sgot->output_offset is not involved in this calculation.  We
+	     always want the start of entire .got section, not the
+	     position after the reserved header.  */
+	  relocation -= sgot->output_section->vma;
+	  break;
+
+	case R_CRIS_32_PLT_PCREL:
+	  /* Relocation is to the entry for this symbol in the
+	     procedure linkage table.  */
+
+	  /* Resolve a PLT_PCREL reloc against a local symbol directly,
+	     without using the procedure linkage table.  */
+	  if (h == NULL || ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	    break;
+
+	  if (h->plt.offset == (bfd_vma) -1
+	      || splt == NULL)
+	    {
+	      /* We didn't make a PLT entry for this symbol.  This
+		 happens when statically linking PIC code, or when
+		 using -Bsymbolic.  */
+	      break;
+	    }
+
+	  relocation = (splt->output_section->vma
+			+ splt->output_offset
+			+ h->plt.offset);
+	  break;
+
+	case R_CRIS_32_PLT_GOTREL:
+	  /* Like R_CRIS_32_PLT_PCREL, but the reference point is the
+	     start of the .got section.  See also comment at
+	     R_CRIS_32_GOT.  */
+	  relocation -= sgot->output_section->vma;
+
+	  /* Resolve a PLT_GOTREL reloc against a local symbol directly,
+	     without using the procedure linkage table.  */
+	  if (h == NULL || ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	    break;
+
+	  if (h->plt.offset == (bfd_vma) -1
+	      || splt == NULL)
+	    {
+	      /* We didn't make a PLT entry for this symbol.  This
+		 happens when statically linking PIC code, or when
+		 using -Bsymbolic.  */
+	      break;
+	    }
+
+	  relocation = (splt->output_section->vma
+			+ splt->output_offset
+			+ h->plt.offset
+			- sgot->output_section->vma);
+	  break;
+
+	case R_CRIS_8_PCREL:
+	case R_CRIS_16_PCREL:
+	case R_CRIS_32_PCREL:
+	  /* If the symbol was local, we need no shlib-specific handling.  */
+	  if (h == NULL || ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+	      || h->dynindx == -1)
+	    break;
+
+	  /* Fall through.  */
+	case R_CRIS_8:
+	case R_CRIS_16:
+	case R_CRIS_32:
+	  if (info->shared
+	      && r_symndx != STN_UNDEF
+	      && (input_section->flags & SEC_ALLOC) != 0
+	      && ((r_type != R_CRIS_8_PCREL
+		   && r_type != R_CRIS_16_PCREL
+		   && r_type != R_CRIS_32_PCREL)
+		  || (!info->symbolic
+		      || (h != NULL && !h->def_regular))))
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_byte *loc;
+	      bfd_boolean skip, relocate;
+
+	      /* When generating a shared object, these relocations
+		 are copied into the output file to be resolved at run
+		 time.  */
+
+	      if (sreloc == NULL)
+		{
+		  sreloc = _bfd_elf_get_dynamic_reloc_section
+		    (dynobj, input_section, /*rela?*/ TRUE);
+		  /* The section should have been created in cris_elf_check_relocs,
+		     but that function will not be called for objects which fail in
+		     cris_elf_merge_private_bfd_data.  */
+		  if (sreloc == NULL)
+		    {
+		      bfd_set_error (bfd_error_bad_value);
+		      return FALSE;
+		    }
+		}
+
+	      skip = FALSE;
+	      relocate = FALSE;
+
+	      outrel.r_offset =
+		_bfd_elf_section_offset (output_bfd, info, input_section,
+					 rel->r_offset);
+	      if (outrel.r_offset == (bfd_vma) -1)
+		skip = TRUE;
+	      else if (outrel.r_offset == (bfd_vma) -2
+		       /* For now, undefined weak symbols with non-default
+			  visibility (yielding 0), like exception info for
+			  discarded sections, will get a R_CRIS_NONE
+			  relocation rather than no relocation, because we
+			  notice too late that the symbol doesn't need a
+			  relocation.  */
+		       || (h != NULL
+			   && h->root.type == bfd_link_hash_undefweak
+			   && ELF_ST_VISIBILITY (h->other) != STV_DEFAULT))
+		skip = TRUE, relocate = TRUE;
+	      outrel.r_offset += (input_section->output_section->vma
+				  + input_section->output_offset);
+
+	      if (skip)
+		memset (&outrel, 0, sizeof outrel);
+	      /* h->dynindx may be -1 if the symbol was marked to
+		 become local.  */
+	      else if (h != NULL
+		       && ((! info->symbolic && h->dynindx != -1)
+			   || !h->def_regular))
+		{
+		  BFD_ASSERT (h->dynindx != -1);
+		  outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
+		  outrel.r_addend = relocation + rel->r_addend;
+		}
+	      else
+		{
+		  outrel.r_addend = relocation + rel->r_addend;
+
+		  if (r_type == R_CRIS_32)
+		    {
+		      relocate = TRUE;
+		      outrel.r_info = ELF32_R_INFO (0, R_CRIS_RELATIVE);
+		    }
+		  else
+		    {
+		      long indx;
+
+		      if (bfd_is_abs_section (sec))
+			indx = 0;
+		      else if (sec == NULL || sec->owner == NULL)
+			{
+			  bfd_set_error (bfd_error_bad_value);
+			  return FALSE;
+			}
+		      else
+			{
+			  asection *osec;
+
+			  /* We are turning this relocation into one
+			     against a section symbol.  It would be
+			     proper to subtract the symbol's value,
+			     osec->vma, from the emitted reloc addend,
+			     but ld.so expects buggy relocs.  */
+			  osec = sec->output_section;
+			  indx = elf_section_data (osec)->dynindx;
+			  if (indx == 0)
+			    {
+			      osec = htab->root.text_index_section;
+			      indx = elf_section_data (osec)->dynindx;
+			    }
+			  BFD_ASSERT (indx != 0);
+			}
+
+		      outrel.r_info = ELF32_R_INFO (indx, r_type);
+		    }
+		}
+
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rela);
+	      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+
+	      /* This reloc will be computed at runtime, so there's no
+                 need to do anything now, except for R_CRIS_32 relocations
+                 that have been turned into R_CRIS_RELATIVE.  */
+	      if (!relocate)
+		continue;
+	    }
+
+	  break;
+
+	case R_CRIS_16_DTPREL:
+	case R_CRIS_32_DTPREL:
+	  /* This relocation must only be performed against local
+	     symbols, or to sections that are not loadable.  It's also
+	     ok when we link a program and the symbol is defined in an
+	     ordinary (non-DSO) object (if it's undefined there, we've
+	     already seen an error).  */
+	  if (h != NULL
+	      && (input_section->flags & SEC_ALLOC) != 0
+	      && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+	      && (info->shared
+		  || (!h->def_regular
+		      && h->root.type != bfd_link_hash_undefined)))
+	    {
+	      (*_bfd_error_handler)
+		((h->root.type == bfd_link_hash_undefined)
+		 /* We shouldn't get here for GCC-emitted code.  */
+		 ? _("%B, section %A: relocation %s has an undefined"
+		     " reference to `%s', perhaps a declaration mixup?")
+		 : ("%B, section %A: relocation %s is"
+		     " not allowed for `%s', a global symbol with default"
+		     " visibility, perhaps a declaration mixup?"),
+		 input_bfd,
+		 input_section,
+		 cris_elf_howto_table[r_type].name,
+		 symname != NULL && symname[0] != '\0'
+		 ? symname : _("[whose name is lost]"));
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+
+	  BFD_ASSERT ((input_section->flags & SEC_ALLOC) == 0
+		      || htab->dtpmod_refcount != 0);
+
+	  /* Fill in a R_CRIS_DTPMOD reloc at offset 3 if we haven't
+	     already done so.  Note that we do this in .got.plt, not
+	     in .got, as .got.plt contains the first part, still the
+	     reloc is against .got, because the linker script directs
+	     (is required to direct) them both into .got.  */
+	  if (htab->dtpmod_refcount > 0
+	      && (input_section->flags & SEC_ALLOC) != 0)
+	    {
+	      asection *sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");
+	      BFD_ASSERT (sgotplt != NULL);
+
+	      if (info->shared)
+		{
+		  Elf_Internal_Rela outrel;
+		  bfd_byte *loc;
+
+		  if (srelgot == NULL)
+		    srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+		  BFD_ASSERT (srelgot != NULL);
+		  loc = srelgot->contents;
+		  loc += srelgot->reloc_count++ * sizeof (Elf32_External_Rela);
+
+		  bfd_put_32 (output_bfd, (bfd_vma) 0, sgotplt->contents + 12);
+		  bfd_put_32 (output_bfd, (bfd_vma) 0, sgotplt->contents + 16);
+		  outrel.r_offset = (sgotplt->output_section->vma
+				     + sgotplt->output_offset
+				     + 12);
+		  outrel.r_info = ELF32_R_INFO (0, R_CRIS_DTPMOD);
+		  outrel.r_addend = 0;
+		  bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+		}
+	      else
+		{
+		  /* For an executable, the GOT entry contents is known.  */
+		  bfd_put_32 (output_bfd, (bfd_vma) 1, sgotplt->contents + 12);
+		  bfd_put_32 (output_bfd, (bfd_vma) 0, sgotplt->contents + 16);
+		}
+
+	      /* Reverse the sign to mark that we've emitted the
+		 required GOT entry.  */
+	      htab->dtpmod_refcount = - htab->dtpmod_refcount;
+	    }
+
+	  /* The relocation is the offset from the start of the module
+	     TLS block to the (local) symbol.  */
+	  relocation -= elf_hash_table (info)->tls_sec == NULL
+	    ? 0 : elf_hash_table (info)->tls_sec->vma;
+	  break;
+
+	case R_CRIS_32_GD:
+	  if (info->shared)
+	    {
+	      bfd_set_error (bfd_error_invalid_operation);
+
+	      /* We've already informed in cris_elf_check_relocs that
+		 this is an error.  */
+	      return FALSE;
+	    }
+	  /* Fall through.  */
+
+	case R_CRIS_16_GOT_GD:
+	case R_CRIS_32_GOT_GD:
+	  if (rel->r_addend != 0)
+	    {
+	      /* We can't do anything for a relocation which is against a
+		 symbol *plus offset*.  The GOT holds relocations for
+		 symbols.  Make this an error; the compiler isn't allowed
+		 to pass us these kinds of things.  */
+	      (*_bfd_error_handler)
+		(_("%B, section %A: relocation %s with non-zero addend %d"
+		   " against symbol `%s'"),
+		 input_bfd,
+		 input_section,
+		 cris_elf_howto_table[r_type].name,
+		 rel->r_addend,
+		 symname[0] != '\0' ? symname : _("[whose name is lost]"));
+
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+
+	  if (!info->shared
+	      && (h == NULL || h->def_regular || ELF_COMMON_DEF_P (h)))
+	    {
+	      /* Known contents of the GOT.  */
+	      bfd_vma off;
+
+	      /* The symbol is defined in the program, so just write
+		 (1, known_tpoffset) into the GOT.  */
+	      relocation -= elf_hash_table (info)->tls_sec->vma;
+
+	      if (h != NULL)
+		{
+		  off = elf_cris_hash_entry (h)->tprel_refcount > 0
+		    ? h->got.offset + 4 : h->got.offset;
+		}
+	      else
+		{
+		  off = local_got_offsets[r_symndx];
+		  if (local_got_offsets[LGOT_TPREL_NDX (r_symndx)])
+		    off += 4;
+		}
+
+	      /* We use bit 1 of the offset as a flag for GOT entry with
+		 the R_CRIS_DTP reloc, setting it when we've emitted the
+		 GOT entry and reloc.  Bit 0 is used for R_CRIS_32_TPREL
+		 relocs.  */
+	      if ((off & 2) == 0)
+		{
+		  off &= ~3;
+
+		  if (h != NULL)
+		    h->got.offset |= 2;
+		  else
+		    local_got_offsets[r_symndx] |= 2;
+
+		  bfd_put_32 (output_bfd, 1, sgot->contents + off);
+		  bfd_put_32 (output_bfd, relocation, sgot->contents + off + 4);
+		}
+	      else
+		off &= ~3;
+
+	      relocation = sgot->output_offset + off
+		+ (r_type == R_CRIS_32_GD ? sgot->output_section->vma : 0);
+	    }
+	  else
+	    {
+	      /* Not all parts of the GOT entry are known; emit a real
+		 relocation.  */
+	      bfd_vma off;
+
+	      if (h != NULL)
+		off = elf_cris_hash_entry (h)->tprel_refcount > 0
+		  ? h->got.offset + 4 : h->got.offset;
+	      else
+		{
+		  off = local_got_offsets[r_symndx];
+		  if (local_got_offsets[LGOT_TPREL_NDX (r_symndx)])
+		    off += 4;
+		}
+
+	      /* See above re bit 1 and bit 0 usage.  */
+	      if ((off & 2) == 0)
+		{
+		  Elf_Internal_Rela outrel;
+		  bfd_byte *loc;
+
+		  off &= ~3;
+
+		  if (h != NULL)
+		    h->got.offset |= 2;
+		  else
+		    local_got_offsets[r_symndx] |= 2;
+
+		  /* Clear the target contents of the GOT (just as a
+		     gesture; it's already cleared on allocation): this
+		     relocation is not like the other dynrelocs.  */
+		  bfd_put_32 (output_bfd, 0, sgot->contents + off);
+		  bfd_put_32 (output_bfd, 0, sgot->contents + off + 4);
+
+		  if (srelgot == NULL)
+		    srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+		  BFD_ASSERT (srelgot != NULL);
+
+		  if (h != NULL && h->dynindx != -1)
+		    {
+		      outrel.r_info = ELF32_R_INFO (h->dynindx, R_CRIS_DTP);
+		      relocation = 0;
+		    }
+		  else
+		    {
+		      outrel.r_info = ELF32_R_INFO (0, R_CRIS_DTP);
+
+		      /* NULL if we had an error.  */
+		      relocation -= elf_hash_table (info)->tls_sec == NULL
+			? 0 : elf_hash_table (info)->tls_sec->vma;
+		    }
+
+		  outrel.r_offset = (sgot->output_section->vma
+				     + sgot->output_offset
+				     + off);
+		  outrel.r_addend = relocation;
+		  loc = srelgot->contents;
+		  loc += srelgot->reloc_count++ * sizeof (Elf32_External_Rela);
+
+		  /* NULL if we had an error.  */
+		  if (srelgot->contents != NULL)
+		    bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+		}
+	      else
+		off &= ~3;
+
+	      relocation = sgot->output_offset + off
+		+ (r_type == R_CRIS_32_GD ? sgot->output_section->vma : 0);
+	    }
+
+	  /* The GOT-relative offset to the GOT entry is the
+	     relocation, or for R_CRIS_32_GD, the actual address of
+	     the GOT entry.  */
+	  break;
+
+	case R_CRIS_32_IE:
+	  if (info->shared)
+	    {
+	      bfd_set_error (bfd_error_invalid_operation);
+
+	      /* We've already informed in cris_elf_check_relocs that
+		 this is an error.  */
+	      return FALSE;
+	    }
+	  /* Fall through.  */
+
+	case R_CRIS_32_GOT_TPREL:
+	case R_CRIS_16_GOT_TPREL:
+	  if (rel->r_addend != 0)
+	    {
+	      /* We can't do anything for a relocation which is
+		 against a symbol *plus offset*.  GOT holds
+		 relocations for symbols.  Make this an error; the
+		 compiler isn't allowed to pass us these kinds of
+		 things.  */
+	      (*_bfd_error_handler)
+		(_("%B, section %A: relocation %s with non-zero addend %d"
+		   " against symbol `%s'"),
+		 input_bfd,
+		 input_section,
+		 cris_elf_howto_table[r_type].name,
+		 rel->r_addend,
+		 symname[0] != '\0' ? symname : _("[whose name is lost]"));
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+
+	  if (!info->shared && (h == NULL || h->def_regular))
+	    {
+	      /* Known contents of the GOT.  */
+	      bfd_vma off;
+
+	      /* The symbol is defined in the program, so just write
+		 the -prog_tls_size+known_tpoffset into the GOT.  */
+	      relocation -= elf_hash_table (info)->tls_sec->vma;
+	      relocation -= elf_hash_table (info)->tls_size;
+
+	      if (h != NULL)
+		off = h->got.offset;
+	      else
+		off = local_got_offsets[r_symndx];
+
+	      /* Bit 0 is used to mark whether we've emitted the required
+		 entry (and if needed R_CRIS_32_TPREL reloc).  Bit 1
+		 is used similarly for R_CRIS_DTP, see above.  */
+	      if ((off & 1) == 0)
+		{
+		  off &= ~3;
+
+		  if (h != NULL)
+		    h->got.offset |= 1;
+		  else
+		    local_got_offsets[r_symndx] |= 1;
+
+		  bfd_put_32 (output_bfd, relocation, sgot->contents + off);
+		}
+	      else
+		off &= ~3;
+
+	      relocation = sgot->output_offset + off
+		+ (r_type == R_CRIS_32_IE ? sgot->output_section->vma : 0);
+	    }
+	  else
+	    {
+	      /* Emit a real relocation.  */
+	      bfd_vma off;
+
+	      if (h != NULL)
+		off = h->got.offset;
+	      else
+		off = local_got_offsets[r_symndx];
+
+	      /* See above re usage of bit 0 and 1.  */
+	      if ((off & 1) == 0)
+		{
+		  Elf_Internal_Rela outrel;
+		  bfd_byte *loc;
+
+		  off &= ~3;
+
+		  if (h != NULL)
+		    h->got.offset |= 1;
+		  else
+		    local_got_offsets[r_symndx] |= 1;
+
+		  if (srelgot == NULL)
+		    srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+		  BFD_ASSERT (srelgot != NULL);
+
+		  if (h != NULL && h->dynindx != -1)
+		    {
+		      outrel.r_info = ELF32_R_INFO (h->dynindx, R_CRIS_32_TPREL);
+		      relocation = 0;
+		    }
+		  else
+		    {
+		      outrel.r_info = ELF32_R_INFO (0, R_CRIS_32_TPREL);
+
+		      /* NULL if we had an error.  */
+		      relocation -= elf_hash_table (info)->tls_sec == NULL
+			? 0 : elf_hash_table (info)->tls_sec->vma;
+		    }
+
+		  /* Just "define" the initial contents in some
+		     semi-logical way.  */
+		  bfd_put_32 (output_bfd, relocation, sgot->contents + off);
+
+		  outrel.r_offset = (sgot->output_section->vma
+				     + sgot->output_offset
+				     + off);
+		  outrel.r_addend = relocation;
+		  loc = srelgot->contents;
+		  loc += srelgot->reloc_count++ * sizeof (Elf32_External_Rela);
+		  /* NULL if we had an error.  */
+		  if (srelgot->contents != NULL)
+		    bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+		}
+	      else
+		off &= ~3;
+
+	      relocation = sgot->output_offset + off
+		+ (r_type == R_CRIS_32_IE ? sgot->output_section->vma : 0);
+	    }
+
+	  /* The GOT-relative offset to the GOT entry is the relocation,
+	     or for R_CRIS_32_GD, the actual address of the GOT entry.  */
+	  break;
+
+	case R_CRIS_16_TPREL:
+	case R_CRIS_32_TPREL:
+	  /* This relocation must only be performed against symbols
+	     defined in an ordinary (non-DSO) object.  */
+	  if (info->shared)
+	    {
+	      bfd_set_error (bfd_error_invalid_operation);
+
+	      /* We've already informed in cris_elf_check_relocs that
+		 this is an error.  */
+	      return FALSE;
+	    }
+
+	  if (h != NULL
+	      && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+	      && !(h->def_regular || ELF_COMMON_DEF_P (h))
+	      /* If it's undefined, then an error message has already
+		 been emitted.  */
+	      && h->root.type != bfd_link_hash_undefined)
+	    {
+	      (*_bfd_error_handler)
+		(_("%B, section %A: relocation %s is"
+		   " not allowed for symbol: `%s'"
+		   " which is defined outside the program,"
+		   " perhaps a declaration mixup?"),
+		 input_bfd,
+		 input_section,
+		 cris_elf_howto_table[r_type].name,
+		 symname);
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+
+	  /* NULL if we had an error.  */
+	  relocation -= elf_hash_table (info)->tls_sec == NULL
+	    ? 0
+	    : (elf_hash_table (info)->tls_sec->vma
+	       + elf_hash_table (info)->tls_size);
+
+	  /* The TLS-relative offset is the relocation.  */
+	  break;
+
+	default:
+	  BFD_FAIL ();
+	  return FALSE;
+	}
+
+      r = cris_final_link_relocate (howto, input_bfd, input_section,
+				     contents, rel, relocation);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char * msg = (const char *) NULL;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      r = info->callbacks->reloc_overflow
+		(info, (h ? &h->root : NULL), symname, howto->name,
+		 (bfd_vma) 0, input_bfd, input_section, rel->r_offset);
+	      if (additional_relocation_error_msg_count > 0)
+		{
+		  additional_relocation_error_msg_count--;
+		  switch (r_type)
+		    {
+		    case R_CRIS_16_GOTPLT:
+		    case R_CRIS_16_GOT:
+
+		      /* Not just TLS is involved here, so we make
+			 generation and message depend on -fPIC/-fpic
+			 only.  */
+		    case R_CRIS_16_GOT_TPREL:
+		    case R_CRIS_16_GOT_GD:
+		      (*_bfd_error_handler)
+			(_("(too many global variables for -fpic:"
+			   " recompile with -fPIC)"));
+		      break;
+
+		    case R_CRIS_16_TPREL:
+		    case R_CRIS_16_DTPREL:
+		      (*_bfd_error_handler)
+			(_("(thread-local data too big for -fpic or"
+			   " -msmall-tls: recompile with -fPIC or"
+			   " -mno-small-tls)"));
+		      break;
+
+		      /* No known cause for overflow for other relocs.  */
+		    default:
+		      break;
+		    }
+		}
+	      break;
+
+	    case bfd_reloc_undefined:
+	      r = info->callbacks->undefined_symbol
+		(info, symname, input_bfd, input_section, rel->r_offset,
+		 TRUE);
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      break;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      break;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous relocation");
+	      break;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      break;
+	    }
+
+	  if (msg)
+	    r = info->callbacks->warning
+	      (info, msg, symname, input_bfd, input_section, rel->r_offset);
+
+	  if (! r)
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+elf_cris_finish_dynamic_symbol (bfd *output_bfd,
+				struct bfd_link_info *info,
+				struct elf_link_hash_entry *h,
+				Elf_Internal_Sym *sym)
+{
+  struct elf_cris_link_hash_table * htab;
+  bfd *dynobj;
+
+  /* Where in the plt entry to put values.  */
+  int plt_off1 = 2, plt_off2 = 10, plt_off3 = 16;
+
+  /* What offset to add to the distance to the first PLT entry for the
+     value at plt_off3.   */
+  int plt_off3_value_bias = 4;
+
+  /* Where in the PLT entry the call-dynlink-stub is (happens to be same
+     for PIC and non-PIC for v32 and pre-v32).  */
+  int plt_stub_offset = 8;
+  int plt_entry_size = PLT_ENTRY_SIZE;
+  const bfd_byte *plt_entry = elf_cris_plt_entry;
+  const bfd_byte *plt_pic_entry = elf_cris_pic_plt_entry;
+
+  htab = elf_cris_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* Adjust the various PLT entry offsets.  */
+  if (bfd_get_mach (output_bfd) == bfd_mach_cris_v32)
+    {
+      plt_off2 = 14;
+      plt_off3 = 20;
+      plt_off3_value_bias = -2;
+      plt_stub_offset = 12;
+      plt_entry_size = PLT_ENTRY_SIZE_V32;
+      plt_entry = elf_cris_plt_entry_v32;
+      plt_pic_entry = elf_cris_pic_plt_entry_v32;
+    }
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      asection *splt;
+      asection *sgotplt;
+      asection *srela;
+      bfd_vma got_base;
+
+      bfd_vma gotplt_offset
+	= elf_cris_hash_entry (h)->gotplt_offset;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+      bfd_boolean has_gotplt = gotplt_offset != 0;
+
+      /* Get the index in the .rela.plt relocations for the .got.plt
+	 entry that corresponds to this symbol.
+	 We have to count backwards here, and the result is only valid
+	 as an index into .rela.plt.  We also have to undo the effect
+	 of the R_CRIS_DTPMOD entry at .got index 3 (offset 12 into
+	 .got.plt) for which gotplt_offset is adjusted, because while
+	 that entry goes into .got.plt, its relocation goes into
+	 .rela.got, not .rela.plt.  (It's not PLT-specific; not to be
+	 processed as part of the runtime lazy .rela.plt relocation).
+	 FIXME: There be literal constants here...  */
+      bfd_vma rela_plt_index
+	= (htab->dtpmod_refcount != 0
+	   ? gotplt_offset/4 - 2 - 3 : gotplt_offset/4 - 3);
+
+      /* Get the offset into the .got table of the entry that corresponds
+	 to this function.  Note that we embed knowledge that "incoming"
+	 .got goes after .got.plt in the output without padding (pointer
+	 aligned).  However, that knowledge is present in several other
+	 places too.  */
+      bfd_vma got_offset
+	= (has_gotplt
+	   ? gotplt_offset
+	   : h->got.offset + htab->next_gotplt_entry);
+
+      /* This symbol has an entry in the procedure linkage table.  Set it
+	 up.  */
+
+      BFD_ASSERT (h->dynindx != -1);
+
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");
+      srela = bfd_get_section_by_name (dynobj, ".rela.plt");
+      BFD_ASSERT (splt != NULL && sgotplt != NULL
+		  && (! has_gotplt || srela != NULL));
+
+      got_base = sgotplt->output_section->vma + sgotplt->output_offset;
+
+      /* Fill in the entry in the procedure linkage table.  */
+      if (! info->shared)
+	{
+	  memcpy (splt->contents + h->plt.offset, plt_entry,
+		  plt_entry_size);
+
+	  /* We need to enter the absolute address of the GOT entry here.  */
+	  bfd_put_32 (output_bfd, got_base + got_offset,
+		      splt->contents + h->plt.offset + plt_off1);
+	}
+      else
+	{
+	  memcpy (splt->contents + h->plt.offset, plt_pic_entry,
+		  plt_entry_size);
+	  bfd_put_32 (output_bfd, got_offset,
+		      splt->contents + h->plt.offset + plt_off1);
+	}
+
+      /* Fill in the plt entry and make a relocation, if this is a "real"
+	 PLT entry.  */
+      if (has_gotplt)
+	{
+	  /* Fill in the offset to the reloc table.  */
+	  bfd_put_32 (output_bfd,
+		      rela_plt_index * sizeof (Elf32_External_Rela),
+		      splt->contents + h->plt.offset + plt_off2);
+
+	  /* Fill in the offset to the first PLT entry, where to "jump".  */
+	  bfd_put_32 (output_bfd,
+		      - (h->plt.offset + plt_off3 + plt_off3_value_bias),
+		      splt->contents + h->plt.offset + plt_off3);
+
+	  /* Fill in the entry in the global offset table with the address of
+	     the relocating stub.  */
+	  bfd_put_32 (output_bfd,
+		      (splt->output_section->vma
+		       + splt->output_offset
+		       + h->plt.offset
+		       + plt_stub_offset),
+		      sgotplt->contents + got_offset);
+
+	  /* Fill in the entry in the .rela.plt section.  */
+	  rela.r_offset = (sgotplt->output_section->vma
+			   + sgotplt->output_offset
+			   + got_offset);
+	  rela.r_info = ELF32_R_INFO (h->dynindx, R_CRIS_JUMP_SLOT);
+	  rela.r_addend = 0;
+	  loc = srela->contents + rela_plt_index * sizeof (Elf32_External_Rela);
+	  bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+	}
+
+      if (!h->def_regular)
+	{
+	  /* Mark the symbol as undefined, rather than as defined in
+	     the .plt section.  Leave the value alone.  */
+	  sym->st_shndx = SHN_UNDEF;
+
+	  /* FIXME: From elf32-sparc.c 2001-02-19 (1.18).  I still don't
+	     know whether resetting the value is significant; if it really
+	     is, rather than a quirk or bug in the sparc port, then I
+	     believe we'd see this elsewhere.  */
+	  /* If the symbol is weak, we do need to clear the value.
+	     Otherwise, the PLT entry would provide a definition for
+	     the symbol even if the symbol wasn't defined anywhere,
+	     and so the symbol would never be NULL.  */
+	  if (!h->ref_regular_nonweak)
+	    sym->st_value = 0;
+	}
+    }
+
+  /* For an ordinary program, we emit .got relocs only for symbols that
+     are in the dynamic-symbols table and are either defined by the
+     program or are undefined weak symbols, or are function symbols
+     where we do not output a PLT: the PLT reloc was output above and all
+     references to the function symbol are redirected to the PLT.  */
+  if (h->got.offset != (bfd_vma) -1
+      && (elf_cris_hash_entry (h)->reg_got_refcount > 0)
+      && (info->shared
+	  || (h->dynindx != -1
+	      && h->plt.offset == (bfd_vma) -1
+	      && !h->def_regular
+	      && h->root.type != bfd_link_hash_undefweak)))
+    {
+      asection *sgot;
+      asection *srela;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+      bfd_byte *where;
+
+      /* This symbol has an entry in the global offset table.  Set it up.  */
+
+      sgot = bfd_get_section_by_name (dynobj, ".got");
+      srela = bfd_get_section_by_name (dynobj, ".rela.got");
+      BFD_ASSERT (sgot != NULL && srela != NULL);
+
+      rela.r_offset = (sgot->output_section->vma
+		       + sgot->output_offset
+		       + (h->got.offset &~ (bfd_vma) 1));
+
+      /* If this is a static link, or it is a -Bsymbolic link and the
+	 symbol is defined locally or was forced to be local because
+	 of a version file, we just want to emit a RELATIVE reloc.
+	 The entry in the global offset table will already have been
+	 initialized in the relocate_section function.  */
+      where = sgot->contents + (h->got.offset &~ (bfd_vma) 1);
+      if (! elf_hash_table (info)->dynamic_sections_created
+	  || (info->shared
+	      && (info->symbolic || h->dynindx == -1)
+	      && h->def_regular))
+	{
+	  rela.r_info = ELF32_R_INFO (0, R_CRIS_RELATIVE);
+	  rela.r_addend = bfd_get_signed_32 (output_bfd, where);
+	}
+      else
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, where);
+	  rela.r_info = ELF32_R_INFO (h->dynindx, R_CRIS_GLOB_DAT);
+	  rela.r_addend = 0;
+	}
+
+      loc = srela->contents;
+      loc += srela->reloc_count++ * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+    }
+
+  if (h->needs_copy)
+    {
+      asection *s;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+
+      /* This symbol needs a copy reloc.  Set it up.  */
+
+      BFD_ASSERT (h->dynindx != -1
+		  && (h->root.type == bfd_link_hash_defined
+		      || h->root.type == bfd_link_hash_defweak));
+
+      s = bfd_get_section_by_name (h->root.u.def.section->owner,
+				   ".rela.bss");
+      BFD_ASSERT (s != NULL);
+
+      rela.r_offset = (h->root.u.def.value
+		       + h->root.u.def.section->output_section->vma
+		       + h->root.u.def.section->output_offset);
+      rela.r_info = ELF32_R_INFO (h->dynindx, R_CRIS_COPY);
+      rela.r_addend = 0;
+      loc = s->contents + s->reloc_count++ * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+    }
+
+  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+      || h == elf_hash_table (info)->hgot)
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+/* Finish up the dynamic sections.  Do *not* emit relocs here, as their
+   offsets were changed, as part of -z combreloc handling, from those we
+   computed.  */
+
+static bfd_boolean
+elf_cris_finish_dynamic_sections (output_bfd, info)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+{
+  bfd *dynobj;
+  asection *sgot;
+  asection *sdyn;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  sgot = bfd_get_section_by_name (dynobj, ".got.plt");
+  BFD_ASSERT (sgot != NULL);
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      asection *splt;
+      Elf32_External_Dyn *dyncon, *dynconend;
+
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      BFD_ASSERT (splt != NULL && sdyn != NULL);
+
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+	  asection *s;
+
+	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    default:
+	      break;
+
+	    case DT_PLTGOT:
+	      s = bfd_get_section_by_name (output_bfd, ".got");
+	      BFD_ASSERT (s != NULL);
+	      dyn.d_un.d_ptr = s->vma;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_JMPREL:
+	      /* Yes, we *can* have a .plt and no .plt.rela, for instance
+		 if all symbols are found in the .got (not .got.plt).  */
+	      s = bfd_get_section_by_name (output_bfd, ".rela.plt");
+	      dyn.d_un.d_ptr = s != NULL ? s->vma : 0;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_PLTRELSZ:
+	      s = bfd_get_section_by_name (output_bfd, ".rela.plt");
+	      if (s == NULL)
+		dyn.d_un.d_val = 0;
+	      else
+		dyn.d_un.d_val = s->size;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_RELASZ:
+	      /* The procedure linkage table relocs (DT_JMPREL) should
+		 not be included in the overall relocs (DT_RELA).
+		 Therefore, we override the DT_RELASZ entry here to
+		 make it not include the JMPREL relocs.  Since the
+		 linker script arranges for .rela.plt to follow all
+		 other relocation sections, we don't have to worry
+		 about changing the DT_RELA entry.  */
+	      s = bfd_get_section_by_name (output_bfd, ".rela.plt");
+	      if (s != NULL)
+		dyn.d_un.d_val -= s->size;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+	    }
+	}
+
+      /* Fill in the first entry in the procedure linkage table.  */
+      if (splt->size > 0)
+	{
+	  if (bfd_get_mach (output_bfd) == bfd_mach_cris_v32)
+	    {
+	      if (info->shared)
+		memcpy (splt->contents, elf_cris_pic_plt0_entry_v32,
+			PLT_ENTRY_SIZE_V32);
+	      else
+		{
+		  memcpy (splt->contents, elf_cris_plt0_entry_v32,
+			  PLT_ENTRY_SIZE_V32);
+		  bfd_put_32 (output_bfd,
+			      sgot->output_section->vma
+			      + sgot->output_offset + 4,
+			      splt->contents + 4);
+
+		  elf_section_data (splt->output_section)->this_hdr.sh_entsize
+		    = PLT_ENTRY_SIZE_V32;
+		}
+	    }
+	  else
+	    {
+	      if (info->shared)
+		memcpy (splt->contents, elf_cris_pic_plt0_entry,
+			PLT_ENTRY_SIZE);
+	      else
+		{
+		  memcpy (splt->contents, elf_cris_plt0_entry,
+			  PLT_ENTRY_SIZE);
+		  bfd_put_32 (output_bfd,
+			      sgot->output_section->vma
+			      + sgot->output_offset + 4,
+			      splt->contents + 6);
+		  bfd_put_32 (output_bfd,
+			      sgot->output_section->vma
+			      + sgot->output_offset + 8,
+			      splt->contents + 14);
+
+		  elf_section_data (splt->output_section)->this_hdr.sh_entsize
+		    = PLT_ENTRY_SIZE;
+		}
+            }
+	}
+    }
+
+  /* Fill in the first three entries in the global offset table.  */
+  if (sgot->size > 0)
+    {
+      if (sdyn == NULL)
+	bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents);
+      else
+	bfd_put_32 (output_bfd,
+		    sdyn->output_section->vma + sdyn->output_offset,
+		    sgot->contents);
+      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 4);
+      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 8);
+    }
+
+  elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
+
+  return TRUE;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+static asection *
+cris_elf_gc_mark_hook (asection *sec,
+		       struct bfd_link_info *info,
+		       Elf_Internal_Rela *rel,
+		       struct elf_link_hash_entry *h,
+		       Elf_Internal_Sym *sym)
+{
+  enum elf_cris_reloc_type r_type = ELF32_R_TYPE (rel->r_info);
+  if (h != NULL)
+    switch (r_type)
+      {
+      case R_CRIS_GNU_VTINHERIT:
+      case R_CRIS_GNU_VTENTRY:
+	return NULL;
+
+      default:
+	break;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Update the got entry reference counts for the section being removed.  */
+
+static bfd_boolean
+cris_elf_gc_sweep_hook (bfd *abfd,
+			struct bfd_link_info *info,
+			asection *sec,
+			const Elf_Internal_Rela *relocs)
+{
+  struct elf_cris_link_hash_table * htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  const Elf_Internal_Rela *rel, *relend;
+  bfd *dynobj;
+  asection *sgot;
+  asection *srelgot;
+
+  if (info->relocatable)
+    return TRUE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  if (dynobj == NULL)
+    return TRUE;
+
+  htab = elf_cris_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+
+  sgot = bfd_get_section_by_name (dynobj, ".got");
+  srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h = NULL;
+      bfd_signed_vma got_element_size = 4;
+      bfd_signed_vma *specific_refcount = NULL;
+      enum elf_cris_reloc_type r_type;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      switch (r_type)
+	{
+	case R_CRIS_32_GOT:
+	case R_CRIS_16_GOT:
+	case R_CRIS_16_GOTPLT:
+	case R_CRIS_32_GOTPLT:
+	  specific_refcount = h != NULL
+	    ? &((struct elf_cris_link_hash_entry *) h)->reg_got_refcount
+	    : &local_got_refcounts[LGOT_REG_NDX (r_symndx)];
+	  break;
+
+	case R_CRIS_32_GD:
+	case R_CRIS_32_GOT_GD:
+	case R_CRIS_16_GOT_GD:
+	  got_element_size = 8;
+	  specific_refcount = h != NULL
+	    ? &((struct elf_cris_link_hash_entry *) h)->dtp_refcount
+	    : &local_got_refcounts[LGOT_DTP_NDX (r_symndx)];
+	  break;
+
+	case R_CRIS_32_IE:
+	case R_CRIS_16_GOT_TPREL:
+	case R_CRIS_32_GOT_TPREL:
+	  specific_refcount = h != NULL
+	    ? &((struct elf_cris_link_hash_entry *) h)->tprel_refcount
+	    : &local_got_refcounts[LGOT_TPREL_NDX (r_symndx)];
+	  break;
+
+	default:
+	  break;
+	}
+
+      switch (r_type)
+	{
+	case R_CRIS_32_IE:
+	case R_CRIS_32_GD:
+	case R_CRIS_16_GOT_TPREL:
+	case R_CRIS_32_GOT_TPREL:
+	case R_CRIS_32_GOT_GD:
+	case R_CRIS_16_GOT_GD:
+	case R_CRIS_16_GOT:
+	case R_CRIS_32_GOT:
+	  if (h != NULL)
+	    {
+	      /* If the counters are 0 when we got here, we've
+		 miscounted somehow somewhere, an internal error.  */
+	      BFD_ASSERT (h->got.refcount > 0);
+	      --h->got.refcount;
+
+	      BFD_ASSERT (*specific_refcount > 0);
+	      --*specific_refcount;
+	      if (*specific_refcount == 0)
+		{
+		  /* We don't need the .got entry any more.  */
+		  sgot->size -= got_element_size;
+		  srelgot->size -= sizeof (Elf32_External_Rela);
+		}
+	      break;
+	    }
+
+	local_got_reloc:
+	  if (local_got_refcounts != NULL)
+	    {
+	      /* If the counters are 0 when we got here, we've
+		 miscounted somehow somewhere, an internal error.  */
+	      BFD_ASSERT (local_got_refcounts[r_symndx] > 0);
+	      --local_got_refcounts[r_symndx];
+
+	      BFD_ASSERT (*specific_refcount > 0);
+	      --*specific_refcount;
+	      if (*specific_refcount == 0)
+		{
+		  /* We don't need the .got entry any more.  */
+		  sgot->size -= got_element_size;
+		  if (info->shared)
+		    srelgot->size -= sizeof (Elf32_External_Rela);
+		}
+	    }
+	  break;
+
+	case R_CRIS_16_GOTPLT:
+	case R_CRIS_32_GOTPLT:
+	  /* For local symbols, treat these like GOT relocs.  */
+	  if (h == NULL)
+	    goto local_got_reloc;
+	  else
+	    /* For global symbols, adjust the reloc-specific refcount.  */
+	    elf_cris_hash_entry (h)->gotplt_refcount--;
+	  /* Fall through.  */
+
+	case R_CRIS_32_PLT_GOTREL:
+	  /* FIXME: We don't garbage-collect away the .got section.  */
+	  if (local_got_refcounts != NULL)
+	    local_got_refcounts[-1]--;
+	  /* Fall through.  */
+
+	case R_CRIS_8:
+	case R_CRIS_16:
+	case R_CRIS_32:
+	case R_CRIS_8_PCREL:
+	case R_CRIS_16_PCREL:
+	case R_CRIS_32_PCREL:
+	case R_CRIS_32_PLT_PCREL:
+	  /* Negate the increment we did in cris_elf_check_relocs.  */
+	  if (h != NULL)
+	    {
+	      if (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		  && h->plt.refcount > 0)
+		--h->plt.refcount;
+	    }
+	  break;
+
+	case R_CRIS_32_DTPREL:
+	  /* This'd be a .dtpreld entry in e.g. debug info.  */
+	  if ((sec->flags & SEC_ALLOC) == 0)
+	    break;
+	  /* Fall through.  */
+	case R_CRIS_16_DTPREL:
+	  htab->dtpmod_refcount--;
+	  if (htab->dtpmod_refcount == 0)
+	    htab->next_gotplt_entry -= 8;
+	  BFD_ASSERT (local_got_refcounts != NULL);
+	  local_got_refcounts[-1]--;
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* The elf_backend_plt_sym_val hook function.  */
+
+static bfd_vma
+cris_elf_plt_sym_val (bfd_vma i, const asection *plt,
+		      const arelent *rel ATTRIBUTE_UNUSED)
+{
+  bfd_size_type plt_entry_size;
+
+  plt_entry_size
+    = (bfd_get_mach (plt->owner) == bfd_mach_cris_v32
+       ? PLT_ENTRY_SIZE_V32 : PLT_ENTRY_SIZE);
+
+  return plt->vma + (i + 1) * plt_entry_size;
+}
+
+/* Make sure we emit a GOT entry if the symbol was supposed to have a PLT
+   entry but we found we will not create any.  Called when we find we will
+   not have any PLT for this symbol, by for example
+   elf_cris_adjust_dynamic_symbol when we're doing a proper dynamic link,
+   or elf_cris_size_dynamic_sections if no dynamic sections will be
+   created (we're only linking static objects).  */
+
+static bfd_boolean
+elf_cris_adjust_gotplt_to_got (h, p)
+     struct elf_cris_link_hash_entry *h;
+     PTR p;
+{
+  struct bfd_link_info *info = (struct bfd_link_info *) p;
+
+  /* A GOTPLT reloc, when activated, is supposed to be included into
+     the PLT refcount.  */
+  BFD_ASSERT (h->gotplt_refcount == 0
+	      || h->gotplt_refcount <= h->root.plt.refcount);
+
+  /* If nobody wanted a GOTPLT with this symbol, we're done.  */
+  if (h->gotplt_refcount <= 0)
+    return TRUE;
+
+  if (h->reg_got_refcount > 0)
+    {
+      /* There's a GOT entry for this symbol.  Just adjust the refcounts.
+	 Probably not necessary at this stage, but keeping them accurate
+	 helps avoiding surprises later.  */
+      h->root.got.refcount += h->gotplt_refcount;
+      h->reg_got_refcount += h->gotplt_refcount;
+      h->gotplt_refcount = 0;
+    }
+  else
+    {
+      /* No GOT entry for this symbol.  We need to create one.  */
+      bfd *dynobj = elf_hash_table (info)->dynobj;
+      asection *sgot;
+      asection *srelgot;
+
+      BFD_ASSERT (dynobj != NULL);
+      sgot = bfd_get_section_by_name (dynobj, ".got");
+      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+
+      /* Put accurate refcounts there.  */
+      h->root.got.refcount += h->gotplt_refcount;
+      h->reg_got_refcount = h->gotplt_refcount;
+
+      h->gotplt_refcount = 0;
+
+      /* We always have a .got and a .rela.got section if there were
+	 GOTPLT relocs in input.  */
+      BFD_ASSERT (sgot != NULL && srelgot != NULL);
+
+      /* Allocate space in the .got section.  */
+      sgot->size += 4;
+
+      /* Allocate relocation space.  */
+      srelgot->size += sizeof (Elf32_External_Rela);
+    }
+
+  return TRUE;
+}
+
+/* Try to fold PLT entries with GOT entries.  There are two cases when we
+   want to do this:
+
+   - When all PLT references are GOTPLT references, and there are GOT
+     references, and this is not the executable.  We don't have to
+     generate a PLT at all.
+
+   - When there are both (ordinary) PLT references and GOT references,
+     and this isn't the executable.
+     We want to make the PLT reference use the ordinary GOT entry rather
+     than R_CRIS_JUMP_SLOT, a run-time dynamically resolved GOTPLT entry,
+     since the GOT entry will have to be resolved at startup anyway.
+
+   Though the latter case is handled when room for the PLT is allocated,
+   not here.
+
+   By folding into the GOT, we may need a round-trip to a PLT in the
+   executable for calls, a loss in performance.  Still, losing a
+   reloc is a win in size and at least in start-up time.
+
+   Note that this function is called before symbols are forced local by
+   version scripts.  The differing cases are handled by
+   elf_cris_hide_symbol.  */
+
+static bfd_boolean
+elf_cris_try_fold_plt_to_got (h, p)
+     struct elf_cris_link_hash_entry *h;
+     PTR p;
+{
+  struct bfd_link_info *info = (struct bfd_link_info *) p;
+
+  /* If there are no GOT references for this symbol, we can't fold any
+     other reference so there's nothing to do.  Likewise if there are no
+     PLT references; GOTPLT references included.  */
+  if (h->root.got.refcount <= 0 || h->root.plt.refcount <= 0)
+    return TRUE;
+
+  /* GOTPLT relocs are supposed to be included into the PLT refcount.  */
+  BFD_ASSERT (h->gotplt_refcount <= h->root.plt.refcount);
+
+  if (h->gotplt_refcount == h->root.plt.refcount)
+    {
+      /* The only PLT references are GOTPLT references, and there are GOT
+	 references.  Convert PLT to GOT references.  */
+      if (! elf_cris_adjust_gotplt_to_got (h, info))
+	return FALSE;
+
+      /* Clear the PLT references, so no PLT will be created.  */
+      h->root.plt.offset = (bfd_vma) -1;
+    }
+
+  return TRUE;
+}
+
+/* Our own version of hide_symbol, so that we can adjust a GOTPLT reloc
+   to use a GOT entry (and create one) rather than requiring a GOTPLT
+   entry.  */
+
+static void
+elf_cris_hide_symbol (info, h, force_local)
+     struct bfd_link_info *info;
+     struct elf_link_hash_entry *h;
+     bfd_boolean force_local;
+{
+  elf_cris_adjust_gotplt_to_got ((struct elf_cris_link_hash_entry *) h, info);
+
+  _bfd_elf_link_hash_hide_symbol (info, h, force_local);
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+elf_cris_adjust_dynamic_symbol (struct bfd_link_info *info,
+				struct elf_link_hash_entry *h)
+{
+  struct elf_cris_link_hash_table * htab;
+  bfd *dynobj;
+  asection *s;
+  bfd_size_type plt_entry_size;
+
+  htab = elf_cris_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (dynobj != NULL
+	      && (h->needs_plt
+		  || h->u.weakdef != NULL
+		  || (h->def_dynamic
+		      && h->ref_regular
+		      && !h->def_regular)));
+
+  plt_entry_size
+    = (bfd_get_mach (dynobj) == bfd_mach_cris_v32
+       ? PLT_ENTRY_SIZE_V32 : PLT_ENTRY_SIZE);
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later,
+     when we know the address of the .got section.  */
+  if (h->type == STT_FUNC
+      || h->needs_plt)
+    {
+      /* If we link a program (not a DSO), we'll get rid of unnecessary
+	 PLT entries; we point to the actual symbols -- even for pic
+	 relocs, because a program built with -fpic should have the same
+	 result as one built without -fpic, specifically considering weak
+	 symbols.
+	 FIXME: m68k and i386 differ here, for unclear reasons.  */
+      if (! info->shared
+	  && !h->def_dynamic)
+	{
+	  /* This case can occur if we saw a PLT reloc in an input file,
+	     but the symbol was not defined by a dynamic object.  In such
+	     a case, we don't actually need to build a procedure linkage
+	     table, and we can just do an absolute or PC reloc instead, or
+	     change a .got.plt index to a .got index for GOTPLT relocs.  */
+	  BFD_ASSERT (h->needs_plt);
+	  h->needs_plt = 0;
+	  h->plt.offset = (bfd_vma) -1;
+	  return
+	    elf_cris_adjust_gotplt_to_got ((struct
+					    elf_cris_link_hash_entry *) h,
+					   info);
+	}
+
+      /* If we had a R_CRIS_GLOB_DAT that didn't have to point to a PLT;
+	 where a pointer-equivalent symbol was unimportant (i.e. more
+	 like R_CRIS_JUMP_SLOT after symbol evaluation) we could get rid
+	 of the PLT.  We can't for the executable, because the GOT
+	 entries will point to the PLT there (and be constant).  */
+      if (info->shared
+	  && !elf_cris_try_fold_plt_to_got ((struct elf_cris_link_hash_entry*)
+					    h, info))
+	return FALSE;
+
+      /* GC or folding may have rendered this entry unused.  */
+      if (h->plt.refcount <= 0)
+	{
+	  h->needs_plt = 0;
+	  h->plt.offset = (bfd_vma) -1;
+	  return TRUE;
+	}
+
+      /* Make sure this symbol is output as a dynamic symbol.  */
+      if (h->dynindx == -1)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      s = bfd_get_section_by_name (dynobj, ".plt");
+      BFD_ASSERT (s != NULL);
+
+      /* If this is the first .plt entry, make room for the special
+	 first entry.  */
+      if (s->size == 0)
+	s->size += plt_entry_size;
+
+      /* If this symbol is not defined in a regular file, and we are
+	 not generating a shared library, then set the symbol to this
+	 location in the .plt.  */
+      if (!info->shared
+	  && !h->def_regular)
+	{
+	  h->root.u.def.section = s;
+	  h->root.u.def.value = s->size;
+	}
+
+      /* If there's already a GOT entry, use that, not a .got.plt.  A
+	 GOT field still has a reference count when we get here; it's
+	 not yet changed to an offset.  We can't do this for an
+	 executable, because then the reloc associated with the PLT
+	 would get a non-PLT reloc pointing to the PLT.  FIXME: Move
+	 this to elf_cris_try_fold_plt_to_got.  */
+      if (info->shared && h->got.refcount > 0)
+	{
+	  h->got.refcount += h->plt.refcount;
+
+	  /* Mark the PLT offset to use the GOT entry by setting the low
+	     bit in the plt offset; it is always a multiple of
+	     plt_entry_size (which is at least a multiple of 2).  */
+	  BFD_ASSERT ((s->size % plt_entry_size) == 0);
+
+	  /* Change the PLT refcount to an offset.  */
+	  h->plt.offset = s->size;
+
+	  /* By not setting gotplt_offset (i.e. it remains at 0), we signal
+	     that the got entry should be used instead.  */
+	  BFD_ASSERT (((struct elf_cris_link_hash_entry *)
+		       h)->gotplt_offset == 0);
+
+	  /* Make room for this entry.  */
+	  s->size += plt_entry_size;
+
+	  return TRUE;
+	}
+
+      /* No GOT reference for this symbol; prepare for an ordinary PLT.  */
+      h->plt.offset = s->size;
+
+      /* Make room for this entry.  */
+      s->size += plt_entry_size;
+
+      /* We also need to make an entry in the .got.plt section, which
+	 will be placed in the .got section by the linker script.  */
+      ((struct elf_cris_link_hash_entry *) h)->gotplt_offset
+	= htab->next_gotplt_entry;
+      htab->next_gotplt_entry += 4;
+
+      s = bfd_get_section_by_name (dynobj, ".got.plt");
+      BFD_ASSERT (s != NULL);
+      s->size += 4;
+
+      /* We also need to make an entry in the .rela.plt section.  */
+
+      s = bfd_get_section_by_name (dynobj, ".rela.plt");
+      BFD_ASSERT (s != NULL);
+      s->size += sizeof (Elf32_External_Rela);
+
+      return TRUE;
+    }
+
+  /* Reinitialize the plt offset now that it is not used as a reference
+     count any more.  */
+  h->plt.offset = (bfd_vma) -1;
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if (!h->non_got_ref)
+    return TRUE;
+
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  s = bfd_get_section_by_name (dynobj, ".dynbss");
+  BFD_ASSERT (s != NULL);
+
+  /* We must generate a R_CRIS_COPY reloc to tell the dynamic linker to
+     copy the initial value out of the dynamic object and into the
+     runtime process image.  We need to remember the offset into the
+     .rela.bss section we are going to use.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      asection *srel;
+
+      srel = bfd_get_section_by_name (dynobj, ".rela.bss");
+      BFD_ASSERT (srel != NULL);
+      srel->size += sizeof (Elf32_External_Rela);
+      h->needs_copy = 1;
+    }
+
+  return _bfd_elf_adjust_dynamic_copy (h, s);
+}
+
+/* Adjust our "subclass" elements for an indirect symbol.  */
+
+static void
+elf_cris_copy_indirect_symbol (struct bfd_link_info *info,
+			       struct elf_link_hash_entry *dir,
+			       struct elf_link_hash_entry *ind)
+{
+  struct elf_cris_link_hash_entry *edir, *eind;
+
+  edir = (struct elf_cris_link_hash_entry *) dir;
+  eind = (struct elf_cris_link_hash_entry *) ind;
+
+  /* Only indirect symbols are replaced; we're not interested in
+     updating any of EIND's fields for other symbols.  */
+  if (eind->root.root.type != bfd_link_hash_indirect)
+    {
+      /* Still, we need to copy flags for e.g. weak definitions.  */
+      _bfd_elf_link_hash_copy_indirect (info, dir, ind);
+      return;
+    }
+
+  BFD_ASSERT (edir->gotplt_offset == 0 || eind->gotplt_offset == 0);
+
+#define XMOVOPZ(F, OP, Z) edir->F OP eind->F; eind->F = Z
+#define XMOVE(F) XMOVOPZ (F, +=, 0)
+  if (eind->pcrel_relocs_copied != NULL)
+    {
+      if (edir->pcrel_relocs_copied != NULL)
+	{
+	  struct elf_cris_pcrel_relocs_copied **pp;
+	  struct elf_cris_pcrel_relocs_copied *p;
+
+	  /* Add reloc counts against the indirect sym to the direct sym
+	     list.  Merge any entries against the same section.  */
+	  for (pp = &eind->pcrel_relocs_copied; *pp != NULL;)
+	    {
+	      struct elf_cris_pcrel_relocs_copied *q;
+	      p = *pp;
+	      for (q = edir->pcrel_relocs_copied; q != NULL; q = q->next)
+		if (q->section == p->section)
+		  {
+		    q->count += p->count;
+		    *pp = p->next;
+		    break;
+		  }
+	      if (q == NULL)
+		pp = &p->next;
+	    }
+	  *pp = edir->pcrel_relocs_copied;
+	}
+      XMOVOPZ (pcrel_relocs_copied, =, NULL);
+    }
+  XMOVE (gotplt_refcount);
+  XMOVE (gotplt_offset);
+  XMOVE (reg_got_refcount);
+  XMOVE (tprel_refcount);
+  XMOVE (dtp_refcount);
+#undef XMOVE
+#undef XMOVOPZ
+
+  _bfd_elf_link_hash_copy_indirect (info, dir, ind);
+}
+
+/* Look through the relocs for a section during the first phase.  */
+
+static bfd_boolean
+cris_elf_check_relocs (bfd *abfd,
+		       struct bfd_link_info *info,
+		       asection *sec,
+		       const Elf_Internal_Rela *relocs)
+{
+  struct elf_cris_link_hash_table * htab;
+  bfd *dynobj;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  asection *sgot;
+  asection *srelgot;
+  asection *sreloc;
+
+  if (info->relocatable)
+    return TRUE;
+
+  htab = elf_cris_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+
+  sgot = NULL;
+  srelgot = NULL;
+  sreloc = NULL;
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+      enum elf_cris_reloc_type r_type;
+      bfd_signed_vma got_element_size = 4;
+      unsigned long r_symndx_lgot = INT_MAX;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  h = NULL;
+	  r_symndx_lgot = LGOT_REG_NDX (r_symndx);
+	}
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      /* Some relocs require linker-created sections; we need to hang them
+	 on the first input bfd we found that contained dynamic relocs.  */
+      switch (r_type)
+	{
+	case R_CRIS_32_DTPREL:
+	  if ((sec->flags & SEC_ALLOC) == 0)
+	    /* This'd be a .dtpreld entry in e.g. debug info.  We have
+	       several different switch statements below, but none of
+	       that is needed; we need no preparations for resolving
+	       R_CRIS_32_DTPREL into a non-allocated section (debug
+	       info), so let's just move on to the next
+	       relocation.  */
+	    continue;
+	  /* Fall through.  */
+	case R_CRIS_16_DTPREL:
+	  /* The first .got.plt entry is right after the R_CRIS_DTPMOD
+	     entry at index 3. */
+	  if (htab->dtpmod_refcount == 0)
+	    htab->next_gotplt_entry += 8;
+
+	  htab->dtpmod_refcount++;
+	  /* Fall through.  */
+
+	case R_CRIS_32_IE:
+	case R_CRIS_32_GD:
+	case R_CRIS_16_GOT_GD:
+	case R_CRIS_32_GOT_GD:
+	case R_CRIS_32_GOT_TPREL:
+	case R_CRIS_16_GOT_TPREL:
+	case R_CRIS_16_GOT:
+	case R_CRIS_32_GOT:
+	case R_CRIS_32_GOTREL:
+	case R_CRIS_32_PLT_GOTREL:
+	case R_CRIS_32_PLT_PCREL:
+	case R_CRIS_16_GOTPLT:
+	case R_CRIS_32_GOTPLT:
+	  if (dynobj == NULL)
+	    {
+	      elf_hash_table (info)->dynobj = dynobj = abfd;
+
+	      /* We could handle this if we can get a handle on the
+		 output bfd in elf_cris_adjust_dynamic_symbol.  Failing
+		 that, we must insist on dynobj being a specific mach.  */
+	      if (bfd_get_mach (dynobj) == bfd_mach_cris_v10_v32)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B, section %A:\n  v10/v32 compatible object %s"
+		       " must not contain a PIC relocation"),
+		     abfd, sec);
+		  return FALSE;
+		}
+
+	      /* Create the .got section, so we can assume it's always
+		 present whenever there's a dynobj.  */
+	      if (!_bfd_elf_create_got_section (dynobj, info))
+		return FALSE;
+	    }
+
+	  if (sgot == NULL)
+	    sgot = bfd_get_section_by_name (dynobj, ".got");
+
+	  if (local_got_refcounts == NULL)
+	    {
+	      bfd_size_type amt;
+
+	      /* We use index local_got_refcounts[-1] to count all
+		 GOT-relative relocations that do not have explicit
+		 GOT entries.  */
+	      amt = LGOT_ALLOC_NELTS_FOR (symtab_hdr->sh_info) + 1;
+	      amt *= sizeof (bfd_signed_vma);
+	      local_got_refcounts = ((bfd_signed_vma *) bfd_zalloc (abfd, amt));
+	      if (local_got_refcounts == NULL)
+		return FALSE;
+
+	      local_got_refcounts++;
+	      elf_local_got_refcounts (abfd) = local_got_refcounts;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+
+      /* Some relocs require a global offset table (but perhaps not a
+	 specific GOT entry).  */
+      switch (r_type)
+	{
+	case R_CRIS_16_DTPREL:
+	case R_CRIS_32_DTPREL:
+	  /* Not requesting .got.rela for an executable: the contents
+	     of the first entry is constant there.  For a shared
+	     library, we need .got.rela for the R_CRIS_DTPMOD
+	     relocation at index 3.  */
+	  if (!info->shared)
+	    break;
+	  /* Fall through.  */
+
+	case R_CRIS_32_IE:
+	case R_CRIS_32_GD:
+	case R_CRIS_16_GOT_GD:
+	case R_CRIS_32_GOT_GD:
+	case R_CRIS_32_GOT_TPREL:
+	case R_CRIS_16_GOT_TPREL:
+	  /* Fall through.  */
+
+	  /* For R_CRIS_16_GOTPLT and R_CRIS_32_GOTPLT, we need a GOT
+	     entry only for local symbols.  Unfortunately, we don't know
+	     until later on if there's a version script that forces the
+	     symbol local.  We must have the .rela.got section in place
+	     before we know if the symbol looks global now, so we need
+	     to treat the reloc just like for R_CRIS_16_GOT and
+	     R_CRIS_32_GOT.  */
+	case R_CRIS_16_GOTPLT:
+	case R_CRIS_32_GOTPLT:
+	case R_CRIS_16_GOT:
+	case R_CRIS_32_GOT:
+	  if (srelgot == NULL
+	      && (h != NULL || info->shared))
+	    {
+	      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+	      if (srelgot == NULL)
+		{
+		  srelgot = bfd_make_section_with_flags (dynobj,
+							 ".rela.got",
+							 (SEC_ALLOC
+							  | SEC_LOAD
+							  | SEC_HAS_CONTENTS
+							  | SEC_IN_MEMORY
+							  | SEC_LINKER_CREATED
+							  | SEC_READONLY));
+		  if (srelgot == NULL
+		      || !bfd_set_section_alignment (dynobj, srelgot, 2))
+		    return FALSE;
+		}
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+
+      /* Warn and error for invalid input.  */
+      switch (r_type)
+	{
+	case R_CRIS_32_IE:
+	case R_CRIS_32_TPREL:
+	case R_CRIS_16_TPREL:
+	case R_CRIS_32_GD:
+	  if (info->shared)
+	    {
+	      (*_bfd_error_handler)
+		(_("%B, section %A:\n  relocation %s not valid"
+		   " in a shared object;"
+		   " typically an option mixup, recompile with -fPIC"),
+		 abfd,
+		 sec,
+		 cris_elf_howto_table[r_type].name);
+	      /* Don't return FALSE here; we want messages for all of
+		 these and the error behavior is ungraceful
+		 anyway.  */
+	    }
+	default:
+	  break;
+	}
+
+      switch (r_type)
+	{
+	case R_CRIS_32_GD:
+	case R_CRIS_16_GOT_GD:
+	case R_CRIS_32_GOT_GD:
+	  /* These are requests for tls_index entries, run-time R_CRIS_DTP.  */
+	  got_element_size = 8;
+	  r_symndx_lgot = LGOT_DTP_NDX (r_symndx);
+	  break;
+
+	case R_CRIS_16_DTPREL:
+	case R_CRIS_32_DTPREL:
+	  /* These two just request for the constant-index
+	     module-local tls_index-sized GOT entry, which we add
+	     elsewhere.  */
+	  break;
+
+	case R_CRIS_32_IE:
+	case R_CRIS_32_GOT_TPREL:
+	case R_CRIS_16_GOT_TPREL:
+	  r_symndx_lgot = LGOT_TPREL_NDX (r_symndx);
+
+	  /* Those relocs also require that a DSO is of type
+	     Initial Exec.  Like other targets, we don't reset this
+	     flag even if the relocs are GC:ed away.  */
+	  if (info->shared)
+	    info->flags |= DF_STATIC_TLS;
+	  break;
+
+	  /* Let's list the other assembler-generated TLS-relocs too,
+	     just to show that they're not forgotten. */
+	case R_CRIS_16_TPREL:
+	case R_CRIS_32_TPREL:
+	default:
+	  break;
+	}
+
+      switch (r_type)
+        {
+	case R_CRIS_16_GOTPLT:
+	case R_CRIS_32_GOTPLT:
+	  /* Mark that we need a GOT entry if the PLT entry (and its GOT
+	     entry) is eliminated.  We can only do this for a non-local
+	     symbol.  */
+	  if (h != NULL)
+	    {
+	      elf_cris_hash_entry (h)->gotplt_refcount++;
+	      goto handle_gotplt_reloc;
+	    }
+	  /* If h is NULL then this is a local symbol, and we must make a
+	     GOT entry for it, so handle it like a GOT reloc.  */
+	  /* Fall through.  */
+
+	case R_CRIS_32_IE:
+	case R_CRIS_32_GD:
+	case R_CRIS_16_GOT_GD:
+	case R_CRIS_32_GOT_GD:
+	case R_CRIS_32_GOT_TPREL:
+	case R_CRIS_16_GOT_TPREL:
+	case R_CRIS_16_GOT:
+	case R_CRIS_32_GOT:
+	  /* This symbol requires a global offset table entry.  */
+	  if (h != NULL)
+	    {
+	      if (h->got.refcount == 0)
+		{
+		  /* Make sure this symbol is output as a dynamic symbol.  */
+		  if (h->dynindx == -1)
+		    {
+		      if (!bfd_elf_link_record_dynamic_symbol (info, h))
+			return FALSE;
+		    }
+		}
+
+	      /* Update the sum of reloc counts for this symbol.  */
+	      h->got.refcount++;
+
+	      switch (r_type)
+		{
+		case R_CRIS_16_GOT:
+		case R_CRIS_32_GOT:
+		  if (elf_cris_hash_entry (h)->reg_got_refcount == 0)
+		    {
+		      /* Allocate space in the .got section.  */
+		      sgot->size += got_element_size;
+		      /* Allocate relocation space.  */
+		      srelgot->size += sizeof (Elf32_External_Rela);
+		    }
+		  elf_cris_hash_entry (h)->reg_got_refcount++;
+		  break;
+
+		case R_CRIS_32_GD:
+		case R_CRIS_16_GOT_GD:
+		case R_CRIS_32_GOT_GD:
+		  if (elf_cris_hash_entry (h)->dtp_refcount == 0)
+		    {
+		      /* Allocate space in the .got section.  */
+		      sgot->size += got_element_size;
+		      /* Allocate relocation space.  */
+		      srelgot->size += sizeof (Elf32_External_Rela);
+		    }
+		  elf_cris_hash_entry (h)->dtp_refcount++;
+		  break;
+
+		case R_CRIS_32_IE:
+		case R_CRIS_32_GOT_TPREL:
+		case R_CRIS_16_GOT_TPREL:
+		  if (elf_cris_hash_entry (h)->tprel_refcount == 0)
+		    {
+		      /* Allocate space in the .got section.  */
+		      sgot->size += got_element_size;
+		      /* Allocate relocation space.  */
+		      srelgot->size += sizeof (Elf32_External_Rela);
+		    }
+		  elf_cris_hash_entry (h)->tprel_refcount++;
+		  break;
+
+		default:
+		  BFD_FAIL ();
+		  break;
+		}
+	    }
+	  else
+	    {
+	      /* This is a global offset table entry for a local symbol.  */
+	      if (local_got_refcounts[r_symndx_lgot] == 0)
+		{
+		  sgot->size += got_element_size;
+		  if (info->shared)
+		    {
+		      /* If we are generating a shared object, we need
+			 to output a R_CRIS_RELATIVE reloc so that the
+			 dynamic linker can adjust this GOT entry.
+			 Similarly for non-regular got entries.  */
+		      srelgot->size += sizeof (Elf32_External_Rela);
+		    }
+		}
+	      /* Update the reloc-specific count.  */
+	      local_got_refcounts[r_symndx_lgot]++;
+
+	      /* This one is the sum of all the others.  */
+	      local_got_refcounts[r_symndx]++;
+	    }
+	  break;
+
+	case R_CRIS_16_DTPREL:
+	case R_CRIS_32_DTPREL:
+	case R_CRIS_32_GOTREL:
+	  /* This reference requires a global offset table.
+	     FIXME: The actual refcount isn't used currently; the .got
+	     section can't be removed if there were any references in the
+	     input.  */
+	  local_got_refcounts[-1]++;
+	  break;
+
+	handle_gotplt_reloc:
+
+	case R_CRIS_32_PLT_GOTREL:
+	  /* This reference requires a global offset table.  */
+	  local_got_refcounts[-1]++;
+	  /* Fall through.  */
+
+	case R_CRIS_32_PLT_PCREL:
+	  /* This symbol requires a procedure linkage table entry.  We
+	     actually build the entry in adjust_dynamic_symbol,
+             because this might be a case of linking PIC code which is
+             never referenced by a dynamic object, in which case we
+             don't need to generate a procedure linkage table entry
+             after all.  */
+
+	  /* Beware: if we'd check for visibility of the symbol here
+	     (and not marking the need for a PLT when non-visible), we'd
+	     get into trouble with keeping handling consistent with
+	     regards to relocs found before definition and GOTPLT
+	     handling.  Eliminable PLT entries will be dealt with later
+	     anyway.  */
+	  if (h == NULL)
+	    continue;
+
+	  h->needs_plt = 1;
+	  h->plt.refcount++;
+	  break;
+
+	case R_CRIS_8:
+	case R_CRIS_16:
+	case R_CRIS_32:
+	  /* Let's help debug shared library creation.  Any of these
+	     relocs *can* be used in shared libs, but pages containing
+	     them cannot be shared, so they're not appropriate for
+	     common use.  Don't warn for sections we don't care about,
+	     such as debug sections or non-constant sections.  We
+	     can't help tables of (global) function pointers, for
+	     example, though they must be emitted in a (writable) data
+	     section to avoid having impure text sections.  */
+	  if (info->shared
+	      && (sec->flags & SEC_ALLOC) != 0
+	      && (sec->flags & SEC_READONLY) != 0)
+	    {
+	      /* FIXME: How do we make this optionally a warning only?  */
+	      (*_bfd_error_handler)
+		(_("%B, section %A:\n  relocation %s should not"
+		   " be used in a shared object; recompile with -fPIC"),
+		 abfd,
+		 sec,
+		 cris_elf_howto_table[r_type].name);
+	    }
+	  if (h != NULL)
+	    {
+	      h->non_got_ref = 1;
+
+	      /* Make sure a plt entry is created for this symbol if it
+		 turns out to be a function defined by a dynamic object.  */
+	      if (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT)
+		h->plt.refcount++;
+	    }
+
+	  /* If we are creating a shared library and this is not a local
+	     symbol, we need to copy the reloc into the shared library.
+	     However when linking with -Bsymbolic and this is a global
+	     symbol which is defined in an object we are including in the
+	     link (i.e., DEF_REGULAR is set), then we can resolve the
+	     reloc directly.  At this point we have not seen all the input
+	     files, so it is possible that DEF_REGULAR is not set now but
+	     will be set later (it is never cleared).  In case of a weak
+	     definition, DEF_REGULAR may be cleared later by a strong
+	     definition in a shared library.  We account for that
+	     possibility below by storing information in the relocs_copied
+	     field of the hash table entry.  A similar situation occurs
+	     when creating shared libraries and symbol visibility changes
+	     render the symbol local.  */
+
+	  /* No need to do anything if we're not creating a shared object.  */
+	  if (! info->shared)
+	    break;
+
+	  /* We don't need to handle relocs into sections not going into
+	     the "real" output.  */
+	  if ((sec->flags & SEC_ALLOC) == 0)
+	    break;
+
+	  /* We may need to create a reloc section in the dynobj and made room
+	     for this reloc.  */
+	  if (sreloc == NULL)
+	    {
+	      sreloc = _bfd_elf_make_dynamic_reloc_section
+		(sec, dynobj, 2, abfd, /*rela?*/ TRUE);
+
+	      if (sreloc == NULL)
+		return FALSE;
+	    }
+
+	  if (sec->flags & SEC_READONLY)
+	    info->flags |= DF_TEXTREL;
+
+	  sreloc->size += sizeof (Elf32_External_Rela);
+	  break;
+
+	case R_CRIS_8_PCREL:
+	case R_CRIS_16_PCREL:
+	case R_CRIS_32_PCREL:
+	  if (h != NULL)
+	    {
+	      h->non_got_ref = 1;
+
+	      /* Make sure a plt entry is created for this symbol if it
+		 turns out to be a function defined by a dynamic object.  */
+	      if (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT)
+		h->plt.refcount++;
+	    }
+
+	  /* If we are creating a shared library and this is not a local
+	     symbol, we need to copy the reloc into the shared library.
+	     However when linking with -Bsymbolic and this is a global
+	     symbol which is defined in an object we are including in the
+	     link (i.e., DEF_REGULAR is set), then we can resolve the
+	     reloc directly.  At this point we have not seen all the input
+	     files, so it is possible that DEF_REGULAR is not set now but
+	     will be set later (it is never cleared).  In case of a weak
+	     definition, DEF_REGULAR may be cleared later by a strong
+	     definition in a shared library.  We account for that
+	     possibility below by storing information in the relocs_copied
+	     field of the hash table entry.  A similar situation occurs
+	     when creating shared libraries and symbol visibility changes
+	     render the symbol local.  */
+
+	  /* No need to do anything if we're not creating a shared object.  */
+	  if (! info->shared)
+	    break;
+
+	  /* We don't need to handle relocs into sections not going into
+	     the "real" output.  */
+	  if ((sec->flags & SEC_ALLOC) == 0)
+	    break;
+
+	  /* If the symbol is local, then we know already we can
+	     eliminate the reloc.  */
+	  if (h == NULL || ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	    break;
+
+	  /* If this is with -Bsymbolic and the symbol isn't weak, and
+	     is defined by an ordinary object (the ones we include in
+	     this shared library) then we can also eliminate the
+	     reloc.  See comment above for more eliminable cases which
+	     we can't identify at this time.  */
+	  if (info->symbolic
+	      && h->root.type != bfd_link_hash_defweak
+	      && h->def_regular)
+	    break;
+
+	  /* We may need to create a reloc section in the dynobj and made room
+	     for this reloc.  */
+	  if (sreloc == NULL)
+	    {
+	      sreloc = _bfd_elf_make_dynamic_reloc_section
+		(sec, dynobj, 2, abfd, /*rela?*/ TRUE);
+
+	      if (sreloc == NULL)
+		return FALSE;
+	    }
+
+	  sreloc->size += sizeof (Elf32_External_Rela);
+
+	  /* We count the number of PC relative relocations we have
+	     entered for this symbol, so that we can discard them
+	     again if the symbol is later defined by a regular object.
+	     We know that h is really a pointer to an
+	     elf_cris_link_hash_entry.  */
+	  {
+	    struct elf_cris_link_hash_entry *eh;
+	    struct elf_cris_pcrel_relocs_copied *p;
+
+	    eh = elf_cris_hash_entry (h);
+
+	    for (p = eh->pcrel_relocs_copied; p != NULL; p = p->next)
+	      if (p->section == sec)
+		break;
+
+	    if (p == NULL)
+	      {
+		p = ((struct elf_cris_pcrel_relocs_copied *)
+		     bfd_alloc (dynobj, (bfd_size_type) sizeof *p));
+		if (p == NULL)
+		  return FALSE;
+		p->next = eh->pcrel_relocs_copied;
+		eh->pcrel_relocs_copied = p;
+		p->section = sec;
+		p->count = 0;
+		p->r_type = r_type;
+	      }
+
+	    ++p->count;
+	  }
+	  break;
+
+        /* This relocation describes the C++ object vtable hierarchy.
+           Reconstruct it for later use during GC.  */
+        case R_CRIS_GNU_VTINHERIT:
+          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+
+        /* This relocation describes which C++ vtable entries are actually
+           used.  Record for later use during GC.  */
+        case R_CRIS_GNU_VTENTRY:
+          BFD_ASSERT (h != NULL);
+          if (h != NULL
+              && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+            return FALSE;
+          break;
+
+	case R_CRIS_16_TPREL:
+	case R_CRIS_32_TPREL:
+	  /* Already warned above, when necessary.  */
+	  break;
+
+	default:
+	  /* Other relocs do not appear here.  */
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+elf_cris_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+				struct bfd_link_info *info)
+{
+  struct elf_cris_link_hash_table * htab;
+  bfd *dynobj;
+  asection *s;
+  bfd_boolean plt;
+  bfd_boolean relocs;
+
+  htab = elf_cris_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (s != NULL);
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+  else
+    {
+      /* Adjust all expected GOTPLT uses to use a GOT entry instead.  */
+      elf_cris_link_hash_traverse (htab, elf_cris_adjust_gotplt_to_got,
+				   info);
+
+      /* We may have created entries in the .rela.got section.
+	 However, if we are not creating the dynamic sections, we will
+	 not actually use these entries.  Reset the size of .rela.got,
+	 which will cause it to get stripped from the output file
+	 below.  */
+      s = bfd_get_section_by_name (dynobj, ".rela.got");
+      if (s != NULL)
+	s->size = 0;
+    }
+
+  /* If this is a -Bsymbolic shared link, then we need to discard all PC
+     relative relocs against symbols defined in a regular object.  We
+     allocated space for them in the check_relocs routine, but we will not
+     fill them in in the relocate_section routine.  We also discard space
+     for relocs that have become for local symbols due to symbol
+     visibility changes.  For programs, we discard space for relocs for
+     symbols not referenced by any dynamic object.  */
+  if (info->shared)
+    elf_cris_link_hash_traverse (htab,
+				 elf_cris_discard_excess_dso_dynamics,
+				 info);
+  else
+    elf_cris_link_hash_traverse (htab,
+				 elf_cris_discard_excess_program_dynamics,
+				 info);
+
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  plt = FALSE;
+  relocs = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      const char *name;
+
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      /* It's OK to base decisions on the section name, because none
+	 of the dynobj section names depend upon the input files.  */
+      name = bfd_get_section_name (dynobj, s);
+
+      if (strcmp (name, ".plt") == 0)
+	{
+	  /* Remember whether there is a PLT.  */
+	  plt = s->size != 0;
+	}
+      else if (strcmp (name, ".got.plt") == 0)
+	{
+	  /* The .got.plt contains the .got header as well as the
+	     actual .got.plt contents.  The .got header may contain a
+	     R_CRIS_DTPMOD entry at index 3.  */
+	  s->size += htab->dtpmod_refcount != 0
+	    ? 8 : 0;
+	}
+      else if (CONST_STRNEQ (name, ".rela"))
+	{
+	  if (strcmp (name, ".rela.got") == 0
+	      && htab->dtpmod_refcount != 0
+	      && info->shared)
+	    s->size += sizeof (Elf32_External_Rela);
+
+	  if (s->size != 0)
+	    {
+	      /* Remember whether there are any reloc sections other
+                 than .rela.plt.  */
+	      if (strcmp (name, ".rela.plt") != 0)
+		  relocs = TRUE;
+
+	      /* We use the reloc_count field as a counter if we need
+		 to copy relocs into the output file.  */
+	      s->reloc_count = 0;
+	    }
+	}
+      else if (! CONST_STRNEQ (name, ".got")
+	       && strcmp (name, ".dynbss") != 0)
+	{
+	  /* It's not one of our sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (s->size == 0)
+	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is mostly to handle .rela.bss and
+	     .rela.plt.  We must create both sections in
+	     create_dynamic_sections, because they must be created
+	     before the linker maps input sections to output
+	     sections.  The linker does that before
+	     adjust_dynamic_symbol is called, and it is that
+	     function which decides whether anything needs to go
+	     into these sections.  */
+	  s->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents. We use bfd_zalloc here
+	 in case unused entries are not reclaimed before the section's
+	 contents are written out.  This should not happen, but this way
+	 if it does, we will not write out garbage.  For reloc sections,
+	 this will make entries have the type R_CRIS_NONE.  */
+      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in elf_cris_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (!info->shared)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (plt)
+	{
+	  if (!add_dynamic_entry (DT_PLTGOT, 0)
+	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+	      || !add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+	}
+
+      if (relocs)
+	{
+	  if (!add_dynamic_entry (DT_RELA, 0)
+	      || !add_dynamic_entry (DT_RELASZ, 0)
+	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
+	    return FALSE;
+	}
+
+      if ((info->flags & DF_TEXTREL) != 0)
+	{
+	  if (!add_dynamic_entry (DT_TEXTREL, 0))
+	    return FALSE;
+	  info->flags |= DF_TEXTREL;
+	}
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+/* This function is called via elf_cris_link_hash_traverse if we are
+   creating a shared object.  In the -Bsymbolic case, it discards the
+   space allocated to copy PC relative relocs against symbols which
+   are defined in regular objects.  For the normal non-symbolic case,
+   we also discard space for relocs that have become local due to
+   symbol visibility changes.  We allocated space for them in the
+   check_relocs routine, but we won't fill them in in the
+   relocate_section routine.  */
+
+static bfd_boolean
+elf_cris_discard_excess_dso_dynamics (h, inf)
+     struct elf_cris_link_hash_entry *h;
+     PTR inf;
+{
+  struct elf_cris_pcrel_relocs_copied *s;
+  struct bfd_link_info *info = (struct bfd_link_info *) inf;
+
+  /* If a symbol has been forced local or we have found a regular
+     definition for the symbolic link case, then we won't be needing
+     any relocs.  */
+  if (h->root.def_regular
+      && (h->root.forced_local
+	  || info->symbolic))
+    {
+      for (s = h->pcrel_relocs_copied; s != NULL; s = s->next)
+	{
+	  asection *sreloc
+	    = _bfd_elf_get_dynamic_reloc_section (elf_hash_table (info)
+						  ->dynobj,
+						  s->section,
+						  /*rela?*/ TRUE);
+	  sreloc->size -= s->count * sizeof (Elf32_External_Rela);
+	}
+      return TRUE;
+    }
+
+  /* If we have accounted for PC-relative relocs for read-only
+     sections, now is the time to warn for them.  We can't do it in
+     cris_elf_check_relocs, because we don't know the status of all
+     symbols at that time (and it's common to force symbols local
+     late).  */
+
+  for (s = h->pcrel_relocs_copied; s != NULL; s = s->next)
+    if ((s->section->flags & SEC_READONLY) != 0)
+      {
+	/* FIXME: How do we make this optionally a warning only?  */
+	(*_bfd_error_handler)
+	  (_("%B, section `%A', to symbol `%s':\n"
+	     "  relocation %s should not be used"
+	     " in a shared object; recompile with -fPIC"),
+	   s->section->owner,
+	   s->section,
+	   h->root.root.root.string,
+	   cris_elf_howto_table[s->r_type].name);
+
+	info->flags |= DF_TEXTREL;
+      }
+
+  return TRUE;
+}
+
+/* This function is called via elf_cris_link_hash_traverse if we are *not*
+   creating a shared object.  We discard space for relocs for symbols put
+   in the .got, but which we found we do not have to resolve at run-time.  */
+
+static bfd_boolean
+elf_cris_discard_excess_program_dynamics (h, inf)
+     struct elf_cris_link_hash_entry *h;
+     PTR inf;
+{
+  struct bfd_link_info *info = (struct bfd_link_info *) inf;
+
+  /* If we're not creating a shared library and have a symbol which is
+     referred to by .got references, but the symbol is defined locally,
+     (or rather, not defined by a DSO) then lose the reloc for the .got
+     (don't allocate room for it).  Likewise for relocs for something
+     for which we create a PLT.  */
+  if (!h->root.def_dynamic
+      || h->root.plt.refcount > 0)
+    {
+      if (h->reg_got_refcount > 0
+	  /* The size of this section is only valid and in sync with the
+	     various reference counts if we do dynamic; don't decrement it
+	     otherwise.  */
+	  && elf_hash_table (info)->dynamic_sections_created)
+	{
+	  bfd *dynobj = elf_hash_table (info)->dynobj;
+	  asection *srelgot;
+
+	  BFD_ASSERT (dynobj != NULL);
+
+	  srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+
+	  BFD_ASSERT (srelgot != NULL);
+
+	  srelgot->size -= sizeof (Elf32_External_Rela);
+	}
+
+      /* If the locally-defined symbol isn't used by a DSO, then we don't
+	 have to export it as a dynamic symbol.  This was already done for
+	 functions; doing this for all symbols would presumably not
+	 introduce new problems.  Of course we don't do this if we're
+	 exporting all dynamic symbols.  */
+      if (! info->export_dynamic
+	  && h->root.dynindx != -1
+	  && !h->root.def_dynamic
+	  && !h->root.ref_dynamic)
+	{
+	  h->root.dynindx = -1;
+	  _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
+				  h->root.dynstr_index);
+	}
+    }
+
+  return TRUE;
+}
+
+/* Reject a file depending on presence and expectation of prefixed
+   underscores on symbols.  */
+
+static bfd_boolean
+cris_elf_object_p (abfd)
+     bfd *abfd;
+{
+  if (! cris_elf_set_mach_from_flags (abfd, elf_elfheader (abfd)->e_flags))
+    return FALSE;
+
+  if ((elf_elfheader (abfd)->e_flags & EF_CRIS_UNDERSCORE))
+    return (bfd_get_symbol_leading_char (abfd) == '_');
+  else
+    return (bfd_get_symbol_leading_char (abfd) == 0);
+}
+
+/* Mark presence or absence of leading underscore.  Set machine type
+   flags from mach type.  */
+
+static void
+cris_elf_final_write_processing (abfd, linker)
+     bfd *abfd;
+     bfd_boolean linker ATTRIBUTE_UNUSED;
+{
+  unsigned long e_flags = elf_elfheader (abfd)->e_flags;
+
+  e_flags &= ~EF_CRIS_UNDERSCORE;
+  if (bfd_get_symbol_leading_char (abfd) == '_')
+    e_flags |= EF_CRIS_UNDERSCORE;
+
+  switch (bfd_get_mach (abfd))
+    {
+    case bfd_mach_cris_v0_v10:
+      e_flags |= EF_CRIS_VARIANT_ANY_V0_V10;
+      break;
+
+    case bfd_mach_cris_v10_v32:
+      e_flags |= EF_CRIS_VARIANT_COMMON_V10_V32;
+      break;
+
+    case bfd_mach_cris_v32:
+      e_flags |= EF_CRIS_VARIANT_V32;
+      break;
+
+    default:
+      _bfd_abort (__FILE__, __LINE__,
+		  _("Unexpected machine number"));
+    }
+
+  elf_elfheader (abfd)->e_flags = e_flags;
+}
+
+/* Set the mach type from e_flags value.  */
+
+static bfd_boolean
+cris_elf_set_mach_from_flags (abfd, flags)
+     bfd *abfd;
+     unsigned long flags;
+{
+  switch (flags & EF_CRIS_VARIANT_MASK)
+    {
+    case EF_CRIS_VARIANT_ANY_V0_V10:
+      bfd_default_set_arch_mach (abfd, bfd_arch_cris, bfd_mach_cris_v0_v10);
+      break;
+
+    case EF_CRIS_VARIANT_V32:
+      bfd_default_set_arch_mach (abfd, bfd_arch_cris, bfd_mach_cris_v32);
+      break;
+
+    case EF_CRIS_VARIANT_COMMON_V10_V32:
+      bfd_default_set_arch_mach (abfd, bfd_arch_cris, bfd_mach_cris_v10_v32);
+      break;
+
+    default:
+      /* Since we don't recognize them, we obviously can't support them
+	 with this code; we'd have to require that all future handling
+	 would be optional.  */
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Display the flags field.  */
+
+static bfd_boolean
+cris_elf_print_private_bfd_data (abfd, ptr)
+     bfd *abfd;
+     PTR ptr;
+{
+  FILE *file = (FILE *) ptr;
+
+  BFD_ASSERT (abfd != NULL && ptr != NULL);
+
+  _bfd_elf_print_private_bfd_data (abfd, ptr);
+
+  fprintf (file, _("private flags = %lx:"), elf_elfheader (abfd)->e_flags);
+
+  if (elf_elfheader (abfd)->e_flags & EF_CRIS_UNDERSCORE)
+    fprintf (file, _(" [symbols have a _ prefix]"));
+  if ((elf_elfheader (abfd)->e_flags & EF_CRIS_VARIANT_MASK)
+      == EF_CRIS_VARIANT_COMMON_V10_V32)
+    fprintf (file, _(" [v10 and v32]"));
+  if ((elf_elfheader (abfd)->e_flags & EF_CRIS_VARIANT_MASK)
+      == EF_CRIS_VARIANT_V32)
+    fprintf (file, _(" [v32]"));
+
+  fputc ('\n', file);
+  return TRUE;
+}
+
+/* Don't mix files with and without a leading underscore.  */
+
+static bfd_boolean
+cris_elf_merge_private_bfd_data (ibfd, obfd)
+     bfd *ibfd;
+     bfd *obfd;
+{
+  int imach, omach;
+
+  if (! _bfd_generic_verify_endian_match (ibfd, obfd))
+    return FALSE;
+
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  imach = bfd_get_mach (ibfd);
+
+  if (! elf_flags_init (obfd))
+    {
+      /* This happens when ld starts out with a 'blank' output file.  */
+      elf_flags_init (obfd) = TRUE;
+
+      /* We ignore the linker-set mach, and instead set it according to
+	 the first input file.  This would also happen if we could
+	 somehow filter out the OUTPUT_ARCH () setting from elf.sc.
+	 This allows us to keep the same linker config across
+	 cris(v0..v10) and crisv32.  The drawback is that we can't force
+	 the output type, which might be a sane thing to do for a
+	 v10+v32 compatibility object.  */
+      if (! bfd_set_arch_mach (obfd, bfd_arch_cris, imach))
+	return FALSE;
+    }
+
+  if (bfd_get_symbol_leading_char (ibfd)
+      != bfd_get_symbol_leading_char (obfd))
+    {
+      (*_bfd_error_handler)
+	(bfd_get_symbol_leading_char (ibfd) == '_'
+	 ? _("%B: uses _-prefixed symbols, but writing file with non-prefixed symbols")
+	 : _("%B: uses non-prefixed symbols, but writing file with _-prefixed symbols"),
+	 ibfd);
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  omach = bfd_get_mach (obfd);
+
+  if (imach != omach)
+    {
+      /* We can get an incompatible combination only if either is
+	 bfd_mach_cris_v32, and the other one isn't compatible.  */
+      if ((imach == bfd_mach_cris_v32
+	   && omach != bfd_mach_cris_v10_v32)
+	  || (omach == bfd_mach_cris_v32
+	      && imach != bfd_mach_cris_v10_v32))
+	{
+	  (*_bfd_error_handler)
+	    ((imach == bfd_mach_cris_v32)
+	     ? _("%B contains CRIS v32 code, incompatible"
+		 " with previous objects")
+	     : _("%B contains non-CRIS-v32 code, incompatible"
+		 " with previous objects"),
+	     ibfd);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      /* We don't have to check the case where the input is compatible
+	 with v10 and v32, because the output is already known to be set
+	 to the other (compatible) mach.  */
+      if (omach == bfd_mach_cris_v10_v32
+	  && ! bfd_set_arch_mach (obfd, bfd_arch_cris, imach))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Do side-effects of e_flags copying to obfd.  */
+
+static bfd_boolean
+cris_elf_copy_private_bfd_data (ibfd, obfd)
+     bfd *ibfd;
+     bfd *obfd;
+{
+  /* Call the base function.  */
+  if (!_bfd_elf_copy_private_bfd_data (ibfd, obfd))
+    return FALSE;
+
+  /* If output is big-endian for some obscure reason, stop here.  */
+  if (_bfd_generic_verify_endian_match (ibfd, obfd) == FALSE)
+    return FALSE;
+
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  /* Do what we really came here for.  */
+  return bfd_set_arch_mach (obfd, bfd_arch_cris, bfd_get_mach (ibfd));
+}
+
+static enum elf_reloc_type_class
+elf_cris_reloc_type_class (rela)
+     const Elf_Internal_Rela *rela;
+{
+  enum elf_cris_reloc_type r_type = ELF32_R_TYPE (rela->r_info);
+  switch (r_type)
+    {
+    case R_CRIS_RELATIVE:
+      return reloc_class_relative;
+    case R_CRIS_JUMP_SLOT:
+      return reloc_class_plt;
+    case R_CRIS_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+/* The elf_backend_got_elt_size worker.  For one symbol, we can have up to
+   two GOT entries from three types with two different sizes.  We handle
+   it as a single entry, so we can use the regular offset-calculation
+   machinery.  */
+
+static bfd_vma
+elf_cris_got_elt_size (bfd *abfd ATTRIBUTE_UNUSED,
+		       struct bfd_link_info *info ATTRIBUTE_UNUSED,
+		       struct elf_link_hash_entry *hr,
+		       bfd *ibfd,
+		       unsigned long symndx)
+{
+  struct elf_link_hash_entry *h = (struct elf_link_hash_entry *) hr;
+  bfd_vma eltsiz = 0;
+
+  /* We may have one regular GOT entry or up to two TLS GOT
+     entries.  */
+  if (h == NULL)
+    {
+      Elf_Internal_Shdr *symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+      bfd_signed_vma *local_got_refcounts = elf_local_got_refcounts (ibfd);
+
+      BFD_ASSERT (local_got_refcounts != NULL);
+
+      if (local_got_refcounts[LGOT_REG_NDX (symndx)] > 0)
+	{
+	  /* We can't have a variable referred to both as a regular
+	     variable and through TLS relocs.  */
+	  BFD_ASSERT (local_got_refcounts[LGOT_DTP_NDX (symndx)] == 0
+		      && local_got_refcounts[LGOT_TPREL_NDX (symndx)] == 0);
+	  return 4;
+	}
+
+      if (local_got_refcounts[LGOT_DTP_NDX (symndx)] > 0)
+	eltsiz += 8;
+
+      if (local_got_refcounts[LGOT_TPREL_NDX (symndx)] > 0)
+	eltsiz += 4;
+    }
+  else
+    {
+      struct elf_cris_link_hash_entry *hh = elf_cris_hash_entry (h);
+      if (hh->reg_got_refcount > 0)
+	{
+	  /* The actual error-on-input is emitted elsewhere.  */
+	  BFD_ASSERT (hh->dtp_refcount == 0 && hh->tprel_refcount == 0);
+	  return 4;
+	}
+
+      if (hh->dtp_refcount > 0)
+	eltsiz += 8;
+
+      if (hh->tprel_refcount > 0)
+	eltsiz += 4;
+    }
+
+  /* We're only called when h->got.refcount is non-zero, so we must
+     have a non-zero size.  */
+  BFD_ASSERT (eltsiz != 0);
+  return eltsiz;
+}
+
+#define ELF_ARCH		bfd_arch_cris
+#define ELF_TARGET_ID		CRIS_ELF_DATA
+#define ELF_MACHINE_CODE	EM_CRIS
+#define ELF_MAXPAGESIZE		0x2000
+
+#define TARGET_LITTLE_SYM	bfd_elf32_cris_vec
+#define TARGET_LITTLE_NAME	"elf32-cris"
+#define elf_symbol_leading_char 0
+
+#define elf_info_to_howto_rel			NULL
+#define elf_info_to_howto			cris_info_to_howto_rela
+#define elf_backend_relocate_section		cris_elf_relocate_section
+#define elf_backend_gc_mark_hook		cris_elf_gc_mark_hook
+#define elf_backend_gc_sweep_hook		cris_elf_gc_sweep_hook
+#define elf_backend_plt_sym_val			cris_elf_plt_sym_val
+#define elf_backend_check_relocs                cris_elf_check_relocs
+#define elf_backend_grok_prstatus		cris_elf_grok_prstatus
+#define elf_backend_grok_psinfo			cris_elf_grok_psinfo
+
+#define elf_backend_can_gc_sections		1
+#define elf_backend_can_refcount		1
+
+#define elf_backend_object_p			cris_elf_object_p
+#define elf_backend_final_write_processing \
+	cris_elf_final_write_processing
+#define bfd_elf32_bfd_print_private_bfd_data \
+	cris_elf_print_private_bfd_data
+#define bfd_elf32_bfd_merge_private_bfd_data \
+	cris_elf_merge_private_bfd_data
+#define bfd_elf32_bfd_copy_private_bfd_data \
+	cris_elf_copy_private_bfd_data
+
+#define bfd_elf32_bfd_reloc_type_lookup		cris_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup	cris_reloc_name_lookup
+
+#define bfd_elf32_bfd_link_hash_table_create \
+	elf_cris_link_hash_table_create
+#define elf_backend_adjust_dynamic_symbol \
+	elf_cris_adjust_dynamic_symbol
+#define elf_backend_copy_indirect_symbol \
+	elf_cris_copy_indirect_symbol
+#define elf_backend_size_dynamic_sections \
+	elf_cris_size_dynamic_sections
+#define elf_backend_init_index_section		_bfd_elf_init_1_index_section
+#define elf_backend_finish_dynamic_symbol \
+	elf_cris_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections \
+	elf_cris_finish_dynamic_sections
+#define elf_backend_create_dynamic_sections \
+	_bfd_elf_create_dynamic_sections
+#define bfd_elf32_bfd_final_link \
+	bfd_elf_gc_common_final_link
+#define elf_backend_hide_symbol			elf_cris_hide_symbol
+#define elf_backend_reloc_type_class		elf_cris_reloc_type_class
+
+#define elf_backend_want_got_plt	1
+#define elf_backend_plt_readonly	1
+#define elf_backend_want_plt_sym	0
+#define elf_backend_got_header_size	12
+#define elf_backend_got_elt_size elf_cris_got_elt_size
+
+/* Later, we my want to optimize RELA entries into REL entries for dynamic
+   linking and libraries (if it's a win of any significance).  Until then,
+   take the easy route.  */
+#define elf_backend_may_use_rel_p 0
+#define elf_backend_may_use_rela_p 1
+#define elf_backend_rela_normal		1
+
+#include "elf32-target.h"
+
+#undef TARGET_LITTLE_SYM
+#undef TARGET_LITTLE_NAME
+#undef elf_symbol_leading_char
+
+#define TARGET_LITTLE_SYM bfd_elf32_us_cris_vec
+#define TARGET_LITTLE_NAME "elf32-us-cris"
+#define elf_symbol_leading_char '_'
+#undef elf32_bed
+#define elf32_bed elf32_us_cris_bed
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-crx.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-crx.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-crx.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-crx.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1331 @@
+/* BFD back-end for National Semiconductor's CRX ELF
+   Copyright 2004, 2005, 2006, 2007, 2009, 2010
+   Free Software Foundation, Inc.
+   Written by Tomer Levi, NSC, Israel.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/crx.h"
+
+static reloc_howto_type *elf_crx_reloc_type_lookup
+  (bfd *, bfd_reloc_code_real_type);
+static void elf_crx_info_to_howto
+  (bfd *, arelent *, Elf_Internal_Rela *);
+static bfd_boolean elf32_crx_relax_delete_bytes
+  (struct bfd_link_info *, bfd *, asection *, bfd_vma, int);
+static bfd_reloc_status_type crx_elf_final_link_relocate
+  (reloc_howto_type *, bfd *, bfd *, asection *,
+   bfd_byte *, bfd_vma, bfd_vma, bfd_vma,
+   struct bfd_link_info *, asection *, int);
+static bfd_boolean elf32_crx_relocate_section
+  (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **);
+static bfd_boolean elf32_crx_relax_section
+  (bfd *, asection *, struct bfd_link_info *, bfd_boolean *);
+static bfd_byte * elf32_crx_get_relocated_section_contents
+  (bfd *, struct bfd_link_info *, struct bfd_link_order *,
+   bfd_byte *, bfd_boolean, asymbol **);
+
+/* crx_reloc_map array maps BFD relocation enum into a CRGAS relocation type.  */
+
+struct crx_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_enum; /* BFD relocation enum.  */
+  unsigned short crx_reloc_type;	   /* CRX relocation type.  */
+};
+
+static const struct crx_reloc_map crx_reloc_map[R_CRX_MAX] =
+{
+  {BFD_RELOC_NONE,	    R_CRX_NONE},
+  {BFD_RELOC_CRX_REL4,	    R_CRX_REL4},
+  {BFD_RELOC_CRX_REL8,	    R_CRX_REL8},
+  {BFD_RELOC_CRX_REL8_CMP,  R_CRX_REL8_CMP},
+  {BFD_RELOC_CRX_REL16,	    R_CRX_REL16},
+  {BFD_RELOC_CRX_REL24,	    R_CRX_REL24},
+  {BFD_RELOC_CRX_REL32,	    R_CRX_REL32},
+  {BFD_RELOC_CRX_REGREL12,  R_CRX_REGREL12},
+  {BFD_RELOC_CRX_REGREL22,  R_CRX_REGREL22},
+  {BFD_RELOC_CRX_REGREL28,  R_CRX_REGREL28},
+  {BFD_RELOC_CRX_REGREL32,  R_CRX_REGREL32},
+  {BFD_RELOC_CRX_ABS16,	    R_CRX_ABS16},
+  {BFD_RELOC_CRX_ABS32,	    R_CRX_ABS32},
+  {BFD_RELOC_CRX_NUM8,	    R_CRX_NUM8},
+  {BFD_RELOC_CRX_NUM16,	    R_CRX_NUM16},
+  {BFD_RELOC_CRX_NUM32,	    R_CRX_NUM32},
+  {BFD_RELOC_CRX_IMM16,	    R_CRX_IMM16},
+  {BFD_RELOC_CRX_IMM32,	    R_CRX_IMM32},
+  {BFD_RELOC_CRX_SWITCH8,   R_CRX_SWITCH8},
+  {BFD_RELOC_CRX_SWITCH16,  R_CRX_SWITCH16},
+  {BFD_RELOC_CRX_SWITCH32,  R_CRX_SWITCH32}
+};
+
+static reloc_howto_type crx_elf_howto_table[] =
+{
+  HOWTO (R_CRX_NONE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_CRX_REL4,		/* type */
+	 1,			/* rightshift */
+	 0,			/* size */
+	 4,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_REL4",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xf,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_CRX_REL8,		/* type */
+	 1,			/* rightshift */
+	 0,			/* size */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_REL8",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_CRX_REL8_CMP,	/* type */
+	 1,			/* rightshift */
+	 0,			/* size */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_REL8_CMP",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_CRX_REL16,		/* type */
+	 1,			/* rightshift */
+	 1,			/* size */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_REL16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_CRX_REL24,		/* type */
+	 1,			/* rightshift */
+	 2,			/* size */
+	 24,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_REL24",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_CRX_REL32,		/* type */
+	 1,			/* rightshift */
+	 2,			/* size */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_REL32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_CRX_REGREL12,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_REGREL12",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xfff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_CRX_REGREL22,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size */
+	 22,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_REGREL22",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0x3fffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_CRX_REGREL28,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size */
+	 28,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_REGREL28",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xfffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_CRX_REGREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_REGREL32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_CRX_ABS16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_ABS16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_CRX_ABS32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_ABS32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_CRX_NUM8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_NUM8",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,	  		/* src_mask */
+	 0xff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_CRX_NUM16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_NUM16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,	  		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_CRX_NUM32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_NUM32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,	  		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_CRX_IMM16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_IMM16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0, 	 		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_CRX_IMM32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_IMM32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,  			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+ 
+  /* An 8 bit switch table entry.  This is generated for an expression
+     such as ``.byte L1 - L2''.  The offset holds the difference
+     between the reloc address and L2.  */
+  HOWTO (R_CRX_SWITCH8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_SWITCH8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 16 bit switch table entry.  This is generated for an expression
+     such as ``.word L1 - L2''.  The offset holds the difference
+     between the reloc address and L2.  */
+  HOWTO (R_CRX_SWITCH16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_SWITCH16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 32 bit switch table entry.  This is generated for an expression
+     such as ``.long L1 - L2''.  The offset holds the difference
+     between the reloc address and L2.  */
+  HOWTO (R_CRX_SWITCH32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_CRX_SWITCH32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE)			/* pcrel_offset */
+};
+
+/* Retrieve a howto ptr using a BFD reloc_code.  */
+
+static reloc_howto_type *
+elf_crx_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			   bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0; i < R_CRX_MAX; i++)
+    if (code == crx_reloc_map[i].bfd_reloc_enum)
+      return &crx_elf_howto_table[crx_reloc_map[i].crx_reloc_type];
+
+  printf ("This relocation Type is not supported -0x%x\n", code);
+  return 0;
+}
+
+static reloc_howto_type *
+elf_crx_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			   const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (crx_elf_howto_table) / sizeof (crx_elf_howto_table[0]);
+       i++)
+    if (crx_elf_howto_table[i].name != NULL
+	&& strcasecmp (crx_elf_howto_table[i].name, r_name) == 0)
+      return &crx_elf_howto_table[i];
+
+  return NULL;
+}
+
+/* Retrieve a howto ptr using an internal relocation entry.  */
+
+static void
+elf_crx_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr,
+		       Elf_Internal_Rela *dst)
+{
+  unsigned int r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_CRX_MAX);
+  cache_ptr->howto = &crx_elf_howto_table[r_type];
+}
+
+/* Perform a relocation as part of a final link.  */
+
+static bfd_reloc_status_type
+crx_elf_final_link_relocate (reloc_howto_type *howto, bfd *input_bfd,
+			     bfd *output_bfd ATTRIBUTE_UNUSED,
+			     asection *input_section, bfd_byte *contents,
+			     bfd_vma offset, bfd_vma Rvalue, bfd_vma addend,
+			     struct bfd_link_info *info ATTRIBUTE_UNUSED,
+			     asection *sec ATTRIBUTE_UNUSED,
+			     int is_local ATTRIBUTE_UNUSED)
+{
+  unsigned short r_type = howto->type;
+  bfd_byte *hit_data = contents + offset;
+  bfd_vma reloc_bits, check;
+
+  switch (r_type)
+    {
+     case R_CRX_IMM16:
+     case R_CRX_IMM32:
+     case R_CRX_ABS16:
+     case R_CRX_ABS32:
+     case R_CRX_REL8_CMP:
+     case R_CRX_REL16:
+     case R_CRX_REL24:
+     case R_CRX_REL32:
+     case R_CRX_REGREL12:
+     case R_CRX_REGREL22:
+     case R_CRX_REGREL28:
+     case R_CRX_REGREL32:
+       /* 'hit_data' is relative to the start of the instruction, not the
+	  relocation offset. Advance it to account for the exact offset.  */
+       hit_data += 2;
+       break;
+
+     case R_CRX_REL4:
+       /* This relocation type is used only in 'Branch if Equal to 0'
+	  instructions and requires special handling.  */
+       Rvalue -= 1;
+       break;
+
+     case R_CRX_NONE:
+       return bfd_reloc_ok;
+       break;
+
+     case R_CRX_SWITCH8:
+     case R_CRX_SWITCH16:
+     case R_CRX_SWITCH32:
+       /* We only care about the addend, where the difference between 
+	  expressions is kept.  */
+       Rvalue = 0;
+       
+     default:
+       break;
+    }
+
+  if (howto->pc_relative)
+    {
+      /* Subtract the address of the section containing the location.  */
+      Rvalue -= (input_section->output_section->vma
+		 + input_section->output_offset);
+      /* Subtract the position of the location within the section.  */
+      Rvalue -= offset;
+    }
+
+  /* Add in supplied addend.  */
+  Rvalue += addend;
+
+  /* Complain if the bitfield overflows, whether it is considered
+     as signed or unsigned.  */
+  check = Rvalue >> howto->rightshift;
+
+  /* Assumes two's complement.  This expression avoids
+     overflow if howto->bitsize is the number of bits in
+     bfd_vma.  */
+  reloc_bits = (((1 << (howto->bitsize - 1)) - 1) << 1) | 1;
+
+  if (((bfd_vma) check & ~reloc_bits) != 0
+      && (((bfd_vma) check & ~reloc_bits)
+	  != (-(bfd_vma) 1 & ~reloc_bits)))
+    {
+      /* The above right shift is incorrect for a signed
+	 value.  See if turning on the upper bits fixes the
+	 overflow.  */
+      if (howto->rightshift && (bfd_signed_vma) Rvalue < 0)
+	{
+	  check |= ((bfd_vma) - 1
+		    & ~((bfd_vma) - 1
+			>> howto->rightshift));
+	  if (((bfd_vma) check & ~reloc_bits)
+	      != (-(bfd_vma) 1 & ~reloc_bits))
+	    return bfd_reloc_overflow;
+	}
+      else
+	return bfd_reloc_overflow;
+    }
+
+  /* Drop unwanted bits from the value we are relocating to.  */
+  Rvalue >>= (bfd_vma) howto->rightshift;
+
+  /* Apply dst_mask to select only relocatable part of the insn.  */
+  Rvalue &= howto->dst_mask;
+
+  switch (howto->size)
+    {
+     case 0:
+       if (r_type == R_CRX_REL4)
+	 {
+	   Rvalue <<= 4;
+	   Rvalue |= (bfd_get_8 (input_bfd, hit_data) & 0x0f);
+	 }
+
+       bfd_put_8 (input_bfd, (unsigned char) Rvalue, hit_data);
+       break;
+
+     case 1:
+       if (r_type == R_CRX_REGREL12)
+	 Rvalue |= (bfd_get_16 (input_bfd, hit_data) & 0xf000);
+
+       bfd_put_16 (input_bfd, Rvalue, hit_data);
+       break;
+
+     case 2:
+       if (r_type == R_CRX_REL24
+	   || r_type == R_CRX_REGREL22
+	   || r_type == R_CRX_REGREL28)
+	 Rvalue |= (((bfd_get_16 (input_bfd, hit_data) << 16) |
+		      bfd_get_16 (input_bfd, hit_data + 2)) & ~howto->dst_mask);
+
+       if (r_type == R_CRX_NUM32 || r_type == R_CRX_SWITCH32)
+	 /* Relocation on DATA is purely little-endian, that is, for a
+	    multi-byte datum, the lowest address in memory contains the
+	    little end of the datum, that is, the least significant byte.
+	    Therefore we use BFD's byte Putting functions.  */
+	 bfd_put_32 (input_bfd, Rvalue, hit_data);
+       else
+	 /* Relocation on INSTRUCTIONS is different : Instructions are
+	    word-addressable, that is, each word itself is arranged according
+	    to little-endian convention, whereas the words are arranged with
+	    respect to one another in BIG ENDIAN fashion.
+	    When there is an immediate value that spans a word boundary, it is
+	    split in a big-endian way with respect to the words.  */
+	 {
+	   bfd_put_16 (input_bfd, (Rvalue >> 16) & 0xffff, hit_data);
+	   bfd_put_16 (input_bfd, Rvalue & 0xffff, hit_data + 2);
+	 }
+     break;
+
+     default:
+       return bfd_reloc_notsupported;
+    }
+
+  return bfd_reloc_ok;
+}
+
+/* Delete some bytes from a section while relaxing.  */
+
+static bfd_boolean
+elf32_crx_relax_delete_bytes (struct bfd_link_info *link_info, bfd *abfd, 
+			      asection *sec, bfd_vma addr, int count)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  unsigned int sec_shndx;
+  bfd_byte *contents;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_vma toaddr;
+  Elf_Internal_Sym *isym;
+  Elf_Internal_Sym *isymend;
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_link_hash_entry **end_hashes;
+  struct elf_link_hash_entry **start_hashes;
+  unsigned int symcount;
+
+  sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+  contents = elf_section_data (sec)->this_hdr.contents;
+
+  toaddr = sec->size;
+
+  irel = elf_section_data (sec)->relocs;
+  irelend = irel + sec->reloc_count;
+
+  /* Actually delete the bytes.  */
+  memmove (contents + addr, contents + addr + count,
+	   (size_t) (toaddr - addr - count));
+  sec->size -= count;
+
+  /* Adjust all the relocs.  */
+  for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
+    {
+      /* Get the new reloc address.  */
+      if ((irel->r_offset > addr
+	   && irel->r_offset < toaddr))
+	irel->r_offset -= count;
+    }
+
+  /* Adjust the local symbols defined in this section.  */
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  isym = (Elf_Internal_Sym *) symtab_hdr->contents;
+  for (isymend = isym + symtab_hdr->sh_info; isym < isymend; isym++)
+    {
+      if (isym->st_shndx == sec_shndx
+	  && isym->st_value > addr
+	  && isym->st_value < toaddr)
+	{
+	  /* Adjust the addend of SWITCH relocations in this section, 
+	     which reference this local symbol.  */
+	  for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
+	    {
+	      unsigned long r_symndx;
+	      Elf_Internal_Sym *rsym;
+	      bfd_vma addsym, subsym;
+
+	      /* Skip if not a SWITCH relocation.  */
+	      if (ELF32_R_TYPE (irel->r_info) != (int) R_CRX_SWITCH8
+		  && ELF32_R_TYPE (irel->r_info) != (int) R_CRX_SWITCH16
+		  && ELF32_R_TYPE (irel->r_info) != (int) R_CRX_SWITCH32)
+		  continue;
+
+	      r_symndx = ELF32_R_SYM (irel->r_info);
+	      rsym = (Elf_Internal_Sym *) symtab_hdr->contents + r_symndx;
+
+	      /* Skip if not the local adjusted symbol.  */
+	      if (rsym != isym)
+		continue;
+
+	      addsym = isym->st_value;
+	      subsym = addsym - irel->r_addend;
+
+	      /* Fix the addend only when -->> (addsym > addr >= subsym).  */
+	      if (subsym <= addr)
+		irel->r_addend -= count;
+	      else
+		continue;
+	    }
+
+	  isym->st_value -= count;
+	}
+    }
+
+  /* Now adjust the global symbols defined in this section.  */
+  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+	      - symtab_hdr->sh_info);
+  sym_hashes = start_hashes = elf_sym_hashes (abfd);
+  end_hashes = sym_hashes + symcount;
+
+  for (; sym_hashes < end_hashes; sym_hashes++)
+    {
+      struct elf_link_hash_entry *sym_hash = *sym_hashes;
+
+      /* The '--wrap SYMBOL' option is causing a pain when the object file, 
+	 containing the definition of __wrap_SYMBOL, includes a direct 
+	 call to SYMBOL as well. Since both __wrap_SYMBOL and SYMBOL reference 
+	 the same symbol (which is __wrap_SYMBOL), but still exist as two 
+	 different symbols in 'sym_hashes', we don't want to adjust 
+	 the global symbol __wrap_SYMBOL twice.  
+	 This check is only relevant when symbols are being wrapped.  */
+      if (link_info->wrap_hash != NULL)
+	{
+	  struct elf_link_hash_entry **cur_sym_hashes;
+	  
+	  /* Loop only over the symbols whom been already checked.  */
+	  for (cur_sym_hashes = start_hashes; cur_sym_hashes < sym_hashes; 
+	       cur_sym_hashes++)
+	    {
+	      /* If the current symbol is identical to 'sym_hash', that means 
+		 the symbol was already adjusted (or at least checked).  */
+	      if (*cur_sym_hashes == sym_hash)
+		break;
+	    }
+	  /* Don't adjust the symbol again.  */
+	  if (cur_sym_hashes < sym_hashes)
+	    continue;
+	}
+
+      if ((sym_hash->root.type == bfd_link_hash_defined
+	   || sym_hash->root.type == bfd_link_hash_defweak)
+	  && sym_hash->root.u.def.section == sec
+	  && sym_hash->root.u.def.value > addr
+	  && sym_hash->root.u.def.value < toaddr)
+	sym_hash->root.u.def.value -= count;
+    }
+
+  return TRUE;
+}
+
+/* This is a version of bfd_generic_get_relocated_section_contents
+   which uses elf32_crx_relocate_section.  */
+
+static bfd_byte *
+elf32_crx_get_relocated_section_contents (bfd *output_bfd,
+					  struct bfd_link_info *link_info,
+					  struct bfd_link_order *link_order,
+					  bfd_byte *data,
+					  bfd_boolean relocatable,
+					  asymbol **symbols)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  asection *input_section = link_order->u.indirect.section;
+  bfd *input_bfd = input_section->owner;
+  asection **sections = NULL;
+  Elf_Internal_Rela *internal_relocs = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+
+  /* We only need to handle the case of relaxing, or of having a
+     particular set of section contents, specially.  */
+  if (relocatable
+      || elf_section_data (input_section)->this_hdr.contents == NULL)
+    return bfd_generic_get_relocated_section_contents (output_bfd, link_info,
+						       link_order, data,
+						       relocatable,
+						       symbols);
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+
+  memcpy (data, elf_section_data (input_section)->this_hdr.contents,
+	  (size_t) input_section->size);
+
+  if ((input_section->flags & SEC_RELOC) != 0
+      && input_section->reloc_count > 0)
+    {
+      Elf_Internal_Sym *isym;
+      Elf_Internal_Sym *isymend;
+      asection **secpp;
+      bfd_size_type amt;
+
+      internal_relocs = (_bfd_elf_link_read_relocs
+			 (input_bfd, input_section, (PTR) NULL,
+			  (Elf_Internal_Rela *) NULL, FALSE));
+      if (internal_relocs == NULL)
+	goto error_return;
+
+      if (symtab_hdr->sh_info != 0)
+	{
+	  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	  if (isymbuf == NULL)
+	    isymbuf = bfd_elf_get_elf_syms (input_bfd, symtab_hdr,
+					    symtab_hdr->sh_info, 0,
+					    NULL, NULL, NULL);
+	  if (isymbuf == NULL)
+	    goto error_return;
+	}
+
+      amt = symtab_hdr->sh_info;
+      amt *= sizeof (asection *);
+      sections = bfd_malloc (amt);
+      if (sections == NULL && amt != 0)
+	goto error_return;
+
+      isymend = isymbuf + symtab_hdr->sh_info;
+      for (isym = isymbuf, secpp = sections; isym < isymend; ++isym, ++secpp)
+	{
+	  asection *isec;
+
+	  if (isym->st_shndx == SHN_UNDEF)
+	    isec = bfd_und_section_ptr;
+	  else if (isym->st_shndx == SHN_ABS)
+	    isec = bfd_abs_section_ptr;
+	  else if (isym->st_shndx == SHN_COMMON)
+	    isec = bfd_com_section_ptr;
+	  else
+	    isec = bfd_section_from_elf_index (input_bfd, isym->st_shndx);
+
+	  *secpp = isec;
+	}
+
+      if (! elf32_crx_relocate_section (output_bfd, link_info, input_bfd,
+				     input_section, data, internal_relocs,
+				     isymbuf, sections))
+	goto error_return;
+
+      if (sections != NULL)
+	free (sections);
+      if (isymbuf != NULL
+	  && symtab_hdr->contents != (unsigned char *) isymbuf)
+	free (isymbuf);
+      if (elf_section_data (input_section)->relocs != internal_relocs)
+	free (internal_relocs);
+    }
+
+  return data;
+
+ error_return:
+  if (sections != NULL)
+    free (sections);
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (internal_relocs != NULL
+      && elf_section_data (input_section)->relocs != internal_relocs)
+    free (internal_relocs);
+  return NULL;
+}
+
+/* Relocate a CRX ELF section.  */
+
+static bfd_boolean
+elf32_crx_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
+			    bfd *input_bfd, asection *input_section,
+			    bfd_byte *contents, Elf_Internal_Rela *relocs,
+			    Elf_Internal_Sym *local_syms,
+			    asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel, *relend;
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+      howto = crx_elf_howto_table + (r_type);
+
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc, warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      r = crx_elf_final_link_relocate (howto, input_bfd, output_bfd,
+					input_section,
+					contents, rel->r_offset,
+					relocation, rel->r_addend,
+					info, sec, h == NULL);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char *name;
+	  const char *msg = (const char *) 0;
+
+	  if (h != NULL)
+	    name = h->root.root.string;
+	  else
+	    {
+	      name = (bfd_elf_string_from_elf_section
+		      (input_bfd, symtab_hdr->sh_link, sym->st_name));
+	      if (name == NULL || *name == '\0')
+		name = bfd_section_name (input_bfd, sec);
+	    }
+
+	  switch (r)
+	    {
+	     case bfd_reloc_overflow:
+	       if (!((*info->callbacks->reloc_overflow)
+		     (info, (h ? &h->root : NULL), name, howto->name,
+		      (bfd_vma) 0, input_bfd, input_section,
+		      rel->r_offset)))
+		 return FALSE;
+	       break;
+
+	     case bfd_reloc_undefined:
+	       if (!((*info->callbacks->undefined_symbol)
+		     (info, name, input_bfd, input_section,
+		      rel->r_offset, TRUE)))
+		 return FALSE;
+	       break;
+
+	     case bfd_reloc_outofrange:
+	       msg = _("internal error: out of range error");
+	       goto common_error;
+
+	     case bfd_reloc_notsupported:
+	       msg = _("internal error: unsupported relocation error");
+	       goto common_error;
+
+	     case bfd_reloc_dangerous:
+	       msg = _("internal error: dangerous error");
+	       goto common_error;
+
+	     default:
+	       msg = _("internal error: unknown error");
+	       /* Fall through.  */
+
+	     common_error:
+	       if (!((*info->callbacks->warning)
+		     (info, msg, name, input_bfd, input_section,
+		      rel->r_offset)))
+		 return FALSE;
+	       break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* This function handles relaxing for the CRX.
+
+   There's quite a few relaxing opportunites available on the CRX:
+
+	* bal/bcond:32 -> bal/bcond:16				   2 bytes
+	* bcond:16 -> bcond:8					   2 bytes
+	* cmpbcond:24 -> cmpbcond:8				   2 bytes
+	* arithmetic imm32 -> arithmetic imm16			   2 bytes
+
+   Symbol- and reloc-reading infrastructure copied from elf-m10200.c.  */
+
+static bfd_boolean
+elf32_crx_relax_section (bfd *abfd, asection *sec,
+			 struct bfd_link_info *link_info, bfd_boolean *again)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *internal_relocs;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_byte *contents = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+
+  /* Assume nothing changes.  */
+  *again = FALSE;
+
+  /* We don't have to do anything for a relocatable link, if
+     this section does not have relocs, or if this is not a
+     code section.  */
+  if (link_info->relocatable
+      || (sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0
+      || (sec->flags & SEC_CODE) == 0)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+
+  /* Get a copy of the native relocations.  */
+  internal_relocs = (_bfd_elf_link_read_relocs
+		     (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
+		      link_info->keep_memory));
+  if (internal_relocs == NULL)
+    goto error_return;
+
+  /* Walk through them looking for relaxing opportunities.  */
+  irelend = internal_relocs + sec->reloc_count;
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      bfd_vma symval;
+
+      /* If this isn't something that can be relaxed, then ignore
+	 this reloc.  */
+      if (ELF32_R_TYPE (irel->r_info) != (int) R_CRX_REL32
+	  && ELF32_R_TYPE (irel->r_info) != (int) R_CRX_REL16
+	  && ELF32_R_TYPE (irel->r_info) != (int) R_CRX_REL24
+	  && ELF32_R_TYPE (irel->r_info) != (int) R_CRX_IMM32)
+	continue;
+
+      /* Get the section contents if we haven't done so already.  */
+      if (contents == NULL)
+	{
+	  /* Get cached copy if it exists.  */
+	  if (elf_section_data (sec)->this_hdr.contents != NULL)
+	    contents = elf_section_data (sec)->this_hdr.contents;
+	  /* Go get them off disk.  */
+	  else if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+	    goto error_return;
+	}
+
+      /* Read this BFD's local symbols if we haven't done so already.  */
+      if (isymbuf == NULL && symtab_hdr->sh_info != 0)
+	{
+	  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	  if (isymbuf == NULL)
+	    isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+					    symtab_hdr->sh_info, 0,
+					    NULL, NULL, NULL);
+	  if (isymbuf == NULL)
+	    goto error_return;
+	}
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+	{
+	  /* A local symbol.  */
+	  Elf_Internal_Sym *isym;
+	  asection *sym_sec;
+
+	  isym = isymbuf + ELF32_R_SYM (irel->r_info);
+	  if (isym->st_shndx == SHN_UNDEF)
+	    sym_sec = bfd_und_section_ptr;
+	  else if (isym->st_shndx == SHN_ABS)
+	    sym_sec = bfd_abs_section_ptr;
+	  else if (isym->st_shndx == SHN_COMMON)
+	    sym_sec = bfd_com_section_ptr;
+	  else
+	    sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+	  symval = (isym->st_value
+		    + sym_sec->output_section->vma
+		    + sym_sec->output_offset);
+	}
+      else
+	{
+	  unsigned long indx;
+	  struct elf_link_hash_entry *h;
+
+	  /* An external symbol.  */
+	  indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+	  h = elf_sym_hashes (abfd)[indx];
+	  BFD_ASSERT (h != NULL);
+
+	  if (h->root.type != bfd_link_hash_defined
+	      && h->root.type != bfd_link_hash_defweak)
+	    /* This appears to be a reference to an undefined
+	       symbol.  Just ignore it--it will be caught by the
+	       regular reloc processing.  */
+	    continue;
+
+	  symval = (h->root.u.def.value
+		    + h->root.u.def.section->output_section->vma
+		    + h->root.u.def.section->output_offset);
+	}
+
+      /* For simplicity of coding, we are going to modify the section
+	 contents, the section relocs, and the BFD symbol table.  We
+	 must tell the rest of the code not to free up this
+	 information.  It would be possible to instead create a table
+	 of changes which have to be made, as is done in coff-mips.c;
+	 that would be more work, but would require less memory when
+	 the linker is run.  */
+
+      /* Try to turn a 32bit pc-relative branch/call into
+	 a 16bit pc-relative branch/call.  */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_CRX_REL32)
+	{
+	  bfd_vma value = symval;
+
+	  /* Deal with pc-relative gunk.  */
+	  value -= (sec->output_section->vma + sec->output_offset);
+	  value -= irel->r_offset;
+	  value += irel->r_addend;
+
+	  /* See if the value will fit in 16 bits, note the high value is
+	     0xfffe + 2 as the target will be two bytes closer if we are
+	     able to relax.  */
+	  if ((long) value < 0x10000 && (long) value > -0x10002)
+	    {
+	      unsigned short code;
+
+	      /* Get the opcode.  */
+	      code = (unsigned short) bfd_get_16 (abfd, contents + irel->r_offset);
+
+	      /* Verify it's a 'bal'/'bcond' and fix the opcode.  */
+	      if ((code & 0xfff0) == 0x3170)
+		bfd_put_8 (abfd, 0x30, contents + irel->r_offset + 1);
+	      else if ((code & 0xf0ff) == 0x707f)
+		bfd_put_8 (abfd, 0x7e, contents + irel->r_offset);
+	      else
+		continue;
+
+	      /* Note that we've changed the relocs, section contents, etc.  */
+	      elf_section_data (sec)->relocs = internal_relocs;
+	      elf_section_data (sec)->this_hdr.contents = contents;
+	      symtab_hdr->contents = (unsigned char *) isymbuf;
+
+	      /* Fix the relocation's type.  */
+	      irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					   R_CRX_REL16);
+
+	      /* Delete two bytes of data.  */
+	      if (!elf32_crx_relax_delete_bytes (link_info, abfd, sec,
+						   irel->r_offset + 2, 2))
+		goto error_return;
+
+	      /* That will change things, so, we should relax again.
+		 Note that this is not required, and it may be slow.  */
+	      *again = TRUE;
+	    }
+	}
+
+      /* Try to turn a 16bit pc-relative branch into an
+	 8bit pc-relative branch.  */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_CRX_REL16)
+	{
+	  bfd_vma value = symval;
+
+	  /* Deal with pc-relative gunk.  */
+	  value -= (sec->output_section->vma + sec->output_offset);
+	  value -= irel->r_offset;
+	  value += irel->r_addend;
+
+	  /* See if the value will fit in 8 bits, note the high value is
+	     0xfc + 2 as the target will be two bytes closer if we are
+	     able to relax.  */
+	  if ((long) value < 0xfe && (long) value > -0x100)
+	    {
+	      unsigned short code;
+
+	      /* Get the opcode.  */
+	      code = (unsigned short) bfd_get_16 (abfd, contents + irel->r_offset);
+
+	      /* Verify it's a 'bcond' opcode.  */
+	      if ((code & 0xf0ff) != 0x707e)
+		continue;
+
+	      /* Note that we've changed the relocs, section contents, etc.  */
+	      elf_section_data (sec)->relocs = internal_relocs;
+	      elf_section_data (sec)->this_hdr.contents = contents;
+	      symtab_hdr->contents = (unsigned char *) isymbuf;
+
+	      /* Fix the relocation's type.  */
+	      irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					   R_CRX_REL8);
+
+	      /* Delete two bytes of data.  */
+	      if (!elf32_crx_relax_delete_bytes (link_info, abfd, sec,
+						   irel->r_offset + 2, 2))
+		goto error_return;
+
+	      /* That will change things, so, we should relax again.
+		 Note that this is not required, and it may be slow.  */
+	      *again = TRUE;
+	    }
+	}
+
+      /* Try to turn a 24bit pc-relative cmp&branch into
+	 an 8bit pc-relative cmp&branch.  */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_CRX_REL24)
+	{
+	  bfd_vma value = symval;
+
+	  /* Deal with pc-relative gunk.  */
+	  value -= (sec->output_section->vma + sec->output_offset);
+	  value -= irel->r_offset;
+	  value += irel->r_addend;
+
+	  /* See if the value will fit in 8 bits, note the high value is
+	     0x7e + 2 as the target will be two bytes closer if we are
+	     able to relax.  */
+	  if ((long) value < 0x100 && (long) value > -0x100)
+	    {
+	      unsigned short code;
+
+	      /* Get the opcode.  */
+	      code = (unsigned short) bfd_get_16 (abfd, contents + irel->r_offset);
+
+	      /* Verify it's a 'cmp&branch' opcode.  */
+	      if ((code & 0xfff0) != 0x3180 && (code & 0xfff0) != 0x3190
+	       && (code & 0xfff0) != 0x31a0 && (code & 0xfff0) != 0x31c0
+	       && (code & 0xfff0) != 0x31d0 && (code & 0xfff0) != 0x31e0
+	       /* Or a Co-processor branch ('bcop').  */
+	       && (code & 0xfff0) != 0x3010 && (code & 0xfff0) != 0x3110)
+		continue;
+
+	      /* Note that we've changed the relocs, section contents, etc.  */
+	      elf_section_data (sec)->relocs = internal_relocs;
+	      elf_section_data (sec)->this_hdr.contents = contents;
+	      symtab_hdr->contents = (unsigned char *) isymbuf;
+
+	      /* Fix the opcode.  */
+	      bfd_put_8 (abfd, 0x30, contents + irel->r_offset + 1);
+
+	      /* Fix the relocation's type.  */
+	      irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					   R_CRX_REL8_CMP);
+
+	      /* Delete two bytes of data.  */
+	      if (!elf32_crx_relax_delete_bytes (link_info, abfd, sec,
+						   irel->r_offset + 4, 2))
+		goto error_return;
+
+	      /* That will change things, so, we should relax again.
+		 Note that this is not required, and it may be slow.  */
+	      *again = TRUE;
+	    }
+	}
+
+      /* Try to turn a 32bit immediate address into
+	 a 16bit immediate address.  */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_CRX_IMM32)
+	{
+	  bfd_vma value = symval;
+
+	  /* See if the value will fit in 16 bits.  */
+	  if ((long) value < 0x7fff && (long) value > -0x8000)
+	    {
+	      unsigned short code;
+
+	      /* Get the opcode.  */
+	      code = (unsigned short) bfd_get_16 (abfd, contents + irel->r_offset);
+
+	      /* Verify it's a 'arithmetic double'.  */
+	      if ((code & 0xf0f0) != 0x20f0)
+		continue;
+
+	      /* Note that we've changed the relocs, section contents, etc.  */
+	      elf_section_data (sec)->relocs = internal_relocs;
+	      elf_section_data (sec)->this_hdr.contents = contents;
+	      symtab_hdr->contents = (unsigned char *) isymbuf;
+
+	      /* Fix the opcode.  */
+	      bfd_put_8 (abfd, (code & 0xff) - 0x10, contents + irel->r_offset);
+
+	      /* Fix the relocation's type.  */
+	      irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					   R_CRX_IMM16);
+
+	      /* Delete two bytes of data.  */
+	      if (!elf32_crx_relax_delete_bytes (link_info, abfd, sec,
+						   irel->r_offset + 2, 2))
+		goto error_return;
+
+	      /* That will change things, so, we should relax again.
+		 Note that this is not required, and it may be slow.  */
+	      *again = TRUE;
+	    }
+	}
+    }
+
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    {
+      if (! link_info->keep_memory)
+	free (isymbuf);
+      else
+	{
+	  /* Cache the symbols for elf_link_input_bfd.  */
+	  symtab_hdr->contents = (unsigned char *) isymbuf;
+	}
+    }
+
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    {
+      if (! link_info->keep_memory)
+	free (contents);
+      else
+	{
+	  /* Cache the section contents for elf_link_input_bfd.  */
+	  elf_section_data (sec)->this_hdr.contents = contents;
+	}
+    }
+
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return TRUE;
+
+ error_return:
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    free (contents);
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return FALSE;
+}
+
+/* Definitions for setting CRX target vector.  */
+#define TARGET_LITTLE_SYM		bfd_elf32_crx_vec
+#define TARGET_LITTLE_NAME		"elf32-crx"
+#define ELF_ARCH			bfd_arch_crx
+#define ELF_MACHINE_CODE		EM_CRX
+#define ELF_MAXPAGESIZE			0x1
+#define elf_symbol_leading_char		'_'
+
+#define bfd_elf32_bfd_reloc_type_lookup	elf_crx_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup \
+					elf_crx_reloc_name_lookup
+#define elf_info_to_howto		elf_crx_info_to_howto
+#define elf_info_to_howto_rel		0
+#define elf_backend_relocate_section	elf32_crx_relocate_section
+#define bfd_elf32_bfd_relax_section	elf32_crx_relax_section
+#define bfd_elf32_bfd_get_relocated_section_contents \
+				elf32_crx_get_relocated_section_contents
+#define elf_backend_can_gc_sections     1
+#define elf_backend_rela_normal		1
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-d10v.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-d10v.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-d10v.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-d10v.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,553 @@
+/* D10V-specific support for 32-bit ELF
+   Copyright 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007 Free Software Foundation, Inc.
+   Contributed by Martin Hunt (hunt@cygnus.com).
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/d10v.h"
+
+/* Use REL instead of RELA to save space.  */
+#define USE_REL	1
+
+static reloc_howto_type elf_d10v_howto_table[] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_D10V_NONE,		/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc, /* Special_function.  */
+	 "R_D10V_NONE",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0,			/* Src_mask.  */
+	 0,			/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* An PC Relative 10-bit relocation, shifted by 2, right container.  */
+  HOWTO (R_D10V_10_PCREL_R,	/* Type.  */
+	 2,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 8,	                /* Bitsize.  */
+	 TRUE,	        	/* PC_relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc, /* Special_function.  */
+	 "R_D10V_10_PCREL_R",	/* Name.  */
+	 FALSE,	        	/* Partial_inplace.  */
+	 0xff,			/* Src_mask.  */
+	 0xff,   		/* Dst_mask.  */
+	 TRUE),			/* PCrel_offset.  */
+
+  /* An PC Relative 10-bit relocation, shifted by 2, left container.  */
+  HOWTO (R_D10V_10_PCREL_L,	/* Type.  */
+	 2,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 8,	                /* Bitsize.  */
+	 TRUE,	        	/* PC_relative.  */
+	 15,	                /* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc, /* Special_function.  */
+	 "R_D10V_10_PCREL_L",	/* Name.  */
+	 FALSE,	        	/* Partial_inplace.  */
+	 0x07f8000,		/* Src_mask.  */
+	 0x07f8000,   		/* Dst_mask.  */
+	 TRUE),			/* PCrel_offset.  */
+
+  /* A 16 bit absolute relocation.  */
+  HOWTO (R_D10V_16,		/* Type.  */
+	 0,			/* Rightshift.  */
+	 1,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc, /* Special_function.  */
+	 "R_D10V_16",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xffff,		/* Src_mask.  */
+	 0xffff,		/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* An 18 bit absolute relocation, right shifted 2.  */
+  HOWTO (R_D10V_18,		/* Type.  */
+	 2,			/* Rightshift.  */
+	 1,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont, /* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc, /* Special_function.  */
+	 "R_D10V_18",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xffff,		/* Src_mask.  */
+	 0xffff,		/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* A relative 18 bit relocation, right shifted by 2.  */
+  HOWTO (R_D10V_18_PCREL,	/* Type.  */
+	 2,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc, /* Special_function.  */
+	 "R_D10V_18_PCREL",	/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xffff,		/* Src_mask.  */
+	 0xffff,		/* Dst_mask.  */
+	 TRUE),			/* PCrel_offset.  */
+
+  /* A 32 bit absolute relocation.  */
+  HOWTO (R_D10V_32,		/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc, /* Special_function.  */
+	 "R_D10V_32",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Src_mask.  */
+	 0xffffffff,		/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_D10V_GNU_VTINHERIT,	/* Type.  */
+	 0,                     /* Rightshift.  */
+	 2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+	 0,                     /* Bitsize.  */
+	 FALSE,                 /* PC_relative.  */
+	 0,                     /* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 NULL,                  /* Special_function.  */
+	 "R_D10V_GNU_VTINHERIT",/* Name.  */
+	 FALSE,                 /* Partial_inplace.  */
+	 0,                     /* Src_mask.  */
+	 0,                     /* Dst_mask.  */
+	 FALSE),                /* PCrel_offset.  */
+
+  /* GNU extension to record C++ vtable member usage.  */
+  HOWTO (R_D10V_GNU_VTENTRY,    /* Type.  */
+	 0,                     /* Rightshift.  */
+	 2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+	 0,                     /* Bitsize.  */
+	 FALSE,                 /* PC_relative.  */
+	 0,                     /* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 _bfd_elf_rel_vtable_reloc_fn,  /* Special_function.  */
+	 "R_D10V_GNU_VTENTRY",  /* Name.  */
+	 FALSE,                 /* Partial_inplace.  */
+	 0,                     /* Src_mask.  */
+	 0,                     /* Dst_mask.  */
+	 FALSE),                /* PCrel_offset.  */
+};
+
+/* Map BFD reloc types to D10V ELF reloc types.  */
+
+struct d10v_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned char elf_reloc_val;
+};
+
+static const struct d10v_reloc_map d10v_reloc_map[] =
+{
+  { BFD_RELOC_NONE, R_D10V_NONE, },
+  { BFD_RELOC_D10V_10_PCREL_R, R_D10V_10_PCREL_R },
+  { BFD_RELOC_D10V_10_PCREL_L, R_D10V_10_PCREL_L },
+  { BFD_RELOC_16, R_D10V_16 },
+  { BFD_RELOC_D10V_18, R_D10V_18 },
+  { BFD_RELOC_D10V_18_PCREL, R_D10V_18_PCREL },
+  { BFD_RELOC_32, R_D10V_32 },
+  { BFD_RELOC_VTABLE_INHERIT, R_D10V_GNU_VTINHERIT },
+  { BFD_RELOC_VTABLE_ENTRY, R_D10V_GNU_VTENTRY },
+};
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (d10v_reloc_map) / sizeof (struct d10v_reloc_map);
+       i++)
+    if (d10v_reloc_map[i].bfd_reloc_val == code)
+      return &elf_d10v_howto_table[d10v_reloc_map[i].elf_reloc_val];
+
+  return NULL;
+}
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (elf_d10v_howto_table) / sizeof (elf_d10v_howto_table[0]);
+       i++)
+    if (elf_d10v_howto_table[i].name != NULL
+	&& strcasecmp (elf_d10v_howto_table[i].name, r_name) == 0)
+      return &elf_d10v_howto_table[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for an D10V ELF reloc.  */
+
+static void
+d10v_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+			arelent *cache_ptr,
+			Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_D10V_max);
+  cache_ptr->howto = &elf_d10v_howto_table[r_type];
+}
+
+static asection *
+elf32_d10v_gc_mark_hook (asection *sec,
+			 struct bfd_link_info *info,
+			 Elf_Internal_Rela *rel,
+			 struct elf_link_hash_entry *h,
+			 Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_D10V_GNU_VTINHERIT:
+      case R_D10V_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Look through the relocs for a section during the first phase.
+   Since we don't do .gots or .plts, we just need to consider the
+   virtual table relocs for gc.  */
+
+static bfd_boolean
+elf32_d10v_check_relocs (bfd *abfd,
+			 struct bfd_link_info *info,
+			 asection *sec,
+			 const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+
+  if (info->relocatable)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+        h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      switch (ELF32_R_TYPE (rel->r_info))
+        {
+        /* This relocation describes the C++ object vtable hierarchy.
+           Reconstruct it for later use during GC.  */
+        case R_D10V_GNU_VTINHERIT:
+          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+
+        /* This relocation describes which C++ vtable entries are actually
+           used.  Record for later use during GC.  */
+        case R_D10V_GNU_VTENTRY:
+          BFD_ASSERT (h != NULL);
+          if (h != NULL
+              && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+        }
+    }
+
+  return TRUE;
+}
+
+static bfd_vma
+extract_rel_addend (bfd *abfd,
+		    bfd_byte *where,
+		    reloc_howto_type *howto)
+{
+  bfd_vma insn, val;
+
+  switch (howto->size)
+    {
+    case 0:
+      insn = bfd_get_8 (abfd, where);
+      break;
+    case 1:
+      insn = bfd_get_16 (abfd, where);
+      break;
+    case 2:
+      insn = bfd_get_32 (abfd, where);
+      break;
+    default:
+      abort ();
+    }
+
+  val = (insn & howto->dst_mask) >> howto->bitpos << howto->rightshift;
+  /* We should really be testing for signed addends here, but we don't
+     have that info directly in the howto.  */
+  if (howto->pc_relative)
+    {
+      bfd_vma sign;
+      sign = howto->dst_mask & (~howto->dst_mask >> 1 | ~(-(bfd_vma) 1 >> 1));
+      sign = sign >> howto->bitpos << howto->rightshift;
+      val = (val ^ sign) - sign;
+    }
+  return val;
+}
+
+static void
+insert_rel_addend (bfd *abfd,
+		   bfd_byte *where,
+		   reloc_howto_type *howto,
+		   bfd_vma addend)
+{
+  bfd_vma insn;
+
+  addend = (addend >> howto->rightshift << howto->bitpos) & howto->dst_mask;
+  insn = ~howto->dst_mask;
+  switch (howto->size)
+    {
+    case 0:
+      insn &= bfd_get_8 (abfd, where);
+      insn |= addend;
+      bfd_put_8 (abfd, insn, where);
+      break;
+    case 1:
+      insn &= bfd_get_16 (abfd, where);
+      insn |= addend;
+      bfd_put_16 (abfd, insn, where);
+      break;
+    case 2:
+      insn &= bfd_get_32 (abfd, where);
+      insn |= addend;
+      bfd_put_32 (abfd, insn, where);
+      break;
+    default:
+      abort ();
+    }
+}
+
+/* Relocate a D10V ELF section.  */
+
+static bfd_boolean
+elf32_d10v_relocate_section (bfd *output_bfd,
+			     struct bfd_link_info *info,
+			     bfd *input_bfd,
+			     asection *input_section,
+			     bfd_byte *contents,
+			     Elf_Internal_Rela *relocs,
+			     Elf_Internal_Sym *local_syms,
+			     asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel, *relend;
+  const char *name;
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      if (r_type == R_D10V_GNU_VTENTRY
+          || r_type == R_D10V_GNU_VTINHERIT)
+        continue;
+
+      howto = elf_d10v_howto_table + r_type;
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = (sec->output_section->vma
+			+ sec->output_offset
+			+ sym->st_value);
+	  if (ELF_ST_TYPE (sym->st_info) == STT_SECTION
+	      && ((sec->flags & SEC_MERGE) != 0
+		  || (info->relocatable
+		      && sec->output_offset != 0)))
+	    {
+	      bfd_vma addend;
+	      bfd_byte *where = contents + rel->r_offset;
+
+	      addend = extract_rel_addend (input_bfd, where, howto);
+
+	      if (info->relocatable)
+		addend += sec->output_offset;
+	      else
+		{
+		  asection *msec = sec;
+		  addend = _bfd_elf_rel_local_sym (output_bfd, sym, &msec,
+						   addend);
+		  addend -= relocation;
+		  addend += msec->output_section->vma + msec->output_offset;
+		}
+	      insert_rel_addend (input_bfd, where, howto, addend);
+	    }
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc, warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      if (h != NULL)
+	name = h->root.root.string;
+      else
+	{
+	  name = (bfd_elf_string_from_elf_section
+		  (input_bfd, symtab_hdr->sh_link, sym->st_name));
+	  if (name == NULL || *name == '\0')
+	    name = bfd_section_name (input_bfd, sec);
+	}
+
+      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+                                    contents, rel->r_offset,
+                                    relocation, (bfd_vma) 0);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char * msg = (const char *) 0;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      if (!((*info->callbacks->reloc_overflow)
+		    (info, (h ? &h->root : NULL), name, howto->name,
+		     (bfd_vma) 0, input_bfd, input_section,
+		     rel->r_offset)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_undefined:
+	      if (!((*info->callbacks->undefined_symbol)
+		    (info, name, input_bfd, input_section,
+		     rel->r_offset, TRUE)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      goto common_error;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      goto common_error;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous error");
+	      goto common_error;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      /* fall through */
+
+	    common_error:
+	      if (!((*info->callbacks->warning)
+		    (info, msg, name, input_bfd, input_section,
+		     rel->r_offset)))
+		return FALSE;
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+#define ELF_ARCH		bfd_arch_d10v
+#define ELF_MACHINE_CODE	EM_D10V
+#define ELF_MACHINE_ALT1	EM_CYGNUS_D10V
+#define ELF_MAXPAGESIZE		0x1000
+
+#define TARGET_BIG_SYM          bfd_elf32_d10v_vec
+#define TARGET_BIG_NAME		"elf32-d10v"
+
+#define elf_info_to_howto	             0
+#define elf_info_to_howto_rel	             d10v_info_to_howto_rel
+#define elf_backend_object_p	             0
+#define elf_backend_final_write_processing   0
+#define elf_backend_gc_mark_hook             elf32_d10v_gc_mark_hook
+#define elf_backend_check_relocs             elf32_d10v_check_relocs
+#define elf_backend_relocate_section         elf32_d10v_relocate_section
+#define elf_backend_can_gc_sections          1
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-d30v.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-d30v.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-d30v.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-d30v.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,551 @@
+/* D30V-specific support for 32-bit ELF
+   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007
+   Free Software Foundation, Inc.
+   Contributed by Martin Hunt (hunt@cygnus.com).
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/d30v.h"
+
+#define MAX32 ((bfd_signed_vma) 0x7fffffff)
+#define MIN32 (- MAX32 - 1)
+
+static bfd_reloc_status_type
+bfd_elf_d30v_reloc (bfd *abfd,
+		    arelent *reloc_entry,
+		    asymbol *symbol,
+		    void * data,
+		    asection *input_section,
+		    bfd *output_bfd,
+		    char **error_message)
+{
+  bfd_signed_vma relocation;
+  bfd_vma in1, in2, num;
+  bfd_vma tmp_addr = 0;
+  bfd_reloc_status_type r;
+  asection *reloc_target_output_section;
+  bfd_size_type addr = reloc_entry->address;
+  bfd_reloc_status_type flag = bfd_reloc_ok;
+  bfd_vma output_base = 0;
+  reloc_howto_type *howto = reloc_entry->howto;
+  int make_absolute = 0;
+
+  if (output_bfd != NULL)
+    {
+      /* Partial linking -- do nothing.  */
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  r = bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+                             input_section, output_bfd, error_message);
+  if (r != bfd_reloc_continue)
+    return r;
+
+  /* A hacked-up version of bfd_perform_reloc() follows.  */
+ if (bfd_is_und_section (symbol->section)
+      && (symbol->flags & BSF_WEAK) == 0
+      && output_bfd == NULL)
+    flag = bfd_reloc_undefined;
+
+  /* Is the address of the relocation really within the section?  */
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  /* Work out which section the relocation is targeted at and the
+     initial relocation command value.  */
+
+  /* Get symbol value.  (Common symbols are special.)  */
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  reloc_target_output_section = symbol->section->output_section;
+
+  /* Convert input-section-relative symbol value to absolute.  */
+  output_base = reloc_target_output_section->vma;
+  relocation += output_base + symbol->section->output_offset;
+
+  /* Add in supplied addend.  */
+  relocation += reloc_entry->addend;
+
+  /* Here the variable relocation holds the final address of the
+     symbol we are relocating against, plus any addend.  */
+  if (howto->pc_relative)
+    {
+      tmp_addr = input_section->output_section->vma
+	+ input_section->output_offset
+	+ reloc_entry->address;
+      relocation -= tmp_addr;
+    }
+
+  in1 = bfd_get_32 (abfd, (bfd_byte *) data + addr);
+  in2 = bfd_get_32 (abfd, (bfd_byte *) data + addr + 4);
+
+  /* Extract the addend.  */
+  num = ((in2 & 0x3FFFF)
+	 | ((in2 & 0xFF00000) >> 2)
+	 | ((in1 & 0x3F) << 26));
+  in1 &= 0xFFFFFFC0;
+  in2 = 0x80000000;
+
+  relocation += num;
+
+  if (howto->pc_relative && howto->bitsize == 32)
+    {
+      /* The D30V has a PC that doesn't wrap and PC-relative jumps are
+	 signed, so a PC-relative jump can't be more than +/- 2^31 bytes.
+	 If one exceeds this, change it to an absolute jump.  */
+      if (relocation > MAX32 || relocation < MIN32)
+	{
+	  relocation = (relocation + tmp_addr) & 0xffffffff;
+	  make_absolute = 1;
+	}
+    }
+
+  in1 |= (relocation >> 26) & 0x3F;		/* Top 6 bits.  */
+  in2 |= ((relocation & 0x03FC0000) << 2);  	/* Next 8 bits.  */
+  in2 |= relocation & 0x0003FFFF;		/* Bottom 18 bits.  */
+
+  /* Change a PC-relative instruction to its
+     absolute equivalent with this simple hack.  */
+  if (make_absolute)
+    in1 |= 0x00100000;
+
+  bfd_put_32 (abfd, in1, (bfd_byte *) data + addr);
+  bfd_put_32 (abfd, in2, (bfd_byte *) data + addr + 4);
+
+  return flag;
+}
+
+static bfd_reloc_status_type
+bfd_elf_d30v_reloc_21 (bfd *abfd,
+		       arelent *reloc_entry,
+		       asymbol *symbol,
+		       void * data,
+		       asection *input_section,
+		       bfd *output_bfd,
+		       char **error_message)
+{
+  bfd_vma relocation;
+  bfd_vma in1, num;
+  bfd_reloc_status_type r;
+  asection *reloc_target_output_section;
+  bfd_size_type addr = reloc_entry->address;
+  bfd_reloc_status_type flag = bfd_reloc_ok;
+  bfd_vma output_base = 0;
+  reloc_howto_type *howto = reloc_entry->howto;
+  int mask, max;
+
+  if (output_bfd != NULL)
+    {
+      /* Partial linking -- do nothing.  */
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  r = bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+                             input_section, output_bfd, error_message);
+  if (r != bfd_reloc_continue)
+    return r;
+
+  /* A hacked-up version of bfd_perform_reloc() follows.  */
+  if (bfd_is_und_section (symbol->section)
+      && (symbol->flags & BSF_WEAK) == 0
+      && output_bfd == NULL)
+    flag = bfd_reloc_undefined;
+
+  /* Is the address of the relocation really within the section?  */
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  /* Work out which section the relocation is targeted at and the
+     initial relocation command value.  */
+
+  /* Get symbol value.  (Common symbols are special.)  */
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  reloc_target_output_section = symbol->section->output_section;
+
+  /* Convert input-section-relative symbol value to absolute.  */
+  output_base = reloc_target_output_section->vma;
+  relocation += output_base + symbol->section->output_offset;
+
+  /* Add in supplied addend.  */
+  relocation += reloc_entry->addend;
+
+  /* Here the variable relocation holds the final address of the
+     symbol we are relocating against, plus any addend.  */
+
+  if (howto->pc_relative)
+    {
+      relocation -= (input_section->output_section->vma
+		     + input_section->output_offset);
+      if (howto->pcrel_offset)
+	relocation -= reloc_entry->address;
+    }
+
+  in1 = bfd_get_32 (abfd, (bfd_byte *) data + addr);
+
+  mask =  (1 << howto->bitsize) - 1;
+  if (howto->bitsize == 6)
+    mask <<= 12;
+  max = (1 << (howto->bitsize + 2)) - 1;
+
+  /* Extract the addend.  */
+  num = in1 & mask;  /* 18 bits.  */
+  if (howto->bitsize == 6)
+    num >>= 12;
+  num <<= 3; /* shift left 3.  */
+  in1 &= ~mask;  /* Mask out addend.  */
+
+  relocation += num;
+  if (howto->type == R_D30V_21_PCREL_R
+      || howto->type == R_D30V_15_PCREL_R
+      || howto->type == R_D30V_9_PCREL_R)
+    relocation += 4;
+
+  if ((int) relocation < 0)
+    {
+      if (~ (int) relocation > max)
+	flag = bfd_reloc_overflow;
+    }
+  else
+    {
+      if ((int) relocation > max)
+	flag = bfd_reloc_overflow;
+    }
+
+  relocation >>= 3;
+  if (howto->bitsize == 6)
+    in1 |= ((relocation & (mask >> 12)) << 12);
+  else
+    in1 |= relocation & mask;
+
+  bfd_put_32 (abfd, in1, (bfd_byte *) data + addr);
+
+  return flag;
+}
+
+static reloc_howto_type elf_d30v_howto_table[] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_D30V_NONE,		/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc,	/* Special_function.  */
+	 "R_D30V_NONE",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0,			/* Src_mask.  */
+	 0,			/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* A 6 bit absolute relocation.  */
+  HOWTO (R_D30V_6,		/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 6,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc,	/* Special_function.  */
+	 "R_D30V_6",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0x3f,			/* Src_mask.  */
+	 0x3f,			/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* A relative 9 bit relocation, right shifted by 3.  */
+  HOWTO (R_D30V_9_PCREL,	/* Type.  */
+	 3,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 6,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_d30v_reloc_21,	/* Special_function.  */
+	 "R_D30V_9_PCREL",	/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0x3f,			/* Src_mask.  */
+	 0x3f,			/* Dst_mask.  */
+	 TRUE),			/* PCrel_offset.  */
+
+  /* A relative 9 bit relocation, right shifted by 3.  */
+  HOWTO (R_D30V_9_PCREL_R,	/* Type.  */
+	 3,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 6,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_d30v_reloc_21,	/* Special_function.  */
+	 "R_D30V_9_PCREL_R",	/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0x3f,			/* Src_mask.  */
+	 0x3f,			/* Dst_mask.  */
+	 TRUE),			/* PCrel_offset.  */
+
+  /* An absolute 15 bit relocation, right shifted by 3.  */
+  HOWTO (R_D30V_15,		/* Type.  */
+	 3,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 12,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc,	/* Special_function.  */
+	 "R_D30V_15",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xfff,			/* Src_mask.  */
+	 0xfff,			/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* A relative 15 bit relocation, right shifted by 3.  */
+  HOWTO (R_D30V_15_PCREL,	/* Type.  */
+	 3,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 12,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_d30v_reloc_21,	/* Special_function.  */
+	 "R_D30V_15_PCREL",	/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xfff,			/* Src_mask.  */
+	 0xfff,			/* Dst_mask.  */
+	 TRUE),			/* PCrel_offset.  */
+
+  /* A relative 15 bit relocation, right shifted by 3.  */
+  HOWTO (R_D30V_15_PCREL_R,	/* Type.  */
+	 3,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 12,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_d30v_reloc_21,	/* Special_function.  */
+	 "R_D30V_15_PCREL_R",	/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xfff,			/* Src_mask.  */
+	 0xfff,			/* Dst_mask.  */
+	 TRUE),			/* PCrel_offset.  */
+
+  /* An absolute 21 bit relocation, right shifted by 3.  */
+  HOWTO (R_D30V_21,		/* Type.  */
+	 3,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 18,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc,	/* Special_function.  */
+	 "R_D30V_21",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0x3ffff,		/* Src_mask.  */
+	 0x3ffff,		/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* A relative 21 bit relocation, right shifted by 3.  */
+  HOWTO (R_D30V_21_PCREL,	/* Type.  */
+	 3,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 18,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_d30v_reloc_21,	/* Special_function.  */
+	 "R_D30V_21_PCREL",	/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0x3ffff,		/* Src_mask.  */
+	 0x3ffff,		/* Dst_mask.  */
+	 TRUE),			/* PCrel_offset.  */
+
+  /* A relative 21 bit relocation, right shifted by 3, in the Right container.  */
+  HOWTO (R_D30V_21_PCREL_R,	/* Type.  */
+	 3,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 18,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_d30v_reloc_21,	/* Special_function.  */
+	 "R_D30V_21_PCREL_R",	/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0x3ffff,		/* Src_mask.  */
+	 0x3ffff,		/* Dst_mask.  */
+	 TRUE),			/* PCrel_offset.  */
+
+  /* A D30V 32 bit absolute relocation.  */
+  HOWTO (R_D30V_32,		/* Type.  */
+	 0,			/* Rightshift.  */
+	 4,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 bfd_elf_d30v_reloc,	/* Special_function.  */
+	 "R_D30V_32",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Src_mask.  */
+	 0xffffffff,		/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* A relative 32 bit relocation.  */
+  HOWTO (R_D30V_32_PCREL,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 4,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_d30v_reloc,	/* Special_function.  */
+	 "R_D30V_32_PCREL",	/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Src_mask.  */
+	 0xffffffff,		/* Dst_mask.  */
+	 TRUE),			/* PCrel_offset.  */
+
+  /* A regular 32 bit absolute relocation.  */
+  HOWTO (R_D30V_32_NORMAL,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc,	/* Special_function.  */
+	 "R_D30V_32_NORMAL",	/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Src_mask.  */
+	 0xffffffff,		/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+};
+
+/* Map BFD reloc types to D30V ELF reloc types.  */
+
+struct d30v_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned char elf_reloc_val;
+};
+
+static const struct d30v_reloc_map d30v_reloc_map[] =
+{
+  { BFD_RELOC_NONE, R_D30V_NONE, },
+  { BFD_RELOC_D30V_6, R_D30V_6 },
+  { BFD_RELOC_D30V_9_PCREL, R_D30V_9_PCREL },
+  { BFD_RELOC_D30V_9_PCREL_R, R_D30V_9_PCREL_R },
+  { BFD_RELOC_D30V_15, R_D30V_15 },
+  { BFD_RELOC_D30V_15_PCREL, R_D30V_15_PCREL },
+  { BFD_RELOC_D30V_15_PCREL_R, R_D30V_15_PCREL_R },
+  { BFD_RELOC_D30V_21, R_D30V_21 },
+  { BFD_RELOC_D30V_21_PCREL, R_D30V_21_PCREL },
+  { BFD_RELOC_D30V_21_PCREL_R, R_D30V_21_PCREL_R },
+  { BFD_RELOC_D30V_32, R_D30V_32 },
+  { BFD_RELOC_D30V_32_PCREL, R_D30V_32_PCREL },
+  { BFD_RELOC_32, R_D30V_32_NORMAL },
+};
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (d30v_reloc_map) / sizeof (struct d30v_reloc_map);
+       i++)
+    {
+      if (d30v_reloc_map[i].bfd_reloc_val == code)
+	return &elf_d30v_howto_table[d30v_reloc_map[i].elf_reloc_val];
+    }
+
+  return NULL;
+}
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (elf_d30v_howto_table) / sizeof (elf_d30v_howto_table[0]);
+       i++)
+    if (elf_d30v_howto_table[i].name != NULL
+	&& strcasecmp (elf_d30v_howto_table[i].name, r_name) == 0)
+      return &elf_d30v_howto_table[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for an D30V ELF reloc (type REL).  */
+
+static void
+d30v_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+			arelent *cache_ptr,
+			Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_D30V_max);
+  cache_ptr->howto = &elf_d30v_howto_table[r_type];
+}
+
+/* Set the howto pointer for an D30V ELF reloc (type RELA).  */
+
+static void
+d30v_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
+			 arelent *cache_ptr,
+			 Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_D30V_max);
+  cache_ptr->howto = &elf_d30v_howto_table[r_type];
+}
+
+#define ELF_ARCH		bfd_arch_d30v
+#define ELF_MACHINE_CODE	EM_D30V
+#define ELF_MACHINE_ALT1	EM_CYGNUS_D30V
+#define ELF_MAXPAGESIZE		0x1000
+
+#define TARGET_BIG_SYM          bfd_elf32_d30v_vec
+#define TARGET_BIG_NAME		"elf32-d30v"
+
+#define elf_info_to_howto	d30v_info_to_howto_rela
+#define elf_info_to_howto_rel	d30v_info_to_howto_rel
+#define elf_backend_object_p	0
+#define elf_backend_final_write_processing	0
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-dlx.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-dlx.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-dlx.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-dlx.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,577 @@
+/* DLX specific support for 32-bit ELF
+   Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/dlx.h"
+
+#define USE_REL 1
+
+#define bfd_elf32_bfd_reloc_type_lookup elf32_dlx_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup elf32_dlx_reloc_name_lookup
+#define elf_info_to_howto               elf32_dlx_info_to_howto
+#define elf_info_to_howto_rel           elf32_dlx_info_to_howto_rel
+#define elf_backend_check_relocs        elf32_dlx_check_relocs
+
+/* The gas default behavior is not to preform the %hi modifier so that the
+   GNU assembler can have the lower 16 bits offset placed in the insn, BUT
+   we do like the gas to indicate it is %hi reloc type so when we in the link
+   loader phase we can have the corrected hi16 vale replace the buggous lo16
+   value that was placed there by gas.  */
+
+static int skip_dlx_elf_hi16_reloc = 0;
+
+extern int set_dlx_skip_hi16_flag (int);
+
+int
+set_dlx_skip_hi16_flag (int flag)
+{
+  skip_dlx_elf_hi16_reloc = flag;
+  return flag;
+}
+
+static bfd_reloc_status_type
+_bfd_dlx_elf_hi16_reloc (bfd *abfd,
+			 arelent *reloc_entry,
+			 asymbol *symbol,
+			 void * data,
+			 asection *input_section,
+			 bfd *output_bfd,
+			 char **error_message)
+{
+  bfd_reloc_status_type ret;
+  bfd_vma relocation;
+
+  /* If the skip flag is set then we simply do the generic relocating, this
+     is more of a hack for dlx gas/gld, so we do not need to do the %hi/%lo
+     fixup like mips gld did.   */
+  if (skip_dlx_elf_hi16_reloc)
+    return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+                          input_section, output_bfd, error_message);
+
+  /* If we're relocating, and this an external symbol, we don't want
+     to change anything.  */
+  if (output_bfd != (bfd *) NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && reloc_entry->addend == 0)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  ret = bfd_reloc_ok;
+
+  if (bfd_is_und_section (symbol->section)
+      && output_bfd == (bfd *) NULL)
+    ret = bfd_reloc_undefined;
+
+  relocation = (bfd_is_com_section (symbol->section)) ? 0 : symbol->value;
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  relocation += reloc_entry->addend;
+  relocation += bfd_get_16 (abfd, (bfd_byte *)data + reloc_entry->address);
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  bfd_put_16 (abfd, (short)((relocation >> 16) & 0xFFFF),
+              (bfd_byte *)data + reloc_entry->address);
+
+  return ret;
+}
+
+/* ELF relocs are against symbols.  If we are producing relocatable
+   output, and the reloc is against an external symbol, and nothing
+   has given us any additional addend, the resulting reloc will also
+   be against the same symbol.  In such a case, we don't want to
+   change anything about the way the reloc is handled, since it will
+   all be done at final link time.  Rather than put special case code
+   into bfd_perform_relocation, all the reloc types use this howto
+   function.  It just short circuits the reloc if producing
+   relocatable output against an external symbol.  */
+
+static bfd_reloc_status_type
+elf32_dlx_relocate16 (bfd *abfd,
+		      arelent *reloc_entry,
+		      asymbol *symbol,
+		      void * data,
+		      asection *input_section,
+		      bfd *output_bfd,
+		      char **error_message ATTRIBUTE_UNUSED)
+{
+  unsigned long insn, vallo, allignment;
+  int           val;
+
+  /* HACK: I think this first condition is necessary when producing
+     relocatable output.  After the end of HACK, the code is identical
+     to bfd_elf_generic_reloc().  I would _guess_ the first change
+     belongs there rather than here.  martindo 1998-10-23.  */
+
+  if (skip_dlx_elf_hi16_reloc)
+    return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+                                 input_section, output_bfd, error_message);
+
+  /* Check undefined section and undefined symbols.  */
+  if (bfd_is_und_section (symbol->section)
+      && output_bfd == (bfd *) NULL)
+    return bfd_reloc_undefined;
+
+  /* Can not support a long jump to sections other then .text.  */
+  if (strcmp (input_section->name, symbol->section->output_section->name) != 0)
+    {
+      (*_bfd_error_handler) (_("BFD Link Error: branch (PC rel16) to section (%s) not supported"),
+			     symbol->section->output_section->name);
+      return bfd_reloc_undefined;
+    }
+
+  insn  = bfd_get_32 (abfd, (bfd_byte *)data + reloc_entry->address);
+  allignment = 1 << (input_section->output_section->alignment_power - 1);
+  vallo = insn & 0x0000FFFF;
+
+  if (vallo & 0x8000)
+    vallo = ~(vallo | 0xFFFF0000) + 1;
+
+  /* vallo points to the vma of next instruction.  */
+  vallo += (((unsigned long)(input_section->output_section->vma +
+                           input_section->output_offset) +
+            allignment) & ~allignment);
+
+  /* val is the displacement (PC relative to next instruction).  */
+  val =  (symbol->section->output_offset +
+	  symbol->section->output_section->vma +
+	  symbol->value) - vallo;
+
+  if (abs ((int) val) > 0x00007FFF)
+    return bfd_reloc_outofrange;
+
+  insn  = (insn & 0xFFFF0000) | (val & 0x0000FFFF);
+
+  bfd_put_32 (abfd, insn,
+              (bfd_byte *) data + reloc_entry->address);
+
+  return bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type
+elf32_dlx_relocate26 (bfd *abfd,
+		      arelent *reloc_entry,
+		      asymbol *symbol,
+		      void * data,
+		      asection *input_section,
+		      bfd *output_bfd,
+		      char **error_message ATTRIBUTE_UNUSED)
+{
+  unsigned long insn, vallo, allignment;
+  int           val;
+
+  /* HACK: I think this first condition is necessary when producing
+     relocatable output.  After the end of HACK, the code is identical
+     to bfd_elf_generic_reloc().  I would _guess_ the first change
+     belongs there rather than here.  martindo 1998-10-23.  */
+
+  if (skip_dlx_elf_hi16_reloc)
+    return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+                                 input_section, output_bfd, error_message);
+
+  /* Check undefined section and undefined symbols.  */
+  if (bfd_is_und_section (symbol->section)
+      && output_bfd == (bfd *) NULL)
+    return bfd_reloc_undefined;
+
+  /* Can not support a long jump to sections other then .text   */
+  if (strcmp (input_section->name, symbol->section->output_section->name) != 0)
+    {
+      (*_bfd_error_handler) (_("BFD Link Error: jump (PC rel26) to section (%s) not supported"),
+			     symbol->section->output_section->name);
+      return bfd_reloc_undefined;
+    }
+
+  insn  = bfd_get_32 (abfd, (bfd_byte *)data + reloc_entry->address);
+  allignment = 1 << (input_section->output_section->alignment_power - 1);
+  vallo = insn & 0x03FFFFFF;
+
+  if (vallo & 0x03000000)
+    vallo = ~(vallo | 0xFC000000) + 1;
+
+  /* vallo is the vma for the next instruction.  */
+  vallo += (((unsigned long) (input_section->output_section->vma +
+			      input_section->output_offset) +
+	     allignment) & ~allignment);
+
+  /* val is the displacement (PC relative to next instruction).  */
+  val = (symbol->section->output_offset +
+	 symbol->section->output_section->vma + symbol->value)
+    - vallo;
+
+  if (abs ((int) val) > 0x01FFFFFF)
+    return bfd_reloc_outofrange;
+
+  insn  = (insn & 0xFC000000) | (val & 0x03FFFFFF);
+  bfd_put_32 (abfd, insn,
+              (bfd_byte *) data + reloc_entry->address);
+
+  return bfd_reloc_ok;
+}
+
+static reloc_howto_type dlx_elf_howto_table[]=
+{
+  /* No relocation.  */
+  HOWTO (R_DLX_NONE,            /* Type. */
+	 0,                     /* Rightshift.  */
+	 0,                     /* size (0 = byte, 1 = short, 2 = long).  */
+	 0,                     /* Bitsize.  */
+	 FALSE,                 /* PC_relative.  */
+	 0,                     /* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc, /* Special_function.  */
+	 "R_DLX_NONE",          /* Name.  */
+	 FALSE,                 /* Partial_inplace.  */
+	 0,                     /* Src_mask.  */
+	 0,                     /* Dst_mask.  */
+	 FALSE),                /* PCrel_offset.  */
+
+  /* 8 bit relocation.  */
+  HOWTO (R_DLX_RELOC_8,         /* Type. */
+	 0,                     /* Rightshift.  */
+	 0,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+	 8,                     /* Bitsize.  */
+	 FALSE,                 /* PC_relative.  */
+	 0,                     /* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc, /* Special_function.  */
+	 "R_DLX_RELOC_8",       /* Name.  */
+	 TRUE,                  /* Partial_inplace.  */
+	 0xff,                  /* Src_mask.  */
+	 0xff,                  /* Dst_mask.  */
+	 FALSE),                /* PCrel_offset.  */
+
+  /* 16 bit relocation.  */
+  HOWTO (R_DLX_RELOC_16,        /* Type. */
+	 0,                     /* Rightshift.  */
+	 1,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,                    /* Bitsize.  */
+	 FALSE,                 /* PC_relative.  */
+	 0,                     /* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc, /* Special_function.  */
+	 "R_DLX_RELOC_16",      /* Name.  */
+	 TRUE,                  /* Partial_inplace.  */
+	 0xffff,                /* Src_mask.  */
+	 0xffff,                /* Dst_mask.  */
+	 FALSE),                /* PCrel_offset.  */
+
+  /* 32 bit relocation.  */
+  HOWTO (R_DLX_RELOC_32,        /* Type. */
+	 0,                     /* Rightshift.  */
+	 2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,                    /* Bitsize.  */
+	 FALSE,                 /* PC_relative.  */
+	 0,                     /* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc, /* Special_function.  */
+	 "R_DLX_RELOC_32",      /* Name.  */
+	 TRUE,                  /* Partial_inplace.  */
+	 0xffffffff,            /* Src_mask.  */
+	 0xffffffff,            /* Dst_mask.  */
+	 FALSE),                /* PCrel_offset.  */
+
+  /* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_DLX_GNU_VTINHERIT,   /* Type. */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 0,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 NULL,			/* Special_function.  */
+	 "R_DLX_GNU_VTINHERIT", /* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0,			/* Src_mask.  */
+	 0,			/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* GNU extension to record C++ vtable member usage.  */
+  HOWTO (R_DLX_GNU_VTENTRY,     /* Type. */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 0,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 _bfd_elf_rel_vtable_reloc_fn,/* Special_function.  */
+	 "R_DLX_GNU_VTENTRY",	/* Name.  */
+	 FALSE,		  	/* Partial_inplace.  */
+	 0,			/* Src_mask.  */
+	 0,			/* Dst_mask.  */
+	 FALSE)		  	/* PCrel_offset.  */
+};
+
+/* 16 bit offset for pc-relative branches.  */
+static reloc_howto_type elf_dlx_gnu_rel16_s2 =
+  HOWTO (R_DLX_RELOC_16_PCREL,  /* Type. */
+	 0,                     /* Rightshift.  */
+	 1,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,                    /* Bitsize.  */
+	 TRUE,                  /* PC_relative.  */
+	 0,                     /* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 elf32_dlx_relocate16,  /* Special_function.  */
+	 "R_DLX_RELOC_16_PCREL",/* Name.  */
+	 TRUE,                  /* Partial_inplace.  */
+	 0xffff,                /* Src_mask.  */
+	 0xffff,                /* Dst_mask.  */
+	 TRUE);                 /* PCrel_offset.  */
+
+/* 26 bit offset for pc-relative branches.  */
+static reloc_howto_type elf_dlx_gnu_rel26_s2 =
+  HOWTO (R_DLX_RELOC_26_PCREL,  /* Type. */
+	 0,                     /* Rightshift.  */
+	 2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+	 26,                    /* Bitsize.  */
+	 TRUE,                  /* PC_relative.  */
+	 0,                     /* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 elf32_dlx_relocate26,  /* Special_function.  */
+	 "R_DLX_RELOC_26_PCREL",/* Name.  */
+	 TRUE,                  /* Partial_inplace.  */
+	 0xffff,                /* Src_mask.  */
+	 0xffff,                /* Dst_mask.  */
+	 TRUE);                 /* PCrel_offset.  */
+
+/* High 16 bits of symbol value.  */
+static reloc_howto_type elf_dlx_reloc_16_hi =
+  HOWTO (R_DLX_RELOC_16_HI,     /* Type. */
+	 16,                    /* Rightshift.  */
+	 2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,                    /* Bitsize.  */
+	 FALSE,                 /* PC_relative.  */
+	 0,                     /* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 _bfd_dlx_elf_hi16_reloc,/* Special_function.  */
+	 "R_DLX_RELOC_16_HI",   /* Name.  */
+	 TRUE,                  /* Partial_inplace.  */
+	 0xFFFF,                /* Src_mask.  */
+	 0xffff,                /* Dst_mask.  */
+	 FALSE);                /* PCrel_offset.  */
+
+  /* Low 16 bits of symbol value.  */
+static reloc_howto_type elf_dlx_reloc_16_lo =
+  HOWTO (R_DLX_RELOC_16_LO,     /* Type. */
+	 0,                     /* Rightshift.  */
+	 1,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,                    /* Bitsize.  */
+	 FALSE,                 /* PC_relative.  */
+	 0,                     /* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc, /* Special_function.  */
+	 "R_DLX_RELOC_16_LO",   /* Name.  */
+	 TRUE,                  /* Partial_inplace.  */
+	 0xffff,                /* Src_mask.  */
+	 0xffff,                /* Dst_mask.  */
+	 FALSE);                /* PCrel_offset.  */
+
+/* A mapping from BFD reloc types to DLX ELF reloc types.
+   Stolen from elf32-mips.c.
+
+   More about this table - for dlx elf relocation we do not really
+   need this table, if we have a rtype defined in this table will
+   caused tc_gen_relocate confused and die on us, but if we remove
+   this table it will caused more problem, so for now simple solution
+   is to remove those entries which may cause problem.  */
+struct elf_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  enum elf_dlx_reloc_type elf_reloc_val;
+};
+
+static const struct elf_reloc_map dlx_reloc_map[] =
+{
+  { BFD_RELOC_NONE,           R_DLX_NONE },
+  { BFD_RELOC_16,             R_DLX_RELOC_16 },
+  { BFD_RELOC_32,             R_DLX_RELOC_32 },
+  { BFD_RELOC_DLX_HI16_S,     R_DLX_RELOC_16_HI },
+  { BFD_RELOC_DLX_LO16,       R_DLX_RELOC_16_LO },
+  { BFD_RELOC_VTABLE_INHERIT,	R_DLX_GNU_VTINHERIT },
+  { BFD_RELOC_VTABLE_ENTRY,	R_DLX_GNU_VTENTRY }
+};
+
+/* Look through the relocs for a section during the first phase.
+   Since we don't do .gots or .plts, we just need to consider the
+   virtual table relocs for gc.  */
+
+static bfd_boolean
+elf32_dlx_check_relocs (bfd *abfd,
+			struct bfd_link_info *info,
+			asection *sec,
+			const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+
+  if (info->relocatable)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+        h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      switch (ELF32_R_TYPE (rel->r_info))
+        {
+        /* This relocation describes the C++ object vtable hierarchy.
+           Reconstruct it for later use during GC.  */
+        case R_DLX_GNU_VTINHERIT:
+          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+
+        /* This relocation describes which C++ vtable entries are actually
+           used.  Record for later use during GC.  */
+        case R_DLX_GNU_VTENTRY:
+          BFD_ASSERT (h != NULL);
+          if (h != NULL
+              && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+            return FALSE;
+          break;
+        }
+    }
+
+  return TRUE;
+}
+
+/* Given a BFD reloc type, return a howto structure.  */
+
+static reloc_howto_type *
+elf32_dlx_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			     bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (dlx_reloc_map) / sizeof (struct elf_reloc_map); i++)
+    if (dlx_reloc_map[i].bfd_reloc_val == code)
+      return &dlx_elf_howto_table[(int) dlx_reloc_map[i].elf_reloc_val];
+
+  switch (code)
+    {
+    default:
+      bfd_set_error (bfd_error_bad_value);
+      return NULL;
+    case BFD_RELOC_16_PCREL_S2:
+      return &elf_dlx_gnu_rel16_s2;
+    case BFD_RELOC_DLX_JMP26:
+      return &elf_dlx_gnu_rel26_s2;
+    case BFD_RELOC_HI16_S:
+      return &elf_dlx_reloc_16_hi;
+    case BFD_RELOC_LO16:
+      return &elf_dlx_reloc_16_lo;
+    }
+}
+
+static reloc_howto_type *
+elf32_dlx_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			     const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (dlx_elf_howto_table) / sizeof (dlx_elf_howto_table[0]);
+       i++)
+    if (dlx_elf_howto_table[i].name != NULL
+	&& strcasecmp (dlx_elf_howto_table[i].name, r_name) == 0)
+      return &dlx_elf_howto_table[i];
+
+  if (strcasecmp (elf_dlx_gnu_rel16_s2.name, r_name) == 0)
+    return &elf_dlx_gnu_rel16_s2;
+  if (strcasecmp (elf_dlx_gnu_rel26_s2.name, r_name) == 0)
+    return &elf_dlx_gnu_rel26_s2;
+  if (strcasecmp (elf_dlx_reloc_16_hi.name, r_name) == 0)
+    return &elf_dlx_reloc_16_hi;
+  if (strcasecmp (elf_dlx_reloc_16_lo.name, r_name) == 0)
+    return &elf_dlx_reloc_16_lo;
+
+  return NULL;
+}
+
+static reloc_howto_type *
+dlx_rtype_to_howto (unsigned int r_type)
+{
+  switch (r_type)
+    {
+    case R_DLX_RELOC_16_PCREL:
+      return & elf_dlx_gnu_rel16_s2;
+    case R_DLX_RELOC_26_PCREL:
+      return & elf_dlx_gnu_rel26_s2;
+    case R_DLX_RELOC_16_HI:
+      return & elf_dlx_reloc_16_hi;
+    case R_DLX_RELOC_16_LO:
+      return & elf_dlx_reloc_16_lo;
+    default:
+      BFD_ASSERT (r_type < (unsigned int) R_DLX_max);
+      return & dlx_elf_howto_table[r_type];
+    }
+}
+
+static void
+elf32_dlx_info_to_howto (bfd * abfd ATTRIBUTE_UNUSED,
+			 arelent * cache_ptr ATTRIBUTE_UNUSED,
+			 Elf_Internal_Rela * dst ATTRIBUTE_UNUSED)
+{
+  abort ();
+}
+
+static void
+elf32_dlx_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+			     arelent *cache_ptr,
+			     Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  cache_ptr->howto = dlx_rtype_to_howto (r_type);
+  return;
+}
+
+#define TARGET_BIG_SYM          bfd_elf32_dlx_big_vec
+#define TARGET_BIG_NAME         "elf32-dlx"
+#define ELF_ARCH                bfd_arch_dlx
+#define ELF_MACHINE_CODE        EM_DLX
+#define ELF_MAXPAGESIZE         1 /* FIXME: This number is wrong,  It should be the page size in bytes.  */
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-fr30.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-fr30.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-fr30.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-fr30.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,740 @@
+/* FR30-specific support for 32-bit ELF.
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/fr30.h"
+
+/* Forward declarations.  */
+static bfd_reloc_status_type fr30_elf_i20_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_reloc_status_type fr30_elf_i32_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static reloc_howto_type * fr30_reloc_type_lookup
+  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
+static void fr30_info_to_howto_rela
+  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
+static bfd_boolean fr30_elf_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
+static bfd_reloc_status_type fr30_final_link_relocate
+  PARAMS ((reloc_howto_type *, bfd *, asection *, bfd_byte *,
+	   Elf_Internal_Rela *, bfd_vma));
+static bfd_boolean fr30_elf_check_relocs
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+	   const Elf_Internal_Rela *));
+
+static reloc_howto_type fr30_elf_howto_table [] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_FR30_NONE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FR30_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An 8 bit absolute relocation.  */
+  HOWTO (R_FR30_8,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 4,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FR30_8",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000,		/* src_mask */
+	 0x0ff0,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 20 bit absolute relocation.  */
+  HOWTO (R_FR30_20,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 20,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 fr30_elf_i20_reloc,	/* special_function */
+	 "R_FR30_20",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000000,		/* src_mask */
+	 0x00f0ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32 bit absolute relocation.  */
+  HOWTO (R_FR30_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FR30_32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000000,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32 bit into 48 bits absolute relocation.  */
+  HOWTO (R_FR30_48,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 fr30_elf_i32_reloc,	/* special_function */
+	 "R_FR30_48",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000000,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 6 bit absolute relocation.  */
+  HOWTO (R_FR30_6_IN_4,		/* type */
+	 2,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 6,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 4,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FR30_6_IN_4",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000,		/* src_mask */
+	 0x00f0,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An 8 bit absolute relocation.  */
+  HOWTO (R_FR30_8_IN_8,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 4,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,/* special_function */
+	 "R_FR30_8_IN_8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000,		/* src_mask */
+	 0x0ff0,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 9 bit absolute relocation.  */
+  HOWTO (R_FR30_9_IN_8,		/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 9,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 4,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,/* special_function */
+	 "R_FR30_9_IN_8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000,		/* src_mask */
+	 0x0ff0,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 10 bit absolute relocation.  */
+  HOWTO (R_FR30_10_IN_8,	/* type */
+	 2,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 10,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 4,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,/* special_function */
+	 "R_FR30_10_IN_8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000,		/* src_mask */
+	 0x0ff0,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A PC relative 9 bit relocation, right shifted by 1.  */
+  HOWTO (R_FR30_9_PCREL,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 9,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_FR30_9_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000,		/* src_mask */
+	 0x00ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A PC relative 12 bit relocation, right shifted by 1.  */
+  HOWTO (R_FR30_12_PCREL,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_FR30_12_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000,		/* src_mask */
+	 0x07ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  /* GNU extension to record C++ vtable hierarchy */
+  HOWTO (R_FR30_GNU_VTINHERIT, /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         NULL,                  /* special_function */
+         "R_FR30_GNU_VTINHERIT", /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage */
+  HOWTO (R_FR30_GNU_VTENTRY,     /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
+         "R_FR30_GNU_VTENTRY",   /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+};
+
+/* Utility to actually perform an R_FR30_20 reloc.  */
+
+static bfd_reloc_status_type
+fr30_elf_i20_reloc (abfd, reloc_entry, symbol, data,
+		    input_section, output_bfd, error_message)
+     bfd *abfd;
+     arelent *reloc_entry;
+     asymbol *symbol;
+     PTR data;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  bfd_vma relocation;
+  unsigned long x;
+
+  /* This part is from bfd_elf_generic_reloc.  */
+  if (output_bfd != (bfd *) NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (! reloc_entry->howto->partial_inplace
+	  || reloc_entry->addend == 0))
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  if (output_bfd != NULL)
+    /* FIXME: See bfd_perform_relocation.  Is this right?  */
+    return bfd_reloc_ok;
+
+  relocation =
+    symbol->value
+    + symbol->section->output_section->vma
+    + symbol->section->output_offset
+    + reloc_entry->addend;
+
+  if (relocation > (((bfd_vma) 1 << 20) - 1))
+    return bfd_reloc_overflow;
+
+  x = bfd_get_32 (abfd, (char *) data + reloc_entry->address);
+  x = (x & 0xff0f0000) | (relocation & 0x0000ffff) | ((relocation & 0x000f0000) << 4);
+  bfd_put_32 (abfd, (bfd_vma) x, (char *) data + reloc_entry->address);
+
+  return bfd_reloc_ok;
+}
+
+/* Utility to actually perform a R_FR30_48 reloc.  */
+
+static bfd_reloc_status_type
+fr30_elf_i32_reloc (abfd, reloc_entry, symbol, data,
+		    input_section, output_bfd, error_message)
+     bfd *abfd;
+     arelent *reloc_entry;
+     asymbol *symbol;
+     PTR data;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  bfd_vma relocation;
+
+  /* This part is from bfd_elf_generic_reloc.  */
+  if (output_bfd != (bfd *) NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (! reloc_entry->howto->partial_inplace
+	  || reloc_entry->addend == 0))
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  if (output_bfd != NULL)
+    /* FIXME: See bfd_perform_relocation.  Is this right?  */
+    return bfd_reloc_ok;
+
+  relocation =
+    symbol->value
+    + symbol->section->output_section->vma
+    + symbol->section->output_offset
+    + reloc_entry->addend;
+
+  bfd_put_32 (abfd, relocation, (char *) data + reloc_entry->address + 2);
+
+  return bfd_reloc_ok;
+}
+
+/* Map BFD reloc types to FR30 ELF reloc types.  */
+
+struct fr30_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned int fr30_reloc_val;
+};
+
+static const struct fr30_reloc_map fr30_reloc_map [] =
+{
+  { BFD_RELOC_NONE,           R_FR30_NONE },
+  { BFD_RELOC_8,              R_FR30_8 },
+  { BFD_RELOC_FR30_20,        R_FR30_20 },
+  { BFD_RELOC_32,             R_FR30_32 },
+  { BFD_RELOC_FR30_48,        R_FR30_48 },
+  { BFD_RELOC_FR30_6_IN_4,    R_FR30_6_IN_4 },
+  { BFD_RELOC_FR30_8_IN_8,    R_FR30_8_IN_8 },
+  { BFD_RELOC_FR30_9_IN_8,    R_FR30_9_IN_8 },
+  { BFD_RELOC_FR30_10_IN_8,   R_FR30_10_IN_8 },
+  { BFD_RELOC_FR30_9_PCREL,   R_FR30_9_PCREL },
+  { BFD_RELOC_FR30_12_PCREL,  R_FR30_12_PCREL },
+  { BFD_RELOC_VTABLE_INHERIT, R_FR30_GNU_VTINHERIT },
+  { BFD_RELOC_VTABLE_ENTRY,   R_FR30_GNU_VTENTRY },
+};
+
+static reloc_howto_type *
+fr30_reloc_type_lookup (abfd, code)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     bfd_reloc_code_real_type code;
+{
+  unsigned int i;
+
+  for (i = sizeof (fr30_reloc_map) / sizeof (fr30_reloc_map[0]);
+       --i;)
+    if (fr30_reloc_map [i].bfd_reloc_val == code)
+      return & fr30_elf_howto_table [fr30_reloc_map[i].fr30_reloc_val];
+
+  return NULL;
+}
+
+static reloc_howto_type *
+fr30_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (fr30_elf_howto_table) / sizeof (fr30_elf_howto_table[0]);
+       i++)
+    if (fr30_elf_howto_table[i].name != NULL
+	&& strcasecmp (fr30_elf_howto_table[i].name, r_name) == 0)
+      return &fr30_elf_howto_table[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for an FR30 ELF reloc.  */
+
+static void
+fr30_info_to_howto_rela (abfd, cache_ptr, dst)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *cache_ptr;
+     Elf_Internal_Rela *dst;
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_FR30_max);
+  cache_ptr->howto = & fr30_elf_howto_table [r_type];
+}
+
+/* Perform a single relocation.  By default we use the standard BFD
+   routines, but a few relocs, we have to do them ourselves.  */
+
+static bfd_reloc_status_type
+fr30_final_link_relocate (howto, input_bfd, input_section, contents, rel,
+			  relocation)
+     reloc_howto_type *howto;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     Elf_Internal_Rela *rel;
+     bfd_vma relocation;
+{
+  bfd_reloc_status_type r = bfd_reloc_ok;
+  bfd_vma x;
+  bfd_signed_vma srel;
+
+  switch (howto->type)
+    {
+    case R_FR30_20:
+      contents   += rel->r_offset;
+      relocation += rel->r_addend;
+
+      if (relocation > ((1 << 20) - 1))
+	return bfd_reloc_overflow;
+
+      x = bfd_get_32 (input_bfd, contents);
+      x = (x & 0xff0f0000) | (relocation & 0x0000ffff) | ((relocation & 0x000f0000) << 4);
+      bfd_put_32 (input_bfd, x, contents);
+      break;
+
+    case R_FR30_48:
+      contents   += rel->r_offset + 2;
+      relocation += rel->r_addend;
+      bfd_put_32 (input_bfd, relocation, contents);
+      break;
+
+    case R_FR30_9_PCREL:
+      contents   += rel->r_offset + 1;
+      srel = (bfd_signed_vma) relocation;
+      srel += rel->r_addend;
+      srel -= rel->r_offset;
+      srel -= 2;  /* Branch instructions add 2 to the PC...  */
+      srel -= (input_section->output_section->vma +
+		     input_section->output_offset);
+
+      if (srel & 1)
+	return bfd_reloc_outofrange;
+      if (srel > ((1 << 8) - 1) || (srel < - (1 << 8)))
+	return bfd_reloc_overflow;
+
+      bfd_put_8 (input_bfd, srel >> 1, contents);
+      break;
+
+    case R_FR30_12_PCREL:
+      contents   += rel->r_offset;
+      srel = (bfd_signed_vma) relocation;
+      srel += rel->r_addend;
+      srel -= rel->r_offset;
+      srel -= 2; /* Branch instructions add 2 to the PC...  */
+      srel -= (input_section->output_section->vma +
+		     input_section->output_offset);
+
+      if (srel & 1)
+	return bfd_reloc_outofrange;
+      if (srel > ((1 << 11) - 1) || (srel < - (1 << 11)))
+	  return bfd_reloc_overflow;
+
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xf800) | ((srel >> 1) & 0x7ff);
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    default:
+      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+				    contents, rel->r_offset,
+				    relocation, rel->r_addend);
+    }
+
+  return r;
+}
+
+/* Relocate an FR30 ELF section.
+
+   The RELOCATE_SECTION function is called by the new ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures; if the section
+   actually uses Rel structures, the r_addend field will always be
+   zero.
+
+   This function is responsible for adjusting the section contents as
+   necessary, and (if using Rela relocs and generating a relocatable
+   output file) adjusting the reloc addend as necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.  */
+
+static bfd_boolean
+fr30_elf_relocate_section (output_bfd, info, input_bfd, input_section,
+			   contents, relocs, local_syms, local_sections)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     Elf_Internal_Rela *relocs;
+     Elf_Internal_Sym *local_syms;
+     asection **local_sections;
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+
+  symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+  relend     = relocs + input_section->reloc_count;
+
+  for (rel = relocs; rel < relend; rel ++)
+    {
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+      const char *name;
+      int r_type;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      if (   r_type == R_FR30_GNU_VTINHERIT
+	  || r_type == R_FR30_GNU_VTENTRY)
+	continue;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      howto  = fr30_elf_howto_table + ELF32_R_TYPE (rel->r_info);
+      h      = NULL;
+      sym    = NULL;
+      sec    = NULL;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections [r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+
+	  name = bfd_elf_string_from_elf_section
+	    (input_bfd, symtab_hdr->sh_link, sym->st_name);
+	  name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name;
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc, warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+
+	  name = h->root.root.string;
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      r = fr30_final_link_relocate (howto, input_bfd, input_section,
+				     contents, rel, relocation);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char * msg = (const char *) NULL;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      r = info->callbacks->reloc_overflow
+		(info, (h ? &h->root : NULL), name, howto->name,
+		 (bfd_vma) 0, input_bfd, input_section, rel->r_offset);
+	      break;
+
+	    case bfd_reloc_undefined:
+	      r = info->callbacks->undefined_symbol
+		(info, name, input_bfd, input_section, rel->r_offset,
+		 TRUE);
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      break;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      break;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous relocation");
+	      break;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      break;
+	    }
+
+	  if (msg)
+	    r = info->callbacks->warning
+	      (info, msg, name, input_bfd, input_section, rel->r_offset);
+
+	  if (! r)
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+static asection *
+fr30_elf_gc_mark_hook (asection *sec,
+		       struct bfd_link_info *info,
+		       Elf_Internal_Rela *rel,
+		       struct elf_link_hash_entry *h,
+		       Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_FR30_GNU_VTINHERIT:
+      case R_FR30_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Look through the relocs for a section during the first phase.
+   Since we don't do .gots or .plts, we just need to consider the
+   virtual table relocs for gc.  */
+
+static bfd_boolean
+fr30_elf_check_relocs (abfd, info, sec, relocs)
+     bfd *abfd;
+     struct bfd_link_info *info;
+     asection *sec;
+     const Elf_Internal_Rela *relocs;
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+
+  if (info->relocatable)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+        h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      switch (ELF32_R_TYPE (rel->r_info))
+        {
+        /* This relocation describes the C++ object vtable hierarchy.
+           Reconstruct it for later use during GC.  */
+        case R_FR30_GNU_VTINHERIT:
+          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+
+        /* This relocation describes which C++ vtable entries are actually
+           used.  Record for later use during GC.  */
+        case R_FR30_GNU_VTENTRY:
+          BFD_ASSERT (h != NULL);
+          if (h != NULL
+              && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+            return FALSE;
+          break;
+        }
+    }
+
+  return TRUE;
+}
+
+#define ELF_ARCH		bfd_arch_fr30
+#define ELF_MACHINE_CODE	EM_FR30
+#define ELF_MACHINE_ALT1	EM_CYGNUS_FR30
+#define ELF_MAXPAGESIZE		0x1000
+
+#define TARGET_BIG_SYM          bfd_elf32_fr30_vec
+#define TARGET_BIG_NAME		"elf32-fr30"
+
+#define elf_info_to_howto_rel			NULL
+#define elf_info_to_howto			fr30_info_to_howto_rela
+#define elf_backend_relocate_section		fr30_elf_relocate_section
+#define elf_backend_gc_mark_hook		fr30_elf_gc_mark_hook
+#define elf_backend_check_relocs                fr30_elf_check_relocs
+
+#define elf_backend_can_gc_sections		1
+#define elf_backend_rela_normal			1
+
+#define bfd_elf32_bfd_reloc_type_lookup		fr30_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup	fr30_reloc_name_lookup
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-frv.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-frv.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-frv.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-frv.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,7092 @@
+/* FRV-specific support for 32-bit ELF.
+   Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/frv.h"
+#include "dwarf2.h"
+#include "hashtab.h"
+
+/* Forward declarations.  */
+static bfd_reloc_status_type elf32_frv_relocate_lo16
+  PARAMS ((bfd *,  Elf_Internal_Rela *, bfd_byte *, bfd_vma));
+static bfd_reloc_status_type elf32_frv_relocate_hi16
+  PARAMS ((bfd *,  Elf_Internal_Rela *, bfd_byte *, bfd_vma));
+static bfd_reloc_status_type elf32_frv_relocate_label24
+  PARAMS ((bfd *, asection *, Elf_Internal_Rela *, bfd_byte *, bfd_vma));
+static bfd_reloc_status_type elf32_frv_relocate_gprel12
+  PARAMS ((struct bfd_link_info *, bfd *, asection *, Elf_Internal_Rela *,
+	   bfd_byte *, bfd_vma));
+static bfd_reloc_status_type elf32_frv_relocate_gprelu12
+  PARAMS ((struct bfd_link_info *, bfd *, asection *, Elf_Internal_Rela *,
+	   bfd_byte *, bfd_vma));
+static bfd_reloc_status_type elf32_frv_relocate_gprello
+  PARAMS ((struct bfd_link_info *, bfd *, asection *, Elf_Internal_Rela *,
+	   bfd_byte *, bfd_vma));
+static bfd_reloc_status_type elf32_frv_relocate_gprelhi
+  PARAMS ((struct bfd_link_info *, bfd *, asection *, Elf_Internal_Rela *,
+	   bfd_byte *, bfd_vma));
+static reloc_howto_type *frv_reloc_type_lookup
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
+static void frv_info_to_howto_rela
+  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
+static bfd_boolean elf32_frv_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
+static bfd_boolean elf32_frv_add_symbol_hook
+  PARAMS (( bfd *, struct bfd_link_info *, Elf_Internal_Sym *,
+	    const char **, flagword *, asection **, bfd_vma *));
+static bfd_reloc_status_type frv_final_link_relocate
+  PARAMS ((reloc_howto_type *, bfd *, asection *, bfd_byte *,
+	   Elf_Internal_Rela *, bfd_vma));
+static bfd_boolean elf32_frv_check_relocs
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+	   const Elf_Internal_Rela *));
+static int elf32_frv_machine
+  PARAMS ((bfd *));
+static bfd_boolean elf32_frv_object_p
+  PARAMS ((bfd *));
+static bfd_boolean frv_elf_set_private_flags
+  PARAMS ((bfd *, flagword));
+static bfd_boolean frv_elf_copy_private_bfd_data
+  PARAMS ((bfd *, bfd *));
+static bfd_boolean frv_elf_merge_private_bfd_data
+  PARAMS ((bfd *, bfd *));
+static bfd_boolean frv_elf_print_private_bfd_data
+  PARAMS ((bfd *, PTR));
+static bfd_boolean elf32_frv_grok_prstatus (bfd * abfd,
+					    Elf_Internal_Note * note);
+static bfd_boolean elf32_frv_grok_psinfo (bfd * abfd,
+					  Elf_Internal_Note * note);
+
+static reloc_howto_type elf32_frv_howto_table [] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_FRV_NONE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32 bit absolute relocation.  */
+  HOWTO (R_FRV_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit pc-relative relocation.  */
+  HOWTO (R_FRV_LABEL16,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_LABEL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 24-bit pc-relative relocation.  */
+  HOWTO (R_FRV_LABEL24,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_LABEL24",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x7e03ffff,		/* src_mask */
+	 0x7e03ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_FRV_LO16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_LO16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_FRV_HI16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_HI16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_FRV_GPREL12,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_GPREL12",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xfff,			/* src_mask */
+	 0xfff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_FRV_GPRELU12,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_GPRELU12",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xfff,			/* src_mask */
+	 0x3f03f,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_FRV_GPREL32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_GPREL32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_FRV_GPRELHI,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_GPRELHI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_FRV_GPRELLO,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_GPRELLO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 12-bit signed operand with the GOT offset for the address of
+     the symbol.  */
+  HOWTO (R_FRV_GOT12,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_GOT12",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xfff,			/* src_mask */
+	 0xfff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The upper 16 bits of the GOT offset for the address of the
+     symbol.  */
+  HOWTO (R_FRV_GOTHI,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_GOTHI",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The lower 16 bits of the GOT offset for the address of the
+     symbol.  */
+  HOWTO (R_FRV_GOTLO,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_GOTLO",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The 32-bit address of the canonical descriptor of a function.  */
+  HOWTO (R_FRV_FUNCDESC,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_FUNCDESC",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 12-bit signed operand with the GOT offset for the address of
+     canonical descriptor of a function.  */
+  HOWTO (R_FRV_FUNCDESC_GOT12,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_FUNCDESC_GOT12", /* name */
+	 FALSE,			/* partial_inplace */
+	 0xfff,			/* src_mask */
+	 0xfff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The upper 16 bits of the GOT offset for the address of the
+     canonical descriptor of a function.  */
+  HOWTO (R_FRV_FUNCDESC_GOTHI,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_FUNCDESC_GOTHI", /* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The lower 16 bits of the GOT offset for the address of the
+     canonical descriptor of a function.  */
+  HOWTO (R_FRV_FUNCDESC_GOTLO,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_FUNCDESC_GOTLO", /* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The 64-bit descriptor of a function.  */
+  HOWTO (R_FRV_FUNCDESC_VALUE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_FUNCDESC_VALUE", /* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 12-bit signed operand with the GOT offset for the address of
+     canonical descriptor of a function.  */
+  HOWTO (R_FRV_FUNCDESC_GOTOFF12, /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_FUNCDESC_GOTOFF12", /* name */
+	 FALSE,			/* partial_inplace */
+	 0xfff,			/* src_mask */
+	 0xfff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The upper 16 bits of the GOT offset for the address of the
+     canonical descriptor of a function.  */
+  HOWTO (R_FRV_FUNCDESC_GOTOFFHI, /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_FUNCDESC_GOTOFFHI", /* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The lower 16 bits of the GOT offset for the address of the
+     canonical descriptor of a function.  */
+  HOWTO (R_FRV_FUNCDESC_GOTOFFLO, /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_FUNCDESC_GOTOFFLO", /* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 12-bit signed operand with the GOT offset for the address of
+     the symbol.  */
+  HOWTO (R_FRV_GOTOFF12,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_GOTOFF12",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xfff,			/* src_mask */
+	 0xfff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The upper 16 bits of the GOT offset for the address of the
+     symbol.  */
+  HOWTO (R_FRV_GOTOFFHI,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_GOTOFFHI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The lower 16 bits of the GOT offset for the address of the
+     symbol.  */
+  HOWTO (R_FRV_GOTOFFLO,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_GOTOFFLO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 24-bit pc-relative relocation referencing the TLS PLT entry for
+     a thread-local symbol.  If the symbol number is 0, it refers to
+     the module.  */
+  HOWTO (R_FRV_GETTLSOFF,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_GETTLSOFF",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x7e03ffff,		/* src_mask */
+	 0x7e03ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 64-bit TLS descriptor for a symbol.  This relocation is only
+     valid as a REL, dynamic relocation.  */
+  HOWTO (R_FRV_TLSDESC_VALUE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_TLSDESC_VALUE", /* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 12-bit signed operand with the GOT offset for the TLS
+     descriptor of the symbol.  */
+  HOWTO (R_FRV_GOTTLSDESC12,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_GOTTLSDESC12",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xfff,			/* src_mask */
+	 0xfff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The upper 16 bits of the GOT offset for the TLS descriptor of the
+     symbol.  */
+  HOWTO (R_FRV_GOTTLSDESCHI,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_GOTTLSDESCHI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The lower 16 bits of the GOT offset for the TLS descriptor of the
+     symbol.  */
+  HOWTO (R_FRV_GOTTLSDESCLO,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_GOTTLSDESCLO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 12-bit signed operand with the offset from the module base
+     address to the thread-local symbol address.  */
+  HOWTO (R_FRV_TLSMOFF12,	 /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_TLSMOFF12",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xfff,			/* src_mask */
+	 0xfff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The upper 16 bits of the offset from the module base address to
+     the thread-local symbol address.  */
+  HOWTO (R_FRV_TLSMOFFHI,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_TLSMOFFHI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The lower 16 bits of the offset from the module base address to
+     the thread-local symbol address.  */
+  HOWTO (R_FRV_TLSMOFFLO,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_TLSMOFFLO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 12-bit signed operand with the GOT offset for the TLSOFF entry
+     for a symbol.  */
+  HOWTO (R_FRV_GOTTLSOFF12,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_GOTTLSOFF12",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xfff,			/* src_mask */
+	 0xfff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The upper 16 bits of the GOT offset for the TLSOFF entry for a
+     symbol.  */
+  HOWTO (R_FRV_GOTTLSOFFHI,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_GOTTLSOFFHI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The lower 16 bits of the GOT offset for the TLSOFF entry for a
+     symbol.  */
+  HOWTO (R_FRV_GOTTLSOFFLO,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_GOTTLSOFFLO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The 32-bit offset from the thread pointer (not the module base
+     address) to a thread-local symbol.  */
+  HOWTO (R_FRV_TLSOFF,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_TLSOFF",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An annotation for linker relaxation, that denotes the
+     symbol+addend whose TLS descriptor is referenced by the sum of
+     the two input registers of an ldd instruction.  */
+  HOWTO (R_FRV_TLSDESC_RELAX,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_TLSDESC_RELAX",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An annotation for linker relaxation, that denotes the
+     symbol+addend whose TLS resolver entry point is given by the sum
+     of the two register operands of an calll instruction.  */
+  HOWTO (R_FRV_GETTLSOFF_RELAX,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_GETTLSOFF_RELAX", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An annotation for linker relaxation, that denotes the
+     symbol+addend whose TLS offset GOT entry is given by the sum of
+     the two input registers of an ld instruction.  */
+  HOWTO (R_FRV_TLSOFF_RELAX,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_TLSOFF_RELAX",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32-bit offset from the module base address to
+     the thread-local symbol address.  */
+  HOWTO (R_FRV_TLSMOFF,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_TLSMOFF",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+/* GNU extension to record C++ vtable hierarchy.  */
+static reloc_howto_type elf32_frv_vtinherit_howto =
+  HOWTO (R_FRV_GNU_VTINHERIT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_FRV_GNU_VTINHERIT", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage.  */
+static reloc_howto_type elf32_frv_vtentry_howto =
+  HOWTO (R_FRV_GNU_VTENTRY,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_elf_rel_vtable_reloc_fn, /* special_function */
+	 "R_FRV_GNU_VTENTRY",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+/* The following 3 relocations are REL.  The only difference to the
+   entries in the table above are that partial_inplace is TRUE.  */
+static reloc_howto_type elf32_frv_rel_32_howto =
+  HOWTO (R_FRV_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+static reloc_howto_type elf32_frv_rel_funcdesc_howto =
+  HOWTO (R_FRV_FUNCDESC,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_FUNCDESC",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+static reloc_howto_type elf32_frv_rel_funcdesc_value_howto =
+  HOWTO (R_FRV_FUNCDESC_VALUE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_FUNCDESC_VALUE", /* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+static reloc_howto_type elf32_frv_rel_tlsdesc_value_howto =
+  /* A 64-bit TLS descriptor for a symbol.  The first word resolves to
+     an entry point, and the second resolves to a special argument.
+     If the symbol turns out to be in static TLS, the entry point is a
+     return instruction, and the special argument is the TLS offset
+     for the symbol.  If it's in dynamic TLS, the entry point is a TLS
+     offset resolver, and the special argument is a pointer to a data
+     structure allocated by the dynamic loader, containing the GOT
+     address for the offset resolver, the module id, the offset within
+     the module, and anything else the TLS offset resolver might need
+     to determine the TLS offset for the symbol in the running
+     thread.  */
+  HOWTO (R_FRV_TLSDESC_VALUE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_TLSDESC_VALUE", /* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+static reloc_howto_type elf32_frv_rel_tlsoff_howto =
+  /* The 32-bit offset from the thread pointer (not the module base
+     address) to a thread-local symbol.  */
+  HOWTO (R_FRV_TLSOFF,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_FRV_TLSOFF",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+
+
+extern const bfd_target bfd_elf32_frvfdpic_vec;
+#define IS_FDPIC(bfd) ((bfd)->xvec == &bfd_elf32_frvfdpic_vec)
+
+/* An extension of the elf hash table data structure, containing some
+   additional FRV-specific data.  */
+struct frvfdpic_elf_link_hash_table
+{
+  struct elf_link_hash_table elf;
+
+  /* A pointer to the .got section.  */
+  asection *sgot;
+  /* A pointer to the .rel.got section.  */
+  asection *sgotrel;
+  /* A pointer to the .rofixup section.  */
+  asection *sgotfixup;
+  /* A pointer to the .plt section.  */
+  asection *splt;
+  /* A pointer to the .rel.plt section.  */
+  asection *spltrel;
+  /* GOT base offset.  */
+  bfd_vma got0;
+  /* Location of the first non-lazy PLT entry, i.e., the number of
+     bytes taken by lazy PLT entries.  If locally-bound TLS
+     descriptors require a ret instruction, it will be placed at this
+     offset.  */
+  bfd_vma plt0;
+  /* A hash table holding information about which symbols were
+     referenced with which PIC-related relocations.  */
+  struct htab *relocs_info;
+  /* Summary reloc information collected by
+     _frvfdpic_count_got_plt_entries.  */
+  struct _frvfdpic_dynamic_got_info *g;
+};
+
+/* Get the FRV ELF linker hash table from a link_info structure.  */
+
+#define frvfdpic_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == FRV_ELF_DATA ? ((struct frvfdpic_elf_link_hash_table *) ((p)->hash)) : NULL)
+
+#define frvfdpic_got_section(info) \
+  (frvfdpic_hash_table (info)->sgot)
+#define frvfdpic_gotrel_section(info) \
+  (frvfdpic_hash_table (info)->sgotrel)
+#define frvfdpic_gotfixup_section(info) \
+  (frvfdpic_hash_table (info)->sgotfixup)
+#define frvfdpic_plt_section(info) \
+  (frvfdpic_hash_table (info)->splt)
+#define frvfdpic_pltrel_section(info) \
+  (frvfdpic_hash_table (info)->spltrel)
+#define frvfdpic_relocs_info(info) \
+  (frvfdpic_hash_table (info)->relocs_info)
+#define frvfdpic_got_initial_offset(info) \
+  (frvfdpic_hash_table (info)->got0)
+#define frvfdpic_plt_initial_offset(info) \
+  (frvfdpic_hash_table (info)->plt0)
+#define frvfdpic_dynamic_got_plt_info(info) \
+  (frvfdpic_hash_table (info)->g)
+
+/* Currently it's the same, but if some day we have a reason to change
+   it, we'd better be using a different macro.
+
+   FIXME: if there's any TLS PLT entry that uses local-exec or
+   initial-exec models, we could use the ret at the end of any of them
+   instead of adding one more.  */
+#define frvfdpic_plt_tls_ret_offset(info) \
+  (frvfdpic_plt_initial_offset (info))
+
+/* The name of the dynamic interpreter.  This is put in the .interp
+   section.  */
+
+#define ELF_DYNAMIC_INTERPRETER "/lib/ld.so.1"
+
+#define DEFAULT_STACK_SIZE 0x20000
+
+/* This structure is used to collect the number of entries present in
+   each addressable range of the got.  */
+struct _frvfdpic_dynamic_got_info
+{
+  /* Several bits of information about the current link.  */
+  struct bfd_link_info *info;
+  /* Total GOT size needed for GOT entries within the 12-, 16- or 32-bit
+     ranges.  */
+  bfd_vma got12, gotlos, gothilo;
+  /* Total GOT size needed for function descriptor entries within the 12-,
+     16- or 32-bit ranges.  */
+  bfd_vma fd12, fdlos, fdhilo;
+  /* Total GOT size needed by function descriptor entries referenced
+     in PLT entries, that would be profitable to place in offsets
+     close to the PIC register.  */
+  bfd_vma fdplt;
+  /* Total PLT size needed by lazy PLT entries.  */
+  bfd_vma lzplt;
+  /* Total GOT size needed for TLS descriptor entries within the 12-,
+     16- or 32-bit ranges.  */
+  bfd_vma tlsd12, tlsdlos, tlsdhilo;
+  /* Total GOT size needed by TLS descriptors referenced in PLT
+     entries, that would be profitable to place in offers close to the
+     PIC register.  */
+  bfd_vma tlsdplt;
+  /* Total PLT size needed by TLS lazy PLT entries.  */
+  bfd_vma tlslzplt;
+  /* Number of relocations carried over from input object files.  */
+  unsigned long relocs;
+  /* Number of fixups introduced by relocations in input object files.  */
+  unsigned long fixups;
+  /* The number of fixups that reference the ret instruction added to
+     the PLT for locally-resolved TLS descriptors.  */
+  unsigned long tls_ret_refs;
+};
+
+/* This structure is used to assign offsets to got entries, function
+   descriptors, plt entries and lazy plt entries.  */
+
+struct _frvfdpic_dynamic_got_plt_info
+{
+  /* Summary information collected with _frvfdpic_count_got_plt_entries.  */
+  struct _frvfdpic_dynamic_got_info g;
+
+  /* For each addressable range, we record a MAX (positive) and MIN
+     (negative) value.  CUR is used to assign got entries, and it's
+     incremented from an initial positive value to MAX, then from MIN
+     to FDCUR (unless FDCUR wraps around first).  FDCUR is used to
+     assign function descriptors, and it's decreased from an initial
+     non-positive value to MIN, then from MAX down to CUR (unless CUR
+     wraps around first).  All of MIN, MAX, CUR and FDCUR always point
+     to even words.  ODD, if non-zero, indicates an odd word to be
+     used for the next got entry, otherwise CUR is used and
+     incremented by a pair of words, wrapping around when it reaches
+     MAX.  FDCUR is decremented (and wrapped) before the next function
+     descriptor is chosen.  FDPLT indicates the number of remaining
+     slots that can be used for function descriptors used only by PLT
+     entries.
+
+     TMAX, TMIN and TCUR are used to assign TLS descriptors.  TCUR
+     starts as MAX, and grows up to TMAX, then wraps around to TMIN
+     and grows up to MIN.  TLSDPLT indicates the number of remaining
+     slots that can be used for TLS descriptors used only by TLS PLT
+     entries.  */
+  struct _frvfdpic_dynamic_got_alloc_data
+  {
+    bfd_signed_vma max, cur, odd, fdcur, min;
+    bfd_signed_vma tmax, tcur, tmin;
+    bfd_vma fdplt, tlsdplt;
+  } got12, gotlos, gothilo;
+};
+
+/* Create an FRV ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+frvfdpic_elf_link_hash_table_create (bfd *abfd)
+{
+  struct frvfdpic_elf_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct frvfdpic_elf_link_hash_table);
+
+  ret = bfd_zalloc (abfd, amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd,
+				      _bfd_elf_link_hash_newfunc,
+				      sizeof (struct elf_link_hash_entry),
+				      FRV_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  return &ret->elf.root;
+}
+
+/* Decide whether a reference to a symbol can be resolved locally or
+   not.  If the symbol is protected, we want the local address, but
+   its function descriptor must be assigned by the dynamic linker.  */
+#define FRVFDPIC_SYM_LOCAL(INFO, H) \
+  (_bfd_elf_symbol_refs_local_p ((H), (INFO), 1) \
+   || ! elf_hash_table (INFO)->dynamic_sections_created)
+#define FRVFDPIC_FUNCDESC_LOCAL(INFO, H) \
+  ((H)->dynindx == -1 || ! elf_hash_table (INFO)->dynamic_sections_created)
+
+/* This structure collects information on what kind of GOT, PLT or
+   function descriptors are required by relocations that reference a
+   certain symbol.  */
+struct frvfdpic_relocs_info
+{
+  /* The index of the symbol, as stored in the relocation r_info, if
+     we have a local symbol; -1 otherwise.  */
+  long symndx;
+  union
+  {
+    /* The input bfd in which the symbol is defined, if it's a local
+       symbol.  */
+    bfd *abfd;
+    /* If symndx == -1, the hash table entry corresponding to a global
+       symbol (even if it turns out to bind locally, in which case it
+       should ideally be replaced with section's symndx + addend).  */
+    struct elf_link_hash_entry *h;
+  } d;
+  /* The addend of the relocation that references the symbol.  */
+  bfd_vma addend;
+
+  /* The fields above are used to identify an entry.  The fields below
+     contain information on how an entry is used and, later on, which
+     locations it was assigned.  */
+  /* The following 3 fields record whether the symbol+addend above was
+     ever referenced with a GOT relocation.  The 12 suffix indicates a
+     GOT12 relocation; los is used for GOTLO relocations that are not
+     matched by a GOTHI relocation; hilo is used for GOTLO/GOTHI
+     pairs.  */
+  unsigned got12:1;
+  unsigned gotlos:1;
+  unsigned gothilo:1;
+  /* Whether a FUNCDESC relocation references symbol+addend.  */
+  unsigned fd:1;
+  /* Whether a FUNCDESC_GOT relocation references symbol+addend.  */
+  unsigned fdgot12:1;
+  unsigned fdgotlos:1;
+  unsigned fdgothilo:1;
+  /* Whether a FUNCDESC_GOTOFF relocation references symbol+addend.  */
+  unsigned fdgoff12:1;
+  unsigned fdgofflos:1;
+  unsigned fdgoffhilo:1;
+  /* Whether a GETTLSOFF relocation references symbol+addend.  */
+  unsigned tlsplt:1;
+  /* FIXME: we should probably add tlspltdesc, tlspltoff and
+     tlspltimm, to tell what kind of TLS PLT entry we're generating.
+     We might instead just pre-compute flags telling whether the
+     object is suitable for local exec, initial exec or general
+     dynamic addressing, and use that all over the place.  We could
+     also try to do a better job of merging TLSOFF and TLSDESC entries
+     in main executables, but perhaps we can get rid of TLSDESC
+     entirely in them instead.  */
+  /* Whether a GOTTLSDESC relocation references symbol+addend.  */
+  unsigned tlsdesc12:1;
+  unsigned tlsdesclos:1;
+  unsigned tlsdeschilo:1;
+  /* Whether a GOTTLSOFF relocation references symbol+addend.  */
+  unsigned tlsoff12:1;
+  unsigned tlsofflos:1;
+  unsigned tlsoffhilo:1;
+  /* Whether symbol+addend is referenced with GOTOFF12, GOTOFFLO or
+     GOTOFFHI relocations.  The addend doesn't really matter, since we
+     envision that this will only be used to check whether the symbol
+     is mapped to the same segment as the got.  */
+  unsigned gotoff:1;
+  /* Whether symbol+addend is referenced by a LABEL24 relocation.  */
+  unsigned call:1;
+  /* Whether symbol+addend is referenced by a 32 or FUNCDESC_VALUE
+     relocation.  */
+  unsigned sym:1;
+  /* Whether we need a PLT entry for a symbol.  Should be implied by
+     something like:
+     (call && symndx == -1 && ! FRVFDPIC_SYM_LOCAL (info, d.h))  */
+  unsigned plt:1;
+  /* Whether a function descriptor should be created in this link unit
+     for symbol+addend.  Should be implied by something like:
+     (plt || fdgotoff12 || fdgotofflos || fdgotofflohi
+      || ((fd || fdgot12 || fdgotlos || fdgothilo)
+          && (symndx != -1 || FRVFDPIC_FUNCDESC_LOCAL (info, d.h))))  */
+  unsigned privfd:1;
+  /* Whether a lazy PLT entry is needed for this symbol+addend.
+     Should be implied by something like:
+     (privfd && symndx == -1 && ! FRVFDPIC_SYM_LOCAL (info, d.h)
+      && ! (info->flags & DF_BIND_NOW))  */
+  unsigned lazyplt:1;
+  /* Whether we've already emitted GOT relocations and PLT entries as
+     needed for this symbol.  */
+  unsigned done:1;
+
+  /* The number of R_FRV_32, R_FRV_FUNCDESC, R_FRV_FUNCDESC_VALUE and
+     R_FRV_TLSDESC_VALUE, R_FRV_TLSOFF relocations referencing
+     symbol+addend.  */
+  unsigned relocs32, relocsfd, relocsfdv, relocstlsd, relocstlsoff;
+
+  /* The number of .rofixups entries and dynamic relocations allocated
+     for this symbol, minus any that might have already been used.  */
+  unsigned fixups, dynrelocs;
+
+  /* The offsets of the GOT entries assigned to symbol+addend, to the
+     function descriptor's address, and to a function descriptor,
+     respectively.  Should be zero if unassigned.  The offsets are
+     counted from the value that will be assigned to the PIC register,
+     not from the beginning of the .got section.  */
+  bfd_signed_vma got_entry, fdgot_entry, fd_entry;
+  /* The offsets of the PLT entries assigned to symbol+addend,
+     non-lazy and lazy, respectively.  If unassigned, should be
+     (bfd_vma)-1.  */
+  bfd_vma plt_entry, lzplt_entry;
+  /* The offsets of the GOT entries for TLS offset and TLS descriptor.  */
+  bfd_signed_vma tlsoff_entry, tlsdesc_entry;
+  /* The offset of the TLS offset PLT entry.  */
+  bfd_vma tlsplt_entry;
+};
+
+/* Compute a hash with the key fields of an frvfdpic_relocs_info entry.  */
+static hashval_t
+frvfdpic_relocs_info_hash (const void *entry_)
+{
+  const struct frvfdpic_relocs_info *entry = entry_;
+
+  return (entry->symndx == -1
+	  ? (long) entry->d.h->root.root.hash
+	  : entry->symndx + (long) entry->d.abfd->id * 257) + entry->addend;
+}
+
+/* Test whether the key fields of two frvfdpic_relocs_info entries are
+   identical.  */
+static int
+frvfdpic_relocs_info_eq (const void *entry1, const void *entry2)
+{
+  const struct frvfdpic_relocs_info *e1 = entry1;
+  const struct frvfdpic_relocs_info *e2 = entry2;
+
+  return e1->symndx == e2->symndx && e1->addend == e2->addend
+    && (e1->symndx == -1 ? e1->d.h == e2->d.h : e1->d.abfd == e2->d.abfd);
+}
+
+/* Find or create an entry in a hash table HT that matches the key
+   fields of the given ENTRY.  If it's not found, memory for a new
+   entry is allocated in ABFD's obstack.  */
+static struct frvfdpic_relocs_info *
+frvfdpic_relocs_info_find (struct htab *ht,
+			   bfd *abfd,
+			   const struct frvfdpic_relocs_info *entry,
+			   enum insert_option insert)
+{
+  struct frvfdpic_relocs_info **loc =
+    (struct frvfdpic_relocs_info **) htab_find_slot (ht, entry, insert);
+
+  if (! loc)
+    return NULL;
+
+  if (*loc)
+    return *loc;
+
+  *loc = bfd_zalloc (abfd, sizeof (**loc));
+
+  if (! *loc)
+    return *loc;
+
+  (*loc)->symndx = entry->symndx;
+  (*loc)->d = entry->d;
+  (*loc)->addend = entry->addend;
+  (*loc)->plt_entry = (bfd_vma)-1;
+  (*loc)->lzplt_entry = (bfd_vma)-1;
+  (*loc)->tlsplt_entry = (bfd_vma)-1;
+
+  return *loc;
+}
+
+/* Obtain the address of the entry in HT associated with H's symbol +
+   addend, creating a new entry if none existed.  ABFD is only used
+   for memory allocation purposes.  */
+inline static struct frvfdpic_relocs_info *
+frvfdpic_relocs_info_for_global (struct htab *ht,
+				 bfd *abfd,
+				 struct elf_link_hash_entry *h,
+				 bfd_vma addend,
+				 enum insert_option insert)
+{
+  struct frvfdpic_relocs_info entry;
+
+  entry.symndx = -1;
+  entry.d.h = h;
+  entry.addend = addend;
+
+  return frvfdpic_relocs_info_find (ht, abfd, &entry, insert);
+}
+
+/* Obtain the address of the entry in HT associated with the SYMNDXth
+   local symbol of the input bfd ABFD, plus the addend, creating a new
+   entry if none existed.  */
+inline static struct frvfdpic_relocs_info *
+frvfdpic_relocs_info_for_local (struct htab *ht,
+				bfd *abfd,
+				long symndx,
+				bfd_vma addend,
+				enum insert_option insert)
+{
+  struct frvfdpic_relocs_info entry;
+
+  entry.symndx = symndx;
+  entry.d.abfd = abfd;
+  entry.addend = addend;
+
+  return frvfdpic_relocs_info_find (ht, abfd, &entry, insert);
+}
+
+/* Merge fields set by check_relocs() of two entries that end up being
+   mapped to the same (presumably global) symbol.  */
+
+inline static void
+frvfdpic_pic_merge_early_relocs_info (struct frvfdpic_relocs_info *e2,
+				      struct frvfdpic_relocs_info const *e1)
+{
+  e2->got12 |= e1->got12;
+  e2->gotlos |= e1->gotlos;
+  e2->gothilo |= e1->gothilo;
+  e2->fd |= e1->fd;
+  e2->fdgot12 |= e1->fdgot12;
+  e2->fdgotlos |= e1->fdgotlos;
+  e2->fdgothilo |= e1->fdgothilo;
+  e2->fdgoff12 |= e1->fdgoff12;
+  e2->fdgofflos |= e1->fdgofflos;
+  e2->fdgoffhilo |= e1->fdgoffhilo;
+  e2->tlsplt |= e1->tlsplt;
+  e2->tlsdesc12 |= e1->tlsdesc12;
+  e2->tlsdesclos |= e1->tlsdesclos;
+  e2->tlsdeschilo |= e1->tlsdeschilo;
+  e2->tlsoff12 |= e1->tlsoff12;
+  e2->tlsofflos |= e1->tlsofflos;
+  e2->tlsoffhilo |= e1->tlsoffhilo;
+  e2->gotoff |= e1->gotoff;
+  e2->call |= e1->call;
+  e2->sym |= e1->sym;
+}
+
+/* Every block of 65535 lazy PLT entries shares a single call to the
+   resolver, inserted in the 32768th lazy PLT entry (i.e., entry #
+   32767, counting from 0).  All other lazy PLT entries branch to it
+   in a single instruction.  */
+
+#define FRVFDPIC_LZPLT_BLOCK_SIZE ((bfd_vma) 8 * 65535 + 4)
+#define FRVFDPIC_LZPLT_RESOLV_LOC (8 * 32767)
+
+/* Add a dynamic relocation to the SRELOC section.  */
+
+inline static bfd_vma
+_frvfdpic_add_dyn_reloc (bfd *output_bfd, asection *sreloc, bfd_vma offset,
+			 int reloc_type, long dynindx, bfd_vma addend,
+			 struct frvfdpic_relocs_info *entry)
+{
+  Elf_Internal_Rela outrel;
+  bfd_vma reloc_offset;
+
+  outrel.r_offset = offset;
+  outrel.r_info = ELF32_R_INFO (dynindx, reloc_type);
+  outrel.r_addend = addend;
+
+  reloc_offset = sreloc->reloc_count * sizeof (Elf32_External_Rel);
+  BFD_ASSERT (reloc_offset < sreloc->size);
+  bfd_elf32_swap_reloc_out (output_bfd, &outrel,
+			    sreloc->contents + reloc_offset);
+  sreloc->reloc_count++;
+
+  /* If the entry's index is zero, this relocation was probably to a
+     linkonce section that got discarded.  We reserved a dynamic
+     relocation, but it was for another entry than the one we got at
+     the time of emitting the relocation.  Unfortunately there's no
+     simple way for us to catch this situation, since the relocation
+     is cleared right before calling relocate_section, at which point
+     we no longer know what the relocation used to point to.  */
+  if (entry->symndx)
+    {
+      BFD_ASSERT (entry->dynrelocs > 0);
+      entry->dynrelocs--;
+    }
+
+  return reloc_offset;
+}
+
+/* Add a fixup to the ROFIXUP section.  */
+
+static bfd_vma
+_frvfdpic_add_rofixup (bfd *output_bfd, asection *rofixup, bfd_vma offset,
+		       struct frvfdpic_relocs_info *entry)
+{
+  bfd_vma fixup_offset;
+
+  if (rofixup->flags & SEC_EXCLUDE)
+    return -1;
+
+  fixup_offset = rofixup->reloc_count * 4;
+  if (rofixup->contents)
+    {
+      BFD_ASSERT (fixup_offset < rofixup->size);
+      bfd_put_32 (output_bfd, offset, rofixup->contents + fixup_offset);
+    }
+  rofixup->reloc_count++;
+
+  if (entry && entry->symndx)
+    {
+      /* See discussion about symndx == 0 in _frvfdpic_add_dyn_reloc
+	 above.  */
+      BFD_ASSERT (entry->fixups > 0);
+      entry->fixups--;
+    }
+
+  return fixup_offset;
+}
+
+/* Find the segment number in which OSEC, and output section, is
+   located.  */
+
+static unsigned
+_frvfdpic_osec_to_segment (bfd *output_bfd, asection *osec)
+{
+  Elf_Internal_Phdr *p = _bfd_elf_find_segment_containing_section (output_bfd, osec);
+
+  return (p != NULL) ? p - elf_tdata (output_bfd)->phdr : -1;
+}
+
+inline static bfd_boolean
+_frvfdpic_osec_readonly_p (bfd *output_bfd, asection *osec)
+{
+  unsigned seg = _frvfdpic_osec_to_segment (output_bfd, osec);
+
+  return ! (elf_tdata (output_bfd)->phdr[seg].p_flags & PF_W);
+}
+
+#define FRVFDPIC_TLS_BIAS (2048 - 16)
+
+/* Return the base VMA address which should be subtracted from real addresses
+   when resolving TLSMOFF relocation.
+   This is PT_TLS segment p_vaddr, plus the 2048-16 bias.  */
+
+static bfd_vma
+tls_biased_base (struct bfd_link_info *info)
+{
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (elf_hash_table (info)->tls_sec == NULL)
+    return FRVFDPIC_TLS_BIAS;
+  return elf_hash_table (info)->tls_sec->vma + FRVFDPIC_TLS_BIAS;
+}
+
+/* Generate relocations for GOT entries, function descriptors, and
+   code for PLT and lazy PLT entries.  */
+
+inline static bfd_boolean
+_frvfdpic_emit_got_relocs_plt_entries (struct frvfdpic_relocs_info *entry,
+				       bfd *output_bfd,
+				       struct bfd_link_info *info,
+				       asection *sec,
+				       Elf_Internal_Sym *sym,
+				       bfd_vma addend)
+
+{
+  bfd_vma fd_lazy_rel_offset = (bfd_vma)-1;
+  int dynindx = -1;
+
+  if (entry->done)
+    return TRUE;
+  entry->done = 1;
+
+  if (entry->got_entry || entry->fdgot_entry || entry->fd_entry
+      || entry->tlsoff_entry || entry->tlsdesc_entry)
+    {
+      /* If the symbol is dynamic, consider it for dynamic
+	 relocations, otherwise decay to section + offset.  */
+      if (entry->symndx == -1 && entry->d.h->dynindx != -1)
+	dynindx = entry->d.h->dynindx;
+      else
+	{
+	  if (sec
+	      && sec->output_section
+	      && ! bfd_is_abs_section (sec->output_section)
+	      && ! bfd_is_und_section (sec->output_section))
+	    dynindx = elf_section_data (sec->output_section)->dynindx;
+	  else
+	    dynindx = 0;
+	}
+    }
+
+  /* Generate relocation for GOT entry pointing to the symbol.  */
+  if (entry->got_entry)
+    {
+      int idx = dynindx;
+      bfd_vma ad = addend;
+
+      /* If the symbol is dynamic but binds locally, use
+	 section+offset.  */
+      if (sec && (entry->symndx != -1
+		  || FRVFDPIC_SYM_LOCAL (info, entry->d.h)))
+	{
+	  if (entry->symndx == -1)
+	    ad += entry->d.h->root.u.def.value;
+	  else
+	    ad += sym->st_value;
+	  ad += sec->output_offset;
+	  if (sec->output_section && elf_section_data (sec->output_section))
+	    idx = elf_section_data (sec->output_section)->dynindx;
+	  else
+	    idx = 0;
+	}
+
+      /* If we're linking an executable at a fixed address, we can
+	 omit the dynamic relocation as long as the symbol is local to
+	 this module.  */
+      if (info->executable && !info->pie
+	  && (entry->symndx != -1
+	      || FRVFDPIC_SYM_LOCAL (info, entry->d.h)))
+	{
+	  if (sec)
+	    ad += sec->output_section->vma;
+	  if (entry->symndx != -1
+	      || entry->d.h->root.type != bfd_link_hash_undefweak)
+	    _frvfdpic_add_rofixup (output_bfd,
+				   frvfdpic_gotfixup_section (info),
+				   frvfdpic_got_section (info)->output_section
+				   ->vma
+				   + frvfdpic_got_section (info)->output_offset
+				   + frvfdpic_got_initial_offset (info)
+				   + entry->got_entry, entry);
+	}
+      else
+	_frvfdpic_add_dyn_reloc (output_bfd, frvfdpic_gotrel_section (info),
+				 _bfd_elf_section_offset
+				 (output_bfd, info,
+				  frvfdpic_got_section (info),
+				  frvfdpic_got_initial_offset (info)
+				  + entry->got_entry)
+				 + frvfdpic_got_section (info)
+				 ->output_section->vma
+				 + frvfdpic_got_section (info)->output_offset,
+				 R_FRV_32, idx, ad, entry);
+
+      bfd_put_32 (output_bfd, ad,
+		  frvfdpic_got_section (info)->contents
+		  + frvfdpic_got_initial_offset (info)
+		  + entry->got_entry);
+    }
+
+  /* Generate relocation for GOT entry pointing to a canonical
+     function descriptor.  */
+  if (entry->fdgot_entry)
+    {
+      int reloc, idx;
+      bfd_vma ad = 0;
+
+      if (! (entry->symndx == -1
+	     && entry->d.h->root.type == bfd_link_hash_undefweak
+	     && FRVFDPIC_SYM_LOCAL (info, entry->d.h)))
+	{
+	  /* If the symbol is dynamic and there may be dynamic symbol
+	     resolution because we are, or are linked with, a shared
+	     library, emit a FUNCDESC relocation such that the dynamic
+	     linker will allocate the function descriptor.  If the
+	     symbol needs a non-local function descriptor but binds
+	     locally (e.g., its visibility is protected, emit a
+	     dynamic relocation decayed to section+offset.  */
+	  if (entry->symndx == -1
+	      && ! FRVFDPIC_FUNCDESC_LOCAL (info, entry->d.h)
+	      && FRVFDPIC_SYM_LOCAL (info, entry->d.h)
+	      && !(info->executable && !info->pie))
+	    {
+	      reloc = R_FRV_FUNCDESC;
+	      idx = elf_section_data (entry->d.h->root.u.def.section
+				      ->output_section)->dynindx;
+	      ad = entry->d.h->root.u.def.section->output_offset
+		+ entry->d.h->root.u.def.value;
+	    }
+	  else if (entry->symndx == -1
+		   && ! FRVFDPIC_FUNCDESC_LOCAL (info, entry->d.h))
+	    {
+	      reloc = R_FRV_FUNCDESC;
+	      idx = dynindx;
+	      ad = addend;
+	      if (ad)
+		{
+		  (*info->callbacks->reloc_dangerous)
+		    (info, _("relocation requires zero addend"),
+		     elf_hash_table (info)->dynobj,
+		     frvfdpic_got_section (info),
+		     entry->fdgot_entry);
+		  return FALSE;
+		}
+	    }
+	  else
+	    {
+	      /* Otherwise, we know we have a private function descriptor,
+		 so reference it directly.  */
+	      if (elf_hash_table (info)->dynamic_sections_created)
+		BFD_ASSERT (entry->privfd);
+	      reloc = R_FRV_32;
+	      idx = elf_section_data (frvfdpic_got_section (info)
+				      ->output_section)->dynindx;
+	      ad = frvfdpic_got_section (info)->output_offset
+		+ frvfdpic_got_initial_offset (info) + entry->fd_entry;
+	    }
+
+	  /* If there is room for dynamic symbol resolution, emit the
+	     dynamic relocation.  However, if we're linking an
+	     executable at a fixed location, we won't have emitted a
+	     dynamic symbol entry for the got section, so idx will be
+	     zero, which means we can and should compute the address
+	     of the private descriptor ourselves.  */
+	  if (info->executable && !info->pie
+	      && (entry->symndx != -1
+		  || FRVFDPIC_FUNCDESC_LOCAL (info, entry->d.h)))
+	    {
+	      ad += frvfdpic_got_section (info)->output_section->vma;
+	      _frvfdpic_add_rofixup (output_bfd,
+				     frvfdpic_gotfixup_section (info),
+				     frvfdpic_got_section (info)
+				     ->output_section->vma
+				     + frvfdpic_got_section (info)
+				     ->output_offset
+				     + frvfdpic_got_initial_offset (info)
+				     + entry->fdgot_entry, entry);
+	    }
+	  else
+	    _frvfdpic_add_dyn_reloc (output_bfd,
+				     frvfdpic_gotrel_section (info),
+				     _bfd_elf_section_offset
+				     (output_bfd, info,
+				      frvfdpic_got_section (info),
+				      frvfdpic_got_initial_offset (info)
+				      + entry->fdgot_entry)
+				     + frvfdpic_got_section (info)
+				     ->output_section->vma
+				     + frvfdpic_got_section (info)
+				     ->output_offset,
+				     reloc, idx, ad, entry);
+	}
+
+      bfd_put_32 (output_bfd, ad,
+		  frvfdpic_got_section (info)->contents
+		  + frvfdpic_got_initial_offset (info)
+		  + entry->fdgot_entry);
+    }
+
+  /* Generate relocation to fill in a private function descriptor in
+     the GOT.  */
+  if (entry->fd_entry)
+    {
+      int idx = dynindx;
+      bfd_vma ad = addend;
+      bfd_vma ofst;
+      long lowword, highword;
+
+      /* If the symbol is dynamic but binds locally, use
+	 section+offset.  */
+      if (sec && (entry->symndx != -1
+		  || FRVFDPIC_SYM_LOCAL (info, entry->d.h)))
+	{
+	  if (entry->symndx == -1)
+	    ad += entry->d.h->root.u.def.value;
+	  else
+	    ad += sym->st_value;
+	  ad += sec->output_offset;
+	  if (sec->output_section && elf_section_data (sec->output_section))
+	    idx = elf_section_data (sec->output_section)->dynindx;
+	  else
+	    idx = 0;
+	}
+
+      /* If we're linking an executable at a fixed address, we can
+	 omit the dynamic relocation as long as the symbol is local to
+	 this module.  */
+      if (info->executable && !info->pie
+	  && (entry->symndx != -1 || FRVFDPIC_SYM_LOCAL (info, entry->d.h)))
+	{
+	  if (sec)
+	    ad += sec->output_section->vma;
+	  ofst = 0;
+	  if (entry->symndx != -1
+	      || entry->d.h->root.type != bfd_link_hash_undefweak)
+	    {
+	      _frvfdpic_add_rofixup (output_bfd,
+				     frvfdpic_gotfixup_section (info),
+				     frvfdpic_got_section (info)
+				     ->output_section->vma
+				     + frvfdpic_got_section (info)
+				     ->output_offset
+				     + frvfdpic_got_initial_offset (info)
+				     + entry->fd_entry, entry);
+	      _frvfdpic_add_rofixup (output_bfd,
+				     frvfdpic_gotfixup_section (info),
+				     frvfdpic_got_section (info)
+				     ->output_section->vma
+				     + frvfdpic_got_section (info)
+				     ->output_offset
+				     + frvfdpic_got_initial_offset (info)
+				     + entry->fd_entry + 4, entry);
+	    }
+	}
+      else
+	{
+	  ofst =
+	    _frvfdpic_add_dyn_reloc (output_bfd,
+				     entry->lazyplt
+				     ? frvfdpic_pltrel_section (info)
+				     : frvfdpic_gotrel_section (info),
+				     _bfd_elf_section_offset
+				     (output_bfd, info,
+				      frvfdpic_got_section (info),
+				      frvfdpic_got_initial_offset (info)
+				      + entry->fd_entry)
+				     + frvfdpic_got_section (info)
+				     ->output_section->vma
+				     + frvfdpic_got_section (info)
+				     ->output_offset,
+				     R_FRV_FUNCDESC_VALUE, idx, ad, entry);
+	}
+
+      /* If we've omitted the dynamic relocation, just emit the fixed
+	 addresses of the symbol and of the local GOT base offset.  */
+      if (info->executable && !info->pie && sec && sec->output_section)
+	{
+	  lowword = ad;
+	  highword = frvfdpic_got_section (info)->output_section->vma
+	    + frvfdpic_got_section (info)->output_offset
+	    + frvfdpic_got_initial_offset (info);
+	}
+      else if (entry->lazyplt)
+	{
+	  if (ad)
+	    {
+	      (*info->callbacks->reloc_dangerous)
+		(info, _("relocation requires zero addend"),
+		 elf_hash_table (info)->dynobj,
+		 frvfdpic_got_section (info),
+		 entry->fd_entry);
+	      return FALSE;
+	    }
+
+	  fd_lazy_rel_offset = ofst;
+
+	  /* A function descriptor used for lazy or local resolving is
+	     initialized such that its high word contains the output
+	     section index in which the PLT entries are located, and
+	     the low word contains the address of the lazy PLT entry
+	     entry point, that must be within the memory region
+	     assigned to that section.  */
+	  lowword = entry->lzplt_entry + 4
+	    + frvfdpic_plt_section (info)->output_offset
+	    + frvfdpic_plt_section (info)->output_section->vma;
+	  highword = _frvfdpic_osec_to_segment
+	    (output_bfd, frvfdpic_plt_section (info)->output_section);
+	}
+      else
+	{
+	  /* A function descriptor for a local function gets the index
+	     of the section.  For a non-local function, it's
+	     disregarded.  */
+	  lowword = ad;
+	  if (sec == NULL
+	      || (entry->symndx == -1 && entry->d.h->dynindx != -1
+		  && entry->d.h->dynindx == idx))
+	    highword = 0;
+	  else
+	    highword = _frvfdpic_osec_to_segment
+	      (output_bfd, sec->output_section);
+	}
+
+      bfd_put_32 (output_bfd, lowword,
+		  frvfdpic_got_section (info)->contents
+		  + frvfdpic_got_initial_offset (info)
+		  + entry->fd_entry);
+      bfd_put_32 (output_bfd, highword,
+		  frvfdpic_got_section (info)->contents
+		  + frvfdpic_got_initial_offset (info)
+		  + entry->fd_entry + 4);
+    }
+
+  /* Generate code for the PLT entry.  */
+  if (entry->plt_entry != (bfd_vma) -1)
+    {
+      bfd_byte *plt_code = frvfdpic_plt_section (info)->contents
+	+ entry->plt_entry;
+
+      BFD_ASSERT (entry->fd_entry);
+
+      /* Figure out what kind of PLT entry we need, depending on the
+	 location of the function descriptor within the GOT.  */
+      if (entry->fd_entry >= -(1 << (12 - 1))
+	  && entry->fd_entry < (1 << (12 - 1)))
+	{
+	  /* lddi @(gr15, fd_entry), gr14 */
+	  bfd_put_32 (output_bfd,
+		      0x9cccf000 | (entry->fd_entry & ((1 << 12) - 1)),
+		      plt_code);
+	  plt_code += 4;
+	}
+      else
+	{
+	  if (entry->fd_entry >= -(1 << (16 - 1))
+	      && entry->fd_entry < (1 << (16 - 1)))
+	    {
+	      /* setlos lo(fd_entry), gr14 */
+	      bfd_put_32 (output_bfd,
+			  0x9cfc0000
+			  | (entry->fd_entry & (((bfd_vma)1 << 16) - 1)),
+			  plt_code);
+	      plt_code += 4;
+	    }
+	  else
+	    {
+	      /* sethi.p hi(fd_entry), gr14
+		 setlo lo(fd_entry), gr14 */
+	      bfd_put_32 (output_bfd,
+			  0x1cf80000
+			  | ((entry->fd_entry >> 16)
+			     & (((bfd_vma)1 << 16) - 1)),
+			  plt_code);
+	      plt_code += 4;
+	      bfd_put_32 (output_bfd,
+			  0x9cf40000
+			  | (entry->fd_entry & (((bfd_vma)1 << 16) - 1)),
+			  plt_code);
+	      plt_code += 4;
+	    }
+	  /* ldd @(gr14,gr15),gr14 */
+	  bfd_put_32 (output_bfd, 0x9c08e14f, plt_code);
+	  plt_code += 4;
+	}
+      /* jmpl @(gr14,gr0) */
+      bfd_put_32 (output_bfd, 0x8030e000, plt_code);
+    }
+
+  /* Generate code for the lazy PLT entry.  */
+  if (entry->lzplt_entry != (bfd_vma) -1)
+    {
+      bfd_byte *lzplt_code = frvfdpic_plt_section (info)->contents
+	+ entry->lzplt_entry;
+      bfd_vma resolverStub_addr;
+
+      bfd_put_32 (output_bfd, fd_lazy_rel_offset, lzplt_code);
+      lzplt_code += 4;
+
+      resolverStub_addr = entry->lzplt_entry / FRVFDPIC_LZPLT_BLOCK_SIZE
+	* FRVFDPIC_LZPLT_BLOCK_SIZE + FRVFDPIC_LZPLT_RESOLV_LOC;
+      if (resolverStub_addr >= frvfdpic_plt_initial_offset (info))
+	resolverStub_addr = frvfdpic_plt_initial_offset (info) - 12;
+
+      if (entry->lzplt_entry == resolverStub_addr)
+	{
+	  /* This is a lazy PLT entry that includes a resolver call.  */
+	  /* ldd @(gr15,gr0), gr4
+	     jmpl @(gr4,gr0)  */
+	  bfd_put_32 (output_bfd, 0x8808f140, lzplt_code);
+	  bfd_put_32 (output_bfd, 0x80304000, lzplt_code + 4);
+	}
+      else
+	{
+	  /* bra  resolverStub */
+	  bfd_put_32 (output_bfd,
+		      0xc01a0000
+		      | (((resolverStub_addr - entry->lzplt_entry)
+			  / 4) & (((bfd_vma)1 << 16) - 1)),
+		      lzplt_code);
+	}
+    }
+
+  /* Generate relocation for GOT entry holding the TLS offset.  */
+  if (entry->tlsoff_entry)
+    {
+      int idx = dynindx;
+      bfd_vma ad = addend;
+
+      if (entry->symndx != -1
+	  || FRVFDPIC_SYM_LOCAL (info, entry->d.h))
+	{
+	  /* If the symbol is dynamic but binds locally, use
+	     section+offset.  */
+	  if (sec)
+	    {
+	      if (entry->symndx == -1)
+		ad += entry->d.h->root.u.def.value;
+	      else
+		ad += sym->st_value;
+	      ad += sec->output_offset;
+	      if (sec->output_section
+		  && elf_section_data (sec->output_section))
+		idx = elf_section_data (sec->output_section)->dynindx;
+	      else
+		idx = 0;
+	    }
+	}
+
+      /* *ABS*+addend is special for TLS relocations, use only the
+	 addend.  */
+      if (info->executable
+	  && idx == 0
+	  && (bfd_is_abs_section (sec)
+	      || bfd_is_und_section (sec)))
+	;
+      /* If we're linking an executable, we can entirely omit the
+	 dynamic relocation if the symbol is local to this module.  */
+      else if (info->executable
+	       && (entry->symndx != -1
+		   || FRVFDPIC_SYM_LOCAL (info, entry->d.h)))
+	{
+	  if (sec)
+	    ad += sec->output_section->vma - tls_biased_base (info);
+	}
+      else
+	{
+	  if (idx == 0
+	      && (bfd_is_abs_section (sec)
+		  || bfd_is_und_section (sec)))
+	    {
+	      if (! elf_hash_table (info)->tls_sec)
+		{
+		  (*info->callbacks->undefined_symbol)
+		    (info, "TLS section", elf_hash_table (info)->dynobj,
+		     frvfdpic_got_section (info), entry->tlsoff_entry, TRUE);
+		  return FALSE;
+		}
+	      idx = elf_section_data (elf_hash_table (info)->tls_sec)->dynindx;
+	      ad += FRVFDPIC_TLS_BIAS;
+	    }
+	  _frvfdpic_add_dyn_reloc (output_bfd, frvfdpic_gotrel_section (info),
+				   _bfd_elf_section_offset
+				   (output_bfd, info,
+				    frvfdpic_got_section (info),
+				    frvfdpic_got_initial_offset (info)
+				    + entry->tlsoff_entry)
+				   + frvfdpic_got_section (info)
+				   ->output_section->vma
+				   + frvfdpic_got_section (info)
+				   ->output_offset,
+				   R_FRV_TLSOFF, idx, ad, entry);
+	}
+
+      bfd_put_32 (output_bfd, ad,
+		  frvfdpic_got_section (info)->contents
+		  + frvfdpic_got_initial_offset (info)
+		  + entry->tlsoff_entry);
+    }
+
+  if (entry->tlsdesc_entry)
+    {
+      int idx = dynindx;
+      bfd_vma ad = addend;
+
+      /* If the symbol is dynamic but binds locally, use
+	 section+offset.  */
+      if (sec && (entry->symndx != -1
+		  || FRVFDPIC_SYM_LOCAL (info, entry->d.h)))
+	{
+	  if (entry->symndx == -1)
+	    ad += entry->d.h->root.u.def.value;
+	  else
+	    ad += sym->st_value;
+	  ad += sec->output_offset;
+	  if (sec->output_section && elf_section_data (sec->output_section))
+	    idx = elf_section_data (sec->output_section)->dynindx;
+	  else
+	    idx = 0;
+	}
+
+      /* If we didn't set up a TLS offset entry, but we're linking an
+	 executable and the symbol binds locally, we can use the
+	 module offset in the TLS descriptor in relaxations.  */
+      if (info->executable && ! entry->tlsoff_entry)
+	entry->tlsoff_entry = entry->tlsdesc_entry + 4;
+
+      if (info->executable && !info->pie
+	  && ((idx == 0
+	       && (bfd_is_abs_section (sec)
+		   || bfd_is_und_section (sec)))
+	      || entry->symndx != -1
+	      || FRVFDPIC_SYM_LOCAL (info, entry->d.h)))
+	{
+	  /* *ABS*+addend is special for TLS relocations, use only the
+	     addend for the TLS offset, and take the module id as
+	     0.  */
+	  if (idx == 0
+	      && (bfd_is_abs_section (sec)
+		  || bfd_is_und_section (sec)))
+	    ;
+	  /* For other TLS symbols that bind locally, add the section
+	     TLS offset to the addend.  */
+	  else if (sec)
+	    ad += sec->output_section->vma - tls_biased_base (info);
+
+	  bfd_put_32 (output_bfd,
+		      frvfdpic_plt_section (info)->output_section->vma
+		      + frvfdpic_plt_section (info)->output_offset
+		      + frvfdpic_plt_tls_ret_offset (info),
+		      frvfdpic_got_section (info)->contents
+		      + frvfdpic_got_initial_offset (info)
+		      + entry->tlsdesc_entry);
+
+	  _frvfdpic_add_rofixup (output_bfd,
+				 frvfdpic_gotfixup_section (info),
+				 frvfdpic_got_section (info)
+				 ->output_section->vma
+				 + frvfdpic_got_section (info)
+				 ->output_offset
+				 + frvfdpic_got_initial_offset (info)
+				 + entry->tlsdesc_entry, entry);
+
+	  BFD_ASSERT (frvfdpic_dynamic_got_plt_info (info)->tls_ret_refs);
+
+	  /* We've used one of the reserved fixups, so discount it so
+	     that we can check at the end that we've used them
+	     all.  */
+	  frvfdpic_dynamic_got_plt_info (info)->tls_ret_refs--;
+
+	  /* While at that, make sure the ret instruction makes to the
+	     right location in the PLT.  We could do it only when we
+	     got to 0, but since the check at the end will only print
+	     a warning, make sure we have the ret in place in case the
+	     warning is missed.  */
+	  bfd_put_32 (output_bfd, 0xc03a4000,
+		      frvfdpic_plt_section (info)->contents
+		      + frvfdpic_plt_tls_ret_offset (info));
+	}
+      else
+	{
+	  if (idx == 0
+	      && (bfd_is_abs_section (sec)
+		  || bfd_is_und_section (sec)))
+	    {
+	      if (! elf_hash_table (info)->tls_sec)
+		{
+		  (*info->callbacks->undefined_symbol)
+		    (info, "TLS section", elf_hash_table (info)->dynobj,
+		     frvfdpic_got_section (info), entry->tlsdesc_entry, TRUE);
+		  return FALSE;
+		}
+	      idx = elf_section_data (elf_hash_table (info)->tls_sec)->dynindx;
+	      ad += FRVFDPIC_TLS_BIAS;
+	    }
+
+	  _frvfdpic_add_dyn_reloc (output_bfd, frvfdpic_gotrel_section (info),
+				   _bfd_elf_section_offset
+				   (output_bfd, info,
+				    frvfdpic_got_section (info),
+				    frvfdpic_got_initial_offset (info)
+				    + entry->tlsdesc_entry)
+				   + frvfdpic_got_section (info)
+				   ->output_section->vma
+				   + frvfdpic_got_section (info)
+				   ->output_offset,
+				   R_FRV_TLSDESC_VALUE, idx, ad, entry);
+
+	  bfd_put_32 (output_bfd, 0,
+		      frvfdpic_got_section (info)->contents
+		      + frvfdpic_got_initial_offset (info)
+		      + entry->tlsdesc_entry);
+	}
+
+      bfd_put_32 (output_bfd, ad,
+		  frvfdpic_got_section (info)->contents
+		  + frvfdpic_got_initial_offset (info)
+		  + entry->tlsdesc_entry + 4);
+    }
+
+  /* Generate code for the get-TLS-offset PLT entry.  */
+  if (entry->tlsplt_entry != (bfd_vma) -1)
+    {
+      bfd_byte *plt_code = frvfdpic_plt_section (info)->contents
+	+ entry->tlsplt_entry;
+
+      if (info->executable
+	  && (entry->symndx != -1
+	      || FRVFDPIC_SYM_LOCAL (info, entry->d.h)))
+	{
+	  int idx = dynindx;
+	  bfd_vma ad = addend;
+
+	  /* sec may be NULL when referencing an undefweak symbol
+	     while linking a static executable.  */
+	  if (!sec)
+	    {
+	      BFD_ASSERT (entry->symndx == -1
+			  && entry->d.h->root.type == bfd_link_hash_undefweak);
+	    }
+	  else
+	    {
+	      if (entry->symndx == -1)
+		ad += entry->d.h->root.u.def.value;
+	      else
+		ad += sym->st_value;
+	      ad += sec->output_offset;
+	      if (sec->output_section
+		  && elf_section_data (sec->output_section))
+		idx = elf_section_data (sec->output_section)->dynindx;
+	      else
+		idx = 0;
+	    }
+
+	  /* *ABS*+addend is special for TLS relocations, use only the
+	     addend for the TLS offset, and take the module id as
+	     0.  */
+	  if (idx == 0
+	      && (bfd_is_abs_section (sec)
+		  || bfd_is_und_section (sec)))
+	    ;
+	  /* For other TLS symbols that bind locally, add the section
+	     TLS offset to the addend.  */
+	  else if (sec)
+	    ad += sec->output_section->vma - tls_biased_base (info);
+
+	  if ((bfd_signed_vma)ad >= -(1 << (16 - 1))
+	      && (bfd_signed_vma)ad < (1 << (16 - 1)))
+	    {
+	      /* setlos lo(ad), gr9 */
+	      bfd_put_32 (output_bfd,
+			  0x92fc0000
+			  | (ad
+			     & (((bfd_vma)1 << 16) - 1)),
+			  plt_code);
+	      plt_code += 4;
+	    }
+	  else
+	    {
+	      /* sethi.p hi(ad), gr9
+		 setlo lo(ad), gr9 */
+	      bfd_put_32 (output_bfd,
+			  0x12f80000
+			  | ((ad >> 16)
+			     & (((bfd_vma)1 << 16) - 1)),
+			  plt_code);
+	      plt_code += 4;
+	      bfd_put_32 (output_bfd,
+			  0x92f40000
+			  | (ad
+			     & (((bfd_vma)1 << 16) - 1)),
+			  plt_code);
+	      plt_code += 4;
+	    }
+	  /* ret */
+	  bfd_put_32 (output_bfd, 0xc03a4000, plt_code);
+	}
+      else if (entry->tlsoff_entry)
+	{
+	  /* Figure out what kind of PLT entry we need, depending on the
+	     location of the TLS descriptor within the GOT.  */
+	  if (entry->tlsoff_entry >= -(1 << (12 - 1))
+	      && entry->tlsoff_entry < (1 << (12 - 1)))
+	    {
+	      /* ldi @(gr15, tlsoff_entry), gr9 */
+	      bfd_put_32 (output_bfd,
+			  0x92c8f000 | (entry->tlsoff_entry
+					& ((1 << 12) - 1)),
+			  plt_code);
+	      plt_code += 4;
+	    }
+	  else
+	    {
+	      if (entry->tlsoff_entry >= -(1 << (16 - 1))
+		  && entry->tlsoff_entry < (1 << (16 - 1)))
+		{
+		  /* setlos lo(tlsoff_entry), gr8 */
+		  bfd_put_32 (output_bfd,
+			      0x90fc0000
+			      | (entry->tlsoff_entry
+				 & (((bfd_vma)1 << 16) - 1)),
+			      plt_code);
+		  plt_code += 4;
+		}
+	      else
+		{
+		  /* sethi.p hi(tlsoff_entry), gr8
+		     setlo lo(tlsoff_entry), gr8 */
+		  bfd_put_32 (output_bfd,
+			      0x10f80000
+			      | ((entry->tlsoff_entry >> 16)
+				 & (((bfd_vma)1 << 16) - 1)),
+			      plt_code);
+		  plt_code += 4;
+		  bfd_put_32 (output_bfd,
+			      0x90f40000
+			      | (entry->tlsoff_entry
+				 & (((bfd_vma)1 << 16) - 1)),
+			      plt_code);
+		  plt_code += 4;
+		}
+	      /* ld @(gr15,gr8),gr9 */
+	      bfd_put_32 (output_bfd, 0x9008f108, plt_code);
+	      plt_code += 4;
+	    }
+	  /* ret */
+	  bfd_put_32 (output_bfd, 0xc03a4000, plt_code);
+	}
+      else
+	{
+	  BFD_ASSERT (entry->tlsdesc_entry);
+
+	  /* Figure out what kind of PLT entry we need, depending on the
+	     location of the TLS descriptor within the GOT.  */
+	  if (entry->tlsdesc_entry >= -(1 << (12 - 1))
+	      && entry->tlsdesc_entry < (1 << (12 - 1)))
+	    {
+	      /* lddi @(gr15, tlsdesc_entry), gr8 */
+	      bfd_put_32 (output_bfd,
+			  0x90ccf000 | (entry->tlsdesc_entry
+					& ((1 << 12) - 1)),
+			  plt_code);
+	      plt_code += 4;
+	    }
+	  else
+	    {
+	      if (entry->tlsdesc_entry >= -(1 << (16 - 1))
+		  && entry->tlsdesc_entry < (1 << (16 - 1)))
+		{
+		  /* setlos lo(tlsdesc_entry), gr8 */
+		  bfd_put_32 (output_bfd,
+			      0x90fc0000
+			      | (entry->tlsdesc_entry
+				 & (((bfd_vma)1 << 16) - 1)),
+			      plt_code);
+		  plt_code += 4;
+		}
+	      else
+		{
+		  /* sethi.p hi(tlsdesc_entry), gr8
+		     setlo lo(tlsdesc_entry), gr8 */
+		  bfd_put_32 (output_bfd,
+			      0x10f80000
+			      | ((entry->tlsdesc_entry >> 16)
+				 & (((bfd_vma)1 << 16) - 1)),
+			      plt_code);
+		  plt_code += 4;
+		  bfd_put_32 (output_bfd,
+			      0x90f40000
+			      | (entry->tlsdesc_entry
+				 & (((bfd_vma)1 << 16) - 1)),
+			      plt_code);
+		  plt_code += 4;
+		}
+	      /* ldd @(gr15,gr8),gr8 */
+	      bfd_put_32 (output_bfd, 0x9008f148, plt_code);
+	      plt_code += 4;
+	    }
+	  /* jmpl @(gr8,gr0) */
+	  bfd_put_32 (output_bfd, 0x80308000, plt_code);
+	}
+    }
+
+  return TRUE;
+}
+
+/* Handle an FRV small data reloc.  */
+
+static bfd_reloc_status_type
+elf32_frv_relocate_gprel12 (info, input_bfd, input_section, relocation,
+			    contents, value)
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     Elf_Internal_Rela *relocation;
+     bfd_byte *contents;
+     bfd_vma value;
+{
+  bfd_vma insn;
+  bfd_vma gp;
+  struct bfd_link_hash_entry *h;
+
+  h = bfd_link_hash_lookup (info->hash, "_gp", FALSE, FALSE, TRUE);
+
+  gp = (h->u.def.value
+	+ h->u.def.section->output_section->vma
+	+ h->u.def.section->output_offset);
+
+  value -= input_section->output_section->vma;
+  value -= (gp - input_section->output_section->vma);
+
+  insn = bfd_get_32 (input_bfd, contents + relocation->r_offset);
+
+  value += relocation->r_addend;
+
+  if ((long) value > 0x7ff || (long) value < -0x800)
+    return bfd_reloc_overflow;
+
+  bfd_put_32 (input_bfd,
+	      (insn & 0xfffff000) | (value & 0xfff),
+	      contents + relocation->r_offset);
+
+  return bfd_reloc_ok;
+}
+
+/* Handle an FRV small data reloc. for the u12 field.  */
+
+static bfd_reloc_status_type
+elf32_frv_relocate_gprelu12 (info, input_bfd, input_section, relocation,
+			     contents, value)
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     Elf_Internal_Rela *relocation;
+     bfd_byte *contents;
+     bfd_vma value;
+{
+  bfd_vma insn;
+  bfd_vma gp;
+  struct bfd_link_hash_entry *h;
+  bfd_vma mask;
+
+  h = bfd_link_hash_lookup (info->hash, "_gp", FALSE, FALSE, TRUE);
+
+  gp = (h->u.def.value
+	+ h->u.def.section->output_section->vma
+	+ h->u.def.section->output_offset);
+
+  value -= input_section->output_section->vma;
+  value -= (gp - input_section->output_section->vma);
+
+  insn = bfd_get_32 (input_bfd, contents + relocation->r_offset);
+
+  value += relocation->r_addend;
+
+  if ((long) value > 0x7ff || (long) value < -0x800)
+    return bfd_reloc_overflow;
+
+  /* The high 6 bits go into bits 17-12. The low 6 bits go into bits 5-0.  */
+  mask = 0x3f03f;
+  insn = (insn & ~mask) | ((value & 0xfc0) << 12) | (value & 0x3f);
+
+  bfd_put_32 (input_bfd, insn, contents + relocation->r_offset);
+
+  return bfd_reloc_ok;
+}
+
+/* Handle an FRV ELF HI16 reloc.  */
+
+static bfd_reloc_status_type
+elf32_frv_relocate_hi16 (input_bfd, relhi, contents, value)
+     bfd *input_bfd;
+     Elf_Internal_Rela *relhi;
+     bfd_byte *contents;
+     bfd_vma value;
+{
+  bfd_vma insn;
+
+  insn = bfd_get_32 (input_bfd, contents + relhi->r_offset);
+
+  value += relhi->r_addend;
+  value = ((value >> 16) & 0xffff);
+
+  insn = (insn & 0xffff0000) | value;
+
+  if ((long) value > 0xffff || (long) value < -0x10000)
+    return bfd_reloc_overflow;
+
+  bfd_put_32 (input_bfd, insn, contents + relhi->r_offset);
+  return bfd_reloc_ok;
+
+}
+static bfd_reloc_status_type
+elf32_frv_relocate_lo16 (input_bfd, rello, contents, value)
+     bfd *input_bfd;
+     Elf_Internal_Rela *rello;
+     bfd_byte *contents;
+     bfd_vma value;
+{
+  bfd_vma insn;
+
+  insn = bfd_get_32 (input_bfd, contents + rello->r_offset);
+
+  value += rello->r_addend;
+  value = value & 0xffff;
+
+  insn = (insn & 0xffff0000) | value;
+
+  if ((long) value > 0xffff || (long) value < -0x10000)
+    return bfd_reloc_overflow;
+
+  bfd_put_32 (input_bfd, insn, contents + rello->r_offset);
+  return bfd_reloc_ok;
+}
+
+/* Perform the relocation for the CALL label24 instruction.  */
+
+static bfd_reloc_status_type
+elf32_frv_relocate_label24 (input_bfd, input_section, rello, contents, value)
+     bfd *input_bfd;
+     asection *input_section;
+     Elf_Internal_Rela *rello;
+     bfd_byte *contents;
+     bfd_vma value;
+{
+  bfd_vma insn;
+  bfd_vma label6;
+  bfd_vma label18;
+
+  /* The format for the call instruction is:
+
+    0 000000 0001111 000000000000000000
+      label6 opcode  label18
+
+    The branch calculation is: pc + (4*label24)
+    where label24 is the concatenation of label6 and label18.  */
+
+  /* Grab the instruction.  */
+  insn = bfd_get_32 (input_bfd, contents + rello->r_offset);
+
+  value -= input_section->output_section->vma + input_section->output_offset;
+  value -= rello->r_offset;
+  value += rello->r_addend;
+
+  value = value >> 2;
+
+  label6  = value & 0xfc0000;
+  label6  = label6 << 7;
+
+  label18 = value & 0x3ffff;
+
+  insn = insn & 0x803c0000;
+  insn = insn | label6;
+  insn = insn | label18;
+
+  bfd_put_32 (input_bfd, insn, contents + rello->r_offset);
+
+  return bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type
+elf32_frv_relocate_gprelhi (info, input_bfd, input_section, relocation,
+			    contents, value)
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     Elf_Internal_Rela *relocation;
+     bfd_byte *contents;
+     bfd_vma value;
+{
+  bfd_vma insn;
+  bfd_vma gp;
+  struct bfd_link_hash_entry *h;
+
+  h = bfd_link_hash_lookup (info->hash, "_gp", FALSE, FALSE, TRUE);
+
+  gp = (h->u.def.value
+        + h->u.def.section->output_section->vma
+        + h->u.def.section->output_offset);
+
+  value -= input_section->output_section->vma;
+  value -= (gp - input_section->output_section->vma);
+  value += relocation->r_addend;
+  value = ((value >> 16) & 0xffff);
+
+  if ((long) value > 0xffff || (long) value < -0x10000)
+    return bfd_reloc_overflow;
+
+  insn = bfd_get_32 (input_bfd, contents + relocation->r_offset);
+  insn = (insn & 0xffff0000) | value;
+
+  bfd_put_32 (input_bfd, insn, contents + relocation->r_offset);
+  return bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type
+elf32_frv_relocate_gprello (info, input_bfd, input_section, relocation,
+			    contents, value)
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     Elf_Internal_Rela *relocation;
+     bfd_byte *contents;
+     bfd_vma value;
+{
+  bfd_vma insn;
+  bfd_vma gp;
+  struct bfd_link_hash_entry *h;
+
+  h = bfd_link_hash_lookup (info->hash, "_gp", FALSE, FALSE, TRUE);
+
+  gp = (h->u.def.value
+        + h->u.def.section->output_section->vma
+        + h->u.def.section->output_offset);
+
+  value -= input_section->output_section->vma;
+  value -= (gp - input_section->output_section->vma);
+  value += relocation->r_addend;
+  value = value & 0xffff;
+
+  if ((long) value > 0xffff || (long) value < -0x10000)
+    return bfd_reloc_overflow;
+
+  insn = bfd_get_32 (input_bfd, contents + relocation->r_offset);
+  insn = (insn & 0xffff0000) | value;
+
+  bfd_put_32 (input_bfd, insn, contents + relocation->r_offset);
+
+ return bfd_reloc_ok;
+}
+
+static reloc_howto_type *
+frv_reloc_type_lookup (abfd, code)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     bfd_reloc_code_real_type code;
+{
+  switch (code)
+    {
+    default:
+      break;
+
+    case BFD_RELOC_NONE:
+      return &elf32_frv_howto_table[ (int) R_FRV_NONE];
+
+    case BFD_RELOC_32:
+      if (elf_elfheader (abfd)->e_type == ET_EXEC
+	  || elf_elfheader (abfd)->e_type == ET_DYN)
+	return &elf32_frv_rel_32_howto;
+      /* Fall through.  */
+    case BFD_RELOC_CTOR:
+      return &elf32_frv_howto_table[ (int) R_FRV_32];
+
+    case BFD_RELOC_FRV_LABEL16:
+      return &elf32_frv_howto_table[ (int) R_FRV_LABEL16];
+
+    case BFD_RELOC_FRV_LABEL24:
+      return &elf32_frv_howto_table[ (int) R_FRV_LABEL24];
+
+    case BFD_RELOC_FRV_LO16:
+      return &elf32_frv_howto_table[ (int) R_FRV_LO16];
+
+    case BFD_RELOC_FRV_HI16:
+      return &elf32_frv_howto_table[ (int) R_FRV_HI16];
+
+    case BFD_RELOC_FRV_GPREL12:
+      return &elf32_frv_howto_table[ (int) R_FRV_GPREL12];
+
+    case BFD_RELOC_FRV_GPRELU12:
+      return &elf32_frv_howto_table[ (int) R_FRV_GPRELU12];
+
+    case BFD_RELOC_FRV_GPREL32:
+      return &elf32_frv_howto_table[ (int) R_FRV_GPREL32];
+
+    case BFD_RELOC_FRV_GPRELHI:
+      return &elf32_frv_howto_table[ (int) R_FRV_GPRELHI];
+
+    case BFD_RELOC_FRV_GPRELLO:
+      return &elf32_frv_howto_table[ (int) R_FRV_GPRELLO];
+
+    case BFD_RELOC_FRV_GOT12:
+      return &elf32_frv_howto_table[ (int) R_FRV_GOT12];
+
+    case BFD_RELOC_FRV_GOTHI:
+      return &elf32_frv_howto_table[ (int) R_FRV_GOTHI];
+
+    case BFD_RELOC_FRV_GOTLO:
+      return &elf32_frv_howto_table[ (int) R_FRV_GOTLO];
+
+    case BFD_RELOC_FRV_FUNCDESC:
+      if (elf_elfheader (abfd)->e_type == ET_EXEC
+	  || elf_elfheader (abfd)->e_type == ET_DYN)
+	return &elf32_frv_rel_funcdesc_howto;
+      return &elf32_frv_howto_table[ (int) R_FRV_FUNCDESC];
+
+    case BFD_RELOC_FRV_FUNCDESC_GOT12:
+      return &elf32_frv_howto_table[ (int) R_FRV_FUNCDESC_GOT12];
+
+    case BFD_RELOC_FRV_FUNCDESC_GOTHI:
+      return &elf32_frv_howto_table[ (int) R_FRV_FUNCDESC_GOTHI];
+
+    case BFD_RELOC_FRV_FUNCDESC_GOTLO:
+      return &elf32_frv_howto_table[ (int) R_FRV_FUNCDESC_GOTLO];
+
+    case BFD_RELOC_FRV_FUNCDESC_VALUE:
+      if (elf_elfheader (abfd)->e_type == ET_EXEC
+	  || elf_elfheader (abfd)->e_type == ET_DYN)
+	return &elf32_frv_rel_funcdesc_value_howto;
+      return &elf32_frv_howto_table[ (int) R_FRV_FUNCDESC_VALUE];
+
+    case BFD_RELOC_FRV_FUNCDESC_GOTOFF12:
+      return &elf32_frv_howto_table[ (int) R_FRV_FUNCDESC_GOTOFF12];
+
+    case BFD_RELOC_FRV_FUNCDESC_GOTOFFHI:
+      return &elf32_frv_howto_table[ (int) R_FRV_FUNCDESC_GOTOFFHI];
+
+    case BFD_RELOC_FRV_FUNCDESC_GOTOFFLO:
+      return &elf32_frv_howto_table[ (int) R_FRV_FUNCDESC_GOTOFFLO];
+
+    case BFD_RELOC_FRV_GOTOFF12:
+      return &elf32_frv_howto_table[ (int) R_FRV_GOTOFF12];
+
+    case BFD_RELOC_FRV_GOTOFFHI:
+      return &elf32_frv_howto_table[ (int) R_FRV_GOTOFFHI];
+
+    case BFD_RELOC_FRV_GOTOFFLO:
+      return &elf32_frv_howto_table[ (int) R_FRV_GOTOFFLO];
+
+    case BFD_RELOC_FRV_GETTLSOFF:
+      return &elf32_frv_howto_table[ (int) R_FRV_GETTLSOFF];
+
+    case BFD_RELOC_FRV_TLSDESC_VALUE:
+      if (elf_elfheader (abfd)->e_type == ET_EXEC
+	  || elf_elfheader (abfd)->e_type == ET_DYN)
+	return &elf32_frv_rel_tlsdesc_value_howto;
+      return &elf32_frv_howto_table[ (int) R_FRV_TLSDESC_VALUE];
+
+    case BFD_RELOC_FRV_GOTTLSDESC12:
+      return &elf32_frv_howto_table[ (int) R_FRV_GOTTLSDESC12];
+
+    case BFD_RELOC_FRV_GOTTLSDESCHI:
+      return &elf32_frv_howto_table[ (int) R_FRV_GOTTLSDESCHI];
+
+    case BFD_RELOC_FRV_GOTTLSDESCLO:
+      return &elf32_frv_howto_table[ (int) R_FRV_GOTTLSDESCLO];
+
+    case BFD_RELOC_FRV_TLSMOFF12:
+      return &elf32_frv_howto_table[ (int) R_FRV_TLSMOFF12];
+
+    case BFD_RELOC_FRV_TLSMOFFHI:
+      return &elf32_frv_howto_table[ (int) R_FRV_TLSMOFFHI];
+
+    case BFD_RELOC_FRV_TLSMOFFLO:
+      return &elf32_frv_howto_table[ (int) R_FRV_TLSMOFFLO];
+
+    case BFD_RELOC_FRV_GOTTLSOFF12:
+      return &elf32_frv_howto_table[ (int) R_FRV_GOTTLSOFF12];
+
+    case BFD_RELOC_FRV_GOTTLSOFFHI:
+      return &elf32_frv_howto_table[ (int) R_FRV_GOTTLSOFFHI];
+
+    case BFD_RELOC_FRV_GOTTLSOFFLO:
+      return &elf32_frv_howto_table[ (int) R_FRV_GOTTLSOFFLO];
+
+    case BFD_RELOC_FRV_TLSOFF:
+      if (elf_elfheader (abfd)->e_type == ET_EXEC
+	  || elf_elfheader (abfd)->e_type == ET_DYN)
+	return &elf32_frv_rel_tlsoff_howto;
+      return &elf32_frv_howto_table[ (int) R_FRV_TLSOFF];
+
+    case BFD_RELOC_FRV_TLSDESC_RELAX:
+      return &elf32_frv_howto_table[ (int) R_FRV_TLSDESC_RELAX];
+
+    case BFD_RELOC_FRV_GETTLSOFF_RELAX:
+      return &elf32_frv_howto_table[ (int) R_FRV_GETTLSOFF_RELAX];
+
+    case BFD_RELOC_FRV_TLSOFF_RELAX:
+      return &elf32_frv_howto_table[ (int) R_FRV_TLSOFF_RELAX];
+
+    case BFD_RELOC_FRV_TLSMOFF:
+      return &elf32_frv_howto_table[ (int) R_FRV_TLSMOFF];
+
+    case BFD_RELOC_VTABLE_INHERIT:
+      return &elf32_frv_vtinherit_howto;
+
+    case BFD_RELOC_VTABLE_ENTRY:
+      return &elf32_frv_vtentry_howto;
+    }
+
+  return NULL;
+}
+
+static reloc_howto_type *
+frv_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (elf32_frv_howto_table) / sizeof (elf32_frv_howto_table[0]);
+       i++)
+    if (elf32_frv_howto_table[i].name != NULL
+	&& strcasecmp (elf32_frv_howto_table[i].name, r_name) == 0)
+      return &elf32_frv_howto_table[i];
+
+  if (strcasecmp (elf32_frv_vtinherit_howto.name, r_name) == 0)
+    return &elf32_frv_vtinherit_howto;
+  if (strcasecmp (elf32_frv_vtentry_howto.name, r_name) == 0)
+    return &elf32_frv_vtentry_howto;
+
+  return NULL;
+}
+
+/* Set the howto pointer for an FRV ELF reloc.  */
+
+static void
+frv_info_to_howto_rela (abfd, cache_ptr, dst)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *cache_ptr;
+     Elf_Internal_Rela *dst;
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  switch (r_type)
+    {
+    case R_FRV_GNU_VTINHERIT:
+      cache_ptr->howto = &elf32_frv_vtinherit_howto;
+      break;
+
+    case R_FRV_GNU_VTENTRY:
+      cache_ptr->howto = &elf32_frv_vtentry_howto;
+      break;
+
+    default:
+      cache_ptr->howto = & elf32_frv_howto_table [r_type];
+      break;
+    }
+}
+
+/* Set the howto pointer for an FRV ELF REL reloc.  */
+static void
+frvfdpic_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+			    arelent *cache_ptr, Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  switch (r_type)
+    {
+    case R_FRV_32:
+      cache_ptr->howto = &elf32_frv_rel_32_howto;
+      break;
+
+    case R_FRV_FUNCDESC:
+      cache_ptr->howto = &elf32_frv_rel_funcdesc_howto;
+      break;
+
+    case R_FRV_FUNCDESC_VALUE:
+      cache_ptr->howto = &elf32_frv_rel_funcdesc_value_howto;
+      break;
+
+    case R_FRV_TLSDESC_VALUE:
+      cache_ptr->howto = &elf32_frv_rel_tlsdesc_value_howto;
+      break;
+
+    case R_FRV_TLSOFF:
+      cache_ptr->howto = &elf32_frv_rel_tlsoff_howto;
+      break;
+
+    default:
+      cache_ptr->howto = NULL;
+      break;
+    }
+}
+
+/* Perform a single relocation.  By default we use the standard BFD
+   routines, but a few relocs, we have to do them ourselves.  */
+
+static bfd_reloc_status_type
+frv_final_link_relocate (howto, input_bfd, input_section, contents, rel,
+			 relocation)
+     reloc_howto_type *howto;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     Elf_Internal_Rela *rel;
+     bfd_vma relocation;
+{
+  return _bfd_final_link_relocate (howto, input_bfd, input_section,
+				   contents, rel->r_offset, relocation,
+				   rel->r_addend);
+}
+
+
+/* Relocate an FRV ELF section.
+
+   The RELOCATE_SECTION function is called by the new ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures; if the section
+   actually uses Rel structures, the r_addend field will always be
+   zero.
+
+   This function is responsible for adjusting the section contents as
+   necessary, and (if using Rela relocs and generating a relocatable
+   output file) adjusting the reloc addend as necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.  */
+
+static bfd_boolean
+elf32_frv_relocate_section (output_bfd, info, input_bfd, input_section,
+			    contents, relocs, local_syms, local_sections)
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     Elf_Internal_Rela *relocs;
+     Elf_Internal_Sym *local_syms;
+     asection **local_sections;
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  unsigned isec_segment, got_segment, plt_segment, gprel_segment, tls_segment,
+    check_segment[2];
+  int silence_segment_error = !(info->shared || info->pie);
+  unsigned long insn;
+
+  symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+  relend     = relocs + input_section->reloc_count;
+
+  isec_segment = _frvfdpic_osec_to_segment (output_bfd,
+					    input_section->output_section);
+  if (IS_FDPIC (output_bfd) && frvfdpic_got_section (info))
+    got_segment = _frvfdpic_osec_to_segment (output_bfd,
+					     frvfdpic_got_section (info)
+					     ->output_section);
+  else
+    got_segment = -1;
+  if (IS_FDPIC (output_bfd) && frvfdpic_gotfixup_section (info))
+    gprel_segment = _frvfdpic_osec_to_segment (output_bfd,
+					       frvfdpic_gotfixup_section (info)
+					       ->output_section);
+  else
+    gprel_segment = -1;
+  if (IS_FDPIC (output_bfd) && frvfdpic_plt_section (info))
+    plt_segment = _frvfdpic_osec_to_segment (output_bfd,
+					     frvfdpic_plt_section (info)
+					     ->output_section);
+  else
+    plt_segment = -1;
+  if (elf_hash_table (info)->tls_sec)
+    tls_segment = _frvfdpic_osec_to_segment (output_bfd,
+					     elf_hash_table (info)->tls_sec);
+  else
+    tls_segment = -1;
+
+  for (rel = relocs; rel < relend; rel ++)
+    {
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+      const char *name;
+      int r_type;
+      asection *osec;
+      struct frvfdpic_relocs_info *picrel;
+      bfd_vma orig_addend = rel->r_addend;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      if (   r_type == R_FRV_GNU_VTINHERIT
+	  || r_type == R_FRV_GNU_VTENTRY)
+	continue;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      howto  = elf32_frv_howto_table + ELF32_R_TYPE (rel->r_info);
+      h      = NULL;
+      sym    = NULL;
+      sec    = NULL;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  osec = sec = local_sections [r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+
+	  name = bfd_elf_string_from_elf_section
+	    (input_bfd, symtab_hdr->sh_link, sym->st_name);
+	  if (name == NULL || name[0] == 0)
+	    name = bfd_section_name (input_bfd, sec);
+	}
+      else
+	{
+	  bfd_boolean warned;
+	  bfd_boolean unresolved_reloc;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	  osec = sec;
+	  name = h->root.root.string;
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      if (r_type != R_FRV_TLSMOFF
+	  && h != NULL
+	  && (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	  && !FRVFDPIC_SYM_LOCAL (info, h))
+	{
+	  osec = sec = NULL;
+	  relocation = 0;
+	}
+
+      switch (r_type)
+	{
+	case R_FRV_LABEL24:
+	case R_FRV_32:
+	  if (! IS_FDPIC (output_bfd))
+	    goto non_fdpic;
+
+	case R_FRV_GOT12:
+	case R_FRV_GOTHI:
+	case R_FRV_GOTLO:
+	case R_FRV_FUNCDESC_GOT12:
+	case R_FRV_FUNCDESC_GOTHI:
+	case R_FRV_FUNCDESC_GOTLO:
+	case R_FRV_GOTOFF12:
+	case R_FRV_GOTOFFHI:
+	case R_FRV_GOTOFFLO:
+	case R_FRV_FUNCDESC_GOTOFF12:
+	case R_FRV_FUNCDESC_GOTOFFHI:
+	case R_FRV_FUNCDESC_GOTOFFLO:
+	case R_FRV_FUNCDESC:
+	case R_FRV_FUNCDESC_VALUE:
+	case R_FRV_GETTLSOFF:
+	case R_FRV_TLSDESC_VALUE:
+	case R_FRV_GOTTLSDESC12:
+	case R_FRV_GOTTLSDESCHI:
+	case R_FRV_GOTTLSDESCLO:
+	case R_FRV_TLSMOFF12:
+	case R_FRV_TLSMOFFHI:
+	case R_FRV_TLSMOFFLO:
+	case R_FRV_GOTTLSOFF12:
+	case R_FRV_GOTTLSOFFHI:
+	case R_FRV_GOTTLSOFFLO:
+	case R_FRV_TLSOFF:
+	case R_FRV_TLSDESC_RELAX:
+	case R_FRV_GETTLSOFF_RELAX:
+	case R_FRV_TLSOFF_RELAX:
+	case R_FRV_TLSMOFF:
+	  if (h != NULL)
+	    picrel = frvfdpic_relocs_info_for_global (frvfdpic_relocs_info
+						      (info), input_bfd, h,
+						      orig_addend, INSERT);
+	  else
+	    /* In order to find the entry we created before, we must
+	       use the original addend, not the one that may have been
+	       modified by _bfd_elf_rela_local_sym().  */
+	    picrel = frvfdpic_relocs_info_for_local (frvfdpic_relocs_info
+						     (info), input_bfd, r_symndx,
+						     orig_addend, INSERT);
+	  if (! picrel)
+	    return FALSE;
+
+	  if (!_frvfdpic_emit_got_relocs_plt_entries (picrel, output_bfd, info,
+						      osec, sym,
+						      rel->r_addend))
+	    {
+	      info->callbacks->einfo
+		(_("%H: relocation to `%s+%v'"
+		   " may have caused the error above\n"),
+		 input_bfd, input_section, rel->r_offset, name, rel->r_addend);
+	      return FALSE;
+	    }
+
+	  break;
+
+	default:
+	non_fdpic:
+	  picrel = NULL;
+	  if (h && ! FRVFDPIC_SYM_LOCAL (info, h))
+	    {
+	      info->callbacks->einfo
+		(_("%H: relocation references symbol"
+		   " not defined in the module\n"),
+		 input_bfd, input_section, rel->r_offset);
+	      return FALSE;
+	    }
+	  break;
+	}
+
+      switch (r_type)
+	{
+	case R_FRV_GETTLSOFF:
+	case R_FRV_TLSDESC_VALUE:
+	case R_FRV_GOTTLSDESC12:
+	case R_FRV_GOTTLSDESCHI:
+	case R_FRV_GOTTLSDESCLO:
+	case R_FRV_TLSMOFF12:
+	case R_FRV_TLSMOFFHI:
+	case R_FRV_TLSMOFFLO:
+	case R_FRV_GOTTLSOFF12:
+	case R_FRV_GOTTLSOFFHI:
+	case R_FRV_GOTTLSOFFLO:
+	case R_FRV_TLSOFF:
+	case R_FRV_TLSDESC_RELAX:
+	case R_FRV_GETTLSOFF_RELAX:
+	case R_FRV_TLSOFF_RELAX:
+	case R_FRV_TLSMOFF:
+	  if (sec && (bfd_is_abs_section (sec) || bfd_is_und_section (sec)))
+	    relocation += tls_biased_base (info);
+	  break;
+
+	default:
+	  break;
+	}
+
+      /* Try to apply TLS relaxations.  */
+      if (1)
+	switch (r_type)
+	  {
+
+#define LOCAL_EXEC_P(info, picrel) \
+  ((info)->executable \
+   && (picrel->symndx != -1 || FRVFDPIC_SYM_LOCAL ((info), (picrel)->d.h)))
+#define INITIAL_EXEC_P(info, picrel) \
+  (((info)->executable || (info)->flags & DF_STATIC_TLS) \
+   && (picrel)->tlsoff_entry)
+
+#define IN_RANGE_FOR_OFST12_P(value) \
+  ((bfd_vma)((value) + 2048) < (bfd_vma)4096)
+#define IN_RANGE_FOR_SETLOS_P(value) \
+  ((bfd_vma)((value) + 32768) < (bfd_vma)65536)
+#define TLSMOFF_IN_RANGE_FOR_SETLOS_P(value, info) \
+  (IN_RANGE_FOR_SETLOS_P ((value) - tls_biased_base (info)))
+
+#define RELAX_GETTLSOFF_LOCAL_EXEC_P(info, picrel, value) \
+  (LOCAL_EXEC_P ((info), (picrel)) \
+   && TLSMOFF_IN_RANGE_FOR_SETLOS_P((value), (info)))
+#define RELAX_GETTLSOFF_INITIAL_EXEC_P(info, picrel) \
+  (INITIAL_EXEC_P ((info), (picrel)) \
+   && IN_RANGE_FOR_OFST12_P ((picrel)->tlsoff_entry))
+
+#define RELAX_TLSDESC_LOCAL_EXEC_P(info, picrel, value) \
+  (LOCAL_EXEC_P ((info), (picrel)))
+#define RELAX_TLSDESC_INITIAL_EXEC_P(info, picrel) \
+  (INITIAL_EXEC_P ((info), (picrel)))
+
+#define RELAX_GOTTLSOFF_LOCAL_EXEC_P(info, picrel, value) \
+  (LOCAL_EXEC_P ((info), (picrel)) \
+   && TLSMOFF_IN_RANGE_FOR_SETLOS_P((value), (info)))
+
+	  case R_FRV_GETTLSOFF:
+	    insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+
+	    /* Is this a call instruction?  */
+	    if ((insn & (unsigned long)0x01fc0000) != 0x003c0000)
+	      {
+		info->callbacks->einfo
+		  (_("%H: R_FRV_GETTLSOFF not applied to a call instruction\n"),
+		   input_bfd, input_section, rel->r_offset);
+		return FALSE;
+	      }
+
+	    if (RELAX_GETTLSOFF_LOCAL_EXEC_P (info, picrel,
+					      relocation + rel->r_addend))
+	      {
+		/* Replace the call instruction (except the packing bit)
+		   with setlos #tlsmofflo(symbol+offset), gr9.  */
+		insn &= (unsigned long)0x80000000;
+		insn |= (unsigned long)0x12fc0000;
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+
+		r_type = R_FRV_TLSMOFFLO;
+		howto  = elf32_frv_howto_table + r_type;
+		rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+	      }
+
+	    else if (RELAX_GETTLSOFF_INITIAL_EXEC_P (info, picrel))
+	      {
+		/* Replace the call instruction (except the packing bit)
+		   with ldi @(gr15, #gottlsoff12(symbol+addend)), gr9.  */
+		insn &= (unsigned long)0x80000000;
+		insn |= (unsigned long)0x12c8f000;
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+
+		r_type = R_FRV_GOTTLSOFF12;
+		howto  = elf32_frv_howto_table + r_type;
+		rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+	      }
+
+	    break;
+
+	  case R_FRV_GOTTLSDESC12:
+	    insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+
+	    /* Is this an lddi instruction?  */
+	    if ((insn & (unsigned long)0x01fc0000) != 0x00cc0000)
+	      {
+		info->callbacks->einfo
+		  (_("%H: R_FRV_GOTTLSDESC12"
+		     " not applied to an lddi instruction\n"),
+		   input_bfd, input_section, rel->r_offset);
+		return FALSE;
+	      }
+
+	    if (RELAX_TLSDESC_LOCAL_EXEC_P (info, picrel,
+					    relocation + rel->r_addend)
+		&& TLSMOFF_IN_RANGE_FOR_SETLOS_P (relocation + rel->r_addend,
+						  info))
+	      {
+		/* Replace lddi @(grB, #gottlsdesc12(symbol+offset), grC
+		   with setlos #tlsmofflo(symbol+offset), gr<C+1>.
+		   Preserve the packing bit.  */
+		insn = (insn & (unsigned long)0x80000000)
+		  | ((insn + (unsigned long)0x02000000)
+		     & (unsigned long)0x7e000000);
+		insn |= (unsigned long)0x00fc0000;
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+
+		r_type = R_FRV_TLSMOFFLO;
+		howto  = elf32_frv_howto_table + r_type;
+		rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+	      }
+
+	    else if (RELAX_TLSDESC_LOCAL_EXEC_P (info, picrel,
+						 relocation + rel->r_addend))
+	      {
+		/* Replace lddi @(grB, #gottlsdesc12(symbol+offset), grC
+		   with sethi #tlsmoffhi(symbol+offset), gr<C+1>.
+		   Preserve the packing bit.  */
+		insn = (insn & (unsigned long)0x80000000)
+		  | ((insn + (unsigned long)0x02000000)
+		     & (unsigned long)0x7e000000);
+		insn |= (unsigned long)0x00f80000;
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+
+		r_type = R_FRV_TLSMOFFHI;
+		howto  = elf32_frv_howto_table + r_type;
+		rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+	      }
+
+	    else if (RELAX_TLSDESC_INITIAL_EXEC_P (info, picrel))
+	      {
+		/* Replace lddi @(grB, #gottlsdesc12(symbol+offset), grC
+		   with ldi @(grB, #gottlsoff12(symbol+offset),
+		   gr<C+1>.  Preserve the packing bit.  If gottlsoff12
+		   overflows, we'll error out, but that's sort-of ok,
+		   since we'd started with gottlsdesc12, that's actually
+		   more demanding.  Compiling with -fPIE instead of
+		   -fpie would fix it; linking with --relax should fix
+		   it as well.  */
+		insn = (insn & (unsigned long)0x80cbf000)
+		  | ((insn + (unsigned long)0x02000000)
+		     & (unsigned long)0x7e000000);
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+
+		r_type = R_FRV_GOTTLSOFF12;
+		howto  = elf32_frv_howto_table + r_type;
+		rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+	      }
+
+	    break;
+
+	  case R_FRV_GOTTLSDESCHI:
+	    insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+
+	    /* Is this a sethi instruction?  */
+	    if ((insn & (unsigned long)0x01ff0000) != 0x00f80000)
+	      {
+		info->callbacks->einfo
+		  (_("%H: R_FRV_GOTTLSDESCHI"
+		     " not applied to a sethi instruction\n"),
+		   input_bfd, input_section, rel->r_offset);
+		return FALSE;
+	      }
+
+	    if (RELAX_TLSDESC_LOCAL_EXEC_P (info, picrel,
+					    relocation + rel->r_addend)
+		|| (RELAX_TLSDESC_INITIAL_EXEC_P (info, picrel)
+		    && IN_RANGE_FOR_SETLOS_P (picrel->tlsoff_entry)))
+	      {
+		/* Replace sethi with a nop.  Preserve the packing bit.  */
+		insn &= (unsigned long)0x80000000;
+		insn |= (unsigned long)0x00880000;
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+
+		/* Nothing to relocate.  */
+		continue;
+	      }
+
+	    else if (RELAX_TLSDESC_INITIAL_EXEC_P (info, picrel))
+	      {
+		/* Simply decay GOTTLSDESC to GOTTLSOFF.  */
+		r_type = R_FRV_GOTTLSOFFHI;
+		howto  = elf32_frv_howto_table + r_type;
+		rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+	      }
+
+	    break;
+
+	  case R_FRV_GOTTLSDESCLO:
+	    insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+
+	    /* Is this a setlo or setlos instruction?  */
+	    if ((insn & (unsigned long)0x01f70000) != 0x00f40000)
+	      {
+		info->callbacks->einfo
+		  (_("%H: R_FRV_GOTTLSDESCLO"
+		     " not applied to a setlo or setlos instruction\n"),
+		   input_bfd, input_section, rel->r_offset);
+		return FALSE;
+	      }
+
+	    if (RELAX_TLSDESC_LOCAL_EXEC_P (info, picrel,
+					    relocation + rel->r_addend)
+		|| (RELAX_TLSDESC_INITIAL_EXEC_P (info, picrel)
+		    && IN_RANGE_FOR_OFST12_P (picrel->tlsoff_entry)))
+	      {
+		/* Replace setlo/setlos with a nop.  Preserve the
+		   packing bit.  */
+		insn &= (unsigned long)0x80000000;
+		insn |= (unsigned long)0x00880000;
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+
+		/* Nothing to relocate.  */
+		continue;
+	      }
+
+	    else if (RELAX_TLSDESC_INITIAL_EXEC_P (info, picrel))
+	      {
+		/* If the corresponding sethi (if it exists) decayed
+		   to a nop, make sure this becomes (or already is) a
+		   setlos, not setlo.  */
+		if (IN_RANGE_FOR_SETLOS_P (picrel->tlsoff_entry))
+		  {
+		    insn |= (unsigned long)0x00080000;
+		    bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+		  }
+
+		/* Simply decay GOTTLSDESC to GOTTLSOFF.  */
+		r_type = R_FRV_GOTTLSOFFLO;
+		howto  = elf32_frv_howto_table + r_type;
+		rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+	      }
+
+	    break;
+
+	  case R_FRV_TLSDESC_RELAX:
+	    insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+
+	    /* Is this an ldd instruction?  */
+	    if ((insn & (unsigned long)0x01fc0fc0) != 0x00080140)
+	      {
+		info->callbacks->einfo
+		  (_("%H: R_FRV_TLSDESC_RELAX"
+		     " not applied to an ldd instruction\n"),
+		   input_bfd, input_section, rel->r_offset);
+		return FALSE;
+	      }
+
+	    if (RELAX_TLSDESC_LOCAL_EXEC_P (info, picrel,
+					    relocation + rel->r_addend)
+		&& TLSMOFF_IN_RANGE_FOR_SETLOS_P (relocation + rel->r_addend,
+						  info))
+	      {
+		/* Replace ldd #tlsdesc(symbol+offset)@(grB, grA), grC
+		   with setlos #tlsmofflo(symbol+offset), gr<C+1>.
+		   Preserve the packing bit.  */
+		insn = (insn & (unsigned long)0x80000000)
+		  | ((insn + (unsigned long)0x02000000)
+		     & (unsigned long)0x7e000000);
+		insn |= (unsigned long)0x00fc0000;
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+
+		r_type = R_FRV_TLSMOFFLO;
+		howto  = elf32_frv_howto_table + r_type;
+		rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+	      }
+
+	    else if (RELAX_TLSDESC_LOCAL_EXEC_P (info, picrel,
+						 relocation + rel->r_addend))
+	      {
+		/* Replace ldd #tlsdesc(symbol+offset)@(grB, grA), grC
+		   with sethi #tlsmoffhi(symbol+offset), gr<C+1>.
+		   Preserve the packing bit.  */
+		insn = (insn & (unsigned long)0x80000000)
+		  | ((insn + (unsigned long)0x02000000)
+		     & (unsigned long)0x7e000000);
+		insn |= (unsigned long)0x00f80000;
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+
+		r_type = R_FRV_TLSMOFFHI;
+		howto  = elf32_frv_howto_table + r_type;
+		rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+	      }
+
+	    else if (RELAX_TLSDESC_INITIAL_EXEC_P (info, picrel)
+		     && IN_RANGE_FOR_OFST12_P (picrel->tlsoff_entry))
+	      {
+		/* Replace ldd #tlsdesc(symbol+offset)@(grB, grA), grC
+		   with ldi @(grB, #gottlsoff12(symbol+offset), gr<C+1>.
+		   Preserve the packing bit.  */
+		insn = (insn & (unsigned long)0x8003f000)
+		  | (unsigned long)0x00c80000
+		  | ((insn + (unsigned long)0x02000000)
+		     & (unsigned long)0x7e000000);
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+
+		r_type = R_FRV_GOTTLSOFF12;
+		howto  = elf32_frv_howto_table + r_type;
+		rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+	      }
+
+	    else if (RELAX_TLSDESC_INITIAL_EXEC_P (info, picrel))
+	      {
+		/* Replace ldd #tlsdesc(symbol+offset)@(grB, grA), grC
+		   with ld #tlsoff(symbol+offset)@(grB, grA), gr<C+1>.
+		   Preserve the packing bit.  */
+		insn = (insn & (unsigned long)0x81ffffbf)
+		  | ((insn + (unsigned long)0x02000000)
+		     & (unsigned long)0x7e000000);
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+
+		/* #tlsoff(symbol+offset) is just a relaxation
+                    annotation, so there's nothing left to
+                    relocate.  */
+		continue;
+	      }
+
+	    break;
+
+	  case R_FRV_GETTLSOFF_RELAX:
+	    insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+
+	    /* Is this a calll or callil instruction?  */
+	    if ((insn & (unsigned long)0x7ff80fc0) != 0x02300000)
+	      {
+		info->callbacks->einfo
+		  (_("%H: R_FRV_GETTLSOFF_RELAX"
+		     " not applied to a calll instruction\n"),
+		   input_bfd, input_section, rel->r_offset);
+		return FALSE;
+	      }
+
+	    if (RELAX_TLSDESC_LOCAL_EXEC_P (info, picrel,
+					    relocation + rel->r_addend)
+		&& TLSMOFF_IN_RANGE_FOR_SETLOS_P (relocation + rel->r_addend,
+						  info))
+	      {
+		/* Replace calll with a nop.  Preserve the packing bit.  */
+		insn &= (unsigned long)0x80000000;
+		insn |= (unsigned long)0x00880000;
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+
+		/* Nothing to relocate.  */
+		continue;
+	      }
+
+	    else if (RELAX_TLSDESC_LOCAL_EXEC_P (info, picrel,
+						 relocation + rel->r_addend))
+	      {
+		/* Replace calll with setlo #tlsmofflo(symbol+offset), gr9.
+		   Preserve the packing bit.  */
+		insn &= (unsigned long)0x80000000;
+		insn |= (unsigned long)0x12f40000;
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+
+		r_type = R_FRV_TLSMOFFLO;
+		howto  = elf32_frv_howto_table + r_type;
+		rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+	      }
+
+	    else if (RELAX_TLSDESC_INITIAL_EXEC_P (info, picrel))
+	      {
+		/* Replace calll with a nop.  Preserve the packing bit.  */
+		insn &= (unsigned long)0x80000000;
+		insn |= (unsigned long)0x00880000;
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+
+		/* Nothing to relocate.  */
+		continue;
+	      }
+
+	    break;
+
+	  case R_FRV_GOTTLSOFF12:
+	    insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+
+	    /* Is this an ldi instruction?  */
+	    if ((insn & (unsigned long)0x01fc0000) != 0x00c80000)
+	      {
+		info->callbacks->einfo
+		  (_("%H: R_FRV_GOTTLSOFF12"
+		     " not applied to an ldi instruction\n"),
+		   input_bfd, input_section, rel->r_offset);
+		return FALSE;
+	      }
+
+	    if (RELAX_GOTTLSOFF_LOCAL_EXEC_P (info, picrel,
+					      relocation + rel->r_addend))
+	      {
+		/* Replace ldi @(grB, #gottlsoff12(symbol+offset), grC
+		   with setlos #tlsmofflo(symbol+offset), grC.
+		   Preserve the packing bit.  */
+		insn &= (unsigned long)0xfe000000;
+		insn |= (unsigned long)0x00fc0000;
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+
+		r_type = R_FRV_TLSMOFFLO;
+		howto  = elf32_frv_howto_table + r_type;
+		rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+	      }
+
+	    break;
+
+	  case R_FRV_GOTTLSOFFHI:
+	    insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+
+	    /* Is this a sethi instruction?  */
+	    if ((insn & (unsigned long)0x01ff0000) != 0x00f80000)
+	      {
+		info->callbacks->einfo
+		  (_("%H: R_FRV_GOTTLSOFFHI"
+		     " not applied to a sethi instruction\n"),
+		   input_bfd, input_section, rel->r_offset);
+		return FALSE;
+	      }
+
+	    if (RELAX_GOTTLSOFF_LOCAL_EXEC_P (info, picrel,
+					      relocation + rel->r_addend)
+		|| (RELAX_TLSDESC_INITIAL_EXEC_P (info, picrel)
+		    && IN_RANGE_FOR_OFST12_P (picrel->tlsoff_entry)))
+	      {
+		/* Replace sethi with a nop.  Preserve the packing bit.  */
+		insn &= (unsigned long)0x80000000;
+		insn |= (unsigned long)0x00880000;
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+
+		/* Nothing to relocate.  */
+		continue;
+	      }
+
+	    break;
+
+	  case R_FRV_GOTTLSOFFLO:
+	    insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+
+	    /* Is this a setlo or setlos instruction?  */
+	    if ((insn & (unsigned long)0x01f70000) != 0x00f40000)
+	      {
+		info->callbacks->einfo
+		  (_("%H: R_FRV_GOTTLSOFFLO"
+		     " not applied to a setlo or setlos instruction\n"),
+		   input_bfd, input_section, rel->r_offset);
+		return FALSE;
+	      }
+
+	    if (RELAX_GOTTLSOFF_LOCAL_EXEC_P (info, picrel,
+					      relocation + rel->r_addend)
+		|| (RELAX_TLSDESC_INITIAL_EXEC_P (info, picrel)
+		    && IN_RANGE_FOR_OFST12_P (picrel->tlsoff_entry)))
+	      {
+		/* Replace setlo/setlos with a nop.  Preserve the
+		   packing bit.  */
+		insn &= (unsigned long)0x80000000;
+		insn |= (unsigned long)0x00880000;
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+
+		/* Nothing to relocate.  */
+		continue;
+	      }
+
+	    break;
+
+	  case R_FRV_TLSOFF_RELAX:
+	    insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+
+	    /* Is this an ld instruction?  */
+	    if ((insn & (unsigned long)0x01fc0fc0) != 0x00080100)
+	      {
+		info->callbacks->einfo
+		  (_("%H: R_FRV_TLSOFF_RELAX"
+		     " not applied to an ld instruction\n"),
+		   input_bfd, input_section, rel->r_offset);
+		return FALSE;
+	      }
+
+	    if (RELAX_GOTTLSOFF_LOCAL_EXEC_P (info, picrel,
+					      relocation + rel->r_addend))
+	      {
+		/* Replace ld #gottlsoff(symbol+offset)@(grB, grA), grC
+		   with setlos #tlsmofflo(symbol+offset), grC.
+		   Preserve the packing bit.  */
+		insn &= (unsigned long)0xfe000000;
+		insn |= (unsigned long)0x00fc0000;
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+
+		r_type = R_FRV_TLSMOFFLO;
+		howto  = elf32_frv_howto_table + r_type;
+		rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+	      }
+
+	    else if (RELAX_TLSDESC_INITIAL_EXEC_P (info, picrel)
+		     && IN_RANGE_FOR_OFST12_P (picrel->tlsoff_entry))
+	      {
+		/* Replace ld #tlsoff(symbol+offset)@(grB, grA), grC
+		   with ldi @(grB, #gottlsoff12(symbol+offset), grC.
+		   Preserve the packing bit.  */
+		insn = (insn & (unsigned long)0xfe03f000)
+		  | (unsigned long)0x00c80000;;
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+
+		r_type = R_FRV_GOTTLSOFF12;
+		howto  = elf32_frv_howto_table + r_type;
+		rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+	      }
+
+	    break;
+
+	  case R_FRV_TLSMOFFHI:
+	    insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+
+	    /* Is this a sethi instruction?  */
+	    if ((insn & (unsigned long)0x01ff0000) != 0x00f80000)
+	      {
+		info->callbacks->einfo
+		  (_("%H: R_FRV_TLSMOFFHI"
+		     " not applied to a sethi instruction\n"),
+		   input_bfd, input_section, rel->r_offset);
+		return FALSE;
+	      }
+
+	    if (TLSMOFF_IN_RANGE_FOR_SETLOS_P (relocation + rel->r_addend,
+					       info))
+	      {
+		/* Replace sethi with a nop.  Preserve the packing bit.  */
+		insn &= (unsigned long)0x80000000;
+		insn |= (unsigned long)0x00880000;
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+
+		/* Nothing to relocate.  */
+		continue;
+	      }
+
+	    break;
+
+	  case R_FRV_TLSMOFFLO:
+	    insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+
+	    /* Is this a setlo or setlos instruction?  */
+	    if ((insn & (unsigned long)0x01f70000) != 0x00f40000)
+	      {
+		info->callbacks->einfo
+		  (_("R_FRV_TLSMOFFLO"
+		     " not applied to a setlo or setlos instruction\n"),
+		   input_bfd, input_section, rel->r_offset);
+		return FALSE;
+	      }
+
+	    if (TLSMOFF_IN_RANGE_FOR_SETLOS_P (relocation + rel->r_addend,
+					       info))
+	      /* If the corresponding sethi (if it exists) decayed
+		 to a nop, make sure this becomes (or already is) a
+		 setlos, not setlo.  */
+	      {
+		insn |= (unsigned long)0x00080000;
+		bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+	      }
+
+	    break;
+
+	    /*
+	      There's nothing to relax in these:
+		R_FRV_TLSDESC_VALUE
+		R_FRV_TLSOFF
+		R_FRV_TLSMOFF12
+		R_FRV_TLSMOFFHI
+		R_FRV_TLSMOFFLO
+		R_FRV_TLSMOFF
+	    */
+
+	  default:
+	    break;
+	  }
+
+      switch (r_type)
+	{
+	case R_FRV_LABEL24:
+	  check_segment[0] = isec_segment;
+	  if (! IS_FDPIC (output_bfd))
+	    check_segment[1] = isec_segment;
+	  else if (picrel->plt)
+	    {
+	      relocation = frvfdpic_plt_section (info)->output_section->vma
+		+ frvfdpic_plt_section (info)->output_offset
+		+ picrel->plt_entry;
+	      check_segment[1] = plt_segment;
+	    }
+	  /* We don't want to warn on calls to undefined weak symbols,
+	     as calls to them must be protected by non-NULL tests
+	     anyway, and unprotected calls would invoke undefined
+	     behavior.  */
+	  else if (picrel->symndx == -1
+		   && picrel->d.h->root.type == bfd_link_hash_undefweak)
+	    check_segment[1] = check_segment[0];
+	  else
+	    check_segment[1] = sec
+	      ? _frvfdpic_osec_to_segment (output_bfd, sec->output_section)
+	      : (unsigned)-1;
+	  break;
+
+	case R_FRV_GOT12:
+	case R_FRV_GOTHI:
+	case R_FRV_GOTLO:
+	  relocation = picrel->got_entry;
+	  check_segment[0] = check_segment[1] = got_segment;
+	  break;
+
+	case R_FRV_FUNCDESC_GOT12:
+	case R_FRV_FUNCDESC_GOTHI:
+	case R_FRV_FUNCDESC_GOTLO:
+	  relocation = picrel->fdgot_entry;
+	  check_segment[0] = check_segment[1] = got_segment;
+	  break;
+
+	case R_FRV_GOTOFFHI:
+	case R_FRV_GOTOFF12:
+	case R_FRV_GOTOFFLO:
+	  relocation -= frvfdpic_got_section (info)->output_section->vma
+	    + frvfdpic_got_section (info)->output_offset
+	    + frvfdpic_got_initial_offset (info);
+	  check_segment[0] = got_segment;
+	  check_segment[1] = sec
+	    ? _frvfdpic_osec_to_segment (output_bfd, sec->output_section)
+	    : (unsigned)-1;
+	  break;
+
+	case R_FRV_FUNCDESC_GOTOFF12:
+	case R_FRV_FUNCDESC_GOTOFFHI:
+	case R_FRV_FUNCDESC_GOTOFFLO:
+	  relocation = picrel->fd_entry;
+	  check_segment[0] = check_segment[1] = got_segment;
+	  break;
+
+	case R_FRV_FUNCDESC:
+	  {
+	    int dynindx;
+	    bfd_vma addend = rel->r_addend;
+
+	    if (! (h && h->root.type == bfd_link_hash_undefweak
+		   && FRVFDPIC_SYM_LOCAL (info, h)))
+	      {
+		/* If the symbol is dynamic and there may be dynamic
+		   symbol resolution because we are or are linked with a
+		   shared library, emit a FUNCDESC relocation such that
+		   the dynamic linker will allocate the function
+		   descriptor.  If the symbol needs a non-local function
+		   descriptor but binds locally (e.g., its visibility is
+		   protected, emit a dynamic relocation decayed to
+		   section+offset.  */
+		if (h && ! FRVFDPIC_FUNCDESC_LOCAL (info, h)
+		    && FRVFDPIC_SYM_LOCAL (info, h)
+		    && !(info->executable && !info->pie))
+		  {
+		    dynindx = elf_section_data (h->root.u.def.section
+						->output_section)->dynindx;
+		    addend += h->root.u.def.section->output_offset
+		      + h->root.u.def.value;
+		  }
+		else if (h && ! FRVFDPIC_FUNCDESC_LOCAL (info, h))
+		  {
+		    if (addend)
+		      {
+			info->callbacks->einfo
+			  (_("%H: R_FRV_FUNCDESC references dynamic symbol"
+			     " with nonzero addend\n"),
+			   input_bfd, input_section, rel->r_offset);
+			return FALSE;
+		      }
+		    dynindx = h->dynindx;
+		  }
+		else
+		  {
+		    /* Otherwise, we know we have a private function
+		       descriptor, so reference it directly.  */
+		    BFD_ASSERT (picrel->privfd);
+		    r_type = R_FRV_32;
+		    dynindx = elf_section_data (frvfdpic_got_section (info)
+						->output_section)->dynindx;
+		    addend = frvfdpic_got_section (info)->output_offset
+		      + frvfdpic_got_initial_offset (info)
+		      + picrel->fd_entry;
+		  }
+
+		/* If there is room for dynamic symbol resolution, emit
+		   the dynamic relocation.  However, if we're linking an
+		   executable at a fixed location, we won't have emitted a
+		   dynamic symbol entry for the got section, so idx will
+		   be zero, which means we can and should compute the
+		   address of the private descriptor ourselves.  */
+		if (info->executable && !info->pie
+		    && (!h || FRVFDPIC_FUNCDESC_LOCAL (info, h)))
+		  {
+		    addend += frvfdpic_got_section (info)->output_section->vma;
+		    if ((bfd_get_section_flags (output_bfd,
+						input_section->output_section)
+			 & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD))
+		      {
+			bfd_vma offset;
+
+			if (_frvfdpic_osec_readonly_p (output_bfd,
+						       input_section
+						       ->output_section))
+			  {
+			    info->callbacks->einfo
+			      (_("%H: cannot emit fixups"
+				 " in read-only section\n"),
+			       input_bfd, input_section, rel->r_offset);
+			    return FALSE;
+			  }
+
+			offset = _bfd_elf_section_offset
+			  (output_bfd, info,
+			   input_section, rel->r_offset);
+
+			if (offset != (bfd_vma)-1)
+			  _frvfdpic_add_rofixup (output_bfd,
+						 frvfdpic_gotfixup_section
+						 (info),
+						 offset + input_section
+						 ->output_section->vma
+						 + input_section->output_offset,
+						 picrel);
+		      }
+		  }
+		else if ((bfd_get_section_flags (output_bfd,
+						 input_section->output_section)
+			  & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD))
+		  {
+		    bfd_vma offset;
+
+		    if (_frvfdpic_osec_readonly_p (output_bfd,
+						   input_section
+						   ->output_section))
+		      {
+			info->callbacks->einfo
+			  (_("%H: cannot emit dynamic relocations"
+			     " in read-only section\n"),
+			   input_bfd, input_section, rel->r_offset);
+			return FALSE;
+		      }
+
+		    offset = _bfd_elf_section_offset
+		      (output_bfd, info,
+		       input_section, rel->r_offset);
+
+		    if (offset != (bfd_vma)-1)
+		      _frvfdpic_add_dyn_reloc (output_bfd,
+					       frvfdpic_gotrel_section (info),
+					       offset + input_section
+					       ->output_section->vma
+					       + input_section->output_offset,
+					       r_type, dynindx, addend, picrel);
+		  }
+		else
+		  addend += frvfdpic_got_section (info)->output_section->vma;
+	      }
+
+	    /* We want the addend in-place because dynamic
+	       relocations are REL.  Setting relocation to it should
+	       arrange for it to be installed.  */
+	    relocation = addend - rel->r_addend;
+	  }
+	  check_segment[0] = check_segment[1] = got_segment;
+	  break;
+
+	case R_FRV_32:
+	  if (! IS_FDPIC (output_bfd))
+	    {
+	      check_segment[0] = check_segment[1] = -1;
+	      break;
+	    }
+	  /* Fall through.  */
+	case R_FRV_FUNCDESC_VALUE:
+	  {
+	    int dynindx;
+	    bfd_vma addend = rel->r_addend;
+
+	    /* If the symbol is dynamic but binds locally, use
+	       section+offset.  */
+	    if (h && ! FRVFDPIC_SYM_LOCAL (info, h))
+	      {
+		if (addend && r_type == R_FRV_FUNCDESC_VALUE)
+		  {
+		    info->callbacks->einfo
+		      (_("%H: R_FRV_FUNCDESC_VALUE"
+			 " references dynamic symbol with nonzero addend\n"),
+		       input_bfd, input_section, rel->r_offset);
+		    return FALSE;
+		  }
+		dynindx = h->dynindx;
+	      }
+	    else
+	      {
+		if (h)
+		  addend += h->root.u.def.value;
+		else
+		  addend += sym->st_value;
+		if (osec)
+		  addend += osec->output_offset;
+		if (osec && osec->output_section
+		    && ! bfd_is_abs_section (osec->output_section)
+		    && ! bfd_is_und_section (osec->output_section))
+		  dynindx = elf_section_data (osec->output_section)->dynindx;
+		else
+		  dynindx = 0;
+	      }
+
+	    /* If we're linking an executable at a fixed address, we
+	       can omit the dynamic relocation as long as the symbol
+	       is defined in the current link unit (which is implied
+	       by its output section not being NULL).  */
+	    if (info->executable && !info->pie
+		&& (!h || FRVFDPIC_SYM_LOCAL (info, h)))
+	      {
+		if (osec)
+		  addend += osec->output_section->vma;
+		if (IS_FDPIC (input_bfd)
+		    && (bfd_get_section_flags (output_bfd,
+					       input_section->output_section)
+			& (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD))
+		  {
+		    if (_frvfdpic_osec_readonly_p (output_bfd,
+						   input_section
+						   ->output_section))
+		      {
+			info->callbacks->einfo
+			  (_("%H: cannot emit fixups in read-only section\n"),
+			   input_bfd, input_section, rel->r_offset);
+			return FALSE;
+		      }
+		    if (!h || h->root.type != bfd_link_hash_undefweak)
+		      {
+			bfd_vma offset = _bfd_elf_section_offset
+			  (output_bfd, info,
+			   input_section, rel->r_offset);
+
+			if (offset != (bfd_vma)-1)
+			  {
+			    _frvfdpic_add_rofixup (output_bfd,
+						   frvfdpic_gotfixup_section
+						   (info),
+						   offset + input_section
+						   ->output_section->vma
+						   + input_section->output_offset,
+						   picrel);
+			    if (r_type == R_FRV_FUNCDESC_VALUE)
+			      _frvfdpic_add_rofixup
+				(output_bfd,
+				 frvfdpic_gotfixup_section (info),
+				 offset
+				 + input_section->output_section->vma
+				 + input_section->output_offset + 4, picrel);
+			  }
+		      }
+		  }
+	      }
+	    else
+	      {
+		if ((bfd_get_section_flags (output_bfd,
+					    input_section->output_section)
+		     & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD))
+		  {
+		    bfd_vma offset;
+
+		    if (_frvfdpic_osec_readonly_p (output_bfd,
+						   input_section
+						   ->output_section))
+		      {
+			info->callbacks->einfo
+			  (_("%H: cannot emit dynamic relocations"
+			     " in read-only section\n"),
+			   input_bfd, input_section, rel->r_offset);
+			return FALSE;
+		      }
+
+		    offset = _bfd_elf_section_offset
+		      (output_bfd, info,
+		       input_section, rel->r_offset);
+
+		    if (offset != (bfd_vma)-1)
+		      _frvfdpic_add_dyn_reloc (output_bfd,
+					       frvfdpic_gotrel_section (info),
+					       offset + input_section
+					       ->output_section->vma
+					       + input_section->output_offset,
+					       r_type, dynindx, addend, picrel);
+		  }
+		else if (osec)
+		  addend += osec->output_section->vma;
+		/* We want the addend in-place because dynamic
+		   relocations are REL.  Setting relocation to it
+		   should arrange for it to be installed.  */
+		relocation = addend - rel->r_addend;
+	      }
+
+	    if (r_type == R_FRV_FUNCDESC_VALUE)
+	      {
+		/* If we've omitted the dynamic relocation, just emit
+		   the fixed addresses of the symbol and of the local
+		   GOT base offset.  */
+		if (info->executable && !info->pie
+		    && (!h || FRVFDPIC_SYM_LOCAL (info, h)))
+		  bfd_put_32 (output_bfd,
+			      frvfdpic_got_section (info)->output_section->vma
+			      + frvfdpic_got_section (info)->output_offset
+			      + frvfdpic_got_initial_offset (info),
+			      contents + rel->r_offset + 4);
+		else
+		  /* A function descriptor used for lazy or local
+		     resolving is initialized such that its high word
+		     contains the output section index in which the
+		     PLT entries are located, and the low word
+		     contains the offset of the lazy PLT entry entry
+		     point into that section.  */
+		  bfd_put_32 (output_bfd,
+			      h && ! FRVFDPIC_SYM_LOCAL (info, h)
+			      ? 0
+			      : _frvfdpic_osec_to_segment (output_bfd,
+							   sec
+							   ->output_section),
+			      contents + rel->r_offset + 4);
+	      }
+	  }
+	  check_segment[0] = check_segment[1] = got_segment;
+	  break;
+
+	case R_FRV_GPREL12:
+	case R_FRV_GPRELU12:
+	case R_FRV_GPREL32:
+	case R_FRV_GPRELHI:
+	case R_FRV_GPRELLO:
+	  check_segment[0] = gprel_segment;
+	  check_segment[1] = sec
+	    ? _frvfdpic_osec_to_segment (output_bfd, sec->output_section)
+	    : (unsigned)-1;
+	  break;
+
+	case R_FRV_GETTLSOFF:
+	  relocation = frvfdpic_plt_section (info)->output_section->vma
+	    + frvfdpic_plt_section (info)->output_offset
+	    + picrel->tlsplt_entry;
+	  BFD_ASSERT (picrel->tlsplt_entry != (bfd_vma)-1
+		      && picrel->tlsdesc_entry);
+	  check_segment[0] = isec_segment;
+	  check_segment[1] = plt_segment;
+	  break;
+
+	case R_FRV_GOTTLSDESC12:
+	case R_FRV_GOTTLSDESCHI:
+	case R_FRV_GOTTLSDESCLO:
+	  BFD_ASSERT (picrel->tlsdesc_entry);
+	  relocation = picrel->tlsdesc_entry;
+	  check_segment[0] = tls_segment;
+	  check_segment[1] = sec
+	    && ! bfd_is_abs_section (sec)
+	    && ! bfd_is_und_section (sec)
+	    ? _frvfdpic_osec_to_segment (output_bfd, sec->output_section)
+	    : tls_segment;
+	  break;
+
+	case R_FRV_TLSMOFF12:
+	case R_FRV_TLSMOFFHI:
+	case R_FRV_TLSMOFFLO:
+	case R_FRV_TLSMOFF:
+	  check_segment[0] = tls_segment;
+	  if (! sec)
+	    check_segment[1] = -1;
+	  else if (bfd_is_abs_section (sec)
+		   || bfd_is_und_section (sec))
+	    {
+	      relocation = 0;
+	      check_segment[1] = tls_segment;
+	    }
+	  else if (sec->output_section)
+	    {
+	      relocation -= tls_biased_base (info);
+	      check_segment[1] =
+		_frvfdpic_osec_to_segment (output_bfd, sec->output_section);
+	    }
+	  else
+	    check_segment[1] = -1;
+	  break;
+
+	case R_FRV_GOTTLSOFF12:
+	case R_FRV_GOTTLSOFFHI:
+	case R_FRV_GOTTLSOFFLO:
+	  BFD_ASSERT (picrel->tlsoff_entry);
+	  relocation = picrel->tlsoff_entry;
+	  check_segment[0] = tls_segment;
+	  check_segment[1] = sec
+	    && ! bfd_is_abs_section (sec)
+	    && ! bfd_is_und_section (sec)
+	    ? _frvfdpic_osec_to_segment (output_bfd, sec->output_section)
+	    : tls_segment;
+	  break;
+
+	case R_FRV_TLSDESC_VALUE:
+	case R_FRV_TLSOFF:
+	  /* These shouldn't be present in input object files.  */
+	  check_segment[0] = check_segment[1] = isec_segment;
+	  break;
+
+	case R_FRV_TLSDESC_RELAX:
+	case R_FRV_GETTLSOFF_RELAX:
+	case R_FRV_TLSOFF_RELAX:
+	  /* These are just annotations for relaxation, nothing to do
+	     here.  */
+	  continue;
+
+	default:
+	  check_segment[0] = isec_segment;
+	  check_segment[1] = sec
+	    ? _frvfdpic_osec_to_segment (output_bfd, sec->output_section)
+	    : (unsigned)-1;
+	  break;
+	}
+
+      if (check_segment[0] != check_segment[1] && IS_FDPIC (output_bfd))
+	{
+	  /* If you take this out, remove the #error from fdpic-static-6.d
+	     in the ld testsuite.  */
+	  /* This helps catch problems in GCC while we can't do more
+	     than static linking.  The idea is to test whether the
+	     input file basename is crt0.o only once.  */
+	  if (silence_segment_error == 1)
+	    silence_segment_error =
+	      (strlen (input_bfd->filename) == 6
+	       && filename_cmp (input_bfd->filename, "crt0.o") == 0)
+	      || (strlen (input_bfd->filename) > 6
+		  && filename_cmp (input_bfd->filename
+				   + strlen (input_bfd->filename) - 7,
+			     "/crt0.o") == 0)
+	      ? -1 : 0;
+	  if (!silence_segment_error
+	      /* We don't want duplicate errors for undefined
+		 symbols.  */
+	      && !(picrel && picrel->symndx == -1
+		   && picrel->d.h->root.type == bfd_link_hash_undefined))
+	    {
+	      info->callbacks->einfo
+		(_("%H: reloc against `%s' references a different segment\n"),
+		 input_bfd, input_section, rel->r_offset, name);
+	    }
+	  if (!silence_segment_error && (info->shared || info->pie))
+	    return FALSE;
+	  elf_elfheader (output_bfd)->e_flags |= EF_FRV_PIC;
+	}
+
+      switch (r_type)
+	{
+	case R_FRV_GOTOFFHI:
+	case R_FRV_TLSMOFFHI:
+	  /* We need the addend to be applied before we shift the
+	     value right.  */
+	  relocation += rel->r_addend;
+	  /* Fall through.  */
+	case R_FRV_GOTHI:
+	case R_FRV_FUNCDESC_GOTHI:
+	case R_FRV_FUNCDESC_GOTOFFHI:
+	case R_FRV_GOTTLSOFFHI:
+	case R_FRV_GOTTLSDESCHI:
+	  relocation >>= 16;
+	  /* Fall through.  */
+
+	case R_FRV_GOTLO:
+	case R_FRV_FUNCDESC_GOTLO:
+	case R_FRV_GOTOFFLO:
+	case R_FRV_FUNCDESC_GOTOFFLO:
+	case R_FRV_GOTTLSOFFLO:
+	case R_FRV_GOTTLSDESCLO:
+	case R_FRV_TLSMOFFLO:
+	  relocation &= 0xffff;
+	  break;
+
+	default:
+	  break;
+	}
+
+      switch (r_type)
+	{
+	case R_FRV_LABEL24:
+	  if (! IS_FDPIC (output_bfd) || ! picrel->plt)
+	    break;
+	  /* Fall through.  */
+
+	  /* When referencing a GOT entry, a function descriptor or a
+	     PLT, we don't want the addend to apply to the reference,
+	     but rather to the referenced symbol.  The actual entry
+	     will have already been created taking the addend into
+	     account, so cancel it out here.  */
+	case R_FRV_GOT12:
+	case R_FRV_GOTHI:
+	case R_FRV_GOTLO:
+	case R_FRV_FUNCDESC_GOT12:
+	case R_FRV_FUNCDESC_GOTHI:
+	case R_FRV_FUNCDESC_GOTLO:
+	case R_FRV_FUNCDESC_GOTOFF12:
+	case R_FRV_FUNCDESC_GOTOFFHI:
+	case R_FRV_FUNCDESC_GOTOFFLO:
+	case R_FRV_GETTLSOFF:
+	case R_FRV_GOTTLSDESC12:
+	case R_FRV_GOTTLSDESCHI:
+	case R_FRV_GOTTLSDESCLO:
+	case R_FRV_GOTTLSOFF12:
+	case R_FRV_GOTTLSOFFHI:
+	case R_FRV_GOTTLSOFFLO:
+	  /* Note that we only want GOTOFFHI, not GOTOFFLO or GOTOFF12
+	     here, since we do want to apply the addend to the others.
+	     Note that we've applied the addend to GOTOFFHI before we
+	     shifted it right.  */
+	case R_FRV_GOTOFFHI:
+	case R_FRV_TLSMOFFHI:
+	  relocation -= rel->r_addend;
+	  break;
+
+	default:
+	  break;
+	}
+
+     if (r_type == R_FRV_HI16)
+       r = elf32_frv_relocate_hi16 (input_bfd, rel, contents, relocation);
+
+     else if (r_type == R_FRV_LO16)
+       r = elf32_frv_relocate_lo16 (input_bfd, rel, contents, relocation);
+
+     else if (r_type == R_FRV_LABEL24 || r_type == R_FRV_GETTLSOFF)
+       r = elf32_frv_relocate_label24 (input_bfd, input_section, rel,
+				       contents, relocation);
+
+     else if (r_type == R_FRV_GPREL12)
+       r = elf32_frv_relocate_gprel12 (info, input_bfd, input_section, rel,
+				       contents, relocation);
+
+     else if (r_type == R_FRV_GPRELU12)
+       r = elf32_frv_relocate_gprelu12 (info, input_bfd, input_section, rel,
+					contents, relocation);
+
+     else if (r_type == R_FRV_GPRELLO)
+       r = elf32_frv_relocate_gprello (info, input_bfd, input_section, rel,
+				       contents, relocation);
+
+     else if (r_type == R_FRV_GPRELHI)
+       r = elf32_frv_relocate_gprelhi (info, input_bfd, input_section, rel,
+				       contents, relocation);
+
+     else if (r_type == R_FRV_TLSOFF
+	      || r_type == R_FRV_TLSDESC_VALUE)
+       r = bfd_reloc_notsupported;
+
+     else
+       r = frv_final_link_relocate (howto, input_bfd, input_section, contents,
+				    rel, relocation);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char * msg = (const char *) NULL;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      r = info->callbacks->reloc_overflow
+		(info, (h ? &h->root : NULL), name, howto->name,
+		 (bfd_vma) 0, input_bfd, input_section, rel->r_offset);
+	      break;
+
+	    case bfd_reloc_undefined:
+	      r = info->callbacks->undefined_symbol
+		(info, name, input_bfd, input_section, rel->r_offset, TRUE);
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      break;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      break;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous relocation");
+	      break;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      break;
+	    }
+
+	  if (msg)
+	    {
+	      info->callbacks->einfo
+		(_("%H: reloc against `%s': %s\n"),
+		 input_bfd, input_section, rel->r_offset, name, msg);
+	      return FALSE;
+	    }
+
+	  if (! r)
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+static asection *
+elf32_frv_gc_mark_hook (asection *sec,
+			struct bfd_link_info *info,
+			Elf_Internal_Rela *rel,
+			struct elf_link_hash_entry *h,
+			Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_FRV_GNU_VTINHERIT:
+      case R_FRV_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Hook called by the linker routine which adds symbols from an object
+   file.  We use it to put .comm items in .scomm, and not .comm.  */
+
+static bfd_boolean
+elf32_frv_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
+     bfd *abfd;
+     struct bfd_link_info *info;
+     Elf_Internal_Sym *sym;
+     const char **namep ATTRIBUTE_UNUSED;
+     flagword *flagsp ATTRIBUTE_UNUSED;
+     asection **secp;
+     bfd_vma *valp;
+{
+  if (sym->st_shndx == SHN_COMMON
+      && !info->relocatable
+      && (int)sym->st_size <= (int)bfd_get_gp_size (abfd))
+    {
+      /* Common symbols less than or equal to -G nn bytes are
+	 automatically put into .sbss.  */
+
+      asection *scomm = bfd_get_section_by_name (abfd, ".scommon");
+
+      if (scomm == NULL)
+	{
+	  scomm = bfd_make_section_with_flags (abfd, ".scommon",
+					       (SEC_ALLOC
+						| SEC_IS_COMMON
+						| SEC_LINKER_CREATED));
+	  if (scomm == NULL)
+	    return FALSE;
+	}
+
+      *secp = scomm;
+      *valp = sym->st_size;
+    }
+
+  return TRUE;
+}
+
+/* We need dynamic symbols for every section, since segments can
+   relocate independently.  */
+static bfd_boolean
+_frvfdpic_link_omit_section_dynsym (bfd *output_bfd ATTRIBUTE_UNUSED,
+				    struct bfd_link_info *info
+				    ATTRIBUTE_UNUSED,
+				    asection *p ATTRIBUTE_UNUSED)
+{
+  switch (elf_section_data (p)->this_hdr.sh_type)
+    {
+    case SHT_PROGBITS:
+    case SHT_NOBITS:
+      /* If sh_type is yet undecided, assume it could be
+	 SHT_PROGBITS/SHT_NOBITS.  */
+    case SHT_NULL:
+      return FALSE;
+
+      /* There shouldn't be section relative relocations
+	 against any other section.  */
+    default:
+      return TRUE;
+    }
+}
+
+/* Create  a .got section, as well as its additional info field.  This
+   is almost entirely copied from
+   elflink.c:_bfd_elf_create_got_section().  */
+
+static bfd_boolean
+_frv_create_got_section (bfd *abfd, struct bfd_link_info *info)
+{
+  flagword flags, pltflags;
+  asection *s;
+  struct elf_link_hash_entry *h;
+  struct bfd_link_hash_entry *bh;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  int ptralign;
+  int offset;
+
+  /* This function may be called more than once.  */
+  s = bfd_get_section_by_name (abfd, ".got");
+  if (s != NULL && (s->flags & SEC_LINKER_CREATED) != 0)
+    return TRUE;
+
+  /* Machine specific: although pointers are 32-bits wide, we want the
+     GOT to be aligned to a 64-bit boundary, such that function
+     descriptors in it can be accessed with 64-bit loads and
+     stores.  */
+  ptralign = 3;
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	   | SEC_LINKER_CREATED);
+  pltflags = flags;
+
+  s = bfd_make_section_with_flags (abfd, ".got", flags);
+  if (s == NULL
+      || !bfd_set_section_alignment (abfd, s, ptralign))
+    return FALSE;
+
+  if (bed->want_got_plt)
+    {
+      s = bfd_make_section_with_flags (abfd, ".got.plt", flags);
+      if (s == NULL
+	  || !bfd_set_section_alignment (abfd, s, ptralign))
+	return FALSE;
+    }
+
+  if (bed->want_got_sym)
+    {
+      /* Define the symbol _GLOBAL_OFFSET_TABLE_ at the start of the .got
+	 (or .got.plt) section.  We don't do this in the linker script
+	 because we don't want to define the symbol if we are not creating
+	 a global offset table.  */
+      h = _bfd_elf_define_linkage_sym (abfd, info, s, "_GLOBAL_OFFSET_TABLE_");
+      elf_hash_table (info)->hgot = h;
+      if (h == NULL)
+	return FALSE;
+
+      /* Machine-specific: we want the symbol for executables as
+	 well.  */
+      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	return FALSE;
+    }
+
+  /* The first bit of the global offset table is the header.  */
+  s->size += bed->got_header_size;
+
+  /* This is the machine-specific part.  Create and initialize section
+     data for the got.  */
+  if (IS_FDPIC (abfd))
+    {
+      frvfdpic_got_section (info) = s;
+      frvfdpic_relocs_info (info) = htab_try_create (1,
+						     frvfdpic_relocs_info_hash,
+						     frvfdpic_relocs_info_eq,
+						     (htab_del) NULL);
+      if (! frvfdpic_relocs_info (info))
+	return FALSE;
+
+      s = bfd_make_section_with_flags (abfd, ".rel.got",
+				       (flags | SEC_READONLY));
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, 2))
+	return FALSE;
+
+      frvfdpic_gotrel_section (info) = s;
+
+      /* Machine-specific.  */
+      s = bfd_make_section_with_flags (abfd, ".rofixup",
+				       (flags | SEC_READONLY));
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, 2))
+	return FALSE;
+
+      frvfdpic_gotfixup_section (info) = s;
+      offset = -2048;
+      flags = BSF_GLOBAL;
+    }
+  else
+    {
+      offset = 2048;
+      flags = BSF_GLOBAL | BSF_WEAK;
+    }
+
+  /* Define _gp in .rofixup, for FDPIC, or .got otherwise.  If it
+     turns out that we're linking with a different linker script, the
+     linker script will override it.  */
+  bh = NULL;
+  if (!(_bfd_generic_link_add_one_symbol
+	(info, abfd, "_gp", flags, s, offset, (const char *) NULL, FALSE,
+	 bed->collect, &bh)))
+    return FALSE;
+  h = (struct elf_link_hash_entry *) bh;
+  h->def_regular = 1;
+  h->type = STT_OBJECT;
+  /* h->other = STV_HIDDEN; */ /* Should we?  */
+
+  /* Machine-specific: we want the symbol for executables as well.  */
+  if (IS_FDPIC (abfd) && ! bfd_elf_link_record_dynamic_symbol (info, h))
+    return FALSE;
+
+  if (!IS_FDPIC (abfd))
+    return TRUE;
+
+  /* FDPIC supports Thread Local Storage, and this may require a
+     procedure linkage table for TLS PLT entries.  */
+
+  /* This is mostly copied from
+     elflink.c:_bfd_elf_create_dynamic_sections().  */
+
+  flags = pltflags;
+  pltflags |= SEC_CODE;
+  if (bed->plt_not_loaded)
+    pltflags &= ~ (SEC_CODE | SEC_LOAD | SEC_HAS_CONTENTS);
+  if (bed->plt_readonly)
+    pltflags |= SEC_READONLY;
+
+  s = bfd_make_section_with_flags (abfd, ".plt", pltflags);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, bed->plt_alignment))
+    return FALSE;
+  /* FRV-specific: remember it.  */
+  frvfdpic_plt_section (info) = s;
+
+  /* Define the symbol _PROCEDURE_LINKAGE_TABLE_ at the start of the
+     .plt section.  */
+  if (bed->want_plt_sym)
+    {
+      h = _bfd_elf_define_linkage_sym (abfd, info, s,
+				       "_PROCEDURE_LINKAGE_TABLE_");
+      elf_hash_table (info)->hplt = h;
+      if (h == NULL)
+	return FALSE;
+    }
+
+  /* FRV-specific: we want rel relocations for the plt.  */
+  s = bfd_make_section_with_flags (abfd, ".rel.plt",
+				   flags | SEC_READONLY);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+    return FALSE;
+  /* FRV-specific: remember it.  */
+  frvfdpic_pltrel_section (info) = s;
+
+  return TRUE;
+}
+
+/* Make sure the got and plt sections exist, and that our pointers in
+   the link hash table point to them.  */
+
+static bfd_boolean
+elf32_frvfdpic_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  /* This is mostly copied from
+     elflink.c:_bfd_elf_create_dynamic_sections().  */
+  flagword flags;
+  asection *s;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	   | SEC_LINKER_CREATED);
+
+  /* We need to create .plt, .rel[a].plt, .got, .got.plt, .dynbss, and
+     .rel[a].bss sections.  */
+
+  /* FRV-specific: we want to create the GOT and the PLT in the FRV
+     way.  */
+  if (! _frv_create_got_section (abfd, info))
+    return FALSE;
+
+  /* FRV-specific: make sure we created everything we wanted.  */
+  BFD_ASSERT (frvfdpic_got_section (info) && frvfdpic_gotrel_section (info)
+	      && frvfdpic_gotfixup_section (info)
+	      && frvfdpic_plt_section (info)
+	      && frvfdpic_pltrel_section (info));
+
+  if (bed->want_dynbss)
+    {
+      /* The .dynbss section is a place to put symbols which are defined
+	 by dynamic objects, are referenced by regular objects, and are
+	 not functions.  We must allocate space for them in the process
+	 image and use a R_*_COPY reloc to tell the dynamic linker to
+	 initialize them at run time.  The linker script puts the .dynbss
+	 section into the .bss section of the final image.  */
+      s = bfd_make_section_with_flags (abfd, ".dynbss",
+				       SEC_ALLOC | SEC_LINKER_CREATED);
+      if (s == NULL)
+	return FALSE;
+
+      /* The .rel[a].bss section holds copy relocs.  This section is not
+     normally needed.  We need to create it here, though, so that the
+     linker will map it to an output section.  We can't just create it
+     only if we need it, because we will not know whether we need it
+     until we have seen all the input files, and the first time the
+     main linker code calls BFD after examining all the input files
+     (size_dynamic_sections) the input sections have already been
+     mapped to the output sections.  If the section turns out not to
+     be needed, we can discard it later.  We will never need this
+     section when generating a shared object, since they do not use
+     copy relocs.  */
+      if (! info->shared)
+	{
+	  s = bfd_make_section_with_flags (abfd,
+					   (bed->default_use_rela_p
+					    ? ".rela.bss" : ".rel.bss"),
+					   flags | SEC_READONLY);
+	  if (s == NULL
+	      || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Compute the total GOT and PLT size required by each symbol in each
+   range.  Symbols may require up to 4 words in the GOT: an entry
+   pointing to the symbol, an entry pointing to its function
+   descriptor, and a private function descriptors taking two
+   words.  */
+
+static void
+_frvfdpic_count_nontls_entries (struct frvfdpic_relocs_info *entry,
+				struct _frvfdpic_dynamic_got_info *dinfo)
+{
+  /* Allocate space for a GOT entry pointing to the symbol.  */
+  if (entry->got12)
+    dinfo->got12 += 4;
+  else if (entry->gotlos)
+    dinfo->gotlos += 4;
+  else if (entry->gothilo)
+    dinfo->gothilo += 4;
+  else
+    entry->relocs32--;
+  entry->relocs32++;
+
+  /* Allocate space for a GOT entry pointing to the function
+     descriptor.  */
+  if (entry->fdgot12)
+    dinfo->got12 += 4;
+  else if (entry->fdgotlos)
+    dinfo->gotlos += 4;
+  else if (entry->fdgothilo)
+    dinfo->gothilo += 4;
+  else
+    entry->relocsfd--;
+  entry->relocsfd++;
+
+  /* Decide whether we need a PLT entry, a function descriptor in the
+     GOT, and a lazy PLT entry for this symbol.  */
+  entry->plt = entry->call
+    && entry->symndx == -1 && ! FRVFDPIC_SYM_LOCAL (dinfo->info, entry->d.h)
+    && elf_hash_table (dinfo->info)->dynamic_sections_created;
+  entry->privfd = entry->plt
+    || entry->fdgoff12 || entry->fdgofflos || entry->fdgoffhilo
+    || ((entry->fd || entry->fdgot12 || entry->fdgotlos || entry->fdgothilo)
+	&& (entry->symndx != -1
+	    || FRVFDPIC_FUNCDESC_LOCAL (dinfo->info, entry->d.h)));
+  entry->lazyplt = entry->privfd
+    && entry->symndx == -1 && ! FRVFDPIC_SYM_LOCAL (dinfo->info, entry->d.h)
+    && ! (dinfo->info->flags & DF_BIND_NOW)
+    && elf_hash_table (dinfo->info)->dynamic_sections_created;
+
+  /* Allocate space for a function descriptor.  */
+  if (entry->fdgoff12)
+    dinfo->fd12 += 8;
+  else if (entry->fdgofflos)
+    dinfo->fdlos += 8;
+  else if (entry->privfd && entry->plt)
+    dinfo->fdplt += 8;
+  else if (entry->privfd)
+    dinfo->fdhilo += 8;
+  else
+    entry->relocsfdv--;
+  entry->relocsfdv++;
+
+  if (entry->lazyplt)
+    dinfo->lzplt += 8;
+}
+
+/* Compute the total GOT size required by each TLS symbol in each
+   range.  Symbols may require up to 5 words in the GOT: an entry
+   holding the TLS offset for the symbol, and an entry with a full TLS
+   descriptor taking 4 words.  */
+
+static void
+_frvfdpic_count_tls_entries (struct frvfdpic_relocs_info *entry,
+			     struct _frvfdpic_dynamic_got_info *dinfo,
+			     bfd_boolean subtract)
+{
+  const int l = subtract ? -1 : 1;
+
+  /* Allocate space for a GOT entry with the TLS offset of the
+     symbol.  */
+  if (entry->tlsoff12)
+    dinfo->got12 += 4 * l;
+  else if (entry->tlsofflos)
+    dinfo->gotlos += 4 * l;
+  else if (entry->tlsoffhilo)
+    dinfo->gothilo += 4 * l;
+  else
+    entry->relocstlsoff -= l;
+  entry->relocstlsoff += l;
+
+  /* If there's any TLSOFF relocation, mark the output file as not
+     suitable for dlopening.  This mark will remain even if we relax
+     all such relocations, but this is not a problem, since we'll only
+     do so for executables, and we definitely don't want anyone
+     dlopening executables.  */
+  if (entry->relocstlsoff)
+    dinfo->info->flags |= DF_STATIC_TLS;
+
+  /* Allocate space for a TLS descriptor.  */
+  if (entry->tlsdesc12)
+    dinfo->tlsd12 += 8 * l;
+  else if (entry->tlsdesclos)
+    dinfo->tlsdlos += 8 * l;
+  else if (entry->tlsplt)
+    dinfo->tlsdplt += 8 * l;
+  else if (entry->tlsdeschilo)
+    dinfo->tlsdhilo += 8 * l;
+  else
+    entry->relocstlsd -= l;
+  entry->relocstlsd += l;
+}
+
+/* Compute the number of dynamic relocations and fixups that a symbol
+   requires, and add (or subtract) from the grand and per-symbol
+   totals.  */
+
+static void
+_frvfdpic_count_relocs_fixups (struct frvfdpic_relocs_info *entry,
+			       struct _frvfdpic_dynamic_got_info *dinfo,
+			       bfd_boolean subtract)
+{
+  bfd_vma relocs = 0, fixups = 0, tlsrets = 0;
+
+  if (!dinfo->info->executable || dinfo->info->pie)
+    {
+      relocs = entry->relocs32 + entry->relocsfd + entry->relocsfdv
+	+ entry->relocstlsd;
+
+      /* In the executable, TLS relocations to symbols that bind
+	 locally (including those that resolve to global TLS offsets)
+	 are resolved immediately, without any need for fixups or
+	 dynamic relocations.  In shared libraries, however, we must
+	 emit dynamic relocations even for local symbols, because we
+	 don't know the module id the library is going to get at
+	 run-time, nor its TLS base offset.  */
+      if (!dinfo->info->executable
+	  || (entry->symndx == -1
+	      && ! FRVFDPIC_SYM_LOCAL (dinfo->info, entry->d.h)))
+	relocs += entry->relocstlsoff;
+    }
+  else
+    {
+      if (entry->symndx != -1 || FRVFDPIC_SYM_LOCAL (dinfo->info, entry->d.h))
+	{
+	  if (entry->symndx != -1
+	      || entry->d.h->root.type != bfd_link_hash_undefweak)
+	    fixups += entry->relocs32 + 2 * entry->relocsfdv;
+	  fixups += entry->relocstlsd;
+	  tlsrets += entry->relocstlsd;
+	}
+      else
+	{
+	  relocs += entry->relocs32 + entry->relocsfdv
+	    + entry->relocstlsoff + entry->relocstlsd;
+	}
+
+      if (entry->symndx != -1
+	  || FRVFDPIC_FUNCDESC_LOCAL (dinfo->info, entry->d.h))
+	{
+	  if (entry->symndx != -1
+	      || entry->d.h->root.type != bfd_link_hash_undefweak)
+	    fixups += entry->relocsfd;
+	}
+      else
+	relocs += entry->relocsfd;
+    }
+
+  if (subtract)
+    {
+      relocs = - relocs;
+      fixups = - fixups;
+      tlsrets = - tlsrets;
+    }
+
+  entry->dynrelocs += relocs;
+  entry->fixups += fixups;
+  dinfo->relocs += relocs;
+  dinfo->fixups += fixups;
+  dinfo->tls_ret_refs += tlsrets;
+}
+
+/* Look for opportunities to relax TLS relocations.  We can assume
+   we're linking the main executable or a static-tls library, since
+   otherwise we wouldn't have got here.  When relaxing, we have to
+   first undo any previous accounting of TLS uses of fixups, dynamic
+   relocations, GOT and PLT entries.  */
+
+static void
+_frvfdpic_relax_tls_entries (struct frvfdpic_relocs_info *entry,
+			     struct _frvfdpic_dynamic_got_info *dinfo,
+			     bfd_boolean relaxing)
+{
+  bfd_boolean changed = ! relaxing;
+
+  BFD_ASSERT (dinfo->info->executable
+	      || (dinfo->info->flags & DF_STATIC_TLS));
+
+  if (entry->tlsdesc12 || entry->tlsdesclos || entry->tlsdeschilo)
+    {
+      if (! changed)
+	{
+	  _frvfdpic_count_relocs_fixups (entry, dinfo, TRUE);
+	  _frvfdpic_count_tls_entries (entry, dinfo, TRUE);
+	  changed = TRUE;
+	}
+
+      /* When linking an executable, we can always decay GOTTLSDESC to
+	 TLSMOFF, if the symbol is local, or GOTTLSOFF, otherwise.
+	 When linking a static-tls shared library, using TLSMOFF is
+	 not an option, but we can still use GOTTLSOFF.  When decaying
+	 to GOTTLSOFF, we must keep the GOT entry in range.  We know
+	 it has to fit because we'll be trading the 4 words of hte TLS
+	 descriptor for a single word in the same range.  */
+      if (! dinfo->info->executable
+	  || (entry->symndx == -1
+	      && ! FRVFDPIC_SYM_LOCAL (dinfo->info, entry->d.h)))
+	{
+	  entry->tlsoff12 |= entry->tlsdesc12;
+	  entry->tlsofflos |= entry->tlsdesclos;
+	  entry->tlsoffhilo |= entry->tlsdeschilo;
+	}
+
+      entry->tlsdesc12 = entry->tlsdesclos = entry->tlsdeschilo = 0;
+    }
+
+  /* We can only decay TLSOFFs or call #gettlsoff to TLSMOFF in the
+     main executable.  We have to check whether the symbol's TLSOFF is
+     in range for a setlos.  For symbols with a hash entry, we can
+     determine exactly what to do; for others locals, we don't have
+     addresses handy, so we use the size of the TLS section as an
+     approximation.  If we get it wrong, we'll retain a GOT entry
+     holding the TLS offset (without dynamic relocations or fixups),
+     but we'll still optimize away the loads from it.  Since TLS sizes
+     are generally very small, it's probably not worth attempting to
+     do better than this.  */
+  if ((entry->tlsplt
+       || entry->tlsoff12 || entry->tlsofflos || entry->tlsoffhilo)
+      && dinfo->info->executable && relaxing
+      && ((entry->symndx == -1
+	   && FRVFDPIC_SYM_LOCAL (dinfo->info, entry->d.h)
+	   /* The above may hold for an undefweak TLS symbol, so make
+	      sure we don't have this case before accessing def.value
+	      and def.section.  */
+	   && (entry->d.h->root.type == bfd_link_hash_undefweak
+	       || (bfd_vma)(entry->d.h->root.u.def.value
+			    + (entry->d.h->root.u.def.section
+			       ->output_section->vma)
+			    + entry->d.h->root.u.def.section->output_offset
+			    + entry->addend
+			    - tls_biased_base (dinfo->info)
+			    + 32768) < (bfd_vma)65536))
+	  || (entry->symndx != -1
+	      && (elf_hash_table (dinfo->info)->tls_sec->size
+		  + abs (entry->addend) < 32768 + FRVFDPIC_TLS_BIAS))))
+    {
+      if (! changed)
+	{
+	  _frvfdpic_count_relocs_fixups (entry, dinfo, TRUE);
+	  _frvfdpic_count_tls_entries (entry, dinfo, TRUE);
+	  changed = TRUE;
+	}
+
+      entry->tlsplt =
+	entry->tlsoff12 = entry->tlsofflos = entry->tlsoffhilo = 0;
+    }
+
+  /* We can decay `call #gettlsoff' to a ldi #tlsoff if we already
+     have a #gottlsoff12 relocation for this entry, or if we can fit
+     one more in the 12-bit (and 16-bit) ranges.  */
+  if (entry->tlsplt
+      && (entry->tlsoff12
+	  || (relaxing
+	      && dinfo->got12 + dinfo->fd12 + dinfo->tlsd12 <= 4096 - 12 - 4
+	      && (dinfo->got12 + dinfo->fd12 + dinfo->tlsd12
+		  + dinfo->gotlos + dinfo->fdlos + dinfo->tlsdlos
+		  <= 65536 - 12 - 4))))
+    {
+      if (! changed)
+	{
+	  _frvfdpic_count_relocs_fixups (entry, dinfo, TRUE);
+	  _frvfdpic_count_tls_entries (entry, dinfo, TRUE);
+	  changed = TRUE;
+	}
+
+      entry->tlsoff12 = 1;
+      entry->tlsplt = 0;
+    }
+
+  if (changed)
+    {
+      _frvfdpic_count_tls_entries (entry, dinfo, FALSE);
+      _frvfdpic_count_relocs_fixups (entry, dinfo, FALSE);
+    }
+
+  return;
+}
+
+/* Compute the total GOT and PLT size required by each symbol in each range. *
+   Symbols may require up to 4 words in the GOT: an entry pointing to
+   the symbol, an entry pointing to its function descriptor, and a
+   private function descriptors taking two words.  */
+
+static int
+_frvfdpic_count_got_plt_entries (void **entryp, void *dinfo_)
+{
+  struct frvfdpic_relocs_info *entry = *entryp;
+  struct _frvfdpic_dynamic_got_info *dinfo = dinfo_;
+
+  _frvfdpic_count_nontls_entries (entry, dinfo);
+
+  if (dinfo->info->executable || (dinfo->info->flags & DF_STATIC_TLS))
+    _frvfdpic_relax_tls_entries (entry, dinfo, FALSE);
+  else
+    {
+      _frvfdpic_count_tls_entries (entry, dinfo, FALSE);
+      _frvfdpic_count_relocs_fixups (entry, dinfo, FALSE);
+    }
+
+  return 1;
+}
+
+/* Determine the positive and negative ranges to be used by each
+   offset range in the GOT.  FDCUR and CUR, that must be aligned to a
+   double-word boundary, are the minimum (negative) and maximum
+   (positive) GOT offsets already used by previous ranges, except for
+   an ODD entry that may have been left behind.  GOT and FD indicate
+   the size of GOT entries and function descriptors that must be
+   placed within the range from -WRAP to WRAP.  If there's room left,
+   up to FDPLT bytes should be reserved for additional function
+   descriptors.  */
+
+inline static bfd_signed_vma
+_frvfdpic_compute_got_alloc_data (struct _frvfdpic_dynamic_got_alloc_data *gad,
+				  bfd_signed_vma fdcur,
+				  bfd_signed_vma odd,
+				  bfd_signed_vma cur,
+				  bfd_vma got,
+				  bfd_vma fd,
+				  bfd_vma fdplt,
+				  bfd_vma tlsd,
+				  bfd_vma tlsdplt,
+				  bfd_vma wrap)
+{
+  bfd_signed_vma wrapmin = -wrap;
+  const bfd_vma tdescsz = 8;
+
+  /* Start at the given initial points.  */
+  gad->fdcur = fdcur;
+  gad->cur = cur;
+
+  /* If we had an incoming odd word and we have any got entries that
+     are going to use it, consume it, otherwise leave gad->odd at
+     zero.  We might force gad->odd to zero and return the incoming
+     odd such that it is used by the next range, but then GOT entries
+     might appear to be out of order and we wouldn't be able to
+     shorten the GOT by one word if it turns out to end with an
+     unpaired GOT entry.  */
+  if (odd && got)
+    {
+      gad->odd = odd;
+      got -= 4;
+      odd = 0;
+    }
+  else
+    gad->odd = 0;
+
+  /* If we're left with an unpaired GOT entry, compute its location
+     such that we can return it.  Otherwise, if got doesn't require an
+     odd number of words here, either odd was already zero in the
+     block above, or it was set to zero because got was non-zero, or
+     got was already zero.  In the latter case, we want the value of
+     odd to carry over to the return statement, so we don't want to
+     reset odd unless the condition below is true.  */
+  if (got & 4)
+    {
+      odd = cur + got;
+      got += 4;
+    }
+
+  /* Compute the tentative boundaries of this range.  */
+  gad->max = cur + got;
+  gad->min = fdcur - fd;
+  gad->fdplt = 0;
+
+  /* If function descriptors took too much space, wrap some of them
+     around.  */
+  if (gad->min < wrapmin)
+    {
+      gad->max += wrapmin - gad->min;
+      gad->tmin = gad->min = wrapmin;
+    }
+
+  /* If GOT entries took too much space, wrap some of them around.
+     This may well cause gad->min to become lower than wrapmin.  This
+     will cause a relocation overflow later on, so we don't have to
+     report it here . */
+  if ((bfd_vma) gad->max > wrap)
+    {
+      gad->min -= gad->max - wrap;
+      gad->max = wrap;
+    }
+
+  /* Add TLS descriptors.  */
+  gad->tmax = gad->max + tlsd;
+  gad->tmin = gad->min;
+  gad->tlsdplt = 0;
+
+  /* If TLS descriptors took too much space, wrap an integral number
+     of them around.  */
+  if ((bfd_vma) gad->tmax > wrap)
+    {
+      bfd_vma wrapsize = gad->tmax - wrap;
+
+      wrapsize += tdescsz / 2;
+      wrapsize &= ~ tdescsz / 2;
+
+      gad->tmin -= wrapsize;
+      gad->tmax -= wrapsize;
+    }
+
+  /* If there is space left and we have function descriptors
+     referenced in PLT entries that could take advantage of shorter
+     offsets, place them now.  */
+  if (fdplt && gad->tmin > wrapmin)
+    {
+      bfd_vma fds;
+
+      if ((bfd_vma) (gad->tmin - wrapmin) < fdplt)
+	fds = gad->tmin - wrapmin;
+      else
+	fds = fdplt;
+
+      fdplt -= fds;
+      gad->min -= fds;
+      gad->tmin -= fds;
+      gad->fdplt += fds;
+    }
+
+  /* If there is more space left, try to place some more function
+     descriptors for PLT entries.  */
+  if (fdplt && (bfd_vma) gad->tmax < wrap)
+    {
+      bfd_vma fds;
+
+      if ((bfd_vma) (wrap - gad->tmax) < fdplt)
+	fds = wrap - gad->tmax;
+      else
+	fds = fdplt;
+
+      fdplt -= fds;
+      gad->max += fds;
+      gad->tmax += fds;
+      gad->fdplt += fds;
+    }
+
+  /* If there is space left and we have TLS descriptors referenced in
+     PLT entries that could take advantage of shorter offsets, place
+     them now.  */
+  if (tlsdplt && gad->tmin > wrapmin)
+    {
+      bfd_vma tlsds;
+
+      if ((bfd_vma) (gad->tmin - wrapmin) < tlsdplt)
+	tlsds = (gad->tmin - wrapmin) & ~ (tdescsz / 2);
+      else
+	tlsds = tlsdplt;
+
+      tlsdplt -= tlsds;
+      gad->tmin -= tlsds;
+      gad->tlsdplt += tlsds;
+    }
+
+  /* If there is more space left, try to place some more TLS
+     descriptors for PLT entries.  Although we could try to fit an
+     additional TLS descriptor with half of it just before before the
+     wrap point and another right past the wrap point, this might
+     cause us to run out of space for the next region, so don't do
+     it.  */
+  if (tlsdplt && (bfd_vma) gad->tmax < wrap - tdescsz / 2)
+    {
+      bfd_vma tlsds;
+
+      if ((bfd_vma) (wrap - gad->tmax) < tlsdplt)
+	tlsds = (wrap - gad->tmax) & ~ (tdescsz / 2);
+      else
+	tlsds = tlsdplt;
+
+      tlsdplt -= tlsds;
+      gad->tmax += tlsds;
+      gad->tlsdplt += tlsds;
+    }
+
+  /* If odd was initially computed as an offset past the wrap point,
+     wrap it around.  */
+  if (odd > gad->max)
+    odd = gad->min + odd - gad->max;
+
+  /* _frvfdpic_get_got_entry() below will always wrap gad->cur if needed
+     before returning, so do it here too.  This guarantees that,
+     should cur and fdcur meet at the wrap point, they'll both be
+     equal to min.  */
+  if (gad->cur == gad->max)
+    gad->cur = gad->min;
+
+  /* Ditto for _frvfdpic_get_tlsdesc_entry().  */
+  gad->tcur = gad->max;
+  if (gad->tcur == gad->tmax)
+    gad->tcur = gad->tmin;
+
+  return odd;
+}
+
+/* Compute the location of the next GOT entry, given the allocation
+   data for a range.  */
+
+inline static bfd_signed_vma
+_frvfdpic_get_got_entry (struct _frvfdpic_dynamic_got_alloc_data *gad)
+{
+  bfd_signed_vma ret;
+
+  if (gad->odd)
+    {
+      /* If there was an odd word left behind, use it.  */
+      ret = gad->odd;
+      gad->odd = 0;
+    }
+  else
+    {
+      /* Otherwise, use the word pointed to by cur, reserve the next
+	 as an odd word, and skip to the next pair of words, possibly
+	 wrapping around.  */
+      ret = gad->cur;
+      gad->odd = gad->cur + 4;
+      gad->cur += 8;
+      if (gad->cur == gad->max)
+	gad->cur = gad->min;
+    }
+
+  return ret;
+}
+
+/* Compute the location of the next function descriptor entry in the
+   GOT, given the allocation data for a range.  */
+
+inline static bfd_signed_vma
+_frvfdpic_get_fd_entry (struct _frvfdpic_dynamic_got_alloc_data *gad)
+{
+  /* If we're at the bottom, wrap around, and only then allocate the
+     next pair of words.  */
+  if (gad->fdcur == gad->min)
+    gad->fdcur = gad->max;
+  return gad->fdcur -= 8;
+}
+
+/* Compute the location of the next TLS descriptor entry in the GOT,
+   given the allocation data for a range.  */
+inline static bfd_signed_vma
+_frvfdpic_get_tlsdesc_entry (struct _frvfdpic_dynamic_got_alloc_data *gad)
+{
+  bfd_signed_vma ret;
+
+  ret = gad->tcur;
+
+  gad->tcur += 8;
+
+  /* If we're at the top of the region, wrap around to the bottom.  */
+  if (gad->tcur == gad->tmax)
+    gad->tcur = gad->tmin;
+
+  return ret;
+}
+
+/* Assign GOT offsets for every GOT entry and function descriptor.
+   Doing everything in a single pass is tricky.  */
+
+static int
+_frvfdpic_assign_got_entries (void **entryp, void *info_)
+{
+  struct frvfdpic_relocs_info *entry = *entryp;
+  struct _frvfdpic_dynamic_got_plt_info *dinfo = info_;
+
+  if (entry->got12)
+    entry->got_entry = _frvfdpic_get_got_entry (&dinfo->got12);
+  else if (entry->gotlos)
+    entry->got_entry = _frvfdpic_get_got_entry (&dinfo->gotlos);
+  else if (entry->gothilo)
+    entry->got_entry = _frvfdpic_get_got_entry (&dinfo->gothilo);
+
+  if (entry->fdgot12)
+    entry->fdgot_entry = _frvfdpic_get_got_entry (&dinfo->got12);
+  else if (entry->fdgotlos)
+    entry->fdgot_entry = _frvfdpic_get_got_entry (&dinfo->gotlos);
+  else if (entry->fdgothilo)
+    entry->fdgot_entry = _frvfdpic_get_got_entry (&dinfo->gothilo);
+
+  if (entry->fdgoff12)
+    entry->fd_entry = _frvfdpic_get_fd_entry (&dinfo->got12);
+  else if (entry->plt && dinfo->got12.fdplt)
+    {
+      dinfo->got12.fdplt -= 8;
+      entry->fd_entry = _frvfdpic_get_fd_entry (&dinfo->got12);
+    }
+  else if (entry->fdgofflos)
+    entry->fd_entry = _frvfdpic_get_fd_entry (&dinfo->gotlos);
+  else if (entry->plt && dinfo->gotlos.fdplt)
+    {
+      dinfo->gotlos.fdplt -= 8;
+      entry->fd_entry = _frvfdpic_get_fd_entry (&dinfo->gotlos);
+    }
+  else if (entry->plt)
+    {
+      dinfo->gothilo.fdplt -= 8;
+      entry->fd_entry = _frvfdpic_get_fd_entry (&dinfo->gothilo);
+    }
+  else if (entry->privfd)
+    entry->fd_entry = _frvfdpic_get_fd_entry (&dinfo->gothilo);
+
+  if (entry->tlsoff12)
+    entry->tlsoff_entry = _frvfdpic_get_got_entry (&dinfo->got12);
+  else if (entry->tlsofflos)
+    entry->tlsoff_entry = _frvfdpic_get_got_entry (&dinfo->gotlos);
+  else if (entry->tlsoffhilo)
+    entry->tlsoff_entry = _frvfdpic_get_got_entry (&dinfo->gothilo);
+
+  if (entry->tlsdesc12)
+    entry->tlsdesc_entry = _frvfdpic_get_tlsdesc_entry (&dinfo->got12);
+  else if (entry->tlsplt && dinfo->got12.tlsdplt)
+    {
+      dinfo->got12.tlsdplt -= 8;
+      entry->tlsdesc_entry = _frvfdpic_get_tlsdesc_entry (&dinfo->got12);
+    }
+  else if (entry->tlsdesclos)
+    entry->tlsdesc_entry = _frvfdpic_get_tlsdesc_entry (&dinfo->gotlos);
+  else if (entry->tlsplt && dinfo->gotlos.tlsdplt)
+    {
+      dinfo->gotlos.tlsdplt -= 8;
+      entry->tlsdesc_entry = _frvfdpic_get_tlsdesc_entry (&dinfo->gotlos);
+    }
+  else if (entry->tlsplt)
+    {
+      dinfo->gothilo.tlsdplt -= 8;
+      entry->tlsdesc_entry = _frvfdpic_get_tlsdesc_entry (&dinfo->gothilo);
+    }
+  else if (entry->tlsdeschilo)
+    entry->tlsdesc_entry = _frvfdpic_get_tlsdesc_entry (&dinfo->gothilo);
+
+  return 1;
+}
+
+/* Assign GOT offsets to private function descriptors used by PLT
+   entries (or referenced by 32-bit offsets), as well as PLT entries
+   and lazy PLT entries.  */
+
+static int
+_frvfdpic_assign_plt_entries (void **entryp, void *info_)
+{
+  struct frvfdpic_relocs_info *entry = *entryp;
+  struct _frvfdpic_dynamic_got_plt_info *dinfo = info_;
+
+  if (entry->privfd)
+    BFD_ASSERT (entry->fd_entry);
+
+  if (entry->plt)
+    {
+      int size;
+
+      /* We use the section's raw size to mark the location of the
+	 next PLT entry.  */
+      entry->plt_entry = frvfdpic_plt_section (dinfo->g.info)->size;
+
+      /* Figure out the length of this PLT entry based on the
+	 addressing mode we need to reach the function descriptor.  */
+      BFD_ASSERT (entry->fd_entry);
+      if (entry->fd_entry >= -(1 << (12 - 1))
+	  && entry->fd_entry < (1 << (12 - 1)))
+	size = 8;
+      else if (entry->fd_entry >= -(1 << (16 - 1))
+	       && entry->fd_entry < (1 << (16 - 1)))
+	size = 12;
+      else
+	size = 16;
+
+      frvfdpic_plt_section (dinfo->g.info)->size += size;
+    }
+
+  if (entry->lazyplt)
+    {
+      entry->lzplt_entry = dinfo->g.lzplt;
+      dinfo->g.lzplt += 8;
+      /* If this entry is the one that gets the resolver stub, account
+	 for the additional instruction.  */
+      if (entry->lzplt_entry % FRVFDPIC_LZPLT_BLOCK_SIZE
+	  == FRVFDPIC_LZPLT_RESOLV_LOC)
+	dinfo->g.lzplt += 4;
+    }
+
+  if (entry->tlsplt)
+    {
+      int size;
+
+      entry->tlsplt_entry
+	= frvfdpic_plt_section (dinfo->g.info)->size;
+
+      if (dinfo->g.info->executable
+	  && (entry->symndx != -1
+	      || FRVFDPIC_SYM_LOCAL (dinfo->g.info, entry->d.h)))
+	{
+	  if ((bfd_signed_vma)entry->addend >= -(1 << (16 - 1))
+	      /* FIXME: here we use the size of the TLS section
+		 as an upper bound for the value of the TLS
+		 symbol, because we may not know the exact value
+		 yet.  If we get it wrong, we'll just waste a
+		 word in the PLT, and we should never get even
+		 close to 32 KiB of TLS anyway.  */
+	      && elf_hash_table (dinfo->g.info)->tls_sec
+	      && (elf_hash_table (dinfo->g.info)->tls_sec->size
+		  + (bfd_signed_vma)(entry->addend) <= (1 << (16 - 1))))
+	    size = 8;
+	  else
+	    size = 12;
+	}
+      else if (entry->tlsoff_entry)
+	{
+	  if (entry->tlsoff_entry >= -(1 << (12 - 1))
+	      && entry->tlsoff_entry < (1 << (12 - 1)))
+	    size = 8;
+	  else if (entry->tlsoff_entry >= -(1 << (16 - 1))
+		   && entry->tlsoff_entry < (1 << (16 - 1)))
+	    size = 12;
+	  else
+	    size = 16;
+	}
+      else
+	{
+	  BFD_ASSERT (entry->tlsdesc_entry);
+
+	  if (entry->tlsdesc_entry >= -(1 << (12 - 1))
+	      && entry->tlsdesc_entry < (1 << (12 - 1)))
+	    size = 8;
+	  else if (entry->tlsdesc_entry >= -(1 << (16 - 1))
+		   && entry->tlsdesc_entry < (1 << (16 - 1)))
+	    size = 12;
+	  else
+	    size = 16;
+	}
+
+      frvfdpic_plt_section (dinfo->g.info)->size += size;
+    }
+
+  return 1;
+}
+
+/* Cancel out any effects of calling _frvfdpic_assign_got_entries and
+   _frvfdpic_assign_plt_entries.  */
+
+static int
+_frvfdpic_reset_got_plt_entries (void **entryp, void *ignore ATTRIBUTE_UNUSED)
+{
+  struct frvfdpic_relocs_info *entry = *entryp;
+
+  entry->got_entry = 0;
+  entry->fdgot_entry = 0;
+  entry->fd_entry = 0;
+  entry->plt_entry = (bfd_vma)-1;
+  entry->lzplt_entry = (bfd_vma)-1;
+  entry->tlsoff_entry = 0;
+  entry->tlsdesc_entry = 0;
+  entry->tlsplt_entry = (bfd_vma)-1;
+
+  return 1;
+}
+
+/* Follow indirect and warning hash entries so that each got entry
+   points to the final symbol definition.  P must point to a pointer
+   to the hash table we're traversing.  Since this traversal may
+   modify the hash table, we set this pointer to NULL to indicate
+   we've made a potentially-destructive change to the hash table, so
+   the traversal must be restarted.  */
+static int
+_frvfdpic_resolve_final_relocs_info (void **entryp, void *p)
+{
+  struct frvfdpic_relocs_info *entry = *entryp;
+  htab_t *htab = p;
+
+  if (entry->symndx == -1)
+    {
+      struct elf_link_hash_entry *h = entry->d.h;
+      struct frvfdpic_relocs_info *oentry;
+
+      while (h->root.type == bfd_link_hash_indirect
+	     || h->root.type == bfd_link_hash_warning)
+	h = (struct elf_link_hash_entry *)h->root.u.i.link;
+
+      if (entry->d.h == h)
+	return 1;
+
+      oentry = frvfdpic_relocs_info_for_global (*htab, 0, h, entry->addend,
+						NO_INSERT);
+
+      if (oentry)
+	{
+	  /* Merge the two entries.  */
+	  frvfdpic_pic_merge_early_relocs_info (oentry, entry);
+	  htab_clear_slot (*htab, entryp);
+	  return 1;
+	}
+
+      entry->d.h = h;
+
+      /* If we can't find this entry with the new bfd hash, re-insert
+	 it, and get the traversal restarted.  */
+      if (! htab_find (*htab, entry))
+	{
+	  htab_clear_slot (*htab, entryp);
+	  entryp = htab_find_slot (*htab, entry, INSERT);
+	  if (! *entryp)
+	    *entryp = entry;
+	  /* Abort the traversal, since the whole table may have
+	     moved, and leave it up to the parent to restart the
+	     process.  */
+	  *(htab_t *)p = NULL;
+	  return 0;
+	}
+    }
+
+  return 1;
+}
+
+/* Compute the total size of the GOT, the PLT, the dynamic relocations
+   section and the rofixup section.  Assign locations for GOT and PLT
+   entries.  */
+
+static bfd_boolean
+_frvfdpic_size_got_plt (bfd *output_bfd,
+			struct _frvfdpic_dynamic_got_plt_info *gpinfop)
+{
+  bfd_signed_vma odd;
+  bfd_vma limit, tlslimit;
+  struct bfd_link_info *info = gpinfop->g.info;
+  bfd *dynobj = elf_hash_table (info)->dynobj;
+
+  memcpy (frvfdpic_dynamic_got_plt_info (info), &gpinfop->g,
+	  sizeof (gpinfop->g));
+
+  odd = 12;
+  /* Compute the total size taken by entries in the 12-bit and 16-bit
+     ranges, to tell how many PLT function descriptors we can bring
+     into the 12-bit range without causing the 16-bit range to
+     overflow.  */
+  limit = odd + gpinfop->g.got12 + gpinfop->g.gotlos
+    + gpinfop->g.fd12 + gpinfop->g.fdlos
+    + gpinfop->g.tlsd12 + gpinfop->g.tlsdlos;
+  if (limit < (bfd_vma)1 << 16)
+    limit = ((bfd_vma)1 << 16) - limit;
+  else
+    limit = 0;
+  if (gpinfop->g.fdplt < limit)
+    {
+      tlslimit = (limit - gpinfop->g.fdplt) & ~ (bfd_vma) 8;
+      limit = gpinfop->g.fdplt;
+    }
+  else
+    tlslimit = 0;
+  if (gpinfop->g.tlsdplt < tlslimit)
+    tlslimit = gpinfop->g.tlsdplt;
+
+  /* Determine the ranges of GOT offsets that we can use for each
+     range of addressing modes.  */
+  odd = _frvfdpic_compute_got_alloc_data (&gpinfop->got12,
+					  0,
+					  odd,
+					  16,
+					  gpinfop->g.got12,
+					  gpinfop->g.fd12,
+					  limit,
+					  gpinfop->g.tlsd12,
+					  tlslimit,
+					  (bfd_vma)1 << (12-1));
+  odd = _frvfdpic_compute_got_alloc_data (&gpinfop->gotlos,
+					  gpinfop->got12.tmin,
+					  odd,
+					  gpinfop->got12.tmax,
+					  gpinfop->g.gotlos,
+					  gpinfop->g.fdlos,
+					  gpinfop->g.fdplt
+					  - gpinfop->got12.fdplt,
+					  gpinfop->g.tlsdlos,
+					  gpinfop->g.tlsdplt
+					  - gpinfop->got12.tlsdplt,
+					  (bfd_vma)1 << (16-1));
+  odd = _frvfdpic_compute_got_alloc_data (&gpinfop->gothilo,
+					  gpinfop->gotlos.tmin,
+					  odd,
+					  gpinfop->gotlos.tmax,
+					  gpinfop->g.gothilo,
+					  gpinfop->g.fdhilo,
+					  gpinfop->g.fdplt
+					  - gpinfop->got12.fdplt
+					  - gpinfop->gotlos.fdplt,
+					  gpinfop->g.tlsdhilo,
+					  gpinfop->g.tlsdplt
+					  - gpinfop->got12.tlsdplt
+					  - gpinfop->gotlos.tlsdplt,
+					  (bfd_vma)1 << (32-1));
+
+  /* Now assign (most) GOT offsets.  */
+  htab_traverse (frvfdpic_relocs_info (info), _frvfdpic_assign_got_entries,
+		 gpinfop);
+
+  frvfdpic_got_section (info)->size = gpinfop->gothilo.tmax
+    - gpinfop->gothilo.tmin
+    /* If an odd word is the last word of the GOT, we don't need this
+       word to be part of the GOT.  */
+    - (odd + 4 == gpinfop->gothilo.tmax ? 4 : 0);
+  if (frvfdpic_got_section (info)->size == 0)
+    frvfdpic_got_section (info)->flags |= SEC_EXCLUDE;
+  else if (frvfdpic_got_section (info)->size == 12
+	   && ! elf_hash_table (info)->dynamic_sections_created)
+    {
+      frvfdpic_got_section (info)->flags |= SEC_EXCLUDE;
+      frvfdpic_got_section (info)->size = 0;
+    }
+  /* This will be non-NULL during relaxation.  The assumption is that
+     the size of one of these sections will never grow, only shrink,
+     so we can use the larger buffer we allocated before.  */
+  else if (frvfdpic_got_section (info)->contents == NULL)
+    {
+      frvfdpic_got_section (info)->contents =
+	(bfd_byte *) bfd_zalloc (dynobj,
+				 frvfdpic_got_section (info)->size);
+      if (frvfdpic_got_section (info)->contents == NULL)
+	return FALSE;
+    }
+
+  if (frvfdpic_gotrel_section (info))
+    /* Subtract the number of lzplt entries, since those will generate
+       relocations in the pltrel section.  */
+    frvfdpic_gotrel_section (info)->size =
+      (gpinfop->g.relocs - gpinfop->g.lzplt / 8)
+      * get_elf_backend_data (output_bfd)->s->sizeof_rel;
+  else
+    BFD_ASSERT (gpinfop->g.relocs == 0);
+  if (frvfdpic_gotrel_section (info)->size == 0)
+    frvfdpic_gotrel_section (info)->flags |= SEC_EXCLUDE;
+  else if (frvfdpic_gotrel_section (info)->contents == NULL)
+    {
+      frvfdpic_gotrel_section (info)->contents =
+	(bfd_byte *) bfd_zalloc (dynobj,
+				 frvfdpic_gotrel_section (info)->size);
+      if (frvfdpic_gotrel_section (info)->contents == NULL)
+	return FALSE;
+    }
+
+  frvfdpic_gotfixup_section (info)->size = (gpinfop->g.fixups + 1) * 4;
+  if (frvfdpic_gotfixup_section (info)->size == 0)
+    frvfdpic_gotfixup_section (info)->flags |= SEC_EXCLUDE;
+  else if (frvfdpic_gotfixup_section (info)->contents == NULL)
+    {
+      frvfdpic_gotfixup_section (info)->contents =
+	(bfd_byte *) bfd_zalloc (dynobj,
+				 frvfdpic_gotfixup_section (info)->size);
+      if (frvfdpic_gotfixup_section (info)->contents == NULL)
+	return FALSE;
+    }
+
+  if (frvfdpic_pltrel_section (info))
+    {
+      frvfdpic_pltrel_section (info)->size =
+	gpinfop->g.lzplt / 8
+	* get_elf_backend_data (output_bfd)->s->sizeof_rel;
+      if (frvfdpic_pltrel_section (info)->size == 0)
+	frvfdpic_pltrel_section (info)->flags |= SEC_EXCLUDE;
+      else if (frvfdpic_pltrel_section (info)->contents == NULL)
+	{
+	  frvfdpic_pltrel_section (info)->contents =
+	    (bfd_byte *) bfd_zalloc (dynobj,
+				     frvfdpic_pltrel_section (info)->size);
+	  if (frvfdpic_pltrel_section (info)->contents == NULL)
+	    return FALSE;
+	}
+    }
+
+  /* Add 4 bytes for every block of at most 65535 lazy PLT entries,
+     such that there's room for the additional instruction needed to
+     call the resolver.  Since _frvfdpic_assign_got_entries didn't
+     account for them, our block size is 4 bytes smaller than the real
+     block size.  */
+  if (frvfdpic_plt_section (info))
+    {
+      frvfdpic_plt_section (info)->size = gpinfop->g.lzplt
+	+ ((gpinfop->g.lzplt + (FRVFDPIC_LZPLT_BLOCK_SIZE - 4) - 8)
+	   / (FRVFDPIC_LZPLT_BLOCK_SIZE - 4) * 4);
+    }
+
+  /* Reset it, such that _frvfdpic_assign_plt_entries() can use it to
+     actually assign lazy PLT entries addresses.  */
+  gpinfop->g.lzplt = 0;
+
+  /* Save information that we're going to need to generate GOT and PLT
+     entries.  */
+  frvfdpic_got_initial_offset (info) = -gpinfop->gothilo.tmin;
+
+  if (get_elf_backend_data (output_bfd)->want_got_sym)
+    elf_hash_table (info)->hgot->root.u.def.value
+      = frvfdpic_got_initial_offset (info);
+
+  if (frvfdpic_plt_section (info))
+    frvfdpic_plt_initial_offset (info) =
+      frvfdpic_plt_section (info)->size;
+
+  /* Allocate a ret statement at plt_initial_offset, to be used by
+     locally-resolved TLS descriptors.  */
+  if (gpinfop->g.tls_ret_refs)
+    frvfdpic_plt_section (info)->size += 4;
+
+  htab_traverse (frvfdpic_relocs_info (info), _frvfdpic_assign_plt_entries,
+		 gpinfop);
+
+  /* Allocate the PLT section contents only after
+     _frvfdpic_assign_plt_entries has a chance to add the size of the
+     non-lazy PLT entries.  */
+  if (frvfdpic_plt_section (info))
+    {
+      if (frvfdpic_plt_section (info)->size == 0)
+	frvfdpic_plt_section (info)->flags |= SEC_EXCLUDE;
+      else if (frvfdpic_plt_section (info)->contents == NULL)
+	{
+	  frvfdpic_plt_section (info)->contents =
+	    (bfd_byte *) bfd_zalloc (dynobj,
+				     frvfdpic_plt_section (info)->size);
+	  if (frvfdpic_plt_section (info)->contents == NULL)
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+elf32_frvfdpic_size_dynamic_sections (bfd *output_bfd,
+				      struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *s;
+  struct _frvfdpic_dynamic_got_plt_info gpinfo;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (s != NULL);
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (bfd_byte *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+
+  memset (&gpinfo, 0, sizeof (gpinfo));
+  gpinfo.g.info = info;
+
+  for (;;)
+    {
+      htab_t relocs = frvfdpic_relocs_info (info);
+
+      htab_traverse (relocs, _frvfdpic_resolve_final_relocs_info, &relocs);
+
+      if (relocs == frvfdpic_relocs_info (info))
+	break;
+    }
+
+  htab_traverse (frvfdpic_relocs_info (info), _frvfdpic_count_got_plt_entries,
+		 &gpinfo.g);
+
+  /* Allocate space to save the summary information, we're going to
+     use it if we're doing relaxations.  */
+  frvfdpic_dynamic_got_plt_info (info) = bfd_alloc (dynobj, sizeof (gpinfo.g));
+
+  if (!_frvfdpic_size_got_plt (output_bfd, &gpinfo))
+    return FALSE;
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      if (frvfdpic_got_section (info)->size)
+	if (!_bfd_elf_add_dynamic_entry (info, DT_PLTGOT, 0))
+	  return FALSE;
+
+      if (frvfdpic_pltrel_section (info)->size)
+	if (!_bfd_elf_add_dynamic_entry (info, DT_PLTRELSZ, 0)
+	    || !_bfd_elf_add_dynamic_entry (info, DT_PLTREL, DT_REL)
+	    || !_bfd_elf_add_dynamic_entry (info, DT_JMPREL, 0))
+	  return FALSE;
+
+      if (frvfdpic_gotrel_section (info)->size)
+	if (!_bfd_elf_add_dynamic_entry (info, DT_REL, 0)
+	    || !_bfd_elf_add_dynamic_entry (info, DT_RELSZ, 0)
+	    || !_bfd_elf_add_dynamic_entry (info, DT_RELENT,
+					    sizeof (Elf32_External_Rel)))
+	  return FALSE;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf32_frvfdpic_always_size_sections (bfd *output_bfd,
+				     struct bfd_link_info *info)
+{
+  if (!info->relocatable)
+    {
+      struct elf_link_hash_entry *h;
+
+      /* Force a PT_GNU_STACK segment to be created.  */
+      if (! elf_tdata (output_bfd)->stack_flags)
+	elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
+
+      /* Define __stacksize if it's not defined yet.  */
+      h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
+				FALSE, FALSE, FALSE);
+      if (! h || h->root.type != bfd_link_hash_defined
+	  || h->type != STT_OBJECT
+	  || !h->def_regular)
+	{
+	  struct bfd_link_hash_entry *bh = NULL;
+
+	  if (!(_bfd_generic_link_add_one_symbol
+		(info, output_bfd, "__stacksize",
+		 BSF_GLOBAL, bfd_abs_section_ptr, DEFAULT_STACK_SIZE,
+		 (const char *) NULL, FALSE,
+		 get_elf_backend_data (output_bfd)->collect, &bh)))
+	    return FALSE;
+
+	  h = (struct elf_link_hash_entry *) bh;
+	  h->def_regular = 1;
+	  h->type = STT_OBJECT;
+	  /* This one must NOT be hidden.  */
+	}
+    }
+
+  return TRUE;
+}
+
+/* Check whether any of the relocations was optimized away, and
+   subtract it from the relocation or fixup count.  */
+static bfd_boolean
+_frvfdpic_check_discarded_relocs (bfd *abfd, asection *sec,
+				  struct bfd_link_info *info,
+				  
+				  bfd_boolean *changed)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel, *erel;
+
+  if ((sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  rel = elf_section_data (sec)->relocs;
+
+  /* Now examine each relocation.  */
+  for (erel = rel + sec->reloc_count; rel < erel; rel++)
+    {
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+      struct frvfdpic_relocs_info *picrel;
+      struct _frvfdpic_dynamic_got_info *dinfo;
+
+      if (ELF32_R_TYPE (rel->r_info) != R_FRV_32
+	  && ELF32_R_TYPE (rel->r_info) != R_FRV_FUNCDESC)
+	continue;
+
+      if (_bfd_elf_section_offset (sec->output_section->owner,
+				   info, sec, rel->r_offset)
+	  != (bfd_vma)-1)
+	continue;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+	h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *)h->root.u.i.link;
+	}
+
+      if (h != NULL)
+	picrel = frvfdpic_relocs_info_for_global (frvfdpic_relocs_info (info),
+						  abfd, h,
+						  rel->r_addend, NO_INSERT);
+      else
+	picrel = frvfdpic_relocs_info_for_local (frvfdpic_relocs_info (info),
+						 abfd, r_symndx,
+						 rel->r_addend, NO_INSERT);
+
+      if (! picrel)
+	return FALSE;
+
+      *changed = TRUE;
+      dinfo = frvfdpic_dynamic_got_plt_info (info);
+
+      _frvfdpic_count_relocs_fixups (picrel, dinfo, TRUE);
+      if (ELF32_R_TYPE (rel->r_info) == R_FRV_32)
+	picrel->relocs32--;
+      else /* we know (ELF32_R_TYPE (rel->r_info) == R_FRV_FUNCDESC) */
+	picrel->relocsfd--;
+      _frvfdpic_count_relocs_fixups (picrel, dinfo, FALSE);
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+frvfdpic_elf_discard_info (bfd *ibfd,
+			   struct elf_reloc_cookie *cookie ATTRIBUTE_UNUSED,
+			   struct bfd_link_info *info)
+{
+  bfd_boolean changed = FALSE;
+  asection *s;
+  bfd *obfd = NULL;
+
+  /* Account for relaxation of .eh_frame section.  */
+  for (s = ibfd->sections; s; s = s->next)
+    if (s->sec_info_type == ELF_INFO_TYPE_EH_FRAME)
+      {
+	if (!_frvfdpic_check_discarded_relocs (ibfd, s, info, &changed))
+	  return FALSE;
+	obfd = s->output_section->owner;
+      }
+
+  if (changed)
+    {
+      struct _frvfdpic_dynamic_got_plt_info gpinfo;
+
+      memset (&gpinfo, 0, sizeof (gpinfo));
+      memcpy (&gpinfo.g, frvfdpic_dynamic_got_plt_info (info),
+	      sizeof (gpinfo.g));
+
+      /* Clear GOT and PLT assignments.  */
+      htab_traverse (frvfdpic_relocs_info (info),
+		     _frvfdpic_reset_got_plt_entries,
+		     NULL);
+
+      if (!_frvfdpic_size_got_plt (obfd, &gpinfo))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Look for opportunities to relax TLS relocations.  We can assume
+   we're linking the main executable or a static-tls library, since
+   otherwise we wouldn't have got here.  */
+
+static int
+_frvfdpic_relax_got_plt_entries (void **entryp, void *dinfo_)
+{
+  struct frvfdpic_relocs_info *entry = *entryp;
+  struct _frvfdpic_dynamic_got_info *dinfo = dinfo_;
+
+  _frvfdpic_relax_tls_entries (entry, dinfo, TRUE);
+
+  return 1;
+}
+
+static bfd_boolean
+elf32_frvfdpic_relax_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec,
+			      struct bfd_link_info *info, bfd_boolean *again)
+{
+  struct _frvfdpic_dynamic_got_plt_info gpinfo;
+
+  if (info->relocatable)
+    (*info->callbacks->einfo)
+      (_("%P%F: --relax and -r may not be used together\n"));
+
+  /* If we return early, we didn't change anything.  */
+  *again = FALSE;
+
+  /* We'll do our thing when requested to relax the GOT section.  */
+  if (sec != frvfdpic_got_section (info))
+    return TRUE;
+
+  /* We can only relax when linking the main executable or a library
+     that can't be dlopened.  */
+  if (! info->executable && ! (info->flags & DF_STATIC_TLS))
+    return TRUE;
+
+  /* If there isn't a TLS section for this binary, we can't do
+     anything about its TLS relocations (it probably doesn't have
+     any.  */
+  if (elf_hash_table (info)->tls_sec == NULL)
+    return TRUE;
+
+  memset (&gpinfo, 0, sizeof (gpinfo));
+  memcpy (&gpinfo.g, frvfdpic_dynamic_got_plt_info (info), sizeof (gpinfo.g));
+
+  /* Now look for opportunities to relax, adjusting the GOT usage
+     as needed.  */
+  htab_traverse (frvfdpic_relocs_info (info),
+		 _frvfdpic_relax_got_plt_entries,
+		 &gpinfo.g);
+
+  /* If we changed anything, reset and re-assign GOT and PLT entries.  */
+  if (memcmp (frvfdpic_dynamic_got_plt_info (info),
+	      &gpinfo.g, sizeof (gpinfo.g)) != 0)
+    {
+      /* Clear GOT and PLT assignments.  */
+      htab_traverse (frvfdpic_relocs_info (info),
+		     _frvfdpic_reset_got_plt_entries,
+		     NULL);
+
+      /* The owner of the TLS section is the output bfd.  There should
+	 be a better way to get to it.  */
+      if (!_frvfdpic_size_got_plt (elf_hash_table (info)->tls_sec->owner,
+				   &gpinfo))
+	return FALSE;
+
+      /* Repeat until we don't make any further changes.  We could fail to
+	 introduce changes in a round if, for example, the 12-bit range is
+	 full, but we later release some space by getting rid of TLS
+	 descriptors in it.  We have to repeat the whole process because
+	 we might have changed the size of a section processed before this
+	 one.  */
+      *again = TRUE;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf32_frvfdpic_modify_program_headers (bfd *output_bfd,
+				       struct bfd_link_info *info)
+{
+  struct elf_obj_tdata *tdata = elf_tdata (output_bfd);
+  struct elf_segment_map *m;
+  Elf_Internal_Phdr *p;
+
+  /* objcopy and strip preserve what's already there using
+     elf32_frvfdpic_copy_private_bfd_data ().  */
+  if (! info)
+    return TRUE;
+
+  for (p = tdata->phdr, m = tdata->segment_map; m != NULL; m = m->next, p++)
+    if (m->p_type == PT_GNU_STACK)
+      break;
+
+  if (m)
+    {
+      struct elf_link_hash_entry *h;
+
+      /* Obtain the pointer to the __stacksize symbol.  */
+      h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
+				FALSE, FALSE, FALSE);
+      if (h)
+	{
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	  BFD_ASSERT (h->root.type == bfd_link_hash_defined);
+	}
+
+      /* Set the header p_memsz from the symbol value.  We
+	 intentionally ignore the symbol section.  */
+      if (h && h->root.type == bfd_link_hash_defined)
+	p->p_memsz = h->root.u.def.value;
+      else
+	p->p_memsz = DEFAULT_STACK_SIZE;
+
+      p->p_align = 8;
+    }
+
+  return TRUE;
+}
+
+/* Fill in code and data in dynamic sections.  */
+
+static bfd_boolean
+elf32_frv_finish_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+				   struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  /* Nothing to be done for non-FDPIC.  */
+  return TRUE;
+}
+
+static bfd_boolean
+elf32_frvfdpic_finish_dynamic_sections (bfd *output_bfd,
+					struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *sdyn;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  if (frvfdpic_dynamic_got_plt_info (info))
+    {
+      BFD_ASSERT (frvfdpic_dynamic_got_plt_info (info)->tls_ret_refs == 0);
+    }
+  if (frvfdpic_got_section (info))
+    {
+      BFD_ASSERT (frvfdpic_gotrel_section (info)->size
+		  == (frvfdpic_gotrel_section (info)->reloc_count
+		      * sizeof (Elf32_External_Rel)));
+
+      if (frvfdpic_gotfixup_section (info))
+	{
+	  struct elf_link_hash_entry *hgot = elf_hash_table (info)->hgot;
+	  bfd_vma got_value = hgot->root.u.def.value
+	    + hgot->root.u.def.section->output_section->vma
+	    + hgot->root.u.def.section->output_offset;
+	  struct bfd_link_hash_entry *hend;
+
+	  _frvfdpic_add_rofixup (output_bfd, frvfdpic_gotfixup_section (info),
+				 got_value, 0);
+
+	  if (frvfdpic_gotfixup_section (info)->size
+	      != (frvfdpic_gotfixup_section (info)->reloc_count * 4))
+	    {
+	    error:
+	      info->callbacks->einfo
+		("LINKER BUG: .rofixup section size mismatch\n");
+	      return FALSE;
+	    }
+
+	  hend = bfd_link_hash_lookup (info->hash, "__ROFIXUP_END__",
+				       FALSE, FALSE, TRUE);
+	  if (hend
+	      && (hend->type == bfd_link_hash_defined
+		  || hend->type == bfd_link_hash_defweak)
+	      && hend->u.def.section->output_section != NULL)
+	    {
+	      bfd_vma value =
+		frvfdpic_gotfixup_section (info)->output_section->vma
+		+ frvfdpic_gotfixup_section (info)->output_offset
+		+ frvfdpic_gotfixup_section (info)->size
+		- hend->u.def.section->output_section->vma
+		- hend->u.def.section->output_offset;
+	      BFD_ASSERT (hend->u.def.value == value);
+	      if (hend->u.def.value != value)
+		goto error;
+	    }
+	}
+    }
+  if (frvfdpic_pltrel_section (info))
+    {
+      BFD_ASSERT (frvfdpic_pltrel_section (info)->size
+		  == (frvfdpic_pltrel_section (info)->reloc_count
+		      * sizeof (Elf32_External_Rel)));
+    }
+
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      Elf32_External_Dyn * dyncon;
+      Elf32_External_Dyn * dynconend;
+
+      sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+      BFD_ASSERT (sdyn != NULL);
+
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+
+	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    default:
+	      break;
+
+	    case DT_PLTGOT:
+	      dyn.d_un.d_ptr = frvfdpic_got_section (info)->output_section->vma
+		+ frvfdpic_got_section (info)->output_offset
+		+ frvfdpic_got_initial_offset (info);
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_JMPREL:
+	      dyn.d_un.d_ptr = frvfdpic_pltrel_section (info)
+		->output_section->vma
+		+ frvfdpic_pltrel_section (info)->output_offset;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_PLTRELSZ:
+	      dyn.d_un.d_val = frvfdpic_pltrel_section (info)->size;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  */
+
+static bfd_boolean
+elf32_frvfdpic_adjust_dynamic_symbol
+(struct bfd_link_info *info ATTRIBUTE_UNUSED,
+ struct elf_link_hash_entry *h ATTRIBUTE_UNUSED)
+{
+  bfd * dynobj;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (dynobj != NULL
+	      && (h->u.weakdef != NULL
+		  || (h->def_dynamic
+		      && h->ref_regular
+		      && !h->def_regular)));
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+    }
+
+  return TRUE;
+}
+
+/* Perform any actions needed for dynamic symbols.  */
+
+static bfd_boolean
+elf32_frvfdpic_finish_dynamic_symbol
+(bfd *output_bfd ATTRIBUTE_UNUSED,
+ struct bfd_link_info *info ATTRIBUTE_UNUSED,
+ struct elf_link_hash_entry *h ATTRIBUTE_UNUSED,
+ Elf_Internal_Sym *sym ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+/* Decide whether to attempt to turn absptr or lsda encodings in
+   shared libraries into pcrel within the given input section.  */
+
+static bfd_boolean
+frvfdpic_elf_use_relative_eh_frame
+(bfd *input_bfd ATTRIBUTE_UNUSED,
+ struct bfd_link_info *info ATTRIBUTE_UNUSED,
+ asection *eh_frame_section ATTRIBUTE_UNUSED)
+{
+  /* We can't use PC-relative encodings in FDPIC binaries, in general.  */
+  return FALSE;
+}
+
+/* Adjust the contents of an eh_frame_hdr section before they're output.  */
+
+static bfd_byte
+frvfdpic_elf_encode_eh_address (bfd *abfd,
+				struct bfd_link_info *info,
+				asection *osec, bfd_vma offset,
+				asection *loc_sec, bfd_vma loc_offset,
+				bfd_vma *encoded)
+{
+  struct elf_link_hash_entry *h;
+
+  h = elf_hash_table (info)->hgot;
+  BFD_ASSERT (h && h->root.type == bfd_link_hash_defined);
+
+  if (! h || (_frvfdpic_osec_to_segment (abfd, osec)
+	      == _frvfdpic_osec_to_segment (abfd, loc_sec->output_section)))
+    return _bfd_elf_encode_eh_address (abfd, info, osec, offset,
+				       loc_sec, loc_offset, encoded);
+
+  BFD_ASSERT (_frvfdpic_osec_to_segment (abfd, osec)
+	      == (_frvfdpic_osec_to_segment
+		  (abfd, h->root.u.def.section->output_section)));
+
+  *encoded = osec->vma + offset
+    - (h->root.u.def.value
+       + h->root.u.def.section->output_section->vma
+       + h->root.u.def.section->output_offset);
+
+  return DW_EH_PE_datarel | DW_EH_PE_sdata4;
+}
+
+/* Look through the relocs for a section during the first phase.
+
+   Besides handling virtual table relocs for gc, we have to deal with
+   all sorts of PIC-related relocations.  We describe below the
+   general plan on how to handle such relocations, even though we only
+   collect information at this point, storing them in hash tables for
+   perusal of later passes.
+
+   32 relocations are propagated to the linker output when creating
+   position-independent output.  LO16 and HI16 relocations are not
+   supposed to be encountered in this case.
+
+   LABEL16 should always be resolvable by the linker, since it's only
+   used by branches.
+
+   LABEL24, on the other hand, is used by calls.  If it turns out that
+   the target of a call is a dynamic symbol, a PLT entry must be
+   created for it, which triggers the creation of a private function
+   descriptor and, unless lazy binding is disabled, a lazy PLT entry.
+
+   GPREL relocations require the referenced symbol to be in the same
+   segment as _gp, but this can only be checked later.
+
+   All GOT, GOTOFF and FUNCDESC relocations require a .got section to
+   exist.  LABEL24 might as well, since it may require a PLT entry,
+   that will require a got.
+
+   Non-FUNCDESC GOT relocations require a GOT entry to be created
+   regardless of whether the symbol is dynamic.  However, since a
+   global symbol that turns out to not be exported may have the same
+   address of a non-dynamic symbol, we don't assign GOT entries at
+   this point, such that we can share them in this case.  A relocation
+   for the GOT entry always has to be created, be it to offset a
+   private symbol by the section load address, be it to get the symbol
+   resolved dynamically.
+
+   FUNCDESC GOT relocations require a GOT entry to be created, and
+   handled as if a FUNCDESC relocation was applied to the GOT entry in
+   an object file.
+
+   FUNCDESC relocations referencing a symbol that turns out to NOT be
+   dynamic cause a private function descriptor to be created.  The
+   FUNCDESC relocation then decays to a 32 relocation that points at
+   the private descriptor.  If the symbol is dynamic, the FUNCDESC
+   relocation is propagated to the linker output, such that the
+   dynamic linker creates the canonical descriptor, pointing to the
+   dynamically-resolved definition of the function.
+
+   Non-FUNCDESC GOTOFF relocations must always refer to non-dynamic
+   symbols that are assigned to the same segment as the GOT, but we
+   can only check this later, after we know the complete set of
+   symbols defined and/or exported.
+
+   FUNCDESC GOTOFF relocations require a function descriptor to be
+   created and, unless lazy binding is disabled or the symbol is not
+   dynamic, a lazy PLT entry.  Since we can't tell at this point
+   whether a symbol is going to be dynamic, we have to decide later
+   whether to create a lazy PLT entry or bind the descriptor directly
+   to the private function.
+
+   FUNCDESC_VALUE relocations are not supposed to be present in object
+   files, but they may very well be simply propagated to the linker
+   output, since they have no side effect.
+
+
+   A function descriptor always requires a FUNCDESC_VALUE relocation.
+   Whether it's in .plt.rel or not depends on whether lazy binding is
+   enabled and on whether the referenced symbol is dynamic.
+
+   The existence of a lazy PLT requires the resolverStub lazy PLT
+   entry to be present.
+
+
+   As for assignment of GOT, PLT and lazy PLT entries, and private
+   descriptors, we might do them all sequentially, but we can do
+   better than that.  For example, we can place GOT entries and
+   private function descriptors referenced using 12-bit operands
+   closer to the PIC register value, such that these relocations don't
+   overflow.  Those that are only referenced with LO16 relocations
+   could come next, but we may as well place PLT-required function
+   descriptors in the 12-bit range to make them shorter.  Symbols
+   referenced with LO16/HI16 may come next, but we may place
+   additional function descriptors in the 16-bit range if we can
+   reliably tell that we've already placed entries that are ever
+   referenced with only LO16.  PLT entries are therefore generated as
+   small as possible, while not introducing relocation overflows in
+   GOT or FUNCDESC_GOTOFF relocations.  Lazy PLT entries could be
+   generated before or after PLT entries, but not intermingled with
+   them, such that we can have more lazy PLT entries in range for a
+   branch to the resolverStub.  The resolverStub should be emitted at
+   the most distant location from the first lazy PLT entry such that
+   it's still in range for a branch, or closer, if there isn't a need
+   for so many lazy PLT entries.  Additional lazy PLT entries may be
+   emitted after the resolverStub, as long as branches are still in
+   range.  If the branch goes out of range, longer lazy PLT entries
+   are emitted.
+
+   We could further optimize PLT and lazy PLT entries by giving them
+   priority in assignment to closer-to-gr17 locations depending on the
+   number of occurrences of references to them (assuming a function
+   that's called more often is more important for performance, so its
+   PLT entry should be faster), or taking hints from the compiler.
+   Given infinite time and money... :-)  */
+
+static bfd_boolean
+elf32_frv_check_relocs (abfd, info, sec, relocs)
+     bfd *abfd;
+     struct bfd_link_info *info;
+     asection *sec;
+     const Elf_Internal_Rela *relocs;
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  bfd *dynobj;
+  struct frvfdpic_relocs_info *picrel;
+
+  if (info->relocatable)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  dynobj = elf_hash_table (info)->dynobj;
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+        h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      switch (ELF32_R_TYPE (rel->r_info))
+	{
+	case R_FRV_GETTLSOFF:
+	case R_FRV_TLSDESC_VALUE:
+	case R_FRV_GOTTLSDESC12:
+	case R_FRV_GOTTLSDESCHI:
+	case R_FRV_GOTTLSDESCLO:
+	case R_FRV_GOTTLSOFF12:
+	case R_FRV_GOTTLSOFFHI:
+	case R_FRV_GOTTLSOFFLO:
+	case R_FRV_TLSOFF:
+	case R_FRV_GOT12:
+	case R_FRV_GOTHI:
+	case R_FRV_GOTLO:
+	case R_FRV_FUNCDESC_GOT12:
+	case R_FRV_FUNCDESC_GOTHI:
+	case R_FRV_FUNCDESC_GOTLO:
+	case R_FRV_GOTOFF12:
+	case R_FRV_GOTOFFHI:
+	case R_FRV_GOTOFFLO:
+	case R_FRV_FUNCDESC_GOTOFF12:
+	case R_FRV_FUNCDESC_GOTOFFHI:
+	case R_FRV_FUNCDESC_GOTOFFLO:
+	case R_FRV_FUNCDESC:
+	case R_FRV_FUNCDESC_VALUE:
+	case R_FRV_TLSMOFF12:
+	case R_FRV_TLSMOFFHI:
+	case R_FRV_TLSMOFFLO:
+	case R_FRV_TLSMOFF:
+	  if (! IS_FDPIC (abfd))
+	    goto bad_reloc;
+	  /* Fall through.  */
+	case R_FRV_GPREL12:
+	case R_FRV_GPRELU12:
+	case R_FRV_GPRELHI:
+	case R_FRV_GPRELLO:
+	case R_FRV_LABEL24:
+	case R_FRV_32:
+	  if (! dynobj)
+	    {
+	      elf_hash_table (info)->dynobj = dynobj = abfd;
+	      if (! _frv_create_got_section (abfd, info))
+		return FALSE;
+	    }
+	  if (! IS_FDPIC (abfd))
+	    {
+	      picrel = NULL;
+	      break;
+	    }
+	  if (h != NULL)
+	    {
+	      if (h->dynindx == -1)
+		switch (ELF_ST_VISIBILITY (h->other))
+		  {
+		  case STV_INTERNAL:
+		  case STV_HIDDEN:
+		    break;
+		  default:
+		    bfd_elf_link_record_dynamic_symbol (info, h);
+		    break;
+		  }
+	      picrel
+		= frvfdpic_relocs_info_for_global (frvfdpic_relocs_info (info),
+						   abfd, h,
+						   rel->r_addend, INSERT);
+	    }
+	  else
+	    picrel = frvfdpic_relocs_info_for_local (frvfdpic_relocs_info
+						     (info), abfd, r_symndx,
+						     rel->r_addend, INSERT);
+	  if (! picrel)
+	    return FALSE;
+	  break;
+
+	default:
+	  picrel = NULL;
+	  break;
+	}
+
+      switch (ELF32_R_TYPE (rel->r_info))
+        {
+	case R_FRV_LABEL24:
+	  if (IS_FDPIC (abfd))
+	    picrel->call = 1;
+	  break;
+
+	case R_FRV_FUNCDESC_VALUE:
+	  picrel->relocsfdv++;
+	  if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)
+	    picrel->relocs32--;
+	  /* Fall through.  */
+
+	case R_FRV_32:
+	  if (! IS_FDPIC (abfd))
+	    break;
+
+	  picrel->sym = 1;
+	  if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)
+	    picrel->relocs32++;
+	  break;
+
+	case R_FRV_GOT12:
+	  picrel->got12 = 1;
+	  break;
+
+	case R_FRV_GOTHI:
+	case R_FRV_GOTLO:
+	  picrel->gothilo = 1;
+	  break;
+
+	case R_FRV_FUNCDESC_GOT12:
+	  picrel->fdgot12 = 1;
+	  break;
+
+	case R_FRV_FUNCDESC_GOTHI:
+	case R_FRV_FUNCDESC_GOTLO:
+	  picrel->fdgothilo = 1;
+	  break;
+
+	case R_FRV_GOTOFF12:
+	case R_FRV_GOTOFFHI:
+	case R_FRV_GOTOFFLO:
+	  picrel->gotoff = 1;
+	  break;
+
+	case R_FRV_FUNCDESC_GOTOFF12:
+	  picrel->fdgoff12 = 1;
+	  break;
+
+	case R_FRV_FUNCDESC_GOTOFFHI:
+	case R_FRV_FUNCDESC_GOTOFFLO:
+	  picrel->fdgoffhilo = 1;
+	  break;
+
+	case R_FRV_FUNCDESC:
+	  picrel->fd = 1;
+	  picrel->relocsfd++;
+	  break;
+
+	case R_FRV_GETTLSOFF:
+	  picrel->tlsplt = 1;
+	  break;
+
+	case R_FRV_TLSDESC_VALUE:
+	  picrel->relocstlsd++;
+	  goto bad_reloc;
+
+	case R_FRV_GOTTLSDESC12:
+	  picrel->tlsdesc12 = 1;
+	  break;
+
+	case R_FRV_GOTTLSDESCHI:
+	case R_FRV_GOTTLSDESCLO:
+	  picrel->tlsdeschilo = 1;
+	  break;
+
+	case R_FRV_TLSMOFF12:
+	case R_FRV_TLSMOFFHI:
+	case R_FRV_TLSMOFFLO:
+	case R_FRV_TLSMOFF:
+	  break;
+
+	case R_FRV_GOTTLSOFF12:
+	  picrel->tlsoff12 = 1;
+	  info->flags |= DF_STATIC_TLS;
+	  break;
+
+	case R_FRV_GOTTLSOFFHI:
+	case R_FRV_GOTTLSOFFLO:
+	  picrel->tlsoffhilo = 1;
+	  info->flags |= DF_STATIC_TLS;
+	  break;
+
+	case R_FRV_TLSOFF:
+	  picrel->relocstlsoff++;
+	  info->flags |= DF_STATIC_TLS;
+	  goto bad_reloc;
+
+        /* This relocation describes the C++ object vtable hierarchy.
+           Reconstruct it for later use during GC.  */
+        case R_FRV_GNU_VTINHERIT:
+          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+
+        /* This relocation describes which C++ vtable entries are actually
+           used.  Record for later use during GC.  */
+        case R_FRV_GNU_VTENTRY:
+          BFD_ASSERT (h != NULL);
+          if (h != NULL
+              && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+            return FALSE;
+          break;
+
+	case R_FRV_LABEL16:
+	case R_FRV_LO16:
+	case R_FRV_HI16:
+	case R_FRV_GPREL12:
+	case R_FRV_GPRELU12:
+	case R_FRV_GPREL32:
+	case R_FRV_GPRELHI:
+	case R_FRV_GPRELLO:
+	case R_FRV_TLSDESC_RELAX:
+	case R_FRV_GETTLSOFF_RELAX:
+	case R_FRV_TLSOFF_RELAX:
+	  break;
+
+	default:
+	bad_reloc:
+	  info->callbacks->einfo
+	    (_("%B: unsupported relocation type %i\n"),
+	     abfd, ELF32_R_TYPE (rel->r_info));
+	  return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+
+/* Return the machine subcode from the ELF e_flags header.  */
+
+static int
+elf32_frv_machine (abfd)
+     bfd *abfd;
+{
+  switch (elf_elfheader (abfd)->e_flags & EF_FRV_CPU_MASK)
+    {
+    default:		    break;
+    case EF_FRV_CPU_FR550:  return bfd_mach_fr550;
+    case EF_FRV_CPU_FR500:  return bfd_mach_fr500;
+    case EF_FRV_CPU_FR450:  return bfd_mach_fr450;
+    case EF_FRV_CPU_FR405:  return bfd_mach_fr400;
+    case EF_FRV_CPU_FR400:  return bfd_mach_fr400;
+    case EF_FRV_CPU_FR300:  return bfd_mach_fr300;
+    case EF_FRV_CPU_SIMPLE: return bfd_mach_frvsimple;
+    case EF_FRV_CPU_TOMCAT: return bfd_mach_frvtomcat;
+    }
+
+  return bfd_mach_frv;
+}
+
+/* Set the right machine number for a FRV ELF file.  */
+
+static bfd_boolean
+elf32_frv_object_p (abfd)
+     bfd *abfd;
+{
+  bfd_default_set_arch_mach (abfd, bfd_arch_frv, elf32_frv_machine (abfd));
+  return (((elf_elfheader (abfd)->e_flags & EF_FRV_FDPIC) != 0)
+	  == (IS_FDPIC (abfd)));
+}
+
+/* Function to set the ELF flag bits.  */
+
+static bfd_boolean
+frv_elf_set_private_flags (abfd, flags)
+     bfd *abfd;
+     flagword flags;
+{
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
+}
+
+/* Copy backend specific data from one object module to another.  */
+
+static bfd_boolean
+frv_elf_copy_private_bfd_data (ibfd, obfd)
+     bfd *ibfd;
+     bfd *obfd;
+{
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  BFD_ASSERT (!elf_flags_init (obfd)
+	      || elf_elfheader (obfd)->e_flags == elf_elfheader (ibfd)->e_flags);
+
+  elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
+  elf_flags_init (obfd) = TRUE;
+
+  /* Copy object attributes.  */
+  _bfd_elf_copy_obj_attributes (ibfd, obfd);
+
+  return TRUE;
+}
+
+/* Return true if the architecture described by elf header flag
+   EXTENSION is an extension of the architecture described by BASE.  */
+
+static bfd_boolean
+frv_elf_arch_extension_p (flagword base, flagword extension)
+{
+  if (base == extension)
+    return TRUE;
+
+  /* CPU_GENERIC code can be merged with code for a specific
+     architecture, in which case the result is marked as being
+     for the specific architecture.  Everything is therefore
+     an extension of CPU_GENERIC.  */
+  if (base == EF_FRV_CPU_GENERIC)
+    return TRUE;
+
+  if (extension == EF_FRV_CPU_FR450)
+    if (base == EF_FRV_CPU_FR400 || base == EF_FRV_CPU_FR405)
+      return TRUE;
+
+  if (extension == EF_FRV_CPU_FR405)
+    if (base == EF_FRV_CPU_FR400)
+      return TRUE;
+
+  return FALSE;
+}
+
+static bfd_boolean
+elf32_frvfdpic_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  unsigned i;
+
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  if (! frv_elf_copy_private_bfd_data (ibfd, obfd))
+    return FALSE;
+
+  if (! elf_tdata (ibfd) || ! elf_tdata (ibfd)->phdr
+      || ! elf_tdata (obfd) || ! elf_tdata (obfd)->phdr)
+    return TRUE;
+
+  /* Copy the stack size.  */
+  for (i = 0; i < elf_elfheader (ibfd)->e_phnum; i++)
+    if (elf_tdata (ibfd)->phdr[i].p_type == PT_GNU_STACK)
+      {
+	Elf_Internal_Phdr *iphdr = &elf_tdata (ibfd)->phdr[i];
+
+	for (i = 0; i < elf_elfheader (obfd)->e_phnum; i++)
+	  if (elf_tdata (obfd)->phdr[i].p_type == PT_GNU_STACK)
+	    {
+	      memcpy (&elf_tdata (obfd)->phdr[i], iphdr, sizeof (*iphdr));
+
+	      /* Rewrite the phdrs, since we're only called after they
+		 were first written.  */
+	      if (bfd_seek (obfd, (bfd_signed_vma) get_elf_backend_data (obfd)
+			    ->s->sizeof_ehdr, SEEK_SET) != 0
+		  || get_elf_backend_data (obfd)->s
+		  ->write_out_phdrs (obfd, elf_tdata (obfd)->phdr,
+				     elf_elfheader (obfd)->e_phnum) != 0)
+		return FALSE;
+	      break;
+	    }
+
+	break;
+      }
+
+  return TRUE;
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+
+static bfd_boolean
+frv_elf_merge_private_bfd_data (ibfd, obfd)
+     bfd *ibfd;
+     bfd *obfd;
+{
+  flagword old_flags, old_partial;
+  flagword new_flags, new_partial;
+  bfd_boolean error = FALSE;
+  char new_opt[80];
+  char old_opt[80];
+
+  new_opt[0] = old_opt[0] = '\0';
+  new_flags = elf_elfheader (ibfd)->e_flags;
+  old_flags = elf_elfheader (obfd)->e_flags;
+
+  if (new_flags & EF_FRV_FDPIC)
+    new_flags &= ~EF_FRV_PIC;
+
+#ifdef DEBUG
+  (*_bfd_error_handler) ("old_flags = 0x%.8lx, new_flags = 0x%.8lx, init = %s, filename = %s",
+			 old_flags, new_flags, elf_flags_init (obfd) ? "yes" : "no",
+			 bfd_get_filename (ibfd));
+#endif
+
+  if (!elf_flags_init (obfd))			/* First call, no flags set.  */
+    {
+      elf_flags_init (obfd) = TRUE;
+      old_flags = new_flags;
+    }
+
+  else if (new_flags == old_flags)		/* Compatible flags are ok.  */
+    ;
+
+  else						/* Possibly incompatible flags.  */
+    {
+      /* Warn if different # of gprs are used.  Note, 0 means nothing is
+         said about the size of gprs.  */
+      new_partial = (new_flags & EF_FRV_GPR_MASK);
+      old_partial = (old_flags & EF_FRV_GPR_MASK);
+      if (new_partial == old_partial)
+	;
+
+      else if (new_partial == 0)
+	;
+
+      else if (old_partial == 0)
+	old_flags |= new_partial;
+
+      else
+	{
+	  switch (new_partial)
+	    {
+	    default:		strcat (new_opt, " -mgpr-??"); break;
+	    case EF_FRV_GPR_32: strcat (new_opt, " -mgpr-32"); break;
+	    case EF_FRV_GPR_64: strcat (new_opt, " -mgpr-64"); break;
+	    }
+
+	  switch (old_partial)
+	    {
+	    default:		strcat (old_opt, " -mgpr-??"); break;
+	    case EF_FRV_GPR_32: strcat (old_opt, " -mgpr-32"); break;
+	    case EF_FRV_GPR_64: strcat (old_opt, " -mgpr-64"); break;
+	    }
+	}
+
+      /* Warn if different # of fprs are used.  Note, 0 means nothing is
+         said about the size of fprs.  */
+      new_partial = (new_flags & EF_FRV_FPR_MASK);
+      old_partial = (old_flags & EF_FRV_FPR_MASK);
+      if (new_partial == old_partial)
+	;
+
+      else if (new_partial == 0)
+	;
+
+      else if (old_partial == 0)
+	old_flags |= new_partial;
+
+      else
+	{
+	  switch (new_partial)
+	    {
+	    default:		  strcat (new_opt, " -mfpr-?");      break;
+	    case EF_FRV_FPR_32:   strcat (new_opt, " -mfpr-32");     break;
+	    case EF_FRV_FPR_64:   strcat (new_opt, " -mfpr-64");     break;
+	    case EF_FRV_FPR_NONE: strcat (new_opt, " -msoft-float"); break;
+	    }
+
+	  switch (old_partial)
+	    {
+	    default:		  strcat (old_opt, " -mfpr-?");      break;
+	    case EF_FRV_FPR_32:   strcat (old_opt, " -mfpr-32");     break;
+	    case EF_FRV_FPR_64:   strcat (old_opt, " -mfpr-64");     break;
+	    case EF_FRV_FPR_NONE: strcat (old_opt, " -msoft-float"); break;
+	    }
+	}
+
+      /* Warn if different dword support was used.  Note, 0 means nothing is
+         said about the dword support.  */
+      new_partial = (new_flags & EF_FRV_DWORD_MASK);
+      old_partial = (old_flags & EF_FRV_DWORD_MASK);
+      if (new_partial == old_partial)
+	;
+
+      else if (new_partial == 0)
+	;
+
+      else if (old_partial == 0)
+	old_flags |= new_partial;
+
+      else
+	{
+	  switch (new_partial)
+	    {
+	    default:		   strcat (new_opt, " -mdword-?");  break;
+	    case EF_FRV_DWORD_YES: strcat (new_opt, " -mdword");    break;
+	    case EF_FRV_DWORD_NO:  strcat (new_opt, " -mno-dword"); break;
+	    }
+
+	  switch (old_partial)
+	    {
+	    default:		   strcat (old_opt, " -mdword-?");  break;
+	    case EF_FRV_DWORD_YES: strcat (old_opt, " -mdword");    break;
+	    case EF_FRV_DWORD_NO:  strcat (old_opt, " -mno-dword"); break;
+	    }
+	}
+
+      /* Or in flags that accumulate (ie, if one module uses it, mark that the
+	 feature is used.  */
+      old_flags |= new_flags & (EF_FRV_DOUBLE
+				| EF_FRV_MEDIA
+				| EF_FRV_MULADD
+				| EF_FRV_NON_PIC_RELOCS);
+
+      /* If any module was compiled without -G0, clear the G0 bit.  */
+      old_flags = ((old_flags & ~ EF_FRV_G0)
+		   | (old_flags & new_flags & EF_FRV_G0));
+
+      /* If any module was compiled without -mnopack, clear the mnopack bit.  */
+      old_flags = ((old_flags & ~ EF_FRV_NOPACK)
+		   | (old_flags & new_flags & EF_FRV_NOPACK));
+
+      /* We don't have to do anything if the pic flags are the same, or the new
+         module(s) were compiled with -mlibrary-pic.  */
+      new_partial = (new_flags & EF_FRV_PIC_FLAGS);
+      old_partial = (old_flags & EF_FRV_PIC_FLAGS);
+      if ((new_partial == old_partial) || ((new_partial & EF_FRV_LIBPIC) != 0))
+	;
+
+      /* If the old module(s) were compiled with -mlibrary-pic, copy in the pic
+         flags if any from the new module.  */
+      else if ((old_partial & EF_FRV_LIBPIC) != 0)
+	old_flags = (old_flags & ~ EF_FRV_PIC_FLAGS) | new_partial;
+
+      /* If we have mixtures of -fpic and -fPIC, or in both bits.  */
+      else if (new_partial != 0 && old_partial != 0)
+	old_flags |= new_partial;
+
+      /* One module was compiled for pic and the other was not, see if we have
+         had any relocations that are not pic-safe.  */
+      else
+	{
+	  if ((old_flags & EF_FRV_NON_PIC_RELOCS) == 0)
+	    old_flags |= new_partial;
+	  else
+	    {
+	      old_flags &= ~ EF_FRV_PIC_FLAGS;
+#ifndef FRV_NO_PIC_ERROR
+	      error = TRUE;
+	      (*_bfd_error_handler)
+		(_("%s: compiled with %s and linked with modules that use non-pic relocations"),
+		 bfd_get_filename (ibfd),
+		 (new_flags & EF_FRV_BIGPIC) ? "-fPIC" : "-fpic");
+#endif
+	    }
+	}
+
+      /* Warn if different cpu is used (allow a specific cpu to override
+	 the generic cpu).  */
+      new_partial = (new_flags & EF_FRV_CPU_MASK);
+      old_partial = (old_flags & EF_FRV_CPU_MASK);
+      if (frv_elf_arch_extension_p (new_partial, old_partial))
+	;
+
+      else if (frv_elf_arch_extension_p (old_partial, new_partial))
+	old_flags = (old_flags & ~EF_FRV_CPU_MASK) | new_partial;
+
+      else
+	{
+	  switch (new_partial)
+	    {
+	    default:		     strcat (new_opt, " -mcpu=?");      break;
+	    case EF_FRV_CPU_GENERIC: strcat (new_opt, " -mcpu=frv");    break;
+	    case EF_FRV_CPU_SIMPLE:  strcat (new_opt, " -mcpu=simple"); break;
+	    case EF_FRV_CPU_FR550:   strcat (new_opt, " -mcpu=fr550");  break;
+	    case EF_FRV_CPU_FR500:   strcat (new_opt, " -mcpu=fr500");  break;
+	    case EF_FRV_CPU_FR450:   strcat (new_opt, " -mcpu=fr450");  break;
+	    case EF_FRV_CPU_FR405:   strcat (new_opt, " -mcpu=fr405");  break;
+	    case EF_FRV_CPU_FR400:   strcat (new_opt, " -mcpu=fr400");  break;
+	    case EF_FRV_CPU_FR300:   strcat (new_opt, " -mcpu=fr300");  break;
+	    case EF_FRV_CPU_TOMCAT:  strcat (new_opt, " -mcpu=tomcat"); break;
+	    }
+
+	  switch (old_partial)
+	    {
+	    default:		     strcat (old_opt, " -mcpu=?");      break;
+	    case EF_FRV_CPU_GENERIC: strcat (old_opt, " -mcpu=frv");    break;
+	    case EF_FRV_CPU_SIMPLE:  strcat (old_opt, " -mcpu=simple"); break;
+	    case EF_FRV_CPU_FR550:   strcat (old_opt, " -mcpu=fr550");  break;
+	    case EF_FRV_CPU_FR500:   strcat (old_opt, " -mcpu=fr500");  break;
+	    case EF_FRV_CPU_FR450:   strcat (old_opt, " -mcpu=fr450");  break;
+	    case EF_FRV_CPU_FR405:   strcat (old_opt, " -mcpu=fr405");  break;
+	    case EF_FRV_CPU_FR400:   strcat (old_opt, " -mcpu=fr400");  break;
+	    case EF_FRV_CPU_FR300:   strcat (old_opt, " -mcpu=fr300");  break;
+	    case EF_FRV_CPU_TOMCAT:  strcat (old_opt, " -mcpu=tomcat"); break;
+	    }
+	}
+
+      /* Print out any mismatches from above.  */
+      if (new_opt[0])
+	{
+	  error = TRUE;
+	  (*_bfd_error_handler)
+	    (_("%s: compiled with %s and linked with modules compiled with %s"),
+	     bfd_get_filename (ibfd), new_opt, old_opt);
+	}
+
+      /* Warn about any other mismatches */
+      new_partial = (new_flags & ~ EF_FRV_ALL_FLAGS);
+      old_partial = (old_flags & ~ EF_FRV_ALL_FLAGS);
+      if (new_partial != old_partial)
+	{
+	  old_flags |= new_partial;
+	  error = TRUE;
+	  (*_bfd_error_handler)
+	    (_("%s: uses different unknown e_flags (0x%lx) fields than previous modules (0x%lx)"),
+	     bfd_get_filename (ibfd), (long)new_partial, (long)old_partial);
+	}
+    }
+
+  /* If the cpu is -mcpu=simple, then set the -mnopack bit.  */
+  if ((old_flags & EF_FRV_CPU_MASK) == EF_FRV_CPU_SIMPLE)
+    old_flags |= EF_FRV_NOPACK;
+
+  /* Update the old flags now with changes made above.  */
+  old_partial = elf_elfheader (obfd)->e_flags & EF_FRV_CPU_MASK;
+  elf_elfheader (obfd)->e_flags = old_flags;
+  if (old_partial != (old_flags & EF_FRV_CPU_MASK))
+    bfd_default_set_arch_mach (obfd, bfd_arch_frv, elf32_frv_machine (obfd));
+
+  if (((new_flags & EF_FRV_FDPIC) == 0)
+      != (! IS_FDPIC (ibfd)))
+    {
+      error = TRUE;
+      if (IS_FDPIC (obfd))
+	(*_bfd_error_handler)
+	  (_("%s: cannot link non-fdpic object file into fdpic executable"),
+	   bfd_get_filename (ibfd));
+      else
+	(*_bfd_error_handler)
+	  (_("%s: cannot link fdpic object file into non-fdpic executable"),
+	   bfd_get_filename (ibfd));
+    }
+
+  if (error)
+    bfd_set_error (bfd_error_bad_value);
+
+  return !error;
+}
+
+
+bfd_boolean
+frv_elf_print_private_bfd_data (abfd, ptr)
+     bfd *abfd;
+     PTR ptr;
+{
+  FILE *file = (FILE *) ptr;
+  flagword flags;
+
+  BFD_ASSERT (abfd != NULL && ptr != NULL);
+
+  /* Print normal ELF private data.  */
+  _bfd_elf_print_private_bfd_data (abfd, ptr);
+
+  flags = elf_elfheader (abfd)->e_flags;
+  fprintf (file, _("private flags = 0x%lx:"), (unsigned long) flags);
+
+  switch (flags & EF_FRV_CPU_MASK)
+    {
+    default:							break;
+    case EF_FRV_CPU_SIMPLE: fprintf (file, " -mcpu=simple");	break;
+    case EF_FRV_CPU_FR550:  fprintf (file, " -mcpu=fr550");	break;
+    case EF_FRV_CPU_FR500:  fprintf (file, " -mcpu=fr500");	break;
+    case EF_FRV_CPU_FR450:  fprintf (file, " -mcpu=fr450");	break;
+    case EF_FRV_CPU_FR405:  fprintf (file, " -mcpu=fr405");	break;
+    case EF_FRV_CPU_FR400:  fprintf (file, " -mcpu=fr400");	break;
+    case EF_FRV_CPU_FR300:  fprintf (file, " -mcpu=fr300");	break;
+    case EF_FRV_CPU_TOMCAT: fprintf (file, " -mcpu=tomcat");	break;
+    }
+
+  switch (flags & EF_FRV_GPR_MASK)
+    {
+    default:							break;
+    case EF_FRV_GPR_32: fprintf (file, " -mgpr-32");		break;
+    case EF_FRV_GPR_64: fprintf (file, " -mgpr-64");		break;
+    }
+
+  switch (flags & EF_FRV_FPR_MASK)
+    {
+    default:							break;
+    case EF_FRV_FPR_32:   fprintf (file, " -mfpr-32");		break;
+    case EF_FRV_FPR_64:   fprintf (file, " -mfpr-64");		break;
+    case EF_FRV_FPR_NONE: fprintf (file, " -msoft-float");	break;
+    }
+
+  switch (flags & EF_FRV_DWORD_MASK)
+    {
+    default:							break;
+    case EF_FRV_DWORD_YES: fprintf (file, " -mdword");		break;
+    case EF_FRV_DWORD_NO:  fprintf (file, " -mno-dword");	break;
+    }
+
+  if (flags & EF_FRV_DOUBLE)
+    fprintf (file, " -mdouble");
+
+  if (flags & EF_FRV_MEDIA)
+    fprintf (file, " -mmedia");
+
+  if (flags & EF_FRV_MULADD)
+    fprintf (file, " -mmuladd");
+
+  if (flags & EF_FRV_PIC)
+    fprintf (file, " -fpic");
+
+  if (flags & EF_FRV_BIGPIC)
+    fprintf (file, " -fPIC");
+
+  if (flags & EF_FRV_LIBPIC)
+    fprintf (file, " -mlibrary-pic");
+
+  if (flags & EF_FRV_FDPIC)
+    fprintf (file, " -mfdpic");
+
+  if (flags & EF_FRV_NON_PIC_RELOCS)
+    fprintf (file, " non-pic relocations");
+
+  if (flags & EF_FRV_G0)
+    fprintf (file, " -G0");
+
+  fputc ('\n', file);
+  return TRUE;
+}
+
+
+/* Support for core dump NOTE sections.  */
+
+static bfd_boolean
+elf32_frv_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  int offset;
+  unsigned int raw_size;
+
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      /* The Linux/FRV elf_prstatus struct is 268 bytes long.  The other
+         hardcoded offsets and sizes listed below (and contained within
+	 this lexical block) refer to fields in the target's elf_prstatus
+	 struct.  */
+      case 268:	
+	/* `pr_cursig' is at offset 12.  */
+	elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12);
+
+	/* `pr_pid' is at offset 24.  */
+	elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 24);
+
+	/* `pr_reg' is at offset 72.  */
+	offset = 72;
+
+	/* Most grok_prstatus implementations set `raw_size' to the size
+	   of the pr_reg field.  For Linux/FRV, we set `raw_size' to be
+	   the size of `pr_reg' plus the size of `pr_exec_fdpic_loadmap'
+	   and `pr_interp_fdpic_loadmap', both of which (by design)
+	   immediately follow `pr_reg'.  This will allow these fields to
+	   be viewed by GDB as registers.
+	   
+	   `pr_reg' is 184 bytes long.  `pr_exec_fdpic_loadmap' and
+	   `pr_interp_fdpic_loadmap' are 4 bytes each.  */
+	raw_size = 184 + 4 + 4;
+
+	break;
+    }
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg", raw_size,
+					  note->descpos + offset);
+}
+
+static bfd_boolean
+elf32_frv_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      /* The Linux/FRV elf_prpsinfo struct is 124 bytes long.  */
+      case 124:
+
+	/* `pr_fname' is found at offset 28 and is 16 bytes long.  */
+	elf_tdata (abfd)->core_program
+	  = _bfd_elfcore_strndup (abfd, note->descdata + 28, 16);
+
+	/* `pr_psargs' is found at offset 44 and is 80 bytes long.  */
+	elf_tdata (abfd)->core_command
+	  = _bfd_elfcore_strndup (abfd, note->descdata + 44, 80);
+    }
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+
+  {
+    char *command = elf_tdata (abfd)->core_command;
+    int n = strlen (command);
+
+    if (0 < n && command[n - 1] == ' ')
+      command[n - 1] = '\0';
+  }
+
+  return TRUE;
+}
+#define ELF_ARCH		bfd_arch_frv
+#define ELF_TARGET_ID		FRV_ELF_DATA
+#define ELF_MACHINE_CODE	EM_CYGNUS_FRV
+#define ELF_MAXPAGESIZE		0x1000
+
+#define TARGET_BIG_SYM          bfd_elf32_frv_vec
+#define TARGET_BIG_NAME		"elf32-frv"
+
+#define elf_info_to_howto			frv_info_to_howto_rela
+#define elf_backend_relocate_section		elf32_frv_relocate_section
+#define elf_backend_gc_mark_hook		elf32_frv_gc_mark_hook
+#define elf_backend_check_relocs                elf32_frv_check_relocs
+#define elf_backend_object_p			elf32_frv_object_p
+#define elf_backend_add_symbol_hook             elf32_frv_add_symbol_hook
+
+#define elf_backend_can_gc_sections		1
+#define elf_backend_rela_normal			1
+
+#define bfd_elf32_bfd_reloc_type_lookup		frv_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup	frv_reloc_name_lookup
+#define bfd_elf32_bfd_set_private_flags		frv_elf_set_private_flags
+#define bfd_elf32_bfd_copy_private_bfd_data	frv_elf_copy_private_bfd_data
+#define bfd_elf32_bfd_merge_private_bfd_data	frv_elf_merge_private_bfd_data
+#define bfd_elf32_bfd_print_private_bfd_data	frv_elf_print_private_bfd_data
+
+#define elf_backend_want_got_sym	1
+#define elf_backend_got_header_size	0
+#define elf_backend_want_got_plt	0
+#define elf_backend_plt_readonly	1
+#define elf_backend_want_plt_sym	0
+#define elf_backend_plt_header_size	0
+
+#define elf_backend_finish_dynamic_sections \
+		elf32_frv_finish_dynamic_sections
+
+#define elf_backend_grok_prstatus	elf32_frv_grok_prstatus
+#define elf_backend_grok_psinfo		elf32_frv_grok_psinfo
+
+#include "elf32-target.h"
+
+#undef ELF_MAXPAGESIZE
+#define ELF_MAXPAGESIZE		0x4000
+
+#undef TARGET_BIG_SYM
+#define TARGET_BIG_SYM          bfd_elf32_frvfdpic_vec
+#undef TARGET_BIG_NAME
+#define TARGET_BIG_NAME		"elf32-frvfdpic"
+#undef	elf32_bed
+#define	elf32_bed		elf32_frvfdpic_bed
+
+#undef elf_info_to_howto_rel
+#define elf_info_to_howto_rel	frvfdpic_info_to_howto_rel
+
+#undef bfd_elf32_bfd_link_hash_table_create
+#define bfd_elf32_bfd_link_hash_table_create \
+		frvfdpic_elf_link_hash_table_create
+#undef elf_backend_always_size_sections
+#define elf_backend_always_size_sections \
+		elf32_frvfdpic_always_size_sections
+#undef elf_backend_modify_program_headers
+#define elf_backend_modify_program_headers \
+		elf32_frvfdpic_modify_program_headers
+#undef bfd_elf32_bfd_copy_private_bfd_data
+#define bfd_elf32_bfd_copy_private_bfd_data \
+		elf32_frvfdpic_copy_private_bfd_data
+
+#undef elf_backend_create_dynamic_sections
+#define elf_backend_create_dynamic_sections \
+		elf32_frvfdpic_create_dynamic_sections
+#undef elf_backend_adjust_dynamic_symbol
+#define elf_backend_adjust_dynamic_symbol \
+		elf32_frvfdpic_adjust_dynamic_symbol
+#undef elf_backend_size_dynamic_sections
+#define elf_backend_size_dynamic_sections \
+		elf32_frvfdpic_size_dynamic_sections
+#undef bfd_elf32_bfd_relax_section
+#define bfd_elf32_bfd_relax_section \
+  elf32_frvfdpic_relax_section
+#undef elf_backend_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_symbol \
+		elf32_frvfdpic_finish_dynamic_symbol
+#undef elf_backend_finish_dynamic_sections
+#define elf_backend_finish_dynamic_sections \
+		elf32_frvfdpic_finish_dynamic_sections
+
+#undef elf_backend_discard_info
+#define elf_backend_discard_info \
+		frvfdpic_elf_discard_info
+#undef elf_backend_can_make_relative_eh_frame
+#define elf_backend_can_make_relative_eh_frame \
+		frvfdpic_elf_use_relative_eh_frame
+#undef elf_backend_can_make_lsda_relative_eh_frame
+#define elf_backend_can_make_lsda_relative_eh_frame \
+		frvfdpic_elf_use_relative_eh_frame
+#undef elf_backend_encode_eh_address
+#define elf_backend_encode_eh_address \
+		frvfdpic_elf_encode_eh_address
+
+#undef elf_backend_may_use_rel_p
+#define elf_backend_may_use_rel_p       1
+#undef elf_backend_may_use_rela_p
+#define elf_backend_may_use_rela_p      1
+/* We use REL for dynamic relocations only.  */
+#undef elf_backend_default_use_rela_p
+#define elf_backend_default_use_rela_p  1
+
+#undef elf_backend_omit_section_dynsym
+#define elf_backend_omit_section_dynsym _frvfdpic_link_omit_section_dynsym
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-gen.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-gen.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-gen.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-gen.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,103 @@
+/* Generic support for 32-bit ELF
+   Copyright 1993, 1995, 1998, 1999, 2001, 2002, 2004, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+
+/* This does not include any relocation information, but should be
+   good enough for GDB or objdump to read the file.  */
+
+static reloc_howto_type dummy =
+  HOWTO (0,			/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "UNKNOWN",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+static void
+elf_generic_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+			   arelent *bfd_reloc,
+			   Elf_Internal_Rela *elf_reloc ATTRIBUTE_UNUSED)
+{
+  bfd_reloc->howto = &dummy;
+}
+
+static void
+elf_generic_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+			       arelent *bfd_reloc,
+			       Elf_Internal_Rela *elf_reloc ATTRIBUTE_UNUSED)
+{
+  bfd_reloc->howto = &dummy;
+}
+
+static void
+check_for_relocs (bfd * abfd, asection * o, void * failed)
+{
+  if ((o->flags & SEC_RELOC) != 0)
+    {
+      Elf_Internal_Ehdr *ehdrp;
+
+      ehdrp = elf_elfheader (abfd);
+      _bfd_error_handler (_("%B: Relocations in generic ELF (EM: %d)"),
+			  abfd, ehdrp->e_machine);
+
+      bfd_set_error (bfd_error_wrong_format);
+      * (bfd_boolean *) failed = TRUE;
+    }
+}
+
+static bfd_boolean
+elf32_generic_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  bfd_boolean failed = FALSE;
+
+  /* Check if there are any relocations.  */
+  bfd_map_over_sections (abfd, check_for_relocs, & failed);
+
+  if (failed)
+    return FALSE;
+  return bfd_elf_link_add_symbols (abfd, info);
+}
+
+#define TARGET_LITTLE_SYM		bfd_elf32_little_generic_vec
+#define TARGET_LITTLE_NAME		"elf32-little"
+#define TARGET_BIG_SYM			bfd_elf32_big_generic_vec
+#define TARGET_BIG_NAME			"elf32-big"
+#define ELF_ARCH			bfd_arch_unknown
+#define ELF_MACHINE_CODE		EM_NONE
+#define ELF_MAXPAGESIZE			0x1
+#define bfd_elf32_bfd_reloc_type_lookup bfd_default_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup _bfd_norelocs_bfd_reloc_name_lookup
+#define bfd_elf32_bfd_link_add_symbols	elf32_generic_link_add_symbols
+#define elf_info_to_howto		elf_generic_info_to_howto
+#define elf_info_to_howto_rel		elf_generic_info_to_howto_rel
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-h8300.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-h8300.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-h8300.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-h8300.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1632 @@
+/* BFD back-end for Renesas H8/300 ELF binaries.
+   Copyright 1993, 1995, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007, 2009, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/h8.h"
+
+static reloc_howto_type *elf32_h8_reloc_type_lookup
+  (bfd *abfd, bfd_reloc_code_real_type code);
+static void elf32_h8_info_to_howto
+  (bfd *, arelent *, Elf_Internal_Rela *);
+static void elf32_h8_info_to_howto_rel
+  (bfd *, arelent *, Elf_Internal_Rela *);
+static unsigned long elf32_h8_mach (flagword);
+static void elf32_h8_final_write_processing (bfd *, bfd_boolean);
+static bfd_boolean elf32_h8_object_p (bfd *);
+static bfd_boolean elf32_h8_merge_private_bfd_data (bfd *, bfd *);
+static bfd_boolean elf32_h8_relax_section
+  (bfd *, asection *, struct bfd_link_info *, bfd_boolean *);
+static bfd_boolean elf32_h8_relax_delete_bytes
+  (bfd *, asection *, bfd_vma, int);
+static bfd_boolean elf32_h8_symbol_address_p (bfd *, asection *, bfd_vma);
+static bfd_byte *elf32_h8_get_relocated_section_contents
+  (bfd *, struct bfd_link_info *, struct bfd_link_order *,
+   bfd_byte *, bfd_boolean, asymbol **);
+static bfd_reloc_status_type elf32_h8_final_link_relocate
+  (unsigned long, bfd *, bfd *, asection *,
+   bfd_byte *, bfd_vma, bfd_vma, bfd_vma,
+   struct bfd_link_info *, asection *, int);
+static bfd_boolean elf32_h8_relocate_section
+  (bfd *, struct bfd_link_info *, bfd *, asection *,
+   bfd_byte *, Elf_Internal_Rela *,
+   Elf_Internal_Sym *, asection **);
+static bfd_reloc_status_type special
+  (bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **);
+
+/* This does not include any relocation information, but should be
+   good enough for GDB or objdump to read the file.  */
+
+static reloc_howto_type h8_elf_howto_table[] = {
+#define R_H8_NONE_X 0
+  HOWTO (R_H8_NONE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 special,		/* special_function */
+	 "R_H8_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+#define R_H8_DIR32_X (R_H8_NONE_X + 1)
+  HOWTO (R_H8_DIR32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 special,		/* special_function */
+	 "R_H8_DIR32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+#define R_H8_DIR16_X (R_H8_DIR32_X + 1)
+  HOWTO (R_H8_DIR16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 special,		/* special_function */
+	 "R_H8_DIR16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+#define R_H8_DIR8_X (R_H8_DIR16_X + 1)
+  HOWTO (R_H8_DIR8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 special,		/* special_function */
+	 "R_H8_DIR8",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x000000ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+#define R_H8_DIR16A8_X (R_H8_DIR8_X + 1)
+  HOWTO (R_H8_DIR16A8,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 special,		/* special_function */
+	 "R_H8_DIR16A8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+#define R_H8_DIR16R8_X (R_H8_DIR16A8_X + 1)
+  HOWTO (R_H8_DIR16R8,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 special,		/* special_function */
+	 "R_H8_DIR16R8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+#define R_H8_DIR24A8_X (R_H8_DIR16R8_X + 1)
+  HOWTO (R_H8_DIR24A8,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 special,		/* special_function */
+	 "R_H8_DIR24A8",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xff000000,		/* src_mask */
+	 0x00ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+#define R_H8_DIR24R8_X (R_H8_DIR24A8_X + 1)
+  HOWTO (R_H8_DIR24R8,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 special,		/* special_function */
+	 "R_H8_DIR24R8",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xff000000,		/* src_mask */
+	 0x00ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+#define R_H8_DIR32A16_X (R_H8_DIR24R8_X + 1)
+  HOWTO (R_H8_DIR32A16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 special,		/* special_function */
+	 "R_H8_DIR32A16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+#define R_H8_PCREL16_X (R_H8_DIR32A16_X + 1)
+  HOWTO (R_H8_PCREL16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 special,		/* special_function */
+	 "R_H8_PCREL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+#define R_H8_PCREL8_X (R_H8_PCREL16_X + 1)
+  HOWTO (R_H8_PCREL8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 special,		/* special_function */
+	 "R_H8_PCREL8",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xff,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+};
+
+/* This structure is used to map BFD reloc codes to H8 ELF relocs.  */
+
+struct elf_reloc_map {
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned char howto_index;
+};
+
+/* An array mapping BFD reloc codes to H8 ELF relocs.  */
+
+static const struct elf_reloc_map h8_reloc_map[] = {
+  { BFD_RELOC_NONE, R_H8_NONE_X },
+  { BFD_RELOC_32, R_H8_DIR32_X },
+  { BFD_RELOC_16, R_H8_DIR16_X },
+  { BFD_RELOC_8, R_H8_DIR8_X },
+  { BFD_RELOC_H8_DIR16A8, R_H8_DIR16A8_X },
+  { BFD_RELOC_H8_DIR16R8, R_H8_DIR16R8_X },
+  { BFD_RELOC_H8_DIR24A8, R_H8_DIR24A8_X },
+  { BFD_RELOC_H8_DIR24R8, R_H8_DIR24R8_X },
+  { BFD_RELOC_H8_DIR32A16, R_H8_DIR32A16_X },
+  { BFD_RELOC_16_PCREL, R_H8_PCREL16_X },
+  { BFD_RELOC_8_PCREL, R_H8_PCREL8_X },
+};
+
+
+static reloc_howto_type *
+elf32_h8_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (h8_reloc_map) / sizeof (struct elf_reloc_map); i++)
+    {
+      if (h8_reloc_map[i].bfd_reloc_val == code)
+	return &h8_elf_howto_table[(int) h8_reloc_map[i].howto_index];
+    }
+  return NULL;
+}
+
+static reloc_howto_type *
+elf32_h8_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (h8_elf_howto_table) / sizeof (h8_elf_howto_table[0]);
+       i++)
+    if (h8_elf_howto_table[i].name != NULL
+	&& strcasecmp (h8_elf_howto_table[i].name, r_name) == 0)
+      return &h8_elf_howto_table[i];
+
+  return NULL;
+}
+
+static void
+elf32_h8_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *bfd_reloc,
+			Elf_Internal_Rela *elf_reloc)
+{
+  unsigned int r;
+  unsigned int i;
+
+  r = ELF32_R_TYPE (elf_reloc->r_info);
+  for (i = 0; i < sizeof (h8_elf_howto_table) / sizeof (reloc_howto_type); i++)
+    if (h8_elf_howto_table[i].type == r)
+      {
+	bfd_reloc->howto = &h8_elf_howto_table[i];
+	return;
+      }
+  abort ();
+}
+
+static void
+elf32_h8_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED, arelent *bfd_reloc,
+			    Elf_Internal_Rela *elf_reloc ATTRIBUTE_UNUSED)
+{
+  unsigned int r;
+
+  abort ();
+  r = ELF32_R_TYPE (elf_reloc->r_info);
+  bfd_reloc->howto = &h8_elf_howto_table[r];
+}
+
+/* Special handling for H8/300 relocs.
+   We only come here for pcrel stuff and return normally if not an -r link.
+   When doing -r, we can't do any arithmetic for the pcrel stuff, because
+   we support relaxing on the H8/300 series chips.  */
+static bfd_reloc_status_type
+special (bfd *abfd ATTRIBUTE_UNUSED,
+	 arelent *reloc_entry ATTRIBUTE_UNUSED,
+	 asymbol *symbol ATTRIBUTE_UNUSED,
+	 PTR data ATTRIBUTE_UNUSED,
+	 asection *input_section ATTRIBUTE_UNUSED,
+	 bfd *output_bfd,
+	 char **error_message ATTRIBUTE_UNUSED)
+{
+  if (output_bfd == (bfd *) NULL)
+    return bfd_reloc_continue;
+
+  /* Adjust the reloc address to that in the output section.  */
+  reloc_entry->address += input_section->output_offset;
+  return bfd_reloc_ok;
+}
+
+/* Perform a relocation as part of a final link.  */
+static bfd_reloc_status_type
+elf32_h8_final_link_relocate (unsigned long r_type, bfd *input_bfd,
+			      bfd *output_bfd ATTRIBUTE_UNUSED,
+			      asection *input_section ATTRIBUTE_UNUSED,
+			      bfd_byte *contents, bfd_vma offset,
+			      bfd_vma value, bfd_vma addend,
+			      struct bfd_link_info *info ATTRIBUTE_UNUSED,
+			      asection *sym_sec ATTRIBUTE_UNUSED,
+			      int is_local ATTRIBUTE_UNUSED)
+{
+  bfd_byte *hit_data = contents + offset;
+
+  switch (r_type)
+    {
+    case R_H8_NONE:
+      return bfd_reloc_ok;
+
+    case R_H8_DIR32:
+    case R_H8_DIR32A16:
+    case R_H8_DIR24A8:
+      value += addend;
+      bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_H8_DIR16:
+    case R_H8_DIR16A8:
+    case R_H8_DIR16R8:
+      value += addend;
+      bfd_put_16 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    /* AKA R_RELBYTE */
+    case R_H8_DIR8:
+      value += addend;
+
+      bfd_put_8 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_H8_DIR24R8:
+      value += addend;
+
+      /* HIT_DATA is the address for the first byte for the relocated
+	 value.  Subtract 1 so that we can manipulate the data in 32-bit
+	 hunks.  */
+      hit_data--;
+
+      /* Clear out the top byte in value.  */
+      value &= 0xffffff;
+
+      /* Retrieve the type byte for value from the section contents.  */
+      value |= (bfd_get_32 (input_bfd, hit_data) & 0xff000000);
+
+      /* Now scribble it out in one 32-bit hunk.  */
+      bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_H8_PCREL16:
+      value -= (input_section->output_section->vma
+		+ input_section->output_offset);
+      value -= offset;
+      value += addend;
+
+      /* The value is relative to the start of the instruction,
+	 not the relocation offset.  Subtract 2 to account for
+	 this minor issue.  */
+      value -= 2;
+
+      bfd_put_16 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_H8_PCREL8:
+      value -= (input_section->output_section->vma
+		+ input_section->output_offset);
+      value -= offset;
+      value += addend;
+
+      /* The value is relative to the start of the instruction,
+	 not the relocation offset.  Subtract 1 to account for
+	 this minor issue.  */
+      value -= 1;
+
+      bfd_put_8 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    default:
+      return bfd_reloc_notsupported;
+    }
+}
+
+/* Relocate an H8 ELF section.  */
+static bfd_boolean
+elf32_h8_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
+			   bfd *input_bfd, asection *input_section,
+			   bfd_byte *contents, Elf_Internal_Rela *relocs,
+			   Elf_Internal_Sym *local_syms,
+			   asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel, *relend;
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      unsigned int r_type;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+      arelent bfd_reloc;
+      reloc_howto_type *howto;
+
+      elf32_h8_info_to_howto (input_bfd, &bfd_reloc, rel);
+      howto = bfd_reloc.howto;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc, warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      r = elf32_h8_final_link_relocate (r_type, input_bfd, output_bfd,
+					input_section,
+					contents, rel->r_offset,
+					relocation, rel->r_addend,
+					info, sec, h == NULL);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char *name;
+	  const char *msg = (const char *) 0;
+
+	  if (h != NULL)
+	    name = h->root.root.string;
+	  else
+	    {
+	      name = (bfd_elf_string_from_elf_section
+		      (input_bfd, symtab_hdr->sh_link, sym->st_name));
+	      if (name == NULL || *name == '\0')
+		name = bfd_section_name (input_bfd, sec);
+	    }
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      if (! ((*info->callbacks->reloc_overflow)
+		     (info, (h ? &h->root : NULL), name, howto->name,
+		      (bfd_vma) 0, input_bfd, input_section,
+		      rel->r_offset)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_undefined:
+	      if (! ((*info->callbacks->undefined_symbol)
+		     (info, name, input_bfd, input_section,
+		      rel->r_offset, TRUE)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      goto common_error;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      goto common_error;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous error");
+	      goto common_error;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      /* fall through */
+
+	    common_error:
+	      if (!((*info->callbacks->warning)
+		    (info, msg, name, input_bfd, input_section,
+		     rel->r_offset)))
+		return FALSE;
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Object files encode the specific H8 model they were compiled
+   for in the ELF flags field.
+
+   Examine that field and return the proper BFD machine type for
+   the object file.  */
+static unsigned long
+elf32_h8_mach (flagword flags)
+{
+  switch (flags & EF_H8_MACH)
+    {
+    case E_H8_MACH_H8300:
+    default:
+      return bfd_mach_h8300;
+
+    case E_H8_MACH_H8300H:
+      return bfd_mach_h8300h;
+
+    case E_H8_MACH_H8300S:
+      return bfd_mach_h8300s;
+
+    case E_H8_MACH_H8300HN:
+      return bfd_mach_h8300hn;
+
+    case E_H8_MACH_H8300SN:
+      return bfd_mach_h8300sn;
+
+    case E_H8_MACH_H8300SX:
+      return bfd_mach_h8300sx;
+
+    case E_H8_MACH_H8300SXN:
+      return bfd_mach_h8300sxn;
+    }
+}
+
+/* The final processing done just before writing out a H8 ELF object
+   file.  We use this opportunity to encode the BFD machine type
+   into the flags field in the object file.  */
+
+static void
+elf32_h8_final_write_processing (bfd *abfd,
+				 bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  unsigned long val;
+
+  switch (bfd_get_mach (abfd))
+    {
+    default:
+    case bfd_mach_h8300:
+      val = E_H8_MACH_H8300;
+      break;
+
+    case bfd_mach_h8300h:
+      val = E_H8_MACH_H8300H;
+      break;
+
+    case bfd_mach_h8300s:
+      val = E_H8_MACH_H8300S;
+      break;
+
+    case bfd_mach_h8300hn:
+      val = E_H8_MACH_H8300HN;
+      break;
+
+    case bfd_mach_h8300sn:
+      val = E_H8_MACH_H8300SN;
+      break;
+
+    case bfd_mach_h8300sx:
+      val = E_H8_MACH_H8300SX;
+      break;
+
+    case bfd_mach_h8300sxn:
+      val = E_H8_MACH_H8300SXN;
+      break;
+    }
+
+  elf_elfheader (abfd)->e_flags &= ~ (EF_H8_MACH);
+  elf_elfheader (abfd)->e_flags |= val;
+}
+
+/* Return nonzero if ABFD represents a valid H8 ELF object file; also
+   record the encoded machine type found in the ELF flags.  */
+
+static bfd_boolean
+elf32_h8_object_p (bfd *abfd)
+{
+  bfd_default_set_arch_mach (abfd, bfd_arch_h8300,
+			     elf32_h8_mach (elf_elfheader (abfd)->e_flags));
+  return TRUE;
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  The only data we need to copy at this
+   time is the architecture/machine information.  */
+
+static bfd_boolean
+elf32_h8_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
+      && bfd_get_mach (obfd) < bfd_get_mach (ibfd))
+    {
+      if (! bfd_set_arch_mach (obfd, bfd_get_arch (ibfd),
+			       bfd_get_mach (ibfd)))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* This function handles relaxing for the H8..
+
+   There are a few relaxing opportunities available on the H8:
+
+     jmp/jsr:24    ->    bra/bsr:8		2 bytes
+     The jmp may be completely eliminated if the previous insn is a
+     conditional branch to the insn after the jump.  In that case
+     we invert the branch and delete the jump and save 4 bytes.
+
+     bCC:16          ->    bCC:8                  2 bytes
+     bsr:16          ->    bsr:8                  2 bytes
+
+     bset:16	     ->    bset:8                 2 bytes
+     bset:24/32	     ->    bset:8                 4 bytes
+     (also applicable to other bit manipulation instructions)
+
+     mov.b:16	     ->    mov.b:8                2 bytes
+     mov.b:24/32     ->    mov.b:8                4 bytes
+
+     bset:24/32	     ->    bset:16                2 bytes
+     (also applicable to other bit manipulation instructions)
+
+     mov.[bwl]:24/32 ->    mov.[bwl]:16           2 bytes */
+
+static bfd_boolean
+elf32_h8_relax_section (bfd *abfd, asection *sec,
+			struct bfd_link_info *link_info, bfd_boolean *again)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *internal_relocs;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_byte *contents = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+  static asection *last_input_section = NULL;
+  static Elf_Internal_Rela *last_reloc = NULL;
+
+  /* Assume nothing changes.  */
+  *again = FALSE;
+
+  /* We don't have to do anything for a relocatable link, if
+     this section does not have relocs, or if this is not a
+     code section.  */
+  if (link_info->relocatable
+      || (sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0
+      || (sec->flags & SEC_CODE) == 0)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+
+  /* Get a copy of the native relocations.  */
+  internal_relocs = (_bfd_elf_link_read_relocs
+		     (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
+		      link_info->keep_memory));
+  if (internal_relocs == NULL)
+    goto error_return;
+
+  if (sec != last_input_section)
+    last_reloc = NULL;
+
+  last_input_section = sec;
+
+  /* Walk through the relocs looking for relaxing opportunities.  */
+  irelend = internal_relocs + sec->reloc_count;
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      bfd_vma symval;
+
+      {
+	arelent bfd_reloc;
+
+	elf32_h8_info_to_howto (abfd, &bfd_reloc, irel);
+      }
+      /* Keep track of the previous reloc so that we can delete
+	 some long jumps created by the compiler.  */
+      if (irel != internal_relocs)
+	last_reloc = irel - 1;
+
+      if (ELF32_R_TYPE (irel->r_info) != R_H8_DIR24R8
+	  && ELF32_R_TYPE (irel->r_info) != R_H8_PCREL16
+	  && ELF32_R_TYPE (irel->r_info) != R_H8_DIR16A8
+	  && ELF32_R_TYPE (irel->r_info) != R_H8_DIR24A8
+	  && ELF32_R_TYPE (irel->r_info) != R_H8_DIR32A16)
+	continue;
+
+      /* Get the section contents if we haven't done so already.  */
+      if (contents == NULL)
+	{
+	  /* Get cached copy if it exists.  */
+	  if (elf_section_data (sec)->this_hdr.contents != NULL)
+	    contents = elf_section_data (sec)->this_hdr.contents;
+	  else
+	    {
+	      /* Go get them off disk.  */
+	      if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+		goto error_return;
+	    }
+	}
+
+      /* Read this BFD's local symbols if we haven't done so already.  */
+      if (isymbuf == NULL && symtab_hdr->sh_info != 0)
+	{
+	  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	  if (isymbuf == NULL)
+	    isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+					    symtab_hdr->sh_info, 0,
+					    NULL, NULL, NULL);
+	  if (isymbuf == NULL)
+	    goto error_return;
+	}
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+	{
+	  /* A local symbol.  */
+	  Elf_Internal_Sym *isym;
+	  asection *sym_sec;
+
+	  isym = isymbuf + ELF32_R_SYM (irel->r_info);
+	  sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+	  symval = isym->st_value;
+	  /* If the reloc is absolute, it will not have
+	     a symbol or section associated with it.  */
+	  if (sym_sec)
+	    symval += sym_sec->output_section->vma
+	      + sym_sec->output_offset;
+	}
+      else
+	{
+	  unsigned long indx;
+	  struct elf_link_hash_entry *h;
+
+	  /* An external symbol.  */
+	  indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+	  h = elf_sym_hashes (abfd)[indx];
+	  BFD_ASSERT (h != NULL);
+	  if (h->root.type != bfd_link_hash_defined
+	      && h->root.type != bfd_link_hash_defweak)
+	    {
+	      /* This appears to be a reference to an undefined
+                 symbol.  Just ignore it--it will be caught by the
+                 regular reloc processing.  */
+	      continue;
+	    }
+
+	  symval = (h->root.u.def.value
+		    + h->root.u.def.section->output_section->vma
+		    + h->root.u.def.section->output_offset);
+	}
+
+      /* For simplicity of coding, we are going to modify the section
+	 contents, the section relocs, and the BFD symbol table.  We
+	 must tell the rest of the code not to free up this
+	 information.  It would be possible to instead create a table
+	 of changes which have to be made, as is done in coff-mips.c;
+	 that would be more work, but would require less memory when
+	 the linker is run.  */
+      switch (ELF32_R_TYPE (irel->r_info))
+	{
+        /* Try to turn a 24-bit absolute branch/call into an 8-bit
+	   pc-relative branch/call.  */
+	case R_H8_DIR24R8:
+	  {
+	    bfd_vma value = symval + irel->r_addend;
+	    bfd_vma dot, gap;
+
+	    /* Get the address of this instruction.  */
+	    dot = (sec->output_section->vma
+		   + sec->output_offset + irel->r_offset - 1);
+
+	    /* Compute the distance from this insn to the branch target.  */
+	    gap = value - dot;
+
+	    /* If the distance is within -126..+130 inclusive, then we can
+	       relax this jump.  +130 is valid since the target will move
+	       two bytes closer if we do relax this branch.  */
+	    if ((int) gap >= -126 && (int) gap <= 130)
+	      {
+		unsigned char code;
+
+		/* Note that we've changed the relocs, section contents,
+		   etc.  */
+		elf_section_data (sec)->relocs = internal_relocs;
+		elf_section_data (sec)->this_hdr.contents = contents;
+		symtab_hdr->contents = (unsigned char *) isymbuf;
+
+		/* Get the instruction code being relaxed.  */
+		code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+		/* If the previous instruction conditionally jumped around
+		   this instruction, we may be able to reverse the condition
+		   and redirect the previous instruction to the target of
+		   this instruction.
+
+		   Such sequences are used by the compiler to deal with
+		   long conditional branches.
+
+		   Only perform this optimisation for jumps (code 0x5a) not
+		   subroutine calls, as otherwise it could transform:
+
+		   	             mov.w   r0,r0
+		   	             beq     .L1
+		         	     jsr     @_bar
+		              .L1:   rts
+		              _bar:  rts
+		   into:
+		   	             mov.w   r0,r0
+			             bne     _bar
+			             rts
+			      _bar:  rts
+
+		   which changes the call (jsr) into a branch (bne).  */
+		if (code == 0x5a
+		    && (int) gap <= 130
+		    && (int) gap >= -128
+		    && last_reloc
+		    && ELF32_R_TYPE (last_reloc->r_info) == R_H8_PCREL8
+		    && ELF32_R_SYM (last_reloc->r_info) < symtab_hdr->sh_info)
+		  {
+		    bfd_vma last_value;
+		    asection *last_sym_sec;
+		    Elf_Internal_Sym *last_sym;
+
+		    /* We will need to examine the symbol used by the
+		       previous relocation.  */
+
+		    last_sym = isymbuf + ELF32_R_SYM (last_reloc->r_info);
+		    last_sym_sec
+		      = bfd_section_from_elf_index (abfd, last_sym->st_shndx);
+		    last_value = (last_sym->st_value
+				  + last_sym_sec->output_section->vma
+				  + last_sym_sec->output_offset);
+
+		    /* Verify that the previous relocation was for a
+		       branch around this instruction and that no symbol
+		       exists at the current location.  */
+		    if (last_value == dot + 4
+			&& last_reloc->r_offset + 2 == irel->r_offset
+			&& ! elf32_h8_symbol_address_p (abfd, sec, dot))
+		      {
+			/* We can eliminate this jump.  Twiddle the
+			   previous relocation as necessary.  */
+			irel->r_info
+			  = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					  ELF32_R_TYPE (R_H8_NONE));
+
+			last_reloc->r_info
+			  = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					  ELF32_R_TYPE (R_H8_PCREL8));
+			last_reloc->r_addend = irel->r_addend;
+
+			code = bfd_get_8 (abfd,
+					  contents + last_reloc->r_offset - 1);
+			code ^= 1;
+			bfd_put_8 (abfd,
+				   code,
+			contents + last_reloc->r_offset - 1);
+
+			/* Delete four bytes of data.  */
+			if (!elf32_h8_relax_delete_bytes (abfd, sec,
+							  irel->r_offset - 1,
+							  4))
+			  goto error_return;
+
+			*again = TRUE;
+			break;
+		      }
+		  }
+
+		if (code == 0x5e)
+		  /* This is jsr.  */
+		  bfd_put_8 (abfd, 0x55, contents + irel->r_offset - 1);
+		else if (code == 0x5a)
+		  /* This is jmp.  */
+		  bfd_put_8 (abfd, 0x40, contents + irel->r_offset - 1);
+		else
+		  abort ();
+
+		/* Fix the relocation's type.  */
+		irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					     R_H8_PCREL8);
+
+		/* Delete two bytes of data.  */
+		if (!elf32_h8_relax_delete_bytes (abfd, sec,
+						  irel->r_offset + 1, 2))
+		  goto error_return;
+
+		/* That will change things, so, we should relax again.
+		   Note that this is not required, and it may be slow.  */
+		*again = TRUE;
+	      }
+	    break;
+	  }
+
+	/* Try to turn a 16-bit pc-relative branch into a 8-bit pc-relative
+	   branch.  */
+	case R_H8_PCREL16:
+	  {
+	    bfd_vma value = symval + irel->r_addend;
+	    bfd_vma dot;
+	    bfd_vma gap;
+
+	    /* Get the address of this instruction.  */
+	    dot = (sec->output_section->vma
+		   + sec->output_offset
+		   + irel->r_offset - 2);
+
+	    gap = value - dot;
+
+	    /* If the distance is within -126..+130 inclusive, then we can
+	       relax this jump.  +130 is valid since the target will move
+	       two bytes closer if we do relax this branch.  */
+	    if ((int) gap >= -126 && (int) gap <= 130)
+	      {
+		unsigned char code;
+
+		/* Note that we've changed the relocs, section contents,
+		   etc.  */
+		elf_section_data (sec)->relocs = internal_relocs;
+		elf_section_data (sec)->this_hdr.contents = contents;
+		symtab_hdr->contents = (unsigned char *) isymbuf;
+
+		/* Get the opcode.  */
+		code = bfd_get_8 (abfd, contents + irel->r_offset - 2);
+
+		if (code == 0x58)
+		  {
+		    /* bCC:16 -> bCC:8 */
+		    /* Get the second byte of the original insn, which
+		       contains the condition code.  */
+		    code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+		    /* Compute the fisrt byte of the relaxed
+		       instruction.  The original sequence 0x58 0xX0
+		       is relaxed to 0x4X, where X represents the
+		       condition code.  */
+		    code &= 0xf0;
+		    code >>= 4;
+		    code |= 0x40;
+		    bfd_put_8 (abfd, code, contents + irel->r_offset - 2);
+		  }
+		else if (code == 0x5c)
+		  /* This is bsr.  */
+		  bfd_put_8 (abfd, 0x55, contents + irel->r_offset - 2);
+		else
+		  /* Might be MOVSD.  */
+		  break;
+
+		/* Fix the relocation's type.  */
+		irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					     R_H8_PCREL8);
+		irel->r_offset--;
+
+		/* Delete two bytes of data.  */
+		if (!elf32_h8_relax_delete_bytes (abfd, sec,
+						  irel->r_offset + 1, 2))
+		  goto error_return;
+
+		/* That will change things, so, we should relax again.
+		   Note that this is not required, and it may be slow.  */
+		*again = TRUE;
+	      }
+	    break;
+	  }
+
+	/* This is a 16-bit absolute address in one of the following
+	   instructions:
+
+	     "band", "bclr", "biand", "bild", "bior", "bist", "bixor",
+	     "bld", "bnot", "bor", "bset", "bst", "btst", "bxor", and
+	     "mov.b"
+
+	   We may relax this into an 8-bit absolute address if it's in
+	   the right range.  */
+	case R_H8_DIR16A8:
+	  {
+	    bfd_vma value;
+
+	    value = bfd_h8300_pad_address (abfd, symval + irel->r_addend);
+	    if (value >= 0xffffff00u)
+	      {
+		unsigned char code;
+		unsigned char temp_code;
+
+		/* Note that we've changed the relocs, section contents,
+		   etc.  */
+		elf_section_data (sec)->relocs = internal_relocs;
+		elf_section_data (sec)->this_hdr.contents = contents;
+		symtab_hdr->contents = (unsigned char *) isymbuf;
+
+		/* Get the opcode.  */
+		code = bfd_get_8 (abfd, contents + irel->r_offset - 2);
+
+		/* All instructions with R_H8_DIR16A8 start with
+		   0x6a.  */
+		if (code != 0x6a)
+		  abort ();
+
+		temp_code = code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+		/* If this is a mov.b instruction, clear the lower
+		   nibble, which contains the source/destination
+		   register number.  */
+		if ((temp_code & 0x10) != 0x10)
+		  temp_code &= 0xf0;
+
+		switch (temp_code)
+		  {
+		  case 0x00:
+		    /* This is mov.b @aa:16,Rd.  */
+		    bfd_put_8 (abfd, (code & 0xf) | 0x20,
+			       contents + irel->r_offset - 2);
+		    break;
+		  case 0x80:
+		    /* This is mov.b Rs,@aa:16.  */
+		    bfd_put_8 (abfd, (code & 0xf) | 0x30,
+			       contents + irel->r_offset - 2);
+		    break;
+		  case 0x18:
+		    /* This is a bit-maniputation instruction that
+		       stores one bit into memory, one of "bclr",
+		       "bist", "bnot", "bset", and "bst".  */
+		    bfd_put_8 (abfd, 0x7f, contents + irel->r_offset - 2);
+		    break;
+		  case 0x10:
+		    /* This is a bit-maniputation instruction that
+		       loads one bit from memory, one of "band",
+		       "biand", "bild", "bior", "bixor", "bld", "bor",
+		       "btst", and "bxor".  */
+		    bfd_put_8 (abfd, 0x7e, contents + irel->r_offset - 2);
+		    break;
+		  default:
+		    abort ();
+		  }
+
+		/* Fix the relocation's type.  */
+		irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					     R_H8_DIR8);
+
+		/* Move the relocation.  */
+		irel->r_offset--;
+
+		/* Delete two bytes of data.  */
+		if (!elf32_h8_relax_delete_bytes (abfd, sec,
+						  irel->r_offset + 1, 2))
+		  goto error_return;
+
+		/* That will change things, so, we should relax again.
+		   Note that this is not required, and it may be slow.  */
+		*again = TRUE;
+	      }
+	    break;
+	  }
+
+	/* This is a 24-bit absolute address in one of the following
+	   instructions:
+
+	     "band", "bclr", "biand", "bild", "bior", "bist", "bixor",
+	     "bld", "bnot", "bor", "bset", "bst", "btst", "bxor", and
+	     "mov.b"
+
+	   We may relax this into an 8-bit absolute address if it's in
+	   the right range.  */
+	case R_H8_DIR24A8:
+	  {
+	    bfd_vma value;
+
+	    value = bfd_h8300_pad_address (abfd, symval + irel->r_addend);
+	    if (value >= 0xffffff00u)
+	      {
+		unsigned char code;
+		unsigned char temp_code;
+
+		/* Note that we've changed the relocs, section contents,
+		   etc.  */
+		elf_section_data (sec)->relocs = internal_relocs;
+		elf_section_data (sec)->this_hdr.contents = contents;
+		symtab_hdr->contents = (unsigned char *) isymbuf;
+
+		/* Get the opcode.  */
+		code = bfd_get_8 (abfd, contents + irel->r_offset - 2);
+
+		/* All instructions with R_H8_DIR24A8 start with
+		   0x6a.  */
+		if (code != 0x6a)
+		  abort ();
+
+		temp_code = code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+		/* If this is a mov.b instruction, clear the lower
+		   nibble, which contains the source/destination
+		   register number.  */
+		if ((temp_code & 0x30) != 0x30)
+		  temp_code &= 0xf0;
+
+		switch (temp_code)
+		  {
+		  case 0x20:
+		    /* This is mov.b @aa:24/32,Rd.  */
+		    bfd_put_8 (abfd, (code & 0xf) | 0x20,
+			       contents + irel->r_offset - 2);
+		    break;
+		  case 0xa0:
+		    /* This is mov.b Rs,@aa:24/32.  */
+		    bfd_put_8 (abfd, (code & 0xf) | 0x30,
+			       contents + irel->r_offset - 2);
+		    break;
+		  case 0x38:
+		    /* This is a bit-maniputation instruction that
+		       stores one bit into memory, one of "bclr",
+		       "bist", "bnot", "bset", and "bst".  */
+		    bfd_put_8 (abfd, 0x7f, contents + irel->r_offset - 2);
+		    break;
+		  case 0x30:
+		    /* This is a bit-maniputation instruction that
+		       loads one bit from memory, one of "band",
+		       "biand", "bild", "bior", "bixor", "bld", "bor",
+		       "btst", and "bxor".  */
+		    bfd_put_8 (abfd, 0x7e, contents + irel->r_offset - 2);
+		    break;
+		  default:
+		    abort();
+		  }
+
+		/* Fix the relocation's type.  */
+		irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					     R_H8_DIR8);
+		irel->r_offset--;
+
+		/* Delete two bytes of data.  */
+		if (!elf32_h8_relax_delete_bytes (abfd, sec,
+						  irel->r_offset + 1, 4))
+		  goto error_return;
+
+		/* That will change things, so, we should relax again.
+		   Note that this is not required, and it may be slow.  */
+		*again = TRUE;
+		break;
+	      }
+	  }
+
+	  /* Fall through.  */
+
+	  /* This is a 24-/32-bit absolute address in one of the
+	     following instructions:
+
+	       "band", "bclr", "biand", "bild", "bior", "bist",
+	       "bixor", "bld", "bnot", "bor", "bset", "bst", "btst",
+	       "bxor", "ldc.w", "stc.w" and "mov.[bwl]"
+
+	     We may relax this into an 16-bit absolute address if it's
+	     in the right range.  */
+	case R_H8_DIR32A16:
+	  {
+	    bfd_vma value;
+
+	    value = bfd_h8300_pad_address (abfd, symval + irel->r_addend);
+	    if (value <= 0x7fff || value >= 0xffff8000u)
+	      {
+		unsigned char code;
+		unsigned char op0, op1, op2, op3;
+		unsigned char *op_ptr;
+
+		/* Note that we've changed the relocs, section contents,
+		   etc.  */
+		elf_section_data (sec)->relocs = internal_relocs;
+		elf_section_data (sec)->this_hdr.contents = contents;
+		symtab_hdr->contents = (unsigned char *) isymbuf;
+
+		if (irel->r_offset >= 4)
+		  {
+		    /* Check for 4-byte MOVA relaxation.  */
+		    int second_reloc = 0;
+
+		    op_ptr = contents + irel->r_offset - 4;
+
+		    if (last_reloc)
+		      {
+			arelent bfd_reloc;
+			reloc_howto_type *h;
+			bfd_vma last_reloc_size;
+
+			elf32_h8_info_to_howto (abfd, &bfd_reloc, last_reloc);
+			h = bfd_reloc.howto;
+			last_reloc_size = 1 << h->size;
+			if (last_reloc->r_offset + last_reloc_size
+			    == irel->r_offset)
+			  {
+			    op_ptr -= last_reloc_size;
+			    second_reloc = 1;
+			  }
+		      }
+		    if (irel < irelend)
+		      {
+			Elf_Internal_Rela *next_reloc = irel + 1;
+			arelent bfd_reloc;
+			reloc_howto_type *h;
+			bfd_vma next_reloc_size;
+
+			elf32_h8_info_to_howto (abfd, &bfd_reloc, next_reloc);
+			h = bfd_reloc.howto;
+			next_reloc_size = 1 << h->size;
+			if (next_reloc->r_offset + next_reloc_size
+			    == irel->r_offset)
+			  {
+			    op_ptr -= next_reloc_size;
+			    second_reloc = 1;
+			  }
+		      }
+
+		    op0 = bfd_get_8 (abfd, op_ptr + 0);
+		    op1 = bfd_get_8 (abfd, op_ptr + 1);
+		    op2 = bfd_get_8 (abfd, op_ptr + 2);
+		    op3 = bfd_get_8 (abfd, op_ptr + 3);
+
+		    if (op0 == 0x01
+			&& (op1 & 0xdf) == 0x5f
+			&& (op2 & 0x40) == 0x40
+			&& (op3 & 0x80) == 0x80)
+		      {
+			if ((op2 & 0x08) == 0)
+			  second_reloc = 1;
+
+			if (second_reloc)
+			  {
+			    op3 &= ~0x08;
+			    bfd_put_8 (abfd, op3, op_ptr + 3);
+			  }
+			else
+			  {
+			    op2 &= ~0x08;
+			    bfd_put_8 (abfd, op2, op_ptr + 2);
+			  }
+			goto r_h8_dir32a16_common;
+		      }
+		  }
+
+		/* Now check for short version of MOVA.  */
+		op_ptr = contents + irel->r_offset - 2;
+		op0 = bfd_get_8 (abfd, op_ptr + 0);
+		op1 = bfd_get_8 (abfd, op_ptr + 1);
+
+		if (op0 == 0x7a
+		    && (op1 & 0x88) == 0x80)
+		  {
+		    op1 |= 0x08;
+		    bfd_put_8 (abfd, op1, op_ptr + 1);
+		    goto r_h8_dir32a16_common;
+		  }
+
+		/* Get the opcode.  */
+		code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+		/* Fix the opcode.  For all the instructions that
+		   belong to this relaxation, we simply need to turn
+		   off bit 0x20 in the previous byte.  */
+		code &= ~0x20;
+
+		bfd_put_8 (abfd, code, contents + irel->r_offset - 1);
+
+	      r_h8_dir32a16_common:
+		/* Fix the relocation's type.  */
+		irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					     R_H8_DIR16);
+
+		/* Delete two bytes of data.  */
+		if (!elf32_h8_relax_delete_bytes (abfd, sec,
+						  irel->r_offset + 1, 2))
+		  goto error_return;
+
+		/* That will change things, so, we should relax again.
+		   Note that this is not required, and it may be slow.  */
+		*again = TRUE;
+	      }
+	    break;
+	  }
+
+	default:
+	  break;
+	}
+    }
+
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    {
+      if (! link_info->keep_memory)
+	free (isymbuf);
+      else
+	symtab_hdr->contents = (unsigned char *) isymbuf;
+    }
+
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    {
+      if (! link_info->keep_memory)
+	free (contents);
+      else
+	{
+	  /* Cache the section contents for elf_link_input_bfd.  */
+	  elf_section_data (sec)->this_hdr.contents = contents;
+	}
+    }
+
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return TRUE;
+
+ error_return:
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    free (contents);
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+  return FALSE;
+}
+
+/* Delete some bytes from a section while relaxing.  */
+
+static bfd_boolean
+elf32_h8_relax_delete_bytes (bfd *abfd, asection *sec, bfd_vma addr, int count)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  unsigned int sec_shndx;
+  bfd_byte *contents;
+  Elf_Internal_Rela *irel, *irelend;
+  Elf_Internal_Sym *isym;
+  Elf_Internal_Sym *isymend;
+  bfd_vma toaddr;
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_link_hash_entry **end_hashes;
+  unsigned int symcount;
+
+  sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+  contents = elf_section_data (sec)->this_hdr.contents;
+
+  toaddr = sec->size;
+
+  irel = elf_section_data (sec)->relocs;
+  irelend = irel + sec->reloc_count;
+
+  /* Actually delete the bytes.  */
+  memmove (contents + addr, contents + addr + count,
+	   (size_t) (toaddr - addr - count));
+  sec->size -= count;
+
+  /* Adjust all the relocs.  */
+  for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
+    {
+      /* Get the new reloc address.  */
+      if ((irel->r_offset > addr
+	   && irel->r_offset < toaddr))
+	irel->r_offset -= count;
+    }
+
+  /* Adjust the local symbols defined in this section.  */
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  isym = (Elf_Internal_Sym *) symtab_hdr->contents;
+  isymend = isym + symtab_hdr->sh_info;
+  for (; isym < isymend; isym++)
+    {
+      if (isym->st_shndx == sec_shndx
+	  && isym->st_value > addr
+	  && isym->st_value < toaddr)
+	isym->st_value -= count;
+    }
+
+  /* Now adjust the global symbols defined in this section.  */
+  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+	      - symtab_hdr->sh_info);
+  sym_hashes = elf_sym_hashes (abfd);
+  end_hashes = sym_hashes + symcount;
+  for (; sym_hashes < end_hashes; sym_hashes++)
+    {
+      struct elf_link_hash_entry *sym_hash = *sym_hashes;
+      if ((sym_hash->root.type == bfd_link_hash_defined
+	   || sym_hash->root.type == bfd_link_hash_defweak)
+	  && sym_hash->root.u.def.section == sec
+	  && sym_hash->root.u.def.value > addr
+	  && sym_hash->root.u.def.value < toaddr)
+	{
+	  sym_hash->root.u.def.value -= count;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return TRUE if a symbol exists at the given address, else return
+   FALSE.  */
+static bfd_boolean
+elf32_h8_symbol_address_p (bfd *abfd, asection *sec, bfd_vma addr)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  unsigned int sec_shndx;
+  Elf_Internal_Sym *isym;
+  Elf_Internal_Sym *isymend;
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_link_hash_entry **end_hashes;
+  unsigned int symcount;
+
+  sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+  /* Examine all the symbols.  */
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  isym = (Elf_Internal_Sym *) symtab_hdr->contents;
+  isymend = isym + symtab_hdr->sh_info;
+  for (; isym < isymend; isym++)
+    {
+      if (isym->st_shndx == sec_shndx
+	  && isym->st_value == addr)
+	return TRUE;
+    }
+
+  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+	      - symtab_hdr->sh_info);
+  sym_hashes = elf_sym_hashes (abfd);
+  end_hashes = sym_hashes + symcount;
+  for (; sym_hashes < end_hashes; sym_hashes++)
+    {
+      struct elf_link_hash_entry *sym_hash = *sym_hashes;
+      if ((sym_hash->root.type == bfd_link_hash_defined
+	   || sym_hash->root.type == bfd_link_hash_defweak)
+	  && sym_hash->root.u.def.section == sec
+	  && sym_hash->root.u.def.value == addr)
+	return TRUE;
+    }
+
+  return FALSE;
+}
+
+/* This is a version of bfd_generic_get_relocated_section_contents
+   which uses elf32_h8_relocate_section.  */
+
+static bfd_byte *
+elf32_h8_get_relocated_section_contents (bfd *output_bfd,
+					 struct bfd_link_info *link_info,
+					 struct bfd_link_order *link_order,
+					 bfd_byte *data,
+					 bfd_boolean relocatable,
+					 asymbol **symbols)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  asection *input_section = link_order->u.indirect.section;
+  bfd *input_bfd = input_section->owner;
+  asection **sections = NULL;
+  Elf_Internal_Rela *internal_relocs = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+
+  /* We only need to handle the case of relaxing, or of having a
+     particular set of section contents, specially.  */
+  if (relocatable
+      || elf_section_data (input_section)->this_hdr.contents == NULL)
+    return bfd_generic_get_relocated_section_contents (output_bfd, link_info,
+						       link_order, data,
+						       relocatable,
+						       symbols);
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+
+  memcpy (data, elf_section_data (input_section)->this_hdr.contents,
+	  (size_t) input_section->size);
+
+  if ((input_section->flags & SEC_RELOC) != 0
+      && input_section->reloc_count > 0)
+    {
+      asection **secpp;
+      Elf_Internal_Sym *isym, *isymend;
+      bfd_size_type amt;
+
+      internal_relocs = (_bfd_elf_link_read_relocs
+			 (input_bfd, input_section, (PTR) NULL,
+			  (Elf_Internal_Rela *) NULL, FALSE));
+      if (internal_relocs == NULL)
+	goto error_return;
+
+      if (symtab_hdr->sh_info != 0)
+	{
+	  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	  if (isymbuf == NULL)
+	    isymbuf = bfd_elf_get_elf_syms (input_bfd, symtab_hdr,
+					    symtab_hdr->sh_info, 0,
+					    NULL, NULL, NULL);
+	  if (isymbuf == NULL)
+	    goto error_return;
+	}
+
+      amt = symtab_hdr->sh_info;
+      amt *= sizeof (asection *);
+      sections = (asection **) bfd_malloc (amt);
+      if (sections == NULL && amt != 0)
+	goto error_return;
+
+      isymend = isymbuf + symtab_hdr->sh_info;
+      for (isym = isymbuf, secpp = sections; isym < isymend; ++isym, ++secpp)
+	{
+	  asection *isec;
+
+	  if (isym->st_shndx == SHN_UNDEF)
+	    isec = bfd_und_section_ptr;
+	  else if (isym->st_shndx == SHN_ABS)
+	    isec = bfd_abs_section_ptr;
+	  else if (isym->st_shndx == SHN_COMMON)
+	    isec = bfd_com_section_ptr;
+	  else
+	    isec = bfd_section_from_elf_index (input_bfd, isym->st_shndx);
+
+	  *secpp = isec;
+	}
+
+      if (! elf32_h8_relocate_section (output_bfd, link_info, input_bfd,
+				       input_section, data, internal_relocs,
+				       isymbuf, sections))
+	goto error_return;
+
+      if (sections != NULL)
+	free (sections);
+      if (isymbuf != NULL
+	  && symtab_hdr->contents != (unsigned char *) isymbuf)
+	free (isymbuf);
+      if (elf_section_data (input_section)->relocs != internal_relocs)
+	free (internal_relocs);
+    }
+
+  return data;
+
+ error_return:
+  if (sections != NULL)
+    free (sections);
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (internal_relocs != NULL
+      && elf_section_data (input_section)->relocs != internal_relocs)
+    free (internal_relocs);
+  return NULL;
+}
+
+
+#define TARGET_BIG_SYM			bfd_elf32_h8300_vec
+#define TARGET_BIG_NAME			"elf32-h8300"
+#define ELF_ARCH			bfd_arch_h8300
+#define ELF_MACHINE_CODE		EM_H8_300
+#define ELF_MAXPAGESIZE			0x1
+#define bfd_elf32_bfd_reloc_type_lookup elf32_h8_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup elf32_h8_reloc_name_lookup
+#define elf_info_to_howto		elf32_h8_info_to_howto
+#define elf_info_to_howto_rel		elf32_h8_info_to_howto_rel
+
+/* So we can set/examine bits in e_flags to get the specific
+   H8 architecture in use.  */
+#define elf_backend_final_write_processing \
+  elf32_h8_final_write_processing
+#define elf_backend_object_p \
+  elf32_h8_object_p
+#define bfd_elf32_bfd_merge_private_bfd_data \
+  elf32_h8_merge_private_bfd_data
+
+/* ??? when elf_backend_relocate_section is not defined, elf32-target.h
+   defaults to using _bfd_generic_link_hash_table_create, but
+   bfd_elf_size_dynamic_sections uses
+   dynobj = elf_hash_table (info)->dynobj;
+   and thus requires an elf hash table.  */
+#define bfd_elf32_bfd_link_hash_table_create _bfd_elf_link_hash_table_create
+
+/* Use an H8 specific linker, not the ELF generic linker.  */
+#define elf_backend_relocate_section elf32_h8_relocate_section
+#define elf_backend_rela_normal		1
+#define elf_backend_can_gc_sections	1
+
+/* And relaxing stuff.  */
+#define bfd_elf32_bfd_relax_section     elf32_h8_relax_section
+#define bfd_elf32_bfd_get_relocated_section_contents \
+                                elf32_h8_get_relocated_section_contents
+
+#define elf_symbol_leading_char '_'
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-hppa.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-hppa.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-hppa.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-hppa.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4696 @@
+/* BFD back-end for HP PA-RISC ELF files.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1999, 2000, 2001,
+   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   Original code by
+	Center for Software Science
+	Department of Computer Science
+	University of Utah
+   Largely rewritten by Alan Modra <alan@linuxcare.com.au>
+   Naming cleanup by Carlos O'Donell <carlos@systemhalted.org>
+   TLS support written by Randolph Chung <tausq@debian.org>
+ 
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/hppa.h"
+#include "libhppa.h"
+#include "elf32-hppa.h"
+#define ARCH_SIZE		32
+#include "elf32-hppa.h"
+#include "elf-hppa.h"
+
+/* In order to gain some understanding of code in this file without
+   knowing all the intricate details of the linker, note the
+   following:
+
+   Functions named elf32_hppa_* are called by external routines, other
+   functions are only called locally.  elf32_hppa_* functions appear
+   in this file more or less in the order in which they are called
+   from external routines.  eg. elf32_hppa_check_relocs is called
+   early in the link process, elf32_hppa_finish_dynamic_sections is
+   one of the last functions.  */
+
+/* We use two hash tables to hold information for linking PA ELF objects.
+
+   The first is the elf32_hppa_link_hash_table which is derived
+   from the standard ELF linker hash table.  We use this as a place to
+   attach other hash tables and static information.
+
+   The second is the stub hash table which is derived from the
+   base BFD hash table.  The stub hash table holds the information
+   necessary to build the linker stubs during a link.
+
+   There are a number of different stubs generated by the linker.
+
+   Long branch stub:
+   :		ldil LR'X,%r1
+   :		be,n RR'X(%sr4,%r1)
+
+   PIC long branch stub:
+   :		b,l .+8,%r1
+   :		addil LR'X - ($PIC_pcrel$0 - 4),%r1
+   :		be,n RR'X - ($PIC_pcrel$0 - 8)(%sr4,%r1)
+
+   Import stub to call shared library routine from normal object file
+   (single sub-space version)
+   :		addil LR'lt_ptr+ltoff,%dp	; get procedure entry point
+   :		ldw RR'lt_ptr+ltoff(%r1),%r21
+   :		bv %r0(%r21)
+   :		ldw RR'lt_ptr+ltoff+4(%r1),%r19	; get new dlt value.
+
+   Import stub to call shared library routine from shared library
+   (single sub-space version)
+   :		addil LR'ltoff,%r19		; get procedure entry point
+   :		ldw RR'ltoff(%r1),%r21
+   :		bv %r0(%r21)
+   :		ldw RR'ltoff+4(%r1),%r19	; get new dlt value.
+
+   Import stub to call shared library routine from normal object file
+   (multiple sub-space support)
+   :		addil LR'lt_ptr+ltoff,%dp	; get procedure entry point
+   :		ldw RR'lt_ptr+ltoff(%r1),%r21
+   :		ldw RR'lt_ptr+ltoff+4(%r1),%r19	; get new dlt value.
+   :		ldsid (%r21),%r1
+   :		mtsp %r1,%sr0
+   :		be 0(%sr0,%r21)			; branch to target
+   :		stw %rp,-24(%sp)		; save rp
+
+   Import stub to call shared library routine from shared library
+   (multiple sub-space support)
+   :		addil LR'ltoff,%r19		; get procedure entry point
+   :		ldw RR'ltoff(%r1),%r21
+   :		ldw RR'ltoff+4(%r1),%r19	; get new dlt value.
+   :		ldsid (%r21),%r1
+   :		mtsp %r1,%sr0
+   :		be 0(%sr0,%r21)			; branch to target
+   :		stw %rp,-24(%sp)		; save rp
+
+   Export stub to return from shared lib routine (multiple sub-space support)
+   One of these is created for each exported procedure in a shared
+   library (and stored in the shared lib).  Shared lib routines are
+   called via the first instruction in the export stub so that we can
+   do an inter-space return.  Not required for single sub-space.
+   :		bl,n X,%rp			; trap the return
+   :		nop
+   :		ldw -24(%sp),%rp		; restore the original rp
+   :		ldsid (%rp),%r1
+   :		mtsp %r1,%sr0
+   :		be,n 0(%sr0,%rp)		; inter-space return.  */
+
+
+/* Variable names follow a coding style.
+   Please follow this (Apps Hungarian) style:
+
+   Structure/Variable         		Prefix
+   elf_link_hash_table			"etab"
+   elf_link_hash_entry			"eh"
+   
+   elf32_hppa_link_hash_table		"htab"
+   elf32_hppa_link_hash_entry		"hh"
+
+   bfd_hash_table			"btab"
+   bfd_hash_entry			"bh"
+   
+   bfd_hash_table containing stubs	"bstab"
+   elf32_hppa_stub_hash_entry		"hsh"
+
+   elf32_hppa_dyn_reloc_entry		"hdh"
+   
+   Always remember to use GNU Coding Style. */
+					  
+#define PLT_ENTRY_SIZE 8
+#define GOT_ENTRY_SIZE 4
+#define ELF_DYNAMIC_INTERPRETER "/lib/ld.so.1"
+
+static const bfd_byte plt_stub[] =
+{
+  0x0e, 0x80, 0x10, 0x96,  /* 1: ldw	0(%r20),%r22		*/
+  0xea, 0xc0, 0xc0, 0x00,  /*    bv	%r0(%r22)		*/
+  0x0e, 0x88, 0x10, 0x95,  /*    ldw	4(%r20),%r21		*/
+#define PLT_STUB_ENTRY (3*4)
+  0xea, 0x9f, 0x1f, 0xdd,  /*    b,l	1b,%r20			*/
+  0xd6, 0x80, 0x1c, 0x1e,  /*    depi	0,31,2,%r20		*/
+  0x00, 0xc0, 0xff, 0xee,  /* 9: .word	fixup_func		*/
+  0xde, 0xad, 0xbe, 0xef   /*    .word	fixup_ltp		*/
+};
+
+/* Section name for stubs is the associated section name plus this
+   string.  */
+#define STUB_SUFFIX ".stub"
+
+/* We don't need to copy certain PC- or GP-relative dynamic relocs
+   into a shared object's dynamic section.  All the relocs of the
+   limited class we are interested in, are absolute.  */
+#ifndef RELATIVE_DYNRELOCS
+#define RELATIVE_DYNRELOCS 0
+#define IS_ABSOLUTE_RELOC(r_type) 1
+#endif
+
+/* If ELIMINATE_COPY_RELOCS is non-zero, the linker will try to avoid
+   copying dynamic variables from a shared lib into an app's dynbss
+   section, and instead use a dynamic relocation to point into the
+   shared lib.  */
+#define ELIMINATE_COPY_RELOCS 1
+
+enum elf32_hppa_stub_type
+{
+  hppa_stub_long_branch,
+  hppa_stub_long_branch_shared,
+  hppa_stub_import,
+  hppa_stub_import_shared,
+  hppa_stub_export,
+  hppa_stub_none
+};
+
+struct elf32_hppa_stub_hash_entry
+{
+  /* Base hash table entry structure.  */
+  struct bfd_hash_entry bh_root;
+
+  /* The stub section.  */
+  asection *stub_sec;
+
+  /* Offset within stub_sec of the beginning of this stub.  */
+  bfd_vma stub_offset;
+
+  /* Given the symbol's value and its section we can determine its final
+     value when building the stubs (so the stub knows where to jump.  */
+  bfd_vma target_value;
+  asection *target_section;
+
+  enum elf32_hppa_stub_type stub_type;
+
+  /* The symbol table entry, if any, that this was derived from.  */
+  struct elf32_hppa_link_hash_entry *hh;
+
+  /* Where this stub is being called from, or, in the case of combined
+     stub sections, the first input section in the group.  */
+  asection *id_sec;
+};
+
+struct elf32_hppa_link_hash_entry
+{
+  struct elf_link_hash_entry eh;
+
+  /* A pointer to the most recently used stub hash entry against this
+     symbol.  */
+  struct elf32_hppa_stub_hash_entry *hsh_cache;
+
+  /* Used to count relocations for delayed sizing of relocation
+     sections.  */
+  struct elf32_hppa_dyn_reloc_entry
+  {
+    /* Next relocation in the chain.  */
+    struct elf32_hppa_dyn_reloc_entry *hdh_next;
+
+    /* The input section of the reloc.  */
+    asection *sec;
+
+    /* Number of relocs copied in this section.  */
+    bfd_size_type count;
+
+#if RELATIVE_DYNRELOCS
+  /* Number of relative relocs copied for the input section.  */
+    bfd_size_type relative_count;
+#endif
+  } *dyn_relocs;
+
+  enum
+  {
+    GOT_UNKNOWN = 0, GOT_NORMAL = 1, GOT_TLS_GD = 2, GOT_TLS_LDM = 4, GOT_TLS_IE = 8
+  } tls_type;
+
+  /* Set if this symbol is used by a plabel reloc.  */
+  unsigned int plabel:1;
+};
+
+struct elf32_hppa_link_hash_table
+{
+  /* The main hash table.  */
+  struct elf_link_hash_table etab;
+
+  /* The stub hash table.  */
+  struct bfd_hash_table bstab;
+
+  /* Linker stub bfd.  */
+  bfd *stub_bfd;
+
+  /* Linker call-backs.  */
+  asection * (*add_stub_section) (const char *, asection *);
+  void (*layout_sections_again) (void);
+
+  /* Array to keep track of which stub sections have been created, and
+     information on stub grouping.  */
+  struct map_stub
+  {
+    /* This is the section to which stubs in the group will be
+       attached.  */
+    asection *link_sec;
+    /* The stub section.  */
+    asection *stub_sec;
+  } *stub_group;
+
+  /* Assorted information used by elf32_hppa_size_stubs.  */
+  unsigned int bfd_count;
+  int top_index;
+  asection **input_list;
+  Elf_Internal_Sym **all_local_syms;
+
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *sgot;
+  asection *srelgot;
+  asection *splt;
+  asection *srelplt;
+  asection *sdynbss;
+  asection *srelbss;
+
+  /* Used during a final link to store the base of the text and data
+     segments so that we can perform SEGREL relocations.  */
+  bfd_vma text_segment_base;
+  bfd_vma data_segment_base;
+
+  /* Whether we support multiple sub-spaces for shared libs.  */
+  unsigned int multi_subspace:1;
+
+  /* Flags set when various size branches are detected.  Used to
+     select suitable defaults for the stub group size.  */
+  unsigned int has_12bit_branch:1;
+  unsigned int has_17bit_branch:1;
+  unsigned int has_22bit_branch:1;
+
+  /* Set if we need a .plt stub to support lazy dynamic linking.  */
+  unsigned int need_plt_stub:1;
+
+  /* Small local sym cache.  */
+  struct sym_cache sym_cache;
+
+  /* Data for LDM relocations.  */
+  union
+  {
+    bfd_signed_vma refcount;
+    bfd_vma offset;
+  } tls_ldm_got;
+};
+
+/* Various hash macros and functions.  */
+#define hppa_link_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == HPPA32_ELF_DATA ? ((struct elf32_hppa_link_hash_table *) ((p)->hash)) : NULL)
+
+#define hppa_elf_hash_entry(ent) \
+  ((struct elf32_hppa_link_hash_entry *)(ent))
+
+#define hppa_stub_hash_entry(ent) \
+  ((struct elf32_hppa_stub_hash_entry *)(ent))
+
+#define hppa_stub_hash_lookup(table, string, create, copy) \
+  ((struct elf32_hppa_stub_hash_entry *) \
+   bfd_hash_lookup ((table), (string), (create), (copy)))
+
+#define hppa_elf_local_got_tls_type(abfd) \
+  ((char *)(elf_local_got_offsets (abfd) + (elf_tdata (abfd)->symtab_hdr.sh_info * 2)))
+
+#define hh_name(hh) \
+  (hh ? hh->eh.root.root.string : "<undef>")
+
+#define eh_name(eh) \
+  (eh ? eh->root.root.string : "<undef>")
+
+/* Assorted hash table functions.  */
+
+/* Initialize an entry in the stub hash table.  */
+
+static struct bfd_hash_entry *
+stub_hash_newfunc (struct bfd_hash_entry *entry,
+		   struct bfd_hash_table *table,
+		   const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table,
+				 sizeof (struct elf32_hppa_stub_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = bfd_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct elf32_hppa_stub_hash_entry *hsh;
+
+      /* Initialize the local fields.  */
+      hsh = hppa_stub_hash_entry (entry);
+      hsh->stub_sec = NULL;
+      hsh->stub_offset = 0;
+      hsh->target_value = 0;
+      hsh->target_section = NULL;
+      hsh->stub_type = hppa_stub_long_branch;
+      hsh->hh = NULL;
+      hsh->id_sec = NULL;
+    }
+
+  return entry;
+}
+
+/* Initialize an entry in the link hash table.  */
+
+static struct bfd_hash_entry *
+hppa_link_hash_newfunc (struct bfd_hash_entry *entry,
+			struct bfd_hash_table *table,
+			const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table,
+				 sizeof (struct elf32_hppa_link_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = _bfd_elf_link_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct elf32_hppa_link_hash_entry *hh;
+
+      /* Initialize the local fields.  */
+      hh = hppa_elf_hash_entry (entry);
+      hh->hsh_cache = NULL;
+      hh->dyn_relocs = NULL;
+      hh->plabel = 0;
+      hh->tls_type = GOT_UNKNOWN;
+    }
+
+  return entry;
+}
+
+/* Create the derived linker hash table.  The PA ELF port uses the derived
+   hash table to keep information specific to the PA ELF linker (without
+   using static variables).  */
+
+static struct bfd_link_hash_table *
+elf32_hppa_link_hash_table_create (bfd *abfd)
+{
+  struct elf32_hppa_link_hash_table *htab;
+  bfd_size_type amt = sizeof (*htab);
+
+  htab = bfd_malloc (amt);
+  if (htab == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&htab->etab, abfd, hppa_link_hash_newfunc,
+				      sizeof (struct elf32_hppa_link_hash_entry),
+				      HPPA32_ELF_DATA))
+    {
+      free (htab);
+      return NULL;
+    }
+
+  /* Init the stub hash table too.  */
+  if (!bfd_hash_table_init (&htab->bstab, stub_hash_newfunc,
+			    sizeof (struct elf32_hppa_stub_hash_entry)))
+    return NULL;
+
+  htab->stub_bfd = NULL;
+  htab->add_stub_section = NULL;
+  htab->layout_sections_again = NULL;
+  htab->stub_group = NULL;
+  htab->sgot = NULL;
+  htab->srelgot = NULL;
+  htab->splt = NULL;
+  htab->srelplt = NULL;
+  htab->sdynbss = NULL;
+  htab->srelbss = NULL;
+  htab->text_segment_base = (bfd_vma) -1;
+  htab->data_segment_base = (bfd_vma) -1;
+  htab->multi_subspace = 0;
+  htab->has_12bit_branch = 0;
+  htab->has_17bit_branch = 0;
+  htab->has_22bit_branch = 0;
+  htab->need_plt_stub = 0;
+  htab->sym_cache.abfd = NULL;
+  htab->tls_ldm_got.refcount = 0;
+
+  return &htab->etab.root;
+}
+
+/* Free the derived linker hash table.  */
+
+static void
+elf32_hppa_link_hash_table_free (struct bfd_link_hash_table *btab)
+{
+  struct elf32_hppa_link_hash_table *htab
+    = (struct elf32_hppa_link_hash_table *) btab;
+
+  bfd_hash_table_free (&htab->bstab);
+  _bfd_generic_link_hash_table_free (btab);
+}
+
+/* Build a name for an entry in the stub hash table.  */
+
+static char *
+hppa_stub_name (const asection *input_section,
+		const asection *sym_sec,
+		const struct elf32_hppa_link_hash_entry *hh,
+		const Elf_Internal_Rela *rela)
+{
+  char *stub_name;
+  bfd_size_type len;
+
+  if (hh)
+    {
+      len = 8 + 1 + strlen (hh_name (hh)) + 1 + 8 + 1;
+      stub_name = bfd_malloc (len);
+      if (stub_name != NULL)
+	sprintf (stub_name, "%08x_%s+%x",
+		 input_section->id & 0xffffffff,
+		 hh_name (hh),
+		 (int) rela->r_addend & 0xffffffff);
+    }
+  else
+    {
+      len = 8 + 1 + 8 + 1 + 8 + 1 + 8 + 1;
+      stub_name = bfd_malloc (len);
+      if (stub_name != NULL)
+	sprintf (stub_name, "%08x_%x:%x+%x",
+		 input_section->id & 0xffffffff,
+		 sym_sec->id & 0xffffffff,
+		 (int) ELF32_R_SYM (rela->r_info) & 0xffffffff,
+		 (int) rela->r_addend & 0xffffffff);
+    }
+  return stub_name;
+}
+
+/* Look up an entry in the stub hash.  Stub entries are cached because
+   creating the stub name takes a bit of time.  */
+
+static struct elf32_hppa_stub_hash_entry *
+hppa_get_stub_entry (const asection *input_section,
+		     const asection *sym_sec,
+		     struct elf32_hppa_link_hash_entry *hh,
+		     const Elf_Internal_Rela *rela,
+		     struct elf32_hppa_link_hash_table *htab)
+{
+  struct elf32_hppa_stub_hash_entry *hsh_entry;
+  const asection *id_sec;
+
+  /* If this input section is part of a group of sections sharing one
+     stub section, then use the id of the first section in the group.
+     Stub names need to include a section id, as there may well be
+     more than one stub used to reach say, printf, and we need to
+     distinguish between them.  */
+  id_sec = htab->stub_group[input_section->id].link_sec;
+
+  if (hh != NULL && hh->hsh_cache != NULL
+      && hh->hsh_cache->hh == hh
+      && hh->hsh_cache->id_sec == id_sec)
+    {
+      hsh_entry = hh->hsh_cache;
+    }
+  else
+    {
+      char *stub_name;
+
+      stub_name = hppa_stub_name (id_sec, sym_sec, hh, rela);
+      if (stub_name == NULL)
+	return NULL;
+
+      hsh_entry = hppa_stub_hash_lookup (&htab->bstab,
+					  stub_name, FALSE, FALSE);
+      if (hh != NULL)
+	hh->hsh_cache = hsh_entry;
+
+      free (stub_name);
+    }
+
+  return hsh_entry;
+}
+
+/* Add a new stub entry to the stub hash.  Not all fields of the new
+   stub entry are initialised.  */
+
+static struct elf32_hppa_stub_hash_entry *
+hppa_add_stub (const char *stub_name,
+	       asection *section,
+	       struct elf32_hppa_link_hash_table *htab)
+{
+  asection *link_sec;
+  asection *stub_sec;
+  struct elf32_hppa_stub_hash_entry *hsh;
+
+  link_sec = htab->stub_group[section->id].link_sec;
+  stub_sec = htab->stub_group[section->id].stub_sec;
+  if (stub_sec == NULL)
+    {
+      stub_sec = htab->stub_group[link_sec->id].stub_sec;
+      if (stub_sec == NULL)
+	{
+	  size_t namelen;
+	  bfd_size_type len;
+	  char *s_name;
+
+	  namelen = strlen (link_sec->name);
+	  len = namelen + sizeof (STUB_SUFFIX);
+	  s_name = bfd_alloc (htab->stub_bfd, len);
+	  if (s_name == NULL)
+	    return NULL;
+
+	  memcpy (s_name, link_sec->name, namelen);
+	  memcpy (s_name + namelen, STUB_SUFFIX, sizeof (STUB_SUFFIX));
+	  stub_sec = (*htab->add_stub_section) (s_name, link_sec);
+	  if (stub_sec == NULL)
+	    return NULL;
+	  htab->stub_group[link_sec->id].stub_sec = stub_sec;
+	}
+      htab->stub_group[section->id].stub_sec = stub_sec;
+    }
+
+  /* Enter this entry into the linker stub hash table.  */
+  hsh = hppa_stub_hash_lookup (&htab->bstab, stub_name,
+				      TRUE, FALSE);
+  if (hsh == NULL)
+    {
+      (*_bfd_error_handler) (_("%B: cannot create stub entry %s"),
+			     section->owner,
+			     stub_name);
+      return NULL;
+    }
+
+  hsh->stub_sec = stub_sec;
+  hsh->stub_offset = 0;
+  hsh->id_sec = link_sec;
+  return hsh;
+}
+
+/* Determine the type of stub needed, if any, for a call.  */
+
+static enum elf32_hppa_stub_type
+hppa_type_of_stub (asection *input_sec,
+		   const Elf_Internal_Rela *rela,
+		   struct elf32_hppa_link_hash_entry *hh,
+		   bfd_vma destination,
+		   struct bfd_link_info *info)
+{
+  bfd_vma location;
+  bfd_vma branch_offset;
+  bfd_vma max_branch_offset;
+  unsigned int r_type;
+
+  if (hh != NULL
+      && hh->eh.plt.offset != (bfd_vma) -1
+      && hh->eh.dynindx != -1
+      && !hh->plabel
+      && (info->shared
+	  || !hh->eh.def_regular
+	  || hh->eh.root.type == bfd_link_hash_defweak))
+    {
+      /* We need an import stub.  Decide between hppa_stub_import
+	 and hppa_stub_import_shared later.  */
+      return hppa_stub_import;
+    }
+
+  /* Determine where the call point is.  */
+  location = (input_sec->output_offset
+	      + input_sec->output_section->vma
+	      + rela->r_offset);
+
+  branch_offset = destination - location - 8;
+  r_type = ELF32_R_TYPE (rela->r_info);
+
+  /* Determine if a long branch stub is needed.  parisc branch offsets
+     are relative to the second instruction past the branch, ie. +8
+     bytes on from the branch instruction location.  The offset is
+     signed and counts in units of 4 bytes.  */
+  if (r_type == (unsigned int) R_PARISC_PCREL17F)
+    max_branch_offset = (1 << (17 - 1)) << 2;
+
+  else if (r_type == (unsigned int) R_PARISC_PCREL12F)
+    max_branch_offset = (1 << (12 - 1)) << 2;
+
+  else /* R_PARISC_PCREL22F.  */
+    max_branch_offset = (1 << (22 - 1)) << 2;
+
+  if (branch_offset + max_branch_offset >= 2*max_branch_offset)
+    return hppa_stub_long_branch;
+
+  return hppa_stub_none;
+}
+
+/* Build one linker stub as defined by the stub hash table entry GEN_ENTRY.
+   IN_ARG contains the link info pointer.  */
+
+#define LDIL_R1		0x20200000	/* ldil  LR'XXX,%r1		*/
+#define BE_SR4_R1	0xe0202002	/* be,n  RR'XXX(%sr4,%r1)	*/
+
+#define BL_R1		0xe8200000	/* b,l   .+8,%r1		*/
+#define ADDIL_R1	0x28200000	/* addil LR'XXX,%r1,%r1		*/
+#define DEPI_R1		0xd4201c1e	/* depi  0,31,2,%r1		*/
+
+#define ADDIL_DP	0x2b600000	/* addil LR'XXX,%dp,%r1		*/
+#define LDW_R1_R21	0x48350000	/* ldw   RR'XXX(%sr0,%r1),%r21	*/
+#define BV_R0_R21	0xeaa0c000	/* bv    %r0(%r21)		*/
+#define LDW_R1_R19	0x48330000	/* ldw   RR'XXX(%sr0,%r1),%r19	*/
+
+#define ADDIL_R19	0x2a600000	/* addil LR'XXX,%r19,%r1	*/
+#define LDW_R1_DP	0x483b0000	/* ldw   RR'XXX(%sr0,%r1),%dp	*/
+
+#define LDSID_R21_R1	0x02a010a1	/* ldsid (%sr0,%r21),%r1	*/
+#define MTSP_R1		0x00011820	/* mtsp  %r1,%sr0		*/
+#define BE_SR0_R21	0xe2a00000	/* be    0(%sr0,%r21)		*/
+#define STW_RP		0x6bc23fd1	/* stw   %rp,-24(%sr0,%sp)	*/
+
+#define BL22_RP		0xe800a002	/* b,l,n XXX,%rp		*/
+#define BL_RP		0xe8400002	/* b,l,n XXX,%rp		*/
+#define NOP		0x08000240	/* nop				*/
+#define LDW_RP		0x4bc23fd1	/* ldw   -24(%sr0,%sp),%rp	*/
+#define LDSID_RP_R1	0x004010a1	/* ldsid (%sr0,%rp),%r1		*/
+#define BE_SR0_RP	0xe0400002	/* be,n  0(%sr0,%rp)		*/
+
+#ifndef R19_STUBS
+#define R19_STUBS 1
+#endif
+
+#if R19_STUBS
+#define LDW_R1_DLT	LDW_R1_R19
+#else
+#define LDW_R1_DLT	LDW_R1_DP
+#endif
+
+static bfd_boolean
+hppa_build_one_stub (struct bfd_hash_entry *bh, void *in_arg)
+{
+  struct elf32_hppa_stub_hash_entry *hsh;
+  struct bfd_link_info *info;
+  struct elf32_hppa_link_hash_table *htab;
+  asection *stub_sec;
+  bfd *stub_bfd;
+  bfd_byte *loc;
+  bfd_vma sym_value;
+  bfd_vma insn;
+  bfd_vma off;
+  int val;
+  int size;
+
+  /* Massage our args to the form they really have.  */
+  hsh = hppa_stub_hash_entry (bh);
+  info = (struct bfd_link_info *)in_arg;
+
+  htab = hppa_link_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  stub_sec = hsh->stub_sec;
+
+  /* Make a note of the offset within the stubs for this entry.  */
+  hsh->stub_offset = stub_sec->size;
+  loc = stub_sec->contents + hsh->stub_offset;
+
+  stub_bfd = stub_sec->owner;
+
+  switch (hsh->stub_type)
+    {
+    case hppa_stub_long_branch:
+      /* Create the long branch.  A long branch is formed with "ldil"
+	 loading the upper bits of the target address into a register,
+	 then branching with "be" which adds in the lower bits.
+	 The "be" has its delay slot nullified.  */
+      sym_value = (hsh->target_value
+		   + hsh->target_section->output_offset
+		   + hsh->target_section->output_section->vma);
+
+      val = hppa_field_adjust (sym_value, 0, e_lrsel);
+      insn = hppa_rebuild_insn ((int) LDIL_R1, val, 21);
+      bfd_put_32 (stub_bfd, insn, loc);
+
+      val = hppa_field_adjust (sym_value, 0, e_rrsel) >> 2;
+      insn = hppa_rebuild_insn ((int) BE_SR4_R1, val, 17);
+      bfd_put_32 (stub_bfd, insn, loc + 4);
+
+      size = 8;
+      break;
+
+    case hppa_stub_long_branch_shared:
+      /* Branches are relative.  This is where we are going to.  */
+      sym_value = (hsh->target_value
+		   + hsh->target_section->output_offset
+		   + hsh->target_section->output_section->vma);
+
+      /* And this is where we are coming from, more or less.  */
+      sym_value -= (hsh->stub_offset
+		    + stub_sec->output_offset
+		    + stub_sec->output_section->vma);
+
+      bfd_put_32 (stub_bfd, (bfd_vma) BL_R1, loc);
+      val = hppa_field_adjust (sym_value, (bfd_signed_vma) -8, e_lrsel);
+      insn = hppa_rebuild_insn ((int) ADDIL_R1, val, 21);
+      bfd_put_32 (stub_bfd, insn, loc + 4);
+
+      val = hppa_field_adjust (sym_value, (bfd_signed_vma) -8, e_rrsel) >> 2;
+      insn = hppa_rebuild_insn ((int) BE_SR4_R1, val, 17);
+      bfd_put_32 (stub_bfd, insn, loc + 8);
+      size = 12;
+      break;
+
+    case hppa_stub_import:
+    case hppa_stub_import_shared:
+      off = hsh->hh->eh.plt.offset;
+      if (off >= (bfd_vma) -2)
+	abort ();
+
+      off &= ~ (bfd_vma) 1;
+      sym_value = (off
+		   + htab->splt->output_offset
+		   + htab->splt->output_section->vma
+		   - elf_gp (htab->splt->output_section->owner));
+
+      insn = ADDIL_DP;
+#if R19_STUBS
+      if (hsh->stub_type == hppa_stub_import_shared)
+	insn = ADDIL_R19;
+#endif
+      val = hppa_field_adjust (sym_value, 0, e_lrsel),
+      insn = hppa_rebuild_insn ((int) insn, val, 21);
+      bfd_put_32 (stub_bfd, insn, loc);
+
+      /* It is critical to use lrsel/rrsel here because we are using
+	 two different offsets (+0 and +4) from sym_value.  If we use
+	 lsel/rsel then with unfortunate sym_values we will round
+	 sym_value+4 up to the next 2k block leading to a mis-match
+	 between the lsel and rsel value.  */
+      val = hppa_field_adjust (sym_value, 0, e_rrsel);
+      insn = hppa_rebuild_insn ((int) LDW_R1_R21, val, 14);
+      bfd_put_32 (stub_bfd, insn, loc + 4);
+
+      if (htab->multi_subspace)
+	{
+	  val = hppa_field_adjust (sym_value, (bfd_signed_vma) 4, e_rrsel);
+	  insn = hppa_rebuild_insn ((int) LDW_R1_DLT, val, 14);
+	  bfd_put_32 (stub_bfd, insn, loc + 8);
+
+	  bfd_put_32 (stub_bfd, (bfd_vma) LDSID_R21_R1, loc + 12);
+	  bfd_put_32 (stub_bfd, (bfd_vma) MTSP_R1,      loc + 16);
+	  bfd_put_32 (stub_bfd, (bfd_vma) BE_SR0_R21,   loc + 20);
+	  bfd_put_32 (stub_bfd, (bfd_vma) STW_RP,       loc + 24);
+
+	  size = 28;
+	}
+      else
+	{
+	  bfd_put_32 (stub_bfd, (bfd_vma) BV_R0_R21, loc + 8);
+	  val = hppa_field_adjust (sym_value, (bfd_signed_vma) 4, e_rrsel);
+	  insn = hppa_rebuild_insn ((int) LDW_R1_DLT, val, 14);
+	  bfd_put_32 (stub_bfd, insn, loc + 12);
+
+	  size = 16;
+	}
+
+      break;
+
+    case hppa_stub_export:
+      /* Branches are relative.  This is where we are going to.  */
+      sym_value = (hsh->target_value
+		   + hsh->target_section->output_offset
+		   + hsh->target_section->output_section->vma);
+
+      /* And this is where we are coming from.  */
+      sym_value -= (hsh->stub_offset
+		    + stub_sec->output_offset
+		    + stub_sec->output_section->vma);
+
+      if (sym_value - 8 + (1 << (17 + 1)) >= (1 << (17 + 2))
+	  && (!htab->has_22bit_branch
+	      || sym_value - 8 + (1 << (22 + 1)) >= (1 << (22 + 2))))
+	{
+	  (*_bfd_error_handler)
+	    (_("%B(%A+0x%lx): cannot reach %s, recompile with -ffunction-sections"),
+	     hsh->target_section->owner,
+	     stub_sec,
+	     (long) hsh->stub_offset,
+	     hsh->bh_root.string);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      val = hppa_field_adjust (sym_value, (bfd_signed_vma) -8, e_fsel) >> 2;
+      if (!htab->has_22bit_branch)
+	insn = hppa_rebuild_insn ((int) BL_RP, val, 17);
+      else
+	insn = hppa_rebuild_insn ((int) BL22_RP, val, 22);
+      bfd_put_32 (stub_bfd, insn, loc);
+
+      bfd_put_32 (stub_bfd, (bfd_vma) NOP,         loc + 4);
+      bfd_put_32 (stub_bfd, (bfd_vma) LDW_RP,      loc + 8);
+      bfd_put_32 (stub_bfd, (bfd_vma) LDSID_RP_R1, loc + 12);
+      bfd_put_32 (stub_bfd, (bfd_vma) MTSP_R1,     loc + 16);
+      bfd_put_32 (stub_bfd, (bfd_vma) BE_SR0_RP,   loc + 20);
+
+      /* Point the function symbol at the stub.  */
+      hsh->hh->eh.root.u.def.section = stub_sec;
+      hsh->hh->eh.root.u.def.value = stub_sec->size;
+
+      size = 24;
+      break;
+
+    default:
+      BFD_FAIL ();
+      return FALSE;
+    }
+
+  stub_sec->size += size;
+  return TRUE;
+}
+
+#undef LDIL_R1
+#undef BE_SR4_R1
+#undef BL_R1
+#undef ADDIL_R1
+#undef DEPI_R1
+#undef LDW_R1_R21
+#undef LDW_R1_DLT
+#undef LDW_R1_R19
+#undef ADDIL_R19
+#undef LDW_R1_DP
+#undef LDSID_R21_R1
+#undef MTSP_R1
+#undef BE_SR0_R21
+#undef STW_RP
+#undef BV_R0_R21
+#undef BL_RP
+#undef NOP
+#undef LDW_RP
+#undef LDSID_RP_R1
+#undef BE_SR0_RP
+
+/* As above, but don't actually build the stub.  Just bump offset so
+   we know stub section sizes.  */
+
+static bfd_boolean
+hppa_size_one_stub (struct bfd_hash_entry *bh, void *in_arg)
+{
+  struct elf32_hppa_stub_hash_entry *hsh;
+  struct elf32_hppa_link_hash_table *htab;
+  int size;
+
+  /* Massage our args to the form they really have.  */
+  hsh = hppa_stub_hash_entry (bh);
+  htab = in_arg;
+
+  if (hsh->stub_type == hppa_stub_long_branch)
+    size = 8;
+  else if (hsh->stub_type == hppa_stub_long_branch_shared)
+    size = 12;
+  else if (hsh->stub_type == hppa_stub_export)
+    size = 24;
+  else /* hppa_stub_import or hppa_stub_import_shared.  */
+    {
+      if (htab->multi_subspace)
+	size = 28;
+      else
+	size = 16;
+    }
+
+  hsh->stub_sec->size += size;
+  return TRUE;
+}
+
+/* Return nonzero if ABFD represents an HPPA ELF32 file.
+   Additionally we set the default architecture and machine.  */
+
+static bfd_boolean
+elf32_hppa_object_p (bfd *abfd)
+{
+  Elf_Internal_Ehdr * i_ehdrp;
+  unsigned int flags;
+
+  i_ehdrp = elf_elfheader (abfd);
+  if (strcmp (bfd_get_target (abfd), "elf32-hppa-linux") == 0)
+    {
+      /* GCC on hppa-linux produces binaries with OSABI=GNU,
+	 but the kernel produces corefiles with OSABI=SysV.  */
+      if (i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_GNU &&
+	  i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_NONE) /* aka SYSV */
+	return FALSE;
+    }
+  else if (strcmp (bfd_get_target (abfd), "elf32-hppa-netbsd") == 0)
+    {
+      /* GCC on hppa-netbsd produces binaries with OSABI=NetBSD,
+	 but the kernel produces corefiles with OSABI=SysV.  */
+      if (i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_NETBSD &&
+	  i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_NONE) /* aka SYSV */
+	return FALSE;
+    }
+  else
+    {
+      if (i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_HPUX)
+	return FALSE;
+    }
+
+  flags = i_ehdrp->e_flags;
+  switch (flags & (EF_PARISC_ARCH | EF_PARISC_WIDE))
+    {
+    case EFA_PARISC_1_0:
+      return bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 10);
+    case EFA_PARISC_1_1:
+      return bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 11);
+    case EFA_PARISC_2_0:
+      return bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 20);
+    case EFA_PARISC_2_0 | EF_PARISC_WIDE:
+      return bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 25);
+    }
+  return TRUE;
+}
+
+/* Create the .plt and .got sections, and set up our hash table
+   short-cuts to various dynamic sections.  */
+
+static bfd_boolean
+elf32_hppa_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  struct elf32_hppa_link_hash_table *htab;
+  struct elf_link_hash_entry *eh;
+
+  /* Don't try to create the .plt and .got twice.  */
+  htab = hppa_link_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+  if (htab->splt != NULL)
+    return TRUE;
+
+  /* Call the generic code to do most of the work.  */
+  if (! _bfd_elf_create_dynamic_sections (abfd, info))
+    return FALSE;
+
+  htab->splt = bfd_get_section_by_name (abfd, ".plt");
+  htab->srelplt = bfd_get_section_by_name (abfd, ".rela.plt");
+
+  htab->sgot = bfd_get_section_by_name (abfd, ".got");
+  htab->srelgot = bfd_get_section_by_name (abfd, ".rela.got");
+
+  htab->sdynbss = bfd_get_section_by_name (abfd, ".dynbss");
+  htab->srelbss = bfd_get_section_by_name (abfd, ".rela.bss");
+
+  /* hppa-linux needs _GLOBAL_OFFSET_TABLE_ to be visible from the main
+     application, because __canonicalize_funcptr_for_compare needs it.  */
+  eh = elf_hash_table (info)->hgot;
+  eh->forced_local = 0;
+  eh->other = STV_DEFAULT;
+  return bfd_elf_link_record_dynamic_symbol (info, eh);
+}
+
+/* Copy the extra info we tack onto an elf_link_hash_entry.  */
+
+static void
+elf32_hppa_copy_indirect_symbol (struct bfd_link_info *info,
+				 struct elf_link_hash_entry *eh_dir,
+				 struct elf_link_hash_entry *eh_ind)
+{
+  struct elf32_hppa_link_hash_entry *hh_dir, *hh_ind;
+
+  hh_dir = hppa_elf_hash_entry (eh_dir);
+  hh_ind = hppa_elf_hash_entry (eh_ind);
+
+  if (hh_ind->dyn_relocs != NULL)
+    {
+      if (hh_dir->dyn_relocs != NULL)
+	{
+	  struct elf32_hppa_dyn_reloc_entry **hdh_pp;
+	  struct elf32_hppa_dyn_reloc_entry *hdh_p;
+
+	  /* Add reloc counts against the indirect sym to the direct sym
+	     list.  Merge any entries against the same section.  */
+	  for (hdh_pp = &hh_ind->dyn_relocs; (hdh_p = *hdh_pp) != NULL; )
+	    {
+	      struct elf32_hppa_dyn_reloc_entry *hdh_q;
+
+	      for (hdh_q = hh_dir->dyn_relocs;
+		   hdh_q != NULL;
+		   hdh_q = hdh_q->hdh_next)
+		if (hdh_q->sec == hdh_p->sec)
+		  {
+#if RELATIVE_DYNRELOCS
+		    hdh_q->relative_count += hdh_p->relative_count;
+#endif
+		    hdh_q->count += hdh_p->count;
+		    *hdh_pp = hdh_p->hdh_next;
+		    break;
+		  }
+	      if (hdh_q == NULL)
+		hdh_pp = &hdh_p->hdh_next;
+	    }
+	  *hdh_pp = hh_dir->dyn_relocs;
+	}
+
+      hh_dir->dyn_relocs = hh_ind->dyn_relocs;
+      hh_ind->dyn_relocs = NULL;
+    }
+
+  if (ELIMINATE_COPY_RELOCS
+      && eh_ind->root.type != bfd_link_hash_indirect
+      && eh_dir->dynamic_adjusted)
+    {
+      /* If called to transfer flags for a weakdef during processing
+	 of elf_adjust_dynamic_symbol, don't copy non_got_ref.
+	 We clear it ourselves for ELIMINATE_COPY_RELOCS.  */
+      eh_dir->ref_dynamic |= eh_ind->ref_dynamic;
+      eh_dir->ref_regular |= eh_ind->ref_regular;
+      eh_dir->ref_regular_nonweak |= eh_ind->ref_regular_nonweak;
+      eh_dir->needs_plt |= eh_ind->needs_plt;
+    }
+  else
+    {
+      if (eh_ind->root.type == bfd_link_hash_indirect
+          && eh_dir->got.refcount <= 0)
+        {
+          hh_dir->tls_type = hh_ind->tls_type;
+          hh_ind->tls_type = GOT_UNKNOWN;
+        }
+
+      _bfd_elf_link_hash_copy_indirect (info, eh_dir, eh_ind);
+    }
+}
+
+static int
+elf32_hppa_optimized_tls_reloc (struct bfd_link_info *info ATTRIBUTE_UNUSED,
+				int r_type, int is_local ATTRIBUTE_UNUSED)
+{
+  /* For now we don't support linker optimizations.  */
+  return r_type;
+}
+
+/* Return a pointer to the local GOT, PLT and TLS reference counts
+   for ABFD.  Returns NULL if the storage allocation fails.  */
+
+static bfd_signed_vma *
+hppa32_elf_local_refcounts (bfd *abfd)
+{
+  Elf_Internal_Shdr *symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  bfd_signed_vma *local_refcounts;
+                  
+  local_refcounts = elf_local_got_refcounts (abfd);
+  if (local_refcounts == NULL)
+    {
+      bfd_size_type size;
+
+      /* Allocate space for local GOT and PLT reference
+	 counts.  Done this way to save polluting elf_obj_tdata
+	 with another target specific pointer.  */
+      size = symtab_hdr->sh_info;
+      size *= 2 * sizeof (bfd_signed_vma);
+      /* Add in space to store the local GOT TLS types.  */
+      size += symtab_hdr->sh_info;
+      local_refcounts = bfd_zalloc (abfd, size);
+      if (local_refcounts == NULL)
+	return NULL;
+      elf_local_got_refcounts (abfd) = local_refcounts;
+      memset (hppa_elf_local_got_tls_type (abfd), GOT_UNKNOWN,
+	      symtab_hdr->sh_info);
+    }
+  return local_refcounts;
+}
+
+
+/* Look through the relocs for a section during the first phase, and
+   calculate needed space in the global offset table, procedure linkage
+   table, and dynamic reloc sections.  At this point we haven't
+   necessarily read all the input files.  */
+
+static bfd_boolean
+elf32_hppa_check_relocs (bfd *abfd,
+			 struct bfd_link_info *info,
+			 asection *sec,
+			 const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **eh_syms;
+  const Elf_Internal_Rela *rela;
+  const Elf_Internal_Rela *rela_end;
+  struct elf32_hppa_link_hash_table *htab;
+  asection *sreloc;
+  int tls_type = GOT_UNKNOWN, old_tls_type = GOT_UNKNOWN;
+
+  if (info->relocatable)
+    return TRUE;
+
+  htab = hppa_link_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  eh_syms = elf_sym_hashes (abfd);
+  sreloc = NULL;
+
+  rela_end = relocs + sec->reloc_count;
+  for (rela = relocs; rela < rela_end; rela++)
+    {
+      enum {
+	NEED_GOT = 1,
+	NEED_PLT = 2,
+	NEED_DYNREL = 4,
+	PLT_PLABEL = 8
+      };
+
+      unsigned int r_symndx, r_type;
+      struct elf32_hppa_link_hash_entry *hh;
+      int need_entry = 0;
+
+      r_symndx = ELF32_R_SYM (rela->r_info);
+
+      if (r_symndx < symtab_hdr->sh_info)
+	hh = NULL;
+      else
+	{
+	  hh =  hppa_elf_hash_entry (eh_syms[r_symndx - symtab_hdr->sh_info]);
+	  while (hh->eh.root.type == bfd_link_hash_indirect
+		 || hh->eh.root.type == bfd_link_hash_warning)
+	    hh = hppa_elf_hash_entry (hh->eh.root.u.i.link);
+	}
+
+      r_type = ELF32_R_TYPE (rela->r_info);
+      r_type = elf32_hppa_optimized_tls_reloc (info, r_type, hh == NULL);
+
+      switch (r_type)
+	{
+	case R_PARISC_DLTIND14F:
+	case R_PARISC_DLTIND14R:
+	case R_PARISC_DLTIND21L:
+	  /* This symbol requires a global offset table entry.  */
+	  need_entry = NEED_GOT;
+	  break;
+
+	case R_PARISC_PLABEL14R: /* "Official" procedure labels.  */
+	case R_PARISC_PLABEL21L:
+	case R_PARISC_PLABEL32:
+	  /* If the addend is non-zero, we break badly.  */
+	  if (rela->r_addend != 0)
+	    abort ();
+
+	  /* If we are creating a shared library, then we need to
+	     create a PLT entry for all PLABELs, because PLABELs with
+	     local symbols may be passed via a pointer to another
+	     object.  Additionally, output a dynamic relocation
+	     pointing to the PLT entry.
+
+	     For executables, the original 32-bit ABI allowed two
+	     different styles of PLABELs (function pointers):  For
+	     global functions, the PLABEL word points into the .plt
+	     two bytes past a (function address, gp) pair, and for
+	     local functions the PLABEL points directly at the
+	     function.  The magic +2 for the first type allows us to
+	     differentiate between the two.  As you can imagine, this
+	     is a real pain when it comes to generating code to call
+	     functions indirectly or to compare function pointers.
+	     We avoid the mess by always pointing a PLABEL into the
+	     .plt, even for local functions.  */
+	  need_entry = PLT_PLABEL | NEED_PLT | NEED_DYNREL;
+	  break;
+
+	case R_PARISC_PCREL12F:
+	  htab->has_12bit_branch = 1;
+	  goto branch_common;
+
+	case R_PARISC_PCREL17C:
+	case R_PARISC_PCREL17F:
+	  htab->has_17bit_branch = 1;
+	  goto branch_common;
+
+	case R_PARISC_PCREL22F:
+	  htab->has_22bit_branch = 1;
+	branch_common:
+	  /* Function calls might need to go through the .plt, and
+	     might require long branch stubs.  */
+	  if (hh == NULL)
+	    {
+	      /* We know local syms won't need a .plt entry, and if
+		 they need a long branch stub we can't guarantee that
+		 we can reach the stub.  So just flag an error later
+		 if we're doing a shared link and find we need a long
+		 branch stub.  */
+	      continue;
+	    }
+	  else
+	    {
+	      /* Global symbols will need a .plt entry if they remain
+		 global, and in most cases won't need a long branch
+		 stub.  Unfortunately, we have to cater for the case
+		 where a symbol is forced local by versioning, or due
+		 to symbolic linking, and we lose the .plt entry.  */
+	      need_entry = NEED_PLT;
+	      if (hh->eh.type == STT_PARISC_MILLI)
+		need_entry = 0;
+	    }
+	  break;
+
+	case R_PARISC_SEGBASE:  /* Used to set segment base.  */
+	case R_PARISC_SEGREL32: /* Relative reloc, used for unwind.  */
+	case R_PARISC_PCREL14F: /* PC relative load/store.  */
+	case R_PARISC_PCREL14R:
+	case R_PARISC_PCREL17R: /* External branches.  */
+	case R_PARISC_PCREL21L: /* As above, and for load/store too.  */
+	case R_PARISC_PCREL32:
+	  /* We don't need to propagate the relocation if linking a
+	     shared object since these are section relative.  */
+	  continue;
+
+	case R_PARISC_DPREL14F: /* Used for gp rel data load/store.  */
+	case R_PARISC_DPREL14R:
+	case R_PARISC_DPREL21L:
+	  if (info->shared)
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: relocation %s can not be used when making a shared object; recompile with -fPIC"),
+		 abfd,
+		 elf_hppa_howto_table[r_type].name);
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	  /* Fall through.  */
+
+	case R_PARISC_DIR17F: /* Used for external branches.  */
+	case R_PARISC_DIR17R:
+	case R_PARISC_DIR14F: /* Used for load/store from absolute locn.  */
+	case R_PARISC_DIR14R:
+	case R_PARISC_DIR21L: /* As above, and for ext branches too.  */
+	case R_PARISC_DIR32: /* .word relocs.  */
+	  /* We may want to output a dynamic relocation later.  */
+	  need_entry = NEED_DYNREL;
+	  break;
+
+	  /* This relocation describes the C++ object vtable hierarchy.
+	     Reconstruct it for later use during GC.  */
+	case R_PARISC_GNU_VTINHERIT:
+	  if (!bfd_elf_gc_record_vtinherit (abfd, sec, &hh->eh, rela->r_offset))
+	    return FALSE;
+	  continue;
+
+	  /* This relocation describes which C++ vtable entries are actually
+	     used.  Record for later use during GC.  */
+	case R_PARISC_GNU_VTENTRY:
+	  BFD_ASSERT (hh != NULL);
+	  if (hh != NULL
+	      && !bfd_elf_gc_record_vtentry (abfd, sec, &hh->eh, rela->r_addend))
+	    return FALSE;
+	  continue;
+
+	case R_PARISC_TLS_GD21L:
+	case R_PARISC_TLS_GD14R:
+	case R_PARISC_TLS_LDM21L:
+	case R_PARISC_TLS_LDM14R:
+	  need_entry = NEED_GOT;
+	  break;
+
+	case R_PARISC_TLS_IE21L:
+	case R_PARISC_TLS_IE14R:
+	  if (info->shared)
+            info->flags |= DF_STATIC_TLS;
+	  need_entry = NEED_GOT;
+	  break;
+
+	default:
+	  continue;
+	}
+
+      /* Now carry out our orders.  */
+      if (need_entry & NEED_GOT)
+	{
+	  switch (r_type)
+	    {
+	    default:
+	      tls_type = GOT_NORMAL;
+	      break;
+	    case R_PARISC_TLS_GD21L:
+	    case R_PARISC_TLS_GD14R:
+	      tls_type |= GOT_TLS_GD;
+	      break;
+	    case R_PARISC_TLS_LDM21L:
+	    case R_PARISC_TLS_LDM14R:
+	      tls_type |= GOT_TLS_LDM;
+	      break;
+	    case R_PARISC_TLS_IE21L:
+	    case R_PARISC_TLS_IE14R:
+	      tls_type |= GOT_TLS_IE;
+	      break;
+	    }
+
+	  /* Allocate space for a GOT entry, as well as a dynamic
+	     relocation for this entry.  */
+	  if (htab->sgot == NULL)
+	    {
+	      if (htab->etab.dynobj == NULL)
+		htab->etab.dynobj = abfd;
+	      if (!elf32_hppa_create_dynamic_sections (htab->etab.dynobj, info))
+		return FALSE;
+	    }
+
+	  if (r_type == R_PARISC_TLS_LDM21L
+	      || r_type == R_PARISC_TLS_LDM14R)
+	    htab->tls_ldm_got.refcount += 1;
+	  else
+	    {
+	      if (hh != NULL)
+	        {
+	          hh->eh.got.refcount += 1;
+	          old_tls_type = hh->tls_type;
+	        }
+	      else
+	        {
+	          bfd_signed_vma *local_got_refcounts;
+		  
+	          /* This is a global offset table entry for a local symbol.  */
+	          local_got_refcounts = hppa32_elf_local_refcounts (abfd);
+	          if (local_got_refcounts == NULL)
+		    return FALSE;
+	          local_got_refcounts[r_symndx] += 1;
+
+	          old_tls_type = hppa_elf_local_got_tls_type (abfd) [r_symndx];
+	        }
+
+	      tls_type |= old_tls_type;
+
+	      if (old_tls_type != tls_type)
+	        {
+	          if (hh != NULL)
+		    hh->tls_type = tls_type;
+	          else
+		    hppa_elf_local_got_tls_type (abfd) [r_symndx] = tls_type;
+	        }
+
+	    }
+	}
+
+      if (need_entry & NEED_PLT)
+	{
+	  /* If we are creating a shared library, and this is a reloc
+	     against a weak symbol or a global symbol in a dynamic
+	     object, then we will be creating an import stub and a
+	     .plt entry for the symbol.  Similarly, on a normal link
+	     to symbols defined in a dynamic object we'll need the
+	     import stub and a .plt entry.  We don't know yet whether
+	     the symbol is defined or not, so make an entry anyway and
+	     clean up later in adjust_dynamic_symbol.  */
+	  if ((sec->flags & SEC_ALLOC) != 0)
+	    {
+	      if (hh != NULL)
+		{
+		  hh->eh.needs_plt = 1;
+		  hh->eh.plt.refcount += 1;
+
+		  /* If this .plt entry is for a plabel, mark it so
+		     that adjust_dynamic_symbol will keep the entry
+		     even if it appears to be local.  */
+		  if (need_entry & PLT_PLABEL)
+		    hh->plabel = 1;
+		}
+	      else if (need_entry & PLT_PLABEL)
+		{
+		  bfd_signed_vma *local_got_refcounts;
+		  bfd_signed_vma *local_plt_refcounts;
+
+		  local_got_refcounts = hppa32_elf_local_refcounts (abfd);
+		  if (local_got_refcounts == NULL)
+		    return FALSE;
+		  local_plt_refcounts = (local_got_refcounts
+					 + symtab_hdr->sh_info);
+		  local_plt_refcounts[r_symndx] += 1;
+		}
+	    }
+	}
+
+      if (need_entry & NEED_DYNREL)
+	{
+	  /* Flag this symbol as having a non-got, non-plt reference
+	     so that we generate copy relocs if it turns out to be
+	     dynamic.  */
+	  if (hh != NULL && !info->shared)
+	    hh->eh.non_got_ref = 1;
+
+	  /* If we are creating a shared library then we need to copy
+	     the reloc into the shared library.  However, if we are
+	     linking with -Bsymbolic, we need only copy absolute
+	     relocs or relocs against symbols that are not defined in
+	     an object we are including in the link.  PC- or DP- or
+	     DLT-relative relocs against any local sym or global sym
+	     with DEF_REGULAR set, can be discarded.  At this point we
+	     have not seen all the input files, so it is possible that
+	     DEF_REGULAR is not set now but will be set later (it is
+	     never cleared).  We account for that possibility below by
+	     storing information in the dyn_relocs field of the
+	     hash table entry.
+
+	     A similar situation to the -Bsymbolic case occurs when
+	     creating shared libraries and symbol visibility changes
+	     render the symbol local.
+
+	     As it turns out, all the relocs we will be creating here
+	     are absolute, so we cannot remove them on -Bsymbolic
+	     links or visibility changes anyway.  A STUB_REL reloc
+	     is absolute too, as in that case it is the reloc in the
+	     stub we will be creating, rather than copying the PCREL
+	     reloc in the branch.
+
+	     If on the other hand, we are creating an executable, we
+	     may need to keep relocations for symbols satisfied by a
+	     dynamic library if we manage to avoid copy relocs for the
+	     symbol.  */
+	  if ((info->shared
+	       && (sec->flags & SEC_ALLOC) != 0
+	       && (IS_ABSOLUTE_RELOC (r_type)
+		   || (hh != NULL
+		       && (!info->symbolic
+			   || hh->eh.root.type == bfd_link_hash_defweak
+			   || !hh->eh.def_regular))))
+	      || (ELIMINATE_COPY_RELOCS
+		  && !info->shared
+		  && (sec->flags & SEC_ALLOC) != 0
+		  && hh != NULL
+		  && (hh->eh.root.type == bfd_link_hash_defweak
+		      || !hh->eh.def_regular)))
+	    {
+	      struct elf32_hppa_dyn_reloc_entry *hdh_p;
+	      struct elf32_hppa_dyn_reloc_entry **hdh_head;
+
+	      /* Create a reloc section in dynobj and make room for
+		 this reloc.  */
+	      if (sreloc == NULL)
+		{
+		  if (htab->etab.dynobj == NULL)
+		    htab->etab.dynobj = abfd;
+
+		  sreloc = _bfd_elf_make_dynamic_reloc_section
+		    (sec, htab->etab.dynobj, 2, abfd, /*rela?*/ TRUE);
+
+		  if (sreloc == NULL)
+		    {
+		      bfd_set_error (bfd_error_bad_value);
+		      return FALSE;
+		    }
+		}
+
+	      /* If this is a global symbol, we count the number of
+		 relocations we need for this symbol.  */
+	      if (hh != NULL)
+		{
+		  hdh_head = &hh->dyn_relocs;
+		}
+	      else
+		{
+		  /* Track dynamic relocs needed for local syms too.
+		     We really need local syms available to do this
+		     easily.  Oh well.  */
+		  asection *sr;
+		  void *vpp;
+		  Elf_Internal_Sym *isym;
+
+		  isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+						abfd, r_symndx);
+		  if (isym == NULL)
+		    return FALSE;
+
+		  sr = bfd_section_from_elf_index (abfd, isym->st_shndx);
+		  if (sr == NULL)
+		    sr = sec;
+
+		  vpp = &elf_section_data (sr)->local_dynrel;
+		  hdh_head = (struct elf32_hppa_dyn_reloc_entry **) vpp;
+		}
+
+	      hdh_p = *hdh_head;
+	      if (hdh_p == NULL || hdh_p->sec != sec)
+		{
+		  hdh_p = bfd_alloc (htab->etab.dynobj, sizeof *hdh_p);
+		  if (hdh_p == NULL)
+		    return FALSE;
+		  hdh_p->hdh_next = *hdh_head;
+		  *hdh_head = hdh_p;
+		  hdh_p->sec = sec;
+		  hdh_p->count = 0;
+#if RELATIVE_DYNRELOCS
+		  hdh_p->relative_count = 0;
+#endif
+		}
+
+	      hdh_p->count += 1;
+#if RELATIVE_DYNRELOCS
+	      if (!IS_ABSOLUTE_RELOC (rtype))
+		hdh_p->relative_count += 1;
+#endif
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return the section that should be marked against garbage collection
+   for a given relocation.  */
+
+static asection *
+elf32_hppa_gc_mark_hook (asection *sec,
+			 struct bfd_link_info *info,
+			 Elf_Internal_Rela *rela,
+			 struct elf_link_hash_entry *hh,
+			 Elf_Internal_Sym *sym)
+{
+  if (hh != NULL)
+    switch ((unsigned int) ELF32_R_TYPE (rela->r_info))
+      {
+      case R_PARISC_GNU_VTINHERIT:
+      case R_PARISC_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rela, hh, sym);
+}
+
+/* Update the got and plt entry reference counts for the section being
+   removed.  */
+
+static bfd_boolean
+elf32_hppa_gc_sweep_hook (bfd *abfd,
+			  struct bfd_link_info *info ATTRIBUTE_UNUSED,
+			  asection *sec,
+			  const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **eh_syms;
+  bfd_signed_vma *local_got_refcounts;
+  bfd_signed_vma *local_plt_refcounts;
+  const Elf_Internal_Rela *rela, *relend;
+  struct elf32_hppa_link_hash_table *htab;
+
+  if (info->relocatable)
+    return TRUE;
+
+  htab = hppa_link_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  elf_section_data (sec)->local_dynrel = NULL;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  eh_syms = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+  local_plt_refcounts = local_got_refcounts;
+  if (local_plt_refcounts != NULL)
+    local_plt_refcounts += symtab_hdr->sh_info;
+
+  relend = relocs + sec->reloc_count;
+  for (rela = relocs; rela < relend; rela++)
+    {
+      unsigned long r_symndx;
+      unsigned int r_type;
+      struct elf_link_hash_entry *eh = NULL;
+
+      r_symndx = ELF32_R_SYM (rela->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  struct elf32_hppa_link_hash_entry *hh;
+	  struct elf32_hppa_dyn_reloc_entry **hdh_pp;
+	  struct elf32_hppa_dyn_reloc_entry *hdh_p;
+
+	  eh = eh_syms[r_symndx - symtab_hdr->sh_info];
+	  while (eh->root.type == bfd_link_hash_indirect
+		 || eh->root.type == bfd_link_hash_warning)
+	    eh = (struct elf_link_hash_entry *) eh->root.u.i.link;
+	  hh = hppa_elf_hash_entry (eh);
+
+	  for (hdh_pp = &hh->dyn_relocs; (hdh_p = *hdh_pp) != NULL; hdh_pp = &hdh_p->hdh_next)
+	    if (hdh_p->sec == sec)
+	      {
+		/* Everything must go for SEC.  */
+		*hdh_pp = hdh_p->hdh_next;
+		break;
+	      }
+	}
+
+      r_type = ELF32_R_TYPE (rela->r_info);
+      r_type = elf32_hppa_optimized_tls_reloc (info, r_type, eh != NULL);
+
+      switch (r_type)
+	{
+	case R_PARISC_DLTIND14F:
+	case R_PARISC_DLTIND14R:
+	case R_PARISC_DLTIND21L:
+	case R_PARISC_TLS_GD21L:
+	case R_PARISC_TLS_GD14R:
+	case R_PARISC_TLS_IE21L:
+	case R_PARISC_TLS_IE14R:
+	  if (eh != NULL)
+	    {
+	      if (eh->got.refcount > 0)
+		eh->got.refcount -= 1;
+	    }
+	  else if (local_got_refcounts != NULL)
+	    {
+	      if (local_got_refcounts[r_symndx] > 0)
+		local_got_refcounts[r_symndx] -= 1;
+	    }
+	  break;
+
+	case R_PARISC_TLS_LDM21L:
+	case R_PARISC_TLS_LDM14R:
+	  htab->tls_ldm_got.refcount -= 1;
+	  break;
+
+	case R_PARISC_PCREL12F:
+	case R_PARISC_PCREL17C:
+	case R_PARISC_PCREL17F:
+	case R_PARISC_PCREL22F:
+	  if (eh != NULL)
+	    {
+	      if (eh->plt.refcount > 0)
+		eh->plt.refcount -= 1;
+	    }
+	  break;
+
+	case R_PARISC_PLABEL14R:
+	case R_PARISC_PLABEL21L:
+	case R_PARISC_PLABEL32:
+	  if (eh != NULL)
+	    {
+	      if (eh->plt.refcount > 0)
+		eh->plt.refcount -= 1;
+	    }
+	  else if (local_plt_refcounts != NULL)
+	    {
+	      if (local_plt_refcounts[r_symndx] > 0)
+		local_plt_refcounts[r_symndx] -= 1;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Support for core dump NOTE sections.  */
+
+static bfd_boolean
+elf32_hppa_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  int offset;
+  size_t size;
+
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      case 396:		/* Linux/hppa */
+	/* pr_cursig */
+	elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12);
+
+	/* pr_pid */
+	elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 24);
+
+	/* pr_reg */
+	offset = 72;
+	size = 320;
+
+	break;
+    }
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg",
+					  size, note->descpos + offset);
+}
+
+static bfd_boolean
+elf32_hppa_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      case 124:		/* Linux/hppa elf_prpsinfo.  */
+	elf_tdata (abfd)->core_program
+	  = _bfd_elfcore_strndup (abfd, note->descdata + 28, 16);
+	elf_tdata (abfd)->core_command
+	  = _bfd_elfcore_strndup (abfd, note->descdata + 44, 80);
+    }
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+  {
+    char *command = elf_tdata (abfd)->core_command;
+    int n = strlen (command);
+
+    if (0 < n && command[n - 1] == ' ')
+      command[n - 1] = '\0';
+  }
+
+  return TRUE;
+}
+
+/* Our own version of hide_symbol, so that we can keep plt entries for
+   plabels.  */
+
+static void
+elf32_hppa_hide_symbol (struct bfd_link_info *info,
+			struct elf_link_hash_entry *eh,
+			bfd_boolean force_local)
+{
+  if (force_local)
+    {
+      eh->forced_local = 1;
+      if (eh->dynindx != -1)
+	{
+	  eh->dynindx = -1;
+	  _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
+				  eh->dynstr_index);
+	}
+    }
+
+  if (! hppa_elf_hash_entry (eh)->plabel)
+    {
+      eh->needs_plt = 0;
+      eh->plt = elf_hash_table (info)->init_plt_refcount;
+    }
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+elf32_hppa_adjust_dynamic_symbol (struct bfd_link_info *info,
+				  struct elf_link_hash_entry *eh)
+{
+  struct elf32_hppa_link_hash_table *htab;
+  asection *sec;
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later.  */
+  if (eh->type == STT_FUNC
+      || eh->needs_plt)
+    {
+      if (eh->plt.refcount <= 0
+	  || (eh->def_regular
+	      && eh->root.type != bfd_link_hash_defweak
+	      && ! hppa_elf_hash_entry (eh)->plabel
+	      && (!info->shared || info->symbolic)))
+	{
+	  /* The .plt entry is not needed when:
+	     a) Garbage collection has removed all references to the
+	     symbol, or
+	     b) We know for certain the symbol is defined in this
+	     object, and it's not a weak definition, nor is the symbol
+	     used by a plabel relocation.  Either this object is the
+	     application or we are doing a shared symbolic link.  */
+
+	  eh->plt.offset = (bfd_vma) -1;
+	  eh->needs_plt = 0;
+	}
+
+      return TRUE;
+    }
+  else
+    eh->plt.offset = (bfd_vma) -1;
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (eh->u.weakdef != NULL)
+    {
+      if (eh->u.weakdef->root.type != bfd_link_hash_defined
+	  && eh->u.weakdef->root.type != bfd_link_hash_defweak)
+	abort ();
+      eh->root.u.def.section = eh->u.weakdef->root.u.def.section;
+      eh->root.u.def.value = eh->u.weakdef->root.u.def.value;
+      if (ELIMINATE_COPY_RELOCS)
+	eh->non_got_ref = eh->u.weakdef->non_got_ref;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if (!eh->non_got_ref)
+    return TRUE;
+
+  if (ELIMINATE_COPY_RELOCS)
+    {
+      struct elf32_hppa_link_hash_entry *hh;
+      struct elf32_hppa_dyn_reloc_entry *hdh_p;
+
+      hh = hppa_elf_hash_entry (eh);
+      for (hdh_p = hh->dyn_relocs; hdh_p != NULL; hdh_p = hdh_p->hdh_next)
+	{
+	  sec = hdh_p->sec->output_section;
+	  if (sec != NULL && (sec->flags & SEC_READONLY) != 0)
+	    break;
+	}
+
+      /* If we didn't find any dynamic relocs in read-only sections, then
+	 we'll be keeping the dynamic relocs and avoiding the copy reloc.  */
+      if (hdh_p == NULL)
+	{
+	  eh->non_got_ref = 0;
+	  return TRUE;
+	}
+    }
+
+  if (eh->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     eh->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  htab = hppa_link_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* We must generate a COPY reloc to tell the dynamic linker to
+     copy the initial value out of the dynamic object and into the
+     runtime process image.  */
+  if ((eh->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      htab->srelbss->size += sizeof (Elf32_External_Rela);
+      eh->needs_copy = 1;
+    }
+
+  sec = htab->sdynbss;
+
+  return _bfd_elf_adjust_dynamic_copy (eh, sec);
+}
+
+/* Allocate space in the .plt for entries that won't have relocations.
+   ie. plabel entries.  */
+
+static bfd_boolean
+allocate_plt_static (struct elf_link_hash_entry *eh, void *inf)
+{
+  struct bfd_link_info *info;
+  struct elf32_hppa_link_hash_table *htab;
+  struct elf32_hppa_link_hash_entry *hh;
+  asection *sec;
+
+  if (eh->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  info = (struct bfd_link_info *) inf;
+  hh = hppa_elf_hash_entry (eh);
+  htab = hppa_link_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (htab->etab.dynamic_sections_created
+      && eh->plt.refcount > 0)
+    {
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (eh->dynindx == -1
+	  && !eh->forced_local
+	  && eh->type != STT_PARISC_MILLI)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, eh))
+	    return FALSE;
+	}
+
+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info->shared, eh))
+	{
+	  /* Allocate these later.  From this point on, h->plabel
+	     means that the plt entry is only used by a plabel.
+	     We'll be using a normal plt entry for this symbol, so
+	     clear the plabel indicator.  */
+	  
+	  hh->plabel = 0;
+	}
+      else if (hh->plabel)
+	{
+	  /* Make an entry in the .plt section for plabel references
+	     that won't have a .plt entry for other reasons.  */
+	  sec = htab->splt;
+	  eh->plt.offset = sec->size;
+	  sec->size += PLT_ENTRY_SIZE;
+	}
+      else
+	{
+	  /* No .plt entry needed.  */
+	  eh->plt.offset = (bfd_vma) -1;
+	  eh->needs_plt = 0;
+	}
+    }
+  else
+    {
+      eh->plt.offset = (bfd_vma) -1;
+      eh->needs_plt = 0;
+    }
+
+  return TRUE;
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   global syms.  */
+
+static bfd_boolean
+allocate_dynrelocs (struct elf_link_hash_entry *eh, void *inf)
+{
+  struct bfd_link_info *info;
+  struct elf32_hppa_link_hash_table *htab;
+  asection *sec;
+  struct elf32_hppa_link_hash_entry *hh;
+  struct elf32_hppa_dyn_reloc_entry *hdh_p;
+
+  if (eh->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  info = inf;
+  htab = hppa_link_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  hh = hppa_elf_hash_entry (eh);
+  
+  if (htab->etab.dynamic_sections_created
+      && eh->plt.offset != (bfd_vma) -1
+      && !hh->plabel
+      && eh->plt.refcount > 0)
+    {
+      /* Make an entry in the .plt section.  */
+      sec = htab->splt;
+      eh->plt.offset = sec->size;
+      sec->size += PLT_ENTRY_SIZE;
+
+      /* We also need to make an entry in the .rela.plt section.  */
+      htab->srelplt->size += sizeof (Elf32_External_Rela);
+      htab->need_plt_stub = 1;
+    }
+
+  if (eh->got.refcount > 0)
+    {
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (eh->dynindx == -1
+	  && !eh->forced_local
+	  && eh->type != STT_PARISC_MILLI)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, eh))
+	    return FALSE;
+	}
+
+      sec = htab->sgot;
+      eh->got.offset = sec->size;
+      sec->size += GOT_ENTRY_SIZE;
+      /* R_PARISC_TLS_GD* needs two GOT entries */
+      if ((hh->tls_type & (GOT_TLS_GD | GOT_TLS_IE)) == (GOT_TLS_GD | GOT_TLS_IE))
+      	sec->size += GOT_ENTRY_SIZE * 2;
+      else if ((hh->tls_type & GOT_TLS_GD) == GOT_TLS_GD)
+      	sec->size += GOT_ENTRY_SIZE;
+      if (htab->etab.dynamic_sections_created
+	  && (info->shared
+	      || (eh->dynindx != -1
+		  && !eh->forced_local)))
+	{
+	  htab->srelgot->size += sizeof (Elf32_External_Rela);
+	  if ((hh->tls_type & (GOT_TLS_GD | GOT_TLS_IE)) == (GOT_TLS_GD | GOT_TLS_IE))
+	    htab->srelgot->size += 2 * sizeof (Elf32_External_Rela);
+	  else if ((hh->tls_type & GOT_TLS_GD) == GOT_TLS_GD)
+	    htab->srelgot->size += sizeof (Elf32_External_Rela);
+	}
+    }
+  else
+    eh->got.offset = (bfd_vma) -1;
+
+  if (hh->dyn_relocs == NULL)
+    return TRUE;
+
+  /* If this is a -Bsymbolic shared link, then we need to discard all
+     space allocated for dynamic pc-relative relocs against symbols
+     defined in a regular object.  For the normal shared case, discard
+     space for relocs that have become local due to symbol visibility
+     changes.  */
+  if (info->shared)
+    {
+#if RELATIVE_DYNRELOCS
+      if (SYMBOL_CALLS_LOCAL (info, eh))
+	{
+	  struct elf32_hppa_dyn_reloc_entry **hdh_pp;
+
+	  for (hdh_pp = &hh->dyn_relocs; (hdh_p = *hdh_pp) != NULL; )
+	    {
+	      hdh_p->count -= hdh_p->relative_count;
+	      hdh_p->relative_count = 0;
+	      if (hdh_p->count == 0)
+		*hdh_pp = hdh_p->hdh_next;
+	      else
+		hdh_pp = &hdh_p->hdh_next;
+	    }
+	}
+#endif
+
+      /* Also discard relocs on undefined weak syms with non-default
+	 visibility.  */
+      if (hh->dyn_relocs != NULL
+	  && eh->root.type == bfd_link_hash_undefweak)
+	{
+	  if (ELF_ST_VISIBILITY (eh->other) != STV_DEFAULT)
+	    hh->dyn_relocs = NULL;
+
+	  /* Make sure undefined weak symbols are output as a dynamic
+	     symbol in PIEs.  */
+	  else if (eh->dynindx == -1
+		   && !eh->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, eh))
+		return FALSE;
+	    }
+	}
+    }
+  else
+    {
+      /* For the non-shared case, discard space for relocs against
+	 symbols which turn out to need copy relocs or are not
+	 dynamic.  */
+      
+      if (!eh->non_got_ref
+	  && ((ELIMINATE_COPY_RELOCS
+	       && eh->def_dynamic
+	       && !eh->def_regular)
+	       || (htab->etab.dynamic_sections_created
+		   && (eh->root.type == bfd_link_hash_undefweak
+		       || eh->root.type == bfd_link_hash_undefined))))
+	{
+	  /* Make sure this symbol is output as a dynamic symbol.
+	     Undefined weak syms won't yet be marked as dynamic.  */
+	  if (eh->dynindx == -1
+	      && !eh->forced_local
+	      && eh->type != STT_PARISC_MILLI)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, eh))
+		return FALSE;
+	    }
+
+	  /* If that succeeded, we know we'll be keeping all the
+	     relocs.  */
+	  if (eh->dynindx != -1)
+	    goto keep;
+	}
+
+      hh->dyn_relocs = NULL;
+      return TRUE;
+
+    keep: ;
+    }
+
+  /* Finally, allocate space.  */
+  for (hdh_p = hh->dyn_relocs; hdh_p != NULL; hdh_p = hdh_p->hdh_next)
+    {
+      asection *sreloc = elf_section_data (hdh_p->sec)->sreloc;
+      sreloc->size += hdh_p->count * sizeof (Elf32_External_Rela);
+    }
+
+  return TRUE;
+}
+
+/* This function is called via elf_link_hash_traverse to force
+   millicode symbols local so they do not end up as globals in the
+   dynamic symbol table.  We ought to be able to do this in
+   adjust_dynamic_symbol, but our adjust_dynamic_symbol is not called
+   for all dynamic symbols.  Arguably, this is a bug in
+   elf_adjust_dynamic_symbol.  */
+
+static bfd_boolean
+clobber_millicode_symbols (struct elf_link_hash_entry *eh,
+			   struct bfd_link_info *info)
+{
+  if (eh->type == STT_PARISC_MILLI
+      && !eh->forced_local)
+    {
+      elf32_hppa_hide_symbol (info, eh, TRUE);
+    }
+  return TRUE;
+}
+
+/* Find any dynamic relocs that apply to read-only sections.  */
+
+static bfd_boolean
+readonly_dynrelocs (struct elf_link_hash_entry *eh, void *inf)
+{
+  struct elf32_hppa_link_hash_entry *hh;
+  struct elf32_hppa_dyn_reloc_entry *hdh_p;
+
+  hh = hppa_elf_hash_entry (eh);
+  for (hdh_p = hh->dyn_relocs; hdh_p != NULL; hdh_p = hdh_p->hdh_next)
+    {
+      asection *sec = hdh_p->sec->output_section;
+
+      if (sec != NULL && (sec->flags & SEC_READONLY) != 0)
+	{
+	  struct bfd_link_info *info = inf;
+
+	  info->flags |= DF_TEXTREL;
+
+	  /* Not an error, just cut short the traversal.  */
+	  return FALSE;
+	}
+    }
+  return TRUE;
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+elf32_hppa_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+				  struct bfd_link_info *info)
+{
+  struct elf32_hppa_link_hash_table *htab;
+  bfd *dynobj;
+  bfd *ibfd;
+  asection *sec;
+  bfd_boolean relocs;
+
+  htab = hppa_link_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = htab->etab.dynobj;
+  if (dynobj == NULL)
+    abort ();
+
+  if (htab->etab.dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  sec = bfd_get_section_by_name (dynobj, ".interp");
+	  if (sec == NULL)
+	    abort ();
+	  sec->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  sec->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+
+      /* Force millicode symbols local.  */
+      elf_link_hash_traverse (&htab->etab,
+			      clobber_millicode_symbols,
+			      info);
+    }
+
+  /* Set up .got and .plt offsets for local syms, and space for local
+     dynamic relocs.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      bfd_signed_vma *local_got;
+      bfd_signed_vma *end_local_got;
+      bfd_signed_vma *local_plt;
+      bfd_signed_vma *end_local_plt;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *srel;
+      char *local_tls_type;
+
+      if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour)
+	continue;
+
+      for (sec = ibfd->sections; sec != NULL; sec = sec->next)
+	{
+	  struct elf32_hppa_dyn_reloc_entry *hdh_p;
+
+	  for (hdh_p = ((struct elf32_hppa_dyn_reloc_entry *)
+		    elf_section_data (sec)->local_dynrel);
+	       hdh_p != NULL;
+	       hdh_p = hdh_p->hdh_next)
+	    {
+	      if (!bfd_is_abs_section (hdh_p->sec)
+		  && bfd_is_abs_section (hdh_p->sec->output_section))
+		{
+		  /* Input section has been discarded, either because
+		     it is a copy of a linkonce section or due to
+		     linker script /DISCARD/, so we'll be discarding
+		     the relocs too.  */
+		}
+	      else if (hdh_p->count != 0)
+		{
+		  srel = elf_section_data (hdh_p->sec)->sreloc;
+		  srel->size += hdh_p->count * sizeof (Elf32_External_Rela);
+		  if ((hdh_p->sec->output_section->flags & SEC_READONLY) != 0)
+		    info->flags |= DF_TEXTREL;
+		}
+	    }
+	}
+
+      local_got = elf_local_got_refcounts (ibfd);
+      if (!local_got)
+	continue;
+
+      symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+      locsymcount = symtab_hdr->sh_info;
+      end_local_got = local_got + locsymcount;
+      local_tls_type = hppa_elf_local_got_tls_type (ibfd);
+      sec = htab->sgot;
+      srel = htab->srelgot;
+      for (; local_got < end_local_got; ++local_got)
+	{
+	  if (*local_got > 0)
+	    {
+	      *local_got = sec->size;
+	      sec->size += GOT_ENTRY_SIZE;
+	      if ((*local_tls_type & (GOT_TLS_GD | GOT_TLS_IE)) == (GOT_TLS_GD | GOT_TLS_IE))
+		sec->size += 2 * GOT_ENTRY_SIZE;
+	      else if ((*local_tls_type & GOT_TLS_GD) == GOT_TLS_GD)
+		sec->size += GOT_ENTRY_SIZE;
+	      if (info->shared) 
+	        {
+		  srel->size += sizeof (Elf32_External_Rela);
+		  if ((*local_tls_type & (GOT_TLS_GD | GOT_TLS_IE)) == (GOT_TLS_GD | GOT_TLS_IE))
+		    srel->size += 2 * sizeof (Elf32_External_Rela);
+		  else if ((*local_tls_type & GOT_TLS_GD) == GOT_TLS_GD)
+		    srel->size += sizeof (Elf32_External_Rela);
+	        }
+	    }
+	  else
+	    *local_got = (bfd_vma) -1;
+
+	  ++local_tls_type;
+	}
+
+      local_plt = end_local_got;
+      end_local_plt = local_plt + locsymcount;
+      if (! htab->etab.dynamic_sections_created)
+	{
+	  /* Won't be used, but be safe.  */
+	  for (; local_plt < end_local_plt; ++local_plt)
+	    *local_plt = (bfd_vma) -1;
+	}
+      else
+	{
+	  sec = htab->splt;
+	  srel = htab->srelplt;
+	  for (; local_plt < end_local_plt; ++local_plt)
+	    {
+	      if (*local_plt > 0)
+		{
+		  *local_plt = sec->size;
+		  sec->size += PLT_ENTRY_SIZE;
+		  if (info->shared)
+		    srel->size += sizeof (Elf32_External_Rela);
+		}
+	      else
+		*local_plt = (bfd_vma) -1;
+	    }
+	}
+    }
+  
+  if (htab->tls_ldm_got.refcount > 0)
+    {
+      /* Allocate 2 got entries and 1 dynamic reloc for 
+         R_PARISC_TLS_DTPMOD32 relocs.  */
+      htab->tls_ldm_got.offset = htab->sgot->size;
+      htab->sgot->size += (GOT_ENTRY_SIZE * 2);
+      htab->srelgot->size += sizeof (Elf32_External_Rela);
+    }
+  else
+    htab->tls_ldm_got.offset = -1;
+
+  /* Do all the .plt entries without relocs first.  The dynamic linker
+     uses the last .plt reloc to find the end of the .plt (and hence
+     the start of the .got) for lazy linking.  */
+  elf_link_hash_traverse (&htab->etab, allocate_plt_static, info);
+
+  /* Allocate global sym .plt and .got entries, and space for global
+     sym dynamic relocs.  */
+  elf_link_hash_traverse (&htab->etab, allocate_dynrelocs, info);
+
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  relocs = FALSE;
+  for (sec = dynobj->sections; sec != NULL; sec = sec->next)
+    {
+      if ((sec->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      if (sec == htab->splt)
+	{
+	  if (htab->need_plt_stub)
+	    {
+	      /* Make space for the plt stub at the end of the .plt
+		 section.  We want this stub right at the end, up
+		 against the .got section.  */
+	      int gotalign = bfd_section_alignment (dynobj, htab->sgot);
+	      int pltalign = bfd_section_alignment (dynobj, sec);
+	      bfd_size_type mask;
+
+	      if (gotalign > pltalign)
+		bfd_set_section_alignment (dynobj, sec, gotalign);
+	      mask = ((bfd_size_type) 1 << gotalign) - 1;
+	      sec->size = (sec->size + sizeof (plt_stub) + mask) & ~mask;
+	    }
+	}
+      else if (sec == htab->sgot
+	       || sec == htab->sdynbss)
+	;
+      else if (CONST_STRNEQ (bfd_get_section_name (dynobj, sec), ".rela"))
+	{
+	  if (sec->size != 0)
+	    {
+	      /* Remember whether there are any reloc sections other
+		 than .rela.plt.  */
+	      if (sec != htab->srelplt)
+		relocs = TRUE;
+
+	      /* We use the reloc_count field as a counter if we need
+		 to copy relocs into the output file.  */
+	      sec->reloc_count = 0;
+	    }
+	}
+      else
+	{
+	  /* It's not one of our sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (sec->size == 0)
+	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is mostly to handle .rela.bss and
+	     .rela.plt.  We must create both sections in
+	     create_dynamic_sections, because they must be created
+	     before the linker maps input sections to output
+	     sections.  The linker does that before
+	     adjust_dynamic_symbol is called, and it is that
+	     function which decides whether anything needs to go
+	     into these sections.  */
+	  sec->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      if ((sec->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents.  Zero it, because
+	 we may not fill in all the reloc sections.  */
+      sec->contents = bfd_zalloc (dynobj, sec->size);
+      if (sec->contents == NULL)
+	return FALSE;
+    }
+
+  if (htab->etab.dynamic_sections_created)
+    {
+      /* Like IA-64 and HPPA64, always create a DT_PLTGOT.  It
+	 actually has nothing to do with the PLT, it is how we
+	 communicate the LTP value of a load module to the dynamic
+	 linker.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (!add_dynamic_entry (DT_PLTGOT, 0))
+	return FALSE;
+
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in elf32_hppa_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+      if (info->executable)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (htab->srelplt->size != 0)
+	{
+	  if (!add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+	      || !add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+	}
+
+      if (relocs)
+	{
+	  if (!add_dynamic_entry (DT_RELA, 0)
+	      || !add_dynamic_entry (DT_RELASZ, 0)
+	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
+	    return FALSE;
+
+	  /* If any dynamic relocs apply to a read-only section,
+	     then we need a DT_TEXTREL entry.  */
+	  if ((info->flags & DF_TEXTREL) == 0)
+	    elf_link_hash_traverse (&htab->etab, readonly_dynrelocs, info);
+
+	  if ((info->flags & DF_TEXTREL) != 0)
+	    {
+	      if (!add_dynamic_entry (DT_TEXTREL, 0))
+		return FALSE;
+	    }
+	}
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+/* External entry points for sizing and building linker stubs.  */
+
+/* Set up various things so that we can make a list of input sections
+   for each output section included in the link.  Returns -1 on error,
+   0 when no stubs will be needed, and 1 on success.  */
+
+int
+elf32_hppa_setup_section_lists (bfd *output_bfd, struct bfd_link_info *info)
+{
+  bfd *input_bfd;
+  unsigned int bfd_count;
+  int top_id, top_index;
+  asection *section;
+  asection **input_list, **list;
+  bfd_size_type amt;
+  struct elf32_hppa_link_hash_table *htab = hppa_link_hash_table (info);
+
+  if (htab == NULL)
+    return -1;
+
+  /* Count the number of input BFDs and find the top input section id.  */
+  for (input_bfd = info->input_bfds, bfd_count = 0, top_id = 0;
+       input_bfd != NULL;
+       input_bfd = input_bfd->link_next)
+    {
+      bfd_count += 1;
+      for (section = input_bfd->sections;
+	   section != NULL;
+	   section = section->next)
+	{
+	  if (top_id < section->id)
+	    top_id = section->id;
+	}
+    }
+  htab->bfd_count = bfd_count;
+
+  amt = sizeof (struct map_stub) * (top_id + 1);
+  htab->stub_group = bfd_zmalloc (amt);
+  if (htab->stub_group == NULL)
+    return -1;
+
+  /* We can't use output_bfd->section_count here to find the top output
+     section index as some sections may have been removed, and
+     strip_excluded_output_sections doesn't renumber the indices.  */
+  for (section = output_bfd->sections, top_index = 0;
+       section != NULL;
+       section = section->next)
+    {
+      if (top_index < section->index)
+	top_index = section->index;
+    }
+
+  htab->top_index = top_index;
+  amt = sizeof (asection *) * (top_index + 1);
+  input_list = bfd_malloc (amt);
+  htab->input_list = input_list;
+  if (input_list == NULL)
+    return -1;
+
+  /* For sections we aren't interested in, mark their entries with a
+     value we can check later.  */
+  list = input_list + top_index;
+  do
+    *list = bfd_abs_section_ptr;
+  while (list-- != input_list);
+
+  for (section = output_bfd->sections;
+       section != NULL;
+       section = section->next)
+    {
+      if ((section->flags & SEC_CODE) != 0)
+	input_list[section->index] = NULL;
+    }
+
+  return 1;
+}
+
+/* The linker repeatedly calls this function for each input section,
+   in the order that input sections are linked into output sections.
+   Build lists of input sections to determine groupings between which
+   we may insert linker stubs.  */
+
+void
+elf32_hppa_next_input_section (struct bfd_link_info *info, asection *isec)
+{
+  struct elf32_hppa_link_hash_table *htab = hppa_link_hash_table (info);
+
+  if (htab == NULL)
+    return;
+
+  if (isec->output_section->index <= htab->top_index)
+    {
+      asection **list = htab->input_list + isec->output_section->index;
+      if (*list != bfd_abs_section_ptr)
+	{
+	  /* Steal the link_sec pointer for our list.  */
+#define PREV_SEC(sec) (htab->stub_group[(sec)->id].link_sec)
+	  /* This happens to make the list in reverse order,
+	     which is what we want.  */
+	  PREV_SEC (isec) = *list;
+	  *list = isec;
+	}
+    }
+}
+
+/* See whether we can group stub sections together.  Grouping stub
+   sections may result in fewer stubs.  More importantly, we need to
+   put all .init* and .fini* stubs at the beginning of the .init or
+   .fini output sections respectively, because glibc splits the
+   _init and _fini functions into multiple parts.  Putting a stub in
+   the middle of a function is not a good idea.  */
+
+static void
+group_sections (struct elf32_hppa_link_hash_table *htab,
+		bfd_size_type stub_group_size,
+		bfd_boolean stubs_always_before_branch)
+{
+  asection **list = htab->input_list + htab->top_index;
+  do
+    {
+      asection *tail = *list;
+      if (tail == bfd_abs_section_ptr)
+	continue;
+      while (tail != NULL)
+	{
+	  asection *curr;
+	  asection *prev;
+	  bfd_size_type total;
+	  bfd_boolean big_sec;
+
+	  curr = tail;
+	  total = tail->size;
+	  big_sec = total >= stub_group_size;
+
+	  while ((prev = PREV_SEC (curr)) != NULL
+		 && ((total += curr->output_offset - prev->output_offset)
+		     < stub_group_size))
+	    curr = prev;
+
+	  /* OK, the size from the start of CURR to the end is less
+	     than 240000 bytes and thus can be handled by one stub
+	     section.  (or the tail section is itself larger than
+	     240000 bytes, in which case we may be toast.)
+	     We should really be keeping track of the total size of
+	     stubs added here, as stubs contribute to the final output
+	     section size.  That's a little tricky, and this way will
+	     only break if stubs added total more than 22144 bytes, or
+	     2768 long branch stubs.  It seems unlikely for more than
+	     2768 different functions to be called, especially from
+	     code only 240000 bytes long.  This limit used to be
+	     250000, but c++ code tends to generate lots of little
+	     functions, and sometimes violated the assumption.  */
+	  do
+	    {
+	      prev = PREV_SEC (tail);
+	      /* Set up this stub group.  */
+	      htab->stub_group[tail->id].link_sec = curr;
+	    }
+	  while (tail != curr && (tail = prev) != NULL);
+
+	  /* But wait, there's more!  Input sections up to 240000
+	     bytes before the stub section can be handled by it too.
+	     Don't do this if we have a really large section after the
+	     stubs, as adding more stubs increases the chance that
+	     branches may not reach into the stub section.  */
+	  if (!stubs_always_before_branch && !big_sec)
+	    {
+	      total = 0;
+	      while (prev != NULL
+		     && ((total += tail->output_offset - prev->output_offset)
+			 < stub_group_size))
+		{
+		  tail = prev;
+		  prev = PREV_SEC (tail);
+		  htab->stub_group[tail->id].link_sec = curr;
+		}
+	    }
+	  tail = prev;
+	}
+    }
+  while (list-- != htab->input_list);
+  free (htab->input_list);
+#undef PREV_SEC
+}
+
+/* Read in all local syms for all input bfds, and create hash entries
+   for export stubs if we are building a multi-subspace shared lib.
+   Returns -1 on error, 1 if export stubs created, 0 otherwise.  */
+
+static int
+get_local_syms (bfd *output_bfd, bfd *input_bfd, struct bfd_link_info *info)
+{
+  unsigned int bfd_indx;
+  Elf_Internal_Sym *local_syms, **all_local_syms;
+  int stub_changed = 0;
+  struct elf32_hppa_link_hash_table *htab = hppa_link_hash_table (info);
+
+  if (htab == NULL)
+    return -1;
+
+  /* We want to read in symbol extension records only once.  To do this
+     we need to read in the local symbols in parallel and save them for
+     later use; so hold pointers to the local symbols in an array.  */
+  bfd_size_type amt = sizeof (Elf_Internal_Sym *) * htab->bfd_count;
+  all_local_syms = bfd_zmalloc (amt);
+  htab->all_local_syms = all_local_syms;
+  if (all_local_syms == NULL)
+    return -1;
+
+  /* Walk over all the input BFDs, swapping in local symbols.
+     If we are creating a shared library, create hash entries for the
+     export stubs.  */
+  for (bfd_indx = 0;
+       input_bfd != NULL;
+       input_bfd = input_bfd->link_next, bfd_indx++)
+    {
+      Elf_Internal_Shdr *symtab_hdr;
+
+      /* We'll need the symbol table in a second.  */
+      symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+      if (symtab_hdr->sh_info == 0)
+	continue;
+
+      /* We need an array of the local symbols attached to the input bfd.  */
+      local_syms = (Elf_Internal_Sym *) symtab_hdr->contents;
+      if (local_syms == NULL)
+	{
+	  local_syms = bfd_elf_get_elf_syms (input_bfd, symtab_hdr,
+					     symtab_hdr->sh_info, 0,
+					     NULL, NULL, NULL);
+	  /* Cache them for elf_link_input_bfd.  */
+	  symtab_hdr->contents = (unsigned char *) local_syms;
+	}
+      if (local_syms == NULL)
+	return -1;
+
+      all_local_syms[bfd_indx] = local_syms;
+
+      if (info->shared && htab->multi_subspace)
+	{
+	  struct elf_link_hash_entry **eh_syms;
+	  struct elf_link_hash_entry **eh_symend;
+	  unsigned int symcount;
+
+	  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+		      - symtab_hdr->sh_info);
+	  eh_syms = (struct elf_link_hash_entry **) elf_sym_hashes (input_bfd);
+	  eh_symend = (struct elf_link_hash_entry **) (eh_syms + symcount);
+
+	  /* Look through the global syms for functions;  We need to
+	     build export stubs for all globally visible functions.  */
+	  for (; eh_syms < eh_symend; eh_syms++)
+	    {
+	      struct elf32_hppa_link_hash_entry *hh;
+
+	      hh = hppa_elf_hash_entry (*eh_syms);
+
+	      while (hh->eh.root.type == bfd_link_hash_indirect
+		     || hh->eh.root.type == bfd_link_hash_warning)
+		   hh = hppa_elf_hash_entry (hh->eh.root.u.i.link);
+
+	      /* At this point in the link, undefined syms have been
+		 resolved, so we need to check that the symbol was
+		 defined in this BFD.  */
+	      if ((hh->eh.root.type == bfd_link_hash_defined
+		   || hh->eh.root.type == bfd_link_hash_defweak)
+		  && hh->eh.type == STT_FUNC
+		  && hh->eh.root.u.def.section->output_section != NULL
+		  && (hh->eh.root.u.def.section->output_section->owner
+		      == output_bfd)
+		  && hh->eh.root.u.def.section->owner == input_bfd
+		  && hh->eh.def_regular
+		  && !hh->eh.forced_local
+		  && ELF_ST_VISIBILITY (hh->eh.other) == STV_DEFAULT)
+		{
+		  asection *sec;
+		  const char *stub_name;
+		  struct elf32_hppa_stub_hash_entry *hsh;
+
+		  sec = hh->eh.root.u.def.section;
+		  stub_name = hh_name (hh);
+		  hsh = hppa_stub_hash_lookup (&htab->bstab,
+						      stub_name,
+						      FALSE, FALSE);
+		  if (hsh == NULL)
+		    {
+		      hsh = hppa_add_stub (stub_name, sec, htab);
+		      if (!hsh)
+			return -1;
+
+		      hsh->target_value = hh->eh.root.u.def.value;
+		      hsh->target_section = hh->eh.root.u.def.section;
+		      hsh->stub_type = hppa_stub_export;
+		      hsh->hh = hh;
+		      stub_changed = 1;
+		    }
+		  else
+		    {
+		      (*_bfd_error_handler) (_("%B: duplicate export stub %s"),
+					     input_bfd,
+					     stub_name);
+		    }
+		}
+	    }
+	}
+    }
+
+  return stub_changed;
+}
+
+/* Determine and set the size of the stub section for a final link.
+
+   The basic idea here is to examine all the relocations looking for
+   PC-relative calls to a target that is unreachable with a "bl"
+   instruction.  */
+
+bfd_boolean
+elf32_hppa_size_stubs
+  (bfd *output_bfd, bfd *stub_bfd, struct bfd_link_info *info,
+   bfd_boolean multi_subspace, bfd_signed_vma group_size,
+   asection * (*add_stub_section) (const char *, asection *),
+   void (*layout_sections_again) (void))
+{
+  bfd_size_type stub_group_size;
+  bfd_boolean stubs_always_before_branch;
+  bfd_boolean stub_changed;
+  struct elf32_hppa_link_hash_table *htab = hppa_link_hash_table (info);
+
+  if (htab == NULL)
+    return FALSE;
+
+  /* Stash our params away.  */
+  htab->stub_bfd = stub_bfd;
+  htab->multi_subspace = multi_subspace;
+  htab->add_stub_section = add_stub_section;
+  htab->layout_sections_again = layout_sections_again;
+  stubs_always_before_branch = group_size < 0;
+  if (group_size < 0)
+    stub_group_size = -group_size;
+  else
+    stub_group_size = group_size;
+  if (stub_group_size == 1)
+    {
+      /* Default values.  */
+      if (stubs_always_before_branch)
+	{
+	  stub_group_size = 7680000;
+	  if (htab->has_17bit_branch || htab->multi_subspace)
+	    stub_group_size = 240000;
+	  if (htab->has_12bit_branch)
+	    stub_group_size = 7500;
+	}
+      else
+	{
+	  stub_group_size = 6971392;
+	  if (htab->has_17bit_branch || htab->multi_subspace)
+	    stub_group_size = 217856;
+	  if (htab->has_12bit_branch)
+	    stub_group_size = 6808;
+	}
+    }
+
+  group_sections (htab, stub_group_size, stubs_always_before_branch);
+
+  switch (get_local_syms (output_bfd, info->input_bfds, info))
+    {
+    default:
+      if (htab->all_local_syms)
+	goto error_ret_free_local;
+      return FALSE;
+
+    case 0:
+      stub_changed = FALSE;
+      break;
+
+    case 1:
+      stub_changed = TRUE;
+      break;
+    }
+
+  while (1)
+    {
+      bfd *input_bfd;
+      unsigned int bfd_indx;
+      asection *stub_sec;
+
+      for (input_bfd = info->input_bfds, bfd_indx = 0;
+	   input_bfd != NULL;
+	   input_bfd = input_bfd->link_next, bfd_indx++)
+	{
+	  Elf_Internal_Shdr *symtab_hdr;
+	  asection *section;
+	  Elf_Internal_Sym *local_syms;
+
+	  /* We'll need the symbol table in a second.  */
+	  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+	  if (symtab_hdr->sh_info == 0)
+	    continue;
+
+	  local_syms = htab->all_local_syms[bfd_indx];
+
+	  /* Walk over each section attached to the input bfd.  */
+	  for (section = input_bfd->sections;
+	       section != NULL;
+	       section = section->next)
+	    {
+	      Elf_Internal_Rela *internal_relocs, *irelaend, *irela;
+
+	      /* If there aren't any relocs, then there's nothing more
+		 to do.  */
+	      if ((section->flags & SEC_RELOC) == 0
+		  || section->reloc_count == 0)
+		continue;
+
+	      /* If this section is a link-once section that will be
+		 discarded, then don't create any stubs.  */
+	      if (section->output_section == NULL
+		  || section->output_section->owner != output_bfd)
+		continue;
+
+	      /* Get the relocs.  */
+	      internal_relocs
+		= _bfd_elf_link_read_relocs (input_bfd, section, NULL, NULL,
+					     info->keep_memory);
+	      if (internal_relocs == NULL)
+		goto error_ret_free_local;
+
+	      /* Now examine each relocation.  */
+	      irela = internal_relocs;
+	      irelaend = irela + section->reloc_count;
+	      for (; irela < irelaend; irela++)
+		{
+		  unsigned int r_type, r_indx;
+		  enum elf32_hppa_stub_type stub_type;
+		  struct elf32_hppa_stub_hash_entry *hsh;
+		  asection *sym_sec;
+		  bfd_vma sym_value;
+		  bfd_vma destination;
+		  struct elf32_hppa_link_hash_entry *hh;
+		  char *stub_name;
+		  const asection *id_sec;
+
+		  r_type = ELF32_R_TYPE (irela->r_info);
+		  r_indx = ELF32_R_SYM (irela->r_info);
+
+		  if (r_type >= (unsigned int) R_PARISC_UNIMPLEMENTED)
+		    {
+		      bfd_set_error (bfd_error_bad_value);
+		    error_ret_free_internal:
+		      if (elf_section_data (section)->relocs == NULL)
+			free (internal_relocs);
+		      goto error_ret_free_local;
+		    }
+
+		  /* Only look for stubs on call instructions.  */
+		  if (r_type != (unsigned int) R_PARISC_PCREL12F
+		      && r_type != (unsigned int) R_PARISC_PCREL17F
+		      && r_type != (unsigned int) R_PARISC_PCREL22F)
+		    continue;
+
+		  /* Now determine the call target, its name, value,
+		     section.  */
+		  sym_sec = NULL;
+		  sym_value = 0;
+		  destination = 0;
+		  hh = NULL;
+		  if (r_indx < symtab_hdr->sh_info)
+		    {
+		      /* It's a local symbol.  */
+		      Elf_Internal_Sym *sym;
+		      Elf_Internal_Shdr *hdr;
+		      unsigned int shndx;
+
+		      sym = local_syms + r_indx;
+		      if (ELF_ST_TYPE (sym->st_info) != STT_SECTION)
+			sym_value = sym->st_value;
+		      shndx = sym->st_shndx;
+		      if (shndx < elf_numsections (input_bfd))
+			{
+			  hdr = elf_elfsections (input_bfd)[shndx];
+			  sym_sec = hdr->bfd_section;
+			  destination = (sym_value + irela->r_addend
+					 + sym_sec->output_offset
+					 + sym_sec->output_section->vma);
+			}
+		    }
+		  else
+		    {
+		      /* It's an external symbol.  */
+		      int e_indx;
+
+		      e_indx = r_indx - symtab_hdr->sh_info;
+		      hh = hppa_elf_hash_entry (elf_sym_hashes (input_bfd)[e_indx]);
+
+		      while (hh->eh.root.type == bfd_link_hash_indirect
+			     || hh->eh.root.type == bfd_link_hash_warning)
+			hh = hppa_elf_hash_entry (hh->eh.root.u.i.link);
+
+		      if (hh->eh.root.type == bfd_link_hash_defined
+			  || hh->eh.root.type == bfd_link_hash_defweak)
+			{
+			  sym_sec = hh->eh.root.u.def.section;
+			  sym_value = hh->eh.root.u.def.value;
+			  if (sym_sec->output_section != NULL)
+			    destination = (sym_value + irela->r_addend
+					   + sym_sec->output_offset
+					   + sym_sec->output_section->vma);
+			}
+		      else if (hh->eh.root.type == bfd_link_hash_undefweak)
+			{
+			  if (! info->shared)
+			    continue;
+			}
+		      else if (hh->eh.root.type == bfd_link_hash_undefined)
+			{
+			  if (! (info->unresolved_syms_in_objects == RM_IGNORE
+				 && (ELF_ST_VISIBILITY (hh->eh.other)
+				     == STV_DEFAULT)
+				 && hh->eh.type != STT_PARISC_MILLI))
+			    continue;
+			}
+		      else
+			{
+			  bfd_set_error (bfd_error_bad_value);
+			  goto error_ret_free_internal;
+			}
+		    }
+
+		  /* Determine what (if any) linker stub is needed.  */
+		  stub_type = hppa_type_of_stub (section, irela, hh,
+						 destination, info);
+		  if (stub_type == hppa_stub_none)
+		    continue;
+
+		  /* Support for grouping stub sections.  */
+		  id_sec = htab->stub_group[section->id].link_sec;
+
+		  /* Get the name of this stub.  */
+		  stub_name = hppa_stub_name (id_sec, sym_sec, hh, irela);
+		  if (!stub_name)
+		    goto error_ret_free_internal;
+
+		  hsh = hppa_stub_hash_lookup (&htab->bstab,
+						      stub_name,
+						      FALSE, FALSE);
+		  if (hsh != NULL)
+		    {
+		      /* The proper stub has already been created.  */
+		      free (stub_name);
+		      continue;
+		    }
+
+		  hsh = hppa_add_stub (stub_name, section, htab);
+		  if (hsh == NULL)
+		    {
+		      free (stub_name);
+		      goto error_ret_free_internal;
+		    }
+
+		  hsh->target_value = sym_value;
+		  hsh->target_section = sym_sec;
+		  hsh->stub_type = stub_type;
+		  if (info->shared)
+		    {
+		      if (stub_type == hppa_stub_import)
+			hsh->stub_type = hppa_stub_import_shared;
+		      else if (stub_type == hppa_stub_long_branch)
+			hsh->stub_type = hppa_stub_long_branch_shared;
+		    }
+		  hsh->hh = hh;
+		  stub_changed = TRUE;
+		}
+
+	      /* We're done with the internal relocs, free them.  */
+	      if (elf_section_data (section)->relocs == NULL)
+		free (internal_relocs);
+	    }
+	}
+
+      if (!stub_changed)
+	break;
+
+      /* OK, we've added some stubs.  Find out the new size of the
+	 stub sections.  */
+      for (stub_sec = htab->stub_bfd->sections;
+	   stub_sec != NULL;
+	   stub_sec = stub_sec->next)
+	stub_sec->size = 0;
+
+      bfd_hash_traverse (&htab->bstab, hppa_size_one_stub, htab);
+
+      /* Ask the linker to do its stuff.  */
+      (*htab->layout_sections_again) ();
+      stub_changed = FALSE;
+    }
+
+  free (htab->all_local_syms);
+  return TRUE;
+
+ error_ret_free_local:
+  free (htab->all_local_syms);
+  return FALSE;
+}
+
+/* For a final link, this function is called after we have sized the
+   stubs to provide a value for __gp.  */
+
+bfd_boolean
+elf32_hppa_set_gp (bfd *abfd, struct bfd_link_info *info)
+{
+  struct bfd_link_hash_entry *h;
+  asection *sec = NULL;
+  bfd_vma gp_val = 0;
+  struct elf32_hppa_link_hash_table *htab;
+
+  htab = hppa_link_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  h = bfd_link_hash_lookup (&htab->etab.root, "$global$", FALSE, FALSE, FALSE);
+
+  if (h != NULL
+      && (h->type == bfd_link_hash_defined
+	  || h->type == bfd_link_hash_defweak))
+    {
+      gp_val = h->u.def.value;
+      sec = h->u.def.section;
+    }
+  else
+    {
+      asection *splt = bfd_get_section_by_name (abfd, ".plt");
+      asection *sgot = bfd_get_section_by_name (abfd, ".got");
+
+      /* Choose to point our LTP at, in this order, one of .plt, .got,
+	 or .data, if these sections exist.  In the case of choosing
+	 .plt try to make the LTP ideal for addressing anywhere in the
+	 .plt or .got with a 14 bit signed offset.  Typically, the end
+	 of the .plt is the start of the .got, so choose .plt + 0x2000
+	 if either the .plt or .got is larger than 0x2000.  If both
+	 the .plt and .got are smaller than 0x2000, choose the end of
+	 the .plt section.  */
+      sec = strcmp (bfd_get_target (abfd), "elf32-hppa-netbsd") == 0
+	  ? NULL : splt;
+      if (sec != NULL)
+	{
+	  gp_val = sec->size;
+	  if (gp_val > 0x2000 || (sgot && sgot->size > 0x2000))
+	    {
+	      gp_val = 0x2000;
+	    }
+	}
+      else
+	{
+	  sec = sgot;
+	  if (sec != NULL)
+	    {
+	      if (strcmp (bfd_get_target (abfd), "elf32-hppa-netbsd") != 0)
+		{
+	          /* We know we don't have a .plt.  If .got is large,
+		     offset our LTP.  */
+	          if (sec->size > 0x2000)
+		    gp_val = 0x2000;
+		}
+	    }
+	  else
+	    {
+	      /* No .plt or .got.  Who cares what the LTP is?  */
+	      sec = bfd_get_section_by_name (abfd, ".data");
+	    }
+	}
+
+      if (h != NULL)
+	{
+	  h->type = bfd_link_hash_defined;
+	  h->u.def.value = gp_val;
+	  if (sec != NULL)
+	    h->u.def.section = sec;
+	  else
+	    h->u.def.section = bfd_abs_section_ptr;
+	}
+    }
+
+  if (sec != NULL && sec->output_section != NULL)
+    gp_val += sec->output_section->vma + sec->output_offset;
+
+  elf_gp (abfd) = gp_val;
+  return TRUE;
+}
+
+/* Build all the stubs associated with the current output file.  The
+   stubs are kept in a hash table attached to the main linker hash
+   table.  We also set up the .plt entries for statically linked PIC
+   functions here.  This function is called via hppaelf_finish in the
+   linker.  */
+
+bfd_boolean
+elf32_hppa_build_stubs (struct bfd_link_info *info)
+{
+  asection *stub_sec;
+  struct bfd_hash_table *table;
+  struct elf32_hppa_link_hash_table *htab;
+
+  htab = hppa_link_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  for (stub_sec = htab->stub_bfd->sections;
+       stub_sec != NULL;
+       stub_sec = stub_sec->next)
+    {
+      bfd_size_type size;
+
+      /* Allocate memory to hold the linker stubs.  */
+      size = stub_sec->size;
+      stub_sec->contents = bfd_zalloc (htab->stub_bfd, size);
+      if (stub_sec->contents == NULL && size != 0)
+	return FALSE;
+      stub_sec->size = 0;
+    }
+
+  /* Build the stubs as directed by the stub hash table.  */
+  table = &htab->bstab;
+  bfd_hash_traverse (table, hppa_build_one_stub, info);
+
+  return TRUE;
+}
+
+/* Return the base vma address which should be subtracted from the real
+   address when resolving a dtpoff relocation.  
+   This is PT_TLS segment p_vaddr.  */
+
+static bfd_vma
+dtpoff_base (struct bfd_link_info *info)
+{
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (elf_hash_table (info)->tls_sec == NULL)
+    return 0;
+  return elf_hash_table (info)->tls_sec->vma;
+}
+
+/* Return the relocation value for R_PARISC_TLS_TPOFF*..  */
+
+static bfd_vma
+tpoff (struct bfd_link_info *info, bfd_vma address)
+{
+  struct elf_link_hash_table *htab = elf_hash_table (info);
+
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (htab->tls_sec == NULL)
+    return 0;
+  /* hppa TLS ABI is variant I and static TLS block start just after 
+     tcbhead structure which has 2 pointer fields.  */
+  return (address - htab->tls_sec->vma 
+	  + align_power ((bfd_vma) 8, htab->tls_sec->alignment_power));
+}
+
+/* Perform a final link.  */
+
+static bfd_boolean
+elf32_hppa_final_link (bfd *abfd, struct bfd_link_info *info)
+{
+  /* Invoke the regular ELF linker to do all the work.  */
+  if (!bfd_elf_final_link (abfd, info))
+    return FALSE;
+
+  /* If we're producing a final executable, sort the contents of the
+     unwind section.  */
+  if (info->relocatable)
+    return TRUE;
+
+  return elf_hppa_sort_unwind (abfd);
+}
+
+/* Record the lowest address for the data and text segments.  */
+
+static void
+hppa_record_segment_addr (bfd *abfd, asection *section, void *data)
+{
+  struct elf32_hppa_link_hash_table *htab;
+
+  htab = (struct elf32_hppa_link_hash_table*) data;
+  if (htab == NULL)
+    return;
+
+  if ((section->flags & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD))
+    {
+      bfd_vma value;
+      Elf_Internal_Phdr *p;
+
+      p = _bfd_elf_find_segment_containing_section (abfd, section->output_section);
+      BFD_ASSERT (p != NULL);
+      value = p->p_vaddr;
+
+      if ((section->flags & SEC_READONLY) != 0)
+	{
+	  if (value < htab->text_segment_base)
+	    htab->text_segment_base = value;
+	}
+      else
+	{
+	  if (value < htab->data_segment_base)
+	    htab->data_segment_base = value;
+	}
+    }
+}
+
+/* Perform a relocation as part of a final link.  */
+
+static bfd_reloc_status_type
+final_link_relocate (asection *input_section,
+		     bfd_byte *contents,
+		     const Elf_Internal_Rela *rela,
+		     bfd_vma value,
+		     struct elf32_hppa_link_hash_table *htab,
+		     asection *sym_sec,
+		     struct elf32_hppa_link_hash_entry *hh,
+		     struct bfd_link_info *info)
+{
+  int insn;
+  unsigned int r_type = ELF32_R_TYPE (rela->r_info);
+  unsigned int orig_r_type = r_type;
+  reloc_howto_type *howto = elf_hppa_howto_table + r_type;
+  int r_format = howto->bitsize;
+  enum hppa_reloc_field_selector_type_alt r_field;
+  bfd *input_bfd = input_section->owner;
+  bfd_vma offset = rela->r_offset;
+  bfd_vma max_branch_offset = 0;
+  bfd_byte *hit_data = contents + offset;
+  bfd_signed_vma addend = rela->r_addend;
+  bfd_vma location;
+  struct elf32_hppa_stub_hash_entry *hsh = NULL;
+  int val;  
+
+  if (r_type == R_PARISC_NONE)
+    return bfd_reloc_ok;
+
+  insn = bfd_get_32 (input_bfd, hit_data);
+
+  /* Find out where we are and where we're going.  */
+  location = (offset +
+	      input_section->output_offset +
+	      input_section->output_section->vma);
+
+  /* If we are not building a shared library, convert DLTIND relocs to
+     DPREL relocs.  */
+  if (!info->shared)
+    {
+      switch (r_type)
+	{
+	  case R_PARISC_DLTIND21L:
+	    r_type = R_PARISC_DPREL21L;
+	    break;
+
+	  case R_PARISC_DLTIND14R:
+	    r_type = R_PARISC_DPREL14R;
+	    break;
+
+	  case R_PARISC_DLTIND14F:
+	    r_type = R_PARISC_DPREL14F;
+	    break;
+	}
+    }
+
+  switch (r_type)
+    {
+    case R_PARISC_PCREL12F:
+    case R_PARISC_PCREL17F:
+    case R_PARISC_PCREL22F:
+      /* If this call should go via the plt, find the import stub in
+	 the stub hash.  */
+      if (sym_sec == NULL
+	  || sym_sec->output_section == NULL
+	  || (hh != NULL
+	      && hh->eh.plt.offset != (bfd_vma) -1
+	      && hh->eh.dynindx != -1
+	      && !hh->plabel
+	      && (info->shared
+		  || !hh->eh.def_regular
+		  || hh->eh.root.type == bfd_link_hash_defweak)))
+	{
+	  hsh = hppa_get_stub_entry (input_section, sym_sec,
+					    hh, rela, htab);
+	  if (hsh != NULL)
+	    {
+	      value = (hsh->stub_offset
+		       + hsh->stub_sec->output_offset
+		       + hsh->stub_sec->output_section->vma);
+	      addend = 0;
+	    }
+	  else if (sym_sec == NULL && hh != NULL
+		   && hh->eh.root.type == bfd_link_hash_undefweak)
+	    {
+	      /* It's OK if undefined weak.  Calls to undefined weak
+		 symbols behave as if the "called" function
+		 immediately returns.  We can thus call to a weak
+		 function without first checking whether the function
+		 is defined.  */
+	      value = location;
+	      addend = 8;
+	    }
+	  else
+	    return bfd_reloc_undefined;
+	}
+      /* Fall thru.  */
+
+    case R_PARISC_PCREL21L:
+    case R_PARISC_PCREL17C:
+    case R_PARISC_PCREL17R:
+    case R_PARISC_PCREL14R:
+    case R_PARISC_PCREL14F:
+    case R_PARISC_PCREL32:
+      /* Make it a pc relative offset.  */
+      value -= location;
+      addend -= 8;
+      break;
+
+    case R_PARISC_DPREL21L:
+    case R_PARISC_DPREL14R:
+    case R_PARISC_DPREL14F:
+    case R_PARISC_TLS_GD21L:
+    case R_PARISC_TLS_LDM21L:
+    case R_PARISC_TLS_IE21L:
+      /* Convert instructions that use the linkage table pointer (r19) to
+	 instructions that use the global data pointer (dp).  This is the
+	 most efficient way of using PIC code in an incomplete executable,
+	 but the user must follow the standard runtime conventions for
+	 accessing data for this to work.  */
+      if (orig_r_type == R_PARISC_DLTIND21L
+	  || (!info->shared
+	      && (r_type == R_PARISC_TLS_GD21L
+		  || r_type == R_PARISC_TLS_LDM21L
+		  || r_type == R_PARISC_TLS_IE21L)))
+	{
+	  /* Convert addil instructions if the original reloc was a
+	     DLTIND21L.  GCC sometimes uses a register other than r19 for
+	     the operation, so we must convert any addil instruction
+	     that uses this relocation.  */
+	  if ((insn & 0xfc000000) == ((int) OP_ADDIL << 26))
+	    insn = ADDIL_DP;
+	  else
+	    /* We must have a ldil instruction.  It's too hard to find
+	       and convert the associated add instruction, so issue an
+	       error.  */
+	    (*_bfd_error_handler)
+	      (_("%B(%A+0x%lx): %s fixup for insn 0x%x is not supported in a non-shared link"),
+	       input_bfd,
+	       input_section,
+	       (long) offset,
+	       howto->name,
+	       insn);
+	}
+      else if (orig_r_type == R_PARISC_DLTIND14F)
+	{
+	  /* This must be a format 1 load/store.  Change the base
+	     register to dp.  */
+	  insn = (insn & 0xfc1ffff) | (27 << 21);
+	}
+
+    /* For all the DP relative relocations, we need to examine the symbol's
+       section.  If it has no section or if it's a code section, then
+       "data pointer relative" makes no sense.  In that case we don't
+       adjust the "value", and for 21 bit addil instructions, we change the
+       source addend register from %dp to %r0.  This situation commonly
+       arises for undefined weak symbols and when a variable's "constness"
+       is declared differently from the way the variable is defined.  For
+       instance: "extern int foo" with foo defined as "const int foo".  */
+      if (sym_sec == NULL || (sym_sec->flags & SEC_CODE) != 0)
+	{
+	  if ((insn & ((0x3f << 26) | (0x1f << 21)))
+	      == (((int) OP_ADDIL << 26) | (27 << 21)))
+	    {
+	      insn &= ~ (0x1f << 21);
+	    }
+	  /* Now try to make things easy for the dynamic linker.  */
+
+	  break;
+	}
+      /* Fall thru.  */
+
+    case R_PARISC_DLTIND21L:
+    case R_PARISC_DLTIND14R:
+    case R_PARISC_DLTIND14F:
+    case R_PARISC_TLS_GD14R:
+    case R_PARISC_TLS_LDM14R:
+    case R_PARISC_TLS_IE14R:
+      value -= elf_gp (input_section->output_section->owner);
+      break;
+
+    case R_PARISC_SEGREL32:
+      if ((sym_sec->flags & SEC_CODE) != 0)
+	value -= htab->text_segment_base;
+      else
+	value -= htab->data_segment_base;
+      break;
+
+    default:
+      break;
+    }
+
+  switch (r_type)
+    {
+    case R_PARISC_DIR32:
+    case R_PARISC_DIR14F:
+    case R_PARISC_DIR17F:
+    case R_PARISC_PCREL17C:
+    case R_PARISC_PCREL14F:
+    case R_PARISC_PCREL32:
+    case R_PARISC_DPREL14F:
+    case R_PARISC_PLABEL32:
+    case R_PARISC_DLTIND14F:
+    case R_PARISC_SEGBASE:
+    case R_PARISC_SEGREL32:
+    case R_PARISC_TLS_DTPMOD32:
+    case R_PARISC_TLS_DTPOFF32:
+    case R_PARISC_TLS_TPREL32:
+      r_field = e_fsel;
+      break;
+
+    case R_PARISC_DLTIND21L:
+    case R_PARISC_PCREL21L:
+    case R_PARISC_PLABEL21L:
+      r_field = e_lsel;
+      break;
+
+    case R_PARISC_DIR21L:
+    case R_PARISC_DPREL21L:
+    case R_PARISC_TLS_GD21L:
+    case R_PARISC_TLS_LDM21L:
+    case R_PARISC_TLS_LDO21L:
+    case R_PARISC_TLS_IE21L:
+    case R_PARISC_TLS_LE21L:
+      r_field = e_lrsel;
+      break;
+
+    case R_PARISC_PCREL17R:
+    case R_PARISC_PCREL14R:
+    case R_PARISC_PLABEL14R:
+    case R_PARISC_DLTIND14R:
+      r_field = e_rsel;
+      break;
+
+    case R_PARISC_DIR17R:
+    case R_PARISC_DIR14R:
+    case R_PARISC_DPREL14R:
+    case R_PARISC_TLS_GD14R:
+    case R_PARISC_TLS_LDM14R:
+    case R_PARISC_TLS_LDO14R:
+    case R_PARISC_TLS_IE14R:
+    case R_PARISC_TLS_LE14R:
+      r_field = e_rrsel;
+      break;
+
+    case R_PARISC_PCREL12F:
+    case R_PARISC_PCREL17F:
+    case R_PARISC_PCREL22F:
+      r_field = e_fsel;
+
+      if (r_type == (unsigned int) R_PARISC_PCREL17F)
+	{
+	  max_branch_offset = (1 << (17-1)) << 2;
+	}
+      else if (r_type == (unsigned int) R_PARISC_PCREL12F)
+	{
+	  max_branch_offset = (1 << (12-1)) << 2;
+	}
+      else
+	{
+	  max_branch_offset = (1 << (22-1)) << 2;
+	}
+
+      /* sym_sec is NULL on undefined weak syms or when shared on
+	 undefined syms.  We've already checked for a stub for the
+	 shared undefined case.  */
+      if (sym_sec == NULL)
+	break;
+
+      /* If the branch is out of reach, then redirect the
+	 call to the local stub for this function.  */
+      if (value + addend + max_branch_offset >= 2*max_branch_offset)
+	{
+	  hsh = hppa_get_stub_entry (input_section, sym_sec,
+					    hh, rela, htab);
+	  if (hsh == NULL)
+	    return bfd_reloc_undefined;
+
+	  /* Munge up the value and addend so that we call the stub
+	     rather than the procedure directly.  */
+	  value = (hsh->stub_offset
+		   + hsh->stub_sec->output_offset
+		   + hsh->stub_sec->output_section->vma
+		   - location);
+	  addend = -8;
+	}
+      break;
+
+    /* Something we don't know how to handle.  */
+    default:
+      return bfd_reloc_notsupported;
+    }
+
+  /* Make sure we can reach the stub.  */
+  if (max_branch_offset != 0
+      && value + addend + max_branch_offset >= 2*max_branch_offset)
+    {
+      (*_bfd_error_handler)
+	(_("%B(%A+0x%lx): cannot reach %s, recompile with -ffunction-sections"),
+	 input_bfd,
+	 input_section,
+	 (long) offset,
+	 hsh->bh_root.string);
+      bfd_set_error (bfd_error_bad_value);
+      return bfd_reloc_notsupported;
+    }
+
+  val = hppa_field_adjust (value, addend, r_field);
+
+  switch (r_type)
+    {
+    case R_PARISC_PCREL12F:
+    case R_PARISC_PCREL17C:
+    case R_PARISC_PCREL17F:
+    case R_PARISC_PCREL17R:
+    case R_PARISC_PCREL22F:
+    case R_PARISC_DIR17F:
+    case R_PARISC_DIR17R:
+      /* This is a branch.  Divide the offset by four.
+	 Note that we need to decide whether it's a branch or
+	 otherwise by inspecting the reloc.  Inspecting insn won't
+	 work as insn might be from a .word directive.  */
+      val >>= 2;
+      break;
+
+    default:
+      break;
+    }
+
+  insn = hppa_rebuild_insn (insn, val, r_format);
+
+  /* Update the instruction word.  */
+  bfd_put_32 (input_bfd, (bfd_vma) insn, hit_data);
+  return bfd_reloc_ok;
+}
+
+/* Relocate an HPPA ELF section.  */
+
+static bfd_boolean
+elf32_hppa_relocate_section (bfd *output_bfd,
+			     struct bfd_link_info *info,
+			     bfd *input_bfd,
+			     asection *input_section,
+			     bfd_byte *contents,
+			     Elf_Internal_Rela *relocs,
+			     Elf_Internal_Sym *local_syms,
+			     asection **local_sections)
+{
+  bfd_vma *local_got_offsets;
+  struct elf32_hppa_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *rela;
+  Elf_Internal_Rela *relend;
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+
+  htab = hppa_link_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  local_got_offsets = elf_local_got_offsets (input_bfd);
+
+  rela = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rela < relend; rela++)
+    {
+      unsigned int r_type;
+      reloc_howto_type *howto;
+      unsigned int r_symndx;
+      struct elf32_hppa_link_hash_entry *hh;
+      Elf_Internal_Sym *sym;
+      asection *sym_sec;
+      bfd_vma relocation;
+      bfd_reloc_status_type rstatus;
+      const char *sym_name;
+      bfd_boolean plabel;
+      bfd_boolean warned_undef;
+
+      r_type = ELF32_R_TYPE (rela->r_info);
+      if (r_type >= (unsigned int) R_PARISC_UNIMPLEMENTED)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+      if (r_type == (unsigned int) R_PARISC_GNU_VTENTRY
+	  || r_type == (unsigned int) R_PARISC_GNU_VTINHERIT)
+	continue;
+
+      r_symndx = ELF32_R_SYM (rela->r_info);
+      hh = NULL;
+      sym = NULL;
+      sym_sec = NULL;
+      warned_undef = FALSE;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  /* This is a local symbol, h defaults to NULL.  */
+	  sym = local_syms + r_symndx;
+	  sym_sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sym_sec, rela);
+	}
+      else
+	{
+	  struct elf_link_hash_entry *eh;
+	  bfd_boolean unresolved_reloc;
+	  struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd);
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rela,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   eh, sym_sec, relocation,
+				   unresolved_reloc, warned_undef);
+
+	  if (!info->relocatable
+	      && relocation == 0
+	      && eh->root.type != bfd_link_hash_defined
+	      && eh->root.type != bfd_link_hash_defweak
+	      && eh->root.type != bfd_link_hash_undefweak)
+	    {
+	      if (info->unresolved_syms_in_objects == RM_IGNORE
+		  && ELF_ST_VISIBILITY (eh->other) == STV_DEFAULT
+		  && eh->type == STT_PARISC_MILLI)
+		{
+		  if (! info->callbacks->undefined_symbol
+		      (info, eh_name (eh), input_bfd,
+		       input_section, rela->r_offset, FALSE))
+		    return FALSE;
+		  warned_undef = TRUE;
+		}
+	    }
+	  hh = hppa_elf_hash_entry (eh);
+	}
+
+      if (sym_sec != NULL && elf_discarded_section (sym_sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rela, relend,
+					 elf_hppa_howto_table + r_type,
+					 contents);
+
+      if (info->relocatable)
+	continue;
+
+      /* Do any required modifications to the relocation value, and
+	 determine what types of dynamic info we need to output, if
+	 any.  */
+      plabel = 0;
+      switch (r_type)
+	{
+	case R_PARISC_DLTIND14F:
+	case R_PARISC_DLTIND14R:
+	case R_PARISC_DLTIND21L:
+	  {
+	    bfd_vma off;
+	    bfd_boolean do_got = 0;
+
+	    /* Relocation is to the entry for this symbol in the
+	       global offset table.  */
+	    if (hh != NULL)
+	      {
+		bfd_boolean dyn;
+
+		off = hh->eh.got.offset;
+		dyn = htab->etab.dynamic_sections_created;
+		if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared,
+						       &hh->eh))
+		  {
+		    /* If we aren't going to call finish_dynamic_symbol,
+		       then we need to handle initialisation of the .got
+		       entry and create needed relocs here.  Since the
+		       offset must always be a multiple of 4, we use the
+		       least significant bit to record whether we have
+		       initialised it already.  */
+		    if ((off & 1) != 0)
+		      off &= ~1;
+		    else
+		      {
+			hh->eh.got.offset |= 1;
+			do_got = 1;
+		      }
+		  }
+	      }
+	    else
+	      {
+		/* Local symbol case.  */
+		if (local_got_offsets == NULL)
+		  abort ();
+
+		off = local_got_offsets[r_symndx];
+
+		/* The offset must always be a multiple of 4.  We use
+		   the least significant bit to record whether we have
+		   already generated the necessary reloc.  */
+		if ((off & 1) != 0)
+		  off &= ~1;
+		else
+		  {
+		    local_got_offsets[r_symndx] |= 1;
+		    do_got = 1;
+		  }
+	      }
+
+	    if (do_got)
+	      {
+		if (info->shared)
+		  {
+		    /* Output a dynamic relocation for this GOT entry.
+		       In this case it is relative to the base of the
+		       object because the symbol index is zero.  */
+		    Elf_Internal_Rela outrel;
+		    bfd_byte *loc;
+		    asection *sec = htab->srelgot;
+
+		    outrel.r_offset = (off
+				       + htab->sgot->output_offset
+				       + htab->sgot->output_section->vma);
+		    outrel.r_info = ELF32_R_INFO (0, R_PARISC_DIR32);
+		    outrel.r_addend = relocation;
+		    loc = sec->contents;
+		    loc += sec->reloc_count++ * sizeof (Elf32_External_Rela);
+		    bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+		  }
+		else
+		  bfd_put_32 (output_bfd, relocation,
+			      htab->sgot->contents + off);
+	      }
+
+	    if (off >= (bfd_vma) -2)
+	      abort ();
+
+	    /* Add the base of the GOT to the relocation value.  */
+	    relocation = (off
+			  + htab->sgot->output_offset
+			  + htab->sgot->output_section->vma);
+	  }
+	  break;
+
+	case R_PARISC_SEGREL32:
+	  /* If this is the first SEGREL relocation, then initialize
+	     the segment base values.  */
+	  if (htab->text_segment_base == (bfd_vma) -1)
+	    bfd_map_over_sections (output_bfd, hppa_record_segment_addr, htab);
+	  break;
+
+	case R_PARISC_PLABEL14R:
+	case R_PARISC_PLABEL21L:
+	case R_PARISC_PLABEL32:
+	  if (htab->etab.dynamic_sections_created)
+	    {
+	      bfd_vma off;
+	      bfd_boolean do_plt = 0;
+	      /* If we have a global symbol with a PLT slot, then
+		 redirect this relocation to it.  */
+	      if (hh != NULL)
+		{
+		  off = hh->eh.plt.offset;
+		  if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info->shared,
+							 &hh->eh))
+		    {
+		      /* In a non-shared link, adjust_dynamic_symbols
+			 isn't called for symbols forced local.  We
+			 need to write out the plt entry here.  */
+		      if ((off & 1) != 0)
+			off &= ~1;
+		      else
+			{
+			  hh->eh.plt.offset |= 1;
+			  do_plt = 1;
+			}
+		    }
+		}
+	      else
+		{
+		  bfd_vma *local_plt_offsets;
+
+		  if (local_got_offsets == NULL)
+		    abort ();
+
+		  local_plt_offsets = local_got_offsets + symtab_hdr->sh_info;
+		  off = local_plt_offsets[r_symndx];
+
+		  /* As for the local .got entry case, we use the last
+		     bit to record whether we've already initialised
+		     this local .plt entry.  */
+		  if ((off & 1) != 0)
+		    off &= ~1;
+		  else
+		    {
+		      local_plt_offsets[r_symndx] |= 1;
+		      do_plt = 1;
+		    }
+		}
+
+	      if (do_plt)
+		{
+		  if (info->shared)
+		    {
+		      /* Output a dynamic IPLT relocation for this
+			 PLT entry.  */
+		      Elf_Internal_Rela outrel;
+		      bfd_byte *loc;
+		      asection *s = htab->srelplt;
+
+		      outrel.r_offset = (off
+					 + htab->splt->output_offset
+					 + htab->splt->output_section->vma);
+		      outrel.r_info = ELF32_R_INFO (0, R_PARISC_IPLT);
+		      outrel.r_addend = relocation;
+		      loc = s->contents;
+		      loc += s->reloc_count++ * sizeof (Elf32_External_Rela);
+		      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+		    }
+		  else
+		    {
+		      bfd_put_32 (output_bfd,
+				  relocation,
+				  htab->splt->contents + off);
+		      bfd_put_32 (output_bfd,
+				  elf_gp (htab->splt->output_section->owner),
+				  htab->splt->contents + off + 4);
+		    }
+		}
+
+	      if (off >= (bfd_vma) -2)
+		abort ();
+
+	      /* PLABELs contain function pointers.  Relocation is to
+		 the entry for the function in the .plt.  The magic +2
+		 offset signals to $$dyncall that the function pointer
+		 is in the .plt and thus has a gp pointer too.
+		 Exception:  Undefined PLABELs should have a value of
+		 zero.  */
+	      if (hh == NULL
+		  || (hh->eh.root.type != bfd_link_hash_undefweak
+		      && hh->eh.root.type != bfd_link_hash_undefined))
+		{
+		  relocation = (off
+				+ htab->splt->output_offset
+				+ htab->splt->output_section->vma
+				+ 2);
+		}
+	      plabel = 1;
+	    }
+	  /* Fall through and possibly emit a dynamic relocation.  */
+
+	case R_PARISC_DIR17F:
+	case R_PARISC_DIR17R:
+	case R_PARISC_DIR14F:
+	case R_PARISC_DIR14R:
+	case R_PARISC_DIR21L:
+	case R_PARISC_DPREL14F:
+	case R_PARISC_DPREL14R:
+	case R_PARISC_DPREL21L:
+	case R_PARISC_DIR32:
+	  if ((input_section->flags & SEC_ALLOC) == 0)
+	    break;
+
+	  /* The reloc types handled here and this conditional
+	     expression must match the code in ..check_relocs and
+	     allocate_dynrelocs.  ie. We need exactly the same condition
+	     as in ..check_relocs, with some extra conditions (dynindx
+	     test in this case) to cater for relocs removed by
+	     allocate_dynrelocs.  If you squint, the non-shared test
+	     here does indeed match the one in ..check_relocs, the
+	     difference being that here we test DEF_DYNAMIC as well as
+	     !DEF_REGULAR.  All common syms end up with !DEF_REGULAR,
+	     which is why we can't use just that test here.
+	     Conversely, DEF_DYNAMIC can't be used in check_relocs as
+	     there all files have not been loaded.  */
+	  if ((info->shared
+	       && (hh == NULL
+		   || ELF_ST_VISIBILITY (hh->eh.other) == STV_DEFAULT
+		   || hh->eh.root.type != bfd_link_hash_undefweak)
+	       && (IS_ABSOLUTE_RELOC (r_type)
+		   || !SYMBOL_CALLS_LOCAL (info, &hh->eh)))
+	      || (!info->shared
+		  && hh != NULL
+		  && hh->eh.dynindx != -1
+		  && !hh->eh.non_got_ref
+		  && ((ELIMINATE_COPY_RELOCS
+		       && hh->eh.def_dynamic
+		       && !hh->eh.def_regular)
+		      || hh->eh.root.type == bfd_link_hash_undefweak
+		      || hh->eh.root.type == bfd_link_hash_undefined)))
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_boolean skip;
+	      asection *sreloc;
+	      bfd_byte *loc;
+
+	      /* When generating a shared object, these relocations
+		 are copied into the output file to be resolved at run
+		 time.  */
+
+	      outrel.r_addend = rela->r_addend;
+	      outrel.r_offset =
+		_bfd_elf_section_offset (output_bfd, info, input_section,
+					 rela->r_offset);
+	      skip = (outrel.r_offset == (bfd_vma) -1
+		      || outrel.r_offset == (bfd_vma) -2);
+	      outrel.r_offset += (input_section->output_offset
+				  + input_section->output_section->vma);
+	      	      
+	      if (skip)
+		{
+		  memset (&outrel, 0, sizeof (outrel));
+		}
+	      else if (hh != NULL
+		       && hh->eh.dynindx != -1
+		       && (plabel
+			   || !IS_ABSOLUTE_RELOC (r_type)
+			   || !info->shared
+			   || !info->symbolic
+			   || !hh->eh.def_regular))
+		{
+		  outrel.r_info = ELF32_R_INFO (hh->eh.dynindx, r_type);
+		}
+	      else /* It's a local symbol, or one marked to become local.  */
+		{
+		  int indx = 0;
+
+		  /* Add the absolute offset of the symbol.  */
+		  outrel.r_addend += relocation;
+
+		  /* Global plabels need to be processed by the
+		     dynamic linker so that functions have at most one
+		     fptr.  For this reason, we need to differentiate
+		     between global and local plabels, which we do by
+		     providing the function symbol for a global plabel
+		     reloc, and no symbol for local plabels.  */
+		  if (! plabel
+		      && sym_sec != NULL
+		      && sym_sec->output_section != NULL
+		      && ! bfd_is_abs_section (sym_sec))
+		    {
+		      asection *osec;
+
+		      osec = sym_sec->output_section;
+		      indx = elf_section_data (osec)->dynindx;
+		      if (indx == 0)
+			{
+			  osec = htab->etab.text_index_section;
+			  indx = elf_section_data (osec)->dynindx;
+			}
+		      BFD_ASSERT (indx != 0);
+
+		      /* We are turning this relocation into one
+			 against a section symbol, so subtract out the
+			 output section's address but not the offset
+			 of the input section in the output section.  */
+		      outrel.r_addend -= osec->vma;
+		    }
+
+		  outrel.r_info = ELF32_R_INFO (indx, r_type);
+		}
+	      sreloc = elf_section_data (input_section)->sreloc;
+	      if (sreloc == NULL)
+		abort ();
+
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rela);
+	      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+	    }
+	  break;
+	  
+	case R_PARISC_TLS_LDM21L:
+	case R_PARISC_TLS_LDM14R:
+	  {
+	    bfd_vma off;
+	
+	    off = htab->tls_ldm_got.offset;
+	    if (off & 1)
+	      off &= ~1;
+	    else
+	      {
+		Elf_Internal_Rela outrel;
+		bfd_byte *loc;
+
+		outrel.r_offset = (off 
+				   + htab->sgot->output_section->vma
+				   + htab->sgot->output_offset);
+		outrel.r_addend = 0;
+		outrel.r_info = ELF32_R_INFO (0, R_PARISC_TLS_DTPMOD32);
+		loc = htab->srelgot->contents; 
+		loc += htab->srelgot->reloc_count++ * sizeof (Elf32_External_Rela);
+
+		bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+		htab->tls_ldm_got.offset |= 1;
+	      }
+
+	    /* Add the base of the GOT to the relocation value.  */
+	    relocation = (off
+			  + htab->sgot->output_offset
+			  + htab->sgot->output_section->vma);
+
+	    break;
+	  }
+
+	case R_PARISC_TLS_LDO21L:
+	case R_PARISC_TLS_LDO14R:
+	  relocation -= dtpoff_base (info);
+	  break;
+
+	case R_PARISC_TLS_GD21L:
+	case R_PARISC_TLS_GD14R:
+	case R_PARISC_TLS_IE21L:
+	case R_PARISC_TLS_IE14R:
+	  {
+	    bfd_vma off;
+	    int indx;
+	    char tls_type;
+
+	    indx = 0;
+	    if (hh != NULL)
+	      {
+	        bfd_boolean dyn;
+	        dyn = htab->etab.dynamic_sections_created;
+
+		if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, &hh->eh)
+		    && (!info->shared
+			|| !SYMBOL_REFERENCES_LOCAL (info, &hh->eh)))
+		  {
+		    indx = hh->eh.dynindx;
+		  }
+		off = hh->eh.got.offset;
+		tls_type = hh->tls_type;
+	      }
+	    else
+	      {
+		off = local_got_offsets[r_symndx];
+		tls_type = hppa_elf_local_got_tls_type (input_bfd)[r_symndx];
+	      }
+
+	    if (tls_type == GOT_UNKNOWN)
+	      abort ();
+
+	    if ((off & 1) != 0)
+	      off &= ~1;
+	    else
+	      {
+		bfd_boolean need_relocs = FALSE;
+		Elf_Internal_Rela outrel;
+		bfd_byte *loc = NULL;
+		int cur_off = off;
+
+	        /* The GOT entries have not been initialized yet.  Do it
+	           now, and emit any relocations.  If both an IE GOT and a
+	           GD GOT are necessary, we emit the GD first.  */
+
+		if ((info->shared || indx != 0)
+		    && (hh == NULL
+			|| ELF_ST_VISIBILITY (hh->eh.other) == STV_DEFAULT
+			|| hh->eh.root.type != bfd_link_hash_undefweak))
+		  {
+		    need_relocs = TRUE;
+		    loc = htab->srelgot->contents; 
+		    /* FIXME (CAO): Should this be reloc_count++ ? */
+		    loc += htab->srelgot->reloc_count * sizeof (Elf32_External_Rela);
+		  }
+
+		if (tls_type & GOT_TLS_GD)
+		  {
+		    if (need_relocs)
+		      {
+			outrel.r_offset = (cur_off
+					   + htab->sgot->output_section->vma
+					   + htab->sgot->output_offset);
+			outrel.r_info = ELF32_R_INFO (indx,R_PARISC_TLS_DTPMOD32);
+			outrel.r_addend = 0;
+			bfd_put_32 (output_bfd, 0, htab->sgot->contents + cur_off);
+			bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+			htab->srelgot->reloc_count++;
+			loc += sizeof (Elf32_External_Rela);
+
+			if (indx == 0)
+			  bfd_put_32 (output_bfd, relocation - dtpoff_base (info),
+				      htab->sgot->contents + cur_off + 4);
+			else
+			  {
+			    bfd_put_32 (output_bfd, 0,
+					htab->sgot->contents + cur_off + 4);
+			    outrel.r_info = ELF32_R_INFO (indx, R_PARISC_TLS_DTPOFF32);
+			    outrel.r_offset += 4;
+			    bfd_elf32_swap_reloca_out (output_bfd, &outrel,loc);
+			    htab->srelgot->reloc_count++;
+			    loc += sizeof (Elf32_External_Rela);
+			  }
+		      }
+		    else
+		      {
+		        /* If we are not emitting relocations for a
+		           general dynamic reference, then we must be in a
+		           static link or an executable link with the
+		           symbol binding locally.  Mark it as belonging
+		           to module 1, the executable.  */
+		        bfd_put_32 (output_bfd, 1,
+				    htab->sgot->contents + cur_off);
+		        bfd_put_32 (output_bfd, relocation - dtpoff_base (info),
+				    htab->sgot->contents + cur_off + 4);
+		      }
+
+
+		    cur_off += 8;
+		  }
+
+		if (tls_type & GOT_TLS_IE)
+		  {
+		    if (need_relocs)
+		      {
+			outrel.r_offset = (cur_off
+					   + htab->sgot->output_section->vma
+					   + htab->sgot->output_offset);
+			outrel.r_info = ELF32_R_INFO (indx, R_PARISC_TLS_TPREL32);
+
+			if (indx == 0)
+			  outrel.r_addend = relocation - dtpoff_base (info);
+			else
+			  outrel.r_addend = 0;
+
+			bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+			htab->srelgot->reloc_count++;
+			loc += sizeof (Elf32_External_Rela);
+		      }
+		    else
+		      bfd_put_32 (output_bfd, tpoff (info, relocation),
+				  htab->sgot->contents + cur_off);
+
+		    cur_off += 4;
+		  }
+
+		if (hh != NULL)
+		  hh->eh.got.offset |= 1;
+		else
+		  local_got_offsets[r_symndx] |= 1;
+	      }
+
+	    if ((tls_type & GOT_TLS_GD)
+	  	&& r_type != R_PARISC_TLS_GD21L
+	  	&& r_type != R_PARISC_TLS_GD14R)
+	      off += 2 * GOT_ENTRY_SIZE;
+
+	    /* Add the base of the GOT to the relocation value.  */
+	    relocation = (off
+			  + htab->sgot->output_offset
+			  + htab->sgot->output_section->vma);
+
+	    break;
+	  }
+
+	case R_PARISC_TLS_LE21L:
+	case R_PARISC_TLS_LE14R:
+	  {
+	    relocation = tpoff (info, relocation);
+	    break;
+	  }
+	  break;
+
+	default:
+	  break;
+	}
+
+      rstatus = final_link_relocate (input_section, contents, rela, relocation,
+			       htab, sym_sec, hh, info);
+
+      if (rstatus == bfd_reloc_ok)
+	continue;
+
+      if (hh != NULL)
+	sym_name = hh_name (hh);
+      else
+	{
+	  sym_name = bfd_elf_string_from_elf_section (input_bfd,
+						      symtab_hdr->sh_link,
+						      sym->st_name);
+	  if (sym_name == NULL)
+	    return FALSE;
+	  if (*sym_name == '\0')
+	    sym_name = bfd_section_name (input_bfd, sym_sec);
+	}
+
+      howto = elf_hppa_howto_table + r_type;
+
+      if (rstatus == bfd_reloc_undefined || rstatus == bfd_reloc_notsupported)
+	{
+	  if (rstatus == bfd_reloc_notsupported || !warned_undef)
+	    {
+	      (*_bfd_error_handler)
+		(_("%B(%A+0x%lx): cannot handle %s for %s"),
+		 input_bfd,
+		 input_section,
+		 (long) rela->r_offset,
+		 howto->name,
+		 sym_name);
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	}
+      else
+	{
+	  if (!((*info->callbacks->reloc_overflow)
+		(info, (hh ? &hh->eh.root : NULL), sym_name, howto->name,
+		 (bfd_vma) 0, input_bfd, input_section, rela->r_offset)))
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+elf32_hppa_finish_dynamic_symbol (bfd *output_bfd,
+				  struct bfd_link_info *info,
+				  struct elf_link_hash_entry *eh,
+				  Elf_Internal_Sym *sym)
+{
+  struct elf32_hppa_link_hash_table *htab;
+  Elf_Internal_Rela rela;
+  bfd_byte *loc;
+
+  htab = hppa_link_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (eh->plt.offset != (bfd_vma) -1)
+    {
+      bfd_vma value;
+
+      if (eh->plt.offset & 1)
+	abort ();
+
+      /* This symbol has an entry in the procedure linkage table.  Set
+	 it up.
+
+	 The format of a plt entry is
+	 <funcaddr>
+	 <__gp>
+      */
+      value = 0;
+      if (eh->root.type == bfd_link_hash_defined
+	  || eh->root.type == bfd_link_hash_defweak)
+	{
+	  value = eh->root.u.def.value;
+	  if (eh->root.u.def.section->output_section != NULL)
+	    value += (eh->root.u.def.section->output_offset
+		      + eh->root.u.def.section->output_section->vma);
+	}
+
+      /* Create a dynamic IPLT relocation for this entry.  */
+      rela.r_offset = (eh->plt.offset
+		      + htab->splt->output_offset
+		      + htab->splt->output_section->vma);
+      if (eh->dynindx != -1)
+	{
+	  rela.r_info = ELF32_R_INFO (eh->dynindx, R_PARISC_IPLT);
+	  rela.r_addend = 0;
+	}
+      else
+	{
+	  /* This symbol has been marked to become local, and is
+	     used by a plabel so must be kept in the .plt.  */
+	  rela.r_info = ELF32_R_INFO (0, R_PARISC_IPLT);
+	  rela.r_addend = value;
+	}
+
+      loc = htab->srelplt->contents;
+      loc += htab->srelplt->reloc_count++ * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (htab->splt->output_section->owner, &rela, loc);
+
+      if (!eh->def_regular)
+	{
+	  /* Mark the symbol as undefined, rather than as defined in
+	     the .plt section.  Leave the value alone.  */
+	  sym->st_shndx = SHN_UNDEF;
+	}
+    }
+
+  if (eh->got.offset != (bfd_vma) -1
+      && (hppa_elf_hash_entry (eh)->tls_type & GOT_TLS_GD) == 0
+      && (hppa_elf_hash_entry (eh)->tls_type & GOT_TLS_IE) == 0)
+    {
+      /* This symbol has an entry in the global offset table.  Set it
+	 up.  */
+
+      rela.r_offset = ((eh->got.offset &~ (bfd_vma) 1)
+		      + htab->sgot->output_offset
+		      + htab->sgot->output_section->vma);
+
+      /* If this is a -Bsymbolic link and the symbol is defined
+	 locally or was forced to be local because of a version file,
+	 we just want to emit a RELATIVE reloc.  The entry in the
+	 global offset table will already have been initialized in the
+	 relocate_section function.  */
+      if (info->shared
+	  && (info->symbolic || eh->dynindx == -1)
+	  && eh->def_regular)
+	{
+	  rela.r_info = ELF32_R_INFO (0, R_PARISC_DIR32);
+	  rela.r_addend = (eh->root.u.def.value
+			  + eh->root.u.def.section->output_offset
+			  + eh->root.u.def.section->output_section->vma);
+	}
+      else
+	{
+	  if ((eh->got.offset & 1) != 0)
+	    abort ();
+
+	  bfd_put_32 (output_bfd, 0, htab->sgot->contents + (eh->got.offset & ~1));
+	  rela.r_info = ELF32_R_INFO (eh->dynindx, R_PARISC_DIR32);
+	  rela.r_addend = 0;
+	}
+
+      loc = htab->srelgot->contents;
+      loc += htab->srelgot->reloc_count++ * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+    }
+
+  if (eh->needs_copy)
+    {
+      asection *sec;
+
+      /* This symbol needs a copy reloc.  Set it up.  */
+
+      if (! (eh->dynindx != -1
+	     && (eh->root.type == bfd_link_hash_defined
+		 || eh->root.type == bfd_link_hash_defweak)))
+	abort ();
+
+      sec = htab->srelbss;
+
+      rela.r_offset = (eh->root.u.def.value
+		      + eh->root.u.def.section->output_offset
+		      + eh->root.u.def.section->output_section->vma);
+      rela.r_addend = 0;
+      rela.r_info = ELF32_R_INFO (eh->dynindx, R_PARISC_COPY);
+      loc = sec->contents + sec->reloc_count++ * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+    }
+
+  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
+  if (eh_name (eh)[0] == '_'
+      && (strcmp (eh_name (eh), "_DYNAMIC") == 0
+	  || eh == htab->etab.hgot))
+    {
+      sym->st_shndx = SHN_ABS;
+    }
+
+  return TRUE;
+}
+
+/* Used to decide how to sort relocs in an optimal manner for the
+   dynamic linker, before writing them out.  */
+
+static enum elf_reloc_type_class
+elf32_hppa_reloc_type_class (const Elf_Internal_Rela *rela)
+{
+  /* Handle TLS relocs first; we don't want them to be marked
+     relative by the "if (ELF32_R_SYM (rela->r_info) == STN_UNDEF)"
+     check below.  */
+  switch ((int) ELF32_R_TYPE (rela->r_info))
+    {
+      case R_PARISC_TLS_DTPMOD32:
+      case R_PARISC_TLS_DTPOFF32:
+      case R_PARISC_TLS_TPREL32:
+        return reloc_class_normal;
+    }
+
+  if (ELF32_R_SYM (rela->r_info) == STN_UNDEF)
+    return reloc_class_relative;
+
+  switch ((int) ELF32_R_TYPE (rela->r_info))
+    {
+    case R_PARISC_IPLT:
+      return reloc_class_plt;
+    case R_PARISC_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+elf32_hppa_finish_dynamic_sections (bfd *output_bfd,
+				    struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  struct elf32_hppa_link_hash_table *htab;
+  asection *sdyn;
+  asection * sgot;
+
+  htab = hppa_link_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = htab->etab.dynobj;
+
+  sgot = htab->sgot;
+  /* A broken linker script might have discarded the dynamic sections.
+     Catch this here so that we do not seg-fault later on.  */
+  if (sgot != NULL && bfd_is_abs_section (sgot->output_section))
+    return FALSE;
+
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (htab->etab.dynamic_sections_created)
+    {
+      Elf32_External_Dyn *dyncon, *dynconend;
+
+      if (sdyn == NULL)
+	abort ();
+
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+	  asection *s;
+
+	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    default:
+	      continue;
+
+	    case DT_PLTGOT:
+	      /* Use PLTGOT to set the GOT register.  */
+	      dyn.d_un.d_ptr = elf_gp (output_bfd);
+	      break;
+
+	    case DT_JMPREL:
+	      s = htab->srelplt;
+	      dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+	      break;
+
+	    case DT_PLTRELSZ:
+	      s = htab->srelplt;
+	      dyn.d_un.d_val = s->size;
+	      break;
+
+	    case DT_RELASZ:
+	      /* Don't count procedure linkage table relocs in the
+		 overall reloc count.  */
+	      s = htab->srelplt;
+	      if (s == NULL)
+		continue;
+	      dyn.d_un.d_val -= s->size;
+	      break;
+
+	    case DT_RELA:
+	      /* We may not be using the standard ELF linker script.
+		 If .rela.plt is the first .rela section, we adjust
+		 DT_RELA to not include it.  */
+	      s = htab->srelplt;
+	      if (s == NULL)
+		continue;
+	      if (dyn.d_un.d_ptr != s->output_section->vma + s->output_offset)
+		continue;
+	      dyn.d_un.d_ptr += s->size;
+	      break;
+	    }
+
+	  bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	}
+    }
+
+  if (sgot != NULL && sgot->size != 0)
+    {
+      /* Fill in the first entry in the global offset table.
+	 We use it to point to our dynamic section, if we have one.  */
+      bfd_put_32 (output_bfd,
+		  sdyn ? sdyn->output_section->vma + sdyn->output_offset : 0,
+		  sgot->contents);
+
+      /* The second entry is reserved for use by the dynamic linker.  */
+      memset (sgot->contents + GOT_ENTRY_SIZE, 0, GOT_ENTRY_SIZE);
+
+      /* Set .got entry size.  */
+      elf_section_data (sgot->output_section)
+	->this_hdr.sh_entsize = GOT_ENTRY_SIZE;
+    }
+
+  if (htab->splt != NULL && htab->splt->size != 0)
+    {
+      /* Set plt entry size.  */
+      elf_section_data (htab->splt->output_section)
+	->this_hdr.sh_entsize = PLT_ENTRY_SIZE;
+
+      if (htab->need_plt_stub)
+	{
+	  /* Set up the .plt stub.  */
+	  memcpy (htab->splt->contents
+		  + htab->splt->size - sizeof (plt_stub),
+		  plt_stub, sizeof (plt_stub));
+
+	  if ((htab->splt->output_offset
+	       + htab->splt->output_section->vma
+	       + htab->splt->size)
+	      != (sgot->output_offset
+		  + sgot->output_section->vma))
+	    {
+	      (*_bfd_error_handler)
+		(_(".got section not immediately after .plt section"));
+	      return FALSE;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Called when writing out an object file to decide the type of a
+   symbol.  */
+static int
+elf32_hppa_elf_get_symbol_type (Elf_Internal_Sym *elf_sym, int type)
+{
+  if (ELF_ST_TYPE (elf_sym->st_info) == STT_PARISC_MILLI)
+    return STT_PARISC_MILLI;
+  else
+    return type;
+}
+
+/* Misc BFD support code.  */
+#define bfd_elf32_bfd_is_local_label_name    elf_hppa_is_local_label_name
+#define bfd_elf32_bfd_reloc_type_lookup	     elf_hppa_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup      elf_hppa_reloc_name_lookup
+#define elf_info_to_howto		     elf_hppa_info_to_howto
+#define elf_info_to_howto_rel		     elf_hppa_info_to_howto_rel
+
+/* Stuff for the BFD linker.  */
+#define bfd_elf32_bfd_final_link	     elf32_hppa_final_link
+#define bfd_elf32_bfd_link_hash_table_create elf32_hppa_link_hash_table_create
+#define bfd_elf32_bfd_link_hash_table_free   elf32_hppa_link_hash_table_free
+#define elf_backend_adjust_dynamic_symbol    elf32_hppa_adjust_dynamic_symbol
+#define elf_backend_copy_indirect_symbol     elf32_hppa_copy_indirect_symbol
+#define elf_backend_check_relocs	     elf32_hppa_check_relocs
+#define elf_backend_create_dynamic_sections  elf32_hppa_create_dynamic_sections
+#define elf_backend_fake_sections	     elf_hppa_fake_sections
+#define elf_backend_relocate_section	     elf32_hppa_relocate_section
+#define elf_backend_hide_symbol		     elf32_hppa_hide_symbol
+#define elf_backend_finish_dynamic_symbol    elf32_hppa_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections  elf32_hppa_finish_dynamic_sections
+#define elf_backend_size_dynamic_sections    elf32_hppa_size_dynamic_sections
+#define elf_backend_init_index_section	     _bfd_elf_init_1_index_section
+#define elf_backend_gc_mark_hook	     elf32_hppa_gc_mark_hook
+#define elf_backend_gc_sweep_hook	     elf32_hppa_gc_sweep_hook
+#define elf_backend_grok_prstatus	     elf32_hppa_grok_prstatus
+#define elf_backend_grok_psinfo		     elf32_hppa_grok_psinfo
+#define elf_backend_object_p		     elf32_hppa_object_p
+#define elf_backend_final_write_processing   elf_hppa_final_write_processing
+#define elf_backend_post_process_headers     _bfd_elf_set_osabi
+#define elf_backend_get_symbol_type	     elf32_hppa_elf_get_symbol_type
+#define elf_backend_reloc_type_class	     elf32_hppa_reloc_type_class
+#define elf_backend_action_discarded	     elf_hppa_action_discarded
+
+#define elf_backend_can_gc_sections	     1
+#define elf_backend_can_refcount	     1
+#define elf_backend_plt_alignment	     2
+#define elf_backend_want_got_plt	     0
+#define elf_backend_plt_readonly	     0
+#define elf_backend_want_plt_sym	     0
+#define elf_backend_got_header_size	     8
+#define elf_backend_rela_normal		     1
+
+#define TARGET_BIG_SYM		bfd_elf32_hppa_vec
+#define TARGET_BIG_NAME		"elf32-hppa"
+#define ELF_ARCH		bfd_arch_hppa
+#define ELF_TARGET_ID		HPPA32_ELF_DATA
+#define ELF_MACHINE_CODE	EM_PARISC
+#define ELF_MAXPAGESIZE		0x1000
+#define ELF_OSABI		ELFOSABI_HPUX
+#define elf32_bed		elf32_hppa_hpux_bed
+
+#include "elf32-target.h"
+
+#undef TARGET_BIG_SYM
+#define TARGET_BIG_SYM		bfd_elf32_hppa_linux_vec
+#undef TARGET_BIG_NAME
+#define TARGET_BIG_NAME		"elf32-hppa-linux"
+#undef ELF_OSABI
+#define ELF_OSABI		ELFOSABI_GNU
+#undef elf32_bed
+#define elf32_bed		elf32_hppa_linux_bed
+
+#include "elf32-target.h"
+
+#undef TARGET_BIG_SYM
+#define TARGET_BIG_SYM		bfd_elf32_hppa_nbsd_vec
+#undef TARGET_BIG_NAME
+#define TARGET_BIG_NAME		"elf32-hppa-netbsd"
+#undef ELF_OSABI
+#define ELF_OSABI		ELFOSABI_NETBSD
+#undef elf32_bed
+#define elf32_bed		elf32_hppa_netbsd_bed
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-hppa.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-hppa.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-hppa.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-hppa.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,78 @@
+/* ELF32/HPPA support
+
+   This file contains ELF32/HPPA relocation support as specified
+   in the Stratus FTX/Golf Object File Format (SED-1762) dated
+   February 1994.
+
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
+   2002, 2003, 2005, 2007 Free Software Foundation, Inc.
+
+   Written by:
+
+   Center for Software Science
+   Department of Computer Science
+   University of Utah
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _ELF32_HPPA_H
+#define _ELF32_HPPA_H
+
+#include "elf-bfd.h"
+#include "libhppa.h"
+#include "elf/hppa.h"
+
+int elf32_hppa_setup_section_lists
+  (bfd *, struct bfd_link_info *);
+
+void elf32_hppa_next_input_section
+  (struct bfd_link_info *, asection *);
+
+bfd_boolean elf32_hppa_size_stubs
+  (bfd *, bfd *, struct bfd_link_info *, bfd_boolean, bfd_signed_vma,
+   asection * (*) (const char *, asection *), void (*) (void));
+
+bfd_boolean elf32_hppa_set_gp
+  (bfd *, struct bfd_link_info *);
+
+bfd_boolean elf32_hppa_build_stubs
+  (struct bfd_link_info *);
+
+elf_hppa_reloc_type elf32_hppa_reloc_final_type
+  (bfd *, elf_hppa_reloc_type, int, unsigned int);
+
+extern elf_hppa_reloc_type ** _bfd_elf32_hppa_gen_reloc_type
+  (bfd *, elf_hppa_reloc_type, int, unsigned int, int, asymbol *);
+
+/* Define groups of basic relocations.  FIXME:  These should
+   be the only basic relocations created by GAS.  The rest
+   should be internal to the BFD backend.
+
+   The idea is both SOM and ELF define these basic relocation
+   types so they map into a SOM or ELF specific relocation
+   as appropriate.  This allows GAS to share much more code
+   between the two target object formats.  */
+
+#define R_HPPA_NONE			R_PARISC_NONE
+#define R_HPPA				R_PARISC_DIR32
+#define R_HPPA_GOTOFF			R_PARISC_DPREL21L
+#define R_HPPA_PCREL_CALL		R_PARISC_PCREL21L
+#define R_HPPA_ABS_CALL			R_PARISC_DIR17F
+#define R_HPPA_COMPLEX			R_PARISC_UNIMPLEMENTED
+
+#endif /* _ELF32_HPPA_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-i370.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-i370.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-i370.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-i370.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1407 @@
+/* i370-specific support for 32-bit ELF
+   Copyright 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc.
+   Written by Ian Lance Taylor, Cygnus Support.
+   Hacked by Linas Vepstas for i370 linas@linas.org
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file is based on a preliminary PowerPC ELF ABI.
+   But its been hacked on for the IBM 360/370 architectures.
+   Basically, the 31bit relocation works, and just about everything
+   else is a wild card.  In particular, don't expect shared libs or
+   dynamic loading to work ...  its never been tested.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/i370.h"
+
+static reloc_howto_type *i370_elf_howto_table[ (int)R_I370_max ];
+
+static reloc_howto_type i370_elf_howto_raw[] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_I370_NONE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_I370_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A standard 31 bit relocation.  */
+  HOWTO (R_I370_ADDR31,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 31,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_I370_ADDR31",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x7fffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A standard 32 bit relocation.  */
+  HOWTO (R_I370_ADDR32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_I370_ADDR32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A standard 16 bit relocation.  */
+  HOWTO (R_I370_ADDR16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_I370_ADDR16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 31-bit PC relative.  */
+  HOWTO (R_I370_REL31,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 31,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_I370_REL31",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x7fffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 32-bit PC relative.  */
+  HOWTO (R_I370_REL32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_I370_REL32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A standard 12 bit relocation.  */
+  HOWTO (R_I370_ADDR12,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_I370_ADDR12",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 12-bit PC relative.  */
+  HOWTO (R_I370_REL12,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_I370_REL12",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A standard 8 bit relocation.  */
+  HOWTO (R_I370_ADDR8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_I370_ADDR8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 8-bit PC relative.  */
+  HOWTO (R_I370_REL8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_I370_REL8",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* This is used only by the dynamic linker.  The symbol should exist
+     both in the object being run and in some shared library.  The
+     dynamic linker copies the data addressed by the symbol from the
+     shared library into the object, because the object being
+     run has to have the data at some particular address.  */
+  HOWTO (R_I370_COPY,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	 /* special_function */
+	 "R_I370_COPY",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used only by the dynamic linker.  When the object is run, this
+     longword is set to the load address of the object, plus the
+     addend.  */
+  HOWTO (R_I370_RELATIVE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	 /* special_function */
+	 "R_I370_RELATIVE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+};
+
+/* Initialize the i370_elf_howto_table, so that linear accesses can be done.  */
+
+static void
+i370_elf_howto_init (void)
+{
+  unsigned int i, type;
+
+  for (i = 0; i < sizeof (i370_elf_howto_raw) / sizeof (i370_elf_howto_raw[0]); i++)
+    {
+      type = i370_elf_howto_raw[i].type;
+      BFD_ASSERT (type < sizeof (i370_elf_howto_table) / sizeof (i370_elf_howto_table[0]));
+      i370_elf_howto_table[type] = &i370_elf_howto_raw[i];
+    }
+}
+
+static reloc_howto_type *
+i370_elf_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    bfd_reloc_code_real_type code)
+{
+  enum i370_reloc_type i370_reloc = R_I370_NONE;
+
+  if (!i370_elf_howto_table[ R_I370_ADDR31 ])
+    /* Initialize howto table if needed.  */
+    i370_elf_howto_init ();
+
+  switch ((int) code)
+    {
+    default:
+      return NULL;
+
+    case BFD_RELOC_NONE:	i370_reloc = R_I370_NONE;	break;
+    case BFD_RELOC_32:		i370_reloc = R_I370_ADDR31;	break;
+    case BFD_RELOC_16:		i370_reloc = R_I370_ADDR16;	break;
+    case BFD_RELOC_32_PCREL:	i370_reloc = R_I370_REL31;	break;
+    case BFD_RELOC_CTOR:	i370_reloc = R_I370_ADDR31;	break;
+    case BFD_RELOC_I370_D12:	i370_reloc = R_I370_ADDR12;	break;
+    }
+
+  return i370_elf_howto_table[ (int)i370_reloc ];
+};
+
+static reloc_howto_type *
+i370_elf_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (i370_elf_howto_raw) / sizeof (i370_elf_howto_raw[0]);
+       i++)
+    if (i370_elf_howto_raw[i].name != NULL
+	&& strcasecmp (i370_elf_howto_raw[i].name, r_name) == 0)
+      return &i370_elf_howto_raw[i];
+
+  return NULL;
+}
+
+/* The name of the dynamic interpreter.  This is put in the .interp
+    section.  */
+
+#define ELF_DYNAMIC_INTERPRETER "/lib/ld.so"
+
+/* Set the howto pointer for an i370 ELF reloc.  */
+
+static void
+i370_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+			arelent *cache_ptr,
+			Elf_Internal_Rela *dst)
+{
+  if (!i370_elf_howto_table[ R_I370_ADDR31 ])
+    /* Initialize howto table.  */
+    i370_elf_howto_init ();
+
+  BFD_ASSERT (ELF32_R_TYPE (dst->r_info) < (unsigned int) R_I370_max);
+  cache_ptr->howto = i370_elf_howto_table[ELF32_R_TYPE (dst->r_info)];
+}
+
+/* Hack alert --  the following several routines look generic to me ...
+   why are we bothering with them ?  */
+/* Function to set whether a module needs the -mrelocatable bit set.  */
+
+static bfd_boolean
+i370_elf_set_private_flags (bfd *abfd, flagword flags)
+{
+  BFD_ASSERT (!elf_flags_init (abfd)
+	      || elf_elfheader (abfd)->e_flags == flags);
+
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+
+static bfd_boolean
+i370_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  flagword old_flags;
+  flagword new_flags;
+
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  new_flags = elf_elfheader (ibfd)->e_flags;
+  old_flags = elf_elfheader (obfd)->e_flags;
+  if (!elf_flags_init (obfd))	/* First call, no flags set.  */
+    {
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = new_flags;
+    }
+
+  else if (new_flags == old_flags)	/* Compatible flags are ok.  */
+    ;
+
+  else					/* Incompatible flags.  */
+    {
+      (*_bfd_error_handler)
+	("%B: uses different e_flags (0x%lx) fields than previous modules (0x%lx)",
+	 ibfd, (long) new_flags, (long) old_flags);
+
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Handle an i370 specific section when reading an object file.  This
+   is called when elfcode.h finds a section with an unknown type.  */
+/* XXX hack alert bogus This routine is mostly all junk and almost
+   certainly does the wrong thing.  Its here simply because it does
+   just enough to allow glibc-2.1 ld.so to compile & link.  */
+
+static bfd_boolean
+i370_elf_section_from_shdr (bfd *abfd,
+			    Elf_Internal_Shdr *hdr,
+			    const char *name,
+			    int shindex)
+{
+  asection *newsect;
+  flagword flags;
+
+  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex))
+    return FALSE;
+
+  newsect = hdr->bfd_section;
+  flags = bfd_get_section_flags (abfd, newsect);
+  if (hdr->sh_type == SHT_ORDERED)
+    flags |= SEC_SORT_ENTRIES;
+
+  bfd_set_section_flags (abfd, newsect, flags);
+  return TRUE;
+}
+
+/* Set up any other section flags and such that may be necessary.  */
+/* XXX hack alert bogus This routine is mostly all junk and almost
+   certainly does the wrong thing.  Its here simply because it does
+   just enough to allow glibc-2.1 ld.so to compile & link.  */
+
+static bfd_boolean
+i370_elf_fake_sections (bfd *abfd ATTRIBUTE_UNUSED,
+			Elf_Internal_Shdr *shdr,
+			asection *asect)
+{
+  if ((asect->flags & (SEC_GROUP | SEC_EXCLUDE)) == SEC_EXCLUDE)
+    shdr->sh_flags |= SHF_EXCLUDE;
+
+  if ((asect->flags & SEC_SORT_ENTRIES) != 0)
+    shdr->sh_type = SHT_ORDERED;
+
+  return TRUE;
+}
+
+/* We have to create .dynsbss and .rela.sbss here so that they get mapped
+   to output sections (just like _bfd_elf_create_dynamic_sections has
+   to create .dynbss and .rela.bss).  */
+/* XXX hack alert bogus This routine is mostly all junk and almost
+   certainly does the wrong thing.  Its here simply because it does
+   just enough to allow glibc-2.1 ld.so to compile & link.  */
+
+static bfd_boolean
+i370_elf_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  asection *s;
+  flagword flags;
+
+  if (!_bfd_elf_create_dynamic_sections(abfd, info))
+    return FALSE;
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	   | SEC_LINKER_CREATED);
+
+  s = bfd_make_section_with_flags (abfd, ".dynsbss",
+				   SEC_ALLOC | SEC_LINKER_CREATED);
+  if (s == NULL)
+    return FALSE;
+
+  if (! info->shared)
+    {
+      s = bfd_make_section_with_flags (abfd, ".rela.sbss",
+				       flags | SEC_READONLY);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, 2))
+	return FALSE;
+    }
+
+   /* XXX beats me, seem to need a rela.text ...  */
+   s = bfd_make_section_with_flags (abfd, ".rela.text",
+				    flags | SEC_READONLY);
+   if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, 2))
+    return FALSE;
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+/* XXX hack alert bogus This routine is mostly all junk and almost
+   certainly does the wrong thing.  Its here simply because it does
+   just enough to allow glibc-2.1 ld.so to compile & link.  */
+
+static bfd_boolean
+i370_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+				struct elf_link_hash_entry *h)
+{
+  bfd *dynobj = elf_hash_table (info)->dynobj;
+  asection *s;
+
+#ifdef DEBUG
+  fprintf (stderr, "i370_elf_adjust_dynamic_symbol called for %s\n",
+	   h->root.root.string);
+#endif
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (dynobj != NULL
+	      && (h->needs_plt
+		  || h->u.weakdef != NULL
+		  || (h->def_dynamic
+		      && h->ref_regular
+		      && !h->def_regular)));
+
+  s = bfd_get_section_by_name (dynobj, ".rela.text");
+  BFD_ASSERT (s != NULL);
+  s->size += sizeof (Elf32_External_Rela);
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.
+
+     Of course, if the symbol is sufficiently small, we must instead
+     allocate it in .sbss.  FIXME: It would be better to do this if and
+     only if there were actually SDAREL relocs for that symbol.  */
+
+  if (h->size <= elf_gp_size (dynobj))
+    s = bfd_get_section_by_name (dynobj, ".dynsbss");
+  else
+    s = bfd_get_section_by_name (dynobj, ".dynbss");
+  BFD_ASSERT (s != NULL);
+
+  /* We must generate a R_I370_COPY reloc to tell the dynamic linker to
+     copy the initial value out of the dynamic object and into the
+     runtime process image.  We need to remember the offset into the
+     .rela.bss section we are going to use.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      asection *srel;
+
+      if (h->size <= elf_gp_size (dynobj))
+	srel = bfd_get_section_by_name (dynobj, ".rela.sbss");
+      else
+	srel = bfd_get_section_by_name (dynobj, ".rela.bss");
+      BFD_ASSERT (srel != NULL);
+      srel->size += sizeof (Elf32_External_Rela);
+      h->needs_copy = 1;
+    }
+
+  return _bfd_elf_adjust_dynamic_copy (h, s);
+}
+
+/* Increment the index of a dynamic symbol by a given amount.  Called
+   via elf_link_hash_traverse.  */
+/* XXX hack alert bogus This routine is mostly all junk and almost
+   certainly does the wrong thing.  Its here simply because it does
+   just enough to allow glibc-2.1 ld.so to compile & link.  */
+
+static bfd_boolean
+i370_elf_adjust_dynindx (struct elf_link_hash_entry *h, void * cparg)
+{
+  int *cp = (int *) cparg;
+
+#ifdef DEBUG
+  fprintf (stderr,
+	   "i370_elf_adjust_dynindx called, h->dynindx = %ld, *cp = %d\n",
+	   h->dynindx, *cp);
+#endif
+
+  if (h->dynindx != -1)
+    h->dynindx += *cp;
+
+  return TRUE;
+}
+
+/* Set the sizes of the dynamic sections.  */
+/* XXX hack alert bogus This routine is mostly all junk and almost
+   certainly does the wrong thing.  Its here simply because it does
+   just enough to allow glibc-2.1 ld.so to compile & link.  */
+
+static bfd_boolean
+i370_elf_size_dynamic_sections (bfd *output_bfd,
+				struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *s;
+  bfd_boolean plt;
+  bfd_boolean relocs;
+  bfd_boolean reltext;
+
+#ifdef DEBUG
+  fprintf (stderr, "i370_elf_size_dynamic_sections called\n");
+#endif
+
+  dynobj = elf_hash_table (info)->dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (s != NULL);
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+  else
+    {
+      /* We may have created entries in the .rela.got, .rela.sdata, and
+	 .rela.sdata2 sections.  However, if we are not creating the
+	 dynamic sections, we will not actually use these entries.  Reset
+	 the size of .rela.got, et al, which will cause it to get
+	 stripped from the output file below.  */
+      static char *rela_sections[] = { ".rela.got", ".rela.sdata",
+				       ".rela.sdata2", ".rela.sbss",
+				       NULL };
+      char **p;
+
+      for (p = rela_sections; *p != NULL; p++)
+	{
+	  s = bfd_get_section_by_name (dynobj, *p);
+	  if (s != NULL)
+	    s->size = 0;
+	}
+    }
+
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  plt = FALSE;
+  relocs = FALSE;
+  reltext = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      const char *name;
+
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      /* It's OK to base decisions on the section name, because none
+	 of the dynobj section names depend upon the input files.  */
+      name = bfd_get_section_name (dynobj, s);
+
+      if (strcmp (name, ".plt") == 0)
+	{
+	  /* Remember whether there is a PLT.  */
+	  plt = s->size != 0;
+	}
+      else if (CONST_STRNEQ (name, ".rela"))
+	{
+	  if (s->size != 0)
+	    {
+	      asection *target;
+	      const char *outname;
+
+	      /* Remember whether there are any relocation sections.  */
+	      relocs = TRUE;
+
+	      /* If this relocation section applies to a read only
+		 section, then we probably need a DT_TEXTREL entry.  */
+	      outname = bfd_get_section_name (output_bfd,
+					      s->output_section);
+	      target = bfd_get_section_by_name (output_bfd, outname + 5);
+	      if (target != NULL
+		  && (target->flags & SEC_READONLY) != 0
+		  && (target->flags & SEC_ALLOC) != 0)
+		reltext = TRUE;
+
+	      /* We use the reloc_count field as a counter if we need
+		 to copy relocs into the output file.  */
+	      s->reloc_count = 0;
+	    }
+	}
+      else if (strcmp (name, ".got") != 0
+	       && strcmp (name, ".sdata") != 0
+	       && strcmp (name, ".sdata2") != 0
+	       && strcmp (name, ".dynbss") != 0
+	       && strcmp (name, ".dynsbss") != 0)
+	{
+	  /* It's not one of our sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (s->size == 0)
+	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is mostly to handle .rela.bss and
+	     .rela.plt.  We must create both sections in
+	     create_dynamic_sections, because they must be created
+	     before the linker maps input sections to output
+	     sections.  The linker does that before
+	     adjust_dynamic_symbol is called, and it is that
+	     function which decides whether anything needs to go
+	     into these sections.  */
+	  s->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents.  */
+      s->contents = bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in i370_elf_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (!info->shared)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (plt)
+	{
+	  if (!add_dynamic_entry (DT_PLTGOT, 0)
+	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+	      || !add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+	}
+
+      if (relocs)
+	{
+	  if (!add_dynamic_entry (DT_RELA, 0)
+	      || !add_dynamic_entry (DT_RELASZ, 0)
+	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
+	    return FALSE;
+	}
+
+      if (reltext)
+	{
+	  if (!add_dynamic_entry (DT_TEXTREL, 0))
+	    return FALSE;
+	  info->flags |= DF_TEXTREL;
+	}
+    }
+#undef add_dynamic_entry
+
+  /* If we are generating a shared library, we generate a section
+     symbol for each output section.  These are local symbols, which
+     means that they must come first in the dynamic symbol table.
+     That means we must increment the dynamic symbol index of every
+     other dynamic symbol.
+
+     FIXME: We assume that there will never be relocations to
+     locations in linker-created sections that do not have
+     externally-visible names. Instead, we should work out precisely
+     which sections relocations are targeted at.  */
+  if (info->shared)
+    {
+      int c;
+
+      for (c = 0, s = output_bfd->sections; s != NULL; s = s->next)
+	{
+	  if ((s->flags & SEC_LINKER_CREATED) != 0
+	      || (s->flags & SEC_ALLOC) == 0)
+	    {
+	      elf_section_data (s)->dynindx = -1;
+	      continue;
+	    }
+
+	  /* These symbols will have no names, so we don't need to
+	     fiddle with dynstr_index.  */
+
+	  elf_section_data (s)->dynindx = c + 1;
+
+	  c++;
+	}
+
+      elf_link_hash_traverse (elf_hash_table (info),
+			      i370_elf_adjust_dynindx, & c);
+      elf_hash_table (info)->dynsymcount += c;
+    }
+
+  return TRUE;
+}
+
+/* Look through the relocs for a section during the first phase, and
+   allocate space in the global offset table or procedure linkage
+   table.  */
+/* XXX hack alert bogus This routine is mostly all junk and almost
+   certainly does the wrong thing.  Its here simply because it does
+   just enough to allow glibc-2.1 ld.so to compile & link.  */
+
+static bfd_boolean
+i370_elf_check_relocs (bfd *abfd,
+		       struct bfd_link_info *info,
+		       asection *sec,
+		       const Elf_Internal_Rela *relocs)
+{
+  bfd *dynobj;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  asection *sreloc;
+
+  if (info->relocatable)
+    return TRUE;
+
+#ifdef DEBUG
+  _bfd_error_handler ("i370_elf_check_relocs called for section %A in %B",
+		      sec, abfd);
+#endif
+
+  dynobj = elf_hash_table (info)->dynobj;
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  sreloc = NULL;
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+	h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      if (info->shared)
+	{
+#ifdef DEBUG
+	  fprintf (stderr,
+		   "i370_elf_check_relocs needs to create relocation for %s\n",
+		   (h && h->root.root.string)
+		   ? h->root.root.string : "<unknown>");
+#endif
+	  if (sreloc == NULL)
+	    {
+	      sreloc = _bfd_elf_make_dynamic_reloc_section
+		(sec, dynobj, 2, abfd, /*rela?*/ TRUE);
+
+	      if (sreloc == NULL)
+		return FALSE;
+	    }
+
+	  sreloc->size += sizeof (Elf32_External_Rela);
+
+	  /* FIXME: We should here do what the m68k and i386
+	     backends do: if the reloc is pc-relative, record it
+	     in case it turns out that the reloc is unnecessary
+	     because the symbol is forced local by versioning or
+	     we are linking with -Bdynamic.  Fortunately this
+	     case is not frequent.  */
+	}
+    }
+
+  return TRUE;
+}
+
+/* Finish up the dynamic sections.  */
+/* XXX hack alert bogus This routine is mostly all junk and almost
+   certainly does the wrong thing.  Its here simply because it does
+   just enough to allow glibc-2.1 ld.so to compile & link.  */
+
+static bfd_boolean
+i370_elf_finish_dynamic_sections (bfd *output_bfd,
+				  struct bfd_link_info *info)
+{
+  asection *sdyn;
+  bfd *dynobj = elf_hash_table (info)->dynobj;
+  asection *sgot = bfd_get_section_by_name (dynobj, ".got");
+
+#ifdef DEBUG
+  fprintf (stderr, "i370_elf_finish_dynamic_sections called\n");
+#endif
+
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      asection *splt;
+      Elf32_External_Dyn *dyncon, *dynconend;
+
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      BFD_ASSERT (splt != NULL && sdyn != NULL);
+
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+	  const char *name;
+	  bfd_boolean size;
+
+	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    case DT_PLTGOT:   name = ".plt";	  size = FALSE; break;
+	    case DT_PLTRELSZ: name = ".rela.plt"; size = TRUE;  break;
+	    case DT_JMPREL:   name = ".rela.plt"; size = FALSE; break;
+	    default:	      name = NULL;	  size = FALSE; break;
+	    }
+
+	  if (name != NULL)
+	    {
+	      asection *s;
+
+	      s = bfd_get_section_by_name (output_bfd, name);
+	      if (s == NULL)
+		dyn.d_un.d_val = 0;
+	      else
+		{
+		  if (! size)
+		    dyn.d_un.d_ptr = s->vma;
+		  else
+		    dyn.d_un.d_val = s->size;
+		}
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	    }
+	}
+    }
+
+  if (sgot && sgot->size != 0)
+    {
+      unsigned char *contents = sgot->contents;
+
+      if (sdyn == NULL)
+	bfd_put_32 (output_bfd, (bfd_vma) 0, contents);
+      else
+	bfd_put_32 (output_bfd,
+		    sdyn->output_section->vma + sdyn->output_offset,
+		    contents);
+
+      elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
+    }
+
+  if (info->shared)
+    {
+      asection *sdynsym;
+      asection *s;
+      Elf_Internal_Sym sym;
+      int maxdindx = 0;
+
+      /* Set up the section symbols for the output sections.  */
+
+      sdynsym = bfd_get_section_by_name (dynobj, ".dynsym");
+      BFD_ASSERT (sdynsym != NULL);
+
+      sym.st_size = 0;
+      sym.st_name = 0;
+      sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_SECTION);
+      sym.st_other = 0;
+      sym.st_target_internal = 0;
+
+      for (s = output_bfd->sections; s != NULL; s = s->next)
+	{
+	  int indx, dindx;
+	  Elf32_External_Sym *esym;
+
+	  sym.st_value = s->vma;
+
+	  indx = elf_section_data (s)->this_idx;
+	  dindx = elf_section_data (s)->dynindx;
+	  if (dindx != -1)
+	    {
+	      BFD_ASSERT(indx > 0);
+	      BFD_ASSERT(dindx > 0);
+
+	      if (dindx > maxdindx)
+		maxdindx = dindx;
+
+	      sym.st_shndx = indx;
+
+	      esym = (Elf32_External_Sym *) sdynsym->contents + dindx;
+	      bfd_elf32_swap_symbol_out (output_bfd, &sym, esym, NULL);
+	    }
+	}
+
+      /* Set the sh_info field of the output .dynsym section to the
+	 index of the first global symbol.  */
+      elf_section_data (sdynsym->output_section)->this_hdr.sh_info =
+	maxdindx + 1;
+    }
+
+  return TRUE;
+}
+
+/* The RELOCATE_SECTION function is called by the ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures; if the section
+   actually uses Rel structures, the r_addend field will always be
+   zero.
+
+   This function is responsible for adjust the section contents as
+   necessary, and (if using Rela relocs and generating a
+   relocatable output file) adjusting the reloc addend as
+   necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.  */
+
+static bfd_boolean
+i370_elf_relocate_section (bfd *output_bfd,
+			   struct bfd_link_info *info,
+			   bfd *input_bfd,
+			   asection *input_section,
+			   bfd_byte *contents,
+			   Elf_Internal_Rela *relocs,
+			   Elf_Internal_Sym *local_syms,
+			   asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd);
+  Elf_Internal_Rela *rel = relocs;
+  Elf_Internal_Rela *relend = relocs + input_section->reloc_count;
+  asection *sreloc = NULL;
+  bfd_boolean ret = TRUE;
+
+#ifdef DEBUG
+  _bfd_error_handler ("i370_elf_relocate_section called for %B section %A, %ld relocations%s",
+		      input_bfd, input_section,
+		      (long) input_section->reloc_count,
+		      (info->relocatable) ? " (relocatable)" : "");
+#endif
+
+  if (!i370_elf_howto_table[ R_I370_ADDR31 ])
+    /* Initialize howto table if needed.  */
+    i370_elf_howto_init ();
+
+  for (; rel < relend; rel++)
+    {
+      enum i370_reloc_type r_type    = (enum i370_reloc_type) ELF32_R_TYPE (rel->r_info);
+      bfd_vma offset		     = rel->r_offset;
+      bfd_vma addend		     = rel->r_addend;
+      bfd_reloc_status_type r	     = bfd_reloc_other;
+      Elf_Internal_Sym *sym	     = NULL;
+      asection *sec		     = NULL;
+      struct elf_link_hash_entry * h = NULL;
+      const char *sym_name	     = NULL;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      bfd_vma relocation;
+
+      /* Unknown relocation handling.  */
+      if ((unsigned) r_type >= (unsigned) R_I370_max
+	  || !i370_elf_howto_table[(int)r_type])
+	{
+	  (*_bfd_error_handler) ("%B: unknown relocation type %d",
+				 input_bfd,
+				 (int) r_type);
+
+	  bfd_set_error (bfd_error_bad_value);
+	  ret = FALSE;
+	  continue;
+	}
+
+      howto = i370_elf_howto_table[(int) r_type];
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      relocation = 0;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  sym_name = "<local symbol>";
+
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, & sec, rel);
+	  addend = rel->r_addend;
+	}
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	  sym_name = h->root.root.string;
+	  if (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	    {
+	      sec = h->root.u.def.section;
+	      if (info->shared
+		  && ((! info->symbolic && h->dynindx != -1)
+		      || !h->def_regular)
+		  && (input_section->flags & SEC_ALLOC) != 0
+		  && (r_type == R_I370_ADDR31
+		      || r_type == R_I370_COPY
+		      || r_type == R_I370_ADDR16
+		      || r_type == R_I370_RELATIVE))
+		/* In these cases, we don't need the relocation
+		   value.  We check specially because in some
+		   obscure cases sec->output_section will be NULL.  */
+		;
+	      else
+		relocation = (h->root.u.def.value
+			      + sec->output_section->vma
+			      + sec->output_offset);
+	    }
+	  else if (h->root.type == bfd_link_hash_undefweak)
+	    ;
+	  else if (info->unresolved_syms_in_objects == RM_IGNORE
+		   && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT)
+	    ;
+	  else if (!info->relocatable)
+	    {
+	      if ((*info->callbacks->undefined_symbol)
+		  (info, h->root.root.string, input_bfd,
+		   input_section, rel->r_offset,
+		   (info->unresolved_syms_in_objects == RM_GENERATE_ERROR
+		    || ELF_ST_VISIBILITY (h->other))))
+		{
+		  ret = FALSE;
+		  continue;
+		}
+	    }
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      switch ((int) r_type)
+	{
+	default:
+	  (*_bfd_error_handler)
+	    ("%B: unknown relocation type %d for symbol %s",
+	     input_bfd, (int) r_type, sym_name);
+
+	  bfd_set_error (bfd_error_bad_value);
+	  ret = FALSE;
+	  continue;
+
+	case (int) R_I370_NONE:
+	  continue;
+
+	/* Relocations that may need to be propagated if this is a shared
+	   object.  */
+	case (int) R_I370_REL31:
+	  /* If these relocations are not to a named symbol, they can be
+	     handled right here, no need to bother the dynamic linker.  */
+	  if (h == NULL
+	      || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
+	    break;
+	/* Fall through.  */
+
+	/* Relocations that always need to be propagated if this is a shared
+	   object.  */
+	case (int) R_I370_ADDR31:
+	case (int) R_I370_ADDR16:
+	  if (info->shared
+	      && r_symndx != STN_UNDEF)
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_byte *loc;
+	      int skip;
+
+#ifdef DEBUG
+	      fprintf (stderr,
+		       "i370_elf_relocate_section needs to create relocation for %s\n",
+		       (h && h->root.root.string) ? h->root.root.string : "<unknown>");
+#endif
+
+	      /* When generating a shared object, these relocations
+		 are copied into the output file to be resolved at run
+		 time.  */
+
+	      if (sreloc == NULL)
+		{
+		  sreloc = _bfd_elf_get_dynamic_reloc_section
+		    (input_bfd, input_section, /*rela?*/ TRUE);
+		  if (sreloc == NULL)
+		    return FALSE;
+		}
+
+	      skip = 0;
+
+	      outrel.r_offset =
+		_bfd_elf_section_offset (output_bfd, info, input_section,
+					 rel->r_offset);
+	      if (outrel.r_offset == (bfd_vma) -1
+		  || outrel.r_offset == (bfd_vma) -2)
+		skip = (int) outrel.r_offset;
+	      outrel.r_offset += (input_section->output_section->vma
+				  + input_section->output_offset);
+
+	      if (skip)
+		memset (&outrel, 0, sizeof outrel);
+	      /* h->dynindx may be -1 if this symbol was marked to
+		 become local.  */
+	      else if (h != NULL
+		       && ((! info->symbolic && h->dynindx != -1)
+			   || !h->def_regular))
+		{
+		  BFD_ASSERT (h->dynindx != -1);
+		  outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
+		  outrel.r_addend = rel->r_addend;
+		}
+	      else
+		{
+		  if (r_type == R_I370_ADDR31)
+		    {
+		      outrel.r_info = ELF32_R_INFO (0, R_I370_RELATIVE);
+		      outrel.r_addend = relocation + rel->r_addend;
+		    }
+		  else
+		    {
+		      long indx;
+
+		      if (bfd_is_abs_section (sec))
+			indx = 0;
+		      else if (sec == NULL || sec->owner == NULL)
+			{
+			  bfd_set_error (bfd_error_bad_value);
+			  return FALSE;
+			}
+		      else
+			{
+			  asection *osec;
+
+			  /* We are turning this relocation into one
+			     against a section symbol.  It would be
+			     proper to subtract the symbol's value,
+			     osec->vma, from the emitted reloc addend,
+			     but ld.so expects buggy relocs.  */
+			  osec = sec->output_section;
+			  indx = elf_section_data (osec)->dynindx;
+			  if (indx == 0)
+			    {
+			      struct elf_link_hash_table *htab;
+			      htab = elf_hash_table (info);
+			      osec = htab->text_index_section;
+			      indx = elf_section_data (osec)->dynindx;
+			    }
+			  BFD_ASSERT (indx != 0);
+#ifdef DEBUG
+			  if (indx <= 0)
+			    {
+			      printf ("indx=%ld section=%s flags=%08x name=%s\n",
+				      indx, osec->name, osec->flags,
+				      h->root.root.string);
+			    }
+#endif
+			}
+
+		      outrel.r_info = ELF32_R_INFO (indx, r_type);
+		      outrel.r_addend = relocation + rel->r_addend;
+		    }
+		}
+
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rela);
+	      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+
+	      /* This reloc will be computed at runtime, so there's no
+		 need to do anything now, unless this is a RELATIVE
+		 reloc in an unallocated section.  */
+	      if (skip == -1
+		  || (input_section->flags & SEC_ALLOC) != 0
+		  || ELF32_R_TYPE (outrel.r_info) != R_I370_RELATIVE)
+		continue;
+	    }
+	  break;
+
+	case (int) R_I370_COPY:
+	case (int) R_I370_RELATIVE:
+	  (*_bfd_error_handler)
+	    ("%B: Relocation %s is not yet supported for symbol %s.",
+	     input_bfd,
+	     i370_elf_howto_table[(int) r_type]->name,
+	     sym_name);
+
+	  bfd_set_error (bfd_error_invalid_operation);
+	  ret = FALSE;
+	  continue;
+	}
+
+#ifdef DEBUG
+      fprintf (stderr, "\ttype = %s (%d), name = %s, symbol index = %ld, offset = %ld, addend = %ld\n",
+	       howto->name,
+	       (int)r_type,
+	       sym_name,
+	       r_symndx,
+	       (long) offset,
+	       (long) addend);
+#endif
+
+      r = _bfd_final_link_relocate (howto, input_bfd, input_section, contents,
+				    offset, relocation, addend);
+
+      if (r != bfd_reloc_ok)
+	{
+	  ret = FALSE;
+	  switch (r)
+	    {
+	    default:
+	      break;
+
+	    case bfd_reloc_overflow:
+	      {
+		const char *name;
+
+		if (h != NULL)
+		  name = NULL;
+		else
+		  {
+		    name = bfd_elf_string_from_elf_section (input_bfd,
+							    symtab_hdr->sh_link,
+							    sym->st_name);
+		    if (name == NULL)
+		      break;
+
+		    if (*name == '\0')
+		      name = bfd_section_name (input_bfd, sec);
+		  }
+
+		(*info->callbacks->reloc_overflow) (info,
+						    (h ? &h->root : NULL),
+						    name,
+						    howto->name,
+						    (bfd_vma) 0,
+						    input_bfd,
+						    input_section,
+						    offset);
+	      }
+	      break;
+	    }
+	}
+    }
+
+#ifdef DEBUG
+  fprintf (stderr, "\n");
+#endif
+
+  return ret;
+}
+
+#define TARGET_BIG_SYM		bfd_elf32_i370_vec
+#define TARGET_BIG_NAME		"elf32-i370"
+#define ELF_ARCH		bfd_arch_i370
+#define ELF_MACHINE_CODE	EM_S370
+#ifdef EM_I370_OLD
+#define ELF_MACHINE_ALT1	EM_I370_OLD
+#endif
+#define ELF_MAXPAGESIZE		0x1000
+#define ELF_OSABI		ELFOSABI_GNU
+
+#define elf_info_to_howto	i370_elf_info_to_howto
+
+#define elf_backend_plt_not_loaded 1
+#define elf_backend_rela_normal    1
+
+#define bfd_elf32_bfd_reloc_type_lookup		i370_elf_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup	i370_elf_reloc_name_lookup
+#define bfd_elf32_bfd_set_private_flags		i370_elf_set_private_flags
+#define bfd_elf32_bfd_merge_private_bfd_data	i370_elf_merge_private_bfd_data
+#define elf_backend_relocate_section		i370_elf_relocate_section
+
+/* Dynamic loader support is mostly broken; just enough here to be able to
+   link glibc's ld.so without errors.  */
+#define elf_backend_create_dynamic_sections	i370_elf_create_dynamic_sections
+#define elf_backend_size_dynamic_sections	i370_elf_size_dynamic_sections
+#define elf_backend_init_index_section		_bfd_elf_init_1_index_section
+#define elf_backend_finish_dynamic_sections	i370_elf_finish_dynamic_sections
+#define elf_backend_fake_sections		i370_elf_fake_sections
+#define elf_backend_section_from_shdr		i370_elf_section_from_shdr
+#define elf_backend_adjust_dynamic_symbol	i370_elf_adjust_dynamic_symbol
+#define elf_backend_check_relocs		i370_elf_check_relocs
+#define elf_backend_post_process_headers	_bfd_elf_set_osabi
+
+static int
+i370_noop (void)
+{
+  return 1;
+}
+
+#define elf_backend_finish_dynamic_symbol \
+  (bfd_boolean (*) \
+     (bfd *, struct bfd_link_info *, struct elf_link_hash_entry *, \
+      Elf_Internal_Sym *)) i370_noop
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-i386.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-i386.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-i386.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-i386.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,5233 @@
+/* Intel 80386/80486-specific support for 32-bit ELF
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf-vxworks.h"
+#include "bfd_stdint.h"
+#include "objalloc.h"
+#include "hashtab.h"
+#include "dwarf2.h"
+
+/* 386 uses REL relocations instead of RELA.  */
+#define USE_REL	1
+
+#include "elf/i386.h"
+
+static reloc_howto_type elf_howto_table[]=
+{
+  HOWTO(R_386_NONE, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_NONE",
+	TRUE, 0x00000000, 0x00000000, FALSE),
+  HOWTO(R_386_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_32",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_PC32, 0, 2, 32, TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_PC32",
+	TRUE, 0xffffffff, 0xffffffff, TRUE),
+  HOWTO(R_386_GOT32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_GOT32",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_PLT32, 0, 2, 32, TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_PLT32",
+	TRUE, 0xffffffff, 0xffffffff, TRUE),
+  HOWTO(R_386_COPY, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_COPY",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_GLOB_DAT, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_GLOB_DAT",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_JUMP_SLOT, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_JUMP_SLOT",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_RELATIVE, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_RELATIVE",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_GOTOFF, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_GOTOFF",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_GOTPC, 0, 2, 32, TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_GOTPC",
+	TRUE, 0xffffffff, 0xffffffff, TRUE),
+
+  /* We have a gap in the reloc numbers here.
+     R_386_standard counts the number up to this point, and
+     R_386_ext_offset is the value to subtract from a reloc type of
+     R_386_16 thru R_386_PC8 to form an index into this table.  */
+#define R_386_standard (R_386_GOTPC + 1)
+#define R_386_ext_offset (R_386_TLS_TPOFF - R_386_standard)
+
+  /* These relocs are a GNU extension.  */
+  HOWTO(R_386_TLS_TPOFF, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_TLS_TPOFF",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_IE, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_TLS_IE",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_GOTIE, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_TLS_GOTIE",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_LE, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_TLS_LE",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_GD, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_TLS_GD",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_LDM, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_TLS_LDM",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_16",
+	TRUE, 0xffff, 0xffff, FALSE),
+  HOWTO(R_386_PC16, 0, 1, 16, TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_PC16",
+	TRUE, 0xffff, 0xffff, TRUE),
+  HOWTO(R_386_8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_8",
+	TRUE, 0xff, 0xff, FALSE),
+  HOWTO(R_386_PC8, 0, 0, 8, TRUE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_386_PC8",
+	TRUE, 0xff, 0xff, TRUE),
+
+#define R_386_ext (R_386_PC8 + 1 - R_386_ext_offset)
+#define R_386_tls_offset (R_386_TLS_LDO_32 - R_386_ext)
+  /* These are common with Solaris TLS implementation.  */
+  HOWTO(R_386_TLS_LDO_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_TLS_LDO_32",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_IE_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_TLS_IE_32",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_LE_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_TLS_LE_32",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_DTPMOD32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_TLS_DTPMOD32",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_DTPOFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_TLS_DTPOFF32",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_TPOFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_TLS_TPOFF32",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  EMPTY_HOWTO (38),
+  HOWTO(R_386_TLS_GOTDESC, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_TLS_GOTDESC",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_TLS_DESC_CALL, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+	bfd_elf_generic_reloc, "R_386_TLS_DESC_CALL",
+	FALSE, 0, 0, FALSE),
+  HOWTO(R_386_TLS_DESC, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_TLS_DESC",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(R_386_IRELATIVE, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_386_IRELATIVE",
+	TRUE, 0xffffffff, 0xffffffff, FALSE),
+
+  /* Another gap.  */
+#define R_386_irelative (R_386_IRELATIVE + 1 - R_386_tls_offset)
+#define R_386_vt_offset (R_386_GNU_VTINHERIT - R_386_irelative)
+
+/* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_386_GNU_VTINHERIT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_386_GNU_VTINHERIT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+/* GNU extension to record C++ vtable member usage.  */
+  HOWTO (R_386_GNU_VTENTRY,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_elf_rel_vtable_reloc_fn, /* special_function */
+	 "R_386_GNU_VTENTRY",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE)			/* pcrel_offset */
+
+#define R_386_vt (R_386_GNU_VTENTRY + 1 - R_386_vt_offset)
+
+};
+
+#ifdef DEBUG_GEN_RELOC
+#define TRACE(str) \
+  fprintf (stderr, "i386 bfd reloc lookup %d (%s)\n", code, str)
+#else
+#define TRACE(str)
+#endif
+
+static reloc_howto_type *
+elf_i386_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    bfd_reloc_code_real_type code)
+{
+  switch (code)
+    {
+    case BFD_RELOC_NONE:
+      TRACE ("BFD_RELOC_NONE");
+      return &elf_howto_table[R_386_NONE];
+
+    case BFD_RELOC_32:
+      TRACE ("BFD_RELOC_32");
+      return &elf_howto_table[R_386_32];
+
+    case BFD_RELOC_CTOR:
+      TRACE ("BFD_RELOC_CTOR");
+      return &elf_howto_table[R_386_32];
+
+    case BFD_RELOC_32_PCREL:
+      TRACE ("BFD_RELOC_PC32");
+      return &elf_howto_table[R_386_PC32];
+
+    case BFD_RELOC_386_GOT32:
+      TRACE ("BFD_RELOC_386_GOT32");
+      return &elf_howto_table[R_386_GOT32];
+
+    case BFD_RELOC_386_PLT32:
+      TRACE ("BFD_RELOC_386_PLT32");
+      return &elf_howto_table[R_386_PLT32];
+
+    case BFD_RELOC_386_COPY:
+      TRACE ("BFD_RELOC_386_COPY");
+      return &elf_howto_table[R_386_COPY];
+
+    case BFD_RELOC_386_GLOB_DAT:
+      TRACE ("BFD_RELOC_386_GLOB_DAT");
+      return &elf_howto_table[R_386_GLOB_DAT];
+
+    case BFD_RELOC_386_JUMP_SLOT:
+      TRACE ("BFD_RELOC_386_JUMP_SLOT");
+      return &elf_howto_table[R_386_JUMP_SLOT];
+
+    case BFD_RELOC_386_RELATIVE:
+      TRACE ("BFD_RELOC_386_RELATIVE");
+      return &elf_howto_table[R_386_RELATIVE];
+
+    case BFD_RELOC_386_GOTOFF:
+      TRACE ("BFD_RELOC_386_GOTOFF");
+      return &elf_howto_table[R_386_GOTOFF];
+
+    case BFD_RELOC_386_GOTPC:
+      TRACE ("BFD_RELOC_386_GOTPC");
+      return &elf_howto_table[R_386_GOTPC];
+
+      /* These relocs are a GNU extension.  */
+    case BFD_RELOC_386_TLS_TPOFF:
+      TRACE ("BFD_RELOC_386_TLS_TPOFF");
+      return &elf_howto_table[R_386_TLS_TPOFF - R_386_ext_offset];
+
+    case BFD_RELOC_386_TLS_IE:
+      TRACE ("BFD_RELOC_386_TLS_IE");
+      return &elf_howto_table[R_386_TLS_IE - R_386_ext_offset];
+
+    case BFD_RELOC_386_TLS_GOTIE:
+      TRACE ("BFD_RELOC_386_TLS_GOTIE");
+      return &elf_howto_table[R_386_TLS_GOTIE - R_386_ext_offset];
+
+    case BFD_RELOC_386_TLS_LE:
+      TRACE ("BFD_RELOC_386_TLS_LE");
+      return &elf_howto_table[R_386_TLS_LE - R_386_ext_offset];
+
+    case BFD_RELOC_386_TLS_GD:
+      TRACE ("BFD_RELOC_386_TLS_GD");
+      return &elf_howto_table[R_386_TLS_GD - R_386_ext_offset];
+
+    case BFD_RELOC_386_TLS_LDM:
+      TRACE ("BFD_RELOC_386_TLS_LDM");
+      return &elf_howto_table[R_386_TLS_LDM - R_386_ext_offset];
+
+    case BFD_RELOC_16:
+      TRACE ("BFD_RELOC_16");
+      return &elf_howto_table[R_386_16 - R_386_ext_offset];
+
+    case BFD_RELOC_16_PCREL:
+      TRACE ("BFD_RELOC_16_PCREL");
+      return &elf_howto_table[R_386_PC16 - R_386_ext_offset];
+
+    case BFD_RELOC_8:
+      TRACE ("BFD_RELOC_8");
+      return &elf_howto_table[R_386_8 - R_386_ext_offset];
+
+    case BFD_RELOC_8_PCREL:
+      TRACE ("BFD_RELOC_8_PCREL");
+      return &elf_howto_table[R_386_PC8 - R_386_ext_offset];
+
+    /* Common with Sun TLS implementation.  */
+    case BFD_RELOC_386_TLS_LDO_32:
+      TRACE ("BFD_RELOC_386_TLS_LDO_32");
+      return &elf_howto_table[R_386_TLS_LDO_32 - R_386_tls_offset];
+
+    case BFD_RELOC_386_TLS_IE_32:
+      TRACE ("BFD_RELOC_386_TLS_IE_32");
+      return &elf_howto_table[R_386_TLS_IE_32 - R_386_tls_offset];
+
+    case BFD_RELOC_386_TLS_LE_32:
+      TRACE ("BFD_RELOC_386_TLS_LE_32");
+      return &elf_howto_table[R_386_TLS_LE_32 - R_386_tls_offset];
+
+    case BFD_RELOC_386_TLS_DTPMOD32:
+      TRACE ("BFD_RELOC_386_TLS_DTPMOD32");
+      return &elf_howto_table[R_386_TLS_DTPMOD32 - R_386_tls_offset];
+
+    case BFD_RELOC_386_TLS_DTPOFF32:
+      TRACE ("BFD_RELOC_386_TLS_DTPOFF32");
+      return &elf_howto_table[R_386_TLS_DTPOFF32 - R_386_tls_offset];
+
+    case BFD_RELOC_386_TLS_TPOFF32:
+      TRACE ("BFD_RELOC_386_TLS_TPOFF32");
+      return &elf_howto_table[R_386_TLS_TPOFF32 - R_386_tls_offset];
+
+    case BFD_RELOC_386_TLS_GOTDESC:
+      TRACE ("BFD_RELOC_386_TLS_GOTDESC");
+      return &elf_howto_table[R_386_TLS_GOTDESC - R_386_tls_offset];
+
+    case BFD_RELOC_386_TLS_DESC_CALL:
+      TRACE ("BFD_RELOC_386_TLS_DESC_CALL");
+      return &elf_howto_table[R_386_TLS_DESC_CALL - R_386_tls_offset];
+
+    case BFD_RELOC_386_TLS_DESC:
+      TRACE ("BFD_RELOC_386_TLS_DESC");
+      return &elf_howto_table[R_386_TLS_DESC - R_386_tls_offset];
+
+    case BFD_RELOC_386_IRELATIVE:
+      TRACE ("BFD_RELOC_386_IRELATIVE");
+      return &elf_howto_table[R_386_IRELATIVE - R_386_tls_offset];
+
+    case BFD_RELOC_VTABLE_INHERIT:
+      TRACE ("BFD_RELOC_VTABLE_INHERIT");
+      return &elf_howto_table[R_386_GNU_VTINHERIT - R_386_vt_offset];
+
+    case BFD_RELOC_VTABLE_ENTRY:
+      TRACE ("BFD_RELOC_VTABLE_ENTRY");
+      return &elf_howto_table[R_386_GNU_VTENTRY - R_386_vt_offset];
+
+    default:
+      break;
+    }
+
+  TRACE ("Unknown");
+  return 0;
+}
+
+static reloc_howto_type *
+elf_i386_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (elf_howto_table) / sizeof (elf_howto_table[0]); i++)
+    if (elf_howto_table[i].name != NULL
+	&& strcasecmp (elf_howto_table[i].name, r_name) == 0)
+      return &elf_howto_table[i];
+
+  return NULL;
+}
+
+static reloc_howto_type *
+elf_i386_rtype_to_howto (bfd *abfd, unsigned r_type)
+{
+  unsigned int indx;
+
+  if ((indx = r_type) >= R_386_standard
+      && ((indx = r_type - R_386_ext_offset) - R_386_standard
+	  >= R_386_ext - R_386_standard)
+      && ((indx = r_type - R_386_tls_offset) - R_386_ext
+	  >= R_386_irelative - R_386_ext)
+      && ((indx = r_type - R_386_vt_offset) - R_386_irelative
+	  >= R_386_vt - R_386_irelative))
+    {
+      (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
+			     abfd, (int) r_type);
+      indx = R_386_NONE;
+    }
+  BFD_ASSERT (elf_howto_table [indx].type == r_type);
+  return &elf_howto_table[indx];
+}
+
+static void
+elf_i386_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+			    arelent *cache_ptr,
+			    Elf_Internal_Rela *dst)
+{
+  unsigned int r_type = ELF32_R_TYPE (dst->r_info);
+  cache_ptr->howto = elf_i386_rtype_to_howto (abfd, r_type);
+}
+
+/* Return whether a symbol name implies a local label.  The UnixWare
+   2.1 cc generates temporary symbols that start with .X, so we
+   recognize them here.  FIXME: do other SVR4 compilers also use .X?.
+   If so, we should move the .X recognition into
+   _bfd_elf_is_local_label_name.  */
+
+static bfd_boolean
+elf_i386_is_local_label_name (bfd *abfd, const char *name)
+{
+  if (name[0] == '.' && name[1] == 'X')
+    return TRUE;
+
+  return _bfd_elf_is_local_label_name (abfd, name);
+}
+
+/* Support for core dump NOTE sections.  */
+
+static bfd_boolean
+elf_i386_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  int offset;
+  size_t size;
+
+  if (note->namesz == 8 && strcmp (note->namedata, "FreeBSD") == 0)
+    {
+      int pr_version = bfd_get_32 (abfd, note->descdata);
+
+      if (pr_version != 1)
+ 	return FALSE;
+
+      /* pr_cursig */
+      elf_tdata (abfd)->core_signal = bfd_get_32 (abfd, note->descdata + 20);
+
+      /* pr_pid */
+      elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 24);
+
+      /* pr_reg */
+      offset = 28;
+      size = bfd_get_32 (abfd, note->descdata + 8);
+    }
+  else
+    {
+      switch (note->descsz)
+	{
+	default:
+	  return FALSE;
+
+	case 144:		/* Linux/i386 */
+	  /* pr_cursig */
+	  elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12);
+
+	  /* pr_pid */
+	  elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 24);
+
+	  /* pr_reg */
+	  offset = 72;
+	  size = 68;
+
+	  break;
+	}
+    }
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg",
+					  size, note->descpos + offset);
+}
+
+static bfd_boolean
+elf_i386_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  if (note->namesz == 8 && strcmp (note->namedata, "FreeBSD") == 0)
+    {
+      int pr_version = bfd_get_32 (abfd, note->descdata);
+
+      if (pr_version != 1)
+	return FALSE;
+
+      elf_tdata (abfd)->core_program
+	= _bfd_elfcore_strndup (abfd, note->descdata + 8, 17);
+      elf_tdata (abfd)->core_command
+	= _bfd_elfcore_strndup (abfd, note->descdata + 25, 81);
+    }
+  else
+    {
+      switch (note->descsz)
+	{
+	default:
+	  return FALSE;
+
+	case 124:		/* Linux/i386 elf_prpsinfo.  */
+	  elf_tdata (abfd)->core_pid
+	    = bfd_get_32 (abfd, note->descdata + 12);
+	  elf_tdata (abfd)->core_program
+	    = _bfd_elfcore_strndup (abfd, note->descdata + 28, 16);
+	  elf_tdata (abfd)->core_command
+	    = _bfd_elfcore_strndup (abfd, note->descdata + 44, 80);
+	}
+    }
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+  {
+    char *command = elf_tdata (abfd)->core_command;
+    int n = strlen (command);
+
+    if (0 < n && command[n - 1] == ' ')
+      command[n - 1] = '\0';
+  }
+
+  return TRUE;
+}
+
+/* Functions for the i386 ELF linker.
+
+   In order to gain some understanding of code in this file without
+   knowing all the intricate details of the linker, note the
+   following:
+
+   Functions named elf_i386_* are called by external routines, other
+   functions are only called locally.  elf_i386_* functions appear
+   in this file more or less in the order in which they are called
+   from external routines.  eg. elf_i386_check_relocs is called
+   early in the link process, elf_i386_finish_dynamic_sections is
+   one of the last functions.  */
+
+
+/* The name of the dynamic interpreter.  This is put in the .interp
+   section.  */
+
+#define ELF_DYNAMIC_INTERPRETER "/usr/lib/libc.so.1"
+
+/* If ELIMINATE_COPY_RELOCS is non-zero, the linker will try to avoid
+   copying dynamic variables from a shared lib into an app's dynbss
+   section, and instead use a dynamic relocation to point into the
+   shared lib.  */
+#define ELIMINATE_COPY_RELOCS 1
+
+/* The size in bytes of an entry in the procedure linkage table.  */
+
+#define PLT_ENTRY_SIZE 16
+
+/* The first entry in an absolute procedure linkage table looks like
+   this.  See the SVR4 ABI i386 supplement to see how this works.
+   Will be padded to PLT_ENTRY_SIZE with htab->plt0_pad_byte.  */
+
+static const bfd_byte elf_i386_plt0_entry[12] =
+{
+  0xff, 0x35,	/* pushl contents of address */
+  0, 0, 0, 0,	/* replaced with address of .got + 4.  */
+  0xff, 0x25,	/* jmp indirect */
+  0, 0, 0, 0	/* replaced with address of .got + 8.  */
+};
+
+/* Subsequent entries in an absolute procedure linkage table look like
+   this.  */
+
+static const bfd_byte elf_i386_plt_entry[PLT_ENTRY_SIZE] =
+{
+  0xff, 0x25,	/* jmp indirect */
+  0, 0, 0, 0,	/* replaced with address of this symbol in .got.  */
+  0x68,		/* pushl immediate */
+  0, 0, 0, 0,	/* replaced with offset into relocation table.  */
+  0xe9,		/* jmp relative */
+  0, 0, 0, 0	/* replaced with offset to start of .plt.  */
+};
+
+/* The first entry in a PIC procedure linkage table look like this.
+   Will be padded to PLT_ENTRY_SIZE with htab->plt0_pad_byte.  */
+
+static const bfd_byte elf_i386_pic_plt0_entry[12] =
+{
+  0xff, 0xb3, 4, 0, 0, 0,	/* pushl 4(%ebx) */
+  0xff, 0xa3, 8, 0, 0, 0	/* jmp *8(%ebx) */
+};
+
+/* Subsequent entries in a PIC procedure linkage table look like this.  */
+
+static const bfd_byte elf_i386_pic_plt_entry[PLT_ENTRY_SIZE] =
+{
+  0xff, 0xa3,	/* jmp *offset(%ebx) */
+  0, 0, 0, 0,	/* replaced with offset of this symbol in .got.  */
+  0x68,		/* pushl immediate */
+  0, 0, 0, 0,	/* replaced with offset into relocation table.  */
+  0xe9,		/* jmp relative */
+  0, 0, 0, 0	/* replaced with offset to start of .plt.  */
+};
+
+/* .eh_frame covering the .plt section.  */
+
+static const bfd_byte elf_i386_eh_frame_plt[] =
+{
+#define PLT_CIE_LENGTH		20
+#define PLT_FDE_LENGTH		36
+#define PLT_FDE_START_OFFSET	4 + PLT_CIE_LENGTH + 8
+#define PLT_FDE_LEN_OFFSET	4 + PLT_CIE_LENGTH + 12
+  PLT_CIE_LENGTH, 0, 0, 0,	/* CIE length */
+  0, 0, 0, 0,			/* CIE ID */
+  1,				/* CIE version */
+  'z', 'R', 0,			/* Augmentation string */
+  1,				/* Code alignment factor */
+  0x7c,				/* Data alignment factor */
+  8,				/* Return address column */
+  1,				/* Augmentation size */
+  DW_EH_PE_pcrel | DW_EH_PE_sdata4, /* FDE encoding */
+  DW_CFA_def_cfa, 4, 4,		/* DW_CFA_def_cfa: r4 (esp) ofs 4 */
+  DW_CFA_offset + 8, 1,		/* DW_CFA_offset: r8 (eip) at cfa-4 */
+  DW_CFA_nop, DW_CFA_nop,
+
+  PLT_FDE_LENGTH, 0, 0, 0,	/* FDE length */
+  PLT_CIE_LENGTH + 8, 0, 0, 0,	/* CIE pointer */
+  0, 0, 0, 0,			/* R_386_PC32 .plt goes here */
+  0, 0, 0, 0,			/* .plt size goes here */
+  0,				/* Augmentation size */
+  DW_CFA_def_cfa_offset, 8,	/* DW_CFA_def_cfa_offset: 8 */
+  DW_CFA_advance_loc + 6,	/* DW_CFA_advance_loc: 6 to __PLT__+6 */
+  DW_CFA_def_cfa_offset, 12,	/* DW_CFA_def_cfa_offset: 12 */
+  DW_CFA_advance_loc + 10,	/* DW_CFA_advance_loc: 10 to __PLT__+16 */
+  DW_CFA_def_cfa_expression,	/* DW_CFA_def_cfa_expression */
+  11,				/* Block length */
+  DW_OP_breg4, 4,		/* DW_OP_breg4 (esp): 4 */
+  DW_OP_breg8, 0,		/* DW_OP_breg8 (eip): 0 */
+  DW_OP_lit15, DW_OP_and, DW_OP_lit11, DW_OP_ge,
+  DW_OP_lit2, DW_OP_shl, DW_OP_plus,
+  DW_CFA_nop, DW_CFA_nop, DW_CFA_nop, DW_CFA_nop
+};
+
+struct elf_i386_plt_layout
+{
+  /* The first entry in an absolute procedure linkage table looks like this.  */
+  const bfd_byte *plt0_entry;
+  unsigned int plt0_entry_size;
+
+  /* Offsets into plt0_entry that are to be replaced with GOT[1] and GOT[2].  */
+  unsigned int plt0_got1_offset;
+  unsigned int plt0_got2_offset;
+
+  /* Later entries in an absolute procedure linkage table look like this.  */
+  const bfd_byte *plt_entry;
+  unsigned int plt_entry_size;
+
+  /* Offsets into plt_entry that are to be replaced with...  */
+  unsigned int plt_got_offset;    /* ... address of this symbol in .got. */
+  unsigned int plt_reloc_offset;  /* ... offset into relocation table. */
+  unsigned int plt_plt_offset;    /* ... offset to start of .plt. */
+
+  /* Offset into plt_entry where the initial value of the GOT entry points.  */
+  unsigned int plt_lazy_offset;
+
+  /* The first entry in a PIC procedure linkage table looks like this.  */
+  const bfd_byte *pic_plt0_entry;
+
+  /* Subsequent entries in a PIC procedure linkage table look like this.  */
+  const bfd_byte *pic_plt_entry;
+
+  /* .eh_frame covering the .plt section.  */
+  const bfd_byte *eh_frame_plt;
+  unsigned int eh_frame_plt_size;
+};
+
+#define GET_PLT_ENTRY_SIZE(abfd) \
+  get_elf_i386_backend_data (abfd)->plt->plt_entry_size
+
+/* These are the standard parameters.  */
+static const struct elf_i386_plt_layout elf_i386_plt =
+  {
+    elf_i386_plt0_entry,                /* plt0_entry */
+    sizeof (elf_i386_plt0_entry),       /* plt0_entry_size */
+    2,                                  /* plt0_got1_offset */
+    8,                                  /* plt0_got2_offset */
+    elf_i386_plt_entry,                 /* plt_entry */
+    PLT_ENTRY_SIZE,                     /* plt_entry_size */
+    2,                                  /* plt_got_offset */
+    7,                                  /* plt_reloc_offset */
+    12,                                 /* plt_plt_offset */
+    6,                                  /* plt_lazy_offset */
+    elf_i386_pic_plt0_entry,            /* pic_plt0_entry */
+    elf_i386_pic_plt_entry,             /* pic_plt_entry */
+    elf_i386_eh_frame_plt,              /* eh_frame_plt */
+    sizeof (elf_i386_eh_frame_plt),     /* eh_frame_plt_size */
+  };
+
+
+/* On VxWorks, the .rel.plt.unloaded section has absolute relocations
+   for the PLTResolve stub and then for each PLT entry.  */
+#define PLTRESOLVE_RELOCS_SHLIB 0
+#define PLTRESOLVE_RELOCS 2
+#define PLT_NON_JUMP_SLOT_RELOCS 2
+
+/* Architecture-specific backend data for i386.  */
+
+struct elf_i386_backend_data
+{
+  /* Parameters describing PLT generation.  */
+  const struct elf_i386_plt_layout *plt;
+
+  /* Value used to fill the unused bytes of the first PLT entry.  */
+  bfd_byte plt0_pad_byte;
+
+  /* True if the target system is VxWorks.  */
+  int is_vxworks;
+};
+
+#define get_elf_i386_backend_data(abfd) \
+  ((const struct elf_i386_backend_data *) \
+   get_elf_backend_data (abfd)->arch_data)
+
+/* These are the standard parameters.  */
+static const struct elf_i386_backend_data elf_i386_arch_bed =
+  {
+    &elf_i386_plt,                      /* plt */
+    0,                                  /* plt0_pad_byte */
+    0,                                  /* is_vxworks */
+  };
+
+#define	elf_backend_arch_data	&elf_i386_arch_bed
+
+/* i386 ELF linker hash entry.  */
+
+struct elf_i386_link_hash_entry
+{
+  struct elf_link_hash_entry elf;
+
+  /* Track dynamic relocs copied for this symbol.  */
+  struct elf_dyn_relocs *dyn_relocs;
+
+#define GOT_UNKNOWN	0
+#define GOT_NORMAL	1
+#define GOT_TLS_GD	2
+#define GOT_TLS_IE	4
+#define GOT_TLS_IE_POS	5
+#define GOT_TLS_IE_NEG	6
+#define GOT_TLS_IE_BOTH 7
+#define GOT_TLS_GDESC	8
+#define GOT_TLS_GD_BOTH_P(type)						\
+  ((type) == (GOT_TLS_GD | GOT_TLS_GDESC))
+#define GOT_TLS_GD_P(type)						\
+  ((type) == GOT_TLS_GD || GOT_TLS_GD_BOTH_P (type))
+#define GOT_TLS_GDESC_P(type)						\
+  ((type) == GOT_TLS_GDESC || GOT_TLS_GD_BOTH_P (type))
+#define GOT_TLS_GD_ANY_P(type)						\
+  (GOT_TLS_GD_P (type) || GOT_TLS_GDESC_P (type))
+  unsigned char tls_type;
+
+  /* Offset of the GOTPLT entry reserved for the TLS descriptor,
+     starting at the end of the jump table.  */
+  bfd_vma tlsdesc_got;
+};
+
+#define elf_i386_hash_entry(ent) ((struct elf_i386_link_hash_entry *)(ent))
+
+struct elf_i386_obj_tdata
+{
+  struct elf_obj_tdata root;
+
+  /* tls_type for each local got entry.  */
+  char *local_got_tls_type;
+
+  /* GOTPLT entries for TLS descriptors.  */
+  bfd_vma *local_tlsdesc_gotent;
+};
+
+#define elf_i386_tdata(abfd) \
+  ((struct elf_i386_obj_tdata *) (abfd)->tdata.any)
+
+#define elf_i386_local_got_tls_type(abfd) \
+  (elf_i386_tdata (abfd)->local_got_tls_type)
+
+#define elf_i386_local_tlsdesc_gotent(abfd) \
+  (elf_i386_tdata (abfd)->local_tlsdesc_gotent)
+
+#define is_i386_elf(bfd)				\
+  (bfd_get_flavour (bfd) == bfd_target_elf_flavour	\
+   && elf_tdata (bfd) != NULL				\
+   && elf_object_id (bfd) == I386_ELF_DATA)
+
+static bfd_boolean
+elf_i386_mkobject (bfd *abfd)
+{
+  return bfd_elf_allocate_object (abfd, sizeof (struct elf_i386_obj_tdata),
+				  I386_ELF_DATA);
+}
+
+/* i386 ELF linker hash table.  */
+
+struct elf_i386_link_hash_table
+{
+  struct elf_link_hash_table elf;
+
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *sdynbss;
+  asection *srelbss;
+  asection *plt_eh_frame;
+
+  union
+  {
+    bfd_signed_vma refcount;
+    bfd_vma offset;
+  } tls_ldm_got;
+
+  /* The amount of space used by the reserved portion of the sgotplt
+     section, plus whatever space is used by the jump slots.  */
+  bfd_vma sgotplt_jump_table_size;
+
+  /* Small local sym cache.  */
+  struct sym_cache sym_cache;
+
+  /* _TLS_MODULE_BASE_ symbol.  */
+  struct bfd_link_hash_entry *tls_module_base;
+
+  /* Used by local STT_GNU_IFUNC symbols.  */
+  htab_t loc_hash_table;
+  void * loc_hash_memory;
+
+  /* The (unloaded but important) .rel.plt.unloaded section on VxWorks.  */
+  asection *srelplt2;
+
+  /* The index of the next unused R_386_TLS_DESC slot in .rel.plt.  */
+  bfd_vma next_tls_desc_index;
+};
+
+/* Get the i386 ELF linker hash table from a link_info structure.  */
+
+#define elf_i386_hash_table(p) \
+  (elf_hash_table_id  ((struct elf_link_hash_table *) ((p)->hash)) \
+  == I386_ELF_DATA ? ((struct elf_i386_link_hash_table *) ((p)->hash)) : NULL)
+
+#define elf_i386_compute_jump_table_size(htab) \
+  ((htab)->next_tls_desc_index * 4)
+
+/* Create an entry in an i386 ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+elf_i386_link_hash_newfunc (struct bfd_hash_entry *entry,
+			    struct bfd_hash_table *table,
+			    const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = (struct bfd_hash_entry *)
+          bfd_hash_allocate (table, sizeof (struct elf_i386_link_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = _bfd_elf_link_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct elf_i386_link_hash_entry *eh;
+
+      eh = (struct elf_i386_link_hash_entry *) entry;
+      eh->dyn_relocs = NULL;
+      eh->tls_type = GOT_UNKNOWN;
+      eh->tlsdesc_got = (bfd_vma) -1;
+    }
+
+  return entry;
+}
+
+/* Compute a hash of a local hash entry.  We use elf_link_hash_entry
+  for local symbol so that we can handle local STT_GNU_IFUNC symbols
+  as global symbol.  We reuse indx and dynstr_index for local symbol
+  hash since they aren't used by global symbols in this backend.  */
+
+static hashval_t
+elf_i386_local_htab_hash (const void *ptr)
+{
+  struct elf_link_hash_entry *h
+    = (struct elf_link_hash_entry *) ptr;
+  return ELF_LOCAL_SYMBOL_HASH (h->indx, h->dynstr_index);
+}
+
+/* Compare local hash entries.  */
+
+static int
+elf_i386_local_htab_eq (const void *ptr1, const void *ptr2)
+{
+  struct elf_link_hash_entry *h1
+     = (struct elf_link_hash_entry *) ptr1;
+  struct elf_link_hash_entry *h2
+    = (struct elf_link_hash_entry *) ptr2;
+
+  return h1->indx == h2->indx && h1->dynstr_index == h2->dynstr_index;
+}
+
+/* Find and/or create a hash entry for local symbol.  */
+
+static struct elf_link_hash_entry *
+elf_i386_get_local_sym_hash (struct elf_i386_link_hash_table *htab,
+			     bfd *abfd, const Elf_Internal_Rela *rel,
+			     bfd_boolean create)
+{
+  struct elf_i386_link_hash_entry e, *ret;
+  asection *sec = abfd->sections;
+  hashval_t h = ELF_LOCAL_SYMBOL_HASH (sec->id,
+				       ELF32_R_SYM (rel->r_info));
+  void **slot;
+
+  e.elf.indx = sec->id;
+  e.elf.dynstr_index = ELF32_R_SYM (rel->r_info);
+  slot = htab_find_slot_with_hash (htab->loc_hash_table, &e, h,
+				   create ? INSERT : NO_INSERT);
+
+  if (!slot)
+    return NULL;
+
+  if (*slot)
+    {
+      ret = (struct elf_i386_link_hash_entry *) *slot;
+      return &ret->elf;
+    }
+
+  ret = (struct elf_i386_link_hash_entry *)
+	objalloc_alloc ((struct objalloc *) htab->loc_hash_memory,
+			sizeof (struct elf_i386_link_hash_entry));
+  if (ret)
+    {
+      memset (ret, 0, sizeof (*ret));
+      ret->elf.indx = sec->id;
+      ret->elf.dynstr_index = ELF32_R_SYM (rel->r_info);
+      ret->elf.dynindx = -1;
+      *slot = ret;
+    }
+  return &ret->elf;
+}
+
+/* Create an i386 ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+elf_i386_link_hash_table_create (bfd *abfd)
+{
+  struct elf_i386_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct elf_i386_link_hash_table);
+
+  ret = (struct elf_i386_link_hash_table *) bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd,
+				      elf_i386_link_hash_newfunc,
+				      sizeof (struct elf_i386_link_hash_entry),
+				      I386_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  ret->sdynbss = NULL;
+  ret->srelbss = NULL;
+  ret->plt_eh_frame = NULL;
+  ret->tls_ldm_got.refcount = 0;
+  ret->next_tls_desc_index = 0;
+  ret->sgotplt_jump_table_size = 0;
+  ret->sym_cache.abfd = NULL;
+  ret->srelplt2 = NULL;
+  ret->tls_module_base = NULL;
+
+  ret->loc_hash_table = htab_try_create (1024,
+					 elf_i386_local_htab_hash,
+					 elf_i386_local_htab_eq,
+					 NULL);
+  ret->loc_hash_memory = objalloc_create ();
+  if (!ret->loc_hash_table || !ret->loc_hash_memory)
+    {
+      free (ret);
+      return NULL;
+    }
+
+  return &ret->elf.root;
+}
+
+/* Destroy an i386 ELF linker hash table.  */
+
+static void
+elf_i386_link_hash_table_free (struct bfd_link_hash_table *hash)
+{
+  struct elf_i386_link_hash_table *htab
+    = (struct elf_i386_link_hash_table *) hash;
+
+  if (htab->loc_hash_table)
+    htab_delete (htab->loc_hash_table);
+  if (htab->loc_hash_memory)
+    objalloc_free ((struct objalloc *) htab->loc_hash_memory);
+  _bfd_generic_link_hash_table_free (hash);
+}
+
+/* Create .plt, .rel.plt, .got, .got.plt, .rel.got, .dynbss, and
+   .rel.bss sections in DYNOBJ, and set up shortcuts to them in our
+   hash table.  */
+
+static bfd_boolean
+elf_i386_create_dynamic_sections (bfd *dynobj, struct bfd_link_info *info)
+{
+  struct elf_i386_link_hash_table *htab;
+
+  if (!_bfd_elf_create_dynamic_sections (dynobj, info))
+    return FALSE;
+
+  htab = elf_i386_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  htab->sdynbss = bfd_get_section_by_name (dynobj, ".dynbss");
+  if (!info->shared)
+    htab->srelbss = bfd_get_section_by_name (dynobj, ".rel.bss");
+
+  if (!htab->sdynbss
+      || (!info->shared && !htab->srelbss))
+    abort ();
+
+  if (get_elf_i386_backend_data (dynobj)->is_vxworks
+      && !elf_vxworks_create_dynamic_sections (dynobj, info,
+					       &htab->srelplt2))
+    return FALSE;
+
+  if (!info->no_ld_generated_unwind_info
+      && bfd_get_section_by_name (dynobj, ".eh_frame") == NULL
+      && htab->elf.splt != NULL)
+    {
+      flagword flags = get_elf_backend_data (dynobj)->dynamic_sec_flags;
+      htab->plt_eh_frame
+	= bfd_make_section_with_flags (dynobj, ".eh_frame",
+				       flags | SEC_READONLY);
+      if (htab->plt_eh_frame == NULL
+	  || !bfd_set_section_alignment (dynobj, htab->plt_eh_frame, 2))
+	return FALSE;
+
+      htab->plt_eh_frame->size = sizeof (elf_i386_eh_frame_plt);
+      htab->plt_eh_frame->contents
+	= bfd_alloc (dynobj, htab->plt_eh_frame->size);
+      memcpy (htab->plt_eh_frame->contents, elf_i386_eh_frame_plt,
+	      sizeof (elf_i386_eh_frame_plt));
+    }
+
+  return TRUE;
+}
+
+/* Copy the extra info we tack onto an elf_link_hash_entry.  */
+
+static void
+elf_i386_copy_indirect_symbol (struct bfd_link_info *info,
+			       struct elf_link_hash_entry *dir,
+			       struct elf_link_hash_entry *ind)
+{
+  struct elf_i386_link_hash_entry *edir, *eind;
+
+  edir = (struct elf_i386_link_hash_entry *) dir;
+  eind = (struct elf_i386_link_hash_entry *) ind;
+
+  if (eind->dyn_relocs != NULL)
+    {
+      if (edir->dyn_relocs != NULL)
+	{
+	  struct elf_dyn_relocs **pp;
+	  struct elf_dyn_relocs *p;
+
+	  /* Add reloc counts against the indirect sym to the direct sym
+	     list.  Merge any entries against the same section.  */
+	  for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      struct elf_dyn_relocs *q;
+
+	      for (q = edir->dyn_relocs; q != NULL; q = q->next)
+		if (q->sec == p->sec)
+		  {
+		    q->pc_count += p->pc_count;
+		    q->count += p->count;
+		    *pp = p->next;
+		    break;
+		  }
+	      if (q == NULL)
+		pp = &p->next;
+	    }
+	  *pp = edir->dyn_relocs;
+	}
+
+      edir->dyn_relocs = eind->dyn_relocs;
+      eind->dyn_relocs = NULL;
+    }
+
+  if (ind->root.type == bfd_link_hash_indirect
+      && dir->got.refcount <= 0)
+    {
+      edir->tls_type = eind->tls_type;
+      eind->tls_type = GOT_UNKNOWN;
+    }
+
+  if (ELIMINATE_COPY_RELOCS
+      && ind->root.type != bfd_link_hash_indirect
+      && dir->dynamic_adjusted)
+    {
+      /* If called to transfer flags for a weakdef during processing
+	 of elf_adjust_dynamic_symbol, don't copy non_got_ref.
+	 We clear it ourselves for ELIMINATE_COPY_RELOCS.  */
+      dir->ref_dynamic |= ind->ref_dynamic;
+      dir->ref_regular |= ind->ref_regular;
+      dir->ref_regular_nonweak |= ind->ref_regular_nonweak;
+      dir->needs_plt |= ind->needs_plt;
+      dir->pointer_equality_needed |= ind->pointer_equality_needed;
+    }
+  else
+    _bfd_elf_link_hash_copy_indirect (info, dir, ind);
+}
+
+/* Return TRUE if the TLS access code sequence support transition
+   from R_TYPE.  */
+
+static bfd_boolean
+elf_i386_check_tls_transition (bfd *abfd, asection *sec,
+			       bfd_byte *contents,
+			       Elf_Internal_Shdr *symtab_hdr,
+			       struct elf_link_hash_entry **sym_hashes,
+			       unsigned int r_type,
+			       const Elf_Internal_Rela *rel,
+			       const Elf_Internal_Rela *relend)
+{
+  unsigned int val, type;
+  unsigned long r_symndx;
+  struct elf_link_hash_entry *h;
+  bfd_vma offset;
+
+  /* Get the section contents.  */
+  if (contents == NULL)
+    {
+      if (elf_section_data (sec)->this_hdr.contents != NULL)
+	contents = elf_section_data (sec)->this_hdr.contents;
+      else
+	{
+	  /* FIXME: How to better handle error condition?  */
+	  if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+	    return FALSE;
+
+	  /* Cache the section contents for elf_link_input_bfd.  */
+	  elf_section_data (sec)->this_hdr.contents = contents;
+	}
+    }
+
+  offset = rel->r_offset;
+  switch (r_type)
+    {
+    case R_386_TLS_GD:
+    case R_386_TLS_LDM:
+      if (offset < 2 || (rel + 1) >= relend)
+	return FALSE;
+
+      type = bfd_get_8 (abfd, contents + offset - 2);
+      if (r_type == R_386_TLS_GD)
+	{
+	  /* Check transition from GD access model.  Only
+		leal foo@tlsgd(,%reg,1), %eax; call ___tls_get_addr
+		leal foo@tlsgd(%reg), %eax; call ___tls_get_addr; nop
+	     can transit to different access model.  */
+	  if ((offset + 10) > sec->size ||
+	      (type != 0x8d && type != 0x04))
+	    return FALSE;
+
+	  val = bfd_get_8 (abfd, contents + offset - 1);
+	  if (type == 0x04)
+	    {
+	      /* leal foo@tlsgd(,%reg,1), %eax; call ___tls_get_addr */
+	      if (offset < 3)
+		return FALSE;
+
+	      if (bfd_get_8 (abfd, contents + offset - 3) != 0x8d)
+		return FALSE;
+
+	      if ((val & 0xc7) != 0x05 || val == (4 << 3))
+		return FALSE;
+	    }
+	  else
+	    {
+	      /* leal foo@tlsgd(%reg), %eax; call ___tls_get_addr; nop  */
+	      if ((val & 0xf8) != 0x80 || (val & 7) == 4)
+		return FALSE;
+
+	      if (bfd_get_8 (abfd, contents + offset + 9) != 0x90)
+		return FALSE;
+	    }
+	}
+      else
+	{
+	  /* Check transition from LD access model.  Only
+		leal foo@tlsgd(%reg), %eax; call ___tls_get_addr
+	     can transit to different access model.  */
+	  if (type != 0x8d || (offset + 9) > sec->size)
+	    return FALSE;
+
+	  val = bfd_get_8 (abfd, contents + offset - 1);
+	  if ((val & 0xf8) != 0x80 || (val & 7) == 4)
+	    return FALSE;
+	}
+
+      if (bfd_get_8 (abfd, contents + offset + 4) != 0xe8)
+	return FALSE;
+
+      r_symndx = ELF32_R_SYM (rel[1].r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+	return FALSE;
+
+      h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+      /* Use strncmp to check ___tls_get_addr since ___tls_get_addr
+	 may be versioned.  */
+      return (h != NULL
+	      && h->root.root.string != NULL
+	      && (ELF32_R_TYPE (rel[1].r_info) == R_386_PC32
+		  || ELF32_R_TYPE (rel[1].r_info) == R_386_PLT32)
+	      && (strncmp (h->root.root.string, "___tls_get_addr",
+			   15) == 0));
+
+    case R_386_TLS_IE:
+      /* Check transition from IE access model:
+		movl foo@indntpoff(%rip), %eax
+		movl foo@indntpoff(%rip), %reg
+		addl foo@indntpoff(%rip), %reg
+       */
+
+      if (offset < 1 || (offset + 4) > sec->size)
+	return FALSE;
+
+      /* Check "movl foo@tpoff(%rip), %eax" first.  */
+      val = bfd_get_8 (abfd, contents + offset - 1);
+      if (val == 0xa1)
+	return TRUE;
+
+      if (offset < 2)
+	return FALSE;
+
+      /* Check movl|addl foo@tpoff(%rip), %reg.   */
+      type = bfd_get_8 (abfd, contents + offset - 2);
+      return ((type == 0x8b || type == 0x03)
+	      && (val & 0xc7) == 0x05);
+
+    case R_386_TLS_GOTIE:
+    case R_386_TLS_IE_32:
+      /* Check transition from {IE_32,GOTIE} access model:
+		subl foo@{tpoff,gontoff}(%reg1), %reg2
+		movl foo@{tpoff,gontoff}(%reg1), %reg2
+		addl foo@{tpoff,gontoff}(%reg1), %reg2
+       */
+
+      if (offset < 2 || (offset + 4) > sec->size)
+	return FALSE;
+
+      val = bfd_get_8 (abfd, contents + offset - 1);
+      if ((val & 0xc0) != 0x80 || (val & 7) == 4)
+	return FALSE;
+
+      type = bfd_get_8 (abfd, contents + offset - 2);
+      return type == 0x8b || type == 0x2b || type == 0x03;
+
+    case R_386_TLS_GOTDESC:
+      /* Check transition from GDesc access model:
+		leal x@tlsdesc(%ebx), %eax
+
+	 Make sure it's a leal adding ebx to a 32-bit offset
+	 into any register, although it's probably almost always
+	 going to be eax.  */
+
+      if (offset < 2 || (offset + 4) > sec->size)
+	return FALSE;
+
+      if (bfd_get_8 (abfd, contents + offset - 2) != 0x8d)
+	return FALSE;
+
+      val = bfd_get_8 (abfd, contents + offset - 1);
+      return (val & 0xc7) == 0x83;
+
+    case R_386_TLS_DESC_CALL:
+      /* Check transition from GDesc access model:
+		call *x@tlsdesc(%rax)
+       */
+      if (offset + 2 <= sec->size)
+	{
+	  /* Make sure that it's a call *x@tlsdesc(%rax).  */
+	  static const unsigned char call[] = { 0xff, 0x10 };
+	  return memcmp (contents + offset, call, 2) == 0;
+	}
+
+      return FALSE;
+
+    default:
+      abort ();
+    }
+}
+
+/* Return TRUE if the TLS access transition is OK or no transition
+   will be performed.  Update R_TYPE if there is a transition.  */
+
+static bfd_boolean
+elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
+			 asection *sec, bfd_byte *contents,
+			 Elf_Internal_Shdr *symtab_hdr,
+			 struct elf_link_hash_entry **sym_hashes,
+			 unsigned int *r_type, int tls_type,
+			 const Elf_Internal_Rela *rel,
+			 const Elf_Internal_Rela *relend,
+			 struct elf_link_hash_entry *h,
+			 unsigned long r_symndx)
+{
+  unsigned int from_type = *r_type;
+  unsigned int to_type = from_type;
+  bfd_boolean check = TRUE;
+
+  /* Skip TLS transition for functions.  */
+  if (h != NULL
+      && (h->type == STT_FUNC
+	  || h->type == STT_GNU_IFUNC))
+    return TRUE;
+
+  switch (from_type)
+    {
+    case R_386_TLS_GD:
+    case R_386_TLS_GOTDESC:
+    case R_386_TLS_DESC_CALL:
+    case R_386_TLS_IE_32:
+    case R_386_TLS_IE:
+    case R_386_TLS_GOTIE:
+      if (info->executable)
+	{
+	  if (h == NULL)
+	    to_type = R_386_TLS_LE_32;
+	  else if (from_type != R_386_TLS_IE
+		   && from_type != R_386_TLS_GOTIE)
+	    to_type = R_386_TLS_IE_32;
+	}
+
+      /* When we are called from elf_i386_relocate_section, CONTENTS
+	 isn't NULL and there may be additional transitions based on
+	 TLS_TYPE.  */
+      if (contents != NULL)
+	{
+	  unsigned int new_to_type = to_type;
+
+	  if (info->executable
+	      && h != NULL
+	      && h->dynindx == -1
+	      && (tls_type & GOT_TLS_IE))
+	    new_to_type = R_386_TLS_LE_32;
+
+	  if (to_type == R_386_TLS_GD
+	      || to_type == R_386_TLS_GOTDESC
+	      || to_type == R_386_TLS_DESC_CALL)
+	    {
+	      if (tls_type == GOT_TLS_IE_POS)
+		new_to_type = R_386_TLS_GOTIE;
+	      else if (tls_type & GOT_TLS_IE)
+		new_to_type = R_386_TLS_IE_32;
+	    }
+
+	  /* We checked the transition before when we were called from
+	     elf_i386_check_relocs.  We only want to check the new
+	     transition which hasn't been checked before.  */
+	  check = new_to_type != to_type && from_type == to_type;
+	  to_type = new_to_type;
+	}
+
+      break;
+
+    case R_386_TLS_LDM:
+      if (info->executable)
+	to_type = R_386_TLS_LE_32;
+      break;
+
+    default:
+      return TRUE;
+    }
+
+  /* Return TRUE if there is no transition.  */
+  if (from_type == to_type)
+    return TRUE;
+
+  /* Check if the transition can be performed.  */
+  if (check
+      && ! elf_i386_check_tls_transition (abfd, sec, contents,
+					  symtab_hdr, sym_hashes,
+					  from_type, rel, relend))
+    {
+      reloc_howto_type *from, *to;
+      const char *name;
+
+      from = elf_i386_rtype_to_howto (abfd, from_type);
+      to = elf_i386_rtype_to_howto (abfd, to_type);
+
+      if (h)
+	name = h->root.root.string;
+      else
+	{
+	  struct elf_i386_link_hash_table *htab;
+
+	  htab = elf_i386_hash_table (info);
+	  if (htab == NULL)
+	    name = "*unknown*";
+	  else
+	    {
+	      Elf_Internal_Sym *isym;
+
+	      isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+					    abfd, r_symndx);
+	      name = bfd_elf_sym_name (abfd, symtab_hdr, isym, NULL);
+	    }
+	}
+
+      (*_bfd_error_handler)
+	(_("%B: TLS transition from %s to %s against `%s' at 0x%lx "
+	   "in section `%A' failed"),
+	 abfd, sec, from->name, to->name, name,
+	 (unsigned long) rel->r_offset);
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  *r_type = to_type;
+  return TRUE;
+}
+
+/* Look through the relocs for a section during the first phase, and
+   calculate needed space in the global offset table, procedure linkage
+   table, and dynamic reloc sections.  */
+
+static bfd_boolean
+elf_i386_check_relocs (bfd *abfd,
+		       struct bfd_link_info *info,
+		       asection *sec,
+		       const Elf_Internal_Rela *relocs)
+{
+  struct elf_i386_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  asection *sreloc;
+
+  if (info->relocatable)
+    return TRUE;
+
+  BFD_ASSERT (is_i386_elf (abfd));
+
+  htab = elf_i386_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+
+  sreloc = NULL;
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      unsigned int r_type;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+      Elf_Internal_Sym *isym;
+      const char *name;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
+	{
+	  (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
+				 abfd,
+				 r_symndx);
+	  return FALSE;
+	}
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  /* A local symbol.  */
+	  isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+					abfd, r_symndx);
+	  if (isym == NULL)
+	    return FALSE;
+
+	  /* Check relocation against local STT_GNU_IFUNC symbol.  */
+	  if (ELF32_ST_TYPE (isym->st_info) == STT_GNU_IFUNC)
+	    {
+	      h = elf_i386_get_local_sym_hash (htab, abfd, rel, TRUE);
+	      if (h == NULL)
+		return FALSE;
+
+	      /* Fake a STT_GNU_IFUNC symbol.  */
+	      h->type = STT_GNU_IFUNC;
+	      h->def_regular = 1;
+	      h->ref_regular = 1;
+	      h->forced_local = 1;
+	      h->root.type = bfd_link_hash_defined;
+	    }
+	  else
+	    h = NULL;
+	}
+      else
+	{
+	  isym = NULL;
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      if (h != NULL)
+	{
+	  /* Create the ifunc sections for static executables.  If we
+	     never see an indirect function symbol nor we are building
+	     a static executable, those sections will be empty and
+	     won't appear in output.  */
+	  switch (r_type)
+	    {
+	    default:
+	      break;
+
+	    case R_386_32:
+	    case R_386_PC32:
+	    case R_386_PLT32:
+	    case R_386_GOT32:
+	    case R_386_GOTOFF:
+	      if (htab->elf.dynobj == NULL)
+		htab->elf.dynobj = abfd;
+	      if (!_bfd_elf_create_ifunc_sections (htab->elf.dynobj, info))
+		return FALSE;
+	      break;
+	    }
+
+	  /* Since STT_GNU_IFUNC symbol must go through PLT, we handle
+	     it here if it is defined in a non-shared object.  */
+	  if (h->type == STT_GNU_IFUNC
+	      && h->def_regular)
+	    {
+	      /* It is referenced by a non-shared object. */
+	      h->ref_regular = 1;
+	      h->needs_plt = 1;
+
+	      /* STT_GNU_IFUNC symbol must go through PLT.  */
+	      h->plt.refcount += 1;
+
+	      /* STT_GNU_IFUNC needs dynamic sections.  */
+	      if (htab->elf.dynobj == NULL)
+		htab->elf.dynobj = abfd;
+
+	      switch (r_type)
+		{
+		default:
+		  if (h->root.root.string)
+		    name = h->root.root.string;
+		  else
+		    name = bfd_elf_sym_name (abfd, symtab_hdr, isym,
+					     NULL);
+		  (*_bfd_error_handler)
+		    (_("%B: relocation %s against STT_GNU_IFUNC "
+		       "symbol `%s' isn't handled by %s"), abfd,
+		     elf_howto_table[r_type].name,
+		     name, __FUNCTION__);
+		  bfd_set_error (bfd_error_bad_value);
+		  return FALSE;
+
+		case R_386_32:
+		  h->non_got_ref = 1;
+		  h->pointer_equality_needed = 1;
+		  if (info->shared)
+		    {
+		      /* We must copy these reloc types into the
+			 output file.  Create a reloc section in
+			 dynobj and make room for this reloc.  */
+		      sreloc = _bfd_elf_create_ifunc_dyn_reloc
+			(abfd, info, sec, sreloc,
+			 &((struct elf_i386_link_hash_entry *) h)->dyn_relocs);
+		      if (sreloc == NULL)
+			return FALSE;
+		    }
+		  break;
+
+		case R_386_PC32:
+		  h->non_got_ref = 1;
+		  break;
+
+		case R_386_PLT32:
+		  break;
+
+		case R_386_GOT32:
+		case R_386_GOTOFF:
+		  h->got.refcount += 1;
+		  if (htab->elf.sgot == NULL
+		      && !_bfd_elf_create_got_section (htab->elf.dynobj,
+						       info))
+		    return FALSE;
+		  break;
+		}
+
+	      continue;
+	    }
+	}
+
+      if (! elf_i386_tls_transition (info, abfd, sec, NULL,
+				     symtab_hdr, sym_hashes,
+				     &r_type, GOT_UNKNOWN,
+				     rel, rel_end, h, r_symndx))
+	return FALSE;
+
+      switch (r_type)
+	{
+	case R_386_TLS_LDM:
+	  htab->tls_ldm_got.refcount += 1;
+	  goto create_got;
+
+	case R_386_PLT32:
+	  /* This symbol requires a procedure linkage table entry.  We
+	     actually build the entry in adjust_dynamic_symbol,
+	     because this might be a case of linking PIC code which is
+	     never referenced by a dynamic object, in which case we
+	     don't need to generate a procedure linkage table entry
+	     after all.  */
+
+	  /* If this is a local symbol, we resolve it directly without
+	     creating a procedure linkage table entry.  */
+	  if (h == NULL)
+	    continue;
+
+	  h->needs_plt = 1;
+	  h->plt.refcount += 1;
+	  break;
+
+	case R_386_TLS_IE_32:
+	case R_386_TLS_IE:
+	case R_386_TLS_GOTIE:
+	  if (!info->executable)
+	    info->flags |= DF_STATIC_TLS;
+	  /* Fall through */
+
+	case R_386_GOT32:
+	case R_386_TLS_GD:
+	case R_386_TLS_GOTDESC:
+	case R_386_TLS_DESC_CALL:
+	  /* This symbol requires a global offset table entry.  */
+	  {
+	    int tls_type, old_tls_type;
+
+	    switch (r_type)
+	      {
+	      default:
+	      case R_386_GOT32: tls_type = GOT_NORMAL; break;
+	      case R_386_TLS_GD: tls_type = GOT_TLS_GD; break;
+	      case R_386_TLS_GOTDESC:
+	      case R_386_TLS_DESC_CALL:
+		tls_type = GOT_TLS_GDESC; break;
+	      case R_386_TLS_IE_32:
+		if (ELF32_R_TYPE (rel->r_info) == r_type)
+		  tls_type = GOT_TLS_IE_NEG;
+		else
+		  /* If this is a GD->IE transition, we may use either of
+		     R_386_TLS_TPOFF and R_386_TLS_TPOFF32.  */
+		  tls_type = GOT_TLS_IE;
+		break;
+	      case R_386_TLS_IE:
+	      case R_386_TLS_GOTIE:
+		tls_type = GOT_TLS_IE_POS; break;
+	      }
+
+	    if (h != NULL)
+	      {
+		h->got.refcount += 1;
+		old_tls_type = elf_i386_hash_entry(h)->tls_type;
+	      }
+	    else
+	      {
+		bfd_signed_vma *local_got_refcounts;
+
+		/* This is a global offset table entry for a local symbol.  */
+		local_got_refcounts = elf_local_got_refcounts (abfd);
+		if (local_got_refcounts == NULL)
+		  {
+		    bfd_size_type size;
+
+		    size = symtab_hdr->sh_info;
+		    size *= (sizeof (bfd_signed_vma)
+			     + sizeof (bfd_vma) + sizeof(char));
+		    local_got_refcounts = (bfd_signed_vma *)
+                        bfd_zalloc (abfd, size);
+		    if (local_got_refcounts == NULL)
+		      return FALSE;
+		    elf_local_got_refcounts (abfd) = local_got_refcounts;
+		    elf_i386_local_tlsdesc_gotent (abfd)
+		      = (bfd_vma *) (local_got_refcounts + symtab_hdr->sh_info);
+		    elf_i386_local_got_tls_type (abfd)
+		      = (char *) (local_got_refcounts + 2 * symtab_hdr->sh_info);
+		  }
+		local_got_refcounts[r_symndx] += 1;
+		old_tls_type = elf_i386_local_got_tls_type (abfd) [r_symndx];
+	      }
+
+	    if ((old_tls_type & GOT_TLS_IE) && (tls_type & GOT_TLS_IE))
+	      tls_type |= old_tls_type;
+	    /* If a TLS symbol is accessed using IE at least once,
+	       there is no point to use dynamic model for it.  */
+	    else if (old_tls_type != tls_type && old_tls_type != GOT_UNKNOWN
+		     && (! GOT_TLS_GD_ANY_P (old_tls_type)
+			 || (tls_type & GOT_TLS_IE) == 0))
+	      {
+		if ((old_tls_type & GOT_TLS_IE) && GOT_TLS_GD_ANY_P (tls_type))
+		  tls_type = old_tls_type;
+		else if (GOT_TLS_GD_ANY_P (old_tls_type)
+			 && GOT_TLS_GD_ANY_P (tls_type))
+		  tls_type |= old_tls_type;
+		else
+		  {
+		    if (h)
+		      name = h->root.root.string;
+		    else
+		      name = bfd_elf_sym_name (abfd, symtab_hdr, isym,
+					     NULL);
+		    (*_bfd_error_handler)
+		      (_("%B: `%s' accessed both as normal and "
+			 "thread local symbol"),
+		       abfd, name);
+		    return FALSE;
+		  }
+	      }
+
+	    if (old_tls_type != tls_type)
+	      {
+		if (h != NULL)
+		  elf_i386_hash_entry (h)->tls_type = tls_type;
+		else
+		  elf_i386_local_got_tls_type (abfd) [r_symndx] = tls_type;
+	      }
+	  }
+	  /* Fall through */
+
+	case R_386_GOTOFF:
+	case R_386_GOTPC:
+	create_got:
+	  if (htab->elf.sgot == NULL)
+	    {
+	      if (htab->elf.dynobj == NULL)
+		htab->elf.dynobj = abfd;
+	      if (!_bfd_elf_create_got_section (htab->elf.dynobj, info))
+		return FALSE;
+	    }
+	  if (r_type != R_386_TLS_IE)
+	    break;
+	  /* Fall through */
+
+	case R_386_TLS_LE_32:
+	case R_386_TLS_LE:
+	  if (info->executable)
+	    break;
+	  info->flags |= DF_STATIC_TLS;
+	  /* Fall through */
+
+	case R_386_32:
+	case R_386_PC32:
+	  if (h != NULL && info->executable)
+	    {
+	      /* If this reloc is in a read-only section, we might
+		 need a copy reloc.  We can't check reliably at this
+		 stage whether the section is read-only, as input
+		 sections have not yet been mapped to output sections.
+		 Tentatively set the flag for now, and correct in
+		 adjust_dynamic_symbol.  */
+	      h->non_got_ref = 1;
+
+	      /* We may need a .plt entry if the function this reloc
+		 refers to is in a shared lib.  */
+	      h->plt.refcount += 1;
+	      if (r_type != R_386_PC32)
+		h->pointer_equality_needed = 1;
+	    }
+
+	  /* If we are creating a shared library, and this is a reloc
+	     against a global symbol, or a non PC relative reloc
+	     against a local symbol, then we need to copy the reloc
+	     into the shared library.  However, if we are linking with
+	     -Bsymbolic, we do not need to copy a reloc against a
+	     global symbol which is defined in an object we are
+	     including in the link (i.e., DEF_REGULAR is set).  At
+	     this point we have not seen all the input files, so it is
+	     possible that DEF_REGULAR is not set now but will be set
+	     later (it is never cleared).  In case of a weak definition,
+	     DEF_REGULAR may be cleared later by a strong definition in
+	     a shared library.  We account for that possibility below by
+	     storing information in the relocs_copied field of the hash
+	     table entry.  A similar situation occurs when creating
+	     shared libraries and symbol visibility changes render the
+	     symbol local.
+
+	     If on the other hand, we are creating an executable, we
+	     may need to keep relocations for symbols satisfied by a
+	     dynamic library if we manage to avoid copy relocs for the
+	     symbol.  */
+	  if ((info->shared
+	       && (sec->flags & SEC_ALLOC) != 0
+	       && (r_type != R_386_PC32
+		   || (h != NULL
+		       && (! SYMBOLIC_BIND (info, h)
+			   || h->root.type == bfd_link_hash_defweak
+			   || !h->def_regular))))
+	      || (ELIMINATE_COPY_RELOCS
+		  && !info->shared
+		  && (sec->flags & SEC_ALLOC) != 0
+		  && h != NULL
+		  && (h->root.type == bfd_link_hash_defweak
+		      || !h->def_regular)))
+	    {
+	      struct elf_dyn_relocs *p;
+	      struct elf_dyn_relocs **head;
+
+	      /* We must copy these reloc types into the output file.
+		 Create a reloc section in dynobj and make room for
+		 this reloc.  */
+	      if (sreloc == NULL)
+		{
+		  if (htab->elf.dynobj == NULL)
+		    htab->elf.dynobj = abfd;
+
+		  sreloc = _bfd_elf_make_dynamic_reloc_section
+		    (sec, htab->elf.dynobj, 2, abfd, /*rela?*/ FALSE);
+
+		  if (sreloc == NULL)
+		    return FALSE;
+		}
+
+	      /* If this is a global symbol, we count the number of
+		 relocations we need for this symbol.  */
+	      if (h != NULL)
+		{
+		  head = &((struct elf_i386_link_hash_entry *) h)->dyn_relocs;
+		}
+	      else
+		{
+		  /* Track dynamic relocs needed for local syms too.
+		     We really need local syms available to do this
+		     easily.  Oh well.  */
+		  void **vpp;
+		  asection *s;
+
+		  isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+						abfd, r_symndx);
+		  if (isym == NULL)
+		    return FALSE;
+
+		  s = bfd_section_from_elf_index (abfd, isym->st_shndx);
+		  if (s == NULL)
+		    s = sec;
+
+		  vpp = &elf_section_data (s)->local_dynrel;
+		  head = (struct elf_dyn_relocs **)vpp;
+		}
+
+	      p = *head;
+	      if (p == NULL || p->sec != sec)
+		{
+		  bfd_size_type amt = sizeof *p;
+		  p = (struct elf_dyn_relocs *) bfd_alloc (htab->elf.dynobj,
+                                                           amt);
+		  if (p == NULL)
+		    return FALSE;
+		  p->next = *head;
+		  *head = p;
+		  p->sec = sec;
+		  p->count = 0;
+		  p->pc_count = 0;
+		}
+
+	      p->count += 1;
+	      if (r_type == R_386_PC32)
+		p->pc_count += 1;
+	    }
+	  break;
+
+	  /* This relocation describes the C++ object vtable hierarchy.
+	     Reconstruct it for later use during GC.  */
+	case R_386_GNU_VTINHERIT:
+	  if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+	    return FALSE;
+	  break;
+
+	  /* This relocation describes which C++ vtable entries are actually
+	     used.  Record for later use during GC.  */
+	case R_386_GNU_VTENTRY:
+	  BFD_ASSERT (h != NULL);
+	  if (h != NULL
+	      && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_offset))
+	    return FALSE;
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+static asection *
+elf_i386_gc_mark_hook (asection *sec,
+		       struct bfd_link_info *info,
+		       Elf_Internal_Rela *rel,
+		       struct elf_link_hash_entry *h,
+		       Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_386_GNU_VTINHERIT:
+      case R_386_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Update the got entry reference counts for the section being removed.  */
+
+static bfd_boolean
+elf_i386_gc_sweep_hook (bfd *abfd,
+			struct bfd_link_info *info,
+			asection *sec,
+			const Elf_Internal_Rela *relocs)
+{
+  struct elf_i386_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  const Elf_Internal_Rela *rel, *relend;
+
+  if (info->relocatable)
+    return TRUE;
+
+  htab = elf_i386_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  elf_section_data (sec)->local_dynrel = NULL;
+
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      unsigned int r_type;
+      struct elf_link_hash_entry *h = NULL;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+      else
+	{
+	  /* A local symbol.  */
+	  Elf_Internal_Sym *isym;
+
+	  isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+					abfd, r_symndx);
+
+	  /* Check relocation against local STT_GNU_IFUNC symbol.  */
+	  if (isym != NULL
+	      && ELF32_ST_TYPE (isym->st_info) == STT_GNU_IFUNC)
+	    {
+	      h = elf_i386_get_local_sym_hash (htab, abfd, rel, FALSE);
+	      if (h == NULL)
+		abort ();
+	    }
+	}
+
+      if (h)
+	{
+	  struct elf_i386_link_hash_entry *eh;
+	  struct elf_dyn_relocs **pp;
+	  struct elf_dyn_relocs *p;
+
+	  eh = (struct elf_i386_link_hash_entry *) h;
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
+	    if (p->sec == sec)
+	      {
+		/* Everything must go for SEC.  */
+		*pp = p->next;
+		break;
+	      }
+	}
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      if (! elf_i386_tls_transition (info, abfd, sec, NULL,
+				     symtab_hdr, sym_hashes,
+				     &r_type, GOT_UNKNOWN,
+				     rel, relend, h, r_symndx))
+	return FALSE;
+
+      switch (r_type)
+	{
+	case R_386_TLS_LDM:
+	  if (htab->tls_ldm_got.refcount > 0)
+	    htab->tls_ldm_got.refcount -= 1;
+	  break;
+
+	case R_386_TLS_GD:
+	case R_386_TLS_GOTDESC:
+	case R_386_TLS_DESC_CALL:
+	case R_386_TLS_IE_32:
+	case R_386_TLS_IE:
+	case R_386_TLS_GOTIE:
+	case R_386_GOT32:
+	  if (h != NULL)
+	    {
+	      if (h->got.refcount > 0)
+		h->got.refcount -= 1;
+	      if (h->type == STT_GNU_IFUNC)
+		{
+		  if (h->plt.refcount > 0)
+		    h->plt.refcount -= 1;
+		}
+	    }
+	  else if (local_got_refcounts != NULL)
+	    {
+	      if (local_got_refcounts[r_symndx] > 0)
+		local_got_refcounts[r_symndx] -= 1;
+	    }
+	  break;
+
+	case R_386_32:
+	case R_386_PC32:
+	  if (info->shared
+	      && (h == NULL || h->type != STT_GNU_IFUNC))
+	    break;
+	  /* Fall through */
+
+	case R_386_PLT32:
+	  if (h != NULL)
+	    {
+	      if (h->plt.refcount > 0)
+		h->plt.refcount -= 1;
+	    }
+	  break;
+
+	case R_386_GOTOFF:
+	  if (h != NULL && h->type == STT_GNU_IFUNC)
+	    {
+	      if (h->got.refcount > 0)
+		h->got.refcount -= 1;
+	      if (h->plt.refcount > 0)
+		h->plt.refcount -= 1;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+elf_i386_adjust_dynamic_symbol (struct bfd_link_info *info,
+				struct elf_link_hash_entry *h)
+{
+  struct elf_i386_link_hash_table *htab;
+  asection *s;
+
+  /* STT_GNU_IFUNC symbol must go through PLT. */
+  if (h->type == STT_GNU_IFUNC)
+    {
+      if (h->plt.refcount <= 0)
+	{
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	}
+      return TRUE;
+    }
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later,
+     when we know the address of the .got section.  */
+  if (h->type == STT_FUNC
+      || h->needs_plt)
+    {
+      if (h->plt.refcount <= 0
+	  || SYMBOL_CALLS_LOCAL (info, h)
+	  || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+	      && h->root.type == bfd_link_hash_undefweak))
+	{
+	  /* This case can occur if we saw a PLT32 reloc in an input
+	     file, but the symbol was never referred to by a dynamic
+	     object, or if all references were garbage collected.  In
+	     such a case, we don't actually need to build a procedure
+	     linkage table, and we can just do a PC32 reloc instead.  */
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	}
+
+      return TRUE;
+    }
+  else
+    /* It's possible that we incorrectly decided a .plt reloc was
+       needed for an R_386_PC32 reloc to a non-function sym in
+       check_relocs.  We can't decide accurately between function and
+       non-function syms in check-relocs;  Objects loaded later in
+       the link may change h->type.  So fix it now.  */
+    h->plt.offset = (bfd_vma) -1;
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      if (ELIMINATE_COPY_RELOCS || info->nocopyreloc)
+	h->non_got_ref = h->u.weakdef->non_got_ref;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if (!h->non_got_ref)
+    return TRUE;
+
+  /* If -z nocopyreloc was given, we won't generate them either.  */
+  if (info->nocopyreloc)
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  htab = elf_i386_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* If there aren't any dynamic relocs in read-only sections, then
+     we can keep the dynamic relocs and avoid the copy reloc.  This
+     doesn't work on VxWorks, where we can not have dynamic relocations
+     (other than copy and jump slot relocations) in an executable.  */
+  if (ELIMINATE_COPY_RELOCS
+      && !get_elf_i386_backend_data (info->output_bfd)->is_vxworks)
+    {
+      struct elf_i386_link_hash_entry * eh;
+      struct elf_dyn_relocs *p;
+
+      eh = (struct elf_i386_link_hash_entry *) h;
+      for (p = eh->dyn_relocs; p != NULL; p = p->next)
+	{
+	  s = p->sec->output_section;
+	  if (s != NULL && (s->flags & SEC_READONLY) != 0)
+	    break;
+	}
+
+      if (p == NULL)
+	{
+	  h->non_got_ref = 0;
+	  return TRUE;
+	}
+    }
+
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  /* We must generate a R_386_COPY reloc to tell the dynamic linker to
+     copy the initial value out of the dynamic object and into the
+     runtime process image.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      htab->srelbss->size += sizeof (Elf32_External_Rel);
+      h->needs_copy = 1;
+    }
+
+  s = htab->sdynbss;
+
+  return _bfd_elf_adjust_dynamic_copy (h, s);
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   dynamic relocs.  */
+
+static bfd_boolean
+elf_i386_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+{
+  struct bfd_link_info *info;
+  struct elf_i386_link_hash_table *htab;
+  struct elf_i386_link_hash_entry *eh;
+  struct elf_dyn_relocs *p;
+  unsigned plt_entry_size;
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  eh = (struct elf_i386_link_hash_entry *) h;
+
+  info = (struct bfd_link_info *) inf;
+  htab = elf_i386_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  plt_entry_size = GET_PLT_ENTRY_SIZE (info->output_bfd);
+
+  /* Since STT_GNU_IFUNC symbol must go through PLT, we handle it
+     here if it is defined and referenced in a non-shared object.  */
+  if (h->type == STT_GNU_IFUNC
+      && h->def_regular)
+    return _bfd_elf_allocate_ifunc_dyn_relocs (info, h, &eh->dyn_relocs,
+                                               plt_entry_size, 4);
+  else if (htab->elf.dynamic_sections_created
+	   && h->plt.refcount > 0)
+    {
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      if (info->shared
+	  || WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, 0, h))
+	{
+	  asection *s = htab->elf.splt;
+
+	  /* If this is the first .plt entry, make room for the special
+	     first entry.  */
+	  if (s->size == 0)
+	    s->size += plt_entry_size;
+
+	  h->plt.offset = s->size;
+
+	  /* If this symbol is not defined in a regular file, and we are
+	     not generating a shared library, then set the symbol to this
+	     location in the .plt.  This is required to make function
+	     pointers compare as equal between the normal executable and
+	     the shared library.  */
+	  if (! info->shared
+	      && !h->def_regular)
+	    {
+	      h->root.u.def.section = s;
+	      h->root.u.def.value = h->plt.offset;
+	    }
+
+	  /* Make room for this entry.  */
+	  s->size += plt_entry_size;
+
+	  /* We also need to make an entry in the .got.plt section, which
+	     will be placed in the .got section by the linker script.  */
+	  htab->elf.sgotplt->size += 4;
+
+	  /* We also need to make an entry in the .rel.plt section.  */
+	  htab->elf.srelplt->size += sizeof (Elf32_External_Rel);
+	  htab->next_tls_desc_index++;
+
+	  if (get_elf_i386_backend_data (info->output_bfd)->is_vxworks
+              && !info->shared)
+	    {
+	      /* VxWorks has a second set of relocations for each PLT entry
+		 in executables.  They go in a separate relocation section,
+		 which is processed by the kernel loader.  */
+
+	      /* There are two relocations for the initial PLT entry: an
+		 R_386_32 relocation for _GLOBAL_OFFSET_TABLE_ + 4 and an
+		 R_386_32 relocation for _GLOBAL_OFFSET_TABLE_ + 8.  */
+
+	      if (h->plt.offset == plt_entry_size)
+		htab->srelplt2->size += (sizeof (Elf32_External_Rel) * 2);
+
+	      /* There are two extra relocations for each subsequent PLT entry:
+		 an R_386_32 relocation for the GOT entry, and an R_386_32
+		 relocation for the PLT entry.  */
+
+	      htab->srelplt2->size += (sizeof (Elf32_External_Rel) * 2);
+	    }
+	}
+      else
+	{
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	}
+    }
+  else
+    {
+      h->plt.offset = (bfd_vma) -1;
+      h->needs_plt = 0;
+    }
+
+  eh->tlsdesc_got = (bfd_vma) -1;
+
+  /* If R_386_TLS_{IE_32,IE,GOTIE} symbol is now local to the binary,
+     make it a R_386_TLS_LE_32 requiring no TLS entry.  */
+  if (h->got.refcount > 0
+      && info->executable
+      && h->dynindx == -1
+      && (elf_i386_hash_entry(h)->tls_type & GOT_TLS_IE))
+    h->got.offset = (bfd_vma) -1;
+  else if (h->got.refcount > 0)
+    {
+      asection *s;
+      bfd_boolean dyn;
+      int tls_type = elf_i386_hash_entry(h)->tls_type;
+
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      s = htab->elf.sgot;
+      if (GOT_TLS_GDESC_P (tls_type))
+	{
+	  eh->tlsdesc_got = htab->elf.sgotplt->size
+	    - elf_i386_compute_jump_table_size (htab);
+	  htab->elf.sgotplt->size += 8;
+	  h->got.offset = (bfd_vma) -2;
+	}
+      if (! GOT_TLS_GDESC_P (tls_type)
+	  || GOT_TLS_GD_P (tls_type))
+	{
+	  h->got.offset = s->size;
+	  s->size += 4;
+	  /* R_386_TLS_GD needs 2 consecutive GOT slots.  */
+	  if (GOT_TLS_GD_P (tls_type) || tls_type == GOT_TLS_IE_BOTH)
+	    s->size += 4;
+	}
+      dyn = htab->elf.dynamic_sections_created;
+      /* R_386_TLS_IE_32 needs one dynamic relocation,
+	 R_386_TLS_IE resp. R_386_TLS_GOTIE needs one dynamic relocation,
+	 (but if both R_386_TLS_IE_32 and R_386_TLS_IE is present, we
+	 need two), R_386_TLS_GD needs one if local symbol and two if
+	 global.  */
+      if (tls_type == GOT_TLS_IE_BOTH)
+	htab->elf.srelgot->size += 2 * sizeof (Elf32_External_Rel);
+      else if ((GOT_TLS_GD_P (tls_type) && h->dynindx == -1)
+	       || (tls_type & GOT_TLS_IE))
+	htab->elf.srelgot->size += sizeof (Elf32_External_Rel);
+      else if (GOT_TLS_GD_P (tls_type))
+	htab->elf.srelgot->size += 2 * sizeof (Elf32_External_Rel);
+      else if (! GOT_TLS_GDESC_P (tls_type)
+	       && (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		   || h->root.type != bfd_link_hash_undefweak)
+	       && (info->shared
+		   || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h)))
+	htab->elf.srelgot->size += sizeof (Elf32_External_Rel);
+      if (GOT_TLS_GDESC_P (tls_type))
+	htab->elf.srelplt->size += sizeof (Elf32_External_Rel);
+    }
+  else
+    h->got.offset = (bfd_vma) -1;
+
+  if (eh->dyn_relocs == NULL)
+    return TRUE;
+
+  /* In the shared -Bsymbolic case, discard space allocated for
+     dynamic pc-relative relocs against symbols which turn out to be
+     defined in regular objects.  For the normal shared case, discard
+     space for pc-relative relocs that have become local due to symbol
+     visibility changes.  */
+
+  if (info->shared)
+    {
+      /* The only reloc that uses pc_count is R_386_PC32, which will
+	 appear on a call or on something like ".long foo - .".  We
+	 want calls to protected symbols to resolve directly to the
+	 function rather than going via the plt.  If people want
+	 function pointer comparisons to work as expected then they
+	 should avoid writing assembly like ".long foo - .".  */
+      if (SYMBOL_CALLS_LOCAL (info, h))
+	{
+	  struct elf_dyn_relocs **pp;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      p->count -= p->pc_count;
+	      p->pc_count = 0;
+	      if (p->count == 0)
+		*pp = p->next;
+	      else
+		pp = &p->next;
+	    }
+	}
+
+      if (get_elf_i386_backend_data (info->output_bfd)->is_vxworks)
+	{
+	  struct elf_dyn_relocs **pp;
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      if (strcmp (p->sec->output_section->name, ".tls_vars") == 0)
+		*pp = p->next;
+	      else
+		pp = &p->next;
+	    }
+	}
+
+      /* Also discard relocs on undefined weak syms with non-default
+    	 visibility.  */
+      if (eh->dyn_relocs != NULL
+	  && h->root.type == bfd_link_hash_undefweak)
+	{
+	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	    eh->dyn_relocs = NULL;
+
+	  /* Make sure undefined weak symbols are output as a dynamic
+	     symbol in PIEs.  */
+	  else if (h->dynindx == -1
+		   && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+	}
+    }
+  else if (ELIMINATE_COPY_RELOCS)
+    {
+      /* For the non-shared case, discard space for relocs against
+	 symbols which turn out to need copy relocs or are not
+	 dynamic.  */
+
+      if (!h->non_got_ref
+	  && ((h->def_dynamic
+	       && !h->def_regular)
+	      || (htab->elf.dynamic_sections_created
+		  && (h->root.type == bfd_link_hash_undefweak
+		      || h->root.type == bfd_link_hash_undefined))))
+	{
+	  /* Make sure this symbol is output as a dynamic symbol.
+	     Undefined weak syms won't yet be marked as dynamic.  */
+	  if (h->dynindx == -1
+	      && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+
+	  /* If that succeeded, we know we'll be keeping all the
+	     relocs.  */
+	  if (h->dynindx != -1)
+	    goto keep;
+	}
+
+      eh->dyn_relocs = NULL;
+
+    keep: ;
+    }
+
+  /* Finally, allocate space.  */
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *sreloc;
+
+      sreloc = elf_section_data (p->sec)->sreloc;
+
+      BFD_ASSERT (sreloc != NULL);
+      sreloc->size += p->count * sizeof (Elf32_External_Rel);
+    }
+
+  return TRUE;
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   local dynamic relocs.  */
+
+static bfd_boolean
+elf_i386_allocate_local_dynrelocs (void **slot, void *inf)
+{
+  struct elf_link_hash_entry *h
+    = (struct elf_link_hash_entry *) *slot;
+
+  if (h->type != STT_GNU_IFUNC
+      || !h->def_regular
+      || !h->ref_regular
+      || !h->forced_local
+      || h->root.type != bfd_link_hash_defined)
+    abort ();
+
+  return elf_i386_allocate_dynrelocs (h, inf);
+}
+
+/* Find any dynamic relocs that apply to read-only sections.  */
+
+static bfd_boolean
+elf_i386_readonly_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+{
+  struct elf_i386_link_hash_entry *eh;
+  struct elf_dyn_relocs *p;
+
+  /* Skip local IFUNC symbols. */
+  if (h->forced_local && h->type == STT_GNU_IFUNC)
+    return TRUE;
+
+  eh = (struct elf_i386_link_hash_entry *) h;
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *s = p->sec->output_section;
+
+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
+	{
+	  struct bfd_link_info *info = (struct bfd_link_info *) inf;
+
+	  info->flags |= DF_TEXTREL;
+
+	  if (info->warn_shared_textrel && info->shared)
+	    info->callbacks->einfo (_("%P: %B: warning: relocation against `%s' in readonly section `%A'.\n"),
+				    p->sec->owner, h->root.root.string,
+				    p->sec);
+
+	  /* Not an error, just cut short the traversal.  */
+	  return FALSE;
+	}
+    }
+  return TRUE;
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+elf_i386_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
+{
+  struct elf_i386_link_hash_table *htab;
+  bfd *dynobj;
+  asection *s;
+  bfd_boolean relocs;
+  bfd *ibfd;
+
+  htab = elf_i386_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+  dynobj = htab->elf.dynobj;
+  if (dynobj == NULL)
+    abort ();
+
+  if (htab->elf.dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  if (s == NULL)
+	    abort ();
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+
+  /* Set up .got offsets for local syms, and space for local dynamic
+     relocs.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      bfd_signed_vma *local_got;
+      bfd_signed_vma *end_local_got;
+      char *local_tls_type;
+      bfd_vma *local_tlsdesc_gotent;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *srel;
+
+      if (! is_i386_elf (ibfd))
+	continue;
+
+      for (s = ibfd->sections; s != NULL; s = s->next)
+	{
+	  struct elf_dyn_relocs *p;
+
+	  for (p = ((struct elf_dyn_relocs *)
+		     elf_section_data (s)->local_dynrel);
+	       p != NULL;
+	       p = p->next)
+	    {
+	      if (!bfd_is_abs_section (p->sec)
+		  && bfd_is_abs_section (p->sec->output_section))
+		{
+		  /* Input section has been discarded, either because
+		     it is a copy of a linkonce section or due to
+		     linker script /DISCARD/, so we'll be discarding
+		     the relocs too.  */
+		}
+	      else if (get_elf_i386_backend_data (output_bfd)->is_vxworks
+		       && strcmp (p->sec->output_section->name,
+				  ".tls_vars") == 0)
+		{
+		  /* Relocations in vxworks .tls_vars sections are
+		     handled specially by the loader.  */
+		}
+	      else if (p->count != 0)
+		{
+		  srel = elf_section_data (p->sec)->sreloc;
+		  srel->size += p->count * sizeof (Elf32_External_Rel);
+		  if ((p->sec->output_section->flags & SEC_READONLY) != 0
+		      && (info->flags & DF_TEXTREL) == 0)
+		    {
+		      info->flags |= DF_TEXTREL;
+		      if (info->warn_shared_textrel && info->shared)
+			info->callbacks->einfo (_("%P: %B: warning: relocation in readonly section `%A'.\n"),
+						p->sec->owner, p->sec);
+		    }
+		}
+	    }
+	}
+
+      local_got = elf_local_got_refcounts (ibfd);
+      if (!local_got)
+	continue;
+
+      symtab_hdr = &elf_symtab_hdr (ibfd);
+      locsymcount = symtab_hdr->sh_info;
+      end_local_got = local_got + locsymcount;
+      local_tls_type = elf_i386_local_got_tls_type (ibfd);
+      local_tlsdesc_gotent = elf_i386_local_tlsdesc_gotent (ibfd);
+      s = htab->elf.sgot;
+      srel = htab->elf.srelgot;
+      for (; local_got < end_local_got;
+	   ++local_got, ++local_tls_type, ++local_tlsdesc_gotent)
+	{
+	  *local_tlsdesc_gotent = (bfd_vma) -1;
+	  if (*local_got > 0)
+	    {
+	      if (GOT_TLS_GDESC_P (*local_tls_type))
+		{
+		  *local_tlsdesc_gotent = htab->elf.sgotplt->size
+		    - elf_i386_compute_jump_table_size (htab);
+		  htab->elf.sgotplt->size += 8;
+		  *local_got = (bfd_vma) -2;
+		}
+	      if (! GOT_TLS_GDESC_P (*local_tls_type)
+		  || GOT_TLS_GD_P (*local_tls_type))
+		{
+		  *local_got = s->size;
+		  s->size += 4;
+		  if (GOT_TLS_GD_P (*local_tls_type)
+		      || *local_tls_type == GOT_TLS_IE_BOTH)
+		    s->size += 4;
+		}
+	      if (info->shared
+		  || GOT_TLS_GD_ANY_P (*local_tls_type)
+		  || (*local_tls_type & GOT_TLS_IE))
+		{
+		  if (*local_tls_type == GOT_TLS_IE_BOTH)
+		    srel->size += 2 * sizeof (Elf32_External_Rel);
+		  else if (GOT_TLS_GD_P (*local_tls_type)
+			   || ! GOT_TLS_GDESC_P (*local_tls_type))
+		    srel->size += sizeof (Elf32_External_Rel);
+		  if (GOT_TLS_GDESC_P (*local_tls_type))
+		    htab->elf.srelplt->size += sizeof (Elf32_External_Rel);
+		}
+	    }
+	  else
+	    *local_got = (bfd_vma) -1;
+	}
+    }
+
+  if (htab->tls_ldm_got.refcount > 0)
+    {
+      /* Allocate 2 got entries and 1 dynamic reloc for R_386_TLS_LDM
+	 relocs.  */
+      htab->tls_ldm_got.offset = htab->elf.sgot->size;
+      htab->elf.sgot->size += 8;
+      htab->elf.srelgot->size += sizeof (Elf32_External_Rel);
+    }
+  else
+    htab->tls_ldm_got.offset = -1;
+
+  /* Allocate global sym .plt and .got entries, and space for global
+     sym dynamic relocs.  */
+  elf_link_hash_traverse (&htab->elf, elf_i386_allocate_dynrelocs, info);
+
+  /* Allocate .plt and .got entries, and space for local symbols.  */
+  htab_traverse (htab->loc_hash_table,
+		 elf_i386_allocate_local_dynrelocs,
+		 info);
+
+  /* For every jump slot reserved in the sgotplt, reloc_count is
+     incremented.  However, when we reserve space for TLS descriptors,
+     it's not incremented, so in order to compute the space reserved
+     for them, it suffices to multiply the reloc count by the jump
+     slot size.  */
+  if (htab->elf.srelplt)
+    htab->sgotplt_jump_table_size = htab->next_tls_desc_index * 4;
+
+  if (htab->elf.sgotplt)
+    {
+      struct elf_link_hash_entry *got;
+      got = elf_link_hash_lookup (elf_hash_table (info),
+				  "_GLOBAL_OFFSET_TABLE_",
+				  FALSE, FALSE, FALSE);
+
+      /* Don't allocate .got.plt section if there are no GOT nor PLT
+         entries and there is no refeence to _GLOBAL_OFFSET_TABLE_.  */
+      if ((got == NULL
+	   || !got->ref_regular_nonweak)
+	  && (htab->elf.sgotplt->size
+	      == get_elf_backend_data (output_bfd)->got_header_size)
+	  && (htab->elf.splt == NULL
+	      || htab->elf.splt->size == 0)
+	  && (htab->elf.sgot == NULL
+	      || htab->elf.sgot->size == 0)
+	  && (htab->elf.iplt == NULL
+	      || htab->elf.iplt->size == 0)
+	  && (htab->elf.igotplt == NULL
+	      || htab->elf.igotplt->size == 0))
+	htab->elf.sgotplt->size = 0;
+    }
+
+  /* We now have determined the sizes of the various dynamic sections.
+     Allocate memory for them.  */
+  relocs = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      bfd_boolean strip_section = TRUE;
+
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      if (s == htab->elf.splt
+	  || s == htab->elf.sgot
+	  || s == htab->elf.sgotplt
+	  || s == htab->elf.iplt
+	  || s == htab->elf.igotplt
+	  || s == htab->sdynbss)
+	{
+	  /* Strip this section if we don't need it; see the
+	     comment below.  */
+	  /* We'd like to strip these sections if they aren't needed, but if
+	     we've exported dynamic symbols from them we must leave them.
+	     It's too late to tell BFD to get rid of the symbols.  */
+
+	  if (htab->elf.hplt != NULL)
+	    strip_section = FALSE;
+	}
+      else if (CONST_STRNEQ (bfd_get_section_name (dynobj, s), ".rel"))
+	{
+	  if (s->size != 0
+	      && s != htab->elf.srelplt
+	      && s != htab->srelplt2)
+	    relocs = TRUE;
+
+	  /* We use the reloc_count field as a counter if we need
+	     to copy relocs into the output file.  */
+	  s->reloc_count = 0;
+	}
+      else
+	{
+	  /* It's not one of our sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (s->size == 0)
+	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is mostly to handle .rel.bss and
+	     .rel.plt.  We must create both sections in
+	     create_dynamic_sections, because they must be created
+	     before the linker maps input sections to output
+	     sections.  The linker does that before
+	     adjust_dynamic_symbol is called, and it is that
+	     function which decides whether anything needs to go
+	     into these sections.  */
+	  if (strip_section)
+	    s->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents.  We use bfd_zalloc
+	 here in case unused entries are not reclaimed before the
+	 section's contents are written out.  This should not happen,
+	 but this way if it does, we get a R_386_NONE reloc instead
+	 of garbage.  */
+      s->contents = (unsigned char *) bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+
+  if (htab->plt_eh_frame != NULL
+      && htab->elf.splt != NULL
+      && htab->elf.splt->size != 0
+      && (htab->elf.splt->flags & SEC_EXCLUDE) == 0)
+    bfd_put_32 (dynobj, htab->elf.splt->size,
+		htab->plt_eh_frame->contents + PLT_FDE_LEN_OFFSET);
+
+  if (htab->elf.dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in elf_i386_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (info->executable)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (htab->elf.splt->size != 0)
+	{
+	  if (!add_dynamic_entry (DT_PLTGOT, 0)
+	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL, DT_REL)
+	      || !add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+	}
+
+      if (relocs)
+	{
+	  if (!add_dynamic_entry (DT_REL, 0)
+	      || !add_dynamic_entry (DT_RELSZ, 0)
+	      || !add_dynamic_entry (DT_RELENT, sizeof (Elf32_External_Rel)))
+	    return FALSE;
+
+	  /* If any dynamic relocs apply to a read-only section,
+	     then we need a DT_TEXTREL entry.  */
+	  if ((info->flags & DF_TEXTREL) == 0)
+	    elf_link_hash_traverse (&htab->elf,
+				    elf_i386_readonly_dynrelocs, info);
+
+	  if ((info->flags & DF_TEXTREL) != 0)
+	    {
+	      if (!add_dynamic_entry (DT_TEXTREL, 0))
+		return FALSE;
+	    }
+	}
+      if (get_elf_i386_backend_data (output_bfd)->is_vxworks
+	  && !elf_vxworks_add_dynamic_entries (output_bfd, info))
+	return FALSE;
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf_i386_always_size_sections (bfd *output_bfd,
+			       struct bfd_link_info *info)
+{
+  asection *tls_sec = elf_hash_table (info)->tls_sec;
+
+  if (tls_sec)
+    {
+      struct elf_link_hash_entry *tlsbase;
+
+      tlsbase = elf_link_hash_lookup (elf_hash_table (info),
+				      "_TLS_MODULE_BASE_",
+				      FALSE, FALSE, FALSE);
+
+      if (tlsbase && tlsbase->type == STT_TLS)
+	{
+	  struct elf_i386_link_hash_table *htab;
+	  struct bfd_link_hash_entry *bh = NULL;
+	  const struct elf_backend_data *bed
+	    = get_elf_backend_data (output_bfd);
+
+	  htab = elf_i386_hash_table (info);
+	  if (htab == NULL)
+	    return FALSE;
+
+	  if (!(_bfd_generic_link_add_one_symbol
+		(info, output_bfd, "_TLS_MODULE_BASE_", BSF_LOCAL,
+		 tls_sec, 0, NULL, FALSE,
+		 bed->collect, &bh)))
+	    return FALSE;
+
+	  htab->tls_module_base = bh;
+
+	  tlsbase = (struct elf_link_hash_entry *)bh;
+	  tlsbase->def_regular = 1;
+	  tlsbase->other = STV_HIDDEN;
+	  (*bed->elf_backend_hide_symbol) (info, tlsbase, TRUE);
+	}
+    }
+
+  return TRUE;
+}
+
+/* Set the correct type for an x86 ELF section.  We do this by the
+   section name, which is a hack, but ought to work.  */
+
+static bfd_boolean
+elf_i386_fake_sections (bfd *abfd ATTRIBUTE_UNUSED,
+			Elf_Internal_Shdr *hdr,
+			asection *sec)
+{
+  const char *name;
+
+  name = bfd_get_section_name (abfd, sec);
+
+  /* This is an ugly, but unfortunately necessary hack that is
+     needed when producing EFI binaries on x86. It tells
+     elf.c:elf_fake_sections() not to consider ".reloc" as a section
+     containing ELF relocation info.  We need this hack in order to
+     be able to generate ELF binaries that can be translated into
+     EFI applications (which are essentially COFF objects).  Those
+     files contain a COFF ".reloc" section inside an ELFNN object,
+     which would normally cause BFD to segfault because it would
+     attempt to interpret this section as containing relocation
+     entries for section "oc".  With this hack enabled, ".reloc"
+     will be treated as a normal data section, which will avoid the
+     segfault.  However, you won't be able to create an ELFNN binary
+     with a section named "oc" that needs relocations, but that's
+     the kind of ugly side-effects you get when detecting section
+     types based on their names...  In practice, this limitation is
+     unlikely to bite.  */
+  if (strcmp (name, ".reloc") == 0)
+    hdr->sh_type = SHT_PROGBITS;
+
+  return TRUE;
+}
+
+/* _TLS_MODULE_BASE_ needs to be treated especially when linking
+   executables.  Rather than setting it to the beginning of the TLS
+   section, we have to set it to the end.    This function may be called
+   multiple times, it is idempotent.  */
+
+static void
+elf_i386_set_tls_module_base (struct bfd_link_info *info)
+{
+  struct elf_i386_link_hash_table *htab;
+  struct bfd_link_hash_entry *base;
+
+  if (!info->executable)
+    return;
+
+  htab = elf_i386_hash_table (info);
+  if (htab == NULL)
+    return;
+
+  base = htab->tls_module_base;
+  if (base == NULL)
+    return;
+
+  base->u.def.value = htab->elf.tls_size;
+}
+
+/* Return the base VMA address which should be subtracted from real addresses
+   when resolving @dtpoff relocation.
+   This is PT_TLS segment p_vaddr.  */
+
+static bfd_vma
+elf_i386_dtpoff_base (struct bfd_link_info *info)
+{
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (elf_hash_table (info)->tls_sec == NULL)
+    return 0;
+  return elf_hash_table (info)->tls_sec->vma;
+}
+
+/* Return the relocation value for @tpoff relocation
+   if STT_TLS virtual address is ADDRESS.  */
+
+static bfd_vma
+elf_i386_tpoff (struct bfd_link_info *info, bfd_vma address)
+{
+  struct elf_link_hash_table *htab = elf_hash_table (info);
+  const struct elf_backend_data *bed = get_elf_backend_data (info->output_bfd);
+  bfd_vma static_tls_size;
+
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (htab->tls_sec == NULL)
+    return 0;
+
+  /* Consider special static TLS alignment requirements.  */
+  static_tls_size = BFD_ALIGN (htab->tls_size, bed->static_tls_alignment);
+  return static_tls_size + htab->tls_sec->vma - address;
+}
+
+/* Relocate an i386 ELF section.  */
+
+static bfd_boolean
+elf_i386_relocate_section (bfd *output_bfd,
+			   struct bfd_link_info *info,
+			   bfd *input_bfd,
+			   asection *input_section,
+			   bfd_byte *contents,
+			   Elf_Internal_Rela *relocs,
+			   Elf_Internal_Sym *local_syms,
+			   asection **local_sections)
+{
+  struct elf_i386_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_vma *local_got_offsets;
+  bfd_vma *local_tlsdesc_gotents;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  bfd_boolean is_vxworks_tls;
+  unsigned plt_entry_size;
+
+  BFD_ASSERT (is_i386_elf (input_bfd));
+
+  htab = elf_i386_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+  symtab_hdr = &elf_symtab_hdr (input_bfd);
+  sym_hashes = elf_sym_hashes (input_bfd);
+  local_got_offsets = elf_local_got_offsets (input_bfd);
+  local_tlsdesc_gotents = elf_i386_local_tlsdesc_gotent (input_bfd);
+  /* We have to handle relocations in vxworks .tls_vars sections
+     specially, because the dynamic loader is 'weird'.  */
+  is_vxworks_tls = (get_elf_i386_backend_data (output_bfd)->is_vxworks
+                    && info->shared
+		    && !strcmp (input_section->output_section->name,
+				".tls_vars"));
+
+  elf_i386_set_tls_module_base (info);
+
+  plt_entry_size = GET_PLT_ENTRY_SIZE (output_bfd);
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      unsigned int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      bfd_vma off, offplt;
+      bfd_vma relocation;
+      bfd_boolean unresolved_reloc;
+      bfd_reloc_status_type r;
+      unsigned int indx;
+      int tls_type;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      if (r_type == R_386_GNU_VTINHERIT
+	  || r_type == R_386_GNU_VTENTRY)
+	continue;
+
+      if ((indx = r_type) >= R_386_standard
+	  && ((indx = r_type - R_386_ext_offset) - R_386_standard
+	      >= R_386_ext - R_386_standard)
+	  && ((indx = r_type - R_386_tls_offset) - R_386_ext
+	      >= R_386_irelative - R_386_ext))
+	{
+	  (*_bfd_error_handler)
+	    (_("%B: unrecognized relocation (0x%x) in section `%A'"),
+	     input_bfd, input_section, r_type);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+      howto = elf_howto_table + indx;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      unresolved_reloc = FALSE;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = (sec->output_section->vma
+			+ sec->output_offset
+			+ sym->st_value);
+
+	  if (ELF_ST_TYPE (sym->st_info) == STT_SECTION
+	      && ((sec->flags & SEC_MERGE) != 0
+		  || (info->relocatable
+		      && sec->output_offset != 0)))
+	    {
+	      bfd_vma addend;
+	      bfd_byte *where = contents + rel->r_offset;
+
+	      switch (howto->size)
+		{
+		case 0:
+		  addend = bfd_get_8 (input_bfd, where);
+		  if (howto->pc_relative)
+		    {
+		      addend = (addend ^ 0x80) - 0x80;
+		      addend += 1;
+		    }
+		  break;
+		case 1:
+		  addend = bfd_get_16 (input_bfd, where);
+		  if (howto->pc_relative)
+		    {
+		      addend = (addend ^ 0x8000) - 0x8000;
+		      addend += 2;
+		    }
+		  break;
+		case 2:
+		  addend = bfd_get_32 (input_bfd, where);
+		  if (howto->pc_relative)
+		    {
+		      addend = (addend ^ 0x80000000) - 0x80000000;
+		      addend += 4;
+		    }
+		  break;
+		default:
+		  abort ();
+		}
+
+	      if (info->relocatable)
+		addend += sec->output_offset;
+	      else
+		{
+		  asection *msec = sec;
+		  addend = _bfd_elf_rel_local_sym (output_bfd, sym, &msec,
+						   addend);
+		  addend -= relocation;
+		  addend += msec->output_section->vma + msec->output_offset;
+		}
+
+	      switch (howto->size)
+		{
+		case 0:
+		  /* FIXME: overflow checks.  */
+		  if (howto->pc_relative)
+		    addend -= 1;
+		  bfd_put_8 (input_bfd, addend, where);
+		  break;
+		case 1:
+		  if (howto->pc_relative)
+		    addend -= 2;
+		  bfd_put_16 (input_bfd, addend, where);
+		  break;
+		case 2:
+		  if (howto->pc_relative)
+		    addend -= 4;
+		  bfd_put_32 (input_bfd, addend, where);
+		  break;
+		}
+	    }
+	  else if (!info->relocatable
+		   && ELF32_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
+	    {
+	      /* Relocate against local STT_GNU_IFUNC symbol.  */
+	      h = elf_i386_get_local_sym_hash (htab, input_bfd, rel,
+					       FALSE);
+	      if (h == NULL)
+		abort ();
+
+	      /* Set STT_GNU_IFUNC symbol value.  */
+	      h->root.u.def.value = sym->st_value;
+	      h->root.u.def.section = sec;
+	    }
+	}
+      else
+	{
+	  bfd_boolean warned ATTRIBUTE_UNUSED;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      /* Since STT_GNU_IFUNC symbol must go through PLT, we handle
+	 it here if it is defined in a non-shared object.  */
+      if (h != NULL
+	  && h->type == STT_GNU_IFUNC
+	  && h->def_regular)
+	{
+	  asection *plt, *gotplt, *base_got;
+	  bfd_vma plt_index;
+	  const char *name;
+
+	  if ((input_section->flags & SEC_ALLOC) == 0
+	      || h->plt.offset == (bfd_vma) -1)
+	    abort ();
+
+	  /* STT_GNU_IFUNC symbol must go through PLT.  */
+	  if (htab->elf.splt != NULL)
+	    {
+	      plt = htab->elf.splt;
+	      gotplt = htab->elf.sgotplt;
+	    }
+	  else
+	    {
+	      plt = htab->elf.iplt;
+	      gotplt = htab->elf.igotplt;
+	    }
+
+	  relocation = (plt->output_section->vma
+			+ plt->output_offset + h->plt.offset);
+
+	  switch (r_type)
+	    {
+	    default:
+	      if (h->root.root.string)
+		name = h->root.root.string;
+	      else
+		name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym,
+					 NULL);
+	      (*_bfd_error_handler)
+		(_("%B: relocation %s against STT_GNU_IFUNC "
+		   "symbol `%s' isn't handled by %s"), input_bfd,
+		 elf_howto_table[r_type].name,
+		 name, __FUNCTION__);
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+
+	    case R_386_32:
+	      /* Generate dynamic relcoation only when there is a
+		 non-GOF reference in a shared object.  */
+	      if (info->shared && h->non_got_ref)
+		{
+		  Elf_Internal_Rela outrel;
+		  bfd_byte *loc;
+		  asection *sreloc;
+		  bfd_vma offset;
+
+		  /* Need a dynamic relocation to get the real function
+		     adddress.  */
+		  offset = _bfd_elf_section_offset (output_bfd,
+						    info,
+						    input_section,
+						    rel->r_offset);
+		  if (offset == (bfd_vma) -1
+		      || offset == (bfd_vma) -2)
+		    abort ();
+
+		  outrel.r_offset = (input_section->output_section->vma
+				     + input_section->output_offset
+				     + offset);
+
+		  if (h->dynindx == -1
+		      || h->forced_local
+		      || info->executable)
+		    {
+		      /* This symbol is resolved locally.  */
+		      outrel.r_info = ELF32_R_INFO (0, R_386_IRELATIVE);
+		      bfd_put_32 (output_bfd,
+				  (h->root.u.def.value
+				   + h->root.u.def.section->output_section->vma
+				   + h->root.u.def.section->output_offset),
+				  contents + offset);
+		    }
+		  else
+		    outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
+
+		  sreloc = htab->elf.irelifunc;
+		  loc = sreloc->contents;
+		  loc += (sreloc->reloc_count++
+			  * sizeof (Elf32_External_Rel));
+		  bfd_elf32_swap_reloc_out (output_bfd, &outrel, loc);
+
+		  /* If this reloc is against an external symbol, we
+		     do not want to fiddle with the addend.  Otherwise,
+		     we need to include the symbol value so that it
+		     becomes an addend for the dynamic reloc.  For an
+		     internal symbol, we have updated addend.  */
+		  continue;
+		}
+	      /* FALLTHROUGH */
+	    case R_386_PC32:
+	    case R_386_PLT32:
+	      goto do_relocation;
+
+	    case R_386_GOT32:
+	      base_got = htab->elf.sgot;
+	      off = h->got.offset;
+
+	      if (base_got == NULL)
+		abort ();
+
+	      if (off == (bfd_vma) -1)
+		{
+		  /* We can't use h->got.offset here to save state, or
+		     even just remember the offset, as finish_dynamic_symbol
+		     would use that as offset into .got.  */
+
+		  if (htab->elf.splt != NULL)
+		    {
+		      plt_index = h->plt.offset / plt_entry_size - 1;
+		      off = (plt_index + 3) * 4;
+		      base_got = htab->elf.sgotplt;
+		    }
+		  else
+		    {
+		      plt_index = h->plt.offset / plt_entry_size;
+		      off = plt_index * 4;
+		      base_got = htab->elf.igotplt;
+		    }
+
+		  if (h->dynindx == -1
+		      || h->forced_local
+		      || info->symbolic)
+		    {
+		      /* This references the local defitionion.  We must
+			 initialize this entry in the global offset table.
+			 Since the offset must always be a multiple of 8,
+			 we use the least significant bit to record
+			 whether we have initialized it already.
+
+			 When doing a dynamic link, we create a .rela.got
+			 relocation entry to initialize the value.  This
+			 is done in the finish_dynamic_symbol routine.	 */
+		      if ((off & 1) != 0)
+			off &= ~1;
+		      else
+			{
+			  bfd_put_32 (output_bfd, relocation,
+				      base_got->contents + off);
+			  h->got.offset |= 1;
+			}
+		    }
+
+		  relocation = off;
+
+		  /* Adjust for static executables.  */
+		  if (htab->elf.splt == NULL)
+		    relocation += gotplt->output_offset;
+		}
+	      else
+		{
+		  relocation = (base_got->output_section->vma
+				+ base_got->output_offset + off
+				- gotplt->output_section->vma
+				- gotplt->output_offset);
+		  /* Adjust for static executables.  */
+		  if (htab->elf.splt == NULL)
+		    relocation += gotplt->output_offset;
+		}
+
+	      goto do_relocation;
+
+	    case R_386_GOTOFF:
+	      relocation -= (gotplt->output_section->vma
+			     + gotplt->output_offset);
+	      goto do_relocation;
+	    }
+	}
+
+      switch (r_type)
+	{
+	case R_386_GOT32:
+	  /* Relocation is to the entry for this symbol in the global
+	     offset table.  */
+	  if (htab->elf.sgot == NULL)
+	    abort ();
+
+	  if (h != NULL)
+	    {
+	      bfd_boolean dyn;
+
+	      off = h->got.offset;
+	      dyn = htab->elf.dynamic_sections_created;
+	      if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+		  || (info->shared
+		      && SYMBOL_REFERENCES_LOCAL (info, h))
+		  || (ELF_ST_VISIBILITY (h->other)
+		      && h->root.type == bfd_link_hash_undefweak))
+		{
+		  /* This is actually a static link, or it is a
+		     -Bsymbolic link and the symbol is defined
+		     locally, or the symbol was forced to be local
+		     because of a version file.  We must initialize
+		     this entry in the global offset table.  Since the
+		     offset must always be a multiple of 4, we use the
+		     least significant bit to record whether we have
+		     initialized it already.
+
+		     When doing a dynamic link, we create a .rel.got
+		     relocation entry to initialize the value.  This
+		     is done in the finish_dynamic_symbol routine.  */
+		  if ((off & 1) != 0)
+		    off &= ~1;
+		  else
+		    {
+		      bfd_put_32 (output_bfd, relocation,
+				  htab->elf.sgot->contents + off);
+		      h->got.offset |= 1;
+		    }
+		}
+	      else
+		unresolved_reloc = FALSE;
+	    }
+	  else
+	    {
+	      if (local_got_offsets == NULL)
+		abort ();
+
+	      off = local_got_offsets[r_symndx];
+
+	      /* The offset must always be a multiple of 4.  We use
+		 the least significant bit to record whether we have
+		 already generated the necessary reloc.  */
+	      if ((off & 1) != 0)
+		off &= ~1;
+	      else
+		{
+		  bfd_put_32 (output_bfd, relocation,
+			      htab->elf.sgot->contents + off);
+
+		  if (info->shared)
+		    {
+		      asection *s;
+		      Elf_Internal_Rela outrel;
+		      bfd_byte *loc;
+
+		      s = htab->elf.srelgot;
+		      if (s == NULL)
+			abort ();
+
+		      outrel.r_offset = (htab->elf.sgot->output_section->vma
+					 + htab->elf.sgot->output_offset
+					 + off);
+		      outrel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);
+		      loc = s->contents;
+		      loc += s->reloc_count++ * sizeof (Elf32_External_Rel);
+		      bfd_elf32_swap_reloc_out (output_bfd, &outrel, loc);
+		    }
+
+		  local_got_offsets[r_symndx] |= 1;
+		}
+	    }
+
+	  if (off >= (bfd_vma) -2)
+	    abort ();
+
+	  relocation = htab->elf.sgot->output_section->vma
+		       + htab->elf.sgot->output_offset + off
+		       - htab->elf.sgotplt->output_section->vma
+		       - htab->elf.sgotplt->output_offset;
+	  break;
+
+	case R_386_GOTOFF:
+	  /* Relocation is relative to the start of the global offset
+	     table.  */
+
+	  /* Check to make sure it isn't a protected function symbol
+	     for shared library since it may not be local when used
+	     as function address.  We also need to make sure that a
+	     symbol is defined locally.  */
+	  if (info->shared && h)
+	    {
+	      if (!h->def_regular)
+		{
+		  const char *v;
+
+		  switch (ELF_ST_VISIBILITY (h->other))
+		    {
+		    case STV_HIDDEN:
+		      v = _("hidden symbol");
+		      break;
+		    case STV_INTERNAL:
+		      v = _("internal symbol");
+		      break;
+		    case STV_PROTECTED:
+		      v = _("protected symbol");
+		      break;
+		    default:
+		      v = _("symbol");
+		      break;
+		    }
+
+		  (*_bfd_error_handler)
+		    (_("%B: relocation R_386_GOTOFF against undefined %s `%s' can not be used when making a shared object"),
+		     input_bfd, v, h->root.root.string);
+		  bfd_set_error (bfd_error_bad_value);
+		  return FALSE;
+		}
+	      else if (!info->executable
+		       && h->type == STT_FUNC
+		       && ELF_ST_VISIBILITY (h->other) == STV_PROTECTED)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B: relocation R_386_GOTOFF against protected function `%s' can not be used when making a shared object"),
+		     input_bfd, h->root.root.string);
+		  bfd_set_error (bfd_error_bad_value);
+		  return FALSE;
+		}
+	    }
+
+	  /* Note that sgot is not involved in this
+	     calculation.  We always want the start of .got.plt.  If we
+	     defined _GLOBAL_OFFSET_TABLE_ in a different way, as is
+	     permitted by the ABI, we might have to change this
+	     calculation.  */
+	  relocation -= htab->elf.sgotplt->output_section->vma
+			+ htab->elf.sgotplt->output_offset;
+	  break;
+
+	case R_386_GOTPC:
+	  /* Use global offset table as symbol value.  */
+	  relocation = htab->elf.sgotplt->output_section->vma
+		       + htab->elf.sgotplt->output_offset;
+	  unresolved_reloc = FALSE;
+	  break;
+
+	case R_386_PLT32:
+	  /* Relocation is to the entry for this symbol in the
+	     procedure linkage table.  */
+
+	  /* Resolve a PLT32 reloc against a local symbol directly,
+	     without using the procedure linkage table.  */
+	  if (h == NULL)
+	    break;
+
+	  if (h->plt.offset == (bfd_vma) -1
+	      || htab->elf.splt == NULL)
+	    {
+	      /* We didn't make a PLT entry for this symbol.  This
+		 happens when statically linking PIC code, or when
+		 using -Bsymbolic.  */
+	      break;
+	    }
+
+	  relocation = (htab->elf.splt->output_section->vma
+			+ htab->elf.splt->output_offset
+			+ h->plt.offset);
+	  unresolved_reloc = FALSE;
+	  break;
+
+	case R_386_32:
+	case R_386_PC32:
+	  if ((input_section->flags & SEC_ALLOC) == 0
+	      || is_vxworks_tls)
+	    break;
+
+	  if ((info->shared
+	       && (h == NULL
+		   || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		   || h->root.type != bfd_link_hash_undefweak)
+	       && (r_type != R_386_PC32
+		   || !SYMBOL_CALLS_LOCAL (info, h)))
+	      || (ELIMINATE_COPY_RELOCS
+		  && !info->shared
+		  && h != NULL
+		  && h->dynindx != -1
+		  && !h->non_got_ref
+		  && ((h->def_dynamic
+		       && !h->def_regular)
+		      || h->root.type == bfd_link_hash_undefweak
+		      || h->root.type == bfd_link_hash_undefined)))
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_byte *loc;
+	      bfd_boolean skip, relocate;
+	      asection *sreloc;
+
+	      /* When generating a shared object, these relocations
+		 are copied into the output file to be resolved at run
+		 time.  */
+
+	      skip = FALSE;
+	      relocate = FALSE;
+
+	      outrel.r_offset =
+		_bfd_elf_section_offset (output_bfd, info, input_section,
+					 rel->r_offset);
+	      if (outrel.r_offset == (bfd_vma) -1)
+		skip = TRUE;
+	      else if (outrel.r_offset == (bfd_vma) -2)
+		skip = TRUE, relocate = TRUE;
+	      outrel.r_offset += (input_section->output_section->vma
+				  + input_section->output_offset);
+
+	      if (skip)
+		memset (&outrel, 0, sizeof outrel);
+	      else if (h != NULL
+		       && h->dynindx != -1
+		       && (r_type == R_386_PC32
+			   || !info->shared
+			   || !SYMBOLIC_BIND (info, h)
+			   || !h->def_regular))
+		outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
+	      else
+		{
+		  /* This symbol is local, or marked to become local.  */
+		  relocate = TRUE;
+		  outrel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);
+		}
+
+	      sreloc = elf_section_data (input_section)->sreloc;
+
+	      if (sreloc == NULL || sreloc->contents == NULL)
+		{
+		  r = bfd_reloc_notsupported;
+		  goto check_relocation_error;
+		}
+
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rel);
+
+	      bfd_elf32_swap_reloc_out (output_bfd, &outrel, loc);
+
+	      /* If this reloc is against an external symbol, we do
+		 not want to fiddle with the addend.  Otherwise, we
+		 need to include the symbol value so that it becomes
+		 an addend for the dynamic reloc.  */
+	      if (! relocate)
+		continue;
+	    }
+	  break;
+
+	case R_386_TLS_IE:
+	  if (!info->executable)
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_byte *loc;
+	      asection *sreloc;
+
+	      outrel.r_offset = rel->r_offset
+				+ input_section->output_section->vma
+				+ input_section->output_offset;
+	      outrel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);
+	      sreloc = elf_section_data (input_section)->sreloc;
+	      if (sreloc == NULL)
+		abort ();
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rel);
+	      bfd_elf32_swap_reloc_out (output_bfd, &outrel, loc);
+	    }
+	  /* Fall through */
+
+	case R_386_TLS_GD:
+	case R_386_TLS_GOTDESC:
+	case R_386_TLS_DESC_CALL:
+	case R_386_TLS_IE_32:
+	case R_386_TLS_GOTIE:
+	  tls_type = GOT_UNKNOWN;
+	  if (h == NULL && local_got_offsets)
+	    tls_type = elf_i386_local_got_tls_type (input_bfd) [r_symndx];
+	  else if (h != NULL)
+	    tls_type = elf_i386_hash_entry(h)->tls_type;
+	  if (tls_type == GOT_TLS_IE)
+	    tls_type = GOT_TLS_IE_NEG;
+
+	  if (! elf_i386_tls_transition (info, input_bfd,
+					 input_section, contents,
+					 symtab_hdr, sym_hashes,
+					 &r_type, tls_type, rel,
+					 relend, h, r_symndx))
+	    return FALSE;
+
+	  if (r_type == R_386_TLS_LE_32)
+	    {
+	      BFD_ASSERT (! unresolved_reloc);
+	      if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_GD)
+		{
+		  unsigned int type;
+		  bfd_vma roff;
+
+		  /* GD->LE transition.  */
+		  type = bfd_get_8 (input_bfd, contents + rel->r_offset - 2);
+		  if (type == 0x04)
+		    {
+		      /* leal foo(,%reg,1), %eax; call ___tls_get_addr
+			 Change it into:
+			 movl %gs:0, %eax; subl $foo@tpoff, %eax
+			 (6 byte form of subl).  */
+		      memcpy (contents + rel->r_offset - 3,
+			      "\x65\xa1\0\0\0\0\x81\xe8\0\0\0", 12);
+		      roff = rel->r_offset + 5;
+		    }
+		  else
+		    {
+		      /* leal foo(%reg), %eax; call ___tls_get_addr; nop
+			 Change it into:
+			 movl %gs:0, %eax; subl $foo@tpoff, %eax
+			 (6 byte form of subl).  */
+		      memcpy (contents + rel->r_offset - 2,
+			      "\x65\xa1\0\0\0\0\x81\xe8\0\0\0", 12);
+		      roff = rel->r_offset + 6;
+		    }
+		  bfd_put_32 (output_bfd, elf_i386_tpoff (info, relocation),
+			      contents + roff);
+		  /* Skip R_386_PC32/R_386_PLT32.  */
+		  rel++;
+		  continue;
+		}
+	      else if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_GOTDESC)
+		{
+		  /* GDesc -> LE transition.
+		     It's originally something like:
+		     leal x@tlsdesc(%ebx), %eax
+
+		     leal x@ntpoff, %eax
+
+		     Registers other than %eax may be set up here.  */
+
+		  unsigned int val;
+		  bfd_vma roff;
+
+		  roff = rel->r_offset;
+		  val = bfd_get_8 (input_bfd, contents + roff - 1);
+
+		  /* Now modify the instruction as appropriate.  */
+		  /* aoliva FIXME: remove the above and xor the byte
+		     below with 0x86.  */
+		  bfd_put_8 (output_bfd, val ^ 0x86,
+			     contents + roff - 1);
+		  bfd_put_32 (output_bfd, -elf_i386_tpoff (info, relocation),
+			      contents + roff);
+		  continue;
+		}
+	      else if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_DESC_CALL)
+		{
+		  /* GDesc -> LE transition.
+		     It's originally:
+		     call *(%eax)
+		     Turn it into:
+		     xchg %ax,%ax  */
+
+		  bfd_vma roff;
+
+		  roff = rel->r_offset;
+		  bfd_put_8 (output_bfd, 0x66, contents + roff);
+		  bfd_put_8 (output_bfd, 0x90, contents + roff + 1);
+		  continue;
+		}
+	      else if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_IE)
+		{
+		  unsigned int val;
+
+		  /* IE->LE transition:
+		     Originally it can be one of:
+		     movl foo, %eax
+		     movl foo, %reg
+		     addl foo, %reg
+		     We change it into:
+		     movl $foo, %eax
+		     movl $foo, %reg
+		     addl $foo, %reg.  */
+		  val = bfd_get_8 (input_bfd, contents + rel->r_offset - 1);
+		  if (val == 0xa1)
+		    {
+		      /* movl foo, %eax.  */
+		      bfd_put_8 (output_bfd, 0xb8,
+				 contents + rel->r_offset - 1);
+		    }
+		  else
+		    {
+		      unsigned int type;
+
+		      type = bfd_get_8 (input_bfd,
+					contents + rel->r_offset - 2);
+		      switch (type)
+			{
+			case 0x8b:
+			  /* movl */
+			  bfd_put_8 (output_bfd, 0xc7,
+				     contents + rel->r_offset - 2);
+			  bfd_put_8 (output_bfd,
+				     0xc0 | ((val >> 3) & 7),
+				     contents + rel->r_offset - 1);
+			  break;
+			case 0x03:
+			  /* addl */
+			  bfd_put_8 (output_bfd, 0x81,
+				     contents + rel->r_offset - 2);
+			  bfd_put_8 (output_bfd,
+				     0xc0 | ((val >> 3) & 7),
+				     contents + rel->r_offset - 1);
+			  break;
+			default:
+			  BFD_FAIL ();
+			  break;
+			}
+		    }
+		  bfd_put_32 (output_bfd, -elf_i386_tpoff (info, relocation),
+			      contents + rel->r_offset);
+		  continue;
+		}
+	      else
+		{
+		  unsigned int val, type;
+
+		  /* {IE_32,GOTIE}->LE transition:
+		     Originally it can be one of:
+		     subl foo(%reg1), %reg2
+		     movl foo(%reg1), %reg2
+		     addl foo(%reg1), %reg2
+		     We change it into:
+		     subl $foo, %reg2
+		     movl $foo, %reg2 (6 byte form)
+		     addl $foo, %reg2.  */
+		  type = bfd_get_8 (input_bfd, contents + rel->r_offset - 2);
+		  val = bfd_get_8 (input_bfd, contents + rel->r_offset - 1);
+		  if (type == 0x8b)
+		    {
+		      /* movl */
+		      bfd_put_8 (output_bfd, 0xc7,
+				 contents + rel->r_offset - 2);
+		      bfd_put_8 (output_bfd, 0xc0 | ((val >> 3) & 7),
+				 contents + rel->r_offset - 1);
+		    }
+		  else if (type == 0x2b)
+		    {
+		      /* subl */
+		      bfd_put_8 (output_bfd, 0x81,
+				 contents + rel->r_offset - 2);
+		      bfd_put_8 (output_bfd, 0xe8 | ((val >> 3) & 7),
+				 contents + rel->r_offset - 1);
+		    }
+		  else if (type == 0x03)
+		    {
+		      /* addl */
+		      bfd_put_8 (output_bfd, 0x81,
+				 contents + rel->r_offset - 2);
+		      bfd_put_8 (output_bfd, 0xc0 | ((val >> 3) & 7),
+				 contents + rel->r_offset - 1);
+		    }
+		  else
+		    BFD_FAIL ();
+		  if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_GOTIE)
+		    bfd_put_32 (output_bfd, -elf_i386_tpoff (info, relocation),
+				contents + rel->r_offset);
+		  else
+		    bfd_put_32 (output_bfd, elf_i386_tpoff (info, relocation),
+				contents + rel->r_offset);
+		  continue;
+		}
+	    }
+
+	  if (htab->elf.sgot == NULL)
+	    abort ();
+
+	  if (h != NULL)
+	    {
+	      off = h->got.offset;
+	      offplt = elf_i386_hash_entry (h)->tlsdesc_got;
+	    }
+	  else
+	    {
+	      if (local_got_offsets == NULL)
+		abort ();
+
+	      off = local_got_offsets[r_symndx];
+	      offplt = local_tlsdesc_gotents[r_symndx];
+	    }
+
+	  if ((off & 1) != 0)
+	    off &= ~1;
+	  else
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_byte *loc;
+	      int dr_type;
+	      asection *sreloc;
+
+	      if (htab->elf.srelgot == NULL)
+		abort ();
+
+	      indx = h && h->dynindx != -1 ? h->dynindx : 0;
+
+	      if (GOT_TLS_GDESC_P (tls_type))
+		{
+		  outrel.r_info = ELF32_R_INFO (indx, R_386_TLS_DESC);
+		  BFD_ASSERT (htab->sgotplt_jump_table_size + offplt + 8
+			      <= htab->elf.sgotplt->size);
+		  outrel.r_offset = (htab->elf.sgotplt->output_section->vma
+				     + htab->elf.sgotplt->output_offset
+				     + offplt
+				     + htab->sgotplt_jump_table_size);
+		  sreloc = htab->elf.srelplt;
+		  loc = sreloc->contents;
+		  loc += (htab->next_tls_desc_index++
+			  * sizeof (Elf32_External_Rel));
+		  BFD_ASSERT (loc + sizeof (Elf32_External_Rel)
+			      <= sreloc->contents + sreloc->size);
+		  bfd_elf32_swap_reloc_out (output_bfd, &outrel, loc);
+		  if (indx == 0)
+		    {
+		      BFD_ASSERT (! unresolved_reloc);
+		      bfd_put_32 (output_bfd,
+				  relocation - elf_i386_dtpoff_base (info),
+				  htab->elf.sgotplt->contents + offplt
+				  + htab->sgotplt_jump_table_size + 4);
+		    }
+		  else
+		    {
+		      bfd_put_32 (output_bfd, 0,
+				  htab->elf.sgotplt->contents + offplt
+				  + htab->sgotplt_jump_table_size + 4);
+		    }
+		}
+
+	      sreloc = htab->elf.srelgot;
+
+	      outrel.r_offset = (htab->elf.sgot->output_section->vma
+				 + htab->elf.sgot->output_offset + off);
+
+	      if (GOT_TLS_GD_P (tls_type))
+		dr_type = R_386_TLS_DTPMOD32;
+	      else if (GOT_TLS_GDESC_P (tls_type))
+		goto dr_done;
+	      else if (tls_type == GOT_TLS_IE_POS)
+		dr_type = R_386_TLS_TPOFF;
+	      else
+		dr_type = R_386_TLS_TPOFF32;
+
+	      if (dr_type == R_386_TLS_TPOFF && indx == 0)
+		bfd_put_32 (output_bfd,
+			    relocation - elf_i386_dtpoff_base (info),
+			    htab->elf.sgot->contents + off);
+	      else if (dr_type == R_386_TLS_TPOFF32 && indx == 0)
+		bfd_put_32 (output_bfd,
+			    elf_i386_dtpoff_base (info) - relocation,
+			    htab->elf.sgot->contents + off);
+	      else if (dr_type != R_386_TLS_DESC)
+		bfd_put_32 (output_bfd, 0,
+			    htab->elf.sgot->contents + off);
+	      outrel.r_info = ELF32_R_INFO (indx, dr_type);
+
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rel);
+	      BFD_ASSERT (loc + sizeof (Elf32_External_Rel)
+			  <= sreloc->contents + sreloc->size);
+	      bfd_elf32_swap_reloc_out (output_bfd, &outrel, loc);
+
+	      if (GOT_TLS_GD_P (tls_type))
+		{
+		  if (indx == 0)
+		    {
+	    	      BFD_ASSERT (! unresolved_reloc);
+		      bfd_put_32 (output_bfd,
+				  relocation - elf_i386_dtpoff_base (info),
+				  htab->elf.sgot->contents + off + 4);
+		    }
+		  else
+		    {
+		      bfd_put_32 (output_bfd, 0,
+				  htab->elf.sgot->contents + off + 4);
+		      outrel.r_info = ELF32_R_INFO (indx,
+						    R_386_TLS_DTPOFF32);
+		      outrel.r_offset += 4;
+		      sreloc->reloc_count++;
+		      loc += sizeof (Elf32_External_Rel);
+		      BFD_ASSERT (loc + sizeof (Elf32_External_Rel)
+				  <= sreloc->contents + sreloc->size);
+		      bfd_elf32_swap_reloc_out (output_bfd, &outrel, loc);
+		    }
+		}
+	      else if (tls_type == GOT_TLS_IE_BOTH)
+		{
+		  bfd_put_32 (output_bfd,
+			      (indx == 0
+			       ? relocation - elf_i386_dtpoff_base (info)
+			       : 0),
+			      htab->elf.sgot->contents + off + 4);
+		  outrel.r_info = ELF32_R_INFO (indx, R_386_TLS_TPOFF);
+		  outrel.r_offset += 4;
+		  sreloc->reloc_count++;
+		  loc += sizeof (Elf32_External_Rel);
+		  bfd_elf32_swap_reloc_out (output_bfd, &outrel, loc);
+		}
+
+	    dr_done:
+	      if (h != NULL)
+		h->got.offset |= 1;
+	      else
+		local_got_offsets[r_symndx] |= 1;
+	    }
+
+	  if (off >= (bfd_vma) -2
+	      && ! GOT_TLS_GDESC_P (tls_type))
+	    abort ();
+	  if (r_type == R_386_TLS_GOTDESC
+	      || r_type == R_386_TLS_DESC_CALL)
+	    {
+	      relocation = htab->sgotplt_jump_table_size + offplt;
+	      unresolved_reloc = FALSE;
+	    }
+	  else if (r_type == ELF32_R_TYPE (rel->r_info))
+	    {
+	      bfd_vma g_o_t = htab->elf.sgotplt->output_section->vma
+			      + htab->elf.sgotplt->output_offset;
+	      relocation = htab->elf.sgot->output_section->vma
+		+ htab->elf.sgot->output_offset + off - g_o_t;
+	      if ((r_type == R_386_TLS_IE || r_type == R_386_TLS_GOTIE)
+		  && tls_type == GOT_TLS_IE_BOTH)
+		relocation += 4;
+	      if (r_type == R_386_TLS_IE)
+		relocation += g_o_t;
+	      unresolved_reloc = FALSE;
+	    }
+	  else if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_GD)
+	    {
+	      unsigned int val, type;
+	      bfd_vma roff;
+
+	      /* GD->IE transition.  */
+	      type = bfd_get_8 (input_bfd, contents + rel->r_offset - 2);
+	      val = bfd_get_8 (input_bfd, contents + rel->r_offset - 1);
+	      if (type == 0x04)
+		{
+		  /* leal foo(,%reg,1), %eax; call ___tls_get_addr
+		     Change it into:
+		     movl %gs:0, %eax; subl $foo@gottpoff(%reg), %eax.  */
+		  val >>= 3;
+		  roff = rel->r_offset - 3;
+		}
+	      else
+		{
+		  /* leal foo(%reg), %eax; call ___tls_get_addr; nop
+		     Change it into:
+		     movl %gs:0, %eax; subl $foo@gottpoff(%reg), %eax.  */
+		  roff = rel->r_offset - 2;
+		}
+	      memcpy (contents + roff,
+		      "\x65\xa1\0\0\0\0\x2b\x80\0\0\0", 12);
+	      contents[roff + 7] = 0x80 | (val & 7);
+	      /* If foo is used only with foo@gotntpoff(%reg) and
+		 foo@indntpoff, but not with foo@gottpoff(%reg), change
+		 subl $foo@gottpoff(%reg), %eax
+		 into:
+		 addl $foo@gotntpoff(%reg), %eax.  */
+	      if (tls_type == GOT_TLS_IE_POS)
+		contents[roff + 6] = 0x03;
+	      bfd_put_32 (output_bfd,
+			  htab->elf.sgot->output_section->vma
+			  + htab->elf.sgot->output_offset + off
+			  - htab->elf.sgotplt->output_section->vma
+			  - htab->elf.sgotplt->output_offset,
+			  contents + roff + 8);
+	      /* Skip R_386_PLT32.  */
+	      rel++;
+	      continue;
+	    }
+	  else if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_GOTDESC)
+	    {
+	      /* GDesc -> IE transition.
+		 It's originally something like:
+		 leal x@tlsdesc(%ebx), %eax
+
+		 Change it to:
+		 movl x@gotntpoff(%ebx), %eax # before xchg %ax,%ax
+		 or:
+		 movl x@gottpoff(%ebx), %eax # before negl %eax
+
+		 Registers other than %eax may be set up here.  */
+
+	      bfd_vma roff;
+
+	      /* First, make sure it's a leal adding ebx to a 32-bit
+		 offset into any register, although it's probably
+		 almost always going to be eax.  */
+	      roff = rel->r_offset;
+
+	      /* Now modify the instruction as appropriate.  */
+	      /* To turn a leal into a movl in the form we use it, it
+		 suffices to change the first byte from 0x8d to 0x8b.
+		 aoliva FIXME: should we decide to keep the leal, all
+		 we have to do is remove the statement below, and
+		 adjust the relaxation of R_386_TLS_DESC_CALL.  */
+	      bfd_put_8 (output_bfd, 0x8b, contents + roff - 2);
+
+	      if (tls_type == GOT_TLS_IE_BOTH)
+		off += 4;
+
+	      bfd_put_32 (output_bfd,
+			  htab->elf.sgot->output_section->vma
+			  + htab->elf.sgot->output_offset + off
+			  - htab->elf.sgotplt->output_section->vma
+			  - htab->elf.sgotplt->output_offset,
+			  contents + roff);
+	      continue;
+	    }
+	  else if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_DESC_CALL)
+	    {
+	      /* GDesc -> IE transition.
+		 It's originally:
+		 call *(%eax)
+
+		 Change it to:
+		 xchg %ax,%ax
+		 or
+		 negl %eax
+		 depending on how we transformed the TLS_GOTDESC above.
+	      */
+
+	      bfd_vma roff;
+
+	      roff = rel->r_offset;
+
+	      /* Now modify the instruction as appropriate.  */
+	      if (tls_type != GOT_TLS_IE_NEG)
+		{
+		  /* xchg %ax,%ax */
+		  bfd_put_8 (output_bfd, 0x66, contents + roff);
+		  bfd_put_8 (output_bfd, 0x90, contents + roff + 1);
+		}
+	      else
+		{
+		  /* negl %eax */
+		  bfd_put_8 (output_bfd, 0xf7, contents + roff);
+		  bfd_put_8 (output_bfd, 0xd8, contents + roff + 1);
+		}
+
+	      continue;
+	    }
+	  else
+	    BFD_ASSERT (FALSE);
+	  break;
+
+	case R_386_TLS_LDM:
+	  if (! elf_i386_tls_transition (info, input_bfd,
+					 input_section, contents,
+					 symtab_hdr, sym_hashes,
+					 &r_type, GOT_UNKNOWN, rel,
+					 relend, h, r_symndx))
+	    return FALSE;
+
+	  if (r_type != R_386_TLS_LDM)
+	    {
+	      /* LD->LE transition:
+		 leal foo(%reg), %eax; call ___tls_get_addr.
+		 We change it into:
+		 movl %gs:0, %eax; nop; leal 0(%esi,1), %esi.  */
+	      BFD_ASSERT (r_type == R_386_TLS_LE_32);
+	      memcpy (contents + rel->r_offset - 2,
+		      "\x65\xa1\0\0\0\0\x90\x8d\x74\x26", 11);
+	      /* Skip R_386_PC32/R_386_PLT32.  */
+	      rel++;
+	      continue;
+	    }
+
+	  if (htab->elf.sgot == NULL)
+	    abort ();
+
+	  off = htab->tls_ldm_got.offset;
+	  if (off & 1)
+	    off &= ~1;
+	  else
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_byte *loc;
+
+	      if (htab->elf.srelgot == NULL)
+		abort ();
+
+	      outrel.r_offset = (htab->elf.sgot->output_section->vma
+				 + htab->elf.sgot->output_offset + off);
+
+	      bfd_put_32 (output_bfd, 0,
+			  htab->elf.sgot->contents + off);
+	      bfd_put_32 (output_bfd, 0,
+			  htab->elf.sgot->contents + off + 4);
+	      outrel.r_info = ELF32_R_INFO (0, R_386_TLS_DTPMOD32);
+	      loc = htab->elf.srelgot->contents;
+	      loc += htab->elf.srelgot->reloc_count++ * sizeof (Elf32_External_Rel);
+	      bfd_elf32_swap_reloc_out (output_bfd, &outrel, loc);
+	      htab->tls_ldm_got.offset |= 1;
+	    }
+	  relocation = htab->elf.sgot->output_section->vma
+		       + htab->elf.sgot->output_offset + off
+		       - htab->elf.sgotplt->output_section->vma
+		       - htab->elf.sgotplt->output_offset;
+	  unresolved_reloc = FALSE;
+	  break;
+
+	case R_386_TLS_LDO_32:
+	  if (!info->executable || (input_section->flags & SEC_CODE) == 0)
+	    relocation -= elf_i386_dtpoff_base (info);
+	  else
+	    /* When converting LDO to LE, we must negate.  */
+	    relocation = -elf_i386_tpoff (info, relocation);
+	  break;
+
+	case R_386_TLS_LE_32:
+	case R_386_TLS_LE:
+	  if (!info->executable)
+	    {
+	      Elf_Internal_Rela outrel;
+	      asection *sreloc;
+	      bfd_byte *loc;
+
+	      outrel.r_offset = rel->r_offset
+				+ input_section->output_section->vma
+				+ input_section->output_offset;
+	      if (h != NULL && h->dynindx != -1)
+		indx = h->dynindx;
+	      else
+		indx = 0;
+	      if (r_type == R_386_TLS_LE_32)
+		outrel.r_info = ELF32_R_INFO (indx, R_386_TLS_TPOFF32);
+	      else
+		outrel.r_info = ELF32_R_INFO (indx, R_386_TLS_TPOFF);
+	      sreloc = elf_section_data (input_section)->sreloc;
+	      if (sreloc == NULL)
+		abort ();
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rel);
+	      bfd_elf32_swap_reloc_out (output_bfd, &outrel, loc);
+	      if (indx)
+		continue;
+	      else if (r_type == R_386_TLS_LE_32)
+		relocation = elf_i386_dtpoff_base (info) - relocation;
+	      else
+		relocation -= elf_i386_dtpoff_base (info);
+	    }
+	  else if (r_type == R_386_TLS_LE_32)
+	    relocation = elf_i386_tpoff (info, relocation);
+	  else
+	    relocation = -elf_i386_tpoff (info, relocation);
+	  break;
+
+	default:
+	  break;
+	}
+
+      /* Dynamic relocs are not propagated for SEC_DEBUGGING sections
+	 because such sections are not SEC_ALLOC and thus ld.so will
+	 not process them.  */
+      if (unresolved_reloc
+	  && !((input_section->flags & SEC_DEBUGGING) != 0
+	       && h->def_dynamic))
+	{
+	  (*_bfd_error_handler)
+	    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+	     input_bfd,
+	     input_section,
+	     (long) rel->r_offset,
+	     howto->name,
+	     h->root.root.string);
+	  return FALSE;
+	}
+
+do_relocation:
+      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+				    contents, rel->r_offset,
+				    relocation, 0);
+
+check_relocation_error:
+      if (r != bfd_reloc_ok)
+	{
+	  const char *name;
+
+	  if (h != NULL)
+	    name = h->root.root.string;
+	  else
+	    {
+	      name = bfd_elf_string_from_elf_section (input_bfd,
+						      symtab_hdr->sh_link,
+						      sym->st_name);
+	      if (name == NULL)
+		return FALSE;
+	      if (*name == '\0')
+		name = bfd_section_name (input_bfd, sec);
+	    }
+
+	  if (r == bfd_reloc_overflow)
+	    {
+	      if (! ((*info->callbacks->reloc_overflow)
+		     (info, (h ? &h->root : NULL), name, howto->name,
+		      (bfd_vma) 0, input_bfd, input_section,
+		      rel->r_offset)))
+		return FALSE;
+	    }
+	  else
+	    {
+	      (*_bfd_error_handler)
+		(_("%B(%A+0x%lx): reloc against `%s': error %d"),
+		 input_bfd, input_section,
+		 (long) rel->r_offset, name, (int) r);
+	      return FALSE;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+elf_i386_finish_dynamic_symbol (bfd *output_bfd,
+				struct bfd_link_info *info,
+				struct elf_link_hash_entry *h,
+				Elf_Internal_Sym *sym)
+{
+  struct elf_i386_link_hash_table *htab;
+  unsigned plt_entry_size;
+  const struct elf_i386_backend_data *abed;
+
+  htab = elf_i386_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  abed = get_elf_i386_backend_data (output_bfd);
+  plt_entry_size = GET_PLT_ENTRY_SIZE (output_bfd);
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      bfd_vma plt_index;
+      bfd_vma got_offset;
+      Elf_Internal_Rela rel;
+      bfd_byte *loc;
+      asection *plt, *gotplt, *relplt;
+
+      /* When building a static executable, use .iplt, .igot.plt and
+	 .rel.iplt sections for STT_GNU_IFUNC symbols.  */
+      if (htab->elf.splt != NULL)
+	{
+	  plt = htab->elf.splt;
+	  gotplt = htab->elf.sgotplt;
+	  relplt = htab->elf.srelplt;
+	}
+      else
+	{
+	  plt = htab->elf.iplt;
+	  gotplt = htab->elf.igotplt;
+	  relplt = htab->elf.irelplt;
+	}
+
+      /* This symbol has an entry in the procedure linkage table.  Set
+	 it up.  */
+
+      if ((h->dynindx == -1
+	   && !((h->forced_local || info->executable)
+		&& h->def_regular
+		&& h->type == STT_GNU_IFUNC))
+	  || plt == NULL
+	  || gotplt == NULL
+	  || relplt == NULL)
+	return FALSE;
+
+      /* Get the index in the procedure linkage table which
+	 corresponds to this symbol.  This is the index of this symbol
+	 in all the symbols for which we are making plt entries.  The
+	 first entry in the procedure linkage table is reserved.
+
+	 Get the offset into the .got table of the entry that
+	 corresponds to this function.  Each .got entry is 4 bytes.
+	 The first three are reserved.
+
+	 For static executables, we don't reserve anything.  */
+
+      if (plt == htab->elf.splt)
+	{
+	  plt_index = h->plt.offset / plt_entry_size - 1;
+	  got_offset = (plt_index + 3) * 4;
+	}
+      else
+	{
+	  plt_index = h->plt.offset / plt_entry_size;
+	  got_offset = plt_index * 4;
+	}
+
+      /* Fill in the entry in the procedure linkage table.  */
+      if (! info->shared)
+	{
+	  memcpy (plt->contents + h->plt.offset, abed->plt->plt_entry,
+		  abed->plt->plt_entry_size);
+	  bfd_put_32 (output_bfd,
+		      (gotplt->output_section->vma
+		       + gotplt->output_offset
+		       + got_offset),
+		      plt->contents + h->plt.offset
+                      + abed->plt->plt_got_offset);
+
+	  if (abed->is_vxworks)
+	    {
+	      int s, k, reloc_index;
+
+	      /* Create the R_386_32 relocation referencing the GOT
+		 for this PLT entry.  */
+
+	      /* S: Current slot number (zero-based).  */
+	      s = ((h->plt.offset - abed->plt->plt_entry_size)
+                   / abed->plt->plt_entry_size);
+	      /* K: Number of relocations for PLTResolve. */
+	      if (info->shared)
+		k = PLTRESOLVE_RELOCS_SHLIB;
+	      else
+		k = PLTRESOLVE_RELOCS;
+	      /* Skip the PLTresolve relocations, and the relocations for
+		 the other PLT slots. */
+	      reloc_index = k + s * PLT_NON_JUMP_SLOT_RELOCS;
+	      loc = (htab->srelplt2->contents + reloc_index
+		     * sizeof (Elf32_External_Rel));
+
+	      rel.r_offset = (htab->elf.splt->output_section->vma
+			      + htab->elf.splt->output_offset
+			      + h->plt.offset + 2),
+	      rel.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_386_32);
+	      bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
+
+	      /* Create the R_386_32 relocation referencing the beginning of
+		 the PLT for this GOT entry.  */
+	      rel.r_offset = (htab->elf.sgotplt->output_section->vma
+			      + htab->elf.sgotplt->output_offset
+			      + got_offset);
+	      rel.r_info = ELF32_R_INFO (htab->elf.hplt->indx, R_386_32);
+	      bfd_elf32_swap_reloc_out (output_bfd, &rel,
+	      loc + sizeof (Elf32_External_Rel));
+	    }
+	}
+      else
+	{
+	  memcpy (plt->contents + h->plt.offset, abed->plt->pic_plt_entry,
+		  abed->plt->plt_entry_size);
+	  bfd_put_32 (output_bfd, got_offset,
+		      plt->contents + h->plt.offset
+                      + abed->plt->plt_got_offset);
+	}
+
+      /* Don't fill PLT entry for static executables.  */
+      if (plt == htab->elf.splt)
+	{
+	  bfd_put_32 (output_bfd, plt_index * sizeof (Elf32_External_Rel),
+		      plt->contents + h->plt.offset
+                      + abed->plt->plt_reloc_offset);
+	  bfd_put_32 (output_bfd, - (h->plt.offset
+                                     + abed->plt->plt_plt_offset + 4),
+		      plt->contents + h->plt.offset
+                      + abed->plt->plt_plt_offset);
+	}
+
+      /* Fill in the entry in the global offset table.  */
+      bfd_put_32 (output_bfd,
+		  (plt->output_section->vma
+		   + plt->output_offset
+		   + h->plt.offset
+		   + abed->plt->plt_lazy_offset),
+		  gotplt->contents + got_offset);
+
+      /* Fill in the entry in the .rel.plt section.  */
+      rel.r_offset = (gotplt->output_section->vma
+		      + gotplt->output_offset
+		      + got_offset);
+      if (h->dynindx == -1
+	  || ((info->executable
+	       || ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	      && h->def_regular
+	       && h->type == STT_GNU_IFUNC))
+	{
+	  /* If an STT_GNU_IFUNC symbol is locally defined, generate
+	     R_386_IRELATIVE instead of R_386_JUMP_SLOT.  Store addend
+	     in the .got.plt section.  */
+	  bfd_put_32 (output_bfd,
+		      (h->root.u.def.value
+		       + h->root.u.def.section->output_section->vma
+		       + h->root.u.def.section->output_offset),
+		      gotplt->contents + got_offset);
+	  rel.r_info = ELF32_R_INFO (0, R_386_IRELATIVE);
+	}
+      else
+	rel.r_info = ELF32_R_INFO (h->dynindx, R_386_JUMP_SLOT);
+      loc = relplt->contents + plt_index * sizeof (Elf32_External_Rel);
+      bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
+
+      if (!h->def_regular)
+	{
+	  /* Mark the symbol as undefined, rather than as defined in
+	     the .plt section.  Leave the value if there were any
+	     relocations where pointer equality matters (this is a clue
+	     for the dynamic linker, to make function pointer
+	     comparisons work between an application and shared
+	     library), otherwise set it to zero.  If a function is only
+	     called from a binary, there is no need to slow down
+	     shared libraries because of that.  */
+	  sym->st_shndx = SHN_UNDEF;
+	  if (!h->pointer_equality_needed)
+	    sym->st_value = 0;
+	}
+    }
+
+  if (h->got.offset != (bfd_vma) -1
+      && ! GOT_TLS_GD_ANY_P (elf_i386_hash_entry(h)->tls_type)
+      && (elf_i386_hash_entry(h)->tls_type & GOT_TLS_IE) == 0)
+    {
+      Elf_Internal_Rela rel;
+      bfd_byte *loc;
+
+      /* This symbol has an entry in the global offset table.  Set it
+	 up.  */
+
+      if (htab->elf.sgot == NULL || htab->elf.srelgot == NULL)
+	abort ();
+
+      rel.r_offset = (htab->elf.sgot->output_section->vma
+		      + htab->elf.sgot->output_offset
+		      + (h->got.offset & ~(bfd_vma) 1));
+
+      /* If this is a static link, or it is a -Bsymbolic link and the
+	 symbol is defined locally or was forced to be local because
+	 of a version file, we just want to emit a RELATIVE reloc.
+	 The entry in the global offset table will already have been
+	 initialized in the relocate_section function.  */
+      if (h->def_regular
+	  && h->type == STT_GNU_IFUNC)
+	{
+	  if (info->shared)
+	    {
+	      /* Generate R_386_GLOB_DAT.  */
+	      goto do_glob_dat;
+	    }
+	  else
+	    {
+	      asection *plt;
+
+	      if (!h->pointer_equality_needed)
+		abort ();
+
+	      /* For non-shared object, we can't use .got.plt, which
+		 contains the real function addres if we need pointer
+		 equality.  We load the GOT entry with the PLT entry.  */
+	      plt = htab->elf.splt ? htab->elf.splt : htab->elf.iplt;
+	      bfd_put_32 (output_bfd,
+			  (plt->output_section->vma
+			   + plt->output_offset + h->plt.offset),
+			  htab->elf.sgot->contents + h->got.offset);
+	      return TRUE;
+	    }
+	}
+      else if (info->shared
+	       && SYMBOL_REFERENCES_LOCAL (info, h))
+	{
+	  BFD_ASSERT((h->got.offset & 1) != 0);
+	  rel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);
+	}
+      else
+	{
+	  BFD_ASSERT((h->got.offset & 1) == 0);
+do_glob_dat:
+	  bfd_put_32 (output_bfd, (bfd_vma) 0,
+		      htab->elf.sgot->contents + h->got.offset);
+	  rel.r_info = ELF32_R_INFO (h->dynindx, R_386_GLOB_DAT);
+	}
+
+      loc = htab->elf.srelgot->contents;
+      loc += htab->elf.srelgot->reloc_count++ * sizeof (Elf32_External_Rel);
+      bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
+    }
+
+  if (h->needs_copy)
+    {
+      Elf_Internal_Rela rel;
+      bfd_byte *loc;
+
+      /* This symbol needs a copy reloc.  Set it up.  */
+
+      if (h->dynindx == -1
+	  || (h->root.type != bfd_link_hash_defined
+	      && h->root.type != bfd_link_hash_defweak)
+	  || htab->srelbss == NULL)
+	abort ();
+
+      rel.r_offset = (h->root.u.def.value
+		      + h->root.u.def.section->output_section->vma
+		      + h->root.u.def.section->output_offset);
+      rel.r_info = ELF32_R_INFO (h->dynindx, R_386_COPY);
+      loc = htab->srelbss->contents;
+      loc += htab->srelbss->reloc_count++ * sizeof (Elf32_External_Rel);
+      bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
+    }
+
+  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  SYM may
+     be NULL for local symbols.
+
+     On VxWorks, the _GLOBAL_OFFSET_TABLE_ symbol is not absolute: it
+     is relative to the ".got" section.  */
+  if (sym != NULL
+      && (strcmp (h->root.root.string, "_DYNAMIC") == 0
+	  || (!abed->is_vxworks
+              && h == htab->elf.hgot)))
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+/* Finish up local dynamic symbol handling.  We set the contents of
+   various dynamic sections here.  */
+
+static bfd_boolean
+elf_i386_finish_local_dynamic_symbol (void **slot, void *inf)
+{
+  struct elf_link_hash_entry *h
+    = (struct elf_link_hash_entry *) *slot;
+  struct bfd_link_info *info
+    = (struct bfd_link_info *) inf;
+
+  return elf_i386_finish_dynamic_symbol (info->output_bfd, info,
+					 h, NULL);
+}
+
+/* Used to decide how to sort relocs in an optimal manner for the
+   dynamic linker, before writing them out.  */
+
+static enum elf_reloc_type_class
+elf_i386_reloc_type_class (const Elf_Internal_Rela *rela)
+{
+  switch (ELF32_R_TYPE (rela->r_info))
+    {
+    case R_386_RELATIVE:
+      return reloc_class_relative;
+    case R_386_JUMP_SLOT:
+      return reloc_class_plt;
+    case R_386_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+elf_i386_finish_dynamic_sections (bfd *output_bfd,
+				  struct bfd_link_info *info)
+{
+  struct elf_i386_link_hash_table *htab;
+  bfd *dynobj;
+  asection *sdyn;
+  const struct elf_i386_backend_data *abed;
+
+  htab = elf_i386_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = htab->elf.dynobj;
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+  abed = get_elf_i386_backend_data (output_bfd);
+
+  if (htab->elf.dynamic_sections_created)
+    {
+      Elf32_External_Dyn *dyncon, *dynconend;
+
+      if (sdyn == NULL || htab->elf.sgot == NULL)
+	abort ();
+
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+	  asection *s;
+
+	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    default:
+	      if (abed->is_vxworks
+                  && elf_vxworks_finish_dynamic_entry (output_bfd, &dyn))
+		break;
+	      continue;
+
+	    case DT_PLTGOT:
+	      s = htab->elf.sgotplt;
+	      dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+	      break;
+
+	    case DT_JMPREL:
+	      s = htab->elf.srelplt;
+	      dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+	      break;
+
+	    case DT_PLTRELSZ:
+	      s = htab->elf.srelplt;
+	      dyn.d_un.d_val = s->size;
+	      break;
+
+	    case DT_RELSZ:
+	      /* My reading of the SVR4 ABI indicates that the
+		 procedure linkage table relocs (DT_JMPREL) should be
+		 included in the overall relocs (DT_REL).  This is
+		 what Solaris does.  However, UnixWare can not handle
+		 that case.  Therefore, we override the DT_RELSZ entry
+		 here to make it not include the JMPREL relocs.  */
+	      s = htab->elf.srelplt;
+	      if (s == NULL)
+		continue;
+	      dyn.d_un.d_val -= s->size;
+	      break;
+
+	    case DT_REL:
+	      /* We may not be using the standard ELF linker script.
+		 If .rel.plt is the first .rel section, we adjust
+		 DT_REL to not include it.  */
+	      s = htab->elf.srelplt;
+	      if (s == NULL)
+		continue;
+	      if (dyn.d_un.d_ptr != s->output_section->vma + s->output_offset)
+		continue;
+	      dyn.d_un.d_ptr += s->size;
+	      break;
+	    }
+
+	  bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	}
+
+      /* Fill in the first entry in the procedure linkage table.  */
+      if (htab->elf.splt && htab->elf.splt->size > 0)
+	{
+	  if (info->shared)
+	    {
+	      memcpy (htab->elf.splt->contents, abed->plt->pic_plt0_entry,
+		      abed->plt->plt0_entry_size);
+	      memset (htab->elf.splt->contents + abed->plt->plt0_entry_size,
+		      abed->plt0_pad_byte,
+		      abed->plt->plt_entry_size - abed->plt->plt0_entry_size);
+	    }
+	  else
+	    {
+	      memcpy (htab->elf.splt->contents, abed->plt->plt0_entry,
+		      abed->plt->plt0_entry_size);
+	      memset (htab->elf.splt->contents + abed->plt->plt0_entry_size,
+		      abed->plt0_pad_byte,
+		      abed->plt->plt_entry_size - abed->plt->plt0_entry_size);
+	      bfd_put_32 (output_bfd,
+			  (htab->elf.sgotplt->output_section->vma
+			   + htab->elf.sgotplt->output_offset
+			   + 4),
+			  htab->elf.splt->contents
+                          + abed->plt->plt0_got1_offset);
+	      bfd_put_32 (output_bfd,
+			  (htab->elf.sgotplt->output_section->vma
+			   + htab->elf.sgotplt->output_offset
+			   + 8),
+			  htab->elf.splt->contents
+                          + abed->plt->plt0_got2_offset);
+
+	      if (abed->is_vxworks)
+		{
+		  Elf_Internal_Rela rel;
+
+		  /* Generate a relocation for _GLOBAL_OFFSET_TABLE_ + 4.
+		     On IA32 we use REL relocations so the addend goes in
+		     the PLT directly.  */
+		  rel.r_offset = (htab->elf.splt->output_section->vma
+				  + htab->elf.splt->output_offset
+				  + abed->plt->plt0_got1_offset);
+		  rel.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_386_32);
+		  bfd_elf32_swap_reloc_out (output_bfd, &rel,
+					    htab->srelplt2->contents);
+		  /* Generate a relocation for _GLOBAL_OFFSET_TABLE_ + 8.  */
+		  rel.r_offset = (htab->elf.splt->output_section->vma
+				  + htab->elf.splt->output_offset
+				  + abed->plt->plt0_got2_offset);
+		  rel.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_386_32);
+		  bfd_elf32_swap_reloc_out (output_bfd, &rel,
+					    htab->srelplt2->contents +
+					    sizeof (Elf32_External_Rel));
+		}
+	    }
+
+	  /* UnixWare sets the entsize of .plt to 4, although that doesn't
+	     really seem like the right value.  */
+	  elf_section_data (htab->elf.splt->output_section)
+	    ->this_hdr.sh_entsize = 4;
+
+	  /* Correct the .rel.plt.unloaded relocations.  */
+	  if (abed->is_vxworks && !info->shared)
+	    {
+	      int num_plts = (htab->elf.splt->size
+                              / abed->plt->plt_entry_size) - 1;
+	      unsigned char *p;
+
+	      p = htab->srelplt2->contents;
+	      if (info->shared)
+		p += PLTRESOLVE_RELOCS_SHLIB * sizeof (Elf32_External_Rel);
+	      else
+		p += PLTRESOLVE_RELOCS * sizeof (Elf32_External_Rel);
+
+	      for (; num_plts; num_plts--)
+		{
+		  Elf_Internal_Rela rel;
+		  bfd_elf32_swap_reloc_in (output_bfd, p, &rel);
+		  rel.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_386_32);
+		  bfd_elf32_swap_reloc_out (output_bfd, &rel, p);
+		  p += sizeof (Elf32_External_Rel);
+
+		  bfd_elf32_swap_reloc_in (output_bfd, p, &rel);
+		  rel.r_info = ELF32_R_INFO (htab->elf.hplt->indx, R_386_32);
+		  bfd_elf32_swap_reloc_out (output_bfd, &rel, p);
+		  p += sizeof (Elf32_External_Rel);
+		}
+	    }
+	}
+    }
+
+  if (htab->elf.sgotplt)
+    {
+      if (bfd_is_abs_section (htab->elf.sgotplt->output_section))
+	{
+	  (*_bfd_error_handler)
+	    (_("discarded output section: `%A'"), htab->elf.sgotplt);
+	  return FALSE;
+	}
+
+      /* Fill in the first three entries in the global offset table.  */
+      if (htab->elf.sgotplt->size > 0)
+	{
+	  bfd_put_32 (output_bfd,
+		      (sdyn == NULL ? 0
+		       : sdyn->output_section->vma + sdyn->output_offset),
+		      htab->elf.sgotplt->contents);
+	  bfd_put_32 (output_bfd, 0, htab->elf.sgotplt->contents + 4);
+	  bfd_put_32 (output_bfd, 0, htab->elf.sgotplt->contents + 8);
+	}
+
+      elf_section_data (htab->elf.sgotplt->output_section)->this_hdr.sh_entsize = 4;
+    }
+
+  /* Adjust .eh_frame for .plt section.  */
+  if (htab->plt_eh_frame != NULL)
+    {
+      if (htab->elf.splt != NULL
+	  && htab->elf.splt->size != 0
+	  && (htab->elf.splt->flags & SEC_EXCLUDE) == 0
+	  && htab->elf.splt->output_section != NULL
+	  && htab->plt_eh_frame->output_section != NULL)
+	{
+	  bfd_vma plt_start = htab->elf.splt->output_section->vma;
+	  bfd_vma eh_frame_start = htab->plt_eh_frame->output_section->vma
+				   + htab->plt_eh_frame->output_offset
+				   + PLT_FDE_START_OFFSET;
+	  bfd_put_signed_32 (dynobj, plt_start - eh_frame_start,
+			     htab->plt_eh_frame->contents
+			     + PLT_FDE_START_OFFSET);
+	}
+      if (htab->plt_eh_frame->sec_info_type
+	  == ELF_INFO_TYPE_EH_FRAME)
+	{
+	  if (! _bfd_elf_write_section_eh_frame (output_bfd, info,
+						 htab->plt_eh_frame,
+						 htab->plt_eh_frame->contents))
+	    return FALSE;
+	}
+    }
+
+  if (htab->elf.sgot && htab->elf.sgot->size > 0)
+    elf_section_data (htab->elf.sgot->output_section)->this_hdr.sh_entsize = 4;
+
+  /* Fill PLT and GOT entries for local STT_GNU_IFUNC symbols.  */
+  htab_traverse (htab->loc_hash_table,
+		 elf_i386_finish_local_dynamic_symbol,
+		 info);
+
+  return TRUE;
+}
+
+/* Return address for Ith PLT stub in section PLT, for relocation REL
+   or (bfd_vma) -1 if it should not be included.  */
+
+static bfd_vma
+elf_i386_plt_sym_val (bfd_vma i, const asection *plt,
+		      const arelent *rel ATTRIBUTE_UNUSED)
+{
+  return plt->vma + (i + 1) * GET_PLT_ENTRY_SIZE (plt->owner);
+}
+
+/* Return TRUE if symbol should be hashed in the `.gnu.hash' section.  */
+
+static bfd_boolean
+elf_i386_hash_symbol (struct elf_link_hash_entry *h)
+{
+  if (h->plt.offset != (bfd_vma) -1
+      && !h->def_regular
+      && !h->pointer_equality_needed)
+    return FALSE;
+
+  return _bfd_elf_hash_symbol (h);
+}
+
+/* Hook called by the linker routine which adds symbols from an object
+   file.  */
+
+static bfd_boolean
+elf_i386_add_symbol_hook (bfd * abfd,
+			  struct bfd_link_info * info ATTRIBUTE_UNUSED,
+			  Elf_Internal_Sym * sym,
+			  const char ** namep ATTRIBUTE_UNUSED,
+			  flagword * flagsp ATTRIBUTE_UNUSED,
+			  asection ** secp ATTRIBUTE_UNUSED,
+			  bfd_vma * valp ATTRIBUTE_UNUSED)
+{
+  if ((abfd->flags & DYNAMIC) == 0
+      && (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC
+	  || ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE))
+    elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE;
+
+  return TRUE;
+}
+
+#define TARGET_LITTLE_SYM		bfd_elf32_i386_vec
+#define TARGET_LITTLE_NAME		"elf32-i386"
+#define ELF_ARCH			bfd_arch_i386
+#define ELF_TARGET_ID			I386_ELF_DATA
+#define ELF_MACHINE_CODE		EM_386
+#define ELF_MAXPAGESIZE			0x1000
+
+#define elf_backend_can_gc_sections	1
+#define elf_backend_can_refcount	1
+#define elf_backend_want_got_plt	1
+#define elf_backend_plt_readonly	1
+#define elf_backend_want_plt_sym	0
+#define elf_backend_got_header_size	12
+#define elf_backend_plt_alignment	4
+
+/* Support RELA for objdump of prelink objects.  */
+#define elf_info_to_howto		      elf_i386_info_to_howto_rel
+#define elf_info_to_howto_rel		      elf_i386_info_to_howto_rel
+
+#define bfd_elf32_mkobject		      elf_i386_mkobject
+
+#define bfd_elf32_bfd_is_local_label_name     elf_i386_is_local_label_name
+#define bfd_elf32_bfd_link_hash_table_create  elf_i386_link_hash_table_create
+#define bfd_elf32_bfd_link_hash_table_free    elf_i386_link_hash_table_free
+#define bfd_elf32_bfd_reloc_type_lookup	      elf_i386_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup	      elf_i386_reloc_name_lookup
+
+#define elf_backend_adjust_dynamic_symbol     elf_i386_adjust_dynamic_symbol
+#define elf_backend_relocs_compatible	      _bfd_elf_relocs_compatible
+#define elf_backend_check_relocs	      elf_i386_check_relocs
+#define elf_backend_copy_indirect_symbol      elf_i386_copy_indirect_symbol
+#define elf_backend_create_dynamic_sections   elf_i386_create_dynamic_sections
+#define elf_backend_fake_sections	      elf_i386_fake_sections
+#define elf_backend_finish_dynamic_sections   elf_i386_finish_dynamic_sections
+#define elf_backend_finish_dynamic_symbol     elf_i386_finish_dynamic_symbol
+#define elf_backend_gc_mark_hook	      elf_i386_gc_mark_hook
+#define elf_backend_gc_sweep_hook	      elf_i386_gc_sweep_hook
+#define elf_backend_grok_prstatus	      elf_i386_grok_prstatus
+#define elf_backend_grok_psinfo		      elf_i386_grok_psinfo
+#define elf_backend_reloc_type_class	      elf_i386_reloc_type_class
+#define elf_backend_relocate_section	      elf_i386_relocate_section
+#define elf_backend_size_dynamic_sections     elf_i386_size_dynamic_sections
+#define elf_backend_always_size_sections      elf_i386_always_size_sections
+#define elf_backend_omit_section_dynsym \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true)
+#define elf_backend_plt_sym_val		      elf_i386_plt_sym_val
+#define elf_backend_hash_symbol		      elf_i386_hash_symbol
+#define elf_backend_add_symbol_hook           elf_i386_add_symbol_hook
+#undef	elf_backend_post_process_headers
+#define	elf_backend_post_process_headers	_bfd_elf_set_osabi
+
+#include "elf32-target.h"
+
+/* FreeBSD support.  */
+
+#undef	TARGET_LITTLE_SYM
+#define	TARGET_LITTLE_SYM		bfd_elf32_i386_freebsd_vec
+#undef	TARGET_LITTLE_NAME
+#define	TARGET_LITTLE_NAME		"elf32-i386-freebsd"
+#undef	ELF_OSABI
+#define	ELF_OSABI			ELFOSABI_FREEBSD
+
+/* The kernel recognizes executables as valid only if they carry a
+   "FreeBSD" label in the ELF header.  So we put this label on all
+   executables and (for simplicity) also all other object files.  */
+
+static void
+elf_i386_fbsd_post_process_headers (bfd *abfd, struct bfd_link_info *info)
+{
+  _bfd_elf_set_osabi (abfd, info);
+
+#ifdef OLD_FREEBSD_ABI_LABEL
+  /* The ABI label supported by FreeBSD <= 4.0 is quite nonstandard.  */
+  memcpy (&i_ehdrp->e_ident[EI_ABIVERSION], "FreeBSD", 8);
+#endif
+}
+
+#undef	elf_backend_post_process_headers
+#define	elf_backend_post_process_headers	elf_i386_fbsd_post_process_headers
+#undef	elf32_bed
+#define	elf32_bed				elf32_i386_fbsd_bed
+
+#undef elf_backend_add_symbol_hook
+
+#include "elf32-target.h"
+
+/* Solaris 2.  */
+
+#undef	TARGET_LITTLE_SYM
+#define	TARGET_LITTLE_SYM		bfd_elf32_i386_sol2_vec
+#undef	TARGET_LITTLE_NAME
+#define	TARGET_LITTLE_NAME		"elf32-i386-sol2"
+
+/* Restore default: we cannot use ELFOSABI_SOLARIS, otherwise ELFOSABI_NONE
+   objects won't be recognized.  */
+#undef ELF_OSABI
+
+#undef	elf32_bed
+#define	elf32_bed			elf32_i386_sol2_bed
+
+/* The 32-bit static TLS arena size is rounded to the nearest 8-byte
+   boundary.  */
+#undef elf_backend_static_tls_alignment
+#define elf_backend_static_tls_alignment 8
+
+/* The Solaris 2 ABI requires a plt symbol on all platforms.
+
+   Cf. Linker and Libraries Guide, Ch. 2, Link-Editor, Generating the Output
+   File, p.63.  */
+#undef elf_backend_want_plt_sym
+#define elf_backend_want_plt_sym	1
+
+#include "elf32-target.h"
+
+/* Native Client support.  */
+
+#undef	TARGET_LITTLE_SYM
+#define	TARGET_LITTLE_SYM		bfd_elf32_i386_nacl_vec
+#undef	TARGET_LITTLE_NAME
+#define	TARGET_LITTLE_NAME		"elf32-i386-nacl"
+#undef	elf32_bed
+#define	elf32_bed			elf32_i386_nacl_bed
+
+#undef	ELF_MAXPAGESIZE
+#define	ELF_MAXPAGESIZE			0x10000
+
+/* Restore defaults.  */
+#undef	ELF_OSABI
+#undef	elf_backend_want_plt_sym
+#define elf_backend_want_plt_sym	0
+#undef	elf_backend_post_process_headers
+#define	elf_backend_post_process_headers	_bfd_elf_set_osabi
+#undef	elf_backend_static_tls_alignment
+
+/* NaCl uses substantially different PLT entries for the same effects.  */
+
+#undef	elf_backend_plt_alignment
+#define elf_backend_plt_alignment	5
+#define NACL_PLT_ENTRY_SIZE		64
+#define	NACLMASK			0xe0 /* 32-byte alignment mask.  */
+
+static const bfd_byte elf_i386_nacl_plt0_entry[] =
+  {
+    0xff, 0x35,			  /* pushl contents of address */
+    0, 0, 0, 0,			  /* replaced with address of .got + 4.	 */
+    0x8b, 0x0d,                   /* movl contents of address, %ecx */
+    0, 0, 0, 0,			  /* replaced with address of .got + 8.	 */
+    0x83, 0xe1, NACLMASK,	  /* andl $NACLMASK, %ecx */
+    0xff, 0xe1			  /* jmp *%ecx */
+  };
+
+static const bfd_byte elf_i386_nacl_plt_entry[NACL_PLT_ENTRY_SIZE] =
+  {
+    0x8b, 0x0d,				/* movl contents of address, %ecx */
+    0, 0, 0, 0,				/* replaced with GOT slot address.  */
+    0x83, 0xe1, NACLMASK,		/* andl $NACLMASK, %ecx */
+    0xff, 0xe1,				/* jmp *%ecx */
+
+    /* Pad to the next 32-byte boundary with nop instructions.	*/
+    0x90,
+    0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
+    0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
+
+    /* Lazy GOT entries point here (32-byte aligned).  */
+    0x68,			       /* pushl immediate */
+    0, 0, 0, 0,			       /* replaced with reloc offset.  */
+    0xe9,			       /* jmp relative */
+    0, 0, 0, 0,			       /* replaced with offset to .plt.	 */
+
+    /* Pad to the next 32-byte boundary with nop instructions.	*/
+    0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
+    0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
+    0x90, 0x90
+  };
+
+static const bfd_byte
+elf_i386_nacl_pic_plt0_entry[sizeof (elf_i386_nacl_plt0_entry)] =
+  {
+    0xff, 0x73, 0x04,		/* pushl 4(%ebx) */
+    0x8b, 0x4b, 0x08,		/* mov 0x8(%ebx), %ecx */
+    0x83, 0xe1, 0xe0,		/* and $NACLMASK, %ecx */
+    0xff, 0xe1,			/* jmp *%ecx */
+    0x90                        /* nop */
+  };
+
+static const bfd_byte elf_i386_nacl_pic_plt_entry[NACL_PLT_ENTRY_SIZE] =
+  {
+    0x8b, 0x8b,          /* movl offset(%ebx), %ecx */
+    0, 0, 0, 0,          /* replaced with offset of this symbol in .got.  */
+    0x83, 0xe1, 0xe0,    /* andl $NACLMASK, %ecx */
+    0xff, 0xe1,          /* jmp *%ecx */
+
+    /* Pad to the next 32-byte boundary with nop instructions.	*/
+    0x90,
+    0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
+    0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
+
+    /* Lazy GOT entries point here (32-byte aligned).  */
+    0x68,                /* pushl immediate */
+    0, 0, 0, 0,          /* replaced with offset into relocation table.  */
+    0xe9,                /* jmp relative */
+    0, 0, 0, 0,          /* replaced with offset to start of .plt.  */
+
+    /* Pad to the next 32-byte boundary with nop instructions.	*/
+    0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
+    0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
+    0x90, 0x90
+  };
+
+static const bfd_byte elf_i386_nacl_eh_frame_plt[] =
+  {
+#if (PLT_CIE_LENGTH != 20                               \
+     || PLT_FDE_LENGTH != 36                            \
+     || PLT_FDE_START_OFFSET != 4 + PLT_CIE_LENGTH + 8  \
+     || PLT_FDE_LEN_OFFSET != 4 + PLT_CIE_LENGTH + 12)
+# error "Need elf_i386_backend_data parameters for eh_frame_plt offsets!"
+#endif
+    PLT_CIE_LENGTH, 0, 0, 0,		/* CIE length */
+    0, 0, 0, 0,                         /* CIE ID */
+    1,                                  /* CIE version */
+    'z', 'R', 0,                        /* Augmentation string */
+    1,                                  /* Code alignment factor */
+    0x7c,                               /* Data alignment factor: -4 */
+    8,                                  /* Return address column */
+    1,					/* Augmentation size */
+    DW_EH_PE_pcrel | DW_EH_PE_sdata4,	/* FDE encoding */
+    DW_CFA_def_cfa, 4, 4,		/* DW_CFA_def_cfa: r4 (esp) ofs 4 */
+    DW_CFA_offset + 8, 1,		/* DW_CFA_offset: r8 (eip) at cfa-4 */
+    DW_CFA_nop, DW_CFA_nop,
+
+    PLT_FDE_LENGTH, 0, 0, 0,     /* FDE length */
+    PLT_CIE_LENGTH + 8, 0, 0, 0, /* CIE pointer */
+    0, 0, 0, 0,                  /* R_386_PC32 .plt goes here */
+    0, 0, 0, 0,                  /* .plt size goes here */
+    0,                           /* Augmentation size */
+    DW_CFA_def_cfa_offset, 8,    /* DW_CFA_def_cfa_offset: 8 */
+    DW_CFA_advance_loc + 6,      /* DW_CFA_advance_loc: 6 to __PLT__+6 */
+    DW_CFA_def_cfa_offset, 12,   /* DW_CFA_def_cfa_offset: 12 */
+    DW_CFA_advance_loc + 58,     /* DW_CFA_advance_loc: 58 to __PLT__+64 */
+    DW_CFA_def_cfa_expression,   /* DW_CFA_def_cfa_expression */
+    13,                          /* Block length */
+    DW_OP_breg4, 4,              /* DW_OP_breg4 (esp): 4 */
+    DW_OP_breg8, 0,              /* DW_OP_breg8 (eip): 0 */
+    DW_OP_const1u, 63, DW_OP_and, DW_OP_const1u, 37, DW_OP_ge,
+    DW_OP_lit2, DW_OP_shl, DW_OP_plus,
+    DW_CFA_nop, DW_CFA_nop
+  };
+
+static const struct elf_i386_plt_layout elf_i386_nacl_plt =
+  {
+    elf_i386_nacl_plt0_entry,		/* plt0_entry */
+    sizeof (elf_i386_nacl_plt0_entry),	/* plt0_entry_size */
+    2,					/* plt0_got1_offset */
+    8,					/* plt0_got2_offset */
+    elf_i386_nacl_plt_entry,		/* plt_entry */
+    NACL_PLT_ENTRY_SIZE,		/* plt_entry_size */
+    2,					/* plt_got_offset */
+    33,					/* plt_reloc_offset */
+    38,					/* plt_plt_offset */
+    32,					/* plt_lazy_offset */
+    elf_i386_nacl_pic_plt0_entry,	/* pic_plt0_entry */
+    elf_i386_nacl_pic_plt_entry,	/* pic_plt_entry */
+    elf_i386_nacl_eh_frame_plt,		/* eh_frame_plt */
+    sizeof (elf_i386_nacl_eh_frame_plt),/* eh_frame_plt_size */
+  };
+
+static const struct elf_i386_backend_data elf_i386_nacl_arch_bed =
+  {
+    &elf_i386_nacl_plt,                      /* plt */
+    0x90,				/* plt0_pad_byte: nop insn */
+    0,                                  /* is_vxworks */
+  };
+
+#undef	elf_backend_arch_data
+#define elf_backend_arch_data	&elf_i386_nacl_arch_bed
+
+#include "elf32-target.h"
+
+/* VxWorks support.  */
+
+#undef	TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM		bfd_elf32_i386_vxworks_vec
+#undef	TARGET_LITTLE_NAME
+#define TARGET_LITTLE_NAME		"elf32-i386-vxworks"
+#undef	ELF_OSABI
+#undef	elf_backend_plt_alignment
+#define elf_backend_plt_alignment	4
+
+static const struct elf_i386_backend_data elf_i386_vxworks_arch_bed =
+  {
+    &elf_i386_plt,                      /* plt */
+    0x90,                               /* plt0_pad_byte */
+    1,                                  /* is_vxworks */
+  };
+
+#undef	elf_backend_arch_data
+#define	elf_backend_arch_data	&elf_i386_vxworks_arch_bed
+
+#undef elf_backend_relocs_compatible
+#undef elf_backend_post_process_headers
+#undef elf_backend_add_symbol_hook
+#define elf_backend_add_symbol_hook \
+  elf_vxworks_add_symbol_hook
+#undef elf_backend_link_output_symbol_hook
+#define elf_backend_link_output_symbol_hook \
+  elf_vxworks_link_output_symbol_hook
+#undef elf_backend_emit_relocs
+#define elf_backend_emit_relocs			elf_vxworks_emit_relocs
+#undef elf_backend_final_write_processing
+#define elf_backend_final_write_processing \
+  elf_vxworks_final_write_processing
+#undef elf_backend_static_tls_alignment
+
+/* On VxWorks, we emit relocations against _PROCEDURE_LINKAGE_TABLE_, so
+   define it.  */
+#undef elf_backend_want_plt_sym
+#define elf_backend_want_plt_sym	1
+
+#undef	elf32_bed
+#define elf32_bed				elf32_i386_vxworks_bed
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-i860.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-i860.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-i860.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-i860.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1269 @@
+/* Intel i860 specific support for 32-bit ELF.
+   Copyright 1993, 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007
+   Free Software Foundation, Inc.
+
+   Full i860 support contributed by Jason Eckhardt <jle@cygnus.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/i860.h"
+
+/* special_function for R_860_PC26 relocation.  */
+static bfd_reloc_status_type
+i860_howto_pc26_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+                       arelent *reloc_entry,
+                       asymbol *symbol,
+                       void *data ATTRIBUTE_UNUSED,
+                       asection *input_section,
+                       bfd *output_bfd,
+                       char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma insn;
+  bfd_vma relocation;
+  bfd_byte *addr;
+
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (! reloc_entry->howto->partial_inplace
+	  || reloc_entry->addend == 0))
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  /* Used elf32-mips.c as an example.  */
+  if (bfd_is_und_section (symbol->section)
+      && output_bfd == (bfd *) NULL)
+    return bfd_reloc_undefined;
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  relocation += reloc_entry->addend;
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  /* Adjust for PC-relative relocation.  */
+  relocation -= (input_section->output_section->vma
+                 + input_section->output_offset
+                 + reloc_entry->address
+                 + 4);
+
+  /* Check for target out of range.  */
+  if ((bfd_signed_vma)relocation > (0x3ffffff << 2)
+      || (bfd_signed_vma)relocation < (-0x4000000 << 2))
+    return bfd_reloc_outofrange;
+
+  addr = (bfd_byte *) data + reloc_entry->address;
+  insn = bfd_get_32 (abfd, addr);
+
+  relocation >>= reloc_entry->howto->rightshift;
+  insn = (insn & ~reloc_entry->howto->dst_mask)
+         | (relocation & reloc_entry->howto->dst_mask);
+
+  bfd_put_32 (abfd, (bfd_vma) insn, addr);
+
+  return bfd_reloc_ok;
+}
+
+/* special_function for R_860_PC16 relocation.  */
+static bfd_reloc_status_type
+i860_howto_pc16_reloc (bfd *abfd,
+                       arelent *reloc_entry,
+                       asymbol *symbol,
+                       void *data,
+                       asection *input_section,
+                       bfd *output_bfd,
+                       char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma insn;
+  bfd_vma relocation;
+  bfd_byte *addr;
+
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (! reloc_entry->howto->partial_inplace
+	  || reloc_entry->addend == 0))
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  /* Used elf32-mips.c as an example.  */
+  if (bfd_is_und_section (symbol->section)
+      && output_bfd == (bfd *) NULL)
+    return bfd_reloc_undefined;
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  relocation += reloc_entry->addend;
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  /* Adjust for PC-relative relocation.  */
+  relocation -= (input_section->output_section->vma
+                 + input_section->output_offset
+                 + reloc_entry->address
+                 + 4);
+
+  /* Check for target out of range.  */
+  if ((bfd_signed_vma)relocation > (0x7fff << 2)
+      || (bfd_signed_vma)relocation < (-0x8000 << 2))
+    return bfd_reloc_outofrange;
+
+  addr = (bfd_byte *) data + reloc_entry->address;
+  insn = bfd_get_32 (abfd, addr);
+
+  relocation >>= reloc_entry->howto->rightshift;
+  relocation = (((relocation & 0xf800) << 5) | (relocation & 0x7ff))
+               & reloc_entry->howto->dst_mask;
+  insn = (insn & ~reloc_entry->howto->dst_mask) | relocation;
+
+  bfd_put_32 (abfd, (bfd_vma) insn, addr);
+
+  return bfd_reloc_ok;
+}
+
+/* special_function for R_860_HIGHADJ relocation.  */
+static bfd_reloc_status_type
+i860_howto_highadj_reloc (bfd *abfd,
+                          arelent *reloc_entry,
+                          asymbol *symbol,
+                          void *data,
+                          asection *input_section,
+                          bfd *output_bfd,
+                          char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma insn;
+  bfd_vma relocation;
+  bfd_byte *addr;
+
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (! reloc_entry->howto->partial_inplace
+	  || reloc_entry->addend == 0))
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  /* Used elf32-mips.c as an example.  */
+  if (bfd_is_und_section (symbol->section)
+      && output_bfd == (bfd *) NULL)
+    return bfd_reloc_undefined;
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  relocation += reloc_entry->addend;
+  relocation += 0x8000;
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  addr = (bfd_byte *) data + reloc_entry->address;
+  insn = bfd_get_32 (abfd, addr);
+
+  relocation = ((relocation >> 16) & 0xffff);
+
+  insn = (insn & 0xffff0000) | relocation;
+
+  bfd_put_32 (abfd, (bfd_vma) insn, addr);
+
+  return bfd_reloc_ok;
+}
+
+/* special_function for R_860_SPLITn relocations.  */
+static bfd_reloc_status_type
+i860_howto_splitn_reloc (bfd *abfd,
+                         arelent *reloc_entry,
+                         asymbol *symbol,
+                         void *data,
+                         asection *input_section,
+                         bfd *output_bfd,
+                         char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma insn;
+  bfd_vma relocation;
+  bfd_byte *addr;
+
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (! reloc_entry->howto->partial_inplace
+	  || reloc_entry->addend == 0))
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  /* Used elf32-mips.c as an example.  */
+  if (bfd_is_und_section (symbol->section)
+      && output_bfd == (bfd *) NULL)
+    return bfd_reloc_undefined;
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  relocation += reloc_entry->addend;
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  addr = (bfd_byte *) data + reloc_entry->address;
+  insn = bfd_get_32 (abfd, addr);
+
+  relocation = (((relocation & 0xf800) << 5) | (relocation & 0x7ff))
+               & reloc_entry->howto->dst_mask;
+  insn = (insn & ~reloc_entry->howto->dst_mask) | relocation;
+
+  bfd_put_32 (abfd, (bfd_vma) insn, addr);
+
+  return bfd_reloc_ok;
+}
+
+/* This howto table is preliminary.  */
+static reloc_howto_type elf32_i860_howto_table [] =
+{
+  /* This relocation does nothing.  */
+  HOWTO (R_860_NONE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32-bit absolute relocation.  */
+  HOWTO (R_860_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_860_COPY,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_COPY",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_860_GLOB_DAT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_GLOB_DAT",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_860_JUMP_SLOT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_JUMP_SLOT",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_860_RELATIVE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_RELATIVE",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 26-bit PC-relative relocation.  */
+  HOWTO (R_860_PC26,	        /* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 i860_howto_pc26_reloc,	/* special_function */
+	 "R_860_PC26",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x3ffffff,		/* src_mask */
+	 0x3ffffff,		/* dst_mask */
+	 TRUE),		        /* pcrel_offset */
+
+  HOWTO (R_860_PLT26,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_PLT26",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),		        /* pcrel_offset */
+
+  /* A 16-bit PC-relative relocation.  */
+  HOWTO (R_860_PC16,	        /* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 i860_howto_pc16_reloc,	/* special_function */
+	 "R_860_PC16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x1f07ff,		/* src_mask */
+	 0x1f07ff,		/* dst_mask */
+	 TRUE),		        /* pcrel_offset */
+
+  HOWTO (R_860_LOW0,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_LOW0",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  HOWTO (R_860_SPLIT0,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 i860_howto_splitn_reloc, /* special_function */
+	 "R_860_SPLIT0",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x1f07ff,		/* src_mask */
+	 0x1f07ff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  HOWTO (R_860_LOW1,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_LOW1",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xfffe,		/* src_mask */
+	 0xfffe,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  HOWTO (R_860_SPLIT1,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 i860_howto_splitn_reloc, /* special_function */
+	 "R_860_SPLIT1",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x1f07fe,		/* src_mask */
+	 0x1f07fe,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  HOWTO (R_860_LOW2,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_LOW2",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xfffc,		/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  HOWTO (R_860_SPLIT2,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 i860_howto_splitn_reloc, /* special_function */
+	 "R_860_SPLIT2",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x1f07fc,		/* src_mask */
+	 0x1f07fc,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  HOWTO (R_860_LOW3,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_LOW3",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xfff8,		/* src_mask */
+	 0xfff8,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  HOWTO (R_860_LOGOT0,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_LOGOT0",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),		        /* pcrel_offset */
+
+  HOWTO (R_860_SPGOT0,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_SPGOT0",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),		        /* pcrel_offset */
+
+  HOWTO (R_860_LOGOT1,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_LOGOT1",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),		        /* pcrel_offset */
+
+  HOWTO (R_860_SPGOT1,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_SPGOT1",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),		        /* pcrel_offset */
+
+  HOWTO (R_860_LOGOTOFF0,        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_LOGOTOFF0",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  HOWTO (R_860_SPGOTOFF0,        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_SPGOTOFF0",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  HOWTO (R_860_LOGOTOFF1,        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_LOGOTOFF1",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  HOWTO (R_860_SPGOTOFF1,       /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_SPGOTOFF1",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  HOWTO (R_860_LOGOTOFF2,        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_LOGOTOFF2",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  HOWTO (R_860_LOGOTOFF3,        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_LOGOTOFF3",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  HOWTO (R_860_LOPC,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_LOPC",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),		        /* pcrel_offset */
+
+  HOWTO (R_860_HIGHADJ,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 i860_howto_highadj_reloc, /* special_function */
+	 "R_860_HIGHADJ",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  HOWTO (R_860_HAGOT,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_HAGOT",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),		        /* pcrel_offset */
+
+  HOWTO (R_860_HAGOTOFF,        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_HAGOTOFF",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  HOWTO (R_860_HAPC,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_HAPC",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),		        /* pcrel_offset */
+
+  HOWTO (R_860_HIGH,	        /* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_HIGH",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+
+  HOWTO (R_860_HIGOT,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_HIGOT",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),		        /* pcrel_offset */
+
+  HOWTO (R_860_HIGOTOFF,        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_860_HIGOTOFF",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),	        /* pcrel_offset */
+};
+
+static unsigned char elf_code_to_howto_index[R_860_max + 1];
+
+static reloc_howto_type *
+lookup_howto (unsigned int rtype)
+{
+  static int initialized = 0;
+  int i;
+  int howto_tbl_size = (int) (sizeof (elf32_i860_howto_table)
+			/ sizeof (elf32_i860_howto_table[0]));
+
+  if (! initialized)
+    {
+      initialized = 1;
+      memset (elf_code_to_howto_index, 0xff,
+	      sizeof (elf_code_to_howto_index));
+      for (i = 0; i < howto_tbl_size; i++)
+        elf_code_to_howto_index[elf32_i860_howto_table[i].type] = i;
+    }
+
+  BFD_ASSERT (rtype <= R_860_max);
+  i = elf_code_to_howto_index[rtype];
+  if (i >= howto_tbl_size)
+    return 0;
+  return elf32_i860_howto_table + i;
+}
+
+/* Given a BFD reloc, return the matching HOWTO structure.  */
+static reloc_howto_type *
+elf32_i860_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			      bfd_reloc_code_real_type code)
+{
+  unsigned int rtype;
+
+  switch (code)
+    {
+    case BFD_RELOC_NONE:
+      rtype = R_860_NONE;
+      break;
+    case BFD_RELOC_32:
+      rtype = R_860_32;
+      break;
+    case BFD_RELOC_860_COPY:
+      rtype = R_860_COPY;
+      break;
+    case BFD_RELOC_860_GLOB_DAT:
+      rtype = R_860_GLOB_DAT;
+      break;
+    case BFD_RELOC_860_JUMP_SLOT:
+      rtype = R_860_JUMP_SLOT;
+      break;
+    case BFD_RELOC_860_RELATIVE:
+      rtype = R_860_RELATIVE;
+      break;
+    case BFD_RELOC_860_PC26:
+      rtype = R_860_PC26;
+      break;
+    case BFD_RELOC_860_PLT26:
+      rtype = R_860_PLT26;
+      break;
+    case BFD_RELOC_860_PC16:
+      rtype = R_860_PC16;
+      break;
+    case BFD_RELOC_860_LOW0:
+      rtype = R_860_LOW0;
+      break;
+    case BFD_RELOC_860_SPLIT0:
+      rtype = R_860_SPLIT0;
+      break;
+    case BFD_RELOC_860_LOW1:
+      rtype = R_860_LOW1;
+      break;
+    case BFD_RELOC_860_SPLIT1:
+      rtype = R_860_SPLIT1;
+      break;
+    case BFD_RELOC_860_LOW2:
+      rtype = R_860_LOW2;
+      break;
+    case BFD_RELOC_860_SPLIT2:
+      rtype = R_860_SPLIT2;
+      break;
+    case BFD_RELOC_860_LOW3:
+      rtype = R_860_LOW3;
+      break;
+    case BFD_RELOC_860_LOGOT0:
+      rtype = R_860_LOGOT0;
+      break;
+    case BFD_RELOC_860_SPGOT0:
+      rtype = R_860_SPGOT0;
+      break;
+    case BFD_RELOC_860_LOGOT1:
+      rtype = R_860_LOGOT1;
+      break;
+    case BFD_RELOC_860_SPGOT1:
+      rtype = R_860_SPGOT1;
+      break;
+    case BFD_RELOC_860_LOGOTOFF0:
+      rtype = R_860_LOGOTOFF0;
+      break;
+    case BFD_RELOC_860_SPGOTOFF0:
+      rtype = R_860_SPGOTOFF0;
+      break;
+    case BFD_RELOC_860_LOGOTOFF1:
+      rtype = R_860_LOGOTOFF1;
+      break;
+    case BFD_RELOC_860_SPGOTOFF1:
+      rtype = R_860_SPGOTOFF1;
+      break;
+    case BFD_RELOC_860_LOGOTOFF2:
+      rtype = R_860_LOGOTOFF2;
+      break;
+    case BFD_RELOC_860_LOGOTOFF3:
+      rtype = R_860_LOGOTOFF3;
+      break;
+    case BFD_RELOC_860_LOPC:
+      rtype = R_860_LOPC;
+      break;
+    case BFD_RELOC_860_HIGHADJ:
+      rtype = R_860_HIGHADJ;
+      break;
+    case BFD_RELOC_860_HAGOT:
+      rtype = R_860_HAGOT;
+      break;
+    case BFD_RELOC_860_HAGOTOFF:
+      rtype = R_860_HAGOTOFF;
+      break;
+    case BFD_RELOC_860_HAPC:
+      rtype = R_860_HAPC;
+      break;
+    case BFD_RELOC_860_HIGH:
+      rtype = R_860_HIGH;
+      break;
+    case BFD_RELOC_860_HIGOT:
+      rtype = R_860_HIGOT;
+      break;
+    case BFD_RELOC_860_HIGOTOFF:
+      rtype = R_860_HIGOTOFF;
+      break;
+    default:
+      rtype = 0;
+      break;
+    }
+  return lookup_howto (rtype);
+}
+
+static reloc_howto_type *
+elf32_i860_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			      const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (elf32_i860_howto_table)
+	    / sizeof (elf32_i860_howto_table[0]));
+       i++)
+    if (elf32_i860_howto_table[i].name != NULL
+	&& strcasecmp (elf32_i860_howto_table[i].name, r_name) == 0)
+      return &elf32_i860_howto_table[i];
+
+  return NULL;
+}
+
+/* Given a ELF reloc, return the matching HOWTO structure.  */
+static void
+elf32_i860_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
+			       arelent *bfd_reloc,
+			       Elf_Internal_Rela *elf_reloc)
+{
+  bfd_reloc->howto
+    = lookup_howto ((unsigned) ELF32_R_TYPE (elf_reloc->r_info));
+}
+
+/* Specialized relocation handler for R_860_SPLITn.  These relocations
+   involves a 16-bit field that is split into two contiguous parts.  */
+static bfd_reloc_status_type
+elf32_i860_relocate_splitn (bfd *input_bfd,
+			    Elf_Internal_Rela *rello,
+			    bfd_byte *contents,
+			    bfd_vma value)
+{
+  bfd_vma insn;
+  reloc_howto_type *howto;
+  howto = lookup_howto ((unsigned) ELF32_R_TYPE (rello->r_info));
+  insn = bfd_get_32 (input_bfd, contents + rello->r_offset);
+
+  /* Relocate.  */
+  value += rello->r_addend;
+
+  /* Separate the fields and insert.  */
+  value = (((value & 0xf800) << 5) | (value & 0x7ff)) & howto->dst_mask;
+  insn = (insn & ~howto->dst_mask) | value;
+
+  bfd_put_32 (input_bfd, insn, contents + rello->r_offset);
+  return bfd_reloc_ok;
+}
+
+/* Specialized relocation handler for R_860_PC16.  This relocation
+   involves a 16-bit, PC-relative field that is split into two contiguous
+   parts.  */
+static bfd_reloc_status_type
+elf32_i860_relocate_pc16 (bfd *input_bfd,
+			  asection *input_section,
+			  Elf_Internal_Rela *rello,
+			  bfd_byte *contents,
+			  bfd_vma value)
+{
+  bfd_vma insn;
+  reloc_howto_type *howto;
+  howto = lookup_howto ((unsigned) ELF32_R_TYPE (rello->r_info));
+  insn = bfd_get_32 (input_bfd, contents + rello->r_offset);
+
+  /* Adjust for PC-relative relocation.  */
+  value -= (input_section->output_section->vma
+	    + input_section->output_offset);
+  value -= rello->r_offset;
+
+  /* Relocate.  */
+  value += rello->r_addend;
+
+  /* Adjust the value by 4, then separate the fields and insert.  */
+  value = (value - 4) >> howto->rightshift;
+  value = (((value & 0xf800) << 5) | (value & 0x7ff)) & howto->dst_mask;
+  insn = (insn & ~howto->dst_mask) | value;
+
+  bfd_put_32 (input_bfd, insn, contents + rello->r_offset);
+  return bfd_reloc_ok;
+
+}
+
+/* Specialized relocation handler for R_860_PC26.  This relocation
+   involves a 26-bit, PC-relative field which must be adjusted by 4.  */
+static bfd_reloc_status_type
+elf32_i860_relocate_pc26 (bfd *input_bfd,
+			  asection *input_section,
+			  Elf_Internal_Rela *rello,
+			  bfd_byte *contents,
+			  bfd_vma value)
+{
+  bfd_vma insn;
+  reloc_howto_type *howto;
+  howto = lookup_howto ((unsigned) ELF32_R_TYPE (rello->r_info));
+  insn = bfd_get_32 (input_bfd, contents + rello->r_offset);
+
+  /* Adjust for PC-relative relocation.  */
+  value -= (input_section->output_section->vma
+	    + input_section->output_offset);
+  value -= rello->r_offset;
+
+  /* Relocate.  */
+  value += rello->r_addend;
+
+  /* Adjust value by 4 and insert the field.  */
+  value = ((value - 4) >> howto->rightshift) & howto->dst_mask;
+  insn = (insn & ~howto->dst_mask) | value;
+
+  bfd_put_32 (input_bfd, insn, contents + rello->r_offset);
+  return bfd_reloc_ok;
+
+}
+
+/* Specialized relocation handler for R_860_HIGHADJ.  */
+static bfd_reloc_status_type
+elf32_i860_relocate_highadj (bfd *input_bfd,
+			     Elf_Internal_Rela *rel,
+			     bfd_byte *contents,
+			     bfd_vma value)
+{
+  bfd_vma insn;
+
+  insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+
+  value += rel->r_addend;
+  value += 0x8000; 
+  value = ((value >> 16) & 0xffff);
+
+  insn = (insn & 0xffff0000) | value;
+
+  bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+  return bfd_reloc_ok;
+}
+
+/* Perform a single relocation.  By default we use the standard BFD
+   routines. However, we handle some specially.  */
+static bfd_reloc_status_type
+i860_final_link_relocate (reloc_howto_type *howto,
+			  bfd *input_bfd,
+			  asection *input_section,
+			  bfd_byte *contents,
+			  Elf_Internal_Rela *rel,
+			  bfd_vma relocation)
+{
+  return _bfd_final_link_relocate (howto, input_bfd, input_section,
+				   contents, rel->r_offset, relocation,
+				   rel->r_addend);
+}
+
+/* Relocate an i860 ELF section.
+
+   This is boiler-plate code copied from fr30.
+
+   The RELOCATE_SECTION function is called by the new ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures; if the section
+   actually uses Rel structures, the r_addend field will always be
+   zero.
+
+   This function is responsible for adjusting the section contents as
+   necessary, and (if using Rela relocs and generating a relocatable
+   output file) adjusting the reloc addend as necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.  */
+static bfd_boolean
+elf32_i860_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
+			     struct bfd_link_info *info,
+			     bfd *input_bfd,
+			     asection *input_section,
+			     bfd_byte *contents,
+			     Elf_Internal_Rela *relocs,
+			     Elf_Internal_Sym *local_syms,
+			     asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+
+  symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+  relend     = relocs + input_section->reloc_count;
+
+  for (rel = relocs; rel < relend; rel ++)
+    {
+      reloc_howto_type *           howto;
+      unsigned long                r_symndx;
+      Elf_Internal_Sym *           sym;
+      asection *                   sec;
+      struct elf_link_hash_entry * h;
+      bfd_vma                      relocation;
+      bfd_reloc_status_type        r;
+      const char *                 name = NULL;
+      int                          r_type;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      howto = lookup_howto ((unsigned) ELF32_R_TYPE (rel->r_info));
+      h     = NULL;
+      sym   = NULL;
+      sec   = NULL;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections [r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+
+	  name = bfd_elf_string_from_elf_section
+	    (input_bfd, symtab_hdr->sh_link, sym->st_name);
+	  name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name;
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc, warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      switch (r_type)
+	{
+	default:
+	  r = i860_final_link_relocate (howto, input_bfd, input_section,
+					contents, rel, relocation);
+	  break;
+
+	case R_860_HIGHADJ:
+	  r = elf32_i860_relocate_highadj (input_bfd, rel, contents,
+					   relocation);
+	  break;
+
+	case R_860_PC16:
+	  r = elf32_i860_relocate_pc16 (input_bfd, input_section, rel,
+					contents, relocation);
+	  break;
+
+	case R_860_PC26:
+	  r = elf32_i860_relocate_pc26 (input_bfd, input_section, rel,
+					contents, relocation);
+	  break;
+
+	case R_860_SPLIT0:
+	case R_860_SPLIT1:
+	case R_860_SPLIT2:
+	  r = elf32_i860_relocate_splitn (input_bfd, rel, contents,
+					  relocation);
+	  break;
+
+	/* We do not yet handle GOT/PLT/Dynamic relocations.  */
+	case R_860_COPY:
+	case R_860_GLOB_DAT:
+	case R_860_JUMP_SLOT:
+	case R_860_RELATIVE:
+	case R_860_PLT26:
+	case R_860_LOGOT0:
+	case R_860_SPGOT0:
+	case R_860_LOGOT1:
+	case R_860_SPGOT1:
+	case R_860_LOGOTOFF0:
+	case R_860_SPGOTOFF0:
+	case R_860_LOGOTOFF1:
+	case R_860_SPGOTOFF1:
+	case R_860_LOGOTOFF2:
+	case R_860_LOGOTOFF3:
+	case R_860_LOPC:
+	case R_860_HAGOT:
+	case R_860_HAGOTOFF:
+	case R_860_HAPC:
+	case R_860_HIGOT:
+	case R_860_HIGOTOFF:
+	  r = bfd_reloc_notsupported;
+	  break;
+	}
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char * msg = (const char *) NULL;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      r = info->callbacks->reloc_overflow
+		(info, (h ? &h->root : NULL), name, howto->name,
+		 (bfd_vma) 0, input_bfd, input_section, rel->r_offset);
+	      break;
+
+	    case bfd_reloc_undefined:
+	      r = info->callbacks->undefined_symbol
+		(info, name, input_bfd, input_section, rel->r_offset, TRUE);
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      break;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      break;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous relocation");
+	      break;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      break;
+	    }
+
+	  if (msg)
+	    r = info->callbacks->warning
+	      (info, msg, name, input_bfd, input_section, rel->r_offset);
+
+	  if (! r)
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return whether a symbol name implies a local label.  SVR4/860 compilers
+   generate labels of the form ".ep.function_name" to denote the end of a
+   function prolog. These should be local.
+   ??? Do any other SVR4 compilers have this convention? If so, this should
+   be added to the generic routine.  */
+static bfd_boolean
+elf32_i860_is_local_label_name (bfd *abfd, const char *name)
+{
+  if (name[0] == '.' && name[1] == 'e' && name[2] == 'p' && name[3] == '.')
+    return TRUE;
+
+  return _bfd_elf_is_local_label_name (abfd, name);
+}
+
+#define TARGET_BIG_SYM		bfd_elf32_i860_vec
+#define TARGET_BIG_NAME		"elf32-i860"
+#define TARGET_LITTLE_SYM	bfd_elf32_i860_little_vec
+#define TARGET_LITTLE_NAME	"elf32-i860-little"
+#define ELF_ARCH		bfd_arch_i860
+#define ELF_MACHINE_CODE	EM_860
+#define ELF_MAXPAGESIZE		4096
+
+#define elf_backend_rela_normal			1
+#define elf_info_to_howto_rel                   NULL
+#define elf_info_to_howto			elf32_i860_info_to_howto_rela
+#define elf_backend_relocate_section		elf32_i860_relocate_section
+#define bfd_elf32_bfd_reloc_type_lookup		elf32_i860_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup	elf32_i860_reloc_name_lookup
+#define bfd_elf32_bfd_is_local_label_name	elf32_i860_is_local_label_name
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-i960.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-i960.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-i960.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-i960.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,168 @@
+/* Intel 960 specific support for 32-bit ELF
+   Copyright 1999, 2000, 2001, 2002, 2003, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/i960.h"
+
+#define USE_REL 1
+
+#define bfd_elf32_bfd_reloc_type_lookup	elf32_i960_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup \
+  elf32_i960_reloc_name_lookup
+#define elf_info_to_howto		elf32_i960_info_to_howto
+#define elf_info_to_howto_rel		elf32_i960_info_to_howto_rel
+
+/* ELF relocs are against symbols.  If we are producing relocatable
+   output, and the reloc is against an external symbol, and nothing
+   has given us any additional addend, the resulting reloc will also
+   be against the same symbol.  In such a case, we don't want to
+   change anything about the way the reloc is handled, since it will
+   all be done at final link time.  Rather than put special case code
+   into bfd_perform_relocation, all the reloc types use this howto
+   function.  It just short circuits the reloc if producing
+   relocatable output against an external symbol.  */
+
+static bfd_reloc_status_type
+elf32_i960_relocate (bfd *abfd ATTRIBUTE_UNUSED,
+		     arelent *reloc_entry,
+		     asymbol *symbol,
+		     PTR data ATTRIBUTE_UNUSED,
+		     asection *input_section,
+		     bfd *output_bfd,
+		     char **error_message ATTRIBUTE_UNUSED)
+{
+  /* HACK: I think this first condition is necessary when producing
+     relocatable output.  After the end of HACK, the code is identical
+     to bfd_elf_generic_reloc().  I would _guess_ the first change
+     belongs there rather than here.  martindo 1998-10-23.  */
+  if (output_bfd != (bfd *) NULL
+      && reloc_entry->howto->pc_relative
+      && !reloc_entry->howto->pcrel_offset)
+    reloc_entry->addend -= symbol->value;
+
+  /* This is more dubious.  */
+  else if (output_bfd != (bfd *) NULL
+	   && (symbol->flags & BSF_SECTION_SYM) != 0)
+    reloc_entry->addend -= symbol->section->output_section->vma;
+
+  else
+    {
+      /* ...end of HACK.  */
+      if (output_bfd != (bfd *) NULL
+	  && (symbol->flags & BSF_SECTION_SYM) == 0
+	  && (! reloc_entry->howto->partial_inplace
+	      || reloc_entry->addend == 0))
+	{
+	  reloc_entry->address += input_section->output_offset;
+	  return bfd_reloc_ok;
+	}
+    }
+
+  return bfd_reloc_continue;
+}
+
+static reloc_howto_type elf_howto_table[]=
+{
+  HOWTO (R_960_NONE, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+	 elf32_i960_relocate, "R_960_NONE", TRUE,
+	 0x00000000, 0x00000000, FALSE),
+  EMPTY_HOWTO (1),
+  HOWTO (R_960_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	 elf32_i960_relocate, "R_960_32", TRUE,
+	 0xffffffff, 0xffffffff, FALSE),
+  HOWTO (R_960_IP24, 0, 2, 24, TRUE, 0, complain_overflow_signed,
+	 elf32_i960_relocate, "R_960_IP24 ", TRUE,
+	 0x00ffffff, 0x00ffffff, FALSE),
+  EMPTY_HOWTO (4),
+  EMPTY_HOWTO (5),
+  EMPTY_HOWTO (6),
+  EMPTY_HOWTO (7)
+};
+
+static enum elf_i960_reloc_type
+elf32_i960_bfd_to_reloc_type (bfd_reloc_code_real_type code)
+{
+  switch (code)
+    {
+    default:
+      return R_960_NONE;
+    case BFD_RELOC_I960_CALLJ:
+      return R_960_OPTCALL;
+    case BFD_RELOC_32:
+    case BFD_RELOC_CTOR:
+      return R_960_32;
+    case BFD_RELOC_24_PCREL:
+      return R_960_IP24;
+    }
+}
+
+static void
+elf32_i960_info_to_howto (bfd *               abfd ATTRIBUTE_UNUSED,
+			  arelent *           cache_ptr ATTRIBUTE_UNUSED,
+			  Elf_Internal_Rela * dst ATTRIBUTE_UNUSED)
+{
+  abort ();
+}
+
+static void
+elf32_i960_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+			      arelent *cache_ptr,
+			      Elf_Internal_Rela *dst)
+{
+  enum elf_i960_reloc_type type;
+
+  type = (enum elf_i960_reloc_type) ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (type < R_960_max);
+
+  cache_ptr->howto = &elf_howto_table[(int) type];
+}
+
+static reloc_howto_type *
+elf32_i960_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			      bfd_reloc_code_real_type code)
+{
+  return elf_howto_table + elf32_i960_bfd_to_reloc_type (code);
+}
+
+static reloc_howto_type *
+elf32_i960_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			      const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (elf_howto_table) / sizeof (elf_howto_table[0]); i++)
+    if (elf_howto_table[i].name != NULL
+	&& strcasecmp (elf_howto_table[i].name, r_name) == 0)
+      return &elf_howto_table[i];
+
+  return NULL;
+}
+
+#define TARGET_LITTLE_SYM	bfd_elf32_i960_vec
+#define TARGET_LITTLE_NAME	"elf32-i960"
+#define ELF_ARCH		bfd_arch_i960
+#define ELF_MACHINE_CODE	EM_960
+#define ELF_MAXPAGESIZE  	1 /* FIXME: This number is wrong,  It should be the page size in bytes.  */
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-ip2k.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-ip2k.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-ip2k.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-ip2k.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1519 @@
+/* Ubicom IP2xxx specific support for 32-bit ELF
+   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/ip2k.h"
+
+/* Struct used to pass miscellaneous paramaters which
+   helps to avoid overly long parameter lists.  */
+struct misc
+{
+  Elf_Internal_Shdr *  symtab_hdr;
+  Elf_Internal_Rela *  irelbase;
+  bfd_byte *           contents;
+  Elf_Internal_Sym *   isymbuf;
+};
+
+struct ip2k_opcode
+{
+  unsigned short opcode;
+  unsigned short mask;
+};
+
+static bfd_boolean ip2k_relaxed = FALSE;
+
+static const struct ip2k_opcode ip2k_page_opcode[] =
+{
+  {0x0010, 0xFFF8},	/* Page.  */
+  {0x0000, 0x0000},
+};
+
+#define IS_PAGE_OPCODE(code) \
+  ip2k_is_opcode (code, ip2k_page_opcode)
+
+static const struct ip2k_opcode ip2k_jmp_opcode[] =
+{
+  {0xE000, 0xE000},	/* Jmp.  */
+  {0x0000, 0x0000},
+};
+
+#define IS_JMP_OPCODE(code) \
+  ip2k_is_opcode (code, ip2k_jmp_opcode)
+
+static const struct ip2k_opcode ip2k_snc_opcode[] =
+{
+  {0xA00B, 0xFFFF},	/* Snc.  */
+  {0x0000, 0x0000},
+};
+
+#define IS_SNC_OPCODE(code) \
+  ip2k_is_opcode (code, ip2k_snc_opcode)
+
+static const struct ip2k_opcode ip2k_inc_1sp_opcode[] =
+{
+  {0x2B81, 0xFFFF},	/* Inc 1(SP).  */
+  {0x0000, 0x0000},
+};
+
+#define IS_INC_1SP_OPCODE(code) \
+  ip2k_is_opcode (code, ip2k_inc_1sp_opcode)
+
+static const struct ip2k_opcode ip2k_add_2sp_w_opcode[] =
+{
+  {0x1F82, 0xFFFF},	/* Add 2(SP),w.  */
+  {0x0000, 0x0000},
+};
+
+#define IS_ADD_2SP_W_OPCODE(code) \
+  ip2k_is_opcode (code, ip2k_add_2sp_w_opcode)
+
+static const struct ip2k_opcode ip2k_add_w_wreg_opcode[] =
+{
+  {0x1C0A, 0xFFFF},	/* Add w,wreg.  */
+  {0x1E0A, 0xFFFF},	/* Add wreg,w.  */
+  {0x0000, 0x0000},
+};
+
+#define IS_ADD_W_WREG_OPCODE(code) \
+  ip2k_is_opcode (code, ip2k_add_w_wreg_opcode)
+
+static const struct ip2k_opcode ip2k_add_pcl_w_opcode[] =
+{
+  {0x1E09, 0xFFFF},	/* Add pcl,w.  */
+  {0x0000, 0x0000},
+};
+
+#define IS_ADD_PCL_W_OPCODE(code) \
+  ip2k_is_opcode (code, ip2k_add_pcl_w_opcode)
+
+static const struct ip2k_opcode ip2k_skip_opcodes[] =
+{
+  {0xB000, 0xF000},	/* sb */
+  {0xA000, 0xF000},	/* snb */
+  {0x7600, 0xFE00},	/* cse/csne #lit */
+  {0x5800, 0xFC00},	/* incsnz */
+  {0x4C00, 0xFC00},	/* decsnz */
+  {0x4000, 0xFC00},	/* cse/csne */
+  {0x3C00, 0xFC00},	/* incsz */
+  {0x2C00, 0xFC00},	/* decsz */
+  {0x0000, 0x0000},
+};
+
+#define IS_SKIP_OPCODE(code) \
+  ip2k_is_opcode (code, ip2k_skip_opcodes)
+
+/* Relocation tables.  */
+static reloc_howto_type ip2k_elf_howto_table [] =
+{
+#define IP2K_HOWTO(t,rs,s,bs,pr,bp,name,sm,dm) \
+    HOWTO(t,                    /* type */ \
+          rs,                   /* rightshift */ \
+          s,                    /* size (0 = byte, 1 = short, 2 = long) */ \
+          bs,                   /* bitsize */ \
+          pr,                   /* pc_relative */ \
+          bp,                   /* bitpos */ \
+          complain_overflow_dont,/* complain_on_overflow */ \
+          bfd_elf_generic_reloc,/* special_function */ \
+          name,                 /* name */ \
+          FALSE,                /* partial_inplace */ \
+          sm,                   /* src_mask */ \
+          dm,                   /* dst_mask */ \
+          pr)                   /* pcrel_offset */
+
+  /* This reloc does nothing.  */
+  IP2K_HOWTO (R_IP2K_NONE, 0,2,32, FALSE, 0, "R_IP2K_NONE", 0, 0),
+  /* A 16 bit absolute relocation.  */
+  IP2K_HOWTO (R_IP2K_16, 0,1,16, FALSE, 0, "R_IP2K_16", 0, 0xffff),
+  /* A 32 bit absolute relocation.  */
+  IP2K_HOWTO (R_IP2K_32, 0,2,32, FALSE, 0, "R_IP2K_32", 0, 0xffffffff),
+  /* A 8-bit data relocation for the FR9 field.  Ninth bit is computed specially.  */
+  IP2K_HOWTO (R_IP2K_FR9, 0,1,9, FALSE, 0, "R_IP2K_FR9", 0, 0x00ff),
+  /* A 4-bit data relocation.  */
+  IP2K_HOWTO (R_IP2K_BANK, 8,1,4, FALSE, 0, "R_IP2K_BANK", 0, 0x000f),
+  /* A 13-bit insn relocation - word address => right-shift 1 bit extra.  */
+  IP2K_HOWTO (R_IP2K_ADDR16CJP, 1,1,13, FALSE, 0, "R_IP2K_ADDR16CJP", 0, 0x1fff),
+  /* A 3-bit insn relocation - word address => right-shift 1 bit extra.  */
+  IP2K_HOWTO (R_IP2K_PAGE3, 14,1,3, FALSE, 0, "R_IP2K_PAGE3", 0, 0x0007),
+  /* Two 8-bit data relocations.  */
+  IP2K_HOWTO (R_IP2K_LO8DATA, 0,1,8, FALSE, 0, "R_IP2K_LO8DATA", 0, 0x00ff),
+  IP2K_HOWTO (R_IP2K_HI8DATA, 8,1,8, FALSE, 0, "R_IP2K_HI8DATA", 0, 0x00ff),
+  /* Two 8-bit insn relocations.  word address => right-shift 1 bit extra.  */
+  IP2K_HOWTO (R_IP2K_LO8INSN, 1,1,8, FALSE, 0, "R_IP2K_LO8INSN", 0, 0x00ff),
+  IP2K_HOWTO (R_IP2K_HI8INSN, 9,1,8, FALSE, 0, "R_IP2K_HI8INSN", 0, 0x00ff),
+
+  /* Special 1 bit relocation for SKIP instructions.  */
+  IP2K_HOWTO (R_IP2K_PC_SKIP, 1,1,1, FALSE, 12, "R_IP2K_PC_SKIP", 0xfffe, 0x1000),
+  /* 16 bit word address.  */
+  IP2K_HOWTO (R_IP2K_TEXT, 1,1,16, FALSE, 0, "R_IP2K_TEXT", 0, 0xffff),
+  /* A 7-bit offset relocation for the FR9 field.  Eigth and ninth bit comes from insn.  */
+  IP2K_HOWTO (R_IP2K_FR_OFFSET, 0,1,9, FALSE, 0, "R_IP2K_FR_OFFSET", 0x180, 0x007f),
+  /* Bits 23:16 of an address.  */
+  IP2K_HOWTO (R_IP2K_EX8DATA, 16,1,8, FALSE, 0, "R_IP2K_EX8DATA", 0, 0x00ff),
+};
+
+
+/* Map BFD reloc types to IP2K ELF reloc types.  */
+
+static reloc_howto_type *
+ip2k_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
+			bfd_reloc_code_real_type code)
+{
+  /* Note that the ip2k_elf_howto_table is indxed by the R_
+     constants.  Thus, the order that the howto records appear in the
+     table *must* match the order of the relocation types defined in
+     include/elf/ip2k.h.  */
+
+  switch (code)
+    {
+    case BFD_RELOC_NONE:
+      return &ip2k_elf_howto_table[ (int) R_IP2K_NONE];
+    case BFD_RELOC_16:
+      return &ip2k_elf_howto_table[ (int) R_IP2K_16];
+    case BFD_RELOC_32:
+      return &ip2k_elf_howto_table[ (int) R_IP2K_32];
+    case BFD_RELOC_IP2K_FR9:
+      return &ip2k_elf_howto_table[ (int) R_IP2K_FR9];
+    case BFD_RELOC_IP2K_BANK:
+      return &ip2k_elf_howto_table[ (int) R_IP2K_BANK];
+    case BFD_RELOC_IP2K_ADDR16CJP:
+      return &ip2k_elf_howto_table[ (int) R_IP2K_ADDR16CJP];
+    case BFD_RELOC_IP2K_PAGE3:
+      return &ip2k_elf_howto_table[ (int) R_IP2K_PAGE3];
+    case BFD_RELOC_IP2K_LO8DATA:
+      return &ip2k_elf_howto_table[ (int) R_IP2K_LO8DATA];
+    case BFD_RELOC_IP2K_HI8DATA:
+      return &ip2k_elf_howto_table[ (int) R_IP2K_HI8DATA];
+    case BFD_RELOC_IP2K_LO8INSN:
+      return &ip2k_elf_howto_table[ (int) R_IP2K_LO8INSN];
+    case BFD_RELOC_IP2K_HI8INSN:
+      return &ip2k_elf_howto_table[ (int) R_IP2K_HI8INSN];
+    case BFD_RELOC_IP2K_PC_SKIP:
+      return &ip2k_elf_howto_table[ (int) R_IP2K_PC_SKIP];
+    case BFD_RELOC_IP2K_TEXT:
+      return &ip2k_elf_howto_table[ (int) R_IP2K_TEXT];
+    case BFD_RELOC_IP2K_FR_OFFSET:
+      return &ip2k_elf_howto_table[ (int) R_IP2K_FR_OFFSET];
+    case BFD_RELOC_IP2K_EX8DATA:
+      return &ip2k_elf_howto_table[ (int) R_IP2K_EX8DATA];
+    default:
+      /* Pacify gcc -Wall.  */
+      return NULL;
+    }
+  return NULL;
+}
+
+static reloc_howto_type *
+ip2k_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (ip2k_elf_howto_table) / sizeof (ip2k_elf_howto_table[0]);
+       i++)
+    if (ip2k_elf_howto_table[i].name != NULL
+	&& strcasecmp (ip2k_elf_howto_table[i].name, r_name) == 0)
+      return &ip2k_elf_howto_table[i];
+
+  return NULL;
+}
+
+static void
+ip2k_get_mem (bfd *abfd ATTRIBUTE_UNUSED,
+	      bfd_byte *addr,
+	      int length,
+	      bfd_byte *ptr)
+{
+  while (length --)
+    * ptr ++ = bfd_get_8 (abfd, addr ++);
+}
+
+static bfd_boolean
+ip2k_is_opcode (bfd_byte *code, const struct ip2k_opcode *opcodes)
+{
+  unsigned short insn = (code[0] << 8) | code[1];
+
+  while (opcodes->mask != 0)
+    {
+      if ((insn & opcodes->mask) == opcodes->opcode)
+	return TRUE;
+
+      opcodes ++;
+    }
+
+  return FALSE;
+}
+
+#define PAGENO(ABSADDR) ((ABSADDR) & 0xFFFFC000)
+#define BASEADDR(SEC)	((SEC)->output_section->vma + (SEC)->output_offset)
+
+#define UNDEFINED_SYMBOL (~(bfd_vma)0)
+
+/* Return the value of the symbol associated with the relocation IREL.  */
+
+static bfd_vma
+symbol_value (bfd *abfd,
+	      Elf_Internal_Shdr *symtab_hdr,
+	      Elf_Internal_Sym *isymbuf,
+	      Elf_Internal_Rela *irel)
+{
+  if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+    {
+      Elf_Internal_Sym *isym;
+      asection *sym_sec;
+
+      isym = isymbuf + ELF32_R_SYM (irel->r_info);
+      if (isym->st_shndx == SHN_UNDEF)
+	sym_sec = bfd_und_section_ptr;
+      else if (isym->st_shndx == SHN_ABS)
+	sym_sec = bfd_abs_section_ptr;
+      else if (isym->st_shndx == SHN_COMMON)
+	sym_sec = bfd_com_section_ptr;
+      else
+	sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+
+      return isym->st_value + BASEADDR (sym_sec);
+    }
+  else
+    {
+      unsigned long indx;
+      struct elf_link_hash_entry *h;
+
+      indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+      h = elf_sym_hashes (abfd)[indx];
+      BFD_ASSERT (h != NULL);
+
+      if (h->root.type != bfd_link_hash_defined
+	  && h->root.type != bfd_link_hash_defweak)
+	return UNDEFINED_SYMBOL;
+
+      return (h->root.u.def.value + BASEADDR (h->root.u.def.section));
+    }
+}
+
+/* Determine if the instruction sequence matches that for
+   the prologue of a switch dispatch table with fewer than
+   128 entries.
+
+          sc
+          page    $nnn0
+          jmp     $nnn0
+          add     w,wreg
+          add     pcl,w
+  addr=>
+          page    $nnn1
+          jmp     $nnn1
+ 	   page    $nnn2
+ 	   jmp     $nnn2
+ 	   ...
+ 	   page    $nnnN
+ 	   jmp     $nnnN
+
+  After relaxation.
+  	   sc
+ 	   page    $nnn0
+  	   jmp     $nnn0
+ 	   add     pcl,w
+  addr=>
+  	   jmp     $nnn1
+ 	   jmp     $nnn2
+ 	   ...
+          jmp     $nnnN  */
+
+static int
+ip2k_is_switch_table_128 (bfd *abfd ATTRIBUTE_UNUSED,
+			  asection *sec,
+			  bfd_vma addr,
+			  bfd_byte *contents)
+{
+  bfd_byte code[4];
+  int table_index = 0;
+  
+  /* Check current page-jmp.  */
+  if (addr + 4 > sec->size)
+    return -1;
+
+  ip2k_get_mem (abfd, contents + addr, 4, code);
+
+  if ((! IS_PAGE_OPCODE (code + 0))
+      || (! IS_JMP_OPCODE (code + 2)))
+    return -1;
+  
+  /* Search back.  */
+  while (1)
+    {
+      if (addr < 4)
+	return -1;
+
+      /* Check previous 2 instructions.  */
+      ip2k_get_mem (abfd, contents + addr - 4, 4, code);
+      if ((IS_ADD_W_WREG_OPCODE (code + 0))
+	  && (IS_ADD_PCL_W_OPCODE (code + 2)))
+	return table_index;
+
+      if ((! IS_PAGE_OPCODE (code + 0))
+	  || (! IS_JMP_OPCODE (code + 2)))
+	return -1;
+
+      table_index++;
+      addr -= 4;
+    }
+}
+
+/* Determine if the instruction sequence matches that for
+   the prologue switch dispatch table with fewer than
+   256 entries but more than 127.
+
+   Before relaxation.
+          push    %lo8insn(label) ; Push address of table
+          push    %hi8insn(label)
+          add     w,wreg          ; index*2 => offset
+          snc                     ; CARRY SET?
+          inc     1(sp)           ; Propagate MSB into table address
+          add     2(sp),w         ; Add low bits of offset to table address
+          snc                     ; and handle any carry-out
+          inc     1(sp)
+   addr=>
+          page    __indjmp        ; Do an indirect jump to that location
+          jmp     __indjmp
+   label:                         ; case dispatch table starts here
+ 	   page    $nnn1
+ 	   jmp	   $nnn1
+ 	   page	   $nnn2
+ 	   jmp     $nnn2
+ 	   ...
+ 	   page    $nnnN
+ 	   jmp	   $nnnN
+
+  After relaxation.
+          push    %lo8insn(label) ; Push address of table
+          push    %hi8insn(label)
+          add     2(sp),w         ; Add low bits of offset to table address
+          snc                     ; and handle any carry-out
+          inc     1(sp)
+  addr=>
+          page    __indjmp        ; Do an indirect jump to that location
+          jmp     __indjmp
+   label:                         ; case dispatch table starts here
+          jmp     $nnn1
+          jmp     $nnn2
+          ...
+          jmp     $nnnN  */
+
+static int
+ip2k_is_switch_table_256 (bfd *abfd ATTRIBUTE_UNUSED,
+			  asection *sec,
+			  bfd_vma addr,
+			  bfd_byte *contents)
+{
+  bfd_byte code[16];
+  int table_index = 0;
+  
+  /* Check current page-jmp.  */
+  if (addr + 4 > sec->size)
+    return -1;
+
+  ip2k_get_mem (abfd, contents + addr, 4, code);
+  if ((! IS_PAGE_OPCODE (code + 0))
+      || (! IS_JMP_OPCODE (code + 2)))
+    return -1;
+  
+  /* Search back.  */
+  while (1)
+    {
+      if (addr < 16)
+	return -1;
+
+      /* Check previous 8 instructions.  */
+      ip2k_get_mem (abfd, contents + addr - 16, 16, code);
+      if ((IS_ADD_W_WREG_OPCODE (code + 0))
+	  && (IS_SNC_OPCODE (code + 2))
+	  && (IS_INC_1SP_OPCODE (code + 4))
+	  && (IS_ADD_2SP_W_OPCODE (code + 6))
+	  && (IS_SNC_OPCODE (code + 8))
+	  && (IS_INC_1SP_OPCODE (code + 10))
+	  && (IS_PAGE_OPCODE (code + 12))
+	  && (IS_JMP_OPCODE (code + 14)))
+	return table_index;
+
+      if ((IS_ADD_W_WREG_OPCODE (code + 2))
+	  && (IS_SNC_OPCODE (code + 4))
+	  && (IS_INC_1SP_OPCODE (code + 6))
+	  && (IS_ADD_2SP_W_OPCODE (code + 8))
+	  && (IS_SNC_OPCODE (code + 10))
+	  && (IS_INC_1SP_OPCODE (code + 12))
+	  && (IS_JMP_OPCODE (code + 14)))
+	return table_index;
+      
+      if ((! IS_PAGE_OPCODE (code + 0))
+	  || (! IS_JMP_OPCODE (code + 2)))
+	return -1;
+
+      table_index++;
+      addr -= 4;
+    }
+}
+
+/* Returns the expected page state for the given instruction not including
+   the effect of page instructions.  */
+
+static bfd_vma
+ip2k_nominal_page_bits (bfd *abfd ATTRIBUTE_UNUSED,
+			asection *sec,
+			bfd_vma addr,
+			bfd_byte *contents)
+{
+  bfd_vma page = PAGENO (BASEADDR (sec) + addr);
+
+  /* Check if section flows into this page. If not then the page
+     bits are assumed to match the PC. This will be true unless
+     the user has a page instruction without a call/jump, in which
+     case they are on their own.  */
+  if (PAGENO (BASEADDR (sec)) == page)
+    return page;
+
+  /* Section flows across page boundary. The page bits should match
+     the PC unless there is a possible flow from the previous page,
+     in which case it is not possible to determine the value of the
+     page bits.  */
+  while (PAGENO (BASEADDR (sec) + addr - 2) == page)
+    {
+      bfd_byte code[2];
+
+      addr -= 2;
+      ip2k_get_mem (abfd, contents + addr, 2, code);
+      if (!IS_PAGE_OPCODE (code))
+	continue;
+
+      /* Found a page instruction, check if jump table.  */
+      if (ip2k_is_switch_table_128 (abfd, sec, addr, contents) != -1)
+	/* Jump table => page is conditional.  */
+	continue;
+
+      if (ip2k_is_switch_table_256 (abfd, sec, addr, contents) != -1)
+	/* Jump table => page is conditional.  */
+	continue;
+
+      /* Found a page instruction, check if conditional.  */
+      if (addr >= 2)
+        {
+	  ip2k_get_mem (abfd, contents + addr - 2, 2, code);
+          if (IS_SKIP_OPCODE (code))
+	    /* Page is conditional.  */
+	    continue;
+        }
+
+      /* Unconditional page instruction => page bits should be correct.  */
+      return page;
+    }
+
+  /* Flow from previous page => page bits are impossible to determine.  */
+  return 0;
+}
+
+static bfd_boolean
+ip2k_test_page_insn (bfd *abfd ATTRIBUTE_UNUSED,
+		     asection *sec,
+		     Elf_Internal_Rela *irel,
+		     struct misc *misc)
+{
+  bfd_vma symval;
+
+  /* Get the value of the symbol referred to by the reloc.  */
+  symval = symbol_value (abfd, misc->symtab_hdr, misc->isymbuf, irel);
+  if (symval == UNDEFINED_SYMBOL)
+    /* This appears to be a reference to an undefined
+       symbol.  Just ignore it--it will be caught by the
+       regular reloc processing.  */
+    return FALSE;
+
+  /* Test if we can delete this page instruction.  */
+  if (PAGENO (symval + irel->r_addend) !=
+      ip2k_nominal_page_bits (abfd, sec, irel->r_offset, misc->contents))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Parts of a Stabs entry.  */
+
+#define STRDXOFF   0
+#define TYPEOFF    4
+#define OTHEROFF   5
+#define DESCOFF    6
+#define VALOFF     8
+#define STABSIZE   12
+
+/* Adjust all the relocations entries after adding or inserting instructions.  */
+
+static void
+adjust_all_relocations (bfd *abfd,
+			asection *sec,
+			bfd_vma addr,
+			bfd_vma endaddr,
+			int count,
+			int noadj)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Sym *isymbuf, *isym, *isymend;
+  unsigned int shndx;
+  Elf_Internal_Rela *irel, *irelend, *irelbase;
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_link_hash_entry **end_hashes;
+  unsigned int symcount;
+  asection *stab;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+
+  shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+  irelbase = elf_section_data (sec)->relocs;
+  irelend = irelbase + sec->reloc_count;
+
+  for (irel = irelbase; irel < irelend; irel++)
+    {
+      if (ELF32_R_TYPE (irel->r_info) != R_IP2K_NONE)
+        {
+          /* Get the value of the symbol referred to by the reloc.  */
+          if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+            {
+              asection *sym_sec;
+
+              /* A local symbol.  */
+	      isym = isymbuf + ELF32_R_SYM (irel->r_info);
+              sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+
+              if (isym->st_shndx == shndx)
+                {
+                  bfd_vma baseaddr = BASEADDR (sec);
+                  bfd_vma symval = BASEADDR (sym_sec) + isym->st_value
+                                   + irel->r_addend;
+
+                  if ((baseaddr + addr + noadj) <= symval
+                      && symval < (baseaddr + endaddr))
+                    irel->r_addend += count;
+                }
+            }
+        }
+
+      /* Do this only for PC space relocations.  */
+      if (addr <= irel->r_offset && irel->r_offset < endaddr)
+        irel->r_offset += count;
+    }
+
+  /* Now fix the stab relocations.  */
+  stab = bfd_get_section_by_name (abfd, ".stab");
+  if (stab)
+    {
+      bfd_byte *stabcontents, *stabend, *stabp;
+      bfd_size_type stab_size = stab->rawsize ? stab->rawsize : stab->size;
+
+      irelbase = elf_section_data (stab)->relocs;
+      irelend = irelbase + stab->reloc_count;
+
+      /* Pull out the contents of the stab section.  */
+      if (elf_section_data (stab)->this_hdr.contents != NULL)
+	stabcontents = elf_section_data (stab)->this_hdr.contents;
+      else
+	{
+	  if (!bfd_malloc_and_get_section (abfd, stab, &stabcontents))
+	    {
+	      if (stabcontents != NULL)
+		free (stabcontents);
+	      return;
+	    }
+
+	  /* We need to remember this.  */
+	  elf_section_data (stab)->this_hdr.contents = stabcontents;
+	}
+
+      stabend = stabcontents + stab_size;
+
+      for (irel = irelbase; irel < irelend; irel++)
+	{
+	  if (ELF32_R_TYPE (irel->r_info) != R_IP2K_NONE)
+	    {
+	      /* Get the value of the symbol referred to by the reloc.  */
+	      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+		{
+		  asection *sym_sec;
+		  
+		  /* A local symbol.  */
+		  isym = isymbuf + ELF32_R_SYM (irel->r_info);
+		  sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+		  
+		  if (sym_sec == sec)
+		    {
+		      const char *name;
+		      unsigned char type;
+		      bfd_vma value;
+		      bfd_vma baseaddr = BASEADDR (sec);
+		      bfd_vma symval = BASEADDR (sym_sec) + isym->st_value
+			+ irel->r_addend;
+		      
+		      if ((baseaddr + addr) <= symval
+			  && symval <= (baseaddr + endaddr))
+			irel->r_addend += count;
+
+		      /* Go hunt up a function and fix its line info if needed.  */
+		      stabp = stabcontents + irel->r_offset - 8; 
+
+		      /* Go pullout the stab entry.  */
+		      type  = bfd_h_get_8 (abfd, stabp + TYPEOFF);
+		      value = bfd_h_get_32 (abfd, stabp + VALOFF);
+		      
+		      name = bfd_get_stab_name (type);
+		      
+		      if (strcmp (name, "FUN") == 0)
+			{
+			  int function_adjusted = 0;
+
+			  if (symval > (baseaddr + addr))
+			    /* Not in this function.  */
+			    continue;
+
+			  /* Hey we got a function hit.  */
+			  stabp += STABSIZE;
+			  for (;stabp < stabend; stabp += STABSIZE)
+			    {
+			      /* Go pullout the stab entry.  */
+			      type  = bfd_h_get_8 (abfd, stabp + TYPEOFF);
+			      value = bfd_h_get_32 (abfd, stabp + VALOFF);
+
+			      name = bfd_get_stab_name (type);
+
+			      if (strcmp (name, "FUN") == 0)
+				{
+				  /* Hit another function entry.  */
+				  if (function_adjusted)
+				    {
+				      /* Adjust the value.  */
+				      value += count;
+				  
+				      /* We need to put it back.  */
+				      bfd_h_put_32 (abfd, value,stabp + VALOFF);
+				    }
+
+				  /* And then bale out.  */
+				  break;
+				}
+
+			      if (strcmp (name, "SLINE") == 0)
+				{
+				  /* Got a line entry.  */
+				  if ((baseaddr + addr) <= (symval + value))
+				    {
+				      /* Adjust the line entry.  */
+				      value += count;
+
+				      /* We need to put it back.  */
+				      bfd_h_put_32 (abfd, value,stabp + VALOFF);
+				      function_adjusted = 1;
+				    }
+				}
+			    }
+			}
+		    }
+		}
+	    }
+	}
+    }
+
+  /* When adding an instruction back it is sometimes necessary to move any
+     global or local symbol that was referencing the first instruction of
+     the moved block to refer to the first instruction of the inserted block.
+
+     For example adding a PAGE instruction before a CALL or JMP requires
+     that any label on the CALL or JMP is moved to the PAGE insn.  */
+  addr += noadj;
+
+  /* Adjust the local symbols defined in this section.  */
+  isymend = isymbuf + symtab_hdr->sh_info;
+  for (isym = isymbuf; isym < isymend; isym++)
+    {
+      if (isym->st_shndx == shndx
+	  && addr <= isym->st_value
+	  && isym->st_value < endaddr)
+	isym->st_value += count;
+    }
+
+  /* Now adjust the global symbols defined in this section.  */
+  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+	      - symtab_hdr->sh_info);
+  sym_hashes = elf_sym_hashes (abfd);
+  end_hashes = sym_hashes + symcount;
+  for (; sym_hashes < end_hashes; sym_hashes++)
+    {
+      struct elf_link_hash_entry *sym_hash = *sym_hashes;
+
+      if ((sym_hash->root.type == bfd_link_hash_defined
+	   || sym_hash->root.type == bfd_link_hash_defweak)
+	  && sym_hash->root.u.def.section == sec)
+	{
+          if (addr <= sym_hash->root.u.def.value
+              && sym_hash->root.u.def.value < endaddr)
+	    sym_hash->root.u.def.value += count;
+	}
+    }
+
+  return;
+}
+
+/* Delete some bytes from a section while relaxing.  */
+
+static bfd_boolean
+ip2k_elf_relax_delete_bytes (bfd *abfd,
+			     asection *sec,
+			     bfd_vma addr,
+			     int count)
+{
+  bfd_byte *contents = elf_section_data (sec)->this_hdr.contents;
+  bfd_vma endaddr = sec->size;
+
+  /* Actually delete the bytes.  */
+  memmove (contents + addr, contents + addr + count,
+	   endaddr - addr - count);
+
+  sec->size -= count;
+
+  adjust_all_relocations (abfd, sec, addr + count, endaddr, -count, 0);
+  return TRUE;
+}
+
+static bfd_boolean
+ip2k_delete_page_insn (bfd *abfd ATTRIBUTE_UNUSED,
+		       asection *sec,
+		       Elf_Internal_Rela *irel,
+		       bfd_boolean *again,
+		       struct misc *misc)
+{
+  /* Note that we've changed the relocs, section contents, etc.  */
+  elf_section_data (sec)->relocs = misc->irelbase;
+  elf_section_data (sec)->this_hdr.contents = misc->contents;
+  misc->symtab_hdr->contents = (bfd_byte *) misc->isymbuf;
+
+  /* Fix the relocation's type.  */
+  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info), R_IP2K_NONE);
+
+  /* Delete the PAGE insn.  */
+  if (!ip2k_elf_relax_delete_bytes (abfd, sec, irel->r_offset, 2))
+    return FALSE;
+	
+  /* Modified => will need to iterate relaxation again.  */
+  *again = TRUE;
+  
+  return TRUE;
+}
+
+static bfd_boolean
+ip2k_relax_switch_table_128 (bfd *abfd ATTRIBUTE_UNUSED,
+			     asection *sec,
+			     Elf_Internal_Rela *irel,
+			     bfd_boolean *again,
+			     struct misc *misc)
+{
+  Elf_Internal_Rela *irelend = misc->irelbase + sec->reloc_count;
+  Elf_Internal_Rela *ireltest = irel;
+  bfd_byte code[4];
+  bfd_vma addr;
+  
+  /* Test all page instructions.  */
+  addr = irel->r_offset;
+  while (1)
+    {
+      if (addr + 4 > sec->size)
+	break;
+
+      ip2k_get_mem (abfd, misc->contents + addr, 4, code);
+      if ((! IS_PAGE_OPCODE (code + 0))
+	  || (! IS_JMP_OPCODE (code + 2)))
+	break;
+
+      /* Validate relocation entry (every entry should have a matching
+          relocation entry).  */
+      if (ireltest >= irelend)
+        {
+	  _bfd_error_handler (_("ip2k relaxer: switch table without complete matching relocation information."));
+          return FALSE;
+        }
+
+      if (ireltest->r_offset != addr)
+        {
+	  _bfd_error_handler (_("ip2k relaxer: switch table without complete matching relocation information."));
+          return FALSE;
+        }
+
+      if (! ip2k_test_page_insn (abfd, sec, ireltest, misc))
+	/* Un-removable page insn => nothing can be done.  */
+	return TRUE;
+
+      addr += 4;
+      ireltest += 2;
+    }
+
+  /* Relaxable. Adjust table header.  */
+  ip2k_get_mem (abfd, misc->contents + irel->r_offset - 4, 4, code);
+  if ((! IS_ADD_W_WREG_OPCODE (code + 0))
+      || (! IS_ADD_PCL_W_OPCODE (code + 2)))
+    {
+      _bfd_error_handler (_("ip2k relaxer: switch table header corrupt."));
+      return FALSE;
+    }
+
+  if (!ip2k_elf_relax_delete_bytes (abfd, sec, irel->r_offset - 4, 2))
+    return FALSE;
+
+  *again = TRUE;
+
+  /* Delete all page instructions in table.  */
+  while (irel < ireltest)
+    {
+      if (!ip2k_delete_page_insn (abfd, sec, irel, again, misc))
+	return FALSE;
+      irel += 2;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+ip2k_relax_switch_table_256 (bfd *abfd ATTRIBUTE_UNUSED,
+			     asection *sec,
+			     Elf_Internal_Rela *irel,
+			     bfd_boolean *again,
+			     struct misc *misc)
+{
+  Elf_Internal_Rela *irelend = misc->irelbase + sec->reloc_count;
+  Elf_Internal_Rela *ireltest = irel;
+  bfd_byte code[12];
+  bfd_vma addr;
+  
+  /* Test all page instructions.  */
+  addr = irel->r_offset;
+
+  while (1)
+    {
+      if (addr + 4 > sec->size)
+	break;
+
+      ip2k_get_mem (abfd, misc->contents + addr, 4, code);
+
+      if ((! IS_PAGE_OPCODE (code + 0))
+	  || (! IS_JMP_OPCODE (code + 2)))
+	break;
+
+      /* Validate relocation entry (every entry should have a matching
+          relocation entry).  */
+      if (ireltest >= irelend)
+        {
+          _bfd_error_handler (_("ip2k relaxer: switch table without complete matching relocation information."));
+          return FALSE;
+        }
+
+      if (ireltest->r_offset != addr)
+        {
+          _bfd_error_handler (_("ip2k relaxer: switch table without complete matching relocation information."));
+          return FALSE;
+        }
+
+      if (!ip2k_test_page_insn (abfd, sec, ireltest, misc))
+	/* Un-removable page insn => nothing can be done.  */
+	return TRUE;
+
+      addr += 4;
+      ireltest += 2;
+    }
+
+  /* Relaxable. Adjust table header.  */
+  ip2k_get_mem (abfd, misc->contents + irel->r_offset - 4, 2, code);
+  if (IS_PAGE_OPCODE (code))
+    addr = irel->r_offset - 16;
+  else
+    addr = irel->r_offset - 14;
+
+  ip2k_get_mem (abfd, misc->contents + addr, 12, code);
+  if ((!IS_ADD_W_WREG_OPCODE (code + 0))
+      || (!IS_SNC_OPCODE (code + 2))
+      || (!IS_INC_1SP_OPCODE (code + 4))
+      || (!IS_ADD_2SP_W_OPCODE (code + 6))
+      || (!IS_SNC_OPCODE (code + 8))
+      || (!IS_INC_1SP_OPCODE (code + 10)))
+    {
+      _bfd_error_handler (_("ip2k relaxer: switch table header corrupt."));
+      return FALSE;
+    }
+
+  /* Delete first 3 opcodes.  */
+  if (!ip2k_elf_relax_delete_bytes (abfd, sec, addr + 0, 6))
+    return FALSE;
+
+  *again = TRUE;
+
+  /* Delete all page instructions in table.  */
+  while (irel < ireltest)
+    {
+      if (!ip2k_delete_page_insn (abfd, sec, irel, again, misc))
+	return FALSE;
+      irel += 2;
+    }
+
+  return TRUE;
+}
+
+/* This function handles relaxation of a section in a specific page.  */
+
+static bfd_boolean
+ip2k_elf_relax_section_page (bfd *abfd,
+			     asection *sec,
+			     bfd_boolean *again,
+			     struct misc *misc,
+			     unsigned long page_start,
+			     unsigned long page_end)
+{
+  Elf_Internal_Rela *irelend = misc->irelbase + sec->reloc_count;
+  Elf_Internal_Rela *irel;
+  int switch_table_128;
+  int switch_table_256;
+  
+  /* Walk thru the section looking for relaxation opportunities.  */
+  for (irel = misc->irelbase; irel < irelend; irel++)
+    {
+      if (ELF32_R_TYPE (irel->r_info) != (int) R_IP2K_PAGE3)
+	/* Ignore non page instructions.  */
+	continue;
+
+      if (BASEADDR (sec) + irel->r_offset < page_start)
+	/* Ignore page instructions on earlier page - they have
+	   already been processed. Remember that there is code flow
+	   that crosses a page boundary.  */
+	continue;
+
+      if (BASEADDR (sec) + irel->r_offset > page_end)
+	/* Flow beyond end of page => nothing more to do for this page.  */
+	return TRUE;
+
+      /* Detect switch tables.  */
+      switch_table_128 = ip2k_is_switch_table_128 (abfd, sec, irel->r_offset, misc->contents);
+      switch_table_256 = ip2k_is_switch_table_256 (abfd, sec, irel->r_offset, misc->contents);
+
+      if ((switch_table_128 > 0) || (switch_table_256 > 0))
+	/* If the index is greater than 0 then it has already been processed.  */
+	continue;
+
+      if (switch_table_128 == 0)
+	{
+	  if (!ip2k_relax_switch_table_128 (abfd, sec, irel, again, misc))
+	    return FALSE;
+
+	  continue;
+	}
+
+      if (switch_table_256 == 0)
+	{
+	  if (!ip2k_relax_switch_table_256 (abfd, sec, irel, again, misc))
+	    return FALSE;
+
+	  continue;
+	}
+
+      /* Simple relax.  */
+      if (ip2k_test_page_insn (abfd, sec, irel, misc))
+	{
+	  if (!ip2k_delete_page_insn (abfd, sec, irel, again, misc))
+	    return FALSE;
+
+	  continue;
+	}
+    }
+
+  return TRUE;
+}
+
+/* This function handles relaxing for the ip2k.
+
+   Principle: Start with the first page and remove page instructions that
+   are not require on this first page. By removing page instructions more
+   code will fit into this page - repeat until nothing more can be achieved
+   for this page. Move on to the next page.
+
+   Processing the pages one at a time from the lowest page allows a removal
+   only policy to be used - pages can be removed but are never reinserted.  */
+
+static bfd_boolean
+ip2k_elf_relax_section (bfd *abfd,
+			asection *sec,
+			struct bfd_link_info *link_info,
+			bfd_boolean *again)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *internal_relocs;
+  bfd_byte *contents = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+  static asection * first_section = NULL;
+  static unsigned long search_addr;
+  static unsigned long page_start = 0;
+  static unsigned long page_end = 0;
+  static unsigned int pass = 0;
+  static bfd_boolean new_pass = FALSE;
+  static bfd_boolean changed = FALSE;
+  struct misc misc;
+
+  /* Assume nothing changes.  */
+  *again = FALSE;
+
+  if (first_section == NULL)
+    {
+      ip2k_relaxed = TRUE;
+      first_section = sec;
+    }
+
+  if (first_section == sec)
+    {
+      pass++;
+      new_pass = TRUE;
+    }
+
+  /* We don't have to do anything for a relocatable link,
+     if this section does not have relocs, or if this is
+     not a code section.  */
+  if (link_info->relocatable
+      || (sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0
+      || (sec->flags & SEC_CODE) == 0)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+
+  internal_relocs = _bfd_elf_link_read_relocs (abfd, sec, NULL, NULL,
+					       link_info->keep_memory);
+  if (internal_relocs == NULL)
+    goto error_return;
+
+  /* Get section contents cached copy if it exists.  */
+  if (contents == NULL)
+    {
+      /* Get cached copy if it exists.  */
+      if (elf_section_data (sec)->this_hdr.contents != NULL)
+	contents = elf_section_data (sec)->this_hdr.contents;
+      else
+	{
+	  /* Go get them off disk.  */
+	  if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+	    goto error_return;
+	}
+    }
+
+  /* Read this BFD's symbols cached copy if it exists.  */
+  if (isymbuf == NULL && symtab_hdr->sh_info != 0)
+    {
+      isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+      if (isymbuf == NULL)
+	isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+					symtab_hdr->sh_info, 0,
+					NULL, NULL, NULL);
+      if (isymbuf == NULL)
+	goto error_return;
+    }
+
+  misc.symtab_hdr = symtab_hdr;
+  misc.isymbuf = isymbuf;
+  misc.irelbase = internal_relocs;
+  misc.contents = contents;
+
+  /* This is where all the relaxation actually get done.  */
+  if ((pass == 1) || (new_pass && !changed))
+    {
+      /* On the first pass we simply search for the lowest page that
+         we havn't relaxed yet. Note that the pass count is reset
+         each time a page is complete in order to move on to the next page.
+         If we can't find any more pages then we are finished.  */
+      if (new_pass)
+	{
+	  pass = 1;
+	  new_pass = FALSE;
+	  changed = TRUE; /* Pre-initialize to break out of pass 1.  */
+	  search_addr = 0xFFFFFFFF;
+	}
+
+      if ((BASEADDR (sec) + sec->size < search_addr)
+	  && (BASEADDR (sec) + sec->size > page_end))
+	{
+	  if (BASEADDR (sec) <= page_end)
+	    search_addr = page_end + 1;
+	  else
+	    search_addr = BASEADDR (sec);
+
+	  /* Found a page => more work to do.  */
+	  *again = TRUE;
+	}
+    }
+  else
+    {
+      if (new_pass)
+	{
+	  new_pass = FALSE;
+	  changed = FALSE;
+	  page_start = PAGENO (search_addr);
+	  page_end = page_start | 0x00003FFF;
+	}
+
+      /* Only process sections in range.  */
+      if ((BASEADDR (sec) + sec->size >= page_start)
+	  && (BASEADDR (sec) <= page_end))
+	{
+          if (!ip2k_elf_relax_section_page (abfd, sec, &changed, &misc, page_start, page_end))
+	    return FALSE;
+	}
+      *again = TRUE;
+    }
+
+  /* Perform some house keeping after relaxing the section.  */
+
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    {
+      if (! link_info->keep_memory)
+	free (isymbuf);
+      else
+	symtab_hdr->contents = (unsigned char *) isymbuf;
+    }
+
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    {
+      if (! link_info->keep_memory)
+	free (contents);
+      else
+	{
+	  /* Cache the section contents for elf_link_input_bfd.  */
+	  elf_section_data (sec)->this_hdr.contents = contents;
+	}
+    }
+
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return TRUE;
+
+ error_return:
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    free (contents);
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+  return FALSE;
+}
+
+/* Set the howto pointer for a IP2K ELF reloc.  */
+
+static void
+ip2k_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED,
+			 arelent * cache_ptr,
+			 Elf_Internal_Rela * dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  cache_ptr->howto = & ip2k_elf_howto_table [r_type];
+}
+
+/* Perform a single relocation.
+   By default we use the standard BFD routines.  */
+
+static bfd_reloc_status_type
+ip2k_final_link_relocate (reloc_howto_type *  howto,
+			  bfd *               input_bfd,
+			  asection *          input_section,
+			  bfd_byte *          contents,
+			  Elf_Internal_Rela * rel,
+			  bfd_vma             relocation)
+{
+  static bfd_vma page_addr = 0;
+
+  bfd_reloc_status_type r = bfd_reloc_ok;
+  switch (howto->type)
+    {
+      /* Handle data space relocations.  */
+    case R_IP2K_FR9:
+    case R_IP2K_BANK:
+      if ((relocation & IP2K_DATA_MASK) == IP2K_DATA_VALUE)
+	relocation &= ~IP2K_DATA_MASK;
+      else
+	r = bfd_reloc_notsupported;
+      break;
+
+    case R_IP2K_LO8DATA:
+    case R_IP2K_HI8DATA:
+    case R_IP2K_EX8DATA:
+      break;
+
+      /* Handle insn space relocations.  */
+    case R_IP2K_PAGE3:
+      page_addr = BASEADDR (input_section) + rel->r_offset;
+      if ((relocation & IP2K_INSN_MASK) == IP2K_INSN_VALUE)
+	relocation &= ~IP2K_INSN_MASK;
+      else
+	r = bfd_reloc_notsupported;
+      break;
+
+    case R_IP2K_ADDR16CJP:
+      if (BASEADDR (input_section) + rel->r_offset != page_addr + 2)
+	{
+	  /* No preceding page instruction, verify that it isn't needed.  */
+	  if (PAGENO (relocation + rel->r_addend) !=
+	      ip2k_nominal_page_bits (input_bfd, input_section,
+	      			      rel->r_offset, contents))
+	    _bfd_error_handler (_("ip2k linker: missing page instruction at 0x%08lx (dest = 0x%08lx)."),
+				BASEADDR (input_section) + rel->r_offset,
+				relocation + rel->r_addend);
+        }
+      else if (ip2k_relaxed)
+        {
+          /* Preceding page instruction. Verify that the page instruction is
+             really needed. One reason for the relaxation to miss a page is if
+             the section is not marked as executable.  */
+	  if (!ip2k_is_switch_table_128 (input_bfd, input_section,
+					 rel->r_offset - 2, contents)
+	      && !ip2k_is_switch_table_256 (input_bfd, input_section,
+					    rel->r_offset - 2, contents)
+	      && (PAGENO (relocation + rel->r_addend) ==
+		  ip2k_nominal_page_bits (input_bfd, input_section,
+					  rel->r_offset - 2, contents)))
+	    _bfd_error_handler (_("ip2k linker: redundant page instruction at 0x%08lx (dest = 0x%08lx)."),
+				page_addr,
+				relocation + rel->r_addend);
+        }
+      if ((relocation & IP2K_INSN_MASK) == IP2K_INSN_VALUE)
+	relocation &= ~IP2K_INSN_MASK;
+      else
+	r = bfd_reloc_notsupported;
+      break;
+
+    case R_IP2K_LO8INSN:
+    case R_IP2K_HI8INSN:
+    case R_IP2K_PC_SKIP:
+      if ((relocation & IP2K_INSN_MASK) == IP2K_INSN_VALUE)
+	relocation &= ~IP2K_INSN_MASK;
+      else
+	r = bfd_reloc_notsupported;
+      break;
+
+    case R_IP2K_16:
+      /* If this is a relocation involving a TEXT
+	 symbol, reduce it to a word address.  */
+      if ((relocation & IP2K_INSN_MASK) == IP2K_INSN_VALUE)
+	howto = &ip2k_elf_howto_table[ (int) R_IP2K_TEXT];
+      break;
+
+      /* Pass others through.  */
+    default:
+      break;
+    }
+
+  /* Only install relocation if above tests did not disqualify it.  */
+  if (r == bfd_reloc_ok)
+    r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+				  contents, rel->r_offset,
+				  relocation, rel->r_addend);
+
+  return r;
+}
+
+/* Relocate a IP2K ELF section.
+
+   The RELOCATE_SECTION function is called by the new ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures; if the section
+   actually uses Rel structures, the r_addend field will always be
+   zero.
+
+   This function is responsible for adjusting the section contents as
+   necessary, and (if using Rela relocs and generating a relocatable
+   output file) adjusting the reloc addend as necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.  */
+
+static bfd_boolean
+ip2k_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
+			   struct bfd_link_info *info,
+			   bfd *input_bfd,
+			   asection *input_section,
+			   bfd_byte *contents,
+			   Elf_Internal_Rela *relocs,
+			   Elf_Internal_Sym *local_syms,
+			   asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+
+  symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+  relend     = relocs + input_section->reloc_count;
+
+  for (rel = relocs; rel < relend; rel ++)
+    {
+      reloc_howto_type *           howto;
+      unsigned long                r_symndx;
+      Elf_Internal_Sym *           sym;
+      asection *                   sec;
+      struct elf_link_hash_entry * h;
+      bfd_vma                      relocation;
+      bfd_reloc_status_type        r;
+      const char *                 name = NULL;
+      int                          r_type;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      howto  = ip2k_elf_howto_table + r_type;
+      h      = NULL;
+      sym    = NULL;
+      sec    = NULL;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections [r_symndx];
+	  relocation = BASEADDR (sec) + sym->st_value;
+
+	  name = bfd_elf_string_from_elf_section
+	    (input_bfd, symtab_hdr->sh_link, sym->st_name);
+	  name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name;
+	}
+      else
+	{
+	  bfd_boolean warned;
+	  bfd_boolean unresolved_reloc;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+
+	  name = h->root.root.string;
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      /* Finally, the sole IP2K-specific part.  */
+      r = ip2k_final_link_relocate (howto, input_bfd, input_section,
+				     contents, rel, relocation);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char * msg = NULL;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      r = info->callbacks->reloc_overflow
+		(info, (h ? &h->root : NULL), name, howto->name,
+		 (bfd_vma) 0, input_bfd, input_section, rel->r_offset);
+	      break;
+
+	    case bfd_reloc_undefined:
+	      r = info->callbacks->undefined_symbol
+		(info, name, input_bfd, input_section, rel->r_offset, TRUE);
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      break;
+
+	      /* This is how ip2k_final_link_relocate tells us of a non-kosher
+                 reference between insn & data address spaces.  */
+	    case bfd_reloc_notsupported:
+              if (sym != NULL) /* Only if it's not an unresolved symbol.  */
+	         msg = _("unsupported relocation between data/insn address spaces");
+	      break;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous relocation");
+	      break;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      break;
+	    }
+
+	  if (msg)
+	    r = info->callbacks->warning
+	      (info, msg, name, input_bfd, input_section, rel->r_offset);
+
+	  if (! r)
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+#define TARGET_BIG_SYM	 bfd_elf32_ip2k_vec
+#define TARGET_BIG_NAME  "elf32-ip2k"
+
+#define ELF_ARCH	 bfd_arch_ip2k
+#define ELF_MACHINE_CODE EM_IP2K
+#define ELF_MACHINE_ALT1 EM_IP2K_OLD
+#define ELF_MAXPAGESIZE  1 /* No pages on the IP2K.  */
+
+#define elf_info_to_howto_rel			NULL
+#define elf_info_to_howto			ip2k_info_to_howto_rela
+
+#define elf_backend_can_gc_sections     	1
+#define elf_backend_rela_normal			1
+#define elf_backend_relocate_section		ip2k_elf_relocate_section
+
+#define elf_symbol_leading_char			'_'
+#define bfd_elf32_bfd_reloc_type_lookup		ip2k_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup	ip2k_reloc_name_lookup
+#define bfd_elf32_bfd_relax_section		ip2k_elf_relax_section
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-iq2000.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-iq2000.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-iq2000.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-iq2000.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,934 @@
+/* IQ2000-specific support for 32-bit ELF.
+   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/iq2000.h"
+
+/* Forward declarations.  */
+
+static bfd_reloc_status_type iq2000_elf_howto_hi16_reloc (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+
+
+static reloc_howto_type iq2000_elf_howto_table [] =
+{
+  /* This reloc does nothing.  */
+
+  HOWTO (R_IQ2000_NONE,		     /* type */
+	 0,			     /* rightshift */
+	 2,			     /* size (0 = byte, 1 = short, 2 = long) */
+	 32,			     /* bitsize */
+	 FALSE,			     /* pc_relative */
+	 0,			     /* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	     /* special_function */
+	 "R_IQ2000_NONE",	     /* name */
+	 FALSE,			     /* partial_inplace */
+	 0,			     /* src_mask */
+	 0,			     /* dst_mask */
+	 FALSE),		     /* pcrel_offset */
+
+  /* A 16 bit absolute relocation.  */
+  HOWTO (R_IQ2000_16,		     /* type */
+	 0,			     /* rightshift */
+	 1,			     /* size (0 = byte, 1 = short, 2 = long) */
+	 16,			     /* bitsize */
+	 FALSE,			     /* pc_relative */
+	 0,			     /* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	     /* special_function */
+	 "R_IQ2000_16",		     /* name */
+	 FALSE,			     /* partial_inplace */
+	 0x0000,		     /* src_mask */
+	 0xffff,		     /* dst_mask */
+	 FALSE),		     /* pcrel_offset */
+
+  /* A 32 bit absolute relocation.  */
+  HOWTO (R_IQ2000_32,		     /* type */
+	 0,			     /* rightshift */
+	 2,			     /* size (0 = byte, 1 = short, 2 = long) */
+	 31,			     /* bitsize */
+	 FALSE,			     /* pc_relative */
+	 0,			     /* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	     /* special_function */
+	 "R_IQ2000_32",		     /* name */
+	 FALSE,			     /* partial_inplace */
+	 0x00000000,		     /* src_mask */
+	 0x7fffffff,		     /* dst_mask */
+	 FALSE),		     /* pcrel_offset */
+
+  /* 26 bit branch address.  */
+  HOWTO (R_IQ2000_26,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+				/* This needs complex overflow
+				   detection, because the upper four
+				   bits must match the PC.  */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_IQ2000_26",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000000,		/* src_mask */
+	 0x03ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit PC relative reference.  */
+  HOWTO (R_IQ2000_PC16,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_IQ2000_PC16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* high 16 bits of symbol value.  */
+  HOWTO (R_IQ2000_HI16,		/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 15,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 iq2000_elf_howto_hi16_reloc,	/* special_function */
+	 "R_IQ2000_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000,		/* src_mask */
+	 0x7fff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of symbol value.  */
+  HOWTO (R_IQ2000_LO16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_IQ2000_LO16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16-bit jump offset.  */
+  HOWTO (R_IQ2000_OFFSET_16,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_IQ2000_OFFSET_16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 21-bit jump offset.  */
+  HOWTO (R_IQ2000_OFFSET_21,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 21,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_IQ2000_OFFSET_21",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x000000,		/* src_mask */
+	 0x1fffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* unsigned high 16 bits of value.  */
+  HOWTO (R_IQ2000_OFFSET_21,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_IQ2000_UHI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000,		/* src_mask */
+	 0x7fff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32 bit absolute debug relocation.  */
+  HOWTO (R_IQ2000_32_DEBUG,	     /* type */
+	 0,			     /* rightshift */
+	 2,			     /* size (0 = byte, 1 = short, 2 = long) */
+	 32,			     /* bitsize */
+	 FALSE,			     /* pc_relative */
+	 0,			     /* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	     /* special_function */
+	 "R_IQ2000_32",		     /* name */
+	 FALSE,			     /* partial_inplace */
+	 0x00000000,		     /* src_mask */
+	 0xffffffff,		     /* dst_mask */
+	 FALSE),		     /* pcrel_offset */
+
+};
+
+/* GNU extension to record C++ vtable hierarchy.  */
+static reloc_howto_type iq2000_elf_vtinherit_howto =
+  HOWTO (R_IQ2000_GNU_VTINHERIT,    /* type */
+	 0,			   /* rightshift */
+	 2,			   /* size (0 = byte, 1 = short, 2 = long) */
+	 0,			   /* bitsize */
+	 FALSE,			   /* pc_relative */
+	 0,			   /* bitpos */
+	 complain_overflow_dont,   /* complain_on_overflow */
+	 NULL,			   /* special_function */
+	 "R_IQ2000_GNU_VTINHERIT",  /* name */
+	 FALSE,			   /* partial_inplace */
+	 0,			   /* src_mask */
+	 0,			   /* dst_mask */
+	 FALSE);		   /* pcrel_offset */
+
+/* GNU extension to record C++ vtable member usage.  */
+static reloc_howto_type iq2000_elf_vtentry_howto =
+  HOWTO (R_IQ2000_GNU_VTENTRY,	   /* type */
+	 0,			   /* rightshift */
+	 2,			   /* size (0 = byte, 1 = short, 2 = long) */
+	 0,			   /* bitsize */
+	 FALSE,			   /* pc_relative */
+	 0,			   /* bitpos */
+	 complain_overflow_dont,   /* complain_on_overflow */
+	 NULL,			   /* special_function */
+	 "R_IQ2000_GNU_VTENTRY",    /* name */
+	 FALSE,			   /* partial_inplace */
+	 0,			   /* src_mask */
+	 0,			   /* dst_mask */
+	 FALSE);		   /* pcrel_offset */
+
+
+static bfd_reloc_status_type
+iq2000_elf_howto_hi16_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+			     arelent *reloc_entry,
+			     asymbol *symbol,
+			     void * data,
+			     asection *input_section,
+			     bfd *output_bfd,
+			     char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_reloc_status_type ret;
+  bfd_vma relocation;
+
+  /* If we're relocating and this an external symbol,
+     we don't want to change anything.  */
+  if (output_bfd != (bfd *) NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && reloc_entry->addend == 0)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  relocation += reloc_entry->addend;
+
+  /* If %lo will have sign-extension, compensate by add 0x10000 to hi portion.  */
+  if (relocation & 0x8000)
+    reloc_entry->addend += 0x10000;
+
+  /* Now do the reloc in the usual way.	 */
+  ret = bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+				input_section, output_bfd, error_message);
+
+  /* Put it back the way it was.  */
+  if (relocation & 0x8000)
+    reloc_entry->addend -= 0x10000;
+
+  return ret;
+}
+
+static bfd_reloc_status_type
+iq2000_elf_relocate_hi16 (bfd *input_bfd,
+			  Elf_Internal_Rela *relhi,
+			  bfd_byte *contents,
+			  bfd_vma value)
+{
+  bfd_vma insn;
+
+  insn = bfd_get_32 (input_bfd, contents + relhi->r_offset);
+  
+  value += relhi->r_addend;
+  value &= 0x7fffffff; /* Mask off top-bit which is Harvard mask bit.  */
+
+  /* If top-bit of %lo value is on, this means that %lo will
+     sign-propagate and so we compensate by adding 1 to %hi value.  */
+  if (value & 0x8000)
+    value += 0x10000;
+
+  value >>= 16; 
+  insn = ((insn & ~0xFFFF) | value);
+
+  bfd_put_32 (input_bfd, insn, contents + relhi->r_offset);
+  return bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type
+iq2000_elf_relocate_offset16 (bfd *input_bfd,
+			      Elf_Internal_Rela *rel,
+			      bfd_byte *contents,
+			      bfd_vma value,
+			      bfd_vma location)
+{
+  bfd_vma insn;
+  bfd_vma jtarget;
+
+  insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+
+  value += rel->r_addend;
+
+  if (value & 3)
+    return bfd_reloc_dangerous;
+
+  jtarget = (value & 0x3fffc) | (location & 0xf0000000L);
+
+  if (jtarget != value)
+    return bfd_reloc_overflow;
+
+  insn = (insn & ~0xFFFF) | ((value >> 2) & 0xFFFF);
+
+  bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
+  return bfd_reloc_ok;
+}
+
+/* Map BFD reloc types to IQ2000 ELF reloc types.  */
+
+static reloc_howto_type *
+iq2000_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			  bfd_reloc_code_real_type code)
+{
+  /* Note that the iq2000_elf_howto_table is indxed by the R_
+     constants.	 Thus, the order that the howto records appear in the
+     table *must* match the order of the relocation types defined in
+     include/elf/iq2000.h.  */
+
+  switch (code)
+    {
+    case BFD_RELOC_NONE:
+      return &iq2000_elf_howto_table[ (int) R_IQ2000_NONE];
+    case BFD_RELOC_16:
+      return &iq2000_elf_howto_table[ (int) R_IQ2000_16];
+    case BFD_RELOC_32:
+      return &iq2000_elf_howto_table[ (int) R_IQ2000_32];
+    case BFD_RELOC_MIPS_JMP:
+      return &iq2000_elf_howto_table[ (int) R_IQ2000_26];
+    case BFD_RELOC_IQ2000_OFFSET_16:
+      return &iq2000_elf_howto_table[ (int) R_IQ2000_OFFSET_16];
+    case BFD_RELOC_IQ2000_OFFSET_21:
+      return &iq2000_elf_howto_table[ (int) R_IQ2000_OFFSET_21];
+    case BFD_RELOC_16_PCREL_S2:
+      return &iq2000_elf_howto_table[ (int) R_IQ2000_PC16];
+    case BFD_RELOC_HI16:
+      return &iq2000_elf_howto_table[ (int) R_IQ2000_HI16];
+    case BFD_RELOC_IQ2000_UHI16:
+      return &iq2000_elf_howto_table[ (int) R_IQ2000_UHI16];
+    case BFD_RELOC_LO16:
+      return &iq2000_elf_howto_table[ (int) R_IQ2000_LO16];
+    case BFD_RELOC_VTABLE_INHERIT:
+      return &iq2000_elf_vtinherit_howto;
+    case BFD_RELOC_VTABLE_ENTRY:
+      return &iq2000_elf_vtentry_howto;
+    default:
+      /* Pacify gcc -Wall.  */
+      return NULL;
+    }
+  return NULL;
+}
+
+static reloc_howto_type *
+iq2000_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (iq2000_elf_howto_table)
+	    / sizeof (iq2000_elf_howto_table[0]));
+       i++)
+    if (iq2000_elf_howto_table[i].name != NULL
+	&& strcasecmp (iq2000_elf_howto_table[i].name, r_name) == 0)
+      return &iq2000_elf_howto_table[i];
+
+  if (strcasecmp (iq2000_elf_vtinherit_howto.name, r_name) == 0)
+    return &iq2000_elf_vtinherit_howto;
+  if (strcasecmp (iq2000_elf_vtentry_howto.name, r_name) == 0)
+    return &iq2000_elf_vtentry_howto;
+
+  return NULL;
+}
+
+/* Perform a single relocation.	 By default we use the standard BFD
+   routines.  */
+
+static bfd_reloc_status_type
+iq2000_final_link_relocate (reloc_howto_type *	howto,
+			    bfd *		input_bfd,
+			    asection *		input_section,
+			    bfd_byte *		contents,
+			    Elf_Internal_Rela *	rel,
+			    bfd_vma		relocation)
+{
+  return _bfd_final_link_relocate (howto, input_bfd, input_section,
+				   contents, rel->r_offset,
+				   relocation, rel->r_addend);
+}
+
+/* Set the howto pointer for a IQ2000 ELF reloc.  */
+
+static void
+iq2000_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED,
+			   arelent * cache_ptr,
+			   Elf_Internal_Rela * dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  switch (r_type)
+    {
+    case R_IQ2000_GNU_VTINHERIT:
+      cache_ptr->howto = & iq2000_elf_vtinherit_howto;
+      break;
+
+    case R_IQ2000_GNU_VTENTRY:
+      cache_ptr->howto = & iq2000_elf_vtentry_howto;
+      break;
+
+    default:
+      cache_ptr->howto = & iq2000_elf_howto_table [r_type];
+      break;
+    }
+}
+
+/* Look through the relocs for a section during the first phase.
+   Since we don't do .gots or .plts, we just need to consider the
+   virtual table relocs for gc.	 */
+ 
+static bfd_boolean
+iq2000_elf_check_relocs (bfd *abfd,
+			 struct bfd_link_info *info,
+			 asection *sec,
+			 const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  bfd_boolean changed = FALSE;
+  
+  if (info->relocatable)
+    return TRUE;
+  
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+      
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+	h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+      
+      switch (ELF32_R_TYPE (rel->r_info))
+	{
+	  /* This relocation describes the C++ object vtable
+	     hierarchy.  Reconstruct it for later use during GC.  */
+	case R_IQ2000_GNU_VTINHERIT:
+	  if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+	    return FALSE;
+	  break;
+	  
+	  /* This relocation describes which C++ vtable entries
+	     are actually used.  Record for later use during GC.  */
+	case R_IQ2000_GNU_VTENTRY:
+	  BFD_ASSERT (h != NULL);
+	  if (h != NULL
+	      && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+	    return FALSE;
+	  break;
+
+	case R_IQ2000_32:
+	  /* For debug section, change to special harvard-aware relocations.  */
+	  if (CONST_STRNEQ (sec->name, ".debug")
+	      || CONST_STRNEQ (sec->name, ".stab")
+	      || CONST_STRNEQ (sec->name, ".eh_frame"))
+	    {
+	      ((Elf_Internal_Rela *) rel)->r_info
+		= ELF32_R_INFO (ELF32_R_SYM (rel->r_info), R_IQ2000_32_DEBUG);
+	      changed = TRUE;
+	    }
+	  break;
+	}
+    }
+
+  if (changed)
+    /* Note that we've changed relocs, otherwise if !info->keep_memory
+       we'll free the relocs and lose our changes.  */
+    elf_section_data (sec)->relocs = (Elf_Internal_Rela *) relocs;
+
+  return TRUE;
+}
+
+
+/* Relocate a IQ2000 ELF section.
+   There is some attempt to make this function usable for many architectures,
+   both USE_REL and USE_RELA ['twould be nice if such a critter existed],
+   if only to serve as a learning tool.
+
+   The RELOCATE_SECTION function is called by the new ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures; if the section
+   actually uses Rel structures, the r_addend field will always be
+   zero.
+
+   This function is responsible for adjusting the section contents as
+   necessary, and (if using Rela relocs and generating a relocatable
+   output file) adjusting the reloc addend as necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.	 */
+
+static bfd_boolean
+iq2000_elf_relocate_section (bfd *		     output_bfd ATTRIBUTE_UNUSED,
+			     struct bfd_link_info *  info,
+			     bfd *		     input_bfd,
+			     asection *		     input_section,
+			     bfd_byte *		     contents,
+			     Elf_Internal_Rela *     relocs,
+			     Elf_Internal_Sym *	     local_syms,
+			     asection **	     local_sections)
+{
+  Elf_Internal_Shdr *		symtab_hdr;
+  struct elf_link_hash_entry ** sym_hashes;
+  Elf_Internal_Rela *		rel;
+  Elf_Internal_Rela *		relend;
+
+  symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+  relend     = relocs + input_section->reloc_count;
+
+  for (rel = relocs; rel < relend; rel ++)
+    {
+      reloc_howto_type *	   howto;
+      unsigned long		   r_symndx;
+      Elf_Internal_Sym *	   sym;
+      asection *		   sec;
+      struct elf_link_hash_entry * h;
+      bfd_vma			   relocation;
+      bfd_reloc_status_type	   r;
+      const char *		   name = NULL;
+      int			   r_type;
+      
+      r_type = ELF32_R_TYPE (rel->r_info);
+      
+      if (   r_type == R_IQ2000_GNU_VTINHERIT
+	  || r_type == R_IQ2000_GNU_VTENTRY)
+	continue;
+      
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      howto  = iq2000_elf_howto_table + ELF32_R_TYPE (rel->r_info);
+      h	     = NULL;
+      sym    = NULL;
+      sec    = NULL;
+      
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  asection *osec;
+
+	  sym = local_syms + r_symndx;
+	  osec = sec = local_sections [r_symndx];
+	  if ((sec->flags & SEC_MERGE)
+	      && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+	    /* This relocation is relative to a section symbol that is
+	       going to be merged.  Change it so that it is relative
+	       to the merged section symbol.  */
+	    rel->r_addend = _bfd_elf_rel_local_sym (output_bfd, sym, &sec,
+						    rel->r_addend);
+
+	  relocation = (sec->output_section->vma
+			+ sec->output_offset
+			+ sym->st_value);
+	  
+	  name = bfd_elf_string_from_elf_section
+	    (input_bfd, symtab_hdr->sh_link, sym->st_name);
+	  name = (name == NULL) ? bfd_section_name (input_bfd, osec) : name;
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc;
+	  bfd_boolean warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+
+	  name = h->root.root.string;
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      switch (r_type)
+	{
+	case R_IQ2000_HI16:
+	  r = iq2000_elf_relocate_hi16 (input_bfd, rel, contents, relocation);
+	  break;
+
+	case R_IQ2000_OFFSET_16:
+	  r = iq2000_elf_relocate_offset16 (input_bfd, rel, contents, relocation,
+					    input_section->output_section->vma
+					    + input_section->output_offset
+					    + rel->r_offset);
+	  break;
+
+	case R_IQ2000_PC16:
+	  rel->r_addend -= 4;
+	  /* Fall through.  */
+
+	default:
+	  r = iq2000_final_link_relocate (howto, input_bfd, input_section,
+					 contents, rel, relocation);
+	  break;
+	}
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char * msg = (const char *) NULL;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      r = info->callbacks->reloc_overflow
+		(info, (h ? &h->root : NULL), name, howto->name,
+		 (bfd_vma) 0, input_bfd, input_section, rel->r_offset);
+	      break;
+	      
+	    case bfd_reloc_undefined:
+	      r = info->callbacks->undefined_symbol
+		(info, name, input_bfd, input_section, rel->r_offset, TRUE);
+	      break;
+	      
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      break;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      break;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous relocation");
+	      break;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      break;
+	    }
+
+	  if (msg)
+	    r = info->callbacks->warning
+	      (info, msg, name, input_bfd, input_section, rel->r_offset);
+
+	  if (! r)
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+
+/* Return the section that should be marked against GC for a given
+   relocation.	*/
+
+static asection *
+iq2000_elf_gc_mark_hook (asection *sec,
+			 struct bfd_link_info *info,
+			 Elf_Internal_Rela *rel,
+			 struct elf_link_hash_entry *h,
+			 Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_IQ2000_GNU_VTINHERIT:
+      case R_IQ2000_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+
+/* Return the MACH for an e_flags value.  */
+
+static int
+elf32_iq2000_machine (bfd *abfd)
+{
+  switch (elf_elfheader (abfd)->e_flags & EF_IQ2000_CPU_MASK)
+    {
+    case EF_IQ2000_CPU_IQ10:
+      return bfd_mach_iq10;
+
+    case EF_IQ2000_CPU_IQ2000:
+    default:
+      return bfd_mach_iq2000;
+    }
+}
+
+
+/* Function to set the ELF flag bits.  */
+
+static bfd_boolean
+iq2000_elf_set_private_flags (bfd *abfd, flagword flags)
+{
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
+}
+
+/* Copy backend specific data from one object module to another.  */
+
+static bfd_boolean
+iq2000_elf_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  BFD_ASSERT (!elf_flags_init (obfd)
+	      || elf_elfheader (obfd)->e_flags == elf_elfheader (ibfd)->e_flags);
+
+  elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
+  elf_flags_init (obfd) = TRUE;
+
+  /* Copy object attributes.  */
+  _bfd_elf_copy_obj_attributes (ibfd, obfd);
+
+  return TRUE;
+}
+
+/* Merge backend specific data from an object
+   file to the output object file when linking.  */
+
+static bfd_boolean
+iq2000_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  flagword old_flags, old_partial;
+  flagword new_flags, new_partial;
+  bfd_boolean error = FALSE;
+  char new_opt[80];
+  char old_opt[80];
+
+  new_opt[0] = old_opt[0] = '\0';
+  new_flags = elf_elfheader (ibfd)->e_flags;
+  old_flags = elf_elfheader (obfd)->e_flags;
+
+  if (!elf_flags_init (obfd))
+    {
+      /* First call, no flags set.  */
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = new_flags;
+    }
+
+  else if (new_flags != old_flags)
+    {
+      /* Warn if different cpu is used, but allow a
+	 specific cpu to override the generic cpu.  */
+      new_partial = (new_flags & EF_IQ2000_CPU_MASK);
+      old_partial = (old_flags & EF_IQ2000_CPU_MASK);
+
+      if (new_partial != old_partial)
+	{
+	  switch (new_partial)
+	    {
+	    case EF_IQ2000_CPU_IQ10:
+	      strcat (new_opt, " -m10");
+	      break;
+
+	    default:
+	    case EF_IQ2000_CPU_IQ2000:
+	      strcat (new_opt, " -m2000");
+	      break;
+	    }
+
+	  switch (old_partial)
+	    {
+	    case EF_IQ2000_CPU_IQ10:
+	      strcat (old_opt, " -m10");
+	      break;
+
+	    default:
+	    case EF_IQ2000_CPU_IQ2000:
+	      strcat (old_opt, " -m2000");
+	      break;
+	    }
+	}
+      
+      /* Print out any mismatches from above.  */
+      if (new_opt[0])
+	{
+	  error = TRUE;
+	  _bfd_error_handler
+	    (_("%s: compiled with %s and linked with modules compiled with %s"),
+	     bfd_get_filename (ibfd), new_opt, old_opt);
+	}
+
+      new_flags &= ~ EF_IQ2000_ALL_FLAGS;
+      old_flags &= ~ EF_IQ2000_ALL_FLAGS;
+
+      /* Warn about any other mismatches.  */
+      if (new_flags != old_flags)
+	{
+	  error = TRUE;
+
+	  _bfd_error_handler
+	    (_("%s: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"),
+	     bfd_get_filename (ibfd), (long)new_flags, (long)old_flags);
+	}
+    }
+
+  if (error)
+    bfd_set_error (bfd_error_bad_value);
+
+  return !error;
+}
+
+
+static bfd_boolean
+iq2000_elf_print_private_bfd_data (bfd *abfd, void * ptr)
+{
+  FILE *file = (FILE *) ptr;
+  flagword flags;
+
+  BFD_ASSERT (abfd != NULL && ptr != NULL);
+
+  /* Print normal ELF private data.  */
+  _bfd_elf_print_private_bfd_data (abfd, ptr);
+
+  flags = elf_elfheader (abfd)->e_flags;
+  fprintf (file, _("private flags = 0x%lx:"), (unsigned long) flags);
+
+  switch (flags & EF_IQ2000_CPU_MASK)
+    {
+    case EF_IQ2000_CPU_IQ10:
+      fprintf (file, " -m10");
+      break;
+    case EF_IQ2000_CPU_IQ2000:
+      fprintf (file, " -m2000");
+      break;
+    default:
+      break;
+    }
+
+  fputc ('\n', file);
+  return TRUE;
+}
+
+static
+bfd_boolean
+iq2000_elf_object_p (bfd *abfd)
+{
+  bfd_default_set_arch_mach (abfd, bfd_arch_iq2000,
+			     elf32_iq2000_machine (abfd));
+  return TRUE;
+}
+
+
+#define ELF_ARCH		bfd_arch_iq2000
+#define ELF_MACHINE_CODE	EM_IQ2000
+#define ELF_MAXPAGESIZE		0x1000
+
+#define TARGET_BIG_SYM		bfd_elf32_iq2000_vec
+#define TARGET_BIG_NAME		"elf32-iq2000"
+
+#define elf_info_to_howto_rel			NULL
+#define elf_info_to_howto			iq2000_info_to_howto_rela
+#define elf_backend_relocate_section		iq2000_elf_relocate_section
+#define elf_backend_gc_mark_hook		iq2000_elf_gc_mark_hook
+#define elf_backend_check_relocs		iq2000_elf_check_relocs
+#define elf_backend_object_p			iq2000_elf_object_p
+#define elf_backend_rela_normal			1
+
+#define elf_backend_can_gc_sections		1
+
+#define bfd_elf32_bfd_reloc_type_lookup		iq2000_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup	iq2000_reloc_name_lookup
+#define bfd_elf32_bfd_set_private_flags		iq2000_elf_set_private_flags
+#define bfd_elf32_bfd_copy_private_bfd_data	iq2000_elf_copy_private_bfd_data
+#define bfd_elf32_bfd_merge_private_bfd_data	iq2000_elf_merge_private_bfd_data
+#define bfd_elf32_bfd_print_private_bfd_data	iq2000_elf_print_private_bfd_data
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-lm32.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-lm32.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-lm32.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-lm32.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2896 @@
+/* Lattice Mico32-specific support for 32-bit ELF
+   Copyright 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Contributed by Jon Beniston <jon@beniston.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "bfd.h"
+#include "sysdep.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/lm32.h"
+
+#define DEFAULT_STACK_SIZE 0x20000
+
+#define PLT_ENTRY_SIZE 20
+
+#define PLT0_ENTRY_WORD0  0
+#define PLT0_ENTRY_WORD1  0
+#define PLT0_ENTRY_WORD2  0
+#define PLT0_ENTRY_WORD3  0
+#define PLT0_ENTRY_WORD4  0
+
+#define PLT0_PIC_ENTRY_WORD0  0
+#define PLT0_PIC_ENTRY_WORD1  0
+#define PLT0_PIC_ENTRY_WORD2  0
+#define PLT0_PIC_ENTRY_WORD3  0
+#define PLT0_PIC_ENTRY_WORD4  0
+
+#define ELF_DYNAMIC_INTERPRETER "/usr/lib/libc.so.1"
+
+extern const bfd_target bfd_elf32_lm32fdpic_vec;
+
+#define IS_FDPIC(bfd) ((bfd)->xvec == &bfd_elf32_lm32fdpic_vec)
+
+static bfd_reloc_status_type lm32_elf_gprel_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+
+/* The linker needs to keep track of the number of relocs that it
+   decides to copy as dynamic relocs in check_relocs for each symbol.
+   This is so that it can later discard them if they are found to be
+   unnecessary.  We store the information in a field extending the
+   regular ELF linker hash table.  */
+
+struct elf_lm32_dyn_relocs
+{
+  struct elf_lm32_dyn_relocs *next;
+
+  /* The input section of the reloc.  */
+  asection *sec;
+
+  /* Total number of relocs copied for the input section.  */
+  bfd_size_type count;
+
+  /* Number of pc-relative relocs copied for the input section.  */
+  bfd_size_type pc_count;
+};
+
+/* lm32 ELF linker hash entry.  */
+
+struct elf_lm32_link_hash_entry
+{
+  struct elf_link_hash_entry root;
+
+  /* Track dynamic relocs copied for this symbol.  */
+  struct elf_lm32_dyn_relocs *dyn_relocs;
+};
+
+/* lm32 ELF linker hash table.  */
+
+struct elf_lm32_link_hash_table
+{
+  struct elf_link_hash_table root;
+
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *sgot;
+  asection *sgotplt;
+  asection *srelgot;
+  asection *sfixup32;
+  asection *splt;
+  asection *srelplt;
+  asection *sdynbss;
+  asection *srelbss;
+
+  int relocs32;
+};
+
+/* Get the lm32 ELF linker hash table from a link_info structure.  */
+
+#define lm32_elf_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == LM32_ELF_DATA ? ((struct elf_lm32_link_hash_table *) ((p)->hash)) : NULL)
+
+#define lm32fdpic_got_section(info) \
+  (lm32_elf_hash_table (info)->sgot)
+#define lm32fdpic_gotrel_section(info) \
+  (lm32_elf_hash_table (info)->srelgot)
+#define lm32fdpic_fixup32_section(info) \
+  (lm32_elf_hash_table (info)->sfixup32)
+
+struct weak_symbol_list
+{
+  const char *name;
+  struct weak_symbol_list *next;
+};
+
+/* Create an entry in an lm32 ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+lm32_elf_link_hash_newfunc (struct bfd_hash_entry *entry,
+			    struct bfd_hash_table *table,
+			    const char *string)
+{
+  struct elf_lm32_link_hash_entry *ret =
+    (struct elf_lm32_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = bfd_hash_allocate (table,
+			     sizeof (struct elf_lm32_link_hash_entry));
+  if (ret == NULL)
+    return NULL;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct elf_lm32_link_hash_entry *)
+         _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
+                                     table, string));
+  if (ret != NULL)
+    {
+      struct elf_lm32_link_hash_entry *eh;
+
+      eh = (struct elf_lm32_link_hash_entry *) ret;
+      eh->dyn_relocs = NULL;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Create an lm32 ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+lm32_elf_link_hash_table_create (bfd *abfd)
+{
+  struct elf_lm32_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct elf_lm32_link_hash_table);
+
+  ret = bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->root, abfd,
+				      lm32_elf_link_hash_newfunc,
+				      sizeof (struct elf_lm32_link_hash_entry),
+				      LM32_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  ret->sgot = NULL;
+  ret->sgotplt = NULL;
+  ret->srelgot = NULL;
+  ret->sfixup32 = NULL;
+  ret->splt = NULL;
+  ret->srelplt = NULL;
+  ret->sdynbss = NULL;
+  ret->srelbss = NULL;
+  ret->relocs32 = 0;
+
+  return &ret->root.root;
+}
+
+/* Add a fixup to the ROFIXUP section.  */
+
+static bfd_vma
+_lm32fdpic_add_rofixup (bfd *output_bfd, asection *rofixup, bfd_vma relocation)
+{
+  bfd_vma fixup_offset;
+
+  if (rofixup->flags & SEC_EXCLUDE)
+    return -1;
+
+  fixup_offset = rofixup->reloc_count * 4;
+  if (rofixup->contents)
+    {
+      BFD_ASSERT (fixup_offset < rofixup->size);
+      if (fixup_offset < rofixup->size)
+      bfd_put_32 (output_bfd, relocation, rofixup->contents + fixup_offset);
+    }
+  rofixup->reloc_count++;
+
+  return fixup_offset;
+}
+
+/* Create .got, .gotplt, and .rela.got sections in DYNOBJ, and set up
+   shortcuts to them in our hash table.  */
+
+static bfd_boolean
+create_got_section (bfd *dynobj, struct bfd_link_info *info)
+{
+  struct elf_lm32_link_hash_table *htab;
+  asection *s;
+
+  /* This function may be called more than once.  */
+  s = bfd_get_section_by_name (dynobj, ".got");
+  if (s != NULL && (s->flags & SEC_LINKER_CREATED) != 0)
+    return TRUE;
+
+  htab = lm32_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (! _bfd_elf_create_got_section (dynobj, info))
+    return FALSE;
+
+  htab->sgot = bfd_get_section_by_name (dynobj, ".got");
+  htab->sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");
+  htab->srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+  if (! htab->sgot || ! htab->sgotplt || ! htab->srelgot)
+    abort ();
+
+  return TRUE;
+}
+
+/* Create .rofixup sections in DYNOBJ, and set up
+   shortcuts to them in our hash table.  */
+
+static bfd_boolean
+create_rofixup_section (bfd *dynobj, struct bfd_link_info *info)
+{
+  struct elf_lm32_link_hash_table *htab;
+  htab = lm32_elf_hash_table (info);
+
+  if (htab == NULL)
+    return FALSE;
+
+  /* Fixup section for R_LM32_32 relocs.  */
+  lm32fdpic_fixup32_section (info) = bfd_make_section_with_flags (dynobj,
+                                                                   ".rofixup",
+				                                   (SEC_ALLOC
+                                                                   | SEC_LOAD
+                                                                   | SEC_HAS_CONTENTS
+                                                                   | SEC_IN_MEMORY
+	                                                           | SEC_LINKER_CREATED
+                                                                   | SEC_READONLY));
+  if (lm32fdpic_fixup32_section (info) == NULL
+      || ! bfd_set_section_alignment (dynobj, lm32fdpic_fixup32_section (info), 2))
+    return FALSE;
+
+  return TRUE;
+}
+
+static reloc_howto_type lm32_elf_howto_table [] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_LM32_NONE,               /* type */
+         0,                         /* rightshift */
+         2,                         /* size (0 = byte, 1 = short, 2 = long) */
+         32,                        /* bitsize */
+         FALSE,                     /* pc_relative */
+         0,                         /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,     /* special_function */
+         "R_LM32_NONE",             /* name */
+         FALSE,                     /* partial_inplace */
+         0,                         /* src_mask */
+         0,                         /* dst_mask */
+         FALSE),                    /* pcrel_offset */
+
+  /* An 8 bit absolute relocation.  */
+  HOWTO (R_LM32_8,                  /* type */
+         0,                         /* rightshift */
+         0,                         /* size (0 = byte, 1 = short, 2 = long) */
+         8,                         /* bitsize */
+         FALSE,                     /* pc_relative */
+         0,                         /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,     /* special_function */
+         "R_LM32_8",                /* name */
+         FALSE,                     /* partial_inplace */
+         0,                         /* src_mask */
+         0xff,                      /* dst_mask */
+         FALSE),                    /* pcrel_offset */
+
+  /* A 16 bit absolute relocation.  */
+  HOWTO (R_LM32_16,                 /* type */
+         0,                         /* rightshift */
+         1,                         /* size (0 = byte, 1 = short, 2 = long) */
+         16,                        /* bitsize */
+         FALSE,                     /* pc_relative */
+         0,                         /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,     /* special_function */
+         "R_LM32_16",               /* name */
+         FALSE,                     /* partial_inplace */
+         0,                         /* src_mask */
+         0xffff,                    /* dst_mask */
+         FALSE),                    /* pcrel_offset */
+
+  /* A 32 bit absolute relocation.  */
+  HOWTO (R_LM32_32,                 /* type */
+         0,                         /* rightshift */
+         2,                         /* size (0 = byte, 1 = short, 2 = long) */
+         32,                        /* bitsize */
+         FALSE,                     /* pc_relative */
+         0,                         /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,     /* special_function */
+         "R_LM32_32",               /* name */
+         FALSE,                     /* partial_inplace */
+         0,                         /* src_mask */
+         0xffffffff,                /* dst_mask */
+         FALSE),                    /* pcrel_offset */
+
+  HOWTO (R_LM32_HI16,               /* type */
+         16,                        /* rightshift */
+         2,                         /* size (0 = byte, 1 = short, 2 = long) */
+         16,                        /* bitsize */
+         FALSE,                     /* pc_relative */
+         0,                         /* bitpos */
+         complain_overflow_bitfield,/* complain_on_overflow */
+         bfd_elf_generic_reloc,     /* special_function */
+         "R_LM32_HI16",             /* name */
+         FALSE,                     /* partial_inplace */
+         0,                         /* src_mask */
+         0xffff,                    /* dst_mask */
+         FALSE),                    /* pcrel_offset */
+
+  HOWTO (R_LM32_LO16,               /* type */
+         0,                         /* rightshift */
+         2,                         /* size (0 = byte, 1 = short, 2 = long) */
+         16,                        /* bitsize */
+         FALSE,                     /* pc_relative */
+         0,                         /* bitpos */
+         complain_overflow_dont,    /* complain_on_overflow */
+         bfd_elf_generic_reloc,     /* special_function */
+         "R_LM32_LO16",             /* name */
+         FALSE,                     /* partial_inplace */
+         0,                         /* src_mask */
+         0xffff,                    /* dst_mask */
+         FALSE),                    /* pcrel_offset */
+
+  HOWTO (R_LM32_GPREL16,            /* type */
+         0,                         /* rightshift */
+         2,                         /* size (0 = byte, 1 = short, 2 = long) */
+         16,                        /* bitsize */
+         FALSE,                     /* pc_relative */
+         0,                         /* bitpos */
+         complain_overflow_dont,    /* complain_on_overflow */
+         lm32_elf_gprel_reloc,      /* special_function */
+         "R_LM32_GPREL16",          /* name */
+         FALSE,                     /* partial_inplace */
+         0,                         /* src_mask */
+         0xffff,                    /* dst_mask */
+         FALSE),                    /* pcrel_offset */
+
+  HOWTO (R_LM32_CALL,               /* type */
+         2,                         /* rightshift */
+         2,                         /* size (0 = byte, 1 = short, 2 = long) */
+         26,                        /* bitsize */
+         TRUE,                      /* pc_relative */
+         0,                         /* bitpos */
+         complain_overflow_signed,  /* complain_on_overflow */
+         bfd_elf_generic_reloc,     /* special_function */
+         "R_LM32_CALL",             /* name */
+         FALSE,                     /* partial_inplace */
+         0,                         /* src_mask */
+         0x3ffffff,                 /* dst_mask */
+         TRUE),                     /* pcrel_offset */
+
+  HOWTO (R_LM32_BRANCH,             /* type */
+         2,                         /* rightshift */
+         2,                         /* size (0 = byte, 1 = short, 2 = long) */
+         16,                        /* bitsize */
+         TRUE,                      /* pc_relative */
+         0,                         /* bitpos */
+         complain_overflow_signed,  /* complain_on_overflow */
+         bfd_elf_generic_reloc,     /* special_function */
+         "R_LM32_BRANCH",           /* name */
+         FALSE,                     /* partial_inplace */
+         0,                         /* src_mask */
+         0xffff,                    /* dst_mask */
+         TRUE),                     /* pcrel_offset */
+
+  /* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_LM32_GNU_VTINHERIT,      /* type */
+         0,                         /* rightshift */
+         2,                         /* size (0 = byte, 1 = short, 2 = long) */
+         0,                         /* bitsize */
+         FALSE,                     /* pc_relative */
+         0,                         /* bitpos */
+         complain_overflow_dont,    /* complain_on_overflow */
+         NULL,                      /* special_function */
+         "R_LM32_GNU_VTINHERIT",    /* name */
+         FALSE,                     /* partial_inplace */
+         0,                         /* src_mask */
+         0,                         /* dst_mask */
+         FALSE),                    /* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage.  */
+  HOWTO (R_LM32_GNU_VTENTRY,        /* type */
+         0,                         /* rightshift */
+         2,                         /* size (0 = byte, 1 = short, 2 = long) */
+         0,                         /* bitsize */
+         FALSE,                     /* pc_relative */
+         0,                         /* bitpos */
+         complain_overflow_dont,    /* complain_on_overflow */
+         _bfd_elf_rel_vtable_reloc_fn,/* special_function */
+         "R_LM32_GNU_VTENTRY",      /* name */
+         FALSE,                     /* partial_inplace */
+         0,                         /* src_mask */
+         0,                         /* dst_mask */
+         FALSE),                    /* pcrel_offset */
+
+  HOWTO (R_LM32_16_GOT,             /* type */
+         0,                         /* rightshift */
+         2,                         /* size (0 = byte, 1 = short, 2 = long) */
+         16,                        /* bitsize */
+         FALSE,                     /* pc_relative */
+         0,                         /* bitpos */
+         complain_overflow_signed,  /* complain_on_overflow */
+         bfd_elf_generic_reloc,     /* special_function */
+         "R_LM32_16_GOT",           /* name */
+         FALSE,                     /* partial_inplace */
+         0,                         /* src_mask */
+         0xffff,                    /* dst_mask */
+         FALSE),                    /* pcrel_offset */
+
+  HOWTO (R_LM32_GOTOFF_HI16,        /* type */
+         16,                        /* rightshift */
+         2,                         /* size (0 = byte, 1 = short, 2 = long) */
+         16,                        /* bitsize */
+         FALSE,                     /* pc_relative */
+         0,                         /* bitpos */
+         complain_overflow_dont,    /* complain_on_overflow */
+         bfd_elf_generic_reloc,     /* special_function */
+         "R_LM32_GOTOFF_HI16",      /* name */
+         FALSE,                     /* partial_inplace */
+         0xffff,                    /* src_mask */
+         0xffff,                    /* dst_mask */
+         FALSE),                    /* pcrel_offset */
+
+  HOWTO (R_LM32_GOTOFF_LO16,        /* type */
+         0,                         /* rightshift */
+         2,                         /* size (0 = byte, 1 = short, 2 = long) */
+         16,                        /* bitsize */
+         FALSE,                     /* pc_relative */
+         0,                         /* bitpos */
+         complain_overflow_dont,    /* complain_on_overflow */
+         bfd_elf_generic_reloc,     /* special_function */
+         "R_LM32_GOTOFF_LO16",      /* name */
+         FALSE,                     /* partial_inplace */
+         0xffff,                    /* src_mask */
+         0xffff,                    /* dst_mask */
+         FALSE),                    /* pcrel_offset */
+
+  HOWTO (R_LM32_COPY,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_LM32_COPY",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_LM32_GLOB_DAT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_LM32_GLOB_DAT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_LM32_JMP_SLOT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_LM32_JMP_SLOT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_LM32_RELATIVE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_LM32_RELATIVE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+};
+
+/* Map BFD reloc types to lm32 ELF reloc types. */
+
+struct lm32_reloc_map
+{
+    bfd_reloc_code_real_type bfd_reloc_val;
+    unsigned char elf_reloc_val;
+};
+
+static const struct lm32_reloc_map lm32_reloc_map[] =
+{
+  { BFD_RELOC_NONE,             R_LM32_NONE },
+  { BFD_RELOC_8,                R_LM32_8 },
+  { BFD_RELOC_16,               R_LM32_16 },
+  { BFD_RELOC_32,               R_LM32_32 },
+  { BFD_RELOC_HI16,             R_LM32_HI16 },
+  { BFD_RELOC_LO16,             R_LM32_LO16 },
+  { BFD_RELOC_GPREL16,          R_LM32_GPREL16 },
+  { BFD_RELOC_LM32_CALL,        R_LM32_CALL },
+  { BFD_RELOC_LM32_BRANCH,      R_LM32_BRANCH },
+  { BFD_RELOC_VTABLE_INHERIT,   R_LM32_GNU_VTINHERIT },
+  { BFD_RELOC_VTABLE_ENTRY,     R_LM32_GNU_VTENTRY },
+  { BFD_RELOC_LM32_16_GOT,      R_LM32_16_GOT },
+  { BFD_RELOC_LM32_GOTOFF_HI16, R_LM32_GOTOFF_HI16 },
+  { BFD_RELOC_LM32_GOTOFF_LO16, R_LM32_GOTOFF_LO16 },
+  { BFD_RELOC_LM32_COPY,        R_LM32_COPY },
+  { BFD_RELOC_LM32_GLOB_DAT,    R_LM32_GLOB_DAT },
+  { BFD_RELOC_LM32_JMP_SLOT,    R_LM32_JMP_SLOT },
+  { BFD_RELOC_LM32_RELATIVE,    R_LM32_RELATIVE },
+};
+
+static reloc_howto_type *
+lm32_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                        bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (lm32_reloc_map) / sizeof (lm32_reloc_map[0]); i++)
+    if (lm32_reloc_map[i].bfd_reloc_val == code)
+      return &lm32_elf_howto_table[lm32_reloc_map[i].elf_reloc_val];
+  return NULL;
+}
+
+static reloc_howto_type *
+lm32_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (lm32_elf_howto_table) / sizeof (lm32_elf_howto_table[0]);
+       i++)
+    if (lm32_elf_howto_table[i].name != NULL
+	&& strcasecmp (lm32_elf_howto_table[i].name, r_name) == 0)
+      return &lm32_elf_howto_table[i];
+
+  return NULL;
+}
+
+
+/* Set the howto pointer for an Lattice Mico32 ELF reloc.  */
+
+static void
+lm32_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
+                         arelent *cache_ptr,
+                         Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_LM32_max);
+  cache_ptr->howto = &lm32_elf_howto_table[r_type];
+}
+
+/* Set the right machine number for an Lattice Mico32 ELF file. */
+
+static bfd_boolean
+lm32_elf_object_p (bfd *abfd)
+{
+  return bfd_default_set_arch_mach (abfd, bfd_arch_lm32, bfd_mach_lm32);
+}
+
+/* Set machine type flags just before file is written out. */
+
+static void
+lm32_elf_final_write_processing (bfd *abfd, bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  elf_elfheader (abfd)->e_machine = EM_LATTICEMICO32;
+  elf_elfheader (abfd)->e_flags &=~ EF_LM32_MACH;
+  switch (bfd_get_mach (abfd))
+    {
+      case bfd_mach_lm32:
+        elf_elfheader (abfd)->e_flags |= E_LM32_MACH;
+        break;
+      default:
+        abort ();
+    }
+}
+
+/* Set the GP value for OUTPUT_BFD.  Returns FALSE if this is a
+   dangerous relocation.  */
+
+static bfd_boolean
+lm32_elf_assign_gp (bfd *output_bfd, bfd_vma *pgp)
+{
+  unsigned int count;
+  asymbol **sym;
+  unsigned int i;
+
+  /* If we've already figured out what GP will be, just return it. */
+  *pgp = _bfd_get_gp_value (output_bfd);
+  if (*pgp)
+    return TRUE;
+
+  count = bfd_get_symcount (output_bfd);
+  sym = bfd_get_outsymbols (output_bfd);
+
+  /* The linker script will have created a symbol named `_gp' with the
+     appropriate value.  */
+  if (sym == NULL)
+    i = count;
+  else
+    {
+      for (i = 0; i < count; i++, sym++)
+	{
+	  const char *name;
+
+	  name = bfd_asymbol_name (*sym);
+	  if (*name == '_' && strcmp (name, "_gp") == 0)
+	    {
+	      *pgp = bfd_asymbol_value (*sym);
+	      _bfd_set_gp_value (output_bfd, *pgp);
+	      break;
+	    }
+	}
+    }
+
+  if (i >= count)
+    {
+      /* Only get the error once.  */
+      *pgp = 4;
+      _bfd_set_gp_value (output_bfd, *pgp);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* We have to figure out the gp value, so that we can adjust the
+   symbol value correctly.  We look up the symbol _gp in the output
+   BFD.  If we can't find it, we're stuck.  We cache it in the ELF
+   target data.  We don't need to adjust the symbol value for an
+   external symbol if we are producing relocatable output.  */
+
+static bfd_reloc_status_type
+lm32_elf_final_gp (bfd *output_bfd, asymbol *symbol, bfd_boolean relocatable,
+                    char **error_message, bfd_vma *pgp)
+{
+  if (bfd_is_und_section (symbol->section) && !relocatable)
+    {
+      *pgp = 0;
+      return bfd_reloc_undefined;
+    }
+
+  *pgp = _bfd_get_gp_value (output_bfd);
+  if (*pgp == 0 && (!relocatable || (symbol->flags & BSF_SECTION_SYM) != 0))
+    {
+      if (relocatable)
+	{
+	  /* Make up a value.  */
+	  *pgp = symbol->section->output_section->vma + 0x4000;
+	  _bfd_set_gp_value (output_bfd, *pgp);
+	}
+      else if (!lm32_elf_assign_gp (output_bfd, pgp))
+	{
+	  *error_message =
+	    (char *)
+	    _("global pointer relative relocation when _gp not defined");
+	  return bfd_reloc_dangerous;
+	}
+    }
+
+  return bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type
+lm32_elf_do_gprel_relocate (bfd *abfd,
+			    reloc_howto_type *howto,
+			    asection *input_section ATTRIBUTE_UNUSED,
+			    bfd_byte *data,
+			    bfd_vma offset,
+			    bfd_vma symbol_value,
+			    bfd_vma addend)
+{
+  return _bfd_final_link_relocate (howto, abfd, input_section,
+				   data, offset, symbol_value, addend);
+}
+
+static bfd_reloc_status_type
+lm32_elf_gprel_reloc (bfd *abfd,
+		      arelent *reloc_entry,
+		      asymbol *symbol,
+		      void *data,
+		      asection *input_section,
+		      bfd *output_bfd,
+		      char **msg)
+{
+  bfd_vma relocation;
+  bfd_vma gp;
+  bfd_reloc_status_type r;
+
+  if (output_bfd != (bfd *) NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (!reloc_entry->howto->partial_inplace || reloc_entry->addend == 0))
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  if (output_bfd != NULL)
+    return bfd_reloc_ok;
+
+  relocation = symbol->value
+    + symbol->section->output_section->vma + symbol->section->output_offset;
+
+  if ((r =
+       lm32_elf_final_gp (abfd, symbol, FALSE, msg, &gp)) == bfd_reloc_ok)
+    {
+      relocation = relocation + reloc_entry->addend - gp;
+      reloc_entry->addend = 0;
+      if ((signed) relocation < -32768 || (signed) relocation > 32767)
+	{
+	  *msg = _("global pointer relative address out of range");
+	  r = bfd_reloc_outofrange;
+	}
+      else
+	{
+	  r = lm32_elf_do_gprel_relocate (abfd, reloc_entry->howto,
+					     input_section,
+					     data, reloc_entry->address,
+					     relocation, reloc_entry->addend);
+	}
+    }
+
+  return r;
+}
+
+/* Find the segment number in which OSEC, and output section, is
+   located.  */
+
+static unsigned
+_lm32fdpic_osec_to_segment (bfd *output_bfd, asection *osec)
+{
+  struct elf_segment_map *m;
+  Elf_Internal_Phdr *p;
+
+  /* Find the segment that contains the output_section.  */
+  for (m = elf_tdata (output_bfd)->segment_map,
+	 p = elf_tdata (output_bfd)->phdr;
+       m != NULL;
+       m = m->next, p++)
+    {
+      int i;
+
+      for (i = m->count - 1; i >= 0; i--)
+	if (m->sections[i] == osec)
+	  break;
+
+      if (i >= 0)
+	break;
+    }
+
+  return p - elf_tdata (output_bfd)->phdr;
+}
+
+/* Determine if an output section is read-only.  */
+
+inline static bfd_boolean
+_lm32fdpic_osec_readonly_p (bfd *output_bfd, asection *osec)
+{
+  unsigned seg = _lm32fdpic_osec_to_segment (output_bfd, osec);
+
+  return ! (elf_tdata (output_bfd)->phdr[seg].p_flags & PF_W);
+}
+
+/* Relocate a section */
+
+static bfd_boolean
+lm32_elf_relocate_section (bfd *output_bfd,
+                           struct bfd_link_info *info,
+                           bfd *input_bfd,
+                           asection *input_section,
+                           bfd_byte *contents,
+                           Elf_Internal_Rela *relocs,
+                           Elf_Internal_Sym *local_syms,
+                           asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd);
+  Elf_Internal_Rela *rel, *relend;
+  struct elf_lm32_link_hash_table *htab = lm32_elf_hash_table (info);
+  bfd *dynobj;
+  bfd_vma *local_got_offsets;
+  asection *sgot;
+
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = htab->root.dynobj;
+  local_got_offsets = elf_local_got_offsets (input_bfd);
+
+  sgot = htab->sgot;
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      reloc_howto_type *howto;
+      unsigned int r_type;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_vma gp;
+      bfd_reloc_status_type r;
+      const char *name = NULL;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      if (r_type == R_LM32_GNU_VTENTRY
+          || r_type == R_LM32_GNU_VTINHERIT )
+        continue;
+
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+
+      howto = lm32_elf_howto_table + r_type;
+
+      if (r_symndx < symtab_hdr->sh_info)
+        {
+          /* It's a local symbol.  */
+          sym = local_syms + r_symndx;
+          sec = local_sections[r_symndx];
+          relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+          name = bfd_elf_string_from_elf_section
+	    (input_bfd, symtab_hdr->sh_link, sym->st_name);
+	  name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name;
+        }
+      else
+        {
+          /* It's a global symbol.  */
+          bfd_boolean unresolved_reloc;
+	  bfd_boolean warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	  name = h->root.root.string;
+        }
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+        {
+	  /* This is a relocatable link.  We don't have to change
+	     anything, unless the reloc is against a section symbol,
+	     in which case we have to adjust according to where the
+	     section symbol winds up in the output section.  */
+	  if (sym == NULL || ELF_ST_TYPE (sym->st_info) != STT_SECTION)
+	    continue;
+
+	  /* If partial_inplace, we need to store any additional addend
+	     back in the section.  */
+	  if (! howto->partial_inplace)
+	    continue;
+
+          /* Shouldn't reach here.  */
+	  abort ();
+	  r = bfd_reloc_ok;
+        }
+      else
+        {
+          switch (howto->type)
+            {
+            case R_LM32_GPREL16:
+              if (!lm32_elf_assign_gp (output_bfd, &gp))
+                r = bfd_reloc_dangerous;
+              else
+                {
+                  relocation = relocation + rel->r_addend - gp;
+                  rel->r_addend = 0;
+                  if ((signed)relocation < -32768 || (signed)relocation > 32767)
+                    r = bfd_reloc_outofrange;
+                  else
+                    {
+                      r = _bfd_final_link_relocate (howto, input_bfd,
+                				  input_section, contents,
+               				  rel->r_offset, relocation,
+               				  rel->r_addend);
+                   }
+                }
+              break;
+            case R_LM32_16_GOT:
+              /* Relocation is to the entry for this symbol in the global
+                 offset table.  */
+              BFD_ASSERT (sgot != NULL);
+              if (h != NULL)
+                {
+                  bfd_boolean dyn;
+                  bfd_vma off;
+
+                  off = h->got.offset;
+                  BFD_ASSERT (off != (bfd_vma) -1);
+
+                  dyn = htab->root.dynamic_sections_created;
+                  if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+                      || (info->shared
+                          && (info->symbolic
+                              || h->dynindx == -1
+                              || h->forced_local)
+                          && h->def_regular))
+                    {
+                      /* This is actually a static link, or it is a
+                         -Bsymbolic link and the symbol is defined
+                         locally, or the symbol was forced to be local
+                         because of a version file.  We must initialize
+                         this entry in the global offset table.  Since the
+                         offset must always be a multiple of 4, we use the
+                         least significant bit to record whether we have
+                         initialized it already.
+
+                         When doing a dynamic link, we create a .rela.got
+                         relocation entry to initialize the value.  This
+                         is done in the finish_dynamic_symbol routine.  */
+                      if ((off & 1) != 0)
+                        off &= ~1;
+                      else
+                        {
+                          /* Write entry in GOT */
+                          bfd_put_32 (output_bfd, relocation,
+                                      sgot->contents + off);
+                          /* Create entry in .rofixup pointing to GOT entry.  */
+                           if (IS_FDPIC (output_bfd) && h->root.type != bfd_link_hash_undefweak)
+                             {
+	                       _lm32fdpic_add_rofixup (output_bfd,
+			                               lm32fdpic_fixup32_section
+				                        (info),
+				                       sgot->output_section->vma
+                                                        + sgot->output_offset
+                                                        + off);
+                             }
+                          /* Mark GOT entry as having been written.  */
+                          h->got.offset |= 1;
+                        }
+                    }
+
+                  relocation = sgot->output_offset + off;
+                }
+              else
+                {
+                  bfd_vma off;
+                  bfd_byte *loc;
+
+                  BFD_ASSERT (local_got_offsets != NULL
+                              && local_got_offsets[r_symndx] != (bfd_vma) -1);
+
+                  /* Get offset into GOT table.  */
+                  off = local_got_offsets[r_symndx];
+
+                  /* The offset must always be a multiple of 4.  We use
+                     the least significant bit to record whether we have
+                     already processed this entry.  */
+                  if ((off & 1) != 0)
+                    off &= ~1;
+                  else
+                    {
+                      /* Write entry in GOT.  */
+                      bfd_put_32 (output_bfd, relocation, sgot->contents + off);
+                      /* Create entry in .rofixup pointing to GOT entry.  */
+                      if (IS_FDPIC (output_bfd))
+                        {
+	                  _lm32fdpic_add_rofixup (output_bfd,
+				                  lm32fdpic_fixup32_section
+				                   (info),
+				                  sgot->output_section->vma
+                                                   + sgot->output_offset
+                                                   + off);
+                        }
+
+                      if (info->shared)
+                        {
+                          asection *srelgot;
+                          Elf_Internal_Rela outrel;
+
+                          /* We need to generate a R_LM32_RELATIVE reloc
+                             for the dynamic linker.  */
+                          srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+                          BFD_ASSERT (srelgot != NULL);
+
+                          outrel.r_offset = (sgot->output_section->vma
+                                             + sgot->output_offset
+                                             + off);
+                          outrel.r_info = ELF32_R_INFO (0, R_LM32_RELATIVE);
+                          outrel.r_addend = relocation;
+                          loc = srelgot->contents;
+                          loc += srelgot->reloc_count * sizeof (Elf32_External_Rela);
+                          bfd_elf32_swap_reloca_out (output_bfd, &outrel,loc);
+                          ++srelgot->reloc_count;
+                        }
+
+                      local_got_offsets[r_symndx] |= 1;
+                    }
+
+
+                  relocation = sgot->output_offset + off;
+                }
+
+              /* Addend should be zero.  */
+              if (rel->r_addend != 0)
+                (*_bfd_error_handler) (_("internal error: addend should be zero for R_LM32_16_GOT"));
+
+              r = _bfd_final_link_relocate (howto,
+                                            input_bfd,
+                                            input_section,
+                                            contents,
+                                            rel->r_offset,
+                                            relocation,
+                                            rel->r_addend);
+              break;
+
+            case R_LM32_GOTOFF_LO16:
+            case R_LM32_GOTOFF_HI16:
+              /* Relocation is offset from GOT.  */
+	      BFD_ASSERT (sgot != NULL);
+	      relocation -= sgot->output_section->vma;
+	      /* Account for sign-extension.  */
+              if ((r_type == R_LM32_GOTOFF_HI16)
+                  && ((relocation + rel->r_addend) & 0x8000))
+                rel->r_addend += 0x10000;
+              r = _bfd_final_link_relocate (howto,
+                                            input_bfd,
+                                            input_section,
+                                            contents,
+                                            rel->r_offset,
+                                            relocation,
+                                            rel->r_addend);
+              break;
+
+            case R_LM32_32:
+              if (IS_FDPIC (output_bfd))
+                {
+                  if ((!h) || (h && h->root.type != bfd_link_hash_undefweak))
+                    {
+                      /* Only create .rofixup entries for relocs in loadable sections.  */
+                      if ((bfd_get_section_flags (output_bfd, input_section->output_section)
+                          & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD))
+
+                        {
+                          /* Check address to be modified is writable.  */
+                          if (_lm32fdpic_osec_readonly_p (output_bfd,
+                                                          input_section
+                                                           ->output_section))
+                            {
+                              info->callbacks->warning
+                                (info,
+                                 _("cannot emit dynamic relocations in read-only section"),
+                                 name, input_bfd, input_section, rel->r_offset);
+                               return FALSE;
+                            }
+                          /* Create entry in .rofixup section.  */
+                          _lm32fdpic_add_rofixup (output_bfd,
+                                                  lm32fdpic_fixup32_section (info),
+                                                  input_section->output_section->vma
+                                                   + input_section->output_offset
+                                                   + rel->r_offset);
+                        }
+                    }
+                }
+              /* Fall through.  */
+
+            default:
+              r = _bfd_final_link_relocate (howto,
+                                            input_bfd,
+                                            input_section,
+                                            contents,
+                                            rel->r_offset,
+                                            relocation,
+                                            rel->r_addend);
+              break;
+            }
+        }
+
+      if (r != bfd_reloc_ok)
+        {
+          const char *msg = NULL;
+          arelent bfd_reloc;
+
+          lm32_info_to_howto_rela (input_bfd, &bfd_reloc, rel);
+          howto = bfd_reloc.howto;
+
+          if (h != NULL)
+            name = h->root.root.string;
+          else
+            {
+              name = (bfd_elf_string_from_elf_section
+                      (input_bfd, symtab_hdr->sh_link, sym->st_name));
+              if (name == NULL || *name == '\0')
+                name = bfd_section_name (input_bfd, sec);
+            }
+
+          switch (r)
+            {
+	    case bfd_reloc_overflow:
+	      if ((h != NULL)
+                 && (h->root.type == bfd_link_hash_undefweak))
+	        break;
+	      if (! ((*info->callbacks->reloc_overflow)
+		     (info, (h ? &h->root : NULL), name, howto->name,
+		      (bfd_vma) 0, input_bfd, input_section, rel->r_offset)))
+		return FALSE;
+	      break;
+
+            case bfd_reloc_undefined:
+              if (! ((*info->callbacks->undefined_symbol)
+                     (info, name, input_bfd, input_section,
+                      rel->r_offset, TRUE)))
+                return FALSE;
+              break;
+
+            case bfd_reloc_outofrange:
+              msg = _("internal error: out of range error");
+              goto common_error;
+
+            case bfd_reloc_notsupported:
+              msg = _("internal error: unsupported relocation error");
+              goto common_error;
+
+            case bfd_reloc_dangerous:
+              msg = _("internal error: dangerous error");
+              goto common_error;
+
+            default:
+              msg = _("internal error: unknown error");
+              /* fall through */
+
+            common_error:
+              if (!((*info->callbacks->warning)
+                    (info, msg, name, input_bfd, input_section,
+                     rel->r_offset)))
+                return FALSE;
+              break;
+            }
+        }
+    }
+
+  return TRUE;
+}
+
+static asection *
+lm32_elf_gc_mark_hook (asection *sec,
+                       struct bfd_link_info *info,
+                       Elf_Internal_Rela *rel,
+                       struct elf_link_hash_entry *h,
+                       Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_LM32_GNU_VTINHERIT:
+      case R_LM32_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+static bfd_boolean
+lm32_elf_gc_sweep_hook (bfd *abfd,
+                        struct bfd_link_info *info ATTRIBUTE_UNUSED,
+                        asection *sec,
+                        const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED)
+{
+  /* Update the got entry reference counts for the section being removed.  */
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  const Elf_Internal_Rela *rel, *relend;
+
+  elf_section_data (sec)->local_dynrel = NULL;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h = NULL;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      switch (ELF32_R_TYPE (rel->r_info))
+	{
+	case R_LM32_16_GOT:
+	  if (h != NULL)
+	    {
+	      if (h->got.refcount > 0)
+		h->got.refcount--;
+	    }
+	  else
+	    {
+	      if (local_got_refcounts && local_got_refcounts[r_symndx] > 0)
+		local_got_refcounts[r_symndx]--;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+  return TRUE;
+}
+
+/* Look through the relocs for a section during the first phase.  */
+
+static bfd_boolean
+lm32_elf_check_relocs (bfd *abfd,
+                       struct bfd_link_info *info,
+                       asection *sec,
+                       const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes, **sym_hashes_end;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  struct elf_lm32_link_hash_table *htab;
+  bfd *dynobj;
+
+  if (info->relocatable)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  sym_hashes_end = sym_hashes + symtab_hdr->sh_size/sizeof (Elf32_External_Sym);
+  if (!elf_bad_symtab (abfd))
+    sym_hashes_end -= symtab_hdr->sh_info;
+
+  htab = lm32_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = htab->root.dynobj;
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      int r_type;
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+        h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      /* Some relocs require a global offset table.  */
+      if (htab->sgot == NULL)
+        {
+          switch (r_type)
+            {
+            case R_LM32_16_GOT:
+            case R_LM32_GOTOFF_HI16:
+            case R_LM32_GOTOFF_LO16:
+              if (dynobj == NULL)
+                htab->root.dynobj = dynobj = abfd;
+              if (! create_got_section (dynobj, info))
+                return FALSE;
+              break;
+            }
+        }
+
+      /* Some relocs require a rofixup table. */
+      if (IS_FDPIC (abfd))
+        {
+          switch (r_type)
+            {
+            case R_LM32_32:
+              /* FDPIC requires a GOT if there is a .rofixup section
+                 (Normal ELF doesn't). */
+              if (dynobj == NULL)
+                htab->root.dynobj = dynobj = abfd;
+              if (! create_got_section (dynobj, info))
+                return FALSE;
+              /* Create .rofixup section */
+              if (htab->sfixup32 == NULL)
+                {
+                  if (! create_rofixup_section (abfd, info))
+                    return FALSE;
+                }
+              break;
+            case R_LM32_16_GOT:
+            case R_LM32_GOTOFF_HI16:
+            case R_LM32_GOTOFF_LO16:
+              /* Create .rofixup section.  */
+              if (htab->sfixup32 == NULL)
+                {
+                  if (! create_rofixup_section (abfd, info))
+                    return FALSE;
+                }
+              break;
+            }
+        }
+
+      switch (r_type)
+	{
+	case R_LM32_16_GOT:
+          if (h != NULL)
+            h->got.refcount += 1;
+          else
+            {
+              bfd_signed_vma *local_got_refcounts;
+
+              /* This is a global offset table entry for a local symbol.  */
+              local_got_refcounts = elf_local_got_refcounts (abfd);
+              if (local_got_refcounts == NULL)
+                {
+                  bfd_size_type size;
+
+                  size = symtab_hdr->sh_info;
+                  size *= sizeof (bfd_signed_vma);
+                  local_got_refcounts = bfd_zalloc (abfd, size);
+                  if (local_got_refcounts == NULL)
+                    return FALSE;
+                  elf_local_got_refcounts (abfd) = local_got_refcounts;
+                }
+              local_got_refcounts[r_symndx] += 1;
+            }
+          break;
+
+        /* This relocation describes the C++ object vtable hierarchy.
+           Reconstruct it for later use during GC.  */
+        case R_LM32_GNU_VTINHERIT:
+          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+
+        /* This relocation describes which C++ vtable entries are actually
+           used.  Record for later use during GC.  */
+        case R_LM32_GNU_VTENTRY:
+          if (!bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+            return FALSE;
+          break;
+
+        }
+    }
+
+  return TRUE;
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+lm32_elf_finish_dynamic_sections (bfd *output_bfd,
+				  struct bfd_link_info *info)
+{
+  struct elf_lm32_link_hash_table *htab;
+  bfd *dynobj;
+  asection *sdyn;
+  asection *sgot;
+
+  htab = lm32_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = htab->root.dynobj;
+
+  sgot = htab->sgotplt;
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (htab->root.dynamic_sections_created)
+    {
+      asection *splt;
+      Elf32_External_Dyn *dyncon, *dynconend;
+
+      BFD_ASSERT (sgot != NULL && sdyn != NULL);
+
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+
+      for (; dyncon < dynconend; dyncon++)
+        {
+          Elf_Internal_Dyn dyn;
+          asection *s;
+
+          bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+          switch (dyn.d_tag)
+            {
+            default:
+              break;
+
+            case DT_PLTGOT:
+              s = htab->sgot->output_section;
+              goto get_vma;
+            case DT_JMPREL:
+              s = htab->srelplt->output_section;
+            get_vma:
+              BFD_ASSERT (s != NULL);
+              dyn.d_un.d_ptr = s->vma;
+              bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+              break;
+
+            case DT_PLTRELSZ:
+              s = htab->srelplt->output_section;
+              BFD_ASSERT (s != NULL);
+	      dyn.d_un.d_val = s->size;
+              bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+              break;
+
+            case DT_RELASZ:
+              /* My reading of the SVR4 ABI indicates that the
+                 procedure linkage table relocs (DT_JMPREL) should be
+                 included in the overall relocs (DT_RELA).  This is
+                 what Solaris does.  However, UnixWare can not handle
+                 that case.  Therefore, we override the DT_RELASZ entry
+                 here to make it not include the JMPREL relocs.  Since
+                 the linker script arranges for .rela.plt to follow all
+                 other relocation sections, we don't have to worry
+                 about changing the DT_RELA entry.  */
+              if (htab->srelplt != NULL)
+                {
+                  s = htab->srelplt->output_section;
+		  dyn.d_un.d_val -= s->size;
+                }
+              bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+              break;
+            }
+        }
+
+      /* Fill in the first entry in the procedure linkage table.  */
+      splt = htab->splt;
+      if (splt && splt->size > 0)
+        {
+          if (info->shared)
+            {
+              bfd_put_32 (output_bfd, PLT0_PIC_ENTRY_WORD0, splt->contents);
+              bfd_put_32 (output_bfd, PLT0_PIC_ENTRY_WORD1, splt->contents + 4);
+              bfd_put_32 (output_bfd, PLT0_PIC_ENTRY_WORD2, splt->contents + 8);
+              bfd_put_32 (output_bfd, PLT0_PIC_ENTRY_WORD3, splt->contents + 12);
+              bfd_put_32 (output_bfd, PLT0_PIC_ENTRY_WORD4, splt->contents + 16);
+            }
+          else
+            {
+              unsigned long addr;
+              /* addr = .got + 4 */
+              addr = sgot->output_section->vma + sgot->output_offset + 4;
+              bfd_put_32 (output_bfd,
+			  PLT0_ENTRY_WORD0 | ((addr >> 16) & 0xffff),
+			  splt->contents);
+              bfd_put_32 (output_bfd,
+			  PLT0_ENTRY_WORD1 | (addr & 0xffff),
+			  splt->contents + 4);
+              bfd_put_32 (output_bfd, PLT0_ENTRY_WORD2, splt->contents + 8);
+              bfd_put_32 (output_bfd, PLT0_ENTRY_WORD3, splt->contents + 12);
+              bfd_put_32 (output_bfd, PLT0_ENTRY_WORD4, splt->contents + 16);
+            }
+
+          elf_section_data (splt->output_section)->this_hdr.sh_entsize =
+            PLT_ENTRY_SIZE;
+        }
+    }
+
+  /* Fill in the first three entries in the global offset table.  */
+  if (sgot && sgot->size > 0)
+    {
+      if (sdyn == NULL)
+        bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents);
+      else
+        bfd_put_32 (output_bfd,
+                    sdyn->output_section->vma + sdyn->output_offset,
+                    sgot->contents);
+      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 4);
+      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 8);
+
+      /* FIXME:  This can be null if create_dynamic_sections wasn't called. */
+      if (elf_section_data (sgot->output_section) != NULL)
+        elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
+    }
+
+  if (lm32fdpic_fixup32_section (info))
+    {
+      struct elf_link_hash_entry *hgot = elf_hash_table (info)->hgot;
+      bfd_vma got_value = hgot->root.u.def.value
+            + hgot->root.u.def.section->output_section->vma
+            + hgot->root.u.def.section->output_offset;
+      struct bfd_link_hash_entry *hend;
+
+      /* Last entry is pointer to GOT.  */
+      _lm32fdpic_add_rofixup (output_bfd, lm32fdpic_fixup32_section (info), got_value);
+
+      /* Check we wrote enough entries.  */
+      if (lm32fdpic_fixup32_section (info)->size
+              != (lm32fdpic_fixup32_section (info)->reloc_count * 4))
+        {
+          (*_bfd_error_handler)
+            ("LINKER BUG: .rofixup section size mismatch: size/4 %d != relocs %d",
+            lm32fdpic_fixup32_section (info)->size/4,
+            lm32fdpic_fixup32_section (info)->reloc_count);
+          return FALSE;
+        }
+
+      hend = bfd_link_hash_lookup (info->hash, "__ROFIXUP_END__",
+              FALSE, FALSE, TRUE);
+      if (hend
+          && (hend->type == bfd_link_hash_defined
+              || hend->type == bfd_link_hash_defweak))
+        {
+          bfd_vma value =
+            lm32fdpic_fixup32_section (info)->output_section->vma
+            + lm32fdpic_fixup32_section (info)->output_offset
+            + lm32fdpic_fixup32_section (info)->size
+            - hend->u.def.section->output_section->vma
+            - hend->u.def.section->output_offset;
+          BFD_ASSERT (hend->u.def.value == value);
+          if (hend->u.def.value != value)
+            {
+              (*_bfd_error_handler)
+                ("LINKER BUG: .rofixup section hend->u.def.value != value: %ld != %ld", hend->u.def.value, value);
+              return FALSE;
+            }
+        }
+    }
+
+  return TRUE;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+lm32_elf_finish_dynamic_symbol (bfd *output_bfd,
+				struct bfd_link_info *info,
+				struct elf_link_hash_entry *h,
+				Elf_Internal_Sym *sym)
+{
+  struct elf_lm32_link_hash_table *htab;
+  bfd_byte *loc;
+
+  htab = lm32_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      asection *splt;
+      asection *sgot;
+      asection *srela;
+
+      bfd_vma plt_index;
+      bfd_vma got_offset;
+      Elf_Internal_Rela rela;
+
+      /* This symbol has an entry in the procedure linkage table.  Set
+         it up.  */
+      BFD_ASSERT (h->dynindx != -1);
+
+      splt = htab->splt;
+      sgot = htab->sgotplt;
+      srela = htab->srelplt;
+      BFD_ASSERT (splt != NULL && sgot != NULL && srela != NULL);
+
+      /* Get the index in the procedure linkage table which
+         corresponds to this symbol.  This is the index of this symbol
+         in all the symbols for which we are making plt entries.  The
+         first entry in the procedure linkage table is reserved.  */
+      plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1;
+
+      /* Get the offset into the .got table of the entry that
+        corresponds to this function.  Each .got entry is 4 bytes.
+        The first three are reserved.  */
+      got_offset = (plt_index + 3) * 4;
+
+      /* Fill in the entry in the procedure linkage table.  */
+      if (! info->shared)
+        {
+          /* TODO */
+        }
+      else
+        {
+          /* TODO */
+        }
+
+      /* Fill in the entry in the global offset table.  */
+      bfd_put_32 (output_bfd,
+                  (splt->output_section->vma
+                   + splt->output_offset
+                   + h->plt.offset
+                   + 12), /* same offset */
+                  sgot->contents + got_offset);
+
+      /* Fill in the entry in the .rela.plt section.  */
+      rela.r_offset = (sgot->output_section->vma
+                       + sgot->output_offset
+                       + got_offset);
+      rela.r_info = ELF32_R_INFO (h->dynindx, R_LM32_JMP_SLOT);
+      rela.r_addend = 0;
+      loc = srela->contents;
+      loc += plt_index * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+
+      if (!h->def_regular)
+        {
+          /* Mark the symbol as undefined, rather than as defined in
+             the .plt section.  Leave the value alone.  */
+          sym->st_shndx = SHN_UNDEF;
+        }
+
+    }
+
+  if (h->got.offset != (bfd_vma) -1)
+    {
+      asection *sgot;
+      asection *srela;
+      Elf_Internal_Rela rela;
+
+      /* This symbol has an entry in the global offset table.  Set it
+         up.  */
+      sgot = htab->sgot;
+      srela = htab->srelgot;
+      BFD_ASSERT (sgot != NULL && srela != NULL);
+
+      rela.r_offset = (sgot->output_section->vma
+                       + sgot->output_offset
+                       + (h->got.offset &~ 1));
+
+      /* If this is a -Bsymbolic link, and the symbol is defined
+         locally, we just want to emit a RELATIVE reloc.  Likewise if
+         the symbol was forced to be local because of a version file.
+         The entry in the global offset table will already have been
+         initialized in the relocate_section function.  */
+      if (info->shared
+          && (info->symbolic
+	      || h->dynindx == -1
+	      || h->forced_local)
+          && h->def_regular)
+        {
+          rela.r_info = ELF32_R_INFO (0, R_LM32_RELATIVE);
+          rela.r_addend = (h->root.u.def.value
+                           + h->root.u.def.section->output_section->vma
+                           + h->root.u.def.section->output_offset);
+        }
+      else
+        {
+	  BFD_ASSERT ((h->got.offset & 1) == 0);
+          bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + h->got.offset);
+          rela.r_info = ELF32_R_INFO (h->dynindx, R_LM32_GLOB_DAT);
+          rela.r_addend = 0;
+        }
+
+      loc = srela->contents;
+      loc += srela->reloc_count * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+      ++srela->reloc_count;
+    }
+
+  if (h->needs_copy)
+    {
+      asection *s;
+      Elf_Internal_Rela rela;
+
+      /* This symbols needs a copy reloc.  Set it up.  */
+      BFD_ASSERT (h->dynindx != -1
+                  && (h->root.type == bfd_link_hash_defined
+                      || h->root.type == bfd_link_hash_defweak));
+
+      s = bfd_get_section_by_name (h->root.u.def.section->owner,
+                                   ".rela.bss");
+      BFD_ASSERT (s != NULL);
+
+      rela.r_offset = (h->root.u.def.value
+                       + h->root.u.def.section->output_section->vma
+                       + h->root.u.def.section->output_offset);
+      rela.r_info = ELF32_R_INFO (h->dynindx, R_LM32_COPY);
+      rela.r_addend = 0;
+      loc = s->contents;
+      loc += s->reloc_count * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+      ++s->reloc_count;
+    }
+
+  /* Mark some specially defined symbols as absolute.  */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+      || h == htab->root.hgot)
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+static enum elf_reloc_type_class
+lm32_elf_reloc_type_class (const Elf_Internal_Rela *rela)
+{
+  switch ((int) ELF32_R_TYPE (rela->r_info))
+    {
+    case R_LM32_RELATIVE:  return reloc_class_relative;
+    case R_LM32_JMP_SLOT:  return reloc_class_plt;
+    case R_LM32_COPY:      return reloc_class_copy;
+    default:      	   return reloc_class_normal;
+    }
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+lm32_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+				struct elf_link_hash_entry *h)
+{
+  struct elf_lm32_link_hash_table *htab;
+  struct elf_lm32_link_hash_entry *eh;
+  struct elf_lm32_dyn_relocs *p;
+  bfd *dynobj;
+  asection *s;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (dynobj != NULL
+              && (h->needs_plt
+                  || h->u.weakdef != NULL
+                  || (h->def_dynamic
+                      && h->ref_regular
+                      && !h->def_regular)));
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later,
+     when we know the address of the .got section.  */
+  if (h->type == STT_FUNC
+      || h->needs_plt)
+    {
+      if (! info->shared
+          && !h->def_dynamic
+          && !h->ref_dynamic
+	  && h->root.type != bfd_link_hash_undefweak
+	  && h->root.type != bfd_link_hash_undefined)
+        {
+          /* This case can occur if we saw a PLT reloc in an input
+             file, but the symbol was never referred to by a dynamic
+             object.  In such a case, we don't actually need to build
+             a procedure linkage table, and we can just do a PCREL
+             reloc instead.  */
+          h->plt.offset = (bfd_vma) -1;
+          h->needs_plt = 0;
+        }
+
+      return TRUE;
+    }
+  else
+    h->plt.offset = (bfd_vma) -1;
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+                  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if (!h->non_got_ref)
+    return TRUE;
+
+  /* If -z nocopyreloc was given, we won't generate them either.  */
+  if (info->nocopyreloc)
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  eh = (struct elf_lm32_link_hash_entry *) h;
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      s = p->sec->output_section;
+      if (s != NULL && (s->flags & (SEC_READONLY | SEC_HAS_CONTENTS)) != 0)
+        break;
+    }
+
+  /* If we didn't find any dynamic relocs in sections which needs the
+     copy reloc, then we'll be keeping the dynamic relocs and avoiding
+     the copy reloc.  */
+  if (p == NULL)
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  htab = lm32_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  s = htab->sdynbss;
+  BFD_ASSERT (s != NULL);
+
+  /* We must generate a R_LM32_COPY reloc to tell the dynamic linker
+     to copy the initial value out of the dynamic object and into the
+     runtime process image.  We need to remember the offset into the
+     .rela.bss section we are going to use.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      asection *srel;
+
+      srel = htab->srelbss;
+      BFD_ASSERT (srel != NULL);
+      srel->size += sizeof (Elf32_External_Rela);
+      h->needs_copy = 1;
+    }
+
+  return _bfd_elf_adjust_dynamic_copy (h, s);
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   dynamic relocs.  */
+
+static bfd_boolean
+allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
+{
+  struct bfd_link_info *info;
+  struct elf_lm32_link_hash_table *htab;
+  struct elf_lm32_link_hash_entry *eh;
+  struct elf_lm32_dyn_relocs *p;
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  info = (struct bfd_link_info *) inf;
+  htab = lm32_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  eh = (struct elf_lm32_link_hash_entry *) h;
+
+  if (htab->root.dynamic_sections_created
+      && h->plt.refcount > 0)
+    {
+      /* Make sure this symbol is output as a dynamic symbol.
+         Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+          && !h->forced_local)
+        {
+          if (! bfd_elf_link_record_dynamic_symbol (info, h))
+            return FALSE;
+        }
+
+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info->shared, h))
+        {
+          asection *s = htab->splt;
+
+          /* If this is the first .plt entry, make room for the special
+             first entry.  */
+          if (s->size == 0)
+            s->size += PLT_ENTRY_SIZE;
+
+          h->plt.offset = s->size;
+
+          /* If this symbol is not defined in a regular file, and we are
+             not generating a shared library, then set the symbol to this
+             location in the .plt.  This is required to make function
+             pointers compare as equal between the normal executable and
+             the shared library.  */
+          if (! info->shared
+              && !h->def_regular)
+            {
+              h->root.u.def.section = s;
+              h->root.u.def.value = h->plt.offset;
+            }
+
+          /* Make room for this entry.  */
+          s->size += PLT_ENTRY_SIZE;
+
+          /* We also need to make an entry in the .got.plt section, which
+             will be placed in the .got section by the linker script.  */
+          htab->sgotplt->size += 4;
+
+          /* We also need to make an entry in the .rel.plt section.  */
+          htab->srelplt->size += sizeof (Elf32_External_Rela);
+        }
+      else
+        {
+          h->plt.offset = (bfd_vma) -1;
+          h->needs_plt = 0;
+        }
+    }
+  else
+    {
+      h->plt.offset = (bfd_vma) -1;
+      h->needs_plt = 0;
+    }
+
+  if (h->got.refcount > 0)
+    {
+      asection *s;
+      bfd_boolean dyn;
+
+      /* Make sure this symbol is output as a dynamic symbol.
+         Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+          && !h->forced_local)
+        {
+          if (! bfd_elf_link_record_dynamic_symbol (info, h))
+            return FALSE;
+        }
+
+      s = htab->sgot;
+
+      h->got.offset = s->size;
+      s->size += 4;
+      dyn = htab->root.dynamic_sections_created;
+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h))
+        htab->srelgot->size += sizeof (Elf32_External_Rela);
+    }
+  else
+    h->got.offset = (bfd_vma) -1;
+
+  if (eh->dyn_relocs == NULL)
+    return TRUE;
+
+  /* In the shared -Bsymbolic case, discard space allocated for
+     dynamic pc-relative relocs against symbols which turn out to be
+     defined in regular objects.  For the normal shared case, discard
+     space for pc-relative relocs that have become local due to symbol
+     visibility changes.  */
+
+  if (info->shared)
+    {
+      if (h->def_regular
+          && (h->forced_local
+              || info->symbolic))
+        {
+          struct elf_lm32_dyn_relocs **pp;
+
+          for (pp = &eh->dyn_relocs; (p = *pp) != NULL;)
+            {
+              p->count -= p->pc_count;
+              p->pc_count = 0;
+              if (p->count == 0)
+                *pp = p->next;
+              else
+                pp = &p->next;
+            }
+        }
+
+      /* Also discard relocs on undefined weak syms with non-default
+	 visibility.  */
+      if (eh->dyn_relocs != NULL
+	  && h->root.type == bfd_link_hash_undefweak)
+	{
+	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	    eh->dyn_relocs = NULL;
+
+	  /* Make sure undefined weak symbols are output as a dynamic
+	     symbol in PIEs.  */
+	  else if (h->dynindx == -1
+		   && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+	}
+    }
+  else
+    {
+      /* For the non-shared case, discard space for relocs against
+         symbols which turn out to need copy relocs or are not
+         dynamic.  */
+
+      if (!h->non_got_ref
+          && ((h->def_dynamic
+               && !h->def_regular)
+              || (htab->root.dynamic_sections_created
+                  && (h->root.type == bfd_link_hash_undefweak
+                      || h->root.type == bfd_link_hash_undefined))))
+        {
+          /* Make sure this symbol is output as a dynamic symbol.
+             Undefined weak syms won't yet be marked as dynamic.  */
+          if (h->dynindx == -1
+              && !h->forced_local)
+            {
+              if (! bfd_elf_link_record_dynamic_symbol (info, h))
+                return FALSE;
+            }
+
+          /* If that succeeded, we know we'll be keeping all the
+             relocs.  */
+          if (h->dynindx != -1)
+            goto keep;
+        }
+
+      eh->dyn_relocs = NULL;
+
+    keep: ;
+    }
+
+  /* Finally, allocate space.  */
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *sreloc = elf_section_data (p->sec)->sreloc;
+      sreloc->size += p->count * sizeof (Elf32_External_Rela);
+    }
+
+  return TRUE;
+}
+
+/* Find any dynamic relocs that apply to read-only sections.  */
+
+static bfd_boolean
+readonly_dynrelocs (struct elf_link_hash_entry *h, void * inf)
+{
+  struct elf_lm32_link_hash_entry *eh;
+  struct elf_lm32_dyn_relocs *p;
+
+  eh = (struct elf_lm32_link_hash_entry *) h;
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *s = p->sec->output_section;
+
+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
+        {
+          struct bfd_link_info *info = (struct bfd_link_info *) inf;
+
+          info->flags |= DF_TEXTREL;
+
+          /* Not an error, just cut short the traversal.  */
+          return FALSE;
+        }
+    }
+  return TRUE;
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+lm32_elf_size_dynamic_sections (bfd *output_bfd,
+                                struct bfd_link_info *info)
+{
+  struct elf_lm32_link_hash_table *htab;
+  bfd *dynobj;
+  asection *s;
+  bfd_boolean relocs;
+  bfd *ibfd;
+
+  htab = lm32_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = htab->root.dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  if (htab->root.dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (s != NULL);
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+
+  /* Set up .got offsets for local syms, and space for local dynamic
+     relocs.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      bfd_signed_vma *local_got;
+      bfd_signed_vma *end_local_got;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *srel;
+
+      if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour)
+        continue;
+
+      for (s = ibfd->sections; s != NULL; s = s->next)
+        {
+          struct elf_lm32_dyn_relocs *p;
+
+          for (p = ((struct elf_lm32_dyn_relocs *)
+                    elf_section_data (s)->local_dynrel);
+               p != NULL;
+               p = p->next)
+            {
+              if (! bfd_is_abs_section (p->sec)
+                  && bfd_is_abs_section (p->sec->output_section))
+                {
+                  /* Input section has been discarded, either because
+                     it is a copy of a linkonce section or due to
+                     linker script /DISCARD/, so we'll be discarding
+                     the relocs too.  */
+                }
+              else if (p->count != 0)
+                {
+                  srel = elf_section_data (p->sec)->sreloc;
+                  srel->size += p->count * sizeof (Elf32_External_Rela);
+                  if ((p->sec->output_section->flags & SEC_READONLY) != 0)
+                    info->flags |= DF_TEXTREL;
+                }
+            }
+        }
+
+      local_got = elf_local_got_refcounts (ibfd);
+      if (!local_got)
+        continue;
+
+      symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+      locsymcount = symtab_hdr->sh_info;
+      end_local_got = local_got + locsymcount;
+      s = htab->sgot;
+      srel = htab->srelgot;
+      for (; local_got < end_local_got; ++local_got)
+        {
+          if (*local_got > 0)
+            {
+              *local_got = s->size;
+              s->size += 4;
+              if (info->shared)
+                srel->size += sizeof (Elf32_External_Rela);
+            }
+          else
+            *local_got = (bfd_vma) -1;
+        }
+    }
+
+  /* Allocate global sym .plt and .got entries, and space for global
+     sym dynamic relocs.  */
+  elf_link_hash_traverse (&htab->root, allocate_dynrelocs, info);
+
+  /* We now have determined the sizes of the various dynamic sections.
+     Allocate memory for them.  */
+  relocs = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+        continue;
+
+      if (s == htab->splt
+          || s == htab->sgot
+          || s == htab->sgotplt
+	  || s == htab->sdynbss)
+        {
+          /* Strip this section if we don't need it; see the
+             comment below.  */
+        }
+      else if (CONST_STRNEQ (bfd_get_section_name (dynobj, s), ".rela"))
+        {
+          if (s->size != 0 && s != htab->srelplt)
+            relocs = TRUE;
+
+          /* We use the reloc_count field as a counter if we need
+             to copy relocs into the output file.  */
+          s->reloc_count = 0;
+        }
+      else
+	/* It's not one of our sections, so don't allocate space.  */
+	continue;
+
+      if (s->size == 0)
+        {
+          /* If we don't need this section, strip it from the
+             output file.  This is mostly to handle .rela.bss and
+             .rela.plt.  We must create both sections in
+             create_dynamic_sections, because they must be created
+             before the linker maps input sections to output
+             sections.  The linker does that before
+             adjust_dynamic_symbol is called, and it is that
+             function which decides whether anything needs to go
+             into these sections.  */
+          s->flags |= SEC_EXCLUDE;
+          continue;
+        }
+
+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents.  We use bfd_zalloc
+         here in case unused entries are not reclaimed before the
+         section's contents are written out.  This should not happen,
+         but this way if it does, we get a R_LM32_NONE reloc instead
+         of garbage.  */
+      s->contents = bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL)
+        return FALSE;
+    }
+
+  if (htab->root.dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in lm32_elf_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+     if (info->executable)
+	{
+	  if (! add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (htab->splt->size != 0)
+        {
+          if (! add_dynamic_entry (DT_PLTGOT, 0)
+              || ! add_dynamic_entry (DT_PLTRELSZ, 0)
+              || ! add_dynamic_entry (DT_PLTREL, DT_RELA)
+              || ! add_dynamic_entry (DT_JMPREL, 0))
+            return FALSE;
+        }
+
+      if (relocs)
+        {
+          if (! add_dynamic_entry (DT_RELA, 0)
+              || ! add_dynamic_entry (DT_RELASZ, 0)
+              || ! add_dynamic_entry (DT_RELAENT,
+                                      sizeof (Elf32_External_Rela)))
+            return FALSE;
+
+          /* If any dynamic relocs apply to a read-only section,
+             then we need a DT_TEXTREL entry.  */
+          if ((info->flags & DF_TEXTREL) == 0)
+            elf_link_hash_traverse (&htab->root, readonly_dynrelocs,
+                                    info);
+
+          if ((info->flags & DF_TEXTREL) != 0)
+            {
+              if (! add_dynamic_entry (DT_TEXTREL, 0))
+                return FALSE;
+            }
+        }
+    }
+#undef add_dynamic_entry
+
+  /* Allocate .rofixup section.  */
+  if (IS_FDPIC (output_bfd))
+    {
+      struct weak_symbol_list *list_start = NULL, *list_end = NULL;
+      int rgot_weak_count = 0;
+      int r32_count = 0;
+      int rgot_count = 0;
+      /* Look for deleted sections.  */
+      for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+        {
+          for (s = ibfd->sections; s != NULL; s = s->next)
+            {
+              if (s->reloc_count)
+                {
+                  /* Count relocs that need .rofixup entires.  */
+                  Elf_Internal_Rela *internal_relocs, *end;
+                  internal_relocs = elf_section_data (s)->relocs;
+                  if (internal_relocs == NULL)
+                    internal_relocs = (_bfd_elf_link_read_relocs (ibfd, s, NULL, NULL, FALSE));
+                  if (internal_relocs != NULL)
+                    {
+                      end = internal_relocs + s->reloc_count;
+                      while (internal_relocs < end)
+                        {
+                          Elf_Internal_Shdr *symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+                          struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (ibfd);
+                          unsigned long r_symndx;
+                          struct elf_link_hash_entry *h;
+
+                          symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+                          sym_hashes = elf_sym_hashes (ibfd);
+                          r_symndx = ELF32_R_SYM (internal_relocs->r_info);
+                          h = NULL;
+                          if (r_symndx < symtab_hdr->sh_info)
+                            {
+                            }
+                          else
+                            {
+                              h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+                              while (h->root.type == bfd_link_hash_indirect
+                                     || h->root.type == bfd_link_hash_warning)
+                                h = (struct elf_link_hash_entry *) h->root.u.i.link;
+                              }
+
+                          /* Don't generate entries for weak symbols.  */
+                          if (!h || (h && h->root.type != bfd_link_hash_undefweak))
+                            {
+                              if (!elf_discarded_section (s) && !((bfd_get_section_flags (ibfd, s) & SEC_ALLOC) == 0))
+                                {
+                                  switch (ELF32_R_TYPE (internal_relocs->r_info))
+                                    {
+                                    case R_LM32_32:
+                                      r32_count++;
+                                      break;
+                                    case R_LM32_16_GOT:
+                                      rgot_count++;
+                                      break;
+                                    }
+                                }
+                            }
+                          else
+                            {
+                              struct weak_symbol_list *current, *new_entry;
+                              /* Is this symbol already in the list?  */
+                              for (current = list_start; current; current = current->next)
+                                {
+                                  if (!strcmp (current->name, h->root.root.string))
+                                    break;
+                                }
+                              if (!current && !elf_discarded_section (s) && (bfd_get_section_flags (ibfd, s) & SEC_ALLOC))
+                                {
+                                  /* Will this have an entry in the GOT.  */
+                                  if (ELF32_R_TYPE (internal_relocs->r_info) == R_LM32_16_GOT)
+                                    {
+                                      /* Create a new entry.  */
+                                      new_entry = malloc (sizeof (struct weak_symbol_list));
+                                      if (!new_entry)
+                                        return FALSE;
+                                      new_entry->name = h->root.root.string;
+                                      new_entry->next = NULL;
+                                      /* Add to list */
+                                      if (list_start == NULL)
+                                        {
+                                          list_start = new_entry;
+                                          list_end = new_entry;
+                                        }
+                                      else
+                                        {
+                                          list_end->next = new_entry;
+                                          list_end = new_entry;
+                                        }
+                                      /* Increase count of undefined weak symbols in the got.  */
+                                      rgot_weak_count++;
+                                    }
+                                }
+                            }
+                          internal_relocs++;
+                        }
+                    }
+                  else
+                    return FALSE;
+                }
+            }
+        }
+      /* Free list.  */
+      while (list_start)
+        {
+          list_end = list_start->next;
+          free (list_start);
+          list_start = list_end;
+        }
+
+      /* Size sections.  */
+      lm32fdpic_fixup32_section (info)->size = (r32_count + (htab->sgot->size / 4) - rgot_weak_count + 1) * 4;
+      if (lm32fdpic_fixup32_section (info)->size == 0)
+        lm32fdpic_fixup32_section (info)->flags |= SEC_EXCLUDE;
+      else
+        {
+          lm32fdpic_fixup32_section (info)->contents =
+    	     bfd_zalloc (dynobj, lm32fdpic_fixup32_section (info)->size);
+          if (lm32fdpic_fixup32_section (info)->contents == NULL)
+    	    return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+/* Create dynamic sections when linking against a dynamic object.  */
+
+static bfd_boolean
+lm32_elf_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  struct elf_lm32_link_hash_table *htab;
+  flagword flags, pltflags;
+  asection *s;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  int ptralign = 2; /* 32bit */
+
+  htab = lm32_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* Make sure we have a GOT - For the case where we have a dynamic object
+     but none of the relocs in check_relocs */
+  if (! create_got_section (abfd, info))
+    return FALSE;
+  if (IS_FDPIC (abfd) && (htab->sfixup32 == NULL))
+    {
+      if (! create_rofixup_section (abfd, info))
+        return FALSE;
+    }
+
+  /* We need to create .plt, .rel[a].plt, .got, .got.plt, .dynbss, and
+     .rel[a].bss sections.  */
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+           | SEC_LINKER_CREATED);
+
+  pltflags = flags;
+  pltflags |= SEC_CODE;
+  if (bed->plt_not_loaded)
+    pltflags &= ~ (SEC_LOAD | SEC_HAS_CONTENTS);
+  if (bed->plt_readonly)
+    pltflags |= SEC_READONLY;
+
+  s = bfd_make_section_with_flags (abfd, ".plt", pltflags);
+  htab->splt = s;
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, bed->plt_alignment))
+    return FALSE;
+
+  if (bed->want_plt_sym)
+    {
+      /* Define the symbol _PROCEDURE_LINKAGE_TABLE_ at the start of the
+         .plt section.  */
+      struct bfd_link_hash_entry *bh = NULL;
+      struct elf_link_hash_entry *h;
+
+      if (! (_bfd_generic_link_add_one_symbol
+             (info, abfd, "_PROCEDURE_LINKAGE_TABLE_", BSF_GLOBAL, s,
+              (bfd_vma) 0, NULL, FALSE,
+              get_elf_backend_data (abfd)->collect, &bh)))
+        return FALSE;
+      h = (struct elf_link_hash_entry *) bh;
+      h->def_regular = 1;
+      h->type = STT_OBJECT;
+      htab->root.hplt = h;
+
+      if (info->shared
+          && ! bfd_elf_link_record_dynamic_symbol (info, h))
+        return FALSE;
+    }
+
+  s = bfd_make_section_with_flags (abfd,
+				   bed->default_use_rela_p ? ".rela.plt" : ".rel.plt",
+				   flags | SEC_READONLY);
+  htab->srelplt = s;
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, ptralign))
+    return FALSE;
+
+  if (htab->sgot == NULL
+      && ! create_got_section (abfd, info))
+    return FALSE;
+
+  {
+    const char *secname;
+    char *relname;
+    flagword secflags;
+    asection *sec;
+
+    for (sec = abfd->sections; sec; sec = sec->next)
+      {
+        secflags = bfd_get_section_flags (abfd, sec);
+        if ((secflags & (SEC_DATA | SEC_LINKER_CREATED))
+            || ((secflags & SEC_HAS_CONTENTS) != SEC_HAS_CONTENTS))
+          continue;
+        secname = bfd_get_section_name (abfd, sec);
+        relname = bfd_malloc ((bfd_size_type) strlen (secname) + 6);
+        strcpy (relname, ".rela");
+        strcat (relname, secname);
+        if (bfd_get_section_by_name (abfd, secname))
+          continue;
+        s = bfd_make_section_with_flags (abfd, relname,
+					 flags | SEC_READONLY);
+        if (s == NULL
+            || ! bfd_set_section_alignment (abfd, s, ptralign))
+          return FALSE;
+      }
+  }
+
+  if (bed->want_dynbss)
+    {
+      /* The .dynbss section is a place to put symbols which are defined
+         by dynamic objects, are referenced by regular objects, and are
+         not functions.  We must allocate space for them in the process
+         image and use a R_*_COPY reloc to tell the dynamic linker to
+         initialize them at run time.  The linker script puts the .dynbss
+         section into the .bss section of the final image.  */
+      s = bfd_make_section_with_flags (abfd, ".dynbss",
+				       SEC_ALLOC | SEC_LINKER_CREATED);
+      htab->sdynbss = s;
+      if (s == NULL)
+        return FALSE;
+      /* The .rel[a].bss section holds copy relocs.  This section is not
+         normally needed.  We need to create it here, though, so that the
+         linker will map it to an output section.  We can't just create it
+         only if we need it, because we will not know whether we need it
+         until we have seen all the input files, and the first time the
+         main linker code calls BFD after examining all the input files
+         (size_dynamic_sections) the input sections have already been
+         mapped to the output sections.  If the section turns out not to
+         be needed, we can discard it later.  We will never need this
+         section when generating a shared object, since they do not use
+         copy relocs.  */
+      if (! info->shared)
+        {
+          s = bfd_make_section_with_flags (abfd,
+					   (bed->default_use_rela_p
+					    ? ".rela.bss" : ".rel.bss"),
+					   flags | SEC_READONLY);
+          htab->srelbss = s;
+          if (s == NULL
+              || ! bfd_set_section_alignment (abfd, s, ptralign))
+            return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+/* Copy the extra info we tack onto an elf_link_hash_entry.  */
+
+static void
+lm32_elf_copy_indirect_symbol (struct bfd_link_info *info,
+                               struct elf_link_hash_entry *dir,
+                               struct elf_link_hash_entry *ind)
+{
+  struct elf_lm32_link_hash_entry * edir;
+  struct elf_lm32_link_hash_entry * eind;
+
+  edir = (struct elf_lm32_link_hash_entry *) dir;
+  eind = (struct elf_lm32_link_hash_entry *) ind;
+
+  if (eind->dyn_relocs != NULL)
+    {
+      if (edir->dyn_relocs != NULL)
+        {
+          struct elf_lm32_dyn_relocs **pp;
+          struct elf_lm32_dyn_relocs *p;
+
+          /* Add reloc counts against the indirect sym to the direct sym
+             list.  Merge any entries against the same section.  */
+          for (pp = &eind->dyn_relocs; (p = *pp) != NULL;)
+            {
+              struct elf_lm32_dyn_relocs *q;
+
+              for (q = edir->dyn_relocs; q != NULL; q = q->next)
+                if (q->sec == p->sec)
+                  {
+                    q->pc_count += p->pc_count;
+                    q->count += p->count;
+                    *pp = p->next;
+                    break;
+                  }
+              if (q == NULL)
+                pp = &p->next;
+            }
+          *pp = edir->dyn_relocs;
+        }
+
+      edir->dyn_relocs = eind->dyn_relocs;
+      eind->dyn_relocs = NULL;
+    }
+
+  _bfd_elf_link_hash_copy_indirect (info, dir, ind);
+}
+
+static bfd_boolean
+lm32_elf_always_size_sections (bfd *output_bfd,
+				 struct bfd_link_info *info)
+{
+  if (!info->relocatable)
+    {
+      struct elf_link_hash_entry *h;
+
+      /* Force a PT_GNU_STACK segment to be created.  */
+      if (! elf_tdata (output_bfd)->stack_flags)
+	elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
+
+      /* Define __stacksize if it's not defined yet.  */
+      h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
+				FALSE, FALSE, FALSE);
+      if (! h || h->root.type != bfd_link_hash_defined
+	  || h->type != STT_OBJECT
+	  || !h->def_regular)
+	{
+	  struct bfd_link_hash_entry *bh = NULL;
+
+	  if (!(_bfd_generic_link_add_one_symbol
+		(info, output_bfd, "__stacksize",
+		 BSF_GLOBAL, bfd_abs_section_ptr, DEFAULT_STACK_SIZE,
+		 (const char *) NULL, FALSE,
+		 get_elf_backend_data (output_bfd)->collect, &bh)))
+	    return FALSE;
+
+	  h = (struct elf_link_hash_entry *) bh;
+	  h->def_regular = 1;
+	  h->type = STT_OBJECT;
+	  /* This one must NOT be hidden.  */
+	}
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+lm32_elf_modify_segment_map (bfd *output_bfd,
+			     struct bfd_link_info *info)
+{
+  struct elf_segment_map *m;
+
+  /* objcopy and strip preserve what's already there using elf32_lm32fdpic_copy_
+     private_bfd_data ().  */
+  if (! info)
+    return TRUE;
+
+  for (m = elf_tdata (output_bfd)->segment_map; m != NULL; m = m->next)
+    if (m->p_type == PT_GNU_STACK)
+      break;
+
+  if (m)
+    {
+      asection *sec = bfd_get_section_by_name (output_bfd, ".stack");
+      struct elf_link_hash_entry *h;
+
+      if (sec)
+	{
+	  /* Obtain the pointer to the __stacksize symbol.  */
+	  h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
+				    FALSE, FALSE, FALSE);
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *)h->root.u.i.link;
+	  BFD_ASSERT (h->root.type == bfd_link_hash_defined);
+
+	  /* Set the section size from the symbol value.  We
+	     intentionally ignore the symbol section.  */
+	  if (h->root.type == bfd_link_hash_defined)
+	    sec->size = h->root.u.def.value;
+	  else
+	    sec->size = DEFAULT_STACK_SIZE;
+
+	  /* Add the stack section to the PT_GNU_STACK segment,
+	     such that its size and alignment requirements make it
+	     to the segment.  */
+	  m->sections[m->count] = sec;
+	  m->count++;
+	}
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+lm32_elf_modify_program_headers (bfd *output_bfd,
+				       struct bfd_link_info *info)
+{
+  struct elf_obj_tdata *tdata = elf_tdata (output_bfd);
+  struct elf_segment_map *m;
+  Elf_Internal_Phdr *p;
+
+  if (! info)
+    return TRUE;
+
+  for (p = tdata->phdr, m = tdata->segment_map; m != NULL; m = m->next, p++)
+    if (m->p_type == PT_GNU_STACK)
+      break;
+
+  if (m)
+    {
+      struct elf_link_hash_entry *h;
+
+      /* Obtain the pointer to the __stacksize symbol.  */
+      h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
+				FALSE, FALSE, FALSE);
+      if (h)
+	{
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	  BFD_ASSERT (h->root.type == bfd_link_hash_defined);
+	}
+
+      /* Set the header p_memsz from the symbol value.  We
+	 intentionally ignore the symbol section.  */
+      if (h && h->root.type == bfd_link_hash_defined)
+	p->p_memsz = h->root.u.def.value;
+      else
+	p->p_memsz = DEFAULT_STACK_SIZE;
+
+      p->p_align = 8;
+    }
+
+  return TRUE;
+}
+
+
+static bfd_boolean
+lm32_elf_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  BFD_ASSERT (!elf_flags_init (obfd)
+	      || elf_elfheader (obfd)->e_flags == elf_elfheader (ibfd)->e_flags);
+
+  elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
+  elf_flags_init (obfd) = TRUE;
+
+  /* Copy object attributes.  */
+  _bfd_elf_copy_obj_attributes (ibfd, obfd);
+
+  return TRUE;
+}
+
+
+static bfd_boolean
+lm32_elf_fdpic_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  unsigned i;
+
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  if (! lm32_elf_copy_private_bfd_data (ibfd, obfd))
+    return FALSE;
+
+  if (! elf_tdata (ibfd) || ! elf_tdata (ibfd)->phdr
+      || ! elf_tdata (obfd) || ! elf_tdata (obfd)->phdr)
+    return TRUE;
+
+  /* Copy the stack size.  */
+  for (i = 0; i < elf_elfheader (ibfd)->e_phnum; i++)
+    if (elf_tdata (ibfd)->phdr[i].p_type == PT_GNU_STACK)
+      {
+	Elf_Internal_Phdr *iphdr = &elf_tdata (ibfd)->phdr[i];
+
+	for (i = 0; i < elf_elfheader (obfd)->e_phnum; i++)
+	  if (elf_tdata (obfd)->phdr[i].p_type == PT_GNU_STACK)
+	    {
+	      memcpy (&elf_tdata (obfd)->phdr[i], iphdr, sizeof (*iphdr));
+
+	      /* Rewrite the phdrs, since we're only called after they were first written.  */
+	      if (bfd_seek (obfd, (bfd_signed_vma) get_elf_backend_data (obfd)
+			    ->s->sizeof_ehdr, SEEK_SET) != 0
+		  || get_elf_backend_data (obfd)->s->write_out_phdrs (obfd, elf_tdata (obfd)->phdr,
+				     elf_elfheader (obfd)->e_phnum) != 0)
+		return FALSE;
+	      break;
+	    }
+
+	break;
+      }
+
+  return TRUE;
+}
+
+
+#define ELF_ARCH                bfd_arch_lm32
+#define ELF_TARGET_ID		LM32_ELF_DATA
+#define ELF_MACHINE_CODE        EM_LATTICEMICO32
+#define ELF_MAXPAGESIZE         0x1000
+
+#define TARGET_BIG_SYM          bfd_elf32_lm32_vec
+#define TARGET_BIG_NAME         "elf32-lm32"
+
+#define bfd_elf32_bfd_reloc_type_lookup         lm32_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup         lm32_reloc_name_lookup
+#define elf_info_to_howto                       lm32_info_to_howto_rela
+#define elf_info_to_howto_rel                   0
+#define elf_backend_rela_normal                 1
+#define elf_backend_object_p                    lm32_elf_object_p
+#define elf_backend_final_write_processing      lm32_elf_final_write_processing
+#define elf_backend_can_gc_sections             1
+#define elf_backend_can_refcount                1
+#define elf_backend_gc_mark_hook                lm32_elf_gc_mark_hook
+#define elf_backend_gc_sweep_hook               lm32_elf_gc_sweep_hook
+#define elf_backend_plt_readonly                1
+#define elf_backend_want_got_plt                1
+#define elf_backend_want_plt_sym                0
+#define elf_backend_got_header_size             12
+#define bfd_elf32_bfd_link_hash_table_create    lm32_elf_link_hash_table_create
+#define elf_backend_check_relocs                lm32_elf_check_relocs
+#define elf_backend_reloc_type_class            lm32_elf_reloc_type_class
+#define elf_backend_copy_indirect_symbol        lm32_elf_copy_indirect_symbol
+#define elf_backend_size_dynamic_sections       lm32_elf_size_dynamic_sections
+#define elf_backend_omit_section_dynsym         ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true)
+#define elf_backend_create_dynamic_sections     lm32_elf_create_dynamic_sections
+#define elf_backend_finish_dynamic_sections     lm32_elf_finish_dynamic_sections
+#define elf_backend_adjust_dynamic_symbol       lm32_elf_adjust_dynamic_symbol
+#define elf_backend_finish_dynamic_symbol       lm32_elf_finish_dynamic_symbol
+#define elf_backend_relocate_section            lm32_elf_relocate_section
+
+#include "elf32-target.h"
+
+#undef  ELF_MAXPAGESIZE
+#define ELF_MAXPAGESIZE		0x4000
+
+
+#undef  TARGET_BIG_SYM
+#define TARGET_BIG_SYM          bfd_elf32_lm32fdpic_vec
+#undef  TARGET_BIG_NAME
+#define TARGET_BIG_NAME		"elf32-lm32fdpic"
+#undef	elf32_bed
+#define	elf32_bed		elf32_lm32fdpic_bed
+
+#undef  elf_backend_always_size_sections
+#define elf_backend_always_size_sections        lm32_elf_always_size_sections
+#undef  elf_backend_modify_segment_map
+#define elf_backend_modify_segment_map          lm32_elf_modify_segment_map
+#undef  elf_backend_modify_program_headers
+#define elf_backend_modify_program_headers      lm32_elf_modify_program_headers
+#undef  bfd_elf32_bfd_copy_private_bfd_data
+#define bfd_elf32_bfd_copy_private_bfd_data     lm32_elf_fdpic_copy_private_bfd_data
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-m32c.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-m32c.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-m32c.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-m32c.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2032 @@
+/* M16C/M32C specific support for 32-bit ELF.
+   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/m32c.h"
+#include "libiberty.h"
+
+/* Forward declarations.  */
+static reloc_howto_type * m32c_reloc_type_lookup
+  (bfd *, bfd_reloc_code_real_type);
+static void m32c_info_to_howto_rela 
+  (bfd *, arelent *, Elf_Internal_Rela *);
+static bfd_boolean m32c_elf_relocate_section 
+  (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Sym *, asection **);
+static bfd_boolean m32c_elf_check_relocs
+  (bfd *, struct bfd_link_info *, asection *, const Elf_Internal_Rela *);
+static bfd_boolean m32c_elf_relax_delete_bytes (bfd *, asection *, bfd_vma, int);
+#ifdef DEBUG
+char * m32c_get_reloc (long reloc);
+void dump_symtab (bfd *, void *, void *);
+#endif
+static bfd_boolean m32c_elf_relax_section
+(bfd *abfd, asection *sec, struct bfd_link_info *link_info, bfd_boolean *again);
+
+
+static reloc_howto_type m32c_elf_howto_table [] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_M32C_NONE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32C_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GCC intentionally overflows these next two in order to work
+     around limitations in the addressing modes, so don't complain
+     about overflow.  */
+  HOWTO (R_M32C_16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32C_16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_M32C_24,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32C_24",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_M32C_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32C_32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_M32C_8_PCREL,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32C_8_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,     		/* src_mask */
+	 0xff,   		/* dst_mask */
+	 TRUE), 		/* pcrel_offset */
+
+  HOWTO (R_M32C_16_PCREL,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32C_16_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,     		/* src_mask */
+	 0xffff,             	/* dst_mask */
+	 TRUE), 		/* pcrel_offset */
+
+  HOWTO (R_M32C_8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32C_8",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,     		/* src_mask */
+	 0xff,			/* dst_mask */
+	 FALSE), 		/* pcrel_offset */
+
+  HOWTO (R_M32C_LO16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32C_LO16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,     		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE), 		/* pcrel_offset */
+
+  HOWTO (R_M32C_HI8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32C_HI8",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,     		/* src_mask */
+	 0xff,			/* dst_mask */
+	 FALSE), 		/* pcrel_offset */
+
+  HOWTO (R_M32C_HI16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32C_HI16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,     		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE), 		/* pcrel_offset */
+
+  HOWTO (R_M32C_RL_JUMP,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32C_RL_JUMP",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,     		/* src_mask */
+	 0,   			/* dst_mask */
+	 FALSE), 		/* pcrel_offset */
+
+  HOWTO (R_M32C_RL_1ADDR,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32C_RL_1ADDR",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,     		/* src_mask */
+	 0,   			/* dst_mask */
+	 FALSE), 		/* pcrel_offset */
+
+  HOWTO (R_M32C_RL_2ADDR,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32C_RL_2ADDR",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,     		/* src_mask */
+	 0,   			/* dst_mask */
+	 FALSE), 		/* pcrel_offset */
+
+};
+
+/* Map BFD reloc types to M32C ELF reloc types.  */
+
+struct m32c_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned int m32c_reloc_val;
+};
+
+static const struct m32c_reloc_map m32c_reloc_map [] =
+{
+  { BFD_RELOC_NONE,		R_M32C_NONE },
+  { BFD_RELOC_16,		R_M32C_16 },
+  { BFD_RELOC_24,               R_M32C_24 },
+  { BFD_RELOC_32,		R_M32C_32 },
+  { BFD_RELOC_8_PCREL,          R_M32C_8_PCREL },
+  { BFD_RELOC_16_PCREL,         R_M32C_16_PCREL },
+  { BFD_RELOC_8,		R_M32C_8 },
+  { BFD_RELOC_LO16,		R_M32C_LO16 },
+  { BFD_RELOC_HI16,		R_M32C_HI16 },
+  { BFD_RELOC_M32C_HI8,		R_M32C_HI8 },
+  { BFD_RELOC_M32C_RL_JUMP,	R_M32C_RL_JUMP },
+  { BFD_RELOC_M32C_RL_1ADDR,	R_M32C_RL_1ADDR },
+  { BFD_RELOC_M32C_RL_2ADDR,	R_M32C_RL_2ADDR }
+};
+
+static reloc_howto_type *
+m32c_reloc_type_lookup
+    (bfd *                    abfd ATTRIBUTE_UNUSED,
+     bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = ARRAY_SIZE (m32c_reloc_map); --i;)
+    if (m32c_reloc_map [i].bfd_reloc_val == code)
+      return & m32c_elf_howto_table [m32c_reloc_map[i].m32c_reloc_val];
+  
+  return NULL;
+}
+
+static reloc_howto_type *
+m32c_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (m32c_elf_howto_table) / sizeof (m32c_elf_howto_table[0]);
+       i++)
+    if (m32c_elf_howto_table[i].name != NULL
+	&& strcasecmp (m32c_elf_howto_table[i].name, r_name) == 0)
+      return &m32c_elf_howto_table[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for an M32C ELF reloc.  */
+
+static void
+m32c_info_to_howto_rela
+    (bfd *               abfd ATTRIBUTE_UNUSED,
+     arelent *           cache_ptr,
+     Elf_Internal_Rela * dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_M32C_max);
+  cache_ptr->howto = & m32c_elf_howto_table [r_type];
+}
+
+
+
+/* Relocate an M32C ELF section.
+   There is some attempt to make this function usable for many architectures,
+   both USE_REL and USE_RELA ['twould be nice if such a critter existed],
+   if only to serve as a learning tool.
+
+   The RELOCATE_SECTION function is called by the new ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures; if the section
+   actually uses Rel structures, the r_addend field will always be
+   zero.
+
+   This function is responsible for adjusting the section contents as
+   necessary, and (if using Rela relocs and generating a relocatable
+   output file) adjusting the reloc addend as necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.  */
+
+static bfd_boolean
+m32c_elf_relocate_section
+    (bfd *                   output_bfd ATTRIBUTE_UNUSED,
+     struct bfd_link_info *  info,
+     bfd *                   input_bfd,
+     asection *              input_section,
+     bfd_byte *              contents,
+     Elf_Internal_Rela *     relocs,
+     Elf_Internal_Sym *      local_syms,
+     asection **             local_sections)
+{
+  Elf_Internal_Shdr *           symtab_hdr;
+  struct elf_link_hash_entry ** sym_hashes;
+  Elf_Internal_Rela *           rel;
+  Elf_Internal_Rela *           relend;
+  bfd *dynobj;
+  asection *splt;
+
+  symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+  relend     = relocs + input_section->reloc_count;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  splt = NULL;
+  if (dynobj != NULL)
+    splt = bfd_get_section_by_name (dynobj, ".plt");
+
+  for (rel = relocs; rel < relend; rel ++)
+    {
+      reloc_howto_type *           howto;
+      unsigned long                r_symndx;
+      Elf_Internal_Sym *           sym;
+      asection *                   sec;
+      struct elf_link_hash_entry * h;
+      bfd_vma                      relocation;
+      bfd_reloc_status_type        r;
+      const char *                 name = NULL;
+      int                          r_type;
+      
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      /* These are only used for relaxing; we don't actually relocate
+	 anything with them, so skip them.  */
+      if (r_type == R_M32C_RL_JUMP
+	  || r_type == R_M32C_RL_1ADDR
+	  || r_type == R_M32C_RL_2ADDR)
+	continue;
+      
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      howto  = m32c_elf_howto_table + ELF32_R_TYPE (rel->r_info);
+      h      = NULL;
+      sym    = NULL;
+      sec    = NULL;
+      relocation = 0;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections [r_symndx];
+	  relocation = (sec->output_section->vma
+			+ sec->output_offset
+			+ sym->st_value);
+	  
+	  name = bfd_elf_string_from_elf_section
+	    (input_bfd, symtab_hdr->sh_link, sym->st_name);
+	  name = (sym->st_name == 0) ? bfd_section_name (input_bfd, sec) : name;
+	}
+      else
+	{
+	  h = sym_hashes [r_symndx - symtab_hdr->sh_info];
+	  
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+	  name = h->root.root.string;
+	  
+	  if (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	    {
+	      sec = h->root.u.def.section;
+	      relocation = (h->root.u.def.value
+			    + sec->output_section->vma
+			    + sec->output_offset);
+	    }
+	  else if (h->root.type == bfd_link_hash_undefweak)
+	    ;
+	  else if (!info->relocatable)
+	    {
+	      if (! ((*info->callbacks->undefined_symbol)
+		     (info, h->root.root.string, input_bfd,
+		      input_section, rel->r_offset, TRUE)))
+		return FALSE;
+	    }
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	{
+	  /* This is a relocatable link.  We don't have to change
+             anything, unless the reloc is against a section symbol,
+             in which case we have to adjust according to where the
+             section symbol winds up in the output section.  */
+	  if (sym != NULL && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+	    rel->r_addend += sec->output_offset;
+	  continue;
+	}
+
+      switch (ELF32_R_TYPE (rel->r_info))
+	{
+	case R_M32C_16:
+	  {
+	    bfd_vma *plt_offset;
+
+	    if (h != NULL)
+	      plt_offset = &h->plt.offset;
+	    else
+	      plt_offset = elf_local_got_offsets (input_bfd) + r_symndx;
+
+	    /*	    printf("%s: rel %x plt %d\n", h ? h->root.root.string : "(none)",
+		    relocation, *plt_offset);*/
+	    if (relocation <= 0xffff)
+	      {
+	        /* If the symbol is in range for a 16-bit address, we should
+		   have deallocated the plt entry in relax_section.  */
+	        BFD_ASSERT (*plt_offset == (bfd_vma) -1);
+	      }
+	    else
+	      {
+		/* If the symbol is out of range for a 16-bit address,
+		   we must have allocated a plt entry.  */
+		BFD_ASSERT (*plt_offset != (bfd_vma) -1);
+
+		/* If this is the first time we've processed this symbol,
+		   fill in the plt entry with the correct symbol address.  */
+		if ((*plt_offset & 1) == 0)
+		  {
+		    unsigned int x;
+
+		    x = 0x000000fc;  /* jmpf */
+		    x |= (relocation << 8) & 0xffffff00;
+		    bfd_put_32 (input_bfd, x, splt->contents + *plt_offset);
+		    *plt_offset |= 1;
+		  }
+
+		relocation = (splt->output_section->vma
+			      + splt->output_offset
+			      + (*plt_offset & -2));
+		if (name)
+		{
+		  char *newname = bfd_malloc (strlen(name)+5);
+		  strcpy (newname, name);
+		  strcat(newname, ".plt");
+		  _bfd_generic_link_add_one_symbol (info,
+						    input_bfd,
+						    newname,
+						    BSF_FUNCTION | BSF_WEAK,
+						    splt,
+						    (*plt_offset & -2),
+						    0,
+						    1,
+						    0,
+						    0);
+		}
+	      }
+	  }
+	  break;
+
+	case R_M32C_HI8:
+	case R_M32C_HI16:
+	  relocation >>= 16;
+	  break;
+	}
+
+#if 0
+      printf ("relocate %s at %06lx relocation %06lx addend %ld  ",
+	      m32c_elf_howto_table[ELF32_R_TYPE(rel->r_info)].name,
+	      rel->r_offset + input_section->output_section->vma + input_section->output_offset,
+	      relocation, rel->r_addend);
+      {
+	int i;
+	for (i=0; i<4; i++)
+	  printf (" %02x", contents[rel->r_offset+i]);
+	printf ("\n");
+      }
+#endif
+      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+                                    contents, rel->r_offset, relocation,
+                                    rel->r_addend);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char * msg = (const char *) NULL;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      r = info->callbacks->reloc_overflow
+		(info, (h ? &h->root : NULL), name, howto->name, (bfd_vma) 0,
+		 input_bfd, input_section, rel->r_offset);
+	      break;
+	      
+	    case bfd_reloc_undefined:
+	      r = info->callbacks->undefined_symbol
+		(info, name, input_bfd, input_section, rel->r_offset,
+		 TRUE);
+	      break;
+	      
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      break;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      break;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous relocation");
+	      break;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      break;
+	    }
+
+	  if (msg)
+	    r = info->callbacks->warning
+	      (info, msg, name, input_bfd, input_section, rel->r_offset);
+
+	  if (! r)
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* We support 16-bit pointers to code above 64k by generating a thunk
+   below 64k containing a JMP instruction to the final address.  */
+ 
+static bfd_boolean
+m32c_elf_check_relocs
+    (bfd *                     abfd,
+     struct bfd_link_info *    info,
+     asection *                sec,
+     const Elf_Internal_Rela * relocs)
+{
+  Elf_Internal_Shdr *           symtab_hdr;
+  struct elf_link_hash_entry ** sym_hashes;
+  const Elf_Internal_Rela *     rel;
+  const Elf_Internal_Rela *     rel_end;
+  bfd_vma *local_plt_offsets;
+  asection *splt;
+  bfd *dynobj;
+ 
+  if (info->relocatable)
+    return TRUE;
+ 
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  local_plt_offsets = elf_local_got_offsets (abfd);
+  splt = NULL;
+  dynobj = elf_hash_table(info)->dynobj;
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+      bfd_vma *offset;
+ 
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+        h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+ 
+      switch (ELF32_R_TYPE (rel->r_info))
+        {
+	  /* This relocation describes a 16-bit pointer to a function.
+	     We may need to allocate a thunk in low memory; reserve memory
+	     for it now.  */
+	case R_M32C_16:
+	  if (dynobj == NULL)
+	    elf_hash_table (info)->dynobj = dynobj = abfd;
+	  if (splt == NULL)
+	    {
+	      splt = bfd_get_section_by_name (dynobj, ".plt");
+	      if (splt == NULL)
+		{
+		  flagword flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
+				    | SEC_IN_MEMORY | SEC_LINKER_CREATED
+				    | SEC_READONLY | SEC_CODE);
+		  splt = bfd_make_section_with_flags (dynobj, ".plt", flags);
+		  if (splt == NULL
+		      || ! bfd_set_section_alignment (dynobj, splt, 1))
+		    return FALSE;
+		}
+	    }
+
+	  if (h != NULL)
+	    offset = &h->plt.offset;
+	  else
+	    {
+	      if (local_plt_offsets == NULL)
+		{
+		  size_t size;
+		  unsigned int i;
+
+		  size = symtab_hdr->sh_info * sizeof (bfd_vma);
+		  local_plt_offsets = (bfd_vma *) bfd_alloc (abfd, size);
+		  if (local_plt_offsets == NULL)
+		    return FALSE;
+		  elf_local_got_offsets (abfd) = local_plt_offsets;
+
+		  for (i = 0; i < symtab_hdr->sh_info; i++)
+		    local_plt_offsets[i] = (bfd_vma) -1;
+		}
+	      offset = &local_plt_offsets[r_symndx];
+	    }
+
+	  if (*offset == (bfd_vma) -1)
+	    {
+	      *offset = splt->size;
+	      splt->size += 4;
+	    }
+	  break;
+        }
+    }
+ 
+  return TRUE;
+}
+
+/* This must exist if dynobj is ever set.  */
+
+static bfd_boolean
+m32c_elf_finish_dynamic_sections (bfd *abfd ATTRIBUTE_UNUSED,
+                                  struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *splt;
+
+  /* As an extra sanity check, verify that all plt entries have
+     been filled in.  */
+
+  if ((dynobj = elf_hash_table (info)->dynobj) != NULL
+      && (splt = bfd_get_section_by_name (dynobj, ".plt")) != NULL)
+    {
+      bfd_byte *contents = splt->contents;
+      unsigned int i, size = splt->size;
+      for (i = 0; i < size; i += 4)
+	{
+	  unsigned int x = bfd_get_32 (dynobj, contents + i);
+	  BFD_ASSERT (x != 0);
+	}
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+m32c_elf_always_size_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+                               struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *splt;
+
+  if (info->relocatable)
+    return TRUE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  if (dynobj == NULL)
+    return TRUE;
+
+  splt = bfd_get_section_by_name (dynobj, ".plt");
+  BFD_ASSERT (splt != NULL);
+
+  splt->contents = (bfd_byte *) bfd_zalloc (dynobj, splt->size);
+  if (splt->contents == NULL)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Function to set the ELF flag bits.  */
+
+static bfd_boolean
+m32c_elf_set_private_flags (bfd *abfd, flagword flags)
+{
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+
+static bfd_boolean
+m32c_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  flagword old_flags, old_partial;
+  flagword new_flags, new_partial;
+  bfd_boolean error = FALSE;
+  char new_opt[80];
+  char old_opt[80];
+
+  new_opt[0] = old_opt[0] = '\0';
+  new_flags = elf_elfheader (ibfd)->e_flags;
+  old_flags = elf_elfheader (obfd)->e_flags;
+
+#ifdef DEBUG
+  (*_bfd_error_handler) ("old_flags = 0x%.8lx, new_flags = 0x%.8lx, init = %s, filename = %s",
+			 old_flags, new_flags, elf_flags_init (obfd) ? "yes" : "no",
+			 bfd_get_filename (ibfd));
+#endif
+
+  if (!elf_flags_init (obfd))
+    {
+      /* First call, no flags set.  */
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = new_flags;
+    }
+
+  else if (new_flags == old_flags)
+    /* Compatible flags are ok.	 */
+    ;
+
+  else		/* Possibly incompatible flags.	 */
+    {
+      /* Warn if different cpu is used (allow a specific cpu to override
+	 the generic cpu).  */
+      new_partial = (new_flags & EF_M32C_CPU_MASK);
+      old_partial = (old_flags & EF_M32C_CPU_MASK);
+      if (new_partial == old_partial)
+	;
+
+      else
+	{
+	  switch (new_partial)
+	    {
+	    default:		  strcat (new_opt, " -m16c");	break;
+	    case EF_M32C_CPU_M16C:	strcat (new_opt, " -m16c");  break;
+	    case EF_M32C_CPU_M32C:  strcat (new_opt, " -m32c");  break;
+	    }
+
+	  switch (old_partial)
+	    {
+	    default:		  strcat (old_opt, " -m16c");	break;
+	    case EF_M32C_CPU_M16C:	strcat (old_opt, " -m16c");  break;
+	    case EF_M32C_CPU_M32C:  strcat (old_opt, " -m32c");  break;
+	    }
+	}
+      
+      /* Print out any mismatches from above.  */
+      if (new_opt[0])
+	{
+	  error = TRUE;
+	  (*_bfd_error_handler)
+	    (_("%s: compiled with %s and linked with modules compiled with %s"),
+	     bfd_get_filename (ibfd), new_opt, old_opt);
+	}
+
+      new_flags &= ~ EF_M32C_ALL_FLAGS;
+      old_flags &= ~ EF_M32C_ALL_FLAGS;
+
+      /* Warn about any other mismatches.  */
+      if (new_flags != old_flags)
+	{
+	  error = TRUE;
+	  (*_bfd_error_handler)
+	    (_("%s: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"),
+	     bfd_get_filename (ibfd), (long)new_flags, (long)old_flags);
+	}
+    }
+
+  if (error)
+    bfd_set_error (bfd_error_bad_value);
+
+  return !error;
+}
+
+
+static bfd_boolean
+m32c_elf_print_private_bfd_data (bfd *abfd, PTR ptr)
+{
+  FILE *file = (FILE *) ptr;
+  flagword flags;
+
+  BFD_ASSERT (abfd != NULL && ptr != NULL);
+
+  /* Print normal ELF private data.  */
+  _bfd_elf_print_private_bfd_data (abfd, ptr);
+
+  flags = elf_elfheader (abfd)->e_flags;
+  fprintf (file, _("private flags = 0x%lx:"), (unsigned long) flags);
+
+  switch (flags & EF_M32C_CPU_MASK)
+    {
+    default:							break;
+    case EF_M32C_CPU_M16C:	fprintf (file, " -m16c");	break;
+    case EF_M32C_CPU_M32C:  fprintf (file, " -m32c");	break;
+    }
+
+  fputc ('\n', file);
+  return TRUE;
+}
+
+/* Return the MACH for an e_flags value.  */
+
+static int
+elf32_m32c_machine (bfd *abfd)
+{
+  switch (elf_elfheader (abfd)->e_flags & EF_M32C_CPU_MASK)
+    {
+    case EF_M32C_CPU_M16C:	return bfd_mach_m16c;
+    case EF_M32C_CPU_M32C:  	return bfd_mach_m32c;
+    }
+
+  return bfd_mach_m16c;
+}
+
+static bfd_boolean
+m32c_elf_object_p (bfd *abfd)
+{
+  bfd_default_set_arch_mach (abfd, bfd_arch_m32c,
+			     elf32_m32c_machine (abfd));
+  return TRUE;
+}
+ 
+
+#ifdef DEBUG
+void
+dump_symtab (bfd * abfd, void *internal_syms, void *external_syms)
+{
+  size_t locsymcount;
+  Elf_Internal_Sym *isymbuf;
+  Elf_Internal_Sym *isymend;
+  Elf_Internal_Sym *isym;
+  Elf_Internal_Shdr *symtab_hdr;
+  bfd_boolean free_internal = 0, free_external = 0;
+  char * st_info_str;
+  char * st_info_stb_str;
+  char * st_other_str;
+  char * st_shndx_str;
+
+  if (! internal_syms)
+    {
+      internal_syms = bfd_malloc (1000);
+      free_internal = 1;
+    }
+  if (! external_syms)
+    {
+      external_syms = bfd_malloc (1000);
+      free_external = 1;
+    }
+  
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  locsymcount = symtab_hdr->sh_size / get_elf_backend_data(abfd)->s->sizeof_sym;
+  if (free_internal)
+    isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+				    symtab_hdr->sh_info, 0,
+				    internal_syms, external_syms, NULL);
+  else
+    isymbuf = internal_syms;
+  isymend = isymbuf + locsymcount;
+
+  for (isym = isymbuf ; isym < isymend ; isym++)
+    {
+      switch (ELF_ST_TYPE (isym->st_info))
+	{
+	case STT_FUNC: st_info_str = "STT_FUNC";
+	case STT_SECTION: st_info_str = "STT_SECTION";
+	case STT_FILE: st_info_str = "STT_FILE";
+	case STT_OBJECT: st_info_str = "STT_OBJECT";
+	case STT_TLS: st_info_str = "STT_TLS";
+	default: st_info_str = "";
+	}
+      switch (ELF_ST_BIND (isym->st_info))
+	{
+	case STB_LOCAL: st_info_stb_str = "STB_LOCAL";
+	case STB_GLOBAL: st_info_stb_str = "STB_GLOBAL";
+	default: st_info_stb_str = "";
+	}
+      switch (ELF_ST_VISIBILITY (isym->st_other))
+	{
+	case STV_DEFAULT: st_other_str = "STV_DEFAULT";
+	case STV_INTERNAL: st_other_str = "STV_INTERNAL";
+	case STV_PROTECTED: st_other_str = "STV_PROTECTED";
+	default: st_other_str = "";
+	}
+      switch (isym->st_shndx)
+	{
+	case SHN_ABS: st_shndx_str = "SHN_ABS";
+	case SHN_COMMON: st_shndx_str = "SHN_COMMON";
+	case SHN_UNDEF: st_shndx_str = "SHN_UNDEF";
+	default: st_shndx_str = "";
+	}
+      
+      printf ("isym = %p st_value = %lx st_size = %lx st_name = (%lu) %s "
+	      "st_info = (%d) %s %s st_other = (%d) %s st_shndx = (%d) %s\n",
+	      isym, 
+	      (unsigned long) isym->st_value,
+	      (unsigned long) isym->st_size,
+	      isym->st_name,
+	      bfd_elf_string_from_elf_section (abfd, symtab_hdr->sh_link,
+					       isym->st_name),
+	      isym->st_info, st_info_str, st_info_stb_str,
+	      isym->st_other, st_other_str,
+	      isym->st_shndx, st_shndx_str);
+    }
+  if (free_internal)
+    free (internal_syms);
+  if (free_external)
+    free (external_syms);
+}
+
+char *
+m32c_get_reloc (long reloc)
+{
+  if (0 <= reloc && reloc < R_M32C_max)
+    return m32c_elf_howto_table[reloc].name;
+  else
+    return "";
+}
+#endif /* DEBUG */
+
+/* Handle relaxing.  */
+
+/* A subroutine of m32c_elf_relax_section.  If the global symbol H
+   is within the low 64k, remove any entry for it in the plt.  */
+
+struct relax_plt_data
+{
+  asection *splt;
+  bfd_boolean *again;
+};
+
+static bfd_boolean
+m32c_relax_plt_check (struct elf_link_hash_entry *h,
+                      PTR xdata)
+{
+  struct relax_plt_data *data = (struct relax_plt_data *) xdata;
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      bfd_vma address;
+
+      if (h->root.type == bfd_link_hash_undefined
+	  || h->root.type == bfd_link_hash_undefweak)
+	address = 0;
+      else
+	address = (h->root.u.def.section->output_section->vma
+		   + h->root.u.def.section->output_offset
+		   + h->root.u.def.value);
+
+      if (address <= 0xffff)
+	{
+	  h->plt.offset = -1;
+	  data->splt->size -= 4;
+	  *data->again = TRUE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* A subroutine of m32c_elf_relax_section.  If the global symbol H
+   previously had a plt entry, give it a new entry offset.  */
+
+static bfd_boolean
+m32c_relax_plt_realloc (struct elf_link_hash_entry *h,
+                        PTR xdata)
+{
+  bfd_vma *entry = (bfd_vma *) xdata;
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      h->plt.offset = *entry;
+      *entry += 4;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+m32c_elf_relax_plt_section (bfd *dynobj,
+                            asection *splt,
+                            struct bfd_link_info *info,
+                            bfd_boolean *again)
+{
+  struct relax_plt_data relax_plt_data;
+  bfd *ibfd;
+
+  /* Assume nothing changes.  */
+  *again = FALSE;
+
+  if (info->relocatable)
+    return TRUE;
+
+  /* We only relax the .plt section at the moment.  */
+  if (dynobj != elf_hash_table (info)->dynobj
+      || strcmp (splt->name, ".plt") != 0)
+    return TRUE;
+
+  /* Quick check for an empty plt.  */
+  if (splt->size == 0)
+    return TRUE;
+
+  /* Map across all global symbols; see which ones happen to
+     fall in the low 64k.  */
+  relax_plt_data.splt = splt;
+  relax_plt_data.again = again;
+  elf_link_hash_traverse (elf_hash_table (info), m32c_relax_plt_check,
+			  &relax_plt_data);
+
+  /* Likewise for local symbols, though that's somewhat less convenient
+     as we have to walk the list of input bfds and swap in symbol data.  */
+  for (ibfd = info->input_bfds; ibfd ; ibfd = ibfd->link_next)
+    {
+      bfd_vma *local_plt_offsets = elf_local_got_offsets (ibfd);
+      Elf_Internal_Shdr *symtab_hdr;
+      Elf_Internal_Sym *isymbuf = NULL;
+      unsigned int idx;
+
+      if (! local_plt_offsets)
+	continue;
+
+      symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+      if (symtab_hdr->sh_info != 0)
+	{
+	  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	  if (isymbuf == NULL)
+	    isymbuf = bfd_elf_get_elf_syms (ibfd, symtab_hdr,
+					    symtab_hdr->sh_info, 0,
+					    NULL, NULL, NULL);
+	  if (isymbuf == NULL)
+	    return FALSE;
+	}
+
+      for (idx = 0; idx < symtab_hdr->sh_info; ++idx)
+	{
+	  Elf_Internal_Sym *isym;
+	  asection *tsec;
+	  bfd_vma address;
+
+	  if (local_plt_offsets[idx] == (bfd_vma) -1)
+	    continue;
+
+	  isym = &isymbuf[idx];
+	  if (isym->st_shndx == SHN_UNDEF)
+	    continue;
+	  else if (isym->st_shndx == SHN_ABS)
+	    tsec = bfd_abs_section_ptr;
+	  else if (isym->st_shndx == SHN_COMMON)
+	    tsec = bfd_com_section_ptr;
+	  else
+	    tsec = bfd_section_from_elf_index (ibfd, isym->st_shndx);
+
+	  address = (tsec->output_section->vma
+		     + tsec->output_offset
+		     + isym->st_value);
+	  if (address <= 0xffff)
+	    {
+	      local_plt_offsets[idx] = -1;
+	      splt->size -= 4;
+	      *again = TRUE;
+	    }
+	}
+
+      if (isymbuf != NULL
+	  && symtab_hdr->contents != (unsigned char *) isymbuf)
+	{
+	  if (! info->keep_memory)
+	    free (isymbuf);
+	  else
+	    {
+	      /* Cache the symbols for elf_link_input_bfd.  */
+	      symtab_hdr->contents = (unsigned char *) isymbuf;
+	    }
+	}
+    }
+
+  /* If we changed anything, walk the symbols again to reallocate
+     .plt entry addresses.  */
+  if (*again && splt->size > 0)
+    {
+      bfd_vma entry = 0;
+
+      elf_link_hash_traverse (elf_hash_table (info),
+			      m32c_relax_plt_realloc, &entry);
+
+      for (ibfd = info->input_bfds; ibfd ; ibfd = ibfd->link_next)
+	{
+	  bfd_vma *local_plt_offsets = elf_local_got_offsets (ibfd);
+	  unsigned int nlocals = elf_tdata (ibfd)->symtab_hdr.sh_info;
+	  unsigned int idx;
+
+	  if (! local_plt_offsets)
+	    continue;
+
+	  for (idx = 0; idx < nlocals; ++idx)
+	    if (local_plt_offsets[idx] != (bfd_vma) -1)
+	      {
+	        local_plt_offsets[idx] = entry;
+		entry += 4;
+	      }
+	}
+    }
+
+  return TRUE;
+}
+
+static int
+compare_reloc (const void *e1, const void *e2)
+{
+  const Elf_Internal_Rela *i1 = (const Elf_Internal_Rela *) e1;
+  const Elf_Internal_Rela *i2 = (const Elf_Internal_Rela *) e2;
+
+  if (i1->r_offset == i2->r_offset)
+    return 0;
+  else
+    return i1->r_offset < i2->r_offset ? -1 : 1;
+}
+
+#define OFFSET_FOR_RELOC(rel) m32c_offset_for_reloc (abfd, rel, symtab_hdr, shndx_buf, intsyms)
+static bfd_vma
+m32c_offset_for_reloc (bfd *abfd,
+		       Elf_Internal_Rela *rel,
+		       Elf_Internal_Shdr *symtab_hdr,
+		       Elf_External_Sym_Shndx *shndx_buf ATTRIBUTE_UNUSED,
+		       Elf_Internal_Sym *intsyms)
+{
+  bfd_vma symval;
+
+  /* Get the value of the symbol referred to by the reloc.  */
+  if (ELF32_R_SYM (rel->r_info) < symtab_hdr->sh_info)
+    {
+      /* A local symbol.  */
+      Elf_Internal_Sym *isym;
+      asection *ssec;
+
+      isym = intsyms + ELF32_R_SYM (rel->r_info);
+      ssec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+      symval = isym->st_value;
+      if (ssec)
+	symval += ssec->output_section->vma
+	  + ssec->output_offset;
+    }
+  else
+    {
+      unsigned long indx;
+      struct elf_link_hash_entry *h;
+
+      /* An external symbol.  */
+      indx = ELF32_R_SYM (rel->r_info) - symtab_hdr->sh_info;
+      h = elf_sym_hashes (abfd)[indx];
+      BFD_ASSERT (h != NULL);
+
+      if (h->root.type != bfd_link_hash_defined
+	  && h->root.type != bfd_link_hash_defweak)
+	/* This appears to be a reference to an undefined
+	   symbol.  Just ignore it--it will be caught by the
+	   regular reloc processing.  */
+	return 0;
+
+      symval = (h->root.u.def.value
+		+ h->root.u.def.section->output_section->vma
+		+ h->root.u.def.section->output_offset);
+    }
+  return symval;
+}
+
+static int bytes_saved = 0;
+
+static int bytes_to_reloc[] = {
+  R_M32C_NONE,
+  R_M32C_8,
+  R_M32C_16,
+  R_M32C_24,
+  R_M32C_32
+};
+
+/* What we use the bits in a relax reloc addend (R_M32C_RL_*) for.  */
+
+/* Mask for the number of relocs associated with this insn.  */
+#define RLA_RELOCS		0x0000000f
+/* Number of bytes gas emitted (before gas's relaxing) */
+#define RLA_NBYTES		0x00000ff0
+
+/* If the displacement is within the given range and the new encoding
+   differs from the old encoding (the index), then the insn can be
+   relaxed to the new encoding.  */
+typedef struct {
+  int bytes;
+  unsigned int max_disp;
+  unsigned char new_encoding;
+} EncodingTable;
+
+static EncodingTable m16c_addr_encodings[] = {
+  { 0,   0,  0 }, /* R0 */
+  { 0,   0,  1 }, /* R1 */
+  { 0,   0,  2 }, /* R2 */
+  { 0,   0,  3 }, /* R3 */
+  { 0,   0,  4 }, /* A0 */
+  { 0,   0,  5 }, /* A1 */
+  { 0,   0,  6 }, /* [A0] */
+  { 0,   0,  7 }, /* [A1] */
+  { 1,   0,  6 }, /* udsp:8[A0] */
+  { 1,   0,  7 }, /* udsp:8[A1] */
+  { 1,   0, 10 }, /* udsp:8[SB] */
+  { 1,   0, 11 }, /* sdsp:8[FB] */
+  { 2, 255,  8 }, /* udsp:16[A0] */
+  { 2, 255,  9 }, /* udsp:16[A1] */
+  { 2, 255, 10 }, /* udsp:16[SB] */
+  { 2,   0, 15 }, /* abs:16 */
+};
+
+static EncodingTable m16c_jmpaddr_encodings[] = {
+  { 0,   0,  0 }, /* R0 */
+  { 0,   0,  1 }, /* R1 */
+  { 0,   0,  2 }, /* R2 */
+  { 0,   0,  3 }, /* R3 */
+  { 0,   0,  4 }, /* A0 */
+  { 0,   0,  5 }, /* A1 */
+  { 0,   0,  6 }, /* [A0] */
+  { 0,   0,  7 }, /* [A1] */
+  { 1,   0,  6 }, /* udsp:8[A0] */
+  { 1,   0,  7 }, /* udsp:8[A1] */
+  { 1,   0, 10 }, /* udsp:8[SB] */
+  { 1,   0, 11 }, /* sdsp:8[FB] */
+  { 3, 255,  8 }, /* udsp:20[A0] */
+  { 3, 255,  9 }, /* udsp:20[A1] */
+  { 2, 255, 10 }, /* udsp:16[SB] */
+  { 2,   0, 15 }, /* abs:16 */
+};
+
+static EncodingTable m32c_addr_encodings[] = {
+  { 0,     0,  0 }, /* [A0] */
+  { 0,     0,  1 }, /* [A1] */
+  { 0,     0,  2 }, /* A0 */
+  { 0,     0,  3 }, /* A1 */
+  { 1,     0,  0 }, /* udsp:8[A0] */
+  { 1,     0,  1 }, /* udsp:8[A1] */
+  { 1,     0,  6 }, /* udsp:8[SB] */
+  { 1,     0,  7 }, /* sdsp:8[FB] */
+  { 2,   255,  4 }, /* udsp:16[A0] */
+  { 2,   255,  5 }, /* udsp:16[A1] */
+  { 2,   255,  6 }, /* udsp:16[SB] */
+  { 2,   127,  7 }, /* sdsp:16[FB] */
+  { 3, 65535, 8 }, /* udsp:24[A0] */
+  { 3, 65535, 9 }, /* udsp:24[A1] */
+  { 3, 65535, 15 }, /* abs24 */
+  { 2,     0, 15 }, /* abs16 */
+  { 0,     0, 16 }, /* R2 */
+  { 0,     0, 17 }, /* R3 */
+  { 0,     0, 18 }, /* R0 */
+  { 0,     0, 19 }, /* R1 */
+  { 0,     0, 20 }, /*  */
+  { 0,     0, 21 }, /*  */
+  { 0,     0, 22 }, /*  */
+  { 0,     0, 23 }, /*  */
+  { 0,     0, 24 }, /*  */
+  { 0,     0, 25 }, /*  */
+  { 0,     0, 26 }, /*  */
+  { 0,     0, 27 }, /*  */
+  { 0,     0, 28 }, /*  */
+  { 0,     0, 29 }, /*  */
+  { 0,     0, 30 }, /*  */
+  { 0,     0, 31 }, /*  */
+};
+
+static bfd_boolean
+m32c_elf_relax_section
+    (bfd *                  abfd,
+     asection *             sec,
+     struct bfd_link_info * link_info,
+     bfd_boolean *          again)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Shdr *shndx_hdr;
+  Elf_Internal_Rela *internal_relocs;
+  Elf_Internal_Rela *free_relocs = NULL;
+  Elf_Internal_Rela *irel, *irelend, *srel;
+  bfd_byte * contents = NULL;
+  bfd_byte * free_contents = NULL;
+  Elf_Internal_Sym *intsyms = NULL;
+  Elf_Internal_Sym *free_intsyms = NULL;
+  Elf_External_Sym_Shndx *shndx_buf = NULL;
+  int machine;
+
+  if (abfd == elf_hash_table (link_info)->dynobj
+      && strcmp (sec->name, ".plt") == 0)
+    return m32c_elf_relax_plt_section (abfd, sec, link_info, again);
+
+  /* Assume nothing changes.  */
+  *again = FALSE;
+
+  machine = elf32_m32c_machine (abfd);
+
+  /* We don't have to do anything for a relocatable link, if
+     this section does not have relocs, or if this is not a
+     code section.  */
+  if (link_info->relocatable
+      || (sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0
+      || (sec->flags & SEC_CODE) == 0)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  shndx_hdr = &elf_tdata (abfd)->symtab_shndx_hdr;
+
+  /* Get the section contents.  */
+  if (elf_section_data (sec)->this_hdr.contents != NULL)
+    contents = elf_section_data (sec)->this_hdr.contents;
+  /* Go get them off disk.  */
+  else if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+    goto error_return;
+
+  /* Read this BFD's symbols.  */
+  /* Get cached copy if it exists.  */
+  if (symtab_hdr->contents != NULL)
+    {
+      intsyms = (Elf_Internal_Sym *) symtab_hdr->contents;
+    }
+  else
+    {
+      intsyms = bfd_elf_get_elf_syms (abfd, symtab_hdr, symtab_hdr->sh_info, 0, NULL, NULL, NULL);
+      symtab_hdr->contents = (bfd_byte *) intsyms;
+    }
+
+  if (shndx_hdr->sh_size != 0)
+    {
+      bfd_size_type amt;
+
+      amt = symtab_hdr->sh_info;
+      amt *= sizeof (Elf_External_Sym_Shndx);
+      shndx_buf = (Elf_External_Sym_Shndx *) bfd_malloc (amt);
+      if (shndx_buf == NULL)
+	goto error_return;
+      if (bfd_seek (abfd, shndx_hdr->sh_offset, SEEK_SET) != 0
+	  || bfd_bread ((PTR) shndx_buf, amt, abfd) != amt)
+	goto error_return;
+      shndx_hdr->contents = (bfd_byte *) shndx_buf;
+    }
+
+  /* Get a copy of the native relocations.  */
+  internal_relocs = (_bfd_elf_link_read_relocs
+		     (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
+		      link_info->keep_memory));
+  if (internal_relocs == NULL)
+    goto error_return;
+  if (! link_info->keep_memory)
+    free_relocs = internal_relocs;
+
+  /* The RL_ relocs must be just before the operand relocs they go
+     with, so we must sort them to guarantee this.  */
+  qsort (internal_relocs, sec->reloc_count, sizeof (Elf_Internal_Rela),
+         compare_reloc);
+
+  /* Walk through them looking for relaxing opportunities.  */
+  irelend = internal_relocs + sec->reloc_count;
+
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      bfd_vma symval;
+      unsigned char *insn, *gap, *einsn;
+      bfd_vma pc;
+      bfd_signed_vma pcrel;
+      int relax_relocs;
+      int gap_size;
+      int new_type;
+      int posn;
+      int enc;
+      EncodingTable *enctbl;
+      EncodingTable *e;
+
+      if (ELF32_R_TYPE(irel->r_info) != R_M32C_RL_JUMP
+	  && ELF32_R_TYPE(irel->r_info) != R_M32C_RL_1ADDR
+	  && ELF32_R_TYPE(irel->r_info) != R_M32C_RL_2ADDR)
+	continue;
+
+      srel = irel;
+
+      /* There will always be room for the relaxed insn, since it is smaller
+	 than the one it would replace.  */
+      BFD_ASSERT (irel->r_offset < sec->size);
+
+      insn = contents + irel->r_offset;
+      relax_relocs = irel->r_addend % 16;
+
+      /* Ok, we only have three relocs we care about, and they're all
+	 fake.  The lower four bits of the addend is always the number
+	 of following relocs (hence the qsort above) that are assigned
+	 to this opcode.  The next 8 bits of the addend indicates the
+	 number of bytes in the insn.  We use the rest of them
+	 ourselves as flags for the more expensive operations (defines
+	 above).  The three relocs are:
+
+	 RL_JUMP: This marks all direct jump insns.  We check the
+		displacement and replace them with shorter jumps if
+		they're in range.  We also use this to find JMP.S
+		insns and manually shorten them when we delete bytes.
+		We have to decode these insns to figure out what to
+		do.
+
+	 RL_1ADDR: This is a :G or :Q insn, which has a single
+		"standard" operand.  We have to extract the type
+		field, see if it's a wide displacement, then figure
+		out if we can replace it with a narrow displacement.
+		We don't have to decode these insns.
+
+	 RL_2ADDR: Similarly, but two "standard" operands.  Note that
+		r_addend may still be 1, as standard operands don't
+		always have displacements.  Gas shouldn't give us one
+		with zero operands, but since we don't know which one
+		has the displacement, we check them both anyway.
+
+	 These all point to the beginning of the insn itself, not the
+	 operands.
+
+	 Note that we only relax one step at a time, relying on the
+	 linker to call us repeatedly.  Thus, there is no code for
+	 JMP.A->JMP.B although that will happen in two steps.
+	 Likewise, for 2ADDR relaxes, we do one operand per cycle.
+      */
+
+      /* Get the value of the symbol referred to by the reloc.  Just
+         in case this is the last reloc in the list, use the RL's
+         addend to choose between this reloc (no addend) or the next
+         (yes addend, which means at least one following reloc).  */
+      srel = irel + (relax_relocs ? 1 : 0);
+      symval = OFFSET_FOR_RELOC (srel);
+
+      /* Setting gap_size nonzero is the flag which means "something
+	 shrunk".  */
+      gap_size = 0;
+      gap = NULL;
+      new_type = ELF32_R_TYPE(srel->r_info);
+
+      pc = sec->output_section->vma + sec->output_offset
+	+ srel->r_offset;
+      pcrel = symval - pc + srel->r_addend;
+
+      if (machine == bfd_mach_m16c)
+	{
+	  /* R8C / M16C */
+
+	  switch (ELF32_R_TYPE(irel->r_info))
+	    {
+
+	    case R_M32C_RL_JUMP:
+	      switch (insn[0])
+		{
+		case 0xfe: /* jmp.b */
+		  if (pcrel >= 2 && pcrel <= 9)
+		    {
+		      /* Relax JMP.B -> JMP.S.  We need to get rid of
+			 the following reloc though. */
+		      insn[0] = 0x60 | (pcrel - 2);
+		      new_type = R_M32C_NONE;
+		      irel->r_addend = 0x10;
+		      gap_size = 1;
+		      gap = insn + 1;
+		    }
+		  break;
+
+		case 0xf4: /* jmp.w */
+		  /* 128 is allowed because it will be one byte closer
+		     after relaxing.  Likewise for all other pc-rel
+		     jumps.  */
+		  if (pcrel <= 128 && pcrel >= -128)
+		    {
+		      /* Relax JMP.W -> JMP.B */
+		      insn[0] = 0xfe;
+		      insn[1] = 0;
+		      new_type = R_M32C_8_PCREL;
+		      gap_size = 1;
+		      gap = insn + 2;
+		    }
+		  break;
+
+		case 0xfc: /* jmp.a */
+		  if (pcrel <= 32768 && pcrel >= -32768)
+		    {
+		      /* Relax JMP.A -> JMP.W */
+		      insn[0] = 0xf4;
+		      insn[1] = 0;
+		      insn[2] = 0;
+		      new_type = R_M32C_16_PCREL;
+		      gap_size = 1;
+		      gap = insn + 3;
+		    }
+		  break;
+
+		case 0xfd: /* jsr.a */
+		  if (pcrel <= 32768 && pcrel >= -32768)
+		    {
+		      /* Relax JSR.A -> JSR.W */
+		      insn[0] = 0xf5;
+		      insn[1] = 0;
+		      insn[2] = 0;
+		      new_type = R_M32C_16_PCREL;
+		      gap_size = 1;
+		      gap = insn + 3;
+		    }
+		  break;
+		}
+	      break;
+
+	    case R_M32C_RL_2ADDR:
+	      /* xxxx xxxx srce dest [src-disp] [dest-disp]*/
+
+	      enctbl = m16c_addr_encodings;
+	      posn = 2;
+	      enc = (insn[1] >> 4) & 0x0f;
+	      e = & enctbl[enc];
+
+	      if (srel->r_offset == irel->r_offset + posn
+		  && e->new_encoding != enc
+		  && symval <= e->max_disp)
+		{
+		  insn[1] &= 0x0f;
+		  insn[1] |= e->new_encoding << 4;
+		  gap_size = e->bytes - enctbl[e->new_encoding].bytes;
+		  gap = insn + posn + enctbl[e->new_encoding].bytes;
+		  new_type = bytes_to_reloc[enctbl[e->new_encoding].bytes];
+		  break;
+		}
+	      if (relax_relocs == 2)
+		srel ++;
+	      posn += e->bytes;
+
+	      goto try_1addr_16;
+
+	    case R_M32C_RL_1ADDR:
+	      /* xxxx xxxx xxxx dest [disp] */
+
+	      enctbl = m16c_addr_encodings;
+	      posn = 2;
+	      
+	      /* Check the opcode for jumps.  We know it's safe to
+		 do this because all 2ADDR insns are at least two
+		 bytes long.  */
+	      enc = insn[0] * 256 + insn[1];
+	      enc &= 0xfff0;
+	      if (enc == 0x7d20
+		  || enc == 0x7d00
+		  || enc == 0x7d30
+		  || enc == 0x7d10)
+		{
+		  enctbl = m16c_jmpaddr_encodings;
+		}
+
+	    try_1addr_16:
+	      /* srel, posn, and enc must be set here.  */
+
+	      symval = OFFSET_FOR_RELOC (srel);
+	      enc = insn[1] & 0x0f;
+	      e = & enctbl[enc];
+
+	      if (srel->r_offset == irel->r_offset + posn
+		  && e->new_encoding != enc
+		  && symval <= e->max_disp)
+		{
+		  insn[1] &= 0xf0;
+		  insn[1] |= e->new_encoding;
+		  gap_size = e->bytes - enctbl[e->new_encoding].bytes;
+		  gap = insn + posn + enctbl[e->new_encoding].bytes;
+		  new_type = bytes_to_reloc[enctbl[e->new_encoding].bytes];
+		  break;
+		}
+
+	      break;
+
+	    } /* Ends switch (reloc type) for m16c.  */
+	}
+      else /* machine == bfd_mach_m32c */
+	{
+	  /* M32CM / M32C */
+
+	  switch (ELF32_R_TYPE(irel->r_info))
+	    {
+
+	    case R_M32C_RL_JUMP:
+	      switch (insn[0])
+		{
+		case 0xbb: /* jmp.b */
+		  if (pcrel >= 2 && pcrel <= 9)
+		    {
+		      int p = pcrel - 2;
+		      /* Relax JMP.B -> JMP.S.  We need to get rid of
+			 the following reloc though. */
+		      insn[0] = 0x4a | ((p << 3) & 0x30) | (p & 1);
+		      new_type = R_M32C_NONE;
+		      irel->r_addend = 0x10;
+		      gap_size = 1;
+		      gap = insn + 1;
+		    }
+		  break;
+
+		case 0xce: /* jmp.w */
+		  if (pcrel <= 128 && pcrel >= -128)
+		    {
+		      /* Relax JMP.W -> JMP.B */
+		      insn[0] = 0xbb;
+		      insn[1] = 0;
+		      new_type = R_M32C_8_PCREL;
+		      gap_size = 1;
+		      gap = insn + 2;
+		    }
+		  break;
+
+		case 0xcc: /* jmp.a */
+		  if (pcrel <= 32768 && pcrel >= -32768)
+		    {
+		      /* Relax JMP.A -> JMP.W */
+		      insn[0] = 0xce;
+		      insn[1] = 0;
+		      insn[2] = 0;
+		      new_type = R_M32C_16_PCREL;
+		      gap_size = 1;
+		      gap = insn + 3;
+		    }
+		  break;
+
+		case 0xcd: /* jsr.a */
+		  if (pcrel <= 32768 && pcrel >= -32768)
+		    {
+		      /* Relax JSR.A -> JSR.W */
+		      insn[0] = 0xcf;
+		      insn[1] = 0;
+		      insn[2] = 0;
+		      new_type = R_M32C_16_PCREL;
+		      gap_size = 1;
+		      gap = insn + 3;
+		    }
+		  break;
+		}
+	      break;
+
+	    case R_M32C_RL_2ADDR:
+	      /* xSSS DDDx DDSS xxxx [src-disp] [dest-disp]*/
+
+	      einsn = insn;
+	      posn = 2;
+	      if (einsn[0] == 1)
+		{
+		  /* prefix; remove it as far as the RL reloc is concerned.  */
+		  einsn ++;
+		  posn ++;
+		}
+
+	      enctbl = m32c_addr_encodings;
+	      enc = ((einsn[0] & 0x70) >> 2) | ((einsn[1] & 0x30) >> 4);
+	      e = & enctbl[enc];
+
+	      if (srel->r_offset == irel->r_offset + posn
+		  && e->new_encoding != enc
+		  && symval <= e->max_disp)
+		{
+		  einsn[0] &= 0x8f;
+		  einsn[0] |= (e->new_encoding & 0x1c) << 2;
+		  einsn[1] &= 0xcf;
+		  einsn[1] |= (e->new_encoding & 0x03) << 4;
+		  gap_size = e->bytes - enctbl[e->new_encoding].bytes;
+		  gap = insn + posn + enctbl[e->new_encoding].bytes;
+		  new_type = bytes_to_reloc[enctbl[e->new_encoding].bytes];
+		  break;
+		}
+	      if (relax_relocs == 2)
+		  srel ++;
+	      posn += e->bytes;
+
+	      goto try_1addr_32;
+
+	    case R_M32C_RL_1ADDR:
+	      /* xxxx DDDx DDxx xxxx [disp] */
+
+	      einsn = insn;
+	      posn = 2;
+	      if (einsn[0] == 1)
+		{
+		  /* prefix; remove it as far as the RL reloc is concerned.  */
+		  einsn ++;
+		  posn ++;
+		}
+
+	      enctbl = m32c_addr_encodings;
+
+	    try_1addr_32:
+	      /* srel, posn, and enc must be set here.  */
+
+	      symval = OFFSET_FOR_RELOC (srel);
+	      enc = ((einsn[0] & 0x0e) << 1) |  ((einsn[1] & 0xc0) >> 6);
+	      e = & enctbl[enc];
+
+	      if (srel->r_offset == irel->r_offset + posn
+		  && e->new_encoding != enc
+		  && symval <= e->max_disp)
+		{
+		  einsn[0] &= 0xf1;
+		  einsn[0] |= (e->new_encoding & 0x1c) >> 1;
+		  einsn[1] &= 0x3f;
+		  einsn[1] |= (e->new_encoding & 0x03) << 6;
+		  gap_size = e->bytes - enctbl[e->new_encoding].bytes;
+		  gap = insn + posn + enctbl[e->new_encoding].bytes;
+		  new_type = bytes_to_reloc[enctbl[e->new_encoding].bytes];
+		  break;
+		}
+
+	      break;
+
+	    } /* Ends switch (reloc type) for m32c.  */
+	}
+
+      if (gap_size == 0)
+	continue;
+
+      *again = TRUE;
+
+      srel->r_info = ELF32_R_INFO (ELF32_R_SYM (srel->r_info), new_type);
+
+      /* Note that we've changed the relocs, section contents, etc.  */
+      elf_section_data (sec)->relocs = internal_relocs;
+      free_relocs = NULL;
+      
+      elf_section_data (sec)->this_hdr.contents = contents;
+      free_contents = NULL;
+
+      symtab_hdr->contents = (bfd_byte *) intsyms;
+      free_intsyms = NULL;
+
+      bytes_saved += gap_size;
+
+      if (! m32c_elf_relax_delete_bytes(abfd, sec, gap - contents, gap_size))
+	goto error_return;
+
+    } /* next relocation */
+
+  if (free_relocs != NULL)
+    {
+      free (free_relocs);
+      free_relocs = NULL;
+    }
+
+  if (free_contents != NULL)
+    {
+      if (! link_info->keep_memory)
+	free (free_contents);
+      /* Cache the section contents for elf_link_input_bfd.  */
+      else
+	elf_section_data (sec)->this_hdr.contents = contents;
+
+      free_contents = NULL;
+    }
+
+  if (shndx_buf != NULL)
+    {
+      shndx_hdr->contents = NULL;
+      free (shndx_buf);
+    }
+
+  if (free_intsyms != NULL)
+    {
+      if (! link_info->keep_memory)
+	free (free_intsyms);
+      /* Cache the symbols for elf_link_input_bfd.  */
+      else
+	{
+	symtab_hdr->contents = NULL /* (unsigned char *) intsyms*/;
+	}
+
+      free_intsyms = NULL;
+    }
+
+  return TRUE;
+
+ error_return:
+  if (free_relocs != NULL)
+    free (free_relocs);
+  if (free_contents != NULL)
+    free (free_contents);
+  if (shndx_buf != NULL)
+    {
+      shndx_hdr->contents = NULL;
+      free (shndx_buf);
+    }
+  if (free_intsyms != NULL)
+    free (free_intsyms);
+  return FALSE;
+}
+
+/* Delete some bytes from a section while relaxing.  */
+
+static bfd_boolean
+m32c_elf_relax_delete_bytes
+ (bfd *      abfd,
+  asection * sec,
+  bfd_vma    addr,
+  int        count)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Shdr *shndx_hdr;
+  int sec_shndx;
+  bfd_byte *contents;
+  Elf_Internal_Rela *irel;
+  Elf_Internal_Rela *irelend;
+  bfd_vma toaddr;
+  Elf_Internal_Sym *isym;
+  Elf_Internal_Sym *isymend;
+  Elf_Internal_Sym *intsyms;
+  Elf_External_Sym_Shndx *shndx_buf;
+  Elf_External_Sym_Shndx *shndx;
+  struct elf_link_hash_entry ** sym_hashes;
+  struct elf_link_hash_entry ** end_hashes;
+  unsigned int                  symcount;
+
+  contents   = elf_section_data (sec)->this_hdr.contents;
+
+  toaddr = sec->size;
+
+  irel = elf_section_data (sec)->relocs;
+  irelend = irel + sec->reloc_count;
+
+  /* Actually delete the bytes.  */
+  memmove (contents + addr, contents + addr + count, (size_t) (toaddr - addr - count));
+  sec->size -= count;
+
+  /* Adjust all the relocs.  */
+  for (irel = elf_section_data (sec)->relocs; irel < irelend; irel ++)
+    {
+      /* Get the new reloc address.  */
+      if (irel->r_offset > addr && irel->r_offset < toaddr)
+	irel->r_offset -= count;
+
+      if (ELF32_R_TYPE(irel->r_info) == R_M32C_RL_JUMP
+	  && irel->r_addend == 0x10 /* one byte insn, no relocs */
+	  && irel->r_offset + 1 < addr
+	  && irel->r_offset + 7 > addr)
+	{
+	  bfd_vma disp;
+	  unsigned char *insn = &contents[irel->r_offset];
+	  disp = *insn;
+	  /* This is a JMP.S, which we have to manually update. */
+	  if (elf32_m32c_machine (abfd) == bfd_mach_m16c)
+	    {
+	      if ((*insn & 0xf8) != 0x60)
+		continue;
+	      disp = (disp & 7);
+	    }
+	  else
+	    {
+	      if ((*insn & 0xce) != 0x4a)
+		continue;
+	      disp = ((disp & 0x30) >> 3) | (disp & 1);
+	    }
+	  if (irel->r_offset + disp + 2 >= addr+count)
+	    {
+	      disp -= count;
+	      if (elf32_m32c_machine (abfd) == bfd_mach_m16c)
+		{
+		  *insn = (*insn & 0xf8) | disp;
+		}
+	      else
+		{
+		  *insn = (*insn & 0xce) | ((disp & 6) << 3) | (disp & 1);
+		}
+	    }
+	}
+    }
+
+  /* Adjust the local symbols defined in this section.  */
+  symtab_hdr = & elf_tdata (abfd)->symtab_hdr;
+  intsyms = (Elf_Internal_Sym *) symtab_hdr->contents;
+  isym = intsyms;
+  isymend = isym + symtab_hdr->sh_info;
+
+  sec_shndx  = _bfd_elf_section_from_bfd_section (abfd, sec);
+  shndx_hdr  = & elf_tdata (abfd)->symtab_shndx_hdr;
+  shndx_buf  = (Elf_External_Sym_Shndx *) shndx_hdr->contents;
+  shndx = shndx_buf;
+
+  for (; isym < isymend; isym++, shndx = (shndx ? shndx + 1 : NULL))
+    {
+      /* If the symbol is in the range of memory we just moved, we
+	 have to adjust its value.  */
+      if ((int) isym->st_shndx == sec_shndx
+	  && isym->st_value > addr
+	  && isym->st_value < toaddr)
+	{
+	  isym->st_value -= count;
+	}
+      /* If the symbol *spans* the bytes we just deleted (i.e. it's
+	 *end* is in the moved bytes but it's *start* isn't), then we
+	 must adjust its size.  */
+      if ((int) isym->st_shndx == sec_shndx
+	    && isym->st_value < addr
+	  && isym->st_value + isym->st_size > addr
+	  && isym->st_value + isym->st_size < toaddr)
+	{
+	  isym->st_size -= count;
+	}
+    }
+
+  /* Now adjust the global symbols defined in this section.  */
+  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+	      - symtab_hdr->sh_info);
+  sym_hashes = elf_sym_hashes (abfd);
+  //  sym_hashes += symtab_hdr->sh_info;
+  end_hashes = sym_hashes + symcount;
+
+  for (; sym_hashes < end_hashes; sym_hashes ++)
+    {
+      struct elf_link_hash_entry * sym_hash = * sym_hashes;
+
+      if (sym_hash &&
+	  (sym_hash->root.type == bfd_link_hash_defined
+	   || sym_hash->root.type == bfd_link_hash_defweak)
+	  && sym_hash->root.u.def.section == sec)
+	{
+	  if (sym_hash->root.u.def.value > addr
+	      && sym_hash->root.u.def.value < toaddr)
+	    {
+	      sym_hash->root.u.def.value -= count;
+	    }
+	  if (sym_hash->root.u.def.value < addr
+	      && sym_hash->root.u.def.value + sym_hash->size > addr
+	      && sym_hash->root.u.def.value + sym_hash->size < toaddr)
+	    {
+	      sym_hash->size -= count;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* This is for versions of gcc prior to 4.3.  */
+static unsigned int
+_bfd_m32c_elf_eh_frame_address_size (bfd *abfd, asection *sec ATTRIBUTE_UNUSED)
+{
+  if ((elf_elfheader (abfd)->e_flags & EF_M32C_CPU_MASK) == EF_M32C_CPU_M16C)
+    return 2;
+  return 4;
+}
+
+
+
+#define ELF_ARCH		bfd_arch_m32c
+#define ELF_MACHINE_CODE	EM_M32C
+#define ELF_MACHINE_ALT1	EM_M32C_OLD
+#define ELF_MAXPAGESIZE		0x100
+
+#if 0
+#define TARGET_BIG_SYM		bfd_elf32_m32c_vec
+#define TARGET_BIG_NAME		"elf32-m32c"
+#else
+#define TARGET_LITTLE_SYM		bfd_elf32_m32c_vec
+#define TARGET_LITTLE_NAME		"elf32-m32c"
+#endif
+
+#define elf_info_to_howto_rel			NULL
+#define elf_info_to_howto			m32c_info_to_howto_rela
+#define elf_backend_object_p			m32c_elf_object_p
+#define elf_backend_relocate_section		m32c_elf_relocate_section
+#define elf_backend_check_relocs                m32c_elf_check_relocs
+#define elf_backend_object_p			m32c_elf_object_p
+#define elf_symbol_leading_char                 ('_')
+#define elf_backend_always_size_sections \
+  m32c_elf_always_size_sections
+#define elf_backend_finish_dynamic_sections \
+  m32c_elf_finish_dynamic_sections
+
+#define elf_backend_can_gc_sections		1
+#define elf_backend_eh_frame_address_size _bfd_m32c_elf_eh_frame_address_size
+
+#define bfd_elf32_bfd_reloc_type_lookup		m32c_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup	m32c_reloc_name_lookup
+#define bfd_elf32_bfd_relax_section		m32c_elf_relax_section
+#define bfd_elf32_bfd_set_private_flags		m32c_elf_set_private_flags
+#define bfd_elf32_bfd_merge_private_bfd_data	m32c_elf_merge_private_bfd_data
+#define bfd_elf32_bfd_print_private_bfd_data	m32c_elf_print_private_bfd_data
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-m32r.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-m32r.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-m32r.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-m32r.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4108 @@
+/* M32R-specific support for 32-bit ELF.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/m32r.h"
+
+#define NOP_INSN		0x7000
+#define MAKE_PARALLEL(insn)	((insn) | 0x8000)
+
+/* Use REL instead of RELA to save space.
+   This only saves space in libraries and object files, but perhaps
+   relocs will be put in ROM?  All in all though, REL relocs are a pain
+   to work with.  */
+/* #define USE_REL	1
+
+#ifndef USE_REL
+#define USE_REL	0
+#endif */
+/* Use RELA. But use REL to link old objects for backwords compatibility.  */
+
+/* Functions for the M32R ELF linker.  */
+
+/* The name of the dynamic interpreter.  This is put in the .interp
+   section.  */
+
+#define ELF_DYNAMIC_INTERPRETER "/usr/lib/libc.so.1"
+
+/* The nop opcode we use.  */
+
+#define M32R_NOP 0x7000f000
+
+#define PLT_EMPTY   0x10101010  /* RIE  -> RIE */
+
+/* The size in bytes of an entry in the procedure linkage table.  */
+
+#define PLT_ENTRY_SIZE 20
+#define PLT_HEADER_SIZE 20
+
+/* The first one entries in a procedure linkage table are reserved,
+   and the initial contents are unimportant (we zero them out).
+   Subsequent entries look like this. */
+
+#define PLT0_ENTRY_WORD0  0xd6c00000    /* seth r6, #high(.got+4)          */
+#define PLT0_ENTRY_WORD1  0x86e60000    /* or3  r6, r6, #low(.got)+4)      */
+#define PLT0_ENTRY_WORD2  0x24e626c6    /* ld   r4, @r6+    -> ld r6, @r6  */
+#define PLT0_ENTRY_WORD3  0x1fc6f000    /* jmp  r6          || pnop        */
+#define PLT0_ENTRY_WORD4  PLT_EMPTY     /* RIE             -> RIE          */
+
+#define PLT0_PIC_ENTRY_WORD0  0xa4cc0004 /* ld   r4, @(4,r12)              */
+#define PLT0_PIC_ENTRY_WORD1  0xa6cc0008 /* ld   r6, @(8,r12)              */
+#define PLT0_PIC_ENTRY_WORD2  0x1fc6f000 /* jmp  r6         || nop         */
+#define PLT0_PIC_ENTRY_WORD3  PLT_EMPTY  /* RIE             -> RIE         */
+#define PLT0_PIC_ENTRY_WORD4  PLT_EMPTY  /* RIE             -> RIE         */
+
+#define PLT_ENTRY_WORD0  0xe6000000 /* ld24 r6, .name_in_GOT                */
+#define PLT_ENTRY_WORD1  0x06acf000 /* add  r6, r12          || nop         */
+#define PLT_ENTRY_WORD0b 0xd6c00000 /* seth r6, #high(.name_in_GOT)         */
+#define PLT_ENTRY_WORD1b 0x86e60000 /* or3  r6, r6, #low(.name_in_GOT)      */
+#define PLT_ENTRY_WORD2  0x26c61fc6 /* ld  r6, @r6           -> jmp r6      */
+#define PLT_ENTRY_WORD3  0xe5000000 /* ld24 r5, $offset                     */
+#define PLT_ENTRY_WORD4  0xff000000 /* bra  .plt0.                          */
+
+
+/* Utility to actually perform an R_M32R_10_PCREL reloc.  */
+
+static bfd_reloc_status_type
+m32r_elf_do_10_pcrel_reloc (bfd *abfd,
+			    reloc_howto_type *howto,
+			    asection *input_section,
+			    bfd_byte *data,
+			    bfd_vma offset,
+			    asection *symbol_section ATTRIBUTE_UNUSED,
+			    bfd_vma symbol_value,
+			    bfd_vma addend)
+{
+  bfd_signed_vma relocation;
+  unsigned long x;
+  bfd_reloc_status_type status;
+
+  /* Sanity check the address (offset in section).  */
+  if (offset > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  relocation = symbol_value + addend;
+  /* Make it pc relative.  */
+  relocation -=	(input_section->output_section->vma
+		 + input_section->output_offset);
+  /* These jumps mask off the lower two bits of the current address
+     before doing pcrel calculations.  */
+  relocation -= (offset & -(bfd_vma) 4);
+
+  if (relocation < -0x200 || relocation > 0x1ff)
+    status = bfd_reloc_overflow;
+  else
+    status = bfd_reloc_ok;
+
+  x = bfd_get_16 (abfd, data + offset);
+  relocation >>= howto->rightshift;
+  relocation <<= howto->bitpos;
+  x = (x & ~howto->dst_mask) | (((x & howto->src_mask) + relocation) & howto->dst_mask);
+  bfd_put_16 (abfd, (bfd_vma) x, data + offset);
+
+  return status;
+}
+
+/* Handle the R_M32R_10_PCREL reloc.  */
+
+static bfd_reloc_status_type
+m32r_elf_10_pcrel_reloc (bfd * abfd,
+			 arelent * reloc_entry,
+			 asymbol * symbol,
+			 void * data,
+			 asection * input_section,
+			 bfd * output_bfd,
+			 char ** error_message ATTRIBUTE_UNUSED)
+{
+  /* This part is from bfd_elf_generic_reloc.  */
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (! reloc_entry->howto->partial_inplace
+	  || reloc_entry->addend == 0))
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  if (output_bfd != NULL)
+    /* FIXME: See bfd_perform_relocation.  Is this right?  */
+    return bfd_reloc_continue;
+
+  return m32r_elf_do_10_pcrel_reloc (abfd, reloc_entry->howto,
+				     input_section,
+				     data, reloc_entry->address,
+				     symbol->section,
+				     (symbol->value
+				      + symbol->section->output_section->vma
+				      + symbol->section->output_offset),
+				     reloc_entry->addend);
+}
+
+/* Do generic partial_inplace relocation.
+   This is a local replacement for bfd_elf_generic_reloc.  */
+
+static bfd_reloc_status_type
+m32r_elf_generic_reloc (bfd *input_bfd,
+			arelent *reloc_entry,
+			asymbol *symbol,
+			void * data,
+			asection *input_section,
+			bfd *output_bfd,
+			char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_reloc_status_type ret;
+  bfd_vma relocation;
+  bfd_byte *inplace_address;
+
+  /* This part is from bfd_elf_generic_reloc.
+     If we're relocating, and this an external symbol, we don't want
+     to change anything.  */
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && reloc_entry->addend == 0)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  /* Now do the reloc in the usual way.
+     ??? It would be nice to call bfd_elf_generic_reloc here,
+     but we have partial_inplace set.  bfd_elf_generic_reloc will
+     pass the handling back to bfd_install_relocation which will install
+     a section relative addend which is wrong.  */
+
+  /* Sanity check the address (offset in section).  */
+  if (reloc_entry->address > bfd_get_section_limit (input_bfd, input_section))
+    return bfd_reloc_outofrange;
+
+  ret = bfd_reloc_ok;
+  if (bfd_is_und_section (symbol->section)
+      && output_bfd == NULL)
+    ret = bfd_reloc_undefined;
+
+  if (bfd_is_com_section (symbol->section)
+      || output_bfd != NULL)
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  /* Only do this for a final link.  */
+  if (output_bfd == NULL)
+    {
+      relocation += symbol->section->output_section->vma;
+      relocation += symbol->section->output_offset;
+    }
+
+  relocation += reloc_entry->addend;
+  inplace_address = (bfd_byte *) data + reloc_entry->address;
+
+#define DOIT(x) 					\
+  x = ( (x & ~reloc_entry->howto->dst_mask) | 		\
+  (((x & reloc_entry->howto->src_mask) +  relocation) &	\
+  reloc_entry->howto->dst_mask))
+
+  switch (reloc_entry->howto->size)
+    {
+    case 1:
+      {
+	short x = bfd_get_16 (input_bfd, inplace_address);
+	DOIT (x);
+      	bfd_put_16 (input_bfd, (bfd_vma) x, inplace_address);
+      }
+      break;
+    case 2:
+      {
+	unsigned long x = bfd_get_32 (input_bfd, inplace_address);
+	DOIT (x);
+      	bfd_put_32 (input_bfd, (bfd_vma)x , inplace_address);
+      }
+      break;
+    default:
+      BFD_ASSERT (0);
+    }
+
+  if (output_bfd != NULL)
+    reloc_entry->address += input_section->output_offset;
+
+  return ret;
+}
+
+/* Handle the R_M32R_SDA16 reloc.
+   This reloc is used to compute the address of objects in the small data area
+   and to perform loads and stores from that area.
+   The lower 16 bits are sign extended and added to the register specified
+   in the instruction, which is assumed to point to _SDA_BASE_.  */
+
+static bfd_reloc_status_type
+m32r_elf_sda16_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+		      arelent *reloc_entry,
+		      asymbol *symbol,
+		      void * data ATTRIBUTE_UNUSED,
+		      asection *input_section,
+		      bfd *output_bfd,
+		      char **error_message ATTRIBUTE_UNUSED)
+{
+  /* This part is from bfd_elf_generic_reloc.  */
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (! reloc_entry->howto->partial_inplace
+	  || reloc_entry->addend == 0))
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  if (output_bfd != NULL)
+    /* FIXME: See bfd_perform_relocation.  Is this right?  */
+    return bfd_reloc_continue;
+
+  /* FIXME: not sure what to do here yet.  But then again, the linker
+     may never call us.  */
+  abort ();
+}
+
+
+/* Handle the R_M32R_HI16_[SU]LO relocs.
+   HI16_SLO is for the add3 and load/store with displacement instructions.
+   HI16_ULO is for the or3 instruction.
+   For R_M32R_HI16_SLO, the lower 16 bits are sign extended when added to
+   the high 16 bytes so if the lower 16 bits are negative (bit 15 == 1) then
+   we must add one to the high 16 bytes (which will get subtracted off when
+   the low 16 bits are added).
+   These relocs have to be done in combination with an R_M32R_LO16 reloc
+   because there is a carry from the LO16 to the HI16.  Here we just save
+   the information we need; we do the actual relocation when we see the LO16.
+   This code is copied from the elf32-mips.c.  We also support an arbitrary
+   number of HI16 relocs to be associated with a single LO16 reloc.  The
+   assembler sorts the relocs to ensure each HI16 immediately precedes its
+   LO16.  However if there are multiple copies, the assembler may not find
+   the real LO16 so it picks the first one it finds.  */
+
+struct m32r_hi16
+{
+  struct m32r_hi16 *next;
+  bfd_byte *addr;
+  bfd_vma addend;
+};
+
+/* FIXME: This should not be a static variable.  */
+
+static struct m32r_hi16 *m32r_hi16_list;
+
+static bfd_reloc_status_type
+m32r_elf_hi16_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+		     arelent *reloc_entry,
+		     asymbol *symbol,
+		     void * data,
+		     asection *input_section,
+		     bfd *output_bfd,
+		     char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_reloc_status_type ret;
+  bfd_vma relocation;
+  struct m32r_hi16 *n;
+
+  /* This part is from bfd_elf_generic_reloc.
+     If we're relocating, and this an external symbol, we don't want
+     to change anything.  */
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && reloc_entry->addend == 0)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  /* Sanity check the address (offset in section).  */
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  ret = bfd_reloc_ok;
+  if (bfd_is_und_section (symbol->section)
+      && output_bfd == NULL)
+    ret = bfd_reloc_undefined;
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  relocation += reloc_entry->addend;
+
+  /* Save the information, and let LO16 do the actual relocation.  */
+  n = bfd_malloc ((bfd_size_type) sizeof *n);
+  if (n == NULL)
+    return bfd_reloc_outofrange;
+  n->addr = (bfd_byte *) data + reloc_entry->address;
+  n->addend = relocation;
+  n->next = m32r_hi16_list;
+  m32r_hi16_list = n;
+
+  if (output_bfd != NULL)
+    reloc_entry->address += input_section->output_offset;
+
+  return ret;
+}
+
+/* Handle an M32R ELF HI16 reloc.  */
+
+static void
+m32r_elf_relocate_hi16 (bfd *input_bfd,
+			int type,
+			Elf_Internal_Rela *relhi,
+			Elf_Internal_Rela *rello,
+			bfd_byte *contents,
+			bfd_vma addend)
+{
+  unsigned long insn;
+  bfd_vma addlo;
+
+  insn = bfd_get_32 (input_bfd, contents + relhi->r_offset);
+
+  addlo = bfd_get_32 (input_bfd, contents + rello->r_offset);
+  if (type == R_M32R_HI16_SLO)
+    addlo = ((addlo & 0xffff) ^ 0x8000) - 0x8000;
+  else
+    addlo &= 0xffff;
+
+  addend += ((insn & 0xffff) << 16) + addlo;
+
+  /* Reaccount for sign extension of low part.  */
+  if (type == R_M32R_HI16_SLO
+      && (addend & 0x8000) != 0)
+    addend += 0x10000;
+
+  bfd_put_32 (input_bfd,
+	      (insn & 0xffff0000) | ((addend >> 16) & 0xffff),
+	      contents + relhi->r_offset);
+}
+
+/* Do an R_M32R_LO16 relocation.  This is a straightforward 16 bit
+   inplace relocation; this function exists in order to do the
+   R_M32R_HI16_[SU]LO relocation described above.  */
+
+static bfd_reloc_status_type
+m32r_elf_lo16_reloc (bfd *input_bfd,
+		     arelent *reloc_entry,
+		     asymbol *symbol,
+		     void * data,
+		     asection *input_section,
+		     bfd *output_bfd,
+		     char **error_message)
+{
+  /* This part is from bfd_elf_generic_reloc.
+     If we're relocating, and this an external symbol, we don't want
+     to change anything.  */
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && reloc_entry->addend == 0)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  if (m32r_hi16_list != NULL)
+    {
+      struct m32r_hi16 *l;
+
+      l = m32r_hi16_list;
+      while (l != NULL)
+	{
+	  unsigned long insn;
+	  unsigned long val;
+	  unsigned long vallo;
+	  struct m32r_hi16 *next;
+
+	  /* Do the HI16 relocation.  Note that we actually don't need
+	     to know anything about the LO16 itself, except where to
+	     find the low 16 bits of the addend needed by the LO16.  */
+	  insn = bfd_get_32 (input_bfd, l->addr);
+	  vallo = ((bfd_get_32 (input_bfd, (bfd_byte *) data + reloc_entry->address)
+		   & 0xffff) ^ 0x8000) - 0x8000;
+	  val = ((insn & 0xffff) << 16) + vallo;
+	  val += l->addend;
+
+	  /* Reaccount for sign extension of low part.  */
+	  if ((val & 0x8000) != 0)
+	    val += 0x10000;
+
+	  insn = (insn &~ (bfd_vma) 0xffff) | ((val >> 16) & 0xffff);
+	  bfd_put_32 (input_bfd, (bfd_vma) insn, l->addr);
+
+	  next = l->next;
+	  free (l);
+	  l = next;
+	}
+
+      m32r_hi16_list = NULL;
+    }
+
+  /* Now do the LO16 reloc in the usual way.
+     ??? It would be nice to call bfd_elf_generic_reloc here,
+     but we have partial_inplace set.  bfd_elf_generic_reloc will
+     pass the handling back to bfd_install_relocation which will install
+     a section relative addend which is wrong.  */
+  return m32r_elf_generic_reloc (input_bfd, reloc_entry, symbol, data,
+				input_section, output_bfd, error_message);
+}
+
+
+static reloc_howto_type m32r_elf_howto_table[] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_M32R_NONE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32R_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit absolute relocation.  */
+  HOWTO (R_M32R_16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 m32r_elf_generic_reloc,/* special_function */
+	 "R_M32R_16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32 bit absolute relocation.  */
+  HOWTO (R_M32R_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 m32r_elf_generic_reloc,/* special_function */
+	 "R_M32R_32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 24 bit address.  */
+  HOWTO (R_M32R_24,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 m32r_elf_generic_reloc,/* special_function */
+	 "R_M32R_24",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffff,		/* src_mask */
+	 0xffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An PC Relative 10-bit relocation, shifted by 2.
+     This reloc is complicated because relocations are relative to pc & -4.
+     i.e. branches in the right insn slot use the address of the left insn
+     slot for pc.  */
+  /* ??? It's not clear whether this should have partial_inplace set or not.
+     Branch relaxing in the assembler can store the addend in the insn,
+     and if bfd_install_relocation gets called the addend may get added
+     again.  */
+  HOWTO (R_M32R_10_PCREL,	/* type */
+	 2,	                /* rightshift */
+	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 10,	                /* bitsize */
+	 TRUE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 m32r_elf_10_pcrel_reloc, /* special_function */
+	 "R_M32R_10_PCREL",	/* name */
+	 FALSE,	                /* partial_inplace */
+	 0xff,		        /* src_mask */
+	 0xff,   		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A relative 18 bit relocation, right shifted by 2.  */
+  HOWTO (R_M32R_18_PCREL,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32R_18_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A relative 26 bit relocation, right shifted by 2.  */
+  /* ??? It's not clear whether this should have partial_inplace set or not.
+     Branch relaxing in the assembler can store the addend in the insn,
+     and if bfd_install_relocation gets called the addend may get added
+     again.  */
+  HOWTO (R_M32R_26_PCREL,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32R_26_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffff,		/* src_mask */
+	 0xffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* High 16 bits of address when lower 16 is or'd in.  */
+  HOWTO (R_M32R_HI16_ULO,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 m32r_elf_hi16_reloc,	/* special_function */
+	 "R_M32R_HI16_ULO",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of address when lower 16 is added in.  */
+  HOWTO (R_M32R_HI16_SLO,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 m32r_elf_hi16_reloc,	/* special_function */
+	 "R_M32R_HI16_SLO",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Lower 16 bits of address.  */
+  HOWTO (R_M32R_LO16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 m32r_elf_lo16_reloc,	/* special_function */
+	 "R_M32R_LO16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Small data area 16 bits offset.  */
+  HOWTO (R_M32R_SDA16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 m32r_elf_sda16_reloc,	/* special_function */
+	 "R_M32R_SDA16",	/* name */
+	 TRUE,			/* partial_inplace */  /* FIXME: correct? */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_M32R_GNU_VTINHERIT, /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         NULL,                  /* special_function */
+         "R_M32R_GNU_VTINHERIT", /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage.  */
+  HOWTO (R_M32R_GNU_VTENTRY,     /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
+         "R_M32R_GNU_VTENTRY",   /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  EMPTY_HOWTO (13),
+  EMPTY_HOWTO (14),
+  EMPTY_HOWTO (15),
+  EMPTY_HOWTO (16),
+  EMPTY_HOWTO (17),
+  EMPTY_HOWTO (18),
+  EMPTY_HOWTO (19),
+  EMPTY_HOWTO (20),
+  EMPTY_HOWTO (21),
+  EMPTY_HOWTO (22),
+  EMPTY_HOWTO (23),
+  EMPTY_HOWTO (24),
+  EMPTY_HOWTO (25),
+  EMPTY_HOWTO (26),
+  EMPTY_HOWTO (27),
+  EMPTY_HOWTO (28),
+  EMPTY_HOWTO (29),
+  EMPTY_HOWTO (30),
+  EMPTY_HOWTO (31),
+  EMPTY_HOWTO (32),
+
+  /* A 16 bit absolute relocation.  */
+  HOWTO (R_M32R_16_RELA,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32R_16_RELA",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32 bit absolute relocation.  */
+  HOWTO (R_M32R_32_RELA,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,/* special_function */
+	 "R_M32R_32_RELA",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 24 bit address.  */
+  HOWTO (R_M32R_24_RELA,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,/* special_function */
+	 "R_M32R_24_RELA",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffff,		/* src_mask */
+	 0xffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_M32R_10_PCREL_RELA,	/* type */
+	 2,	                /* rightshift */
+	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 10,	                /* bitsize */
+	 TRUE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 m32r_elf_10_pcrel_reloc, /* special_function */
+	 "R_M32R_10_PCREL_RELA",/* name */
+	 FALSE,	                /* partial_inplace */
+	 0xff,		        /* src_mask */
+	 0xff,   		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A relative 18 bit relocation, right shifted by 2.  */
+  HOWTO (R_M32R_18_PCREL_RELA,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32R_18_PCREL_RELA",/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A relative 26 bit relocation, right shifted by 2.  */
+  HOWTO (R_M32R_26_PCREL_RELA,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32R_26_PCREL_RELA",/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffff,		/* src_mask */
+	 0xffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* High 16 bits of address when lower 16 is or'd in.  */
+  HOWTO (R_M32R_HI16_ULO_RELA,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32R_HI16_ULO_RELA",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of address when lower 16 is added in.  */
+  HOWTO (R_M32R_HI16_SLO_RELA,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32R_HI16_SLO_RELA",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Lower 16 bits of address.  */
+  HOWTO (R_M32R_LO16_RELA,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32R_LO16_RELA",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Small data area 16 bits offset.  */
+  HOWTO (R_M32R_SDA16_RELA,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32R_SDA16_RELA",	/* name */
+	 TRUE,			/* partial_inplace */  /* FIXME: correct? */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_M32R_RELA_GNU_VTINHERIT, /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         NULL,                  /* special_function */
+         "R_M32R_RELA_GNU_VTINHERIT", /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage.  */
+  HOWTO (R_M32R_RELA_GNU_VTENTRY,     /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
+         "R_M32R_RELA_GNU_VTENTRY",   /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* A 32 bit PC relative relocation.  */
+  HOWTO (R_M32R_REL32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,/* special_function */
+	 "R_M32R_REL32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  EMPTY_HOWTO (46),
+  EMPTY_HOWTO (47),
+
+  /* Like R_M32R_24, but referring to the GOT table entry for
+     the symbol.  */
+  HOWTO (R_M32R_GOT24,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_M32R_GOT24",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffff,		/* src_mask */
+	 0xffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_M32R_PCREL, but referring to the procedure linkage table
+     entry for the symbol.  */
+  HOWTO (R_M32R_26_PLTREL,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32R_26_PLTREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffff,		/* src_mask */
+	 0xffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* This is used only by the dynamic linker.  The symbol should exist
+     both in the object being run and in some shared library.  The
+     dynamic linker copies the data addressed by the symbol from the
+     shared library into the object, because the object being
+     run has to have the data at some particular address.  */
+  HOWTO (R_M32R_COPY,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_M32R_COPY",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_M32R_24, but used when setting global offset table
+     entries.  */
+  HOWTO (R_M32R_GLOB_DAT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_M32R_GLOB_DAT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Marks a procedure linkage table entry for a symbol.  */
+  HOWTO (R_M32R_JMP_SLOT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_M32R_JMP_SLOT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used only by the dynamic linker.  When the object is run, this
+     longword is set to the load address of the object, plus the
+     addend.  */
+  HOWTO (R_M32R_RELATIVE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_M32R_RELATIVE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_M32R_GOTOFF,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_M32R_GOTOFF",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffff,		/* src_mask */
+	 0xffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An PC Relative 24-bit relocation used when setting PIC offset
+     table register. */
+  HOWTO (R_M32R_GOTPC24,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_M32R_GOTPC24",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffff,		/* src_mask */
+	 0xffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Like R_M32R_HI16_ULO, but referring to the GOT table entry for
+     the symbol.  */
+  HOWTO (R_M32R_GOT16_HI_ULO,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32R_GOT16_HI_ULO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_M32R_HI16_SLO, but referring to the GOT table entry for
+     the symbol.  */
+  HOWTO (R_M32R_GOT16_HI_SLO,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32R_GOT16_HI_SLO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_M32R_LO16, but referring to the GOT table entry for
+     the symbol.  */
+  HOWTO (R_M32R_GOT16_LO,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32R_GOT16_LO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An PC Relative relocation used when setting PIC offset table register.
+     Like R_M32R_HI16_ULO, but referring to the GOT table entry for
+     the symbol.  */
+  HOWTO (R_M32R_GOTPC_HI_ULO,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32R_GOTPC_HI_ULO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* An PC Relative relocation used when setting PIC offset table register.
+     Like R_M32R_HI16_SLO, but referring to the GOT table entry for
+     the symbol.  */
+  HOWTO (R_M32R_GOTPC_HI_SLO,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32R_GOTPC_HI_SLO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* An PC Relative relocation used when setting PIC offset table register.
+     Like R_M32R_LO16, but referring to the GOT table entry for
+     the symbol.  */
+  HOWTO (R_M32R_GOTPC_LO,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32R_GOTPC_LO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_M32R_GOTOFF_HI_ULO,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32R_GOTOFF_HI_ULO",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_M32R_GOTOFF_HI_SLO,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32R_GOTOFF_HI_SLO",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_M32R_GOTOFF_LO,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M32R_GOTOFF_LO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+/* Map BFD reloc types to M32R ELF reloc types.  */
+
+struct m32r_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned char elf_reloc_val;
+};
+
+#ifdef USE_M32R_OLD_RELOC
+static const struct m32r_reloc_map m32r_reloc_map_old[] =
+{
+  { BFD_RELOC_NONE, R_M32R_NONE },
+  { BFD_RELOC_16, R_M32R_16 },
+  { BFD_RELOC_32, R_M32R_32 },
+  { BFD_RELOC_M32R_24, R_M32R_24 },
+  { BFD_RELOC_M32R_10_PCREL, R_M32R_10_PCREL },
+  { BFD_RELOC_M32R_18_PCREL, R_M32R_18_PCREL },
+  { BFD_RELOC_M32R_26_PCREL, R_M32R_26_PCREL },
+  { BFD_RELOC_M32R_HI16_ULO, R_M32R_HI16_ULO },
+  { BFD_RELOC_M32R_HI16_SLO, R_M32R_HI16_SLO },
+  { BFD_RELOC_M32R_LO16, R_M32R_LO16 },
+  { BFD_RELOC_M32R_SDA16, R_M32R_SDA16 },
+  { BFD_RELOC_VTABLE_INHERIT, R_M32R_GNU_VTINHERIT },
+  { BFD_RELOC_VTABLE_ENTRY, R_M32R_GNU_VTENTRY },
+};
+#else
+static const struct m32r_reloc_map m32r_reloc_map[] =
+{
+  { BFD_RELOC_NONE, R_M32R_NONE },
+  { BFD_RELOC_16, R_M32R_16_RELA },
+  { BFD_RELOC_32, R_M32R_32_RELA },
+  { BFD_RELOC_M32R_24, R_M32R_24_RELA },
+  { BFD_RELOC_M32R_10_PCREL, R_M32R_10_PCREL_RELA },
+  { BFD_RELOC_M32R_18_PCREL, R_M32R_18_PCREL_RELA },
+  { BFD_RELOC_M32R_26_PCREL, R_M32R_26_PCREL_RELA },
+  { BFD_RELOC_M32R_HI16_ULO, R_M32R_HI16_ULO_RELA },
+  { BFD_RELOC_M32R_HI16_SLO, R_M32R_HI16_SLO_RELA },
+  { BFD_RELOC_M32R_LO16, R_M32R_LO16_RELA },
+  { BFD_RELOC_M32R_SDA16, R_M32R_SDA16_RELA },
+  { BFD_RELOC_VTABLE_INHERIT, R_M32R_RELA_GNU_VTINHERIT },
+  { BFD_RELOC_VTABLE_ENTRY, R_M32R_RELA_GNU_VTENTRY },
+  { BFD_RELOC_32_PCREL, R_M32R_REL32 },
+
+  { BFD_RELOC_M32R_GOT24, R_M32R_GOT24 },
+  { BFD_RELOC_M32R_26_PLTREL, R_M32R_26_PLTREL },
+  { BFD_RELOC_M32R_COPY, R_M32R_COPY },
+  { BFD_RELOC_M32R_GLOB_DAT, R_M32R_GLOB_DAT },
+  { BFD_RELOC_M32R_JMP_SLOT, R_M32R_JMP_SLOT },
+  { BFD_RELOC_M32R_RELATIVE, R_M32R_RELATIVE },
+  { BFD_RELOC_M32R_GOTOFF, R_M32R_GOTOFF },
+  { BFD_RELOC_M32R_GOTPC24, R_M32R_GOTPC24 },
+  { BFD_RELOC_M32R_GOT16_HI_ULO, R_M32R_GOT16_HI_ULO },
+  { BFD_RELOC_M32R_GOT16_HI_SLO, R_M32R_GOT16_HI_SLO },
+  { BFD_RELOC_M32R_GOT16_LO, R_M32R_GOT16_LO },
+  { BFD_RELOC_M32R_GOTPC_HI_ULO, R_M32R_GOTPC_HI_ULO },
+  { BFD_RELOC_M32R_GOTPC_HI_SLO, R_M32R_GOTPC_HI_SLO },
+  { BFD_RELOC_M32R_GOTPC_LO, R_M32R_GOTPC_LO },
+  { BFD_RELOC_M32R_GOTOFF_HI_ULO, R_M32R_GOTOFF_HI_ULO },
+  { BFD_RELOC_M32R_GOTOFF_HI_SLO, R_M32R_GOTOFF_HI_SLO },
+  { BFD_RELOC_M32R_GOTOFF_LO, R_M32R_GOTOFF_LO },
+};
+#endif
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+#ifdef USE_M32R_OLD_RELOC
+  for (i = 0;
+       i < sizeof (m32r_reloc_map_old) / sizeof (struct m32r_reloc_map);
+       i++)
+    if (m32r_reloc_map_old[i].bfd_reloc_val == code)
+      return &m32r_elf_howto_table[m32r_reloc_map_old[i].elf_reloc_val];
+
+#else /* ! USE_M32R_OLD_RELOC */
+
+  for (i = 0;
+       i < sizeof (m32r_reloc_map) / sizeof (struct m32r_reloc_map);
+       i++)
+    if (m32r_reloc_map[i].bfd_reloc_val == code)
+      return &m32r_elf_howto_table[m32r_reloc_map[i].elf_reloc_val];
+#endif
+
+  return NULL;
+}
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (m32r_elf_howto_table) / sizeof (m32r_elf_howto_table[0]);
+       i++)
+    if (m32r_elf_howto_table[i].name != NULL
+	&& strcasecmp (m32r_elf_howto_table[i].name, r_name) == 0)
+      return &m32r_elf_howto_table[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for an M32R ELF reloc.  */
+
+static void
+m32r_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+			arelent *cache_ptr,
+			Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (ELF32_R_TYPE(dst->r_info) <= (unsigned int) R_M32R_GNU_VTENTRY);
+  cache_ptr->howto = &m32r_elf_howto_table[r_type];
+}
+
+static void
+m32r_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+		    arelent *cache_ptr,
+		    Elf_Internal_Rela *dst)
+{
+  BFD_ASSERT ((ELF32_R_TYPE(dst->r_info) == (unsigned int) R_M32R_NONE)
+              || ((ELF32_R_TYPE(dst->r_info) > (unsigned int) R_M32R_GNU_VTENTRY)
+                  && (ELF32_R_TYPE(dst->r_info) < (unsigned int) R_M32R_max)));
+  cache_ptr->howto = &m32r_elf_howto_table[ELF32_R_TYPE(dst->r_info)];
+}
+
+
+/* Given a BFD section, try to locate the corresponding ELF section
+   index.  */
+
+static bfd_boolean
+_bfd_m32r_elf_section_from_bfd_section (bfd *abfd ATTRIBUTE_UNUSED,
+					asection *sec,
+					int *retval)
+{
+  if (strcmp (bfd_get_section_name (abfd, sec), ".scommon") == 0)
+    {
+      *retval = SHN_M32R_SCOMMON;
+      return TRUE;
+    }
+  return FALSE;
+}
+
+/* M32R ELF uses two common sections.  One is the usual one, and the other
+   is for small objects.  All the small objects are kept together, and then
+   referenced via one register, which yields faster assembler code.  It is
+   up to the compiler to emit an instruction to load the register with
+   _SDA_BASE.  This is what we use for the small common section.  This
+   approach is copied from elf32-mips.c.  */
+static asection m32r_elf_scom_section;
+static asymbol m32r_elf_scom_symbol;
+static asymbol *m32r_elf_scom_symbol_ptr;
+
+/* Handle the special M32R section numbers that a symbol may use.  */
+
+static void
+_bfd_m32r_elf_symbol_processing (bfd *abfd ATTRIBUTE_UNUSED, asymbol *asym)
+{
+  elf_symbol_type *elfsym = (elf_symbol_type *) asym;
+
+  switch (elfsym->internal_elf_sym.st_shndx)
+    {
+    case SHN_M32R_SCOMMON:
+      if (m32r_elf_scom_section.name == NULL)
+	{
+	  /* Initialize the small common section.  */
+	  m32r_elf_scom_section.name = ".scommon";
+	  m32r_elf_scom_section.flags = SEC_IS_COMMON;
+	  m32r_elf_scom_section.output_section = &m32r_elf_scom_section;
+	  m32r_elf_scom_section.symbol = &m32r_elf_scom_symbol;
+	  m32r_elf_scom_section.symbol_ptr_ptr = &m32r_elf_scom_symbol_ptr;
+	  m32r_elf_scom_symbol.name = ".scommon";
+	  m32r_elf_scom_symbol.flags = BSF_SECTION_SYM;
+	  m32r_elf_scom_symbol.section = &m32r_elf_scom_section;
+	  m32r_elf_scom_symbol_ptr = &m32r_elf_scom_symbol;
+	}
+      asym->section = &m32r_elf_scom_section;
+      asym->value = elfsym->internal_elf_sym.st_size;
+      break;
+    }
+}
+
+/* Hook called by the linker routine which adds symbols from an object
+   file.  We must handle the special M32R section numbers here.
+   We also keep watching for whether we need to create the sdata special
+   linker sections.  */
+
+static bfd_boolean
+m32r_elf_add_symbol_hook (bfd *abfd,
+			  struct bfd_link_info *info,
+			  Elf_Internal_Sym *sym,
+			  const char **namep,
+			  flagword *flagsp ATTRIBUTE_UNUSED,
+			  asection **secp,
+			  bfd_vma *valp)
+{
+  if (! info->relocatable
+      && (*namep)[0] == '_' && (*namep)[1] == 'S'
+      && strcmp (*namep, "_SDA_BASE_") == 0
+      && is_elf_hash_table (info->hash))
+    {
+      /* This is simpler than using _bfd_elf_create_linker_section
+	 (our needs are simpler than ppc's needs).  Also
+	 _bfd_elf_create_linker_section currently has a bug where if a .sdata
+	 section already exists a new one is created that follows it which
+	 screws of _SDA_BASE_ address calcs because output_offset != 0.  */
+      struct elf_link_hash_entry *h;
+      struct bfd_link_hash_entry *bh;
+      asection *s = bfd_get_section_by_name (abfd, ".sdata");
+
+      /* The following code was cobbled from elf32-ppc.c and elflink.c.  */
+      if (s == NULL)
+	{
+	  flagword flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
+			    | SEC_IN_MEMORY | SEC_LINKER_CREATED);
+
+	  s = bfd_make_section_anyway_with_flags (abfd, ".sdata",
+						  flags);
+	  if (s == NULL)
+	    return FALSE;
+	  bfd_set_section_alignment (abfd, s, 2);
+	}
+
+      bh = bfd_link_hash_lookup (info->hash, "_SDA_BASE_",
+				 FALSE, FALSE, FALSE);
+
+      if ((bh == NULL || bh->type == bfd_link_hash_undefined)
+	  && !(_bfd_generic_link_add_one_symbol (info,
+						 abfd,
+						 "_SDA_BASE_",
+						 BSF_GLOBAL,
+						 s,
+						 (bfd_vma) 32768,
+						 NULL,
+						 FALSE,
+						 get_elf_backend_data (abfd)->collect,
+						 &bh)))
+	return FALSE;
+      h = (struct elf_link_hash_entry *) bh;
+      h->type = STT_OBJECT;
+    }
+
+  switch (sym->st_shndx)
+    {
+    case SHN_M32R_SCOMMON:
+      *secp = bfd_make_section_old_way (abfd, ".scommon");
+      (*secp)->flags |= SEC_IS_COMMON;
+      *valp = sym->st_size;
+      break;
+    }
+
+  return TRUE;
+}
+
+/* We have to figure out the SDA_BASE value, so that we can adjust the
+   symbol value correctly.  We look up the symbol _SDA_BASE_ in the output
+   BFD.  If we can't find it, we're stuck.  We cache it in the ELF
+   target data.  We don't need to adjust the symbol value for an
+   external symbol if we are producing relocatable output.  */
+
+static bfd_reloc_status_type
+m32r_elf_final_sda_base (bfd *output_bfd,
+			 struct bfd_link_info *info,
+			 const char **error_message,
+			 bfd_vma *psb)
+{
+  if (elf_gp (output_bfd) == 0)
+    {
+      struct bfd_link_hash_entry *h;
+
+      h = bfd_link_hash_lookup (info->hash, "_SDA_BASE_", FALSE, FALSE, TRUE);
+      if (h != NULL && h->type == bfd_link_hash_defined)
+	elf_gp (output_bfd) = (h->u.def.value
+			       + h->u.def.section->output_section->vma
+			       + h->u.def.section->output_offset);
+      else
+	{
+	  /* Only get the error once.  */
+	  *psb = elf_gp (output_bfd) = 4;
+	  *error_message =
+	    (const char *) _("SDA relocation when _SDA_BASE_ not defined");
+	  return bfd_reloc_dangerous;
+	}
+    }
+  *psb = elf_gp (output_bfd);
+  return bfd_reloc_ok;
+}
+
+/* Return size of a PLT entry.  */
+#define elf_m32r_sizeof_plt(info) PLT_ENTRY_SIZE
+
+/* The m32r linker needs to keep track of the number of relocs that it
+   decides to copy in check_relocs for each symbol.  This is so that
+   it can discard PC relative relocs if it doesn't need them when
+   linking with -Bsymbolic.  We store the information in a field
+   extending the regular ELF linker hash table.  */
+
+/* This structure keeps track of the number of PC relative relocs we
+   have copied for a given symbol.  */
+
+struct elf_m32r_pcrel_relocs_copied
+{
+  /* Next section.  */
+  struct elf_m32r_pcrel_relocs_copied *next;
+  /* A section in dynobj.  */
+  asection *section;
+  /* Number of relocs copied in this section.  */
+  bfd_size_type count;
+};
+
+/* The sh linker needs to keep track of the number of relocs that it
+   decides to copy as dynamic relocs in check_relocs for each symbol.
+   This is so that it can later discard them if they are found to be
+   unnecessary.  We store the information in a field extending the
+   regular ELF linker hash table.  */
+
+struct elf_m32r_dyn_relocs
+{
+  struct elf_m32r_dyn_relocs *next;
+
+  /* The input section of the reloc.  */
+  asection *sec;
+
+  /* Total number of relocs copied for the input section.  */
+  bfd_size_type count;
+
+  /* Number of pc-relative relocs copied for the input section.  */
+  bfd_size_type pc_count;
+};
+
+
+/* m32r ELF linker hash entry.  */
+
+struct elf_m32r_link_hash_entry
+{
+  struct elf_link_hash_entry root;
+
+  /* Track dynamic relocs copied for this symbol.  */
+  struct elf_m32r_dyn_relocs *dyn_relocs;
+};
+
+/* m32r ELF linker hash table.  */
+
+struct elf_m32r_link_hash_table
+{
+  struct elf_link_hash_table root;
+
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *sgot;
+  asection *sgotplt;
+  asection *srelgot;
+  asection *splt;
+  asection *srelplt;
+  asection *sdynbss;
+  asection *srelbss;
+
+  /* Small local sym cache.  */
+  struct sym_cache sym_cache;
+};
+
+/* Traverse an m32r ELF linker hash table.  */
+
+#define m32r_elf_link_hash_traverse(table, func, info)			\
+  (elf_link_hash_traverse						\
+   (&(table)->root,							\
+    (bfd_boolean (*) (struct elf_link_hash_entry *, void *)) (func),	\
+    (info)))
+
+/* Get the m32r ELF linker hash table from a link_info structure.  */
+
+#define m32r_elf_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == M32R_ELF_DATA ? ((struct elf_m32r_link_hash_table *) ((p)->hash)) : NULL)
+
+/* Create an entry in an m32r ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+m32r_elf_link_hash_newfunc (struct bfd_hash_entry *entry,
+			    struct bfd_hash_table *table,
+			    const char *string)
+{
+  struct elf_m32r_link_hash_entry *ret =
+    (struct elf_m32r_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = bfd_hash_allocate (table,
+			     sizeof (struct elf_m32r_link_hash_entry));
+  if (ret == NULL)
+    return NULL;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct elf_m32r_link_hash_entry *)
+         _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
+                                     table, string));
+  if (ret != NULL)
+    {
+      struct elf_m32r_link_hash_entry *eh;
+
+      eh = (struct elf_m32r_link_hash_entry *) ret;
+      eh->dyn_relocs = NULL;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Create an m32r ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+m32r_elf_link_hash_table_create (bfd *abfd)
+{
+  struct elf_m32r_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct elf_m32r_link_hash_table);
+
+  ret = bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->root, abfd,
+				      m32r_elf_link_hash_newfunc,
+				      sizeof (struct elf_m32r_link_hash_entry),
+				      M32R_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  ret->sgot = NULL;
+  ret->sgotplt = NULL;
+  ret->srelgot = NULL;
+  ret->splt = NULL;
+  ret->srelplt = NULL;
+  ret->sdynbss = NULL;
+  ret->srelbss = NULL;
+  ret->sym_cache.abfd = NULL;
+
+  return &ret->root.root;
+}
+
+/* Create .got, .gotplt, and .rela.got sections in DYNOBJ, and set up
+   shortcuts to them in our hash table.  */
+
+static bfd_boolean
+create_got_section (bfd *dynobj, struct bfd_link_info *info)
+{
+  struct elf_m32r_link_hash_table *htab;
+
+  if (! _bfd_elf_create_got_section (dynobj, info))
+    return FALSE;
+
+  htab = m32r_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  htab->sgot = bfd_get_section_by_name (dynobj, ".got");
+  htab->sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");
+  htab->srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+  if (! htab->sgot || ! htab->sgotplt || ! htab->srelgot)
+    abort ();
+
+  return TRUE;
+}
+
+/* Create dynamic sections when linking against a dynamic object.  */
+
+static bfd_boolean
+m32r_elf_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  struct elf_m32r_link_hash_table *htab;
+  flagword flags, pltflags;
+  asection *s;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  int ptralign = 2; /* 32bit */
+
+  htab = m32r_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* We need to create .plt, .rel[a].plt, .got, .got.plt, .dynbss, and
+     .rel[a].bss sections.  */
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+           | SEC_LINKER_CREATED);
+
+  pltflags = flags;
+  pltflags |= SEC_CODE;
+  if (bed->plt_not_loaded)
+    pltflags &= ~ (SEC_LOAD | SEC_HAS_CONTENTS);
+  if (bed->plt_readonly)
+    pltflags |= SEC_READONLY;
+
+  s = bfd_make_section_with_flags (abfd, ".plt", pltflags);
+  htab->splt = s;
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, bed->plt_alignment))
+    return FALSE;
+
+  if (bed->want_plt_sym)
+    {
+      /* Define the symbol _PROCEDURE_LINKAGE_TABLE_ at the start of the
+         .plt section.  */
+      struct bfd_link_hash_entry *bh = NULL;
+      struct elf_link_hash_entry *h;
+
+      if (! (_bfd_generic_link_add_one_symbol
+             (info, abfd, "_PROCEDURE_LINKAGE_TABLE_", BSF_GLOBAL, s,
+              (bfd_vma) 0, NULL, FALSE,
+              get_elf_backend_data (abfd)->collect, &bh)))
+        return FALSE;
+      h = (struct elf_link_hash_entry *) bh;
+      h->def_regular = 1;
+      h->type = STT_OBJECT;
+      htab->root.hplt = h;
+
+      if (info->shared
+          && ! bfd_elf_link_record_dynamic_symbol (info, h))
+        return FALSE;
+    }
+
+  s = bfd_make_section_with_flags (abfd,
+				   bed->default_use_rela_p ? ".rela.plt" : ".rel.plt",
+				   flags | SEC_READONLY);
+  htab->srelplt = s;
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, ptralign))
+    return FALSE;
+
+  if (htab->sgot == NULL
+      && ! create_got_section (abfd, info))
+    return FALSE;
+
+  {
+    const char *secname;
+    char *relname;
+    flagword secflags;
+    asection *sec;
+
+    for (sec = abfd->sections; sec; sec = sec->next)
+      {
+        secflags = bfd_get_section_flags (abfd, sec);
+        if ((secflags & (SEC_DATA | SEC_LINKER_CREATED))
+            || ((secflags & SEC_HAS_CONTENTS) != SEC_HAS_CONTENTS))
+          continue;
+        secname = bfd_get_section_name (abfd, sec);
+        relname = bfd_malloc ((bfd_size_type) strlen (secname) + 6);
+        strcpy (relname, ".rela");
+        strcat (relname, secname);
+        if (bfd_get_section_by_name (abfd, secname))
+          continue;
+        s = bfd_make_section_with_flags (abfd, relname,
+					 flags | SEC_READONLY);
+        if (s == NULL
+            || ! bfd_set_section_alignment (abfd, s, ptralign))
+          return FALSE;
+      }
+  }
+
+  if (bed->want_dynbss)
+    {
+      /* The .dynbss section is a place to put symbols which are defined
+         by dynamic objects, are referenced by regular objects, and are
+         not functions.  We must allocate space for them in the process
+         image and use a R_*_COPY reloc to tell the dynamic linker to
+         initialize them at run time.  The linker script puts the .dynbss
+         section into the .bss section of the final image.  */
+      s = bfd_make_section_with_flags (abfd, ".dynbss",
+				       SEC_ALLOC | SEC_LINKER_CREATED);
+      htab->sdynbss = s;
+      if (s == NULL)
+        return FALSE;
+      /* The .rel[a].bss section holds copy relocs.  This section is not
+         normally needed.  We need to create it here, though, so that the
+         linker will map it to an output section.  We can't just create it
+         only if we need it, because we will not know whether we need it
+         until we have seen all the input files, and the first time the
+         main linker code calls BFD after examining all the input files
+         (size_dynamic_sections) the input sections have already been
+         mapped to the output sections.  If the section turns out not to
+         be needed, we can discard it later.  We will never need this
+         section when generating a shared object, since they do not use
+         copy relocs.  */
+      if (! info->shared)
+        {
+          s = bfd_make_section_with_flags (abfd,
+					   (bed->default_use_rela_p
+					    ? ".rela.bss" : ".rel.bss"),
+					   flags | SEC_READONLY);
+          htab->srelbss = s;
+          if (s == NULL
+              || ! bfd_set_section_alignment (abfd, s, ptralign))
+            return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+/* Copy the extra info we tack onto an elf_link_hash_entry.  */
+
+static void
+m32r_elf_copy_indirect_symbol (struct bfd_link_info *info,
+                               struct elf_link_hash_entry *dir,
+                               struct elf_link_hash_entry *ind)
+{
+  struct elf_m32r_link_hash_entry * edir;
+  struct elf_m32r_link_hash_entry * eind;
+
+  edir = (struct elf_m32r_link_hash_entry *) dir;
+  eind = (struct elf_m32r_link_hash_entry *) ind;
+
+  if (eind->dyn_relocs != NULL)
+    {
+      if (edir->dyn_relocs != NULL)
+        {
+          struct elf_m32r_dyn_relocs **pp;
+          struct elf_m32r_dyn_relocs *p;
+
+          /* Add reloc counts against the indirect sym to the direct sym
+             list.  Merge any entries against the same section.  */
+          for (pp = &eind->dyn_relocs; (p = *pp) != NULL;)
+            {
+              struct elf_m32r_dyn_relocs *q;
+
+              for (q = edir->dyn_relocs; q != NULL; q = q->next)
+                if (q->sec == p->sec)
+                  {
+                    q->pc_count += p->pc_count;
+                    q->count += p->count;
+                    *pp = p->next;
+                    break;
+                  }
+              if (q == NULL)
+                pp = &p->next;
+            }
+          *pp = edir->dyn_relocs;
+        }
+
+      edir->dyn_relocs = eind->dyn_relocs;
+      eind->dyn_relocs = NULL;
+    }
+
+  _bfd_elf_link_hash_copy_indirect (info, dir, ind);
+}
+
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+m32r_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+				struct elf_link_hash_entry *h)
+{
+  struct elf_m32r_link_hash_table *htab;
+  struct elf_m32r_link_hash_entry *eh;
+  struct elf_m32r_dyn_relocs *p;
+  bfd *dynobj;
+  asection *s;
+
+#ifdef DEBUG_PIC
+  printf ("m32r_elf_adjust_dynamic_symbol()\n");
+#endif
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (dynobj != NULL
+              && (h->needs_plt
+                  || h->u.weakdef != NULL
+                  || (h->def_dynamic
+                      && h->ref_regular
+                      && !h->def_regular)));
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later,
+     when we know the address of the .got section.  */
+  if (h->type == STT_FUNC
+      || h->needs_plt)
+    {
+      if (! info->shared
+          && !h->def_dynamic
+          && !h->ref_dynamic
+	  && h->root.type != bfd_link_hash_undefweak
+	  && h->root.type != bfd_link_hash_undefined)
+        {
+          /* This case can occur if we saw a PLT reloc in an input
+             file, but the symbol was never referred to by a dynamic
+             object.  In such a case, we don't actually need to build
+             a procedure linkage table, and we can just do a PCREL
+             reloc instead.  */
+          h->plt.offset = (bfd_vma) -1;
+          h->needs_plt = 0;
+        }
+
+      return TRUE;
+    }
+  else
+    h->plt.offset = (bfd_vma) -1;
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+                  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if (!h->non_got_ref)
+    return TRUE;
+
+  /* If -z nocopyreloc was given, we won't generate them either.  */
+  if (info->nocopyreloc)
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  eh = (struct elf_m32r_link_hash_entry *) h;
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      s = p->sec->output_section;
+      if (s != NULL && (s->flags & (SEC_READONLY | SEC_HAS_CONTENTS)) != 0)
+        break;
+    }
+
+  /* If we didn't find any dynamic relocs in sections which needs the
+     copy reloc, then we'll be keeping the dynamic relocs and avoiding
+     the copy reloc.  */
+  if (p == NULL)
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  htab = m32r_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  s = htab->sdynbss;
+  BFD_ASSERT (s != NULL);
+
+  /* We must generate a R_M32R_COPY reloc to tell the dynamic linker
+     to copy the initial value out of the dynamic object and into the
+     runtime process image.  We need to remember the offset into the
+     .rela.bss section we are going to use.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      asection *srel;
+
+      srel = htab->srelbss;
+      BFD_ASSERT (srel != NULL);
+      srel->size += sizeof (Elf32_External_Rela);
+      h->needs_copy = 1;
+    }
+
+  return _bfd_elf_adjust_dynamic_copy (h, s);
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   dynamic relocs.  */
+
+static bfd_boolean
+allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
+{
+  struct bfd_link_info *info;
+  struct elf_m32r_link_hash_table *htab;
+  struct elf_m32r_link_hash_entry *eh;
+  struct elf_m32r_dyn_relocs *p;
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  info = (struct bfd_link_info *) inf;
+  htab = m32r_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  eh = (struct elf_m32r_link_hash_entry *) h;
+
+  if (htab->root.dynamic_sections_created
+      && h->plt.refcount > 0)
+    {
+      /* Make sure this symbol is output as a dynamic symbol.
+         Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+          && !h->forced_local)
+        {
+          if (! bfd_elf_link_record_dynamic_symbol (info, h))
+            return FALSE;
+        }
+
+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info->shared, h))
+        {
+          asection *s = htab->splt;
+
+          /* If this is the first .plt entry, make room for the special
+             first entry.  */
+          if (s->size == 0)
+            s->size += PLT_ENTRY_SIZE;
+
+          h->plt.offset = s->size;
+
+          /* If this symbol is not defined in a regular file, and we are
+             not generating a shared library, then set the symbol to this
+             location in the .plt.  This is required to make function
+             pointers compare as equal between the normal executable and
+             the shared library.  */
+          if (! info->shared
+              && !h->def_regular)
+            {
+              h->root.u.def.section = s;
+              h->root.u.def.value = h->plt.offset;
+            }
+
+          /* Make room for this entry.  */
+          s->size += PLT_ENTRY_SIZE;
+
+          /* We also need to make an entry in the .got.plt section, which
+             will be placed in the .got section by the linker script.  */
+          htab->sgotplt->size += 4;
+
+          /* We also need to make an entry in the .rel.plt section.  */
+          htab->srelplt->size += sizeof (Elf32_External_Rela);
+        }
+      else
+        {
+          h->plt.offset = (bfd_vma) -1;
+          h->needs_plt = 0;
+        }
+    }
+  else
+    {
+      h->plt.offset = (bfd_vma) -1;
+      h->needs_plt = 0;
+    }
+
+  if (h->got.refcount > 0)
+    {
+      asection *s;
+      bfd_boolean dyn;
+
+      /* Make sure this symbol is output as a dynamic symbol.
+         Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+          && !h->forced_local)
+        {
+          if (! bfd_elf_link_record_dynamic_symbol (info, h))
+            return FALSE;
+        }
+
+      s = htab->sgot;
+
+      h->got.offset = s->size;
+      s->size += 4;
+      dyn = htab->root.dynamic_sections_created;
+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h))
+        htab->srelgot->size += sizeof (Elf32_External_Rela);
+    }
+  else
+    h->got.offset = (bfd_vma) -1;
+
+  if (eh->dyn_relocs == NULL)
+    return TRUE;
+
+  /* In the shared -Bsymbolic case, discard space allocated for
+     dynamic pc-relative relocs against symbols which turn out to be
+     defined in regular objects.  For the normal shared case, discard
+     space for pc-relative relocs that have become local due to symbol
+     visibility changes.  */
+
+  if (info->shared)
+    {
+      if (h->def_regular
+          && (h->forced_local
+              || info->symbolic))
+        {
+          struct elf_m32r_dyn_relocs **pp;
+
+          for (pp = &eh->dyn_relocs; (p = *pp) != NULL;)
+            {
+              p->count -= p->pc_count;
+              p->pc_count = 0;
+              if (p->count == 0)
+                *pp = p->next;
+              else
+                pp = &p->next;
+            }
+        }
+
+      /* Also discard relocs on undefined weak syms with non-default
+	 visibility.  */
+      if (eh->dyn_relocs != NULL
+	  && h->root.type == bfd_link_hash_undefweak)
+	{
+	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	    eh->dyn_relocs = NULL;
+
+	  /* Make sure undefined weak symbols are output as a dynamic
+	     symbol in PIEs.  */
+	  else if (h->dynindx == -1
+		   && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+	}
+    }
+  else
+    {
+      /* For the non-shared case, discard space for relocs against
+         symbols which turn out to need copy relocs or are not
+         dynamic.  */
+
+      if (!h->non_got_ref
+          && ((h->def_dynamic
+               && !h->def_regular)
+              || (htab->root.dynamic_sections_created
+                  && (h->root.type == bfd_link_hash_undefweak
+                      || h->root.type == bfd_link_hash_undefined))))
+        {
+          /* Make sure this symbol is output as a dynamic symbol.
+             Undefined weak syms won't yet be marked as dynamic.  */
+          if (h->dynindx == -1
+              && !h->forced_local)
+            {
+              if (! bfd_elf_link_record_dynamic_symbol (info, h))
+                return FALSE;
+            }
+
+          /* If that succeeded, we know we'll be keeping all the
+             relocs.  */
+          if (h->dynindx != -1)
+            goto keep;
+        }
+
+      eh->dyn_relocs = NULL;
+
+    keep: ;
+    }
+
+  /* Finally, allocate space.  */
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *sreloc = elf_section_data (p->sec)->sreloc;
+      sreloc->size += p->count * sizeof (Elf32_External_Rela);
+    }
+
+  return TRUE;
+}
+
+/* Find any dynamic relocs that apply to read-only sections.  */
+
+static bfd_boolean
+readonly_dynrelocs (struct elf_link_hash_entry *h, void * inf)
+{
+  struct elf_m32r_link_hash_entry *eh;
+  struct elf_m32r_dyn_relocs *p;
+
+  eh = (struct elf_m32r_link_hash_entry *) h;
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *s = p->sec->output_section;
+
+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
+        {
+          struct bfd_link_info *info = (struct bfd_link_info *) inf;
+
+          info->flags |= DF_TEXTREL;
+
+          /* Not an error, just cut short the traversal.  */
+          return FALSE;
+        }
+    }
+  return TRUE;
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+m32r_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+				struct bfd_link_info *info)
+{
+  struct elf_m32r_link_hash_table *htab;
+  bfd *dynobj;
+  asection *s;
+  bfd_boolean relocs;
+  bfd *ibfd;
+
+#ifdef DEBUG_PIC
+  printf ("m32r_elf_size_dynamic_sections()\n");
+#endif
+
+  htab = m32r_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = htab->root.dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  if (htab->root.dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (s != NULL);
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+
+  /* Set up .got offsets for local syms, and space for local dynamic
+     relocs.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      bfd_signed_vma *local_got;
+      bfd_signed_vma *end_local_got;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *srel;
+
+      if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour)
+        continue;
+
+      for (s = ibfd->sections; s != NULL; s = s->next)
+        {
+          struct elf_m32r_dyn_relocs *p;
+
+          for (p = ((struct elf_m32r_dyn_relocs *)
+                    elf_section_data (s)->local_dynrel);
+               p != NULL;
+               p = p->next)
+            {
+              if (! bfd_is_abs_section (p->sec)
+                  && bfd_is_abs_section (p->sec->output_section))
+                {
+                  /* Input section has been discarded, either because
+                     it is a copy of a linkonce section or due to
+                     linker script /DISCARD/, so we'll be discarding
+                     the relocs too.  */
+                }
+              else if (p->count != 0)
+                {
+                  srel = elf_section_data (p->sec)->sreloc;
+                  srel->size += p->count * sizeof (Elf32_External_Rela);
+                  if ((p->sec->output_section->flags & SEC_READONLY) != 0)
+                    info->flags |= DF_TEXTREL;
+                }
+            }
+        }
+
+      local_got = elf_local_got_refcounts (ibfd);
+      if (!local_got)
+        continue;
+
+      symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+      locsymcount = symtab_hdr->sh_info;
+      end_local_got = local_got + locsymcount;
+      s = htab->sgot;
+      srel = htab->srelgot;
+      for (; local_got < end_local_got; ++local_got)
+        {
+          if (*local_got > 0)
+            {
+              *local_got = s->size;
+              s->size += 4;
+              if (info->shared)
+                srel->size += sizeof (Elf32_External_Rela);
+            }
+          else
+            *local_got = (bfd_vma) -1;
+        }
+    }
+
+  /* Allocate global sym .plt and .got entries, and space for global
+     sym dynamic relocs.  */
+  elf_link_hash_traverse (&htab->root, allocate_dynrelocs, info);
+
+  /* We now have determined the sizes of the various dynamic sections.
+     Allocate memory for them.  */
+  relocs = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+        continue;
+
+      if (s == htab->splt
+          || s == htab->sgot
+          || s == htab->sgotplt
+	  || s == htab->sdynbss)
+        {
+          /* Strip this section if we don't need it; see the
+             comment below.  */
+        }
+      else if (CONST_STRNEQ (bfd_get_section_name (dynobj, s), ".rela"))
+        {
+          if (s->size != 0 && s != htab->srelplt)
+            relocs = TRUE;
+
+          /* We use the reloc_count field as a counter if we need
+             to copy relocs into the output file.  */
+          s->reloc_count = 0;
+        }
+      else
+	/* It's not one of our sections, so don't allocate space.  */
+	continue;
+
+      if (s->size == 0)
+        {
+          /* If we don't need this section, strip it from the
+             output file.  This is mostly to handle .rela.bss and
+             .rela.plt.  We must create both sections in
+             create_dynamic_sections, because they must be created
+             before the linker maps input sections to output
+             sections.  The linker does that before
+             adjust_dynamic_symbol is called, and it is that
+             function which decides whether anything needs to go
+             into these sections.  */
+          s->flags |= SEC_EXCLUDE;
+          continue;
+        }
+
+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents.  We use bfd_zalloc
+         here in case unused entries are not reclaimed before the
+         section's contents are written out.  This should not happen,
+         but this way if it does, we get a R_M32R_NONE reloc instead
+         of garbage.  */
+      s->contents = bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL)
+        return FALSE;
+    }
+
+  if (htab->root.dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in m32r_elf_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+     if (info->executable)
+	{
+	  if (! add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (htab->splt->size != 0)
+        {
+          if (! add_dynamic_entry (DT_PLTGOT, 0)
+              || ! add_dynamic_entry (DT_PLTRELSZ, 0)
+              || ! add_dynamic_entry (DT_PLTREL, DT_RELA)
+              || ! add_dynamic_entry (DT_JMPREL, 0))
+            return FALSE;
+        }
+
+      if (relocs)
+        {
+          if (! add_dynamic_entry (DT_RELA, 0)
+              || ! add_dynamic_entry (DT_RELASZ, 0)
+              || ! add_dynamic_entry (DT_RELAENT,
+                                      sizeof (Elf32_External_Rela)))
+            return FALSE;
+
+          /* If any dynamic relocs apply to a read-only section,
+             then we need a DT_TEXTREL entry.  */
+          if ((info->flags & DF_TEXTREL) == 0)
+            elf_link_hash_traverse (&htab->root, readonly_dynrelocs,
+                                    info);
+
+          if ((info->flags & DF_TEXTREL) != 0)
+            {
+              if (! add_dynamic_entry (DT_TEXTREL, 0))
+                return FALSE;
+            }
+        }
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+/* Relocate an M32R/D ELF section.
+   There is some attempt to make this function usable for many architectures,
+   both for RELA and REL type relocs, if only to serve as a learning tool.
+
+   The RELOCATE_SECTION function is called by the new ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures; if the section
+   actually uses Rel structures, the r_addend field will always be
+   zero.
+
+   This function is responsible for adjust the section contents as
+   necessary, and (if using Rela relocs and generating a
+   relocatable output file) adjusting the reloc addend as
+   necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.  */
+
+static bfd_boolean
+m32r_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
+			   struct bfd_link_info *info,
+			   bfd *input_bfd,
+			   asection *input_section,
+			   bfd_byte *contents,
+			   Elf_Internal_Rela *relocs,
+			   Elf_Internal_Sym *local_syms,
+			   asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd);
+  Elf_Internal_Rela *rel, *relend;
+  /* Assume success.  */
+  bfd_boolean ret = TRUE;
+  struct elf_m32r_link_hash_table *htab = m32r_elf_hash_table (info);
+  bfd *dynobj;
+  bfd_vma *local_got_offsets;
+  asection *sgot, *splt, *sreloc;
+  bfd_vma high_address = bfd_get_section_limit (input_bfd, input_section);
+
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = htab->root.dynobj;
+  local_got_offsets = elf_local_got_offsets (input_bfd);
+
+  sgot = htab->sgot;
+  splt = htab->splt;
+  sreloc = NULL;
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+      /* We can't modify r_addend here as elf_link_input_bfd has an assert to
+         ensure it's zero (we use REL relocs, not RELA).  Therefore this
+         should be assigning zero to `addend', but for clarity we use
+         `r_addend'.  */
+      bfd_vma addend = rel->r_addend;
+      bfd_vma offset = rel->r_offset;
+      bfd_vma relocation;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      const char *sym_name;
+      bfd_reloc_status_type r;
+      const char *errmsg = NULL;
+      bfd_boolean use_rel = FALSE;
+
+      h = NULL;
+      r_type = ELF32_R_TYPE (rel->r_info);
+      if (r_type < 0 || r_type >= (int) R_M32R_max)
+	{
+	  (*_bfd_error_handler) (_("%B: unknown relocation type %d"),
+				 input_bfd,
+				 (int) r_type);
+	  bfd_set_error (bfd_error_bad_value);
+	  ret = FALSE;
+	  continue;
+	}
+
+      if (   r_type == R_M32R_GNU_VTENTRY
+          || r_type == R_M32R_GNU_VTINHERIT
+          || r_type == R_M32R_NONE
+          || r_type == R_M32R_RELA_GNU_VTENTRY
+          || r_type == R_M32R_RELA_GNU_VTINHERIT)
+        continue;
+
+      if (r_type <= R_M32R_GNU_VTENTRY)
+        use_rel = TRUE;
+
+      howto = m32r_elf_howto_table + r_type;
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      sym = NULL;
+      sec = NULL;
+      h = NULL;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  /* Local symbol.  */
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  sym_name = "<local symbol>";
+
+	  if (!use_rel)
+	    {
+	      relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	      addend = rel->r_addend;
+	    }
+	  else
+	    {
+	      relocation = (sec->output_section->vma
+			    + sec->output_offset
+			    + sym->st_value);
+	    }
+	}
+      else
+	{
+	  /* External symbol.  */
+	  relocation = 0;
+
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	  sym_name = h->root.root.string;
+
+	  if (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	    {
+	      bfd_boolean dyn;
+	      sec = h->root.u.def.section;
+
+	      dyn = htab->root.dynamic_sections_created;
+	      sec = h->root.u.def.section;
+	      if (r_type == R_M32R_GOTPC24
+		  || (r_type == R_M32R_GOTPC_HI_ULO
+		      || r_type == R_M32R_GOTPC_HI_SLO
+		      || r_type == R_M32R_GOTPC_LO)
+		  || (r_type == R_M32R_26_PLTREL
+		      && h->plt.offset != (bfd_vma) -1)
+		  || ((r_type == R_M32R_GOT24
+		       || r_type == R_M32R_GOT16_HI_ULO
+		       || r_type == R_M32R_GOT16_HI_SLO
+		       || r_type == R_M32R_GOT16_LO)
+		      && WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn,
+							  info->shared, h)
+		      && (! info->shared
+			  || (! info->symbolic && h->dynindx != -1)
+			  || !h->def_regular))
+		  || (info->shared
+		      && ((! info->symbolic && h->dynindx != -1)
+			  || !h->def_regular)
+		      && (((r_type == R_M32R_16_RELA
+			    || r_type == R_M32R_32_RELA
+			    || r_type == R_M32R_24_RELA
+			    || r_type == R_M32R_HI16_ULO_RELA
+			    || r_type == R_M32R_HI16_SLO_RELA
+			    || r_type == R_M32R_LO16_RELA)
+			   && !h->forced_local)
+			  || r_type == R_M32R_REL32
+			  || r_type == R_M32R_10_PCREL_RELA
+			  || r_type == R_M32R_18_PCREL_RELA
+			  || r_type == R_M32R_26_PCREL_RELA)
+		      && ((input_section->flags & SEC_ALLOC) != 0
+			  /* DWARF will emit R_M32R_16(24,32) relocations
+			     in its sections against symbols defined
+			     externally in shared libraries.  We can't do
+			     anything with them here.  */
+			  || ((input_section->flags & SEC_DEBUGGING) != 0
+			      && h->def_dynamic))))
+		{
+		  /* In these cases, we don't need the relocation
+		     value.  We check specially because in some
+		     obscure cases sec->output_section will be NULL.  */
+		}
+	      else if (sec->output_section != NULL)
+		relocation = (h->root.u.def.value
+			      + sec->output_section->vma
+			      + sec->output_offset);
+	      else if (!info->relocatable)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+		     input_bfd,
+		     input_section,
+		     (long) rel->r_offset,
+		     howto->name,
+		     h->root.root.string);
+		}
+	    }
+	  else if (h->root.type == bfd_link_hash_undefweak)
+	    ;
+	  else if (info->unresolved_syms_in_objects == RM_IGNORE
+		   && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT)
+	    ;
+	  else if (!info->relocatable)
+	    {
+	      if (! ((*info->callbacks->undefined_symbol)
+		     (info, h->root.root.string, input_bfd,
+		      input_section, offset,
+		      (info->unresolved_syms_in_objects == RM_GENERATE_ERROR
+		       || ELF_ST_VISIBILITY (h->other)))))
+		return FALSE;
+	    }
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable && !use_rel)
+	{
+	  /* This is a relocatable link.  We don't have to change
+	     anything, unless the reloc is against a section symbol,
+	     in which case we have to adjust according to where the
+	     section symbol winds up in the output section.  */
+	  if (sym != NULL && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+	    rel->r_addend += sec->output_offset;
+	  continue;
+	}
+
+      if (info->relocatable && use_rel)
+	{
+	  /* This is a relocatable link.  We don't have to change
+	     anything, unless the reloc is against a section symbol,
+	     in which case we have to adjust according to where the
+	     section symbol winds up in the output section.  */
+	  if (sym == NULL || ELF_ST_TYPE (sym->st_info) != STT_SECTION)
+	    continue;
+
+	  addend += sec->output_offset;
+
+	  /* If partial_inplace, we need to store any additional addend
+	     back in the section.  */
+	  if (! howto->partial_inplace)
+	    continue;
+	  /* ??? Here is a nice place to call a special_function
+	     like handler.  */
+	  if (r_type != R_M32R_HI16_SLO && r_type != R_M32R_HI16_ULO)
+	    r = _bfd_relocate_contents (howto, input_bfd,
+					addend, contents + offset);
+	  else
+	    {
+	      Elf_Internal_Rela *lorel;
+
+	      /* We allow an arbitrary number of HI16 relocs before the
+		 LO16 reloc.  This permits gcc to emit the HI and LO relocs
+		 itself.  */
+	      for (lorel = rel + 1;
+		   (lorel < relend
+		    && (ELF32_R_TYPE (lorel->r_info) == R_M32R_HI16_SLO
+			|| ELF32_R_TYPE (lorel->r_info) == R_M32R_HI16_ULO));
+		   lorel++)
+		continue;
+	      if (lorel < relend
+		  && ELF32_R_TYPE (lorel->r_info) == R_M32R_LO16)
+		{
+		  m32r_elf_relocate_hi16 (input_bfd, r_type, rel, lorel,
+					  contents, addend);
+		  r = bfd_reloc_ok;
+		}
+	      else
+		r = _bfd_relocate_contents (howto, input_bfd,
+					    addend, contents + offset);
+	    }
+	}
+      else
+	{
+	  /* Sanity check the address.  */
+	  if (offset > high_address)
+	    {
+	      r = bfd_reloc_outofrange;
+	      goto check_reloc;
+	    }
+
+	  switch ((int) r_type)
+	    {
+            case R_M32R_GOTOFF:
+              /* Relocation is relative to the start of the global offset
+                 table (for ld24 rx, #uimm24). eg access at label+addend
+
+                 ld24 rx. #label@GOTOFF + addend
+                 sub  rx, r12.  */
+
+              BFD_ASSERT (sgot != NULL);
+
+              relocation = -(relocation - sgot->output_section->vma);
+              rel->r_addend = -rel->r_addend;
+              break;
+
+            case R_M32R_GOTOFF_HI_ULO:
+            case R_M32R_GOTOFF_HI_SLO:
+            case R_M32R_GOTOFF_LO:
+	      BFD_ASSERT (sgot != NULL);
+
+	      relocation -= sgot->output_section->vma;
+
+	      if ((r_type == R_M32R_GOTOFF_HI_SLO)
+		  && ((relocation + rel->r_addend) & 0x8000))
+		rel->r_addend += 0x10000;
+	      break;
+
+            case R_M32R_GOTPC24:
+              /* .got(_GLOBAL_OFFSET_TABLE_) - pc relocation
+                 ld24 rx,#_GLOBAL_OFFSET_TABLE_
+               */
+             relocation = sgot->output_section->vma;
+             break;
+
+            case R_M32R_GOTPC_HI_ULO:
+            case R_M32R_GOTPC_HI_SLO:
+            case R_M32R_GOTPC_LO:
+              {
+                /* .got(_GLOBAL_OFFSET_TABLE_) - pc relocation
+                   bl .+4
+                   seth rx,#high(_GLOBAL_OFFSET_TABLE_)
+                   or3 rx,rx,#low(_GLOBAL_OFFSET_TABLE_ +4)
+                   or
+                   bl .+4
+                   seth rx,#shigh(_GLOBAL_OFFSET_TABLE_)
+                   add3 rx,rx,#low(_GLOBAL_OFFSET_TABLE_ +4)
+                 */
+                relocation = sgot->output_section->vma;
+                relocation -= (input_section->output_section->vma
+                               + input_section->output_offset
+                               + rel->r_offset);
+                if ((r_type == R_M32R_GOTPC_HI_SLO)
+                     && ((relocation + rel->r_addend) & 0x8000))
+                  rel->r_addend += 0x10000;
+
+                break;
+              }
+            case R_M32R_GOT16_HI_ULO:
+            case R_M32R_GOT16_HI_SLO:
+            case R_M32R_GOT16_LO:
+              /* Fall through.  */
+            case R_M32R_GOT24:
+              /* Relocation is to the entry for this symbol in the global
+                 offset table.  */
+              BFD_ASSERT (sgot != NULL);
+
+              if (h != NULL)
+                {
+                  bfd_boolean dyn;
+                  bfd_vma off;
+
+                  off = h->got.offset;
+                  BFD_ASSERT (off != (bfd_vma) -1);
+
+                  dyn = htab->root.dynamic_sections_created;
+                  if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+                      || (info->shared
+                          && (info->symbolic
+                              || h->dynindx == -1
+                              || h->forced_local)
+                          && h->def_regular))
+                    {
+                      /* This is actually a static link, or it is a
+                         -Bsymbolic link and the symbol is defined
+                         locally, or the symbol was forced to be local
+                         because of a version file.  We must initialize
+                         this entry in the global offset table.  Since the
+                         offset must always be a multiple of 4, we use the
+                         least significant bit to record whether we have
+                         initialized it already.
+
+                         When doing a dynamic link, we create a .rela.got
+                         relocation entry to initialize the value.  This
+                         is done in the finish_dynamic_symbol routine.  */
+                      if ((off & 1) != 0)
+                        off &= ~1;
+                      else
+                        {
+                          bfd_put_32 (output_bfd, relocation,
+                                      sgot->contents + off);
+                          h->got.offset |= 1;
+                        }
+                    }
+
+                  relocation = sgot->output_offset + off;
+                }
+              else
+                {
+                  bfd_vma off;
+                  bfd_byte *loc;
+
+                  BFD_ASSERT (local_got_offsets != NULL
+                              && local_got_offsets[r_symndx] != (bfd_vma) -1);
+
+                  off = local_got_offsets[r_symndx];
+
+                  /* The offset must always be a multiple of 4.  We use
+                     the least significant bit to record whether we have
+                     already processed this entry.  */
+                  if ((off & 1) != 0)
+                    off &= ~1;
+                  else
+                    {
+                      bfd_put_32 (output_bfd, relocation, sgot->contents + off);
+
+                      if (info->shared)
+                        {
+                          asection *srelgot;
+                          Elf_Internal_Rela outrel;
+
+                          /* We need to generate a R_M32R_RELATIVE reloc
+                             for the dynamic linker.  */
+                          srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+                          BFD_ASSERT (srelgot != NULL);
+
+                          outrel.r_offset = (sgot->output_section->vma
+                                             + sgot->output_offset
+                                             + off);
+                          outrel.r_info = ELF32_R_INFO (0, R_M32R_RELATIVE);
+                          outrel.r_addend = relocation;
+                          loc = srelgot->contents;
+                          loc += srelgot->reloc_count * sizeof (Elf32_External_Rela);
+                          bfd_elf32_swap_reloca_out (output_bfd, &outrel,loc);
+                          ++srelgot->reloc_count;
+                        }
+
+                      local_got_offsets[r_symndx] |= 1;
+                    }
+
+                  relocation = sgot->output_offset + off;
+                }
+              if ((r_type == R_M32R_GOT16_HI_SLO)
+                  && ((relocation + rel->r_addend) & 0x8000))
+                rel->r_addend += 0x10000;
+
+              break;
+
+            case R_M32R_26_PLTREL:
+              /* Relocation is to the entry for this symbol in the
+                 procedure linkage table.  */
+
+              /* The native assembler will generate a 26_PLTREL reloc
+                 for a local symbol if you assemble a call from one
+                 section to another when using -K pic. */
+              if (h == NULL)
+                break;
+
+              if (h->forced_local)
+                break;
+
+              if (h->plt.offset == (bfd_vma) -1)
+		/* We didn't make a PLT entry for this symbol.  This
+		   happens when statically linking PIC code, or when
+		   using -Bsymbolic.  */
+		break;
+
+              relocation = (splt->output_section->vma
+                            + splt->output_offset
+                            + h->plt.offset);
+              break;
+
+            case R_M32R_HI16_SLO_RELA:
+	      if ((relocation + rel->r_addend) & 0x8000)
+		rel->r_addend += 0x10000;
+              /* Fall through.  */
+
+            case R_M32R_16_RELA:
+            case R_M32R_24_RELA:
+            case R_M32R_32_RELA:
+            case R_M32R_REL32:
+	    case R_M32R_10_PCREL_RELA:
+            case R_M32R_18_PCREL_RELA:
+            case R_M32R_26_PCREL_RELA:
+            case R_M32R_HI16_ULO_RELA:
+            case R_M32R_LO16_RELA:
+              if (info->shared
+                  && r_symndx != STN_UNDEF
+                  && (input_section->flags & SEC_ALLOC) != 0
+                  && ((   r_type != R_M32R_10_PCREL_RELA
+                       && r_type != R_M32R_18_PCREL_RELA
+                       && r_type != R_M32R_26_PCREL_RELA
+                       && r_type != R_M32R_REL32)
+                      || (h != NULL
+                          && h->dynindx != -1
+                          && (! info->symbolic
+                              || !h->def_regular))))
+                {
+                  Elf_Internal_Rela outrel;
+                  bfd_boolean skip, relocate;
+                  bfd_byte *loc;
+
+                  /* When generating a shared object, these relocations
+                     are copied into the output file to be resolved at run
+                     time.  */
+                  if (sreloc == NULL)
+                    {
+		      sreloc = _bfd_elf_get_dynamic_reloc_section
+			(input_bfd, input_section, /*rela?*/ TRUE);
+		      if (sreloc == NULL)
+			return FALSE;
+                    }
+
+                  skip = FALSE;
+                  relocate = FALSE;
+
+                  outrel.r_offset = _bfd_elf_section_offset (output_bfd,
+                                                             info,
+                                                             input_section,
+                                                             rel->r_offset);
+                  if (outrel.r_offset == (bfd_vma) -1)
+                    skip = TRUE;
+                  else if (outrel.r_offset == (bfd_vma) -2)
+                    skip = relocate = TRUE;
+                  outrel.r_offset += (input_section->output_section->vma
+                                      + input_section->output_offset);
+
+                  if (skip)
+                    memset (&outrel, 0, sizeof outrel);
+                  else if (   r_type == R_M32R_10_PCREL_RELA
+                           || r_type == R_M32R_18_PCREL_RELA
+                           || r_type == R_M32R_26_PCREL_RELA
+                           || r_type == R_M32R_REL32)
+                    {
+                      BFD_ASSERT (h != NULL && h->dynindx != -1);
+                      outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
+                      outrel.r_addend = rel->r_addend;
+                    }
+                  else
+                    {
+                    /* h->dynindx may be -1 if this symbol was marked to
+                       become local.  */
+                    if (h == NULL
+                        || ((info->symbolic || h->dynindx == -1)
+                             && h->def_regular))
+                      {
+                        relocate = TRUE;
+                        outrel.r_info = ELF32_R_INFO (0, R_M32R_RELATIVE);
+                        outrel.r_addend = relocation + rel->r_addend;
+                      }
+                    else
+                      {
+                        BFD_ASSERT (h->dynindx != -1);
+                        outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
+                        outrel.r_addend = relocation + rel->r_addend;
+                      }
+                    }
+
+                  loc = sreloc->contents;
+                  loc += sreloc->reloc_count * sizeof (Elf32_External_Rela);
+                  bfd_elf32_swap_reloca_out (output_bfd, &outrel,loc);
+                  ++sreloc->reloc_count;
+
+                  /* If this reloc is against an external symbol, we do
+                     not want to fiddle with the addend.  Otherwise, we
+                     need to include the symbol value so that it becomes
+                     an addend for the dynamic reloc.  */
+                  if (! relocate)
+                    continue;
+		  break;
+                }
+	      else if (r_type != R_M32R_10_PCREL_RELA)
+		break;
+	      /* Fall through.  */
+
+	    case (int) R_M32R_10_PCREL :
+	      r = m32r_elf_do_10_pcrel_reloc (input_bfd, howto, input_section,
+					      contents, offset,
+					      sec, relocation, addend);
+              goto check_reloc;
+
+	    case (int) R_M32R_HI16_SLO :
+	    case (int) R_M32R_HI16_ULO :
+	      {
+		Elf_Internal_Rela *lorel;
+
+		/* We allow an arbitrary number of HI16 relocs before the
+		   LO16 reloc.  This permits gcc to emit the HI and LO relocs
+		   itself.  */
+		for (lorel = rel + 1;
+		     (lorel < relend
+		      && (ELF32_R_TYPE (lorel->r_info) == R_M32R_HI16_SLO
+			  || ELF32_R_TYPE (lorel->r_info) == R_M32R_HI16_ULO));
+		     lorel++)
+		  continue;
+		if (lorel < relend
+		    && ELF32_R_TYPE (lorel->r_info) == R_M32R_LO16)
+		  {
+		    m32r_elf_relocate_hi16 (input_bfd, r_type, rel, lorel,
+					    contents, relocation + addend);
+		    r = bfd_reloc_ok;
+		  }
+		else
+		  r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+						contents, offset,
+						relocation, addend);
+	      }
+
+              goto check_reloc;
+
+            case (int) R_M32R_SDA16_RELA:
+	    case (int) R_M32R_SDA16 :
+	      {
+		const char *name;
+
+		BFD_ASSERT (sec != NULL);
+		name = bfd_get_section_name (abfd, sec);
+
+		if (   strcmp (name, ".sdata") == 0
+		    || strcmp (name, ".sbss") == 0
+		    || strcmp (name, ".scommon") == 0)
+		  {
+		    bfd_vma sda_base;
+		    bfd *out_bfd = sec->output_section->owner;
+
+		    r = m32r_elf_final_sda_base (out_bfd, info,
+						 &errmsg,
+						 &sda_base);
+		    if (r != bfd_reloc_ok)
+		      {
+			ret = FALSE;
+			goto check_reloc;
+		      }
+
+		    /* At this point `relocation' contains the object's
+		       address.  */
+		    relocation -= sda_base;
+		    /* Now it contains the offset from _SDA_BASE_.  */
+		  }
+		else
+		  {
+		    (*_bfd_error_handler)
+		      (_("%B: The target (%s) of an %s relocation is in the wrong section (%A)"),
+		       input_bfd,
+		       sec,
+		       sym_name,
+		       m32r_elf_howto_table[(int) r_type].name);
+		    /*bfd_set_error (bfd_error_bad_value); ??? why? */
+		    ret = FALSE;
+		    continue;
+		  }
+	      }
+              /* Fall through.  */
+
+	    default : /* OLD_M32R_RELOC */
+
+	      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+					    contents, offset,
+					    relocation, addend);
+	      goto check_reloc;
+	    }
+
+          r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+                                        contents, rel->r_offset,
+                                        relocation, rel->r_addend);
+
+	}
+
+    check_reloc:
+
+      if (r != bfd_reloc_ok)
+	{
+	  /* FIXME: This should be generic enough to go in a utility.  */
+	  const char *name;
+
+	  if (h != NULL)
+	    name = h->root.root.string;
+	  else
+	    {
+	      name = (bfd_elf_string_from_elf_section
+		      (input_bfd, symtab_hdr->sh_link, sym->st_name));
+	      if (name == NULL || *name == '\0')
+		name = bfd_section_name (input_bfd, sec);
+	    }
+
+	  if (errmsg != NULL)
+	    goto common_error;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      if (! ((*info->callbacks->reloc_overflow)
+		     (info, (h ? &h->root : NULL), name, howto->name,
+		      (bfd_vma) 0, input_bfd, input_section, offset)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_undefined:
+	      if (! ((*info->callbacks->undefined_symbol)
+		     (info, name, input_bfd, input_section,
+		      offset, TRUE)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      errmsg = _("internal error: out of range error");
+	      goto common_error;
+
+	    case bfd_reloc_notsupported:
+	      errmsg = _("internal error: unsupported relocation error");
+	      goto common_error;
+
+	    case bfd_reloc_dangerous:
+	      errmsg = _("internal error: dangerous error");
+	      goto common_error;
+
+	    default:
+	      errmsg = _("internal error: unknown error");
+	      /* fall through */
+
+	    common_error:
+	      if (!((*info->callbacks->warning)
+		    (info, errmsg, name, input_bfd, input_section,
+		     offset)))
+		return FALSE;
+	      break;
+	    }
+	}
+    }
+
+  return ret;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+m32r_elf_finish_dynamic_symbol (bfd *output_bfd,
+				struct bfd_link_info *info,
+				struct elf_link_hash_entry *h,
+				Elf_Internal_Sym *sym)
+{
+  struct elf_m32r_link_hash_table *htab;
+  bfd_byte *loc;
+
+#ifdef DEBUG_PIC
+  printf ("m32r_elf_finish_dynamic_symbol()\n");
+#endif
+
+  htab = m32r_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      asection *splt;
+      asection *sgot;
+      asection *srela;
+
+      bfd_vma plt_index;
+      bfd_vma got_offset;
+      Elf_Internal_Rela rela;
+
+      /* This symbol has an entry in the procedure linkage table.  Set
+         it up.  */
+
+      BFD_ASSERT (h->dynindx != -1);
+
+      splt = htab->splt;
+      sgot = htab->sgotplt;
+      srela = htab->srelplt;
+      BFD_ASSERT (splt != NULL && sgot != NULL && srela != NULL);
+
+      /* Get the index in the procedure linkage table which
+         corresponds to this symbol.  This is the index of this symbol
+         in all the symbols for which we are making plt entries.  The
+         first entry in the procedure linkage table is reserved.  */
+      plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1;
+
+      /* Get the offset into the .got table of the entry that
+        corresponds to this function.  Each .got entry is 4 bytes.
+        The first three are reserved.  */
+      got_offset = (plt_index + 3) * 4;
+
+      /* Fill in the entry in the procedure linkage table.  */
+      if (! info->shared)
+        {
+          bfd_put_32 (output_bfd,
+              (PLT_ENTRY_WORD0b
+               + (((sgot->output_section->vma
+                    + sgot->output_offset
+                    + got_offset) >> 16) & 0xffff)),
+              splt->contents + h->plt.offset);
+          bfd_put_32 (output_bfd,
+              (PLT_ENTRY_WORD1b
+               + ((sgot->output_section->vma
+                   + sgot->output_offset
+                   + got_offset) & 0xffff)),
+              splt->contents + h->plt.offset + 4);
+          bfd_put_32 (output_bfd, PLT_ENTRY_WORD2,
+              splt->contents + h->plt.offset + 8);
+          bfd_put_32 (output_bfd,
+              (PLT_ENTRY_WORD3
+               + plt_index * sizeof (Elf32_External_Rela)),
+              splt->contents + h->plt.offset + 12);
+          bfd_put_32 (output_bfd,
+              (PLT_ENTRY_WORD4
+               + (((unsigned int) ((- (h->plt.offset + 16)) >> 2)) & 0xffffff)),
+              splt->contents + h->plt.offset + 16);
+        }
+      else
+        {
+          bfd_put_32 (output_bfd,
+              PLT_ENTRY_WORD0 + got_offset,
+              splt->contents + h->plt.offset);
+          bfd_put_32 (output_bfd, PLT_ENTRY_WORD1,
+              splt->contents + h->plt.offset + 4);
+          bfd_put_32 (output_bfd, PLT_ENTRY_WORD2,
+              splt->contents + h->plt.offset + 8);
+          bfd_put_32 (output_bfd,
+              (PLT_ENTRY_WORD3
+               + plt_index * sizeof (Elf32_External_Rela)),
+              splt->contents + h->plt.offset + 12);
+          bfd_put_32 (output_bfd,
+              (PLT_ENTRY_WORD4
+               + (((unsigned int) ((- (h->plt.offset + 16)) >> 2)) & 0xffffff)),
+              splt->contents + h->plt.offset + 16);
+        }
+
+      /* Fill in the entry in the global offset table.  */
+      bfd_put_32 (output_bfd,
+                  (splt->output_section->vma
+                   + splt->output_offset
+                   + h->plt.offset
+                   + 12), /* same offset */
+                  sgot->contents + got_offset);
+
+      /* Fill in the entry in the .rela.plt section.  */
+      rela.r_offset = (sgot->output_section->vma
+                       + sgot->output_offset
+                       + got_offset);
+      rela.r_info = ELF32_R_INFO (h->dynindx, R_M32R_JMP_SLOT);
+      rela.r_addend = 0;
+      loc = srela->contents;
+      loc += plt_index * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+
+      if (!h->def_regular)
+        {
+          /* Mark the symbol as undefined, rather than as defined in
+             the .plt section.  Leave the value alone.  */
+          sym->st_shndx = SHN_UNDEF;
+        }
+    }
+
+  if (h->got.offset != (bfd_vma) -1)
+    {
+      asection *sgot;
+      asection *srela;
+      Elf_Internal_Rela rela;
+
+      /* This symbol has an entry in the global offset table.  Set it
+         up.  */
+
+      sgot = htab->sgot;
+      srela = htab->srelgot;
+      BFD_ASSERT (sgot != NULL && srela != NULL);
+
+      rela.r_offset = (sgot->output_section->vma
+                       + sgot->output_offset
+                       + (h->got.offset &~ 1));
+
+      /* If this is a -Bsymbolic link, and the symbol is defined
+         locally, we just want to emit a RELATIVE reloc.  Likewise if
+         the symbol was forced to be local because of a version file.
+         The entry in the global offset table will already have been
+         initialized in the relocate_section function.  */
+      if (info->shared
+          && (info->symbolic
+	      || h->dynindx == -1
+	      || h->forced_local)
+          && h->def_regular)
+        {
+          rela.r_info = ELF32_R_INFO (0, R_M32R_RELATIVE);
+          rela.r_addend = (h->root.u.def.value
+                           + h->root.u.def.section->output_section->vma
+                           + h->root.u.def.section->output_offset);
+        }
+      else
+        {
+	  BFD_ASSERT ((h->got.offset & 1) == 0);
+          bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + h->got.offset);
+          rela.r_info = ELF32_R_INFO (h->dynindx, R_M32R_GLOB_DAT);
+          rela.r_addend = 0;
+        }
+
+      loc = srela->contents;
+      loc += srela->reloc_count * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+      ++srela->reloc_count;
+    }
+
+  if (h->needs_copy)
+    {
+      asection *s;
+      Elf_Internal_Rela rela;
+
+      /* This symbols needs a copy reloc.  Set it up.  */
+
+      BFD_ASSERT (h->dynindx != -1
+                  && (h->root.type == bfd_link_hash_defined
+                      || h->root.type == bfd_link_hash_defweak));
+
+      s = bfd_get_section_by_name (h->root.u.def.section->owner,
+                                   ".rela.bss");
+      BFD_ASSERT (s != NULL);
+
+      rela.r_offset = (h->root.u.def.value
+                       + h->root.u.def.section->output_section->vma
+                       + h->root.u.def.section->output_offset);
+      rela.r_info = ELF32_R_INFO (h->dynindx, R_M32R_COPY);
+      rela.r_addend = 0;
+      loc = s->contents;
+      loc += s->reloc_count * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+      ++s->reloc_count;
+    }
+
+  /* Mark some specially defined symbols as absolute.  */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+      || h == htab->root.hgot)
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+m32r_elf_finish_dynamic_sections (bfd *output_bfd,
+				  struct bfd_link_info *info)
+{
+  struct elf_m32r_link_hash_table *htab;
+  bfd *dynobj;
+  asection *sdyn;
+  asection *sgot;
+
+#ifdef DEBUG_PIC
+  printf ("m32r_elf_finish_dynamic_sections()\n");
+#endif
+
+  htab = m32r_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = htab->root.dynobj;
+
+  sgot = htab->sgotplt;
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (htab->root.dynamic_sections_created)
+    {
+      asection *splt;
+      Elf32_External_Dyn *dyncon, *dynconend;
+
+      BFD_ASSERT (sgot != NULL && sdyn != NULL);
+
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+
+      for (; dyncon < dynconend; dyncon++)
+        {
+          Elf_Internal_Dyn dyn;
+          asection *s;
+
+          bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+          switch (dyn.d_tag)
+            {
+            default:
+              break;
+
+            case DT_PLTGOT:
+              s = htab->sgot->output_section;
+              goto get_vma;
+            case DT_JMPREL:
+              s = htab->srelplt->output_section;
+            get_vma:
+              BFD_ASSERT (s != NULL);
+              dyn.d_un.d_ptr = s->vma;
+              bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+              break;
+
+            case DT_PLTRELSZ:
+              s = htab->srelplt->output_section;
+              BFD_ASSERT (s != NULL);
+	      dyn.d_un.d_val = s->size;
+              bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+              break;
+
+            case DT_RELASZ:
+              /* My reading of the SVR4 ABI indicates that the
+                 procedure linkage table relocs (DT_JMPREL) should be
+                 included in the overall relocs (DT_RELA).  This is
+                 what Solaris does.  However, UnixWare can not handle
+                 that case.  Therefore, we override the DT_RELASZ entry
+                 here to make it not include the JMPREL relocs.  Since
+                 the linker script arranges for .rela.plt to follow all
+                 other relocation sections, we don't have to worry
+                 about changing the DT_RELA entry.  */
+              if (htab->srelplt != NULL)
+                {
+                  s = htab->srelplt->output_section;
+		  dyn.d_un.d_val -= s->size;
+                }
+              bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+              break;
+            }
+        }
+
+      /* Fill in the first entry in the procedure linkage table.  */
+      splt = htab->splt;
+      if (splt && splt->size > 0)
+        {
+          if (info->shared)
+            {
+              bfd_put_32 (output_bfd, PLT0_PIC_ENTRY_WORD0, splt->contents);
+              bfd_put_32 (output_bfd, PLT0_PIC_ENTRY_WORD1, splt->contents + 4);
+              bfd_put_32 (output_bfd, PLT0_PIC_ENTRY_WORD2, splt->contents + 8);
+              bfd_put_32 (output_bfd, PLT0_PIC_ENTRY_WORD3, splt->contents + 12);
+              bfd_put_32 (output_bfd, PLT0_PIC_ENTRY_WORD4, splt->contents + 16);
+            }
+          else
+            {
+              unsigned long addr;
+              /* addr = .got + 4 */
+              addr = sgot->output_section->vma + sgot->output_offset + 4;
+              bfd_put_32 (output_bfd,
+			  PLT0_ENTRY_WORD0 | ((addr >> 16) & 0xffff),
+			  splt->contents);
+              bfd_put_32 (output_bfd,
+			  PLT0_ENTRY_WORD1 | (addr & 0xffff),
+			  splt->contents + 4);
+              bfd_put_32 (output_bfd, PLT0_ENTRY_WORD2, splt->contents + 8);
+              bfd_put_32 (output_bfd, PLT0_ENTRY_WORD3, splt->contents + 12);
+              bfd_put_32 (output_bfd, PLT0_ENTRY_WORD4, splt->contents + 16);
+            }
+
+          elf_section_data (splt->output_section)->this_hdr.sh_entsize =
+            PLT_ENTRY_SIZE;
+        }
+    }
+
+  /* Fill in the first three entries in the global offset table.  */
+  if (sgot && sgot->size > 0)
+    {
+      if (sdyn == NULL)
+        bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents);
+      else
+        bfd_put_32 (output_bfd,
+                    sdyn->output_section->vma + sdyn->output_offset,
+                    sgot->contents);
+      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 4);
+      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 8);
+
+      elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
+    }
+
+  return TRUE;
+}
+
+
+/* Set the right machine number.  */
+
+static bfd_boolean
+m32r_elf_object_p (bfd *abfd)
+{
+  switch (elf_elfheader (abfd)->e_flags & EF_M32R_ARCH)
+    {
+    default:
+    case E_M32R_ARCH:   (void) bfd_default_set_arch_mach (abfd, bfd_arch_m32r, bfd_mach_m32r);  break;
+    case E_M32RX_ARCH:  (void) bfd_default_set_arch_mach (abfd, bfd_arch_m32r, bfd_mach_m32rx); break;
+    case E_M32R2_ARCH:  (void) bfd_default_set_arch_mach (abfd, bfd_arch_m32r, bfd_mach_m32r2); break;
+    }
+  return TRUE;
+}
+
+/* Store the machine number in the flags field.  */
+
+static void
+m32r_elf_final_write_processing (bfd *abfd,
+				 bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  unsigned long val;
+
+  switch (bfd_get_mach (abfd))
+    {
+    default:
+    case bfd_mach_m32r:  val = E_M32R_ARCH; break;
+    case bfd_mach_m32rx: val = E_M32RX_ARCH; break;
+    case bfd_mach_m32r2: val = E_M32R2_ARCH; break;
+    }
+
+  elf_elfheader (abfd)->e_flags &=~ EF_M32R_ARCH;
+  elf_elfheader (abfd)->e_flags |= val;
+}
+
+/* Function to keep M32R specific file flags.  */
+
+static bfd_boolean
+m32r_elf_set_private_flags (bfd *abfd, flagword flags)
+{
+  BFD_ASSERT (!elf_flags_init (abfd)
+	      || elf_elfheader (abfd)->e_flags == flags);
+
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+
+static bfd_boolean
+m32r_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  flagword out_flags;
+  flagword in_flags;
+
+  if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  in_flags  = elf_elfheader (ibfd)->e_flags;
+  out_flags = elf_elfheader (obfd)->e_flags;
+
+  if (! elf_flags_init (obfd))
+    {
+      /* If the input is the default architecture then do not
+	 bother setting the flags for the output architecture,
+	 instead allow future merges to do this.  If no future
+	 merges ever set these flags then they will retain their
+	 unitialised values, which surprise surprise, correspond
+	 to the default values.  */
+      if (bfd_get_arch_info (ibfd)->the_default)
+	return TRUE;
+
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = in_flags;
+
+      if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
+	  && bfd_get_arch_info (obfd)->the_default)
+	return bfd_set_arch_mach (obfd, bfd_get_arch (ibfd),
+				  bfd_get_mach (ibfd));
+
+      return TRUE;
+    }
+
+  /* Check flag compatibility.  */
+  if (in_flags == out_flags)
+    return TRUE;
+
+  if ((in_flags & EF_M32R_ARCH) != (out_flags & EF_M32R_ARCH))
+    {
+      if (   ((in_flags  & EF_M32R_ARCH) != E_M32R_ARCH)
+          || ((out_flags & EF_M32R_ARCH) == E_M32R_ARCH)
+          || ((in_flags  & EF_M32R_ARCH) == E_M32R2_ARCH))
+	{
+	  (*_bfd_error_handler)
+	    (_("%B: Instruction set mismatch with previous modules"), ibfd);
+
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Display the flags field.  */
+
+static bfd_boolean
+m32r_elf_print_private_bfd_data (bfd *abfd, void * ptr)
+{
+  FILE * file = (FILE *) ptr;
+
+  BFD_ASSERT (abfd != NULL && ptr != NULL);
+
+  _bfd_elf_print_private_bfd_data (abfd, ptr);
+
+  fprintf (file, _("private flags = %lx"), elf_elfheader (abfd)->e_flags);
+
+  switch (elf_elfheader (abfd)->e_flags & EF_M32R_ARCH)
+    {
+    default:
+    case E_M32R_ARCH:  fprintf (file, _(": m32r instructions"));  break;
+    case E_M32RX_ARCH: fprintf (file, _(": m32rx instructions")); break;
+    case E_M32R2_ARCH: fprintf (file, _(": m32r2 instructions")); break;
+    }
+
+  fputc ('\n', file);
+
+  return TRUE;
+}
+
+static asection *
+m32r_elf_gc_mark_hook (asection *sec,
+		       struct bfd_link_info *info,
+		       Elf_Internal_Rela *rel,
+		       struct elf_link_hash_entry *h,
+		       Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_M32R_GNU_VTINHERIT:
+      case R_M32R_GNU_VTENTRY:
+      case R_M32R_RELA_GNU_VTINHERIT:
+      case R_M32R_RELA_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+static bfd_boolean
+m32r_elf_gc_sweep_hook (bfd *abfd ATTRIBUTE_UNUSED,
+			struct bfd_link_info *info ATTRIBUTE_UNUSED,
+			asection *sec ATTRIBUTE_UNUSED,
+			const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED)
+{
+  /* Update the got entry reference counts for the section being removed.  */
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  const Elf_Internal_Rela *rel, *relend;
+
+  if (info->relocatable)
+    return TRUE;
+
+  elf_section_data (sec)->local_dynrel = NULL;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h = NULL;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      switch (ELF32_R_TYPE (rel->r_info))
+	{
+	case R_M32R_GOT16_HI_ULO:
+	case R_M32R_GOT16_HI_SLO:
+	case R_M32R_GOT16_LO:
+	case R_M32R_GOTOFF:
+	case R_M32R_GOTOFF_HI_ULO:
+	case R_M32R_GOTOFF_HI_SLO:
+	case R_M32R_GOTOFF_LO:
+	case R_M32R_GOT24:
+	case R_M32R_GOTPC_HI_ULO:
+	case R_M32R_GOTPC_HI_SLO:
+	case R_M32R_GOTPC_LO:
+	case R_M32R_GOTPC24:
+	  if (h != NULL)
+	    {
+	      if (h->got.refcount > 0)
+		h->got.refcount--;
+	    }
+	  else
+	    {
+	      if (local_got_refcounts && local_got_refcounts[r_symndx] > 0)
+		local_got_refcounts[r_symndx]--;
+	    }
+	  break;
+
+	case R_M32R_16_RELA:
+	case R_M32R_24_RELA:
+	case R_M32R_32_RELA:
+	case R_M32R_REL32:
+	case R_M32R_HI16_ULO_RELA:
+	case R_M32R_HI16_SLO_RELA:
+	case R_M32R_LO16_RELA:
+	case R_M32R_SDA16_RELA:
+	case R_M32R_10_PCREL_RELA:
+	case R_M32R_18_PCREL_RELA:
+	case R_M32R_26_PCREL_RELA:
+	  if (h != NULL)
+	    {
+	      struct elf_m32r_link_hash_entry *eh;
+	      struct elf_m32r_dyn_relocs **pp;
+	      struct elf_m32r_dyn_relocs *p;
+
+	      if (!info->shared && h->plt.refcount > 0)
+		h->plt.refcount -= 1;
+
+	      eh = (struct elf_m32r_link_hash_entry *) h;
+
+	      for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
+		if (p->sec == sec)
+		  {
+		    if (   ELF32_R_TYPE (rel->r_info) == R_M32R_26_PCREL_RELA
+			|| ELF32_R_TYPE (rel->r_info) == R_M32R_18_PCREL_RELA
+			|| ELF32_R_TYPE (rel->r_info) == R_M32R_10_PCREL_RELA
+			|| ELF32_R_TYPE (rel->r_info) == R_M32R_REL32)
+		      p->pc_count -= 1;
+		    p->count -= 1;
+		    if (p->count == 0)
+		      *pp = p->next;
+		    break;
+		  }
+	    }
+	  break;
+
+	case R_M32R_26_PLTREL:
+	  if (h != NULL)
+	    {
+	      if (h->plt.refcount > 0)
+		h->plt.refcount--;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Look through the relocs for a section during the first phase.
+   Since we don't do .gots or .plts, we just need to consider the
+   virtual table relocs for gc.  */
+
+static bfd_boolean
+m32r_elf_check_relocs (bfd *abfd,
+		       struct bfd_link_info *info,
+		       asection *sec,
+		       const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  struct elf_m32r_link_hash_table *htab;
+  bfd *dynobj;
+  asection *sreloc;
+
+  if (info->relocatable)
+    return TRUE;
+
+  sreloc = NULL;
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  htab = m32r_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = htab->root.dynobj;
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      int r_type;
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+        h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      /* Some relocs require a global offset table.  */
+      if (htab->sgot == NULL)
+        {
+          switch (r_type)
+            {
+            case R_M32R_GOT16_HI_ULO:
+            case R_M32R_GOT16_HI_SLO:
+            case R_M32R_GOTOFF:
+            case R_M32R_GOTOFF_HI_ULO:
+            case R_M32R_GOTOFF_HI_SLO:
+            case R_M32R_GOTOFF_LO:
+            case R_M32R_GOT16_LO:
+            case R_M32R_GOTPC24:
+            case R_M32R_GOTPC_HI_ULO:
+            case R_M32R_GOTPC_HI_SLO:
+            case R_M32R_GOTPC_LO:
+            case R_M32R_GOT24:
+              if (dynobj == NULL)
+                htab->root.dynobj = dynobj = abfd;
+              if (! create_got_section (dynobj, info))
+                return FALSE;
+              break;
+
+            default:
+              break;
+          }
+        }
+
+      switch (r_type)
+        {
+	case R_M32R_GOT16_HI_ULO:
+	case R_M32R_GOT16_HI_SLO:
+	case R_M32R_GOT16_LO:
+        case R_M32R_GOT24:
+
+          if (h != NULL)
+            h->got.refcount += 1;
+          else
+            {
+              bfd_signed_vma *local_got_refcounts;
+
+              /* This is a global offset table entry for a local
+                 symbol.  */
+              local_got_refcounts = elf_local_got_refcounts (abfd);
+              if (local_got_refcounts == NULL)
+                {
+                  bfd_size_type size;
+
+                  size = symtab_hdr->sh_info;
+                  size *= sizeof (bfd_signed_vma);
+                  local_got_refcounts = bfd_zalloc (abfd, size);
+                  if (local_got_refcounts == NULL)
+                    return FALSE;
+                  elf_local_got_refcounts (abfd) = local_got_refcounts;
+                }
+              local_got_refcounts[r_symndx] += 1;
+            }
+          break;
+
+        case R_M32R_26_PLTREL:
+          /* This symbol requires a procedure linkage table entry.  We
+             actually build the entry in adjust_dynamic_symbol,
+             because this might be a case of linking PIC code without
+             linking in any dynamic objects, in which case we don't
+             need to generate a procedure linkage table after all.  */
+
+	  /* If this is a local symbol, we resolve it directly without
+	     creating a procedure linkage table entry.  */
+          if (h == NULL)
+            continue;
+
+          if (h->forced_local)
+            break;
+
+          h->needs_plt = 1;
+	  h->plt.refcount += 1;
+          break;
+
+        case R_M32R_16_RELA:
+        case R_M32R_24_RELA:
+        case R_M32R_32_RELA:
+        case R_M32R_REL32:
+        case R_M32R_HI16_ULO_RELA:
+        case R_M32R_HI16_SLO_RELA:
+        case R_M32R_LO16_RELA:
+        case R_M32R_SDA16_RELA:
+	case R_M32R_10_PCREL_RELA:
+        case R_M32R_18_PCREL_RELA:
+        case R_M32R_26_PCREL_RELA:
+
+          if (h != NULL && !info->shared)
+            {
+              h->non_got_ref = 1;
+              h->plt.refcount += 1;
+            }
+
+          /* If we are creating a shared library, and this is a reloc
+             against a global symbol, or a non PC relative reloc
+             against a local symbol, then we need to copy the reloc
+             into the shared library.  However, if we are linking with
+             -Bsymbolic, we do not need to copy a reloc against a
+             global symbol which is defined in an object we are
+             including in the link (i.e., DEF_REGULAR is set).  At
+             this point we have not seen all the input files, so it is
+             possible that DEF_REGULAR is not set now but will be set
+             later (it is never cleared).  We account for that
+             possibility below by storing information in the
+             dyn_relocs field of the hash table entry. A similar
+             situation occurs when creating shared libraries and symbol
+             visibility changes render the symbol local.
+
+             If on the other hand, we are creating an executable, we
+             may need to keep relocations for symbols satisfied by a
+             dynamic library if we manage to avoid copy relocs for the
+             symbol.  */
+          if ((info->shared
+               && (sec->flags & SEC_ALLOC) != 0
+	       && ((   r_type != R_M32R_26_PCREL_RELA
+                    && r_type != R_M32R_18_PCREL_RELA
+                    && r_type != R_M32R_10_PCREL_RELA
+                    && r_type != R_M32R_REL32)
+	           || (h != NULL
+		       && (! info->symbolic
+		           || h->root.type == bfd_link_hash_defweak
+		           || !h->def_regular))))
+              || (!info->shared
+                  && (sec->flags & SEC_ALLOC) != 0
+                  && h != NULL
+                  && (h->root.type == bfd_link_hash_defweak
+                      || !h->def_regular)))
+            {
+              struct elf_m32r_dyn_relocs *p;
+              struct elf_m32r_dyn_relocs **head;
+
+              if (dynobj == NULL)
+                htab->root.dynobj = dynobj = abfd;
+
+              /* When creating a shared object, we must copy these
+                 relocs into the output file.  We create a reloc
+                 section in dynobj and make room for the reloc.  */
+              if (sreloc == NULL)
+                {
+		  sreloc = _bfd_elf_make_dynamic_reloc_section
+		    (sec, dynobj, 2, abfd, /*rela?*/ TRUE);
+
+		  if (sreloc == NULL)
+		    return FALSE;
+                }
+
+              /* If this is a global symbol, we count the number of
+                 relocations we need for this symbol.  */
+              if (h != NULL)
+                head = &((struct elf_m32r_link_hash_entry *) h)->dyn_relocs;
+              else
+                {
+                  /* Track dynamic relocs needed for local syms too.  */
+                  asection *s;
+                  void *vpp;
+		  Elf_Internal_Sym *isym;
+
+		  isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+						abfd, r_symndx);
+		  if (isym == NULL)
+		    return FALSE;
+
+		  s = bfd_section_from_elf_index (abfd, isym->st_shndx);
+		  if (s == NULL)
+		    s = sec;
+
+		  vpp = &elf_section_data (s)->local_dynrel;
+                  head = (struct elf_m32r_dyn_relocs **) vpp;
+                }
+
+              p = *head;
+              if (p == NULL || p->sec != sec)
+                {
+                  bfd_size_type amt = sizeof (*p);
+
+                  p = bfd_alloc (dynobj, amt);
+                  if (p == NULL)
+                    return FALSE;
+                  p->next = *head;
+                  *head = p;
+                  p->sec = sec;
+                  p->count = 0;
+                  p->pc_count = 0;
+                }
+
+              p->count += 1;
+              if (   ELF32_R_TYPE (rel->r_info) == R_M32R_26_PCREL_RELA
+                  || ELF32_R_TYPE (rel->r_info) == R_M32R_18_PCREL_RELA
+		  || ELF32_R_TYPE (rel->r_info) == R_M32R_10_PCREL_RELA
+		  || ELF32_R_TYPE (rel->r_info) == R_M32R_REL32)
+                p->pc_count += 1;
+            }
+          break;
+
+        /* This relocation describes the C++ object vtable hierarchy.
+           Reconstruct it for later use during GC.  */
+        case R_M32R_RELA_GNU_VTINHERIT:
+        case R_M32R_GNU_VTINHERIT:
+          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+
+        /* This relocation describes which C++ vtable entries are actually
+           used.  Record for later use during GC.  */
+        case R_M32R_GNU_VTENTRY:
+          BFD_ASSERT (h != NULL);
+          if (h != NULL
+              && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+        case R_M32R_RELA_GNU_VTENTRY:
+          BFD_ASSERT (h != NULL);
+          if (h != NULL
+              && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+            return FALSE;
+          break;
+        }
+    }
+
+  return TRUE;
+}
+
+static const struct bfd_elf_special_section m32r_elf_special_sections[] =
+{
+  { STRING_COMMA_LEN (".sbss"),  -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".sdata"), -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
+  { NULL,                     0,  0, 0,            0 }
+};
+
+static enum elf_reloc_type_class
+m32r_elf_reloc_type_class (const Elf_Internal_Rela *rela)
+{
+  switch ((int) ELF32_R_TYPE (rela->r_info))
+    {
+    case R_M32R_RELATIVE:  return reloc_class_relative;
+    case R_M32R_JMP_SLOT:  return reloc_class_plt;
+    case R_M32R_COPY:      return reloc_class_copy;
+    default:      	   return reloc_class_normal;
+    }
+}
+
+#define ELF_ARCH		bfd_arch_m32r
+#define ELF_TARGET_ID		M32R_ELF_DATA
+#define ELF_MACHINE_CODE	EM_M32R
+#define ELF_MACHINE_ALT1	EM_CYGNUS_M32R
+#define ELF_MAXPAGESIZE		0x1 /* Explicitly requested by Mitsubishi.  */
+
+#define TARGET_BIG_SYM          bfd_elf32_m32r_vec
+#define TARGET_BIG_NAME		"elf32-m32r"
+#define TARGET_LITTLE_SYM       bfd_elf32_m32rle_vec
+#define TARGET_LITTLE_NAME      "elf32-m32rle"
+
+#define elf_info_to_howto			m32r_info_to_howto
+#define elf_info_to_howto_rel			m32r_info_to_howto_rel
+#define elf_backend_section_from_bfd_section	_bfd_m32r_elf_section_from_bfd_section
+#define elf_backend_symbol_processing		_bfd_m32r_elf_symbol_processing
+#define elf_backend_add_symbol_hook		m32r_elf_add_symbol_hook
+#define elf_backend_relocate_section		m32r_elf_relocate_section
+#define elf_backend_gc_mark_hook                m32r_elf_gc_mark_hook
+#define elf_backend_gc_sweep_hook               m32r_elf_gc_sweep_hook
+#define elf_backend_check_relocs                m32r_elf_check_relocs
+
+#define elf_backend_create_dynamic_sections     m32r_elf_create_dynamic_sections
+#define bfd_elf32_bfd_link_hash_table_create    m32r_elf_link_hash_table_create
+#define elf_backend_size_dynamic_sections       m32r_elf_size_dynamic_sections
+#define elf_backend_omit_section_dynsym \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true)
+#define elf_backend_finish_dynamic_sections     m32r_elf_finish_dynamic_sections
+#define elf_backend_adjust_dynamic_symbol       m32r_elf_adjust_dynamic_symbol
+#define elf_backend_finish_dynamic_symbol       m32r_elf_finish_dynamic_symbol
+#define elf_backend_reloc_type_class            m32r_elf_reloc_type_class
+#define elf_backend_copy_indirect_symbol        m32r_elf_copy_indirect_symbol
+
+#define elf_backend_can_gc_sections             1
+/*#if !USE_REL
+#define elf_backend_rela_normal			1
+#endif*/
+#define elf_backend_can_refcount 1
+#define elf_backend_want_got_plt 1
+#define elf_backend_plt_readonly 1
+#define elf_backend_want_plt_sym 0
+#define elf_backend_got_header_size 12
+
+#define elf_backend_may_use_rel_p       1
+#ifdef USE_M32R_OLD_RELOC
+#define elf_backend_default_use_rela_p  0
+#define elf_backend_may_use_rela_p      0
+#else
+#define elf_backend_default_use_rela_p  1
+#define elf_backend_may_use_rela_p      1
+#endif
+
+#define elf_backend_object_p			m32r_elf_object_p
+#define elf_backend_final_write_processing 	m32r_elf_final_write_processing
+#define bfd_elf32_bfd_merge_private_bfd_data 	m32r_elf_merge_private_bfd_data
+#define bfd_elf32_bfd_set_private_flags		m32r_elf_set_private_flags
+#define bfd_elf32_bfd_print_private_bfd_data	m32r_elf_print_private_bfd_data
+#define elf_backend_special_sections		m32r_elf_special_sections
+
+#include "elf32-target.h"
+
+#undef  ELF_MAXPAGESIZE
+#define ELF_MAXPAGESIZE         0x1000
+
+#undef  TARGET_BIG_SYM
+#define TARGET_BIG_SYM          bfd_elf32_m32rlin_vec
+#undef  TARGET_BIG_NAME
+#define TARGET_BIG_NAME         "elf32-m32r-linux"
+#undef  TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM       bfd_elf32_m32rlelin_vec
+#undef  TARGET_LITTLE_NAME
+#define TARGET_LITTLE_NAME      "elf32-m32rle-linux"
+#undef  elf32_bed
+#define elf32_bed               elf32_m32r_lin_bed
+
+#include "elf32-target.h"
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-m68hc11.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-m68hc11.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-m68hc11.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-m68hc11.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1316 @@
+/* Motorola 68HC11-specific support for 32-bit ELF
+   Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2010
+   Free Software Foundation, Inc.
+   Contributed by Stephane Carrez (stcarrez@nerim.fr)
+   (Heavily copied from the D10V port by Martin Hunt (hunt@cygnus.com))
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf32-m68hc1x.h"
+#include "elf/m68hc11.h"
+#include "opcode/m68hc11.h"
+
+/* Relocation functions.  */
+static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
+  (bfd *, bfd_reloc_code_real_type);
+static void m68hc11_info_to_howto_rel
+  (bfd *, arelent *, Elf_Internal_Rela *);
+
+/* Trampoline generation.  */
+static bfd_boolean m68hc11_elf_size_one_stub
+  (struct bfd_hash_entry *gen_entry, void *in_arg);
+static bfd_boolean m68hc11_elf_build_one_stub
+  (struct bfd_hash_entry *gen_entry, void *in_arg);
+static struct bfd_link_hash_table* m68hc11_elf_bfd_link_hash_table_create
+  (bfd* abfd);
+
+/* Linker relaxation.  */
+static bfd_boolean m68hc11_elf_relax_section
+  (bfd *, asection *, struct bfd_link_info *, bfd_boolean *);
+static void m68hc11_elf_relax_delete_bytes
+  (bfd *, asection *, bfd_vma, int);
+static void m68hc11_relax_group
+  (bfd *, asection *, bfd_byte *, unsigned, unsigned long, unsigned long);
+static int compare_reloc (const void *, const void *);
+
+/* Use REL instead of RELA to save space */
+#define USE_REL	1
+
+/* The Motorola 68HC11 microcontroller only addresses 64Kb but we also
+   support a memory bank switching mechanism similar to 68HC12.
+   We must handle 8 and 16-bit relocations.  The 32-bit relocation
+   are used for debugging sections (DWARF2) to represent a virtual
+   address.
+   The 3-bit and 16-bit PC rel relocation is only used by 68HC12.  */
+static reloc_howto_type elf_m68hc11_howto_table[] = {
+  /* This reloc does nothing.  */
+  HOWTO (R_M68HC11_NONE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC11_NONE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 8 bit absolute relocation */
+  HOWTO (R_M68HC11_8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC11_8",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00ff,		/* src_mask */
+	 0x00ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 8 bit absolute relocation (upper address) */
+  HOWTO (R_M68HC11_HI8,		/* type */
+	 8,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC11_HI8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00ff,		/* src_mask */
+	 0x00ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 8 bit absolute relocation (upper address) */
+  HOWTO (R_M68HC11_LO8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC11_LO8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00ff,		/* src_mask */
+	 0x00ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 8 bit PC-rel relocation */
+  HOWTO (R_M68HC11_PCREL_8,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC11_PCREL_8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00ff,		/* src_mask */
+	 0x00ff,		/* dst_mask */
+	 TRUE),                 /* pcrel_offset */
+
+  /* A 16 bit absolute relocation */
+  HOWTO (R_M68HC11_16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont /*bitfield */ ,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC11_16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32 bit absolute relocation.  This one is never used for the
+     code relocation.  It's used by gas for -gstabs generation.  */
+  HOWTO (R_M68HC11_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC11_32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 3 bit absolute relocation */
+  HOWTO (R_M68HC11_3B,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 3,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC11_4B",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x003,			/* src_mask */
+	 0x003,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit PC-rel relocation */
+  HOWTO (R_M68HC11_PCREL_16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC11_PCREL_16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),                 /* pcrel_offset */
+
+  /* GNU extension to record C++ vtable hierarchy */
+  HOWTO (R_M68HC11_GNU_VTINHERIT,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_M68HC11_GNU_VTINHERIT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage */
+  HOWTO (R_M68HC11_GNU_VTENTRY,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 _bfd_elf_rel_vtable_reloc_fn,	/* special_function */
+	 "R_M68HC11_GNU_VTENTRY",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 24 bit relocation */
+  HOWTO (R_M68HC11_24,	        /* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC11_24",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffff,		/* src_mask */
+	 0xffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16-bit low relocation */
+  HOWTO (R_M68HC11_LO16,        /* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC11_LO16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A page relocation */
+  HOWTO (R_M68HC11_PAGE,        /* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC11_PAGE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00ff,		/* src_mask */
+	 0x00ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (14),
+  EMPTY_HOWTO (15),
+  EMPTY_HOWTO (16),
+  EMPTY_HOWTO (17),
+  EMPTY_HOWTO (18),
+  EMPTY_HOWTO (19),
+
+  /* Mark beginning of a jump instruction (any form).  */
+  HOWTO (R_M68HC11_RL_JUMP,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 m68hc11_elf_ignore_reloc,	/* special_function */
+	 "R_M68HC11_RL_JUMP",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),                 /* pcrel_offset */
+
+  /* Mark beginning of Gcc relaxation group instruction.  */
+  HOWTO (R_M68HC11_RL_GROUP,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 m68hc11_elf_ignore_reloc,	/* special_function */
+	 "R_M68HC11_RL_GROUP",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),                 /* pcrel_offset */
+};
+
+/* Map BFD reloc types to M68HC11 ELF reloc types.  */
+
+struct m68hc11_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned char elf_reloc_val;
+};
+
+static const struct m68hc11_reloc_map m68hc11_reloc_map[] = {
+  {BFD_RELOC_NONE, R_M68HC11_NONE,},
+  {BFD_RELOC_8, R_M68HC11_8},
+  {BFD_RELOC_M68HC11_HI8, R_M68HC11_HI8},
+  {BFD_RELOC_M68HC11_LO8, R_M68HC11_LO8},
+  {BFD_RELOC_8_PCREL, R_M68HC11_PCREL_8},
+  {BFD_RELOC_16_PCREL, R_M68HC11_PCREL_16},
+  {BFD_RELOC_16, R_M68HC11_16},
+  {BFD_RELOC_32, R_M68HC11_32},
+  {BFD_RELOC_M68HC11_3B, R_M68HC11_3B},
+
+  {BFD_RELOC_VTABLE_INHERIT, R_M68HC11_GNU_VTINHERIT},
+  {BFD_RELOC_VTABLE_ENTRY, R_M68HC11_GNU_VTENTRY},
+
+  {BFD_RELOC_M68HC11_LO16, R_M68HC11_LO16},
+  {BFD_RELOC_M68HC11_PAGE, R_M68HC11_PAGE},
+  {BFD_RELOC_M68HC11_24, R_M68HC11_24},
+
+  {BFD_RELOC_M68HC11_RL_JUMP, R_M68HC11_RL_JUMP},
+  {BFD_RELOC_M68HC11_RL_GROUP, R_M68HC11_RL_GROUP},
+};
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                                 bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (m68hc11_reloc_map) / sizeof (struct m68hc11_reloc_map);
+       i++)
+    {
+      if (m68hc11_reloc_map[i].bfd_reloc_val == code)
+	return &elf_m68hc11_howto_table[m68hc11_reloc_map[i].elf_reloc_val];
+    }
+
+  return NULL;
+}
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (elf_m68hc11_howto_table)
+	    / sizeof (elf_m68hc11_howto_table[0]));
+       i++)
+    if (elf_m68hc11_howto_table[i].name != NULL
+	&& strcasecmp (elf_m68hc11_howto_table[i].name, r_name) == 0)
+      return &elf_m68hc11_howto_table[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for an M68HC11 ELF reloc.  */
+
+static void
+m68hc11_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+                           arelent *cache_ptr, Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_M68HC11_max);
+  cache_ptr->howto = &elf_m68hc11_howto_table[r_type];
+}
+
+
+/* Far trampoline generation.  */
+
+/* Build a 68HC11 trampoline stub.  */
+static bfd_boolean
+m68hc11_elf_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+{
+  struct elf32_m68hc11_stub_hash_entry *stub_entry;
+  struct bfd_link_info *info;
+  struct m68hc11_elf_link_hash_table *htab;
+  asection *stub_sec;
+  bfd *stub_bfd;
+  bfd_byte *loc;
+  bfd_vma sym_value, phys_page, phys_addr;
+
+  /* Massage our args to the form they really have.  */
+  stub_entry = (struct elf32_m68hc11_stub_hash_entry *) gen_entry;
+  info = (struct bfd_link_info *) in_arg;
+
+  htab = m68hc11_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  stub_sec = stub_entry->stub_sec;
+
+  /* Make a note of the offset within the stubs for this entry.  */
+  stub_entry->stub_offset = stub_sec->size;
+  stub_sec->size += 10;
+  loc = stub_sec->contents + stub_entry->stub_offset;
+
+  stub_bfd = stub_sec->owner;
+
+  /* Create the trampoline call stub:
+
+     pshb
+     ldab #%page(symbol)
+     ldy #%addr(symbol)
+     jmp __trampoline
+
+  */
+  sym_value = (stub_entry->target_value
+               + stub_entry->target_section->output_offset
+               + stub_entry->target_section->output_section->vma);
+  phys_addr = m68hc11_phys_addr (&htab->pinfo, sym_value);
+  phys_page = m68hc11_phys_page (&htab->pinfo, sym_value);
+
+  /* pshb; ldab #%page(sym) */
+  bfd_put_8 (stub_bfd, 0x37, loc);
+  bfd_put_8 (stub_bfd, 0xC6, loc + 1);
+  bfd_put_8 (stub_bfd, phys_page, loc + 2);
+  loc += 3;
+
+  /* ldy #%addr(sym)  */
+  bfd_put_8 (stub_bfd, 0x18, loc);
+  bfd_put_8 (stub_bfd, 0xCE, loc + 1);
+  bfd_put_16 (stub_bfd, phys_addr, loc + 2);
+  loc += 4;
+
+  /* jmp __trampoline  */
+  bfd_put_8 (stub_bfd, 0x7E, loc);
+  bfd_put_16 (stub_bfd, htab->pinfo.trampoline_addr, loc + 1);
+
+  return TRUE;
+}
+
+/* As above, but don't actually build the stub.  Just bump offset so
+   we know stub section sizes.  */
+
+static bfd_boolean
+m68hc11_elf_size_one_stub (struct bfd_hash_entry *gen_entry,
+                           void *in_arg ATTRIBUTE_UNUSED)
+{
+  struct elf32_m68hc11_stub_hash_entry *stub_entry;
+
+  /* Massage our args to the form they really have.  */
+  stub_entry = (struct elf32_m68hc11_stub_hash_entry *) gen_entry;
+
+  stub_entry->stub_sec->size += 10;
+  return TRUE;
+}
+
+/* Create a 68HC11 ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+m68hc11_elf_bfd_link_hash_table_create (bfd *abfd)
+{
+  struct m68hc11_elf_link_hash_table *ret;
+
+  ret = m68hc11_elf_hash_table_create (abfd);
+  if (ret == (struct m68hc11_elf_link_hash_table *) NULL)
+    return NULL;
+
+  ret->size_one_stub = m68hc11_elf_size_one_stub;
+  ret->build_one_stub = m68hc11_elf_build_one_stub;
+
+  return &ret->root.root;
+}
+
+
+/* 68HC11 Linker Relaxation.  */
+
+struct m68hc11_direct_relax
+{
+  const char *name;
+  unsigned char code;
+  unsigned char direct_code;
+} m68hc11_direct_relax_table[] = {
+  { "adca", 0xB9, 0x99 },
+  { "adcb", 0xF9, 0xD9 },
+  { "adda", 0xBB, 0x9B },
+  { "addb", 0xFB, 0xDB },
+  { "addd", 0xF3, 0xD3 },
+  { "anda", 0xB4, 0x94 },
+  { "andb", 0xF4, 0xD4 },
+  { "cmpa", 0xB1, 0x91 },
+  { "cmpb", 0xF1, 0xD1 },
+  { "cpd",  0xB3, 0x93 },
+  { "cpxy", 0xBC, 0x9C },
+/* { "cpy",  0xBC, 0x9C }, */
+  { "eora", 0xB8, 0x98 },
+  { "eorb", 0xF8, 0xD8 },
+  { "jsr",  0xBD, 0x9D },
+  { "ldaa", 0xB6, 0x96 },
+  { "ldab", 0xF6, 0xD6 },
+  { "ldd",  0xFC, 0xDC },
+  { "lds",  0xBE, 0x9E },
+  { "ldxy", 0xFE, 0xDE },
+  /*  { "ldy",  0xFE, 0xDE },*/
+  { "oraa", 0xBA, 0x9A },
+  { "orab", 0xFA, 0xDA },
+  { "sbca", 0xB2, 0x92 },
+  { "sbcb", 0xF2, 0xD2 },
+  { "staa", 0xB7, 0x97 },
+  { "stab", 0xF7, 0xD7 },
+  { "std",  0xFD, 0xDD },
+  { "sts",  0xBF, 0x9F },
+  { "stxy", 0xFF, 0xDF },
+  /*  { "sty",  0xFF, 0xDF },*/
+  { "suba", 0xB0, 0x90 },
+  { "subb", 0xF0, 0xD0 },
+  { "subd", 0xB3, 0x93 },
+  { 0, 0, 0 }
+};
+
+static struct m68hc11_direct_relax *
+find_relaxable_insn (unsigned char code)
+{
+  int i;
+
+  for (i = 0; m68hc11_direct_relax_table[i].name; i++)
+    if (m68hc11_direct_relax_table[i].code == code)
+      return &m68hc11_direct_relax_table[i];
+
+  return 0;
+}
+
+static int
+compare_reloc (const void *e1, const void *e2)
+{
+  const Elf_Internal_Rela *i1 = (const Elf_Internal_Rela *) e1;
+  const Elf_Internal_Rela *i2 = (const Elf_Internal_Rela *) e2;
+
+  if (i1->r_offset == i2->r_offset)
+    return 0;
+  else
+    return i1->r_offset < i2->r_offset ? -1 : 1;
+}
+
+#define M6811_OP_LDX_IMMEDIATE (0xCE)
+
+static void
+m68hc11_relax_group (bfd *abfd, asection *sec, bfd_byte *contents,
+                     unsigned value, unsigned long offset,
+                     unsigned long end_group)
+{
+  unsigned char code;
+  unsigned long start_offset;
+  unsigned long ldx_offset = offset;
+  unsigned long ldx_size;
+  int can_delete_ldx;
+  int relax_ldy = 0;
+
+  /* First instruction of the relax group must be a
+     LDX #value or LDY #value.  If this is not the case,
+     ignore the relax group.  */
+  code = bfd_get_8 (abfd, contents + offset);
+  if (code == 0x18)
+    {
+      relax_ldy++;
+      offset++;
+      code = bfd_get_8 (abfd, contents + offset);
+    }
+  ldx_size = offset - ldx_offset + 3;
+  offset += 3;
+  if (code != M6811_OP_LDX_IMMEDIATE || offset >= end_group)
+    return;
+
+
+  /* We can remove the LDX/LDY only when all bset/brclr instructions
+     of the relax group have been converted to use direct addressing
+     mode.  */
+  can_delete_ldx = 1;
+  while (offset < end_group)
+    {
+      unsigned isize;
+      unsigned new_value;
+      int bset_use_y;
+
+      bset_use_y = 0;
+      start_offset = offset;
+      code = bfd_get_8 (abfd, contents + offset);
+      if (code == 0x18)
+        {
+          bset_use_y++;
+          offset++;
+          code = bfd_get_8 (abfd, contents + offset);
+        }
+
+      /* Check the instruction and translate to use direct addressing mode.  */
+      switch (code)
+        {
+          /* bset */
+        case 0x1C:
+          code = 0x14;
+          isize = 3;
+          break;
+
+          /* brclr */
+        case 0x1F:
+          code = 0x13;
+          isize = 4;
+          break;
+
+          /* brset */
+        case 0x1E:
+          code = 0x12;
+          isize = 4;
+          break;
+
+          /* bclr */
+        case 0x1D:
+          code = 0x15;
+          isize = 3;
+          break;
+
+          /* This instruction is not recognized and we are not
+             at end of the relax group.  Ignore and don't remove
+             the first LDX (we don't know what it is used for...).  */
+        default:
+          return;
+        }
+      new_value = (unsigned) bfd_get_8 (abfd, contents + offset + 1);
+      new_value += value;
+      if ((new_value & 0xff00) == 0 && bset_use_y == relax_ldy)
+        {
+          bfd_put_8 (abfd, code, contents + offset);
+          bfd_put_8 (abfd, new_value, contents + offset + 1);
+          if (start_offset != offset)
+            {
+              m68hc11_elf_relax_delete_bytes (abfd, sec, start_offset,
+                                              offset - start_offset);
+              end_group--;
+            }
+        }
+      else
+        {
+          can_delete_ldx = 0;
+        }
+      offset = start_offset + isize;
+    }
+  if (can_delete_ldx)
+    {
+      /* Remove the move instruction (3 or 4 bytes win).  */
+      m68hc11_elf_relax_delete_bytes (abfd, sec, ldx_offset, ldx_size);
+    }
+}
+
+/* This function handles relaxing for the 68HC11.
+
+
+	and somewhat more difficult to support.  */
+
+static bfd_boolean
+m68hc11_elf_relax_section (bfd *abfd, asection *sec,
+                           struct bfd_link_info *link_info, bfd_boolean *again)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *internal_relocs;
+  Elf_Internal_Rela *free_relocs = NULL;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_byte *contents = NULL;
+  bfd_byte *free_contents = NULL;
+  Elf32_External_Sym *free_extsyms = NULL;
+  Elf_Internal_Rela *prev_insn_branch = NULL;
+  Elf_Internal_Rela *prev_insn_group = NULL;
+  unsigned insn_group_value = 0;
+  Elf_Internal_Sym *isymbuf = NULL;
+
+  /* Assume nothing changes.  */
+  *again = FALSE;
+
+  /* We don't have to do anything for a relocatable link, if
+     this section does not have relocs, or if this is not a
+     code section.  */
+  if (link_info->relocatable
+      || (sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0
+      || (sec->flags & SEC_CODE) == 0)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+
+  /* Get a copy of the native relocations.  */
+  internal_relocs = (_bfd_elf_link_read_relocs
+		     (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
+		      link_info->keep_memory));
+  if (internal_relocs == NULL)
+    goto error_return;
+  if (! link_info->keep_memory)
+    free_relocs = internal_relocs;
+
+  /* Checking for branch relaxation relies on the relocations to
+     be sorted on 'r_offset'.  This is not guaranteed so we must sort.  */
+  qsort (internal_relocs, sec->reloc_count, sizeof (Elf_Internal_Rela),
+         compare_reloc);
+
+  /* Walk through them looking for relaxing opportunities.  */
+  irelend = internal_relocs + sec->reloc_count;
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      bfd_vma symval;
+      bfd_vma value;
+      Elf_Internal_Sym *isym;
+      asection *sym_sec;
+      int is_far = 0;
+
+      /* If this isn't something that can be relaxed, then ignore
+	 this reloc.  */
+      if (ELF32_R_TYPE (irel->r_info) != (int) R_M68HC11_16
+          && ELF32_R_TYPE (irel->r_info) != (int) R_M68HC11_RL_JUMP
+          && ELF32_R_TYPE (irel->r_info) != (int) R_M68HC11_RL_GROUP)
+        {
+          prev_insn_branch = 0;
+          prev_insn_group = 0;
+          continue;
+        }
+
+      /* Get the section contents if we haven't done so already.  */
+      if (contents == NULL)
+	{
+	  /* Get cached copy if it exists.  */
+	  if (elf_section_data (sec)->this_hdr.contents != NULL)
+	    contents = elf_section_data (sec)->this_hdr.contents;
+	  else
+	    {
+	      /* Go get them off disk.  */
+	      if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+		goto error_return;
+	    }
+	}
+
+      /* Try to eliminate an unconditional 8 bit pc-relative branch
+	 which immediately follows a conditional 8 bit pc-relative
+	 branch around the unconditional branch.
+
+	    original:		new:
+	    bCC lab1		bCC' lab2
+	    bra lab2
+	   lab1:	       lab1:
+
+	 This happens when the bCC can't reach lab2 at assembly time,
+	 but due to other relaxations it can reach at link time.  */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_M68HC11_RL_JUMP)
+	{
+	  Elf_Internal_Rela *nrel;
+	  unsigned char code;
+          unsigned char roffset;
+
+          prev_insn_branch = 0;
+          prev_insn_group = 0;
+
+	  /* Do nothing if this reloc is the last byte in the section.  */
+	  if (irel->r_offset + 2 >= sec->size)
+	    continue;
+
+	  /* See if the next instruction is an unconditional pc-relative
+	     branch, more often than not this test will fail, so we
+	     test it first to speed things up.  */
+	  code = bfd_get_8 (abfd, contents + irel->r_offset + 2);
+	  if (code != 0x7e)
+	    continue;
+
+	  /* Also make sure the next relocation applies to the next
+	     instruction and that it's a pc-relative 8 bit branch.  */
+	  nrel = irel + 1;
+	  if (nrel == irelend
+	      || irel->r_offset + 3 != nrel->r_offset
+	      || ELF32_R_TYPE (nrel->r_info) != (int) R_M68HC11_16)
+	    continue;
+
+	  /* Make sure our destination immediately follows the
+	     unconditional branch.  */
+          roffset = bfd_get_8 (abfd, contents + irel->r_offset + 1);
+          if (roffset != 3)
+            continue;
+
+          prev_insn_branch = irel;
+          prev_insn_group = 0;
+          continue;
+        }
+
+      /* Read this BFD's symbols if we haven't done so already.  */
+      if (isymbuf == NULL && symtab_hdr->sh_info != 0)
+	{
+	  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	  if (isymbuf == NULL)
+	    isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+					    symtab_hdr->sh_info, 0,
+					    NULL, NULL, NULL);
+	  if (isymbuf == NULL)
+	    goto error_return;
+	}
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+	{
+	  /* A local symbol.  */
+	  isym = isymbuf + ELF32_R_SYM (irel->r_info);
+          is_far = isym->st_other & STO_M68HC12_FAR;
+          sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+	  symval = (isym->st_value
+		    + sym_sec->output_section->vma
+		    + sym_sec->output_offset);
+	}
+      else
+	{
+	  unsigned long indx;
+	  struct elf_link_hash_entry *h;
+
+	  /* An external symbol.  */
+	  indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+	  h = elf_sym_hashes (abfd)[indx];
+	  BFD_ASSERT (h != NULL);
+	  if (h->root.type != bfd_link_hash_defined
+	      && h->root.type != bfd_link_hash_defweak)
+	    {
+	      /* This appears to be a reference to an undefined
+                 symbol.  Just ignore it--it will be caught by the
+                 regular reloc processing.  */
+              prev_insn_branch = 0;
+              prev_insn_group = 0;
+	      continue;
+	    }
+
+          is_far = h->other & STO_M68HC12_FAR;
+          isym = 0;
+          sym_sec = h->root.u.def.section;
+	  symval = (h->root.u.def.value
+		    + sym_sec->output_section->vma
+		    + sym_sec->output_offset);
+	}
+
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_M68HC11_RL_GROUP)
+	{
+          prev_insn_branch = 0;
+          prev_insn_group = 0;
+
+	  /* Do nothing if this reloc is the last byte in the section.  */
+	  if (irel->r_offset == sec->size)
+	    continue;
+
+          prev_insn_group = irel;
+          insn_group_value = isym->st_value;
+          continue;
+        }
+
+      /* When we relax some bytes, the size of our section changes.
+         This affects the layout of next input sections that go in our
+         output section.  When the symbol is part of another section that
+         will go in the same output section as the current one, it's
+         final address may now be incorrect (too far).  We must let the
+         linker re-compute all section offsets before processing this
+         reloc.  Code example:
+
+                                Initial             Final
+         .sect .text            section size = 6    section size = 4
+         jmp foo
+         jmp bar
+         .sect .text.foo_bar    output_offset = 6   output_offset = 4
+         foo: rts
+         bar: rts
+
+         If we process the reloc now, the jmp bar is replaced by a
+         relative branch to the initial bar address (output_offset 6).  */
+      if (*again && sym_sec != sec
+          && sym_sec->output_section == sec->output_section)
+        {
+          prev_insn_group = 0;
+          prev_insn_branch = 0;
+          continue;
+        }
+
+      value = symval;
+      /* Try to turn a far branch to a near branch.  */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_M68HC11_16
+          && prev_insn_branch)
+        {
+          bfd_vma offset;
+          unsigned char code;
+
+          offset = value - (prev_insn_branch->r_offset
+                            + sec->output_section->vma
+                            + sec->output_offset + 2);
+
+          /* If the offset is still out of -128..+127 range,
+             leave that far branch unchanged.  */
+          if ((offset & 0xff80) != 0 && (offset & 0xff80) != 0xff80)
+            {
+              prev_insn_branch = 0;
+              continue;
+            }
+
+          /* Shrink the branch.  */
+          code = bfd_get_8 (abfd, contents + prev_insn_branch->r_offset);
+          if (code == 0x7e)
+            {
+              code = 0x20;
+              bfd_put_8 (abfd, code, contents + prev_insn_branch->r_offset);
+              bfd_put_8 (abfd, 0xff,
+                         contents + prev_insn_branch->r_offset + 1);
+              irel->r_offset = prev_insn_branch->r_offset + 1;
+              irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                           R_M68HC11_PCREL_8);
+              m68hc11_elf_relax_delete_bytes (abfd, sec,
+                                              irel->r_offset + 1, 1);
+            }
+          else
+            {
+              code ^= 0x1;
+              bfd_put_8 (abfd, code, contents + prev_insn_branch->r_offset);
+              bfd_put_8 (abfd, 0xff,
+                         contents + prev_insn_branch->r_offset + 1);
+              irel->r_offset = prev_insn_branch->r_offset + 1;
+              irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                           R_M68HC11_PCREL_8);
+              m68hc11_elf_relax_delete_bytes (abfd, sec,
+                                              irel->r_offset + 1, 3);
+            }
+          prev_insn_branch = 0;
+          *again = TRUE;
+        }
+
+      /* Try to turn a 16 bit address into a 8 bit page0 address.  */
+      else if (ELF32_R_TYPE (irel->r_info) == (int) R_M68HC11_16
+               && (value & 0xff00) == 0)
+	{
+          unsigned char code;
+          unsigned short offset;
+          struct m68hc11_direct_relax *rinfo;
+
+          prev_insn_branch = 0;
+          offset = bfd_get_16 (abfd, contents + irel->r_offset);
+          offset += value;
+          if ((offset & 0xff00) != 0)
+            {
+              prev_insn_group = 0;
+              continue;
+            }
+
+          if (prev_insn_group)
+            {
+              unsigned long old_sec_size = sec->size;
+
+              /* Note that we've changed the relocation contents, etc.  */
+              elf_section_data (sec)->relocs = internal_relocs;
+              free_relocs = NULL;
+
+              elf_section_data (sec)->this_hdr.contents = contents;
+              free_contents = NULL;
+
+              symtab_hdr->contents = (bfd_byte *) isymbuf;
+              free_extsyms = NULL;
+
+              m68hc11_relax_group (abfd, sec, contents, offset,
+                                   prev_insn_group->r_offset,
+                                   insn_group_value);
+              irel = prev_insn_group;
+              prev_insn_group = 0;
+              irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                           R_M68HC11_NONE);
+              if (sec->size != old_sec_size)
+                *again = TRUE;
+              continue;
+            }
+
+          /* Get the opcode.  */
+          code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+          rinfo = find_relaxable_insn (code);
+          if (rinfo == 0)
+            {
+              prev_insn_group = 0;
+              continue;
+            }
+
+          /* Note that we've changed the relocation contents, etc.  */
+          elf_section_data (sec)->relocs = internal_relocs;
+          free_relocs = NULL;
+
+          elf_section_data (sec)->this_hdr.contents = contents;
+          free_contents = NULL;
+
+          symtab_hdr->contents = (bfd_byte *) isymbuf;
+          free_extsyms = NULL;
+
+          /* Fix the opcode.  */
+          /* printf ("A relaxable case : 0x%02x (%s)\n",
+             code, rinfo->name); */
+          bfd_put_8 (abfd, rinfo->direct_code,
+                     contents + irel->r_offset - 1);
+
+          /* Delete one byte of data (upper byte of address).  */
+          m68hc11_elf_relax_delete_bytes (abfd, sec, irel->r_offset, 1);
+
+          /* Fix the relocation's type.  */
+          irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                       R_M68HC11_8);
+
+          /* That will change things, so, we should relax again.  */
+          *again = TRUE;
+        }
+      else if (ELF32_R_TYPE (irel->r_info) == R_M68HC11_16 && !is_far)
+        {
+          unsigned char code;
+          bfd_vma offset;
+
+          prev_insn_branch = 0;
+          code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+          if (code == 0x7e || code == 0xbd)
+            {
+              offset = value - (irel->r_offset
+                                + sec->output_section->vma
+                                + sec->output_offset + 1);
+              offset += bfd_get_16 (abfd, contents + irel->r_offset);
+
+              /* If the offset is still out of -128..+127 range,
+                 leave that far branch unchanged.  */
+              if ((offset & 0xff80) == 0 || (offset & 0xff80) == 0xff80)
+                {
+
+                  /* Note that we've changed the relocation contents, etc.  */
+                  elf_section_data (sec)->relocs = internal_relocs;
+                  free_relocs = NULL;
+
+                  elf_section_data (sec)->this_hdr.contents = contents;
+                  free_contents = NULL;
+
+                  symtab_hdr->contents = (bfd_byte *) isymbuf;
+                  free_extsyms = NULL;
+
+                  /* Shrink the branch.  */
+                  code = (code == 0x7e) ? 0x20 : 0x8d;
+                  bfd_put_8 (abfd, code,
+                             contents + irel->r_offset - 1);
+                  bfd_put_8 (abfd, 0xff,
+                             contents + irel->r_offset);
+                  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                               R_M68HC11_PCREL_8);
+                  m68hc11_elf_relax_delete_bytes (abfd, sec,
+                                                  irel->r_offset + 1, 1);
+                  /* That will change things, so, we should relax again.  */
+                  *again = TRUE;
+                }
+            }
+        }
+      prev_insn_branch = 0;
+      prev_insn_group = 0;
+    }
+
+  if (free_relocs != NULL)
+    {
+      free (free_relocs);
+      free_relocs = NULL;
+    }
+
+  if (free_contents != NULL)
+    {
+      if (! link_info->keep_memory)
+	free (free_contents);
+      else
+	{
+	  /* Cache the section contents for elf_link_input_bfd.  */
+	  elf_section_data (sec)->this_hdr.contents = contents;
+	}
+      free_contents = NULL;
+    }
+
+  if (free_extsyms != NULL)
+    {
+      if (! link_info->keep_memory)
+	free (free_extsyms);
+      else
+	{
+	  /* Cache the symbols for elf_link_input_bfd.  */
+	  symtab_hdr->contents = (unsigned char *) isymbuf;
+	}
+      free_extsyms = NULL;
+    }
+
+  return TRUE;
+
+ error_return:
+  if (free_relocs != NULL)
+    free (free_relocs);
+  if (free_contents != NULL)
+    free (free_contents);
+  if (free_extsyms != NULL)
+    free (free_extsyms);
+  return FALSE;
+}
+
+/* Delete some bytes from a section while relaxing.  */
+
+static void
+m68hc11_elf_relax_delete_bytes (bfd *abfd, asection *sec,
+                                bfd_vma addr, int count)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  unsigned int sec_shndx;
+  bfd_byte *contents;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_vma toaddr;
+  Elf_Internal_Sym *isymbuf, *isym, *isymend;
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_link_hash_entry **end_hashes;
+  unsigned int symcount;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+
+  sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+  contents = elf_section_data (sec)->this_hdr.contents;
+
+  toaddr = sec->size;
+
+  irel = elf_section_data (sec)->relocs;
+  irelend = irel + sec->reloc_count;
+
+  /* Actually delete the bytes.  */
+  memmove (contents + addr, contents + addr + count,
+	   (size_t) (toaddr - addr - count));
+
+  sec->size -= count;
+
+  /* Adjust all the relocs.  */
+  for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
+    {
+      unsigned char code;
+      unsigned char offset;
+      unsigned short raddr;
+      unsigned long old_offset;
+      int branch_pos;
+
+      old_offset = irel->r_offset;
+
+      /* See if this reloc was for the bytes we have deleted, in which
+	 case we no longer care about it.  Don't delete relocs which
+	 represent addresses, though.  */
+      if (ELF32_R_TYPE (irel->r_info) != R_M68HC11_RL_JUMP
+          && irel->r_offset >= addr && irel->r_offset < addr + count)
+        irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                     R_M68HC11_NONE);
+
+      if (ELF32_R_TYPE (irel->r_info) == R_M68HC11_NONE)
+        continue;
+
+      /* Get the new reloc address.  */
+      if ((irel->r_offset > addr
+	   && irel->r_offset < toaddr))
+	irel->r_offset -= count;
+
+      /* If this is a PC relative reloc, see if the range it covers
+         includes the bytes we have deleted.  */
+      switch (ELF32_R_TYPE (irel->r_info))
+	{
+	default:
+	  break;
+
+	case R_M68HC11_RL_JUMP:
+          code = bfd_get_8 (abfd, contents + irel->r_offset);
+          switch (code)
+            {
+              /* jsr and jmp instruction are also marked with RL_JUMP
+                 relocs but no adjustment must be made.  */
+            case 0x7e:
+            case 0x9d:
+            case 0xbd:
+              continue;
+
+            case 0x12:
+            case 0x13:
+              branch_pos = 3;
+              raddr = 4;
+
+              /* Special case when we translate a brclr N,y into brclr *<addr>
+                 In this case, the 0x18 page2 prefix is removed.
+                 The reloc offset is not modified but the instruction
+                 size is reduced by 1.  */
+              if (old_offset == addr)
+                raddr++;
+              break;
+
+            case 0x1e:
+            case 0x1f:
+              branch_pos = 3;
+              raddr = 4;
+              break;
+
+            case 0x18:
+              branch_pos = 4;
+              raddr = 5;
+              break;
+
+            default:
+              branch_pos = 1;
+              raddr = 2;
+              break;
+            }
+          offset = bfd_get_8 (abfd, contents + irel->r_offset + branch_pos);
+          raddr += old_offset;
+          raddr += ((unsigned short) offset | ((offset & 0x80) ? 0xff00 : 0));
+          if (irel->r_offset < addr && raddr > addr)
+            {
+              offset -= count;
+              bfd_put_8 (abfd, offset, contents + irel->r_offset + branch_pos);
+            }
+          else if (irel->r_offset >= addr && raddr <= addr)
+            {
+              offset += count;
+              bfd_put_8 (abfd, offset, contents + irel->r_offset + branch_pos);
+            }
+          else
+            {
+              /*printf ("Not adjusted 0x%04x [0x%4x 0x%4x]\n", raddr,
+                irel->r_offset, addr);*/
+            }
+
+          break;
+	}
+    }
+
+  /* Adjust the local symbols defined in this section.  */
+  isymend = isymbuf + symtab_hdr->sh_info;
+  for (isym = isymbuf; isym < isymend; isym++)
+    {
+      if (isym->st_shndx == sec_shndx
+	  && isym->st_value > addr
+	  && isym->st_value <= toaddr)
+	isym->st_value -= count;
+    }
+
+  /* Now adjust the global symbols defined in this section.  */
+  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+	      - symtab_hdr->sh_info);
+  sym_hashes = elf_sym_hashes (abfd);
+  end_hashes = sym_hashes + symcount;
+  for (; sym_hashes < end_hashes; sym_hashes++)
+    {
+      struct elf_link_hash_entry *sym_hash = *sym_hashes;
+      if ((sym_hash->root.type == bfd_link_hash_defined
+	   || sym_hash->root.type == bfd_link_hash_defweak)
+	  && sym_hash->root.u.def.section == sec
+	  && sym_hash->root.u.def.value > addr
+	  && sym_hash->root.u.def.value <= toaddr)
+	{
+	  sym_hash->root.u.def.value -= count;
+	}
+    }
+}
+
+/* Specific sections:
+   - The .page0 is a data section that is mapped in [0x0000..0x00FF].
+     Page0 accesses are faster on the M68HC11. Soft registers used by GCC-m6811
+     are located in .page0.
+   - The .vectors is the section that represents the interrupt
+     vectors.  */
+static const struct bfd_elf_special_section elf32_m68hc11_special_sections[] =
+{
+  { STRING_COMMA_LEN (".eeprom"),   0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".page0"),    0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".softregs"), 0, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".vectors"),  0, SHT_PROGBITS, SHF_ALLOC },
+  { NULL,                       0,  0, 0,            0 }
+};
+
+#define ELF_ARCH		bfd_arch_m68hc11
+#define ELF_TARGET_ID		M68HC11_ELF_DATA
+#define ELF_MACHINE_CODE	EM_68HC11
+#define ELF_MAXPAGESIZE		0x1000
+
+#define TARGET_BIG_SYM          bfd_elf32_m68hc11_vec
+#define TARGET_BIG_NAME		"elf32-m68hc11"
+
+#define elf_info_to_howto	0
+#define elf_info_to_howto_rel	m68hc11_info_to_howto_rel
+#define bfd_elf32_bfd_relax_section  m68hc11_elf_relax_section
+#define elf_backend_check_relocs     elf32_m68hc11_check_relocs
+#define elf_backend_relocate_section elf32_m68hc11_relocate_section
+#define elf_backend_add_symbol_hook  elf32_m68hc11_add_symbol_hook
+#define elf_backend_object_p	0
+#define elf_backend_final_write_processing	0
+#define elf_backend_can_gc_sections		1
+#define elf_backend_special_sections  elf32_m68hc11_special_sections
+
+#define bfd_elf32_bfd_link_hash_table_create \
+                                m68hc11_elf_bfd_link_hash_table_create
+#define bfd_elf32_bfd_link_hash_table_free \
+				m68hc11_elf_bfd_link_hash_table_free
+#define bfd_elf32_bfd_merge_private_bfd_data \
+					_bfd_m68hc11_elf_merge_private_bfd_data
+#define bfd_elf32_bfd_set_private_flags	_bfd_m68hc11_elf_set_private_flags
+#define bfd_elf32_bfd_print_private_bfd_data \
+					_bfd_m68hc11_elf_print_private_bfd_data
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-m68hc12.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-m68hc12.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-m68hc12.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-m68hc12.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,595 @@
+/* Motorola 68HC12-specific support for 32-bit ELF
+   Copyright 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007
+   Free Software Foundation, Inc.
+   Contributed by Stephane Carrez (stcarrez@nerim.fr)
+   (Heavily copied from the D10V port by Martin Hunt (hunt@cygnus.com))
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf32-m68hc1x.h"
+#include "elf/m68hc11.h"
+#include "opcode/m68hc11.h"
+
+/* Relocation functions.  */
+static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
+  (bfd *, bfd_reloc_code_real_type);
+static void m68hc11_info_to_howto_rel
+  (bfd *, arelent *, Elf_Internal_Rela *);
+
+/* Trampoline generation.  */
+static bfd_boolean m68hc12_elf_size_one_stub
+  (struct bfd_hash_entry *gen_entry, void *in_arg);
+static bfd_boolean m68hc12_elf_build_one_stub
+  (struct bfd_hash_entry *gen_entry, void *in_arg);
+static struct bfd_link_hash_table* m68hc12_elf_bfd_link_hash_table_create
+  (bfd*);
+
+static bfd_boolean m68hc12_elf_set_mach_from_flags PARAMS ((bfd *));
+
+/* Use REL instead of RELA to save space */
+#define USE_REL	1
+
+/* The 68HC12 microcontroler has a memory bank switching system
+   with a 16Kb window in the 64Kb address space.  The extended memory
+   is mapped in the 16Kb window (at 0x8000).  The page register controls
+   which 16Kb bank is mapped.  The call/rtc instructions take care of
+   bank switching in function calls/returns.
+
+   For GNU Binutils to work, we consider there is a physical memory
+   at 0..0x0ffff and a kind of virtual memory above that.  Symbols
+   in virtual memory have their addresses treated in a special way
+   when disassembling and when linking.
+
+   For the linker to work properly, we must always relocate the virtual
+   memory as if it is mapped at 0x8000.  When a 16-bit relocation is
+   made in the virtual memory, we check that it does not cross the
+   memory bank where it is used.  This would involve a page change
+   which would be wrong.  The 24-bit relocation is for that and it
+   treats the address as a physical address + page number.
+
+
+					Banked
+					Address Space
+                                        |               |       Page n
+					+---------------+ 0x1010000
+                                        |               |
+                                        | jsr _foo      |
+                                        | ..            |       Page 3
+                                        | _foo:         |
+					+---------------+ 0x100C000
+					|	        |
+                                        | call _bar     |
+					| ..	        |	Page 2
+					| _bar:	        |
+					+---------------+ 0x1008000
+				/------>|	        |
+				|	| call _foo     |	Page 1
+				|	|       	|
+				|	+---------------+ 0x1004000
+      Physical			|	|	        |
+      Address Space		|	|	        |	Page 0
+				|	|	        |
+    +-----------+ 0x00FFFF	|	+---------------+ 0x1000000
+    |		|		|
+    | call _foo	|		|
+    |		|		|
+    +-----------+ 0x00BFFF -+---/
+    |		|           |
+    |		|	    |
+    |		| 16K	    |
+    |		|	    |
+    +-----------+ 0x008000 -+
+    |		|
+    |		|
+    =		=
+    |		|
+    |		|
+    +-----------+ 0000
+
+
+   The 'call _foo' must be relocated with page 3 and 16-bit address
+   mapped at 0x8000.
+
+   The 3-bit and 16-bit PC rel relocation is only used by 68HC12.  */
+static reloc_howto_type elf_m68hc11_howto_table[] = {
+  /* This reloc does nothing.  */
+  HOWTO (R_M68HC11_NONE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC12_NONE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 8 bit absolute relocation */
+  HOWTO (R_M68HC11_8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC12_8",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00ff,		/* src_mask */
+	 0x00ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 8 bit absolute relocation (upper address) */
+  HOWTO (R_M68HC11_HI8,		/* type */
+	 8,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC12_HI8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00ff,		/* src_mask */
+	 0x00ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 8 bit absolute relocation (upper address) */
+  HOWTO (R_M68HC11_LO8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC12_LO8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00ff,		/* src_mask */
+	 0x00ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 8 bit PC-rel relocation */
+  HOWTO (R_M68HC11_PCREL_8,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC12_PCREL_8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00ff,		/* src_mask */
+	 0x00ff,		/* dst_mask */
+	 TRUE),                 /* pcrel_offset */
+
+  /* A 16 bit absolute relocation */
+  HOWTO (R_M68HC11_16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont /*bitfield */ ,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC12_16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32 bit absolute relocation.  This one is never used for the
+     code relocation.  It's used by gas for -gstabs generation.  */
+  HOWTO (R_M68HC11_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC12_32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 3 bit absolute relocation */
+  HOWTO (R_M68HC11_3B,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 3,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC12_4B",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x003,			/* src_mask */
+	 0x003,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit PC-rel relocation */
+  HOWTO (R_M68HC11_PCREL_16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_M68HC12_PCREL_16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),                 /* pcrel_offset */
+
+  /* GNU extension to record C++ vtable hierarchy */
+  HOWTO (R_M68HC11_GNU_VTINHERIT,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_M68HC11_GNU_VTINHERIT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage */
+  HOWTO (R_M68HC11_GNU_VTENTRY,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 _bfd_elf_rel_vtable_reloc_fn,	/* special_function */
+	 "R_M68HC11_GNU_VTENTRY",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 24 bit relocation */
+  HOWTO (R_M68HC11_24,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 m68hc11_elf_special_reloc,	/* special_function */
+	 "R_M68HC12_24",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffff,		/* src_mask */
+	 0xffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16-bit low relocation */
+  HOWTO (R_M68HC11_LO16,        /* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 m68hc11_elf_special_reloc,/* special_function */
+	 "R_M68HC12_LO16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A page relocation */
+  HOWTO (R_M68HC11_PAGE,        /* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 m68hc11_elf_special_reloc,/* special_function */
+	 "R_M68HC12_PAGE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00ff,		/* src_mask */
+	 0x00ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (14),
+  EMPTY_HOWTO (15),
+  EMPTY_HOWTO (16),
+  EMPTY_HOWTO (17),
+  EMPTY_HOWTO (18),
+  EMPTY_HOWTO (19),
+
+  /* Mark beginning of a jump instruction (any form).  */
+  HOWTO (R_M68HC11_RL_JUMP,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 m68hc11_elf_ignore_reloc,	/* special_function */
+	 "R_M68HC12_RL_JUMP",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),                 /* pcrel_offset */
+
+  /* Mark beginning of Gcc relaxation group instruction.  */
+  HOWTO (R_M68HC11_RL_GROUP,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 m68hc11_elf_ignore_reloc,	/* special_function */
+	 "R_M68HC12_RL_GROUP",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),                 /* pcrel_offset */
+};
+
+/* Map BFD reloc types to M68HC11 ELF reloc types.  */
+
+struct m68hc11_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned char elf_reloc_val;
+};
+
+static const struct m68hc11_reloc_map m68hc11_reloc_map[] = {
+  {BFD_RELOC_NONE, R_M68HC11_NONE,},
+  {BFD_RELOC_8, R_M68HC11_8},
+  {BFD_RELOC_M68HC11_HI8, R_M68HC11_HI8},
+  {BFD_RELOC_M68HC11_LO8, R_M68HC11_LO8},
+  {BFD_RELOC_8_PCREL, R_M68HC11_PCREL_8},
+  {BFD_RELOC_16_PCREL, R_M68HC11_PCREL_16},
+  {BFD_RELOC_16, R_M68HC11_16},
+  {BFD_RELOC_32, R_M68HC11_32},
+  {BFD_RELOC_M68HC11_3B, R_M68HC11_3B},
+
+  {BFD_RELOC_VTABLE_INHERIT, R_M68HC11_GNU_VTINHERIT},
+  {BFD_RELOC_VTABLE_ENTRY, R_M68HC11_GNU_VTENTRY},
+
+  {BFD_RELOC_M68HC11_LO16, R_M68HC11_LO16},
+  {BFD_RELOC_M68HC11_PAGE, R_M68HC11_PAGE},
+  {BFD_RELOC_M68HC11_24, R_M68HC11_24},
+
+  {BFD_RELOC_M68HC11_RL_JUMP, R_M68HC11_RL_JUMP},
+  {BFD_RELOC_M68HC11_RL_GROUP, R_M68HC11_RL_GROUP},
+};
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                                 bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (m68hc11_reloc_map) / sizeof (struct m68hc11_reloc_map);
+       i++)
+    {
+      if (m68hc11_reloc_map[i].bfd_reloc_val == code)
+	return &elf_m68hc11_howto_table[m68hc11_reloc_map[i].elf_reloc_val];
+    }
+
+  return NULL;
+}
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (elf_m68hc11_howto_table)
+	    / sizeof (elf_m68hc11_howto_table[0]));
+       i++)
+    if (elf_m68hc11_howto_table[i].name != NULL
+	&& strcasecmp (elf_m68hc11_howto_table[i].name, r_name) == 0)
+      return &elf_m68hc11_howto_table[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for an M68HC11 ELF reloc.  */
+
+static void
+m68hc11_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+                           arelent *cache_ptr, Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_M68HC11_max);
+  cache_ptr->howto = &elf_m68hc11_howto_table[r_type];
+}
+
+
+/* Far trampoline generation.  */
+
+/* Build a 68HC12 trampoline stub.  */
+static bfd_boolean
+m68hc12_elf_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+{
+  struct elf32_m68hc11_stub_hash_entry *stub_entry;
+  struct bfd_link_info *info;
+  struct m68hc11_elf_link_hash_table *htab;
+  asection *stub_sec;
+  bfd *stub_bfd;
+  bfd_byte *loc;
+  bfd_vma sym_value, phys_page, phys_addr;
+
+  /* Massage our args to the form they really have.  */
+  stub_entry = (struct elf32_m68hc11_stub_hash_entry *) gen_entry;
+  info = (struct bfd_link_info *) in_arg;
+
+  htab = m68hc11_elf_hash_table (info);
+
+  stub_sec = stub_entry->stub_sec;
+
+  /* Make a note of the offset within the stubs for this entry.  */
+  stub_entry->stub_offset = stub_sec->size;
+  stub_sec->size += 7;
+  loc = stub_sec->contents + stub_entry->stub_offset;
+
+  stub_bfd = stub_sec->owner;
+
+  /* Create the trampoline call stub:
+
+     ldy #%addr(symbol)
+     call %page(symbol), __trampoline
+
+  */
+  sym_value = (stub_entry->target_value
+               + stub_entry->target_section->output_offset
+               + stub_entry->target_section->output_section->vma);
+  phys_addr = m68hc11_phys_addr (&htab->pinfo, sym_value);
+  phys_page = m68hc11_phys_page (&htab->pinfo, sym_value);
+
+  /* ldy #%page(sym) */
+  bfd_put_8 (stub_bfd, 0xCD, loc);
+  bfd_put_16 (stub_bfd, phys_addr, loc + 1);
+  loc += 3;
+
+  /* call %page(sym), __trampoline  */
+  bfd_put_8 (stub_bfd, 0x4a, loc);
+  bfd_put_16 (stub_bfd, htab->pinfo.trampoline_addr, loc + 1);
+  bfd_put_8 (stub_bfd, phys_page, loc + 3);
+
+  return TRUE;
+}
+
+/* As above, but don't actually build the stub.  Just bump offset so
+   we know stub section sizes.  */
+
+static bfd_boolean
+m68hc12_elf_size_one_stub (struct bfd_hash_entry *gen_entry,
+                           void *in_arg ATTRIBUTE_UNUSED)
+{
+  struct elf32_m68hc11_stub_hash_entry *stub_entry;
+
+  /* Massage our args to the form they really have.  */
+  stub_entry = (struct elf32_m68hc11_stub_hash_entry *) gen_entry;
+
+  stub_entry->stub_sec->size += 7;
+  return TRUE;
+}
+
+/* Create a 68HC12 ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+m68hc12_elf_bfd_link_hash_table_create (bfd *abfd)
+{
+  struct m68hc11_elf_link_hash_table *ret;
+
+  ret = m68hc11_elf_hash_table_create (abfd);
+  if (ret == (struct m68hc11_elf_link_hash_table *) NULL)
+    return NULL;
+
+  ret->size_one_stub = m68hc12_elf_size_one_stub;
+  ret->build_one_stub = m68hc12_elf_build_one_stub;
+
+  return &ret->root.root;
+}
+
+static bfd_boolean
+m68hc12_elf_set_mach_from_flags (bfd *abfd)
+{
+  flagword flags = elf_elfheader (abfd)->e_flags;
+
+  switch (flags & EF_M68HC11_MACH_MASK)
+    {
+    case EF_M68HC12_MACH:
+      bfd_default_set_arch_mach (abfd, bfd_arch_m68hc12, bfd_mach_m6812);
+      break;
+    case EF_M68HCS12_MACH:
+      bfd_default_set_arch_mach (abfd, bfd_arch_m68hc12, bfd_mach_m6812s);
+      break;
+    case EF_M68HC11_GENERIC:
+      bfd_default_set_arch_mach (abfd, bfd_arch_m68hc12,
+                                 bfd_mach_m6812_default);
+      break;
+    default:
+      return FALSE;
+    }
+  return TRUE;
+}
+
+/* Specific sections:
+   - The .page0 is a data section that is mapped in [0x0000..0x00FF].
+     Page0 accesses are faster on the M68HC12.
+   - The .vectors is the section that represents the interrupt
+     vectors.  */
+static const struct bfd_elf_special_section elf32_m68hc12_special_sections[] =
+{
+  { STRING_COMMA_LEN (".eeprom"),   0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".page0"),    0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".softregs"), 0, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".vectors"),  0, SHT_PROGBITS, SHF_ALLOC },
+  { NULL,                       0,  0, 0,            0 }
+};
+
+#define ELF_ARCH		bfd_arch_m68hc12
+#define ELF_TARGET_ID		M68HC11_ELF_DATA
+#define ELF_MACHINE_CODE	EM_68HC12
+#define ELF_MAXPAGESIZE		0x1000
+
+#define TARGET_BIG_SYM          bfd_elf32_m68hc12_vec
+#define TARGET_BIG_NAME		"elf32-m68hc12"
+
+#define elf_info_to_howto	0
+#define elf_info_to_howto_rel	m68hc11_info_to_howto_rel
+#define elf_backend_check_relocs     elf32_m68hc11_check_relocs
+#define elf_backend_relocate_section elf32_m68hc11_relocate_section
+#define elf_backend_object_p		m68hc12_elf_set_mach_from_flags
+#define elf_backend_final_write_processing	0
+#define elf_backend_can_gc_sections		1
+#define elf_backend_special_sections elf32_m68hc12_special_sections
+#define elf_backend_post_process_headers     elf32_m68hc11_post_process_headers
+#define elf_backend_add_symbol_hook  elf32_m68hc11_add_symbol_hook
+
+#define bfd_elf32_bfd_link_hash_table_create \
+                                m68hc12_elf_bfd_link_hash_table_create
+#define bfd_elf32_bfd_link_hash_table_free \
+				m68hc11_elf_bfd_link_hash_table_free
+#define bfd_elf32_bfd_merge_private_bfd_data \
+					_bfd_m68hc11_elf_merge_private_bfd_data
+#define bfd_elf32_bfd_set_private_flags	_bfd_m68hc11_elf_set_private_flags
+#define bfd_elf32_bfd_print_private_bfd_data \
+					_bfd_m68hc11_elf_print_private_bfd_data
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-m68hc1x.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-m68hc1x.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-m68hc1x.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-m68hc1x.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1349 @@
+/* Motorola 68HC11/HC12-specific support for 32-bit ELF
+   Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+   2009, 2010, 2011  Free Software Foundation, Inc.
+   Contributed by Stephane Carrez (stcarrez@nerim.fr)
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "alloca-conf.h"
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf32-m68hc1x.h"
+#include "elf/m68hc11.h"
+#include "opcode/m68hc11.h"
+
+
+#define m68hc12_stub_hash_lookup(table, string, create, copy) \
+  ((struct elf32_m68hc11_stub_hash_entry *) \
+   bfd_hash_lookup ((table), (string), (create), (copy)))
+
+static struct elf32_m68hc11_stub_hash_entry* m68hc12_add_stub
+  (const char *stub_name,
+   asection *section,
+   struct m68hc11_elf_link_hash_table *htab);
+
+static struct bfd_hash_entry *stub_hash_newfunc
+  (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
+
+static void m68hc11_elf_set_symbol (bfd* abfd, struct bfd_link_info *info,
+                                    const char* name, bfd_vma value,
+                                    asection* sec);
+
+static bfd_boolean m68hc11_elf_export_one_stub
+  (struct bfd_hash_entry *gen_entry, void *in_arg);
+
+static void scan_sections_for_abi (bfd*, asection*, PTR);
+
+struct m68hc11_scan_param
+{
+   struct m68hc11_page_info* pinfo;
+   bfd_boolean use_memory_banks;
+};
+
+
+/* Create a 68HC11/68HC12 ELF linker hash table.  */
+
+struct m68hc11_elf_link_hash_table*
+m68hc11_elf_hash_table_create (bfd *abfd)
+{
+  struct m68hc11_elf_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct m68hc11_elf_link_hash_table);
+
+  ret = (struct m68hc11_elf_link_hash_table *) bfd_malloc (amt);
+  if (ret == (struct m68hc11_elf_link_hash_table *) NULL)
+    return NULL;
+
+  memset (ret, 0, amt);
+  if (!_bfd_elf_link_hash_table_init (&ret->root, abfd,
+				      _bfd_elf_link_hash_newfunc,
+				      sizeof (struct elf_link_hash_entry),
+				      M68HC11_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  /* Init the stub hash table too.  */
+  amt = sizeof (struct bfd_hash_table);
+  ret->stub_hash_table = (struct bfd_hash_table*) bfd_malloc (amt);
+  if (ret->stub_hash_table == NULL)
+    {
+      free (ret);
+      return NULL;
+    }
+  if (!bfd_hash_table_init (ret->stub_hash_table, stub_hash_newfunc,
+			    sizeof (struct elf32_m68hc11_stub_hash_entry)))
+    return NULL;
+
+  ret->stub_bfd = NULL;
+  ret->stub_section = 0;
+  ret->add_stub_section = NULL;
+  ret->sym_cache.abfd = NULL;
+
+  return ret;
+}
+
+/* Free the derived linker hash table.  */
+
+void
+m68hc11_elf_bfd_link_hash_table_free (struct bfd_link_hash_table *hash)
+{
+  struct m68hc11_elf_link_hash_table *ret
+    = (struct m68hc11_elf_link_hash_table *) hash;
+
+  bfd_hash_table_free (ret->stub_hash_table);
+  free (ret->stub_hash_table);
+  _bfd_generic_link_hash_table_free (hash);
+}
+
+/* Assorted hash table functions.  */
+
+/* Initialize an entry in the stub hash table.  */
+
+static struct bfd_hash_entry *
+stub_hash_newfunc (struct bfd_hash_entry *entry, struct bfd_hash_table *table,
+                   const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table,
+				 sizeof (struct elf32_m68hc11_stub_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = bfd_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct elf32_m68hc11_stub_hash_entry *eh;
+
+      /* Initialize the local fields.  */
+      eh = (struct elf32_m68hc11_stub_hash_entry *) entry;
+      eh->stub_sec = NULL;
+      eh->stub_offset = 0;
+      eh->target_value = 0;
+      eh->target_section = NULL;
+    }
+
+  return entry;
+}
+
+/* Add a new stub entry to the stub hash.  Not all fields of the new
+   stub entry are initialised.  */
+
+static struct elf32_m68hc11_stub_hash_entry *
+m68hc12_add_stub (const char *stub_name, asection *section,
+                  struct m68hc11_elf_link_hash_table *htab)
+{
+  struct elf32_m68hc11_stub_hash_entry *stub_entry;
+
+  /* Enter this entry into the linker stub hash table.  */
+  stub_entry = m68hc12_stub_hash_lookup (htab->stub_hash_table, stub_name,
+                                         TRUE, FALSE);
+  if (stub_entry == NULL)
+    {
+      (*_bfd_error_handler) (_("%B: cannot create stub entry %s"),
+			     section->owner, stub_name);
+      return NULL;
+    }
+
+  if (htab->stub_section == 0)
+    {
+      htab->stub_section = (*htab->add_stub_section) (".tramp",
+                                                      htab->tramp_section);
+    }
+
+  stub_entry->stub_sec = htab->stub_section;
+  stub_entry->stub_offset = 0;
+  return stub_entry;
+}
+
+/* Hook called by the linker routine which adds symbols from an object
+   file.  We use it for identify far symbols and force a loading of
+   the trampoline handler.  */
+
+bfd_boolean
+elf32_m68hc11_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
+                               Elf_Internal_Sym *sym,
+                               const char **namep ATTRIBUTE_UNUSED,
+                               flagword *flagsp ATTRIBUTE_UNUSED,
+                               asection **secp ATTRIBUTE_UNUSED,
+                               bfd_vma *valp ATTRIBUTE_UNUSED)
+{
+  if (sym->st_other & STO_M68HC12_FAR)
+    {
+      struct elf_link_hash_entry *h;
+
+      h = (struct elf_link_hash_entry *)
+	bfd_link_hash_lookup (info->hash, "__far_trampoline",
+                              FALSE, FALSE, FALSE);
+      if (h == NULL)
+        {
+          struct bfd_link_hash_entry* entry = NULL;
+
+          _bfd_generic_link_add_one_symbol (info, abfd,
+                                            "__far_trampoline",
+                                            BSF_GLOBAL,
+                                            bfd_und_section_ptr,
+                                            (bfd_vma) 0, (const char*) NULL,
+                                            FALSE, FALSE, &entry);
+        }
+
+    }
+  return TRUE;
+}
+
+/* External entry points for sizing and building linker stubs.  */
+
+/* Set up various things so that we can make a list of input sections
+   for each output section included in the link.  Returns -1 on error,
+   0 when no stubs will be needed, and 1 on success.  */
+
+int
+elf32_m68hc11_setup_section_lists (bfd *output_bfd, struct bfd_link_info *info)
+{
+  bfd *input_bfd;
+  unsigned int bfd_count;
+  int top_id, top_index;
+  asection *section;
+  asection **input_list, **list;
+  bfd_size_type amt;
+  asection *text_section;
+  struct m68hc11_elf_link_hash_table *htab;
+
+  htab = m68hc11_elf_hash_table (info);
+  if (htab == NULL)
+    return -1;
+
+  if (bfd_get_flavour (info->output_bfd) != bfd_target_elf_flavour)
+    return 0;
+
+  /* Count the number of input BFDs and find the top input section id.
+     Also search for an existing ".tramp" section so that we know
+     where generated trampolines must go.  Default to ".text" if we
+     can't find it.  */
+  htab->tramp_section = 0;
+  text_section = 0;
+  for (input_bfd = info->input_bfds, bfd_count = 0, top_id = 0;
+       input_bfd != NULL;
+       input_bfd = input_bfd->link_next)
+    {
+      bfd_count += 1;
+      for (section = input_bfd->sections;
+	   section != NULL;
+	   section = section->next)
+	{
+          const char* name = bfd_get_section_name (input_bfd, section);
+
+          if (!strcmp (name, ".tramp"))
+            htab->tramp_section = section;
+
+          if (!strcmp (name, ".text"))
+            text_section = section;
+
+	  if (top_id < section->id)
+	    top_id = section->id;
+	}
+    }
+  htab->bfd_count = bfd_count;
+  if (htab->tramp_section == 0)
+    htab->tramp_section = text_section;
+
+  /* We can't use output_bfd->section_count here to find the top output
+     section index as some sections may have been removed, and
+     strip_excluded_output_sections doesn't renumber the indices.  */
+  for (section = output_bfd->sections, top_index = 0;
+       section != NULL;
+       section = section->next)
+    {
+      if (top_index < section->index)
+	top_index = section->index;
+    }
+
+  htab->top_index = top_index;
+  amt = sizeof (asection *) * (top_index + 1);
+  input_list = (asection **) bfd_malloc (amt);
+  htab->input_list = input_list;
+  if (input_list == NULL)
+    return -1;
+
+  /* For sections we aren't interested in, mark their entries with a
+     value we can check later.  */
+  list = input_list + top_index;
+  do
+    *list = bfd_abs_section_ptr;
+  while (list-- != input_list);
+
+  for (section = output_bfd->sections;
+       section != NULL;
+       section = section->next)
+    {
+      if ((section->flags & SEC_CODE) != 0)
+	input_list[section->index] = NULL;
+    }
+
+  return 1;
+}
+
+/* Determine and set the size of the stub section for a final link.
+
+   The basic idea here is to examine all the relocations looking for
+   PC-relative calls to a target that is unreachable with a "bl"
+   instruction.  */
+
+bfd_boolean
+elf32_m68hc11_size_stubs (bfd *output_bfd, bfd *stub_bfd,
+                          struct bfd_link_info *info,
+                          asection * (*add_stub_section) (const char*, asection*))
+{
+  bfd *input_bfd;
+  asection *section;
+  Elf_Internal_Sym *local_syms, **all_local_syms;
+  unsigned int bfd_indx, bfd_count;
+  bfd_size_type amt;
+  asection *stub_sec;
+  struct m68hc11_elf_link_hash_table *htab = m68hc11_elf_hash_table (info);
+
+  if (htab == NULL)
+    return FALSE;
+
+  /* Stash our params away.  */
+  htab->stub_bfd = stub_bfd;
+  htab->add_stub_section = add_stub_section;
+
+  /* Count the number of input BFDs and find the top input section id.  */
+  for (input_bfd = info->input_bfds, bfd_count = 0;
+       input_bfd != NULL;
+       input_bfd = input_bfd->link_next)
+    bfd_count += 1;
+
+  /* We want to read in symbol extension records only once.  To do this
+     we need to read in the local symbols in parallel and save them for
+     later use; so hold pointers to the local symbols in an array.  */
+  amt = sizeof (Elf_Internal_Sym *) * bfd_count;
+  all_local_syms = (Elf_Internal_Sym **) bfd_zmalloc (amt);
+  if (all_local_syms == NULL)
+    return FALSE;
+
+  /* Walk over all the input BFDs, swapping in local symbols.  */
+  for (input_bfd = info->input_bfds, bfd_indx = 0;
+       input_bfd != NULL;
+       input_bfd = input_bfd->link_next, bfd_indx++)
+    {
+      Elf_Internal_Shdr *symtab_hdr;
+
+      /* We'll need the symbol table in a second.  */
+      symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+      if (symtab_hdr->sh_info == 0)
+	continue;
+
+      /* We need an array of the local symbols attached to the input bfd.  */
+      local_syms = (Elf_Internal_Sym *) symtab_hdr->contents;
+      if (local_syms == NULL)
+	{
+	  local_syms = bfd_elf_get_elf_syms (input_bfd, symtab_hdr,
+					     symtab_hdr->sh_info, 0,
+					     NULL, NULL, NULL);
+	  /* Cache them for elf_link_input_bfd.  */
+	  symtab_hdr->contents = (unsigned char *) local_syms;
+	}
+      if (local_syms == NULL)
+        {
+          free (all_local_syms);
+	  return FALSE;
+        }
+
+      all_local_syms[bfd_indx] = local_syms;
+    }
+
+  for (input_bfd = info->input_bfds, bfd_indx = 0;
+       input_bfd != NULL;
+       input_bfd = input_bfd->link_next, bfd_indx++)
+    {
+      Elf_Internal_Shdr *symtab_hdr;
+      struct elf_link_hash_entry ** sym_hashes;
+
+      sym_hashes = elf_sym_hashes (input_bfd);
+
+      /* We'll need the symbol table in a second.  */
+      symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+      if (symtab_hdr->sh_info == 0)
+        continue;
+
+      local_syms = all_local_syms[bfd_indx];
+
+      /* Walk over each section attached to the input bfd.  */
+      for (section = input_bfd->sections;
+           section != NULL;
+           section = section->next)
+        {
+          Elf_Internal_Rela *internal_relocs, *irelaend, *irela;
+
+          /* If there aren't any relocs, then there's nothing more
+             to do.  */
+          if ((section->flags & SEC_RELOC) == 0
+              || section->reloc_count == 0)
+            continue;
+
+          /* If this section is a link-once section that will be
+             discarded, then don't create any stubs.  */
+          if (section->output_section == NULL
+              || section->output_section->owner != output_bfd)
+            continue;
+
+          /* Get the relocs.  */
+          internal_relocs
+            = _bfd_elf_link_read_relocs (input_bfd, section, NULL,
+					 (Elf_Internal_Rela *) NULL,
+					 info->keep_memory);
+          if (internal_relocs == NULL)
+            goto error_ret_free_local;
+
+          /* Now examine each relocation.  */
+          irela = internal_relocs;
+          irelaend = irela + section->reloc_count;
+          for (; irela < irelaend; irela++)
+            {
+              unsigned int r_type, r_indx;
+              struct elf32_m68hc11_stub_hash_entry *stub_entry;
+              asection *sym_sec;
+              bfd_vma sym_value;
+              struct elf_link_hash_entry *hash;
+              const char *stub_name;
+              Elf_Internal_Sym *sym;
+
+              r_type = ELF32_R_TYPE (irela->r_info);
+
+              /* Only look at 16-bit relocs.  */
+              if (r_type != (unsigned int) R_M68HC11_16)
+                continue;
+
+              /* Now determine the call target, its name, value,
+                 section.  */
+              r_indx = ELF32_R_SYM (irela->r_info);
+              if (r_indx < symtab_hdr->sh_info)
+                {
+                  /* It's a local symbol.  */
+                  Elf_Internal_Shdr *hdr;
+                  bfd_boolean is_far;
+
+                  sym = local_syms + r_indx;
+                  is_far = (sym && (sym->st_other & STO_M68HC12_FAR));
+                  if (!is_far)
+                    continue;
+
+		  if (sym->st_shndx >= elf_numsections (input_bfd))
+		    sym_sec = NULL;
+		  else
+		    {
+		      hdr = elf_elfsections (input_bfd)[sym->st_shndx];
+		      sym_sec = hdr->bfd_section;
+		    }
+                  stub_name = (bfd_elf_string_from_elf_section
+                               (input_bfd, symtab_hdr->sh_link,
+                                sym->st_name));
+                  sym_value = sym->st_value;
+                  hash = NULL;
+                }
+              else
+                {
+                  /* It's an external symbol.  */
+                  int e_indx;
+
+                  e_indx = r_indx - symtab_hdr->sh_info;
+                  hash = (struct elf_link_hash_entry *)
+                    (sym_hashes[e_indx]);
+
+                  while (hash->root.type == bfd_link_hash_indirect
+                         || hash->root.type == bfd_link_hash_warning)
+                    hash = ((struct elf_link_hash_entry *)
+                            hash->root.u.i.link);
+
+                  if (hash->root.type == bfd_link_hash_defined
+                      || hash->root.type == bfd_link_hash_defweak
+                      || hash->root.type == bfd_link_hash_new)
+                    {
+                      if (!(hash->other & STO_M68HC12_FAR))
+                        continue;
+                    }
+                  else if (hash->root.type == bfd_link_hash_undefweak)
+                    {
+                      continue;
+                    }
+                  else if (hash->root.type == bfd_link_hash_undefined)
+                    {
+                      continue;
+                    }
+                  else
+                    {
+                      bfd_set_error (bfd_error_bad_value);
+                      goto error_ret_free_internal;
+                    }
+                  sym_sec = hash->root.u.def.section;
+                  sym_value = hash->root.u.def.value;
+                  stub_name = hash->root.root.string;
+                }
+
+              if (!stub_name)
+                goto error_ret_free_internal;
+
+              stub_entry = m68hc12_stub_hash_lookup
+                (htab->stub_hash_table,
+                 stub_name,
+                 FALSE, FALSE);
+              if (stub_entry == NULL)
+                {
+                  if (add_stub_section == 0)
+                    continue;
+
+                  stub_entry = m68hc12_add_stub (stub_name, section, htab);
+                  if (stub_entry == NULL)
+                    {
+                    error_ret_free_internal:
+                      if (elf_section_data (section)->relocs == NULL)
+                        free (internal_relocs);
+                      goto error_ret_free_local;
+                    }
+                }
+
+              stub_entry->target_value = sym_value;
+              stub_entry->target_section = sym_sec;
+            }
+
+          /* We're done with the internal relocs, free them.  */
+          if (elf_section_data (section)->relocs == NULL)
+            free (internal_relocs);
+        }
+    }
+
+  if (add_stub_section)
+    {
+      /* OK, we've added some stubs.  Find out the new size of the
+         stub sections.  */
+      for (stub_sec = htab->stub_bfd->sections;
+           stub_sec != NULL;
+           stub_sec = stub_sec->next)
+        {
+          stub_sec->size = 0;
+        }
+
+      bfd_hash_traverse (htab->stub_hash_table, htab->size_one_stub, htab);
+    }
+  free (all_local_syms);
+  return TRUE;
+
+ error_ret_free_local:
+  free (all_local_syms);
+  return FALSE;
+}
+
+/* Export the trampoline addresses in the symbol table.  */
+static bfd_boolean
+m68hc11_elf_export_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+{
+  struct bfd_link_info *info;
+  struct m68hc11_elf_link_hash_table *htab;
+  struct elf32_m68hc11_stub_hash_entry *stub_entry;
+  char* name;
+  bfd_boolean result;
+
+  info = (struct bfd_link_info *) in_arg;
+  htab = m68hc11_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* Massage our args to the form they really have.  */
+  stub_entry = (struct elf32_m68hc11_stub_hash_entry *) gen_entry;
+
+  /* Generate the trampoline according to HC11 or HC12.  */
+  result = (* htab->build_one_stub) (gen_entry, in_arg);
+
+  /* Make a printable name that does not conflict with the real function.  */
+  name = alloca (strlen (stub_entry->root.string) + 16);
+  sprintf (name, "tramp.%s", stub_entry->root.string);
+
+  /* Export the symbol for debugging/disassembling.  */
+  m68hc11_elf_set_symbol (htab->stub_bfd, info, name,
+                          stub_entry->stub_offset,
+                          stub_entry->stub_sec);
+  return result;
+}
+
+/* Export a symbol or set its value and section.  */
+static void
+m68hc11_elf_set_symbol (bfd *abfd, struct bfd_link_info *info,
+                        const char *name, bfd_vma value, asection *sec)
+{
+  struct elf_link_hash_entry *h;
+
+  h = (struct elf_link_hash_entry *)
+    bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, FALSE);
+  if (h == NULL)
+    {
+      _bfd_generic_link_add_one_symbol (info, abfd,
+                                        name,
+                                        BSF_GLOBAL,
+                                        sec,
+                                        value,
+                                        (const char*) NULL,
+                                        TRUE, FALSE, NULL);
+    }
+  else
+    {
+      h->root.type = bfd_link_hash_defined;
+      h->root.u.def.value = value;
+      h->root.u.def.section = sec;
+    }
+}
+
+
+/* Build all the stubs associated with the current output file.  The
+   stubs are kept in a hash table attached to the main linker hash
+   table.  This function is called via m68hc12elf_finish in the
+   linker.  */
+
+bfd_boolean
+elf32_m68hc11_build_stubs (bfd *abfd, struct bfd_link_info *info)
+{
+  asection *stub_sec;
+  struct bfd_hash_table *table;
+  struct m68hc11_elf_link_hash_table *htab;
+  struct m68hc11_scan_param param;
+
+  m68hc11_elf_get_bank_parameters (info);
+  htab = m68hc11_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  for (stub_sec = htab->stub_bfd->sections;
+       stub_sec != NULL;
+       stub_sec = stub_sec->next)
+    {
+      bfd_size_type size;
+
+      /* Allocate memory to hold the linker stubs.  */
+      size = stub_sec->size;
+      stub_sec->contents = (unsigned char *) bfd_zalloc (htab->stub_bfd, size);
+      if (stub_sec->contents == NULL && size != 0)
+	return FALSE;
+      stub_sec->size = 0;
+    }
+
+  /* Build the stubs as directed by the stub hash table.  */
+  table = htab->stub_hash_table;
+  bfd_hash_traverse (table, m68hc11_elf_export_one_stub, info);
+  
+  /* Scan the output sections to see if we use the memory banks.
+     If so, export the symbols that define how the memory banks
+     are mapped.  This is used by gdb and the simulator to obtain
+     the information.  It can be used by programs to burn the eprom
+     at the good addresses.  */
+  param.use_memory_banks = FALSE;
+  param.pinfo = &htab->pinfo;
+  bfd_map_over_sections (abfd, scan_sections_for_abi, &param);
+  if (param.use_memory_banks)
+    {
+      m68hc11_elf_set_symbol (abfd, info, BFD_M68HC11_BANK_START_NAME,
+                              htab->pinfo.bank_physical,
+                              bfd_abs_section_ptr);
+      m68hc11_elf_set_symbol (abfd, info, BFD_M68HC11_BANK_VIRTUAL_NAME,
+                              htab->pinfo.bank_virtual,
+                              bfd_abs_section_ptr);
+      m68hc11_elf_set_symbol (abfd, info, BFD_M68HC11_BANK_SIZE_NAME,
+                              htab->pinfo.bank_size,
+                              bfd_abs_section_ptr);
+    }
+
+  return TRUE;
+}
+
+void
+m68hc11_elf_get_bank_parameters (struct bfd_link_info *info)
+{
+  unsigned i;
+  struct m68hc11_page_info *pinfo;
+  struct bfd_link_hash_entry *h;
+  struct m68hc11_elf_link_hash_table *htab;
+
+  htab = m68hc11_elf_hash_table (info);
+  if (htab == NULL)
+    return;
+
+  pinfo = & htab->pinfo;
+  if (pinfo->bank_param_initialized)
+    return;
+
+  pinfo->bank_virtual = M68HC12_BANK_VIRT;
+  pinfo->bank_mask = M68HC12_BANK_MASK;
+  pinfo->bank_physical = M68HC12_BANK_BASE;
+  pinfo->bank_shift = M68HC12_BANK_SHIFT;
+  pinfo->bank_size = 1 << M68HC12_BANK_SHIFT;
+
+  h = bfd_link_hash_lookup (info->hash, BFD_M68HC11_BANK_START_NAME,
+                            FALSE, FALSE, TRUE);
+  if (h != (struct bfd_link_hash_entry*) NULL
+      && h->type == bfd_link_hash_defined)
+    pinfo->bank_physical = (h->u.def.value
+                            + h->u.def.section->output_section->vma
+                            + h->u.def.section->output_offset);
+
+  h = bfd_link_hash_lookup (info->hash, BFD_M68HC11_BANK_VIRTUAL_NAME,
+                            FALSE, FALSE, TRUE);
+  if (h != (struct bfd_link_hash_entry*) NULL
+      && h->type == bfd_link_hash_defined)
+    pinfo->bank_virtual = (h->u.def.value
+                           + h->u.def.section->output_section->vma
+                           + h->u.def.section->output_offset);
+
+  h = bfd_link_hash_lookup (info->hash, BFD_M68HC11_BANK_SIZE_NAME,
+                            FALSE, FALSE, TRUE);
+  if (h != (struct bfd_link_hash_entry*) NULL
+      && h->type == bfd_link_hash_defined)
+    pinfo->bank_size = (h->u.def.value
+                        + h->u.def.section->output_section->vma
+                        + h->u.def.section->output_offset);
+
+  pinfo->bank_shift = 0;
+  for (i = pinfo->bank_size; i != 0; i >>= 1)
+    pinfo->bank_shift++;
+  pinfo->bank_shift--;
+  pinfo->bank_mask = (1 << pinfo->bank_shift) - 1;
+  pinfo->bank_physical_end = pinfo->bank_physical + pinfo->bank_size;
+  pinfo->bank_param_initialized = 1;
+
+  h = bfd_link_hash_lookup (info->hash, "__far_trampoline", FALSE,
+                            FALSE, TRUE);
+  if (h != (struct bfd_link_hash_entry*) NULL
+      && h->type == bfd_link_hash_defined)
+    pinfo->trampoline_addr = (h->u.def.value
+                              + h->u.def.section->output_section->vma
+                              + h->u.def.section->output_offset);
+}
+
+/* Return 1 if the address is in banked memory.
+   This can be applied to a virtual address and to a physical address.  */
+int
+m68hc11_addr_is_banked (struct m68hc11_page_info *pinfo, bfd_vma addr)
+{
+  if (addr >= pinfo->bank_virtual)
+    return 1;
+
+  if (addr >= pinfo->bank_physical && addr <= pinfo->bank_physical_end)
+    return 1;
+
+  return 0;
+}
+
+/* Return the physical address seen by the processor, taking
+   into account banked memory.  */
+bfd_vma
+m68hc11_phys_addr (struct m68hc11_page_info *pinfo, bfd_vma addr)
+{
+  if (addr < pinfo->bank_virtual)
+    return addr;
+
+  /* Map the address to the memory bank.  */
+  addr -= pinfo->bank_virtual;
+  addr &= pinfo->bank_mask;
+  addr += pinfo->bank_physical;
+  return addr;
+}
+
+/* Return the page number corresponding to an address in banked memory.  */
+bfd_vma
+m68hc11_phys_page (struct m68hc11_page_info *pinfo, bfd_vma addr)
+{
+  if (addr < pinfo->bank_virtual)
+    return 0;
+
+  /* Map the address to the memory bank.  */
+  addr -= pinfo->bank_virtual;
+  addr >>= pinfo->bank_shift;
+  addr &= 0x0ff;
+  return addr;
+}
+
+/* This function is used for relocs which are only used for relaxing,
+   which the linker should otherwise ignore.  */
+
+bfd_reloc_status_type
+m68hc11_elf_ignore_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+                          arelent *reloc_entry,
+                          asymbol *symbol ATTRIBUTE_UNUSED,
+                          void *data ATTRIBUTE_UNUSED,
+                          asection *input_section,
+                          bfd *output_bfd,
+                          char **error_message ATTRIBUTE_UNUSED)
+{
+  if (output_bfd != NULL)
+    reloc_entry->address += input_section->output_offset;
+  return bfd_reloc_ok;
+}
+
+bfd_reloc_status_type
+m68hc11_elf_special_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+                           arelent *reloc_entry,
+                           asymbol *symbol,
+                           void *data ATTRIBUTE_UNUSED,
+                           asection *input_section,
+                           bfd *output_bfd,
+                           char **error_message ATTRIBUTE_UNUSED)
+{
+  if (output_bfd != (bfd *) NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (! reloc_entry->howto->partial_inplace
+	  || reloc_entry->addend == 0))
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  if (output_bfd != NULL)
+    return bfd_reloc_continue;
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  abort();
+}
+
+/* Look through the relocs for a section during the first phase.
+   Since we don't do .gots or .plts, we just need to consider the
+   virtual table relocs for gc.  */
+
+bfd_boolean
+elf32_m68hc11_check_relocs (bfd *abfd, struct bfd_link_info *info,
+                            asection *sec, const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *           symtab_hdr;
+  struct elf_link_hash_entry ** sym_hashes;
+  const Elf_Internal_Rela *     rel;
+  const Elf_Internal_Rela *     rel_end;
+
+  if (info->relocatable)
+    return TRUE;
+
+  symtab_hdr = & elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  rel_end = relocs + sec->reloc_count;
+
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      struct elf_link_hash_entry * h;
+      unsigned long r_symndx;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      if (r_symndx < symtab_hdr->sh_info)
+        h = NULL;
+      else
+	{
+	  h = sym_hashes [r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      switch (ELF32_R_TYPE (rel->r_info))
+        {
+        /* This relocation describes the C++ object vtable hierarchy.
+           Reconstruct it for later use during GC.  */
+        case R_M68HC11_GNU_VTINHERIT:
+          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+
+        /* This relocation describes which C++ vtable entries are actually
+           used.  Record for later use during GC.  */
+        case R_M68HC11_GNU_VTENTRY:
+          BFD_ASSERT (h != NULL);
+          if (h != NULL
+              && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+            return FALSE;
+          break;
+        }
+    }
+
+  return TRUE;
+}
+
+/* Relocate a 68hc11/68hc12 ELF section.  */
+bfd_boolean
+elf32_m68hc11_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
+                                struct bfd_link_info *info,
+                                bfd *input_bfd, asection *input_section,
+                                bfd_byte *contents, Elf_Internal_Rela *relocs,
+                                Elf_Internal_Sym *local_syms,
+                                asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel, *relend;
+  const char *name = NULL;
+  struct m68hc11_page_info *pinfo;
+  const struct elf_backend_data * const ebd = get_elf_backend_data (input_bfd);
+  struct m68hc11_elf_link_hash_table *htab;
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+
+  htab = m68hc11_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* Get memory bank parameters.  */
+  m68hc11_elf_get_bank_parameters (info);
+
+  pinfo = & htab->pinfo;
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+
+  for (; rel < relend; rel++)
+    {
+      int r_type;
+      arelent arel;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      bfd_vma relocation = 0;
+      bfd_reloc_status_type r = bfd_reloc_undefined;
+      bfd_vma phys_page;
+      bfd_vma phys_addr;
+      bfd_vma insn_addr;
+      bfd_vma insn_page;
+      bfd_boolean is_far = FALSE;
+      struct elf_link_hash_entry *h;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      if (r_type == R_M68HC11_GNU_VTENTRY
+          || r_type == R_M68HC11_GNU_VTINHERIT )
+        continue;
+
+      (*ebd->elf_info_to_howto_rel) (input_bfd, &arel, rel);
+      howto = arel.howto;
+
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = (sec->output_section->vma
+			+ sec->output_offset
+			+ sym->st_value);
+	  is_far = (sym && (sym->st_other & STO_M68HC12_FAR));
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc, warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation, unresolved_reloc,
+				   warned);
+
+	  is_far = (h && (h->other & STO_M68HC12_FAR));
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	{
+	  /* This is a relocatable link.  We don't have to change
+	     anything, unless the reloc is against a section symbol,
+	     in which case we have to adjust according to where the
+	     section symbol winds up in the output section.  */
+	  if (sym != NULL && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+	    rel->r_addend += sec->output_offset;
+	  continue;
+	}
+
+      if (h != NULL)
+	name = h->root.root.string;
+      else
+	{
+	  name = (bfd_elf_string_from_elf_section
+		  (input_bfd, symtab_hdr->sh_link, sym->st_name));
+	  if (name == NULL || *name == '\0')
+	    name = bfd_section_name (input_bfd, sec);
+	}
+
+      if (is_far && ELF32_R_TYPE (rel->r_info) == R_M68HC11_16)
+	{
+	  struct elf32_m68hc11_stub_hash_entry* stub;
+
+	  stub = m68hc12_stub_hash_lookup (htab->stub_hash_table,
+					   name, FALSE, FALSE);
+	  if (stub)
+	    {
+	      relocation = stub->stub_offset
+		+ stub->stub_sec->output_section->vma
+		+ stub->stub_sec->output_offset;
+	      is_far = FALSE;
+	    }
+	}
+
+      /* Do the memory bank mapping.  */
+      phys_addr = m68hc11_phys_addr (pinfo, relocation + rel->r_addend);
+      phys_page = m68hc11_phys_page (pinfo, relocation + rel->r_addend);
+      switch (r_type)
+        {
+        case R_M68HC11_24:
+          /* Reloc used by 68HC12 call instruction.  */
+          bfd_put_16 (input_bfd, phys_addr,
+                      (bfd_byte*) contents + rel->r_offset);
+          bfd_put_8 (input_bfd, phys_page,
+                     (bfd_byte*) contents + rel->r_offset + 2);
+          r = bfd_reloc_ok;
+          r_type = R_M68HC11_NONE;
+          break;
+
+        case R_M68HC11_NONE:
+          r = bfd_reloc_ok;
+          break;
+
+        case R_M68HC11_LO16:
+          /* Reloc generated by %addr(expr) gas to obtain the
+             address as mapped in the memory bank window.  */
+          relocation = phys_addr;
+          break;
+
+        case R_M68HC11_PAGE:
+          /* Reloc generated by %page(expr) gas to obtain the
+             page number associated with the address.  */
+          relocation = phys_page;
+          break;
+
+        case R_M68HC11_16:
+          /* Get virtual address of instruction having the relocation.  */
+          if (is_far)
+            {
+              const char* msg;
+              char* buf;
+              msg = _("Reference to the far symbol `%s' using a wrong "
+                      "relocation may result in incorrect execution");
+              buf = alloca (strlen (msg) + strlen (name) + 10);
+              sprintf (buf, msg, name);
+              
+              (* info->callbacks->warning)
+                (info, buf, name, input_bfd, NULL, rel->r_offset);
+            }
+
+          /* Get virtual address of instruction having the relocation.  */
+          insn_addr = input_section->output_section->vma
+            + input_section->output_offset
+            + rel->r_offset;
+
+          insn_page = m68hc11_phys_page (pinfo, insn_addr);
+
+          if (m68hc11_addr_is_banked (pinfo, relocation + rel->r_addend)
+              && m68hc11_addr_is_banked (pinfo, insn_addr)
+              && phys_page != insn_page)
+            {
+              const char* msg;
+              char* buf;
+
+              msg = _("banked address [%lx:%04lx] (%lx) is not in the same bank "
+                      "as current banked address [%lx:%04lx] (%lx)");
+
+              buf = alloca (strlen (msg) + 128);
+              sprintf (buf, msg, phys_page, phys_addr,
+                       (long) (relocation + rel->r_addend),
+                       insn_page, m68hc11_phys_addr (pinfo, insn_addr),
+                       (long) (insn_addr));
+              if (!((*info->callbacks->warning)
+                    (info, buf, name, input_bfd, input_section,
+                     rel->r_offset)))
+                return FALSE;
+              break;
+            }
+          if (phys_page != 0 && insn_page == 0)
+            {
+              const char* msg;
+              char* buf;
+
+              msg = _("reference to a banked address [%lx:%04lx] in the "
+                      "normal address space at %04lx");
+
+              buf = alloca (strlen (msg) + 128);
+              sprintf (buf, msg, phys_page, phys_addr, insn_addr);
+              if (!((*info->callbacks->warning)
+                    (info, buf, name, input_bfd, input_section,
+                     insn_addr)))
+                return FALSE;
+
+              relocation = phys_addr;
+              break;
+            }
+
+          /* If this is a banked address use the phys_addr so that
+             we stay in the banked window.  */
+          if (m68hc11_addr_is_banked (pinfo, relocation + rel->r_addend))
+            relocation = phys_addr;
+          break;
+        }
+      if (r_type != R_M68HC11_NONE)
+        r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+                                      contents, rel->r_offset,
+                                      relocation, rel->r_addend);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char * msg = (const char *) 0;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      if (!((*info->callbacks->reloc_overflow)
+		    (info, NULL, name, howto->name, (bfd_vma) 0,
+		     input_bfd, input_section, rel->r_offset)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_undefined:
+	      if (!((*info->callbacks->undefined_symbol)
+		    (info, name, input_bfd, input_section,
+		     rel->r_offset, TRUE)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _ ("internal error: out of range error");
+	      goto common_error;
+
+	    case bfd_reloc_notsupported:
+	      msg = _ ("internal error: unsupported relocation error");
+	      goto common_error;
+
+	    case bfd_reloc_dangerous:
+	      msg = _ ("internal error: dangerous error");
+	      goto common_error;
+
+	    default:
+	      msg = _ ("internal error: unknown error");
+	      /* fall through */
+
+	    common_error:
+	      if (!((*info->callbacks->warning)
+		    (info, msg, name, input_bfd, input_section,
+		     rel->r_offset)))
+		return FALSE;
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+
+
+/* Set and control ELF flags in ELF header.  */
+
+bfd_boolean
+_bfd_m68hc11_elf_set_private_flags (bfd *abfd, flagword flags)
+{
+  BFD_ASSERT (!elf_flags_init (abfd)
+	      || elf_elfheader (abfd)->e_flags == flags);
+
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+
+bfd_boolean
+_bfd_m68hc11_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  flagword old_flags;
+  flagword new_flags;
+  bfd_boolean ok = TRUE;
+
+  /* Check if we have the same endianness */
+  if (!_bfd_generic_verify_endian_match (ibfd, obfd))
+    return FALSE;
+
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  new_flags = elf_elfheader (ibfd)->e_flags;
+  elf_elfheader (obfd)->e_flags |= new_flags & EF_M68HC11_ABI;
+  old_flags = elf_elfheader (obfd)->e_flags;
+
+  if (! elf_flags_init (obfd))
+    {
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = new_flags;
+      elf_elfheader (obfd)->e_ident[EI_CLASS]
+	= elf_elfheader (ibfd)->e_ident[EI_CLASS];
+
+      if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
+	  && bfd_get_arch_info (obfd)->the_default)
+	{
+	  if (! bfd_set_arch_mach (obfd, bfd_get_arch (ibfd),
+				   bfd_get_mach (ibfd)))
+	    return FALSE;
+	}
+
+      return TRUE;
+    }
+
+  /* Check ABI compatibility.  */
+  if ((new_flags & E_M68HC11_I32) != (old_flags & E_M68HC11_I32))
+    {
+      (*_bfd_error_handler)
+	(_("%B: linking files compiled for 16-bit integers (-mshort) "
+           "and others for 32-bit integers"), ibfd);
+      ok = FALSE;
+    }
+  if ((new_flags & E_M68HC11_F64) != (old_flags & E_M68HC11_F64))
+    {
+      (*_bfd_error_handler)
+	(_("%B: linking files compiled for 32-bit double (-fshort-double) "
+           "and others for 64-bit double"), ibfd);
+      ok = FALSE;
+    }
+
+  /* Processor compatibility.  */
+  if (!EF_M68HC11_CAN_MERGE_MACH (new_flags, old_flags))
+    {
+      (*_bfd_error_handler)
+	(_("%B: linking files compiled for HCS12 with "
+           "others compiled for HC12"), ibfd);
+      ok = FALSE;
+    }
+  new_flags = ((new_flags & ~EF_M68HC11_MACH_MASK)
+               | (EF_M68HC11_MERGE_MACH (new_flags, old_flags)));
+
+  elf_elfheader (obfd)->e_flags = new_flags;
+
+  new_flags &= ~(EF_M68HC11_ABI | EF_M68HC11_MACH_MASK);
+  old_flags &= ~(EF_M68HC11_ABI | EF_M68HC11_MACH_MASK);
+
+  /* Warn about any other mismatches */
+  if (new_flags != old_flags)
+    {
+      (*_bfd_error_handler)
+	(_("%B: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"),
+	 ibfd, (unsigned long) new_flags, (unsigned long) old_flags);
+      ok = FALSE;
+    }
+
+  if (! ok)
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+bfd_boolean
+_bfd_m68hc11_elf_print_private_bfd_data (bfd *abfd, void *ptr)
+{
+  FILE *file = (FILE *) ptr;
+
+  BFD_ASSERT (abfd != NULL && ptr != NULL);
+
+  /* Print normal ELF private data.  */
+  _bfd_elf_print_private_bfd_data (abfd, ptr);
+
+  /* xgettext:c-format */
+  fprintf (file, _("private flags = %lx:"), elf_elfheader (abfd)->e_flags);
+
+  if (elf_elfheader (abfd)->e_flags & E_M68HC11_I32)
+    fprintf (file, _("[abi=32-bit int, "));
+  else
+    fprintf (file, _("[abi=16-bit int, "));
+
+  if (elf_elfheader (abfd)->e_flags & E_M68HC11_F64)
+    fprintf (file, _("64-bit double, "));
+  else
+    fprintf (file, _("32-bit double, "));
+
+  if (strcmp (bfd_get_target (abfd), "elf32-m68hc11") == 0)
+    fprintf (file, _("cpu=HC11]"));
+  else if (elf_elfheader (abfd)->e_flags & EF_M68HCS12_MACH)
+    fprintf (file, _("cpu=HCS12]"));
+  else
+    fprintf (file, _("cpu=HC12]"));    
+
+  if (elf_elfheader (abfd)->e_flags & E_M68HC12_BANKS)
+    fprintf (file, _(" [memory=bank-model]"));
+  else
+    fprintf (file, _(" [memory=flat]"));
+
+  fputc ('\n', file);
+
+  return TRUE;
+}
+
+static void scan_sections_for_abi (bfd *abfd ATTRIBUTE_UNUSED,
+                                   asection *asect, void *arg)
+{
+  struct m68hc11_scan_param* p = (struct m68hc11_scan_param*) arg;
+
+  if (asect->vma >= p->pinfo->bank_virtual)
+    p->use_memory_banks = TRUE;
+}
+  
+/* Tweak the OSABI field of the elf header.  */
+
+void
+elf32_m68hc11_post_process_headers (bfd *abfd, struct bfd_link_info *link_info)
+{
+  struct m68hc11_scan_param param;
+  struct m68hc11_elf_link_hash_table *htab;
+
+  if (link_info == NULL)
+    return;
+
+  htab = m68hc11_elf_hash_table (link_info);
+  if (htab == NULL)
+    return;
+
+  m68hc11_elf_get_bank_parameters (link_info);
+
+  param.use_memory_banks = FALSE;
+  param.pinfo = & htab->pinfo;
+
+  bfd_map_over_sections (abfd, scan_sections_for_abi, &param);
+
+  if (param.use_memory_banks)
+    {
+      Elf_Internal_Ehdr * i_ehdrp;
+
+      i_ehdrp = elf_elfheader (abfd);
+      i_ehdrp->e_flags |= E_M68HC12_BANKS;
+    }
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-m68hc1x.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-m68hc1x.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-m68hc1x.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-m68hc1x.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,190 @@
+/* Motorola 68HC11/68HC12-specific support for 32-bit ELF
+   Copyright 2003, 2004, 2005, 2006, 2007, 2009, 2010
+   Free Software Foundation, Inc.
+   Contributed by Stephane Carrez (stcarrez@nerim.fr)
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _ELF32_M68HC1X_H
+#define _ELF32_M68HC1X_H
+
+#include "elf-bfd.h"
+#include "bfdlink.h"
+#include "elf/m68hc11.h"
+
+/* Name of symbols exported by HC11/HC12 linker when there is a memory
+   bank window.  */
+#define BFD_M68HC11_BANK_START_NAME   "__bank_start"
+#define BFD_M68HC11_BANK_SIZE_NAME    "__bank_size"
+#define BFD_M68HC11_BANK_VIRTUAL_NAME "__bank_virtual"
+
+/* Set and control ELF flags in ELF header.  */
+extern bfd_boolean _bfd_m68hc11_elf_merge_private_bfd_data (bfd*,bfd*);
+extern bfd_boolean _bfd_m68hc11_elf_set_private_flags (bfd*,flagword);
+extern bfd_boolean _bfd_m68hc11_elf_print_private_bfd_data (bfd*, void*);
+
+/* This hash entry is used to record a trampoline that must be generated
+   to call a far function using a normal calling convention ('jsr').
+   The trampoline is used when a pointer to a far function is used.
+   It takes care of installing the proper memory bank as well as creating
+   the 'call/rtc' calling convention.  */
+struct elf32_m68hc11_stub_hash_entry
+{
+  /* Base hash table entry structure.  */
+  struct bfd_hash_entry root;
+
+  /* The stub section.  */
+  asection *stub_sec;
+
+  /* Offset within stub_sec of the beginning of this stub.  */
+  bfd_vma stub_offset;
+
+  /* Given the symbol's value and its section we can determine its final
+     value when building the stubs (so the stub knows where to jump.  */
+  bfd_vma target_value;
+  asection *target_section;
+};
+
+/* Placeholder for the parameters to compute memory page and physical address.
+   The following formulas are used:
+
+   sym > bank_virtual =>
+     %addr(sym) = (((sym - bank_virtual) & bank_mask) + bank_physical
+     %page(sym) = (((sym - bank_virtual) >> bank_shift) % 256
+
+   sym < bank_virtual =>
+     %addr(sym) = sym
+     %page(sym) = 0
+
+
+   These parameters are obtained from the symbol table by looking
+   at the following:
+
+   __bank_start         Symbol marking the start of memory bank window
+                        (bank_physical)
+   __bank_virtual       Logical address of symbols for which the transformation
+                        must be computed
+   __bank_page_size     Size in bytes of page size (this is *NOT* the memory
+                        bank window size and the window size is always
+                        less or equal to the page size)
+
+   For 68HC12, the window is at 0x8000 and the page size is 16K (full window).
+   For 68HC11 this is board specific (implemented by external hardware).  */
+
+struct m68hc11_page_info
+{
+  bfd_vma bank_virtual;
+  bfd_vma bank_physical;
+  bfd_vma bank_physical_end;
+  bfd_vma bank_mask;
+  bfd_vma bank_size;
+  int bank_shift;
+  int bank_param_initialized;
+  bfd_vma trampoline_addr;
+};
+
+struct m68hc11_elf_link_hash_table
+{
+  struct elf_link_hash_table root;
+  struct m68hc11_page_info pinfo;
+
+  /* The stub hash table.  */
+  struct bfd_hash_table* stub_hash_table;
+
+  /* Linker stub bfd.  */
+  bfd *stub_bfd;
+
+  asection* stub_section;
+  asection* tramp_section;
+
+  /* Linker call-backs.  */
+  asection * (*add_stub_section) (const char *, asection *);
+
+  /* Assorted information used by elf32_hppa_size_stubs.  */
+  unsigned int bfd_count;
+  int top_index;
+  asection **input_list;
+
+  /* Small local sym cache.  */
+  struct sym_cache sym_cache;
+
+  bfd_boolean (* size_one_stub)  (struct bfd_hash_entry*, void*);
+  bfd_boolean (* build_one_stub) (struct bfd_hash_entry*, void*);
+};
+
+/* Get the Sparc64 ELF linker hash table from a link_info structure.  */
+
+#define m68hc11_elf_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == M68HC11_ELF_DATA ? ((struct m68hc11_elf_link_hash_table *) ((p)->hash)) : NULL)
+
+/* Create a 68HC11/68HC12 ELF linker hash table.  */
+
+extern struct m68hc11_elf_link_hash_table* m68hc11_elf_hash_table_create
+  (bfd*);
+extern void m68hc11_elf_bfd_link_hash_table_free (struct bfd_link_hash_table*);
+
+extern void m68hc11_elf_get_bank_parameters (struct bfd_link_info*);
+
+/* Return 1 if the address is in banked memory.
+   This can be applied to a virtual address and to a physical address.  */
+extern int m68hc11_addr_is_banked (struct m68hc11_page_info*, bfd_vma);
+
+/* Return the physical address seen by the processor, taking
+   into account banked memory.  */
+extern bfd_vma m68hc11_phys_addr (struct m68hc11_page_info*, bfd_vma);
+
+/* Return the page number corresponding to an address in banked memory.  */
+extern bfd_vma m68hc11_phys_page (struct m68hc11_page_info*, bfd_vma);
+
+bfd_reloc_status_type m68hc11_elf_ignore_reloc
+  (bfd *abfd, arelent *reloc_entry,
+   asymbol *symbol, void *data, asection *input_section,
+   bfd *output_bfd, char **error_message);
+bfd_reloc_status_type m68hc11_elf_special_reloc
+  (bfd *abfd, arelent *reloc_entry,
+    asymbol *symbol, void *data, asection *input_section,
+    bfd *output_bfd, char **error_message);
+
+bfd_boolean elf32_m68hc11_check_relocs
+  (bfd * abfd, struct bfd_link_info * info,
+   asection * sec, const Elf_Internal_Rela * relocs);
+bfd_boolean elf32_m68hc11_relocate_section
+  (bfd *output_bfd, struct bfd_link_info *info,
+   bfd *input_bfd, asection *input_section,
+   bfd_byte *contents, Elf_Internal_Rela *relocs,
+   Elf_Internal_Sym *local_syms, asection **local_sections);
+
+bfd_boolean elf32_m68hc11_add_symbol_hook
+  (bfd *abfd, struct bfd_link_info *info,
+   Elf_Internal_Sym *sym, const char **namep,
+   flagword *flagsp, asection **secp,
+   bfd_vma *valp);
+
+/* Tweak the OSABI field of the elf header.  */
+
+extern void elf32_m68hc11_post_process_headers (bfd*, struct bfd_link_info*);
+
+int elf32_m68hc11_setup_section_lists (bfd *, struct bfd_link_info *);
+
+bfd_boolean elf32_m68hc11_size_stubs
+  (bfd *, bfd *, struct bfd_link_info *,
+   asection * (*) (const char *, asection *));
+
+bfd_boolean elf32_m68hc11_build_stubs (bfd* abfd, struct bfd_link_info *);
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-m68k.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-m68k.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-m68k.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-m68k.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4861 @@
+/* Motorola 68k series support for 32-bit ELF
+   Copyright 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/m68k.h"
+#include "opcode/m68k.h"
+
+static reloc_howto_type *reloc_type_lookup
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
+static void rtype_to_howto
+  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
+static struct bfd_hash_entry *elf_m68k_link_hash_newfunc
+  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
+static struct bfd_link_hash_table *elf_m68k_link_hash_table_create
+  PARAMS ((bfd *));
+static bfd_boolean elf_m68k_check_relocs
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+	   const Elf_Internal_Rela *));
+static bfd_boolean elf_m68k_adjust_dynamic_symbol
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
+static bfd_boolean elf_m68k_size_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean elf_m68k_discard_copies
+  PARAMS ((struct elf_link_hash_entry *, PTR));
+static bfd_boolean elf_m68k_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
+static bfd_boolean elf_m68k_finish_dynamic_symbol
+  PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
+	   Elf_Internal_Sym *));
+static bfd_boolean elf_m68k_finish_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
+
+static bfd_boolean elf32_m68k_set_private_flags
+  PARAMS ((bfd *, flagword));
+static bfd_boolean elf32_m68k_merge_private_bfd_data
+  PARAMS ((bfd *, bfd *));
+static bfd_boolean elf32_m68k_print_private_bfd_data
+  PARAMS ((bfd *, PTR));
+static enum elf_reloc_type_class elf32_m68k_reloc_type_class
+  PARAMS ((const Elf_Internal_Rela *));
+
+static reloc_howto_type howto_table[] = {
+  HOWTO(R_68K_NONE,       0, 0, 0, FALSE,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_68K_NONE",      FALSE, 0, 0x00000000,FALSE),
+  HOWTO(R_68K_32,         0, 2,32, FALSE,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_32",        FALSE, 0, 0xffffffff,FALSE),
+  HOWTO(R_68K_16,         0, 1,16, FALSE,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_16",        FALSE, 0, 0x0000ffff,FALSE),
+  HOWTO(R_68K_8,          0, 0, 8, FALSE,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_8",         FALSE, 0, 0x000000ff,FALSE),
+  HOWTO(R_68K_PC32,       0, 2,32, TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_PC32",      FALSE, 0, 0xffffffff,TRUE),
+  HOWTO(R_68K_PC16,       0, 1,16, TRUE, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PC16",      FALSE, 0, 0x0000ffff,TRUE),
+  HOWTO(R_68K_PC8,        0, 0, 8, TRUE, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PC8",       FALSE, 0, 0x000000ff,TRUE),
+  HOWTO(R_68K_GOT32,      0, 2,32, TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_GOT32",     FALSE, 0, 0xffffffff,TRUE),
+  HOWTO(R_68K_GOT16,      0, 1,16, TRUE, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_GOT16",     FALSE, 0, 0x0000ffff,TRUE),
+  HOWTO(R_68K_GOT8,       0, 0, 8, TRUE, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_GOT8",      FALSE, 0, 0x000000ff,TRUE),
+  HOWTO(R_68K_GOT32O,     0, 2,32, FALSE,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_GOT32O",    FALSE, 0, 0xffffffff,FALSE),
+  HOWTO(R_68K_GOT16O,     0, 1,16, FALSE,0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_GOT16O",    FALSE, 0, 0x0000ffff,FALSE),
+  HOWTO(R_68K_GOT8O,      0, 0, 8, FALSE,0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_GOT8O",     FALSE, 0, 0x000000ff,FALSE),
+  HOWTO(R_68K_PLT32,      0, 2,32, TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_PLT32",     FALSE, 0, 0xffffffff,TRUE),
+  HOWTO(R_68K_PLT16,      0, 1,16, TRUE, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PLT16",     FALSE, 0, 0x0000ffff,TRUE),
+  HOWTO(R_68K_PLT8,       0, 0, 8, TRUE, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PLT8",      FALSE, 0, 0x000000ff,TRUE),
+  HOWTO(R_68K_PLT32O,     0, 2,32, FALSE,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_PLT32O",    FALSE, 0, 0xffffffff,FALSE),
+  HOWTO(R_68K_PLT16O,     0, 1,16, FALSE,0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PLT16O",    FALSE, 0, 0x0000ffff,FALSE),
+  HOWTO(R_68K_PLT8O,      0, 0, 8, FALSE,0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PLT8O",     FALSE, 0, 0x000000ff,FALSE),
+  HOWTO(R_68K_COPY,       0, 0, 0, FALSE,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_68K_COPY",      FALSE, 0, 0xffffffff,FALSE),
+  HOWTO(R_68K_GLOB_DAT,   0, 2,32, FALSE,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_68K_GLOB_DAT",  FALSE, 0, 0xffffffff,FALSE),
+  HOWTO(R_68K_JMP_SLOT,   0, 2,32, FALSE,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_68K_JMP_SLOT",  FALSE, 0, 0xffffffff,FALSE),
+  HOWTO(R_68K_RELATIVE,   0, 2,32, FALSE,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_68K_RELATIVE",  FALSE, 0, 0xffffffff,FALSE),
+  /* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_68K_GNU_VTINHERIT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_68K_GNU_VTINHERIT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),
+  /* GNU extension to record C++ vtable member usage.  */
+  HOWTO (R_68K_GNU_VTENTRY,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_elf_rel_vtable_reloc_fn, /* special_function */
+	 "R_68K_GNU_VTENTRY",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),
+
+  /* TLS general dynamic variable reference.  */
+  HOWTO (R_68K_TLS_GD32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_68K_TLS_GD32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_68K_TLS_GD16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_68K_TLS_GD16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_68K_TLS_GD8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_68K_TLS_GD8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x000000ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS local dynamic variable reference.  */
+  HOWTO (R_68K_TLS_LDM32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_68K_TLS_LDM32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_68K_TLS_LDM16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_68K_TLS_LDM16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_68K_TLS_LDM8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_68K_TLS_LDM8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x000000ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_68K_TLS_LDO32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_68K_TLS_LDO32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_68K_TLS_LDO16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_68K_TLS_LDO16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_68K_TLS_LDO8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_68K_TLS_LDO8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x000000ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS initial execution variable reference.  */
+  HOWTO (R_68K_TLS_IE32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_68K_TLS_IE32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_68K_TLS_IE16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_68K_TLS_IE16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_68K_TLS_IE8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_68K_TLS_IE8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x000000ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS local execution variable reference.  */
+  HOWTO (R_68K_TLS_LE32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_68K_TLS_LE32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_68K_TLS_LE16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_68K_TLS_LE16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_68K_TLS_LE8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_68K_TLS_LE8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x000000ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS GD/LD dynamic relocations.  */
+  HOWTO (R_68K_TLS_DTPMOD32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_68K_TLS_DTPMOD32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_68K_TLS_DTPREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_68K_TLS_DTPREL32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_68K_TLS_TPREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_68K_TLS_TPREL32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+static void
+rtype_to_howto (bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst)
+{
+  unsigned int indx = ELF32_R_TYPE (dst->r_info);
+
+  if (indx >= (unsigned int) R_68K_max)
+    {
+      (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
+			     abfd, (int) indx);
+      indx = R_68K_NONE;
+    }
+  cache_ptr->howto = &howto_table[indx];
+}
+
+#define elf_info_to_howto rtype_to_howto
+
+static const struct
+{
+  bfd_reloc_code_real_type bfd_val;
+  int elf_val;
+}
+  reloc_map[] =
+{
+  { BFD_RELOC_NONE, R_68K_NONE },
+  { BFD_RELOC_32, R_68K_32 },
+  { BFD_RELOC_16, R_68K_16 },
+  { BFD_RELOC_8, R_68K_8 },
+  { BFD_RELOC_32_PCREL, R_68K_PC32 },
+  { BFD_RELOC_16_PCREL, R_68K_PC16 },
+  { BFD_RELOC_8_PCREL, R_68K_PC8 },
+  { BFD_RELOC_32_GOT_PCREL, R_68K_GOT32 },
+  { BFD_RELOC_16_GOT_PCREL, R_68K_GOT16 },
+  { BFD_RELOC_8_GOT_PCREL, R_68K_GOT8 },
+  { BFD_RELOC_32_GOTOFF, R_68K_GOT32O },
+  { BFD_RELOC_16_GOTOFF, R_68K_GOT16O },
+  { BFD_RELOC_8_GOTOFF, R_68K_GOT8O },
+  { BFD_RELOC_32_PLT_PCREL, R_68K_PLT32 },
+  { BFD_RELOC_16_PLT_PCREL, R_68K_PLT16 },
+  { BFD_RELOC_8_PLT_PCREL, R_68K_PLT8 },
+  { BFD_RELOC_32_PLTOFF, R_68K_PLT32O },
+  { BFD_RELOC_16_PLTOFF, R_68K_PLT16O },
+  { BFD_RELOC_8_PLTOFF, R_68K_PLT8O },
+  { BFD_RELOC_NONE, R_68K_COPY },
+  { BFD_RELOC_68K_GLOB_DAT, R_68K_GLOB_DAT },
+  { BFD_RELOC_68K_JMP_SLOT, R_68K_JMP_SLOT },
+  { BFD_RELOC_68K_RELATIVE, R_68K_RELATIVE },
+  { BFD_RELOC_CTOR, R_68K_32 },
+  { BFD_RELOC_VTABLE_INHERIT, R_68K_GNU_VTINHERIT },
+  { BFD_RELOC_VTABLE_ENTRY, R_68K_GNU_VTENTRY },
+  { BFD_RELOC_68K_TLS_GD32, R_68K_TLS_GD32 },
+  { BFD_RELOC_68K_TLS_GD16, R_68K_TLS_GD16 },
+  { BFD_RELOC_68K_TLS_GD8, R_68K_TLS_GD8 },
+  { BFD_RELOC_68K_TLS_LDM32, R_68K_TLS_LDM32 },
+  { BFD_RELOC_68K_TLS_LDM16, R_68K_TLS_LDM16 },
+  { BFD_RELOC_68K_TLS_LDM8, R_68K_TLS_LDM8 },
+  { BFD_RELOC_68K_TLS_LDO32, R_68K_TLS_LDO32 },
+  { BFD_RELOC_68K_TLS_LDO16, R_68K_TLS_LDO16 },
+  { BFD_RELOC_68K_TLS_LDO8, R_68K_TLS_LDO8 },
+  { BFD_RELOC_68K_TLS_IE32, R_68K_TLS_IE32 },
+  { BFD_RELOC_68K_TLS_IE16, R_68K_TLS_IE16 },
+  { BFD_RELOC_68K_TLS_IE8, R_68K_TLS_IE8 },
+  { BFD_RELOC_68K_TLS_LE32, R_68K_TLS_LE32 },
+  { BFD_RELOC_68K_TLS_LE16, R_68K_TLS_LE16 },
+  { BFD_RELOC_68K_TLS_LE8, R_68K_TLS_LE8 },
+};
+
+static reloc_howto_type *
+reloc_type_lookup (abfd, code)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     bfd_reloc_code_real_type code;
+{
+  unsigned int i;
+  for (i = 0; i < sizeof (reloc_map) / sizeof (reloc_map[0]); i++)
+    {
+      if (reloc_map[i].bfd_val == code)
+	return &howto_table[reloc_map[i].elf_val];
+    }
+  return 0;
+}
+
+static reloc_howto_type *
+reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (howto_table) / sizeof (howto_table[0]); i++)
+    if (howto_table[i].name != NULL
+	&& strcasecmp (howto_table[i].name, r_name) == 0)
+      return &howto_table[i];
+
+  return NULL;
+}
+
+#define bfd_elf32_bfd_reloc_type_lookup reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup reloc_name_lookup
+#define ELF_ARCH bfd_arch_m68k
+#define ELF_TARGET_ID M68K_ELF_DATA
+
+/* Functions for the m68k ELF linker.  */
+
+/* The name of the dynamic interpreter.  This is put in the .interp
+   section.  */
+
+#define ELF_DYNAMIC_INTERPRETER "/usr/lib/libc.so.1"
+
+/* Describes one of the various PLT styles.  */
+
+struct elf_m68k_plt_info
+{
+  /* The size of each PLT entry.  */
+  bfd_vma size;
+
+  /* The template for the first PLT entry.  */
+  const bfd_byte *plt0_entry;
+
+  /* Offsets of fields in PLT0_ENTRY that require R_68K_PC32 relocations.
+     The comments by each member indicate the value that the relocation
+     is against.  */
+  struct {
+    unsigned int got4; /* .got + 4 */
+    unsigned int got8; /* .got + 8 */
+  } plt0_relocs;
+
+  /* The template for a symbol's PLT entry.  */
+  const bfd_byte *symbol_entry;
+
+  /* Offsets of fields in SYMBOL_ENTRY that require R_68K_PC32 relocations.
+     The comments by each member indicate the value that the relocation
+     is against.  */
+  struct {
+    unsigned int got; /* the symbol's .got.plt entry */
+    unsigned int plt; /* .plt */
+  } symbol_relocs;
+
+  /* The offset of the resolver stub from the start of SYMBOL_ENTRY.
+     The stub starts with "move.l #relocoffset,%d0".  */
+  bfd_vma symbol_resolve_entry;
+};
+
+/* The size in bytes of an entry in the procedure linkage table.  */
+
+#define PLT_ENTRY_SIZE 20
+
+/* The first entry in a procedure linkage table looks like this.  See
+   the SVR4 ABI m68k supplement to see how this works.  */
+
+static const bfd_byte elf_m68k_plt0_entry[PLT_ENTRY_SIZE] =
+{
+  0x2f, 0x3b, 0x01, 0x70, /* move.l (%pc,addr),-(%sp) */
+  0, 0, 0, 2,		  /* + (.got + 4) - . */
+  0x4e, 0xfb, 0x01, 0x71, /* jmp ([%pc,addr]) */
+  0, 0, 0, 2,		  /* + (.got + 8) - . */
+  0, 0, 0, 0		  /* pad out to 20 bytes.  */
+};
+
+/* Subsequent entries in a procedure linkage table look like this.  */
+
+static const bfd_byte elf_m68k_plt_entry[PLT_ENTRY_SIZE] =
+{
+  0x4e, 0xfb, 0x01, 0x71, /* jmp ([%pc,symbol@GOTPC]) */
+  0, 0, 0, 2,		  /* + (.got.plt entry) - . */
+  0x2f, 0x3c,		  /* move.l #offset,-(%sp) */
+  0, 0, 0, 0,		  /* + reloc index */
+  0x60, 0xff,		  /* bra.l .plt */
+  0, 0, 0, 0		  /* + .plt - . */
+};
+
+static const struct elf_m68k_plt_info elf_m68k_plt_info = {
+  PLT_ENTRY_SIZE,
+  elf_m68k_plt0_entry, { 4, 12 },
+  elf_m68k_plt_entry, { 4, 16 }, 8
+};
+
+#define ISAB_PLT_ENTRY_SIZE 24
+
+static const bfd_byte elf_isab_plt0_entry[ISAB_PLT_ENTRY_SIZE] =
+{
+  0x20, 0x3c,             /* move.l #offset,%d0 */
+  0, 0, 0, 0,             /* + (.got + 4) - . */
+  0x2f, 0x3b, 0x08, 0xfa, /* move.l (-6,%pc,%d0:l),-(%sp) */
+  0x20, 0x3c,             /* move.l #offset,%d0 */
+  0, 0, 0, 0,             /* + (.got + 8) - . */
+  0x20, 0x7b, 0x08, 0xfa, /* move.l (-6,%pc,%d0:l), %a0 */
+  0x4e, 0xd0,             /* jmp (%a0) */
+  0x4e, 0x71		  /* nop */
+};
+
+/* Subsequent entries in a procedure linkage table look like this.  */
+
+static const bfd_byte elf_isab_plt_entry[ISAB_PLT_ENTRY_SIZE] =
+{
+  0x20, 0x3c,             /* move.l #offset,%d0 */
+  0, 0, 0, 0,             /* + (.got.plt entry) - . */
+  0x20, 0x7b, 0x08, 0xfa, /* move.l (-6,%pc,%d0:l), %a0 */
+  0x4e, 0xd0,             /* jmp (%a0) */
+  0x2f, 0x3c,             /* move.l #offset,-(%sp) */
+  0, 0, 0, 0,             /* + reloc index */
+  0x60, 0xff,             /* bra.l .plt */
+  0, 0, 0, 0              /* + .plt - . */
+};
+
+static const struct elf_m68k_plt_info elf_isab_plt_info = {
+  ISAB_PLT_ENTRY_SIZE,
+  elf_isab_plt0_entry, { 2, 12 },
+  elf_isab_plt_entry, { 2, 20 }, 12
+};
+
+#define ISAC_PLT_ENTRY_SIZE 24
+
+static const bfd_byte elf_isac_plt0_entry[ISAC_PLT_ENTRY_SIZE] =
+{
+  0x20, 0x3c,		  /* move.l #offset,%d0 */
+  0, 0, 0, 0,		  /* replaced with .got + 4 - . */
+  0x2e, 0xbb, 0x08, 0xfa, /* move.l (-6,%pc,%d0:l),(%sp) */
+  0x20, 0x3c,		  /* move.l #offset,%d0 */
+  0, 0, 0, 0,		  /* replaced with .got + 8 - . */
+  0x20, 0x7b, 0x08, 0xfa, /* move.l (-6,%pc,%d0:l), %a0 */
+  0x4e, 0xd0,		  /* jmp (%a0) */
+  0x4e, 0x71		  /* nop */
+};
+
+/* Subsequent entries in a procedure linkage table look like this.  */
+
+static const bfd_byte elf_isac_plt_entry[ISAC_PLT_ENTRY_SIZE] =
+{
+  0x20, 0x3c,		  /* move.l #offset,%d0 */
+  0, 0, 0, 0,		  /* replaced with (.got entry) - . */
+  0x20, 0x7b, 0x08, 0xfa, /* move.l (-6,%pc,%d0:l), %a0 */
+  0x4e, 0xd0,		  /* jmp (%a0) */
+  0x2f, 0x3c,		  /* move.l #offset,-(%sp) */
+  0, 0, 0, 0,		  /* replaced with offset into relocation table */
+  0x61, 0xff,		  /* bsr.l .plt */
+  0, 0, 0, 0 		  /* replaced with .plt - . */
+};
+
+static const struct elf_m68k_plt_info elf_isac_plt_info = {
+  ISAC_PLT_ENTRY_SIZE,
+  elf_isac_plt0_entry, { 2, 12},
+  elf_isac_plt_entry, { 2, 20 }, 12
+};
+
+#define CPU32_PLT_ENTRY_SIZE 24
+/* Procedure linkage table entries for the cpu32 */
+static const bfd_byte elf_cpu32_plt0_entry[CPU32_PLT_ENTRY_SIZE] =
+{
+  0x2f, 0x3b, 0x01, 0x70, /* move.l (%pc,addr),-(%sp) */
+  0, 0, 0, 2,             /* + (.got + 4) - . */
+  0x22, 0x7b, 0x01, 0x70, /* moveal %pc@(0xc), %a1 */
+  0, 0, 0, 2,             /* + (.got + 8) - . */
+  0x4e, 0xd1,             /* jmp %a1@ */
+  0, 0, 0, 0,             /* pad out to 24 bytes.  */
+  0, 0
+};
+
+static const bfd_byte elf_cpu32_plt_entry[CPU32_PLT_ENTRY_SIZE] =
+{
+  0x22, 0x7b, 0x01, 0x70,  /* moveal %pc@(0xc), %a1 */
+  0, 0, 0, 2,              /* + (.got.plt entry) - . */
+  0x4e, 0xd1,              /* jmp %a1@ */
+  0x2f, 0x3c,              /* move.l #offset,-(%sp) */
+  0, 0, 0, 0,              /* + reloc index */
+  0x60, 0xff,              /* bra.l .plt */
+  0, 0, 0, 0,              /* + .plt - . */
+  0, 0
+};
+
+static const struct elf_m68k_plt_info elf_cpu32_plt_info = {
+  CPU32_PLT_ENTRY_SIZE,
+  elf_cpu32_plt0_entry, { 4, 12 },
+  elf_cpu32_plt_entry, { 4, 18 }, 10
+};
+
+/* The m68k linker needs to keep track of the number of relocs that it
+   decides to copy in check_relocs for each symbol.  This is so that it
+   can discard PC relative relocs if it doesn't need them when linking
+   with -Bsymbolic.  We store the information in a field extending the
+   regular ELF linker hash table.  */
+
+/* This structure keeps track of the number of PC relative relocs we have
+   copied for a given symbol.  */
+
+struct elf_m68k_pcrel_relocs_copied
+{
+  /* Next section.  */
+  struct elf_m68k_pcrel_relocs_copied *next;
+  /* A section in dynobj.  */
+  asection *section;
+  /* Number of relocs copied in this section.  */
+  bfd_size_type count;
+};
+
+/* Forward declaration.  */
+struct elf_m68k_got_entry;
+
+/* m68k ELF linker hash entry.  */
+
+struct elf_m68k_link_hash_entry
+{
+  struct elf_link_hash_entry root;
+
+  /* Number of PC relative relocs copied for this symbol.  */
+  struct elf_m68k_pcrel_relocs_copied *pcrel_relocs_copied;
+
+  /* Key to got_entries.  */
+  unsigned long got_entry_key;
+
+  /* List of GOT entries for this symbol.  This list is build during
+     offset finalization and is used within elf_m68k_finish_dynamic_symbol
+     to traverse all GOT entries for a particular symbol.
+
+     ??? We could've used root.got.glist field instead, but having
+     a separate field is cleaner.  */
+  struct elf_m68k_got_entry *glist;
+};
+
+#define elf_m68k_hash_entry(ent) ((struct elf_m68k_link_hash_entry *) (ent))
+
+/* Key part of GOT entry in hashtable.  */
+struct elf_m68k_got_entry_key
+{
+  /* BFD in which this symbol was defined.  NULL for global symbols.  */
+  const bfd *bfd;
+
+  /* Symbol index.  Either local symbol index or h->got_entry_key.  */
+  unsigned long symndx;
+
+  /* Type is one of R_68K_GOT{8, 16, 32}O, R_68K_TLS_GD{8, 16, 32},
+     R_68K_TLS_LDM{8, 16, 32} or R_68K_TLS_IE{8, 16, 32}.
+
+     From perspective of hashtable key, only elf_m68k_got_reloc_type (type)
+     matters.  That is, we distinguish between, say, R_68K_GOT16O
+     and R_68K_GOT32O when allocating offsets, but they are considered to be
+     the same when searching got->entries.  */
+  enum elf_m68k_reloc_type type;
+};
+
+/* Size of the GOT offset suitable for relocation.  */
+enum elf_m68k_got_offset_size { R_8, R_16, R_32, R_LAST };
+
+/* Entry of the GOT.  */
+struct elf_m68k_got_entry
+{
+  /* GOT entries are put into a got->entries hashtable.  This is the key.  */
+  struct elf_m68k_got_entry_key key_;
+
+  /* GOT entry data.  We need s1 before offset finalization and s2 after.  */
+  union
+  {
+    struct
+    {
+      /* Number of times this entry is referenced.  It is used to
+	 filter out unnecessary GOT slots in elf_m68k_gc_sweep_hook.  */
+      bfd_vma refcount;
+    } s1;
+
+    struct
+    {
+      /* Offset from the start of .got section.  To calculate offset relative
+	 to GOT pointer one should substract got->offset from this value.  */
+      bfd_vma offset;
+
+      /* Pointer to the next GOT entry for this global symbol.
+	 Symbols have at most one entry in one GOT, but might
+	 have entries in more than one GOT.
+	 Root of this list is h->glist.
+	 NULL for local symbols.  */
+      struct elf_m68k_got_entry *next;
+    } s2;
+  } u;
+};
+
+/* Return representative type for relocation R_TYPE.
+   This is used to avoid enumerating many relocations in comparisons,
+   switches etc.  */
+
+static enum elf_m68k_reloc_type
+elf_m68k_reloc_got_type (enum elf_m68k_reloc_type r_type)
+{
+  switch (r_type)
+    {
+      /* In most cases R_68K_GOTx relocations require the very same
+	 handling as R_68K_GOT32O relocation.  In cases when we need
+	 to distinguish between the two, we use explicitly compare against
+	 r_type.  */
+    case R_68K_GOT32:
+    case R_68K_GOT16:
+    case R_68K_GOT8:
+    case R_68K_GOT32O:
+    case R_68K_GOT16O:
+    case R_68K_GOT8O:
+      return R_68K_GOT32O;
+
+    case R_68K_TLS_GD32:
+    case R_68K_TLS_GD16:
+    case R_68K_TLS_GD8:
+      return R_68K_TLS_GD32;
+
+    case R_68K_TLS_LDM32:
+    case R_68K_TLS_LDM16:
+    case R_68K_TLS_LDM8:
+      return R_68K_TLS_LDM32;
+
+    case R_68K_TLS_IE32:
+    case R_68K_TLS_IE16:
+    case R_68K_TLS_IE8:
+      return R_68K_TLS_IE32;
+
+    default:
+      BFD_ASSERT (FALSE);
+      return 0;
+    }
+}
+
+/* Return size of the GOT entry offset for relocation R_TYPE.  */
+
+static enum elf_m68k_got_offset_size
+elf_m68k_reloc_got_offset_size (enum elf_m68k_reloc_type r_type)
+{
+  switch (r_type)
+    {
+    case R_68K_GOT32: case R_68K_GOT16: case R_68K_GOT8:
+    case R_68K_GOT32O: case R_68K_TLS_GD32: case R_68K_TLS_LDM32:
+    case R_68K_TLS_IE32:
+      return R_32;
+
+    case R_68K_GOT16O: case R_68K_TLS_GD16: case R_68K_TLS_LDM16:
+    case R_68K_TLS_IE16:
+      return R_16;
+
+    case R_68K_GOT8O: case R_68K_TLS_GD8: case R_68K_TLS_LDM8:
+    case R_68K_TLS_IE8:
+      return R_8;
+
+    default:
+      BFD_ASSERT (FALSE);
+      return 0;
+    }
+}
+
+/* Return number of GOT entries we need to allocate in GOT for
+   relocation R_TYPE.  */
+
+static bfd_vma
+elf_m68k_reloc_got_n_slots (enum elf_m68k_reloc_type r_type)
+{
+  switch (elf_m68k_reloc_got_type (r_type))
+    {
+    case R_68K_GOT32O:
+    case R_68K_TLS_IE32:
+      return 1;
+
+    case R_68K_TLS_GD32:
+    case R_68K_TLS_LDM32:
+      return 2;
+
+    default:
+      BFD_ASSERT (FALSE);
+      return 0;
+    }
+}
+
+/* Return TRUE if relocation R_TYPE is a TLS one.  */
+
+static bfd_boolean
+elf_m68k_reloc_tls_p (enum elf_m68k_reloc_type r_type)
+{
+  switch (r_type)
+    {
+    case R_68K_TLS_GD32: case R_68K_TLS_GD16: case R_68K_TLS_GD8:
+    case R_68K_TLS_LDM32: case R_68K_TLS_LDM16: case R_68K_TLS_LDM8:
+    case R_68K_TLS_LDO32: case R_68K_TLS_LDO16: case R_68K_TLS_LDO8:
+    case R_68K_TLS_IE32: case R_68K_TLS_IE16: case R_68K_TLS_IE8:
+    case R_68K_TLS_LE32: case R_68K_TLS_LE16: case R_68K_TLS_LE8:
+    case R_68K_TLS_DTPMOD32: case R_68K_TLS_DTPREL32: case R_68K_TLS_TPREL32:
+      return TRUE;
+
+    default:
+      return FALSE;
+    }
+}
+
+/* Data structure representing a single GOT.  */
+struct elf_m68k_got
+{
+  /* Hashtable of 'struct elf_m68k_got_entry's.
+     Starting size of this table is the maximum number of
+     R_68K_GOT8O entries.  */
+  htab_t entries;
+
+  /* Number of R_x slots in this GOT.  Some (e.g., TLS) entries require
+     several GOT slots.
+
+     n_slots[R_8] is the count of R_8 slots in this GOT.
+     n_slots[R_16] is the cumulative count of R_8 and R_16 slots
+     in this GOT.
+     n_slots[R_32] is the cumulative count of R_8, R_16 and R_32 slots
+     in this GOT.  This is the total number of slots.  */
+  bfd_vma n_slots[R_LAST];
+
+  /* Number of local (entry->key_.h == NULL) slots in this GOT.
+     This is only used to properly calculate size of .rela.got section;
+     see elf_m68k_partition_multi_got.  */
+  bfd_vma local_n_slots;
+
+  /* Offset of this GOT relative to beginning of .got section.  */
+  bfd_vma offset;
+};
+
+/* BFD and its GOT.  This is an entry in multi_got->bfd2got hashtable.  */
+struct elf_m68k_bfd2got_entry
+{
+  /* BFD.  */
+  const bfd *bfd;
+
+  /* Assigned GOT.  Before partitioning multi-GOT each BFD has its own
+     GOT structure.  After partitioning several BFD's might [and often do]
+     share a single GOT.  */
+  struct elf_m68k_got *got;
+};
+
+/* The main data structure holding all the pieces.  */
+struct elf_m68k_multi_got
+{
+  /* Hashtable mapping each BFD to its GOT.  If a BFD doesn't have an entry
+     here, then it doesn't need a GOT (this includes the case of a BFD
+     having an empty GOT).
+
+     ??? This hashtable can be replaced by an array indexed by bfd->id.  */
+  htab_t bfd2got;
+
+  /* Next symndx to assign a global symbol.
+     h->got_entry_key is initialized from this counter.  */
+  unsigned long global_symndx;
+};
+
+/* m68k ELF linker hash table.  */
+
+struct elf_m68k_link_hash_table
+{
+  struct elf_link_hash_table root;
+
+  /* Small local sym cache.  */
+  struct sym_cache sym_cache;
+
+  /* The PLT format used by this link, or NULL if the format has not
+     yet been chosen.  */
+  const struct elf_m68k_plt_info *plt_info;
+
+  /* True, if GP is loaded within each function which uses it.
+     Set to TRUE when GOT negative offsets or multi-GOT is enabled.  */
+  bfd_boolean local_gp_p;
+
+  /* Switch controlling use of negative offsets to double the size of GOTs.  */
+  bfd_boolean use_neg_got_offsets_p;
+
+  /* Switch controlling generation of multiple GOTs.  */
+  bfd_boolean allow_multigot_p;
+
+  /* Multi-GOT data structure.  */
+  struct elf_m68k_multi_got multi_got_;
+};
+
+/* Get the m68k ELF linker hash table from a link_info structure.  */
+
+#define elf_m68k_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == M68K_ELF_DATA ? ((struct elf_m68k_link_hash_table *) ((p)->hash)) : NULL)
+
+/* Shortcut to multi-GOT data.  */
+#define elf_m68k_multi_got(INFO) (&elf_m68k_hash_table (INFO)->multi_got_)
+
+/* Create an entry in an m68k ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+elf_m68k_link_hash_newfunc (struct bfd_hash_entry *entry,
+			    struct bfd_hash_table *table,
+			    const char *string)
+{
+  struct bfd_hash_entry *ret = entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = bfd_hash_allocate (table,
+			     sizeof (struct elf_m68k_link_hash_entry));
+  if (ret == NULL)
+    return ret;
+
+  /* Call the allocation method of the superclass.  */
+  ret = _bfd_elf_link_hash_newfunc (ret, table, string);
+  if (ret != NULL)
+    {
+      elf_m68k_hash_entry (ret)->pcrel_relocs_copied = NULL;
+      elf_m68k_hash_entry (ret)->got_entry_key = 0;
+      elf_m68k_hash_entry (ret)->glist = NULL;
+    }
+
+  return ret;
+}
+
+/* Create an m68k ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+elf_m68k_link_hash_table_create (bfd *abfd)
+{
+  struct elf_m68k_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct elf_m68k_link_hash_table);
+
+  ret = (struct elf_m68k_link_hash_table *) bfd_malloc (amt);
+  if (ret == (struct elf_m68k_link_hash_table *) NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->root, abfd,
+				      elf_m68k_link_hash_newfunc,
+				      sizeof (struct elf_m68k_link_hash_entry),
+				      M68K_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  ret->sym_cache.abfd = NULL;
+  ret->plt_info = NULL;
+  ret->local_gp_p = FALSE;
+  ret->use_neg_got_offsets_p = FALSE;
+  ret->allow_multigot_p = FALSE;
+  ret->multi_got_.bfd2got = NULL;
+  ret->multi_got_.global_symndx = 1;
+
+  return &ret->root.root;
+}
+
+/* Destruct local data.  */
+
+static void
+elf_m68k_link_hash_table_free (struct bfd_link_hash_table *_htab)
+{
+  struct elf_m68k_link_hash_table *htab;
+
+  htab = (struct elf_m68k_link_hash_table *) _htab;
+
+  if (htab->multi_got_.bfd2got != NULL)
+    {
+      htab_delete (htab->multi_got_.bfd2got);
+      htab->multi_got_.bfd2got = NULL;
+    }
+}
+
+/* Set the right machine number.  */
+
+static bfd_boolean
+elf32_m68k_object_p (bfd *abfd)
+{
+  unsigned int mach = 0;
+  unsigned features = 0;
+  flagword eflags = elf_elfheader (abfd)->e_flags;
+
+  if ((eflags & EF_M68K_ARCH_MASK) == EF_M68K_M68000)
+    features |= m68000;
+  else if ((eflags & EF_M68K_ARCH_MASK) == EF_M68K_CPU32)
+    features |= cpu32;
+  else if ((eflags & EF_M68K_ARCH_MASK) == EF_M68K_FIDO)
+    features |= fido_a;
+  else
+    {
+      switch (eflags & EF_M68K_CF_ISA_MASK)
+	{
+	case EF_M68K_CF_ISA_A_NODIV:
+	  features |= mcfisa_a;
+	  break;
+	case EF_M68K_CF_ISA_A:
+	  features |= mcfisa_a|mcfhwdiv;
+	  break;
+	case EF_M68K_CF_ISA_A_PLUS:
+	  features |= mcfisa_a|mcfisa_aa|mcfhwdiv|mcfusp;
+	  break;
+	case EF_M68K_CF_ISA_B_NOUSP:
+	  features |= mcfisa_a|mcfisa_b|mcfhwdiv;
+	  break;
+	case EF_M68K_CF_ISA_B:
+	  features |= mcfisa_a|mcfisa_b|mcfhwdiv|mcfusp;
+	  break;
+	case EF_M68K_CF_ISA_C:
+	  features |= mcfisa_a|mcfisa_c|mcfhwdiv|mcfusp;
+	  break;
+	case EF_M68K_CF_ISA_C_NODIV:
+	  features |= mcfisa_a|mcfisa_c|mcfusp;
+	  break;
+	}
+      switch (eflags & EF_M68K_CF_MAC_MASK)
+	{
+	case EF_M68K_CF_MAC:
+	  features |= mcfmac;
+	  break;
+	case EF_M68K_CF_EMAC:
+	  features |= mcfemac;
+	  break;
+	}
+      if (eflags & EF_M68K_CF_FLOAT)
+	features |= cfloat;
+    }
+
+  mach = bfd_m68k_features_to_mach (features);
+  bfd_default_set_arch_mach (abfd, bfd_arch_m68k, mach);
+
+  return TRUE;
+}
+
+/* Somewhat reverse of elf32_m68k_object_p, this sets the e_flag
+   field based on the machine number.  */
+
+static void
+elf_m68k_final_write_processing (bfd *abfd,
+				 bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  int mach = bfd_get_mach (abfd);
+  unsigned long e_flags = elf_elfheader (abfd)->e_flags;
+
+  if (!e_flags)
+    {
+      unsigned int arch_mask;
+
+      arch_mask = bfd_m68k_mach_to_features (mach);
+
+      if (arch_mask & m68000)
+	e_flags = EF_M68K_M68000;
+      else if (arch_mask & cpu32)
+	e_flags = EF_M68K_CPU32;
+      else if (arch_mask & fido_a)
+	e_flags = EF_M68K_FIDO;
+      else
+	{
+	  switch (arch_mask
+		  & (mcfisa_a | mcfisa_aa | mcfisa_b | mcfisa_c | mcfhwdiv | mcfusp))
+	    {
+	    case mcfisa_a:
+	      e_flags |= EF_M68K_CF_ISA_A_NODIV;
+	      break;
+	    case mcfisa_a | mcfhwdiv:
+	      e_flags |= EF_M68K_CF_ISA_A;
+	      break;
+	    case mcfisa_a | mcfisa_aa | mcfhwdiv | mcfusp:
+	      e_flags |= EF_M68K_CF_ISA_A_PLUS;
+	      break;
+	    case mcfisa_a | mcfisa_b | mcfhwdiv:
+	      e_flags |= EF_M68K_CF_ISA_B_NOUSP;
+	      break;
+	    case mcfisa_a | mcfisa_b | mcfhwdiv | mcfusp:
+	      e_flags |= EF_M68K_CF_ISA_B;
+	      break;
+	    case mcfisa_a | mcfisa_c | mcfhwdiv | mcfusp:
+	      e_flags |= EF_M68K_CF_ISA_C;
+	      break;
+	    case mcfisa_a | mcfisa_c | mcfusp:
+	      e_flags |= EF_M68K_CF_ISA_C_NODIV;
+	      break;
+	    }
+	  if (arch_mask & mcfmac)
+	    e_flags |= EF_M68K_CF_MAC;
+	  else if (arch_mask & mcfemac)
+	    e_flags |= EF_M68K_CF_EMAC;
+	  if (arch_mask & cfloat)
+	    e_flags |= EF_M68K_CF_FLOAT | EF_M68K_CFV4E;
+	}
+      elf_elfheader (abfd)->e_flags = e_flags;
+    }
+}
+
+/* Keep m68k-specific flags in the ELF header.  */
+
+static bfd_boolean
+elf32_m68k_set_private_flags (abfd, flags)
+     bfd *abfd;
+     flagword flags;
+{
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+static bfd_boolean
+elf32_m68k_merge_private_bfd_data (ibfd, obfd)
+     bfd *ibfd;
+     bfd *obfd;
+{
+  flagword out_flags;
+  flagword in_flags;
+  flagword out_isa;
+  flagword in_isa;
+  const bfd_arch_info_type *arch_info;
+
+  if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return FALSE;
+
+  /* Get the merged machine.  This checks for incompatibility between
+     Coldfire & non-Coldfire flags, incompability between different
+     Coldfire ISAs, and incompability between different MAC types.  */
+  arch_info = bfd_arch_get_compatible (ibfd, obfd, FALSE);
+  if (!arch_info)
+    return FALSE;
+
+  bfd_set_arch_mach (obfd, bfd_arch_m68k, arch_info->mach);
+
+  in_flags = elf_elfheader (ibfd)->e_flags;
+  if (!elf_flags_init (obfd))
+    {
+      elf_flags_init (obfd) = TRUE;
+      out_flags = in_flags;
+    }
+  else
+    {
+      out_flags = elf_elfheader (obfd)->e_flags;
+      unsigned int variant_mask;
+
+      if ((in_flags & EF_M68K_ARCH_MASK) == EF_M68K_M68000)
+	variant_mask = 0;
+      else if ((in_flags & EF_M68K_ARCH_MASK) == EF_M68K_CPU32)
+	variant_mask = 0;
+      else if ((in_flags & EF_M68K_ARCH_MASK) == EF_M68K_FIDO)
+	variant_mask = 0;
+      else
+	variant_mask = EF_M68K_CF_ISA_MASK;
+
+      in_isa = (in_flags & variant_mask);
+      out_isa = (out_flags & variant_mask);
+      if (in_isa > out_isa)
+	out_flags ^= in_isa ^ out_isa;
+      if (((in_flags & EF_M68K_ARCH_MASK) == EF_M68K_CPU32
+	   && (out_flags & EF_M68K_ARCH_MASK) == EF_M68K_FIDO)
+	  || ((in_flags & EF_M68K_ARCH_MASK) == EF_M68K_FIDO
+	      && (out_flags & EF_M68K_ARCH_MASK) == EF_M68K_CPU32))
+	out_flags = EF_M68K_FIDO;
+      else
+      out_flags |= in_flags ^ in_isa;
+    }
+  elf_elfheader (obfd)->e_flags = out_flags;
+
+  return TRUE;
+}
+
+/* Display the flags field.  */
+
+static bfd_boolean
+elf32_m68k_print_private_bfd_data (bfd *abfd, void * ptr)
+{
+  FILE *file = (FILE *) ptr;
+  flagword eflags = elf_elfheader (abfd)->e_flags;
+
+  BFD_ASSERT (abfd != NULL && ptr != NULL);
+
+  /* Print normal ELF private data.  */
+  _bfd_elf_print_private_bfd_data (abfd, ptr);
+
+  /* Ignore init flag - it may not be set, despite the flags field containing valid data.  */
+
+  /* xgettext:c-format */
+  fprintf (file, _("private flags = %lx:"), elf_elfheader (abfd)->e_flags);
+
+  if ((eflags & EF_M68K_ARCH_MASK) == EF_M68K_M68000)
+    fprintf (file, " [m68000]");
+  else if ((eflags & EF_M68K_ARCH_MASK) == EF_M68K_CPU32)
+    fprintf (file, " [cpu32]");
+  else if ((eflags & EF_M68K_ARCH_MASK) == EF_M68K_FIDO)
+    fprintf (file, " [fido]");
+  else
+    {
+      if ((eflags & EF_M68K_ARCH_MASK) == EF_M68K_CFV4E)
+	fprintf (file, " [cfv4e]");
+
+      if (eflags & EF_M68K_CF_ISA_MASK)
+	{
+	  char const *isa = _("unknown");
+	  char const *mac = _("unknown");
+	  char const *additional = "";
+
+	  switch (eflags & EF_M68K_CF_ISA_MASK)
+	    {
+	    case EF_M68K_CF_ISA_A_NODIV:
+	      isa = "A";
+	      additional = " [nodiv]";
+	      break;
+	    case EF_M68K_CF_ISA_A:
+	      isa = "A";
+	      break;
+	    case EF_M68K_CF_ISA_A_PLUS:
+	      isa = "A+";
+	      break;
+	    case EF_M68K_CF_ISA_B_NOUSP:
+	      isa = "B";
+	      additional = " [nousp]";
+	      break;
+	    case EF_M68K_CF_ISA_B:
+	      isa = "B";
+	      break;
+	    case EF_M68K_CF_ISA_C:
+	      isa = "C";
+	      break;
+	    case EF_M68K_CF_ISA_C_NODIV:
+	      isa = "C";
+	      additional = " [nodiv]";
+	      break;
+	    }
+	  fprintf (file, " [isa %s]%s", isa, additional);
+
+	  if (eflags & EF_M68K_CF_FLOAT)
+	    fprintf (file, " [float]");
+
+	  switch (eflags & EF_M68K_CF_MAC_MASK)
+	    {
+	    case 0:
+	      mac = NULL;
+	      break;
+	    case EF_M68K_CF_MAC:
+	      mac = "mac";
+	      break;
+	    case EF_M68K_CF_EMAC:
+	      mac = "emac";
+	      break;
+	    case EF_M68K_CF_EMAC_B:
+	      mac = "emac_b";
+	      break;
+	    }
+	  if (mac)
+	    fprintf (file, " [%s]", mac);
+	}
+    }
+
+  fputc ('\n', file);
+
+  return TRUE;
+}
+
+/* Multi-GOT support implementation design:
+
+   Multi-GOT starts in check_relocs hook.  There we scan all
+   relocations of a BFD and build a local GOT (struct elf_m68k_got)
+   for it.  If a single BFD appears to require too many GOT slots with
+   R_68K_GOT8O or R_68K_GOT16O relocations, we fail with notification
+   to user.
+   After check_relocs has been invoked for each input BFD, we have
+   constructed a GOT for each input BFD.
+
+   To minimize total number of GOTs required for a particular output BFD
+   (as some environments support only 1 GOT per output object) we try
+   to merge some of the GOTs to share an offset space.  Ideally [and in most
+   cases] we end up with a single GOT.  In cases when there are too many
+   restricted relocations (e.g., R_68K_GOT16O relocations) we end up with
+   several GOTs, assuming the environment can handle them.
+
+   Partitioning is done in elf_m68k_partition_multi_got.  We start with
+   an empty GOT and traverse bfd2got hashtable putting got_entries from
+   local GOTs to the new 'big' one.  We do that by constructing an
+   intermediate GOT holding all the entries the local GOT has and the big
+   GOT lacks.  Then we check if there is room in the big GOT to accomodate
+   all the entries from diff.  On success we add those entries to the big
+   GOT; on failure we start the new 'big' GOT and retry the adding of
+   entries from the local GOT.  Note that this retry will always succeed as
+   each local GOT doesn't overflow the limits.  After partitioning we
+   end up with each bfd assigned one of the big GOTs.  GOT entries in the
+   big GOTs are initialized with GOT offsets.  Note that big GOTs are
+   positioned consequently in program space and represent a single huge GOT
+   to the outside world.
+
+   After that we get to elf_m68k_relocate_section.  There we
+   adjust relocations of GOT pointer (_GLOBAL_OFFSET_TABLE_) and symbol
+   relocations to refer to appropriate [assigned to current input_bfd]
+   big GOT.
+
+   Notes:
+
+   GOT entry type: We have several types of GOT entries.
+   * R_8 type is used in entries for symbols that have at least one
+   R_68K_GOT8O or R_68K_TLS_*8 relocation.  We can have at most 0x40
+   such entries in one GOT.
+   * R_16 type is used in entries for symbols that have at least one
+   R_68K_GOT16O or R_68K_TLS_*16 relocation and no R_8 relocations.
+   We can have at most 0x4000 such entries in one GOT.
+   * R_32 type is used in all other cases.  We can have as many
+   such entries in one GOT as we'd like.
+   When counting relocations we have to include the count of the smaller
+   ranged relocations in the counts of the larger ranged ones in order
+   to correctly detect overflow.
+
+   Sorting the GOT: In each GOT starting offsets are assigned to
+   R_8 entries, which are followed by R_16 entries, and
+   R_32 entries go at the end.  See finalize_got_offsets for details.
+
+   Negative GOT offsets: To double usable offset range of GOTs we use
+   negative offsets.  As we assign entries with GOT offsets relative to
+   start of .got section, the offset values are positive.  They become
+   negative only in relocate_section where got->offset value is
+   subtracted from them.
+
+   3 special GOT entries: There are 3 special GOT entries used internally
+   by loader.  These entries happen to be placed to .got.plt section,
+   so we don't do anything about them in multi-GOT support.
+
+   Memory management: All data except for hashtables
+   multi_got->bfd2got and got->entries are allocated on
+   elf_hash_table (info)->dynobj bfd (for this reason we pass 'info'
+   to most functions), so we don't need to care to free them.  At the
+   moment of allocation hashtables are being linked into main data
+   structure (multi_got), all pieces of which are reachable from
+   elf_m68k_multi_got (info).  We deallocate them in
+   elf_m68k_link_hash_table_free.  */
+
+/* Initialize GOT.  */
+
+static void
+elf_m68k_init_got (struct elf_m68k_got *got)
+{
+  got->entries = NULL;
+  got->n_slots[R_8] = 0;
+  got->n_slots[R_16] = 0;
+  got->n_slots[R_32] = 0;
+  got->local_n_slots = 0;
+  got->offset = (bfd_vma) -1;
+}
+
+/* Destruct GOT.  */
+
+static void
+elf_m68k_clear_got (struct elf_m68k_got *got)
+{
+  if (got->entries != NULL)
+    {
+      htab_delete (got->entries);
+      got->entries = NULL;
+    }
+}
+
+/* Create and empty GOT structure.  INFO is the context where memory
+   should be allocated.  */
+
+static struct elf_m68k_got *
+elf_m68k_create_empty_got (struct bfd_link_info *info)
+{
+  struct elf_m68k_got *got;
+
+  got = bfd_alloc (elf_hash_table (info)->dynobj, sizeof (*got));
+  if (got == NULL)
+    return NULL;
+
+  elf_m68k_init_got (got);
+
+  return got;
+}
+
+/* Initialize KEY.  */
+
+static void
+elf_m68k_init_got_entry_key (struct elf_m68k_got_entry_key *key,
+			     struct elf_link_hash_entry *h,
+			     const bfd *abfd, unsigned long symndx,
+			     enum elf_m68k_reloc_type reloc_type)
+{
+  if (elf_m68k_reloc_got_type (reloc_type) == R_68K_TLS_LDM32)
+    /* All TLS_LDM relocations share a single GOT entry.  */
+    {
+      key->bfd = NULL;
+      key->symndx = 0;
+    }
+  else if (h != NULL)
+    /* Global symbols are identified with their got_entry_key.  */
+    {
+      key->bfd = NULL;
+      key->symndx = elf_m68k_hash_entry (h)->got_entry_key;
+      BFD_ASSERT (key->symndx != 0);
+    }
+  else
+    /* Local symbols are identified by BFD they appear in and symndx.  */
+    {
+      key->bfd = abfd;
+      key->symndx = symndx;
+    }
+
+  key->type = reloc_type;
+}
+
+/* Calculate hash of got_entry.
+   ??? Is it good?  */
+
+static hashval_t
+elf_m68k_got_entry_hash (const void *_entry)
+{
+  const struct elf_m68k_got_entry_key *key;
+
+  key = &((const struct elf_m68k_got_entry *) _entry)->key_;
+
+  return (key->symndx
+	  + (key->bfd != NULL ? (int) key->bfd->id : -1)
+	  + elf_m68k_reloc_got_type (key->type));
+}
+
+/* Check if two got entries are equal.  */
+
+static int
+elf_m68k_got_entry_eq (const void *_entry1, const void *_entry2)
+{
+  const struct elf_m68k_got_entry_key *key1;
+  const struct elf_m68k_got_entry_key *key2;
+
+  key1 = &((const struct elf_m68k_got_entry *) _entry1)->key_;
+  key2 = &((const struct elf_m68k_got_entry *) _entry2)->key_;
+
+  return (key1->bfd == key2->bfd
+	  && key1->symndx == key2->symndx
+	  && (elf_m68k_reloc_got_type (key1->type)
+	      == elf_m68k_reloc_got_type (key2->type)));
+}
+
+/* When using negative offsets, we allocate one extra R_8, one extra R_16
+   and one extra R_32 slots to simplify handling of 2-slot entries during
+   offset allocation -- hence -1 for R_8 slots and -2 for R_16 slots.  */
+
+/* Maximal number of R_8 slots in a single GOT.  */
+#define ELF_M68K_R_8_MAX_N_SLOTS_IN_GOT(INFO)		\
+  (elf_m68k_hash_table (INFO)->use_neg_got_offsets_p		\
+   ? (0x40 - 1)							\
+   : 0x20)
+
+/* Maximal number of R_8 and R_16 slots in a single GOT.  */
+#define ELF_M68K_R_8_16_MAX_N_SLOTS_IN_GOT(INFO)		\
+  (elf_m68k_hash_table (INFO)->use_neg_got_offsets_p		\
+   ? (0x4000 - 2)						\
+   : 0x2000)
+
+/* SEARCH - simply search the hashtable, don't insert new entries or fail when
+   the entry cannot be found.
+   FIND_OR_CREATE - search for an existing entry, but create new if there's
+   no such.
+   MUST_FIND - search for an existing entry and assert that it exist.
+   MUST_CREATE - assert that there's no such entry and create new one.  */
+enum elf_m68k_get_entry_howto
+  {
+    SEARCH,
+    FIND_OR_CREATE,
+    MUST_FIND,
+    MUST_CREATE
+  };
+
+/* Get or create (depending on HOWTO) entry with KEY in GOT.
+   INFO is context in which memory should be allocated (can be NULL if
+   HOWTO is SEARCH or MUST_FIND).  */
+
+static struct elf_m68k_got_entry *
+elf_m68k_get_got_entry (struct elf_m68k_got *got,
+			const struct elf_m68k_got_entry_key *key,
+			enum elf_m68k_get_entry_howto howto,
+			struct bfd_link_info *info)
+{
+  struct elf_m68k_got_entry entry_;
+  struct elf_m68k_got_entry *entry;
+  void **ptr;
+
+  BFD_ASSERT ((info == NULL) == (howto == SEARCH || howto == MUST_FIND));
+
+  if (got->entries == NULL)
+    /* This is the first entry in ABFD.  Initialize hashtable.  */
+    {
+      if (howto == SEARCH)
+	return NULL;
+
+      got->entries = htab_try_create (ELF_M68K_R_8_MAX_N_SLOTS_IN_GOT
+				      (info),
+				      elf_m68k_got_entry_hash,
+				      elf_m68k_got_entry_eq, NULL);
+      if (got->entries == NULL)
+	{
+	  bfd_set_error (bfd_error_no_memory);
+	  return NULL;
+	}
+    }
+
+  entry_.key_ = *key;
+  ptr = htab_find_slot (got->entries, &entry_, (howto != SEARCH
+						? INSERT : NO_INSERT));
+  if (ptr == NULL)
+    {
+      if (howto == SEARCH)
+	/* Entry not found.  */
+	return NULL;
+
+      /* We're out of memory.  */
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+
+  if (*ptr == NULL)
+    /* We didn't find the entry and we're asked to create a new one.  */
+    {
+      BFD_ASSERT (howto != MUST_FIND && howto != SEARCH);
+
+      entry = bfd_alloc (elf_hash_table (info)->dynobj, sizeof (*entry));
+      if (entry == NULL)
+	return NULL;
+
+      /* Initialize new entry.  */
+      entry->key_ = *key;
+
+      entry->u.s1.refcount = 0;
+
+      /* Mark the entry as not initialized.  */
+      entry->key_.type = R_68K_max;
+
+      *ptr = entry;
+    }
+  else
+    /* We found the entry.  */
+    {
+      BFD_ASSERT (howto != MUST_CREATE);
+
+      entry = *ptr;
+    }
+
+  return entry;
+}
+
+/* Update GOT counters when merging entry of WAS type with entry of NEW type.
+   Return the value to which ENTRY's type should be set.  */
+
+static enum elf_m68k_reloc_type
+elf_m68k_update_got_entry_type (struct elf_m68k_got *got,
+				enum elf_m68k_reloc_type was,
+				enum elf_m68k_reloc_type new_reloc)
+{
+  enum elf_m68k_got_offset_size was_size;
+  enum elf_m68k_got_offset_size new_size;
+  bfd_vma n_slots;
+
+  if (was == R_68K_max)
+    /* The type of the entry is not initialized yet.  */
+    {
+      /* Update all got->n_slots counters, including n_slots[R_32].  */
+      was_size = R_LAST;
+
+      was = new_reloc;
+    }
+  else
+    {
+      /* !!! We, probably, should emit an error rather then fail on assert
+	 in such a case.  */
+      BFD_ASSERT (elf_m68k_reloc_got_type (was)
+		  == elf_m68k_reloc_got_type (new_reloc));
+
+      was_size = elf_m68k_reloc_got_offset_size (was);
+    }
+
+  new_size = elf_m68k_reloc_got_offset_size (new_reloc);
+  n_slots = elf_m68k_reloc_got_n_slots (new_reloc);
+
+  while (was_size > new_size)
+    {
+      --was_size;
+      got->n_slots[was_size] += n_slots;
+    }
+
+  if (new_reloc > was)
+    /* Relocations are ordered from bigger got offset size to lesser,
+       so choose the relocation type with lesser offset size.  */
+    was = new_reloc;
+
+  return was;
+}
+
+/* Update GOT counters when removing an entry of type TYPE.  */
+
+static void
+elf_m68k_remove_got_entry_type (struct elf_m68k_got *got,
+				enum elf_m68k_reloc_type type)
+{
+  enum elf_m68k_got_offset_size os;
+  bfd_vma n_slots;
+
+  n_slots = elf_m68k_reloc_got_n_slots (type);
+
+  /* Decrese counter of slots with offset size corresponding to TYPE
+     and all greater offset sizes.  */
+  for (os = elf_m68k_reloc_got_offset_size (type); os <= R_32; ++os)
+    {
+      BFD_ASSERT (got->n_slots[os] >= n_slots);
+
+      got->n_slots[os] -= n_slots;
+    }
+}
+
+/* Add new or update existing entry to GOT.
+   H, ABFD, TYPE and SYMNDX is data for the entry.
+   INFO is a context where memory should be allocated.  */
+
+static struct elf_m68k_got_entry *
+elf_m68k_add_entry_to_got (struct elf_m68k_got *got,
+			   struct elf_link_hash_entry *h,
+			   const bfd *abfd,
+			   enum elf_m68k_reloc_type reloc_type,
+			   unsigned long symndx,
+			   struct bfd_link_info *info)
+{
+  struct elf_m68k_got_entry_key key_;
+  struct elf_m68k_got_entry *entry;
+
+  if (h != NULL && elf_m68k_hash_entry (h)->got_entry_key == 0)
+    elf_m68k_hash_entry (h)->got_entry_key
+      = elf_m68k_multi_got (info)->global_symndx++;
+
+  elf_m68k_init_got_entry_key (&key_, h, abfd, symndx, reloc_type);
+
+  entry = elf_m68k_get_got_entry (got, &key_, FIND_OR_CREATE, info);
+  if (entry == NULL)
+    return NULL;
+
+  /* Determine entry's type and update got->n_slots counters.  */
+  entry->key_.type = elf_m68k_update_got_entry_type (got,
+						     entry->key_.type,
+						     reloc_type);
+
+  /* Update refcount.  */
+  ++entry->u.s1.refcount;
+
+  if (entry->u.s1.refcount == 1)
+    /* We see this entry for the first time.  */
+    {
+      if (entry->key_.bfd != NULL)
+	got->local_n_slots += elf_m68k_reloc_got_n_slots (entry->key_.type);
+    }
+
+  BFD_ASSERT (got->n_slots[R_32] >= got->local_n_slots);
+
+  if ((got->n_slots[R_8]
+       > ELF_M68K_R_8_MAX_N_SLOTS_IN_GOT (info))
+      || (got->n_slots[R_16]
+	  > ELF_M68K_R_8_16_MAX_N_SLOTS_IN_GOT (info)))
+    /* This BFD has too many relocation.  */
+    {
+      if (got->n_slots[R_8] > ELF_M68K_R_8_MAX_N_SLOTS_IN_GOT (info))
+	(*_bfd_error_handler) (_("%B: GOT overflow: "
+				 "Number of relocations with 8-bit "
+				 "offset > %d"),
+			       abfd,
+			       ELF_M68K_R_8_MAX_N_SLOTS_IN_GOT (info));
+      else
+	(*_bfd_error_handler) (_("%B: GOT overflow: "
+				 "Number of relocations with 8- or 16-bit "
+				 "offset > %d"),
+			       abfd,
+			       ELF_M68K_R_8_16_MAX_N_SLOTS_IN_GOT (info));
+
+      return NULL;
+    }
+
+  return entry;
+}
+
+/* Compute the hash value of the bfd in a bfd2got hash entry.  */
+
+static hashval_t
+elf_m68k_bfd2got_entry_hash (const void *entry)
+{
+  const struct elf_m68k_bfd2got_entry *e;
+
+  e = (const struct elf_m68k_bfd2got_entry *) entry;
+
+  return e->bfd->id;
+}
+
+/* Check whether two hash entries have the same bfd.  */
+
+static int
+elf_m68k_bfd2got_entry_eq (const void *entry1, const void *entry2)
+{
+  const struct elf_m68k_bfd2got_entry *e1;
+  const struct elf_m68k_bfd2got_entry *e2;
+
+  e1 = (const struct elf_m68k_bfd2got_entry *) entry1;
+  e2 = (const struct elf_m68k_bfd2got_entry *) entry2;
+
+  return e1->bfd == e2->bfd;
+}
+
+/* Destruct a bfd2got entry.  */
+
+static void
+elf_m68k_bfd2got_entry_del (void *_entry)
+{
+  struct elf_m68k_bfd2got_entry *entry;
+
+  entry = (struct elf_m68k_bfd2got_entry *) _entry;
+
+  BFD_ASSERT (entry->got != NULL);
+  elf_m68k_clear_got (entry->got);
+}
+
+/* Find existing or create new (depending on HOWTO) bfd2got entry in
+   MULTI_GOT.  ABFD is the bfd we need a GOT for.  INFO is a context where
+   memory should be allocated.  */
+
+static struct elf_m68k_bfd2got_entry *
+elf_m68k_get_bfd2got_entry (struct elf_m68k_multi_got *multi_got,
+			    const bfd *abfd,
+			    enum elf_m68k_get_entry_howto howto,
+			    struct bfd_link_info *info)
+{
+  struct elf_m68k_bfd2got_entry entry_;
+  void **ptr;
+  struct elf_m68k_bfd2got_entry *entry;
+
+  BFD_ASSERT ((info == NULL) == (howto == SEARCH || howto == MUST_FIND));
+
+  if (multi_got->bfd2got == NULL)
+    /* This is the first GOT.  Initialize bfd2got.  */
+    {
+      if (howto == SEARCH)
+	return NULL;
+
+      multi_got->bfd2got = htab_try_create (1, elf_m68k_bfd2got_entry_hash,
+					    elf_m68k_bfd2got_entry_eq,
+					    elf_m68k_bfd2got_entry_del);
+      if (multi_got->bfd2got == NULL)
+	{
+	  bfd_set_error (bfd_error_no_memory);
+	  return NULL;
+	}
+    }
+
+  entry_.bfd = abfd;
+  ptr = htab_find_slot (multi_got->bfd2got, &entry_, (howto != SEARCH
+						      ? INSERT : NO_INSERT));
+  if (ptr == NULL)
+    {
+      if (howto == SEARCH)
+	/* Entry not found.  */
+	return NULL;
+
+      /* We're out of memory.  */
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+
+  if (*ptr == NULL)
+    /* Entry was not found.  Create new one.  */
+    {
+      BFD_ASSERT (howto != MUST_FIND && howto != SEARCH);
+
+      entry = ((struct elf_m68k_bfd2got_entry *)
+	       bfd_alloc (elf_hash_table (info)->dynobj, sizeof (*entry)));
+      if (entry == NULL)
+	return NULL;
+
+      entry->bfd = abfd;
+
+      entry->got = elf_m68k_create_empty_got (info);
+      if (entry->got == NULL)
+	return NULL;
+
+      *ptr = entry;
+    }
+  else
+    {
+      BFD_ASSERT (howto != MUST_CREATE);
+
+      /* Return existing entry.  */
+      entry = *ptr;
+    }
+
+  return entry;
+}
+
+struct elf_m68k_can_merge_gots_arg
+{
+  /* A current_got that we constructing a DIFF against.  */
+  struct elf_m68k_got *big;
+
+  /* GOT holding entries not present or that should be changed in
+     BIG.  */
+  struct elf_m68k_got *diff;
+
+  /* Context where to allocate memory.  */
+  struct bfd_link_info *info;
+
+  /* Error flag.  */
+  bfd_boolean error_p;
+};
+
+/* Process a single entry from the small GOT to see if it should be added
+   or updated in the big GOT.  */
+
+static int
+elf_m68k_can_merge_gots_1 (void **_entry_ptr, void *_arg)
+{
+  const struct elf_m68k_got_entry *entry1;
+  struct elf_m68k_can_merge_gots_arg *arg;
+  const struct elf_m68k_got_entry *entry2;
+  enum elf_m68k_reloc_type type;
+
+  entry1 = (const struct elf_m68k_got_entry *) *_entry_ptr;
+  arg = (struct elf_m68k_can_merge_gots_arg *) _arg;
+
+  entry2 = elf_m68k_get_got_entry (arg->big, &entry1->key_, SEARCH, NULL);
+
+  if (entry2 != NULL)
+    /* We found an existing entry.  Check if we should update it.  */
+    {
+      type = elf_m68k_update_got_entry_type (arg->diff,
+					     entry2->key_.type,
+					     entry1->key_.type);
+
+      if (type == entry2->key_.type)
+	/* ENTRY1 doesn't update data in ENTRY2.  Skip it.
+	   To skip creation of difference entry we use the type,
+	   which we won't see in GOT entries for sure.  */
+	type = R_68K_max;
+    }
+  else
+    /* We didn't find the entry.  Add entry1 to DIFF.  */
+    {
+      BFD_ASSERT (entry1->key_.type != R_68K_max);
+
+      type = elf_m68k_update_got_entry_type (arg->diff,
+					     R_68K_max, entry1->key_.type);
+
+      if (entry1->key_.bfd != NULL)
+	arg->diff->local_n_slots += elf_m68k_reloc_got_n_slots (type);
+    }
+
+  if (type != R_68K_max)
+    /* Create an entry in DIFF.  */
+    {
+      struct elf_m68k_got_entry *entry;
+
+      entry = elf_m68k_get_got_entry (arg->diff, &entry1->key_, MUST_CREATE,
+				      arg->info);
+      if (entry == NULL)
+	{
+	  arg->error_p = TRUE;
+	  return 0;
+	}
+
+      entry->key_.type = type;
+    }
+
+  return 1;
+}
+
+/* Return TRUE if SMALL GOT can be added to BIG GOT without overflowing it.
+   Construct DIFF GOT holding the entries which should be added or updated
+   in BIG GOT to accumulate information from SMALL.
+   INFO is the context where memory should be allocated.  */
+
+static bfd_boolean
+elf_m68k_can_merge_gots (struct elf_m68k_got *big,
+			 const struct elf_m68k_got *small,
+			 struct bfd_link_info *info,
+			 struct elf_m68k_got *diff)
+{
+  struct elf_m68k_can_merge_gots_arg arg_;
+
+  BFD_ASSERT (small->offset == (bfd_vma) -1);
+
+  arg_.big = big;
+  arg_.diff = diff;
+  arg_.info = info;
+  arg_.error_p = FALSE;
+  htab_traverse_noresize (small->entries, elf_m68k_can_merge_gots_1, &arg_);
+  if (arg_.error_p)
+    {
+      diff->offset = 0;
+      return FALSE;
+    }
+
+  /* Check for overflow.  */
+  if ((big->n_slots[R_8] + arg_.diff->n_slots[R_8]
+       > ELF_M68K_R_8_MAX_N_SLOTS_IN_GOT (info))
+      || (big->n_slots[R_16] + arg_.diff->n_slots[R_16]
+	  > ELF_M68K_R_8_16_MAX_N_SLOTS_IN_GOT (info)))
+    return FALSE;
+
+  return TRUE;
+}
+
+struct elf_m68k_merge_gots_arg
+{
+  /* The BIG got.  */
+  struct elf_m68k_got *big;
+
+  /* Context where memory should be allocated.  */
+  struct bfd_link_info *info;
+
+  /* Error flag.  */
+  bfd_boolean error_p;
+};
+
+/* Process a single entry from DIFF got.  Add or update corresponding
+   entry in the BIG got.  */
+
+static int
+elf_m68k_merge_gots_1 (void **entry_ptr, void *_arg)
+{
+  const struct elf_m68k_got_entry *from;
+  struct elf_m68k_merge_gots_arg *arg;
+  struct elf_m68k_got_entry *to;
+
+  from = (const struct elf_m68k_got_entry *) *entry_ptr;
+  arg = (struct elf_m68k_merge_gots_arg *) _arg;
+
+  to = elf_m68k_get_got_entry (arg->big, &from->key_, FIND_OR_CREATE,
+			       arg->info);
+  if (to == NULL)
+    {
+      arg->error_p = TRUE;
+      return 0;
+    }
+
+  BFD_ASSERT (to->u.s1.refcount == 0);
+  /* All we need to merge is TYPE.  */
+  to->key_.type = from->key_.type;
+
+  return 1;
+}
+
+/* Merge data from DIFF to BIG.  INFO is context where memory should be
+   allocated.  */
+
+static bfd_boolean
+elf_m68k_merge_gots (struct elf_m68k_got *big,
+		     struct elf_m68k_got *diff,
+		     struct bfd_link_info *info)
+{
+  if (diff->entries != NULL)
+    /* DIFF is not empty.  Merge it into BIG GOT.  */
+    {
+      struct elf_m68k_merge_gots_arg arg_;
+
+      /* Merge entries.  */
+      arg_.big = big;
+      arg_.info = info;
+      arg_.error_p = FALSE;
+      htab_traverse_noresize (diff->entries, elf_m68k_merge_gots_1, &arg_);
+      if (arg_.error_p)
+	return FALSE;
+
+      /* Merge counters.  */
+      big->n_slots[R_8] += diff->n_slots[R_8];
+      big->n_slots[R_16] += diff->n_slots[R_16];
+      big->n_slots[R_32] += diff->n_slots[R_32];
+      big->local_n_slots += diff->local_n_slots;
+    }
+  else
+    /* DIFF is empty.  */
+    {
+      BFD_ASSERT (diff->n_slots[R_8] == 0);
+      BFD_ASSERT (diff->n_slots[R_16] == 0);
+      BFD_ASSERT (diff->n_slots[R_32] == 0);
+      BFD_ASSERT (diff->local_n_slots == 0);
+    }
+
+  BFD_ASSERT (!elf_m68k_hash_table (info)->allow_multigot_p
+	      || ((big->n_slots[R_8]
+		   <= ELF_M68K_R_8_MAX_N_SLOTS_IN_GOT (info))
+		  && (big->n_slots[R_16]
+		      <= ELF_M68K_R_8_16_MAX_N_SLOTS_IN_GOT (info))));
+
+  return TRUE;
+}
+
+struct elf_m68k_finalize_got_offsets_arg
+{
+  /* Ranges of the offsets for GOT entries.
+     R_x entries receive offsets between offset1[R_x] and offset2[R_x].
+     R_x is R_8, R_16 and R_32.  */
+  bfd_vma *offset1;
+  bfd_vma *offset2;
+
+  /* Mapping from global symndx to global symbols.
+     This is used to build lists of got entries for global symbols.  */
+  struct elf_m68k_link_hash_entry **symndx2h;
+
+  bfd_vma n_ldm_entries;
+};
+
+/* Assign ENTRY an offset.  Build list of GOT entries for global symbols
+   along the way.  */
+
+static int
+elf_m68k_finalize_got_offsets_1 (void **entry_ptr, void *_arg)
+{
+  struct elf_m68k_got_entry *entry;
+  struct elf_m68k_finalize_got_offsets_arg *arg;
+
+  enum elf_m68k_got_offset_size got_offset_size;
+  bfd_vma entry_size;
+
+  entry = (struct elf_m68k_got_entry *) *entry_ptr;
+  arg = (struct elf_m68k_finalize_got_offsets_arg *) _arg;
+
+  /* This should be a fresh entry created in elf_m68k_can_merge_gots.  */
+  BFD_ASSERT (entry->u.s1.refcount == 0);
+
+  /* Get GOT offset size for the entry .  */
+  got_offset_size = elf_m68k_reloc_got_offset_size (entry->key_.type);
+
+  /* Calculate entry size in bytes.  */
+  entry_size = 4 * elf_m68k_reloc_got_n_slots (entry->key_.type);
+
+  /* Check if we should switch to negative range of the offsets. */
+  if (arg->offset1[got_offset_size] + entry_size
+      > arg->offset2[got_offset_size])
+    {
+      /* Verify that this is the only switch to negative range for
+	 got_offset_size.  If this assertion fails, then we've miscalculated
+	 range for got_offset_size entries in
+	 elf_m68k_finalize_got_offsets.  */
+      BFD_ASSERT (arg->offset2[got_offset_size]
+		  != arg->offset2[-(int) got_offset_size - 1]);
+
+      /* Switch.  */
+      arg->offset1[got_offset_size] = arg->offset1[-(int) got_offset_size - 1];
+      arg->offset2[got_offset_size] = arg->offset2[-(int) got_offset_size - 1];
+
+      /* Verify that now we have enough room for the entry.  */
+      BFD_ASSERT (arg->offset1[got_offset_size] + entry_size
+		  <= arg->offset2[got_offset_size]);
+    }
+
+  /* Assign offset to entry.  */
+  entry->u.s2.offset = arg->offset1[got_offset_size];
+  arg->offset1[got_offset_size] += entry_size;
+
+  if (entry->key_.bfd == NULL)
+    /* Hook up this entry into the list of got_entries of H.  */
+    {
+      struct elf_m68k_link_hash_entry *h;
+
+      h = arg->symndx2h[entry->key_.symndx];
+      if (h != NULL)
+	{
+	  entry->u.s2.next = h->glist;
+	  h->glist = entry;
+	}
+      else
+	/* This should be the entry for TLS_LDM relocation then.  */
+	{
+	  BFD_ASSERT ((elf_m68k_reloc_got_type (entry->key_.type)
+		       == R_68K_TLS_LDM32)
+		      && entry->key_.symndx == 0);
+
+	  ++arg->n_ldm_entries;
+	}
+    }
+  else
+    /* This entry is for local symbol.  */
+    entry->u.s2.next = NULL;
+
+  return 1;
+}
+
+/* Assign offsets within GOT.  USE_NEG_GOT_OFFSETS_P indicates if we
+   should use negative offsets.
+   Build list of GOT entries for global symbols along the way.
+   SYMNDX2H is mapping from global symbol indices to actual
+   global symbols.
+   Return offset at which next GOT should start.  */
+
+static void
+elf_m68k_finalize_got_offsets (struct elf_m68k_got *got,
+			       bfd_boolean use_neg_got_offsets_p,
+			       struct elf_m68k_link_hash_entry **symndx2h,
+			       bfd_vma *final_offset, bfd_vma *n_ldm_entries)
+{
+  struct elf_m68k_finalize_got_offsets_arg arg_;
+  bfd_vma offset1_[2 * R_LAST];
+  bfd_vma offset2_[2 * R_LAST];
+  int i;
+  bfd_vma start_offset;
+
+  BFD_ASSERT (got->offset != (bfd_vma) -1);
+
+  /* We set entry offsets relative to the .got section (and not the
+     start of a particular GOT), so that we can use them in
+     finish_dynamic_symbol without needing to know the GOT which they come
+     from.  */
+
+  /* Put offset1 in the middle of offset1_, same for offset2.  */
+  arg_.offset1 = offset1_ + R_LAST;
+  arg_.offset2 = offset2_ + R_LAST;
+
+  start_offset = got->offset;
+
+  if (use_neg_got_offsets_p)
+    /* Setup both negative and positive ranges for R_8, R_16 and R_32.  */
+    i = -(int) R_32 - 1;
+  else
+    /* Setup positives ranges for R_8, R_16 and R_32.  */
+    i = (int) R_8;
+
+  for (; i <= (int) R_32; ++i)
+    {
+      int j;
+      size_t n;
+
+      /* Set beginning of the range of offsets I.  */
+      arg_.offset1[i] = start_offset;
+
+      /* Calculate number of slots that require I offsets.  */
+      j = (i >= 0) ? i : -i - 1;
+      n = (j >= 1) ? got->n_slots[j - 1] : 0;
+      n = got->n_slots[j] - n;
+
+      if (use_neg_got_offsets_p && n != 0)
+	{
+	  if (i < 0)
+	    /* We first fill the positive side of the range, so we might
+	       end up with one empty slot at that side when we can't fit
+	       whole 2-slot entry.  Account for that at negative side of
+	       the interval with one additional entry.  */
+	    n = n / 2 + 1;
+	  else
+	    /* When the number of slots is odd, make positive side of the
+	       range one entry bigger.  */
+	    n = (n + 1) / 2;
+	}
+
+      /* N is the number of slots that require I offsets.
+	 Calculate length of the range for I offsets.  */
+      n = 4 * n;
+
+      /* Set end of the range.  */
+      arg_.offset2[i] = start_offset + n;
+
+      start_offset = arg_.offset2[i];
+    }
+
+  if (!use_neg_got_offsets_p)
+    /* Make sure that if we try to switch to negative offsets in
+       elf_m68k_finalize_got_offsets_1, the assert therein will catch
+       the bug.  */
+    for (i = R_8; i <= R_32; ++i)
+      arg_.offset2[-i - 1] = arg_.offset2[i];
+
+  /* Setup got->offset.  offset1[R_8] is either in the middle or at the
+     beginning of GOT depending on use_neg_got_offsets_p.  */
+  got->offset = arg_.offset1[R_8];
+
+  arg_.symndx2h = symndx2h;
+  arg_.n_ldm_entries = 0;
+
+  /* Assign offsets.  */
+  htab_traverse (got->entries, elf_m68k_finalize_got_offsets_1, &arg_);
+
+  /* Check offset ranges we have actually assigned.  */
+  for (i = (int) R_8; i <= (int) R_32; ++i)
+    BFD_ASSERT (arg_.offset2[i] - arg_.offset1[i] <= 4);
+
+  *final_offset = start_offset;
+  *n_ldm_entries = arg_.n_ldm_entries;
+}
+
+struct elf_m68k_partition_multi_got_arg
+{
+  /* The GOT we are adding entries to.  Aka big got.  */
+  struct elf_m68k_got *current_got;
+
+  /* Offset to assign the next CURRENT_GOT.  */
+  bfd_vma offset;
+
+  /* Context where memory should be allocated.  */
+  struct bfd_link_info *info;
+
+  /* Total number of slots in the .got section.
+     This is used to calculate size of the .got and .rela.got sections.  */
+  bfd_vma n_slots;
+
+  /* Difference in numbers of allocated slots in the .got section
+     and necessary relocations in the .rela.got section.
+     This is used to calculate size of the .rela.got section.  */
+  bfd_vma slots_relas_diff;
+
+  /* Error flag.  */
+  bfd_boolean error_p;
+
+  /* Mapping from global symndx to global symbols.
+     This is used to build lists of got entries for global symbols.  */
+  struct elf_m68k_link_hash_entry **symndx2h;
+};
+
+static void
+elf_m68k_partition_multi_got_2 (struct elf_m68k_partition_multi_got_arg *arg)
+{
+  bfd_vma n_ldm_entries;
+
+  elf_m68k_finalize_got_offsets (arg->current_got,
+				 (elf_m68k_hash_table (arg->info)
+				  ->use_neg_got_offsets_p),
+				 arg->symndx2h,
+				 &arg->offset, &n_ldm_entries);
+
+  arg->n_slots += arg->current_got->n_slots[R_32];
+
+  if (!arg->info->shared)
+    /* If we are generating a shared object, we need to
+       output a R_68K_RELATIVE reloc so that the dynamic
+       linker can adjust this GOT entry.  Overwise we
+       don't need space in .rela.got for local symbols.  */
+    arg->slots_relas_diff += arg->current_got->local_n_slots;
+
+  /* @LDM relocations require a 2-slot GOT entry, but only
+     one relocation.  Account for that.  */
+  arg->slots_relas_diff += n_ldm_entries;
+
+  BFD_ASSERT (arg->slots_relas_diff <= arg->n_slots);
+}
+
+
+/* Process a single BFD2GOT entry and either merge GOT to CURRENT_GOT
+   or start a new CURRENT_GOT.  */
+
+static int
+elf_m68k_partition_multi_got_1 (void **_entry, void *_arg)
+{
+  struct elf_m68k_bfd2got_entry *entry;
+  struct elf_m68k_partition_multi_got_arg *arg;
+  struct elf_m68k_got *got;
+  struct elf_m68k_got diff_;
+  struct elf_m68k_got *diff;
+
+  entry = (struct elf_m68k_bfd2got_entry *) *_entry;
+  arg = (struct elf_m68k_partition_multi_got_arg *) _arg;
+
+  got = entry->got;
+  BFD_ASSERT (got != NULL);
+  BFD_ASSERT (got->offset == (bfd_vma) -1);
+
+  diff = NULL;
+
+  if (arg->current_got != NULL)
+    /* Construct diff.  */
+    {
+      diff = &diff_;
+      elf_m68k_init_got (diff);
+
+      if (!elf_m68k_can_merge_gots (arg->current_got, got, arg->info, diff))
+	{
+	  if (diff->offset == 0)
+	    /* Offset set to 0 in the diff_ indicates an error.  */
+	    {
+	      arg->error_p = TRUE;
+	      goto final_return;
+	    }
+
+	  if (elf_m68k_hash_table (arg->info)->allow_multigot_p)
+	    {
+	      elf_m68k_clear_got (diff);
+	      /* Schedule to finish up current_got and start new one.  */
+	      diff = NULL;
+	    }
+	  /* else
+	     Merge GOTs no matter what.  If big GOT overflows,
+	     we'll fail in relocate_section due to truncated relocations.
+
+	     ??? May be fail earlier?  E.g., in can_merge_gots.  */
+	}
+    }
+  else
+    /* Diff of got against empty current_got is got itself.  */
+    {
+      /* Create empty current_got to put subsequent GOTs to.  */
+      arg->current_got = elf_m68k_create_empty_got (arg->info);
+      if (arg->current_got == NULL)
+	{
+	  arg->error_p = TRUE;
+	  goto final_return;
+	}
+
+      arg->current_got->offset = arg->offset;
+
+      diff = got;
+    }
+
+  if (diff != NULL)
+    {
+      if (!elf_m68k_merge_gots (arg->current_got, diff, arg->info))
+	{
+	  arg->error_p = TRUE;
+	  goto final_return;
+	}
+
+      /* Now we can free GOT.  */
+      elf_m68k_clear_got (got);
+
+      entry->got = arg->current_got;
+    }
+  else
+    {
+      /* Finish up current_got.  */
+      elf_m68k_partition_multi_got_2 (arg);
+
+      /* Schedule to start a new current_got.  */
+      arg->current_got = NULL;
+
+      /* Retry.  */
+      if (!elf_m68k_partition_multi_got_1 (_entry, _arg))
+	{
+	  BFD_ASSERT (arg->error_p);
+	  goto final_return;
+	}
+    }
+
+ final_return:
+  if (diff != NULL)
+    elf_m68k_clear_got (diff);
+
+  return arg->error_p == FALSE ? 1 : 0;
+}
+
+/* Helper function to build symndx2h mapping.  */
+
+static bfd_boolean
+elf_m68k_init_symndx2h_1 (struct elf_link_hash_entry *_h,
+			  void *_arg)
+{
+  struct elf_m68k_link_hash_entry *h;
+
+  h = elf_m68k_hash_entry (_h);
+
+  if (h->got_entry_key != 0)
+    /* H has at least one entry in the GOT.  */
+    {
+      struct elf_m68k_partition_multi_got_arg *arg;
+
+      arg = (struct elf_m68k_partition_multi_got_arg *) _arg;
+
+      BFD_ASSERT (arg->symndx2h[h->got_entry_key] == NULL);
+      arg->symndx2h[h->got_entry_key] = h;
+    }
+
+  return TRUE;
+}
+
+/* Merge GOTs of some BFDs, assign offsets to GOT entries and build
+   lists of GOT entries for global symbols.
+   Calculate sizes of .got and .rela.got sections.  */
+
+static bfd_boolean
+elf_m68k_partition_multi_got (struct bfd_link_info *info)
+{
+  struct elf_m68k_multi_got *multi_got;
+  struct elf_m68k_partition_multi_got_arg arg_;
+
+  multi_got = elf_m68k_multi_got (info);
+
+  arg_.current_got = NULL;
+  arg_.offset = 0;
+  arg_.info = info;
+  arg_.n_slots = 0;
+  arg_.slots_relas_diff = 0;
+  arg_.error_p = FALSE;
+
+  if (multi_got->bfd2got != NULL)
+    {
+      /* Initialize symndx2h mapping.  */
+      {
+	arg_.symndx2h = bfd_zmalloc (multi_got->global_symndx
+				     * sizeof (*arg_.symndx2h));
+	if (arg_.symndx2h == NULL)
+	  return FALSE;
+
+	elf_link_hash_traverse (elf_hash_table (info),
+				elf_m68k_init_symndx2h_1, &arg_);
+      }
+
+      /* Partition.  */
+      htab_traverse (multi_got->bfd2got, elf_m68k_partition_multi_got_1,
+		     &arg_);
+      if (arg_.error_p)
+	{
+	  free (arg_.symndx2h);
+	  arg_.symndx2h = NULL;
+
+	  return FALSE;
+	}
+
+      /* Finish up last current_got.  */
+      elf_m68k_partition_multi_got_2 (&arg_);
+
+      free (arg_.symndx2h);
+    }
+
+  if (elf_hash_table (info)->dynobj != NULL)
+    /* Set sizes of .got and .rela.got sections.  */
+    {
+      asection *s;
+
+      s = bfd_get_section_by_name (elf_hash_table (info)->dynobj, ".got");
+      if (s != NULL)
+	s->size = arg_.offset;
+      else
+	BFD_ASSERT (arg_.offset == 0);
+
+      BFD_ASSERT (arg_.slots_relas_diff <= arg_.n_slots);
+      arg_.n_slots -= arg_.slots_relas_diff;
+
+      s = bfd_get_section_by_name (elf_hash_table (info)->dynobj, ".rela.got");
+      if (s != NULL)
+	s->size = arg_.n_slots * sizeof (Elf32_External_Rela);
+      else
+	BFD_ASSERT (arg_.n_slots == 0);
+    }
+  else
+    BFD_ASSERT (multi_got->bfd2got == NULL);
+
+  return TRUE;
+}
+
+/* Specialized version of elf_m68k_get_got_entry that returns pointer
+   to hashtable slot, thus allowing removal of entry via
+   elf_m68k_remove_got_entry.  */
+
+static struct elf_m68k_got_entry **
+elf_m68k_find_got_entry_ptr (struct elf_m68k_got *got,
+			     struct elf_m68k_got_entry_key *key)
+{
+  void **ptr;
+  struct elf_m68k_got_entry entry_;
+  struct elf_m68k_got_entry **entry_ptr;
+
+  entry_.key_ = *key;
+  ptr = htab_find_slot (got->entries, &entry_, NO_INSERT);
+  BFD_ASSERT (ptr != NULL);
+
+  entry_ptr = (struct elf_m68k_got_entry **) ptr;
+
+  return entry_ptr;
+}
+
+/* Remove entry pointed to by ENTRY_PTR from GOT.  */
+
+static void
+elf_m68k_remove_got_entry (struct elf_m68k_got *got,
+			   struct elf_m68k_got_entry **entry_ptr)
+{
+  struct elf_m68k_got_entry *entry;
+
+  entry = *entry_ptr;
+
+  /* Check that offsets have not been finalized yet.  */
+  BFD_ASSERT (got->offset == (bfd_vma) -1);
+  /* Check that this entry is indeed unused.  */
+  BFD_ASSERT (entry->u.s1.refcount == 0);
+
+  elf_m68k_remove_got_entry_type (got, entry->key_.type);
+
+  if (entry->key_.bfd != NULL)
+    got->local_n_slots -= elf_m68k_reloc_got_n_slots (entry->key_.type);
+
+  BFD_ASSERT (got->n_slots[R_32] >= got->local_n_slots);
+
+  htab_clear_slot (got->entries, (void **) entry_ptr);
+}
+
+/* Copy any information related to dynamic linking from a pre-existing
+   symbol to a newly created symbol.  Also called to copy flags and
+   other back-end info to a weakdef, in which case the symbol is not
+   newly created and plt/got refcounts and dynamic indices should not
+   be copied.  */
+
+static void
+elf_m68k_copy_indirect_symbol (struct bfd_link_info *info,
+			       struct elf_link_hash_entry *_dir,
+			       struct elf_link_hash_entry *_ind)
+{
+  struct elf_m68k_link_hash_entry *dir;
+  struct elf_m68k_link_hash_entry *ind;
+
+  _bfd_elf_link_hash_copy_indirect (info, _dir, _ind);
+
+  if (_ind->root.type != bfd_link_hash_indirect)
+    return;
+
+  dir = elf_m68k_hash_entry (_dir);
+  ind = elf_m68k_hash_entry (_ind);
+
+  /* Any absolute non-dynamic relocations against an indirect or weak
+     definition will be against the target symbol.  */
+  _dir->non_got_ref |= _ind->non_got_ref;
+
+  /* We might have a direct symbol already having entries in the GOTs.
+     Update its key only in case indirect symbol has GOT entries and
+     assert that both indirect and direct symbols don't have GOT entries
+     at the same time.  */
+  if (ind->got_entry_key != 0)
+    {
+      BFD_ASSERT (dir->got_entry_key == 0);
+      /* Assert that GOTs aren't partioned yet.  */
+      BFD_ASSERT (ind->glist == NULL);
+
+      dir->got_entry_key = ind->got_entry_key;
+      ind->got_entry_key = 0;
+    }
+}
+
+/* Look through the relocs for a section during the first phase, and
+   allocate space in the global offset table or procedure linkage
+   table.  */
+
+static bfd_boolean
+elf_m68k_check_relocs (abfd, info, sec, relocs)
+     bfd *abfd;
+     struct bfd_link_info *info;
+     asection *sec;
+     const Elf_Internal_Rela *relocs;
+{
+  bfd *dynobj;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  asection *sgot;
+  asection *srelgot;
+  asection *sreloc;
+  struct elf_m68k_got *got;
+
+  if (info->relocatable)
+    return TRUE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  sgot = NULL;
+  srelgot = NULL;
+  sreloc = NULL;
+
+  got = NULL;
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      if (r_symndx < symtab_hdr->sh_info)
+	h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      switch (ELF32_R_TYPE (rel->r_info))
+	{
+	case R_68K_GOT8:
+	case R_68K_GOT16:
+	case R_68K_GOT32:
+	  if (h != NULL
+	      && strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
+	    break;
+	  /* Fall through.  */
+
+	  /* Relative GOT relocations.  */
+	case R_68K_GOT8O:
+	case R_68K_GOT16O:
+	case R_68K_GOT32O:
+	  /* Fall through.  */
+
+	  /* TLS relocations.  */
+	case R_68K_TLS_GD8:
+	case R_68K_TLS_GD16:
+	case R_68K_TLS_GD32:
+	case R_68K_TLS_LDM8:
+	case R_68K_TLS_LDM16:
+	case R_68K_TLS_LDM32:
+	case R_68K_TLS_IE8:
+	case R_68K_TLS_IE16:
+	case R_68K_TLS_IE32:
+
+	case R_68K_TLS_TPREL32:
+	case R_68K_TLS_DTPREL32:
+
+	  if (ELF32_R_TYPE (rel->r_info) == R_68K_TLS_TPREL32
+	      && info->shared)
+	    /* Do the special chorus for libraries with static TLS.  */
+	    info->flags |= DF_STATIC_TLS;
+
+	  /* This symbol requires a global offset table entry.  */
+
+	  if (dynobj == NULL)
+	    {
+	      /* Create the .got section.  */
+	      elf_hash_table (info)->dynobj = dynobj = abfd;
+	      if (!_bfd_elf_create_got_section (dynobj, info))
+		return FALSE;
+	    }
+
+	  if (sgot == NULL)
+	    {
+	      sgot = bfd_get_section_by_name (dynobj, ".got");
+	      BFD_ASSERT (sgot != NULL);
+	    }
+
+	  if (srelgot == NULL
+	      && (h != NULL || info->shared))
+	    {
+	      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+	      if (srelgot == NULL)
+		{
+		  srelgot = bfd_make_section_with_flags (dynobj,
+							 ".rela.got",
+							 (SEC_ALLOC
+							  | SEC_LOAD
+							  | SEC_HAS_CONTENTS
+							  | SEC_IN_MEMORY
+							  | SEC_LINKER_CREATED
+							  | SEC_READONLY));
+		  if (srelgot == NULL
+		      || !bfd_set_section_alignment (dynobj, srelgot, 2))
+		    return FALSE;
+		}
+	    }
+
+	  if (got == NULL)
+	    {
+	      struct elf_m68k_bfd2got_entry *bfd2got_entry;
+
+	      bfd2got_entry
+		= elf_m68k_get_bfd2got_entry (elf_m68k_multi_got (info),
+					      abfd, FIND_OR_CREATE, info);
+	      if (bfd2got_entry == NULL)
+		return FALSE;
+
+	      got = bfd2got_entry->got;
+	      BFD_ASSERT (got != NULL);
+	    }
+
+	  {
+	    struct elf_m68k_got_entry *got_entry;
+
+	    /* Add entry to got.  */
+	    got_entry = elf_m68k_add_entry_to_got (got, h, abfd,
+						   ELF32_R_TYPE (rel->r_info),
+						   r_symndx, info);
+	    if (got_entry == NULL)
+	      return FALSE;
+
+	    if (got_entry->u.s1.refcount == 1)
+	      {
+		/* Make sure this symbol is output as a dynamic symbol.  */
+		if (h != NULL
+		    && h->dynindx == -1
+		    && !h->forced_local)
+		  {
+		    if (!bfd_elf_link_record_dynamic_symbol (info, h))
+		      return FALSE;
+		  }
+	      }
+	  }
+
+	  break;
+
+	case R_68K_PLT8:
+	case R_68K_PLT16:
+	case R_68K_PLT32:
+	  /* This symbol requires a procedure linkage table entry.  We
+	     actually build the entry in adjust_dynamic_symbol,
+             because this might be a case of linking PIC code which is
+             never referenced by a dynamic object, in which case we
+             don't need to generate a procedure linkage table entry
+             after all.  */
+
+	  /* If this is a local symbol, we resolve it directly without
+	     creating a procedure linkage table entry.  */
+	  if (h == NULL)
+	    continue;
+
+	  h->needs_plt = 1;
+	  h->plt.refcount++;
+	  break;
+
+	case R_68K_PLT8O:
+	case R_68K_PLT16O:
+	case R_68K_PLT32O:
+	  /* This symbol requires a procedure linkage table entry.  */
+
+	  if (h == NULL)
+	    {
+	      /* It does not make sense to have this relocation for a
+		 local symbol.  FIXME: does it?  How to handle it if
+		 it does make sense?  */
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+
+	  /* Make sure this symbol is output as a dynamic symbol.  */
+	  if (h->dynindx == -1
+	      && !h->forced_local)
+	    {
+	      if (!bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+
+	  h->needs_plt = 1;
+	  h->plt.refcount++;
+	  break;
+
+	case R_68K_PC8:
+	case R_68K_PC16:
+	case R_68K_PC32:
+	  /* If we are creating a shared library and this is not a local
+	     symbol, we need to copy the reloc into the shared library.
+	     However when linking with -Bsymbolic and this is a global
+	     symbol which is defined in an object we are including in the
+	     link (i.e., DEF_REGULAR is set), then we can resolve the
+	     reloc directly.  At this point we have not seen all the input
+	     files, so it is possible that DEF_REGULAR is not set now but
+	     will be set later (it is never cleared).  We account for that
+	     possibility below by storing information in the
+	     pcrel_relocs_copied field of the hash table entry.  */
+	  if (!(info->shared
+		&& (sec->flags & SEC_ALLOC) != 0
+		&& h != NULL
+		&& (!info->symbolic
+		    || h->root.type == bfd_link_hash_defweak
+		    || !h->def_regular)))
+	    {
+	      if (h != NULL)
+		{
+		  /* Make sure a plt entry is created for this symbol if
+		     it turns out to be a function defined by a dynamic
+		     object.  */
+		  h->plt.refcount++;
+		}
+	      break;
+	    }
+	  /* Fall through.  */
+	case R_68K_8:
+	case R_68K_16:
+	case R_68K_32:
+	  if (h != NULL)
+	    {
+	      /* Make sure a plt entry is created for this symbol if it
+		 turns out to be a function defined by a dynamic object.  */
+	      h->plt.refcount++;
+
+	      if (!info->shared)
+		/* This symbol needs a non-GOT reference.  */
+		h->non_got_ref = 1;
+	    }
+
+	  /* If we are creating a shared library, we need to copy the
+	     reloc into the shared library.  */
+	  if (info->shared
+	      && (sec->flags & SEC_ALLOC) != 0)
+	    {
+	      /* When creating a shared object, we must copy these
+		 reloc types into the output file.  We create a reloc
+		 section in dynobj and make room for this reloc.  */
+	      if (sreloc == NULL)
+		{
+		  sreloc = _bfd_elf_make_dynamic_reloc_section
+		    (sec, dynobj, 2, abfd, /*rela?*/ TRUE);
+
+		  if (sreloc == NULL)
+		    return FALSE;
+		}
+
+	      if (sec->flags & SEC_READONLY
+		  /* Don't set DF_TEXTREL yet for PC relative
+		     relocations, they might be discarded later.  */
+		  && !(ELF32_R_TYPE (rel->r_info) == R_68K_PC8
+		       || ELF32_R_TYPE (rel->r_info) == R_68K_PC16
+		       || ELF32_R_TYPE (rel->r_info) == R_68K_PC32))
+		    info->flags |= DF_TEXTREL;
+
+	      sreloc->size += sizeof (Elf32_External_Rela);
+
+	      /* We count the number of PC relative relocations we have
+		 entered for this symbol, so that we can discard them
+		 again if, in the -Bsymbolic case, the symbol is later
+		 defined by a regular object, or, in the normal shared
+		 case, the symbol is forced to be local.  Note that this
+		 function is only called if we are using an m68kelf linker
+		 hash table, which means that h is really a pointer to an
+		 elf_m68k_link_hash_entry.  */
+	      if (ELF32_R_TYPE (rel->r_info) == R_68K_PC8
+		  || ELF32_R_TYPE (rel->r_info) == R_68K_PC16
+		  || ELF32_R_TYPE (rel->r_info) == R_68K_PC32)
+		{
+		  struct elf_m68k_pcrel_relocs_copied *p;
+		  struct elf_m68k_pcrel_relocs_copied **head;
+
+		  if (h != NULL)
+		    {
+		      struct elf_m68k_link_hash_entry *eh
+			= elf_m68k_hash_entry (h);
+		      head = &eh->pcrel_relocs_copied;
+		    }
+		  else
+		    {
+		      asection *s;
+		      void *vpp;
+		      Elf_Internal_Sym *isym;
+
+		      isym = bfd_sym_from_r_symndx (&elf_m68k_hash_table (info)->sym_cache,
+						    abfd, r_symndx);
+		      if (isym == NULL)
+			return FALSE;
+
+		      s = bfd_section_from_elf_index (abfd, isym->st_shndx);
+		      if (s == NULL)
+			s = sec;
+
+		      vpp = &elf_section_data (s)->local_dynrel;
+		      head = (struct elf_m68k_pcrel_relocs_copied **) vpp;
+		    }
+
+		  for (p = *head; p != NULL; p = p->next)
+		    if (p->section == sreloc)
+		      break;
+
+		  if (p == NULL)
+		    {
+		      p = ((struct elf_m68k_pcrel_relocs_copied *)
+			   bfd_alloc (dynobj, (bfd_size_type) sizeof *p));
+		      if (p == NULL)
+			return FALSE;
+		      p->next = *head;
+		      *head = p;
+		      p->section = sreloc;
+		      p->count = 0;
+		    }
+
+		  ++p->count;
+		}
+	    }
+
+	  break;
+
+	  /* This relocation describes the C++ object vtable hierarchy.
+	     Reconstruct it for later use during GC.  */
+	case R_68K_GNU_VTINHERIT:
+	  if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+	    return FALSE;
+	  break;
+
+	  /* This relocation describes which C++ vtable entries are actually
+	     used.  Record for later use during GC.  */
+	case R_68K_GNU_VTENTRY:
+	  BFD_ASSERT (h != NULL);
+	  if (h != NULL
+	      && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+	    return FALSE;
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+static asection *
+elf_m68k_gc_mark_hook (asection *sec,
+		       struct bfd_link_info *info,
+		       Elf_Internal_Rela *rel,
+		       struct elf_link_hash_entry *h,
+		       Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_68K_GNU_VTINHERIT:
+      case R_68K_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Update the got entry reference counts for the section being removed.  */
+
+static bfd_boolean
+elf_m68k_gc_sweep_hook (bfd *abfd,
+			struct bfd_link_info *info,
+			asection *sec,
+			const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel, *relend;
+  bfd *dynobj;
+  struct elf_m68k_got *got;
+
+  if (info->relocatable)
+    return TRUE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  if (dynobj == NULL)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  got = NULL;
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h = NULL;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      switch (ELF32_R_TYPE (rel->r_info))
+	{
+	case R_68K_GOT8:
+	case R_68K_GOT16:
+	case R_68K_GOT32:
+	  if (h != NULL
+	      && strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
+	    break;
+
+	  /* FALLTHRU */
+	case R_68K_GOT8O:
+	case R_68K_GOT16O:
+	case R_68K_GOT32O:
+	  /* Fall through.  */
+
+	  /* TLS relocations.  */
+	case R_68K_TLS_GD8:
+	case R_68K_TLS_GD16:
+	case R_68K_TLS_GD32:
+	case R_68K_TLS_LDM8:
+	case R_68K_TLS_LDM16:
+	case R_68K_TLS_LDM32:
+	case R_68K_TLS_IE8:
+	case R_68K_TLS_IE16:
+	case R_68K_TLS_IE32:
+
+	case R_68K_TLS_TPREL32:
+	case R_68K_TLS_DTPREL32:
+
+	  if (got == NULL)
+	    {
+	      got = elf_m68k_get_bfd2got_entry (elf_m68k_multi_got (info),
+						abfd, MUST_FIND, NULL)->got;
+	      BFD_ASSERT (got != NULL);
+	    }
+
+	  {
+	    struct elf_m68k_got_entry_key key_;
+	    struct elf_m68k_got_entry **got_entry_ptr;
+	    struct elf_m68k_got_entry *got_entry;
+
+	    elf_m68k_init_got_entry_key (&key_, h, abfd, r_symndx,
+					 ELF32_R_TYPE (rel->r_info));
+	    got_entry_ptr = elf_m68k_find_got_entry_ptr (got, &key_);
+
+	    got_entry = *got_entry_ptr;
+
+	    if (got_entry->u.s1.refcount > 0)
+	      {
+		--got_entry->u.s1.refcount;
+
+		if (got_entry->u.s1.refcount == 0)
+		  /* We don't need the .got entry any more.  */
+		  elf_m68k_remove_got_entry (got, got_entry_ptr);
+	      }
+	  }
+	  break;
+
+	case R_68K_PLT8:
+	case R_68K_PLT16:
+	case R_68K_PLT32:
+	case R_68K_PLT8O:
+	case R_68K_PLT16O:
+	case R_68K_PLT32O:
+	case R_68K_PC8:
+	case R_68K_PC16:
+	case R_68K_PC32:
+	case R_68K_8:
+	case R_68K_16:
+	case R_68K_32:
+	  if (h != NULL)
+	    {
+	      if (h->plt.refcount > 0)
+		--h->plt.refcount;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return the type of PLT associated with OUTPUT_BFD.  */
+
+static const struct elf_m68k_plt_info *
+elf_m68k_get_plt_info (bfd *output_bfd)
+{
+  unsigned int features;
+
+  features = bfd_m68k_mach_to_features (bfd_get_mach (output_bfd));
+  if (features & cpu32)
+    return &elf_cpu32_plt_info;
+  if (features & mcfisa_b)
+    return &elf_isab_plt_info;
+  if (features & mcfisa_c)
+    return &elf_isac_plt_info;
+  return &elf_m68k_plt_info;
+}
+
+/* This function is called after all the input files have been read,
+   and the input sections have been assigned to output sections.
+   It's a convenient place to determine the PLT style.  */
+
+static bfd_boolean
+elf_m68k_always_size_sections (bfd *output_bfd, struct bfd_link_info *info)
+{
+  /* Bind input BFDs to GOTs and calculate sizes of .got and .rela.got
+     sections.  */
+  if (!elf_m68k_partition_multi_got (info))
+    return FALSE;
+
+  elf_m68k_hash_table (info)->plt_info = elf_m68k_get_plt_info (output_bfd);
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+elf_m68k_adjust_dynamic_symbol (info, h)
+     struct bfd_link_info *info;
+     struct elf_link_hash_entry *h;
+{
+  struct elf_m68k_link_hash_table *htab;
+  bfd *dynobj;
+  asection *s;
+
+  htab = elf_m68k_hash_table (info);
+  dynobj = elf_hash_table (info)->dynobj;
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (dynobj != NULL
+	      && (h->needs_plt
+		  || h->u.weakdef != NULL
+		  || (h->def_dynamic
+		      && h->ref_regular
+		      && !h->def_regular)));
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later,
+     when we know the address of the .got section.  */
+  if (h->type == STT_FUNC
+      || h->needs_plt)
+    {
+      if ((h->plt.refcount <= 0
+           || SYMBOL_CALLS_LOCAL (info, h)
+	   || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+	       && h->root.type == bfd_link_hash_undefweak))
+	  /* We must always create the plt entry if it was referenced
+	     by a PLTxxO relocation.  In this case we already recorded
+	     it as a dynamic symbol.  */
+	  && h->dynindx == -1)
+	{
+	  /* This case can occur if we saw a PLTxx reloc in an input
+	     file, but the symbol was never referred to by a dynamic
+	     object, or if all references were garbage collected.  In
+	     such a case, we don't actually need to build a procedure
+	     linkage table, and we can just do a PCxx reloc instead.  */
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	  return TRUE;
+	}
+
+      /* Make sure this symbol is output as a dynamic symbol.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      s = bfd_get_section_by_name (dynobj, ".plt");
+      BFD_ASSERT (s != NULL);
+
+      /* If this is the first .plt entry, make room for the special
+	 first entry.  */
+      if (s->size == 0)
+	s->size = htab->plt_info->size;
+
+      /* If this symbol is not defined in a regular file, and we are
+	 not generating a shared library, then set the symbol to this
+	 location in the .plt.  This is required to make function
+	 pointers compare as equal between the normal executable and
+	 the shared library.  */
+      if (!info->shared
+	  && !h->def_regular)
+	{
+	  h->root.u.def.section = s;
+	  h->root.u.def.value = s->size;
+	}
+
+      h->plt.offset = s->size;
+
+      /* Make room for this entry.  */
+      s->size += htab->plt_info->size;
+
+      /* We also need to make an entry in the .got.plt section, which
+	 will be placed in the .got section by the linker script.  */
+      s = bfd_get_section_by_name (dynobj, ".got.plt");
+      BFD_ASSERT (s != NULL);
+      s->size += 4;
+
+      /* We also need to make an entry in the .rela.plt section.  */
+      s = bfd_get_section_by_name (dynobj, ".rela.plt");
+      BFD_ASSERT (s != NULL);
+      s->size += sizeof (Elf32_External_Rela);
+
+      return TRUE;
+    }
+
+  /* Reinitialize the plt offset now that it is not used as a reference
+     count any more.  */
+  h->plt.offset = (bfd_vma) -1;
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if (!h->non_got_ref)
+    return TRUE;
+
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  s = bfd_get_section_by_name (dynobj, ".dynbss");
+  BFD_ASSERT (s != NULL);
+
+  /* We must generate a R_68K_COPY reloc to tell the dynamic linker to
+     copy the initial value out of the dynamic object and into the
+     runtime process image.  We need to remember the offset into the
+     .rela.bss section we are going to use.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      asection *srel;
+
+      srel = bfd_get_section_by_name (dynobj, ".rela.bss");
+      BFD_ASSERT (srel != NULL);
+      srel->size += sizeof (Elf32_External_Rela);
+      h->needs_copy = 1;
+    }
+
+  return _bfd_elf_adjust_dynamic_copy (h, s);
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+elf_m68k_size_dynamic_sections (output_bfd, info)
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info;
+{
+  bfd *dynobj;
+  asection *s;
+  bfd_boolean plt;
+  bfd_boolean relocs;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (s != NULL);
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+  else
+    {
+      /* We may have created entries in the .rela.got section.
+	 However, if we are not creating the dynamic sections, we will
+	 not actually use these entries.  Reset the size of .rela.got,
+	 which will cause it to get stripped from the output file
+	 below.  */
+      s = bfd_get_section_by_name (dynobj, ".rela.got");
+      if (s != NULL)
+	s->size = 0;
+    }
+
+  /* If this is a -Bsymbolic shared link, then we need to discard all
+     PC relative relocs against symbols defined in a regular object.
+     For the normal shared case we discard the PC relative relocs
+     against symbols that have become local due to visibility changes.
+     We allocated space for them in the check_relocs routine, but we
+     will not fill them in in the relocate_section routine.  */
+  if (info->shared)
+    elf_link_hash_traverse (elf_hash_table (info),
+			    elf_m68k_discard_copies,
+			    (PTR) info);
+
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  plt = FALSE;
+  relocs = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      const char *name;
+
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      /* It's OK to base decisions on the section name, because none
+	 of the dynobj section names depend upon the input files.  */
+      name = bfd_get_section_name (dynobj, s);
+
+      if (strcmp (name, ".plt") == 0)
+	{
+	  /* Remember whether there is a PLT.  */
+	  plt = s->size != 0;
+	}
+      else if (CONST_STRNEQ (name, ".rela"))
+	{
+	  if (s->size != 0)
+	    {
+	      relocs = TRUE;
+
+	      /* We use the reloc_count field as a counter if we need
+		 to copy relocs into the output file.  */
+	      s->reloc_count = 0;
+	    }
+	}
+      else if (! CONST_STRNEQ (name, ".got")
+	       && strcmp (name, ".dynbss") != 0)
+	{
+	  /* It's not one of our sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (s->size == 0)
+	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is mostly to handle .rela.bss and
+	     .rela.plt.  We must create both sections in
+	     create_dynamic_sections, because they must be created
+	     before the linker maps input sections to output
+	     sections.  The linker does that before
+	     adjust_dynamic_symbol is called, and it is that
+	     function which decides whether anything needs to go
+	     into these sections.  */
+	  s->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents.  */
+      /* FIXME: This should be a call to bfd_alloc not bfd_zalloc.
+	 Unused entries should be reclaimed before the section's contents
+	 are written out, but at the moment this does not happen.  Thus in
+	 order to prevent writing out garbage, we initialise the section's
+	 contents to zero.  */
+      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in elf_m68k_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (!info->shared)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (plt)
+	{
+	  if (!add_dynamic_entry (DT_PLTGOT, 0)
+	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+	      || !add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+	}
+
+      if (relocs)
+	{
+	  if (!add_dynamic_entry (DT_RELA, 0)
+	      || !add_dynamic_entry (DT_RELASZ, 0)
+	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
+	    return FALSE;
+	}
+
+      if ((info->flags & DF_TEXTREL) != 0)
+	{
+	  if (!add_dynamic_entry (DT_TEXTREL, 0))
+	    return FALSE;
+	}
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+/* This function is called via elf_link_hash_traverse if we are
+   creating a shared object.  In the -Bsymbolic case it discards the
+   space allocated to copy PC relative relocs against symbols which
+   are defined in regular objects.  For the normal shared case, it
+   discards space for pc-relative relocs that have become local due to
+   symbol visibility changes.  We allocated space for them in the
+   check_relocs routine, but we won't fill them in in the
+   relocate_section routine.
+
+   We also check whether any of the remaining relocations apply
+   against a readonly section, and set the DF_TEXTREL flag in this
+   case.  */
+
+static bfd_boolean
+elf_m68k_discard_copies (h, inf)
+     struct elf_link_hash_entry *h;
+     PTR inf;
+{
+  struct bfd_link_info *info = (struct bfd_link_info *) inf;
+  struct elf_m68k_pcrel_relocs_copied *s;
+
+  if (!SYMBOL_CALLS_LOCAL (info, h))
+    {
+      if ((info->flags & DF_TEXTREL) == 0)
+	{
+	  /* Look for relocations against read-only sections.  */
+	  for (s = elf_m68k_hash_entry (h)->pcrel_relocs_copied;
+	       s != NULL;
+	       s = s->next)
+	    if ((s->section->flags & SEC_READONLY) != 0)
+	      {
+		info->flags |= DF_TEXTREL;
+		break;
+	      }
+	}
+
+      return TRUE;
+    }
+
+  for (s = elf_m68k_hash_entry (h)->pcrel_relocs_copied;
+       s != NULL;
+       s = s->next)
+    s->section->size -= s->count * sizeof (Elf32_External_Rela);
+
+  return TRUE;
+}
+
+
+/* Install relocation RELA.  */
+
+static void
+elf_m68k_install_rela (bfd *output_bfd,
+		       asection *srela,
+		       Elf_Internal_Rela *rela)
+{
+  bfd_byte *loc;
+
+  loc = srela->contents;
+  loc += srela->reloc_count++ * sizeof (Elf32_External_Rela);
+  bfd_elf32_swap_reloca_out (output_bfd, rela, loc);
+}
+
+/* Find the base offsets for thread-local storage in this object,
+   for GD/LD and IE/LE respectively.  */
+
+#define DTP_OFFSET 0x8000
+#define TP_OFFSET  0x7000
+
+static bfd_vma
+dtpoff_base (struct bfd_link_info *info)
+{
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (elf_hash_table (info)->tls_sec == NULL)
+    return 0;
+  return elf_hash_table (info)->tls_sec->vma + DTP_OFFSET;
+}
+
+static bfd_vma
+tpoff_base (struct bfd_link_info *info)
+{
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (elf_hash_table (info)->tls_sec == NULL)
+    return 0;
+  return elf_hash_table (info)->tls_sec->vma + TP_OFFSET;
+}
+
+/* Output necessary relocation to handle a symbol during static link.
+   This function is called from elf_m68k_relocate_section.  */
+
+static void
+elf_m68k_init_got_entry_static (struct bfd_link_info *info,
+				bfd *output_bfd,
+				enum elf_m68k_reloc_type r_type,
+				asection *sgot,
+				bfd_vma got_entry_offset,
+				bfd_vma relocation)
+{
+  switch (elf_m68k_reloc_got_type (r_type))
+    {
+    case R_68K_GOT32O:
+      bfd_put_32 (output_bfd, relocation, sgot->contents + got_entry_offset);
+      break;
+
+    case R_68K_TLS_GD32:
+      /* We know the offset within the module,
+	 put it into the second GOT slot.  */
+      bfd_put_32 (output_bfd, relocation - dtpoff_base (info),
+		  sgot->contents + got_entry_offset + 4);
+      /* FALLTHRU */
+
+    case R_68K_TLS_LDM32:
+      /* Mark it as belonging to module 1, the executable.  */
+      bfd_put_32 (output_bfd, 1, sgot->contents + got_entry_offset);
+      break;
+
+    case R_68K_TLS_IE32:
+      bfd_put_32 (output_bfd, relocation - tpoff_base (info),
+		  sgot->contents + got_entry_offset);
+      break;
+
+    default:
+      BFD_ASSERT (FALSE);
+    }
+}
+
+/* Output necessary relocation to handle a local symbol
+   during dynamic link.
+   This function is called either from elf_m68k_relocate_section
+   or from elf_m68k_finish_dynamic_symbol.  */
+
+static void
+elf_m68k_init_got_entry_local_shared (struct bfd_link_info *info,
+				      bfd *output_bfd,
+				      enum elf_m68k_reloc_type r_type,
+				      asection *sgot,
+				      bfd_vma got_entry_offset,
+				      bfd_vma relocation,
+				      asection *srela)
+{
+  Elf_Internal_Rela outrel;
+
+  switch (elf_m68k_reloc_got_type (r_type))
+    {
+    case R_68K_GOT32O:
+      /* Emit RELATIVE relocation to initialize GOT slot
+	 at run-time.  */
+      outrel.r_info = ELF32_R_INFO (0, R_68K_RELATIVE);
+      outrel.r_addend = relocation;
+      break;
+
+    case R_68K_TLS_GD32:
+      /* We know the offset within the module,
+	 put it into the second GOT slot.  */
+      bfd_put_32 (output_bfd, relocation - dtpoff_base (info),
+		  sgot->contents + got_entry_offset + 4);
+      /* FALLTHRU */
+
+    case R_68K_TLS_LDM32:
+      /* We don't know the module number,
+	 create a relocation for it.  */
+      outrel.r_info = ELF32_R_INFO (0, R_68K_TLS_DTPMOD32);
+      outrel.r_addend = 0;
+      break;
+
+    case R_68K_TLS_IE32:
+      /* Emit TPREL relocation to initialize GOT slot
+	 at run-time.  */
+      outrel.r_info = ELF32_R_INFO (0, R_68K_TLS_TPREL32);
+      outrel.r_addend = relocation - elf_hash_table (info)->tls_sec->vma;
+      break;
+
+    default:
+      BFD_ASSERT (FALSE);
+    }
+
+  /* Offset of the GOT entry.  */
+  outrel.r_offset = (sgot->output_section->vma
+		     + sgot->output_offset
+		     + got_entry_offset);
+
+  /* Install one of the above relocations.  */
+  elf_m68k_install_rela (output_bfd, srela, &outrel);
+
+  bfd_put_32 (output_bfd, outrel.r_addend, sgot->contents + got_entry_offset);
+}
+
+/* Relocate an M68K ELF section.  */
+
+static bfd_boolean
+elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section,
+			   contents, relocs, local_syms, local_sections)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     Elf_Internal_Rela *relocs;
+     Elf_Internal_Sym *local_syms;
+     asection **local_sections;
+{
+  bfd *dynobj;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  asection *sgot;
+  asection *splt;
+  asection *sreloc;
+  asection *srela;
+  struct elf_m68k_got *got;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+
+  sgot = NULL;
+  splt = NULL;
+  sreloc = NULL;
+  srela = NULL;
+
+  got = NULL;
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      bfd_vma relocation;
+      bfd_boolean unresolved_reloc;
+      bfd_reloc_status_type r;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      if (r_type < 0 || r_type >= (int) R_68K_max)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+      howto = howto_table + r_type;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      unresolved_reloc = FALSE;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+      else
+	{
+	  bfd_boolean warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      switch (r_type)
+	{
+	case R_68K_GOT8:
+	case R_68K_GOT16:
+	case R_68K_GOT32:
+	  /* Relocation is to the address of the entry for this symbol
+	     in the global offset table.  */
+	  if (h != NULL
+	      && strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
+	    {
+	      if (elf_m68k_hash_table (info)->local_gp_p)
+		{
+		  bfd_vma sgot_output_offset;
+		  bfd_vma got_offset;
+
+		  if (sgot == NULL)
+		    {
+		      sgot = bfd_get_section_by_name (dynobj, ".got");
+
+		      if (sgot != NULL)
+			sgot_output_offset = sgot->output_offset;
+		      else
+			/* In this case we have a reference to
+			   _GLOBAL_OFFSET_TABLE_, but the GOT itself is
+			   empty.
+			   ??? Issue a warning?  */
+			sgot_output_offset = 0;
+		    }
+		  else
+		    sgot_output_offset = sgot->output_offset;
+
+		  if (got == NULL)
+		    {
+		      struct elf_m68k_bfd2got_entry *bfd2got_entry;
+
+		      bfd2got_entry
+			= elf_m68k_get_bfd2got_entry (elf_m68k_multi_got (info),
+						      input_bfd, SEARCH, NULL);
+
+		      if (bfd2got_entry != NULL)
+			{
+			  got = bfd2got_entry->got;
+			  BFD_ASSERT (got != NULL);
+
+			  got_offset = got->offset;
+			}
+		      else
+			/* In this case we have a reference to
+			   _GLOBAL_OFFSET_TABLE_, but no other references
+			   accessing any GOT entries.
+			   ??? Issue a warning?  */
+			got_offset = 0;
+		    }
+		  else
+		    got_offset = got->offset;
+
+		  /* Adjust GOT pointer to point to the GOT
+		     assigned to input_bfd.  */
+		  rel->r_addend += sgot_output_offset + got_offset;
+		}
+	      else
+		BFD_ASSERT (got == NULL || got->offset == 0);
+
+	      break;
+	    }
+	  /* Fall through.  */
+	case R_68K_GOT8O:
+	case R_68K_GOT16O:
+	case R_68K_GOT32O:
+
+	case R_68K_TLS_LDM32:
+	case R_68K_TLS_LDM16:
+	case R_68K_TLS_LDM8:
+
+	case R_68K_TLS_GD8:
+	case R_68K_TLS_GD16:
+	case R_68K_TLS_GD32:
+
+	case R_68K_TLS_IE8:
+	case R_68K_TLS_IE16:
+	case R_68K_TLS_IE32:
+
+	  /* Relocation is the offset of the entry for this symbol in
+	     the global offset table.  */
+
+	  {
+	    struct elf_m68k_got_entry_key key_;
+	    bfd_vma *off_ptr;
+	    bfd_vma off;
+
+	    if (sgot == NULL)
+	      {
+		sgot = bfd_get_section_by_name (dynobj, ".got");
+		BFD_ASSERT (sgot != NULL);
+	      }
+
+	    if (got == NULL)
+	      {
+		got = elf_m68k_get_bfd2got_entry (elf_m68k_multi_got (info),
+						  input_bfd, MUST_FIND,
+						  NULL)->got;
+		BFD_ASSERT (got != NULL);
+	      }
+
+	    /* Get GOT offset for this symbol.  */
+	    elf_m68k_init_got_entry_key (&key_, h, input_bfd, r_symndx,
+					 r_type);
+	    off_ptr = &elf_m68k_get_got_entry (got, &key_, MUST_FIND,
+					       NULL)->u.s2.offset;
+	    off = *off_ptr;
+
+	    /* The offset must always be a multiple of 4.  We use
+	       the least significant bit to record whether we have
+	       already generated the necessary reloc.  */
+	    if ((off & 1) != 0)
+	      off &= ~1;
+	    else
+	      {
+		if (h != NULL
+		    /* @TLSLDM relocations are bounded to the module, in
+		       which the symbol is defined -- not to the symbol
+		       itself.  */
+		    && elf_m68k_reloc_got_type (r_type) != R_68K_TLS_LDM32)
+		  {
+		    bfd_boolean dyn;
+
+		    dyn = elf_hash_table (info)->dynamic_sections_created;
+		    if (!WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+			|| (info->shared
+			    && SYMBOL_REFERENCES_LOCAL (info, h))
+			|| (ELF_ST_VISIBILITY (h->other)
+			    && h->root.type == bfd_link_hash_undefweak))
+		      {
+			/* This is actually a static link, or it is a
+			   -Bsymbolic link and the symbol is defined
+			   locally, or the symbol was forced to be local
+			   because of a version file.  We must initialize
+			   this entry in the global offset table.  Since
+			   the offset must always be a multiple of 4, we
+			   use the least significant bit to record whether
+			   we have initialized it already.
+
+			   When doing a dynamic link, we create a .rela.got
+			   relocation entry to initialize the value.  This
+			   is done in the finish_dynamic_symbol routine.  */
+
+			elf_m68k_init_got_entry_static (info,
+							output_bfd,
+							r_type,
+							sgot,
+							off,
+							relocation);
+
+			*off_ptr |= 1;
+		      }
+		    else
+		      unresolved_reloc = FALSE;
+		  }
+		else if (info->shared) /* && h == NULL */
+		  /* Process local symbol during dynamic link.  */
+		  {
+		    if (srela == NULL)
+		      {
+			srela = bfd_get_section_by_name (dynobj, ".rela.got");
+			BFD_ASSERT (srela != NULL);
+		      }
+
+		    elf_m68k_init_got_entry_local_shared (info,
+							  output_bfd,
+							  r_type,
+							  sgot,
+							  off,
+							  relocation,
+							  srela);
+
+		    *off_ptr |= 1;
+		  }
+		else /* h == NULL && !info->shared */
+		  {
+		    elf_m68k_init_got_entry_static (info,
+						    output_bfd,
+						    r_type,
+						    sgot,
+						    off,
+						    relocation);
+
+		    *off_ptr |= 1;
+		  }
+	      }
+
+	    /* We don't use elf_m68k_reloc_got_type in the condition below
+	       because this is the only place where difference between
+	       R_68K_GOTx and R_68K_GOTxO relocations matters.  */
+	    if (r_type == R_68K_GOT32O
+		|| r_type == R_68K_GOT16O
+		|| r_type == R_68K_GOT8O
+		|| elf_m68k_reloc_got_type (r_type) == R_68K_TLS_GD32
+		|| elf_m68k_reloc_got_type (r_type) == R_68K_TLS_LDM32
+		|| elf_m68k_reloc_got_type (r_type) == R_68K_TLS_IE32)
+	      {
+		/* GOT pointer is adjusted to point to the start/middle
+		   of local GOT.  Adjust the offset accordingly.  */
+		BFD_ASSERT (elf_m68k_hash_table (info)->use_neg_got_offsets_p
+			    || off >= got->offset);
+
+		if (elf_m68k_hash_table (info)->local_gp_p)
+		  relocation = off - got->offset;
+		else
+		  {
+		    BFD_ASSERT (got->offset == 0);
+		    relocation = sgot->output_offset + off;
+		  }
+
+		/* This relocation does not use the addend.  */
+		rel->r_addend = 0;
+	      }
+	    else
+	      relocation = (sgot->output_section->vma + sgot->output_offset
+			    + off);
+	  }
+	  break;
+
+	case R_68K_TLS_LDO32:
+	case R_68K_TLS_LDO16:
+	case R_68K_TLS_LDO8:
+	  relocation -= dtpoff_base (info);
+	  break;
+
+	case R_68K_TLS_LE32:
+	case R_68K_TLS_LE16:
+	case R_68K_TLS_LE8:
+	  if (info->shared)
+	    {
+	      (*_bfd_error_handler)
+		(_("%B(%A+0x%lx): R_68K_TLS_LE32 relocation not permitted "
+		   "in shared object"),
+		 input_bfd, input_section, (long) rel->r_offset, howto->name);
+
+	      return FALSE;
+	    }
+	  else
+	    relocation -= tpoff_base (info);
+
+	  break;
+
+	case R_68K_PLT8:
+	case R_68K_PLT16:
+	case R_68K_PLT32:
+	  /* Relocation is to the entry for this symbol in the
+	     procedure linkage table.  */
+
+	  /* Resolve a PLTxx reloc against a local symbol directly,
+	     without using the procedure linkage table.  */
+	  if (h == NULL)
+	    break;
+
+	  if (h->plt.offset == (bfd_vma) -1
+	      || !elf_hash_table (info)->dynamic_sections_created)
+	    {
+	      /* We didn't make a PLT entry for this symbol.  This
+		 happens when statically linking PIC code, or when
+		 using -Bsymbolic.  */
+	      break;
+	    }
+
+	  if (splt == NULL)
+	    {
+	      splt = bfd_get_section_by_name (dynobj, ".plt");
+	      BFD_ASSERT (splt != NULL);
+	    }
+
+	  relocation = (splt->output_section->vma
+			+ splt->output_offset
+			+ h->plt.offset);
+	  unresolved_reloc = FALSE;
+	  break;
+
+	case R_68K_PLT8O:
+	case R_68K_PLT16O:
+	case R_68K_PLT32O:
+	  /* Relocation is the offset of the entry for this symbol in
+	     the procedure linkage table.  */
+	  BFD_ASSERT (h != NULL && h->plt.offset != (bfd_vma) -1);
+
+	  if (splt == NULL)
+	    {
+	      splt = bfd_get_section_by_name (dynobj, ".plt");
+	      BFD_ASSERT (splt != NULL);
+	    }
+
+	  relocation = h->plt.offset;
+	  unresolved_reloc = FALSE;
+
+	  /* This relocation does not use the addend.  */
+	  rel->r_addend = 0;
+
+	  break;
+
+	case R_68K_8:
+	case R_68K_16:
+	case R_68K_32:
+	case R_68K_PC8:
+	case R_68K_PC16:
+	case R_68K_PC32:
+	  if (info->shared
+	      && r_symndx != STN_UNDEF
+	      && (input_section->flags & SEC_ALLOC) != 0
+	      && (h == NULL
+		  || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		  || h->root.type != bfd_link_hash_undefweak)
+	      && ((r_type != R_68K_PC8
+		   && r_type != R_68K_PC16
+		   && r_type != R_68K_PC32)
+		  || !SYMBOL_CALLS_LOCAL (info, h)))
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_byte *loc;
+	      bfd_boolean skip, relocate;
+
+	      /* When generating a shared object, these relocations
+		 are copied into the output file to be resolved at run
+		 time.  */
+
+	      skip = FALSE;
+	      relocate = FALSE;
+
+	      outrel.r_offset =
+		_bfd_elf_section_offset (output_bfd, info, input_section,
+					 rel->r_offset);
+	      if (outrel.r_offset == (bfd_vma) -1)
+		skip = TRUE;
+	      else if (outrel.r_offset == (bfd_vma) -2)
+		skip = TRUE, relocate = TRUE;
+	      outrel.r_offset += (input_section->output_section->vma
+				  + input_section->output_offset);
+
+	      if (skip)
+		memset (&outrel, 0, sizeof outrel);
+	      else if (h != NULL
+		       && h->dynindx != -1
+		       && (r_type == R_68K_PC8
+			   || r_type == R_68K_PC16
+			   || r_type == R_68K_PC32
+			   || !info->shared
+			   || !info->symbolic
+			   || !h->def_regular))
+		{
+		  outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
+		  outrel.r_addend = rel->r_addend;
+		}
+	      else
+		{
+		  /* This symbol is local, or marked to become local.  */
+		  outrel.r_addend = relocation + rel->r_addend;
+
+		  if (r_type == R_68K_32)
+		    {
+		      relocate = TRUE;
+		      outrel.r_info = ELF32_R_INFO (0, R_68K_RELATIVE);
+		    }
+		  else
+		    {
+		      long indx;
+
+		      if (bfd_is_abs_section (sec))
+			indx = 0;
+		      else if (sec == NULL || sec->owner == NULL)
+			{
+			  bfd_set_error (bfd_error_bad_value);
+			  return FALSE;
+			}
+		      else
+			{
+			  asection *osec;
+
+			  /* We are turning this relocation into one
+			     against a section symbol.  It would be
+			     proper to subtract the symbol's value,
+			     osec->vma, from the emitted reloc addend,
+			     but ld.so expects buggy relocs.  */
+			  osec = sec->output_section;
+			  indx = elf_section_data (osec)->dynindx;
+			  if (indx == 0)
+			    {
+			      struct elf_link_hash_table *htab;
+			      htab = elf_hash_table (info);
+			      osec = htab->text_index_section;
+			      indx = elf_section_data (osec)->dynindx;
+			    }
+			  BFD_ASSERT (indx != 0);
+			}
+
+		      outrel.r_info = ELF32_R_INFO (indx, r_type);
+		    }
+		}
+
+	      sreloc = elf_section_data (input_section)->sreloc;
+	      if (sreloc == NULL)
+		abort ();
+
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rela);
+	      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+
+	      /* This reloc will be computed at runtime, so there's no
+                 need to do anything now, except for R_68K_32
+                 relocations that have been turned into
+                 R_68K_RELATIVE.  */
+	      if (!relocate)
+		continue;
+	    }
+
+	  break;
+
+	case R_68K_GNU_VTINHERIT:
+	case R_68K_GNU_VTENTRY:
+	  /* These are no-ops in the end.  */
+	  continue;
+
+	default:
+	  break;
+	}
+
+      /* Dynamic relocs are not propagated for SEC_DEBUGGING sections
+	 because such sections are not SEC_ALLOC and thus ld.so will
+	 not process them.  */
+      if (unresolved_reloc
+	  && !((input_section->flags & SEC_DEBUGGING) != 0
+	       && h->def_dynamic))
+	{
+	  (*_bfd_error_handler)
+	    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+	     input_bfd,
+	     input_section,
+	     (long) rel->r_offset,
+	     howto->name,
+	     h->root.root.string);
+	  return FALSE;
+	}
+
+      if (r_symndx != STN_UNDEF
+	  && r_type != R_68K_NONE
+	  && (h == NULL
+	      || h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak))
+	{
+	  char sym_type;
+
+	  sym_type = (sym != NULL) ? ELF32_ST_TYPE (sym->st_info) : h->type;
+
+	  if (elf_m68k_reloc_tls_p (r_type) != (sym_type == STT_TLS))
+	    {
+	      const char *name;
+
+	      if (h != NULL)
+		name = h->root.root.string;
+	      else
+		{
+		  name = (bfd_elf_string_from_elf_section
+			  (input_bfd, symtab_hdr->sh_link, sym->st_name));
+		  if (name == NULL || *name == '\0')
+		    name = bfd_section_name (input_bfd, sec);
+		}
+
+	      (*_bfd_error_handler)
+		((sym_type == STT_TLS
+		  ? _("%B(%A+0x%lx): %s used with TLS symbol %s")
+		  : _("%B(%A+0x%lx): %s used with non-TLS symbol %s")),
+		 input_bfd,
+		 input_section,
+		 (long) rel->r_offset,
+		 howto->name,
+		 name);
+	    }
+	}
+
+      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+				    contents, rel->r_offset,
+				    relocation, rel->r_addend);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char *name;
+
+	  if (h != NULL)
+	    name = h->root.root.string;
+	  else
+	    {
+	      name = bfd_elf_string_from_elf_section (input_bfd,
+						      symtab_hdr->sh_link,
+						      sym->st_name);
+	      if (name == NULL)
+		return FALSE;
+	      if (*name == '\0')
+		name = bfd_section_name (input_bfd, sec);
+	    }
+
+	  if (r == bfd_reloc_overflow)
+	    {
+	      if (!(info->callbacks->reloc_overflow
+		    (info, (h ? &h->root : NULL), name, howto->name,
+		     (bfd_vma) 0, input_bfd, input_section,
+		     rel->r_offset)))
+		return FALSE;
+	    }
+	  else
+	    {
+	      (*_bfd_error_handler)
+		(_("%B(%A+0x%lx): reloc against `%s': error %d"),
+		 input_bfd, input_section,
+		 (long) rel->r_offset, name, (int) r);
+	      return FALSE;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Install an M_68K_PC32 relocation against VALUE at offset OFFSET
+   into section SEC.  */
+
+static void
+elf_m68k_install_pc32 (asection *sec, bfd_vma offset, bfd_vma value)
+{
+  /* Make VALUE PC-relative.  */
+  value -= sec->output_section->vma + offset;
+
+  /* Apply any in-place addend.  */
+  value += bfd_get_32 (sec->owner, sec->contents + offset);
+
+  bfd_put_32 (sec->owner, value, sec->contents + offset);
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+elf_m68k_finish_dynamic_symbol (output_bfd, info, h, sym)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+     struct elf_link_hash_entry *h;
+     Elf_Internal_Sym *sym;
+{
+  bfd *dynobj;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      const struct elf_m68k_plt_info *plt_info;
+      asection *splt;
+      asection *sgot;
+      asection *srela;
+      bfd_vma plt_index;
+      bfd_vma got_offset;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+
+      /* This symbol has an entry in the procedure linkage table.  Set
+	 it up.  */
+
+      BFD_ASSERT (h->dynindx != -1);
+
+      plt_info = elf_m68k_hash_table (info)->plt_info;
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      sgot = bfd_get_section_by_name (dynobj, ".got.plt");
+      srela = bfd_get_section_by_name (dynobj, ".rela.plt");
+      BFD_ASSERT (splt != NULL && sgot != NULL && srela != NULL);
+
+      /* Get the index in the procedure linkage table which
+	 corresponds to this symbol.  This is the index of this symbol
+	 in all the symbols for which we are making plt entries.  The
+	 first entry in the procedure linkage table is reserved.  */
+      plt_index = (h->plt.offset / plt_info->size) - 1;
+
+      /* Get the offset into the .got table of the entry that
+	 corresponds to this function.  Each .got entry is 4 bytes.
+	 The first three are reserved.  */
+      got_offset = (plt_index + 3) * 4;
+
+      memcpy (splt->contents + h->plt.offset,
+	      plt_info->symbol_entry,
+	      plt_info->size);
+
+      elf_m68k_install_pc32 (splt, h->plt.offset + plt_info->symbol_relocs.got,
+			     (sgot->output_section->vma
+			      + sgot->output_offset
+			      + got_offset));
+
+      bfd_put_32 (output_bfd, plt_index * sizeof (Elf32_External_Rela),
+		  splt->contents
+		  + h->plt.offset
+		  + plt_info->symbol_resolve_entry + 2);
+
+      elf_m68k_install_pc32 (splt, h->plt.offset + plt_info->symbol_relocs.plt,
+			     splt->output_section->vma);
+
+      /* Fill in the entry in the global offset table.  */
+      bfd_put_32 (output_bfd,
+		  (splt->output_section->vma
+		   + splt->output_offset
+		   + h->plt.offset
+		   + plt_info->symbol_resolve_entry),
+		  sgot->contents + got_offset);
+
+      /* Fill in the entry in the .rela.plt section.  */
+      rela.r_offset = (sgot->output_section->vma
+		       + sgot->output_offset
+		       + got_offset);
+      rela.r_info = ELF32_R_INFO (h->dynindx, R_68K_JMP_SLOT);
+      rela.r_addend = 0;
+      loc = srela->contents + plt_index * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+
+      if (!h->def_regular)
+	{
+	  /* Mark the symbol as undefined, rather than as defined in
+	     the .plt section.  Leave the value alone.  */
+	  sym->st_shndx = SHN_UNDEF;
+	}
+    }
+
+  if (elf_m68k_hash_entry (h)->glist != NULL)
+    {
+      asection *sgot;
+      asection *srela;
+      struct elf_m68k_got_entry *got_entry;
+
+      /* This symbol has an entry in the global offset table.  Set it
+	 up.  */
+
+      sgot = bfd_get_section_by_name (dynobj, ".got");
+      srela = bfd_get_section_by_name (dynobj, ".rela.got");
+      BFD_ASSERT (sgot != NULL && srela != NULL);
+
+      got_entry = elf_m68k_hash_entry (h)->glist;
+
+      while (got_entry != NULL)
+	{
+	  enum elf_m68k_reloc_type r_type;
+	  bfd_vma got_entry_offset;
+
+	  r_type = got_entry->key_.type;
+	  got_entry_offset = got_entry->u.s2.offset &~ (bfd_vma) 1;
+
+	  /* If this is a -Bsymbolic link, and the symbol is defined
+	     locally, we just want to emit a RELATIVE reloc.  Likewise if
+	     the symbol was forced to be local because of a version file.
+	     The entry in the global offset table already have been
+	     initialized in the relocate_section function.  */
+	  if (info->shared
+	      && SYMBOL_REFERENCES_LOCAL (info, h))
+	    {
+	      bfd_vma relocation;
+
+	      relocation = bfd_get_signed_32 (output_bfd,
+					      (sgot->contents
+					       + got_entry_offset));
+
+	      /* Undo TP bias.  */
+	      switch (elf_m68k_reloc_got_type (r_type))
+		{
+		case R_68K_GOT32O:
+		case R_68K_TLS_LDM32:
+		  break;
+
+		case R_68K_TLS_GD32:
+		  /* The value for this relocation is actually put in
+		     the second GOT slot.  */
+		  relocation = bfd_get_signed_32 (output_bfd,
+						  (sgot->contents
+						   + got_entry_offset + 4));
+		  relocation += dtpoff_base (info);
+		  break;
+
+		case R_68K_TLS_IE32:
+		  relocation += tpoff_base (info);
+		  break;
+
+		default:
+		  BFD_ASSERT (FALSE);
+		}
+
+	      elf_m68k_init_got_entry_local_shared (info,
+						    output_bfd,
+						    r_type,
+						    sgot,
+						    got_entry_offset,
+						    relocation,
+						    srela);
+	    }
+	  else
+	    {
+	      Elf_Internal_Rela rela;
+
+	      /* Put zeros to GOT slots that will be initialized
+		 at run-time.  */
+	      {
+		bfd_vma n_slots;
+
+		n_slots = elf_m68k_reloc_got_n_slots (got_entry->key_.type);
+		while (n_slots--)
+		  bfd_put_32 (output_bfd, (bfd_vma) 0,
+			      (sgot->contents + got_entry_offset
+			       + 4 * n_slots));
+	      }
+
+	      rela.r_addend = 0;
+	      rela.r_offset = (sgot->output_section->vma
+			       + sgot->output_offset
+			       + got_entry_offset);
+
+	      switch (elf_m68k_reloc_got_type (r_type))
+		{
+		case R_68K_GOT32O:
+		  rela.r_info = ELF32_R_INFO (h->dynindx, R_68K_GLOB_DAT);
+		  elf_m68k_install_rela (output_bfd, srela, &rela);
+		  break;
+
+		case R_68K_TLS_GD32:
+		  rela.r_info = ELF32_R_INFO (h->dynindx, R_68K_TLS_DTPMOD32);
+		  elf_m68k_install_rela (output_bfd, srela, &rela);
+
+		  rela.r_offset += 4;
+		  rela.r_info = ELF32_R_INFO (h->dynindx, R_68K_TLS_DTPREL32);
+		  elf_m68k_install_rela (output_bfd, srela, &rela);
+		  break;
+
+		case R_68K_TLS_IE32:
+		  rela.r_info = ELF32_R_INFO (h->dynindx, R_68K_TLS_TPREL32);
+		  elf_m68k_install_rela (output_bfd, srela, &rela);
+		  break;
+
+		default:
+		  BFD_ASSERT (FALSE);
+		  break;
+		}
+	    }
+
+	  got_entry = got_entry->u.s2.next;
+	}
+    }
+
+  if (h->needs_copy)
+    {
+      asection *s;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+
+      /* This symbol needs a copy reloc.  Set it up.  */
+
+      BFD_ASSERT (h->dynindx != -1
+		  && (h->root.type == bfd_link_hash_defined
+		      || h->root.type == bfd_link_hash_defweak));
+
+      s = bfd_get_section_by_name (h->root.u.def.section->owner,
+				   ".rela.bss");
+      BFD_ASSERT (s != NULL);
+
+      rela.r_offset = (h->root.u.def.value
+		       + h->root.u.def.section->output_section->vma
+		       + h->root.u.def.section->output_offset);
+      rela.r_info = ELF32_R_INFO (h->dynindx, R_68K_COPY);
+      rela.r_addend = 0;
+      loc = s->contents + s->reloc_count++ * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+    }
+
+  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+      || h == elf_hash_table (info)->hgot)
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+elf_m68k_finish_dynamic_sections (output_bfd, info)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+{
+  bfd *dynobj;
+  asection *sgot;
+  asection *sdyn;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  sgot = bfd_get_section_by_name (dynobj, ".got.plt");
+  BFD_ASSERT (sgot != NULL);
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      asection *splt;
+      Elf32_External_Dyn *dyncon, *dynconend;
+
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      BFD_ASSERT (splt != NULL && sdyn != NULL);
+
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+	  const char *name;
+	  asection *s;
+
+	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    default:
+	      break;
+
+	    case DT_PLTGOT:
+	      name = ".got";
+	      goto get_vma;
+	    case DT_JMPREL:
+	      name = ".rela.plt";
+	    get_vma:
+	      s = bfd_get_section_by_name (output_bfd, name);
+	      BFD_ASSERT (s != NULL);
+	      dyn.d_un.d_ptr = s->vma;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_PLTRELSZ:
+	      s = bfd_get_section_by_name (output_bfd, ".rela.plt");
+	      BFD_ASSERT (s != NULL);
+	      dyn.d_un.d_val = s->size;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_RELASZ:
+	      /* The procedure linkage table relocs (DT_JMPREL) should
+		 not be included in the overall relocs (DT_RELA).
+		 Therefore, we override the DT_RELASZ entry here to
+		 make it not include the JMPREL relocs.  Since the
+		 linker script arranges for .rela.plt to follow all
+		 other relocation sections, we don't have to worry
+		 about changing the DT_RELA entry.  */
+	      s = bfd_get_section_by_name (output_bfd, ".rela.plt");
+	      if (s != NULL)
+		dyn.d_un.d_val -= s->size;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+	    }
+	}
+
+      /* Fill in the first entry in the procedure linkage table.  */
+      if (splt->size > 0)
+	{
+	  const struct elf_m68k_plt_info *plt_info;
+
+	  plt_info = elf_m68k_hash_table (info)->plt_info;
+	  memcpy (splt->contents, plt_info->plt0_entry, plt_info->size);
+
+	  elf_m68k_install_pc32 (splt, plt_info->plt0_relocs.got4,
+				 (sgot->output_section->vma
+				  + sgot->output_offset
+				  + 4));
+
+	  elf_m68k_install_pc32 (splt, plt_info->plt0_relocs.got8,
+				 (sgot->output_section->vma
+				  + sgot->output_offset
+				  + 8));
+
+	  elf_section_data (splt->output_section)->this_hdr.sh_entsize
+	    = plt_info->size;
+	}
+    }
+
+  /* Fill in the first three entries in the global offset table.  */
+  if (sgot->size > 0)
+    {
+      if (sdyn == NULL)
+	bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents);
+      else
+	bfd_put_32 (output_bfd,
+		    sdyn->output_section->vma + sdyn->output_offset,
+		    sgot->contents);
+      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 4);
+      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 8);
+    }
+
+  elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
+
+  return TRUE;
+}
+
+/* Given a .data section and a .emreloc in-memory section, store
+   relocation information into the .emreloc section which can be
+   used at runtime to relocate the section.  This is called by the
+   linker when the --embedded-relocs switch is used.  This is called
+   after the add_symbols entry point has been called for all the
+   objects, and before the final_link entry point is called.  */
+
+bfd_boolean
+bfd_m68k_elf32_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
+     bfd *abfd;
+     struct bfd_link_info *info;
+     asection *datasec;
+     asection *relsec;
+     char **errmsg;
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Sym *isymbuf = NULL;
+  Elf_Internal_Rela *internal_relocs = NULL;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_byte *p;
+  bfd_size_type amt;
+
+  BFD_ASSERT (! info->relocatable);
+
+  *errmsg = NULL;
+
+  if (datasec->reloc_count == 0)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+
+  /* Get a copy of the native relocations.  */
+  internal_relocs = (_bfd_elf_link_read_relocs
+		     (abfd, datasec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
+		      info->keep_memory));
+  if (internal_relocs == NULL)
+    goto error_return;
+
+  amt = (bfd_size_type) datasec->reloc_count * 12;
+  relsec->contents = (bfd_byte *) bfd_alloc (abfd, amt);
+  if (relsec->contents == NULL)
+    goto error_return;
+
+  p = relsec->contents;
+
+  irelend = internal_relocs + datasec->reloc_count;
+  for (irel = internal_relocs; irel < irelend; irel++, p += 12)
+    {
+      asection *targetsec;
+
+      /* We are going to write a four byte longword into the runtime
+       reloc section.  The longword will be the address in the data
+       section which must be relocated.  It is followed by the name
+       of the target section NUL-padded or truncated to 8
+       characters.  */
+
+      /* We can only relocate absolute longword relocs at run time.  */
+      if (ELF32_R_TYPE (irel->r_info) != (int) R_68K_32)
+	{
+	  *errmsg = _("unsupported reloc type");
+	  bfd_set_error (bfd_error_bad_value);
+	  goto error_return;
+	}
+
+      /* Get the target section referred to by the reloc.  */
+      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+	{
+	  /* A local symbol.  */
+	  Elf_Internal_Sym *isym;
+
+	  /* Read this BFD's local symbols if we haven't done so already.  */
+	  if (isymbuf == NULL)
+	    {
+	      isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	      if (isymbuf == NULL)
+		isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+						symtab_hdr->sh_info, 0,
+						NULL, NULL, NULL);
+	      if (isymbuf == NULL)
+		goto error_return;
+	    }
+
+	  isym = isymbuf + ELF32_R_SYM (irel->r_info);
+	  targetsec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+	}
+      else
+	{
+	  unsigned long indx;
+	  struct elf_link_hash_entry *h;
+
+	  /* An external symbol.  */
+	  indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+	  h = elf_sym_hashes (abfd)[indx];
+	  BFD_ASSERT (h != NULL);
+	  if (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	    targetsec = h->root.u.def.section;
+	  else
+	    targetsec = NULL;
+	}
+
+      bfd_put_32 (abfd, irel->r_offset + datasec->output_offset, p);
+      memset (p + 4, 0, 8);
+      if (targetsec != NULL)
+	strncpy ((char *) p + 4, targetsec->output_section->name, 8);
+    }
+
+  if (isymbuf != NULL && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (internal_relocs != NULL
+      && elf_section_data (datasec)->relocs != internal_relocs)
+    free (internal_relocs);
+  return TRUE;
+
+error_return:
+  if (isymbuf != NULL && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (internal_relocs != NULL
+      && elf_section_data (datasec)->relocs != internal_relocs)
+    free (internal_relocs);
+  return FALSE;
+}
+
+/* Set target options.  */
+
+void
+bfd_elf_m68k_set_target_options (struct bfd_link_info *info, int got_handling)
+{
+  struct elf_m68k_link_hash_table *htab;
+  bfd_boolean use_neg_got_offsets_p;
+  bfd_boolean allow_multigot_p;
+  bfd_boolean local_gp_p;
+
+  switch (got_handling)
+    {
+    case 0:
+      /* --got=single.  */
+      local_gp_p = FALSE;
+      use_neg_got_offsets_p = FALSE;
+      allow_multigot_p = FALSE;
+      break;
+
+    case 1:
+      /* --got=negative.  */
+      local_gp_p = TRUE;
+      use_neg_got_offsets_p = TRUE;
+      allow_multigot_p = FALSE;
+      break;
+
+    case 2:
+      /* --got=multigot.  */
+      local_gp_p = TRUE;
+      use_neg_got_offsets_p = TRUE;
+      allow_multigot_p = TRUE;
+      break;
+
+    default:
+      BFD_ASSERT (FALSE);
+      return;
+    }
+
+  htab = elf_m68k_hash_table (info);
+  if (htab != NULL)
+    {
+      htab->local_gp_p = local_gp_p;
+      htab->use_neg_got_offsets_p = use_neg_got_offsets_p;
+      htab->allow_multigot_p = allow_multigot_p;
+    }
+}
+
+static enum elf_reloc_type_class
+elf32_m68k_reloc_type_class (rela)
+     const Elf_Internal_Rela *rela;
+{
+  switch ((int) ELF32_R_TYPE (rela->r_info))
+    {
+    case R_68K_RELATIVE:
+      return reloc_class_relative;
+    case R_68K_JMP_SLOT:
+      return reloc_class_plt;
+    case R_68K_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+/* Return address for Ith PLT stub in section PLT, for relocation REL
+   or (bfd_vma) -1 if it should not be included.  */
+
+static bfd_vma
+elf_m68k_plt_sym_val (bfd_vma i, const asection *plt,
+		      const arelent *rel ATTRIBUTE_UNUSED)
+{
+  return plt->vma + (i + 1) * elf_m68k_get_plt_info (plt->owner)->size;
+}
+
+#define TARGET_BIG_SYM			bfd_elf32_m68k_vec
+#define TARGET_BIG_NAME			"elf32-m68k"
+#define ELF_MACHINE_CODE		EM_68K
+#define ELF_MAXPAGESIZE			0x2000
+#define elf_backend_create_dynamic_sections \
+					_bfd_elf_create_dynamic_sections
+#define bfd_elf32_bfd_link_hash_table_create \
+					elf_m68k_link_hash_table_create
+/* ??? Should it be this macro or bfd_elfNN_bfd_link_hash_table_create?  */
+#define bfd_elf32_bfd_link_hash_table_free \
+					elf_m68k_link_hash_table_free
+#define bfd_elf32_bfd_final_link	bfd_elf_final_link
+
+#define elf_backend_check_relocs	elf_m68k_check_relocs
+#define elf_backend_always_size_sections \
+					elf_m68k_always_size_sections
+#define elf_backend_adjust_dynamic_symbol \
+					elf_m68k_adjust_dynamic_symbol
+#define elf_backend_size_dynamic_sections \
+					elf_m68k_size_dynamic_sections
+#define elf_backend_final_write_processing	elf_m68k_final_write_processing
+#define elf_backend_init_index_section	_bfd_elf_init_1_index_section
+#define elf_backend_relocate_section	elf_m68k_relocate_section
+#define elf_backend_finish_dynamic_symbol \
+					elf_m68k_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections \
+					elf_m68k_finish_dynamic_sections
+#define elf_backend_gc_mark_hook	elf_m68k_gc_mark_hook
+#define elf_backend_gc_sweep_hook	elf_m68k_gc_sweep_hook
+#define elf_backend_copy_indirect_symbol elf_m68k_copy_indirect_symbol
+#define bfd_elf32_bfd_merge_private_bfd_data \
+                                        elf32_m68k_merge_private_bfd_data
+#define bfd_elf32_bfd_set_private_flags \
+                                        elf32_m68k_set_private_flags
+#define bfd_elf32_bfd_print_private_bfd_data \
+                                        elf32_m68k_print_private_bfd_data
+#define elf_backend_reloc_type_class	elf32_m68k_reloc_type_class
+#define elf_backend_plt_sym_val		elf_m68k_plt_sym_val
+#define elf_backend_object_p		elf32_m68k_object_p
+
+#define elf_backend_can_gc_sections 1
+#define elf_backend_can_refcount 1
+#define elf_backend_want_got_plt 1
+#define elf_backend_plt_readonly 1
+#define elf_backend_want_plt_sym 0
+#define elf_backend_got_header_size	12
+#define elf_backend_rela_normal		1
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-m88k.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-m88k.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-m88k.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-m88k.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,38 @@
+/* Motorola 88k-specific support for 32-bit ELF
+   Copyright 1993, 1995, 1999, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+
+/* This does not include any relocations, but should be good enough
+   for GDB.  */
+
+#define TARGET_BIG_SYM		bfd_elf32_m88k_vec
+#define TARGET_BIG_NAME		"elf32-m88k"
+#define ELF_ARCH		bfd_arch_m88k
+#define ELF_MACHINE_CODE	EM_88K
+#define ELF_MAXPAGESIZE  	1 /* FIXME: This number is wrong,  It should be the page size in bytes.  */
+#define bfd_elf32_bfd_reloc_type_lookup bfd_default_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup _bfd_norelocs_bfd_reloc_name_lookup
+#define elf_info_to_howto		_bfd_elf_no_info_to_howto
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-mcore.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-mcore.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-mcore.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-mcore.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,672 @@
+/* Motorola MCore specific support for 32-bit ELF
+   Copyright 1994, 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007, 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* This file is based on a preliminary RCE ELF ABI.  The
+   information may not match the final RCE ELF ABI.   */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/mcore.h"
+#include <assert.h>
+
+/* RELA relocs are used here...  */
+
+/* Function to set whether a module needs the -mrelocatable bit set.  */
+
+static bfd_boolean
+mcore_elf_set_private_flags (bfd * abfd, flagword flags)
+{
+  BFD_ASSERT (! elf_flags_init (abfd)
+	      || elf_elfheader (abfd)->e_flags == flags);
+
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+
+static bfd_boolean
+mcore_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd)
+{
+  flagword old_flags;
+  flagword new_flags;
+
+  /* Check if we have the same endianness.  */
+  if (! _bfd_generic_verify_endian_match (ibfd, obfd))
+    return FALSE;
+
+  if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  new_flags = elf_elfheader (ibfd)->e_flags;
+  old_flags = elf_elfheader (obfd)->e_flags;
+
+  if (! elf_flags_init (obfd))
+    {
+      	/* First call, no flags set.  */
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = new_flags;
+    }
+  else if (new_flags == old_flags)
+    /* Compatible flags are OK.  */
+    ;
+  else
+    {
+      /* FIXME */
+    }
+
+  return TRUE;
+}
+
+/* Don't pretend we can deal with unsupported relocs.  */
+
+static bfd_reloc_status_type
+mcore_elf_unsupported_reloc (bfd * abfd,
+			     arelent * reloc_entry,
+			     asymbol * symbol ATTRIBUTE_UNUSED,
+			     PTR data ATTRIBUTE_UNUSED,
+			     asection * input_section ATTRIBUTE_UNUSED,
+			     bfd * output_bfd ATTRIBUTE_UNUSED,
+			     char ** error_message ATTRIBUTE_UNUSED)
+{
+  BFD_ASSERT (reloc_entry->howto != (reloc_howto_type *)0);
+
+  _bfd_error_handler (_("%B: Relocation %s (%d) is not currently supported.\n"),
+		      abfd,
+		      reloc_entry->howto->name,
+		      reloc_entry->howto->type);
+
+  return bfd_reloc_notsupported;
+}
+
+static reloc_howto_type * mcore_elf_howto_table [(int) R_MCORE_max];
+
+static reloc_howto_type mcore_elf_howto_raw[] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_MCORE_NONE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,  /* complain_on_overflow */
+	 NULL,                  /* special_function */
+	 "R_MCORE_NONE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A standard 32 bit relocation.  */
+  HOWTO (R_MCORE_ADDR32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "ADDR32",		/* name *//* For compatibility with coff/pe port.  */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 8 bits + 2 zero bits; jmpi/jsri/lrw instructions.
+     Should not appear in object files.  */
+  HOWTO (R_MCORE_PCRELIMM8BY4,	/* type */
+	 2,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 mcore_elf_unsupported_reloc,	/* special_function */
+	 "R_MCORE_PCRELIMM8BY4",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* bsr/bt/bf/br instructions; 11 bits + 1 zero bit
+     Span 2k instructions == 4k bytes.
+     Only useful pieces at the relocated address are the opcode (5 bits) */
+  HOWTO (R_MCORE_PCRELIMM11BY2,/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 11,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MCORE_PCRELIMM11BY2",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0x7ff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 4 bits + 1 zero bit; 'loopt' instruction only; unsupported.  */
+  HOWTO (R_MCORE_PCRELIMM4BY2,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 4,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 mcore_elf_unsupported_reloc,/* special_function */
+	 "R_MCORE_PCRELIMM4BY2",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 32-bit pc-relative. Eventually this will help support PIC code.  */
+  HOWTO (R_MCORE_PCREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MCORE_PCREL32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Like PCRELIMM11BY2, this relocation indicates that there is a
+     'jsri' at the specified address. There is a separate relocation
+     entry for the literal pool entry that it references, but we
+     might be able to change the jsri to a bsr if the target turns out
+     to be close enough [even though we won't reclaim the literal pool
+     entry, we'll get some runtime efficiency back]. Note that this
+     is a relocation that we are allowed to safely ignore.  */
+  HOWTO (R_MCORE_PCRELJSR_IMM11BY2,/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 11,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MCORE_PCRELJSR_IMM11BY2", /* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0x7ff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_MCORE_GNU_VTINHERIT, /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         NULL,                  /* special_function */
+         "R_MCORE_GNU_VTINHERIT", /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage.  */
+  HOWTO (R_MCORE_GNU_VTENTRY,   /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
+         "R_MCORE_GNU_VTENTRY", /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  HOWTO (R_MCORE_RELATIVE,      /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 NULL,                  /* special_function */
+	 "R_MCORE_RELATIVE",    /* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE)			/* pcrel_offset */
+};
+
+#ifndef NUM_ELEM
+#define NUM_ELEM(a) (sizeof (a) / sizeof (a)[0])
+#endif
+
+/* Initialize the mcore_elf_howto_table, so that linear accesses can be done.  */
+static void
+mcore_elf_howto_init (void)
+{
+  unsigned int i;
+
+  for (i = NUM_ELEM (mcore_elf_howto_raw); i--;)
+    {
+      unsigned int type;
+
+      type = mcore_elf_howto_raw[i].type;
+
+      BFD_ASSERT (type < NUM_ELEM (mcore_elf_howto_table));
+
+      mcore_elf_howto_table [type] = & mcore_elf_howto_raw [i];
+    }
+}
+
+static reloc_howto_type *
+mcore_elf_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
+			     bfd_reloc_code_real_type code)
+{
+  enum elf_mcore_reloc_type mcore_reloc = R_MCORE_NONE;
+
+  switch (code)
+    {
+    case BFD_RELOC_NONE:		     mcore_reloc = R_MCORE_NONE; break;
+    case BFD_RELOC_32:			     mcore_reloc = R_MCORE_ADDR32; break;
+    case BFD_RELOC_MCORE_PCREL_IMM8BY4:	     mcore_reloc = R_MCORE_PCRELIMM8BY4; break;
+    case BFD_RELOC_MCORE_PCREL_IMM11BY2:     mcore_reloc = R_MCORE_PCRELIMM11BY2; break;
+    case BFD_RELOC_MCORE_PCREL_IMM4BY2:	     mcore_reloc = R_MCORE_PCRELIMM4BY2; break;
+    case BFD_RELOC_32_PCREL:		     mcore_reloc = R_MCORE_PCREL32; break;
+    case BFD_RELOC_MCORE_PCREL_JSR_IMM11BY2: mcore_reloc = R_MCORE_PCRELJSR_IMM11BY2; break;
+    case BFD_RELOC_VTABLE_INHERIT:           mcore_reloc = R_MCORE_GNU_VTINHERIT; break;
+    case BFD_RELOC_VTABLE_ENTRY:             mcore_reloc = R_MCORE_GNU_VTENTRY; break;
+    case BFD_RELOC_RVA:                      mcore_reloc = R_MCORE_RELATIVE; break;
+    default:
+      return NULL;
+    }
+
+  if (! mcore_elf_howto_table [R_MCORE_PCRELIMM8BY4])
+    /* Initialize howto table if needed.  */
+    mcore_elf_howto_init ();
+
+  return mcore_elf_howto_table [(int) mcore_reloc];
+};
+
+static reloc_howto_type *
+mcore_elf_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			     const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (mcore_elf_howto_raw) / sizeof (mcore_elf_howto_raw[0]);
+       i++)
+    if (mcore_elf_howto_raw[i].name != NULL
+	&& strcasecmp (mcore_elf_howto_raw[i].name, r_name) == 0)
+      return &mcore_elf_howto_raw[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for a RCE ELF reloc.  */
+
+static void
+mcore_elf_info_to_howto (bfd * abfd ATTRIBUTE_UNUSED,
+			 arelent * cache_ptr,
+			 Elf_Internal_Rela * dst)
+{
+  if (! mcore_elf_howto_table [R_MCORE_PCRELIMM8BY4])
+    /* Initialize howto table if needed.  */
+    mcore_elf_howto_init ();
+
+  BFD_ASSERT (ELF32_R_TYPE (dst->r_info) < (unsigned int) R_MCORE_max);
+
+  cache_ptr->howto = mcore_elf_howto_table [ELF32_R_TYPE (dst->r_info)];
+}
+
+/* The RELOCATE_SECTION function is called by the ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures; if the section
+   actually uses Rel structures, the r_addend field will always be
+   zero.
+
+   This function is responsible for adjust the section contents as
+   necessary, and (if using Rela relocs and generating a
+   relocatable output file) adjusting the reloc addend as
+   necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.  */
+
+static bfd_boolean
+mcore_elf_relocate_section (bfd * output_bfd,
+			    struct bfd_link_info * info,
+			    bfd * input_bfd,
+			    asection * input_section,
+			    bfd_byte * contents,
+			    Elf_Internal_Rela * relocs,
+			    Elf_Internal_Sym * local_syms,
+			    asection ** local_sections)
+{
+  Elf_Internal_Shdr * symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
+  struct elf_link_hash_entry ** sym_hashes = elf_sym_hashes (input_bfd);
+  Elf_Internal_Rela * rel = relocs;
+  Elf_Internal_Rela * relend = relocs + input_section->reloc_count;
+  bfd_boolean ret = TRUE;
+
+#ifdef DEBUG
+  _bfd_error_handler
+    ("mcore_elf_relocate_section called for %B section %A, %ld relocations%s",
+     input_bfd,
+     input_section,
+     (long) input_section->reloc_count,
+     (info->relocatable) ? " (relocatable)" : "");
+#endif
+
+  if (! mcore_elf_howto_table [R_MCORE_PCRELIMM8BY4])	/* Initialize howto table if needed */
+    mcore_elf_howto_init ();
+
+  for (; rel < relend; rel++)
+    {
+      enum elf_mcore_reloc_type    r_type = (enum elf_mcore_reloc_type) ELF32_R_TYPE (rel->r_info);
+      bfd_vma                      offset = rel->r_offset;
+      bfd_vma                      addend = rel->r_addend;
+      bfd_reloc_status_type        r = bfd_reloc_other;
+      asection *                   sec = NULL;
+      reloc_howto_type *           howto;
+      bfd_vma                      relocation;
+      Elf_Internal_Sym *           sym = NULL;
+      unsigned long                r_symndx;
+      struct elf_link_hash_entry * h = NULL;
+      unsigned short               oldinst = 0;
+
+      /* Unknown relocation handling.  */
+      if ((unsigned) r_type >= (unsigned) R_MCORE_max
+	  || ! mcore_elf_howto_table [(int)r_type])
+	{
+	  _bfd_error_handler (_("%B: Unknown relocation type %d\n"),
+			      input_bfd, (int) r_type);
+
+	  bfd_set_error (bfd_error_bad_value);
+	  ret = FALSE;
+	  continue;
+	}
+
+      howto = mcore_elf_howto_table [(int) r_type];
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      /* Complain about known relocation that are not yet supported.  */
+      if (howto->special_function == mcore_elf_unsupported_reloc)
+	{
+	  _bfd_error_handler (_("%B: Relocation %s (%d) is not currently supported.\n"),
+			      input_bfd,
+			      howto->name,
+			      (int)r_type);
+
+	  bfd_set_error (bfd_error_bad_value);
+	  ret = FALSE;
+	  continue;
+	}
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections [r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	  addend = rel->r_addend;
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc, warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      switch (r_type)
+	{
+	default:
+	  break;
+
+	case R_MCORE_PCRELJSR_IMM11BY2:
+	  oldinst = bfd_get_16 (input_bfd, contents + offset);
+#define	MCORE_INST_BSR	0xF800
+	  bfd_put_16 (input_bfd, (bfd_vma) MCORE_INST_BSR, contents + offset);
+	  break;
+	}
+
+#ifdef DEBUG
+      fprintf (stderr, "\ttype = %s (%d), symbol index = %ld, offset = %ld, addend = %ld\n",
+	       howto->name, r_type, r_symndx, (long) offset, (long) addend);
+#endif
+
+      r = _bfd_final_link_relocate
+	(howto, input_bfd, input_section, contents, offset, relocation, addend);
+
+      if (r != bfd_reloc_ok && r_type == R_MCORE_PCRELJSR_IMM11BY2)
+	{
+	  /* Wasn't ok, back it out and give up.  */
+	  bfd_put_16 (input_bfd, (bfd_vma) oldinst, contents + offset);
+	  r = bfd_reloc_ok;
+	}
+
+      if (r != bfd_reloc_ok)
+	{
+	  ret = FALSE;
+
+	  switch (r)
+	    {
+	    default:
+	      break;
+
+	    case bfd_reloc_overflow:
+	      {
+		const char * name;
+
+		if (h != NULL)
+		  name = NULL;
+		else
+		  {
+		    name = bfd_elf_string_from_elf_section
+		      (input_bfd, symtab_hdr->sh_link, sym->st_name);
+
+		    if (name == NULL)
+		      break;
+
+		    if (* name == '\0')
+		      name = bfd_section_name (input_bfd, sec);
+		  }
+
+		(*info->callbacks->reloc_overflow)
+		  (info, (h ? &h->root : NULL), name, howto->name,
+		   (bfd_vma) 0, input_bfd, input_section, offset);
+	      }
+	      break;
+	    }
+	}
+    }
+
+#ifdef DEBUG
+  fprintf (stderr, "\n");
+#endif
+
+  return ret;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+static asection *
+mcore_elf_gc_mark_hook (asection *sec,
+			struct bfd_link_info *info,
+			Elf_Internal_Rela *rel,
+			struct elf_link_hash_entry *h,
+			Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_MCORE_GNU_VTINHERIT:
+      case R_MCORE_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Update the got entry reference counts for the section being removed.  */
+
+static bfd_boolean
+mcore_elf_gc_sweep_hook (bfd * abfd ATTRIBUTE_UNUSED,
+			 struct bfd_link_info * info ATTRIBUTE_UNUSED,
+			 asection * sec ATTRIBUTE_UNUSED,
+			 const Elf_Internal_Rela * relocs ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+/* Look through the relocs for a section during the first phase.
+   Since we don't do .gots or .plts, we just need to consider the
+   virtual table relocs for gc.  */
+
+static bfd_boolean
+mcore_elf_check_relocs (bfd * abfd,
+			struct bfd_link_info * info,
+			asection * sec,
+			const Elf_Internal_Rela * relocs)
+{
+  Elf_Internal_Shdr * symtab_hdr;
+  struct elf_link_hash_entry ** sym_hashes;
+  const Elf_Internal_Rela * rel;
+  const Elf_Internal_Rela * rel_end;
+
+  if (info->relocatable)
+    return TRUE;
+
+  symtab_hdr = & elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  rel_end = relocs + sec->reloc_count;
+
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      struct elf_link_hash_entry * h;
+      unsigned long r_symndx;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      if (r_symndx < symtab_hdr->sh_info)
+        h = NULL;
+      else
+	{
+	  h = sym_hashes [r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      switch (ELF32_R_TYPE (rel->r_info))
+        {
+        /* This relocation describes the C++ object vtable hierarchy.
+           Reconstruct it for later use during GC.  */
+        case R_MCORE_GNU_VTINHERIT:
+          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+
+        /* This relocation describes which C++ vtable entries are actually
+           used.  Record for later use during GC.  */
+        case R_MCORE_GNU_VTENTRY:
+          BFD_ASSERT (h != NULL);
+          if (h != NULL
+              && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+            return FALSE;
+          break;
+        }
+    }
+
+  return TRUE;
+}
+
+static const struct bfd_elf_special_section mcore_elf_special_sections[]=
+{
+  { STRING_COMMA_LEN (".ctors"), -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".dtors"), -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
+  { NULL,                     0,  0, 0,            0 }
+};
+
+#define TARGET_BIG_SYM		bfd_elf32_mcore_big_vec
+#define TARGET_BIG_NAME		"elf32-mcore-big"
+#define TARGET_LITTLE_SYM       bfd_elf32_mcore_little_vec
+#define TARGET_LITTLE_NAME      "elf32-mcore-little"
+
+#define ELF_ARCH		bfd_arch_mcore
+#define ELF_MACHINE_CODE	EM_MCORE
+#define ELF_MAXPAGESIZE		0x1000		/* 4k, if we ever have 'em */
+#define elf_info_to_howto	mcore_elf_info_to_howto
+#define elf_info_to_howto_rel	NULL
+
+#define bfd_elf32_bfd_merge_private_bfd_data	mcore_elf_merge_private_bfd_data
+#define bfd_elf32_bfd_set_private_flags		mcore_elf_set_private_flags
+#define bfd_elf32_bfd_reloc_type_lookup		mcore_elf_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup	mcore_elf_reloc_name_lookup
+#define elf_backend_relocate_section		mcore_elf_relocate_section
+#define elf_backend_gc_mark_hook		mcore_elf_gc_mark_hook
+#define elf_backend_gc_sweep_hook		mcore_elf_gc_sweep_hook
+#define elf_backend_check_relocs                mcore_elf_check_relocs
+#define elf_backend_special_sections		mcore_elf_special_sections
+
+#define elf_backend_can_gc_sections		1
+#define elf_backend_rela_normal			1
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-mep.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-mep.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-mep.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-mep.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,787 @@
+/* MeP-specific support for 32-bit ELF.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+   2010, 2011  Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/mep.h"
+#include "libiberty.h"
+
+/* Forward declarations.  */
+
+/* Private relocation functions.  */
+
+#define MEPREL(type, size, bits, right, left, pcrel, overflow, mask) \
+  {(unsigned)type, right, size, bits, pcrel, left, overflow, mep_reloc, #type, FALSE, 0, mask, 0 }
+
+#define N complain_overflow_dont
+#define S complain_overflow_signed
+#define U complain_overflow_unsigned
+
+static bfd_reloc_status_type mep_reloc (bfd *, arelent *, struct bfd_symbol *,
+					void *, asection *, bfd *, char **);
+
+static reloc_howto_type mep_elf_howto_table [] =
+{
+  /* type, size, bits, leftshift, rightshift, pcrel, OD/OS/OU, mask.  */
+  MEPREL (R_MEP_NONE,     0,  0, 0, 0, 0, N, 0),
+  MEPREL (R_RELC,         0,  0, 0, 0, 0, N, 0),
+  /* MEPRELOC:HOWTO */
+    /* This section generated from bfd/mep-relocs.pl from include/elf/mep.h.  */
+  MEPREL (R_MEP_8,        0,  8, 0, 0, 0, U, 0xff),
+  MEPREL (R_MEP_16,       1, 16, 0, 0, 0, U, 0xffff),
+  MEPREL (R_MEP_32,       2, 32, 0, 0, 0, U, 0xffffffff),
+  MEPREL (R_MEP_PCREL8A2, 1,  8, 1, 1, 1, S, 0x00fe),
+  MEPREL (R_MEP_PCREL12A2,1, 12, 1, 1, 1, S, 0x0ffe),
+  MEPREL (R_MEP_PCREL17A2,2, 17, 0, 1, 1, S, 0x0000ffff),
+  MEPREL (R_MEP_PCREL24A2,2, 24, 0, 1, 1, S, 0x07f0ffff),
+  MEPREL (R_MEP_PCABS24A2,2, 24, 0, 1, 0, U, 0x07f0ffff),
+  MEPREL (R_MEP_LOW16,    2, 16, 0, 0, 0, N, 0x0000ffff),
+  MEPREL (R_MEP_HI16U,    2, 32, 0,16, 0, N, 0x0000ffff),
+  MEPREL (R_MEP_HI16S,    2, 32, 0,16, 0, N, 0x0000ffff),
+  MEPREL (R_MEP_GPREL,    2, 16, 0, 0, 0, S, 0x0000ffff),
+  MEPREL (R_MEP_TPREL,    2, 16, 0, 0, 0, S, 0x0000ffff),
+  MEPREL (R_MEP_TPREL7,   1,  7, 0, 0, 0, U, 0x007f),
+  MEPREL (R_MEP_TPREL7A2, 1,  7, 1, 1, 0, U, 0x007e),
+  MEPREL (R_MEP_TPREL7A4, 1,  7, 2, 2, 0, U, 0x007c),
+  MEPREL (R_MEP_UIMM24,   2, 24, 0, 0, 0, U, 0x00ffffff),
+  MEPREL (R_MEP_ADDR24A4, 2, 24, 0, 2, 0, U, 0x00fcffff),
+  MEPREL (R_MEP_GNU_VTINHERIT,1,  0,16,32, 0, N, 0x0000),
+  MEPREL (R_MEP_GNU_VTENTRY,1,  0,16,32, 0, N, 0x0000),
+  /* MEPRELOC:END */
+};
+
+#define VALID_MEP_RELOC(N) ((N) >= 0 \
+  && (N) < ARRAY_SIZE (mep_elf_howto_table)
+
+#undef N
+#undef S
+#undef U
+
+static bfd_reloc_status_type
+mep_reloc
+    (bfd *               abfd ATTRIBUTE_UNUSED,
+     arelent *           reloc_entry ATTRIBUTE_UNUSED,
+     struct bfd_symbol * symbol ATTRIBUTE_UNUSED,
+     void *              data ATTRIBUTE_UNUSED,
+     asection *          input_section ATTRIBUTE_UNUSED,
+     bfd *               output_bfd ATTRIBUTE_UNUSED,
+     char **             error_message ATTRIBUTE_UNUSED)
+{
+  return bfd_reloc_ok;
+}
+
+
+
+#define BFD_RELOC_MEP_NONE BFD_RELOC_NONE
+#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
+#define MAP(n) case BFD_RELOC_MEP_##n: type = R_MEP_##n; break
+#else
+#define MAP(n) case BFD_RELOC_MEP_/**/n: type = R_MEP_/**/n; break
+#endif
+
+static reloc_howto_type *
+mep_reloc_type_lookup
+    (bfd * abfd ATTRIBUTE_UNUSED,
+     bfd_reloc_code_real_type code)
+{
+  unsigned int type = 0;
+
+  switch (code)
+    {
+    MAP(NONE);
+    case BFD_RELOC_8:
+      type = R_MEP_8;
+      break;
+    case BFD_RELOC_16:
+      type = R_MEP_16;
+      break;
+    case BFD_RELOC_32:
+      type = R_MEP_32;
+      break;
+    case BFD_RELOC_VTABLE_ENTRY:
+      type = R_MEP_GNU_VTENTRY;
+      break;
+    case BFD_RELOC_VTABLE_INHERIT:
+      type = R_MEP_GNU_VTINHERIT;
+      break;
+    case BFD_RELOC_RELC:
+      type = R_RELC;
+      break;
+
+    /* MEPRELOC:MAP */
+    /* This section generated from bfd/mep-relocs.pl from include/elf/mep.h.  */
+    MAP(8);
+    MAP(16);
+    MAP(32);
+    MAP(PCREL8A2);
+    MAP(PCREL12A2);
+    MAP(PCREL17A2);
+    MAP(PCREL24A2);
+    MAP(PCABS24A2);
+    MAP(LOW16);
+    MAP(HI16U);
+    MAP(HI16S);
+    MAP(GPREL);
+    MAP(TPREL);
+    MAP(TPREL7);
+    MAP(TPREL7A2);
+    MAP(TPREL7A4);
+    MAP(UIMM24);
+    MAP(ADDR24A4);
+    MAP(GNU_VTINHERIT);
+    MAP(GNU_VTENTRY);
+    /* MEPRELOC:END */
+
+    default:
+      /* Pacify gcc -Wall.  */
+      (*_bfd_error_handler) (_("mep: no reloc for code %d"), code);
+      return NULL;
+    }
+
+  if (mep_elf_howto_table[type].type != type)
+    {
+      (*_bfd_error_handler) (_("MeP: howto %d has type %d"),
+			     type, mep_elf_howto_table[type].type);
+      abort ();
+    }
+
+  return mep_elf_howto_table + type;
+}
+
+#undef MAP
+
+static reloc_howto_type *
+mep_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (mep_elf_howto_table) / sizeof (mep_elf_howto_table[0]);
+       i++)
+    if (mep_elf_howto_table[i].name != NULL
+	&& strcasecmp (mep_elf_howto_table[i].name, r_name) == 0)
+      return &mep_elf_howto_table[i];
+
+  return NULL;
+}
+
+/* Perform a single relocation.  */
+
+static struct bfd_link_info *mep_info;
+static int warn_tp = 0, warn_sda = 0;
+
+static bfd_vma
+mep_lookup_global
+    (char *    name,
+     bfd_vma   ofs,
+     bfd_vma * cache,
+     int *     warn)
+{
+  struct bfd_link_hash_entry *h;
+
+  if (*cache || *warn)
+    return *cache;
+
+  h = bfd_link_hash_lookup (mep_info->hash, name, FALSE, FALSE, TRUE);
+  if (h == 0 || h->type != bfd_link_hash_defined)
+    {
+      *warn = ofs + 1;
+      return 0;
+    }
+  *cache = (h->u.def.value
+	  + h->u.def.section->output_section->vma
+	  + h->u.def.section->output_offset);
+  return *cache;
+}
+
+static bfd_vma
+mep_tpoff_base (bfd_vma ofs)
+{
+  static bfd_vma cache = 0;
+  return mep_lookup_global ("__tpbase", ofs, &cache, &warn_tp);
+}
+
+static bfd_vma
+mep_sdaoff_base (bfd_vma ofs)
+{
+  static bfd_vma cache = 0;
+  return mep_lookup_global ("__sdabase", ofs, &cache, &warn_sda);
+}
+
+static bfd_reloc_status_type
+mep_final_link_relocate
+    (reloc_howto_type *  howto,
+     bfd *               input_bfd,
+     asection *          input_section,
+     bfd_byte *          contents,
+     Elf_Internal_Rela * rel,
+     bfd_vma             relocation)
+{
+  unsigned long u;
+  long s;
+  unsigned char *byte;
+  bfd_vma pc;
+  bfd_reloc_status_type r = bfd_reloc_ok;
+  int e2, e4;
+
+  if (bfd_big_endian (input_bfd))
+    {
+      e2 = 0;
+      e4 = 0;
+    }
+  else
+    {
+      e2 = 1;
+      e4 = 3;
+    }
+
+  pc = (input_section->output_section->vma
+	+ input_section->output_offset
+	+ rel->r_offset);
+
+  s = relocation + rel->r_addend;
+
+  byte = (unsigned char *)contents + rel->r_offset;
+
+  if (howto->type == R_MEP_PCREL24A2
+      && s == 0
+      && pc >= 0x800000)
+    {
+      /* This is an unreachable branch to an undefined weak function.
+	 Silently ignore it, since the opcode can't do that but should
+	 never be executed anyway.  */
+      return bfd_reloc_ok;
+    }
+
+  if (howto->pc_relative)
+    s -= pc;
+
+  u = (unsigned long) s;
+
+  switch (howto->type)
+    {
+    /* MEPRELOC:APPLY */
+    /* This section generated from bfd/mep-relocs.pl from include/elf/mep.h.  */
+    case R_MEP_8: /* 76543210 */
+      if (u > 255) r = bfd_reloc_overflow;
+      byte[0] = (u & 0xff);
+      break;
+    case R_MEP_16: /* fedcba9876543210 */
+      if (u > 65535) r = bfd_reloc_overflow;
+      byte[0^e2] = ((u >> 8) & 0xff);
+      byte[1^e2] = (u & 0xff);
+      break;
+    case R_MEP_32: /* vutsrqponmlkjihgfedcba9876543210 */
+      byte[0^e4] = ((u >> 24) & 0xff);
+      byte[1^e4] = ((u >> 16) & 0xff);
+      byte[2^e4] = ((u >> 8) & 0xff);
+      byte[3^e4] = (u & 0xff);
+      break;
+    case R_MEP_PCREL8A2: /* --------7654321- */
+      if (-128 > s || s > 127) r = bfd_reloc_overflow;
+      byte[1^e2] = (byte[1^e2] & 0x01) | (s & 0xfe);
+      break;
+    case R_MEP_PCREL12A2: /* ----ba987654321- */
+      if (-2048 > s || s > 2047) r = bfd_reloc_overflow;
+      byte[0^e2] = (byte[0^e2] & 0xf0) | ((s >> 8) & 0x0f);
+      byte[1^e2] = (byte[1^e2] & 0x01) | (s & 0xfe);
+      break;
+    case R_MEP_PCREL17A2: /* ----------------gfedcba987654321 */
+      if (-65536 > s || s > 65535) r = bfd_reloc_overflow;
+      byte[2^e2] = ((s >> 9) & 0xff);
+      byte[3^e2] = ((s >> 1) & 0xff);
+      break;
+    case R_MEP_PCREL24A2: /* -----7654321----nmlkjihgfedcba98 */
+      if (-8388608 > s || s > 8388607) r = bfd_reloc_overflow;
+      byte[0^e2] = (byte[0^e2] & 0xf8) | ((s >> 5) & 0x07);
+      byte[1^e2] = (byte[1^e2] & 0x0f) | ((s << 3) & 0xf0);
+      byte[2^e2] = ((s >> 16) & 0xff);
+      byte[3^e2] = ((s >> 8) & 0xff);
+      break;
+    case R_MEP_PCABS24A2: /* -----7654321----nmlkjihgfedcba98 */
+      if (u > 16777215) r = bfd_reloc_overflow;
+      byte[0^e2] = (byte[0^e2] & 0xf8) | ((u >> 5) & 0x07);
+      byte[1^e2] = (byte[1^e2] & 0x0f) | ((u << 3) & 0xf0);
+      byte[2^e2] = ((u >> 16) & 0xff);
+      byte[3^e2] = ((u >> 8) & 0xff);
+      break;
+    case R_MEP_LOW16: /* ----------------fedcba9876543210 */
+      byte[2^e2] = ((u >> 8) & 0xff);
+      byte[3^e2] = (u & 0xff);
+      break;
+    case R_MEP_HI16U: /* ----------------vutsrqponmlkjihg */
+      byte[2^e2] = ((u >> 24) & 0xff);
+      byte[3^e2] = ((u >> 16) & 0xff);
+      break;
+    case R_MEP_HI16S: /* ----------------vutsrqponmlkjihg */
+      if (s & 0x8000)
+	s += 0x10000;
+      byte[2^e2] = ((s >> 24) & 0xff);
+      byte[3^e2] = ((s >> 16) & 0xff);
+      break;
+    case R_MEP_GPREL: /* ----------------fedcba9876543210 */
+      s -= mep_sdaoff_base(rel->r_offset);
+      if (-32768 > s || s > 32767) r = bfd_reloc_overflow;
+      byte[2^e2] = ((s >> 8) & 0xff);
+      byte[3^e2] = (s & 0xff);
+      break;
+    case R_MEP_TPREL: /* ----------------fedcba9876543210 */
+      s -= mep_tpoff_base(rel->r_offset);
+      if (-32768 > s || s > 32767) r = bfd_reloc_overflow;
+      byte[2^e2] = ((s >> 8) & 0xff);
+      byte[3^e2] = (s & 0xff);
+      break;
+    case R_MEP_TPREL7: /* ---------6543210 */
+      u -= mep_tpoff_base(rel->r_offset);
+      if (u > 127) r = bfd_reloc_overflow;
+      byte[1^e2] = (byte[1^e2] & 0x80) | (u & 0x7f);
+      break;
+    case R_MEP_TPREL7A2: /* ---------654321- */
+      u -= mep_tpoff_base(rel->r_offset);
+      if (u > 127) r = bfd_reloc_overflow;
+      byte[1^e2] = (byte[1^e2] & 0x81) | (u & 0x7e);
+      break;
+    case R_MEP_TPREL7A4: /* ---------65432-- */
+      u -= mep_tpoff_base(rel->r_offset);
+      if (u > 127) r = bfd_reloc_overflow;
+      byte[1^e2] = (byte[1^e2] & 0x83) | (u & 0x7c);
+      break;
+    case R_MEP_UIMM24: /* --------76543210nmlkjihgfedcba98 */
+      if (u > 16777215) r = bfd_reloc_overflow;
+      byte[1^e2] = (u & 0xff);
+      byte[2^e2] = ((u >> 16) & 0xff);
+      byte[3^e2] = ((u >> 8) & 0xff);
+      break;
+    case R_MEP_ADDR24A4: /* --------765432--nmlkjihgfedcba98 */
+      if (u > 16777215) r = bfd_reloc_overflow;
+      byte[1^e2] = (byte[1^e2] & 0x03) | (u & 0xfc);
+      byte[2^e2] = ((u >> 16) & 0xff);
+      byte[3^e2] = ((u >> 8) & 0xff);
+      break;
+    case R_MEP_GNU_VTINHERIT: /* ---------------- */
+      break;
+    case R_MEP_GNU_VTENTRY: /* ---------------- */
+      break;
+    /* MEPRELOC:END */
+    default:
+      abort ();
+    }
+
+  return r;
+}
+
+/* Set the howto pointer for a MEP ELF reloc.  */
+
+static void
+mep_info_to_howto_rela
+    (bfd *               abfd ATTRIBUTE_UNUSED,
+     arelent *           cache_ptr,
+     Elf_Internal_Rela * dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  cache_ptr->howto = & mep_elf_howto_table [r_type];
+}
+
+/* Relocate a MEP ELF section.
+   There is some attempt to make this function usable for many architectures,
+   both USE_REL and USE_RELA ['twould be nice if such a critter existed],
+   if only to serve as a learning tool.
+
+   The RELOCATE_SECTION function is called by the new ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures; if the section
+   actually uses Rel structures, the r_addend field will always be
+   zero.
+
+   This function is responsible for adjusting the section contents as
+   necessary, and (if using Rela relocs and generating a relocatable
+   output file) adjusting the reloc addend as necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.  */
+
+static bfd_boolean
+mep_elf_relocate_section
+    (bfd *                   output_bfd ATTRIBUTE_UNUSED,
+     struct bfd_link_info *  info,
+     bfd *                   input_bfd,
+     asection *              input_section,
+     bfd_byte *              contents,
+     Elf_Internal_Rela *     relocs,
+     Elf_Internal_Sym *      local_syms,
+     asection **             local_sections)
+{
+  Elf_Internal_Shdr *           symtab_hdr;
+  struct elf_link_hash_entry ** sym_hashes;
+  Elf_Internal_Rela *           rel;
+  Elf_Internal_Rela *           relend;
+
+  symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+  relend     = relocs + input_section->reloc_count;
+
+  mep_info = info;
+
+  for (rel = relocs; rel < relend; rel ++)
+    {
+      reloc_howto_type *           howto;
+      unsigned long                r_symndx;
+      Elf_Internal_Sym *           sym;
+      asection *                   sec;
+      struct elf_link_hash_entry * h;
+      bfd_vma                      relocation;
+      bfd_reloc_status_type        r;
+      const char *                 name = NULL;
+      int                          r_type;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      howto  = mep_elf_howto_table + ELF32_R_TYPE (rel->r_info);
+      h      = NULL;
+      sym    = NULL;
+      sec    = NULL;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections [r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+
+	  name = bfd_elf_string_from_elf_section
+	    (input_bfd, symtab_hdr->sh_link, sym->st_name);
+	  name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name;
+	}
+      else
+	{
+	  bfd_boolean warned, unresolved_reloc;
+
+	  RELOC_FOR_GLOBAL_SYMBOL(info, input_bfd, input_section, rel,
+				  r_symndx, symtab_hdr, sym_hashes,
+				  h, sec, relocation,
+				  unresolved_reloc, warned);
+
+	  name = h->root.root.string;
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      if (r_type == R_RELC)
+	r = bfd_elf_perform_complex_relocation (input_bfd, input_section,
+						contents, rel, relocation);
+      else
+	r = mep_final_link_relocate (howto, input_bfd, input_section,
+				     contents, rel, relocation);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char * msg = (const char *) NULL;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      r = info->callbacks->reloc_overflow
+		(info, (h ? &h->root : NULL), name, howto->name, (bfd_vma) 0,
+		 input_bfd, input_section, rel->r_offset);
+	      break;
+
+	    case bfd_reloc_undefined:
+	      r = info->callbacks->undefined_symbol
+		(info, name, input_bfd, input_section, rel->r_offset, TRUE);
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      break;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      break;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous relocation");
+	      break;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      break;
+	    }
+
+	  if (msg)
+	    r = info->callbacks->warning
+	      (info, msg, name, input_bfd, input_section, rel->r_offset);
+
+	  if (! r)
+	    return FALSE;
+	}
+    }
+
+  if (warn_tp)
+    info->callbacks->undefined_symbol
+      (info, "__tpbase", input_bfd, input_section, warn_tp-1, TRUE);
+  if (warn_sda)
+    info->callbacks->undefined_symbol
+      (info, "__sdabase", input_bfd, input_section, warn_sda-1, TRUE);
+  if (warn_sda || warn_tp)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Function to set the ELF flag bits.  */
+
+static bfd_boolean
+mep_elf_set_private_flags (bfd *    abfd,
+			   flagword flags)
+{
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
+}
+
+static bfd_boolean
+mep_elf_copy_private_bfd_data (bfd * ibfd, bfd * obfd)
+{
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
+  elf_flags_init (obfd) = TRUE;
+
+  /* Copy object attributes.  */
+  _bfd_elf_copy_obj_attributes (ibfd, obfd);
+
+  return TRUE;
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+
+static bfd_boolean
+mep_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd)
+{
+  static bfd *last_ibfd = 0;
+  flagword old_flags, new_flags;
+  flagword old_partial, new_partial;
+
+  /* Check if we have the same endianness.  */
+  if (_bfd_generic_verify_endian_match (ibfd, obfd) == FALSE)
+    return FALSE;
+
+  new_flags = elf_elfheader (ibfd)->e_flags;
+  old_flags = elf_elfheader (obfd)->e_flags;
+
+#ifdef DEBUG
+  _bfd_error_handler ("%B: old_flags = 0x%.8lx, new_flags = 0x%.8lx, init = %s",
+		      ibfd, old_flags, new_flags, elf_flags_init (obfd) ? "yes" : "no");
+#endif
+
+    /* First call, no flags set.  */
+    if (!elf_flags_init (obfd))
+    {
+      elf_flags_init (obfd) = TRUE;
+      old_flags = new_flags;
+    }
+  else if ((new_flags | old_flags) & EF_MEP_LIBRARY)
+    {
+      /* Non-library flags trump library flags.  The choice doesn't really
+	 matter if both OLD_FLAGS and NEW_FLAGS have EF_MEP_LIBRARY set.  */
+      if (old_flags & EF_MEP_LIBRARY)
+	old_flags = new_flags;
+    }
+  else
+    {
+      /* Make sure they're for the same mach.  Allow upgrade from the "mep"
+	 mach.  */
+      new_partial = (new_flags & EF_MEP_CPU_MASK);
+      old_partial = (old_flags & EF_MEP_CPU_MASK);
+      if (new_partial == old_partial)
+	;
+      else if (new_partial == EF_MEP_CPU_MEP)
+	;
+      else if (old_partial == EF_MEP_CPU_MEP)
+	old_flags = (old_flags & ~EF_MEP_CPU_MASK) | new_partial;
+      else
+	{
+	  _bfd_error_handler (_("%B and %B are for different cores"), last_ibfd, ibfd);
+	  bfd_set_error (bfd_error_invalid_target);
+	  return FALSE;
+	}
+
+      /* Make sure they're for the same me_module.  Allow basic config to
+	 mix with any other.  */
+      new_partial = (new_flags & EF_MEP_INDEX_MASK);
+      old_partial = (old_flags & EF_MEP_INDEX_MASK);
+      if (new_partial == old_partial)
+	;
+      else if (new_partial == 0)
+	;
+      else if (old_partial == 0)
+	old_flags = (old_flags & ~EF_MEP_INDEX_MASK) | new_partial;
+      else
+	{
+	  _bfd_error_handler (_("%B and %B are for different configurations"), last_ibfd, ibfd);
+	  bfd_set_error (bfd_error_invalid_target);
+	  return FALSE;
+	}
+    }
+
+  elf_elfheader (obfd)->e_flags = old_flags;
+  last_ibfd = ibfd;
+  return TRUE;
+}
+
+/* This will be edited by the MeP configration tool.  */
+static const char * config_names[] =
+{
+  "basic"
+  /* start-mepcfgtool */
+  ,"default"
+  /* end-mepcfgtool */
+};
+
+static const char * core_names[] =
+{
+  "MeP", "MeP-c2", "MeP-c3", "MeP-h1"
+};
+
+static bfd_boolean
+mep_elf_print_private_bfd_data (bfd * abfd, void * ptr)
+{
+  FILE *   file = (FILE *) ptr;
+  flagword flags, partial_flags;
+
+  BFD_ASSERT (abfd != NULL && ptr != NULL);
+
+  /* Print normal ELF private data.  */
+  _bfd_elf_print_private_bfd_data (abfd, ptr);
+
+  flags = elf_elfheader (abfd)->e_flags;
+  fprintf (file, _("private flags = 0x%lx"), (unsigned long) flags);
+
+  partial_flags = (flags & EF_MEP_CPU_MASK) >> 24;
+  if (partial_flags < ARRAY_SIZE (core_names))
+    fprintf (file, "  core: %s", core_names[(long)partial_flags]);
+
+  partial_flags = flags & EF_MEP_INDEX_MASK;
+  if (partial_flags < ARRAY_SIZE (config_names))
+    fprintf (file, "  me_module: %s", config_names[(long)partial_flags]);
+
+  fputc ('\n', file);
+
+  return TRUE;
+}
+
+/* Return the machine subcode from the ELF e_flags header.  */
+
+static int
+elf32_mep_machine (bfd * abfd)
+{
+  switch (elf_elfheader (abfd)->e_flags & EF_MEP_CPU_MASK)
+    {
+    default: break;
+    case EF_MEP_CPU_C2: return bfd_mach_mep;
+    case EF_MEP_CPU_C3: return bfd_mach_mep;
+    case EF_MEP_CPU_C4: return bfd_mach_mep;
+    case EF_MEP_CPU_C5: return bfd_mach_mep_c5;
+    case EF_MEP_CPU_H1: return bfd_mach_mep_h1;
+    }
+
+  return bfd_mach_mep;
+}
+
+static bfd_boolean
+mep_elf_object_p (bfd * abfd)
+{
+  bfd_default_set_arch_mach (abfd, bfd_arch_mep, elf32_mep_machine (abfd));
+  return TRUE;
+}
+
+static bfd_boolean
+mep_elf_section_flags (flagword * flags, const Elf_Internal_Shdr * hdr)
+{
+  if (hdr->sh_flags & SHF_MEP_VLIW)
+    * flags |= SEC_MEP_VLIW;
+  return TRUE;
+}
+
+static bfd_boolean
+mep_elf_fake_sections (bfd *               abfd ATTRIBUTE_UNUSED,
+		       Elf_Internal_Shdr * hdr,
+		       asection *          sec)
+{
+  if (sec->flags & SEC_MEP_VLIW)
+    hdr->sh_flags |= SHF_MEP_VLIW;
+  return TRUE;
+}
+
+
+#define ELF_ARCH		bfd_arch_mep
+#define ELF_MACHINE_CODE	EM_CYGNUS_MEP
+#define ELF_MAXPAGESIZE		0x1000
+
+#define TARGET_BIG_SYM		bfd_elf32_mep_vec
+#define TARGET_BIG_NAME		"elf32-mep"
+
+#define TARGET_LITTLE_SYM	bfd_elf32_mep_little_vec
+#define TARGET_LITTLE_NAME	"elf32-mep-little"
+
+#define elf_info_to_howto_rel			NULL
+#define elf_info_to_howto			mep_info_to_howto_rela
+#define elf_backend_relocate_section		mep_elf_relocate_section
+#define elf_backend_object_p		        mep_elf_object_p
+#define elf_backend_section_flags		mep_elf_section_flags
+#define elf_backend_fake_sections		mep_elf_fake_sections
+
+#define bfd_elf32_bfd_reloc_type_lookup		mep_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup		mep_reloc_name_lookup
+#define bfd_elf32_bfd_set_private_flags		mep_elf_set_private_flags
+#define bfd_elf32_bfd_copy_private_bfd_data	mep_elf_copy_private_bfd_data
+#define bfd_elf32_bfd_merge_private_bfd_data	mep_elf_merge_private_bfd_data
+#define bfd_elf32_bfd_print_private_bfd_data	mep_elf_print_private_bfd_data
+
+#define elf_backend_rela_normal			1
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-microblaze.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-microblaze.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-microblaze.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-microblaze.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3055 @@
+/* Xilinx MicroBlaze-specific support for 32-bit ELF
+
+   Copyright 2009, 2010, 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+
+int dbg = 0;
+
+#include "bfd.h"
+#include "sysdep.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/microblaze.h"
+#include <assert.h>
+
+#define	USE_RELA	/* Only USE_REL is actually significant, but this is
+			   here are a reminder...  */
+#define INST_WORD_SIZE 4
+
+static int ro_small_data_pointer = 0;
+static int rw_small_data_pointer = 0;
+
+static reloc_howto_type * microblaze_elf_howto_table [(int) R_MICROBLAZE_max];
+
+static reloc_howto_type microblaze_elf_howto_raw[] =
+{
+   /* This reloc does nothing.  */
+   HOWTO (R_MICROBLAZE_NONE,	/* Type.  */
+          0,			/* Rightshift.  */
+          2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+          32,			/* Bitsize.  */
+          FALSE,		/* PC_relative.  */
+          0,			/* Bitpos.  */
+          complain_overflow_bitfield,  /* Complain on overflow.  */
+          NULL,                  /* Special Function.  */
+          "R_MICROBLAZE_NONE", 	/* Name.  */
+          FALSE,		/* Partial Inplace.  */
+          0,			/* Source Mask.  */
+          0,			/* Dest Mask.  */
+          FALSE),		/* PC relative offset?  */
+
+   /* A standard 32 bit relocation.  */
+   HOWTO (R_MICROBLAZE_32,     	/* Type.  */
+          0,			/* Rightshift.  */
+          2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+          32,			/* Bitsize.  */
+          FALSE,		/* PC_relative.  */
+          0,			/* Bitpos.  */
+          complain_overflow_bitfield, /* Complain on overflow.  */
+          bfd_elf_generic_reloc,/* Special Function.  */
+          "R_MICROBLAZE_32",   	/* Name.  */
+          FALSE,		/* Partial Inplace.  */
+          0,			/* Source Mask.  */
+          0xffffffff,		/* Dest Mask.  */
+          FALSE), 		/* PC relative offset?  */
+
+   /* A standard PCREL 32 bit relocation.  */
+   HOWTO (R_MICROBLAZE_32_PCREL,/* Type.  */
+          0,			/* Rightshift.  */
+          2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+          32,			/* Bitsize.  */
+          TRUE,			/* PC_relative.  */
+          0,			/* Bitpos.  */
+          complain_overflow_bitfield, /* Complain on overflow.  */
+          bfd_elf_generic_reloc,/* Special Function.  */
+          "R_MICROBLAZE_32_PCREL",   	/* Name.  */
+          TRUE,			/* Partial Inplace.  */
+          0,			/* Source Mask.  */
+          0xffffffff,		/* Dest Mask.  */
+          TRUE), 		/* PC relative offset?  */
+
+   /* A 64 bit PCREL relocation.  Table-entry not really used.  */
+   HOWTO (R_MICROBLAZE_64_PCREL,/* Type.  */
+          0,			/* Rightshift.  */
+          2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+          16,			/* Bitsize.  */
+          TRUE,			/* PC_relative.  */
+          0,			/* Bitpos.  */
+          complain_overflow_dont, /* Complain on overflow.  */
+          bfd_elf_generic_reloc,/* Special Function.  */
+          "R_MICROBLAZE_64_PCREL", 	/* Name.  */
+          FALSE,		/* Partial Inplace.  */
+          0,			/* Source Mask.  */
+          0x0000ffff,		/* Dest Mask.  */
+          TRUE), 		/* PC relative offset?  */
+
+   /* The low half of a PCREL 32 bit relocation.  */
+   HOWTO (R_MICROBLAZE_32_PCREL_LO,   	/* Type.  */
+          0,			/* Rightshift.  */
+          2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+          16,			/* Bitsize.  */
+          TRUE,			/* PC_relative.  */
+          0,			/* Bitpos.  */
+          complain_overflow_signed, /* Complain on overflow.  */
+          bfd_elf_generic_reloc,	/* Special Function.  */
+          "R_MICROBLAZE_32_PCREL_LO", 	/* Name.  */
+          FALSE,		/* Partial Inplace.  */
+          0,			/* Source Mask.  */
+          0x0000ffff,		/* Dest Mask.  */
+          TRUE), 		/* PC relative offset?  */
+
+   /* A 64 bit relocation.  Table entry not really used.  */
+   HOWTO (R_MICROBLAZE_64,     	/* Type.  */
+          0,			/* Rightshift.  */
+          2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+          16,			/* Bitsize.  */
+          FALSE,		/* PC_relative.  */
+          0,			/* Bitpos.  */
+          complain_overflow_dont, /* Complain on overflow.  */
+          bfd_elf_generic_reloc,/* Special Function.  */
+          "R_MICROBLAZE_64",   	/* Name.  */
+          FALSE,		/* Partial Inplace.  */
+          0,			/* Source Mask.  */
+          0x0000ffff,		/* Dest Mask.  */
+          FALSE), 		/* PC relative offset?  */
+
+   /* The low half of a 32 bit relocation.  */
+   HOWTO (R_MICROBLAZE_32_LO,   /* Type.  */
+          0,			/* Rightshift.  */
+          2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+          16,			/* Bitsize.  */
+          FALSE,		/* PC_relative.  */
+          0,			/* Bitpos.  */
+          complain_overflow_signed, /* Complain on overflow.  */
+          bfd_elf_generic_reloc,/* Special Function.  */
+          "R_MICROBLAZE_32_LO", /* Name.  */
+          FALSE,		/* Partial Inplace.  */
+          0,			/* Source Mask.  */
+          0x0000ffff,		/* Dest Mask.  */
+          FALSE), 		/* PC relative offset?  */
+
+   /* Read-only small data section relocation.  */
+   HOWTO (R_MICROBLAZE_SRO32,   /* Type.  */
+          0,			/* Rightshift.  */
+          2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+          16,			/* Bitsize.  */
+          FALSE,		/* PC_relative.  */
+          0,			/* Bitpos.  */
+          complain_overflow_bitfield, /* Complain on overflow.  */
+          bfd_elf_generic_reloc,/* Special Function.  */
+          "R_MICROBLAZE_SRO32", /* Name.  */
+          FALSE,		/* Partial Inplace.  */
+          0,			/* Source Mask.  */
+          0x0000ffff,		/* Dest Mask.  */
+          FALSE), 		/* PC relative offset?  */
+
+   /* Read-write small data area relocation.  */
+   HOWTO (R_MICROBLAZE_SRW32,   /* Type.  */
+          0,			/* Rightshift.  */
+          2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+          16,			/* Bitsize.  */
+          FALSE,		/* PC_relative.  */
+          0,			/* Bitpos.  */
+          complain_overflow_bitfield, /* Complain on overflow.  */
+          bfd_elf_generic_reloc,/* Special Function.  */
+          "R_MICROBLAZE_SRW32", /* Name.  */
+          FALSE,		/* Partial Inplace.  */
+          0,			/* Source Mask.  */
+          0x0000ffff,		/* Dest Mask.  */
+          FALSE), 		/* PC relative offset?  */
+
+   /* This reloc does nothing.  Used for relaxation.  */
+   HOWTO (R_MICROBLAZE_64_NONE,	/* Type.  */
+          0,			/* Rightshift.  */
+          2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+          32,			/* Bitsize.  */
+          TRUE,			/* PC_relative.  */
+          0,			/* Bitpos.  */
+          complain_overflow_bitfield,  /* Complain on overflow.  */
+          NULL,                  /* Special Function.  */
+          "R_MICROBLAZE_64_NONE",/* Name.  */
+          FALSE,		/* Partial Inplace.  */
+          0,			/* Source Mask.  */
+          0,			/* Dest Mask.  */
+          FALSE),		/* PC relative offset?  */
+
+   /* Symbol Op Symbol relocation.  */
+   HOWTO (R_MICROBLAZE_32_SYM_OP_SYM,     	/* Type.  */
+          0,			/* Rightshift.  */
+          2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+          32,			/* Bitsize.  */
+          FALSE,		/* PC_relative.  */
+          0,			/* Bitpos.  */
+          complain_overflow_bitfield, /* Complain on overflow.  */
+          bfd_elf_generic_reloc,/* Special Function.  */
+          "R_MICROBLAZE_32_SYM_OP_SYM",   	/* Name.  */
+          FALSE,		/* Partial Inplace.  */
+          0,			/* Source Mask.  */
+          0xffffffff,		/* Dest Mask.  */
+          FALSE), 		/* PC relative offset?  */
+
+   /* GNU extension to record C++ vtable hierarchy.  */
+   HOWTO (R_MICROBLAZE_GNU_VTINHERIT, /* Type.  */
+          0,                     /* Rightshift.  */
+          2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+          0,                     /* Bitsize.  */
+          FALSE,                 /* PC_relative.  */
+          0,                     /* Bitpos.  */
+          complain_overflow_dont,/* Complain on overflow.  */
+          NULL,                  /* Special Function.  */
+          "R_MICROBLAZE_GNU_VTINHERIT", /* Name.  */
+          FALSE,                 /* Partial Inplace.  */
+          0,                     /* Source Mask.  */
+          0,                     /* Dest Mask.  */
+          FALSE),                /* PC relative offset?  */
+
+   /* GNU extension to record C++ vtable member usage.  */
+   HOWTO (R_MICROBLAZE_GNU_VTENTRY,   /* Type.  */
+          0,                     /* Rightshift.  */
+          2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+          0,                     /* Bitsize.  */
+          FALSE,                 /* PC_relative.  */
+          0,                     /* Bitpos.  */
+          complain_overflow_dont,/* Complain on overflow.  */
+          _bfd_elf_rel_vtable_reloc_fn,  /* Special Function.  */
+          "R_MICROBLAZE_GNU_VTENTRY", /* Name.  */
+          FALSE,                 /* Partial Inplace.  */
+          0,                     /* Source Mask.  */
+          0,                     /* Dest Mask.  */
+          FALSE),                /* PC relative offset?  */
+
+   /* A 64 bit GOTPC relocation.  Table-entry not really used.  */
+   HOWTO (R_MICROBLAZE_GOTPC_64,   	/* Type.  */
+          0,			/* Rightshift.  */
+          2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+          16,			/* Bitsize.  */
+          TRUE,			/* PC_relative.  */
+          0,			/* Bitpos.  */
+          complain_overflow_dont, /* Complain on overflow.  */
+          bfd_elf_generic_reloc,	/* Special Function.  */
+          "R_MICROBLAZE_GOTPC_64", 	/* Name.  */
+          FALSE,		/* Partial Inplace.  */
+          0,			/* Source Mask.  */
+          0x0000ffff,		/* Dest Mask.  */
+          TRUE), 		/* PC relative offset?  */
+
+   /* A 64 bit GOT relocation.  Table-entry not really used.  */
+   HOWTO (R_MICROBLAZE_GOT_64,  /* Type.  */
+          0,			/* Rightshift.  */
+          2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+          16,			/* Bitsize.  */
+          FALSE,		/* PC_relative.  */
+          0,			/* Bitpos.  */
+          complain_overflow_dont, /* Complain on overflow.  */
+          bfd_elf_generic_reloc,/* Special Function.  */
+          "R_MICROBLAZE_GOT_64",/* Name.  */
+          FALSE,		/* Partial Inplace.  */
+          0,			/* Source Mask.  */
+          0x0000ffff,		/* Dest Mask.  */
+          FALSE), 		/* PC relative offset?  */
+
+   /* A 64 bit PLT relocation.  Table-entry not really used.  */
+   HOWTO (R_MICROBLAZE_PLT_64,  /* Type.  */
+          0,			/* Rightshift.  */
+          2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+          16,			/* Bitsize.  */
+          TRUE,			/* PC_relative.  */
+          0,			/* Bitpos.  */
+          complain_overflow_dont, /* Complain on overflow.  */
+          bfd_elf_generic_reloc,/* Special Function.  */
+          "R_MICROBLAZE_PLT_64",/* Name.  */
+          FALSE,		/* Partial Inplace.  */
+          0,			/* Source Mask.  */
+          0x0000ffff,		/* Dest Mask.  */
+          TRUE), 		/* PC relative offset?  */
+
+   /*  Table-entry not really used.  */
+   HOWTO (R_MICROBLAZE_REL,   	/* Type.  */
+          0,			/* Rightshift.  */
+          2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+          16,			/* Bitsize.  */
+          TRUE,			/* PC_relative.  */
+          0,			/* Bitpos.  */
+          complain_overflow_dont, /* Complain on overflow.  */
+          bfd_elf_generic_reloc,/* Special Function.  */
+          "R_MICROBLAZE_REL", 	/* Name.  */
+          FALSE,		/* Partial Inplace.  */
+          0,			/* Source Mask.  */
+          0x0000ffff,		/* Dest Mask.  */
+          TRUE), 		/* PC relative offset?  */
+
+   /*  Table-entry not really used.  */
+   HOWTO (R_MICROBLAZE_JUMP_SLOT,/* Type.  */
+          0,			/* Rightshift.  */
+          2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+          16,			/* Bitsize.  */
+          TRUE,			/* PC_relative.  */
+          0,			/* Bitpos.  */
+          complain_overflow_dont, /* Complain on overflow.  */
+          bfd_elf_generic_reloc,/* Special Function.  */
+          "R_MICROBLAZE_JUMP_SLOT", 	/* Name.  */
+          FALSE,		/* Partial Inplace.  */
+          0,			/* Source Mask.  */
+          0x0000ffff,		/* Dest Mask.  */
+          TRUE), 		/* PC relative offset?  */
+
+   /*  Table-entry not really used.  */
+   HOWTO (R_MICROBLAZE_GLOB_DAT,/* Type.  */
+          0,			/* Rightshift.  */
+          2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+          16,			/* Bitsize.  */
+          TRUE,			/* PC_relative.  */
+          0,			/* Bitpos.  */
+          complain_overflow_dont, /* Complain on overflow.  */
+          bfd_elf_generic_reloc,/* Special Function.  */
+          "R_MICROBLAZE_GLOB_DAT", 	/* Name.  */
+          FALSE,		/* Partial Inplace.  */
+          0,			/* Source Mask.  */
+          0x0000ffff,		/* Dest Mask.  */
+          TRUE), 		/* PC relative offset?  */
+
+   /* A 64 bit GOT relative relocation.  Table-entry not really used.  */
+   HOWTO (R_MICROBLAZE_GOTOFF_64,   	/* Type.  */
+          0,			/* Rightshift.  */
+          2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+          16,			/* Bitsize.  */
+          FALSE,		/* PC_relative.  */
+          0,			/* Bitpos.  */
+          complain_overflow_dont, /* Complain on overflow.  */
+          bfd_elf_generic_reloc,/* Special Function.  */
+          "R_MICROBLAZE_GOTOFF_64", 	/* Name.  */
+          FALSE,		/* Partial Inplace.  */
+          0,			/* Source Mask.  */
+          0x0000ffff,		/* Dest Mask.  */
+          FALSE), 		/* PC relative offset?  */
+
+   /* A 32 bit GOT relative relocation.  Table-entry not really used.  */
+   HOWTO (R_MICROBLAZE_GOTOFF_32,   	/* Type.  */
+          0,			/* Rightshift.  */
+          2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+          16,			/* Bitsize.  */
+          FALSE,		/* PC_relative.  */
+          0,			/* Bitpos.  */
+          complain_overflow_dont, /* Complain on overflow.  */
+          bfd_elf_generic_reloc,	/* Special Function.  */
+          "R_MICROBLAZE_GOTOFF_32", 	/* Name.  */
+          FALSE,		/* Partial Inplace.  */
+          0,			/* Source Mask.  */
+          0x0000ffff,		/* Dest Mask.  */
+          FALSE), 		/* PC relative offset?  */
+
+   /* COPY relocation.  Table-entry not really used.  */
+   HOWTO (R_MICROBLAZE_COPY,   	/* Type.  */
+          0,			/* Rightshift.  */
+          2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+          16,			/* Bitsize.  */
+          FALSE,		/* PC_relative.  */
+          0,			/* Bitpos.  */
+          complain_overflow_dont, /* Complain on overflow.  */
+          bfd_elf_generic_reloc,/* Special Function.  */
+          "R_MICROBLAZE_COPY", 	/* Name.  */
+          FALSE,		/* Partial Inplace.  */
+          0,			/* Source Mask.  */
+          0x0000ffff,		/* Dest Mask.  */
+          FALSE), 		/* PC relative offset?  */
+};
+
+#ifndef NUM_ELEM
+#define NUM_ELEM(a) (sizeof (a) / sizeof (a)[0])
+#endif
+
+/* Initialize the microblaze_elf_howto_table, so that linear accesses can be done.  */
+
+static void
+microblaze_elf_howto_init (void)
+{
+  unsigned int i;
+
+  for (i = NUM_ELEM (microblaze_elf_howto_raw); i--;)
+    {
+      unsigned int type;
+
+      type = microblaze_elf_howto_raw[i].type;
+
+      BFD_ASSERT (type < NUM_ELEM (microblaze_elf_howto_table));
+
+      microblaze_elf_howto_table [type] = & microblaze_elf_howto_raw [i];
+    }
+}
+
+static reloc_howto_type *
+microblaze_elf_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
+				  bfd_reloc_code_real_type code)
+{
+  enum elf_microblaze_reloc_type microblaze_reloc = R_MICROBLAZE_NONE;
+
+  switch (code)
+    {
+    case BFD_RELOC_NONE:
+      microblaze_reloc = R_MICROBLAZE_NONE;
+      break;
+    case BFD_RELOC_MICROBLAZE_64_NONE:
+      microblaze_reloc = R_MICROBLAZE_64_NONE;
+      break;
+    case BFD_RELOC_32:
+      microblaze_reloc = R_MICROBLAZE_32;
+      break;
+      /* RVA is treated the same as 32 */
+    case BFD_RELOC_RVA:
+      microblaze_reloc = R_MICROBLAZE_32;
+      break;
+    case BFD_RELOC_32_PCREL:
+      microblaze_reloc = R_MICROBLAZE_32_PCREL;
+      break;
+    case BFD_RELOC_64_PCREL:
+      microblaze_reloc = R_MICROBLAZE_64_PCREL;
+      break;
+    case BFD_RELOC_MICROBLAZE_32_LO_PCREL:
+      microblaze_reloc = R_MICROBLAZE_32_PCREL_LO;
+      break;
+    case BFD_RELOC_64:
+      microblaze_reloc = R_MICROBLAZE_64;
+      break;
+    case BFD_RELOC_MICROBLAZE_32_LO:
+      microblaze_reloc = R_MICROBLAZE_32_LO;
+      break;
+    case BFD_RELOC_MICROBLAZE_32_ROSDA:
+      microblaze_reloc = R_MICROBLAZE_SRO32;
+      break;
+    case BFD_RELOC_MICROBLAZE_32_RWSDA:
+      microblaze_reloc = R_MICROBLAZE_SRW32;
+      break;
+    case BFD_RELOC_MICROBLAZE_32_SYM_OP_SYM:
+      microblaze_reloc = R_MICROBLAZE_32_SYM_OP_SYM;
+      break;
+    case BFD_RELOC_VTABLE_INHERIT:
+      microblaze_reloc = R_MICROBLAZE_GNU_VTINHERIT;
+      break;
+    case BFD_RELOC_VTABLE_ENTRY:
+      microblaze_reloc = R_MICROBLAZE_GNU_VTENTRY;
+      break;
+    case BFD_RELOC_MICROBLAZE_64_GOTPC:
+      microblaze_reloc = R_MICROBLAZE_GOTPC_64;
+      break;
+    case BFD_RELOC_MICROBLAZE_64_GOT:
+      microblaze_reloc = R_MICROBLAZE_GOT_64;
+      break;
+    case BFD_RELOC_MICROBLAZE_64_PLT:
+      microblaze_reloc = R_MICROBLAZE_PLT_64;
+      break;
+    case BFD_RELOC_MICROBLAZE_64_GOTOFF:
+      microblaze_reloc = R_MICROBLAZE_GOTOFF_64;
+      break;
+    case BFD_RELOC_MICROBLAZE_32_GOTOFF:
+      microblaze_reloc = R_MICROBLAZE_GOTOFF_32;
+      break;
+    case BFD_RELOC_MICROBLAZE_COPY:
+      microblaze_reloc = R_MICROBLAZE_COPY;
+      break;
+    default:
+      return (reloc_howto_type *) NULL;
+    }
+
+  if (!microblaze_elf_howto_table [R_MICROBLAZE_32])
+    /* Initialize howto table if needed.  */
+    microblaze_elf_howto_init ();
+
+  return microblaze_elf_howto_table [(int) microblaze_reloc];
+};
+
+static reloc_howto_type *
+microblaze_elf_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				  const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0; i < NUM_ELEM (microblaze_elf_howto_raw); i++)
+    if (microblaze_elf_howto_raw[i].name != NULL
+	&& strcasecmp (microblaze_elf_howto_raw[i].name, r_name) == 0)
+      return &microblaze_elf_howto_raw[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for a RCE ELF reloc.  */
+
+static void
+microblaze_elf_info_to_howto (bfd * abfd ATTRIBUTE_UNUSED,
+			      arelent * cache_ptr,
+			      Elf_Internal_Rela * dst)
+{
+  if (!microblaze_elf_howto_table [R_MICROBLAZE_32])
+    /* Initialize howto table if needed.  */
+    microblaze_elf_howto_init ();
+
+  BFD_ASSERT (ELF32_R_TYPE (dst->r_info) < (unsigned int) R_MICROBLAZE_max);
+
+  cache_ptr->howto = microblaze_elf_howto_table [ELF32_R_TYPE (dst->r_info)];
+}
+
+/* Microblaze ELF local labels start with 'L.' or '$L', not '.L'.  */
+
+static bfd_boolean
+microblaze_elf_is_local_label_name (bfd *abfd, const char *name)
+{
+  if (name[0] == 'L' && name[1] == '.')
+    return TRUE;
+
+  if (name[0] == '$' && name[1] == 'L')
+    return TRUE;
+
+  /* With gcc, the labels go back to starting with '.', so we accept
+     the generic ELF local label syntax as well.  */
+  return _bfd_elf_is_local_label_name (abfd, name);
+}
+
+/* The microblaze linker (like many others) needs to keep track of
+   the number of relocs that it decides to copy as dynamic relocs in
+   check_relocs for each symbol. This is so that it can later discard
+   them if they are found to be unnecessary.  We store the information
+   in a field extending the regular ELF linker hash table.  */
+
+struct elf32_mb_dyn_relocs
+{
+  struct elf32_mb_dyn_relocs *next;
+
+  /* The input section of the reloc.  */
+  asection *sec;
+
+  /* Total number of relocs copied for the input section.  */
+  bfd_size_type count;
+
+  /* Number of pc-relative relocs copied for the input section.  */
+  bfd_size_type pc_count;
+};
+
+/* ELF linker hash entry.  */
+
+struct elf32_mb_link_hash_entry
+{
+  struct elf_link_hash_entry elf;
+
+  /* Track dynamic relocs copied for this symbol.  */
+  struct elf32_mb_dyn_relocs *dyn_relocs;
+
+};
+
+#define elf32_mb_hash_entry(ent) ((struct elf32_mb_link_hash_entry *)(ent))
+
+/* ELF linker hash table.  */
+
+struct elf32_mb_link_hash_table
+{
+  struct elf_link_hash_table elf;
+
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *sgot;
+  asection *sgotplt;
+  asection *srelgot;
+  asection *splt;
+  asection *srelplt;
+  asection *sdynbss;
+  asection *srelbss;
+
+  /* Small local sym to section mapping cache.  */
+  struct sym_cache sym_sec;
+};
+
+/* Get the ELF linker hash table from a link_info structure.  */
+
+#define elf32_mb_hash_table(p)				\
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == MICROBLAZE_ELF_DATA ? ((struct elf32_mb_link_hash_table *) ((p)->hash)) : NULL)
+
+/* Create an entry in a microblaze ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+link_hash_newfunc (struct bfd_hash_entry *entry,
+		   struct bfd_hash_table *table,
+		   const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table,
+				 sizeof (struct elf32_mb_link_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = _bfd_elf_link_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct elf32_mb_link_hash_entry *eh;
+
+      eh = (struct elf32_mb_link_hash_entry *) entry;
+      eh->dyn_relocs = NULL;
+    }
+
+  return entry;
+}
+
+/* Create a mb ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+microblaze_elf_link_hash_table_create (bfd *abfd)
+{
+  struct elf32_mb_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct elf32_mb_link_hash_table);
+
+  ret = (struct elf32_mb_link_hash_table *) bfd_zmalloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd, link_hash_newfunc,
+				      sizeof (struct elf32_mb_link_hash_entry),
+				      MICROBLAZE_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  return &ret->elf.root;
+}
+
+/* Set the values of the small data pointers.  */
+
+static void
+microblaze_elf_final_sdp (struct bfd_link_info *info)
+{
+  struct bfd_link_hash_entry *h;
+
+  h = bfd_link_hash_lookup (info->hash, RO_SDA_ANCHOR_NAME, FALSE, FALSE, TRUE);
+  if (h != (struct bfd_link_hash_entry *) NULL
+      && h->type == bfd_link_hash_defined)
+    ro_small_data_pointer = (h->u.def.value
+                             + h->u.def.section->output_section->vma
+                             + h->u.def.section->output_offset);
+
+  h = bfd_link_hash_lookup (info->hash, RW_SDA_ANCHOR_NAME, FALSE, FALSE, TRUE);
+  if (h != (struct bfd_link_hash_entry *) NULL
+      && h->type == bfd_link_hash_defined)
+    rw_small_data_pointer = (h->u.def.value
+                             + h->u.def.section->output_section->vma
+                             + h->u.def.section->output_offset);
+}
+
+/* This code is taken from elf32-m32r.c
+   There is some attempt to make this function usable for many architectures,
+   both USE_REL and USE_RELA ['twould be nice if such a critter existed],
+   if only to serve as a learning tool.
+
+   The RELOCATE_SECTION function is called by the new ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures; if the section
+   actually uses Rel structures, the r_addend field will always be
+   zero.
+
+   This function is responsible for adjust the section contents as
+   necessary, and (if using Rela relocs and generating a
+   relocatable output file) adjusting the reloc addend as
+   necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.  */
+
+static bfd_boolean
+microblaze_elf_relocate_section (bfd *output_bfd,
+			         struct bfd_link_info *info,
+			         bfd *input_bfd,
+			         asection *input_section,
+			         bfd_byte *contents,
+			         Elf_Internal_Rela *relocs,
+			         Elf_Internal_Sym *local_syms,
+			         asection **local_sections)
+{
+  struct elf32_mb_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd);
+  Elf_Internal_Rela *rel, *relend;
+  /* Assume success.  */
+  bfd_boolean ret = TRUE;
+  asection *sreloc;
+  bfd_vma *local_got_offsets;
+
+  if (!microblaze_elf_howto_table[R_MICROBLAZE_max-1])
+    microblaze_elf_howto_init ();
+
+  htab = elf32_mb_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  local_got_offsets = elf_local_got_offsets (input_bfd);
+
+  sreloc = elf_section_data (input_section)->sreloc;
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      bfd_vma addend = rel->r_addend;
+      bfd_vma offset = rel->r_offset;
+      struct elf_link_hash_entry *h;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      const char *sym_name;
+      bfd_reloc_status_type r = bfd_reloc_ok;
+      const char *errmsg = NULL;
+      bfd_boolean unresolved_reloc = FALSE;
+
+      h = NULL;
+      r_type = ELF32_R_TYPE (rel->r_info);
+      if (r_type < 0 || r_type >= (int) R_MICROBLAZE_max)
+	{
+	  (*_bfd_error_handler) (_("%s: unknown relocation type %d"),
+				 bfd_get_filename (input_bfd), (int) r_type);
+	  bfd_set_error (bfd_error_bad_value);
+	  ret = FALSE;
+	  continue;
+	}
+
+      howto = microblaze_elf_howto_table[r_type];
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      if (info->relocatable)
+	{
+	  /* This is a relocatable link.  We don't have to change
+	     anything, unless the reloc is against a section symbol,
+	     in which case we have to adjust according to where the
+	     section symbol winds up in the output section.  */
+	  sec = NULL;
+	  if (r_symndx >= symtab_hdr->sh_info)
+	    /* External symbol.  */
+	    continue;
+
+	  /* Local symbol.  */
+	  sym = local_syms + r_symndx;
+	  sym_name = "<local symbol>";
+	  /* STT_SECTION: symbol is associated with a section.  */
+	  if (ELF_ST_TYPE (sym->st_info) != STT_SECTION)
+	    /* Symbol isn't associated with a section.  Nothing to do.  */
+	    continue;
+
+	  sec = local_sections[r_symndx];
+	  addend += sec->output_offset + sym->st_value;
+#ifndef USE_REL
+	  /* This can't be done for USE_REL because it doesn't mean anything
+	     and elf_link_input_bfd asserts this stays zero.  */
+	  /* rel->r_addend = addend; */
+#endif
+
+#ifndef USE_REL
+	  /* Addends are stored with relocs.  We're done.  */
+	  continue;
+#else /* USE_REL */
+	  /* If partial_inplace, we need to store any additional addend
+	     back in the section.  */
+	  if (!howto->partial_inplace)
+	    continue;
+	  /* ??? Here is a nice place to call a special_function like handler.  */
+	  r = _bfd_relocate_contents (howto, input_bfd, addend,
+				      contents + offset);
+#endif /* USE_REL */
+	}
+      else
+	{
+	  bfd_vma relocation;
+
+	  /* This is a final link.  */
+	  sym = NULL;
+	  sec = NULL;
+	  unresolved_reloc = FALSE;
+
+	  if (r_symndx < symtab_hdr->sh_info)
+	    {
+	      /* Local symbol.  */
+	      sym = local_syms + r_symndx;
+	      sec = local_sections[r_symndx];
+	      if (sec == 0)
+		continue;
+	      sym_name = "<local symbol>";
+	      relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	      /* r_addend may have changed if the reference section was
+		 a merge section.  */
+	      addend = rel->r_addend;
+	    }
+	  else
+	    {
+	      /* External symbol.  */
+	      bfd_boolean warned ATTRIBUTE_UNUSED;
+
+	      RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				       r_symndx, symtab_hdr, sym_hashes,
+				       h, sec, relocation,
+				       unresolved_reloc, warned);
+	      sym_name = h->root.root.string;
+	    }
+
+	  /* Sanity check the address.  */
+	  if (offset > bfd_get_section_limit (input_bfd, input_section))
+	    {
+	      r = bfd_reloc_outofrange;
+	      goto check_reloc;
+	    }
+
+	  switch ((int) r_type)
+	    {
+	    case (int) R_MICROBLAZE_SRO32 :
+	      {
+		const char *name;
+
+		/* Only relocate if the symbol is defined.  */
+		if (sec)
+		  {
+		    name = bfd_get_section_name (abfd, sec);
+
+		    if (strcmp (name, ".sdata2") == 0
+			|| strcmp (name, ".sbss2") == 0)
+		      {
+			if (ro_small_data_pointer == 0)
+			  microblaze_elf_final_sdp (info);
+			if (ro_small_data_pointer == 0)
+			  {
+			    ret = FALSE;
+			    r = bfd_reloc_undefined;
+			    goto check_reloc;
+			  }
+
+			/* At this point `relocation' contains the object's
+			   address.  */
+			relocation -= ro_small_data_pointer;
+			/* Now it contains the offset from _SDA2_BASE_.  */
+			r = _bfd_final_link_relocate (howto, input_bfd,
+						      input_section,
+						      contents, offset,
+						      relocation, addend);
+		      }
+		    else
+		      {
+			(*_bfd_error_handler) (_("%s: The target (%s) of an %s relocation is in the wrong section (%s)"),
+					       bfd_get_filename (input_bfd),
+					       sym_name,
+					       microblaze_elf_howto_table[(int) r_type]->name,
+					       bfd_get_section_name (abfd, sec));
+			/*bfd_set_error (bfd_error_bad_value); ??? why? */
+			ret = FALSE;
+			continue;
+		      }
+		  }
+	      }
+	      break;
+
+	    case (int) R_MICROBLAZE_SRW32 :
+	      {
+		const char *name;
+
+		/* Only relocate if the symbol is defined.  */
+		if (sec)
+		  {
+		    name = bfd_get_section_name (abfd, sec);
+
+		    if (strcmp (name, ".sdata") == 0
+			|| strcmp (name, ".sbss") == 0)
+		      {
+			if (rw_small_data_pointer == 0)
+			  microblaze_elf_final_sdp (info);
+			if (rw_small_data_pointer == 0)
+			  {
+			    ret = FALSE;
+			    r = bfd_reloc_undefined;
+			    goto check_reloc;
+			  }
+
+			/* At this point `relocation' contains the object's
+			   address.  */
+			relocation -= rw_small_data_pointer;
+			/* Now it contains the offset from _SDA_BASE_.  */
+			r = _bfd_final_link_relocate (howto, input_bfd,
+						      input_section,
+						      contents, offset,
+						      relocation, addend);
+		      }
+		    else
+		      {
+			(*_bfd_error_handler) (_("%s: The target (%s) of an %s relocation is in the wrong section (%s)"),
+					       bfd_get_filename (input_bfd),
+					       sym_name,
+					       microblaze_elf_howto_table[(int) r_type]->name,
+					       bfd_get_section_name (abfd, sec));
+			/*bfd_set_error (bfd_error_bad_value); ??? why? */
+			ret = FALSE;
+			continue;
+		      }
+		  }
+	      }
+	      break;
+
+	    case (int) R_MICROBLAZE_32_SYM_OP_SYM:
+	      break; /* Do nothing.  */
+
+	    case (int) R_MICROBLAZE_GOTPC_64:
+	      relocation = htab->sgotplt->output_section->vma
+		+ htab->sgotplt->output_offset;
+	      relocation -= (input_section->output_section->vma
+			     + input_section->output_offset
+			     + offset + INST_WORD_SIZE);
+	      relocation += addend;
+	      bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
+			  contents + offset + 2);
+	      bfd_put_16 (input_bfd, relocation & 0xffff,
+			  contents + offset + 2 + INST_WORD_SIZE);
+	      break;
+
+	    case (int) R_MICROBLAZE_PLT_64:
+	      {
+		bfd_vma immediate;
+		if (htab->splt != NULL && h != NULL
+		    && h->plt.offset != (bfd_vma) -1)
+		  {
+		    relocation = (htab->splt->output_section->vma
+				  + htab->splt->output_offset
+				  + h->plt.offset);
+		    unresolved_reloc = FALSE;
+		    immediate = relocation - (input_section->output_section->vma
+					      + input_section->output_offset
+					      + offset + INST_WORD_SIZE);
+		    bfd_put_16 (input_bfd, (immediate >> 16) & 0xffff,
+				contents + offset + 2);
+		    bfd_put_16 (input_bfd, immediate & 0xffff,
+				contents + offset + 2 + INST_WORD_SIZE);
+		  }
+		else
+		  {
+		    relocation -= (input_section->output_section->vma
+				   + input_section->output_offset
+				   + offset + INST_WORD_SIZE);
+		    immediate = relocation;
+		    bfd_put_16 (input_bfd, (immediate >> 16) & 0xffff,
+				contents + offset + 2);
+		    bfd_put_16 (input_bfd, immediate & 0xffff,
+				contents + offset + 2 + INST_WORD_SIZE);
+		  }
+		break;
+	      }
+
+	    case (int) R_MICROBLAZE_GOT_64:
+	      {
+		if (htab->sgot == NULL)
+		  abort ();
+		if (h == NULL)
+		  {
+		    bfd_vma off;
+		    if (local_got_offsets == NULL)
+		      abort ();
+		    off = local_got_offsets[r_symndx];
+		    /* The LSB indicates whether we've already
+		       created relocation.  */
+		    if (off & 1)
+		      off &= ~1;
+		    else
+		      {
+			bfd_put_32 (output_bfd, relocation + addend,
+				    htab->sgot->contents + off);
+
+			if (info->shared)
+			  {
+			    Elf_Internal_Rela outrel;
+			    bfd_byte *loc;
+			    if (htab->srelgot == NULL)
+			      abort ();
+			    outrel.r_offset = (htab->sgot->output_section->vma
+					       + htab->sgot->output_offset
+					       + off);
+			    outrel.r_info = ELF32_R_INFO (0, R_MICROBLAZE_REL);
+			    outrel.r_addend = relocation + addend;
+			    loc = htab->srelgot->contents;
+			    loc += htab->srelgot->reloc_count++
+			      * sizeof (Elf32_External_Rela);
+			    bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+			  }
+			local_got_offsets[r_symndx] |= 1;
+		      }
+		    relocation = htab->sgot->output_section->vma
+		      + htab->sgot->output_offset + off
+		      - htab->sgotplt->output_section->vma
+		      - htab->sgotplt->output_offset;
+		    unresolved_reloc = FALSE;
+		  }
+		else
+		  {
+		    if (htab->sgotplt != NULL && h != NULL
+			&& h->got.offset != (bfd_vma) -1)
+		      {
+			bfd_put_32 (output_bfd, relocation + addend,
+				    htab->sgot->contents + h->got.offset);
+			relocation = htab->sgot->output_section->vma
+			  + htab->sgot->output_offset
+			  + h->got.offset
+			  - htab->sgotplt->output_section->vma
+			  - htab->sgotplt->output_offset;
+			unresolved_reloc = FALSE;
+		      }
+		    else
+		      abort (); /* ??? */
+		  }
+		bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
+			    contents + offset + 2);
+		bfd_put_16 (input_bfd, relocation & 0xffff,
+			    contents + offset + 2 + INST_WORD_SIZE);
+		break;
+	      }
+
+	    case (int) R_MICROBLAZE_GOTOFF_64:
+	      {
+		bfd_vma immediate;
+		unsigned short lo, high;
+		relocation += addend;
+		relocation -= htab->sgotplt->output_section->vma
+		  + htab->sgotplt->output_offset;
+		/* Write this value into correct location.  */
+		immediate = relocation;
+		lo = immediate & 0x0000ffff;
+		high = (immediate >> 16) & 0x0000ffff;
+		bfd_put_16 (input_bfd, high, contents + offset + 2);
+		bfd_put_16 (input_bfd, lo, contents + offset + INST_WORD_SIZE + 2);
+		break;
+	      }
+
+	    case (int) R_MICROBLAZE_GOTOFF_32:
+	      {
+		relocation += addend;
+		relocation -= htab->sgotplt->output_section->vma
+		  + htab->sgotplt->output_offset;
+		/* Write this value into correct location.  */
+		bfd_put_32 (input_bfd, relocation, contents + offset);
+		break;
+	      }
+
+	    case (int) R_MICROBLAZE_64_PCREL :
+	    case (int) R_MICROBLAZE_64:
+	    case (int) R_MICROBLAZE_32:
+	      {
+		/* r_symndx will be STN_UNDEF (zero) only for relocs against symbols
+		   from removed linkonce sections, or sections discarded by
+		   a linker script.  */
+		if (r_symndx == STN_UNDEF || (input_section->flags & SEC_ALLOC) == 0)
+		  {
+		    relocation += addend;
+		    if (r_type == R_MICROBLAZE_32)
+		      bfd_put_32 (input_bfd, relocation, contents + offset);
+		    else
+		      {
+			if (r_type == R_MICROBLAZE_64_PCREL)
+			  relocation -= (input_section->output_section->vma
+					 + input_section->output_offset
+					 + offset + INST_WORD_SIZE);
+			bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
+				    contents + offset + 2);
+			bfd_put_16 (input_bfd, relocation & 0xffff,
+				    contents + offset + 2 + INST_WORD_SIZE);
+		      }
+		    break;
+		  }
+
+		if ((info->shared
+		     && (h == NULL
+			 || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+			 || h->root.type != bfd_link_hash_undefweak)
+		     && (!howto->pc_relative
+			 || (h != NULL
+			     && h->dynindx != -1
+			     && (!info->symbolic
+				 || !h->def_regular))))
+		    || (!info->shared
+			&& h != NULL
+			&& h->dynindx != -1
+			&& !h->non_got_ref
+			&& ((h->def_dynamic
+			     && !h->def_regular)
+			    || h->root.type == bfd_link_hash_undefweak
+			    || h->root.type == bfd_link_hash_undefined)))
+		  {
+		    Elf_Internal_Rela outrel;
+		    bfd_byte *loc;
+		    bfd_boolean skip;
+
+		    /* When generating a shared object, these relocations
+		       are copied into the output file to be resolved at run
+		       time.  */
+
+		    BFD_ASSERT (sreloc != NULL);
+
+		    skip = FALSE;
+
+		    outrel.r_offset =
+		      _bfd_elf_section_offset (output_bfd, info, input_section,
+					       rel->r_offset);
+		    if (outrel.r_offset == (bfd_vma) -1)
+		      skip = TRUE;
+		    else if (outrel.r_offset == (bfd_vma) -2)
+		      skip = TRUE;
+		    outrel.r_offset += (input_section->output_section->vma
+					+ input_section->output_offset);
+
+		    if (skip)
+		      memset (&outrel, 0, sizeof outrel);
+		    /* h->dynindx may be -1 if the symbol was marked to
+		       become local.  */
+		    else if (h != NULL
+			     && ((! info->symbolic && h->dynindx != -1)
+				 || !h->def_regular))
+		      {
+			BFD_ASSERT (h->dynindx != -1);
+			outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
+			outrel.r_addend = addend;
+		      }
+		    else
+		      {
+			if (r_type == R_MICROBLAZE_32)
+			  {
+			    outrel.r_info = ELF32_R_INFO (0, R_MICROBLAZE_REL);
+			    outrel.r_addend = relocation + addend;
+			  }
+			else
+			  {
+			    BFD_FAIL ();
+			    (*_bfd_error_handler)
+			      (_("%B: probably compiled without -fPIC?"),
+			       input_bfd);
+			    bfd_set_error (bfd_error_bad_value);
+			    return FALSE;
+			  }
+		      }
+
+		    loc = sreloc->contents;
+		    loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rela);
+		    bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+		    break;
+		  }
+		else
+		  {
+		    relocation += addend;
+		    if (r_type == R_MICROBLAZE_32)
+		      bfd_put_32 (input_bfd, relocation, contents + offset);
+		    else
+		      {
+			if (r_type == R_MICROBLAZE_64_PCREL)
+			  relocation -= (input_section->output_section->vma
+					 + input_section->output_offset
+					 + offset + INST_WORD_SIZE);
+			bfd_put_16 (input_bfd, (relocation >> 16) & 0xffff,
+				    contents + offset + 2);
+			bfd_put_16 (input_bfd, relocation & 0xffff,
+				    contents + offset + 2 + INST_WORD_SIZE);
+		      }
+		    break;
+		  }
+	      }
+
+	    default :
+	      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+					    contents, offset,
+					    relocation, addend);
+	      break;
+	    }
+	}
+
+    check_reloc:
+
+      if (r != bfd_reloc_ok)
+	{
+	  /* FIXME: This should be generic enough to go in a utility.  */
+	  const char *name;
+
+	  if (h != NULL)
+	    name = h->root.root.string;
+	  else
+	    {
+	      name = (bfd_elf_string_from_elf_section
+		      (input_bfd, symtab_hdr->sh_link, sym->st_name));
+	      if (name == NULL || *name == '\0')
+		name = bfd_section_name (input_bfd, sec);
+	    }
+
+	  if (errmsg != NULL)
+	    goto common_error;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      if (!((*info->callbacks->reloc_overflow)
+		    (info, (h ? &h->root : NULL), name, howto->name,
+		     (bfd_vma) 0, input_bfd, input_section, offset)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_undefined:
+	      if (!((*info->callbacks->undefined_symbol)
+		    (info, name, input_bfd, input_section, offset, TRUE)))
+	        return FALSE;
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      errmsg = _("internal error: out of range error");
+	      goto common_error;
+
+	    case bfd_reloc_notsupported:
+	      errmsg = _("internal error: unsupported relocation error");
+	      goto common_error;
+
+	    case bfd_reloc_dangerous:
+	      errmsg = _("internal error: dangerous error");
+	      goto common_error;
+
+	    default:
+	      errmsg = _("internal error: unknown error");
+	      /* Fall through.  */
+	    common_error:
+	      if (!((*info->callbacks->warning)
+		    (info, errmsg, name, input_bfd, input_section, offset)))
+	        return FALSE;
+	      break;
+	    }
+	}
+    }
+
+  return ret;
+}
+
+/* Calculate fixup value for reference.  */
+
+static int
+calc_fixup (bfd_vma addr, asection *sec)
+{
+  int i, fixup = 0;
+
+  if (sec == NULL || sec->relax == NULL)
+    return 0;
+
+  /* Look for addr in relax table, total fixup value.  */
+  for (i = 0; i < sec->relax_count; i++)
+    {
+      if (addr <= sec->relax[i].addr)
+        break;
+      fixup += sec->relax[i].size;
+    }
+
+  return fixup;
+}
+
+static bfd_boolean
+microblaze_elf_relax_section (bfd *abfd,
+			      asection *sec,
+			      struct bfd_link_info *link_info,
+			      bfd_boolean *again)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *internal_relocs;
+  Elf_Internal_Rela *free_relocs = NULL;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_byte *contents = NULL;
+  bfd_byte *free_contents = NULL;
+  int rel_count;
+  unsigned int shndx;
+  int i, sym_index;
+  asection *o;
+  struct elf_link_hash_entry *sym_hash;
+  Elf_Internal_Sym *isymbuf, *isymend;
+  Elf_Internal_Sym *isym;
+  int symcount;
+  int offset;
+  bfd_vma src, dest;
+
+  /* We only do this once per section.  We may be able to delete some code
+     by running multiple passes, but it is not worth it.  */
+  *again = FALSE;
+
+  /* Only do this for a text section.  */
+  if (link_info->relocatable
+      || (sec->flags & SEC_RELOC) == 0
+      || (sec->reloc_count == 0))
+    return TRUE;
+
+  BFD_ASSERT ((sec->size > 0) || (sec->rawsize > 0));
+
+  /* If this is the first time we have been called for this section,
+     initialize the cooked size.  */
+  if (sec->size == 0)
+    sec->size = sec->rawsize;
+
+  /* Get symbols for this section.  */
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+  symcount =  symtab_hdr->sh_size / sizeof (Elf32_External_Sym);
+  if (isymbuf == NULL)
+    isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr, symcount,
+ 			     	    0, NULL, NULL, NULL);
+  BFD_ASSERT (isymbuf != NULL);
+
+  internal_relocs = _bfd_elf_link_read_relocs (abfd, sec, NULL, NULL, link_info->keep_memory);
+  if (internal_relocs == NULL)
+    goto error_return;
+  if (! link_info->keep_memory)
+    free_relocs = internal_relocs;
+
+  sec->relax = (struct relax_table *) bfd_malloc ((sec->reloc_count + 1)
+						  * sizeof (struct relax_table));
+  if (sec->relax == NULL)
+    goto error_return;
+  sec->relax_count = 0;
+
+  irelend = internal_relocs + sec->reloc_count;
+  rel_count = 0;
+  for (irel = internal_relocs; irel < irelend; irel++, rel_count++)
+    {
+      bfd_vma symval;
+      if ((ELF32_R_TYPE (irel->r_info) != (int) R_MICROBLAZE_64_PCREL)
+	  && (ELF32_R_TYPE (irel->r_info) != (int) R_MICROBLAZE_64 ))
+	continue; /* Can't delete this reloc.  */
+
+      /* Get the section contents.  */
+      if (contents == NULL)
+	{
+	  if (elf_section_data (sec)->this_hdr.contents != NULL)
+	    contents = elf_section_data (sec)->this_hdr.contents;
+	  else
+	    {
+	      contents = (bfd_byte *) bfd_malloc (sec->size);
+	      if (contents == NULL)
+		goto error_return;
+	      free_contents = contents;
+
+	      if (!bfd_get_section_contents (abfd, sec, contents,
+					     (file_ptr) 0, sec->size))
+		goto error_return;
+              elf_section_data (sec)->this_hdr.contents = contents;
+	    }
+	}
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+	{
+	  /* A local symbol.  */
+	  asection *sym_sec;
+
+	  isym = isymbuf + ELF32_R_SYM (irel->r_info);
+          if (isym->st_shndx == SHN_UNDEF)
+	    sym_sec = bfd_und_section_ptr;
+	  else if (isym->st_shndx == SHN_ABS)
+	    sym_sec = bfd_abs_section_ptr;
+	  else if (isym->st_shndx == SHN_COMMON)
+	    sym_sec = bfd_com_section_ptr;
+	  else
+	    sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+
+	  symval = _bfd_elf_rela_local_sym (abfd, isym, &sym_sec, irel);
+	}
+      else
+	{
+	  unsigned long indx;
+	  struct elf_link_hash_entry *h;
+
+	  indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+	  h = elf_sym_hashes (abfd)[indx];
+	  BFD_ASSERT (h != NULL);
+
+          if (h->root.type != bfd_link_hash_defined
+	      && h->root.type != bfd_link_hash_defweak)
+	    /* This appears to be a reference to an undefined
+	       symbol.  Just ignore it--it will be caught by the
+	       regular reloc processing.  */
+	    continue;
+
+	  symval = (h->root.u.def.value
+		    + h->root.u.def.section->output_section->vma
+		    + h->root.u.def.section->output_offset);
+	}
+
+      /* If this is a PC-relative reloc, subtract the instr offset from
+         the symbol value.  */
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_MICROBLAZE_64_PCREL)
+	{
+	  symval = symval + irel->r_addend
+	    - (irel->r_offset
+	       + sec->output_section->vma
+	       + sec->output_offset);
+        }
+      else
+	symval += irel->r_addend;
+
+      if ((symval & 0xffff8000) == 0
+	  || (symval & 0xffff8000) == 0xffff8000)
+	{
+          /* We can delete this instruction.  */
+	  sec->relax[sec->relax_count].addr = irel->r_offset;
+	  sec->relax[sec->relax_count].size = INST_WORD_SIZE;
+	  sec->relax_count++;
+
+	  /* Rewrite relocation type.  */
+          switch ((enum elf_microblaze_reloc_type) ELF32_R_TYPE (irel->r_info))
+	    {
+	    case R_MICROBLAZE_64_PCREL:
+	      irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                           (int) R_MICROBLAZE_32_PCREL_LO);
+	      break;
+	    case R_MICROBLAZE_64:
+              irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                           (int) R_MICROBLAZE_32_LO);
+	      break;
+	    default:
+	      /* Cannot happen.  */
+	      BFD_ASSERT (FALSE);
+            }
+        }
+    } /* Loop through all relocations.  */
+
+  /* Loop through the relocs again, and see if anything needs to change.  */
+  if (sec->relax_count > 0)
+    {
+      shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+      rel_count = 0;
+      sec->relax[sec->relax_count].addr = sec->size;
+
+      for (irel = internal_relocs; irel < irelend; irel++, rel_count++)
+        {
+	  bfd_vma nraddr;
+
+          /* Get the new reloc address.  */
+	  nraddr = irel->r_offset - calc_fixup (irel->r_offset, sec);
+          switch ((enum elf_microblaze_reloc_type) ELF32_R_TYPE (irel->r_info))
+	    {
+	    default:
+	      break;
+	    case R_MICROBLAZE_64_PCREL:
+	      break;
+	    case R_MICROBLAZE_64:
+	    case R_MICROBLAZE_32_LO:
+	      /* If this reloc is against a symbol defined in this
+	         section, we must check the addend to see it will put the value in
+	         range to be adjusted, and hence must be changed.  */
+	      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+	        {
+		  isym = isymbuf + ELF32_R_SYM (irel->r_info);
+		  /* Only handle relocs against .text.  */
+		  if (isym->st_shndx == shndx
+		      && ELF32_ST_TYPE (isym->st_info) == STT_SECTION)
+		    irel->r_addend -= calc_fixup (irel->r_addend, sec);
+	        }
+	      break;
+	    case R_MICROBLAZE_NONE:
+	      {
+	        /* This was a PC-relative instruction that was
+ 		   completely resolved.  */
+	        int sfix, efix;
+	        bfd_vma target_address;
+	        target_address = irel->r_addend + irel->r_offset;
+	        sfix = calc_fixup (irel->r_offset, sec);
+	        efix = calc_fixup (target_address, sec);
+	        irel->r_addend -= (efix - sfix);
+	        /* Should use HOWTO.  */
+	        bfd_put_16 (abfd, irel->r_addend, contents + irel->r_offset + 2);
+	      }
+	      break;
+	    case R_MICROBLAZE_64_NONE:
+	      {
+	        /* This was a PC-relative 64-bit instruction that was
+ 		   completely resolved.  */
+	        int sfix, efix;
+	        bfd_vma target_address;
+		target_address = irel->r_addend + irel->r_offset + INST_WORD_SIZE;
+		sfix = calc_fixup (irel->r_offset + INST_WORD_SIZE, sec);
+		efix = calc_fixup (target_address, sec);
+		irel->r_addend -= (efix - sfix);
+		bfd_put_16 (abfd, irel->r_addend, contents + irel->r_offset
+			    + INST_WORD_SIZE + 2);
+	      }
+	      break;
+	    }
+          irel->r_offset = nraddr;
+        } /* Change all relocs in this section.  */
+
+      /* Look through all other sections.  */
+      for (o = abfd->sections; o != NULL; o = o->next)
+        {
+          Elf_Internal_Rela *irelocs;
+          Elf_Internal_Rela *irelscan, *irelscanend;
+          bfd_byte *ocontents;
+
+          if (o == sec
+              || (o->flags & SEC_RELOC) == 0
+              || o->reloc_count == 0)
+            continue;
+
+          /* We always cache the relocs.  Perhaps, if info->keep_memory is
+             FALSE, we should free them, if we are permitted to.  */
+
+          irelocs = _bfd_elf_link_read_relocs (abfd, o, NULL, NULL, TRUE);
+          if (irelocs == NULL)
+            goto error_return;
+
+          ocontents = NULL;
+          irelscanend = irelocs + o->reloc_count;
+          for (irelscan = irelocs; irelscan < irelscanend; irelscan++)
+            {
+              if (ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32)
+                {
+	          isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
+
+                  /* Look at the reloc only if the value has been resolved.  */
+                  if (isym->st_shndx == shndx
+                      && (ELF32_ST_TYPE (isym->st_info) == STT_SECTION))
+                    {
+                      if (ocontents == NULL)
+                        {
+                          if (elf_section_data (o)->this_hdr.contents != NULL)
+                            ocontents = elf_section_data (o)->this_hdr.contents;
+                          else
+                            {
+                              /* We always cache the section contents.
+                                 Perhaps, if info->keep_memory is FALSE, we
+                                 should free them, if we are permitted to.  */
+		              if (o->rawsize == 0)
+			        o->rawsize = o->size;
+                              ocontents = (bfd_byte *) bfd_malloc (o->rawsize);
+                              if (ocontents == NULL)
+                                goto error_return;
+                              if (!bfd_get_section_contents (abfd, o, ocontents,
+                                                             (file_ptr) 0,
+							     o->rawsize))
+                                goto error_return;
+                              elf_section_data (o)->this_hdr.contents = ocontents;
+                            }
+
+                        }
+		      irelscan->r_addend -= calc_fixup (irelscan->r_addend, sec);
+                    }
+		  else if (ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_SYM_OP_SYM)
+		    {
+		      isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
+
+		      /* Look at the reloc only if the value has been resolved.  */
+		      if (ocontents == NULL)
+			{
+			  if (elf_section_data (o)->this_hdr.contents != NULL)
+			    ocontents = elf_section_data (o)->this_hdr.contents;
+			  else
+			    {
+			      /* We always cache the section contents.
+				 Perhaps, if info->keep_memory is FALSE, we
+				 should free them, if we are permitted to.  */
+
+			      if (o->rawsize == 0)
+				o->rawsize = o->size;
+			      ocontents = (bfd_byte *) bfd_malloc (o->rawsize);
+			      if (ocontents == NULL)
+				goto error_return;
+			      if (!bfd_get_section_contents (abfd, o, ocontents,
+							     (file_ptr) 0,
+							     o->rawsize))
+				goto error_return;
+			      elf_section_data (o)->this_hdr.contents = ocontents;
+			    }
+			}
+		      irelscan->r_addend -= calc_fixup (irel->r_addend
+							+ isym->st_value,
+							sec);
+		    }
+		}
+	      else if ((ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_PCREL_LO)
+		       || (ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32_LO))
+		{
+		  isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
+
+		  /* Look at the reloc only if the value has been resolved.  */
+		  if (isym->st_shndx == shndx
+		      && (ELF32_ST_TYPE (isym->st_info) == STT_SECTION))
+		    {
+		      bfd_vma immediate;
+		      bfd_vma target_address;
+
+		      if (ocontents == NULL)
+			{
+			  if (elf_section_data (o)->this_hdr.contents != NULL)
+			    ocontents = elf_section_data (o)->this_hdr.contents;
+			  else
+			    {
+			      /* We always cache the section contents.
+				 Perhaps, if info->keep_memory is FALSE, we
+				 should free them, if we are permitted to.  */
+			      if (o->rawsize == 0)
+				o->rawsize = o->size;
+			      ocontents = (bfd_byte *) bfd_malloc (o->rawsize);
+			      if (ocontents == NULL)
+				goto error_return;
+			      if (!bfd_get_section_contents (abfd, o, ocontents,
+							     (file_ptr) 0,
+							     o->rawsize))
+				goto error_return;
+			      elf_section_data (o)->this_hdr.contents = ocontents;
+			    }
+			}
+
+		      immediate = (unsigned short) bfd_get_16 (abfd, ocontents +
+							       irelscan->r_offset + 2);
+		      target_address = immediate;
+		      offset = calc_fixup (target_address, sec);
+		      immediate -= offset;
+		      irelscan->r_addend -= offset;
+		      bfd_put_16 (abfd, immediate, ocontents + irelscan->r_offset + 2);
+		    }
+		}
+
+	      if (ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_64)
+		{
+		  isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
+
+		  /* Look at the reloc only if the value has been resolved.  */
+		  if (isym->st_shndx == shndx
+		      && (ELF32_ST_TYPE (isym->st_info) == STT_SECTION))
+		    {
+		      bfd_vma immediate;
+
+		      if (ocontents == NULL)
+			{
+			  if (elf_section_data (o)->this_hdr.contents != NULL)
+			    ocontents = elf_section_data (o)->this_hdr.contents;
+			  else
+			    {
+			      /* We always cache the section contents.
+				 Perhaps, if info->keep_memory is FALSE, we
+				 should free them, if we are permitted to.  */
+
+			      if (o->rawsize == 0)
+				o->rawsize = o->size;
+			      ocontents = (bfd_byte *) bfd_malloc (o->rawsize);
+			      if (ocontents == NULL)
+				goto error_return;
+			      if (!bfd_get_section_contents (abfd, o, ocontents,
+							     (file_ptr) 0,
+							     o->rawsize))
+				goto error_return;
+			      elf_section_data (o)->this_hdr.contents = ocontents;
+			    }
+			}
+		      immediate = (unsigned short) (bfd_get_16 (abfd, ocontents
+								+ irelscan->r_offset
+								+ 2) << 16)
+			& 0xffff0000;
+		      immediate += (unsigned short) (bfd_get_16 (abfd, ocontents
+								 + irelscan->r_offset
+								 + INST_WORD_SIZE + 2))
+			& 0x0000ffff;
+
+		      offset = calc_fixup (irelscan->r_addend, sec);
+		      immediate -= offset;
+		      irelscan->r_addend -= offset;
+		    }
+		}
+	      else if (ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_64_PCREL)
+		{
+		  isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
+
+		  /* Look at the reloc only if the value has been resolved.  */
+		  if (isym->st_shndx == shndx
+		      && (ELF32_ST_TYPE (isym->st_info) == STT_SECTION))
+		    {
+		      bfd_vma immediate;
+		      bfd_vma target_address;
+
+		      if (ocontents == NULL)
+			{
+			  if (elf_section_data (o)->this_hdr.contents != NULL)
+			    ocontents = elf_section_data (o)->this_hdr.contents;
+			  else
+			    {
+			      /* We always cache the section contents.
+				 Perhaps, if info->keep_memory is FALSE, we
+				 should free them, if we are permitted to.  */
+			      if (o->rawsize == 0)
+				o->rawsize = o->size;
+			      ocontents = (bfd_byte *) bfd_malloc (o->rawsize);
+			      if (ocontents == NULL)
+				goto error_return;
+			      if (!bfd_get_section_contents (abfd, o, ocontents,
+							     (file_ptr) 0,
+							     o->rawsize))
+				goto error_return;
+			      elf_section_data (o)->this_hdr.contents = ocontents;
+			    }
+			}
+
+		      immediate = (unsigned short)
+			(bfd_get_16 (abfd, ocontents + irelscan->r_offset + 2) << 16)
+			& 0xffff0000;
+		      immediate += (unsigned short)
+			(bfd_get_16 (abfd, ocontents + irelscan->r_offset
+				     + INST_WORD_SIZE + 2))
+			& 0x0000ffff;
+		      target_address = immediate;
+		      offset = calc_fixup (target_address, sec);
+		      immediate -= offset;
+		      irelscan->r_addend -= offset;
+		      bfd_put_16 (abfd, ((immediate >> 16) & 0x0000ffff),
+				  ocontents + irelscan->r_offset + 2);
+		      bfd_put_16 (abfd, (immediate & 0x0000ffff),
+				  ocontents + irelscan->r_offset + INST_WORD_SIZE + 2);
+		    }
+		}
+            }
+        }
+
+      /* Adjust the local symbols defined in this section.  */
+      isymend = isymbuf + symtab_hdr->sh_info;
+      for (isym = isymbuf; isym < isymend; isym++)
+        {
+          if (isym->st_shndx == shndx)
+	    isym->st_value =- calc_fixup (isym->st_value, sec);
+        }
+
+      /* Now adjust the global symbols defined in this section.  */
+      isym = isymbuf + symtab_hdr->sh_info;
+      isymend = isymbuf + (symtab_hdr->sh_size / sizeof (Elf32_External_Sym));
+      for (sym_index = 0; isym < isymend; isym++, sym_index++)
+        {
+          sym_hash = elf_sym_hashes (abfd)[sym_index];
+          if (isym->st_shndx == shndx
+              && (sym_hash->root.type == bfd_link_hash_defined
+                  || sym_hash->root.type == bfd_link_hash_defweak)
+              && sym_hash->root.u.def.section == sec)
+	    {
+	      sym_hash->root.u.def.value -= calc_fixup (sym_hash->root.u.def.value,
+						        sec);
+	    }
+	}
+
+      /* Physically move the code and change the cooked size.  */
+      dest = sec->relax[0].addr;
+      for (i = 0; i < sec->relax_count; i++)
+        {
+          int len;
+          src = sec->relax[i].addr + sec->relax[i].size;
+          len = sec->relax[i+1].addr - sec->relax[i].addr - sec->relax[i].size;
+
+          memmove (contents + dest, contents + src, len);
+          sec->size -= sec->relax[i].size;
+          dest += len;
+        }
+
+      elf_section_data (sec)->relocs = internal_relocs;
+      free_relocs = NULL;
+
+      elf_section_data (sec)->this_hdr.contents = contents;
+      free_contents = NULL;
+
+      symtab_hdr->contents = (bfd_byte *) isymbuf;
+    }
+
+  if (free_relocs != NULL)
+    {
+      free (free_relocs);
+      free_relocs = NULL;
+    }
+
+  if (free_contents != NULL)
+    {
+      if (!link_info->keep_memory)
+	free (free_contents);
+      else
+	/* Cache the section contents for elf_link_input_bfd.  */
+	elf_section_data (sec)->this_hdr.contents = contents;
+      free_contents = NULL;
+    }
+
+  if (sec->relax_count == 0)
+    {
+      free (sec->relax);
+      sec->relax = NULL;
+    }
+  return TRUE;
+
+ error_return:
+  if (free_relocs != NULL)
+    free (free_relocs);
+  if (free_contents != NULL)
+    free (free_contents);
+  if (sec->relax != NULL)
+    {
+      free (sec->relax);
+      sec->relax = NULL;
+      sec->relax_count = 0;
+    }
+  return FALSE;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+static asection *
+microblaze_elf_gc_mark_hook (asection *sec,
+			     struct bfd_link_info * info,
+     			     Elf_Internal_Rela * rel,
+     			     struct elf_link_hash_entry * h,
+     			     Elf_Internal_Sym * sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_MICROBLAZE_GNU_VTINHERIT:
+      case R_MICROBLAZE_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Update the got entry reference counts for the section being removed.  */
+
+static bfd_boolean
+microblaze_elf_gc_sweep_hook (bfd * abfd ATTRIBUTE_UNUSED,
+     			      struct bfd_link_info * info ATTRIBUTE_UNUSED,
+     			      asection * sec ATTRIBUTE_UNUSED,
+     			      const Elf_Internal_Rela * relocs ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+/* PIC support.  */
+
+#define PLT_ENTRY_SIZE 16
+
+#define PLT_ENTRY_WORD_0  0xb0000000          /* "imm 0".  */
+#define PLT_ENTRY_WORD_1  0xe9940000          /* "lwi r12,r20,0" - relocated to lwi r12,r20,func@GOT.  */
+#define PLT_ENTRY_WORD_1_NOPIC  0xe9800000    /* "lwi r12,r0,0" - non-PIC object.  */
+#define PLT_ENTRY_WORD_2  0x98186000          /* "brad r12".  */
+#define PLT_ENTRY_WORD_3  0x80000000          /* "nop".  */
+
+/* Create .got, .gotplt, and .rela.got sections in DYNOBJ, and set up
+   shortcuts to them in our hash table.  */
+
+static bfd_boolean
+create_got_section (bfd *dynobj, struct bfd_link_info *info)
+{
+  struct elf32_mb_link_hash_table *htab;
+
+  if (! _bfd_elf_create_got_section (dynobj, info))
+    return FALSE;
+  htab = elf32_mb_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  htab->sgot = bfd_get_section_by_name (dynobj, ".got");
+  htab->sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");
+  if (!htab->sgot || !htab->sgotplt)
+    return FALSE;
+
+  htab->srelgot = bfd_make_section (dynobj, ".rela.got");
+  if (htab->srelgot == NULL
+      || ! bfd_set_section_flags (dynobj, htab->srelgot, SEC_ALLOC
+                                  | SEC_LOAD
+                                  | SEC_HAS_CONTENTS
+                                  | SEC_IN_MEMORY
+                                  | SEC_LINKER_CREATED
+                                  | SEC_READONLY)
+      || ! bfd_set_section_alignment (dynobj, htab->srelgot, 2))
+    return FALSE;
+  return TRUE;
+}
+
+/* Look through the relocs for a section during the first phase.  */
+
+static bfd_boolean
+microblaze_elf_check_relocs (bfd * abfd,
+			     struct bfd_link_info * info,
+     			     asection * sec,
+			     const Elf_Internal_Rela * relocs)
+{
+  Elf_Internal_Shdr *           symtab_hdr;
+  struct elf_link_hash_entry ** sym_hashes;
+  struct elf_link_hash_entry ** sym_hashes_end;
+  const Elf_Internal_Rela *     rel;
+  const Elf_Internal_Rela *     rel_end;
+  struct elf32_mb_link_hash_table *htab;
+  asection *sreloc = NULL;
+
+  if (info->relocatable)
+    return TRUE;
+
+  htab = elf32_mb_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  symtab_hdr = & elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  sym_hashes_end = sym_hashes + symtab_hdr->sh_size / sizeof (Elf32_External_Sym);
+  if (!elf_bad_symtab (abfd))
+    sym_hashes_end -= symtab_hdr->sh_info;
+
+  rel_end = relocs + sec->reloc_count;
+
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      unsigned int r_type;
+      struct elf_link_hash_entry * h;
+      unsigned long r_symndx;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      if (r_symndx < symtab_hdr->sh_info)
+        h = NULL;
+      else
+        h = sym_hashes [r_symndx - symtab_hdr->sh_info];
+
+      switch (r_type)
+        {
+	  /* This relocation describes the C++ object vtable hierarchy.
+	     Reconstruct it for later use during GC.  */
+        case R_MICROBLAZE_GNU_VTINHERIT:
+          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+
+	  /* This relocation describes which C++ vtable entries are actually
+	     used.  Record for later use during GC.  */
+        case R_MICROBLAZE_GNU_VTENTRY:
+          if (!bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+            return FALSE;
+          break;
+
+	  /* This relocation requires .plt entry.  */
+        case R_MICROBLAZE_PLT_64:
+          if (h != NULL)
+	    {
+	      h->needs_plt = 1;
+	      h->plt.refcount += 1;
+	    }
+          break;
+
+	  /* This relocation requires .got entry.  */
+        case R_MICROBLAZE_GOT_64:
+          if (htab->sgot == NULL)
+            {
+              if (htab->elf.dynobj == NULL)
+                htab->elf.dynobj = abfd;
+              if (!create_got_section (htab->elf.dynobj, info))
+                return FALSE;
+            }
+          if (h != NULL)
+	    {
+	      h->got.refcount += 1;
+	    }
+          else
+	    {
+	      bfd_signed_vma *local_got_refcounts;
+
+	      /* This is a global offset table entry for a local symbol.  */
+	      local_got_refcounts = elf_local_got_refcounts (abfd);
+	      if (local_got_refcounts == NULL)
+		{
+		  bfd_size_type size;
+
+		  size = symtab_hdr->sh_info;
+		  size *= sizeof (bfd_signed_vma);
+		  local_got_refcounts = bfd_zalloc (abfd, size);
+		  if (local_got_refcounts == NULL)
+		    return FALSE;
+		  elf_local_got_refcounts (abfd) = local_got_refcounts;
+		}
+	      local_got_refcounts[r_symndx] += 1;
+	    }
+          break;
+
+        case R_MICROBLAZE_64:
+        case R_MICROBLAZE_64_PCREL:
+        case R_MICROBLAZE_32:
+          {
+            if (h != NULL && !info->shared)
+	      {
+		/* we may need a copy reloc.  */
+		h->non_got_ref = 1;
+
+		/* we may also need a .plt entry.  */
+		h->plt.refcount += 1;
+		if (ELF32_R_TYPE (rel->r_info) != R_MICROBLAZE_64_PCREL)
+		  h->pointer_equality_needed = 1;
+	      }
+
+
+	    /* If we are creating a shared library, and this is a reloc
+	       against a global symbol, or a non PC relative reloc
+	       against a local symbol, then we need to copy the reloc
+	       into the shared library.  However, if we are linking with
+	       -Bsymbolic, we do not need to copy a reloc against a
+	       global symbol which is defined in an object we are
+	       including in the link (i.e., DEF_REGULAR is set).  At
+	       this point we have not seen all the input files, so it is
+	       possible that DEF_REGULAR is not set now but will be set
+	       later (it is never cleared).  In case of a weak definition,
+	       DEF_REGULAR may be cleared later by a strong definition in
+	       a shared library.  We account for that possibility below by
+	       storing information in the relocs_copied field of the hash
+	       table entry.  A similar situation occurs when creating
+	       shared libraries and symbol visibility changes render the
+	       symbol local.
+
+	       If on the other hand, we are creating an executable, we
+	       may need to keep relocations for symbols satisfied by a
+	       dynamic library if we manage to avoid copy relocs for the
+	       symbol.  */
+
+            if ((info->shared
+                 && (sec->flags & SEC_ALLOC) != 0
+                 && (r_type != R_MICROBLAZE_64_PCREL
+                     || (h != NULL
+			 && (! info->symbolic
+			     || h->root.type == bfd_link_hash_defweak
+			     || !h->def_regular))))
+                || (!info->shared
+                    && (sec->flags & SEC_ALLOC) != 0
+                    && h != NULL
+                    && (h->root.type == bfd_link_hash_defweak
+                        || !h->def_regular)))
+              {
+                struct elf32_mb_dyn_relocs *p;
+                struct elf32_mb_dyn_relocs **head;
+
+                /* When creating a shared object, we must copy these
+                   relocs into the output file.  We create a reloc
+                   section in dynobj and make room for the reloc.  */
+
+		if (sreloc == NULL)
+		  {
+		    const char *name;
+		    bfd *dynobj;
+		    unsigned int strndx = elf_elfheader (abfd)->e_shstrndx;
+		    unsigned int shnam = _bfd_elf_single_rel_hdr (sec)->sh_name;
+
+		    name = bfd_elf_string_from_elf_section (abfd, strndx, shnam);
+		    if (name == NULL)
+		      return FALSE;
+
+		    if (strncmp (name, ".rela", 5) != 0
+			|| strcmp (bfd_get_section_name (abfd, sec),
+				   name + 5) != 0)
+		      {
+			(*_bfd_error_handler)
+			  (_("%B: bad relocation section name `%s\'"),
+			   abfd, name);
+		      }
+
+		    if (htab->elf.dynobj == NULL)
+		      htab->elf.dynobj = abfd;
+		    dynobj = htab->elf.dynobj;
+
+		    sreloc = bfd_get_section_by_name (dynobj, name);
+		    if (sreloc == NULL)
+		      {
+			flagword flags;
+
+			sreloc = bfd_make_section (dynobj, name);
+			flags = (SEC_HAS_CONTENTS | SEC_READONLY
+				 | SEC_IN_MEMORY | SEC_LINKER_CREATED);
+			if ((sec->flags & SEC_ALLOC) != 0)
+			  flags |= SEC_ALLOC | SEC_LOAD;
+			if (sreloc == NULL
+			    || ! bfd_set_section_flags (dynobj, sreloc, flags)
+			    || ! bfd_set_section_alignment (dynobj, sreloc, 2))
+			  return FALSE;
+		      }
+		    elf_section_data (sec)->sreloc = sreloc;
+		  }
+
+		/* If this is a global symbol, we count the number of
+		   relocations we need for this symbol.  */
+		if (h != NULL)
+		  head = &((struct elf32_mb_link_hash_entry *) h)->dyn_relocs;
+		else
+		  {
+		    /* Track dynamic relocs needed for local syms too.
+		       We really need local syms available to do this
+		       easily.  Oh well.  */
+
+		    asection *s;
+		    Elf_Internal_Sym *isym;
+		    void *vpp;
+
+		    isym = bfd_sym_from_r_symndx (&htab->sym_sec,
+						  abfd, r_symndx);
+		    if (isym == NULL)
+		      return FALSE;
+
+		    s = bfd_section_from_elf_index (abfd, isym->st_shndx);
+		    if (s == NULL)
+		      return FALSE;
+
+		    vpp = &elf_section_data (s)->local_dynrel;
+		    head = (struct elf32_mb_dyn_relocs **) vpp;
+		  }
+
+		p = *head;
+		if (p == NULL || p->sec != sec)
+		  {
+		    bfd_size_type amt = sizeof *p;
+		    p = ((struct elf32_mb_dyn_relocs *)
+			 bfd_alloc (htab->elf.dynobj, amt));
+		    if (p == NULL)
+		      return FALSE;
+		    p->next = *head;
+		    *head = p;
+		    p->sec = sec;
+		    p->count = 0;
+		    p->pc_count = 0;
+		  }
+
+		p->count += 1;
+		if (r_type == R_MICROBLAZE_64_PCREL)
+		  p->pc_count += 1;
+	      }
+          }
+          break;
+        }
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+microblaze_elf_create_dynamic_sections (bfd *dynobj, struct bfd_link_info *info)
+{
+  struct elf32_mb_link_hash_table *htab;
+
+  htab = elf32_mb_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (!htab->sgot && !create_got_section (dynobj, info))
+    return FALSE;
+
+  if (!_bfd_elf_create_dynamic_sections (dynobj, info))
+    return FALSE;
+
+  htab->splt = bfd_get_section_by_name (dynobj, ".plt");
+  htab->srelplt = bfd_get_section_by_name (dynobj, ".rela.plt");
+  htab->sdynbss = bfd_get_section_by_name (dynobj, ".dynbss");
+  if (!info->shared)
+    htab->srelbss = bfd_get_section_by_name (dynobj, ".rela.bss");
+
+  if (!htab->splt || !htab->srelplt || !htab->sdynbss
+      || (!info->shared && !htab->srelbss))
+    abort ();
+
+  return TRUE;
+}
+
+/* Copy the extra info we tack onto an elf_link_hash_entry.  */
+
+static void
+microblaze_elf_copy_indirect_symbol (struct bfd_link_info *info,
+				     struct elf_link_hash_entry *dir,
+				     struct elf_link_hash_entry *ind)
+{
+  struct elf32_mb_link_hash_entry *edir, *eind;
+
+  edir = (struct elf32_mb_link_hash_entry *) dir;
+  eind = (struct elf32_mb_link_hash_entry *) ind;
+
+  if (eind->dyn_relocs != NULL)
+    {
+      if (edir->dyn_relocs != NULL)
+	{
+	  struct elf32_mb_dyn_relocs **pp;
+	  struct elf32_mb_dyn_relocs *p;
+
+	  if (ind->root.type == bfd_link_hash_indirect)
+	    abort ();
+
+	  /* Add reloc counts against the weak sym to the strong sym
+	     list.  Merge any entries against the same section.  */
+	  for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      struct elf32_mb_dyn_relocs *q;
+
+	      for (q = edir->dyn_relocs; q != NULL; q = q->next)
+		if (q->sec == p->sec)
+		  {
+		    q->pc_count += p->pc_count;
+		    q->count += p->count;
+		    *pp = p->next;
+		    break;
+		  }
+	      if (q == NULL)
+		pp = &p->next;
+	    }
+	  *pp = edir->dyn_relocs;
+	}
+
+      edir->dyn_relocs = eind->dyn_relocs;
+      eind->dyn_relocs = NULL;
+    }
+
+  _bfd_elf_link_hash_copy_indirect (info, dir, ind);
+}
+
+static bfd_boolean
+microblaze_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+				      struct elf_link_hash_entry *h)
+{
+  struct elf32_mb_link_hash_table *htab;
+  struct elf32_mb_link_hash_entry * eh;
+  struct elf32_mb_dyn_relocs *p;
+  asection *sdynbss, *s;
+  unsigned int power_of_two;
+  bfd *dynobj;
+
+  htab = elf32_mb_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later,
+     when we know the address of the .got section.  */
+  if (h->type == STT_FUNC
+      || h->needs_plt)
+    {
+      if (h->plt.refcount <= 0
+	  || SYMBOL_CALLS_LOCAL (info, h)
+	  || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+	      && h->root.type == bfd_link_hash_undefweak))
+	{
+	  /* This case can occur if we saw a PLT reloc in an input
+	     file, but the symbol was never referred to by a dynamic
+	     object, or if all references were garbage collected.  In
+	     such a case, we don't actually need to build a procedure
+	     linkage table, and we can just do a PC32 reloc instead.  */
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	}
+
+      return TRUE;
+    }
+  else
+    /* It's possible that we incorrectly decided a .plt reloc was
+       needed for an R_MICROBLAZE_64_PCREL reloc to a non-function sym in
+       check_relocs.  We can't decide accurately between function and
+       non-function syms in check-relocs;  Objects loaded later in
+       the link may change h->type.  So fix it now.  */
+    h->plt.offset = (bfd_vma) -1;
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if (!h->non_got_ref)
+    return TRUE;
+
+  /* If -z nocopyreloc was given, we won't generate them either.  */
+  if (info->nocopyreloc)
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  eh = (struct elf32_mb_link_hash_entry *) h;
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      s = p->sec->output_section;
+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
+	break;
+    }
+
+  /* If we didn't find any dynamic relocs in read-only sections, then
+     we'll be keeping the dynamic relocs and avoiding the copy reloc.  */
+  if (p == NULL)
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  /* We must generate a R_MICROBLAZE_COPY reloc to tell the dynamic linker
+     to copy the initial value out of the dynamic object and into the
+     runtime process image.  */
+  dynobj = elf_hash_table (info)->dynobj;
+  BFD_ASSERT (dynobj != NULL);
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      htab->srelbss->size += sizeof (Elf32_External_Rela);
+      h->needs_copy = 1;
+    }
+
+  /* We need to figure out the alignment required for this symbol.  I
+     have no idea how ELF linkers handle this.  */
+  power_of_two = bfd_log2 (h->size);
+  if (power_of_two > 3)
+    power_of_two = 3;
+
+  sdynbss = htab->sdynbss;
+  /* Apply the required alignment.  */
+  sdynbss->size = BFD_ALIGN (sdynbss->size, (bfd_size_type) (1 << power_of_two));
+  if (power_of_two > bfd_get_section_alignment (dynobj, sdynbss))
+    {
+      if (! bfd_set_section_alignment (dynobj, sdynbss, power_of_two))
+	return FALSE;
+    }
+
+  /* Define the symbol as being at this point in the section.  */
+  h->root.u.def.section = sdynbss;
+  h->root.u.def.value = sdynbss->size;
+
+  /* Increment the section size to make room for the symbol.  */
+  sdynbss->size += h->size;
+  return TRUE;
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   dynamic relocs.  */
+
+static bfd_boolean
+allocate_dynrelocs (struct elf_link_hash_entry *h, void * dat)
+{
+  struct bfd_link_info *info;
+  struct elf32_mb_link_hash_table *htab;
+  struct elf32_mb_link_hash_entry *eh;
+  struct elf32_mb_dyn_relocs *p;
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  info = (struct bfd_link_info *) dat;
+  htab = elf32_mb_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (htab->elf.dynamic_sections_created
+      && h->plt.refcount > 0)
+    {
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+          && !h->forced_local)
+        {
+          if (! bfd_elf_link_record_dynamic_symbol (info, h))
+            return FALSE;
+        }
+
+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info->shared, h))
+        {
+          asection *s = htab->splt;
+
+          /* The first entry in .plt is reserved.  */
+          if (s->size == 0)
+            s->size = PLT_ENTRY_SIZE;
+
+          h->plt.offset = s->size;
+
+          /* If this symbol is not defined in a regular file, and we are
+             not generating a shared library, then set the symbol to this
+             location in the .plt.  This is required to make function
+             pointers compare as equal between the normal executable and
+             the shared library.  */
+          if (! info->shared
+              && !h->def_regular)
+            {
+              h->root.u.def.section = s;
+              h->root.u.def.value = h->plt.offset;
+            }
+
+          /* Make room for this entry.  */
+          s->size += PLT_ENTRY_SIZE;
+
+          /* We also need to make an entry in the .got.plt section, which
+             will be placed in the .got section by the linker script.  */
+	  htab->sgotplt->size += 4;
+
+          /* We also need to make an entry in the .rel.plt section.  */
+          htab->srelplt->size += sizeof (Elf32_External_Rela);
+        }
+      else
+        {
+          h->plt.offset = (bfd_vma) -1;
+          h->needs_plt = 0;
+        }
+    }
+  else
+    {
+      h->plt.offset = (bfd_vma) -1;
+      h->needs_plt = 0;
+    }
+
+  if (h->got.refcount > 0)
+    {
+      asection *s;
+
+      /* Make sure this symbol is output as a dynamic symbol.
+         Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+          && !h->forced_local)
+        {
+          if (! bfd_elf_link_record_dynamic_symbol (info, h))
+            return FALSE;
+        }
+
+      s = htab->sgot;
+      h->got.offset = s->size;
+      s->size += 4;
+      htab->srelgot->size += sizeof (Elf32_External_Rela);
+    }
+  else
+    h->got.offset = (bfd_vma) -1;
+
+  eh = (struct elf32_mb_link_hash_entry *) h;
+  if (eh->dyn_relocs == NULL)
+    return TRUE;
+
+  /* In the shared -Bsymbolic case, discard space allocated for
+     dynamic pc-relative relocs against symbols which turn out to be
+     defined in regular objects.  For the normal shared case, discard
+     space for pc-relative relocs that have become local due to symbol
+     visibility changes.  */
+
+  if (info->shared)
+    {
+      if (h->def_regular
+	  && (h->forced_local
+	      || info->symbolic))
+	{
+	  struct elf32_mb_dyn_relocs **pp;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      p->count -= p->pc_count;
+	      p->pc_count = 0;
+	      if (p->count == 0)
+		*pp = p->next;
+	      else
+		pp = &p->next;
+	    }
+	}
+    }
+  else
+    {
+      /* For the non-shared case, discard space for relocs against
+	 symbols which turn out to need copy relocs or are not
+	 dynamic.  */
+
+      if (!h->non_got_ref
+	  && ((h->def_dynamic
+	       && !h->def_regular)
+	      || (htab->elf.dynamic_sections_created
+		  && (h->root.type == bfd_link_hash_undefweak
+		      || h->root.type == bfd_link_hash_undefined))))
+	{
+	  /* Make sure this symbol is output as a dynamic symbol.
+	     Undefined weak syms won't yet be marked as dynamic.  */
+	  if (h->dynindx == -1
+	      && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+
+	  /* If that succeeded, we know we'll be keeping all the
+	     relocs.  */
+	  if (h->dynindx != -1)
+	    goto keep;
+	}
+
+      eh->dyn_relocs = NULL;
+
+    keep: ;
+    }
+
+  /* Finally, allocate space.  */
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *sreloc = elf_section_data (p->sec)->sreloc;
+      sreloc->size += p->count * sizeof (Elf32_External_Rela);
+    }
+
+  return TRUE;
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+microblaze_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+				      struct bfd_link_info *info)
+{
+  struct elf32_mb_link_hash_table *htab;
+  bfd *dynobj;
+  asection *s;
+  bfd *ibfd;
+
+  htab = elf32_mb_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = htab->elf.dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  /* Set up .got offsets for local syms, and space for local dynamic
+     relocs.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      bfd_signed_vma *local_got;
+      bfd_signed_vma *end_local_got;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *srel;
+
+      if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour)
+        continue;
+
+      for (s = ibfd->sections; s != NULL; s = s->next)
+	{
+	  struct elf32_mb_dyn_relocs *p;
+
+	  for (p = ((struct elf32_mb_dyn_relocs *)
+		    elf_section_data (s)->local_dynrel);
+	       p != NULL;
+	       p = p->next)
+	    {
+	      if (!bfd_is_abs_section (p->sec)
+		  && bfd_is_abs_section (p->sec->output_section))
+		{
+		  /* Input section has been discarded, either because
+		     it is a copy of a linkonce section or due to
+		     linker script /DISCARD/, so we'll be discarding
+		     the relocs too.  */
+		}
+	      else if (p->count != 0)
+		{
+		  srel = elf_section_data (p->sec)->sreloc;
+		  srel->size += p->count * sizeof (Elf32_External_Rela);
+		  if ((p->sec->output_section->flags & SEC_READONLY) != 0)
+		    info->flags |= DF_TEXTREL;
+		}
+	    }
+	}
+
+      local_got = elf_local_got_refcounts (ibfd);
+      if (!local_got)
+        continue;
+
+      symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+      locsymcount = symtab_hdr->sh_info;
+      end_local_got = local_got + locsymcount;
+      s = htab->sgot;
+      srel = htab->srelgot;
+
+      for (; local_got < end_local_got; ++local_got)
+        {
+          if (*local_got > 0)
+            {
+              *local_got = s->size;
+              s->size += 4;
+              if (info->shared)
+                srel->size += sizeof (Elf32_External_Rela);
+            }
+          else
+            *local_got = (bfd_vma) -1;
+        }
+    }
+
+  /* Allocate global sym .plt and .got entries, and space for global
+     sym dynamic relocs.  */
+  elf_link_hash_traverse (elf_hash_table (info), allocate_dynrelocs, info);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Make space for the trailing nop in .plt.  */
+      if (htab->splt->size > 0)
+        htab->splt->size += 4;
+    }
+
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      const char *name;
+      bfd_boolean strip = FALSE;
+
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+        continue;
+
+      /* It's OK to base decisions on the section name, because none
+         of the dynobj section names depend upon the input files.  */
+      name = bfd_get_section_name (dynobj, s);
+
+      if (strncmp (name, ".rela", 5) == 0)
+        {
+          if (s->size == 0)
+            {
+              /* If we don't need this section, strip it from the
+        	 output file.  This is to handle .rela.bss and
+        	 .rela.plt.  We must create it in
+        	 create_dynamic_sections, because it must be created
+        	 before the linker maps input sections to output
+        	 sections.  The linker does that before
+        	 adjust_dynamic_symbol is called, and it is that
+        	 function which decides whether anything needs to go
+        	 into these sections.  */
+              strip = TRUE;
+            }
+          else
+            {
+              /* We use the reloc_count field as a counter if we need
+        	 to copy relocs into the output file.  */
+              s->reloc_count = 0;
+            }
+        }
+      else if (s != htab->splt && s != htab->sgot && s != htab->sgotplt)
+        {
+          /* It's not one of our sections, so don't allocate space.  */
+          continue;
+        }
+
+      if (strip)
+        {
+          s->flags |= SEC_EXCLUDE;
+          continue;
+        }
+
+      /* Allocate memory for the section contents.  */
+      /* FIXME: This should be a call to bfd_alloc not bfd_zalloc.
+         Unused entries should be reclaimed before the section's contents
+         are written out, but at the moment this does not happen.  Thus in
+         order to prevent writing out garbage, we initialise the section's
+         contents to zero.  */
+      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL && s->size != 0)
+        return FALSE;
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in microblaze_elf_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL)			\
+      _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (info->executable)
+        {
+          if (!add_dynamic_entry (DT_DEBUG, 0))
+            return FALSE;
+        }
+
+      if (!add_dynamic_entry (DT_RELA, 0)
+          || !add_dynamic_entry (DT_RELASZ, 0)
+          || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
+	return FALSE;
+
+      if (htab->splt->size != 0)
+        {
+          if (!add_dynamic_entry (DT_PLTGOT, 0)
+              || !add_dynamic_entry (DT_PLTRELSZ, 0)
+              || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+              || !add_dynamic_entry (DT_JMPREL, 0)
+              || !add_dynamic_entry (DT_BIND_NOW, 1))
+            return FALSE;
+        }
+
+      if (info->flags & DF_TEXTREL)
+        {
+          if (!add_dynamic_entry (DT_TEXTREL, 0))
+            return FALSE;
+        }
+    }
+#undef add_dynamic_entry
+  return TRUE;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+microblaze_elf_finish_dynamic_symbol (bfd *output_bfd,
+				      struct bfd_link_info *info,
+				      struct elf_link_hash_entry *h,
+				      Elf_Internal_Sym *sym)
+{
+  struct elf32_mb_link_hash_table *htab;
+
+  htab = elf32_mb_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      asection *splt;
+      asection *srela;
+      asection *sgotplt;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+      bfd_vma plt_index;
+      bfd_vma got_offset;
+      bfd_vma got_addr;
+
+      /* This symbol has an entry in the procedure linkage table.  Set
+         it up.  */
+      BFD_ASSERT (h->dynindx != -1);
+
+      splt = htab->splt;
+      srela = htab->srelplt;
+      sgotplt = htab->sgotplt;
+      BFD_ASSERT (splt != NULL && srela != NULL && sgotplt != NULL);
+
+      plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1; /* first entry reserved.  */
+      got_offset = (plt_index + 3) * 4; /* 3 reserved ???  */
+      got_addr = got_offset;
+
+      /* For non-PIC objects we need absolute address of the GOT entry.  */
+      if (!info->shared)
+        got_addr += htab->sgotplt->output_section->vma + sgotplt->output_offset;
+
+      /* Fill in the entry in the procedure linkage table.  */
+      bfd_put_32 (output_bfd, PLT_ENTRY_WORD_0 + ((got_addr >> 16) & 0xffff),
+                  splt->contents + h->plt.offset);
+      if (info->shared)
+        bfd_put_32 (output_bfd, PLT_ENTRY_WORD_1 + (got_addr & 0xffff),
+                    splt->contents + h->plt.offset + 4);
+      else
+        bfd_put_32 (output_bfd, PLT_ENTRY_WORD_1_NOPIC + (got_addr & 0xffff),
+                    splt->contents + h->plt.offset + 4);
+      bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD_2,
+                  splt->contents + h->plt.offset + 8);
+      bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD_3,
+                  splt->contents + h->plt.offset + 12);
+
+      /* Any additions to the .got section??? */
+      /*      bfd_put_32 (output_bfd,
+	      splt->output_section->vma + splt->output_offset + h->plt.offset + 4,
+	      sgotplt->contents + got_offset); */
+
+      /* Fill in the entry in the .rela.plt section.  */
+      rela.r_offset = (sgotplt->output_section->vma
+                       + sgotplt->output_offset
+                       + got_offset);
+      rela.r_info = ELF32_R_INFO (h->dynindx, R_MICROBLAZE_JUMP_SLOT);
+      rela.r_addend = 0;
+      loc = srela->contents;
+      loc += plt_index * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+
+      if (!h->def_regular)
+        {
+          /* Mark the symbol as undefined, rather than as defined in
+             the .plt section.  Zero the value.  */
+          sym->st_shndx = SHN_UNDEF;
+          sym->st_value = 0;
+        }
+    }
+
+  if (h->got.offset != (bfd_vma) -1)
+    {
+      asection *sgot;
+      asection *srela;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+
+      /* This symbol has an entry in the global offset table.  Set it
+         up.  */
+
+      sgot = htab->sgot;
+      srela = htab->srelgot;
+      BFD_ASSERT (sgot != NULL && srela != NULL);
+
+      rela.r_offset = (sgot->output_section->vma
+                       + sgot->output_offset
+                       + (h->got.offset &~ (bfd_vma) 1));
+
+      /* If this is a -Bsymbolic link, and the symbol is defined
+         locally, we just want to emit a RELATIVE reloc.  Likewise if
+         the symbol was forced to be local because of a version file.
+         The entry in the global offset table will already have been
+         initialized in the relocate_section function.  */
+      if (info->shared
+          && (info->symbolic || h->dynindx == -1)
+          && h->def_regular)
+        {
+          asection *sec = h->root.u.def.section;
+          rela.r_info = ELF32_R_INFO (0, R_MICROBLAZE_REL);
+          rela.r_addend = (h->root.u.def.value
+                           + sec->output_section->vma
+                           + sec->output_offset);
+        }
+      else
+        {
+          rela.r_info = ELF32_R_INFO (h->dynindx, R_MICROBLAZE_GLOB_DAT);
+          rela.r_addend = 0;
+        }
+
+      bfd_put_32 (output_bfd, (bfd_vma) 0,
+                  sgot->contents + (h->got.offset &~ (bfd_vma) 1));
+      loc = srela->contents;
+      loc += srela->reloc_count++ * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+    }
+
+  if (h->needs_copy)
+    {
+      asection *s;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+
+      /* This symbols needs a copy reloc.  Set it up.  */
+
+      BFD_ASSERT (h->dynindx != -1);
+
+      s = bfd_get_section_by_name (h->root.u.def.section->owner,
+                                   ".rela.bss");
+      BFD_ASSERT (s != NULL);
+
+      rela.r_offset = (h->root.u.def.value
+                       + h->root.u.def.section->output_section->vma
+                       + h->root.u.def.section->output_offset);
+      rela.r_info = ELF32_R_INFO (h->dynindx, R_MICROBLAZE_COPY);
+      rela.r_addend = 0;
+      loc = s->contents + s->reloc_count++ * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+    }
+
+  /* Mark some specially defined symbols as absolute.  */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+      || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0
+      || strcmp (h->root.root.string, "_PROCEDURE_LINKAGE_TABLE_") == 0)
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+microblaze_elf_finish_dynamic_sections (bfd *output_bfd,
+					struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *sdyn, *sgot;
+  struct elf32_mb_link_hash_table *htab;
+
+  htab = elf32_mb_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = htab->elf.dynobj;
+
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (htab->elf.dynamic_sections_created)
+    {
+      asection *splt;
+      Elf32_External_Dyn *dyncon, *dynconend;
+
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      BFD_ASSERT (splt != NULL && sdyn != NULL);
+
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+      for (; dyncon < dynconend; dyncon++)
+        {
+          Elf_Internal_Dyn dyn;
+          const char *name;
+          bfd_boolean size;
+
+          bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+          switch (dyn.d_tag)
+            {
+            case DT_PLTGOT:   name = ".got.plt"; size = FALSE; break;
+            case DT_PLTRELSZ: name = ".rela.plt"; size = TRUE; break;
+            case DT_JMPREL:   name = ".rela.plt"; size = FALSE; break;
+            case DT_RELA:     name = ".rela.dyn"; size = FALSE; break;
+            case DT_RELASZ:   name = ".rela.dyn"; size = TRUE; break;
+            default:	  name = NULL; size = FALSE; break;
+            }
+
+          if (name != NULL)
+            {
+              asection *s;
+
+              s = bfd_get_section_by_name (output_bfd, name);
+              if (s == NULL)
+                dyn.d_un.d_val = 0;
+              else
+                {
+                  if (! size)
+                    dyn.d_un.d_ptr = s->vma;
+                  else
+                    dyn.d_un.d_val = s->size;
+                }
+              bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+            }
+        }
+
+      /* Clear the first entry in the procedure linkage table,
+	 and put a nop in the last four bytes.  */
+      if (splt->size > 0)
+        {
+          memset (splt->contents, 0, PLT_ENTRY_SIZE);
+          bfd_put_32 (output_bfd, (bfd_vma) 0x80000000 /* nop.  */,
+                      splt->contents + splt->size - 4);
+        }
+
+      elf_section_data (splt->output_section)->this_hdr.sh_entsize = 4;
+    }
+
+  /* Set the first entry in the global offset table to the address of
+     the dynamic section.  */
+  sgot = bfd_get_section_by_name (dynobj, ".got.plt");
+  if (sgot && sgot->size > 0)
+    {
+      if (sdyn == NULL)
+        bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents);
+      else
+        bfd_put_32 (output_bfd,
+                    sdyn->output_section->vma + sdyn->output_offset,
+                    sgot->contents);
+      elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
+    }
+
+  if (htab->sgot && htab->sgot->size > 0)
+    elf_section_data (htab->sgot->output_section)->this_hdr.sh_entsize = 4;
+
+  return TRUE;
+}
+
+/* Hook called by the linker routine which adds symbols from an object
+   file.  We use it to put .comm items in .sbss, and not .bss.  */
+
+static bfd_boolean
+microblaze_elf_add_symbol_hook (bfd *abfd,
+			        struct bfd_link_info *info,
+			        Elf_Internal_Sym *sym,
+			        const char **namep ATTRIBUTE_UNUSED,
+			        flagword *flagsp ATTRIBUTE_UNUSED,
+			        asection **secp,
+			        bfd_vma *valp)
+{
+  if (sym->st_shndx == SHN_COMMON
+      && !info->relocatable
+      && sym->st_size <= elf_gp_size (abfd))
+    {
+      /* Common symbols less than or equal to -G nn bytes are automatically
+	 put into .sbss.  */
+      *secp = bfd_make_section_anyway (abfd, ".sbss");
+      if (*secp == NULL
+          || ! bfd_set_section_flags (abfd, *secp, SEC_IS_COMMON))
+        return FALSE;
+
+      *valp = sym->st_size;
+    }
+
+  return TRUE;
+}
+
+
+#define TARGET_BIG_SYM          bfd_elf32_microblaze_vec
+#define TARGET_BIG_NAME		"elf32-microblaze"
+
+#define ELF_ARCH		bfd_arch_microblaze
+#define ELF_TARGET_ID		MICROBLAZE_ELF_DATA
+#define ELF_MACHINE_CODE	EM_MICROBLAZE
+#define ELF_MACHINE_ALT1	EM_MICROBLAZE_OLD
+#define ELF_MAXPAGESIZE		0x4   		/* 4k, if we ever have 'em.  */
+#define elf_info_to_howto	microblaze_elf_info_to_howto
+#define elf_info_to_howto_rel	NULL
+
+#define bfd_elf32_bfd_reloc_type_lookup		microblaze_elf_reloc_type_lookup
+#define bfd_elf32_bfd_is_local_label_name       microblaze_elf_is_local_label_name
+#define elf_backend_relocate_section		microblaze_elf_relocate_section
+#define bfd_elf32_bfd_relax_section             microblaze_elf_relax_section
+#define bfd_elf32_bfd_reloc_name_lookup		microblaze_elf_reloc_name_lookup
+
+#define elf_backend_gc_mark_hook		microblaze_elf_gc_mark_hook
+#define elf_backend_gc_sweep_hook		microblaze_elf_gc_sweep_hook
+#define elf_backend_check_relocs                microblaze_elf_check_relocs
+#define elf_backend_copy_indirect_symbol        microblaze_elf_copy_indirect_symbol
+#define bfd_elf32_bfd_link_hash_table_create    microblaze_elf_link_hash_table_create
+#define elf_backend_can_gc_sections		1
+#define elf_backend_can_refcount    		1
+#define elf_backend_want_got_plt    		1
+#define elf_backend_plt_readonly    		1
+#define elf_backend_got_header_size 		12
+#define elf_backend_rela_normal     		1
+
+#define elf_backend_adjust_dynamic_symbol       microblaze_elf_adjust_dynamic_symbol
+#define elf_backend_create_dynamic_sections     microblaze_elf_create_dynamic_sections
+#define elf_backend_finish_dynamic_sections     microblaze_elf_finish_dynamic_sections
+#define elf_backend_finish_dynamic_symbol       microblaze_elf_finish_dynamic_symbol
+#define elf_backend_size_dynamic_sections       microblaze_elf_size_dynamic_sections
+#define elf_backend_add_symbol_hook		microblaze_elf_add_symbol_hook
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-mips.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-mips.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-mips.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-mips.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2398 @@
+/* MIPS-specific support for 32-bit ELF
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+   Most of the information added by Ian Lance Taylor, Cygnus Support,
+   <ian@cygnus.com>.
+   N32/64 ABI support added by Mark Mitchell, CodeSourcery, LLC.
+   <mark@codesourcery.com>
+   Traditional MIPS targets support added by Koundinya.K, Dansk Data
+   Elektronik & Operations Research Group. <kk@ddeorg.soft.net>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* This file handles MIPS ELF targets.  SGI Irix 5 uses a slightly
+   different MIPS ELF from other targets.  This matters when linking.
+   This file supports both, switching at runtime.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "bfdlink.h"
+#include "genlink.h"
+#include "elf-bfd.h"
+#include "elfxx-mips.h"
+#include "elf/mips.h"
+#include "elf-vxworks.h"
+
+/* Get the ECOFF swapping routines.  */
+#include "coff/sym.h"
+#include "coff/symconst.h"
+#include "coff/internal.h"
+#include "coff/ecoff.h"
+#include "coff/mips.h"
+#define ECOFF_SIGNED_32
+#include "ecoffswap.h"
+
+static bfd_reloc_status_type gprel32_with_gp
+  (bfd *, asymbol *, arelent *, asection *, bfd_boolean, void *, bfd_vma);
+static bfd_reloc_status_type mips_elf_gprel32_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type mips32_64bit_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
+  (bfd *, bfd_reloc_code_real_type);
+static reloc_howto_type *mips_elf32_rtype_to_howto
+  (unsigned int, bfd_boolean);
+static void mips_info_to_howto_rel
+  (bfd *, arelent *, Elf_Internal_Rela *);
+static void mips_info_to_howto_rela
+  (bfd *, arelent *, Elf_Internal_Rela *);
+static bfd_boolean mips_elf_sym_is_global
+  (bfd *, asymbol *);
+static bfd_boolean mips_elf32_object_p
+  (bfd *);
+static bfd_boolean mips_elf_is_local_label_name
+  (bfd *, const char *);
+static bfd_reloc_status_type mips16_gprel_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type mips_elf_final_gp
+  (bfd *, asymbol *, bfd_boolean, char **, bfd_vma *);
+static bfd_boolean mips_elf_assign_gp
+  (bfd *, bfd_vma *);
+static bfd_boolean elf32_mips_grok_prstatus
+  (bfd *, Elf_Internal_Note *);
+static bfd_boolean elf32_mips_grok_psinfo
+  (bfd *, Elf_Internal_Note *);
+static irix_compat_t elf32_mips_irix_compat
+  (bfd *);
+
+extern const bfd_target bfd_elf32_bigmips_vec;
+extern const bfd_target bfd_elf32_littlemips_vec;
+
+/* Nonzero if ABFD is using the N32 ABI.  */
+#define ABI_N32_P(abfd) \
+  ((elf_elfheader (abfd)->e_flags & EF_MIPS_ABI2) != 0)
+
+/* Whether we are trying to be compatible with IRIX at all.  */
+#define SGI_COMPAT(abfd) \
+  (elf32_mips_irix_compat (abfd) != ict_none)
+
+/* The number of local .got entries we reserve.  */
+#define MIPS_RESERVED_GOTNO (2)
+
+/* In case we're on a 32-bit machine, construct a 64-bit "-1" value
+   from smaller values.  Start with zero, widen, *then* decrement.  */
+#define MINUS_ONE	(((bfd_vma)0) - 1)
+
+/* The relocation table used for SHT_REL sections.  */
+
+static reloc_howto_type elf_mips_howto_table_rel[] =
+{
+  /* No relocation.  */
+  HOWTO (R_MIPS_NONE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit relocation.  */
+  HOWTO (R_MIPS_16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit relocation.  */
+  HOWTO (R_MIPS_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit symbol relative relocation.  */
+  HOWTO (R_MIPS_REL32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_REL32",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 26 bit jump address.  */
+  HOWTO (R_MIPS_26,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 			/* This needs complex overflow
+				   detection, because the upper four
+				   bits must match the PC + 4.  */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_26",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x03ffffff,		/* src_mask */
+	 0x03ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of symbol value.  */
+  HOWTO (R_MIPS_HI16,		/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_hi16_reloc, /* special_function */
+	 "R_MIPS_HI16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of symbol value.  */
+  HOWTO (R_MIPS_LO16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_lo16_reloc, /* special_function */
+	 "R_MIPS_LO16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GP relative reference.  */
+  HOWTO (R_MIPS_GPREL16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf32_gprel16_reloc, /* special_function */
+	 "R_MIPS_GPREL16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Reference to literal section.  */
+  HOWTO (R_MIPS_LITERAL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf32_gprel16_reloc, /* special_function */
+	 "R_MIPS_LITERAL",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Reference to global offset table.  */
+  HOWTO (R_MIPS_GOT16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_got16_reloc, /* special_function */
+	 "R_MIPS_GOT16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit PC relative reference.  Note that the ABI document has a typo
+     and claims R_MIPS_PC16 to be not rightshifted, rendering it useless.
+     We do the right thing here.  */
+  HOWTO (R_MIPS_PC16,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_PC16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 16 bit call through global offset table.  */
+  HOWTO (R_MIPS_CALL16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_CALL16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit GP relative reference.  */
+  HOWTO (R_MIPS_GPREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 mips_elf_gprel32_reloc, /* special_function */
+	 "R_MIPS_GPREL32",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The remaining relocs are defined on Irix 5, although they are
+     not defined by the ABI.  */
+  EMPTY_HOWTO (13),
+  EMPTY_HOWTO (14),
+  EMPTY_HOWTO (15),
+
+  /* A 5 bit shift field.  */
+  HOWTO (R_MIPS_SHIFT5,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 5,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 6,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_SHIFT5",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x000007c0,		/* src_mask */
+	 0x000007c0,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 6 bit shift field.  */
+  /* FIXME: This is not handled correctly; a special function is
+     needed to put the most significant bit in the right place.  */
+  HOWTO (R_MIPS_SHIFT6,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 6,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 6,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_SHIFT6",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x000007c4,		/* src_mask */
+	 0x000007c4,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 64 bit relocation.  */
+  HOWTO (R_MIPS_64,		/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 mips32_64bit_reloc,	/* special_function */
+	 "R_MIPS_64",		/* name */
+	 TRUE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Displacement in the global offset table.  */
+  HOWTO (R_MIPS_GOT_DISP,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GOT_DISP",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Displacement to page pointer in the global offset table.  */
+  HOWTO (R_MIPS_GOT_PAGE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GOT_PAGE",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Offset from page pointer in the global offset table.  */
+  HOWTO (R_MIPS_GOT_OFST,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GOT_OFST",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of displacement in global offset table.  */
+  HOWTO (R_MIPS_GOT_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GOT_HI16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_MIPS_GOT_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GOT_LO16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 64 bit subtraction.  Used in the N32 ABI.  */
+  HOWTO (R_MIPS_SUB,		/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_SUB",		/* name */
+	 TRUE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used to cause the linker to insert and delete instructions?  */
+  EMPTY_HOWTO (R_MIPS_INSERT_A),
+  EMPTY_HOWTO (R_MIPS_INSERT_B),
+  EMPTY_HOWTO (R_MIPS_DELETE),
+
+  /* Get the higher value of a 64 bit addend.  */
+  HOWTO (R_MIPS_HIGHER,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_HIGHER",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Get the highest value of a 64 bit addend.  */
+  HOWTO (R_MIPS_HIGHEST,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_HIGHEST",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of displacement in global offset table.  */
+  HOWTO (R_MIPS_CALL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_CALL_HI16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_MIPS_CALL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_CALL_LO16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Section displacement.  */
+  HOWTO (R_MIPS_SCN_DISP,       /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_SCN_DISP",     /* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (R_MIPS_REL16),
+  EMPTY_HOWTO (R_MIPS_ADD_IMMEDIATE),
+  EMPTY_HOWTO (R_MIPS_PJUMP),
+  EMPTY_HOWTO (R_MIPS_RELGOT),
+
+  /* Protected jump conversion.  This is an optimization hint.  No
+     relocation is required for correctness.  */
+  HOWTO (R_MIPS_JALR,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_JALR",	        /* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000000,		/* src_mask */
+	 0x00000000,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS GD/LD dynamic relocations.  */
+  HOWTO (R_MIPS_TLS_DTPMOD32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_DTPMOD32",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MIPS_TLS_DTPREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_DTPREL32",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (R_MIPS_TLS_DTPMOD64),
+  EMPTY_HOWTO (R_MIPS_TLS_DTPREL64),
+
+  /* TLS general dynamic variable reference.  */
+  HOWTO (R_MIPS_TLS_GD,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_GD",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS local dynamic variable reference.  */
+  HOWTO (R_MIPS_TLS_LDM,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_LDM",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS local dynamic offset.  */
+  HOWTO (R_MIPS_TLS_DTPREL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_DTPREL_HI16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS local dynamic offset.  */
+  HOWTO (R_MIPS_TLS_DTPREL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_DTPREL_LO16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS thread pointer offset.  */
+  HOWTO (R_MIPS_TLS_GOTTPREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_GOTTPREL",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS IE dynamic relocations.  */
+  HOWTO (R_MIPS_TLS_TPREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_TPREL32",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (R_MIPS_TLS_TPREL64),
+
+  /* TLS thread pointer offset.  */
+  HOWTO (R_MIPS_TLS_TPREL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_TPREL_HI16", /* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS thread pointer offset.  */
+  HOWTO (R_MIPS_TLS_TPREL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_TPREL_LO16", /* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit relocation with no addend.  */
+  HOWTO (R_MIPS_GLOB_DAT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GLOB_DAT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+/* The reloc used for BFD_RELOC_CTOR when doing a 64 bit link.  This
+   is a hack to make the linker think that we need 64 bit values.  */
+static reloc_howto_type elf_mips_ctor64_howto =
+  HOWTO (R_MIPS_64,		/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mips32_64bit_reloc,	/* special_function */
+	 "R_MIPS_64",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+static reloc_howto_type elf_mips16_howto_table_rel[] =
+{
+  /* The reloc used for the mips16 jump instruction.  */
+  HOWTO (R_MIPS16_26,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 			/* This needs complex overflow
+				   detection, because the upper four
+				   bits must match the PC.  */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS16_26",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x3ffffff,		/* src_mask */
+	 0x3ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The reloc used for the mips16 gprel instruction.  */
+  HOWTO (R_MIPS16_GPREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mips16_gprel_reloc,	/* special_function */
+	 "R_MIPS16_GPREL",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,	        /* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A MIPS16 reference to the global offset table.  */
+  HOWTO (R_MIPS16_GOT16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_got16_reloc, /* special_function */
+	 "R_MIPS16_GOT16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,	        /* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A MIPS16 call through the global offset table.  */
+  HOWTO (R_MIPS16_CALL16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS16_CALL16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,	        /* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* MIPS16 high 16 bits of symbol value.  */
+  HOWTO (R_MIPS16_HI16,		/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_hi16_reloc, /* special_function */
+	 "R_MIPS16_HI16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,	        /* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* MIPS16 low 16 bits of symbol value.  */
+  HOWTO (R_MIPS16_LO16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_lo16_reloc, /* special_function */
+	 "R_MIPS16_LO16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,	        /* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+static reloc_howto_type elf_micromips_howto_table_rel[] =
+{
+  EMPTY_HOWTO (130),
+  EMPTY_HOWTO (131),
+  EMPTY_HOWTO (132),
+
+  /* 26 bit jump address.  */
+  HOWTO (R_MICROMIPS_26_S1,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 			/* This needs complex overflow
+				   detection, because the upper four
+				   bits must match the PC.  */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_26_S1",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x3ffffff,		/* src_mask */
+	 0x3ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of symbol value.  */
+  HOWTO (R_MICROMIPS_HI16,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_hi16_reloc, /* special_function */
+	 "R_MICROMIPS_HI16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of symbol value.  */
+  HOWTO (R_MICROMIPS_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_lo16_reloc, /* special_function */
+	 "R_MICROMIPS_LO16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GP relative reference.  */
+  HOWTO (R_MICROMIPS_GPREL16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf32_gprel16_reloc, /* special_function */
+	 "R_MICROMIPS_GPREL16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Reference to literal section.  */
+  HOWTO (R_MICROMIPS_LITERAL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf32_gprel16_reloc, /* special_function */
+	 "R_MICROMIPS_LITERAL",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Reference to global offset table.  */
+  HOWTO (R_MICROMIPS_GOT16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_got16_reloc, /* special_function */
+	 "R_MICROMIPS_GOT16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* This is for microMIPS branches.  */
+  HOWTO (R_MICROMIPS_PC7_S1,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 7,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_PC7_S1",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000007f,		/* src_mask */
+	 0x0000007f,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MICROMIPS_PC10_S1,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 10,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_PC10_S1",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x000003ff,		/* src_mask */
+	 0x000003ff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MICROMIPS_PC16_S1,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_PC16_S1",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 16 bit call through global offset table.  */
+  HOWTO (R_MICROMIPS_CALL16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_CALL16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (143),
+  EMPTY_HOWTO (144),
+
+  /* Displacement in the global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_DISP,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_DISP",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Displacement to page pointer in the global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_PAGE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_PAGE",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Offset from page pointer in the global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_OFST,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_OFST",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of displacement in global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_HI16",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_LO16",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 64 bit subtraction.  Used in the N32 ABI.  */
+  HOWTO (R_MICROMIPS_SUB,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_SUB",	/* name */
+	 TRUE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Get the higher value of a 64 bit addend.  */
+  HOWTO (R_MICROMIPS_HIGHER,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_HIGHER",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Get the highest value of a 64 bit addend.  */
+  HOWTO (R_MICROMIPS_HIGHEST,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_HIGHEST",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of displacement in global offset table.  */
+  HOWTO (R_MICROMIPS_CALL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_CALL_HI16",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_MICROMIPS_CALL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_CALL_LO16",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Section displacement.  */
+  HOWTO (R_MICROMIPS_SCN_DISP,  /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_SCN_DISP",/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Protected jump conversion.  This is an optimization hint.  No
+     relocation is required for correctness.  */
+  HOWTO (R_MICROMIPS_JALR,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_JALR",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000000,		/* src_mask */
+	 0x00000000,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of symbol value.  Note that the high 16 bits of symbol values
+     must be zero.  This is used for relaxation.  */
+  HOWTO (R_MICROMIPS_HI0_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_HI0_LO16",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (158),
+  EMPTY_HOWTO (159),
+  EMPTY_HOWTO (160),
+  EMPTY_HOWTO (161),
+
+  /* TLS general dynamic variable reference.  */
+  HOWTO (R_MICROMIPS_TLS_GD,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_TLS_GD",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS local dynamic variable reference.  */
+  HOWTO (R_MICROMIPS_TLS_LDM,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_TLS_LDM",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS local dynamic offset.  */
+  HOWTO (R_MICROMIPS_TLS_DTPREL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_TLS_DTPREL_HI16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS local dynamic offset.  */
+  HOWTO (R_MICROMIPS_TLS_DTPREL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_TLS_DTPREL_LO16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS thread pointer offset.  */
+  HOWTO (R_MICROMIPS_TLS_GOTTPREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_TLS_GOTTPREL",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (167),
+  EMPTY_HOWTO (168),
+
+  /* TLS thread pointer offset.  */
+  HOWTO (R_MICROMIPS_TLS_TPREL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_TLS_TPREL_HI16", /* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS thread pointer offset.  */
+  HOWTO (R_MICROMIPS_TLS_TPREL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_TLS_TPREL_LO16", /* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (171),
+
+  /* GP- and PC-relative relocations.  */
+  HOWTO (R_MICROMIPS_GPREL7_S2,	/* type */
+	 2,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 7,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf32_gprel16_reloc, /* special_function */
+	 "R_MICROMIPS_GPREL7_S2",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000007f,		/* src_mask */
+	 0x0000007f,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MICROMIPS_PC23_S2,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 23,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_PC23_S2",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x007fffff,		/* src_mask */
+	 0x007fffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+};
+
+/* 16 bit offset for pc-relative branches.  */
+static reloc_howto_type elf_mips_gnu_rel16_s2 =
+  HOWTO (R_MIPS_GNU_REL16_S2,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GNU_REL16_S2",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE);			/* pcrel_offset */
+
+/* 32 bit pc-relative.  This was a GNU extension used by embedded-PIC.
+   It was co-opted by mips-linux for exception-handling data.  It is no
+   longer used, but should continue to be supported by the linker for
+   backward compatibility.  (GCC stopped using it in May, 2004.)  */
+static reloc_howto_type elf_mips_gnu_pcrel32 =
+  HOWTO (R_MIPS_PC32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_PC32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE);			/* pcrel_offset */
+
+/* GNU extension to record C++ vtable hierarchy */
+static reloc_howto_type elf_mips_gnu_vtinherit_howto =
+  HOWTO (R_MIPS_GNU_VTINHERIT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_MIPS_GNU_VTINHERIT", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+/* GNU extension to record C++ vtable member usage */
+static reloc_howto_type elf_mips_gnu_vtentry_howto =
+  HOWTO (R_MIPS_GNU_VTENTRY,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_elf_rel_vtable_reloc_fn, /* special_function */
+	 "R_MIPS_GNU_VTENTRY",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+/* Originally a VxWorks extension, but now used for other systems too.  */
+static reloc_howto_type elf_mips_copy_howto =
+  HOWTO (R_MIPS_COPY,		/* type */
+	 0,			/* rightshift */
+	 0,			/* this one is variable size */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_COPY",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,         		/* src_mask */
+	 0x0,		        /* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+/* Originally a VxWorks extension, but now used for other systems too.  */
+static reloc_howto_type elf_mips_jump_slot_howto =
+  HOWTO (R_MIPS_JUMP_SLOT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_JUMP_SLOT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,         		/* src_mask */
+	 0x0,		        /* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+/* Set the GP value for OUTPUT_BFD.  Returns FALSE if this is a
+   dangerous relocation.  */
+
+static bfd_boolean
+mips_elf_assign_gp (bfd *output_bfd, bfd_vma *pgp)
+{
+  unsigned int count;
+  asymbol **sym;
+  unsigned int i;
+
+  /* If we've already figured out what GP will be, just return it.  */
+  *pgp = _bfd_get_gp_value (output_bfd);
+  if (*pgp)
+    return TRUE;
+
+  count = bfd_get_symcount (output_bfd);
+  sym = bfd_get_outsymbols (output_bfd);
+
+  /* The linker script will have created a symbol named `_gp' with the
+     appropriate value.  */
+  if (sym == NULL)
+    i = count;
+  else
+    {
+      for (i = 0; i < count; i++, sym++)
+	{
+	  register const char *name;
+
+	  name = bfd_asymbol_name (*sym);
+	  if (*name == '_' && strcmp (name, "_gp") == 0)
+	    {
+	      *pgp = bfd_asymbol_value (*sym);
+	      _bfd_set_gp_value (output_bfd, *pgp);
+	      break;
+	    }
+	}
+    }
+
+  if (i >= count)
+    {
+      /* Only get the error once.  */
+      *pgp = 4;
+      _bfd_set_gp_value (output_bfd, *pgp);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* We have to figure out the gp value, so that we can adjust the
+   symbol value correctly.  We look up the symbol _gp in the output
+   BFD.  If we can't find it, we're stuck.  We cache it in the ELF
+   target data.  We don't need to adjust the symbol value for an
+   external symbol if we are producing relocatable output.  */
+
+static bfd_reloc_status_type
+mips_elf_final_gp (bfd *output_bfd, asymbol *symbol, bfd_boolean relocatable,
+		   char **error_message, bfd_vma *pgp)
+{
+  if (bfd_is_und_section (symbol->section)
+      && ! relocatable)
+    {
+      *pgp = 0;
+      return bfd_reloc_undefined;
+    }
+
+  *pgp = _bfd_get_gp_value (output_bfd);
+  if (*pgp == 0
+      && (! relocatable
+	  || (symbol->flags & BSF_SECTION_SYM) != 0))
+    {
+      if (relocatable)
+	{
+	  /* Make up a value.  */
+	  *pgp = symbol->section->output_section->vma /*+ 0x4000*/;
+	  _bfd_set_gp_value (output_bfd, *pgp);
+	}
+      else if (!mips_elf_assign_gp (output_bfd, pgp))
+	{
+	  *error_message =
+	    (char *) _("GP relative relocation when _gp not defined");
+	  return bfd_reloc_dangerous;
+	}
+    }
+
+  return bfd_reloc_ok;
+}
+
+/* Do a R_MIPS_GPREL16 relocation.  This is a 16 bit value which must
+   become the offset from the gp register.  This function also handles
+   R_MIPS_LITERAL relocations, although those can be handled more
+   cleverly because the entries in the .lit8 and .lit4 sections can be
+   merged.  */
+
+bfd_reloc_status_type
+_bfd_mips_elf32_gprel16_reloc (bfd *abfd, arelent *reloc_entry,
+			       asymbol *symbol, void *data,
+			       asection *input_section, bfd *output_bfd,
+			       char **error_message)
+{
+  bfd_boolean relocatable;
+  bfd_reloc_status_type ret;
+  bfd_byte *location;
+  bfd_vma gp;
+
+  /* R_MIPS_LITERAL/R_MICROMIPS_LITERAL relocations are defined for local
+     symbols only.  */
+  if (literal_reloc_p (reloc_entry->howto->type)
+      && output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (symbol->flags & BSF_LOCAL) != 0)
+    {
+      *error_message = (char *)
+	_("literal relocation occurs for an external symbol");
+      return bfd_reloc_outofrange;
+    }
+
+  if (output_bfd != NULL)
+    relocatable = TRUE;
+  else
+    {
+      relocatable = FALSE;
+      output_bfd = symbol->section->output_section->owner;
+    }
+
+  ret = mips_elf_final_gp (output_bfd, symbol, relocatable, error_message,
+			   &gp);
+  if (ret != bfd_reloc_ok)
+    return ret;
+
+  location = (bfd_byte *) data + reloc_entry->address;
+  _bfd_mips_elf_reloc_unshuffle (abfd, reloc_entry->howto->type, FALSE,
+				 location);
+  ret = _bfd_mips_elf_gprel16_with_gp (abfd, symbol, reloc_entry,
+				       input_section, relocatable,
+				       data, gp);
+  _bfd_mips_elf_reloc_shuffle (abfd, reloc_entry->howto->type, !relocatable,
+			       location);
+
+  return ret;
+}
+
+/* Do a R_MIPS_GPREL32 relocation.  This is a 32 bit value which must
+   become the offset from the gp register.  */
+
+static bfd_reloc_status_type
+mips_elf_gprel32_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+			void *data, asection *input_section, bfd *output_bfd,
+			char **error_message)
+{
+  bfd_boolean relocatable;
+  bfd_reloc_status_type ret;
+  bfd_vma gp;
+
+  /* R_MIPS_GPREL32 relocations are defined for local symbols only.  */
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (symbol->flags & BSF_LOCAL) != 0)
+    {
+      *error_message = (char *)
+	_("32bits gp relative relocation occurs for an external symbol");
+      return bfd_reloc_outofrange;
+    }
+
+  if (output_bfd != NULL)
+    relocatable = TRUE;
+  else
+    {
+      relocatable = FALSE;
+      output_bfd = symbol->section->output_section->owner;
+    }
+
+  ret = mips_elf_final_gp (output_bfd, symbol, relocatable,
+			   error_message, &gp);
+  if (ret != bfd_reloc_ok)
+    return ret;
+
+  return gprel32_with_gp (abfd, symbol, reloc_entry, input_section,
+			  relocatable, data, gp);
+}
+
+static bfd_reloc_status_type
+gprel32_with_gp (bfd *abfd, asymbol *symbol, arelent *reloc_entry,
+		 asection *input_section, bfd_boolean relocatable,
+		 void *data, bfd_vma gp)
+{
+  bfd_vma relocation;
+  bfd_vma val;
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  /* Set val to the offset into the section or symbol.  */
+  val = reloc_entry->addend;
+
+  if (reloc_entry->howto->partial_inplace)
+    val += bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
+
+  /* Adjust val for the final section location and GP value.  If we
+     are producing relocatable output, we don't want to do this for
+     an external symbol.  */
+  if (! relocatable
+      || (symbol->flags & BSF_SECTION_SYM) != 0)
+    val += relocation - gp;
+
+  if (reloc_entry->howto->partial_inplace)
+    bfd_put_32 (abfd, val, (bfd_byte *) data + reloc_entry->address);
+  else
+    reloc_entry->addend = val;
+
+  if (relocatable)
+    reloc_entry->address += input_section->output_offset;
+
+  return bfd_reloc_ok;
+}
+
+/* Handle a 64 bit reloc in a 32 bit MIPS ELF file.  These are
+   generated when addresses are 64 bits.  The upper 32 bits are a simple
+   sign extension.  */
+
+static bfd_reloc_status_type
+mips32_64bit_reloc (bfd *abfd, arelent *reloc_entry,
+		    asymbol *symbol ATTRIBUTE_UNUSED,
+		    void *data, asection *input_section,
+		    bfd *output_bfd, char **error_message)
+{
+  bfd_reloc_status_type r;
+  arelent reloc32;
+  unsigned long val;
+  bfd_size_type addr;
+
+  /* Do a normal 32 bit relocation on the lower 32 bits.  */
+  reloc32 = *reloc_entry;
+  if (bfd_big_endian (abfd))
+    reloc32.address += 4;
+  reloc32.howto = &elf_mips_howto_table_rel[R_MIPS_32];
+  r = bfd_perform_relocation (abfd, &reloc32, data, input_section,
+			      output_bfd, error_message);
+
+  /* Sign extend into the upper 32 bits.  */
+  val = bfd_get_32 (abfd, (bfd_byte *) data + reloc32.address);
+  if ((val & 0x80000000) != 0)
+    val = 0xffffffff;
+  else
+    val = 0;
+  addr = reloc_entry->address;
+  if (bfd_little_endian (abfd))
+    addr += 4;
+  bfd_put_32 (abfd, val, (bfd_byte *) data + addr);
+
+  return r;
+}
+
+/* Handle a mips16 GP relative reloc.  */
+
+static bfd_reloc_status_type
+mips16_gprel_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+		    void *data, asection *input_section, bfd *output_bfd,
+		    char **error_message)
+{
+  bfd_boolean relocatable;
+  bfd_reloc_status_type ret;
+  bfd_byte *location;
+  bfd_vma gp;
+
+  /* If we're relocating, and this is an external symbol, we don't want
+     to change anything.  */
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (symbol->flags & BSF_LOCAL) != 0)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  if (output_bfd != NULL)
+    relocatable = TRUE;
+  else
+    {
+      relocatable = FALSE;
+      output_bfd = symbol->section->output_section->owner;
+    }
+
+  ret = mips_elf_final_gp (output_bfd, symbol, relocatable, error_message,
+			   &gp);
+  if (ret != bfd_reloc_ok)
+    return ret;
+
+  location = (bfd_byte *) data + reloc_entry->address;
+  _bfd_mips_elf_reloc_unshuffle (abfd, reloc_entry->howto->type, FALSE,
+				 location);
+  ret = _bfd_mips_elf_gprel16_with_gp (abfd, symbol, reloc_entry,
+				       input_section, relocatable,
+				       data, gp);
+  _bfd_mips_elf_reloc_shuffle (abfd, reloc_entry->howto->type, !relocatable,
+			       location);
+
+  return ret;
+}
+
+/* A mapping from BFD reloc types to MIPS ELF reloc types.  */
+
+struct elf_reloc_map {
+  bfd_reloc_code_real_type bfd_val;
+  enum elf_mips_reloc_type elf_val;
+};
+
+static const struct elf_reloc_map mips_reloc_map[] =
+{
+  { BFD_RELOC_NONE, R_MIPS_NONE },
+  { BFD_RELOC_16, R_MIPS_16 },
+  { BFD_RELOC_32, R_MIPS_32 },
+  /* There is no BFD reloc for R_MIPS_REL32.  */
+  { BFD_RELOC_64, R_MIPS_64 },
+  { BFD_RELOC_MIPS_JMP, R_MIPS_26 },
+  { BFD_RELOC_HI16_S, R_MIPS_HI16 },
+  { BFD_RELOC_LO16, R_MIPS_LO16 },
+  { BFD_RELOC_GPREL16, R_MIPS_GPREL16 },
+  { BFD_RELOC_MIPS_LITERAL, R_MIPS_LITERAL },
+  { BFD_RELOC_MIPS_GOT16, R_MIPS_GOT16 },
+  { BFD_RELOC_16_PCREL_S2, R_MIPS_PC16 },
+  { BFD_RELOC_MIPS_CALL16, R_MIPS_CALL16 },
+  { BFD_RELOC_GPREL32, R_MIPS_GPREL32 },
+  { BFD_RELOC_MIPS_GOT_HI16, R_MIPS_GOT_HI16 },
+  { BFD_RELOC_MIPS_GOT_LO16, R_MIPS_GOT_LO16 },
+  { BFD_RELOC_MIPS_CALL_HI16, R_MIPS_CALL_HI16 },
+  { BFD_RELOC_MIPS_CALL_LO16, R_MIPS_CALL_LO16 },
+  { BFD_RELOC_MIPS_SUB, R_MIPS_SUB },
+  { BFD_RELOC_MIPS_GOT_PAGE, R_MIPS_GOT_PAGE },
+  { BFD_RELOC_MIPS_GOT_OFST, R_MIPS_GOT_OFST },
+  { BFD_RELOC_MIPS_GOT_DISP, R_MIPS_GOT_DISP },
+  { BFD_RELOC_MIPS_JALR, R_MIPS_JALR },
+  { BFD_RELOC_MIPS_TLS_DTPMOD32, R_MIPS_TLS_DTPMOD32 },
+  { BFD_RELOC_MIPS_TLS_DTPREL32, R_MIPS_TLS_DTPREL32 },
+  { BFD_RELOC_MIPS_TLS_DTPMOD64, R_MIPS_TLS_DTPMOD64 },
+  { BFD_RELOC_MIPS_TLS_DTPREL64, R_MIPS_TLS_DTPREL64 },
+  { BFD_RELOC_MIPS_TLS_GD, R_MIPS_TLS_GD },
+  { BFD_RELOC_MIPS_TLS_LDM, R_MIPS_TLS_LDM },
+  { BFD_RELOC_MIPS_TLS_DTPREL_HI16, R_MIPS_TLS_DTPREL_HI16 },
+  { BFD_RELOC_MIPS_TLS_DTPREL_LO16, R_MIPS_TLS_DTPREL_LO16 },
+  { BFD_RELOC_MIPS_TLS_GOTTPREL, R_MIPS_TLS_GOTTPREL },
+  { BFD_RELOC_MIPS_TLS_TPREL32, R_MIPS_TLS_TPREL32 },
+  { BFD_RELOC_MIPS_TLS_TPREL64, R_MIPS_TLS_TPREL64 },
+  { BFD_RELOC_MIPS_TLS_TPREL_HI16, R_MIPS_TLS_TPREL_HI16 },
+  { BFD_RELOC_MIPS_TLS_TPREL_LO16, R_MIPS_TLS_TPREL_LO16 }
+};
+
+static const struct elf_reloc_map mips16_reloc_map[] =
+{
+  { BFD_RELOC_MIPS16_JMP, R_MIPS16_26 - R_MIPS16_min },
+  { BFD_RELOC_MIPS16_GPREL, R_MIPS16_GPREL - R_MIPS16_min },
+  { BFD_RELOC_MIPS16_GOT16, R_MIPS16_GOT16 - R_MIPS16_min },
+  { BFD_RELOC_MIPS16_CALL16, R_MIPS16_CALL16 - R_MIPS16_min },
+  { BFD_RELOC_MIPS16_HI16_S, R_MIPS16_HI16 - R_MIPS16_min },
+  { BFD_RELOC_MIPS16_LO16, R_MIPS16_LO16 - R_MIPS16_min },
+};
+
+static const struct elf_reloc_map micromips_reloc_map[] =
+{
+  { BFD_RELOC_MICROMIPS_JMP, R_MICROMIPS_26_S1 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_HI16_S, R_MICROMIPS_HI16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_LO16, R_MICROMIPS_LO16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GPREL16, R_MICROMIPS_GPREL16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_LITERAL, R_MICROMIPS_LITERAL - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GOT16, R_MICROMIPS_GOT16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_7_PCREL_S1, R_MICROMIPS_PC7_S1 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_10_PCREL_S1, R_MICROMIPS_PC10_S1 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_16_PCREL_S1, R_MICROMIPS_PC16_S1 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_CALL16, R_MICROMIPS_CALL16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GOT_DISP, R_MICROMIPS_GOT_DISP - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GOT_PAGE, R_MICROMIPS_GOT_PAGE - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GOT_OFST, R_MICROMIPS_GOT_OFST - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GOT_HI16, R_MICROMIPS_GOT_HI16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GOT_LO16, R_MICROMIPS_GOT_LO16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_SUB, R_MICROMIPS_SUB - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_HIGHER, R_MICROMIPS_HIGHER - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_HIGHEST, R_MICROMIPS_HIGHEST - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_CALL_HI16, R_MICROMIPS_CALL_HI16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_CALL_LO16, R_MICROMIPS_CALL_LO16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_SCN_DISP, R_MICROMIPS_SCN_DISP - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_JALR, R_MICROMIPS_JALR - R_MICROMIPS_min },
+  /* There is no BFD reloc for R_MICROMIPS_HI0_LO16.  */
+  { BFD_RELOC_MICROMIPS_TLS_GD, R_MICROMIPS_TLS_GD - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_TLS_LDM, R_MICROMIPS_TLS_LDM - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_TLS_DTPREL_HI16,
+    R_MICROMIPS_TLS_DTPREL_HI16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_TLS_DTPREL_LO16,
+    R_MICROMIPS_TLS_DTPREL_LO16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_TLS_GOTTPREL,
+    R_MICROMIPS_TLS_GOTTPREL - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_TLS_TPREL_HI16,
+    R_MICROMIPS_TLS_TPREL_HI16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_TLS_TPREL_LO16,
+    R_MICROMIPS_TLS_TPREL_LO16 - R_MICROMIPS_min },
+  /* There is no BFD reloc for R_MICROMIPS_GPREL7_S2.  */
+  /* There is no BFD reloc for R_MICROMIPS_PC23_S2.  */
+};
+
+/* Given a BFD reloc type, return a howto structure.  */
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_type_lookup (bfd *abfd, bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+  reloc_howto_type *howto_table = elf_mips_howto_table_rel;
+  reloc_howto_type *howto16_table = elf_mips16_howto_table_rel;
+  reloc_howto_type *howto_micromips_table = elf_micromips_howto_table_rel;
+
+  for (i = 0; i < sizeof (mips_reloc_map) / sizeof (struct elf_reloc_map);
+       i++)
+    {
+      if (mips_reloc_map[i].bfd_val == code)
+	return &howto_table[(int) mips_reloc_map[i].elf_val];
+    }
+
+  for (i = 0; i < sizeof (mips16_reloc_map) / sizeof (struct elf_reloc_map);
+       i++)
+    {
+      if (mips16_reloc_map[i].bfd_val == code)
+	return &howto16_table[(int) mips16_reloc_map[i].elf_val];
+    }
+
+  for (i = 0; i < sizeof (micromips_reloc_map) / sizeof (struct elf_reloc_map);
+       i++)
+    {
+      if (micromips_reloc_map[i].bfd_val == code)
+	return &howto_micromips_table[(int) micromips_reloc_map[i].elf_val];
+    }
+
+  switch (code)
+    {
+    default:
+      bfd_set_error (bfd_error_bad_value);
+      return NULL;
+
+    case BFD_RELOC_CTOR:
+      /* We need to handle BFD_RELOC_CTOR specially.
+	 Select the right relocation (R_MIPS_32 or R_MIPS_64) based on the
+	 size of addresses of the ABI.  */
+      if ((elf_elfheader (abfd)->e_flags & (E_MIPS_ABI_O64
+					    | E_MIPS_ABI_EABI64)) != 0)
+	return &elf_mips_ctor64_howto;
+      else
+	return &howto_table[(int) R_MIPS_32];
+
+    case BFD_RELOC_VTABLE_INHERIT:
+      return &elf_mips_gnu_vtinherit_howto;
+    case BFD_RELOC_VTABLE_ENTRY:
+      return &elf_mips_gnu_vtentry_howto;
+    case BFD_RELOC_32_PCREL:
+      return &elf_mips_gnu_pcrel32;
+    case BFD_RELOC_MIPS_COPY:
+      return &elf_mips_copy_howto;
+    case BFD_RELOC_MIPS_JUMP_SLOT:
+      return &elf_mips_jump_slot_howto;
+    }
+}
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (elf_mips_howto_table_rel)
+	    / sizeof (elf_mips_howto_table_rel[0]));
+       i++)
+    if (elf_mips_howto_table_rel[i].name != NULL
+	&& strcasecmp (elf_mips_howto_table_rel[i].name, r_name) == 0)
+      return &elf_mips_howto_table_rel[i];
+
+  for (i = 0;
+       i < (sizeof (elf_mips16_howto_table_rel)
+	    / sizeof (elf_mips16_howto_table_rel[0]));
+       i++)
+    if (elf_mips16_howto_table_rel[i].name != NULL
+	&& strcasecmp (elf_mips16_howto_table_rel[i].name, r_name) == 0)
+      return &elf_mips16_howto_table_rel[i];
+
+  for (i = 0;
+       i < (sizeof (elf_micromips_howto_table_rel)
+	    / sizeof (elf_micromips_howto_table_rel[0]));
+       i++)
+    if (elf_micromips_howto_table_rel[i].name != NULL
+	&& strcasecmp (elf_micromips_howto_table_rel[i].name, r_name) == 0)
+      return &elf_micromips_howto_table_rel[i];
+
+  if (strcasecmp (elf_mips_gnu_pcrel32.name, r_name) == 0)
+    return &elf_mips_gnu_pcrel32;
+  if (strcasecmp (elf_mips_gnu_rel16_s2.name, r_name) == 0)
+    return &elf_mips_gnu_rel16_s2;
+  if (strcasecmp (elf_mips_gnu_vtinherit_howto.name, r_name) == 0)
+    return &elf_mips_gnu_vtinherit_howto;
+  if (strcasecmp (elf_mips_gnu_vtentry_howto.name, r_name) == 0)
+    return &elf_mips_gnu_vtentry_howto;
+  if (strcasecmp (elf_mips_copy_howto.name, r_name) == 0)
+    return &elf_mips_copy_howto;
+  if (strcasecmp (elf_mips_jump_slot_howto.name, r_name) == 0)
+    return &elf_mips_jump_slot_howto;
+
+  return NULL;
+}
+
+/* Given a MIPS Elf_Internal_Rel, fill in an arelent structure.  */
+
+static reloc_howto_type *
+mips_elf32_rtype_to_howto (unsigned int r_type,
+			   bfd_boolean rela_p ATTRIBUTE_UNUSED)
+{
+  switch (r_type)
+    {
+    case R_MIPS_GNU_VTINHERIT:
+      return &elf_mips_gnu_vtinherit_howto;
+    case R_MIPS_GNU_VTENTRY:
+      return &elf_mips_gnu_vtentry_howto;
+    case R_MIPS_GNU_REL16_S2:
+      return &elf_mips_gnu_rel16_s2;
+    case R_MIPS_PC32:
+      return &elf_mips_gnu_pcrel32;
+    case R_MIPS_COPY:
+      return &elf_mips_copy_howto;
+    case R_MIPS_JUMP_SLOT:
+      return &elf_mips_jump_slot_howto;
+    default:
+      if (r_type >= R_MICROMIPS_min && r_type < R_MICROMIPS_max)
+	return &elf_micromips_howto_table_rel[r_type - R_MICROMIPS_min];
+      if (r_type >= R_MIPS16_min && r_type < R_MIPS16_max)
+        return &elf_mips16_howto_table_rel[r_type - R_MIPS16_min];
+      BFD_ASSERT (r_type < (unsigned int) R_MIPS_max);
+      return &elf_mips_howto_table_rel[r_type];
+    }
+}
+
+/* Given a MIPS Elf_Internal_Rel, fill in an arelent structure.  */
+
+static void
+mips_info_to_howto_rel (bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst)
+{
+  const struct elf_backend_data *bed;
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  bed = get_elf_backend_data (abfd);
+  cache_ptr->howto = bed->elf_backend_mips_rtype_to_howto (r_type, FALSE);
+
+  /* The addend for a GPREL16 or LITERAL relocation comes from the GP
+     value for the object file.  We get the addend now, rather than
+     when we do the relocation, because the symbol manipulations done
+     by the linker may cause us to lose track of the input BFD.  */
+  if (((*cache_ptr->sym_ptr_ptr)->flags & BSF_SECTION_SYM) != 0
+      && (gprel16_reloc_p (r_type) || literal_reloc_p (r_type)))
+    cache_ptr->addend = elf_gp (abfd);
+}
+
+/* Given a MIPS Elf_Internal_Rela, fill in an arelent structure.  */
+
+static void
+mips_info_to_howto_rela (bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst)
+{
+  mips_info_to_howto_rel (abfd, cache_ptr, dst);
+
+  /* If we ever need to do any extra processing with dst->r_addend
+     (the field omitted in an Elf_Internal_Rel) we can do it here.  */
+}
+
+/* Determine whether a symbol is global for the purposes of splitting
+   the symbol table into global symbols and local symbols.  At least
+   on Irix 5, this split must be between section symbols and all other
+   symbols.  On most ELF targets the split is between static symbols
+   and externally visible symbols.  */
+
+static bfd_boolean
+mips_elf_sym_is_global (bfd *abfd ATTRIBUTE_UNUSED, asymbol *sym)
+{
+  if (SGI_COMPAT (abfd))
+    return (sym->flags & BSF_SECTION_SYM) == 0;
+  else
+    return ((sym->flags & (BSF_GLOBAL | BSF_WEAK | BSF_GNU_UNIQUE)) != 0
+	    || bfd_is_und_section (bfd_get_section (sym))
+	    || bfd_is_com_section (bfd_get_section (sym)));
+}
+
+/* Set the right machine number for a MIPS ELF file.  */
+
+static bfd_boolean
+mips_elf32_object_p (bfd *abfd)
+{
+  unsigned long mach;
+
+  /* Irix 5 and 6 are broken.  Object file symbol tables are not always
+     sorted correctly such that local symbols precede global symbols,
+     and the sh_info field in the symbol table is not always right.  */
+  if (SGI_COMPAT (abfd))
+    elf_bad_symtab (abfd) = TRUE;
+
+  if (ABI_N32_P (abfd))
+    return FALSE;
+
+  mach = _bfd_elf_mips_mach (elf_elfheader (abfd)->e_flags);
+  bfd_default_set_arch_mach (abfd, bfd_arch_mips, mach);
+
+  return TRUE;
+}
+
+/* MIPS ELF local labels start with '$', not 'L'.  */
+
+static bfd_boolean
+mips_elf_is_local_label_name (bfd *abfd, const char *name)
+{
+  if (name[0] == '$')
+    return TRUE;
+
+  /* On Irix 6, the labels go back to starting with '.', so we accept
+     the generic ELF local label syntax as well.  */
+  return _bfd_elf_is_local_label_name (abfd, name);
+}
+
+/* Support for core dump NOTE sections.  */
+static bfd_boolean
+elf32_mips_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  int offset;
+  unsigned int size;
+
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      case 256:		/* Linux/MIPS */
+	/* pr_cursig */
+	elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12);
+
+	/* pr_pid */
+	elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 24);
+
+	/* pr_reg */
+	offset = 72;
+	size = 180;
+
+	break;
+    }
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg",
+					  size, note->descpos + offset);
+}
+
+static bfd_boolean
+elf32_mips_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      case 128:		/* Linux/MIPS elf_prpsinfo */
+	elf_tdata (abfd)->core_program
+	 = _bfd_elfcore_strndup (abfd, note->descdata + 32, 16);
+	elf_tdata (abfd)->core_command
+	 = _bfd_elfcore_strndup (abfd, note->descdata + 48, 80);
+    }
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+
+  {
+    char *command = elf_tdata (abfd)->core_command;
+    int n = strlen (command);
+
+    if (0 < n && command[n - 1] == ' ')
+      command[n - 1] = '\0';
+  }
+
+  return TRUE;
+}
+
+/* Depending on the target vector we generate some version of Irix
+   executables or "normal" MIPS ELF ABI executables.  */
+static irix_compat_t
+elf32_mips_irix_compat (bfd *abfd)
+{
+  if ((abfd->xvec == &bfd_elf32_bigmips_vec)
+      || (abfd->xvec == &bfd_elf32_littlemips_vec))
+    return ict_irix5;
+  else
+    return ict_none;
+}
+
+/* ECOFF swapping routines.  These are used when dealing with the
+   .mdebug section, which is in the ECOFF debugging format.  */
+static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = {
+  /* Symbol table magic number.  */
+  magicSym,
+  /* Alignment of debugging information.  E.g., 4.  */
+  4,
+  /* Sizes of external symbolic information.  */
+  sizeof (struct hdr_ext),
+  sizeof (struct dnr_ext),
+  sizeof (struct pdr_ext),
+  sizeof (struct sym_ext),
+  sizeof (struct opt_ext),
+  sizeof (struct fdr_ext),
+  sizeof (struct rfd_ext),
+  sizeof (struct ext_ext),
+  /* Functions to swap in external symbolic data.  */
+  ecoff_swap_hdr_in,
+  ecoff_swap_dnr_in,
+  ecoff_swap_pdr_in,
+  ecoff_swap_sym_in,
+  ecoff_swap_opt_in,
+  ecoff_swap_fdr_in,
+  ecoff_swap_rfd_in,
+  ecoff_swap_ext_in,
+  _bfd_ecoff_swap_tir_in,
+  _bfd_ecoff_swap_rndx_in,
+  /* Functions to swap out external symbolic data.  */
+  ecoff_swap_hdr_out,
+  ecoff_swap_dnr_out,
+  ecoff_swap_pdr_out,
+  ecoff_swap_sym_out,
+  ecoff_swap_opt_out,
+  ecoff_swap_fdr_out,
+  ecoff_swap_rfd_out,
+  ecoff_swap_ext_out,
+  _bfd_ecoff_swap_tir_out,
+  _bfd_ecoff_swap_rndx_out,
+  /* Function to read in symbolic data.  */
+  _bfd_mips_elf_read_ecoff_info
+};
+
+#define ELF_ARCH			bfd_arch_mips
+#define ELF_TARGET_ID			MIPS_ELF_DATA
+#define ELF_MACHINE_CODE		EM_MIPS
+
+#define elf_backend_collect		TRUE
+#define elf_backend_type_change_ok	TRUE
+#define elf_backend_can_gc_sections	TRUE
+#define elf_info_to_howto		mips_info_to_howto_rela
+#define elf_info_to_howto_rel		mips_info_to_howto_rel
+#define elf_backend_sym_is_global	mips_elf_sym_is_global
+#define elf_backend_object_p		mips_elf32_object_p
+#define elf_backend_symbol_processing	_bfd_mips_elf_symbol_processing
+#define elf_backend_section_processing	_bfd_mips_elf_section_processing
+#define elf_backend_section_from_shdr	_bfd_mips_elf_section_from_shdr
+#define elf_backend_fake_sections	_bfd_mips_elf_fake_sections
+#define elf_backend_section_from_bfd_section \
+					_bfd_mips_elf_section_from_bfd_section
+#define elf_backend_add_symbol_hook	_bfd_mips_elf_add_symbol_hook
+#define elf_backend_link_output_symbol_hook \
+					_bfd_mips_elf_link_output_symbol_hook
+#define elf_backend_create_dynamic_sections \
+					_bfd_mips_elf_create_dynamic_sections
+#define elf_backend_check_relocs	_bfd_mips_elf_check_relocs
+#define elf_backend_merge_symbol_attribute \
+					_bfd_mips_elf_merge_symbol_attribute
+#define elf_backend_get_target_dtag	_bfd_mips_elf_get_target_dtag
+#define elf_backend_adjust_dynamic_symbol \
+					_bfd_mips_elf_adjust_dynamic_symbol
+#define elf_backend_always_size_sections \
+					_bfd_mips_elf_always_size_sections
+#define elf_backend_size_dynamic_sections \
+					_bfd_mips_elf_size_dynamic_sections
+#define elf_backend_init_index_section	_bfd_elf_init_1_index_section
+#define elf_backend_relocate_section	_bfd_mips_elf_relocate_section
+#define elf_backend_finish_dynamic_symbol \
+					_bfd_mips_elf_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections \
+					_bfd_mips_elf_finish_dynamic_sections
+#define elf_backend_final_write_processing \
+					_bfd_mips_elf_final_write_processing
+#define elf_backend_additional_program_headers \
+					_bfd_mips_elf_additional_program_headers
+#define elf_backend_modify_segment_map	_bfd_mips_elf_modify_segment_map
+#define elf_backend_gc_mark_hook	_bfd_mips_elf_gc_mark_hook
+#define elf_backend_gc_sweep_hook	_bfd_mips_elf_gc_sweep_hook
+#define elf_backend_copy_indirect_symbol \
+					_bfd_mips_elf_copy_indirect_symbol
+#define elf_backend_grok_prstatus	elf32_mips_grok_prstatus
+#define elf_backend_grok_psinfo		elf32_mips_grok_psinfo
+#define elf_backend_ecoff_debug_swap	&mips_elf32_ecoff_debug_swap
+
+#define elf_backend_got_header_size	(4 * MIPS_RESERVED_GOTNO)
+#define elf_backend_may_use_rel_p	1
+#define elf_backend_may_use_rela_p	0
+#define elf_backend_default_use_rela_p	0
+#define elf_backend_sign_extend_vma	TRUE
+#define elf_backend_plt_readonly	1
+#define elf_backend_plt_sym_val		_bfd_mips_elf_plt_sym_val
+
+#define elf_backend_discard_info	_bfd_mips_elf_discard_info
+#define elf_backend_ignore_discarded_relocs \
+					_bfd_mips_elf_ignore_discarded_relocs
+#define elf_backend_write_section	_bfd_mips_elf_write_section
+#define elf_backend_mips_irix_compat	elf32_mips_irix_compat
+#define elf_backend_mips_rtype_to_howto	mips_elf32_rtype_to_howto
+#define bfd_elf32_bfd_is_local_label_name \
+					mips_elf_is_local_label_name
+#define bfd_elf32_bfd_is_target_special_symbol \
+					_bfd_mips_elf_is_target_special_symbol
+#define bfd_elf32_find_nearest_line	_bfd_mips_elf_find_nearest_line
+#define bfd_elf32_find_inliner_info	_bfd_mips_elf_find_inliner_info
+#define bfd_elf32_new_section_hook	_bfd_mips_elf_new_section_hook
+#define bfd_elf32_set_section_contents	_bfd_mips_elf_set_section_contents
+#define bfd_elf32_bfd_get_relocated_section_contents \
+				_bfd_elf_mips_get_relocated_section_contents
+#define bfd_elf32_bfd_link_hash_table_create \
+					_bfd_mips_elf_link_hash_table_create
+#define bfd_elf32_bfd_final_link	_bfd_mips_elf_final_link
+#define bfd_elf32_bfd_merge_private_bfd_data \
+					_bfd_mips_elf_merge_private_bfd_data
+#define bfd_elf32_bfd_set_private_flags	_bfd_mips_elf_set_private_flags
+#define bfd_elf32_bfd_print_private_bfd_data \
+					_bfd_mips_elf_print_private_bfd_data
+#define bfd_elf32_bfd_relax_section	_bfd_mips_elf_relax_section
+
+/* Support for SGI-ish mips targets.  */
+#define TARGET_LITTLE_SYM		bfd_elf32_littlemips_vec
+#define TARGET_LITTLE_NAME		"elf32-littlemips"
+#define TARGET_BIG_SYM			bfd_elf32_bigmips_vec
+#define TARGET_BIG_NAME			"elf32-bigmips"
+
+/* The SVR4 MIPS ABI says that this should be 0x10000, but Irix 5 uses
+   a value of 0x1000, and we are compatible.  */
+#define ELF_MAXPAGESIZE			0x1000
+#define ELF_COMMONPAGESIZE		0x1000
+
+#include "elf32-target.h"
+
+/* Support for traditional mips targets.  */
+#undef TARGET_LITTLE_SYM
+#undef TARGET_LITTLE_NAME
+#undef TARGET_BIG_SYM
+#undef TARGET_BIG_NAME
+
+#undef ELF_MAXPAGESIZE
+#undef ELF_COMMONPAGESIZE
+
+#define TARGET_LITTLE_SYM               bfd_elf32_tradlittlemips_vec
+#define TARGET_LITTLE_NAME              "elf32-tradlittlemips"
+#define TARGET_BIG_SYM                  bfd_elf32_tradbigmips_vec
+#define TARGET_BIG_NAME                 "elf32-tradbigmips"
+
+/* The MIPS ABI says at Page 5-1:
+   Virtual addresses and file offsets for MIPS segments are congruent
+   modulo 64 KByte (0x10000) or larger powers of 2.  Because 64 KBytes
+   is the maximum page size, the files are suitable for paging
+   regardless of physical page size.  */
+#define ELF_MAXPAGESIZE			0x10000
+#define ELF_COMMONPAGESIZE		0x1000
+#define elf32_bed			elf32_tradbed
+
+/* Include the target file again for this target.  */
+#include "elf32-target.h"
+
+/* FreeBSD support.  */
+
+#undef TARGET_LITTLE_SYM
+#undef TARGET_LITTLE_NAME
+#undef TARGET_BIG_SYM
+#undef TARGET_BIG_NAME
+
+#define	TARGET_LITTLE_SYM		bfd_elf32_tradlittlemips_freebsd_vec
+#define	TARGET_LITTLE_NAME		"elf32-tradlittlemips-freebsd"
+#define	TARGET_BIG_SYM			bfd_elf32_tradbigmips_freebsd_vec
+#define	TARGET_BIG_NAME			"elf32-tradbigmips-freebsd"
+
+#undef	ELF_OSABI
+#define	ELF_OSABI			ELFOSABI_FREEBSD
+
+/* The kernel recognizes executables as valid only if they carry a
+   "FreeBSD" label in the ELF header.  So we put this label on all
+   executables and (for simplicity) also all other object files.  */
+
+static void
+elf_fbsd_post_process_headers (bfd *abfd, struct bfd_link_info *info)
+{
+  _bfd_elf_set_osabi (abfd, info);
+}
+
+#undef	elf_backend_post_process_headers
+#define	elf_backend_post_process_headers	elf_fbsd_post_process_headers
+#undef	elf32_bed
+#define elf32_bed				elf32_fbsd_tradbed
+
+#include "elf32-target.h"
+/* Implement elf_backend_final_write_processing for VxWorks.  */
+
+static void
+mips_vxworks_final_write_processing (bfd *abfd, bfd_boolean linker)
+{
+  _bfd_mips_elf_final_write_processing (abfd, linker);
+  elf_vxworks_final_write_processing (abfd, linker);
+}
+
+#undef TARGET_LITTLE_SYM
+#undef TARGET_LITTLE_NAME
+#undef TARGET_BIG_SYM
+#undef TARGET_BIG_NAME
+
+#undef ELF_MAXPAGESIZE
+#undef ELF_COMMONPAGESIZE
+
+#define TARGET_LITTLE_SYM               bfd_elf32_littlemips_vxworks_vec
+#define TARGET_LITTLE_NAME              "elf32-littlemips-vxworks"
+#define TARGET_BIG_SYM                  bfd_elf32_bigmips_vxworks_vec
+#define TARGET_BIG_NAME                 "elf32-bigmips-vxworks"
+
+#undef elf32_bed
+#define elf32_bed			elf32_mips_vxworks_bed
+
+#define ELF_MAXPAGESIZE			0x1000
+#define ELF_COMMONPAGESIZE		0x1000
+
+#undef elf_backend_want_got_plt
+#define elf_backend_want_got_plt		1
+#undef elf_backend_want_plt_sym
+#define elf_backend_want_plt_sym		1
+#undef elf_backend_may_use_rel_p
+#define elf_backend_may_use_rel_p		0
+#undef elf_backend_may_use_rela_p
+#define elf_backend_may_use_rela_p		1
+#undef elf_backend_default_use_rela_p
+#define elf_backend_default_use_rela_p		1
+#undef elf_backend_got_header_size
+#define elf_backend_got_header_size		(4 * 3)
+#undef elf_backend_plt_sym_val
+
+#undef elf_backend_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_symbol \
+  _bfd_mips_vxworks_finish_dynamic_symbol
+#undef bfd_elf32_bfd_link_hash_table_create
+#define bfd_elf32_bfd_link_hash_table_create \
+  _bfd_mips_vxworks_link_hash_table_create
+#undef elf_backend_add_symbol_hook
+#define elf_backend_add_symbol_hook \
+  elf_vxworks_add_symbol_hook
+#undef elf_backend_link_output_symbol_hook
+#define elf_backend_link_output_symbol_hook \
+  elf_vxworks_link_output_symbol_hook
+#undef elf_backend_emit_relocs
+#define elf_backend_emit_relocs \
+  elf_vxworks_emit_relocs
+#undef elf_backend_final_write_processing
+#define elf_backend_final_write_processing \
+  mips_vxworks_final_write_processing
+
+#undef elf_backend_additional_program_headers
+#undef elf_backend_modify_segment_map
+#undef elf_backend_symbol_processing
+/* NOTE: elf_backend_rela_normal is not defined for MIPS.  */
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-moxie.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-moxie.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-moxie.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-moxie.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,384 @@
+/* moxie-specific support for 32-bit ELF.
+   Copyright 2009, 2010 Free Software Foundation, Inc.
+
+   Copied from elf32-fr30.c which is..
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/moxie.h"
+
+/* Forward declarations.  */
+
+static reloc_howto_type moxie_elf_howto_table [] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_MOXIE_NONE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MOXIE_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32 bit absolute relocation.  */
+  HOWTO (R_MOXIE_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MOXIE_32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000000,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 10 bit PC-relative relocation.  */
+  HOWTO (R_MOXIE_PCREL10,	/* type.  */
+	 1,			/* rightshift.  */
+	 1,			/* size (0 = byte, 1 = short, 2 = long).  */
+	 10,			/* bitsize.  */
+	 TRUE,			/* pc_relative.  */
+	 0,			/* bitpos.  */
+	 complain_overflow_signed, /* complain_on_overflow.  */
+	 bfd_elf_generic_reloc,	/* special_function.  */
+	 "R_MOXIE_PCREL10",		/* name.  */
+	 FALSE,			/* partial_inplace.  */
+	 0,			/* src_mask.  */
+	 0x000003FF,		/* dst_mask.  */
+	 TRUE),			/* pcrel_offset.  */
+};
+
+/* Map BFD reloc types to MOXIE ELF reloc types.  */
+
+struct moxie_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned int moxie_reloc_val;
+};
+
+static const struct moxie_reloc_map moxie_reloc_map [] =
+{
+  { BFD_RELOC_NONE,            R_MOXIE_NONE },
+  { BFD_RELOC_32,              R_MOXIE_32 },
+  { BFD_RELOC_MOXIE_10_PCREL,  R_MOXIE_PCREL10 },
+};
+
+static reloc_howto_type *
+moxie_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			 bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = sizeof (moxie_reloc_map) / sizeof (moxie_reloc_map[0]);
+       --i;)
+    if (moxie_reloc_map [i].bfd_reloc_val == code)
+      return & moxie_elf_howto_table [moxie_reloc_map[i].moxie_reloc_val];
+
+  return NULL;
+}
+
+static reloc_howto_type *
+moxie_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (moxie_elf_howto_table) / sizeof (moxie_elf_howto_table[0]);
+       i++)
+    if (moxie_elf_howto_table[i].name != NULL
+	&& strcasecmp (moxie_elf_howto_table[i].name, r_name) == 0)
+      return &moxie_elf_howto_table[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for an MOXIE ELF reloc.  */
+
+static void
+moxie_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
+			  arelent *cache_ptr,
+			  Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_MOXIE_max);
+  cache_ptr->howto = & moxie_elf_howto_table [r_type];
+}
+
+/* Perform a single relocation.  By default we use the standard BFD
+   routines, but a few relocs, we have to do them ourselves.  */
+
+static bfd_reloc_status_type
+moxie_final_link_relocate (reloc_howto_type *howto,
+			   bfd *input_bfd,
+			   asection *input_section,
+			   bfd_byte *contents,
+			   Elf_Internal_Rela *rel,
+			   bfd_vma relocation)
+{
+  bfd_reloc_status_type r = bfd_reloc_ok;
+
+  switch (howto->type)
+    {
+    default:
+      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+				    contents, rel->r_offset,
+				    relocation, rel->r_addend);
+    }
+
+  return r;
+}
+
+/* Relocate an MOXIE ELF section.
+
+   The RELOCATE_SECTION function is called by the new ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures; if the section
+   actually uses Rel structures, the r_addend field will always be
+   zero.
+
+   This function is responsible for adjusting the section contents as
+   necessary, and (if using Rela relocs and generating a relocatable
+   output file) adjusting the reloc addend as necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.  */
+
+static bfd_boolean
+moxie_elf_relocate_section (bfd *output_bfd,
+			    struct bfd_link_info *info,
+			    bfd *input_bfd,
+			    asection *input_section,
+			    bfd_byte *contents,
+			    Elf_Internal_Rela *relocs,
+			    Elf_Internal_Sym *local_syms,
+			    asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+
+  symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+  relend     = relocs + input_section->reloc_count;
+
+  for (rel = relocs; rel < relend; rel ++)
+    {
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+      const char *name;
+      int r_type;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      howto  = moxie_elf_howto_table + r_type;
+      h      = NULL;
+      sym    = NULL;
+      sec    = NULL;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections [r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+
+	  name = bfd_elf_string_from_elf_section
+	    (input_bfd, symtab_hdr->sh_link, sym->st_name);
+	  name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name;
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc, warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+
+	  name = h->root.root.string;
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      r = moxie_final_link_relocate (howto, input_bfd, input_section,
+				     contents, rel, relocation);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char * msg = NULL;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      r = info->callbacks->reloc_overflow
+		(info, (h ? &h->root : NULL), name, howto->name,
+		 (bfd_vma) 0, input_bfd, input_section, rel->r_offset);
+	      break;
+
+	    case bfd_reloc_undefined:
+	      r = info->callbacks->undefined_symbol
+		(info, name, input_bfd, input_section, rel->r_offset,
+		 TRUE);
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      break;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      break;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous relocation");
+	      break;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      break;
+	    }
+
+	  if (msg)
+	    r = info->callbacks->warning
+	      (info, msg, name, input_bfd, input_section, rel->r_offset);
+
+	  if (! r)
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+static asection *
+moxie_elf_gc_mark_hook (asection *sec,
+			struct bfd_link_info *info,
+			Elf_Internal_Rela *rel,
+			struct elf_link_hash_entry *h,
+			Elf_Internal_Sym *sym)
+{
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Look through the relocs for a section during the first phase.
+   Since we don't do .gots or .plts, we just need to consider the
+   virtual table relocs for gc.  */
+
+static bfd_boolean
+moxie_elf_check_relocs (bfd *abfd,
+			struct bfd_link_info *info,
+			asection *sec,
+			const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+
+  if (info->relocatable)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+        h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+    }
+
+  return TRUE;
+}
+
+#define ELF_ARCH		bfd_arch_moxie
+#define ELF_MACHINE_CODE	EM_MOXIE
+#define ELF_MAXPAGESIZE		0x1
+
+#define TARGET_BIG_SYM          bfd_elf32_moxie_vec
+#define TARGET_BIG_NAME		"elf32-moxie"
+
+#define elf_info_to_howto_rel			NULL
+#define elf_info_to_howto			moxie_info_to_howto_rela
+#define elf_backend_relocate_section		moxie_elf_relocate_section
+#define elf_backend_gc_mark_hook		moxie_elf_gc_mark_hook
+#define elf_backend_check_relocs                moxie_elf_check_relocs
+
+#define elf_backend_can_gc_sections		1
+#define elf_backend_rela_normal			1
+
+#define bfd_elf32_bfd_reloc_type_lookup		moxie_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup		moxie_reloc_name_lookup
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-msp430.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-msp430.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-msp430.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-msp430.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1179 @@
+/*  MSP430-specific support for 32-bit ELF
+    Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2010
+    Free Software Foundation, Inc.
+    Contributed by Dmitry Diky <diwil@mail.ru>
+
+    This file is part of BFD, the Binary File Descriptor library.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+    MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libiberty.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/msp430.h"
+
+/* Use RELA instead of REL.  */
+#undef USE_REL
+
+static reloc_howto_type elf_msp430_howto_table[] =
+{
+  HOWTO (R_MSP430_NONE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MSP430_NONE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MSP430_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MSP430_32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 13 bit PC relative relocation.  */
+  HOWTO (R_MSP430_10_PCREL,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 10,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MSP430_13_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xfff,			/* src_mask */
+	 0xfff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 16 bit absolute relocation.  */
+  HOWTO (R_MSP430_16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MSP430_16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit absolute relocation for command address.  */
+  HOWTO (R_MSP430_16_PCREL,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MSP430_16_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 16 bit absolute relocation, byte operations.  */
+  HOWTO (R_MSP430_16_BYTE,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MSP430_16_BYTE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit absolute relocation for command address.  */
+  HOWTO (R_MSP430_16_PCREL_BYTE,/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MSP430_16_PCREL_BYTE",/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 13 bit PC relative relocation for complicated polymorphs.  */
+  HOWTO (R_MSP430_2X_PCREL,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 10,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MSP430_2X_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xfff,			/* src_mask */
+	 0xfff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 16 bit relaxable relocation for command address.  */
+  HOWTO (R_MSP430_RL_PCREL,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MSP430_RL_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE)			/* pcrel_offset */
+};
+
+/* Map BFD reloc types to MSP430 ELF reloc types.  */
+
+struct msp430_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned int elf_reloc_val;
+};
+
+static const struct msp430_reloc_map msp430_reloc_map[] =
+  {
+    {BFD_RELOC_NONE,                 R_MSP430_NONE},
+    {BFD_RELOC_32,                   R_MSP430_32},
+    {BFD_RELOC_MSP430_10_PCREL,      R_MSP430_10_PCREL},
+    {BFD_RELOC_16,                   R_MSP430_16_BYTE},
+    {BFD_RELOC_MSP430_16_PCREL,      R_MSP430_16_PCREL},
+    {BFD_RELOC_MSP430_16,            R_MSP430_16},
+    {BFD_RELOC_MSP430_16_PCREL_BYTE, R_MSP430_16_PCREL_BYTE},
+    {BFD_RELOC_MSP430_16_BYTE,       R_MSP430_16_BYTE},
+    {BFD_RELOC_MSP430_2X_PCREL,      R_MSP430_2X_PCREL},
+    {BFD_RELOC_MSP430_RL_PCREL,      R_MSP430_RL_PCREL}
+  };
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
+				 bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0; i < ARRAY_SIZE (msp430_reloc_map); i++)
+    if (msp430_reloc_map[i].bfd_reloc_val == code)
+      return &elf_msp430_howto_table[msp430_reloc_map[i].elf_reloc_val];
+
+  return NULL;
+}
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (elf_msp430_howto_table)
+	    / sizeof (elf_msp430_howto_table[0]));
+       i++)
+    if (elf_msp430_howto_table[i].name != NULL
+	&& strcasecmp (elf_msp430_howto_table[i].name, r_name) == 0)
+      return &elf_msp430_howto_table[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for an MSP430 ELF reloc.  */
+
+static void
+msp430_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED,
+			   arelent * cache_ptr,
+			   Elf_Internal_Rela * dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_MSP430_max);
+  cache_ptr->howto = &elf_msp430_howto_table[r_type];
+}
+
+/* Look through the relocs for a section during the first phase.
+   Since we don't do .gots or .plts, we just need to consider the
+   virtual table relocs for gc.  */
+
+static bfd_boolean
+elf32_msp430_check_relocs (bfd * abfd, struct bfd_link_info * info,
+			   asection * sec, const Elf_Internal_Rela * relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+
+  if (info->relocatable)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+	h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Perform a single relocation.  By default we use the standard BFD
+   routines, but a few relocs, we have to do them ourselves.  */
+
+static bfd_reloc_status_type
+msp430_final_link_relocate (reloc_howto_type * howto, bfd * input_bfd,
+			    asection * input_section, bfd_byte * contents,
+			    Elf_Internal_Rela * rel, bfd_vma relocation)
+{
+  bfd_reloc_status_type r = bfd_reloc_ok;
+  bfd_vma x;
+  bfd_signed_vma srel;
+
+  switch (howto->type)
+    {
+    case R_MSP430_10_PCREL:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation;
+      srel += rel->r_addend;
+      srel -= rel->r_offset;
+      srel -= 2;		/* Branch instructions add 2 to the PC...  */
+      srel -= (input_section->output_section->vma +
+	       input_section->output_offset);
+
+      if (srel & 1)
+	return bfd_reloc_outofrange;
+
+      /* MSP430 addresses commands as words.  */
+      srel >>= 1;
+
+      /* Check for an overflow.  */
+      if (srel < -512 || srel > 511)
+	return bfd_reloc_overflow;
+
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xfc00) | (srel & 0x3ff);
+      bfd_put_16 (input_bfd, x, contents);
+      break;
+
+    case R_MSP430_2X_PCREL:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation;
+      srel += rel->r_addend;
+      srel -= rel->r_offset;
+      srel -= 2;		/* Branch instructions add 2 to the PC...  */
+      srel -= (input_section->output_section->vma +
+	       input_section->output_offset);
+
+      if (srel & 1)
+	return bfd_reloc_outofrange;
+
+      /* MSP430 addresses commands as words.  */
+      srel >>= 1;
+
+      /* Check for an overflow.  */
+      if (srel < -512 || srel > 511)
+	return bfd_reloc_overflow;
+
+      x = bfd_get_16 (input_bfd, contents);
+      x = (x & 0xfc00) | (srel & 0x3ff);
+      bfd_put_16 (input_bfd, x, contents);
+      /* Handle second jump instruction.  */
+      x = bfd_get_16 (input_bfd, contents - 2);
+      srel += 1;
+      x = (x & 0xfc00) | (srel & 0x3ff);
+      bfd_put_16 (input_bfd, x, contents - 2);
+      break;
+
+    case R_MSP430_16_PCREL:
+    case R_MSP430_RL_PCREL:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation;
+      srel += rel->r_addend;
+      srel -= rel->r_offset;
+      /* Only branch instructions add 2 to the PC...  */
+      srel -= (input_section->output_section->vma +
+	       input_section->output_offset);
+
+      if (srel & 1)
+	return bfd_reloc_outofrange;
+
+      bfd_put_16 (input_bfd, srel & 0xffff, contents);
+      break;
+
+    case R_MSP430_16_PCREL_BYTE:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation;
+      srel += rel->r_addend;
+      srel -= rel->r_offset;
+      /* Only branch instructions add 2 to the PC...  */
+      srel -= (input_section->output_section->vma +
+	       input_section->output_offset);
+
+      bfd_put_16 (input_bfd, srel & 0xffff, contents);
+      break;
+
+    case R_MSP430_16_BYTE:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation;
+      srel += rel->r_addend;
+      bfd_put_16 (input_bfd, srel & 0xffff, contents);
+      break;
+
+    case R_MSP430_16:
+      contents += rel->r_offset;
+      srel = (bfd_signed_vma) relocation;
+      srel += rel->r_addend;
+
+      if (srel & 1)
+	return bfd_reloc_notsupported;
+
+      bfd_put_16 (input_bfd, srel & 0xffff, contents);
+      break;
+
+    default:
+      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+				    contents, rel->r_offset,
+				    relocation, rel->r_addend);
+    }
+
+  return r;
+}
+
+/* Relocate an MSP430 ELF section.  */
+
+static bfd_boolean
+elf32_msp430_relocate_section (bfd * output_bfd ATTRIBUTE_UNUSED,
+			       struct bfd_link_info * info,
+			       bfd * input_bfd,
+			       asection * input_section,
+			       bfd_byte * contents,
+			       Elf_Internal_Rela * relocs,
+			       Elf_Internal_Sym * local_syms,
+			       asection ** local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+  relend = relocs + input_section->reloc_count;
+
+  for (rel = relocs; rel < relend; rel++)
+    {
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+      const char *name = NULL;
+      int r_type;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      howto = elf_msp430_howto_table + r_type;
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+
+	  name = bfd_elf_string_from_elf_section
+	      (input_bfd, symtab_hdr->sh_link, sym->st_name);
+	  name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name;
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc, warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      r = msp430_final_link_relocate (howto, input_bfd, input_section,
+				      contents, rel, relocation);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char *msg = (const char *) NULL;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      r = info->callbacks->reloc_overflow
+		  (info, (h ? &h->root : NULL), name, howto->name,
+		   (bfd_vma) 0, input_bfd, input_section,
+		   rel->r_offset);
+	      break;
+
+	    case bfd_reloc_undefined:
+	      r = info->callbacks->undefined_symbol
+		  (info, name, input_bfd, input_section, rel->r_offset, TRUE);
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      break;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      break;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous relocation");
+	      break;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      break;
+	    }
+
+	  if (msg)
+	    r = info->callbacks->warning
+		(info, msg, name, input_bfd, input_section, rel->r_offset);
+
+	  if (!r)
+	    return FALSE;
+	}
+
+    }
+
+  return TRUE;
+}
+
+/* The final processing done just before writing out a MSP430 ELF object
+   file.  This gets the MSP430 architecture right based on the machine
+   number.  */
+
+static void
+bfd_elf_msp430_final_write_processing (bfd * abfd,
+				       bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  unsigned long val;
+
+  switch (bfd_get_mach (abfd))
+    {
+    default:
+    case bfd_mach_msp110:
+      val = E_MSP430_MACH_MSP430x11x1;
+      break;
+
+    case bfd_mach_msp11:
+      val = E_MSP430_MACH_MSP430x11;
+      break;
+
+    case bfd_mach_msp12:
+      val = E_MSP430_MACH_MSP430x12;
+      break;
+
+    case bfd_mach_msp13:
+      val = E_MSP430_MACH_MSP430x13;
+      break;
+
+    case bfd_mach_msp14:
+      val = E_MSP430_MACH_MSP430x14;
+      break;
+
+    case bfd_mach_msp15:
+      val = E_MSP430_MACH_MSP430x15;
+      break;
+
+    case bfd_mach_msp16:
+      val = E_MSP430_MACH_MSP430x16;
+      break;
+
+    case bfd_mach_msp31:
+      val = E_MSP430_MACH_MSP430x31;
+      break;
+
+    case bfd_mach_msp32:
+      val = E_MSP430_MACH_MSP430x32;
+      break;
+
+    case bfd_mach_msp33:
+      val = E_MSP430_MACH_MSP430x33;
+      break;
+
+    case bfd_mach_msp41:
+      val = E_MSP430_MACH_MSP430x41;
+      break;
+
+    case bfd_mach_msp42:
+      val = E_MSP430_MACH_MSP430x42;
+      break;
+
+    case bfd_mach_msp43:
+      val = E_MSP430_MACH_MSP430x43;
+      break;
+
+    case bfd_mach_msp44:
+      val = E_MSP430_MACH_MSP430x44;
+      break;
+    }
+
+  elf_elfheader (abfd)->e_machine = EM_MSP430;
+  elf_elfheader (abfd)->e_flags &= ~EF_MSP430_MACH;
+  elf_elfheader (abfd)->e_flags |= val;
+}
+
+/* Set the right machine number.  */
+
+static bfd_boolean
+elf32_msp430_object_p (bfd * abfd)
+{
+  int e_set = bfd_mach_msp14;
+
+  if (elf_elfheader (abfd)->e_machine == EM_MSP430
+      || elf_elfheader (abfd)->e_machine == EM_MSP430_OLD)
+    {
+      int e_mach = elf_elfheader (abfd)->e_flags & EF_MSP430_MACH;
+
+      switch (e_mach)
+	{
+	default:
+	case E_MSP430_MACH_MSP430x11:
+	  e_set = bfd_mach_msp11;
+	  break;
+
+	case E_MSP430_MACH_MSP430x11x1:
+	  e_set = bfd_mach_msp110;
+	  break;
+
+	case E_MSP430_MACH_MSP430x12:
+	  e_set = bfd_mach_msp12;
+	  break;
+
+	case E_MSP430_MACH_MSP430x13:
+	  e_set = bfd_mach_msp13;
+	  break;
+
+	case E_MSP430_MACH_MSP430x14:
+	  e_set = bfd_mach_msp14;
+	  break;
+
+	case E_MSP430_MACH_MSP430x15:
+	  e_set = bfd_mach_msp15;
+	  break;
+
+	case E_MSP430_MACH_MSP430x16:
+	  e_set = bfd_mach_msp16;
+	  break;
+
+	case E_MSP430_MACH_MSP430x31:
+	  e_set = bfd_mach_msp31;
+	  break;
+
+	case E_MSP430_MACH_MSP430x32:
+	  e_set = bfd_mach_msp32;
+	  break;
+
+	case E_MSP430_MACH_MSP430x33:
+	  e_set = bfd_mach_msp33;
+	  break;
+
+	case E_MSP430_MACH_MSP430x41:
+	  e_set = bfd_mach_msp41;
+	  break;
+
+	case E_MSP430_MACH_MSP430x42:
+	  e_set = bfd_mach_msp42;
+	  break;
+
+	case E_MSP430_MACH_MSP430x43:
+	  e_set = bfd_mach_msp43;
+	  break;
+
+	case E_MSP430_MACH_MSP430x44:
+	  e_set = bfd_mach_msp44;
+	  break;
+	}
+    }
+
+  return bfd_default_set_arch_mach (abfd, bfd_arch_msp430, e_set);
+}
+
+/* These functions handle relaxing for the msp430.
+   Relaxation required only in two cases:
+    - Bad hand coding like jumps from one section to another or
+      from file to file.
+    - Sibling calls. This will affect onlu 'jump label' polymorph. Without
+      relaxing this enlarges code by 2 bytes. Sibcalls implemented but
+      do not work in gcc's port by the reason I do not know.
+   Anyway, if a relaxation required, user should pass -relax option to the
+   linker.
+
+   There are quite a few relaxing opportunities available on the msp430:
+
+   ================================================================
+
+   1. 3 words -> 1 word
+
+   eq      ==      jeq label    		jne +4; br lab
+   ne      !=      jne label    		jeq +4; br lab
+   lt      <       jl  label    		jge +4; br lab
+   ltu     <       jlo label    		lhs +4; br lab
+   ge      >=      jge label    		jl  +4; br lab
+   geu     >=      jhs label    		jlo +4; br lab
+
+   2. 4 words -> 1 word
+
+   ltn     <       jn                      jn  +2; jmp +4; br lab
+
+   3. 4 words -> 2 words
+
+   gt      >       jeq +2; jge label       jeq +6; jl  +4; br label
+   gtu     >       jeq +2; jhs label       jeq +6; jlo +4; br label
+
+   4. 4 words -> 2 words and 2 labels
+
+   leu     <=      jeq label; jlo label    jeq +2; jhs +4; br label
+   le      <=      jeq label; jl  label    jeq +2; jge +4; br label
+   =================================================================
+
+   codemap for first cases is (labels masked ):
+	      eq:	0x2002,0x4010,0x0000 -> 0x2400
+	      ne:	0x2402,0x4010,0x0000 -> 0x2000
+	      lt:	0x3402,0x4010,0x0000 -> 0x3800
+	      ltu:	0x2c02,0x4010,0x0000 -> 0x2800
+	      ge:	0x3802,0x4010,0x0000 -> 0x3400
+	      geu:	0x2802,0x4010,0x0000 -> 0x2c00
+
+  second case:
+	      ltn:	0x3001,0x3c02,0x4010,0x0000 -> 0x3000
+
+  third case:
+	      gt:	0x2403,0x3802,0x4010,0x0000 -> 0x2401,0x3400
+	      gtu:	0x2403,0x2802,0x4010,0x0000 -> 0x2401,0x2c00
+
+  fourth case:
+	      leu:	0x2401,0x2c02,0x4010,0x0000 -> 0x2400,0x2800
+	      le:	0x2401,0x3402,0x4010,0x0000 -> 0x2400,0x3800
+
+  Unspecified case :)
+	      jump:	0x4010,0x0000 -> 0x3c00.  */
+
+#define NUMB_RELAX_CODES	12
+static struct rcodes_s
+{
+  int f0, f1;			/* From code.  */
+  int t0, t1;			/* To code.  */
+  int labels;			/* Position of labels: 1 - one label at first
+				   word, 2 - one at second word, 3 - two
+				   labels at both.  */
+  int cdx;			/* Words to match.  */
+  int bs;			/* Shrink bytes.  */
+  int off;			/* Offset from old label for new code.  */
+  int ncl;			/* New code length.  */
+} rcode[] =
+{/*                               lab,cdx,bs,off,ncl */
+  { 0x0000, 0x0000, 0x3c00, 0x0000, 1, 0, 2, 2,	 2},	/* jump */
+  { 0x0000, 0x2002, 0x2400, 0x0000, 1, 1, 4, 4,	 2},	/* eq */
+  { 0x0000, 0x2402, 0x2000, 0x0000, 1, 1, 4, 4,	 2},	/* ne */
+  { 0x0000, 0x3402, 0x3800, 0x0000, 1, 1, 4, 4,	 2},	/* lt */
+  { 0x0000, 0x2c02, 0x2800, 0x0000, 1, 1, 4, 4,	 2},	/* ltu */
+  { 0x0000, 0x3802, 0x3400, 0x0000, 1, 1, 4, 4,	 2},	/* ge */
+  { 0x0000, 0x2802, 0x2c00, 0x0000, 1, 1, 4, 4,	 2},	/* geu */
+  { 0x3001, 0x3c02, 0x3000, 0x0000, 1, 2, 6, 6,	 2},	/* ltn */
+  { 0x2403, 0x3802, 0x2401, 0x3400, 2, 2, 4, 6,	 4},	/* gt */
+  { 0x2403, 0x2802, 0x2401, 0x2c00, 2, 2, 4, 6,	 4},	/* gtu */
+  { 0x2401, 0x2c02, 0x2400, 0x2800, 3, 2, 4, 6,	 4},	/* leu , 2 labels */
+  { 0x2401, 0x2c02, 0x2400, 0x2800, 3, 2, 4, 6,	 4},	/* le  , 2 labels */
+  { 0, 	    0, 	    0, 	    0, 	    0, 0, 0, 0,  0}
+};
+
+/* Return TRUE if a symbol exists at the given address.  */
+
+static bfd_boolean
+msp430_elf_symbol_address_p (bfd * abfd,
+			     asection * sec,
+			     Elf_Internal_Sym * isym,
+			     bfd_vma addr)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  unsigned int sec_shndx;
+  Elf_Internal_Sym *isymend;
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_link_hash_entry **end_hashes;
+  unsigned int symcount;
+
+  sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+  /* Examine all the local symbols.  */
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  for (isymend = isym + symtab_hdr->sh_info; isym < isymend; isym++)
+    if (isym->st_shndx == sec_shndx && isym->st_value == addr)
+      return TRUE;
+
+  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+	      - symtab_hdr->sh_info);
+  sym_hashes = elf_sym_hashes (abfd);
+  end_hashes = sym_hashes + symcount;
+  for (; sym_hashes < end_hashes; sym_hashes++)
+    {
+      struct elf_link_hash_entry *sym_hash = *sym_hashes;
+
+      if ((sym_hash->root.type == bfd_link_hash_defined
+	   || sym_hash->root.type == bfd_link_hash_defweak)
+	  && sym_hash->root.u.def.section == sec
+	  && sym_hash->root.u.def.value == addr)
+	return TRUE;
+    }
+
+  return FALSE;
+}
+
+/* Adjust all local symbols defined as '.section + 0xXXXX' (.section has sec_shndx)
+    referenced from current and other sections */
+static bfd_boolean
+msp430_elf_relax_adjust_locals(bfd * abfd, asection * sec, bfd_vma addr,
+    int count, unsigned int sec_shndx, bfd_vma toaddr)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *irel;
+  Elf_Internal_Rela *irelend;
+  Elf_Internal_Sym *isym;
+
+  irel = elf_section_data (sec)->relocs;
+  irelend = irel + sec->reloc_count;
+  symtab_hdr = & elf_tdata (abfd)->symtab_hdr;
+  isym = (Elf_Internal_Sym *) symtab_hdr->contents;
+  
+  for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
+    {
+      int sidx = ELF32_R_SYM(irel->r_info);
+      Elf_Internal_Sym *lsym = isym + sidx;
+      
+      /* Adjust symbols referenced by .sec+0xXX */
+      if (irel->r_addend > addr && irel->r_addend < toaddr 
+	  && lsym->st_shndx == sec_shndx)
+	irel->r_addend -= count;
+    }
+  
+  return TRUE;
+}
+
+/* Delete some bytes from a section while relaxing.  */
+
+static bfd_boolean
+msp430_elf_relax_delete_bytes (bfd * abfd, asection * sec, bfd_vma addr,
+			       int count)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  unsigned int sec_shndx;
+  bfd_byte *contents;
+  Elf_Internal_Rela *irel;
+  Elf_Internal_Rela *irelend;
+  bfd_vma toaddr;
+  Elf_Internal_Sym *isym;
+  Elf_Internal_Sym *isymend;
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_link_hash_entry **end_hashes;
+  unsigned int symcount;
+  asection *p;
+
+  sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+  contents = elf_section_data (sec)->this_hdr.contents;
+
+  toaddr = sec->size;
+
+  irel = elf_section_data (sec)->relocs;
+  irelend = irel + sec->reloc_count;
+
+  /* Actually delete the bytes.  */
+  memmove (contents + addr, contents + addr + count,
+	   (size_t) (toaddr - addr - count));
+  sec->size -= count;
+
+  /* Adjust all the relocs.  */
+  symtab_hdr = & elf_tdata (abfd)->symtab_hdr;
+  isym = (Elf_Internal_Sym *) symtab_hdr->contents;
+  for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
+    {
+      /* Get the new reloc address.  */
+      if ((irel->r_offset > addr && irel->r_offset < toaddr))
+	irel->r_offset -= count;
+    }
+
+  for (p = abfd->sections; p != NULL; p = p->next)
+    msp430_elf_relax_adjust_locals(abfd,p,addr,count,sec_shndx,toaddr);
+  
+  /* Adjust the local symbols defined in this section.  */
+  symtab_hdr = & elf_tdata (abfd)->symtab_hdr;
+  isym = (Elf_Internal_Sym *) symtab_hdr->contents;
+  for (isymend = isym + symtab_hdr->sh_info; isym < isymend; isym++)
+    if (isym->st_shndx == sec_shndx
+	&& isym->st_value > addr && isym->st_value < toaddr)
+      isym->st_value -= count;
+
+  /* Now adjust the global symbols defined in this section.  */
+  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+	      - symtab_hdr->sh_info);
+  sym_hashes = elf_sym_hashes (abfd);
+  end_hashes = sym_hashes + symcount;
+  for (; sym_hashes < end_hashes; sym_hashes++)
+    {
+      struct elf_link_hash_entry *sym_hash = *sym_hashes;
+
+      if ((sym_hash->root.type == bfd_link_hash_defined
+	   || sym_hash->root.type == bfd_link_hash_defweak)
+	  && sym_hash->root.u.def.section == sec
+	  && sym_hash->root.u.def.value > addr
+	  && sym_hash->root.u.def.value < toaddr)
+	sym_hash->root.u.def.value -= count;
+    }
+
+  return TRUE;
+}
+
+
+static bfd_boolean
+msp430_elf_relax_section (bfd * abfd, asection * sec,
+			  struct bfd_link_info * link_info,
+			  bfd_boolean * again)
+{
+  Elf_Internal_Shdr * symtab_hdr;
+  Elf_Internal_Rela * internal_relocs;
+  Elf_Internal_Rela * irel;
+  Elf_Internal_Rela * irelend;
+  bfd_byte *          contents = NULL;
+  Elf_Internal_Sym *  isymbuf = NULL;
+
+  /* Assume nothing changes.  */
+  *again = FALSE;
+
+  /* We don't have to do anything for a relocatable link, if
+     this section does not have relocs, or if this is not a
+     code section.  */
+  if (link_info->relocatable
+      || (sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0 || (sec->flags & SEC_CODE) == 0)
+    return TRUE;
+
+  symtab_hdr = & elf_tdata (abfd)->symtab_hdr;
+
+  /* Get a copy of the native relocations.  */
+  internal_relocs =
+    _bfd_elf_link_read_relocs (abfd, sec, NULL, NULL, link_info->keep_memory);
+  if (internal_relocs == NULL)
+    goto error_return;
+
+  /* Walk through them looking for relaxing opportunities.  */
+  irelend = internal_relocs + sec->reloc_count;
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      bfd_vma symval;
+
+      /* If this isn't something that can be relaxed, then ignore
+         this reloc.  */
+      if (ELF32_R_TYPE (irel->r_info) != (int) R_MSP430_RL_PCREL)
+	continue;
+
+      /* Get the section contents if we haven't done so already.  */
+      if (contents == NULL)
+	{
+	  /* Get cached copy if it exists.  */
+	  if (elf_section_data (sec)->this_hdr.contents != NULL)
+	    contents = elf_section_data (sec)->this_hdr.contents;
+	  else if (! bfd_malloc_and_get_section (abfd, sec, &contents))
+	    goto error_return;
+	}
+
+      /* Read this BFD's local symbols if we haven't done so already.  */
+      if (isymbuf == NULL && symtab_hdr->sh_info != 0)
+	{
+	  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	  if (isymbuf == NULL)
+	    isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+					    symtab_hdr->sh_info, 0,
+					    NULL, NULL, NULL);
+	  if (isymbuf == NULL)
+	    goto error_return;
+	}
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+	{
+	  /* A local symbol.  */
+	  Elf_Internal_Sym *isym;
+	  asection *sym_sec;
+
+	  isym = isymbuf + ELF32_R_SYM (irel->r_info);
+	  if (isym->st_shndx == SHN_UNDEF)
+	    sym_sec = bfd_und_section_ptr;
+	  else if (isym->st_shndx == SHN_ABS)
+	    sym_sec = bfd_abs_section_ptr;
+	  else if (isym->st_shndx == SHN_COMMON)
+	    sym_sec = bfd_com_section_ptr;
+	  else
+	    sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+	  symval = (isym->st_value
+		    + sym_sec->output_section->vma + sym_sec->output_offset);
+	}
+      else
+	{
+	  unsigned long indx;
+	  struct elf_link_hash_entry *h;
+
+	  /* An external symbol.  */
+	  indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+	  h = elf_sym_hashes (abfd)[indx];
+	  BFD_ASSERT (h != NULL);
+
+	  if (h->root.type != bfd_link_hash_defined
+	      && h->root.type != bfd_link_hash_defweak)
+	    /* This appears to be a reference to an undefined
+	       symbol.  Just ignore it--it will be caught by the
+	       regular reloc processing.  */
+	    continue;
+
+	  symval = (h->root.u.def.value
+		    + h->root.u.def.section->output_section->vma
+		    + h->root.u.def.section->output_offset);
+	}
+
+      /* For simplicity of coding, we are going to modify the section
+         contents, the section relocs, and the BFD symbol table.  We
+         must tell the rest of the code not to free up this
+         information.  It would be possible to instead create a table
+         of changes which have to be made, as is done in coff-mips.c;
+         that would be more work, but would require less memory when
+         the linker is run.  */
+
+      /* Try to turn a 16bit pc-relative branch into a 10bit pc-relative
+         branch.  */
+      /* Paranoia? paranoia...  */      
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_MSP430_RL_PCREL)
+	{
+	  bfd_vma value = symval;
+
+	  /* Deal with pc-relative gunk.  */
+	  value -= (sec->output_section->vma + sec->output_offset);
+	  value -= irel->r_offset;
+	  value += irel->r_addend;
+
+	  /* See if the value will fit in 10 bits, note the high value is
+	     1016 as the target will be two bytes closer if we are
+	     able to relax. */
+	  if ((long) value < 1016 && (long) value > -1016)
+	    {
+	      int code0 = 0, code1 = 0, code2 = 0;
+	      int i;
+	      struct rcodes_s *rx;
+
+	      /* Get the opcode.  */
+	      if (irel->r_offset >= 6)
+		code0 = bfd_get_16 (abfd, contents + irel->r_offset - 6);
+
+	      if (irel->r_offset >= 4)
+		code1 = bfd_get_16 (abfd, contents + irel->r_offset - 4);
+
+	      code2 = bfd_get_16 (abfd, contents + irel->r_offset - 2);
+
+	      if (code2 != 0x4010)
+		continue;
+
+	      /* Check r4 and r3.  */
+	      for (i = NUMB_RELAX_CODES - 1; i >= 0; i--)
+		{
+		  rx = &rcode[i];
+		  if (rx->cdx == 2 && rx->f0 == code0 && rx->f1 == code1)
+		    break;
+		  else if (rx->cdx == 1 && rx->f1 == code1)
+		    break;
+		  else if (rx->cdx == 0)	/* This is an unconditional jump.  */
+		    break;
+		}
+
+	      /* Check labels:
+		   .Label0:       ; we do not care about this label
+		      jeq    +6
+		   .Label1:       ; make sure there is no label here
+		      jl     +4
+		   .Label2:       ; make sure there is no label here
+		      br .Label_dst
+
+	         So, if there is .Label1 or .Label2 we cannot relax this code.
+	         This actually should not happen, cause for relaxable
+		 instructions we use RL_PCREL reloc instead of 16_PCREL.
+		 Will change this in the future. */
+
+	      if (rx->cdx > 0
+		  && msp430_elf_symbol_address_p (abfd, sec, isymbuf,
+						  irel->r_offset - 2))
+		continue;
+	      if (rx->cdx > 1
+		  && msp430_elf_symbol_address_p (abfd, sec, isymbuf,
+						  irel->r_offset - 4))
+		continue;
+
+	      /* Note that we've changed the relocs, section contents, etc.  */
+	      elf_section_data (sec)->relocs = internal_relocs;
+	      elf_section_data (sec)->this_hdr.contents = contents;
+	      symtab_hdr->contents = (unsigned char *) isymbuf;
+
+	      /* Fix the relocation's type.  */
+	      if (rx->labels == 3)	/* Handle special cases.  */
+		irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					   R_MSP430_2X_PCREL);
+	      else
+		irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					   R_MSP430_10_PCREL);
+
+	      /* Fix the opcode right way.  */
+	      bfd_put_16 (abfd, rx->t0, contents + irel->r_offset - rx->off);
+	      if (rx->t1)
+		bfd_put_16 (abfd, rx->t1,
+			    contents + irel->r_offset - rx->off + 2);
+
+	      /* Delete bytes. */
+	      if (!msp430_elf_relax_delete_bytes (abfd, sec,
+						  irel->r_offset - rx->off +
+						  rx->ncl, rx->bs))
+		goto error_return;
+
+	      /* Handle unconditional jumps.  */
+	      if (rx->cdx == 0)
+		irel->r_offset -= 2;
+
+	      /* That will change things, so, we should relax again.
+	         Note that this is not required, and it may be slow.  */
+	      *again = TRUE;
+	    }
+	}
+    }
+
+  if (isymbuf != NULL && symtab_hdr->contents != (unsigned char *) isymbuf)
+    {
+      if (!link_info->keep_memory)
+	free (isymbuf);
+      else
+	{
+	  /* Cache the symbols for elf_link_input_bfd.  */
+	  symtab_hdr->contents = (unsigned char *) isymbuf;
+	}
+    }
+
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    {
+      if (!link_info->keep_memory)
+	free (contents);
+      else
+	{
+	  /* Cache the section contents for elf_link_input_bfd.  */
+	  elf_section_data (sec)->this_hdr.contents = contents;
+	}
+    }
+
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return TRUE;
+
+error_return:
+  if (isymbuf != NULL && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    free (contents);
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return FALSE;
+}
+
+
+#define ELF_ARCH		bfd_arch_msp430
+#define ELF_MACHINE_CODE	EM_MSP430
+#define ELF_MACHINE_ALT1	EM_MSP430_OLD
+#define ELF_MAXPAGESIZE		1
+#define	ELF_OSABI		ELFOSABI_STANDALONE
+
+#define TARGET_LITTLE_SYM       bfd_elf32_msp430_vec
+#define TARGET_LITTLE_NAME	"elf32-msp430"
+
+#define elf_info_to_howto	             msp430_info_to_howto_rela
+#define elf_info_to_howto_rel	             NULL
+#define elf_backend_relocate_section         elf32_msp430_relocate_section
+#define elf_backend_check_relocs             elf32_msp430_check_relocs
+#define elf_backend_can_gc_sections          1
+#define elf_backend_final_write_processing   bfd_elf_msp430_final_write_processing
+#define elf_backend_object_p		     elf32_msp430_object_p
+#define elf_backend_post_process_headers     _bfd_elf_set_osabi
+#define bfd_elf32_bfd_relax_section	     msp430_elf_relax_section
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-mt.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-mt.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-mt.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-mt.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,618 @@
+/* Morpho Technologies MT specific support for 32-bit ELF
+   Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+   MA 02111-1307, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/mt.h"
+
+/* Prototypes.  */
+static reloc_howto_type * mt_reloc_type_lookup 
+  (bfd *, bfd_reloc_code_real_type);
+
+static void mt_info_to_howto_rela
+  (bfd *, arelent *, Elf_Internal_Rela *);
+
+static bfd_reloc_status_type mt_elf_relocate_hi16
+  (bfd *, Elf_Internal_Rela *, bfd_byte *, bfd_vma);
+
+static bfd_reloc_status_type mt_final_link_relocate
+  (reloc_howto_type *, bfd *, asection *, bfd_byte *, 
+   Elf_Internal_Rela *, bfd_vma);
+
+static bfd_boolean mt_elf_relocate_section
+  (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, 
+   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **);
+
+/* Relocation tables.  */
+static reloc_howto_type mt_elf_howto_table [] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_MT_NONE,           /* type */
+          0,                      /* rightshift */ 
+          2,                      /* size (0 = byte, 1 = short, 2 = long) */ 
+          32,                     /* bitsize */
+          FALSE,                  /* pc_relative */ 
+          0,                      /* bitpos */ 
+          complain_overflow_dont, /* complain_on_overflow */ 
+          bfd_elf_generic_reloc,  /* special_function */ 
+          "R_MT_NONE",          /* name */ 
+          FALSE,                  /* partial_inplace */ 
+          0 ,                     /* src_mask */ 
+          0,                      /* dst_mask */ 
+          FALSE),                 /* pcrel_offset */
+
+  /* A 16 bit absolute relocation.  */
+  HOWTO (R_MT_16,             /* type */
+          0,                      /* rightshift */ 
+          2,                      /* size (0 = byte, 1 = short, 2 = long) */ 
+          16,                     /* bitsize */
+          FALSE,                  /* pc_relative */ 
+          0,                      /* bitpos */ 
+          complain_overflow_dont, /* complain_on_overflow */ 
+          bfd_elf_generic_reloc,  /* special_function */ 
+          "R_MT_16",            /* name */ 
+          FALSE,                  /* partial_inplace */ 
+          0 ,                     /* src_mask */ 
+          0xffff,                 /* dst_mask */ 
+          FALSE),                 /* pcrel_offset */
+
+  /* A 32 bit absolute relocation.  */
+  HOWTO (R_MT_32,             /* type */
+          0,                      /* rightshift */ 
+          2,                      /* size (0 = byte, 1 = short, 2 = long) */ 
+          32,                     /* bitsize */
+          FALSE,                  /* pc_relative */ 
+          0,                      /* bitpos */ 
+          complain_overflow_dont, /* complain_on_overflow */ 
+          bfd_elf_generic_reloc,  /* special_function */ 
+          "R_MT_32",            /* name */ 
+          FALSE,                  /* partial_inplace */ 
+          0 ,                     /* src_mask */ 
+          0xffffffff,             /* dst_mask */ 
+          FALSE),                 /* pcrel_offset */
+
+  /* A 32 bit pc-relative relocation.  */
+  HOWTO (R_MT_32_PCREL,       /* type */
+          0,                      /* rightshift */ 
+          2,                      /* size (0 = byte, 1 = short, 2 = long) */ 
+          32,                     /* bitsize */
+          TRUE,                   /* pc_relative */ 
+          0,                      /* bitpos */ 
+          complain_overflow_dont, /* complain_on_overflow */ 
+          bfd_elf_generic_reloc,  /* special_function */ 
+          "R_MT_32_PCREL",    /* name */ 
+          FALSE,                  /* partial_inplace */ 
+          0 ,                     /* src_mask */ 
+          0xffffffff,             /* dst_mask */ 
+          TRUE),                  /* pcrel_offset */
+
+  /* A 16 bit pc-relative relocation.  */
+  HOWTO (R_MT_PC16,           /* type */
+          0,                      /* rightshift */ 
+          2,                      /* size (0 = byte, 1 = short, 2 = long) */ 
+          16,                     /* bitsize */
+          TRUE,                   /* pc_relative */ 
+          0,                      /* bitpos */ 
+          complain_overflow_signed, /* complain_on_overflow */ 
+          bfd_elf_generic_reloc,  /* special_function */ 
+          "R_MT_PC16",          /* name */ 
+          FALSE,                  /* partial_inplace */ 
+          0,                      /* src_mask */ 
+          0xffff,                 /* dst_mask */ 
+          TRUE),                  /* pcrel_offset */
+
+  /* high 16 bits of symbol value.  */
+  HOWTO (R_MT_HI16,          /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_MT_HI16",        /* name */
+         FALSE,                  /* partial_inplace */
+         0xffff0000,            /* src_mask */
+         0xffff0000,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* Low 16 bits of symbol value.  */
+  HOWTO (R_MT_LO16,          /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_MT_LO16",        /* name */
+         FALSE,                  /* partial_inplace */
+         0xffff,                /* src_mask */
+         0xffff,                /* dst_mask */
+         FALSE),                /* pcrel_offset */
+};
+
+/* Map BFD reloc types to MT ELF reloc types.  */
+
+static reloc_howto_type *
+mt_reloc_type_lookup
+    (bfd *                    abfd ATTRIBUTE_UNUSED,
+     bfd_reloc_code_real_type code)
+{
+  /* Note that the mt_elf_howto_table is indxed by the R_
+     constants.  Thus, the order that the howto records appear in the
+     table *must* match the order of the relocation types defined in
+     include/elf/mt.h.  */
+
+  switch (code)
+    {
+    case BFD_RELOC_NONE:
+      return &mt_elf_howto_table[ (int) R_MT_NONE];
+    case BFD_RELOC_16:
+      return &mt_elf_howto_table[ (int) R_MT_16];
+    case BFD_RELOC_32:
+      return &mt_elf_howto_table[ (int) R_MT_32];
+    case BFD_RELOC_32_PCREL:
+      return &mt_elf_howto_table[ (int) R_MT_32_PCREL];
+    case BFD_RELOC_16_PCREL:
+      return &mt_elf_howto_table[ (int) R_MT_PC16];
+    case BFD_RELOC_HI16:
+      return &mt_elf_howto_table[ (int) R_MT_HI16];
+    case BFD_RELOC_LO16:
+      return &mt_elf_howto_table[ (int) R_MT_LO16];
+
+    default:
+      /* Pacify gcc -Wall.  */
+      return NULL;
+    }
+  return NULL;
+}
+
+static reloc_howto_type *
+mt_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+		      const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (mt_elf_howto_table) / sizeof (mt_elf_howto_table[0]);
+       i++)
+    if (mt_elf_howto_table[i].name != NULL
+	&& strcasecmp (mt_elf_howto_table[i].name, r_name) == 0)
+      return &mt_elf_howto_table[i];
+
+  return NULL;
+}
+
+bfd_reloc_status_type
+mt_elf_relocate_hi16
+    (bfd *               input_bfd,
+     Elf_Internal_Rela * relhi,
+     bfd_byte *          contents,
+     bfd_vma             value)
+{
+  bfd_vma insn;
+
+  insn = bfd_get_32 (input_bfd, contents + relhi->r_offset);
+
+  value += relhi->r_addend;
+  value >>= 16;
+  insn = ((insn & ~0xFFFF) | value);
+
+  bfd_put_32 (input_bfd, insn, contents + relhi->r_offset);
+  return bfd_reloc_ok;
+}
+
+/* XXX: The following code is the result of a cut&paste.  This unfortunate
+   practice is very widespread in the various target back-end files.  */
+
+/* Set the howto pointer for a MT ELF reloc.  */
+
+static void
+mt_info_to_howto_rela
+    (bfd *               abfd ATTRIBUTE_UNUSED,
+     arelent *           cache_ptr,
+     Elf_Internal_Rela * dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  cache_ptr->howto = & mt_elf_howto_table [r_type];
+}
+
+/* Perform a single relocation.  By default we use the standard BFD
+   routines.  */
+
+static bfd_reloc_status_type
+mt_final_link_relocate
+    (reloc_howto_type *  howto,
+     bfd *               input_bfd,
+     asection *          input_section,
+     bfd_byte *          contents,
+     Elf_Internal_Rela * rel,
+     bfd_vma             relocation)
+{
+  return _bfd_final_link_relocate (howto, input_bfd, input_section,
+				   contents, rel->r_offset,
+				   relocation, rel->r_addend);
+}
+
+/* Relocate a MT ELF section.
+   There is some attempt to make this function usable for many architectures,
+   both USE_REL and USE_RELA ['twould be nice if such a critter existed],
+   if only to serve as a learning tool.
+
+   The RELOCATE_SECTION function is called by the new ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures; if the section
+   actually uses Rel structures, the r_addend field will always be
+   zero.
+
+   This function is responsible for adjusting the section contents as
+   necessary, and (if using Rela relocs and generating a relocatable
+   output file) adjusting the reloc addend as necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.  */
+
+static bfd_boolean
+mt_elf_relocate_section
+    (bfd *                   output_bfd ATTRIBUTE_UNUSED,
+     struct bfd_link_info *  info,
+     bfd *                   input_bfd,
+     asection *              input_section,
+     bfd_byte *              contents,
+     Elf_Internal_Rela *     relocs,
+     Elf_Internal_Sym *      local_syms,
+     asection **             local_sections)
+{
+  Elf_Internal_Shdr *           symtab_hdr;
+  struct elf_link_hash_entry ** sym_hashes;
+  Elf_Internal_Rela *           rel;
+  Elf_Internal_Rela *           relend;
+
+  symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+  relend     = relocs + input_section->reloc_count;
+
+  for (rel = relocs; rel < relend; rel ++)
+    {
+      reloc_howto_type *           howto;
+      unsigned long                r_symndx;
+      Elf_Internal_Sym *           sym;
+      asection *                   sec;
+      struct elf_link_hash_entry * h;
+      bfd_vma                      relocation;
+      bfd_reloc_status_type        r;
+      const char *                 name = NULL;
+      int                          r_type;
+      
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      howto  = mt_elf_howto_table + ELF32_R_TYPE (rel->r_info);
+      h      = NULL;
+      sym    = NULL;
+      sec    = NULL;
+      
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections [r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	  
+	  name = bfd_elf_string_from_elf_section
+	    (input_bfd, symtab_hdr->sh_link, sym->st_name);
+	  name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name;
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc;
+	  bfd_boolean warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+
+	  name = h->root.root.string;
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      /* Finally, the sole MT-specific part.  */
+      switch (r_type)
+        {
+        case R_MT_HI16:
+          r = mt_elf_relocate_hi16 (input_bfd, rel, contents, relocation);
+          break;
+	default:
+          r = mt_final_link_relocate (howto, input_bfd, input_section,
+		        		  contents, rel, relocation);
+          break;
+        }
+
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char * msg = (const char *) NULL;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      r = info->callbacks->reloc_overflow
+		(info, (h ? &h->root : NULL), name, howto->name, (bfd_vma) 0,
+		 input_bfd, input_section, rel->r_offset);
+	      break;
+	      
+	    case bfd_reloc_undefined:
+	      r = info->callbacks->undefined_symbol
+		(info, name, input_bfd, input_section, rel->r_offset, TRUE);
+	      break;
+	      
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      break;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous relocation");
+	      break;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      break;
+	    }
+
+	  if (msg)
+	    r = info->callbacks->warning
+	      (info, msg, name, input_bfd, input_section, rel->r_offset);
+
+	  if (! r)
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Look through the relocs for a section during the first phase.
+   Since we don't do .gots or .plts, we just need to consider the
+   virtual table relocs for gc.  */
+ 
+static bfd_boolean
+mt_elf_check_relocs
+    (bfd *                     abfd,
+     struct bfd_link_info *    info,
+     asection *                sec,
+     const Elf_Internal_Rela * relocs)
+{
+  Elf_Internal_Shdr *           symtab_hdr;
+  struct elf_link_hash_entry ** sym_hashes;
+  const Elf_Internal_Rela *     rel;
+  const Elf_Internal_Rela *     rel_end;
+  
+  if (info->relocatable)
+    return TRUE;
+  
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+      
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+        h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return the MACH for an e_flags value.  */
+
+static int
+elf32_mt_machine (bfd *abfd)
+{
+  switch (elf_elfheader (abfd)->e_flags & EF_MT_CPU_MASK)
+    {
+    case EF_MT_CPU_MRISC:	return bfd_mach_ms1;
+    case EF_MT_CPU_MRISC2:	return bfd_mach_mrisc2;
+    case EF_MT_CPU_MS2:		return bfd_mach_ms2;
+    }
+
+  return bfd_mach_ms1;
+}
+
+static bfd_boolean
+mt_elf_object_p (bfd * abfd)
+{
+  bfd_default_set_arch_mach (abfd, bfd_arch_mt, elf32_mt_machine (abfd));
+
+  return TRUE;
+}
+
+/* Function to set the ELF flag bits.  */
+
+static bfd_boolean
+mt_elf_set_private_flags (bfd *    abfd,
+			   flagword flags)
+{
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
+}
+
+static bfd_boolean
+mt_elf_copy_private_bfd_data (bfd * ibfd, bfd * obfd)
+{
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+  
+  BFD_ASSERT (!elf_flags_init (obfd)
+	      || elf_elfheader (obfd)->e_flags == elf_elfheader (ibfd)->e_flags);
+
+  elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
+  elf_flags_init (obfd) = TRUE;
+
+  /* Copy object attributes.  */
+  _bfd_elf_copy_obj_attributes (ibfd, obfd);
+
+  return TRUE;
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+
+static bfd_boolean
+mt_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd)
+{
+  flagword     old_flags, new_flags;
+  bfd_boolean  ok = TRUE;
+
+  /* Check if we have the same endianness.  */
+  if (_bfd_generic_verify_endian_match (ibfd, obfd) == FALSE)
+    return FALSE;
+
+  /* If they're not both mt, then merging is meaningless, so just
+     don't do it.  */
+  if (strcmp (ibfd->arch_info->arch_name, "mt") != 0)
+    return TRUE;
+  if (strcmp (obfd->arch_info->arch_name, "mt") != 0)
+    return TRUE;
+
+  new_flags = elf_elfheader (ibfd)->e_flags;
+  old_flags = elf_elfheader (obfd)->e_flags;
+
+#ifdef DEBUG
+  _bfd_error_handler ("%B: old_flags = 0x%.8lx, new_flags = 0x%.8lx, init = %s",
+		      ibfd, old_flags, new_flags, elf_flags_init (obfd) ? "yes" : "no");
+#endif
+
+  if (!elf_flags_init (obfd))
+    {
+      old_flags = new_flags;
+      elf_flags_init (obfd) = TRUE;
+    }
+  else if ((new_flags & EF_MT_CPU_MASK) != (old_flags & EF_MT_CPU_MASK))
+    {
+      /* CPU has changed.  This is invalid, because MRISC, MRISC2 and
+	 MS2 are not subsets of each other.   */
+      ok = FALSE;
+    }
+  
+  if (ok)
+    {
+      obfd->arch_info = ibfd->arch_info;
+      elf_elfheader (obfd)->e_flags = old_flags;
+    }
+
+  return ok;
+}
+
+static bfd_boolean
+mt_elf_print_private_bfd_data (bfd * abfd, void * ptr)
+{
+  FILE *   file = (FILE *) ptr;
+  flagword flags;
+
+  BFD_ASSERT (abfd != NULL && ptr != NULL);
+  
+  /* Print normal ELF private data.  */
+  _bfd_elf_print_private_bfd_data (abfd, ptr);
+
+  flags = elf_elfheader (abfd)->e_flags;
+  fprintf (file, _("private flags = 0x%lx:"), (unsigned long) flags);
+
+  switch (flags & EF_MT_CPU_MASK)
+    {
+    default:
+    case EF_MT_CPU_MRISC:   fprintf (file, " ms1-16-002");	break;
+    case EF_MT_CPU_MRISC2:  fprintf (file, " ms1-16-003");	break;
+    case EF_MT_CPU_MS2:     fprintf (file, " ms2");	break;
+    }
+
+  fputc ('\n', file);
+
+  return TRUE;
+}
+
+
+#define TARGET_BIG_SYM	 bfd_elf32_mt_vec
+#define TARGET_BIG_NAME  "elf32-mt"
+
+#define ELF_ARCH	 bfd_arch_mt
+#define ELF_MACHINE_CODE EM_MT
+#define ELF_MAXPAGESIZE  1 /* No pages on the MT.  */
+
+#define elf_info_to_howto_rel			NULL
+#define elf_info_to_howto			mt_info_to_howto_rela
+
+#define elf_backend_relocate_section		mt_elf_relocate_section
+
+#define bfd_elf32_bfd_reloc_type_lookup	        mt_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup   mt_reloc_name_lookup
+
+#define elf_backend_check_relocs                mt_elf_check_relocs
+#define elf_backend_object_p		        mt_elf_object_p
+#define elf_backend_rela_normal			1
+
+#define elf_backend_can_gc_sections		1
+
+#define bfd_elf32_bfd_set_private_flags		mt_elf_set_private_flags
+#define bfd_elf32_bfd_copy_private_bfd_data	mt_elf_copy_private_bfd_data
+#define bfd_elf32_bfd_merge_private_bfd_data	mt_elf_merge_private_bfd_data
+#define bfd_elf32_bfd_print_private_bfd_data	mt_elf_print_private_bfd_data
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-openrisc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-openrisc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-openrisc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-openrisc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,566 @@
+/* OpenRISC-specific support for 32-bit ELF.
+   Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007
+   Free Software Foundation, Inc.
+   Contributed by Johan Rydberg, jrydberg@opencores.org
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/openrisc.h"
+#include "libiberty.h"
+
+static reloc_howto_type openrisc_elf_howto_table[] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_OPENRISC_NONE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_OPENRISC_NONE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A PC relative 26 bit relocation, right shifted by 2.  */
+  HOWTO (R_OPENRISC_INSN_REL_26, /* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_OPENRISC_INSN_REL_26", /* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000000,		/* src_mask */
+	 0x03ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A absolute 26 bit relocation, right shifted by 2.  */
+  HOWTO (R_OPENRISC_INSN_ABS_26, /* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_OPENRISC_INSN_ABS_26", /* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000000,		/* src_mask */
+	 0x03ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_OPENRISC_LO_16_IN_INSN, /* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_OPENRISC_LO_16_IN_INSN", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_OPENRISC_HI_16_IN_INSN, /* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_OPENRISC_HI_16_IN_INSN",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An 8 bit absolute relocation.  */
+  HOWTO (R_OPENRISC_8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_OPENRISC_8",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000,		/* src_mask */
+	 0x00ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit absolute relocation.  */
+  HOWTO (R_OPENRISC_16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_OPENRISC_16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x00000000,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32 bit absolute relocation.  */
+  HOWTO (R_OPENRISC_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_OPENRISC_32",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x00000000,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_OPENRISC_GNU_VTINHERIT, /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_OPENRISC_GNU_VTINHERIT", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage.  */
+  HOWTO (R_OPENRISC_GNU_VTENTRY, /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_elf_rel_vtable_reloc_fn, /* special_function */
+	 "R_OPENRISC_GNU_VTENTRY", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+/* Map BFD reloc types to OpenRISC ELF reloc types.  */
+
+struct openrisc_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned int openrisc_reloc_val;
+};
+
+static const struct openrisc_reloc_map openrisc_reloc_map[] =
+{
+  { BFD_RELOC_NONE, 		R_OPENRISC_NONE },
+  { BFD_RELOC_32, 		R_OPENRISC_32 },
+  { BFD_RELOC_16, 		R_OPENRISC_16 },
+  { BFD_RELOC_8, 		R_OPENRISC_8 },
+  { BFD_RELOC_OPENRISC_REL_26,	R_OPENRISC_INSN_REL_26 },
+  { BFD_RELOC_OPENRISC_ABS_26,	R_OPENRISC_INSN_ABS_26 },
+  { BFD_RELOC_HI16, 		R_OPENRISC_HI_16_IN_INSN },
+  { BFD_RELOC_LO16, 		R_OPENRISC_LO_16_IN_INSN },
+  { BFD_RELOC_VTABLE_INHERIT,	R_OPENRISC_GNU_VTINHERIT },
+  { BFD_RELOC_VTABLE_ENTRY, 	R_OPENRISC_GNU_VTENTRY }
+};
+
+static reloc_howto_type *
+openrisc_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
+			    bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = ARRAY_SIZE (openrisc_reloc_map); --i;)
+    if (openrisc_reloc_map[i].bfd_reloc_val == code)
+      return & openrisc_elf_howto_table[openrisc_reloc_map[i].
+				       openrisc_reloc_val];
+
+  return NULL;
+}
+
+static reloc_howto_type *
+openrisc_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (openrisc_elf_howto_table)
+	    / sizeof (openrisc_elf_howto_table[0]));
+       i++)
+    if (openrisc_elf_howto_table[i].name != NULL
+	&& strcasecmp (openrisc_elf_howto_table[i].name, r_name) == 0)
+      return &openrisc_elf_howto_table[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for an OpenRISC ELF reloc.  */
+
+static void
+openrisc_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED,
+			     arelent * cache_ptr,
+			     Elf_Internal_Rela * dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_OPENRISC_max);
+  cache_ptr->howto = & openrisc_elf_howto_table[r_type];
+}
+
+/* Perform a single relocation.  By default we use the standard BFD
+   routines, but a few relocs, we have to do them ourselves.  */
+
+static bfd_reloc_status_type
+openrisc_final_link_relocate (reloc_howto_type *howto,
+			      bfd *input_bfd,
+			      asection *input_section,
+			      bfd_byte *contents,
+			      Elf_Internal_Rela *rel,
+			      bfd_vma relocation)
+{
+  bfd_reloc_status_type r = bfd_reloc_ok;
+
+  switch (howto->type)
+    {
+    case R_OPENRISC_LO_16_IN_INSN:
+      relocation &= 0xffff;
+      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+				    contents, rel->r_offset,
+				    relocation, rel->r_addend);
+      break;
+
+    default:
+      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+				    contents, rel->r_offset,
+				    relocation, rel->r_addend);
+    }
+
+  return r;
+}
+
+/* Relocate an OpenRISC ELF section.
+
+   The RELOCATE_SECTION function is called by the new ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures; if the section
+   actually uses Rel structures, the r_addend field will always be
+   zero.
+
+   This function is responsible for adjusting the section contents as
+   necessary, and (if using Rela relocs and generating a relocatable
+   output file) adjusting the reloc addend as necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.  */
+
+static bfd_boolean
+openrisc_elf_relocate_section (bfd *output_bfd,
+			       struct bfd_link_info *info,
+			       bfd *input_bfd,
+			       asection *input_section,
+			       bfd_byte *contents,
+			       Elf_Internal_Rela *relocs,
+			       Elf_Internal_Sym *local_syms,
+			       asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+  relend = relocs + input_section->reloc_count;
+
+  for (rel = relocs; rel < relend; rel++)
+    {
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+      const char *name = NULL;
+      int r_type;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      if (r_type == R_OPENRISC_GNU_VTINHERIT
+	  || r_type == R_OPENRISC_GNU_VTENTRY)
+	continue;
+
+      if ((unsigned int) r_type >
+	  (sizeof openrisc_elf_howto_table / sizeof (reloc_howto_type)))
+	abort ();
+
+      howto = openrisc_elf_howto_table + ELF32_R_TYPE (rel->r_info);
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+
+	  name = bfd_elf_string_from_elf_section
+	    (input_bfd, symtab_hdr->sh_link, sym->st_name);
+	  name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name;
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc, warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      r = openrisc_final_link_relocate (howto, input_bfd, input_section,
+					contents, rel, relocation);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char *msg = NULL;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      r = info->callbacks->reloc_overflow
+		(info, (h ? &h->root : NULL), name, howto->name,
+		 (bfd_vma) 0, input_bfd, input_section, rel->r_offset);
+	      break;
+
+	    case bfd_reloc_undefined:
+	      r = info->callbacks->undefined_symbol
+		(info, name, input_bfd, input_section, rel->r_offset, TRUE);
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      break;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      break;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous relocation");
+	      break;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      break;
+	    }
+
+	  if (msg)
+	    r = info->callbacks->warning
+	      (info, msg, name, input_bfd, input_section, rel->r_offset);
+
+	  if (!r)
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+static asection *
+openrisc_elf_gc_mark_hook (asection *sec,
+			   struct bfd_link_info *info,
+			   Elf_Internal_Rela *rel,
+			   struct elf_link_hash_entry *h,
+			   Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_OPENRISC_GNU_VTINHERIT:
+      case R_OPENRISC_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Look through the relocs for a section during the first phase.
+   Since we don't do .gots or .plts, we just need to consider the
+   virtual table relocs for gc.  */
+
+static bfd_boolean
+openrisc_elf_check_relocs (bfd *abfd,
+			   struct bfd_link_info *info,
+			   asection *sec,
+			   const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+
+  if (info->relocatable)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+	h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      switch (ELF32_R_TYPE (rel->r_info))
+	{
+	  /* This relocation describes the C++ object vtable hierarchy.
+	     Reconstruct it for later use during GC.  */
+	case R_OPENRISC_GNU_VTINHERIT:
+	  if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+	    return FALSE;
+	  break;
+
+	  /* This relocation describes which C++ vtable entries are actually
+	     used.  Record for later use during GC.  */
+	case R_OPENRISC_GNU_VTENTRY:
+	  BFD_ASSERT (h != NULL);
+	  if (h != NULL
+	      && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+	    return FALSE;
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Set the right machine number.  */
+
+static bfd_boolean
+openrisc_elf_object_p (bfd *abfd)
+{
+  bfd_default_set_arch_mach (abfd, bfd_arch_openrisc, 0);
+  return TRUE;
+}
+
+/* Store the machine number in the flags field.  */
+
+static void
+openrisc_elf_final_write_processing (bfd *abfd,
+				     bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  unsigned long val;
+
+  switch (bfd_get_mach (abfd))
+    {
+    default:
+      val = 0;
+      break;
+    }
+
+  elf_elfheader (abfd)->e_flags &= ~0xf;
+  elf_elfheader (abfd)->e_flags |= val;
+}
+
+
+#define ELF_ARCH			bfd_arch_openrisc
+#define ELF_MACHINE_CODE		EM_OPENRISC
+#define ELF_MACHINE_ALT1		EM_OPENRISC_OLD
+#define ELF_MAXPAGESIZE			0x1000
+
+#define TARGET_BIG_SYM			bfd_elf32_openrisc_vec
+#define TARGET_BIG_NAME			"elf32-openrisc"
+
+#define elf_info_to_howto_rel		NULL
+#define elf_info_to_howto		openrisc_info_to_howto_rela
+#define elf_backend_relocate_section	openrisc_elf_relocate_section
+#define elf_backend_gc_mark_hook	openrisc_elf_gc_mark_hook
+#define elf_backend_check_relocs	openrisc_elf_check_relocs
+
+#define elf_backend_can_gc_sections	1
+#define elf_backend_rela_normal		1
+
+#define bfd_elf32_bfd_reloc_type_lookup openrisc_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup openrisc_reloc_name_lookup
+
+#define elf_backend_object_p                openrisc_elf_object_p
+#define elf_backend_final_write_processing  openrisc_elf_final_write_processing
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-or32.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-or32.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-or32.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-or32.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,514 @@
+/* OR32-specific support for 32-bit ELF
+   Copyright 2002, 2004, 2005, 2007 Free Software Foundation, Inc.
+   Contributed by Ivan Guzvinec  <ivang@opencores.org>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/or32.h"
+#include "libiberty.h"
+
+/* Try to minimize the amount of space occupied by relocation tables
+   on the ROM (not that the ROM won't be swamped by other ELF overhead).  */
+#define USE_REL	1
+
+/* Set the right machine number for an OR32 ELF file.  */
+
+static bfd_boolean
+or32_elf_object_p (bfd *abfd)
+{
+  (void) bfd_default_set_arch_mach (abfd, bfd_arch_or32, 0);
+  return TRUE;
+}
+
+/* The final processing done just before writing out an OR32 ELF object file.
+   This gets the OR32 architecture right based on the machine number.  */
+
+static void
+or32_elf_final_write_processing (bfd *abfd,
+				 bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  elf_elfheader (abfd)->e_flags &=~ EF_OR32_MACH;
+}
+
+static bfd_reloc_status_type
+or32_elf_32_reloc (bfd *abfd,
+		   arelent *reloc_entry,
+		   asymbol *symbol,
+		   void * data,
+		   asection *input_section,
+		   bfd *output_bfd,
+		   char **error_message ATTRIBUTE_UNUSED)
+{
+  if (output_bfd != NULL)
+    {
+      unsigned long insn;
+      bfd_size_type addr = reloc_entry->address;
+
+      reloc_entry->address += input_section->output_offset;
+
+      insn = bfd_get_32 (abfd, (bfd_byte *) data + addr);
+      insn += symbol->section->output_section->vma;
+      insn += symbol->section->output_offset;
+      insn += symbol->value;
+      bfd_put_32 (abfd, insn, (bfd_byte *) data + addr);
+
+      return bfd_reloc_ok;
+    }
+
+  return bfd_reloc_continue;
+}
+
+static bfd_reloc_status_type
+or32_elf_16_reloc (bfd *abfd,
+		   arelent *reloc_entry,
+		   asymbol *symbol,
+		   void * data,
+		   asection *input_section,
+		   bfd *output_bfd,
+		   char **error_message ATTRIBUTE_UNUSED)
+{
+  if (output_bfd != NULL)
+    {
+      unsigned short insn;
+      bfd_size_type addr = reloc_entry->address;
+
+      reloc_entry->address += input_section->output_offset;
+
+      insn = bfd_get_16 (abfd, (bfd_byte *) data + addr);
+      insn += symbol->section->output_section->vma;
+      insn += symbol->section->output_offset;
+      insn += symbol->value;
+      bfd_put_16 (abfd, insn, (bfd_byte *) data + addr);
+
+      return bfd_reloc_ok;
+    }
+
+  return bfd_reloc_continue;
+}
+
+static bfd_reloc_status_type
+or32_elf_8_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+		  arelent *reloc_entry,
+		  asymbol *symbol,
+		  void * data,
+		  asection *input_section,
+		  bfd *output_bfd,
+		  char **error_message ATTRIBUTE_UNUSED)
+{
+  if (output_bfd != NULL)
+    {
+      unsigned char insn;
+      bfd_size_type addr = reloc_entry->address;
+
+      reloc_entry->address += input_section->output_offset;
+
+      insn = bfd_get_8 (abfd, (bfd_byte *) data + addr);
+      insn += symbol->section->output_section->vma;
+      insn += symbol->section->output_offset;
+      insn += symbol->value;
+      bfd_put_8 (abfd, insn, (bfd_byte *) data + addr);
+
+      return bfd_reloc_ok;
+    }
+
+  return bfd_reloc_continue;
+}
+
+/* Do a R_OR32_CONSTH relocation.  This has to be done in combination
+   with a R_OR32_CONST reloc, because there is a carry from the LO16 to
+   the HI16.  Here we just save the information we need; we do the
+   actual relocation when we see the LO16.  OR32 ELF requires that the
+   LO16 immediately follow the HI16.  As a GNU extension, we permit an
+   arbitrary number of HI16 relocs to be associated with a single LO16
+   reloc.  This extension permits gcc to output the HI and LO relocs
+   itself. This code is copied from the elf32-mips.c.  */
+
+struct or32_consth
+{
+  struct or32_consth *next;
+  bfd_byte *addr;
+  bfd_vma addend;
+};
+
+/* FIXME: This should not be a static variable.  */
+
+static struct or32_consth *or32_consth_list;
+
+static bfd_reloc_status_type
+or32_elf_consth_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+		       arelent *reloc_entry,
+		       asymbol *symbol,
+		       void * data,
+		       asection *input_section,
+		       bfd *output_bfd,
+		       char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_reloc_status_type ret;
+  bfd_vma relocation;
+  struct or32_consth *n;
+
+  ret = bfd_reloc_ok;
+
+  if (bfd_is_und_section (symbol->section)
+      && output_bfd == NULL)
+    ret = bfd_reloc_undefined;
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  relocation += reloc_entry->addend;
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  /* Save the information, and let LO16 do the actual relocation.  */
+  n = bfd_malloc (sizeof *n);
+  if (n == NULL)
+    return bfd_reloc_outofrange;
+  n->addr = (bfd_byte *) data + reloc_entry->address;
+  n->addend = relocation;
+  n->next = or32_consth_list;
+  or32_consth_list = n;
+
+  if (output_bfd != NULL)
+    reloc_entry->address += input_section->output_offset;
+
+  return ret;
+}
+
+/* Do a R_OR32_CONST relocation.  This is a straightforward 16 bit
+   inplace relocation; this function exists in order to do the
+   R_OR32_CONSTH relocation described above.  */
+
+static bfd_reloc_status_type
+or32_elf_const_reloc (bfd *abfd,
+		      arelent *reloc_entry,
+		      asymbol *symbol,
+		      void * data,
+		      asection *input_section,
+		      bfd *output_bfd,
+		      char **error_message)
+{
+  if (or32_consth_list != NULL)
+    {
+      struct or32_consth *l;
+
+      l = or32_consth_list;
+      while (l != NULL)
+	{
+	  unsigned long insn;
+	  unsigned long val;
+          unsigned long vallo;
+	  struct or32_consth *next;
+
+	  /* Do the HI16 relocation.  Note that we actually don't need
+	     to know anything about the LO16 itself, except where to
+	     find the low 16 bits of the addend needed by the LO16.  */
+	  insn = bfd_get_32 (abfd, l->addr);
+	  vallo = (bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address)
+		   & 0xffff);
+	  val = ((insn & 0xffff) << 16) + vallo;
+	  val += l->addend;
+
+	  insn = (insn &~ 0xffff) | ((val >> 16) & 0xffff);
+	  bfd_put_32 (abfd, insn, l->addr);
+
+	  next = l->next;
+	  free (l);
+	  l = next;
+	}
+
+      or32_consth_list = NULL;
+    }
+
+  if (output_bfd != NULL)
+    {
+      unsigned long insn, tmp;
+      bfd_size_type addr = reloc_entry->address;
+
+      reloc_entry->address += input_section->output_offset;
+
+      insn = bfd_get_32 (abfd, (bfd_byte *) data + addr);
+      tmp = insn & 0x0000ffff;
+      tmp += symbol->section->output_section->vma;
+      tmp += symbol->section->output_offset;
+      tmp += symbol->value;
+      insn = (insn & 0xffff0000) | (tmp & 0x0000ffff);
+      bfd_put_32 (abfd, insn, (bfd_byte *) data + addr);
+
+      return bfd_reloc_ok;
+    }
+
+  /* Now do the LO16 reloc in the usual way.  */
+  return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+				input_section, output_bfd, error_message);
+}
+
+static bfd_reloc_status_type
+or32_elf_jumptarg_reloc (bfd *abfd,
+			 arelent *reloc_entry,
+			 asymbol *symbol ATTRIBUTE_UNUSED,
+			 void * data,
+			 asection *input_section,
+			 bfd *output_bfd,
+			 char **error_message ATTRIBUTE_UNUSED)
+{
+  if (output_bfd != NULL)
+    {
+      unsigned long insn, tmp;
+      bfd_size_type addr = reloc_entry->address;
+
+      reloc_entry->address += input_section->output_offset;
+
+      insn = bfd_get_32 (abfd, (bfd_byte *) data + addr);
+      tmp = insn | 0xfc000000;
+      tmp -= (input_section->output_offset >> 2);
+      insn = (insn & 0xfc000000) | (tmp & 0x03ffffff);
+      bfd_put_32 (abfd, insn, (bfd_byte *) data + addr);
+
+      return bfd_reloc_ok;
+    }
+
+  return bfd_reloc_continue;
+}
+
+static reloc_howto_type elf_or32_howto_table[] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_OR32_NONE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_OR32_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A standard 32 bit relocation.  */
+  HOWTO (R_OR32_32,		/* type */
+	 0,	                /* rightshift */
+	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 32,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 or32_elf_32_reloc, 	/* special_function */
+	 "R_OR32_32",		/* name */
+	 FALSE,	                /* partial_inplace */
+	 0xffffffff,	        /* src_mask */
+	 0xffffffff,   		/* dst_mask */
+	 FALSE),                /* pcrel_offset */
+
+  /* A standard 16 bit relocation.  */
+  HOWTO (R_OR32_16,		/* type */
+	 0,	                /* rightshift */
+	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 16,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 or32_elf_16_reloc, 	/* special_function */
+	 "R_OR32_16",		/* name */
+	 FALSE,	                /* partial_inplace */
+	 0x0000ffff,	        /* src_mask */
+	 0x0000ffff,   		/* dst_mask */
+	 FALSE),                /* pcrel_offset */
+
+  /* A standard 8 bit relocation.  */
+  HOWTO (R_OR32_8,		/* type */
+	 0,	                /* rightshift */
+	 0,	                /* size (0 = byte, 1 = short, 2 = long) */
+	 8,	                /* bitsize */
+	 FALSE,	                /* pc_relative */
+	 0,	                /* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 or32_elf_8_reloc, 	/* special_function */
+	 "R_OR32_8",		/* name */
+	 FALSE,	                /* partial_inplace */
+	 0x000000ff,	        /* src_mask */
+	 0x000000ff,   		/* dst_mask */
+	 FALSE),                /* pcrel_offset */
+
+  /* A standard low 16 bit relocation.  */
+  HOWTO (R_OR32_CONST,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 or32_elf_const_reloc,	/* special_function */
+	 "R_OR32_CONST",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A standard high 16 bit relocation.  */
+  HOWTO (R_OR32_CONSTH,		/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 or32_elf_consth_reloc,	/* special_function */
+	 "R_OR32_CONSTH",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff0000,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A standard branch relocation.  */
+  HOWTO (R_OR32_JUMPTARG,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 28,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 or32_elf_jumptarg_reloc,/* special_function */
+	 "R_OR32_JUMPTARG",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x03ffffff,		/* dst_mask */
+	 TRUE), 		/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_OR32_GNU_VTINHERIT, /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         NULL,                  /* special_function */
+         "R_OR32_GNU_VTINHERIT", /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage.  */
+  HOWTO (R_OR32_GNU_VTENTRY,     /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
+         "R_OR32_GNU_VTENTRY",   /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+};
+
+/* Map BFD reloc types to OR32 ELF reloc types.  */
+
+struct or32_reloc_map
+{
+  bfd_reloc_code_real_type  bfd_reloc_val;
+  unsigned char             elf_reloc_val;
+};
+
+static const struct or32_reloc_map or32_reloc_map[] =
+{
+  { BFD_RELOC_NONE, R_OR32_NONE },
+  { BFD_RELOC_32, R_OR32_32 },
+  { BFD_RELOC_16, R_OR32_16 },
+  { BFD_RELOC_8, R_OR32_8 },
+  { BFD_RELOC_LO16, R_OR32_CONST },
+  { BFD_RELOC_HI16, R_OR32_CONSTH },
+  { BFD_RELOC_32_GOT_PCREL, R_OR32_JUMPTARG },
+  { BFD_RELOC_VTABLE_INHERIT, R_OR32_GNU_VTINHERIT },
+  { BFD_RELOC_VTABLE_ENTRY, R_OR32_GNU_VTENTRY },
+};
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = ARRAY_SIZE (or32_reloc_map); i--;)
+    if (or32_reloc_map[i].bfd_reloc_val == code)
+      return &elf_or32_howto_table[or32_reloc_map[i].elf_reloc_val];
+
+  return NULL;
+}
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (elf_or32_howto_table) / sizeof (elf_or32_howto_table[0]);
+       i++)
+    if (elf_or32_howto_table[i].name != NULL
+	&& strcasecmp (elf_or32_howto_table[i].name, r_name) == 0)
+      return &elf_or32_howto_table[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for an OR32 ELF reloc.  */
+
+static void
+or32_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+			arelent *cache_ptr,
+			Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_OR32_max);
+  cache_ptr->howto = &elf_or32_howto_table[r_type];
+}
+
+#define TARGET_LITTLE_SYM	bfd_elf32_or32_little_vec
+#define TARGET_LITTLE_NAME	"elf32-littleor32"
+#define TARGET_BIG_SYM		bfd_elf32_or32_big_vec
+#define TARGET_BIG_NAME		"elf32-or32"
+#define ELF_ARCH		bfd_arch_or32
+#define ELF_MACHINE_CODE	EM_OR32
+#define ELF_MAXPAGESIZE		0x1000
+
+#define elf_info_to_howto	0
+#define elf_info_to_howto_rel	or32_info_to_howto_rel
+#define elf_backend_object_p	or32_elf_object_p
+#define elf_backend_final_write_processing \
+				or32_elf_final_write_processing
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-pj.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-pj.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-pj.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-pj.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,353 @@
+/* picoJava specific support for 32-bit ELF
+   Copyright 1999, 2000, 2001, 2002, 2005, 2007
+   Free Software Foundation, Inc.
+   Contributed by Steve Chamberlan of Transmeta (sac@pobox.com).
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/pj.h"
+
+/* This function is used for normal relocs.  This is like the COFF
+   function, and is almost certainly incorrect for other ELF targets.  */
+
+static bfd_reloc_status_type
+pj_elf_reloc (bfd *abfd,
+	      arelent *reloc_entry,
+	      asymbol *symbol_in,
+	      void * data,
+	      asection *input_section,
+	      bfd *output_bfd,
+	      char **error_message ATTRIBUTE_UNUSED)
+{
+  unsigned long insn;
+  bfd_vma sym_value;
+  enum elf_pj_reloc_type r_type;
+  bfd_vma addr = reloc_entry->address;
+  bfd_byte *hit_data = addr + (bfd_byte *) data;
+
+  r_type = (enum elf_pj_reloc_type) reloc_entry->howto->type;
+
+  if (output_bfd != NULL)
+    {
+      /* Partial linking--do nothing.  */
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  if (symbol_in != NULL
+      && bfd_is_und_section (symbol_in->section))
+    return bfd_reloc_undefined;
+
+  if (bfd_is_com_section (symbol_in->section))
+    sym_value = 0;
+  else
+    sym_value = (symbol_in->value +
+		 symbol_in->section->output_section->vma +
+		 symbol_in->section->output_offset);
+
+  switch (r_type)
+    {
+    case R_PJ_DATA_DIR32:
+      insn = bfd_get_32 (abfd, hit_data);
+      insn += sym_value + reloc_entry->addend;
+      bfd_put_32 (abfd, (bfd_vma) insn, hit_data);
+      break;
+
+      /* Relocations in code are always bigendian, no matter what the
+	 data endianness is.  */
+
+    case R_PJ_CODE_DIR32:
+      insn = bfd_getb32 (hit_data);
+      insn += sym_value + reloc_entry->addend;
+      bfd_putb32 ((bfd_vma) insn, hit_data);
+      break;
+
+    case R_PJ_CODE_REL16:
+      insn = bfd_getb16 (hit_data);
+      insn += sym_value + reloc_entry->addend
+        -  (input_section->output_section->vma
+            + input_section->output_offset);
+      bfd_putb16 ((bfd_vma) insn, hit_data);
+      break;
+    case R_PJ_CODE_LO16:
+      insn = bfd_getb16 (hit_data);
+      insn += sym_value + reloc_entry->addend;
+      bfd_putb16 ((bfd_vma) insn, hit_data);
+      break;
+
+    case R_PJ_CODE_HI16:
+      insn = bfd_getb16 (hit_data);
+      insn += (sym_value + reloc_entry->addend) >> 16;
+      bfd_putb16 ((bfd_vma) insn, hit_data);
+      break;
+
+    default:
+      abort ();
+      break;
+    }
+
+  return bfd_reloc_ok;
+}
+
+static reloc_howto_type pj_elf_howto_table[] =
+{
+  /* No relocation.  */
+  HOWTO (R_PJ_NONE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 pj_elf_reloc,		/* special_function */
+	 "R_PJ_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit absolute relocation.  Setting partial_inplace to TRUE and
+     src_mask to a non-zero value is similar to the COFF toolchain.  */
+  HOWTO (R_PJ_DATA_DIR32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 pj_elf_reloc,		/* special_function */
+	 "R_PJ_DIR32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit PC relative relocation.  */
+  HOWTO (R_PJ_CODE_REL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 pj_elf_reloc,		/* special_function */
+	 "R_PJ_REL32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+/* 16 bit PC relative relocation.  */
+  HOWTO (R_PJ_CODE_REL16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overf6w */
+	 pj_elf_reloc,		/* special_function */
+	 "R_PJ_REL16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+  EMPTY_HOWTO (4),
+  EMPTY_HOWTO (5),
+  HOWTO (R_PJ_CODE_DIR32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 pj_elf_reloc,		/* special_function */
+	 "R_PJ_CODE_DIR32",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (7),
+  EMPTY_HOWTO (8),
+  EMPTY_HOWTO (9),
+  EMPTY_HOWTO (10),
+  EMPTY_HOWTO (11),
+  EMPTY_HOWTO (12),
+
+  HOWTO (R_PJ_CODE_LO16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 pj_elf_reloc,		/* special_function */
+	 "R_PJ_LO16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+    HOWTO (R_PJ_CODE_HI16,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 pj_elf_reloc,		/* special_function */
+	 "R_PJ_HI16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_PJ_GNU_VTINHERIT,    /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         NULL,                  /* special_function */
+         "R_PJ_GNU_VTINHERIT",  /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage.  */
+  HOWTO (R_PJ_GNU_VTENTRY,     /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
+         "R_PJ_GNU_VTENTRY",   /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+};
+
+/* This structure is used to map BFD reloc codes to PJ ELF relocs.  */
+
+struct elf_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned char elf_reloc_val;
+};
+
+/* An array mapping BFD reloc codes to PJ ELF relocs.  */
+
+static const struct elf_reloc_map pj_reloc_map[] =
+{
+    { BFD_RELOC_NONE, 		R_PJ_NONE          },
+    { BFD_RELOC_32, 		R_PJ_DATA_DIR32    },
+    { BFD_RELOC_PJ_CODE_DIR16, 	R_PJ_CODE_DIR16    },
+    { BFD_RELOC_PJ_CODE_DIR32, 	R_PJ_CODE_DIR32    },
+    { BFD_RELOC_PJ_CODE_LO16, 	R_PJ_CODE_LO16     },
+    { BFD_RELOC_PJ_CODE_HI16, 	R_PJ_CODE_HI16     },
+    { BFD_RELOC_PJ_CODE_REL32,  R_PJ_CODE_REL32    },
+    { BFD_RELOC_PJ_CODE_REL16,  R_PJ_CODE_REL16    },
+    { BFD_RELOC_VTABLE_INHERIT, R_PJ_GNU_VTINHERIT },
+    { BFD_RELOC_VTABLE_ENTRY,   R_PJ_GNU_VTENTRY   },
+};
+
+/* Given a BFD reloc code, return the howto structure for the
+   corresponding PJ ELf reloc.  */
+
+static reloc_howto_type *
+pj_elf_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			  bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (pj_reloc_map) / sizeof (struct elf_reloc_map); i++)
+    if (pj_reloc_map[i].bfd_reloc_val == code)
+      return & pj_elf_howto_table[(int) pj_reloc_map[i].elf_reloc_val];
+
+  return NULL;
+}
+
+static reloc_howto_type *
+pj_elf_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			  const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (pj_elf_howto_table) / sizeof (pj_elf_howto_table[0]);
+       i++)
+    if (pj_elf_howto_table[i].name != NULL
+	&& strcasecmp (pj_elf_howto_table[i].name, r_name) == 0)
+      return &pj_elf_howto_table[i];
+
+  return NULL;
+}
+
+/* Given an ELF reloc, fill in the howto field of a relent.  */
+
+static void
+pj_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+		      arelent *cache_ptr,
+		      Elf_Internal_Rela *dst)
+{
+  unsigned int r;
+
+  r = ELF32_R_TYPE (dst->r_info);
+
+  BFD_ASSERT (r < (unsigned int) R_PJ_max);
+
+  cache_ptr->howto = &pj_elf_howto_table[r];
+}
+
+/* Take this moment to fill in the special picoJava bits in the
+   e_flags field.  */
+
+static void
+pj_elf_final_write_processing (bfd *abfd,
+			       bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  elf_elfheader (abfd)->e_flags |= EF_PICOJAVA_ARCH;
+  elf_elfheader (abfd)->e_flags |= EF_PICOJAVA_GNUCALLS;
+}
+
+#define TARGET_BIG_SYM		bfd_elf32_pj_vec
+#define TARGET_BIG_NAME		"elf32-pj"
+#define TARGET_LITTLE_SYM	bfd_elf32_pjl_vec
+#define TARGET_LITTLE_NAME	"elf32-pjl"
+#define ELF_ARCH		bfd_arch_pj
+#define ELF_MACHINE_CODE	EM_PJ
+#define ELF_MACHINE_ALT1	EM_PJ_OLD
+#define ELF_MAXPAGESIZE		0x1000
+#define bfd_elf32_bfd_get_relocated_section_contents \
+  bfd_generic_get_relocated_section_contents
+#define bfd_elf32_bfd_reloc_type_lookup	        pj_elf_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup   pj_elf_reloc_name_lookup
+#define elf_backend_final_write_processing      pj_elf_final_write_processing
+#define elf_info_to_howto		        pj_elf_info_to_howto
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-ppc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-ppc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-ppc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-ppc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,9238 @@
+/* PowerPC-specific support for 32-bit ELF
+   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Ian Lance Taylor, Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+
+/* This file is based on a preliminary PowerPC ELF ABI.  The
+   information may not match the final PowerPC ELF ABI.  It includes
+   suggestions from the in-progress Embedded PowerPC ABI, and that
+   information may also not match.  */
+
+#include "sysdep.h"
+#include <stdarg.h>
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/ppc.h"
+#include "elf32-ppc.h"
+#include "elf-vxworks.h"
+#include "dwarf2.h"
+
+/* RELA relocations are used here.  */
+
+static bfd_reloc_status_type ppc_elf_addr16_ha_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type ppc_elf_unhandled_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+
+/* Branch prediction bit for branch taken relocs.  */
+#define BRANCH_PREDICT_BIT 0x200000
+/* Mask to set RA in memory instructions.  */
+#define RA_REGISTER_MASK 0x001f0000
+/* Value to shift register by to insert RA.  */
+#define RA_REGISTER_SHIFT 16
+
+/* The name of the dynamic interpreter.  This is put in the .interp
+   section.  */
+#define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so.1"
+
+/* For old-style PLT.  */
+/* The number of single-slot PLT entries (the rest use two slots).  */
+#define PLT_NUM_SINGLE_ENTRIES 8192
+
+/* For new-style .glink and .plt.  */
+#define GLINK_PLTRESOLVE 16*4
+#define GLINK_ENTRY_SIZE 4*4
+#define TLS_GET_ADDR_GLINK_SIZE 12*4
+
+/* VxWorks uses its own plt layout, filled in by the static linker.  */
+
+/* The standard VxWorks PLT entry.  */
+#define VXWORKS_PLT_ENTRY_SIZE 32
+static const bfd_vma ppc_elf_vxworks_plt_entry
+    [VXWORKS_PLT_ENTRY_SIZE / 4] =
+  {
+    0x3d800000, /* lis     r12,0                 */
+    0x818c0000, /* lwz     r12,0(r12)            */
+    0x7d8903a6, /* mtctr   r12                   */
+    0x4e800420, /* bctr                          */
+    0x39600000, /* li      r11,0                 */
+    0x48000000, /* b       14 <.PLT0resolve+0x4> */
+    0x60000000, /* nop                           */
+    0x60000000, /* nop                           */
+  };
+static const bfd_vma ppc_elf_vxworks_pic_plt_entry
+    [VXWORKS_PLT_ENTRY_SIZE / 4] =
+  {
+    0x3d9e0000, /* addis r12,r30,0 */
+    0x818c0000, /* lwz	 r12,0(r12) */
+    0x7d8903a6, /* mtctr r12 */
+    0x4e800420, /* bctr */
+    0x39600000, /* li	 r11,0 */
+    0x48000000, /* b	 14 <.PLT0resolve+0x4> 14: R_PPC_REL24 .PLTresolve */
+    0x60000000, /* nop */
+    0x60000000, /* nop */
+  };
+
+/* The initial VxWorks PLT entry.  */
+#define VXWORKS_PLT_INITIAL_ENTRY_SIZE 32
+static const bfd_vma ppc_elf_vxworks_plt0_entry
+    [VXWORKS_PLT_INITIAL_ENTRY_SIZE / 4] =
+  {
+    0x3d800000, /* lis     r12,0        */
+    0x398c0000, /* addi    r12,r12,0    */
+    0x800c0008, /* lwz     r0,8(r12)    */
+    0x7c0903a6, /* mtctr   r0           */
+    0x818c0004, /* lwz     r12,4(r12)   */
+    0x4e800420, /* bctr                 */
+    0x60000000, /* nop                  */
+    0x60000000, /* nop                  */
+  };
+static const bfd_vma ppc_elf_vxworks_pic_plt0_entry
+    [VXWORKS_PLT_INITIAL_ENTRY_SIZE / 4] =
+  {
+    0x819e0008, /* lwz	 r12,8(r30) */
+    0x7d8903a6, /* mtctr r12        */
+    0x819e0004, /* lwz	 r12,4(r30) */
+    0x4e800420, /* bctr             */
+    0x60000000, /* nop              */
+    0x60000000, /* nop              */
+    0x60000000, /* nop              */
+    0x60000000, /* nop              */
+  };
+
+/* For executables, we have some additional relocations in
+   .rela.plt.unloaded, for the kernel loader.  */
+
+/* The number of non-JMP_SLOT relocations per PLT0 slot. */
+#define VXWORKS_PLT_NON_JMP_SLOT_RELOCS 3
+/* The number of relocations in the PLTResolve slot. */
+#define VXWORKS_PLTRESOLVE_RELOCS 2
+/* The number of relocations in the PLTResolve slot when when creating
+   a shared library. */
+#define VXWORKS_PLTRESOLVE_RELOCS_SHLIB 0
+
+/* Some instructions.  */
+#define ADDIS_11_11	0x3d6b0000
+#define ADDIS_11_30	0x3d7e0000
+#define ADDIS_12_12	0x3d8c0000
+#define ADDI_11_11	0x396b0000
+#define ADD_0_11_11	0x7c0b5a14
+#define ADD_3_12_2	0x7c6c1214
+#define ADD_11_0_11	0x7d605a14
+#define B		0x48000000
+#define BCL_20_31	0x429f0005
+#define BCTR		0x4e800420
+#define BEQLR		0x4d820020
+#define CMPWI_11_0	0x2c0b0000
+#define LIS_11		0x3d600000
+#define LIS_12		0x3d800000
+#define LWZU_0_12	0x840c0000
+#define LWZ_0_12	0x800c0000
+#define LWZ_11_3	0x81630000
+#define LWZ_11_11	0x816b0000
+#define LWZ_11_30	0x817e0000
+#define LWZ_12_3	0x81830000
+#define LWZ_12_12	0x818c0000
+#define MR_0_3		0x7c601b78
+#define MR_3_0		0x7c030378
+#define MFLR_0		0x7c0802a6
+#define MFLR_12		0x7d8802a6
+#define MTCTR_0		0x7c0903a6
+#define MTCTR_11	0x7d6903a6
+#define MTLR_0		0x7c0803a6
+#define NOP		0x60000000
+#define SUB_11_11_12	0x7d6c5850
+
+/* Offset of tp and dtp pointers from start of TLS block.  */
+#define TP_OFFSET	0x7000
+#define DTP_OFFSET	0x8000
+
+/* The value of a defined global symbol.  */
+#define SYM_VAL(SYM) \
+  ((SYM)->root.u.def.section->output_section->vma	\
+   + (SYM)->root.u.def.section->output_offset		\
+   + (SYM)->root.u.def.value)
+
+static reloc_howto_type *ppc_elf_howto_table[R_PPC_max];
+
+static reloc_howto_type ppc_elf_howto_raw[] = {
+  /* This reloc does nothing.  */
+  HOWTO (R_PPC_NONE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A standard 32 bit relocation.  */
+  HOWTO (R_PPC_ADDR32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_ADDR32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An absolute 26 bit branch; the lower two bits must be zero.
+     FIXME: we don't check that, we just clear them.  */
+  HOWTO (R_PPC_ADDR24,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_ADDR24",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A standard 16 bit relocation.  */
+  HOWTO (R_PPC_ADDR16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_ADDR16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit relocation without overflow.  */
+  HOWTO (R_PPC_ADDR16_LO,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_ADDR16_LO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The high order 16 bits of an address.  */
+  HOWTO (R_PPC_ADDR16_HI,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_ADDR16_HI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The high order 16 bits of an address, plus 1 if the contents of
+     the low 16 bits, treated as a signed number, is negative.  */
+  HOWTO (R_PPC_ADDR16_HA,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_addr16_ha_reloc, /* special_function */
+	 "R_PPC_ADDR16_HA",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An absolute 16 bit branch; the lower two bits must be zero.
+     FIXME: we don't check that, we just clear them.  */
+  HOWTO (R_PPC_ADDR14,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_ADDR14",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An absolute 16 bit branch, for which bit 10 should be set to
+     indicate that the branch is expected to be taken.	The lower two
+     bits must be zero.  */
+  HOWTO (R_PPC_ADDR14_BRTAKEN,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_ADDR14_BRTAKEN",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An absolute 16 bit branch, for which bit 10 should be set to
+     indicate that the branch is not expected to be taken.  The lower
+     two bits must be zero.  */
+  HOWTO (R_PPC_ADDR14_BRNTAKEN, /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_ADDR14_BRNTAKEN",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A relative 26 bit branch; the lower two bits must be zero.  */
+  HOWTO (R_PPC_REL24,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_REL24",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffffc,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A relative 16 bit branch; the lower two bits must be zero.  */
+  HOWTO (R_PPC_REL14,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_REL14",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A relative 16 bit branch.  Bit 10 should be set to indicate that
+     the branch is expected to be taken.  The lower two bits must be
+     zero.  */
+  HOWTO (R_PPC_REL14_BRTAKEN,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_REL14_BRTAKEN",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A relative 16 bit branch.  Bit 10 should be set to indicate that
+     the branch is not expected to be taken.  The lower two bits must
+     be zero.  */
+  HOWTO (R_PPC_REL14_BRNTAKEN,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_REL14_BRNTAKEN",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Like R_PPC_ADDR16, but referring to the GOT table entry for the
+     symbol.  */
+  HOWTO (R_PPC_GOT16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_GOT16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC_ADDR16_LO, but referring to the GOT table entry for
+     the symbol.  */
+  HOWTO (R_PPC_GOT16_LO,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_GOT16_LO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC_ADDR16_HI, but referring to the GOT table entry for
+     the symbol.  */
+  HOWTO (R_PPC_GOT16_HI,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_GOT16_HI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		 /* pcrel_offset */
+
+  /* Like R_PPC_ADDR16_HA, but referring to the GOT table entry for
+     the symbol.  */
+  HOWTO (R_PPC_GOT16_HA,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 ppc_elf_addr16_ha_reloc, /* special_function */
+	 "R_PPC_GOT16_HA",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC_REL24, but referring to the procedure linkage table
+     entry for the symbol.  */
+  HOWTO (R_PPC_PLTREL24,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,  /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_PLTREL24",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffffc,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* This is used only by the dynamic linker.  The symbol should exist
+     both in the object being run and in some shared library.  The
+     dynamic linker copies the data addressed by the symbol from the
+     shared library into the object, because the object being
+     run has to have the data at some particular address.  */
+  HOWTO (R_PPC_COPY,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	 /* special_function */
+	 "R_PPC_COPY",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC_ADDR32, but used when setting global offset table
+     entries.  */
+  HOWTO (R_PPC_GLOB_DAT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	 /* special_function */
+	 "R_PPC_GLOB_DAT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Marks a procedure linkage table entry for a symbol.  */
+  HOWTO (R_PPC_JMP_SLOT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	 /* special_function */
+	 "R_PPC_JMP_SLOT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used only by the dynamic linker.  When the object is run, this
+     longword is set to the load address of the object, plus the
+     addend.  */
+  HOWTO (R_PPC_RELATIVE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	 /* special_function */
+	 "R_PPC_RELATIVE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC_REL24, but uses the value of the symbol within the
+     object rather than the final value.  Normally used for
+     _GLOBAL_OFFSET_TABLE_.  */
+  HOWTO (R_PPC_LOCAL24PC,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_LOCAL24PC",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffffc,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Like R_PPC_ADDR32, but may be unaligned.  */
+  HOWTO (R_PPC_UADDR32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_UADDR32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC_ADDR16, but may be unaligned.  */
+  HOWTO (R_PPC_UADDR16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_UADDR16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32-bit PC relative */
+  HOWTO (R_PPC_REL32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_REL32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 32-bit relocation to the symbol's procedure linkage table.
+     FIXME: not supported.  */
+  HOWTO (R_PPC_PLT32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_PLT32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32-bit PC relative relocation to the symbol's procedure linkage table.
+     FIXME: not supported.  */
+  HOWTO (R_PPC_PLTREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_PLTREL32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Like R_PPC_ADDR16_LO, but referring to the PLT table entry for
+     the symbol.  */
+  HOWTO (R_PPC_PLT16_LO,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_PLT16_LO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC_ADDR16_HI, but referring to the PLT table entry for
+     the symbol.  */
+  HOWTO (R_PPC_PLT16_HI,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_PLT16_HI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		 /* pcrel_offset */
+
+  /* Like R_PPC_ADDR16_HA, but referring to the PLT table entry for
+     the symbol.  */
+  HOWTO (R_PPC_PLT16_HA,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 ppc_elf_addr16_ha_reloc, /* special_function */
+	 "R_PPC_PLT16_HA",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A sign-extended 16 bit value relative to _SDA_BASE_, for use with
+     small data items.  */
+  HOWTO (R_PPC_SDAREL16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_SDAREL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16-bit section relative relocation.  */
+  HOWTO (R_PPC_SECTOFF,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_SECTOFF",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16-bit lower half section relative relocation.  */
+  HOWTO (R_PPC_SECTOFF_LO,	  /* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_SECTOFF_LO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16-bit upper half section relative relocation.  */
+  HOWTO (R_PPC_SECTOFF_HI,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_SECTOFF_HI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		 /* pcrel_offset */
+
+  /* 16-bit upper half adjusted section relative relocation.  */
+  HOWTO (R_PPC_SECTOFF_HA,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 ppc_elf_addr16_ha_reloc, /* special_function */
+	 "R_PPC_SECTOFF_HA",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Marker relocs for TLS.  */
+  HOWTO (R_PPC_TLS,
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_TLS",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_PPC_TLSGD,
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_PPC_TLSGD",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_PPC_TLSLD,
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_PPC_TLSLD",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Computes the load module index of the load module that contains the
+     definition of its TLS sym.  */
+  HOWTO (R_PPC_DTPMOD32,
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_DTPMOD32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Computes a dtv-relative displacement, the difference between the value
+     of sym+add and the base address of the thread-local storage block that
+     contains the definition of sym, minus 0x8000.  */
+  HOWTO (R_PPC_DTPREL32,
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_DTPREL32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit dtprel reloc.  */
+  HOWTO (R_PPC_DTPREL16,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_DTPREL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like DTPREL16, but no overflow.  */
+  HOWTO (R_PPC_DTPREL16_LO,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_DTPREL16_LO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like DTPREL16_LO, but next higher group of 16 bits.  */
+  HOWTO (R_PPC_DTPREL16_HI,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_DTPREL16_HI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like DTPREL16_HI, but adjust for low 16 bits.  */
+  HOWTO (R_PPC_DTPREL16_HA,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_DTPREL16_HA",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Computes a tp-relative displacement, the difference between the value of
+     sym+add and the value of the thread pointer (r13).  */
+  HOWTO (R_PPC_TPREL32,
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_TPREL32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit tprel reloc.  */
+  HOWTO (R_PPC_TPREL16,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_TPREL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like TPREL16, but no overflow.  */
+  HOWTO (R_PPC_TPREL16_LO,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_TPREL16_LO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like TPREL16_LO, but next higher group of 16 bits.  */
+  HOWTO (R_PPC_TPREL16_HI,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_TPREL16_HI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like TPREL16_HI, but adjust for low 16 bits.  */
+  HOWTO (R_PPC_TPREL16_HA,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_TPREL16_HA",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Allocates two contiguous entries in the GOT to hold a tls_index structure,
+     with values (sym+add)@dtpmod and (sym+add)@dtprel, and computes the offset
+     to the first entry.  */
+  HOWTO (R_PPC_GOT_TLSGD16,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_GOT_TLSGD16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_TLSGD16, but no overflow.  */
+  HOWTO (R_PPC_GOT_TLSGD16_LO,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_GOT_TLSGD16_LO", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_TLSGD16_LO, but next higher group of 16 bits.  */
+  HOWTO (R_PPC_GOT_TLSGD16_HI,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_GOT_TLSGD16_HI", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_TLSGD16_HI, but adjust for low 16 bits.  */
+  HOWTO (R_PPC_GOT_TLSGD16_HA,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_GOT_TLSGD16_HA", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Allocates two contiguous entries in the GOT to hold a tls_index structure,
+     with values (sym+add)@dtpmod and zero, and computes the offset to the
+     first entry.  */
+  HOWTO (R_PPC_GOT_TLSLD16,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_GOT_TLSLD16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_TLSLD16, but no overflow.  */
+  HOWTO (R_PPC_GOT_TLSLD16_LO,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_GOT_TLSLD16_LO", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_TLSLD16_LO, but next higher group of 16 bits.  */
+  HOWTO (R_PPC_GOT_TLSLD16_HI,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_GOT_TLSLD16_HI", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_TLSLD16_HI, but adjust for low 16 bits.  */
+  HOWTO (R_PPC_GOT_TLSLD16_HA,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_GOT_TLSLD16_HA", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Allocates an entry in the GOT with value (sym+add)@dtprel, and computes
+     the offset to the entry.  */
+  HOWTO (R_PPC_GOT_DTPREL16,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_GOT_DTPREL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_DTPREL16, but no overflow.  */
+  HOWTO (R_PPC_GOT_DTPREL16_LO,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_GOT_DTPREL16_LO", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_DTPREL16_LO, but next higher group of 16 bits.  */
+  HOWTO (R_PPC_GOT_DTPREL16_HI,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_GOT_DTPREL16_HI", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_DTPREL16_HI, but adjust for low 16 bits.  */
+  HOWTO (R_PPC_GOT_DTPREL16_HA,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_GOT_DTPREL16_HA", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Allocates an entry in the GOT with value (sym+add)@tprel, and computes the
+     offset to the entry.  */
+  HOWTO (R_PPC_GOT_TPREL16,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_GOT_TPREL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_TPREL16, but no overflow.  */
+  HOWTO (R_PPC_GOT_TPREL16_LO,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_GOT_TPREL16_LO", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_TPREL16_LO, but next higher group of 16 bits.  */
+  HOWTO (R_PPC_GOT_TPREL16_HI,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_GOT_TPREL16_HI", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_TPREL16_HI, but adjust for low 16 bits.  */
+  HOWTO (R_PPC_GOT_TPREL16_HA,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_unhandled_reloc, /* special_function */
+	 "R_PPC_GOT_TPREL16_HA", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The remaining relocs are from the Embedded ELF ABI, and are not
+     in the SVR4 ELF ABI.  */
+
+  /* 32 bit value resulting from the addend minus the symbol.  */
+  HOWTO (R_PPC_EMB_NADDR32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_EMB_NADDR32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit value resulting from the addend minus the symbol.  */
+  HOWTO (R_PPC_EMB_NADDR16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_EMB_NADDR16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit value resulting from the addend minus the symbol.  */
+  HOWTO (R_PPC_EMB_NADDR16_LO,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_EMB_ADDR16_LO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The high order 16 bits of the addend minus the symbol.  */
+  HOWTO (R_PPC_EMB_NADDR16_HI,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_EMB_NADDR16_HI", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The high order 16 bits of the result of the addend minus the address,
+     plus 1 if the contents of the low 16 bits, treated as a signed number,
+     is negative.  */
+  HOWTO (R_PPC_EMB_NADDR16_HA,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_addr16_ha_reloc, /* special_function */
+	 "R_PPC_EMB_NADDR16_HA", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit value resulting from allocating a 4 byte word to hold an
+     address in the .sdata section, and returning the offset from
+     _SDA_BASE_ for that relocation.  */
+  HOWTO (R_PPC_EMB_SDAI16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_EMB_SDAI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit value resulting from allocating a 4 byte word to hold an
+     address in the .sdata2 section, and returning the offset from
+     _SDA2_BASE_ for that relocation.  */
+  HOWTO (R_PPC_EMB_SDA2I16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_EMB_SDA2I16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A sign-extended 16 bit value relative to _SDA2_BASE_, for use with
+     small data items.	 */
+  HOWTO (R_PPC_EMB_SDA2REL,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_EMB_SDA2REL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Relocate against either _SDA_BASE_ or _SDA2_BASE_, filling in the 16 bit
+     signed offset from the appropriate base, and filling in the register
+     field with the appropriate register (0, 2, or 13).  */
+  HOWTO (R_PPC_EMB_SDA21,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_EMB_SDA21",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Relocation not handled: R_PPC_EMB_MRKREF */
+  /* Relocation not handled: R_PPC_EMB_RELSEC16 */
+  /* Relocation not handled: R_PPC_EMB_RELST_LO */
+  /* Relocation not handled: R_PPC_EMB_RELST_HI */
+  /* Relocation not handled: R_PPC_EMB_RELST_HA */
+  /* Relocation not handled: R_PPC_EMB_BIT_FLD */
+
+  /* PC relative relocation against either _SDA_BASE_ or _SDA2_BASE_, filling
+     in the 16 bit signed offset from the appropriate base, and filling in the
+     register field with the appropriate register (0, 2, or 13).  */
+  HOWTO (R_PPC_EMB_RELSDA,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_EMB_RELSDA",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_PPC_IRELATIVE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	 /* special_function */
+	 "R_PPC_IRELATIVE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit relative relocation.  */
+  HOWTO (R_PPC_REL16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_REL16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 16 bit relative relocation without overflow.  */
+  HOWTO (R_PPC_REL16_LO,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_REL16_LO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* The high order 16 bits of a relative address.  */
+  HOWTO (R_PPC_REL16_HI,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_REL16_HI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* The high order 16 bits of a relative address, plus 1 if the contents of
+     the low 16 bits, treated as a signed number, is negative.  */
+  HOWTO (R_PPC_REL16_HA,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc_elf_addr16_ha_reloc, /* special_function */
+	 "R_PPC_REL16_HA",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_PPC_GNU_VTINHERIT,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_PPC_GNU_VTINHERIT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage.  */
+  HOWTO (R_PPC_GNU_VTENTRY,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_PPC_GNU_VTENTRY",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Phony reloc to handle AIX style TOC entries.  */
+  HOWTO (R_PPC_TOC16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC_TOC16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+/* Initialize the ppc_elf_howto_table, so that linear accesses can be done.  */
+
+static void
+ppc_elf_howto_init (void)
+{
+  unsigned int i, type;
+
+  for (i = 0;
+       i < sizeof (ppc_elf_howto_raw) / sizeof (ppc_elf_howto_raw[0]);
+       i++)
+    {
+      type = ppc_elf_howto_raw[i].type;
+      if (type >= (sizeof (ppc_elf_howto_table)
+		   / sizeof (ppc_elf_howto_table[0])))
+	abort ();
+      ppc_elf_howto_table[type] = &ppc_elf_howto_raw[i];
+    }
+}
+
+static reloc_howto_type *
+ppc_elf_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			   bfd_reloc_code_real_type code)
+{
+  enum elf_ppc_reloc_type r;
+
+  /* Initialize howto table if not already done.  */
+  if (!ppc_elf_howto_table[R_PPC_ADDR32])
+    ppc_elf_howto_init ();
+
+  switch (code)
+    {
+    default:
+      return NULL;
+
+    case BFD_RELOC_NONE:		r = R_PPC_NONE;			break;
+    case BFD_RELOC_32:			r = R_PPC_ADDR32;		break;
+    case BFD_RELOC_PPC_BA26:		r = R_PPC_ADDR24;		break;
+    case BFD_RELOC_16:			r = R_PPC_ADDR16;		break;
+    case BFD_RELOC_LO16:		r = R_PPC_ADDR16_LO;		break;
+    case BFD_RELOC_HI16:		r = R_PPC_ADDR16_HI;		break;
+    case BFD_RELOC_HI16_S:		r = R_PPC_ADDR16_HA;		break;
+    case BFD_RELOC_PPC_BA16:		r = R_PPC_ADDR14;		break;
+    case BFD_RELOC_PPC_BA16_BRTAKEN:	r = R_PPC_ADDR14_BRTAKEN;	break;
+    case BFD_RELOC_PPC_BA16_BRNTAKEN:	r = R_PPC_ADDR14_BRNTAKEN;	break;
+    case BFD_RELOC_PPC_B26:		r = R_PPC_REL24;		break;
+    case BFD_RELOC_PPC_B16:		r = R_PPC_REL14;		break;
+    case BFD_RELOC_PPC_B16_BRTAKEN:	r = R_PPC_REL14_BRTAKEN;	break;
+    case BFD_RELOC_PPC_B16_BRNTAKEN:	r = R_PPC_REL14_BRNTAKEN;	break;
+    case BFD_RELOC_16_GOTOFF:		r = R_PPC_GOT16;		break;
+    case BFD_RELOC_LO16_GOTOFF:		r = R_PPC_GOT16_LO;		break;
+    case BFD_RELOC_HI16_GOTOFF:		r = R_PPC_GOT16_HI;		break;
+    case BFD_RELOC_HI16_S_GOTOFF:	r = R_PPC_GOT16_HA;		break;
+    case BFD_RELOC_24_PLT_PCREL:	r = R_PPC_PLTREL24;		break;
+    case BFD_RELOC_PPC_COPY:		r = R_PPC_COPY;			break;
+    case BFD_RELOC_PPC_GLOB_DAT:	r = R_PPC_GLOB_DAT;		break;
+    case BFD_RELOC_PPC_LOCAL24PC:	r = R_PPC_LOCAL24PC;		break;
+    case BFD_RELOC_32_PCREL:		r = R_PPC_REL32;		break;
+    case BFD_RELOC_32_PLTOFF:		r = R_PPC_PLT32;		break;
+    case BFD_RELOC_32_PLT_PCREL:	r = R_PPC_PLTREL32;		break;
+    case BFD_RELOC_LO16_PLTOFF:		r = R_PPC_PLT16_LO;		break;
+    case BFD_RELOC_HI16_PLTOFF:		r = R_PPC_PLT16_HI;		break;
+    case BFD_RELOC_HI16_S_PLTOFF:	r = R_PPC_PLT16_HA;		break;
+    case BFD_RELOC_GPREL16:		r = R_PPC_SDAREL16;		break;
+    case BFD_RELOC_16_BASEREL:		r = R_PPC_SECTOFF;		break;
+    case BFD_RELOC_LO16_BASEREL:	r = R_PPC_SECTOFF_LO;		break;
+    case BFD_RELOC_HI16_BASEREL:	r = R_PPC_SECTOFF_HI;		break;
+    case BFD_RELOC_HI16_S_BASEREL:	r = R_PPC_SECTOFF_HA;		break;
+    case BFD_RELOC_CTOR:		r = R_PPC_ADDR32;		break;
+    case BFD_RELOC_PPC_TOC16:		r = R_PPC_TOC16;		break;
+    case BFD_RELOC_PPC_TLS:		r = R_PPC_TLS;			break;
+    case BFD_RELOC_PPC_TLSGD:		r = R_PPC_TLSGD;		break;
+    case BFD_RELOC_PPC_TLSLD:		r = R_PPC_TLSLD;		break;
+    case BFD_RELOC_PPC_DTPMOD:		r = R_PPC_DTPMOD32;		break;
+    case BFD_RELOC_PPC_TPREL16:		r = R_PPC_TPREL16;		break;
+    case BFD_RELOC_PPC_TPREL16_LO:	r = R_PPC_TPREL16_LO;		break;
+    case BFD_RELOC_PPC_TPREL16_HI:	r = R_PPC_TPREL16_HI;		break;
+    case BFD_RELOC_PPC_TPREL16_HA:	r = R_PPC_TPREL16_HA;		break;
+    case BFD_RELOC_PPC_TPREL:		r = R_PPC_TPREL32;		break;
+    case BFD_RELOC_PPC_DTPREL16:	r = R_PPC_DTPREL16;		break;
+    case BFD_RELOC_PPC_DTPREL16_LO:	r = R_PPC_DTPREL16_LO;		break;
+    case BFD_RELOC_PPC_DTPREL16_HI:	r = R_PPC_DTPREL16_HI;		break;
+    case BFD_RELOC_PPC_DTPREL16_HA:	r = R_PPC_DTPREL16_HA;		break;
+    case BFD_RELOC_PPC_DTPREL:		r = R_PPC_DTPREL32;		break;
+    case BFD_RELOC_PPC_GOT_TLSGD16:	r = R_PPC_GOT_TLSGD16;		break;
+    case BFD_RELOC_PPC_GOT_TLSGD16_LO:	r = R_PPC_GOT_TLSGD16_LO;	break;
+    case BFD_RELOC_PPC_GOT_TLSGD16_HI:	r = R_PPC_GOT_TLSGD16_HI;	break;
+    case BFD_RELOC_PPC_GOT_TLSGD16_HA:	r = R_PPC_GOT_TLSGD16_HA;	break;
+    case BFD_RELOC_PPC_GOT_TLSLD16:	r = R_PPC_GOT_TLSLD16;		break;
+    case BFD_RELOC_PPC_GOT_TLSLD16_LO:	r = R_PPC_GOT_TLSLD16_LO;	break;
+    case BFD_RELOC_PPC_GOT_TLSLD16_HI:	r = R_PPC_GOT_TLSLD16_HI;	break;
+    case BFD_RELOC_PPC_GOT_TLSLD16_HA:	r = R_PPC_GOT_TLSLD16_HA;	break;
+    case BFD_RELOC_PPC_GOT_TPREL16:	r = R_PPC_GOT_TPREL16;		break;
+    case BFD_RELOC_PPC_GOT_TPREL16_LO:	r = R_PPC_GOT_TPREL16_LO;	break;
+    case BFD_RELOC_PPC_GOT_TPREL16_HI:	r = R_PPC_GOT_TPREL16_HI;	break;
+    case BFD_RELOC_PPC_GOT_TPREL16_HA:	r = R_PPC_GOT_TPREL16_HA;	break;
+    case BFD_RELOC_PPC_GOT_DTPREL16:	r = R_PPC_GOT_DTPREL16;		break;
+    case BFD_RELOC_PPC_GOT_DTPREL16_LO:	r = R_PPC_GOT_DTPREL16_LO;	break;
+    case BFD_RELOC_PPC_GOT_DTPREL16_HI:	r = R_PPC_GOT_DTPREL16_HI;	break;
+    case BFD_RELOC_PPC_GOT_DTPREL16_HA:	r = R_PPC_GOT_DTPREL16_HA;	break;
+    case BFD_RELOC_PPC_EMB_NADDR32:	r = R_PPC_EMB_NADDR32;		break;
+    case BFD_RELOC_PPC_EMB_NADDR16:	r = R_PPC_EMB_NADDR16;		break;
+    case BFD_RELOC_PPC_EMB_NADDR16_LO:	r = R_PPC_EMB_NADDR16_LO;	break;
+    case BFD_RELOC_PPC_EMB_NADDR16_HI:	r = R_PPC_EMB_NADDR16_HI;	break;
+    case BFD_RELOC_PPC_EMB_NADDR16_HA:	r = R_PPC_EMB_NADDR16_HA;	break;
+    case BFD_RELOC_PPC_EMB_SDAI16:	r = R_PPC_EMB_SDAI16;		break;
+    case BFD_RELOC_PPC_EMB_SDA2I16:	r = R_PPC_EMB_SDA2I16;		break;
+    case BFD_RELOC_PPC_EMB_SDA2REL:	r = R_PPC_EMB_SDA2REL;		break;
+    case BFD_RELOC_PPC_EMB_SDA21:	r = R_PPC_EMB_SDA21;		break;
+    case BFD_RELOC_PPC_EMB_MRKREF:	r = R_PPC_EMB_MRKREF;		break;
+    case BFD_RELOC_PPC_EMB_RELSEC16:	r = R_PPC_EMB_RELSEC16;		break;
+    case BFD_RELOC_PPC_EMB_RELST_LO:	r = R_PPC_EMB_RELST_LO;		break;
+    case BFD_RELOC_PPC_EMB_RELST_HI:	r = R_PPC_EMB_RELST_HI;		break;
+    case BFD_RELOC_PPC_EMB_RELST_HA:	r = R_PPC_EMB_RELST_HA;		break;
+    case BFD_RELOC_PPC_EMB_BIT_FLD:	r = R_PPC_EMB_BIT_FLD;		break;
+    case BFD_RELOC_PPC_EMB_RELSDA:	r = R_PPC_EMB_RELSDA;		break;
+    case BFD_RELOC_16_PCREL:		r = R_PPC_REL16;		break;
+    case BFD_RELOC_LO16_PCREL:		r = R_PPC_REL16_LO;		break;
+    case BFD_RELOC_HI16_PCREL:		r = R_PPC_REL16_HI;		break;
+    case BFD_RELOC_HI16_S_PCREL:	r = R_PPC_REL16_HA;		break;
+    case BFD_RELOC_VTABLE_INHERIT:	r = R_PPC_GNU_VTINHERIT;	break;
+    case BFD_RELOC_VTABLE_ENTRY:	r = R_PPC_GNU_VTENTRY;		break;
+    }
+
+  return ppc_elf_howto_table[r];
+};
+
+static reloc_howto_type *
+ppc_elf_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			   const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (ppc_elf_howto_raw) / sizeof (ppc_elf_howto_raw[0]);
+       i++)
+    if (ppc_elf_howto_raw[i].name != NULL
+	&& strcasecmp (ppc_elf_howto_raw[i].name, r_name) == 0)
+      return &ppc_elf_howto_raw[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for a PowerPC ELF reloc.  */
+
+static void
+ppc_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+		       arelent *cache_ptr,
+		       Elf_Internal_Rela *dst)
+{
+  /* Initialize howto table if not already done.  */
+  if (!ppc_elf_howto_table[R_PPC_ADDR32])
+    ppc_elf_howto_init ();
+
+  BFD_ASSERT (ELF32_R_TYPE (dst->r_info) < (unsigned int) R_PPC_max);
+  cache_ptr->howto = ppc_elf_howto_table[ELF32_R_TYPE (dst->r_info)];
+
+  /* Just because the above assert didn't trigger doesn't mean that
+     ELF32_R_TYPE (dst->r_info) is necessarily a valid relocation.  */
+  if (!cache_ptr->howto)
+    {
+      (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
+                             abfd, ELF32_R_TYPE (dst->r_info));
+      bfd_set_error (bfd_error_bad_value);
+
+      cache_ptr->howto = ppc_elf_howto_table[R_PPC_NONE];
+    }
+}
+
+/* Handle the R_PPC_ADDR16_HA and R_PPC_REL16_HA relocs.  */
+
+static bfd_reloc_status_type
+ppc_elf_addr16_ha_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+			 arelent *reloc_entry,
+			 asymbol *symbol,
+			 void *data ATTRIBUTE_UNUSED,
+			 asection *input_section,
+			 bfd *output_bfd,
+			 char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma relocation;
+
+  if (output_bfd != NULL)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  relocation += reloc_entry->addend;
+  if (reloc_entry->howto->pc_relative)
+    relocation -= reloc_entry->address;
+
+  reloc_entry->addend += (relocation & 0x8000) << 1;
+
+  return bfd_reloc_continue;
+}
+
+static bfd_reloc_status_type
+ppc_elf_unhandled_reloc (bfd *abfd,
+			 arelent *reloc_entry,
+			 asymbol *symbol,
+			 void *data,
+			 asection *input_section,
+			 bfd *output_bfd,
+			 char **error_message)
+{
+  /* If this is a relocatable link (output_bfd test tells us), just
+     call the generic function.  Any adjustment will be done at final
+     link time.  */
+  if (output_bfd != NULL)
+    return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+				  input_section, output_bfd, error_message);
+
+  if (error_message != NULL)
+    {
+      static char buf[60];
+      sprintf (buf, _("generic linker can't handle %s"),
+	       reloc_entry->howto->name);
+      *error_message = buf;
+    }
+  return bfd_reloc_dangerous;
+}
+
+/* Sections created by the linker.  */
+
+typedef struct elf_linker_section
+{
+  /* Pointer to the bfd section.  */
+  asection *section;
+  /* Section name.  */
+  const char *name;
+  /* Associated bss section name.  */
+  const char *bss_name;
+  /* Associated symbol name.  */
+  const char *sym_name;
+  /* Associated symbol.  */
+  struct elf_link_hash_entry *sym;
+} elf_linker_section_t;
+
+/* Linked list of allocated pointer entries.  This hangs off of the
+   symbol lists, and provides allows us to return different pointers,
+   based on different addend's.  */
+
+typedef struct elf_linker_section_pointers
+{
+  /* next allocated pointer for this symbol */
+  struct elf_linker_section_pointers *next;
+  /* offset of pointer from beginning of section */
+  bfd_vma offset;
+  /* addend used */
+  bfd_vma addend;
+  /* which linker section this is */
+  elf_linker_section_t *lsect;
+} elf_linker_section_pointers_t;
+
+struct ppc_elf_obj_tdata
+{
+  struct elf_obj_tdata elf;
+
+  /* A mapping from local symbols to offsets into the various linker
+     sections added.  This is index by the symbol index.  */
+  elf_linker_section_pointers_t **linker_section_pointers;
+
+  /* Flags used to auto-detect plt type.  */
+  unsigned int makes_plt_call : 1;
+  unsigned int has_rel16 : 1;
+};
+
+#define ppc_elf_tdata(bfd) \
+  ((struct ppc_elf_obj_tdata *) (bfd)->tdata.any)
+
+#define elf_local_ptr_offsets(bfd) \
+  (ppc_elf_tdata (bfd)->linker_section_pointers)
+
+#define is_ppc_elf(bfd) \
+  (bfd_get_flavour (bfd) == bfd_target_elf_flavour \
+   && elf_object_id (bfd) == PPC32_ELF_DATA)
+
+/* Override the generic function because we store some extras.  */
+
+static bfd_boolean
+ppc_elf_mkobject (bfd *abfd)
+{
+  return bfd_elf_allocate_object (abfd, sizeof (struct ppc_elf_obj_tdata),
+				  PPC32_ELF_DATA);
+}
+
+/* Fix bad default arch selected for a 32 bit input bfd when the
+   default is 64 bit.  */
+
+static bfd_boolean
+ppc_elf_object_p (bfd *abfd)
+{
+  if (abfd->arch_info->the_default && abfd->arch_info->bits_per_word == 64)
+    {
+      Elf_Internal_Ehdr *i_ehdr = elf_elfheader (abfd);
+
+      if (i_ehdr->e_ident[EI_CLASS] == ELFCLASS32)
+	{
+	  /* Relies on arch after 64 bit default being 32 bit default.  */
+	  abfd->arch_info = abfd->arch_info->next;
+	  BFD_ASSERT (abfd->arch_info->bits_per_word == 32);
+	}
+    }
+  return TRUE;
+}
+
+/* Function to set whether a module needs the -mrelocatable bit set.  */
+
+static bfd_boolean
+ppc_elf_set_private_flags (bfd *abfd, flagword flags)
+{
+  BFD_ASSERT (!elf_flags_init (abfd)
+	      || elf_elfheader (abfd)->e_flags == flags);
+
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
+}
+
+/* Support for core dump NOTE sections.  */
+
+static bfd_boolean
+ppc_elf_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  int offset;
+  unsigned int size;
+
+  switch (note->descsz)
+    {
+    default:
+      return FALSE;
+
+    case 268:		/* Linux/PPC.  */
+      /* pr_cursig */
+      elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12);
+
+      /* pr_pid */
+      elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 24);
+
+      /* pr_reg */
+      offset = 72;
+      size = 192;
+
+      break;
+    }
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg",
+					  size, note->descpos + offset);
+}
+
+static bfd_boolean
+ppc_elf_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  switch (note->descsz)
+    {
+    default:
+      return FALSE;
+
+    case 128:		/* Linux/PPC elf_prpsinfo.  */
+      elf_tdata (abfd)->core_pid
+	= bfd_get_32 (abfd, note->descdata + 16);
+      elf_tdata (abfd)->core_program
+	= _bfd_elfcore_strndup (abfd, note->descdata + 32, 16);
+      elf_tdata (abfd)->core_command
+	= _bfd_elfcore_strndup (abfd, note->descdata + 48, 80);
+    }
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+
+  {
+    char *command = elf_tdata (abfd)->core_command;
+    int n = strlen (command);
+
+    if (0 < n && command[n - 1] == ' ')
+      command[n - 1] = '\0';
+  }
+
+  return TRUE;
+}
+
+static char *
+ppc_elf_write_core_note (bfd *abfd, char *buf, int *bufsiz, int note_type, ...)
+{
+  switch (note_type)
+    {
+    default:
+      return NULL;
+
+    case NT_PRPSINFO:
+      {
+	char data[128];
+	va_list ap;
+
+	va_start (ap, note_type);
+	memset (data, 0, 32);
+	strncpy (data + 32, va_arg (ap, const char *), 16);
+	strncpy (data + 48, va_arg (ap, const char *), 80);
+	va_end (ap);
+	return elfcore_write_note (abfd, buf, bufsiz,
+				   "CORE", note_type, data, sizeof (data));
+      }
+
+    case NT_PRSTATUS:
+      {
+	char data[268];
+	va_list ap;
+	long pid;
+	int cursig;
+	const void *greg;
+
+	va_start (ap, note_type);
+	memset (data, 0, 72);
+	pid = va_arg (ap, long);
+	bfd_put_32 (abfd, pid, data + 24);
+	cursig = va_arg (ap, int);
+	bfd_put_16 (abfd, cursig, data + 12);
+	greg = va_arg (ap, const void *);
+	memcpy (data + 72, greg, 192);
+	memset (data + 264, 0, 4);
+	va_end (ap);
+	return elfcore_write_note (abfd, buf, bufsiz,
+				   "CORE", note_type, data, sizeof (data));
+      }
+    }
+}
+
+/* Return address for Ith PLT stub in section PLT, for relocation REL
+   or (bfd_vma) -1 if it should not be included.  */
+
+static bfd_vma
+ppc_elf_plt_sym_val (bfd_vma i ATTRIBUTE_UNUSED,
+		     const asection *plt ATTRIBUTE_UNUSED,
+		     const arelent *rel)
+{
+  return rel->address;
+}
+
+/* Handle a PowerPC specific section when reading an object file.  This
+   is called when bfd_section_from_shdr finds a section with an unknown
+   type.  */
+
+static bfd_boolean
+ppc_elf_section_from_shdr (bfd *abfd,
+			   Elf_Internal_Shdr *hdr,
+			   const char *name,
+			   int shindex)
+{
+  asection *newsect;
+  flagword flags;
+
+  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex))
+    return FALSE;
+
+  newsect = hdr->bfd_section;
+  flags = bfd_get_section_flags (abfd, newsect);
+  if (hdr->sh_flags & SHF_EXCLUDE)
+    flags |= SEC_EXCLUDE;
+
+  if (hdr->sh_type == SHT_ORDERED)
+    flags |= SEC_SORT_ENTRIES;
+
+  bfd_set_section_flags (abfd, newsect, flags);
+  return TRUE;
+}
+
+/* Set up any other section flags and such that may be necessary.  */
+
+static bfd_boolean
+ppc_elf_fake_sections (bfd *abfd ATTRIBUTE_UNUSED,
+		       Elf_Internal_Shdr *shdr,
+		       asection *asect)
+{
+  if ((asect->flags & SEC_SORT_ENTRIES) != 0)
+    shdr->sh_type = SHT_ORDERED;
+
+  return TRUE;
+}
+
+/* If we have .sbss2 or .PPC.EMB.sbss0 output sections, we
+   need to bump up the number of section headers.  */
+
+static int
+ppc_elf_additional_program_headers (bfd *abfd,
+				    struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  asection *s;
+  int ret = 0;
+
+  s = bfd_get_section_by_name (abfd, ".sbss2");
+  if (s != NULL && (s->flags & SEC_ALLOC) != 0)
+    ++ret;
+
+  s = bfd_get_section_by_name (abfd, ".PPC.EMB.sbss0");
+  if (s != NULL && (s->flags & SEC_ALLOC) != 0)
+    ++ret;
+
+  return ret;
+}
+
+/* Add extra PPC sections -- Note, for now, make .sbss2 and
+   .PPC.EMB.sbss0 a normal section, and not a bss section so
+   that the linker doesn't crater when trying to make more than
+   2 sections.  */
+
+static const struct bfd_elf_special_section ppc_elf_special_sections[] =
+{
+  { STRING_COMMA_LEN (".plt"),             0, SHT_NOBITS,   SHF_ALLOC + SHF_EXECINSTR },
+  { STRING_COMMA_LEN (".sbss"),           -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".sbss2"),          -2, SHT_PROGBITS, SHF_ALLOC },
+  { STRING_COMMA_LEN (".sdata"),          -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".sdata2"),         -2, SHT_PROGBITS, SHF_ALLOC },
+  { STRING_COMMA_LEN (".tags"),            0, SHT_ORDERED,  SHF_ALLOC },
+  { STRING_COMMA_LEN (".PPC.EMB.apuinfo"), 0, SHT_NOTE,     0 },
+  { STRING_COMMA_LEN (".PPC.EMB.sbss0"),   0, SHT_PROGBITS, SHF_ALLOC },
+  { STRING_COMMA_LEN (".PPC.EMB.sdata0"),  0, SHT_PROGBITS, SHF_ALLOC },
+  { NULL,                              0,  0, 0,            0 }
+};
+
+/* This is what we want for new plt/got.  */
+static struct bfd_elf_special_section ppc_alt_plt =
+  { STRING_COMMA_LEN (".plt"),             0, SHT_PROGBITS, SHF_ALLOC };
+
+static const struct bfd_elf_special_section *
+ppc_elf_get_sec_type_attr (bfd *abfd ATTRIBUTE_UNUSED, asection *sec)
+{
+  const struct bfd_elf_special_section *ssect;
+
+  /* See if this is one of the special sections.  */
+  if (sec->name == NULL)
+    return NULL;
+
+  ssect = _bfd_elf_get_special_section (sec->name, ppc_elf_special_sections,
+					sec->use_rela_p);
+  if (ssect != NULL)
+    {
+      if (ssect == ppc_elf_special_sections && (sec->flags & SEC_LOAD) != 0)
+	ssect = &ppc_alt_plt;
+      return ssect;
+    }
+
+  return _bfd_elf_get_sec_type_attr (abfd, sec);
+}
+
+/* Very simple linked list structure for recording apuinfo values.  */
+typedef struct apuinfo_list
+{
+  struct apuinfo_list *next;
+  unsigned long value;
+}
+apuinfo_list;
+
+static apuinfo_list *head;
+static bfd_boolean apuinfo_set;
+
+static void
+apuinfo_list_init (void)
+{
+  head = NULL;
+  apuinfo_set = FALSE;
+}
+
+static void
+apuinfo_list_add (unsigned long value)
+{
+  apuinfo_list *entry = head;
+
+  while (entry != NULL)
+    {
+      if (entry->value == value)
+	return;
+      entry = entry->next;
+    }
+
+  entry = bfd_malloc (sizeof (* entry));
+  if (entry == NULL)
+    return;
+
+  entry->value = value;
+  entry->next  = head;
+  head = entry;
+}
+
+static unsigned
+apuinfo_list_length (void)
+{
+  apuinfo_list *entry;
+  unsigned long count;
+
+  for (entry = head, count = 0;
+       entry;
+       entry = entry->next)
+    ++ count;
+
+  return count;
+}
+
+static inline unsigned long
+apuinfo_list_element (unsigned long number)
+{
+  apuinfo_list * entry;
+
+  for (entry = head;
+       entry && number --;
+       entry = entry->next)
+    ;
+
+  return entry ? entry->value : 0;
+}
+
+static void
+apuinfo_list_finish (void)
+{
+  apuinfo_list *entry;
+
+  for (entry = head; entry;)
+    {
+      apuinfo_list *next = entry->next;
+      free (entry);
+      entry = next;
+    }
+
+  head = NULL;
+}
+
+#define APUINFO_SECTION_NAME	".PPC.EMB.apuinfo"
+#define APUINFO_LABEL		"APUinfo"
+
+/* Scan the input BFDs and create a linked list of
+   the APUinfo values that will need to be emitted.  */
+
+static void
+ppc_elf_begin_write_processing (bfd *abfd, struct bfd_link_info *link_info)
+{
+  bfd *ibfd;
+  asection *asec;
+  char *buffer = NULL;
+  bfd_size_type largest_input_size = 0;
+  unsigned i;
+  unsigned long length;
+  const char *error_message = NULL;
+
+  if (link_info == NULL)
+    return;
+
+  apuinfo_list_init ();
+
+  /* Read in the input sections contents.  */
+  for (ibfd = link_info->input_bfds; ibfd; ibfd = ibfd->link_next)
+    {
+      unsigned long datum;
+
+      asec = bfd_get_section_by_name (ibfd, APUINFO_SECTION_NAME);
+      if (asec == NULL)
+	continue;
+
+      error_message = _("corrupt %s section in %B");
+      length = asec->size;
+      if (length < 20)
+	goto fail;
+
+      apuinfo_set = TRUE;
+      if (largest_input_size < asec->size)
+	{
+	  if (buffer)
+	    free (buffer);
+	  largest_input_size = asec->size;
+	  buffer = bfd_malloc (largest_input_size);
+	  if (!buffer)
+	    return;
+	}
+
+      if (bfd_seek (ibfd, asec->filepos, SEEK_SET) != 0
+	  || (bfd_bread (buffer, length, ibfd) != length))
+	{
+	  error_message = _("unable to read in %s section from %B");
+	  goto fail;
+	}
+
+      /* Verify the contents of the header.  Note - we have to
+	 extract the values this way in order to allow for a
+	 host whose endian-ness is different from the target.  */
+      datum = bfd_get_32 (ibfd, buffer);
+      if (datum != sizeof APUINFO_LABEL)
+	goto fail;
+
+      datum = bfd_get_32 (ibfd, buffer + 8);
+      if (datum != 0x2)
+	goto fail;
+
+      if (strcmp (buffer + 12, APUINFO_LABEL) != 0)
+	goto fail;
+
+      /* Get the number of bytes used for apuinfo entries.  */
+      datum = bfd_get_32 (ibfd, buffer + 4);
+      if (datum + 20 != length)
+	goto fail;
+
+      /* Scan the apuinfo section, building a list of apuinfo numbers.  */
+      for (i = 0; i < datum; i += 4)
+	apuinfo_list_add (bfd_get_32 (ibfd, buffer + 20 + i));
+    }
+
+  error_message = NULL;
+
+  if (apuinfo_set)
+    {
+      /* Compute the size of the output section.  */
+      unsigned num_entries = apuinfo_list_length ();
+
+      /* Set the output section size, if it exists.  */
+      asec = bfd_get_section_by_name (abfd, APUINFO_SECTION_NAME);
+
+      if (asec && ! bfd_set_section_size (abfd, asec, 20 + num_entries * 4))
+	{
+	  ibfd = abfd;
+	  error_message = _("warning: unable to set size of %s section in %B");
+	}
+    }
+
+ fail:
+  if (buffer)
+    free (buffer);
+
+  if (error_message)
+    (*_bfd_error_handler) (error_message, ibfd, APUINFO_SECTION_NAME);
+}
+
+/* Prevent the output section from accumulating the input sections'
+   contents.  We have already stored this in our linked list structure.  */
+
+static bfd_boolean
+ppc_elf_write_section (bfd *abfd ATTRIBUTE_UNUSED,
+		       struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
+		       asection *asec,
+		       bfd_byte *contents ATTRIBUTE_UNUSED)
+{
+  return apuinfo_set && strcmp (asec->name, APUINFO_SECTION_NAME) == 0;
+}
+
+/* Finally we can generate the output section.  */
+
+static void
+ppc_elf_final_write_processing (bfd *abfd, bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  bfd_byte *buffer;
+  asection *asec;
+  unsigned i;
+  unsigned num_entries;
+  bfd_size_type length;
+
+  asec = bfd_get_section_by_name (abfd, APUINFO_SECTION_NAME);
+  if (asec == NULL)
+    return;
+
+  if (!apuinfo_set)
+    return;
+
+  length = asec->size;
+  if (length < 20)
+    return;
+
+  buffer = bfd_malloc (length);
+  if (buffer == NULL)
+    {
+      (*_bfd_error_handler)
+	(_("failed to allocate space for new APUinfo section."));
+      return;
+    }
+
+  /* Create the apuinfo header.  */
+  num_entries = apuinfo_list_length ();
+  bfd_put_32 (abfd, sizeof APUINFO_LABEL, buffer);
+  bfd_put_32 (abfd, num_entries * 4, buffer + 4);
+  bfd_put_32 (abfd, 0x2, buffer + 8);
+  strcpy ((char *) buffer + 12, APUINFO_LABEL);
+
+  length = 20;
+  for (i = 0; i < num_entries; i++)
+    {
+      bfd_put_32 (abfd, apuinfo_list_element (i), buffer + length);
+      length += 4;
+    }
+
+  if (length != asec->size)
+    (*_bfd_error_handler) (_("failed to compute new APUinfo section."));
+
+  if (! bfd_set_section_contents (abfd, asec, buffer, (file_ptr) 0, length))
+    (*_bfd_error_handler) (_("failed to install new APUinfo section."));
+
+  free (buffer);
+
+  apuinfo_list_finish ();
+}
+
+static bfd_boolean
+is_nonpic_glink_stub (bfd *abfd, asection *glink, bfd_vma off)
+{
+  bfd_byte buf[GLINK_ENTRY_SIZE];
+
+  if (!bfd_get_section_contents (abfd, glink, buf, off, GLINK_ENTRY_SIZE))
+    return FALSE;
+
+  return ((bfd_get_32 (abfd, buf + 0) & 0xffff0000) == LIS_11
+	  && (bfd_get_32 (abfd, buf + 4) & 0xffff0000) == LWZ_11_11
+	  && bfd_get_32 (abfd, buf + 8) == MTCTR_11
+	  && bfd_get_32 (abfd, buf + 12) == BCTR);
+}
+
+static bfd_boolean
+section_covers_vma (bfd *abfd ATTRIBUTE_UNUSED, asection *section, void *ptr)
+{
+  bfd_vma vma = *(bfd_vma *) ptr;
+  return ((section->flags & SEC_ALLOC) != 0
+	  && section->vma <= vma
+	  && vma < section->vma + section->size);
+}
+
+static long
+ppc_elf_get_synthetic_symtab (bfd *abfd, long symcount, asymbol **syms,
+			      long dynsymcount, asymbol **dynsyms,
+			      asymbol **ret)
+{
+  bfd_boolean (*slurp_relocs) (bfd *, asection *, asymbol **, bfd_boolean);
+  asection *plt, *relplt, *dynamic, *glink;
+  bfd_vma glink_vma = 0;
+  bfd_vma resolv_vma = 0;
+  bfd_vma stub_vma;
+  asymbol *s;
+  arelent *p;
+  long count, i;
+  size_t size;
+  char *names;
+  bfd_byte buf[4];
+
+  *ret = NULL;
+
+  if ((abfd->flags & (DYNAMIC | EXEC_P)) == 0)
+    return 0;
+
+  if (dynsymcount <= 0)
+    return 0;
+
+  relplt = bfd_get_section_by_name (abfd, ".rela.plt");
+  if (relplt == NULL)
+    return 0;
+
+  plt = bfd_get_section_by_name (abfd, ".plt");
+  if (plt == NULL)
+    return 0;
+
+  /* Call common code to handle old-style executable PLTs.  */
+  if (elf_section_flags (plt) & SHF_EXECINSTR)
+    return _bfd_elf_get_synthetic_symtab (abfd, symcount, syms,
+					  dynsymcount, dynsyms, ret);
+
+  /* If this object was prelinked, the prelinker stored the address
+     of .glink at got[1].  If it wasn't prelinked, got[1] will be zero.  */
+  dynamic = bfd_get_section_by_name (abfd, ".dynamic");
+  if (dynamic != NULL)
+    {
+      bfd_byte *dynbuf, *extdyn, *extdynend;
+      size_t extdynsize;
+      void (*swap_dyn_in) (bfd *, const void *, Elf_Internal_Dyn *);
+
+      if (!bfd_malloc_and_get_section (abfd, dynamic, &dynbuf))
+	return -1;
+
+      extdynsize = get_elf_backend_data (abfd)->s->sizeof_dyn;
+      swap_dyn_in = get_elf_backend_data (abfd)->s->swap_dyn_in;
+
+      extdyn = dynbuf;
+      extdynend = extdyn + dynamic->size;
+      for (; extdyn < extdynend; extdyn += extdynsize)
+	{
+	  Elf_Internal_Dyn dyn;
+	  (*swap_dyn_in) (abfd, extdyn, &dyn);
+
+	  if (dyn.d_tag == DT_NULL)
+	    break;
+
+	  if (dyn.d_tag == DT_PPC_GOT)
+	    {
+	      unsigned int g_o_t = dyn.d_un.d_val;
+	      asection *got = bfd_get_section_by_name (abfd, ".got");
+	      if (got != NULL
+		  && bfd_get_section_contents (abfd, got, buf,
+					       g_o_t - got->vma + 4, 4))
+		glink_vma = bfd_get_32 (abfd, buf);
+	      break;
+	    }
+	}
+      free (dynbuf);
+    }
+
+  /* Otherwise we read the first plt entry.  */
+  if (glink_vma == 0)
+    {
+      if (bfd_get_section_contents (abfd, plt, buf, 0, 4))
+	glink_vma = bfd_get_32 (abfd, buf);
+    }
+
+  if (glink_vma == 0)
+    return 0;
+
+  /* The .glink section usually does not survive the final
+     link; search for the section (usually .text) where the
+     glink stubs now reside.  */
+  glink = bfd_sections_find_if (abfd, section_covers_vma, &glink_vma);
+  if (glink == NULL)
+    return 0;
+
+  /* Determine glink PLT resolver by reading the relative branch
+     from the first glink stub.  */
+  if (bfd_get_section_contents (abfd, glink, buf,
+				glink_vma - glink->vma, 4))
+    {
+      unsigned int insn = bfd_get_32 (abfd, buf);
+
+      /* The first glink stub may either branch to the resolver ...  */
+      insn ^= B;
+      if ((insn & ~0x3fffffc) == 0)
+	resolv_vma = glink_vma + (insn ^ 0x2000000) - 0x2000000;
+
+      /* ... or fall through a bunch of NOPs.  */
+      else if ((insn ^ B ^ NOP) == 0)
+	for (i = 4;
+	     bfd_get_section_contents (abfd, glink, buf,
+				       glink_vma - glink->vma + i, 4);
+	     i += 4)
+	  if (bfd_get_32 (abfd, buf) != NOP)
+	    {
+	      resolv_vma = glink_vma + i;
+	      break;
+	    }
+    }
+
+  count = relplt->size / sizeof (Elf32_External_Rela);
+  stub_vma = glink_vma - (bfd_vma) count * 16;
+  /* If the stubs are those for -shared/-pie then we might have
+     multiple stubs for each plt entry.  If that is the case then
+     there is no way to associate stubs with their plt entries short
+     of figuring out the GOT pointer value used in the stub.  */
+  if (!is_nonpic_glink_stub (abfd, glink,
+			     glink_vma - GLINK_ENTRY_SIZE - glink->vma))
+    return 0;
+
+  slurp_relocs = get_elf_backend_data (abfd)->s->slurp_reloc_table;
+  if (! (*slurp_relocs) (abfd, relplt, dynsyms, TRUE))
+    return -1;
+
+  size = count * sizeof (asymbol);
+  p = relplt->relocation;
+  for (i = 0; i < count; i++, p++)
+    {
+      size += strlen ((*p->sym_ptr_ptr)->name) + sizeof ("@plt");
+      if (p->addend != 0)
+	size += sizeof ("+0x") - 1 + 8;
+    }
+
+  size += sizeof (asymbol) + sizeof ("__glink");
+
+  if (resolv_vma)
+    size += sizeof (asymbol) + sizeof ("__glink_PLTresolve");
+
+  s = *ret = bfd_malloc (size);
+  if (s == NULL)
+    return -1;
+
+  names = (char *) (s + count + 1 + (resolv_vma != 0));
+  p = relplt->relocation;
+  for (i = 0; i < count; i++, p++)
+    {
+      size_t len;
+
+      *s = **p->sym_ptr_ptr;
+      /* Undefined syms won't have BSF_LOCAL or BSF_GLOBAL set.  Since
+	 we are defining a symbol, ensure one of them is set.  */
+      if ((s->flags & BSF_LOCAL) == 0)
+	s->flags |= BSF_GLOBAL;
+      s->flags |= BSF_SYNTHETIC;
+      s->section = glink;
+      s->value = stub_vma - glink->vma;
+      s->name = names;
+      s->udata.p = NULL;
+      len = strlen ((*p->sym_ptr_ptr)->name);
+      memcpy (names, (*p->sym_ptr_ptr)->name, len);
+      names += len;
+      if (p->addend != 0)
+	{
+	  memcpy (names, "+0x", sizeof ("+0x") - 1);
+	  names += sizeof ("+0x") - 1;
+	  bfd_sprintf_vma (abfd, names, p->addend);
+	  names += strlen (names);
+	}
+      memcpy (names, "@plt", sizeof ("@plt"));
+      names += sizeof ("@plt");
+      ++s;
+      stub_vma += 16;
+    }
+
+  /* Add a symbol at the start of the glink branch table.  */
+  memset (s, 0, sizeof *s);
+  s->the_bfd = abfd;
+  s->flags = BSF_GLOBAL | BSF_SYNTHETIC;
+  s->section = glink;
+  s->value = glink_vma - glink->vma;
+  s->name = names;
+  memcpy (names, "__glink", sizeof ("__glink"));
+  names += sizeof ("__glink");
+  s++;
+  count++;
+
+  if (resolv_vma)
+    {
+      /* Add a symbol for the glink PLT resolver.  */
+      memset (s, 0, sizeof *s);
+      s->the_bfd = abfd;
+      s->flags = BSF_GLOBAL | BSF_SYNTHETIC;
+      s->section = glink;
+      s->value = resolv_vma - glink->vma;
+      s->name = names;
+      memcpy (names, "__glink_PLTresolve", sizeof ("__glink_PLTresolve"));
+      names += sizeof ("__glink_PLTresolve");
+      s++;
+      count++;
+    }
+
+  return count;
+}
+
+/* The following functions are specific to the ELF linker, while
+   functions above are used generally.  They appear in this file more
+   or less in the order in which they are called.  eg.
+   ppc_elf_check_relocs is called early in the link process,
+   ppc_elf_finish_dynamic_sections is one of the last functions
+   called.  */
+
+/* Track PLT entries needed for a given symbol.  We might need more
+   than one glink entry per symbol when generating a pic binary.  */
+struct plt_entry
+{
+  struct plt_entry *next;
+
+  /* -fPIC uses multiple GOT sections, one per file, called ".got2".
+     This field stores the offset into .got2 used to initialise the
+     GOT pointer reg.  It will always be at least 32768.  (Current
+     gcc always uses an offset of 32768, but ld -r will pack .got2
+     sections together resulting in larger offsets).  */
+  bfd_vma addend;
+
+  /* The .got2 section.  */
+  asection *sec;
+
+  /* PLT refcount or offset.  */
+  union
+    {
+      bfd_signed_vma refcount;
+      bfd_vma offset;
+    } plt;
+
+  /* .glink stub offset.  */
+  bfd_vma glink_offset;
+};
+
+/* Of those relocs that might be copied as dynamic relocs, this function
+   selects those that must be copied when linking a shared library,
+   even when the symbol is local.  */
+
+static int
+must_be_dyn_reloc (struct bfd_link_info *info,
+		   enum elf_ppc_reloc_type r_type)
+{
+  switch (r_type)
+    {
+    default:
+      return 1;
+
+    case R_PPC_REL24:
+    case R_PPC_REL14:
+    case R_PPC_REL14_BRTAKEN:
+    case R_PPC_REL14_BRNTAKEN:
+    case R_PPC_REL32:
+      return 0;
+
+    case R_PPC_TPREL32:
+    case R_PPC_TPREL16:
+    case R_PPC_TPREL16_LO:
+    case R_PPC_TPREL16_HI:
+    case R_PPC_TPREL16_HA:
+      return !info->executable;
+    }
+}
+
+/* If ELIMINATE_COPY_RELOCS is non-zero, the linker will try to avoid
+   copying dynamic variables from a shared lib into an app's dynbss
+   section, and instead use a dynamic relocation to point into the
+   shared lib.  */
+#define ELIMINATE_COPY_RELOCS 1
+
+/* PPC ELF linker hash entry.  */
+
+struct ppc_elf_link_hash_entry
+{
+  struct elf_link_hash_entry elf;
+
+  /* If this symbol is used in the linker created sections, the processor
+     specific backend uses this field to map the field into the offset
+     from the beginning of the section.  */
+  elf_linker_section_pointers_t *linker_section_pointer;
+
+  /* Track dynamic relocs copied for this symbol.  */
+  struct elf_dyn_relocs *dyn_relocs;
+
+  /* Contexts in which symbol is used in the GOT (or TOC).
+     TLS_GD .. TLS_TLS bits are or'd into the mask as the
+     corresponding relocs are encountered during check_relocs.
+     tls_optimize clears TLS_GD .. TLS_TPREL when optimizing to
+     indicate the corresponding GOT entry type is not needed.  */
+#define TLS_GD		 1	/* GD reloc. */
+#define TLS_LD		 2	/* LD reloc. */
+#define TLS_TPREL	 4	/* TPREL reloc, => IE. */
+#define TLS_DTPREL	 8	/* DTPREL reloc, => LD. */
+#define TLS_TLS		16	/* Any TLS reloc.  */
+#define TLS_TPRELGD	32	/* TPREL reloc resulting from GD->IE. */
+#define PLT_IFUNC	64	/* STT_GNU_IFUNC.  */
+  char tls_mask;
+
+  /* Nonzero if we have seen a small data relocation referring to this
+     symbol.  */
+  unsigned char has_sda_refs;
+};
+
+#define ppc_elf_hash_entry(ent) ((struct ppc_elf_link_hash_entry *) (ent))
+
+/* PPC ELF linker hash table.  */
+
+struct ppc_elf_link_hash_table
+{
+  struct elf_link_hash_table elf;
+
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *got;
+  asection *relgot;
+  asection *glink;
+  asection *plt;
+  asection *relplt;
+  asection *iplt;
+  asection *reliplt;
+  asection *dynbss;
+  asection *relbss;
+  asection *dynsbss;
+  asection *relsbss;
+  elf_linker_section_t sdata[2];
+  asection *sbss;
+  asection *glink_eh_frame;
+
+  /* The (unloaded but important) .rela.plt.unloaded on VxWorks.  */
+  asection *srelplt2;
+
+  /* The .got.plt section (VxWorks only)*/
+  asection *sgotplt;
+
+  /* Shortcut to __tls_get_addr.  */
+  struct elf_link_hash_entry *tls_get_addr;
+
+  /* The bfd that forced an old-style PLT.  */
+  bfd *old_bfd;
+
+  /* TLS local dynamic got entry handling.  */
+  union {
+    bfd_signed_vma refcount;
+    bfd_vma offset;
+  } tlsld_got;
+
+  /* Offset of branch table to PltResolve function in glink.  */
+  bfd_vma glink_pltresolve;
+
+  /* Size of reserved GOT entries.  */
+  unsigned int got_header_size;
+  /* Non-zero if allocating the header left a gap.  */
+  unsigned int got_gap;
+
+  /* The type of PLT we have chosen to use.  */
+  enum ppc_elf_plt_type plt_type;
+
+  /* Set if we should emit symbols for stubs.  */
+  unsigned int emit_stub_syms:1;
+
+  /* Set if __tls_get_addr optimization should not be done.  */
+  unsigned int no_tls_get_addr_opt:1;
+
+  /* True if the target system is VxWorks.  */
+  unsigned int is_vxworks:1;
+
+  /* The size of PLT entries.  */
+  int plt_entry_size;
+  /* The distance between adjacent PLT slots.  */
+  int plt_slot_size;
+  /* The size of the first PLT entry.  */
+  int plt_initial_entry_size;
+
+  /* Small local sym cache.  */
+  struct sym_cache sym_cache;
+};
+
+/* Rename some of the generic section flags to better document how they
+   are used here.  */
+
+/* Nonzero if this section has TLS related relocations.  */
+#define has_tls_reloc sec_flg0
+
+/* Nonzero if this section has a call to __tls_get_addr.  */
+#define has_tls_get_addr_call sec_flg1
+
+/* Get the PPC ELF linker hash table from a link_info structure.  */
+
+#define ppc_elf_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == PPC32_ELF_DATA ? ((struct ppc_elf_link_hash_table *) ((p)->hash)) : NULL)
+
+/* Create an entry in a PPC ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+ppc_elf_link_hash_newfunc (struct bfd_hash_entry *entry,
+			   struct bfd_hash_table *table,
+			   const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table,
+				 sizeof (struct ppc_elf_link_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = _bfd_elf_link_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      ppc_elf_hash_entry (entry)->linker_section_pointer = NULL;
+      ppc_elf_hash_entry (entry)->dyn_relocs = NULL;
+      ppc_elf_hash_entry (entry)->tls_mask = 0;
+      ppc_elf_hash_entry (entry)->has_sda_refs = 0;
+    }
+
+  return entry;
+}
+
+/* Create a PPC ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+ppc_elf_link_hash_table_create (bfd *abfd)
+{
+  struct ppc_elf_link_hash_table *ret;
+
+  ret = bfd_zmalloc (sizeof (struct ppc_elf_link_hash_table));
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd,
+				      ppc_elf_link_hash_newfunc,
+				      sizeof (struct ppc_elf_link_hash_entry),
+				      PPC32_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  ret->elf.init_plt_refcount.refcount = 0;
+  ret->elf.init_plt_refcount.glist = NULL;
+  ret->elf.init_plt_offset.offset = 0;
+  ret->elf.init_plt_offset.glist = NULL;
+
+  ret->sdata[0].name = ".sdata";
+  ret->sdata[0].sym_name = "_SDA_BASE_";
+  ret->sdata[0].bss_name = ".sbss";
+
+  ret->sdata[1].name = ".sdata2";
+  ret->sdata[1].sym_name = "_SDA2_BASE_";
+  ret->sdata[1].bss_name = ".sbss2";
+
+  ret->plt_entry_size = 12;
+  ret->plt_slot_size = 8;
+  ret->plt_initial_entry_size = 72;
+
+  return &ret->elf.root;
+}
+
+/* Create .got and the related sections.  */
+
+static bfd_boolean
+ppc_elf_create_got (bfd *abfd, struct bfd_link_info *info)
+{
+  struct ppc_elf_link_hash_table *htab;
+  asection *s;
+  flagword flags;
+
+  if (!_bfd_elf_create_got_section (abfd, info))
+    return FALSE;
+
+  htab = ppc_elf_hash_table (info);
+  htab->got = s = bfd_get_section_by_name (abfd, ".got");
+  if (s == NULL)
+    abort ();
+
+  if (htab->is_vxworks)
+    {
+      htab->sgotplt = bfd_get_section_by_name (abfd, ".got.plt");
+      if (!htab->sgotplt)
+	abort ();
+    }
+  else
+    {
+      /* The powerpc .got has a blrl instruction in it.  Mark it
+	 executable.  */
+      flags = (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS
+	       | SEC_IN_MEMORY | SEC_LINKER_CREATED);
+      if (!bfd_set_section_flags (abfd, s, flags))
+	return FALSE;
+    }
+
+  htab->relgot = bfd_get_section_by_name (abfd, ".rela.got");
+  if (!htab->relgot)
+    abort ();
+
+  return TRUE;
+}
+
+static bfd_boolean
+ppc_elf_create_glink (bfd *abfd, struct bfd_link_info *info)
+{
+  struct ppc_elf_link_hash_table *htab = ppc_elf_hash_table (info);
+  asection *s;
+  flagword flags;
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_READONLY | SEC_HAS_CONTENTS
+	   | SEC_IN_MEMORY | SEC_LINKER_CREATED);
+  s = bfd_make_section_anyway_with_flags (abfd, ".glink", flags);
+  htab->glink = s;
+  if (s == NULL
+      || !bfd_set_section_alignment (abfd, s, 4))
+    return FALSE;
+
+  if (!info->no_ld_generated_unwind_info)
+    {
+      flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_HAS_CONTENTS
+	       | SEC_IN_MEMORY | SEC_LINKER_CREATED);
+      s = bfd_make_section_anyway_with_flags (abfd, ".eh_frame", flags);
+      htab->glink_eh_frame = s;
+      if (s == NULL
+	  || !bfd_set_section_alignment (abfd, s, 2))
+	return FALSE;
+    }
+
+  flags = SEC_ALLOC | SEC_LINKER_CREATED;
+  s = bfd_make_section_anyway_with_flags (abfd, ".iplt", flags);
+  htab->iplt = s;
+  if (s == NULL
+      || !bfd_set_section_alignment (abfd, s, 4))
+    return FALSE;
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_HAS_CONTENTS
+	   | SEC_IN_MEMORY | SEC_LINKER_CREATED);
+  s = bfd_make_section_anyway_with_flags (abfd, ".rela.iplt", flags);
+  htab->reliplt = s;
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, 2))
+    return FALSE;
+  return TRUE;
+}
+
+/* We have to create .dynsbss and .rela.sbss here so that they get mapped
+   to output sections (just like _bfd_elf_create_dynamic_sections has
+   to create .dynbss and .rela.bss).  */
+
+static bfd_boolean
+ppc_elf_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  struct ppc_elf_link_hash_table *htab;
+  asection *s;
+  flagword flags;
+
+  htab = ppc_elf_hash_table (info);
+
+  if (htab->got == NULL
+      && !ppc_elf_create_got (abfd, info))
+    return FALSE;
+
+  if (!_bfd_elf_create_dynamic_sections (abfd, info))
+    return FALSE;
+
+  if (htab->glink == NULL
+      && !ppc_elf_create_glink (abfd, info))
+    return FALSE;
+
+  htab->dynbss = bfd_get_section_by_name (abfd, ".dynbss");
+  s = bfd_make_section_anyway_with_flags (abfd, ".dynsbss",
+					  SEC_ALLOC | SEC_LINKER_CREATED);
+  htab->dynsbss = s;
+  if (s == NULL)
+    return FALSE;
+
+  if (! info->shared)
+    {
+      htab->relbss = bfd_get_section_by_name (abfd, ".rela.bss");
+      flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_HAS_CONTENTS
+	       | SEC_IN_MEMORY | SEC_LINKER_CREATED);
+      s = bfd_make_section_anyway_with_flags (abfd, ".rela.sbss", flags);
+      htab->relsbss = s;
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, 2))
+	return FALSE;
+    }
+
+  if (htab->is_vxworks
+      && !elf_vxworks_create_dynamic_sections (abfd, info, &htab->srelplt2))
+    return FALSE;
+
+  htab->relplt = bfd_get_section_by_name (abfd, ".rela.plt");
+  htab->plt = s = bfd_get_section_by_name (abfd, ".plt");
+  if (s == NULL)
+    abort ();
+
+  flags = SEC_ALLOC | SEC_CODE | SEC_LINKER_CREATED;
+  if (htab->plt_type == PLT_VXWORKS)
+    /* The VxWorks PLT is a loaded section with contents.  */
+    flags |= SEC_HAS_CONTENTS | SEC_LOAD | SEC_READONLY;
+  return bfd_set_section_flags (abfd, s, flags);
+}
+
+/* Copy the extra info we tack onto an elf_link_hash_entry.  */
+
+static void
+ppc_elf_copy_indirect_symbol (struct bfd_link_info *info,
+			      struct elf_link_hash_entry *dir,
+			      struct elf_link_hash_entry *ind)
+{
+  struct ppc_elf_link_hash_entry *edir, *eind;
+
+  edir = (struct ppc_elf_link_hash_entry *) dir;
+  eind = (struct ppc_elf_link_hash_entry *) ind;
+
+  edir->tls_mask |= eind->tls_mask;
+  edir->has_sda_refs |= eind->has_sda_refs;
+
+  /* If called to transfer flags for a weakdef during processing
+     of elf_adjust_dynamic_symbol, don't copy non_got_ref.
+     We clear it ourselves for ELIMINATE_COPY_RELOCS.  */
+  if (!(ELIMINATE_COPY_RELOCS
+	&& eind->elf.root.type != bfd_link_hash_indirect
+	&& edir->elf.dynamic_adjusted))
+    edir->elf.non_got_ref |= eind->elf.non_got_ref;
+
+  edir->elf.ref_dynamic |= eind->elf.ref_dynamic;
+  edir->elf.ref_regular |= eind->elf.ref_regular;
+  edir->elf.ref_regular_nonweak |= eind->elf.ref_regular_nonweak;
+  edir->elf.needs_plt |= eind->elf.needs_plt;
+  edir->elf.pointer_equality_needed |= eind->elf.pointer_equality_needed;
+
+  /* If we were called to copy over info for a weak sym, that's all.  */
+  if (eind->elf.root.type != bfd_link_hash_indirect)
+    return;
+
+  if (eind->dyn_relocs != NULL)
+    {
+      if (edir->dyn_relocs != NULL)
+	{
+	  struct elf_dyn_relocs **pp;
+	  struct elf_dyn_relocs *p;
+
+	  /* Add reloc counts against the indirect sym to the direct sym
+	     list.  Merge any entries against the same section.  */
+	  for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      struct elf_dyn_relocs *q;
+
+	      for (q = edir->dyn_relocs; q != NULL; q = q->next)
+		if (q->sec == p->sec)
+		  {
+		    q->pc_count += p->pc_count;
+		    q->count += p->count;
+		    *pp = p->next;
+		    break;
+		  }
+	      if (q == NULL)
+		pp = &p->next;
+	    }
+	  *pp = edir->dyn_relocs;
+	}
+
+      edir->dyn_relocs = eind->dyn_relocs;
+      eind->dyn_relocs = NULL;
+    }
+
+  /* Copy over the GOT refcount entries that we may have already seen to
+     the symbol which just became indirect.  */
+  edir->elf.got.refcount += eind->elf.got.refcount;
+  eind->elf.got.refcount = 0;
+
+  /* And plt entries.  */
+  if (eind->elf.plt.plist != NULL)
+    {
+      if (edir->elf.plt.plist != NULL)
+	{
+	  struct plt_entry **entp;
+	  struct plt_entry *ent;
+
+	  for (entp = &eind->elf.plt.plist; (ent = *entp) != NULL; )
+	    {
+	      struct plt_entry *dent;
+
+	      for (dent = edir->elf.plt.plist; dent != NULL; dent = dent->next)
+		if (dent->sec == ent->sec && dent->addend == ent->addend)
+		  {
+		    dent->plt.refcount += ent->plt.refcount;
+		    *entp = ent->next;
+		    break;
+		  }
+	      if (dent == NULL)
+		entp = &ent->next;
+	    }
+	  *entp = edir->elf.plt.plist;
+	}
+
+      edir->elf.plt.plist = eind->elf.plt.plist;
+      eind->elf.plt.plist = NULL;
+    }
+
+  if (eind->elf.dynindx != -1)
+    {
+      if (edir->elf.dynindx != -1)
+	_bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
+				edir->elf.dynstr_index);
+      edir->elf.dynindx = eind->elf.dynindx;
+      edir->elf.dynstr_index = eind->elf.dynstr_index;
+      eind->elf.dynindx = -1;
+      eind->elf.dynstr_index = 0;
+    }
+}
+
+/* Hook called by the linker routine which adds symbols from an object
+   file.  We use it to put .comm items in .sbss, and not .bss.  */
+
+static bfd_boolean
+ppc_elf_add_symbol_hook (bfd *abfd,
+			 struct bfd_link_info *info,
+			 Elf_Internal_Sym *sym,
+			 const char **namep ATTRIBUTE_UNUSED,
+			 flagword *flagsp ATTRIBUTE_UNUSED,
+			 asection **secp,
+			 bfd_vma *valp)
+{
+  if (sym->st_shndx == SHN_COMMON
+      && !info->relocatable
+      && is_ppc_elf (info->output_bfd)
+      && sym->st_size <= elf_gp_size (abfd))
+    {
+      /* Common symbols less than or equal to -G nn bytes are automatically
+	 put into .sbss.  */
+      struct ppc_elf_link_hash_table *htab;
+
+      htab = ppc_elf_hash_table (info);
+      if (htab->sbss == NULL)
+	{
+	  flagword flags = SEC_IS_COMMON | SEC_LINKER_CREATED;
+
+	  if (!htab->elf.dynobj)
+	    htab->elf.dynobj = abfd;
+
+	  htab->sbss = bfd_make_section_anyway_with_flags (htab->elf.dynobj,
+							   ".sbss",
+							   flags);
+	  if (htab->sbss == NULL)
+	    return FALSE;
+	}
+
+      *secp = htab->sbss;
+      *valp = sym->st_size;
+    }
+
+  if ((abfd->flags & DYNAMIC) == 0
+      && (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC
+	  || ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE))
+    elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE;
+
+  return TRUE;
+}
+
+static bfd_boolean
+create_sdata_sym (struct bfd_link_info *info, elf_linker_section_t *lsect)
+{
+  struct ppc_elf_link_hash_table *htab = ppc_elf_hash_table (info);
+
+  lsect->sym = elf_link_hash_lookup (&htab->elf, lsect->sym_name,
+				     TRUE, FALSE, TRUE);
+  if (lsect->sym == NULL)
+    return FALSE;
+  if (lsect->sym->root.type == bfd_link_hash_new)
+    lsect->sym->non_elf = 0;
+  lsect->sym->ref_regular = 1;
+  _bfd_elf_link_hash_hide_symbol (info, lsect->sym, TRUE);
+  return TRUE;
+}
+
+/* Create a special linker section.  */
+
+static bfd_boolean
+ppc_elf_create_linker_section (bfd *abfd,
+			       struct bfd_link_info *info,
+			       flagword flags,
+			       elf_linker_section_t *lsect)
+{
+  struct ppc_elf_link_hash_table *htab = ppc_elf_hash_table (info);
+  asection *s;
+
+  flags |= (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	    | SEC_LINKER_CREATED);
+
+  /* Record the first bfd that needs the special sections.  */
+  if (!htab->elf.dynobj)
+    htab->elf.dynobj = abfd;
+
+  s = bfd_make_section_anyway_with_flags (htab->elf.dynobj,
+					  lsect->name,
+					  flags);
+  if (s == NULL
+      || !bfd_set_section_alignment (htab->elf.dynobj, s, 2))
+    return FALSE;
+  lsect->section = s;
+
+  return create_sdata_sym (info, lsect);
+}
+
+/* Find a linker generated pointer with a given addend and type.  */
+
+static elf_linker_section_pointers_t *
+elf_find_pointer_linker_section
+  (elf_linker_section_pointers_t *linker_pointers,
+   bfd_vma addend,
+   elf_linker_section_t *lsect)
+{
+  for ( ; linker_pointers != NULL; linker_pointers = linker_pointers->next)
+    if (lsect == linker_pointers->lsect && addend == linker_pointers->addend)
+      return linker_pointers;
+
+  return NULL;
+}
+
+/* Allocate a pointer to live in a linker created section.  */
+
+static bfd_boolean
+elf_create_pointer_linker_section (bfd *abfd,
+				   elf_linker_section_t *lsect,
+				   struct elf_link_hash_entry *h,
+				   const Elf_Internal_Rela *rel)
+{
+  elf_linker_section_pointers_t **ptr_linker_section_ptr = NULL;
+  elf_linker_section_pointers_t *linker_section_ptr;
+  unsigned long r_symndx = ELF32_R_SYM (rel->r_info);
+  bfd_size_type amt;
+
+  BFD_ASSERT (lsect != NULL);
+
+  /* Is this a global symbol?  */
+  if (h != NULL)
+    {
+      struct ppc_elf_link_hash_entry *eh;
+
+      /* Has this symbol already been allocated?  If so, our work is done.  */
+      eh = (struct ppc_elf_link_hash_entry *) h;
+      if (elf_find_pointer_linker_section (eh->linker_section_pointer,
+					   rel->r_addend,
+					   lsect))
+	return TRUE;
+
+      ptr_linker_section_ptr = &eh->linker_section_pointer;
+    }
+  else
+    {
+      BFD_ASSERT (is_ppc_elf (abfd));
+
+      /* Allocation of a pointer to a local symbol.  */
+      elf_linker_section_pointers_t **ptr = elf_local_ptr_offsets (abfd);
+
+      /* Allocate a table to hold the local symbols if first time.  */
+      if (!ptr)
+	{
+	  unsigned int num_symbols = elf_symtab_hdr (abfd).sh_info;
+
+	  amt = num_symbols;
+	  amt *= sizeof (elf_linker_section_pointers_t *);
+	  ptr = bfd_zalloc (abfd, amt);
+
+	  if (!ptr)
+	    return FALSE;
+
+	  elf_local_ptr_offsets (abfd) = ptr;
+	}
+
+      /* Has this symbol already been allocated?  If so, our work is done.  */
+      if (elf_find_pointer_linker_section (ptr[r_symndx],
+					   rel->r_addend,
+					   lsect))
+	return TRUE;
+
+      ptr_linker_section_ptr = &ptr[r_symndx];
+    }
+
+  /* Allocate space for a pointer in the linker section, and allocate
+     a new pointer record from internal memory.  */
+  BFD_ASSERT (ptr_linker_section_ptr != NULL);
+  amt = sizeof (elf_linker_section_pointers_t);
+  linker_section_ptr = bfd_alloc (abfd, amt);
+
+  if (!linker_section_ptr)
+    return FALSE;
+
+  linker_section_ptr->next = *ptr_linker_section_ptr;
+  linker_section_ptr->addend = rel->r_addend;
+  linker_section_ptr->lsect = lsect;
+  *ptr_linker_section_ptr = linker_section_ptr;
+
+  linker_section_ptr->offset = lsect->section->size;
+  lsect->section->size += 4;
+
+#ifdef DEBUG
+  fprintf (stderr,
+	   "Create pointer in linker section %s, offset = %ld, section size = %ld\n",
+	   lsect->name, (long) linker_section_ptr->offset,
+	   (long) lsect->section->size);
+#endif
+
+  return TRUE;
+}
+
+static struct plt_entry **
+update_local_sym_info (bfd *abfd,
+		       Elf_Internal_Shdr *symtab_hdr,
+		       unsigned long r_symndx,
+		       int tls_type)
+{
+  bfd_signed_vma *local_got_refcounts = elf_local_got_refcounts (abfd);
+  struct plt_entry **local_plt;
+  char *local_got_tls_masks;
+
+  if (local_got_refcounts == NULL)
+    {
+      bfd_size_type size = symtab_hdr->sh_info;
+
+      size *= (sizeof (*local_got_refcounts)
+	       + sizeof (*local_plt)
+	       + sizeof (*local_got_tls_masks));
+      local_got_refcounts = bfd_zalloc (abfd, size);
+      if (local_got_refcounts == NULL)
+	return NULL;
+      elf_local_got_refcounts (abfd) = local_got_refcounts;
+    }
+
+  local_plt = (struct plt_entry **) (local_got_refcounts + symtab_hdr->sh_info);
+  local_got_tls_masks = (char *) (local_plt + symtab_hdr->sh_info);
+  local_got_tls_masks[r_symndx] |= tls_type;
+  if (tls_type != PLT_IFUNC)
+    local_got_refcounts[r_symndx] += 1;
+  return local_plt + r_symndx;
+}
+
+static bfd_boolean
+update_plt_info (bfd *abfd, struct plt_entry **plist,
+		 asection *sec, bfd_vma addend)
+{
+  struct plt_entry *ent;
+
+  if (addend < 32768)
+    sec = NULL;
+  for (ent = *plist; ent != NULL; ent = ent->next)
+    if (ent->sec == sec && ent->addend == addend)
+      break;
+  if (ent == NULL)
+    {
+      bfd_size_type amt = sizeof (*ent);
+      ent = bfd_alloc (abfd, amt);
+      if (ent == NULL)
+	return FALSE;
+      ent->next = *plist;
+      ent->sec = sec;
+      ent->addend = addend;
+      ent->plt.refcount = 0;
+      *plist = ent;
+    }
+  ent->plt.refcount += 1;
+  return TRUE;
+}
+
+static struct plt_entry *
+find_plt_ent (struct plt_entry **plist, asection *sec, bfd_vma addend)
+{
+  struct plt_entry *ent;
+
+  if (addend < 32768)
+    sec = NULL;
+  for (ent = *plist; ent != NULL; ent = ent->next)
+    if (ent->sec == sec && ent->addend == addend)
+      break;
+  return ent;
+}
+
+static bfd_boolean
+is_branch_reloc (enum elf_ppc_reloc_type r_type)
+{
+  return (r_type == R_PPC_PLTREL24
+	  || r_type == R_PPC_LOCAL24PC
+	  || r_type == R_PPC_REL24
+	  || r_type == R_PPC_REL14
+	  || r_type == R_PPC_REL14_BRTAKEN
+	  || r_type == R_PPC_REL14_BRNTAKEN
+	  || r_type == R_PPC_ADDR24
+	  || r_type == R_PPC_ADDR14
+	  || r_type == R_PPC_ADDR14_BRTAKEN
+	  || r_type == R_PPC_ADDR14_BRNTAKEN);
+}
+
+static void
+bad_shared_reloc (bfd *abfd, enum elf_ppc_reloc_type r_type)
+{
+  (*_bfd_error_handler)
+    (_("%B: relocation %s cannot be used when making a shared object"),
+     abfd,
+     ppc_elf_howto_table[r_type]->name);
+  bfd_set_error (bfd_error_bad_value);
+}
+
+/* Look through the relocs for a section during the first phase, and
+   allocate space in the global offset table or procedure linkage
+   table.  */
+
+static bfd_boolean
+ppc_elf_check_relocs (bfd *abfd,
+		      struct bfd_link_info *info,
+		      asection *sec,
+		      const Elf_Internal_Rela *relocs)
+{
+  struct ppc_elf_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  asection *got2, *sreloc;
+  struct elf_link_hash_entry *tga;
+
+  if (info->relocatable)
+    return TRUE;
+
+  /* Don't do anything special with non-loaded, non-alloced sections.
+     In particular, any relocs in such sections should not affect GOT
+     and PLT reference counting (ie. we don't allow them to create GOT
+     or PLT entries), there's no possibility or desire to optimize TLS
+     relocs, and there's not much point in propagating relocs to shared
+     libs that the dynamic linker won't relocate.  */
+  if ((sec->flags & SEC_ALLOC) == 0)
+    return TRUE;
+
+#ifdef DEBUG
+  _bfd_error_handler ("ppc_elf_check_relocs called for section %A in %B",
+		      sec, abfd);
+#endif
+
+  BFD_ASSERT (is_ppc_elf (abfd));
+
+  /* Initialize howto table if not already done.  */
+  if (!ppc_elf_howto_table[R_PPC_ADDR32])
+    ppc_elf_howto_init ();
+
+  htab = ppc_elf_hash_table (info);
+  if (htab->glink == NULL)
+    {
+      if (htab->elf.dynobj == NULL)
+	htab->elf.dynobj = abfd;
+      if (!ppc_elf_create_glink (htab->elf.dynobj, info))
+	return FALSE;
+    }
+  tga = elf_link_hash_lookup (&htab->elf, "__tls_get_addr",
+			      FALSE, FALSE, TRUE);
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+  got2 = bfd_get_section_by_name (abfd, ".got2");
+  sreloc = NULL;
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      unsigned long r_symndx;
+      enum elf_ppc_reloc_type r_type;
+      struct elf_link_hash_entry *h;
+      int tls_type;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+	h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      /* If a relocation refers to _GLOBAL_OFFSET_TABLE_, create the .got.
+	 This shows up in particular in an R_PPC_ADDR32 in the eabi
+	 startup code.  */
+      if (h != NULL
+	  && htab->got == NULL
+	  && strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
+	{
+	  if (htab->elf.dynobj == NULL)
+	    htab->elf.dynobj = abfd;
+	  if (!ppc_elf_create_got (htab->elf.dynobj, info))
+	    return FALSE;
+	  BFD_ASSERT (h == htab->elf.hgot);
+	}
+
+      tls_type = 0;
+      r_type = ELF32_R_TYPE (rel->r_info);
+      if (h == NULL && !htab->is_vxworks)
+	{
+	  Elf_Internal_Sym *isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+							  abfd, r_symndx);
+	  if (isym == NULL)
+	    return FALSE;
+
+	  if (ELF_ST_TYPE (isym->st_info) == STT_GNU_IFUNC
+	      && (!info->shared
+		  || is_branch_reloc (r_type)))
+	    {
+	      struct plt_entry **ifunc;
+	      bfd_vma addend;
+
+	      ifunc = update_local_sym_info (abfd, symtab_hdr, r_symndx,
+					     PLT_IFUNC);
+	      if (ifunc == NULL)
+		return FALSE;
+
+	      /* STT_GNU_IFUNC symbols must have a PLT entry;
+		 In a non-pie executable even when there are
+		 no plt calls.  */
+	      addend = 0;
+	      if (r_type == R_PPC_PLTREL24)
+		{
+		  ppc_elf_tdata (abfd)->makes_plt_call = 1;
+		  if (info->shared)
+		    addend = rel->r_addend;
+		}
+	      if (!update_plt_info (abfd, ifunc, got2, addend))
+		return FALSE;
+	    }
+	}
+
+      if (!htab->is_vxworks
+	  && is_branch_reloc (r_type)
+	  && h != NULL
+	  && h == tga)
+	{
+	  if (rel != relocs
+	      && (ELF32_R_TYPE (rel[-1].r_info) == R_PPC_TLSGD
+		  || ELF32_R_TYPE (rel[-1].r_info) == R_PPC_TLSLD))
+	    /* We have a new-style __tls_get_addr call with a marker
+	       reloc.  */
+	    ;
+	  else
+	    /* Mark this section as having an old-style call.  */
+	    sec->has_tls_get_addr_call = 1;
+	}
+
+      switch (r_type)
+	{
+	case R_PPC_TLSGD:
+	case R_PPC_TLSLD:
+	  /* These special tls relocs tie a call to __tls_get_addr with
+	     its parameter symbol.  */
+	  break;
+
+	case R_PPC_GOT_TLSLD16:
+	case R_PPC_GOT_TLSLD16_LO:
+	case R_PPC_GOT_TLSLD16_HI:
+	case R_PPC_GOT_TLSLD16_HA:
+	  tls_type = TLS_TLS | TLS_LD;
+	  goto dogottls;
+
+	case R_PPC_GOT_TLSGD16:
+	case R_PPC_GOT_TLSGD16_LO:
+	case R_PPC_GOT_TLSGD16_HI:
+	case R_PPC_GOT_TLSGD16_HA:
+	  tls_type = TLS_TLS | TLS_GD;
+	  goto dogottls;
+
+	case R_PPC_GOT_TPREL16:
+	case R_PPC_GOT_TPREL16_LO:
+	case R_PPC_GOT_TPREL16_HI:
+	case R_PPC_GOT_TPREL16_HA:
+	  if (!info->executable)
+	    info->flags |= DF_STATIC_TLS;
+	  tls_type = TLS_TLS | TLS_TPREL;
+	  goto dogottls;
+
+	case R_PPC_GOT_DTPREL16:
+	case R_PPC_GOT_DTPREL16_LO:
+	case R_PPC_GOT_DTPREL16_HI:
+	case R_PPC_GOT_DTPREL16_HA:
+	  tls_type = TLS_TLS | TLS_DTPREL;
+	dogottls:
+	  sec->has_tls_reloc = 1;
+	  /* Fall thru */
+
+	  /* GOT16 relocations */
+	case R_PPC_GOT16:
+	case R_PPC_GOT16_LO:
+	case R_PPC_GOT16_HI:
+	case R_PPC_GOT16_HA:
+	  /* This symbol requires a global offset table entry.  */
+	  if (htab->got == NULL)
+	    {
+	      if (htab->elf.dynobj == NULL)
+		htab->elf.dynobj = abfd;
+	      if (!ppc_elf_create_got (htab->elf.dynobj, info))
+		return FALSE;
+	    }
+	  if (h != NULL)
+	    {
+	      h->got.refcount += 1;
+	      ppc_elf_hash_entry (h)->tls_mask |= tls_type;
+	    }
+	  else
+	    /* This is a global offset table entry for a local symbol.  */
+	    if (!update_local_sym_info (abfd, symtab_hdr, r_symndx, tls_type))
+	      return FALSE;
+
+	  /* We may also need a plt entry if the symbol turns out to be
+	     an ifunc.  */
+	  if (h != NULL && !info->shared)
+	    {
+	      if (!update_plt_info (abfd, &h->plt.plist, NULL, 0))
+		return FALSE;
+	    }
+	  break;
+
+	  /* Indirect .sdata relocation.  */
+	case R_PPC_EMB_SDAI16:
+	  if (info->shared)
+	    {
+	      bad_shared_reloc (abfd, r_type);
+	      return FALSE;
+	    }
+	  if (htab->sdata[0].section == NULL
+	      && !ppc_elf_create_linker_section (abfd, info, 0,
+						 &htab->sdata[0]))
+	    return FALSE;
+	  if (!elf_create_pointer_linker_section (abfd, &htab->sdata[0],
+						  h, rel))
+	    return FALSE;
+	  if (h != NULL)
+	    {
+	      ppc_elf_hash_entry (h)->has_sda_refs = TRUE;
+	      h->non_got_ref = TRUE;
+	    }
+	  break;
+
+	  /* Indirect .sdata2 relocation.  */
+	case R_PPC_EMB_SDA2I16:
+	  if (info->shared)
+	    {
+	      bad_shared_reloc (abfd, r_type);
+	      return FALSE;
+	    }
+	  if (htab->sdata[1].section == NULL
+	      && !ppc_elf_create_linker_section (abfd, info, SEC_READONLY,
+						 &htab->sdata[1]))
+	    return FALSE;
+	  if (!elf_create_pointer_linker_section (abfd, &htab->sdata[1],
+						  h, rel))
+	    return FALSE;
+	  if (h != NULL)
+	    {
+	      ppc_elf_hash_entry (h)->has_sda_refs = TRUE;
+	      h->non_got_ref = TRUE;
+	    }
+	  break;
+
+	case R_PPC_SDAREL16:
+	  if (htab->sdata[0].sym == NULL
+	      && !create_sdata_sym (info, &htab->sdata[0]))
+	    return FALSE;
+	  if (h != NULL)
+	    {
+	      ppc_elf_hash_entry (h)->has_sda_refs = TRUE;
+	      h->non_got_ref = TRUE;
+	    }
+	  break;
+
+	case R_PPC_EMB_SDA2REL:
+	  if (info->shared)
+	    {
+	      bad_shared_reloc (abfd, r_type);
+	      return FALSE;
+	    }
+	  if (htab->sdata[1].sym == NULL
+	      && !create_sdata_sym (info, &htab->sdata[1]))
+	    return FALSE;
+	  if (h != NULL)
+	    {
+	      ppc_elf_hash_entry (h)->has_sda_refs = TRUE;
+	      h->non_got_ref = TRUE;
+	    }
+	  break;
+
+	case R_PPC_EMB_SDA21:
+	case R_PPC_EMB_RELSDA:
+	  if (info->shared)
+	    {
+	      bad_shared_reloc (abfd, r_type);
+	      return FALSE;
+	    }
+	  if (htab->sdata[0].sym == NULL
+	      && !create_sdata_sym (info, &htab->sdata[0]))
+	    return FALSE;
+	  if (htab->sdata[1].sym == NULL
+	      && !create_sdata_sym (info, &htab->sdata[1]))
+	    return FALSE;
+	  if (h != NULL)
+	    {
+	      ppc_elf_hash_entry (h)->has_sda_refs = TRUE;
+	      h->non_got_ref = TRUE;
+	    }
+	  break;
+
+	case R_PPC_EMB_NADDR32:
+	case R_PPC_EMB_NADDR16:
+	case R_PPC_EMB_NADDR16_LO:
+	case R_PPC_EMB_NADDR16_HI:
+	case R_PPC_EMB_NADDR16_HA:
+	  if (info->shared)
+	    {
+	      bad_shared_reloc (abfd, r_type);
+	      return FALSE;
+	    }
+	  if (h != NULL)
+	    h->non_got_ref = TRUE;
+	  break;
+
+	case R_PPC_PLTREL24:
+	  if (h == NULL)
+	    break;
+	  /* Fall through */
+	case R_PPC_PLT32:
+	case R_PPC_PLTREL32:
+	case R_PPC_PLT16_LO:
+	case R_PPC_PLT16_HI:
+	case R_PPC_PLT16_HA:
+#ifdef DEBUG
+	  fprintf (stderr, "Reloc requires a PLT entry\n");
+#endif
+	  /* This symbol requires a procedure linkage table entry.  We
+	     actually build the entry in finish_dynamic_symbol,
+	     because this might be a case of linking PIC code without
+	     linking in any dynamic objects, in which case we don't
+	     need to generate a procedure linkage table after all.  */
+
+	  if (h == NULL)
+	    {
+	      /* It does not make sense to have a procedure linkage
+		 table entry for a local symbol.  */
+	      info->callbacks->einfo (_("%P: %H: %s reloc against local symbol\n"),
+				      abfd, sec, rel->r_offset,
+				      ppc_elf_howto_table[r_type]->name);
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	  else
+	    {
+	      bfd_vma addend = 0;
+
+	      if (r_type == R_PPC_PLTREL24)
+		{
+		  ppc_elf_tdata (abfd)->makes_plt_call = 1;
+		  if (info->shared)
+		    addend = rel->r_addend;
+		}
+	      h->needs_plt = 1;
+	      if (!update_plt_info (abfd, &h->plt.plist, got2, addend))
+		return FALSE;
+	    }
+	  break;
+
+	  /* The following relocations don't need to propagate the
+	     relocation if linking a shared object since they are
+	     section relative.  */
+	case R_PPC_SECTOFF:
+	case R_PPC_SECTOFF_LO:
+	case R_PPC_SECTOFF_HI:
+	case R_PPC_SECTOFF_HA:
+	case R_PPC_DTPREL16:
+	case R_PPC_DTPREL16_LO:
+	case R_PPC_DTPREL16_HI:
+	case R_PPC_DTPREL16_HA:
+	case R_PPC_TOC16:
+	  break;
+
+	case R_PPC_REL16:
+	case R_PPC_REL16_LO:
+	case R_PPC_REL16_HI:
+	case R_PPC_REL16_HA:
+	  ppc_elf_tdata (abfd)->has_rel16 = 1;
+	  break;
+
+	  /* These are just markers.  */
+	case R_PPC_TLS:
+	case R_PPC_EMB_MRKREF:
+	case R_PPC_NONE:
+	case R_PPC_max:
+	case R_PPC_RELAX:
+	case R_PPC_RELAX_PLT:
+	case R_PPC_RELAX_PLTREL24:
+	  break;
+
+	  /* These should only appear in dynamic objects.  */
+	case R_PPC_COPY:
+	case R_PPC_GLOB_DAT:
+	case R_PPC_JMP_SLOT:
+	case R_PPC_RELATIVE:
+	case R_PPC_IRELATIVE:
+	  break;
+
+	  /* These aren't handled yet.  We'll report an error later.  */
+	case R_PPC_ADDR30:
+	case R_PPC_EMB_RELSEC16:
+	case R_PPC_EMB_RELST_LO:
+	case R_PPC_EMB_RELST_HI:
+	case R_PPC_EMB_RELST_HA:
+	case R_PPC_EMB_BIT_FLD:
+	  break;
+
+	  /* This refers only to functions defined in the shared library.  */
+	case R_PPC_LOCAL24PC:
+	  if (h != NULL && h == htab->elf.hgot && htab->plt_type == PLT_UNSET)
+	    {
+	      htab->plt_type = PLT_OLD;
+	      htab->old_bfd = abfd;
+	    }
+	  break;
+
+	  /* This relocation describes the C++ object vtable hierarchy.
+	     Reconstruct it for later use during GC.  */
+	case R_PPC_GNU_VTINHERIT:
+	  if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+	    return FALSE;
+	  break;
+
+	  /* This relocation describes which C++ vtable entries are actually
+	     used.  Record for later use during GC.  */
+	case R_PPC_GNU_VTENTRY:
+	  BFD_ASSERT (h != NULL);
+	  if (h != NULL
+	      && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+	    return FALSE;
+	  break;
+
+	  /* We shouldn't really be seeing these.  */
+	case R_PPC_TPREL32:
+	case R_PPC_TPREL16:
+	case R_PPC_TPREL16_LO:
+	case R_PPC_TPREL16_HI:
+	case R_PPC_TPREL16_HA:
+	  if (!info->executable)
+	    info->flags |= DF_STATIC_TLS;
+	  goto dodyn;
+
+	  /* Nor these.  */
+	case R_PPC_DTPMOD32:
+	case R_PPC_DTPREL32:
+	  goto dodyn;
+
+	case R_PPC_REL32:
+	  if (h == NULL
+	      && got2 != NULL
+	      && (sec->flags & SEC_CODE) != 0
+	      && info->shared
+	      && htab->plt_type == PLT_UNSET)
+	    {
+	      /* Old -fPIC gcc code has .long LCTOC1-LCFx just before
+		 the start of a function, which assembles to a REL32
+		 reference to .got2.  If we detect one of these, then
+		 force the old PLT layout because the linker cannot
+		 reliably deduce the GOT pointer value needed for
+		 PLT call stubs.  */
+	      asection *s;
+	      Elf_Internal_Sym *isym;
+
+	      isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+					    abfd, r_symndx);
+	      if (isym == NULL)
+		return FALSE;
+
+	      s = bfd_section_from_elf_index (abfd, isym->st_shndx);
+	      if (s == got2)
+		{
+		  htab->plt_type = PLT_OLD;
+		  htab->old_bfd = abfd;
+		}
+	    }
+	  if (h == NULL || h == htab->elf.hgot)
+	    break;
+	  /* fall through */
+
+	case R_PPC_ADDR32:
+	case R_PPC_ADDR16:
+	case R_PPC_ADDR16_LO:
+	case R_PPC_ADDR16_HI:
+	case R_PPC_ADDR16_HA:
+	case R_PPC_UADDR32:
+	case R_PPC_UADDR16:
+	  if (h != NULL && !info->shared)
+	    {
+	      /* We may need a plt entry if the symbol turns out to be
+		 a function defined in a dynamic object.  */
+	      if (!update_plt_info (abfd, &h->plt.plist, NULL, 0))
+		return FALSE;
+
+	      /* We may need a copy reloc too.  */
+	      h->non_got_ref = 1;
+	      h->pointer_equality_needed = 1;
+	    }
+	  goto dodyn;
+
+	case R_PPC_REL24:
+	case R_PPC_REL14:
+	case R_PPC_REL14_BRTAKEN:
+	case R_PPC_REL14_BRNTAKEN:
+	  if (h == NULL)
+	    break;
+	  if (h == htab->elf.hgot)
+	    {
+	      if (htab->plt_type == PLT_UNSET)
+		{
+		  htab->plt_type = PLT_OLD;
+		  htab->old_bfd = abfd;
+		}
+	      break;
+	    }
+	  /* fall through */
+
+	case R_PPC_ADDR24:
+	case R_PPC_ADDR14:
+	case R_PPC_ADDR14_BRTAKEN:
+	case R_PPC_ADDR14_BRNTAKEN:
+	  if (h != NULL && !info->shared)
+	    {
+	      /* We may need a plt entry if the symbol turns out to be
+		 a function defined in a dynamic object.  */
+	      h->needs_plt = 1;
+	      if (!update_plt_info (abfd, &h->plt.plist, NULL, 0))
+		return FALSE;
+	      break;
+	    }
+
+	dodyn:
+	  /* If we are creating a shared library, and this is a reloc
+	     against a global symbol, or a non PC relative reloc
+	     against a local symbol, then we need to copy the reloc
+	     into the shared library.  However, if we are linking with
+	     -Bsymbolic, we do not need to copy a reloc against a
+	     global symbol which is defined in an object we are
+	     including in the link (i.e., DEF_REGULAR is set).  At
+	     this point we have not seen all the input files, so it is
+	     possible that DEF_REGULAR is not set now but will be set
+	     later (it is never cleared).  In case of a weak definition,
+	     DEF_REGULAR may be cleared later by a strong definition in
+	     a shared library.  We account for that possibility below by
+	     storing information in the dyn_relocs field of the hash
+	     table entry.  A similar situation occurs when creating
+	     shared libraries and symbol visibility changes render the
+	     symbol local.
+
+	     If on the other hand, we are creating an executable, we
+	     may need to keep relocations for symbols satisfied by a
+	     dynamic library if we manage to avoid copy relocs for the
+	     symbol.  */
+	  if ((info->shared
+	       && (must_be_dyn_reloc (info, r_type)
+		   || (h != NULL
+		       && (! info->symbolic
+			   || h->root.type == bfd_link_hash_defweak
+			   || !h->def_regular))))
+	      || (ELIMINATE_COPY_RELOCS
+		  && !info->shared
+		  && h != NULL
+		  && (h->root.type == bfd_link_hash_defweak
+		      || !h->def_regular)))
+	    {
+	      struct elf_dyn_relocs *p;
+	      struct elf_dyn_relocs **rel_head;
+
+#ifdef DEBUG
+	      fprintf (stderr,
+		       "ppc_elf_check_relocs needs to "
+		       "create relocation for %s\n",
+		       (h && h->root.root.string
+			? h->root.root.string : "<unknown>"));
+#endif
+	      if (sreloc == NULL)
+		{
+		  if (htab->elf.dynobj == NULL)
+		    htab->elf.dynobj = abfd;
+
+		  sreloc = _bfd_elf_make_dynamic_reloc_section
+		    (sec, htab->elf.dynobj, 2, abfd, /*rela?*/ TRUE);
+
+		  if (sreloc == NULL)
+		    return FALSE;
+		}
+
+	      /* If this is a global symbol, we count the number of
+		 relocations we need for this symbol.  */
+	      if (h != NULL)
+		{
+		  rel_head = &ppc_elf_hash_entry (h)->dyn_relocs;
+		}
+	      else
+		{
+		  /* Track dynamic relocs needed for local syms too.
+		     We really need local syms available to do this
+		     easily.  Oh well.  */
+		  asection *s;
+		  void *vpp;
+		  Elf_Internal_Sym *isym;
+
+		  isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+						abfd, r_symndx);
+		  if (isym == NULL)
+		    return FALSE;
+
+		  s = bfd_section_from_elf_index (abfd, isym->st_shndx);
+		  if (s == NULL)
+		    s = sec;
+
+		  vpp = &elf_section_data (s)->local_dynrel;
+		  rel_head = (struct elf_dyn_relocs **) vpp;
+		}
+
+	      p = *rel_head;
+	      if (p == NULL || p->sec != sec)
+		{
+		  p = bfd_alloc (htab->elf.dynobj, sizeof *p);
+		  if (p == NULL)
+		    return FALSE;
+		  p->next = *rel_head;
+		  *rel_head = p;
+		  p->sec = sec;
+		  p->count = 0;
+		  p->pc_count = 0;
+		}
+
+	      p->count += 1;
+	      if (!must_be_dyn_reloc (info, r_type))
+		p->pc_count += 1;
+	    }
+
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+
+/* Merge object attributes from IBFD into OBFD.  Raise an error if
+   there are conflicting attributes.  */
+static bfd_boolean
+ppc_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd)
+{
+  obj_attribute *in_attr, *in_attrs;
+  obj_attribute *out_attr, *out_attrs;
+
+  if (!elf_known_obj_attributes_proc (obfd)[0].i)
+    {
+      /* This is the first object.  Copy the attributes.  */
+      _bfd_elf_copy_obj_attributes (ibfd, obfd);
+
+      /* Use the Tag_null value to indicate the attributes have been
+	 initialized.  */
+      elf_known_obj_attributes_proc (obfd)[0].i = 1;
+
+      return TRUE;
+    }
+
+  in_attrs = elf_known_obj_attributes (ibfd)[OBJ_ATTR_GNU];
+  out_attrs = elf_known_obj_attributes (obfd)[OBJ_ATTR_GNU];
+
+  /* Check for conflicting Tag_GNU_Power_ABI_FP attributes and merge
+     non-conflicting ones.  */
+  in_attr = &in_attrs[Tag_GNU_Power_ABI_FP];
+  out_attr = &out_attrs[Tag_GNU_Power_ABI_FP];
+  if (in_attr->i != out_attr->i)
+    {
+      out_attr->type = 1;
+      if (out_attr->i == 0)
+	out_attr->i = in_attr->i;
+      else if (in_attr->i == 0)
+	;
+      else if (out_attr->i == 1 && in_attr->i == 2)
+	_bfd_error_handler
+	  (_("Warning: %B uses hard float, %B uses soft float"), obfd, ibfd);
+      else if (out_attr->i == 1 && in_attr->i == 3)
+	_bfd_error_handler
+	  (_("Warning: %B uses double-precision hard float, %B uses single-precision hard float"),
+	  obfd, ibfd);
+      else if (out_attr->i == 3 && in_attr->i == 1)
+	_bfd_error_handler
+	  (_("Warning: %B uses double-precision hard float, %B uses single-precision hard float"),
+	  ibfd, obfd);
+      else if (out_attr->i == 3 && in_attr->i == 2)
+	_bfd_error_handler
+	  (_("Warning: %B uses soft float, %B uses single-precision hard float"),
+	  ibfd, obfd);
+      else if (out_attr->i == 2 && (in_attr->i == 1 || in_attr->i == 3))
+	_bfd_error_handler
+	  (_("Warning: %B uses hard float, %B uses soft float"), ibfd, obfd);
+      else if (in_attr->i > 3)
+	_bfd_error_handler
+	  (_("Warning: %B uses unknown floating point ABI %d"), ibfd,
+	   in_attr->i);
+      else
+	_bfd_error_handler
+	  (_("Warning: %B uses unknown floating point ABI %d"), obfd,
+	   out_attr->i);
+    }
+
+  /* Check for conflicting Tag_GNU_Power_ABI_Vector attributes and
+     merge non-conflicting ones.  */
+  in_attr = &in_attrs[Tag_GNU_Power_ABI_Vector];
+  out_attr = &out_attrs[Tag_GNU_Power_ABI_Vector];
+  if (in_attr->i != out_attr->i)
+    {
+      const char *in_abi = NULL, *out_abi = NULL;
+
+      switch (in_attr->i)
+	{
+	case 1: in_abi = "generic"; break;
+	case 2: in_abi = "AltiVec"; break;
+	case 3: in_abi = "SPE"; break;
+	}
+
+      switch (out_attr->i)
+	{
+	case 1: out_abi = "generic"; break;
+	case 2: out_abi = "AltiVec"; break;
+	case 3: out_abi = "SPE"; break;
+	}
+
+      out_attr->type = 1;
+      if (out_attr->i == 0)
+	out_attr->i = in_attr->i;
+      else if (in_attr->i == 0)
+	;
+      /* For now, allow generic to transition to AltiVec or SPE
+	 without a warning.  If GCC marked files with their stack
+	 alignment and used don't-care markings for files which are
+	 not affected by the vector ABI, we could warn about this
+	 case too.  */
+      else if (out_attr->i == 1)
+	out_attr->i = in_attr->i;
+      else if (in_attr->i == 1)
+	;
+      else if (in_abi == NULL)
+	_bfd_error_handler
+	  (_("Warning: %B uses unknown vector ABI %d"), ibfd,
+	   in_attr->i);
+      else if (out_abi == NULL)
+	_bfd_error_handler
+	  (_("Warning: %B uses unknown vector ABI %d"), obfd,
+	   in_attr->i);
+      else
+	_bfd_error_handler
+	  (_("Warning: %B uses vector ABI \"%s\", %B uses \"%s\""),
+	   ibfd, obfd, in_abi, out_abi);
+    }
+
+  /* Check for conflicting Tag_GNU_Power_ABI_Struct_Return attributes
+     and merge non-conflicting ones.  */
+  in_attr = &in_attrs[Tag_GNU_Power_ABI_Struct_Return];
+  out_attr = &out_attrs[Tag_GNU_Power_ABI_Struct_Return];
+  if (in_attr->i != out_attr->i)
+    {
+      out_attr->type = 1;
+      if (out_attr->i == 0)
+       out_attr->i = in_attr->i;
+      else if (in_attr->i == 0)
+       ;
+      else if (out_attr->i == 1 && in_attr->i == 2)
+       _bfd_error_handler
+         (_("Warning: %B uses r3/r4 for small structure returns, %B uses memory"), obfd, ibfd);
+      else if (out_attr->i == 2 && in_attr->i == 1)
+       _bfd_error_handler
+         (_("Warning: %B uses r3/r4 for small structure returns, %B uses memory"), ibfd, obfd);
+      else if (in_attr->i > 2)
+       _bfd_error_handler
+         (_("Warning: %B uses unknown small structure return convention %d"), ibfd,
+          in_attr->i);
+      else
+       _bfd_error_handler
+         (_("Warning: %B uses unknown small structure return convention %d"), obfd,
+          out_attr->i);
+    }
+
+  /* Merge Tag_compatibility attributes and any common GNU ones.  */
+  _bfd_elf_merge_object_attributes (ibfd, obfd);
+
+  return TRUE;
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+
+static bfd_boolean
+ppc_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  flagword old_flags;
+  flagword new_flags;
+  bfd_boolean error;
+
+  if (!is_ppc_elf (ibfd) || !is_ppc_elf (obfd))
+    return TRUE;
+
+  /* Check if we have the same endianness.  */
+  if (! _bfd_generic_verify_endian_match (ibfd, obfd))
+    return FALSE;
+
+  if (!ppc_elf_merge_obj_attributes (ibfd, obfd))
+    return FALSE;
+
+  new_flags = elf_elfheader (ibfd)->e_flags;
+  old_flags = elf_elfheader (obfd)->e_flags;
+  if (!elf_flags_init (obfd))
+    {
+      /* First call, no flags set.  */
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = new_flags;
+    }
+
+  /* Compatible flags are ok.  */
+  else if (new_flags == old_flags)
+    ;
+
+  /* Incompatible flags.  */
+  else
+    {
+      /* Warn about -mrelocatable mismatch.  Allow -mrelocatable-lib
+	 to be linked with either.  */
+      error = FALSE;
+      if ((new_flags & EF_PPC_RELOCATABLE) != 0
+	  && (old_flags & (EF_PPC_RELOCATABLE | EF_PPC_RELOCATABLE_LIB)) == 0)
+	{
+	  error = TRUE;
+	  (*_bfd_error_handler)
+	    (_("%B: compiled with -mrelocatable and linked with "
+	       "modules compiled normally"), ibfd);
+	}
+      else if ((new_flags & (EF_PPC_RELOCATABLE | EF_PPC_RELOCATABLE_LIB)) == 0
+	       && (old_flags & EF_PPC_RELOCATABLE) != 0)
+	{
+	  error = TRUE;
+	  (*_bfd_error_handler)
+	    (_("%B: compiled normally and linked with "
+	       "modules compiled with -mrelocatable"), ibfd);
+	}
+
+      /* The output is -mrelocatable-lib iff both the input files are.  */
+      if (! (new_flags & EF_PPC_RELOCATABLE_LIB))
+	elf_elfheader (obfd)->e_flags &= ~EF_PPC_RELOCATABLE_LIB;
+
+      /* The output is -mrelocatable iff it can't be -mrelocatable-lib,
+	 but each input file is either -mrelocatable or -mrelocatable-lib.  */
+      if (! (elf_elfheader (obfd)->e_flags & EF_PPC_RELOCATABLE_LIB)
+	  && (new_flags & (EF_PPC_RELOCATABLE_LIB | EF_PPC_RELOCATABLE))
+	  && (old_flags & (EF_PPC_RELOCATABLE_LIB | EF_PPC_RELOCATABLE)))
+	elf_elfheader (obfd)->e_flags |= EF_PPC_RELOCATABLE;
+
+      /* Do not warn about eabi vs. V.4 mismatch, just or in the bit if
+	 any module uses it.  */
+      elf_elfheader (obfd)->e_flags |= (new_flags & EF_PPC_EMB);
+
+      new_flags &= ~(EF_PPC_RELOCATABLE | EF_PPC_RELOCATABLE_LIB | EF_PPC_EMB);
+      old_flags &= ~(EF_PPC_RELOCATABLE | EF_PPC_RELOCATABLE_LIB | EF_PPC_EMB);
+
+      /* Warn about any other mismatches.  */
+      if (new_flags != old_flags)
+	{
+	  error = TRUE;
+	  (*_bfd_error_handler)
+	    (_("%B: uses different e_flags (0x%lx) fields "
+	       "than previous modules (0x%lx)"),
+	     ibfd, (long) new_flags, (long) old_flags);
+	}
+
+      if (error)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Choose which PLT scheme to use, and set .plt flags appropriately.
+   Returns -1 on error, 0 for old PLT, 1 for new PLT.  */
+int
+ppc_elf_select_plt_layout (bfd *output_bfd ATTRIBUTE_UNUSED,
+			   struct bfd_link_info *info,
+			   enum ppc_elf_plt_type plt_style,
+			   int emit_stub_syms)
+{
+  struct ppc_elf_link_hash_table *htab;
+  flagword flags;
+
+  htab = ppc_elf_hash_table (info);
+
+  htab->emit_stub_syms = emit_stub_syms;
+
+  if (htab->plt_type == PLT_UNSET)
+    {
+      struct elf_link_hash_entry *h;
+
+      if (plt_style == PLT_OLD)
+	htab->plt_type = PLT_OLD;
+      else if (info->shared
+	       && htab->elf.dynamic_sections_created
+	       && (h = elf_link_hash_lookup (&htab->elf, "_mcount",
+					     FALSE, FALSE, TRUE)) != NULL
+	       && (h->type == STT_FUNC
+		   || h->needs_plt)
+	       && h->ref_regular
+	       && !(SYMBOL_CALLS_LOCAL (info, h)
+		    || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+			&& h->root.type == bfd_link_hash_undefweak)))
+	{
+	  /* Profiling of shared libs (and pies) is not supported with
+	     secure plt, because ppc32 does profiling before a
+	     function prologue and a secure plt pic call stubs needs
+	     r30 to be set up.  */
+	  htab->plt_type = PLT_OLD;
+	}
+      else
+	{
+	  bfd *ibfd;
+	  enum ppc_elf_plt_type plt_type = plt_style;
+
+	  /* Look through the reloc flags left by ppc_elf_check_relocs.
+	     Use the old style bss plt if a file makes plt calls
+	     without using the new relocs, and if ld isn't given
+	     --secure-plt and we never see REL16 relocs.  */
+	  if (plt_type == PLT_UNSET)
+	    plt_type = PLT_OLD;
+	  for (ibfd = info->input_bfds; ibfd; ibfd = ibfd->link_next)
+	    if (is_ppc_elf (ibfd))
+	      {
+		if (ppc_elf_tdata (ibfd)->has_rel16)
+		  plt_type = PLT_NEW;
+		else if (ppc_elf_tdata (ibfd)->makes_plt_call)
+		  {
+		    plt_type = PLT_OLD;
+		    htab->old_bfd = ibfd;
+		    break;
+		  }
+	      }
+	  htab->plt_type = plt_type;
+	}
+    }
+  if (htab->plt_type == PLT_OLD && plt_style == PLT_NEW)
+    {
+      if (htab->old_bfd != NULL)
+	info->callbacks->einfo (_("%P: bss-plt forced due to %B\n"),
+				htab->old_bfd);
+      else
+	info->callbacks->einfo (_("%P: bss-plt forced by profiling\n"));
+    }
+
+  BFD_ASSERT (htab->plt_type != PLT_VXWORKS);
+
+  if (htab->plt_type == PLT_NEW)
+    {
+      flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
+	       | SEC_IN_MEMORY | SEC_LINKER_CREATED);
+
+      /* The new PLT is a loaded section.  */
+      if (htab->plt != NULL
+	  && !bfd_set_section_flags (htab->elf.dynobj, htab->plt, flags))
+	return -1;
+
+      /* The new GOT is not executable.  */
+      if (htab->got != NULL
+	  && !bfd_set_section_flags (htab->elf.dynobj, htab->got, flags))
+	return -1;
+    }
+  else
+    {
+      /* Stop an unused .glink section from affecting .text alignment.  */
+      if (htab->glink != NULL
+	  && !bfd_set_section_alignment (htab->elf.dynobj, htab->glink, 0))
+	return -1;
+    }
+  return htab->plt_type == PLT_NEW;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+static asection *
+ppc_elf_gc_mark_hook (asection *sec,
+		      struct bfd_link_info *info,
+		      Elf_Internal_Rela *rel,
+		      struct elf_link_hash_entry *h,
+		      Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_PPC_GNU_VTINHERIT:
+      case R_PPC_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Update the got, plt and dynamic reloc reference counts for the
+   section being removed.  */
+
+static bfd_boolean
+ppc_elf_gc_sweep_hook (bfd *abfd,
+		       struct bfd_link_info *info,
+		       asection *sec,
+		       const Elf_Internal_Rela *relocs)
+{
+  struct ppc_elf_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  const Elf_Internal_Rela *rel, *relend;
+  asection *got2;
+
+  if (info->relocatable)
+    return TRUE;
+
+  if ((sec->flags & SEC_ALLOC) == 0)
+    return TRUE;
+
+  elf_section_data (sec)->local_dynrel = NULL;
+
+  htab = ppc_elf_hash_table (info);
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+  got2 = bfd_get_section_by_name (abfd, ".got2");
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      enum elf_ppc_reloc_type r_type;
+      struct elf_link_hash_entry *h = NULL;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  struct elf_dyn_relocs **pp, *p;
+	  struct ppc_elf_link_hash_entry *eh;
+
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	  eh = (struct ppc_elf_link_hash_entry *) h;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
+	    if (p->sec == sec)
+	      {
+		/* Everything must go for SEC.  */
+		*pp = p->next;
+		break;
+	      }
+	}
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      if (!htab->is_vxworks
+	  && h == NULL
+	  && local_got_refcounts != NULL
+	  && (!info->shared
+	      || is_branch_reloc (r_type)))
+	{
+	  struct plt_entry **local_plt = (struct plt_entry **)
+	    (local_got_refcounts + symtab_hdr->sh_info);
+	  char *local_got_tls_masks = (char *)
+	    (local_plt + symtab_hdr->sh_info);
+	  if ((local_got_tls_masks[r_symndx] & PLT_IFUNC) != 0)
+	    {
+	      struct plt_entry **ifunc = local_plt + r_symndx;
+	      bfd_vma addend = 0;
+	      struct plt_entry *ent;
+
+	      if (r_type == R_PPC_PLTREL24 && info->shared)
+		addend = rel->r_addend;
+	      ent = find_plt_ent (ifunc, got2, addend);
+	      if (ent->plt.refcount > 0)
+		ent->plt.refcount -= 1;
+	      continue;
+	    }
+	}
+
+      switch (r_type)
+	{
+	case R_PPC_GOT_TLSLD16:
+	case R_PPC_GOT_TLSLD16_LO:
+	case R_PPC_GOT_TLSLD16_HI:
+	case R_PPC_GOT_TLSLD16_HA:
+	case R_PPC_GOT_TLSGD16:
+	case R_PPC_GOT_TLSGD16_LO:
+	case R_PPC_GOT_TLSGD16_HI:
+	case R_PPC_GOT_TLSGD16_HA:
+	case R_PPC_GOT_TPREL16:
+	case R_PPC_GOT_TPREL16_LO:
+	case R_PPC_GOT_TPREL16_HI:
+	case R_PPC_GOT_TPREL16_HA:
+	case R_PPC_GOT_DTPREL16:
+	case R_PPC_GOT_DTPREL16_LO:
+	case R_PPC_GOT_DTPREL16_HI:
+	case R_PPC_GOT_DTPREL16_HA:
+	case R_PPC_GOT16:
+	case R_PPC_GOT16_LO:
+	case R_PPC_GOT16_HI:
+	case R_PPC_GOT16_HA:
+	  if (h != NULL)
+	    {
+	      if (h->got.refcount > 0)
+		h->got.refcount--;
+	      if (!info->shared)
+		{
+		  struct plt_entry *ent;
+
+		  ent = find_plt_ent (&h->plt.plist, NULL, 0);
+		  if (ent != NULL && ent->plt.refcount > 0)
+		    ent->plt.refcount -= 1;
+		}
+	    }
+	  else if (local_got_refcounts != NULL)
+	    {
+	      if (local_got_refcounts[r_symndx] > 0)
+		local_got_refcounts[r_symndx]--;
+	    }
+	  break;
+
+	case R_PPC_REL24:
+	case R_PPC_REL14:
+	case R_PPC_REL14_BRTAKEN:
+	case R_PPC_REL14_BRNTAKEN:
+	case R_PPC_REL32:
+	  if (h == NULL || h == htab->elf.hgot)
+	    break;
+	  /* Fall thru */
+
+	case R_PPC_ADDR32:
+	case R_PPC_ADDR24:
+	case R_PPC_ADDR16:
+	case R_PPC_ADDR16_LO:
+	case R_PPC_ADDR16_HI:
+	case R_PPC_ADDR16_HA:
+	case R_PPC_ADDR14:
+	case R_PPC_ADDR14_BRTAKEN:
+	case R_PPC_ADDR14_BRNTAKEN:
+	case R_PPC_UADDR32:
+	case R_PPC_UADDR16:
+	  if (info->shared)
+	    break;
+
+	case R_PPC_PLT32:
+	case R_PPC_PLTREL24:
+	case R_PPC_PLTREL32:
+	case R_PPC_PLT16_LO:
+	case R_PPC_PLT16_HI:
+	case R_PPC_PLT16_HA:
+	  if (h != NULL)
+	    {
+	      bfd_vma addend = 0;
+	      struct plt_entry *ent;
+
+	      if (r_type == R_PPC_PLTREL24 && info->shared)
+		addend = rel->r_addend;
+	      ent = find_plt_ent (&h->plt.plist, got2, addend);
+	      if (ent != NULL && ent->plt.refcount > 0)
+		ent->plt.refcount -= 1;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+  return TRUE;
+}
+
+/* Set plt output section type, htab->tls_get_addr, and call the
+   generic ELF tls_setup function.  */
+
+asection *
+ppc_elf_tls_setup (bfd *obfd,
+		   struct bfd_link_info *info,
+		   int no_tls_get_addr_opt)
+{
+  struct ppc_elf_link_hash_table *htab;
+
+  htab = ppc_elf_hash_table (info);
+  htab->tls_get_addr = elf_link_hash_lookup (&htab->elf, "__tls_get_addr",
+					     FALSE, FALSE, TRUE);
+  if (!no_tls_get_addr_opt)
+    {
+      struct elf_link_hash_entry *opt, *tga;
+      opt = elf_link_hash_lookup (&htab->elf, "__tls_get_addr_opt",
+				  FALSE, FALSE, TRUE);
+      if (opt != NULL
+	  && (opt->root.type == bfd_link_hash_defined
+	      || opt->root.type == bfd_link_hash_defweak))
+	{
+	  /* If glibc supports an optimized __tls_get_addr call stub,
+	     signalled by the presence of __tls_get_addr_opt, and we'll
+	     be calling __tls_get_addr via a plt call stub, then
+	     make __tls_get_addr point to __tls_get_addr_opt.  */
+	  tga = htab->tls_get_addr;
+	  if (htab->elf.dynamic_sections_created
+	      && tga != NULL
+	      && (tga->type == STT_FUNC
+		  || tga->needs_plt)
+	      && !(SYMBOL_CALLS_LOCAL (info, tga)
+		   || (ELF_ST_VISIBILITY (tga->other) != STV_DEFAULT
+		       && tga->root.type == bfd_link_hash_undefweak)))
+	    {
+	      struct plt_entry *ent;
+	      for (ent = tga->plt.plist; ent != NULL; ent = ent->next)
+		if (ent->plt.refcount > 0)
+		  break;
+	      if (ent != NULL)
+		{
+		  tga->root.type = bfd_link_hash_indirect;
+		  tga->root.u.i.link = &opt->root;
+		  ppc_elf_copy_indirect_symbol (info, opt, tga);
+		  if (opt->dynindx != -1)
+		    {
+		      /* Use __tls_get_addr_opt in dynamic relocations.  */
+		      opt->dynindx = -1;
+		      _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
+					      opt->dynstr_index);
+		      if (!bfd_elf_link_record_dynamic_symbol (info, opt))
+			return FALSE;
+		    }
+		  htab->tls_get_addr = opt;
+		}
+	    }
+	}
+      else
+	no_tls_get_addr_opt = TRUE;
+    }
+  htab->no_tls_get_addr_opt = no_tls_get_addr_opt;
+  if (htab->plt_type == PLT_NEW
+      && htab->plt != NULL
+      && htab->plt->output_section != NULL)
+    {
+      elf_section_type (htab->plt->output_section) = SHT_PROGBITS;
+      elf_section_flags (htab->plt->output_section) = SHF_ALLOC + SHF_WRITE;
+    }
+
+  return _bfd_elf_tls_setup (obfd, info);
+}
+
+/* Return TRUE iff REL is a branch reloc with a global symbol matching
+   HASH.  */
+
+static bfd_boolean
+branch_reloc_hash_match (const bfd *ibfd,
+			 const Elf_Internal_Rela *rel,
+			 const struct elf_link_hash_entry *hash)
+{
+  Elf_Internal_Shdr *symtab_hdr = &elf_symtab_hdr (ibfd);
+  enum elf_ppc_reloc_type r_type = ELF32_R_TYPE (rel->r_info);
+  unsigned int r_symndx = ELF32_R_SYM (rel->r_info);
+
+  if (r_symndx >= symtab_hdr->sh_info && is_branch_reloc (r_type))
+    {
+      struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (ibfd);
+      struct elf_link_hash_entry *h;
+
+      h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+      while (h->root.type == bfd_link_hash_indirect
+	     || h->root.type == bfd_link_hash_warning)
+	h = (struct elf_link_hash_entry *) h->root.u.i.link;
+      if (h == hash)
+	return TRUE;
+    }
+  return FALSE;
+}
+
+/* Run through all the TLS relocs looking for optimization
+   opportunities.  */
+
+bfd_boolean
+ppc_elf_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED,
+		      struct bfd_link_info *info)
+{
+  bfd *ibfd;
+  asection *sec;
+  struct ppc_elf_link_hash_table *htab;
+  int pass;
+
+  if (info->relocatable || !info->executable)
+    return TRUE;
+
+  htab = ppc_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* Make two passes through the relocs.  First time check that tls
+     relocs involved in setting up a tls_get_addr call are indeed
+     followed by such a call.  If they are not, don't do any tls
+     optimization.  On the second pass twiddle tls_mask flags to
+     notify relocate_section that optimization can be done, and
+     adjust got and plt refcounts.  */
+  for (pass = 0; pass < 2; ++pass)
+    for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+      {
+	Elf_Internal_Sym *locsyms = NULL;
+	Elf_Internal_Shdr *symtab_hdr = &elf_symtab_hdr (ibfd);
+	asection *got2 = bfd_get_section_by_name (ibfd, ".got2");
+
+	for (sec = ibfd->sections; sec != NULL; sec = sec->next)
+	  if (sec->has_tls_reloc && !bfd_is_abs_section (sec->output_section))
+	    {
+	      Elf_Internal_Rela *relstart, *rel, *relend;
+	      int expecting_tls_get_addr = 0;
+
+	      /* Read the relocations.  */
+	      relstart = _bfd_elf_link_read_relocs (ibfd, sec, NULL, NULL,
+						    info->keep_memory);
+	      if (relstart == NULL)
+		return FALSE;
+
+	      relend = relstart + sec->reloc_count;
+	      for (rel = relstart; rel < relend; rel++)
+		{
+		  enum elf_ppc_reloc_type r_type;
+		  unsigned long r_symndx;
+		  struct elf_link_hash_entry *h = NULL;
+		  char *tls_mask;
+		  char tls_set, tls_clear;
+		  bfd_boolean is_local;
+		  bfd_signed_vma *got_count;
+
+		  r_symndx = ELF32_R_SYM (rel->r_info);
+		  if (r_symndx >= symtab_hdr->sh_info)
+		    {
+		      struct elf_link_hash_entry **sym_hashes;
+
+		      sym_hashes = elf_sym_hashes (ibfd);
+		      h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+		      while (h->root.type == bfd_link_hash_indirect
+			     || h->root.type == bfd_link_hash_warning)
+			h = (struct elf_link_hash_entry *) h->root.u.i.link;
+		    }
+
+		  is_local = FALSE;
+		  if (h == NULL
+		      || !h->def_dynamic)
+		    is_local = TRUE;
+
+		  r_type = ELF32_R_TYPE (rel->r_info);
+		  /* If this section has old-style __tls_get_addr calls
+		     without marker relocs, then check that each
+		     __tls_get_addr call reloc is preceded by a reloc
+		     that conceivably belongs to the __tls_get_addr arg
+		     setup insn.  If we don't find matching arg setup
+		     relocs, don't do any tls optimization.  */
+		  if (pass == 0
+		      && sec->has_tls_get_addr_call
+		      && h != NULL
+		      && h == htab->tls_get_addr
+		      && !expecting_tls_get_addr
+		      && is_branch_reloc (r_type))
+		    {
+		      info->callbacks->minfo ("%H __tls_get_addr lost arg, "
+					      "TLS optimization disabled\n",
+					      ibfd, sec, rel->r_offset);
+		      if (elf_section_data (sec)->relocs != relstart)
+			free (relstart);
+		      return TRUE;
+		    }
+
+		  expecting_tls_get_addr = 0;
+		  switch (r_type)
+		    {
+		    case R_PPC_GOT_TLSLD16:
+		    case R_PPC_GOT_TLSLD16_LO:
+		      expecting_tls_get_addr = 1;
+		      /* Fall thru */
+
+		    case R_PPC_GOT_TLSLD16_HI:
+		    case R_PPC_GOT_TLSLD16_HA:
+		      /* These relocs should never be against a symbol
+			 defined in a shared lib.  Leave them alone if
+			 that turns out to be the case.  */
+		      if (!is_local)
+			continue;
+
+		      /* LD -> LE */
+		      tls_set = 0;
+		      tls_clear = TLS_LD;
+		      break;
+
+		    case R_PPC_GOT_TLSGD16:
+		    case R_PPC_GOT_TLSGD16_LO:
+		      expecting_tls_get_addr = 1;
+		      /* Fall thru */
+
+		    case R_PPC_GOT_TLSGD16_HI:
+		    case R_PPC_GOT_TLSGD16_HA:
+		      if (is_local)
+			/* GD -> LE */
+			tls_set = 0;
+		      else
+			/* GD -> IE */
+			tls_set = TLS_TLS | TLS_TPRELGD;
+		      tls_clear = TLS_GD;
+		      break;
+
+		    case R_PPC_GOT_TPREL16:
+		    case R_PPC_GOT_TPREL16_LO:
+		    case R_PPC_GOT_TPREL16_HI:
+		    case R_PPC_GOT_TPREL16_HA:
+		      if (is_local)
+			{
+			  /* IE -> LE */
+			  tls_set = 0;
+			  tls_clear = TLS_TPREL;
+			  break;
+			}
+		      else
+			continue;
+
+		    case R_PPC_TLSGD:
+		    case R_PPC_TLSLD:
+		      expecting_tls_get_addr = 2;
+		      tls_set = 0;
+		      tls_clear = 0;
+		      break;
+
+		    default:
+		      continue;
+		    }
+
+		  if (pass == 0)
+		    {
+		      if (!expecting_tls_get_addr
+			  || (expecting_tls_get_addr == 1
+			      && !sec->has_tls_get_addr_call))
+			continue;
+
+		      if (rel + 1 < relend
+			  && branch_reloc_hash_match (ibfd, rel + 1,
+						      htab->tls_get_addr))
+			continue;
+
+		      /* Uh oh, we didn't find the expected call.  We
+			 could just mark this symbol to exclude it
+			 from tls optimization but it's safer to skip
+			 the entire optimization.  */
+		      info->callbacks->minfo (_("%H arg lost __tls_get_addr, "
+						"TLS optimization disabled\n"),
+					      ibfd, sec, rel->r_offset);
+		      if (elf_section_data (sec)->relocs != relstart)
+			free (relstart);
+		      return TRUE;
+		    }
+
+		  if (expecting_tls_get_addr)
+		    {
+		      struct plt_entry *ent;
+		      bfd_vma addend = 0;
+
+		      if (info->shared
+			  && ELF32_R_TYPE (rel[1].r_info) == R_PPC_PLTREL24)
+			addend = rel[1].r_addend;
+		      ent = find_plt_ent (&htab->tls_get_addr->plt.plist,
+					  got2, addend);
+		      if (ent != NULL && ent->plt.refcount > 0)
+			ent->plt.refcount -= 1;
+
+		      if (expecting_tls_get_addr == 2)
+			continue;
+		    }
+
+		  if (h != NULL)
+		    {
+		      tls_mask = &ppc_elf_hash_entry (h)->tls_mask;
+		      got_count = &h->got.refcount;
+		    }
+		  else
+		    {
+		      bfd_signed_vma *lgot_refs;
+		      struct plt_entry **local_plt;
+		      char *lgot_masks;
+
+		      if (locsyms == NULL)
+			{
+			  locsyms = (Elf_Internal_Sym *) symtab_hdr->contents;
+			  if (locsyms == NULL)
+			    locsyms = bfd_elf_get_elf_syms (ibfd, symtab_hdr,
+							    symtab_hdr->sh_info,
+							    0, NULL, NULL, NULL);
+			  if (locsyms == NULL)
+			    {
+			      if (elf_section_data (sec)->relocs != relstart)
+				free (relstart);
+			      return FALSE;
+			    }
+			}
+		      lgot_refs = elf_local_got_refcounts (ibfd);
+		      if (lgot_refs == NULL)
+			abort ();
+		      local_plt = (struct plt_entry **)
+			(lgot_refs + symtab_hdr->sh_info);
+		      lgot_masks = (char *) (local_plt + symtab_hdr->sh_info);
+		      tls_mask = &lgot_masks[r_symndx];
+		      got_count = &lgot_refs[r_symndx];
+		    }
+
+		  if (tls_set == 0)
+		    {
+		      /* We managed to get rid of a got entry.  */
+		      if (*got_count > 0)
+			*got_count -= 1;
+		    }
+
+		  *tls_mask |= tls_set;
+		  *tls_mask &= ~tls_clear;
+		}
+
+	      if (elf_section_data (sec)->relocs != relstart)
+		free (relstart);
+	    }
+
+	if (locsyms != NULL
+	    && (symtab_hdr->contents != (unsigned char *) locsyms))
+	  {
+	    if (!info->keep_memory)
+	      free (locsyms);
+	    else
+	      symtab_hdr->contents = (unsigned char *) locsyms;
+	  }
+      }
+  return TRUE;
+}
+
+/* Return true if we have dynamic relocs that apply to read-only sections.  */
+
+static bfd_boolean
+readonly_dynrelocs (struct elf_link_hash_entry *h)
+{
+  struct elf_dyn_relocs *p;
+
+  for (p = ppc_elf_hash_entry (h)->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *s = p->sec->output_section;
+
+      if (s != NULL
+	  && ((s->flags & (SEC_READONLY | SEC_ALLOC))
+	      == (SEC_READONLY | SEC_ALLOC)))
+	return TRUE;
+    }
+  return FALSE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+ppc_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+			       struct elf_link_hash_entry *h)
+{
+  struct ppc_elf_link_hash_table *htab;
+  asection *s;
+
+#ifdef DEBUG
+  fprintf (stderr, "ppc_elf_adjust_dynamic_symbol called for %s\n",
+	   h->root.root.string);
+#endif
+
+  /* Make sure we know what is going on here.  */
+  htab = ppc_elf_hash_table (info);
+  BFD_ASSERT (htab->elf.dynobj != NULL
+	      && (h->needs_plt
+		  || h->type == STT_GNU_IFUNC
+		  || h->u.weakdef != NULL
+		  || (h->def_dynamic
+		      && h->ref_regular
+		      && !h->def_regular)));
+
+  /* Deal with function syms.  */
+  if (h->type == STT_FUNC
+      || h->type == STT_GNU_IFUNC
+      || h->needs_plt)
+    {
+      /* Clear procedure linkage table information for any symbol that
+	 won't need a .plt entry.  */
+      struct plt_entry *ent;
+      for (ent = h->plt.plist; ent != NULL; ent = ent->next)
+	if (ent->plt.refcount > 0)
+	  break;
+      if (ent == NULL
+	  || (h->type != STT_GNU_IFUNC
+	      && (SYMBOL_CALLS_LOCAL (info, h)
+		  || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+		      && h->root.type == bfd_link_hash_undefweak))))
+	{
+	  /* A PLT entry is not required/allowed when:
+
+	     1. We are not using ld.so; because then the PLT entry
+	     can't be set up, so we can't use one.  In this case,
+	     ppc_elf_adjust_dynamic_symbol won't even be called.
+
+	     2. GC has rendered the entry unused.
+
+	     3. We know for certain that a call to this symbol
+	     will go to this object, or will remain undefined.  */
+	  h->plt.plist = NULL;
+	  h->needs_plt = 0;
+	}
+      else
+	{
+	  /* After adjust_dynamic_symbol, non_got_ref set in the
+	     non-shared case means that we have allocated space in
+	     .dynbss for the symbol and thus dyn_relocs for this
+	     symbol should be discarded.
+	     If we get here we know we are making a PLT entry for this
+	     symbol, and in an executable we'd normally resolve
+	     relocations against this symbol to the PLT entry.  Allow
+	     dynamic relocs if the reference is weak, and the dynamic
+	     relocs will not cause text relocation.  */
+	  if (!h->ref_regular_nonweak
+	      && h->non_got_ref
+	      && h->type != STT_GNU_IFUNC
+	      && !htab->is_vxworks
+	      && !ppc_elf_hash_entry (h)->has_sda_refs
+	      && !readonly_dynrelocs (h))
+	    h->non_got_ref = 0;
+	}
+      return TRUE;
+    }
+  else
+    h->plt.plist = NULL;
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      if (ELIMINATE_COPY_RELOCS)
+	h->non_got_ref = h->u.weakdef->non_got_ref;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if (!h->non_got_ref)
+    return TRUE;
+
+   /* If we didn't find any dynamic relocs in read-only sections, then
+      we'll be keeping the dynamic relocs and avoiding the copy reloc.
+      We can't do this if there are any small data relocations.  This
+      doesn't work on VxWorks, where we can not have dynamic
+      relocations (other than copy and jump slot relocations) in an
+      executable.  */
+  if (ELIMINATE_COPY_RELOCS
+      && !ppc_elf_hash_entry (h)->has_sda_refs
+      && !htab->is_vxworks
+      && !h->def_regular
+      && !readonly_dynrelocs (h))
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  if (h->size == 0)
+    {
+      info->callbacks->einfo (_("%P: dynamic variable `%s' is zero size\n"),
+			      h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.
+
+     Of course, if the symbol is referenced using SDAREL relocs, we
+     must instead allocate it in .sbss.  */
+
+  if (ppc_elf_hash_entry (h)->has_sda_refs)
+    s = htab->dynsbss;
+  else
+    s = htab->dynbss;
+  BFD_ASSERT (s != NULL);
+
+  /* We must generate a R_PPC_COPY reloc to tell the dynamic linker to
+     copy the initial value out of the dynamic object and into the
+     runtime process image.  We need to remember the offset into the
+     .rela.bss section we are going to use.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      asection *srel;
+
+      if (ppc_elf_hash_entry (h)->has_sda_refs)
+	srel = htab->relsbss;
+      else
+	srel = htab->relbss;
+      BFD_ASSERT (srel != NULL);
+      srel->size += sizeof (Elf32_External_Rela);
+      h->needs_copy = 1;
+    }
+
+  return _bfd_elf_adjust_dynamic_copy (h, s);
+}
+
+/* Generate a symbol to mark plt call stubs.  For non-PIC code the sym is
+   xxxxxxxx.plt_call32.<callee> where xxxxxxxx is a hex number, usually 0,
+   specifying the addend on the plt relocation.  For -fpic code, the sym
+   is xxxxxxxx.plt_pic32.<callee>, and for -fPIC
+   xxxxxxxx.got2.plt_pic32.<callee>.  */
+
+static bfd_boolean
+add_stub_sym (struct plt_entry *ent,
+	      struct elf_link_hash_entry *h,
+	      struct bfd_link_info *info)
+{
+  struct elf_link_hash_entry *sh;
+  size_t len1, len2, len3;
+  char *name;
+  const char *stub;
+  struct ppc_elf_link_hash_table *htab = ppc_elf_hash_table (info);
+
+  if (info->shared)
+    stub = ".plt_pic32.";
+  else
+    stub = ".plt_call32.";
+
+  len1 = strlen (h->root.root.string);
+  len2 = strlen (stub);
+  len3 = 0;
+  if (ent->sec)
+    len3 = strlen (ent->sec->name);
+  name = bfd_malloc (len1 + len2 + len3 + 9);
+  if (name == NULL)
+    return FALSE;
+  sprintf (name, "%08x", (unsigned) ent->addend & 0xffffffff);
+  if (ent->sec)
+    memcpy (name + 8, ent->sec->name, len3);
+  memcpy (name + 8 + len3, stub, len2);
+  memcpy (name + 8 + len3 + len2, h->root.root.string, len1 + 1);
+  sh = elf_link_hash_lookup (&htab->elf, name, TRUE, FALSE, FALSE);
+  if (sh == NULL)
+    return FALSE;
+  if (sh->root.type == bfd_link_hash_new)
+    {
+      sh->root.type = bfd_link_hash_defined;
+      sh->root.u.def.section = htab->glink;
+      sh->root.u.def.value = ent->glink_offset;
+      sh->ref_regular = 1;
+      sh->def_regular = 1;
+      sh->ref_regular_nonweak = 1;
+      sh->forced_local = 1;
+      sh->non_elf = 0;
+    }
+  return TRUE;
+}
+
+/* Allocate NEED contiguous space in .got, and return the offset.
+   Handles allocation of the got header when crossing 32k.  */
+
+static bfd_vma
+allocate_got (struct ppc_elf_link_hash_table *htab, unsigned int need)
+{
+  bfd_vma where;
+  unsigned int max_before_header;
+
+  if (htab->plt_type == PLT_VXWORKS)
+    {
+      where = htab->got->size;
+      htab->got->size += need;
+    }
+  else
+    {
+      max_before_header = htab->plt_type == PLT_NEW ? 32768 : 32764;
+      if (need <= htab->got_gap)
+	{
+	  where = max_before_header - htab->got_gap;
+	  htab->got_gap -= need;
+	}
+      else
+	{
+	  if (htab->got->size + need > max_before_header
+	      && htab->got->size <= max_before_header)
+	    {
+	      htab->got_gap = max_before_header - htab->got->size;
+	      htab->got->size = max_before_header + htab->got_header_size;
+	    }
+	  where = htab->got->size;
+	  htab->got->size += need;
+	}
+    }
+  return where;
+}
+
+/* Allocate space in associated reloc sections for dynamic relocs.  */
+
+static bfd_boolean
+allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+{
+  struct bfd_link_info *info = inf;
+  struct ppc_elf_link_hash_entry *eh;
+  struct ppc_elf_link_hash_table *htab;
+  struct elf_dyn_relocs *p;
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  htab = ppc_elf_hash_table (info);
+  if (htab->elf.dynamic_sections_created
+      || h->type == STT_GNU_IFUNC)
+    {
+      struct plt_entry *ent;
+      bfd_boolean doneone = FALSE;
+      bfd_vma plt_offset = 0, glink_offset = 0;
+      bfd_boolean dyn;
+
+      for (ent = h->plt.plist; ent != NULL; ent = ent->next)
+	if (ent->plt.refcount > 0)
+	  {
+	    /* Make sure this symbol is output as a dynamic symbol.  */
+	    if (h->dynindx == -1
+		&& !h->forced_local
+		&& !h->def_regular
+		&& htab->elf.dynamic_sections_created)
+	      {
+		if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		  return FALSE;
+	      }
+
+	    dyn = htab->elf.dynamic_sections_created;
+	    if (info->shared
+		|| h->type == STT_GNU_IFUNC
+		|| WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h))
+	      {
+		asection *s = htab->plt;
+		if (!dyn || h->dynindx == -1)
+		  s = htab->iplt;
+
+		if (htab->plt_type == PLT_NEW || !dyn || h->dynindx == -1)
+		  {
+		    if (!doneone)
+		      {
+			plt_offset = s->size;
+			s->size += 4;
+		      }
+		    ent->plt.offset = plt_offset;
+
+		    s = htab->glink;
+		    if (!doneone || info->shared)
+		      {
+			glink_offset = s->size;
+			s->size += GLINK_ENTRY_SIZE;
+			if (h == htab->tls_get_addr
+			    && !htab->no_tls_get_addr_opt)
+			  s->size += TLS_GET_ADDR_GLINK_SIZE - GLINK_ENTRY_SIZE;
+		      }
+		    if (!doneone
+			&& !info->shared
+			&& h->def_dynamic
+			&& !h->def_regular)
+		      {
+			h->root.u.def.section = s;
+			h->root.u.def.value = glink_offset;
+		      }
+		    ent->glink_offset = glink_offset;
+
+		    if (htab->emit_stub_syms
+			&& !add_stub_sym (ent, h, info))
+		      return FALSE;
+		  }
+		else
+		  {
+		    if (!doneone)
+		      {
+			/* If this is the first .plt entry, make room
+			   for the special first entry.  */
+			if (s->size == 0)
+			  s->size += htab->plt_initial_entry_size;
+
+			/* The PowerPC PLT is actually composed of two
+			   parts, the first part is 2 words (for a load
+			   and a jump), and then there is a remaining
+			   word available at the end.  */
+			plt_offset = (htab->plt_initial_entry_size
+				      + (htab->plt_slot_size
+					 * ((s->size
+					     - htab->plt_initial_entry_size)
+					    / htab->plt_entry_size)));
+
+			/* If this symbol is not defined in a regular
+			   file, and we are not generating a shared
+			   library, then set the symbol to this location
+			   in the .plt.  This is to avoid text
+			   relocations, and is required to make
+			   function pointers compare as equal between
+			   the normal executable and the shared library.  */
+			if (! info->shared
+			    && h->def_dynamic
+			    && !h->def_regular)
+			  {
+			    h->root.u.def.section = s;
+			    h->root.u.def.value = plt_offset;
+			  }
+
+			/* Make room for this entry.  */
+			s->size += htab->plt_entry_size;
+			/* After the 8192nd entry, room for two entries
+			   is allocated.  */
+			if (htab->plt_type == PLT_OLD
+			    && (s->size - htab->plt_initial_entry_size)
+				/ htab->plt_entry_size
+			       > PLT_NUM_SINGLE_ENTRIES)
+			  s->size += htab->plt_entry_size;
+		      }
+		    ent->plt.offset = plt_offset;
+		  }
+
+		/* We also need to make an entry in the .rela.plt section.  */
+		if (!doneone)
+		  {
+		    if (!htab->elf.dynamic_sections_created
+			|| h->dynindx == -1)
+		      htab->reliplt->size += sizeof (Elf32_External_Rela);
+		    else
+		      {
+			htab->relplt->size += sizeof (Elf32_External_Rela);
+
+			if (htab->plt_type == PLT_VXWORKS)
+			  {
+			    /* Allocate space for the unloaded relocations.  */
+			    if (!info->shared
+				&& htab->elf.dynamic_sections_created)
+			      {
+				if (ent->plt.offset
+				    == (bfd_vma) htab->plt_initial_entry_size)
+				  {
+				    htab->srelplt2->size
+				      += (sizeof (Elf32_External_Rela)
+					  * VXWORKS_PLTRESOLVE_RELOCS);
+				  }
+
+				htab->srelplt2->size
+				  += (sizeof (Elf32_External_Rela)
+				      * VXWORKS_PLT_NON_JMP_SLOT_RELOCS);
+			      }
+
+			    /* Every PLT entry has an associated GOT entry in
+			       .got.plt.  */
+			    htab->sgotplt->size += 4;
+			  }
+		      }
+		    doneone = TRUE;
+		  }
+	      }
+	    else
+	      ent->plt.offset = (bfd_vma) -1;
+	  }
+	else
+	  ent->plt.offset = (bfd_vma) -1;
+
+      if (!doneone)
+	{
+	  h->plt.plist = NULL;
+	  h->needs_plt = 0;
+	}
+    }
+  else
+    {
+      h->plt.plist = NULL;
+      h->needs_plt = 0;
+    }
+
+  eh = (struct ppc_elf_link_hash_entry *) h;
+  if (eh->elf.got.refcount > 0)
+    {
+      bfd_boolean dyn;
+      unsigned int need;
+
+      /* Make sure this symbol is output as a dynamic symbol.  */
+      if (eh->elf.dynindx == -1
+	  && !eh->elf.forced_local
+	  && eh->elf.type != STT_GNU_IFUNC
+	  && htab->elf.dynamic_sections_created)
+	{
+	  if (!bfd_elf_link_record_dynamic_symbol (info, &eh->elf))
+	    return FALSE;
+	}
+
+      need = 0;
+      if ((eh->tls_mask & TLS_TLS) != 0)
+	{
+	  if ((eh->tls_mask & TLS_LD) != 0)
+	    {
+	      if (!eh->elf.def_dynamic)
+		/* We'll just use htab->tlsld_got.offset.  This should
+		   always be the case.  It's a little odd if we have
+		   a local dynamic reloc against a non-local symbol.  */
+		htab->tlsld_got.refcount += 1;
+	      else
+		need += 8;
+	    }
+	  if ((eh->tls_mask & TLS_GD) != 0)
+	    need += 8;
+	  if ((eh->tls_mask & (TLS_TPREL | TLS_TPRELGD)) != 0)
+	    need += 4;
+	  if ((eh->tls_mask & TLS_DTPREL) != 0)
+	    need += 4;
+	}
+      else
+	need += 4;
+      if (need == 0)
+	eh->elf.got.offset = (bfd_vma) -1;
+      else
+	{
+	  eh->elf.got.offset = allocate_got (htab, need);
+	  dyn = htab->elf.dynamic_sections_created;
+	  if ((info->shared
+	       || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, &eh->elf))
+	      && (ELF_ST_VISIBILITY (eh->elf.other) == STV_DEFAULT
+		  || eh->elf.root.type != bfd_link_hash_undefweak))
+	    {
+	      asection *rsec = htab->relgot;
+	      /* All the entries we allocated need relocs.
+		 Except LD only needs one.  */
+	      if ((eh->tls_mask & TLS_LD) != 0
+		  && eh->elf.def_dynamic)
+		need -= 4;
+	      rsec->size += need * (sizeof (Elf32_External_Rela) / 4);
+	    }
+	}
+    }
+  else
+    eh->elf.got.offset = (bfd_vma) -1;
+
+  if (eh->dyn_relocs == NULL
+      || !htab->elf.dynamic_sections_created)
+    return TRUE;
+
+  /* In the shared -Bsymbolic case, discard space allocated for
+     dynamic pc-relative relocs against symbols which turn out to be
+     defined in regular objects.  For the normal shared case, discard
+     space for relocs that have become local due to symbol visibility
+     changes.  */
+
+  if (info->shared)
+    {
+      /* Relocs that use pc_count are those that appear on a call insn,
+	 or certain REL relocs (see must_be_dyn_reloc) that can be
+	 generated via assembly.  We want calls to protected symbols to
+	 resolve directly to the function rather than going via the plt.
+	 If people want function pointer comparisons to work as expected
+	 then they should avoid writing weird assembly.  */
+      if (SYMBOL_CALLS_LOCAL (info, h))
+	{
+	  struct elf_dyn_relocs **pp;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      p->count -= p->pc_count;
+	      p->pc_count = 0;
+	      if (p->count == 0)
+		*pp = p->next;
+	      else
+		pp = &p->next;
+	    }
+	}
+
+      if (htab->is_vxworks)
+	{
+	  struct elf_dyn_relocs **pp;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      if (strcmp (p->sec->output_section->name, ".tls_vars") == 0)
+		*pp = p->next;
+	      else
+		pp = &p->next;
+	    }
+	}
+
+      /* Discard relocs on undefined symbols that must be local.  */
+      if (eh->dyn_relocs != NULL
+	  && h->root.type == bfd_link_hash_undefined
+	  && (ELF_ST_VISIBILITY (h->other) == STV_HIDDEN
+	      || ELF_ST_VISIBILITY (h->other) == STV_INTERNAL))
+	eh->dyn_relocs = NULL;
+
+      /* Also discard relocs on undefined weak syms with non-default
+	 visibility.  */
+      if (eh->dyn_relocs != NULL
+	  && h->root.type == bfd_link_hash_undefweak)
+	{
+	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	    eh->dyn_relocs = NULL;
+
+	  /* Make sure undefined weak symbols are output as a dynamic
+	     symbol in PIEs.  */
+	  else if (h->dynindx == -1
+		   && !h->forced_local
+		   && !h->def_regular)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+	}
+    }
+  else if (ELIMINATE_COPY_RELOCS)
+    {
+      /* For the non-shared case, discard space for relocs against
+	 symbols which turn out to need copy relocs or are not
+	 dynamic.  */
+
+      if (!h->non_got_ref
+	  && !h->def_regular)
+	{
+	  /* Make sure this symbol is output as a dynamic symbol.
+	     Undefined weak syms won't yet be marked as dynamic.  */
+	  if (h->dynindx == -1
+	      && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+
+	  /* If that succeeded, we know we'll be keeping all the
+	     relocs.  */
+	  if (h->dynindx != -1)
+	    goto keep;
+	}
+
+      eh->dyn_relocs = NULL;
+
+    keep: ;
+    }
+
+  /* Finally, allocate space.  */
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *sreloc = elf_section_data (p->sec)->sreloc;
+      if (!htab->elf.dynamic_sections_created)
+	sreloc = htab->reliplt;
+      sreloc->size += p->count * sizeof (Elf32_External_Rela);
+    }
+
+  return TRUE;
+}
+
+/* Set DF_TEXTREL if we find any dynamic relocs that apply to
+   read-only sections.  */
+
+static bfd_boolean
+maybe_set_textrel (struct elf_link_hash_entry *h, void *info)
+{
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  if (readonly_dynrelocs (h))
+    {
+      ((struct bfd_link_info *) info)->flags |= DF_TEXTREL;
+
+      /* Not an error, just cut short the traversal.  */
+      return FALSE;
+    }
+  return TRUE;
+}
+
+static const unsigned char glink_eh_frame_cie[] =
+{
+  0, 0, 0, 16,				/* length.  */
+  0, 0, 0, 0,				/* id.  */
+  1,					/* CIE version.  */
+  'z', 'R', 0,				/* Augmentation string.  */
+  4,					/* Code alignment.  */
+  0x7c,					/* Data alignment.  */
+  65,					/* RA reg.  */
+  1,					/* Augmentation size.  */
+  DW_EH_PE_pcrel | DW_EH_PE_sdata4,	/* FDE encoding.  */
+  DW_CFA_def_cfa, 1, 0			/* def_cfa: r1 offset 0.  */
+};
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+ppc_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+			       struct bfd_link_info *info)
+{
+  struct ppc_elf_link_hash_table *htab;
+  asection *s;
+  bfd_boolean relocs;
+  bfd *ibfd;
+
+#ifdef DEBUG
+  fprintf (stderr, "ppc_elf_size_dynamic_sections called\n");
+#endif
+
+  htab = ppc_elf_hash_table (info);
+  BFD_ASSERT (htab->elf.dynobj != NULL);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (htab->elf.dynobj, ".interp");
+	  BFD_ASSERT (s != NULL);
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+
+  if (htab->plt_type == PLT_OLD)
+    htab->got_header_size = 16;
+  else if (htab->plt_type == PLT_NEW)
+    htab->got_header_size = 12;
+
+  /* Set up .got offsets for local syms, and space for local dynamic
+     relocs.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      bfd_signed_vma *local_got;
+      bfd_signed_vma *end_local_got;
+      struct plt_entry **local_plt;
+      struct plt_entry **end_local_plt;
+      char *lgot_masks;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+
+      if (!is_ppc_elf (ibfd))
+	continue;
+
+      for (s = ibfd->sections; s != NULL; s = s->next)
+	{
+	  struct elf_dyn_relocs *p;
+
+	  for (p = ((struct elf_dyn_relocs *)
+		    elf_section_data (s)->local_dynrel);
+	       p != NULL;
+	       p = p->next)
+	    {
+	      if (!bfd_is_abs_section (p->sec)
+		  && bfd_is_abs_section (p->sec->output_section))
+		{
+		  /* Input section has been discarded, either because
+		     it is a copy of a linkonce section or due to
+		     linker script /DISCARD/, so we'll be discarding
+		     the relocs too.  */
+		}
+	      else if (htab->is_vxworks
+		       && strcmp (p->sec->output_section->name,
+				  ".tls_vars") == 0)
+		{
+		  /* Relocations in vxworks .tls_vars sections are
+		     handled specially by the loader.  */
+		}
+	      else if (p->count != 0)
+		{
+		  asection *sreloc = elf_section_data (p->sec)->sreloc;
+		  if (!htab->elf.dynamic_sections_created)
+		    sreloc = htab->reliplt;
+		  sreloc->size += p->count * sizeof (Elf32_External_Rela);
+		  if ((p->sec->output_section->flags
+		       & (SEC_READONLY | SEC_ALLOC))
+		      == (SEC_READONLY | SEC_ALLOC))
+		    info->flags |= DF_TEXTREL;
+		}
+	    }
+	}
+
+      local_got = elf_local_got_refcounts (ibfd);
+      if (!local_got)
+	continue;
+
+      symtab_hdr = &elf_symtab_hdr (ibfd);
+      locsymcount = symtab_hdr->sh_info;
+      end_local_got = local_got + locsymcount;
+      local_plt = (struct plt_entry **) end_local_got;
+      end_local_plt = local_plt + locsymcount;
+      lgot_masks = (char *) end_local_plt;
+
+      for (; local_got < end_local_got; ++local_got, ++lgot_masks)
+	if (*local_got > 0)
+	  {
+	    unsigned int need = 0;
+	    if ((*lgot_masks & TLS_TLS) != 0)
+	      {
+		if ((*lgot_masks & TLS_GD) != 0)
+		  need += 8;
+		if ((*lgot_masks & TLS_LD) != 0)
+		  htab->tlsld_got.refcount += 1;
+		if ((*lgot_masks & (TLS_TPREL | TLS_TPRELGD)) != 0)
+		  need += 4;
+		if ((*lgot_masks & TLS_DTPREL) != 0)
+		  need += 4;
+	      }
+	    else
+	      need += 4;
+	    if (need == 0)
+	      *local_got = (bfd_vma) -1;
+	    else
+	      {
+		*local_got = allocate_got (htab, need);
+		if (info->shared)
+		  htab->relgot->size += (need
+					 * (sizeof (Elf32_External_Rela) / 4));
+	      }
+	  }
+	else
+	  *local_got = (bfd_vma) -1;
+
+      if (htab->is_vxworks)
+	continue;
+
+      /* Allocate space for calls to local STT_GNU_IFUNC syms in .iplt.  */
+      for (; local_plt < end_local_plt; ++local_plt)
+	{
+	  struct plt_entry *ent;
+	  bfd_boolean doneone = FALSE;
+	  bfd_vma plt_offset = 0, glink_offset = 0;
+
+	  for (ent = *local_plt; ent != NULL; ent = ent->next)
+	    if (ent->plt.refcount > 0)
+	      {
+		s = htab->iplt;
+
+		if (!doneone)
+		  {
+		    plt_offset = s->size;
+		    s->size += 4;
+		  }
+		ent->plt.offset = plt_offset;
+
+		s = htab->glink;
+		if (!doneone || info->shared)
+		  {
+		    glink_offset = s->size;
+		    s->size += GLINK_ENTRY_SIZE;
+		  }
+		ent->glink_offset = glink_offset;
+
+		if (!doneone)
+		  {
+		    htab->reliplt->size += sizeof (Elf32_External_Rela);
+		    doneone = TRUE;
+		  }
+	      }
+	    else
+	      ent->plt.offset = (bfd_vma) -1;
+	}
+    }
+
+  /* Allocate space for global sym dynamic relocs.  */
+  elf_link_hash_traverse (elf_hash_table (info), allocate_dynrelocs, info);
+
+  if (htab->tlsld_got.refcount > 0)
+    {
+      htab->tlsld_got.offset = allocate_got (htab, 8);
+      if (info->shared)
+	htab->relgot->size += sizeof (Elf32_External_Rela);
+    }
+  else
+    htab->tlsld_got.offset = (bfd_vma) -1;
+
+  if (htab->got != NULL && htab->plt_type != PLT_VXWORKS)
+    {
+      unsigned int g_o_t = 32768;
+
+      /* If we haven't allocated the header, do so now.  When we get here,
+	 for old plt/got the got size will be 0 to 32764 (not allocated),
+	 or 32780 to 65536 (header allocated).  For new plt/got, the
+	 corresponding ranges are 0 to 32768 and 32780 to 65536.  */
+      if (htab->got->size <= 32768)
+	{
+	  g_o_t = htab->got->size;
+	  if (htab->plt_type == PLT_OLD)
+	    g_o_t += 4;
+	  htab->got->size += htab->got_header_size;
+	}
+
+      htab->elf.hgot->root.u.def.value = g_o_t;
+    }
+  if (info->shared)
+    {
+      struct elf_link_hash_entry *sda = htab->sdata[0].sym;
+      if (sda != NULL
+	  && !(sda->root.type == bfd_link_hash_defined
+	       || sda->root.type == bfd_link_hash_defweak))
+	{
+	  sda->root.type = bfd_link_hash_defined;
+	  sda->root.u.def.section = htab->elf.hgot->root.u.def.section;
+	  sda->root.u.def.value = htab->elf.hgot->root.u.def.value;
+	}
+    }
+
+  if (htab->glink != NULL
+      && htab->glink->size != 0
+      && htab->elf.dynamic_sections_created)
+    {
+      htab->glink_pltresolve = htab->glink->size;
+      /* Space for the branch table.  */
+      htab->glink->size += htab->glink->size / (GLINK_ENTRY_SIZE / 4) - 4;
+      /* Pad out to align the start of PLTresolve.  */
+      htab->glink->size += -htab->glink->size & 15;
+      htab->glink->size += GLINK_PLTRESOLVE;
+
+      if (htab->emit_stub_syms)
+	{
+	  struct elf_link_hash_entry *sh;
+	  sh = elf_link_hash_lookup (&htab->elf, "__glink",
+				     TRUE, FALSE, FALSE);
+	  if (sh == NULL)
+	    return FALSE;
+	  if (sh->root.type == bfd_link_hash_new)
+	    {
+	      sh->root.type = bfd_link_hash_defined;
+	      sh->root.u.def.section = htab->glink;
+	      sh->root.u.def.value = htab->glink_pltresolve;
+	      sh->ref_regular = 1;
+	      sh->def_regular = 1;
+	      sh->ref_regular_nonweak = 1;
+	      sh->forced_local = 1;
+	      sh->non_elf = 0;
+	    }
+	  sh = elf_link_hash_lookup (&htab->elf, "__glink_PLTresolve",
+				     TRUE, FALSE, FALSE);
+	  if (sh == NULL)
+	    return FALSE;
+	  if (sh->root.type == bfd_link_hash_new)
+	    {
+	      sh->root.type = bfd_link_hash_defined;
+	      sh->root.u.def.section = htab->glink;
+	      sh->root.u.def.value = htab->glink->size - GLINK_PLTRESOLVE;
+	      sh->ref_regular = 1;
+	      sh->def_regular = 1;
+	      sh->ref_regular_nonweak = 1;
+	      sh->forced_local = 1;
+	      sh->non_elf = 0;
+	    }
+	}
+    }
+
+  if (htab->glink != NULL
+      && htab->glink->size != 0
+      && htab->glink_eh_frame != NULL
+      && !bfd_is_abs_section (htab->glink_eh_frame->output_section))
+    {
+      s = htab->glink_eh_frame;
+      s->size = sizeof (glink_eh_frame_cie) + 20;
+      if (info->shared)
+	{
+	  s->size += 4;
+	  if (htab->glink->size - GLINK_PLTRESOLVE + 8 >= 256)
+	    s->size += 4;
+	}
+    }
+
+  /* We've now determined the sizes of the various dynamic sections.
+     Allocate memory for them.  */
+  relocs = FALSE;
+  for (s = htab->elf.dynobj->sections; s != NULL; s = s->next)
+    {
+      bfd_boolean strip_section = TRUE;
+
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      if (s == htab->plt
+	  || s == htab->got)
+	{
+	  /* We'd like to strip these sections if they aren't needed, but if
+	     we've exported dynamic symbols from them we must leave them.
+	     It's too late to tell BFD to get rid of the symbols.  */
+	  if (htab->elf.hplt != NULL)
+	    strip_section = FALSE;
+	  /* Strip this section if we don't need it; see the
+	     comment below.  */
+	}
+      else if (s == htab->iplt
+	       || s == htab->glink
+	       || s == htab->glink_eh_frame
+	       || s == htab->sgotplt
+	       || s == htab->sbss
+	       || s == htab->dynbss
+	       || s == htab->dynsbss
+	       || s == htab->sdata[0].section
+	       || s == htab->sdata[1].section)
+	{
+	  /* Strip these too.  */
+	}
+      else if (CONST_STRNEQ (bfd_get_section_name (dynobj, s), ".rela"))
+	{
+	  if (s->size != 0)
+	    {
+	      /* Remember whether there are any relocation sections.  */
+	      relocs = TRUE;
+
+	      /* We use the reloc_count field as a counter if we need
+		 to copy relocs into the output file.  */
+	      s->reloc_count = 0;
+	    }
+	}
+      else
+	{
+	  /* It's not one of our sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (s->size == 0 && strip_section)
+	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is mostly to handle .rela.bss and
+	     .rela.plt.  We must create both sections in
+	     create_dynamic_sections, because they must be created
+	     before the linker maps input sections to output
+	     sections.  The linker does that before
+	     adjust_dynamic_symbol is called, and it is that
+	     function which decides whether anything needs to go
+	     into these sections.  */
+	  s->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents.  */
+      s->contents = bfd_zalloc (htab->elf.dynobj, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+
+  if (htab->elf.dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in ppc_elf_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (info->executable)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (htab->plt != NULL && htab->plt->size != 0)
+	{
+	  if (!add_dynamic_entry (DT_PLTGOT, 0)
+	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+	      || !add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+	}
+
+      if (htab->glink != NULL && htab->glink->size != 0)
+	{
+	  if (!add_dynamic_entry (DT_PPC_GOT, 0))
+	    return FALSE;
+	  if (!htab->no_tls_get_addr_opt
+	      && htab->tls_get_addr != NULL
+	      && htab->tls_get_addr->plt.plist != NULL
+	      && !add_dynamic_entry (DT_PPC_TLSOPT, 0))
+	    return FALSE;
+	}
+
+      if (relocs)
+	{
+	  if (!add_dynamic_entry (DT_RELA, 0)
+	      || !add_dynamic_entry (DT_RELASZ, 0)
+	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
+	    return FALSE;
+	}
+
+      /* If any dynamic relocs apply to a read-only section, then we
+	 need a DT_TEXTREL entry.  */
+      if ((info->flags & DF_TEXTREL) == 0)
+	elf_link_hash_traverse (elf_hash_table (info), maybe_set_textrel,
+				info);
+
+      if ((info->flags & DF_TEXTREL) != 0)
+	{
+	  if (!add_dynamic_entry (DT_TEXTREL, 0))
+	    return FALSE;
+	}
+      if (htab->is_vxworks
+	  && !elf_vxworks_add_dynamic_entries (output_bfd, info))
+	return FALSE;
+   }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+/* Return TRUE if symbol should be hashed in the `.gnu.hash' section.  */
+
+static bfd_boolean
+ppc_elf_hash_symbol (struct elf_link_hash_entry *h)
+{
+  if (h->plt.plist != NULL
+      && !h->def_regular
+      && (!h->pointer_equality_needed
+	  || !h->ref_regular_nonweak))
+    return FALSE;
+
+  return _bfd_elf_hash_symbol (h);
+}
+
+#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
+
+/* Relaxation trampolines.  r12 is available for clobbering (r11, is
+   used for some functions that are allowed to break the ABI).  */
+static const int shared_stub_entry[] =
+  {
+    0x7c0802a6, /* mflr 0 */
+    0x429f0005, /* bcl 20, 31, .Lxxx */
+    0x7d8802a6, /* mflr 12 */
+    0x3d8c0000, /* addis 12, 12, (xxx-.Lxxx)@ha */
+    0x398c0008, /* addi 12, 12, (xxx-.Lxxx)@l */
+    0x7c0803a6, /* mtlr 0 */
+    0x7d8903a6, /* mtctr 12 */
+    0x4e800420, /* bctr */
+  };
+
+static const int stub_entry[] =
+  {
+    0x3d800000, /* lis 12,xxx@ha */
+    0x398c0000, /* addi 12,12,xxx@l */
+    0x7d8903a6, /* mtctr 12 */
+    0x4e800420, /* bctr */
+  };
+
+static bfd_boolean
+ppc_elf_relax_section (bfd *abfd,
+		       asection *isec,
+		       struct bfd_link_info *link_info,
+		       bfd_boolean *again)
+{
+  struct one_fixup
+  {
+    struct one_fixup *next;
+    asection *tsec;
+    /* Final link, can use the symbol offset.  For a
+       relocatable link we use the symbol's index.  */
+    bfd_vma toff;
+    bfd_vma trampoff;
+  };
+
+  Elf_Internal_Shdr *symtab_hdr;
+  bfd_byte *contents = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+  Elf_Internal_Rela *internal_relocs = NULL;
+  Elf_Internal_Rela *irel, *irelend;
+  struct one_fixup *fixups = NULL;
+  unsigned changes = 0;
+  struct ppc_elf_link_hash_table *htab;
+  bfd_size_type trampoff;
+  asection *got2;
+  bfd_boolean maybe_pasted;
+
+  *again = FALSE;
+
+  /* Nothing to do if there are no relocations, and no need to do
+     anything with non-alloc or non-code sections.  */
+  if ((isec->flags & SEC_ALLOC) == 0
+      || (isec->flags & SEC_CODE) == 0
+      || (isec->flags & SEC_RELOC) == 0
+      || isec->reloc_count == 0)
+    return TRUE;
+
+  /* We cannot represent the required PIC relocs in the output, so don't
+     do anything.  The linker doesn't support mixing -shared and -r
+     anyway.  */
+  if (link_info->relocatable && link_info->shared)
+     return TRUE;
+
+  trampoff = (isec->size + 3) & (bfd_vma) -4;
+  maybe_pasted = (strcmp (isec->output_section->name, ".init") == 0
+		  || strcmp (isec->output_section->name, ".fini") == 0);
+  /* Space for a branch around any trampolines.  */
+  if (maybe_pasted)
+    trampoff += 4;
+
+  symtab_hdr = &elf_symtab_hdr (abfd);
+
+  /* Get a copy of the native relocations.  */
+  internal_relocs = _bfd_elf_link_read_relocs (abfd, isec, NULL, NULL,
+					       link_info->keep_memory);
+  if (internal_relocs == NULL)
+    goto error_return;
+
+  htab = ppc_elf_hash_table (link_info);
+  got2 = bfd_get_section_by_name (abfd, ".got2");
+
+  irelend = internal_relocs + isec->reloc_count;
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      unsigned long r_type = ELF32_R_TYPE (irel->r_info);
+      bfd_vma toff, roff;
+      asection *tsec;
+      struct one_fixup *f;
+      size_t insn_offset = 0;
+      bfd_vma max_branch_offset, val;
+      bfd_byte *hit_addr;
+      unsigned long t0;
+      struct elf_link_hash_entry *h;
+      struct plt_entry **plist;
+      unsigned char sym_type;
+
+      switch (r_type)
+	{
+	case R_PPC_REL24:
+	case R_PPC_LOCAL24PC:
+	case R_PPC_PLTREL24:
+	  max_branch_offset = 1 << 25;
+	  break;
+
+	case R_PPC_REL14:
+	case R_PPC_REL14_BRTAKEN:
+	case R_PPC_REL14_BRNTAKEN:
+	  max_branch_offset = 1 << 15;
+	  break;
+
+	default:
+	  continue;
+	}
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      h = NULL;
+      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+	{
+	  /* A local symbol.  */
+	  Elf_Internal_Sym *isym;
+
+	  /* Read this BFD's local symbols.  */
+	  if (isymbuf == NULL)
+	    {
+	      isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	      if (isymbuf == NULL)
+		isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+						symtab_hdr->sh_info, 0,
+						NULL, NULL, NULL);
+	      if (isymbuf == 0)
+		goto error_return;
+	    }
+	  isym = isymbuf + ELF32_R_SYM (irel->r_info);
+	  if (isym->st_shndx == SHN_UNDEF)
+	    tsec = bfd_und_section_ptr;
+	  else if (isym->st_shndx == SHN_ABS)
+	    tsec = bfd_abs_section_ptr;
+	  else if (isym->st_shndx == SHN_COMMON)
+	    tsec = bfd_com_section_ptr;
+	  else
+	    tsec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+
+	  toff = isym->st_value;
+	  sym_type = ELF_ST_TYPE (isym->st_info);
+	}
+      else
+	{
+	  /* Global symbol handling.  */
+	  unsigned long indx;
+
+	  indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+	  h = elf_sym_hashes (abfd)[indx];
+
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+	  if (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	    {
+	      tsec = h->root.u.def.section;
+	      toff = h->root.u.def.value;
+	    }
+	  else if (h->root.type == bfd_link_hash_undefined
+		   || h->root.type == bfd_link_hash_undefweak)
+	    {
+	      tsec = bfd_und_section_ptr;
+	      toff = link_info->relocatable ? indx : 0;
+	    }
+	  else
+	    continue;
+
+	  sym_type = h->type;
+	}
+
+      /* The condition here under which we call find_plt_ent must
+	 match that in relocate_section.  If we call find_plt_ent here
+	 but not in relocate_section, or vice versa, then the branch
+	 destination used here may be incorrect.  */
+      plist = NULL;
+      if (h != NULL)
+	{
+	  /* We know is_branch_reloc (r_type) is true.  */
+	  if (h->type == STT_GNU_IFUNC
+	      || r_type == R_PPC_PLTREL24)
+	    plist = &h->plt.plist;
+	}
+      else if (sym_type == STT_GNU_IFUNC
+	       && elf_local_got_offsets (abfd) != NULL)
+	{
+	  bfd_vma *local_got_offsets = elf_local_got_offsets (abfd);
+	  struct plt_entry **local_plt = (struct plt_entry **)
+	    (local_got_offsets + symtab_hdr->sh_info);
+	  plist = local_plt + ELF32_R_SYM (irel->r_info);
+	}
+      if (plist != NULL)
+	{
+	  bfd_vma addend = 0;
+	  struct plt_entry *ent;
+
+	  if (r_type == R_PPC_PLTREL24 && link_info->shared)
+	    addend = irel->r_addend;
+	  ent = find_plt_ent (plist, got2, addend);
+	  if (ent != NULL)
+	    {
+	      if (htab->plt_type == PLT_NEW
+		  || h == NULL
+		  || !htab->elf.dynamic_sections_created
+		  || h->dynindx == -1)
+		{
+		  tsec = htab->glink;
+		  toff = ent->glink_offset;
+		}
+	      else
+		{
+		  tsec = htab->plt;
+		  toff = ent->plt.offset;
+		}
+	    }
+	}
+
+      /* If the branch and target are in the same section, you have
+	 no hope of adding stubs.  We'll error out later should the
+	 branch overflow.  */
+      if (tsec == isec)
+	continue;
+
+      /* There probably isn't any reason to handle symbols in
+	 SEC_MERGE sections;  SEC_MERGE doesn't seem a likely
+	 attribute for a code section, and we are only looking at
+	 branches.  However, implement it correctly here as a
+	 reference for other target relax_section functions.  */
+      if (0 && tsec->sec_info_type == ELF_INFO_TYPE_MERGE)
+	{
+	  /* At this stage in linking, no SEC_MERGE symbol has been
+	     adjusted, so all references to such symbols need to be
+	     passed through _bfd_merged_section_offset.  (Later, in
+	     relocate_section, all SEC_MERGE symbols *except* for
+	     section symbols have been adjusted.)
+
+	     gas may reduce relocations against symbols in SEC_MERGE
+	     sections to a relocation against the section symbol when
+	     the original addend was zero.  When the reloc is against
+	     a section symbol we should include the addend in the
+	     offset passed to _bfd_merged_section_offset, since the
+	     location of interest is the original symbol.  On the
+	     other hand, an access to "sym+addend" where "sym" is not
+	     a section symbol should not include the addend;  Such an
+	     access is presumed to be an offset from "sym";  The
+	     location of interest is just "sym".  */
+	  if (sym_type == STT_SECTION)
+	    toff += irel->r_addend;
+
+	  toff = _bfd_merged_section_offset (abfd, &tsec,
+					     elf_section_data (tsec)->sec_info,
+					     toff);
+
+	  if (sym_type != STT_SECTION)
+	    toff += irel->r_addend;
+	}
+      /* PLTREL24 addends are special.  */
+      else if (r_type != R_PPC_PLTREL24)
+	toff += irel->r_addend;
+
+      /* Attempted -shared link of non-pic code loses.  */
+      if (tsec->output_section == NULL)
+	continue;
+
+      roff = irel->r_offset;
+
+      /* If the branch is in range, no need to do anything.  */
+      if (tsec != bfd_und_section_ptr
+	  && (!link_info->relocatable
+	      /* A relocatable link may have sections moved during
+		 final link, so do not presume they remain in range.  */
+	      || tsec->output_section == isec->output_section))
+	{
+	  bfd_vma symaddr, reladdr;
+
+	  symaddr = tsec->output_section->vma + tsec->output_offset + toff;
+	  reladdr = isec->output_section->vma + isec->output_offset + roff;
+	  if (symaddr - reladdr + max_branch_offset < 2 * max_branch_offset)
+	    continue;
+	}
+
+      /* Look for an existing fixup to this address.  */
+      for (f = fixups; f ; f = f->next)
+	if (f->tsec == tsec && f->toff == toff)
+	  break;
+
+      if (f == NULL)
+	{
+	  size_t size;
+	  unsigned long stub_rtype;
+
+	  val = trampoff - roff;
+	  if (val >= max_branch_offset)
+	    /* Oh dear, we can't reach a trampoline.  Don't try to add
+	       one.  We'll report an error later.  */
+	    continue;
+
+	  if (link_info->shared)
+	    {
+	      size = 4 * ARRAY_SIZE (shared_stub_entry);
+	      insn_offset = 12;
+	    }
+	  else
+	    {
+	      size = 4 * ARRAY_SIZE (stub_entry);
+	      insn_offset = 0;
+	    }
+	  stub_rtype = R_PPC_RELAX;
+	  if (tsec == htab->plt
+	      || tsec == htab->glink)
+	    {
+	      stub_rtype = R_PPC_RELAX_PLT;
+	      if (r_type == R_PPC_PLTREL24)
+		stub_rtype = R_PPC_RELAX_PLTREL24;
+	    }
+
+	  /* Hijack the old relocation.  Since we need two
+	     relocations for this use a "composite" reloc.  */
+	  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+				       stub_rtype);
+	  irel->r_offset = trampoff + insn_offset;
+	  if (r_type == R_PPC_PLTREL24
+	      && stub_rtype != R_PPC_RELAX_PLTREL24)
+	    irel->r_addend = 0;
+
+	  /* Record the fixup so we don't do it again this section.  */
+	  f = bfd_malloc (sizeof (*f));
+	  f->next = fixups;
+	  f->tsec = tsec;
+	  f->toff = toff;
+	  f->trampoff = trampoff;
+	  fixups = f;
+
+	  trampoff += size;
+	  changes++;
+	}
+      else
+	{
+	  val = f->trampoff - roff;
+	  if (val >= max_branch_offset)
+	    continue;
+
+	  /* Nop out the reloc, since we're finalizing things here.  */
+	  irel->r_info = ELF32_R_INFO (0, R_PPC_NONE);
+	}
+
+      /* Get the section contents.  */
+      if (contents == NULL)
+	{
+	  /* Get cached copy if it exists.  */
+	  if (elf_section_data (isec)->this_hdr.contents != NULL)
+	    contents = elf_section_data (isec)->this_hdr.contents;
+	  else
+	    {
+	      /* Go get them off disk.  */
+	      if (!bfd_malloc_and_get_section (abfd, isec, &contents))
+		goto error_return;
+	    }
+	}
+
+      /* Fix up the existing branch to hit the trampoline.  */
+      hit_addr = contents + roff;
+      switch (r_type)
+	{
+	case R_PPC_REL24:
+	case R_PPC_LOCAL24PC:
+	case R_PPC_PLTREL24:
+	  t0 = bfd_get_32 (abfd, hit_addr);
+	  t0 &= ~0x3fffffc;
+	  t0 |= val & 0x3fffffc;
+	  bfd_put_32 (abfd, t0, hit_addr);
+	  break;
+
+	case R_PPC_REL14:
+	case R_PPC_REL14_BRTAKEN:
+	case R_PPC_REL14_BRNTAKEN:
+	  t0 = bfd_get_32 (abfd, hit_addr);
+	  t0 &= ~0xfffc;
+	  t0 |= val & 0xfffc;
+	  bfd_put_32 (abfd, t0, hit_addr);
+	  break;
+	}
+    }
+
+  /* Write out the trampolines.  */
+  if (fixups != NULL)
+    {
+      const int *stub;
+      bfd_byte *dest;
+      int i, size;
+
+      do
+	{
+	  struct one_fixup *f = fixups;
+	  fixups = fixups->next;
+	  free (f);
+	}
+      while (fixups);
+
+      contents = bfd_realloc_or_free (contents, trampoff);
+      if (contents == NULL)
+	goto error_return;
+
+      isec->size = (isec->size + 3) & (bfd_vma) -4;
+      dest = contents + isec->size;
+      /* Branch around the trampolines.  */
+      if (maybe_pasted)
+	{
+	  bfd_vma val = B + trampoff - isec->size;
+	  bfd_put_32 (abfd, val, dest);
+	  dest += 4;
+	}
+      isec->size = trampoff;
+
+      if (link_info->shared)
+	{
+	  stub = shared_stub_entry;
+	  size = ARRAY_SIZE (shared_stub_entry);
+	}
+      else
+	{
+	  stub = stub_entry;
+	  size = ARRAY_SIZE (stub_entry);
+	}
+
+      i = 0;
+      while (dest < contents + trampoff)
+	{
+	  bfd_put_32 (abfd, stub[i], dest);
+	  i++;
+	  if (i == size)
+	    i = 0;
+	  dest += 4;
+	}
+      BFD_ASSERT (i == 0);
+    }
+
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    {
+      if (! link_info->keep_memory)
+	free (isymbuf);
+      else
+	{
+	  /* Cache the symbols for elf_link_input_bfd.  */
+	  symtab_hdr->contents = (unsigned char *) isymbuf;
+	}
+    }
+
+  if (contents != NULL
+      && elf_section_data (isec)->this_hdr.contents != contents)
+    {
+      if (!changes && !link_info->keep_memory)
+	free (contents);
+      else
+	{
+	  /* Cache the section contents for elf_link_input_bfd.  */
+	  elf_section_data (isec)->this_hdr.contents = contents;
+	}
+    }
+
+  if (changes != 0)
+    {
+      /* Append sufficient NOP relocs so we can write out relocation
+	 information for the trampolines.  */
+      Elf_Internal_Shdr *rel_hdr;
+      Elf_Internal_Rela *new_relocs = bfd_malloc ((changes + isec->reloc_count)
+						  * sizeof (*new_relocs));
+      unsigned ix;
+
+      if (!new_relocs)
+	goto error_return;
+      memcpy (new_relocs, internal_relocs,
+	      isec->reloc_count * sizeof (*new_relocs));
+      for (ix = changes; ix--;)
+	{
+	  irel = new_relocs + ix + isec->reloc_count;
+
+	  irel->r_info = ELF32_R_INFO (0, R_PPC_NONE);
+	}
+      if (internal_relocs != elf_section_data (isec)->relocs)
+	free (internal_relocs);
+      elf_section_data (isec)->relocs = new_relocs;
+      isec->reloc_count += changes;
+      rel_hdr = _bfd_elf_single_rel_hdr (isec);
+      rel_hdr->sh_size += changes * rel_hdr->sh_entsize;
+    }
+  else if (elf_section_data (isec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  *again = changes != 0;
+  if (!*again && link_info->relocatable)
+    {
+      /* Convert the internal relax relocs to external form.  */
+      for (irel = internal_relocs; irel < irelend; irel++)
+	if (ELF32_R_TYPE (irel->r_info) == R_PPC_RELAX)
+	  {
+	    unsigned long r_symndx = ELF32_R_SYM (irel->r_info);
+
+	    /* Rewrite the reloc and convert one of the trailing nop
+	       relocs to describe this relocation.  */
+	    BFD_ASSERT (ELF32_R_TYPE (irelend[-1].r_info) == R_PPC_NONE);
+	    /* The relocs are at the bottom 2 bytes */
+	    irel[0].r_offset += 2;
+	    memmove (irel + 1, irel, (irelend - irel - 1) * sizeof (*irel));
+	    irel[0].r_info = ELF32_R_INFO (r_symndx, R_PPC_ADDR16_HA);
+	    irel[1].r_offset += 4;
+	    irel[1].r_info = ELF32_R_INFO (r_symndx, R_PPC_ADDR16_LO);
+	    irel++;
+	  }
+    }
+
+  return TRUE;
+
+ error_return:
+  if (isymbuf != NULL && (unsigned char *) isymbuf != symtab_hdr->contents)
+    free (isymbuf);
+  if (contents != NULL
+      && elf_section_data (isec)->this_hdr.contents != contents)
+    free (contents);
+  if (internal_relocs != NULL
+      && elf_section_data (isec)->relocs != internal_relocs)
+    free (internal_relocs);
+  return FALSE;
+}
+
+/* What to do when ld finds relocations against symbols defined in
+   discarded sections.  */
+
+static unsigned int
+ppc_elf_action_discarded (asection *sec)
+{
+  if (strcmp (".fixup", sec->name) == 0)
+    return 0;
+
+  if (strcmp (".got2", sec->name) == 0)
+    return 0;
+
+  return _bfd_elf_default_action_discarded (sec);
+}
+
+/* Fill in the address for a pointer generated in a linker section.  */
+
+static bfd_vma
+elf_finish_pointer_linker_section (bfd *input_bfd,
+				   elf_linker_section_t *lsect,
+				   struct elf_link_hash_entry *h,
+				   bfd_vma relocation,
+				   const Elf_Internal_Rela *rel)
+{
+  elf_linker_section_pointers_t *linker_section_ptr;
+
+  BFD_ASSERT (lsect != NULL);
+
+  if (h != NULL)
+    {
+      /* Handle global symbol.  */
+      struct ppc_elf_link_hash_entry *eh;
+
+      eh = (struct ppc_elf_link_hash_entry *) h;
+      BFD_ASSERT (eh->elf.def_regular);
+      linker_section_ptr = eh->linker_section_pointer;
+    }
+  else
+    {
+      /* Handle local symbol.  */
+      unsigned long r_symndx = ELF32_R_SYM (rel->r_info);
+
+      BFD_ASSERT (is_ppc_elf (input_bfd));
+      BFD_ASSERT (elf_local_ptr_offsets (input_bfd) != NULL);
+      linker_section_ptr = elf_local_ptr_offsets (input_bfd)[r_symndx];
+    }
+
+  linker_section_ptr = elf_find_pointer_linker_section (linker_section_ptr,
+							rel->r_addend,
+							lsect);
+  BFD_ASSERT (linker_section_ptr != NULL);
+
+  /* Offset will always be a multiple of four, so use the bottom bit
+     as a "written" flag.  */
+  if ((linker_section_ptr->offset & 1) == 0)
+    {
+      bfd_put_32 (lsect->section->owner,
+		  relocation + linker_section_ptr->addend,
+		  lsect->section->contents + linker_section_ptr->offset);
+      linker_section_ptr->offset += 1;
+    }
+
+  relocation = (lsect->section->output_section->vma
+		+ lsect->section->output_offset
+		+ linker_section_ptr->offset - 1
+		- SYM_VAL (lsect->sym));
+
+#ifdef DEBUG
+  fprintf (stderr,
+	   "Finish pointer in linker section %s, offset = %ld (0x%lx)\n",
+	   lsect->name, (long) relocation, (long) relocation);
+#endif
+
+  return relocation;
+}
+
+#define PPC_LO(v) ((v) & 0xffff)
+#define PPC_HI(v) (((v) >> 16) & 0xffff)
+#define PPC_HA(v) PPC_HI ((v) + 0x8000)
+
+static void
+write_glink_stub (struct plt_entry *ent, asection *plt_sec, unsigned char *p,
+		  struct bfd_link_info *info)
+{
+  struct ppc_elf_link_hash_table *htab = ppc_elf_hash_table (info);
+  bfd *output_bfd = info->output_bfd;
+  bfd_vma plt;
+
+  plt = ((ent->plt.offset & ~1)
+	 + plt_sec->output_section->vma
+	 + plt_sec->output_offset);
+
+  if (info->shared)
+    {
+      bfd_vma got = 0;
+
+      if (ent->addend >= 32768)
+	got = (ent->addend
+	       + ent->sec->output_section->vma
+	       + ent->sec->output_offset);
+      else if (htab->elf.hgot != NULL)
+	got = SYM_VAL (htab->elf.hgot);
+
+      plt -= got;
+
+      if (plt + 0x8000 < 0x10000)
+	{
+	  bfd_put_32 (output_bfd, LWZ_11_30 + PPC_LO (plt), p);
+	  p += 4;
+	  bfd_put_32 (output_bfd, MTCTR_11, p);
+	  p += 4;
+	  bfd_put_32 (output_bfd, BCTR, p);
+	  p += 4;
+	  bfd_put_32 (output_bfd, NOP, p);
+	  p += 4;
+	}
+      else
+	{
+	  bfd_put_32 (output_bfd, ADDIS_11_30 + PPC_HA (plt), p);
+	  p += 4;
+	  bfd_put_32 (output_bfd, LWZ_11_11 + PPC_LO (plt), p);
+	  p += 4;
+	  bfd_put_32 (output_bfd, MTCTR_11, p);
+	  p += 4;
+	  bfd_put_32 (output_bfd, BCTR, p);
+	  p += 4;
+	}
+    }
+  else
+    {
+      bfd_put_32 (output_bfd, LIS_11 + PPC_HA (plt), p);
+      p += 4;
+      bfd_put_32 (output_bfd, LWZ_11_11 + PPC_LO (plt), p);
+      p += 4;
+      bfd_put_32 (output_bfd, MTCTR_11, p);
+      p += 4;
+      bfd_put_32 (output_bfd, BCTR, p);
+      p += 4;
+    }
+}
+
+/* Return true if symbol is defined statically.  */
+
+static bfd_boolean
+is_static_defined (struct elf_link_hash_entry *h)
+{
+  return ((h->root.type == bfd_link_hash_defined
+	   || h->root.type == bfd_link_hash_defweak)
+	  && h->root.u.def.section != NULL
+	  && h->root.u.def.section->output_section != NULL);
+}
+
+/* If INSN is an opcode that may be used with an @tls operand, return
+   the transformed insn for TLS optimisation, otherwise return 0.  If
+   REG is non-zero only match an insn with RB or RA equal to REG.  */
+
+unsigned int
+_bfd_elf_ppc_at_tls_transform (unsigned int insn, unsigned int reg)
+{
+  unsigned int rtra;
+
+  if ((insn & (0x3f << 26)) != 31 << 26)
+    return 0;
+
+  if (reg == 0 || ((insn >> 11) & 0x1f) == reg)
+    rtra = insn & ((1 << 26) - (1 << 16));
+  else if (((insn >> 16) & 0x1f) == reg)
+    rtra = (insn & (0x1f << 21)) | ((insn & (0x1f << 11)) << 5);
+  else
+    return 0;
+
+  if ((insn & (0x3ff << 1)) == 266 << 1)
+    /* add -> addi.  */
+    insn = 14 << 26;
+  else if ((insn & (0x1f << 1)) == 23 << 1
+	   && ((insn & (0x1f << 6)) < 14 << 6
+	       || ((insn & (0x1f << 6)) >= 16 << 6
+		   && (insn & (0x1f << 6)) < 24 << 6)))
+    /* load and store indexed -> dform.  */
+    insn = (32 | ((insn >> 6) & 0x1f)) << 26;
+  else if ((insn & (((0x1a << 5) | 0x1f) << 1)) == 21 << 1)
+    /* ldx, ldux, stdx, stdux -> ld, ldu, std, stdu.  */
+    insn = ((58 | ((insn >> 6) & 4)) << 26) | ((insn >> 6) & 1);
+  else if ((insn & (((0x1f << 5) | 0x1f) << 1)) == 341 << 1)
+    /* lwax -> lwa.  */
+    insn = (58 << 26) | 2;
+  else
+    return 0;
+  insn |= rtra;
+  return insn;
+}
+
+/* If INSN is an opcode that may be used with an @tprel operand, return
+   the transformed insn for an undefined weak symbol, ie. with the
+   thread pointer REG operand removed.  Otherwise return 0.  */
+
+unsigned int
+_bfd_elf_ppc_at_tprel_transform (unsigned int insn, unsigned int reg)
+{
+  if ((insn & (0x1f << 16)) == reg << 16
+      && ((insn & (0x3f << 26)) == 14u << 26 /* addi */
+	  || (insn & (0x3f << 26)) == 15u << 26 /* addis */
+	  || (insn & (0x3f << 26)) == 32u << 26 /* lwz */
+	  || (insn & (0x3f << 26)) == 34u << 26 /* lbz */
+	  || (insn & (0x3f << 26)) == 36u << 26 /* stw */
+	  || (insn & (0x3f << 26)) == 38u << 26 /* stb */
+	  || (insn & (0x3f << 26)) == 40u << 26 /* lhz */
+	  || (insn & (0x3f << 26)) == 42u << 26 /* lha */
+	  || (insn & (0x3f << 26)) == 44u << 26 /* sth */
+	  || (insn & (0x3f << 26)) == 46u << 26 /* lmw */
+	  || (insn & (0x3f << 26)) == 47u << 26 /* stmw */
+	  || (insn & (0x3f << 26)) == 48u << 26 /* lfs */
+	  || (insn & (0x3f << 26)) == 50u << 26 /* lfd */
+	  || (insn & (0x3f << 26)) == 52u << 26 /* stfs */
+	  || (insn & (0x3f << 26)) == 54u << 26 /* stfd */
+	  || ((insn & (0x3f << 26)) == 58u << 26 /* lwa,ld,lmd */
+	      && (insn & 3) != 1)
+	  || ((insn & (0x3f << 26)) == 62u << 26 /* std, stmd */
+	      && ((insn & 3) == 0 || (insn & 3) == 3))))
+    {
+      insn &= ~(0x1f << 16);
+    }
+  else if ((insn & (0x1f << 21)) == reg << 21
+	   && ((insn & (0x3e << 26)) == 24u << 26 /* ori, oris */
+	       || (insn & (0x3e << 26)) == 26u << 26 /* xori,xoris */
+	       || (insn & (0x3e << 26)) == 28u << 26 /* andi,andis */))
+    {
+      insn &= ~(0x1f << 21);
+      insn |= (insn & (0x1f << 16)) << 5;
+      if ((insn & (0x3e << 26)) == 26 << 26 /* xori,xoris */)
+	insn -= 2 >> 26;  /* convert to ori,oris */
+    }
+  else
+    insn = 0;
+  return insn;
+}
+
+/* The RELOCATE_SECTION function is called by the ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures; if the section
+   actually uses Rel structures, the r_addend field will always be
+   zero.
+
+   This function is responsible for adjust the section contents as
+   necessary, and (if using Rela relocs and generating a
+   relocatable output file) adjusting the reloc addend as
+   necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.  */
+
+static bfd_boolean
+ppc_elf_relocate_section (bfd *output_bfd,
+			  struct bfd_link_info *info,
+			  bfd *input_bfd,
+			  asection *input_section,
+			  bfd_byte *contents,
+			  Elf_Internal_Rela *relocs,
+			  Elf_Internal_Sym *local_syms,
+			  asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  struct ppc_elf_link_hash_table *htab;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  Elf_Internal_Rela outrel;
+  asection *got2, *sreloc = NULL;
+  bfd_vma *local_got_offsets;
+  bfd_boolean ret = TRUE;
+  bfd_vma d_offset = (bfd_big_endian (output_bfd) ? 2 : 0);
+  bfd_boolean is_vxworks_tls;
+
+#ifdef DEBUG
+  _bfd_error_handler ("ppc_elf_relocate_section called for %B section %A, "
+		      "%ld relocations%s",
+		      input_bfd, input_section,
+		      (long) input_section->reloc_count,
+		      (info->relocatable) ? " (relocatable)" : "");
+#endif
+
+  got2 = bfd_get_section_by_name (input_bfd, ".got2");
+
+  /* Initialize howto table if not already done.  */
+  if (!ppc_elf_howto_table[R_PPC_ADDR32])
+    ppc_elf_howto_init ();
+
+  htab = ppc_elf_hash_table (info);
+  local_got_offsets = elf_local_got_offsets (input_bfd);
+  symtab_hdr = &elf_symtab_hdr (input_bfd);
+  sym_hashes = elf_sym_hashes (input_bfd);
+  /* We have to handle relocations in vxworks .tls_vars sections
+     specially, because the dynamic loader is 'weird'.  */
+  is_vxworks_tls = (htab->is_vxworks && info->shared
+		    && !strcmp (input_section->output_section->name,
+				".tls_vars"));
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      enum elf_ppc_reloc_type r_type;
+      bfd_vma addend;
+      bfd_reloc_status_type r;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      const char *sym_name;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      bfd_vma relocation;
+      bfd_vma branch_bit, from;
+      bfd_boolean unresolved_reloc;
+      bfd_boolean warned;
+      unsigned int tls_type, tls_mask, tls_gd;
+      struct plt_entry **ifunc;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      sym = NULL;
+      sec = NULL;
+      h = NULL;
+      unresolved_reloc = FALSE;
+      warned = FALSE;
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  sym_name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym, sec);
+
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+      else
+	{
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+
+	  sym_name = h->root.root.string;
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	{
+	  /* For relocs against symbols from removed linkonce sections,
+	     or sections discarded by a linker script, we just want the
+	     section contents zeroed.  Avoid any special processing.  */
+	  howto = NULL;
+	  if (r_type < R_PPC_max)
+	    howto = ppc_elf_howto_table[r_type];
+	  RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					   rel, relend, howto, contents);
+	}
+
+      if (info->relocatable)
+	{
+	  if (got2 != NULL
+	      && r_type == R_PPC_PLTREL24
+	      && rel->r_addend >= 32768)
+	    {
+	      /* R_PPC_PLTREL24 is rather special.  If non-zero, the
+		 addend specifies the GOT pointer offset within .got2.  */
+	      rel->r_addend += got2->output_offset;
+	    }
+	  continue;
+	}
+
+      /* TLS optimizations.  Replace instruction sequences and relocs
+	 based on information we collected in tls_optimize.  We edit
+	 RELOCS so that --emit-relocs will output something sensible
+	 for the final instruction stream.  */
+      tls_mask = 0;
+      tls_gd = 0;
+      if (h != NULL)
+	tls_mask = ((struct ppc_elf_link_hash_entry *) h)->tls_mask;
+      else if (local_got_offsets != NULL)
+	{
+	  struct plt_entry **local_plt;
+	  char *lgot_masks;
+	  local_plt
+	    = (struct plt_entry **) (local_got_offsets + symtab_hdr->sh_info);
+	  lgot_masks = (char *) (local_plt + symtab_hdr->sh_info);
+	  tls_mask = lgot_masks[r_symndx];
+	}
+
+      /* Ensure reloc mapping code below stays sane.  */
+      if ((R_PPC_GOT_TLSLD16 & 3)    != (R_PPC_GOT_TLSGD16 & 3)
+	  || (R_PPC_GOT_TLSLD16_LO & 3) != (R_PPC_GOT_TLSGD16_LO & 3)
+	  || (R_PPC_GOT_TLSLD16_HI & 3) != (R_PPC_GOT_TLSGD16_HI & 3)
+	  || (R_PPC_GOT_TLSLD16_HA & 3) != (R_PPC_GOT_TLSGD16_HA & 3)
+	  || (R_PPC_GOT_TLSLD16 & 3)    != (R_PPC_GOT_TPREL16 & 3)
+	  || (R_PPC_GOT_TLSLD16_LO & 3) != (R_PPC_GOT_TPREL16_LO & 3)
+	  || (R_PPC_GOT_TLSLD16_HI & 3) != (R_PPC_GOT_TPREL16_HI & 3)
+	  || (R_PPC_GOT_TLSLD16_HA & 3) != (R_PPC_GOT_TPREL16_HA & 3))
+	abort ();
+      switch (r_type)
+	{
+	default:
+	  break;
+
+	case R_PPC_GOT_TPREL16:
+	case R_PPC_GOT_TPREL16_LO:
+	  if ((tls_mask & TLS_TLS) != 0
+	      && (tls_mask & TLS_TPREL) == 0)
+	    {
+	      bfd_vma insn;
+
+	      insn = bfd_get_32 (output_bfd, contents + rel->r_offset - d_offset);
+	      insn &= 31 << 21;
+	      insn |= 0x3c020000;	/* addis 0,2,0 */
+	      bfd_put_32 (output_bfd, insn, contents + rel->r_offset - d_offset);
+	      r_type = R_PPC_TPREL16_HA;
+	      rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+	    }
+	  break;
+
+	case R_PPC_TLS:
+	  if ((tls_mask & TLS_TLS) != 0
+	      && (tls_mask & TLS_TPREL) == 0)
+	    {
+	      bfd_vma insn;
+
+	      insn = bfd_get_32 (output_bfd, contents + rel->r_offset);
+	      insn = _bfd_elf_ppc_at_tls_transform (insn, 2);
+	      if (insn == 0)
+		abort ();
+	      bfd_put_32 (output_bfd, insn, contents + rel->r_offset);
+	      r_type = R_PPC_TPREL16_LO;
+	      rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+
+	      /* Was PPC_TLS which sits on insn boundary, now
+		 PPC_TPREL16_LO which is at low-order half-word.  */
+	      rel->r_offset += d_offset;
+	    }
+	  break;
+
+	case R_PPC_GOT_TLSGD16_HI:
+	case R_PPC_GOT_TLSGD16_HA:
+	  tls_gd = TLS_TPRELGD;
+	  if ((tls_mask & TLS_TLS) != 0 && (tls_mask & TLS_GD) == 0)
+	    goto tls_gdld_hi;
+	  break;
+
+	case R_PPC_GOT_TLSLD16_HI:
+	case R_PPC_GOT_TLSLD16_HA:
+	  if ((tls_mask & TLS_TLS) != 0 && (tls_mask & TLS_LD) == 0)
+	    {
+	    tls_gdld_hi:
+	      if ((tls_mask & tls_gd) != 0)
+		r_type = (((r_type - (R_PPC_GOT_TLSGD16 & 3)) & 3)
+			  + R_PPC_GOT_TPREL16);
+	      else
+		{
+		  bfd_put_32 (output_bfd, NOP, contents + rel->r_offset);
+		  rel->r_offset -= d_offset;
+		  r_type = R_PPC_NONE;
+		}
+	      rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+	    }
+	  break;
+
+	case R_PPC_GOT_TLSGD16:
+	case R_PPC_GOT_TLSGD16_LO:
+	  tls_gd = TLS_TPRELGD;
+	  if ((tls_mask & TLS_TLS) != 0 && (tls_mask & TLS_GD) == 0)
+	    goto tls_ldgd_opt;
+	  break;
+
+	case R_PPC_GOT_TLSLD16:
+	case R_PPC_GOT_TLSLD16_LO:
+	  if ((tls_mask & TLS_TLS) != 0 && (tls_mask & TLS_LD) == 0)
+	    {
+	      unsigned int insn1, insn2;
+	      bfd_vma offset;
+
+	    tls_ldgd_opt:
+	      offset = (bfd_vma) -1;
+	      /* If not using the newer R_PPC_TLSGD/LD to mark
+		 __tls_get_addr calls, we must trust that the call
+		 stays with its arg setup insns, ie. that the next
+		 reloc is the __tls_get_addr call associated with
+		 the current reloc.  Edit both insns.  */
+	      if (input_section->has_tls_get_addr_call
+		  && rel + 1 < relend
+		  && branch_reloc_hash_match (input_bfd, rel + 1,
+					      htab->tls_get_addr))
+		offset = rel[1].r_offset;
+	      if ((tls_mask & tls_gd) != 0)
+		{
+		  /* IE */
+		  insn1 = bfd_get_32 (output_bfd,
+				      contents + rel->r_offset - d_offset);
+		  insn1 &= (1 << 26) - 1;
+		  insn1 |= 32 << 26;	/* lwz */
+		  if (offset != (bfd_vma) -1)
+		    {
+		      rel[1].r_info = ELF32_R_INFO (STN_UNDEF, R_PPC_NONE);
+		      insn2 = 0x7c631214;	/* add 3,3,2 */
+		      bfd_put_32 (output_bfd, insn2, contents + offset);
+		    }
+		  r_type = (((r_type - (R_PPC_GOT_TLSGD16 & 3)) & 3)
+			    + R_PPC_GOT_TPREL16);
+		  rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+		}
+	      else
+		{
+		  /* LE */
+		  insn1 = 0x3c620000;	/* addis 3,2,0 */
+		  if (tls_gd == 0)
+		    {
+		      /* Was an LD reloc.  */
+		      for (r_symndx = 0;
+			   r_symndx < symtab_hdr->sh_info;
+			   r_symndx++)
+			if (local_sections[r_symndx] == sec)
+			  break;
+		      if (r_symndx >= symtab_hdr->sh_info)
+			r_symndx = STN_UNDEF;
+		      rel->r_addend = htab->elf.tls_sec->vma + DTP_OFFSET;
+		      if (r_symndx != STN_UNDEF)
+			rel->r_addend -= (local_syms[r_symndx].st_value
+					  + sec->output_offset
+					  + sec->output_section->vma);
+		    }
+		  r_type = R_PPC_TPREL16_HA;
+		  rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+		  if (offset != (bfd_vma) -1)
+		    {
+		      rel[1].r_info = ELF32_R_INFO (r_symndx, R_PPC_TPREL16_LO);
+		      rel[1].r_offset = offset + d_offset;
+		      rel[1].r_addend = rel->r_addend;
+		      insn2 = 0x38630000;	/* addi 3,3,0 */
+		      bfd_put_32 (output_bfd, insn2, contents + offset);
+		    }
+		}
+	      bfd_put_32 (output_bfd, insn1,
+			  contents + rel->r_offset - d_offset);
+	      if (tls_gd == 0)
+		{
+		  /* We changed the symbol on an LD reloc.  Start over
+		     in order to get h, sym, sec etc. right.  */
+		  rel--;
+		  continue;
+		}
+	    }
+	  break;
+
+	case R_PPC_TLSGD:
+	  if ((tls_mask & TLS_TLS) != 0 && (tls_mask & TLS_GD) == 0)
+	    {
+	      unsigned int insn2;
+	      bfd_vma offset = rel->r_offset;
+
+	      if ((tls_mask & TLS_TPRELGD) != 0)
+		{
+		  /* IE */
+		  r_type = R_PPC_NONE;
+		  insn2 = 0x7c631214;	/* add 3,3,2 */
+		}
+	      else
+		{
+		  /* LE */
+		  r_type = R_PPC_TPREL16_LO;
+		  rel->r_offset += d_offset;
+		  insn2 = 0x38630000;	/* addi 3,3,0 */
+		}
+	      rel->r_info = ELF32_R_INFO (r_symndx, r_type);
+	      bfd_put_32 (output_bfd, insn2, contents + offset);
+	      /* Zap the reloc on the _tls_get_addr call too.  */
+	      BFD_ASSERT (offset == rel[1].r_offset);
+	      rel[1].r_info = ELF32_R_INFO (STN_UNDEF, R_PPC_NONE);
+	    }
+	  break;
+
+	case R_PPC_TLSLD:
+	  if ((tls_mask & TLS_TLS) != 0 && (tls_mask & TLS_LD) == 0)
+	    {
+	      unsigned int insn2;
+
+	      for (r_symndx = 0;
+		   r_symndx < symtab_hdr->sh_info;
+		   r_symndx++)
+		if (local_sections[r_symndx] == sec)
+		  break;
+	      if (r_symndx >= symtab_hdr->sh_info)
+		r_symndx = STN_UNDEF;
+	      rel->r_addend = htab->elf.tls_sec->vma + DTP_OFFSET;
+	      if (r_symndx != STN_UNDEF)
+		rel->r_addend -= (local_syms[r_symndx].st_value
+				  + sec->output_offset
+				  + sec->output_section->vma);
+
+	      rel->r_info = ELF32_R_INFO (r_symndx, R_PPC_TPREL16_LO);
+	      rel->r_offset += d_offset;
+	      insn2 = 0x38630000;	/* addi 3,3,0 */
+	      bfd_put_32 (output_bfd, insn2,
+			  contents + rel->r_offset - d_offset);
+	      /* Zap the reloc on the _tls_get_addr call too.  */
+	      BFD_ASSERT (rel->r_offset - d_offset == rel[1].r_offset);
+	      rel[1].r_info = ELF32_R_INFO (STN_UNDEF, R_PPC_NONE);
+	      rel--;
+	      continue;
+	    }
+	  break;
+	}
+
+      /* Handle other relocations that tweak non-addend part of insn.  */
+      branch_bit = 0;
+      switch (r_type)
+	{
+	default:
+	  break;
+
+	  /* Branch taken prediction relocations.  */
+	case R_PPC_ADDR14_BRTAKEN:
+	case R_PPC_REL14_BRTAKEN:
+	  branch_bit = BRANCH_PREDICT_BIT;
+	  /* Fall thru */
+
+	  /* Branch not taken prediction relocations.  */
+	case R_PPC_ADDR14_BRNTAKEN:
+	case R_PPC_REL14_BRNTAKEN:
+	  {
+	    bfd_vma insn;
+
+	    insn = bfd_get_32 (output_bfd, contents + rel->r_offset);
+	    insn &= ~BRANCH_PREDICT_BIT;
+	    insn |= branch_bit;
+
+	    from = (rel->r_offset
+		    + input_section->output_offset
+		    + input_section->output_section->vma);
+
+	    /* Invert 'y' bit if not the default.  */
+	    if ((bfd_signed_vma) (relocation + rel->r_addend - from) < 0)
+	      insn ^= BRANCH_PREDICT_BIT;
+
+	    bfd_put_32 (output_bfd, insn, contents + rel->r_offset);
+	    break;
+	  }
+	}
+
+      ifunc = NULL;
+      if (!htab->is_vxworks)
+	{
+	  struct plt_entry *ent;
+
+	  if (h != NULL)
+	    {
+	      if (h->type == STT_GNU_IFUNC)
+		ifunc = &h->plt.plist;
+	    }
+	  else if (local_got_offsets != NULL
+		   && ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
+	    {
+	      struct plt_entry **local_plt;
+
+	      local_plt = (struct plt_entry **) (local_got_offsets
+						 + symtab_hdr->sh_info);
+	      ifunc = local_plt + r_symndx;
+	    }
+
+	  ent = NULL;
+	  if (ifunc != NULL
+	      && (!info->shared
+		  || is_branch_reloc (r_type)))
+	    {
+	      addend = 0;
+	      if (r_type == R_PPC_PLTREL24 && info->shared)
+		addend = rel->r_addend;
+	      ent = find_plt_ent (ifunc, got2, addend);
+	    }
+	  if (ent != NULL)
+	    {
+	      if (h == NULL && (ent->plt.offset & 1) == 0)
+		{
+		  Elf_Internal_Rela rela;
+		  bfd_byte *loc;
+
+		  rela.r_offset = (htab->iplt->output_section->vma
+				   + htab->iplt->output_offset
+				   + ent->plt.offset);
+		  rela.r_info = ELF32_R_INFO (0, R_PPC_IRELATIVE);
+		  rela.r_addend = relocation;
+		  loc = htab->reliplt->contents;
+		  loc += (htab->reliplt->reloc_count++
+			  * sizeof (Elf32_External_Rela));
+		  bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+
+		  ent->plt.offset |= 1;
+		}
+	      if (h == NULL && (ent->glink_offset & 1) == 0)
+		{
+		  unsigned char *p = ((unsigned char *) htab->glink->contents
+				      + ent->glink_offset);
+		  write_glink_stub (ent, htab->iplt, p, info);
+		  ent->glink_offset |= 1;
+		}
+
+	      unresolved_reloc = FALSE;
+	      if (htab->plt_type == PLT_NEW
+		  || !htab->elf.dynamic_sections_created
+		  || h == NULL)
+		relocation = (htab->glink->output_section->vma
+			      + htab->glink->output_offset
+			      + (ent->glink_offset & ~1));
+	      else
+		relocation = (htab->plt->output_section->vma
+			      + htab->plt->output_offset
+			      + ent->plt.offset);
+	    }
+	}
+
+      addend = rel->r_addend;
+      tls_type = 0;
+      howto = NULL;
+      if (r_type < R_PPC_max)
+	howto = ppc_elf_howto_table[r_type];
+      switch (r_type)
+	{
+	default:
+	  info->callbacks->einfo
+	    (_("%P: %B: unknown relocation type %d for symbol %s\n"),
+	     input_bfd, (int) r_type, sym_name);
+
+	  bfd_set_error (bfd_error_bad_value);
+	  ret = FALSE;
+	  continue;
+
+	case R_PPC_NONE:
+	case R_PPC_TLS:
+	case R_PPC_TLSGD:
+	case R_PPC_TLSLD:
+	case R_PPC_EMB_MRKREF:
+	case R_PPC_GNU_VTINHERIT:
+	case R_PPC_GNU_VTENTRY:
+	  continue;
+
+	  /* GOT16 relocations.  Like an ADDR16 using the symbol's
+	     address in the GOT as relocation value instead of the
+	     symbol's value itself.  Also, create a GOT entry for the
+	     symbol and put the symbol value there.  */
+	case R_PPC_GOT_TLSGD16:
+	case R_PPC_GOT_TLSGD16_LO:
+	case R_PPC_GOT_TLSGD16_HI:
+	case R_PPC_GOT_TLSGD16_HA:
+	  tls_type = TLS_TLS | TLS_GD;
+	  goto dogot;
+
+	case R_PPC_GOT_TLSLD16:
+	case R_PPC_GOT_TLSLD16_LO:
+	case R_PPC_GOT_TLSLD16_HI:
+	case R_PPC_GOT_TLSLD16_HA:
+	  tls_type = TLS_TLS | TLS_LD;
+	  goto dogot;
+
+	case R_PPC_GOT_TPREL16:
+	case R_PPC_GOT_TPREL16_LO:
+	case R_PPC_GOT_TPREL16_HI:
+	case R_PPC_GOT_TPREL16_HA:
+	  tls_type = TLS_TLS | TLS_TPREL;
+	  goto dogot;
+
+	case R_PPC_GOT_DTPREL16:
+	case R_PPC_GOT_DTPREL16_LO:
+	case R_PPC_GOT_DTPREL16_HI:
+	case R_PPC_GOT_DTPREL16_HA:
+	  tls_type = TLS_TLS | TLS_DTPREL;
+	  goto dogot;
+
+	case R_PPC_GOT16:
+	case R_PPC_GOT16_LO:
+	case R_PPC_GOT16_HI:
+	case R_PPC_GOT16_HA:
+	  tls_mask = 0;
+	dogot:
+	  {
+	    /* Relocation is to the entry for this symbol in the global
+	       offset table.  */
+	    bfd_vma off;
+	    bfd_vma *offp;
+	    unsigned long indx;
+
+	    if (htab->got == NULL)
+	      abort ();
+
+	    indx = 0;
+	    if (tls_type == (TLS_TLS | TLS_LD)
+		&& (h == NULL
+		    || !h->def_dynamic))
+	      offp = &htab->tlsld_got.offset;
+	    else if (h != NULL)
+	      {
+		bfd_boolean dyn;
+		dyn = htab->elf.dynamic_sections_created;
+		if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+		    || (info->shared
+			&& SYMBOL_REFERENCES_LOCAL (info, h)))
+		  /* This is actually a static link, or it is a
+		     -Bsymbolic link and the symbol is defined
+		     locally, or the symbol was forced to be local
+		     because of a version file.  */
+		  ;
+		else
+		  {
+		    indx = h->dynindx;
+		    unresolved_reloc = FALSE;
+		  }
+		offp = &h->got.offset;
+	      }
+	    else
+	      {
+		if (local_got_offsets == NULL)
+		  abort ();
+		offp = &local_got_offsets[r_symndx];
+	      }
+
+	    /* The offset must always be a multiple of 4.  We use the
+	       least significant bit to record whether we have already
+	       processed this entry.  */
+	    off = *offp;
+	    if ((off & 1) != 0)
+	      off &= ~1;
+	    else
+	      {
+		unsigned int tls_m = (tls_mask
+				      & (TLS_LD | TLS_GD | TLS_DTPREL
+					 | TLS_TPREL | TLS_TPRELGD));
+
+		if (offp == &htab->tlsld_got.offset)
+		  tls_m = TLS_LD;
+		else if (h == NULL
+			 || !h->def_dynamic)
+		  tls_m &= ~TLS_LD;
+
+		/* We might have multiple got entries for this sym.
+		   Initialize them all.  */
+		do
+		  {
+		    int tls_ty = 0;
+
+		    if ((tls_m & TLS_LD) != 0)
+		      {
+			tls_ty = TLS_TLS | TLS_LD;
+			tls_m &= ~TLS_LD;
+		      }
+		    else if ((tls_m & TLS_GD) != 0)
+		      {
+			tls_ty = TLS_TLS | TLS_GD;
+			tls_m &= ~TLS_GD;
+		      }
+		    else if ((tls_m & TLS_DTPREL) != 0)
+		      {
+			tls_ty = TLS_TLS | TLS_DTPREL;
+			tls_m &= ~TLS_DTPREL;
+		      }
+		    else if ((tls_m & (TLS_TPREL | TLS_TPRELGD)) != 0)
+		      {
+			tls_ty = TLS_TLS | TLS_TPREL;
+			tls_m = 0;
+		      }
+
+		    /* Generate relocs for the dynamic linker.  */
+		    if ((info->shared || indx != 0)
+			&& (offp == &htab->tlsld_got.offset
+			    || h == NULL
+			    || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+			    || h->root.type != bfd_link_hash_undefweak))
+		      {
+			asection *rsec = htab->relgot;
+			bfd_byte * loc;
+
+			outrel.r_offset = (htab->got->output_section->vma
+					   + htab->got->output_offset
+					   + off);
+			outrel.r_addend = 0;
+			if (tls_ty & (TLS_LD | TLS_GD))
+			  {
+			    outrel.r_info = ELF32_R_INFO (indx, R_PPC_DTPMOD32);
+			    if (tls_ty == (TLS_TLS | TLS_GD))
+			      {
+				loc = rsec->contents;
+				loc += (rsec->reloc_count++
+					* sizeof (Elf32_External_Rela));
+				bfd_elf32_swap_reloca_out (output_bfd,
+							   &outrel, loc);
+				outrel.r_offset += 4;
+				outrel.r_info
+				  = ELF32_R_INFO (indx, R_PPC_DTPREL32);
+			      }
+			  }
+			else if (tls_ty == (TLS_TLS | TLS_DTPREL))
+			  outrel.r_info = ELF32_R_INFO (indx, R_PPC_DTPREL32);
+			else if (tls_ty == (TLS_TLS | TLS_TPREL))
+			  outrel.r_info = ELF32_R_INFO (indx, R_PPC_TPREL32);
+			else if (indx != 0)
+			  outrel.r_info = ELF32_R_INFO (indx, R_PPC_GLOB_DAT);
+			else if (ifunc != NULL)
+			  outrel.r_info = ELF32_R_INFO (0, R_PPC_IRELATIVE);
+			else
+			  outrel.r_info = ELF32_R_INFO (0, R_PPC_RELATIVE);
+			if (indx == 0 && tls_ty != (TLS_TLS | TLS_LD))
+			  {
+			    outrel.r_addend += relocation;
+			    if (tls_ty & (TLS_GD | TLS_DTPREL | TLS_TPREL))
+			      outrel.r_addend -= htab->elf.tls_sec->vma;
+			  }
+			loc = rsec->contents;
+			loc += (rsec->reloc_count++
+				* sizeof (Elf32_External_Rela));
+			bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+		      }
+
+		    /* Init the .got section contents if we're not
+		       emitting a reloc.  */
+		    else
+		      {
+			bfd_vma value = relocation;
+
+			if (tls_ty == (TLS_TLS | TLS_LD))
+			  value = 1;
+			else if (tls_ty != 0)
+			  {
+			    value -= htab->elf.tls_sec->vma + DTP_OFFSET;
+			    if (tls_ty == (TLS_TLS | TLS_TPREL))
+			      value += DTP_OFFSET - TP_OFFSET;
+
+			    if (tls_ty == (TLS_TLS | TLS_GD))
+			      {
+				bfd_put_32 (output_bfd, value,
+					    htab->got->contents + off + 4);
+				value = 1;
+			      }
+			  }
+			bfd_put_32 (output_bfd, value,
+				    htab->got->contents + off);
+		      }
+
+		    off += 4;
+		    if (tls_ty & (TLS_LD | TLS_GD))
+		      off += 4;
+		  }
+		while (tls_m != 0);
+
+		off = *offp;
+		*offp = off | 1;
+	      }
+
+	    if (off >= (bfd_vma) -2)
+	      abort ();
+
+	    if ((tls_type & TLS_TLS) != 0)
+	      {
+		if (tls_type != (TLS_TLS | TLS_LD))
+		  {
+		    if ((tls_mask & TLS_LD) != 0
+			&& !(h == NULL
+			     || !h->def_dynamic))
+		      off += 8;
+		    if (tls_type != (TLS_TLS | TLS_GD))
+		      {
+			if ((tls_mask & TLS_GD) != 0)
+			  off += 8;
+			if (tls_type != (TLS_TLS | TLS_DTPREL))
+			  {
+			    if ((tls_mask & TLS_DTPREL) != 0)
+			      off += 4;
+			  }
+		      }
+		  }
+	      }
+
+	    relocation = (htab->got->output_section->vma
+			  + htab->got->output_offset
+			  + off
+			  - SYM_VAL (htab->elf.hgot));
+
+	    /* Addends on got relocations don't make much sense.
+	       x+off@got is actually x@got+off, and since the got is
+	       generated by a hash table traversal, the value in the
+	       got at entry m+n bears little relation to the entry m.  */
+	    if (addend != 0)
+	      info->callbacks->einfo
+		(_("%P: %H: non-zero addend on %s reloc against `%s'\n"),
+		 input_bfd, input_section, rel->r_offset,
+		 howto->name,
+		 sym_name);
+	  }
+	break;
+
+	/* Relocations that need no special processing.  */
+	case R_PPC_LOCAL24PC:
+	  /* It makes no sense to point a local relocation
+	     at a symbol not in this object.  */
+	  if (unresolved_reloc)
+	    {
+	      if (! (*info->callbacks->undefined_symbol) (info,
+							  h->root.root.string,
+							  input_bfd,
+							  input_section,
+							  rel->r_offset,
+							  TRUE))
+		return FALSE;
+	      continue;
+	    }
+	  break;
+
+	case R_PPC_DTPREL16:
+	case R_PPC_DTPREL16_LO:
+	case R_PPC_DTPREL16_HI:
+	case R_PPC_DTPREL16_HA:
+	  addend -= htab->elf.tls_sec->vma + DTP_OFFSET;
+	  break;
+
+	  /* Relocations that may need to be propagated if this is a shared
+	     object.  */
+	case R_PPC_TPREL16:
+	case R_PPC_TPREL16_LO:
+	case R_PPC_TPREL16_HI:
+	case R_PPC_TPREL16_HA:
+	  if (h != NULL
+	      && h->root.type == bfd_link_hash_undefweak
+	      && h->dynindx == -1)
+	    {
+	      /* Make this relocation against an undefined weak symbol
+		 resolve to zero.  This is really just a tweak, since
+		 code using weak externs ought to check that they are
+		 defined before using them.  */
+	      bfd_byte *p = contents + rel->r_offset - d_offset;
+	      unsigned int insn = bfd_get_32 (output_bfd, p);
+	      insn = _bfd_elf_ppc_at_tprel_transform (insn, 2);
+	      if (insn != 0)
+		bfd_put_32 (output_bfd, insn, p);
+	      break;
+	    }
+	  addend -= htab->elf.tls_sec->vma + TP_OFFSET;
+	  /* The TPREL16 relocs shouldn't really be used in shared
+	     libs as they will result in DT_TEXTREL being set, but
+	     support them anyway.  */
+	  goto dodyn;
+
+	case R_PPC_TPREL32:
+	  addend -= htab->elf.tls_sec->vma + TP_OFFSET;
+	  goto dodyn;
+
+	case R_PPC_DTPREL32:
+	  addend -= htab->elf.tls_sec->vma + DTP_OFFSET;
+	  goto dodyn;
+
+	case R_PPC_DTPMOD32:
+	  relocation = 1;
+	  addend = 0;
+	  goto dodyn;
+
+	case R_PPC_REL16:
+	case R_PPC_REL16_LO:
+	case R_PPC_REL16_HI:
+	case R_PPC_REL16_HA:
+	  break;
+
+	case R_PPC_REL32:
+	  if (h == NULL || h == htab->elf.hgot)
+	    break;
+	  /* fall through */
+
+	case R_PPC_ADDR32:
+	case R_PPC_ADDR16:
+	case R_PPC_ADDR16_LO:
+	case R_PPC_ADDR16_HI:
+	case R_PPC_ADDR16_HA:
+	case R_PPC_UADDR32:
+	case R_PPC_UADDR16:
+	  goto dodyn;
+
+	case R_PPC_REL24:
+	case R_PPC_REL14:
+	case R_PPC_REL14_BRTAKEN:
+	case R_PPC_REL14_BRNTAKEN:
+	  /* If these relocations are not to a named symbol, they can be
+	     handled right here, no need to bother the dynamic linker.  */
+	  if (SYMBOL_CALLS_LOCAL (info, h)
+	      || h == htab->elf.hgot)
+	    break;
+	  /* fall through */
+
+	case R_PPC_ADDR24:
+	case R_PPC_ADDR14:
+	case R_PPC_ADDR14_BRTAKEN:
+	case R_PPC_ADDR14_BRNTAKEN:
+	  if (h != NULL && !info->shared)
+	    break;
+	  /* fall through */
+
+	dodyn:
+	  if ((input_section->flags & SEC_ALLOC) == 0
+	      || is_vxworks_tls)
+	    break;
+
+	  if ((info->shared
+	       && !(h != NULL
+		    && ((h->root.type == bfd_link_hash_undefined
+			 && (ELF_ST_VISIBILITY (h->other) == STV_HIDDEN
+			     || ELF_ST_VISIBILITY (h->other) == STV_INTERNAL))
+			|| (h->root.type == bfd_link_hash_undefweak
+			    && ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)))
+	       && (must_be_dyn_reloc (info, r_type)
+		   || !SYMBOL_CALLS_LOCAL (info, h)))
+	      || (ELIMINATE_COPY_RELOCS
+		  && !info->shared
+		  && h != NULL
+		  && h->dynindx != -1
+		  && !h->non_got_ref
+		  && !h->def_regular))
+	    {
+	      int skip;
+	      bfd_byte * loc;
+#ifdef DEBUG
+	      fprintf (stderr, "ppc_elf_relocate_section needs to "
+		       "create relocation for %s\n",
+		       (h && h->root.root.string
+			? h->root.root.string : "<unknown>"));
+#endif
+
+	      /* When generating a shared object, these relocations
+		 are copied into the output file to be resolved at run
+		 time.  */
+	      if (sreloc == NULL)
+		{
+		  sreloc = elf_section_data (input_section)->sreloc;
+		  if (!htab->elf.dynamic_sections_created)
+		    sreloc = htab->reliplt;
+		  if (sreloc == NULL)
+		    return FALSE;
+		}
+
+	      skip = 0;
+	      outrel.r_offset = _bfd_elf_section_offset (output_bfd, info,
+							 input_section,
+							 rel->r_offset);
+	      if (outrel.r_offset == (bfd_vma) -1
+		  || outrel.r_offset == (bfd_vma) -2)
+		skip = (int) outrel.r_offset;
+	      outrel.r_offset += (input_section->output_section->vma
+				  + input_section->output_offset);
+
+	      if (skip)
+		memset (&outrel, 0, sizeof outrel);
+	      else if ((h != NULL
+			&& (h->root.type == bfd_link_hash_undefined
+			    || h->root.type == bfd_link_hash_undefweak))
+		       || !SYMBOL_REFERENCES_LOCAL (info, h))
+		{
+		  unresolved_reloc = FALSE;
+		  outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
+		  outrel.r_addend = rel->r_addend;
+		}
+	      else
+		{
+		  outrel.r_addend = relocation + rel->r_addend;
+
+		  if (r_type != R_PPC_ADDR32)
+		    {
+		      long indx = 0;
+
+		      if (ifunc != NULL)
+			{
+			  /* If we get here when building a static
+			     executable, then the libc startup function
+			     responsible for applying indirect function
+			     relocations is going to complain about
+			     the reloc type.
+			     If we get here when building a dynamic
+			     executable, it will be because we have
+			     a text relocation.  The dynamic loader
+			     will set the text segment writable and
+			     non-executable to apply text relocations.
+			     So we'll segfault when trying to run the
+			     indirection function to resolve the reloc.  */
+			  info->callbacks->einfo
+			    (_("%P: %H: relocation %s for indirect "
+			       "function %s unsupported\n"),
+			     input_bfd, input_section, rel->r_offset,
+			     howto->name,
+			     sym_name);
+			  ret = FALSE;
+			}
+		      else if (r_symndx == STN_UNDEF || bfd_is_abs_section (sec))
+			;
+		      else if (sec == NULL || sec->owner == NULL)
+			{
+			  bfd_set_error (bfd_error_bad_value);
+			  ret = FALSE;
+			}
+		      else
+			{
+			  asection *osec;
+
+			  /* We are turning this relocation into one
+			     against a section symbol.  It would be
+			     proper to subtract the symbol's value,
+			     osec->vma, from the emitted reloc addend,
+			     but ld.so expects buggy relocs.
+			     FIXME: Why not always use a zero index?  */
+			  osec = sec->output_section;
+			  indx = elf_section_data (osec)->dynindx;
+			  if (indx == 0)
+			    {
+			      osec = htab->elf.text_index_section;
+			      indx = elf_section_data (osec)->dynindx;
+			    }
+			  BFD_ASSERT (indx != 0);
+#ifdef DEBUG
+			  if (indx == 0)
+			    printf ("indx=%ld section=%s flags=%08x name=%s\n",
+				    indx, osec->name, osec->flags,
+				    h->root.root.string);
+#endif
+			}
+
+		      outrel.r_info = ELF32_R_INFO (indx, r_type);
+		    }
+		  else if (ifunc != NULL)
+		    outrel.r_info = ELF32_R_INFO (0, R_PPC_IRELATIVE);
+		  else
+		    outrel.r_info = ELF32_R_INFO (0, R_PPC_RELATIVE);
+		}
+
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rela);
+	      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+
+	      if (skip == -1)
+		continue;
+
+	      /* This reloc will be computed at runtime.  We clear the memory
+		 so that it contains predictable value.  */
+	      if (! skip
+		  && ((input_section->flags & SEC_ALLOC) != 0
+		      || ELF32_R_TYPE (outrel.r_info) != R_PPC_RELATIVE))
+		{
+		  relocation = howto->pc_relative ? outrel.r_offset : 0;
+		  addend = 0;
+		  break;
+		}
+	    }
+	  break;
+
+	case R_PPC_RELAX_PLT:
+	case R_PPC_RELAX_PLTREL24:
+	  if (h != NULL)
+	    {
+	      struct plt_entry *ent;
+	      bfd_vma got2_addend = 0;
+
+	      if (r_type == R_PPC_RELAX_PLTREL24)
+		{
+		  if (info->shared)
+		    got2_addend = addend;
+		  addend = 0;
+		}
+	      ent = find_plt_ent (&h->plt.plist, got2, got2_addend);
+	      if (htab->plt_type == PLT_NEW)
+		relocation = (htab->glink->output_section->vma
+			      + htab->glink->output_offset
+			      + ent->glink_offset);
+	      else
+		relocation = (htab->plt->output_section->vma
+			      + htab->plt->output_offset
+			      + ent->plt.offset);
+	    }
+	  /* Fall thru */
+
+	case R_PPC_RELAX:
+	  if (info->shared)
+	    relocation -= (input_section->output_section->vma
+			   + input_section->output_offset
+			   + rel->r_offset - 4);
+
+	  {
+	    unsigned long t0;
+	    unsigned long t1;
+
+	    t0 = bfd_get_32 (output_bfd, contents + rel->r_offset);
+	    t1 = bfd_get_32 (output_bfd, contents + rel->r_offset + 4);
+
+	    /* We're clearing the bits for R_PPC_ADDR16_HA
+	       and R_PPC_ADDR16_LO here.  */
+	    t0 &= ~0xffff;
+	    t1 &= ~0xffff;
+
+	    /* t0 is HA, t1 is LO */
+	    relocation += addend;
+	    t0 |= ((relocation + 0x8000) >> 16) & 0xffff;
+	    t1 |= relocation & 0xffff;
+
+	    bfd_put_32 (output_bfd, t0, contents + rel->r_offset);
+	    bfd_put_32 (output_bfd, t1, contents + rel->r_offset + 4);
+
+	    /* Rewrite the reloc and convert one of the trailing nop
+	       relocs to describe this relocation.  */
+	    BFD_ASSERT (ELF32_R_TYPE (relend[-1].r_info) == R_PPC_NONE);
+	    /* The relocs are at the bottom 2 bytes */
+	    rel[0].r_offset += 2;
+	    memmove (rel + 1, rel, (relend - rel - 1) * sizeof (*rel));
+	    rel[0].r_info = ELF32_R_INFO (r_symndx, R_PPC_ADDR16_HA);
+	    rel[1].r_offset += 4;
+	    rel[1].r_info = ELF32_R_INFO (r_symndx, R_PPC_ADDR16_LO);
+	    rel++;
+	  }
+	  continue;
+
+	  /* Indirect .sdata relocation.  */
+	case R_PPC_EMB_SDAI16:
+	  BFD_ASSERT (htab->sdata[0].section != NULL);
+	  if (!is_static_defined (htab->sdata[0].sym))
+	    {
+	      unresolved_reloc = TRUE;
+	      break;
+	    }
+	  relocation
+	    = elf_finish_pointer_linker_section (input_bfd, &htab->sdata[0],
+						 h, relocation, rel);
+	  addend = 0;
+	  break;
+
+	  /* Indirect .sdata2 relocation.  */
+	case R_PPC_EMB_SDA2I16:
+	  BFD_ASSERT (htab->sdata[1].section != NULL);
+	  if (!is_static_defined (htab->sdata[1].sym))
+	    {
+	      unresolved_reloc = TRUE;
+	      break;
+	    }
+	  relocation
+	    = elf_finish_pointer_linker_section (input_bfd, &htab->sdata[1],
+						 h, relocation, rel);
+	  addend = 0;
+	  break;
+
+	  /* Handle the TOC16 reloc.  We want to use the offset within the .got
+	     section, not the actual VMA.  This is appropriate when generating
+	     an embedded ELF object, for which the .got section acts like the
+	     AIX .toc section.  */
+	case R_PPC_TOC16:			/* phony GOT16 relocations */
+	  if (sec == NULL || sec->output_section == NULL)
+	    {
+	      unresolved_reloc = TRUE;
+	      break;
+	    }
+	  BFD_ASSERT (strcmp (bfd_get_section_name (abfd, sec), ".got") == 0
+		      || strcmp (bfd_get_section_name (abfd, sec), ".cgot") == 0);
+
+	  addend -= sec->output_section->vma + sec->output_offset + 0x8000;
+	  break;
+
+	case R_PPC_PLTREL24:
+	  if (h == NULL || ifunc != NULL)
+	    break;
+	  /* Relocation is to the entry for this symbol in the
+	     procedure linkage table.  */
+	  {
+	    struct plt_entry *ent = find_plt_ent (&h->plt.plist, got2,
+						  info->shared ? addend : 0);
+	    addend = 0;
+	    if (ent == NULL
+		|| htab->plt == NULL)
+	      {
+		/* We didn't make a PLT entry for this symbol.  This
+		   happens when statically linking PIC code, or when
+		   using -Bsymbolic.  */
+		break;
+	      }
+
+	    unresolved_reloc = FALSE;
+	    if (htab->plt_type == PLT_NEW)
+	      relocation = (htab->glink->output_section->vma
+			    + htab->glink->output_offset
+			    + ent->glink_offset);
+	    else
+	      relocation = (htab->plt->output_section->vma
+			    + htab->plt->output_offset
+			    + ent->plt.offset);
+	  }
+	  break;
+
+	  /* Relocate against _SDA_BASE_.  */
+	case R_PPC_SDAREL16:
+	  {
+	    const char *name;
+	    struct elf_link_hash_entry *sda = htab->sdata[0].sym;
+
+	    if (sec == NULL
+		|| sec->output_section == NULL
+		|| !is_static_defined (sda))
+	      {
+		unresolved_reloc = TRUE;
+		break;
+	      }
+	    addend -= SYM_VAL (sda);
+
+	    name = bfd_get_section_name (abfd, sec->output_section);
+	    if (! ((CONST_STRNEQ (name, ".sdata")
+		    && (name[6] == 0 || name[6] == '.'))
+		   || (CONST_STRNEQ (name, ".sbss")
+		       && (name[5] == 0 || name[5] == '.'))))
+	      {
+		info->callbacks->einfo
+		  (_("%P: %B: the target (%s) of a %s relocation is "
+		     "in the wrong output section (%s)\n"),
+		   input_bfd,
+		   sym_name,
+		   howto->name,
+		   name);
+	      }
+	  }
+	  break;
+
+	  /* Relocate against _SDA2_BASE_.  */
+	case R_PPC_EMB_SDA2REL:
+	  {
+	    const char *name;
+	    struct elf_link_hash_entry *sda = htab->sdata[1].sym;
+
+	    if (sec == NULL
+		|| sec->output_section == NULL
+		|| !is_static_defined (sda))
+	      {
+		unresolved_reloc = TRUE;
+		break;
+	      }
+	    addend -= SYM_VAL (sda);
+
+	    name = bfd_get_section_name (abfd, sec->output_section);
+	    if (! (CONST_STRNEQ (name, ".sdata2")
+		   || CONST_STRNEQ (name, ".sbss2")))
+	      {
+		info->callbacks->einfo
+		  (_("%P: %B: the target (%s) of a %s relocation is "
+		     "in the wrong output section (%s)\n"),
+		   input_bfd,
+		   sym_name,
+		   howto->name,
+		   name);
+	      }
+	  }
+	  break;
+
+	  /* Relocate against either _SDA_BASE_, _SDA2_BASE_, or 0.  */
+	case R_PPC_EMB_SDA21:
+	case R_PPC_EMB_RELSDA:
+	  {
+	    const char *name;
+	    int reg;
+	    struct elf_link_hash_entry *sda = NULL;
+
+	    if (sec == NULL || sec->output_section == NULL)
+	      {
+		unresolved_reloc = TRUE;
+		break;
+	      }
+
+	    name = bfd_get_section_name (abfd, sec->output_section);
+	    if (((CONST_STRNEQ (name, ".sdata")
+		  && (name[6] == 0 || name[6] == '.'))
+		 || (CONST_STRNEQ (name, ".sbss")
+		     && (name[5] == 0 || name[5] == '.'))))
+	      {
+		reg = 13;
+		sda = htab->sdata[0].sym;
+	      }
+	    else if (CONST_STRNEQ (name, ".sdata2")
+		     || CONST_STRNEQ (name, ".sbss2"))
+	      {
+		reg = 2;
+		sda = htab->sdata[1].sym;
+	      }
+	    else if (strcmp (name, ".PPC.EMB.sdata0") == 0
+		     || strcmp (name, ".PPC.EMB.sbss0") == 0)
+	      {
+		reg = 0;
+	      }
+	    else
+	      {
+		info->callbacks->einfo
+		  (_("%P: %B: the target (%s) of a %s relocation is "
+		     "in the wrong output section (%s)\n"),
+		   input_bfd,
+		   sym_name,
+		   howto->name,
+		   name);
+
+		bfd_set_error (bfd_error_bad_value);
+		ret = FALSE;
+		continue;
+	      }
+
+	    if (sda != NULL)
+	      {
+		if (!is_static_defined (sda))
+		  {
+		    unresolved_reloc = TRUE;
+		    break;
+		  }
+		addend -= SYM_VAL (sda);
+	      }
+
+	    if (r_type == R_PPC_EMB_SDA21)
+	      {
+		bfd_vma insn;  /* Fill in register field.  */
+
+		insn = bfd_get_32 (output_bfd, contents + rel->r_offset);
+		insn = (insn & ~RA_REGISTER_MASK) | (reg << RA_REGISTER_SHIFT);
+		bfd_put_32 (output_bfd, insn, contents + rel->r_offset);
+	      }
+	  }
+	  break;
+
+	  /* Relocate against the beginning of the section.  */
+	case R_PPC_SECTOFF:
+	case R_PPC_SECTOFF_LO:
+	case R_PPC_SECTOFF_HI:
+	case R_PPC_SECTOFF_HA:
+	  if (sec == NULL || sec->output_section == NULL)
+	    {
+	      unresolved_reloc = TRUE;
+	      break;
+	    }
+	  addend -= sec->output_section->vma;
+	  break;
+
+	  /* Negative relocations.  */
+	case R_PPC_EMB_NADDR32:
+	case R_PPC_EMB_NADDR16:
+	case R_PPC_EMB_NADDR16_LO:
+	case R_PPC_EMB_NADDR16_HI:
+	case R_PPC_EMB_NADDR16_HA:
+	  addend -= 2 * relocation;
+	  break;
+
+	case R_PPC_COPY:
+	case R_PPC_GLOB_DAT:
+	case R_PPC_JMP_SLOT:
+	case R_PPC_RELATIVE:
+	case R_PPC_IRELATIVE:
+	case R_PPC_PLT32:
+	case R_PPC_PLTREL32:
+	case R_PPC_PLT16_LO:
+	case R_PPC_PLT16_HI:
+	case R_PPC_PLT16_HA:
+	case R_PPC_ADDR30:
+	case R_PPC_EMB_RELSEC16:
+	case R_PPC_EMB_RELST_LO:
+	case R_PPC_EMB_RELST_HI:
+	case R_PPC_EMB_RELST_HA:
+	case R_PPC_EMB_BIT_FLD:
+	  info->callbacks->einfo
+	    (_("%P: %B: relocation %s is not yet supported for symbol %s\n"),
+	     input_bfd,
+	     howto->name,
+	     sym_name);
+
+	  bfd_set_error (bfd_error_invalid_operation);
+	  ret = FALSE;
+	  continue;
+	}
+
+      /* Do any further special processing.  */
+      switch (r_type)
+	{
+	default:
+	  break;
+
+	case R_PPC_ADDR16_HA:
+	case R_PPC_REL16_HA:
+	case R_PPC_SECTOFF_HA:
+	case R_PPC_TPREL16_HA:
+	case R_PPC_DTPREL16_HA:
+	case R_PPC_EMB_NADDR16_HA:
+	case R_PPC_EMB_RELST_HA:
+	  /* It's just possible that this symbol is a weak symbol
+	     that's not actually defined anywhere.  In that case,
+	     'sec' would be NULL, and we should leave the symbol
+	     alone (it will be set to zero elsewhere in the link).  */
+	  if (sec == NULL)
+	    break;
+	  /* Fall thru */
+
+	case R_PPC_PLT16_HA:
+	case R_PPC_GOT16_HA:
+	case R_PPC_GOT_TLSGD16_HA:
+	case R_PPC_GOT_TLSLD16_HA:
+	case R_PPC_GOT_TPREL16_HA:
+	case R_PPC_GOT_DTPREL16_HA:
+	  /* Add 0x10000 if sign bit in 0:15 is set.
+	     Bits 0:15 are not used.  */
+	  addend += 0x8000;
+	  break;
+	}
+
+#ifdef DEBUG
+      fprintf (stderr, "\ttype = %s (%d), name = %s, symbol index = %ld, "
+	       "offset = %ld, addend = %ld\n",
+	       howto->name,
+	       (int) r_type,
+	       sym_name,
+	       r_symndx,
+	       (long) rel->r_offset,
+	       (long) addend);
+#endif
+
+      if (unresolved_reloc
+	  && !((input_section->flags & SEC_DEBUGGING) != 0
+	       && h->def_dynamic))
+	{
+	  info->callbacks->einfo
+	    (_("%P: %H: unresolvable %s relocation against symbol `%s'\n"),
+	     input_bfd, input_section, rel->r_offset,
+	     howto->name,
+	     sym_name);
+	  ret = FALSE;
+	}
+
+      r = _bfd_final_link_relocate (howto,
+				    input_bfd,
+				    input_section,
+				    contents,
+				    rel->r_offset,
+				    relocation,
+				    addend);
+
+      if (r != bfd_reloc_ok)
+	{
+	  if (r == bfd_reloc_overflow)
+	    {
+	      if (warned)
+		continue;
+	      if (h != NULL
+		  && h->root.type == bfd_link_hash_undefweak
+		  && howto->pc_relative)
+		{
+		  /* Assume this is a call protected by other code that
+		     detect the symbol is undefined.  If this is the case,
+		     we can safely ignore the overflow.  If not, the
+		     program is hosed anyway, and a little warning isn't
+		     going to help.  */
+
+		  continue;
+		}
+
+	      if (! (*info->callbacks->reloc_overflow) (info,
+							(h ? &h->root : NULL),
+							sym_name,
+							howto->name,
+							rel->r_addend,
+							input_bfd,
+							input_section,
+							rel->r_offset))
+		return FALSE;
+	    }
+	  else
+	    {
+	      info->callbacks->einfo
+		(_("%P: %H: %s reloc against `%s': error %d\n"),
+		 input_bfd, input_section, rel->r_offset,
+		 howto->name, sym_name, (int) r);
+	      ret = FALSE;
+	    }
+	}
+    }
+
+#ifdef DEBUG
+  fprintf (stderr, "\n");
+#endif
+
+  return ret;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+ppc_elf_finish_dynamic_symbol (bfd *output_bfd,
+			       struct bfd_link_info *info,
+			       struct elf_link_hash_entry *h,
+			       Elf_Internal_Sym *sym)
+{
+  struct ppc_elf_link_hash_table *htab;
+  struct plt_entry *ent;
+  bfd_boolean doneone;
+
+#ifdef DEBUG
+  fprintf (stderr, "ppc_elf_finish_dynamic_symbol called for %s",
+	   h->root.root.string);
+#endif
+
+  htab = ppc_elf_hash_table (info);
+  BFD_ASSERT (htab->elf.dynobj != NULL);
+
+  doneone = FALSE;
+  for (ent = h->plt.plist; ent != NULL; ent = ent->next)
+    if (ent->plt.offset != (bfd_vma) -1)
+      {
+	if (!doneone)
+	  {
+	    Elf_Internal_Rela rela;
+	    bfd_byte *loc;
+	    bfd_vma reloc_index;
+
+	    if (htab->plt_type == PLT_NEW
+		|| !htab->elf.dynamic_sections_created
+		|| h->dynindx == -1)
+	      reloc_index = ent->plt.offset / 4;
+	    else
+	      {
+		reloc_index = ((ent->plt.offset - htab->plt_initial_entry_size)
+			       / htab->plt_slot_size);
+		if (reloc_index > PLT_NUM_SINGLE_ENTRIES
+		    && htab->plt_type == PLT_OLD)
+		  reloc_index -= (reloc_index - PLT_NUM_SINGLE_ENTRIES) / 2;
+	      }
+
+	    /* This symbol has an entry in the procedure linkage table.
+	       Set it up.  */
+	    if (htab->plt_type == PLT_VXWORKS
+		&& htab->elf.dynamic_sections_created
+		&& h->dynindx != -1)
+	      {
+		bfd_vma got_offset;
+		const bfd_vma *plt_entry;
+
+		/* The first three entries in .got.plt are reserved.  */
+		got_offset = (reloc_index + 3) * 4;
+
+		/* Use the right PLT. */
+		plt_entry = info->shared ? ppc_elf_vxworks_pic_plt_entry
+			    : ppc_elf_vxworks_plt_entry;
+
+		/* Fill in the .plt on VxWorks.  */
+		if (info->shared)
+		  {
+		    bfd_put_32 (output_bfd,
+				plt_entry[0] | PPC_HA (got_offset),
+				htab->plt->contents + ent->plt.offset + 0);
+		    bfd_put_32 (output_bfd,
+				plt_entry[1] | PPC_LO (got_offset),
+				htab->plt->contents + ent->plt.offset + 4);
+		  }
+		else
+		  {
+		    bfd_vma got_loc = got_offset + SYM_VAL (htab->elf.hgot);
+
+		    bfd_put_32 (output_bfd,
+				plt_entry[0] | PPC_HA (got_loc),
+				htab->plt->contents + ent->plt.offset + 0);
+		    bfd_put_32 (output_bfd,
+				plt_entry[1] | PPC_LO (got_loc),
+				htab->plt->contents + ent->plt.offset + 4);
+		  }
+
+		bfd_put_32 (output_bfd, plt_entry[2],
+			    htab->plt->contents + ent->plt.offset + 8);
+		bfd_put_32 (output_bfd, plt_entry[3],
+			    htab->plt->contents + ent->plt.offset + 12);
+
+		/* This instruction is an immediate load.  The value loaded is
+		   the byte offset of the R_PPC_JMP_SLOT relocation from the
+		   start of the .rela.plt section.  The value is stored in the
+		   low-order 16 bits of the load instruction.  */
+		/* NOTE: It appears that this is now an index rather than a
+		   prescaled offset.  */
+		bfd_put_32 (output_bfd,
+			    plt_entry[4] | reloc_index,
+			    htab->plt->contents + ent->plt.offset + 16);
+		/* This instruction is a PC-relative branch whose target is
+		   the start of the PLT section.  The address of this branch
+		   instruction is 20 bytes beyond the start of this PLT entry.
+		   The address is encoded in bits 6-29, inclusive.  The value
+		   stored is right-shifted by two bits, permitting a 26-bit
+		   offset.  */
+		bfd_put_32 (output_bfd,
+			    (plt_entry[5]
+			     | (-(ent->plt.offset + 20) & 0x03fffffc)),
+			    htab->plt->contents + ent->plt.offset + 20);
+		bfd_put_32 (output_bfd, plt_entry[6],
+			    htab->plt->contents + ent->plt.offset + 24);
+		bfd_put_32 (output_bfd, plt_entry[7],
+			    htab->plt->contents + ent->plt.offset + 28);
+
+		/* Fill in the GOT entry corresponding to this PLT slot with
+		   the address immediately after the the "bctr" instruction
+		   in this PLT entry.  */
+		bfd_put_32 (output_bfd, (htab->plt->output_section->vma
+					 + htab->plt->output_offset
+					 + ent->plt.offset + 16),
+			    htab->sgotplt->contents + got_offset);
+
+		if (!info->shared)
+		  {
+		    /* Fill in a couple of entries in .rela.plt.unloaded.  */
+		    loc = htab->srelplt2->contents
+		      + ((VXWORKS_PLTRESOLVE_RELOCS + reloc_index
+			  * VXWORKS_PLT_NON_JMP_SLOT_RELOCS)
+			 * sizeof (Elf32_External_Rela));
+
+		    /* Provide the @ha relocation for the first instruction.  */
+		    rela.r_offset = (htab->plt->output_section->vma
+				     + htab->plt->output_offset
+				     + ent->plt.offset + 2);
+		    rela.r_info = ELF32_R_INFO (htab->elf.hgot->indx,
+						R_PPC_ADDR16_HA);
+		    rela.r_addend = got_offset;
+		    bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+		    loc += sizeof (Elf32_External_Rela);
+
+		    /* Provide the @l relocation for the second instruction.  */
+		    rela.r_offset = (htab->plt->output_section->vma
+				     + htab->plt->output_offset
+				     + ent->plt.offset + 6);
+		    rela.r_info = ELF32_R_INFO (htab->elf.hgot->indx,
+						R_PPC_ADDR16_LO);
+		    rela.r_addend = got_offset;
+		    bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+		    loc += sizeof (Elf32_External_Rela);
+
+		    /* Provide a relocation for the GOT entry corresponding to this
+		       PLT slot.  Point it at the middle of the .plt entry.  */
+		    rela.r_offset = (htab->sgotplt->output_section->vma
+				     + htab->sgotplt->output_offset
+				     + got_offset);
+		    rela.r_info = ELF32_R_INFO (htab->elf.hplt->indx,
+						R_PPC_ADDR32);
+		    rela.r_addend = ent->plt.offset + 16;
+		    bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+		  }
+
+		/* VxWorks uses non-standard semantics for R_PPC_JMP_SLOT.
+		   In particular, the offset for the relocation is not the
+		   address of the PLT entry for this function, as specified
+		   by the ABI.  Instead, the offset is set to the address of
+		   the GOT slot for this function.  See EABI 4.4.4.1.  */
+		rela.r_offset = (htab->sgotplt->output_section->vma
+				 + htab->sgotplt->output_offset
+				 + got_offset);
+
+	      }
+	    else
+	      {
+		asection *splt = htab->plt;
+		if (!htab->elf.dynamic_sections_created
+		    || h->dynindx == -1)
+		  splt = htab->iplt;
+
+		rela.r_offset = (splt->output_section->vma
+				 + splt->output_offset
+				 + ent->plt.offset);
+		if (htab->plt_type == PLT_OLD
+		    || !htab->elf.dynamic_sections_created
+		    || h->dynindx == -1)
+		  {
+		    /* We don't need to fill in the .plt.  The ppc dynamic
+		       linker will fill it in.  */
+		  }
+		else
+		  {
+		    bfd_vma val = (htab->glink_pltresolve + ent->plt.offset
+				   + htab->glink->output_section->vma
+				   + htab->glink->output_offset);
+		    bfd_put_32 (output_bfd, val,
+				splt->contents + ent->plt.offset);
+		  }
+	      }
+
+	    /* Fill in the entry in the .rela.plt section.  */
+	    rela.r_addend = 0;
+	    if (!htab->elf.dynamic_sections_created
+		|| h->dynindx == -1)
+	      {
+		BFD_ASSERT (h->type == STT_GNU_IFUNC
+			    && h->def_regular
+			    && (h->root.type == bfd_link_hash_defined
+				|| h->root.type == bfd_link_hash_defweak));
+		rela.r_info = ELF32_R_INFO (0, R_PPC_IRELATIVE);
+		rela.r_addend = SYM_VAL (h);
+	      }
+	    else
+	      rela.r_info = ELF32_R_INFO (h->dynindx, R_PPC_JMP_SLOT);
+
+	    if (!htab->elf.dynamic_sections_created
+		|| h->dynindx == -1)
+	      loc = (htab->reliplt->contents
+		     + (htab->reliplt->reloc_count++
+			* sizeof (Elf32_External_Rela)));
+	    else
+	      loc = (htab->relplt->contents
+		     + reloc_index * sizeof (Elf32_External_Rela));
+	    bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+
+	    if (!h->def_regular)
+	      {
+		/* Mark the symbol as undefined, rather than as
+		   defined in the .plt section.  Leave the value if
+		   there were any relocations where pointer equality
+		   matters (this is a clue for the dynamic linker, to
+		   make function pointer comparisons work between an
+		   application and shared library), otherwise set it
+		   to zero.  */
+		sym->st_shndx = SHN_UNDEF;
+		if (!h->pointer_equality_needed)
+		  sym->st_value = 0;
+		else if (!h->ref_regular_nonweak)
+		  {
+		    /* This breaks function pointer comparisons, but
+		       that is better than breaking tests for a NULL
+		       function pointer.  */
+		    sym->st_value = 0;
+		  }
+	      }
+	    else if (h->type == STT_GNU_IFUNC
+		     && !info->shared)
+	      {
+		/* Set the value of ifunc symbols in a non-pie
+		   executable to the glink entry.  This is to avoid
+		   text relocations.  We can't do this for ifunc in
+		   allocate_dynrelocs, as we do for normal dynamic
+		   function symbols with plt entries, because we need
+		   to keep the original value around for the ifunc
+		   relocation.  */
+		sym->st_shndx = (_bfd_elf_section_from_bfd_section
+				 (output_bfd, htab->glink->output_section));
+		sym->st_value = (ent->glink_offset
+				 + htab->glink->output_offset
+				 + htab->glink->output_section->vma);
+	      }
+	    doneone = TRUE;
+	  }
+
+	if (htab->plt_type == PLT_NEW
+	    || !htab->elf.dynamic_sections_created
+	    || h->dynindx == -1)
+	  {
+	    unsigned char *p;
+	    asection *splt = htab->plt;
+	    if (!htab->elf.dynamic_sections_created
+		|| h->dynindx == -1)
+	      splt = htab->iplt;
+
+	    p = (unsigned char *) htab->glink->contents + ent->glink_offset;
+
+	    if (h == htab->tls_get_addr && !htab->no_tls_get_addr_opt)
+	      {
+		bfd_put_32 (output_bfd, LWZ_11_3, p);
+		p += 4;
+		bfd_put_32 (output_bfd, LWZ_12_3 + 4, p);
+		p += 4;
+		bfd_put_32 (output_bfd, MR_0_3, p);
+		p += 4;
+		bfd_put_32 (output_bfd, CMPWI_11_0, p);
+		p += 4;
+		bfd_put_32 (output_bfd, ADD_3_12_2, p);
+		p += 4;
+		bfd_put_32 (output_bfd, BEQLR, p);
+		p += 4;
+		bfd_put_32 (output_bfd, MR_3_0, p);
+		p += 4;
+		bfd_put_32 (output_bfd, NOP, p);
+		p += 4;
+	      }
+
+	    write_glink_stub (ent, splt, p, info);
+
+	    if (!info->shared)
+	      /* We only need one non-PIC glink stub.  */
+	      break;
+	  }
+	else
+	  break;
+      }
+
+  if (h->needs_copy)
+    {
+      asection *s;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+
+      /* This symbols needs a copy reloc.  Set it up.  */
+
+#ifdef DEBUG
+      fprintf (stderr, ", copy");
+#endif
+
+      BFD_ASSERT (h->dynindx != -1);
+
+      if (ppc_elf_hash_entry (h)->has_sda_refs)
+	s = htab->relsbss;
+      else
+	s = htab->relbss;
+      BFD_ASSERT (s != NULL);
+
+      rela.r_offset = SYM_VAL (h);
+      rela.r_info = ELF32_R_INFO (h->dynindx, R_PPC_COPY);
+      rela.r_addend = 0;
+      loc = s->contents + s->reloc_count++ * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+    }
+
+#ifdef DEBUG
+  fprintf (stderr, "\n");
+#endif
+
+  /* Mark some specially defined symbols as absolute.  */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+      || (!htab->is_vxworks
+	  && (h == htab->elf.hgot
+	      || strcmp (h->root.root.string,
+			 "_PROCEDURE_LINKAGE_TABLE_") == 0)))
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+static enum elf_reloc_type_class
+ppc_elf_reloc_type_class (const Elf_Internal_Rela *rela)
+{
+  switch (ELF32_R_TYPE (rela->r_info))
+    {
+    case R_PPC_RELATIVE:
+      return reloc_class_relative;
+    case R_PPC_REL24:
+    case R_PPC_ADDR24:
+    case R_PPC_JMP_SLOT:
+      return reloc_class_plt;
+    case R_PPC_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+ppc_elf_finish_dynamic_sections (bfd *output_bfd,
+				 struct bfd_link_info *info)
+{
+  asection *sdyn;
+  asection *splt;
+  struct ppc_elf_link_hash_table *htab;
+  bfd_vma got;
+  bfd *dynobj;
+  bfd_boolean ret = TRUE;
+
+#ifdef DEBUG
+  fprintf (stderr, "ppc_elf_finish_dynamic_sections called\n");
+#endif
+
+  htab = ppc_elf_hash_table (info);
+  dynobj = elf_hash_table (info)->dynobj;
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+  if (htab->is_vxworks)
+    splt = bfd_get_section_by_name (dynobj, ".plt");
+  else
+    splt = NULL;
+
+  got = 0;
+  if (htab->elf.hgot != NULL)
+    got = SYM_VAL (htab->elf.hgot);
+
+  if (htab->elf.dynamic_sections_created)
+    {
+      Elf32_External_Dyn *dyncon, *dynconend;
+
+      BFD_ASSERT (htab->plt != NULL && sdyn != NULL);
+
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+	  asection *s;
+
+	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    case DT_PLTGOT:
+	      if (htab->is_vxworks)
+		s = htab->sgotplt;
+	      else
+		s = htab->plt;
+	      dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+	      break;
+
+	    case DT_PLTRELSZ:
+	      dyn.d_un.d_val = htab->relplt->size;
+	      break;
+
+	    case DT_JMPREL:
+	      s = htab->relplt;
+	      dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+	      break;
+
+	    case DT_PPC_GOT:
+	      dyn.d_un.d_ptr = got;
+	      break;
+
+	    case DT_RELASZ:
+	      if (htab->is_vxworks)
+		{
+		  if (htab->relplt)
+		    dyn.d_un.d_ptr -= htab->relplt->size;
+		  break;
+		}
+	      continue;
+
+	    default:
+	      if (htab->is_vxworks
+		  && elf_vxworks_finish_dynamic_entry (output_bfd, &dyn))
+		break;
+	      continue;
+	    }
+
+	  bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	}
+    }
+
+  if (htab->got != NULL)
+    {
+      if (htab->elf.hgot->root.u.def.section == htab->got
+	  || htab->elf.hgot->root.u.def.section == htab->sgotplt)
+	{
+	  unsigned char *p = htab->elf.hgot->root.u.def.section->contents;
+
+	  p += htab->elf.hgot->root.u.def.value;
+	  if (htab->plt_type == PLT_OLD)
+	    {
+	      /* Add a blrl instruction at _GLOBAL_OFFSET_TABLE_-4
+		 so that a function can easily find the address of
+		 _GLOBAL_OFFSET_TABLE_.  */
+	      BFD_ASSERT (htab->elf.hgot->root.u.def.value - 4
+			  < htab->elf.hgot->root.u.def.section->size);
+	      bfd_put_32 (output_bfd, 0x4e800021, p - 4);
+	    }
+
+	  if (sdyn != NULL)
+	    {
+	      bfd_vma val = sdyn->output_section->vma + sdyn->output_offset;
+	      BFD_ASSERT (htab->elf.hgot->root.u.def.value
+			  < htab->elf.hgot->root.u.def.section->size);
+	      bfd_put_32 (output_bfd, val, p);
+	    }
+	}
+      else
+	{
+	  info->callbacks->einfo (_("%P: %s not defined in linker created %s\n"),
+				  htab->elf.hgot->root.root.string,
+				  (htab->sgotplt != NULL
+				   ? htab->sgotplt->name : htab->got->name));
+	  bfd_set_error (bfd_error_bad_value);
+	  ret = FALSE;
+	}
+
+      elf_section_data (htab->got->output_section)->this_hdr.sh_entsize = 4;
+    }
+
+  /* Fill in the first entry in the VxWorks procedure linkage table.  */
+  if (splt && splt->size > 0)
+    {
+      /* Use the right PLT. */
+      const bfd_vma *plt_entry = (info->shared
+				  ? ppc_elf_vxworks_pic_plt0_entry
+				  : ppc_elf_vxworks_plt0_entry);
+
+      if (!info->shared)
+	{
+	  bfd_vma got_value = SYM_VAL (htab->elf.hgot);
+
+	  bfd_put_32 (output_bfd, plt_entry[0] | PPC_HA (got_value),
+		      splt->contents +  0);
+	  bfd_put_32 (output_bfd, plt_entry[1] | PPC_LO (got_value),
+		      splt->contents +  4);
+	}
+      else
+	{
+	  bfd_put_32 (output_bfd, plt_entry[0], splt->contents +  0);
+	  bfd_put_32 (output_bfd, plt_entry[1], splt->contents +  4);
+	}
+      bfd_put_32 (output_bfd, plt_entry[2], splt->contents +  8);
+      bfd_put_32 (output_bfd, plt_entry[3], splt->contents + 12);
+      bfd_put_32 (output_bfd, plt_entry[4], splt->contents + 16);
+      bfd_put_32 (output_bfd, plt_entry[5], splt->contents + 20);
+      bfd_put_32 (output_bfd, plt_entry[6], splt->contents + 24);
+      bfd_put_32 (output_bfd, plt_entry[7], splt->contents + 28);
+
+      if (! info->shared)
+	{
+	  Elf_Internal_Rela rela;
+	  bfd_byte *loc;
+
+	  loc = htab->srelplt2->contents;
+
+	  /* Output the @ha relocation for the first instruction.  */
+	  rela.r_offset = (htab->plt->output_section->vma
+			   + htab->plt->output_offset
+			   + 2);
+	  rela.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_PPC_ADDR16_HA);
+	  rela.r_addend = 0;
+	  bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+	  loc += sizeof (Elf32_External_Rela);
+
+	  /* Output the @l relocation for the second instruction.  */
+	  rela.r_offset = (htab->plt->output_section->vma
+			   + htab->plt->output_offset
+			   + 6);
+	  rela.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_PPC_ADDR16_LO);
+	  rela.r_addend = 0;
+	  bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+	  loc += sizeof (Elf32_External_Rela);
+
+	  /* Fix up the remaining relocations.  They may have the wrong
+	     symbol index for _G_O_T_ or _P_L_T_ depending on the order
+	     in which symbols were output.  */
+	  while (loc < htab->srelplt2->contents + htab->srelplt2->size)
+	    {
+	      Elf_Internal_Rela rel;
+
+	      bfd_elf32_swap_reloc_in (output_bfd, loc, &rel);
+	      rel.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_PPC_ADDR16_HA);
+	      bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
+	      loc += sizeof (Elf32_External_Rela);
+
+	      bfd_elf32_swap_reloc_in (output_bfd, loc, &rel);
+	      rel.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_PPC_ADDR16_LO);
+	      bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
+	      loc += sizeof (Elf32_External_Rela);
+
+	      bfd_elf32_swap_reloc_in (output_bfd, loc, &rel);
+	      rel.r_info = ELF32_R_INFO (htab->elf.hplt->indx, R_PPC_ADDR32);
+	      bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
+	      loc += sizeof (Elf32_External_Rela);
+	    }
+	}
+    }
+
+  if (htab->glink != NULL
+      && htab->glink->contents != NULL
+      && htab->elf.dynamic_sections_created)
+    {
+      unsigned char *p;
+      unsigned char *endp;
+      bfd_vma res0;
+      unsigned int i;
+
+      /*
+       * PIC glink code is the following:
+       *
+       * # ith PLT code stub.
+       *   addis 11,30,(plt+(i-1)*4-got)@ha
+       *   lwz 11,(plt+(i-1)*4-got)@l(11)
+       *   mtctr 11
+       *   bctr
+       *
+       * # A table of branches, one for each plt entry.
+       * # The idea is that the plt call stub loads ctr and r11 with these
+       * # addresses, so (r11 - res_0) gives the plt index * 4.
+       * res_0:	b PLTresolve
+       * res_1:	b PLTresolve
+       * .
+       * # Some number of entries towards the end can be nops
+       * res_n_m3: nop
+       * res_n_m2: nop
+       * res_n_m1:
+       *
+       * PLTresolve:
+       *    addis 11,11,(1f-res_0)@ha
+       *    mflr 0
+       *    bcl 20,31,1f
+       * 1: addi 11,11,(1b-res_0)@l
+       *    mflr 12
+       *    mtlr 0
+       *    sub 11,11,12                # r11 = index * 4
+       *    addis 12,12,(got+4-1b)@ha
+       *    lwz 0,(got+4-1b)@l(12)      # got[1] address of dl_runtime_resolve
+       *    lwz 12,(got+8-1b)@l(12)     # got[2] contains the map address
+       *    mtctr 0
+       *    add 0,11,11
+       *    add 11,0,11                 # r11 = index * 12 = reloc offset.
+       *    bctr
+       */
+      static const unsigned int pic_plt_resolve[] =
+	{
+	  ADDIS_11_11,
+	  MFLR_0,
+	  BCL_20_31,
+	  ADDI_11_11,
+	  MFLR_12,
+	  MTLR_0,
+	  SUB_11_11_12,
+	  ADDIS_12_12,
+	  LWZ_0_12,
+	  LWZ_12_12,
+	  MTCTR_0,
+	  ADD_0_11_11,
+	  ADD_11_0_11,
+	  BCTR,
+	  NOP,
+	  NOP
+	};
+
+      /*
+       * Non-PIC glink code is a little simpler.
+       *
+       * # ith PLT code stub.
+       *   lis 11,(plt+(i-1)*4)@ha
+       *   lwz 11,(plt+(i-1)*4)@l(11)
+       *   mtctr 11
+       *   bctr
+       *
+       * The branch table is the same, then comes
+       *
+       * PLTresolve:
+       *    lis 12,(got+4)@ha
+       *    addis 11,11,(-res_0)@ha
+       *    lwz 0,(got+4)@l(12)         # got[1] address of dl_runtime_resolve
+       *    addi 11,11,(-res_0)@l       # r11 = index * 4
+       *    mtctr 0
+       *    add 0,11,11
+       *    lwz 12,(got+8)@l(12)        # got[2] contains the map address
+       *    add 11,0,11                 # r11 = index * 12 = reloc offset.
+       *    bctr
+       */
+      static const unsigned int plt_resolve[] =
+	{
+	  LIS_12,
+	  ADDIS_11_11,
+	  LWZ_0_12,
+	  ADDI_11_11,
+	  MTCTR_0,
+	  ADD_0_11_11,
+	  LWZ_12_12,
+	  ADD_11_0_11,
+	  BCTR,
+	  NOP,
+	  NOP,
+	  NOP,
+	  NOP,
+	  NOP,
+	  NOP,
+	  NOP
+	};
+
+      if (ARRAY_SIZE (pic_plt_resolve) != GLINK_PLTRESOLVE / 4)
+	abort ();
+      if (ARRAY_SIZE (plt_resolve) != GLINK_PLTRESOLVE / 4)
+	abort ();
+
+      /* Build the branch table, one for each plt entry (less one),
+	 and perhaps some padding.  */
+      p = htab->glink->contents;
+      p += htab->glink_pltresolve;
+      endp = htab->glink->contents;
+      endp += htab->glink->size - GLINK_PLTRESOLVE;
+      while (p < endp - 8 * 4)
+	{
+	  bfd_put_32 (output_bfd, B + endp - p, p);
+	  p += 4;
+	}
+      while (p < endp)
+	{
+	  bfd_put_32 (output_bfd, NOP, p);
+	  p += 4;
+	}
+
+      res0 = (htab->glink_pltresolve
+	      + htab->glink->output_section->vma
+	      + htab->glink->output_offset);
+
+      /* Last comes the PLTresolve stub.  */
+      if (info->shared)
+	{
+	  bfd_vma bcl;
+
+	  for (i = 0; i < ARRAY_SIZE (pic_plt_resolve); i++)
+	    {
+	      bfd_put_32 (output_bfd, pic_plt_resolve[i], p);
+	      p += 4;
+	    }
+	  p -= 4 * ARRAY_SIZE (pic_plt_resolve);
+
+	  bcl = (htab->glink->size - GLINK_PLTRESOLVE + 3*4
+		 + htab->glink->output_section->vma
+		 + htab->glink->output_offset);
+
+	  bfd_put_32 (output_bfd,
+		      ADDIS_11_11 + PPC_HA (bcl - res0), p + 0*4);
+	  bfd_put_32 (output_bfd,
+		      ADDI_11_11 + PPC_LO (bcl - res0), p + 3*4);
+	  bfd_put_32 (output_bfd,
+		      ADDIS_12_12 + PPC_HA (got + 4 - bcl), p + 7*4);
+	  if (PPC_HA (got + 4 - bcl) == PPC_HA (got + 8 - bcl))
+	    {
+	      bfd_put_32 (output_bfd,
+			  LWZ_0_12 + PPC_LO (got + 4 - bcl), p + 8*4);
+	      bfd_put_32 (output_bfd,
+			  LWZ_12_12 + PPC_LO (got + 8 - bcl), p + 9*4);
+	    }
+	  else
+	    {
+	      bfd_put_32 (output_bfd,
+			  LWZU_0_12 + PPC_LO (got + 4 - bcl), p + 8*4);
+	      bfd_put_32 (output_bfd,
+			  LWZ_12_12 + 4, p + 9*4);
+	    }
+	}
+      else
+	{
+	  for (i = 0; i < ARRAY_SIZE (plt_resolve); i++)
+	    {
+	      bfd_put_32 (output_bfd, plt_resolve[i], p);
+	      p += 4;
+	    }
+	  p -= 4 * ARRAY_SIZE (plt_resolve);
+
+	  bfd_put_32 (output_bfd,
+		      LIS_12 + PPC_HA (got + 4), p + 0*4);
+	  bfd_put_32 (output_bfd,
+		      ADDIS_11_11 + PPC_HA (-res0), p + 1*4);
+	  bfd_put_32 (output_bfd,
+		      ADDI_11_11 + PPC_LO (-res0), p + 3*4);
+	  if (PPC_HA (got + 4) == PPC_HA (got + 8))
+	    {
+	      bfd_put_32 (output_bfd,
+			  LWZ_0_12 + PPC_LO (got + 4), p + 2*4);
+	      bfd_put_32 (output_bfd,
+			  LWZ_12_12 + PPC_LO (got + 8), p + 6*4);
+	    }
+	  else
+	    {
+	      bfd_put_32 (output_bfd,
+			  LWZU_0_12 + PPC_LO (got + 4), p + 2*4);
+	      bfd_put_32 (output_bfd,
+			  LWZ_12_12 + 4, p + 6*4);
+	    }
+	}
+    }
+
+  if (htab->glink_eh_frame != NULL
+      && htab->glink_eh_frame->contents != NULL)
+    {
+      unsigned char *p = htab->glink_eh_frame->contents;
+      bfd_vma val;
+
+      memcpy (p, glink_eh_frame_cie, sizeof (glink_eh_frame_cie));
+      /* CIE length (rewrite in case little-endian).  */
+      bfd_put_32 (htab->elf.dynobj, sizeof (glink_eh_frame_cie) - 4, p);
+      p += sizeof (glink_eh_frame_cie);
+      /* FDE length.  */
+      val = htab->glink_eh_frame->size - 4 - sizeof (glink_eh_frame_cie);
+      bfd_put_32 (htab->elf.dynobj, val, p);
+      p += 4;
+      /* CIE pointer.  */
+      val = p - htab->glink_eh_frame->contents;
+      bfd_put_32 (htab->elf.dynobj, val, p);
+      p += 4;
+      /* Offset to .glink.  */
+      val = (htab->glink->output_section->vma
+	     + htab->glink->output_offset);
+      val -= (htab->glink_eh_frame->output_section->vma
+	      + htab->glink_eh_frame->output_offset);
+      val -= p - htab->glink_eh_frame->contents;
+      bfd_put_32 (htab->elf.dynobj, val, p);
+      p += 4;
+      /* .glink size.  */
+      bfd_put_32 (htab->elf.dynobj, htab->glink->size, p);
+      p += 4;
+      /* Augmentation.  */
+      p += 1;
+
+      if (info->shared
+	  && htab->elf.dynamic_sections_created)
+	{
+	  bfd_vma adv = (htab->glink->size - GLINK_PLTRESOLVE + 8) >> 2;
+	  if (adv < 64)
+	    *p++ = DW_CFA_advance_loc + adv;
+	  else if (adv < 256)
+	    {
+	      *p++ = DW_CFA_advance_loc1;
+	      *p++ = adv;
+	    }
+	  else if (adv < 65536)
+	    {
+	      *p++ = DW_CFA_advance_loc2;
+	      bfd_put_16 (htab->elf.dynobj, adv, p);
+	      p += 2;
+	    }
+	  else
+	    {
+	      *p++ = DW_CFA_advance_loc4;
+	      bfd_put_32 (htab->elf.dynobj, adv, p);
+	      p += 4;
+	    }
+	  *p++ = DW_CFA_register;
+	  *p++ = 65;
+	  p++;
+	  *p++ = DW_CFA_advance_loc + 4;
+	  *p++ = DW_CFA_restore_extended;
+	  *p++ = 65;
+	}
+      BFD_ASSERT ((bfd_vma) ((p + 3 - htab->glink_eh_frame->contents) & -4)
+		  == htab->glink_eh_frame->size);
+
+      if (htab->glink_eh_frame->sec_info_type == ELF_INFO_TYPE_EH_FRAME
+	  && !_bfd_elf_write_section_eh_frame (output_bfd, info,
+					       htab->glink_eh_frame,
+					       htab->glink_eh_frame->contents))
+	return FALSE;
+    }
+
+  return ret;
+}
+
+#define TARGET_LITTLE_SYM	bfd_elf32_powerpcle_vec
+#define TARGET_LITTLE_NAME	"elf32-powerpcle"
+#define TARGET_BIG_SYM		bfd_elf32_powerpc_vec
+#define TARGET_BIG_NAME		"elf32-powerpc"
+#define ELF_ARCH		bfd_arch_powerpc
+#define ELF_TARGET_ID		PPC32_ELF_DATA
+#define ELF_MACHINE_CODE	EM_PPC
+#ifdef __QNXTARGET__
+#define ELF_MAXPAGESIZE		0x1000
+#else
+#define ELF_MAXPAGESIZE		0x10000
+#endif
+#define ELF_MINPAGESIZE		0x1000
+#define ELF_COMMONPAGESIZE	0x1000
+#define elf_info_to_howto	ppc_elf_info_to_howto
+
+#ifdef  EM_CYGNUS_POWERPC
+#define ELF_MACHINE_ALT1	EM_CYGNUS_POWERPC
+#endif
+
+#ifdef EM_PPC_OLD
+#define ELF_MACHINE_ALT2	EM_PPC_OLD
+#endif
+
+#define elf_backend_plt_not_loaded	1
+#define elf_backend_can_gc_sections	1
+#define elf_backend_can_refcount	1
+#define elf_backend_rela_normal		1
+
+#define bfd_elf32_mkobject			ppc_elf_mkobject
+#define bfd_elf32_bfd_merge_private_bfd_data	ppc_elf_merge_private_bfd_data
+#define bfd_elf32_bfd_relax_section		ppc_elf_relax_section
+#define bfd_elf32_bfd_reloc_type_lookup		ppc_elf_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup	ppc_elf_reloc_name_lookup
+#define bfd_elf32_bfd_set_private_flags		ppc_elf_set_private_flags
+#define bfd_elf32_bfd_link_hash_table_create	ppc_elf_link_hash_table_create
+#define bfd_elf32_get_synthetic_symtab		ppc_elf_get_synthetic_symtab
+
+#define elf_backend_object_p			ppc_elf_object_p
+#define elf_backend_gc_mark_hook		ppc_elf_gc_mark_hook
+#define elf_backend_gc_sweep_hook		ppc_elf_gc_sweep_hook
+#define elf_backend_section_from_shdr		ppc_elf_section_from_shdr
+#define elf_backend_relocate_section		ppc_elf_relocate_section
+#define elf_backend_create_dynamic_sections	ppc_elf_create_dynamic_sections
+#define elf_backend_check_relocs		ppc_elf_check_relocs
+#define elf_backend_copy_indirect_symbol	ppc_elf_copy_indirect_symbol
+#define elf_backend_adjust_dynamic_symbol	ppc_elf_adjust_dynamic_symbol
+#define elf_backend_add_symbol_hook		ppc_elf_add_symbol_hook
+#define elf_backend_size_dynamic_sections	ppc_elf_size_dynamic_sections
+#define elf_backend_hash_symbol			ppc_elf_hash_symbol
+#define elf_backend_finish_dynamic_symbol	ppc_elf_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections	ppc_elf_finish_dynamic_sections
+#define elf_backend_fake_sections		ppc_elf_fake_sections
+#define elf_backend_additional_program_headers	ppc_elf_additional_program_headers
+#define elf_backend_grok_prstatus		ppc_elf_grok_prstatus
+#define elf_backend_grok_psinfo			ppc_elf_grok_psinfo
+#define elf_backend_write_core_note		ppc_elf_write_core_note
+#define elf_backend_reloc_type_class		ppc_elf_reloc_type_class
+#define elf_backend_begin_write_processing	ppc_elf_begin_write_processing
+#define elf_backend_final_write_processing	ppc_elf_final_write_processing
+#define elf_backend_write_section		ppc_elf_write_section
+#define elf_backend_get_sec_type_attr		ppc_elf_get_sec_type_attr
+#define elf_backend_plt_sym_val			ppc_elf_plt_sym_val
+#define elf_backend_action_discarded		ppc_elf_action_discarded
+#define elf_backend_init_index_section		_bfd_elf_init_1_index_section
+#define elf_backend_post_process_headers	_bfd_elf_set_osabi
+
+#include "elf32-target.h"
+
+/* VxWorks Target */
+
+#undef TARGET_LITTLE_SYM
+#undef TARGET_LITTLE_NAME
+
+#undef TARGET_BIG_SYM
+#define TARGET_BIG_SYM		bfd_elf32_powerpc_vxworks_vec
+#undef TARGET_BIG_NAME
+#define TARGET_BIG_NAME		"elf32-powerpc-vxworks"
+
+/* VxWorks uses the elf default section flags for .plt.  */
+static const struct bfd_elf_special_section *
+ppc_elf_vxworks_get_sec_type_attr (bfd *abfd ATTRIBUTE_UNUSED, asection *sec)
+{
+  if (sec->name == NULL)
+    return NULL;
+
+  if (strcmp (sec->name, ".plt") == 0)
+    return _bfd_elf_get_sec_type_attr (abfd, sec);
+
+  return ppc_elf_get_sec_type_attr (abfd, sec);
+}
+
+/* Like ppc_elf_link_hash_table_create, but overrides
+   appropriately for VxWorks.  */
+static struct bfd_link_hash_table *
+ppc_elf_vxworks_link_hash_table_create (bfd *abfd)
+{
+  struct bfd_link_hash_table *ret;
+
+  ret = ppc_elf_link_hash_table_create (abfd);
+  if (ret)
+    {
+      struct ppc_elf_link_hash_table *htab
+        = (struct ppc_elf_link_hash_table *)ret;
+      htab->is_vxworks = 1;
+      htab->plt_type = PLT_VXWORKS;
+      htab->plt_entry_size = VXWORKS_PLT_ENTRY_SIZE;
+      htab->plt_slot_size = VXWORKS_PLT_ENTRY_SIZE;
+      htab->plt_initial_entry_size = VXWORKS_PLT_INITIAL_ENTRY_SIZE;
+    }
+  return ret;
+}
+
+/* Tweak magic VxWorks symbols as they are loaded.  */
+static bfd_boolean
+ppc_elf_vxworks_add_symbol_hook (bfd *abfd,
+				 struct bfd_link_info *info,
+				 Elf_Internal_Sym *sym,
+				 const char **namep ATTRIBUTE_UNUSED,
+				 flagword *flagsp ATTRIBUTE_UNUSED,
+				 asection **secp,
+				 bfd_vma *valp)
+{
+  if (!elf_vxworks_add_symbol_hook(abfd, info, sym,namep, flagsp, secp,
+				   valp))
+    return FALSE;
+
+  return ppc_elf_add_symbol_hook(abfd, info, sym,namep, flagsp, secp, valp);
+}
+
+static void
+ppc_elf_vxworks_final_write_processing (bfd *abfd, bfd_boolean linker)
+{
+  ppc_elf_final_write_processing(abfd, linker);
+  elf_vxworks_final_write_processing(abfd, linker);
+}
+
+/* On VxWorks, we emit relocations against _PROCEDURE_LINKAGE_TABLE_, so
+   define it.  */
+#undef elf_backend_want_plt_sym
+#define elf_backend_want_plt_sym		1
+#undef elf_backend_want_got_plt
+#define elf_backend_want_got_plt		1
+#undef elf_backend_got_symbol_offset
+#define elf_backend_got_symbol_offset		0
+#undef elf_backend_plt_not_loaded
+#define elf_backend_plt_not_loaded		0
+#undef elf_backend_plt_readonly
+#define elf_backend_plt_readonly		1
+#undef elf_backend_got_header_size
+#define elf_backend_got_header_size		12
+
+#undef bfd_elf32_get_synthetic_symtab
+
+#undef bfd_elf32_bfd_link_hash_table_create
+#define bfd_elf32_bfd_link_hash_table_create \
+  ppc_elf_vxworks_link_hash_table_create
+#undef elf_backend_add_symbol_hook
+#define elf_backend_add_symbol_hook \
+  ppc_elf_vxworks_add_symbol_hook
+#undef elf_backend_link_output_symbol_hook
+#define elf_backend_link_output_symbol_hook \
+  elf_vxworks_link_output_symbol_hook
+#undef elf_backend_final_write_processing
+#define elf_backend_final_write_processing \
+  ppc_elf_vxworks_final_write_processing
+#undef elf_backend_get_sec_type_attr
+#define elf_backend_get_sec_type_attr \
+  ppc_elf_vxworks_get_sec_type_attr
+#undef elf_backend_emit_relocs
+#define elf_backend_emit_relocs \
+  elf_vxworks_emit_relocs
+
+#undef elf32_bed
+#define elf32_bed				ppc_elf_vxworks_bed
+#undef elf_backend_post_process_headers
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-ppc.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-ppc.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-ppc.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-ppc.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,33 @@
+/* PowerPC-specific support for 64-bit ELF.
+   Copyright 2003, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+enum ppc_elf_plt_type
+{
+  PLT_UNSET,
+  PLT_OLD,
+  PLT_NEW,
+  PLT_VXWORKS
+};
+
+int ppc_elf_select_plt_layout (bfd *, struct bfd_link_info *,
+			       enum ppc_elf_plt_type, int);
+asection *ppc_elf_tls_setup (bfd *, struct bfd_link_info *, int);
+bfd_boolean ppc_elf_tls_optimize (bfd *, struct bfd_link_info *);
+void ppc_elf_set_sdata_syms (bfd *, struct bfd_link_info *);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-rx.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-rx.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-rx.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-rx.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3468 @@
+/* Renesas RX specific support for 32-bit ELF.
+   Copyright (C) 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfd_stdint.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/rx.h"
+#include "libiberty.h"
+
+#define RX_OPCODE_BIG_ENDIAN 0
+
+/* This is a meta-target that's used only with objcopy, to avoid the
+   endian-swap we would otherwise get.  We check for this in
+   rx_elf_object_p().  */
+const bfd_target bfd_elf32_rx_be_ns_vec;
+
+#ifdef DEBUG
+char * rx_get_reloc (long);
+void rx_dump_symtab (bfd *, void *, void *);
+#endif
+
+#define RXREL(n,sz,bit,shift,complain,pcrel)				     \
+  HOWTO (R_RX_##n, shift, sz, bit, pcrel, 0, complain_overflow_ ## complain, \
+	 bfd_elf_generic_reloc, "R_RX_" #n, FALSE, 0, ~0, FALSE)
+
+/* Note that the relocations around 0x7f are internal to this file;
+   feel free to move them as needed to avoid conflicts with published
+   relocation numbers.  */
+
+static reloc_howto_type rx_elf_howto_table [] =
+{
+  RXREL (NONE,         0,  0, 0, dont,     FALSE),
+  RXREL (DIR32,        2, 32, 0, signed,   FALSE),
+  RXREL (DIR24S,       2, 24, 0, signed,   FALSE),
+  RXREL (DIR16,        1, 16, 0, dont,     FALSE),
+  RXREL (DIR16U,       1, 16, 0, unsigned, FALSE),
+  RXREL (DIR16S,       1, 16, 0, signed,   FALSE),
+  RXREL (DIR8,         0,  8, 0, dont,     FALSE),
+  RXREL (DIR8U,        0,  8, 0, unsigned, FALSE),
+  RXREL (DIR8S,        0,  8, 0, signed,   FALSE),
+  RXREL (DIR24S_PCREL, 2, 24, 0, signed,   TRUE),
+  RXREL (DIR16S_PCREL, 1, 16, 0, signed,   TRUE),
+  RXREL (DIR8S_PCREL,  0,  8, 0, signed,   TRUE),
+  RXREL (DIR16UL,      1, 16, 2, unsigned, FALSE),
+  RXREL (DIR16UW,      1, 16, 1, unsigned, FALSE),
+  RXREL (DIR8UL,       0,  8, 2, unsigned, FALSE),
+  RXREL (DIR8UW,       0,  8, 1, unsigned, FALSE),
+  RXREL (DIR32_REV,    1, 16, 0, dont,     FALSE),
+  RXREL (DIR16_REV,    1, 16, 0, dont,     FALSE),
+  RXREL (DIR3U_PCREL,  0,  3, 0, dont,     TRUE),
+
+  EMPTY_HOWTO (0x13),
+  EMPTY_HOWTO (0x14),
+  EMPTY_HOWTO (0x15),
+  EMPTY_HOWTO (0x16),
+  EMPTY_HOWTO (0x17),
+  EMPTY_HOWTO (0x18),
+  EMPTY_HOWTO (0x19),
+  EMPTY_HOWTO (0x1a),
+  EMPTY_HOWTO (0x1b),
+  EMPTY_HOWTO (0x1c),
+  EMPTY_HOWTO (0x1d),
+  EMPTY_HOWTO (0x1e),
+  EMPTY_HOWTO (0x1f),
+
+  RXREL (RH_3_PCREL, 0,  3, 0, signed,   TRUE),
+  RXREL (RH_16_OP,   1, 16, 0, signed,   FALSE),
+  RXREL (RH_24_OP,   2, 24, 0, signed,   FALSE),
+  RXREL (RH_32_OP,   2, 32, 0, signed,   FALSE),
+  RXREL (RH_24_UNS,  2, 24, 0, unsigned, FALSE),
+  RXREL (RH_8_NEG,   0,  8, 0, signed,   FALSE),
+  RXREL (RH_16_NEG,  1, 16, 0, signed,   FALSE),
+  RXREL (RH_24_NEG,  2, 24, 0, signed,   FALSE),
+  RXREL (RH_32_NEG,  2, 32, 0, signed,   FALSE),
+  RXREL (RH_DIFF,    2, 32, 0, signed,   FALSE),
+  RXREL (RH_GPRELB,  1, 16, 0, unsigned, FALSE),
+  RXREL (RH_GPRELW,  1, 16, 0, unsigned, FALSE),
+  RXREL (RH_GPRELL,  1, 16, 0, unsigned, FALSE),
+  RXREL (RH_RELAX,   0,  0, 0, dont,     FALSE),
+
+  EMPTY_HOWTO (0x2e),
+  EMPTY_HOWTO (0x2f),
+  EMPTY_HOWTO (0x30),
+  EMPTY_HOWTO (0x31),
+  EMPTY_HOWTO (0x32),
+  EMPTY_HOWTO (0x33),
+  EMPTY_HOWTO (0x34),
+  EMPTY_HOWTO (0x35),
+  EMPTY_HOWTO (0x36),
+  EMPTY_HOWTO (0x37),
+  EMPTY_HOWTO (0x38),
+  EMPTY_HOWTO (0x39),
+  EMPTY_HOWTO (0x3a),
+  EMPTY_HOWTO (0x3b),
+  EMPTY_HOWTO (0x3c),
+  EMPTY_HOWTO (0x3d),
+  EMPTY_HOWTO (0x3e),
+  EMPTY_HOWTO (0x3f),
+  EMPTY_HOWTO (0x40),
+
+  RXREL (ABS32,        2, 32, 0, dont,     FALSE),
+  RXREL (ABS24S,       2, 24, 0, signed,   FALSE),
+  RXREL (ABS16,        1, 16, 0, dont,     FALSE),
+  RXREL (ABS16U,       1, 16, 0, unsigned, FALSE),
+  RXREL (ABS16S,       1, 16, 0, signed,   FALSE),
+  RXREL (ABS8,         0,  8, 0, dont,     FALSE),
+  RXREL (ABS8U,        0,  8, 0, unsigned, FALSE),
+  RXREL (ABS8S,        0,  8, 0, signed,   FALSE),
+  RXREL (ABS24S_PCREL, 2, 24, 0, signed,   TRUE),
+  RXREL (ABS16S_PCREL, 1, 16, 0, signed,   TRUE),
+  RXREL (ABS8S_PCREL,  0,  8, 0, signed,   TRUE),
+  RXREL (ABS16UL,      1, 16, 0, unsigned, FALSE),
+  RXREL (ABS16UW,      1, 16, 0, unsigned, FALSE),
+  RXREL (ABS8UL,       0,  8, 0, unsigned, FALSE),
+  RXREL (ABS8UW,       0,  8, 0, unsigned, FALSE),
+  RXREL (ABS32_REV,    2, 32, 0, dont,     FALSE),
+  RXREL (ABS16_REV,    1, 16, 0, dont,     FALSE),
+
+#define STACK_REL_P(x) ((x) <= R_RX_ABS16_REV && (x) >= R_RX_ABS32)
+
+  EMPTY_HOWTO (0x52),
+  EMPTY_HOWTO (0x53),
+  EMPTY_HOWTO (0x54),
+  EMPTY_HOWTO (0x55),
+  EMPTY_HOWTO (0x56),
+  EMPTY_HOWTO (0x57),
+  EMPTY_HOWTO (0x58),
+  EMPTY_HOWTO (0x59),
+  EMPTY_HOWTO (0x5a),
+  EMPTY_HOWTO (0x5b),
+  EMPTY_HOWTO (0x5c),
+  EMPTY_HOWTO (0x5d),
+  EMPTY_HOWTO (0x5e),
+  EMPTY_HOWTO (0x5f),
+  EMPTY_HOWTO (0x60),
+  EMPTY_HOWTO (0x61),
+  EMPTY_HOWTO (0x62),
+  EMPTY_HOWTO (0x63),
+  EMPTY_HOWTO (0x64),
+  EMPTY_HOWTO (0x65),
+  EMPTY_HOWTO (0x66),
+  EMPTY_HOWTO (0x67),
+  EMPTY_HOWTO (0x68),
+  EMPTY_HOWTO (0x69),
+  EMPTY_HOWTO (0x6a),
+  EMPTY_HOWTO (0x6b),
+  EMPTY_HOWTO (0x6c),
+  EMPTY_HOWTO (0x6d),
+  EMPTY_HOWTO (0x6e),
+  EMPTY_HOWTO (0x6f),
+  EMPTY_HOWTO (0x70),
+  EMPTY_HOWTO (0x71),
+  EMPTY_HOWTO (0x72),
+  EMPTY_HOWTO (0x73),
+  EMPTY_HOWTO (0x74),
+  EMPTY_HOWTO (0x75),
+  EMPTY_HOWTO (0x76),
+  EMPTY_HOWTO (0x77),
+
+  /* These are internal.  */
+  /* A 5-bit unsigned displacement to a B/W/L address, at bit position 8/12.  */
+  /* ---- ----   4--- 3210.  */
+#define R_RX_RH_ABS5p8B 0x78
+  RXREL (RH_ABS5p8B,   0,  0, 0, dont,     FALSE),
+#define R_RX_RH_ABS5p8W 0x79
+  RXREL (RH_ABS5p8W,   0,  0, 0, dont,     FALSE),
+#define R_RX_RH_ABS5p8L 0x7a
+  RXREL (RH_ABS5p8L,   0,  0, 0, dont,     FALSE),
+  /* A 5-bit unsigned displacement to a B/W/L address, at bit position 5/12.  */
+  /* ---- -432   1--- 0---.  */
+#define R_RX_RH_ABS5p5B 0x7b
+  RXREL (RH_ABS5p5B,   0,  0, 0, dont,     FALSE),
+#define R_RX_RH_ABS5p5W 0x7c
+  RXREL (RH_ABS5p5W,   0,  0, 0, dont,     FALSE),
+#define R_RX_RH_ABS5p5L 0x7d
+  RXREL (RH_ABS5p5L,   0,  0, 0, dont,     FALSE),
+  /* A 4-bit unsigned immediate at bit position 8.  */
+#define R_RX_RH_UIMM4p8 0x7e
+  RXREL (RH_UIMM4p8,   0,  0, 0, dont,     FALSE),
+  /* A 4-bit negative unsigned immediate at bit position 8.  */
+#define R_RX_RH_UNEG4p8 0x7f
+  RXREL (RH_UNEG4p8,   0,  0, 0, dont,     FALSE),
+  /* End of internal relocs.  */
+
+  RXREL (SYM,       2, 32, 0, dont, FALSE),
+  RXREL (OPneg,     2, 32, 0, dont, FALSE),
+  RXREL (OPadd,     2, 32, 0, dont, FALSE),
+  RXREL (OPsub,     2, 32, 0, dont, FALSE),
+  RXREL (OPmul,     2, 32, 0, dont, FALSE),
+  RXREL (OPdiv,     2, 32, 0, dont, FALSE),
+  RXREL (OPshla,    2, 32, 0, dont, FALSE),
+  RXREL (OPshra,    2, 32, 0, dont, FALSE),
+  RXREL (OPsctsize, 2, 32, 0, dont, FALSE),
+  RXREL (OPscttop,  2, 32, 0, dont, FALSE),
+  RXREL (OPand,     2, 32, 0, dont, FALSE),
+  RXREL (OPor,      2, 32, 0, dont, FALSE),
+  RXREL (OPxor,     2, 32, 0, dont, FALSE),
+  RXREL (OPnot,     2, 32, 0, dont, FALSE),
+  RXREL (OPmod,     2, 32, 0, dont, FALSE),
+  RXREL (OPromtop,  2, 32, 0, dont, FALSE),
+  RXREL (OPramtop,  2, 32, 0, dont, FALSE)
+};
+
+/* Map BFD reloc types to RX ELF reloc types.  */
+
+struct rx_reloc_map
+{
+  bfd_reloc_code_real_type  bfd_reloc_val;
+  unsigned int              rx_reloc_val;
+};
+
+static const struct rx_reloc_map rx_reloc_map [] =
+{
+  { BFD_RELOC_NONE,		R_RX_NONE },
+  { BFD_RELOC_8,		R_RX_DIR8S },
+  { BFD_RELOC_16,		R_RX_DIR16S },
+  { BFD_RELOC_24,		R_RX_DIR24S },
+  { BFD_RELOC_32,		R_RX_DIR32 },
+  { BFD_RELOC_RX_16_OP,		R_RX_DIR16 },
+  { BFD_RELOC_RX_DIR3U_PCREL,	R_RX_DIR3U_PCREL },
+  { BFD_RELOC_8_PCREL,		R_RX_DIR8S_PCREL },
+  { BFD_RELOC_16_PCREL,		R_RX_DIR16S_PCREL },
+  { BFD_RELOC_24_PCREL,		R_RX_DIR24S_PCREL },
+  { BFD_RELOC_RX_8U,		R_RX_DIR8U },
+  { BFD_RELOC_RX_16U,		R_RX_DIR16U },
+  { BFD_RELOC_RX_24U,		R_RX_RH_24_UNS },
+  { BFD_RELOC_RX_NEG8,		R_RX_RH_8_NEG },
+  { BFD_RELOC_RX_NEG16,		R_RX_RH_16_NEG },
+  { BFD_RELOC_RX_NEG24,		R_RX_RH_24_NEG },
+  { BFD_RELOC_RX_NEG32,		R_RX_RH_32_NEG },
+  { BFD_RELOC_RX_DIFF,		R_RX_RH_DIFF },
+  { BFD_RELOC_RX_GPRELB,	R_RX_RH_GPRELB },
+  { BFD_RELOC_RX_GPRELW,	R_RX_RH_GPRELW },
+  { BFD_RELOC_RX_GPRELL,	R_RX_RH_GPRELL },
+  { BFD_RELOC_RX_RELAX,		R_RX_RH_RELAX },
+  { BFD_RELOC_RX_SYM,		R_RX_SYM },
+  { BFD_RELOC_RX_OP_SUBTRACT,	R_RX_OPsub },
+  { BFD_RELOC_RX_OP_NEG,	R_RX_OPneg },
+  { BFD_RELOC_RX_ABS8,		R_RX_ABS8 },
+  { BFD_RELOC_RX_ABS16,		R_RX_ABS16 },
+  { BFD_RELOC_RX_ABS16_REV,	R_RX_ABS16_REV },
+  { BFD_RELOC_RX_ABS32,		R_RX_ABS32 },
+  { BFD_RELOC_RX_ABS32_REV,	R_RX_ABS32_REV },
+  { BFD_RELOC_RX_ABS16UL,	R_RX_ABS16UL },
+  { BFD_RELOC_RX_ABS16UW,	R_RX_ABS16UW },
+  { BFD_RELOC_RX_ABS16U,	R_RX_ABS16U }
+};
+
+#define BIGE(abfd)       ((abfd)->xvec->byteorder == BFD_ENDIAN_BIG)
+
+static reloc_howto_type *
+rx_reloc_type_lookup (bfd *                    abfd ATTRIBUTE_UNUSED,
+		      bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  if (code == BFD_RELOC_RX_32_OP)
+    return rx_elf_howto_table + R_RX_DIR32;
+
+  for (i = ARRAY_SIZE (rx_reloc_map); --i;)
+    if (rx_reloc_map [i].bfd_reloc_val == code)
+      return rx_elf_howto_table + rx_reloc_map[i].rx_reloc_val;
+
+  return NULL;
+}
+
+static reloc_howto_type *
+rx_reloc_name_lookup (bfd * abfd ATTRIBUTE_UNUSED, const char * r_name)
+{
+  unsigned int i;
+
+  for (i = 0; i < ARRAY_SIZE (rx_elf_howto_table); i++)
+    if (rx_elf_howto_table[i].name != NULL
+	&& strcasecmp (rx_elf_howto_table[i].name, r_name) == 0)
+      return rx_elf_howto_table + i;
+
+  return NULL;
+}
+
+/* Set the howto pointer for an RX ELF reloc.  */
+
+static void
+rx_info_to_howto_rela (bfd *               abfd ATTRIBUTE_UNUSED,
+		       arelent *           cache_ptr,
+		       Elf_Internal_Rela * dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_RX_max);
+  cache_ptr->howto = rx_elf_howto_table + r_type;
+}
+
+static bfd_vma
+get_symbol_value (const char *            name,
+		  bfd_reloc_status_type * status,
+		  struct bfd_link_info *  info,
+		  bfd *                   input_bfd,
+		  asection *              input_section,
+		  int			  offset)
+{
+  bfd_vma value = 0;
+  struct bfd_link_hash_entry * h;
+
+  h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE);
+
+  if (h == NULL
+      || (h->type != bfd_link_hash_defined
+	  && h->type != bfd_link_hash_defweak))
+    * status = info->callbacks->undefined_symbol
+      (info, name, input_bfd, input_section, offset, TRUE);
+  else
+    value = (h->u.def.value
+	     + h->u.def.section->output_section->vma
+	     + h->u.def.section->output_offset);
+
+  return value;
+}
+
+static bfd_vma
+get_gp (bfd_reloc_status_type * status,
+	struct bfd_link_info *  info,
+	bfd *                   abfd,
+	asection *              sec,
+	int			offset)
+{
+  static bfd_boolean cached = FALSE;
+  static bfd_vma     cached_value = 0;
+
+  if (!cached)
+    {
+      cached_value = get_symbol_value ("__gp", status, info, abfd, sec, offset);
+      cached = TRUE;
+    }
+  return cached_value;
+}
+
+static bfd_vma
+get_romstart (bfd_reloc_status_type * status,
+	      struct bfd_link_info *  info,
+	      bfd *                   abfd,
+	      asection *              sec,
+	      int		      offset)
+{
+  static bfd_boolean cached = FALSE;
+  static bfd_vma     cached_value = 0;
+
+  if (!cached)
+    {
+      cached_value = get_symbol_value ("_start", status, info, abfd, sec, offset);
+      cached = TRUE;
+    }
+  return cached_value;
+}
+
+static bfd_vma
+get_ramstart (bfd_reloc_status_type * status,
+	      struct bfd_link_info *  info,
+	      bfd *                   abfd,
+	      asection *              sec,
+	      int		      offset)
+{
+  static bfd_boolean cached = FALSE;
+  static bfd_vma     cached_value = 0;
+
+  if (!cached)
+    {
+      cached_value = get_symbol_value ("__datastart", status, info, abfd, sec, offset);
+      cached = TRUE;
+    }
+  return cached_value;
+}
+
+#define NUM_STACK_ENTRIES 16
+static int32_t rx_stack [ NUM_STACK_ENTRIES ];
+static unsigned int rx_stack_top;
+
+#define RX_STACK_PUSH(val)			\
+  do						\
+    {						\
+      if (rx_stack_top < NUM_STACK_ENTRIES)	\
+        rx_stack [rx_stack_top ++] = (val);	\
+      else					\
+        r = bfd_reloc_dangerous;		\
+    }						\
+  while (0)
+
+#define RX_STACK_POP(dest)			\
+  do						\
+    {						\
+      if (rx_stack_top > 0)			\
+        (dest) = rx_stack [-- rx_stack_top];	\
+      else					\
+        (dest) = 0, r = bfd_reloc_dangerous;	\
+    }						\
+  while (0)
+
+/* Relocate an RX ELF section.
+   There is some attempt to make this function usable for many architectures,
+   both USE_REL and USE_RELA ['twould be nice if such a critter existed],
+   if only to serve as a learning tool.
+
+   The RELOCATE_SECTION function is called by the new ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures; if the section
+   actually uses Rel structures, the r_addend field will always be
+   zero.
+
+   This function is responsible for adjusting the section contents as
+   necessary, and (if using Rela relocs and generating a relocatable
+   output file) adjusting the reloc addend as necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.  */
+
+static bfd_boolean
+rx_elf_relocate_section
+    (bfd *                   output_bfd,
+     struct bfd_link_info *  info,
+     bfd *                   input_bfd,
+     asection *              input_section,
+     bfd_byte *              contents,
+     Elf_Internal_Rela *     relocs,
+     Elf_Internal_Sym *      local_syms,
+     asection **             local_sections)
+{
+  Elf_Internal_Shdr *           symtab_hdr;
+  struct elf_link_hash_entry ** sym_hashes;
+  Elf_Internal_Rela *           rel;
+  Elf_Internal_Rela *           relend;
+
+  symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+  relend     = relocs + input_section->reloc_count;
+  for (rel = relocs; rel < relend; rel ++)
+    {
+      reloc_howto_type *           howto;
+      unsigned long                r_symndx;
+      Elf_Internal_Sym *           sym;
+      asection *                   sec;
+      struct elf_link_hash_entry * h;
+      bfd_vma                      relocation;
+      bfd_reloc_status_type        r;
+      const char *                 name = NULL;
+      bfd_boolean                  unresolved_reloc = TRUE;
+      int                          r_type;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      howto  = rx_elf_howto_table + ELF32_R_TYPE (rel->r_info);
+      h      = NULL;
+      sym    = NULL;
+      sec    = NULL;
+      relocation = 0;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections [r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, & sec, rel);
+
+	  name = bfd_elf_string_from_elf_section
+	    (input_bfd, symtab_hdr->sh_link, sym->st_name);
+	  name = (sym->st_name == 0) ? bfd_section_name (input_bfd, sec) : name;
+	}
+      else
+	{
+	  bfd_boolean warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes, h,
+				   sec, relocation, unresolved_reloc,
+				   warned);
+
+	  name = h->root.root.string;
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	{
+	  /* This is a relocatable link.  We don't have to change
+             anything, unless the reloc is against a section symbol,
+             in which case we have to adjust according to where the
+             section symbol winds up in the output section.  */
+	  if (sym != NULL && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+	    rel->r_addend += sec->output_offset;
+	  continue;
+	}
+
+      if (h != NULL && h->root.type == bfd_link_hash_undefweak)
+	/* If the symbol is undefined and weak
+	   then the relocation resolves to zero.  */
+	relocation = 0;
+      else
+	{
+	  if (howto->pc_relative)
+	    {
+	      relocation -= (input_section->output_section->vma
+			     + input_section->output_offset
+			     + rel->r_offset);
+	      if (r_type != R_RX_RH_3_PCREL
+		  && r_type != R_RX_DIR3U_PCREL)
+		relocation ++;
+	    }
+
+	  relocation += rel->r_addend;
+	}
+
+      r = bfd_reloc_ok;
+
+#define RANGE(a,b) if (a > (long) relocation || (long) relocation > b) r = bfd_reloc_overflow
+#define ALIGN(m)   if (relocation & m) r = bfd_reloc_other;
+#define OP(i)      (contents[rel->r_offset + (i)])
+#define WARN_REDHAT(type) \
+      _bfd_error_handler (_("%B:%A: Warning: deprecated Red Hat reloc " type " detected against: %s."), \
+      input_bfd, input_section, name)
+
+      /* Opcode relocs are always big endian.  Data relocs are bi-endian.  */
+      switch (r_type)
+	{
+	case R_RX_NONE:
+	  break;
+
+	case R_RX_RH_RELAX:
+	  break;
+
+	case R_RX_RH_3_PCREL:
+	  WARN_REDHAT ("RX_RH_3_PCREL");
+	  RANGE (3, 10);
+	  OP (0) &= 0xf8;
+	  OP (0) |= relocation & 0x07;
+	  break;
+
+	case R_RX_RH_8_NEG:
+	  WARN_REDHAT ("RX_RH_8_NEG");
+	  relocation = - relocation;
+	case R_RX_DIR8S_PCREL:
+	  RANGE (-128, 127);
+	  OP (0) = relocation;
+	  break;
+
+	case R_RX_DIR8S:
+	  RANGE (-128, 255);
+	  OP (0) = relocation;
+	  break;
+
+	case R_RX_DIR8U:
+	  RANGE (0, 255);
+	  OP (0) = relocation;
+	  break;
+
+	case R_RX_RH_16_NEG:
+	  WARN_REDHAT ("RX_RH_16_NEG");
+	  relocation = - relocation;
+	case R_RX_DIR16S_PCREL:
+	  RANGE (-32768, 32767);
+#if RX_OPCODE_BIG_ENDIAN
+#else
+	  OP (0) = relocation;
+	  OP (1) = relocation >> 8;
+#endif
+	  break;
+
+	case R_RX_RH_16_OP:
+	  WARN_REDHAT ("RX_RH_16_OP");
+	  RANGE (-32768, 32767);
+#if RX_OPCODE_BIG_ENDIAN
+	  OP (1) = relocation;
+	  OP (0) = relocation >> 8;
+#else
+	  OP (0) = relocation;
+	  OP (1) = relocation >> 8;
+#endif
+	  break;
+
+	case R_RX_DIR16S:
+	  RANGE (-32768, 65535);
+	  if (BIGE (output_bfd) && !(input_section->flags & SEC_CODE))
+	    {
+	      OP (1) = relocation;
+	      OP (0) = relocation >> 8;
+	    }
+	  else
+	    {
+	      OP (0) = relocation;
+	      OP (1) = relocation >> 8;
+	    }
+	  break;
+
+	case R_RX_DIR16U:
+	  RANGE (0, 65536);
+#if RX_OPCODE_BIG_ENDIAN
+	  OP (1) = relocation;
+	  OP (0) = relocation >> 8;
+#else
+	  OP (0) = relocation;
+	  OP (1) = relocation >> 8;
+#endif
+	  break;
+
+	case R_RX_DIR16:
+	  RANGE (-32768, 65536);
+#if RX_OPCODE_BIG_ENDIAN
+	  OP (1) = relocation;
+	  OP (0) = relocation >> 8;
+#else
+	  OP (0) = relocation;
+	  OP (1) = relocation >> 8;
+#endif
+	  break;
+
+	case R_RX_DIR16_REV:
+	  RANGE (-32768, 65536);
+#if RX_OPCODE_BIG_ENDIAN
+	  OP (0) = relocation;
+	  OP (1) = relocation >> 8;
+#else
+	  OP (1) = relocation;
+	  OP (0) = relocation >> 8;
+#endif
+	  break;
+
+	case R_RX_DIR3U_PCREL:
+	  RANGE (3, 10);
+	  OP (0) &= 0xf8;
+	  OP (0) |= relocation & 0x07;
+	  break;
+
+	case R_RX_RH_24_NEG:
+	  WARN_REDHAT ("RX_RH_24_NEG");
+	  relocation = - relocation;
+	case R_RX_DIR24S_PCREL:
+	  RANGE (-0x800000, 0x7fffff);
+#if RX_OPCODE_BIG_ENDIAN
+	  OP (2) = relocation;
+	  OP (1) = relocation >> 8;
+	  OP (0) = relocation >> 16;
+#else
+	  OP (0) = relocation;
+	  OP (1) = relocation >> 8;
+	  OP (2) = relocation >> 16;
+#endif
+	  break;
+
+	case R_RX_RH_24_OP:
+	  WARN_REDHAT ("RX_RH_24_OP");
+	  RANGE (-0x800000, 0x7fffff);
+#if RX_OPCODE_BIG_ENDIAN
+	  OP (2) = relocation;
+	  OP (1) = relocation >> 8;
+	  OP (0) = relocation >> 16;
+#else
+	  OP (0) = relocation;
+	  OP (1) = relocation >> 8;
+	  OP (2) = relocation >> 16;
+#endif
+	  break;
+
+	case R_RX_DIR24S:
+	  RANGE (-0x800000, 0x7fffff);
+	  if (BIGE (output_bfd) && !(input_section->flags & SEC_CODE))
+	    {
+	      OP (2) = relocation;
+	      OP (1) = relocation >> 8;
+	      OP (0) = relocation >> 16;
+	    }
+	  else
+	    {
+	      OP (0) = relocation;
+	      OP (1) = relocation >> 8;
+	      OP (2) = relocation >> 16;
+	    }
+	  break;
+
+	case R_RX_RH_24_UNS:
+	  WARN_REDHAT ("RX_RH_24_UNS");
+	  RANGE (0, 0xffffff);
+#if RX_OPCODE_BIG_ENDIAN
+	  OP (2) = relocation;
+	  OP (1) = relocation >> 8;
+	  OP (0) = relocation >> 16;
+#else
+	  OP (0) = relocation;
+	  OP (1) = relocation >> 8;
+	  OP (2) = relocation >> 16;
+#endif
+	  break;
+
+	case R_RX_RH_32_NEG:
+	  WARN_REDHAT ("RX_RH_32_NEG");
+	  relocation = - relocation;
+#if RX_OPCODE_BIG_ENDIAN
+	  OP (3) = relocation;
+	  OP (2) = relocation >> 8;
+	  OP (1) = relocation >> 16;
+	  OP (0) = relocation >> 24;
+#else
+	  OP (0) = relocation;
+	  OP (1) = relocation >> 8;
+	  OP (2) = relocation >> 16;
+	  OP (3) = relocation >> 24;
+#endif
+	  break;
+
+	case R_RX_RH_32_OP:
+	  WARN_REDHAT ("RX_RH_32_OP");
+#if RX_OPCODE_BIG_ENDIAN
+	  OP (3) = relocation;
+	  OP (2) = relocation >> 8;
+	  OP (1) = relocation >> 16;
+	  OP (0) = relocation >> 24;
+#else
+	  OP (0) = relocation;
+	  OP (1) = relocation >> 8;
+	  OP (2) = relocation >> 16;
+	  OP (3) = relocation >> 24;
+#endif
+	  break;
+
+	case R_RX_DIR32:
+	  if (BIGE (output_bfd) && !(input_section->flags & SEC_CODE))
+	    {
+	      OP (3) = relocation;
+	      OP (2) = relocation >> 8;
+	      OP (1) = relocation >> 16;
+	      OP (0) = relocation >> 24;
+	    }
+	  else
+	    {
+	      OP (0) = relocation;
+	      OP (1) = relocation >> 8;
+	      OP (2) = relocation >> 16;
+	      OP (3) = relocation >> 24;
+	    }
+	  break;
+
+	case R_RX_DIR32_REV:
+	  if (BIGE (output_bfd))
+	    {
+	      OP (0) = relocation;
+	      OP (1) = relocation >> 8;
+	      OP (2) = relocation >> 16;
+	      OP (3) = relocation >> 24;
+	    }
+	  else
+	    {
+	      OP (3) = relocation;
+	      OP (2) = relocation >> 8;
+	      OP (1) = relocation >> 16;
+	      OP (0) = relocation >> 24;
+	    }
+	  break;
+
+	case R_RX_RH_DIFF:
+	  {
+	    bfd_vma val;
+	    WARN_REDHAT ("RX_RH_DIFF");
+	    val = bfd_get_32 (output_bfd, & OP (0));
+	    val -= relocation;
+	    bfd_put_32 (output_bfd, val, & OP (0));
+	  }
+	  break;
+
+	case R_RX_RH_GPRELB:
+	  WARN_REDHAT ("RX_RH_GPRELB");
+	  relocation -= get_gp (&r, info, input_bfd, input_section, rel->r_offset);
+	  RANGE (0, 65535);
+#if RX_OPCODE_BIG_ENDIAN
+	  OP (1) = relocation;
+	  OP (0) = relocation >> 8;
+#else
+	  OP (0) = relocation;
+	  OP (1) = relocation >> 8;
+#endif
+	  break;
+
+	case R_RX_RH_GPRELW:
+	  WARN_REDHAT ("RX_RH_GPRELW");
+	  relocation -= get_gp (&r, info, input_bfd, input_section, rel->r_offset);
+	  ALIGN (1);
+	  relocation >>= 1;
+	  RANGE (0, 65535);
+#if RX_OPCODE_BIG_ENDIAN
+	  OP (1) = relocation;
+	  OP (0) = relocation >> 8;
+#else
+	  OP (0) = relocation;
+	  OP (1) = relocation >> 8;
+#endif
+	  break;
+
+	case R_RX_RH_GPRELL:
+	  WARN_REDHAT ("RX_RH_GPRELL");
+	  relocation -= get_gp (&r, info, input_bfd, input_section, rel->r_offset);
+	  ALIGN (3);
+	  relocation >>= 2;
+	  RANGE (0, 65535);
+#if RX_OPCODE_BIG_ENDIAN
+	  OP (1) = relocation;
+	  OP (0) = relocation >> 8;
+#else
+	  OP (0) = relocation;
+	  OP (1) = relocation >> 8;
+#endif
+	  break;
+
+	/* Internal relocations just for relaxation:  */
+	case R_RX_RH_ABS5p5B:
+	  RX_STACK_POP (relocation);
+	  RANGE (0, 31);
+	  OP (0) &= 0xf8;
+	  OP (0) |= relocation >> 2;
+	  OP (1) &= 0x77;
+	  OP (1) |= (relocation << 6) & 0x80;
+	  OP (1) |= (relocation << 3) & 0x08;
+	  break;
+
+	case R_RX_RH_ABS5p5W:
+	  RX_STACK_POP (relocation);
+	  RANGE (0, 62);
+	  ALIGN (1);
+	  relocation >>= 1;
+	  OP (0) &= 0xf8;
+	  OP (0) |= relocation >> 2;
+	  OP (1) &= 0x77;
+	  OP (1) |= (relocation << 6) & 0x80;
+	  OP (1) |= (relocation << 3) & 0x08;
+	  break;
+
+	case R_RX_RH_ABS5p5L:
+	  RX_STACK_POP (relocation);
+	  RANGE (0, 124);
+	  ALIGN (3);
+	  relocation >>= 2;
+	  OP (0) &= 0xf8;
+	  OP (0) |= relocation >> 2;
+	  OP (1) &= 0x77;
+	  OP (1) |= (relocation << 6) & 0x80;
+	  OP (1) |= (relocation << 3) & 0x08;
+	  break;
+
+	case R_RX_RH_ABS5p8B:
+	  RX_STACK_POP (relocation);
+	  RANGE (0, 31);
+	  OP (0) &= 0x70;
+	  OP (0) |= (relocation << 3) & 0x80;
+	  OP (0) |= relocation & 0x0f;
+	  break;
+
+	case R_RX_RH_ABS5p8W:
+	  RX_STACK_POP (relocation);
+	  RANGE (0, 62);
+	  ALIGN (1);
+	  relocation >>= 1;
+	  OP (0) &= 0x70;
+	  OP (0) |= (relocation << 3) & 0x80;
+	  OP (0) |= relocation & 0x0f;
+	  break;
+
+	case R_RX_RH_ABS5p8L:
+	  RX_STACK_POP (relocation);
+	  RANGE (0, 124);
+	  ALIGN (3);
+	  relocation >>= 2;
+	  OP (0) &= 0x70;
+	  OP (0) |= (relocation << 3) & 0x80;
+	  OP (0) |= relocation & 0x0f;
+	  break;
+
+	case R_RX_RH_UIMM4p8:
+	  RANGE (0, 15);
+	  OP (0) &= 0x0f;
+	  OP (0) |= relocation << 4;
+	  break;
+
+	case R_RX_RH_UNEG4p8:
+	  RANGE (-15, 0);
+	  OP (0) &= 0x0f;
+	  OP (0) |= (-relocation) << 4;
+	  break;
+
+	  /* Complex reloc handling:  */
+
+	case R_RX_ABS32:
+	  RX_STACK_POP (relocation);
+#if RX_OPCODE_BIG_ENDIAN
+	  OP (3) = relocation;
+	  OP (2) = relocation >> 8;
+	  OP (1) = relocation >> 16;
+	  OP (0) = relocation >> 24;
+#else
+	  OP (0) = relocation;
+	  OP (1) = relocation >> 8;
+	  OP (2) = relocation >> 16;
+	  OP (3) = relocation >> 24;
+#endif
+	  break;
+
+	case R_RX_ABS32_REV:
+	  RX_STACK_POP (relocation);
+#if RX_OPCODE_BIG_ENDIAN
+	  OP (0) = relocation;
+	  OP (1) = relocation >> 8;
+	  OP (2) = relocation >> 16;
+	  OP (3) = relocation >> 24;
+#else
+	  OP (3) = relocation;
+	  OP (2) = relocation >> 8;
+	  OP (1) = relocation >> 16;
+	  OP (0) = relocation >> 24;
+#endif
+	  break;
+
+	case R_RX_ABS24S_PCREL:
+	case R_RX_ABS24S:
+	  RX_STACK_POP (relocation);
+	  RANGE (-0x800000, 0x7fffff);
+	  if (BIGE (output_bfd) && !(input_section->flags & SEC_CODE))
+	    {
+	      OP (2) = relocation;
+	      OP (1) = relocation >> 8;
+	      OP (0) = relocation >> 16;
+	    }
+	  else
+	    {
+	      OP (0) = relocation;
+	      OP (1) = relocation >> 8;
+	      OP (2) = relocation >> 16;
+	    }
+	  break;
+
+	case R_RX_ABS16:
+	  RX_STACK_POP (relocation);
+	  RANGE (-32768, 65535);
+#if RX_OPCODE_BIG_ENDIAN
+	  OP (1) = relocation;
+	  OP (0) = relocation >> 8;
+#else
+	  OP (0) = relocation;
+	  OP (1) = relocation >> 8;
+#endif
+	  break;
+
+	case R_RX_ABS16_REV:
+	  RX_STACK_POP (relocation);
+	  RANGE (-32768, 65535);
+#if RX_OPCODE_BIG_ENDIAN
+	  OP (0) = relocation;
+	  OP (1) = relocation >> 8;
+#else
+	  OP (1) = relocation;
+	  OP (0) = relocation >> 8;
+#endif
+	  break;
+
+	case R_RX_ABS16S_PCREL:
+	case R_RX_ABS16S:
+	  RX_STACK_POP (relocation);
+	  RANGE (-32768, 32767);
+	  if (BIGE (output_bfd) && !(input_section->flags & SEC_CODE))
+	    {
+	      OP (1) = relocation;
+	      OP (0) = relocation >> 8;
+	    }
+	  else
+	    {
+	      OP (0) = relocation;
+	      OP (1) = relocation >> 8;
+	    }
+	  break;
+
+	case R_RX_ABS16U:
+	  RX_STACK_POP (relocation);
+	  RANGE (0, 65536);
+#if RX_OPCODE_BIG_ENDIAN
+	  OP (1) = relocation;
+	  OP (0) = relocation >> 8;
+#else
+	  OP (0) = relocation;
+	  OP (1) = relocation >> 8;
+#endif
+	  break;
+
+	case R_RX_ABS16UL:
+	  RX_STACK_POP (relocation);
+	  relocation >>= 2;
+	  RANGE (0, 65536);
+#if RX_OPCODE_BIG_ENDIAN
+	  OP (1) = relocation;
+	  OP (0) = relocation >> 8;
+#else
+	  OP (0) = relocation;
+	  OP (1) = relocation >> 8;
+#endif
+	  break;
+
+	case R_RX_ABS16UW:
+	  RX_STACK_POP (relocation);
+	  relocation >>= 1;
+	  RANGE (0, 65536);
+#if RX_OPCODE_BIG_ENDIAN
+	  OP (1) = relocation;
+	  OP (0) = relocation >> 8;
+#else
+	  OP (0) = relocation;
+	  OP (1) = relocation >> 8;
+#endif
+	  break;
+
+	case R_RX_ABS8:
+	  RX_STACK_POP (relocation);
+	  RANGE (-128, 255);
+	  OP (0) = relocation;
+	  break;
+
+	case R_RX_ABS8U:
+	  RX_STACK_POP (relocation);
+	  RANGE (0, 255);
+	  OP (0) = relocation;
+	  break;
+
+	case R_RX_ABS8UL:
+	  RX_STACK_POP (relocation);
+	  relocation >>= 2;
+	  RANGE (0, 255);
+	  OP (0) = relocation;
+	  break;
+
+	case R_RX_ABS8UW:
+	  RX_STACK_POP (relocation);
+	  relocation >>= 1;
+	  RANGE (0, 255);
+	  OP (0) = relocation;
+	  break;
+
+	case R_RX_ABS8S_PCREL:
+	case R_RX_ABS8S:
+	  RX_STACK_POP (relocation);
+	  RANGE (-128, 127);
+	  OP (0) = relocation;
+	  break;
+
+	case R_RX_SYM:
+	  if (r_symndx < symtab_hdr->sh_info)
+	    RX_STACK_PUSH (sec->output_section->vma
+			   + sec->output_offset
+			   + sym->st_value);
+	  else
+	    {
+	      if (h != NULL
+		  && (h->root.type == bfd_link_hash_defined
+		      || h->root.type == bfd_link_hash_defweak))
+		RX_STACK_PUSH (h->root.u.def.value
+			       + sec->output_section->vma
+			       + sec->output_offset);
+	      else
+		_bfd_error_handler (_("Warning: RX_SYM reloc with an unknown symbol"));
+	    }
+	  break;
+
+	case R_RX_OPneg:
+	  {
+	    int32_t tmp;
+
+	    RX_STACK_POP (tmp);
+	    tmp = - tmp;
+	    RX_STACK_PUSH (tmp);
+	  }
+	  break;
+
+	case R_RX_OPadd:
+	  {
+	    int32_t tmp1, tmp2;
+
+	    RX_STACK_POP (tmp1);
+	    RX_STACK_POP (tmp2);
+	    tmp1 += tmp2;
+	    RX_STACK_PUSH (tmp1);
+	  }
+	  break;
+
+	case R_RX_OPsub:
+	  {
+	    int32_t tmp1, tmp2;
+
+	    RX_STACK_POP (tmp1);
+	    RX_STACK_POP (tmp2);
+	    tmp2 -= tmp1;
+	    RX_STACK_PUSH (tmp2);
+	  }
+	  break;
+
+	case R_RX_OPmul:
+	  {
+	    int32_t tmp1, tmp2;
+
+	    RX_STACK_POP (tmp1);
+	    RX_STACK_POP (tmp2);
+	    tmp1 *= tmp2;
+	    RX_STACK_PUSH (tmp1);
+	  }
+	  break;
+
+	case R_RX_OPdiv:
+	  {
+	    int32_t tmp1, tmp2;
+
+	    RX_STACK_POP (tmp1);
+	    RX_STACK_POP (tmp2);
+	    tmp1 /= tmp2;
+	    RX_STACK_PUSH (tmp1);
+	  }
+	  break;
+
+	case R_RX_OPshla:
+	  {
+	    int32_t tmp1, tmp2;
+
+	    RX_STACK_POP (tmp1);
+	    RX_STACK_POP (tmp2);
+	    tmp1 <<= tmp2;
+	    RX_STACK_PUSH (tmp1);
+	  }
+	  break;
+
+	case R_RX_OPshra:
+	  {
+	    int32_t tmp1, tmp2;
+
+	    RX_STACK_POP (tmp1);
+	    RX_STACK_POP (tmp2);
+	    tmp1 >>= tmp2;
+	    RX_STACK_PUSH (tmp1);
+	  }
+	  break;
+
+	case R_RX_OPsctsize:
+	  RX_STACK_PUSH (input_section->size);
+	  break;
+
+	case R_RX_OPscttop:
+	  RX_STACK_PUSH (input_section->output_section->vma);
+	  break;
+
+	case R_RX_OPand:
+	  {
+	    int32_t tmp1, tmp2;
+
+	    RX_STACK_POP (tmp1);
+	    RX_STACK_POP (tmp2);
+	    tmp1 &= tmp2;
+	    RX_STACK_PUSH (tmp1);
+	  }
+	  break;
+
+	case R_RX_OPor:
+	  {
+	    int32_t tmp1, tmp2;
+
+	    RX_STACK_POP (tmp1);
+	    RX_STACK_POP (tmp2);
+	    tmp1 |= tmp2;
+	    RX_STACK_PUSH (tmp1);
+	  }
+	  break;
+
+	case R_RX_OPxor:
+	  {
+	    int32_t tmp1, tmp2;
+
+	    RX_STACK_POP (tmp1);
+	    RX_STACK_POP (tmp2);
+	    tmp1 ^= tmp2;
+	    RX_STACK_PUSH (tmp1);
+	  }
+	  break;
+
+	case R_RX_OPnot:
+	  {
+	    int32_t tmp;
+
+	    RX_STACK_POP (tmp);
+	    tmp = ~ tmp;
+	    RX_STACK_PUSH (tmp);
+	  }
+	  break;
+
+	case R_RX_OPmod:
+	  {
+	    int32_t tmp1, tmp2;
+
+	    RX_STACK_POP (tmp1);
+	    RX_STACK_POP (tmp2);
+	    tmp1 %= tmp2;
+	    RX_STACK_PUSH (tmp1);
+	  }
+	  break;
+
+	case R_RX_OPromtop:
+	  RX_STACK_PUSH (get_romstart (&r, info, input_bfd, input_section, rel->r_offset));
+	  break;
+
+	case R_RX_OPramtop:
+	  RX_STACK_PUSH (get_ramstart (&r, info, input_bfd, input_section, rel->r_offset));
+	  break;
+
+	default:
+	  r = bfd_reloc_notsupported;
+	  break;
+	}
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char * msg = NULL;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      /* Catch the case of a missing function declaration
+		 and emit a more helpful error message.  */
+	      if (r_type == R_RX_DIR24S_PCREL)
+		msg = _("%B(%A): error: call to undefined function '%s'");
+	      else
+		r = info->callbacks->reloc_overflow
+		  (info, (h ? &h->root : NULL), name, howto->name, (bfd_vma) 0,
+		   input_bfd, input_section, rel->r_offset);
+	      break;
+
+	    case bfd_reloc_undefined:
+	      r = info->callbacks->undefined_symbol
+		(info, name, input_bfd, input_section, rel->r_offset,
+		 TRUE);
+	      break;
+
+	    case bfd_reloc_other:
+	      msg = _("%B(%A): warning: unaligned access to symbol '%s' in the small data area");
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("%B(%A): internal error: out of range error");
+	      break;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("%B(%A): internal error: unsupported relocation error");
+	      break;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("%B(%A): internal error: dangerous relocation");
+	      break;
+
+	    default:
+	      msg = _("%B(%A): internal error: unknown error");
+	      break;
+	    }
+
+	  if (msg)
+	    _bfd_error_handler (msg, input_bfd, input_section, name);
+
+	  if (! r)
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Relaxation Support.  */
+
+/* Progression of relocations from largest operand size to smallest
+   operand size.  */
+
+static int
+next_smaller_reloc (int r)
+{
+  switch (r)
+    {
+    case R_RX_DIR32:		return R_RX_DIR24S;
+    case R_RX_DIR24S:		return R_RX_DIR16S;
+    case R_RX_DIR16S:		return R_RX_DIR8S;
+    case R_RX_DIR8S:		return R_RX_NONE;
+
+    case R_RX_DIR16:		return R_RX_DIR8;
+    case R_RX_DIR8:		return R_RX_NONE;
+
+    case R_RX_DIR16U:		return R_RX_DIR8U;
+    case R_RX_DIR8U:		return R_RX_NONE;
+
+    case R_RX_DIR24S_PCREL:	return R_RX_DIR16S_PCREL;
+    case R_RX_DIR16S_PCREL:	return R_RX_DIR8S_PCREL;
+    case R_RX_DIR8S_PCREL:	return R_RX_DIR3U_PCREL;
+
+    case R_RX_DIR16UL:		return R_RX_DIR8UL;
+    case R_RX_DIR8UL:		return R_RX_NONE;
+    case R_RX_DIR16UW:		return R_RX_DIR8UW;
+    case R_RX_DIR8UW:		return R_RX_NONE;
+
+    case R_RX_RH_32_OP:		return R_RX_RH_24_OP;
+    case R_RX_RH_24_OP:		return R_RX_RH_16_OP;
+    case R_RX_RH_16_OP:		return R_RX_DIR8;
+
+    case R_RX_ABS32:		return R_RX_ABS24S;
+    case R_RX_ABS24S:		return R_RX_ABS16S;
+    case R_RX_ABS16:		return R_RX_ABS8;
+    case R_RX_ABS16U:		return R_RX_ABS8U;
+    case R_RX_ABS16S:		return R_RX_ABS8S;
+    case R_RX_ABS8:		return R_RX_NONE;
+    case R_RX_ABS8U:		return R_RX_NONE;
+    case R_RX_ABS8S:		return R_RX_NONE;
+    case R_RX_ABS24S_PCREL:	return R_RX_ABS16S_PCREL;
+    case R_RX_ABS16S_PCREL:	return R_RX_ABS8S_PCREL;
+    case R_RX_ABS8S_PCREL:	return R_RX_NONE;
+    case R_RX_ABS16UL:		return R_RX_ABS8UL;
+    case R_RX_ABS16UW:		return R_RX_ABS8UW;
+    case R_RX_ABS8UL:		return R_RX_NONE;
+    case R_RX_ABS8UW:		return R_RX_NONE;
+    }
+  return r;
+};
+
+/* Delete some bytes from a section while relaxing.  */
+
+static bfd_boolean
+elf32_rx_relax_delete_bytes (bfd *abfd, asection *sec, bfd_vma addr, int count,
+			     Elf_Internal_Rela *alignment_rel, int force_snip)
+{
+  Elf_Internal_Shdr * symtab_hdr;
+  unsigned int        sec_shndx;
+  bfd_byte *          contents;
+  Elf_Internal_Rela * irel;
+  Elf_Internal_Rela * irelend;
+  Elf_Internal_Sym *  isym;
+  Elf_Internal_Sym *  isymend;
+  bfd_vma             toaddr;
+  unsigned int        symcount;
+  struct elf_link_hash_entry ** sym_hashes;
+  struct elf_link_hash_entry ** end_hashes;
+
+  if (!alignment_rel)
+    force_snip = 1;
+
+  sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+  contents = elf_section_data (sec)->this_hdr.contents;
+
+  /* The deletion must stop at the next alignment boundary, if
+     ALIGNMENT_REL is non-NULL.  */
+  toaddr = sec->size;
+  if (alignment_rel)
+    toaddr = alignment_rel->r_offset;
+
+  irel = elf_section_data (sec)->relocs;
+  irelend = irel + sec->reloc_count;
+
+  /* Actually delete the bytes.  */
+  memmove (contents + addr, contents + addr + count,
+	   (size_t) (toaddr - addr - count));
+
+  /* If we don't have an alignment marker to worry about, we can just
+     shrink the section.  Otherwise, we have to fill in the newly
+     created gap with NOP insns (0x03).  */
+  if (force_snip)
+    sec->size -= count;
+  else
+    memset (contents + toaddr - count, 0x03, count);
+
+  /* Adjust all the relocs.  */
+  for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
+    {
+      /* Get the new reloc address.  */
+      if (irel->r_offset > addr
+	  && (irel->r_offset < toaddr
+	      || (force_snip && irel->r_offset == toaddr)))
+	irel->r_offset -= count;
+
+      /* If we see an ALIGN marker at the end of the gap, we move it
+	 to the beginning of the gap, since marking these gaps is what
+	 they're for.  */
+      if (irel->r_offset == toaddr
+	  && ELF32_R_TYPE (irel->r_info) == R_RX_RH_RELAX
+	  && irel->r_addend & RX_RELAXA_ALIGN)
+	irel->r_offset -= count;
+    }
+
+  /* Adjust the local symbols defined in this section.  */
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  isym = (Elf_Internal_Sym *) symtab_hdr->contents;
+  isymend = isym + symtab_hdr->sh_info;
+
+  for (; isym < isymend; isym++)
+    {
+      /* If the symbol is in the range of memory we just moved, we
+	 have to adjust its value.  */
+      if (isym->st_shndx == sec_shndx
+	  && isym->st_value > addr
+	  && isym->st_value < toaddr)
+	isym->st_value -= count;
+
+      /* If the symbol *spans* the bytes we just deleted (i.e. it's
+	 *end* is in the moved bytes but it's *start* isn't), then we
+	 must adjust its size.  */
+      if (isym->st_shndx == sec_shndx
+	  && isym->st_value < addr
+	  && isym->st_value + isym->st_size > addr
+	  && isym->st_value + isym->st_size < toaddr)
+	isym->st_size -= count;
+    }
+
+  /* Now adjust the global symbols defined in this section.  */
+  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+	      - symtab_hdr->sh_info);
+  sym_hashes = elf_sym_hashes (abfd);
+  end_hashes = sym_hashes + symcount;
+
+  for (; sym_hashes < end_hashes; sym_hashes++)
+    {
+      struct elf_link_hash_entry *sym_hash = *sym_hashes;
+
+      if ((sym_hash->root.type == bfd_link_hash_defined
+	   || sym_hash->root.type == bfd_link_hash_defweak)
+	  && sym_hash->root.u.def.section == sec)
+	{
+	  /* As above, adjust the value if needed.  */
+	  if (sym_hash->root.u.def.value > addr
+	      && sym_hash->root.u.def.value < toaddr)
+	    sym_hash->root.u.def.value -= count;
+
+	  /* As above, adjust the size if needed.  */
+	  if (sym_hash->root.u.def.value < addr
+	      && sym_hash->root.u.def.value + sym_hash->size > addr
+	      && sym_hash->root.u.def.value + sym_hash->size < toaddr)
+	    sym_hash->size -= count;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Used to sort relocs by address.  If relocs have the same address,
+   we maintain their relative order, except that R_RX_RH_RELAX
+   alignment relocs must be the first reloc for any given address.  */
+
+static void
+reloc_bubblesort (Elf_Internal_Rela * r, int count)
+{
+  int i;
+  bfd_boolean again;
+  bfd_boolean swappit;
+
+  /* This is almost a classic bubblesort.  It's the slowest sort, but
+     we're taking advantage of the fact that the relocations are
+     mostly in order already (the assembler emits them that way) and
+     we need relocs with the same address to remain in the same
+     relative order.  */
+  again = TRUE;
+  while (again)
+    {
+      again = FALSE;
+      for (i = 0; i < count - 1; i ++)
+	{
+	  if (r[i].r_offset > r[i + 1].r_offset)
+	    swappit = TRUE;
+	  else if (r[i].r_offset < r[i + 1].r_offset)
+	    swappit = FALSE;
+	  else if (ELF32_R_TYPE (r[i + 1].r_info) == R_RX_RH_RELAX
+		   && (r[i + 1].r_addend & RX_RELAXA_ALIGN))
+	    swappit = TRUE;
+	  else if (ELF32_R_TYPE (r[i + 1].r_info) == R_RX_RH_RELAX
+		   && (r[i + 1].r_addend & RX_RELAXA_ELIGN)
+		   && !(ELF32_R_TYPE (r[i].r_info) == R_RX_RH_RELAX
+			&& (r[i].r_addend & RX_RELAXA_ALIGN)))
+	    swappit = TRUE;
+	  else
+	    swappit = FALSE;
+
+	  if (swappit)
+	    {
+	      Elf_Internal_Rela tmp;
+
+	      tmp = r[i];
+	      r[i] = r[i + 1];
+	      r[i + 1] = tmp;
+	      /* If we do move a reloc back, re-scan to see if it
+		 needs to be moved even further back.  This avoids
+		 most of the O(n^2) behavior for our cases.  */
+	      if (i > 0)
+		i -= 2;
+	      again = TRUE;
+	    }
+	}
+    }
+}
+
+
+#define OFFSET_FOR_RELOC(rel, lrel, scale) \
+  rx_offset_for_reloc (abfd, rel + 1, symtab_hdr, shndx_buf, intsyms, \
+		       lrel, abfd, sec, link_info, scale)
+
+static bfd_vma
+rx_offset_for_reloc (bfd *                    abfd,
+		     Elf_Internal_Rela *      rel,
+		     Elf_Internal_Shdr *      symtab_hdr,
+		     Elf_External_Sym_Shndx * shndx_buf ATTRIBUTE_UNUSED,
+		     Elf_Internal_Sym *       intsyms,
+		     Elf_Internal_Rela **     lrel,
+		     bfd *                    input_bfd,
+		     asection *               input_section,
+		     struct bfd_link_info *   info,
+		     int *                    scale)
+{
+  bfd_vma symval;
+  bfd_reloc_status_type r;
+
+  *scale = 1;
+
+  /* REL is the first of 1..N relocations.  We compute the symbol
+     value for each relocation, then combine them if needed.  LREL
+     gets a pointer to the last relocation used.  */
+  while (1)
+    {
+      int32_t tmp1, tmp2;
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      if (ELF32_R_SYM (rel->r_info) < symtab_hdr->sh_info)
+	{
+	  /* A local symbol.  */
+	  Elf_Internal_Sym *isym;
+	  asection *ssec;
+
+	  isym = intsyms + ELF32_R_SYM (rel->r_info);
+
+	  if (isym->st_shndx == SHN_UNDEF)
+	    ssec = bfd_und_section_ptr;
+	  else if (isym->st_shndx == SHN_ABS)
+	    ssec = bfd_abs_section_ptr;
+	  else if (isym->st_shndx == SHN_COMMON)
+	    ssec = bfd_com_section_ptr;
+	  else
+	    ssec = bfd_section_from_elf_index (abfd,
+					       isym->st_shndx);
+
+	  /* Initial symbol value.  */
+	  symval = isym->st_value;
+
+	  /* GAS may have made this symbol relative to a section, in
+	     which case, we have to add the addend to find the
+	     symbol.  */
+	  if (ELF_ST_TYPE (isym->st_info) == STT_SECTION)
+	    symval += rel->r_addend;
+
+	  if (ssec)
+	    {
+	      if ((ssec->flags & SEC_MERGE)
+		  && ssec->sec_info_type == ELF_INFO_TYPE_MERGE)
+		symval = _bfd_merged_section_offset (abfd, & ssec,
+						     elf_section_data (ssec)->sec_info,
+						     symval);
+	    }
+
+	  /* Now make the offset relative to where the linker is putting it.  */
+	  if (ssec)
+	    symval +=
+	      ssec->output_section->vma + ssec->output_offset;
+
+	  symval += rel->r_addend;
+	}
+      else
+	{
+	  unsigned long indx;
+	  struct elf_link_hash_entry * h;
+
+	  /* An external symbol.  */
+	  indx = ELF32_R_SYM (rel->r_info) - symtab_hdr->sh_info;
+	  h = elf_sym_hashes (abfd)[indx];
+	  BFD_ASSERT (h != NULL);
+
+	  if (h->root.type != bfd_link_hash_defined
+	      && h->root.type != bfd_link_hash_defweak)
+	    {
+	      /* This appears to be a reference to an undefined
+		 symbol.  Just ignore it--it will be caught by the
+		 regular reloc processing.  */
+	      if (lrel)
+		*lrel = rel;
+	      return 0;
+	    }
+
+	  symval = (h->root.u.def.value
+		    + h->root.u.def.section->output_section->vma
+		    + h->root.u.def.section->output_offset);
+
+	  symval += rel->r_addend;
+	}
+
+      switch (ELF32_R_TYPE (rel->r_info))
+	{
+	case R_RX_SYM:
+	  RX_STACK_PUSH (symval);
+	  break;
+
+	case R_RX_OPneg:
+	  RX_STACK_POP (tmp1);
+	  tmp1 = - tmp1;
+	  RX_STACK_PUSH (tmp1);
+	  break;
+
+	case R_RX_OPadd:
+	  RX_STACK_POP (tmp1);
+	  RX_STACK_POP (tmp2);
+	  tmp1 += tmp2;
+	  RX_STACK_PUSH (tmp1);
+	  break;
+
+	case R_RX_OPsub:
+	  RX_STACK_POP (tmp1);
+	  RX_STACK_POP (tmp2);
+	  tmp2 -= tmp1;
+	  RX_STACK_PUSH (tmp2);
+	  break;
+
+	case R_RX_OPmul:
+	  RX_STACK_POP (tmp1);
+	  RX_STACK_POP (tmp2);
+	  tmp1 *= tmp2;
+	  RX_STACK_PUSH (tmp1);
+	  break;
+
+	case R_RX_OPdiv:
+	  RX_STACK_POP (tmp1);
+	  RX_STACK_POP (tmp2);
+	  tmp1 /= tmp2;
+	  RX_STACK_PUSH (tmp1);
+	  break;
+
+	case R_RX_OPshla:
+	  RX_STACK_POP (tmp1);
+	  RX_STACK_POP (tmp2);
+	  tmp1 <<= tmp2;
+	  RX_STACK_PUSH (tmp1);
+	  break;
+
+	case R_RX_OPshra:
+	  RX_STACK_POP (tmp1);
+	  RX_STACK_POP (tmp2);
+	  tmp1 >>= tmp2;
+	  RX_STACK_PUSH (tmp1);
+	  break;
+
+	case R_RX_OPsctsize:
+	  RX_STACK_PUSH (input_section->size);
+	  break;
+
+	case R_RX_OPscttop:
+	  RX_STACK_PUSH (input_section->output_section->vma);
+	  break;
+
+	case R_RX_OPand:
+	  RX_STACK_POP (tmp1);
+	  RX_STACK_POP (tmp2);
+	  tmp1 &= tmp2;
+	  RX_STACK_PUSH (tmp1);
+	  break;
+
+	case R_RX_OPor:
+	  RX_STACK_POP (tmp1);
+	  RX_STACK_POP (tmp2);
+	  tmp1 |= tmp2;
+	  RX_STACK_PUSH (tmp1);
+	  break;
+
+	case R_RX_OPxor:
+	  RX_STACK_POP (tmp1);
+	  RX_STACK_POP (tmp2);
+	  tmp1 ^= tmp2;
+	  RX_STACK_PUSH (tmp1);
+	  break;
+
+	case R_RX_OPnot:
+	  RX_STACK_POP (tmp1);
+	  tmp1 = ~ tmp1;
+	  RX_STACK_PUSH (tmp1);
+	  break;
+
+	case R_RX_OPmod:
+	  RX_STACK_POP (tmp1);
+	  RX_STACK_POP (tmp2);
+	  tmp1 %= tmp2;
+	  RX_STACK_PUSH (tmp1);
+	  break;
+
+	case R_RX_OPromtop:
+	  RX_STACK_PUSH (get_romstart (&r, info, input_bfd, input_section, rel->r_offset));
+	  break;
+
+	case R_RX_OPramtop:
+	  RX_STACK_PUSH (get_ramstart (&r, info, input_bfd, input_section, rel->r_offset));
+	  break;
+
+	case R_RX_DIR16UL:
+	case R_RX_DIR8UL:
+	case R_RX_ABS16UL:
+	case R_RX_ABS8UL:
+	  if (rx_stack_top)
+	    RX_STACK_POP (symval);
+	  if (lrel)
+	    *lrel = rel;
+	  *scale = 4;
+	  return symval;
+
+	case R_RX_DIR16UW:
+	case R_RX_DIR8UW:
+	case R_RX_ABS16UW:
+	case R_RX_ABS8UW:
+	  if (rx_stack_top)
+	    RX_STACK_POP (symval);
+	  if (lrel)
+	    *lrel = rel;
+	  *scale = 2;
+	  return symval;
+
+	default:
+	  if (rx_stack_top)
+	    RX_STACK_POP (symval);
+	  if (lrel)
+	    *lrel = rel;
+	  return symval;
+	}
+
+      rel ++;
+    }
+}
+
+static void
+move_reloc (Elf_Internal_Rela * irel, Elf_Internal_Rela * srel, int delta)
+{
+  bfd_vma old_offset = srel->r_offset;
+
+  irel ++;
+  while (irel <= srel)
+    {
+      if (irel->r_offset == old_offset)
+	irel->r_offset += delta;
+      irel ++;
+    }
+}
+
+/* Relax one section.  */
+
+static bfd_boolean
+elf32_rx_relax_section (bfd *                  abfd,
+			asection *             sec,
+			struct bfd_link_info * link_info,
+			bfd_boolean *          again,
+			bfd_boolean            allow_pcrel3)
+{
+  Elf_Internal_Shdr * symtab_hdr;
+  Elf_Internal_Shdr * shndx_hdr;
+  Elf_Internal_Rela * internal_relocs;
+  Elf_Internal_Rela * free_relocs = NULL;
+  Elf_Internal_Rela * irel;
+  Elf_Internal_Rela * srel;
+  Elf_Internal_Rela * irelend;
+  Elf_Internal_Rela * next_alignment;
+  Elf_Internal_Rela * prev_alignment;
+  bfd_byte *          contents = NULL;
+  bfd_byte *          free_contents = NULL;
+  Elf_Internal_Sym *  intsyms = NULL;
+  Elf_Internal_Sym *  free_intsyms = NULL;
+  Elf_External_Sym_Shndx * shndx_buf = NULL;
+  bfd_vma pc;
+  bfd_vma sec_start;
+  bfd_vma symval = 0;
+  int pcrel = 0;
+  int code = 0;
+  int section_alignment_glue;
+  /* how much to scale the relocation by - 1, 2, or 4.  */
+  int scale;
+
+  /* Assume nothing changes.  */
+  *again = FALSE;
+
+  /* We don't have to do anything for a relocatable link, if
+     this section does not have relocs, or if this is not a
+     code section.  */
+  if (link_info->relocatable
+      || (sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0
+      || (sec->flags & SEC_CODE) == 0)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  shndx_hdr = &elf_tdata (abfd)->symtab_shndx_hdr;
+
+  sec_start = sec->output_section->vma + sec->output_offset;
+
+  /* Get the section contents.  */
+  if (elf_section_data (sec)->this_hdr.contents != NULL)
+    contents = elf_section_data (sec)->this_hdr.contents;
+  /* Go get them off disk.  */
+  else
+    {
+      if (! bfd_malloc_and_get_section (abfd, sec, &contents))
+	goto error_return;
+      elf_section_data (sec)->this_hdr.contents = contents;
+    }
+
+  /* Read this BFD's symbols.  */
+  /* Get cached copy if it exists.  */
+  if (symtab_hdr->contents != NULL)
+    intsyms = (Elf_Internal_Sym *) symtab_hdr->contents;
+  else
+    {
+      intsyms = bfd_elf_get_elf_syms (abfd, symtab_hdr, symtab_hdr->sh_info, 0, NULL, NULL, NULL);
+      symtab_hdr->contents = (bfd_byte *) intsyms;
+    }
+
+  if (shndx_hdr->sh_size != 0)
+    {
+      bfd_size_type amt;
+
+      amt = symtab_hdr->sh_info;
+      amt *= sizeof (Elf_External_Sym_Shndx);
+      shndx_buf = (Elf_External_Sym_Shndx *) bfd_malloc (amt);
+      if (shndx_buf == NULL)
+	goto error_return;
+      if (bfd_seek (abfd, shndx_hdr->sh_offset, SEEK_SET) != 0
+	  || bfd_bread ((PTR) shndx_buf, amt, abfd) != amt)
+	goto error_return;
+      shndx_hdr->contents = (bfd_byte *) shndx_buf;
+    }
+
+  /* Get a copy of the native relocations.  */
+  internal_relocs = (_bfd_elf_link_read_relocs
+		     (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
+		      link_info->keep_memory));
+  if (internal_relocs == NULL)
+    goto error_return;
+  if (! link_info->keep_memory)
+    free_relocs = internal_relocs;
+
+  /* The RL_ relocs must be just before the operand relocs they go
+     with, so we must sort them to guarantee this.  We use bubblesort
+     instead of qsort so we can guarantee that relocs with the same
+     address remain in the same relative order.  */
+  reloc_bubblesort (internal_relocs, sec->reloc_count);
+
+  /* Walk through them looking for relaxing opportunities.  */
+  irelend = internal_relocs + sec->reloc_count;
+
+  /* This will either be NULL or a pointer to the next alignment
+     relocation.  */
+  next_alignment = internal_relocs;
+  /* This will be the previous alignment, although at first it points
+     to the first real relocation.  */
+  prev_alignment = internal_relocs;
+
+  /* We calculate worst case shrinkage caused by alignment directives.
+     No fool-proof, but better than either ignoring the problem or
+     doing heavy duty analysis of all the alignment markers in all
+     input sections.  */
+  section_alignment_glue = 0;
+  for (irel = internal_relocs; irel < irelend; irel++)
+      if (ELF32_R_TYPE (irel->r_info) == R_RX_RH_RELAX
+	  && irel->r_addend & RX_RELAXA_ALIGN)
+	{
+	  int this_glue = 1 << (irel->r_addend & RX_RELAXA_ANUM);
+
+	  if (section_alignment_glue < this_glue)
+	    section_alignment_glue = this_glue;
+	}
+  /* Worst case is all 0..N alignments, in order, causing 2*N-1 byte
+     shrinkage.  */
+  section_alignment_glue *= 2;
+
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      unsigned char *insn;
+      int nrelocs;
+
+      /* The insns we care about are all marked with one of these.  */
+      if (ELF32_R_TYPE (irel->r_info) != R_RX_RH_RELAX)
+	continue;
+
+      if (irel->r_addend & RX_RELAXA_ALIGN
+	  || next_alignment == internal_relocs)
+	{
+	  /* When we delete bytes, we need to maintain all the alignments
+	     indicated.  In addition, we need to be careful about relaxing
+	     jumps across alignment boundaries - these displacements
+	     *grow* when we delete bytes.  For now, don't shrink
+	     displacements across an alignment boundary, just in case.
+	     Note that this only affects relocations to the same
+	     section.  */
+	  prev_alignment = next_alignment;
+	  next_alignment += 2;
+	  while (next_alignment < irelend
+		 && (ELF32_R_TYPE (next_alignment->r_info) != R_RX_RH_RELAX
+		     || !(next_alignment->r_addend & RX_RELAXA_ELIGN)))
+	    next_alignment ++;
+	  if (next_alignment >= irelend || next_alignment->r_offset == 0)
+	    next_alignment = NULL;
+	}
+
+      /* When we hit alignment markers, see if we've shrunk enough
+	 before them to reduce the gap without violating the alignment
+	 requirements.  */
+      if (irel->r_addend & RX_RELAXA_ALIGN)
+	{
+	  /* At this point, the next relocation *should* be the ELIGN
+	     end marker.  */
+	  Elf_Internal_Rela *erel = irel + 1;
+	  unsigned int alignment, nbytes;
+
+	  if (ELF32_R_TYPE (erel->r_info) != R_RX_RH_RELAX)
+	    continue;
+	  if (!(erel->r_addend & RX_RELAXA_ELIGN))
+	    continue;
+
+	  alignment = 1 << (irel->r_addend & RX_RELAXA_ANUM);
+
+	  if (erel->r_offset - irel->r_offset < alignment)
+	    continue;
+
+	  nbytes = erel->r_offset - irel->r_offset;
+	  nbytes /= alignment;
+	  nbytes *= alignment;
+
+	  elf32_rx_relax_delete_bytes (abfd, sec, erel->r_offset-nbytes, nbytes, next_alignment,
+				       erel->r_offset == sec->size);
+	  *again = TRUE;
+
+	  continue;
+	}
+
+      if (irel->r_addend & RX_RELAXA_ELIGN)
+	  continue;
+
+      insn = contents + irel->r_offset;
+
+      nrelocs = irel->r_addend & RX_RELAXA_RNUM;
+
+      /* At this point, we have an insn that is a candidate for linker
+	 relaxation.  There are NRELOCS relocs following that may be
+	 relaxed, although each reloc may be made of more than one
+	 reloc entry (such as gp-rel symbols).  */
+
+      /* Get the value of the symbol referred to by the reloc.  Just
+         in case this is the last reloc in the list, use the RL's
+         addend to choose between this reloc (no addend) or the next
+         (yes addend, which means at least one following reloc).  */
+
+      /* srel points to the "current" reloction for this insn -
+	 actually the last reloc for a given operand, which is the one
+	 we need to update.  We check the relaxations in the same
+	 order that the relocations happen, so we'll just push it
+	 along as we go.  */
+      srel = irel;
+
+      pc = sec->output_section->vma + sec->output_offset
+	+ srel->r_offset;
+
+#define GET_RELOC \
+      symval = OFFSET_FOR_RELOC (srel, &srel, &scale); \
+      pcrel = symval - pc + srel->r_addend; \
+      nrelocs --;
+
+#define SNIPNR(offset, nbytes) \
+	elf32_rx_relax_delete_bytes (abfd, sec, (insn - contents) + offset, nbytes, next_alignment, 0);
+#define SNIP(offset, nbytes, newtype) \
+        SNIPNR (offset, nbytes);						\
+	srel->r_info = ELF32_R_INFO (ELF32_R_SYM (srel->r_info), newtype)
+
+      /* The order of these bit tests must match the order that the
+	 relocs appear in.  Since we sorted those by offset, we can
+	 predict them.  */
+
+      /* Note that the numbers in, say, DSP6 are the bit offsets of
+	 the code fields that describe the operand.  Bits number 0 for
+	 the MSB of insn[0].  */
+
+      /* DSP* codes:
+	   0  00  [reg]
+	   1  01  dsp:8[reg]
+	   2  10  dsp:16[reg]
+	   3  11  reg  */
+      if (irel->r_addend & RX_RELAXA_DSP6)
+	{
+	  GET_RELOC;
+
+	  code = insn[0] & 3;
+	  if (code == 2 && symval/scale <= 255)
+	    {
+	      unsigned int newrel = ELF32_R_TYPE (srel->r_info);
+	      insn[0] &= 0xfc;
+	      insn[0] |= 0x01;
+	      newrel = next_smaller_reloc (ELF32_R_TYPE (srel->r_info));
+	      if (newrel != ELF32_R_TYPE (srel->r_info))
+		{
+		  SNIP (3, 1, newrel);
+		  *again = TRUE;
+		}
+	    }
+
+	  else if (code == 1 && symval == 0)
+	    {
+	      insn[0] &= 0xfc;
+	      SNIP (2, 1, R_RX_NONE);
+	      *again = TRUE;
+	    }
+
+	  /* Special case DSP:5 format: MOV.bwl dsp:5[Rsrc],Rdst.  */
+	  else if (code == 1 && symval/scale <= 31
+		   /* Decodable bits.  */
+		   && (insn[0] & 0xcc) == 0xcc
+		   /* Width.  */
+		   && (insn[0] & 0x30) != 3
+		   /* Register MSBs.  */
+		   && (insn[1] & 0x88)  == 0x00)
+	    {
+	      int newrel = 0;
+
+	      insn[0] = 0x88 | (insn[0] & 0x30);
+	      /* The register fields are in the right place already.  */
+
+	      /* We can't relax this new opcode.  */
+	      irel->r_addend = 0;
+
+	      switch ((insn[0] & 0x30) >> 4)
+		{
+		case 0:
+		  newrel = R_RX_RH_ABS5p5B;
+		  break;
+		case 1:
+		  newrel = R_RX_RH_ABS5p5W;
+		  break;
+		case 2:
+		  newrel = R_RX_RH_ABS5p5L;
+		  break;
+		}
+
+	      move_reloc (irel, srel, -2);
+	      SNIP (2, 1, newrel);
+	    }
+
+	  /* Special case DSP:5 format: MOVU.bw dsp:5[Rsrc],Rdst.  */
+	  else if (code == 1 && symval/scale <= 31
+		   /* Decodable bits.  */
+		   && (insn[0] & 0xf8) == 0x58
+		   /* Register MSBs.  */
+		   && (insn[1] & 0x88)  == 0x00)
+	    {
+	      int newrel = 0;
+
+	      insn[0] = 0xb0 | ((insn[0] & 0x04) << 1);
+	      /* The register fields are in the right place already.  */
+
+	      /* We can't relax this new opcode.  */
+	      irel->r_addend = 0;
+
+	      switch ((insn[0] & 0x08) >> 3)
+		{
+		case 0:
+		  newrel = R_RX_RH_ABS5p5B;
+		  break;
+		case 1:
+		  newrel = R_RX_RH_ABS5p5W;
+		  break;
+		}
+
+	      move_reloc (irel, srel, -2);
+	      SNIP (2, 1, newrel);
+	    }
+	}
+
+      /* A DSP4 operand always follows a DSP6 operand, even if there's
+	 no relocation for it.  We have to read the code out of the
+	 opcode to calculate the offset of the operand.  */
+      if (irel->r_addend & RX_RELAXA_DSP4)
+	{
+	  int code6, offset = 0;
+
+	  GET_RELOC;
+
+	  code6 = insn[0] & 0x03;
+	  switch (code6)
+	    {
+	    case 0: offset = 2; break;
+	    case 1: offset = 3; break;
+	    case 2: offset = 4; break;
+	    case 3: offset = 2; break;
+	    }
+
+	  code = (insn[0] & 0x0c) >> 2;
+
+	  if (code == 2 && symval / scale <= 255)
+	    {
+	      unsigned int newrel = ELF32_R_TYPE (srel->r_info);
+
+	      insn[0] &= 0xf3;
+	      insn[0] |= 0x04;
+	      newrel = next_smaller_reloc (ELF32_R_TYPE (srel->r_info));
+	      if (newrel != ELF32_R_TYPE (srel->r_info))
+		{
+		  SNIP (offset+1, 1, newrel);
+		  *again = TRUE;
+		}
+	    }
+
+	  else if (code == 1 && symval == 0)
+	    {
+	      insn[0] &= 0xf3;
+	      SNIP (offset, 1, R_RX_NONE);
+	      *again = TRUE;
+	    }
+	  /* Special case DSP:5 format: MOV.bwl Rsrc,dsp:5[Rdst] */
+	  else if (code == 1 && symval/scale <= 31
+		   /* Decodable bits.  */
+		   && (insn[0] & 0xc3) == 0xc3
+		   /* Width.  */
+		   && (insn[0] & 0x30) != 3
+		   /* Register MSBs.  */
+		   && (insn[1] & 0x88)  == 0x00)
+	    {
+	      int newrel = 0;
+
+	      insn[0] = 0x80 | (insn[0] & 0x30);
+	      /* The register fields are in the right place already.  */
+
+	      /* We can't relax this new opcode.  */
+	      irel->r_addend = 0;
+
+	      switch ((insn[0] & 0x30) >> 4)
+		{
+		case 0:
+		  newrel = R_RX_RH_ABS5p5B;
+		  break;
+		case 1:
+		  newrel = R_RX_RH_ABS5p5W;
+		  break;
+		case 2:
+		  newrel = R_RX_RH_ABS5p5L;
+		  break;
+		}
+
+	      move_reloc (irel, srel, -2);
+	      SNIP (2, 1, newrel);
+	    }
+	}
+
+      /* These always occur alone, but the offset depends on whether
+	 it's a MEMEX opcode (0x06) or not.  */
+      if (irel->r_addend & RX_RELAXA_DSP14)
+	{
+	  int offset;
+	  GET_RELOC;
+
+	  if (insn[0] == 0x06)
+	    offset = 3;
+	  else
+	    offset = 4;
+
+	  code = insn[1] & 3;
+
+	  if (code == 2 && symval / scale <= 255)
+	    {
+	      unsigned int newrel = ELF32_R_TYPE (srel->r_info);
+
+	      insn[1] &= 0xfc;
+	      insn[1] |= 0x01;
+	      newrel = next_smaller_reloc (ELF32_R_TYPE (srel->r_info));
+	      if (newrel != ELF32_R_TYPE (srel->r_info))
+		{
+		  SNIP (offset, 1, newrel);
+		  *again = TRUE;
+		}
+	    }
+	  else if (code == 1 && symval == 0)
+	    {
+	      insn[1] &= 0xfc;
+	      SNIP (offset, 1, R_RX_NONE);
+	      *again = TRUE;
+	    }
+	}
+
+      /* IMM* codes:
+	   0  00  imm:32
+	   1  01  simm:8
+	   2  10  simm:16
+	   3  11  simm:24.  */
+
+      /* These always occur alone.  */
+      if (irel->r_addend & RX_RELAXA_IMM6)
+	{
+	  long ssymval;
+
+	  GET_RELOC;
+
+	  /* These relocations sign-extend, so we must do signed compares.  */
+	  ssymval = (long) symval;
+
+	  code = insn[0] & 0x03;
+
+	  if (code == 0 && ssymval <= 8388607 && ssymval >= -8388608)
+	    {
+	      unsigned int newrel = ELF32_R_TYPE (srel->r_info);
+
+	      insn[0] &= 0xfc;
+	      insn[0] |= 0x03;
+	      newrel = next_smaller_reloc (ELF32_R_TYPE (srel->r_info));
+	      if (newrel != ELF32_R_TYPE (srel->r_info))
+		{
+		  SNIP (2, 1, newrel);
+		  *again = TRUE;
+		}
+	    }
+
+	  else if (code == 3 && ssymval <= 32767 && ssymval >= -32768)
+	    {
+	      unsigned int newrel = ELF32_R_TYPE (srel->r_info);
+
+	      insn[0] &= 0xfc;
+	      insn[0] |= 0x02;
+	      newrel = next_smaller_reloc (ELF32_R_TYPE (srel->r_info));
+	      if (newrel != ELF32_R_TYPE (srel->r_info))
+		{
+		  SNIP (2, 1, newrel);
+		  *again = TRUE;
+		}
+	    }
+
+	  /* Special case UIMM8 format: CMP #uimm8,Rdst.  */
+	  else if (code == 2 && ssymval <= 255 && ssymval >= 16
+		   /* Decodable bits.  */
+		   && (insn[0] & 0xfc) == 0x74
+		   /* Decodable bits.  */
+		   && ((insn[1] & 0xf0) == 0x00))
+	    {
+	      int newrel;
+
+	      insn[0] = 0x75;
+	      insn[1] = 0x50 | (insn[1] & 0x0f);
+
+	      /* We can't relax this new opcode.  */
+	      irel->r_addend = 0;
+
+	      if (STACK_REL_P (ELF32_R_TYPE (srel->r_info)))
+		newrel = R_RX_ABS8U;
+	      else
+		newrel = R_RX_DIR8U;
+
+	      SNIP (2, 1, newrel);
+	      *again = TRUE;
+	    }
+
+	  else if (code == 2 && ssymval <= 127 && ssymval >= -128)
+	    {
+	      unsigned int newrel = ELF32_R_TYPE (srel->r_info);
+
+	      insn[0] &= 0xfc;
+	      insn[0] |= 0x01;
+	      newrel = next_smaller_reloc (ELF32_R_TYPE (srel->r_info));
+	      if (newrel != ELF32_R_TYPE (srel->r_info))
+		{
+		  SNIP (2, 1, newrel);
+		  *again = TRUE;
+		}
+	    }
+
+	  /* Special case UIMM4 format: CMP, MUL, AND, OR.  */
+	  else if (code == 1 && ssymval <= 15 && ssymval >= 0
+		   /* Decodable bits and immediate type.  */
+		   && insn[0] == 0x75
+		   /* Decodable bits.  */
+		   && (insn[1] & 0xc0)  == 0x00)
+	    {
+	      static const int newop[4] = { 1, 3, 4, 5 };
+
+	      insn[0] = 0x60 | newop[insn[1] >> 4];
+	      /* The register number doesn't move.  */
+
+	      /* We can't relax this new opcode.  */
+	      irel->r_addend = 0;
+
+	      move_reloc (irel, srel, -1);
+
+	      SNIP (2, 1, R_RX_RH_UIMM4p8);
+	      *again = TRUE;
+	    }
+
+	  /* Special case UIMM4 format: ADD -> ADD/SUB.  */
+	  else if (code == 1 && ssymval <= 15 && ssymval >= -15
+		   /* Decodable bits and immediate type.  */
+		   && insn[0] == 0x71
+		   /* Same register for source and destination.  */
+		   && ((insn[1] >> 4) == (insn[1] & 0x0f)))
+	    {
+	      int newrel;
+
+	      /* Note that we can't turn "add $0,Rs" into a NOP
+		 because the flags need to be set right.  */
+
+	      if (ssymval < 0)
+		{
+		  insn[0] = 0x60; /* Subtract.  */
+		  newrel = R_RX_RH_UNEG4p8;
+		}
+	      else
+		{
+		  insn[0] = 0x62; /* Add.  */
+		  newrel = R_RX_RH_UIMM4p8;
+		}
+
+	      /* The register number is in the right place.  */
+
+	      /* We can't relax this new opcode.  */
+	      irel->r_addend = 0;
+
+	      move_reloc (irel, srel, -1);
+
+	      SNIP (2, 1, newrel);
+	      *again = TRUE;
+	    }
+	}
+
+      /* These are either matched with a DSP6 (2-byte base) or an id24
+	 (3-byte base).  */
+      if (irel->r_addend & RX_RELAXA_IMM12)
+	{
+	  int dspcode, offset = 0;
+	  long ssymval;
+
+	  GET_RELOC;
+
+	  if ((insn[0] & 0xfc) == 0xfc)
+	    dspcode = 1; /* Just something with one byte operand.  */
+	  else
+	    dspcode = insn[0] & 3;
+	  switch (dspcode)
+	    {
+	    case 0: offset = 2; break;
+	    case 1: offset = 3; break;
+	    case 2: offset = 4; break;
+	    case 3: offset = 2; break;
+	    }
+
+	  /* These relocations sign-extend, so we must do signed compares.  */
+	  ssymval = (long) symval;
+
+	  code = (insn[1] >> 2) & 3;
+	  if (code == 0 && ssymval <= 8388607 && ssymval >= -8388608)
+	    {
+	      unsigned int newrel = ELF32_R_TYPE (srel->r_info);
+
+	      insn[1] &= 0xf3;
+	      insn[1] |= 0x0c;
+	      newrel = next_smaller_reloc (ELF32_R_TYPE (srel->r_info));
+	      if (newrel != ELF32_R_TYPE (srel->r_info))
+		{
+		  SNIP (offset, 1, newrel);
+		  *again = TRUE;
+		}
+	    }
+
+	  else if (code == 3 && ssymval <= 32767 && ssymval >= -32768)
+	    {
+	      unsigned int newrel = ELF32_R_TYPE (srel->r_info);
+
+	      insn[1] &= 0xf3;
+	      insn[1] |= 0x08;
+	      newrel = next_smaller_reloc (ELF32_R_TYPE (srel->r_info));
+	      if (newrel != ELF32_R_TYPE (srel->r_info))
+		{
+		  SNIP (offset, 1, newrel);
+		  *again = TRUE;
+		}
+	    }
+
+	  /* Special case UIMM8 format: MOV #uimm8,Rdst.  */
+	  else if (code == 2 && ssymval <= 255 && ssymval >= 16
+		   /* Decodable bits.  */
+		   && insn[0] == 0xfb
+		   /* Decodable bits.  */
+		   && ((insn[1] & 0x03) == 0x02))
+	    {
+	      int newrel;
+
+	      insn[0] = 0x75;
+	      insn[1] = 0x40 | (insn[1] >> 4);
+
+	      /* We can't relax this new opcode.  */
+	      irel->r_addend = 0;
+
+	      if (STACK_REL_P (ELF32_R_TYPE (srel->r_info)))
+		newrel = R_RX_ABS8U;
+	      else
+		newrel = R_RX_DIR8U;
+
+	      SNIP (2, 1, newrel);
+	      *again = TRUE;
+	    }
+
+	  else if (code == 2 && ssymval <= 127 && ssymval >= -128)
+	    {
+	      unsigned int newrel = ELF32_R_TYPE(srel->r_info);
+
+	      insn[1] &= 0xf3;
+	      insn[1] |= 0x04;
+	      newrel = next_smaller_reloc (ELF32_R_TYPE (srel->r_info));
+	      if (newrel != ELF32_R_TYPE(srel->r_info))
+		{
+		  SNIP (offset, 1, newrel);
+		  *again = TRUE;
+		}
+	    }
+
+	  /* Special case UIMM4 format: MOV #uimm4,Rdst.  */
+	  else if (code == 1 && ssymval <= 15 && ssymval >= 0
+		   /* Decodable bits.  */
+		   && insn[0] == 0xfb
+		   /* Decodable bits.  */
+		   && ((insn[1] & 0x03) == 0x02))
+	    {
+	      insn[0] = 0x66;
+	      insn[1] = insn[1] >> 4;
+
+	      /* We can't relax this new opcode.  */
+	      irel->r_addend = 0;
+
+	      move_reloc (irel, srel, -1);
+
+	      SNIP (2, 1, R_RX_RH_UIMM4p8);
+	      *again = TRUE;
+	    }
+	}
+
+      if (irel->r_addend & RX_RELAXA_BRA)
+	{
+	  unsigned int newrel = ELF32_R_TYPE (srel->r_info);
+	  int max_pcrel3 = 4;
+	  int alignment_glue = 0;
+
+	  GET_RELOC;
+
+	  /* Branches over alignment chunks are problematic, as
+	     deleting bytes here makes the branch *further* away.  We
+	     can be agressive with branches within this alignment
+	     block, but not branches outside it.  */
+	  if ((prev_alignment == NULL
+	       || symval < (bfd_vma)(sec_start + prev_alignment->r_offset))
+	      && (next_alignment == NULL
+		  || symval > (bfd_vma)(sec_start + next_alignment->r_offset)))
+	    alignment_glue = section_alignment_glue;
+
+	  if (ELF32_R_TYPE(srel[1].r_info) == R_RX_RH_RELAX
+	      && srel[1].r_addend & RX_RELAXA_BRA
+	      && srel[1].r_offset < irel->r_offset + pcrel)
+	    max_pcrel3 ++;
+
+	  newrel = next_smaller_reloc (ELF32_R_TYPE (srel->r_info));
+
+	  /* The values we compare PCREL with are not what you'd
+	     expect; they're off by a little to compensate for (1)
+	     where the reloc is relative to the insn, and (2) how much
+	     the insn is going to change when we relax it.  */
+
+	  /* These we have to decode.  */
+	  switch (insn[0])
+	    {
+	    case 0x04: /* BRA pcdsp:24 */
+	      if (-32768 + alignment_glue <= pcrel
+		  && pcrel <= 32765 - alignment_glue)
+		{
+		  insn[0] = 0x38;
+		  SNIP (3, 1, newrel);
+		  *again = TRUE;
+		}
+	      break;
+
+	    case 0x38: /* BRA pcdsp:16 */
+	      if (-128 + alignment_glue <= pcrel
+		  && pcrel <= 127 - alignment_glue)
+		{
+		  insn[0] = 0x2e;
+		  SNIP (2, 1, newrel);
+		  *again = TRUE;
+		}
+	      break;
+
+	    case 0x2e: /* BRA pcdsp:8 */
+	      /* Note that there's a risk here of shortening things so
+		 much that we no longer fit this reloc; it *should*
+		 only happen when you branch across a branch, and that
+		 branch also devolves into BRA.S.  "Real" code should
+		 be OK.  */
+	      if (max_pcrel3 + alignment_glue <= pcrel
+		  && pcrel <= 10 - alignment_glue
+		  && allow_pcrel3)
+		{
+		  insn[0] = 0x08;
+		  SNIP (1, 1, newrel);
+		  move_reloc (irel, srel, -1);
+		  *again = TRUE;
+		}
+	      break;
+
+	    case 0x05: /* BSR pcdsp:24 */
+	      if (-32768 + alignment_glue <= pcrel
+		  && pcrel <= 32765 - alignment_glue)
+		{
+		  insn[0] = 0x39;
+		  SNIP (1, 1, newrel);
+		  *again = TRUE;
+		}
+	      break;
+
+	    case 0x3a: /* BEQ.W pcdsp:16 */
+	    case 0x3b: /* BNE.W pcdsp:16 */
+	      if (-128 + alignment_glue <= pcrel
+		  && pcrel <= 127 - alignment_glue)
+		{
+		  insn[0] = 0x20 | (insn[0] & 1);
+		  SNIP (1, 1, newrel);
+		  *again = TRUE;
+		}
+	      break;
+
+	    case 0x20: /* BEQ.B pcdsp:8 */
+	    case 0x21: /* BNE.B pcdsp:8 */
+	      if (max_pcrel3 + alignment_glue <= pcrel
+		  && pcrel - alignment_glue <= 10
+		  && allow_pcrel3)
+		{
+		  insn[0] = 0x10 | ((insn[0] & 1) << 3);
+		  SNIP (1, 1, newrel);
+		  move_reloc (irel, srel, -1);
+		  *again = TRUE;
+		}
+	      break;
+
+	    case 0x16: /* synthetic BNE dsp24 */
+	    case 0x1e: /* synthetic BEQ dsp24 */
+	      if (-32767 + alignment_glue <= pcrel
+		  && pcrel <= 32766 - alignment_glue
+		  && insn[1] == 0x04)
+		{
+		  if (insn[0] == 0x16)
+		    insn[0] = 0x3b;
+		  else
+		    insn[0] = 0x3a;
+		  /* We snip out the bytes at the end else the reloc
+		     will get moved too, and too much.  */
+		  SNIP (3, 2, newrel);
+		  move_reloc (irel, srel, -1);
+		  *again = TRUE;
+		}
+	      break;
+	    }
+
+	  /* Special case - synthetic conditional branches, pcrel24.
+	     Note that EQ and NE have been handled above.  */
+	  if ((insn[0] & 0xf0) == 0x20
+	      && insn[1] == 0x06
+	      && insn[2] == 0x04
+	      && srel->r_offset != irel->r_offset + 1
+	      && -32767 + alignment_glue <= pcrel
+	      && pcrel <= 32766 - alignment_glue)
+	    {
+	      insn[1] = 0x05;
+	      insn[2] = 0x38;
+	      SNIP (5, 1, newrel);
+	      *again = TRUE;
+	    }
+
+	  /* Special case - synthetic conditional branches, pcrel16 */
+	  if ((insn[0] & 0xf0) == 0x20
+	      && insn[1] == 0x05
+	      && insn[2] == 0x38
+	      && srel->r_offset != irel->r_offset + 1
+	      && -127 + alignment_glue <= pcrel
+	      && pcrel <= 126 - alignment_glue)
+	    {
+	      int cond = (insn[0] & 0x0f) ^ 0x01;
+
+	      insn[0] = 0x20 | cond;
+	      /* By moving the reloc first, we avoid having
+		 delete_bytes move it also.  */
+	      move_reloc (irel, srel, -2);
+	      SNIP (2, 3, newrel);
+	      *again = TRUE;
+	    }
+	}
+
+      BFD_ASSERT (nrelocs == 0);
+
+      /* Special case - check MOV.bwl #IMM, dsp[reg] and see if we can
+	 use MOV.bwl #uimm:8, dsp:5[r7] format.  This is tricky
+	 because it may have one or two relocations.  */
+      if ((insn[0] & 0xfc) == 0xf8
+	  && (insn[1] & 0x80) == 0x00
+	  && (insn[0] & 0x03) != 0x03)
+	{
+	  int dcode, icode, reg, ioff, dscale, ilen;
+	  bfd_vma disp_val = 0;
+	  long imm_val = 0;
+	  Elf_Internal_Rela * disp_rel = 0;
+	  Elf_Internal_Rela * imm_rel = 0;
+
+	  /* Reset this.  */
+	  srel = irel;
+
+	  dcode = insn[0] & 0x03;
+	  icode = (insn[1] >> 2) & 0x03;
+	  reg = (insn[1] >> 4) & 0x0f;
+
+	  ioff = dcode == 1 ? 3 : dcode == 2 ? 4 : 2;
+
+	  /* Figure out what the dispacement is.  */
+	  if (dcode == 1 || dcode == 2)
+	    {
+	      /* There's a displacement.  See if there's a reloc for it.  */
+	      if (srel[1].r_offset == irel->r_offset + 2)
+		{
+		  GET_RELOC;
+		  disp_val = symval;
+		  disp_rel = srel;
+		}
+	      else
+		{
+		  if (dcode == 1)
+		    disp_val = insn[2];
+		  else
+		    {
+#if RX_OPCODE_BIG_ENDIAN
+		      disp_val = insn[2] * 256 + insn[3];
+#else
+		      disp_val = insn[2] + insn[3] * 256;
+#endif
+		    }
+		  switch (insn[1] & 3)
+		    {
+		    case 1:
+		      disp_val *= 2;
+		      scale = 2;
+		      break;
+		    case 2:
+		      disp_val *= 4;
+		      scale = 4;
+		      break;
+		    }
+		}
+	    }
+
+	  dscale = scale;
+
+	  /* Figure out what the immediate is.  */
+	  if (srel[1].r_offset == irel->r_offset + ioff)
+	    {
+	      GET_RELOC;
+	      imm_val = (long) symval;
+	      imm_rel = srel;
+	    }
+	  else
+	    {
+	      unsigned char * ip = insn + ioff;
+
+	      switch (icode)
+		{
+		case 1:
+		  /* For byte writes, we don't sign extend.  Makes the math easier later.  */
+		  if (scale == 1)
+		    imm_val = ip[0];
+		  else
+		    imm_val = (char) ip[0];
+		  break;
+		case 2:
+#if RX_OPCODE_BIG_ENDIAN
+		  imm_val = ((char) ip[0] << 8) | ip[1];
+#else
+		  imm_val = ((char) ip[1] << 8) | ip[0];
+#endif
+		  break;
+		case 3:
+#if RX_OPCODE_BIG_ENDIAN
+		  imm_val = ((char) ip[0] << 16) | (ip[1] << 8) | ip[2];
+#else
+		  imm_val = ((char) ip[2] << 16) | (ip[1] << 8) | ip[0];
+#endif
+		  break;
+		case 0:
+#if RX_OPCODE_BIG_ENDIAN
+		  imm_val = (ip[0] << 24) | (ip[1] << 16) | (ip[2] << 8) | ip[3];
+#else
+		  imm_val = (ip[3] << 24) | (ip[2] << 16) | (ip[1] << 8) | ip[0];
+#endif
+		  break;
+		}
+	    }
+
+	  ilen = 2;
+
+	  switch (dcode)
+	    {
+	    case 1:
+	      ilen += 1;
+	      break;
+	    case 2:
+	      ilen += 2;
+	      break;
+	    }
+
+	  switch (icode)
+	    {
+	    case 1:
+	      ilen += 1;
+	      break;
+	    case 2:
+	      ilen += 2;
+	      break;
+	    case 3:
+	      ilen += 3;
+	      break;
+	    case 4:
+	      ilen += 4;
+	      break;
+	    }
+
+	  /* The shortcut happens when the immediate is 0..255,
+	     register r0 to r7, and displacement (scaled) 0..31.  */
+
+	  if (0 <= imm_val && imm_val <= 255
+	      && 0 <= reg && reg <= 7
+	      && disp_val / dscale <= 31)
+	    {
+	      insn[0] = 0x3c | (insn[1] & 0x03);
+	      insn[1] = (((disp_val / dscale) << 3) & 0x80) | (reg << 4) | ((disp_val/dscale) & 0x0f);
+	      insn[2] = imm_val;
+
+	      if (disp_rel)
+		{
+		  int newrel = R_RX_NONE;
+
+		  switch (dscale)
+		    {
+		    case 1:
+		      newrel = R_RX_RH_ABS5p8B;
+		      break;
+		    case 2:
+		      newrel = R_RX_RH_ABS5p8W;
+		      break;
+		    case 4:
+		      newrel = R_RX_RH_ABS5p8L;
+		      break;
+		    }
+		  disp_rel->r_info = ELF32_R_INFO (ELF32_R_SYM (disp_rel->r_info), newrel);
+		  move_reloc (irel, disp_rel, -1);
+		}
+	      if (imm_rel)
+		{
+		  imm_rel->r_info = ELF32_R_INFO (ELF32_R_SYM (imm_rel->r_info), R_RX_DIR8U);
+		  move_reloc (disp_rel ? disp_rel : irel,
+			      imm_rel,
+			      irel->r_offset - imm_rel->r_offset + 2);
+		}
+
+	      SNIPNR (3, ilen - 3);
+	      *again = TRUE;
+
+	      /* We can't relax this new opcode.  */
+	      irel->r_addend = 0;
+	    }
+	}
+    }
+
+  /* We can't reliably relax branches to DIR3U_PCREL unless we know
+     whatever they're branching over won't shrink any more.  If we're
+     basically done here, do one more pass just for branches - but
+     don't request a pass after that one!  */
+  if (!*again && !allow_pcrel3)
+    {
+      bfd_boolean ignored;
+
+      elf32_rx_relax_section (abfd, sec, link_info, &ignored, TRUE);
+    }
+
+  return TRUE;
+
+ error_return:
+  if (free_relocs != NULL)
+    free (free_relocs);
+
+  if (free_contents != NULL)
+    free (free_contents);
+
+  if (shndx_buf != NULL)
+    {
+      shndx_hdr->contents = NULL;
+      free (shndx_buf);
+    }
+
+  if (free_intsyms != NULL)
+    free (free_intsyms);
+
+  return FALSE;
+}
+
+static bfd_boolean
+elf32_rx_relax_section_wrapper (bfd *                  abfd,
+				asection *             sec,
+				struct bfd_link_info * link_info,
+				bfd_boolean *          again)
+{
+  return elf32_rx_relax_section (abfd, sec, link_info, again, FALSE);
+}
+
+/* Function to set the ELF flag bits.  */
+
+static bfd_boolean
+rx_elf_set_private_flags (bfd * abfd, flagword flags)
+{
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
+}
+
+static bfd_boolean no_warn_mismatch = FALSE;
+static bfd_boolean ignore_lma = TRUE;
+
+void bfd_elf32_rx_set_target_flags (bfd_boolean, bfd_boolean);
+
+void
+bfd_elf32_rx_set_target_flags (bfd_boolean user_no_warn_mismatch,
+			       bfd_boolean user_ignore_lma)
+{
+  no_warn_mismatch = user_no_warn_mismatch;
+  ignore_lma = user_ignore_lma;
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+
+static bfd_boolean
+rx_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd)
+{
+  flagword old_flags;
+  flagword new_flags;
+  bfd_boolean error = FALSE;
+
+  new_flags = elf_elfheader (ibfd)->e_flags;
+  old_flags = elf_elfheader (obfd)->e_flags;
+
+  if (!elf_flags_init (obfd))
+    {
+      /* First call, no flags set.  */
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = new_flags;
+    }
+  else if (old_flags != new_flags)
+    {
+      flagword known_flags = E_FLAG_RX_64BIT_DOUBLES | E_FLAG_RX_DSP;
+
+      if ((old_flags ^ new_flags) & known_flags)
+	{
+	  /* Only complain if flag bits we care about do not match.
+	     Other bits may be set, since older binaries did use some
+	     deprecated flags.  */
+	  if (no_warn_mismatch)
+	    {
+	      elf_elfheader (obfd)->e_flags = (new_flags | old_flags) & known_flags;
+	    }
+	  else
+	    {
+	      (*_bfd_error_handler)
+		("ELF header flags mismatch: old_flags = 0x%.8lx, new_flags = 0x%.8lx, filename = %s",
+		 old_flags, new_flags, bfd_get_filename (ibfd));
+	      error = TRUE;
+	    }
+	}
+      else
+	elf_elfheader (obfd)->e_flags = new_flags & known_flags;
+    }
+
+  if (error)
+    bfd_set_error (bfd_error_bad_value);
+
+  return !error;
+}
+
+static bfd_boolean
+rx_elf_print_private_bfd_data (bfd * abfd, void * ptr)
+{
+  FILE * file = (FILE *) ptr;
+  flagword flags;
+
+  BFD_ASSERT (abfd != NULL && ptr != NULL);
+
+  /* Print normal ELF private data.  */
+  _bfd_elf_print_private_bfd_data (abfd, ptr);
+
+  flags = elf_elfheader (abfd)->e_flags;
+  fprintf (file, _("private flags = 0x%lx:"), (long) flags);
+
+  if (flags & E_FLAG_RX_64BIT_DOUBLES)
+    fprintf (file, _(" [64-bit doubles]"));
+  if (flags & E_FLAG_RX_DSP)
+    fprintf (file, _(" [dsp]"));
+
+  fputc ('\n', file);
+  return TRUE;
+}
+
+/* Return the MACH for an e_flags value.  */
+
+static int
+elf32_rx_machine (bfd * abfd)
+{
+  if ((elf_elfheader (abfd)->e_flags & EF_RX_CPU_MASK) == EF_RX_CPU_RX)
+    return bfd_mach_rx;
+
+  return 0;
+}
+
+static bfd_boolean
+rx_elf_object_p (bfd * abfd)
+{
+  int i;
+  unsigned int u;
+  Elf_Internal_Phdr *phdr = elf_tdata (abfd)->phdr;
+  int nphdrs = elf_elfheader (abfd)->e_phnum;
+  sec_ptr bsec;
+
+  /* We never want to automatically choose the non-swapping big-endian
+     target.  The user can only get that explicitly, such as with -I
+     and objcopy.  */
+  if (abfd->xvec == &bfd_elf32_rx_be_ns_vec
+      && abfd->target_defaulted)
+    return FALSE;
+
+  bfd_default_set_arch_mach (abfd, bfd_arch_rx,
+			     elf32_rx_machine (abfd));
+
+  /* For each PHDR in the object, we must find some section that
+     corresponds (based on matching file offsets) and use its VMA
+     information to reconstruct the p_vaddr field we clobbered when we
+     wrote it out.  */
+  for (i=0; i<nphdrs; i++)
+    {
+      for (u=0; u<elf_tdata(abfd)->num_elf_sections; u++)
+	{
+	  Elf_Internal_Shdr *sec = elf_tdata(abfd)->elf_sect_ptr[u];
+
+	  if (phdr[i].p_offset <= (bfd_vma) sec->sh_offset
+	      && (bfd_vma)sec->sh_offset <= phdr[i].p_offset + (phdr[i].p_filesz - 1))
+	    {
+	      /* Found one!  The difference between the two addresses,
+		 plus the difference between the two file offsets, is
+		 enough information to reconstruct the lma.  */
+
+	      /* Example where they aren't:
+		 PHDR[1] = lma fffc0100 offset 00002010 size 00000100
+		 SEC[6]  = vma 00000050 offset 00002050 size 00000040
+
+		 The correct LMA for the section is fffc0140 + (2050-2010).
+	      */
+
+	      phdr[i].p_vaddr = sec->sh_addr + (sec->sh_offset - phdr[i].p_offset);
+	      break;
+	    }
+	}
+
+      /* We must update the bfd sections as well, so we don't stop
+	 with one match.  */
+      bsec = abfd->sections;
+      while (bsec)
+	{
+	  if (phdr[i].p_vaddr <= bsec->lma
+	      && bsec->vma <= phdr[i].p_vaddr + (phdr[i].p_filesz - 1))
+	    {
+	      bsec->lma = phdr[i].p_paddr + (bsec->vma - phdr[i].p_vaddr);
+	    }
+	  bsec = bsec->next;
+	}
+    }
+
+  return TRUE;
+}
+ 
+
+#ifdef DEBUG
+void
+rx_dump_symtab (bfd * abfd, void * internal_syms, void * external_syms)
+{
+  size_t locsymcount;
+  Elf_Internal_Sym * isymbuf;
+  Elf_Internal_Sym * isymend;
+  Elf_Internal_Sym * isym;
+  Elf_Internal_Shdr * symtab_hdr;
+  bfd_boolean free_internal = FALSE, free_external = FALSE;
+  char * st_info_str;
+  char * st_info_stb_str;
+  char * st_other_str;
+  char * st_shndx_str;
+
+  if (! internal_syms)
+    {
+      internal_syms = bfd_malloc (1000);
+      free_internal = 1;
+    }
+  if (! external_syms)
+    {
+      external_syms = bfd_malloc (1000);
+      free_external = 1;
+    }
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  locsymcount = symtab_hdr->sh_size / get_elf_backend_data (abfd)->s->sizeof_sym;
+  if (free_internal)
+    isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+				    symtab_hdr->sh_info, 0,
+				    internal_syms, external_syms, NULL);
+  else
+    isymbuf = internal_syms;
+  isymend = isymbuf + locsymcount;
+
+  for (isym = isymbuf ; isym < isymend ; isym++)
+    {
+      switch (ELF_ST_TYPE (isym->st_info))
+	{
+	case STT_FUNC: st_info_str = "STT_FUNC";
+	case STT_SECTION: st_info_str = "STT_SECTION";
+	case STT_FILE: st_info_str = "STT_FILE";
+	case STT_OBJECT: st_info_str = "STT_OBJECT";
+	case STT_TLS: st_info_str = "STT_TLS";
+	default: st_info_str = "";
+	}
+      switch (ELF_ST_BIND (isym->st_info))
+	{
+	case STB_LOCAL: st_info_stb_str = "STB_LOCAL";
+	case STB_GLOBAL: st_info_stb_str = "STB_GLOBAL";
+	default: st_info_stb_str = "";
+	}
+      switch (ELF_ST_VISIBILITY (isym->st_other))
+	{
+	case STV_DEFAULT: st_other_str = "STV_DEFAULT";
+	case STV_INTERNAL: st_other_str = "STV_INTERNAL";
+	case STV_PROTECTED: st_other_str = "STV_PROTECTED";
+	default: st_other_str = "";
+	}
+      switch (isym->st_shndx)
+	{
+	case SHN_ABS: st_shndx_str = "SHN_ABS";
+	case SHN_COMMON: st_shndx_str = "SHN_COMMON";
+	case SHN_UNDEF: st_shndx_str = "SHN_UNDEF";
+	default: st_shndx_str = "";
+	}
+
+      printf ("isym = %p st_value = %lx st_size = %lx st_name = (%lu) %s "
+	      "st_info = (%d) %s %s st_other = (%d) %s st_shndx = (%d) %s\n",
+	      isym,
+	      (unsigned long) isym->st_value,
+	      (unsigned long) isym->st_size,
+	      isym->st_name,
+	      bfd_elf_string_from_elf_section (abfd, symtab_hdr->sh_link,
+					       isym->st_name),
+	      isym->st_info, st_info_str, st_info_stb_str,
+	      isym->st_other, st_other_str,
+	      isym->st_shndx, st_shndx_str);
+    }
+  if (free_internal)
+    free (internal_syms);
+  if (free_external)
+    free (external_syms);
+}
+
+char *
+rx_get_reloc (long reloc)
+{
+  if (0 <= reloc && reloc < R_RX_max)
+    return rx_elf_howto_table[reloc].name;
+  return "";
+}
+#endif /* DEBUG */
+
+
+/* We must take care to keep the on-disk copy of any code sections
+   that are fully linked swapped if the target is big endian, to match
+   the Renesas tools.  */
+
+/* The rule is: big endian object that are final-link executables,
+   have code sections stored with 32-bit words swapped relative to
+   what you'd get by default.  */
+
+static bfd_boolean
+rx_get_section_contents (bfd *         abfd,
+			 sec_ptr       section,
+			 void *        location,
+			 file_ptr      offset,
+			 bfd_size_type count)
+{
+  int exec = (abfd->flags & EXEC_P) ? 1 : 0;
+  int s_code = (section->flags & SEC_CODE) ? 1 : 0;
+  bfd_boolean rv;
+
+#ifdef DJDEBUG
+  fprintf (stderr, "dj: get %ld %ld from %s  %s e%d sc%d  %08lx:%08lx\n",
+	   (long) offset, (long) count, section->name,
+	   bfd_big_endian(abfd) ? "be" : "le",
+	   exec, s_code, (long unsigned) section->filepos,
+	   (long unsigned) offset);
+#endif
+
+  if (exec && s_code && bfd_big_endian (abfd))
+    {
+      char * cloc = (char *) location;
+      bfd_size_type cnt, end_cnt;
+
+      rv = TRUE;
+
+      /* Fetch and swap unaligned bytes at the beginning.  */
+      if (offset % 4)
+        {
+	  char buf[4];
+
+	  rv = _bfd_generic_get_section_contents (abfd, section, buf,
+	                                          (offset & -4), 4);
+	  if (!rv)
+	    return FALSE;
+
+	  bfd_putb32 (bfd_getl32 (buf), buf);
+
+	  cnt = 4 - (offset % 4);
+	  if (cnt > count)
+	    cnt = count;
+
+	  memcpy (location, buf + (offset % 4), cnt);
+
+	  count -= cnt;
+	  offset += cnt;
+	  cloc += count;
+	}
+
+      end_cnt = count % 4;
+
+      /* Fetch and swap the middle bytes.  */
+      if (count >= 4)
+	{
+	  rv = _bfd_generic_get_section_contents (abfd, section, cloc, offset,
+						  count - end_cnt);
+	  if (!rv)
+	    return FALSE;
+
+	  for (cnt = count; cnt >= 4; cnt -= 4, cloc += 4)
+	    bfd_putb32 (bfd_getl32 (cloc), cloc);
+	}
+
+      /* Fetch and swap the end bytes.  */
+      if (end_cnt > 0)
+	{
+	  char buf[4];
+
+	  /* Fetch the end bytes.  */
+	  rv = _bfd_generic_get_section_contents (abfd, section, buf,
+	                                          offset + count - end_cnt, 4);
+	  if (!rv)
+	    return FALSE;
+
+	  bfd_putb32 (bfd_getl32 (buf), buf);
+	  memcpy (cloc, buf, end_cnt);
+	}
+    }
+  else
+    rv = _bfd_generic_get_section_contents (abfd, section, location, offset, count);
+
+  return rv;
+}
+
+#ifdef DJDEBUG
+static bfd_boolean
+rx2_set_section_contents (bfd *        abfd,
+			 sec_ptr       section,
+			 const void *  location,
+			 file_ptr      offset,
+			 bfd_size_type count)
+{
+  bfd_size_type i;
+
+  fprintf (stderr, "   set sec %s %08x loc %p offset %#x count %#x\n",
+	   section->name, (unsigned) section->vma, location, (int) offset, (int) count);
+  for (i = 0; i < count; i++)
+    {
+      if (i % 16 == 0 && i > 0)
+	fprintf (stderr, "\n");
+
+      if (i % 16  && i % 4 == 0)
+	fprintf (stderr, " ");
+
+      if (i % 16 == 0)
+	fprintf (stderr, "      %08x:", (int) (section->vma + offset + i));
+
+      fprintf (stderr, " %02x", ((unsigned char *) location)[i]);
+    }
+  fprintf (stderr, "\n");
+
+  return _bfd_elf_set_section_contents (abfd, section, location, offset, count);
+}
+#define _bfd_elf_set_section_contents rx2_set_section_contents
+#endif
+
+static bfd_boolean
+rx_set_section_contents (bfd *         abfd,
+			 sec_ptr       section,
+			 const void *  location,
+			 file_ptr      offset,
+			 bfd_size_type count)
+{
+  bfd_boolean exec = (abfd->flags & EXEC_P) ? TRUE : FALSE;
+  bfd_boolean s_code = (section->flags & SEC_CODE) ? TRUE : FALSE;
+  bfd_boolean rv;
+  char * swapped_data = NULL;
+  bfd_size_type i;
+  bfd_vma caddr = section->vma + offset;
+  file_ptr faddr = 0;
+  bfd_size_type scount;
+
+#ifdef DJDEBUG
+  bfd_size_type i;
+
+  fprintf (stderr, "\ndj: set %ld %ld to %s  %s e%d sc%d\n",
+	   (long) offset, (long) count, section->name,
+	   bfd_big_endian (abfd) ? "be" : "le",
+	   exec, s_code);
+
+  for (i = 0; i < count; i++)
+    {
+      int a = section->vma + offset + i;
+
+      if (a % 16 == 0 && a > 0)
+	fprintf (stderr, "\n");
+
+      if (a % 16  && a % 4 == 0)
+	fprintf (stderr, " ");
+
+      if (a % 16 == 0 || i == 0)
+	fprintf (stderr, "      %08x:", (int) (section->vma + offset + i));
+
+      fprintf (stderr, " %02x", ((unsigned char *) location)[i]);
+    }
+
+  fprintf (stderr, "\n");
+#endif
+
+  if (! exec || ! s_code || ! bfd_big_endian (abfd))
+    return _bfd_elf_set_section_contents (abfd, section, location, offset, count);
+
+  while (count > 0 && caddr > 0 && caddr % 4)
+    {
+      switch (caddr % 4)
+	{
+	case 0: faddr = offset + 3; break;
+	case 1: faddr = offset + 1; break;
+	case 2: faddr = offset - 1; break;
+	case 3: faddr = offset - 3; break;
+	}
+
+      rv = _bfd_elf_set_section_contents (abfd, section, location, faddr, 1);
+      if (! rv)
+	return rv;
+
+      location ++;
+      offset ++;
+      count --;
+      caddr ++;
+    }
+
+  scount = (int)(count / 4) * 4;
+  if (scount > 0)
+    {
+      char * cloc = (char *) location;
+
+      swapped_data = (char *) bfd_alloc (abfd, count);
+
+      for (i = 0; i < count; i += 4)
+	{
+	  bfd_vma v = bfd_getl32 (cloc + i);
+	  bfd_putb32 (v, swapped_data + i);
+	}
+
+      rv = _bfd_elf_set_section_contents (abfd, section, swapped_data, offset, scount);
+
+      if (!rv)
+	return rv;
+    }
+
+  count -= scount;
+  location += scount;
+  offset += scount;
+
+  if (count > 0)
+    {
+      caddr = section->vma + offset;
+      while (count > 0)
+	{
+	  switch (caddr % 4)
+	    {
+	    case 0: faddr = offset + 3; break;
+	    case 1: faddr = offset + 1; break;
+	    case 2: faddr = offset - 1; break;
+	    case 3: faddr = offset - 3; break;
+	    }
+	  rv = _bfd_elf_set_section_contents (abfd, section, location, faddr, 1);
+	  if (! rv)
+	    return rv;
+
+	  location ++;
+	  offset ++;
+	  count --;
+	  caddr ++;
+	}
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+rx_final_link (bfd * abfd, struct bfd_link_info * info)
+{
+  asection * o;
+
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+#ifdef DJDEBUG
+      fprintf (stderr, "sec %s fl %x vma %lx lma %lx size %lx raw %lx\n",
+	       o->name, o->flags, o->vma, o->lma, o->size, o->rawsize);
+#endif
+      if (o->flags & SEC_CODE
+	  && bfd_big_endian (abfd)
+	  && o->size % 4)
+	{
+#ifdef DJDEBUG
+	  fprintf (stderr, "adjusting...\n");
+#endif
+	  o->size += 4 - (o->size % 4);
+	}
+    }
+
+  return bfd_elf_final_link (abfd, info);
+}
+
+static bfd_boolean
+elf32_rx_modify_program_headers (bfd * abfd ATTRIBUTE_UNUSED,
+				 struct bfd_link_info * info ATTRIBUTE_UNUSED)
+{
+  const struct elf_backend_data * bed;
+  struct elf_obj_tdata * tdata;
+  Elf_Internal_Phdr * phdr;
+  unsigned int count;
+  unsigned int i;
+
+  bed = get_elf_backend_data (abfd);
+  tdata = elf_tdata (abfd);
+  phdr = tdata->phdr;
+  count = tdata->program_header_size / bed->s->sizeof_phdr;
+
+  if (ignore_lma)
+    for (i = count; i-- != 0;)
+      if (phdr[i].p_type == PT_LOAD)
+	{
+	  /* The Renesas tools expect p_paddr to be zero.  However,
+	     there is no other way to store the writable data in ROM for
+	     startup initialization.  So, we let the linker *think*
+	     we're using paddr and vaddr the "usual" way, but at the
+	     last minute we move the paddr into the vaddr (which is what
+	     the simulator uses) and zero out paddr.  Note that this
+	     does not affect the section headers, just the program
+	     headers.  We hope.  */
+	  phdr[i].p_vaddr = phdr[i].p_paddr;
+#if 0	  /* If we zero out p_paddr, then the LMA in the section table
+	     becomes wrong.  */
+	  phdr[i].p_paddr = 0;
+#endif
+	}
+
+  return TRUE;
+}
+
+#define ELF_ARCH		bfd_arch_rx
+#define ELF_MACHINE_CODE	EM_RX
+#define ELF_MAXPAGESIZE		0x1000
+
+#define TARGET_BIG_SYM		bfd_elf32_rx_be_vec
+#define TARGET_BIG_NAME		"elf32-rx-be"
+
+#define TARGET_LITTLE_SYM	bfd_elf32_rx_le_vec
+#define TARGET_LITTLE_NAME	"elf32-rx-le"
+
+#define elf_info_to_howto_rel			NULL
+#define elf_info_to_howto			rx_info_to_howto_rela
+#define elf_backend_object_p			rx_elf_object_p
+#define elf_backend_relocate_section		rx_elf_relocate_section
+#define elf_symbol_leading_char                 ('_')
+#define elf_backend_can_gc_sections		1
+#define elf_backend_modify_program_headers	elf32_rx_modify_program_headers
+
+#define bfd_elf32_bfd_reloc_type_lookup		rx_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup		rx_reloc_name_lookup
+#define bfd_elf32_bfd_set_private_flags		rx_elf_set_private_flags
+#define bfd_elf32_bfd_merge_private_bfd_data	rx_elf_merge_private_bfd_data
+#define bfd_elf32_bfd_print_private_bfd_data	rx_elf_print_private_bfd_data
+#define bfd_elf32_get_section_contents		rx_get_section_contents
+#define bfd_elf32_set_section_contents		rx_set_section_contents
+#define bfd_elf32_bfd_final_link		rx_final_link
+#define bfd_elf32_bfd_relax_section		elf32_rx_relax_section_wrapper
+
+#include "elf32-target.h"
+
+/* We define a second big-endian target that doesn't have the custom
+   section get/set hooks, for times when we want to preserve the
+   pre-swapped .text sections (like objcopy).  */
+
+#undef  TARGET_BIG_SYM
+#define TARGET_BIG_SYM		bfd_elf32_rx_be_ns_vec
+#undef  TARGET_BIG_NAME
+#define TARGET_BIG_NAME		"elf32-rx-be-ns"
+#undef  TARGET_LITTLE_SYM
+
+#undef bfd_elf32_get_section_contents
+#undef bfd_elf32_set_section_contents
+
+#undef	elf32_bed
+#define elf32_bed				elf32_rx_be_ns_bed
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-s390.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-s390.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-s390.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-s390.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3524 @@
+/* IBM S/390-specific support for 32-bit ELF
+   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+   2011 Free Software Foundation, Inc.
+   Contributed by Carl B. Pedersen and Martin Schwidefsky.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+
+static reloc_howto_type *elf_s390_reloc_type_lookup
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
+static void elf_s390_info_to_howto
+  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
+static bfd_boolean elf_s390_is_local_label_name
+  PARAMS ((bfd *, const char *));
+static struct bfd_hash_entry *link_hash_newfunc
+  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
+static struct bfd_link_hash_table *elf_s390_link_hash_table_create
+  PARAMS ((bfd *));
+static bfd_boolean create_got_section
+  PARAMS((bfd *, struct bfd_link_info *));
+static bfd_boolean elf_s390_create_dynamic_sections
+  PARAMS((bfd *, struct bfd_link_info *));
+static void elf_s390_copy_indirect_symbol
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *,
+	   struct elf_link_hash_entry *));
+static bfd_boolean elf_s390_check_relocs
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+	   const Elf_Internal_Rela *));
+struct elf_s390_link_hash_entry;
+static void elf_s390_adjust_gotplt
+  PARAMS ((struct elf_s390_link_hash_entry *));
+static bfd_boolean elf_s390_adjust_dynamic_symbol
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
+static bfd_boolean allocate_dynrelocs
+  PARAMS ((struct elf_link_hash_entry *, PTR));
+static bfd_boolean readonly_dynrelocs
+  PARAMS ((struct elf_link_hash_entry *, PTR));
+static bfd_boolean elf_s390_size_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean elf_s390_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
+static bfd_boolean elf_s390_finish_dynamic_symbol
+  PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
+	   Elf_Internal_Sym *));
+static enum elf_reloc_type_class elf_s390_reloc_type_class
+  PARAMS ((const Elf_Internal_Rela *));
+static bfd_boolean elf_s390_finish_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean elf_s390_object_p
+  PARAMS ((bfd *));
+static bfd_boolean elf_s390_grok_prstatus
+  PARAMS ((bfd *, Elf_Internal_Note *));
+static int elf_s390_tls_transition
+  PARAMS ((struct bfd_link_info *, int, int));
+static bfd_reloc_status_type s390_tls_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_vma dtpoff_base
+  PARAMS ((struct bfd_link_info *));
+static bfd_vma tpoff
+  PARAMS ((struct bfd_link_info *, bfd_vma));
+static void invalid_tls_insn
+  PARAMS ((bfd *, asection *, Elf_Internal_Rela *));
+static bfd_reloc_status_type s390_elf_ldisp_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+
+#include "elf/s390.h"
+
+/* The relocation "howto" table.  */
+
+static reloc_howto_type elf_howto_table[] =
+{
+  HOWTO (R_390_NONE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_390_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO(R_390_8,         0, 0,  8, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_8",        FALSE, 0,0x000000ff, FALSE),
+  HOWTO(R_390_12,        0, 1, 12, FALSE, 0, complain_overflow_dont,
+	bfd_elf_generic_reloc, "R_390_12",       FALSE, 0,0x00000fff, FALSE),
+  HOWTO(R_390_16,        0, 1, 16, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_16",       FALSE, 0,0x0000ffff, FALSE),
+  HOWTO(R_390_32,        0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_32",       FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_PC32,	 0, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PC32",     FALSE, 0,0xffffffff, TRUE),
+  HOWTO(R_390_GOT12,	 0, 1, 12, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOT12",    FALSE, 0,0x00000fff, FALSE),
+  HOWTO(R_390_GOT32,	 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOT32",    FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_PLT32,	 0, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PLT32",    FALSE, 0,0xffffffff, TRUE),
+  HOWTO(R_390_COPY,      0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_COPY",     FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_GLOB_DAT,  0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GLOB_DAT", FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_JMP_SLOT,  0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_JMP_SLOT", FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_RELATIVE,  0, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_RELATIVE", FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_GOTOFF32,  0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOTOFF32", FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_GOTPC,     0, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOTPC",    FALSE, 0,0xffffffff, TRUE),
+  HOWTO(R_390_GOT16,     0, 1, 16, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOT16",    FALSE, 0,0x0000ffff, FALSE),
+  HOWTO(R_390_PC16,      0, 1, 16,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PC16",     FALSE, 0,0x0000ffff, TRUE),
+  HOWTO(R_390_PC16DBL,   1, 1, 16,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PC16DBL",  FALSE, 0,0x0000ffff, TRUE),
+  HOWTO(R_390_PLT16DBL,  1, 1, 16,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PLT16DBL", FALSE, 0,0x0000ffff, TRUE),
+  HOWTO(R_390_PC32DBL,	 1, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PC32DBL",  FALSE, 0,0xffffffff, TRUE),
+  HOWTO(R_390_PLT32DBL,	 1, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PLT32DBL", FALSE, 0,0xffffffff, TRUE),
+  HOWTO(R_390_GOTPCDBL,  1, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOTPCDBL", FALSE, 0,0xffffffff, TRUE),
+  EMPTY_HOWTO (R_390_64),	/* Empty entry for R_390_64.  */
+  EMPTY_HOWTO (R_390_PC64),	/* Empty entry for R_390_PC64.  */
+  EMPTY_HOWTO (R_390_GOT64),	/* Empty entry for R_390_GOT64.  */
+  EMPTY_HOWTO (R_390_PLT64),	/* Empty entry for R_390_PLT64.  */
+  HOWTO(R_390_GOTENT,	 1, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOTENT",   FALSE, 0,0xffffffff, TRUE),
+  HOWTO(R_390_GOTOFF16,  0, 1, 16, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOTOFF16", FALSE, 0,0x0000ffff, FALSE),
+  EMPTY_HOWTO (R_390_GOTOFF64),	/* Empty entry for R_390_GOTOFF64.  */
+  HOWTO(R_390_GOTPLT12,  0, 1, 12, FALSE, 0, complain_overflow_dont,
+	bfd_elf_generic_reloc, "R_390_GOTPLT12", FALSE, 0,0x00000fff, FALSE),
+  HOWTO(R_390_GOTPLT16,  0, 1, 16, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOTPLT16", FALSE, 0,0x0000ffff, FALSE),
+  HOWTO(R_390_GOTPLT32,  0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOTPLT32", FALSE, 0,0xffffffff, FALSE),
+  EMPTY_HOWTO (R_390_GOTPLT64),	/* Empty entry for R_390_GOTPLT64.  */
+  HOWTO(R_390_GOTPLTENT, 1, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOTPLTENT",FALSE, 0,0xffffffff, TRUE),
+  HOWTO(R_390_PLTOFF16,  0, 1, 16, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PLTOFF16", FALSE, 0,0x0000ffff, FALSE),
+  HOWTO(R_390_PLTOFF32,  0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PLTOFF32", FALSE, 0,0xffffffff, FALSE),
+  EMPTY_HOWTO (R_390_PLTOFF64),	/* Empty entry for R_390_PLTOFF64.  */
+  HOWTO(R_390_TLS_LOAD, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+	s390_tls_reloc, "R_390_TLS_LOAD", FALSE, 0, 0, FALSE),
+  HOWTO(R_390_TLS_GDCALL, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+	s390_tls_reloc, "R_390_TLS_GDCALL", FALSE, 0, 0, FALSE),
+  HOWTO(R_390_TLS_LDCALL, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+	s390_tls_reloc, "R_390_TLS_LDCALL", FALSE, 0, 0, FALSE),
+  HOWTO(R_390_TLS_GD32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_TLS_GD32", FALSE, 0, 0xffffffff, FALSE),
+  EMPTY_HOWTO (R_390_TLS_GD64),	/* Empty entry for R_390_TLS_GD64.  */
+  HOWTO(R_390_TLS_GOTIE12, 0, 1, 12, FALSE, 0, complain_overflow_dont,
+	bfd_elf_generic_reloc, "R_390_TLS_GOTIE12", FALSE, 0, 0x00000fff, FALSE),
+  HOWTO(R_390_TLS_GOTIE32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_TLS_GOTIE32", FALSE, 0, 0xffffffff, FALSE),
+  EMPTY_HOWTO (R_390_TLS_GOTIE64),	/* Empty entry for R_390_TLS_GOTIE64.  */
+  HOWTO(R_390_TLS_LDM32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_TLS_LDM32", FALSE, 0, 0xffffffff, FALSE),
+  EMPTY_HOWTO (R_390_TLS_LDM64),	/* Empty entry for R_390_TLS_LDM64.  */
+  HOWTO(R_390_TLS_IE32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_TLS_IE32", FALSE, 0, 0xffffffff, FALSE),
+  EMPTY_HOWTO (R_390_TLS_IE64),	/* Empty entry for R_390_TLS_IE64.  */
+  HOWTO(R_390_TLS_IEENT, 1, 2, 32, TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_TLS_IEENT", FALSE, 0, 0xffffffff, TRUE),
+  HOWTO(R_390_TLS_LE32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_TLS_LE32", FALSE, 0, 0xffffffff, FALSE),
+  EMPTY_HOWTO (R_390_TLS_LE64),	/* Empty entry for R_390_TLS_LE64.  */
+  HOWTO(R_390_TLS_LDO32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_TLS_LDO32", FALSE, 0, 0xffffffff, FALSE),
+  EMPTY_HOWTO (R_390_TLS_LDO64),	/* Empty entry for R_390_TLS_LDO64.  */
+  HOWTO(R_390_TLS_DTPMOD, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_TLS_DTPMOD", FALSE, 0, 0xffffffff, FALSE),
+  HOWTO(R_390_TLS_DTPOFF, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_TLS_DTPOFF", FALSE, 0, 0xffffffff, FALSE),
+  HOWTO(R_390_TLS_TPOFF, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_TLS_TPOFF", FALSE, 0, 0xffffffff, FALSE),
+  HOWTO(R_390_20,        0, 2, 20, FALSE, 8, complain_overflow_dont,
+	s390_elf_ldisp_reloc, "R_390_20",      FALSE, 0,0x0fffff00, FALSE),
+  HOWTO(R_390_GOT20,	 0, 2, 20, FALSE, 8, complain_overflow_dont,
+	s390_elf_ldisp_reloc, "R_390_GOT20",   FALSE, 0,0x0fffff00, FALSE),
+  HOWTO(R_390_GOTPLT20,  0, 2, 20, FALSE, 8, complain_overflow_dont,
+	s390_elf_ldisp_reloc, "R_390_GOTPLT20", FALSE, 0,0x0fffff00, FALSE),
+  HOWTO(R_390_TLS_GOTIE20, 0, 2, 20, FALSE, 8, complain_overflow_dont,
+	s390_elf_ldisp_reloc, "R_390_TLS_GOTIE20", FALSE, 0,0x0fffff00, FALSE),
+};
+
+/* GNU extension to record C++ vtable hierarchy.  */
+static reloc_howto_type elf32_s390_vtinherit_howto =
+  HOWTO (R_390_GNU_VTINHERIT, 0,2,0,FALSE,0,complain_overflow_dont, NULL, "R_390_GNU_VTINHERIT", FALSE,0, 0, FALSE);
+static reloc_howto_type elf32_s390_vtentry_howto =
+  HOWTO (R_390_GNU_VTENTRY, 0,2,0,FALSE,0,complain_overflow_dont, _bfd_elf_rel_vtable_reloc_fn,"R_390_GNU_VTENTRY", FALSE,0,0, FALSE);
+
+static reloc_howto_type *
+elf_s390_reloc_type_lookup (abfd, code)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     bfd_reloc_code_real_type code;
+{
+  switch (code)
+    {
+    case BFD_RELOC_NONE:
+      return &elf_howto_table[(int) R_390_NONE];
+    case BFD_RELOC_8:
+      return &elf_howto_table[(int) R_390_8];
+    case BFD_RELOC_390_12:
+      return &elf_howto_table[(int) R_390_12];
+    case BFD_RELOC_16:
+      return &elf_howto_table[(int) R_390_16];
+    case BFD_RELOC_32:
+      return &elf_howto_table[(int) R_390_32];
+    case BFD_RELOC_CTOR:
+      return &elf_howto_table[(int) R_390_32];
+    case BFD_RELOC_32_PCREL:
+      return &elf_howto_table[(int) R_390_PC32];
+    case BFD_RELOC_390_GOT12:
+      return &elf_howto_table[(int) R_390_GOT12];
+    case BFD_RELOC_32_GOT_PCREL:
+      return &elf_howto_table[(int) R_390_GOT32];
+    case BFD_RELOC_390_PLT32:
+      return &elf_howto_table[(int) R_390_PLT32];
+    case BFD_RELOC_390_COPY:
+      return &elf_howto_table[(int) R_390_COPY];
+    case BFD_RELOC_390_GLOB_DAT:
+      return &elf_howto_table[(int) R_390_GLOB_DAT];
+    case BFD_RELOC_390_JMP_SLOT:
+      return &elf_howto_table[(int) R_390_JMP_SLOT];
+    case BFD_RELOC_390_RELATIVE:
+      return &elf_howto_table[(int) R_390_RELATIVE];
+    case BFD_RELOC_32_GOTOFF:
+      return &elf_howto_table[(int) R_390_GOTOFF32];
+    case BFD_RELOC_390_GOTPC:
+      return &elf_howto_table[(int) R_390_GOTPC];
+    case BFD_RELOC_390_GOT16:
+      return &elf_howto_table[(int) R_390_GOT16];
+    case BFD_RELOC_16_PCREL:
+      return &elf_howto_table[(int) R_390_PC16];
+    case BFD_RELOC_390_PC16DBL:
+      return &elf_howto_table[(int) R_390_PC16DBL];
+    case BFD_RELOC_390_PLT16DBL:
+      return &elf_howto_table[(int) R_390_PLT16DBL];
+    case BFD_RELOC_390_PC32DBL:
+      return &elf_howto_table[(int) R_390_PC32DBL];
+    case BFD_RELOC_390_PLT32DBL:
+      return &elf_howto_table[(int) R_390_PLT32DBL];
+    case BFD_RELOC_390_GOTPCDBL:
+      return &elf_howto_table[(int) R_390_GOTPCDBL];
+    case BFD_RELOC_390_GOTENT:
+      return &elf_howto_table[(int) R_390_GOTENT];
+    case BFD_RELOC_16_GOTOFF:
+      return &elf_howto_table[(int) R_390_GOTOFF16];
+    case BFD_RELOC_390_GOTPLT12:
+      return &elf_howto_table[(int) R_390_GOTPLT12];
+    case BFD_RELOC_390_GOTPLT16:
+      return &elf_howto_table[(int) R_390_GOTPLT16];
+    case BFD_RELOC_390_GOTPLT32:
+      return &elf_howto_table[(int) R_390_GOTPLT32];
+    case BFD_RELOC_390_GOTPLTENT:
+      return &elf_howto_table[(int) R_390_GOTPLTENT];
+    case BFD_RELOC_390_PLTOFF16:
+      return &elf_howto_table[(int) R_390_PLTOFF16];
+    case BFD_RELOC_390_PLTOFF32:
+      return &elf_howto_table[(int) R_390_PLTOFF32];
+    case BFD_RELOC_390_TLS_LOAD:
+      return &elf_howto_table[(int) R_390_TLS_LOAD];
+    case BFD_RELOC_390_TLS_GDCALL:
+      return &elf_howto_table[(int) R_390_TLS_GDCALL];
+    case BFD_RELOC_390_TLS_LDCALL:
+      return &elf_howto_table[(int) R_390_TLS_LDCALL];
+    case BFD_RELOC_390_TLS_GD32:
+      return &elf_howto_table[(int) R_390_TLS_GD32];
+    case BFD_RELOC_390_TLS_GOTIE12:
+      return &elf_howto_table[(int) R_390_TLS_GOTIE12];
+    case BFD_RELOC_390_TLS_GOTIE32:
+      return &elf_howto_table[(int) R_390_TLS_GOTIE32];
+    case BFD_RELOC_390_TLS_LDM32:
+      return &elf_howto_table[(int) R_390_TLS_LDM32];
+    case BFD_RELOC_390_TLS_IE32:
+      return &elf_howto_table[(int) R_390_TLS_IE32];
+    case BFD_RELOC_390_TLS_IEENT:
+      return &elf_howto_table[(int) R_390_TLS_IEENT];
+    case BFD_RELOC_390_TLS_LE32:
+      return &elf_howto_table[(int) R_390_TLS_LE32];
+    case BFD_RELOC_390_TLS_LDO32:
+      return &elf_howto_table[(int) R_390_TLS_LDO32];
+    case BFD_RELOC_390_TLS_DTPMOD:
+      return &elf_howto_table[(int) R_390_TLS_DTPMOD];
+    case BFD_RELOC_390_TLS_DTPOFF:
+      return &elf_howto_table[(int) R_390_TLS_DTPOFF];
+    case BFD_RELOC_390_TLS_TPOFF:
+      return &elf_howto_table[(int) R_390_TLS_TPOFF];
+    case BFD_RELOC_390_20:
+      return &elf_howto_table[(int) R_390_20];
+    case BFD_RELOC_390_GOT20:
+      return &elf_howto_table[(int) R_390_GOT20];
+    case BFD_RELOC_390_GOTPLT20:
+      return &elf_howto_table[(int) R_390_GOTPLT20];
+    case BFD_RELOC_390_TLS_GOTIE20:
+      return &elf_howto_table[(int) R_390_TLS_GOTIE20];
+    case BFD_RELOC_VTABLE_INHERIT:
+      return &elf32_s390_vtinherit_howto;
+    case BFD_RELOC_VTABLE_ENTRY:
+      return &elf32_s390_vtentry_howto;
+    default:
+      break;
+    }
+  return 0;
+}
+
+static reloc_howto_type *
+elf_s390_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (elf_howto_table) / sizeof (elf_howto_table[0]); i++)
+    if (elf_howto_table[i].name != NULL
+	&& strcasecmp (elf_howto_table[i].name, r_name) == 0)
+      return &elf_howto_table[i];
+
+  if (strcasecmp (elf32_s390_vtinherit_howto.name, r_name) == 0)
+    return &elf32_s390_vtinherit_howto;
+  if (strcasecmp (elf32_s390_vtentry_howto.name, r_name) == 0)
+    return &elf32_s390_vtentry_howto;
+
+  return NULL;
+}
+
+/* We need to use ELF32_R_TYPE so we have our own copy of this function,
+   and elf32-s390.c has its own copy.  */
+
+static void
+elf_s390_info_to_howto (abfd, cache_ptr, dst)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *cache_ptr;
+     Elf_Internal_Rela *dst;
+{
+  unsigned int r_type = ELF32_R_TYPE(dst->r_info);
+  switch (r_type)
+    {
+    case R_390_GNU_VTINHERIT:
+      cache_ptr->howto = &elf32_s390_vtinherit_howto;
+      break;
+
+    case R_390_GNU_VTENTRY:
+      cache_ptr->howto = &elf32_s390_vtentry_howto;
+      break;
+
+    default:
+      if (r_type >= sizeof (elf_howto_table) / sizeof (elf_howto_table[0]))
+	{
+	  (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
+				 abfd, (int) r_type);
+	  r_type = R_390_NONE;
+	}
+      cache_ptr->howto = &elf_howto_table[r_type];
+    }
+}
+
+/* A relocation function which doesn't do anything.  */
+static bfd_reloc_status_type
+s390_tls_reloc (abfd, reloc_entry, symbol, data, input_section,
+		output_bfd, error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry;
+     asymbol *symbol ATTRIBUTE_UNUSED;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  if (output_bfd)
+    reloc_entry->address += input_section->output_offset;
+  return bfd_reloc_ok;
+}
+
+/* Handle the large displacement relocs.  */
+static bfd_reloc_status_type
+s390_elf_ldisp_reloc (abfd, reloc_entry, symbol, data, input_section,
+                      output_bfd, error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry;
+     asymbol *symbol;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  reloc_howto_type *howto = reloc_entry->howto;
+  bfd_vma relocation;
+  bfd_vma insn;
+  
+  if (output_bfd != (bfd *) NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (! howto->partial_inplace
+	  || reloc_entry->addend == 0))
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+  
+  if (output_bfd != NULL)
+    return bfd_reloc_continue;
+  
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+  
+  relocation = (symbol->value
+		+ symbol->section->output_section->vma
+		+ symbol->section->output_offset);
+  relocation += reloc_entry->addend;
+  if (howto->pc_relative)
+    {
+      relocation -= (input_section->output_section->vma
+		     + input_section->output_offset);
+      relocation -= reloc_entry->address;
+    }
+  
+  insn = bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
+  insn |= (relocation & 0xfff) << 16 | (relocation & 0xff000) >> 4;
+  bfd_put_32 (abfd, insn, (bfd_byte *) data + reloc_entry->address);
+  
+  if ((bfd_signed_vma) relocation < - 0x80000
+      || (bfd_signed_vma) relocation > 0x7ffff)
+    return bfd_reloc_overflow;
+  else
+    return bfd_reloc_ok;
+}
+
+static bfd_boolean
+elf_s390_is_local_label_name (abfd, name)
+     bfd *abfd;
+     const char *name;
+{
+  if (name[0] == '.' && (name[1] == 'X' || name[1] == 'L'))
+    return TRUE;
+
+  return _bfd_elf_is_local_label_name (abfd, name);
+}
+
+/* Functions for the 390 ELF linker.  */
+
+/* The name of the dynamic interpreter.  This is put in the .interp
+   section.  */
+
+#define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so.1"
+
+/* If ELIMINATE_COPY_RELOCS is non-zero, the linker will try to avoid
+   copying dynamic variables from a shared lib into an app's dynbss
+   section, and instead use a dynamic relocation to point into the
+   shared lib.  */
+#define ELIMINATE_COPY_RELOCS 1
+
+/* The size in bytes of the first entry in the procedure linkage table.  */
+#define PLT_FIRST_ENTRY_SIZE 32
+/* The size in bytes of an entry in the procedure linkage table.  */
+#define PLT_ENTRY_SIZE 32
+
+#define GOT_ENTRY_SIZE 4
+
+/* The first three entries in a procedure linkage table are reserved,
+   and the initial contents are unimportant (we zero them out).
+   Subsequent entries look like this.  See the SVR4 ABI 386
+   supplement to see how this works.  */
+
+/* For the s390, simple addr offset can only be 0 - 4096.
+   To use the full 2 GB address space, several instructions
+   are needed to load an address in a register and execute
+   a branch( or just saving the address)
+
+   Furthermore, only r 0 and 1 are free to use!!!  */
+
+/* The first 3 words in the GOT are then reserved.
+   Word 0 is the address of the dynamic table.
+   Word 1 is a pointer to a structure describing the object
+   Word 2 is used to point to the loader entry address.
+
+   The code for position independent PLT entries looks like this:
+
+   r12 holds addr of the current GOT at entry to the PLT
+
+   The GOT holds the address in the PLT to be executed.
+   The loader then gets:
+   24(15) =  Pointer to the structure describing the object.
+   28(15) =  Offset in symbol table
+
+   The loader  must  then find the module where the function is
+   and insert the address in the GOT.
+
+  Note: 390 can only address +- 64 K relative.
+        We check if offset > 65536, then make a relative branch -64xxx
+        back to a previous defined branch
+
+PLT1: BASR 1,0         # 2 bytes
+      L    1,22(1)     # 4 bytes  Load offset in GOT in r 1
+      L    1,(1,12)    # 4 bytes  Load address from GOT in r1
+      BCR  15,1        # 2 bytes  Jump to address
+RET1: BASR 1,0         # 2 bytes  Return from GOT 1st time
+      L    1,14(1)     # 4 bytes  Load offset in symol table in r1
+      BRC  15,-x       # 4 bytes  Jump to start of PLT
+      .word 0          # 2 bytes filler
+      .long ?          # 4 bytes  offset in GOT
+      .long ?          # 4 bytes  offset into symbol table
+
+  This was the general case. There are two additional, optimizes PLT
+  definitions. One for GOT offsets < 4096 and one for GOT offsets < 32768.
+  First the one for GOT offsets < 4096:
+
+PLT1: L    1,<offset>(12) # 4 bytes  Load address from GOT in R1
+      BCR  15,1           # 2 bytes  Jump to address
+      .word 0,0,0         # 6 bytes  filler
+RET1: BASR 1,0            # 2 bytes  Return from GOT 1st time
+      L    1,14(1)        # 4 bytes  Load offset in symbol table in r1
+      BRC  15,-x          # 4 bytes  Jump to start of PLT
+      .word 0,0,0         # 6 bytes  filler
+      .long ?             # 4 bytes  offset into symbol table
+
+  Second the one for GOT offsets < 32768:
+
+PLT1: LHI  1,<offset>     # 4 bytes  Load offset in GOT to r1
+      L    1,(1,12)       # 4 bytes  Load address from GOT to r1
+      BCR  15,1           # 2 bytes  Jump to address
+      .word 0             # 2 bytes  filler
+RET1: BASR 1,0            # 2 bytes  Return from GOT 1st time
+      L    1,14(1)        # 4 bytes  Load offset in symbol table in r1
+      BRC  15,-x          # 4 bytes  Jump to start of PLT
+      .word 0,0,0         # 6 bytes  filler
+      .long ?             # 4 bytes  offset into symbol table
+
+Total = 32 bytes per PLT entry
+
+   The code for static build PLT entries looks like this:
+
+PLT1: BASR 1,0         # 2 bytes
+      L    1,22(1)     # 4 bytes  Load address of GOT entry
+      L    1,0(0,1)    # 4 bytes  Load address from GOT in r1
+      BCR  15,1        # 2 bytes  Jump to address
+RET1: BASR 1,0         # 2 bytes  Return from GOT 1st time
+      L    1,14(1)     # 4 bytes  Load offset in symbol table in r1
+      BRC  15,-x       # 4 bytes  Jump to start of PLT
+      .word 0          # 2 bytes  filler
+      .long ?          # 4 bytes  address of GOT entry
+      .long ?          # 4 bytes  offset into symbol table  */
+
+#define PLT_PIC_ENTRY_WORD0 0x0d105810
+#define PLT_PIC_ENTRY_WORD1 0x10165811
+#define PLT_PIC_ENTRY_WORD2 0xc00007f1
+#define PLT_PIC_ENTRY_WORD3 0x0d105810
+#define PLT_PIC_ENTRY_WORD4 0x100ea7f4
+
+#define PLT_PIC12_ENTRY_WORD0 0x5810c000
+#define PLT_PIC12_ENTRY_WORD1 0x07f10000
+#define PLT_PIC12_ENTRY_WORD2 0x00000000
+#define PLT_PIC12_ENTRY_WORD3 0x0d105810
+#define PLT_PIC12_ENTRY_WORD4 0x100ea7f4
+
+#define PLT_PIC16_ENTRY_WORD0 0xa7180000
+#define PLT_PIC16_ENTRY_WORD1 0x5811c000
+#define PLT_PIC16_ENTRY_WORD2 0x07f10000
+#define PLT_PIC16_ENTRY_WORD3 0x0d105810
+#define PLT_PIC16_ENTRY_WORD4 0x100ea7f4
+
+#define PLT_ENTRY_WORD0     0x0d105810
+#define PLT_ENTRY_WORD1     0x10165810
+#define PLT_ENTRY_WORD2     0x100007f1
+#define PLT_ENTRY_WORD3     0x0d105810
+#define PLT_ENTRY_WORD4     0x100ea7f4
+
+/* The first PLT entry pushes the offset into the symbol table
+   from R1 onto the stack at 8(15) and the loader object info
+   at 12(15), loads the loader address in R1 and jumps to it.  */
+
+/* The first entry in the PLT for PIC code:
+
+PLT0:
+   ST   1,28(15)  # R1 has offset into symbol table
+   L    1,4(12)   # Get loader ino(object struct address)
+   ST   1,24(15)  # Store address
+   L    1,8(12)   # Entry address of loader in R1
+   BR   1         # Jump to loader
+
+   The first entry in the PLT for static code:
+
+PLT0:
+   ST   1,28(15)      # R1 has offset into symbol table
+   BASR 1,0
+   L    1,18(0,1)     # Get address of GOT
+   MVC  24(4,15),4(1) # Move loader ino to stack
+   L    1,8(1)        # Get address of loader
+   BR   1             # Jump to loader
+   .word 0            # filler
+   .long got          # address of GOT  */
+
+#define PLT_PIC_FIRST_ENTRY_WORD0 0x5010f01c
+#define PLT_PIC_FIRST_ENTRY_WORD1 0x5810c004
+#define PLT_PIC_FIRST_ENTRY_WORD2 0x5010f018
+#define PLT_PIC_FIRST_ENTRY_WORD3 0x5810c008
+#define PLT_PIC_FIRST_ENTRY_WORD4 0x07f10000
+
+#define PLT_FIRST_ENTRY_WORD0     0x5010f01c
+#define PLT_FIRST_ENTRY_WORD1     0x0d105810
+#define PLT_FIRST_ENTRY_WORD2     0x1012D203
+#define PLT_FIRST_ENTRY_WORD3     0xf0181004
+#define PLT_FIRST_ENTRY_WORD4     0x58101008
+#define PLT_FIRST_ENTRY_WORD5     0x07f10000
+
+/* The s390 linker needs to keep track of the number of relocs that it
+   decides to copy as dynamic relocs in check_relocs for each symbol.
+   This is so that it can later discard them if they are found to be
+   unnecessary.  We store the information in a field extending the
+   regular ELF linker hash table.  */
+
+struct elf_s390_dyn_relocs
+{
+  struct elf_s390_dyn_relocs *next;
+
+  /* The input section of the reloc.  */
+  asection *sec;
+
+  /* Total number of relocs copied for the input section.  */
+  bfd_size_type count;
+
+  /* Number of pc-relative relocs copied for the input section.  */
+  bfd_size_type pc_count;
+};
+
+/* s390 ELF linker hash entry.  */
+
+struct elf_s390_link_hash_entry
+{
+  struct elf_link_hash_entry elf;
+
+  /* Track dynamic relocs copied for this symbol.  */
+  struct elf_s390_dyn_relocs *dyn_relocs;
+
+  /* Number of GOTPLT references for a function.  */
+  bfd_signed_vma gotplt_refcount;
+
+#define GOT_UNKNOWN	0
+#define GOT_NORMAL	1
+#define GOT_TLS_GD	2
+#define GOT_TLS_IE	3
+#define GOT_TLS_IE_NLT	4
+  unsigned char tls_type;
+};
+
+#define elf_s390_hash_entry(ent) \
+  ((struct elf_s390_link_hash_entry *)(ent))
+
+/* NOTE: Keep this structure in sync with
+   the one declared in elf64-s390.c.  */
+struct elf_s390_obj_tdata
+{
+  struct elf_obj_tdata root;
+
+  /* TLS type for each local got entry.  */
+  char *local_got_tls_type;
+};
+
+#define elf_s390_tdata(abfd) \
+  ((struct elf_s390_obj_tdata *) (abfd)->tdata.any)
+
+#define elf_s390_local_got_tls_type(abfd) \
+  (elf_s390_tdata (abfd)->local_got_tls_type)
+
+#define is_s390_elf(bfd) \
+  (bfd_get_flavour (bfd) == bfd_target_elf_flavour \
+   && elf_tdata (bfd) != NULL \
+   && elf_object_id (bfd) == S390_ELF_DATA)
+
+static bfd_boolean
+elf_s390_mkobject (bfd *abfd)
+{
+  return bfd_elf_allocate_object (abfd, sizeof (struct elf_s390_obj_tdata),
+				  S390_ELF_DATA);
+}
+
+static bfd_boolean
+elf_s390_object_p (abfd)
+     bfd *abfd;
+{
+  /* Set the right machine number for an s390 elf32 file.  */
+  return bfd_default_set_arch_mach (abfd, bfd_arch_s390, bfd_mach_s390_31);
+}
+
+/* s390 ELF linker hash table.  */
+
+struct elf_s390_link_hash_table
+{
+  struct elf_link_hash_table elf;
+
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *sgot;
+  asection *sgotplt;
+  asection *srelgot;
+  asection *splt;
+  asection *srelplt;
+  asection *sdynbss;
+  asection *srelbss;
+
+  union {
+    bfd_signed_vma refcount;
+    bfd_vma offset;
+  } tls_ldm_got;
+
+  /* Small local sym cache.  */
+  struct sym_cache sym_cache;
+};
+
+/* Get the s390 ELF linker hash table from a link_info structure.  */
+
+#define elf_s390_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == S390_ELF_DATA ? ((struct elf_s390_link_hash_table *) ((p)->hash)) : NULL)
+
+/* Create an entry in an s390 ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+link_hash_newfunc (entry, table, string)
+     struct bfd_hash_entry *entry;
+     struct bfd_hash_table *table;
+     const char *string;
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table,
+				 sizeof (struct elf_s390_link_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = _bfd_elf_link_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct elf_s390_link_hash_entry *eh;
+
+      eh = (struct elf_s390_link_hash_entry *) entry;
+      eh->dyn_relocs = NULL;
+      eh->gotplt_refcount = 0;
+      eh->tls_type = GOT_UNKNOWN;
+    }
+
+  return entry;
+}
+
+/* Create an s390 ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+elf_s390_link_hash_table_create (abfd)
+     bfd *abfd;
+{
+  struct elf_s390_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct elf_s390_link_hash_table);
+
+  ret = (struct elf_s390_link_hash_table *) bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd, link_hash_newfunc,
+				      sizeof (struct elf_s390_link_hash_entry),
+				      S390_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  ret->sgot = NULL;
+  ret->sgotplt = NULL;
+  ret->srelgot = NULL;
+  ret->splt = NULL;
+  ret->srelplt = NULL;
+  ret->sdynbss = NULL;
+  ret->srelbss = NULL;
+  ret->tls_ldm_got.refcount = 0;
+  ret->sym_cache.abfd = NULL;
+
+  return &ret->elf.root;
+}
+
+/* Create .got, .gotplt, and .rela.got sections in DYNOBJ, and set up
+   shortcuts to them in our hash table.  */
+
+static bfd_boolean
+create_got_section (dynobj, info)
+     bfd *dynobj;
+     struct bfd_link_info *info;
+{
+  struct elf_s390_link_hash_table *htab;
+
+  if (! _bfd_elf_create_got_section (dynobj, info))
+    return FALSE;
+
+  htab = elf_s390_hash_table (info);
+  htab->sgot = bfd_get_section_by_name (dynobj, ".got");
+  htab->sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");
+  htab->srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+  if (!htab->sgot || !htab->sgotplt || !htab->srelgot)
+    abort ();
+
+  return TRUE;
+}
+
+/* Create .plt, .rela.plt, .got, .got.plt, .rela.got, .dynbss, and
+   .rela.bss sections in DYNOBJ, and set up shortcuts to them in our
+   hash table.  */
+
+static bfd_boolean
+elf_s390_create_dynamic_sections (dynobj, info)
+     bfd *dynobj;
+     struct bfd_link_info *info;
+{
+  struct elf_s390_link_hash_table *htab;
+
+  htab = elf_s390_hash_table (info);
+  if (!htab->sgot && !create_got_section (dynobj, info))
+    return FALSE;
+
+  if (!_bfd_elf_create_dynamic_sections (dynobj, info))
+    return FALSE;
+
+  htab->splt = bfd_get_section_by_name (dynobj, ".plt");
+  htab->srelplt = bfd_get_section_by_name (dynobj, ".rela.plt");
+  htab->sdynbss = bfd_get_section_by_name (dynobj, ".dynbss");
+  if (!info->shared)
+    htab->srelbss = bfd_get_section_by_name (dynobj, ".rela.bss");
+
+  if (!htab->splt || !htab->srelplt || !htab->sdynbss
+      || (!info->shared && !htab->srelbss))
+    abort ();
+
+  return TRUE;
+}
+
+/* Copy the extra info we tack onto an elf_link_hash_entry.  */
+
+static void
+elf_s390_copy_indirect_symbol (info, dir, ind)
+     struct bfd_link_info *info;
+     struct elf_link_hash_entry *dir, *ind;
+{
+  struct elf_s390_link_hash_entry *edir, *eind;
+
+  edir = (struct elf_s390_link_hash_entry *) dir;
+  eind = (struct elf_s390_link_hash_entry *) ind;
+
+  if (eind->dyn_relocs != NULL)
+    {
+      if (edir->dyn_relocs != NULL)
+	{
+	  struct elf_s390_dyn_relocs **pp;
+	  struct elf_s390_dyn_relocs *p;
+
+	  /* Add reloc counts against the indirect sym to the direct sym
+	     list.  Merge any entries against the same section.  */
+	  for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      struct elf_s390_dyn_relocs *q;
+
+	      for (q = edir->dyn_relocs; q != NULL; q = q->next)
+		if (q->sec == p->sec)
+		  {
+		    q->pc_count += p->pc_count;
+		    q->count += p->count;
+		    *pp = p->next;
+		    break;
+		  }
+	      if (q == NULL)
+		pp = &p->next;
+	    }
+	  *pp = edir->dyn_relocs;
+	}
+
+      edir->dyn_relocs = eind->dyn_relocs;
+      eind->dyn_relocs = NULL;
+    }
+
+  if (ind->root.type == bfd_link_hash_indirect
+      && dir->got.refcount <= 0)
+    {
+      edir->tls_type = eind->tls_type;
+      eind->tls_type = GOT_UNKNOWN;
+    }
+
+  if (ELIMINATE_COPY_RELOCS
+      && ind->root.type != bfd_link_hash_indirect
+      && dir->dynamic_adjusted)
+    {
+      /* If called to transfer flags for a weakdef during processing
+	 of elf_adjust_dynamic_symbol, don't copy non_got_ref.
+	 We clear it ourselves for ELIMINATE_COPY_RELOCS.  */
+      dir->ref_dynamic |= ind->ref_dynamic;
+      dir->ref_regular |= ind->ref_regular;
+      dir->ref_regular_nonweak |= ind->ref_regular_nonweak;
+      dir->needs_plt |= ind->needs_plt;
+    }
+  else
+    _bfd_elf_link_hash_copy_indirect (info, dir, ind);
+}
+
+static int
+elf_s390_tls_transition (info, r_type, is_local)
+     struct bfd_link_info *info;
+     int r_type;
+     int is_local;
+{
+  if (info->shared)
+    return r_type;
+
+  switch (r_type)
+    {
+    case R_390_TLS_GD32:
+    case R_390_TLS_IE32:
+      if (is_local)
+	return R_390_TLS_LE32;
+      return R_390_TLS_IE32;
+    case R_390_TLS_GOTIE32:
+      if (is_local)
+	return R_390_TLS_LE32;
+      return R_390_TLS_GOTIE32;
+    case R_390_TLS_LDM32:
+      return R_390_TLS_LE32;
+    }
+
+  return r_type;
+}
+
+/* Look through the relocs for a section during the first phase, and
+   allocate space in the global offset table or procedure linkage
+   table.  */
+
+static bfd_boolean
+elf_s390_check_relocs (abfd, info, sec, relocs)
+     bfd *abfd;
+     struct bfd_link_info *info;
+     asection *sec;
+     const Elf_Internal_Rela *relocs;
+{
+  struct elf_s390_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  asection *sreloc;
+  bfd_signed_vma *local_got_refcounts;
+  int tls_type, old_tls_type;
+
+  if (info->relocatable)
+    return TRUE;
+
+  BFD_ASSERT (is_s390_elf (abfd));
+
+  htab = elf_s390_hash_table (info);
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+
+  sreloc = NULL;
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      unsigned int r_type;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
+	{
+	  (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
+				 abfd, r_symndx);
+	  return FALSE;
+	}
+
+      if (r_symndx < symtab_hdr->sh_info)
+	h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      /* Create got section and local_got_refcounts array if they
+	 are needed.  */
+      r_type = elf_s390_tls_transition (info,
+					ELF32_R_TYPE (rel->r_info),
+					h == NULL);
+      switch (r_type)
+	{
+	case R_390_GOT12:
+	case R_390_GOT16:
+	case R_390_GOT20:
+	case R_390_GOT32:
+	case R_390_GOTENT:
+	case R_390_GOTPLT12:
+	case R_390_GOTPLT16:
+	case R_390_GOTPLT20:
+	case R_390_GOTPLT32:
+	case R_390_GOTPLTENT:
+	case R_390_TLS_GD32:
+	case R_390_TLS_GOTIE12:
+	case R_390_TLS_GOTIE20:
+	case R_390_TLS_GOTIE32:
+	case R_390_TLS_IEENT:
+	case R_390_TLS_IE32:
+	case R_390_TLS_LDM32:
+	  if (h == NULL
+	      && local_got_refcounts == NULL)
+	    {
+	      bfd_size_type size;
+
+	      size = symtab_hdr->sh_info;
+	      size *= (sizeof (bfd_signed_vma) + sizeof(char));
+	      local_got_refcounts = ((bfd_signed_vma *)
+				     bfd_zalloc (abfd, size));
+	      if (local_got_refcounts == NULL)
+		return FALSE;
+	      elf_local_got_refcounts (abfd) = local_got_refcounts;
+	      elf_s390_local_got_tls_type (abfd)
+		= (char *) (local_got_refcounts + symtab_hdr->sh_info);
+	    }
+	  /* Fall through.  */
+	case R_390_GOTOFF16:
+	case R_390_GOTOFF32:
+	case R_390_GOTPC:
+	case R_390_GOTPCDBL:
+	  if (htab->sgot == NULL)
+	    {
+	      if (htab->elf.dynobj == NULL)
+		htab->elf.dynobj = abfd;
+	      if (!create_got_section (htab->elf.dynobj, info))
+		return FALSE;
+	    }
+	}
+
+      switch (r_type)
+	{
+	case R_390_GOTOFF16:
+	case R_390_GOTOFF32:
+	case R_390_GOTPC:
+	case R_390_GOTPCDBL:
+	  /* Got is created, nothing to be done.  */
+	  break;
+
+	case R_390_PLT16DBL:
+	case R_390_PLT32DBL:
+	case R_390_PLT32:
+	case R_390_PLTOFF16:
+	case R_390_PLTOFF32:
+	  /* This symbol requires a procedure linkage table entry.  We
+	     actually build the entry in adjust_dynamic_symbol,
+	     because this might be a case of linking PIC code which is
+	     never referenced by a dynamic object, in which case we
+	     don't need to generate a procedure linkage table entry
+	     after all.  */
+
+	  /* If this is a local symbol, we resolve it directly without
+	     creating a procedure linkage table entry.  */
+	  if (h != NULL)
+	    {
+	      h->needs_plt = 1;
+	      h->plt.refcount += 1;
+	    }
+	  break;
+
+	case R_390_GOTPLT12:
+	case R_390_GOTPLT16:
+	case R_390_GOTPLT20:
+	case R_390_GOTPLT32:
+	case R_390_GOTPLTENT:
+	  /* This symbol requires either a procedure linkage table entry
+	     or an entry in the local got. We actually build the entry
+	     in adjust_dynamic_symbol because whether this is really a
+	     global reference can change and with it the fact if we have
+	     to create a plt entry or a local got entry. To be able to
+	     make a once global symbol a local one we have to keep track
+	     of the number of gotplt references that exist for this
+	     symbol.  */
+	  if (h != NULL)
+	    {
+	      ((struct elf_s390_link_hash_entry *) h)->gotplt_refcount++;
+	      h->needs_plt = 1;
+	      h->plt.refcount += 1;
+	    }
+	  else
+	    local_got_refcounts[r_symndx] += 1;
+	  break;
+
+	case R_390_TLS_LDM32:
+	  htab->tls_ldm_got.refcount += 1;
+	  break;
+
+	case R_390_TLS_IE32:
+	case R_390_TLS_GOTIE12:
+	case R_390_TLS_GOTIE20:
+	case R_390_TLS_GOTIE32:
+	case R_390_TLS_IEENT:
+	  if (info->shared)
+	    info->flags |= DF_STATIC_TLS;
+	  /* Fall through.  */
+
+	case R_390_GOT12:
+	case R_390_GOT16:
+	case R_390_GOT20:
+	case R_390_GOT32:
+	case R_390_GOTENT:
+	case R_390_TLS_GD32:
+	  /* This symbol requires a global offset table entry.  */
+	  switch (r_type)
+	    {
+	    default:
+	    case R_390_GOT12:
+	    case R_390_GOT16:
+	    case R_390_GOT20:
+	    case R_390_GOT32:
+	    case R_390_GOTENT:
+	      tls_type = GOT_NORMAL;
+	      break;
+	    case R_390_TLS_GD32:
+	      tls_type = GOT_TLS_GD;
+	      break;
+	    case R_390_TLS_IE32:
+	    case R_390_TLS_GOTIE32:
+	      tls_type = GOT_TLS_IE;
+	      break;
+	    case R_390_TLS_GOTIE12:
+	    case R_390_TLS_GOTIE20:
+	    case R_390_TLS_IEENT:
+	      tls_type = GOT_TLS_IE_NLT;
+	      break;
+	    }
+
+	  if (h != NULL)
+	    {
+	      h->got.refcount += 1;
+	      old_tls_type = elf_s390_hash_entry(h)->tls_type;
+	    }
+	  else
+	    {
+	      local_got_refcounts[r_symndx] += 1;
+	      old_tls_type = elf_s390_local_got_tls_type (abfd) [r_symndx];
+	    }
+	  /* If a TLS symbol is accessed using IE at least once,
+	     there is no point to use dynamic model for it.  */
+	  if (old_tls_type != tls_type && old_tls_type != GOT_UNKNOWN)
+	    {
+	      if (old_tls_type == GOT_NORMAL || tls_type == GOT_NORMAL)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B: `%s' accessed both as normal and thread local symbol"),
+		     abfd, h->root.root.string);
+		  return FALSE;
+		}
+	      if (old_tls_type > tls_type)
+		tls_type = old_tls_type;
+	    }
+
+	  if (old_tls_type != tls_type)
+	    {
+	      if (h != NULL)
+		elf_s390_hash_entry (h)->tls_type = tls_type;
+	      else
+		elf_s390_local_got_tls_type (abfd) [r_symndx] = tls_type;
+	    }
+
+	  if (r_type != R_390_TLS_IE32)
+	    break;
+	  /* Fall through.  */
+
+	case R_390_TLS_LE32:
+	  if (!info->shared)
+	    break;
+	  info->flags |= DF_STATIC_TLS;
+	  /* Fall through.  */
+
+	case R_390_8:
+	case R_390_16:
+	case R_390_32:
+	case R_390_PC16:
+	case R_390_PC16DBL:
+	case R_390_PC32DBL:
+	case R_390_PC32:
+	  if (h != NULL && !info->shared)
+	    {
+	      /* If this reloc is in a read-only section, we might
+		 need a copy reloc.  We can't check reliably at this
+		 stage whether the section is read-only, as input
+		 sections have not yet been mapped to output sections.
+		 Tentatively set the flag for now, and correct in
+		 adjust_dynamic_symbol.  */
+	      h->non_got_ref = 1;
+
+	      /* We may need a .plt entry if the function this reloc
+		 refers to is in a shared lib.  */
+	      h->plt.refcount += 1;
+	    }
+
+	  /* If we are creating a shared library, and this is a reloc
+	     against a global symbol, or a non PC relative reloc
+	     against a local symbol, then we need to copy the reloc
+	     into the shared library.  However, if we are linking with
+	     -Bsymbolic, we do not need to copy a reloc against a
+	     global symbol which is defined in an object we are
+	     including in the link (i.e., DEF_REGULAR is set).  At
+	     this point we have not seen all the input files, so it is
+	     possible that DEF_REGULAR is not set now but will be set
+	     later (it is never cleared).  In case of a weak definition,
+	     DEF_REGULAR may be cleared later by a strong definition in
+	     a shared library. We account for that possibility below by
+	     storing information in the relocs_copied field of the hash
+	     table entry.  A similar situation occurs when creating
+	     shared libraries and symbol visibility changes render the
+	     symbol local.
+
+	     If on the other hand, we are creating an executable, we
+	     may need to keep relocations for symbols satisfied by a
+	     dynamic library if we manage to avoid copy relocs for the
+	     symbol.  */
+	  if ((info->shared
+	       && (sec->flags & SEC_ALLOC) != 0
+	       && ((ELF32_R_TYPE (rel->r_info) != R_390_PC16
+		    && ELF32_R_TYPE (rel->r_info) != R_390_PC16DBL
+		    && ELF32_R_TYPE (rel->r_info) != R_390_PC32DBL
+		    && ELF32_R_TYPE (rel->r_info) != R_390_PC32)
+		   || (h != NULL
+		       && (! SYMBOLIC_BIND (info, h)
+			   || h->root.type == bfd_link_hash_defweak
+			   || !h->def_regular))))
+	      || (ELIMINATE_COPY_RELOCS
+		  && !info->shared
+		  && (sec->flags & SEC_ALLOC) != 0
+		  && h != NULL
+		  && (h->root.type == bfd_link_hash_defweak
+		      || !h->def_regular)))
+	    {
+	      struct elf_s390_dyn_relocs *p;
+	      struct elf_s390_dyn_relocs **head;
+
+	      /* We must copy these reloc types into the output file.
+		 Create a reloc section in dynobj and make room for
+		 this reloc.  */
+	      if (sreloc == NULL)
+		{
+		  if (htab->elf.dynobj == NULL)
+		    htab->elf.dynobj = abfd;
+
+		  sreloc = _bfd_elf_make_dynamic_reloc_section
+		    (sec, htab->elf.dynobj, 2, abfd, /*rela?*/ TRUE);
+
+		  if (sreloc == NULL)
+		    return FALSE;
+		}
+
+	      /* If this is a global symbol, we count the number of
+		 relocations we need for this symbol.  */
+	      if (h != NULL)
+		{
+		  head = &((struct elf_s390_link_hash_entry *) h)->dyn_relocs;
+		}
+	      else
+		{
+		  /* Track dynamic relocs needed for local syms too.
+		     We really need local syms available to do this
+		     easily.  Oh well.  */
+		  asection *s;
+		  void *vpp;
+		  Elf_Internal_Sym *isym;
+
+		  isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+						abfd, r_symndx);
+		  if (isym == NULL)
+		    return FALSE;
+
+		  s = bfd_section_from_elf_index (abfd, isym->st_shndx);
+		  if (s == NULL)
+		    s = sec;
+
+		  vpp = &elf_section_data (s)->local_dynrel;
+		  head = (struct elf_s390_dyn_relocs **) vpp;
+		}
+
+	      p = *head;
+	      if (p == NULL || p->sec != sec)
+		{
+		  bfd_size_type amt = sizeof *p;
+
+		  p = ((struct elf_s390_dyn_relocs *)
+		       bfd_alloc (htab->elf.dynobj, amt));
+		  if (p == NULL)
+		    return FALSE;
+		  p->next = *head;
+		  *head = p;
+		  p->sec = sec;
+		  p->count = 0;
+		  p->pc_count = 0;
+		}
+
+	      p->count += 1;
+	      if (ELF32_R_TYPE (rel->r_info) == R_390_PC16
+		  || ELF32_R_TYPE (rel->r_info) == R_390_PC16DBL
+		  || ELF32_R_TYPE (rel->r_info) == R_390_PC32DBL
+		  || ELF32_R_TYPE (rel->r_info) == R_390_PC32)
+		p->pc_count += 1;
+	    }
+	  break;
+
+	  /* This relocation describes the C++ object vtable hierarchy.
+	     Reconstruct it for later use during GC.  */
+	case R_390_GNU_VTINHERIT:
+	  if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+	    return FALSE;
+	  break;
+
+	  /* This relocation describes which C++ vtable entries are actually
+	     used.  Record for later use during GC.  */
+	case R_390_GNU_VTENTRY:
+	  BFD_ASSERT (h != NULL);
+	  if (h != NULL
+	      && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+	    return FALSE;
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+static asection *
+elf_s390_gc_mark_hook (asection *sec,
+		       struct bfd_link_info *info,
+		       Elf_Internal_Rela *rel,
+		       struct elf_link_hash_entry *h,
+		       Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_390_GNU_VTINHERIT:
+      case R_390_GNU_VTENTRY:
+	return NULL;
+      }
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+
+}
+
+/* Update the got entry reference counts for the section being removed.  */
+
+static bfd_boolean
+elf_s390_gc_sweep_hook (bfd *abfd,
+			struct bfd_link_info *info,
+			asection *sec,
+			const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  const Elf_Internal_Rela *rel, *relend;
+
+  if (info->relocatable)
+    return TRUE;
+
+  elf_section_data (sec)->local_dynrel = NULL;
+
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      unsigned int r_type;
+      struct elf_link_hash_entry *h = NULL;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  struct elf_s390_link_hash_entry *eh;
+	  struct elf_s390_dyn_relocs **pp;
+	  struct elf_s390_dyn_relocs *p;
+
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	  eh = (struct elf_s390_link_hash_entry *) h;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
+	    if (p->sec == sec)
+	      {
+		/* Everything must go for SEC.  */
+		*pp = p->next;
+		break;
+	      }
+	}
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      r_type = elf_s390_tls_transition (info, r_type, h != NULL);
+      switch (r_type)
+	{
+	case R_390_TLS_LDM32:
+	  if (elf_s390_hash_table (info)->tls_ldm_got.refcount > 0)
+	    elf_s390_hash_table (info)->tls_ldm_got.refcount -= 1;
+	  break;
+
+	case R_390_TLS_GD32:
+	case R_390_TLS_IE32:
+	case R_390_TLS_GOTIE12:
+	case R_390_TLS_GOTIE20:
+	case R_390_TLS_GOTIE32:
+	case R_390_TLS_IEENT:
+	case R_390_GOT12:
+	case R_390_GOT16:
+	case R_390_GOT20:
+	case R_390_GOT32:
+	case R_390_GOTOFF16:
+	case R_390_GOTOFF32:
+	case R_390_GOTPC:
+	case R_390_GOTPCDBL:
+	case R_390_GOTENT:
+	  if (h != NULL)
+	    {
+	      if (h->got.refcount > 0)
+		h->got.refcount -= 1;
+	    }
+	  else if (local_got_refcounts != NULL)
+	    {
+	      if (local_got_refcounts[r_symndx] > 0)
+		local_got_refcounts[r_symndx] -= 1;
+	    }
+	  break;
+
+	case R_390_8:
+	case R_390_12:
+	case R_390_16:
+	case R_390_20:
+	case R_390_32:
+	case R_390_PC16:
+	case R_390_PC16DBL:
+	case R_390_PC32DBL:
+	case R_390_PC32:
+	  if (info->shared)
+	    break;
+	  /* Fall through.  */
+
+	case R_390_PLT16DBL:
+	case R_390_PLT32DBL:
+	case R_390_PLT32:
+	case R_390_PLTOFF16:
+	case R_390_PLTOFF32:
+	  if (h != NULL)
+	    {
+	      if (h->plt.refcount > 0)
+		h->plt.refcount -= 1;
+	    }
+	  break;
+
+	case R_390_GOTPLT12:
+	case R_390_GOTPLT16:
+	case R_390_GOTPLT20:
+	case R_390_GOTPLT32:
+	case R_390_GOTPLTENT:
+	  if (h != NULL)
+	    {
+	      if (h->plt.refcount > 0)
+		{
+		  ((struct elf_s390_link_hash_entry *) h)->gotplt_refcount--;
+		  h->plt.refcount -= 1;
+		}
+	    }
+	  else if (local_got_refcounts != NULL)
+	    {
+	      if (local_got_refcounts[r_symndx] > 0)
+		local_got_refcounts[r_symndx] -= 1;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Make sure we emit a GOT entry if the symbol was supposed to have a PLT
+   entry but we found we will not create any.  Called when we find we will
+   not have any PLT for this symbol, by for example
+   elf_s390_adjust_dynamic_symbol when we're doing a proper dynamic link,
+   or elf_s390_size_dynamic_sections if no dynamic sections will be
+   created (we're only linking static objects).  */
+
+static void
+elf_s390_adjust_gotplt (h)
+     struct elf_s390_link_hash_entry *h;
+{
+  if (h->elf.root.type == bfd_link_hash_warning)
+    h = (struct elf_s390_link_hash_entry *) h->elf.root.u.i.link;
+
+  if (h->gotplt_refcount <= 0)
+    return;
+
+  /* We simply add the number of gotplt references to the number
+   * of got references for this symbol.  */
+  h->elf.got.refcount += h->gotplt_refcount;
+  h->gotplt_refcount = -1;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+elf_s390_adjust_dynamic_symbol (info, h)
+     struct bfd_link_info *info;
+     struct elf_link_hash_entry *h;
+{
+  struct elf_s390_link_hash_table *htab;
+  asection *s;
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later
+     (although we could actually do it here).  */
+  if (h->type == STT_FUNC
+      || h->needs_plt)
+    {
+      if (h->plt.refcount <= 0
+	  || SYMBOL_CALLS_LOCAL (info, h)
+	  || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+	      && h->root.type != bfd_link_hash_undefweak))
+	{
+	  /* This case can occur if we saw a PLT32 reloc in an input
+	     file, but the symbol was never referred to by a dynamic
+	     object, or if all references were garbage collected.  In
+	     such a case, we don't actually need to build a procedure
+	     linkage table, and we can just do a PC32 reloc instead.  */
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	  elf_s390_adjust_gotplt((struct elf_s390_link_hash_entry *) h);
+	}
+
+      return TRUE;
+    }
+  else
+    /* It's possible that we incorrectly decided a .plt reloc was
+       needed for an R_390_PC32 reloc to a non-function sym in
+       check_relocs.  We can't decide accurately between function and
+       non-function syms in check-relocs;  Objects loaded later in
+       the link may change h->type.  So fix it now.  */
+    h->plt.offset = (bfd_vma) -1;
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      if (ELIMINATE_COPY_RELOCS || info->nocopyreloc)
+	h->non_got_ref = h->u.weakdef->non_got_ref;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if (!h->non_got_ref)
+    return TRUE;
+
+  /* If -z nocopyreloc was given, we won't generate them either.  */
+  if (info->nocopyreloc)
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  if (ELIMINATE_COPY_RELOCS)
+    {
+      struct elf_s390_link_hash_entry * eh;
+      struct elf_s390_dyn_relocs *p;
+
+      eh = (struct elf_s390_link_hash_entry *) h;
+      for (p = eh->dyn_relocs; p != NULL; p = p->next)
+	{
+	  s = p->sec->output_section;
+	  if (s != NULL && (s->flags & SEC_READONLY) != 0)
+	    break;
+	}
+
+      /* If we didn't find any dynamic relocs in read-only sections, then
+	 we'll be keeping the dynamic relocs and avoiding the copy reloc.  */
+      if (p == NULL)
+	{
+	  h->non_got_ref = 0;
+	  return TRUE;
+	}
+    }
+
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  htab = elf_s390_hash_table (info);
+
+  /* We must generate a R_390_COPY reloc to tell the dynamic linker to
+     copy the initial value out of the dynamic object and into the
+     runtime process image.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      htab->srelbss->size += sizeof (Elf32_External_Rela);
+      h->needs_copy = 1;
+    }
+
+  s = htab->sdynbss;
+
+  return _bfd_elf_adjust_dynamic_copy (h, s);
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   dynamic relocs.  */
+
+static bfd_boolean
+allocate_dynrelocs (h, inf)
+     struct elf_link_hash_entry *h;
+     PTR inf;
+{
+  struct bfd_link_info *info;
+  struct elf_s390_link_hash_table *htab;
+  struct elf_s390_link_hash_entry *eh;
+  struct elf_s390_dyn_relocs *p;
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  info = (struct bfd_link_info *) inf;
+  htab = elf_s390_hash_table (info);
+
+  if (htab->elf.dynamic_sections_created
+      && h->plt.refcount > 0)
+    {
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      if (info->shared
+	  || WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, 0, h))
+	{
+	  asection *s = htab->splt;
+
+	  /* If this is the first .plt entry, make room for the special
+	     first entry.  */
+	  if (s->size == 0)
+	    s->size += PLT_FIRST_ENTRY_SIZE;
+
+	  h->plt.offset = s->size;
+
+	  /* If this symbol is not defined in a regular file, and we are
+	     not generating a shared library, then set the symbol to this
+	     location in the .plt.  This is required to make function
+	     pointers compare as equal between the normal executable and
+	     the shared library.  */
+	  if (! info->shared
+	      && !h->def_regular)
+	    {
+	      h->root.u.def.section = s;
+	      h->root.u.def.value = h->plt.offset;
+	    }
+
+	  /* Make room for this entry.  */
+	  s->size += PLT_ENTRY_SIZE;
+
+	  /* We also need to make an entry in the .got.plt section, which
+	     will be placed in the .got section by the linker script.  */
+	  htab->sgotplt->size += GOT_ENTRY_SIZE;
+
+	  /* We also need to make an entry in the .rela.plt section.  */
+	  htab->srelplt->size += sizeof (Elf32_External_Rela);
+	}
+      else
+	{
+ 	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	  elf_s390_adjust_gotplt((struct elf_s390_link_hash_entry *) h);
+	}
+    }
+  else
+    {
+      h->plt.offset = (bfd_vma) -1;
+      h->needs_plt = 0;
+      elf_s390_adjust_gotplt((struct elf_s390_link_hash_entry *) h);
+    }
+
+  /* If R_390_TLS_{IE32,GOTIE32,GOTIE12,IEENT} symbol is now local to
+     the binary, we can optimize a bit. IE32 and GOTIE32 get converted
+     to R_390_TLS_LE32 requiring no TLS entry. For GOTIE12 and IEENT
+     we can save the dynamic TLS relocation.  */
+  if (h->got.refcount > 0
+      && !info->shared
+      && h->dynindx == -1
+      && elf_s390_hash_entry(h)->tls_type >= GOT_TLS_IE)
+    {
+      if (elf_s390_hash_entry(h)->tls_type == GOT_TLS_IE_NLT)
+	/* For the GOTIE access without a literal pool entry the offset has
+	   to be stored somewhere. The immediate value in the instruction
+	   is not bit enough so the value is stored in the got.  */
+	{
+	  h->got.offset = htab->sgot->size;
+	  htab->sgot->size += GOT_ENTRY_SIZE;
+	}
+      else
+	h->got.offset = (bfd_vma) -1;
+    }
+  else if (h->got.refcount > 0)
+   {
+      asection *s;
+      bfd_boolean dyn;
+      int tls_type = elf_s390_hash_entry(h)->tls_type;
+
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      s = htab->sgot;
+      h->got.offset = s->size;
+      s->size += GOT_ENTRY_SIZE;
+      /* R_390_TLS_GD32 needs 2 consecutive GOT slots.  */
+      if (tls_type == GOT_TLS_GD)
+	s->size += GOT_ENTRY_SIZE;
+      dyn = htab->elf.dynamic_sections_created;
+      /* R_390_TLS_IE32 needs one dynamic relocation,
+	 R_390_TLS_GD32 needs one if local symbol and two if global.  */
+      if ((tls_type == GOT_TLS_GD && h->dynindx == -1)
+	  || tls_type >= GOT_TLS_IE)
+	htab->srelgot->size += sizeof (Elf32_External_Rela);
+      else if (tls_type == GOT_TLS_GD)
+	htab->srelgot->size += 2 * sizeof (Elf32_External_Rela);
+      else if ((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		|| h->root.type != bfd_link_hash_undefweak)
+	       && (info->shared
+		   || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h)))
+	htab->srelgot->size += sizeof (Elf32_External_Rela);
+    }
+  else
+    h->got.offset = (bfd_vma) -1;
+
+  eh = (struct elf_s390_link_hash_entry *) h;
+  if (eh->dyn_relocs == NULL)
+    return TRUE;
+
+  /* In the shared -Bsymbolic case, discard space allocated for
+     dynamic pc-relative relocs against symbols which turn out to be
+     defined in regular objects.  For the normal shared case, discard
+     space for pc-relative relocs that have become local due to symbol
+     visibility changes.  */
+
+  if (info->shared)
+    {
+      if (SYMBOL_CALLS_LOCAL (info, h))
+	{
+	  struct elf_s390_dyn_relocs **pp;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      p->count -= p->pc_count;
+	      p->pc_count = 0;
+	      if (p->count == 0)
+		*pp = p->next;
+	      else
+		pp = &p->next;
+	    }
+	}
+
+      /* Also discard relocs on undefined weak syms with non-default
+	 visibility.  */
+      if (eh->dyn_relocs != NULL
+	  && h->root.type == bfd_link_hash_undefweak)
+	{
+	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	    eh->dyn_relocs = NULL;
+
+	  /* Make sure undefined weak symbols are output as a dynamic
+	     symbol in PIEs.  */
+	  else if (h->dynindx == -1
+		   && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+	}
+    }
+  else if (ELIMINATE_COPY_RELOCS)
+    {
+      /* For the non-shared case, discard space for relocs against
+	 symbols which turn out to need copy relocs or are not
+	 dynamic.  */
+
+      if (!h->non_got_ref
+	  && ((h->def_dynamic
+	       && !h->def_regular)
+	      || (htab->elf.dynamic_sections_created
+		  && (h->root.type == bfd_link_hash_undefweak
+		      || h->root.type == bfd_link_hash_undefined))))
+	{
+	  /* Make sure this symbol is output as a dynamic symbol.
+	     Undefined weak syms won't yet be marked as dynamic.  */
+	  if (h->dynindx == -1
+	      && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+
+	  /* If that succeeded, we know we'll be keeping all the
+	     relocs.  */
+	  if (h->dynindx != -1)
+	    goto keep;
+	}
+
+      eh->dyn_relocs = NULL;
+
+    keep: ;
+    }
+
+  /* Finally, allocate space.  */
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *sreloc = elf_section_data (p->sec)->sreloc;
+
+      sreloc->size += p->count * sizeof (Elf32_External_Rela);
+    }
+
+  return TRUE;
+}
+
+/* Find any dynamic relocs that apply to read-only sections.  */
+
+static bfd_boolean
+readonly_dynrelocs (h, inf)
+     struct elf_link_hash_entry *h;
+     PTR inf;
+{
+  struct elf_s390_link_hash_entry *eh;
+  struct elf_s390_dyn_relocs *p;
+
+  eh = (struct elf_s390_link_hash_entry *) h;
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *s = p->sec->output_section;
+
+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
+	{
+	  struct bfd_link_info *info = (struct bfd_link_info *) inf;
+
+	  info->flags |= DF_TEXTREL;
+
+	  /* Not an error, just cut short the traversal.  */
+	  return FALSE;
+	}
+    }
+  return TRUE;
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+elf_s390_size_dynamic_sections (output_bfd, info)
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info;
+{
+  struct elf_s390_link_hash_table *htab;
+  bfd *dynobj;
+  asection *s;
+  bfd_boolean relocs;
+  bfd *ibfd;
+
+  htab = elf_s390_hash_table (info);
+  dynobj = htab->elf.dynobj;
+  if (dynobj == NULL)
+    abort ();
+
+  if (htab->elf.dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  if (s == NULL)
+	    abort ();
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+
+  /* Set up .got offsets for local syms, and space for local dynamic
+     relocs.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      bfd_signed_vma *local_got;
+      bfd_signed_vma *end_local_got;
+      char *local_tls_type;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *srela;
+
+      if (! is_s390_elf (ibfd))
+	continue;
+
+      for (s = ibfd->sections; s != NULL; s = s->next)
+	{
+	  struct elf_s390_dyn_relocs *p;
+
+	  for (p = elf_section_data (s)->local_dynrel; p != NULL; p = p->next)
+	    {
+	      if (!bfd_is_abs_section (p->sec)
+		  && bfd_is_abs_section (p->sec->output_section))
+		{
+		  /* Input section has been discarded, either because
+		     it is a copy of a linkonce section or due to
+		     linker script /DISCARD/, so we'll be discarding
+		     the relocs too.  */
+		}
+	      else if (p->count != 0)
+		{
+		  srela = elf_section_data (p->sec)->sreloc;
+		  srela->size += p->count * sizeof (Elf32_External_Rela);
+		  if ((p->sec->output_section->flags & SEC_READONLY) != 0)
+		    info->flags |= DF_TEXTREL;
+		}
+	    }
+	}
+
+      local_got = elf_local_got_refcounts (ibfd);
+      if (!local_got)
+	continue;
+
+      symtab_hdr = &elf_symtab_hdr (ibfd);
+      locsymcount = symtab_hdr->sh_info;
+      end_local_got = local_got + locsymcount;
+      local_tls_type = elf_s390_local_got_tls_type (ibfd);
+      s = htab->sgot;
+      srela = htab->srelgot;
+      for (; local_got < end_local_got; ++local_got, ++local_tls_type)
+	{
+	  if (*local_got > 0)
+	    {
+	      *local_got = s->size;
+	      s->size += GOT_ENTRY_SIZE;
+	      if (*local_tls_type == GOT_TLS_GD)
+		s->size += GOT_ENTRY_SIZE;
+	      if (info->shared)
+		srela->size += sizeof (Elf32_External_Rela);
+	    }
+	  else
+	    *local_got = (bfd_vma) -1;
+	}
+    }
+
+  if (htab->tls_ldm_got.refcount > 0)
+    {
+      /* Allocate 2 got entries and 1 dynamic reloc for R_390_TLS_LDM32
+	 relocs.  */
+      htab->tls_ldm_got.offset = htab->sgot->size;
+      htab->sgot->size += 2 * GOT_ENTRY_SIZE;
+      htab->srelgot->size += sizeof (Elf32_External_Rela);
+    }
+  else
+    htab->tls_ldm_got.offset = -1;
+
+  /* Allocate global sym .plt and .got entries, and space for global
+     sym dynamic relocs.  */
+  elf_link_hash_traverse (&htab->elf, allocate_dynrelocs, (PTR) info);
+
+  /* We now have determined the sizes of the various dynamic sections.
+     Allocate memory for them.  */
+  relocs = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      if (s == htab->splt
+	  || s == htab->sgot
+	  || s == htab->sgotplt
+	  || s == htab->sdynbss)
+	{
+	  /* Strip this section if we don't need it; see the
+	     comment below.  */
+	}
+      else if (CONST_STRNEQ (bfd_get_section_name (dynobj, s), ".rela"))
+	{
+	  if (s->size != 0)
+	    relocs = TRUE;
+
+	  /* We use the reloc_count field as a counter if we need
+	     to copy relocs into the output file.  */
+	  s->reloc_count = 0;
+	}
+      else
+	{
+	  /* It's not one of our sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (s->size == 0)
+	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is to handle .rela.bss and
+	     .rela.plt.  We must create it in
+	     create_dynamic_sections, because it must be created
+	     before the linker maps input sections to output
+	     sections.  The linker does that before
+	     adjust_dynamic_symbol is called, and it is that
+	     function which decides whether anything needs to go
+	     into these sections.  */
+
+	  s->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents.  We use bfd_zalloc
+	 here in case unused entries are not reclaimed before the
+	 section's contents are written out.  This should not happen,
+	 but this way if it does, we get a R_390_NONE reloc instead
+	 of garbage.  */
+      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+
+  if (htab->elf.dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in elf_s390_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (info->executable)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (htab->splt->size != 0)
+	{
+	  if (!add_dynamic_entry (DT_PLTGOT, 0)
+	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+	      || !add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+	}
+
+      if (relocs)
+	{
+	  if (!add_dynamic_entry (DT_RELA, 0)
+	      || !add_dynamic_entry (DT_RELASZ, 0)
+	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
+	    return FALSE;
+
+	  /* If any dynamic relocs apply to a read-only section,
+	     then we need a DT_TEXTREL entry.  */
+	  if ((info->flags & DF_TEXTREL) == 0)
+	    elf_link_hash_traverse (&htab->elf, readonly_dynrelocs,
+				    (PTR) info);
+
+	  if ((info->flags & DF_TEXTREL) != 0)
+	    {
+	      if (!add_dynamic_entry (DT_TEXTREL, 0))
+		return FALSE;
+	    }
+	}
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+/* Return the base VMA address which should be subtracted from real addresses
+   when resolving @dtpoff relocation.
+   This is PT_TLS segment p_vaddr.  */
+
+static bfd_vma
+dtpoff_base (info)
+     struct bfd_link_info *info;
+{
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (elf_hash_table (info)->tls_sec == NULL)
+    return 0;
+  return elf_hash_table (info)->tls_sec->vma;
+}
+
+/* Return the relocation value for @tpoff relocation
+   if STT_TLS virtual address is ADDRESS.  */
+
+static bfd_vma
+tpoff (info, address)
+     struct bfd_link_info *info;
+     bfd_vma address;
+{
+  struct elf_link_hash_table *htab = elf_hash_table (info);
+
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (htab->tls_sec == NULL)
+    return 0;
+  return htab->tls_size + htab->tls_sec->vma - address;
+}
+
+/* Complain if TLS instruction relocation is against an invalid
+   instruction.  */
+
+static void
+invalid_tls_insn (input_bfd, input_section, rel)
+     bfd *input_bfd;
+     asection *input_section;
+     Elf_Internal_Rela *rel;
+{
+  reloc_howto_type *howto;
+
+  howto = elf_howto_table + ELF32_R_TYPE (rel->r_info);
+  (*_bfd_error_handler)
+    (_("%B(%A+0x%lx): invalid instruction for TLS relocation %s"),
+     input_bfd,
+     input_section,
+     (long) rel->r_offset,
+     howto->name);
+  bfd_set_error (bfd_error_bad_value);
+}
+
+/* Relocate a 390 ELF section.  */
+
+static bfd_boolean
+elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
+			      contents, relocs, local_syms, local_sections)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     Elf_Internal_Rela *relocs;
+     Elf_Internal_Sym *local_syms;
+     asection **local_sections;
+{
+  struct elf_s390_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_vma *local_got_offsets;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+
+  BFD_ASSERT (is_s390_elf (input_bfd));
+
+  htab = elf_s390_hash_table (info);
+  symtab_hdr = &elf_symtab_hdr (input_bfd);
+  sym_hashes = elf_sym_hashes (input_bfd);
+  local_got_offsets = elf_local_got_offsets (input_bfd);
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      unsigned int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      bfd_vma off;
+      bfd_vma relocation;
+      bfd_boolean unresolved_reloc;
+      bfd_reloc_status_type r;
+      int tls_type;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      if (r_type == (int) R_390_GNU_VTINHERIT
+	  || r_type == (int) R_390_GNU_VTENTRY)
+	continue;
+      if (r_type >= (int) R_390_max)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      howto = elf_howto_table + r_type;
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      unresolved_reloc = FALSE;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+      else
+	{
+	  bfd_boolean warned ATTRIBUTE_UNUSED;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      switch (r_type)
+	{
+	case R_390_GOTPLT12:
+	case R_390_GOTPLT16:
+	case R_390_GOTPLT20:
+	case R_390_GOTPLT32:
+	case R_390_GOTPLTENT:
+	  /* There are three cases for a GOTPLT relocation. 1) The
+	     relocation is against the jump slot entry of a plt that
+	     will get emitted to the output file. 2) The relocation
+	     is against the jump slot of a plt entry that has been
+	     removed. elf_s390_adjust_gotplt has created a GOT entry
+	     as replacement. 3) The relocation is against a local symbol.
+	     Cases 2) and 3) are the same as the GOT relocation code
+	     so we just have to test for case 1 and fall through for
+	     the other two.  */
+	  if (h != NULL && h->plt.offset != (bfd_vma) -1)
+	    {
+	      bfd_vma plt_index;
+
+	      /* Calc. index no.
+		 Current offset - size first entry / entry size.  */
+	      plt_index = (h->plt.offset - PLT_FIRST_ENTRY_SIZE) /
+		PLT_ENTRY_SIZE;
+
+	      /* Offset in GOT is PLT index plus GOT headers(3) times 4,
+		 addr & GOT addr.  */
+	      relocation = (plt_index + 3) * GOT_ENTRY_SIZE;
+	      unresolved_reloc = FALSE;
+
+	      if (r_type == R_390_GOTPLTENT)
+		relocation += htab->sgot->output_section->vma;
+	      break;
+	    }
+	  /* Fall through.  */
+
+	case R_390_GOT12:
+	case R_390_GOT16:
+	case R_390_GOT20:
+	case R_390_GOT32:
+	case R_390_GOTENT:
+	  /* Relocation is to the entry for this symbol in the global
+	     offset table.  */
+	  if (htab->sgot == NULL)
+	    abort ();
+
+	  if (h != NULL)
+	    {
+	      bfd_boolean dyn;
+
+	      off = h->got.offset;
+	      dyn = htab->elf.dynamic_sections_created;
+	      if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+		  || (info->shared
+		      && SYMBOL_REFERENCES_LOCAL (info, h))
+		  || (ELF_ST_VISIBILITY (h->other)
+		      && h->root.type == bfd_link_hash_undefweak))
+		{
+		  /* This is actually a static link, or it is a
+		     -Bsymbolic link and the symbol is defined
+		     locally, or the symbol was forced to be local
+		     because of a version file.  We must initialize
+		     this entry in the global offset table.  Since the
+		     offset must always be a multiple of 2, we use the
+		     least significant bit to record whether we have
+		     initialized it already.
+
+		     When doing a dynamic link, we create a .rel.got
+		     relocation entry to initialize the value.  This
+		     is done in the finish_dynamic_symbol routine.  */
+		  if ((off & 1) != 0)
+		    off &= ~1;
+		  else
+		    {
+		      bfd_put_32 (output_bfd, relocation,
+				  htab->sgot->contents + off);
+		      h->got.offset |= 1;
+		    }
+		}
+	      else
+		unresolved_reloc = FALSE;
+	    }
+	  else
+	    {
+	      if (local_got_offsets == NULL)
+		abort ();
+
+	      off = local_got_offsets[r_symndx];
+
+	      /* The offset must always be a multiple of 4.  We use
+		 the least significant bit to record whether we have
+		 already generated the necessary reloc.  */
+	      if ((off & 1) != 0)
+		off &= ~1;
+	      else
+		{
+		  bfd_put_32 (output_bfd, relocation,
+			      htab->sgot->contents + off);
+
+		  if (info->shared)
+		    {
+		      asection *srelgot;
+		      Elf_Internal_Rela outrel;
+		      bfd_byte *loc;
+
+		      srelgot = htab->srelgot;
+		      if (srelgot == NULL)
+			abort ();
+
+		      outrel.r_offset = (htab->sgot->output_section->vma
+					 + htab->sgot->output_offset
+					 + off);
+		      outrel.r_info = ELF32_R_INFO (0, R_390_RELATIVE);
+		      outrel.r_addend = relocation;
+		      loc = srelgot->contents;
+		      loc += srelgot->reloc_count++ * sizeof (Elf32_External_Rela);
+		      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+		    }
+
+		  local_got_offsets[r_symndx] |= 1;
+		}
+	    }
+
+	  if (off >= (bfd_vma) -2)
+	    abort ();
+
+	  relocation = htab->sgot->output_offset + off;
+
+	  /* For @GOTENT the relocation is against the offset between
+	     the instruction and the symbols entry in the GOT and not
+	     between the start of the GOT and the symbols entry. We
+	     add the vma of the GOT to get the correct value.  */
+	  if (   r_type == R_390_GOTENT
+	      || r_type == R_390_GOTPLTENT)
+	    relocation += htab->sgot->output_section->vma;
+
+	  break;
+
+	case R_390_GOTOFF16:
+	case R_390_GOTOFF32:
+	  /* Relocation is relative to the start of the global offset
+	     table.  */
+
+	  /* Note that sgot->output_offset is not involved in this
+	     calculation.  We always want the start of .got.  If we
+	     defined _GLOBAL_OFFSET_TABLE in a different way, as is
+	     permitted by the ABI, we might have to change this
+	     calculation.  */
+	  relocation -= htab->sgot->output_section->vma;
+	  break;
+
+	case R_390_GOTPC:
+	case R_390_GOTPCDBL:
+	  /* Use global offset table as symbol value.  */
+	  relocation = htab->sgot->output_section->vma;
+	  unresolved_reloc = FALSE;
+	  break;
+
+	case R_390_PLT16DBL:
+	case R_390_PLT32DBL:
+	case R_390_PLT32:
+	  /* Relocation is to the entry for this symbol in the
+	     procedure linkage table.  */
+
+	  /* Resolve a PLT32 reloc against a local symbol directly,
+	     without using the procedure linkage table.  */
+	  if (h == NULL)
+	    break;
+
+	  if (h->plt.offset == (bfd_vma) -1
+	      || htab->splt == NULL)
+	    {
+	      /* We didn't make a PLT entry for this symbol.  This
+		 happens when statically linking PIC code, or when
+		 using -Bsymbolic.  */
+	      break;
+	    }
+
+	  relocation = (htab->splt->output_section->vma
+			+ htab->splt->output_offset
+			+ h->plt.offset);
+	  unresolved_reloc = FALSE;
+	  break;
+
+	case R_390_PLTOFF16:
+	case R_390_PLTOFF32:
+	  /* Relocation is to the entry for this symbol in the
+	     procedure linkage table relative to the start of the GOT.  */
+
+	  /* For local symbols or if we didn't make a PLT entry for
+	     this symbol resolve the symbol directly.  */
+	  if (   h == NULL
+	      || h->plt.offset == (bfd_vma) -1
+	      || htab->splt == NULL)
+	    {
+	      relocation -= htab->sgot->output_section->vma;
+	      break;
+	    }
+
+	  relocation = (htab->splt->output_section->vma
+			+ htab->splt->output_offset
+			+ h->plt.offset
+			- htab->sgot->output_section->vma);
+	  unresolved_reloc = FALSE;
+	  break;
+
+	case R_390_8:
+	case R_390_16:
+	case R_390_32:
+	case R_390_PC16:
+	case R_390_PC16DBL:
+	case R_390_PC32DBL:
+	case R_390_PC32:
+	  if ((input_section->flags & SEC_ALLOC) == 0)
+	    break;
+
+	  if ((info->shared
+	       && (h == NULL
+		   || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		   || h->root.type != bfd_link_hash_undefweak)
+	       && ((r_type != R_390_PC16
+		    && r_type != R_390_PC16DBL
+		    && r_type != R_390_PC32DBL
+		    && r_type != R_390_PC32)
+		   || !SYMBOL_CALLS_LOCAL (info, h)))
+	      || (ELIMINATE_COPY_RELOCS
+		  && !info->shared
+		  && h != NULL
+		  && h->dynindx != -1
+		  && !h->non_got_ref
+		  && ((h->def_dynamic
+		       && !h->def_regular)
+		      || h->root.type == bfd_link_hash_undefweak
+		      || h->root.type == bfd_link_hash_undefined)))
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_boolean skip, relocate;
+	      asection *sreloc;
+	      bfd_byte *loc;
+
+	      /* When generating a shared object, these relocations
+		 are copied into the output file to be resolved at run
+		 time.  */
+
+	      skip = FALSE;
+	      relocate = FALSE;
+
+	      outrel.r_offset =
+		_bfd_elf_section_offset (output_bfd, info, input_section,
+					 rel->r_offset);
+	      if (outrel.r_offset == (bfd_vma) -1)
+		skip = TRUE;
+	      else if (outrel.r_offset == (bfd_vma) -2)
+		skip = TRUE, relocate = TRUE;
+	      outrel.r_offset += (input_section->output_section->vma
+				  + input_section->output_offset);
+
+	      if (skip)
+		memset (&outrel, 0, sizeof outrel);
+	      else if (h != NULL
+		       && h->dynindx != -1
+		       && (r_type == R_390_PC16
+			   || r_type == R_390_PC16DBL
+			   || r_type == R_390_PC32DBL
+			   || r_type == R_390_PC32
+			   || !info->shared
+			   || !SYMBOLIC_BIND (info, h)
+			   || !h->def_regular))
+		{
+		  outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
+		  outrel.r_addend = rel->r_addend;
+		}
+	      else
+		{
+		  /* This symbol is local, or marked to become local.  */
+		  outrel.r_addend = relocation + rel->r_addend;
+		  if (r_type == R_390_32)
+		    {
+		      relocate = TRUE;
+		      outrel.r_info = ELF32_R_INFO (0, R_390_RELATIVE);
+		    }
+		  else
+		    {
+		      long sindx;
+
+		      if (bfd_is_abs_section (sec))
+			sindx = 0;
+		      else if (sec == NULL || sec->owner == NULL)
+			{
+			  bfd_set_error(bfd_error_bad_value);
+			  return FALSE;
+			}
+		      else
+			{
+			  asection *osec;
+
+			  osec = sec->output_section;
+			  sindx = elf_section_data (osec)->dynindx;
+			  if (sindx == 0)
+			    {
+			      osec = htab->elf.text_index_section;
+			      sindx = elf_section_data (osec)->dynindx;
+			    }
+			  BFD_ASSERT (sindx != 0);
+
+			  /* We are turning this relocation into one
+			     against a section symbol, so subtract out
+			     the output section's address but not the
+			     offset of the input section in the output
+			     section.  */
+			  outrel.r_addend -= osec->vma;
+			}
+		      outrel.r_info = ELF32_R_INFO (sindx, r_type);
+		    }
+		}
+
+	      sreloc = elf_section_data (input_section)->sreloc;
+	      if (sreloc == NULL)
+		abort ();
+
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rela);
+	      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+
+	      /* If this reloc is against an external symbol, we do
+		 not want to fiddle with the addend.  Otherwise, we
+		 need to include the symbol value so that it becomes
+		 an addend for the dynamic reloc.  */
+	      if (! relocate)
+		continue;
+	    }
+	  break;
+
+	  /* Relocations for tls literal pool entries.  */
+	case R_390_TLS_IE32:
+	  if (info->shared)
+	    {
+	      Elf_Internal_Rela outrel;
+	      asection *sreloc;
+	      bfd_byte *loc;
+
+	      outrel.r_offset = rel->r_offset
+				+ input_section->output_section->vma
+				+ input_section->output_offset;
+	      outrel.r_info = ELF32_R_INFO (0, R_390_RELATIVE);
+	      sreloc = elf_section_data (input_section)->sreloc;
+	      if (sreloc == NULL)
+		abort ();
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rela);
+	      bfd_elf32_swap_reloc_out (output_bfd, &outrel, loc);
+	    }
+	  /* Fall through.  */
+
+	case R_390_TLS_GD32:
+	case R_390_TLS_GOTIE32:
+	  r_type = elf_s390_tls_transition (info, r_type, h == NULL);
+	  tls_type = GOT_UNKNOWN;
+	  if (h == NULL && local_got_offsets)
+	    tls_type = elf_s390_local_got_tls_type (input_bfd) [r_symndx];
+	  else if (h != NULL)
+	    {
+	      tls_type = elf_s390_hash_entry(h)->tls_type;
+	      if (!info->shared && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
+		r_type = R_390_TLS_LE32;
+	    }
+	  if (r_type == R_390_TLS_GD32 && tls_type >= GOT_TLS_IE)
+	    r_type = R_390_TLS_IE32;
+
+	  if (r_type == R_390_TLS_LE32)
+	    {
+	      /* This relocation gets optimized away by the local exec
+		 access optimization.  */
+	      BFD_ASSERT (! unresolved_reloc);
+	      bfd_put_32 (output_bfd, -tpoff (info, relocation),
+			  contents + rel->r_offset);
+	      continue;
+	    }
+
+	  if (htab->sgot == NULL)
+	    abort ();
+
+	  if (h != NULL)
+	    off = h->got.offset;
+	  else
+	    {
+	      if (local_got_offsets == NULL)
+		abort ();
+
+	      off = local_got_offsets[r_symndx];
+	    }
+
+	emit_tls_relocs:
+
+	  if ((off & 1) != 0)
+	    off &= ~1;
+	  else
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_byte *loc;
+	      int dr_type, indx;
+
+	      if (htab->srelgot == NULL)
+		abort ();
+
+	      outrel.r_offset = (htab->sgot->output_section->vma
+				 + htab->sgot->output_offset + off);
+
+	      indx = h && h->dynindx != -1 ? h->dynindx : 0;
+	      if (r_type == R_390_TLS_GD32)
+		dr_type = R_390_TLS_DTPMOD;
+	      else
+		dr_type = R_390_TLS_TPOFF;
+	      if (dr_type == R_390_TLS_TPOFF && indx == 0)
+		outrel.r_addend = relocation - dtpoff_base (info);
+	      else
+		outrel.r_addend = 0;
+	      outrel.r_info = ELF32_R_INFO (indx, dr_type);
+	      loc = htab->srelgot->contents;
+	      loc += htab->srelgot->reloc_count++
+		* sizeof (Elf32_External_Rela);
+	      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+
+	      if (r_type == R_390_TLS_GD32)
+		{
+		  if (indx == 0)
+		    {
+		      BFD_ASSERT (! unresolved_reloc);
+		      bfd_put_32 (output_bfd,
+				  relocation - dtpoff_base (info),
+				  htab->sgot->contents + off + GOT_ENTRY_SIZE);
+		    }
+		  else
+		    {
+		      outrel.r_info = ELF32_R_INFO (indx, R_390_TLS_DTPOFF);
+		      outrel.r_offset += GOT_ENTRY_SIZE;
+		      outrel.r_addend = 0;
+		      htab->srelgot->reloc_count++;
+		      loc += sizeof (Elf32_External_Rela);
+		      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+		    }
+		}
+
+	      if (h != NULL)
+		h->got.offset |= 1;
+	      else
+		local_got_offsets[r_symndx] |= 1;
+	    }
+
+	  if (off >= (bfd_vma) -2)
+	    abort ();
+	  if (r_type == ELF32_R_TYPE (rel->r_info))
+	    {
+	      relocation = htab->sgot->output_offset + off;
+	      if (r_type == R_390_TLS_IE32 || r_type == R_390_TLS_IEENT)
+		relocation += htab->sgot->output_section->vma;
+	      unresolved_reloc = FALSE;
+	    }
+	  else
+	    {
+	      bfd_put_32 (output_bfd, htab->sgot->output_offset + off,
+			  contents + rel->r_offset);
+	      continue;
+	    }
+	  break;
+
+	case R_390_TLS_GOTIE12:
+	case R_390_TLS_GOTIE20:
+	case R_390_TLS_IEENT:
+	  if (h == NULL)
+	    {
+	      if (local_got_offsets == NULL)
+		abort();
+	      off = local_got_offsets[r_symndx];
+	      if (info->shared)
+		goto emit_tls_relocs;
+	    }
+	  else
+	    {
+	      off = h->got.offset;
+	      tls_type = elf_s390_hash_entry(h)->tls_type;
+	      if (info->shared || h->dynindx != -1 || tls_type < GOT_TLS_IE)
+		goto emit_tls_relocs;
+	    }
+
+	  if (htab->sgot == NULL)
+	    abort ();
+
+	  BFD_ASSERT (! unresolved_reloc);
+	  bfd_put_32 (output_bfd, -tpoff (info, relocation),
+		      htab->sgot->contents + off);
+	  relocation = htab->sgot->output_offset + off;
+	  if (r_type == R_390_TLS_IEENT)
+	    relocation += htab->sgot->output_section->vma;
+	  unresolved_reloc = FALSE;
+	  break;
+
+	case R_390_TLS_LDM32:
+	  if (! info->shared)
+	    /* The literal pool entry this relocation refers to gets ignored
+	       by the optimized code of the local exec model. Do nothing
+	       and the value will turn out zero.  */
+	    continue;
+
+	  if (htab->sgot == NULL)
+	    abort ();
+
+	  off = htab->tls_ldm_got.offset;
+	  if (off & 1)
+	    off &= ~1;
+	  else
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_byte *loc;
+
+	      if (htab->srelgot == NULL)
+		abort ();
+
+	      outrel.r_offset = (htab->sgot->output_section->vma
+				 + htab->sgot->output_offset + off);
+
+	      bfd_put_32 (output_bfd, 0,
+			  htab->sgot->contents + off + GOT_ENTRY_SIZE);
+	      outrel.r_info = ELF32_R_INFO (0, R_390_TLS_DTPMOD);
+	      outrel.r_addend = 0;
+	      loc = htab->srelgot->contents;
+	      loc += htab->srelgot->reloc_count++
+		* sizeof (Elf32_External_Rela);
+	      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+	      htab->tls_ldm_got.offset |= 1;
+	    }
+	  relocation = htab->sgot->output_offset + off;
+	  unresolved_reloc = FALSE;
+	  break;
+
+	case R_390_TLS_LE32:
+	  if (info->shared)
+	    {
+	      /* Linking a shared library with non-fpic code requires
+		 a R_390_TLS_TPOFF relocation.  */
+	      Elf_Internal_Rela outrel;
+	      asection *sreloc;
+	      bfd_byte *loc;
+	      int indx;
+
+	      outrel.r_offset = rel->r_offset
+				+ input_section->output_section->vma
+				+ input_section->output_offset;
+	      if (h != NULL && h->dynindx != -1)
+		indx = h->dynindx;
+	      else
+		indx = 0;
+	      outrel.r_info = ELF32_R_INFO (indx, R_390_TLS_TPOFF);
+	      if (indx == 0)
+		outrel.r_addend = relocation - dtpoff_base (info);
+	      else
+		outrel.r_addend = 0;
+	      sreloc = elf_section_data (input_section)->sreloc;
+	      if (sreloc == NULL)
+		abort ();
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rela);
+	      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+	    }
+	  else
+	    {
+	      BFD_ASSERT (! unresolved_reloc);
+	      bfd_put_32 (output_bfd, -tpoff (info, relocation),
+			  contents + rel->r_offset);
+	    }
+	  continue;
+
+	case R_390_TLS_LDO32:
+	  if (info->shared)
+	    relocation -= dtpoff_base (info);
+	  else
+	    /* When converting LDO to LE, we must negate.  */
+	    relocation = -tpoff (info, relocation);
+	  break;
+
+	  /* Relocations for tls instructions.  */
+	case R_390_TLS_LOAD:
+	case R_390_TLS_GDCALL:
+	case R_390_TLS_LDCALL:
+	  tls_type = GOT_UNKNOWN;
+	  if (h == NULL && local_got_offsets)
+	    tls_type = elf_s390_local_got_tls_type (input_bfd) [r_symndx];
+	  else if (h != NULL)
+	    tls_type = elf_s390_hash_entry(h)->tls_type;
+
+	  if (tls_type == GOT_TLS_GD)
+	    continue;
+
+	  if (r_type == R_390_TLS_LOAD)
+	    {
+	      if (!info->shared && (h == NULL || h->dynindx == -1))
+		{
+		  /* IE->LE transition. Four valid cases:
+		     l %rx,0(0,%ry)    -> lr %rx,%ry + bcr 0,0
+		     l %rx,0(%ry,0)    -> lr %rx,%ry + bcr 0,0
+		     l %rx,0(%ry,%r12) -> lr %rx,%ry + bcr 0,0
+		     l %rx,0(%r12,%ry) -> lr %rx,%ry + bcr 0,0 */
+		  unsigned int insn, ry;
+
+		  insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+		  ry = 0;
+		  if ((insn & 0xff00f000) == 0x58000000)
+		    /* l %rx,0(%ry,0) -> lr %rx,%ry + bcr 0,0  */
+		    ry = (insn & 0x000f0000);
+		  else if ((insn & 0xff0f0000) == 0x58000000)
+		    /* l %rx,0(0,%ry) -> lr %rx,%ry + bcr 0,0  */
+		    ry = (insn & 0x0000f000) << 4;
+		  else if ((insn & 0xff00f000) == 0x5800c000)
+		    /* l %rx,0(%ry,%r12) -> lr %rx,%ry + bcr 0,0  */
+		    ry = (insn & 0x000f0000);
+		  else if ((insn & 0xff0f0000) == 0x580c0000)
+		    /* l %rx,0(%r12,%ry) -> lr %rx,%ry + bcr 0,0  */
+		    ry = (insn & 0x0000f000) << 4;
+		  else
+		    invalid_tls_insn (input_bfd, input_section, rel);
+		  insn = 0x18000700 | (insn & 0x00f00000) | ry;
+		  bfd_put_32 (output_bfd, insn, contents + rel->r_offset);
+		}
+	    }
+	  else if (r_type == R_390_TLS_GDCALL)
+	    {
+	      unsigned int insn;
+
+	      insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+	      if ((insn & 0xff000fff) != 0x4d000000 &&
+		  (insn & 0xffff0000) != 0xc0e50000)
+		invalid_tls_insn (input_bfd, input_section, rel);
+	      if (!info->shared && (h == NULL || h->dynindx == -1))
+		{
+		  if ((insn & 0xff000000) == 0x4d000000)
+		    {
+		      /* GD->LE transition.
+			 bas %r14,0(%rx,%r13) -> bc 0,0  */
+		      insn = 0x47000000;
+		    }
+		  else
+		    {
+		      /* GD->LE transition.
+			 brasl %r14,_tls_get_addr@plt -> brcl 0,.  */
+		      insn = 0xc0040000;
+		      bfd_put_16 (output_bfd, 0x0000,
+				  contents + rel->r_offset + 4);
+		    }
+		}
+	      else
+		{
+		  if ((insn & 0xff000000) == 0x4d000000)
+		    {
+		      /* GD->IE transition.
+			 bas %r14,0(%rx,%r13) -> l %r2,0(%r2,%r12)  */
+		      insn = 0x5822c000;
+		    }
+		  else
+		    {
+		      /* GD->IE transition.
+			 brasl %r14,__tls_get_addr@plt ->
+			 	l %r2,0(%r2,%r12) ; bcr 0,0 */
+		      insn = 0x5822c000;
+		      bfd_put_16 (output_bfd, 0x0700,
+				  contents + rel->r_offset + 4);
+		    }
+		}
+	      bfd_put_32 (output_bfd, insn, contents + rel->r_offset);
+	    }
+	  else if (r_type == R_390_TLS_LDCALL)
+	    {
+	      if (!info->shared)
+		{
+		  unsigned int insn;
+
+		  insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+		  if ((insn & 0xff000fff) != 0x4d000000 &&
+		      (insn & 0xffff0000) != 0xc0e50000)
+		    invalid_tls_insn (input_bfd, input_section, rel);
+		  if ((insn & 0xff000000) == 0x4d000000)
+		    {
+		      /* LD->LE transition.
+			 bas %r14,0(%rx,%r13) -> bc 0,0  */
+		      insn = 0x47000000;
+		    }
+		  else
+		    {
+		      /* LD->LE transition.
+			 brasl %r14,__tls_get_addr@plt -> brcl 0,. */
+		      insn = 0xc0040000;
+		      bfd_put_16 (output_bfd, 0x0000,
+				  contents + rel->r_offset + 4);
+		    }
+		  bfd_put_32 (output_bfd, insn, contents + rel->r_offset);
+		}
+	    }
+	  continue;
+
+	default:
+	  break;
+	}
+
+      /* Dynamic relocs are not propagated for SEC_DEBUGGING sections
+	 because such sections are not SEC_ALLOC and thus ld.so will
+	 not process them.  */
+      if (unresolved_reloc
+	  && !((input_section->flags & SEC_DEBUGGING) != 0
+	       && h->def_dynamic))
+	(*_bfd_error_handler)
+	  (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+	   input_bfd,
+	   input_section,
+	   (long) rel->r_offset,
+	   howto->name,
+	   h->root.root.string);
+
+      if (r_type == R_390_20
+	  || r_type == R_390_GOT20
+	  || r_type == R_390_GOTPLT20
+	  || r_type == R_390_TLS_GOTIE20)
+	{
+	  relocation += rel->r_addend;
+	  relocation = (relocation&0xfff) << 8 | (relocation&0xff000) >> 12;
+	  r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+					contents, rel->r_offset,
+					relocation, 0);
+	}
+      else
+	r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+				      contents, rel->r_offset,
+				      relocation, rel->r_addend);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char *name;
+
+	  if (h != NULL)
+	    name = h->root.root.string;
+	  else
+	    {
+	      name = bfd_elf_string_from_elf_section (input_bfd,
+						      symtab_hdr->sh_link,
+						      sym->st_name);
+	      if (name == NULL)
+		return FALSE;
+	      if (*name == '\0')
+		name = bfd_section_name (input_bfd, sec);
+	    }
+
+	  if (r == bfd_reloc_overflow)
+	    {
+
+	      if (! ((*info->callbacks->reloc_overflow)
+		     (info, (h ? &h->root : NULL), name, howto->name,
+		      (bfd_vma) 0, input_bfd, input_section,
+		      rel->r_offset)))
+		return FALSE;
+	    }
+	  else
+	    {
+	      (*_bfd_error_handler)
+		(_("%B(%A+0x%lx): reloc against `%s': error %d"),
+		 input_bfd, input_section,
+		 (long) rel->r_offset, name, (int) r);
+	      return FALSE;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+elf_s390_finish_dynamic_symbol (output_bfd, info, h, sym)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+     struct elf_link_hash_entry *h;
+     Elf_Internal_Sym *sym;
+{
+  struct elf_s390_link_hash_table *htab;
+
+  htab = elf_s390_hash_table (info);
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      bfd_vma plt_index;
+      bfd_vma got_offset;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+      bfd_vma relative_offset;
+
+      /* This symbol has an entry in the procedure linkage table.  Set
+	 it up.  */
+      if (h->dynindx == -1
+	  || htab->splt == NULL
+	  || htab->sgotplt == NULL
+	  || htab->srelplt == NULL)
+	abort ();
+
+      /* Calc. index no.
+	 Current offset - size first entry / entry size.  */
+      plt_index = (h->plt.offset - PLT_FIRST_ENTRY_SIZE) / PLT_ENTRY_SIZE;
+
+      /* Offset in GOT is PLT index plus GOT headers(3) times 4,
+	 addr & GOT addr.  */
+      got_offset = (plt_index + 3) * GOT_ENTRY_SIZE;
+
+      /* S390 uses halfwords for relative branch calc!  */
+      relative_offset = - ((PLT_FIRST_ENTRY_SIZE +
+			    (PLT_ENTRY_SIZE * plt_index) + 18) / 2);
+      /* If offset is > 32768, branch to a previous branch
+	 390 can only handle +-64 K jumps.  */
+      if ( -32768 > (int) relative_offset )
+	relative_offset
+	  = -(unsigned) (((65536 / PLT_ENTRY_SIZE - 1) * PLT_ENTRY_SIZE) / 2);
+
+      /* Fill in the entry in the procedure linkage table.  */
+      if (!info->shared)
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD0,
+		      htab->splt->contents + h->plt.offset);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD1,
+		      htab->splt->contents + h->plt.offset + 4);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD2,
+		      htab->splt->contents + h->plt.offset + 8);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD3,
+		      htab->splt->contents + h->plt.offset + 12);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD4,
+		      htab->splt->contents + h->plt.offset + 16);
+	  bfd_put_32 (output_bfd, (bfd_vma) 0+(relative_offset << 16),
+		      htab->splt->contents + h->plt.offset + 20);
+	  bfd_put_32 (output_bfd,
+		      (htab->sgotplt->output_section->vma
+		       + htab->sgotplt->output_offset
+		       + got_offset),
+		      htab->splt->contents + h->plt.offset + 24);
+	}
+      else if (got_offset < 4096)
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC12_ENTRY_WORD0 + got_offset,
+		      htab->splt->contents + h->plt.offset);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC12_ENTRY_WORD1,
+		      htab->splt->contents + h->plt.offset + 4);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC12_ENTRY_WORD2,
+		      htab->splt->contents + h->plt.offset + 8);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC12_ENTRY_WORD3,
+		      htab->splt->contents + h->plt.offset + 12);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC12_ENTRY_WORD4,
+		      htab->splt->contents + h->plt.offset + 16);
+	  bfd_put_32 (output_bfd, (bfd_vma) 0+(relative_offset << 16),
+		      htab->splt->contents + h->plt.offset + 20);
+	  bfd_put_32 (output_bfd, (bfd_vma) 0,
+		      htab->splt->contents + h->plt.offset + 24);
+	}
+      else if (got_offset < 32768)
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC16_ENTRY_WORD0 + got_offset,
+		      htab->splt->contents + h->plt.offset);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC16_ENTRY_WORD1,
+		      htab->splt->contents + h->plt.offset + 4);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC16_ENTRY_WORD2,
+		      htab->splt->contents + h->plt.offset + 8);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC16_ENTRY_WORD3,
+		      htab->splt->contents + h->plt.offset + 12);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC16_ENTRY_WORD4,
+		      htab->splt->contents + h->plt.offset + 16);
+	  bfd_put_32 (output_bfd, (bfd_vma) 0+(relative_offset << 16),
+		      htab->splt->contents + h->plt.offset + 20);
+	  bfd_put_32 (output_bfd, (bfd_vma) 0,
+		      htab->splt->contents + h->plt.offset + 24);
+	}
+      else
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_ENTRY_WORD0,
+		      htab->splt->contents + h->plt.offset);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_ENTRY_WORD1,
+		      htab->splt->contents + h->plt.offset + 4);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_ENTRY_WORD2,
+		      htab->splt->contents + h->plt.offset + 8);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_ENTRY_WORD3,
+		      htab->splt->contents + h->plt.offset + 12);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_ENTRY_WORD4,
+		      htab->splt->contents + h->plt.offset + 16);
+	  bfd_put_32 (output_bfd, (bfd_vma) 0+(relative_offset << 16),
+		      htab->splt->contents + h->plt.offset + 20);
+	  bfd_put_32 (output_bfd, got_offset,
+		      htab->splt->contents + h->plt.offset + 24);
+	}
+      /* Insert offset into  reloc. table here.  */
+      bfd_put_32 (output_bfd, plt_index * sizeof (Elf32_External_Rela),
+		  htab->splt->contents + h->plt.offset + 28);
+
+      /* Fill in the entry in the global offset table.
+	 Points to instruction after GOT offset.  */
+      bfd_put_32 (output_bfd,
+		  (htab->splt->output_section->vma
+		   + htab->splt->output_offset
+		   + h->plt.offset
+		   + 12),
+		  htab->sgotplt->contents + got_offset);
+
+      /* Fill in the entry in the .rela.plt section.  */
+      rela.r_offset = (htab->sgotplt->output_section->vma
+		       + htab->sgotplt->output_offset
+		       + got_offset);
+      rela.r_info = ELF32_R_INFO (h->dynindx, R_390_JMP_SLOT);
+      rela.r_addend = 0;
+      loc = htab->srelplt->contents + plt_index * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+
+      if (!h->def_regular)
+	{
+	  /* Mark the symbol as undefined, rather than as defined in
+	     the .plt section.  Leave the value alone.  This is a clue
+	     for the dynamic linker, to make function pointer
+	     comparisons work between an application and shared
+	     library.  */
+	  sym->st_shndx = SHN_UNDEF;
+	}
+    }
+
+  if (h->got.offset != (bfd_vma) -1
+      && elf_s390_hash_entry(h)->tls_type != GOT_TLS_GD
+      && elf_s390_hash_entry(h)->tls_type != GOT_TLS_IE
+      && elf_s390_hash_entry(h)->tls_type != GOT_TLS_IE_NLT)
+    {
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+
+      /* This symbol has an entry in the global offset table.  Set it
+	 up.  */
+
+      if (htab->sgot == NULL || htab->srelgot == NULL)
+	abort ();
+
+      rela.r_offset = (htab->sgot->output_section->vma
+		       + htab->sgot->output_offset
+		       + (h->got.offset &~ (bfd_vma) 1));
+
+      /* If this is a static link, or it is a -Bsymbolic link and the
+	 symbol is defined locally or was forced to be local because
+	 of a version file, we just want to emit a RELATIVE reloc.
+	 The entry in the global offset table will already have been
+	 initialized in the relocate_section function.  */
+      if (info->shared
+	  && SYMBOL_REFERENCES_LOCAL (info, h))
+	{
+	  if (!h->def_regular)
+	    return FALSE;
+	  BFD_ASSERT((h->got.offset & 1) != 0);
+	  rela.r_info = ELF32_R_INFO (0, R_390_RELATIVE);
+	  rela.r_addend = (h->root.u.def.value
+			   + h->root.u.def.section->output_section->vma
+			   + h->root.u.def.section->output_offset);
+	}
+      else
+	{
+	  BFD_ASSERT((h->got.offset & 1) == 0);
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, htab->sgot->contents + h->got.offset);
+	  rela.r_info = ELF32_R_INFO (h->dynindx, R_390_GLOB_DAT);
+	  rela.r_addend = 0;
+	}
+
+      loc = htab->srelgot->contents;
+      loc += htab->srelgot->reloc_count++ * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+    }
+
+  if (h->needs_copy)
+    {
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+
+      /* This symbols needs a copy reloc.  Set it up.  */
+
+      if (h->dynindx == -1
+	  || (h->root.type != bfd_link_hash_defined
+	      && h->root.type != bfd_link_hash_defweak)
+	  || htab->srelbss == NULL)
+	abort ();
+
+      rela.r_offset = (h->root.u.def.value
+		       + h->root.u.def.section->output_section->vma
+		       + h->root.u.def.section->output_offset);
+      rela.r_info = ELF32_R_INFO (h->dynindx, R_390_COPY);
+      rela.r_addend = 0;
+      loc = htab->srelbss->contents;
+      loc += htab->srelbss->reloc_count++ * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+    }
+
+  /* Mark some specially defined symbols as absolute.  */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+      || h == htab->elf.hgot
+      || h == htab->elf.hplt)
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+/* Used to decide how to sort relocs in an optimal manner for the
+   dynamic linker, before writing them out.  */
+
+static enum elf_reloc_type_class
+elf_s390_reloc_type_class (rela)
+     const Elf_Internal_Rela *rela;
+{
+  switch ((int) ELF32_R_TYPE (rela->r_info))
+    {
+    case R_390_RELATIVE:
+      return reloc_class_relative;
+    case R_390_JMP_SLOT:
+      return reloc_class_plt;
+    case R_390_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+elf_s390_finish_dynamic_sections (output_bfd, info)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+{
+  struct elf_s390_link_hash_table *htab;
+  bfd *dynobj;
+  asection *sdyn;
+
+  htab = elf_s390_hash_table (info);
+  dynobj = htab->elf.dynobj;
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (htab->elf.dynamic_sections_created)
+    {
+      Elf32_External_Dyn *dyncon, *dynconend;
+
+      if (sdyn == NULL || htab->sgot == NULL)
+	abort ();
+
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+	  asection *s;
+
+	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    default:
+	      continue;
+
+	    case DT_PLTGOT:
+	      dyn.d_un.d_ptr = htab->sgot->output_section->vma;
+	      break;
+
+	    case DT_JMPREL:
+	      dyn.d_un.d_ptr = htab->srelplt->output_section->vma;
+	      break;
+
+	    case DT_PLTRELSZ:
+	      s = htab->srelplt->output_section;
+	      dyn.d_un.d_val = s->size;
+	      break;
+	    }
+
+	  bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	}
+
+      /* Fill in the special first entry in the procedure linkage table.  */
+      if (htab->splt && htab->splt->size > 0)
+	{
+	  memset (htab->splt->contents, 0, PLT_FIRST_ENTRY_SIZE);
+	  if (info->shared)
+	    {
+	      bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_FIRST_ENTRY_WORD0,
+			  htab->splt->contents );
+	      bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_FIRST_ENTRY_WORD1,
+			  htab->splt->contents +4 );
+	      bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_FIRST_ENTRY_WORD2,
+			  htab->splt->contents +8 );
+	      bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_FIRST_ENTRY_WORD3,
+			  htab->splt->contents +12 );
+	      bfd_put_32 (output_bfd, (bfd_vma) PLT_PIC_FIRST_ENTRY_WORD4,
+			  htab->splt->contents +16 );
+	   }
+	  else
+	   {
+	      bfd_put_32 (output_bfd, (bfd_vma)PLT_FIRST_ENTRY_WORD0,
+			  htab->splt->contents );
+	      bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD1,
+			  htab->splt->contents +4 );
+	      bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD2,
+			  htab->splt->contents +8 );
+	      bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD3,
+			  htab->splt->contents +12 );
+	      bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD4,
+			  htab->splt->contents +16 );
+	      bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD5,
+			  htab->splt->contents +20 );
+	      bfd_put_32 (output_bfd,
+			  htab->sgotplt->output_section->vma
+			  + htab->sgotplt->output_offset,
+			  htab->splt->contents + 24);
+	   }
+	  elf_section_data (htab->splt->output_section)
+	    ->this_hdr.sh_entsize = 4;
+	}
+
+    }
+
+  if (htab->sgotplt)
+    {
+      /* Fill in the first three entries in the global offset table.  */
+      if (htab->sgotplt->size > 0)
+	{
+	  bfd_put_32 (output_bfd,
+		      (sdyn == NULL ? (bfd_vma) 0
+		       : sdyn->output_section->vma + sdyn->output_offset),
+		      htab->sgotplt->contents);
+	  /* One entry for shared object struct ptr.  */
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, htab->sgotplt->contents + 4);
+	  /* One entry for _dl_runtime_resolve.  */
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, htab->sgotplt->contents + 8);
+	}
+
+      elf_section_data (htab->sgotplt->output_section)
+	->this_hdr.sh_entsize = 4;
+    }
+  return TRUE;
+}
+
+static bfd_boolean
+elf_s390_grok_prstatus (abfd, note)
+     bfd * abfd;
+     Elf_Internal_Note * note;
+{
+  int offset;
+  unsigned int size;
+
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      case 224:		/* S/390 Linux.  */
+	/* pr_cursig */
+	elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12);
+
+	/* pr_pid */
+	elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 24);
+
+	/* pr_reg */
+	offset = 72;
+	size = 144;
+	break;
+    }
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg",
+					  size, note->descpos + offset);
+}
+
+/* Return address for Ith PLT stub in section PLT, for relocation REL
+   or (bfd_vma) -1 if it should not be included.  */
+
+static bfd_vma
+elf_s390_plt_sym_val (bfd_vma i, const asection *plt,
+		      const arelent *rel ATTRIBUTE_UNUSED)
+{
+  return plt->vma + PLT_FIRST_ENTRY_SIZE + i * PLT_ENTRY_SIZE;
+}
+
+static bfd_boolean
+elf32_s390_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  elf_elfheader (obfd)->e_flags |= elf_elfheader (ibfd)->e_flags;
+  return TRUE;
+}
+
+
+#define TARGET_BIG_SYM	bfd_elf32_s390_vec
+#define TARGET_BIG_NAME	"elf32-s390"
+#define ELF_ARCH	bfd_arch_s390
+#define ELF_TARGET_ID	S390_ELF_DATA
+#define ELF_MACHINE_CODE EM_S390
+#define ELF_MACHINE_ALT1 EM_S390_OLD
+#define ELF_MAXPAGESIZE 0x1000
+
+#define elf_backend_can_gc_sections	1
+#define elf_backend_can_refcount	1
+#define elf_backend_want_got_plt	1
+#define elf_backend_plt_readonly	1
+#define elf_backend_want_plt_sym	0
+#define elf_backend_got_header_size	12
+#define elf_backend_rela_normal		1
+
+#define elf_info_to_howto		      elf_s390_info_to_howto
+
+#define bfd_elf32_bfd_is_local_label_name     elf_s390_is_local_label_name
+#define bfd_elf32_bfd_link_hash_table_create  elf_s390_link_hash_table_create
+#define bfd_elf32_bfd_reloc_type_lookup	      elf_s390_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup elf_s390_reloc_name_lookup
+
+#define bfd_elf32_bfd_merge_private_bfd_data  elf32_s390_merge_private_bfd_data
+
+#define elf_backend_adjust_dynamic_symbol     elf_s390_adjust_dynamic_symbol
+#define elf_backend_check_relocs	      elf_s390_check_relocs
+#define elf_backend_copy_indirect_symbol      elf_s390_copy_indirect_symbol
+#define elf_backend_create_dynamic_sections   elf_s390_create_dynamic_sections
+#define elf_backend_finish_dynamic_sections   elf_s390_finish_dynamic_sections
+#define elf_backend_finish_dynamic_symbol     elf_s390_finish_dynamic_symbol
+#define elf_backend_gc_mark_hook	      elf_s390_gc_mark_hook
+#define elf_backend_gc_sweep_hook	      elf_s390_gc_sweep_hook
+#define elf_backend_reloc_type_class	      elf_s390_reloc_type_class
+#define elf_backend_relocate_section	      elf_s390_relocate_section
+#define elf_backend_size_dynamic_sections     elf_s390_size_dynamic_sections
+#define elf_backend_init_index_section	      _bfd_elf_init_1_index_section
+#define elf_backend_reloc_type_class	      elf_s390_reloc_type_class
+#define elf_backend_grok_prstatus	      elf_s390_grok_prstatus
+#define elf_backend_plt_sym_val		      elf_s390_plt_sym_val
+
+#define bfd_elf32_mkobject		elf_s390_mkobject
+#define elf_backend_object_p		elf_s390_object_p
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-score.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-score.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-score.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-score.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4500 @@
+/* 32-bit ELF support for S+core.
+   Copyright 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Contributed by
+   Brain.lin (brain.lin@sunplusct.com)
+   Mei Ligang (ligang@sunnorth.com.cn)
+   Pei-Lin Tsai (pltsai@sunplus.com)
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libiberty.h"
+#include "elf-bfd.h"
+#include "elf/score.h"
+#include "elf/common.h"
+#include "elf/internal.h"
+#include "hashtab.h"
+#include "elf32-score.h"
+
+
+int score3 = 0;
+int score7 = 1;
+
+/* The SCORE ELF linker needs additional information for each symbol in
+   the global hash table.  */
+struct score_elf_link_hash_entry
+{
+  struct elf_link_hash_entry root;
+
+  /* Number of R_SCORE_ABS32, R_SCORE_REL32 relocs against this symbol.  */
+  unsigned int possibly_dynamic_relocs;
+
+  /* If the R_SCORE_ABS32, R_SCORE_REL32 reloc is against a readonly section.  */
+  bfd_boolean readonly_reloc;
+
+  /* We must not create a stub for a symbol that has relocations related to
+     taking the function's address, i.e. any but R_SCORE_CALL15 ones.  */
+  bfd_boolean no_fn_stub;
+
+  /* Are we forced local?  This will only be set if we have converted
+     the initial global GOT entry to a local GOT entry.  */
+  bfd_boolean forced_local;
+};
+
+/* Traverse a score ELF linker hash table.  */
+#define score_elf_link_hash_traverse(table, func, info) \
+  (elf_link_hash_traverse \
+   ((table),							     \
+    (bfd_boolean (*) (struct elf_link_hash_entry *, void *)) (func), \
+    (info)))
+
+/* This structure is used to hold .got entries while estimating got sizes.  */
+struct score_got_entry
+{
+  /* The input bfd in which the symbol is defined.  */
+  bfd *abfd;
+  /* The index of the symbol, as stored in the relocation r_info, if
+     we have a local symbol; -1 otherwise.  */
+  long symndx;
+  union
+  {
+    /* If abfd == NULL, an address that must be stored in the got.  */
+    bfd_vma address;
+    /* If abfd != NULL && symndx != -1, the addend of the relocation
+       that should be added to the symbol value.  */
+    bfd_vma addend;
+    /* If abfd != NULL && symndx == -1, the hash table entry
+       corresponding to a global symbol in the got (or, local, if
+       h->forced_local).  */
+    struct score_elf_link_hash_entry *h;
+  } d;
+
+  /* The offset from the beginning of the .got section to the entry
+     corresponding to this symbol+addend.  If it's a global symbol
+     whose offset is yet to be decided, it's going to be -1.  */
+  long gotidx;
+};
+
+/* This structure is passed to score_elf_sort_hash_table_f when sorting
+   the dynamic symbols.  */
+
+struct score_elf_hash_sort_data
+{
+  /* The symbol in the global GOT with the lowest dynamic symbol table index.  */
+  struct elf_link_hash_entry *low;
+  /* The least dynamic symbol table index corresponding to a symbol with a GOT entry.  */
+  long min_got_dynindx;
+  /* The greatest dynamic symbol table index corresponding to a symbol
+     with a GOT entry that is not referenced (e.g., a dynamic symbol
+     with dynamic relocations pointing to it from non-primary GOTs).  */
+  long max_unref_got_dynindx;
+  /* The greatest dynamic symbol table index not corresponding to a
+     symbol without a GOT entry.  */
+  long max_non_got_dynindx;
+};
+
+struct score_got_info
+{
+  /* The global symbol in the GOT with the lowest index in the dynamic
+     symbol table.  */
+  struct elf_link_hash_entry *global_gotsym;
+  /* The number of global .got entries.  */
+  unsigned int global_gotno;
+  /* The number of local .got entries.  */
+  unsigned int local_gotno;
+  /* The number of local .got entries we have used.  */
+  unsigned int assigned_gotno;
+  /* A hash table holding members of the got.  */
+  struct htab *got_entries;
+  /* In multi-got links, a pointer to the next got (err, rather, most
+     of the time, it points to the previous got).  */
+  struct score_got_info *next;
+};
+
+/* A structure used to count GOT entries, for GOT entry or ELF symbol table traversal.  */
+struct _score_elf_section_data
+{
+  struct bfd_elf_section_data elf;
+  union
+  {
+    struct score_got_info *got_info;
+    bfd_byte *tdata;
+  }
+  u;
+};
+
+#define score_elf_section_data(sec) \
+  ((struct _score_elf_section_data *) elf_section_data (sec))
+
+/* The size of a symbol-table entry.  */
+#define SCORE_ELF_SYM_SIZE(abfd)  \
+  (get_elf_backend_data (abfd)->s->sizeof_sym)
+
+/* In case we're on a 32-bit machine, construct a 64-bit "-1" value
+   from smaller values.  Start with zero, widen, *then* decrement.  */
+#define MINUS_ONE (((bfd_vma)0) - 1)
+#define MINUS_TWO (((bfd_vma)0) - 2)
+
+#define PDR_SIZE 32
+
+
+/* The number of local .got entries we reserve.  */
+#define SCORE_RESERVED_GOTNO (2)
+#define ELF_DYNAMIC_INTERPRETER     "/usr/lib/ld.so.1"
+
+/* The offset of $gp from the beginning of the .got section.  */
+#define ELF_SCORE_GP_OFFSET(abfd) (0x3ff0)
+/* The maximum size of the GOT for it to be addressable using 15-bit offsets from $gp.  */
+#define SCORE_ELF_GOT_MAX_SIZE(abfd) (ELF_SCORE_GP_OFFSET(abfd) + 0x3fff)
+
+#define SCORE_ELF_STUB_SECTION_NAME  (".SCORE.stub")
+#define SCORE_FUNCTION_STUB_SIZE (16)
+
+#define STUB_LW      0xc3bcc010     /* lw r29, [r28, -0x3ff0]  */
+#define STUB_MOVE    0x8363bc56     /* mv r27, r3  */
+#define STUB_LI16    0x87548000     /* ori r26, .dynsym_index  */
+#define STUB_BRL     0x801dbc09     /* brl r29  */
+
+#define SCORE_ELF_GOT_SIZE(abfd)   \
+  (get_elf_backend_data (abfd)->s->arch_size / 8)
+
+#define SCORE_ELF_ADD_DYNAMIC_ENTRY(info, tag, val) \
+        (_bfd_elf_add_dynamic_entry (info, (bfd_vma) tag, (bfd_vma) val))
+
+/* The size of an external dynamic table entry.  */
+#define SCORE_ELF_DYN_SIZE(abfd) \
+  (get_elf_backend_data (abfd)->s->sizeof_dyn)
+
+/* The size of an external REL relocation.  */
+#define SCORE_ELF_REL_SIZE(abfd) \
+  (get_elf_backend_data (abfd)->s->sizeof_rel)
+
+/* The default alignment for sections, as a power of two.  */
+#define SCORE_ELF_LOG_FILE_ALIGN(abfd)\
+  (get_elf_backend_data (abfd)->s->log_file_align)
+
+static bfd_byte *hi16_rel_addr;
+
+/* This will be used when we sort the dynamic relocation records.  */
+static bfd *reldyn_sorting_bfd;
+
+/* SCORE ELF uses two common sections.  One is the usual one, and the
+   other is for small objects.  All the small objects are kept
+   together, and then referenced via the gp pointer, which yields
+   faster assembler code.  This is what we use for the small common
+   section.  This approach is copied from ecoff.c.  */
+static asection score_elf_scom_section;
+static asymbol  score_elf_scom_symbol;
+static asymbol  *score_elf_scom_symbol_ptr;
+
+static bfd_vma
+score_bfd_get_16 (bfd *abfd, const void *data)
+{
+  return bfd_get_16 (abfd, data);
+}
+
+static bfd_vma
+score3_bfd_getl32 (const void *p)
+{
+  const bfd_byte *addr = p;
+  unsigned long v;
+
+  v = (unsigned long) addr[2];
+  v |= (unsigned long) addr[3] << 8;
+  v |= (unsigned long) addr[0] << 16;
+  v |= (unsigned long) addr[1] << 24;
+  return v;
+}
+
+static bfd_vma
+score3_bfd_getl48 (const void *p)
+{
+  const bfd_byte *addr = p;
+  unsigned long long v;
+
+  v = (unsigned long long) addr[4];
+  v |= (unsigned long long) addr[5] << 8;
+  v |= (unsigned long long) addr[2] << 16;
+  v |= (unsigned long long) addr[3] << 24;
+  v |= (unsigned long long) addr[0] << 32;
+  v |= (unsigned long long) addr[1] << 40;
+  return v;
+}
+
+static bfd_vma
+score_bfd_get_32 (bfd *abfd, const void *data)
+{
+  if (/* score3 && */ abfd->xvec->byteorder == BFD_ENDIAN_LITTLE)
+    return score3_bfd_getl32 (data);
+  else
+    return bfd_get_32 (abfd, data);
+}
+
+static bfd_vma
+score_bfd_get_48 (bfd *abfd, const void *p)
+{
+  if (/* score3 && */ abfd->xvec->byteorder == BFD_ENDIAN_LITTLE)
+    return score3_bfd_getl48 (p);
+  else
+    return bfd_get_bits (p, 48, 1);
+}
+
+static void
+score_bfd_put_16 (bfd *abfd, bfd_vma addr, void *data)
+{
+  return bfd_put_16 (abfd, addr, data);
+}
+
+static void
+score3_bfd_putl32 (bfd_vma data, void *p)
+{
+  bfd_byte *addr = p;
+  addr[0] = (data >> 16) & 0xff;
+  addr[1] = (data >> 24) & 0xff;
+  addr[2] = data & 0xff;
+  addr[3] = (data >>  8) & 0xff;
+}
+
+static void
+score3_bfd_putl48 (bfd_vma data, void *p)
+{
+  bfd_byte *addr = p;
+  addr[0] = (data >> 32) & 0xff;
+  addr[1] = (data >> 40) & 0xff;
+  addr[2] = (data >> 16) & 0xff;
+  addr[3] = (data >> 24) & 0xff;
+  addr[4] = data & 0xff;
+  addr[5] = (data >>  8) & 0xff;
+}
+
+static void
+score_bfd_put_32 (bfd *abfd, bfd_vma addr, void *data)
+{
+  if (/* score3 && */ abfd->xvec->byteorder == BFD_ENDIAN_LITTLE)
+    return score3_bfd_putl32 (addr, data);
+  else
+    return bfd_put_32 (abfd, addr, data);
+}
+
+static void
+score_bfd_put_48 (bfd *abfd, bfd_vma val, void *p)
+{
+  if (/* score3 && */ abfd->xvec->byteorder == BFD_ENDIAN_LITTLE)
+    return score3_bfd_putl48 (val, p);
+  else
+    return bfd_put_bits (val, p, 48, 1);
+}
+
+static bfd_reloc_status_type
+score_elf_hi16_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+                      arelent *reloc_entry,
+                      asymbol *symbol ATTRIBUTE_UNUSED,
+                      void * data,
+                      asection *input_section ATTRIBUTE_UNUSED,
+                      bfd *output_bfd ATTRIBUTE_UNUSED,
+                      char **error_message ATTRIBUTE_UNUSED)
+{
+  hi16_rel_addr = (bfd_byte *) data + reloc_entry->address;
+  return bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type
+score_elf_lo16_reloc (bfd *abfd,
+                      arelent *reloc_entry,
+                      asymbol *symbol ATTRIBUTE_UNUSED,
+                      void * data,
+                      asection *input_section,
+                      bfd *output_bfd ATTRIBUTE_UNUSED,
+                      char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma addend = 0, offset = 0;
+  unsigned long val;
+  unsigned long hi16_offset, hi16_value, uvalue;
+
+  hi16_value = score_bfd_get_32 (abfd, hi16_rel_addr);
+  hi16_offset = ((((hi16_value >> 16) & 0x3) << 15) | (hi16_value & 0x7fff)) >> 1;
+  addend = score_bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
+  offset = ((((addend >> 16) & 0x3) << 15) | (addend & 0x7fff)) >> 1;
+  val = reloc_entry->addend;
+  if (reloc_entry->address > input_section->size)
+    return bfd_reloc_outofrange;
+  uvalue = ((hi16_offset << 16) | (offset & 0xffff)) + val;
+  hi16_offset = (uvalue >> 16) << 1;
+  hi16_value = (hi16_value & ~0x37fff) | (hi16_offset & 0x7fff) | ((hi16_offset << 1) & 0x30000);
+  score_bfd_put_32 (abfd, hi16_value, hi16_rel_addr);
+  offset = (uvalue & 0xffff) << 1;
+  addend = (addend & ~0x37fff) | (offset & 0x7fff) | ((offset << 1) & 0x30000);
+  score_bfd_put_32 (abfd, addend, (bfd_byte *) data + reloc_entry->address);
+  return bfd_reloc_ok;
+}
+
+/* Set the GP value for OUTPUT_BFD.  Returns FALSE if this is a
+   dangerous relocation.  */
+
+static bfd_boolean
+score_elf_assign_gp (bfd *output_bfd, bfd_vma *pgp)
+{
+  unsigned int count;
+  asymbol **sym;
+  unsigned int i;
+
+  /* If we've already figured out what GP will be, just return it.  */
+  *pgp = _bfd_get_gp_value (output_bfd);
+  if (*pgp)
+    return TRUE;
+
+  count = bfd_get_symcount (output_bfd);
+  sym = bfd_get_outsymbols (output_bfd);
+
+  /* The linker script will have created a symbol named `_gp' with the
+     appropriate value.  */
+  if (sym == NULL)
+    i = count;
+  else
+    {
+      for (i = 0; i < count; i++, sym++)
+        {
+          const char *name;
+
+          name = bfd_asymbol_name (*sym);
+          if (*name == '_' && strcmp (name, "_gp") == 0)
+            {
+              *pgp = bfd_asymbol_value (*sym);
+              _bfd_set_gp_value (output_bfd, *pgp);
+              break;
+            }
+        }
+    }
+
+  if (i >= count)
+    {
+      /* Only get the error once.  */
+      *pgp = 4;
+      _bfd_set_gp_value (output_bfd, *pgp);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* We have to figure out the gp value, so that we can adjust the
+   symbol value correctly.  We look up the symbol _gp in the output
+   BFD.  If we can't find it, we're stuck.  We cache it in the ELF
+   target data.  We don't need to adjust the symbol value for an
+   external symbol if we are producing relocatable output.  */
+static bfd_reloc_status_type
+score_elf_final_gp (bfd *output_bfd,
+                    asymbol *symbol,
+                    bfd_boolean relocatable,
+                     char **error_message,
+                    bfd_vma *pgp)
+{
+  if (bfd_is_und_section (symbol->section)
+      && ! relocatable)
+    {
+      *pgp = 0;
+      return bfd_reloc_undefined;
+    }
+
+  *pgp = _bfd_get_gp_value (output_bfd);
+  if (*pgp == 0
+      && (! relocatable
+          || (symbol->flags & BSF_SECTION_SYM) != 0))
+    {
+      if (relocatable)
+        {
+          /* Make up a value.  */
+          *pgp = symbol->section->output_section->vma + 0x4000;
+          _bfd_set_gp_value (output_bfd, *pgp);
+        }
+      else if (!score_elf_assign_gp (output_bfd, pgp))
+        {
+            *error_message =
+              (char *) _("GP relative relocation when _gp not defined");
+            return bfd_reloc_dangerous;
+        }
+    }
+
+  return bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type
+score_elf_gprel15_with_gp (bfd *abfd,
+                           asymbol *symbol,
+                           arelent *reloc_entry,
+                           asection *input_section,
+                           bfd_boolean relocateable,
+                           void * data,
+                           bfd_vma gp ATTRIBUTE_UNUSED)
+{
+  bfd_vma relocation;
+  unsigned long insn;
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  if (reloc_entry->address > input_section->size)
+    return bfd_reloc_outofrange;
+
+  insn = score_bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
+  if (((reloc_entry->addend & 0xffffc000) != 0)
+      && ((reloc_entry->addend & 0xffffc000) != 0xffffc000))
+    return bfd_reloc_overflow;
+
+  insn = (insn & ~0x7fff) | (reloc_entry->addend & 0x7fff);
+  score_bfd_put_32 (abfd, insn, (bfd_byte *) data + reloc_entry->address);
+  if (relocateable)
+    reloc_entry->address += input_section->output_offset;
+
+  return bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type
+gprel32_with_gp (bfd *abfd, asymbol *symbol, arelent *reloc_entry,
+                 asection *input_section, bfd_boolean relocatable,
+                 void *data, bfd_vma gp)
+{
+  bfd_vma relocation;
+  bfd_vma val;
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  /* Set val to the offset into the section or symbol.  */
+  val = reloc_entry->addend;
+
+  if (reloc_entry->howto->partial_inplace)
+    val += score_bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
+
+  /* Adjust val for the final section location and GP value.  If we
+     are producing relocatable output, we don't want to do this for
+     an external symbol.  */
+  if (! relocatable
+      || (symbol->flags & BSF_SECTION_SYM) != 0)
+    val += relocation - gp;
+
+  if (reloc_entry->howto->partial_inplace)
+    score_bfd_put_32 (abfd, val, (bfd_byte *) data + reloc_entry->address);
+  else
+    reloc_entry->addend = val;
+
+  if (relocatable)
+    reloc_entry->address += input_section->output_offset;
+
+  return bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type
+score_elf_gprel15_reloc (bfd *abfd,
+                         arelent *reloc_entry,
+                         asymbol *symbol,
+                         void * data,
+                         asection *input_section,
+                         bfd *output_bfd,
+                         char **error_message)
+{
+  bfd_boolean relocateable;
+  bfd_reloc_status_type ret;
+  bfd_vma gp;
+
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0 && reloc_entry->addend == 0)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+  if (output_bfd != NULL)
+    relocateable = TRUE;
+  else
+    {
+      relocateable = FALSE;
+      output_bfd = symbol->section->output_section->owner;
+    }
+
+  ret = score_elf_final_gp (output_bfd, symbol, relocateable, error_message, &gp);
+  if (ret != bfd_reloc_ok)
+    return ret;
+
+  return score_elf_gprel15_with_gp (abfd, symbol, reloc_entry,
+                                         input_section, relocateable, data, gp);
+}
+
+/* Do a R_SCORE_GPREL32 relocation.  This is a 32 bit value which must
+   become the offset from the gp register.  */
+
+static bfd_reloc_status_type
+score_elf_gprel32_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+                        void *data, asection *input_section, bfd *output_bfd,
+                        char **error_message)
+{
+  bfd_boolean relocatable;
+  bfd_reloc_status_type ret;
+  bfd_vma gp;
+
+  /* R_SCORE_GPREL32 relocations are defined for local symbols only.  */
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (symbol->flags & BSF_LOCAL) != 0)
+    {
+      *error_message = (char *)
+        _("32bits gp relative relocation occurs for an external symbol");
+      return bfd_reloc_outofrange;
+    }
+
+  if (output_bfd != NULL)
+    relocatable = TRUE;
+  else
+    {
+      relocatable = FALSE;
+      output_bfd = symbol->section->output_section->owner;
+    }
+
+  ret = score_elf_final_gp (output_bfd, symbol, relocatable, error_message, &gp);
+  if (ret != bfd_reloc_ok)
+    return ret;
+
+  gp = 0;
+  return gprel32_with_gp (abfd, symbol, reloc_entry, input_section,
+                          relocatable, data, gp);
+}
+
+/* A howto special_function for R_SCORE_GOT15 relocations.  This is just
+   like any other 16-bit relocation when applied to global symbols, but is
+   treated in the same as R_SCORE_HI16 when applied to local symbols.  */
+static bfd_reloc_status_type
+score_elf_got15_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+                       void *data, asection *input_section,
+                       bfd *output_bfd, char **error_message)
+{
+  if ((symbol->flags & (BSF_GLOBAL | BSF_WEAK)) != 0
+      || bfd_is_und_section (bfd_get_section (symbol))
+      || bfd_is_com_section (bfd_get_section (symbol)))
+    /* The relocation is against a global symbol.  */
+    return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+                                  input_section, output_bfd,
+                                  error_message);
+
+  return score_elf_hi16_reloc (abfd, reloc_entry, symbol, data,
+                               input_section, output_bfd, error_message);
+}
+
+static bfd_reloc_status_type
+score_elf_got_lo16_reloc (bfd *abfd,
+                          arelent *reloc_entry,
+                          asymbol *symbol ATTRIBUTE_UNUSED,
+                          void * data,
+                          asection *input_section,
+                          bfd *output_bfd ATTRIBUTE_UNUSED,
+                          char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma addend = 0, offset = 0;
+  signed long val;
+  signed long hi16_offset, hi16_value, uvalue;
+
+  hi16_value = score_bfd_get_32 (abfd, hi16_rel_addr);
+  hi16_offset = ((((hi16_value >> 16) & 0x3) << 15) | (hi16_value & 0x7fff)) >> 1;
+  addend = score_bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
+  offset = ((((addend >> 16) & 0x3) << 15) | (addend & 0x7fff)) >> 1;
+  val = reloc_entry->addend;
+  if (reloc_entry->address > input_section->size)
+    return bfd_reloc_outofrange;
+  uvalue = ((hi16_offset << 16) | (offset & 0xffff)) + val;
+  if ((uvalue > -0x8000) && (uvalue < 0x7fff))
+    hi16_offset = 0;
+  else
+    hi16_offset = (uvalue >> 16) & 0x7fff;
+  hi16_value = (hi16_value & ~0x37fff) | (hi16_offset & 0x7fff) | ((hi16_offset << 1) & 0x30000);
+  score_bfd_put_32 (abfd, hi16_value, hi16_rel_addr);
+  offset = (uvalue & 0xffff) << 1;
+  addend = (addend & ~0x37fff) | (offset & 0x7fff) | ((offset << 1) & 0x30000);
+  score_bfd_put_32 (abfd, addend, (bfd_byte *) data + reloc_entry->address);
+  return bfd_reloc_ok;
+}
+
+static reloc_howto_type elf32_score_howto_table[] =
+{
+  /* No relocation.  */
+  HOWTO (R_SCORE_NONE,          /* type */
+         0,                     /* rightshift */
+         0,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE_NONE",        /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* R_SCORE_HI16 */
+  HOWTO (R_SCORE_HI16,          /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         1,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         score_elf_hi16_reloc,  /* special_function */
+         "R_SCORE_HI16",        /* name */
+         TRUE,                  /* partial_inplace */
+         0x37fff,               /* src_mask */
+         0x37fff,               /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* R_SCORE_LO16 */
+  HOWTO (R_SCORE_LO16,          /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         1,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         score_elf_lo16_reloc,  /* special_function */
+         "R_SCORE_LO16",        /* name */
+         TRUE,                  /* partial_inplace */
+         0x37fff,               /* src_mask */
+         0x37fff,               /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /*  R_SCORE_BCMP */
+  HOWTO (R_SCORE_BCMP,          /* type */
+         1,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         TRUE,                  /* pc_relative */
+         1,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE_BCMP",        /* name */
+         FALSE,                 /* partial_inplace */
+         0x03e00381,            /* src_mask */
+         0x03e00381,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /*R_SCORE_24 */
+  HOWTO (R_SCORE_24,            /* type */
+         1,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         24,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         1,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE_24",          /* name */
+         FALSE,                 /* partial_inplace */
+         0x3ff7fff,             /* src_mask */
+         0x3ff7fff,             /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /*R_SCORE_PC19 */
+  HOWTO (R_SCORE_PC19,          /* type */
+         1,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         19,                    /* bitsize */
+         TRUE,                  /* pc_relative */
+         1,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE_PC19",        /* name */
+         FALSE,                 /* partial_inplace */
+         0x3ff03fe,             /* src_mask */
+         0x3ff03fe,             /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /*R_SCORE16_11 */
+  HOWTO (R_SCORE16_11,          /* type */
+         1,                     /* rightshift */
+         1,                     /* size (0 = byte, 1 = short, 2 = long) */
+         11,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         1,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE16_11",        /* name */
+         FALSE,                 /* partial_inplace */
+         0x000000ffe,           /* src_mask */
+         0x000000ffe,           /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* R_SCORE16_PC8 */
+  HOWTO (R_SCORE16_PC8,         /* type */
+         1,                     /* rightshift */
+         1,                     /* size (0 = byte, 1 = short, 2 = long) */
+         9,                     /* bitsize */
+         TRUE,                  /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE16_PC8",       /* name */
+         FALSE,                 /* partial_inplace */
+         0x000001ff,            /* src_mask */
+         0x000001ff,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* 32 bit absolute */
+  HOWTO (R_SCORE_ABS32,         /* type  8 */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,    /* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE_ABS32",       /* name */
+         FALSE,                 /* partial_inplace */
+         0xffffffff,            /* src_mask */
+         0xffffffff,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* 16 bit absolute */
+  HOWTO (R_SCORE_ABS16,         /* type 11 */
+         0,                     /* rightshift */
+         1,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,    /* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE_ABS16",       /* name */
+         FALSE,                 /* partial_inplace */
+         0x0000ffff,            /* src_mask */
+         0x0000ffff,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* R_SCORE_DUMMY2 */
+  HOWTO (R_SCORE_DUMMY2,        /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE_DUMMY2",      /* name */
+         TRUE,                  /* partial_inplace */
+         0x00007fff,            /* src_mask */
+         0x00007fff,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* R_SCORE_GP15 */
+  HOWTO (R_SCORE_GP15,          /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         score_elf_gprel15_reloc,/* special_function */
+         "R_SCORE_GP15",        /* name */
+         TRUE,                  /* partial_inplace */
+         0x00007fff,            /* src_mask */
+         0x00007fff,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_SCORE_GNU_VTINHERIT, /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         NULL,                  /* special_function */
+         "R_SCORE_GNU_VTINHERIT",       /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage */
+  HOWTO (R_SCORE_GNU_VTENTRY,   /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
+         "R_SCORE_GNU_VTENTRY", /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* Reference to global offset table.  */
+  HOWTO (R_SCORE_GOT15,         /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_signed,      /* complain_on_overflow */
+         score_elf_got15_reloc, /* special_function */
+         "R_SCORE_GOT15",       /* name */
+         TRUE,                  /* partial_inplace */
+         0x00007fff,            /* src_mask */
+         0x00007fff,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_SCORE_GOT_LO16,      /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         1,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         score_elf_got_lo16_reloc, /* special_function */
+         "R_SCORE_GOT_LO16",    /* name */
+         TRUE,                  /* partial_inplace */
+         0x37ffe,               /* src_mask */
+         0x37ffe,               /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* 15 bit call through global offset table.  */
+  HOWTO (R_SCORE_CALL15,        /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_signed, /* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE_CALL15",      /* name */
+         TRUE,                  /* partial_inplace */
+         0x0000ffff,            /* src_mask */
+         0x0000ffff,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* 32 bit GP relative reference.  */
+  HOWTO (R_SCORE_GPREL32,       /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         score_elf_gprel32_reloc, /* special_function */
+         "R_SCORE_GPREL32",     /* name */
+         TRUE,                  /* partial_inplace */
+         0xffffffff,            /* src_mask */
+         0xffffffff,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* 32 bit symbol relative relocation.  */
+  HOWTO (R_SCORE_REL32,         /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE_REL32",       /* name */
+         TRUE,                  /* partial_inplace */
+         0xffffffff,            /* src_mask */
+         0xffffffff,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* R_SCORE_DUMMY_HI16 */
+  HOWTO (R_SCORE_DUMMY_HI16,    /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         1,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         score_elf_hi16_reloc,  /* special_function */
+         "R_SCORE_DUMMY_HI16",  /* name */
+         TRUE,                  /* partial_inplace */
+         0x37fff,               /* src_mask */
+         0x37fff,               /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* R_SCORE_IMM30 */
+  HOWTO (R_SCORE_IMM30,         /* type */
+         2,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         30,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         7,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE_IMM30",       /* name */
+         FALSE,                 /* partial_inplace */
+         0x7f7fff7f80LL,        /* src_mask */
+         0x7f7fff7f80LL,        /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* R_SCORE_IMM32 */
+  HOWTO (R_SCORE_IMM32,         /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         5,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE_IMM32",       /* name */
+         FALSE,                 /* partial_inplace */
+         0x7f7fff7fe0LL,        /* src_mask */
+         0x7f7fff7fe0LL,        /* dst_mask */
+         FALSE),                /* pcrel_offset */
+};
+
+struct score_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned char elf_reloc_val;
+};
+
+static const struct score_reloc_map elf32_score_reloc_map[] =
+{
+  {BFD_RELOC_NONE,               R_SCORE_NONE},
+  {BFD_RELOC_HI16_S,             R_SCORE_HI16},
+  {BFD_RELOC_LO16,               R_SCORE_LO16},
+  {BFD_RELOC_SCORE_BCMP,         R_SCORE_BCMP},
+  {BFD_RELOC_SCORE_JMP,          R_SCORE_24},
+  {BFD_RELOC_SCORE_BRANCH,       R_SCORE_PC19},
+  {BFD_RELOC_SCORE16_JMP,        R_SCORE16_11},
+  {BFD_RELOC_SCORE16_BRANCH,     R_SCORE16_PC8},
+  {BFD_RELOC_32,                 R_SCORE_ABS32},
+  {BFD_RELOC_16,                 R_SCORE_ABS16},
+  {BFD_RELOC_SCORE_DUMMY2,       R_SCORE_DUMMY2},
+  {BFD_RELOC_SCORE_GPREL15,      R_SCORE_GP15},
+  {BFD_RELOC_VTABLE_INHERIT,     R_SCORE_GNU_VTINHERIT},
+  {BFD_RELOC_VTABLE_ENTRY,       R_SCORE_GNU_VTENTRY},
+  {BFD_RELOC_SCORE_GOT15,        R_SCORE_GOT15},
+  {BFD_RELOC_SCORE_GOT_LO16,     R_SCORE_GOT_LO16},
+  {BFD_RELOC_SCORE_CALL15,       R_SCORE_CALL15},
+  {BFD_RELOC_GPREL32,            R_SCORE_GPREL32},
+  {BFD_RELOC_32_PCREL,           R_SCORE_REL32},
+  {BFD_RELOC_SCORE_DUMMY_HI16,   R_SCORE_DUMMY_HI16},
+  {BFD_RELOC_SCORE_IMM30,        R_SCORE_IMM30},
+  {BFD_RELOC_SCORE_IMM32,        R_SCORE_IMM32},
+};
+
+/* got_entries only match if they're identical, except for gotidx, so
+   use all fields to compute the hash, and compare the appropriate
+   union members.  */
+static hashval_t
+score_elf_got_entry_hash (const void *entry_)
+{
+  const struct score_got_entry *entry = (struct score_got_entry *)entry_;
+
+  return entry->symndx
+    + (!entry->abfd ? entry->d.address : entry->abfd->id);
+}
+
+static int
+score_elf_got_entry_eq (const void *entry1, const void *entry2)
+{
+  const struct score_got_entry *e1 = (struct score_got_entry *)entry1;
+  const struct score_got_entry *e2 = (struct score_got_entry *)entry2;
+
+  return e1->abfd == e2->abfd && e1->symndx == e2->symndx
+    && (! e1->abfd ? e1->d.address == e2->d.address
+        : e1->symndx >= 0 ? e1->d.addend == e2->d.addend
+        : e1->d.h == e2->d.h);
+}
+
+/* If H needs a GOT entry, assign it the highest available dynamic
+   index.  Otherwise, assign it the lowest available dynamic
+   index.  */
+static bfd_boolean
+score_elf_sort_hash_table_f (struct score_elf_link_hash_entry *h, void *data)
+{
+  struct score_elf_hash_sort_data *hsd = data;
+
+  /* Symbols without dynamic symbol table entries aren't interesting at all.  */
+  if (h->root.dynindx == -1)
+    return TRUE;
+
+  /* Global symbols that need GOT entries that are not explicitly
+     referenced are marked with got offset 2.  Those that are
+     referenced get a 1, and those that don't need GOT entries get
+     -1.  */
+  if (h->root.got.offset == 2)
+    {
+      if (hsd->max_unref_got_dynindx == hsd->min_got_dynindx)
+        hsd->low = (struct elf_link_hash_entry *) h;
+      h->root.dynindx = hsd->max_unref_got_dynindx++;
+    }
+  else if (h->root.got.offset != 1)
+    h->root.dynindx = hsd->max_non_got_dynindx++;
+  else
+    {
+      h->root.dynindx = --hsd->min_got_dynindx;
+      hsd->low = (struct elf_link_hash_entry *) h;
+    }
+
+  return TRUE;
+}
+
+static asection *
+score_elf_got_section (bfd *abfd, bfd_boolean maybe_excluded)
+{
+  asection *sgot = bfd_get_section_by_name (abfd, ".got");
+
+  if (sgot == NULL || (! maybe_excluded && (sgot->flags & SEC_EXCLUDE) != 0))
+    return NULL;
+  return sgot;
+}
+
+/* Returns the GOT information associated with the link indicated by
+   INFO.  If SGOTP is non-NULL, it is filled in with the GOT section.  */
+static struct score_got_info *
+score_elf_got_info (bfd *abfd, asection **sgotp)
+{
+  asection *sgot;
+  struct score_got_info *g;
+
+  sgot = score_elf_got_section (abfd, TRUE);
+  BFD_ASSERT (sgot != NULL);
+  BFD_ASSERT (elf_section_data (sgot) != NULL);
+  g = score_elf_section_data (sgot)->u.got_info;
+  BFD_ASSERT (g != NULL);
+
+  if (sgotp)
+    *sgotp = sgot;
+  return g;
+}
+
+/* Sort the dynamic symbol table so that symbols that need GOT entries
+   appear towards the end.  This reduces the amount of GOT space
+   required.  MAX_LOCAL is used to set the number of local symbols
+   known to be in the dynamic symbol table.  During
+   s3_bfd_score_elf_size_dynamic_sections, this value is 1.  Afterward, the
+   section symbols are added and the count is higher.  */
+static bfd_boolean
+score_elf_sort_hash_table (struct bfd_link_info *info,
+                           unsigned long max_local)
+{
+  struct score_elf_hash_sort_data hsd;
+  struct score_got_info *g;
+  bfd *dynobj;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  g = score_elf_got_info (dynobj, NULL);
+
+  hsd.low = NULL;
+  hsd.max_unref_got_dynindx =
+    hsd.min_got_dynindx = elf_hash_table (info)->dynsymcount
+    /* In the multi-got case, assigned_gotno of the master got_info
+       indicate the number of entries that aren't referenced in the
+       primary GOT, but that must have entries because there are
+       dynamic relocations that reference it.  Since they aren't
+       referenced, we move them to the end of the GOT, so that they
+       don't prevent other entries that are referenced from getting
+       too large offsets.  */
+    - (g->next ? g->assigned_gotno : 0);
+  hsd.max_non_got_dynindx = max_local;
+  score_elf_link_hash_traverse (elf_hash_table (info),
+				score_elf_sort_hash_table_f,
+				&hsd);
+
+  /* There should have been enough room in the symbol table to
+     accommodate both the GOT and non-GOT symbols.  */
+  BFD_ASSERT (hsd.max_non_got_dynindx <= hsd.min_got_dynindx);
+  BFD_ASSERT ((unsigned long)hsd.max_unref_got_dynindx
+              <= elf_hash_table (info)->dynsymcount);
+
+  /* Now we know which dynamic symbol has the lowest dynamic symbol
+     table index in the GOT.  */
+  g->global_gotsym = hsd.low;
+
+  return TRUE;
+}
+
+/* Create an entry in an score ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+score_elf_link_hash_newfunc (struct bfd_hash_entry *entry,
+                             struct bfd_hash_table *table,
+                             const char *string)
+{
+  struct score_elf_link_hash_entry *ret = (struct score_elf_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a subclass.  */
+  if (ret == NULL)
+    ret = bfd_hash_allocate (table, sizeof (struct score_elf_link_hash_entry));
+  if (ret == NULL)
+    return (struct bfd_hash_entry *) ret;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct score_elf_link_hash_entry *)
+         _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
+
+  if (ret != NULL)
+    {
+      ret->possibly_dynamic_relocs = 0;
+      ret->readonly_reloc = FALSE;
+      ret->no_fn_stub = FALSE;
+      ret->forced_local = FALSE;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Returns the first relocation of type r_type found, beginning with
+   RELOCATION.  RELEND is one-past-the-end of the relocation table.  */
+static const Elf_Internal_Rela *
+score_elf_next_relocation (bfd *abfd ATTRIBUTE_UNUSED, unsigned int r_type,
+                            const Elf_Internal_Rela *relocation,
+                           const Elf_Internal_Rela *relend)
+{
+  while (relocation < relend)
+    {
+      if (ELF32_R_TYPE (relocation->r_info) == r_type)
+        return relocation;
+
+      ++relocation;
+    }
+
+  /* We didn't find it.  */
+  bfd_set_error (bfd_error_bad_value);
+  return NULL;
+}
+
+/* This function is called via qsort() to sort the dynamic relocation
+   entries by increasing r_symndx value.  */
+static int
+score_elf_sort_dynamic_relocs (const void *arg1, const void *arg2)
+{
+  Elf_Internal_Rela int_reloc1;
+  Elf_Internal_Rela int_reloc2;
+
+  bfd_elf32_swap_reloc_in (reldyn_sorting_bfd, arg1, &int_reloc1);
+  bfd_elf32_swap_reloc_in (reldyn_sorting_bfd, arg2, &int_reloc2);
+
+  return (ELF32_R_SYM (int_reloc1.r_info) - ELF32_R_SYM (int_reloc2.r_info));
+}
+
+/* Return whether a relocation is against a local symbol.  */
+static bfd_boolean
+score_elf_local_relocation_p (bfd *input_bfd,
+                              const Elf_Internal_Rela *relocation,
+                              asection **local_sections,
+                              bfd_boolean check_forced)
+{
+  unsigned long r_symndx;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct score_elf_link_hash_entry *h;
+  size_t extsymoff;
+
+  r_symndx = ELF32_R_SYM (relocation->r_info);
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  extsymoff = (elf_bad_symtab (input_bfd)) ? 0 : symtab_hdr->sh_info;
+
+  if (r_symndx < extsymoff)
+    return TRUE;
+  if (elf_bad_symtab (input_bfd) && local_sections[r_symndx] != NULL)
+    return TRUE;
+
+  if (check_forced)
+    {
+      /* Look up the hash table to check whether the symbol was forced local.  */
+      h = (struct score_elf_link_hash_entry *)
+        elf_sym_hashes (input_bfd) [r_symndx - extsymoff];
+      /* Find the real hash-table entry for this symbol.  */
+      while (h->root.root.type == bfd_link_hash_indirect
+             || h->root.root.type == bfd_link_hash_warning)
+        h = (struct score_elf_link_hash_entry *) h->root.root.u.i.link;
+      if (h->root.forced_local)
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+/* Returns the dynamic relocation section for DYNOBJ.  */
+static asection *
+score_elf_rel_dyn_section (bfd *dynobj, bfd_boolean create_p)
+{
+  static const char dname[] = ".rel.dyn";
+  asection *sreloc;
+
+  sreloc = bfd_get_section_by_name (dynobj, dname);
+  if (sreloc == NULL && create_p)
+    {
+      sreloc = bfd_make_section_with_flags (dynobj, dname,
+                                            (SEC_ALLOC
+                                             | SEC_LOAD
+                                             | SEC_HAS_CONTENTS
+                                             | SEC_IN_MEMORY
+                                             | SEC_LINKER_CREATED
+                                             | SEC_READONLY));
+      if (sreloc == NULL
+          || ! bfd_set_section_alignment (dynobj, sreloc,
+                                          SCORE_ELF_LOG_FILE_ALIGN (dynobj)))
+        return NULL;
+    }
+  return sreloc;
+}
+
+static void
+score_elf_allocate_dynamic_relocations (bfd *abfd, unsigned int n)
+{
+  asection *s;
+
+  s = score_elf_rel_dyn_section (abfd, FALSE);
+  BFD_ASSERT (s != NULL);
+
+  if (s->size == 0)
+    {
+      /* Make room for a null element.  */
+      s->size += SCORE_ELF_REL_SIZE (abfd);
+      ++s->reloc_count;
+    }
+  s->size += n * SCORE_ELF_REL_SIZE (abfd);
+}
+
+/* Create a rel.dyn relocation for the dynamic linker to resolve.  REL
+   is the original relocation, which is now being transformed into a
+   dynamic relocation.  The ADDENDP is adjusted if necessary; the
+   caller should store the result in place of the original addend.  */
+static bfd_boolean
+score_elf_create_dynamic_relocation (bfd *output_bfd,
+                                     struct bfd_link_info *info,
+                                     const Elf_Internal_Rela *rel,
+                                     struct score_elf_link_hash_entry *h,
+                                     bfd_vma symbol,
+                                     bfd_vma *addendp, asection *input_section)
+{
+  Elf_Internal_Rela outrel[3];
+  asection *sreloc;
+  bfd *dynobj;
+  int r_type;
+  long indx;
+  bfd_boolean defined_p;
+
+  r_type = ELF32_R_TYPE (rel->r_info);
+  dynobj = elf_hash_table (info)->dynobj;
+  sreloc = score_elf_rel_dyn_section (dynobj, FALSE);
+  BFD_ASSERT (sreloc != NULL);
+  BFD_ASSERT (sreloc->contents != NULL);
+  BFD_ASSERT (sreloc->reloc_count * SCORE_ELF_REL_SIZE (output_bfd) < sreloc->size);
+
+  outrel[0].r_offset =
+    _bfd_elf_section_offset (output_bfd, info, input_section, rel[0].r_offset);
+  outrel[1].r_offset =
+    _bfd_elf_section_offset (output_bfd, info, input_section, rel[1].r_offset);
+  outrel[2].r_offset =
+    _bfd_elf_section_offset (output_bfd, info, input_section, rel[2].r_offset);
+
+  if (outrel[0].r_offset == MINUS_ONE)
+    /* The relocation field has been deleted.  */
+    return TRUE;
+
+  if (outrel[0].r_offset == MINUS_TWO)
+    {
+      /* The relocation field has been converted into a relative value of
+         some sort.  Functions like _bfd_elf_write_section_eh_frame expect
+         the field to be fully relocated, so add in the symbol's value.  */
+      *addendp += symbol;
+      return TRUE;
+    }
+
+  /* We must now calculate the dynamic symbol table index to use
+     in the relocation.  */
+  if (h != NULL
+      && (! info->symbolic || !h->root.def_regular)
+      /* h->root.dynindx may be -1 if this symbol was marked to
+         become local.  */
+      && h->root.dynindx != -1)
+    {
+      indx = h->root.dynindx;
+        /* ??? glibc's ld.so just adds the final GOT entry to the
+           relocation field.  It therefore treats relocs against
+           defined symbols in the same way as relocs against
+           undefined symbols.  */
+      defined_p = FALSE;
+    }
+  else
+    {
+      indx = 0;
+      defined_p = TRUE;
+    }
+
+  /* If the relocation was previously an absolute relocation and
+     this symbol will not be referred to by the relocation, we must
+     adjust it by the value we give it in the dynamic symbol table.
+     Otherwise leave the job up to the dynamic linker.  */
+  if (defined_p && r_type != R_SCORE_REL32)
+    *addendp += symbol;
+
+  /* The relocation is always an REL32 relocation because we don't
+     know where the shared library will wind up at load-time.  */
+  outrel[0].r_info = ELF32_R_INFO ((unsigned long) indx, R_SCORE_REL32);
+
+  /* For strict adherence to the ABI specification, we should
+     generate a R_SCORE_64 relocation record by itself before the
+     _REL32/_64 record as well, such that the addend is read in as
+     a 64-bit value (REL32 is a 32-bit relocation, after all).
+     However, since none of the existing ELF64 SCORE dynamic
+     loaders seems to care, we don't waste space with these
+     artificial relocations.  If this turns out to not be true,
+     score_elf_allocate_dynamic_relocations() should be tweaked so
+     as to make room for a pair of dynamic relocations per
+     invocation if ABI_64_P, and here we should generate an
+     additional relocation record with R_SCORE_64 by itself for a
+     NULL symbol before this relocation record.  */
+  outrel[1].r_info = ELF32_R_INFO (0, R_SCORE_NONE);
+  outrel[2].r_info = ELF32_R_INFO (0, R_SCORE_NONE);
+
+  /* Adjust the output offset of the relocation to reference the
+     correct location in the output file.  */
+  outrel[0].r_offset += (input_section->output_section->vma
+                         + input_section->output_offset);
+  outrel[1].r_offset += (input_section->output_section->vma
+                         + input_section->output_offset);
+  outrel[2].r_offset += (input_section->output_section->vma
+                         + input_section->output_offset);
+
+  /* Put the relocation back out.  We have to use the special
+     relocation outputter in the 64-bit case since the 64-bit
+     relocation format is non-standard.  */
+  bfd_elf32_swap_reloc_out
+      (output_bfd, &outrel[0],
+       (sreloc->contents + sreloc->reloc_count * sizeof (Elf32_External_Rel)));
+
+  /* We've now added another relocation.  */
+  ++sreloc->reloc_count;
+
+  /* Make sure the output section is writable.  The dynamic linker
+     will be writing to it.  */
+  elf_section_data (input_section->output_section)->this_hdr.sh_flags |= SHF_WRITE;
+
+  return TRUE;
+}
+
+static bfd_boolean
+score_elf_create_got_section (bfd *abfd,
+                              struct bfd_link_info *info,
+                              bfd_boolean maybe_exclude)
+{
+  flagword flags;
+  asection *s;
+  struct elf_link_hash_entry *h;
+  struct bfd_link_hash_entry *bh;
+  struct score_got_info *g;
+  bfd_size_type amt;
+
+  /* This function may be called more than once.  */
+  s = score_elf_got_section (abfd, TRUE);
+  if (s)
+    {
+      if (! maybe_exclude)
+        s->flags &= ~SEC_EXCLUDE;
+      return TRUE;
+    }
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED);
+
+  if (maybe_exclude)
+    flags |= SEC_EXCLUDE;
+
+  /* We have to use an alignment of 2**4 here because this is hardcoded
+     in the function stub generation and in the linker script.  */
+  s = bfd_make_section_with_flags (abfd, ".got", flags);
+   if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, 4))
+    return FALSE;
+
+  /* Define the symbol _GLOBAL_OFFSET_TABLE_.  We don't do this in the
+     linker script because we don't want to define the symbol if we
+     are not creating a global offset table.  */
+  bh = NULL;
+  if (! (_bfd_generic_link_add_one_symbol
+         (info, abfd, "_GLOBAL_OFFSET_TABLE_", BSF_GLOBAL, s,
+          0, NULL, FALSE, get_elf_backend_data (abfd)->collect, &bh)))
+    return FALSE;
+
+  h = (struct elf_link_hash_entry *) bh;
+  h->non_elf = 0;
+  h->def_regular = 1;
+  h->type = STT_OBJECT;
+
+  if (info->shared && ! bfd_elf_link_record_dynamic_symbol (info, h))
+    return FALSE;
+
+  amt = sizeof (struct score_got_info);
+  g = bfd_alloc (abfd, amt);
+  if (g == NULL)
+    return FALSE;
+
+  g->global_gotsym = NULL;
+  g->global_gotno = 0;
+
+  g->local_gotno = SCORE_RESERVED_GOTNO;
+  g->assigned_gotno = SCORE_RESERVED_GOTNO;
+  g->next = NULL;
+
+  g->got_entries = htab_try_create (1, score_elf_got_entry_hash,
+                                    score_elf_got_entry_eq, NULL);
+  if (g->got_entries == NULL)
+    return FALSE;
+  score_elf_section_data (s)->u.got_info = g;
+  score_elf_section_data (s)->elf.this_hdr.sh_flags |= SHF_ALLOC | SHF_WRITE | SHF_SCORE_GPREL;
+
+  return TRUE;
+}
+
+/* Calculate the %high function.  */
+static bfd_vma
+score_elf_high (bfd_vma value)
+{
+  return ((value + (bfd_vma) 0x8000) >> 16) & 0xffff;
+}
+
+/* Create a local GOT entry for VALUE.  Return the index of the entry,
+   or -1 if it could not be created.  */
+static struct score_got_entry *
+score_elf_create_local_got_entry (bfd *abfd,
+                                  bfd *ibfd ATTRIBUTE_UNUSED,
+                                  struct score_got_info *gg,
+                                  asection *sgot, bfd_vma value,
+                                  unsigned long r_symndx ATTRIBUTE_UNUSED,
+                                  struct score_elf_link_hash_entry *h ATTRIBUTE_UNUSED,
+                                  int r_type ATTRIBUTE_UNUSED)
+{
+  struct score_got_entry entry, **loc;
+  struct score_got_info *g;
+
+  entry.abfd = NULL;
+  entry.symndx = -1;
+  entry.d.address = value;
+
+  g = gg;
+  loc = (struct score_got_entry **) htab_find_slot (g->got_entries, &entry, INSERT);
+  if (*loc)
+    return *loc;
+
+  entry.gotidx = SCORE_ELF_GOT_SIZE (abfd) * g->assigned_gotno++;
+
+  *loc = bfd_alloc (abfd, sizeof entry);
+
+  if (! *loc)
+    return NULL;
+
+  memcpy (*loc, &entry, sizeof entry);
+
+  if (g->assigned_gotno >= g->local_gotno)
+    {
+      (*loc)->gotidx = -1;
+      /* We didn't allocate enough space in the GOT.  */
+      (*_bfd_error_handler)
+        (_("not enough GOT space for local GOT entries"));
+      bfd_set_error (bfd_error_bad_value);
+      return NULL;
+    }
+
+  score_bfd_put_32 (abfd, value, (sgot->contents + entry.gotidx));
+
+  return *loc;
+}
+
+/* Find a GOT entry whose higher-order 16 bits are the same as those
+   for value.  Return the index into the GOT for this entry.  */
+static bfd_vma
+score_elf_got16_entry (bfd *abfd, bfd *ibfd, struct bfd_link_info *info,
+                       bfd_vma value, bfd_boolean external)
+{
+  asection *sgot;
+  struct score_got_info *g;
+  struct score_got_entry *entry;
+
+  if (!external)
+    {
+      /* Although the ABI says that it is "the high-order 16 bits" that we
+         want, it is really the %high value.  The complete value is
+         calculated with a `addiu' of a LO16 relocation, just as with a
+         HI16/LO16 pair.  */
+      value = score_elf_high (value) << 16;
+    }
+
+  g = score_elf_got_info (elf_hash_table (info)->dynobj, &sgot);
+
+  entry = score_elf_create_local_got_entry (abfd, ibfd, g, sgot, value, 0, NULL,
+                                            R_SCORE_GOT15);
+  if (entry)
+    return entry->gotidx;
+  else
+    return MINUS_ONE;
+}
+
+static void
+s3_bfd_score_elf_hide_symbol (struct bfd_link_info *info,
+                              struct elf_link_hash_entry *entry,
+                              bfd_boolean force_local)
+{
+  bfd *dynobj;
+  asection *got;
+  struct score_got_info *g;
+  struct score_elf_link_hash_entry *h;
+
+  h = (struct score_elf_link_hash_entry *) entry;
+  if (h->forced_local)
+    return;
+  h->forced_local = TRUE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  if (dynobj != NULL && force_local)
+    {
+      got = score_elf_got_section (dynobj, FALSE);
+      if (got == NULL)
+        return;
+      g = score_elf_section_data (got)->u.got_info;
+
+      if (g->next)
+        {
+          struct score_got_entry e;
+          struct score_got_info *gg = g;
+
+          /* Since we're turning what used to be a global symbol into a
+             local one, bump up the number of local entries of each GOT
+             that had an entry for it.  This will automatically decrease
+             the number of global entries, since global_gotno is actually
+             the upper limit of global entries.  */
+          e.abfd = dynobj;
+          e.symndx = -1;
+          e.d.h = h;
+
+          for (g = g->next; g != gg; g = g->next)
+            if (htab_find (g->got_entries, &e))
+              {
+                BFD_ASSERT (g->global_gotno > 0);
+                g->local_gotno++;
+                g->global_gotno--;
+              }
+
+          /* If this was a global symbol forced into the primary GOT, we
+             no longer need an entry for it.  We can't release the entry
+             at this point, but we must at least stop counting it as one
+             of the symbols that required a forced got entry.  */
+          if (h->root.got.offset == 2)
+            {
+              BFD_ASSERT (gg->assigned_gotno > 0);
+              gg->assigned_gotno--;
+            }
+        }
+      else if (g->global_gotno == 0 && g->global_gotsym == NULL)
+        /* If we haven't got through GOT allocation yet, just bump up the
+              number of local entries, as this symbol won't be counted as
+              global.  */
+        g->local_gotno++;
+      else if (h->root.got.offset == 1)
+        {
+          /* If we're past non-multi-GOT allocation and this symbol had
+                  been marked for a global got entry, give it a local entry
+                  instead.  */
+          BFD_ASSERT (g->global_gotno > 0);
+          g->local_gotno++;
+          g->global_gotno--;
+        }
+    }
+
+  _bfd_elf_link_hash_hide_symbol (info, &h->root, force_local);
+}
+
+/* If H is a symbol that needs a global GOT entry, but has a dynamic
+   symbol table index lower than any we've seen to date, record it for
+   posterity.  */
+static bfd_boolean
+score_elf_record_global_got_symbol (struct elf_link_hash_entry *h,
+                                    bfd *abfd,
+                                    struct bfd_link_info *info,
+                                    struct score_got_info *g)
+{
+  struct score_got_entry entry, **loc;
+
+  /* A global symbol in the GOT must also be in the dynamic symbol table.  */
+  if (h->dynindx == -1)
+    {
+      switch (ELF_ST_VISIBILITY (h->other))
+        {
+        case STV_INTERNAL:
+        case STV_HIDDEN:
+          s3_bfd_score_elf_hide_symbol (info, h, TRUE);
+          break;
+        }
+      if (!bfd_elf_link_record_dynamic_symbol (info, h))
+        return FALSE;
+    }
+
+  entry.abfd = abfd;
+  entry.symndx = -1;
+  entry.d.h = (struct score_elf_link_hash_entry *)h;
+
+  loc = (struct score_got_entry **)htab_find_slot (g->got_entries, &entry, INSERT);
+
+  /* If we've already marked this entry as needing GOT space, we don't
+     need to do it again.  */
+  if (*loc)
+    return TRUE;
+
+  *loc = bfd_alloc (abfd, sizeof entry);
+  if (! *loc)
+    return FALSE;
+
+  entry.gotidx = -1;
+
+  memcpy (*loc, &entry, sizeof (entry));
+
+  if (h->got.offset != MINUS_ONE)
+    return TRUE;
+
+  /* By setting this to a value other than -1, we are indicating that
+     there needs to be a GOT entry for H.  Avoid using zero, as the
+     generic ELF copy_indirect_symbol tests for <= 0.  */
+  h->got.offset = 1;
+
+  return TRUE;
+}
+
+/* Reserve space in G for a GOT entry containing the value of symbol
+   SYMNDX in input bfd ABDF, plus ADDEND.  */
+static bfd_boolean
+score_elf_record_local_got_symbol (bfd *abfd,
+                                   long symndx,
+                                   bfd_vma addend,
+                                   struct score_got_info *g)
+{
+  struct score_got_entry entry, **loc;
+
+  entry.abfd = abfd;
+  entry.symndx = symndx;
+  entry.d.addend = addend;
+  loc = (struct score_got_entry **)htab_find_slot (g->got_entries, &entry, INSERT);
+
+  if (*loc)
+    return TRUE;
+
+  entry.gotidx = g->local_gotno++;
+
+  *loc = bfd_alloc (abfd, sizeof(entry));
+  if (! *loc)
+    return FALSE;
+
+  memcpy (*loc, &entry, sizeof (entry));
+
+  return TRUE;
+}
+
+/* Returns the GOT offset at which the indicated address can be found.
+   If there is not yet a GOT entry for this value, create one.
+   Returns -1 if no satisfactory GOT offset can be found.  */
+static bfd_vma
+score_elf_local_got_index (bfd *abfd, bfd *ibfd, struct bfd_link_info *info,
+                           bfd_vma value, unsigned long r_symndx,
+                           struct score_elf_link_hash_entry *h, int r_type)
+{
+  asection *sgot;
+  struct score_got_info *g;
+  struct score_got_entry *entry;
+
+  g = score_elf_got_info (elf_hash_table (info)->dynobj, &sgot);
+
+  entry = score_elf_create_local_got_entry (abfd, ibfd, g, sgot, value,
+                                             r_symndx, h, r_type);
+  if (!entry)
+    return MINUS_ONE;
+
+  else
+    return entry->gotidx;
+}
+
+/* Returns the GOT index for the global symbol indicated by H.  */
+
+static bfd_vma
+score_elf_global_got_index (bfd *abfd, struct elf_link_hash_entry *h)
+{
+  bfd_vma got_index;
+  asection *sgot;
+  struct score_got_info *g;
+  long global_got_dynindx = 0;
+
+  g = score_elf_got_info (abfd, &sgot);
+  if (g->global_gotsym != NULL)
+    global_got_dynindx = g->global_gotsym->dynindx;
+
+  /* Once we determine the global GOT entry with the lowest dynamic
+     symbol table index, we must put all dynamic symbols with greater
+     indices into the GOT.  That makes it easy to calculate the GOT
+     offset.  */
+  BFD_ASSERT (h->dynindx >= global_got_dynindx);
+  got_index = ((h->dynindx - global_got_dynindx + g->local_gotno) * SCORE_ELF_GOT_SIZE (abfd));
+  BFD_ASSERT (got_index < sgot->size);
+
+  return got_index;
+}
+
+/* Returns the offset for the entry at the INDEXth position in the GOT.  */
+
+static bfd_vma
+score_elf_got_offset_from_index (bfd *dynobj,
+				 bfd *output_bfd,
+                                 bfd *input_bfd ATTRIBUTE_UNUSED,
+				 bfd_vma got_index)
+{
+  asection *sgot;
+  bfd_vma gp;
+
+  score_elf_got_info (dynobj, &sgot);
+  gp = _bfd_get_gp_value (output_bfd);
+
+  return sgot->output_section->vma + sgot->output_offset + got_index - gp;
+}
+
+/* Follow indirect and warning hash entries so that each got entry
+   points to the final symbol definition.  P must point to a pointer
+   to the hash table we're traversing.  Since this traversal may
+   modify the hash table, we set this pointer to NULL to indicate
+   we've made a potentially-destructive change to the hash table, so
+   the traversal must be restarted.  */
+static int
+score_elf_resolve_final_got_entry (void **entryp, void *p)
+{
+  struct score_got_entry *entry = (struct score_got_entry *)*entryp;
+  htab_t got_entries = *(htab_t *)p;
+
+  if (entry->abfd != NULL && entry->symndx == -1)
+    {
+      struct score_elf_link_hash_entry *h = entry->d.h;
+
+      while (h->root.root.type == bfd_link_hash_indirect
+             || h->root.root.type == bfd_link_hash_warning)
+        h = (struct score_elf_link_hash_entry *) h->root.root.u.i.link;
+
+      if (entry->d.h == h)
+        return 1;
+
+      entry->d.h = h;
+
+      /* If we can't find this entry with the new bfd hash, re-insert
+         it, and get the traversal restarted.  */
+      if (! htab_find (got_entries, entry))
+        {
+          htab_clear_slot (got_entries, entryp);
+          entryp = htab_find_slot (got_entries, entry, INSERT);
+          if (! *entryp)
+            *entryp = entry;
+          /* Abort the traversal, since the whole table may have
+             moved, and leave it up to the parent to restart the
+             process.  */
+          *(htab_t *)p = NULL;
+          return 0;
+        }
+      /* We might want to decrement the global_gotno count, but it's
+         either too early or too late for that at this point.  */
+    }
+
+  return 1;
+}
+
+/* Turn indirect got entries in a got_entries table into their final locations.  */
+static void
+score_elf_resolve_final_got_entries (struct score_got_info *g)
+{
+  htab_t got_entries;
+
+  do
+    {
+      got_entries = g->got_entries;
+
+      htab_traverse (got_entries,
+                     score_elf_resolve_final_got_entry,
+                     &got_entries);
+    }
+  while (got_entries == NULL);
+}
+
+/* Add INCREMENT to the reloc (of type HOWTO) at ADDRESS. for -r  */
+static void
+score_elf_add_to_rel (bfd *abfd,
+                      bfd_byte *address,
+                      reloc_howto_type *howto,
+                      bfd_signed_vma increment)
+{
+  bfd_signed_vma addend;
+  bfd_vma contents;
+  unsigned long offset;
+  unsigned long r_type = howto->type;
+  unsigned long hi16_addend, hi16_offset, hi16_value, uvalue;
+
+  contents = score_bfd_get_32 (abfd, address);
+  /* Get the (signed) value from the instruction.  */
+  addend = contents & howto->src_mask;
+  if (addend & ((howto->src_mask + 1) >> 1))
+    {
+      bfd_signed_vma mask;
+
+      mask = -1;
+      mask &= ~howto->src_mask;
+      addend |= mask;
+    }
+  /* Add in the increment, (which is a byte value).  */
+  switch (r_type)
+    {
+    case R_SCORE_PC19:
+      offset =
+        (((contents & howto->src_mask) & 0x3ff0000) >> 6) | ((contents & howto->src_mask) & 0x3ff);
+      offset += increment;
+      contents =
+        (contents & ~howto->
+         src_mask) | (((offset << 6) & howto->src_mask) & 0x3ff0000) | (offset & 0x3ff);
+      score_bfd_put_32 (abfd, contents, address);
+      break;
+    case R_SCORE_HI16:
+      break;
+    case R_SCORE_LO16:
+      hi16_addend = score_bfd_get_32 (abfd, address - 4);
+      hi16_offset = ((((hi16_addend >> 16) & 0x3) << 15) | (hi16_addend & 0x7fff)) >> 1;
+      offset = ((((contents >> 16) & 0x3) << 15) | (contents & 0x7fff)) >> 1;
+      offset = (hi16_offset << 16) | (offset & 0xffff);
+      uvalue = increment + offset;
+      hi16_offset = (uvalue >> 16) << 1;
+      hi16_value = (hi16_addend & (~(howto->dst_mask)))
+        | (hi16_offset & 0x7fff) | ((hi16_offset << 1) & 0x30000);
+      score_bfd_put_32 (abfd, hi16_value, address - 4);
+      offset = (uvalue & 0xffff) << 1;
+      contents = (contents & (~(howto->dst_mask))) | (offset & 0x7fff) | ((offset << 1) & 0x30000);
+      score_bfd_put_32 (abfd, contents, address);
+      break;
+    case R_SCORE_24:
+      offset =
+        (((contents & howto->src_mask) >> 1) & 0x1ff8000) | ((contents & howto->src_mask) & 0x7fff);
+      offset += increment;
+      contents =
+        (contents & ~howto->
+         src_mask) | (((offset << 1) & howto->src_mask) & 0x3ff0000) | (offset & 0x7fff);
+      score_bfd_put_32 (abfd, contents, address);
+      break;
+
+    case R_SCORE16_11:
+
+      contents = score_bfd_get_16 (abfd, address);
+      offset = contents & howto->src_mask;
+      offset += increment;
+      contents = (contents & ~howto->src_mask) | (offset & howto->src_mask);
+      score_bfd_put_16 (abfd, contents, address);
+
+      break;
+    case R_SCORE16_PC8:
+
+      contents = score_bfd_get_16 (abfd, address);
+      offset = (contents & howto->src_mask) + ((increment >> 1) & 0x1ff);
+      contents = (contents & (~howto->src_mask)) | (offset & howto->src_mask);
+      score_bfd_put_16 (abfd, contents, address);
+
+      break;
+
+    case R_SCORE_BCMP:
+      contents = score_bfd_get_32 (abfd, address);
+      offset = (contents & howto->src_mask);
+      offset <<= howto->rightshift;
+      offset += increment;
+      offset >>= howto->rightshift;
+      contents = (contents & (~howto->src_mask)) | (offset & howto->src_mask);
+      score_bfd_put_32 (abfd, contents, address);
+      break;
+
+    case R_SCORE_IMM30:
+      contents = score_bfd_get_48 (abfd, address);
+      offset = (contents & howto->src_mask);
+      offset <<= howto->rightshift;
+      offset += increment;
+      offset >>= howto->rightshift;
+      contents = (contents & (~howto->src_mask)) | (offset & howto->src_mask);
+      score_bfd_put_48 (abfd, contents, address);
+      break;
+
+    case R_SCORE_IMM32:
+      contents = score_bfd_get_48 (abfd, address);
+      offset = (contents & howto->src_mask);
+      offset += increment;
+      contents = (contents & (~howto->src_mask)) | (offset & howto->src_mask);
+      score_bfd_put_48 (abfd, contents, address);
+      break;
+
+    default:
+      addend += increment;
+      contents = (contents & ~howto->dst_mask) | (addend & howto->dst_mask);
+      score_bfd_put_32 (abfd, contents, address);
+      break;
+    }
+}
+
+/* Perform a relocation as part of a final link.  */
+static bfd_reloc_status_type
+score_elf_final_link_relocate (reloc_howto_type *howto,
+                               bfd *input_bfd,
+                               bfd *output_bfd,
+                               asection *input_section,
+                               bfd_byte *contents,
+                               Elf_Internal_Rela *rel,
+                               Elf_Internal_Rela *relocs,
+                               bfd_vma symbol,
+                               struct bfd_link_info *info,
+                               const char *sym_name ATTRIBUTE_UNUSED,
+                               int sym_flags ATTRIBUTE_UNUSED,
+                               struct score_elf_link_hash_entry *h,
+                               asection **local_sections,
+                               bfd_boolean gp_disp_p)
+{
+  unsigned long r_type;
+  unsigned long r_symndx;
+  bfd_byte *hit_data = contents + rel->r_offset;
+  bfd_vma addend;
+  /* The final GP value to be used for the relocatable, executable, or
+     shared object file being produced.  */
+  bfd_vma gp = MINUS_ONE;
+  /* The place (section offset or address) of the storage unit being relocated.  */
+  bfd_vma rel_addr;
+  /* The offset into the global offset table at which the address of the relocation entry
+     symbol, adjusted by the addend, resides during execution.  */
+  bfd_vma g = MINUS_ONE;
+  /* TRUE if the symbol referred to by this relocation is a local symbol.  */
+  bfd_boolean local_p;
+  /* The eventual value we will relocate.  */
+  bfd_vma value = symbol;
+  unsigned long hi16_addend, hi16_offset, hi16_value, uvalue, offset, abs_value = 0;
+
+
+  if (elf_gp (output_bfd) == 0)
+    {
+      struct bfd_link_hash_entry *bh;
+      asection *o;
+
+      bh = bfd_link_hash_lookup (info->hash, "_gp", 0, 0, 1);
+      if (bh != NULL && bh->type == bfd_link_hash_defined)
+        elf_gp (output_bfd) = (bh->u.def.value
+                               + bh->u.def.section->output_section->vma
+                               + bh->u.def.section->output_offset);
+      else if (info->relocatable)
+        {
+          bfd_vma lo = -1;
+
+          /* Find the GP-relative section with the lowest offset.  */
+          for (o = output_bfd->sections; o != NULL; o = o->next)
+            if (o->vma < lo)
+              lo = o->vma;
+          /* And calculate GP relative to that.  */
+          elf_gp (output_bfd) = lo + ELF_SCORE_GP_OFFSET (input_bfd);
+        }
+      else
+        {
+          /* If the relocate_section function needs to do a reloc
+             involving the GP value, it should make a reloc_dangerous
+             callback to warn that GP is not defined.  */
+        }
+    }
+
+  /* Parse the relocation.  */
+  r_symndx = ELF32_R_SYM (rel->r_info);
+  r_type = ELF32_R_TYPE (rel->r_info);
+  rel_addr = (input_section->output_section->vma + input_section->output_offset + rel->r_offset);
+  local_p = score_elf_local_relocation_p (input_bfd, rel, local_sections, TRUE);
+
+  if (r_type == R_SCORE_GOT15)
+    {
+      const Elf_Internal_Rela *relend;
+      const Elf_Internal_Rela *lo16_rel;
+      const struct elf_backend_data *bed;
+      bfd_vma lo_value = 0;
+
+      bed = get_elf_backend_data (output_bfd);
+      relend = relocs + input_section->reloc_count * bed->s->int_rels_per_ext_rel;
+      lo16_rel = score_elf_next_relocation (input_bfd, R_SCORE_GOT_LO16, rel, relend);
+      if ((local_p) && (lo16_rel != NULL))
+        {
+          bfd_vma tmp = 0;
+          tmp = score_bfd_get_32 (input_bfd, contents + lo16_rel->r_offset);
+          lo_value = (((tmp >> 16) & 0x3) << 14) | ((tmp & 0x7fff) >> 1);
+        }
+      addend = lo_value;
+    }
+  /* For score3 R_SCORE_ABS32.  */
+  else if (r_type == R_SCORE_ABS32 || r_type == R_SCORE_REL32)
+    {
+      addend = (bfd_get_32 (input_bfd, hit_data) >> howto->bitpos) & howto->src_mask;
+    }
+  else
+    {
+      addend = (score_bfd_get_32 (input_bfd, hit_data) >> howto->bitpos) & howto->src_mask;
+    }
+
+  /* If we haven't already determined the GOT offset, or the GP value,
+     and we're going to need it, get it now.  */
+  switch (r_type)
+    {
+    case R_SCORE_CALL15:
+    case R_SCORE_GOT15:
+      if (!local_p)
+        {
+          g = score_elf_global_got_index (elf_hash_table (info)->dynobj,
+                                          (struct elf_link_hash_entry *) h);
+          if ((! elf_hash_table (info)->dynamic_sections_created
+               || (info->shared
+                   && (info->symbolic || h->root.dynindx == -1)
+                   && h->root.def_regular)))
+            {
+              /* This is a static link or a -Bsymbolic link.  The
+                 symbol is defined locally, or was forced to be local.
+                 We must initialize this entry in the GOT.  */
+              bfd *tmpbfd = elf_hash_table (info)->dynobj;
+              asection *sgot = score_elf_got_section (tmpbfd, FALSE);
+              score_bfd_put_32 (tmpbfd, value, sgot->contents + g);
+            }
+        }
+      else if (r_type == R_SCORE_GOT15 || r_type == R_SCORE_CALL15)
+        {
+          /* There's no need to create a local GOT entry here; the
+             calculation for a local GOT15 entry does not involve G.  */
+          ;
+        }
+      else
+        {
+          g = score_elf_local_got_index (output_bfd, input_bfd, info,
+                                         symbol + addend, r_symndx, h, r_type);
+            if (g == MINUS_ONE)
+            return bfd_reloc_outofrange;
+        }
+
+      /* Convert GOT indices to actual offsets.  */
+      g = score_elf_got_offset_from_index (elf_hash_table (info)->dynobj,
+                                           output_bfd, input_bfd, g);
+      break;
+
+    case R_SCORE_HI16:
+    case R_SCORE_LO16:
+    case R_SCORE_GPREL32:
+      gp = _bfd_get_gp_value (output_bfd);
+      break;
+
+    case R_SCORE_GP15:
+      gp = _bfd_get_gp_value (output_bfd);
+
+    default:
+      break;
+    }
+
+  switch (r_type)
+    {
+    case R_SCORE_NONE:
+      return bfd_reloc_ok;
+
+    case R_SCORE_ABS32:
+    case R_SCORE_REL32:
+      if ((info->shared
+           || (elf_hash_table (info)->dynamic_sections_created
+               && h != NULL
+               && h->root.def_dynamic
+               && !h->root.def_regular))
+           && r_symndx != STN_UNDEF
+           && (input_section->flags & SEC_ALLOC) != 0)
+        {
+          /* If we're creating a shared library, or this relocation is against a symbol
+             in a shared library, then we can't know where the symbol will end up.
+             So, we create a relocation record in the output, and leave the job up
+             to the dynamic linker.  */
+          value = addend;
+          if (!score_elf_create_dynamic_relocation (output_bfd, info, rel, h,
+                                                    symbol, &value,
+                                                    input_section))
+            return bfd_reloc_undefined;
+        }
+      else if (r_symndx == STN_UNDEF)
+        /* r_symndx will be STN_UNDEF (zero) only for relocs against symbols
+           from removed linkonce sections, or sections discarded by
+           a linker script.  */
+        value = 0;
+      else
+        {
+          if (r_type != R_SCORE_REL32)
+            value = symbol + addend;
+          else
+            value = addend;
+        }
+      value &= howto->dst_mask;
+      bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE_ABS16:
+      value += addend;
+      if ((long)value > 0x7fff || (long)value < -0x8000)
+        return bfd_reloc_overflow;
+      score_bfd_put_16 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE_24:
+      addend = score_bfd_get_32 (input_bfd, hit_data);
+      offset = (((addend & howto->src_mask) >> 1) & 0x1ff8000) | ((addend & howto->src_mask) & 0x7fff);
+      if ((offset & 0x1000000) != 0)
+        offset |= 0xfe000000;
+      value += offset;
+      abs_value = abs (value - rel_addr);
+      if ((abs_value & 0xfe000000) != 0)
+        return bfd_reloc_overflow;
+      addend = (addend & ~howto->src_mask)
+                | (((value << 1) & howto->src_mask) & 0x3ff0000) | (value & 0x7fff);
+      score_bfd_put_32 (input_bfd, addend, hit_data);
+      return bfd_reloc_ok;
+
+    /* signed imm32.  */
+    case R_SCORE_IMM30:
+      {
+        int not_word_align_p = 0;
+        bfd_vma imm_offset = 0;
+        addend = score_bfd_get_48 (input_bfd, hit_data);
+        imm_offset = ((addend >> 7) & 0xff)
+                     | (((addend >> 16) & 0x7fff) << 8)
+                     | (((addend >> 32) & 0x7f) << 23);
+        imm_offset <<= howto->rightshift;
+        value += imm_offset;
+        value &= 0xffffffff;
+
+        /* Check lw48/sw48 rd, value/label word align.  */
+        if ((value & 0x3) != 0)
+          not_word_align_p = 1;
+
+        value >>= howto->rightshift;
+        addend = (addend & ~howto->src_mask)
+                 | (((value & 0xff) >> 0) << 7)
+                 | (((value & 0x7fff00) >> 8) << 16)
+                 | (((value & 0x3f800000) >> 23) << 32);
+        score_bfd_put_48 (input_bfd, addend, hit_data);
+        if (not_word_align_p)
+          return bfd_reloc_other;
+        else
+          return bfd_reloc_ok;
+      }
+
+    case R_SCORE_IMM32:
+      {
+        bfd_vma imm_offset = 0;
+        addend = score_bfd_get_48 (input_bfd, hit_data);
+        imm_offset = ((addend >> 5) & 0x3ff)
+                     | (((addend >> 16) & 0x7fff) << 10)
+                     | (((addend >> 32) & 0x7f) << 25);
+        value += imm_offset;
+        value &= 0xffffffff;
+        addend = (addend & ~howto->src_mask)
+                 | ((value & 0x3ff) << 5)
+                 | (((value >> 10) & 0x7fff) << 16)
+                 | (((value >> 25) & 0x7f) << 32);
+        score_bfd_put_48 (input_bfd, addend, hit_data);
+        return bfd_reloc_ok;
+      }
+
+    case R_SCORE_PC19:
+      addend = score_bfd_get_32 (input_bfd, hit_data);
+      offset = (((addend & howto->src_mask) & 0x3ff0000) >> 6) | ((addend & howto->src_mask) & 0x3ff);
+      if ((offset & 0x80000) != 0)
+        offset |= 0xfff00000;
+      abs_value = value = value - rel_addr + offset;
+      /* exceed 20 bit : overflow.  */
+      if ((abs_value & 0x80000000) == 0x80000000)
+        abs_value = 0xffffffff - value + 1;
+      if ((abs_value & 0xfff80000) != 0)
+        return bfd_reloc_overflow;
+      addend = (addend & ~howto->src_mask)
+                | (((value << 6) & howto->src_mask) & 0x3ff0000) | (value & 0x3ff);
+      score_bfd_put_32 (input_bfd, addend, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE16_11:
+      addend = score_bfd_get_16 (input_bfd, hit_data);
+      offset = addend & howto->src_mask;
+      if ((offset & 0x800) != 0)        /* Offset is negative.  */
+        offset |= 0xfffff000;
+      value += offset;
+      abs_value = abs (value - rel_addr);
+      if ((abs_value & 0xfffff000) != 0)
+        return bfd_reloc_overflow;
+      addend = (addend & ~howto->src_mask) | (value & howto->src_mask);
+      score_bfd_put_16 (input_bfd, addend, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE16_PC8:
+      addend = score_bfd_get_16 (input_bfd, hit_data);
+      offset = (addend & howto->src_mask) << 1;
+      if ((offset & 0x200) != 0)        /* Offset is negative.  */
+        offset |= 0xfffffe00;
+      abs_value = value = value - rel_addr + offset;
+      /* Sign bit + exceed 9 bit.  */
+      if (((value & 0xfffffe00) != 0) && ((value & 0xfffffe00) != 0xfffffe00))
+        return bfd_reloc_overflow;
+      value >>= 1;
+      addend = (addend & ~howto->src_mask) | (value & howto->src_mask);
+      score_bfd_put_16 (input_bfd, addend, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE_BCMP:
+      addend = score_bfd_get_32 (input_bfd, hit_data);
+      offset = (addend & howto->src_mask) << howto->rightshift;
+      if ((offset & 0x200) != 0)        /* Offset is negative.  */
+        offset |= 0xfffffe00;
+      value = value - rel_addr + offset;
+      /* Sign bit + exceed 9 bit.  */
+      if (((value & 0xfffffe00) != 0) && ((value & 0xfffffe00) != 0xfffffe00))
+        return bfd_reloc_overflow;
+      value >>= howto->rightshift;
+      addend = (addend & ~howto->src_mask)
+               | (value & 0x1)
+               | (((value >> 1) & 0x7) << 7)
+               | (((value >> 4) & 0x1f) << 21);
+      score_bfd_put_32 (input_bfd, addend, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE_HI16:
+      return bfd_reloc_ok;
+
+    case R_SCORE_LO16:
+      hi16_addend = score_bfd_get_32 (input_bfd, hit_data - 4);
+      hi16_offset = ((((hi16_addend >> 16) & 0x3) << 15) | (hi16_addend & 0x7fff)) >> 1;
+      addend = score_bfd_get_32 (input_bfd, hit_data);
+      offset = ((((addend >> 16) & 0x3) << 15) | (addend & 0x7fff)) >> 1;
+      offset = (hi16_offset << 16) | (offset & 0xffff);
+
+      if (!gp_disp_p)
+        uvalue = value + offset;
+      else
+        uvalue = offset + gp - rel_addr + 4;
+
+      hi16_offset = (uvalue >> 16) << 1;
+      hi16_value = (hi16_addend & (~(howto->dst_mask)))
+                        | (hi16_offset & 0x7fff) | ((hi16_offset << 1) & 0x30000);
+      score_bfd_put_32 (input_bfd, hi16_value, hit_data - 4);
+      offset = (uvalue & 0xffff) << 1;
+      value = (addend & (~(howto->dst_mask))) | (offset & 0x7fff) | ((offset << 1) & 0x30000);
+      score_bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE_GP15:
+      addend = score_bfd_get_32 (input_bfd, hit_data);
+      offset = addend & 0x7fff;
+      if ((offset & 0x4000) == 0x4000)
+        offset |= 0xffffc000;
+      value = value + offset - gp;
+      if (((value & 0xffffc000) != 0) && ((value & 0xffffc000) != 0xffffc000))
+        return bfd_reloc_overflow;
+      value = (addend & ~howto->src_mask) | (value & howto->src_mask);
+      score_bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE_GOT15:
+    case R_SCORE_CALL15:
+      if (local_p)
+        {
+          bfd_boolean forced;
+
+          /* The special case is when the symbol is forced to be local.  We need the
+             full address in the GOT since no R_SCORE_GOT_LO16 relocation follows.  */
+          forced = ! score_elf_local_relocation_p (input_bfd, rel,
+                                                   local_sections, FALSE);
+          value = score_elf_got16_entry (output_bfd, input_bfd, info,
+                                         symbol + addend, forced);
+          if (value == MINUS_ONE)
+            return bfd_reloc_outofrange;
+          value = score_elf_got_offset_from_index (elf_hash_table (info)->dynobj,
+                                                   output_bfd, input_bfd, value);
+        }
+      else
+        {
+          value = g;
+        }
+
+      if ((long) value > 0x3fff || (long) value < -0x4000)
+        return bfd_reloc_overflow;
+
+      addend = score_bfd_get_32 (input_bfd, hit_data);
+      value = (addend & ~howto->dst_mask) | (value & howto->dst_mask);
+      score_bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE_GPREL32:
+      value = (addend + symbol - gp);
+      value &= howto->dst_mask;
+      score_bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE_GOT_LO16:
+      addend = score_bfd_get_32 (input_bfd, hit_data);
+      value = (((addend >> 16) & 0x3) << 14) | ((addend & 0x7fff) >> 1);
+      value += symbol;
+      value = (addend & (~(howto->dst_mask))) | ((value & 0x3fff) << 1)
+               | (((value >> 14) & 0x3) << 16);
+
+      score_bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE_DUMMY_HI16:
+      return bfd_reloc_ok;
+
+    case R_SCORE_GNU_VTINHERIT:
+    case R_SCORE_GNU_VTENTRY:
+      /* We don't do anything with these at present.  */
+      return bfd_reloc_continue;
+
+    default:
+      return bfd_reloc_notsupported;
+    }
+}
+
+/* Score backend functions.  */
+static void
+s3_bfd_score_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+                            arelent *bfd_reloc,
+                            Elf_Internal_Rela *elf_reloc)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (elf_reloc->r_info);
+  if (r_type >= ARRAY_SIZE (elf32_score_howto_table))
+    bfd_reloc->howto = NULL;
+  else
+    bfd_reloc->howto = &elf32_score_howto_table[r_type];
+}
+
+/* Relocate an score ELF section.  */
+static bfd_boolean
+s3_bfd_score_elf_relocate_section (bfd *output_bfd,
+                                   struct bfd_link_info *info,
+                                   bfd *input_bfd,
+                                   asection *input_section,
+                                   bfd_byte *contents,
+                                   Elf_Internal_Rela *relocs,
+                                   Elf_Internal_Sym *local_syms,
+                                   asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  const char *name;
+  unsigned long offset;
+  unsigned long hi16_addend, hi16_offset, hi16_value, uvalue;
+  size_t extsymoff;
+  bfd_boolean gp_disp_p = FALSE;
+
+  /* Sort dynsym.  */
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      bfd_size_type dynsecsymcount = 0;
+      if (info->shared)
+        {
+          asection * p;
+          const struct elf_backend_data *bed = get_elf_backend_data (output_bfd);
+
+          for (p = output_bfd->sections; p ; p = p->next)
+            if ((p->flags & SEC_EXCLUDE) == 0
+                && (p->flags & SEC_ALLOC) != 0
+                && !(*bed->elf_backend_omit_section_dynsym) (output_bfd, info, p))
+              ++ dynsecsymcount;
+        }
+
+      if (!score_elf_sort_hash_table (info, dynsecsymcount + 1))
+        return FALSE;
+    }
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  extsymoff = (elf_bad_symtab (input_bfd)) ? 0 : symtab_hdr->sh_info;
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct score_elf_link_hash_entry *h;
+      bfd_vma relocation = 0;
+      bfd_reloc_status_type r;
+      arelent bfd_reloc;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      s3_bfd_score_info_to_howto (input_bfd, &bfd_reloc, (Elf_Internal_Rela *) rel);
+      howto = bfd_reloc.howto;
+
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+
+      if (r_symndx < extsymoff)
+        {
+          sym = local_syms + r_symndx;
+          sec = local_sections[r_symndx];
+          relocation = (sec->output_section->vma
+                        + sec->output_offset
+                        + sym->st_value);
+          name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym, sec);
+
+          if (!info->relocatable
+              && (sec->flags & SEC_MERGE)
+              && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+            {
+              asection *msec;
+              bfd_vma addend, value;
+
+              switch (r_type)
+                {
+                case R_SCORE_HI16:
+                  break;
+                case R_SCORE_LO16:
+                  hi16_addend = score_bfd_get_32 (input_bfd, contents + rel->r_offset - 4);
+                  hi16_offset = ((((hi16_addend >> 16) & 0x3) << 15) | (hi16_addend & 0x7fff)) >> 1;
+                  value = score_bfd_get_32 (input_bfd, contents + rel->r_offset);
+                  offset = ((((value >> 16) & 0x3) << 15) | (value & 0x7fff)) >> 1;
+                  addend = (hi16_offset << 16) | (offset & 0xffff);
+                  msec = sec;
+                  addend = _bfd_elf_rel_local_sym (output_bfd, sym, &msec, addend);
+                  addend -= relocation;
+                  addend += msec->output_section->vma + msec->output_offset;
+                  uvalue = addend;
+                  hi16_offset = (uvalue >> 16) << 1;
+                  hi16_value = (hi16_addend & (~(howto->dst_mask)))
+                    | (hi16_offset & 0x7fff) | ((hi16_offset << 1) & 0x30000);
+                  score_bfd_put_32 (input_bfd, hi16_value, contents + rel->r_offset - 4);
+                  offset = (uvalue & 0xffff) << 1;
+                  value = (value & (~(howto->dst_mask)))
+                    | (offset & 0x7fff) | ((offset << 1) & 0x30000);
+                  score_bfd_put_32 (input_bfd, value, contents + rel->r_offset);
+                  break;
+
+                case R_SCORE_IMM32:
+                  {
+                    value = score_bfd_get_48 (input_bfd, contents + rel->r_offset);
+                    addend = ((value >> 5) & 0x3ff)
+                              | (((value >> 16) & 0x7fff) << 10)
+                              | (((value >> 32) & 0x7f) << 25);
+                    msec = sec;
+                    addend = _bfd_elf_rel_local_sym (output_bfd, sym, &msec, addend);
+                    addend -= relocation;
+                    addend += msec->output_section->vma + msec->output_offset;
+                    addend &= 0xffffffff;
+                    value = (value & ~howto->src_mask)
+                             | ((addend & 0x3ff) << 5)
+                             | (((addend >> 10) & 0x7fff) << 16)
+                             | (((addend >> 25) & 0x7f) << 32);
+                    score_bfd_put_48 (input_bfd, value, contents + rel->r_offset);
+                    break;
+                  }
+
+                case R_SCORE_IMM30:
+                  {
+                    int not_word_align_p = 0;
+                    value = score_bfd_get_48 (input_bfd, contents + rel->r_offset);
+                    addend = ((value >> 7) & 0xff)
+                              | (((value >> 16) & 0x7fff) << 8)
+                              | (((value >> 32) & 0x7f) << 23);
+                    addend <<= howto->rightshift;
+                    msec = sec;
+                    addend = _bfd_elf_rel_local_sym (output_bfd, sym, &msec, addend);
+                    addend -= relocation;
+                    addend += msec->output_section->vma + msec->output_offset;
+                    addend &= 0xffffffff;
+
+                    /* Check lw48/sw48 rd, value/label word align.  */
+                    if ((addend & 0x3) != 0)
+                      not_word_align_p = 1;
+
+                    addend >>= howto->rightshift;
+                    value = (value & ~howto->src_mask)
+                             | (((addend & 0xff) >> 0) << 7)
+                             | (((addend & 0x7fff00) >> 8) << 16)
+                             | (((addend & 0x3f800000) >> 23) << 32);
+                    score_bfd_put_48 (input_bfd, value, contents + rel->r_offset);
+
+                    if (not_word_align_p)
+                      return bfd_reloc_other;
+                    else
+                      break;
+                  }
+
+                case R_SCORE_GOT_LO16:
+                  value = score_bfd_get_32 (input_bfd, contents + rel->r_offset);
+                  addend = (((value >> 16) & 0x3) << 14) | ((value & 0x7fff) >> 1);
+                  msec = sec;
+                  addend = _bfd_elf_rel_local_sym (output_bfd, sym, &msec, addend) - relocation;
+                  addend += msec->output_section->vma + msec->output_offset;
+                  value = (value & (~(howto->dst_mask))) | ((addend & 0x3fff) << 1)
+                           | (((addend >> 14) & 0x3) << 16);
+
+                  score_bfd_put_32 (input_bfd, value, contents + rel->r_offset);
+                  break;
+
+                case R_SCORE_ABS32:
+                case R_SCORE_REL32:
+                  value = bfd_get_32 (input_bfd, contents + rel->r_offset);
+                  /* Get the (signed) value from the instruction.  */
+                  addend = value & howto->src_mask;
+                  if (addend & ((howto->src_mask + 1) >> 1))
+                    {
+                      bfd_signed_vma mask;
+
+                      mask = -1;
+                      mask &= ~howto->src_mask;
+                      addend |= mask;
+                    }
+                  msec = sec;
+                  addend = _bfd_elf_rel_local_sym (output_bfd, sym, &msec, addend) - relocation;
+                  addend += msec->output_section->vma + msec->output_offset;
+                  value = (value & ~howto->dst_mask) | (addend & howto->dst_mask);
+                  bfd_put_32 (input_bfd, value, contents + rel->r_offset);
+                  break;
+
+                default:
+                  value = score_bfd_get_32 (input_bfd, contents + rel->r_offset);
+                  /* Get the (signed) value from the instruction.  */
+                  addend = value & howto->src_mask;
+                  if (addend & ((howto->src_mask + 1) >> 1))
+                    {
+                      bfd_signed_vma mask;
+
+                      mask = -1;
+                      mask &= ~howto->src_mask;
+                      addend |= mask;
+                    }
+                  msec = sec;
+                  addend = _bfd_elf_rel_local_sym (output_bfd, sym, &msec, addend) - relocation;
+                  addend += msec->output_section->vma + msec->output_offset;
+                  value = (value & ~howto->dst_mask) | (addend & howto->dst_mask);
+                  score_bfd_put_32 (input_bfd, value, contents + rel->r_offset);
+                  break;
+                }
+            }
+        }
+      else
+        {
+          /* For global symbols we look up the symbol in the hash-table.  */
+          h = ((struct score_elf_link_hash_entry *)
+               elf_sym_hashes (input_bfd) [r_symndx - extsymoff]);
+          /* Find the real hash-table entry for this symbol.  */
+          while (h->root.root.type == bfd_link_hash_indirect
+                 || h->root.root.type == bfd_link_hash_warning)
+            h = (struct score_elf_link_hash_entry *) h->root.root.u.i.link;
+
+          /* Record the name of this symbol, for our caller.  */
+          name = h->root.root.root.string;
+
+          /* See if this is the special GP_DISP_LABEL symbol.  Note that such a
+             symbol must always be a global symbol.  */
+          if (strcmp (name, GP_DISP_LABEL) == 0)
+            {
+              /* Relocations against GP_DISP_LABEL are permitted only with
+                 R_SCORE_HI16 and R_SCORE_LO16 relocations.  */
+              if (r_type != R_SCORE_HI16 && r_type != R_SCORE_LO16)
+                return bfd_reloc_notsupported;
+
+              gp_disp_p = TRUE;
+            }
+
+          /* If this symbol is defined, calculate its address.  Note that
+              GP_DISP_LABEL is a magic symbol, always implicitly defined by the
+              linker, so it's inappropriate to check to see whether or not
+              its defined.  */
+          else if ((h->root.root.type == bfd_link_hash_defined
+                    || h->root.root.type == bfd_link_hash_defweak)
+                   && h->root.root.u.def.section)
+            {
+              sec = h->root.root.u.def.section;
+              if (sec->output_section)
+                relocation = (h->root.root.u.def.value
+                              + sec->output_section->vma
+                              + sec->output_offset);
+              else
+                {
+                  relocation = h->root.root.u.def.value;
+                }
+            }
+          else if (h->root.root.type == bfd_link_hash_undefweak)
+            /* We allow relocations against undefined weak symbols, giving
+               it the value zero, so that you can undefined weak functions
+               and check to see if they exist by looking at their addresses.  */
+            relocation = 0;
+          else if (info->unresolved_syms_in_objects == RM_IGNORE
+                   && ELF_ST_VISIBILITY (h->root.other) == STV_DEFAULT)
+            relocation = 0;
+          else if (strcmp (name, "_DYNAMIC_LINK") == 0)
+            {
+              /* If this is a dynamic link, we should have created a _DYNAMIC_LINK symbol
+                 in s3_bfd_score_elf_create_dynamic_sections.  Otherwise, we should define
+                 the symbol with a value of 0.  */
+              BFD_ASSERT (! info->shared);
+              BFD_ASSERT (bfd_get_section_by_name (output_bfd, ".dynamic") == NULL);
+              relocation = 0;
+            }
+          else if (!info->relocatable)
+            {
+              if (! ((*info->callbacks->undefined_symbol)
+                     (info, h->root.root.root.string, input_bfd,
+                      input_section, rel->r_offset,
+                      (info->unresolved_syms_in_objects == RM_GENERATE_ERROR)
+                      || ELF_ST_VISIBILITY (h->root.other))))
+                return bfd_reloc_undefined;
+              relocation = 0;
+            }
+        }
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+        {
+          /* This is a relocatable link.  We don't have to change
+             anything, unless the reloc is against a section symbol,
+             in which case we have to adjust according to where the
+             section symbol winds up in the output section.  */
+          if (r_symndx < symtab_hdr->sh_info)
+            {
+              sym = local_syms + r_symndx;
+              if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+                {
+                  sec = local_sections[r_symndx];
+                  score_elf_add_to_rel (input_bfd, contents + rel->r_offset,
+                                    howto, (bfd_signed_vma) (sec->output_offset + sym->st_value));
+                }
+            }
+          continue;
+        }
+
+      /* This is a final link.  */
+      r = score_elf_final_link_relocate (howto, input_bfd, output_bfd,
+                                         input_section, contents, rel, relocs,
+                                         relocation, info, name,
+                                         (h ? ELF_ST_TYPE ((unsigned int)h->root.root.type) :
+                                         ELF_ST_TYPE ((unsigned int)sym->st_info)), h, local_sections,
+                                         gp_disp_p);
+
+      if (r != bfd_reloc_ok)
+        {
+          const char *msg = (const char *)0;
+
+          switch (r)
+            {
+            case bfd_reloc_overflow:
+              /* If the overflowing reloc was to an undefined symbol,
+                 we have already printed one error message and there
+                 is no point complaining again.  */
+              if (((!h) || (h->root.root.type != bfd_link_hash_undefined))
+                  && (!((*info->callbacks->reloc_overflow)
+                        (info, NULL, name, howto->name, (bfd_vma) 0,
+                         input_bfd, input_section, rel->r_offset))))
+                return FALSE;
+              break;
+            case bfd_reloc_undefined:
+              if (!((*info->callbacks->undefined_symbol)
+                    (info, name, input_bfd, input_section, rel->r_offset, TRUE)))
+                return FALSE;
+              break;
+
+            case bfd_reloc_outofrange:
+              msg = _("internal error: out of range error");
+              goto common_error;
+
+            case bfd_reloc_notsupported:
+              msg = _("internal error: unsupported relocation error");
+              goto common_error;
+
+            case bfd_reloc_dangerous:
+              msg = _("internal error: dangerous error");
+              goto common_error;
+
+            /* Use bfd_reloc_other to check lw48, sw48 word align.  */
+            case bfd_reloc_other:
+              msg = _("address not word align");
+              goto common_error;
+
+            default:
+              msg = _("internal error: unknown error");
+              /* fall through */
+
+            common_error:
+              if (!((*info->callbacks->warning)
+                    (info, msg, name, input_bfd, input_section, rel->r_offset)))
+                return FALSE;
+              break;
+            }
+        }
+    }
+
+  return TRUE;
+}
+
+/* Look through the relocs for a section during the first phase, and
+   allocate space in the global offset table.  */
+static bfd_boolean
+s3_bfd_score_elf_check_relocs (bfd *abfd,
+                               struct bfd_link_info *info,
+                               asection *sec,
+                               const Elf_Internal_Rela *relocs)
+{
+  const char *name;
+  bfd *dynobj;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  struct score_got_info *g;
+  size_t extsymoff;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  asection *sgot;
+  asection *sreloc;
+  const struct elf_backend_data *bed;
+
+  if (info->relocatable)
+    return TRUE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  extsymoff = (elf_bad_symtab (abfd)) ? 0 : symtab_hdr->sh_info;
+
+  name = bfd_get_section_name (abfd, sec);
+
+  if (dynobj == NULL)
+    {
+      sgot = NULL;
+      g = NULL;
+    }
+  else
+    {
+      sgot = score_elf_got_section (dynobj, FALSE);
+      if (sgot == NULL)
+        g = NULL;
+      else
+        {
+          BFD_ASSERT (score_elf_section_data (sgot) != NULL);
+          g = score_elf_section_data (sgot)->u.got_info;
+          BFD_ASSERT (g != NULL);
+        }
+    }
+
+  sreloc = NULL;
+  bed = get_elf_backend_data (abfd);
+  rel_end = relocs + sec->reloc_count * bed->s->int_rels_per_ext_rel;
+  for (rel = relocs; rel < rel_end; ++rel)
+    {
+      unsigned long r_symndx;
+      unsigned int r_type;
+      struct elf_link_hash_entry *h;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      if (r_symndx < extsymoff)
+        {
+          h = NULL;
+        }
+      else if (r_symndx >= extsymoff + NUM_SHDR_ENTRIES (symtab_hdr))
+        {
+          (*_bfd_error_handler) (_("%s: Malformed reloc detected for section %s"), abfd, name);
+          bfd_set_error (bfd_error_bad_value);
+          return FALSE;
+        }
+      else
+        {
+          h = sym_hashes[r_symndx - extsymoff];
+
+          /* This may be an indirect symbol created because of a version.  */
+          if (h != NULL)
+            {
+              while (h->root.type == bfd_link_hash_indirect)
+                h = (struct elf_link_hash_entry *)h->root.u.i.link;
+            }
+        }
+
+      /* Some relocs require a global offset table.  */
+      if (dynobj == NULL || sgot == NULL)
+        {
+          switch (r_type)
+            {
+            case R_SCORE_GOT15:
+            case R_SCORE_CALL15:
+              if (dynobj == NULL)
+                elf_hash_table (info)->dynobj = dynobj = abfd;
+              if (!score_elf_create_got_section (dynobj, info, FALSE))
+                return FALSE;
+              g = score_elf_got_info (dynobj, &sgot);
+              break;
+            case R_SCORE_ABS32:
+            case R_SCORE_REL32:
+              if (dynobj == NULL && (info->shared || h != NULL) && (sec->flags & SEC_ALLOC) != 0)
+                elf_hash_table (info)->dynobj = dynobj = abfd;
+              break;
+            default:
+              break;
+            }
+        }
+
+      if (!h && (r_type == R_SCORE_GOT_LO16))
+        {
+          if (! score_elf_record_local_got_symbol (abfd, r_symndx, rel->r_addend, g))
+            return FALSE;
+        }
+
+      switch (r_type)
+        {
+        case R_SCORE_CALL15:
+          if (h == NULL)
+            {
+              (*_bfd_error_handler)
+                (_("%B: CALL15 reloc at 0x%lx not against global symbol"),
+                 abfd, (unsigned long) rel->r_offset);
+              bfd_set_error (bfd_error_bad_value);
+              return FALSE;
+            }
+          else
+            {
+              /* This symbol requires a global offset table entry.  */
+              if (! score_elf_record_global_got_symbol (h, abfd, info, g))
+                return FALSE;
+
+              /* We need a stub, not a plt entry for the undefined function.  But we record
+                 it as if it needs plt.  See _bfd_elf_adjust_dynamic_symbol.  */
+              h->needs_plt = 1;
+              h->type = STT_FUNC;
+            }
+          break;
+        case R_SCORE_GOT15:
+          if (h && ! score_elf_record_global_got_symbol (h, abfd, info, g))
+            return FALSE;
+          break;
+        case R_SCORE_ABS32:
+        case R_SCORE_REL32:
+          if ((info->shared || h != NULL) && (sec->flags & SEC_ALLOC) != 0)
+            {
+              if (sreloc == NULL)
+                {
+                  sreloc = score_elf_rel_dyn_section (dynobj, TRUE);
+                  if (sreloc == NULL)
+                    return FALSE;
+                }
+#define SCORE_READONLY_SECTION (SEC_ALLOC | SEC_LOAD | SEC_READONLY)
+              if (info->shared)
+                {
+                  /* When creating a shared object, we must copy these reloc types into
+                     the output file as R_SCORE_REL32 relocs.  We make room for this reloc
+                     in the .rel.dyn reloc section.  */
+                  score_elf_allocate_dynamic_relocations (dynobj, 1);
+                  if ((sec->flags & SCORE_READONLY_SECTION)
+                      == SCORE_READONLY_SECTION)
+                    /* We tell the dynamic linker that there are
+                       relocations against the text segment.  */
+                    info->flags |= DF_TEXTREL;
+                }
+              else
+                {
+                  struct score_elf_link_hash_entry *hscore;
+
+                  /* We only need to copy this reloc if the symbol is
+                     defined in a dynamic object.  */
+                  hscore = (struct score_elf_link_hash_entry *)h;
+                  ++hscore->possibly_dynamic_relocs;
+                  if ((sec->flags & SCORE_READONLY_SECTION)
+                      == SCORE_READONLY_SECTION)
+                    /* We need it to tell the dynamic linker if there
+                       are relocations against the text segment.  */
+                    hscore->readonly_reloc = TRUE;
+                }
+
+              /* Even though we don't directly need a GOT entry for this symbol,
+                 a symbol must have a dynamic symbol table index greater that
+                 DT_SCORE_GOTSYM if there are dynamic relocations against it.  */
+              if (h != NULL)
+                {
+                  if (dynobj == NULL)
+                    elf_hash_table (info)->dynobj = dynobj = abfd;
+                  if (! score_elf_create_got_section (dynobj, info, TRUE))
+                    return FALSE;
+                  g = score_elf_got_info (dynobj, &sgot);
+                  if (! score_elf_record_global_got_symbol (h, abfd, info, g))
+                    return FALSE;
+                }
+            }
+          break;
+
+          /* This relocation describes the C++ object vtable hierarchy.
+             Reconstruct it for later use during GC.  */
+        case R_SCORE_GNU_VTINHERIT:
+          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+
+          /* This relocation describes which C++ vtable entries are actually
+             used.  Record for later use during GC.  */
+        case R_SCORE_GNU_VTENTRY:
+          if (!bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+        default:
+          break;
+        }
+
+      /* We must not create a stub for a symbol that has relocations
+         related to taking the function's address.  */
+      switch (r_type)
+        {
+        default:
+          if (h != NULL)
+            {
+              struct score_elf_link_hash_entry *sh;
+
+              sh = (struct score_elf_link_hash_entry *) h;
+              sh->no_fn_stub = TRUE;
+            }
+          break;
+        case R_SCORE_CALL15:
+          break;
+        }
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+s3_bfd_score_elf_add_symbol_hook (bfd *abfd,
+                                  struct bfd_link_info *info ATTRIBUTE_UNUSED,
+                                  Elf_Internal_Sym *sym,
+                                  const char **namep ATTRIBUTE_UNUSED,
+                                  flagword *flagsp ATTRIBUTE_UNUSED,
+                                  asection **secp,
+                                  bfd_vma *valp)
+{
+  switch (sym->st_shndx)
+    {
+    case SHN_COMMON:
+      if (sym->st_size > elf_gp_size (abfd))
+        break;
+      /* Fall through.  */
+    case SHN_SCORE_SCOMMON:
+      *secp = bfd_make_section_old_way (abfd, ".scommon");
+      (*secp)->flags |= SEC_IS_COMMON;
+      *valp = sym->st_size;
+      break;
+    }
+
+  return TRUE;
+}
+
+static void
+s3_bfd_score_elf_symbol_processing (bfd *abfd, asymbol *asym)
+{
+  elf_symbol_type *elfsym;
+
+  elfsym = (elf_symbol_type *) asym;
+  switch (elfsym->internal_elf_sym.st_shndx)
+    {
+    case SHN_COMMON:
+      if (asym->value > elf_gp_size (abfd))
+        break;
+      /* Fall through.  */
+    case SHN_SCORE_SCOMMON:
+      if (score_elf_scom_section.name == NULL)
+        {
+          /* Initialize the small common section.  */
+          score_elf_scom_section.name = ".scommon";
+          score_elf_scom_section.flags = SEC_IS_COMMON;
+          score_elf_scom_section.output_section = &score_elf_scom_section;
+          score_elf_scom_section.symbol = &score_elf_scom_symbol;
+          score_elf_scom_section.symbol_ptr_ptr = &score_elf_scom_symbol_ptr;
+          score_elf_scom_symbol.name = ".scommon";
+          score_elf_scom_symbol.flags = BSF_SECTION_SYM;
+          score_elf_scom_symbol.section = &score_elf_scom_section;
+          score_elf_scom_symbol_ptr = &score_elf_scom_symbol;
+        }
+      asym->section = &score_elf_scom_section;
+      asym->value = elfsym->internal_elf_sym.st_size;
+      break;
+    }
+}
+
+static int
+s3_bfd_score_elf_link_output_symbol_hook (struct bfd_link_info *info ATTRIBUTE_UNUSED,
+                                          const char *name ATTRIBUTE_UNUSED,
+                                          Elf_Internal_Sym *sym,
+                                          asection *input_sec,
+                                          struct elf_link_hash_entry *h ATTRIBUTE_UNUSED)
+{
+  /* If we see a common symbol, which implies a relocatable link, then
+     if a symbol was small common in an input file, mark it as small
+     common in the output file.  */
+  if (sym->st_shndx == SHN_COMMON && strcmp (input_sec->name, ".scommon") == 0)
+    sym->st_shndx = SHN_SCORE_SCOMMON;
+
+  return 1;
+}
+
+static bfd_boolean
+s3_bfd_score_elf_section_from_bfd_section (bfd *abfd ATTRIBUTE_UNUSED,
+                                           asection *sec,
+                                           int *retval)
+{
+  if (strcmp (bfd_get_section_name (abfd, sec), ".scommon") == 0)
+    {
+      *retval = SHN_SCORE_SCOMMON;
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can understand.  */
+static bfd_boolean
+s3_bfd_score_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+                                        struct elf_link_hash_entry *h)
+{
+  bfd *dynobj;
+  struct score_elf_link_hash_entry *hscore;
+  asection *s;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (dynobj != NULL
+              && (h->needs_plt
+                  || h->u.weakdef != NULL
+                  || (h->def_dynamic && h->ref_regular && !h->def_regular)));
+
+  /* If this symbol is defined in a dynamic object, we need to copy
+     any R_SCORE_ABS32 or R_SCORE_REL32 relocs against it into the output
+     file.  */
+  hscore = (struct score_elf_link_hash_entry *)h;
+  if (!info->relocatable
+      && hscore->possibly_dynamic_relocs != 0
+      && (h->root.type == bfd_link_hash_defweak || !h->def_regular))
+    {
+      score_elf_allocate_dynamic_relocations (dynobj, hscore->possibly_dynamic_relocs);
+      if (hscore->readonly_reloc)
+        /* We tell the dynamic linker that there are relocations
+           against the text segment.  */
+        info->flags |= DF_TEXTREL;
+    }
+
+  /* For a function, create a stub, if allowed.  */
+  if (!hscore->no_fn_stub && h->needs_plt)
+    {
+      if (!elf_hash_table (info)->dynamic_sections_created)
+        return TRUE;
+
+      /* If this symbol is not defined in a regular file, then set
+         the symbol to the stub location.  This is required to make
+         function pointers compare as equal between the normal
+         executable and the shared library.  */
+      if (!h->def_regular)
+        {
+          /* We need .stub section.  */
+          s = bfd_get_section_by_name (dynobj, SCORE_ELF_STUB_SECTION_NAME);
+          BFD_ASSERT (s != NULL);
+
+          h->root.u.def.section = s;
+          h->root.u.def.value = s->size;
+
+          /* XXX Write this stub address somewhere.  */
+          h->plt.offset = s->size;
+
+          /* Make room for this stub code.  */
+          s->size += SCORE_FUNCTION_STUB_SIZE;
+
+          /* The last half word of the stub will be filled with the index
+             of this symbol in .dynsym section.  */
+          return TRUE;
+        }
+    }
+  else if ((h->type == STT_FUNC) && !h->needs_plt)
+    {
+      /* This will set the entry for this symbol in the GOT to 0, and
+         the dynamic linker will take care of this.  */
+      h->root.u.def.value = 0;
+      return TRUE;
+    }
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+                  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+  return TRUE;
+}
+
+/* This function is called after all the input files have been read,
+   and the input sections have been assigned to output sections.  */
+static bfd_boolean
+s3_bfd_score_elf_always_size_sections (bfd *output_bfd,
+                                       struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *s;
+  struct score_got_info *g;
+  int i;
+  bfd_size_type loadable_size = 0;
+  bfd_size_type local_gotno;
+  bfd *sub;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  if (dynobj == NULL)
+    /* Relocatable links don't have it.  */
+    return TRUE;
+
+  g = score_elf_got_info (dynobj, &s);
+  if (s == NULL)
+    return TRUE;
+
+  /* Calculate the total loadable size of the output.  That will give us the
+     maximum number of GOT_PAGE entries required.  */
+  for (sub = info->input_bfds; sub; sub = sub->link_next)
+    {
+      asection *subsection;
+
+      for (subsection = sub->sections;
+           subsection;
+           subsection = subsection->next)
+        {
+          if ((subsection->flags & SEC_ALLOC) == 0)
+            continue;
+          loadable_size += ((subsection->size + 0xf)
+                            &~ (bfd_size_type) 0xf);
+        }
+    }
+
+  /* There has to be a global GOT entry for every symbol with
+     a dynamic symbol table index of DT_SCORE_GOTSYM or
+     higher.  Therefore, it make sense to put those symbols
+     that need GOT entries at the end of the symbol table.  We
+     do that here.  */
+  if (! score_elf_sort_hash_table (info, 1))
+    return FALSE;
+
+  if (g->global_gotsym != NULL)
+    i = elf_hash_table (info)->dynsymcount - g->global_gotsym->dynindx;
+  else
+    /* If there are no global symbols, or none requiring
+       relocations, then GLOBAL_GOTSYM will be NULL.  */
+    i = 0;
+
+  /* In the worst case, we'll get one stub per dynamic symbol.  */
+  loadable_size += SCORE_FUNCTION_STUB_SIZE * i;
+
+  /* Assume there are two loadable segments consisting of
+     contiguous sections.  Is 5 enough?  */
+  local_gotno = (loadable_size >> 16) + 5;
+
+  g->local_gotno += local_gotno;
+  s->size += g->local_gotno * SCORE_ELF_GOT_SIZE (output_bfd);
+
+  g->global_gotno = i;
+  s->size += i * SCORE_ELF_GOT_SIZE (output_bfd);
+
+  score_elf_resolve_final_got_entries (g);
+
+  if (s->size > SCORE_ELF_GOT_MAX_SIZE (output_bfd))
+    {
+      /* Fixme. Error message or Warning message should be issued here.  */
+    }
+
+  return TRUE;
+}
+
+/* Set the sizes of the dynamic sections.  */
+static bfd_boolean
+s3_bfd_score_elf_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *s;
+  bfd_boolean reltext;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (!info->shared)
+        {
+          s = bfd_get_section_by_name (dynobj, ".interp");
+          BFD_ASSERT (s != NULL);
+          s->size = strlen (ELF_DYNAMIC_INTERPRETER) + 1;
+          s->contents = (bfd_byte *) ELF_DYNAMIC_INTERPRETER;
+        }
+    }
+
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  reltext = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      const char *name;
+
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+        continue;
+
+      /* It's OK to base decisions on the section name, because none
+         of the dynobj section names depend upon the input files.  */
+      name = bfd_get_section_name (dynobj, s);
+
+      if (CONST_STRNEQ (name, ".rel"))
+        {
+          if (s->size == 0)
+            {
+              /* We only strip the section if the output section name
+                 has the same name.  Otherwise, there might be several
+                 input sections for this output section.  FIXME: This
+                 code is probably not needed these days anyhow, since
+                 the linker now does not create empty output sections.  */
+              if (s->output_section != NULL
+                  && strcmp (name,
+                             bfd_get_section_name (s->output_section->owner,
+                                                   s->output_section)) == 0)
+                s->flags |= SEC_EXCLUDE;
+            }
+          else
+            {
+              const char *outname;
+              asection *target;
+
+              /* If this relocation section applies to a read only
+                 section, then we probably need a DT_TEXTREL entry.
+                 If the relocation section is .rel.dyn, we always
+                 assert a DT_TEXTREL entry rather than testing whether
+                 there exists a relocation to a read only section or
+                 not.  */
+              outname = bfd_get_section_name (output_bfd, s->output_section);
+              target = bfd_get_section_by_name (output_bfd, outname + 4);
+              if ((target != NULL
+                   && (target->flags & SEC_READONLY) != 0
+                   && (target->flags & SEC_ALLOC) != 0) || strcmp (outname, ".rel.dyn") == 0)
+                reltext = TRUE;
+
+              /* We use the reloc_count field as a counter if we need
+                 to copy relocs into the output file.  */
+              if (strcmp (name, ".rel.dyn") != 0)
+                s->reloc_count = 0;
+            }
+        }
+      else if (CONST_STRNEQ (name, ".got"))
+        {
+          /* s3_bfd_score_elf_always_size_sections() has already done
+             most of the work, but some symbols may have been mapped
+             to versions that we must now resolve in the got_entries
+             hash tables.  */
+        }
+      else if (strcmp (name, SCORE_ELF_STUB_SECTION_NAME) == 0)
+        {
+          /* IRIX rld assumes that the function stub isn't at the end
+             of .text section. So put a dummy. XXX  */
+          s->size += SCORE_FUNCTION_STUB_SIZE;
+        }
+      else if (! CONST_STRNEQ (name, ".init"))
+        {
+          /* It's not one of our sections, so don't allocate space.  */
+          continue;
+        }
+
+      /* Allocate memory for the section contents.  */
+      s->contents = bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL && s->size != 0)
+        {
+          bfd_set_error (bfd_error_no_memory);
+          return FALSE;
+        }
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+         values later, in s3_bfd_score_elf_finish_dynamic_sections, but we
+         must add the entries now so that we get the correct size for
+         the .dynamic section.  The DT_DEBUG entry is filled in by the
+         dynamic linker and used by the debugger.  */
+
+      if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_DEBUG, 0))
+        return FALSE;
+
+      if (reltext)
+        info->flags |= DF_TEXTREL;
+
+      if ((info->flags & DF_TEXTREL) != 0)
+        {
+          if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_TEXTREL, 0))
+            return FALSE;
+        }
+
+      if (! SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_PLTGOT, 0))
+        return FALSE;
+
+      if (score_elf_rel_dyn_section (dynobj, FALSE))
+        {
+          if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_REL, 0))
+            return FALSE;
+
+          if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_RELSZ, 0))
+            return FALSE;
+
+          if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_RELENT, 0))
+            return FALSE;
+        }
+
+      if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_SCORE_BASE_ADDRESS, 0))
+        return FALSE;
+
+      if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_SCORE_LOCAL_GOTNO, 0))
+        return FALSE;
+
+      if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_SCORE_SYMTABNO, 0))
+        return FALSE;
+
+      if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_SCORE_UNREFEXTNO, 0))
+        return FALSE;
+
+      if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_SCORE_GOTSYM, 0))
+        return FALSE;
+
+      if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_SCORE_HIPAGENO, 0))
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+s3_bfd_score_elf_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  struct elf_link_hash_entry *h;
+  struct bfd_link_hash_entry *bh;
+  flagword flags;
+  asection *s;
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+           | SEC_LINKER_CREATED | SEC_READONLY);
+
+  /* ABI requests the .dynamic section to be read only.  */
+  s = bfd_get_section_by_name (abfd, ".dynamic");
+  if (s != NULL)
+    {
+      if (!bfd_set_section_flags (abfd, s, flags))
+        return FALSE;
+    }
+
+  /* We need to create .got section.  */
+  if (!score_elf_create_got_section (abfd, info, FALSE))
+    return FALSE;
+
+  if (!score_elf_rel_dyn_section (elf_hash_table (info)->dynobj, TRUE))
+    return FALSE;
+
+  /* Create .stub section.  */
+  if (bfd_get_section_by_name (abfd, SCORE_ELF_STUB_SECTION_NAME) == NULL)
+    {
+      s = bfd_make_section_with_flags (abfd, SCORE_ELF_STUB_SECTION_NAME,
+                                       flags | SEC_CODE);
+      if (s == NULL
+          || !bfd_set_section_alignment (abfd, s, 2))
+
+        return FALSE;
+    }
+
+  if (!info->shared)
+    {
+      const char *name;
+
+      name = "_DYNAMIC_LINK";
+      bh = NULL;
+      if (!(_bfd_generic_link_add_one_symbol
+            (info, abfd, name, BSF_GLOBAL, bfd_abs_section_ptr,
+             (bfd_vma) 0, NULL, FALSE, get_elf_backend_data (abfd)->collect, &bh)))
+        return FALSE;
+
+      h = (struct elf_link_hash_entry *)bh;
+      h->non_elf = 0;
+      h->def_regular = 1;
+      h->type = STT_SECTION;
+
+      if (!bfd_elf_link_record_dynamic_symbol (info, h))
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+static bfd_boolean
+s3_bfd_score_elf_finish_dynamic_symbol (bfd *output_bfd,
+                                        struct bfd_link_info *info,
+                                        struct elf_link_hash_entry *h,
+                                        Elf_Internal_Sym *sym)
+{
+  bfd *dynobj;
+  asection *sgot;
+  struct score_got_info *g;
+  const char *name;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  if (h->plt.offset != MINUS_ONE)
+    {
+      asection *s;
+      bfd_byte stub[SCORE_FUNCTION_STUB_SIZE];
+
+      /* This symbol has a stub.  Set it up.  */
+      BFD_ASSERT (h->dynindx != -1);
+
+      s = bfd_get_section_by_name (dynobj, SCORE_ELF_STUB_SECTION_NAME);
+      BFD_ASSERT (s != NULL);
+
+      /* FIXME: Can h->dynindex be more than 64K?  */
+      if (h->dynindx & 0xffff0000)
+        return FALSE;
+
+      /* Fill the stub.  */
+      score_bfd_put_32 (output_bfd, STUB_LW, stub);
+      score_bfd_put_32 (output_bfd, STUB_MOVE, stub + 4);
+      score_bfd_put_32 (output_bfd, STUB_LI16 | (h->dynindx << 1), stub + 8);
+      score_bfd_put_32 (output_bfd, STUB_BRL, stub + 12);
+
+      BFD_ASSERT (h->plt.offset <= s->size);
+      memcpy (s->contents + h->plt.offset, stub, SCORE_FUNCTION_STUB_SIZE);
+
+      /* Mark the symbol as undefined.  plt.offset != -1 occurs
+         only for the referenced symbol.  */
+      sym->st_shndx = SHN_UNDEF;
+
+      /* The run-time linker uses the st_value field of the symbol
+          to reset the global offset table entry for this external
+          to its stub address when unlinking a shared object.  */
+      sym->st_value = (s->output_section->vma + s->output_offset + h->plt.offset);
+    }
+
+  BFD_ASSERT (h->dynindx != -1 || h->forced_local);
+
+  sgot = score_elf_got_section (dynobj, FALSE);
+  BFD_ASSERT (sgot != NULL);
+  BFD_ASSERT (score_elf_section_data (sgot) != NULL);
+  g = score_elf_section_data (sgot)->u.got_info;
+  BFD_ASSERT (g != NULL);
+
+  /* Run through the global symbol table, creating GOT entries for all
+     the symbols that need them.  */
+  if (g->global_gotsym != NULL && h->dynindx >= g->global_gotsym->dynindx)
+    {
+      bfd_vma offset;
+      bfd_vma value;
+
+      value = sym->st_value;
+      offset = score_elf_global_got_index (dynobj, h);
+      score_bfd_put_32 (output_bfd, value, sgot->contents + offset);
+    }
+
+  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
+  name = h->root.root.string;
+  if (strcmp (name, "_DYNAMIC") == 0 || strcmp (name, "_GLOBAL_OFFSET_TABLE_") == 0)
+    sym->st_shndx = SHN_ABS;
+  else if (strcmp (name, "_DYNAMIC_LINK") == 0)
+    {
+      sym->st_shndx = SHN_ABS;
+      sym->st_info = ELF_ST_INFO (STB_GLOBAL, STT_SECTION);
+      sym->st_value = 1;
+    }
+  else if (strcmp (name, GP_DISP_LABEL) == 0)
+    {
+      sym->st_shndx = SHN_ABS;
+      sym->st_info = ELF_ST_INFO (STB_GLOBAL, STT_SECTION);
+      sym->st_value = elf_gp (output_bfd);
+    }
+
+  return TRUE;
+}
+
+/* Finish up the dynamic sections.  */
+static bfd_boolean
+s3_bfd_score_elf_finish_dynamic_sections (bfd *output_bfd,
+                                          struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *sdyn;
+  asection *sgot;
+  asection *s;
+  struct score_got_info *g;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  sgot = score_elf_got_section (dynobj, FALSE);
+  if (sgot == NULL)
+    g = NULL;
+  else
+    {
+      BFD_ASSERT (score_elf_section_data (sgot) != NULL);
+      g = score_elf_section_data (sgot)->u.got_info;
+      BFD_ASSERT (g != NULL);
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      bfd_byte *b;
+
+      BFD_ASSERT (sdyn != NULL);
+      BFD_ASSERT (g != NULL);
+
+      for (b = sdyn->contents;
+           b < sdyn->contents + sdyn->size;
+           b += SCORE_ELF_DYN_SIZE (dynobj))
+        {
+          Elf_Internal_Dyn dyn;
+          const char *name;
+          size_t elemsize;
+          bfd_boolean swap_out_p;
+
+          /* Read in the current dynamic entry.  */
+          (*get_elf_backend_data (dynobj)->s->swap_dyn_in) (dynobj, b, &dyn);
+
+          /* Assume that we're going to modify it and write it out.  */
+          swap_out_p = TRUE;
+
+          switch (dyn.d_tag)
+            {
+            case DT_RELENT:
+              s = score_elf_rel_dyn_section (dynobj, FALSE);
+              BFD_ASSERT (s != NULL);
+              dyn.d_un.d_val = SCORE_ELF_REL_SIZE (dynobj);
+              break;
+
+            case DT_STRSZ:
+              /* Rewrite DT_STRSZ.  */
+              dyn.d_un.d_val = _bfd_elf_strtab_size (elf_hash_table (info)->dynstr);
+                    break;
+
+            case DT_PLTGOT:
+              name = ".got";
+              s = bfd_get_section_by_name (output_bfd, name);
+              BFD_ASSERT (s != NULL);
+              dyn.d_un.d_ptr = s->vma;
+              break;
+
+            case DT_SCORE_BASE_ADDRESS:
+              s = output_bfd->sections;
+              BFD_ASSERT (s != NULL);
+              dyn.d_un.d_ptr = s->vma & ~(bfd_vma) 0xffff;
+              break;
+
+            case DT_SCORE_LOCAL_GOTNO:
+              dyn.d_un.d_val = g->local_gotno;
+              break;
+
+            case DT_SCORE_UNREFEXTNO:
+              /* The index into the dynamic symbol table which is the
+                 entry of the first external symbol that is not
+                 referenced within the same object.  */
+              dyn.d_un.d_val = bfd_count_sections (output_bfd) + 1;
+              break;
+
+            case DT_SCORE_GOTSYM:
+              if (g->global_gotsym)
+                {
+                  dyn.d_un.d_val = g->global_gotsym->dynindx;
+                  break;
+                }
+              /* In case if we don't have global got symbols we default
+                  to setting DT_SCORE_GOTSYM to the same value as
+                  DT_SCORE_SYMTABNO, so we just fall through.  */
+
+            case DT_SCORE_SYMTABNO:
+              name = ".dynsym";
+              elemsize = SCORE_ELF_SYM_SIZE (output_bfd);
+              s = bfd_get_section_by_name (output_bfd, name);
+              BFD_ASSERT (s != NULL);
+
+              dyn.d_un.d_val = s->size / elemsize;
+              break;
+
+            case DT_SCORE_HIPAGENO:
+              dyn.d_un.d_val = g->local_gotno - SCORE_RESERVED_GOTNO;
+              break;
+
+            default:
+              swap_out_p = FALSE;
+              break;
+            }
+
+          if (swap_out_p)
+            (*get_elf_backend_data (dynobj)->s->swap_dyn_out) (dynobj, &dyn, b);
+        }
+    }
+
+  /* The first entry of the global offset table will be filled at
+     runtime. The second entry will be used by some runtime loaders.
+     This isn't the case of IRIX rld.  */
+  if (sgot != NULL && sgot->size > 0)
+    {
+      score_bfd_put_32 (output_bfd, 0, sgot->contents);
+      score_bfd_put_32 (output_bfd, 0x80000000, sgot->contents + SCORE_ELF_GOT_SIZE (output_bfd));
+    }
+
+  if (sgot != NULL)
+    elf_section_data (sgot->output_section)->this_hdr.sh_entsize
+      = SCORE_ELF_GOT_SIZE (output_bfd);
+
+
+  /* We need to sort the entries of the dynamic relocation section.  */
+  s = score_elf_rel_dyn_section (dynobj, FALSE);
+
+  if (s != NULL && s->size > (bfd_vma)2 * SCORE_ELF_REL_SIZE (output_bfd))
+    {
+      reldyn_sorting_bfd = output_bfd;
+      qsort ((Elf32_External_Rel *) s->contents + 1, s->reloc_count - 1,
+             sizeof (Elf32_External_Rel), score_elf_sort_dynamic_relocs);
+    }
+
+  return TRUE;
+}
+
+/* This function set up the ELF section header for a BFD section in preparation for writing
+   it out.  This is where the flags and type fields are set for unusual sections.  */
+static bfd_boolean
+s3_bfd_score_elf_fake_sections (bfd *abfd ATTRIBUTE_UNUSED,
+                                Elf_Internal_Shdr *hdr,
+                                asection *sec)
+{
+  const char *name;
+
+  name = bfd_get_section_name (abfd, sec);
+
+  if (strcmp (name, ".got") == 0
+      || strcmp (name, ".srdata") == 0
+      || strcmp (name, ".sdata") == 0
+      || strcmp (name, ".sbss") == 0)
+    hdr->sh_flags |= SHF_SCORE_GPREL;
+
+  return TRUE;
+}
+
+/* This function do additional processing on the ELF section header before writing
+   it out.  This is used to set the flags and type fields for some sections.  */
+
+/* assign_file_positions_except_relocs() check section flag and if it is allocatable,
+   warning message will be issued.  backend_fake_section is called before
+   assign_file_positions_except_relocs(); backend_section_processing after it.  so, we
+   modify section flag there, but not backend_fake_section.  */
+static bfd_boolean
+s3_bfd_score_elf_section_processing (bfd *abfd ATTRIBUTE_UNUSED, Elf_Internal_Shdr *hdr)
+{
+  if (hdr->bfd_section != NULL)
+    {
+      const char *name = bfd_get_section_name (abfd, hdr->bfd_section);
+
+      if (strcmp (name, ".sdata") == 0)
+        {
+          hdr->sh_flags |= SHF_ALLOC | SHF_WRITE | SHF_SCORE_GPREL;
+          hdr->sh_type = SHT_PROGBITS;
+        }
+      else if (strcmp (name, ".sbss") == 0)
+        {
+          hdr->sh_flags |= SHF_ALLOC | SHF_WRITE | SHF_SCORE_GPREL;
+          hdr->sh_type = SHT_NOBITS;
+        }
+      else if (strcmp (name, ".srdata") == 0)
+        {
+          hdr->sh_flags |= SHF_ALLOC | SHF_SCORE_GPREL;
+          hdr->sh_type = SHT_PROGBITS;
+        }
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+s3_bfd_score_elf_write_section (bfd *output_bfd, asection *sec, bfd_byte *contents)
+{
+  bfd_byte *to, *from, *end;
+  int i;
+
+  if (strcmp (sec->name, ".pdr") != 0)
+    return FALSE;
+
+  if (score_elf_section_data (sec)->u.tdata == NULL)
+    return FALSE;
+
+  to = contents;
+  end = contents + sec->size;
+  for (from = contents, i = 0; from < end; from += PDR_SIZE, i++)
+    {
+      if ((score_elf_section_data (sec)->u.tdata)[i] == 1)
+        continue;
+
+      if (to != from)
+        memcpy (to, from, PDR_SIZE);
+
+      to += PDR_SIZE;
+    }
+  bfd_set_section_contents (output_bfd, sec->output_section, contents,
+                            (file_ptr) sec->output_offset, sec->size);
+
+  return TRUE;
+}
+
+/* Copy data from a SCORE ELF indirect symbol to its direct symbol, hiding the old
+   indirect symbol.  Process additional relocation information.  */
+static void
+s3_bfd_score_elf_copy_indirect_symbol (struct bfd_link_info *info,
+                                       struct elf_link_hash_entry *dir,
+                                       struct elf_link_hash_entry *ind)
+{
+  struct score_elf_link_hash_entry *dirscore, *indscore;
+
+  _bfd_elf_link_hash_copy_indirect (info, dir, ind);
+
+  if (ind->root.type != bfd_link_hash_indirect)
+    return;
+
+  dirscore = (struct score_elf_link_hash_entry *) dir;
+  indscore = (struct score_elf_link_hash_entry *) ind;
+  dirscore->possibly_dynamic_relocs += indscore->possibly_dynamic_relocs;
+
+  if (indscore->readonly_reloc)
+    dirscore->readonly_reloc = TRUE;
+
+  if (indscore->no_fn_stub)
+    dirscore->no_fn_stub = TRUE;
+}
+
+/* Remove information about discarded functions from other sections which mention them.  */
+static bfd_boolean
+s3_bfd_score_elf_discard_info (bfd *abfd, struct elf_reloc_cookie *cookie,
+                               struct bfd_link_info *info)
+{
+  asection *o;
+  bfd_boolean ret = FALSE;
+  unsigned char *tdata;
+  size_t i, skip;
+
+  o = bfd_get_section_by_name (abfd, ".pdr");
+  if ((!o) || (o->size == 0) || (o->size % PDR_SIZE != 0)
+      || (o->output_section != NULL && bfd_is_abs_section (o->output_section)))
+    return FALSE;
+
+  tdata = bfd_zmalloc (o->size / PDR_SIZE);
+  if (!tdata)
+    return FALSE;
+
+  cookie->rels = _bfd_elf_link_read_relocs (abfd, o, NULL, NULL, info->keep_memory);
+  if (!cookie->rels)
+    {
+      free (tdata);
+      return FALSE;
+    }
+
+  cookie->rel = cookie->rels;
+  cookie->relend = cookie->rels + o->reloc_count;
+
+  for (i = 0, skip = 0; i < o->size; i++)
+    {
+      if (bfd_elf_reloc_symbol_deleted_p (i * PDR_SIZE, cookie))
+        {
+          tdata[i] = 1;
+          skip++;
+        }
+    }
+
+  if (skip != 0)
+    {
+      score_elf_section_data (o)->u.tdata = tdata;
+      o->size -= skip * PDR_SIZE;
+      ret = TRUE;
+    }
+  else
+    free (tdata);
+
+  if (!info->keep_memory)
+    free (cookie->rels);
+
+  return ret;
+}
+
+/* Signal that discard_info() has removed the discarded relocations for this section.  */
+static bfd_boolean
+s3_bfd_score_elf_ignore_discarded_relocs (asection *sec)
+{
+  if (strcmp (sec->name, ".pdr") == 0)
+    return TRUE;
+  return FALSE;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+static asection *
+s3_bfd_score_elf_gc_mark_hook (asection *sec,
+                               struct bfd_link_info *info,
+                               Elf_Internal_Rela *rel,
+                               struct elf_link_hash_entry *h,
+                               Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_SCORE_GNU_VTINHERIT:
+      case R_SCORE_GNU_VTENTRY:
+        return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Support for core dump NOTE sections.  */
+
+static bfd_boolean
+s3_bfd_score_elf_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  int offset;
+  unsigned int raw_size;
+
+  switch (note->descsz)
+    {
+    default:
+      return FALSE;
+
+    case 148:                  /* Linux/Score 32-bit.  */
+      /* pr_cursig */
+      elf_tdata (abfd)->core_signal = score_bfd_get_16 (abfd, note->descdata + 12);
+
+      /* pr_pid */
+      elf_tdata (abfd)->core_lwpid = score_bfd_get_32 (abfd, note->descdata + 24);
+
+      /* pr_reg */
+      offset = 72;
+      raw_size = 72;
+
+      break;
+    }
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg", raw_size, note->descpos + offset);
+}
+
+static bfd_boolean
+s3_bfd_score_elf_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  switch (note->descsz)
+    {
+    default:
+      return FALSE;
+
+    case 124:                  /* Linux/Score elf_prpsinfo.  */
+      elf_tdata (abfd)->core_program = _bfd_elfcore_strndup (abfd, note->descdata + 28, 16);
+      elf_tdata (abfd)->core_command = _bfd_elfcore_strndup (abfd, note->descdata + 44, 80);
+    }
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+
+  {
+    char *command = elf_tdata (abfd)->core_command;
+    int n = strlen (command);
+
+    if (0 < n && command[n - 1] == ' ')
+      command[n - 1] = '\0';
+  }
+
+  return TRUE;
+}
+
+
+/* Score BFD functions.  */
+static reloc_howto_type *
+s3_elf32_score_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0; i < ARRAY_SIZE (elf32_score_reloc_map); i++)
+    if (elf32_score_reloc_map[i].bfd_reloc_val == code)
+      return &elf32_score_howto_table[elf32_score_reloc_map[i].elf_reloc_val];
+
+  return NULL;
+}
+
+static reloc_howto_type *
+elf32_score_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                               const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (elf32_score_howto_table)
+            / sizeof (elf32_score_howto_table[0]));
+       i++)
+    if (elf32_score_howto_table[i].name != NULL
+        && strcasecmp (elf32_score_howto_table[i].name, r_name) == 0)
+      return &elf32_score_howto_table[i];
+
+  return NULL;
+}
+
+static bfd_boolean
+s3_elf32_score_print_private_bfd_data (bfd *abfd, void * ptr)
+{
+  FILE *file = (FILE *) ptr;
+
+  BFD_ASSERT (abfd != NULL && ptr != NULL);
+
+  /* Print normal ELF private data.  */
+  _bfd_elf_print_private_bfd_data (abfd, ptr);
+
+  /* xgettext:c-format */
+  fprintf (file, _("private flags = %lx:"), elf_elfheader (abfd)->e_flags);
+  if (elf_elfheader (abfd)->e_flags & EF_SCORE_PIC)
+    {
+      fprintf (file, _(" [pic]"));
+    }
+  if (elf_elfheader (abfd)->e_flags & EF_SCORE_FIXDEP)
+    {
+      fprintf (file, _(" [fix dep]"));
+    }
+  fputc ('\n', file);
+
+  return TRUE;
+}
+
+static bfd_boolean
+s3_elf32_score_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  flagword in_flags;
+  flagword out_flags;
+
+  if (!_bfd_generic_verify_endian_match (ibfd, obfd))
+    return FALSE;
+
+  in_flags  = elf_elfheader (ibfd)->e_flags;
+  out_flags = elf_elfheader (obfd)->e_flags;
+
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  in_flags = elf_elfheader (ibfd)->e_flags;
+  out_flags = elf_elfheader (obfd)->e_flags;
+
+  if (! elf_flags_init (obfd))
+    {
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = in_flags;
+
+      if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
+          && bfd_get_arch_info (obfd)->the_default)
+        {
+          return bfd_set_arch_mach (obfd, bfd_get_arch (ibfd), bfd_get_mach (ibfd));
+        }
+
+      return TRUE;
+    }
+
+  if (((in_flags & EF_SCORE_PIC) != 0) != ((out_flags & EF_SCORE_PIC) != 0))
+    {
+      (*_bfd_error_handler) (_("%B: warning: linking PIC files with non-PIC files"), ibfd);
+    }
+
+  /* FIXME: Maybe dependency fix compatibility should be checked here.  */
+
+  return TRUE;
+}
+
+static bfd_boolean
+s3_elf32_score_new_section_hook (bfd *abfd, asection *sec)
+{
+  struct _score_elf_section_data *sdata;
+  bfd_size_type amt = sizeof (*sdata);
+
+  sdata = bfd_zalloc (abfd, amt);
+  if (sdata == NULL)
+    return FALSE;
+  sec->used_by_bfd = sdata;
+
+  return _bfd_elf_new_section_hook (abfd, sec);
+}
+
+/*****************************************************************************/
+
+/* s3_s7: backend hooks.  */
+static void
+_bfd_score_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+                          arelent *bfd_reloc,
+                          Elf_Internal_Rela *elf_reloc)
+{
+  if (bfd_get_mach (abfd) == bfd_mach_score3)
+    return s3_bfd_score_info_to_howto (abfd, bfd_reloc, elf_reloc);
+  else
+    return s7_bfd_score_info_to_howto (abfd, bfd_reloc, elf_reloc);
+}
+
+static bfd_boolean
+_bfd_score_elf_relocate_section (bfd *output_bfd,
+                                 struct bfd_link_info *info,
+                                 bfd *input_bfd,
+                                 asection *input_section,
+                                 bfd_byte *contents,
+                                 Elf_Internal_Rela *relocs,
+                                 Elf_Internal_Sym *local_syms,
+                                 asection **local_sections)
+{
+  if (bfd_get_mach (output_bfd) == bfd_mach_score3)
+    return s3_bfd_score_elf_relocate_section (output_bfd,
+             info, input_bfd, input_section, contents, relocs,
+             local_syms, local_sections);
+  else
+    return s7_bfd_score_elf_relocate_section (output_bfd,
+             info, input_bfd, input_section, contents, relocs,
+             local_syms, local_sections);
+}
+
+static bfd_boolean
+_bfd_score_elf_check_relocs (bfd *abfd,
+                             struct bfd_link_info *info,
+                             asection *sec,
+                             const Elf_Internal_Rela *relocs)
+{
+  if (bfd_get_mach (abfd) == bfd_mach_score3)
+    return s3_bfd_score_elf_check_relocs (abfd, info, sec, relocs);
+  else
+    return s7_bfd_score_elf_check_relocs (abfd, info, sec, relocs);
+}
+
+static bfd_boolean
+_bfd_score_elf_add_symbol_hook (bfd *abfd,
+                                struct bfd_link_info *info ATTRIBUTE_UNUSED,
+                                Elf_Internal_Sym *sym,
+                                const char **namep ATTRIBUTE_UNUSED,
+                                flagword *flagsp ATTRIBUTE_UNUSED,
+                                asection **secp,
+                                bfd_vma *valp)
+{
+  if (bfd_get_mach (abfd) == bfd_mach_score3)
+    return s3_bfd_score_elf_add_symbol_hook (abfd, info, sym, namep, flagsp,
+                                             secp, valp);
+  else
+    return s7_bfd_score_elf_add_symbol_hook (abfd, info, sym, namep, flagsp,
+                                             secp, valp);
+}
+
+static void
+_bfd_score_elf_symbol_processing (bfd *abfd, asymbol *asym)
+{
+  if (bfd_get_mach (abfd) == bfd_mach_score3)
+    return s3_bfd_score_elf_symbol_processing (abfd, asym);
+  else
+    return s7_bfd_score_elf_symbol_processing (abfd, asym);
+}
+
+static int
+_bfd_score_elf_link_output_symbol_hook (struct bfd_link_info *info ATTRIBUTE_UNUSED,
+     const char *name ATTRIBUTE_UNUSED,
+     Elf_Internal_Sym *sym,
+     asection *input_sec,
+     struct elf_link_hash_entry *h ATTRIBUTE_UNUSED)
+{
+  /* If link a empty .o, then this filed is NULL.  */
+  if (info->input_bfds == NULL)
+    {
+      /* If we see a common symbol, which implies a relocatable link, then
+         if a symbol was small common in an input file, mark it as small
+         common in the output file.  */
+      if (sym->st_shndx == SHN_COMMON && strcmp (input_sec->name, ".scommon") == 0)
+        sym->st_shndx = SHN_SCORE_SCOMMON;
+      return 1;
+    }
+
+  if (bfd_get_mach (info->input_bfds) == bfd_mach_score3)
+    return s3_bfd_score_elf_link_output_symbol_hook (info, name, sym, input_sec, h);
+  else
+    return s7_bfd_score_elf_link_output_symbol_hook (info, name, sym, input_sec, h);
+}
+
+static bfd_boolean
+_bfd_score_elf_section_from_bfd_section (bfd *abfd ATTRIBUTE_UNUSED,
+                                         asection *sec,
+                                         int *retval)
+{
+  if (bfd_get_mach (abfd) == bfd_mach_score3)
+    return s3_bfd_score_elf_section_from_bfd_section (abfd, sec, retval);
+  else
+    return s7_bfd_score_elf_section_from_bfd_section (abfd, sec, retval);
+}
+
+static bfd_boolean
+_bfd_score_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+                                      struct elf_link_hash_entry *h)
+{
+  if (bfd_get_mach (info->input_bfds) == bfd_mach_score3)
+    return s3_bfd_score_elf_adjust_dynamic_symbol (info, h);
+  else
+    return s7_bfd_score_elf_adjust_dynamic_symbol (info, h);
+}
+
+static bfd_boolean
+_bfd_score_elf_always_size_sections (bfd *output_bfd,
+                                     struct bfd_link_info *info)
+{
+  if (bfd_get_mach (output_bfd) == bfd_mach_score3)
+    return s3_bfd_score_elf_always_size_sections (output_bfd, info);
+  else
+    return s7_bfd_score_elf_always_size_sections (output_bfd, info);
+}
+
+static bfd_boolean
+_bfd_score_elf_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
+{
+  if (bfd_get_mach (output_bfd) == bfd_mach_score3)
+    return s3_bfd_score_elf_size_dynamic_sections (output_bfd, info);
+  else
+    return s7_bfd_score_elf_size_dynamic_sections (output_bfd, info);
+}
+
+static bfd_boolean
+_bfd_score_elf_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  if (bfd_get_mach (abfd) == bfd_mach_score3)
+    return s3_bfd_score_elf_create_dynamic_sections (abfd, info);
+  else
+    return s7_bfd_score_elf_create_dynamic_sections (abfd, info);
+}
+
+static bfd_boolean
+_bfd_score_elf_finish_dynamic_symbol (bfd *output_bfd,
+                                      struct bfd_link_info *info,
+                                      struct elf_link_hash_entry *h,
+                                      Elf_Internal_Sym *sym)
+{
+  if (bfd_get_mach (output_bfd) == bfd_mach_score3)
+    return s3_bfd_score_elf_finish_dynamic_symbol (output_bfd, info, h, sym);
+  else
+    return s7_bfd_score_elf_finish_dynamic_symbol (output_bfd, info, h, sym);
+}
+
+static bfd_boolean
+_bfd_score_elf_finish_dynamic_sections (bfd *output_bfd,
+                                        struct bfd_link_info *info)
+{
+  if (bfd_get_mach (output_bfd) == bfd_mach_score3)
+    return s3_bfd_score_elf_finish_dynamic_sections (output_bfd, info);
+  else
+    return s7_bfd_score_elf_finish_dynamic_sections (output_bfd, info);
+}
+
+static bfd_boolean
+_bfd_score_elf_fake_sections (bfd *abfd ATTRIBUTE_UNUSED,
+                              Elf_Internal_Shdr *hdr,
+                              asection *sec)
+{
+  if (bfd_get_mach (abfd) == bfd_mach_score3)
+    return s3_bfd_score_elf_fake_sections (abfd, hdr, sec);
+  else
+    return s7_bfd_score_elf_fake_sections (abfd, hdr, sec);
+}
+
+static bfd_boolean
+_bfd_score_elf_section_processing (bfd *abfd ATTRIBUTE_UNUSED, Elf_Internal_Shdr *hdr)
+{
+  if (bfd_get_mach (abfd) == bfd_mach_score3)
+    return s3_bfd_score_elf_section_processing (abfd, hdr);
+  else
+    return s7_bfd_score_elf_section_processing (abfd, hdr);
+}
+
+static bfd_boolean
+_bfd_score_elf_write_section (bfd *output_bfd,
+                              struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
+                              asection *sec, bfd_byte *contents)
+{
+  if (bfd_get_mach (output_bfd) == bfd_mach_score3)
+    return s3_bfd_score_elf_write_section (output_bfd, sec, contents);
+  else
+    return s7_bfd_score_elf_write_section (output_bfd, sec, contents);
+}
+
+static void
+_bfd_score_elf_copy_indirect_symbol (struct bfd_link_info *info,
+                                     struct elf_link_hash_entry *dir,
+                                     struct elf_link_hash_entry *ind)
+{
+  if (bfd_get_mach (info->input_bfds) == bfd_mach_score3)
+    return s3_bfd_score_elf_copy_indirect_symbol (info, dir, ind);
+  else
+    return s7_bfd_score_elf_copy_indirect_symbol (info, dir, ind);
+}
+
+static void
+_bfd_score_elf_hide_symbol (struct bfd_link_info *info,
+                            struct elf_link_hash_entry *entry,
+                            bfd_boolean force_local)
+{
+  if (bfd_get_mach (info->input_bfds) == bfd_mach_score3)
+    return s3_bfd_score_elf_hide_symbol (info, entry, force_local);
+  else
+    return s7_bfd_score_elf_hide_symbol (info, entry, force_local);
+}
+
+static bfd_boolean
+_bfd_score_elf_discard_info (bfd *abfd, struct elf_reloc_cookie *cookie,
+                         struct bfd_link_info *info)
+{
+  if (bfd_get_mach (abfd) == bfd_mach_score3)
+    return s3_bfd_score_elf_discard_info (abfd, cookie, info);
+  else
+    return s7_bfd_score_elf_discard_info (abfd, cookie, info);
+}
+
+static bfd_boolean
+_bfd_score_elf_ignore_discarded_relocs (asection *sec)
+{
+  if (bfd_get_mach (sec->owner) == bfd_mach_score3)
+    return s3_bfd_score_elf_ignore_discarded_relocs (sec);
+  else
+    return s7_bfd_score_elf_ignore_discarded_relocs (sec);
+}
+
+static asection *
+_bfd_score_elf_gc_mark_hook (asection *sec,
+                             struct bfd_link_info *info,
+                             Elf_Internal_Rela *rel,
+                             struct elf_link_hash_entry *h,
+                             Elf_Internal_Sym *sym)
+{
+  if (bfd_get_mach (info->input_bfds) == bfd_mach_score3)
+    return s3_bfd_score_elf_gc_mark_hook (sec, info, rel, h, sym);
+  else
+    return s7_bfd_score_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+static bfd_boolean
+_bfd_score_elf_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  if (bfd_get_mach (abfd) == bfd_mach_score3)
+    return s3_bfd_score_elf_grok_prstatus (abfd, note);
+  else
+    return s7_bfd_score_elf_grok_prstatus (abfd, note);
+}
+
+static bfd_boolean
+_bfd_score_elf_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  if (bfd_get_mach (abfd) == bfd_mach_score3)
+    return s3_bfd_score_elf_grok_psinfo (abfd, note);
+  else
+    return s7_bfd_score_elf_grok_psinfo (abfd, note);
+}
+
+static reloc_howto_type *
+elf32_score_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, bfd_reloc_code_real_type code)
+{
+  /* s3: NOTE!!!
+     gas will call elf32_score_reloc_type_lookup, and don't write elf file.
+     So just using score3, but we don't know ld will call this or not.
+     If so, this way can't work.  */
+
+  if (score3)
+    return s3_elf32_score_reloc_type_lookup (abfd, code);
+  else
+    return s7_elf32_score_reloc_type_lookup (abfd, code);
+}
+
+/* Create a score elf linker hash table.
+   This is a copy of _bfd_elf_link_hash_table_create() except with a
+   different hash table entry creation function.  */
+
+static struct bfd_link_hash_table *
+elf32_score_link_hash_table_create (bfd *abfd)
+{
+  struct elf_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct elf_link_hash_table);
+
+  ret = (struct elf_link_hash_table *) bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (ret, abfd, score_elf_link_hash_newfunc,
+                                      sizeof (struct score_elf_link_hash_entry),
+				      GENERIC_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  return &ret->root;
+}
+
+static bfd_boolean
+elf32_score_print_private_bfd_data (bfd *abfd, void * ptr)
+{
+  if (bfd_get_mach (abfd) == bfd_mach_score3)
+    return s3_elf32_score_print_private_bfd_data (abfd, ptr);
+  else
+    return s7_elf32_score_print_private_bfd_data (abfd, ptr);
+}
+
+static bfd_boolean
+elf32_score_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  if (bfd_get_mach (obfd) == bfd_mach_score3)
+    return s3_elf32_score_merge_private_bfd_data (ibfd, obfd);
+  else
+    return s7_elf32_score_merge_private_bfd_data (ibfd, obfd);
+}
+
+static bfd_boolean
+elf32_score_new_section_hook (bfd *abfd, asection *sec)
+{
+  if (bfd_get_mach (abfd) == bfd_mach_score3)
+    return s3_elf32_score_new_section_hook (abfd, sec);
+  else
+    return s7_elf32_score_new_section_hook (abfd, sec);
+}
+
+
+/* s3_s7: don't need to split.  */
+
+/* Set the right machine number.  */
+static bfd_boolean
+_bfd_score_elf_score_object_p (bfd * abfd)
+{
+  int e_set = bfd_mach_score7;
+
+  if (elf_elfheader (abfd)->e_machine == EM_SCORE)
+    {
+      int e_mach = elf_elfheader (abfd)->e_flags & EF_SCORE_MACH & EF_OMIT_PIC_FIXDD;
+      switch (e_mach)
+        {
+        /* Set default target is score7.  */
+        default:
+        case E_SCORE_MACH_SCORE7:
+          e_set = bfd_mach_score7;
+          break;
+
+        case E_SCORE_MACH_SCORE3:
+          e_set = bfd_mach_score3;
+          break;
+        }
+    }
+
+  return bfd_default_set_arch_mach (abfd, bfd_arch_score, e_set);
+}
+
+bfd_boolean
+_bfd_score_elf_common_definition (Elf_Internal_Sym *sym)
+{
+  return (sym->st_shndx == SHN_COMMON || sym->st_shndx == SHN_SCORE_SCOMMON);
+}
+
+/*****************************************************************************/
+
+
+#define USE_REL                         1
+#define TARGET_LITTLE_SYM               bfd_elf32_littlescore_vec
+#define TARGET_LITTLE_NAME              "elf32-littlescore"
+#define TARGET_BIG_SYM                  bfd_elf32_bigscore_vec
+#define TARGET_BIG_NAME                 "elf32-bigscore"
+#define ELF_ARCH                        bfd_arch_score
+#define ELF_MACHINE_CODE                EM_SCORE
+#define ELF_MACHINE_ALT1                EM_SCORE_OLD
+#define ELF_MAXPAGESIZE                 0x8000
+
+#define elf_info_to_howto               0
+#define elf_info_to_howto_rel           _bfd_score_info_to_howto
+#define elf_backend_relocate_section    _bfd_score_elf_relocate_section
+#define elf_backend_check_relocs        _bfd_score_elf_check_relocs
+#define elf_backend_add_symbol_hook     _bfd_score_elf_add_symbol_hook
+#define elf_backend_symbol_processing   _bfd_score_elf_symbol_processing
+#define elf_backend_link_output_symbol_hook \
+  _bfd_score_elf_link_output_symbol_hook
+#define elf_backend_section_from_bfd_section \
+  _bfd_score_elf_section_from_bfd_section
+#define elf_backend_adjust_dynamic_symbol \
+  _bfd_score_elf_adjust_dynamic_symbol
+#define elf_backend_always_size_sections \
+  _bfd_score_elf_always_size_sections
+#define elf_backend_size_dynamic_sections \
+  _bfd_score_elf_size_dynamic_sections
+#define elf_backend_omit_section_dynsym \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true)
+#define elf_backend_create_dynamic_sections \
+  _bfd_score_elf_create_dynamic_sections
+#define elf_backend_finish_dynamic_symbol \
+  _bfd_score_elf_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections \
+  _bfd_score_elf_finish_dynamic_sections
+#define elf_backend_fake_sections         _bfd_score_elf_fake_sections
+#define elf_backend_section_processing    _bfd_score_elf_section_processing
+#define elf_backend_write_section         _bfd_score_elf_write_section
+#define elf_backend_copy_indirect_symbol  _bfd_score_elf_copy_indirect_symbol
+#define elf_backend_hide_symbol           _bfd_score_elf_hide_symbol
+#define elf_backend_discard_info          _bfd_score_elf_discard_info
+#define elf_backend_ignore_discarded_relocs \
+  _bfd_score_elf_ignore_discarded_relocs
+#define elf_backend_gc_mark_hook          _bfd_score_elf_gc_mark_hook
+#define elf_backend_grok_prstatus         _bfd_score_elf_grok_prstatus
+#define elf_backend_grok_psinfo           _bfd_score_elf_grok_psinfo
+#define elf_backend_can_gc_sections       1
+#define elf_backend_want_plt_sym          0
+#define elf_backend_got_header_size       (4 * SCORE_RESERVED_GOTNO)
+#define elf_backend_plt_header_size       0
+#define elf_backend_collect               TRUE
+#define elf_backend_type_change_ok        TRUE
+#define elf_backend_object_p                  _bfd_score_elf_score_object_p
+
+#define bfd_elf32_bfd_reloc_type_lookup      elf32_score_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup \
+  elf32_score_reloc_name_lookup
+#define bfd_elf32_bfd_link_hash_table_create elf32_score_link_hash_table_create
+#define bfd_elf32_bfd_print_private_bfd_data elf32_score_print_private_bfd_data
+#define bfd_elf32_bfd_merge_private_bfd_data elf32_score_merge_private_bfd_data
+#define bfd_elf32_new_section_hook           elf32_score_new_section_hook
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-score.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-score.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-score.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-score.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,152 @@
+/* 32-bit ELF support for S+core.
+   Copyright 2009 Free Software Foundation, Inc.
+   Contributed by
+   Brain.lin (brain.lin@sunplusct.com)
+   Mei Ligang (ligang@sunnorth.com.cn)
+   Pei-Lin Tsai (pltsai@sunplus.com)
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "elf/common.h"
+#include "elf/internal.h"
+
+extern void
+s7_bfd_score_elf_hide_symbol (struct bfd_link_info *,
+                              struct elf_link_hash_entry *,
+                              bfd_boolean);
+
+extern void 
+s7_bfd_score_info_to_howto (bfd *, arelent *, Elf_Internal_Rela *);
+
+extern bfd_boolean 
+s7_bfd_score_elf_relocate_section (bfd *,
+                                   struct bfd_link_info *,
+                                   bfd *,
+                                   asection *,
+                                   bfd_byte *,
+                                   Elf_Internal_Rela *,
+                                   Elf_Internal_Sym *,
+                                   asection **);
+
+extern bfd_boolean
+s7_bfd_score_elf_check_relocs (bfd *,
+                               struct bfd_link_info *,
+                               asection *,
+                               const Elf_Internal_Rela *);
+
+extern bfd_boolean
+s7_bfd_score_elf_add_symbol_hook (bfd *,
+                                  struct bfd_link_info *,
+                                  Elf_Internal_Sym *,
+                                  const char **,
+                                  flagword *,
+                                  asection **,
+                                  bfd_vma *);
+
+extern void
+s7_bfd_score_elf_symbol_processing (bfd *, asymbol *);
+
+extern int
+s7_bfd_score_elf_link_output_symbol_hook (struct bfd_link_info *,
+                                          const char *,
+                                          Elf_Internal_Sym *,
+                                          asection *,
+                                          struct elf_link_hash_entry *);
+
+extern bfd_boolean
+s7_bfd_score_elf_section_from_bfd_section (bfd *,
+                                           asection *,
+                                           int *);
+
+extern bfd_boolean
+s7_bfd_score_elf_adjust_dynamic_symbol (struct bfd_link_info *,
+                                        struct elf_link_hash_entry *);
+
+extern bfd_boolean
+s7_bfd_score_elf_always_size_sections (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean
+s7_bfd_score_elf_size_dynamic_sections (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean
+s7_bfd_score_elf_create_dynamic_sections (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean
+s7_bfd_score_elf_finish_dynamic_symbol (bfd *,
+                                        struct bfd_link_info *,
+                                        struct elf_link_hash_entry *,
+                                        Elf_Internal_Sym *);
+
+extern bfd_boolean
+s7_bfd_score_elf_finish_dynamic_sections (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean
+s7_bfd_score_elf_fake_sections (bfd *,
+                                Elf_Internal_Shdr *,
+                                asection *);
+
+extern bfd_boolean
+s7_bfd_score_elf_section_processing (bfd *, Elf_Internal_Shdr *);
+
+extern bfd_boolean
+s7_bfd_score_elf_write_section (bfd *, asection *, bfd_byte *);
+
+extern void
+s7_bfd_score_elf_copy_indirect_symbol (struct bfd_link_info *,
+                                       struct elf_link_hash_entry *,
+                                       struct elf_link_hash_entry *);
+
+extern bfd_boolean
+s7_bfd_score_elf_discard_info (bfd *, struct elf_reloc_cookie *,
+                               struct bfd_link_info *);
+
+extern bfd_boolean
+s7_bfd_score_elf_ignore_discarded_relocs (asection *);
+
+extern asection *
+s7_bfd_score_elf_gc_mark_hook (asection *,
+                               struct bfd_link_info *,
+                               Elf_Internal_Rela *,
+                               struct elf_link_hash_entry *,
+                               Elf_Internal_Sym *);
+
+extern bfd_boolean
+s7_bfd_score_elf_grok_prstatus (bfd *, Elf_Internal_Note *);
+
+extern bfd_boolean
+s7_bfd_score_elf_grok_psinfo (bfd *, Elf_Internal_Note *);
+
+extern reloc_howto_type *
+s7_elf32_score_reloc_type_lookup (bfd *, bfd_reloc_code_real_type);
+
+extern struct bfd_link_hash_table *
+s7_elf32_score_link_hash_table_create (bfd *);
+
+extern bfd_boolean
+s7_elf32_score_print_private_bfd_data (bfd *, void *);
+
+extern bfd_boolean
+s7_elf32_score_merge_private_bfd_data (bfd *, bfd *);
+
+extern bfd_boolean
+s7_elf32_score_new_section_hook (bfd *, asection *);
+
+extern bfd_boolean
+_bfd_score_elf_common_definition (Elf_Internal_Sym *);
+
+#define elf_backend_common_definition   _bfd_score_elf_common_definition
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-score7.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-score7.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-score7.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-score7.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3871 @@
+/* 32-bit ELF support for S+core.
+   Copyright 2009, 2010, 2011 Free Software Foundation, Inc.
+   Contributed by
+   Brain.lin (brain.lin@sunplusct.com)
+   Mei Ligang (ligang@sunnorth.com.cn)
+   Pei-Lin Tsai (pltsai@sunplus.com)
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "bfd.h"
+#include "sysdep.h"
+#include "libbfd.h"
+#include "libiberty.h"
+#include "elf-bfd.h"
+#include "elf/score.h"
+#include "elf/common.h"
+#include "elf/internal.h"
+#include "hashtab.h"
+#include "elf32-score.h"
+
+
+/* The SCORE ELF linker needs additional information for each symbol in
+   the global hash table.  */
+struct score_elf_link_hash_entry
+{
+  struct elf_link_hash_entry root;
+
+  /* Number of R_SCORE_ABS32, R_SCORE_REL32 relocs against this symbol.  */
+  unsigned int possibly_dynamic_relocs;
+
+  /* If the R_SCORE_ABS32, R_SCORE_REL32 reloc is against a readonly section.  */
+  bfd_boolean readonly_reloc;
+
+  /* We must not create a stub for a symbol that has relocations related to
+     taking the function's address, i.e. any but R_SCORE_CALL15 ones.  */
+  bfd_boolean no_fn_stub;
+
+  /* Are we forced local?  This will only be set if we have converted
+     the initial global GOT entry to a local GOT entry.  */
+  bfd_boolean forced_local;
+};
+
+/* Traverse a score ELF linker hash table.  */
+#define score_elf_link_hash_traverse(table, func, info) \
+  (elf_link_hash_traverse \
+   ((table),						     \
+    (bfd_boolean (*) (struct elf_link_hash_entry *, void *)) (func), \
+    (info)))
+
+/* This structure is used to hold .got entries while estimating got sizes.  */
+struct score_got_entry
+{
+  /* The input bfd in which the symbol is defined.  */
+  bfd *abfd;
+  /* The index of the symbol, as stored in the relocation r_info, if
+     we have a local symbol; -1 otherwise.  */
+  long symndx;
+  union
+  {
+    /* If abfd == NULL, an address that must be stored in the got.  */
+    bfd_vma address;
+    /* If abfd != NULL && symndx != -1, the addend of the relocation
+       that should be added to the symbol value.  */
+    bfd_vma addend;
+    /* If abfd != NULL && symndx == -1, the hash table entry
+       corresponding to a global symbol in the got (or, local, if
+       h->forced_local).  */
+    struct score_elf_link_hash_entry *h;
+  } d;
+
+  /* The offset from the beginning of the .got section to the entry
+     corresponding to this symbol+addend.  If it's a global symbol
+     whose offset is yet to be decided, it's going to be -1.  */
+  long gotidx;
+};
+
+/* This structure is passed to score_elf_sort_hash_table_f when sorting
+   the dynamic symbols.  */
+struct score_elf_hash_sort_data
+{
+  /* The symbol in the global GOT with the lowest dynamic symbol table index.  */
+  struct elf_link_hash_entry *low;
+  /* The least dynamic symbol table index corresponding to a symbol with a GOT entry.  */
+  long min_got_dynindx;
+  /* The greatest dynamic symbol table index corresponding to a symbol
+     with a GOT entry that is not referenced (e.g., a dynamic symbol
+     with dynamic relocations pointing to it from non-primary GOTs).  */
+  long max_unref_got_dynindx;
+  /* The greatest dynamic symbol table index not corresponding to a
+     symbol without a GOT entry.  */
+  long max_non_got_dynindx;
+};
+
+struct score_got_info
+{
+  /* The global symbol in the GOT with the lowest index in the dynamic
+     symbol table.  */
+  struct elf_link_hash_entry *global_gotsym;
+  /* The number of global .got entries.  */
+  unsigned int global_gotno;
+  /* The number of local .got entries.  */
+  unsigned int local_gotno;
+  /* The number of local .got entries we have used.  */
+  unsigned int assigned_gotno;
+  /* A hash table holding members of the got.  */
+  struct htab *got_entries;
+  /* In multi-got links, a pointer to the next got (err, rather, most
+     of the time, it points to the previous got).  */
+  struct score_got_info *next;
+};
+
+/* A structure used to count GOT entries, for GOT entry or ELF symbol table traversal.  */
+struct _score_elf_section_data
+{
+  struct bfd_elf_section_data elf;
+  union
+  {
+    struct score_got_info *got_info;
+    bfd_byte *tdata;
+  }
+  u;
+};
+
+#define score_elf_section_data(sec) \
+  ((struct _score_elf_section_data *) elf_section_data (sec))
+
+/* The size of a symbol-table entry.  */
+#define SCORE_ELF_SYM_SIZE(abfd)  \
+  (get_elf_backend_data (abfd)->s->sizeof_sym)
+
+/* In case we're on a 32-bit machine, construct a 64-bit "-1" value
+   from smaller values.  Start with zero, widen, *then* decrement.  */
+#define MINUS_ONE (((bfd_vma)0) - 1)
+#define MINUS_TWO (((bfd_vma)0) - 2)
+
+#define PDR_SIZE 32
+
+
+/* The number of local .got entries we reserve.  */
+#define SCORE_RESERVED_GOTNO 		(2)
+#define ELF_DYNAMIC_INTERPRETER		"/usr/lib/ld.so.1"
+
+/* The offset of $gp from the beginning of the .got section.  */
+#define ELF_SCORE_GP_OFFSET(abfd) (0x3ff0)
+
+/* The maximum size of the GOT for it to be addressable using 15-bit offsets from $gp.  */
+#define SCORE_ELF_GOT_MAX_SIZE(abfd) (ELF_SCORE_GP_OFFSET(abfd) + 0x3fff)
+
+#define SCORE_ELF_STUB_SECTION_NAME  (".SCORE.stub")
+#define SCORE_FUNCTION_STUB_SIZE (16)
+
+#define STUB_LW      0xc3bcc010     /* lw r29, [r28, -0x3ff0]  */
+#define STUB_MOVE    0x8323bc56     /* mv r25, r3  */
+#define STUB_LI16    0x87548000     /* ori r26, .dynsym_index  */
+#define STUB_BRL     0x801dbc09     /* brl r29  */
+
+#define SCORE_ELF_GOT_SIZE(abfd)   \
+  (get_elf_backend_data (abfd)->s->arch_size / 8)
+
+#define SCORE_ELF_ADD_DYNAMIC_ENTRY(info, tag, val) \
+  (_bfd_elf_add_dynamic_entry (info, (bfd_vma) tag, (bfd_vma) val))
+
+/* The size of an external dynamic table entry.  */
+#define SCORE_ELF_DYN_SIZE(abfd) \
+  (get_elf_backend_data (abfd)->s->sizeof_dyn)
+
+/* The size of an external REL relocation.  */
+#define SCORE_ELF_REL_SIZE(abfd) \
+  (get_elf_backend_data (abfd)->s->sizeof_rel)
+
+/* The default alignment for sections, as a power of two.  */
+#define SCORE_ELF_LOG_FILE_ALIGN(abfd)\
+  (get_elf_backend_data (abfd)->s->log_file_align)
+
+static bfd_byte *hi16_rel_addr;
+
+/* This will be used when we sort the dynamic relocation records.  */
+static bfd *reldyn_sorting_bfd;
+
+/* SCORE ELF uses two common sections.  One is the usual one, and the
+   other is for small objects.  All the small objects are kept
+   together, and then referenced via the gp pointer, which yields
+   faster assembler code.  This is what we use for the small common
+   section.  This approach is copied from ecoff.c.  */
+static asection  score_elf_scom_section;
+static asymbol   score_elf_scom_symbol;
+static asymbol * score_elf_scom_symbol_ptr;
+
+static bfd_reloc_status_type
+score_elf_hi16_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+                      arelent *reloc_entry,
+                      asymbol *symbol ATTRIBUTE_UNUSED,
+                      void * data,
+                      asection *input_section ATTRIBUTE_UNUSED,
+                      bfd *output_bfd ATTRIBUTE_UNUSED,
+                      char **error_message ATTRIBUTE_UNUSED)
+{
+  hi16_rel_addr = (bfd_byte *) data + reloc_entry->address;
+  return bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type
+score_elf_lo16_reloc (bfd *abfd,
+                      arelent *reloc_entry,
+                      asymbol *symbol ATTRIBUTE_UNUSED,
+                      void * data,
+                      asection *input_section,
+                      bfd *output_bfd ATTRIBUTE_UNUSED,
+                      char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma addend = 0, offset = 0;
+  unsigned long val;
+  unsigned long hi16_offset, hi16_value, uvalue;
+
+  hi16_value = bfd_get_32 (abfd, hi16_rel_addr);
+  hi16_offset = ((((hi16_value >> 16) & 0x3) << 15) | (hi16_value & 0x7fff)) >> 1;
+  addend = bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
+  offset = ((((addend >> 16) & 0x3) << 15) | (addend & 0x7fff)) >> 1;
+  val = reloc_entry->addend;
+  if (reloc_entry->address > input_section->size)
+    return bfd_reloc_outofrange;
+  uvalue = ((hi16_offset << 16) | (offset & 0xffff)) + val;
+  hi16_offset = (uvalue >> 16) << 1;
+  hi16_value = (hi16_value & ~0x37fff) | (hi16_offset & 0x7fff) | ((hi16_offset << 1) & 0x30000);
+  bfd_put_32 (abfd, hi16_value, hi16_rel_addr);
+  offset = (uvalue & 0xffff) << 1;
+  addend = (addend & ~0x37fff) | (offset & 0x7fff) | ((offset << 1) & 0x30000);
+  bfd_put_32 (abfd, addend, (bfd_byte *) data + reloc_entry->address);
+  return bfd_reloc_ok;
+}
+
+/* Set the GP value for OUTPUT_BFD.  Returns FALSE if this is a
+   dangerous relocation.  */
+
+static bfd_boolean
+score_elf_assign_gp (bfd *output_bfd, bfd_vma *pgp)
+{
+  unsigned int count;
+  asymbol **sym;
+  unsigned int i;
+
+  /* If we've already figured out what GP will be, just return it.  */
+  *pgp = _bfd_get_gp_value (output_bfd);
+  if (*pgp)
+    return TRUE;
+
+  count = bfd_get_symcount (output_bfd);
+  sym = bfd_get_outsymbols (output_bfd);
+
+  /* The linker script will have created a symbol named `_gp' with the
+     appropriate value.  */
+  if (sym == NULL)
+    i = count;
+  else
+    {
+      for (i = 0; i < count; i++, sym++)
+        {
+          const char *name;
+
+          name = bfd_asymbol_name (*sym);
+          if (*name == '_' && strcmp (name, "_gp") == 0)
+            {
+              *pgp = bfd_asymbol_value (*sym);
+              _bfd_set_gp_value (output_bfd, *pgp);
+              break;
+            }
+        }
+    }
+
+  if (i >= count)
+    {
+      /* Only get the error once.  */
+      *pgp = 4;
+      _bfd_set_gp_value (output_bfd, *pgp);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* We have to figure out the gp value, so that we can adjust the
+   symbol value correctly.  We look up the symbol _gp in the output
+   BFD.  If we can't find it, we're stuck.  We cache it in the ELF
+   target data.  We don't need to adjust the symbol value for an
+   external symbol if we are producing relocatable output.  */
+
+static bfd_reloc_status_type
+score_elf_final_gp (bfd *output_bfd,
+                    asymbol *symbol,
+                    bfd_boolean relocatable,
+                    char **error_message,
+                    bfd_vma *pgp)
+{
+  if (bfd_is_und_section (symbol->section)
+      && ! relocatable)
+    {
+      *pgp = 0;
+      return bfd_reloc_undefined;
+    }
+
+  *pgp = _bfd_get_gp_value (output_bfd);
+  if (*pgp == 0
+      && (! relocatable
+          || (symbol->flags & BSF_SECTION_SYM) != 0))
+    {
+      if (relocatable)
+        {
+          /* Make up a value.  */
+          *pgp = symbol->section->output_section->vma + 0x4000;
+          _bfd_set_gp_value (output_bfd, *pgp);
+        }
+      else if (!score_elf_assign_gp (output_bfd, pgp))
+        {
+            *error_message =
+              (char *) _("GP relative relocation when _gp not defined");
+            return bfd_reloc_dangerous;
+        }
+    }
+
+  return bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type
+score_elf_gprel15_with_gp (bfd *abfd,
+                           asymbol *symbol,
+                           arelent *reloc_entry,
+                           asection *input_section,
+                           bfd_boolean relocateable,
+                           void * data,
+                           bfd_vma gp ATTRIBUTE_UNUSED)
+{
+  bfd_vma relocation;
+  unsigned long insn;
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  if (reloc_entry->address > input_section->size)
+    return bfd_reloc_outofrange;
+
+  insn = bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
+  if (((reloc_entry->addend & 0xffffc000) != 0)
+      && ((reloc_entry->addend & 0xffffc000) != 0xffffc000))
+    return bfd_reloc_overflow;
+
+  insn = (insn & ~0x7fff) | (reloc_entry->addend & 0x7fff);
+  bfd_put_32 (abfd, insn, (bfd_byte *) data + reloc_entry->address);
+  if (relocateable)
+    reloc_entry->address += input_section->output_offset;
+
+  return bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type
+gprel32_with_gp (bfd *abfd, asymbol *symbol, arelent *reloc_entry,
+                 asection *input_section, bfd_boolean relocatable,
+                 void *data, bfd_vma gp)
+{
+  bfd_vma relocation;
+  bfd_vma val;
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  /* Set val to the offset into the section or symbol.  */
+  val = reloc_entry->addend;
+
+  if (reloc_entry->howto->partial_inplace)
+    val += bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
+
+  /* Adjust val for the final section location and GP value.  If we
+     are producing relocatable output, we don't want to do this for
+     an external symbol.  */
+  if (! relocatable
+      || (symbol->flags & BSF_SECTION_SYM) != 0)
+    val += relocation - gp;
+
+  if (reloc_entry->howto->partial_inplace)
+    bfd_put_32 (abfd, val, (bfd_byte *) data + reloc_entry->address);
+  else
+    reloc_entry->addend = val;
+
+  if (relocatable)
+    reloc_entry->address += input_section->output_offset;
+
+  return bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type
+score_elf_gprel15_reloc (bfd *abfd,
+                         arelent *reloc_entry,
+                         asymbol *symbol,
+                         void * data,
+                         asection *input_section,
+                         bfd *output_bfd,
+                         char **error_message)
+{
+  bfd_boolean relocateable;
+  bfd_reloc_status_type ret;
+  bfd_vma gp;
+
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0 && reloc_entry->addend == 0)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+  if (output_bfd != NULL)
+    relocateable = TRUE;
+  else
+    {
+      relocateable = FALSE;
+      output_bfd = symbol->section->output_section->owner;
+    }
+
+  ret = score_elf_final_gp (output_bfd, symbol, relocateable, error_message, &gp);
+  if (ret != bfd_reloc_ok)
+    return ret;
+
+  return score_elf_gprel15_with_gp (abfd, symbol, reloc_entry,
+                                         input_section, relocateable, data, gp);
+}
+
+/* Do a R_SCORE_GPREL32 relocation.  This is a 32 bit value which must
+   become the offset from the gp register.  */
+
+static bfd_reloc_status_type
+score_elf_gprel32_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+                         void *data, asection *input_section, bfd *output_bfd,
+                         char **error_message)
+{
+  bfd_boolean relocatable;
+  bfd_reloc_status_type ret;
+  bfd_vma gp;
+
+  /* R_SCORE_GPREL32 relocations are defined for local symbols only.  */
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (symbol->flags & BSF_LOCAL) != 0)
+    {
+      *error_message = (char *)
+        _("32bits gp relative relocation occurs for an external symbol");
+      return bfd_reloc_outofrange;
+    }
+
+  if (output_bfd != NULL)
+    relocatable = TRUE;
+  else
+    {
+      relocatable = FALSE;
+      output_bfd = symbol->section->output_section->owner;
+    }
+
+  ret = score_elf_final_gp (output_bfd, symbol, relocatable, error_message, &gp);
+  if (ret != bfd_reloc_ok)
+    return ret;
+
+  gp = 0;
+  return gprel32_with_gp (abfd, symbol, reloc_entry, input_section,
+                          relocatable, data, gp);
+}
+
+/* A howto special_function for R_SCORE_GOT15 relocations.  This is just
+   like any other 16-bit relocation when applied to global symbols, but is
+   treated in the same as R_SCORE_HI16 when applied to local symbols.  */
+
+static bfd_reloc_status_type
+score_elf_got15_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+                       void *data, asection *input_section,
+                       bfd *output_bfd, char **error_message)
+{
+  if ((symbol->flags & (BSF_GLOBAL | BSF_WEAK)) != 0
+      || bfd_is_und_section (bfd_get_section (symbol))
+      || bfd_is_com_section (bfd_get_section (symbol)))
+    /* The relocation is against a global symbol.  */
+    return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+                                  input_section, output_bfd,
+                                  error_message);
+
+  return score_elf_hi16_reloc (abfd, reloc_entry, symbol, data,
+                               input_section, output_bfd, error_message);
+}
+
+static bfd_reloc_status_type
+score_elf_got_lo16_reloc (bfd *abfd,
+                          arelent *reloc_entry,
+                          asymbol *symbol ATTRIBUTE_UNUSED,
+                          void * data,
+                          asection *input_section,
+                          bfd *output_bfd ATTRIBUTE_UNUSED,
+                          char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma addend = 0, offset = 0;
+  signed long val;
+  signed long hi16_offset, hi16_value, uvalue;
+
+  hi16_value = bfd_get_32 (abfd, hi16_rel_addr);
+  hi16_offset = ((((hi16_value >> 16) & 0x3) << 15) | (hi16_value & 0x7fff)) >> 1;
+  addend = bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
+  offset = ((((addend >> 16) & 0x3) << 15) | (addend & 0x7fff)) >> 1;
+  val = reloc_entry->addend;
+  if (reloc_entry->address > input_section->size)
+    return bfd_reloc_outofrange;
+  uvalue = ((hi16_offset << 16) | (offset & 0xffff)) + val;
+  if ((uvalue > -0x8000) && (uvalue < 0x7fff))
+    hi16_offset = 0;
+  else
+    hi16_offset = (uvalue >> 16) & 0x7fff;
+  hi16_value = (hi16_value & ~0x37fff) | (hi16_offset & 0x7fff) | ((hi16_offset << 1) & 0x30000);
+  bfd_put_32 (abfd, hi16_value, hi16_rel_addr);
+  offset = (uvalue & 0xffff) << 1;
+  addend = (addend & ~0x37fff) | (offset & 0x7fff) | ((offset << 1) & 0x30000);
+  bfd_put_32 (abfd, addend, (bfd_byte *) data + reloc_entry->address);
+  return bfd_reloc_ok;
+}
+
+static reloc_howto_type elf32_score_howto_table[] =
+{
+  /* No relocation.  */
+  HOWTO (R_SCORE_NONE,          /* type */
+         0,                     /* rightshift */
+         0,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE_NONE",        /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* R_SCORE_HI16 */
+  HOWTO (R_SCORE_HI16,          /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         1,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         score_elf_hi16_reloc,  /* special_function */
+         "R_SCORE_HI16",        /* name */
+         TRUE,                  /* partial_inplace */
+         0x37fff,               /* src_mask */
+         0x37fff,               /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* R_SCORE_LO16 */
+  HOWTO (R_SCORE_LO16,          /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         1,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         score_elf_lo16_reloc,  /* special_function */
+         "R_SCORE_LO16",        /* name */
+         TRUE,                  /* partial_inplace */
+         0x37fff,               /* src_mask */
+         0x37fff,               /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /*  R_SCORE_BCMP */
+  HOWTO (R_SCORE_BCMP,        /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         1,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE_BCMP",      /* name */
+         TRUE,                  /* partial_inplace */
+         0x0000ffff,            /* src_mask */
+         0x0000ffff,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  HOWTO (R_SCORE_24,            /* type */
+         1,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         24,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         1,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE_24",          /* name */
+         FALSE,                 /* partial_inplace */
+         0x3ff7fff,             /* src_mask */
+         0x3ff7fff,             /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /*R_SCORE_PC19 */
+  HOWTO (R_SCORE_PC19,          /* type */
+         1,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         19,                    /* bitsize */
+         TRUE,                  /* pc_relative */
+         1,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE_PC19",        /* name */
+         FALSE,                 /* partial_inplace */
+         0x3ff03fe,             /* src_mask */
+         0x3ff03fe,             /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /*R_SCORE16_11 */
+  HOWTO (R_SCORE16_11,          /* type */
+         1,                     /* rightshift */
+         1,                     /* size (0 = byte, 1 = short, 2 = long) */
+         11,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         1,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE16_11",        /* name */
+         FALSE,                 /* partial_inplace */
+         0x000000ffe,           /* src_mask */
+         0x000000ffe,           /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* R_SCORE16_PC8 */
+  HOWTO (R_SCORE16_PC8,         /* type */
+         1,                     /* rightshift */
+         1,                     /* size (0 = byte, 1 = short, 2 = long) */
+         8,                     /* bitsize */
+         TRUE,                  /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE16_PC8",       /* name */
+         FALSE,                 /* partial_inplace */
+         0x000000ff,            /* src_mask */
+         0x000000ff,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* 32 bit absolute */
+  HOWTO (R_SCORE_ABS32,         /* type  8 */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,    /* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE_ABS32",       /* name */
+         FALSE,                 /* partial_inplace */
+         0xffffffff,            /* src_mask */
+         0xffffffff,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* 16 bit absolute */
+  HOWTO (R_SCORE_ABS16,         /* type 11 */
+         0,                     /* rightshift */
+         1,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield,    /* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE_ABS16",       /* name */
+         FALSE,                 /* partial_inplace */
+         0x0000ffff,            /* src_mask */
+         0x0000ffff,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* R_SCORE_DUMMY2 */
+  HOWTO (R_SCORE_DUMMY2,        /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE_DUMMY2",      /* name */
+         TRUE,                  /* partial_inplace */
+         0x00007fff,            /* src_mask */
+         0x00007fff,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* R_SCORE_GP15 */
+  HOWTO (R_SCORE_GP15,          /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         score_elf_gprel15_reloc,/* special_function */
+         "R_SCORE_GP15",        /* name */
+         TRUE,                  /* partial_inplace */
+         0x00007fff,            /* src_mask */
+         0x00007fff,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_SCORE_GNU_VTINHERIT, /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         NULL,                  /* special_function */
+         "R_SCORE_GNU_VTINHERIT",       /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage */
+  HOWTO (R_SCORE_GNU_VTENTRY,   /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
+         "R_SCORE_GNU_VTENTRY", /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* Reference to global offset table.  */
+  HOWTO (R_SCORE_GOT15,         /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_signed,      /* complain_on_overflow */
+         score_elf_got15_reloc, /* special_function */
+         "R_SCORE_GOT15",       /* name */
+         TRUE,                  /* partial_inplace */
+         0x00007fff,            /* src_mask */
+         0x00007fff,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_SCORE_GOT_LO16,      /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         1,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         score_elf_got_lo16_reloc, /* special_function */
+         "R_SCORE_GOT_LO16",    /* name */
+         TRUE,                  /* partial_inplace */
+         0x37ffe,               /* src_mask */
+         0x37ffe,               /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* 15 bit call through global offset table.  */
+  HOWTO (R_SCORE_CALL15,        /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_signed, /* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE_CALL15",      /* name */
+         TRUE,                  /* partial_inplace */
+         0x00007fff,            /* src_mask */
+         0x00007fff,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* 32 bit GP relative reference.  */
+  HOWTO (R_SCORE_GPREL32,       /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         score_elf_gprel32_reloc, /* special_function */
+         "R_SCORE_GPREL32",     /* name */
+         TRUE,                  /* partial_inplace */
+         0xffffffff,            /* src_mask */
+         0xffffffff,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* 32 bit symbol relative relocation.  */
+  HOWTO (R_SCORE_REL32,         /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         32,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         bfd_elf_generic_reloc, /* special_function */
+         "R_SCORE_REL32",       /* name */
+         TRUE,                  /* partial_inplace */
+         0xffffffff,            /* src_mask */
+         0xffffffff,            /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* R_SCORE_DUMMY_HI16 */
+  HOWTO (R_SCORE_DUMMY_HI16,    /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         16,                    /* bitsize */
+         FALSE,                 /* pc_relative */
+         1,                     /* bitpos */
+         complain_overflow_dont,/* complain_on_overflow */
+         score_elf_hi16_reloc,  /* special_function */
+         "R_SCORE_DUMMY_HI16",  /* name */
+         TRUE,                  /* partial_inplace */
+         0x37fff,               /* src_mask */
+         0x37fff,               /* dst_mask */
+         FALSE),                /* pcrel_offset */
+};
+
+struct score_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned char elf_reloc_val;
+};
+
+static const struct score_reloc_map elf32_score_reloc_map[] =
+{
+  {BFD_RELOC_NONE,               R_SCORE_NONE},
+  {BFD_RELOC_HI16_S,             R_SCORE_HI16},
+  {BFD_RELOC_LO16,               R_SCORE_LO16},
+  {BFD_RELOC_SCORE_BCMP,         R_SCORE_BCMP},
+  {BFD_RELOC_SCORE_JMP,          R_SCORE_24},
+  {BFD_RELOC_SCORE_BRANCH,       R_SCORE_PC19},
+  {BFD_RELOC_SCORE16_JMP,        R_SCORE16_11},
+  {BFD_RELOC_SCORE16_BRANCH,     R_SCORE16_PC8},
+  {BFD_RELOC_32,                 R_SCORE_ABS32},
+  {BFD_RELOC_16,                 R_SCORE_ABS16},
+  {BFD_RELOC_SCORE_DUMMY2,       R_SCORE_DUMMY2},
+  {BFD_RELOC_SCORE_GPREL15,      R_SCORE_GP15},
+  {BFD_RELOC_VTABLE_INHERIT,     R_SCORE_GNU_VTINHERIT},
+  {BFD_RELOC_VTABLE_ENTRY,       R_SCORE_GNU_VTENTRY},
+  {BFD_RELOC_SCORE_GOT15,        R_SCORE_GOT15},
+  {BFD_RELOC_SCORE_GOT_LO16,     R_SCORE_GOT_LO16},
+  {BFD_RELOC_SCORE_CALL15,       R_SCORE_CALL15},
+  {BFD_RELOC_GPREL32,            R_SCORE_GPREL32},
+  {BFD_RELOC_32_PCREL,           R_SCORE_REL32},
+  {BFD_RELOC_SCORE_DUMMY_HI16,   R_SCORE_DUMMY_HI16},
+};
+
+static INLINE hashval_t
+score_elf_hash_bfd_vma (bfd_vma addr)
+{
+#ifdef BFD64
+  return addr + (addr >> 32);
+#else
+  return addr;
+#endif
+}
+
+/* got_entries only match if they're identical, except for gotidx, so
+   use all fields to compute the hash, and compare the appropriate
+   union members.  */
+
+static hashval_t
+score_elf_got_entry_hash (const void *entry_)
+{
+  const struct score_got_entry *entry = (struct score_got_entry *) entry_;
+
+  return entry->symndx
+    + (! entry->abfd ? score_elf_hash_bfd_vma (entry->d.address)
+       : entry->abfd->id
+         + (entry->symndx >= 0 ? score_elf_hash_bfd_vma (entry->d.addend)
+            : entry->d.h->root.root.root.hash));
+}
+
+static int
+score_elf_got_entry_eq (const void *entry1, const void *entry2)
+{
+  const struct score_got_entry *e1 = (struct score_got_entry *) entry1;
+  const struct score_got_entry *e2 = (struct score_got_entry *) entry2;
+
+  return e1->abfd == e2->abfd && e1->symndx == e2->symndx
+    && (! e1->abfd ? e1->d.address == e2->d.address
+        : e1->symndx >= 0 ? e1->d.addend == e2->d.addend
+        : e1->d.h == e2->d.h);
+}
+
+/* If H needs a GOT entry, assign it the highest available dynamic
+   index.  Otherwise, assign it the lowest available dynamic
+   index.  */
+
+static bfd_boolean
+score_elf_sort_hash_table_f (struct score_elf_link_hash_entry *h, void *data)
+{
+  struct score_elf_hash_sort_data *hsd = data;
+
+  /* Symbols without dynamic symbol table entries aren't interesting at all.  */
+  if (h->root.dynindx == -1)
+    return TRUE;
+
+  /* Global symbols that need GOT entries that are not explicitly
+     referenced are marked with got offset 2.  Those that are
+     referenced get a 1, and those that don't need GOT entries get
+     -1.  */
+  if (h->root.got.offset == 2)
+    {
+      if (hsd->max_unref_got_dynindx == hsd->min_got_dynindx)
+        hsd->low = (struct elf_link_hash_entry *) h;
+      h->root.dynindx = hsd->max_unref_got_dynindx++;
+    }
+  else if (h->root.got.offset != 1)
+    h->root.dynindx = hsd->max_non_got_dynindx++;
+  else
+    {
+      h->root.dynindx = --hsd->min_got_dynindx;
+      hsd->low = (struct elf_link_hash_entry *) h;
+    }
+
+  return TRUE;
+}
+
+static asection *
+score_elf_got_section (bfd *abfd, bfd_boolean maybe_excluded)
+{
+  asection *sgot = bfd_get_section_by_name (abfd, ".got");
+
+  if (sgot == NULL || (! maybe_excluded && (sgot->flags & SEC_EXCLUDE) != 0))
+    return NULL;
+  return sgot;
+}
+
+/* Returns the GOT information associated with the link indicated by
+   INFO.  If SGOTP is non-NULL, it is filled in with the GOT section.  */
+
+static struct score_got_info *
+score_elf_got_info (bfd *abfd, asection **sgotp)
+{
+  asection *sgot;
+  struct score_got_info *g;
+
+  sgot = score_elf_got_section (abfd, TRUE);
+  BFD_ASSERT (sgot != NULL);
+  BFD_ASSERT (elf_section_data (sgot) != NULL);
+  g = score_elf_section_data (sgot)->u.got_info;
+  BFD_ASSERT (g != NULL);
+
+  if (sgotp)
+    *sgotp = sgot;
+  return g;
+}
+
+/* Sort the dynamic symbol table so that symbols that need GOT entries
+   appear towards the end.  This reduces the amount of GOT space
+   required.  MAX_LOCAL is used to set the number of local symbols
+   known to be in the dynamic symbol table.  During
+   s7_bfd_score_elf_size_dynamic_sections, this value is 1.  Afterward, the
+   section symbols are added and the count is higher.  */
+
+static bfd_boolean
+score_elf_sort_hash_table (struct bfd_link_info *info,
+                           unsigned long max_local)
+{
+  struct score_elf_hash_sort_data hsd;
+  struct score_got_info *g;
+  bfd *dynobj;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  g = score_elf_got_info (dynobj, NULL);
+
+  hsd.low = NULL;
+  hsd.max_unref_got_dynindx =
+    hsd.min_got_dynindx = elf_hash_table (info)->dynsymcount
+    /* In the multi-got case, assigned_gotno of the master got_info
+       indicate the number of entries that aren't referenced in the
+       primary GOT, but that must have entries because there are
+       dynamic relocations that reference it.  Since they aren't
+       referenced, we move them to the end of the GOT, so that they
+       don't prevent other entries that are referenced from getting
+       too large offsets.  */
+    - (g->next ? g->assigned_gotno : 0);
+  hsd.max_non_got_dynindx = max_local;
+  score_elf_link_hash_traverse (elf_hash_table (info),
+				score_elf_sort_hash_table_f,
+				&hsd);
+
+  /* There should have been enough room in the symbol table to
+     accommodate both the GOT and non-GOT symbols.  */
+  BFD_ASSERT (hsd.max_non_got_dynindx <= hsd.min_got_dynindx);
+  BFD_ASSERT ((unsigned long) hsd.max_unref_got_dynindx
+              <= elf_hash_table (info)->dynsymcount);
+
+  /* Now we know which dynamic symbol has the lowest dynamic symbol
+     table index in the GOT.  */
+  g->global_gotsym = hsd.low;
+
+  return TRUE;
+}
+
+/* Returns the first relocation of type r_type found, beginning with
+   RELOCATION.  RELEND is one-past-the-end of the relocation table.  */
+
+static const Elf_Internal_Rela *
+score_elf_next_relocation (bfd *abfd ATTRIBUTE_UNUSED, unsigned int r_type,
+                           const Elf_Internal_Rela *relocation,
+                           const Elf_Internal_Rela *relend)
+{
+  while (relocation < relend)
+    {
+      if (ELF32_R_TYPE (relocation->r_info) == r_type)
+        return relocation;
+
+      ++relocation;
+    }
+
+  /* We didn't find it.  */
+  bfd_set_error (bfd_error_bad_value);
+  return NULL;
+}
+
+/* This function is called via qsort() to sort the dynamic relocation
+   entries by increasing r_symndx value.  */
+static int
+score_elf_sort_dynamic_relocs (const void *arg1, const void *arg2)
+{
+  Elf_Internal_Rela int_reloc1;
+  Elf_Internal_Rela int_reloc2;
+
+  bfd_elf32_swap_reloc_in (reldyn_sorting_bfd, arg1, &int_reloc1);
+  bfd_elf32_swap_reloc_in (reldyn_sorting_bfd, arg2, &int_reloc2);
+
+  return (ELF32_R_SYM (int_reloc1.r_info) - ELF32_R_SYM (int_reloc2.r_info));
+}
+
+/* Return whether a relocation is against a local symbol.  */
+static bfd_boolean
+score_elf_local_relocation_p (bfd *input_bfd,
+                              const Elf_Internal_Rela *relocation,
+                              asection **local_sections,
+                              bfd_boolean check_forced)
+{
+  unsigned long r_symndx;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct score_elf_link_hash_entry *h;
+  size_t extsymoff;
+
+  r_symndx = ELF32_R_SYM (relocation->r_info);
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  extsymoff = (elf_bad_symtab (input_bfd)) ? 0 : symtab_hdr->sh_info;
+
+  if (r_symndx < extsymoff)
+    return TRUE;
+  if (elf_bad_symtab (input_bfd) && local_sections[r_symndx] != NULL)
+    return TRUE;
+
+  if (check_forced)
+    {
+      /* Look up the hash table to check whether the symbol was forced local.  */
+      h = (struct score_elf_link_hash_entry *)
+        elf_sym_hashes (input_bfd) [r_symndx - extsymoff];
+      /* Find the real hash-table entry for this symbol.  */
+      while (h->root.root.type == bfd_link_hash_indirect
+             || h->root.root.type == bfd_link_hash_warning)
+        h = (struct score_elf_link_hash_entry *) h->root.root.u.i.link;
+      if (h->root.forced_local)
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+/* Returns the dynamic relocation section for DYNOBJ.  */
+
+static asection *
+score_elf_rel_dyn_section (bfd *dynobj, bfd_boolean create_p)
+{
+  static const char dname[] = ".rel.dyn";
+  asection *sreloc;
+
+  sreloc = bfd_get_section_by_name (dynobj, dname);
+  if (sreloc == NULL && create_p)
+    {
+      sreloc = bfd_make_section_with_flags (dynobj, dname,
+                                            (SEC_ALLOC
+                                             | SEC_LOAD
+                                             | SEC_HAS_CONTENTS
+                                             | SEC_IN_MEMORY
+                                             | SEC_LINKER_CREATED
+                                             | SEC_READONLY));
+      if (sreloc == NULL
+          || ! bfd_set_section_alignment (dynobj, sreloc,
+                                          SCORE_ELF_LOG_FILE_ALIGN (dynobj)))
+        return NULL;
+    }
+  return sreloc;
+}
+
+static void
+score_elf_allocate_dynamic_relocations (bfd *abfd, unsigned int n)
+{
+  asection *s;
+
+  s = score_elf_rel_dyn_section (abfd, FALSE);
+  BFD_ASSERT (s != NULL);
+
+  if (s->size == 0)
+    {
+      /* Make room for a null element.  */
+      s->size += SCORE_ELF_REL_SIZE (abfd);
+      ++s->reloc_count;
+    }
+  s->size += n * SCORE_ELF_REL_SIZE (abfd);
+}
+
+/* Create a rel.dyn relocation for the dynamic linker to resolve.  REL
+   is the original relocation, which is now being transformed into a
+   dynamic relocation.  The ADDENDP is adjusted if necessary; the
+   caller should store the result in place of the original addend.  */
+
+static bfd_boolean
+score_elf_create_dynamic_relocation (bfd *output_bfd,
+                                     struct bfd_link_info *info,
+                                     const Elf_Internal_Rela *rel,
+                                     struct score_elf_link_hash_entry *h,
+                                     bfd_vma symbol,
+                                     bfd_vma *addendp, asection *input_section)
+{
+  Elf_Internal_Rela outrel[3];
+  asection *sreloc;
+  bfd *dynobj;
+  int r_type;
+  long indx;
+  bfd_boolean defined_p;
+
+  r_type = ELF32_R_TYPE (rel->r_info);
+  dynobj = elf_hash_table (info)->dynobj;
+  sreloc = score_elf_rel_dyn_section (dynobj, FALSE);
+  BFD_ASSERT (sreloc != NULL);
+  BFD_ASSERT (sreloc->contents != NULL);
+  BFD_ASSERT (sreloc->reloc_count * SCORE_ELF_REL_SIZE (output_bfd) < sreloc->size);
+
+  outrel[0].r_offset =
+    _bfd_elf_section_offset (output_bfd, info, input_section, rel[0].r_offset);
+  outrel[1].r_offset =
+    _bfd_elf_section_offset (output_bfd, info, input_section, rel[1].r_offset);
+  outrel[2].r_offset =
+    _bfd_elf_section_offset (output_bfd, info, input_section, rel[2].r_offset);
+
+  if (outrel[0].r_offset == MINUS_ONE)
+    /* The relocation field has been deleted.  */
+    return TRUE;
+
+  if (outrel[0].r_offset == MINUS_TWO)
+    {
+      /* The relocation field has been converted into a relative value of
+         some sort.  Functions like _bfd_elf_write_section_eh_frame expect
+         the field to be fully relocated, so add in the symbol's value.  */
+      *addendp += symbol;
+      return TRUE;
+    }
+
+  /* We must now calculate the dynamic symbol table index to use
+     in the relocation.  */
+  if (h != NULL
+      && (! info->symbolic || !h->root.def_regular)
+      /* h->root.dynindx may be -1 if this symbol was marked to
+         become local.  */
+      && h->root.dynindx != -1)
+    {
+      indx = h->root.dynindx;
+        /* ??? glibc's ld.so just adds the final GOT entry to the
+           relocation field.  It therefore treats relocs against
+           defined symbols in the same way as relocs against
+           undefined symbols.  */
+      defined_p = FALSE;
+    }
+  else
+    {
+      indx = 0;
+      defined_p = TRUE;
+    }
+
+  /* If the relocation was previously an absolute relocation and
+     this symbol will not be referred to by the relocation, we must
+     adjust it by the value we give it in the dynamic symbol table.
+     Otherwise leave the job up to the dynamic linker.  */
+  if (defined_p && r_type != R_SCORE_REL32)
+    *addendp += symbol;
+
+  /* The relocation is always an REL32 relocation because we don't
+     know where the shared library will wind up at load-time.  */
+  outrel[0].r_info = ELF32_R_INFO ((unsigned long) indx, R_SCORE_REL32);
+
+  /* For strict adherence to the ABI specification, we should
+     generate a R_SCORE_64 relocation record by itself before the
+     _REL32/_64 record as well, such that the addend is read in as
+     a 64-bit value (REL32 is a 32-bit relocation, after all).
+     However, since none of the existing ELF64 SCORE dynamic
+     loaders seems to care, we don't waste space with these
+     artificial relocations.  If this turns out to not be true,
+     score_elf_allocate_dynamic_relocations() should be tweaked so
+     as to make room for a pair of dynamic relocations per
+     invocation if ABI_64_P, and here we should generate an
+     additional relocation record with R_SCORE_64 by itself for a
+     NULL symbol before this relocation record.  */
+  outrel[1].r_info = ELF32_R_INFO (0, R_SCORE_NONE);
+  outrel[2].r_info = ELF32_R_INFO (0, R_SCORE_NONE);
+
+  /* Adjust the output offset of the relocation to reference the
+     correct location in the output file.  */
+  outrel[0].r_offset += (input_section->output_section->vma
+                         + input_section->output_offset);
+  outrel[1].r_offset += (input_section->output_section->vma
+                         + input_section->output_offset);
+  outrel[2].r_offset += (input_section->output_section->vma
+                         + input_section->output_offset);
+
+  /* Put the relocation back out.  We have to use the special
+     relocation outputter in the 64-bit case since the 64-bit
+     relocation format is non-standard.  */
+  bfd_elf32_swap_reloc_out
+      (output_bfd, &outrel[0],
+       (sreloc->contents + sreloc->reloc_count * sizeof (Elf32_External_Rel)));
+
+  /* We've now added another relocation.  */
+  ++sreloc->reloc_count;
+
+  /* Make sure the output section is writable.  The dynamic linker
+     will be writing to it.  */
+  elf_section_data (input_section->output_section)->this_hdr.sh_flags |= SHF_WRITE;
+
+  return TRUE;
+}
+
+static bfd_boolean
+score_elf_create_got_section (bfd *abfd,
+                              struct bfd_link_info *info,
+                              bfd_boolean maybe_exclude)
+{
+  flagword flags;
+  asection *s;
+  struct elf_link_hash_entry *h;
+  struct bfd_link_hash_entry *bh;
+  struct score_got_info *g;
+  bfd_size_type amt;
+
+  /* This function may be called more than once.  */
+  s = score_elf_got_section (abfd, TRUE);
+  if (s)
+    {
+      if (! maybe_exclude)
+        s->flags &= ~SEC_EXCLUDE;
+      return TRUE;
+    }
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED);
+
+  if (maybe_exclude)
+    flags |= SEC_EXCLUDE;
+
+  /* We have to use an alignment of 2**4 here because this is hardcoded
+     in the function stub generation and in the linker script.  */
+  s = bfd_make_section_with_flags (abfd, ".got", flags);
+   if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, 4))
+    return FALSE;
+
+  /* Define the symbol _GLOBAL_OFFSET_TABLE_.  We don't do this in the
+     linker script because we don't want to define the symbol if we
+     are not creating a global offset table.  */
+  bh = NULL;
+  if (! (_bfd_generic_link_add_one_symbol
+         (info, abfd, "_GLOBAL_OFFSET_TABLE_", BSF_GLOBAL, s,
+          0, NULL, FALSE, get_elf_backend_data (abfd)->collect, &bh)))
+    return FALSE;
+
+  h = (struct elf_link_hash_entry *) bh;
+  h->non_elf = 0;
+  h->def_regular = 1;
+  h->type = STT_OBJECT;
+
+  if (info->shared && ! bfd_elf_link_record_dynamic_symbol (info, h))
+    return FALSE;
+
+  amt = sizeof (struct score_got_info);
+  g = bfd_alloc (abfd, amt);
+  if (g == NULL)
+    return FALSE;
+
+  g->global_gotsym = NULL;
+  g->global_gotno = 0;
+
+  g->local_gotno = SCORE_RESERVED_GOTNO;
+  g->assigned_gotno = SCORE_RESERVED_GOTNO;
+  g->next = NULL;
+
+  g->got_entries = htab_try_create (1, score_elf_got_entry_hash,
+                                    score_elf_got_entry_eq, NULL);
+  if (g->got_entries == NULL)
+    return FALSE;
+  score_elf_section_data (s)->u.got_info = g;
+  score_elf_section_data (s)->elf.this_hdr.sh_flags |= SHF_ALLOC | SHF_WRITE | SHF_SCORE_GPREL;
+
+  return TRUE;
+}
+
+/* Calculate the %high function.  */
+
+static bfd_vma
+score_elf_high (bfd_vma value)
+{
+  return ((value + (bfd_vma) 0x8000) >> 16) & 0xffff;
+}
+
+/* Create a local GOT entry for VALUE.  Return the index of the entry,
+   or -1 if it could not be created.  */
+
+static struct score_got_entry *
+score_elf_create_local_got_entry (bfd *abfd,
+                                  bfd *ibfd ATTRIBUTE_UNUSED,
+                                  struct score_got_info *gg,
+                                  asection *sgot, bfd_vma value,
+                                  unsigned long r_symndx ATTRIBUTE_UNUSED,
+                                  struct score_elf_link_hash_entry *h ATTRIBUTE_UNUSED,
+                                  int r_type ATTRIBUTE_UNUSED)
+{
+  struct score_got_entry entry, **loc;
+  struct score_got_info *g;
+
+  entry.abfd = NULL;
+  entry.symndx = -1;
+  entry.d.address = value;
+
+  g = gg;
+  loc = (struct score_got_entry **) htab_find_slot (g->got_entries, &entry, INSERT);
+  if (*loc)
+    return *loc;
+
+  entry.gotidx = SCORE_ELF_GOT_SIZE (abfd) * g->assigned_gotno++;
+
+  *loc = bfd_alloc (abfd, sizeof entry);
+
+  if (! *loc)
+    return NULL;
+
+  memcpy (*loc, &entry, sizeof entry);
+
+  if (g->assigned_gotno >= g->local_gotno)
+    {
+      (*loc)->gotidx = -1;
+      /* We didn't allocate enough space in the GOT.  */
+      (*_bfd_error_handler)
+        (_("not enough GOT space for local GOT entries"));
+      bfd_set_error (bfd_error_bad_value);
+      return NULL;
+    }
+
+  bfd_put_32 (abfd, value, (sgot->contents + entry.gotidx));
+
+  return *loc;
+}
+
+/* Find a GOT entry whose higher-order 16 bits are the same as those
+   for value.  Return the index into the GOT for this entry.  */
+
+static bfd_vma
+score_elf_got16_entry (bfd *abfd, bfd *ibfd, struct bfd_link_info *info,
+                       bfd_vma value, bfd_boolean external)
+{
+  asection *sgot;
+  struct score_got_info *g;
+  struct score_got_entry *entry;
+
+  if (!external)
+    {
+      /* Although the ABI says that it is "the high-order 16 bits" that we
+         want, it is really the %high value.  The complete value is
+         calculated with a `addiu' of a LO16 relocation, just as with a
+         HI16/LO16 pair.  */
+      value = score_elf_high (value) << 16;
+    }
+
+  g = score_elf_got_info (elf_hash_table (info)->dynobj, &sgot);
+
+  entry = score_elf_create_local_got_entry (abfd, ibfd, g, sgot, value, 0, NULL,
+                                            R_SCORE_GOT15);
+  if (entry)
+    return entry->gotidx;
+  else
+    return MINUS_ONE;
+}
+
+void
+s7_bfd_score_elf_hide_symbol (struct bfd_link_info *info,
+                              struct elf_link_hash_entry *entry,
+                              bfd_boolean force_local)
+{
+  bfd *dynobj;
+  asection *got;
+  struct score_got_info *g;
+  struct score_elf_link_hash_entry *h;
+
+  h = (struct score_elf_link_hash_entry *) entry;
+  if (h->forced_local)
+    return;
+  h->forced_local = TRUE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  if (dynobj != NULL && force_local)
+    {
+      got = score_elf_got_section (dynobj, FALSE);
+      if (got == NULL)
+        return;
+      g = score_elf_section_data (got)->u.got_info;
+
+      if (g->next)
+        {
+          struct score_got_entry e;
+          struct score_got_info *gg = g;
+
+          /* Since we're turning what used to be a global symbol into a
+             local one, bump up the number of local entries of each GOT
+             that had an entry for it.  This will automatically decrease
+             the number of global entries, since global_gotno is actually
+             the upper limit of global entries.  */
+          e.abfd = dynobj;
+          e.symndx = -1;
+          e.d.h = h;
+
+          for (g = g->next; g != gg; g = g->next)
+            if (htab_find (g->got_entries, &e))
+              {
+                BFD_ASSERT (g->global_gotno > 0);
+                g->local_gotno++;
+                g->global_gotno--;
+              }
+
+          /* If this was a global symbol forced into the primary GOT, we
+             no longer need an entry for it.  We can't release the entry
+             at this point, but we must at least stop counting it as one
+             of the symbols that required a forced got entry.  */
+          if (h->root.got.offset == 2)
+            {
+              BFD_ASSERT (gg->assigned_gotno > 0);
+              gg->assigned_gotno--;
+            }
+        }
+      else if (g->global_gotno == 0 && g->global_gotsym == NULL)
+        /* If we haven't got through GOT allocation yet, just bump up the
+              number of local entries, as this symbol won't be counted as
+              global.  */
+        g->local_gotno++;
+      else if (h->root.got.offset == 1)
+        {
+          /* If we're past non-multi-GOT allocation and this symbol had
+                  been marked for a global got entry, give it a local entry
+                  instead.  */
+          BFD_ASSERT (g->global_gotno > 0);
+          g->local_gotno++;
+          g->global_gotno--;
+        }
+    }
+
+  _bfd_elf_link_hash_hide_symbol (info, &h->root, force_local);
+}
+
+/* If H is a symbol that needs a global GOT entry, but has a dynamic
+   symbol table index lower than any we've seen to date, record it for
+   posterity.  */
+
+static bfd_boolean
+score_elf_record_global_got_symbol (struct elf_link_hash_entry *h,
+                                    bfd *abfd,
+                                    struct bfd_link_info *info,
+                                    struct score_got_info *g)
+{
+  struct score_got_entry entry, **loc;
+
+  /* A global symbol in the GOT must also be in the dynamic symbol table.  */
+  if (h->dynindx == -1)
+    {
+      switch (ELF_ST_VISIBILITY (h->other))
+        {
+        case STV_INTERNAL:
+        case STV_HIDDEN:
+          s7_bfd_score_elf_hide_symbol (info, h, TRUE);
+          break;
+        }
+      if (!bfd_elf_link_record_dynamic_symbol (info, h))
+        return FALSE;
+    }
+
+  entry.abfd = abfd;
+  entry.symndx = -1;
+  entry.d.h = (struct score_elf_link_hash_entry *) h;
+
+  loc = (struct score_got_entry **) htab_find_slot (g->got_entries, &entry, INSERT);
+
+  /* If we've already marked this entry as needing GOT space, we don't
+     need to do it again.  */
+  if (*loc)
+    return TRUE;
+
+  *loc = bfd_alloc (abfd, sizeof entry);
+  if (! *loc)
+    return FALSE;
+
+  entry.gotidx = -1;
+
+  memcpy (*loc, &entry, sizeof (entry));
+
+  if (h->got.offset != MINUS_ONE)
+    return TRUE;
+
+  /* By setting this to a value other than -1, we are indicating that
+     there needs to be a GOT entry for H.  Avoid using zero, as the
+     generic ELF copy_indirect_symbol tests for <= 0.  */
+  h->got.offset = 1;
+
+  return TRUE;
+}
+
+/* Reserve space in G for a GOT entry containing the value of symbol
+   SYMNDX in input bfd ABDF, plus ADDEND.  */
+
+static bfd_boolean
+score_elf_record_local_got_symbol (bfd *abfd,
+                                   long symndx,
+                                   bfd_vma addend,
+                                   struct score_got_info *g)
+{
+  struct score_got_entry entry, **loc;
+
+  entry.abfd = abfd;
+  entry.symndx = symndx;
+  entry.d.addend = addend;
+  loc = (struct score_got_entry **) htab_find_slot (g->got_entries, &entry, INSERT);
+
+  if (*loc)
+    return TRUE;
+
+  entry.gotidx = g->local_gotno++;
+
+  *loc = bfd_alloc (abfd, sizeof(entry));
+  if (! *loc)
+    return FALSE;
+
+  memcpy (*loc, &entry, sizeof (entry));
+
+  return TRUE;
+}
+
+/* Returns the GOT offset at which the indicated address can be found.
+   If there is not yet a GOT entry for this value, create one.
+   Returns -1 if no satisfactory GOT offset can be found.  */
+
+static bfd_vma
+score_elf_local_got_index (bfd *abfd, bfd *ibfd, struct bfd_link_info *info,
+                           bfd_vma value, unsigned long r_symndx,
+                           struct score_elf_link_hash_entry *h, int r_type)
+{
+  asection *sgot;
+  struct score_got_info *g;
+  struct score_got_entry *entry;
+
+  g = score_elf_got_info (elf_hash_table (info)->dynobj, &sgot);
+
+  entry = score_elf_create_local_got_entry (abfd, ibfd, g, sgot, value,
+                                             r_symndx, h, r_type);
+  if (!entry)
+    return MINUS_ONE;
+
+  else
+    return entry->gotidx;
+}
+
+/* Returns the GOT index for the global symbol indicated by H.  */
+
+static bfd_vma
+score_elf_global_got_index (bfd *abfd, struct elf_link_hash_entry *h)
+{
+  bfd_vma got_index;
+  asection *sgot;
+  struct score_got_info *g;
+  long global_got_dynindx = 0;
+
+  g = score_elf_got_info (abfd, &sgot);
+  if (g->global_gotsym != NULL)
+    global_got_dynindx = g->global_gotsym->dynindx;
+
+  /* Once we determine the global GOT entry with the lowest dynamic
+     symbol table index, we must put all dynamic symbols with greater
+     indices into the GOT.  That makes it easy to calculate the GOT
+     offset.  */
+  BFD_ASSERT (h->dynindx >= global_got_dynindx);
+  got_index = ((h->dynindx - global_got_dynindx + g->local_gotno) * SCORE_ELF_GOT_SIZE (abfd));
+  BFD_ASSERT (got_index < sgot->size);
+
+  return got_index;
+}
+
+/* Returns the offset for the entry at the INDEXth position in the GOT.  */
+
+static bfd_vma
+score_elf_got_offset_from_index (bfd *dynobj,
+				 bfd *output_bfd,
+                                 bfd *input_bfd ATTRIBUTE_UNUSED,
+				 bfd_vma got_index)
+{
+  asection *sgot;
+  bfd_vma gp;
+
+  score_elf_got_info (dynobj, &sgot);
+  gp = _bfd_get_gp_value (output_bfd);
+
+  return sgot->output_section->vma + sgot->output_offset + got_index - gp;
+}
+
+/* Follow indirect and warning hash entries so that each got entry
+   points to the final symbol definition.  P must point to a pointer
+   to the hash table we're traversing.  Since this traversal may
+   modify the hash table, we set this pointer to NULL to indicate
+   we've made a potentially-destructive change to the hash table, so
+   the traversal must be restarted.  */
+
+static int
+score_elf_resolve_final_got_entry (void **entryp, void *p)
+{
+  struct score_got_entry *entry = (struct score_got_entry *) *entryp;
+  htab_t got_entries = *(htab_t *) p;
+
+  if (entry->abfd != NULL && entry->symndx == -1)
+    {
+      struct score_elf_link_hash_entry *h = entry->d.h;
+
+      while (h->root.root.type == bfd_link_hash_indirect
+             || h->root.root.type == bfd_link_hash_warning)
+        h = (struct score_elf_link_hash_entry *) h->root.root.u.i.link;
+
+      if (entry->d.h == h)
+        return 1;
+
+      entry->d.h = h;
+
+      /* If we can't find this entry with the new bfd hash, re-insert
+         it, and get the traversal restarted.  */
+      if (! htab_find (got_entries, entry))
+        {
+          htab_clear_slot (got_entries, entryp);
+          entryp = htab_find_slot (got_entries, entry, INSERT);
+          if (! *entryp)
+            *entryp = entry;
+          /* Abort the traversal, since the whole table may have
+             moved, and leave it up to the parent to restart the
+             process.  */
+          *(htab_t *) p = NULL;
+          return 0;
+        }
+      /* We might want to decrement the global_gotno count, but it's
+         either too early or too late for that at this point.  */
+    }
+
+  return 1;
+}
+
+/* Turn indirect got entries in a got_entries table into their final locations.  */
+
+static void
+score_elf_resolve_final_got_entries (struct score_got_info *g)
+{
+  htab_t got_entries;
+
+  do
+    {
+      got_entries = g->got_entries;
+
+      htab_traverse (got_entries,
+                     score_elf_resolve_final_got_entry,
+                     &got_entries);
+    }
+  while (got_entries == NULL);
+}
+
+/* Add INCREMENT to the reloc (of type HOWTO) at ADDRESS. for -r  */
+
+static void
+score_elf_add_to_rel (bfd *abfd,
+                      bfd_byte *address,
+                      reloc_howto_type *howto,
+                      bfd_signed_vma increment)
+{
+  bfd_signed_vma addend;
+  bfd_vma contents;
+  unsigned long offset;
+  unsigned long r_type = howto->type;
+  unsigned long hi16_addend, hi16_offset, hi16_value, uvalue;
+
+  contents = bfd_get_32 (abfd, address);
+  /* Get the (signed) value from the instruction.  */
+  addend = contents & howto->src_mask;
+  if (addend & ((howto->src_mask + 1) >> 1))
+    {
+      bfd_signed_vma mask;
+
+      mask = -1;
+      mask &= ~howto->src_mask;
+      addend |= mask;
+    }
+  /* Add in the increment, (which is a byte value).  */
+  switch (r_type)
+    {
+    case R_SCORE_PC19:
+      offset =
+        (((contents & howto->src_mask) & 0x3ff0000) >> 6) | ((contents & howto->src_mask) & 0x3ff);
+      offset += increment;
+      contents =
+        (contents & ~howto->
+         src_mask) | (((offset << 6) & howto->src_mask) & 0x3ff0000) | (offset & 0x3ff);
+      bfd_put_32 (abfd, contents, address);
+      break;
+    case R_SCORE_HI16:
+      break;
+    case R_SCORE_LO16:
+      hi16_addend = bfd_get_32 (abfd, address - 4);
+      hi16_offset = ((((hi16_addend >> 16) & 0x3) << 15) | (hi16_addend & 0x7fff)) >> 1;
+      offset = ((((contents >> 16) & 0x3) << 15) | (contents & 0x7fff)) >> 1;
+      offset = (hi16_offset << 16) | (offset & 0xffff);
+      uvalue = increment + offset;
+      hi16_offset = (uvalue >> 16) << 1;
+      hi16_value = (hi16_addend & (~(howto->dst_mask)))
+        | (hi16_offset & 0x7fff) | ((hi16_offset << 1) & 0x30000);
+      bfd_put_32 (abfd, hi16_value, address - 4);
+      offset = (uvalue & 0xffff) << 1;
+      contents = (contents & (~(howto->dst_mask))) | (offset & 0x7fff) | ((offset << 1) & 0x30000);
+      bfd_put_32 (abfd, contents, address);
+      break;
+    case R_SCORE_24:
+      offset =
+        (((contents & howto->src_mask) >> 1) & 0x1ff8000) | ((contents & howto->src_mask) & 0x7fff);
+      offset += increment;
+      contents =
+        (contents & ~howto->
+         src_mask) | (((offset << 1) & howto->src_mask) & 0x3ff0000) | (offset & 0x7fff);
+      bfd_put_32 (abfd, contents, address);
+      break;
+    case R_SCORE16_11:
+
+      contents = bfd_get_16 (abfd, address);
+      offset = contents & howto->src_mask;
+      offset += increment;
+      contents = (contents & ~howto->src_mask) | (offset & howto->src_mask);
+      bfd_put_16 (abfd, contents, address);
+
+      break;
+    case R_SCORE16_PC8:
+
+      contents = bfd_get_16 (abfd, address);
+      offset = (contents & howto->src_mask) + ((increment >> 1) & 0xff);
+      contents = (contents & (~howto->src_mask)) | (offset & howto->src_mask);
+      bfd_put_16 (abfd, contents, address);
+
+      break;
+    case R_SCORE_GOT15:
+    case R_SCORE_GOT_LO16:
+      break;
+
+    default:
+      addend += increment;
+      contents = (contents & ~howto->dst_mask) | (addend & howto->dst_mask);
+      bfd_put_32 (abfd, contents, address);
+      break;
+    }
+}
+
+/* Perform a relocation as part of a final link.  */
+
+static bfd_reloc_status_type
+score_elf_final_link_relocate (reloc_howto_type *howto,
+                               bfd *input_bfd,
+                               bfd *output_bfd,
+                               asection *input_section,
+                               bfd_byte *contents,
+                               Elf_Internal_Rela *rel,
+                               Elf_Internal_Rela *relocs,
+                               bfd_vma symbol,
+                               struct bfd_link_info *info,
+                               const char *sym_name ATTRIBUTE_UNUSED,
+                               int sym_flags ATTRIBUTE_UNUSED,
+                               struct score_elf_link_hash_entry *h,
+                               Elf_Internal_Sym *local_syms,
+                               asection **local_sections,
+                               bfd_boolean gp_disp_p)
+{
+  unsigned long r_type;
+  unsigned long r_symndx;
+  bfd_byte *hit_data = contents + rel->r_offset;
+  bfd_vma addend;
+  /* The final GP value to be used for the relocatable, executable, or
+     shared object file being produced.  */
+  bfd_vma gp = MINUS_ONE;
+  /* The place (section offset or address) of the storage unit being relocated.  */
+  bfd_vma rel_addr;
+  /* The value of GP used to create the relocatable object.  */
+  bfd_vma gp0 = MINUS_ONE;
+  /* The offset into the global offset table at which the address of the relocation entry
+     symbol, adjusted by the addend, resides during execution.  */
+  bfd_vma g = MINUS_ONE;
+  /* TRUE if the symbol referred to by this relocation is a local symbol.  */
+  bfd_boolean local_p;
+  /* The eventual value we will relocate.  */
+  bfd_vma value = symbol;
+  unsigned long hi16_addend, hi16_offset, hi16_value, uvalue, offset, abs_value = 0;
+
+  Elf_Internal_Sym *sym = 0;
+  asection *sec = NULL;
+  bfd_boolean merge_p = 0;
+
+
+  if (elf_gp (output_bfd) == 0)
+    {
+      struct bfd_link_hash_entry *bh;
+      asection *o;
+
+      bh = bfd_link_hash_lookup (info->hash, "_gp", 0, 0, 1);
+      if (bh != NULL && bh->type == bfd_link_hash_defined)
+        elf_gp (output_bfd) = (bh->u.def.value
+                               + bh->u.def.section->output_section->vma
+                               + bh->u.def.section->output_offset);
+      else if (info->relocatable)
+        {
+          bfd_vma lo = -1;
+
+          /* Find the GP-relative section with the lowest offset.  */
+          for (o = output_bfd->sections; o != NULL; o = o->next)
+            if (o->vma < lo)
+              lo = o->vma;
+          /* And calculate GP relative to that.  */
+          elf_gp (output_bfd) = lo + ELF_SCORE_GP_OFFSET (input_bfd);
+        }
+      else
+        {
+          /* If the relocate_section function needs to do a reloc
+             involving the GP value, it should make a reloc_dangerous
+             callback to warn that GP is not defined.  */
+        }
+    }
+
+  /* Parse the relocation.  */
+  r_symndx = ELF32_R_SYM (rel->r_info);
+  r_type = ELF32_R_TYPE (rel->r_info);
+  rel_addr = (input_section->output_section->vma + input_section->output_offset + rel->r_offset);
+
+  /* For hidden symbol.  */
+  local_p = score_elf_local_relocation_p (input_bfd, rel, local_sections, FALSE);
+  if (local_p)
+    {
+      sym = local_syms + r_symndx;
+      sec = local_sections[r_symndx];
+
+      symbol = sec->output_section->vma + sec->output_offset;
+      if (ELF_ST_TYPE (sym->st_info) != STT_SECTION
+          || (sec->flags & SEC_MERGE))
+        symbol += sym->st_value;
+      if ((sec->flags & SEC_MERGE)
+          && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+        merge_p = 1;
+    }
+
+  if (r_type == R_SCORE_GOT15)
+    {
+      const Elf_Internal_Rela *relend;
+      const Elf_Internal_Rela *lo16_rel;
+      const struct elf_backend_data *bed;
+      bfd_vma lo_value = 0;
+
+      bed = get_elf_backend_data (output_bfd);
+      relend = relocs + input_section->reloc_count * bed->s->int_rels_per_ext_rel;
+      lo16_rel = score_elf_next_relocation (input_bfd, R_SCORE_GOT_LO16, rel, relend);
+      if ((local_p) && (lo16_rel != NULL))
+        {
+          bfd_vma tmp = 0;
+          tmp = bfd_get_32 (input_bfd, contents + lo16_rel->r_offset);
+          lo_value = (((tmp >> 16) & 0x3) << 14) | ((tmp & 0x7fff) >> 1);
+          if (merge_p)
+            {
+              asection *msec = sec;
+              lo_value = _bfd_elf_rel_local_sym (output_bfd, sym, &msec, lo_value);
+              lo_value -= symbol;
+              lo_value += msec->output_section->vma + msec->output_offset;
+            }
+        }
+      addend = lo_value;
+    }
+  else
+    {
+      addend = (bfd_get_32 (input_bfd, hit_data) >> howto->bitpos) & howto->src_mask;
+    }
+
+  /* Figure out the value of the symbol.  */
+  if (local_p && !merge_p)
+    {
+      if (r_type == R_SCORE_GOT15)
+        {
+          const Elf_Internal_Rela *relend;
+          const Elf_Internal_Rela *lo16_rel;
+          const struct elf_backend_data *bed;
+          bfd_vma lo_value = 0;
+
+          value = bfd_get_32 (input_bfd, contents + rel->r_offset);
+          addend = value & 0x7fff;
+          if ((addend & 0x4000) == 0x4000)
+            addend |= 0xffffc000;
+
+          bed = get_elf_backend_data (output_bfd);
+          relend = relocs + input_section->reloc_count * bed->s->int_rels_per_ext_rel;
+          lo16_rel = score_elf_next_relocation (input_bfd, R_SCORE_GOT_LO16, rel, relend);
+          if ((local_p) && (lo16_rel != NULL))
+            {
+              bfd_vma tmp = 0;
+              tmp = bfd_get_32 (input_bfd, contents + lo16_rel->r_offset);
+              lo_value = (((tmp >> 16) & 0x3) << 14) | ((tmp & 0x7fff) >> 1);
+            }
+
+          addend <<= 16;
+          addend += lo_value;
+        }
+    }
+
+  local_p = score_elf_local_relocation_p (input_bfd, rel, local_sections, TRUE);
+
+  /* If we haven't already determined the GOT offset, or the GP value,
+     and we're going to need it, get it now.  */
+  switch (r_type)
+    {
+    case R_SCORE_CALL15:
+    case R_SCORE_GOT15:
+      if (!local_p)
+        {
+          g = score_elf_global_got_index (elf_hash_table (info)->dynobj,
+                                          (struct elf_link_hash_entry *) h);
+          if ((! elf_hash_table(info)->dynamic_sections_created
+               || (info->shared
+                   && (info->symbolic || h->root.dynindx == -1)
+                   && h->root.def_regular)))
+            {
+              /* This is a static link or a -Bsymbolic link.  The
+                 symbol is defined locally, or was forced to be local.
+                 We must initialize this entry in the GOT.  */
+              bfd *tmpbfd = elf_hash_table (info)->dynobj;
+              asection *sgot = score_elf_got_section (tmpbfd, FALSE);
+              bfd_put_32 (tmpbfd, value, sgot->contents + g);
+            }
+        }
+      else if (r_type == R_SCORE_GOT15 || r_type == R_SCORE_CALL15)
+        {
+          /* There's no need to create a local GOT entry here; the
+             calculation for a local GOT15 entry does not involve G.  */
+          ;
+        }
+      else
+        {
+          g = score_elf_local_got_index (output_bfd, input_bfd, info,
+                                         symbol + addend, r_symndx, h, r_type);
+            if (g == MINUS_ONE)
+            return bfd_reloc_outofrange;
+        }
+
+      /* Convert GOT indices to actual offsets.  */
+      g = score_elf_got_offset_from_index (elf_hash_table (info)->dynobj,
+                                           output_bfd, input_bfd, g);
+      break;
+
+    case R_SCORE_HI16:
+    case R_SCORE_LO16:
+    case R_SCORE_GPREL32:
+      gp0 = _bfd_get_gp_value (input_bfd);
+      gp = _bfd_get_gp_value (output_bfd);
+      break;
+
+    case R_SCORE_GP15:
+      gp = _bfd_get_gp_value (output_bfd);
+
+    default:
+      break;
+    }
+
+  switch (r_type)
+    {
+    case R_SCORE_NONE:
+      return bfd_reloc_ok;
+
+    case R_SCORE_ABS32:
+    case R_SCORE_REL32:
+      if ((info->shared
+           || (elf_hash_table (info)->dynamic_sections_created
+               && h != NULL
+               && h->root.def_dynamic
+               && !h->root.def_regular))
+           && r_symndx != STN_UNDEF
+           && (input_section->flags & SEC_ALLOC) != 0)
+        {
+          /* If we're creating a shared library, or this relocation is against a symbol
+             in a shared library, then we can't know where the symbol will end up.
+             So, we create a relocation record in the output, and leave the job up
+             to the dynamic linker.  */
+          value = addend;
+          if (!score_elf_create_dynamic_relocation (output_bfd, info, rel, h,
+                                                    symbol, &value,
+                                                    input_section))
+            return bfd_reloc_undefined;
+        }
+      else if (r_symndx == STN_UNDEF)
+        /* r_symndx will be STN_UNDEF (zero) only for relocs against symbols
+           from removed linkonce sections, or sections discarded by
+           a linker script.  */
+        value = 0;
+      else
+        {
+          if (r_type != R_SCORE_REL32)
+            value = symbol + addend;
+          else
+            value = addend;
+        }
+      value &= howto->dst_mask;
+      bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE_ABS16:
+      value += addend;
+      if ((long) value > 0x7fff || (long) value < -0x8000)
+        return bfd_reloc_overflow;
+      bfd_put_16 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE_24:
+      addend = bfd_get_32 (input_bfd, hit_data);
+      offset = (((addend & howto->src_mask) >> 1) & 0x1ff8000) | ((addend & howto->src_mask) & 0x7fff);
+      if ((offset & 0x1000000) != 0)
+        offset |= 0xfe000000;
+      value += offset;
+      abs_value = abs (value - rel_addr);
+      if ((abs_value & 0xfe000000) != 0)
+        return bfd_reloc_overflow;
+      addend = (addend & ~howto->src_mask)
+                | (((value << 1) & howto->src_mask) & 0x3ff0000) | (value & 0x7fff);
+      bfd_put_32 (input_bfd, addend, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE_PC19:
+      addend = bfd_get_32 (input_bfd, hit_data);
+      offset = (((addend & howto->src_mask) & 0x3ff0000) >> 6) | ((addend & howto->src_mask) & 0x3ff);
+      if ((offset & 0x80000) != 0)
+        offset |= 0xfff00000;
+      abs_value = value = value - rel_addr + offset;
+      /* exceed 20 bit : overflow.  */
+      if ((abs_value & 0x80000000) == 0x80000000)
+        abs_value = 0xffffffff - value + 1;
+      if ((abs_value & 0xfff80000) != 0)
+        return bfd_reloc_overflow;
+      addend = (addend & ~howto->src_mask)
+                | (((value << 6) & howto->src_mask) & 0x3ff0000) | (value & 0x3ff);
+      bfd_put_32 (input_bfd, addend, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE16_11:
+      addend = bfd_get_16 (input_bfd, hit_data);
+      offset = addend & howto->src_mask;
+      if ((offset & 0x800) != 0)        /* Offset is negative.  */
+        offset |= 0xfffff000;
+      value += offset;
+      abs_value = abs (value - rel_addr);
+      if ((abs_value & 0xfffff000) != 0)
+        return bfd_reloc_overflow;
+      addend = (addend & ~howto->src_mask) | (value & howto->src_mask);
+      bfd_put_16 (input_bfd, addend, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE16_PC8:
+      addend = bfd_get_16 (input_bfd, hit_data);
+      offset = (addend & howto->src_mask) << 1;
+      if ((offset & 0x100) != 0)        /* Offset is negative.  */
+        offset |= 0xfffffe00;
+      abs_value = value = value - rel_addr + offset;
+      /* Sign bit + exceed 9 bit.  */
+      if (((value & 0xffffff00) != 0) && ((value & 0xffffff00) != 0xffffff00))
+        return bfd_reloc_overflow;
+      value >>= 1;
+      addend = (addend & ~howto->src_mask) | (value & howto->src_mask);
+      bfd_put_16 (input_bfd, addend, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE_HI16:
+      return bfd_reloc_ok;
+
+    case R_SCORE_LO16:
+      hi16_addend = bfd_get_32 (input_bfd, hit_data - 4);
+      hi16_offset = ((((hi16_addend >> 16) & 0x3) << 15) | (hi16_addend & 0x7fff)) >> 1;
+      addend = bfd_get_32 (input_bfd, hit_data);
+      offset = ((((addend >> 16) & 0x3) << 15) | (addend & 0x7fff)) >> 1;
+      offset = (hi16_offset << 16) | (offset & 0xffff);
+
+      if (!gp_disp_p)
+        uvalue = value + offset;
+      else
+        uvalue = offset + gp - rel_addr + 4;
+
+      hi16_offset = (uvalue >> 16) << 1;
+      hi16_value = (hi16_addend & (~(howto->dst_mask)))
+                        | (hi16_offset & 0x7fff) | ((hi16_offset << 1) & 0x30000);
+      bfd_put_32 (input_bfd, hi16_value, hit_data - 4);
+      offset = (uvalue & 0xffff) << 1;
+      value = (addend & (~(howto->dst_mask))) | (offset & 0x7fff) | ((offset << 1) & 0x30000);
+      bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE_GP15:
+      addend = bfd_get_32 (input_bfd, hit_data);
+      offset = addend & 0x7fff;
+      if ((offset & 0x4000) == 0x4000)
+        offset |= 0xffffc000;
+      value = value + offset - gp;
+      if (((value & 0xffffc000) != 0) && ((value & 0xffffc000) != 0xffffc000))
+        return bfd_reloc_overflow;
+      value = (addend & ~howto->src_mask) | (value & howto->src_mask);
+      bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE_GOT15:
+    case R_SCORE_CALL15:
+      if (local_p)
+        {
+          bfd_boolean forced;
+
+          /* The special case is when the symbol is forced to be local.  We need the
+             full address in the GOT since no R_SCORE_GOT_LO16 relocation follows.  */
+          forced = ! score_elf_local_relocation_p (input_bfd, rel,
+                                                   local_sections, FALSE);
+          value = score_elf_got16_entry (output_bfd, input_bfd, info,
+                                         symbol + addend, forced);
+          if (value == MINUS_ONE)
+            return bfd_reloc_outofrange;
+          value = score_elf_got_offset_from_index (elf_hash_table (info)->dynobj,
+                                                   output_bfd, input_bfd, value);
+        }
+      else
+        {
+          value = g;
+        }
+
+      if ((long) value > 0x3fff || (long) value < -0x4000)
+        return bfd_reloc_overflow;
+
+      addend = bfd_get_32 (input_bfd, hit_data);
+      value = (addend & ~howto->dst_mask) | (value & howto->dst_mask);
+      bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE_GPREL32:
+      value = (addend + symbol + gp0 - gp);
+      value &= howto->dst_mask;
+      bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE_GOT_LO16:
+      addend = bfd_get_32 (input_bfd, hit_data);
+      value = (((addend >> 16) & 0x3) << 14) | ((addend & 0x7fff) >> 1);
+      value += symbol;
+      value = (addend & (~(howto->dst_mask))) | ((value & 0x3fff) << 1)
+               | (((value >> 14) & 0x3) << 16);
+
+      bfd_put_32 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_SCORE_DUMMY_HI16:
+      return bfd_reloc_ok;
+
+    case R_SCORE_GNU_VTINHERIT:
+    case R_SCORE_GNU_VTENTRY:
+      /* We don't do anything with these at present.  */
+      return bfd_reloc_continue;
+
+    default:
+      return bfd_reloc_notsupported;
+    }
+}
+
+/* Score backend functions.  */
+
+void
+s7_bfd_score_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+                            arelent *bfd_reloc,
+                            Elf_Internal_Rela *elf_reloc)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (elf_reloc->r_info);
+  if (r_type >= ARRAY_SIZE (elf32_score_howto_table))
+    bfd_reloc->howto = NULL;
+  else
+    bfd_reloc->howto = &elf32_score_howto_table[r_type];
+}
+
+/* Relocate an score ELF section.  */
+
+bfd_boolean
+s7_bfd_score_elf_relocate_section (bfd *output_bfd,
+                                   struct bfd_link_info *info,
+                                   bfd *input_bfd,
+                                   asection *input_section,
+                                   bfd_byte *contents,
+                                   Elf_Internal_Rela *relocs,
+                                   Elf_Internal_Sym *local_syms,
+                                   asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  const char *name;
+  unsigned long offset;
+  unsigned long hi16_addend, hi16_offset, hi16_value, uvalue;
+  size_t extsymoff;
+  bfd_boolean gp_disp_p = FALSE;
+
+  /* Sort dynsym.  */
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      bfd_size_type dynsecsymcount = 0;
+      if (info->shared)
+        {
+          asection * p;
+          const struct elf_backend_data *bed = get_elf_backend_data (output_bfd);
+
+          for (p = output_bfd->sections; p ; p = p->next)
+            if ((p->flags & SEC_EXCLUDE) == 0
+                && (p->flags & SEC_ALLOC) != 0
+                && !(*bed->elf_backend_omit_section_dynsym) (output_bfd, info, p))
+              ++ dynsecsymcount;
+        }
+
+      if (!score_elf_sort_hash_table (info, dynsecsymcount + 1))
+        return FALSE;
+    }
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  extsymoff = (elf_bad_symtab (input_bfd)) ? 0 : symtab_hdr->sh_info;
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct score_elf_link_hash_entry *h;
+      bfd_vma relocation = 0;
+      bfd_reloc_status_type r;
+      arelent bfd_reloc;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      s7_bfd_score_info_to_howto (input_bfd, &bfd_reloc, (Elf_Internal_Rela *) rel);
+      howto = bfd_reloc.howto;
+
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+
+      if (r_symndx < extsymoff)
+        {
+          sym = local_syms + r_symndx;
+          sec = local_sections[r_symndx];
+          relocation = sec->output_section->vma + sec->output_offset;
+          name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym, sec);
+
+          if (!info->relocatable)
+            {
+              if (ELF_ST_TYPE (sym->st_info) != STT_SECTION
+                      || (sec->flags & SEC_MERGE))
+                {
+                      relocation += sym->st_value;
+                    }
+
+              if ((sec->flags & SEC_MERGE)
+                      && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+                {
+                  asection *msec;
+                  bfd_vma addend, value;
+
+                  switch (r_type)
+                    {
+                    case R_SCORE_HI16:
+                      break;
+                    case R_SCORE_LO16:
+                      hi16_addend = bfd_get_32 (input_bfd, contents + rel->r_offset - 4);
+                      hi16_offset = ((((hi16_addend >> 16) & 0x3) << 15) | (hi16_addend & 0x7fff)) >> 1;
+                      value = bfd_get_32 (input_bfd, contents + rel->r_offset);
+                      offset = ((((value >> 16) & 0x3) << 15) | (value & 0x7fff)) >> 1;
+                      addend = (hi16_offset << 16) | (offset & 0xffff);
+                      msec = sec;
+                      addend = _bfd_elf_rel_local_sym (output_bfd, sym, &msec, addend);
+                      addend -= relocation;
+                      addend += msec->output_section->vma + msec->output_offset;
+                      uvalue = addend;
+                      hi16_offset = (uvalue >> 16) << 1;
+                      hi16_value = (hi16_addend & (~(howto->dst_mask)))
+                        | (hi16_offset & 0x7fff) | ((hi16_offset << 1) & 0x30000);
+                      bfd_put_32 (input_bfd, hi16_value, contents + rel->r_offset - 4);
+                      offset = (uvalue & 0xffff) << 1;
+                      value = (value & (~(howto->dst_mask)))
+                        | (offset & 0x7fff) | ((offset << 1) & 0x30000);
+                      bfd_put_32 (input_bfd, value, contents + rel->r_offset);
+                      break;
+                    case R_SCORE_GOT_LO16:
+                      value = bfd_get_32 (input_bfd, contents + rel->r_offset);
+                      addend = (((value >> 16) & 0x3) << 14) | ((value & 0x7fff) >> 1);
+                      msec = sec;
+                      addend = _bfd_elf_rel_local_sym (output_bfd, sym, &msec, addend) - relocation;
+                      addend += msec->output_section->vma + msec->output_offset;
+                      value = (value & (~(howto->dst_mask))) | ((addend & 0x3fff) << 1)
+                               | (((addend >> 14) & 0x3) << 16);
+
+                      bfd_put_32 (input_bfd, value, contents + rel->r_offset);
+                      break;
+                    default:
+                      value = bfd_get_32 (input_bfd, contents + rel->r_offset);
+                      /* Get the (signed) value from the instruction.  */
+                      addend = value & howto->src_mask;
+                      if (addend & ((howto->src_mask + 1) >> 1))
+                        {
+                          bfd_signed_vma mask;
+
+                          mask = -1;
+                          mask &= ~howto->src_mask;
+                          addend |= mask;
+                        }
+                      msec = sec;
+                      addend = _bfd_elf_rel_local_sym (output_bfd, sym, &msec, addend) - relocation;
+                      addend += msec->output_section->vma + msec->output_offset;
+                      value = (value & ~howto->dst_mask) | (addend & howto->dst_mask);
+                      bfd_put_32 (input_bfd, value, contents + rel->r_offset);
+                      break;
+                    }
+                }
+            }
+        }
+      else
+        {
+          /* For global symbols we look up the symbol in the hash-table.  */
+          h = ((struct score_elf_link_hash_entry *)
+               elf_sym_hashes (input_bfd) [r_symndx - extsymoff]);
+          /* Find the real hash-table entry for this symbol.  */
+          while (h->root.root.type == bfd_link_hash_indirect
+                 || h->root.root.type == bfd_link_hash_warning)
+            h = (struct score_elf_link_hash_entry *) h->root.root.u.i.link;
+
+          /* Record the name of this symbol, for our caller.  */
+          name = h->root.root.root.string;
+
+          /* See if this is the special GP_DISP_LABEL symbol.  Note that such a
+             symbol must always be a global symbol.  */
+          if (strcmp (name, GP_DISP_LABEL) == 0)
+            {
+              /* Relocations against GP_DISP_LABEL are permitted only with
+                 R_SCORE_HI16 and R_SCORE_LO16 relocations.  */
+              if (r_type != R_SCORE_HI16 && r_type != R_SCORE_LO16)
+                return bfd_reloc_notsupported;
+
+              gp_disp_p = TRUE;
+            }
+
+          /* If this symbol is defined, calculate its address.  Note that
+              GP_DISP_LABEL is a magic symbol, always implicitly defined by the
+              linker, so it's inappropriate to check to see whether or not
+              its defined.  */
+          else if ((h->root.root.type == bfd_link_hash_defined
+                    || h->root.root.type == bfd_link_hash_defweak)
+                   && h->root.root.u.def.section)
+            {
+              sec = h->root.root.u.def.section;
+              if (sec->output_section)
+                relocation = (h->root.root.u.def.value
+                              + sec->output_section->vma
+                              + sec->output_offset);
+              else
+                {
+                  relocation = h->root.root.u.def.value;
+                }
+            }
+          else if (h->root.root.type == bfd_link_hash_undefweak)
+            /* We allow relocations against undefined weak symbols, giving
+               it the value zero, so that you can undefined weak functions
+               and check to see if they exist by looking at their addresses.  */
+            relocation = 0;
+          else if (info->unresolved_syms_in_objects == RM_IGNORE
+                   && ELF_ST_VISIBILITY (h->root.other) == STV_DEFAULT)
+            relocation = 0;
+          else if (strcmp (name, "_DYNAMIC_LINK") == 0)
+            {
+              /* If this is a dynamic link, we should have created a _DYNAMIC_LINK symbol
+                 in s7_bfd_score_elf_create_dynamic_sections.  Otherwise, we should define
+                 the symbol with a value of 0.  */
+              BFD_ASSERT (! info->shared);
+              BFD_ASSERT (bfd_get_section_by_name (output_bfd, ".dynamic") == NULL);
+              relocation = 0;
+            }
+          else if (!info->relocatable)
+            {
+              if (! ((*info->callbacks->undefined_symbol)
+                     (info, h->root.root.root.string, input_bfd,
+                      input_section, rel->r_offset,
+                      (info->unresolved_syms_in_objects == RM_GENERATE_ERROR)
+                      || ELF_ST_VISIBILITY (h->root.other))))
+                return bfd_reloc_undefined;
+              relocation = 0;
+            }
+        }
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+        {
+          /* This is a relocatable link.  We don't have to change
+             anything, unless the reloc is against a section symbol,
+             in which case we have to adjust according to where the
+             section symbol winds up in the output section.  */
+          if (r_symndx < symtab_hdr->sh_info)
+            {
+              sym = local_syms + r_symndx;
+
+              if (r_type == R_SCORE_GOT15)
+                {
+                  const Elf_Internal_Rela *lo16_rel;
+                  const struct elf_backend_data *bed;
+                  bfd_vma lo_addend = 0, lo_value = 0;
+                  bfd_vma addend, value;
+
+                  value = bfd_get_32 (input_bfd, contents + rel->r_offset);
+                  addend = value & 0x7fff;
+                  if ((addend & 0x4000) == 0x4000)
+                    addend |= 0xffffc000;
+
+                  bed = get_elf_backend_data (output_bfd);
+                  relend = relocs + input_section->reloc_count * bed->s->int_rels_per_ext_rel;
+                  lo16_rel = score_elf_next_relocation (input_bfd, R_SCORE_GOT_LO16, rel, relend);
+                  if (lo16_rel != NULL)
+                    {
+                      lo_value = bfd_get_32 (input_bfd, contents + lo16_rel->r_offset);
+                      lo_addend = (((lo_value >> 16) & 0x3) << 14) | ((lo_value & 0x7fff) >> 1);
+                    }
+
+                  addend <<= 16;
+                  addend += lo_addend;
+
+                  if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+                    addend += local_sections[r_symndx]->output_offset;
+
+                  lo_addend = addend & 0xffff;
+                  lo_value = (lo_value & (~(howto->dst_mask))) | ((lo_addend & 0x3fff) << 1)
+                              | (((lo_addend >> 14) & 0x3) << 16);
+                  bfd_put_32 (input_bfd, lo_value, contents + lo16_rel->r_offset);
+
+                  addend = addend >> 16;
+                  value = (value & ~howto->src_mask) | (addend & howto->src_mask);
+                  bfd_put_32 (input_bfd, value, contents + rel->r_offset);
+                }
+              else if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+                {
+                  sec = local_sections[r_symndx];
+                  score_elf_add_to_rel (input_bfd, contents + rel->r_offset,
+                                        howto, (bfd_signed_vma) (sec->output_offset + sym->st_value));
+                }
+            }
+          continue;
+        }
+
+      /* This is a final link.  */
+      r = score_elf_final_link_relocate (howto, input_bfd, output_bfd,
+                                         input_section, contents, rel, relocs,
+                                         relocation, info, name,
+                                         (h ? ELF_ST_TYPE ((unsigned int) h->root.root.type) :
+                                         ELF_ST_TYPE ((unsigned int) sym->st_info)), h, local_syms,
+                                         local_sections, gp_disp_p);
+
+      if (r != bfd_reloc_ok)
+        {
+          const char *msg = (const char *)0;
+
+          switch (r)
+            {
+            case bfd_reloc_overflow:
+              /* If the overflowing reloc was to an undefined symbol,
+                 we have already printed one error message and there
+                 is no point complaining again.  */
+              if (((!h) || (h->root.root.type != bfd_link_hash_undefined))
+                  && (!((*info->callbacks->reloc_overflow)
+                        (info, NULL, name, howto->name, (bfd_vma) 0,
+                         input_bfd, input_section, rel->r_offset))))
+                return FALSE;
+              break;
+            case bfd_reloc_undefined:
+              if (!((*info->callbacks->undefined_symbol)
+                    (info, name, input_bfd, input_section, rel->r_offset, TRUE)))
+                return FALSE;
+              break;
+
+            case bfd_reloc_outofrange:
+              msg = _("internal error: out of range error");
+              goto common_error;
+
+            case bfd_reloc_notsupported:
+              msg = _("internal error: unsupported relocation error");
+              goto common_error;
+
+            case bfd_reloc_dangerous:
+              msg = _("internal error: dangerous error");
+              goto common_error;
+
+            default:
+              msg = _("internal error: unknown error");
+              /* fall through */
+
+            common_error:
+              if (!((*info->callbacks->warning)
+                    (info, msg, name, input_bfd, input_section, rel->r_offset)))
+                return FALSE;
+              break;
+            }
+        }
+    }
+
+  return TRUE;
+}
+
+/* Look through the relocs for a section during the first phase, and
+   allocate space in the global offset table.  */
+
+bfd_boolean
+s7_bfd_score_elf_check_relocs (bfd *abfd,
+                               struct bfd_link_info *info,
+                               asection *sec,
+                               const Elf_Internal_Rela *relocs)
+{
+  const char *name;
+  bfd *dynobj;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  struct score_got_info *g;
+  size_t extsymoff;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  asection *sgot;
+  asection *sreloc;
+  const struct elf_backend_data *bed;
+
+  if (info->relocatable)
+    return TRUE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  extsymoff = (elf_bad_symtab (abfd)) ? 0 : symtab_hdr->sh_info;
+
+  name = bfd_get_section_name (abfd, sec);
+
+  if (dynobj == NULL)
+    {
+      sgot = NULL;
+      g = NULL;
+    }
+  else
+    {
+      sgot = score_elf_got_section (dynobj, FALSE);
+      if (sgot == NULL)
+        g = NULL;
+      else
+        {
+          BFD_ASSERT (score_elf_section_data (sgot) != NULL);
+          g = score_elf_section_data (sgot)->u.got_info;
+          BFD_ASSERT (g != NULL);
+        }
+    }
+
+  sreloc = NULL;
+  bed = get_elf_backend_data (abfd);
+  rel_end = relocs + sec->reloc_count * bed->s->int_rels_per_ext_rel;
+  for (rel = relocs; rel < rel_end; ++rel)
+    {
+      unsigned long r_symndx;
+      unsigned int r_type;
+      struct elf_link_hash_entry *h;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      if (r_symndx < extsymoff)
+        {
+          h = NULL;
+        }
+      else if (r_symndx >= extsymoff + NUM_SHDR_ENTRIES (symtab_hdr))
+        {
+          (*_bfd_error_handler) (_("%s: Malformed reloc detected for section %s"), abfd, name);
+          bfd_set_error (bfd_error_bad_value);
+          return FALSE;
+        }
+      else
+        {
+          h = sym_hashes[r_symndx - extsymoff];
+
+          /* This may be an indirect symbol created because of a version.  */
+          if (h != NULL)
+            {
+              while (h->root.type == bfd_link_hash_indirect)
+                h = (struct elf_link_hash_entry *) h->root.u.i.link;
+            }
+        }
+
+      /* Some relocs require a global offset table.  */
+      if (dynobj == NULL || sgot == NULL)
+        {
+          switch (r_type)
+            {
+            case R_SCORE_GOT15:
+            case R_SCORE_CALL15:
+              if (dynobj == NULL)
+                elf_hash_table (info)->dynobj = dynobj = abfd;
+              if (!score_elf_create_got_section (dynobj, info, FALSE))
+                return FALSE;
+              g = score_elf_got_info (dynobj, &sgot);
+              break;
+            case R_SCORE_ABS32:
+            case R_SCORE_REL32:
+              if (dynobj == NULL && (info->shared || h != NULL) && (sec->flags & SEC_ALLOC) != 0)
+                elf_hash_table (info)->dynobj = dynobj = abfd;
+              break;
+            default:
+              break;
+            }
+        }
+
+      if (!h && (r_type == R_SCORE_GOT_LO16))
+        {
+          if (! score_elf_record_local_got_symbol (abfd, r_symndx, rel->r_addend, g))
+            return FALSE;
+        }
+
+      switch (r_type)
+        {
+        case R_SCORE_CALL15:
+          if (h == NULL)
+            {
+              (*_bfd_error_handler)
+                (_("%B: CALL15 reloc at 0x%lx not against global symbol"),
+                 abfd, (unsigned long) rel->r_offset);
+              bfd_set_error (bfd_error_bad_value);
+              return FALSE;
+            }
+          else
+            {
+              /* This symbol requires a global offset table entry.  */
+              if (! score_elf_record_global_got_symbol (h, abfd, info, g))
+                return FALSE;
+
+              /* We need a stub, not a plt entry for the undefined function.  But we record
+                 it as if it needs plt.  See _bfd_elf_adjust_dynamic_symbol.  */
+              h->needs_plt = 1;
+              h->type = STT_FUNC;
+            }
+          break;
+        case R_SCORE_GOT15:
+          if (h && ! score_elf_record_global_got_symbol (h, abfd, info, g))
+            return FALSE;
+          break;
+        case R_SCORE_ABS32:
+        case R_SCORE_REL32:
+          if ((info->shared || h != NULL) && (sec->flags & SEC_ALLOC) != 0)
+            {
+              if (sreloc == NULL)
+                {
+                  sreloc = score_elf_rel_dyn_section (dynobj, TRUE);
+                  if (sreloc == NULL)
+                    return FALSE;
+                }
+#define SCORE_READONLY_SECTION (SEC_ALLOC | SEC_LOAD | SEC_READONLY)
+              if (info->shared)
+                {
+                  /* When creating a shared object, we must copy these reloc types into
+                     the output file as R_SCORE_REL32 relocs.  We make room for this reloc
+                     in the .rel.dyn reloc section.  */
+                  score_elf_allocate_dynamic_relocations (dynobj, 1);
+                  if ((sec->flags & SCORE_READONLY_SECTION)
+                      == SCORE_READONLY_SECTION)
+                    /* We tell the dynamic linker that there are
+                       relocations against the text segment.  */
+                    info->flags |= DF_TEXTREL;
+                }
+              else
+                {
+                  struct score_elf_link_hash_entry *hscore;
+
+                  /* We only need to copy this reloc if the symbol is
+                     defined in a dynamic object.  */
+                  hscore = (struct score_elf_link_hash_entry *) h;
+                  ++hscore->possibly_dynamic_relocs;
+                  if ((sec->flags & SCORE_READONLY_SECTION)
+                      == SCORE_READONLY_SECTION)
+                    /* We need it to tell the dynamic linker if there
+                       are relocations against the text segment.  */
+                    hscore->readonly_reloc = TRUE;
+                }
+
+              /* Even though we don't directly need a GOT entry for this symbol,
+                 a symbol must have a dynamic symbol table index greater that
+                 DT_SCORE_GOTSYM if there are dynamic relocations against it.  */
+              if (h != NULL)
+                {
+                  if (dynobj == NULL)
+                    elf_hash_table (info)->dynobj = dynobj = abfd;
+                  if (! score_elf_create_got_section (dynobj, info, TRUE))
+                    return FALSE;
+                  g = score_elf_got_info (dynobj, &sgot);
+                  if (! score_elf_record_global_got_symbol (h, abfd, info, g))
+                    return FALSE;
+                }
+            }
+          break;
+
+          /* This relocation describes the C++ object vtable hierarchy.
+             Reconstruct it for later use during GC.  */
+        case R_SCORE_GNU_VTINHERIT:
+          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+
+          /* This relocation describes which C++ vtable entries are actually
+             used.  Record for later use during GC.  */
+        case R_SCORE_GNU_VTENTRY:
+          if (!bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+        default:
+          break;
+        }
+
+      /* We must not create a stub for a symbol that has relocations
+         related to taking the function's address.  */
+      switch (r_type)
+        {
+        default:
+          if (h != NULL)
+            {
+              struct score_elf_link_hash_entry *sh;
+
+              sh = (struct score_elf_link_hash_entry *) h;
+              sh->no_fn_stub = TRUE;
+            }
+          break;
+        case R_SCORE_CALL15:
+          break;
+        }
+    }
+
+  return TRUE;
+}
+
+bfd_boolean
+s7_bfd_score_elf_add_symbol_hook (bfd *abfd,
+                                  struct bfd_link_info *info ATTRIBUTE_UNUSED,
+                                  Elf_Internal_Sym *sym,
+                                  const char **namep ATTRIBUTE_UNUSED,
+                                  flagword *flagsp ATTRIBUTE_UNUSED,
+                                  asection **secp,
+                                  bfd_vma *valp)
+{
+  switch (sym->st_shndx)
+    {
+    case SHN_COMMON:
+      if (sym->st_size > elf_gp_size (abfd))
+        break;
+      /* Fall through.  */
+    case SHN_SCORE_SCOMMON:
+      *secp = bfd_make_section_old_way (abfd, ".scommon");
+      (*secp)->flags |= SEC_IS_COMMON;
+      *valp = sym->st_size;
+      break;
+    }
+
+  return TRUE;
+}
+
+void
+s7_bfd_score_elf_symbol_processing (bfd *abfd, asymbol *asym)
+{
+  elf_symbol_type *elfsym;
+
+  elfsym = (elf_symbol_type *) asym;
+  switch (elfsym->internal_elf_sym.st_shndx)
+    {
+    case SHN_COMMON:
+      if (asym->value > elf_gp_size (abfd))
+        break;
+      /* Fall through.  */
+    case SHN_SCORE_SCOMMON:
+      if (score_elf_scom_section.name == NULL)
+        {
+          /* Initialize the small common section.  */
+          score_elf_scom_section.name = ".scommon";
+          score_elf_scom_section.flags = SEC_IS_COMMON;
+          score_elf_scom_section.output_section = &score_elf_scom_section;
+          score_elf_scom_section.symbol = &score_elf_scom_symbol;
+          score_elf_scom_section.symbol_ptr_ptr = &score_elf_scom_symbol_ptr;
+          score_elf_scom_symbol.name = ".scommon";
+          score_elf_scom_symbol.flags = BSF_SECTION_SYM;
+          score_elf_scom_symbol.section = &score_elf_scom_section;
+          score_elf_scom_symbol_ptr = &score_elf_scom_symbol;
+        }
+      asym->section = &score_elf_scom_section;
+      asym->value = elfsym->internal_elf_sym.st_size;
+      break;
+    }
+}
+
+int
+s7_bfd_score_elf_link_output_symbol_hook (struct bfd_link_info *info ATTRIBUTE_UNUSED,
+                                          const char *name ATTRIBUTE_UNUSED,
+                                          Elf_Internal_Sym *sym,
+                                          asection *input_sec,
+                                          struct elf_link_hash_entry *h ATTRIBUTE_UNUSED)
+{
+  /* If we see a common symbol, which implies a relocatable link, then
+     if a symbol was small common in an input file, mark it as small
+     common in the output file.  */
+  if (sym->st_shndx == SHN_COMMON && strcmp (input_sec->name, ".scommon") == 0)
+    sym->st_shndx = SHN_SCORE_SCOMMON;
+
+  return 1;
+}
+
+bfd_boolean
+s7_bfd_score_elf_section_from_bfd_section (bfd *abfd ATTRIBUTE_UNUSED,
+                                         asection *sec,
+                                         int *retval)
+{
+  if (strcmp (bfd_get_section_name (abfd, sec), ".scommon") == 0)
+    {
+      *retval = SHN_SCORE_SCOMMON;
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can understand.  */
+
+bfd_boolean
+s7_bfd_score_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+                                        struct elf_link_hash_entry *h)
+{
+  bfd *dynobj;
+  struct score_elf_link_hash_entry *hscore;
+  asection *s;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (dynobj != NULL
+              && (h->needs_plt
+                  || h->u.weakdef != NULL
+                  || (h->def_dynamic && h->ref_regular && !h->def_regular)));
+
+  /* If this symbol is defined in a dynamic object, we need to copy
+     any R_SCORE_ABS32 or R_SCORE_REL32 relocs against it into the output
+     file.  */
+  hscore = (struct score_elf_link_hash_entry *) h;
+  if (!info->relocatable
+      && hscore->possibly_dynamic_relocs != 0
+      && (h->root.type == bfd_link_hash_defweak || !h->def_regular))
+    {
+      score_elf_allocate_dynamic_relocations (dynobj, hscore->possibly_dynamic_relocs);
+      if (hscore->readonly_reloc)
+        /* We tell the dynamic linker that there are relocations
+           against the text segment.  */
+        info->flags |= DF_TEXTREL;
+    }
+
+  /* For a function, create a stub, if allowed.  */
+  if (!hscore->no_fn_stub && h->needs_plt)
+    {
+      if (!elf_hash_table (info)->dynamic_sections_created)
+        return TRUE;
+
+      /* If this symbol is not defined in a regular file, then set
+         the symbol to the stub location.  This is required to make
+         function pointers compare as equal between the normal
+         executable and the shared library.  */
+      if (!h->def_regular)
+        {
+          /* We need .stub section.  */
+          s = bfd_get_section_by_name (dynobj, SCORE_ELF_STUB_SECTION_NAME);
+          BFD_ASSERT (s != NULL);
+
+          h->root.u.def.section = s;
+          h->root.u.def.value = s->size;
+
+          /* XXX Write this stub address somewhere.  */
+          h->plt.offset = s->size;
+
+          /* Make room for this stub code.  */
+          s->size += SCORE_FUNCTION_STUB_SIZE;
+
+          /* The last half word of the stub will be filled with the index
+             of this symbol in .dynsym section.  */
+          return TRUE;
+        }
+    }
+  else if ((h->type == STT_FUNC) && !h->needs_plt)
+    {
+      /* This will set the entry for this symbol in the GOT to 0, and
+         the dynamic linker will take care of this.  */
+      h->root.u.def.value = 0;
+      return TRUE;
+    }
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+                  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+  return TRUE;
+}
+
+/* This function is called after all the input files have been read,
+   and the input sections have been assigned to output sections.  */
+
+bfd_boolean
+s7_bfd_score_elf_always_size_sections (bfd *output_bfd,
+                                       struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *s;
+  struct score_got_info *g;
+  int i;
+  bfd_size_type loadable_size = 0;
+  bfd_size_type local_gotno;
+  bfd *sub;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  if (dynobj == NULL)
+    /* Relocatable links don't have it.  */
+    return TRUE;
+
+  g = score_elf_got_info (dynobj, &s);
+  if (s == NULL)
+    return TRUE;
+
+  /* Calculate the total loadable size of the output.  That will give us the
+     maximum number of GOT_PAGE entries required.  */
+  for (sub = info->input_bfds; sub; sub = sub->link_next)
+    {
+      asection *subsection;
+
+      for (subsection = sub->sections;
+           subsection;
+           subsection = subsection->next)
+        {
+          if ((subsection->flags & SEC_ALLOC) == 0)
+            continue;
+          loadable_size += ((subsection->size + 0xf)
+                            &~ (bfd_size_type) 0xf);
+        }
+    }
+
+  /* There has to be a global GOT entry for every symbol with
+     a dynamic symbol table index of DT_SCORE_GOTSYM or
+     higher.  Therefore, it make sense to put those symbols
+     that need GOT entries at the end of the symbol table.  We
+     do that here.  */
+  if (! score_elf_sort_hash_table (info, 1))
+    return FALSE;
+
+  if (g->global_gotsym != NULL)
+    i = elf_hash_table (info)->dynsymcount - g->global_gotsym->dynindx;
+  else
+    /* If there are no global symbols, or none requiring
+       relocations, then GLOBAL_GOTSYM will be NULL.  */
+    i = 0;
+
+  /* In the worst case, we'll get one stub per dynamic symbol.  */
+  loadable_size += SCORE_FUNCTION_STUB_SIZE * i;
+
+  /* Assume there are two loadable segments consisting of
+     contiguous sections.  Is 5 enough?  */
+  local_gotno = (loadable_size >> 16) + 5;
+
+  g->local_gotno += local_gotno;
+  s->size += g->local_gotno * SCORE_ELF_GOT_SIZE (output_bfd);
+
+  g->global_gotno = i;
+  s->size += i * SCORE_ELF_GOT_SIZE (output_bfd);
+
+  score_elf_resolve_final_got_entries (g);
+
+  if (s->size > SCORE_ELF_GOT_MAX_SIZE (output_bfd))
+    {
+      /* Fixme. Error message or Warning message should be issued here.  */
+    }
+
+  return TRUE;
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+bfd_boolean
+s7_bfd_score_elf_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *s;
+  bfd_boolean reltext;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (!info->shared)
+        {
+          s = bfd_get_section_by_name (dynobj, ".interp");
+          BFD_ASSERT (s != NULL);
+          s->size = strlen (ELF_DYNAMIC_INTERPRETER) + 1;
+          s->contents = (bfd_byte *) ELF_DYNAMIC_INTERPRETER;
+        }
+    }
+
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  reltext = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      const char *name;
+
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+        continue;
+
+      /* It's OK to base decisions on the section name, because none
+         of the dynobj section names depend upon the input files.  */
+      name = bfd_get_section_name (dynobj, s);
+
+      if (CONST_STRNEQ (name, ".rel"))
+        {
+          if (s->size == 0)
+            {
+              /* We only strip the section if the output section name
+                 has the same name.  Otherwise, there might be several
+                 input sections for this output section.  FIXME: This
+                 code is probably not needed these days anyhow, since
+                 the linker now does not create empty output sections.  */
+              if (s->output_section != NULL
+                  && strcmp (name,
+                             bfd_get_section_name (s->output_section->owner,
+                                                   s->output_section)) == 0)
+                s->flags |= SEC_EXCLUDE;
+            }
+          else
+            {
+              const char *outname;
+              asection *target;
+
+              /* If this relocation section applies to a read only
+                 section, then we probably need a DT_TEXTREL entry.
+                 If the relocation section is .rel.dyn, we always
+                 assert a DT_TEXTREL entry rather than testing whether
+                 there exists a relocation to a read only section or
+                 not.  */
+              outname = bfd_get_section_name (output_bfd, s->output_section);
+              target = bfd_get_section_by_name (output_bfd, outname + 4);
+              if ((target != NULL
+                   && (target->flags & SEC_READONLY) != 0
+                   && (target->flags & SEC_ALLOC) != 0) || strcmp (outname, ".rel.dyn") == 0)
+                reltext = TRUE;
+
+              /* We use the reloc_count field as a counter if we need
+                 to copy relocs into the output file.  */
+              if (strcmp (name, ".rel.dyn") != 0)
+                s->reloc_count = 0;
+            }
+        }
+      else if (CONST_STRNEQ (name, ".got"))
+        {
+          /* s7_bfd_score_elf_always_size_sections() has already done
+             most of the work, but some symbols may have been mapped
+             to versions that we must now resolve in the got_entries
+             hash tables.  */
+        }
+      else if (strcmp (name, SCORE_ELF_STUB_SECTION_NAME) == 0)
+        {
+          /* IRIX rld assumes that the function stub isn't at the end
+             of .text section. So put a dummy. XXX  */
+          s->size += SCORE_FUNCTION_STUB_SIZE;
+        }
+      else if (! CONST_STRNEQ (name, ".init"))
+        {
+          /* It's not one of our sections, so don't allocate space.  */
+          continue;
+        }
+
+      /* Allocate memory for the section contents.  */
+      s->contents = bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL && s->size != 0)
+        {
+          bfd_set_error (bfd_error_no_memory);
+          return FALSE;
+        }
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+         values later, in s7_bfd_score_elf_finish_dynamic_sections, but we
+         must add the entries now so that we get the correct size for
+         the .dynamic section.  The DT_DEBUG entry is filled in by the
+         dynamic linker and used by the debugger.  */
+
+      if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_DEBUG, 0))
+        return FALSE;
+
+      if (reltext)
+        info->flags |= DF_TEXTREL;
+
+      if ((info->flags & DF_TEXTREL) != 0)
+        {
+          if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_TEXTREL, 0))
+            return FALSE;
+        }
+
+      if (! SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_PLTGOT, 0))
+        return FALSE;
+
+      if (score_elf_rel_dyn_section (dynobj, FALSE))
+        {
+          if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_REL, 0))
+            return FALSE;
+
+          if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_RELSZ, 0))
+            return FALSE;
+
+          if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_RELENT, 0))
+            return FALSE;
+        }
+
+      if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_SCORE_BASE_ADDRESS, 0))
+        return FALSE;
+
+      if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_SCORE_LOCAL_GOTNO, 0))
+        return FALSE;
+
+      if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_SCORE_SYMTABNO, 0))
+        return FALSE;
+
+      if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_SCORE_UNREFEXTNO, 0))
+        return FALSE;
+
+      if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_SCORE_GOTSYM, 0))
+        return FALSE;
+
+      if (!SCORE_ELF_ADD_DYNAMIC_ENTRY (info, DT_SCORE_HIPAGENO, 0))
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+bfd_boolean
+s7_bfd_score_elf_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  struct elf_link_hash_entry *h;
+  struct bfd_link_hash_entry *bh;
+  flagword flags;
+  asection *s;
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+           | SEC_LINKER_CREATED | SEC_READONLY);
+
+  /* ABI requests the .dynamic section to be read only.  */
+  s = bfd_get_section_by_name (abfd, ".dynamic");
+  if (s != NULL)
+    {
+      if (!bfd_set_section_flags (abfd, s, flags))
+        return FALSE;
+    }
+
+  /* We need to create .got section.  */
+  if (!score_elf_create_got_section (abfd, info, FALSE))
+    return FALSE;
+
+  if (!score_elf_rel_dyn_section (elf_hash_table (info)->dynobj, TRUE))
+    return FALSE;
+
+  /* Create .stub section.  */
+  if (bfd_get_section_by_name (abfd, SCORE_ELF_STUB_SECTION_NAME) == NULL)
+    {
+      s = bfd_make_section_with_flags (abfd, SCORE_ELF_STUB_SECTION_NAME,
+                                       flags | SEC_CODE);
+      if (s == NULL
+          || !bfd_set_section_alignment (abfd, s, 2))
+
+        return FALSE;
+    }
+
+  if (!info->shared)
+    {
+      const char *name;
+
+      name = "_DYNAMIC_LINK";
+      bh = NULL;
+      if (!(_bfd_generic_link_add_one_symbol
+            (info, abfd, name, BSF_GLOBAL, bfd_abs_section_ptr,
+             (bfd_vma) 0, NULL, FALSE, get_elf_backend_data (abfd)->collect, &bh)))
+        return FALSE;
+
+      h = (struct elf_link_hash_entry *) bh;
+      h->non_elf = 0;
+      h->def_regular = 1;
+      h->type = STT_SECTION;
+
+      if (!bfd_elf_link_record_dynamic_symbol (info, h))
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+bfd_boolean
+s7_bfd_score_elf_finish_dynamic_symbol (bfd *output_bfd,
+                                        struct bfd_link_info *info,
+                                        struct elf_link_hash_entry *h,
+                                        Elf_Internal_Sym *sym)
+{
+  bfd *dynobj;
+  asection *sgot;
+  struct score_got_info *g;
+  const char *name;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  if (h->plt.offset != MINUS_ONE)
+    {
+      asection *s;
+      bfd_byte stub[SCORE_FUNCTION_STUB_SIZE];
+
+      /* This symbol has a stub.  Set it up.  */
+      BFD_ASSERT (h->dynindx != -1);
+
+      s = bfd_get_section_by_name (dynobj, SCORE_ELF_STUB_SECTION_NAME);
+      BFD_ASSERT (s != NULL);
+
+      /* FIXME: Can h->dynindex be more than 64K?  */
+      if (h->dynindx & 0xffff0000)
+        return FALSE;
+
+      /* Fill the stub.  */
+      bfd_put_32 (output_bfd, STUB_LW, stub);
+      bfd_put_32 (output_bfd, STUB_MOVE, stub + 4);
+      bfd_put_32 (output_bfd, STUB_LI16 | (h->dynindx << 1), stub + 8);
+      bfd_put_32 (output_bfd, STUB_BRL, stub + 12);
+
+      BFD_ASSERT (h->plt.offset <= s->size);
+      memcpy (s->contents + h->plt.offset, stub, SCORE_FUNCTION_STUB_SIZE);
+
+      /* Mark the symbol as undefined.  plt.offset != -1 occurs
+         only for the referenced symbol.  */
+      sym->st_shndx = SHN_UNDEF;
+
+      /* The run-time linker uses the st_value field of the symbol
+          to reset the global offset table entry for this external
+          to its stub address when unlinking a shared object.  */
+      sym->st_value = (s->output_section->vma + s->output_offset + h->plt.offset);
+    }
+
+  BFD_ASSERT (h->dynindx != -1 || h->forced_local);
+
+  sgot = score_elf_got_section (dynobj, FALSE);
+  BFD_ASSERT (sgot != NULL);
+  BFD_ASSERT (score_elf_section_data (sgot) != NULL);
+  g = score_elf_section_data (sgot)->u.got_info;
+  BFD_ASSERT (g != NULL);
+
+  /* Run through the global symbol table, creating GOT entries for all
+     the symbols that need them.  */
+  if (g->global_gotsym != NULL && h->dynindx >= g->global_gotsym->dynindx)
+    {
+      bfd_vma offset;
+      bfd_vma value;
+
+      value = sym->st_value;
+      offset = score_elf_global_got_index (dynobj, h);
+      bfd_put_32 (output_bfd, value, sgot->contents + offset);
+    }
+
+  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
+  name = h->root.root.string;
+  if (strcmp (name, "_DYNAMIC") == 0 || strcmp (name, "_GLOBAL_OFFSET_TABLE_") == 0)
+    sym->st_shndx = SHN_ABS;
+  else if (strcmp (name, "_DYNAMIC_LINK") == 0)
+    {
+      sym->st_shndx = SHN_ABS;
+      sym->st_info = ELF_ST_INFO (STB_GLOBAL, STT_SECTION);
+      sym->st_value = 1;
+    }
+  else if (strcmp (name, GP_DISP_LABEL) == 0)
+    {
+      sym->st_shndx = SHN_ABS;
+      sym->st_info = ELF_ST_INFO (STB_GLOBAL, STT_SECTION);
+      sym->st_value = elf_gp (output_bfd);
+    }
+
+  return TRUE;
+}
+
+/* Finish up the dynamic sections.  */
+
+bfd_boolean
+s7_bfd_score_elf_finish_dynamic_sections (bfd *output_bfd,
+                                          struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *sdyn;
+  asection *sgot;
+  asection *s;
+  struct score_got_info *g;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  sgot = score_elf_got_section (dynobj, FALSE);
+  if (sgot == NULL)
+    g = NULL;
+  else
+    {
+      BFD_ASSERT (score_elf_section_data (sgot) != NULL);
+      g = score_elf_section_data (sgot)->u.got_info;
+      BFD_ASSERT (g != NULL);
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      bfd_byte *b;
+
+      BFD_ASSERT (sdyn != NULL);
+      BFD_ASSERT (g != NULL);
+
+      for (b = sdyn->contents;
+           b < sdyn->contents + sdyn->size;
+           b += SCORE_ELF_DYN_SIZE (dynobj))
+        {
+          Elf_Internal_Dyn dyn;
+          const char *name;
+          size_t elemsize;
+          bfd_boolean swap_out_p;
+
+          /* Read in the current dynamic entry.  */
+          (*get_elf_backend_data (dynobj)->s->swap_dyn_in) (dynobj, b, &dyn);
+
+          /* Assume that we're going to modify it and write it out.  */
+          swap_out_p = TRUE;
+
+          switch (dyn.d_tag)
+            {
+            case DT_RELENT:
+              s = score_elf_rel_dyn_section (dynobj, FALSE);
+              BFD_ASSERT (s != NULL);
+              dyn.d_un.d_val = SCORE_ELF_REL_SIZE (dynobj);
+              break;
+
+            case DT_STRSZ:
+              /* Rewrite DT_STRSZ.  */
+              dyn.d_un.d_val = _bfd_elf_strtab_size (elf_hash_table (info)->dynstr);
+                    break;
+
+            case DT_PLTGOT:
+              name = ".got";
+              s = bfd_get_section_by_name (output_bfd, name);
+              BFD_ASSERT (s != NULL);
+              dyn.d_un.d_ptr = s->vma;
+              break;
+
+            case DT_SCORE_BASE_ADDRESS:
+              s = output_bfd->sections;
+              BFD_ASSERT (s != NULL);
+              dyn.d_un.d_ptr = s->vma & ~(bfd_vma) 0xffff;
+              break;
+
+            case DT_SCORE_LOCAL_GOTNO:
+              dyn.d_un.d_val = g->local_gotno;
+              break;
+
+            case DT_SCORE_UNREFEXTNO:
+              /* The index into the dynamic symbol table which is the
+                 entry of the first external symbol that is not
+                 referenced within the same object.  */
+              dyn.d_un.d_val = bfd_count_sections (output_bfd) + 1;
+              break;
+
+            case DT_SCORE_GOTSYM:
+              if (g->global_gotsym)
+                {
+                  dyn.d_un.d_val = g->global_gotsym->dynindx;
+                  break;
+                }
+              /* In case if we don't have global got symbols we default
+                  to setting DT_SCORE_GOTSYM to the same value as
+                  DT_SCORE_SYMTABNO, so we just fall through.  */
+
+            case DT_SCORE_SYMTABNO:
+              name = ".dynsym";
+              elemsize = SCORE_ELF_SYM_SIZE (output_bfd);
+              s = bfd_get_section_by_name (output_bfd, name);
+              BFD_ASSERT (s != NULL);
+
+              dyn.d_un.d_val = s->size / elemsize;
+              break;
+
+            case DT_SCORE_HIPAGENO:
+              dyn.d_un.d_val = g->local_gotno - SCORE_RESERVED_GOTNO;
+              break;
+
+            default:
+              swap_out_p = FALSE;
+              break;
+            }
+
+          if (swap_out_p)
+            (*get_elf_backend_data (dynobj)->s->swap_dyn_out) (dynobj, &dyn, b);
+        }
+    }
+
+  /* The first entry of the global offset table will be filled at
+     runtime. The second entry will be used by some runtime loaders.
+     This isn't the case of IRIX rld.  */
+  if (sgot != NULL && sgot->size > 0)
+    {
+      bfd_put_32 (output_bfd, 0, sgot->contents);
+      bfd_put_32 (output_bfd, 0x80000000, sgot->contents + SCORE_ELF_GOT_SIZE (output_bfd));
+    }
+
+  if (sgot != NULL)
+    elf_section_data (sgot->output_section)->this_hdr.sh_entsize
+      = SCORE_ELF_GOT_SIZE (output_bfd);
+
+
+  /* We need to sort the entries of the dynamic relocation section.  */
+  s = score_elf_rel_dyn_section (dynobj, FALSE);
+
+  if (s != NULL && s->size > (bfd_vma)2 * SCORE_ELF_REL_SIZE (output_bfd))
+    {
+      reldyn_sorting_bfd = output_bfd;
+      qsort ((Elf32_External_Rel *) s->contents + 1, s->reloc_count - 1,
+             sizeof (Elf32_External_Rel), score_elf_sort_dynamic_relocs);
+    }
+
+  return TRUE;
+}
+
+/* This function set up the ELF section header for a BFD section in preparation for writing
+   it out.  This is where the flags and type fields are set for unusual sections.  */
+
+bfd_boolean
+s7_bfd_score_elf_fake_sections (bfd *abfd ATTRIBUTE_UNUSED,
+                                Elf_Internal_Shdr *hdr,
+                                asection *sec)
+{
+  const char *name;
+
+  name = bfd_get_section_name (abfd, sec);
+
+  if (strcmp (name, ".got") == 0
+      || strcmp (name, ".srdata") == 0
+      || strcmp (name, ".sdata") == 0
+      || strcmp (name, ".sbss") == 0)
+    hdr->sh_flags |= SHF_SCORE_GPREL;
+
+  return TRUE;
+}
+
+/* This function do additional processing on the ELF section header before writing
+   it out.  This is used to set the flags and type fields for some sections.  */
+
+/* assign_file_positions_except_relocs() check section flag and if it is allocatable,
+   warning message will be issued.  backend_fake_section is called before
+   assign_file_positions_except_relocs(); backend_section_processing after it.  so, we
+   modify section flag there, but not backend_fake_section.  */
+
+bfd_boolean
+s7_bfd_score_elf_section_processing (bfd *abfd ATTRIBUTE_UNUSED, Elf_Internal_Shdr *hdr)
+{
+  if (hdr->bfd_section != NULL)
+    {
+      const char *name = bfd_get_section_name (abfd, hdr->bfd_section);
+
+      if (strcmp (name, ".sdata") == 0)
+        {
+          hdr->sh_flags |= SHF_ALLOC | SHF_WRITE | SHF_SCORE_GPREL;
+          hdr->sh_type = SHT_PROGBITS;
+        }
+      else if (strcmp (name, ".sbss") == 0)
+        {
+          hdr->sh_flags |= SHF_ALLOC | SHF_WRITE | SHF_SCORE_GPREL;
+          hdr->sh_type = SHT_NOBITS;
+        }
+      else if (strcmp (name, ".srdata") == 0)
+        {
+          hdr->sh_flags |= SHF_ALLOC | SHF_SCORE_GPREL;
+          hdr->sh_type = SHT_PROGBITS;
+        }
+    }
+
+  return TRUE;
+}
+
+bfd_boolean
+s7_bfd_score_elf_write_section (bfd *output_bfd, asection *sec, bfd_byte *contents)
+{
+  bfd_byte *to, *from, *end;
+  int i;
+
+  if (strcmp (sec->name, ".pdr") != 0)
+    return FALSE;
+
+  if (score_elf_section_data (sec)->u.tdata == NULL)
+    return FALSE;
+
+  to = contents;
+  end = contents + sec->size;
+  for (from = contents, i = 0; from < end; from += PDR_SIZE, i++)
+    {
+      if ((score_elf_section_data (sec)->u.tdata)[i] == 1)
+        continue;
+
+      if (to != from)
+        memcpy (to, from, PDR_SIZE);
+
+      to += PDR_SIZE;
+    }
+  bfd_set_section_contents (output_bfd, sec->output_section, contents,
+                            (file_ptr) sec->output_offset, sec->size);
+
+  return TRUE;
+}
+
+/* Copy data from a SCORE ELF indirect symbol to its direct symbol, hiding the old
+   indirect symbol.  Process additional relocation information.  */
+
+void
+s7_bfd_score_elf_copy_indirect_symbol (struct bfd_link_info *info,
+                                       struct elf_link_hash_entry *dir,
+                                       struct elf_link_hash_entry *ind)
+{
+  struct score_elf_link_hash_entry *dirscore, *indscore;
+
+  _bfd_elf_link_hash_copy_indirect (info, dir, ind);
+
+  if (ind->root.type != bfd_link_hash_indirect)
+    return;
+
+  dirscore = (struct score_elf_link_hash_entry *) dir;
+  indscore = (struct score_elf_link_hash_entry *) ind;
+  dirscore->possibly_dynamic_relocs += indscore->possibly_dynamic_relocs;
+
+  if (indscore->readonly_reloc)
+    dirscore->readonly_reloc = TRUE;
+
+  if (indscore->no_fn_stub)
+    dirscore->no_fn_stub = TRUE;
+}
+
+/* Remove information about discarded functions from other sections which mention them.  */
+
+bfd_boolean
+s7_bfd_score_elf_discard_info (bfd *abfd,
+                               struct elf_reloc_cookie *cookie,
+                               struct bfd_link_info *info)
+{
+  asection *o;
+  bfd_boolean ret = FALSE;
+  unsigned char *tdata;
+  size_t i, skip;
+
+  o = bfd_get_section_by_name (abfd, ".pdr");
+  if ((!o) || (o->size == 0) || (o->size % PDR_SIZE != 0)
+      || (o->output_section != NULL && bfd_is_abs_section (o->output_section)))
+    return FALSE;
+
+  tdata = bfd_zmalloc (o->size / PDR_SIZE);
+  if (!tdata)
+    return FALSE;
+
+  cookie->rels = _bfd_elf_link_read_relocs (abfd, o, NULL, NULL, info->keep_memory);
+  if (!cookie->rels)
+    {
+      free (tdata);
+      return FALSE;
+    }
+
+  cookie->rel = cookie->rels;
+  cookie->relend = cookie->rels + o->reloc_count;
+
+  for (i = 0, skip = 0; i < o->size; i++)
+    {
+      if (bfd_elf_reloc_symbol_deleted_p (i * PDR_SIZE, cookie))
+        {
+          tdata[i] = 1;
+          skip++;
+        }
+    }
+
+  if (skip != 0)
+    {
+      score_elf_section_data (o)->u.tdata = tdata;
+      o->size -= skip * PDR_SIZE;
+      ret = TRUE;
+    }
+  else
+    free (tdata);
+
+  if (!info->keep_memory)
+    free (cookie->rels);
+
+  return ret;
+}
+
+/* Signal that discard_info() has removed the discarded relocations for this section.  */
+
+bfd_boolean
+s7_bfd_score_elf_ignore_discarded_relocs (asection *sec)
+{
+  if (strcmp (sec->name, ".pdr") == 0)
+    return TRUE;
+  return FALSE;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+asection *
+s7_bfd_score_elf_gc_mark_hook (asection *sec,
+                               struct bfd_link_info *info,
+                               Elf_Internal_Rela *rel,
+                               struct elf_link_hash_entry *h,
+                               Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_SCORE_GNU_VTINHERIT:
+      case R_SCORE_GNU_VTENTRY:
+        return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Support for core dump NOTE sections.  */
+
+bfd_boolean
+s7_bfd_score_elf_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  int offset;
+  unsigned int raw_size;
+
+  switch (note->descsz)
+    {
+    default:
+      return FALSE;
+    case 272:                  /* Linux/Score elf_prstatus */
+
+      /* pr_cursig */
+      elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12);
+
+      /* pr_pid */
+      elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 24);
+
+      /* pr_reg */
+      offset = 72;
+
+      /* sizeof(elf_gregset_t) */
+      raw_size = 196;
+
+      break;
+    }
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg", raw_size, note->descpos + offset);
+}
+
+bfd_boolean
+s7_bfd_score_elf_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  switch (note->descsz)
+    {
+    default:
+      return FALSE;
+
+    case 128:                  /* Linux/Score elf_prpsinfo.  */
+      /* pr_fname */
+      elf_tdata (abfd)->core_program = _bfd_elfcore_strndup (abfd, note->descdata + 32, 16);
+
+      /* pr_psargs */
+      elf_tdata (abfd)->core_command = _bfd_elfcore_strndup (abfd, note->descdata + 48, 80);
+      break;
+    }
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+
+  {
+    char *command = elf_tdata (abfd)->core_command;
+    int n = strlen (command);
+
+    if (0 < n && command[n - 1] == ' ')
+      command[n - 1] = '\0';
+  }
+
+  return TRUE;
+}
+
+
+/* Score BFD functions.  */
+
+reloc_howto_type *
+s7_elf32_score_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0; i < ARRAY_SIZE (elf32_score_reloc_map); i++)
+    if (elf32_score_reloc_map[i].bfd_reloc_val == code)
+      return &elf32_score_howto_table[elf32_score_reloc_map[i].elf_reloc_val];
+
+  return NULL;
+}
+
+bfd_boolean
+s7_elf32_score_print_private_bfd_data (bfd *abfd, void * ptr)
+{
+  FILE *file = (FILE *) ptr;
+
+  BFD_ASSERT (abfd != NULL && ptr != NULL);
+
+  /* Print normal ELF private data.  */
+  _bfd_elf_print_private_bfd_data (abfd, ptr);
+
+  /* xgettext:c-format */
+  fprintf (file, _("private flags = %lx:"), elf_elfheader (abfd)->e_flags);
+  if (elf_elfheader (abfd)->e_flags & EF_SCORE_PIC)
+    {
+      fprintf (file, _(" [pic]"));
+    }
+  if (elf_elfheader (abfd)->e_flags & EF_SCORE_FIXDEP)
+    {
+      fprintf (file, _(" [fix dep]"));
+    }
+  fputc ('\n', file);
+
+  return TRUE;
+}
+
+bfd_boolean
+s7_elf32_score_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  flagword in_flags;
+  flagword out_flags;
+
+  if (!_bfd_generic_verify_endian_match (ibfd, obfd))
+    return FALSE;
+
+  in_flags  = elf_elfheader (ibfd)->e_flags;
+  out_flags = elf_elfheader (obfd)->e_flags;
+
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  in_flags = elf_elfheader (ibfd)->e_flags;
+  out_flags = elf_elfheader (obfd)->e_flags;
+
+  if (! elf_flags_init (obfd))
+    {
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = in_flags;
+
+      if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
+          && bfd_get_arch_info (obfd)->the_default)
+        {
+          return bfd_set_arch_mach (obfd, bfd_get_arch (ibfd), bfd_get_mach (ibfd));
+        }
+
+      return TRUE;
+    }
+
+  if (((in_flags & EF_SCORE_PIC) != 0) != ((out_flags & EF_SCORE_PIC) != 0))
+    {
+      (*_bfd_error_handler) (_("%B: warning: linking PIC files with non-PIC files"), ibfd);
+    }
+
+  /* Maybe dependency fix compatibility should be checked here.  */
+  return TRUE;
+}
+
+bfd_boolean
+s7_elf32_score_new_section_hook (bfd *abfd, asection *sec)
+{
+  struct _score_elf_section_data *sdata;
+  bfd_size_type amt = sizeof (*sdata);
+
+  sdata = bfd_zalloc (abfd, amt);
+  if (sdata == NULL)
+    return FALSE;
+  sec->used_by_bfd = sdata;
+
+  return _bfd_elf_new_section_hook (abfd, sec);
+}
+
+#define elf_backend_omit_section_dynsym \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-sh-relocs.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-sh-relocs.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-sh-relocs.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-sh-relocs.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1880 @@
+/* Copyright 2006, 2007, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* No relocation.  */
+  HOWTO (R_SH_NONE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 sh_elf_ignore_reloc,	/* special_function */
+	 "R_SH_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit absolute relocation.  Setting partial_inplace to TRUE and
+     src_mask to a non-zero value is similar to the COFF toolchain.  */
+  HOWTO (R_SH_DIR32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 SH_ELF_RELOC,		/* special_function */
+	 "R_SH_DIR32",		/* name */
+	 SH_PARTIAL32,		/* partial_inplace */
+	 SH_SRC_MASK32,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit PC relative relocation.  */
+  HOWTO (R_SH_REL32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 sh_elf_ignore_reloc,	/* special_function */
+	 "R_SH_REL32",		/* name */
+	 SH_PARTIAL32,		/* partial_inplace */
+	 SH_SRC_MASK32,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 8 bit PC relative branch divided by 2.  */
+  HOWTO (R_SH_DIR8WPN,		/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 sh_elf_ignore_reloc,	/* special_function */
+	 "R_SH_DIR8WPN",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xff,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 12 bit PC relative branch divided by 2.  */
+  /* This cannot be partial_inplace because relaxation can't know the
+     eventual value of a symbol.  */
+  HOWTO (R_SH_IND12W,		/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_SH_IND12W",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xfff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 8 bit unsigned PC relative divided by 4.  */
+  HOWTO (R_SH_DIR8WPL,		/* type */
+	 2,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_elf_ignore_reloc,	/* special_function */
+	 "R_SH_DIR8WPL",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xff,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 8 bit unsigned PC relative divided by 2.  */
+  HOWTO (R_SH_DIR8WPZ,		/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_elf_ignore_reloc,	/* special_function */
+	 "R_SH_DIR8WPZ",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xff,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 8 bit GBR relative.  FIXME: This only makes sense if we have some
+     special symbol for the GBR relative area, and that is not
+     implemented.  */
+  HOWTO (R_SH_DIR8BP,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_elf_ignore_reloc,	/* special_function */
+	 "R_SH_DIR8BP",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 8 bit GBR relative divided by 2.  FIXME: This only makes sense if
+     we have some special symbol for the GBR relative area, and that
+     is not implemented.  */
+  HOWTO (R_SH_DIR8W,		/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_elf_ignore_reloc,	/* special_function */
+	 "R_SH_DIR8W",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 8 bit GBR relative divided by 4.  FIXME: This only makes sense if
+     we have some special symbol for the GBR relative area, and that
+     is not implemented.  */
+  HOWTO (R_SH_DIR8L,		/* type */
+	 2,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_elf_ignore_reloc,	/* special_function */
+	 "R_SH_DIR8L",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 8 bit PC relative divided by 2 - but specified in a very odd way.  */
+  HOWTO (R_SH_LOOP_START,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 sh_elf_ignore_reloc,	/* special_function */
+	 "R_SH_LOOP_START",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xff,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 8 bit PC relative divided by 2 - but specified in a very odd way.  */
+  HOWTO (R_SH_LOOP_END,		/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 sh_elf_ignore_reloc,	/* special_function */
+	 "R_SH_LOOP_END",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xff,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  EMPTY_HOWTO (12),
+  EMPTY_HOWTO (13),
+  EMPTY_HOWTO (14),
+  EMPTY_HOWTO (15),
+  EMPTY_HOWTO (16),
+  EMPTY_HOWTO (17),
+  EMPTY_HOWTO (18),
+  EMPTY_HOWTO (19),
+  EMPTY_HOWTO (20),
+  EMPTY_HOWTO (21),
+
+  /* The remaining relocs are a GNU extension used for relaxing.  The
+     final pass of the linker never needs to do anything with any of
+     these relocs.  Any required operations are handled by the
+     relaxation code.  */
+
+  /* GNU extension to record C++ vtable hierarchy */
+  HOWTO (R_SH_GNU_VTINHERIT, /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_SH_GNU_VTINHERIT", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage */
+  HOWTO (R_SH_GNU_VTENTRY,     /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_elf_rel_vtable_reloc_fn,	/* special_function */
+	 "R_SH_GNU_VTENTRY",   /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An 8 bit switch table entry.  This is generated for an expression
+     such as ``.word L1 - L2''.  The offset holds the difference
+     between the reloc address and L2.  */
+  HOWTO (R_SH_SWITCH8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_elf_ignore_reloc,	/* special_function */
+	 "R_SH_SWITCH8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 16 bit switch table entry.  This is generated for an expression
+     such as ``.word L1 - L2''.  The offset holds the difference
+     between the reloc address and L2.  */
+  HOWTO (R_SH_SWITCH16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_elf_ignore_reloc,	/* special_function */
+	 "R_SH_SWITCH16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 32 bit switch table entry.  This is generated for an expression
+     such as ``.long L1 - L2''.  The offset holds the difference
+     between the reloc address and L2.  */
+  HOWTO (R_SH_SWITCH32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_elf_ignore_reloc,	/* special_function */
+	 "R_SH_SWITCH32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Indicates a .uses pseudo-op.  The compiler will generate .uses
+     pseudo-ops when it finds a function call which can be relaxed.
+     The offset field holds the PC relative offset to the instruction
+     which loads the register used in the function call.  */
+  HOWTO (R_SH_USES,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_elf_ignore_reloc,	/* special_function */
+	 "R_SH_USES",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* The assembler will generate this reloc for addresses referred to
+     by the register loads associated with USES relocs.  The offset
+     field holds the number of times the address is referenced in the
+     object file.  */
+  HOWTO (R_SH_COUNT,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_elf_ignore_reloc,	/* special_function */
+	 "R_SH_COUNT",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Indicates an alignment statement.  The offset field is the power
+     of 2 to which subsequent portions of the object file must be
+     aligned.  */
+  HOWTO (R_SH_ALIGN,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_elf_ignore_reloc,	/* special_function */
+	 "R_SH_ALIGN",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* The assembler will generate this reloc before a block of
+     instructions.  A section should be processed as assuming it
+     contains data, unless this reloc is seen.  */
+  HOWTO (R_SH_CODE,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_elf_ignore_reloc,	/* special_function */
+	 "R_SH_CODE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* The assembler will generate this reloc after a block of
+     instructions when it sees data that is not instructions.  */
+  HOWTO (R_SH_DATA,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_elf_ignore_reloc,	/* special_function */
+	 "R_SH_DATA",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* The assembler generates this reloc for each label within a block
+     of instructions.  This permits the linker to avoid swapping
+     instructions which are the targets of branches.  */
+  HOWTO (R_SH_LABEL,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_elf_ignore_reloc,	/* special_function */
+	 "R_SH_LABEL",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* The next 12 are only supported via linking in SHC-generated objects.  */
+  HOWTO (R_SH_DIR16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_DIR8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR8",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_DIR8UL,		/* type */
+	 2,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR8UL",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_DIR8UW,		/* type */
+	 1,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR8UW",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_DIR8U,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR8U",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_DIR8SW,		/* type */
+	 1,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR8SW",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_DIR8S,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR8S",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_DIR4UL,		/* type */
+	 2,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 4,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR4UL",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0f,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_DIR4UW,		/* type */
+	 1,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 4,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR4UW",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0f,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_DIR4U,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 4,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR4U",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0f,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_PSHA,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 7,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 4,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_PSHA",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0f,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_PSHL,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 7,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 4,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_PSHL",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0f,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+#ifdef INCLUDE_SHMEDIA
+  /* Used in SHLLI.L and SHLRI.L.  */
+  HOWTO (R_SH_DIR5U,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 5,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR5U",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in SHARI, SHLLI et al.  */
+  HOWTO (R_SH_DIR6U,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 6,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR6U",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in BxxI, LDHI.L et al.  */
+  HOWTO (R_SH_DIR6S,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 6,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR6S",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in ADDI, ANDI et al.  */
+  HOWTO (R_SH_DIR10S,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 10,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR10S",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in LD.UW, ST.W et al.	 */
+  HOWTO (R_SH_DIR10SW,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 11,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR10SW",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in LD.L, FLD.S et al.	 */
+  HOWTO (R_SH_DIR10SL,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR10SL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in FLD.D, FST.P et al.  */
+  HOWTO (R_SH_DIR10SQ,	/* type */
+	 3,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 13,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR10SQ",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+#else
+  EMPTY_HOWTO (45),
+  EMPTY_HOWTO (46),
+  EMPTY_HOWTO (47),
+  EMPTY_HOWTO (48),
+  EMPTY_HOWTO (49),
+  EMPTY_HOWTO (50),
+  EMPTY_HOWTO (51),
+#endif
+
+  EMPTY_HOWTO (52),
+
+  HOWTO (R_SH_DIR16S,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR16S",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (54),
+  EMPTY_HOWTO (55),
+  EMPTY_HOWTO (56),
+  EMPTY_HOWTO (57),
+  EMPTY_HOWTO (58),
+  EMPTY_HOWTO (59),
+  EMPTY_HOWTO (60),
+  EMPTY_HOWTO (61),
+  EMPTY_HOWTO (62),
+  EMPTY_HOWTO (63),
+  EMPTY_HOWTO (64),
+  EMPTY_HOWTO (65),
+  EMPTY_HOWTO (66),
+  EMPTY_HOWTO (67),
+  EMPTY_HOWTO (68),
+  EMPTY_HOWTO (69),
+  EMPTY_HOWTO (70),
+  EMPTY_HOWTO (71),
+  EMPTY_HOWTO (72),
+  EMPTY_HOWTO (73),
+  EMPTY_HOWTO (74),
+  EMPTY_HOWTO (75),
+  EMPTY_HOWTO (76),
+  EMPTY_HOWTO (77),
+  EMPTY_HOWTO (78),
+  EMPTY_HOWTO (79),
+  EMPTY_HOWTO (80),
+  EMPTY_HOWTO (81),
+  EMPTY_HOWTO (82),
+  EMPTY_HOWTO (83),
+  EMPTY_HOWTO (84),
+  EMPTY_HOWTO (85),
+  EMPTY_HOWTO (86),
+  EMPTY_HOWTO (87),
+  EMPTY_HOWTO (88),
+  EMPTY_HOWTO (89),
+  EMPTY_HOWTO (90),
+  EMPTY_HOWTO (91),
+  EMPTY_HOWTO (92),
+  EMPTY_HOWTO (93),
+  EMPTY_HOWTO (94),
+  EMPTY_HOWTO (95),
+  EMPTY_HOWTO (96),
+  EMPTY_HOWTO (97),
+  EMPTY_HOWTO (98),
+  EMPTY_HOWTO (99),
+  EMPTY_HOWTO (100),
+  EMPTY_HOWTO (101),
+  EMPTY_HOWTO (102),
+  EMPTY_HOWTO (103),
+  EMPTY_HOWTO (104),
+  EMPTY_HOWTO (105),
+  EMPTY_HOWTO (106),
+  EMPTY_HOWTO (107),
+  EMPTY_HOWTO (108),
+  EMPTY_HOWTO (109),
+  EMPTY_HOWTO (110),
+  EMPTY_HOWTO (111),
+  EMPTY_HOWTO (112),
+  EMPTY_HOWTO (113),
+  EMPTY_HOWTO (114),
+  EMPTY_HOWTO (115),
+  EMPTY_HOWTO (116),
+  EMPTY_HOWTO (117),
+  EMPTY_HOWTO (118),
+  EMPTY_HOWTO (119),
+  EMPTY_HOWTO (120),
+  EMPTY_HOWTO (121),
+  EMPTY_HOWTO (122),
+  EMPTY_HOWTO (123),
+  EMPTY_HOWTO (124),
+  EMPTY_HOWTO (125),
+  EMPTY_HOWTO (126),
+  EMPTY_HOWTO (127),
+  EMPTY_HOWTO (128),
+  EMPTY_HOWTO (129),
+  EMPTY_HOWTO (130),
+  EMPTY_HOWTO (131),
+  EMPTY_HOWTO (132),
+  EMPTY_HOWTO (133),
+  EMPTY_HOWTO (134),
+  EMPTY_HOWTO (135),
+  EMPTY_HOWTO (136),
+  EMPTY_HOWTO (137),
+  EMPTY_HOWTO (138),
+  EMPTY_HOWTO (139),
+  EMPTY_HOWTO (140),
+  EMPTY_HOWTO (141),
+  EMPTY_HOWTO (142),
+  EMPTY_HOWTO (143),
+
+  HOWTO (R_SH_TLS_GD_32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* */
+	 "R_SH_TLS_GD_32",	/* name */
+	 SH_PARTIAL32,		/* partial_inplace */
+	 SH_SRC_MASK32,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_TLS_LD_32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* */
+	 "R_SH_TLS_LD_32",	/* name */
+	 SH_PARTIAL32,		/* partial_inplace */
+	 SH_SRC_MASK32,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_TLS_LDO_32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* */
+	 "R_SH_TLS_LDO_32",	/* name */
+	 SH_PARTIAL32,		/* partial_inplace */
+	 SH_SRC_MASK32,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_TLS_IE_32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* */
+	 "R_SH_TLS_IE_32",	/* name */
+	 SH_PARTIAL32,		/* partial_inplace */
+	 SH_SRC_MASK32,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_TLS_LE_32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* */
+	 "R_SH_TLS_LE_32",	/* name */
+	 SH_PARTIAL32,		/* partial_inplace */
+	 SH_SRC_MASK32,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_TLS_DTPMOD32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* */
+	 "R_SH_TLS_DTPMOD32",	/* name */
+	 SH_PARTIAL32,		/* partial_inplace */
+	 SH_SRC_MASK32,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_TLS_DTPOFF32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* */
+	 "R_SH_TLS_DTPOFF32",	/* name */
+	 SH_PARTIAL32,		/* partial_inplace */
+	 SH_SRC_MASK32,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_TLS_TPOFF32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* */
+	 "R_SH_TLS_TPOFF32",	/* name */
+	 SH_PARTIAL32,		/* partial_inplace */
+	 SH_SRC_MASK32,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (152),
+  EMPTY_HOWTO (153),
+  EMPTY_HOWTO (154),
+  EMPTY_HOWTO (155),
+  EMPTY_HOWTO (156),
+  EMPTY_HOWTO (157),
+  EMPTY_HOWTO (158),
+  EMPTY_HOWTO (159),
+
+  HOWTO (R_SH_GOT32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_SH_GOT32",		/* name */
+	 SH_PARTIAL32,		/* partial_inplace */
+	 SH_SRC_MASK32,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_PLT32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_SH_PLT32",		/* name */
+	 SH_PARTIAL32,		/* partial_inplace */
+	 SH_SRC_MASK32,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_SH_COPY,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_SH_COPY",		/* name */
+	 SH_PARTIAL32,		/* partial_inplace */
+	 SH_SRC_MASK32,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_GLOB_DAT,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_SH_GLOB_DAT",	/* name */
+	 SH_PARTIAL32,		/* partial_inplace */
+	 SH_SRC_MASK32,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_JMP_SLOT,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_SH_JMP_SLOT",	/* name */
+	 SH_PARTIAL32,		/* partial_inplace */
+	 SH_SRC_MASK32,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_RELATIVE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_SH_RELATIVE",	/* name */
+	 SH_PARTIAL32,		/* partial_inplace */
+	 SH_SRC_MASK32,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_GOTOFF,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_SH_GOTOFF",		/* name */
+	 SH_PARTIAL32,		/* partial_inplace */
+	 SH_SRC_MASK32,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_GOTPC,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_SH_GOTPC",		/* name */
+	 SH_PARTIAL32,		/* partial_inplace */
+	 SH_SRC_MASK32,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_SH_GOTPLT32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* */
+	 "R_SH_GOTPLT32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 /* ??? Why not 0?  */
+	 SH_SRC_MASK32,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+#ifdef INCLUDE_SHMEDIA
+  /* Used in MOVI and SHORI (x & 65536).  */
+  HOWTO (R_SH_GOT_LOW16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOT_LOW16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
+  HOWTO (R_SH_GOT_MEDLOW16,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOT_MEDLOW16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
+  HOWTO (R_SH_GOT_MEDHI16,	/* type */
+	 32,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOT_MEDHI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
+  HOWTO (R_SH_GOT_HI16,		/* type */
+	 48,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOT_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in MOVI and SHORI (x & 65536).  */
+  HOWTO (R_SH_GOTPLT_LOW16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTPLT_LOW16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
+  HOWTO (R_SH_GOTPLT_MEDLOW16,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTPLT_MEDLOW16", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
+  HOWTO (R_SH_GOTPLT_MEDHI16,	/* type */
+	 32,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTPLT_MEDHI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
+  HOWTO (R_SH_GOTPLT_HI16,	/* type */
+	 48,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTPLT_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in MOVI and SHORI (x & 65536).  */
+  HOWTO (R_SH_PLT_LOW16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_PLT_LOW16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
+  HOWTO (R_SH_PLT_MEDLOW16,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_PLT_MEDLOW16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
+  HOWTO (R_SH_PLT_MEDHI16,	/* type */
+	 32,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_PLT_MEDHI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
+  HOWTO (R_SH_PLT_HI16,		/* type */
+	 48,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_PLT_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Used in MOVI and SHORI (x & 65536).  */
+  HOWTO (R_SH_GOTOFF_LOW16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTOFF_LOW16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
+  HOWTO (R_SH_GOTOFF_MEDLOW16,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTOFF_MEDLOW16", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
+  HOWTO (R_SH_GOTOFF_MEDHI16,	/* type */
+	 32,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTOFF_MEDHI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
+  HOWTO (R_SH_GOTOFF_HI16,	/* type */
+	 48,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTOFF_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in MOVI and SHORI (x & 65536).  */
+  HOWTO (R_SH_GOTPC_LOW16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTPC_LOW16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
+  HOWTO (R_SH_GOTPC_MEDLOW16,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTPC_MEDLOW16", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
+  HOWTO (R_SH_GOTPC_MEDHI16,	/* type */
+	 32,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTPC_MEDHI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
+  HOWTO (R_SH_GOTPC_HI16,	/* type */
+	 48,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTPC_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Used in LD.L, FLD.S et al.	 */
+  HOWTO (R_SH_GOT10BY4,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOT10BY4",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in LD.L, FLD.S et al.	 */
+  HOWTO (R_SH_GOTPLT10BY4,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTPLT10BY4",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in FLD.D, FST.P et al.  */
+  HOWTO (R_SH_GOT10BY8,		/* type */
+	 3,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 13,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOT10BY8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in FLD.D, FST.P et al.  */
+  HOWTO (R_SH_GOTPLT10BY8,	/* type */
+	 3,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 13,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTPLT10BY8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_COPY64,		/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_COPY64",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ((bfd_vma) 0) - 1,	/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_GLOB_DAT64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GLOB_DAT64",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ((bfd_vma) 0) - 1,	/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_JMP_SLOT64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_JMP_SLOT64",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ((bfd_vma) 0) - 1,	/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_SH_RELATIVE64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_RELATIVE64",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ((bfd_vma) 0) - 1,	/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+#else
+  EMPTY_HOWTO (169),
+  EMPTY_HOWTO (170),
+  EMPTY_HOWTO (171),
+  EMPTY_HOWTO (172),
+  EMPTY_HOWTO (173),
+  EMPTY_HOWTO (174),
+  EMPTY_HOWTO (175),
+  EMPTY_HOWTO (176),
+  EMPTY_HOWTO (177),
+  EMPTY_HOWTO (178),
+  EMPTY_HOWTO (179),
+  EMPTY_HOWTO (180),
+  EMPTY_HOWTO (181),
+  EMPTY_HOWTO (182),
+  EMPTY_HOWTO (183),
+  EMPTY_HOWTO (184),
+  EMPTY_HOWTO (185),
+  EMPTY_HOWTO (186),
+  EMPTY_HOWTO (187),
+  EMPTY_HOWTO (188),
+  EMPTY_HOWTO (189),
+  EMPTY_HOWTO (190),
+  EMPTY_HOWTO (191),
+  EMPTY_HOWTO (192),
+  EMPTY_HOWTO (193),
+  EMPTY_HOWTO (194),
+  EMPTY_HOWTO (195),
+  EMPTY_HOWTO (196),
+#endif
+
+  EMPTY_HOWTO (197),
+  EMPTY_HOWTO (198),
+  EMPTY_HOWTO (199),
+  EMPTY_HOWTO (200),
+
+  /* FDPIC-relative offset to a GOT entry, for movi20.  */
+  HOWTO (R_SH_GOT20,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 20,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOT20",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x00f0ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* FDPIC-relative offset to a data object, for movi20.  */
+  HOWTO (R_SH_GOTOFF20,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 20,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTOFF20",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x00f0ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* FDPIC-relative offset to a GOT entry for a function descriptor.  */
+  HOWTO (R_SH_GOTFUNCDESC,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTFUNCDESC",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* FDPIC-relative offset to a GOT entry for a function descriptor,
+     for movi20.  */
+  HOWTO (R_SH_GOTFUNCDESC20,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 20,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTFUNCDESC20",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x00f0ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* FDPIC-relative offset to a function descriptor.  */
+  HOWTO (R_SH_GOTOFFFUNCDESC,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTOFFFUNCDESC",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* FDPIC-relative offset to a function descriptor, for movi20.  */
+  HOWTO (R_SH_GOTOFFFUNCDESC20,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 20,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTOFFFUNCDESC20", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x00f0ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Address of an official function descriptor.  */
+  HOWTO (R_SH_FUNCDESC,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_FUNCDESC",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Function descriptor to be filled in by the dynamic linker.  */
+  HOWTO (R_SH_FUNCDESC_VALUE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_FUNCDESC_VALUE", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+#ifdef INCLUDE_SHMEDIA
+  EMPTY_HOWTO (209),
+  EMPTY_HOWTO (210),
+  EMPTY_HOWTO (211),
+  EMPTY_HOWTO (212),
+  EMPTY_HOWTO (213),
+  EMPTY_HOWTO (214),
+  EMPTY_HOWTO (215),
+  EMPTY_HOWTO (216),
+  EMPTY_HOWTO (217),
+  EMPTY_HOWTO (218),
+  EMPTY_HOWTO (219),
+  EMPTY_HOWTO (220),
+  EMPTY_HOWTO (221),
+  EMPTY_HOWTO (222),
+  EMPTY_HOWTO (223),
+  EMPTY_HOWTO (224),
+  EMPTY_HOWTO (225),
+  EMPTY_HOWTO (226),
+  EMPTY_HOWTO (227),
+  EMPTY_HOWTO (228),
+  EMPTY_HOWTO (229),
+  EMPTY_HOWTO (230),
+  EMPTY_HOWTO (231),
+  EMPTY_HOWTO (232),
+  EMPTY_HOWTO (233),
+  EMPTY_HOWTO (234),
+  EMPTY_HOWTO (235),
+  EMPTY_HOWTO (236),
+  EMPTY_HOWTO (237),
+  EMPTY_HOWTO (238),
+  EMPTY_HOWTO (239),
+  EMPTY_HOWTO (240),
+  EMPTY_HOWTO (241),
+
+  /* Relocations for SHmedia code.  None of these are partial_inplace or
+     use the field being relocated (except R_SH_PT_16).  */
+
+  /* The assembler will generate this reloc before a block of SHmedia
+     instructions.  A section should be processed as assuming it contains
+     data, unless this reloc is seen.  Note that a block of SHcompact
+     instructions are instead preceded by R_SH_CODE.
+     This is currently not implemented, but should be used for SHmedia
+     linker relaxation.  */
+  HOWTO (R_SH_SHMEDIA_CODE,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_elf_ignore_reloc,	/* special_function */
+	 "R_SH_SHMEDIA_CODE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The assembler will generate this reloc at a PTA or PTB instruction,
+     and the linker checks the right type of target, or changes a PTA to a
+     PTB, if the original insn was PT.  */
+  HOWTO (R_SH_PT_16,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 18,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_PT_16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Used in unexpanded MOVI.  */
+  HOWTO (R_SH_IMMS16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_IMMS16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in SHORI.  */
+  HOWTO (R_SH_IMMU16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_IMMU16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in MOVI and SHORI (x & 65536).  */
+  HOWTO (R_SH_IMM_LOW16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_IMM_LOW16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x - $) & 65536).  */
+  HOWTO (R_SH_IMM_LOW16_PCREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_IMM_LOW16_PCREL", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
+  HOWTO (R_SH_IMM_MEDLOW16,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_IMM_MEDLOW16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in MOVI and SHORI (((x - $) >> 16) & 65536).  */
+  HOWTO (R_SH_IMM_MEDLOW16_PCREL, /* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_IMM_MEDLOW16_PCREL", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
+  HOWTO (R_SH_IMM_MEDHI16,	/* type */
+	 32,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_IMM_MEDHI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in MOVI and SHORI (((x - $) >> 32) & 65536).  */
+  HOWTO (R_SH_IMM_MEDHI16_PCREL, /* type */
+	 32,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_IMM_MEDHI16_PCREL", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
+  HOWTO (R_SH_IMM_HI16,		/* type */
+	 48,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_IMM_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used in MOVI and SHORI (((x - $) >> 48) & 65536).  */
+  HOWTO (R_SH_IMM_HI16_PCREL,	/* type */
+	 48,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_IMM_HI16_PCREL", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* For the .uaquad pseudo.  */
+  HOWTO (R_SH_64,		/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_64",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ((bfd_vma) 0) - 1,	/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* For the .uaquad pseudo, (x - $).  */
+  HOWTO (R_SH_64_PCREL,		/* type */
+	 48,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_64_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ((bfd_vma) 0) - 1,	/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+#endif
+#undef SH_PARTIAL32
+#undef SH_SRC_MASK32
+#undef SH_ELF_RELOC
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-sh-symbian.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-sh-symbian.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-sh-symbian.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-sh-symbian.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,628 @@
+/* Renesas / SuperH specific support for Symbian 32-bit ELF files
+   Copyright 2004, 2005, 2006, 2007, 2008
+   Free Software Foundation, Inc.
+   Contributed by Red Hat
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* Stop elf32-sh.c from defining any target vectors.  */
+#define SH_TARGET_ALREADY_DEFINED
+#define sh_find_elf_flags           sh_symbian_find_elf_flags
+#define sh_elf_get_flags_from_mach  sh_symbian_elf_get_flags_from_mach 
+#include "elf32-sh.c"
+
+
+//#define SYMBIAN_DEBUG 1
+#define SYMBIAN_DEBUG 0
+
+#define DIRECTIVE_HEADER	"#<SYMEDIT>#\n"
+#define DIRECTIVE_IMPORT	"IMPORT "
+#define DIRECTIVE_EXPORT	"EXPORT "
+#define DIRECTIVE_AS		"AS "
+
+/* Macro to advance 's' until either it reaches 'e' or the
+   character pointed to by 's' is equal to 'c'.  If 'e' is
+   reached and SYMBIAN_DEBUG is enabled then the error message 'm'
+   is displayed.  */
+#define SKIP_UNTIL(s,e,c,m)					\
+  do								\
+    {								\
+      while (s < e && *s != c)					\
+	++ s;							\
+      if (s >= e)						\
+	{							\
+          if (SYMBIAN_DEBUG)					\
+	    fprintf (stderr, "Corrupt directive: %s\n", m);	\
+	  result = FALSE;					\
+	}							\
+    }								\
+  while (0);							\
+  if (!result)							\
+     break;
+
+/* Like SKIP_UNTIL except there are two terminator characters
+   c1 and c2.  */
+#define SKIP_UNTIL2(s,e,c1,c2,m)				\
+  do								\
+    {								\
+      while (s < e && *s != c1 && *s != c2)			\
+	++ s;							\
+      if (s >= e)						\
+	{							\
+          if (SYMBIAN_DEBUG)					\
+	    fprintf (stderr, "Corrupt directive: %s\n", m);	\
+	  result = FALSE;					\
+	}							\
+    }								\
+  while (0);							\
+  if (!result)							\
+     break;
+
+/* Macro to advance 's' until either it reaches 'e' or the
+   character pointed to by 's' is not equal to 'c'.  If 'e'
+   is reached and SYMBIAN_DEBUG is enabled then the error message
+   'm' is displayed.  */
+#define SKIP_WHILE(s,e,c,m)					\
+  do								\
+    {								\
+      while (s < e && *s == c)					\
+	++ s;							\
+      if (s >= e)						\
+	{							\
+          if (SYMBIAN_DEBUG)					\
+	    fprintf (stderr, "Corrupt directive: %s\n", m);	\
+	  result = FALSE;					\
+	}							\
+    }								\
+  while (0);							\
+  if (!result)							\
+     break;
+
+
+typedef struct symbol_rename
+{
+  struct symbol_rename *       next;
+  char *                       current_name;
+  char *                       new_name;
+  struct elf_link_hash_entry * current_hash;
+  unsigned long                new_symndx;
+}
+symbol_rename;
+
+static symbol_rename * rename_list = NULL;
+
+/* Accumulate a list of symbols to be renamed.  */
+
+static bfd_boolean
+sh_symbian_import_as (struct bfd_link_info *info, bfd * abfd,
+		      char * current_name, char * new_name)
+{
+  struct elf_link_hash_entry * new_hash;
+  symbol_rename * node;
+
+  if (SYMBIAN_DEBUG)
+    fprintf (stderr, "IMPORT '%s' AS '%s'\n", current_name, new_name);
+
+  for (node = rename_list; node; node = node->next)
+    if (strcmp (node->current_name, current_name) == 0)
+      {
+	if (strcmp (node->new_name, new_name) == 0)
+	  /* Already added to rename list.  */
+	  return TRUE;
+
+	bfd_set_error (bfd_error_invalid_operation);
+	_bfd_error_handler (_("%B: IMPORT AS directive for %s conceals previous IMPORT AS"),
+			    abfd, current_name);
+	return FALSE;	    
+      }
+
+  if ((node = bfd_malloc (sizeof * node)) == NULL)
+    {
+      if (SYMBIAN_DEBUG)
+	fprintf (stderr, "IMPORT AS: No mem for new rename node\n");
+      return FALSE;
+    }
+
+  if ((node->current_name = bfd_malloc (strlen (current_name) + 1)) == NULL)
+    {
+      if (SYMBIAN_DEBUG)
+	fprintf (stderr, "IMPORT AS: No mem for current name field in rename node\n");
+      free (node);
+      return FALSE;
+    }
+  else
+    strcpy (node->current_name, current_name);
+  
+  if ((node->new_name = bfd_malloc (strlen (new_name) + 1)) == NULL)
+    {
+      if (SYMBIAN_DEBUG)
+	fprintf (stderr, "IMPORT AS: No mem for new name field in rename node\n");
+      free (node->current_name);
+      free (node);
+      return FALSE;
+    }
+  else
+    strcpy (node->new_name, new_name);
+
+  node->next = rename_list;
+  node->current_hash = NULL;
+  node->new_symndx = 0;
+  rename_list = node;
+
+  new_hash = elf_link_hash_lookup (elf_hash_table (info), node->new_name, TRUE, FALSE, TRUE);
+  bfd_elf_link_record_dynamic_symbol (info, new_hash);
+  if (new_hash->root.type == bfd_link_hash_new)
+    new_hash->root.type = bfd_link_hash_undefined;
+
+  return TRUE;
+}
+
+
+static bfd_boolean
+sh_symbian_import (bfd * abfd ATTRIBUTE_UNUSED, char * name)
+{
+  if (SYMBIAN_DEBUG)
+    fprintf (stderr, "IMPORT '%s'\n", name);
+
+  /* XXX: Generate an import somehow ?  */
+
+  return TRUE;
+}
+
+static bfd_boolean
+sh_symbian_export (bfd * abfd ATTRIBUTE_UNUSED, char * name)
+{
+  if (SYMBIAN_DEBUG)
+    fprintf (stderr, "EXPORT '%s'\n", name);
+
+  /* XXX: Generate an export somehow ?  */
+
+  return TRUE;
+}
+
+/* Process any magic embedded commands in the .directive. section.
+   Returns TRUE upon sucecss, but if it fails it sets bfd_error and
+   returns FALSE.  */
+
+static bfd_boolean
+sh_symbian_process_embedded_commands (struct bfd_link_info *info, bfd * abfd,
+				      asection * sec, bfd_byte * contents)
+{
+  char *s;
+  char *e;
+  bfd_boolean result = TRUE;
+  bfd_size_type sz = sec->rawsize ? sec->rawsize : sec->size;
+
+  for (s = (char *) contents, e = s + sz; s < e;)
+    {
+      char * directive = s;
+
+      switch (*s)
+	{
+	  /* I want to use "case DIRECTIVE_HEADER [0]:" here but gcc won't let me :-(  */
+	case '#':
+	  if (strcmp (s, DIRECTIVE_HEADER))
+	    result = FALSE;
+	  else
+	    /* Just ignore the header.
+	       XXX: Strictly speaking we ought to check that the header
+	       is present and that it is the first thing in the file.  */
+	    s += strlen (DIRECTIVE_HEADER) + 1;
+	  break;
+
+	case 'I':
+	  if (! CONST_STRNEQ (s, DIRECTIVE_IMPORT))
+	    result = FALSE;
+	  else
+	    {
+	      char * new_name;
+	      char * new_name_end;
+	      char   name_end_char;
+
+	      /* Skip the IMPORT directive.  */
+	      s += strlen (DIRECTIVE_IMPORT);
+
+	      new_name = s;
+	      /* Find the end of the new name.  */
+	      while (s < e && *s != ' ' && *s != '\n')
+		++ s;
+	      if (s >= e)
+		{
+		  /* We have reached the end of the .directive section
+		     without encountering a string terminator.  This is
+		     allowed for IMPORT directives.  */
+		  new_name_end   = e - 1;
+		  name_end_char  = * new_name_end;
+		  * new_name_end = 0;
+		  result = sh_symbian_import (abfd, new_name);
+		  * new_name_end = name_end_char;
+		  break;
+		}
+
+	      /* Remember where the name ends.  */
+	      new_name_end = s;
+	      /* Skip any whitespace before the 'AS'.  */
+	      SKIP_WHILE (s, e, ' ', "IMPORT: Name just followed by spaces");
+	      /* Terminate the new name.  (Do this after skiping...)  */
+	      name_end_char = * new_name_end;
+	      * new_name_end = 0;
+
+	      /* Check to see if 'AS '... is present.  If so we have an
+		 IMPORT AS directive, otherwise we have an IMPORT directive.  */
+	      if (! CONST_STRNEQ (s, DIRECTIVE_AS))
+		{
+		  /* Skip the new-line at the end of the name.  */
+		  if (SYMBIAN_DEBUG && name_end_char != '\n')
+		    fprintf (stderr, "IMPORT: No newline at end of directive\n");
+		  else
+		    s ++;
+
+		  result = sh_symbian_import (abfd, new_name);
+
+		  /* Skip past the NUL character.  */
+		  if (* s ++ != 0)
+		    {
+		      if (SYMBIAN_DEBUG)
+			fprintf (stderr, "IMPORT: No NUL at end of directive\n");
+		    }
+		}
+	      else
+		{
+		  char * current_name;
+		  char * current_name_end;
+		  char   current_name_end_char;
+
+		  /* Skip the 'AS '.  */
+		  s += strlen (DIRECTIVE_AS);
+		  /* Skip any white space after the 'AS '.  */
+		  SKIP_WHILE (s, e, ' ', "IMPORT AS: Nothing after AS");
+		  current_name = s;
+		  /* Find the end of the current name.  */
+		  SKIP_UNTIL2 (s, e, ' ', '\n', "IMPORT AS: No newline at the end of the current name");
+		  /* Skip (backwards) over spaces at the end of the current name.  */
+		  current_name_end = s;
+		  current_name_end_char = * current_name_end;
+
+		  SKIP_WHILE (s, e, ' ', "IMPORT AS: Current name just followed by spaces");
+		  /* Skip past the newline character.  */
+		  if (* s ++ != '\n')
+		    if (SYMBIAN_DEBUG)
+		      fprintf (stderr, "IMPORT AS: No newline at end of directive\n");
+
+		  /* Terminate the current name after having performed the skips.  */
+		  * current_name_end = 0;
+
+		  result = sh_symbian_import_as (info, abfd, current_name, new_name);
+
+		  /* The next character should be a NUL.  */
+		  if (* s != 0)
+		    {
+		      if (SYMBIAN_DEBUG)
+			fprintf (stderr, "IMPORT AS: Junk at end of directive\n");
+		      result = FALSE;
+		    }
+		  s ++;
+
+		  * current_name_end = current_name_end_char;
+		}
+
+	      /* Restore the characters we overwrote, since
+		 the .directive section will be emitted.  */
+	      * new_name_end = name_end_char;
+	    }
+	  break;
+
+	case 'E':
+	  if (! CONST_STRNEQ (s, DIRECTIVE_EXPORT))
+	    result = FALSE;
+	  else
+	    {
+	      char * name;
+	      char * name_end;
+	      char   name_end_char;
+
+	      /* Skip the directive.  */
+	      s += strlen (DIRECTIVE_EXPORT);
+	      name = s;
+	      /* Find the end of the name to be exported.  */
+	      SKIP_UNTIL (s, e, '\n', "EXPORT: no newline at end of directive");
+	      /* Skip (backwards) over spaces at end of exported name.  */
+	      for (name_end = s; name_end[-1] == ' '; name_end --)
+		;
+	      /* name_end now points at the first character after the
+		 end of the exported name, so we can termiante it  */
+	      name_end_char = * name_end;
+	      * name_end = 0;
+	      /* Skip passed the newline character.  */
+	      s ++;
+
+	      result = sh_symbian_export (abfd, name);
+
+	      /* The next character should be a NUL.  */
+	      if (* s != 0)
+		{
+		  if (SYMBIAN_DEBUG)
+		    fprintf (stderr, "EXPORT: Junk at end of directive\n");
+		  result = FALSE;
+		}
+	      s++;
+
+	      /* Restore the character we deleted.  */
+	      * name_end = name_end_char;
+	    }
+	  break;
+
+	default:
+	  result = FALSE;
+	  break;
+	}
+
+      if (! result)
+	{
+	  if (SYMBIAN_DEBUG)
+	    fprintf (stderr, "offset into .directive section: %ld\n",
+		     (long) (directive - (char *) contents));
+	  
+	  bfd_set_error (bfd_error_invalid_operation);
+	  _bfd_error_handler (_("%B: Unrecognised .directive command: %s"),
+			      abfd, directive);
+	  break;
+	}
+    }
+
+  return result;
+}
+
+
+/* Scan a bfd for a .directive section, and if found process it.
+   Returns TRUE upon success, FALSE otherwise.  */
+
+static bfd_boolean
+sh_symbian_process_directives (bfd *abfd, struct bfd_link_info *info)
+{
+  bfd_boolean result = FALSE;
+  bfd_byte *  contents;
+  asection *  sec = bfd_get_section_by_name (abfd, ".directive");
+  bfd_size_type sz;
+
+  if (!sec)
+    return TRUE;
+
+  sz = sec->rawsize ? sec->rawsize : sec->size;
+  contents = bfd_malloc (sz);
+
+  if (!contents)
+    bfd_set_error (bfd_error_no_memory);
+  else 
+    {
+      if (bfd_get_section_contents (abfd, sec, contents, 0, sz))
+	result = sh_symbian_process_embedded_commands (info, abfd, sec, contents);
+      free (contents);
+    }
+
+  return result;
+}
+
+/* Intercept the normal sh_relocate_section() function
+   and magle the relocs to allow for symbol renaming.  */
+
+static bfd_boolean
+sh_symbian_relocate_section (bfd *                  output_bfd,
+			     struct bfd_link_info * info,
+			     bfd *                  input_bfd,
+			     asection *             input_section,
+			     bfd_byte *             contents,
+			     Elf_Internal_Rela *    relocs,
+			     Elf_Internal_Sym *     local_syms,
+			     asection **            local_sections)
+{
+  /* When performing a final link we implement the IMPORT AS directives.  */
+  if (!info->relocatable)
+    {
+      Elf_Internal_Rela *            rel;
+      Elf_Internal_Rela *            relend;
+      Elf_Internal_Shdr *            symtab_hdr;
+      struct elf_link_hash_entry **  sym_hashes;
+      struct elf_link_hash_entry **  sym_hashes_end;
+      struct elf_link_hash_table *   hash_table;
+      symbol_rename *                ptr;
+      bfd_size_type                  num_global_syms;
+      unsigned long		     num_local_syms;
+      
+      BFD_ASSERT (! elf_bad_symtab (input_bfd));
+ 
+      symtab_hdr       = & elf_tdata (input_bfd)->symtab_hdr;
+      hash_table       = elf_hash_table (info);
+      num_local_syms   = symtab_hdr->sh_info;
+      num_global_syms  = symtab_hdr->sh_size / sizeof (Elf32_External_Sym);
+      num_global_syms -= num_local_syms;
+      sym_hashes       = elf_sym_hashes (input_bfd);
+      sym_hashes_end   = sym_hashes + num_global_syms;
+
+      /* First scan the rename table, caching the hash entry and the new index.  */
+      for (ptr = rename_list; ptr; ptr = ptr->next)
+	{
+	  struct elf_link_hash_entry *   new_hash;
+	  struct elf_link_hash_entry **  h;
+
+	  ptr->current_hash = elf_link_hash_lookup (hash_table, ptr->current_name, FALSE, FALSE, TRUE);
+
+	  if (ptr->current_hash == NULL)
+	    {
+	      if (SYMBIAN_DEBUG)
+		fprintf (stderr, "IMPORT AS: current symbol '%s' does not exist\n", ptr->current_name);
+	      continue;
+	    }
+	  
+	  new_hash = elf_link_hash_lookup (hash_table, ptr->new_name, FALSE, FALSE, TRUE);
+
+	  /* If we could not find the symbol then it is a new, undefined symbol.
+	     Symbian want this behaviour - ie they want to be able to rename the
+	     reference in a reloc from one undefined symbol to another, new and
+	     undefined symbol.  So we create that symbol here.  */
+	  if (new_hash == NULL)
+	    {
+	      asection *                     psec = bfd_und_section_ptr;
+	      Elf_Internal_Sym               new_sym;
+	      bfd_vma                        new_value = 0;
+	      bfd_boolean                    skip;
+	      bfd_boolean                    override;
+	      bfd_boolean                    type_change_ok;
+	      bfd_boolean                    size_change_ok;
+
+	      new_sym.st_value = 0;
+	      new_sym.st_size  = 0;
+	      new_sym.st_name  = -1;
+	      new_sym.st_info  = ELF_ST_INFO (STB_GLOBAL, STT_FUNC);
+	      new_sym.st_other = ELF_ST_VISIBILITY (STV_DEFAULT);
+	      new_sym.st_shndx = SHN_UNDEF;
+	      new_sym.st_target_internal = 0;
+
+	      if (! _bfd_elf_merge_symbol (input_bfd, info,
+					   ptr->new_name, & new_sym,
+					   & psec, & new_value, NULL,
+					   & new_hash, & skip,
+					   & override, & type_change_ok,
+					   & size_change_ok))
+		{
+		  _bfd_error_handler (_("%B: Failed to add renamed symbol %s"),
+				      input_bfd, ptr->new_name);
+		  continue;
+		}
+	      /* XXX - should we check psec, skip, override etc ?  */
+
+	      new_hash->root.type = bfd_link_hash_undefined;
+
+	      /* Allow the symbol to become local if necessary.  */
+	      if (new_hash->dynindx == -1)
+		new_hash->def_regular = 1;
+
+	      if (SYMBIAN_DEBUG)
+		fprintf (stderr, "Created new symbol %s\n", ptr->new_name);
+	    }
+
+	  /* Convert the new_hash value into a index into the table of symbol hashes.  */
+	  for (h = sym_hashes; h < sym_hashes_end; h ++)
+	    {
+	      if (* h == new_hash)
+		{
+		  ptr->new_symndx = h - sym_hashes + num_local_syms;
+		  if (SYMBIAN_DEBUG)
+		    fprintf (stderr, "Converted new hash to index of %ld\n", ptr->new_symndx);
+		  break;
+		}
+	    }
+	  /* If the new symbol is not in the hash table then it must be
+	     because it is one of the newly created undefined symbols
+	     manufactured above.  So we extend the sym has table here to
+	     include this extra symbol.  */
+	  if (h == sym_hashes_end)
+	    {
+	      struct elf_link_hash_entry **  new_sym_hashes;
+
+	      /* This is not very efficient, but it works.  */
+	      ++ num_global_syms;
+	      new_sym_hashes = bfd_alloc (input_bfd, num_global_syms * sizeof * sym_hashes);
+	      if (new_sym_hashes == NULL)
+		{
+		  if (SYMBIAN_DEBUG)
+		    fprintf (stderr, "Out of memory extending hash table\n");
+		  continue;
+		}
+	      memcpy (new_sym_hashes, sym_hashes, (num_global_syms - 1) * sizeof * sym_hashes);
+	      new_sym_hashes[num_global_syms - 1] = new_hash;
+	      elf_sym_hashes (input_bfd) = sym_hashes = new_sym_hashes;
+	      sym_hashes_end = sym_hashes + num_global_syms;
+	      symtab_hdr->sh_size  = (num_global_syms + num_local_syms) * sizeof (Elf32_External_Sym);
+
+	      ptr->new_symndx = num_global_syms - 1 + num_local_syms;
+
+	      if (SYMBIAN_DEBUG)
+		fprintf (stderr, "Extended symbol hash table to insert new symbol as index %ld\n",
+			 ptr->new_symndx);
+	    }
+	}
+
+      /* Walk the reloc list looking for references to renamed symbols.
+	 When we find one, we alter the index in the reloc to point to the new symbol.  */
+      for (rel = relocs, relend = relocs + input_section->reloc_count;
+	   rel < relend;
+	   rel ++)
+	{
+	  int                          r_type;
+	  unsigned long                r_symndx;
+	  struct elf_link_hash_entry * h;
+      
+	  r_symndx = ELF32_R_SYM (rel->r_info);
+	  r_type = ELF32_R_TYPE (rel->r_info);
+
+	  /* Ignore unused relocs.  */
+	  if ((r_type >= (int) R_SH_GNU_VTINHERIT
+	       && r_type <= (int) R_SH_LABEL)
+	      || r_type == (int) R_SH_NONE
+	      || r_type < 0
+	      || r_type >= R_SH_max)
+	    continue;
+
+	  /* Ignore relocs against local symbols.  */
+	  if (r_symndx < num_local_syms)
+	    continue;
+
+	  BFD_ASSERT (r_symndx < (num_global_syms + num_local_syms));
+	  h = sym_hashes[r_symndx - num_local_syms];
+	  BFD_ASSERT (h != NULL);
+
+	  while (   h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+	  /* If the symbol is defined there is no need to rename it.
+	     XXX - is this true ?  */
+	  if (   h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak
+	      || h->root.type == bfd_link_hash_undefweak)
+	    continue;
+
+	  for (ptr = rename_list; ptr; ptr = ptr->next)
+	    if (h == ptr->current_hash)
+	      {
+		BFD_ASSERT (ptr->new_symndx);
+		if (SYMBIAN_DEBUG)
+		  fprintf (stderr, "convert reloc %lx from using index %ld to using index %ld\n",
+			   (unsigned long) rel->r_info,
+			   (long) ELF32_R_SYM (rel->r_info), ptr->new_symndx);
+		rel->r_info = ELF32_R_INFO (ptr->new_symndx, r_type);
+		break;
+	      }
+	}
+    }
+  
+  return sh_elf_relocate_section (output_bfd, info, input_bfd, input_section,
+				  contents, relocs, local_syms, local_sections);
+}
+
+#define TARGET_LITTLE_SYM	bfd_elf32_shl_symbian_vec
+#define TARGET_LITTLE_NAME      "elf32-shl-symbian"
+
+#undef  elf_backend_relocate_section
+#define elf_backend_relocate_section	sh_symbian_relocate_section
+#undef  elf_backend_check_directives
+#define elf_backend_check_directives    sh_symbian_process_directives
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-sh.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-sh.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-sh.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-sh.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,7720 @@
+/* Renesas / SuperH SH specific support for 32-bit ELF
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Contributed by Ian Lance Taylor, Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf-vxworks.h"
+#include "elf/sh.h"
+#include "dwarf2.h"
+#include "libiberty.h"
+#include "../opcodes/sh-opc.h"
+
+static bfd_reloc_status_type sh_elf_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type sh_elf_ignore_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_boolean sh_elf_relax_delete_bytes
+  (bfd *, asection *, bfd_vma, int);
+static bfd_boolean sh_elf_align_loads
+  (bfd *, asection *, Elf_Internal_Rela *, bfd_byte *, bfd_boolean *);
+#ifndef SH64_ELF
+static bfd_boolean sh_elf_swap_insns
+  (bfd *, asection *, void *, bfd_byte *, bfd_vma);
+#endif
+static int sh_elf_optimized_tls_reloc
+  (struct bfd_link_info *, int, int);
+static bfd_vma dtpoff_base
+  (struct bfd_link_info *);
+static bfd_vma tpoff
+  (struct bfd_link_info *, bfd_vma);
+
+/* The name of the dynamic interpreter.  This is put in the .interp
+   section.  */
+
+#define ELF_DYNAMIC_INTERPRETER "/usr/lib/libc.so.1"
+
+/* FDPIC binaries have a default 128K stack.  */
+#define DEFAULT_STACK_SIZE 0x20000
+
+#define MINUS_ONE ((bfd_vma) 0 - 1)
+
+/* Decide whether a reference to a symbol can be resolved locally or
+   not.  If the symbol is protected, we want the local address, but
+   its function descriptor must be assigned by the dynamic linker.  */
+#define SYMBOL_FUNCDESC_LOCAL(INFO, H) \
+  (SYMBOL_REFERENCES_LOCAL (INFO, H) \
+   || ! elf_hash_table (INFO)->dynamic_sections_created)
+
+#define SH_PARTIAL32 TRUE
+#define SH_SRC_MASK32 0xffffffff
+#define SH_ELF_RELOC sh_elf_reloc
+static reloc_howto_type sh_elf_howto_table[] =
+{
+#include "elf32-sh-relocs.h"
+};
+
+#define SH_PARTIAL32 FALSE
+#define SH_SRC_MASK32 0
+#define SH_ELF_RELOC bfd_elf_generic_reloc
+static reloc_howto_type sh_vxworks_howto_table[] =
+{
+#include "elf32-sh-relocs.h"
+};
+
+/* Return true if OUTPUT_BFD is a VxWorks object.  */
+
+static bfd_boolean
+vxworks_object_p (bfd *abfd ATTRIBUTE_UNUSED)
+{
+#if !defined INCLUDE_SHMEDIA && !defined SH_TARGET_ALREADY_DEFINED
+  extern const bfd_target bfd_elf32_shlvxworks_vec;
+  extern const bfd_target bfd_elf32_shvxworks_vec;
+
+  return (abfd->xvec == &bfd_elf32_shlvxworks_vec
+	  || abfd->xvec == &bfd_elf32_shvxworks_vec);
+#else
+  return FALSE;
+#endif
+}
+
+/* Return true if OUTPUT_BFD is an FDPIC object.  */
+
+static bfd_boolean
+fdpic_object_p (bfd *abfd ATTRIBUTE_UNUSED)
+{
+#if !defined INCLUDE_SHMEDIA && !defined SH_TARGET_ALREADY_DEFINED
+  extern const bfd_target bfd_elf32_shfd_vec;
+  extern const bfd_target bfd_elf32_shbfd_vec;
+
+  return (abfd->xvec == &bfd_elf32_shfd_vec
+	  || abfd->xvec == &bfd_elf32_shbfd_vec);
+#else
+  return FALSE;
+#endif
+}
+
+/* Return the howto table for ABFD.  */
+
+static reloc_howto_type *
+get_howto_table (bfd *abfd)
+{
+  if (vxworks_object_p (abfd))
+    return sh_vxworks_howto_table;
+  return sh_elf_howto_table;
+}
+
+static bfd_reloc_status_type
+sh_elf_reloc_loop (int r_type ATTRIBUTE_UNUSED, bfd *input_bfd,
+		   asection *input_section, bfd_byte *contents,
+		   bfd_vma addr, asection *symbol_section,
+		   bfd_vma start, bfd_vma end)
+{
+  static bfd_vma last_addr;
+  static asection *last_symbol_section;
+  bfd_byte *start_ptr, *ptr, *last_ptr;
+  int diff, cum_diff;
+  bfd_signed_vma x;
+  int insn;
+
+  /* Sanity check the address.  */
+  if (addr > bfd_get_section_limit (input_bfd, input_section))
+    return bfd_reloc_outofrange;
+
+  /* We require the start and end relocations to be processed consecutively -
+     although we allow then to be processed forwards or backwards.  */
+  if (! last_addr)
+    {
+      last_addr = addr;
+      last_symbol_section = symbol_section;
+      return bfd_reloc_ok;
+    }
+  if (last_addr != addr)
+    abort ();
+  last_addr = 0;
+
+  if (! symbol_section || last_symbol_section != symbol_section || end < start)
+    return bfd_reloc_outofrange;
+
+  /* Get the symbol_section contents.  */
+  if (symbol_section != input_section)
+    {
+      if (elf_section_data (symbol_section)->this_hdr.contents != NULL)
+	contents = elf_section_data (symbol_section)->this_hdr.contents;
+      else
+	{
+	  if (!bfd_malloc_and_get_section (input_bfd, symbol_section,
+					   &contents))
+	    {
+	      if (contents != NULL)
+		free (contents);
+	      return bfd_reloc_outofrange;
+	    }
+	}
+    }
+#define IS_PPI(PTR) ((bfd_get_16 (input_bfd, (PTR)) & 0xfc00) == 0xf800)
+  start_ptr = contents + start;
+  for (cum_diff = -6, ptr = contents + end; cum_diff < 0 && ptr > start_ptr;)
+    {
+      for (last_ptr = ptr, ptr -= 4; ptr >= start_ptr && IS_PPI (ptr);)
+	ptr -= 2;
+      ptr += 2;
+      diff = (last_ptr - ptr) >> 1;
+      cum_diff += diff & 1;
+      cum_diff += diff;
+    }
+  /* Calculate the start / end values to load into rs / re minus four -
+     so that will cancel out the four we would otherwise have to add to
+     addr to get the value to subtract in order to get relative addressing.  */
+  if (cum_diff >= 0)
+    {
+      start -= 4;
+      end = (ptr + cum_diff * 2) - contents;
+    }
+  else
+    {
+      bfd_vma start0 = start - 4;
+
+      while (start0 && IS_PPI (contents + start0))
+	start0 -= 2;
+      start0 = start - 2 - ((start - start0) & 2);
+      start = start0 - cum_diff - 2;
+      end = start0;
+    }
+
+  if (contents != NULL
+      && elf_section_data (symbol_section)->this_hdr.contents != contents)
+    free (contents);
+
+  insn = bfd_get_16 (input_bfd, contents + addr);
+
+  x = (insn & 0x200 ? end : start) - addr;
+  if (input_section != symbol_section)
+    x += ((symbol_section->output_section->vma + symbol_section->output_offset)
+	  - (input_section->output_section->vma
+	     + input_section->output_offset));
+  x >>= 1;
+  if (x < -128 || x > 127)
+    return bfd_reloc_overflow;
+
+  x = (insn & ~0xff) | (x & 0xff);
+  bfd_put_16 (input_bfd, (bfd_vma) x, contents + addr);
+
+  return bfd_reloc_ok;
+}
+
+/* This function is used for normal relocs.  This used to be like the COFF
+   function, and is almost certainly incorrect for other ELF targets.  */
+
+static bfd_reloc_status_type
+sh_elf_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol_in,
+	      void *data, asection *input_section, bfd *output_bfd,
+	      char **error_message ATTRIBUTE_UNUSED)
+{
+  unsigned long insn;
+  bfd_vma sym_value;
+  enum elf_sh_reloc_type r_type;
+  bfd_vma addr = reloc_entry->address;
+  bfd_byte *hit_data = addr + (bfd_byte *) data;
+
+  r_type = (enum elf_sh_reloc_type) reloc_entry->howto->type;
+
+  if (output_bfd != NULL)
+    {
+      /* Partial linking--do nothing.  */
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  /* Almost all relocs have to do with relaxing.  If any work must be
+     done for them, it has been done in sh_relax_section.  */
+  if (r_type == R_SH_IND12W && (symbol_in->flags & BSF_LOCAL) != 0)
+    return bfd_reloc_ok;
+
+  if (symbol_in != NULL
+      && bfd_is_und_section (symbol_in->section))
+    return bfd_reloc_undefined;
+
+  if (bfd_is_com_section (symbol_in->section))
+    sym_value = 0;
+  else
+    sym_value = (symbol_in->value +
+		 symbol_in->section->output_section->vma +
+		 symbol_in->section->output_offset);
+
+  switch (r_type)
+    {
+    case R_SH_DIR32:
+      insn = bfd_get_32 (abfd, hit_data);
+      insn += sym_value + reloc_entry->addend;
+      bfd_put_32 (abfd, (bfd_vma) insn, hit_data);
+      break;
+    case R_SH_IND12W:
+      insn = bfd_get_16 (abfd, hit_data);
+      sym_value += reloc_entry->addend;
+      sym_value -= (input_section->output_section->vma
+		    + input_section->output_offset
+		    + addr
+		    + 4);
+      sym_value += (insn & 0xfff) << 1;
+      if (insn & 0x800)
+	sym_value -= 0x1000;
+      insn = (insn & 0xf000) | (sym_value & 0xfff);
+      bfd_put_16 (abfd, (bfd_vma) insn, hit_data);
+      if (sym_value < (bfd_vma) -0x1000 || sym_value >= 0x1000)
+	return bfd_reloc_overflow;
+      break;
+    default:
+      abort ();
+      break;
+    }
+
+  return bfd_reloc_ok;
+}
+
+/* This function is used for relocs which are only used for relaxing,
+   which the linker should otherwise ignore.  */
+
+static bfd_reloc_status_type
+sh_elf_ignore_reloc (bfd *abfd ATTRIBUTE_UNUSED, arelent *reloc_entry,
+		     asymbol *symbol ATTRIBUTE_UNUSED,
+		     void *data ATTRIBUTE_UNUSED, asection *input_section,
+		     bfd *output_bfd,
+		     char **error_message ATTRIBUTE_UNUSED)
+{
+  if (output_bfd != NULL)
+    reloc_entry->address += input_section->output_offset;
+  return bfd_reloc_ok;
+}
+
+/* This structure is used to map BFD reloc codes to SH ELF relocs.  */
+
+struct elf_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned char elf_reloc_val;
+};
+
+/* An array mapping BFD reloc codes to SH ELF relocs.  */
+
+static const struct elf_reloc_map sh_reloc_map[] =
+{
+  { BFD_RELOC_NONE, R_SH_NONE },
+  { BFD_RELOC_32, R_SH_DIR32 },
+  { BFD_RELOC_16, R_SH_DIR16 },
+  { BFD_RELOC_8, R_SH_DIR8 },
+  { BFD_RELOC_CTOR, R_SH_DIR32 },
+  { BFD_RELOC_32_PCREL, R_SH_REL32 },
+  { BFD_RELOC_SH_PCDISP8BY2, R_SH_DIR8WPN },
+  { BFD_RELOC_SH_PCDISP12BY2, R_SH_IND12W },
+  { BFD_RELOC_SH_PCRELIMM8BY2, R_SH_DIR8WPZ },
+  { BFD_RELOC_SH_PCRELIMM8BY4, R_SH_DIR8WPL },
+  { BFD_RELOC_8_PCREL, R_SH_SWITCH8 },
+  { BFD_RELOC_SH_SWITCH16, R_SH_SWITCH16 },
+  { BFD_RELOC_SH_SWITCH32, R_SH_SWITCH32 },
+  { BFD_RELOC_SH_USES, R_SH_USES },
+  { BFD_RELOC_SH_COUNT, R_SH_COUNT },
+  { BFD_RELOC_SH_ALIGN, R_SH_ALIGN },
+  { BFD_RELOC_SH_CODE, R_SH_CODE },
+  { BFD_RELOC_SH_DATA, R_SH_DATA },
+  { BFD_RELOC_SH_LABEL, R_SH_LABEL },
+  { BFD_RELOC_VTABLE_INHERIT, R_SH_GNU_VTINHERIT },
+  { BFD_RELOC_VTABLE_ENTRY, R_SH_GNU_VTENTRY },
+  { BFD_RELOC_SH_LOOP_START, R_SH_LOOP_START },
+  { BFD_RELOC_SH_LOOP_END, R_SH_LOOP_END },
+  { BFD_RELOC_SH_TLS_GD_32, R_SH_TLS_GD_32 },
+  { BFD_RELOC_SH_TLS_LD_32, R_SH_TLS_LD_32 },
+  { BFD_RELOC_SH_TLS_LDO_32, R_SH_TLS_LDO_32 },
+  { BFD_RELOC_SH_TLS_IE_32, R_SH_TLS_IE_32 },
+  { BFD_RELOC_SH_TLS_LE_32, R_SH_TLS_LE_32 },
+  { BFD_RELOC_SH_TLS_DTPMOD32, R_SH_TLS_DTPMOD32 },
+  { BFD_RELOC_SH_TLS_DTPOFF32, R_SH_TLS_DTPOFF32 },
+  { BFD_RELOC_SH_TLS_TPOFF32, R_SH_TLS_TPOFF32 },
+  { BFD_RELOC_32_GOT_PCREL, R_SH_GOT32 },
+  { BFD_RELOC_32_PLT_PCREL, R_SH_PLT32 },
+  { BFD_RELOC_SH_COPY, R_SH_COPY },
+  { BFD_RELOC_SH_GLOB_DAT, R_SH_GLOB_DAT },
+  { BFD_RELOC_SH_JMP_SLOT, R_SH_JMP_SLOT },
+  { BFD_RELOC_SH_RELATIVE, R_SH_RELATIVE },
+  { BFD_RELOC_32_GOTOFF, R_SH_GOTOFF },
+  { BFD_RELOC_SH_GOTPC, R_SH_GOTPC },
+  { BFD_RELOC_SH_GOTPLT32, R_SH_GOTPLT32 },
+  { BFD_RELOC_SH_GOT20, R_SH_GOT20 },
+  { BFD_RELOC_SH_GOTOFF20, R_SH_GOTOFF20 },
+  { BFD_RELOC_SH_GOTFUNCDESC, R_SH_GOTFUNCDESC },
+  { BFD_RELOC_SH_GOTFUNCDESC20, R_SH_GOTFUNCDESC20 },
+  { BFD_RELOC_SH_GOTOFFFUNCDESC, R_SH_GOTOFFFUNCDESC },
+  { BFD_RELOC_SH_GOTOFFFUNCDESC20, R_SH_GOTOFFFUNCDESC20 },
+  { BFD_RELOC_SH_FUNCDESC, R_SH_FUNCDESC },
+#ifdef INCLUDE_SHMEDIA
+  { BFD_RELOC_SH_GOT_LOW16, R_SH_GOT_LOW16 },
+  { BFD_RELOC_SH_GOT_MEDLOW16, R_SH_GOT_MEDLOW16 },
+  { BFD_RELOC_SH_GOT_MEDHI16, R_SH_GOT_MEDHI16 },
+  { BFD_RELOC_SH_GOT_HI16, R_SH_GOT_HI16 },
+  { BFD_RELOC_SH_GOTPLT_LOW16, R_SH_GOTPLT_LOW16 },
+  { BFD_RELOC_SH_GOTPLT_MEDLOW16, R_SH_GOTPLT_MEDLOW16 },
+  { BFD_RELOC_SH_GOTPLT_MEDHI16, R_SH_GOTPLT_MEDHI16 },
+  { BFD_RELOC_SH_GOTPLT_HI16, R_SH_GOTPLT_HI16 },
+  { BFD_RELOC_SH_PLT_LOW16, R_SH_PLT_LOW16 },
+  { BFD_RELOC_SH_PLT_MEDLOW16, R_SH_PLT_MEDLOW16 },
+  { BFD_RELOC_SH_PLT_MEDHI16, R_SH_PLT_MEDHI16 },
+  { BFD_RELOC_SH_PLT_HI16, R_SH_PLT_HI16 },
+  { BFD_RELOC_SH_GOTOFF_LOW16, R_SH_GOTOFF_LOW16 },
+  { BFD_RELOC_SH_GOTOFF_MEDLOW16, R_SH_GOTOFF_MEDLOW16 },
+  { BFD_RELOC_SH_GOTOFF_MEDHI16, R_SH_GOTOFF_MEDHI16 },
+  { BFD_RELOC_SH_GOTOFF_HI16, R_SH_GOTOFF_HI16 },
+  { BFD_RELOC_SH_GOTPC_LOW16, R_SH_GOTPC_LOW16 },
+  { BFD_RELOC_SH_GOTPC_MEDLOW16, R_SH_GOTPC_MEDLOW16 },
+  { BFD_RELOC_SH_GOTPC_MEDHI16, R_SH_GOTPC_MEDHI16 },
+  { BFD_RELOC_SH_GOTPC_HI16, R_SH_GOTPC_HI16 },
+  { BFD_RELOC_SH_COPY64, R_SH_COPY64 },
+  { BFD_RELOC_SH_GLOB_DAT64, R_SH_GLOB_DAT64 },
+  { BFD_RELOC_SH_JMP_SLOT64, R_SH_JMP_SLOT64 },
+  { BFD_RELOC_SH_RELATIVE64, R_SH_RELATIVE64 },
+  { BFD_RELOC_SH_GOT10BY4, R_SH_GOT10BY4 },
+  { BFD_RELOC_SH_GOT10BY8, R_SH_GOT10BY8 },
+  { BFD_RELOC_SH_GOTPLT10BY4, R_SH_GOTPLT10BY4 },
+  { BFD_RELOC_SH_GOTPLT10BY8, R_SH_GOTPLT10BY8 },
+  { BFD_RELOC_SH_PT_16, R_SH_PT_16 },
+  { BFD_RELOC_SH_SHMEDIA_CODE, R_SH_SHMEDIA_CODE },
+  { BFD_RELOC_SH_IMMU5, R_SH_DIR5U },
+  { BFD_RELOC_SH_IMMS6, R_SH_DIR6S },
+  { BFD_RELOC_SH_IMMU6, R_SH_DIR6U },
+  { BFD_RELOC_SH_IMMS10, R_SH_DIR10S },
+  { BFD_RELOC_SH_IMMS10BY2, R_SH_DIR10SW },
+  { BFD_RELOC_SH_IMMS10BY4, R_SH_DIR10SL },
+  { BFD_RELOC_SH_IMMS10BY8, R_SH_DIR10SQ },
+  { BFD_RELOC_SH_IMMS16, R_SH_IMMS16 },
+  { BFD_RELOC_SH_IMMU16, R_SH_IMMU16 },
+  { BFD_RELOC_SH_IMM_LOW16, R_SH_IMM_LOW16 },
+  { BFD_RELOC_SH_IMM_LOW16_PCREL, R_SH_IMM_LOW16_PCREL },
+  { BFD_RELOC_SH_IMM_MEDLOW16, R_SH_IMM_MEDLOW16 },
+  { BFD_RELOC_SH_IMM_MEDLOW16_PCREL, R_SH_IMM_MEDLOW16_PCREL },
+  { BFD_RELOC_SH_IMM_MEDHI16, R_SH_IMM_MEDHI16 },
+  { BFD_RELOC_SH_IMM_MEDHI16_PCREL, R_SH_IMM_MEDHI16_PCREL },
+  { BFD_RELOC_SH_IMM_HI16, R_SH_IMM_HI16 },
+  { BFD_RELOC_SH_IMM_HI16_PCREL, R_SH_IMM_HI16_PCREL },
+  { BFD_RELOC_64, R_SH_64 },
+  { BFD_RELOC_64_PCREL, R_SH_64_PCREL },
+#endif /* not INCLUDE_SHMEDIA */
+};
+
+/* Given a BFD reloc code, return the howto structure for the
+   corresponding SH ELF reloc.  */
+
+static reloc_howto_type *
+sh_elf_reloc_type_lookup (bfd *abfd, bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (sh_reloc_map) / sizeof (struct elf_reloc_map); i++)
+    {
+      if (sh_reloc_map[i].bfd_reloc_val == code)
+	return get_howto_table (abfd) + (int) sh_reloc_map[i].elf_reloc_val;
+    }
+
+  return NULL;
+}
+
+static reloc_howto_type *
+sh_elf_reloc_name_lookup (bfd *abfd, const char *r_name)
+{
+  unsigned int i;
+
+  if (vxworks_object_p (abfd))
+    {
+      for (i = 0;
+	   i < (sizeof (sh_vxworks_howto_table)
+		/ sizeof (sh_vxworks_howto_table[0]));
+	   i++)
+	if (sh_vxworks_howto_table[i].name != NULL
+	    && strcasecmp (sh_vxworks_howto_table[i].name, r_name) == 0)
+	  return &sh_vxworks_howto_table[i];
+    }
+  else
+    {
+      for (i = 0;
+	   i < (sizeof (sh_elf_howto_table)
+		/ sizeof (sh_elf_howto_table[0]));
+	   i++)
+	if (sh_elf_howto_table[i].name != NULL
+	    && strcasecmp (sh_elf_howto_table[i].name, r_name) == 0)
+	  return &sh_elf_howto_table[i];
+    }
+
+  return NULL;
+}
+
+/* Given an ELF reloc, fill in the howto field of a relent.  */
+
+static void
+sh_elf_info_to_howto (bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst)
+{
+  unsigned int r;
+
+  r = ELF32_R_TYPE (dst->r_info);
+
+  BFD_ASSERT (r < (unsigned int) R_SH_max);
+  BFD_ASSERT (r < R_SH_FIRST_INVALID_RELOC || r > R_SH_LAST_INVALID_RELOC);
+  BFD_ASSERT (r < R_SH_FIRST_INVALID_RELOC_2 || r > R_SH_LAST_INVALID_RELOC_2);
+  BFD_ASSERT (r < R_SH_FIRST_INVALID_RELOC_3 || r > R_SH_LAST_INVALID_RELOC_3);
+  BFD_ASSERT (r < R_SH_FIRST_INVALID_RELOC_4 || r > R_SH_LAST_INVALID_RELOC_4);
+  BFD_ASSERT (r < R_SH_FIRST_INVALID_RELOC_5 || r > R_SH_LAST_INVALID_RELOC_5);
+  BFD_ASSERT (r < R_SH_FIRST_INVALID_RELOC_6 || r > R_SH_LAST_INVALID_RELOC_6);
+
+  cache_ptr->howto = get_howto_table (abfd) + r;
+}
+
+/* This function handles relaxing for SH ELF.  See the corresponding
+   function in coff-sh.c for a description of what this does.  FIXME:
+   There is a lot of duplication here between this code and the COFF
+   specific code.  The format of relocs and symbols is wound deeply
+   into this code, but it would still be better if the duplication
+   could be eliminated somehow.  Note in particular that although both
+   functions use symbols like R_SH_CODE, those symbols have different
+   values; in coff-sh.c they come from include/coff/sh.h, whereas here
+   they come from enum elf_sh_reloc_type in include/elf/sh.h.  */
+
+static bfd_boolean
+sh_elf_relax_section (bfd *abfd, asection *sec,
+		      struct bfd_link_info *link_info, bfd_boolean *again)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *internal_relocs;
+  bfd_boolean have_code;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_byte *contents = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+
+  *again = FALSE;
+
+  if (link_info->relocatable
+      || (sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0)
+    return TRUE;
+
+#ifdef INCLUDE_SHMEDIA
+  if (elf_section_data (sec)->this_hdr.sh_flags
+      & (SHF_SH5_ISA32 | SHF_SH5_ISA32_MIXED))
+    {
+      return TRUE;
+    }
+#endif
+
+  symtab_hdr = &elf_symtab_hdr (abfd);
+
+  internal_relocs = (_bfd_elf_link_read_relocs
+		     (abfd, sec, NULL, (Elf_Internal_Rela *) NULL,
+		      link_info->keep_memory));
+  if (internal_relocs == NULL)
+    goto error_return;
+
+  have_code = FALSE;
+
+  irelend = internal_relocs + sec->reloc_count;
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      bfd_vma laddr, paddr, symval;
+      unsigned short insn;
+      Elf_Internal_Rela *irelfn, *irelscan, *irelcount;
+      bfd_signed_vma foff;
+
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_SH_CODE)
+	have_code = TRUE;
+
+      if (ELF32_R_TYPE (irel->r_info) != (int) R_SH_USES)
+	continue;
+
+      /* Get the section contents.  */
+      if (contents == NULL)
+	{
+	  if (elf_section_data (sec)->this_hdr.contents != NULL)
+	    contents = elf_section_data (sec)->this_hdr.contents;
+	  else
+	    {
+	      if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+		goto error_return;
+	    }
+	}
+
+      /* The r_addend field of the R_SH_USES reloc will point us to
+	 the register load.  The 4 is because the r_addend field is
+	 computed as though it were a jump offset, which are based
+	 from 4 bytes after the jump instruction.  */
+      laddr = irel->r_offset + 4 + irel->r_addend;
+      if (laddr >= sec->size)
+	{
+	  (*_bfd_error_handler) (_("%B: 0x%lx: warning: bad R_SH_USES offset"),
+				 abfd,
+				 (unsigned long) irel->r_offset);
+	  continue;
+	}
+      insn = bfd_get_16 (abfd, contents + laddr);
+
+      /* If the instruction is not mov.l NN,rN, we don't know what to
+	 do.  */
+      if ((insn & 0xf000) != 0xd000)
+	{
+	  ((*_bfd_error_handler)
+	   (_("%B: 0x%lx: warning: R_SH_USES points to unrecognized insn 0x%x"),
+	    abfd, (unsigned long) irel->r_offset, insn));
+	  continue;
+	}
+
+      /* Get the address from which the register is being loaded.  The
+	 displacement in the mov.l instruction is quadrupled.  It is a
+	 displacement from four bytes after the movl instruction, but,
+	 before adding in the PC address, two least significant bits
+	 of the PC are cleared.  We assume that the section is aligned
+	 on a four byte boundary.  */
+      paddr = insn & 0xff;
+      paddr *= 4;
+      paddr += (laddr + 4) &~ (bfd_vma) 3;
+      if (paddr >= sec->size)
+	{
+	  ((*_bfd_error_handler)
+	   (_("%B: 0x%lx: warning: bad R_SH_USES load offset"),
+	    abfd, (unsigned long) irel->r_offset));
+	  continue;
+	}
+
+      /* Get the reloc for the address from which the register is
+	 being loaded.  This reloc will tell us which function is
+	 actually being called.  */
+      for (irelfn = internal_relocs; irelfn < irelend; irelfn++)
+	if (irelfn->r_offset == paddr
+	    && ELF32_R_TYPE (irelfn->r_info) == (int) R_SH_DIR32)
+	  break;
+      if (irelfn >= irelend)
+	{
+	  ((*_bfd_error_handler)
+	   (_("%B: 0x%lx: warning: could not find expected reloc"),
+	    abfd, (unsigned long) paddr));
+	  continue;
+	}
+
+      /* Read this BFD's symbols if we haven't done so already.  */
+      if (isymbuf == NULL && symtab_hdr->sh_info != 0)
+	{
+	  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	  if (isymbuf == NULL)
+	    isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+					    symtab_hdr->sh_info, 0,
+					    NULL, NULL, NULL);
+	  if (isymbuf == NULL)
+	    goto error_return;
+	}
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      if (ELF32_R_SYM (irelfn->r_info) < symtab_hdr->sh_info)
+	{
+	  /* A local symbol.  */
+	  Elf_Internal_Sym *isym;
+
+	  isym = isymbuf + ELF32_R_SYM (irelfn->r_info);
+	  if (isym->st_shndx
+	      != (unsigned int) _bfd_elf_section_from_bfd_section (abfd, sec))
+	    {
+	      ((*_bfd_error_handler)
+	       (_("%B: 0x%lx: warning: symbol in unexpected section"),
+		abfd, (unsigned long) paddr));
+	      continue;
+	    }
+
+	  symval = (isym->st_value
+		    + sec->output_section->vma
+		    + sec->output_offset);
+	}
+      else
+	{
+	  unsigned long indx;
+	  struct elf_link_hash_entry *h;
+
+	  indx = ELF32_R_SYM (irelfn->r_info) - symtab_hdr->sh_info;
+	  h = elf_sym_hashes (abfd)[indx];
+	  BFD_ASSERT (h != NULL);
+	  if (h->root.type != bfd_link_hash_defined
+	      && h->root.type != bfd_link_hash_defweak)
+	    {
+	      /* This appears to be a reference to an undefined
+		 symbol.  Just ignore it--it will be caught by the
+		 regular reloc processing.  */
+	      continue;
+	    }
+
+	  symval = (h->root.u.def.value
+		    + h->root.u.def.section->output_section->vma
+		    + h->root.u.def.section->output_offset);
+	}
+
+      if (get_howto_table (abfd)[R_SH_DIR32].partial_inplace)
+	symval += bfd_get_32 (abfd, contents + paddr);
+      else
+	symval += irelfn->r_addend;
+
+      /* See if this function call can be shortened.  */
+      foff = (symval
+	      - (irel->r_offset
+		 + sec->output_section->vma
+		 + sec->output_offset
+		 + 4));
+      /* A branch to an address beyond ours might be increased by an
+	 .align that doesn't move when bytes behind us are deleted.
+	 So, we add some slop in this calculation to allow for
+	 that.  */
+      if (foff < -0x1000 || foff >= 0x1000 - 8)
+	{
+	  /* After all that work, we can't shorten this function call.  */
+	  continue;
+	}
+
+      /* Shorten the function call.  */
+
+      /* For simplicity of coding, we are going to modify the section
+	 contents, the section relocs, and the BFD symbol table.  We
+	 must tell the rest of the code not to free up this
+	 information.  It would be possible to instead create a table
+	 of changes which have to be made, as is done in coff-mips.c;
+	 that would be more work, but would require less memory when
+	 the linker is run.  */
+
+      elf_section_data (sec)->relocs = internal_relocs;
+      elf_section_data (sec)->this_hdr.contents = contents;
+      symtab_hdr->contents = (unsigned char *) isymbuf;
+
+      /* Replace the jsr with a bsr.  */
+
+      /* Change the R_SH_USES reloc into an R_SH_IND12W reloc, and
+	 replace the jsr with a bsr.  */
+      irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irelfn->r_info), R_SH_IND12W);
+      /* We used to test (ELF32_R_SYM (irelfn->r_info) < symtab_hdr->sh_info)
+	 here, but that only checks if the symbol is an external symbol,
+	 not if the symbol is in a different section.  Besides, we need
+	 a consistent meaning for the relocation, so we just assume here that
+	 the value of the symbol is not available.  */
+
+      /* We can't fully resolve this yet, because the external
+	 symbol value may be changed by future relaxing.  We let
+	 the final link phase handle it.  */
+      bfd_put_16 (abfd, (bfd_vma) 0xb000, contents + irel->r_offset);
+
+      irel->r_addend = -4;
+
+      /* When we calculated the symbol "value" we had an offset in the
+	 DIR32's word in memory (we read and add it above).  However,
+	 the jsr we create does NOT have this offset encoded, so we
+	 have to add it to the addend to preserve it.  */
+      irel->r_addend += bfd_get_32 (abfd, contents + paddr);
+
+      /* See if there is another R_SH_USES reloc referring to the same
+	 register load.  */
+      for (irelscan = internal_relocs; irelscan < irelend; irelscan++)
+	if (ELF32_R_TYPE (irelscan->r_info) == (int) R_SH_USES
+	    && laddr == irelscan->r_offset + 4 + irelscan->r_addend)
+	  break;
+      if (irelscan < irelend)
+	{
+	  /* Some other function call depends upon this register load,
+	     and we have not yet converted that function call.
+	     Indeed, we may never be able to convert it.  There is
+	     nothing else we can do at this point.  */
+	  continue;
+	}
+
+      /* Look for a R_SH_COUNT reloc on the location where the
+	 function address is stored.  Do this before deleting any
+	 bytes, to avoid confusion about the address.  */
+      for (irelcount = internal_relocs; irelcount < irelend; irelcount++)
+	if (irelcount->r_offset == paddr
+	    && ELF32_R_TYPE (irelcount->r_info) == (int) R_SH_COUNT)
+	  break;
+
+      /* Delete the register load.  */
+      if (! sh_elf_relax_delete_bytes (abfd, sec, laddr, 2))
+	goto error_return;
+
+      /* That will change things, so, just in case it permits some
+	 other function call to come within range, we should relax
+	 again.  Note that this is not required, and it may be slow.  */
+      *again = TRUE;
+
+      /* Now check whether we got a COUNT reloc.  */
+      if (irelcount >= irelend)
+	{
+	  ((*_bfd_error_handler)
+	   (_("%B: 0x%lx: warning: could not find expected COUNT reloc"),
+	    abfd, (unsigned long) paddr));
+	  continue;
+	}
+
+      /* The number of uses is stored in the r_addend field.  We've
+	 just deleted one.  */
+      if (irelcount->r_addend == 0)
+	{
+	  ((*_bfd_error_handler) (_("%B: 0x%lx: warning: bad count"),
+				  abfd,
+				  (unsigned long) paddr));
+	  continue;
+	}
+
+      --irelcount->r_addend;
+
+      /* If there are no more uses, we can delete the address.  Reload
+	 the address from irelfn, in case it was changed by the
+	 previous call to sh_elf_relax_delete_bytes.  */
+      if (irelcount->r_addend == 0)
+	{
+	  if (! sh_elf_relax_delete_bytes (abfd, sec, irelfn->r_offset, 4))
+	    goto error_return;
+	}
+
+      /* We've done all we can with that function call.  */
+    }
+
+  /* Look for load and store instructions that we can align on four
+     byte boundaries.  */
+  if ((elf_elfheader (abfd)->e_flags & EF_SH_MACH_MASK) != EF_SH4
+      && have_code)
+    {
+      bfd_boolean swapped;
+
+      /* Get the section contents.  */
+      if (contents == NULL)
+	{
+	  if (elf_section_data (sec)->this_hdr.contents != NULL)
+	    contents = elf_section_data (sec)->this_hdr.contents;
+	  else
+	    {
+	      if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+		goto error_return;
+	    }
+	}
+
+      if (! sh_elf_align_loads (abfd, sec, internal_relocs, contents,
+				&swapped))
+	goto error_return;
+
+      if (swapped)
+	{
+	  elf_section_data (sec)->relocs = internal_relocs;
+	  elf_section_data (sec)->this_hdr.contents = contents;
+	  symtab_hdr->contents = (unsigned char *) isymbuf;
+	}
+    }
+
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    {
+      if (! link_info->keep_memory)
+	free (isymbuf);
+      else
+	{
+	  /* Cache the symbols for elf_link_input_bfd.  */
+	  symtab_hdr->contents = (unsigned char *) isymbuf;
+	}
+    }
+
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    {
+      if (! link_info->keep_memory)
+	free (contents);
+      else
+	{
+	  /* Cache the section contents for elf_link_input_bfd.  */
+	  elf_section_data (sec)->this_hdr.contents = contents;
+	}
+    }
+
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return TRUE;
+
+ error_return:
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    free (contents);
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return FALSE;
+}
+
+/* Delete some bytes from a section while relaxing.  FIXME: There is a
+   lot of duplication between this function and sh_relax_delete_bytes
+   in coff-sh.c.  */
+
+static bfd_boolean
+sh_elf_relax_delete_bytes (bfd *abfd, asection *sec, bfd_vma addr,
+			   int count)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  unsigned int sec_shndx;
+  bfd_byte *contents;
+  Elf_Internal_Rela *irel, *irelend;
+  Elf_Internal_Rela *irelalign;
+  bfd_vma toaddr;
+  Elf_Internal_Sym *isymbuf, *isym, *isymend;
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_link_hash_entry **end_hashes;
+  unsigned int symcount;
+  asection *o;
+
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+
+  sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+  contents = elf_section_data (sec)->this_hdr.contents;
+
+  /* The deletion must stop at the next ALIGN reloc for an aligment
+     power larger than the number of bytes we are deleting.  */
+
+  irelalign = NULL;
+  toaddr = sec->size;
+
+  irel = elf_section_data (sec)->relocs;
+  irelend = irel + sec->reloc_count;
+  for (; irel < irelend; irel++)
+    {
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_SH_ALIGN
+	  && irel->r_offset > addr
+	  && count < (1 << irel->r_addend))
+	{
+	  irelalign = irel;
+	  toaddr = irel->r_offset;
+	  break;
+	}
+    }
+
+  /* Actually delete the bytes.  */
+  memmove (contents + addr, contents + addr + count,
+	   (size_t) (toaddr - addr - count));
+  if (irelalign == NULL)
+    sec->size -= count;
+  else
+    {
+      int i;
+
+#define NOP_OPCODE (0x0009)
+
+      BFD_ASSERT ((count & 1) == 0);
+      for (i = 0; i < count; i += 2)
+	bfd_put_16 (abfd, (bfd_vma) NOP_OPCODE, contents + toaddr - count + i);
+    }
+
+  /* Adjust all the relocs.  */
+  for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
+    {
+      bfd_vma nraddr, stop;
+      bfd_vma start = 0;
+      int insn = 0;
+      int off, adjust, oinsn;
+      bfd_signed_vma voff = 0;
+      bfd_boolean overflow;
+
+      /* Get the new reloc address.  */
+      nraddr = irel->r_offset;
+      if ((irel->r_offset > addr
+	   && irel->r_offset < toaddr)
+	  || (ELF32_R_TYPE (irel->r_info) == (int) R_SH_ALIGN
+	      && irel->r_offset == toaddr))
+	nraddr -= count;
+
+      /* See if this reloc was for the bytes we have deleted, in which
+	 case we no longer care about it.  Don't delete relocs which
+	 represent addresses, though.  */
+      if (irel->r_offset >= addr
+	  && irel->r_offset < addr + count
+	  && ELF32_R_TYPE (irel->r_info) != (int) R_SH_ALIGN
+	  && ELF32_R_TYPE (irel->r_info) != (int) R_SH_CODE
+	  && ELF32_R_TYPE (irel->r_info) != (int) R_SH_DATA
+	  && ELF32_R_TYPE (irel->r_info) != (int) R_SH_LABEL)
+	irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+				     (int) R_SH_NONE);
+
+      /* If this is a PC relative reloc, see if the range it covers
+	 includes the bytes we have deleted.  */
+      switch ((enum elf_sh_reloc_type) ELF32_R_TYPE (irel->r_info))
+	{
+	default:
+	  break;
+
+	case R_SH_DIR8WPN:
+	case R_SH_IND12W:
+	case R_SH_DIR8WPZ:
+	case R_SH_DIR8WPL:
+	  start = irel->r_offset;
+	  insn = bfd_get_16 (abfd, contents + nraddr);
+	  break;
+	}
+
+      switch ((enum elf_sh_reloc_type) ELF32_R_TYPE (irel->r_info))
+	{
+	default:
+	  start = stop = addr;
+	  break;
+
+	case R_SH_DIR32:
+	  /* If this reloc is against a symbol defined in this
+	     section, and the symbol will not be adjusted below, we
+	     must check the addend to see it will put the value in
+	     range to be adjusted, and hence must be changed.  */
+	  if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+	    {
+	      isym = isymbuf + ELF32_R_SYM (irel->r_info);
+	      if (isym->st_shndx == sec_shndx
+		  && (isym->st_value <= addr
+		      || isym->st_value >= toaddr))
+		{
+		  bfd_vma val;
+
+		  if (get_howto_table (abfd)[R_SH_DIR32].partial_inplace)
+		    {
+		      val = bfd_get_32 (abfd, contents + nraddr);
+		      val += isym->st_value;
+		      if (val > addr && val < toaddr)
+			bfd_put_32 (abfd, val - count, contents + nraddr);
+		    }
+		  else
+		    {
+		      val = isym->st_value + irel->r_addend;
+		      if (val > addr && val < toaddr)
+			irel->r_addend -= count;
+		    }
+		}
+	    }
+	  start = stop = addr;
+	  break;
+
+	case R_SH_DIR8WPN:
+	  off = insn & 0xff;
+	  if (off & 0x80)
+	    off -= 0x100;
+	  stop = (bfd_vma) ((bfd_signed_vma) start + 4 + off * 2);
+	  break;
+
+	case R_SH_IND12W:
+	  off = insn & 0xfff;
+	  if (! off)
+	    {
+	      /* This has been made by previous relaxation.  Since the
+		 relocation will be against an external symbol, the
+		 final relocation will just do the right thing.  */
+	      start = stop = addr;
+	    }
+	  else
+	    {
+	      if (off & 0x800)
+		off -= 0x1000;
+	      stop = (bfd_vma) ((bfd_signed_vma) start + 4 + off * 2);
+
+	      /* The addend will be against the section symbol, thus
+		 for adjusting the addend, the relevant start is the
+		 start of the section.
+		 N.B. If we want to abandon in-place changes here and
+		 test directly using symbol + addend, we have to take into
+		 account that the addend has already been adjusted by -4.  */
+	      if (stop > addr && stop < toaddr)
+		irel->r_addend -= count;
+	    }
+	  break;
+
+	case R_SH_DIR8WPZ:
+	  off = insn & 0xff;
+	  stop = start + 4 + off * 2;
+	  break;
+
+	case R_SH_DIR8WPL:
+	  off = insn & 0xff;
+	  stop = (start & ~(bfd_vma) 3) + 4 + off * 4;
+	  break;
+
+	case R_SH_SWITCH8:
+	case R_SH_SWITCH16:
+	case R_SH_SWITCH32:
+	  /* These relocs types represent
+	       .word L2-L1
+	     The r_addend field holds the difference between the reloc
+	     address and L1.  That is the start of the reloc, and
+	     adding in the contents gives us the top.  We must adjust
+	     both the r_offset field and the section contents.
+	     N.B. in gas / coff bfd, the elf bfd r_addend is called r_offset,
+	     and the elf bfd r_offset is called r_vaddr.  */
+
+	  stop = irel->r_offset;
+	  start = (bfd_vma) ((bfd_signed_vma) stop - (long) irel->r_addend);
+
+	  if (start > addr
+	      && start < toaddr
+	      && (stop <= addr || stop >= toaddr))
+	    irel->r_addend += count;
+	  else if (stop > addr
+		   && stop < toaddr
+		   && (start <= addr || start >= toaddr))
+	    irel->r_addend -= count;
+
+	  if (ELF32_R_TYPE (irel->r_info) == (int) R_SH_SWITCH16)
+	    voff = bfd_get_signed_16 (abfd, contents + nraddr);
+	  else if (ELF32_R_TYPE (irel->r_info) == (int) R_SH_SWITCH8)
+	    voff = bfd_get_8 (abfd, contents + nraddr);
+	  else
+	    voff = bfd_get_signed_32 (abfd, contents + nraddr);
+	  stop = (bfd_vma) ((bfd_signed_vma) start + voff);
+
+	  break;
+
+	case R_SH_USES:
+	  start = irel->r_offset;
+	  stop = (bfd_vma) ((bfd_signed_vma) start
+			    + (long) irel->r_addend
+			    + 4);
+	  break;
+	}
+
+      if (start > addr
+	  && start < toaddr
+	  && (stop <= addr || stop >= toaddr))
+	adjust = count;
+      else if (stop > addr
+	       && stop < toaddr
+	       && (start <= addr || start >= toaddr))
+	adjust = - count;
+      else
+	adjust = 0;
+
+      if (adjust != 0)
+	{
+	  oinsn = insn;
+	  overflow = FALSE;
+	  switch ((enum elf_sh_reloc_type) ELF32_R_TYPE (irel->r_info))
+	    {
+	    default:
+	      abort ();
+	      break;
+
+	    case R_SH_DIR8WPN:
+	    case R_SH_DIR8WPZ:
+	      insn += adjust / 2;
+	      if ((oinsn & 0xff00) != (insn & 0xff00))
+		overflow = TRUE;
+	      bfd_put_16 (abfd, (bfd_vma) insn, contents + nraddr);
+	      break;
+
+	    case R_SH_IND12W:
+	      insn += adjust / 2;
+	      if ((oinsn & 0xf000) != (insn & 0xf000))
+		overflow = TRUE;
+	      bfd_put_16 (abfd, (bfd_vma) insn, contents + nraddr);
+	      break;
+
+	    case R_SH_DIR8WPL:
+	      BFD_ASSERT (adjust == count || count >= 4);
+	      if (count >= 4)
+		insn += adjust / 4;
+	      else
+		{
+		  if ((irel->r_offset & 3) == 0)
+		    ++insn;
+		}
+	      if ((oinsn & 0xff00) != (insn & 0xff00))
+		overflow = TRUE;
+	      bfd_put_16 (abfd, (bfd_vma) insn, contents + nraddr);
+	      break;
+
+	    case R_SH_SWITCH8:
+	      voff += adjust;
+	      if (voff < 0 || voff >= 0xff)
+		overflow = TRUE;
+	      bfd_put_8 (abfd, voff, contents + nraddr);
+	      break;
+
+	    case R_SH_SWITCH16:
+	      voff += adjust;
+	      if (voff < - 0x8000 || voff >= 0x8000)
+		overflow = TRUE;
+	      bfd_put_signed_16 (abfd, (bfd_vma) voff, contents + nraddr);
+	      break;
+
+	    case R_SH_SWITCH32:
+	      voff += adjust;
+	      bfd_put_signed_32 (abfd, (bfd_vma) voff, contents + nraddr);
+	      break;
+
+	    case R_SH_USES:
+	      irel->r_addend += adjust;
+	      break;
+	    }
+
+	  if (overflow)
+	    {
+	      ((*_bfd_error_handler)
+	       (_("%B: 0x%lx: fatal: reloc overflow while relaxing"),
+		abfd, (unsigned long) irel->r_offset));
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	}
+
+      irel->r_offset = nraddr;
+    }
+
+  /* Look through all the other sections.  If there contain any IMM32
+     relocs against internal symbols which we are not going to adjust
+     below, we may need to adjust the addends.  */
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      Elf_Internal_Rela *internal_relocs;
+      Elf_Internal_Rela *irelscan, *irelscanend;
+      bfd_byte *ocontents;
+
+      if (o == sec
+	  || (o->flags & SEC_RELOC) == 0
+	  || o->reloc_count == 0)
+	continue;
+
+      /* We always cache the relocs.  Perhaps, if info->keep_memory is
+	 FALSE, we should free them, if we are permitted to, when we
+	 leave sh_coff_relax_section.  */
+      internal_relocs = (_bfd_elf_link_read_relocs
+			 (abfd, o, NULL, (Elf_Internal_Rela *) NULL, TRUE));
+      if (internal_relocs == NULL)
+	return FALSE;
+
+      ocontents = NULL;
+      irelscanend = internal_relocs + o->reloc_count;
+      for (irelscan = internal_relocs; irelscan < irelscanend; irelscan++)
+	{
+	  /* Dwarf line numbers use R_SH_SWITCH32 relocs.  */
+	  if (ELF32_R_TYPE (irelscan->r_info) == (int) R_SH_SWITCH32)
+	    {
+	      bfd_vma start, stop;
+	      bfd_signed_vma voff;
+
+	      if (ocontents == NULL)
+		{
+		  if (elf_section_data (o)->this_hdr.contents != NULL)
+		    ocontents = elf_section_data (o)->this_hdr.contents;
+		  else
+		    {
+		      /* We always cache the section contents.
+			 Perhaps, if info->keep_memory is FALSE, we
+			 should free them, if we are permitted to,
+			 when we leave sh_coff_relax_section.  */
+		      if (!bfd_malloc_and_get_section (abfd, o, &ocontents))
+			{
+			  if (ocontents != NULL)
+			    free (ocontents);
+			  return FALSE;
+			}
+
+		      elf_section_data (o)->this_hdr.contents = ocontents;
+		    }
+		}
+
+	      stop = irelscan->r_offset;
+	      start
+		= (bfd_vma) ((bfd_signed_vma) stop - (long) irelscan->r_addend);
+
+	      /* STOP is in a different section, so it won't change.  */
+	      if (start > addr && start < toaddr)
+		irelscan->r_addend += count;
+
+	      voff = bfd_get_signed_32 (abfd, ocontents + irelscan->r_offset);
+	      stop = (bfd_vma) ((bfd_signed_vma) start + voff);
+
+	      if (start > addr
+		  && start < toaddr
+		  && (stop <= addr || stop >= toaddr))
+		bfd_put_signed_32 (abfd, (bfd_vma) voff + count,
+				   ocontents + irelscan->r_offset);
+	      else if (stop > addr
+		       && stop < toaddr
+		       && (start <= addr || start >= toaddr))
+		bfd_put_signed_32 (abfd, (bfd_vma) voff - count,
+				   ocontents + irelscan->r_offset);
+	    }
+
+	  if (ELF32_R_TYPE (irelscan->r_info) != (int) R_SH_DIR32)
+	    continue;
+
+	  if (ELF32_R_SYM (irelscan->r_info) >= symtab_hdr->sh_info)
+	    continue;
+
+
+	  isym = isymbuf + ELF32_R_SYM (irelscan->r_info);
+	  if (isym->st_shndx == sec_shndx
+	      && (isym->st_value <= addr
+		  || isym->st_value >= toaddr))
+	    {
+	      bfd_vma val;
+
+	      if (ocontents == NULL)
+		{
+		  if (elf_section_data (o)->this_hdr.contents != NULL)
+		    ocontents = elf_section_data (o)->this_hdr.contents;
+		  else
+		    {
+		      /* We always cache the section contents.
+			 Perhaps, if info->keep_memory is FALSE, we
+			 should free them, if we are permitted to,
+			 when we leave sh_coff_relax_section.  */
+		      if (!bfd_malloc_and_get_section (abfd, o, &ocontents))
+			{
+			  if (ocontents != NULL)
+			    free (ocontents);
+			  return FALSE;
+			}
+
+		      elf_section_data (o)->this_hdr.contents = ocontents;
+		    }
+		}
+
+	      val = bfd_get_32 (abfd, ocontents + irelscan->r_offset);
+	      val += isym->st_value;
+	      if (val > addr && val < toaddr)
+		bfd_put_32 (abfd, val - count,
+			    ocontents + irelscan->r_offset);
+	    }
+	}
+    }
+
+  /* Adjust the local symbols defined in this section.  */
+  isymend = isymbuf + symtab_hdr->sh_info;
+  for (isym = isymbuf; isym < isymend; isym++)
+    {
+      if (isym->st_shndx == sec_shndx
+	  && isym->st_value > addr
+	  && isym->st_value < toaddr)
+	isym->st_value -= count;
+    }
+
+  /* Now adjust the global symbols defined in this section.  */
+  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+	      - symtab_hdr->sh_info);
+  sym_hashes = elf_sym_hashes (abfd);
+  end_hashes = sym_hashes + symcount;
+  for (; sym_hashes < end_hashes; sym_hashes++)
+    {
+      struct elf_link_hash_entry *sym_hash = *sym_hashes;
+      if ((sym_hash->root.type == bfd_link_hash_defined
+	   || sym_hash->root.type == bfd_link_hash_defweak)
+	  && sym_hash->root.u.def.section == sec
+	  && sym_hash->root.u.def.value > addr
+	  && sym_hash->root.u.def.value < toaddr)
+	{
+	  sym_hash->root.u.def.value -= count;
+	}
+    }
+
+  /* See if we can move the ALIGN reloc forward.  We have adjusted
+     r_offset for it already.  */
+  if (irelalign != NULL)
+    {
+      bfd_vma alignto, alignaddr;
+
+      alignto = BFD_ALIGN (toaddr, 1 << irelalign->r_addend);
+      alignaddr = BFD_ALIGN (irelalign->r_offset,
+			     1 << irelalign->r_addend);
+      if (alignto != alignaddr)
+	{
+	  /* Tail recursion.  */
+	  return sh_elf_relax_delete_bytes (abfd, sec, alignaddr,
+					    (int) (alignto - alignaddr));
+	}
+    }
+
+  return TRUE;
+}
+
+/* Look for loads and stores which we can align to four byte
+   boundaries.  This is like sh_align_loads in coff-sh.c.  */
+
+static bfd_boolean
+sh_elf_align_loads (bfd *abfd ATTRIBUTE_UNUSED, asection *sec,
+		    Elf_Internal_Rela *internal_relocs,
+		    bfd_byte *contents ATTRIBUTE_UNUSED,
+		    bfd_boolean *pswapped)
+{
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_vma *labels = NULL;
+  bfd_vma *label, *label_end;
+  bfd_size_type amt;
+
+  *pswapped = FALSE;
+
+  irelend = internal_relocs + sec->reloc_count;
+
+  /* Get all the addresses with labels on them.  */
+  amt = sec->reloc_count;
+  amt *= sizeof (bfd_vma);
+  labels = (bfd_vma *) bfd_malloc (amt);
+  if (labels == NULL)
+    goto error_return;
+  label_end = labels;
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_SH_LABEL)
+	{
+	  *label_end = irel->r_offset;
+	  ++label_end;
+	}
+    }
+
+  /* Note that the assembler currently always outputs relocs in
+     address order.  If that ever changes, this code will need to sort
+     the label values and the relocs.  */
+
+  label = labels;
+
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      bfd_vma start, stop;
+
+      if (ELF32_R_TYPE (irel->r_info) != (int) R_SH_CODE)
+	continue;
+
+      start = irel->r_offset;
+
+      for (irel++; irel < irelend; irel++)
+	if (ELF32_R_TYPE (irel->r_info) == (int) R_SH_DATA)
+	  break;
+      if (irel < irelend)
+	stop = irel->r_offset;
+      else
+	stop = sec->size;
+
+      if (! _bfd_sh_align_load_span (abfd, sec, contents, sh_elf_swap_insns,
+				     internal_relocs, &label,
+				     label_end, start, stop, pswapped))
+	goto error_return;
+    }
+
+  free (labels);
+
+  return TRUE;
+
+ error_return:
+  if (labels != NULL)
+    free (labels);
+  return FALSE;
+}
+
+#ifndef SH64_ELF
+/* Swap two SH instructions.  This is like sh_swap_insns in coff-sh.c.  */
+
+static bfd_boolean
+sh_elf_swap_insns (bfd *abfd, asection *sec, void *relocs,
+		   bfd_byte *contents, bfd_vma addr)
+{
+  Elf_Internal_Rela *internal_relocs = (Elf_Internal_Rela *) relocs;
+  unsigned short i1, i2;
+  Elf_Internal_Rela *irel, *irelend;
+
+  /* Swap the instructions themselves.  */
+  i1 = bfd_get_16 (abfd, contents + addr);
+  i2 = bfd_get_16 (abfd, contents + addr + 2);
+  bfd_put_16 (abfd, (bfd_vma) i2, contents + addr);
+  bfd_put_16 (abfd, (bfd_vma) i1, contents + addr + 2);
+
+  /* Adjust all reloc addresses.  */
+  irelend = internal_relocs + sec->reloc_count;
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      enum elf_sh_reloc_type type;
+      int add;
+
+      /* There are a few special types of relocs that we don't want to
+	 adjust.  These relocs do not apply to the instruction itself,
+	 but are only associated with the address.  */
+      type = (enum elf_sh_reloc_type) ELF32_R_TYPE (irel->r_info);
+      if (type == R_SH_ALIGN
+	  || type == R_SH_CODE
+	  || type == R_SH_DATA
+	  || type == R_SH_LABEL)
+	continue;
+
+      /* If an R_SH_USES reloc points to one of the addresses being
+	 swapped, we must adjust it.  It would be incorrect to do this
+	 for a jump, though, since we want to execute both
+	 instructions after the jump.  (We have avoided swapping
+	 around a label, so the jump will not wind up executing an
+	 instruction it shouldn't).  */
+      if (type == R_SH_USES)
+	{
+	  bfd_vma off;
+
+	  off = irel->r_offset + 4 + irel->r_addend;
+	  if (off == addr)
+	    irel->r_offset += 2;
+	  else if (off == addr + 2)
+	    irel->r_offset -= 2;
+	}
+
+      if (irel->r_offset == addr)
+	{
+	  irel->r_offset += 2;
+	  add = -2;
+	}
+      else if (irel->r_offset == addr + 2)
+	{
+	  irel->r_offset -= 2;
+	  add = 2;
+	}
+      else
+	add = 0;
+
+      if (add != 0)
+	{
+	  bfd_byte *loc;
+	  unsigned short insn, oinsn;
+	  bfd_boolean overflow;
+
+	  loc = contents + irel->r_offset;
+	  overflow = FALSE;
+	  switch (type)
+	    {
+	    default:
+	      break;
+
+	    case R_SH_DIR8WPN:
+	    case R_SH_DIR8WPZ:
+	      insn = bfd_get_16 (abfd, loc);
+	      oinsn = insn;
+	      insn += add / 2;
+	      if ((oinsn & 0xff00) != (insn & 0xff00))
+		overflow = TRUE;
+	      bfd_put_16 (abfd, (bfd_vma) insn, loc);
+	      break;
+
+	    case R_SH_IND12W:
+	      insn = bfd_get_16 (abfd, loc);
+	      oinsn = insn;
+	      insn += add / 2;
+	      if ((oinsn & 0xf000) != (insn & 0xf000))
+		overflow = TRUE;
+	      bfd_put_16 (abfd, (bfd_vma) insn, loc);
+	      break;
+
+	    case R_SH_DIR8WPL:
+	      /* This reloc ignores the least significant 3 bits of
+		 the program counter before adding in the offset.
+		 This means that if ADDR is at an even address, the
+		 swap will not affect the offset.  If ADDR is an at an
+		 odd address, then the instruction will be crossing a
+		 four byte boundary, and must be adjusted.  */
+	      if ((addr & 3) != 0)
+		{
+		  insn = bfd_get_16 (abfd, loc);
+		  oinsn = insn;
+		  insn += add / 2;
+		  if ((oinsn & 0xff00) != (insn & 0xff00))
+		    overflow = TRUE;
+		  bfd_put_16 (abfd, (bfd_vma) insn, loc);
+		}
+
+	      break;
+	    }
+
+	  if (overflow)
+	    {
+	      ((*_bfd_error_handler)
+	       (_("%B: 0x%lx: fatal: reloc overflow while relaxing"),
+		abfd, (unsigned long) irel->r_offset));
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+#endif /* defined SH64_ELF */
+
+/* Describes one of the various PLT styles.  */
+
+struct elf_sh_plt_info
+{
+  /* The template for the first PLT entry, or NULL if there is no special
+     first entry.  */
+  const bfd_byte *plt0_entry;
+
+  /* The size of PLT0_ENTRY in bytes, or 0 if PLT0_ENTRY is NULL.  */
+  bfd_vma plt0_entry_size;
+
+  /* Index I is the offset into PLT0_ENTRY of a pointer to
+     _GLOBAL_OFFSET_TABLE_ + I * 4.  The value is MINUS_ONE
+     if there is no such pointer.  */
+  bfd_vma plt0_got_fields[3];
+
+  /* The template for a symbol's PLT entry.  */
+  const bfd_byte *symbol_entry;
+
+  /* The size of SYMBOL_ENTRY in bytes.  */
+  bfd_vma symbol_entry_size;
+
+  /* Byte offsets of fields in SYMBOL_ENTRY.  Not all fields are used
+     on all targets.  The comments by each member indicate the value
+     that the field must hold.  */
+  struct {
+    bfd_vma got_entry; /* the address of the symbol's .got.plt entry */
+    bfd_vma plt; /* .plt (or a branch to .plt on VxWorks) */
+    bfd_vma reloc_offset; /* the offset of the symbol's JMP_SLOT reloc */
+    bfd_boolean got20; /* TRUE if got_entry points to a movi20
+			  instruction (instead of a constant pool
+			  entry).  */
+  } symbol_fields;
+
+  /* The offset of the resolver stub from the start of SYMBOL_ENTRY.  */
+  bfd_vma symbol_resolve_offset;
+
+  /* A different PLT layout which can be used for the first
+     MAX_SHORT_PLT entries.  It must share the same plt0.  NULL in
+     other cases.  */
+  const struct elf_sh_plt_info *short_plt;
+};
+
+#ifdef INCLUDE_SHMEDIA
+
+/* The size in bytes of an entry in the procedure linkage table.  */
+
+#define ELF_PLT_ENTRY_SIZE 64
+
+/* First entry in an absolute procedure linkage table look like this.  */
+
+static const bfd_byte elf_sh_plt0_entry_be[ELF_PLT_ENTRY_SIZE] =
+{
+  0xcc, 0x00, 0x01, 0x10, /* movi  .got.plt >> 16, r17 */
+  0xc8, 0x00, 0x01, 0x10, /* shori .got.plt & 65535, r17 */
+  0x89, 0x10, 0x09, 0x90, /* ld.l  r17, 8, r25 */
+  0x6b, 0xf1, 0x66, 0x00, /* ptabs r25, tr0 */
+  0x89, 0x10, 0x05, 0x10, /* ld.l  r17, 4, r17 */
+  0x44, 0x01, 0xff, 0xf0, /* blink tr0, r63 */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+};
+
+static const bfd_byte elf_sh_plt0_entry_le[ELF_PLT_ENTRY_SIZE] =
+{
+  0x10, 0x01, 0x00, 0xcc, /* movi  .got.plt >> 16, r17 */
+  0x10, 0x01, 0x00, 0xc8, /* shori .got.plt & 65535, r17 */
+  0x90, 0x09, 0x10, 0x89, /* ld.l  r17, 8, r25 */
+  0x00, 0x66, 0xf1, 0x6b, /* ptabs r25, tr0 */
+  0x10, 0x05, 0x10, 0x89, /* ld.l  r17, 4, r17 */
+  0xf0, 0xff, 0x01, 0x44, /* blink tr0, r63 */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+};
+
+/* Sebsequent entries in an absolute procedure linkage table look like
+   this.  */
+
+static const bfd_byte elf_sh_plt_entry_be[ELF_PLT_ENTRY_SIZE] =
+{
+  0xcc, 0x00, 0x01, 0x90, /* movi  nameN-in-GOT >> 16, r25 */
+  0xc8, 0x00, 0x01, 0x90, /* shori nameN-in-GOT & 65535, r25 */
+  0x89, 0x90, 0x01, 0x90, /* ld.l  r25, 0, r25 */
+  0x6b, 0xf1, 0x66, 0x00, /* ptabs r25, tr0 */
+  0x44, 0x01, 0xff, 0xf0, /* blink tr0, r63 */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0xcc, 0x00, 0x01, 0x90, /* movi  .PLT0 >> 16, r25 */
+  0xc8, 0x00, 0x01, 0x90, /* shori .PLT0 & 65535, r25 */
+  0x6b, 0xf1, 0x66, 0x00, /* ptabs r25, tr0 */
+  0xcc, 0x00, 0x01, 0x50, /* movi  reloc-offset >> 16, r21 */
+  0xc8, 0x00, 0x01, 0x50, /* shori reloc-offset & 65535, r21 */
+  0x44, 0x01, 0xff, 0xf0, /* blink tr0, r63 */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+};
+
+static const bfd_byte elf_sh_plt_entry_le[ELF_PLT_ENTRY_SIZE] =
+{
+  0x90, 0x01, 0x00, 0xcc, /* movi  nameN-in-GOT >> 16, r25 */
+  0x90, 0x01, 0x00, 0xc8, /* shori nameN-in-GOT & 65535, r25 */
+  0x90, 0x01, 0x90, 0x89, /* ld.l  r25, 0, r25 */
+  0x00, 0x66, 0xf1, 0x6b, /* ptabs r25, tr0 */
+  0xf0, 0xff, 0x01, 0x44, /* blink tr0, r63 */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0x90, 0x01, 0x00, 0xcc, /* movi  .PLT0 >> 16, r25 */
+  0x90, 0x01, 0x00, 0xc8, /* shori .PLT0 & 65535, r25 */
+  0x00, 0x66, 0xf1, 0x6b, /* ptabs r25, tr0 */
+  0x50, 0x01, 0x00, 0xcc, /* movi  reloc-offset >> 16, r21 */
+  0x50, 0x01, 0x00, 0xc8, /* shori reloc-offset & 65535, r21 */
+  0xf0, 0xff, 0x01, 0x44, /* blink tr0, r63 */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+};
+
+/* Entries in a PIC procedure linkage table look like this.  */
+
+static const bfd_byte elf_sh_pic_plt_entry_be[ELF_PLT_ENTRY_SIZE] =
+{
+  0xcc, 0x00, 0x01, 0x90, /* movi  nameN@GOT >> 16, r25 */
+  0xc8, 0x00, 0x01, 0x90, /* shori nameN@GOT & 65535, r25 */
+  0x40, 0xc2, 0x65, 0x90, /* ldx.l r12, r25, r25 */
+  0x6b, 0xf1, 0x66, 0x00, /* ptabs r25, tr0 */
+  0x44, 0x01, 0xff, 0xf0, /* blink tr0, r63 */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0xce, 0x00, 0x01, 0x10, /* movi  -GOT_BIAS, r17 */
+  0x00, 0xc8, 0x45, 0x10, /* add.l r12, r17, r17 */
+  0x89, 0x10, 0x09, 0x90, /* ld.l  r17, 8, r25 */
+  0x6b, 0xf1, 0x66, 0x00, /* ptabs r25, tr0 */
+  0x89, 0x10, 0x05, 0x10, /* ld.l  r17, 4, r17 */
+  0xcc, 0x00, 0x01, 0x50, /* movi  reloc-offset >> 16, r21 */
+  0xc8, 0x00, 0x01, 0x50, /* shori reloc-offset & 65535, r21 */
+  0x44, 0x01, 0xff, 0xf0, /* blink tr0, r63 */
+};
+
+static const bfd_byte elf_sh_pic_plt_entry_le[ELF_PLT_ENTRY_SIZE] =
+{
+  0x90, 0x01, 0x00, 0xcc, /* movi  nameN@GOT >> 16, r25 */
+  0x90, 0x01, 0x00, 0xc8, /* shori nameN@GOT & 65535, r25 */
+  0x90, 0x65, 0xc2, 0x40, /* ldx.l r12, r25, r25 */
+  0x00, 0x66, 0xf1, 0x6b, /* ptabs r25, tr0 */
+  0xf0, 0xff, 0x01, 0x44, /* blink tr0, r63 */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0x10, 0x01, 0x00, 0xce, /* movi  -GOT_BIAS, r17 */
+  0x10, 0x45, 0xc8, 0x00, /* add.l r12, r17, r17 */
+  0x90, 0x09, 0x10, 0x89, /* ld.l  r17, 8, r25 */
+  0x00, 0x66, 0xf1, 0x6b, /* ptabs r25, tr0 */
+  0x10, 0x05, 0x10, 0x89, /* ld.l  r17, 4, r17 */
+  0x50, 0x01, 0x00, 0xcc, /* movi  reloc-offset >> 16, r21 */
+  0x50, 0x01, 0x00, 0xc8, /* shori reloc-offset & 65535, r21 */
+  0xf0, 0xff, 0x01, 0x44, /* blink tr0, r63 */
+};
+
+static const struct elf_sh_plt_info elf_sh_plts[2][2] = {
+  {
+    {
+      /* Big-endian non-PIC.  */
+      elf_sh_plt0_entry_be,
+      ELF_PLT_ENTRY_SIZE,
+      { 0, MINUS_ONE, MINUS_ONE },
+      elf_sh_plt_entry_be,
+      ELF_PLT_ENTRY_SIZE,
+      { 0, 32, 48, FALSE },
+      33, /* includes ISA encoding */
+      NULL
+    },
+    {
+      /* Little-endian non-PIC.  */
+      elf_sh_plt0_entry_le,
+      ELF_PLT_ENTRY_SIZE,
+      { 0, MINUS_ONE, MINUS_ONE },
+      elf_sh_plt_entry_le,
+      ELF_PLT_ENTRY_SIZE,
+      { 0, 32, 48, FALSE },
+      33, /* includes ISA encoding */
+      NULL
+    },
+  },
+  {
+    {
+      /* Big-endian PIC.  */
+      elf_sh_plt0_entry_be,
+      ELF_PLT_ENTRY_SIZE,
+      { MINUS_ONE, MINUS_ONE, MINUS_ONE },
+      elf_sh_pic_plt_entry_be,
+      ELF_PLT_ENTRY_SIZE,
+      { 0, MINUS_ONE, 52, FALSE },
+      33, /* includes ISA encoding */
+      NULL
+    },
+    {
+      /* Little-endian PIC.  */
+      elf_sh_plt0_entry_le,
+      ELF_PLT_ENTRY_SIZE,
+      { MINUS_ONE, MINUS_ONE, MINUS_ONE },
+      elf_sh_pic_plt_entry_le,
+      ELF_PLT_ENTRY_SIZE,
+      { 0, MINUS_ONE, 52, FALSE },
+      33, /* includes ISA encoding */
+      NULL
+    },
+  }
+};
+
+/* Return offset of the linker in PLT0 entry.  */
+#define elf_sh_plt0_gotplt_offset(info) 0
+
+/* Install a 32-bit PLT field starting at ADDR, which occurs in OUTPUT_BFD.
+   VALUE is the field's value and CODE_P is true if VALUE refers to code,
+   not data.
+
+   On SH64, each 32-bit field is loaded by a movi/shori pair.  */
+
+inline static void
+install_plt_field (bfd *output_bfd, bfd_boolean code_p,
+		   unsigned long value, bfd_byte *addr)
+{
+  value |= code_p;
+  bfd_put_32 (output_bfd,
+	      bfd_get_32 (output_bfd, addr)
+	      | ((value >> 6) & 0x3fffc00),
+	      addr);
+  bfd_put_32 (output_bfd,
+	      bfd_get_32 (output_bfd, addr + 4)
+	      | ((value << 10) & 0x3fffc00),
+	      addr + 4);
+}
+
+/* Return the type of PLT associated with ABFD.  PIC_P is true if
+   the object is position-independent.  */
+
+static const struct elf_sh_plt_info *
+get_plt_info (bfd *abfd ATTRIBUTE_UNUSED, bfd_boolean pic_p)
+{
+  return &elf_sh_plts[pic_p][!bfd_big_endian (abfd)];
+}
+#else
+/* The size in bytes of an entry in the procedure linkage table.  */
+
+#define ELF_PLT_ENTRY_SIZE 28
+
+/* First entry in an absolute procedure linkage table look like this.  */
+
+/* Note - this code has been "optimised" not to use r2.  r2 is used by
+   GCC to return the address of large structures, so it should not be
+   corrupted here.  This does mean however, that this PLT does not conform
+   to the SH PIC ABI.  That spec says that r0 contains the type of the PLT
+   and r2 contains the GOT id.  This version stores the GOT id in r0 and
+   ignores the type.  Loaders can easily detect this difference however,
+   since the type will always be 0 or 8, and the GOT ids will always be
+   greater than or equal to 12.  */
+static const bfd_byte elf_sh_plt0_entry_be[ELF_PLT_ENTRY_SIZE] =
+{
+  0xd0, 0x05,	/* mov.l 2f,r0 */
+  0x60, 0x02,	/* mov.l @r0,r0 */
+  0x2f, 0x06,	/* mov.l r0,@-r15 */
+  0xd0, 0x03,	/* mov.l 1f,r0 */
+  0x60, 0x02,	/* mov.l @r0,r0 */
+  0x40, 0x2b,	/* jmp @r0 */
+  0x60, 0xf6,	/*  mov.l @r15+,r0 */
+  0x00, 0x09,	/* nop */
+  0x00, 0x09,	/* nop */
+  0x00, 0x09,	/* nop */
+  0, 0, 0, 0,	/* 1: replaced with address of .got.plt + 8.  */
+  0, 0, 0, 0,	/* 2: replaced with address of .got.plt + 4.  */
+};
+
+static const bfd_byte elf_sh_plt0_entry_le[ELF_PLT_ENTRY_SIZE] =
+{
+  0x05, 0xd0,	/* mov.l 2f,r0 */
+  0x02, 0x60,	/* mov.l @r0,r0 */
+  0x06, 0x2f,	/* mov.l r0,@-r15 */
+  0x03, 0xd0,	/* mov.l 1f,r0 */
+  0x02, 0x60,	/* mov.l @r0,r0 */
+  0x2b, 0x40,	/* jmp @r0 */
+  0xf6, 0x60,	/*  mov.l @r15+,r0 */
+  0x09, 0x00,	/* nop */
+  0x09, 0x00,	/* nop */
+  0x09, 0x00,	/* nop */
+  0, 0, 0, 0,	/* 1: replaced with address of .got.plt + 8.  */
+  0, 0, 0, 0,	/* 2: replaced with address of .got.plt + 4.  */
+};
+
+/* Sebsequent entries in an absolute procedure linkage table look like
+   this.  */
+
+static const bfd_byte elf_sh_plt_entry_be[ELF_PLT_ENTRY_SIZE] =
+{
+  0xd0, 0x04,	/* mov.l 1f,r0 */
+  0x60, 0x02,	/* mov.l @(r0,r12),r0 */
+  0xd1, 0x02,	/* mov.l 0f,r1 */
+  0x40, 0x2b,   /* jmp @r0 */
+  0x60, 0x13,	/*  mov r1,r0 */
+  0xd1, 0x03,	/* mov.l 2f,r1 */
+  0x40, 0x2b,	/* jmp @r0 */
+  0x00, 0x09,	/* nop */
+  0, 0, 0, 0,	/* 0: replaced with address of .PLT0.  */
+  0, 0, 0, 0,	/* 1: replaced with address of this symbol in .got.  */
+  0, 0, 0, 0,	/* 2: replaced with offset into relocation table.  */
+};
+
+static const bfd_byte elf_sh_plt_entry_le[ELF_PLT_ENTRY_SIZE] =
+{
+  0x04, 0xd0,	/* mov.l 1f,r0 */
+  0x02, 0x60,	/* mov.l @r0,r0 */
+  0x02, 0xd1,	/* mov.l 0f,r1 */
+  0x2b, 0x40,   /* jmp @r0 */
+  0x13, 0x60,	/*  mov r1,r0 */
+  0x03, 0xd1,	/* mov.l 2f,r1 */
+  0x2b, 0x40,	/* jmp @r0 */
+  0x09, 0x00,	/*  nop */
+  0, 0, 0, 0,	/* 0: replaced with address of .PLT0.  */
+  0, 0, 0, 0,	/* 1: replaced with address of this symbol in .got.  */
+  0, 0, 0, 0,	/* 2: replaced with offset into relocation table.  */
+};
+
+/* Entries in a PIC procedure linkage table look like this.  */
+
+static const bfd_byte elf_sh_pic_plt_entry_be[ELF_PLT_ENTRY_SIZE] =
+{
+  0xd0, 0x04,	/* mov.l 1f,r0 */
+  0x00, 0xce,	/* mov.l @(r0,r12),r0 */
+  0x40, 0x2b,	/* jmp @r0 */
+  0x00, 0x09,	/*  nop */
+  0x50, 0xc2,	/* mov.l @(8,r12),r0 */
+  0xd1, 0x03,	/* mov.l 2f,r1 */
+  0x40, 0x2b,	/* jmp @r0 */
+  0x50, 0xc1,	/*  mov.l @(4,r12),r0 */
+  0x00, 0x09,	/* nop */
+  0x00, 0x09,	/* nop */
+  0, 0, 0, 0,	/* 1: replaced with address of this symbol in .got.  */
+  0, 0, 0, 0    /* 2: replaced with offset into relocation table.  */
+};
+
+static const bfd_byte elf_sh_pic_plt_entry_le[ELF_PLT_ENTRY_SIZE] =
+{
+  0x04, 0xd0,	/* mov.l 1f,r0 */
+  0xce, 0x00,	/* mov.l @(r0,r12),r0 */
+  0x2b, 0x40,	/* jmp @r0 */
+  0x09, 0x00,	/*  nop */
+  0xc2, 0x50,	/* mov.l @(8,r12),r0 */
+  0x03, 0xd1,	/* mov.l 2f,r1 */
+  0x2b, 0x40,	/* jmp @r0 */
+  0xc1, 0x50,	/*  mov.l @(4,r12),r0 */
+  0x09, 0x00,	/*  nop */
+  0x09, 0x00,	/* nop */
+  0, 0, 0, 0,	/* 1: replaced with address of this symbol in .got.  */
+  0, 0, 0, 0    /* 2: replaced with offset into relocation table.  */
+};
+
+static const struct elf_sh_plt_info elf_sh_plts[2][2] = {
+  {
+    {
+      /* Big-endian non-PIC.  */
+      elf_sh_plt0_entry_be,
+      ELF_PLT_ENTRY_SIZE,
+      { MINUS_ONE, 24, 20 },
+      elf_sh_plt_entry_be,
+      ELF_PLT_ENTRY_SIZE,
+      { 20, 16, 24, FALSE },
+      8,
+      NULL
+    },
+    {
+      /* Little-endian non-PIC.  */
+      elf_sh_plt0_entry_le,
+      ELF_PLT_ENTRY_SIZE,
+      { MINUS_ONE, 24, 20 },
+      elf_sh_plt_entry_le,
+      ELF_PLT_ENTRY_SIZE,
+      { 20, 16, 24, FALSE },
+      8,
+      NULL
+    },
+  },
+  {
+    {
+      /* Big-endian PIC.  */
+      elf_sh_plt0_entry_be,
+      ELF_PLT_ENTRY_SIZE,
+      { MINUS_ONE, MINUS_ONE, MINUS_ONE },
+      elf_sh_pic_plt_entry_be,
+      ELF_PLT_ENTRY_SIZE,
+      { 20, MINUS_ONE, 24, FALSE },
+      8,
+      NULL
+    },
+    {
+      /* Little-endian PIC.  */
+      elf_sh_plt0_entry_le,
+      ELF_PLT_ENTRY_SIZE,
+      { MINUS_ONE, MINUS_ONE, MINUS_ONE },
+      elf_sh_pic_plt_entry_le,
+      ELF_PLT_ENTRY_SIZE,
+      { 20, MINUS_ONE, 24, FALSE },
+      8,
+      NULL
+    },
+  }
+};
+
+#define VXWORKS_PLT_HEADER_SIZE 12
+#define VXWORKS_PLT_ENTRY_SIZE 24
+
+static const bfd_byte vxworks_sh_plt0_entry_be[VXWORKS_PLT_HEADER_SIZE] =
+{
+  0xd1, 0x01,	/* mov.l @(8,pc),r1 */
+  0x61, 0x12,	/* mov.l @r1,r1 */
+  0x41, 0x2b,	/* jmp @r1 */
+  0x00, 0x09,	/* nop */
+  0, 0, 0, 0	/* 0: replaced with _GLOBAL_OFFSET_TABLE+8.  */
+};
+
+static const bfd_byte vxworks_sh_plt0_entry_le[VXWORKS_PLT_HEADER_SIZE] =
+{
+  0x01, 0xd1,	/* mov.l @(8,pc),r1 */
+  0x12, 0x61,	/* mov.l @r1,r1 */
+  0x2b, 0x41,	/* jmp @r1 */
+  0x09, 0x00,	/* nop */
+  0, 0, 0, 0	/* 0: replaced with _GLOBAL_OFFSET_TABLE+8.  */
+};
+
+static const bfd_byte vxworks_sh_plt_entry_be[VXWORKS_PLT_ENTRY_SIZE] =
+{
+  0xd0, 0x01,	/* mov.l @(8,pc),r0 */
+  0x60, 0x02,	/* mov.l @r0,r0 */
+  0x40, 0x2b,	/* jmp @r0 */
+  0x00, 0x09,	/* nop */
+  0, 0, 0, 0,	/* 0: replaced with address of this symbol in .got.  */
+  0xd0, 0x01,	/* mov.l @(8,pc),r0 */
+  0xa0, 0x00,	/* bra PLT (We need to fix the offset.)  */
+  0x00, 0x09,	/* nop */
+  0x00, 0x09,	/* nop */
+  0, 0, 0, 0,	/* 1: replaced with offset into relocation table.  */
+};
+
+static const bfd_byte vxworks_sh_plt_entry_le[VXWORKS_PLT_ENTRY_SIZE] =
+{
+  0x01, 0xd0,	/* mov.l @(8,pc),r0 */
+  0x02, 0x60,	/* mov.l @r0,r0 */
+  0x2b, 0x40,	/* jmp @r0 */
+  0x09, 0x00,	/* nop */
+  0, 0, 0, 0,	/* 0: replaced with address of this symbol in .got.  */
+  0x01, 0xd0,	/* mov.l @(8,pc),r0 */
+  0x00, 0xa0,	/* bra PLT (We need to fix the offset.)  */
+  0x09, 0x00,	/* nop */
+  0x09, 0x00,	/* nop */
+  0, 0, 0, 0,	/* 1: replaced with offset into relocation table.  */
+};
+
+static const bfd_byte vxworks_sh_pic_plt_entry_be[VXWORKS_PLT_ENTRY_SIZE] =
+{
+  0xd0, 0x01,	/* mov.l @(8,pc),r0 */
+  0x00, 0xce,	/* mov.l @(r0,r12),r0 */
+  0x40, 0x2b,	/* jmp @r0 */
+  0x00, 0x09,	/* nop */
+  0, 0, 0, 0,	/* 0: replaced with offset of this symbol in .got.  */
+  0xd0, 0x01,	/* mov.l @(8,pc),r0 */
+  0x51, 0xc2,	/* mov.l @(8,r12),r1 */
+  0x41, 0x2b,	/* jmp @r1 */
+  0x00, 0x09,	/* nop */
+  0, 0, 0, 0,	/* 1: replaced with offset into relocation table.  */
+};
+
+static const bfd_byte vxworks_sh_pic_plt_entry_le[VXWORKS_PLT_ENTRY_SIZE] =
+{
+  0x01, 0xd0,	/* mov.l @(8,pc),r0 */
+  0xce, 0x00,	/* mov.l @(r0,r12),r0 */
+  0x2b, 0x40,	/* jmp @r0 */
+  0x09, 0x00,	/* nop */
+  0, 0, 0, 0,	/* 0: replaced with offset of this symbol in .got.  */
+  0x01, 0xd0,	/* mov.l @(8,pc),r0 */
+  0xc2, 0x51,	/* mov.l @(8,r12),r1 */
+  0x2b, 0x41,	/* jmp @r1 */
+  0x09, 0x00,	/* nop */
+  0, 0, 0, 0,	/* 1: replaced with offset into relocation table.  */
+};
+
+static const struct elf_sh_plt_info vxworks_sh_plts[2][2] = {
+  {
+    {
+      /* Big-endian non-PIC.  */
+      vxworks_sh_plt0_entry_be,
+      VXWORKS_PLT_HEADER_SIZE,
+      { MINUS_ONE, MINUS_ONE, 8 },
+      vxworks_sh_plt_entry_be,
+      VXWORKS_PLT_ENTRY_SIZE,
+      { 8, 14, 20, FALSE },
+      12,
+      NULL
+    },
+    {
+      /* Little-endian non-PIC.  */
+      vxworks_sh_plt0_entry_le,
+      VXWORKS_PLT_HEADER_SIZE,
+      { MINUS_ONE, MINUS_ONE, 8 },
+      vxworks_sh_plt_entry_le,
+      VXWORKS_PLT_ENTRY_SIZE,
+      { 8, 14, 20, FALSE },
+      12,
+      NULL
+    },
+  },
+  {
+    {
+      /* Big-endian PIC.  */
+      NULL,
+      0,
+      { MINUS_ONE, MINUS_ONE, MINUS_ONE },
+      vxworks_sh_pic_plt_entry_be,
+      VXWORKS_PLT_ENTRY_SIZE,
+      { 8, MINUS_ONE, 20, FALSE },
+      12,
+      NULL
+    },
+    {
+      /* Little-endian PIC.  */
+      NULL,
+      0,
+      { MINUS_ONE, MINUS_ONE, MINUS_ONE },
+      vxworks_sh_pic_plt_entry_le,
+      VXWORKS_PLT_ENTRY_SIZE,
+      { 8, MINUS_ONE, 20, FALSE },
+      12,
+      NULL
+    },
+  }
+};
+
+/* FDPIC PLT entries.  Two unimplemented optimizations for lazy
+   binding are to omit the lazy binding stub when linking with -z now
+   and to move lazy binding stubs into a separate region for better
+   cache behavior.  */
+
+#define FDPIC_PLT_ENTRY_SIZE 28
+#define FDPIC_PLT_LAZY_OFFSET 20
+
+/* FIXME: The lazy binding stub requires a plt0 - which may need to be
+   duplicated if it is out of range, or which can be inlined.  So
+   right now it is always inlined, which wastes a word per stub.  It
+   might be easier to handle the duplication if we put the lazy
+   stubs separately.  */
+
+static const bfd_byte fdpic_sh_plt_entry_be[FDPIC_PLT_ENTRY_SIZE] =
+{
+  0xd0, 0x02,	/* mov.l @(12,pc),r0 */
+  0x01, 0xce,	/* mov.l @(r0,r12),r1 */
+  0x70, 0x04,	/* add #4, r0 */
+  0x41, 0x2b,	/* jmp @r1 */
+  0x0c, 0xce,	/* mov.l @(r0,r12),r12 */
+  0x00, 0x09,	/* nop */
+  0, 0, 0, 0,	/* 0: replaced with offset of this symbol's funcdesc */
+  0, 0, 0, 0,	/* 1: replaced with offset into relocation table.  */
+  0x60, 0xc2,	/* mov.l @r12,r0 */
+  0x40, 0x2b,	/* jmp @r0 */
+  0x53, 0xc1,	/*  mov.l @(4,r12),r3 */
+  0x00, 0x09,	/* nop */
+};
+
+static const bfd_byte fdpic_sh_plt_entry_le[FDPIC_PLT_ENTRY_SIZE] =
+{
+  0x02, 0xd0,	/* mov.l @(12,pc),r0 */
+  0xce, 0x01,	/* mov.l @(r0,r12),r1 */
+  0x04, 0x70,	/* add #4, r0 */
+  0x2b, 0x41,	/* jmp @r1 */
+  0xce, 0x0c,	/* mov.l @(r0,r12),r12 */
+  0x09, 0x00,	/* nop */
+  0, 0, 0, 0,	/* 0: replaced with offset of this symbol's funcdesc */
+  0, 0, 0, 0,	/* 1: replaced with offset into relocation table.  */
+  0xc2, 0x60,	/* mov.l @r12,r0 */
+  0x2b, 0x40,	/* jmp @r0 */
+  0xc1, 0x53,	/*  mov.l @(4,r12),r3 */
+  0x09, 0x00,	/* nop */
+};
+
+static const struct elf_sh_plt_info fdpic_sh_plts[2] = {
+  {
+    /* Big-endian PIC.  */
+    NULL,
+    0,
+    { MINUS_ONE, MINUS_ONE, MINUS_ONE },
+    fdpic_sh_plt_entry_be,
+    FDPIC_PLT_ENTRY_SIZE,
+    { 12, MINUS_ONE, 16, FALSE },
+    FDPIC_PLT_LAZY_OFFSET,
+    NULL
+  },
+  {
+    /* Little-endian PIC.  */
+    NULL,
+    0,
+    { MINUS_ONE, MINUS_ONE, MINUS_ONE },
+    fdpic_sh_plt_entry_le,
+    FDPIC_PLT_ENTRY_SIZE,
+    { 12, MINUS_ONE, 16, FALSE },
+    FDPIC_PLT_LAZY_OFFSET,
+    NULL
+  },
+};
+
+/* On SH2A, we can use the movi20 instruction to generate shorter PLT
+   entries for the first 64K slots.  We use the normal FDPIC PLT entry
+   past that point; we could also use movi20s, which might be faster,
+   but would not be any smaller.  */
+
+#define FDPIC_SH2A_PLT_ENTRY_SIZE 24
+#define FDPIC_SH2A_PLT_LAZY_OFFSET 16
+
+static const bfd_byte fdpic_sh2a_plt_entry_be[FDPIC_SH2A_PLT_ENTRY_SIZE] =
+{
+  0, 0, 0, 0,	/* movi20 #gotofffuncdesc,r0 */
+  0x01, 0xce,	/* mov.l @(r0,r12),r1 */
+  0x70, 0x04,	/* add #4, r0 */
+  0x41, 0x2b,	/* jmp @r1 */
+  0x0c, 0xce,	/* mov.l @(r0,r12),r12 */
+  0, 0, 0, 0,	/* 1: replaced with offset into relocation table.  */
+  0x60, 0xc2,	/* mov.l @r12,r0 */
+  0x40, 0x2b,	/* jmp @r0 */
+  0x53, 0xc1,	/*  mov.l @(4,r12),r3 */
+  0x00, 0x09,	/* nop */
+};
+
+static const bfd_byte fdpic_sh2a_plt_entry_le[FDPIC_SH2A_PLT_ENTRY_SIZE] =
+{
+  0, 0, 0, 0,	/* movi20 #gotofffuncdesc,r0 */
+  0xce, 0x01,	/* mov.l @(r0,r12),r1 */
+  0x04, 0x70,	/* add #4, r0 */
+  0x2b, 0x41,	/* jmp @r1 */
+  0xce, 0x0c,	/* mov.l @(r0,r12),r12 */
+  0, 0, 0, 0,	/* 1: replaced with offset into relocation table.  */
+  0xc2, 0x60,	/* mov.l @r12,r0 */
+  0x2b, 0x40,	/* jmp @r0 */
+  0xc1, 0x53,	/*  mov.l @(4,r12),r3 */
+  0x09, 0x00,	/* nop */
+};
+
+static const struct elf_sh_plt_info fdpic_sh2a_short_plt_be = {
+  /* Big-endian FDPIC, max index 64K.  */
+  NULL,
+  0,
+  { MINUS_ONE, MINUS_ONE, MINUS_ONE },
+  fdpic_sh2a_plt_entry_be,
+  FDPIC_SH2A_PLT_ENTRY_SIZE,
+  { 0, MINUS_ONE, 12, TRUE },
+  FDPIC_SH2A_PLT_LAZY_OFFSET,
+  NULL
+};
+
+static const struct elf_sh_plt_info fdpic_sh2a_short_plt_le = {
+  /* Little-endian FDPIC, max index 64K.  */
+  NULL,
+  0,
+  { MINUS_ONE, MINUS_ONE, MINUS_ONE },
+  fdpic_sh2a_plt_entry_le,
+  FDPIC_SH2A_PLT_ENTRY_SIZE,
+  { 0, MINUS_ONE, 12, TRUE },
+  FDPIC_SH2A_PLT_LAZY_OFFSET,
+  NULL
+};
+
+static const struct elf_sh_plt_info fdpic_sh2a_plts[2] = {
+  {
+    /* Big-endian PIC.  */
+    NULL,
+    0,
+    { MINUS_ONE, MINUS_ONE, MINUS_ONE },
+    fdpic_sh_plt_entry_be,
+    FDPIC_PLT_ENTRY_SIZE,
+    { 12, MINUS_ONE, 16, FALSE },
+    FDPIC_PLT_LAZY_OFFSET,
+    &fdpic_sh2a_short_plt_be
+  },
+  {
+    /* Little-endian PIC.  */
+    NULL,
+    0,
+    { MINUS_ONE, MINUS_ONE, MINUS_ONE },
+    fdpic_sh_plt_entry_le,
+    FDPIC_PLT_ENTRY_SIZE,
+    { 12, MINUS_ONE, 16, FALSE },
+    FDPIC_PLT_LAZY_OFFSET,
+    &fdpic_sh2a_short_plt_le
+  },
+};
+
+/* Return the type of PLT associated with ABFD.  PIC_P is true if
+   the object is position-independent.  */
+
+static const struct elf_sh_plt_info *
+get_plt_info (bfd *abfd, bfd_boolean pic_p)
+{
+  if (fdpic_object_p (abfd))
+    {
+      /* If any input file requires SH2A we can use a shorter PLT
+	 sequence.  */
+      if (sh_get_arch_from_bfd_mach (bfd_get_mach (abfd)) & arch_sh2a_base)
+	return &fdpic_sh2a_plts[!bfd_big_endian (abfd)];
+      else
+	return &fdpic_sh_plts[!bfd_big_endian (abfd)];
+    }
+  if (vxworks_object_p (abfd))
+    return &vxworks_sh_plts[pic_p][!bfd_big_endian (abfd)];
+  return &elf_sh_plts[pic_p][!bfd_big_endian (abfd)];
+}
+
+/* Install a 32-bit PLT field starting at ADDR, which occurs in OUTPUT_BFD.
+   VALUE is the field's value and CODE_P is true if VALUE refers to code,
+   not data.  */
+
+inline static void
+install_plt_field (bfd *output_bfd, bfd_boolean code_p ATTRIBUTE_UNUSED,
+		   unsigned long value, bfd_byte *addr)
+{
+  bfd_put_32 (output_bfd, value, addr);
+}
+#endif
+
+/* The number of PLT entries which can use a shorter PLT, if any.
+   Currently always 64K, since only SH-2A FDPIC uses this; a
+   20-bit movi20 can address that many function descriptors below
+   _GLOBAL_OFFSET_TABLE_.  */
+#define MAX_SHORT_PLT 65536
+
+/* Return the index of the PLT entry at byte offset OFFSET.  */
+
+static bfd_vma
+get_plt_index (const struct elf_sh_plt_info *info, bfd_vma offset)
+{
+  bfd_vma plt_index = 0;
+
+  offset -= info->plt0_entry_size;
+  if (info->short_plt != NULL)
+    {
+      if (offset > MAX_SHORT_PLT * info->short_plt->symbol_entry_size)
+	{
+	  plt_index = MAX_SHORT_PLT;
+	  offset -= MAX_SHORT_PLT * info->short_plt->symbol_entry_size;
+	}
+      else
+	info = info->short_plt;
+    }
+  return plt_index + offset / info->symbol_entry_size;
+}
+
+/* Do the inverse operation.  */
+
+static bfd_vma
+get_plt_offset (const struct elf_sh_plt_info *info, bfd_vma plt_index)
+{
+  bfd_vma offset = 0;
+
+  if (info->short_plt != NULL)
+    {
+      if (plt_index > MAX_SHORT_PLT)
+	{
+	  offset = MAX_SHORT_PLT * info->short_plt->symbol_entry_size;
+	  plt_index -= MAX_SHORT_PLT;
+	}
+      else
+	info = info->short_plt;
+    }
+  return (offset + info->plt0_entry_size
+	  + (plt_index * info->symbol_entry_size));
+}
+
+/* The sh linker needs to keep track of the number of relocs that it
+   decides to copy as dynamic relocs in check_relocs for each symbol.
+   This is so that it can later discard them if they are found to be
+   unnecessary.  We store the information in a field extending the
+   regular ELF linker hash table.  */
+
+struct elf_sh_dyn_relocs
+{
+  struct elf_sh_dyn_relocs *next;
+
+  /* The input section of the reloc.  */
+  asection *sec;
+
+  /* Total number of relocs copied for the input section.  */
+  bfd_size_type count;
+
+  /* Number of pc-relative relocs copied for the input section.  */
+  bfd_size_type pc_count;
+};
+
+union gotref
+{
+  bfd_signed_vma refcount;
+  bfd_vma offset;
+};
+
+/* sh ELF linker hash entry.  */
+
+struct elf_sh_link_hash_entry
+{
+  struct elf_link_hash_entry root;
+
+#ifdef INCLUDE_SHMEDIA
+  union
+  {
+    bfd_signed_vma refcount;
+    bfd_vma offset;
+  } datalabel_got;
+#endif
+
+  /* Track dynamic relocs copied for this symbol.  */
+  struct elf_sh_dyn_relocs *dyn_relocs;
+
+  bfd_signed_vma gotplt_refcount;
+
+  /* A local function descriptor, for FDPIC.  The refcount counts
+     R_SH_FUNCDESC, R_SH_GOTOFFFUNCDESC, and R_SH_GOTOFFFUNCDESC20
+     relocations; the PLT and GOT entry are accounted
+     for separately.  After adjust_dynamic_symbol, the offset is
+     MINUS_ONE if there is no local descriptor (dynamic linker
+     managed and no PLT entry, or undefined weak non-dynamic).
+     During check_relocs we do not yet know whether the local
+     descriptor will be canonical.  */
+  union gotref funcdesc;
+
+  /* How many of the above refcounted relocations were R_SH_FUNCDESC,
+     and thus require fixups or relocations.  */
+  bfd_signed_vma abs_funcdesc_refcount;
+
+  enum {
+    GOT_UNKNOWN = 0, GOT_NORMAL, GOT_TLS_GD, GOT_TLS_IE, GOT_FUNCDESC
+  } got_type;
+};
+
+#define sh_elf_hash_entry(ent) ((struct elf_sh_link_hash_entry *)(ent))
+
+struct sh_elf_obj_tdata
+{
+  struct elf_obj_tdata root;
+
+  /* got_type for each local got entry.  */
+  char *local_got_type;
+
+  /* Function descriptor refcount and offset for each local symbol.  */
+  union gotref *local_funcdesc;
+};
+
+#define sh_elf_tdata(abfd) \
+  ((struct sh_elf_obj_tdata *) (abfd)->tdata.any)
+
+#define sh_elf_local_got_type(abfd) \
+  (sh_elf_tdata (abfd)->local_got_type)
+
+#define sh_elf_local_funcdesc(abfd) \
+  (sh_elf_tdata (abfd)->local_funcdesc)
+
+#define is_sh_elf(bfd) \
+  (bfd_get_flavour (bfd) == bfd_target_elf_flavour \
+   && elf_tdata (bfd) != NULL \
+   && elf_object_id (bfd) == SH_ELF_DATA)
+
+/* Override the generic function because we need to store sh_elf_obj_tdata
+   as the specific tdata.  */
+
+static bfd_boolean
+sh_elf_mkobject (bfd *abfd)
+{
+  return bfd_elf_allocate_object (abfd, sizeof (struct sh_elf_obj_tdata),
+				  SH_ELF_DATA);
+}
+
+/* sh ELF linker hash table.  */
+
+struct elf_sh_link_hash_table
+{
+  struct elf_link_hash_table root;
+
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *sgot;
+  asection *sgotplt;
+  asection *srelgot;
+  asection *splt;
+  asection *srelplt;
+  asection *sdynbss;
+  asection *srelbss;
+  asection *sfuncdesc;
+  asection *srelfuncdesc;
+  asection *srofixup;
+
+  /* The (unloaded but important) VxWorks .rela.plt.unloaded section.  */
+  asection *srelplt2;
+
+  /* Small local sym cache.  */
+  struct sym_cache sym_cache;
+
+  /* A counter or offset to track a TLS got entry.  */
+  union
+    {
+      bfd_signed_vma refcount;
+      bfd_vma offset;
+    } tls_ldm_got;
+
+  /* The type of PLT to use.  */
+  const struct elf_sh_plt_info *plt_info;
+
+  /* True if the target system is VxWorks.  */
+  bfd_boolean vxworks_p;
+
+  /* True if the target system uses FDPIC.  */
+  bfd_boolean fdpic_p;
+};
+
+/* Traverse an sh ELF linker hash table.  */
+
+#define sh_elf_link_hash_traverse(table, func, info)			\
+  (elf_link_hash_traverse						\
+   (&(table)->root,							\
+    (bfd_boolean (*) (struct elf_link_hash_entry *, void *)) (func), \
+    (info)))
+
+/* Get the sh ELF linker hash table from a link_info structure.  */
+
+#define sh_elf_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == SH_ELF_DATA ? ((struct elf_sh_link_hash_table *) ((p)->hash)) : NULL)
+
+/* Create an entry in an sh ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+sh_elf_link_hash_newfunc (struct bfd_hash_entry *entry,
+			  struct bfd_hash_table *table,
+			  const char *string)
+{
+  struct elf_sh_link_hash_entry *ret =
+    (struct elf_sh_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == (struct elf_sh_link_hash_entry *) NULL)
+    ret = ((struct elf_sh_link_hash_entry *)
+	   bfd_hash_allocate (table,
+			      sizeof (struct elf_sh_link_hash_entry)));
+  if (ret == (struct elf_sh_link_hash_entry *) NULL)
+    return (struct bfd_hash_entry *) ret;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct elf_sh_link_hash_entry *)
+	 _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
+				     table, string));
+  if (ret != (struct elf_sh_link_hash_entry *) NULL)
+    {
+      ret->dyn_relocs = NULL;
+      ret->gotplt_refcount = 0;
+#ifdef INCLUDE_SHMEDIA
+      ret->datalabel_got.refcount = ret->root.got.refcount;
+#endif
+      ret->funcdesc.refcount = 0;
+      ret->abs_funcdesc_refcount = 0;
+      ret->got_type = GOT_UNKNOWN;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Create an sh ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+sh_elf_link_hash_table_create (bfd *abfd)
+{
+  struct elf_sh_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct elf_sh_link_hash_table);
+
+  ret = (struct elf_sh_link_hash_table *) bfd_malloc (amt);
+  if (ret == (struct elf_sh_link_hash_table *) NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->root, abfd,
+				      sh_elf_link_hash_newfunc,
+				      sizeof (struct elf_sh_link_hash_entry),
+				      SH_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  ret->sgot = NULL;
+  ret->sgotplt = NULL;
+  ret->srelgot = NULL;
+  ret->splt = NULL;
+  ret->srelplt = NULL;
+  ret->sdynbss = NULL;
+  ret->srelbss = NULL;
+  ret->srelplt2 = NULL;
+  ret->sym_cache.abfd = NULL;
+  ret->tls_ldm_got.refcount = 0;
+  ret->plt_info = NULL;
+  ret->vxworks_p = vxworks_object_p (abfd);
+  ret->fdpic_p = fdpic_object_p (abfd);
+
+  return &ret->root.root;
+}
+
+static bfd_boolean
+sh_elf_omit_section_dynsym (bfd *output_bfd ATTRIBUTE_UNUSED,
+			    struct bfd_link_info *info, asection *p)
+{
+  struct elf_sh_link_hash_table *htab = sh_elf_hash_table (info);
+
+  /* Non-FDPIC binaries do not need dynamic symbols for sections.  */
+  if (!htab->fdpic_p)
+    return TRUE;
+
+  /* We need dynamic symbols for every section, since segments can
+     relocate independently.  */
+  switch (elf_section_data (p)->this_hdr.sh_type)
+    {
+    case SHT_PROGBITS:
+    case SHT_NOBITS:
+      /* If sh_type is yet undecided, assume it could be
+	 SHT_PROGBITS/SHT_NOBITS.  */
+    case SHT_NULL:
+      return FALSE;
+
+      /* There shouldn't be section relative relocations
+	 against any other section.  */
+    default:
+      return TRUE;
+    }
+}
+
+/* Create .got, .gotplt, and .rela.got sections in DYNOBJ, and set up
+   shortcuts to them in our hash table.  */
+
+static bfd_boolean
+create_got_section (bfd *dynobj, struct bfd_link_info *info)
+{
+  struct elf_sh_link_hash_table *htab;
+
+  if (! _bfd_elf_create_got_section (dynobj, info))
+    return FALSE;
+
+  htab = sh_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  htab->sgot = bfd_get_section_by_name (dynobj, ".got");
+  htab->sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");
+  htab->srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+  if (! htab->sgot || ! htab->sgotplt || ! htab->srelgot)
+    abort ();
+
+  htab->sfuncdesc = bfd_make_section_with_flags (dynobj, ".got.funcdesc",
+						 (SEC_ALLOC | SEC_LOAD
+						  | SEC_HAS_CONTENTS
+						  | SEC_IN_MEMORY
+						  | SEC_LINKER_CREATED));
+  if (htab->sfuncdesc == NULL
+      || ! bfd_set_section_alignment (dynobj, htab->sfuncdesc, 2))
+    return FALSE;
+
+  htab->srelfuncdesc = bfd_make_section_with_flags (dynobj,
+						    ".rela.got.funcdesc",
+						    (SEC_ALLOC | SEC_LOAD
+						     | SEC_HAS_CONTENTS
+						     | SEC_IN_MEMORY
+						     | SEC_LINKER_CREATED
+						     | SEC_READONLY));
+  if (htab->srelfuncdesc == NULL
+      || ! bfd_set_section_alignment (dynobj, htab->srelfuncdesc, 2))
+    return FALSE;
+
+  /* Also create .rofixup.  */
+  htab->srofixup = bfd_make_section_with_flags (dynobj, ".rofixup",
+						(SEC_ALLOC | SEC_LOAD
+						 | SEC_HAS_CONTENTS
+						 | SEC_IN_MEMORY
+						 | SEC_LINKER_CREATED
+						 | SEC_READONLY));
+  if (htab->srofixup == NULL
+      || ! bfd_set_section_alignment (dynobj, htab->srofixup, 2))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Create dynamic sections when linking against a dynamic object.  */
+
+static bfd_boolean
+sh_elf_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  struct elf_sh_link_hash_table *htab;
+  flagword flags, pltflags;
+  asection *s;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  int ptralign = 0;
+
+  switch (bed->s->arch_size)
+    {
+    case 32:
+      ptralign = 2;
+      break;
+
+    case 64:
+      ptralign = 3;
+      break;
+
+    default:
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  htab = sh_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (htab->root.dynamic_sections_created)
+    return TRUE;
+
+  /* We need to create .plt, .rel[a].plt, .got, .got.plt, .dynbss, and
+     .rel[a].bss sections.  */
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	   | SEC_LINKER_CREATED);
+
+  pltflags = flags;
+  pltflags |= SEC_CODE;
+  if (bed->plt_not_loaded)
+    pltflags &= ~ (SEC_LOAD | SEC_HAS_CONTENTS);
+  if (bed->plt_readonly)
+    pltflags |= SEC_READONLY;
+
+  s = bfd_make_section_with_flags (abfd, ".plt", pltflags);
+  htab->splt = s;
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, bed->plt_alignment))
+    return FALSE;
+
+  if (bed->want_plt_sym)
+    {
+      /* Define the symbol _PROCEDURE_LINKAGE_TABLE_ at the start of the
+	 .plt section.  */
+      struct elf_link_hash_entry *h;
+      struct bfd_link_hash_entry *bh = NULL;
+
+      if (! (_bfd_generic_link_add_one_symbol
+	     (info, abfd, "_PROCEDURE_LINKAGE_TABLE_", BSF_GLOBAL, s,
+	      (bfd_vma) 0, (const char *) NULL, FALSE,
+	      get_elf_backend_data (abfd)->collect, &bh)))
+	return FALSE;
+
+      h = (struct elf_link_hash_entry *) bh;
+      h->def_regular = 1;
+      h->type = STT_OBJECT;
+      htab->root.hplt = h;
+
+      if (info->shared
+	  && ! bfd_elf_link_record_dynamic_symbol (info, h))
+	return FALSE;
+    }
+
+  s = bfd_make_section_with_flags (abfd,
+				   bed->default_use_rela_p ? ".rela.plt" : ".rel.plt",
+				   flags | SEC_READONLY);
+  htab->srelplt = s;
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, ptralign))
+    return FALSE;
+
+  if (htab->sgot == NULL
+      && !create_got_section (abfd, info))
+    return FALSE;
+
+  {
+    const char *secname;
+    char *relname;
+    flagword secflags;
+    asection *sec;
+
+    for (sec = abfd->sections; sec; sec = sec->next)
+      {
+	secflags = bfd_get_section_flags (abfd, sec);
+	if ((secflags & (SEC_DATA | SEC_LINKER_CREATED))
+	    || ((secflags & SEC_HAS_CONTENTS) != SEC_HAS_CONTENTS))
+	  continue;
+	secname = bfd_get_section_name (abfd, sec);
+	relname = (char *) bfd_malloc ((bfd_size_type) strlen (secname) + 6);
+	strcpy (relname, ".rela");
+	strcat (relname, secname);
+	if (bfd_get_section_by_name (abfd, secname))
+	  continue;
+	s = bfd_make_section_with_flags (abfd, relname,
+					 flags | SEC_READONLY);
+	if (s == NULL
+	    || ! bfd_set_section_alignment (abfd, s, ptralign))
+	  return FALSE;
+      }
+  }
+
+  if (bed->want_dynbss)
+    {
+      /* The .dynbss section is a place to put symbols which are defined
+	 by dynamic objects, are referenced by regular objects, and are
+	 not functions.  We must allocate space for them in the process
+	 image and use a R_*_COPY reloc to tell the dynamic linker to
+	 initialize them at run time.  The linker script puts the .dynbss
+	 section into the .bss section of the final image.  */
+      s = bfd_make_section_with_flags (abfd, ".dynbss",
+				       SEC_ALLOC | SEC_LINKER_CREATED);
+      htab->sdynbss = s;
+      if (s == NULL)
+	return FALSE;
+
+      /* The .rel[a].bss section holds copy relocs.  This section is not
+	 normally needed.  We need to create it here, though, so that the
+	 linker will map it to an output section.  We can't just create it
+	 only if we need it, because we will not know whether we need it
+	 until we have seen all the input files, and the first time the
+	 main linker code calls BFD after examining all the input files
+	 (size_dynamic_sections) the input sections have already been
+	 mapped to the output sections.  If the section turns out not to
+	 be needed, we can discard it later.  We will never need this
+	 section when generating a shared object, since they do not use
+	 copy relocs.  */
+      if (! info->shared)
+	{
+	  s = bfd_make_section_with_flags (abfd,
+					   (bed->default_use_rela_p
+					    ? ".rela.bss" : ".rel.bss"),
+					   flags | SEC_READONLY);
+	  htab->srelbss = s;
+	  if (s == NULL
+	      || ! bfd_set_section_alignment (abfd, s, ptralign))
+	    return FALSE;
+	}
+    }
+
+  if (htab->vxworks_p)
+    {
+      if (!elf_vxworks_create_dynamic_sections (abfd, info, &htab->srelplt2))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+sh_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+			      struct elf_link_hash_entry *h)
+{
+  struct elf_sh_link_hash_table *htab;
+  struct elf_sh_link_hash_entry *eh;
+  struct elf_sh_dyn_relocs *p;
+  asection *s;
+
+  htab = sh_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (htab->root.dynobj != NULL
+	      && (h->needs_plt
+		  || h->u.weakdef != NULL
+		  || (h->def_dynamic
+		      && h->ref_regular
+		      && !h->def_regular)));
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later,
+     when we know the address of the .got section.  */
+  if (h->type == STT_FUNC
+      || h->needs_plt)
+    {
+      if (h->plt.refcount <= 0
+	  || SYMBOL_CALLS_LOCAL (info, h)
+	  || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+	      && h->root.type == bfd_link_hash_undefweak))
+	{
+	  /* This case can occur if we saw a PLT reloc in an input
+	     file, but the symbol was never referred to by a dynamic
+	     object.  In such a case, we don't actually need to build
+	     a procedure linkage table, and we can just do a REL32
+	     reloc instead.  */
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	}
+
+      return TRUE;
+    }
+  else
+    h->plt.offset = (bfd_vma) -1;
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      if (info->nocopyreloc)
+	h->non_got_ref = h->u.weakdef->non_got_ref;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if (!h->non_got_ref)
+    return TRUE;
+
+  /* If -z nocopyreloc was given, we won't generate them either.  */
+  if (info->nocopyreloc)
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  eh = (struct elf_sh_link_hash_entry *) h;
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      s = p->sec->output_section;
+      if (s != NULL && (s->flags & (SEC_READONLY | SEC_HAS_CONTENTS)) != 0)
+	break;
+    }
+
+  /* If we didn't find any dynamic relocs in sections which needs the
+     copy reloc, then we'll be keeping the dynamic relocs and avoiding
+     the copy reloc.  */
+  if (p == NULL)
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  s = htab->sdynbss;
+  BFD_ASSERT (s != NULL);
+
+  /* We must generate a R_SH_COPY reloc to tell the dynamic linker to
+     copy the initial value out of the dynamic object and into the
+     runtime process image.  We need to remember the offset into the
+     .rela.bss section we are going to use.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      asection *srel;
+
+      srel = htab->srelbss;
+      BFD_ASSERT (srel != NULL);
+      srel->size += sizeof (Elf32_External_Rela);
+      h->needs_copy = 1;
+    }
+
+  return _bfd_elf_adjust_dynamic_copy (h, s);
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   dynamic relocs.  */
+
+static bfd_boolean
+allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+{
+  struct bfd_link_info *info;
+  struct elf_sh_link_hash_table *htab;
+  struct elf_sh_link_hash_entry *eh;
+  struct elf_sh_dyn_relocs *p;
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  info = (struct bfd_link_info *) inf;
+  htab = sh_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  eh = (struct elf_sh_link_hash_entry *) h;
+  if ((h->got.refcount > 0
+       || h->forced_local)
+      && eh->gotplt_refcount > 0)
+    {
+      /* The symbol has been forced local, or we have some direct got refs,
+	 so treat all the gotplt refs as got refs. */
+      h->got.refcount += eh->gotplt_refcount;
+      if (h->plt.refcount >= eh->gotplt_refcount)
+	h->plt.refcount -= eh->gotplt_refcount;
+    }
+
+  if (htab->root.dynamic_sections_created
+      && h->plt.refcount > 0
+      && (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+	  || h->root.type != bfd_link_hash_undefweak))
+    {
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      if (info->shared
+	  || WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, 0, h))
+	{
+	  asection *s = htab->splt;
+	  const struct elf_sh_plt_info *plt_info;
+
+	  /* If this is the first .plt entry, make room for the special
+	     first entry.  */
+	  if (s->size == 0)
+	    s->size += htab->plt_info->plt0_entry_size;
+
+	  h->plt.offset = s->size;
+
+	  /* If this symbol is not defined in a regular file, and we are
+	     not generating a shared library, then set the symbol to this
+	     location in the .plt.  This is required to make function
+	     pointers compare as equal between the normal executable and
+	     the shared library.  Skip this for FDPIC, since the
+	     function's address will be the address of the canonical
+	     function descriptor.  */
+	  if (!htab->fdpic_p && !info->shared && !h->def_regular)
+	    {
+	      h->root.u.def.section = s;
+	      h->root.u.def.value = h->plt.offset;
+	    }
+
+	  /* Make room for this entry.  */
+	  plt_info = htab->plt_info;
+	  if (plt_info->short_plt != NULL
+	      && (get_plt_index (plt_info->short_plt, s->size) < MAX_SHORT_PLT))
+	    plt_info = plt_info->short_plt;
+	  s->size += plt_info->symbol_entry_size;
+
+	  /* We also need to make an entry in the .got.plt section, which
+	     will be placed in the .got section by the linker script.  */
+	  if (!htab->fdpic_p)
+	    htab->sgotplt->size += 4;
+	  else
+	    htab->sgotplt->size += 8;
+
+	  /* We also need to make an entry in the .rel.plt section.  */
+	  htab->srelplt->size += sizeof (Elf32_External_Rela);
+
+	  if (htab->vxworks_p && !info->shared)
+	    {
+	      /* VxWorks executables have a second set of relocations
+		 for each PLT entry.  They go in a separate relocation
+		 section, which is processed by the kernel loader.  */
+
+	      /* There is a relocation for the initial PLT entry:
+		 an R_SH_DIR32 relocation for _GLOBAL_OFFSET_TABLE_.  */
+	      if (h->plt.offset == htab->plt_info->plt0_entry_size)
+		htab->srelplt2->size += sizeof (Elf32_External_Rela);
+
+	      /* There are two extra relocations for each subsequent
+		 PLT entry: an R_SH_DIR32 relocation for the GOT entry,
+		 and an R_SH_DIR32 relocation for the PLT entry.  */
+	      htab->srelplt2->size += sizeof (Elf32_External_Rela) * 2;
+	    }
+	}
+      else
+	{
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	}
+    }
+  else
+    {
+      h->plt.offset = (bfd_vma) -1;
+      h->needs_plt = 0;
+    }
+
+  if (h->got.refcount > 0)
+    {
+      asection *s;
+      bfd_boolean dyn;
+      int got_type = sh_elf_hash_entry (h)->got_type;
+
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      s = htab->sgot;
+      h->got.offset = s->size;
+      s->size += 4;
+      /* R_SH_TLS_GD needs 2 consecutive GOT slots.  */
+      if (got_type == GOT_TLS_GD)
+	s->size += 4;
+      dyn = htab->root.dynamic_sections_created;
+      if (!dyn)
+	{
+	  /* No dynamic relocations required.  */
+	  if (htab->fdpic_p && !info->shared
+	      && h->root.type != bfd_link_hash_undefweak
+	      && (got_type == GOT_NORMAL || got_type == GOT_FUNCDESC))
+	    htab->srofixup->size += 4;
+	}
+      /* R_SH_TLS_IE_32 needs one dynamic relocation if dynamic,
+	 R_SH_TLS_GD needs one if local symbol and two if global.  */
+      else if ((got_type == GOT_TLS_GD && h->dynindx == -1)
+	       || got_type == GOT_TLS_IE)
+	htab->srelgot->size += sizeof (Elf32_External_Rela);
+      else if (got_type == GOT_TLS_GD)
+	htab->srelgot->size += 2 * sizeof (Elf32_External_Rela);
+      else if (got_type == GOT_FUNCDESC)
+	{
+	  if (!info->shared && SYMBOL_FUNCDESC_LOCAL (info, h))
+	    htab->srofixup->size += 4;
+	  else
+	    htab->srelgot->size += sizeof (Elf32_External_Rela);
+	}
+      else if ((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		|| h->root.type != bfd_link_hash_undefweak)
+	       && (info->shared
+		   || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h)))
+	htab->srelgot->size += sizeof (Elf32_External_Rela);
+      else if (htab->fdpic_p && !info->shared && got_type == GOT_NORMAL
+	       && (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		   || h->root.type != bfd_link_hash_undefweak))
+	htab->srofixup->size += 4;
+    }
+  else
+    h->got.offset = (bfd_vma) -1;
+
+#ifdef INCLUDE_SHMEDIA
+  if (eh->datalabel_got.refcount > 0)
+    {
+      asection *s;
+      bfd_boolean dyn;
+
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      s = htab->sgot;
+      eh->datalabel_got.offset = s->size;
+      s->size += 4;
+      dyn = htab->root.dynamic_sections_created;
+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h))
+	htab->srelgot->size += sizeof (Elf32_External_Rela);
+    }
+  else
+    eh->datalabel_got.offset = (bfd_vma) -1;
+#endif
+
+  /* Allocate space for any dynamic relocations to function
+     descriptors, canonical or otherwise.  We need to relocate the
+     reference unless it resolves to zero, which only happens for
+     undefined weak symbols (either non-default visibility, or when
+     static linking).  Any GOT slot is accounted for elsewhere.  */
+  if (eh->abs_funcdesc_refcount > 0
+      && (h->root.type != bfd_link_hash_undefweak
+	  || (htab->root.dynamic_sections_created
+	      && ! SYMBOL_CALLS_LOCAL (info, h))))
+    {
+      if (!info->shared && SYMBOL_FUNCDESC_LOCAL (info, h))
+	htab->srofixup->size += eh->abs_funcdesc_refcount * 4;
+      else
+	htab->srelgot->size
+	  += eh->abs_funcdesc_refcount * sizeof (Elf32_External_Rela);
+    }
+
+  /* We must allocate a function descriptor if there are references to
+     a canonical descriptor (R_SH_GOTFUNCDESC or R_SH_FUNCDESC) and
+     the dynamic linker isn't going to allocate it.  None of this
+     applies if we already created one in .got.plt, but if the
+     canonical function descriptor can be in this object, there
+     won't be a PLT entry at all.  */
+  if ((eh->funcdesc.refcount > 0
+       || (h->got.offset != MINUS_ONE && eh->got_type == GOT_FUNCDESC))
+      && h->root.type != bfd_link_hash_undefweak
+      && SYMBOL_FUNCDESC_LOCAL (info, h))
+    {
+      /* Make room for this function descriptor.  */
+      eh->funcdesc.offset = htab->sfuncdesc->size;
+      htab->sfuncdesc->size += 8;
+
+      /* We will need a relocation or two fixups to initialize the
+	 function descriptor, so allocate those too.  */
+      if (!info->shared && SYMBOL_CALLS_LOCAL (info, h))
+	htab->srofixup->size += 8;
+      else
+	htab->srelfuncdesc->size += sizeof (Elf32_External_Rela);
+    }
+
+  if (eh->dyn_relocs == NULL)
+    return TRUE;
+
+  /* In the shared -Bsymbolic case, discard space allocated for
+     dynamic pc-relative relocs against symbols which turn out to be
+     defined in regular objects.  For the normal shared case, discard
+     space for pc-relative relocs that have become local due to symbol
+     visibility changes.  */
+
+  if (info->shared)
+    {
+      if (SYMBOL_CALLS_LOCAL (info, h))
+	{
+	  struct elf_sh_dyn_relocs **pp;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      p->count -= p->pc_count;
+	      p->pc_count = 0;
+	      if (p->count == 0)
+		*pp = p->next;
+	      else
+		pp = &p->next;
+	    }
+	}
+
+      if (htab->vxworks_p)
+	{
+	  struct elf_sh_dyn_relocs **pp;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      if (strcmp (p->sec->output_section->name, ".tls_vars") == 0)
+		*pp = p->next;
+	      else
+		pp = &p->next;
+	    }
+	}
+
+      /* Also discard relocs on undefined weak syms with non-default
+	 visibility.  */
+      if (eh->dyn_relocs != NULL
+	  && h->root.type == bfd_link_hash_undefweak)
+	{
+	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	    eh->dyn_relocs = NULL;
+
+	  /* Make sure undefined weak symbols are output as a dynamic
+	     symbol in PIEs.  */
+	  else if (h->dynindx == -1
+		   && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+	}
+    }
+  else
+    {
+      /* For the non-shared case, discard space for relocs against
+	 symbols which turn out to need copy relocs or are not
+	 dynamic.  */
+
+      if (!h->non_got_ref
+	  && ((h->def_dynamic
+	       && !h->def_regular)
+	      || (htab->root.dynamic_sections_created
+		  && (h->root.type == bfd_link_hash_undefweak
+		      || h->root.type == bfd_link_hash_undefined))))
+	{
+	  /* Make sure this symbol is output as a dynamic symbol.
+	     Undefined weak syms won't yet be marked as dynamic.  */
+	  if (h->dynindx == -1
+	      && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+
+	  /* If that succeeded, we know we'll be keeping all the
+	     relocs.  */
+	  if (h->dynindx != -1)
+	    goto keep;
+	}
+
+      eh->dyn_relocs = NULL;
+
+    keep: ;
+    }
+
+  /* Finally, allocate space.  */
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *sreloc = elf_section_data (p->sec)->sreloc;
+      sreloc->size += p->count * sizeof (Elf32_External_Rela);
+
+      /* If we need relocations, we do not need fixups.  */
+      if (htab->fdpic_p && !info->shared)
+	htab->srofixup->size -= 4 * (p->count - p->pc_count);
+    }
+
+  return TRUE;
+}
+
+/* Find any dynamic relocs that apply to read-only sections.  */
+
+static bfd_boolean
+readonly_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+{
+  struct elf_sh_link_hash_entry *eh;
+  struct elf_sh_dyn_relocs *p;
+
+  eh = (struct elf_sh_link_hash_entry *) h;
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *s = p->sec->output_section;
+
+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
+	{
+	  struct bfd_link_info *info = (struct bfd_link_info *) inf;
+
+	  info->flags |= DF_TEXTREL;
+
+	  /* Not an error, just cut short the traversal.  */
+	  return FALSE;
+	}
+    }
+  return TRUE;
+}
+
+/* This function is called after all the input files have been read,
+   and the input sections have been assigned to output sections.
+   It's a convenient place to determine the PLT style.  */
+
+static bfd_boolean
+sh_elf_always_size_sections (bfd *output_bfd, struct bfd_link_info *info)
+{
+  sh_elf_hash_table (info)->plt_info = get_plt_info (output_bfd, info->shared);
+
+  if (sh_elf_hash_table (info)->fdpic_p && !info->relocatable)
+    {
+      struct elf_link_hash_entry *h;
+
+      /* Force a PT_GNU_STACK segment to be created.  */
+      if (! elf_tdata (output_bfd)->stack_flags)
+	elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
+
+      /* Define __stacksize if it's not defined yet.  */
+      h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
+				FALSE, FALSE, FALSE);
+      if (! h || h->root.type != bfd_link_hash_defined
+	  || h->type != STT_OBJECT
+	  || !h->def_regular)
+	{
+	  struct bfd_link_hash_entry *bh = NULL;
+
+	  if (!(_bfd_generic_link_add_one_symbol
+		(info, output_bfd, "__stacksize",
+		 BSF_GLOBAL, bfd_abs_section_ptr, DEFAULT_STACK_SIZE,
+		 (const char *) NULL, FALSE,
+		 get_elf_backend_data (output_bfd)->collect, &bh)))
+	    return FALSE;
+
+	  h = (struct elf_link_hash_entry *) bh;
+	  h->def_regular = 1;
+	  h->type = STT_OBJECT;
+	}
+    }
+  return TRUE;
+}
+
+#if !defined INCLUDE_SHMEDIA && !defined SH_TARGET_ALREADY_DEFINED
+
+static bfd_boolean
+sh_elf_modify_program_headers (bfd *output_bfd, struct bfd_link_info *info)
+{
+  struct elf_obj_tdata *tdata = elf_tdata (output_bfd);
+  struct elf_segment_map *m;
+  Elf_Internal_Phdr *p;
+
+  /* objcopy and strip preserve what's already there using
+     sh_elf_copy_private_bfd_data ().  */
+  if (! info)
+    return TRUE;
+
+  for (p = tdata->phdr, m = tdata->segment_map; m != NULL; m = m->next, p++)
+    if (m->p_type == PT_GNU_STACK)
+      break;
+
+  if (m)
+    {
+      struct elf_link_hash_entry *h;
+
+      /* Obtain the pointer to the __stacksize symbol.  */
+      h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
+				FALSE, FALSE, FALSE);
+      if (h)
+	{
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	  BFD_ASSERT (h->root.type == bfd_link_hash_defined);
+	}
+
+      /* Set the header p_memsz from the symbol value.  We
+	 intentionally ignore the symbol section.  */
+      if (h && h->root.type == bfd_link_hash_defined)
+	p->p_memsz = h->root.u.def.value;
+      else
+	p->p_memsz = DEFAULT_STACK_SIZE;
+
+      p->p_align = 8;
+    }
+
+  return TRUE;
+}
+
+#endif
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+sh_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+			      struct bfd_link_info *info)
+{
+  struct elf_sh_link_hash_table *htab;
+  bfd *dynobj;
+  asection *s;
+  bfd_boolean relocs;
+  bfd *ibfd;
+
+  htab = sh_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = htab->root.dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  if (htab->root.dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (s != NULL);
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+
+  /* Set up .got offsets for local syms, and space for local dynamic
+     relocs.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      bfd_signed_vma *local_got;
+      bfd_signed_vma *end_local_got;
+      union gotref *local_funcdesc, *end_local_funcdesc;
+      char *local_got_type;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *srel;
+
+      if (! is_sh_elf (ibfd))
+	continue;
+
+      for (s = ibfd->sections; s != NULL; s = s->next)
+	{
+	  struct elf_sh_dyn_relocs *p;
+
+	  for (p = ((struct elf_sh_dyn_relocs *)
+		    elf_section_data (s)->local_dynrel);
+	       p != NULL;
+	       p = p->next)
+	    {
+	      if (! bfd_is_abs_section (p->sec)
+		  && bfd_is_abs_section (p->sec->output_section))
+		{
+		  /* Input section has been discarded, either because
+		     it is a copy of a linkonce section or due to
+		     linker script /DISCARD/, so we'll be discarding
+		     the relocs too.  */
+		}
+	      else if (htab->vxworks_p
+		       && strcmp (p->sec->output_section->name,
+				  ".tls_vars") == 0)
+		{
+		  /* Relocations in vxworks .tls_vars sections are
+		     handled specially by the loader.  */
+		}
+	      else if (p->count != 0)
+		{
+		  srel = elf_section_data (p->sec)->sreloc;
+		  srel->size += p->count * sizeof (Elf32_External_Rela);
+		  if ((p->sec->output_section->flags & SEC_READONLY) != 0)
+		    info->flags |= DF_TEXTREL;
+
+		  /* If we need relocations, we do not need fixups.  */
+		  if (htab->fdpic_p && !info->shared)
+		    htab->srofixup->size -= 4 * (p->count - p->pc_count);
+		}
+	    }
+	}
+
+      symtab_hdr = &elf_symtab_hdr (ibfd);
+      locsymcount = symtab_hdr->sh_info;
+#ifdef INCLUDE_SHMEDIA
+      /* Count datalabel local GOT.  */
+      locsymcount *= 2;
+#endif
+      s = htab->sgot;
+      srel = htab->srelgot;
+
+      local_got = elf_local_got_refcounts (ibfd);
+      if (local_got)
+	{
+	  end_local_got = local_got + locsymcount;
+	  local_got_type = sh_elf_local_got_type (ibfd);
+	  local_funcdesc = sh_elf_local_funcdesc (ibfd);
+	  for (; local_got < end_local_got; ++local_got)
+	    {
+	      if (*local_got > 0)
+		{
+		  *local_got = s->size;
+		  s->size += 4;
+		  if (*local_got_type == GOT_TLS_GD)
+		    s->size += 4;
+		  if (info->shared)
+		    srel->size += sizeof (Elf32_External_Rela);
+		  else
+		    htab->srofixup->size += 4;
+
+		  if (*local_got_type == GOT_FUNCDESC)
+		    {
+		      if (local_funcdesc == NULL)
+			{
+			  bfd_size_type size;
+
+			  size = locsymcount * sizeof (union gotref);
+			  local_funcdesc = (union gotref *) bfd_zalloc (ibfd,
+									size);
+			  if (local_funcdesc == NULL)
+			    return FALSE;
+			  sh_elf_local_funcdesc (ibfd) = local_funcdesc;
+			  local_funcdesc += (local_got
+					     - elf_local_got_refcounts (ibfd));
+			}
+		      local_funcdesc->refcount++;
+		      ++local_funcdesc;
+		    }
+		}
+	      else
+		*local_got = (bfd_vma) -1;
+	      ++local_got_type;
+	    }
+	}
+
+      local_funcdesc = sh_elf_local_funcdesc (ibfd);
+      if (local_funcdesc)
+	{
+	  end_local_funcdesc = local_funcdesc + locsymcount;
+
+	  for (; local_funcdesc < end_local_funcdesc; ++local_funcdesc)
+	    {
+	      if (local_funcdesc->refcount > 0)
+		{
+		  local_funcdesc->offset = htab->sfuncdesc->size;
+		  htab->sfuncdesc->size += 8;
+		  if (!info->shared)
+		    htab->srofixup->size += 8;
+		  else
+		    htab->srelfuncdesc->size += sizeof (Elf32_External_Rela);
+		}
+	      else
+		local_funcdesc->offset = MINUS_ONE;
+	    }
+	}
+
+    }
+
+  if (htab->tls_ldm_got.refcount > 0)
+    {
+      /* Allocate 2 got entries and 1 dynamic reloc for R_SH_TLS_LD_32
+	 relocs.  */
+      htab->tls_ldm_got.offset = htab->sgot->size;
+      htab->sgot->size += 8;
+      htab->srelgot->size += sizeof (Elf32_External_Rela);
+    }
+  else
+    htab->tls_ldm_got.offset = -1;
+
+  /* Only the reserved entries should be present.  For FDPIC, they go at
+     the end of .got.plt.  */
+  if (htab->fdpic_p)
+    {
+      BFD_ASSERT (htab->sgotplt && htab->sgotplt->size == 12);
+      htab->sgotplt->size = 0;
+    }
+
+  /* Allocate global sym .plt and .got entries, and space for global
+     sym dynamic relocs.  */
+  elf_link_hash_traverse (&htab->root, allocate_dynrelocs, info);
+
+  /* Move the reserved entries and the _GLOBAL_OFFSET_TABLE_ symbol to the
+     end of the FDPIC .got.plt.  */
+  if (htab->fdpic_p)
+    {
+      htab->root.hgot->root.u.def.value = htab->sgotplt->size;
+      htab->sgotplt->size += 12;
+    }
+
+  /* At the very end of the .rofixup section is a pointer to the GOT.  */
+  if (htab->fdpic_p && htab->srofixup != NULL)
+    htab->srofixup->size += 4;
+
+  /* We now have determined the sizes of the various dynamic sections.
+     Allocate memory for them.  */
+  relocs = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      if (s == htab->splt
+	  || s == htab->sgot
+	  || s == htab->sgotplt
+	  || s == htab->sfuncdesc
+	  || s == htab->srofixup
+	  || s == htab->sdynbss)
+	{
+	  /* Strip this section if we don't need it; see the
+	     comment below.  */
+	}
+      else if (CONST_STRNEQ (bfd_get_section_name (dynobj, s), ".rela"))
+	{
+	  if (s->size != 0 && s != htab->srelplt && s != htab->srelplt2)
+	    relocs = TRUE;
+
+	  /* We use the reloc_count field as a counter if we need
+	     to copy relocs into the output file.  */
+	  s->reloc_count = 0;
+	}
+      else
+	{
+	  /* It's not one of our sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (s->size == 0)
+	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is mostly to handle .rela.bss and
+	     .rela.plt.  We must create both sections in
+	     create_dynamic_sections, because they must be created
+	     before the linker maps input sections to output
+	     sections.  The linker does that before
+	     adjust_dynamic_symbol is called, and it is that
+	     function which decides whether anything needs to go
+	     into these sections.  */
+
+	  s->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents.  We use bfd_zalloc
+	 here in case unused entries are not reclaimed before the
+	 section's contents are written out.  This should not happen,
+	 but this way if it does, we get a R_SH_NONE reloc instead
+	 of garbage.  */
+      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+
+  if (htab->root.dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in sh_elf_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (info->executable)
+	{
+	  if (! add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (htab->splt->size != 0)
+	{
+	  if (! add_dynamic_entry (DT_PLTGOT, 0)
+	      || ! add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || ! add_dynamic_entry (DT_PLTREL, DT_RELA)
+	      || ! add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+	}
+      else if ((elf_elfheader (output_bfd)->e_flags & EF_SH_FDPIC)
+	       && htab->sgot->size != 0)
+	{
+	  if (! add_dynamic_entry (DT_PLTGOT, 0))
+	    return FALSE;
+	}
+
+      if (relocs)
+	{
+	  if (! add_dynamic_entry (DT_RELA, 0)
+	      || ! add_dynamic_entry (DT_RELASZ, 0)
+	      || ! add_dynamic_entry (DT_RELAENT,
+				      sizeof (Elf32_External_Rela)))
+	    return FALSE;
+
+	  /* If any dynamic relocs apply to a read-only section,
+	     then we need a DT_TEXTREL entry.  */
+	  if ((info->flags & DF_TEXTREL) == 0)
+	    elf_link_hash_traverse (&htab->root, readonly_dynrelocs, info);
+
+	  if ((info->flags & DF_TEXTREL) != 0)
+	    {
+	      if (! add_dynamic_entry (DT_TEXTREL, 0))
+		return FALSE;
+	    }
+	}
+      if (htab->vxworks_p
+	  && !elf_vxworks_add_dynamic_entries (output_bfd, info))
+	return FALSE;
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+/* Add a dynamic relocation to the SRELOC section.  */
+
+inline static bfd_vma
+sh_elf_add_dyn_reloc (bfd *output_bfd, asection *sreloc, bfd_vma offset,
+		      int reloc_type, long dynindx, bfd_vma addend)
+{
+  Elf_Internal_Rela outrel;
+  bfd_vma reloc_offset;
+
+  outrel.r_offset = offset;
+  outrel.r_info = ELF32_R_INFO (dynindx, reloc_type);
+  outrel.r_addend = addend;
+
+  reloc_offset = sreloc->reloc_count * sizeof (Elf32_External_Rela);
+  BFD_ASSERT (reloc_offset < sreloc->size);
+  bfd_elf32_swap_reloca_out (output_bfd, &outrel,
+			     sreloc->contents + reloc_offset);
+  sreloc->reloc_count++;
+
+  return reloc_offset;
+}
+
+/* Add an FDPIC read-only fixup.  */
+
+inline static void
+sh_elf_add_rofixup (bfd *output_bfd, asection *srofixup, bfd_vma offset)
+{
+  bfd_vma fixup_offset;
+
+  fixup_offset = srofixup->reloc_count++ * 4;
+  BFD_ASSERT (fixup_offset < srofixup->size);
+  bfd_put_32 (output_bfd, offset, srofixup->contents + fixup_offset);
+}
+
+/* Return the offset of the generated .got section from the
+   _GLOBAL_OFFSET_TABLE_ symbol.  */
+
+static bfd_signed_vma
+sh_elf_got_offset (struct elf_sh_link_hash_table *htab)
+{
+  return (htab->sgot->output_offset - htab->sgotplt->output_offset
+	  - htab->root.hgot->root.u.def.value);
+}
+
+/* Find the segment number in which OSEC, and output section, is
+   located.  */
+
+static unsigned
+sh_elf_osec_to_segment (bfd *output_bfd, asection *osec)
+{
+  Elf_Internal_Phdr *p = _bfd_elf_find_segment_containing_section (output_bfd,
+								   osec);
+
+  /* FIXME: Nothing ever says what this index is relative to.  The kernel
+     supplies data in terms of the number of load segments but this is
+     a phdr index and the first phdr may not be a load segment.  */
+  return (p != NULL) ? p - elf_tdata (output_bfd)->phdr : -1;
+}
+
+static bfd_boolean
+sh_elf_osec_readonly_p (bfd *output_bfd, asection *osec)
+{
+  unsigned seg = sh_elf_osec_to_segment (output_bfd, osec);
+
+  return ! (elf_tdata (output_bfd)->phdr[seg].p_flags & PF_W);
+}
+
+/* Generate the initial contents of a local function descriptor, along
+   with any relocations or fixups required.  */
+static bfd_boolean
+sh_elf_initialize_funcdesc (bfd *output_bfd,
+			    struct bfd_link_info *info,
+			    struct elf_link_hash_entry *h,
+			    bfd_vma offset,
+			    asection *section,
+			    bfd_vma value)
+{
+  struct elf_sh_link_hash_table *htab;
+  int dynindx;
+  bfd_vma addr, seg;
+
+  htab = sh_elf_hash_table (info);
+
+  /* FIXME: The ABI says that the offset to the function goes in the
+     descriptor, along with the segment index.  We're RELA, so it could
+     go in the reloc instead... */
+
+  if (h != NULL && SYMBOL_CALLS_LOCAL (info, h))
+    {
+      section = h->root.u.def.section;
+      value = h->root.u.def.value;
+    }
+
+  if (h == NULL || SYMBOL_CALLS_LOCAL (info, h))
+    {
+      dynindx = elf_section_data (section->output_section)->dynindx;
+      addr = value + section->output_offset;
+      seg = sh_elf_osec_to_segment (output_bfd, section->output_section);
+    }
+  else
+    {
+      BFD_ASSERT (h->dynindx != -1);
+      dynindx = h->dynindx;
+      addr = seg = 0;
+    }
+
+  if (!info->shared && SYMBOL_CALLS_LOCAL (info, h))
+    {
+      if (h == NULL || h->root.type != bfd_link_hash_undefweak)
+	{
+	  sh_elf_add_rofixup (output_bfd, htab->srofixup,
+			      offset
+			      + htab->sfuncdesc->output_section->vma
+			      + htab->sfuncdesc->output_offset);
+	  sh_elf_add_rofixup (output_bfd, htab->srofixup,
+			      offset + 4
+			      + htab->sfuncdesc->output_section->vma
+			      + htab->sfuncdesc->output_offset);
+	}
+
+      /* There are no dynamic relocations so fill in the final
+	 address and gp value (barring fixups).  */
+      addr += section->output_section->vma;
+      seg = htab->root.hgot->root.u.def.value
+	+ htab->root.hgot->root.u.def.section->output_section->vma
+	+ htab->root.hgot->root.u.def.section->output_offset;
+    }
+  else
+    sh_elf_add_dyn_reloc (output_bfd, htab->srelfuncdesc,
+			  offset
+			  + htab->sfuncdesc->output_section->vma
+			  + htab->sfuncdesc->output_offset,
+			  R_SH_FUNCDESC_VALUE, dynindx, 0);
+
+  bfd_put_32 (output_bfd, addr, htab->sfuncdesc->contents + offset);
+  bfd_put_32 (output_bfd, seg, htab->sfuncdesc->contents + offset + 4);
+
+  return TRUE;
+}
+
+/* Install a 20-bit movi20 field starting at ADDR, which occurs in OUTPUT_BFD.
+   VALUE is the field's value.  Return bfd_reloc_ok if successful or an error
+   otherwise.  */
+
+static bfd_reloc_status_type
+install_movi20_field (bfd *output_bfd, unsigned long relocation,
+		      bfd *input_bfd, asection *input_section,
+		      bfd_byte *contents, bfd_vma offset)
+{
+  unsigned long cur_val;
+  bfd_byte *addr;
+  bfd_reloc_status_type r;
+
+  if (offset > bfd_get_section_limit (input_bfd, input_section))
+    return bfd_reloc_outofrange;
+
+  r = bfd_check_overflow (complain_overflow_signed, 20, 0,
+			  bfd_arch_bits_per_address (input_bfd), relocation);
+  if (r != bfd_reloc_ok)
+    return r;
+
+  addr = contents + offset;
+  cur_val = bfd_get_16 (output_bfd, addr);
+  bfd_put_16 (output_bfd, cur_val | ((relocation & 0xf0000) >> 12), addr);
+  bfd_put_16 (output_bfd, relocation & 0xffff, addr + 2);
+
+  return bfd_reloc_ok;
+}
+
+/* Relocate an SH ELF section.  */
+
+static bfd_boolean
+sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
+			 bfd *input_bfd, asection *input_section,
+			 bfd_byte *contents, Elf_Internal_Rela *relocs,
+			 Elf_Internal_Sym *local_syms,
+			 asection **local_sections)
+{
+  struct elf_sh_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel, *relend;
+  bfd *dynobj = NULL;
+  bfd_vma *local_got_offsets;
+  asection *sgot = NULL;
+  asection *sgotplt = NULL;
+  asection *splt = NULL;
+  asection *sreloc = NULL;
+  asection *srelgot = NULL;
+  bfd_boolean is_vxworks_tls;
+  unsigned isec_segment, got_segment, plt_segment, check_segment[2];
+  bfd_boolean fdpic_p = FALSE;
+
+  BFD_ASSERT (is_sh_elf (input_bfd));
+
+  htab = sh_elf_hash_table (info);
+  if (htab != NULL)
+    {
+      dynobj = htab->root.dynobj;
+      sgot = htab->sgot;
+      sgotplt = htab->sgotplt;
+      splt = htab->splt;
+      fdpic_p = htab->fdpic_p;
+    }
+  symtab_hdr = &elf_symtab_hdr (input_bfd);
+  sym_hashes = elf_sym_hashes (input_bfd);
+  local_got_offsets = elf_local_got_offsets (input_bfd);
+
+  isec_segment = sh_elf_osec_to_segment (output_bfd,
+					 input_section->output_section);
+  if (fdpic_p && sgot)
+    got_segment = sh_elf_osec_to_segment (output_bfd,
+					  sgot->output_section);
+  else
+    got_segment = -1;
+  if (fdpic_p && splt)
+    plt_segment = sh_elf_osec_to_segment (output_bfd,
+					  splt->output_section);
+  else
+    plt_segment = -1;
+
+  /* We have to handle relocations in vxworks .tls_vars sections
+     specially, because the dynamic loader is 'weird'.  */
+  is_vxworks_tls = (htab && htab->vxworks_p && info->shared
+		    && !strcmp (input_section->output_section->name,
+				".tls_vars"));
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_vma addend = (bfd_vma) 0;
+      bfd_reloc_status_type r;
+      int seen_stt_datalabel = 0;
+      bfd_vma off;
+      int got_type;
+      const char *symname = NULL;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      /* Many of the relocs are only used for relaxing, and are
+	 handled entirely by the relaxation code.  */
+      if (r_type >= (int) R_SH_GNU_VTINHERIT
+	  && r_type <= (int) R_SH_LABEL)
+	continue;
+      if (r_type == (int) R_SH_NONE)
+	continue;
+
+      if (r_type < 0
+	  || r_type >= R_SH_max
+	  || (r_type >= (int) R_SH_FIRST_INVALID_RELOC
+	      && r_type <= (int) R_SH_LAST_INVALID_RELOC)
+	  || (r_type >= (int) R_SH_FIRST_INVALID_RELOC_2
+	      && r_type <= (int) R_SH_LAST_INVALID_RELOC_2)
+	  || (   r_type >= (int) R_SH_FIRST_INVALID_RELOC_3
+	      && r_type <= (int) R_SH_LAST_INVALID_RELOC_3)
+	  || (   r_type >= (int) R_SH_FIRST_INVALID_RELOC_4
+	      && r_type <= (int) R_SH_LAST_INVALID_RELOC_4)
+	  || (   r_type >= (int) R_SH_FIRST_INVALID_RELOC_5
+	      && r_type <= (int) R_SH_LAST_INVALID_RELOC_5)
+	  || (   r_type >= (int) R_SH_FIRST_INVALID_RELOC_6
+	      && r_type <= (int) R_SH_LAST_INVALID_RELOC_6))
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      howto = get_howto_table (output_bfd) + r_type;
+
+      /* For relocs that aren't partial_inplace, we get the addend from
+	 the relocation.  */
+      if (! howto->partial_inplace)
+	addend = rel->r_addend;
+
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      check_segment[0] = -1;
+      check_segment[1] = -1;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+
+	  symname = bfd_elf_string_from_elf_section
+	    (input_bfd, symtab_hdr->sh_link, sym->st_name);
+	  if (symname == NULL || *symname == '\0')
+	    symname = bfd_section_name (input_bfd, sec);
+
+	  relocation = (sec->output_section->vma
+			+ sec->output_offset
+			+ sym->st_value);
+	  /* A local symbol never has STO_SH5_ISA32, so we don't need
+	     datalabel processing here.  Make sure this does not change
+	     without notice.  */
+	  if ((sym->st_other & STO_SH5_ISA32) != 0)
+	    ((*info->callbacks->reloc_dangerous)
+	     (info,
+	      _("Unexpected STO_SH5_ISA32 on local symbol is not handled"),
+	      input_bfd, input_section, rel->r_offset));
+
+	  if (sec != NULL && elf_discarded_section (sec))
+	    /* Handled below.  */
+	    ;
+	  else if (info->relocatable)
+	    {
+	      /* This is a relocatable link.  We don't have to change
+		 anything, unless the reloc is against a section symbol,
+		 in which case we have to adjust according to where the
+		 section symbol winds up in the output section.  */
+	      if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+		{
+		  if (! howto->partial_inplace)
+		    {
+		      /* For relocations with the addend in the
+			 relocation, we need just to update the addend.
+			 All real relocs are of type partial_inplace; this
+			 code is mostly for completeness.  */
+		      rel->r_addend += sec->output_offset;
+
+		      continue;
+		    }
+
+		  /* Relocs of type partial_inplace need to pick up the
+		     contents in the contents and add the offset resulting
+		     from the changed location of the section symbol.
+		     Using _bfd_final_link_relocate (e.g. goto
+		     final_link_relocate) here would be wrong, because
+		     relocations marked pc_relative would get the current
+		     location subtracted, and we must only do that at the
+		     final link.  */
+		  r = _bfd_relocate_contents (howto, input_bfd,
+					      sec->output_offset
+					      + sym->st_value,
+					      contents + rel->r_offset);
+		  goto relocation_done;
+		}
+
+	      continue;
+	    }
+	  else if (! howto->partial_inplace)
+	    {
+	      relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	      addend = rel->r_addend;
+	    }
+	  else if ((sec->flags & SEC_MERGE)
+		   && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+	    {
+	      asection *msec;
+
+	      if (howto->rightshift || howto->src_mask != 0xffffffff)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B(%A+0x%lx): %s relocation against SEC_MERGE section"),
+		     input_bfd, input_section,
+		     (long) rel->r_offset, howto->name);
+		  return FALSE;
+		}
+
+	      addend = bfd_get_32 (input_bfd, contents + rel->r_offset);
+	      msec = sec;
+	      addend =
+		_bfd_elf_rel_local_sym (output_bfd, sym, &msec, addend)
+		- relocation;
+	      addend += msec->output_section->vma + msec->output_offset;
+	      bfd_put_32 (input_bfd, addend, contents + rel->r_offset);
+	      addend = 0;
+	    }
+	}
+      else
+	{
+	  /* FIXME: Ought to make use of the RELOC_FOR_GLOBAL_SYMBOL macro.  */
+
+	  relocation = 0;
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  symname = h->root.root.string;
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    {
+#ifdef INCLUDE_SHMEDIA
+	      /* If the reference passes a symbol marked with
+		 STT_DATALABEL, then any STO_SH5_ISA32 on the final value
+		 doesn't count.  */
+	      seen_stt_datalabel |= h->type == STT_DATALABEL;
+#endif
+	      h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	    }
+	  if (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	    {
+	      bfd_boolean dyn;
+
+	      dyn = htab ? htab->root.dynamic_sections_created : FALSE;
+	      sec = h->root.u.def.section;
+	      /* In these cases, we don't need the relocation value.
+		 We check specially because in some obscure cases
+		 sec->output_section will be NULL.  */
+	      if (r_type == R_SH_GOTPC
+		  || r_type == R_SH_GOTPC_LOW16
+		  || r_type == R_SH_GOTPC_MEDLOW16
+		  || r_type == R_SH_GOTPC_MEDHI16
+		  || r_type == R_SH_GOTPC_HI16
+		  || ((r_type == R_SH_PLT32
+		       || r_type == R_SH_PLT_LOW16
+		       || r_type == R_SH_PLT_MEDLOW16
+		       || r_type == R_SH_PLT_MEDHI16
+		       || r_type == R_SH_PLT_HI16)
+		      && h->plt.offset != (bfd_vma) -1)
+		  || ((r_type == R_SH_GOT32
+		       || r_type == R_SH_GOT20
+		       || r_type == R_SH_GOTFUNCDESC
+		       || r_type == R_SH_GOTFUNCDESC20
+		       || r_type == R_SH_GOTOFFFUNCDESC
+		       || r_type == R_SH_GOTOFFFUNCDESC20
+		       || r_type == R_SH_FUNCDESC
+		       || r_type == R_SH_GOT_LOW16
+		       || r_type == R_SH_GOT_MEDLOW16
+		       || r_type == R_SH_GOT_MEDHI16
+		       || r_type == R_SH_GOT_HI16)
+		      && WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+		      && (! info->shared
+			  || (! info->symbolic && h->dynindx != -1)
+			  || !h->def_regular))
+		  /* The cases above are those in which relocation is
+		     overwritten in the switch block below.  The cases
+		     below are those in which we must defer relocation
+		     to run-time, because we can't resolve absolute
+		     addresses when creating a shared library.  */
+		  || (info->shared
+		      && ((! info->symbolic && h->dynindx != -1)
+			  || !h->def_regular)
+		      && ((r_type == R_SH_DIR32
+			   && !h->forced_local)
+			  || (r_type == R_SH_REL32
+			      && !SYMBOL_CALLS_LOCAL (info, h)))
+		      && ((input_section->flags & SEC_ALLOC) != 0
+			  /* DWARF will emit R_SH_DIR32 relocations in its
+			     sections against symbols defined externally
+			     in shared libraries.  We can't do anything
+			     with them here.  */
+			  || ((input_section->flags & SEC_DEBUGGING) != 0
+			      && h->def_dynamic)))
+		  /* Dynamic relocs are not propagated for SEC_DEBUGGING
+		     sections because such sections are not SEC_ALLOC and
+		     thus ld.so will not process them.  */
+		  || (sec->output_section == NULL
+		      && ((input_section->flags & SEC_DEBUGGING) != 0
+			  && h->def_dynamic))
+		  || (sec->output_section == NULL
+		      && (sh_elf_hash_entry (h)->got_type == GOT_TLS_IE
+			  || sh_elf_hash_entry (h)->got_type == GOT_TLS_GD)))
+		;
+	      else if (sec->output_section != NULL)
+		relocation = ((h->root.u.def.value
+			      + sec->output_section->vma
+			      + sec->output_offset)
+			      /* A STO_SH5_ISA32 causes a "bitor 1" to the
+				 symbol value, unless we've seen
+				 STT_DATALABEL on the way to it.  */
+			      | ((h->other & STO_SH5_ISA32) != 0
+				 && ! seen_stt_datalabel));
+	      else if (!info->relocatable)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+		     input_bfd,
+		     input_section,
+		     (long) rel->r_offset,
+		     howto->name,
+		     h->root.root.string);
+		  return FALSE;
+		}
+	    }
+	  else if (h->root.type == bfd_link_hash_undefweak)
+	    ;
+	  else if (info->unresolved_syms_in_objects == RM_IGNORE
+		   && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT)
+	    ;
+	  else if (!info->relocatable)
+	    {
+	      if (! info->callbacks->undefined_symbol
+		  (info, h->root.root.string, input_bfd,
+		   input_section, rel->r_offset,
+		   (info->unresolved_syms_in_objects == RM_GENERATE_ERROR
+		    || ELF_ST_VISIBILITY (h->other))))
+		return FALSE;
+	    }
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      /* Check for inter-segment relocations in FDPIC files.  Most
+	 relocations connect the relocation site to the location of
+	 the target symbol, but there are some exceptions below.  */
+      check_segment[0] = isec_segment;
+      if (sec != NULL)
+	check_segment[1] = sh_elf_osec_to_segment (output_bfd,
+						   sec->output_section);
+      else
+	check_segment[1] = -1;
+
+      switch ((int) r_type)
+	{
+	final_link_relocate:
+	  /* COFF relocs don't use the addend. The addend is used for
+	     R_SH_DIR32 to be compatible with other compilers.  */
+	  r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+					contents, rel->r_offset,
+					relocation, addend);
+	  break;
+
+	case R_SH_IND12W:
+	  goto final_link_relocate;
+
+	case R_SH_DIR8WPN:
+	case R_SH_DIR8WPZ:
+	case R_SH_DIR8WPL:
+	  /* If the reloc is against the start of this section, then
+	     the assembler has already taken care of it and the reloc
+	     is here only to assist in relaxing.  If the reloc is not
+	     against the start of this section, then it's against an
+	     external symbol and we must deal with it ourselves.  */
+	  if (input_section->output_section->vma + input_section->output_offset
+	      != relocation)
+	    {
+	      int disp = (relocation
+			  - input_section->output_section->vma
+			  - input_section->output_offset
+			  - rel->r_offset);
+	      int mask = 0;
+	      switch (r_type)
+		{
+		case R_SH_DIR8WPN:
+		case R_SH_DIR8WPZ: mask = 1; break;
+		case R_SH_DIR8WPL: mask = 3; break;
+		default: mask = 0; break;
+		}
+	      if (disp & mask)
+		{
+		  ((*_bfd_error_handler)
+		   (_("%B: 0x%lx: fatal: unaligned branch target for relax-support relocation"),
+		    input_section->owner,
+		    (unsigned long) rel->r_offset));
+		  bfd_set_error (bfd_error_bad_value);
+		  return FALSE;
+		}
+	      relocation -= 4;
+	      goto final_link_relocate;
+	    }
+	  r = bfd_reloc_ok;
+	  break;
+
+	default:
+#ifdef INCLUDE_SHMEDIA
+	  if (shmedia_prepare_reloc (info, input_bfd, input_section,
+				     contents, rel, &relocation))
+	    goto final_link_relocate;
+#endif
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+
+	case R_SH_DIR16:
+	case R_SH_DIR8:
+	case R_SH_DIR8U:
+	case R_SH_DIR8S:
+	case R_SH_DIR4U:
+	  goto final_link_relocate;
+
+	case R_SH_DIR8UL:
+	case R_SH_DIR4UL:
+	  if (relocation & 3)
+	    {
+	      ((*_bfd_error_handler)
+	       (_("%B: 0x%lx: fatal: unaligned %s relocation 0x%lx"),
+		input_section->owner,
+		(unsigned long) rel->r_offset, howto->name, 
+		(unsigned long) relocation));
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	  goto final_link_relocate;
+
+	case R_SH_DIR8UW:
+	case R_SH_DIR8SW:
+	case R_SH_DIR4UW:
+	  if (relocation & 1)
+	    {
+	      ((*_bfd_error_handler)
+	       (_("%B: 0x%lx: fatal: unaligned %s relocation 0x%lx"),
+		input_section->owner,
+		(unsigned long) rel->r_offset, howto->name, 
+		(unsigned long) relocation));
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	  goto final_link_relocate;
+
+	case R_SH_PSHA:
+	  if ((signed int)relocation < -32
+	      || (signed int)relocation > 32)
+	    {
+	      ((*_bfd_error_handler)
+	       (_("%B: 0x%lx: fatal: R_SH_PSHA relocation %d not in range -32..32"),
+		input_section->owner,
+		(unsigned long) rel->r_offset,
+		(unsigned long) relocation));
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	  goto final_link_relocate;
+
+	case R_SH_PSHL:
+	  if ((signed int)relocation < -16
+	      || (signed int)relocation > 16)
+	    {
+	      ((*_bfd_error_handler)
+	       (_("%B: 0x%lx: fatal: R_SH_PSHL relocation %d not in range -32..32"),
+		input_section->owner,
+		(unsigned long) rel->r_offset,
+		(unsigned long) relocation));
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	  goto final_link_relocate;
+
+	case R_SH_DIR32:
+	case R_SH_REL32:
+#ifdef INCLUDE_SHMEDIA
+	case R_SH_IMM_LOW16_PCREL:
+	case R_SH_IMM_MEDLOW16_PCREL:
+	case R_SH_IMM_MEDHI16_PCREL:
+	case R_SH_IMM_HI16_PCREL:
+#endif
+	  if (info->shared
+	      && (h == NULL
+		  || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		  || h->root.type != bfd_link_hash_undefweak)
+	      && r_symndx != STN_UNDEF
+	      && (input_section->flags & SEC_ALLOC) != 0
+	      && !is_vxworks_tls
+	      && (r_type == R_SH_DIR32
+		  || !SYMBOL_CALLS_LOCAL (info, h)))
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_byte *loc;
+	      bfd_boolean skip, relocate;
+
+	      /* When generating a shared object, these relocations
+		 are copied into the output file to be resolved at run
+		 time.  */
+
+	      if (sreloc == NULL)
+		{
+		  sreloc = _bfd_elf_get_dynamic_reloc_section
+		    (input_bfd, input_section, /*rela?*/ TRUE);
+		  if (sreloc == NULL)
+		    return FALSE;
+		}
+
+	      skip = FALSE;
+	      relocate = FALSE;
+
+	      outrel.r_offset =
+		_bfd_elf_section_offset (output_bfd, info, input_section,
+					 rel->r_offset);
+	      if (outrel.r_offset == (bfd_vma) -1)
+		skip = TRUE;
+	      else if (outrel.r_offset == (bfd_vma) -2)
+		skip = TRUE, relocate = TRUE;
+	      outrel.r_offset += (input_section->output_section->vma
+				  + input_section->output_offset);
+
+	      if (skip)
+		memset (&outrel, 0, sizeof outrel);
+	      else if (r_type == R_SH_REL32)
+		{
+		  BFD_ASSERT (h != NULL && h->dynindx != -1);
+		  outrel.r_info = ELF32_R_INFO (h->dynindx, R_SH_REL32);
+		  outrel.r_addend
+		    = (howto->partial_inplace
+		       ? bfd_get_32 (input_bfd, contents + rel->r_offset)
+		       : addend);
+		}
+#ifdef INCLUDE_SHMEDIA
+	      else if (r_type == R_SH_IMM_LOW16_PCREL
+		       || r_type == R_SH_IMM_MEDLOW16_PCREL
+		       || r_type == R_SH_IMM_MEDHI16_PCREL
+		       || r_type == R_SH_IMM_HI16_PCREL)
+		{
+		  BFD_ASSERT (h != NULL && h->dynindx != -1);
+		  outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
+		  outrel.r_addend = addend;
+		}
+#endif
+	      else if (fdpic_p
+		       && (h == NULL
+			   || ((info->symbolic || h->dynindx == -1)
+			       && h->def_regular)))
+		{
+		  int dynindx;
+
+		  BFD_ASSERT (sec != NULL);
+		  BFD_ASSERT (sec->output_section != NULL);
+		  dynindx = elf_section_data (sec->output_section)->dynindx;
+		  outrel.r_info = ELF32_R_INFO (dynindx, R_SH_DIR32);
+		  outrel.r_addend = relocation;
+		  outrel.r_addend
+		    += (howto->partial_inplace
+			? bfd_get_32 (input_bfd, contents + rel->r_offset)
+			: addend);
+		  outrel.r_addend -= sec->output_section->vma;
+		}
+	      else
+		{
+		  /* h->dynindx may be -1 if this symbol was marked to
+		     become local.  */
+		  if (h == NULL
+		      || ((info->symbolic || h->dynindx == -1)
+			  && h->def_regular))
+		    {
+		      relocate = howto->partial_inplace;
+		      outrel.r_info = ELF32_R_INFO (0, R_SH_RELATIVE);
+		    }
+		  else
+		    {
+		      BFD_ASSERT (h->dynindx != -1);
+		      outrel.r_info = ELF32_R_INFO (h->dynindx, R_SH_DIR32);
+		    }
+		  outrel.r_addend = relocation;
+		  outrel.r_addend
+		    += (howto->partial_inplace
+			? bfd_get_32 (input_bfd, contents + rel->r_offset)
+			: addend);
+		}
+
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rela);
+	      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+
+	      check_segment[0] = check_segment[1] = -1;
+
+	      /* If this reloc is against an external symbol, we do
+		 not want to fiddle with the addend.  Otherwise, we
+		 need to include the symbol value so that it becomes
+		 an addend for the dynamic reloc.  */
+	      if (! relocate)
+		continue;
+	    }
+	  else if (fdpic_p && !info->shared
+		   && r_type == R_SH_DIR32
+		   && (input_section->flags & SEC_ALLOC) != 0)
+	    {
+	      bfd_vma offset;
+
+	      BFD_ASSERT (htab);
+
+		if (sh_elf_osec_readonly_p (output_bfd,
+					    input_section->output_section))
+		  {
+		    (*_bfd_error_handler)
+		      (_("%B(%A+0x%lx): cannot emit fixup to `%s' in read-only section"),
+		       input_bfd,
+		       input_section,
+		       (long) rel->r_offset,
+		       symname);
+		    return FALSE;
+		  }
+
+	      offset = _bfd_elf_section_offset (output_bfd, info,
+						input_section, rel->r_offset);
+	      if (offset != (bfd_vma)-1)
+		sh_elf_add_rofixup (output_bfd, htab->srofixup,
+				    input_section->output_section->vma
+				    + input_section->output_offset
+				    + rel->r_offset);
+
+	      check_segment[0] = check_segment[1] = -1;
+	    }
+	  goto final_link_relocate;
+
+	case R_SH_GOTPLT32:
+#ifdef INCLUDE_SHMEDIA
+	case R_SH_GOTPLT_LOW16:
+	case R_SH_GOTPLT_MEDLOW16:
+	case R_SH_GOTPLT_MEDHI16:
+	case R_SH_GOTPLT_HI16:
+	case R_SH_GOTPLT10BY4:
+	case R_SH_GOTPLT10BY8:
+#endif
+	  /* Relocation is to the entry for this symbol in the
+	     procedure linkage table.  */
+
+	  if (h == NULL
+	      || h->forced_local
+	      || ! info->shared
+	      || info->symbolic
+	      || h->dynindx == -1
+	      || h->plt.offset == (bfd_vma) -1
+	      || h->got.offset != (bfd_vma) -1)
+	    goto force_got;
+
+	  /* Relocation is to the entry for this symbol in the global
+	     offset table extension for the procedure linkage table.  */
+
+	  BFD_ASSERT (htab);
+	  BFD_ASSERT (sgotplt != NULL);
+	  relocation = (sgotplt->output_offset
+			+ (get_plt_index (htab->plt_info, h->plt.offset)
+			   + 3) * 4);
+
+#ifdef GOT_BIAS
+	  relocation -= GOT_BIAS;
+#endif
+
+	  goto final_link_relocate;
+
+	force_got:
+	case R_SH_GOT32:
+	case R_SH_GOT20:
+#ifdef INCLUDE_SHMEDIA
+	case R_SH_GOT_LOW16:
+	case R_SH_GOT_MEDLOW16:
+	case R_SH_GOT_MEDHI16:
+	case R_SH_GOT_HI16:
+	case R_SH_GOT10BY4:
+	case R_SH_GOT10BY8:
+#endif
+	  /* Relocation is to the entry for this symbol in the global
+	     offset table.  */
+
+	  BFD_ASSERT (htab);
+	  BFD_ASSERT (sgot != NULL);
+	  check_segment[0] = check_segment[1] = -1;
+
+	  if (h != NULL)
+	    {
+	      bfd_boolean dyn;
+
+	      off = h->got.offset;
+#ifdef INCLUDE_SHMEDIA
+	      if (seen_stt_datalabel)
+		{
+		  struct elf_sh_link_hash_entry *hsh;
+
+		  hsh = (struct elf_sh_link_hash_entry *)h;
+		  off = hsh->datalabel_got.offset;
+		}
+#endif
+	      BFD_ASSERT (off != (bfd_vma) -1);
+
+	      dyn = htab->root.dynamic_sections_created;
+	      if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+		  || (info->shared
+		      && SYMBOL_REFERENCES_LOCAL (info, h))
+		  || (ELF_ST_VISIBILITY (h->other)
+		      && h->root.type == bfd_link_hash_undefweak))
+		{
+		  /* This is actually a static link, or it is a
+		     -Bsymbolic link and the symbol is defined
+		     locally, or the symbol was forced to be local
+		     because of a version file.  We must initialize
+		     this entry in the global offset table.  Since the
+		     offset must always be a multiple of 4, we use the
+		     least significant bit to record whether we have
+		     initialized it already.
+
+		     When doing a dynamic link, we create a .rela.got
+		     relocation entry to initialize the value.  This
+		     is done in the finish_dynamic_symbol routine.  */
+		  if ((off & 1) != 0)
+		    off &= ~1;
+		  else
+		    {
+		      bfd_put_32 (output_bfd, relocation,
+				  sgot->contents + off);
+#ifdef INCLUDE_SHMEDIA
+		      if (seen_stt_datalabel)
+			{
+			  struct elf_sh_link_hash_entry *hsh;
+
+			  hsh = (struct elf_sh_link_hash_entry *)h;
+			  hsh->datalabel_got.offset |= 1;
+			}
+		      else
+#endif
+			h->got.offset |= 1;
+
+		      /* If we initialize the GOT entry here with a valid
+			 symbol address, also add a fixup.  */
+		      if (fdpic_p && !info->shared
+			  && sh_elf_hash_entry (h)->got_type == GOT_NORMAL
+			  && (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+			      || h->root.type != bfd_link_hash_undefweak))
+			sh_elf_add_rofixup (output_bfd, htab->srofixup,
+					    sgot->output_section->vma
+					    + sgot->output_offset
+					    + off);
+		    }
+		}
+
+	      relocation = sh_elf_got_offset (htab) + off;
+	    }
+	  else
+	    {
+#ifdef INCLUDE_SHMEDIA
+	      if (rel->r_addend)
+		{
+		  BFD_ASSERT (local_got_offsets != NULL
+			      && (local_got_offsets[symtab_hdr->sh_info
+						    + r_symndx]
+				  != (bfd_vma) -1));
+
+		  off = local_got_offsets[symtab_hdr->sh_info
+					  + r_symndx];
+		}
+	      else
+		{
+#endif
+	      BFD_ASSERT (local_got_offsets != NULL
+			  && local_got_offsets[r_symndx] != (bfd_vma) -1);
+
+	      off = local_got_offsets[r_symndx];
+#ifdef INCLUDE_SHMEDIA
+		}
+#endif
+
+	      /* The offset must always be a multiple of 4.  We use
+		 the least significant bit to record whether we have
+		 already generated the necessary reloc.  */
+	      if ((off & 1) != 0)
+		off &= ~1;
+	      else
+		{
+		  bfd_put_32 (output_bfd, relocation, sgot->contents + off);
+
+		  if (info->shared)
+		    {
+		      Elf_Internal_Rela outrel;
+		      bfd_byte *loc;
+
+		      if (srelgot == NULL)
+			{
+			  srelgot = bfd_get_section_by_name (dynobj,
+							     ".rela.got");
+			  BFD_ASSERT (srelgot != NULL);
+			}
+
+		      outrel.r_offset = (sgot->output_section->vma
+					 + sgot->output_offset
+					 + off);
+		      if (fdpic_p)
+			{
+			  int dynindx
+			    = elf_section_data (sec->output_section)->dynindx;
+			  outrel.r_info = ELF32_R_INFO (dynindx, R_SH_DIR32);
+			  outrel.r_addend = relocation;
+			  outrel.r_addend -= sec->output_section->vma;
+			}
+		      else
+			{
+			  outrel.r_info = ELF32_R_INFO (0, R_SH_RELATIVE);
+			  outrel.r_addend = relocation;
+			}
+		      loc = srelgot->contents;
+		      loc += srelgot->reloc_count++ * sizeof (Elf32_External_Rela);
+		      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+		    }
+		  else if (fdpic_p
+			   && (sh_elf_local_got_type (input_bfd) [r_symndx]
+			       == GOT_NORMAL))
+		    sh_elf_add_rofixup (output_bfd, htab->srofixup,
+					sgot->output_section->vma
+					+ sgot->output_offset
+					+ off);
+
+#ifdef INCLUDE_SHMEDIA
+		  if (rel->r_addend)
+		    local_got_offsets[symtab_hdr->sh_info + r_symndx] |= 1;
+		  else
+#endif
+		    local_got_offsets[r_symndx] |= 1;
+		}
+
+	      relocation = sh_elf_got_offset (htab) + off;
+	    }
+
+#ifdef GOT_BIAS
+	  relocation -= GOT_BIAS;
+#endif
+
+	  if (r_type == R_SH_GOT20)
+	    {
+	      r = install_movi20_field (output_bfd, relocation + addend,
+					input_bfd, input_section, contents,
+					rel->r_offset);
+	      break;
+	    }
+	  else
+	    goto final_link_relocate;
+
+	case R_SH_GOTOFF:
+	case R_SH_GOTOFF20:
+#ifdef INCLUDE_SHMEDIA
+	case R_SH_GOTOFF_LOW16:
+	case R_SH_GOTOFF_MEDLOW16:
+	case R_SH_GOTOFF_MEDHI16:
+	case R_SH_GOTOFF_HI16:
+#endif
+	  /* GOTOFF relocations are relative to _GLOBAL_OFFSET_TABLE_, which
+	     we place at the start of the .got.plt section.  This is the same
+	     as the start of the output .got section, unless there are function
+	     descriptors in front of it.  */
+	  BFD_ASSERT (htab);
+	  BFD_ASSERT (sgotplt != NULL);
+	  check_segment[0] = got_segment;
+	  relocation -= sgotplt->output_section->vma + sgotplt->output_offset
+	    + htab->root.hgot->root.u.def.value;
+
+#ifdef GOT_BIAS
+	  relocation -= GOT_BIAS;
+#endif
+
+	  addend = rel->r_addend;
+
+	  if (r_type == R_SH_GOTOFF20)
+	    {
+	      r = install_movi20_field (output_bfd, relocation + addend,
+					input_bfd, input_section, contents,
+					rel->r_offset);
+	      break;
+	    }
+	  else
+	    goto final_link_relocate;
+
+	case R_SH_GOTPC:
+#ifdef INCLUDE_SHMEDIA
+	case R_SH_GOTPC_LOW16:
+	case R_SH_GOTPC_MEDLOW16:
+	case R_SH_GOTPC_MEDHI16:
+	case R_SH_GOTPC_HI16:
+#endif
+	  /* Use global offset table as symbol value.  */
+
+	  BFD_ASSERT (sgotplt != NULL);
+	  relocation = sgotplt->output_section->vma + sgotplt->output_offset;
+
+#ifdef GOT_BIAS
+	  relocation += GOT_BIAS;
+#endif
+
+	  addend = rel->r_addend;
+
+	  goto final_link_relocate;
+
+	case R_SH_PLT32:
+#ifdef INCLUDE_SHMEDIA
+	case R_SH_PLT_LOW16:
+	case R_SH_PLT_MEDLOW16:
+	case R_SH_PLT_MEDHI16:
+	case R_SH_PLT_HI16:
+#endif
+	  /* Relocation is to the entry for this symbol in the
+	     procedure linkage table.  */
+
+	  /* Resolve a PLT reloc against a local symbol directly,
+	     without using the procedure linkage table.  */
+	  if (h == NULL)
+	    goto final_link_relocate;
+
+	  /* We don't want to warn on calls to undefined weak symbols,
+	     as calls to them must be protected by non-NULL tests
+	     anyway, and unprotected calls would invoke undefined
+	     behavior.  */
+	  if (h->root.type == bfd_link_hash_undefweak)
+	    check_segment[0] = check_segment[1] = -1;
+
+	  if (h->forced_local)
+	    goto final_link_relocate;
+
+	  if (h->plt.offset == (bfd_vma) -1)
+	    {
+	      /* We didn't make a PLT entry for this symbol.  This
+		 happens when statically linking PIC code, or when
+		 using -Bsymbolic.  */
+	      goto final_link_relocate;
+	    }
+
+	  BFD_ASSERT (splt != NULL);
+	  check_segment[1] = plt_segment;
+	  relocation = (splt->output_section->vma
+			+ splt->output_offset
+			+ h->plt.offset);
+
+#ifdef INCLUDE_SHMEDIA
+	  relocation++;
+#endif
+
+	  addend = rel->r_addend;
+
+	  goto final_link_relocate;
+
+	/* Relocation is to the canonical function descriptor for this
+	   symbol, possibly via the GOT.  Initialize the GOT
+	   entry and function descriptor if necessary.  */
+	case R_SH_GOTFUNCDESC:
+	case R_SH_GOTFUNCDESC20:
+	case R_SH_FUNCDESC:
+	  {
+	    int dynindx = -1;
+	    asection *reloc_section;
+	    bfd_vma reloc_offset;
+	    int reloc_type = R_SH_FUNCDESC;
+
+	    BFD_ASSERT (htab);
+
+	    check_segment[0] = check_segment[1] = -1;
+
+	    /* FIXME: See what FRV does for global symbols in the
+	       executable, with --export-dynamic.  Do they need ld.so
+	       to allocate official descriptors?  See what this code
+	       does.  */
+
+	    relocation = 0;
+	    addend = 0;
+
+	    if (r_type == R_SH_FUNCDESC)
+	      {
+		reloc_section = input_section;
+		reloc_offset = rel->r_offset;
+	      }
+	    else
+	      {
+		reloc_section = sgot;
+
+		if (h != NULL)
+		  reloc_offset = h->got.offset;
+		else
+		  {
+		    BFD_ASSERT (local_got_offsets != NULL);
+		    reloc_offset = local_got_offsets[r_symndx];
+		  }
+		BFD_ASSERT (reloc_offset != MINUS_ONE);
+
+		if (reloc_offset & 1)
+		  {
+		    reloc_offset &= ~1;
+		    goto funcdesc_done_got;
+		  }
+	      }
+
+	    if (h && h->root.type == bfd_link_hash_undefweak
+		&& (SYMBOL_CALLS_LOCAL (info, h)
+		    || !htab->root.dynamic_sections_created))
+	      /* Undefined weak symbol which will not be dynamically
+		 resolved later; leave it at zero.  */
+	      goto funcdesc_leave_zero;
+	    else if (SYMBOL_CALLS_LOCAL (info, h)
+		     && ! SYMBOL_FUNCDESC_LOCAL (info, h))
+	      {
+		/* If the symbol needs a non-local function descriptor
+		   but binds locally (i.e., its visibility is
+		   protected), emit a dynamic relocation decayed to
+		   section+offset.  This is an optimization; the dynamic
+		   linker would resolve our function descriptor request
+		   to our copy of the function anyway.  */
+		dynindx = elf_section_data (h->root.u.def.section
+					    ->output_section)->dynindx;
+		relocation += h->root.u.def.section->output_offset
+		  + h->root.u.def.value;
+	      }
+	    else if (! SYMBOL_FUNCDESC_LOCAL (info, h))
+	      {
+		/* If the symbol is dynamic and there will be dynamic
+		   symbol resolution because we are or are linked with a
+		   shared library, emit a FUNCDESC relocation such that
+		   the dynamic linker will allocate the function
+		   descriptor.  */
+		BFD_ASSERT (h->dynindx != -1);
+		dynindx = h->dynindx;
+	      }
+	    else
+	      {
+		bfd_vma offset;
+
+		/* Otherwise, we know we have a private function
+		   descriptor, so reference it directly.  */
+		reloc_type = R_SH_DIR32;
+		dynindx = elf_section_data (htab->sfuncdesc
+					    ->output_section)->dynindx;
+
+		if (h)
+		  {
+		    offset = sh_elf_hash_entry (h)->funcdesc.offset;
+		    BFD_ASSERT (offset != MINUS_ONE);
+		    if ((offset & 1) == 0)
+		      {
+			if (!sh_elf_initialize_funcdesc (output_bfd, info, h,
+							 offset, NULL, 0))
+			  return FALSE;
+			sh_elf_hash_entry (h)->funcdesc.offset |= 1;
+		      }
+		  }
+		else
+		  {
+		    union gotref *local_funcdesc;
+
+		    local_funcdesc = sh_elf_local_funcdesc (input_bfd);
+		    offset = local_funcdesc[r_symndx].offset;
+		    BFD_ASSERT (offset != MINUS_ONE);
+		    if ((offset & 1) == 0)
+		      {
+			if (!sh_elf_initialize_funcdesc (output_bfd, info, NULL,
+							 offset, sec,
+							 sym->st_value))
+			  return FALSE;
+			local_funcdesc[r_symndx].offset |= 1;
+		      }
+		  }
+
+		relocation = htab->sfuncdesc->output_offset + (offset & ~1);
+	      }
+
+	    if (!info->shared && SYMBOL_FUNCDESC_LOCAL (info, h))
+	      {
+		bfd_vma offset;
+
+		if (sh_elf_osec_readonly_p (output_bfd,
+					    reloc_section->output_section))
+		  {
+		    (*_bfd_error_handler)
+		      (_("%B(%A+0x%lx): cannot emit fixup to `%s' in read-only section"),
+		       input_bfd,
+		       input_section,
+		       (long) rel->r_offset,
+		       symname);
+		    return FALSE;
+		  }
+
+		offset = _bfd_elf_section_offset (output_bfd, info,
+						  reloc_section, reloc_offset);
+
+		if (offset != (bfd_vma)-1)
+		  sh_elf_add_rofixup (output_bfd, htab->srofixup,
+				      offset
+				      + reloc_section->output_section->vma
+				      + reloc_section->output_offset);
+	      }
+	    else if ((reloc_section->output_section->flags
+		      & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD))
+	      {
+		bfd_vma offset;
+
+		if (sh_elf_osec_readonly_p (output_bfd,
+					    reloc_section->output_section))
+		  {
+		    info->callbacks->warning
+		      (info,
+		       _("cannot emit dynamic relocations in read-only section"),
+		       symname, input_bfd, reloc_section, reloc_offset);
+		    return FALSE;
+		  }
+
+		if (srelgot == NULL)
+		  {
+		    srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+		    BFD_ASSERT (srelgot != NULL);
+		  }
+
+		offset = _bfd_elf_section_offset (output_bfd, info,
+						  reloc_section, reloc_offset);
+
+		if (offset != (bfd_vma)-1)
+		  sh_elf_add_dyn_reloc (output_bfd, srelgot,
+					offset
+					+ reloc_section->output_section->vma
+					+ reloc_section->output_offset,
+					reloc_type, dynindx, relocation);
+
+		if (r_type == R_SH_FUNCDESC)
+		  {
+		    r = bfd_reloc_ok;
+		    break;
+		  }
+		else
+		  {
+		    relocation = 0;
+		    goto funcdesc_leave_zero;
+		  }
+	      }
+
+	    if (SYMBOL_FUNCDESC_LOCAL (info, h))
+	      relocation += htab->sfuncdesc->output_section->vma;
+	  funcdesc_leave_zero:
+	    if (r_type != R_SH_FUNCDESC)
+	      {
+		bfd_put_32 (output_bfd, relocation,
+			    reloc_section->contents + reloc_offset);
+		if (h != NULL)
+		  h->got.offset |= 1;
+		else
+		  local_got_offsets[r_symndx] |= 1;
+
+	      funcdesc_done_got:
+
+		relocation = sh_elf_got_offset (htab) + reloc_offset;
+#ifdef GOT_BIAS
+		relocation -= GOT_BIAS;
+#endif
+	      }
+	    if (r_type == R_SH_GOTFUNCDESC20)
+	      {
+		r = install_movi20_field (output_bfd, relocation + addend,
+					  input_bfd, input_section, contents,
+					  rel->r_offset);
+		break;
+	      }
+	    else
+	      goto final_link_relocate;
+	  }
+	  break;
+
+	case R_SH_GOTOFFFUNCDESC:
+	case R_SH_GOTOFFFUNCDESC20:
+	  /* FIXME: See R_SH_FUNCDESC comment about global symbols in the
+	     executable and --export-dynamic.  If such symbols get
+	     ld.so-allocated descriptors we can not use R_SH_GOTOFFFUNCDESC
+	     for them.  */
+	  BFD_ASSERT (htab);
+
+	  check_segment[0] = check_segment[1] = -1;
+	  relocation = 0;
+	  addend = rel->r_addend;
+
+	  if (h && (h->root.type == bfd_link_hash_undefweak
+		    || !SYMBOL_FUNCDESC_LOCAL (info, h)))
+	    {
+	      _bfd_error_handler
+		(_("%B(%A+0x%lx): %s relocation against external symbol \"%s\""),
+		 input_bfd, input_section, (long) rel->r_offset, howto->name,
+		 h->root.root.string);
+	      return FALSE;
+	    }
+	  else
+	    {
+	      bfd_vma offset;
+
+	      /* Otherwise, we know we have a private function
+		 descriptor, so reference it directly.  */
+	      if (h)
+		{
+		  offset = sh_elf_hash_entry (h)->funcdesc.offset;
+		  BFD_ASSERT (offset != MINUS_ONE);
+		  if ((offset & 1) == 0)
+		    {
+		      if (!sh_elf_initialize_funcdesc (output_bfd, info, h,
+						       offset, NULL, 0))
+			return FALSE;
+		      sh_elf_hash_entry (h)->funcdesc.offset |= 1;
+		    }
+		}
+	      else
+		{
+		  union gotref *local_funcdesc;
+
+		  local_funcdesc = sh_elf_local_funcdesc (input_bfd);
+		  offset = local_funcdesc[r_symndx].offset;
+		  BFD_ASSERT (offset != MINUS_ONE);
+		  if ((offset & 1) == 0)
+		    {
+		      if (!sh_elf_initialize_funcdesc (output_bfd, info, NULL,
+						       offset, sec,
+						       sym->st_value))
+			return FALSE;
+		      local_funcdesc[r_symndx].offset |= 1;
+		    }
+		}
+
+	      relocation = htab->sfuncdesc->output_offset + (offset & ~1);
+	    }
+
+	  relocation -= (htab->root.hgot->root.u.def.value
+			 + sgotplt->output_offset);
+#ifdef GOT_BIAS
+	  relocation -= GOT_BIAS;
+#endif
+
+	  if (r_type == R_SH_GOTOFFFUNCDESC20)
+	    {
+	      r = install_movi20_field (output_bfd, relocation + addend,
+					input_bfd, input_section, contents,
+					rel->r_offset);
+	      break;
+	    }
+	  else
+	    goto final_link_relocate;
+
+	case R_SH_LOOP_START:
+	  {
+	    static bfd_vma start, end;
+
+	    start = (relocation + rel->r_addend
+		     - (sec->output_section->vma + sec->output_offset));
+	    r = sh_elf_reloc_loop (r_type, input_bfd, input_section, contents,
+				   rel->r_offset, sec, start, end);
+	    break;
+
+	case R_SH_LOOP_END:
+	    end = (relocation + rel->r_addend
+		   - (sec->output_section->vma + sec->output_offset));
+	    r = sh_elf_reloc_loop (r_type, input_bfd, input_section, contents,
+				   rel->r_offset, sec, start, end);
+	    break;
+	  }
+
+	case R_SH_TLS_GD_32:
+	case R_SH_TLS_IE_32:
+	  BFD_ASSERT (htab);
+	  check_segment[0] = check_segment[1] = -1;
+	  r_type = sh_elf_optimized_tls_reloc (info, r_type, h == NULL);
+	  got_type = GOT_UNKNOWN;
+	  if (h == NULL && local_got_offsets)
+	    got_type = sh_elf_local_got_type (input_bfd) [r_symndx];
+	  else if (h != NULL)
+	    {
+	      got_type = sh_elf_hash_entry (h)->got_type;
+	      if (! info->shared
+		  && (h->dynindx == -1
+		      || h->def_regular))
+		r_type = R_SH_TLS_LE_32;
+	    }
+
+	  if (r_type == R_SH_TLS_GD_32 && got_type == GOT_TLS_IE)
+	    r_type = R_SH_TLS_IE_32;
+
+	  if (r_type == R_SH_TLS_LE_32)
+	    {
+	      bfd_vma offset;
+	      unsigned short insn;
+
+	      if (ELF32_R_TYPE (rel->r_info) == R_SH_TLS_GD_32)
+		{
+		  /* GD->LE transition:
+		       mov.l 1f,r4; mova 2f,r0; mov.l 2f,r1; add r0,r1;
+		       jsr @r1; add r12,r4; bra 3f; nop; .align 2;
+		       1: .long x$TLSGD; 2: .long __tls_get_addr@PLT; 3:
+		     We change it into:
+		       mov.l 1f,r4; stc gbr,r0; add r4,r0; nop;
+		       nop; nop; ...
+		       1: .long x@TPOFF; 2: .long __tls_get_addr@PLT; 3:.  */
+
+		  offset = rel->r_offset;
+		  BFD_ASSERT (offset >= 16);
+		  /* Size of GD instructions is 16 or 18.  */
+		  offset -= 16;
+		  insn = bfd_get_16 (input_bfd, contents + offset + 0);
+		  if ((insn & 0xff00) == 0xc700)
+		    {
+		      BFD_ASSERT (offset >= 2);
+		      offset -= 2;
+		      insn = bfd_get_16 (input_bfd, contents + offset + 0);
+		    }
+
+		  BFD_ASSERT ((insn & 0xff00) == 0xd400);
+		  insn = bfd_get_16 (input_bfd, contents + offset + 2);
+		  BFD_ASSERT ((insn & 0xff00) == 0xc700);
+		  insn = bfd_get_16 (input_bfd, contents + offset + 4);
+		  BFD_ASSERT ((insn & 0xff00) == 0xd100);
+		  insn = bfd_get_16 (input_bfd, contents + offset + 6);
+		  BFD_ASSERT (insn == 0x310c);
+		  insn = bfd_get_16 (input_bfd, contents + offset + 8);
+		  BFD_ASSERT (insn == 0x410b);
+		  insn = bfd_get_16 (input_bfd, contents + offset + 10);
+		  BFD_ASSERT (insn == 0x34cc);
+
+		  bfd_put_16 (output_bfd, 0x0012, contents + offset + 2);
+		  bfd_put_16 (output_bfd, 0x304c, contents + offset + 4);
+		  bfd_put_16 (output_bfd, 0x0009, contents + offset + 6);
+		  bfd_put_16 (output_bfd, 0x0009, contents + offset + 8);
+		  bfd_put_16 (output_bfd, 0x0009, contents + offset + 10);
+		}
+	      else
+		{
+		  int target;
+
+		  /* IE->LE transition:
+		     mov.l 1f,r0; stc gbr,rN; mov.l @(r0,r12),rM;
+		     bra 2f; add ...; .align 2; 1: x@GOTTPOFF; 2:
+		     We change it into:
+		     mov.l .Ln,rM; stc gbr,rN; nop; ...;
+		     1: x@TPOFF; 2:.  */
+
+		  offset = rel->r_offset;
+		  BFD_ASSERT (offset >= 16);
+		  /* Size of IE instructions is 10 or 12.  */
+		  offset -= 10;
+		  insn = bfd_get_16 (input_bfd, contents + offset + 0);
+		  if ((insn & 0xf0ff) == 0x0012)
+		    {
+		      BFD_ASSERT (offset >= 2);
+		      offset -= 2;
+		      insn = bfd_get_16 (input_bfd, contents + offset + 0);
+		    }
+
+		  BFD_ASSERT ((insn & 0xff00) == 0xd000);
+		  target = insn & 0x00ff;
+		  insn = bfd_get_16 (input_bfd, contents + offset + 2);
+		  BFD_ASSERT ((insn & 0xf0ff) == 0x0012);
+		  insn = bfd_get_16 (input_bfd, contents + offset + 4);
+		  BFD_ASSERT ((insn & 0xf0ff) == 0x00ce);
+		  insn = 0xd000 | (insn & 0x0f00) | target;
+		  bfd_put_16 (output_bfd, insn, contents + offset + 0);
+		  bfd_put_16 (output_bfd, 0x0009, contents + offset + 4);
+		}
+
+	      bfd_put_32 (output_bfd, tpoff (info, relocation),
+			  contents + rel->r_offset);
+	      continue;
+	    }
+
+	  if (sgot == NULL || sgotplt == NULL)
+	    abort ();
+
+	  if (h != NULL)
+	    off = h->got.offset;
+	  else
+	    {
+	      if (local_got_offsets == NULL)
+		abort ();
+
+	      off = local_got_offsets[r_symndx];
+	    }
+
+	  /* Relocate R_SH_TLS_IE_32 directly when statically linking.  */
+	  if (r_type == R_SH_TLS_IE_32
+	      && ! htab->root.dynamic_sections_created)
+	    {
+	      off &= ~1;
+	      bfd_put_32 (output_bfd, tpoff (info, relocation),
+			  sgot->contents + off);
+	      bfd_put_32 (output_bfd, sh_elf_got_offset (htab) + off,
+			  contents + rel->r_offset);
+	      continue;
+	    }
+
+	  if ((off & 1) != 0)
+	    off &= ~1;
+	  else
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_byte *loc;
+	      int dr_type, indx;
+
+	      if (srelgot == NULL)
+		{
+		  srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+		  BFD_ASSERT (srelgot != NULL);
+		}
+
+	      outrel.r_offset = (sgot->output_section->vma
+				 + sgot->output_offset + off);
+
+	      if (h == NULL || h->dynindx == -1)
+		indx = 0;
+	      else
+		indx = h->dynindx;
+
+	      dr_type = (r_type == R_SH_TLS_GD_32 ? R_SH_TLS_DTPMOD32 :
+			 R_SH_TLS_TPOFF32);
+	      if (dr_type == R_SH_TLS_TPOFF32 && indx == 0)
+		outrel.r_addend = relocation - dtpoff_base (info);
+	      else
+		outrel.r_addend = 0;
+	      outrel.r_info = ELF32_R_INFO (indx, dr_type);
+	      loc = srelgot->contents;
+	      loc += srelgot->reloc_count++ * sizeof (Elf32_External_Rela);
+	      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+
+	      if (r_type == R_SH_TLS_GD_32)
+		{
+		  if (indx == 0)
+		    {
+		      bfd_put_32 (output_bfd,
+				  relocation - dtpoff_base (info),
+				  sgot->contents + off + 4);
+		    }
+		  else
+		    {
+		      outrel.r_info = ELF32_R_INFO (indx,
+						    R_SH_TLS_DTPOFF32);
+		      outrel.r_offset += 4;
+		      outrel.r_addend = 0;
+		      srelgot->reloc_count++;
+		      loc += sizeof (Elf32_External_Rela);
+		      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+		    }
+		}
+
+	      if (h != NULL)
+		h->got.offset |= 1;
+	      else
+		local_got_offsets[r_symndx] |= 1;
+	    }
+
+	  if (off >= (bfd_vma) -2)
+	    abort ();
+
+	  if (r_type == (int) ELF32_R_TYPE (rel->r_info))
+	    relocation = sh_elf_got_offset (htab) + off;
+	  else
+	    {
+	      bfd_vma offset;
+	      unsigned short insn;
+
+	      /* GD->IE transition:
+		   mov.l 1f,r4; mova 2f,r0; mov.l 2f,r1; add r0,r1;
+		   jsr @r1; add r12,r4; bra 3f; nop; .align 2;
+		   1: .long x$TLSGD; 2: .long __tls_get_addr@PLT; 3:
+		 We change it into:
+		   mov.l 1f,r0; stc gbr,r4; mov.l @(r0,r12),r0; add r4,r0;
+		   nop; nop; bra 3f; nop; .align 2;
+		   1: .long x@TPOFF; 2:...; 3:.  */
+
+	      offset = rel->r_offset;
+	      BFD_ASSERT (offset >= 16);
+	      /* Size of GD instructions is 16 or 18.  */
+	      offset -= 16;
+	      insn = bfd_get_16 (input_bfd, contents + offset + 0);
+	      if ((insn & 0xff00) == 0xc700)
+		{
+		  BFD_ASSERT (offset >= 2);
+		  offset -= 2;
+		  insn = bfd_get_16 (input_bfd, contents + offset + 0);
+		}
+
+	      BFD_ASSERT ((insn & 0xff00) == 0xd400);
+
+	      /* Replace mov.l 1f,R4 with mov.l 1f,r0.  */
+	      bfd_put_16 (output_bfd, insn & 0xf0ff, contents + offset);
+
+	      insn = bfd_get_16 (input_bfd, contents + offset + 2);
+	      BFD_ASSERT ((insn & 0xff00) == 0xc700);
+	      insn = bfd_get_16 (input_bfd, contents + offset + 4);
+	      BFD_ASSERT ((insn & 0xff00) == 0xd100);
+	      insn = bfd_get_16 (input_bfd, contents + offset + 6);
+	      BFD_ASSERT (insn == 0x310c);
+	      insn = bfd_get_16 (input_bfd, contents + offset + 8);
+	      BFD_ASSERT (insn == 0x410b);
+	      insn = bfd_get_16 (input_bfd, contents + offset + 10);
+	      BFD_ASSERT (insn == 0x34cc);
+
+	      bfd_put_16 (output_bfd, 0x0412, contents + offset + 2);
+	      bfd_put_16 (output_bfd, 0x00ce, contents + offset + 4);
+	      bfd_put_16 (output_bfd, 0x304c, contents + offset + 6);
+	      bfd_put_16 (output_bfd, 0x0009, contents + offset + 8);
+	      bfd_put_16 (output_bfd, 0x0009, contents + offset + 10);
+
+	      bfd_put_32 (output_bfd, sh_elf_got_offset (htab) + off,
+			  contents + rel->r_offset);
+
+	      continue;
+	  }
+
+	  addend = rel->r_addend;
+
+	  goto final_link_relocate;
+
+	case R_SH_TLS_LD_32:
+	  BFD_ASSERT (htab);
+	  check_segment[0] = check_segment[1] = -1;
+	  if (! info->shared)
+	    {
+	      bfd_vma offset;
+	      unsigned short insn;
+
+	      /* LD->LE transition:
+		   mov.l 1f,r4; mova 2f,r0; mov.l 2f,r1; add r0,r1;
+		   jsr @r1; add r12,r4; bra 3f; nop; .align 2;
+		   1: .long x$TLSLD; 2: .long __tls_get_addr@PLT; 3:
+		 We change it into:
+		   stc gbr,r0; nop; nop; nop;
+		   nop; nop; bra 3f; ...; 3:.  */
+
+	      offset = rel->r_offset;
+	      BFD_ASSERT (offset >= 16);
+	      /* Size of LD instructions is 16 or 18.  */
+	      offset -= 16;
+	      insn = bfd_get_16 (input_bfd, contents + offset + 0);
+	      if ((insn & 0xff00) == 0xc700)
+		{
+		  BFD_ASSERT (offset >= 2);
+		  offset -= 2;
+		  insn = bfd_get_16 (input_bfd, contents + offset + 0);
+		}
+
+	      BFD_ASSERT ((insn & 0xff00) == 0xd400);
+	      insn = bfd_get_16 (input_bfd, contents + offset + 2);
+	      BFD_ASSERT ((insn & 0xff00) == 0xc700);
+	      insn = bfd_get_16 (input_bfd, contents + offset + 4);
+	      BFD_ASSERT ((insn & 0xff00) == 0xd100);
+	      insn = bfd_get_16 (input_bfd, contents + offset + 6);
+	      BFD_ASSERT (insn == 0x310c);
+	      insn = bfd_get_16 (input_bfd, contents + offset + 8);
+	      BFD_ASSERT (insn == 0x410b);
+	      insn = bfd_get_16 (input_bfd, contents + offset + 10);
+	      BFD_ASSERT (insn == 0x34cc);
+
+	      bfd_put_16 (output_bfd, 0x0012, contents + offset + 0);
+	      bfd_put_16 (output_bfd, 0x0009, contents + offset + 2);
+	      bfd_put_16 (output_bfd, 0x0009, contents + offset + 4);
+	      bfd_put_16 (output_bfd, 0x0009, contents + offset + 6);
+	      bfd_put_16 (output_bfd, 0x0009, contents + offset + 8);
+	      bfd_put_16 (output_bfd, 0x0009, contents + offset + 10);
+
+	      continue;
+	    }
+
+	  if (sgot == NULL || sgotplt == NULL)
+	    abort ();
+
+	  off = htab->tls_ldm_got.offset;
+	  if (off & 1)
+	    off &= ~1;
+	  else
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_byte *loc;
+
+	      srelgot = htab->srelgot;
+	      if (srelgot == NULL)
+		abort ();
+
+	      outrel.r_offset = (sgot->output_section->vma
+				 + sgot->output_offset + off);
+	      outrel.r_addend = 0;
+	      outrel.r_info = ELF32_R_INFO (0, R_SH_TLS_DTPMOD32);
+	      loc = srelgot->contents;
+	      loc += srelgot->reloc_count++ * sizeof (Elf32_External_Rela);
+	      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+	      htab->tls_ldm_got.offset |= 1;
+	    }
+
+	  relocation = sh_elf_got_offset (htab) + off;
+	  addend = rel->r_addend;
+
+	  goto final_link_relocate;
+
+	case R_SH_TLS_LDO_32:
+	  check_segment[0] = check_segment[1] = -1;
+	  if (! info->shared)
+	    relocation = tpoff (info, relocation);
+	  else
+	    relocation -= dtpoff_base (info);
+
+	  addend = rel->r_addend;
+	  goto final_link_relocate;
+
+	case R_SH_TLS_LE_32:
+	  {
+	    int indx;
+	    Elf_Internal_Rela outrel;
+	    bfd_byte *loc;
+
+	    check_segment[0] = check_segment[1] = -1;
+
+	    if (! info->shared || info->pie)
+	      {
+		relocation = tpoff (info, relocation);
+		addend = rel->r_addend;
+		goto final_link_relocate;
+	      }
+
+	    if (sreloc == NULL)
+	      {
+		sreloc = _bfd_elf_get_dynamic_reloc_section
+		  (input_bfd, input_section, /*rela?*/ TRUE);
+		if (sreloc == NULL)
+		  return FALSE;
+	      }
+
+	    if (h == NULL || h->dynindx == -1)
+	      indx = 0;
+	    else
+	      indx = h->dynindx;
+
+	    outrel.r_offset = (input_section->output_section->vma
+			       + input_section->output_offset
+			       + rel->r_offset);
+	    outrel.r_info = ELF32_R_INFO (indx, R_SH_TLS_TPOFF32);
+	    if (indx == 0)
+	      outrel.r_addend = relocation - dtpoff_base (info);
+	    else
+	      outrel.r_addend = 0;
+
+	    loc = sreloc->contents;
+	    loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rela);
+	    bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+	    continue;
+	  }
+	}
+
+    relocation_done:
+      if (fdpic_p && check_segment[0] != (unsigned) -1
+	  && check_segment[0] != check_segment[1])
+	{
+	  /* We don't want duplicate errors for undefined symbols.  */
+	  if (!h || h->root.type != bfd_link_hash_undefined)
+	    {
+	      if (info->shared)
+		{
+		  info->callbacks->einfo
+		    (_("%X%C: relocation to \"%s\" references a different segment\n"),
+		     input_bfd, input_section, rel->r_offset, symname);
+		  return FALSE;
+		}
+	      else
+		info->callbacks->einfo
+		  (_("%C: warning: relocation to \"%s\" references a different segment\n"),
+		   input_bfd, input_section, rel->r_offset, symname);
+	    }
+
+	  elf_elfheader (output_bfd)->e_flags &= ~EF_SH_PIC;
+	}
+
+      if (r != bfd_reloc_ok)
+	{
+	  switch (r)
+	    {
+	    default:
+	    case bfd_reloc_outofrange:
+	      abort ();
+	    case bfd_reloc_overflow:
+	      {
+		const char *name;
+
+		if (h != NULL)
+		  name = NULL;
+		else
+		  {
+		    name = (bfd_elf_string_from_elf_section
+			    (input_bfd, symtab_hdr->sh_link, sym->st_name));
+		    if (name == NULL)
+		      return FALSE;
+		    if (*name == '\0')
+		      name = bfd_section_name (input_bfd, sec);
+		  }
+		if (! ((*info->callbacks->reloc_overflow)
+		       (info, (h ? &h->root : NULL), name, howto->name,
+			(bfd_vma) 0, input_bfd, input_section,
+			rel->r_offset)))
+		  return FALSE;
+	      }
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* This is a version of bfd_generic_get_relocated_section_contents
+   which uses sh_elf_relocate_section.  */
+
+static bfd_byte *
+sh_elf_get_relocated_section_contents (bfd *output_bfd,
+				       struct bfd_link_info *link_info,
+				       struct bfd_link_order *link_order,
+				       bfd_byte *data,
+				       bfd_boolean relocatable,
+				       asymbol **symbols)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  asection *input_section = link_order->u.indirect.section;
+  bfd *input_bfd = input_section->owner;
+  asection **sections = NULL;
+  Elf_Internal_Rela *internal_relocs = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+
+  /* We only need to handle the case of relaxing, or of having a
+     particular set of section contents, specially.  */
+  if (relocatable
+      || elf_section_data (input_section)->this_hdr.contents == NULL)
+    return bfd_generic_get_relocated_section_contents (output_bfd, link_info,
+						       link_order, data,
+						       relocatable,
+						       symbols);
+
+  symtab_hdr = &elf_symtab_hdr (input_bfd);
+
+  memcpy (data, elf_section_data (input_section)->this_hdr.contents,
+	  (size_t) input_section->size);
+
+  if ((input_section->flags & SEC_RELOC) != 0
+      && input_section->reloc_count > 0)
+    {
+      asection **secpp;
+      Elf_Internal_Sym *isym, *isymend;
+      bfd_size_type amt;
+
+      internal_relocs = (_bfd_elf_link_read_relocs
+			 (input_bfd, input_section, NULL,
+			  (Elf_Internal_Rela *) NULL, FALSE));
+      if (internal_relocs == NULL)
+	goto error_return;
+
+      if (symtab_hdr->sh_info != 0)
+	{
+	  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	  if (isymbuf == NULL)
+	    isymbuf = bfd_elf_get_elf_syms (input_bfd, symtab_hdr,
+					    symtab_hdr->sh_info, 0,
+					    NULL, NULL, NULL);
+	  if (isymbuf == NULL)
+	    goto error_return;
+	}
+
+      amt = symtab_hdr->sh_info;
+      amt *= sizeof (asection *);
+      sections = (asection **) bfd_malloc (amt);
+      if (sections == NULL && amt != 0)
+	goto error_return;
+
+      isymend = isymbuf + symtab_hdr->sh_info;
+      for (isym = isymbuf, secpp = sections; isym < isymend; ++isym, ++secpp)
+	{
+	  asection *isec;
+
+	  if (isym->st_shndx == SHN_UNDEF)
+	    isec = bfd_und_section_ptr;
+	  else if (isym->st_shndx == SHN_ABS)
+	    isec = bfd_abs_section_ptr;
+	  else if (isym->st_shndx == SHN_COMMON)
+	    isec = bfd_com_section_ptr;
+	  else
+	    isec = bfd_section_from_elf_index (input_bfd, isym->st_shndx);
+
+	  *secpp = isec;
+	}
+
+      if (! sh_elf_relocate_section (output_bfd, link_info, input_bfd,
+				     input_section, data, internal_relocs,
+				     isymbuf, sections))
+	goto error_return;
+
+      if (sections != NULL)
+	free (sections);
+      if (isymbuf != NULL
+	  && symtab_hdr->contents != (unsigned char *) isymbuf)
+	free (isymbuf);
+      if (elf_section_data (input_section)->relocs != internal_relocs)
+	free (internal_relocs);
+    }
+
+  return data;
+
+ error_return:
+  if (sections != NULL)
+    free (sections);
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (internal_relocs != NULL
+      && elf_section_data (input_section)->relocs != internal_relocs)
+    free (internal_relocs);
+  return NULL;
+}
+
+/* Return the base VMA address which should be subtracted from real addresses
+   when resolving @dtpoff relocation.
+   This is PT_TLS segment p_vaddr.  */
+
+static bfd_vma
+dtpoff_base (struct bfd_link_info *info)
+{
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (elf_hash_table (info)->tls_sec == NULL)
+    return 0;
+  return elf_hash_table (info)->tls_sec->vma;
+}
+
+/* Return the relocation value for R_SH_TLS_TPOFF32..  */
+
+static bfd_vma
+tpoff (struct bfd_link_info *info, bfd_vma address)
+{
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (elf_hash_table (info)->tls_sec == NULL)
+    return 0;
+  /* SH TLS ABI is variant I and static TLS block start just after tcbhead
+     structure which has 2 pointer fields.  */
+  return (address - elf_hash_table (info)->tls_sec->vma
+	  + align_power ((bfd_vma) 8,
+			 elf_hash_table (info)->tls_sec->alignment_power));
+}
+
+static asection *
+sh_elf_gc_mark_hook (asection *sec,
+		     struct bfd_link_info *info,
+		     Elf_Internal_Rela *rel,
+		     struct elf_link_hash_entry *h,
+		     Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_SH_GNU_VTINHERIT:
+      case R_SH_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Update the got entry reference counts for the section being removed.  */
+
+static bfd_boolean
+sh_elf_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info,
+		      asection *sec, const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  union gotref *local_funcdesc;
+  const Elf_Internal_Rela *rel, *relend;
+
+  if (info->relocatable)
+    return TRUE;
+
+  elf_section_data (sec)->local_dynrel = NULL;
+
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+  local_funcdesc = sh_elf_local_funcdesc (abfd);
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      unsigned int r_type;
+      struct elf_link_hash_entry *h = NULL;
+#ifdef INCLUDE_SHMEDIA
+      int seen_stt_datalabel = 0;
+#endif
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  struct elf_sh_link_hash_entry *eh;
+	  struct elf_sh_dyn_relocs **pp;
+	  struct elf_sh_dyn_relocs *p;
+
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    {
+#ifdef INCLUDE_SHMEDIA
+	      seen_stt_datalabel |= h->type == STT_DATALABEL;
+#endif
+	      h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	    }
+	  eh = (struct elf_sh_link_hash_entry *) h;
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
+	    if (p->sec == sec)
+	      {
+		/* Everything must go for SEC.  */
+		*pp = p->next;
+		break;
+	      }
+	}
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      switch (sh_elf_optimized_tls_reloc (info, r_type, h != NULL))
+	{
+	case R_SH_TLS_LD_32:
+	  if (sh_elf_hash_table (info)->tls_ldm_got.refcount > 0)
+	    sh_elf_hash_table (info)->tls_ldm_got.refcount -= 1;
+	  break;
+
+	case R_SH_GOT32:
+	case R_SH_GOT20:
+	case R_SH_GOTOFF:
+	case R_SH_GOTOFF20:
+	case R_SH_GOTPC:
+#ifdef INCLUDE_SHMEDIA
+	case R_SH_GOT_LOW16:
+	case R_SH_GOT_MEDLOW16:
+	case R_SH_GOT_MEDHI16:
+	case R_SH_GOT_HI16:
+	case R_SH_GOT10BY4:
+	case R_SH_GOT10BY8:
+	case R_SH_GOTOFF_LOW16:
+	case R_SH_GOTOFF_MEDLOW16:
+	case R_SH_GOTOFF_MEDHI16:
+	case R_SH_GOTOFF_HI16:
+	case R_SH_GOTPC_LOW16:
+	case R_SH_GOTPC_MEDLOW16:
+	case R_SH_GOTPC_MEDHI16:
+	case R_SH_GOTPC_HI16:
+#endif
+	case R_SH_TLS_GD_32:
+	case R_SH_TLS_IE_32:
+	case R_SH_GOTFUNCDESC:
+	case R_SH_GOTFUNCDESC20:
+	  if (h != NULL)
+	    {
+#ifdef INCLUDE_SHMEDIA
+	      if (seen_stt_datalabel)
+		{
+		  struct elf_sh_link_hash_entry *eh;
+		  eh = (struct elf_sh_link_hash_entry *) h;
+		  if (eh->datalabel_got.refcount > 0)
+		    eh->datalabel_got.refcount -= 1;
+		}
+	      else
+#endif
+		if (h->got.refcount > 0)
+		  h->got.refcount -= 1;
+	    }
+	  else if (local_got_refcounts != NULL)
+	    {
+#ifdef INCLUDE_SHMEDIA
+	      if (rel->r_addend & 1)
+		{
+		  if (local_got_refcounts[symtab_hdr->sh_info + r_symndx] > 0)
+		    local_got_refcounts[symtab_hdr->sh_info + r_symndx] -= 1;
+		}
+	      else
+#endif
+		if (local_got_refcounts[r_symndx] > 0)
+		  local_got_refcounts[r_symndx] -= 1;
+	    }
+	  break;
+
+	case R_SH_FUNCDESC:
+	  if (h != NULL)
+	    sh_elf_hash_entry (h)->abs_funcdesc_refcount -= 1;
+	  else if (sh_elf_hash_table (info)->fdpic_p && !info->shared)
+	    sh_elf_hash_table (info)->srofixup->size -= 4;
+
+	  /* Fall through.  */
+
+	case R_SH_GOTOFFFUNCDESC:
+	case R_SH_GOTOFFFUNCDESC20:
+	  if (h != NULL)
+	    sh_elf_hash_entry (h)->funcdesc.refcount -= 1;
+	  else
+	    local_funcdesc[r_symndx].refcount -= 1;
+	  break;
+
+	case R_SH_DIR32:
+	  if (sh_elf_hash_table (info)->fdpic_p && !info->shared
+	      && (sec->flags & SEC_ALLOC) != 0)
+	    sh_elf_hash_table (info)->srofixup->size -= 4;
+	  /* Fall thru */
+
+	case R_SH_REL32:
+	  if (info->shared)
+	    break;
+	  /* Fall thru */
+
+	case R_SH_PLT32:
+#ifdef INCLUDE_SHMEDIA
+	case R_SH_PLT_LOW16:
+	case R_SH_PLT_MEDLOW16:
+	case R_SH_PLT_MEDHI16:
+	case R_SH_PLT_HI16:
+#endif
+	  if (h != NULL)
+	    {
+	      if (h->plt.refcount > 0)
+		h->plt.refcount -= 1;
+	    }
+	  break;
+
+	case R_SH_GOTPLT32:
+#ifdef INCLUDE_SHMEDIA
+	case R_SH_GOTPLT_LOW16:
+	case R_SH_GOTPLT_MEDLOW16:
+	case R_SH_GOTPLT_MEDHI16:
+	case R_SH_GOTPLT_HI16:
+	case R_SH_GOTPLT10BY4:
+	case R_SH_GOTPLT10BY8:
+#endif
+	  if (h != NULL)
+	    {
+	      struct elf_sh_link_hash_entry *eh;
+	      eh = (struct elf_sh_link_hash_entry *) h;
+	      if (eh->gotplt_refcount > 0)
+		{
+		  eh->gotplt_refcount -= 1;
+		  if (h->plt.refcount > 0)
+		    h->plt.refcount -= 1;
+		}
+#ifdef INCLUDE_SHMEDIA
+	      else if (seen_stt_datalabel)
+		{
+		  if (eh->datalabel_got.refcount > 0)
+		    eh->datalabel_got.refcount -= 1;
+		}
+#endif
+	      else if (h->got.refcount > 0)
+		h->got.refcount -= 1;
+	    }
+	  else if (local_got_refcounts != NULL)
+	    {
+#ifdef INCLUDE_SHMEDIA
+	      if (rel->r_addend & 1)
+		{
+		  if (local_got_refcounts[symtab_hdr->sh_info + r_symndx] > 0)
+		    local_got_refcounts[symtab_hdr->sh_info + r_symndx] -= 1;
+		}
+	      else
+#endif
+		if (local_got_refcounts[r_symndx] > 0)
+		  local_got_refcounts[r_symndx] -= 1;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Copy the extra info we tack onto an elf_link_hash_entry.  */
+
+static void
+sh_elf_copy_indirect_symbol (struct bfd_link_info *info,
+			     struct elf_link_hash_entry *dir,
+			     struct elf_link_hash_entry *ind)
+{
+  struct elf_sh_link_hash_entry *edir, *eind;
+
+  edir = (struct elf_sh_link_hash_entry *) dir;
+  eind = (struct elf_sh_link_hash_entry *) ind;
+
+  if (eind->dyn_relocs != NULL)
+    {
+      if (edir->dyn_relocs != NULL)
+	{
+	  struct elf_sh_dyn_relocs **pp;
+	  struct elf_sh_dyn_relocs *p;
+
+	  /* Add reloc counts against the indirect sym to the direct sym
+	     list.  Merge any entries against the same section.  */
+	  for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      struct elf_sh_dyn_relocs *q;
+
+	      for (q = edir->dyn_relocs; q != NULL; q = q->next)
+		if (q->sec == p->sec)
+		  {
+		    q->pc_count += p->pc_count;
+		    q->count += p->count;
+		    *pp = p->next;
+		    break;
+		  }
+	      if (q == NULL)
+		pp = &p->next;
+	    }
+	  *pp = edir->dyn_relocs;
+	}
+
+      edir->dyn_relocs = eind->dyn_relocs;
+      eind->dyn_relocs = NULL;
+    }
+  edir->gotplt_refcount = eind->gotplt_refcount;
+  eind->gotplt_refcount = 0;
+#ifdef INCLUDE_SHMEDIA
+  edir->datalabel_got.refcount += eind->datalabel_got.refcount;
+  eind->datalabel_got.refcount = 0;
+#endif
+  edir->funcdesc.refcount += eind->funcdesc.refcount;
+  eind->funcdesc.refcount = 0;  
+  edir->abs_funcdesc_refcount += eind->abs_funcdesc_refcount;
+  eind->abs_funcdesc_refcount = 0;  
+
+  if (ind->root.type == bfd_link_hash_indirect
+      && dir->got.refcount <= 0)
+    {
+      edir->got_type = eind->got_type;
+      eind->got_type = GOT_UNKNOWN;
+    }
+
+  if (ind->root.type != bfd_link_hash_indirect
+      && dir->dynamic_adjusted)
+    {
+      /* If called to transfer flags for a weakdef during processing
+	 of elf_adjust_dynamic_symbol, don't copy non_got_ref.
+	 We clear it ourselves for ELIMINATE_COPY_RELOCS.  */
+      dir->ref_dynamic |= ind->ref_dynamic;
+      dir->ref_regular |= ind->ref_regular;
+      dir->ref_regular_nonweak |= ind->ref_regular_nonweak;
+      dir->needs_plt |= ind->needs_plt;
+    }
+  else
+    _bfd_elf_link_hash_copy_indirect (info, dir, ind);
+}
+
+static int
+sh_elf_optimized_tls_reloc (struct bfd_link_info *info, int r_type,
+			    int is_local)
+{
+  if (info->shared)
+    return r_type;
+
+  switch (r_type)
+    {
+    case R_SH_TLS_GD_32:
+    case R_SH_TLS_IE_32:
+      if (is_local)
+	return R_SH_TLS_LE_32;
+      return R_SH_TLS_IE_32;
+    case R_SH_TLS_LD_32:
+      return R_SH_TLS_LE_32;
+    }
+
+  return r_type;
+}
+
+/* Look through the relocs for a section during the first phase.
+   Since we don't do .gots or .plts, we just need to consider the
+   virtual table relocs for gc.  */
+
+static bfd_boolean
+sh_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
+		     const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_sh_link_hash_table *htab;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  asection *sreloc;
+  unsigned int r_type;
+  int got_type, old_got_type;
+
+  sreloc = NULL;
+
+  if (info->relocatable)
+    return TRUE;
+
+  BFD_ASSERT (is_sh_elf (abfd));
+
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+
+  htab = sh_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+#ifdef INCLUDE_SHMEDIA
+      int seen_stt_datalabel = 0;
+#endif
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      if (r_symndx < symtab_hdr->sh_info)
+	h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    {
+#ifdef INCLUDE_SHMEDIA
+	      seen_stt_datalabel |= h->type == STT_DATALABEL;
+#endif
+	      h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	    }
+	}
+
+      r_type = sh_elf_optimized_tls_reloc (info, r_type, h == NULL);
+      if (! info->shared
+	  && r_type == R_SH_TLS_IE_32
+	  && h != NULL
+	  && h->root.type != bfd_link_hash_undefined
+	  && h->root.type != bfd_link_hash_undefweak
+	  && (h->dynindx == -1
+	      || h->def_regular))
+	r_type = R_SH_TLS_LE_32;
+
+      if (htab->fdpic_p)
+	switch (r_type)
+	  {
+	  case R_SH_GOTOFFFUNCDESC:
+	  case R_SH_GOTOFFFUNCDESC20:
+	  case R_SH_FUNCDESC:
+	  case R_SH_GOTFUNCDESC:
+	  case R_SH_GOTFUNCDESC20:
+	    if (h != NULL)
+	      {
+		if (h->dynindx == -1)
+		  switch (ELF_ST_VISIBILITY (h->other))
+		    {
+		    case STV_INTERNAL:
+		    case STV_HIDDEN:
+		      break;
+		    default:
+		      bfd_elf_link_record_dynamic_symbol (info, h);
+		      break;
+		    }
+	      }
+	    break;
+	  }
+
+      /* Some relocs require a global offset table.  */
+      if (htab->sgot == NULL)
+	{
+	  switch (r_type)
+	    {
+	    case R_SH_DIR32:
+	      /* This may require an rofixup.  */
+	      if (!htab->fdpic_p)
+		break;
+	    case R_SH_GOTPLT32:
+	    case R_SH_GOT32:
+	    case R_SH_GOT20:
+	    case R_SH_GOTOFF:
+	    case R_SH_GOTOFF20:
+	    case R_SH_FUNCDESC:
+	    case R_SH_GOTFUNCDESC:
+	    case R_SH_GOTFUNCDESC20:
+	    case R_SH_GOTOFFFUNCDESC:
+	    case R_SH_GOTOFFFUNCDESC20:
+	    case R_SH_GOTPC:
+#ifdef INCLUDE_SHMEDIA
+	    case R_SH_GOTPLT_LOW16:
+	    case R_SH_GOTPLT_MEDLOW16:
+	    case R_SH_GOTPLT_MEDHI16:
+	    case R_SH_GOTPLT_HI16:
+	    case R_SH_GOTPLT10BY4:
+	    case R_SH_GOTPLT10BY8:
+	    case R_SH_GOT_LOW16:
+	    case R_SH_GOT_MEDLOW16:
+	    case R_SH_GOT_MEDHI16:
+	    case R_SH_GOT_HI16:
+	    case R_SH_GOT10BY4:
+	    case R_SH_GOT10BY8:
+	    case R_SH_GOTOFF_LOW16:
+	    case R_SH_GOTOFF_MEDLOW16:
+	    case R_SH_GOTOFF_MEDHI16:
+	    case R_SH_GOTOFF_HI16:
+	    case R_SH_GOTPC_LOW16:
+	    case R_SH_GOTPC_MEDLOW16:
+	    case R_SH_GOTPC_MEDHI16:
+	    case R_SH_GOTPC_HI16:
+#endif
+	    case R_SH_TLS_GD_32:
+	    case R_SH_TLS_LD_32:
+	    case R_SH_TLS_IE_32:
+	      if (htab->root.dynobj == NULL)
+		htab->root.dynobj = abfd;
+	      if (!create_got_section (htab->root.dynobj, info))
+		return FALSE;
+	      break;
+
+	    default:
+	      break;
+	    }
+	}
+
+      switch (r_type)
+	{
+	  /* This relocation describes the C++ object vtable hierarchy.
+	     Reconstruct it for later use during GC.  */
+	case R_SH_GNU_VTINHERIT:
+	  if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+	    return FALSE;
+	  break;
+
+	  /* This relocation describes which C++ vtable entries are actually
+	     used.  Record for later use during GC.  */
+	case R_SH_GNU_VTENTRY:
+	  BFD_ASSERT (h != NULL);
+	  if (h != NULL
+	      && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+	    return FALSE;
+	  break;
+
+	case R_SH_TLS_IE_32:
+	  if (info->shared)
+	    info->flags |= DF_STATIC_TLS;
+
+	  /* FALLTHROUGH */
+	force_got:
+	case R_SH_TLS_GD_32:
+	case R_SH_GOT32:
+	case R_SH_GOT20:
+#ifdef INCLUDE_SHMEDIA
+	case R_SH_GOT_LOW16:
+	case R_SH_GOT_MEDLOW16:
+	case R_SH_GOT_MEDHI16:
+	case R_SH_GOT_HI16:
+	case R_SH_GOT10BY4:
+	case R_SH_GOT10BY8:
+#endif
+	case R_SH_GOTFUNCDESC:
+	case R_SH_GOTFUNCDESC20:
+	  switch (r_type)
+	    {
+	    default:
+	      got_type = GOT_NORMAL;
+	      break;
+	    case R_SH_TLS_GD_32:
+	      got_type = GOT_TLS_GD;
+	      break;
+	    case R_SH_TLS_IE_32:
+	      got_type = GOT_TLS_IE;
+	      break;
+	    case R_SH_GOTFUNCDESC:
+	    case R_SH_GOTFUNCDESC20:
+	      got_type = GOT_FUNCDESC;
+	      break;
+	    }
+
+	  if (h != NULL)
+	    {
+#ifdef INCLUDE_SHMEDIA
+	      if (seen_stt_datalabel)
+		{
+		  struct elf_sh_link_hash_entry *eh
+		    = (struct elf_sh_link_hash_entry *) h;
+
+		  eh->datalabel_got.refcount += 1;
+		}
+	      else
+#endif
+		h->got.refcount += 1;
+	      old_got_type = sh_elf_hash_entry (h)->got_type;
+	    }
+	  else
+	    {
+	      bfd_signed_vma *local_got_refcounts;
+
+	      /* This is a global offset table entry for a local
+		 symbol.  */
+	      local_got_refcounts = elf_local_got_refcounts (abfd);
+	      if (local_got_refcounts == NULL)
+		{
+		  bfd_size_type size;
+
+		  size = symtab_hdr->sh_info;
+		  size *= sizeof (bfd_signed_vma);
+#ifdef INCLUDE_SHMEDIA
+		  /* Reserve space for both the datalabel and
+		     codelabel local GOT offsets.  */
+		  size *= 2;
+#endif
+		  size += symtab_hdr->sh_info;
+		  local_got_refcounts = ((bfd_signed_vma *)
+					 bfd_zalloc (abfd, size));
+		  if (local_got_refcounts == NULL)
+		    return FALSE;
+		  elf_local_got_refcounts (abfd) = local_got_refcounts;
+#ifdef 	INCLUDE_SHMEDIA
+		  /* Take care of both the datalabel and codelabel local
+		     GOT offsets.  */
+		  sh_elf_local_got_type (abfd)
+		    = (char *) (local_got_refcounts + 2 * symtab_hdr->sh_info);
+#else
+		  sh_elf_local_got_type (abfd)
+		    = (char *) (local_got_refcounts + symtab_hdr->sh_info);
+#endif
+		}
+#ifdef INCLUDE_SHMEDIA
+	      if (rel->r_addend & 1)
+		local_got_refcounts[symtab_hdr->sh_info + r_symndx] += 1;
+	      else
+#endif
+		local_got_refcounts[r_symndx] += 1;
+	      old_got_type = sh_elf_local_got_type (abfd) [r_symndx];
+	    }
+
+	  /* If a TLS symbol is accessed using IE at least once,
+	     there is no point to use dynamic model for it.  */
+	  if (old_got_type != got_type && old_got_type != GOT_UNKNOWN
+	      && (old_got_type != GOT_TLS_GD || got_type != GOT_TLS_IE))
+	    {
+	      if (old_got_type == GOT_TLS_IE && got_type == GOT_TLS_GD)
+		got_type = GOT_TLS_IE;
+	      else
+		{
+		  if ((old_got_type == GOT_FUNCDESC || got_type == GOT_FUNCDESC)
+		      && (old_got_type == GOT_NORMAL || got_type == GOT_NORMAL))
+		    (*_bfd_error_handler)
+		      (_("%B: `%s' accessed both as normal and FDPIC symbol"),
+		       abfd, h->root.root.string);
+		  else if (old_got_type == GOT_FUNCDESC
+			   || got_type == GOT_FUNCDESC)
+		    (*_bfd_error_handler)
+		      (_("%B: `%s' accessed both as FDPIC and thread local symbol"),
+		       abfd, h->root.root.string);
+		  else
+		    (*_bfd_error_handler)
+		    (_("%B: `%s' accessed both as normal and thread local symbol"),
+		     abfd, h->root.root.string);
+		  return FALSE;
+		}
+	    }
+
+	  if (old_got_type != got_type)
+	    {
+	      if (h != NULL)
+		sh_elf_hash_entry (h)->got_type = got_type;
+	      else
+		sh_elf_local_got_type (abfd) [r_symndx] = got_type;
+	    }
+
+	  break;
+
+	case R_SH_TLS_LD_32:
+	  sh_elf_hash_table(info)->tls_ldm_got.refcount += 1;
+	  break;
+
+	case R_SH_FUNCDESC:
+	case R_SH_GOTOFFFUNCDESC:
+	case R_SH_GOTOFFFUNCDESC20:
+	  if (rel->r_addend)
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: Function descriptor relocation with non-zero addend"),
+		 abfd);
+	      return FALSE;
+	    }
+
+	  if (h == NULL)
+	    {
+	      union gotref *local_funcdesc;
+
+	      /* We need a function descriptor for a local symbol.  */
+	      local_funcdesc = sh_elf_local_funcdesc (abfd);
+	      if (local_funcdesc == NULL)
+		{
+		  bfd_size_type size;
+
+		  size = symtab_hdr->sh_info * sizeof (union gotref);
+#ifdef INCLUDE_SHMEDIA
+		  /* Count datalabel local GOT.  */
+		  size *= 2;
+#endif
+		  local_funcdesc = (union gotref *) bfd_zalloc (abfd, size);
+		  if (local_funcdesc == NULL)
+		    return FALSE;
+		  sh_elf_local_funcdesc (abfd) = local_funcdesc;
+		}
+	      local_funcdesc[r_symndx].refcount += 1;
+
+	      if (r_type == R_SH_FUNCDESC)
+		{
+		  if (!info->shared)
+		    htab->srofixup->size += 4;
+		  else
+		    htab->srelgot->size += sizeof (Elf32_External_Rela);
+		}
+	    }
+	  else
+	    {
+	      sh_elf_hash_entry (h)->funcdesc.refcount++;
+	      if (r_type == R_SH_FUNCDESC)
+		sh_elf_hash_entry (h)->abs_funcdesc_refcount++;
+
+	      /* If there is a function descriptor reference, then
+		 there should not be any non-FDPIC references.  */
+	      old_got_type = sh_elf_hash_entry (h)->got_type;
+	      if (old_got_type != GOT_FUNCDESC && old_got_type != GOT_UNKNOWN)
+		{
+		  if (old_got_type == GOT_NORMAL)
+		    (*_bfd_error_handler)
+		      (_("%B: `%s' accessed both as normal and FDPIC symbol"),
+		       abfd, h->root.root.string);
+		  else
+		    (*_bfd_error_handler)
+		      (_("%B: `%s' accessed both as FDPIC and thread local symbol"),
+		       abfd, h->root.root.string);
+		}
+	    }
+	  break;
+
+	case R_SH_GOTPLT32:
+#ifdef INCLUDE_SHMEDIA
+	case R_SH_GOTPLT_LOW16:
+	case R_SH_GOTPLT_MEDLOW16:
+	case R_SH_GOTPLT_MEDHI16:
+	case R_SH_GOTPLT_HI16:
+	case R_SH_GOTPLT10BY4:
+	case R_SH_GOTPLT10BY8:
+#endif
+	  /* If this is a local symbol, we resolve it directly without
+	     creating a procedure linkage table entry.  */
+
+	  if (h == NULL
+	      || h->forced_local
+	      || ! info->shared
+	      || info->symbolic
+	      || h->dynindx == -1)
+	    goto force_got;
+
+	  h->needs_plt = 1;
+	  h->plt.refcount += 1;
+	  ((struct elf_sh_link_hash_entry *) h)->gotplt_refcount += 1;
+
+	  break;
+
+	case R_SH_PLT32:
+#ifdef INCLUDE_SHMEDIA
+	case R_SH_PLT_LOW16:
+	case R_SH_PLT_MEDLOW16:
+	case R_SH_PLT_MEDHI16:
+	case R_SH_PLT_HI16:
+#endif
+	  /* This symbol requires a procedure linkage table entry.  We
+	     actually build the entry in adjust_dynamic_symbol,
+	     because this might be a case of linking PIC code which is
+	     never referenced by a dynamic object, in which case we
+	     don't need to generate a procedure linkage table entry
+	     after all.  */
+
+	  /* If this is a local symbol, we resolve it directly without
+	     creating a procedure linkage table entry.  */
+	  if (h == NULL)
+	    continue;
+
+	  if (h->forced_local)
+	    break;
+
+	  h->needs_plt = 1;
+	  h->plt.refcount += 1;
+	  break;
+
+	case R_SH_DIR32:
+	case R_SH_REL32:
+#ifdef INCLUDE_SHMEDIA
+	case R_SH_IMM_LOW16_PCREL:
+	case R_SH_IMM_MEDLOW16_PCREL:
+	case R_SH_IMM_MEDHI16_PCREL:
+	case R_SH_IMM_HI16_PCREL:
+#endif
+	  if (h != NULL && ! info->shared)
+	    {
+	      h->non_got_ref = 1;
+	      h->plt.refcount += 1;
+	    }
+
+	  /* If we are creating a shared library, and this is a reloc
+	     against a global symbol, or a non PC relative reloc
+	     against a local symbol, then we need to copy the reloc
+	     into the shared library.  However, if we are linking with
+	     -Bsymbolic, we do not need to copy a reloc against a
+	     global symbol which is defined in an object we are
+	     including in the link (i.e., DEF_REGULAR is set).  At
+	     this point we have not seen all the input files, so it is
+	     possible that DEF_REGULAR is not set now but will be set
+	     later (it is never cleared).  We account for that
+	     possibility below by storing information in the
+	     dyn_relocs field of the hash table entry. A similar
+	     situation occurs when creating shared libraries and symbol
+	     visibility changes render the symbol local.
+
+	     If on the other hand, we are creating an executable, we
+	     may need to keep relocations for symbols satisfied by a
+	     dynamic library if we manage to avoid copy relocs for the
+	     symbol.  */
+	  if ((info->shared
+	       && (sec->flags & SEC_ALLOC) != 0
+	       && (r_type != R_SH_REL32
+		   || (h != NULL
+		       && (! info->symbolic
+			   || h->root.type == bfd_link_hash_defweak
+			   || !h->def_regular))))
+	      || (! info->shared
+		  && (sec->flags & SEC_ALLOC) != 0
+		  && h != NULL
+		  && (h->root.type == bfd_link_hash_defweak
+		      || !h->def_regular)))
+	    {
+	      struct elf_sh_dyn_relocs *p;
+	      struct elf_sh_dyn_relocs **head;
+
+	      if (htab->root.dynobj == NULL)
+		htab->root.dynobj = abfd;
+
+	      /* When creating a shared object, we must copy these
+		 reloc types into the output file.  We create a reloc
+		 section in dynobj and make room for this reloc.  */
+	      if (sreloc == NULL)
+		{
+		  sreloc = _bfd_elf_make_dynamic_reloc_section
+		    (sec, htab->root.dynobj, 2, abfd, /*rela?*/ TRUE);
+
+		  if (sreloc == NULL)
+		    return FALSE;
+		}
+
+	      /* If this is a global symbol, we count the number of
+		 relocations we need for this symbol.  */
+	      if (h != NULL)
+		head = &((struct elf_sh_link_hash_entry *) h)->dyn_relocs;
+	      else
+		{
+		  /* Track dynamic relocs needed for local syms too.  */
+		  asection *s;
+		  void *vpp;
+		  Elf_Internal_Sym *isym;
+
+		  isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+						abfd, r_symndx);
+		  if (isym == NULL)
+		    return FALSE;
+
+		  s = bfd_section_from_elf_index (abfd, isym->st_shndx);
+		  if (s == NULL)
+		    s = sec;
+
+		  vpp = &elf_section_data (s)->local_dynrel;
+		  head = (struct elf_sh_dyn_relocs **) vpp;
+		}
+
+	      p = *head;
+	      if (p == NULL || p->sec != sec)
+		{
+		  bfd_size_type amt = sizeof (*p);
+		  p = bfd_alloc (htab->root.dynobj, amt);
+		  if (p == NULL)
+		    return FALSE;
+		  p->next = *head;
+		  *head = p;
+		  p->sec = sec;
+		  p->count = 0;
+		  p->pc_count = 0;
+		}
+
+	      p->count += 1;
+	      if (r_type == R_SH_REL32
+#ifdef INCLUDE_SHMEDIA
+		  || r_type == R_SH_IMM_LOW16_PCREL
+		  || r_type == R_SH_IMM_MEDLOW16_PCREL
+		  || r_type == R_SH_IMM_MEDHI16_PCREL
+		  || r_type == R_SH_IMM_HI16_PCREL
+#endif
+		  )
+		p->pc_count += 1;
+	    }
+
+	  /* Allocate the fixup regardless of whether we need a relocation.
+	     If we end up generating the relocation, we'll unallocate the
+	     fixup.  */
+	  if (htab->fdpic_p && !info->shared
+	      && r_type == R_SH_DIR32
+	      && (sec->flags & SEC_ALLOC) != 0)
+	    htab->srofixup->size += 4;
+	  break;
+
+	case R_SH_TLS_LE_32:
+	  if (info->shared && !info->pie)
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: TLS local exec code cannot be linked into shared objects"),
+		 abfd);
+	      return FALSE;
+	    }
+
+	  break;
+
+	case R_SH_TLS_LDO_32:
+	  /* Nothing to do.  */
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+#ifndef sh_elf_set_mach_from_flags
+static unsigned int sh_ef_bfd_table[] = { EF_SH_BFD_TABLE };
+
+static bfd_boolean
+sh_elf_set_mach_from_flags (bfd *abfd)
+{
+  flagword flags = elf_elfheader (abfd)->e_flags & EF_SH_MACH_MASK;
+
+  if (flags >= sizeof(sh_ef_bfd_table))
+    return FALSE;
+
+  if (sh_ef_bfd_table[flags] == 0)
+    return FALSE;
+  
+  bfd_default_set_arch_mach (abfd, bfd_arch_sh, sh_ef_bfd_table[flags]);
+
+  return TRUE;
+}
+
+
+/* Reverse table lookup for sh_ef_bfd_table[].
+   Given a bfd MACH value from archures.c
+   return the equivalent ELF flags from the table.
+   Return -1 if no match is found.  */
+
+int
+sh_elf_get_flags_from_mach (unsigned long mach)
+{
+  int i = ARRAY_SIZE (sh_ef_bfd_table) - 1;
+  
+  for (; i>0; i--)
+    if (sh_ef_bfd_table[i] == mach)
+      return i;
+  
+  /* shouldn't get here */
+  BFD_FAIL();
+
+  return -1;
+}
+#endif /* not sh_elf_set_mach_from_flags */
+
+#ifndef sh_elf_set_private_flags
+/* Function to keep SH specific file flags.  */
+
+static bfd_boolean
+sh_elf_set_private_flags (bfd *abfd, flagword flags)
+{
+  BFD_ASSERT (! elf_flags_init (abfd)
+	      || elf_elfheader (abfd)->e_flags == flags);
+
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = TRUE;
+  return sh_elf_set_mach_from_flags (abfd);
+}
+#endif /* not sh_elf_set_private_flags */
+
+#ifndef sh_elf_copy_private_data
+/* Copy backend specific data from one object module to another */
+
+static bfd_boolean
+sh_elf_copy_private_data (bfd * ibfd, bfd * obfd)
+{
+  /* Copy object attributes.  */
+  _bfd_elf_copy_obj_attributes (ibfd, obfd);
+
+  if (! is_sh_elf (ibfd) || ! is_sh_elf (obfd))
+    return TRUE;
+
+  /* Copy the stack size.  */
+  if (elf_tdata (ibfd)->phdr && elf_tdata (obfd)->phdr
+      && fdpic_object_p (ibfd) && fdpic_object_p (obfd))
+    {
+      unsigned i;
+
+      for (i = 0; i < elf_elfheader (ibfd)->e_phnum; i++)
+	if (elf_tdata (ibfd)->phdr[i].p_type == PT_GNU_STACK)
+	  {
+	    Elf_Internal_Phdr *iphdr = &elf_tdata (ibfd)->phdr[i];
+
+	    for (i = 0; i < elf_elfheader (obfd)->e_phnum; i++)
+	      if (elf_tdata (obfd)->phdr[i].p_type == PT_GNU_STACK)
+		{
+		  memcpy (&elf_tdata (obfd)->phdr[i], iphdr, sizeof (*iphdr));
+
+		  /* Rewrite the phdrs, since we're only called after they
+		     were first written.  */
+		  if (bfd_seek (obfd,
+				(bfd_signed_vma) get_elf_backend_data (obfd)
+				->s->sizeof_ehdr, SEEK_SET) != 0
+		      || get_elf_backend_data (obfd)->s
+		      ->write_out_phdrs (obfd, elf_tdata (obfd)->phdr,
+					 elf_elfheader (obfd)->e_phnum) != 0)
+		    return FALSE;
+		  break;
+		}
+
+	    break;
+	  }
+    }
+
+  return sh_elf_set_private_flags (obfd, elf_elfheader (ibfd)->e_flags);
+}
+#endif /* not sh_elf_copy_private_data */
+
+#ifndef sh_elf_merge_private_data
+
+/* This function returns the ELF architecture number that
+   corresponds to the given arch_sh* flags.  */
+
+int
+sh_find_elf_flags (unsigned int arch_set)
+{
+  extern unsigned long sh_get_bfd_mach_from_arch_set (unsigned int);
+  unsigned long bfd_mach = sh_get_bfd_mach_from_arch_set (arch_set);
+
+  return sh_elf_get_flags_from_mach (bfd_mach);
+}
+
+/* This routine initialises the elf flags when required and
+   calls sh_merge_bfd_arch() to check dsp/fpu compatibility.  */
+
+static bfd_boolean
+sh_elf_merge_private_data (bfd *ibfd, bfd *obfd)
+{
+  extern bfd_boolean sh_merge_bfd_arch (bfd *, bfd *);
+
+  if (! is_sh_elf (ibfd) || ! is_sh_elf (obfd))
+    return TRUE;
+
+  if (! elf_flags_init (obfd))
+    {
+      /* This happens when ld starts out with a 'blank' output file.  */
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
+      sh_elf_set_mach_from_flags (obfd);
+      if (elf_elfheader (obfd)->e_flags & EF_SH_FDPIC)
+	elf_elfheader (obfd)->e_flags |= EF_SH_PIC;
+    }
+
+  if (! sh_merge_bfd_arch (ibfd, obfd))
+    {
+      _bfd_error_handler ("%B: uses instructions which are incompatible "
+			  "with instructions used in previous modules",
+			  ibfd);
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  elf_elfheader (obfd)->e_flags &= ~EF_SH_MACH_MASK;
+  elf_elfheader (obfd)->e_flags |=
+    sh_elf_get_flags_from_mach (bfd_get_mach (obfd));
+
+  if (fdpic_object_p (ibfd) != fdpic_object_p (obfd))
+    {
+      _bfd_error_handler ("%B: attempt to mix FDPIC and non-FDPIC objects",
+			  ibfd);
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+#endif /* not sh_elf_merge_private_data */
+
+/* Override the generic function because we need to store sh_elf_obj_tdata
+   as the specific tdata.  We set also the machine architecture from flags
+   here.  */
+
+static bfd_boolean
+sh_elf_object_p (bfd *abfd)
+{
+  if (! sh_elf_set_mach_from_flags (abfd))
+    return FALSE;
+
+  return (((elf_elfheader (abfd)->e_flags & EF_SH_FDPIC) != 0)
+	  == fdpic_object_p (abfd));
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+sh_elf_finish_dynamic_symbol (bfd *output_bfd, struct bfd_link_info *info,
+			      struct elf_link_hash_entry *h,
+			      Elf_Internal_Sym *sym)
+{
+  struct elf_sh_link_hash_table *htab;
+
+  htab = sh_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      asection *splt;
+      asection *sgotplt;
+      asection *srelplt;
+
+      bfd_vma plt_index;
+      bfd_vma got_offset;
+      Elf_Internal_Rela rel;
+      bfd_byte *loc;
+      const struct elf_sh_plt_info *plt_info;
+
+      /* This symbol has an entry in the procedure linkage table.  Set
+	 it up.  */
+
+      BFD_ASSERT (h->dynindx != -1);
+
+      splt = htab->splt;
+      sgotplt = htab->sgotplt;
+      srelplt = htab->srelplt;
+      BFD_ASSERT (splt != NULL && sgotplt != NULL && srelplt != NULL);
+
+      /* Get the index in the procedure linkage table which
+	 corresponds to this symbol.  This is the index of this symbol
+	 in all the symbols for which we are making plt entries.  The
+	 first entry in the procedure linkage table is reserved.  */
+      plt_index = get_plt_index (htab->plt_info, h->plt.offset);
+
+      plt_info = htab->plt_info;
+      if (plt_info->short_plt != NULL && plt_index <= MAX_SHORT_PLT)
+	plt_info = plt_info->short_plt;
+
+      /* Get the offset into the .got table of the entry that
+	 corresponds to this function.  */
+      if (htab->fdpic_p)
+	/* The offset must be relative to the GOT symbol, twelve bytes
+	   before the end of .got.plt.  Each descriptor is eight
+	   bytes.  */
+	got_offset = plt_index * 8 + 12 - sgotplt->size;
+      else
+	/* Each .got entry is 4 bytes.  The first three are
+	   reserved.  */
+	got_offset = (plt_index + 3) * 4;
+
+#ifdef GOT_BIAS
+      if (info->shared)
+	got_offset -= GOT_BIAS;
+#endif
+
+      /* Fill in the entry in the procedure linkage table.  */
+      memcpy (splt->contents + h->plt.offset,
+	      plt_info->symbol_entry,
+	      plt_info->symbol_entry_size);
+
+      if (info->shared || htab->fdpic_p)
+	{
+	  if (plt_info->symbol_fields.got20)
+	    {
+	      bfd_reloc_status_type r;
+	      r = install_movi20_field (output_bfd, got_offset,
+					splt->owner, splt, splt->contents,
+					h->plt.offset
+					+ plt_info->symbol_fields.got_entry);
+	      BFD_ASSERT (r == bfd_reloc_ok);
+	    }
+	  else
+	    install_plt_field (output_bfd, FALSE, got_offset,
+			       (splt->contents
+				+ h->plt.offset
+				+ plt_info->symbol_fields.got_entry));
+	}
+      else
+	{
+	  BFD_ASSERT (!plt_info->symbol_fields.got20);
+
+	  install_plt_field (output_bfd, FALSE,
+			     (sgotplt->output_section->vma
+			      + sgotplt->output_offset
+			      + got_offset),
+			     (splt->contents
+			      + h->plt.offset
+			      + plt_info->symbol_fields.got_entry));
+	  if (htab->vxworks_p)
+	    {
+	      unsigned int reachable_plts, plts_per_4k;
+	      int distance;
+
+	      /* Divide the PLT into groups.  The first group contains
+		 REACHABLE_PLTS entries and the other groups contain
+		 PLTS_PER_4K entries.  Entries in the first group can
+		 branch directly to .plt; those in later groups branch
+		 to the last element of the previous group.  */
+	      /* ??? It would be better to create multiple copies of
+		 the common resolver stub.  */
+	      reachable_plts = ((4096
+				 - plt_info->plt0_entry_size
+				 - (plt_info->symbol_fields.plt + 4))
+				/ plt_info->symbol_entry_size) + 1;
+	      plts_per_4k = (4096 / plt_info->symbol_entry_size);
+	      if (plt_index < reachable_plts)
+		distance = -(h->plt.offset
+			     + plt_info->symbol_fields.plt);
+	      else
+		distance = -(((plt_index - reachable_plts) % plts_per_4k + 1)
+			     * plt_info->symbol_entry_size);
+
+	      /* Install the 'bra' with this offset.  */
+	      bfd_put_16 (output_bfd,
+			  0xa000 | (0x0fff & ((distance - 4) / 2)),
+			  (splt->contents
+			   + h->plt.offset
+			   + plt_info->symbol_fields.plt));
+	    }
+	  else
+	    install_plt_field (output_bfd, TRUE,
+			       splt->output_section->vma + splt->output_offset,
+			       (splt->contents
+				+ h->plt.offset
+				+ plt_info->symbol_fields.plt));
+	}
+
+      /* Make got_offset relative to the start of .got.plt.  */
+#ifdef GOT_BIAS
+      if (info->shared)
+	got_offset += GOT_BIAS;
+#endif
+      if (htab->fdpic_p)
+	got_offset = plt_index * 8;
+
+      if (plt_info->symbol_fields.reloc_offset != MINUS_ONE)
+	install_plt_field (output_bfd, FALSE,
+			   plt_index * sizeof (Elf32_External_Rela),
+			   (splt->contents
+			    + h->plt.offset
+			    + plt_info->symbol_fields.reloc_offset));
+
+      /* Fill in the entry in the global offset table.  */
+      bfd_put_32 (output_bfd,
+		  (splt->output_section->vma
+		   + splt->output_offset
+		   + h->plt.offset
+		   + plt_info->symbol_resolve_offset),
+		  sgotplt->contents + got_offset);
+      if (htab->fdpic_p)
+	bfd_put_32 (output_bfd,
+		    sh_elf_osec_to_segment (output_bfd,
+					    htab->splt->output_section),
+		    sgotplt->contents + got_offset + 4);
+
+      /* Fill in the entry in the .rela.plt section.  */
+      rel.r_offset = (sgotplt->output_section->vma
+		      + sgotplt->output_offset
+		      + got_offset);
+      if (htab->fdpic_p)
+	rel.r_info = ELF32_R_INFO (h->dynindx, R_SH_FUNCDESC_VALUE);
+      else
+	rel.r_info = ELF32_R_INFO (h->dynindx, R_SH_JMP_SLOT);
+      rel.r_addend = 0;
+#ifdef GOT_BIAS
+      rel.r_addend = GOT_BIAS;
+#endif
+      loc = srelplt->contents + plt_index * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rel, loc);
+
+      if (htab->vxworks_p && !info->shared)
+	{
+	  /* Create the .rela.plt.unloaded relocations for this PLT entry.
+	     Begin by pointing LOC to the first such relocation.  */
+	  loc = (htab->srelplt2->contents
+		 + (plt_index * 2 + 1) * sizeof (Elf32_External_Rela));
+
+	  /* Create a .rela.plt.unloaded R_SH_DIR32 relocation
+	     for the PLT entry's pointer to the .got.plt entry.  */
+	  rel.r_offset = (htab->splt->output_section->vma
+			  + htab->splt->output_offset
+			  + h->plt.offset
+			  + plt_info->symbol_fields.got_entry);
+	  rel.r_info = ELF32_R_INFO (htab->root.hgot->indx, R_SH_DIR32);
+	  rel.r_addend = got_offset;
+	  bfd_elf32_swap_reloca_out (output_bfd, &rel, loc);
+	  loc += sizeof (Elf32_External_Rela);
+
+	  /* Create a .rela.plt.unloaded R_SH_DIR32 relocation for
+	     the .got.plt entry, which initially points to .plt.  */
+	  rel.r_offset = (sgotplt->output_section->vma
+			  + sgotplt->output_offset
+			  + got_offset);
+	  rel.r_info = ELF32_R_INFO (htab->root.hplt->indx, R_SH_DIR32);
+	  rel.r_addend = 0;
+	  bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
+	}
+
+      if (!h->def_regular)
+	{
+	  /* Mark the symbol as undefined, rather than as defined in
+	     the .plt section.  Leave the value alone.  */
+	  sym->st_shndx = SHN_UNDEF;
+	}
+    }
+
+  if (h->got.offset != (bfd_vma) -1
+      && sh_elf_hash_entry (h)->got_type != GOT_TLS_GD
+      && sh_elf_hash_entry (h)->got_type != GOT_TLS_IE
+      && sh_elf_hash_entry (h)->got_type != GOT_FUNCDESC)
+    {
+      asection *sgot;
+      asection *srelgot;
+      Elf_Internal_Rela rel;
+      bfd_byte *loc;
+
+      /* This symbol has an entry in the global offset table.  Set it
+	 up.  */
+
+      sgot = htab->sgot;
+      srelgot = htab->srelgot;
+      BFD_ASSERT (sgot != NULL && srelgot != NULL);
+
+      rel.r_offset = (sgot->output_section->vma
+		      + sgot->output_offset
+		      + (h->got.offset &~ (bfd_vma) 1));
+
+      /* If this is a static link, or it is a -Bsymbolic link and the
+	 symbol is defined locally or was forced to be local because
+	 of a version file, we just want to emit a RELATIVE reloc.
+	 The entry in the global offset table will already have been
+	 initialized in the relocate_section function.  */
+      if (info->shared
+	  && SYMBOL_REFERENCES_LOCAL (info, h))
+	{
+	  if (htab->fdpic_p)
+	    {
+	      asection *sec = h->root.u.def.section;
+	      int dynindx
+		= elf_section_data (sec->output_section)->dynindx;
+
+	      rel.r_info = ELF32_R_INFO (dynindx, R_SH_DIR32);
+	      rel.r_addend = (h->root.u.def.value
+			      + h->root.u.def.section->output_offset);
+	    }
+	  else
+	    {
+	      rel.r_info = ELF32_R_INFO (0, R_SH_RELATIVE);
+	      rel.r_addend = (h->root.u.def.value
+			      + h->root.u.def.section->output_section->vma
+			      + h->root.u.def.section->output_offset);
+	    }
+	}
+      else
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + h->got.offset);
+	  rel.r_info = ELF32_R_INFO (h->dynindx, R_SH_GLOB_DAT);
+	  rel.r_addend = 0;
+	}
+
+      loc = srelgot->contents;
+      loc += srelgot->reloc_count++ * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rel, loc);
+    }
+
+#ifdef INCLUDE_SHMEDIA
+  {
+    struct elf_sh_link_hash_entry *eh;
+
+    eh = (struct elf_sh_link_hash_entry *) h;
+    if (eh->datalabel_got.offset != (bfd_vma) -1)
+      {
+	asection *sgot;
+	asection *srelgot;
+	Elf_Internal_Rela rel;
+	bfd_byte *loc;
+
+	/* This symbol has a datalabel entry in the global offset table.
+	   Set it up.  */
+
+	sgot = htab->sgot;
+	srelgot = htab->srelgot;
+	BFD_ASSERT (sgot != NULL && srelgot != NULL);
+
+	rel.r_offset = (sgot->output_section->vma
+			+ sgot->output_offset
+			+ (eh->datalabel_got.offset &~ (bfd_vma) 1));
+
+	/* If this is a static link, or it is a -Bsymbolic link and the
+	   symbol is defined locally or was forced to be local because
+	   of a version file, we just want to emit a RELATIVE reloc.
+	   The entry in the global offset table will already have been
+	   initialized in the relocate_section function.  */
+	if (info->shared
+	    && SYMBOL_REFERENCES_LOCAL (info, h))
+	  {
+	    if (htab->fdpic_p)
+	      {
+		asection *sec = h->root.u.def.section;
+		int dynindx
+		  = elf_section_data (sec->output_section)->dynindx;
+
+		rel.r_info = ELF32_R_INFO (dynindx, R_SH_DIR32);
+		rel.r_addend = (h->root.u.def.value
+				+ h->root.u.def.section->output_offset);
+	      }
+	    else
+	      {
+		rel.r_info = ELF32_R_INFO (0, R_SH_RELATIVE);
+		rel.r_addend = (h->root.u.def.value
+				+ h->root.u.def.section->output_section->vma
+				+ h->root.u.def.section->output_offset);
+	      }
+	  }
+	else
+	  {
+	    bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents
+			+ eh->datalabel_got.offset);
+	    rel.r_info = ELF32_R_INFO (h->dynindx, R_SH_GLOB_DAT);
+	    rel.r_addend = 0;
+	  }
+
+	loc = srelgot->contents;
+	loc += srelgot->reloc_count++ * sizeof (Elf32_External_Rela);
+	bfd_elf32_swap_reloca_out (output_bfd, &rel, loc);
+      }
+  }
+#endif
+
+  if (h->needs_copy)
+    {
+      asection *s;
+      Elf_Internal_Rela rel;
+      bfd_byte *loc;
+
+      /* This symbol needs a copy reloc.  Set it up.  */
+
+      BFD_ASSERT (h->dynindx != -1
+		  && (h->root.type == bfd_link_hash_defined
+		      || h->root.type == bfd_link_hash_defweak));
+
+      s = bfd_get_section_by_name (h->root.u.def.section->owner,
+				   ".rela.bss");
+      BFD_ASSERT (s != NULL);
+
+      rel.r_offset = (h->root.u.def.value
+		      + h->root.u.def.section->output_section->vma
+		      + h->root.u.def.section->output_offset);
+      rel.r_info = ELF32_R_INFO (h->dynindx, R_SH_COPY);
+      rel.r_addend = 0;
+      loc = s->contents + s->reloc_count++ * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rel, loc);
+    }
+
+  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  On VxWorks,
+     _GLOBAL_OFFSET_TABLE_ is not absolute: it is relative to the
+     ".got" section.  */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+      || (!htab->vxworks_p && h == htab->root.hgot))
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+sh_elf_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
+{
+  struct elf_sh_link_hash_table *htab;
+  asection *sgotplt;
+  asection *sdyn;
+
+  htab = sh_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  sgotplt = htab->sgotplt;
+  sdyn = bfd_get_section_by_name (htab->root.dynobj, ".dynamic");
+
+  if (htab->root.dynamic_sections_created)
+    {
+      asection *splt;
+      Elf32_External_Dyn *dyncon, *dynconend;
+
+      BFD_ASSERT (sgotplt != NULL && sdyn != NULL);
+
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+	  asection *s;
+#ifdef INCLUDE_SHMEDIA
+	  const char *name;
+#endif
+
+	  bfd_elf32_swap_dyn_in (htab->root.dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    default:
+	      if (htab->vxworks_p
+		  && elf_vxworks_finish_dynamic_entry (output_bfd, &dyn))
+		bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+#ifdef INCLUDE_SHMEDIA
+	    case DT_INIT:
+	      name = info->init_function;
+	      goto get_sym;
+
+	    case DT_FINI:
+	      name = info->fini_function;
+	    get_sym:
+	      if (dyn.d_un.d_val != 0)
+		{
+		  struct elf_link_hash_entry *h;
+
+		  h = elf_link_hash_lookup (&htab->root, name,
+					    FALSE, FALSE, TRUE);
+		  if (h != NULL && (h->other & STO_SH5_ISA32))
+		    {
+		      dyn.d_un.d_val |= 1;
+		      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+		    }
+		}
+	      break;
+#endif
+
+	    case DT_PLTGOT:
+	      BFD_ASSERT (htab->root.hgot != NULL);
+	      s = htab->root.hgot->root.u.def.section;
+	      dyn.d_un.d_ptr = htab->root.hgot->root.u.def.value
+		+ s->output_section->vma + s->output_offset;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_JMPREL:
+	      s = htab->srelplt->output_section;
+	      BFD_ASSERT (s != NULL);
+	      dyn.d_un.d_ptr = s->vma;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_PLTRELSZ:
+	      s = htab->srelplt->output_section;
+	      BFD_ASSERT (s != NULL);
+	      dyn.d_un.d_val = s->size;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_RELASZ:
+	      /* My reading of the SVR4 ABI indicates that the
+		 procedure linkage table relocs (DT_JMPREL) should be
+		 included in the overall relocs (DT_RELA).  This is
+		 what Solaris does.  However, UnixWare can not handle
+		 that case.  Therefore, we override the DT_RELASZ entry
+		 here to make it not include the JMPREL relocs.  Since
+		 the linker script arranges for .rela.plt to follow all
+		 other relocation sections, we don't have to worry
+		 about changing the DT_RELA entry.  */
+	      if (htab->srelplt != NULL)
+		{
+		  s = htab->srelplt->output_section;
+		  dyn.d_un.d_val -= s->size;
+		}
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+	    }
+	}
+
+      /* Fill in the first entry in the procedure linkage table.  */
+      splt = htab->splt;
+      if (splt && splt->size > 0 && htab->plt_info->plt0_entry)
+	{
+	  unsigned int i;
+
+	  memcpy (splt->contents,
+		  htab->plt_info->plt0_entry,
+		  htab->plt_info->plt0_entry_size);
+	  for (i = 0; i < ARRAY_SIZE (htab->plt_info->plt0_got_fields); i++)
+	    if (htab->plt_info->plt0_got_fields[i] != MINUS_ONE)
+	      install_plt_field (output_bfd, FALSE,
+				 (sgotplt->output_section->vma
+				  + sgotplt->output_offset
+				  + (i * 4)),
+				 (splt->contents
+				  + htab->plt_info->plt0_got_fields[i]));
+
+	  if (htab->vxworks_p)
+	    {
+	      /* Finalize the .rela.plt.unloaded contents.  */
+	      Elf_Internal_Rela rel;
+	      bfd_byte *loc;
+
+	      /* Create a .rela.plt.unloaded R_SH_DIR32 relocation for the
+		 first PLT entry's pointer to _GLOBAL_OFFSET_TABLE_ + 8.  */
+	      loc = htab->srelplt2->contents;
+	      rel.r_offset = (splt->output_section->vma
+			      + splt->output_offset
+			      + htab->plt_info->plt0_got_fields[2]);
+	      rel.r_info = ELF32_R_INFO (htab->root.hgot->indx, R_SH_DIR32);
+	      rel.r_addend = 8;
+	      bfd_elf32_swap_reloca_out (output_bfd, &rel, loc);
+	      loc += sizeof (Elf32_External_Rela);
+
+	      /* Fix up the remaining .rela.plt.unloaded relocations.
+		 They may have the wrong symbol index for _G_O_T_ or
+		 _P_L_T_ depending on the order in which symbols were
+		 output.  */
+	      while (loc < htab->srelplt2->contents + htab->srelplt2->size)
+		{
+		  /* The PLT entry's pointer to the .got.plt slot.  */
+		  bfd_elf32_swap_reloc_in (output_bfd, loc, &rel);
+		  rel.r_info = ELF32_R_INFO (htab->root.hgot->indx,
+					     R_SH_DIR32);
+		  bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
+		  loc += sizeof (Elf32_External_Rela);
+
+		  /* The .got.plt slot's pointer to .plt.  */
+		  bfd_elf32_swap_reloc_in (output_bfd, loc, &rel);
+		  rel.r_info = ELF32_R_INFO (htab->root.hplt->indx,
+					     R_SH_DIR32);
+		  bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
+		  loc += sizeof (Elf32_External_Rela);
+		}
+	    }
+
+	  /* UnixWare sets the entsize of .plt to 4, although that doesn't
+	     really seem like the right value.  */
+	  elf_section_data (splt->output_section)->this_hdr.sh_entsize = 4;
+	}
+    }
+
+  /* Fill in the first three entries in the global offset table.  */
+  if (sgotplt && sgotplt->size > 0 && !htab->fdpic_p)
+    {
+      if (sdyn == NULL)
+	bfd_put_32 (output_bfd, (bfd_vma) 0, sgotplt->contents);
+      else
+	bfd_put_32 (output_bfd,
+		    sdyn->output_section->vma + sdyn->output_offset,
+		    sgotplt->contents);
+      bfd_put_32 (output_bfd, (bfd_vma) 0, sgotplt->contents + 4);
+      bfd_put_32 (output_bfd, (bfd_vma) 0, sgotplt->contents + 8);
+    }
+
+  if (sgotplt && sgotplt->size > 0)
+    elf_section_data (sgotplt->output_section)->this_hdr.sh_entsize = 4;
+    
+  /* At the very end of the .rofixup section is a pointer to the GOT.  */
+  if (htab->fdpic_p && htab->srofixup != NULL)
+    {
+      struct elf_link_hash_entry *hgot = htab->root.hgot;
+      bfd_vma got_value = hgot->root.u.def.value
+	+ hgot->root.u.def.section->output_section->vma
+	+ hgot->root.u.def.section->output_offset;
+
+      sh_elf_add_rofixup (output_bfd, htab->srofixup, got_value);
+
+      /* Make sure we allocated and generated the same number of fixups.  */
+      BFD_ASSERT (htab->srofixup->reloc_count * 4 == htab->srofixup->size);
+    }
+
+  if (htab->srelfuncdesc)
+    BFD_ASSERT (htab->srelfuncdesc->reloc_count * sizeof (Elf32_External_Rela)
+		== htab->srelfuncdesc->size);
+
+  if (htab->srelgot)
+    BFD_ASSERT (htab->srelgot->reloc_count * sizeof (Elf32_External_Rela)
+		== htab->srelgot->size);
+
+  return TRUE;
+}
+
+static enum elf_reloc_type_class
+sh_elf_reloc_type_class (const Elf_Internal_Rela *rela)
+{
+  switch ((int) ELF32_R_TYPE (rela->r_info))
+    {
+    case R_SH_RELATIVE:
+      return reloc_class_relative;
+    case R_SH_JMP_SLOT:
+      return reloc_class_plt;
+    case R_SH_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+#if !defined SH_TARGET_ALREADY_DEFINED
+/* Support for Linux core dump NOTE sections.  */
+
+static bfd_boolean
+elf32_shlin_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  int offset;
+  unsigned int size;
+
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      case 168:		/* Linux/SH */
+	/* pr_cursig */
+	elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12);
+
+	/* pr_pid */
+	elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 24);
+
+	/* pr_reg */
+	offset = 72;
+	size = 92;
+
+	break;
+    }
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg",
+					  size, note->descpos + offset);
+}
+
+static bfd_boolean
+elf32_shlin_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      case 124:		/* Linux/SH elf_prpsinfo */
+	elf_tdata (abfd)->core_program
+	 = _bfd_elfcore_strndup (abfd, note->descdata + 28, 16);
+	elf_tdata (abfd)->core_command
+	 = _bfd_elfcore_strndup (abfd, note->descdata + 44, 80);
+    }
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+
+  {
+    char *command = elf_tdata (abfd)->core_command;
+    int n = strlen (command);
+
+    if (0 < n && command[n - 1] == ' ')
+      command[n - 1] = '\0';
+  }
+
+  return TRUE;
+}
+#endif /* not SH_TARGET_ALREADY_DEFINED */
+
+ 
+/* Return address for Ith PLT stub in section PLT, for relocation REL
+   or (bfd_vma) -1 if it should not be included.  */
+
+static bfd_vma
+sh_elf_plt_sym_val (bfd_vma i, const asection *plt,
+		    const arelent *rel ATTRIBUTE_UNUSED)
+{
+  const struct elf_sh_plt_info *plt_info;
+
+  plt_info = get_plt_info (plt->owner, (plt->owner->flags & DYNAMIC) != 0);
+  return plt->vma + get_plt_offset (plt_info, i);
+}
+
+/* Decide whether to attempt to turn absptr or lsda encodings in
+   shared libraries into pcrel within the given input section.  */
+
+static bfd_boolean
+sh_elf_use_relative_eh_frame (bfd *input_bfd ATTRIBUTE_UNUSED,
+			      struct bfd_link_info *info,
+			      asection *eh_frame_section ATTRIBUTE_UNUSED)
+{
+  struct elf_sh_link_hash_table *htab = sh_elf_hash_table (info);
+
+  /* We can't use PC-relative encodings in FDPIC binaries, in general.  */
+  if (htab->fdpic_p)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Adjust the contents of an eh_frame_hdr section before they're output.  */
+
+static bfd_byte
+sh_elf_encode_eh_address (bfd *abfd,
+			  struct bfd_link_info *info,
+			  asection *osec, bfd_vma offset,
+			  asection *loc_sec, bfd_vma loc_offset,
+			  bfd_vma *encoded)
+{
+  struct elf_sh_link_hash_table *htab = sh_elf_hash_table (info);
+  struct elf_link_hash_entry *h;
+
+  if (!htab->fdpic_p)
+    return _bfd_elf_encode_eh_address (abfd, info, osec, offset, loc_sec,
+				       loc_offset, encoded);
+
+  h = htab->root.hgot;
+  BFD_ASSERT (h && h->root.type == bfd_link_hash_defined);
+
+  if (! h || (sh_elf_osec_to_segment (abfd, osec)
+	      == sh_elf_osec_to_segment (abfd, loc_sec->output_section)))
+    return _bfd_elf_encode_eh_address (abfd, info, osec, offset,
+				       loc_sec, loc_offset, encoded);
+
+  BFD_ASSERT (sh_elf_osec_to_segment (abfd, osec)
+	      == (sh_elf_osec_to_segment
+		  (abfd, h->root.u.def.section->output_section)));
+
+  *encoded = osec->vma + offset
+    - (h->root.u.def.value
+       + h->root.u.def.section->output_section->vma
+       + h->root.u.def.section->output_offset);
+
+  return DW_EH_PE_datarel | DW_EH_PE_sdata4;
+}
+
+#if !defined SH_TARGET_ALREADY_DEFINED
+#define TARGET_BIG_SYM		bfd_elf32_sh_vec
+#define TARGET_BIG_NAME		"elf32-sh"
+#define TARGET_LITTLE_SYM	bfd_elf32_shl_vec
+#define TARGET_LITTLE_NAME	"elf32-shl"
+#endif
+
+#define ELF_ARCH		bfd_arch_sh
+#define ELF_TARGET_ID		SH_ELF_DATA
+#define ELF_MACHINE_CODE	EM_SH
+#ifdef __QNXTARGET__
+#define ELF_MAXPAGESIZE		0x1000
+#else
+#define ELF_MAXPAGESIZE		0x80
+#endif
+
+#define elf_symbol_leading_char '_'
+
+#define bfd_elf32_bfd_reloc_type_lookup	sh_elf_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup \
+					sh_elf_reloc_name_lookup
+#define elf_info_to_howto		sh_elf_info_to_howto
+#define bfd_elf32_bfd_relax_section	sh_elf_relax_section
+#define elf_backend_relocate_section	sh_elf_relocate_section
+#define bfd_elf32_bfd_get_relocated_section_contents \
+					sh_elf_get_relocated_section_contents
+#define bfd_elf32_mkobject		sh_elf_mkobject
+#define elf_backend_object_p		sh_elf_object_p
+#define bfd_elf32_bfd_set_private_bfd_flags \
+					sh_elf_set_private_flags
+#define bfd_elf32_bfd_copy_private_bfd_data \
+					sh_elf_copy_private_data
+#define bfd_elf32_bfd_merge_private_bfd_data \
+					sh_elf_merge_private_data
+
+#define elf_backend_gc_mark_hook	sh_elf_gc_mark_hook
+#define elf_backend_gc_sweep_hook	sh_elf_gc_sweep_hook
+#define elf_backend_check_relocs	sh_elf_check_relocs
+#define elf_backend_copy_indirect_symbol \
+					sh_elf_copy_indirect_symbol
+#define elf_backend_create_dynamic_sections \
+					sh_elf_create_dynamic_sections
+#define bfd_elf32_bfd_link_hash_table_create \
+					sh_elf_link_hash_table_create
+#define elf_backend_adjust_dynamic_symbol \
+					sh_elf_adjust_dynamic_symbol
+#define elf_backend_always_size_sections \
+					sh_elf_always_size_sections
+#define elf_backend_size_dynamic_sections \
+					sh_elf_size_dynamic_sections
+#define elf_backend_omit_section_dynsym	sh_elf_omit_section_dynsym
+#define elf_backend_finish_dynamic_symbol \
+					sh_elf_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections \
+					sh_elf_finish_dynamic_sections
+#define elf_backend_reloc_type_class	sh_elf_reloc_type_class
+#define elf_backend_plt_sym_val		sh_elf_plt_sym_val
+#define elf_backend_can_make_relative_eh_frame \
+					sh_elf_use_relative_eh_frame
+#define elf_backend_can_make_lsda_relative_eh_frame \
+					sh_elf_use_relative_eh_frame
+#define elf_backend_encode_eh_address \
+					sh_elf_encode_eh_address
+
+#define elf_backend_can_gc_sections	1
+#define elf_backend_can_refcount	1
+#define elf_backend_want_got_plt	1
+#define elf_backend_plt_readonly	1
+#define elf_backend_want_plt_sym	0
+#define elf_backend_got_header_size	12
+
+#if !defined INCLUDE_SHMEDIA && !defined SH_TARGET_ALREADY_DEFINED
+
+#include "elf32-target.h"
+
+/* NetBSD support.  */
+#undef	TARGET_BIG_SYM
+#define	TARGET_BIG_SYM			bfd_elf32_shnbsd_vec
+#undef	TARGET_BIG_NAME
+#define	TARGET_BIG_NAME			"elf32-sh-nbsd"
+#undef	TARGET_LITTLE_SYM
+#define	TARGET_LITTLE_SYM		bfd_elf32_shlnbsd_vec
+#undef	TARGET_LITTLE_NAME
+#define	TARGET_LITTLE_NAME		"elf32-shl-nbsd"
+#undef	ELF_MAXPAGESIZE
+#define	ELF_MAXPAGESIZE			0x10000
+#undef	ELF_COMMONPAGESIZE
+#undef	elf_symbol_leading_char
+#define	elf_symbol_leading_char		0
+#undef	elf32_bed
+#define	elf32_bed			elf32_sh_nbsd_bed
+
+#include "elf32-target.h"
+
+
+/* Linux support.  */
+#undef	TARGET_BIG_SYM
+#define	TARGET_BIG_SYM			bfd_elf32_shblin_vec
+#undef	TARGET_BIG_NAME
+#define	TARGET_BIG_NAME			"elf32-shbig-linux"
+#undef	TARGET_LITTLE_SYM
+#define	TARGET_LITTLE_SYM		bfd_elf32_shlin_vec
+#undef	TARGET_LITTLE_NAME
+#define	TARGET_LITTLE_NAME		"elf32-sh-linux"
+#undef	ELF_COMMONPAGESIZE
+#define	ELF_COMMONPAGESIZE		0x1000
+
+#undef	elf_backend_grok_prstatus
+#define	elf_backend_grok_prstatus	elf32_shlin_grok_prstatus
+#undef	elf_backend_grok_psinfo
+#define	elf_backend_grok_psinfo		elf32_shlin_grok_psinfo
+#undef	elf32_bed
+#define	elf32_bed			elf32_sh_lin_bed
+
+#include "elf32-target.h"
+
+
+/* FDPIC support.  */
+#undef	TARGET_BIG_SYM
+#define	TARGET_BIG_SYM			bfd_elf32_shbfd_vec
+#undef	TARGET_BIG_NAME
+#define	TARGET_BIG_NAME			"elf32-shbig-fdpic"
+#undef	TARGET_LITTLE_SYM
+#define	TARGET_LITTLE_SYM		bfd_elf32_shfd_vec
+#undef	TARGET_LITTLE_NAME
+#define	TARGET_LITTLE_NAME		"elf32-sh-fdpic"
+#undef elf_backend_modify_program_headers
+#define elf_backend_modify_program_headers \
+					sh_elf_modify_program_headers
+
+#undef	elf32_bed
+#define	elf32_bed			elf32_sh_fd_bed
+
+#include "elf32-target.h"
+
+#undef elf_backend_modify_program_headers
+
+/* VxWorks support.  */
+#undef	TARGET_BIG_SYM
+#define	TARGET_BIG_SYM			bfd_elf32_shvxworks_vec
+#undef	TARGET_BIG_NAME
+#define	TARGET_BIG_NAME			"elf32-sh-vxworks"
+#undef	TARGET_LITTLE_SYM
+#define	TARGET_LITTLE_SYM		bfd_elf32_shlvxworks_vec
+#undef	TARGET_LITTLE_NAME
+#define	TARGET_LITTLE_NAME		"elf32-shl-vxworks"
+#undef	elf32_bed
+#define	elf32_bed			elf32_sh_vxworks_bed
+
+#undef	elf_backend_want_plt_sym
+#define	elf_backend_want_plt_sym	1
+#undef	elf_symbol_leading_char
+#define	elf_symbol_leading_char		'_'
+#define	elf_backend_want_got_underscore 1
+#undef	elf_backend_grok_prstatus
+#undef	elf_backend_grok_psinfo
+#undef	elf_backend_add_symbol_hook
+#define	elf_backend_add_symbol_hook	elf_vxworks_add_symbol_hook
+#undef	elf_backend_link_output_symbol_hook
+#define	elf_backend_link_output_symbol_hook \
+					elf_vxworks_link_output_symbol_hook
+#undef	elf_backend_emit_relocs
+#define	elf_backend_emit_relocs		elf_vxworks_emit_relocs
+#undef	elf_backend_final_write_processing
+#define	elf_backend_final_write_processing \
+					elf_vxworks_final_write_processing
+#undef	ELF_MAXPAGESIZE
+#define	ELF_MAXPAGESIZE			0x1000
+#undef	ELF_COMMONPAGESIZE
+
+#include "elf32-target.h"
+
+#endif /* neither INCLUDE_SHMEDIA nor SH_TARGET_ALREADY_DEFINED */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-sh64-com.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-sh64-com.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-sh64-com.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-sh64-com.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,246 @@
+/* SuperH SH64-specific support for 32-bit ELF
+   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define SH64_ELF
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/sh.h"
+#include "elf32-sh64.h"
+#include "../opcodes/sh64-opc.h"
+
+static bfd_boolean sh64_address_in_cranges
+  (asection *cranges, bfd_vma, sh64_elf_crange *);
+
+/* Ordering functions of a crange, for the qsort and bsearch calls and for
+   different endianness.  */
+
+int
+_bfd_sh64_crange_qsort_cmpb (const void *p1, const void *p2)
+{
+  bfd_vma a1 = bfd_getb32 (p1);
+  bfd_vma a2 = bfd_getb32 (p2);
+
+  /* Preserve order if there's ambiguous contents.  */
+  if (a1 == a2)
+    return (char *) p1 - (char *) p2;
+
+  return a1 - a2;
+}
+
+int
+_bfd_sh64_crange_qsort_cmpl (const void *p1, const void *p2)
+{
+  bfd_vma a1 = (bfd_vma) bfd_getl32 (p1);
+  bfd_vma a2 = (bfd_vma) bfd_getl32 (p2);
+
+  /* Preserve order if there's ambiguous contents.  */
+  if (a1 == a2)
+    return (char *) p1 - (char *) p2;
+
+  return a1 - a2;
+}
+
+int
+_bfd_sh64_crange_bsearch_cmpb (const void *p1, const void *p2)
+{
+  bfd_vma a1 = *(bfd_vma *) p1;
+  bfd_vma a2 = (bfd_vma) bfd_getb32 (p2);
+  bfd_size_type size
+    = (bfd_size_type) bfd_getb32 (SH64_CRANGE_CR_SIZE_OFFSET + (char *) p2);
+
+  if (a1 >= a2 + size)
+    return 1;
+  if (a1 < a2)
+    return -1;
+  return 0;
+}
+
+int
+_bfd_sh64_crange_bsearch_cmpl (const void *p1, const void *p2)
+{
+  bfd_vma a1 = *(bfd_vma *) p1;
+  bfd_vma a2 = (bfd_vma) bfd_getl32 (p2);
+  bfd_size_type size
+    = (bfd_size_type) bfd_getl32 (SH64_CRANGE_CR_SIZE_OFFSET + (char *) p2);
+
+  if (a1 >= a2 + size)
+    return 1;
+  if (a1 < a2)
+    return -1;
+  return 0;
+}
+
+/* Check whether a specific address is specified within a .cranges
+   section.  Return FALSE if not found, and TRUE if found, and the region
+   filled into RANGEP if non-NULL.  */
+
+static bfd_boolean
+sh64_address_in_cranges (asection *cranges, bfd_vma addr,
+			 sh64_elf_crange *rangep)
+{
+  bfd_byte *cranges_contents;
+  bfd_byte *found_rangep;
+  bfd_size_type cranges_size = cranges->size;
+
+  /* If the size is not a multiple of the cranges entry size, then
+     something is badly wrong.  */
+  if ((cranges_size % SH64_CRANGE_SIZE) != 0)
+    return FALSE;
+
+  /* If this section has relocations, then we can't do anything sane.  */
+  if (bfd_get_section_flags (cranges->owner, cranges) & SEC_RELOC)
+    return FALSE;
+
+  /* Has some kind soul (or previous call) left processed, sorted contents
+     for us?  */
+  if ((bfd_get_section_flags (cranges->owner, cranges) & SEC_IN_MEMORY)
+      && elf_section_data (cranges)->this_hdr.sh_type == SHT_SH5_CR_SORTED)
+    cranges_contents = cranges->contents;
+  else
+    {
+      if (!bfd_malloc_and_get_section (cranges->owner, cranges,
+				       &cranges_contents))
+	goto error_return;
+
+      /* Is it sorted?  */
+      if (elf_section_data (cranges)->this_hdr.sh_type
+	  != SHT_SH5_CR_SORTED)
+	/* Nope.  Lets sort it.  */
+	qsort (cranges_contents, cranges_size / SH64_CRANGE_SIZE,
+	       SH64_CRANGE_SIZE,
+	       bfd_big_endian (cranges->owner)
+	       ? _bfd_sh64_crange_qsort_cmpb : _bfd_sh64_crange_qsort_cmpl);
+
+      /* Let's keep it around.  */
+      cranges->contents = cranges_contents;
+      bfd_set_section_flags (cranges->owner, cranges,
+			     bfd_get_section_flags (cranges->owner, cranges)
+			     | SEC_IN_MEMORY);
+
+      /* It's sorted now.  */
+      elf_section_data (cranges)->this_hdr.sh_type = SHT_SH5_CR_SORTED;
+    }
+
+  /* Try and find a matching range.  */
+  found_rangep
+    = bsearch (&addr, cranges_contents, cranges_size / SH64_CRANGE_SIZE,
+	       SH64_CRANGE_SIZE,
+	       bfd_big_endian (cranges->owner)
+	       ? _bfd_sh64_crange_bsearch_cmpb
+	       : _bfd_sh64_crange_bsearch_cmpl);
+
+  /* Fill in a few return values if we found a matching range.  */
+  if (found_rangep)
+    {
+      enum sh64_elf_cr_type cr_type
+	= bfd_get_16 (cranges->owner,
+		      SH64_CRANGE_CR_TYPE_OFFSET + found_rangep);
+      bfd_vma cr_addr
+	= bfd_get_32 (cranges->owner,
+		      SH64_CRANGE_CR_ADDR_OFFSET
+		      + (char *) found_rangep);
+      bfd_size_type cr_size
+	= bfd_get_32 (cranges->owner,
+		      SH64_CRANGE_CR_SIZE_OFFSET
+		      + (char *) found_rangep);
+
+      rangep->cr_addr = cr_addr;
+      rangep->cr_size = cr_size;
+      rangep->cr_type = cr_type;
+
+      return TRUE;
+    }
+
+  /* There is a .cranges section, but it does not have a descriptor
+     matching this address.  */
+  return FALSE;
+
+error_return:
+  if (cranges_contents != NULL)
+    free (cranges_contents);
+  return FALSE;
+}
+
+/* Determine what ADDR points to in SEC, and fill in a range descriptor in
+   *RANGEP if it's non-NULL.  */
+
+enum sh64_elf_cr_type
+sh64_get_contents_type (asection *sec, bfd_vma addr, sh64_elf_crange *rangep)
+{
+  asection *cranges;
+
+  /* Fill in the range with the boundaries of the section as a default.  */
+  if (bfd_get_flavour (sec->owner) == bfd_target_elf_flavour
+      && elf_elfheader (sec->owner)->e_type == ET_EXEC)
+    {
+      rangep->cr_addr = bfd_get_section_vma (sec->owner, sec);
+      rangep->cr_size = sec->size;
+      rangep->cr_type = CRT_NONE;
+    }
+  else
+    return FALSE;
+
+  /* If none of the pertinent bits are set, then it's a SHcompact (or at
+     least not SHmedia).  */
+  if ((elf_section_data (sec)->this_hdr.sh_flags
+       & (SHF_SH5_ISA32 | SHF_SH5_ISA32_MIXED)) == 0)
+    {
+      enum sh64_elf_cr_type cr_type
+	= ((bfd_get_section_flags (sec->owner, sec) & SEC_CODE) != 0
+	   ? CRT_SH5_ISA16 : CRT_DATA);
+      rangep->cr_type = cr_type;
+      return cr_type;
+    }
+
+  /* If only the SHF_SH5_ISA32 bit is set, then we have SHmedia.  */
+  if ((elf_section_data (sec)->this_hdr.sh_flags
+       & (SHF_SH5_ISA32 | SHF_SH5_ISA32_MIXED)) == SHF_SH5_ISA32)
+    {
+      rangep->cr_type = CRT_SH5_ISA32;
+      return CRT_SH5_ISA32;
+    }
+
+  /* Otherwise, we have to look up the .cranges section.  */
+  cranges = bfd_get_section_by_name (sec->owner, SH64_CRANGES_SECTION_NAME);
+
+  if (cranges == NULL)
+    /* A mixed section but there's no .cranges section.  This is probably
+       bad input; it does not comply to specs.  */
+    return CRT_NONE;
+
+  /* If this call fails, we will still have CRT_NONE in rangep->cr_type
+     and that will be suitable to return.  */
+  sh64_address_in_cranges (cranges, addr, rangep);
+
+  return rangep->cr_type;
+}
+
+/* This is a simpler exported interface for the benefit of gdb et al.  */
+
+bfd_boolean
+sh64_address_is_shmedia (asection *sec, bfd_vma addr)
+{
+  sh64_elf_crange dummy;
+  return sh64_get_contents_type (sec, addr, &dummy) == CRT_SH5_ISA32;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-sh64.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-sh64.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-sh64.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-sh64.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,813 @@
+/* SuperH SH64-specific support for 32-bit ELF
+   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define SH64_ELF
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "elf-bfd.h"
+#include "../opcodes/sh64-opc.h"
+#include "elf32-sh64.h"
+
+/* Add a suffix for datalabel indirection symbols.  It must not match any
+   other symbols; user symbols with or without version or other
+   decoration.  It must only be used internally and not emitted by any
+   means.  */
+#define DATALABEL_SUFFIX " DL"
+
+/* Used to hold data for function called through bfd_map_over_sections.  */
+struct sh64_find_section_vma_data
+ {
+   asection *section;
+   bfd_vma addr;
+ };
+
+static bfd_boolean sh64_elf_new_section_hook
+  (bfd *, asection *);
+static bfd_boolean sh64_elf_copy_private_data
+  (bfd *, bfd *);
+static bfd_boolean sh64_elf_merge_private_data
+  (bfd *, bfd *);
+static bfd_boolean sh64_elf_fake_sections
+  (bfd *, Elf_Internal_Shdr *, asection *);
+static bfd_boolean sh64_elf_set_private_flags
+  (bfd *, flagword);
+static bfd_boolean sh64_elf_set_mach_from_flags
+  (bfd *);
+static bfd_boolean shmedia_prepare_reloc
+  (struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+   const Elf_Internal_Rela *, bfd_vma *);
+static int sh64_elf_get_symbol_type
+  (Elf_Internal_Sym *, int);
+static bfd_boolean sh64_elf_add_symbol_hook
+  (bfd *, struct bfd_link_info *, Elf_Internal_Sym *, const char **,
+   flagword *, asection **, bfd_vma *);
+static int sh64_elf_link_output_symbol_hook
+  (struct bfd_link_info *, const char *, Elf_Internal_Sym *, asection *,
+   struct elf_link_hash_entry *);
+static bfd_boolean sh64_backend_section_from_shdr
+  (bfd *, Elf_Internal_Shdr *, const char *, int);
+static void sh64_elf_final_write_processing
+  (bfd *, bfd_boolean);
+static bfd_boolean sh64_bfd_elf_copy_private_section_data
+  (bfd *, asection *, bfd *, asection *);
+static void sh64_find_section_for_address
+  (bfd *, asection *, void *);
+
+/* Let elf32-sh.c handle the "bfd_" definitions, so we only have to
+   intrude with an #ifndef around the function definition.  */
+#define sh_elf_copy_private_data		sh64_elf_copy_private_data
+#define sh_elf_merge_private_data		sh64_elf_merge_private_data
+#define sh_elf_set_private_flags		sh64_elf_set_private_flags
+/* Typo in elf32-sh.c (and unlinear name).  */
+#define bfd_elf32_bfd_set_private_flags		sh64_elf_set_private_flags
+#define sh_elf_set_mach_from_flags		sh64_elf_set_mach_from_flags
+
+#define elf_backend_sign_extend_vma		1
+#define elf_backend_fake_sections		sh64_elf_fake_sections
+#define elf_backend_get_symbol_type		sh64_elf_get_symbol_type
+#define elf_backend_add_symbol_hook		sh64_elf_add_symbol_hook
+#define elf_backend_link_output_symbol_hook \
+	sh64_elf_link_output_symbol_hook
+#define elf_backend_merge_symbol_attribute	sh64_elf_merge_symbol_attribute
+#define elf_backend_final_write_processing 	sh64_elf_final_write_processing
+#define elf_backend_section_from_shdr		sh64_backend_section_from_shdr
+#define elf_backend_special_sections		sh64_elf_special_sections
+#define elf_backend_section_flags		sh64_elf_section_flags
+
+#define bfd_elf32_new_section_hook		sh64_elf_new_section_hook
+
+/* For objcopy, we need to set up sh64_elf_section_data (asection *) from
+   incoming section flags.  This is otherwise done in sh64elf.em when
+   linking or tc-sh64.c when assembling.  */
+#define bfd_elf32_bfd_copy_private_section_data \
+	sh64_bfd_elf_copy_private_section_data
+
+/* This COFF-only function (only compiled with COFF support, making
+   ELF-only chains problematic) returns TRUE early for SH4, so let's just
+   define it TRUE here.  */
+#define _bfd_sh_align_load_span(a,b,c,d,e,f,g,h,i,j) \
+  ((void) f, (void) h, (void) i, TRUE)
+
+#define GOT_BIAS (-((long)-32768))
+#define INCLUDE_SHMEDIA
+#define SH_TARGET_ALREADY_DEFINED
+#include "elf32-sh.c"
+
+/* Tack some extra info on struct bfd_elf_section_data.  */
+
+static bfd_boolean
+sh64_elf_new_section_hook (bfd *abfd, asection *sec)
+{
+  if (!sec->used_by_bfd)
+    {
+      struct _sh64_elf_section_data *sdata;
+      bfd_size_type amt = sizeof (*sdata);
+
+      sdata = bfd_zalloc (abfd, amt);
+      if (sdata == NULL)
+	return FALSE;
+      sec->used_by_bfd = sdata;
+    }
+
+  return _bfd_elf_new_section_hook (abfd, sec);
+}
+
+/* Set the SHF_SH5_ISA32 flag for ISA SHmedia code sections, and pass
+   through SHT_SH5_CR_SORTED on a sorted .cranges section.  */
+
+bfd_boolean
+sh64_elf_fake_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+			Elf_Internal_Shdr *elf_section_hdr,
+			asection *asect)
+{
+  if (sh64_elf_section_data (asect)->sh64_info != NULL)
+    elf_section_hdr->sh_flags
+      |= sh64_elf_section_data (asect)->sh64_info->contents_flags;
+
+  /* If this section has the SEC_SORT_ENTRIES flag set, it is a sorted
+     .cranges section passing through objcopy.  */
+  if ((bfd_get_section_flags (output_bfd, asect) & SEC_SORT_ENTRIES) != 0
+      && strcmp (bfd_get_section_name (output_bfd, asect),
+		 SH64_CRANGES_SECTION_NAME) == 0)
+    elf_section_hdr->sh_type = SHT_SH5_CR_SORTED;
+
+  return TRUE;
+}
+
+static bfd_boolean
+sh64_elf_set_mach_from_flags (bfd *abfd)
+{
+  flagword flags = elf_elfheader (abfd)->e_flags;
+
+  switch (flags & EF_SH_MACH_MASK)
+    {
+    case EF_SH5:
+      /* These are fit to execute on SH5.  Just one but keep the switch
+	 construct to make additions easy.  */
+      bfd_default_set_arch_mach (abfd, bfd_arch_sh, bfd_mach_sh5);
+      break;
+
+    default:
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+sh64_elf_section_flags (flagword *flags,
+			const Elf_Internal_Shdr *hdr)
+{
+  if (hdr->bfd_section == NULL)
+    return FALSE;
+
+  if (strcmp (hdr->bfd_section->name, SH64_CRANGES_SECTION_NAME) == 0)
+    *flags |= SEC_DEBUGGING;
+
+  return TRUE;
+}
+
+static bfd_boolean
+sh64_elf_copy_private_data (bfd * ibfd, bfd * obfd)
+{
+  if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  BFD_ASSERT (!elf_flags_init (obfd)
+	      || (elf_elfheader (obfd)->e_flags
+		  == elf_elfheader (ibfd)->e_flags));
+
+  elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
+  return TRUE;
+}
+
+static bfd_boolean
+sh64_elf_merge_private_data (bfd *ibfd, bfd *obfd)
+{
+  flagword old_flags, new_flags;
+
+  if (! _bfd_generic_verify_endian_match (ibfd, obfd))
+    return FALSE;
+
+  if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  if (bfd_get_arch_size (ibfd) != bfd_get_arch_size (obfd))
+    {
+      const char *msg;
+
+      if (bfd_get_arch_size (ibfd) == 32
+	  && bfd_get_arch_size (obfd) == 64)
+	msg = _("%s: compiled as 32-bit object and %s is 64-bit");
+      else if (bfd_get_arch_size (ibfd) == 64
+	       && bfd_get_arch_size (obfd) == 32)
+	msg = _("%s: compiled as 64-bit object and %s is 32-bit");
+      else
+	msg = _("%s: object size does not match that of target %s");
+
+      (*_bfd_error_handler) (msg, bfd_get_filename (ibfd),
+			     bfd_get_filename (obfd));
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+
+  old_flags = elf_elfheader (obfd)->e_flags;
+  new_flags = elf_elfheader (ibfd)->e_flags;
+  if (! elf_flags_init (obfd))
+    {
+      /* This happens when ld starts out with a 'blank' output file.  */
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = old_flags = new_flags;
+    }
+  /* We don't allow linking in non-SH64 code.  */
+  else if ((new_flags & EF_SH_MACH_MASK) != EF_SH5)
+    {
+      (*_bfd_error_handler)
+	("%s: uses non-SH64 instructions while previous modules use SH64 instructions",
+	 bfd_get_filename (ibfd));
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  /* I can't think of anything sane other than old_flags being EF_SH5 and
+     that we need to preserve that.  */
+  elf_elfheader (obfd)->e_flags = old_flags;
+  return sh64_elf_set_mach_from_flags (obfd);
+}
+
+/* Handle a SH64-specific section when reading an object file.  This
+   is called when bfd_section_from_shdr finds a section with an unknown
+   type.
+
+   We only recognize SHT_SH5_CR_SORTED, on the .cranges section.  */
+
+bfd_boolean
+sh64_backend_section_from_shdr (bfd *abfd, Elf_Internal_Shdr *hdr,
+				const char *name, int shindex)
+{
+  flagword flags = 0;
+
+  /* We do like MIPS with a bit switch for recognized types, and returning
+     FALSE for a recognized section type with an unexpected name.  Right
+     now we only have one recognized type, but that might change.  */
+  switch (hdr->sh_type)
+    {
+    case SHT_SH5_CR_SORTED:
+      if (strcmp (name, SH64_CRANGES_SECTION_NAME) != 0)
+	return FALSE;
+
+      /* We set the SEC_SORT_ENTRIES flag so it can be passed on to
+	 sh64_elf_fake_sections, keeping SHT_SH5_CR_SORTED if this object
+	 passes through objcopy.  Perhaps it is brittle; the flag can
+	 suddenly be used by other BFD parts, but it seems not really used
+	 anywhere at the moment.  */
+      flags = SEC_DEBUGGING | SEC_SORT_ENTRIES;
+      break;
+
+    default:
+      return FALSE;
+    }
+
+  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex))
+    return FALSE;
+
+  if (flags
+      && ! bfd_set_section_flags (abfd, hdr->bfd_section,
+				  bfd_get_section_flags (abfd,
+							 hdr->bfd_section)
+				  | flags))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* In contrast to sh64_backend_section_from_shdr, this is called for all
+   sections, but only when copying sections, not when linking or
+   assembling.  We need to set up the sh64_elf_section_data (asection *)
+   structure for the SH64 ELF section flags to be copied correctly.  */
+
+bfd_boolean
+sh64_bfd_elf_copy_private_section_data (bfd *ibfd, asection *isec,
+					bfd *obfd, asection *osec)
+{
+  struct sh64_section_data *sh64_sec_data;
+
+  if (ibfd->xvec->flavour != bfd_target_elf_flavour
+      || obfd->xvec->flavour != bfd_target_elf_flavour)
+    return TRUE;
+
+  if (! _bfd_elf_copy_private_section_data (ibfd, isec, obfd, osec))
+    return FALSE;
+
+  sh64_sec_data = sh64_elf_section_data (isec)->sh64_info;
+  if (sh64_sec_data == NULL)
+    {
+      sh64_sec_data = bfd_zmalloc (sizeof (struct sh64_section_data));
+
+      if (sh64_sec_data == NULL)
+	return FALSE;
+
+      sh64_sec_data->contents_flags
+	= (elf_section_data (isec)->this_hdr.sh_flags
+	   & (SHF_SH5_ISA32 | SHF_SH5_ISA32_MIXED));
+
+      sh64_elf_section_data (osec)->sh64_info = sh64_sec_data;
+    }
+
+  return TRUE;
+}
+
+/* Function to keep SH64 specific file flags.  */
+
+static bfd_boolean
+sh64_elf_set_private_flags (bfd *abfd, flagword flags)
+{
+  BFD_ASSERT (! elf_flags_init (abfd)
+	      || elf_elfheader (abfd)->e_flags == flags);
+
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = TRUE;
+  return sh64_elf_set_mach_from_flags (abfd);
+}
+
+/* Called when writing out an object file to decide the type of a symbol.  */
+
+static int
+sh64_elf_get_symbol_type (Elf_Internal_Sym *elf_sym, int type)
+{
+  if (ELF_ST_TYPE (elf_sym->st_info) == STT_DATALABEL)
+    return STT_DATALABEL;
+
+  return type;
+}
+
+/* Hook called by the linker routine which adds symbols from an object
+   file.  We must make indirect symbols for undefined symbols marked with
+   STT_DATALABEL, so relocations passing them will pick up that attribute
+   and neutralize STO_SH5_ISA32 found on the symbol definition.
+
+   There is a problem, though: We want to fill in the hash-table entry for
+   this symbol and signal to the caller that no further processing is
+   needed.  But we don't have the index for this hash-table entry.  We
+   rely here on that the current entry is the first hash-entry with NULL,
+   which seems brittle.  Also, iterating over the hash-table to find that
+   entry is a linear operation on the number of symbols in this input
+   file, and this function should take constant time, so that's not good
+   too.  Only comfort is that DataLabel references should only be found in
+   hand-written assembly code and thus be rare.  FIXME: Talk maintainers
+   into adding an option to elf_add_symbol_hook (preferably) for the index
+   or the hash entry, alternatively adding the index to Elf_Internal_Sym
+   (not so good).  */
+
+static bfd_boolean
+sh64_elf_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
+			  Elf_Internal_Sym *sym, const char **namep,
+			  flagword *flagsp ATTRIBUTE_UNUSED,
+			  asection **secp, bfd_vma *valp)
+{
+  /* We want to do this for relocatable as well as final linking.  */
+  if (ELF_ST_TYPE (sym->st_info) == STT_DATALABEL
+      && is_elf_hash_table (info->hash))
+    {
+      struct elf_link_hash_entry *h;
+
+      /* For relocatable links, we register the DataLabel sym in its own
+	 right, and tweak the name when it's output.  Otherwise, we make
+	 an indirect symbol of it.  */
+      flagword flags
+	= info->relocatable || info->emitrelocations
+	? BSF_GLOBAL : BSF_GLOBAL | BSF_INDIRECT;
+
+      char *dl_name
+	= bfd_malloc (strlen (*namep) + sizeof (DATALABEL_SUFFIX));
+      struct elf_link_hash_entry ** sym_hash = elf_sym_hashes (abfd);
+
+      BFD_ASSERT (sym_hash != NULL);
+
+      /* Allocation may fail.  */
+      if (dl_name == NULL)
+	return FALSE;
+
+      strcpy (dl_name, *namep);
+      strcat (dl_name, DATALABEL_SUFFIX);
+
+      h = (struct elf_link_hash_entry *)
+	bfd_link_hash_lookup (info->hash, dl_name, FALSE, FALSE, FALSE);
+
+      if (h == NULL)
+	{
+	  /* No previous datalabel symbol.  Make one.  */
+	  struct bfd_link_hash_entry *bh = NULL;
+	  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+
+	  if (! _bfd_generic_link_add_one_symbol (info, abfd, dl_name,
+						  flags, *secp, *valp,
+						  *namep, FALSE,
+						  bed->collect, &bh))
+	    {
+	      free (dl_name);
+	      return FALSE;
+	    }
+
+	  h = (struct elf_link_hash_entry *) bh;
+	  h->non_elf = 0;
+	  h->type = STT_DATALABEL;
+	}
+      else
+	/* If a new symbol was created, it holds the allocated name.
+	   Otherwise, we don't need it anymore and should deallocate it.  */
+	free (dl_name);
+
+      if (h->type != STT_DATALABEL
+	  || ((info->relocatable || info->emitrelocations)
+	      && h->root.type != bfd_link_hash_undefined)
+	  || (! info->relocatable && !info->emitrelocations
+	      && h->root.type != bfd_link_hash_indirect))
+	{
+	  /* Make sure we don't get confused on invalid input.  */
+	  (*_bfd_error_handler)
+	    (_("%s: encountered datalabel symbol in input"),
+	     bfd_get_filename (abfd));
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      /* Now find the hash-table slot for this entry and fill it in.  */
+      while (*sym_hash != NULL)
+	sym_hash++;
+      *sym_hash = h;
+
+      /* Signal to caller to skip this symbol - we've handled it.  */
+      *namep = NULL;
+    }
+
+  return TRUE;
+}
+
+/* This hook function is called before the linker writes out a global
+   symbol.  For relocatable links, DataLabel symbols will be present in
+   linker output.  We cut off the special suffix on those symbols, so the
+   right name appears in the output.
+
+   When linking and emitting relocations, there can appear global symbols
+   that are not referenced by relocs, but rather only implicitly through
+   DataLabel references, a relation that is not visible to the linker.
+   Since no stripping of global symbols in done when doing such linking,
+   we don't need to look up and make sure to emit the main symbol for each
+   DataLabel symbol.  */
+
+static int
+sh64_elf_link_output_symbol_hook (struct bfd_link_info *info,
+				  const char *cname,
+				  Elf_Internal_Sym *sym,
+				  asection *input_sec ATTRIBUTE_UNUSED,
+				  struct elf_link_hash_entry *h ATTRIBUTE_UNUSED)
+{
+  char *name = (char *) cname;
+
+  if (info->relocatable || info->emitrelocations)
+    {
+      if (ELF_ST_TYPE (sym->st_info) == STT_DATALABEL)
+	name[strlen (name) - strlen (DATALABEL_SUFFIX)] = 0;
+    }
+
+  return 1;
+}
+
+/* Check a SH64-specific reloc and put the value to relocate to into
+   RELOCATION, ready to pass to _bfd_final_link_relocate.  Return FALSE if
+   bad value, TRUE if ok.  */
+
+static bfd_boolean
+shmedia_prepare_reloc (struct bfd_link_info *info, bfd *abfd,
+		       asection *input_section, bfd_byte *contents,
+		       const Elf_Internal_Rela *rel, bfd_vma *relocation)
+{
+  bfd_vma disp, dropped;
+
+  switch (ELF32_R_TYPE (rel->r_info))
+    {
+    case R_SH_PT_16:
+      /* Check the lowest bit of the destination field.  If it is 1, we
+	 check the ISA type of the destination (i.e. the low bit of the
+	 "relocation" value, and emit an error if the instruction does not
+	 match).  If it is 0, we change a PTA to PTB.  There should never
+	 be a PTB that should change to a PTA; that indicates a toolchain
+	 error; a mismatch with GAS.  */
+      {
+	char *msg = NULL;
+	bfd_vma insn = bfd_get_32 (abfd, contents + rel->r_offset);
+
+	if (insn & (1 << 10))
+	  {
+	    /* Check matching insn and ISA (address of target).  */
+	    if ((insn & SHMEDIA_PTB_BIT) != 0
+		&& ((*relocation + rel->r_addend) & 1) != 0)
+	      msg = _("PTB mismatch: a SHmedia address (bit 0 == 1)");
+	    else if ((insn & SHMEDIA_PTB_BIT) == 0
+		     && ((*relocation + rel->r_addend) & 1) == 0)
+	      msg = _("PTA mismatch: a SHcompact address (bit 0 == 0)");
+
+	    if (msg != NULL
+		&& ! ((*info->callbacks->reloc_dangerous)
+		      (info, msg, abfd, input_section,
+		       rel->r_offset)))
+	      return FALSE;
+	  }
+	else
+	  {
+	    /* We shouldn't get here with a PTB insn and a R_SH_PT_16.  It
+	       means GAS output does not match expectations; a PTA or PTB
+	       expressed as such (or a PT found at assembly to be PTB)
+	       would match the test above, and PT expansion with an
+	       unknown destination (or when relaxing) will get us here.  */
+	    if ((insn & SHMEDIA_PTB_BIT) != 0)
+	      {
+		(*_bfd_error_handler)
+		  (_("%s: GAS error: unexpected PTB insn with R_SH_PT_16"),
+		   bfd_get_filename (input_section->owner));
+		return FALSE;
+	      }
+
+	    /* Change the PTA to a PTB, if destination indicates so.  */
+	    if (((*relocation + rel->r_addend) & 1) == 0)
+	      bfd_put_32 (abfd, insn | SHMEDIA_PTB_BIT,
+			  contents + rel->r_offset);
+	  }
+      }
+
+    case R_SH_SHMEDIA_CODE:
+    case R_SH_DIR5U:
+    case R_SH_DIR6S:
+    case R_SH_DIR6U:
+    case R_SH_DIR10S:
+    case R_SH_DIR10SW:
+    case R_SH_DIR10SL:
+    case R_SH_DIR10SQ:
+    case R_SH_IMMS16:
+    case R_SH_IMMU16:
+    case R_SH_IMM_LOW16:
+    case R_SH_IMM_LOW16_PCREL:
+    case R_SH_IMM_MEDLOW16:
+    case R_SH_IMM_MEDLOW16_PCREL:
+    case R_SH_IMM_MEDHI16:
+    case R_SH_IMM_MEDHI16_PCREL:
+    case R_SH_IMM_HI16:
+    case R_SH_IMM_HI16_PCREL:
+    case R_SH_64:
+    case R_SH_64_PCREL:
+      break;
+
+    default:
+      return FALSE;
+    }
+
+  disp = (*relocation & 0xf);
+  dropped = 0;
+  switch (ELF32_R_TYPE (rel->r_info))
+    {
+    case R_SH_DIR10SW: dropped = disp & 1; break;
+    case R_SH_DIR10SL: dropped = disp & 3; break;
+    case R_SH_DIR10SQ: dropped = disp & 7; break;
+    }
+  if (dropped != 0)
+    {
+      (*_bfd_error_handler)
+	(_("%B: error: unaligned relocation type %d at %08x reloc %p\n"),
+	 input_section->owner, ELF32_R_TYPE (rel->r_info),
+	 (unsigned) rel->r_offset, relocation);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Helper function to locate the section holding a certain address.  This
+   is called via bfd_map_over_sections.  */
+
+static void
+sh64_find_section_for_address (bfd *abfd ATTRIBUTE_UNUSED,
+			       asection *section, void *data)
+{
+  bfd_vma vma;
+  bfd_size_type size;
+
+  struct sh64_find_section_vma_data *fsec_datap
+    = (struct sh64_find_section_vma_data *) data;
+
+  /* Return if already found.  */
+  if (fsec_datap->section)
+    return;
+
+  /* If this section isn't part of the addressable contents, skip it.  */
+  if ((bfd_get_section_flags (abfd, section) & SEC_ALLOC) == 0)
+    return;
+
+  vma = bfd_get_section_vma (abfd, section);
+  if (fsec_datap->addr < vma)
+    return;
+
+  size = section->size;
+  if (fsec_datap->addr >= vma + size)
+    return;
+
+  fsec_datap->section = section;
+}
+
+/* Make sure to write out the generated entries in the .cranges section
+   when doing partial linking, and set bit 0 on the entry address if it
+   points to SHmedia code and write sorted .cranges entries when writing
+   executables (final linking and objcopy).  */
+
+static void
+sh64_elf_final_write_processing (bfd *abfd,
+				 bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  bfd_vma ld_generated_cranges_size;
+  asection *cranges
+    = bfd_get_section_by_name (abfd, SH64_CRANGES_SECTION_NAME);
+
+  /* If no new .cranges were added, the generic ELF linker parts will
+     write it all out.  If not, we need to write them out when doing
+     partial linking.  For a final link, we will sort them and write them
+     all out further below.  */
+  if (linker
+      && cranges != NULL
+      && elf_elfheader (abfd)->e_type != ET_EXEC
+      && (ld_generated_cranges_size
+	  = sh64_elf_section_data (cranges)->sh64_info->cranges_growth) != 0)
+    {
+      bfd_vma incoming_cranges_size
+	= cranges->size - ld_generated_cranges_size;
+
+      if (! bfd_set_section_contents (abfd, cranges,
+				      cranges->contents
+				      + incoming_cranges_size,
+				      cranges->output_offset
+				      + incoming_cranges_size,
+				      ld_generated_cranges_size))
+	{
+	  bfd_set_error (bfd_error_file_truncated);
+	  (*_bfd_error_handler)
+	    (_("%s: could not write out added .cranges entries"),
+	     bfd_get_filename (abfd));
+	}
+    }
+
+  /* Only set entry address bit 0 and sort .cranges when linking to an
+     executable; never with objcopy or strip.  */
+  if (linker && elf_elfheader (abfd)->e_type == ET_EXEC)
+    {
+      struct sh64_find_section_vma_data fsec_data;
+      sh64_elf_crange dummy;
+
+      /* For a final link, set the low bit of the entry address to
+	 reflect whether or not it is a SHmedia address.
+	 FIXME: Perhaps we shouldn't do this if the entry address was
+	 supplied numerically, but we currently lack the infrastructure to
+	 recognize that: The entry symbol, and info whether it is numeric
+	 or a symbol name is kept private in the linker.  */
+      fsec_data.addr = elf_elfheader (abfd)->e_entry;
+      fsec_data.section = NULL;
+
+      bfd_map_over_sections (abfd, sh64_find_section_for_address,
+			     &fsec_data);
+      if (fsec_data.section
+	  && (sh64_get_contents_type (fsec_data.section,
+				      elf_elfheader (abfd)->e_entry,
+				      &dummy) == CRT_SH5_ISA32))
+	elf_elfheader (abfd)->e_entry |= 1;
+
+      /* If we have a .cranges section, sort the entries.  */
+      if (cranges != NULL)
+	{
+	  bfd_size_type cranges_size = cranges->size;
+
+	  /* We know we always have these in memory at this time.  */
+	  BFD_ASSERT (cranges->contents != NULL);
+
+	  /* The .cranges may already have been sorted in the process of
+	     finding out the ISA-type of the entry address.  If not, we do
+	     it here.  */
+	  if (elf_section_data (cranges)->this_hdr.sh_type
+	      != SHT_SH5_CR_SORTED)
+	    {
+	      qsort (cranges->contents, cranges_size / SH64_CRANGE_SIZE,
+		     SH64_CRANGE_SIZE,
+		     bfd_big_endian (cranges->owner)
+		     ? _bfd_sh64_crange_qsort_cmpb
+		     : _bfd_sh64_crange_qsort_cmpl);
+	      elf_section_data (cranges)->this_hdr.sh_type
+		= SHT_SH5_CR_SORTED;
+	    }
+
+	  /* We need to write it out in whole as sorted.  */
+	  if (! bfd_set_section_contents (abfd, cranges,
+					  cranges->contents,
+					  cranges->output_offset,
+					  cranges_size))
+	    {
+	      bfd_set_error (bfd_error_file_truncated);
+	      (*_bfd_error_handler)
+		(_("%s: could not write out sorted .cranges entries"),
+		 bfd_get_filename (abfd));
+	    }
+	}
+    }
+}
+
+/* Merge non visibility st_other attribute when the symbol comes from
+   a dynamic object.  */
+static void
+sh64_elf_merge_symbol_attribute (struct elf_link_hash_entry *h,
+				 const Elf_Internal_Sym *isym,
+				 bfd_boolean definition,
+				 bfd_boolean dynamic ATTRIBUTE_UNUSED)
+{
+  if ((isym->st_other & ~ELF_ST_VISIBILITY (-1)) != 0)
+    {
+      unsigned char other;
+
+      /* Take the balance of OTHER from the definition.  */
+      other = (definition ? isym->st_other : h->other);
+      other &= ~ ELF_ST_VISIBILITY (-1);
+      h->other = other | ELF_ST_VISIBILITY (h->other);
+    }
+
+  return;
+}
+
+static const struct bfd_elf_special_section sh64_elf_special_sections[] =
+{
+  { STRING_COMMA_LEN (".cranges"), 0, SHT_PROGBITS, 0 },
+  { NULL,                       0, 0, 0,            0 }
+};
+
+#undef	TARGET_BIG_SYM
+#define	TARGET_BIG_SYM		bfd_elf32_sh64_vec
+#undef	TARGET_BIG_NAME
+#define	TARGET_BIG_NAME		"elf32-sh64"
+#undef	TARGET_LITTLE_SYM
+#define	TARGET_LITTLE_SYM	bfd_elf32_sh64l_vec
+#undef	TARGET_LITTLE_NAME
+#define	TARGET_LITTLE_NAME	"elf32-sh64l"
+
+#include "elf32-target.h"
+
+/* NetBSD support.  */
+#undef	TARGET_BIG_SYM
+#define	TARGET_BIG_SYM		bfd_elf32_sh64nbsd_vec
+#undef	TARGET_BIG_NAME
+#define	TARGET_BIG_NAME		"elf32-sh64-nbsd"
+#undef	TARGET_LITTLE_SYM
+#define	TARGET_LITTLE_SYM	bfd_elf32_sh64lnbsd_vec
+#undef	TARGET_LITTLE_NAME
+#define	TARGET_LITTLE_NAME	"elf32-sh64l-nbsd"
+#undef	ELF_MAXPAGESIZE
+#define	ELF_MAXPAGESIZE		0x10000
+#undef	ELF_COMMONPAGESIZE
+#undef	elf_symbol_leading_char
+#define	elf_symbol_leading_char	0
+#undef	elf32_bed
+#define	elf32_bed		elf32_sh64_nbsd_bed
+
+#include "elf32-target.h"
+
+/* Linux support.  */
+#undef	TARGET_BIG_SYM
+#define	TARGET_BIG_SYM		bfd_elf32_sh64blin_vec
+#undef	TARGET_BIG_NAME
+#define	TARGET_BIG_NAME		"elf32-sh64big-linux"
+#undef	TARGET_LITTLE_SYM
+#define	TARGET_LITTLE_SYM	bfd_elf32_sh64lin_vec
+#undef	TARGET_LITTLE_NAME
+#define	TARGET_LITTLE_NAME	"elf32-sh64-linux"
+#undef	elf32_bed
+#define	elf32_bed		elf32_sh64_lin_bed
+#undef	ELF_COMMONPAGESIZE
+#define	ELF_COMMONPAGESIZE	0x1000
+
+#include "elf32-target.h"
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-sh64.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-sh64.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-sh64.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-sh64.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,88 @@
+/* SH ELF support for BFD.
+   Copyright 2003, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef ELF32_SH64_H
+#define ELF32_SH64_H
+
+#define SH64_CRANGES_SECTION_NAME ".cranges"
+enum sh64_elf_cr_type {
+  CRT_NONE = 0,
+  CRT_DATA = 1,
+  CRT_SH5_ISA16 = 2,
+  CRT_SH5_ISA32 = 3
+};
+
+/* The official definition is this:
+
+    typedef struct {
+      Elf32_Addr cr_addr;
+      Elf32_Word cr_size;
+      Elf32_Half cr_type;
+    } Elf32_CRange;
+
+   but we have no use for that exact type.  Instead we use this struct for
+   the internal representation.  */
+typedef struct {
+  bfd_vma cr_addr;
+  bfd_size_type cr_size;
+  enum sh64_elf_cr_type cr_type;
+} sh64_elf_crange;
+
+#define SH64_CRANGE_SIZE (4 + 4 + 2)
+#define SH64_CRANGE_CR_ADDR_OFFSET 0
+#define SH64_CRANGE_CR_SIZE_OFFSET 4
+#define SH64_CRANGE_CR_TYPE_OFFSET (4 + 4)
+
+/* Get the contents type of an arbitrary address, or return CRT_NONE.  */
+extern enum sh64_elf_cr_type sh64_get_contents_type
+  (asection *, bfd_vma, sh64_elf_crange *);
+
+/* Simpler interface.
+   FIXME: This seems redundant now that we export the interface above.  */
+extern bfd_boolean sh64_address_is_shmedia
+  (asection *, bfd_vma);
+
+extern int _bfd_sh64_crange_qsort_cmpb
+  (const void *, const void *);
+extern int _bfd_sh64_crange_qsort_cmpl
+  (const void *, const void *);
+extern int _bfd_sh64_crange_bsearch_cmpb
+  (const void *, const void *);
+extern int _bfd_sh64_crange_bsearch_cmpl
+  (const void *, const void *);
+
+struct sh64_section_data
+{
+  flagword contents_flags;
+
+  /* Only used in the cranges section, but we don't have an official
+     backend-specific bfd field.  */
+  bfd_size_type cranges_growth;
+};
+
+struct _sh64_elf_section_data
+{
+  struct bfd_elf_section_data elf;
+  struct sh64_section_data *sh64_info;
+};
+
+#define sh64_elf_section_data(sec) \
+  ((struct _sh64_elf_section_data *) elf_section_data (sec))
+
+#endif /* ELF32_SH64_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-sparc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-sparc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-sparc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-sparc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,332 @@
+/* SPARC-specific support for 32-bit ELF
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2006, 2007, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/sparc.h"
+#include "opcode/sparc.h"
+#include "elfxx-sparc.h"
+#include "elf-vxworks.h"
+
+/* Support for core dump NOTE sections.  */
+
+static bfd_boolean
+elf32_sparc_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  switch (note->descsz)
+    {
+    default:
+      return FALSE;
+
+    case 260:			/* Solaris prpsinfo_t.  */
+      elf_tdata (abfd)->core_program
+	= _bfd_elfcore_strndup (abfd, note->descdata + 84, 16);
+      elf_tdata (abfd)->core_command
+	= _bfd_elfcore_strndup (abfd, note->descdata + 100, 80);
+      break;
+
+    case 336:			/* Solaris psinfo_t.  */
+      elf_tdata (abfd)->core_program
+	= _bfd_elfcore_strndup (abfd, note->descdata + 88, 16);
+      elf_tdata (abfd)->core_command
+	= _bfd_elfcore_strndup (abfd, note->descdata + 104, 80);
+      break;
+    }
+
+  return TRUE;
+}
+
+/* Functions for dealing with the e_flags field.
+
+   We don't define set_private_flags or copy_private_bfd_data because
+   the only currently defined values are based on the bfd mach number,
+   so we use the latter instead and defer setting e_flags until the
+   file is written out.  */
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+
+static bfd_boolean
+elf32_sparc_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  bfd_boolean error;
+  unsigned long ibfd_mach;
+  /* FIXME: This should not be static.  */
+  static unsigned long previous_ibfd_e_flags = (unsigned long) -1;
+
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  error = FALSE;
+
+  ibfd_mach = bfd_get_mach (ibfd);
+  if (bfd_mach_sparc_64bit_p (ibfd_mach))
+    {
+      error = TRUE;
+      (*_bfd_error_handler)
+	(_("%B: compiled for a 64 bit system and target is 32 bit"), ibfd);
+    }
+  else if ((ibfd->flags & DYNAMIC) == 0)
+    {
+      if (bfd_get_mach (obfd) < ibfd_mach)
+	bfd_set_arch_mach (obfd, bfd_arch_sparc, ibfd_mach);
+    }
+
+  if (((elf_elfheader (ibfd)->e_flags & EF_SPARC_LEDATA)
+       != previous_ibfd_e_flags)
+      && previous_ibfd_e_flags != (unsigned long) -1)
+    {
+      (*_bfd_error_handler)
+	(_("%B: linking little endian files with big endian files"), ibfd);
+      error = TRUE;
+    }
+  previous_ibfd_e_flags = elf_elfheader (ibfd)->e_flags & EF_SPARC_LEDATA;
+
+  if (error)
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  return _bfd_sparc_elf_merge_private_bfd_data (ibfd, obfd);
+}
+
+/* The final processing done just before writing out the object file.
+   We need to set the e_machine field appropriately.  */
+
+static void
+elf32_sparc_final_write_processing (bfd *abfd,
+				    bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  switch (bfd_get_mach (abfd))
+    {
+    case bfd_mach_sparc :
+    case bfd_mach_sparc_sparclet :
+    case bfd_mach_sparc_sparclite :
+      break; /* nothing to do */
+    case bfd_mach_sparc_v8plus :
+      elf_elfheader (abfd)->e_machine = EM_SPARC32PLUS;
+      elf_elfheader (abfd)->e_flags &=~ EF_SPARC_32PLUS_MASK;
+      elf_elfheader (abfd)->e_flags |= EF_SPARC_32PLUS;
+      break;
+    case bfd_mach_sparc_v8plusa :
+      elf_elfheader (abfd)->e_machine = EM_SPARC32PLUS;
+      elf_elfheader (abfd)->e_flags &=~ EF_SPARC_32PLUS_MASK;
+      elf_elfheader (abfd)->e_flags |= EF_SPARC_32PLUS | EF_SPARC_SUN_US1;
+      break;
+    case bfd_mach_sparc_v8plusb :
+      elf_elfheader (abfd)->e_machine = EM_SPARC32PLUS;
+      elf_elfheader (abfd)->e_flags &=~ EF_SPARC_32PLUS_MASK;
+      elf_elfheader (abfd)->e_flags |= EF_SPARC_32PLUS | EF_SPARC_SUN_US1
+				       | EF_SPARC_SUN_US3;
+      break;
+    case bfd_mach_sparc_sparclite_le :
+      elf_elfheader (abfd)->e_flags |= EF_SPARC_LEDATA;
+      break;
+    default :
+      abort ();
+      break;
+    }
+}
+
+static enum elf_reloc_type_class
+elf32_sparc_reloc_type_class (const Elf_Internal_Rela *rela)
+{
+  switch ((int) ELF32_R_TYPE (rela->r_info))
+    {
+    case R_SPARC_RELATIVE:
+      return reloc_class_relative;
+    case R_SPARC_JMP_SLOT:
+      return reloc_class_plt;
+    case R_SPARC_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+/* Hook called by the linker routine which adds symbols from an object
+   file.  */
+
+static bfd_boolean
+elf32_sparc_add_symbol_hook (bfd * abfd,
+			     struct bfd_link_info * info ATTRIBUTE_UNUSED,
+			     Elf_Internal_Sym * sym,
+			     const char ** namep ATTRIBUTE_UNUSED,
+			     flagword * flagsp ATTRIBUTE_UNUSED,
+			     asection ** secp ATTRIBUTE_UNUSED,
+			     bfd_vma * valp ATTRIBUTE_UNUSED)
+{
+  if ((abfd->flags & DYNAMIC) == 0
+      && (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC
+	  || ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE))
+    elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE;
+  return TRUE;
+}
+
+#define TARGET_BIG_SYM	bfd_elf32_sparc_vec
+#define TARGET_BIG_NAME	"elf32-sparc"
+#define ELF_ARCH	bfd_arch_sparc
+#define ELF_TARGET_ID	SPARC_ELF_DATA
+#define ELF_MACHINE_CODE EM_SPARC
+#define ELF_MACHINE_ALT1 EM_SPARC32PLUS
+#define ELF_MAXPAGESIZE 0x10000
+#define ELF_COMMONPAGESIZE 0x2000
+
+#define bfd_elf32_bfd_merge_private_bfd_data \
+					elf32_sparc_merge_private_bfd_data
+#define elf_backend_final_write_processing \
+					elf32_sparc_final_write_processing
+#define elf_backend_grok_psinfo		elf32_sparc_grok_psinfo
+#define elf_backend_reloc_type_class	elf32_sparc_reloc_type_class
+
+#define elf_info_to_howto		_bfd_sparc_elf_info_to_howto
+#define bfd_elf32_bfd_reloc_type_lookup	_bfd_sparc_elf_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup \
+  _bfd_sparc_elf_reloc_name_lookup
+#define bfd_elf32_bfd_link_hash_table_create \
+					_bfd_sparc_elf_link_hash_table_create
+#define bfd_elf32_bfd_link_hash_table_free \
+					_bfd_sparc_elf_link_hash_table_free
+#define bfd_elf32_bfd_relax_section	_bfd_sparc_elf_relax_section
+#define bfd_elf32_new_section_hook	_bfd_sparc_elf_new_section_hook
+#define elf_backend_copy_indirect_symbol \
+					_bfd_sparc_elf_copy_indirect_symbol
+#define elf_backend_create_dynamic_sections \
+					_bfd_sparc_elf_create_dynamic_sections
+#define elf_backend_check_relocs	_bfd_sparc_elf_check_relocs
+#define elf_backend_adjust_dynamic_symbol \
+					_bfd_sparc_elf_adjust_dynamic_symbol
+#define elf_backend_omit_section_dynsym	_bfd_sparc_elf_omit_section_dynsym
+#define elf_backend_size_dynamic_sections \
+					_bfd_sparc_elf_size_dynamic_sections
+#define elf_backend_relocate_section	_bfd_sparc_elf_relocate_section
+#define elf_backend_finish_dynamic_symbol \
+					_bfd_sparc_elf_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections \
+					_bfd_sparc_elf_finish_dynamic_sections
+#define bfd_elf32_mkobject		_bfd_sparc_elf_mkobject
+#define elf_backend_object_p		_bfd_sparc_elf_object_p
+#define elf_backend_gc_mark_hook	_bfd_sparc_elf_gc_mark_hook
+#define elf_backend_gc_sweep_hook       _bfd_sparc_elf_gc_sweep_hook
+#define elf_backend_plt_sym_val		_bfd_sparc_elf_plt_sym_val
+#define elf_backend_init_index_section	_bfd_elf_init_1_index_section
+
+#define elf_backend_can_gc_sections 1
+#define elf_backend_can_refcount 1
+#define elf_backend_want_got_plt 0
+#define elf_backend_plt_readonly 0
+#define elf_backend_want_plt_sym 1
+#define elf_backend_got_header_size 4
+#define elf_backend_rela_normal 1
+
+#define elf_backend_post_process_headers	_bfd_elf_set_osabi
+#define elf_backend_add_symbol_hook		elf32_sparc_add_symbol_hook
+
+#include "elf32-target.h"
+
+/* Solaris 2.  */
+
+#undef	TARGET_BIG_SYM
+#define	TARGET_BIG_SYM				bfd_elf32_sparc_sol2_vec
+#undef	TARGET_BIG_NAME
+#define	TARGET_BIG_NAME				"elf32-sparc-sol2"
+
+#undef elf32_bed
+#define elf32_bed				elf32_sparc_sol2_bed
+
+/* The 32-bit static TLS arena size is rounded to the nearest 8-byte
+   boundary.  */
+#undef elf_backend_static_tls_alignment
+#define elf_backend_static_tls_alignment	8
+
+#include "elf32-target.h"
+
+/* A wrapper around _bfd_sparc_elf_link_hash_table_create that identifies
+   the target system as VxWorks.  */
+
+static struct bfd_link_hash_table *
+elf32_sparc_vxworks_link_hash_table_create (bfd *abfd)
+{
+  struct bfd_link_hash_table *ret;
+
+  ret = _bfd_sparc_elf_link_hash_table_create (abfd);
+  if (ret)
+    {
+      struct _bfd_sparc_elf_link_hash_table *htab;
+
+      htab = (struct _bfd_sparc_elf_link_hash_table *) ret;
+      htab->is_vxworks = 1;
+    }
+  return ret;
+}
+
+/* A final_write_processing hook that does both the SPARC- and VxWorks-
+   specific handling.  */
+
+static void
+elf32_sparc_vxworks_final_write_processing (bfd *abfd, bfd_boolean linker)
+{
+  elf32_sparc_final_write_processing (abfd, linker);
+  elf_vxworks_final_write_processing (abfd, linker);
+}
+
+#undef TARGET_BIG_SYM
+#define TARGET_BIG_SYM	bfd_elf32_sparc_vxworks_vec
+#undef TARGET_BIG_NAME
+#define TARGET_BIG_NAME	"elf32-sparc-vxworks"
+
+#undef ELF_MINPAGESIZE
+#define ELF_MINPAGESIZE	0x1000
+
+#undef bfd_elf32_bfd_link_hash_table_create
+#define bfd_elf32_bfd_link_hash_table_create \
+  elf32_sparc_vxworks_link_hash_table_create
+
+#undef elf_backend_want_got_plt
+#define elf_backend_want_got_plt		1
+#undef elf_backend_plt_readonly
+#define elf_backend_plt_readonly		1
+#undef elf_backend_got_header_size
+#define elf_backend_got_header_size		12
+#undef elf_backend_add_symbol_hook
+#define elf_backend_add_symbol_hook \
+  elf_vxworks_add_symbol_hook
+#undef elf_backend_link_output_symbol_hook
+#define elf_backend_link_output_symbol_hook \
+  elf_vxworks_link_output_symbol_hook
+#undef elf_backend_emit_relocs
+#define elf_backend_emit_relocs \
+  elf_vxworks_emit_relocs
+#undef elf_backend_final_write_processing
+#define elf_backend_final_write_processing \
+  elf32_sparc_vxworks_final_write_processing
+#undef elf_backend_static_tls_alignment
+
+#undef elf32_bed
+#define elf32_bed				sparc_elf_vxworks_bed
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-spu.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-spu.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-spu.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-spu.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,5479 @@
+/* SPU specific support for 32-bit ELF
+
+   Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "libiberty.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/spu.h"
+#include "elf32-spu.h"
+
+/* We use RELA style relocs.  Don't define USE_REL.  */
+
+static bfd_reloc_status_type spu_elf_rel9 (bfd *, arelent *, asymbol *,
+					   void *, asection *,
+					   bfd *, char **);
+
+/* Values of type 'enum elf_spu_reloc_type' are used to index this
+   array, so it must be declared in the order of that type.  */
+
+static reloc_howto_type elf_howto_table[] = {
+  HOWTO (R_SPU_NONE,       0, 0,  0, FALSE,  0, complain_overflow_dont,
+	 bfd_elf_generic_reloc, "SPU_NONE",
+	 FALSE, 0, 0x00000000, FALSE),
+  HOWTO (R_SPU_ADDR10,     4, 2, 10, FALSE, 14, complain_overflow_bitfield,
+	 bfd_elf_generic_reloc, "SPU_ADDR10",
+	 FALSE, 0, 0x00ffc000, FALSE),
+  HOWTO (R_SPU_ADDR16,     2, 2, 16, FALSE,  7, complain_overflow_bitfield,
+	 bfd_elf_generic_reloc, "SPU_ADDR16",
+	 FALSE, 0, 0x007fff80, FALSE),
+  HOWTO (R_SPU_ADDR16_HI, 16, 2, 16, FALSE,  7, complain_overflow_bitfield,
+	 bfd_elf_generic_reloc, "SPU_ADDR16_HI",
+	 FALSE, 0, 0x007fff80, FALSE),
+  HOWTO (R_SPU_ADDR16_LO,  0, 2, 16, FALSE,  7, complain_overflow_dont,
+	 bfd_elf_generic_reloc, "SPU_ADDR16_LO",
+	 FALSE, 0, 0x007fff80, FALSE),
+  HOWTO (R_SPU_ADDR18,     0, 2, 18, FALSE,  7, complain_overflow_bitfield,
+	 bfd_elf_generic_reloc, "SPU_ADDR18",
+	 FALSE, 0, 0x01ffff80, FALSE),
+  HOWTO (R_SPU_ADDR32,     0, 2, 32, FALSE,  0, complain_overflow_dont,
+	 bfd_elf_generic_reloc, "SPU_ADDR32",
+	 FALSE, 0, 0xffffffff, FALSE),
+  HOWTO (R_SPU_REL16,      2, 2, 16,  TRUE,  7, complain_overflow_bitfield,
+	 bfd_elf_generic_reloc, "SPU_REL16",
+	 FALSE, 0, 0x007fff80, TRUE),
+  HOWTO (R_SPU_ADDR7,      0, 2,  7, FALSE, 14, complain_overflow_dont,
+	 bfd_elf_generic_reloc, "SPU_ADDR7",
+	 FALSE, 0, 0x001fc000, FALSE),
+  HOWTO (R_SPU_REL9,       2, 2,  9,  TRUE,  0, complain_overflow_signed,
+	 spu_elf_rel9,          "SPU_REL9",
+	 FALSE, 0, 0x0180007f, TRUE),
+  HOWTO (R_SPU_REL9I,      2, 2,  9,  TRUE,  0, complain_overflow_signed,
+	 spu_elf_rel9,          "SPU_REL9I",
+	 FALSE, 0, 0x0000c07f, TRUE),
+  HOWTO (R_SPU_ADDR10I,    0, 2, 10, FALSE, 14, complain_overflow_signed,
+	 bfd_elf_generic_reloc, "SPU_ADDR10I",
+	 FALSE, 0, 0x00ffc000, FALSE),
+  HOWTO (R_SPU_ADDR16I,    0, 2, 16, FALSE,  7, complain_overflow_signed,
+	 bfd_elf_generic_reloc, "SPU_ADDR16I",
+	 FALSE, 0, 0x007fff80, FALSE),
+  HOWTO (R_SPU_REL32,      0, 2, 32, TRUE,  0, complain_overflow_dont,
+	 bfd_elf_generic_reloc, "SPU_REL32",
+	 FALSE, 0, 0xffffffff, TRUE),
+  HOWTO (R_SPU_ADDR16X,    0, 2, 16, FALSE,  7, complain_overflow_bitfield,
+	 bfd_elf_generic_reloc, "SPU_ADDR16X",
+	 FALSE, 0, 0x007fff80, FALSE),
+  HOWTO (R_SPU_PPU32,      0, 2, 32, FALSE,  0, complain_overflow_dont,
+	 bfd_elf_generic_reloc, "SPU_PPU32",
+	 FALSE, 0, 0xffffffff, FALSE),
+  HOWTO (R_SPU_PPU64,      0, 4, 64, FALSE,  0, complain_overflow_dont,
+	 bfd_elf_generic_reloc, "SPU_PPU64",
+	 FALSE, 0, -1, FALSE),
+  HOWTO (R_SPU_ADD_PIC,      0, 0, 0, FALSE,  0, complain_overflow_dont,
+	 bfd_elf_generic_reloc, "SPU_ADD_PIC",
+	 FALSE, 0, 0x00000000, FALSE),
+};
+
+static struct bfd_elf_special_section const spu_elf_special_sections[] = {
+  { "._ea", 4, 0, SHT_PROGBITS, SHF_WRITE },
+  { ".toe", 4, 0, SHT_NOBITS, SHF_ALLOC },
+  { NULL, 0, 0, 0, 0 }
+};
+
+static enum elf_spu_reloc_type
+spu_elf_bfd_to_reloc_type (bfd_reloc_code_real_type code)
+{
+  switch (code)
+    {
+    default:
+      return R_SPU_NONE;
+    case BFD_RELOC_SPU_IMM10W:
+      return R_SPU_ADDR10;
+    case BFD_RELOC_SPU_IMM16W:
+      return R_SPU_ADDR16;
+    case BFD_RELOC_SPU_LO16:
+      return R_SPU_ADDR16_LO;
+    case BFD_RELOC_SPU_HI16:
+      return R_SPU_ADDR16_HI;
+    case BFD_RELOC_SPU_IMM18:
+      return R_SPU_ADDR18;
+    case BFD_RELOC_SPU_PCREL16:
+      return R_SPU_REL16;
+    case BFD_RELOC_SPU_IMM7:
+      return R_SPU_ADDR7;
+    case BFD_RELOC_SPU_IMM8:
+      return R_SPU_NONE;
+    case BFD_RELOC_SPU_PCREL9a:
+      return R_SPU_REL9;
+    case BFD_RELOC_SPU_PCREL9b:
+      return R_SPU_REL9I;
+    case BFD_RELOC_SPU_IMM10:
+      return R_SPU_ADDR10I;
+    case BFD_RELOC_SPU_IMM16:
+      return R_SPU_ADDR16I;
+    case BFD_RELOC_32:
+      return R_SPU_ADDR32;
+    case BFD_RELOC_32_PCREL:
+      return R_SPU_REL32;
+    case BFD_RELOC_SPU_PPU32:
+      return R_SPU_PPU32;
+    case BFD_RELOC_SPU_PPU64:
+      return R_SPU_PPU64;
+    case BFD_RELOC_SPU_ADD_PIC:
+      return R_SPU_ADD_PIC;
+    }
+}
+
+static void
+spu_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+		       arelent *cache_ptr,
+		       Elf_Internal_Rela *dst)
+{
+  enum elf_spu_reloc_type r_type;
+
+  r_type = (enum elf_spu_reloc_type) ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < R_SPU_max);
+  cache_ptr->howto = &elf_howto_table[(int) r_type];
+}
+
+static reloc_howto_type *
+spu_elf_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			   bfd_reloc_code_real_type code)
+{
+  enum elf_spu_reloc_type r_type = spu_elf_bfd_to_reloc_type (code);
+
+  if (r_type == R_SPU_NONE)
+    return NULL;
+
+  return elf_howto_table + r_type;
+}
+
+static reloc_howto_type *
+spu_elf_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			   const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (elf_howto_table) / sizeof (elf_howto_table[0]); i++)
+    if (elf_howto_table[i].name != NULL
+	&& strcasecmp (elf_howto_table[i].name, r_name) == 0)
+      return &elf_howto_table[i];
+
+  return NULL;
+}
+
+/* Apply R_SPU_REL9 and R_SPU_REL9I relocs.  */
+
+static bfd_reloc_status_type
+spu_elf_rel9 (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+	      void *data, asection *input_section,
+	      bfd *output_bfd, char **error_message)
+{
+  bfd_size_type octets;
+  bfd_vma val;
+  long insn;
+
+  /* If this is a relocatable link (output_bfd test tells us), just
+     call the generic function.  Any adjustment will be done at final
+     link time.  */
+  if (output_bfd != NULL)
+    return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+				  input_section, output_bfd, error_message);
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+  octets = reloc_entry->address * bfd_octets_per_byte (abfd);
+
+  /* Get symbol value.  */
+  val = 0;
+  if (!bfd_is_com_section (symbol->section))
+    val = symbol->value;
+  if (symbol->section->output_section)
+    val += symbol->section->output_section->vma;
+
+  val += reloc_entry->addend;
+
+  /* Make it pc-relative.  */
+  val -= input_section->output_section->vma + input_section->output_offset;
+
+  val >>= 2;
+  if (val + 256 >= 512)
+    return bfd_reloc_overflow;
+
+  insn = bfd_get_32 (abfd, (bfd_byte *) data + octets);
+
+  /* Move two high bits of value to REL9I and REL9 position.
+     The mask will take care of selecting the right field.  */
+  val = (val & 0x7f) | ((val & 0x180) << 7) | ((val & 0x180) << 16);
+  insn &= ~reloc_entry->howto->dst_mask;
+  insn |= val & reloc_entry->howto->dst_mask;
+  bfd_put_32 (abfd, insn, (bfd_byte *) data + octets);
+  return bfd_reloc_ok;
+}
+
+static bfd_boolean
+spu_elf_new_section_hook (bfd *abfd, asection *sec)
+{
+  if (!sec->used_by_bfd)
+    {
+      struct _spu_elf_section_data *sdata;
+
+      sdata = bfd_zalloc (abfd, sizeof (*sdata));
+      if (sdata == NULL)
+	return FALSE;
+      sec->used_by_bfd = sdata;
+    }
+
+  return _bfd_elf_new_section_hook (abfd, sec);
+}
+
+/* Set up overlay info for executables.  */
+
+static bfd_boolean
+spu_elf_object_p (bfd *abfd)
+{
+  if ((abfd->flags & (EXEC_P | DYNAMIC)) != 0)
+    {
+      unsigned int i, num_ovl, num_buf;
+      Elf_Internal_Phdr *phdr = elf_tdata (abfd)->phdr;
+      Elf_Internal_Ehdr *ehdr = elf_elfheader (abfd);
+      Elf_Internal_Phdr *last_phdr = NULL;
+
+      for (num_buf = 0, num_ovl = 0, i = 0; i < ehdr->e_phnum; i++, phdr++)
+	if (phdr->p_type == PT_LOAD && (phdr->p_flags & PF_OVERLAY) != 0)
+	  {
+	    unsigned int j;
+
+	    ++num_ovl;
+	    if (last_phdr == NULL
+		|| ((last_phdr->p_vaddr ^ phdr->p_vaddr) & 0x3ffff) != 0)
+	      ++num_buf;
+	    last_phdr = phdr;
+	    for (j = 1; j < elf_numsections (abfd); j++)
+	      {
+		Elf_Internal_Shdr *shdr = elf_elfsections (abfd)[j];
+
+		if (ELF_SECTION_SIZE (shdr, phdr) != 0
+		    && ELF_SECTION_IN_SEGMENT (shdr, phdr))
+		  {
+		    asection *sec = shdr->bfd_section;
+		    spu_elf_section_data (sec)->u.o.ovl_index = num_ovl;
+		    spu_elf_section_data (sec)->u.o.ovl_buf = num_buf;
+		  }
+	      }
+	  }
+    }
+  return TRUE;
+}
+
+/* Specially mark defined symbols named _EAR_* with BSF_KEEP so that
+   strip --strip-unneeded will not remove them.  */
+
+static void
+spu_elf_backend_symbol_processing (bfd *abfd ATTRIBUTE_UNUSED, asymbol *sym)
+{
+  if (sym->name != NULL
+      && sym->section != bfd_abs_section_ptr
+      && strncmp (sym->name, "_EAR_", 5) == 0)
+    sym->flags |= BSF_KEEP;
+}
+
+/* SPU ELF linker hash table.  */
+
+struct spu_link_hash_table
+{
+  struct elf_link_hash_table elf;
+
+  struct spu_elf_params *params;
+
+  /* Shortcuts to overlay sections.  */
+  asection *ovtab;
+  asection *init;
+  asection *toe;
+  asection **ovl_sec;
+
+  /* Count of stubs in each overlay section.  */
+  unsigned int *stub_count;
+
+  /* The stub section for each overlay section.  */
+  asection **stub_sec;
+
+  struct elf_link_hash_entry *ovly_entry[2];
+
+  /* Number of overlay buffers.  */
+  unsigned int num_buf;
+
+  /* Total number of overlays.  */
+  unsigned int num_overlays;
+
+  /* For soft icache.  */
+  unsigned int line_size_log2;
+  unsigned int num_lines_log2;
+  unsigned int fromelem_size_log2;
+
+  /* How much memory we have.  */
+  unsigned int local_store;
+
+  /* Count of overlay stubs needed in non-overlay area.  */
+  unsigned int non_ovly_stub;
+
+  /* Pointer to the fixup section */
+  asection *sfixup;
+
+  /* Set on error.  */
+  unsigned int stub_err : 1;
+};
+
+/* Hijack the generic got fields for overlay stub accounting.  */
+
+struct got_entry
+{
+  struct got_entry *next;
+  unsigned int ovl;
+  union {
+    bfd_vma addend;
+    bfd_vma br_addr;
+  };
+  bfd_vma stub_addr;
+};
+
+#define spu_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == SPU_ELF_DATA ? ((struct spu_link_hash_table *) ((p)->hash)) : NULL)
+
+struct call_info
+{
+  struct function_info *fun;
+  struct call_info *next;
+  unsigned int count;
+  unsigned int max_depth;
+  unsigned int is_tail : 1;
+  unsigned int is_pasted : 1;
+  unsigned int broken_cycle : 1;
+  unsigned int priority : 13;
+};
+
+struct function_info
+{
+  /* List of functions called.  Also branches to hot/cold part of
+     function.  */
+  struct call_info *call_list;
+  /* For hot/cold part of function, point to owner.  */
+  struct function_info *start;
+  /* Symbol at start of function.  */
+  union {
+    Elf_Internal_Sym *sym;
+    struct elf_link_hash_entry *h;
+  } u;
+  /* Function section.  */
+  asection *sec;
+  asection *rodata;
+  /* Where last called from, and number of sections called from.  */
+  asection *last_caller;
+  unsigned int call_count;
+  /* Address range of (this part of) function.  */
+  bfd_vma lo, hi;
+  /* Offset where we found a store of lr, or -1 if none found.  */
+  bfd_vma lr_store;
+  /* Offset where we found the stack adjustment insn.  */
+  bfd_vma sp_adjust;
+  /* Stack usage.  */
+  int stack;
+  /* Distance from root of call tree.  Tail and hot/cold branches
+     count as one deeper.  We aren't counting stack frames here.  */
+  unsigned int depth;
+  /* Set if global symbol.  */
+  unsigned int global : 1;
+  /* Set if known to be start of function (as distinct from a hunk
+     in hot/cold section.  */
+  unsigned int is_func : 1;
+  /* Set if not a root node.  */
+  unsigned int non_root : 1;
+  /* Flags used during call tree traversal.  It's cheaper to replicate
+     the visit flags than have one which needs clearing after a traversal.  */
+  unsigned int visit1 : 1;
+  unsigned int visit2 : 1;
+  unsigned int marking : 1;
+  unsigned int visit3 : 1;
+  unsigned int visit4 : 1;
+  unsigned int visit5 : 1;
+  unsigned int visit6 : 1;
+  unsigned int visit7 : 1;
+};
+
+struct spu_elf_stack_info
+{
+  int num_fun;
+  int max_fun;
+  /* Variable size array describing functions, one per contiguous
+     address range belonging to a function.  */
+  struct function_info fun[1];
+};
+
+static struct function_info *find_function (asection *, bfd_vma,
+					    struct bfd_link_info *);
+
+/* Create a spu ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+spu_elf_link_hash_table_create (bfd *abfd)
+{
+  struct spu_link_hash_table *htab;
+
+  htab = bfd_malloc (sizeof (*htab));
+  if (htab == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&htab->elf, abfd,
+				      _bfd_elf_link_hash_newfunc,
+				      sizeof (struct elf_link_hash_entry),
+				      SPU_ELF_DATA))
+    {
+      free (htab);
+      return NULL;
+    }
+
+  memset (&htab->ovtab, 0,
+	  sizeof (*htab) - offsetof (struct spu_link_hash_table, ovtab));
+
+  htab->elf.init_got_refcount.refcount = 0;
+  htab->elf.init_got_refcount.glist = NULL;
+  htab->elf.init_got_offset.offset = 0;
+  htab->elf.init_got_offset.glist = NULL;
+  return &htab->elf.root;
+}
+
+void
+spu_elf_setup (struct bfd_link_info *info, struct spu_elf_params *params)
+{
+  bfd_vma max_branch_log2;
+
+  struct spu_link_hash_table *htab = spu_hash_table (info);
+  htab->params = params;
+  htab->line_size_log2 = bfd_log2 (htab->params->line_size);
+  htab->num_lines_log2 = bfd_log2 (htab->params->num_lines);
+
+  /* For the software i-cache, we provide a "from" list whose size
+     is a power-of-two number of quadwords, big enough to hold one
+     byte per outgoing branch.  Compute this number here.  */
+  max_branch_log2 = bfd_log2 (htab->params->max_branch);
+  htab->fromelem_size_log2 = max_branch_log2 > 4 ? max_branch_log2 - 4 : 0;
+}
+
+/* Find the symbol for the given R_SYMNDX in IBFD and set *HP and *SYMP
+   to (hash, NULL) for global symbols, and (NULL, sym) for locals.  Set
+   *SYMSECP to the symbol's section.  *LOCSYMSP caches local syms.  */
+
+static bfd_boolean
+get_sym_h (struct elf_link_hash_entry **hp,
+	   Elf_Internal_Sym **symp,
+	   asection **symsecp,
+	   Elf_Internal_Sym **locsymsp,
+	   unsigned long r_symndx,
+	   bfd *ibfd)
+{
+  Elf_Internal_Shdr *symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+
+  if (r_symndx >= symtab_hdr->sh_info)
+    {
+      struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (ibfd);
+      struct elf_link_hash_entry *h;
+
+      h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+      while (h->root.type == bfd_link_hash_indirect
+	     || h->root.type == bfd_link_hash_warning)
+	h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+      if (hp != NULL)
+	*hp = h;
+
+      if (symp != NULL)
+	*symp = NULL;
+
+      if (symsecp != NULL)
+	{
+	  asection *symsec = NULL;
+	  if (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	    symsec = h->root.u.def.section;
+	  *symsecp = symsec;
+	}
+    }
+  else
+    {
+      Elf_Internal_Sym *sym;
+      Elf_Internal_Sym *locsyms = *locsymsp;
+
+      if (locsyms == NULL)
+	{
+	  locsyms = (Elf_Internal_Sym *) symtab_hdr->contents;
+	  if (locsyms == NULL)
+	    locsyms = bfd_elf_get_elf_syms (ibfd, symtab_hdr,
+					    symtab_hdr->sh_info,
+					    0, NULL, NULL, NULL);
+	  if (locsyms == NULL)
+	    return FALSE;
+	  *locsymsp = locsyms;
+	}
+      sym = locsyms + r_symndx;
+
+      if (hp != NULL)
+	*hp = NULL;
+
+      if (symp != NULL)
+	*symp = sym;
+
+      if (symsecp != NULL)
+	*symsecp = bfd_section_from_elf_index (ibfd, sym->st_shndx);
+    }
+
+  return TRUE;
+}
+
+/* Create the note section if not already present.  This is done early so
+   that the linker maps the sections to the right place in the output.  */
+
+bfd_boolean
+spu_elf_create_sections (struct bfd_link_info *info)
+{
+  struct spu_link_hash_table *htab = spu_hash_table (info);
+  bfd *ibfd;
+
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    if (bfd_get_section_by_name (ibfd, SPU_PTNOTE_SPUNAME) != NULL)
+      break;
+
+  if (ibfd == NULL)
+    {
+      /* Make SPU_PTNOTE_SPUNAME section.  */
+      asection *s;
+      size_t name_len;
+      size_t size;
+      bfd_byte *data;
+      flagword flags;
+
+      ibfd = info->input_bfds;
+      flags = SEC_LOAD | SEC_READONLY | SEC_HAS_CONTENTS | SEC_IN_MEMORY;
+      s = bfd_make_section_anyway_with_flags (ibfd, SPU_PTNOTE_SPUNAME, flags);
+      if (s == NULL
+	  || !bfd_set_section_alignment (ibfd, s, 4))
+	return FALSE;
+
+      name_len = strlen (bfd_get_filename (info->output_bfd)) + 1;
+      size = 12 + ((sizeof (SPU_PLUGIN_NAME) + 3) & -4);
+      size += (name_len + 3) & -4;
+
+      if (!bfd_set_section_size (ibfd, s, size))
+	return FALSE;
+
+      data = bfd_zalloc (ibfd, size);
+      if (data == NULL)
+	return FALSE;
+
+      bfd_put_32 (ibfd, sizeof (SPU_PLUGIN_NAME), data + 0);
+      bfd_put_32 (ibfd, name_len, data + 4);
+      bfd_put_32 (ibfd, 1, data + 8);
+      memcpy (data + 12, SPU_PLUGIN_NAME, sizeof (SPU_PLUGIN_NAME));
+      memcpy (data + 12 + ((sizeof (SPU_PLUGIN_NAME) + 3) & -4),
+	      bfd_get_filename (info->output_bfd), name_len);
+      s->contents = data;
+    }
+
+  if (htab->params->emit_fixups)
+    {
+      asection *s;
+      flagword flags;
+
+      if (htab->elf.dynobj == NULL)
+	htab->elf.dynobj = ibfd;
+      ibfd = htab->elf.dynobj;
+      flags = (SEC_LOAD | SEC_ALLOC | SEC_READONLY | SEC_HAS_CONTENTS
+	       | SEC_IN_MEMORY | SEC_LINKER_CREATED);
+      s = bfd_make_section_anyway_with_flags (ibfd, ".fixup", flags);
+      if (s == NULL || !bfd_set_section_alignment (ibfd, s, 2))
+	return FALSE;
+      htab->sfixup = s;
+    }
+
+  return TRUE;
+}
+
+/* qsort predicate to sort sections by vma.  */
+
+static int
+sort_sections (const void *a, const void *b)
+{
+  const asection *const *s1 = a;
+  const asection *const *s2 = b;
+  bfd_signed_vma delta = (*s1)->vma - (*s2)->vma;
+
+  if (delta != 0)
+    return delta < 0 ? -1 : 1;
+
+  return (*s1)->index - (*s2)->index;
+}
+
+/* Identify overlays in the output bfd, and number them.
+   Returns 0 on error, 1 if no overlays, 2 if overlays.  */
+
+int
+spu_elf_find_overlays (struct bfd_link_info *info)
+{
+  struct spu_link_hash_table *htab = spu_hash_table (info);
+  asection **alloc_sec;
+  unsigned int i, n, ovl_index, num_buf;
+  asection *s;
+  bfd_vma ovl_end;
+  static const char *const entry_names[2][2] = {
+    { "__ovly_load", "__icache_br_handler" },
+    { "__ovly_return", "__icache_call_handler" }
+  };
+
+  if (info->output_bfd->section_count < 2)
+    return 1;
+
+  alloc_sec
+    = bfd_malloc (info->output_bfd->section_count * sizeof (*alloc_sec));
+  if (alloc_sec == NULL)
+    return 0;
+
+  /* Pick out all the alloced sections.  */
+  for (n = 0, s = info->output_bfd->sections; s != NULL; s = s->next)
+    if ((s->flags & SEC_ALLOC) != 0
+	&& (s->flags & (SEC_LOAD | SEC_THREAD_LOCAL)) != SEC_THREAD_LOCAL
+	&& s->size != 0)
+      alloc_sec[n++] = s;
+
+  if (n == 0)
+    {
+      free (alloc_sec);
+      return 1;
+    }
+
+  /* Sort them by vma.  */
+  qsort (alloc_sec, n, sizeof (*alloc_sec), sort_sections);
+
+  ovl_end = alloc_sec[0]->vma + alloc_sec[0]->size;
+  if (htab->params->ovly_flavour == ovly_soft_icache)
+    {
+      unsigned int prev_buf = 0, set_id = 0;
+
+      /* Look for an overlapping vma to find the first overlay section.  */
+      bfd_vma vma_start = 0;
+
+      for (i = 1; i < n; i++)
+	{
+	  s = alloc_sec[i];
+	  if (s->vma < ovl_end)
+	    {
+	      asection *s0 = alloc_sec[i - 1];
+	      vma_start = s0->vma;
+	      ovl_end = (s0->vma
+			 + ((bfd_vma) 1
+			    << (htab->num_lines_log2 + htab->line_size_log2)));
+	      --i;
+	      break;
+	    }
+	  else
+	    ovl_end = s->vma + s->size;
+	}
+
+      /* Now find any sections within the cache area.  */
+      for (ovl_index = 0, num_buf = 0; i < n; i++)
+	{
+	  s = alloc_sec[i];
+	  if (s->vma >= ovl_end)
+	    break;
+
+	  /* A section in an overlay area called .ovl.init is not
+	     an overlay, in the sense that it might be loaded in
+	     by the overlay manager, but rather the initial
+	     section contents for the overlay buffer.  */
+	  if (strncmp (s->name, ".ovl.init", 9) != 0)
+	    {
+	      num_buf = ((s->vma - vma_start) >> htab->line_size_log2) + 1;
+	      set_id = (num_buf == prev_buf)? set_id + 1 : 0;
+	      prev_buf = num_buf;
+
+	      if ((s->vma - vma_start) & (htab->params->line_size - 1))
+		{
+		  info->callbacks->einfo (_("%X%P: overlay section %A "
+					    "does not start on a cache line.\n"),
+					  s);
+		  bfd_set_error (bfd_error_bad_value);
+		  return 0;
+		}
+	      else if (s->size > htab->params->line_size)
+		{
+		  info->callbacks->einfo (_("%X%P: overlay section %A "
+					    "is larger than a cache line.\n"),
+					  s);
+		  bfd_set_error (bfd_error_bad_value);
+		  return 0;
+		}
+
+	      alloc_sec[ovl_index++] = s;
+	      spu_elf_section_data (s)->u.o.ovl_index
+		= (set_id << htab->num_lines_log2) + num_buf;
+	      spu_elf_section_data (s)->u.o.ovl_buf = num_buf;
+	    }
+	}
+
+      /* Ensure there are no more overlay sections.  */
+      for ( ; i < n; i++)
+	{
+	  s = alloc_sec[i];
+	  if (s->vma < ovl_end)
+	    {
+	      info->callbacks->einfo (_("%X%P: overlay section %A "
+					"is not in cache area.\n"),
+				      alloc_sec[i-1]);
+	      bfd_set_error (bfd_error_bad_value);
+	      return 0;
+	    }
+	  else
+	    ovl_end = s->vma + s->size;
+	}
+    }
+  else
+    {
+      /* Look for overlapping vmas.  Any with overlap must be overlays.
+	 Count them.  Also count the number of overlay regions.  */
+      for (ovl_index = 0, num_buf = 0, i = 1; i < n; i++)
+	{
+	  s = alloc_sec[i];
+	  if (s->vma < ovl_end)
+	    {
+	      asection *s0 = alloc_sec[i - 1];
+
+	      if (spu_elf_section_data (s0)->u.o.ovl_index == 0)
+		{
+		  ++num_buf;
+		  if (strncmp (s0->name, ".ovl.init", 9) != 0)
+		    {
+		      alloc_sec[ovl_index] = s0;
+		      spu_elf_section_data (s0)->u.o.ovl_index = ++ovl_index;
+		      spu_elf_section_data (s0)->u.o.ovl_buf = num_buf;
+		    }
+		  else
+		    ovl_end = s->vma + s->size;
+		}
+	      if (strncmp (s->name, ".ovl.init", 9) != 0)
+		{
+		  alloc_sec[ovl_index] = s;
+		  spu_elf_section_data (s)->u.o.ovl_index = ++ovl_index;
+		  spu_elf_section_data (s)->u.o.ovl_buf = num_buf;
+		  if (s0->vma != s->vma)
+		    {
+		      info->callbacks->einfo (_("%X%P: overlay sections %A "
+						"and %A do not start at the "
+						"same address.\n"),
+					      s0, s);
+		      bfd_set_error (bfd_error_bad_value);
+		      return 0;
+		    }
+		  if (ovl_end < s->vma + s->size)
+		    ovl_end = s->vma + s->size;
+		}
+	    }
+	  else
+	    ovl_end = s->vma + s->size;
+	}
+    }
+
+  htab->num_overlays = ovl_index;
+  htab->num_buf = num_buf;
+  htab->ovl_sec = alloc_sec;
+
+  if (ovl_index == 0)
+    return 1;
+
+  for (i = 0; i < 2; i++)
+    {
+      const char *name;
+      struct elf_link_hash_entry *h;
+
+      name = entry_names[i][htab->params->ovly_flavour];
+      h = elf_link_hash_lookup (&htab->elf, name, TRUE, FALSE, FALSE);
+      if (h == NULL)
+	return 0;
+
+      if (h->root.type == bfd_link_hash_new)
+	{
+	  h->root.type = bfd_link_hash_undefined;
+	  h->ref_regular = 1;
+	  h->ref_regular_nonweak = 1;
+	  h->non_elf = 0;
+	}
+      htab->ovly_entry[i] = h;
+    }
+
+  return 2;
+}
+
+/* Non-zero to use bra in overlay stubs rather than br.  */
+#define BRA_STUBS 0
+
+#define BRA	0x30000000
+#define BRASL	0x31000000
+#define BR	0x32000000
+#define BRSL	0x33000000
+#define NOP	0x40200000
+#define LNOP	0x00200000
+#define ILA	0x42000000
+
+/* Return true for all relative and absolute branch instructions.
+   bra   00110000 0..
+   brasl 00110001 0..
+   br    00110010 0..
+   brsl  00110011 0..
+   brz   00100000 0..
+   brnz  00100001 0..
+   brhz  00100010 0..
+   brhnz 00100011 0..  */
+
+static bfd_boolean
+is_branch (const unsigned char *insn)
+{
+  return (insn[0] & 0xec) == 0x20 && (insn[1] & 0x80) == 0;
+}
+
+/* Return true for all indirect branch instructions.
+   bi     00110101 000
+   bisl   00110101 001
+   iret   00110101 010
+   bisled 00110101 011
+   biz    00100101 000
+   binz   00100101 001
+   bihz   00100101 010
+   bihnz  00100101 011  */
+
+static bfd_boolean
+is_indirect_branch (const unsigned char *insn)
+{
+  return (insn[0] & 0xef) == 0x25 && (insn[1] & 0x80) == 0;
+}
+
+/* Return true for branch hint instructions.
+   hbra  0001000..
+   hbrr  0001001..  */
+
+static bfd_boolean
+is_hint (const unsigned char *insn)
+{
+  return (insn[0] & 0xfc) == 0x10;
+}
+
+/* True if INPUT_SECTION might need overlay stubs.  */
+
+static bfd_boolean
+maybe_needs_stubs (asection *input_section)
+{
+  /* No stubs for debug sections and suchlike.  */
+  if ((input_section->flags & SEC_ALLOC) == 0)
+    return FALSE;
+
+  /* No stubs for link-once sections that will be discarded.  */
+  if (input_section->output_section == bfd_abs_section_ptr)
+    return FALSE;
+
+  /* Don't create stubs for .eh_frame references.  */
+  if (strcmp (input_section->name, ".eh_frame") == 0)
+    return FALSE;
+
+  return TRUE;
+}
+
+enum _stub_type
+{
+  no_stub,
+  call_ovl_stub,
+  br000_ovl_stub,
+  br001_ovl_stub,
+  br010_ovl_stub,
+  br011_ovl_stub,
+  br100_ovl_stub,
+  br101_ovl_stub,
+  br110_ovl_stub,
+  br111_ovl_stub,
+  nonovl_stub,
+  stub_error
+};
+
+/* Return non-zero if this reloc symbol should go via an overlay stub.
+   Return 2 if the stub must be in non-overlay area.  */
+
+static enum _stub_type
+needs_ovl_stub (struct elf_link_hash_entry *h,
+		Elf_Internal_Sym *sym,
+		asection *sym_sec,
+		asection *input_section,
+		Elf_Internal_Rela *irela,
+		bfd_byte *contents,
+		struct bfd_link_info *info)
+{
+  struct spu_link_hash_table *htab = spu_hash_table (info);
+  enum elf_spu_reloc_type r_type;
+  unsigned int sym_type;
+  bfd_boolean branch, hint, call;
+  enum _stub_type ret = no_stub;
+  bfd_byte insn[4];
+
+  if (sym_sec == NULL
+      || sym_sec->output_section == bfd_abs_section_ptr
+      || spu_elf_section_data (sym_sec->output_section) == NULL)
+    return ret;
+
+  if (h != NULL)
+    {
+      /* Ensure no stubs for user supplied overlay manager syms.  */
+      if (h == htab->ovly_entry[0] || h == htab->ovly_entry[1])
+	return ret;
+
+      /* setjmp always goes via an overlay stub, because then the return
+	 and hence the longjmp goes via __ovly_return.  That magically
+	 makes setjmp/longjmp between overlays work.  */
+      if (strncmp (h->root.root.string, "setjmp", 6) == 0
+	  && (h->root.root.string[6] == '\0' || h->root.root.string[6] == '@'))
+	ret = call_ovl_stub;
+    }
+
+  if (h != NULL)
+    sym_type = h->type;
+  else
+    sym_type = ELF_ST_TYPE (sym->st_info);
+
+  r_type = ELF32_R_TYPE (irela->r_info);
+  branch = FALSE;
+  hint = FALSE;
+  call = FALSE;
+  if (r_type == R_SPU_REL16 || r_type == R_SPU_ADDR16)
+    {
+      if (contents == NULL)
+	{
+	  contents = insn;
+	  if (!bfd_get_section_contents (input_section->owner,
+					 input_section,
+					 contents,
+					 irela->r_offset, 4))
+	    return stub_error;
+	}
+      else
+	contents += irela->r_offset;
+
+      branch = is_branch (contents);
+      hint = is_hint (contents);
+      if (branch || hint)
+	{
+	  call = (contents[0] & 0xfd) == 0x31;
+	  if (call
+	      && sym_type != STT_FUNC
+	      && contents != insn)
+	    {
+	      /* It's common for people to write assembly and forget
+		 to give function symbols the right type.  Handle
+		 calls to such symbols, but warn so that (hopefully)
+		 people will fix their code.  We need the symbol
+		 type to be correct to distinguish function pointer
+		 initialisation from other pointer initialisations.  */
+	      const char *sym_name;
+
+	      if (h != NULL)
+		sym_name = h->root.root.string;
+	      else
+		{
+		  Elf_Internal_Shdr *symtab_hdr;
+		  symtab_hdr = &elf_tdata (input_section->owner)->symtab_hdr;
+		  sym_name = bfd_elf_sym_name (input_section->owner,
+					       symtab_hdr,
+					       sym,
+					       sym_sec);
+		}
+	      (*_bfd_error_handler) (_("warning: call to non-function"
+				       " symbol %s defined in %B"),
+				     sym_sec->owner, sym_name);
+
+	    }
+	}
+    }
+
+  if ((!branch && htab->params->ovly_flavour == ovly_soft_icache)
+      || (sym_type != STT_FUNC
+	  && !(branch || hint)
+	  && (sym_sec->flags & SEC_CODE) == 0))
+    return no_stub;
+
+  /* Usually, symbols in non-overlay sections don't need stubs.  */
+  if (spu_elf_section_data (sym_sec->output_section)->u.o.ovl_index == 0
+      && !htab->params->non_overlay_stubs)
+    return ret;
+
+  /* A reference from some other section to a symbol in an overlay
+     section needs a stub.  */
+  if (spu_elf_section_data (sym_sec->output_section)->u.o.ovl_index
+       != spu_elf_section_data (input_section->output_section)->u.o.ovl_index)
+    {
+      unsigned int lrlive = 0;
+      if (branch)
+	lrlive = (contents[1] & 0x70) >> 4;
+
+      if (!lrlive && (call || sym_type == STT_FUNC))
+	ret = call_ovl_stub;
+      else
+	ret = br000_ovl_stub + lrlive;
+    }
+
+  /* If this insn isn't a branch then we are possibly taking the
+     address of a function and passing it out somehow.  Soft-icache code
+     always generates inline code to do indirect branches.  */
+  if (!(branch || hint)
+      && sym_type == STT_FUNC
+      && htab->params->ovly_flavour != ovly_soft_icache)
+    ret = nonovl_stub;
+
+  return ret;
+}
+
+static bfd_boolean
+count_stub (struct spu_link_hash_table *htab,
+	    bfd *ibfd,
+	    asection *isec,
+	    enum _stub_type stub_type,
+	    struct elf_link_hash_entry *h,
+	    const Elf_Internal_Rela *irela)
+{
+  unsigned int ovl = 0;
+  struct got_entry *g, **head;
+  bfd_vma addend;
+
+  /* If this instruction is a branch or call, we need a stub
+     for it.  One stub per function per overlay.
+     If it isn't a branch, then we are taking the address of
+     this function so need a stub in the non-overlay area
+     for it.  One stub per function.  */
+  if (stub_type != nonovl_stub)
+    ovl = spu_elf_section_data (isec->output_section)->u.o.ovl_index;
+
+  if (h != NULL)
+    head = &h->got.glist;
+  else
+    {
+      if (elf_local_got_ents (ibfd) == NULL)
+	{
+	  bfd_size_type amt = (elf_tdata (ibfd)->symtab_hdr.sh_info
+			       * sizeof (*elf_local_got_ents (ibfd)));
+	  elf_local_got_ents (ibfd) = bfd_zmalloc (amt);
+	  if (elf_local_got_ents (ibfd) == NULL)
+	    return FALSE;
+	}
+      head = elf_local_got_ents (ibfd) + ELF32_R_SYM (irela->r_info);
+    }
+
+  if (htab->params->ovly_flavour == ovly_soft_icache)
+    {
+      htab->stub_count[ovl] += 1;
+      return TRUE;
+    }
+
+  addend = 0;
+  if (irela != NULL)
+    addend = irela->r_addend;
+
+  if (ovl == 0)
+    {
+      struct got_entry *gnext;
+
+      for (g = *head; g != NULL; g = g->next)
+	if (g->addend == addend && g->ovl == 0)
+	  break;
+
+      if (g == NULL)
+	{
+	  /* Need a new non-overlay area stub.  Zap other stubs.  */
+	  for (g = *head; g != NULL; g = gnext)
+	    {
+	      gnext = g->next;
+	      if (g->addend == addend)
+		{
+		  htab->stub_count[g->ovl] -= 1;
+		  free (g);
+		}
+	    }
+	}
+    }
+  else
+    {
+      for (g = *head; g != NULL; g = g->next)
+	if (g->addend == addend && (g->ovl == ovl || g->ovl == 0))
+	  break;
+    }
+
+  if (g == NULL)
+    {
+      g = bfd_malloc (sizeof *g);
+      if (g == NULL)
+	return FALSE;
+      g->ovl = ovl;
+      g->addend = addend;
+      g->stub_addr = (bfd_vma) -1;
+      g->next = *head;
+      *head = g;
+
+      htab->stub_count[ovl] += 1;
+    }
+
+  return TRUE;
+}
+
+/* Support two sizes of overlay stubs, a slower more compact stub of two
+   intructions, and a faster stub of four instructions.
+   Soft-icache stubs are four or eight words.  */
+
+static unsigned int
+ovl_stub_size (struct spu_elf_params *params)
+{
+  return 16 << params->ovly_flavour >> params->compact_stub;
+}
+
+static unsigned int
+ovl_stub_size_log2 (struct spu_elf_params *params)
+{
+  return 4 + params->ovly_flavour - params->compact_stub;
+}
+
+/* Two instruction overlay stubs look like:
+
+   brsl $75,__ovly_load
+   .word target_ovl_and_address
+
+   ovl_and_address is a word with the overlay number in the top 14 bits
+   and local store address in the bottom 18 bits.
+
+   Four instruction overlay stubs look like:
+
+   ila $78,ovl_number
+   lnop
+   ila $79,target_address
+   br __ovly_load
+
+   Software icache stubs are:
+
+   .word target_index
+   .word target_ia;
+   .word lrlive_branchlocalstoreaddr;
+   brasl $75,__icache_br_handler
+   .quad xor_pattern
+*/
+
+static bfd_boolean
+build_stub (struct bfd_link_info *info,
+	    bfd *ibfd,
+	    asection *isec,
+	    enum _stub_type stub_type,
+	    struct elf_link_hash_entry *h,
+	    const Elf_Internal_Rela *irela,
+	    bfd_vma dest,
+	    asection *dest_sec)
+{
+  struct spu_link_hash_table *htab = spu_hash_table (info);
+  unsigned int ovl, dest_ovl, set_id;
+  struct got_entry *g, **head;
+  asection *sec;
+  bfd_vma addend, from, to, br_dest, patt;
+  unsigned int lrlive;
+
+  ovl = 0;
+  if (stub_type != nonovl_stub)
+    ovl = spu_elf_section_data (isec->output_section)->u.o.ovl_index;
+
+  if (h != NULL)
+    head = &h->got.glist;
+  else
+    head = elf_local_got_ents (ibfd) + ELF32_R_SYM (irela->r_info);
+
+  addend = 0;
+  if (irela != NULL)
+    addend = irela->r_addend;
+
+  if (htab->params->ovly_flavour == ovly_soft_icache)
+    {
+      g = bfd_malloc (sizeof *g);
+      if (g == NULL)
+	return FALSE;
+      g->ovl = ovl;
+      g->br_addr = 0;
+      if (irela != NULL)
+	g->br_addr = (irela->r_offset
+		      + isec->output_offset
+		      + isec->output_section->vma);
+      g->next = *head;
+      *head = g;
+    }
+  else
+    {
+      for (g = *head; g != NULL; g = g->next)
+	if (g->addend == addend && (g->ovl == ovl || g->ovl == 0))
+	  break;
+      if (g == NULL)
+	abort ();
+
+      if (g->ovl == 0 && ovl != 0)
+	return TRUE;
+
+      if (g->stub_addr != (bfd_vma) -1)
+	return TRUE;
+    }
+
+  sec = htab->stub_sec[ovl];
+  dest += dest_sec->output_offset + dest_sec->output_section->vma;
+  from = sec->size + sec->output_offset + sec->output_section->vma;
+  g->stub_addr = from;
+  to = (htab->ovly_entry[0]->root.u.def.value
+	+ htab->ovly_entry[0]->root.u.def.section->output_offset
+	+ htab->ovly_entry[0]->root.u.def.section->output_section->vma);
+
+  if (((dest | to | from) & 3) != 0)
+    {
+      htab->stub_err = 1;
+      return FALSE;
+    }
+  dest_ovl = spu_elf_section_data (dest_sec->output_section)->u.o.ovl_index;
+
+  if (htab->params->ovly_flavour == ovly_normal
+      && !htab->params->compact_stub)
+    {
+      bfd_put_32 (sec->owner, ILA + ((dest_ovl << 7) & 0x01ffff80) + 78,
+		  sec->contents + sec->size);
+      bfd_put_32 (sec->owner, LNOP,
+		  sec->contents + sec->size + 4);
+      bfd_put_32 (sec->owner, ILA + ((dest << 7) & 0x01ffff80) + 79,
+		  sec->contents + sec->size + 8);
+      if (!BRA_STUBS)
+	bfd_put_32 (sec->owner, BR + (((to - (from + 12)) << 5) & 0x007fff80),
+		    sec->contents + sec->size + 12);
+      else
+	bfd_put_32 (sec->owner, BRA + ((to << 5) & 0x007fff80),
+		    sec->contents + sec->size + 12);
+    }
+  else if (htab->params->ovly_flavour == ovly_normal
+	   && htab->params->compact_stub)
+    {
+      if (!BRA_STUBS)
+	bfd_put_32 (sec->owner, BRSL + (((to - from) << 5) & 0x007fff80) + 75,
+		    sec->contents + sec->size);
+      else
+	bfd_put_32 (sec->owner, BRASL + ((to << 5) & 0x007fff80) + 75,
+		    sec->contents + sec->size);
+      bfd_put_32 (sec->owner, (dest & 0x3ffff) | (dest_ovl << 18),
+		  sec->contents + sec->size + 4);
+    }
+  else if (htab->params->ovly_flavour == ovly_soft_icache
+	   && htab->params->compact_stub)
+    {
+      lrlive = 0;
+      if (stub_type == nonovl_stub)
+	;
+      else if (stub_type == call_ovl_stub)
+	/* A brsl makes lr live and *(*sp+16) is live.
+	   Tail calls have the same liveness.  */
+	lrlive = 5;
+      else if (!htab->params->lrlive_analysis)
+	/* Assume stack frame and lr save.  */
+	lrlive = 1;
+      else if (irela != NULL)
+	{
+	  /* Analyse branch instructions.  */
+	  struct function_info *caller;
+	  bfd_vma off;
+
+	  caller = find_function (isec, irela->r_offset, info);
+	  if (caller->start == NULL)
+	    off = irela->r_offset;
+	  else
+	    {
+	      struct function_info *found = NULL;
+
+	      /* Find the earliest piece of this function that
+		 has frame adjusting instructions.  We might
+		 see dynamic frame adjustment (eg. for alloca)
+		 in some later piece, but functions using
+		 alloca always set up a frame earlier.  Frame
+		 setup instructions are always in one piece.  */
+	      if (caller->lr_store != (bfd_vma) -1
+		  || caller->sp_adjust != (bfd_vma) -1)
+		found = caller;
+	      while (caller->start != NULL)
+		{
+		  caller = caller->start;
+		  if (caller->lr_store != (bfd_vma) -1
+		      || caller->sp_adjust != (bfd_vma) -1)
+		    found = caller;
+		}
+	      if (found != NULL)
+		caller = found;
+	      off = (bfd_vma) -1;
+	    }
+
+	  if (off > caller->sp_adjust)
+	    {
+	      if (off > caller->lr_store)
+		/* Only *(*sp+16) is live.  */
+		lrlive = 1;
+	      else
+		/* If no lr save, then we must be in a
+		   leaf function with a frame.
+		   lr is still live.  */
+		lrlive = 4;
+	    }
+	  else if (off > caller->lr_store)
+	    {
+	      /* Between lr save and stack adjust.  */
+	      lrlive = 3;
+	      /* This should never happen since prologues won't
+		 be split here.  */
+	      BFD_ASSERT (0);
+	    }
+	  else
+	    /* On entry to function.  */
+	    lrlive = 5;
+
+	  if (stub_type != br000_ovl_stub
+	      && lrlive != stub_type - br000_ovl_stub)
+	    info->callbacks->einfo (_("%A:0x%v lrlive .brinfo (%u) differs "
+				      "from analysis (%u)\n"),
+				    isec, irela->r_offset, lrlive,
+				    stub_type - br000_ovl_stub);
+	}
+
+      /* If given lrlive info via .brinfo, use it.  */
+      if (stub_type > br000_ovl_stub)
+	lrlive = stub_type - br000_ovl_stub;
+
+      if (ovl == 0)
+	to = (htab->ovly_entry[1]->root.u.def.value
+	      + htab->ovly_entry[1]->root.u.def.section->output_offset
+	      + htab->ovly_entry[1]->root.u.def.section->output_section->vma);
+
+      /* The branch that uses this stub goes to stub_addr + 4.  We'll
+	 set up an xor pattern that can be used by the icache manager
+	 to modify this branch to go directly to its destination.  */
+      g->stub_addr += 4;
+      br_dest = g->stub_addr;
+      if (irela == NULL)
+	{
+	  /* Except in the case of _SPUEAR_ stubs, the branch in
+	     question is the one in the stub itself.  */
+	  BFD_ASSERT (stub_type == nonovl_stub);
+	  g->br_addr = g->stub_addr;
+	  br_dest = to;
+	}
+
+      set_id = ((dest_ovl - 1) >> htab->num_lines_log2) + 1;
+      bfd_put_32 (sec->owner, (set_id << 18) | (dest & 0x3ffff),
+		  sec->contents + sec->size);
+      bfd_put_32 (sec->owner, BRASL + ((to << 5) & 0x007fff80) + 75,
+		  sec->contents + sec->size + 4);
+      bfd_put_32 (sec->owner, (lrlive << 29) | (g->br_addr & 0x3ffff),
+		  sec->contents + sec->size + 8);
+      patt = dest ^ br_dest;
+      if (irela != NULL && ELF32_R_TYPE (irela->r_info) == R_SPU_REL16)
+	patt = (dest - g->br_addr) ^ (br_dest - g->br_addr);
+      bfd_put_32 (sec->owner, (patt << 5) & 0x007fff80,
+		  sec->contents + sec->size + 12);
+
+      if (ovl == 0)
+	/* Extra space for linked list entries.  */
+	sec->size += 16;
+    }
+  else
+    abort ();
+
+  sec->size += ovl_stub_size (htab->params);
+
+  if (htab->params->emit_stub_syms)
+    {
+      size_t len;
+      char *name;
+      int add;
+
+      len = 8 + sizeof (".ovl_call.") - 1;
+      if (h != NULL)
+	len += strlen (h->root.root.string);
+      else
+	len += 8 + 1 + 8;
+      add = 0;
+      if (irela != NULL)
+	add = (int) irela->r_addend & 0xffffffff;
+      if (add != 0)
+	len += 1 + 8;
+      name = bfd_malloc (len);
+      if (name == NULL)
+	return FALSE;
+
+      sprintf (name, "%08x.ovl_call.", g->ovl);
+      if (h != NULL)
+	strcpy (name + 8 + sizeof (".ovl_call.") - 1, h->root.root.string);
+      else
+	sprintf (name + 8 + sizeof (".ovl_call.") - 1, "%x:%x",
+		 dest_sec->id & 0xffffffff,
+		 (int) ELF32_R_SYM (irela->r_info) & 0xffffffff);
+      if (add != 0)
+	sprintf (name + len - 9, "+%x", add);
+
+      h = elf_link_hash_lookup (&htab->elf, name, TRUE, TRUE, FALSE);
+      free (name);
+      if (h == NULL)
+	return FALSE;
+      if (h->root.type == bfd_link_hash_new)
+	{
+	  h->root.type = bfd_link_hash_defined;
+	  h->root.u.def.section = sec;
+	  h->size = ovl_stub_size (htab->params);
+	  h->root.u.def.value = sec->size - h->size;
+	  h->type = STT_FUNC;
+	  h->ref_regular = 1;
+	  h->def_regular = 1;
+	  h->ref_regular_nonweak = 1;
+	  h->forced_local = 1;
+	  h->non_elf = 0;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Called via elf_link_hash_traverse to allocate stubs for any _SPUEAR_
+   symbols.  */
+
+static bfd_boolean
+allocate_spuear_stubs (struct elf_link_hash_entry *h, void *inf)
+{
+  /* Symbols starting with _SPUEAR_ need a stub because they may be
+     invoked by the PPU.  */
+  struct bfd_link_info *info = inf;
+  struct spu_link_hash_table *htab = spu_hash_table (info);
+  asection *sym_sec;
+
+  if ((h->root.type == bfd_link_hash_defined
+       || h->root.type == bfd_link_hash_defweak)
+      && h->def_regular
+      && strncmp (h->root.root.string, "_SPUEAR_", 8) == 0
+      && (sym_sec = h->root.u.def.section) != NULL
+      && sym_sec->output_section != bfd_abs_section_ptr
+      && spu_elf_section_data (sym_sec->output_section) != NULL
+      && (spu_elf_section_data (sym_sec->output_section)->u.o.ovl_index != 0
+	  || htab->params->non_overlay_stubs))
+    {
+      return count_stub (htab, NULL, NULL, nonovl_stub, h, NULL);
+    }
+  
+  return TRUE;
+}
+
+static bfd_boolean
+build_spuear_stubs (struct elf_link_hash_entry *h, void *inf)
+{
+  /* Symbols starting with _SPUEAR_ need a stub because they may be
+     invoked by the PPU.  */
+  struct bfd_link_info *info = inf;
+  struct spu_link_hash_table *htab = spu_hash_table (info);
+  asection *sym_sec;
+
+  if ((h->root.type == bfd_link_hash_defined
+       || h->root.type == bfd_link_hash_defweak)
+      && h->def_regular
+      && strncmp (h->root.root.string, "_SPUEAR_", 8) == 0
+      && (sym_sec = h->root.u.def.section) != NULL
+      && sym_sec->output_section != bfd_abs_section_ptr
+      && spu_elf_section_data (sym_sec->output_section) != NULL
+      && (spu_elf_section_data (sym_sec->output_section)->u.o.ovl_index != 0
+	  || htab->params->non_overlay_stubs))
+    {
+      return build_stub (info, NULL, NULL, nonovl_stub, h, NULL,
+			 h->root.u.def.value, sym_sec);
+    }
+  
+  return TRUE;
+}
+
+/* Size or build stubs.  */
+
+static bfd_boolean
+process_stubs (struct bfd_link_info *info, bfd_boolean build)
+{
+  struct spu_link_hash_table *htab = spu_hash_table (info);
+  bfd *ibfd;
+
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      extern const bfd_target bfd_elf32_spu_vec;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *isec;
+      Elf_Internal_Sym *local_syms = NULL;
+
+      if (ibfd->xvec != &bfd_elf32_spu_vec)
+	continue;
+
+      /* We'll need the symbol table in a second.  */
+      symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+      if (symtab_hdr->sh_info == 0)
+	continue;
+
+      /* Walk over each section attached to the input bfd.  */
+      for (isec = ibfd->sections; isec != NULL; isec = isec->next)
+	{
+	  Elf_Internal_Rela *internal_relocs, *irelaend, *irela;
+
+	  /* If there aren't any relocs, then there's nothing more to do.  */
+	  if ((isec->flags & SEC_RELOC) == 0
+	      || isec->reloc_count == 0)
+	    continue;
+
+	  if (!maybe_needs_stubs (isec))
+	    continue;
+
+	  /* Get the relocs.  */
+	  internal_relocs = _bfd_elf_link_read_relocs (ibfd, isec, NULL, NULL,
+						       info->keep_memory);
+	  if (internal_relocs == NULL)
+	    goto error_ret_free_local;
+
+	  /* Now examine each relocation.  */
+	  irela = internal_relocs;
+	  irelaend = irela + isec->reloc_count;
+	  for (; irela < irelaend; irela++)
+	    {
+	      enum elf_spu_reloc_type r_type;
+	      unsigned int r_indx;
+	      asection *sym_sec;
+	      Elf_Internal_Sym *sym;
+	      struct elf_link_hash_entry *h;
+	      enum _stub_type stub_type;
+
+	      r_type = ELF32_R_TYPE (irela->r_info);
+	      r_indx = ELF32_R_SYM (irela->r_info);
+
+	      if (r_type >= R_SPU_max)
+		{
+		  bfd_set_error (bfd_error_bad_value);
+		error_ret_free_internal:
+		  if (elf_section_data (isec)->relocs != internal_relocs)
+		    free (internal_relocs);
+		error_ret_free_local:
+		  if (local_syms != NULL
+		      && (symtab_hdr->contents
+			  != (unsigned char *) local_syms))
+		    free (local_syms);
+		  return FALSE;
+		}
+
+	      /* Determine the reloc target section.  */
+	      if (!get_sym_h (&h, &sym, &sym_sec, &local_syms, r_indx, ibfd))
+		goto error_ret_free_internal;
+
+	      stub_type = needs_ovl_stub (h, sym, sym_sec, isec, irela,
+					  NULL, info);
+	      if (stub_type == no_stub)
+		continue;
+	      else if (stub_type == stub_error)
+		goto error_ret_free_internal;
+
+	      if (htab->stub_count == NULL)
+		{
+		  bfd_size_type amt;
+		  amt = (htab->num_overlays + 1) * sizeof (*htab->stub_count);
+		  htab->stub_count = bfd_zmalloc (amt);
+		  if (htab->stub_count == NULL)
+		    goto error_ret_free_internal;
+		}
+
+	      if (!build)
+		{
+		  if (!count_stub (htab, ibfd, isec, stub_type, h, irela))
+		    goto error_ret_free_internal;
+		}
+	      else
+		{
+		  bfd_vma dest;
+
+		  if (h != NULL)
+		    dest = h->root.u.def.value;
+		  else
+		    dest = sym->st_value;
+		  dest += irela->r_addend;
+		  if (!build_stub (info, ibfd, isec, stub_type, h, irela,
+				   dest, sym_sec))
+		    goto error_ret_free_internal;
+		}
+	    }
+
+	  /* We're done with the internal relocs, free them.  */
+	  if (elf_section_data (isec)->relocs != internal_relocs)
+	    free (internal_relocs);
+	}
+
+      if (local_syms != NULL
+	  && symtab_hdr->contents != (unsigned char *) local_syms)
+	{
+	  if (!info->keep_memory)
+	    free (local_syms);
+	  else
+	    symtab_hdr->contents = (unsigned char *) local_syms;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Allocate space for overlay call and return stubs.
+   Return 0 on error, 1 if no overlays, 2 otherwise.  */
+
+int
+spu_elf_size_stubs (struct bfd_link_info *info)
+{
+  struct spu_link_hash_table *htab;
+  bfd *ibfd;
+  bfd_size_type amt;
+  flagword flags;
+  unsigned int i;
+  asection *stub;
+
+  if (!process_stubs (info, FALSE))
+    return 0;
+
+  htab = spu_hash_table (info);
+  elf_link_hash_traverse (&htab->elf, allocate_spuear_stubs, info);
+  if (htab->stub_err)
+    return 0;
+
+  ibfd = info->input_bfds;
+  if (htab->stub_count != NULL)
+    {
+      amt = (htab->num_overlays + 1) * sizeof (*htab->stub_sec);
+      htab->stub_sec = bfd_zmalloc (amt);
+      if (htab->stub_sec == NULL)
+	return 0;
+
+      flags = (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_READONLY
+	       | SEC_HAS_CONTENTS | SEC_IN_MEMORY);
+      stub = bfd_make_section_anyway_with_flags (ibfd, ".stub", flags);
+      htab->stub_sec[0] = stub;
+      if (stub == NULL
+	  || !bfd_set_section_alignment (ibfd, stub,
+					 ovl_stub_size_log2 (htab->params)))
+	return 0;
+      stub->size = htab->stub_count[0] * ovl_stub_size (htab->params);
+      if (htab->params->ovly_flavour == ovly_soft_icache)
+	/* Extra space for linked list entries.  */
+	stub->size += htab->stub_count[0] * 16;
+
+      for (i = 0; i < htab->num_overlays; ++i)
+	{
+	  asection *osec = htab->ovl_sec[i];
+	  unsigned int ovl = spu_elf_section_data (osec)->u.o.ovl_index;
+	  stub = bfd_make_section_anyway_with_flags (ibfd, ".stub", flags);
+	  htab->stub_sec[ovl] = stub;
+	  if (stub == NULL
+	      || !bfd_set_section_alignment (ibfd, stub,
+					     ovl_stub_size_log2 (htab->params)))
+	    return 0;
+	  stub->size = htab->stub_count[ovl] * ovl_stub_size (htab->params);
+	}
+    }
+
+  if (htab->params->ovly_flavour == ovly_soft_icache)
+    {
+      /* Space for icache manager tables.
+	 a) Tag array, one quadword per cache line.
+	 b) Rewrite "to" list, one quadword per cache line.
+	 c) Rewrite "from" list, one byte per outgoing branch (rounded up to
+	    a power-of-two number of full quadwords) per cache line.  */
+
+      flags = SEC_ALLOC;
+      htab->ovtab = bfd_make_section_anyway_with_flags (ibfd, ".ovtab", flags);
+      if (htab->ovtab == NULL
+	  || !bfd_set_section_alignment (ibfd, htab->ovtab, 4))
+	return 0;
+
+      htab->ovtab->size = (16 + 16 + (16 << htab->fromelem_size_log2))
+			  << htab->num_lines_log2;
+
+      flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY;
+      htab->init = bfd_make_section_anyway_with_flags (ibfd, ".ovini", flags);
+      if (htab->init == NULL
+	  || !bfd_set_section_alignment (ibfd, htab->init, 4))
+	return 0;
+
+      htab->init->size = 16;
+    }
+  else if (htab->stub_count == NULL)
+    return 1;
+  else
+    {
+      /* htab->ovtab consists of two arrays.
+	 .	struct {
+	 .	  u32 vma;
+	 .	  u32 size;
+	 .	  u32 file_off;
+	 .	  u32 buf;
+	 .	} _ovly_table[];
+	 .
+	 .	struct {
+	 .	  u32 mapped;
+	 .	} _ovly_buf_table[];
+	 .  */
+
+      flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY;
+      htab->ovtab = bfd_make_section_anyway_with_flags (ibfd, ".ovtab", flags);
+      if (htab->ovtab == NULL
+	  || !bfd_set_section_alignment (ibfd, htab->ovtab, 4))
+	return 0;
+
+      htab->ovtab->size = htab->num_overlays * 16 + 16 + htab->num_buf * 4;
+    }
+
+  htab->toe = bfd_make_section_anyway_with_flags (ibfd, ".toe", SEC_ALLOC);
+  if (htab->toe == NULL
+      || !bfd_set_section_alignment (ibfd, htab->toe, 4))
+    return 0;
+  htab->toe->size = 16;
+
+  return 2;
+}
+
+/* Called from ld to place overlay manager data sections.  This is done
+   after the overlay manager itself is loaded, mainly so that the
+   linker's htab->init section is placed after any other .ovl.init
+   sections.  */
+
+void
+spu_elf_place_overlay_data (struct bfd_link_info *info)
+{
+  struct spu_link_hash_table *htab = spu_hash_table (info);
+  unsigned int i;
+
+  if (htab->stub_sec != NULL)
+    {
+      (*htab->params->place_spu_section) (htab->stub_sec[0], NULL, ".text");
+
+      for (i = 0; i < htab->num_overlays; ++i)
+	{
+	  asection *osec = htab->ovl_sec[i];
+	  unsigned int ovl = spu_elf_section_data (osec)->u.o.ovl_index;
+	  (*htab->params->place_spu_section) (htab->stub_sec[ovl], osec, NULL);
+	}
+    }
+
+  if (htab->params->ovly_flavour == ovly_soft_icache)
+    (*htab->params->place_spu_section) (htab->init, NULL, ".ovl.init");
+
+  if (htab->ovtab != NULL)
+    {
+      const char *ovout = ".data";
+      if (htab->params->ovly_flavour == ovly_soft_icache)
+	ovout = ".bss";
+      (*htab->params->place_spu_section) (htab->ovtab, NULL, ovout);
+    }
+
+  if (htab->toe != NULL)
+    (*htab->params->place_spu_section) (htab->toe, NULL, ".toe");
+}
+
+/* Functions to handle embedded spu_ovl.o object.  */
+
+static void *
+ovl_mgr_open (struct bfd *nbfd ATTRIBUTE_UNUSED, void *stream)
+{
+  return stream;
+}
+
+static file_ptr
+ovl_mgr_pread (struct bfd *abfd ATTRIBUTE_UNUSED,
+	       void *stream,
+	       void *buf,
+	       file_ptr nbytes,
+	       file_ptr offset)
+{
+  struct _ovl_stream *os;
+  size_t count;
+  size_t max;
+
+  os = (struct _ovl_stream *) stream;
+  max = (const char *) os->end - (const char *) os->start;
+
+  if ((ufile_ptr) offset >= max)
+    return 0;
+
+  count = nbytes;
+  if (count > max - offset)
+    count = max - offset;
+
+  memcpy (buf, (const char *) os->start + offset, count);
+  return count;
+}
+
+bfd_boolean
+spu_elf_open_builtin_lib (bfd **ovl_bfd, const struct _ovl_stream *stream)
+{
+  *ovl_bfd = bfd_openr_iovec ("builtin ovl_mgr",
+			      "elf32-spu",
+			      ovl_mgr_open,
+			      (void *) stream,
+			      ovl_mgr_pread,
+			      NULL,
+			      NULL);
+  return *ovl_bfd != NULL;
+}
+
+static unsigned int
+overlay_index (asection *sec)
+{
+  if (sec == NULL
+      || sec->output_section == bfd_abs_section_ptr)
+    return 0;
+  return spu_elf_section_data (sec->output_section)->u.o.ovl_index;
+}
+
+/* Define an STT_OBJECT symbol.  */
+
+static struct elf_link_hash_entry *
+define_ovtab_symbol (struct spu_link_hash_table *htab, const char *name)
+{
+  struct elf_link_hash_entry *h;
+
+  h = elf_link_hash_lookup (&htab->elf, name, TRUE, FALSE, FALSE);
+  if (h == NULL)
+    return NULL;
+
+  if (h->root.type != bfd_link_hash_defined
+      || !h->def_regular)
+    {
+      h->root.type = bfd_link_hash_defined;
+      h->root.u.def.section = htab->ovtab;
+      h->type = STT_OBJECT;
+      h->ref_regular = 1;
+      h->def_regular = 1;
+      h->ref_regular_nonweak = 1;
+      h->non_elf = 0;
+    }
+  else if (h->root.u.def.section->owner != NULL)
+    {
+      (*_bfd_error_handler) (_("%B is not allowed to define %s"),
+			     h->root.u.def.section->owner,
+			     h->root.root.string);
+      bfd_set_error (bfd_error_bad_value);
+      return NULL;
+    }
+  else
+    {
+      (*_bfd_error_handler) (_("you are not allowed to define %s in a script"),
+			     h->root.root.string);
+      bfd_set_error (bfd_error_bad_value);
+      return NULL;
+    }
+
+  return h;
+}
+
+/* Fill in all stubs and the overlay tables.  */
+
+static bfd_boolean
+spu_elf_build_stubs (struct bfd_link_info *info)
+{
+  struct spu_link_hash_table *htab = spu_hash_table (info);
+  struct elf_link_hash_entry *h;
+  bfd_byte *p;
+  asection *s;
+  bfd *obfd;
+  unsigned int i;
+
+  if (htab->num_overlays != 0)
+    {
+      for (i = 0; i < 2; i++)
+	{
+	  h = htab->ovly_entry[i];
+	  if (h != NULL
+	      && (h->root.type == bfd_link_hash_defined
+		  || h->root.type == bfd_link_hash_defweak)
+	      && h->def_regular)
+	    {
+	      s = h->root.u.def.section->output_section;
+	      if (spu_elf_section_data (s)->u.o.ovl_index)
+		{
+		  (*_bfd_error_handler) (_("%s in overlay section"),
+					 h->root.root.string);
+		  bfd_set_error (bfd_error_bad_value);
+		  return FALSE;
+		}
+	    }
+	}
+    }
+
+  if (htab->stub_sec != NULL)
+    {
+      for (i = 0; i <= htab->num_overlays; i++)
+	if (htab->stub_sec[i]->size != 0)
+	  {
+	    htab->stub_sec[i]->contents = bfd_zalloc (htab->stub_sec[i]->owner,
+						      htab->stub_sec[i]->size);
+	    if (htab->stub_sec[i]->contents == NULL)
+	      return FALSE;
+	    htab->stub_sec[i]->rawsize = htab->stub_sec[i]->size;
+	    htab->stub_sec[i]->size = 0;
+	  }
+
+      /* Fill in all the stubs.  */
+      process_stubs (info, TRUE);
+      if (!htab->stub_err)
+	elf_link_hash_traverse (&htab->elf, build_spuear_stubs, info);
+
+      if (htab->stub_err)
+	{
+	  (*_bfd_error_handler) (_("overlay stub relocation overflow"));
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      for (i = 0; i <= htab->num_overlays; i++)
+	{
+	  if (htab->stub_sec[i]->size != htab->stub_sec[i]->rawsize)
+	    {
+	      (*_bfd_error_handler)  (_("stubs don't match calculated size"));
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	  htab->stub_sec[i]->rawsize = 0;
+	}
+    }
+
+  if (htab->ovtab == NULL || htab->ovtab->size == 0)
+    return TRUE;
+
+  htab->ovtab->contents = bfd_zalloc (htab->ovtab->owner, htab->ovtab->size);
+  if (htab->ovtab->contents == NULL)
+    return FALSE;
+
+  p = htab->ovtab->contents;
+  if (htab->params->ovly_flavour == ovly_soft_icache)
+    {
+      bfd_vma off;
+
+      h = define_ovtab_symbol (htab, "__icache_tag_array");
+      if (h == NULL)
+	return FALSE;
+      h->root.u.def.value = 0;
+      h->size = 16 << htab->num_lines_log2;
+      off = h->size;
+
+      h = define_ovtab_symbol (htab, "__icache_tag_array_size");
+      if (h == NULL)
+	return FALSE;
+      h->root.u.def.value = 16 << htab->num_lines_log2;
+      h->root.u.def.section = bfd_abs_section_ptr;
+
+      h = define_ovtab_symbol (htab, "__icache_rewrite_to");
+      if (h == NULL)
+	return FALSE;
+      h->root.u.def.value = off;
+      h->size = 16 << htab->num_lines_log2;
+      off += h->size;
+
+      h = define_ovtab_symbol (htab, "__icache_rewrite_to_size");
+      if (h == NULL)
+	return FALSE;
+      h->root.u.def.value = 16 << htab->num_lines_log2;
+      h->root.u.def.section = bfd_abs_section_ptr;
+
+      h = define_ovtab_symbol (htab, "__icache_rewrite_from");
+      if (h == NULL)
+	return FALSE;
+      h->root.u.def.value = off;
+      h->size = 16 << (htab->fromelem_size_log2 + htab->num_lines_log2);
+      off += h->size;
+
+      h = define_ovtab_symbol (htab, "__icache_rewrite_from_size");
+      if (h == NULL)
+	return FALSE;
+      h->root.u.def.value = 16 << (htab->fromelem_size_log2
+				   + htab->num_lines_log2);
+      h->root.u.def.section = bfd_abs_section_ptr;
+
+      h = define_ovtab_symbol (htab, "__icache_log2_fromelemsize");
+      if (h == NULL)
+	return FALSE;
+      h->root.u.def.value = htab->fromelem_size_log2;
+      h->root.u.def.section = bfd_abs_section_ptr;
+
+      h = define_ovtab_symbol (htab, "__icache_base");
+      if (h == NULL)
+	return FALSE;
+      h->root.u.def.value = htab->ovl_sec[0]->vma;
+      h->root.u.def.section = bfd_abs_section_ptr;
+      h->size = htab->num_buf << htab->line_size_log2;
+
+      h = define_ovtab_symbol (htab, "__icache_linesize");
+      if (h == NULL)
+	return FALSE;
+      h->root.u.def.value = 1 << htab->line_size_log2;
+      h->root.u.def.section = bfd_abs_section_ptr;
+
+      h = define_ovtab_symbol (htab, "__icache_log2_linesize");
+      if (h == NULL)
+	return FALSE;
+      h->root.u.def.value = htab->line_size_log2;
+      h->root.u.def.section = bfd_abs_section_ptr;
+
+      h = define_ovtab_symbol (htab, "__icache_neg_log2_linesize");
+      if (h == NULL)
+	return FALSE;
+      h->root.u.def.value = -htab->line_size_log2;
+      h->root.u.def.section = bfd_abs_section_ptr;
+
+      h = define_ovtab_symbol (htab, "__icache_cachesize");
+      if (h == NULL)
+	return FALSE;
+      h->root.u.def.value = 1 << (htab->num_lines_log2 + htab->line_size_log2);
+      h->root.u.def.section = bfd_abs_section_ptr;
+
+      h = define_ovtab_symbol (htab, "__icache_log2_cachesize");
+      if (h == NULL)
+	return FALSE;
+      h->root.u.def.value = htab->num_lines_log2 + htab->line_size_log2;
+      h->root.u.def.section = bfd_abs_section_ptr;
+
+      h = define_ovtab_symbol (htab, "__icache_neg_log2_cachesize");
+      if (h == NULL)
+	return FALSE;
+      h->root.u.def.value = -(htab->num_lines_log2 + htab->line_size_log2);
+      h->root.u.def.section = bfd_abs_section_ptr;
+
+      if (htab->init != NULL && htab->init->size != 0)
+	{
+	  htab->init->contents = bfd_zalloc (htab->init->owner,
+					     htab->init->size);
+	  if (htab->init->contents == NULL)
+	    return FALSE;
+
+	  h = define_ovtab_symbol (htab, "__icache_fileoff");
+	  if (h == NULL)
+	    return FALSE;
+	  h->root.u.def.value = 0;
+	  h->root.u.def.section = htab->init;
+	  h->size = 8;
+	}
+    }
+  else
+    {
+      /* Write out _ovly_table.  */
+      /* set low bit of .size to mark non-overlay area as present.  */
+      p[7] = 1;
+      obfd = htab->ovtab->output_section->owner;
+      for (s = obfd->sections; s != NULL; s = s->next)
+	{
+	  unsigned int ovl_index = spu_elf_section_data (s)->u.o.ovl_index;
+
+	  if (ovl_index != 0)
+	    {
+	      unsigned long off = ovl_index * 16;
+	      unsigned int ovl_buf = spu_elf_section_data (s)->u.o.ovl_buf;
+
+	      bfd_put_32 (htab->ovtab->owner, s->vma, p + off);
+	      bfd_put_32 (htab->ovtab->owner, (s->size + 15) & -16,
+			  p + off + 4);
+	      /* file_off written later in spu_elf_modify_program_headers.  */
+	      bfd_put_32 (htab->ovtab->owner, ovl_buf, p + off + 12);
+	    }
+	}
+
+      h = define_ovtab_symbol (htab, "_ovly_table");
+      if (h == NULL)
+	return FALSE;
+      h->root.u.def.value = 16;
+      h->size = htab->num_overlays * 16;
+
+      h = define_ovtab_symbol (htab, "_ovly_table_end");
+      if (h == NULL)
+	return FALSE;
+      h->root.u.def.value = htab->num_overlays * 16 + 16;
+      h->size = 0;
+
+      h = define_ovtab_symbol (htab, "_ovly_buf_table");
+      if (h == NULL)
+	return FALSE;
+      h->root.u.def.value = htab->num_overlays * 16 + 16;
+      h->size = htab->num_buf * 4;
+
+      h = define_ovtab_symbol (htab, "_ovly_buf_table_end");
+      if (h == NULL)
+	return FALSE;
+      h->root.u.def.value = htab->num_overlays * 16 + 16 + htab->num_buf * 4;
+      h->size = 0;
+    }
+
+  h = define_ovtab_symbol (htab, "_EAR_");
+  if (h == NULL)
+    return FALSE;
+  h->root.u.def.section = htab->toe;
+  h->root.u.def.value = 0;
+  h->size = 16;
+
+  return TRUE;
+}
+
+/* Check that all loadable section VMAs lie in the range
+   LO .. HI inclusive, and stash some parameters for --auto-overlay.  */
+
+asection *
+spu_elf_check_vma (struct bfd_link_info *info)
+{
+  struct elf_segment_map *m;
+  unsigned int i;
+  struct spu_link_hash_table *htab = spu_hash_table (info);
+  bfd *abfd = info->output_bfd;
+  bfd_vma hi = htab->params->local_store_hi;
+  bfd_vma lo = htab->params->local_store_lo;
+
+  htab->local_store = hi + 1 - lo;
+
+  for (m = elf_tdata (abfd)->segment_map; m != NULL; m = m->next)
+    if (m->p_type == PT_LOAD)
+      for (i = 0; i < m->count; i++)
+	if (m->sections[i]->size != 0
+	    && (m->sections[i]->vma < lo
+		|| m->sections[i]->vma > hi
+		|| m->sections[i]->vma + m->sections[i]->size - 1 > hi))
+	  return m->sections[i];
+
+  return NULL;
+}
+
+/* OFFSET in SEC (presumably) is the beginning of a function prologue.
+   Search for stack adjusting insns, and return the sp delta.
+   If a store of lr is found save the instruction offset to *LR_STORE.
+   If a stack adjusting instruction is found, save that offset to
+   *SP_ADJUST.  */
+
+static int
+find_function_stack_adjust (asection *sec,
+			    bfd_vma offset,
+			    bfd_vma *lr_store,
+			    bfd_vma *sp_adjust)
+{
+  int reg[128];
+
+  memset (reg, 0, sizeof (reg));
+  for ( ; offset + 4 <= sec->size; offset += 4)
+    {
+      unsigned char buf[4];
+      int rt, ra;
+      int imm;
+
+      /* Assume no relocs on stack adjusing insns.  */
+      if (!bfd_get_section_contents (sec->owner, sec, buf, offset, 4))
+	break;
+
+      rt = buf[3] & 0x7f;
+      ra = ((buf[2] & 0x3f) << 1) | (buf[3] >> 7);
+
+      if (buf[0] == 0x24 /* stqd */)
+	{
+	  if (rt == 0 /* lr */ && ra == 1 /* sp */)
+	    *lr_store = offset;
+	  continue;
+	}
+
+      /* Partly decoded immediate field.  */
+      imm = (buf[1] << 9) | (buf[2] << 1) | (buf[3] >> 7);
+
+      if (buf[0] == 0x1c /* ai */)
+	{
+	  imm >>= 7;
+	  imm = (imm ^ 0x200) - 0x200;
+	  reg[rt] = reg[ra] + imm;
+
+	  if (rt == 1 /* sp */)
+	    {
+	      if (reg[rt] > 0)
+		break;
+	      *sp_adjust = offset;
+	      return reg[rt];
+	    }
+	}
+      else if (buf[0] == 0x18 && (buf[1] & 0xe0) == 0 /* a */)
+	{
+	  int rb = ((buf[1] & 0x1f) << 2) | ((buf[2] & 0xc0) >> 6);
+
+	  reg[rt] = reg[ra] + reg[rb];
+	  if (rt == 1)
+	    {
+	      if (reg[rt] > 0)
+		break;
+	      *sp_adjust = offset;
+	      return reg[rt];
+	    }
+	}
+      else if (buf[0] == 0x08 && (buf[1] & 0xe0) == 0 /* sf */)
+	{
+	  int rb = ((buf[1] & 0x1f) << 2) | ((buf[2] & 0xc0) >> 6);
+
+	  reg[rt] = reg[rb] - reg[ra];
+	  if (rt == 1)
+	    {
+	      if (reg[rt] > 0)
+		break;
+	      *sp_adjust = offset;
+	      return reg[rt];
+	    }
+	}
+      else if ((buf[0] & 0xfc) == 0x40 /* il, ilh, ilhu, ila */)
+	{
+	  if (buf[0] >= 0x42 /* ila */)
+	    imm |= (buf[0] & 1) << 17;
+	  else
+	    {
+	      imm &= 0xffff;
+
+	      if (buf[0] == 0x40 /* il */)
+		{
+		  if ((buf[1] & 0x80) == 0)
+		    continue;
+		  imm = (imm ^ 0x8000) - 0x8000;
+		}
+	      else if ((buf[1] & 0x80) == 0 /* ilhu */)
+		imm <<= 16;
+	    }
+	  reg[rt] = imm;
+	  continue;
+	}
+      else if (buf[0] == 0x60 && (buf[1] & 0x80) != 0 /* iohl */)
+	{
+	  reg[rt] |= imm & 0xffff;
+	  continue;
+	}
+      else if (buf[0] == 0x04 /* ori */)
+	{
+	  imm >>= 7;
+	  imm = (imm ^ 0x200) - 0x200;
+	  reg[rt] = reg[ra] | imm;
+	  continue;
+	}
+      else if (buf[0] == 0x32 && (buf[1] & 0x80) != 0 /* fsmbi */)
+	{
+	  reg[rt] = (  ((imm & 0x8000) ? 0xff000000 : 0)
+		     | ((imm & 0x4000) ? 0x00ff0000 : 0)
+		     | ((imm & 0x2000) ? 0x0000ff00 : 0)
+		     | ((imm & 0x1000) ? 0x000000ff : 0));
+	  continue;
+	}
+      else if (buf[0] == 0x16 /* andbi */)
+	{
+	  imm >>= 7;
+	  imm &= 0xff;
+	  imm |= imm << 8;
+	  imm |= imm << 16;
+	  reg[rt] = reg[ra] & imm;
+	  continue;
+	}
+      else if (buf[0] == 0x33 && imm == 1 /* brsl .+4 */)
+	{
+	  /* Used in pic reg load.  Say rt is trashed.  Won't be used
+	     in stack adjust, but we need to continue past this branch.  */
+	  reg[rt] = 0;
+	  continue;
+	}
+      else if (is_branch (buf) || is_indirect_branch (buf))
+	/* If we hit a branch then we must be out of the prologue.  */
+	break;
+    }
+
+  return 0;
+}
+
+/* qsort predicate to sort symbols by section and value.  */
+
+static Elf_Internal_Sym *sort_syms_syms;
+static asection **sort_syms_psecs;
+
+static int
+sort_syms (const void *a, const void *b)
+{
+  Elf_Internal_Sym *const *s1 = a;
+  Elf_Internal_Sym *const *s2 = b;
+  asection *sec1,*sec2;
+  bfd_signed_vma delta;
+
+  sec1 = sort_syms_psecs[*s1 - sort_syms_syms];
+  sec2 = sort_syms_psecs[*s2 - sort_syms_syms];
+
+  if (sec1 != sec2)
+    return sec1->index - sec2->index;
+
+  delta = (*s1)->st_value - (*s2)->st_value;
+  if (delta != 0)
+    return delta < 0 ? -1 : 1;
+
+  delta = (*s2)->st_size - (*s1)->st_size;
+  if (delta != 0)
+    return delta < 0 ? -1 : 1;
+
+  return *s1 < *s2 ? -1 : 1;
+}
+
+/* Allocate a struct spu_elf_stack_info with MAX_FUN struct function_info
+   entries for section SEC.  */
+
+static struct spu_elf_stack_info *
+alloc_stack_info (asection *sec, int max_fun)
+{
+  struct _spu_elf_section_data *sec_data = spu_elf_section_data (sec);
+  bfd_size_type amt;
+
+  amt = sizeof (struct spu_elf_stack_info);
+  amt += (max_fun - 1) * sizeof (struct function_info);
+  sec_data->u.i.stack_info = bfd_zmalloc (amt);
+  if (sec_data->u.i.stack_info != NULL)
+    sec_data->u.i.stack_info->max_fun = max_fun;
+  return sec_data->u.i.stack_info;
+}
+
+/* Add a new struct function_info describing a (part of a) function
+   starting at SYM_H.  Keep the array sorted by address.  */
+
+static struct function_info *
+maybe_insert_function (asection *sec,
+		       void *sym_h,
+		       bfd_boolean global,
+		       bfd_boolean is_func)
+{
+  struct _spu_elf_section_data *sec_data = spu_elf_section_data (sec);
+  struct spu_elf_stack_info *sinfo = sec_data->u.i.stack_info;
+  int i;
+  bfd_vma off, size;
+
+  if (sinfo == NULL)
+    {
+      sinfo = alloc_stack_info (sec, 20);
+      if (sinfo == NULL)
+	return NULL;
+    }
+
+  if (!global)
+    {
+      Elf_Internal_Sym *sym = sym_h;
+      off = sym->st_value;
+      size = sym->st_size;
+    }
+  else
+    {
+      struct elf_link_hash_entry *h = sym_h;
+      off = h->root.u.def.value;
+      size = h->size;
+    }
+
+  for (i = sinfo->num_fun; --i >= 0; )
+    if (sinfo->fun[i].lo <= off)
+      break;
+
+  if (i >= 0)
+    {
+      /* Don't add another entry for an alias, but do update some
+	 info.  */
+      if (sinfo->fun[i].lo == off)
+	{
+	  /* Prefer globals over local syms.  */
+	  if (global && !sinfo->fun[i].global)
+	    {
+	      sinfo->fun[i].global = TRUE;
+	      sinfo->fun[i].u.h = sym_h;
+	    }
+	  if (is_func)
+	    sinfo->fun[i].is_func = TRUE;
+	  return &sinfo->fun[i];
+	}
+      /* Ignore a zero-size symbol inside an existing function.  */
+      else if (sinfo->fun[i].hi > off && size == 0)
+	return &sinfo->fun[i];
+    }
+
+  if (sinfo->num_fun >= sinfo->max_fun)
+    {
+      bfd_size_type amt = sizeof (struct spu_elf_stack_info);
+      bfd_size_type old = amt;
+
+      old += (sinfo->max_fun - 1) * sizeof (struct function_info);
+      sinfo->max_fun += 20 + (sinfo->max_fun >> 1);
+      amt += (sinfo->max_fun - 1) * sizeof (struct function_info);
+      sinfo = bfd_realloc (sinfo, amt);
+      if (sinfo == NULL)
+	return NULL;
+      memset ((char *) sinfo + old, 0, amt - old);
+      sec_data->u.i.stack_info = sinfo;
+    }
+
+  if (++i < sinfo->num_fun)
+    memmove (&sinfo->fun[i + 1], &sinfo->fun[i],
+	     (sinfo->num_fun - i) * sizeof (sinfo->fun[i]));
+  sinfo->fun[i].is_func = is_func;
+  sinfo->fun[i].global = global;
+  sinfo->fun[i].sec = sec;
+  if (global)
+    sinfo->fun[i].u.h = sym_h;
+  else
+    sinfo->fun[i].u.sym = sym_h;
+  sinfo->fun[i].lo = off;
+  sinfo->fun[i].hi = off + size;
+  sinfo->fun[i].lr_store = -1;
+  sinfo->fun[i].sp_adjust = -1;
+  sinfo->fun[i].stack = -find_function_stack_adjust (sec, off,
+						     &sinfo->fun[i].lr_store,
+						     &sinfo->fun[i].sp_adjust);
+  sinfo->num_fun += 1;
+  return &sinfo->fun[i];
+}
+
+/* Return the name of FUN.  */
+
+static const char *
+func_name (struct function_info *fun)
+{
+  asection *sec;
+  bfd *ibfd;
+  Elf_Internal_Shdr *symtab_hdr;
+
+  while (fun->start != NULL)
+    fun = fun->start;
+
+  if (fun->global)
+    return fun->u.h->root.root.string;
+
+  sec = fun->sec;
+  if (fun->u.sym->st_name == 0)
+    {
+      size_t len = strlen (sec->name);
+      char *name = bfd_malloc (len + 10);
+      if (name == NULL)
+	return "(null)";
+      sprintf (name, "%s+%lx", sec->name,
+	       (unsigned long) fun->u.sym->st_value & 0xffffffff);
+      return name;
+    }
+  ibfd = sec->owner;
+  symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+  return bfd_elf_sym_name (ibfd, symtab_hdr, fun->u.sym, sec);
+}
+
+/* Read the instruction at OFF in SEC.  Return true iff the instruction
+   is a nop, lnop, or stop 0 (all zero insn).  */
+
+static bfd_boolean
+is_nop (asection *sec, bfd_vma off)
+{
+  unsigned char insn[4];
+
+  if (off + 4 > sec->size
+      || !bfd_get_section_contents (sec->owner, sec, insn, off, 4))
+    return FALSE;
+  if ((insn[0] & 0xbf) == 0 && (insn[1] & 0xe0) == 0x20)
+    return TRUE;
+  if (insn[0] == 0 && insn[1] == 0 && insn[2] == 0 && insn[3] == 0)
+    return TRUE;
+  return FALSE;
+}
+
+/* Extend the range of FUN to cover nop padding up to LIMIT.
+   Return TRUE iff some instruction other than a NOP was found.  */
+
+static bfd_boolean
+insns_at_end (struct function_info *fun, bfd_vma limit)
+{
+  bfd_vma off = (fun->hi + 3) & -4;
+
+  while (off < limit && is_nop (fun->sec, off))
+    off += 4;
+  if (off < limit)
+    {
+      fun->hi = off;
+      return TRUE;
+    }
+  fun->hi = limit;
+  return FALSE;
+}
+
+/* Check and fix overlapping function ranges.  Return TRUE iff there
+   are gaps in the current info we have about functions in SEC.  */
+
+static bfd_boolean
+check_function_ranges (asection *sec, struct bfd_link_info *info)
+{
+  struct _spu_elf_section_data *sec_data = spu_elf_section_data (sec);
+  struct spu_elf_stack_info *sinfo = sec_data->u.i.stack_info;
+  int i;
+  bfd_boolean gaps = FALSE;
+
+  if (sinfo == NULL)
+    return FALSE;
+
+  for (i = 1; i < sinfo->num_fun; i++)
+    if (sinfo->fun[i - 1].hi > sinfo->fun[i].lo)
+      {
+	/* Fix overlapping symbols.  */
+	const char *f1 = func_name (&sinfo->fun[i - 1]);
+	const char *f2 = func_name (&sinfo->fun[i]);
+
+	info->callbacks->einfo (_("warning: %s overlaps %s\n"), f1, f2);
+	sinfo->fun[i - 1].hi = sinfo->fun[i].lo;
+      }
+    else if (insns_at_end (&sinfo->fun[i - 1], sinfo->fun[i].lo))
+      gaps = TRUE;
+
+  if (sinfo->num_fun == 0)
+    gaps = TRUE;
+  else
+    {
+      if (sinfo->fun[0].lo != 0)
+	gaps = TRUE;
+      if (sinfo->fun[sinfo->num_fun - 1].hi > sec->size)
+	{
+	  const char *f1 = func_name (&sinfo->fun[sinfo->num_fun - 1]);
+
+	  info->callbacks->einfo (_("warning: %s exceeds section size\n"), f1);
+	  sinfo->fun[sinfo->num_fun - 1].hi = sec->size;
+	}
+      else if (insns_at_end (&sinfo->fun[sinfo->num_fun - 1], sec->size))
+	gaps = TRUE;
+    }
+  return gaps;
+}
+
+/* Search current function info for a function that contains address
+   OFFSET in section SEC.  */
+
+static struct function_info *
+find_function (asection *sec, bfd_vma offset, struct bfd_link_info *info)
+{
+  struct _spu_elf_section_data *sec_data = spu_elf_section_data (sec);
+  struct spu_elf_stack_info *sinfo = sec_data->u.i.stack_info;
+  int lo, hi, mid;
+
+  lo = 0;
+  hi = sinfo->num_fun;
+  while (lo < hi)
+    {
+      mid = (lo + hi) / 2;
+      if (offset < sinfo->fun[mid].lo)
+	hi = mid;
+      else if (offset >= sinfo->fun[mid].hi)
+	lo = mid + 1;
+      else
+	return &sinfo->fun[mid];
+    }
+  info->callbacks->einfo (_("%A:0x%v not found in function table\n"),
+			  sec, offset);
+  bfd_set_error (bfd_error_bad_value);
+  return NULL;
+}
+
+/* Add CALLEE to CALLER call list if not already present.  Return TRUE
+   if CALLEE was new.  If this function return FALSE, CALLEE should
+   be freed.  */
+
+static bfd_boolean
+insert_callee (struct function_info *caller, struct call_info *callee)
+{
+  struct call_info **pp, *p;
+
+  for (pp = &caller->call_list; (p = *pp) != NULL; pp = &p->next)
+    if (p->fun == callee->fun)
+      {
+	/* Tail calls use less stack than normal calls.  Retain entry
+	   for normal call over one for tail call.  */
+	p->is_tail &= callee->is_tail;
+	if (!p->is_tail)
+	  {
+	    p->fun->start = NULL;
+	    p->fun->is_func = TRUE;
+	  }
+	p->count += callee->count;
+	/* Reorder list so most recent call is first.  */
+	*pp = p->next;
+	p->next = caller->call_list;
+	caller->call_list = p;
+	return FALSE;
+      }
+  callee->next = caller->call_list;
+  caller->call_list = callee;
+  return TRUE;
+}
+
+/* Copy CALL and insert the copy into CALLER.  */
+
+static bfd_boolean
+copy_callee (struct function_info *caller, const struct call_info *call)
+{
+  struct call_info *callee;
+  callee = bfd_malloc (sizeof (*callee));
+  if (callee == NULL)
+    return FALSE;
+  *callee = *call;
+  if (!insert_callee (caller, callee))
+    free (callee);
+  return TRUE;
+}
+
+/* We're only interested in code sections.  Testing SEC_IN_MEMORY excludes
+   overlay stub sections.  */
+
+static bfd_boolean
+interesting_section (asection *s)
+{
+  return (s->output_section != bfd_abs_section_ptr
+	  && ((s->flags & (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_IN_MEMORY))
+	      == (SEC_ALLOC | SEC_LOAD | SEC_CODE))
+	  && s->size != 0);
+}
+
+/* Rummage through the relocs for SEC, looking for function calls.
+   If CALL_TREE is true, fill in call graph.  If CALL_TREE is false,
+   mark destination symbols on calls as being functions.  Also
+   look at branches, which may be tail calls or go to hot/cold
+   section part of same function.  */
+
+static bfd_boolean
+mark_functions_via_relocs (asection *sec,
+			   struct bfd_link_info *info,
+			   int call_tree)
+{
+  Elf_Internal_Rela *internal_relocs, *irelaend, *irela;
+  Elf_Internal_Shdr *symtab_hdr;
+  void *psyms;
+  unsigned int priority = 0;
+  static bfd_boolean warned;
+
+  if (!interesting_section (sec)
+      || sec->reloc_count == 0)
+    return TRUE;
+
+  internal_relocs = _bfd_elf_link_read_relocs (sec->owner, sec, NULL, NULL,
+					       info->keep_memory);
+  if (internal_relocs == NULL)
+    return FALSE;
+
+  symtab_hdr = &elf_tdata (sec->owner)->symtab_hdr;
+  psyms = &symtab_hdr->contents;
+  irela = internal_relocs;
+  irelaend = irela + sec->reloc_count;
+  for (; irela < irelaend; irela++)
+    {
+      enum elf_spu_reloc_type r_type;
+      unsigned int r_indx;
+      asection *sym_sec;
+      Elf_Internal_Sym *sym;
+      struct elf_link_hash_entry *h;
+      bfd_vma val;
+      bfd_boolean nonbranch, is_call;
+      struct function_info *caller;
+      struct call_info *callee;
+
+      r_type = ELF32_R_TYPE (irela->r_info);
+      nonbranch = r_type != R_SPU_REL16 && r_type != R_SPU_ADDR16;
+
+      r_indx = ELF32_R_SYM (irela->r_info);
+      if (!get_sym_h (&h, &sym, &sym_sec, psyms, r_indx, sec->owner))
+	return FALSE;
+
+      if (sym_sec == NULL
+	  || sym_sec->output_section == bfd_abs_section_ptr)
+	continue;
+
+      is_call = FALSE;
+      if (!nonbranch)
+	{
+	  unsigned char insn[4];
+
+	  if (!bfd_get_section_contents (sec->owner, sec, insn,
+					 irela->r_offset, 4))
+	    return FALSE;
+	  if (is_branch (insn))
+	    {
+	      is_call = (insn[0] & 0xfd) == 0x31;
+	      priority = insn[1] & 0x0f;
+	      priority <<= 8;
+	      priority |= insn[2];
+	      priority <<= 8;
+	      priority |= insn[3];
+	      priority >>= 7;
+	      if ((sym_sec->flags & (SEC_ALLOC | SEC_LOAD | SEC_CODE))
+		  != (SEC_ALLOC | SEC_LOAD | SEC_CODE))
+		{
+		  if (!warned)
+		    info->callbacks->einfo
+		      (_("%B(%A+0x%v): call to non-code section"
+			 " %B(%A), analysis incomplete\n"),
+		       sec->owner, sec, irela->r_offset,
+		       sym_sec->owner, sym_sec);
+		  warned = TRUE;
+		  continue;
+		}
+	    }
+	  else
+	    {
+	      nonbranch = TRUE;
+	      if (is_hint (insn))
+		continue;
+	    }
+	}
+
+      if (nonbranch)
+	{
+	  /* For --auto-overlay, count possible stubs we need for
+	     function pointer references.  */
+	  unsigned int sym_type;
+	  if (h)
+	    sym_type = h->type;
+	  else
+	    sym_type = ELF_ST_TYPE (sym->st_info);
+	  if (sym_type == STT_FUNC)
+	    {
+	      if (call_tree && spu_hash_table (info)->params->auto_overlay)
+		spu_hash_table (info)->non_ovly_stub += 1;
+	      /* If the symbol type is STT_FUNC then this must be a
+		 function pointer initialisation.  */
+	      continue;
+	    }
+	  /* Ignore data references.  */
+	  if ((sym_sec->flags & (SEC_ALLOC | SEC_LOAD | SEC_CODE))
+	      != (SEC_ALLOC | SEC_LOAD | SEC_CODE))
+	    continue;
+	  /* Otherwise we probably have a jump table reloc for
+	     a switch statement or some other reference to a
+	     code label.  */
+	}
+
+      if (h)
+	val = h->root.u.def.value;
+      else
+	val = sym->st_value;
+      val += irela->r_addend;
+
+      if (!call_tree)
+	{
+	  struct function_info *fun;
+
+	  if (irela->r_addend != 0)
+	    {
+	      Elf_Internal_Sym *fake = bfd_zmalloc (sizeof (*fake));
+	      if (fake == NULL)
+		return FALSE;
+	      fake->st_value = val;
+	      fake->st_shndx
+		= _bfd_elf_section_from_bfd_section (sym_sec->owner, sym_sec);
+	      sym = fake;
+	    }
+	  if (sym)
+	    fun = maybe_insert_function (sym_sec, sym, FALSE, is_call);
+	  else
+	    fun = maybe_insert_function (sym_sec, h, TRUE, is_call);
+	  if (fun == NULL)
+	    return FALSE;
+	  if (irela->r_addend != 0
+	      && fun->u.sym != sym)
+	    free (sym);
+	  continue;
+	}
+
+      caller = find_function (sec, irela->r_offset, info);
+      if (caller == NULL)
+	return FALSE;
+      callee = bfd_malloc (sizeof *callee);
+      if (callee == NULL)
+	return FALSE;
+
+      callee->fun = find_function (sym_sec, val, info);
+      if (callee->fun == NULL)
+	return FALSE;
+      callee->is_tail = !is_call;
+      callee->is_pasted = FALSE;
+      callee->broken_cycle = FALSE;
+      callee->priority = priority;
+      callee->count = nonbranch? 0 : 1;
+      if (callee->fun->last_caller != sec)
+	{
+	  callee->fun->last_caller = sec;
+	  callee->fun->call_count += 1;
+	}
+      if (!insert_callee (caller, callee))
+	free (callee);
+      else if (!is_call
+	       && !callee->fun->is_func
+	       && callee->fun->stack == 0)
+	{
+	  /* This is either a tail call or a branch from one part of
+	     the function to another, ie. hot/cold section.  If the
+	     destination has been called by some other function then
+	     it is a separate function.  We also assume that functions
+	     are not split across input files.  */
+	  if (sec->owner != sym_sec->owner)
+	    {
+	      callee->fun->start = NULL;
+	      callee->fun->is_func = TRUE;
+	    }
+	  else if (callee->fun->start == NULL)
+	    {
+	      struct function_info *caller_start = caller;
+	      while (caller_start->start)
+		caller_start = caller_start->start;
+
+	      if (caller_start != callee->fun)
+		callee->fun->start = caller_start;
+	    }
+	  else
+	    {
+	      struct function_info *callee_start;
+	      struct function_info *caller_start;
+	      callee_start = callee->fun;
+	      while (callee_start->start)
+		callee_start = callee_start->start;
+	      caller_start = caller;
+	      while (caller_start->start)
+		caller_start = caller_start->start;
+	      if (caller_start != callee_start)
+		{
+		  callee->fun->start = NULL;
+		  callee->fun->is_func = TRUE;
+		}
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Handle something like .init or .fini, which has a piece of a function.
+   These sections are pasted together to form a single function.  */
+
+static bfd_boolean
+pasted_function (asection *sec)
+{
+  struct bfd_link_order *l;
+  struct _spu_elf_section_data *sec_data;
+  struct spu_elf_stack_info *sinfo;
+  Elf_Internal_Sym *fake;
+  struct function_info *fun, *fun_start;
+
+  fake = bfd_zmalloc (sizeof (*fake));
+  if (fake == NULL)
+    return FALSE;
+  fake->st_value = 0;
+  fake->st_size = sec->size;
+  fake->st_shndx
+    = _bfd_elf_section_from_bfd_section (sec->owner, sec);
+  fun = maybe_insert_function (sec, fake, FALSE, FALSE);
+  if (!fun)
+    return FALSE;
+
+  /* Find a function immediately preceding this section.  */
+  fun_start = NULL;
+  for (l = sec->output_section->map_head.link_order; l != NULL; l = l->next)
+    {
+      if (l->u.indirect.section == sec)
+	{
+	  if (fun_start != NULL)
+	    {
+	      struct call_info *callee = bfd_malloc (sizeof *callee);
+	      if (callee == NULL)
+		return FALSE;
+
+	      fun->start = fun_start;
+	      callee->fun = fun;
+	      callee->is_tail = TRUE;
+	      callee->is_pasted = TRUE;
+	      callee->broken_cycle = FALSE;
+	      callee->priority = 0;
+	      callee->count = 1;
+	      if (!insert_callee (fun_start, callee))
+		free (callee);
+	      return TRUE;
+	    }
+	  break;
+	}
+      if (l->type == bfd_indirect_link_order
+	  && (sec_data = spu_elf_section_data (l->u.indirect.section)) != NULL
+	  && (sinfo = sec_data->u.i.stack_info) != NULL
+	  && sinfo->num_fun != 0)
+	fun_start = &sinfo->fun[sinfo->num_fun - 1];
+    }
+
+  /* Don't return an error if we did not find a function preceding this
+     section.  The section may have incorrect flags.  */
+  return TRUE;
+}
+
+/* Map address ranges in code sections to functions.  */
+
+static bfd_boolean
+discover_functions (struct bfd_link_info *info)
+{
+  bfd *ibfd;
+  int bfd_idx;
+  Elf_Internal_Sym ***psym_arr;
+  asection ***sec_arr;
+  bfd_boolean gaps = FALSE;
+
+  bfd_idx = 0;
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    bfd_idx++;
+
+  psym_arr = bfd_zmalloc (bfd_idx * sizeof (*psym_arr));
+  if (psym_arr == NULL)
+    return FALSE;
+  sec_arr = bfd_zmalloc (bfd_idx * sizeof (*sec_arr));
+  if (sec_arr == NULL)
+    return FALSE;
+  
+  for (ibfd = info->input_bfds, bfd_idx = 0;
+       ibfd != NULL;
+       ibfd = ibfd->link_next, bfd_idx++)
+    {
+      extern const bfd_target bfd_elf32_spu_vec;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *sec;
+      size_t symcount;
+      Elf_Internal_Sym *syms, *sy, **psyms, **psy;
+      asection **psecs, **p;
+
+      if (ibfd->xvec != &bfd_elf32_spu_vec)
+	continue;
+
+      /* Read all the symbols.  */
+      symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+      symcount = symtab_hdr->sh_size / symtab_hdr->sh_entsize;
+      if (symcount == 0)
+	{
+	  if (!gaps)
+	    for (sec = ibfd->sections; sec != NULL && !gaps; sec = sec->next)
+	      if (interesting_section (sec))
+		{
+		  gaps = TRUE;
+		  break;
+		}
+	  continue;
+	}
+
+      if (symtab_hdr->contents != NULL)
+	{
+	  /* Don't use cached symbols since the generic ELF linker
+	     code only reads local symbols, and we need globals too.  */ 
+	  free (symtab_hdr->contents);
+	  symtab_hdr->contents = NULL;
+	}
+      syms = bfd_elf_get_elf_syms (ibfd, symtab_hdr, symcount, 0,
+				   NULL, NULL, NULL);
+      symtab_hdr->contents = (void *) syms;
+      if (syms == NULL)
+	return FALSE;
+
+      /* Select defined function symbols that are going to be output.  */
+      psyms = bfd_malloc ((symcount + 1) * sizeof (*psyms));
+      if (psyms == NULL)
+	return FALSE;
+      psym_arr[bfd_idx] = psyms;
+      psecs = bfd_malloc (symcount * sizeof (*psecs));
+      if (psecs == NULL)
+	return FALSE;
+      sec_arr[bfd_idx] = psecs;
+      for (psy = psyms, p = psecs, sy = syms; sy < syms + symcount; ++p, ++sy)
+	if (ELF_ST_TYPE (sy->st_info) == STT_NOTYPE
+	    || ELF_ST_TYPE (sy->st_info) == STT_FUNC)
+	  {
+	    asection *s;
+
+	    *p = s = bfd_section_from_elf_index (ibfd, sy->st_shndx);
+	    if (s != NULL && interesting_section (s))
+	      *psy++ = sy;
+	  }
+      symcount = psy - psyms;
+      *psy = NULL;
+
+      /* Sort them by section and offset within section.  */
+      sort_syms_syms = syms;
+      sort_syms_psecs = psecs;
+      qsort (psyms, symcount, sizeof (*psyms), sort_syms);
+
+      /* Now inspect the function symbols.  */
+      for (psy = psyms; psy < psyms + symcount; )
+	{
+	  asection *s = psecs[*psy - syms];
+	  Elf_Internal_Sym **psy2;
+
+	  for (psy2 = psy; ++psy2 < psyms + symcount; )
+	    if (psecs[*psy2 - syms] != s)
+	      break;
+
+	  if (!alloc_stack_info (s, psy2 - psy))
+	    return FALSE;
+	  psy = psy2;
+	}
+
+      /* First install info about properly typed and sized functions.
+	 In an ideal world this will cover all code sections, except
+	 when partitioning functions into hot and cold sections,
+	 and the horrible pasted together .init and .fini functions.  */
+      for (psy = psyms; psy < psyms + symcount; ++psy)
+	{
+	  sy = *psy;
+	  if (ELF_ST_TYPE (sy->st_info) == STT_FUNC)
+	    {
+	      asection *s = psecs[sy - syms];
+	      if (!maybe_insert_function (s, sy, FALSE, TRUE))
+		return FALSE;
+	    }
+	}
+
+      for (sec = ibfd->sections; sec != NULL && !gaps; sec = sec->next)
+	if (interesting_section (sec))
+	  gaps |= check_function_ranges (sec, info);
+    }
+
+  if (gaps)
+    {
+      /* See if we can discover more function symbols by looking at
+	 relocations.  */
+      for (ibfd = info->input_bfds, bfd_idx = 0;
+	   ibfd != NULL;
+	   ibfd = ibfd->link_next, bfd_idx++)
+	{
+	  asection *sec;
+
+	  if (psym_arr[bfd_idx] == NULL)
+	    continue;
+
+	  for (sec = ibfd->sections; sec != NULL; sec = sec->next)
+	    if (!mark_functions_via_relocs (sec, info, FALSE))
+	      return FALSE;
+	}
+
+      for (ibfd = info->input_bfds, bfd_idx = 0;
+	   ibfd != NULL;
+	   ibfd = ibfd->link_next, bfd_idx++)
+	{
+	  Elf_Internal_Shdr *symtab_hdr;
+	  asection *sec;
+	  Elf_Internal_Sym *syms, *sy, **psyms, **psy;
+	  asection **psecs;
+
+	  if ((psyms = psym_arr[bfd_idx]) == NULL)
+	    continue;
+
+	  psecs = sec_arr[bfd_idx];
+
+	  symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+	  syms = (Elf_Internal_Sym *) symtab_hdr->contents;
+
+	  gaps = FALSE;
+	  for (sec = ibfd->sections; sec != NULL && !gaps; sec = sec->next)
+	    if (interesting_section (sec))
+	      gaps |= check_function_ranges (sec, info);
+	  if (!gaps)
+	    continue;
+
+	  /* Finally, install all globals.  */
+	  for (psy = psyms; (sy = *psy) != NULL; ++psy)
+	    {
+	      asection *s;
+
+	      s = psecs[sy - syms];
+
+	      /* Global syms might be improperly typed functions.  */
+	      if (ELF_ST_TYPE (sy->st_info) != STT_FUNC
+		  && ELF_ST_BIND (sy->st_info) == STB_GLOBAL)
+		{
+		  if (!maybe_insert_function (s, sy, FALSE, FALSE))
+		    return FALSE;
+		}
+	    }
+	}
+
+      for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+	{
+	  extern const bfd_target bfd_elf32_spu_vec;
+	  asection *sec;
+
+	  if (ibfd->xvec != &bfd_elf32_spu_vec)
+	    continue;
+
+	  /* Some of the symbols we've installed as marking the
+	     beginning of functions may have a size of zero.  Extend
+	     the range of such functions to the beginning of the
+	     next symbol of interest.  */
+	  for (sec = ibfd->sections; sec != NULL; sec = sec->next)
+	    if (interesting_section (sec))
+	      {
+		struct _spu_elf_section_data *sec_data;
+		struct spu_elf_stack_info *sinfo;
+
+		sec_data = spu_elf_section_data (sec);
+		sinfo = sec_data->u.i.stack_info;
+		if (sinfo != NULL && sinfo->num_fun != 0)
+		  {
+		    int fun_idx;
+		    bfd_vma hi = sec->size;
+
+		    for (fun_idx = sinfo->num_fun; --fun_idx >= 0; )
+		      {
+			sinfo->fun[fun_idx].hi = hi;
+			hi = sinfo->fun[fun_idx].lo;
+		      }
+
+		    sinfo->fun[0].lo = 0;
+		  }
+		/* No symbols in this section.  Must be .init or .fini
+		   or something similar.  */
+		else if (!pasted_function (sec))
+		  return FALSE;
+	      }
+	}
+    }
+
+  for (ibfd = info->input_bfds, bfd_idx = 0;
+       ibfd != NULL;
+       ibfd = ibfd->link_next, bfd_idx++)
+    {
+      if (psym_arr[bfd_idx] == NULL)
+	continue;
+
+      free (psym_arr[bfd_idx]);
+      free (sec_arr[bfd_idx]);
+    }
+
+  free (psym_arr);
+  free (sec_arr);
+
+  return TRUE;
+}
+
+/* Iterate over all function_info we have collected, calling DOIT on
+   each node if ROOT_ONLY is false.  Only call DOIT on root nodes
+   if ROOT_ONLY.  */
+
+static bfd_boolean
+for_each_node (bfd_boolean (*doit) (struct function_info *,
+				    struct bfd_link_info *,
+				    void *),
+	       struct bfd_link_info *info,
+	       void *param,
+	       int root_only)
+{
+  bfd *ibfd;
+
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      extern const bfd_target bfd_elf32_spu_vec;
+      asection *sec;
+
+      if (ibfd->xvec != &bfd_elf32_spu_vec)
+	continue;
+
+      for (sec = ibfd->sections; sec != NULL; sec = sec->next)
+	{
+	  struct _spu_elf_section_data *sec_data;
+	  struct spu_elf_stack_info *sinfo;
+
+	  if ((sec_data = spu_elf_section_data (sec)) != NULL
+	      && (sinfo = sec_data->u.i.stack_info) != NULL)
+	    {
+	      int i;
+	      for (i = 0; i < sinfo->num_fun; ++i)
+		if (!root_only || !sinfo->fun[i].non_root)
+		  if (!doit (&sinfo->fun[i], info, param))
+		    return FALSE;
+	    }
+	}
+    }
+  return TRUE;
+}
+
+/* Transfer call info attached to struct function_info entries for
+   all of a given function's sections to the first entry.  */
+
+static bfd_boolean
+transfer_calls (struct function_info *fun,
+		struct bfd_link_info *info ATTRIBUTE_UNUSED,
+		void *param ATTRIBUTE_UNUSED)
+{
+  struct function_info *start = fun->start;
+
+  if (start != NULL)
+    {
+      struct call_info *call, *call_next;
+
+      while (start->start != NULL)
+	start = start->start;
+      for (call = fun->call_list; call != NULL; call = call_next)
+	{
+	  call_next = call->next;
+	  if (!insert_callee (start, call))
+	    free (call);
+	}
+      fun->call_list = NULL;
+    }
+  return TRUE;
+}
+
+/* Mark nodes in the call graph that are called by some other node.  */
+
+static bfd_boolean
+mark_non_root (struct function_info *fun,
+	       struct bfd_link_info *info ATTRIBUTE_UNUSED,
+	       void *param ATTRIBUTE_UNUSED)
+{
+  struct call_info *call;
+
+  if (fun->visit1)
+    return TRUE;
+  fun->visit1 = TRUE;
+  for (call = fun->call_list; call; call = call->next)
+    {
+      call->fun->non_root = TRUE;
+      mark_non_root (call->fun, 0, 0);
+    }
+  return TRUE;
+}
+
+/* Remove cycles from the call graph.  Set depth of nodes.  */
+
+static bfd_boolean
+remove_cycles (struct function_info *fun,
+	       struct bfd_link_info *info,
+	       void *param)
+{
+  struct call_info **callp, *call;
+  unsigned int depth = *(unsigned int *) param;
+  unsigned int max_depth = depth;
+
+  fun->depth = depth;
+  fun->visit2 = TRUE;
+  fun->marking = TRUE;
+
+  callp = &fun->call_list;
+  while ((call = *callp) != NULL)
+    {
+      call->max_depth = depth + !call->is_pasted;
+      if (!call->fun->visit2)
+	{
+	  if (!remove_cycles (call->fun, info, &call->max_depth))
+	    return FALSE;
+	  if (max_depth < call->max_depth)
+	    max_depth = call->max_depth;
+	}
+      else if (call->fun->marking)
+	{
+	  struct spu_link_hash_table *htab = spu_hash_table (info);
+
+	  if (!htab->params->auto_overlay
+	      && htab->params->stack_analysis)
+	    {
+	      const char *f1 = func_name (fun);
+	      const char *f2 = func_name (call->fun);
+
+	      info->callbacks->info (_("Stack analysis will ignore the call "
+				       "from %s to %s\n"),
+				     f1, f2);
+	    }
+
+	  call->broken_cycle = TRUE;
+	}
+      callp = &call->next;
+    }
+  fun->marking = FALSE;
+  *(unsigned int *) param = max_depth;
+  return TRUE;
+}
+
+/* Check that we actually visited all nodes in remove_cycles.  If we
+   didn't, then there is some cycle in the call graph not attached to
+   any root node.  Arbitrarily choose a node in the cycle as a new
+   root and break the cycle.  */
+
+static bfd_boolean
+mark_detached_root (struct function_info *fun,
+		    struct bfd_link_info *info,
+		    void *param)
+{
+  if (fun->visit2)
+    return TRUE;
+  fun->non_root = FALSE;
+  *(unsigned int *) param = 0;
+  return remove_cycles (fun, info, param);
+}
+
+/* Populate call_list for each function.  */
+
+static bfd_boolean
+build_call_tree (struct bfd_link_info *info)
+{
+  bfd *ibfd;
+  unsigned int depth;
+
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      extern const bfd_target bfd_elf32_spu_vec;
+      asection *sec;
+
+      if (ibfd->xvec != &bfd_elf32_spu_vec)
+	continue;
+
+      for (sec = ibfd->sections; sec != NULL; sec = sec->next)
+	if (!mark_functions_via_relocs (sec, info, TRUE))
+	  return FALSE;
+    }
+
+  /* Transfer call info from hot/cold section part of function
+     to main entry.  */
+  if (!spu_hash_table (info)->params->auto_overlay
+      && !for_each_node (transfer_calls, info, 0, FALSE))
+    return FALSE;
+
+  /* Find the call graph root(s).  */
+  if (!for_each_node (mark_non_root, info, 0, FALSE))
+    return FALSE;
+
+  /* Remove cycles from the call graph.  We start from the root node(s)
+     so that we break cycles in a reasonable place.  */
+  depth = 0;
+  if (!for_each_node (remove_cycles, info, &depth, TRUE))
+    return FALSE;
+
+  return for_each_node (mark_detached_root, info, &depth, FALSE);
+}
+
+/* qsort predicate to sort calls by priority, max_depth then count.  */
+
+static int
+sort_calls (const void *a, const void *b)
+{
+  struct call_info *const *c1 = a;
+  struct call_info *const *c2 = b;
+  int delta;
+
+  delta = (*c2)->priority - (*c1)->priority;
+  if (delta != 0)
+    return delta;
+
+  delta = (*c2)->max_depth - (*c1)->max_depth;
+  if (delta != 0)
+    return delta;
+
+  delta = (*c2)->count - (*c1)->count;
+  if (delta != 0)
+    return delta;
+
+  return (char *) c1 - (char *) c2;
+}
+
+struct _mos_param {
+  unsigned int max_overlay_size;
+};
+
+/* Set linker_mark and gc_mark on any sections that we will put in
+   overlays.  These flags are used by the generic ELF linker, but we
+   won't be continuing on to bfd_elf_final_link so it is OK to use
+   them.  linker_mark is clear before we get here.  Set segment_mark
+   on sections that are part of a pasted function (excluding the last
+   section).
+
+   Set up function rodata section if --overlay-rodata.  We don't
+   currently include merged string constant rodata sections since
+
+   Sort the call graph so that the deepest nodes will be visited
+   first.  */
+
+static bfd_boolean
+mark_overlay_section (struct function_info *fun,
+		      struct bfd_link_info *info,
+		      void *param)
+{
+  struct call_info *call;
+  unsigned int count;
+  struct _mos_param *mos_param = param;
+  struct spu_link_hash_table *htab = spu_hash_table (info);
+
+  if (fun->visit4)
+    return TRUE;
+
+  fun->visit4 = TRUE;
+  if (!fun->sec->linker_mark
+      && (htab->params->ovly_flavour != ovly_soft_icache
+	  || htab->params->non_ia_text
+	  || strncmp (fun->sec->name, ".text.ia.", 9) == 0
+	  || strcmp (fun->sec->name, ".init") == 0
+	  || strcmp (fun->sec->name, ".fini") == 0))
+    {
+      unsigned int size;
+
+      fun->sec->linker_mark = 1;
+      fun->sec->gc_mark = 1;
+      fun->sec->segment_mark = 0;
+      /* Ensure SEC_CODE is set on this text section (it ought to
+	 be!), and SEC_CODE is clear on rodata sections.  We use
+	 this flag to differentiate the two overlay section types.  */
+      fun->sec->flags |= SEC_CODE;
+
+      size = fun->sec->size;
+      if (htab->params->auto_overlay & OVERLAY_RODATA)
+	{
+	  char *name = NULL;
+
+	  /* Find the rodata section corresponding to this function's
+	     text section.  */
+	  if (strcmp (fun->sec->name, ".text") == 0)
+	    {
+	      name = bfd_malloc (sizeof (".rodata"));
+	      if (name == NULL)
+		return FALSE;
+	      memcpy (name, ".rodata", sizeof (".rodata"));
+	    }
+	  else if (strncmp (fun->sec->name, ".text.", 6) == 0)
+	    {
+	      size_t len = strlen (fun->sec->name);
+	      name = bfd_malloc (len + 3);
+	      if (name == NULL)
+		return FALSE;
+	      memcpy (name, ".rodata", sizeof (".rodata"));
+	      memcpy (name + 7, fun->sec->name + 5, len - 4);
+	    }
+	  else if (strncmp (fun->sec->name, ".gnu.linkonce.t.", 16) == 0)
+	    {
+	      size_t len = strlen (fun->sec->name) + 1;
+	      name = bfd_malloc (len);
+	      if (name == NULL)
+		return FALSE;
+	      memcpy (name, fun->sec->name, len);
+	      name[14] = 'r';
+	    }
+
+	  if (name != NULL)
+	    {
+	      asection *rodata = NULL;
+	      asection *group_sec = elf_section_data (fun->sec)->next_in_group;
+	      if (group_sec == NULL)
+		rodata = bfd_get_section_by_name (fun->sec->owner, name);
+	      else
+		while (group_sec != NULL && group_sec != fun->sec)
+		  {
+		    if (strcmp (group_sec->name, name) == 0)
+		      {
+			rodata = group_sec;
+			break;
+		      }
+		    group_sec = elf_section_data (group_sec)->next_in_group;
+		  }
+	      fun->rodata = rodata;
+	      if (fun->rodata)
+		{
+		  size += fun->rodata->size;
+		  if (htab->params->line_size != 0
+		      && size > htab->params->line_size)
+		    {
+		      size -= fun->rodata->size;
+		      fun->rodata = NULL;
+		    }
+		  else
+		    {
+		      fun->rodata->linker_mark = 1;
+		      fun->rodata->gc_mark = 1;
+		      fun->rodata->flags &= ~SEC_CODE;
+		    }
+		}
+	      free (name);
+	    }
+	}
+      if (mos_param->max_overlay_size < size)
+	mos_param->max_overlay_size = size;
+    }
+
+  for (count = 0, call = fun->call_list; call != NULL; call = call->next)
+    count += 1;
+
+  if (count > 1)
+    {
+      struct call_info **calls = bfd_malloc (count * sizeof (*calls));
+      if (calls == NULL)
+	return FALSE;
+
+      for (count = 0, call = fun->call_list; call != NULL; call = call->next)
+	calls[count++] = call;
+
+      qsort (calls, count, sizeof (*calls), sort_calls);
+
+      fun->call_list = NULL;
+      while (count != 0)
+	{
+	  --count;
+	  calls[count]->next = fun->call_list;
+	  fun->call_list = calls[count];
+	}
+      free (calls);
+    }
+
+  for (call = fun->call_list; call != NULL; call = call->next)
+    {
+      if (call->is_pasted)
+	{
+	  /* There can only be one is_pasted call per function_info.  */
+	  BFD_ASSERT (!fun->sec->segment_mark);
+	  fun->sec->segment_mark = 1;
+	}
+      if (!call->broken_cycle
+	  && !mark_overlay_section (call->fun, info, param))
+	return FALSE;
+    }
+
+  /* Don't put entry code into an overlay.  The overlay manager needs
+     a stack!  Also, don't mark .ovl.init as an overlay.  */
+  if (fun->lo + fun->sec->output_offset + fun->sec->output_section->vma
+      == info->output_bfd->start_address
+      || strncmp (fun->sec->output_section->name, ".ovl.init", 9) == 0)
+    {
+      fun->sec->linker_mark = 0;
+      if (fun->rodata != NULL)
+	fun->rodata->linker_mark = 0;
+    }
+  return TRUE;
+}
+
+/* If non-zero then unmark functions called from those within sections
+   that we need to unmark.  Unfortunately this isn't reliable since the
+   call graph cannot know the destination of function pointer calls.  */
+#define RECURSE_UNMARK 0
+
+struct _uos_param {
+  asection *exclude_input_section;
+  asection *exclude_output_section;
+  unsigned long clearing;
+};
+
+/* Undo some of mark_overlay_section's work.  */
+
+static bfd_boolean
+unmark_overlay_section (struct function_info *fun,
+			struct bfd_link_info *info,
+			void *param)
+{
+  struct call_info *call;
+  struct _uos_param *uos_param = param;
+  unsigned int excluded = 0;
+
+  if (fun->visit5)
+    return TRUE;
+
+  fun->visit5 = TRUE;
+
+  excluded = 0;
+  if (fun->sec == uos_param->exclude_input_section
+      || fun->sec->output_section == uos_param->exclude_output_section)
+    excluded = 1;
+
+  if (RECURSE_UNMARK)
+    uos_param->clearing += excluded;
+
+  if (RECURSE_UNMARK ? uos_param->clearing : excluded)
+    {
+      fun->sec->linker_mark = 0;
+      if (fun->rodata)
+	fun->rodata->linker_mark = 0;
+    }
+
+  for (call = fun->call_list; call != NULL; call = call->next)
+    if (!call->broken_cycle
+	&& !unmark_overlay_section (call->fun, info, param))
+      return FALSE;
+
+  if (RECURSE_UNMARK)
+    uos_param->clearing -= excluded;
+  return TRUE;
+}
+
+struct _cl_param {
+  unsigned int lib_size;
+  asection **lib_sections;
+};
+
+/* Add sections we have marked as belonging to overlays to an array
+   for consideration as non-overlay sections.  The array consist of
+   pairs of sections, (text,rodata), for functions in the call graph.  */
+
+static bfd_boolean
+collect_lib_sections (struct function_info *fun,
+		      struct bfd_link_info *info,
+		      void *param)
+{
+  struct _cl_param *lib_param = param;
+  struct call_info *call;
+  unsigned int size;
+
+  if (fun->visit6)
+    return TRUE;
+
+  fun->visit6 = TRUE;
+  if (!fun->sec->linker_mark || !fun->sec->gc_mark || fun->sec->segment_mark)
+    return TRUE;
+
+  size = fun->sec->size;
+  if (fun->rodata)
+    size += fun->rodata->size;
+
+  if (size <= lib_param->lib_size)
+    {
+      *lib_param->lib_sections++ = fun->sec;
+      fun->sec->gc_mark = 0;
+      if (fun->rodata && fun->rodata->linker_mark && fun->rodata->gc_mark)
+	{
+	  *lib_param->lib_sections++ = fun->rodata;
+	  fun->rodata->gc_mark = 0;
+	}
+      else
+	*lib_param->lib_sections++ = NULL;
+    }
+
+  for (call = fun->call_list; call != NULL; call = call->next)
+    if (!call->broken_cycle)
+      collect_lib_sections (call->fun, info, param);
+
+  return TRUE;
+}
+
+/* qsort predicate to sort sections by call count.  */
+
+static int
+sort_lib (const void *a, const void *b)
+{
+  asection *const *s1 = a;
+  asection *const *s2 = b;
+  struct _spu_elf_section_data *sec_data;
+  struct spu_elf_stack_info *sinfo;
+  int delta;
+
+  delta = 0;
+  if ((sec_data = spu_elf_section_data (*s1)) != NULL
+      && (sinfo = sec_data->u.i.stack_info) != NULL)
+    {
+      int i;
+      for (i = 0; i < sinfo->num_fun; ++i)
+	delta -= sinfo->fun[i].call_count;
+    }
+
+  if ((sec_data = spu_elf_section_data (*s2)) != NULL
+      && (sinfo = sec_data->u.i.stack_info) != NULL)
+    {
+      int i;
+      for (i = 0; i < sinfo->num_fun; ++i)
+	delta += sinfo->fun[i].call_count;
+    }
+
+  if (delta != 0)
+    return delta;
+
+  return s1 - s2;
+}
+
+/* Remove some sections from those marked to be in overlays.  Choose
+   those that are called from many places, likely library functions.  */
+
+static unsigned int
+auto_ovl_lib_functions (struct bfd_link_info *info, unsigned int lib_size)
+{
+  bfd *ibfd;
+  asection **lib_sections;
+  unsigned int i, lib_count;
+  struct _cl_param collect_lib_param;
+  struct function_info dummy_caller;
+  struct spu_link_hash_table *htab;
+
+  memset (&dummy_caller, 0, sizeof (dummy_caller));
+  lib_count = 0;
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      extern const bfd_target bfd_elf32_spu_vec;
+      asection *sec;
+
+      if (ibfd->xvec != &bfd_elf32_spu_vec)
+	continue;
+
+      for (sec = ibfd->sections; sec != NULL; sec = sec->next)
+	if (sec->linker_mark
+	    && sec->size < lib_size
+	    && (sec->flags & SEC_CODE) != 0)
+	  lib_count += 1;
+    }
+  lib_sections = bfd_malloc (lib_count * 2 * sizeof (*lib_sections));
+  if (lib_sections == NULL)
+    return (unsigned int) -1;
+  collect_lib_param.lib_size = lib_size;
+  collect_lib_param.lib_sections = lib_sections;
+  if (!for_each_node (collect_lib_sections, info, &collect_lib_param,
+		      TRUE))
+    return (unsigned int) -1;
+  lib_count = (collect_lib_param.lib_sections - lib_sections) / 2;
+
+  /* Sort sections so that those with the most calls are first.  */
+  if (lib_count > 1)
+    qsort (lib_sections, lib_count, 2 * sizeof (*lib_sections), sort_lib);
+
+  htab = spu_hash_table (info);
+  for (i = 0; i < lib_count; i++)
+    {
+      unsigned int tmp, stub_size;
+      asection *sec;
+      struct _spu_elf_section_data *sec_data;
+      struct spu_elf_stack_info *sinfo;
+
+      sec = lib_sections[2 * i];
+      /* If this section is OK, its size must be less than lib_size.  */
+      tmp = sec->size;
+      /* If it has a rodata section, then add that too.  */
+      if (lib_sections[2 * i + 1])
+	tmp += lib_sections[2 * i + 1]->size;
+      /* Add any new overlay call stubs needed by the section.  */
+      stub_size = 0;
+      if (tmp < lib_size
+	  && (sec_data = spu_elf_section_data (sec)) != NULL
+	  && (sinfo = sec_data->u.i.stack_info) != NULL)
+	{
+	  int k;
+	  struct call_info *call;
+
+	  for (k = 0; k < sinfo->num_fun; ++k)
+	    for (call = sinfo->fun[k].call_list; call; call = call->next)
+	      if (call->fun->sec->linker_mark)
+		{
+		  struct call_info *p;
+		  for (p = dummy_caller.call_list; p; p = p->next)
+		    if (p->fun == call->fun)
+		      break;
+		  if (!p)
+		    stub_size += ovl_stub_size (htab->params);
+		}
+	}
+      if (tmp + stub_size < lib_size)
+	{
+	  struct call_info **pp, *p;
+
+	  /* This section fits.  Mark it as non-overlay.  */
+	  lib_sections[2 * i]->linker_mark = 0;
+	  if (lib_sections[2 * i + 1])
+	    lib_sections[2 * i + 1]->linker_mark = 0;
+	  lib_size -= tmp + stub_size;
+	  /* Call stubs to the section we just added are no longer
+	     needed.  */
+	  pp = &dummy_caller.call_list;
+	  while ((p = *pp) != NULL)
+	    if (!p->fun->sec->linker_mark)
+	      {
+		lib_size += ovl_stub_size (htab->params);
+		*pp = p->next;
+		free (p);
+	      }
+	    else
+	      pp = &p->next;
+	  /* Add new call stubs to dummy_caller.  */
+	  if ((sec_data = spu_elf_section_data (sec)) != NULL
+	      && (sinfo = sec_data->u.i.stack_info) != NULL)
+	    {
+	      int k;
+	      struct call_info *call;
+
+	      for (k = 0; k < sinfo->num_fun; ++k)
+		for (call = sinfo->fun[k].call_list;
+		     call;
+		     call = call->next)
+		  if (call->fun->sec->linker_mark)
+		    {
+		      struct call_info *callee;
+		      callee = bfd_malloc (sizeof (*callee));
+		      if (callee == NULL)
+			return (unsigned int) -1;
+		      *callee = *call;
+		      if (!insert_callee (&dummy_caller, callee))
+			free (callee);
+		    }
+	    }
+	}
+    }
+  while (dummy_caller.call_list != NULL)
+    {
+      struct call_info *call = dummy_caller.call_list;
+      dummy_caller.call_list = call->next;
+      free (call);
+    }
+  for (i = 0; i < 2 * lib_count; i++)
+    if (lib_sections[i])
+      lib_sections[i]->gc_mark = 1;
+  free (lib_sections);
+  return lib_size;
+}
+
+/* Build an array of overlay sections.  The deepest node's section is
+   added first, then its parent node's section, then everything called
+   from the parent section.  The idea being to group sections to
+   minimise calls between different overlays.  */
+
+static bfd_boolean
+collect_overlays (struct function_info *fun,
+		  struct bfd_link_info *info,
+		  void *param)
+{
+  struct call_info *call;
+  bfd_boolean added_fun;
+  asection ***ovly_sections = param;
+
+  if (fun->visit7)
+    return TRUE;
+
+  fun->visit7 = TRUE;
+  for (call = fun->call_list; call != NULL; call = call->next)
+    if (!call->is_pasted && !call->broken_cycle)
+      {
+	if (!collect_overlays (call->fun, info, ovly_sections))
+	  return FALSE;
+	break;
+      }
+
+  added_fun = FALSE;
+  if (fun->sec->linker_mark && fun->sec->gc_mark)
+    {
+      fun->sec->gc_mark = 0;
+      *(*ovly_sections)++ = fun->sec;
+      if (fun->rodata && fun->rodata->linker_mark && fun->rodata->gc_mark)
+	{
+	  fun->rodata->gc_mark = 0;
+	  *(*ovly_sections)++ = fun->rodata;
+	}
+      else
+	*(*ovly_sections)++ = NULL;
+      added_fun = TRUE;
+
+      /* Pasted sections must stay with the first section.  We don't
+	 put pasted sections in the array, just the first section.
+	 Mark subsequent sections as already considered.  */
+      if (fun->sec->segment_mark)
+	{
+	  struct function_info *call_fun = fun;
+	  do
+	    {
+	      for (call = call_fun->call_list; call != NULL; call = call->next)
+		if (call->is_pasted)
+		  {
+		    call_fun = call->fun;
+		    call_fun->sec->gc_mark = 0;
+		    if (call_fun->rodata)
+		      call_fun->rodata->gc_mark = 0;
+		    break;
+		  }
+	      if (call == NULL)
+		abort ();
+	    }
+	  while (call_fun->sec->segment_mark);
+	}
+    }
+
+  for (call = fun->call_list; call != NULL; call = call->next)
+    if (!call->broken_cycle
+	&& !collect_overlays (call->fun, info, ovly_sections))
+      return FALSE;
+
+  if (added_fun)
+    {
+      struct _spu_elf_section_data *sec_data;
+      struct spu_elf_stack_info *sinfo;
+
+      if ((sec_data = spu_elf_section_data (fun->sec)) != NULL
+	  && (sinfo = sec_data->u.i.stack_info) != NULL)
+	{
+	  int i;
+	  for (i = 0; i < sinfo->num_fun; ++i)
+	    if (!collect_overlays (&sinfo->fun[i], info, ovly_sections))
+	      return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+struct _sum_stack_param {
+  size_t cum_stack;
+  size_t overall_stack;
+  bfd_boolean emit_stack_syms;
+};
+
+/* Descend the call graph for FUN, accumulating total stack required.  */
+
+static bfd_boolean
+sum_stack (struct function_info *fun,
+	   struct bfd_link_info *info,
+	   void *param)
+{
+  struct call_info *call;
+  struct function_info *max;
+  size_t stack, cum_stack;
+  const char *f1;
+  bfd_boolean has_call;
+  struct _sum_stack_param *sum_stack_param = param;
+  struct spu_link_hash_table *htab;
+
+  cum_stack = fun->stack;
+  sum_stack_param->cum_stack = cum_stack;
+  if (fun->visit3)
+    return TRUE;
+
+  has_call = FALSE;
+  max = NULL;
+  for (call = fun->call_list; call; call = call->next)
+    {
+      if (call->broken_cycle)
+	continue;
+      if (!call->is_pasted)
+	has_call = TRUE;
+      if (!sum_stack (call->fun, info, sum_stack_param))
+	return FALSE;
+      stack = sum_stack_param->cum_stack;
+      /* Include caller stack for normal calls, don't do so for
+	 tail calls.  fun->stack here is local stack usage for
+	 this function.  */
+      if (!call->is_tail || call->is_pasted || call->fun->start != NULL)
+	stack += fun->stack;
+      if (cum_stack < stack)
+	{
+	  cum_stack = stack;
+	  max = call->fun;
+	}
+    }
+
+  sum_stack_param->cum_stack = cum_stack;
+  stack = fun->stack;
+  /* Now fun->stack holds cumulative stack.  */
+  fun->stack = cum_stack;
+  fun->visit3 = TRUE;
+
+  if (!fun->non_root
+      && sum_stack_param->overall_stack < cum_stack)
+    sum_stack_param->overall_stack = cum_stack;
+
+  htab = spu_hash_table (info);
+  if (htab->params->auto_overlay)
+    return TRUE;
+
+  f1 = func_name (fun);
+  if (htab->params->stack_analysis)
+    {
+      if (!fun->non_root)
+	info->callbacks->info (_("  %s: 0x%v\n"), f1, (bfd_vma) cum_stack);
+      info->callbacks->minfo (_("%s: 0x%v 0x%v\n"),
+			      f1, (bfd_vma) stack, (bfd_vma) cum_stack);
+
+      if (has_call)
+	{
+	  info->callbacks->minfo (_("  calls:\n"));
+	  for (call = fun->call_list; call; call = call->next)
+	    if (!call->is_pasted && !call->broken_cycle)
+	      {
+		const char *f2 = func_name (call->fun);
+		const char *ann1 = call->fun == max ? "*" : " ";
+		const char *ann2 = call->is_tail ? "t" : " ";
+
+		info->callbacks->minfo (_("   %s%s %s\n"), ann1, ann2, f2);
+	      }
+	}
+    }
+
+  if (sum_stack_param->emit_stack_syms)
+    {
+      char *name = bfd_malloc (18 + strlen (f1));
+      struct elf_link_hash_entry *h;
+
+      if (name == NULL)
+	return FALSE;
+
+      if (fun->global || ELF_ST_BIND (fun->u.sym->st_info) == STB_GLOBAL)
+	sprintf (name, "__stack_%s", f1);
+      else
+	sprintf (name, "__stack_%x_%s", fun->sec->id & 0xffffffff, f1);
+
+      h = elf_link_hash_lookup (&htab->elf, name, TRUE, TRUE, FALSE);
+      free (name);
+      if (h != NULL
+	  && (h->root.type == bfd_link_hash_new
+	      || h->root.type == bfd_link_hash_undefined
+	      || h->root.type == bfd_link_hash_undefweak))
+	{
+	  h->root.type = bfd_link_hash_defined;
+	  h->root.u.def.section = bfd_abs_section_ptr;
+	  h->root.u.def.value = cum_stack;
+	  h->size = 0;
+	  h->type = 0;
+	  h->ref_regular = 1;
+	  h->def_regular = 1;
+	  h->ref_regular_nonweak = 1;
+	  h->forced_local = 1;
+	  h->non_elf = 0;
+	}
+    }
+
+  return TRUE;
+}
+
+/* SEC is part of a pasted function.  Return the call_info for the
+   next section of this function.  */
+
+static struct call_info *
+find_pasted_call (asection *sec)
+{
+  struct _spu_elf_section_data *sec_data = spu_elf_section_data (sec);
+  struct spu_elf_stack_info *sinfo = sec_data->u.i.stack_info;
+  struct call_info *call;
+  int k;
+
+  for (k = 0; k < sinfo->num_fun; ++k)
+    for (call = sinfo->fun[k].call_list; call != NULL; call = call->next)
+      if (call->is_pasted)
+	return call;
+  abort ();
+  return 0;
+}
+
+/* qsort predicate to sort bfds by file name.  */
+
+static int
+sort_bfds (const void *a, const void *b)
+{
+  bfd *const *abfd1 = a;
+  bfd *const *abfd2 = b;
+
+  return filename_cmp ((*abfd1)->filename, (*abfd2)->filename);
+}
+
+static unsigned int
+print_one_overlay_section (FILE *script,
+			   unsigned int base,
+			   unsigned int count,
+			   unsigned int ovlynum,
+			   unsigned int *ovly_map,
+			   asection **ovly_sections,
+			   struct bfd_link_info *info)
+{
+  unsigned int j;
+	  
+  for (j = base; j < count && ovly_map[j] == ovlynum; j++)
+    {
+      asection *sec = ovly_sections[2 * j];
+
+      if (fprintf (script, "   %s%c%s (%s)\n",
+		   (sec->owner->my_archive != NULL
+		    ? sec->owner->my_archive->filename : ""),
+		   info->path_separator,
+		   sec->owner->filename,
+		   sec->name) <= 0)
+	return -1;
+      if (sec->segment_mark)
+	{
+	  struct call_info *call = find_pasted_call (sec);
+	  while (call != NULL)
+	    {
+	      struct function_info *call_fun = call->fun;
+	      sec = call_fun->sec;
+	      if (fprintf (script, "   %s%c%s (%s)\n",
+			   (sec->owner->my_archive != NULL
+			    ? sec->owner->my_archive->filename : ""),
+			   info->path_separator,
+			   sec->owner->filename,
+			   sec->name) <= 0)
+		return -1;
+	      for (call = call_fun->call_list; call; call = call->next)
+		if (call->is_pasted)
+		  break;
+	    }
+	}
+    }
+
+  for (j = base; j < count && ovly_map[j] == ovlynum; j++)
+    {
+      asection *sec = ovly_sections[2 * j + 1];
+      if (sec != NULL
+	  && fprintf (script, "   %s%c%s (%s)\n",
+		      (sec->owner->my_archive != NULL
+		       ? sec->owner->my_archive->filename : ""),
+		      info->path_separator,
+		      sec->owner->filename,
+		      sec->name) <= 0)
+	return -1;
+
+      sec = ovly_sections[2 * j];
+      if (sec->segment_mark)
+	{
+	  struct call_info *call = find_pasted_call (sec);
+	  while (call != NULL)
+	    {
+	      struct function_info *call_fun = call->fun;
+	      sec = call_fun->rodata;
+	      if (sec != NULL
+		  && fprintf (script, "   %s%c%s (%s)\n",
+			      (sec->owner->my_archive != NULL
+			       ? sec->owner->my_archive->filename : ""),
+			      info->path_separator,
+			      sec->owner->filename,
+			      sec->name) <= 0)
+		return -1;
+	      for (call = call_fun->call_list; call; call = call->next)
+		if (call->is_pasted)
+		  break;
+	    }
+	}
+    }
+
+  return j;
+}
+
+/* Handle --auto-overlay.  */
+
+static void
+spu_elf_auto_overlay (struct bfd_link_info *info)
+{
+  bfd *ibfd;
+  bfd **bfd_arr;
+  struct elf_segment_map *m;
+  unsigned int fixed_size, lo, hi;
+  unsigned int reserved;
+  struct spu_link_hash_table *htab;
+  unsigned int base, i, count, bfd_count;
+  unsigned int region, ovlynum;
+  asection **ovly_sections, **ovly_p;
+  unsigned int *ovly_map;
+  FILE *script;
+  unsigned int total_overlay_size, overlay_size;
+  const char *ovly_mgr_entry;
+  struct elf_link_hash_entry *h;
+  struct _mos_param mos_param;
+  struct _uos_param uos_param;
+  struct function_info dummy_caller;
+
+  /* Find the extents of our loadable image.  */
+  lo = (unsigned int) -1;
+  hi = 0;
+  for (m = elf_tdata (info->output_bfd)->segment_map; m != NULL; m = m->next)
+    if (m->p_type == PT_LOAD)
+      for (i = 0; i < m->count; i++)
+	if (m->sections[i]->size != 0)
+	  {
+	    if (m->sections[i]->vma < lo)
+	      lo = m->sections[i]->vma;
+	    if (m->sections[i]->vma + m->sections[i]->size - 1 > hi)
+	      hi = m->sections[i]->vma + m->sections[i]->size - 1;
+	  }
+  fixed_size = hi + 1 - lo;
+
+  if (!discover_functions (info))
+    goto err_exit;
+
+  if (!build_call_tree (info))
+    goto err_exit;
+
+  htab = spu_hash_table (info);
+  reserved = htab->params->auto_overlay_reserved;
+  if (reserved == 0)
+    {
+      struct _sum_stack_param sum_stack_param;
+
+      sum_stack_param.emit_stack_syms = 0;
+      sum_stack_param.overall_stack = 0;
+      if (!for_each_node (sum_stack, info, &sum_stack_param, TRUE))
+	goto err_exit;
+      reserved = (sum_stack_param.overall_stack
+		  + htab->params->extra_stack_space);
+    }
+
+  /* No need for overlays if everything already fits.  */
+  if (fixed_size + reserved <= htab->local_store
+      && htab->params->ovly_flavour != ovly_soft_icache)
+    {
+      htab->params->auto_overlay = 0;
+      return;
+    }
+
+  uos_param.exclude_input_section = 0;
+  uos_param.exclude_output_section
+    = bfd_get_section_by_name (info->output_bfd, ".interrupt");
+
+  ovly_mgr_entry = "__ovly_load";
+  if (htab->params->ovly_flavour == ovly_soft_icache)
+    ovly_mgr_entry = "__icache_br_handler";
+  h = elf_link_hash_lookup (&htab->elf, ovly_mgr_entry,
+			    FALSE, FALSE, FALSE);
+  if (h != NULL
+      && (h->root.type == bfd_link_hash_defined
+	  || h->root.type == bfd_link_hash_defweak)
+      && h->def_regular)
+    {
+      /* We have a user supplied overlay manager.  */
+      uos_param.exclude_input_section = h->root.u.def.section;
+    }
+  else
+    {
+      /* If no user overlay manager, spu_elf_load_ovl_mgr will add our
+	 builtin version to .text, and will adjust .text size.  */
+      fixed_size += (*htab->params->spu_elf_load_ovl_mgr) ();
+    }
+
+  /* Mark overlay sections, and find max overlay section size.  */
+  mos_param.max_overlay_size = 0;
+  if (!for_each_node (mark_overlay_section, info, &mos_param, TRUE))
+    goto err_exit;
+
+  /* We can't put the overlay manager or interrupt routines in
+     overlays.  */
+  uos_param.clearing = 0;
+  if ((uos_param.exclude_input_section
+       || uos_param.exclude_output_section)
+      && !for_each_node (unmark_overlay_section, info, &uos_param, TRUE))
+    goto err_exit;
+
+  bfd_count = 0;
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    ++bfd_count;
+  bfd_arr = bfd_malloc (bfd_count * sizeof (*bfd_arr));
+  if (bfd_arr == NULL)
+    goto err_exit;
+
+  /* Count overlay sections, and subtract their sizes from "fixed_size".  */
+  count = 0;
+  bfd_count = 0;
+  total_overlay_size = 0;
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      extern const bfd_target bfd_elf32_spu_vec;
+      asection *sec;
+      unsigned int old_count;
+
+      if (ibfd->xvec != &bfd_elf32_spu_vec)
+	continue;
+
+      old_count = count;
+      for (sec = ibfd->sections; sec != NULL; sec = sec->next)
+	if (sec->linker_mark)
+	  {
+	    if ((sec->flags & SEC_CODE) != 0)
+	      count += 1;
+	    fixed_size -= sec->size;
+	    total_overlay_size += sec->size;
+	  }
+	else if ((sec->flags & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD)
+		 && sec->output_section->owner == info->output_bfd
+		 && strncmp (sec->output_section->name, ".ovl.init", 9) == 0)
+	  fixed_size -= sec->size;
+      if (count != old_count)
+	bfd_arr[bfd_count++] = ibfd;
+    }
+
+  /* Since the overlay link script selects sections by file name and
+     section name, ensure that file names are unique.  */
+  if (bfd_count > 1)
+    {
+      bfd_boolean ok = TRUE;
+
+      qsort (bfd_arr, bfd_count, sizeof (*bfd_arr), sort_bfds);
+      for (i = 1; i < bfd_count; ++i)
+	if (filename_cmp (bfd_arr[i - 1]->filename, bfd_arr[i]->filename) == 0)
+	  {
+	    if (bfd_arr[i - 1]->my_archive == bfd_arr[i]->my_archive)
+	      {
+		if (bfd_arr[i - 1]->my_archive && bfd_arr[i]->my_archive)
+		  info->callbacks->einfo (_("%s duplicated in %s\n"),
+					  bfd_arr[i]->filename,
+					  bfd_arr[i]->my_archive->filename);
+		else
+		  info->callbacks->einfo (_("%s duplicated\n"),
+					  bfd_arr[i]->filename);
+		ok = FALSE;
+	      }
+	  }
+      if (!ok)
+	{
+	  info->callbacks->einfo (_("sorry, no support for duplicate "
+				    "object files in auto-overlay script\n"));
+	  bfd_set_error (bfd_error_bad_value);
+	  goto err_exit;
+	}
+    }
+  free (bfd_arr);
+
+  fixed_size += reserved;
+  fixed_size += htab->non_ovly_stub * ovl_stub_size (htab->params);
+  if (fixed_size + mos_param.max_overlay_size <= htab->local_store)
+    {
+      if (htab->params->ovly_flavour == ovly_soft_icache)
+	{
+	  /* Stubs in the non-icache area are bigger.  */
+	  fixed_size += htab->non_ovly_stub * 16;
+	  /* Space for icache manager tables.
+	     a) Tag array, one quadword per cache line.
+	     - word 0: ia address of present line, init to zero.  */
+	  fixed_size += 16 << htab->num_lines_log2;
+	  /* b) Rewrite "to" list, one quadword per cache line.  */
+	  fixed_size += 16 << htab->num_lines_log2;
+	  /* c) Rewrite "from" list, one byte per outgoing branch (rounded up
+		to a power-of-two number of full quadwords) per cache line.  */
+	  fixed_size += 16 << (htab->fromelem_size_log2
+			       + htab->num_lines_log2);
+	  /* d) Pointer to __ea backing store (toe), 1 quadword.  */
+	  fixed_size += 16;
+	}
+      else
+	{
+	  /* Guess number of overlays.  Assuming overlay buffer is on
+	     average only half full should be conservative.  */
+	  ovlynum = (total_overlay_size * 2 * htab->params->num_lines
+		     / (htab->local_store - fixed_size));
+	  /* Space for _ovly_table[], _ovly_buf_table[] and toe.  */
+	  fixed_size += ovlynum * 16 + 16 + 4 + 16;
+	}
+    }
+
+  if (fixed_size + mos_param.max_overlay_size > htab->local_store)
+    info->callbacks->einfo (_("non-overlay size of 0x%v plus maximum overlay "
+			      "size of 0x%v exceeds local store\n"),
+			    (bfd_vma) fixed_size,
+			    (bfd_vma) mos_param.max_overlay_size);
+
+  /* Now see if we should put some functions in the non-overlay area.  */
+  else if (fixed_size < htab->params->auto_overlay_fixed)
+    {
+      unsigned int max_fixed, lib_size;
+
+      max_fixed = htab->local_store - mos_param.max_overlay_size;
+      if (max_fixed > htab->params->auto_overlay_fixed)
+	max_fixed = htab->params->auto_overlay_fixed;
+      lib_size = max_fixed - fixed_size;
+      lib_size = auto_ovl_lib_functions (info, lib_size);
+      if (lib_size == (unsigned int) -1)
+	goto err_exit;
+      fixed_size = max_fixed - lib_size;
+    }
+
+  /* Build an array of sections, suitably sorted to place into
+     overlays.  */
+  ovly_sections = bfd_malloc (2 * count * sizeof (*ovly_sections));
+  if (ovly_sections == NULL)
+    goto err_exit;
+  ovly_p = ovly_sections;
+  if (!for_each_node (collect_overlays, info, &ovly_p, TRUE))
+    goto err_exit;
+  count = (size_t) (ovly_p - ovly_sections) / 2;
+  ovly_map = bfd_malloc (count * sizeof (*ovly_map));
+  if (ovly_map == NULL)
+    goto err_exit;
+
+  memset (&dummy_caller, 0, sizeof (dummy_caller));
+  overlay_size = (htab->local_store - fixed_size) / htab->params->num_lines;
+  if (htab->params->line_size != 0)
+    overlay_size = htab->params->line_size;
+  base = 0;
+  ovlynum = 0;
+  while (base < count)
+    {
+      unsigned int size = 0, rosize = 0, roalign = 0;
+
+      for (i = base; i < count; i++)
+	{
+	  asection *sec, *rosec;
+	  unsigned int tmp, rotmp;
+	  unsigned int num_stubs;
+	  struct call_info *call, *pasty;
+	  struct _spu_elf_section_data *sec_data;
+	  struct spu_elf_stack_info *sinfo;
+	  unsigned int k;
+
+	  /* See whether we can add this section to the current
+	     overlay without overflowing our overlay buffer.  */
+	  sec = ovly_sections[2 * i];
+	  tmp = align_power (size, sec->alignment_power) + sec->size;
+	  rotmp = rosize;
+	  rosec = ovly_sections[2 * i + 1];
+	  if (rosec != NULL)
+	    {
+	      rotmp = align_power (rotmp, rosec->alignment_power) + rosec->size;
+	      if (roalign < rosec->alignment_power)
+		roalign = rosec->alignment_power;
+	    }
+	  if (align_power (tmp, roalign) + rotmp > overlay_size)
+	    break;
+	  if (sec->segment_mark)
+	    {
+	      /* Pasted sections must stay together, so add their
+		 sizes too.  */
+	      pasty = find_pasted_call (sec);
+	      while (pasty != NULL)
+		{
+		  struct function_info *call_fun = pasty->fun;
+		  tmp = (align_power (tmp, call_fun->sec->alignment_power)
+			 + call_fun->sec->size);
+		  if (call_fun->rodata)
+		    {
+		      rotmp = (align_power (rotmp,
+					    call_fun->rodata->alignment_power)
+			       + call_fun->rodata->size);
+		      if (roalign < rosec->alignment_power)
+			roalign = rosec->alignment_power;
+		    }
+		  for (pasty = call_fun->call_list; pasty; pasty = pasty->next)
+		    if (pasty->is_pasted)
+		      break;
+		}
+	    }
+	  if (align_power (tmp, roalign) + rotmp > overlay_size)
+	    break;
+
+	  /* If we add this section, we might need new overlay call
+	     stubs.  Add any overlay section calls to dummy_call.  */
+	  pasty = NULL;
+	  sec_data = spu_elf_section_data (sec);
+	  sinfo = sec_data->u.i.stack_info;
+	  for (k = 0; k < (unsigned) sinfo->num_fun; ++k)
+	    for (call = sinfo->fun[k].call_list; call; call = call->next)
+	      if (call->is_pasted)
+		{
+		  BFD_ASSERT (pasty == NULL);
+		  pasty = call;
+		}
+	      else if (call->fun->sec->linker_mark)
+		{
+		  if (!copy_callee (&dummy_caller, call))
+		    goto err_exit;
+		}
+	  while (pasty != NULL)
+	    {
+	      struct function_info *call_fun = pasty->fun;
+	      pasty = NULL;
+	      for (call = call_fun->call_list; call; call = call->next)
+		if (call->is_pasted)
+		  {
+		    BFD_ASSERT (pasty == NULL);
+		    pasty = call;
+		  }
+		else if (!copy_callee (&dummy_caller, call))
+		  goto err_exit;
+	    }
+
+	  /* Calculate call stub size.  */
+	  num_stubs = 0;
+	  for (call = dummy_caller.call_list; call; call = call->next)
+	    {
+	      unsigned int stub_delta = 1;
+
+	      if (htab->params->ovly_flavour == ovly_soft_icache)
+		stub_delta = call->count;
+	      num_stubs += stub_delta;
+
+	      /* If the call is within this overlay, we won't need a
+		 stub.  */
+	      for (k = base; k < i + 1; k++)
+		if (call->fun->sec == ovly_sections[2 * k])
+		  {
+		    num_stubs -= stub_delta;
+		    break;
+		  }
+	    }
+	  if (htab->params->ovly_flavour == ovly_soft_icache
+	      && num_stubs > htab->params->max_branch)
+	    break;
+	  if (align_power (tmp, roalign) + rotmp
+	      + num_stubs * ovl_stub_size (htab->params) > overlay_size)
+	    break;
+	  size = tmp;
+	  rosize = rotmp;
+	}
+
+      if (i == base)
+	{
+	  info->callbacks->einfo (_("%B:%A%s exceeds overlay size\n"),
+				  ovly_sections[2 * i]->owner,
+				  ovly_sections[2 * i],
+				  ovly_sections[2 * i + 1] ? " + rodata" : "");
+	  bfd_set_error (bfd_error_bad_value);
+	  goto err_exit;
+	}
+
+      while (dummy_caller.call_list != NULL)
+	{
+	  struct call_info *call = dummy_caller.call_list;
+	  dummy_caller.call_list = call->next;
+	  free (call);
+	}
+
+      ++ovlynum;
+      while (base < i)
+	ovly_map[base++] = ovlynum;
+    }
+
+  script = htab->params->spu_elf_open_overlay_script ();
+
+  if (htab->params->ovly_flavour == ovly_soft_icache)
+    {
+      if (fprintf (script, "SECTIONS\n{\n") <= 0)
+	goto file_err;
+
+      if (fprintf (script,
+		   " . = ALIGN (%u);\n"
+		   " .ovl.init : { *(.ovl.init) }\n"
+		   " . = ABSOLUTE (ADDR (.ovl.init));\n",
+		   htab->params->line_size) <= 0)
+	goto file_err;
+
+      base = 0;
+      ovlynum = 1;
+      while (base < count)
+	{
+	  unsigned int indx = ovlynum - 1;
+	  unsigned int vma, lma;
+
+	  vma = (indx & (htab->params->num_lines - 1)) << htab->line_size_log2;
+	  lma = vma + (((indx >> htab->num_lines_log2) + 1) << 18);
+
+	  if (fprintf (script, " .ovly%u ABSOLUTE (ADDR (.ovl.init)) + %u "
+			       ": AT (LOADADDR (.ovl.init) + %u) {\n",
+		       ovlynum, vma, lma) <= 0)
+	    goto file_err;
+
+	  base = print_one_overlay_section (script, base, count, ovlynum,
+					    ovly_map, ovly_sections, info);
+	  if (base == (unsigned) -1)
+	    goto file_err;
+
+	  if (fprintf (script, "  }\n") <= 0)
+	    goto file_err;
+
+	  ovlynum++;
+	}
+
+      if (fprintf (script, " . = ABSOLUTE (ADDR (.ovl.init)) + %u;\n",
+		   1 << (htab->num_lines_log2 + htab->line_size_log2)) <= 0)
+	goto file_err;
+
+      if (fprintf (script, "}\nINSERT AFTER .toe;\n") <= 0)
+	goto file_err;
+    }
+  else
+    {
+      if (fprintf (script, "SECTIONS\n{\n") <= 0)
+	goto file_err;
+
+      if (fprintf (script,
+		   " . = ALIGN (16);\n"
+		   " .ovl.init : { *(.ovl.init) }\n"
+		   " . = ABSOLUTE (ADDR (.ovl.init));\n") <= 0)
+	goto file_err;
+
+      for (region = 1; region <= htab->params->num_lines; region++)
+	{
+	  ovlynum = region;
+	  base = 0;
+	  while (base < count && ovly_map[base] < ovlynum)
+	    base++;
+
+	  if (base == count)
+	    break;
+
+	  if (region == 1)
+	    {
+	      /* We need to set lma since we are overlaying .ovl.init.  */
+	      if (fprintf (script,
+			   " OVERLAY : AT (ALIGN (LOADADDR (.ovl.init) + SIZEOF (.ovl.init), 16))\n {\n") <= 0)
+		goto file_err;
+	    }
+	  else
+	    {
+	      if (fprintf (script, " OVERLAY :\n {\n") <= 0)
+		goto file_err;
+	    }
+
+	  while (base < count)
+	    {
+	      if (fprintf (script, "  .ovly%u {\n", ovlynum) <= 0)
+		goto file_err;
+
+	      base = print_one_overlay_section (script, base, count, ovlynum,
+						ovly_map, ovly_sections, info);
+	      if (base == (unsigned) -1)
+		goto file_err;
+
+	      if (fprintf (script, "  }\n") <= 0)
+		goto file_err;
+
+	      ovlynum += htab->params->num_lines;
+	      while (base < count && ovly_map[base] < ovlynum)
+		base++;
+	    }
+
+	  if (fprintf (script, " }\n") <= 0)
+	    goto file_err;
+	}
+
+      if (fprintf (script, "}\nINSERT BEFORE .text;\n") <= 0)
+	goto file_err;
+    }
+
+  free (ovly_map);
+  free (ovly_sections);
+
+  if (fclose (script) != 0)
+    goto file_err;
+
+  if (htab->params->auto_overlay & AUTO_RELINK)
+    (*htab->params->spu_elf_relink) ();
+
+  xexit (0);
+
+ file_err:
+  bfd_set_error (bfd_error_system_call);
+ err_exit:
+  info->callbacks->einfo ("%F%P: auto overlay error: %E\n");
+  xexit (1);
+}
+
+/* Provide an estimate of total stack required.  */
+
+static bfd_boolean
+spu_elf_stack_analysis (struct bfd_link_info *info)
+{
+  struct spu_link_hash_table *htab;
+  struct _sum_stack_param sum_stack_param;
+
+  if (!discover_functions (info))
+    return FALSE;
+
+  if (!build_call_tree (info))
+    return FALSE;
+
+  htab = spu_hash_table (info);
+  if (htab->params->stack_analysis)
+    {
+      info->callbacks->info (_("Stack size for call graph root nodes.\n"));
+      info->callbacks->minfo (_("\nStack size for functions.  "
+				"Annotations: '*' max stack, 't' tail call\n"));
+    }
+
+  sum_stack_param.emit_stack_syms = htab->params->emit_stack_syms;
+  sum_stack_param.overall_stack = 0;
+  if (!for_each_node (sum_stack, info, &sum_stack_param, TRUE))
+    return FALSE;
+
+  if (htab->params->stack_analysis)
+    info->callbacks->info (_("Maximum stack required is 0x%v\n"),
+			   (bfd_vma) sum_stack_param.overall_stack);
+  return TRUE;
+}
+
+/* Perform a final link.  */
+
+static bfd_boolean
+spu_elf_final_link (bfd *output_bfd, struct bfd_link_info *info)
+{
+  struct spu_link_hash_table *htab = spu_hash_table (info);
+
+  if (htab->params->auto_overlay)
+    spu_elf_auto_overlay (info);
+
+  if ((htab->params->stack_analysis
+       || (htab->params->ovly_flavour == ovly_soft_icache
+	   && htab->params->lrlive_analysis))
+      && !spu_elf_stack_analysis (info))
+    info->callbacks->einfo ("%X%P: stack/lrlive analysis error: %E\n");
+
+  if (!spu_elf_build_stubs (info))
+    info->callbacks->einfo ("%F%P: can not build overlay stubs: %E\n");
+
+  return bfd_elf_final_link (output_bfd, info);
+}
+
+/* Called when not normally emitting relocs, ie. !info->relocatable
+   and !info->emitrelocations.  Returns a count of special relocs
+   that need to be emitted.  */
+
+static unsigned int
+spu_elf_count_relocs (struct bfd_link_info *info, asection *sec)
+{
+  Elf_Internal_Rela *relocs;
+  unsigned int count = 0;
+
+  relocs = _bfd_elf_link_read_relocs (sec->owner, sec, NULL, NULL,
+				      info->keep_memory);
+  if (relocs != NULL)
+    {
+      Elf_Internal_Rela *rel;
+      Elf_Internal_Rela *relend = relocs + sec->reloc_count;
+
+      for (rel = relocs; rel < relend; rel++)
+	{
+	  int r_type = ELF32_R_TYPE (rel->r_info);
+	  if (r_type == R_SPU_PPU32 || r_type == R_SPU_PPU64)
+	    ++count;
+	}
+
+      if (elf_section_data (sec)->relocs != relocs)
+	free (relocs);
+    }
+
+  return count;
+}
+
+/* Functions for adding fixup records to .fixup */
+
+#define FIXUP_RECORD_SIZE 4
+
+#define FIXUP_PUT(output_bfd,htab,index,addr) \
+	  bfd_put_32 (output_bfd, addr, \
+		      htab->sfixup->contents + FIXUP_RECORD_SIZE * (index))
+#define FIXUP_GET(output_bfd,htab,index) \
+	  bfd_get_32 (output_bfd, \
+		      htab->sfixup->contents + FIXUP_RECORD_SIZE * (index))
+
+/* Store OFFSET in .fixup.  This assumes it will be called with an
+   increasing OFFSET.  When this OFFSET fits with the last base offset,
+   it just sets a bit, otherwise it adds a new fixup record.  */
+static void
+spu_elf_emit_fixup (bfd * output_bfd, struct bfd_link_info *info,
+		    bfd_vma offset)
+{
+  struct spu_link_hash_table *htab = spu_hash_table (info);
+  asection *sfixup = htab->sfixup;
+  bfd_vma qaddr = offset & ~(bfd_vma) 15;
+  bfd_vma bit = ((bfd_vma) 8) >> ((offset & 15) >> 2);
+  if (sfixup->reloc_count == 0)
+    {
+      FIXUP_PUT (output_bfd, htab, 0, qaddr | bit);
+      sfixup->reloc_count++;
+    }
+  else
+    {
+      bfd_vma base = FIXUP_GET (output_bfd, htab, sfixup->reloc_count - 1);
+      if (qaddr != (base & ~(bfd_vma) 15))
+	{
+	  if ((sfixup->reloc_count + 1) * FIXUP_RECORD_SIZE > sfixup->size)
+	    (*_bfd_error_handler) (_("fatal error while creating .fixup"));
+	  FIXUP_PUT (output_bfd, htab, sfixup->reloc_count, qaddr | bit);
+	  sfixup->reloc_count++;
+	}
+      else
+	FIXUP_PUT (output_bfd, htab, sfixup->reloc_count - 1, base | bit);
+    }
+}
+
+/* Apply RELOCS to CONTENTS of INPUT_SECTION from INPUT_BFD.  */
+
+static int
+spu_elf_relocate_section (bfd *output_bfd,
+			  struct bfd_link_info *info,
+			  bfd *input_bfd,
+			  asection *input_section,
+			  bfd_byte *contents,
+			  Elf_Internal_Rela *relocs,
+			  Elf_Internal_Sym *local_syms,
+			  asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel, *relend;
+  struct spu_link_hash_table *htab;
+  asection *ea;
+  int ret = TRUE;
+  bfd_boolean emit_these_relocs = FALSE;
+  bfd_boolean is_ea_sym;
+  bfd_boolean stubs;
+  unsigned int iovl = 0;
+
+  htab = spu_hash_table (info);
+  stubs = (htab->stub_sec != NULL
+	   && maybe_needs_stubs (input_section));
+  iovl = overlay_index (input_section);
+  ea = bfd_get_section_by_name (output_bfd, "._ea");
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = (struct elf_link_hash_entry **) (elf_sym_hashes (input_bfd));
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      int r_type;
+      reloc_howto_type *howto;
+      unsigned int r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      const char *sym_name;
+      bfd_vma relocation;
+      bfd_vma addend;
+      bfd_reloc_status_type r;
+      bfd_boolean unresolved_reloc;
+      enum _stub_type stub_type;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+      howto = elf_howto_table + r_type;
+      unresolved_reloc = FALSE;
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  sym_name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym, sec);
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+      else
+	{
+	  if (sym_hashes == NULL)
+	    return FALSE;
+
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+	  relocation = 0;
+	  if (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	    {
+	      sec = h->root.u.def.section;
+	      if (sec == NULL
+		  || sec->output_section == NULL)
+		/* Set a flag that will be cleared later if we find a
+		   relocation value for this symbol.  output_section
+		   is typically NULL for symbols satisfied by a shared
+		   library.  */
+		unresolved_reloc = TRUE;
+	      else
+		relocation = (h->root.u.def.value
+			      + sec->output_section->vma
+			      + sec->output_offset);
+	    }
+	  else if (h->root.type == bfd_link_hash_undefweak)
+	    ;
+	  else if (info->unresolved_syms_in_objects == RM_IGNORE
+		   && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT)
+	    ;
+	  else if (!info->relocatable
+		   && !(r_type == R_SPU_PPU32 || r_type == R_SPU_PPU64))
+	    {
+	      bfd_boolean err;
+	      err = (info->unresolved_syms_in_objects == RM_GENERATE_ERROR
+		     || ELF_ST_VISIBILITY (h->other) != STV_DEFAULT);
+	      if (!info->callbacks->undefined_symbol (info,
+						      h->root.root.string,
+						      input_bfd,
+						      input_section,
+						      rel->r_offset, err))
+		return FALSE;
+	    }
+	  sym_name = h->root.root.string;
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      /* Change "a rt,ra,rb" to "ai rt,ra,0". */
+      if (r_type == R_SPU_ADD_PIC
+	  && h != NULL
+	  && !(h->def_regular || ELF_COMMON_DEF_P (h)))
+	{
+	  bfd_byte *loc = contents + rel->r_offset;
+	  loc[0] = 0x1c; 
+	  loc[1] = 0x00; 
+	  loc[2] &= 0x3f;
+	}
+
+      is_ea_sym = (ea != NULL
+		   && sec != NULL
+		   && sec->output_section == ea);
+
+      /* If this symbol is in an overlay area, we may need to relocate
+	 to the overlay stub.  */
+      addend = rel->r_addend;
+      if (stubs
+	  && !is_ea_sym
+	  && (stub_type = needs_ovl_stub (h, sym, sec, input_section, rel,
+					  contents, info)) != no_stub)
+	{
+	  unsigned int ovl = 0;
+	  struct got_entry *g, **head;
+
+	  if (stub_type != nonovl_stub)
+	    ovl = iovl;
+
+	  if (h != NULL)
+	    head = &h->got.glist;
+	  else
+	    head = elf_local_got_ents (input_bfd) + r_symndx;
+
+	  for (g = *head; g != NULL; g = g->next)
+	    if (htab->params->ovly_flavour == ovly_soft_icache
+		? (g->ovl == ovl
+		   && g->br_addr == (rel->r_offset
+				     + input_section->output_offset
+				     + input_section->output_section->vma))
+		: g->addend == addend && (g->ovl == ovl || g->ovl == 0))
+	      break;
+	  if (g == NULL)
+	    abort ();
+
+	  relocation = g->stub_addr;
+	  addend = 0;
+	}
+      else
+	{
+	  /* For soft icache, encode the overlay index into addresses.  */
+	  if (htab->params->ovly_flavour == ovly_soft_icache
+	      && (r_type == R_SPU_ADDR16_HI
+		  || r_type == R_SPU_ADDR32 || r_type == R_SPU_REL32)
+	      && !is_ea_sym)
+	    {
+	      unsigned int ovl = overlay_index (sec);
+	      if (ovl != 0)
+		{
+		  unsigned int set_id = ((ovl - 1) >> htab->num_lines_log2) + 1;
+		  relocation += set_id << 18;
+		}
+	    }
+	}
+
+      if (htab->params->emit_fixups && !info->relocatable
+	  && (input_section->flags & SEC_ALLOC) != 0
+	  && r_type == R_SPU_ADDR32)
+	{
+	  bfd_vma offset;
+	  offset = rel->r_offset + input_section->output_section->vma
+		   + input_section->output_offset;
+	  spu_elf_emit_fixup (output_bfd, info, offset);
+	}
+
+      if (unresolved_reloc)
+	;
+      else if (r_type == R_SPU_PPU32 || r_type == R_SPU_PPU64)
+	{
+	  if (is_ea_sym)
+	    {
+	      /* ._ea is a special section that isn't allocated in SPU
+		 memory, but rather occupies space in PPU memory as
+		 part of an embedded ELF image.  If this reloc is
+		 against a symbol defined in ._ea, then transform the
+		 reloc into an equivalent one without a symbol
+		 relative to the start of the ELF image.  */
+	      rel->r_addend += (relocation
+				- ea->vma
+				+ elf_section_data (ea)->this_hdr.sh_offset);
+	      rel->r_info = ELF32_R_INFO (0, r_type);
+	    }
+	  emit_these_relocs = TRUE;
+	  continue;
+	}
+      else if (is_ea_sym)
+	unresolved_reloc = TRUE;
+
+      if (unresolved_reloc)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B(%s+0x%lx): unresolvable %s relocation against symbol `%s'"),
+	     input_bfd,
+	     bfd_get_section_name (input_bfd, input_section),
+	     (long) rel->r_offset,
+	     howto->name,
+	     sym_name);
+	  ret = FALSE;
+	}
+
+      r = _bfd_final_link_relocate (howto,
+				    input_bfd,
+				    input_section,
+				    contents,
+				    rel->r_offset, relocation, addend);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char *msg = (const char *) 0;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      if (!((*info->callbacks->reloc_overflow)
+		    (info, (h ? &h->root : NULL), sym_name, howto->name,
+		     (bfd_vma) 0, input_bfd, input_section, rel->r_offset)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_undefined:
+	      if (!((*info->callbacks->undefined_symbol)
+		    (info, sym_name, input_bfd, input_section,
+		     rel->r_offset, TRUE)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      goto common_error;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      goto common_error;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous error");
+	      goto common_error;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      /* fall through */
+
+	    common_error:
+	      ret = FALSE;
+	      if (!((*info->callbacks->warning)
+		    (info, msg, sym_name, input_bfd, input_section,
+		     rel->r_offset)))
+		return FALSE;
+	      break;
+	    }
+	}
+    }
+
+  if (ret
+      && emit_these_relocs
+      && !info->emitrelocations)
+    {
+      Elf_Internal_Rela *wrel;
+      Elf_Internal_Shdr *rel_hdr;
+
+      wrel = rel = relocs;
+      relend = relocs + input_section->reloc_count;
+      for (; rel < relend; rel++)
+	{
+	  int r_type;
+
+	  r_type = ELF32_R_TYPE (rel->r_info);
+	  if (r_type == R_SPU_PPU32 || r_type == R_SPU_PPU64)
+	    *wrel++ = *rel;
+	}
+      input_section->reloc_count = wrel - relocs;
+      /* Backflips for _bfd_elf_link_output_relocs.  */
+      rel_hdr = _bfd_elf_single_rel_hdr (input_section);
+      rel_hdr->sh_size = input_section->reloc_count * rel_hdr->sh_entsize;
+      ret = 2;
+    }
+
+  return ret;
+}
+
+static bfd_boolean
+spu_elf_finish_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+				 struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+/* Adjust _SPUEAR_ syms to point at their overlay stubs.  */
+
+static int
+spu_elf_output_symbol_hook (struct bfd_link_info *info,
+			    const char *sym_name ATTRIBUTE_UNUSED,
+			    Elf_Internal_Sym *sym,
+			    asection *sym_sec ATTRIBUTE_UNUSED,
+			    struct elf_link_hash_entry *h)
+{
+  struct spu_link_hash_table *htab = spu_hash_table (info);
+
+  if (!info->relocatable
+      && htab->stub_sec != NULL
+      && h != NULL
+      && (h->root.type == bfd_link_hash_defined
+	  || h->root.type == bfd_link_hash_defweak)
+      && h->def_regular
+      && strncmp (h->root.root.string, "_SPUEAR_", 8) == 0)
+    {
+      struct got_entry *g;
+
+      for (g = h->got.glist; g != NULL; g = g->next)
+	if (htab->params->ovly_flavour == ovly_soft_icache
+	    ? g->br_addr == g->stub_addr
+	    : g->addend == 0 && g->ovl == 0)
+	  {
+	    sym->st_shndx = (_bfd_elf_section_from_bfd_section
+			     (htab->stub_sec[0]->output_section->owner,
+			      htab->stub_sec[0]->output_section));
+	    sym->st_value = g->stub_addr;
+	    break;
+	  }
+    }
+
+  return 1;
+}
+
+static int spu_plugin = 0;
+
+void
+spu_elf_plugin (int val)
+{
+  spu_plugin = val;
+}
+
+/* Set ELF header e_type for plugins.  */
+
+static void
+spu_elf_post_process_headers (bfd *abfd,
+			      struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  if (spu_plugin)
+    {
+      Elf_Internal_Ehdr *i_ehdrp = elf_elfheader (abfd);
+
+      i_ehdrp->e_type = ET_DYN;
+    }
+}
+
+/* We may add an extra PT_LOAD segment for .toe.  We also need extra
+   segments for overlays.  */
+
+static int
+spu_elf_additional_program_headers (bfd *abfd, struct bfd_link_info *info)
+{
+  int extra = 0;
+  asection *sec;
+
+  if (info != NULL)
+    {
+      struct spu_link_hash_table *htab = spu_hash_table (info);
+      extra = htab->num_overlays;
+    }
+
+  if (extra)
+    ++extra;
+
+  sec = bfd_get_section_by_name (abfd, ".toe");
+  if (sec != NULL && (sec->flags & SEC_LOAD) != 0)
+    ++extra;
+
+  return extra;
+}
+
+/* Remove .toe section from other PT_LOAD segments and put it in
+   a segment of its own.  Put overlays in separate segments too.  */
+
+static bfd_boolean
+spu_elf_modify_segment_map (bfd *abfd, struct bfd_link_info *info)
+{
+  asection *toe, *s;
+  struct elf_segment_map *m, *m_overlay;
+  struct elf_segment_map **p, **p_overlay;
+  unsigned int i;
+
+  if (info == NULL)
+    return TRUE;
+
+  toe = bfd_get_section_by_name (abfd, ".toe");
+  for (m = elf_tdata (abfd)->segment_map; m != NULL; m = m->next)
+    if (m->p_type == PT_LOAD && m->count > 1)
+      for (i = 0; i < m->count; i++)
+	if ((s = m->sections[i]) == toe
+	    || spu_elf_section_data (s)->u.o.ovl_index != 0)
+	  {
+	    struct elf_segment_map *m2;
+	    bfd_vma amt;
+
+	    if (i + 1 < m->count)
+	      {
+		amt = sizeof (struct elf_segment_map);
+		amt += (m->count - (i + 2)) * sizeof (m->sections[0]);
+		m2 = bfd_zalloc (abfd, amt);
+		if (m2 == NULL)
+		  return FALSE;
+		m2->count = m->count - (i + 1);
+		memcpy (m2->sections, m->sections + i + 1,
+			m2->count * sizeof (m->sections[0]));
+		m2->p_type = PT_LOAD;
+		m2->next = m->next;
+		m->next = m2;
+	      }
+	    m->count = 1;
+	    if (i != 0)
+	      {
+		m->count = i;
+		amt = sizeof (struct elf_segment_map);
+		m2 = bfd_zalloc (abfd, amt);
+		if (m2 == NULL)
+		  return FALSE;
+		m2->p_type = PT_LOAD;
+		m2->count = 1;
+		m2->sections[0] = s;
+		m2->next = m->next;
+		m->next = m2;
+	      }
+	    break;
+	  }
+
+
+  /* Some SPU ELF loaders ignore the PF_OVERLAY flag and just load all
+     PT_LOAD segments.  This can cause the .ovl.init section to be
+     overwritten with the contents of some overlay segment.  To work
+     around this issue, we ensure that all PF_OVERLAY segments are
+     sorted first amongst the program headers; this ensures that even
+     with a broken loader, the .ovl.init section (which is not marked
+     as PF_OVERLAY) will be placed into SPU local store on startup.  */
+
+  /* Move all overlay segments onto a separate list.  */
+  p = &elf_tdata (abfd)->segment_map;
+  p_overlay = &m_overlay;
+  while (*p != NULL)
+    {
+      if ((*p)->p_type == PT_LOAD && (*p)->count == 1
+	  && spu_elf_section_data ((*p)->sections[0])->u.o.ovl_index != 0)
+	{
+	  m = *p;
+	  *p = m->next;
+	  *p_overlay = m;
+	  p_overlay = &m->next;
+	  continue;
+	}
+
+      p = &((*p)->next);
+    }
+
+  /* Re-insert overlay segments at the head of the segment map.  */
+  *p_overlay = elf_tdata (abfd)->segment_map;
+  elf_tdata (abfd)->segment_map = m_overlay;
+
+  return TRUE;
+}
+
+/* Tweak the section type of .note.spu_name.  */
+
+static bfd_boolean
+spu_elf_fake_sections (bfd *obfd ATTRIBUTE_UNUSED,
+		       Elf_Internal_Shdr *hdr,
+		       asection *sec)
+{
+  if (strcmp (sec->name, SPU_PTNOTE_SPUNAME) == 0)
+    hdr->sh_type = SHT_NOTE;
+  return TRUE;
+}
+
+/* Tweak phdrs before writing them out.  */
+
+static int
+spu_elf_modify_program_headers (bfd *abfd, struct bfd_link_info *info)
+{
+  const struct elf_backend_data *bed;
+  struct elf_obj_tdata *tdata;
+  Elf_Internal_Phdr *phdr, *last;
+  struct spu_link_hash_table *htab;
+  unsigned int count;
+  unsigned int i;
+
+  if (info == NULL)
+    return TRUE;
+
+  bed = get_elf_backend_data (abfd);
+  tdata = elf_tdata (abfd);
+  phdr = tdata->phdr;
+  count = tdata->program_header_size / bed->s->sizeof_phdr;
+  htab = spu_hash_table (info);
+  if (htab->num_overlays != 0)
+    {
+      struct elf_segment_map *m;
+      unsigned int o;
+
+      for (i = 0, m = elf_tdata (abfd)->segment_map; m; ++i, m = m->next)
+	if (m->count != 0
+	    && (o = spu_elf_section_data (m->sections[0])->u.o.ovl_index) != 0)
+	  {
+	    /* Mark this as an overlay header.  */
+	    phdr[i].p_flags |= PF_OVERLAY;
+
+	    if (htab->ovtab != NULL && htab->ovtab->size != 0
+		&& htab->params->ovly_flavour != ovly_soft_icache)
+	      {
+		bfd_byte *p = htab->ovtab->contents;
+		unsigned int off = o * 16 + 8;
+
+		/* Write file_off into _ovly_table.  */
+		bfd_put_32 (htab->ovtab->owner, phdr[i].p_offset, p + off);
+	      }
+	  }
+      /* Soft-icache has its file offset put in .ovl.init.  */
+      if (htab->init != NULL && htab->init->size != 0)
+	{
+	  bfd_vma val = elf_section_data (htab->ovl_sec[0])->this_hdr.sh_offset;
+
+	  bfd_put_32 (htab->init->owner, val, htab->init->contents + 4);
+	}
+    }
+
+  /* Round up p_filesz and p_memsz of PT_LOAD segments to multiples
+     of 16.  This should always be possible when using the standard
+     linker scripts, but don't create overlapping segments if
+     someone is playing games with linker scripts.  */
+  last = NULL;
+  for (i = count; i-- != 0; )
+    if (phdr[i].p_type == PT_LOAD)
+      {
+	unsigned adjust;
+
+	adjust = -phdr[i].p_filesz & 15;
+	if (adjust != 0
+	    && last != NULL
+	    && phdr[i].p_offset + phdr[i].p_filesz > last->p_offset - adjust)
+	  break;
+
+	adjust = -phdr[i].p_memsz & 15;
+	if (adjust != 0
+	    && last != NULL
+	    && phdr[i].p_filesz != 0
+	    && phdr[i].p_vaddr + phdr[i].p_memsz > last->p_vaddr - adjust
+	    && phdr[i].p_vaddr + phdr[i].p_memsz <= last->p_vaddr)
+	  break;
+
+	if (phdr[i].p_filesz != 0)
+	  last = &phdr[i];
+      }
+
+  if (i == (unsigned int) -1)
+    for (i = count; i-- != 0; )
+      if (phdr[i].p_type == PT_LOAD)
+	{
+	unsigned adjust;
+
+	adjust = -phdr[i].p_filesz & 15;
+	phdr[i].p_filesz += adjust;
+
+	adjust = -phdr[i].p_memsz & 15;
+	phdr[i].p_memsz += adjust;
+      }
+
+  return TRUE;
+}
+
+bfd_boolean
+spu_elf_size_sections (bfd * output_bfd, struct bfd_link_info *info)
+{
+  struct spu_link_hash_table *htab = spu_hash_table (info);
+  if (htab->params->emit_fixups)
+    {
+      asection *sfixup = htab->sfixup;
+      int fixup_count = 0;
+      bfd *ibfd;
+      size_t size;
+
+      for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+	{
+	  asection *isec;
+
+	  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour)
+	    continue;
+
+	  /* Walk over each section attached to the input bfd.  */
+	  for (isec = ibfd->sections; isec != NULL; isec = isec->next)
+	    {
+	      Elf_Internal_Rela *internal_relocs, *irelaend, *irela;
+	      bfd_vma base_end;
+
+	      /* If there aren't any relocs, then there's nothing more
+	         to do.  */
+	      if ((isec->flags & SEC_ALLOC) == 0
+		  || (isec->flags & SEC_RELOC) == 0
+		  || isec->reloc_count == 0)
+		continue;
+
+	      /* Get the relocs.  */
+	      internal_relocs =
+		_bfd_elf_link_read_relocs (ibfd, isec, NULL, NULL,
+					   info->keep_memory);
+	      if (internal_relocs == NULL)
+		return FALSE;
+
+	      /* 1 quadword can contain up to 4 R_SPU_ADDR32
+	         relocations.  They are stored in a single word by
+	         saving the upper 28 bits of the address and setting the
+	         lower 4 bits to a bit mask of the words that have the
+	         relocation.  BASE_END keeps track of the next quadword. */
+	      irela = internal_relocs;
+	      irelaend = irela + isec->reloc_count;
+	      base_end = 0;
+	      for (; irela < irelaend; irela++)
+		if (ELF32_R_TYPE (irela->r_info) == R_SPU_ADDR32
+		    && irela->r_offset >= base_end)
+		  {
+		    base_end = (irela->r_offset & ~(bfd_vma) 15) + 16;
+		    fixup_count++;
+		  }
+	    }
+	}
+
+      /* We always have a NULL fixup as a sentinel */
+      size = (fixup_count + 1) * FIXUP_RECORD_SIZE;
+      if (!bfd_set_section_size (output_bfd, sfixup, size))
+	return FALSE;
+      sfixup->contents = (bfd_byte *) bfd_zalloc (info->input_bfds, size);
+      if (sfixup->contents == NULL)
+	return FALSE;
+    }
+  return TRUE;
+}
+
+#define TARGET_BIG_SYM		bfd_elf32_spu_vec
+#define TARGET_BIG_NAME		"elf32-spu"
+#define ELF_ARCH		bfd_arch_spu
+#define ELF_TARGET_ID		SPU_ELF_DATA
+#define ELF_MACHINE_CODE	EM_SPU
+/* This matches the alignment need for DMA.  */
+#define ELF_MAXPAGESIZE		0x80
+#define elf_backend_rela_normal         1
+#define elf_backend_can_gc_sections	1
+
+#define bfd_elf32_bfd_reloc_type_lookup		spu_elf_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup		spu_elf_reloc_name_lookup
+#define elf_info_to_howto			spu_elf_info_to_howto
+#define elf_backend_count_relocs		spu_elf_count_relocs
+#define elf_backend_relocate_section		spu_elf_relocate_section
+#define elf_backend_finish_dynamic_sections	spu_elf_finish_dynamic_sections
+#define elf_backend_symbol_processing		spu_elf_backend_symbol_processing
+#define elf_backend_link_output_symbol_hook	spu_elf_output_symbol_hook
+#define elf_backend_object_p			spu_elf_object_p
+#define bfd_elf32_new_section_hook		spu_elf_new_section_hook
+#define bfd_elf32_bfd_link_hash_table_create	spu_elf_link_hash_table_create
+
+#define elf_backend_additional_program_headers	spu_elf_additional_program_headers
+#define elf_backend_modify_segment_map		spu_elf_modify_segment_map
+#define elf_backend_modify_program_headers	spu_elf_modify_program_headers
+#define elf_backend_post_process_headers        spu_elf_post_process_headers
+#define elf_backend_fake_sections		spu_elf_fake_sections
+#define elf_backend_special_sections		spu_elf_special_sections
+#define bfd_elf32_bfd_final_link		spu_elf_final_link
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-spu.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-spu.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-spu.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-spu.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,124 @@
+/* SPU specific support for 32-bit ELF.
+
+   Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+struct spu_elf_params
+{
+  /* Stash various callbacks for --auto-overlay.  */
+  void (*place_spu_section) (asection *, asection *, const char *);
+  bfd_size_type (*spu_elf_load_ovl_mgr) (void);
+  FILE *(*spu_elf_open_overlay_script) (void);
+  void (*spu_elf_relink) (void);
+
+  /* Bit 0 set if --auto-overlay.
+     Bit 1 set if --auto-relink.
+     Bit 2 set if --overlay-rodata.  */
+  unsigned int auto_overlay : 3;
+#define AUTO_OVERLAY 1
+#define AUTO_RELINK 2
+#define OVERLAY_RODATA 4
+
+  /* Type of overlays, enum _ovly_flavour.  */
+  unsigned int ovly_flavour : 1;
+  unsigned int compact_stub : 1;
+
+  /* Set if we should emit symbols for stubs.  */
+  unsigned int emit_stub_syms : 1;
+
+  /* Set if we want stubs on calls out of overlay regions to
+     non-overlay regions.  */
+  unsigned int non_overlay_stubs : 1;
+
+  /* Set if lr liveness analysis should be done.  */
+  unsigned int lrlive_analysis : 1;
+
+  /* Set if stack size analysis should be done.  */
+  unsigned int stack_analysis : 1;
+
+  /* Set if __stack_* syms will be emitted.  */
+  unsigned int emit_stack_syms : 1;
+
+  /* Set if non-icache code should be allowed in icache lines.  */
+  unsigned int non_ia_text : 1;
+
+  /* Set when the .fixup section should be generated. */
+  unsigned int emit_fixups : 1;
+
+  /* Range of valid addresses for loadable sections.  */
+  bfd_vma local_store_lo;
+  bfd_vma local_store_hi;
+
+  /* Control --auto-overlay feature.  */
+  unsigned int num_lines;
+  unsigned int line_size;
+  unsigned int max_branch;
+  unsigned int auto_overlay_fixed;
+  unsigned int auto_overlay_reserved;
+  int extra_stack_space;
+};
+
+/* Extra info kept for SPU sections.  */
+
+struct spu_elf_stack_info;
+
+struct _spu_elf_section_data
+{
+  struct bfd_elf_section_data elf;
+
+  union {
+    /* Info kept for input sections.  */
+    struct {
+      /* Stack analysis info kept for this section.  */
+      struct spu_elf_stack_info *stack_info;
+    } i;
+
+    /* Info kept for output sections.  */
+    struct {
+      /* Non-zero for overlay output sections.  */
+      unsigned int ovl_index;
+      unsigned int ovl_buf;
+    } o;
+  } u;
+};
+
+#define spu_elf_section_data(sec) \
+  ((struct _spu_elf_section_data *) elf_section_data (sec))
+
+enum _ovly_flavour
+{
+  ovly_normal,
+  ovly_soft_icache
+};
+
+struct _ovl_stream
+{
+  const void *start;
+  const void *end;
+};
+
+extern void spu_elf_setup (struct bfd_link_info *, struct spu_elf_params *);
+extern void spu_elf_plugin (int);
+extern bfd_boolean spu_elf_open_builtin_lib (bfd **,
+					     const struct _ovl_stream *);
+extern bfd_boolean spu_elf_create_sections (struct bfd_link_info *);
+extern bfd_boolean spu_elf_size_sections (bfd *, struct bfd_link_info *);
+extern int spu_elf_find_overlays (struct bfd_link_info *);
+extern int spu_elf_size_stubs (struct bfd_link_info *);
+extern void spu_elf_place_overlay_data (struct bfd_link_info *);
+extern asection *spu_elf_check_vma (struct bfd_link_info *);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-tic6x.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-tic6x.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-tic6x.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-tic6x.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4587 @@
+/* 32-bit ELF support for TI C6X
+   Copyright 2010, 2011
+   Free Software Foundation, Inc.
+   Contributed by Joseph Myers <joseph@codesourcery.com>
+   		  Bernd Schmidt  <bernds@codesourcery.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include <limits.h>
+#include "bfd.h"
+#include "libbfd.h"
+#include "libiberty.h"
+#include "elf-bfd.h"
+#include "elf/tic6x.h"
+#include "elf32-tic6x.h"
+
+#define ELF_DYNAMIC_INTERPRETER "/lib/ld-uClibc.so.0"
+
+/* DSBT binaries have a default 128K stack.  */
+#define DEFAULT_STACK_SIZE 0x20000
+
+/* The size in bytes of an entry in the procedure linkage table.  */
+#define PLT_ENTRY_SIZE 24
+
+/* TI C6X ELF linker hash table.  */
+
+struct elf32_tic6x_link_hash_table
+{
+  struct elf_link_hash_table elf;
+
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *sdynbss;
+  asection *srelbss;
+
+  /* C6X specific command line arguments.  */
+  struct elf32_tic6x_params params;
+
+  /* Small local sym cache.  */
+  struct sym_cache sym_cache;
+
+  /* The output BFD, for convenience.  */
+  bfd *obfd;
+
+  /* The .dsbt section.  */
+  asection *dsbt;
+};
+
+/* Get the TI C6X ELF linker hash table from a link_info structure.  */
+
+#define elf32_tic6x_hash_table(p) \
+  ((struct elf32_tic6x_link_hash_table *) ((p)->hash))
+
+/* TI C6X ELF linker hash entry.  */
+
+struct elf32_tic6x_link_hash_entry
+{
+  struct elf_link_hash_entry elf;
+
+  /* Track dynamic relocs copied for this symbol.  */
+  struct elf_dyn_relocs *dyn_relocs;
+};
+
+typedef enum
+{
+  DELETE_EXIDX_ENTRY,
+  INSERT_EXIDX_CANTUNWIND_AT_END
+}
+tic6x_unwind_edit_type;
+
+/* A (sorted) list of edits to apply to an unwind table.  */
+typedef struct tic6x_unwind_table_edit
+{
+  tic6x_unwind_edit_type type;
+  /* Note: we sometimes want to insert an unwind entry corresponding to a
+     section different from the one we're currently writing out, so record the
+     (text) section this edit relates to here.  */
+  asection *linked_section;
+  unsigned int index;
+  struct tic6x_unwind_table_edit *next;
+}
+tic6x_unwind_table_edit;
+
+typedef struct _tic6x_elf_section_data
+{
+  /* Information about mapping symbols.  */
+  struct bfd_elf_section_data elf;
+  /* Information about unwind tables.  */
+  union
+  {
+    /* Unwind info attached to a text section.  */
+    struct
+    {
+      asection *tic6x_exidx_sec;
+    } text;
+
+    /* Unwind info attached to an .c6xabi.exidx section.  */
+    struct
+    {
+      tic6x_unwind_table_edit *unwind_edit_list;
+      tic6x_unwind_table_edit *unwind_edit_tail;
+    } exidx;
+  } u;
+}
+_tic6x_elf_section_data;
+
+#define elf32_tic6x_section_data(sec) \
+  ((_tic6x_elf_section_data *) elf_section_data (sec))
+
+struct elf32_tic6x_obj_tdata
+{
+  struct elf_obj_tdata root;
+
+  /* Whether to use RELA relocations when generating relocations.
+     This is a per-object flag to allow the assembler to generate REL
+     relocations for use in linker testcases.  */
+  bfd_boolean use_rela_p;
+};
+
+#define elf32_tic6x_tdata(abfd) \
+  ((struct elf32_tic6x_obj_tdata *) (abfd)->tdata.any)
+
+#define is_tic6x_elf(bfd) \
+  (bfd_get_flavour (bfd) == bfd_target_elf_flavour \
+   && elf_tdata (bfd) != NULL \
+   && elf_object_id (bfd) == TIC6X_ELF_DATA)
+
+/* C6X ELF uses two common sections.  One is the usual one, and the
+   other is for small objects.  All the small objects are kept
+   together, and then referenced via the gp pointer, which yields
+   faster assembler code.  This is what we use for the small common
+   section.  This approach is copied from ecoff.c.  */
+static asection tic6x_elf_scom_section;
+static asymbol  tic6x_elf_scom_symbol;
+static asymbol  *tic6x_elf_scom_symbol_ptr;
+
+static reloc_howto_type elf32_tic6x_howto_table[] =
+{
+  HOWTO (R_C6000_NONE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_NONE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_ABS32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_ABS32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_ABS16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_ABS16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_ABS8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_ABS8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x000000ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_PCR_S21,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 21,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_PCR_S21",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0fffff80,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+  HOWTO (R_C6000_PCR_S12,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 16,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_PCR_S12",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0fff0000,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+  HOWTO (R_C6000_PCR_S10,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 10,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 13,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_PCR_S10",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fe000,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+  HOWTO (R_C6000_PCR_S7,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 7,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 16,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_PCR_S7",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007f0000,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+  HOWTO (R_C6000_ABS_S16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_ABS_S16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_ABS_L16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_ABS_L16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_ABS_H16,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_ABS_H16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_SBR_U15_B,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 15,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 8,			/* bitpos */
+	 complain_overflow_unsigned,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_U15_B",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fff00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_SBR_U15_H,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 15,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 8,			/* bitpos */
+	 complain_overflow_unsigned,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_U15_H",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fff00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_SBR_U15_W,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 15,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 8,			/* bitpos */
+	 complain_overflow_unsigned,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_U15_W",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fff00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_SBR_S16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_S16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_SBR_L16_B,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_L16_B",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_SBR_L16_H,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_L16_H",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_SBR_L16_W,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_L16_W",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_SBR_H16_B,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_H16_B",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_SBR_H16_H,	/* type */
+	 17,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_H16_H",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_SBR_H16_W,	/* type */
+	 18,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_H16_W",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_SBR_GOT_U15_W,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 15,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 8,			/* bitpos */
+	 complain_overflow_unsigned,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_GOT_U15_W",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fff00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_SBR_GOT_L16_W,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_GOT_L16_W",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_SBR_GOT_H16_W,	/* type */
+	 18,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_GOT_H16_W",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_DSBT_INDEX,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 15,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 8,			/* bitpos */
+	 complain_overflow_unsigned,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_DSBT_INDEX",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fff00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_PREL31,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 31,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_PREL31",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x7fffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+  HOWTO (R_C6000_COPY,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_COPY",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_JUMP_SLOT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_JUMP_SLOT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_EHTYPE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_EHTYPE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_PCR_H16,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_PCR_H16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+  HOWTO (R_C6000_PCR_L16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_PCR_L16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+  EMPTY_HOWTO (31),
+  EMPTY_HOWTO (32),
+  EMPTY_HOWTO (33),
+  EMPTY_HOWTO (34),
+  EMPTY_HOWTO (35),
+  EMPTY_HOWTO (36),
+  EMPTY_HOWTO (37),
+  EMPTY_HOWTO (38),
+  EMPTY_HOWTO (39),
+  EMPTY_HOWTO (40),
+  EMPTY_HOWTO (41),
+  EMPTY_HOWTO (42),
+  EMPTY_HOWTO (43),
+  EMPTY_HOWTO (44),
+  EMPTY_HOWTO (45),
+  EMPTY_HOWTO (46),
+  EMPTY_HOWTO (47),
+  EMPTY_HOWTO (48),
+  EMPTY_HOWTO (49),
+  EMPTY_HOWTO (50),
+  EMPTY_HOWTO (51),
+  EMPTY_HOWTO (52),
+  EMPTY_HOWTO (53),
+  EMPTY_HOWTO (54),
+  EMPTY_HOWTO (55),
+  EMPTY_HOWTO (56),
+  EMPTY_HOWTO (57),
+  EMPTY_HOWTO (58),
+  EMPTY_HOWTO (59),
+  EMPTY_HOWTO (60),
+  EMPTY_HOWTO (61),
+  EMPTY_HOWTO (62),
+  EMPTY_HOWTO (63),
+  EMPTY_HOWTO (64),
+  EMPTY_HOWTO (65),
+  EMPTY_HOWTO (66),
+  EMPTY_HOWTO (67),
+  EMPTY_HOWTO (68),
+  EMPTY_HOWTO (69),
+  EMPTY_HOWTO (70),
+  EMPTY_HOWTO (71),
+  EMPTY_HOWTO (72),
+  EMPTY_HOWTO (73),
+  EMPTY_HOWTO (74),
+  EMPTY_HOWTO (75),
+  EMPTY_HOWTO (76),
+  EMPTY_HOWTO (77),
+  EMPTY_HOWTO (78),
+  EMPTY_HOWTO (79),
+  EMPTY_HOWTO (80),
+  EMPTY_HOWTO (81),
+  EMPTY_HOWTO (82),
+  EMPTY_HOWTO (83),
+  EMPTY_HOWTO (84),
+  EMPTY_HOWTO (85),
+  EMPTY_HOWTO (86),
+  EMPTY_HOWTO (87),
+  EMPTY_HOWTO (88),
+  EMPTY_HOWTO (89),
+  EMPTY_HOWTO (90),
+  EMPTY_HOWTO (91),
+  EMPTY_HOWTO (92),
+  EMPTY_HOWTO (93),
+  EMPTY_HOWTO (94),
+  EMPTY_HOWTO (95),
+  EMPTY_HOWTO (96),
+  EMPTY_HOWTO (97),
+  EMPTY_HOWTO (98),
+  EMPTY_HOWTO (99),
+  EMPTY_HOWTO (100),
+  EMPTY_HOWTO (101),
+  EMPTY_HOWTO (102),
+  EMPTY_HOWTO (103),
+  EMPTY_HOWTO (104),
+  EMPTY_HOWTO (105),
+  EMPTY_HOWTO (106),
+  EMPTY_HOWTO (107),
+  EMPTY_HOWTO (108),
+  EMPTY_HOWTO (109),
+  EMPTY_HOWTO (110),
+  EMPTY_HOWTO (111),
+  EMPTY_HOWTO (112),
+  EMPTY_HOWTO (113),
+  EMPTY_HOWTO (114),
+  EMPTY_HOWTO (115),
+  EMPTY_HOWTO (116),
+  EMPTY_HOWTO (117),
+  EMPTY_HOWTO (118),
+  EMPTY_HOWTO (119),
+  EMPTY_HOWTO (120),
+  EMPTY_HOWTO (121),
+  EMPTY_HOWTO (122),
+  EMPTY_HOWTO (123),
+  EMPTY_HOWTO (124),
+  EMPTY_HOWTO (125),
+  EMPTY_HOWTO (126),
+  EMPTY_HOWTO (127),
+  EMPTY_HOWTO (128),
+  EMPTY_HOWTO (129),
+  EMPTY_HOWTO (130),
+  EMPTY_HOWTO (131),
+  EMPTY_HOWTO (132),
+  EMPTY_HOWTO (133),
+  EMPTY_HOWTO (134),
+  EMPTY_HOWTO (135),
+  EMPTY_HOWTO (136),
+  EMPTY_HOWTO (137),
+  EMPTY_HOWTO (138),
+  EMPTY_HOWTO (139),
+  EMPTY_HOWTO (140),
+  EMPTY_HOWTO (141),
+  EMPTY_HOWTO (142),
+  EMPTY_HOWTO (143),
+  EMPTY_HOWTO (144),
+  EMPTY_HOWTO (145),
+  EMPTY_HOWTO (146),
+  EMPTY_HOWTO (147),
+  EMPTY_HOWTO (148),
+  EMPTY_HOWTO (149),
+  EMPTY_HOWTO (150),
+  EMPTY_HOWTO (151),
+  EMPTY_HOWTO (152),
+  EMPTY_HOWTO (153),
+  EMPTY_HOWTO (154),
+  EMPTY_HOWTO (155),
+  EMPTY_HOWTO (156),
+  EMPTY_HOWTO (157),
+  EMPTY_HOWTO (158),
+  EMPTY_HOWTO (159),
+  EMPTY_HOWTO (160),
+  EMPTY_HOWTO (161),
+  EMPTY_HOWTO (162),
+  EMPTY_HOWTO (163),
+  EMPTY_HOWTO (164),
+  EMPTY_HOWTO (165),
+  EMPTY_HOWTO (166),
+  EMPTY_HOWTO (167),
+  EMPTY_HOWTO (168),
+  EMPTY_HOWTO (169),
+  EMPTY_HOWTO (170),
+  EMPTY_HOWTO (171),
+  EMPTY_HOWTO (172),
+  EMPTY_HOWTO (173),
+  EMPTY_HOWTO (174),
+  EMPTY_HOWTO (175),
+  EMPTY_HOWTO (176),
+  EMPTY_HOWTO (177),
+  EMPTY_HOWTO (178),
+  EMPTY_HOWTO (179),
+  EMPTY_HOWTO (180),
+  EMPTY_HOWTO (181),
+  EMPTY_HOWTO (182),
+  EMPTY_HOWTO (183),
+  EMPTY_HOWTO (184),
+  EMPTY_HOWTO (185),
+  EMPTY_HOWTO (186),
+  EMPTY_HOWTO (187),
+  EMPTY_HOWTO (188),
+  EMPTY_HOWTO (189),
+  EMPTY_HOWTO (190),
+  EMPTY_HOWTO (191),
+  EMPTY_HOWTO (192),
+  EMPTY_HOWTO (193),
+  EMPTY_HOWTO (194),
+  EMPTY_HOWTO (195),
+  EMPTY_HOWTO (196),
+  EMPTY_HOWTO (197),
+  EMPTY_HOWTO (198),
+  EMPTY_HOWTO (199),
+  EMPTY_HOWTO (200),
+  EMPTY_HOWTO (201),
+  EMPTY_HOWTO (202),
+  EMPTY_HOWTO (203),
+  EMPTY_HOWTO (204),
+  EMPTY_HOWTO (205),
+  EMPTY_HOWTO (206),
+  EMPTY_HOWTO (207),
+  EMPTY_HOWTO (208),
+  EMPTY_HOWTO (209),
+  EMPTY_HOWTO (210),
+  EMPTY_HOWTO (211),
+  EMPTY_HOWTO (212),
+  EMPTY_HOWTO (213),
+  EMPTY_HOWTO (214),
+  EMPTY_HOWTO (215),
+  EMPTY_HOWTO (216),
+  EMPTY_HOWTO (217),
+  EMPTY_HOWTO (218),
+  EMPTY_HOWTO (219),
+  EMPTY_HOWTO (220),
+  EMPTY_HOWTO (221),
+  EMPTY_HOWTO (222),
+  EMPTY_HOWTO (223),
+  EMPTY_HOWTO (224),
+  EMPTY_HOWTO (225),
+  EMPTY_HOWTO (226),
+  EMPTY_HOWTO (227),
+  EMPTY_HOWTO (228),
+  EMPTY_HOWTO (229),
+  EMPTY_HOWTO (230),
+  EMPTY_HOWTO (231),
+  EMPTY_HOWTO (232),
+  EMPTY_HOWTO (233),
+  EMPTY_HOWTO (234),
+  EMPTY_HOWTO (235),
+  EMPTY_HOWTO (236),
+  EMPTY_HOWTO (237),
+  EMPTY_HOWTO (238),
+  EMPTY_HOWTO (239),
+  EMPTY_HOWTO (240),
+  EMPTY_HOWTO (241),
+  EMPTY_HOWTO (242),
+  EMPTY_HOWTO (243),
+  EMPTY_HOWTO (244),
+  EMPTY_HOWTO (245),
+  EMPTY_HOWTO (246),
+  EMPTY_HOWTO (247),
+  EMPTY_HOWTO (248),
+  EMPTY_HOWTO (249),
+  EMPTY_HOWTO (250),
+  EMPTY_HOWTO (251),
+  EMPTY_HOWTO (252),
+  HOWTO (R_C6000_ALIGN,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_ALIGN",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_FPHEAD,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_FPHEAD",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_NOCMP,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_NOCMP",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE)			/* pcrel_offset */
+};
+
+static reloc_howto_type elf32_tic6x_howto_table_rel[] =
+{
+  HOWTO (R_C6000_NONE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_NONE",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_ABS32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_ABS32",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_ABS16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_ABS16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_ABS8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_ABS8",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x000000ff,		/* src_mask */
+	 0x000000ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_PCR_S21,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 21,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_PCR_S21",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0fffff80,		/* src_mask */
+	 0x0fffff80,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+  HOWTO (R_C6000_PCR_S12,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 16,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_PCR_S12",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0fff0000,		/* src_mask */
+	 0x0fff0000,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+  HOWTO (R_C6000_PCR_S10,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 10,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 13,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_PCR_S10",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x007fe000,		/* src_mask */
+	 0x007fe000,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+  HOWTO (R_C6000_PCR_S7,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 7,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 16,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_PCR_S7",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x007f0000,		/* src_mask */
+	 0x007f0000,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+  HOWTO (R_C6000_ABS_S16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_ABS_S16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x007fff80,		/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_ABS_L16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_ABS_L16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x007fff80,		/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  EMPTY_HOWTO (R_C6000_ABS_H16),
+  HOWTO (R_C6000_SBR_U15_B,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 15,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 8,			/* bitpos */
+	 complain_overflow_unsigned,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_U15_B",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x007fff00,		/* src_mask */
+	 0x007fff00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_SBR_U15_H,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 15,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 8,			/* bitpos */
+	 complain_overflow_unsigned,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_U15_H",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x007fff00,		/* src_mask */
+	 0x007fff00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_SBR_U15_W,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 15,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 8,			/* bitpos */
+	 complain_overflow_unsigned,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_U15_W",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x007fff00,		/* src_mask */
+	 0x007fff00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_SBR_S16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_S16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x007fff80,		/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_SBR_L16_B,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_L16_B",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x007fff80,		/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_SBR_L16_H,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_L16_H",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x007fff80,		/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_SBR_L16_W,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_L16_W",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x007fff80,		/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  EMPTY_HOWTO (R_C6000_SBR_H16_B),
+  EMPTY_HOWTO (R_C6000_SBR_H16_H),
+  EMPTY_HOWTO (R_C6000_SBR_H16_W),
+  HOWTO (R_C6000_SBR_GOT_U15_W,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 15,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 8,			/* bitpos */
+	 complain_overflow_unsigned,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_GOT_U15_W",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x007fff00,		/* src_mask */
+	 0x007fff00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_SBR_GOT_L16_W,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 7,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_SBR_GOT_L16_W",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x007fff80,		/* src_mask */
+	 0x007fff80,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  EMPTY_HOWTO (R_C6000_SBR_GOT_H16_W),
+  HOWTO (R_C6000_DSBT_INDEX,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 15,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 8,			/* bitpos */
+	 complain_overflow_unsigned,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_DSBT_INDEX",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x007fff00,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_PREL31,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 31,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_PREL31",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x7fffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+  HOWTO (R_C6000_COPY,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_COPY",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_JUMP_SLOT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_JUMP_SLOT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_EHTYPE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_EHTYPE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  EMPTY_HOWTO (R_C6000_PCR_H16),
+  EMPTY_HOWTO (R_C6000_PCR_L16),
+  EMPTY_HOWTO (31),
+  EMPTY_HOWTO (32),
+  EMPTY_HOWTO (33),
+  EMPTY_HOWTO (34),
+  EMPTY_HOWTO (35),
+  EMPTY_HOWTO (36),
+  EMPTY_HOWTO (37),
+  EMPTY_HOWTO (38),
+  EMPTY_HOWTO (39),
+  EMPTY_HOWTO (40),
+  EMPTY_HOWTO (41),
+  EMPTY_HOWTO (42),
+  EMPTY_HOWTO (43),
+  EMPTY_HOWTO (44),
+  EMPTY_HOWTO (45),
+  EMPTY_HOWTO (46),
+  EMPTY_HOWTO (47),
+  EMPTY_HOWTO (48),
+  EMPTY_HOWTO (49),
+  EMPTY_HOWTO (50),
+  EMPTY_HOWTO (51),
+  EMPTY_HOWTO (52),
+  EMPTY_HOWTO (53),
+  EMPTY_HOWTO (54),
+  EMPTY_HOWTO (55),
+  EMPTY_HOWTO (56),
+  EMPTY_HOWTO (57),
+  EMPTY_HOWTO (58),
+  EMPTY_HOWTO (59),
+  EMPTY_HOWTO (60),
+  EMPTY_HOWTO (61),
+  EMPTY_HOWTO (62),
+  EMPTY_HOWTO (63),
+  EMPTY_HOWTO (64),
+  EMPTY_HOWTO (65),
+  EMPTY_HOWTO (66),
+  EMPTY_HOWTO (67),
+  EMPTY_HOWTO (68),
+  EMPTY_HOWTO (69),
+  EMPTY_HOWTO (70),
+  EMPTY_HOWTO (71),
+  EMPTY_HOWTO (72),
+  EMPTY_HOWTO (73),
+  EMPTY_HOWTO (74),
+  EMPTY_HOWTO (75),
+  EMPTY_HOWTO (76),
+  EMPTY_HOWTO (77),
+  EMPTY_HOWTO (78),
+  EMPTY_HOWTO (79),
+  EMPTY_HOWTO (80),
+  EMPTY_HOWTO (81),
+  EMPTY_HOWTO (82),
+  EMPTY_HOWTO (83),
+  EMPTY_HOWTO (84),
+  EMPTY_HOWTO (85),
+  EMPTY_HOWTO (86),
+  EMPTY_HOWTO (87),
+  EMPTY_HOWTO (88),
+  EMPTY_HOWTO (89),
+  EMPTY_HOWTO (90),
+  EMPTY_HOWTO (91),
+  EMPTY_HOWTO (92),
+  EMPTY_HOWTO (93),
+  EMPTY_HOWTO (94),
+  EMPTY_HOWTO (95),
+  EMPTY_HOWTO (96),
+  EMPTY_HOWTO (97),
+  EMPTY_HOWTO (98),
+  EMPTY_HOWTO (99),
+  EMPTY_HOWTO (100),
+  EMPTY_HOWTO (101),
+  EMPTY_HOWTO (102),
+  EMPTY_HOWTO (103),
+  EMPTY_HOWTO (104),
+  EMPTY_HOWTO (105),
+  EMPTY_HOWTO (106),
+  EMPTY_HOWTO (107),
+  EMPTY_HOWTO (108),
+  EMPTY_HOWTO (109),
+  EMPTY_HOWTO (110),
+  EMPTY_HOWTO (111),
+  EMPTY_HOWTO (112),
+  EMPTY_HOWTO (113),
+  EMPTY_HOWTO (114),
+  EMPTY_HOWTO (115),
+  EMPTY_HOWTO (116),
+  EMPTY_HOWTO (117),
+  EMPTY_HOWTO (118),
+  EMPTY_HOWTO (119),
+  EMPTY_HOWTO (120),
+  EMPTY_HOWTO (121),
+  EMPTY_HOWTO (122),
+  EMPTY_HOWTO (123),
+  EMPTY_HOWTO (124),
+  EMPTY_HOWTO (125),
+  EMPTY_HOWTO (126),
+  EMPTY_HOWTO (127),
+  EMPTY_HOWTO (128),
+  EMPTY_HOWTO (129),
+  EMPTY_HOWTO (130),
+  EMPTY_HOWTO (131),
+  EMPTY_HOWTO (132),
+  EMPTY_HOWTO (133),
+  EMPTY_HOWTO (134),
+  EMPTY_HOWTO (135),
+  EMPTY_HOWTO (136),
+  EMPTY_HOWTO (137),
+  EMPTY_HOWTO (138),
+  EMPTY_HOWTO (139),
+  EMPTY_HOWTO (140),
+  EMPTY_HOWTO (141),
+  EMPTY_HOWTO (142),
+  EMPTY_HOWTO (143),
+  EMPTY_HOWTO (144),
+  EMPTY_HOWTO (145),
+  EMPTY_HOWTO (146),
+  EMPTY_HOWTO (147),
+  EMPTY_HOWTO (148),
+  EMPTY_HOWTO (149),
+  EMPTY_HOWTO (150),
+  EMPTY_HOWTO (151),
+  EMPTY_HOWTO (152),
+  EMPTY_HOWTO (153),
+  EMPTY_HOWTO (154),
+  EMPTY_HOWTO (155),
+  EMPTY_HOWTO (156),
+  EMPTY_HOWTO (157),
+  EMPTY_HOWTO (158),
+  EMPTY_HOWTO (159),
+  EMPTY_HOWTO (160),
+  EMPTY_HOWTO (161),
+  EMPTY_HOWTO (162),
+  EMPTY_HOWTO (163),
+  EMPTY_HOWTO (164),
+  EMPTY_HOWTO (165),
+  EMPTY_HOWTO (166),
+  EMPTY_HOWTO (167),
+  EMPTY_HOWTO (168),
+  EMPTY_HOWTO (169),
+  EMPTY_HOWTO (170),
+  EMPTY_HOWTO (171),
+  EMPTY_HOWTO (172),
+  EMPTY_HOWTO (173),
+  EMPTY_HOWTO (174),
+  EMPTY_HOWTO (175),
+  EMPTY_HOWTO (176),
+  EMPTY_HOWTO (177),
+  EMPTY_HOWTO (178),
+  EMPTY_HOWTO (179),
+  EMPTY_HOWTO (180),
+  EMPTY_HOWTO (181),
+  EMPTY_HOWTO (182),
+  EMPTY_HOWTO (183),
+  EMPTY_HOWTO (184),
+  EMPTY_HOWTO (185),
+  EMPTY_HOWTO (186),
+  EMPTY_HOWTO (187),
+  EMPTY_HOWTO (188),
+  EMPTY_HOWTO (189),
+  EMPTY_HOWTO (190),
+  EMPTY_HOWTO (191),
+  EMPTY_HOWTO (192),
+  EMPTY_HOWTO (193),
+  EMPTY_HOWTO (194),
+  EMPTY_HOWTO (195),
+  EMPTY_HOWTO (196),
+  EMPTY_HOWTO (197),
+  EMPTY_HOWTO (198),
+  EMPTY_HOWTO (199),
+  EMPTY_HOWTO (200),
+  EMPTY_HOWTO (201),
+  EMPTY_HOWTO (202),
+  EMPTY_HOWTO (203),
+  EMPTY_HOWTO (204),
+  EMPTY_HOWTO (205),
+  EMPTY_HOWTO (206),
+  EMPTY_HOWTO (207),
+  EMPTY_HOWTO (208),
+  EMPTY_HOWTO (209),
+  EMPTY_HOWTO (210),
+  EMPTY_HOWTO (211),
+  EMPTY_HOWTO (212),
+  EMPTY_HOWTO (213),
+  EMPTY_HOWTO (214),
+  EMPTY_HOWTO (215),
+  EMPTY_HOWTO (216),
+  EMPTY_HOWTO (217),
+  EMPTY_HOWTO (218),
+  EMPTY_HOWTO (219),
+  EMPTY_HOWTO (220),
+  EMPTY_HOWTO (221),
+  EMPTY_HOWTO (222),
+  EMPTY_HOWTO (223),
+  EMPTY_HOWTO (224),
+  EMPTY_HOWTO (225),
+  EMPTY_HOWTO (226),
+  EMPTY_HOWTO (227),
+  EMPTY_HOWTO (228),
+  EMPTY_HOWTO (229),
+  EMPTY_HOWTO (230),
+  EMPTY_HOWTO (231),
+  EMPTY_HOWTO (232),
+  EMPTY_HOWTO (233),
+  EMPTY_HOWTO (234),
+  EMPTY_HOWTO (235),
+  EMPTY_HOWTO (236),
+  EMPTY_HOWTO (237),
+  EMPTY_HOWTO (238),
+  EMPTY_HOWTO (239),
+  EMPTY_HOWTO (240),
+  EMPTY_HOWTO (241),
+  EMPTY_HOWTO (242),
+  EMPTY_HOWTO (243),
+  EMPTY_HOWTO (244),
+  EMPTY_HOWTO (245),
+  EMPTY_HOWTO (246),
+  EMPTY_HOWTO (247),
+  EMPTY_HOWTO (248),
+  EMPTY_HOWTO (249),
+  EMPTY_HOWTO (250),
+  EMPTY_HOWTO (251),
+  EMPTY_HOWTO (252),
+  HOWTO (R_C6000_ALIGN,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_ALIGN",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_FPHEAD,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_FPHEAD",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+  HOWTO (R_C6000_NOCMP,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_C6000_NOCMP",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE)			/* pcrel_offset */
+};
+
+/* Map BFD relocations to ELF relocations.  */
+
+typedef struct
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  enum elf_tic6x_reloc_type elf_reloc_val;
+} tic6x_reloc_map;
+
+static const tic6x_reloc_map elf32_tic6x_reloc_map[] =
+  {
+    { BFD_RELOC_NONE, R_C6000_NONE },
+    { BFD_RELOC_32, R_C6000_ABS32 },
+    { BFD_RELOC_16, R_C6000_ABS16 },
+    { BFD_RELOC_8, R_C6000_ABS8 },
+    { BFD_RELOC_C6000_PCR_S21, R_C6000_PCR_S21 },
+    { BFD_RELOC_C6000_PCR_S12, R_C6000_PCR_S12 },
+    { BFD_RELOC_C6000_PCR_S10, R_C6000_PCR_S10 },
+    { BFD_RELOC_C6000_PCR_S7, R_C6000_PCR_S7 },
+    { BFD_RELOC_C6000_ABS_S16, R_C6000_ABS_S16 },
+    { BFD_RELOC_C6000_ABS_L16, R_C6000_ABS_L16 },
+    { BFD_RELOC_C6000_ABS_H16, R_C6000_ABS_H16 },
+    { BFD_RELOC_C6000_SBR_U15_B, R_C6000_SBR_U15_B },
+    { BFD_RELOC_C6000_SBR_U15_H, R_C6000_SBR_U15_H },
+    { BFD_RELOC_C6000_SBR_U15_W, R_C6000_SBR_U15_W },
+    { BFD_RELOC_C6000_SBR_S16, R_C6000_SBR_S16 },
+    { BFD_RELOC_C6000_SBR_L16_B, R_C6000_SBR_L16_B },
+    { BFD_RELOC_C6000_SBR_L16_H, R_C6000_SBR_L16_H },
+    { BFD_RELOC_C6000_SBR_L16_W, R_C6000_SBR_L16_W },
+    { BFD_RELOC_C6000_SBR_H16_B, R_C6000_SBR_H16_B },
+    { BFD_RELOC_C6000_SBR_H16_H, R_C6000_SBR_H16_H },
+    { BFD_RELOC_C6000_SBR_H16_W, R_C6000_SBR_H16_W },
+    { BFD_RELOC_C6000_SBR_GOT_U15_W, R_C6000_SBR_GOT_U15_W },
+    { BFD_RELOC_C6000_SBR_GOT_L16_W, R_C6000_SBR_GOT_L16_W },
+    { BFD_RELOC_C6000_SBR_GOT_H16_W, R_C6000_SBR_GOT_H16_W },
+    { BFD_RELOC_C6000_DSBT_INDEX, R_C6000_DSBT_INDEX },
+    { BFD_RELOC_C6000_PREL31, R_C6000_PREL31 },
+    { BFD_RELOC_C6000_COPY, R_C6000_COPY },
+    { BFD_RELOC_C6000_JUMP_SLOT, R_C6000_JUMP_SLOT },
+    { BFD_RELOC_C6000_EHTYPE, R_C6000_EHTYPE },
+    { BFD_RELOC_C6000_PCR_H16, R_C6000_PCR_H16 },
+    { BFD_RELOC_C6000_PCR_L16, R_C6000_PCR_L16 },
+    { BFD_RELOC_C6000_ALIGN, R_C6000_ALIGN },
+    { BFD_RELOC_C6000_FPHEAD, R_C6000_FPHEAD },
+    { BFD_RELOC_C6000_NOCMP, R_C6000_NOCMP }
+  };
+
+static reloc_howto_type *
+elf32_tic6x_reloc_type_lookup (bfd *abfd, bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0; i < ARRAY_SIZE (elf32_tic6x_reloc_map); i++)
+    if (elf32_tic6x_reloc_map[i].bfd_reloc_val == code)
+      {
+	enum elf_tic6x_reloc_type elf_reloc_val;
+	reloc_howto_type *howto;
+
+	elf_reloc_val = elf32_tic6x_reloc_map[i].elf_reloc_val;
+	if (elf32_tic6x_tdata (abfd)->use_rela_p)
+	  howto = &elf32_tic6x_howto_table[elf_reloc_val];
+	else
+	  howto = &elf32_tic6x_howto_table_rel[elf_reloc_val];
+
+	/* Some relocations are RELA-only; do not return them for
+	   REL.  */
+	if (howto->name == NULL)
+	  howto = NULL;
+
+	return howto;
+      }
+
+  return NULL;
+}
+
+static reloc_howto_type *
+elf32_tic6x_reloc_name_lookup (bfd *abfd, const char *r_name)
+{
+  if (elf32_tic6x_tdata (abfd)->use_rela_p)
+    {
+      unsigned int i;
+
+      for (i = 0; i < ARRAY_SIZE (elf32_tic6x_howto_table); i++)
+	if (elf32_tic6x_howto_table[i].name != NULL
+	    && strcasecmp (elf32_tic6x_howto_table[i].name, r_name) == 0)
+	  return &elf32_tic6x_howto_table[i];
+    }
+  else
+    {
+      unsigned int i;
+
+      for (i = 0; i < ARRAY_SIZE (elf32_tic6x_howto_table_rel); i++)
+	if (elf32_tic6x_howto_table_rel[i].name != NULL
+	    && strcasecmp (elf32_tic6x_howto_table_rel[i].name, r_name) == 0)
+	  return &elf32_tic6x_howto_table_rel[i];
+    }
+
+  return NULL;
+}
+
+static void
+elf32_tic6x_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *bfd_reloc,
+			   Elf_Internal_Rela *elf_reloc)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (elf_reloc->r_info);
+  if (r_type >= ARRAY_SIZE (elf32_tic6x_howto_table))
+    bfd_reloc->howto = NULL;
+  else
+    bfd_reloc->howto = &elf32_tic6x_howto_table[r_type];
+}
+
+static void
+elf32_tic6x_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED, arelent *bfd_reloc,
+			       Elf_Internal_Rela *elf_reloc)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (elf_reloc->r_info);
+  if (r_type >= ARRAY_SIZE (elf32_tic6x_howto_table_rel))
+    bfd_reloc->howto = NULL;
+  else
+    bfd_reloc->howto = &elf32_tic6x_howto_table_rel[r_type];
+}
+
+void
+elf32_tic6x_set_use_rela_p (bfd *abfd, bfd_boolean use_rela_p)
+{
+  elf32_tic6x_tdata (abfd)->use_rela_p = use_rela_p;
+}
+
+/* Create an entry in a C6X ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+elf32_tic6x_link_hash_newfunc (struct bfd_hash_entry *entry,
+			    struct bfd_hash_table *table,
+			    const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table,
+				 sizeof (struct elf32_tic6x_link_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = _bfd_elf_link_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct elf32_tic6x_link_hash_entry *eh;
+
+      eh = (struct elf32_tic6x_link_hash_entry *) entry;
+      eh->dyn_relocs = NULL;
+    }
+
+  return entry;
+}
+
+/* Create a C6X ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+elf32_tic6x_link_hash_table_create (bfd *abfd)
+{
+  struct elf32_tic6x_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct elf32_tic6x_link_hash_table);
+
+  ret = bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd,
+				      elf32_tic6x_link_hash_newfunc,
+				      sizeof (struct elf32_tic6x_link_hash_entry),
+				      TIC6X_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  ret->sym_cache.abfd = NULL;
+  ret->obfd = abfd;
+  ret->elf.is_relocatable_executable = 1;
+
+  return &ret->elf.root;
+}
+
+static bfd_boolean
+elf32_tic6x_final_link (bfd *abfd, struct bfd_link_info *info)
+{
+  if (info->shared)
+    {
+      obj_attribute *out_attr;
+      out_attr = elf_known_obj_attributes_proc (abfd);
+      if (out_attr[Tag_ABI_PIC].i == 0)
+	{
+	  _bfd_error_handler (_("warning: generating a shared library "
+				"containing non-PIC code"));
+	}
+      if (out_attr[Tag_ABI_PID].i == 0)
+	{
+	  _bfd_error_handler (_("warning: generating a shared library "
+				"containing non-PID code"));
+	}
+    }
+  /* Invoke the regular ELF backend linker to do all the work.  */
+  if (!bfd_elf_final_link (abfd, info))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Destroy a C6X ELF linker hash table.  */
+
+static void
+elf32_tic6x_link_hash_table_free (struct bfd_link_hash_table *hash)
+{
+  _bfd_generic_link_hash_table_free (hash);
+}
+
+/* Called to pass PARAMS to the backend.  We store them in the hash table
+   associated with INFO.  */
+
+void
+elf32_tic6x_setup (struct bfd_link_info *info,
+		   struct elf32_tic6x_params *params)
+{
+  struct elf32_tic6x_link_hash_table *htab = elf32_tic6x_hash_table (info);
+  htab->params = *params;
+}
+
+/* Determine if we're dealing with a DSBT object.  */
+
+static bfd_boolean
+elf32_tic6x_using_dsbt (bfd *abfd)
+{
+  return bfd_elf_get_obj_attr_int (abfd, OBJ_ATTR_PROC,
+				   Tag_ABI_DSBT);
+}
+
+/* Create .plt, .rela.plt, .got, .got.plt, .rela.got and .dsbt
+   sections in DYNOBJ, and set up shortcuts to them in our hash
+   table.  */
+
+static bfd_boolean
+elf32_tic6x_create_dynamic_sections (bfd *dynobj, struct bfd_link_info *info)
+{
+  struct elf32_tic6x_link_hash_table *htab;
+  flagword flags;
+
+  htab = elf32_tic6x_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (!_bfd_elf_create_dynamic_sections (dynobj, info))
+    return FALSE;
+
+  /* Create .dsbt  */
+  flags = (SEC_ALLOC | SEC_LOAD
+	   | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED);
+  htab->dsbt = bfd_make_section_anyway_with_flags (dynobj, ".dsbt",
+						   flags);
+  if (htab->dsbt == NULL
+      || ! bfd_set_section_alignment (dynobj, htab->dsbt, 2)
+      || ! bfd_set_section_alignment (dynobj, htab->elf.splt, 5))
+    return FALSE;
+
+  htab->sdynbss = bfd_get_section_by_name (dynobj, ".dynbss");
+  if (!info->shared)
+    htab->srelbss = bfd_get_section_by_name (dynobj, ".rela.bss");
+
+  if (!htab->sdynbss
+      || (!info->shared && !htab->srelbss))
+    abort ();
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf32_tic6x_mkobject (bfd *abfd)
+{
+  bfd_boolean ret;
+
+  ret = bfd_elf_allocate_object (abfd, sizeof (struct elf32_tic6x_obj_tdata),
+				 TIC6X_ELF_DATA);
+  if (ret)
+    elf32_tic6x_set_use_rela_p (abfd, TRUE);
+  return ret;
+}
+
+/* Install relocation RELA into section SRELA, incrementing its
+   reloc_count.  */
+
+static void
+elf32_tic6x_install_rela (bfd *output_bfd, asection *srela,
+			  Elf_Internal_Rela *rela)
+{
+  bfd_byte *loc;
+  bfd_vma off = srela->reloc_count++ * sizeof (Elf32_External_Rela);
+  loc = srela->contents + off;
+  BFD_ASSERT (off < srela->size);
+  bfd_elf32_swap_reloca_out (output_bfd, rela, loc);
+}
+
+/* Create a dynamic reloc against the GOT at offset OFFSET.  The contents
+   of the GOT at this offset have been initialized with the relocation.  */
+
+static void
+elf32_tic6x_make_got_dynreloc (bfd *output_bfd,
+			       struct elf32_tic6x_link_hash_table *htab,
+			       asection *sym_sec, bfd_vma offset)
+{
+  asection *sgot = htab->elf.sgot;
+  Elf_Internal_Rela outrel;
+  int dynindx;
+
+  outrel.r_offset = sgot->output_section->vma + sgot->output_offset + offset;
+  outrel.r_addend = bfd_get_32 (output_bfd, sgot->contents + offset);
+  if (sym_sec && sym_sec->output_section
+      && ! bfd_is_abs_section (sym_sec->output_section)
+      && ! bfd_is_und_section (sym_sec->output_section))
+    {
+      dynindx = elf_section_data (sym_sec->output_section)->dynindx;
+      outrel.r_addend -= sym_sec->output_section->vma;
+    }
+  else
+    {
+      dynindx = 0;
+    }
+  outrel.r_info = ELF32_R_INFO (dynindx, R_C6000_ABS32);
+  elf32_tic6x_install_rela (output_bfd, htab->elf.srelgot, &outrel);
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+elf32_tic6x_finish_dynamic_symbol (bfd * output_bfd,
+				   struct bfd_link_info *info,
+				   struct elf_link_hash_entry *h,
+				   Elf_Internal_Sym * sym)
+{
+  bfd *dynobj;
+  struct elf32_tic6x_link_hash_table *htab;
+
+  htab = elf32_tic6x_hash_table (info);
+  dynobj = htab->elf.dynobj;
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      bfd_vma plt_index;
+      bfd_vma got_section_offset, got_dp_offset, rela_offset;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+      asection *plt, *gotplt, *relplt;
+      const struct elf_backend_data *bed;
+
+      bed = get_elf_backend_data (output_bfd);
+
+      BFD_ASSERT (htab->elf.splt != NULL);
+      plt = htab->elf.splt;
+      gotplt = htab->elf.sgotplt;
+      relplt = htab->elf.srelplt;
+
+      /* This symbol has an entry in the procedure linkage table.  Set
+	 it up.  */
+
+      if ((h->dynindx == -1
+	   && !((h->forced_local || info->executable)
+		&& h->def_regular
+		&& h->type == STT_GNU_IFUNC))
+	  || plt == NULL
+	  || gotplt == NULL
+	  || relplt == NULL)
+	abort ();
+
+      /* Get the index in the procedure linkage table which
+	 corresponds to this symbol.  This is the index of this symbol
+	 in all the symbols for which we are making plt entries.  The
+	 first entry in the procedure linkage table is reserved.
+
+	 Get the offset into the .got table of the entry that
+	 corresponds to this function.  Each .got entry is 4 bytes.
+	 The first three are reserved.
+	 
+	 For static executables, we don't reserve anything.  */
+
+      plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1;
+      got_section_offset = plt_index + bed->got_header_size / 4;
+      got_dp_offset = got_section_offset + htab->params.dsbt_size;
+      rela_offset = plt_index * sizeof (Elf32_External_Rela);
+
+      got_section_offset *= 4;
+
+      /* Fill in the entry in the procedure linkage table.  */
+
+      /* ldw .d2t2 *+B14($GOT(f)), b2 */
+      bfd_put_32 (output_bfd, got_dp_offset << 8 | 0x0100006e,
+		  plt->contents + h->plt.offset);
+      /* mvk .s2 low(rela_offset), b0 */
+      bfd_put_32 (output_bfd, (rela_offset & 0xffff) << 7 | 0x0000002a,
+		  plt->contents + h->plt.offset + 4);
+      /* mvkh .s2 high(rela_offset), b0 */
+      bfd_put_32 (output_bfd, ((rela_offset >> 16) & 0xffff) << 7 | 0x0000006a,
+		  plt->contents + h->plt.offset + 8);
+      /* nop 2 */
+      bfd_put_32 (output_bfd, 0x00002000,
+		  plt->contents + h->plt.offset + 12);
+      /* b .s2 b2 */
+      bfd_put_32 (output_bfd, 0x00080362,
+		  plt->contents + h->plt.offset + 16);
+      /* nop 5 */
+      bfd_put_32 (output_bfd, 0x00008000,
+		  plt->contents + h->plt.offset + 20);
+
+      /* Fill in the entry in the global offset table.  */
+      bfd_put_32 (output_bfd,
+		  (plt->output_section->vma + plt->output_offset),
+		  gotplt->contents + got_section_offset);
+
+      /* Fill in the entry in the .rel.plt section.  */
+      rela.r_offset = (gotplt->output_section->vma
+		       + gotplt->output_offset
+		       + got_section_offset);
+      rela.r_info = ELF32_R_INFO (h->dynindx, R_C6000_JUMP_SLOT);
+      rela.r_addend = 0;
+      loc = relplt->contents + rela_offset;
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+
+      if (!h->def_regular)
+	{
+	  /* Mark the symbol as undefined, rather than as defined in
+	     the .plt section.  */
+	  sym->st_shndx = SHN_UNDEF;
+	  sym->st_value = 0;
+	}
+    }
+
+  if (h->got.offset != (bfd_vma) -1)
+    {
+      asection *sgot;
+      asection *srela;
+
+      /* This symbol has an entry in the global offset table.
+         Set it up.  */
+
+      sgot = bfd_get_section_by_name (dynobj, ".got");
+      srela = bfd_get_section_by_name (dynobj, ".rela.got");
+      BFD_ASSERT (sgot != NULL && srela != NULL);
+
+      /* If this is a -Bsymbolic link, and the symbol is defined
+         locally, we just want to emit a RELATIVE reloc.  Likewise if
+         the symbol was forced to be local because of a version file.
+         The entry in the global offset table will already have been
+         initialized in the relocate_section function.  */
+      if (info->shared
+	  && (info->symbolic
+	      || h->dynindx == -1 || h->forced_local) && h->def_regular)
+	{
+	  asection *s = h->root.u.def.section;
+	  elf32_tic6x_make_got_dynreloc (output_bfd, htab, s,
+			     h->got.offset & ~(bfd_vma) 1);
+	}
+      else
+	{
+	  Elf_Internal_Rela outrel;
+	  bfd_put_32 (output_bfd, (bfd_vma) 0,
+		      sgot->contents + (h->got.offset & ~(bfd_vma) 1));
+	  outrel.r_offset = (sgot->output_section->vma
+			   + sgot->output_offset
+			   + (h->got.offset & ~(bfd_vma) 1));
+	  outrel.r_info = ELF32_R_INFO (h->dynindx, R_C6000_ABS32);
+	  outrel.r_addend = 0;
+
+	  elf32_tic6x_install_rela (output_bfd, srela, &outrel);
+	}
+    }
+
+  if (h->needs_copy)
+    {
+      Elf_Internal_Rela rel;
+
+      /* This symbol needs a copy reloc.  Set it up.  */
+
+      if (h->dynindx == -1
+	  || (h->root.type != bfd_link_hash_defined
+	      && h->root.type != bfd_link_hash_defweak)
+	  || htab->srelbss == NULL)
+	abort ();
+
+      rel.r_offset = (h->root.u.def.value
+		      + h->root.u.def.section->output_section->vma
+		      + h->root.u.def.section->output_offset);
+      rel.r_info = ELF32_R_INFO (h->dynindx, R_C6000_COPY);
+      rel.r_addend = 0;
+
+      elf32_tic6x_install_rela (output_bfd, htab->srelbss, &rel);
+    }
+
+  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+      || h == elf_hash_table (info)->hgot)
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+/* Unwinding tables are not referenced directly.  This pass marks them as
+   required if the corresponding code section is marked.  */
+
+static bfd_boolean
+elf32_tic6x_gc_mark_extra_sections (struct bfd_link_info *info,
+				    elf_gc_mark_hook_fn gc_mark_hook)
+{
+  bfd *sub;
+  Elf_Internal_Shdr **elf_shdrp;
+  bfd_boolean again;
+
+  _bfd_elf_gc_mark_extra_sections (info, gc_mark_hook);
+
+  /* Marking EH data may cause additional code sections to be marked,
+     requiring multiple passes.  */
+  again = TRUE;
+  while (again)
+    {
+      again = FALSE;
+      for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+	{
+	  asection *o;
+
+	  if (! is_tic6x_elf (sub))
+	    continue;
+
+	  elf_shdrp = elf_elfsections (sub);
+	  for (o = sub->sections; o != NULL; o = o->next)
+	    {
+	      Elf_Internal_Shdr *hdr;
+
+	      hdr = &elf_section_data (o)->this_hdr;
+	      if (hdr->sh_type == SHT_C6000_UNWIND
+		  && hdr->sh_link
+		  && hdr->sh_link < elf_numsections (sub)
+		  && !o->gc_mark
+		  && elf_shdrp[hdr->sh_link]->bfd_section->gc_mark)
+		{
+		  again = TRUE;
+		  if (!_bfd_elf_gc_mark (info, o, gc_mark_hook))
+		    return FALSE;
+		}
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return TRUE if this is an unwinding table index.  */
+
+static bfd_boolean
+is_tic6x_elf_unwind_section_name (const char *name)
+{
+  return (CONST_STRNEQ (name, ELF_STRING_C6000_unwind)
+	  || CONST_STRNEQ (name, ELF_STRING_C6000_unwind_once));
+}
+
+
+/* Set the type and flags for an unwinding index table.  We do this by
+   the section name, which is a hack, but ought to work.  */
+
+static bfd_boolean
+elf32_tic6x_fake_sections (bfd *abfd ATTRIBUTE_UNUSED,
+			   Elf_Internal_Shdr *hdr, asection *sec)
+{
+  const char * name;
+
+  name = bfd_get_section_name (abfd, sec);
+
+  if (is_tic6x_elf_unwind_section_name (name))
+    {
+      hdr->sh_type = SHT_C6000_UNWIND;
+      hdr->sh_flags |= SHF_LINK_ORDER;
+    }
+
+  return TRUE;
+}
+
+/* Update the got entry reference counts for the section being removed.  */
+
+static bfd_boolean
+elf32_tic6x_gc_sweep_hook (bfd *abfd,
+			   struct bfd_link_info *info,
+			   asection *sec,
+			   const Elf_Internal_Rela *relocs)
+{
+  struct elf32_tic6x_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  const Elf_Internal_Rela *rel, *relend;
+
+  if (info->relocatable)
+    return TRUE;
+
+  htab = elf32_tic6x_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  elf_section_data (sec)->local_dynrel = NULL;
+
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      unsigned int r_type;
+      struct elf_link_hash_entry *h = NULL;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  struct elf32_tic6x_link_hash_entry *eh;
+	  struct elf_dyn_relocs **pp;
+	  struct elf_dyn_relocs *p;
+
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	  eh = (struct elf32_tic6x_link_hash_entry *) h;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
+	    if (p->sec == sec)
+	      {
+		/* Everything must go for SEC.  */
+		*pp = p->next;
+		break;
+	      }
+	}
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      switch (r_type)
+	{
+	case R_C6000_SBR_GOT_U15_W:
+	case R_C6000_SBR_GOT_L16_W:
+	case R_C6000_SBR_GOT_H16_W:
+	case R_C6000_EHTYPE:
+	  if (h != NULL)
+	    {
+	      if (h->got.refcount > 0)
+		h->got.refcount -= 1;
+	    }
+	  else if (local_got_refcounts != NULL)
+	    {
+	      if (local_got_refcounts[r_symndx] > 0)
+		local_got_refcounts[r_symndx] -= 1;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+elf32_tic6x_adjust_dynamic_symbol (struct bfd_link_info *info,
+				   struct elf_link_hash_entry *h)
+{
+  struct elf32_tic6x_link_hash_table *htab;
+  bfd *dynobj;
+  asection *s;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (dynobj != NULL
+	      && (h->needs_plt
+		  || h->u.weakdef != NULL
+		  || (h->def_dynamic && h->ref_regular && !h->def_regular)));
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later,
+     when we know the address of the .got section.  */
+  if (h->type == STT_FUNC
+      || h->needs_plt)
+    {
+      if (h->plt.refcount <= 0
+	  || SYMBOL_CALLS_LOCAL (info, h)
+	  || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+	      && h->root.type == bfd_link_hash_undefweak))
+	{
+	  /* This case can occur if we saw a PLT32 reloc in an input
+	     file, but the symbol was never referred to by a dynamic
+	     object, or if all references were garbage collected.  In
+	     such a case, we don't actually need to build a procedure
+	     linkage table, and we can just do a PC32 reloc instead.  */
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	}
+
+      return TRUE;
+    }
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      h->non_got_ref = h->u.weakdef->non_got_ref;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if (!h->non_got_ref)
+    return TRUE;
+
+  /* If -z nocopyreloc was given, we won't generate them either.  */
+  if (info->nocopyreloc)
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  htab = elf32_tic6x_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  /* We must generate a R_C6000_COPY reloc to tell the dynamic linker to
+     copy the initial value out of the dynamic object and into the
+     runtime process image.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      htab->srelbss->size += sizeof (Elf32_External_Rela);
+      h->needs_copy = 1;
+    }
+
+  s = htab->sdynbss;
+
+  return _bfd_elf_adjust_dynamic_copy (h, s);
+}
+
+static bfd_boolean
+elf32_tic6x_new_section_hook (bfd *abfd, asection *sec)
+{
+  bfd_boolean ret;
+
+  /* Allocate target specific section data.  */
+  if (!sec->used_by_bfd)
+    {
+      _tic6x_elf_section_data *sdata;
+      bfd_size_type amt = sizeof (*sdata);
+
+      sdata = (_tic6x_elf_section_data *) bfd_zalloc (abfd, amt);
+      if (sdata == NULL)
+	return FALSE;
+      sec->used_by_bfd = sdata;
+    }
+
+  ret = _bfd_elf_new_section_hook (abfd, sec);
+  sec->use_rela_p = elf32_tic6x_tdata (abfd)->use_rela_p;
+
+  return ret;
+}
+
+/* Return true if relocation REL against section SEC is a REL rather
+   than RELA relocation.  RELOCS is the first relocation in the
+   section and ABFD is the bfd that contains SEC.  */
+
+static bfd_boolean
+elf32_tic6x_rel_relocation_p (bfd *abfd, asection *sec,
+			      const Elf_Internal_Rela *relocs,
+			      const Elf_Internal_Rela *rel)
+{
+  Elf_Internal_Shdr *rel_hdr;
+  const struct elf_backend_data *bed;
+
+  /* To determine which flavor of relocation this is, we depend on the
+     fact that the INPUT_SECTION's REL_HDR is read before RELA_HDR.  */
+  rel_hdr = elf_section_data (sec)->rel.hdr;
+  if (rel_hdr == NULL)
+    return FALSE;
+  bed = get_elf_backend_data (abfd);
+  return ((size_t) (rel - relocs)
+	  < NUM_SHDR_ENTRIES (rel_hdr) * bed->s->int_rels_per_ext_rel);
+}
+
+/* We need dynamic symbols for every section, since segments can
+   relocate independently.  */
+static bfd_boolean
+elf32_tic6x_link_omit_section_dynsym (bfd *output_bfd ATTRIBUTE_UNUSED,
+				      struct bfd_link_info *info ATTRIBUTE_UNUSED,
+				      asection *p)
+{
+  switch (elf_section_data (p)->this_hdr.sh_type)
+    {
+    case SHT_PROGBITS:
+    case SHT_NOBITS:
+      /* If sh_type is yet undecided, assume it could be
+	 SHT_PROGBITS/SHT_NOBITS.  */
+    case SHT_NULL:
+      return FALSE;
+
+      /* There shouldn't be section relative relocations
+	 against any other section.  */
+    default:
+      return TRUE;
+    }
+}
+
+static bfd_boolean
+elf32_tic6x_relocate_section (bfd *output_bfd,
+			      struct bfd_link_info *info,
+			      bfd *input_bfd,
+			      asection *input_section,
+			      bfd_byte *contents,
+			      Elf_Internal_Rela *relocs,
+			      Elf_Internal_Sym *local_syms,
+			      asection **local_sections)
+{
+  struct elf32_tic6x_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_vma *local_got_offsets;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  bfd_boolean ok = TRUE;
+
+  htab = elf32_tic6x_hash_table (info);
+  symtab_hdr = & elf_symtab_hdr (input_bfd);
+  sym_hashes = elf_sym_hashes (input_bfd);
+  local_got_offsets = elf_local_got_offsets (input_bfd);
+
+  relend = relocs + input_section->reloc_count;
+
+  for (rel = relocs; rel < relend; rel ++)
+    {
+      int r_type;
+      unsigned long r_symndx;
+      arelent bfd_reloc;
+      reloc_howto_type *howto;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma off, off2, relocation;
+      bfd_boolean unresolved_reloc;
+      bfd_reloc_status_type r;
+      struct bfd_link_hash_entry *sbh;
+      bfd_boolean is_rel;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      is_rel = elf32_tic6x_rel_relocation_p (input_bfd, input_section,
+					     relocs, rel);
+
+      if (is_rel)
+	elf32_tic6x_info_to_howto_rel (input_bfd, &bfd_reloc, rel);
+      else
+	elf32_tic6x_info_to_howto (input_bfd, &bfd_reloc, rel);
+      howto = bfd_reloc.howto;
+      if (howto == NULL)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      unresolved_reloc = FALSE;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+      else
+	{
+	  bfd_boolean warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	{
+	  if (is_rel
+	      && sym != NULL
+	      && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+	    {
+	      rel->r_addend = 0;
+	      relocation = sec->output_offset + sym->st_value;
+	      r = _bfd_relocate_contents (howto, input_bfd, relocation,
+					  contents + rel->r_offset);
+	      goto done_reloc;
+	    }
+	  continue;
+	}
+
+      switch (r_type)
+	{
+	case R_C6000_NONE:
+	case R_C6000_ALIGN:
+	case R_C6000_FPHEAD:
+	case R_C6000_NOCMP:
+	  /* No action needed.  */
+	  continue;
+
+	case R_C6000_PCR_S21:
+	  /* A branch to an undefined weak symbol is turned into a
+	     "b .s2 B3" instruction if the existing insn is of the
+	     form "b .s2 symbol".  */
+	  if (h ? h->root.type == bfd_link_hash_undefweak
+	      && (htab->elf.splt == NULL || h->plt.offset == (bfd_vma) -1)
+	      : r_symndx != STN_UNDEF && bfd_is_und_section (sec))
+	    {
+	      unsigned long oldval;
+	      oldval = bfd_get_32 (input_bfd, contents + rel->r_offset);
+
+	      if ((oldval & 0x7e) == 0x12)
+		{
+		  oldval &= 0xF0000001;
+		  bfd_put_32 (input_bfd, oldval | 0x000c0362,
+			      contents + rel->r_offset);
+		  r = bfd_reloc_ok;
+		  goto done_reloc;
+		}
+	    }
+
+	case R_C6000_PCR_S12:
+	case R_C6000_PCR_S10:
+	case R_C6000_PCR_S7:
+	  if (h != NULL
+	      && h->plt.offset != (bfd_vma) -1
+	      && htab->elf.splt != NULL)
+	    {
+	      relocation = (htab->elf.splt->output_section->vma
+			    + htab->elf.splt->output_offset
+			    + h->plt.offset);
+	    }
+
+	  /* Generic PC-relative handling produces a value relative to
+	     the exact location of the relocation.  Adjust it to be
+	     relative to the start of the fetch packet instead.  */
+	  relocation += (input_section->output_section->vma
+			 + input_section->output_offset
+			 + rel->r_offset) & 0x1f;
+	  unresolved_reloc = FALSE;
+	  break;
+
+	case R_C6000_PCR_H16:
+	case R_C6000_PCR_L16:
+	  off = (input_section->output_section->vma
+		 + input_section->output_offset
+		 + rel->r_offset);
+	  /* These must be calculated as R = S - FP(FP(PC) - A).
+	     PC, here, is the value we just computed in OFF.  RELOCATION
+	     has the address of S + A. */
+	  relocation -= rel->r_addend;
+	  off2 = ((off & ~(bfd_vma)0x1f) - rel->r_addend) & (bfd_vma)~0x1f;
+	  off2 = relocation - off2;
+	  relocation = off + off2;
+	  break;
+
+	case R_C6000_DSBT_INDEX:
+	  relocation = elf32_tic6x_hash_table (info)->params.dsbt_index;
+	  if (!info->shared || relocation != 0)
+	    break;
+
+	  /* fall through */
+	case R_C6000_ABS32:
+	case R_C6000_ABS16:
+	case R_C6000_ABS8:
+	case R_C6000_ABS_S16:
+	case R_C6000_ABS_L16:
+	case R_C6000_ABS_H16:
+	  /* When generating a shared object or relocatable executable, these
+	     relocations are copied into the output file to be resolved at
+	     run time.  */
+	  if ((info->shared || elf32_tic6x_using_dsbt (output_bfd))
+	      && (input_section->flags & SEC_ALLOC)
+	      && (h == NULL
+		  || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		  || h->root.type != bfd_link_hash_undefweak))
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_boolean skip, relocate;
+	      asection *sreloc;
+
+	      unresolved_reloc = FALSE;
+
+	      sreloc = elf_section_data (input_section)->sreloc;
+	      BFD_ASSERT (sreloc != NULL && sreloc->contents != NULL);
+
+	      skip = FALSE;
+	      relocate = FALSE;
+
+	      outrel.r_offset =
+		_bfd_elf_section_offset (output_bfd, info, input_section,
+					 rel->r_offset);
+	      if (outrel.r_offset == (bfd_vma) -1)
+		skip = TRUE;
+	      else if (outrel.r_offset == (bfd_vma) -2)
+		skip = TRUE, relocate = TRUE;
+	      outrel.r_offset += (input_section->output_section->vma
+				  + input_section->output_offset);
+
+	      if (skip)
+		memset (&outrel, 0, sizeof outrel);
+	      else if (h != NULL
+		       && h->dynindx != -1
+		       && (!info->shared
+			   || !info->symbolic
+			   || !h->def_regular))
+		{
+		  outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
+		  outrel.r_addend = rel->r_addend;
+		}
+	      else
+		{
+		  long indx;
+
+		  outrel.r_addend = relocation + rel->r_addend;
+
+		  if (bfd_is_abs_section (sec))
+		    indx = 0;
+		  else if (sec == NULL || sec->owner == NULL)
+		    {
+		      bfd_set_error (bfd_error_bad_value);
+		      return FALSE;
+		    }
+		  else
+		    {
+		      asection *osec;
+
+		      osec = sec->output_section;
+		      indx = elf_section_data (osec)->dynindx;
+		      outrel.r_addend -= osec->vma;
+		      BFD_ASSERT (indx != 0);
+		    }
+
+		  outrel.r_info = ELF32_R_INFO (indx, r_type);
+		}
+
+	      elf32_tic6x_install_rela (output_bfd, sreloc, &outrel);
+
+	      /* If this reloc is against an external symbol, we do not want to
+		 fiddle with the addend.  Otherwise, we need to include the symbol
+		 value so that it becomes an addend for the dynamic reloc.  */
+	      if (! relocate)
+		continue;
+	    }
+
+	  /* Generic logic OK.  */
+	  break;
+
+	case R_C6000_SBR_U15_B:
+	case R_C6000_SBR_U15_H:
+	case R_C6000_SBR_U15_W:
+	case R_C6000_SBR_S16:
+	case R_C6000_SBR_L16_B:
+	case R_C6000_SBR_L16_H:
+	case R_C6000_SBR_L16_W:
+	case R_C6000_SBR_H16_B:
+	case R_C6000_SBR_H16_H:
+	case R_C6000_SBR_H16_W:
+	  sbh = bfd_link_hash_lookup (info->hash, "__c6xabi_DSBT_BASE",
+				      FALSE, FALSE, TRUE);
+	  if (sbh != NULL
+	      && (sbh->type == bfd_link_hash_defined
+		  || sbh->type == bfd_link_hash_defweak))
+	    {
+	      if (h ? (h->root.type == bfd_link_hash_undefweak
+		       && (htab->elf.splt == NULL
+			   || h->plt.offset == (bfd_vma) -1))
+		  : r_symndx != STN_UNDEF && bfd_is_und_section (sec))
+		relocation = 0;
+	      else
+		relocation -= (sbh->u.def.value
+			       + sbh->u.def.section->output_section->vma
+			       + sbh->u.def.section->output_offset);
+	    }
+	  else
+	    {
+	      (*_bfd_error_handler) (_("%B: SB-relative relocation but "
+				       "__c6xabi_DSBT_BASE not defined"),
+				     input_bfd);
+	      ok = FALSE;
+	      continue;
+	    }
+	  break;
+
+	case R_C6000_SBR_GOT_U15_W:
+	case R_C6000_SBR_GOT_L16_W:
+	case R_C6000_SBR_GOT_H16_W:
+	case R_C6000_EHTYPE:
+	  /* Relocation is to the entry for this symbol in the global
+	     offset table.  */
+	  if (htab->elf.sgot == NULL)
+	    abort ();
+
+	  if (h != NULL)
+	    {
+	      bfd_boolean dyn;
+
+	      off = h->got.offset;
+	      dyn = htab->elf.dynamic_sections_created;
+	      if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+		  || (info->shared
+		      && SYMBOL_REFERENCES_LOCAL (info, h))
+		  || (ELF_ST_VISIBILITY (h->other)
+		      && h->root.type == bfd_link_hash_undefweak))
+		{
+		  /* This is actually a static link, or it is a
+		     -Bsymbolic link and the symbol is defined
+		     locally, or the symbol was forced to be local
+		     because of a version file.  We must initialize
+		     this entry in the global offset table.  Since the
+		     offset must always be a multiple of 4, we use the
+		     least significant bit to record whether we have
+		     initialized it already.
+
+		     When doing a dynamic link, we create a .rel.got
+		     relocation entry to initialize the value.  This
+		     is done in the finish_dynamic_symbol routine.  */
+		  if ((off & 1) != 0)
+		    off &= ~1;
+		  else
+		    {
+		      bfd_put_32 (output_bfd, relocation,
+				  htab->elf.sgot->contents + off);
+		      h->got.offset |= 1;
+
+		      if (!WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared,
+							    h)
+			  && !(ELF_ST_VISIBILITY (h->other)
+			       && h->root.type == bfd_link_hash_undefweak))
+			elf32_tic6x_make_got_dynreloc (output_bfd, htab, sec,
+						       off);
+		    }
+		}
+	      else
+		unresolved_reloc = FALSE;
+	    }
+	  else
+	    {
+	      if (local_got_offsets == NULL)
+		abort ();
+
+	      off = local_got_offsets[r_symndx];
+
+	      /* The offset must always be a multiple of 4.  We use
+		 the least significant bit to record whether we have
+		 already generated the necessary reloc.  */
+	      if ((off & 1) != 0)
+		off &= ~1;
+	      else
+		{
+		  bfd_put_32 (output_bfd, relocation,
+			      htab->elf.sgot->contents + off);
+
+		  if (info->shared || elf32_tic6x_using_dsbt (output_bfd))
+		    elf32_tic6x_make_got_dynreloc (output_bfd, htab, sec, off);
+
+		  local_got_offsets[r_symndx] |= 1;
+		}
+	    }
+
+	  if (off >= (bfd_vma) -2)
+	    abort ();
+
+	  if (htab->dsbt)
+	    relocation = (htab->elf.sgot->output_section->vma
+			  + htab->elf.sgot->output_offset + off
+			  - htab->dsbt->output_section->vma
+			  - htab->dsbt->output_offset);
+	  else
+	    relocation = (htab->elf.sgot->output_section->vma
+			  + htab->elf.sgot->output_offset + off
+			  - htab->elf.sgotplt->output_section->vma
+			  - htab->elf.sgotplt->output_offset);
+
+	  if (rel->r_addend != 0)
+	    {
+	      /* We can't do anything for a relocation which is against
+		 a symbol *plus offset*.  GOT holds relocations for
+		 symbols.  Make this an error; the compiler isn't
+		 allowed to pass us these kinds of things.  */
+	      if (h == NULL)
+		(*_bfd_error_handler)
+		  (_("%B, section %A: relocation %s with non-zero addend %d"
+		     " against local symbol"),
+		   input_bfd,
+		   input_section,
+		   elf32_tic6x_howto_table[r_type].name,
+		   rel->r_addend);
+	      else
+		(*_bfd_error_handler)
+		  (_("%B, section %A: relocation %s with non-zero addend %d"
+		     " against symbol `%s'"),
+		   input_bfd,
+		   input_section,
+		   elf32_tic6x_howto_table[r_type].name,
+		   rel->r_addend,
+		   h->root.root.string[0] != '\0' ? h->root.root.string
+		   : _("[whose name is lost]"));
+
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	  break;
+
+	case R_C6000_PREL31:
+	  if (h != NULL
+	      && h->plt.offset != (bfd_vma) -1
+	      && htab->elf.splt != NULL)
+	    {
+	      relocation = (htab->elf.splt->output_section->vma
+			    + htab->elf.splt->output_offset
+			    + h->plt.offset);
+	    }
+	  break;
+
+	case R_C6000_COPY:
+	  /* Invalid in relocatable object.  */
+	default:
+	  /* Unknown relocation.  */
+	  (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
+				 input_bfd, r_type);
+	  ok = FALSE;
+	  continue;
+	}
+
+      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+				    contents, rel->r_offset,
+				    relocation, rel->r_addend);
+
+    done_reloc:
+      if (r == bfd_reloc_ok
+	  && howto->complain_on_overflow == complain_overflow_bitfield)
+	{
+	  /* Generic overflow handling accepts cases the ABI says
+	     should be rejected for R_C6000_ABS16 and
+	     R_C6000_ABS8.  */
+	  bfd_vma value = (relocation + rel->r_addend) & 0xffffffff;
+	  bfd_vma sbit = 1 << (howto->bitsize - 1);
+	  bfd_vma sbits = (-(bfd_vma) sbit) & 0xffffffff;
+	  bfd_vma value_sbits = value & sbits;
+
+	  if (value_sbits != 0
+	      && value_sbits != sbit
+	      && value_sbits != sbits)
+	    r = bfd_reloc_overflow;
+	}
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char *name;
+	  const char *error_message;
+
+	  if (h != NULL)
+	    name = h->root.root.string;
+	  else
+	    {
+	      name = bfd_elf_string_from_elf_section (input_bfd,
+						      symtab_hdr->sh_link,
+						      sym->st_name);
+	      if (name == NULL)
+		return FALSE;
+	      if (*name == '\0')
+		name = bfd_section_name (input_bfd, sec);
+	    }
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      /* If the overflowing reloc was to an undefined symbol,
+		 we have already printed one error message and there
+		 is no point complaining again.  */
+	      if ((! h ||
+		   h->root.type != bfd_link_hash_undefined)
+		  && (!((*info->callbacks->reloc_overflow)
+			(info, (h ? &h->root : NULL), name, howto->name,
+			 (bfd_vma) 0, input_bfd, input_section,
+			 rel->r_offset))))
+		  return FALSE;
+	      break;
+
+	    case bfd_reloc_undefined:
+	      if (!((*info->callbacks->undefined_symbol)
+		    (info, name, input_bfd, input_section,
+		     rel->r_offset, TRUE)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      error_message = _("out of range");
+	      goto common_error;
+
+	    case bfd_reloc_notsupported:
+	      error_message = _("unsupported relocation");
+	      goto common_error;
+
+	    case bfd_reloc_dangerous:
+	      error_message = _("dangerous relocation");
+	      goto common_error;
+
+	    default:
+	      error_message = _("unknown error");
+	      /* Fall through.  */
+
+	    common_error:
+	      BFD_ASSERT (error_message != NULL);
+	      if (!((*info->callbacks->reloc_dangerous)
+		    (info, error_message, input_bfd, input_section,
+		     rel->r_offset)))
+		return FALSE;
+	      break;
+	    }
+	}
+    }
+
+  return ok;
+}
+
+
+/* Look through the relocs for a section during the first phase, and
+   calculate needed space in the global offset table, procedure linkage
+   table, and dynamic reloc sections.  */
+
+static bfd_boolean
+elf32_tic6x_check_relocs (bfd *abfd, struct bfd_link_info *info,
+			  asection *sec, const Elf_Internal_Rela *relocs)
+{
+  struct elf32_tic6x_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  asection *sreloc;
+
+  if (info->relocatable)
+    return TRUE;
+
+  htab = elf32_tic6x_hash_table (info);
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+
+  /* Create dynamic sections for relocatable executables so that we can
+     copy relocations.  */
+  if ((info->shared || elf32_tic6x_using_dsbt (abfd))
+      && ! htab->elf.dynamic_sections_created)
+    {
+      if (! _bfd_elf_link_create_dynamic_sections (abfd, info))
+	return FALSE;
+    }
+
+  sreloc = NULL;
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      unsigned int r_type;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+      Elf_Internal_Sym *isym;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
+	{
+	  (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
+				 abfd,
+				 r_symndx);
+	  return FALSE;
+	}
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  /* A local symbol.  */
+	  isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+					abfd, r_symndx);
+	  if (isym == NULL)
+	    return FALSE;
+	  h = NULL;
+	}
+      else
+	{
+	  isym = NULL;
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      switch (r_type)
+	{
+	case R_C6000_PCR_S21:
+	case R_C6000_PREL31:
+	  /* This symbol requires a procedure linkage table entry.  We
+	     actually build the entry in adjust_dynamic_symbol,
+	     because this might be a case of linking PIC code which is
+	     never referenced by a dynamic object, in which case we
+	     don't need to generate a procedure linkage table entry
+	     after all.  */
+
+	  /* If this is a local symbol, we resolve it directly without
+	     creating a procedure linkage table entry.  */
+	  if (h == NULL)
+	    continue;
+
+	  h->needs_plt = 1;
+	  h->plt.refcount += 1;
+	  break;
+
+	case R_C6000_SBR_GOT_U15_W:
+	case R_C6000_SBR_GOT_L16_W:
+	case R_C6000_SBR_GOT_H16_W:
+	case R_C6000_EHTYPE:
+	  /* This symbol requires a global offset table entry.  */
+	  if (h != NULL)
+	    {
+	      h->got.refcount += 1;
+	    }
+	  else
+	    {
+	      bfd_signed_vma *local_got_refcounts;
+
+	      /* This is a global offset table entry for a local symbol.  */
+	      local_got_refcounts = elf_local_got_refcounts (abfd);
+	      if (local_got_refcounts == NULL)
+		{
+		  bfd_size_type size;
+
+		  size = symtab_hdr->sh_info;
+		  size *= (sizeof (bfd_signed_vma)
+			   + sizeof (bfd_vma) + sizeof(char));
+		  local_got_refcounts = bfd_zalloc (abfd, size);
+		  if (local_got_refcounts == NULL)
+		    return FALSE;
+		  elf_local_got_refcounts (abfd) = local_got_refcounts;
+		}
+	      local_got_refcounts[r_symndx] += 1;
+	    }
+
+	  if (htab->elf.sgot == NULL)
+	    {
+	      if (htab->elf.dynobj == NULL)
+		htab->elf.dynobj = abfd;
+	      if (!_bfd_elf_create_got_section (htab->elf.dynobj, info))
+		return FALSE;
+	    }
+	  break;
+
+	case R_C6000_DSBT_INDEX:
+	  /* We'd like to check for nonzero dsbt_index here, but it's
+	     set up only after check_relocs is called.  Instead, we
+	     store the number of R_C6000_DSBT_INDEX relocs in the
+	     pc_count field, and potentially discard the extra space
+	     in elf32_tic6x_allocate_dynrelocs.  */
+	  if (!info->shared)
+	    break;
+
+	  /* fall through */
+	case R_C6000_ABS32:
+	case R_C6000_ABS16:
+	case R_C6000_ABS8:
+	case R_C6000_ABS_S16:
+	case R_C6000_ABS_L16:
+	case R_C6000_ABS_H16:
+	  /* If we are creating a shared library, and this is a reloc
+	     against a global symbol, or a non PC relative reloc
+	     against a local symbol, then we need to copy the reloc
+	     into the shared library.  However, if we are linking with
+	     -Bsymbolic, we do not need to copy a reloc against a
+	     global symbol which is defined in an object we are
+	     including in the link (i.e., DEF_REGULAR is set).  At
+	     this point we have not seen all the input files, so it is
+	     possible that DEF_REGULAR is not set now but will be set
+	     later (it is never cleared).  In case of a weak definition,
+	     DEF_REGULAR may be cleared later by a strong definition in
+	     a shared library.  We account for that possibility below by
+	     storing information in the relocs_copied field of the hash
+	     table entry.  A similar situation occurs when creating
+	     shared libraries and symbol visibility changes render the
+	     symbol local.
+
+	     If on the other hand, we are creating an executable, we
+	     may need to keep relocations for symbols satisfied by a
+	     dynamic library if we manage to avoid copy relocs for the
+	     symbol.  */
+	  if ((info->shared || elf32_tic6x_using_dsbt (abfd))
+	      && (sec->flags & SEC_ALLOC) != 0)
+	    {
+	      struct elf_dyn_relocs *p;
+	      struct elf_dyn_relocs **head;
+
+	      /* We must copy these reloc types into the output file.
+		 Create a reloc section in dynobj and make room for
+		 this reloc.  */
+	      if (sreloc == NULL)
+		{
+		  if (htab->elf.dynobj == NULL)
+		    htab->elf.dynobj = abfd;
+
+		  sreloc = _bfd_elf_make_dynamic_reloc_section
+		    (sec, htab->elf.dynobj, 2, abfd, /*rela? */ TRUE);
+
+		  if (sreloc == NULL)
+		    return FALSE;
+		}
+
+	      /* If this is a global symbol, we count the number of
+		 relocations we need for this symbol.  */
+	      if (h != NULL)
+		{
+		  head = &((struct elf32_tic6x_link_hash_entry *) h)->dyn_relocs;
+		}
+	      else
+		{
+		  /* Track dynamic relocs needed for local syms too.
+		     We really need local syms available to do this
+		     easily.  Oh well.  */
+		  void **vpp;
+		  asection *s;
+
+		  s = bfd_section_from_elf_index (abfd, isym->st_shndx);
+		  if (s == NULL)
+		    s = sec;
+
+		  vpp = &elf_section_data (s)->local_dynrel;
+		  head = (struct elf_dyn_relocs **)vpp;
+		}
+
+	      p = *head;
+	      if (p == NULL || p->sec != sec)
+		{
+		  bfd_size_type amt = sizeof *p;
+		  p = bfd_alloc (htab->elf.dynobj, amt);
+		  if (p == NULL)
+		    return FALSE;
+		  p->next = *head;
+		  *head = p;
+		  p->sec = sec;
+		  p->count = 0;
+		  p->pc_count = 0;
+		}
+
+	      p->count += 1;
+	      if (r_type == R_C6000_DSBT_INDEX)
+		p->pc_count += 1;
+	    }
+	  break;
+
+	case R_C6000_SBR_U15_B:
+	case R_C6000_SBR_U15_H:
+	case R_C6000_SBR_U15_W:
+	case R_C6000_SBR_S16:
+	case R_C6000_SBR_L16_B:
+	case R_C6000_SBR_L16_H:
+	case R_C6000_SBR_L16_W:
+	case R_C6000_SBR_H16_B:
+	case R_C6000_SBR_H16_H:
+	case R_C6000_SBR_H16_W:
+	  if (h != NULL && info->executable)
+	    {
+	      /* For B14-relative addresses, we might need a copy
+		 reloc.  */
+	      h->non_got_ref = 1;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf32_tic6x_add_symbol_hook (bfd *abfd,
+			     struct bfd_link_info *info ATTRIBUTE_UNUSED,
+			     Elf_Internal_Sym *sym,
+			     const char **namep ATTRIBUTE_UNUSED,
+			     flagword *flagsp ATTRIBUTE_UNUSED,
+			     asection **secp,
+			     bfd_vma *valp)
+{
+  switch (sym->st_shndx)
+    {
+    case SHN_TIC6X_SCOMMON:
+      *secp = bfd_make_section_old_way (abfd, ".scommon");
+      (*secp)->flags |= SEC_IS_COMMON;
+      *valp = sym->st_size;
+      bfd_set_section_alignment (abfd, *secp, bfd_log2 (sym->st_value));
+      break;
+    }
+
+  return TRUE;
+}
+
+static void
+elf32_tic6x_symbol_processing (bfd *abfd ATTRIBUTE_UNUSED, asymbol *asym)
+{
+  elf_symbol_type *elfsym;
+
+  elfsym = (elf_symbol_type *) asym;
+  switch (elfsym->internal_elf_sym.st_shndx)
+    {
+    case SHN_TIC6X_SCOMMON:
+      if (tic6x_elf_scom_section.name == NULL)
+        {
+          /* Initialize the small common section.  */
+          tic6x_elf_scom_section.name = ".scommon";
+          tic6x_elf_scom_section.flags = SEC_IS_COMMON;
+          tic6x_elf_scom_section.output_section = &tic6x_elf_scom_section;
+          tic6x_elf_scom_section.symbol = &tic6x_elf_scom_symbol;
+          tic6x_elf_scom_section.symbol_ptr_ptr = &tic6x_elf_scom_symbol_ptr;
+          tic6x_elf_scom_symbol.name = ".scommon";
+          tic6x_elf_scom_symbol.flags = BSF_SECTION_SYM;
+          tic6x_elf_scom_symbol.section = &tic6x_elf_scom_section;
+          tic6x_elf_scom_symbol_ptr = &tic6x_elf_scom_symbol;
+        }
+      asym->section = &tic6x_elf_scom_section;
+      asym->value = elfsym->internal_elf_sym.st_size;
+      break;
+    }
+}
+
+static int
+elf32_tic6x_link_output_symbol_hook (struct bfd_link_info *info ATTRIBUTE_UNUSED,
+				     const char *name ATTRIBUTE_UNUSED,
+				     Elf_Internal_Sym *sym,
+				     asection *input_sec,
+				     struct elf_link_hash_entry *h ATTRIBUTE_UNUSED)
+{
+  /* If we see a common symbol, which implies a relocatable link, then
+     if a symbol was small common in an input file, mark it as small
+     common in the output file.  */
+  if (sym->st_shndx == SHN_COMMON && strcmp (input_sec->name, ".scommon") == 0)
+    sym->st_shndx = SHN_TIC6X_SCOMMON;
+
+  return 1;
+}
+
+static bfd_boolean
+elf32_tic6x_section_from_bfd_section (bfd *abfd ATTRIBUTE_UNUSED,
+				      asection *sec,
+				      int *retval)
+{
+  if (strcmp (bfd_get_section_name (abfd, sec), ".scommon") == 0)
+    {
+      *retval = SHN_TIC6X_SCOMMON;
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   dynamic relocs.  */
+
+static bfd_boolean
+elf32_tic6x_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+{
+  struct bfd_link_info *info;
+  struct elf32_tic6x_link_hash_table *htab;
+  struct elf32_tic6x_link_hash_entry *eh;
+  struct elf_dyn_relocs *p;
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  eh = (struct elf32_tic6x_link_hash_entry *) h;
+  info = (struct bfd_link_info *) inf;
+  htab = elf32_tic6x_hash_table (info);
+
+  if (htab->elf.dynamic_sections_created && h->plt.refcount > 0)
+    {
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1 && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      if (info->shared
+	  || WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, 0, h))
+	{
+	  asection *s = htab->elf.splt;
+
+	  /* If this is the first .plt entry, make room for the special
+	     first entry.  */
+	  if (s->size == 0)
+	    s->size += PLT_ENTRY_SIZE;
+
+	  h->plt.offset = s->size;
+
+	  /* If this symbol is not defined in a regular file, and we are
+	     not generating a shared library, then set the symbol to this
+	     location in the .plt.  This is required to make function
+	     pointers compare as equal between the normal executable and
+	     the shared library.  */
+	  if (! info->shared && !h->def_regular)
+	    {
+	      h->root.u.def.section = s;
+	      h->root.u.def.value = h->plt.offset;
+	    }
+
+	  /* Make room for this entry.  */
+	  s->size += PLT_ENTRY_SIZE;
+	  /* We also need to make an entry in the .got.plt section, which
+	     will be placed in the .got section by the linker script.  */
+	  htab->elf.sgotplt->size += 4;
+	  /* We also need to make an entry in the .rel.plt section.  */
+	  htab->elf.srelplt->size += sizeof (Elf32_External_Rela);
+	}
+      else
+	{
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	}
+    }
+  else
+    {
+      h->plt.offset = (bfd_vma) -1;
+      h->needs_plt = 0;
+    }
+
+  if (h->got.refcount > 0)
+    {
+      asection *s;
+
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      s = htab->elf.sgot;
+      h->got.offset = s->size;
+      s->size += 4;
+
+      if (!(ELF_ST_VISIBILITY (h->other)
+	    && h->root.type == bfd_link_hash_undefweak))
+	htab->elf.srelgot->size += sizeof (Elf32_External_Rela);
+    }
+  else
+    h->got.offset = (bfd_vma) -1;
+
+  if (eh->dyn_relocs == NULL)
+    return TRUE;
+
+  /* Discard relocs on undefined weak syms with non-default
+     visibility.  */
+  if (info->shared || elf32_tic6x_using_dsbt (htab->obfd))
+    {
+      /* We use the pc_count field to hold the number of
+	 R_C6000_DSBT_INDEX relocs.  */
+      if (htab->params.dsbt_index != 0)
+	{
+	  struct elf_dyn_relocs **pp;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      p->count -= p->pc_count;
+	      p->pc_count = 0;
+	      if (p->count == 0)
+		*pp = p->next;
+	      else
+		pp = &p->next;
+	    }
+	}
+
+      if (eh->dyn_relocs != NULL
+	  && h->root.type == bfd_link_hash_undefweak)
+	{
+	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	    eh->dyn_relocs = NULL;
+
+	  /* Make sure undefined weak symbols are output as a dynamic
+	     symbol in PIEs.  */
+	  else if (h->dynindx == -1
+		   && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+	}
+    }
+
+  /* Finally, allocate space.  */
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *sreloc;
+
+      sreloc = elf_section_data (p->sec)->sreloc;
+
+      BFD_ASSERT (sreloc != NULL);
+      sreloc->size += p->count * sizeof (Elf32_External_Rela);
+    }
+
+  return TRUE;
+}
+
+/* Find any dynamic relocs that apply to read-only sections.  */
+
+static bfd_boolean
+elf32_tic6x_readonly_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+{
+  struct elf32_tic6x_link_hash_entry *eh;
+  struct elf_dyn_relocs *p;
+
+  eh = (struct elf32_tic6x_link_hash_entry *) h;
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *s = p->sec->output_section;
+
+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
+	{
+	  struct bfd_link_info *info = (struct bfd_link_info *) inf;
+
+	  info->flags |= DF_TEXTREL;
+
+	  /* Not an error, just cut short the traversal.  */
+	  return FALSE;
+	}
+    }
+  return TRUE;
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+elf32_tic6x_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
+{
+  struct elf32_tic6x_link_hash_table *htab;
+  bfd *dynobj;
+  asection *s;
+  bfd_boolean relocs;
+  bfd *ibfd;
+
+  htab = elf32_tic6x_hash_table (info);
+  dynobj = htab->elf.dynobj;
+  if (dynobj == NULL)
+    abort ();
+
+  if (htab->elf.dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  if (s == NULL)
+	    abort ();
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+
+  /* Set up .got offsets for local syms, and space for local dynamic
+     relocs.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      bfd_signed_vma *local_got;
+      bfd_signed_vma *end_local_got;
+      char *local_tls_type;
+      bfd_vma *local_tlsdesc_gotent;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *srel;
+
+      for (s = ibfd->sections; s != NULL; s = s->next)
+	{
+	  struct elf_dyn_relocs *p;
+
+	  for (p = ((struct elf_dyn_relocs *)
+		     elf_section_data (s)->local_dynrel);
+	       p != NULL;
+	       p = p->next)
+	    {
+	      if (!bfd_is_abs_section (p->sec)
+		  && bfd_is_abs_section (p->sec->output_section))
+		{
+		  /* Input section has been discarded, either because
+		     it is a copy of a linkonce section or due to
+		     linker script /DISCARD/, so we'll be discarding
+		     the relocs too.  */
+		}
+	      else if (p->count != 0)
+		{
+		  srel = elf_section_data (p->sec)->sreloc;
+		  srel->size += p->count * sizeof (Elf32_External_Rela);
+		  if ((p->sec->output_section->flags & SEC_READONLY) != 0)
+		    info->flags |= DF_TEXTREL;
+		}
+	    }
+	}
+
+      local_got = elf_local_got_refcounts (ibfd);
+      if (!local_got)
+	continue;
+
+      symtab_hdr = &elf_symtab_hdr (ibfd);
+      locsymcount = symtab_hdr->sh_info;
+      end_local_got = local_got + locsymcount;
+      s = htab->elf.sgot;
+      srel = htab->elf.srelgot;
+      for (; local_got < end_local_got;
+	   ++local_got, ++local_tls_type, ++local_tlsdesc_gotent)
+	{
+	  if (*local_got > 0)
+	    {
+	      *local_got = s->size;
+	      s->size += 4;
+
+	      if (info->shared || elf32_tic6x_using_dsbt (output_bfd))
+		{
+		  srel->size += sizeof (Elf32_External_Rela);
+		}
+	    }
+	  else
+	    *local_got = (bfd_vma) -1;
+	}
+    }
+
+  /* Allocate global sym .plt and .got entries, and space for global
+     sym dynamic relocs.  */
+  elf_link_hash_traverse (&htab->elf, elf32_tic6x_allocate_dynrelocs, info);
+
+  /* We now have determined the sizes of the various dynamic sections.
+     Allocate memory for them.  */
+  relocs = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      bfd_boolean strip_section = TRUE;
+
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      if (s == htab->dsbt)
+	s->size = 4 * htab->params.dsbt_size;
+      else if (s == htab->elf.splt
+	       || s == htab->elf.sgot
+	       || s == htab->elf.sgotplt
+	       || s == htab->sdynbss)
+	{
+	  /* Strip this section if we don't need it; see the
+	     comment below.  */
+	  /* We'd like to strip these sections if they aren't needed, but if
+	     we've exported dynamic symbols from them we must leave them.
+	     It's too late to tell BFD to get rid of the symbols.  */
+
+	  if (htab->elf.hplt != NULL)
+	    strip_section = FALSE;
+
+	  /* Round up the size of the PLT section to a multiple of 32.  */
+	  if (s == htab->elf.splt && s->size > 0)
+	    s->size = (s->size + 31) & ~(bfd_vma)31;
+	}
+      else if (CONST_STRNEQ (bfd_get_section_name (dynobj, s), ".rela"))
+	{
+	  if (s->size != 0
+	      && s != htab->elf.srelplt)
+	    relocs = TRUE;
+
+	  /* We use the reloc_count field as a counter if we need
+	     to copy relocs into the output file.  */
+	  s->reloc_count = 0;
+	}
+      else
+	{
+	  /* It's not one of our sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (s->size == 0)
+	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is mostly to handle .rel.bss and
+	     .rel.plt.  We must create both sections in
+	     create_dynamic_sections, because they must be created
+	     before the linker maps input sections to output
+	     sections.  The linker does that before
+	     adjust_dynamic_symbol is called, and it is that
+	     function which decides whether anything needs to go
+	     into these sections.  */
+	  if (strip_section)
+	    s->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents.  We use bfd_zalloc
+	 here in case unused entries are not reclaimed before the
+	 section's contents are written out.  This should not happen,
+	 but this way if it does, we get a R_C6000_NONE reloc instead
+	 of garbage.  */
+      s->contents = bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+
+  if (htab->elf.dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in elf32_tic6x_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (info->executable)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (!add_dynamic_entry (DT_C6000_DSBT_BASE, 0)
+	  || !add_dynamic_entry (DT_C6000_DSBT_SIZE, htab->params.dsbt_size)
+	  || !add_dynamic_entry (DT_C6000_DSBT_INDEX,
+				 htab->params.dsbt_index))
+	return FALSE;
+
+      if (htab->elf.splt->size != 0)
+	{
+	  if (!add_dynamic_entry (DT_PLTGOT, 0)
+	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+	      || !add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+	}
+
+      if (relocs)
+	{
+	  if (!add_dynamic_entry (DT_RELA, 0)
+	      || !add_dynamic_entry (DT_RELASZ, 0)
+	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
+	    return FALSE;
+
+	  /* If any dynamic relocs apply to a read-only section,
+	     then we need a DT_TEXTREL entry.  */
+	  if ((info->flags & DF_TEXTREL) == 0)
+	    elf_link_hash_traverse (&htab->elf,
+				    elf32_tic6x_readonly_dynrelocs, info);
+
+	  if ((info->flags & DF_TEXTREL) != 0)
+	    {
+	      if (!add_dynamic_entry (DT_TEXTREL, 0))
+		return FALSE;
+	    }
+	}
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+/* This function is called after all the input files have been read,
+   and the input sections have been assigned to output sections.  */
+
+static bfd_boolean
+elf32_tic6x_always_size_sections (bfd *output_bfd, struct bfd_link_info *info)
+{
+  if (elf32_tic6x_using_dsbt (output_bfd) && !info->relocatable)
+    {
+      struct elf_link_hash_entry *h;
+
+      /* Force a PT_GNU_STACK segment to be created.  */
+      if (! elf_tdata (output_bfd)->stack_flags)
+	elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
+
+      /* Define __stacksize if it's not defined yet.  */
+      h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
+				FALSE, FALSE, FALSE);
+      if (! h || h->root.type != bfd_link_hash_defined
+	  || h->type != STT_OBJECT
+	  || !h->def_regular)
+	{
+	  struct bfd_link_hash_entry *bh = NULL;
+
+	  if (!(_bfd_generic_link_add_one_symbol
+		(info, output_bfd, "__stacksize",
+		 BSF_GLOBAL, bfd_abs_section_ptr, DEFAULT_STACK_SIZE,
+		 (const char *) NULL, FALSE,
+		 get_elf_backend_data (output_bfd)->collect, &bh)))
+	    return FALSE;
+
+	  h = (struct elf_link_hash_entry *) bh;
+	  h->def_regular = 1;
+	  h->type = STT_OBJECT;
+	}
+    }
+  return TRUE;
+}
+
+static bfd_boolean
+elf32_tic6x_modify_program_headers (bfd *output_bfd,
+				    struct bfd_link_info *info)
+{
+  struct elf_obj_tdata *tdata = elf_tdata (output_bfd);
+  struct elf_segment_map *m;
+  Elf_Internal_Phdr *p;
+
+  /* objcopy and strip preserve what's already there using
+     elf32_tic6x_copy_private_bfd_data ().  */
+  if (! info)
+    return TRUE;
+
+  for (p = tdata->phdr, m = tdata->segment_map; m != NULL; m = m->next, p++)
+    if (m->p_type == PT_GNU_STACK)
+      break;
+
+  if (m)
+    {
+      struct elf_link_hash_entry *h;
+
+      /* Obtain the pointer to the __stacksize symbol.  */
+      h = elf_link_hash_lookup (elf_hash_table (info), "__stacksize",
+				FALSE, FALSE, FALSE);
+      if (h)
+	{
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	  BFD_ASSERT (h->root.type == bfd_link_hash_defined);
+	}
+
+      /* Set the header p_memsz from the symbol value.  We
+	 intentionally ignore the symbol section.  */
+      if (h && h->root.type == bfd_link_hash_defined)
+	p->p_memsz = h->root.u.def.value;
+      else
+	p->p_memsz = DEFAULT_STACK_SIZE;
+
+      p->p_align = 8;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf32_tic6x_finish_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+				     struct bfd_link_info *info)
+{
+  struct elf32_tic6x_link_hash_table *htab;
+  bfd *dynobj;
+  asection *sdyn;
+
+  htab = elf32_tic6x_hash_table (info);
+  dynobj = htab->elf.dynobj;
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      Elf32_External_Dyn * dyncon;
+      Elf32_External_Dyn * dynconend;
+
+      BFD_ASSERT (sdyn != NULL);
+
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+	  asection *s;
+
+	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    default:
+	      break;
+
+	    case DT_C6000_DSBT_BASE:
+	      s = htab->dsbt;
+	      dyn.d_un.d_ptr = (s->output_section->vma + s->output_offset);
+	      break;
+
+	    case DT_PLTGOT:
+	      s = htab->elf.sgotplt;
+	      dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+	      break;
+
+	    case DT_JMPREL:
+	      s = htab->elf.srelplt;
+	      dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+	      break;
+
+	    case DT_PLTRELSZ:
+	      s = htab->elf.srelplt;
+	      dyn.d_un.d_val = s->size;
+	      break;
+	    }
+	  bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	}
+
+      /* Fill in the first entry in the procedure linkage table.  */
+      if (htab->elf.splt && htab->elf.splt->size > 0)
+	{
+	  bfd_vma got_offs = (htab->elf.sgotplt->output_section->vma
+			      + htab->elf.sgotplt->output_offset
+			      - htab->dsbt->output_section->vma
+			      - htab->dsbt->output_offset) / 4;
+
+	  /* ldw .D2T2 *+b14[$GOT(0)],b2 */
+	  bfd_put_32 (output_bfd, got_offs << 8 | 0x0100006e,
+		      htab->elf.splt->contents);
+	  /* ldw .D2T2 *+b14[$GOT(4)],b1 */
+	  bfd_put_32 (output_bfd, (got_offs + 1) << 8 | 0x0080006e,
+		      htab->elf.splt->contents + 4);
+	  /* nop 3 */
+	  bfd_put_32 (output_bfd, 0x00004000,
+		      htab->elf.splt->contents + 8);
+	  /* b .s2 b2 */
+	  bfd_put_32 (output_bfd, 0x00080362,
+		      htab->elf.splt->contents + 12);
+	  /* nop 5 */
+	  bfd_put_32 (output_bfd, 0x00008000,
+		      htab->elf.splt->contents + 16);
+
+	  elf_section_data (htab->elf.splt->output_section)
+	    ->this_hdr.sh_entsize = PLT_ENTRY_SIZE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return address for Ith PLT stub in section PLT, for relocation REL
+   or (bfd_vma) -1 if it should not be included.  */
+
+static bfd_vma
+elf32_tic6x_plt_sym_val (bfd_vma i, const asection *plt,
+			 const arelent *rel ATTRIBUTE_UNUSED)
+{
+  return plt->vma + (i + 1) * PLT_ENTRY_SIZE;
+}
+
+static int
+elf32_tic6x_obj_attrs_arg_type (int tag)
+{
+  if (tag == Tag_ABI_compatibility)
+    return ATTR_TYPE_FLAG_INT_VAL | ATTR_TYPE_FLAG_STR_VAL;
+  else if (tag & 1)
+    return ATTR_TYPE_FLAG_STR_VAL;
+  else
+    return ATTR_TYPE_FLAG_INT_VAL;
+}
+
+static int
+elf32_tic6x_obj_attrs_order (int num)
+{
+  if (num == LEAST_KNOWN_OBJ_ATTRIBUTE)
+    return Tag_ABI_conformance;
+  if ((num - 1) < Tag_ABI_conformance)
+    return num - 1;
+  return num;
+}
+
+static bfd_boolean
+elf32_tic6x_obj_attrs_handle_unknown (bfd *abfd, int tag)
+{
+  if ((tag & 127) < 64)
+    {
+      _bfd_error_handler
+	(_("%B: error: unknown mandatory EABI object attribute %d"),
+	 abfd, tag);
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+  else
+    {
+      _bfd_error_handler
+	(_("%B: warning: unknown EABI object attribute %d"),
+	 abfd, tag);
+      return TRUE;
+    }
+}
+
+/* Merge the Tag_ISA attribute values ARCH1 and ARCH2
+   and return the merged value.  At present, all merges succeed, so no
+   return value for errors is defined.  */
+
+int
+elf32_tic6x_merge_arch_attributes (int arch1, int arch2)
+{
+  int min_arch, max_arch;
+
+  min_arch = (arch1 < arch2 ? arch1 : arch2);
+  max_arch = (arch1 > arch2 ? arch1 : arch2);
+
+  /* In most cases, the numerically greatest value is the correct
+     merged value, but merging C64 and C67 results in C674X.  */
+  if ((min_arch == C6XABI_Tag_ISA_C67X
+       || min_arch == C6XABI_Tag_ISA_C67XP)
+      && (max_arch == C6XABI_Tag_ISA_C64X
+	  || max_arch == C6XABI_Tag_ISA_C64XP))
+    return C6XABI_Tag_ISA_C674X;
+
+  return max_arch;
+}
+
+/* Convert a Tag_ABI_array_object_alignment or
+   Tag_ABI_array_object_align_expected tag value TAG to a
+   corresponding alignment value; return the alignment, or -1 for an
+   unknown tag value.  */
+
+static int
+elf32_tic6x_tag_to_array_alignment (int tag)
+{
+  switch (tag)
+    {
+    case 0:
+      return 8;
+
+    case 1:
+      return 4;
+
+    case 2:
+      return 16;
+
+    default:
+      return -1;
+    }
+}
+
+/* Convert a Tag_ABI_array_object_alignment or
+   Tag_ABI_array_object_align_expected alignment ALIGN to a
+   corresponding tag value; return the tag value.  */
+
+static int
+elf32_tic6x_array_alignment_to_tag (int align)
+{
+  switch (align)
+    {
+    case 8:
+      return 0;
+
+    case 4:
+      return 1;
+
+    case 16:
+      return 2;
+
+    default:
+      abort ();
+    }
+}
+
+/* Merge attributes from IBFD and OBFD, returning TRUE if the merge
+   succeeded, FALSE otherwise.  */
+
+static bfd_boolean
+elf32_tic6x_merge_attributes (bfd *ibfd, bfd *obfd)
+{
+  bfd_boolean result = TRUE;
+  obj_attribute *in_attr;
+  obj_attribute *out_attr;
+  int i;
+  int array_align_in, array_align_out, array_expect_in, array_expect_out;
+
+  if (!elf_known_obj_attributes_proc (obfd)[0].i)
+    {
+      /* This is the first object.  Copy the attributes.  */
+      _bfd_elf_copy_obj_attributes (ibfd, obfd);
+
+      out_attr = elf_known_obj_attributes_proc (obfd);
+
+      /* Use the Tag_null value to indicate the attributes have been
+	 initialized.  */
+      out_attr[0].i = 1;
+
+      return TRUE;
+    }
+
+  in_attr = elf_known_obj_attributes_proc (ibfd);
+  out_attr = elf_known_obj_attributes_proc (obfd);
+
+  /* No specification yet for handling of unknown attributes, so just
+     ignore them and handle known ones.  */
+
+  if (out_attr[Tag_ABI_stack_align_preserved].i
+      < in_attr[Tag_ABI_stack_align_needed].i)
+    {
+      _bfd_error_handler
+	(_("error: %B requires more stack alignment than %B preserves"),
+	 ibfd, obfd);
+      result = FALSE;
+    }
+  if (in_attr[Tag_ABI_stack_align_preserved].i
+      < out_attr[Tag_ABI_stack_align_needed].i)
+    {
+      _bfd_error_handler
+	(_("error: %B requires more stack alignment than %B preserves"),
+	 obfd, ibfd);
+      result = FALSE;
+    }
+
+  array_align_in = elf32_tic6x_tag_to_array_alignment
+    (in_attr[Tag_ABI_array_object_alignment].i);
+  if (array_align_in == -1)
+    {
+      _bfd_error_handler
+	(_("error: unknown Tag_ABI_array_object_alignment value in %B"),
+	 ibfd);
+      result = FALSE;
+    }
+  array_align_out = elf32_tic6x_tag_to_array_alignment
+    (out_attr[Tag_ABI_array_object_alignment].i);
+  if (array_align_out == -1)
+    {
+      _bfd_error_handler
+	(_("error: unknown Tag_ABI_array_object_alignment value in %B"),
+	 obfd);
+      result = FALSE;
+    }
+  array_expect_in = elf32_tic6x_tag_to_array_alignment
+    (in_attr[Tag_ABI_array_object_align_expected].i);
+  if (array_expect_in == -1)
+    {
+      _bfd_error_handler
+	(_("error: unknown Tag_ABI_array_object_align_expected value in %B"),
+	 ibfd);
+      result = FALSE;
+    }
+  array_expect_out = elf32_tic6x_tag_to_array_alignment
+    (out_attr[Tag_ABI_array_object_align_expected].i);
+  if (array_expect_out == -1)
+    {
+      _bfd_error_handler
+	(_("error: unknown Tag_ABI_array_object_align_expected value in %B"),
+	 obfd);
+      result = FALSE;
+    }
+
+  if (array_align_out < array_expect_in)
+    {
+      _bfd_error_handler
+	(_("error: %B requires more array alignment than %B preserves"),
+	 ibfd, obfd);
+      result = FALSE;
+    }
+  if (array_align_in < array_expect_out)
+    {
+      _bfd_error_handler
+	(_("error: %B requires more array alignment than %B preserves"),
+	 obfd, ibfd);
+      result = FALSE;
+    }
+
+  for (i = LEAST_KNOWN_OBJ_ATTRIBUTE; i < NUM_KNOWN_OBJ_ATTRIBUTES; i++)
+    {
+      switch (i)
+	{
+	case Tag_ISA:
+	  out_attr[i].i = elf32_tic6x_merge_arch_attributes (in_attr[i].i,
+							     out_attr[i].i);
+	  break;
+
+	case Tag_ABI_wchar_t:
+	  if (out_attr[i].i == 0)
+	    out_attr[i].i = in_attr[i].i;
+	  if (out_attr[i].i != 0
+	      && in_attr[i].i != 0
+	      && out_attr[i].i != in_attr[i].i)
+	    {
+	      _bfd_error_handler
+		(_("warning: %B and %B differ in wchar_t size"), obfd, ibfd);
+	    }
+	  break;
+
+	case Tag_ABI_stack_align_needed:
+	  if (out_attr[i].i < in_attr[i].i)
+	    out_attr[i].i = in_attr[i].i;
+	  break;
+
+	case Tag_ABI_stack_align_preserved:
+	  if (out_attr[i].i > in_attr[i].i)
+	    out_attr[i].i = in_attr[i].i;
+	  break;
+
+	case Tag_ABI_DSBT:
+	  if (out_attr[i].i != in_attr[i].i)
+	    {
+	      _bfd_error_handler
+		(_("warning: %B and %B differ in whether code is "
+		   "compiled for DSBT"),
+		 obfd, ibfd);
+	    }
+	  break;
+
+	case Tag_ABI_PIC:
+	case Tag_ABI_PID:
+	  if (out_attr[i].i > in_attr[i].i)
+	    out_attr[i].i = in_attr[i].i;
+	  break;
+
+	case Tag_ABI_array_object_alignment:
+	  if (array_align_out != -1
+	      && array_align_in != -1
+	      && array_align_out > array_align_in)
+	    out_attr[i].i
+	      = elf32_tic6x_array_alignment_to_tag (array_align_in);
+	  break;
+
+	case Tag_ABI_array_object_align_expected:
+	  if (array_expect_out != -1
+	      && array_expect_in != -1
+	      && array_expect_out < array_expect_in)
+	    out_attr[i].i
+	      = elf32_tic6x_array_alignment_to_tag (array_expect_in);
+	  break;
+
+	case Tag_ABI_conformance:
+	  /* Merging for this attribute is not specified.  As on ARM,
+	     treat a missing attribute as no claim to conform and only
+	     merge identical values.  */
+	  if (out_attr[i].s == NULL
+	      || in_attr[i].s == NULL
+	      || strcmp (out_attr[i].s,
+			 in_attr[i].s) != 0)
+	    out_attr[i].s = NULL;
+	  break;
+
+	case Tag_ABI_compatibility:
+	  /* Merged in _bfd_elf_merge_object_attributes.  */
+	  break;
+
+	default:
+	  result
+	    = result && _bfd_elf_merge_unknown_attribute_low (ibfd, obfd, i);
+	  break;
+	}
+
+      if (in_attr[i].type && !out_attr[i].type)
+	out_attr[i].type = in_attr[i].type;
+    }
+
+  /* Merge Tag_ABI_compatibility attributes and any common GNU ones.  */
+  if (!_bfd_elf_merge_object_attributes (ibfd, obfd))
+    return FALSE;
+
+  result &= _bfd_elf_merge_unknown_attribute_list (ibfd, obfd);
+
+  return result;
+}
+
+static bfd_boolean
+elf32_tic6x_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  if (!_bfd_generic_verify_endian_match (ibfd, obfd))
+    return FALSE;
+
+  if (!elf32_tic6x_merge_attributes (ibfd, obfd))
+    return FALSE;
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf32_tic6x_copy_private_data (bfd * ibfd, bfd * obfd)
+{
+  _bfd_elf_copy_private_bfd_data (ibfd, obfd);
+
+  if (! is_tic6x_elf (ibfd) || ! is_tic6x_elf (obfd))
+    return TRUE;
+
+  /* Copy the stack size.  */
+  if (elf_tdata (ibfd)->phdr && elf_tdata (obfd)->phdr
+      && elf32_tic6x_using_dsbt (ibfd) && elf32_tic6x_using_dsbt (obfd))
+    {
+      unsigned i;
+
+      for (i = 0; i < elf_elfheader (ibfd)->e_phnum; i++)
+	if (elf_tdata (ibfd)->phdr[i].p_type == PT_GNU_STACK)
+	  {
+	    Elf_Internal_Phdr *iphdr = &elf_tdata (ibfd)->phdr[i];
+
+	    for (i = 0; i < elf_elfheader (obfd)->e_phnum; i++)
+	      if (elf_tdata (obfd)->phdr[i].p_type == PT_GNU_STACK)
+		{
+		  memcpy (&elf_tdata (obfd)->phdr[i], iphdr, sizeof (*iphdr));
+
+		  /* Rewrite the phdrs, since we're only called after they
+		     were first written.  */
+		  if (bfd_seek (obfd,
+				(bfd_signed_vma) get_elf_backend_data (obfd)
+				->s->sizeof_ehdr, SEEK_SET) != 0
+		      || get_elf_backend_data (obfd)->s
+		      ->write_out_phdrs (obfd, elf_tdata (obfd)->phdr,
+					 elf_elfheader (obfd)->e_phnum) != 0)
+		    return FALSE;
+		  break;
+		}
+
+	    break;
+	  }
+    }
+
+  return TRUE;
+}
+
+/* Add a new unwind edit to the list described by HEAD, TAIL.  If TINDEX is zero,
+   adds the edit to the start of the list.  (The list must be built in order of
+   ascending TINDEX: the function's callers are primarily responsible for
+   maintaining that condition).  */
+
+static void
+elf32_tic6x_add_unwind_table_edit (tic6x_unwind_table_edit **head,
+				   tic6x_unwind_table_edit **tail,
+				   tic6x_unwind_edit_type type,
+				   asection *linked_section,
+				   unsigned int tindex)
+{
+  tic6x_unwind_table_edit *new_edit = (tic6x_unwind_table_edit *)
+      xmalloc (sizeof (tic6x_unwind_table_edit));
+  
+  new_edit->type = type;
+  new_edit->linked_section = linked_section;
+  new_edit->index = tindex;
+  
+  if (tindex > 0)
+    {
+      new_edit->next = NULL;
+
+      if (*tail)
+	(*tail)->next = new_edit;
+
+      (*tail) = new_edit;
+
+      if (!*head)
+	(*head) = new_edit;
+    }
+  else
+    {
+      new_edit->next = *head;
+
+      if (!*tail)
+	*tail = new_edit;
+
+      *head = new_edit;
+    }
+}
+
+static _tic6x_elf_section_data *
+get_tic6x_elf_section_data (asection * sec)
+{
+  if (sec && sec->owner && is_tic6x_elf (sec->owner))
+    return elf32_tic6x_section_data (sec);
+  else
+    return NULL;
+}
+
+
+/* Increase the size of EXIDX_SEC by ADJUST bytes.  ADJUST must be negative.  */
+static void
+elf32_tic6x_adjust_exidx_size (asection *exidx_sec, int adjust)
+{
+  asection *out_sec;
+
+  if (!exidx_sec->rawsize)
+    exidx_sec->rawsize = exidx_sec->size;
+
+  bfd_set_section_size (exidx_sec->owner, exidx_sec, exidx_sec->size + adjust);
+  out_sec = exidx_sec->output_section;
+  /* Adjust size of output section.  */
+  bfd_set_section_size (out_sec->owner, out_sec, out_sec->size +adjust);
+}
+
+/* Insert an EXIDX_CANTUNWIND marker at the end of a section.  */
+static void
+elf32_tic6x_insert_cantunwind_after (asection *text_sec, asection *exidx_sec)
+{
+  struct _tic6x_elf_section_data *exidx_data;
+
+  exidx_data = get_tic6x_elf_section_data (exidx_sec);
+  elf32_tic6x_add_unwind_table_edit (
+    &exidx_data->u.exidx.unwind_edit_list,
+    &exidx_data->u.exidx.unwind_edit_tail,
+    INSERT_EXIDX_CANTUNWIND_AT_END, text_sec, UINT_MAX);
+
+  elf32_tic6x_adjust_exidx_size (exidx_sec, 8);
+}
+
+/* Scan .cx6abi.exidx tables, and create a list describing edits which
+   should be made to those tables, such that:
+   
+     1. Regions without unwind data are marked with EXIDX_CANTUNWIND entries.
+     2. Duplicate entries are merged together (EXIDX_CANTUNWIND, or unwind
+        codes which have been inlined into the index).
+
+   If MERGE_EXIDX_ENTRIES is false, duplicate entries are not merged.
+
+   The edits are applied when the tables are written
+   (in elf32_tic6x_write_section).
+*/
+
+bfd_boolean
+elf32_tic6x_fix_exidx_coverage (asection **text_section_order,
+				unsigned int num_text_sections,
+				struct bfd_link_info *info,
+				bfd_boolean merge_exidx_entries)
+{
+  bfd *inp;
+  unsigned int last_second_word = 0, i;
+  asection *last_exidx_sec = NULL;
+  asection *last_text_sec = NULL;
+  int last_unwind_type = -1;
+
+  /* Walk over all EXIDX sections, and create backlinks from the corrsponding
+     text sections.  */
+  for (inp = info->input_bfds; inp != NULL; inp = inp->link_next)
+    {
+      asection *sec;
+      
+      for (sec = inp->sections; sec != NULL; sec = sec->next)
+        {
+	  struct bfd_elf_section_data *elf_sec = elf_section_data (sec);
+	  Elf_Internal_Shdr *hdr = &elf_sec->this_hdr;
+	  
+	  if (!hdr || hdr->sh_type != SHT_C6000_UNWIND)
+	    continue;
+	  
+	  if (elf_sec->linked_to)
+	    {
+	      Elf_Internal_Shdr *linked_hdr
+	        = &elf_section_data (elf_sec->linked_to)->this_hdr;
+	      struct _tic6x_elf_section_data *linked_sec_tic6x_data
+	        = get_tic6x_elf_section_data (linked_hdr->bfd_section);
+
+	      if (linked_sec_tic6x_data == NULL)
+	        continue;
+
+	      /* Link this .c6xabi.exidx section back from the
+		 text section it describes.  */
+	      linked_sec_tic6x_data->u.text.tic6x_exidx_sec = sec;
+	    }
+	}
+    }
+
+  /* Walk all text sections in order of increasing VMA.  Eilminate duplicate
+     index table entries (EXIDX_CANTUNWIND and inlined unwind opcodes),
+     and add EXIDX_CANTUNWIND entries for sections with no unwind table data.  */
+
+  for (i = 0; i < num_text_sections; i++)
+    {
+      asection *sec = text_section_order[i];
+      asection *exidx_sec;
+      struct _tic6x_elf_section_data *tic6x_data
+       	= get_tic6x_elf_section_data (sec);
+      struct _tic6x_elf_section_data *exidx_data;
+      bfd_byte *contents = NULL;
+      int deleted_exidx_bytes = 0;
+      bfd_vma j;
+      tic6x_unwind_table_edit *unwind_edit_head = NULL;
+      tic6x_unwind_table_edit *unwind_edit_tail = NULL;
+      Elf_Internal_Shdr *hdr;
+      bfd *ibfd;
+
+      if (tic6x_data == NULL)
+        continue;
+
+      exidx_sec = tic6x_data->u.text.tic6x_exidx_sec;
+      if (exidx_sec == NULL)
+	{
+	  /* Section has no unwind data.  */
+	  if (last_unwind_type == 0 || !last_exidx_sec)
+	    continue;
+
+	  /* Ignore zero sized sections.  */
+	  if (sec->size == 0)
+	    continue;
+
+	  elf32_tic6x_insert_cantunwind_after (last_text_sec, last_exidx_sec);
+	  last_unwind_type = 0;
+	  continue;
+	}
+
+      /* Skip /DISCARD/ sections.  */
+      if (bfd_is_abs_section (exidx_sec->output_section))
+	continue;
+
+      hdr = &elf_section_data (exidx_sec)->this_hdr;
+      if (hdr->sh_type != SHT_C6000_UNWIND)
+        continue;
+      
+      exidx_data = get_tic6x_elf_section_data (exidx_sec);
+      if (exidx_data == NULL)
+        continue;
+      
+      ibfd = exidx_sec->owner;
+	  
+      if (hdr->contents != NULL)
+	contents = hdr->contents;
+      else if (! bfd_malloc_and_get_section (ibfd, exidx_sec, &contents))
+	/* An error?  */
+	continue;
+
+      for (j = 0; j < hdr->sh_size; j += 8)
+	{
+	  unsigned int second_word = bfd_get_32 (ibfd, contents + j + 4);
+	  int unwind_type;
+	  int elide = 0;
+
+	  /* An EXIDX_CANTUNWIND entry.  */
+	  if (second_word == 1)
+	    {
+	      if (last_unwind_type == 0)
+		elide = 1;
+	      unwind_type = 0;
+	    }
+	  /* Inlined unwinding data.  Merge if equal to previous.  */
+	  else if ((second_word & 0x80000000) != 0)
+	    {
+	      if (merge_exidx_entries
+		  && last_second_word == second_word
+		  && last_unwind_type == 1)
+		elide = 1;
+	      unwind_type = 1;
+	      last_second_word = second_word;
+	    }
+	  /* Normal table entry.  In theory we could merge these too,
+	     but duplicate entries are likely to be much less common.  */
+	  else
+	    unwind_type = 2;
+
+	  if (elide)
+	    {
+	      elf32_tic6x_add_unwind_table_edit (&unwind_edit_head,
+		  &unwind_edit_tail, DELETE_EXIDX_ENTRY, NULL, j / 8);
+
+	      deleted_exidx_bytes += 8;
+	    }
+
+	  last_unwind_type = unwind_type;
+	}
+
+      /* Free contents if we allocated it ourselves.  */
+      if (contents != hdr->contents)
+        free (contents);
+
+      /* Record edits to be applied later (in elf32_tic6x_write_section).  */
+      exidx_data->u.exidx.unwind_edit_list = unwind_edit_head;
+      exidx_data->u.exidx.unwind_edit_tail = unwind_edit_tail;
+	  
+      if (deleted_exidx_bytes > 0)
+	elf32_tic6x_adjust_exidx_size (exidx_sec, -deleted_exidx_bytes);
+
+      last_exidx_sec = exidx_sec;
+      last_text_sec = sec;
+    }
+
+  /* Add terminating CANTUNWIND entry.  */
+  if (last_exidx_sec && last_unwind_type != 0)
+    elf32_tic6x_insert_cantunwind_after (last_text_sec, last_exidx_sec);
+
+  return TRUE;
+}
+
+/* Add ADDEND to lower 31 bits of VAL, leaving other bits unmodified.  */
+
+static unsigned long
+elf32_tic6x_add_low31 (unsigned long val, bfd_vma addend)
+{
+  return (val & ~0x7ffffffful) | ((val + addend) & 0x7ffffffful);
+}
+
+/* Copy an .c6xabi.exidx table entry, adding OFFSET to (applied) PREL31
+   relocations.  OFFSET is in bytes, and will be scaled before encoding.  */
+
+
+static void
+elf32_tic6x_copy_exidx_entry (bfd *output_bfd, bfd_byte *to, bfd_byte *from,
+			      bfd_vma offset)
+{
+  unsigned long first_word = bfd_get_32 (output_bfd, from);
+  unsigned long second_word = bfd_get_32 (output_bfd, from + 4);
+
+  offset >>= 1;
+  /* High bit of first word is supposed to be zero.  */
+  if ((first_word & 0x80000000ul) == 0)
+    first_word = elf32_tic6x_add_low31 (first_word, offset);
+  
+  /* If the high bit of the first word is clear, and the bit pattern is not 0x1
+     (EXIDX_CANTUNWIND), this is an offset to an .c6xabi.extab entry.  */
+  if ((second_word != 0x1) && ((second_word & 0x80000000ul) == 0))
+    second_word = elf32_tic6x_add_low31 (second_word, offset);
+  
+  bfd_put_32 (output_bfd, first_word, to);
+  bfd_put_32 (output_bfd, second_word, to + 4);
+}
+
+/* Do the actual mangling of exception index tables.  */
+
+static bfd_boolean
+elf32_tic6x_write_section (bfd *output_bfd,
+			 struct bfd_link_info *link_info,
+			 asection *sec,
+			 bfd_byte *contents)
+{
+  _tic6x_elf_section_data *tic6x_data;
+  struct elf32_tic6x_link_hash_table *globals
+    = elf32_tic6x_hash_table (link_info);
+  bfd_vma offset = sec->output_section->vma + sec->output_offset;
+
+  if (globals == NULL)
+    return FALSE;
+
+  /* If this section has not been allocated an _tic6x_elf_section_data
+     structure then we cannot record anything.  */
+  tic6x_data = get_tic6x_elf_section_data (sec);
+  if (tic6x_data == NULL)
+    return FALSE;
+
+  if (tic6x_data->elf.this_hdr.sh_type != SHT_C6000_UNWIND)
+    return FALSE;
+
+  tic6x_unwind_table_edit *edit_node
+    = tic6x_data->u.exidx.unwind_edit_list;
+  /* Now, sec->size is the size of the section we will write.  The original
+     size (before we merged duplicate entries and inserted EXIDX_CANTUNWIND
+     markers) was sec->rawsize.  (This isn't the case if we perform no
+     edits, then rawsize will be zero and we should use size).  */
+  bfd_byte *edited_contents = (bfd_byte *) bfd_malloc (sec->size);
+  unsigned int input_size = sec->rawsize ? sec->rawsize : sec->size;
+  unsigned int in_index, out_index;
+  bfd_vma add_to_offsets = 0;
+
+  for (in_index = 0, out_index = 0; in_index * 8 < input_size || edit_node;)
+    {
+      if (edit_node)
+	{
+	  unsigned int edit_index = edit_node->index;
+	  
+	  if (in_index < edit_index && in_index * 8 < input_size)
+	    {
+	      elf32_tic6x_copy_exidx_entry (output_bfd,
+		  edited_contents + out_index * 8,
+		  contents + in_index * 8, add_to_offsets);
+	      out_index++;
+	      in_index++;
+	    }
+	  else if (in_index == edit_index
+		   || (in_index * 8 >= input_size
+		       && edit_index == UINT_MAX))
+	    {
+	      switch (edit_node->type)
+		{
+		case DELETE_EXIDX_ENTRY:
+		  in_index++;
+		  add_to_offsets += 8;
+		  break;
+		
+		case INSERT_EXIDX_CANTUNWIND_AT_END:
+		  {
+		    asection *text_sec = edit_node->linked_section;
+		    bfd_vma text_offset = text_sec->output_section->vma
+					  + text_sec->output_offset
+					  + text_sec->size;
+		    bfd_vma exidx_offset = offset + out_index * 8;
+		    unsigned long prel31_offset;
+
+		    /* Note: this is meant to be equivalent to an
+		       R_C6000_PREL31 relocation.  These synthetic
+		       EXIDX_CANTUNWIND markers are not relocated by the
+		       usual BFD method.  */
+		    prel31_offset = ((text_offset - exidx_offset) >> 1)
+				    & 0x7ffffffful;
+
+		    /* First address we can't unwind.  */
+		    bfd_put_32 (output_bfd, prel31_offset,
+				&edited_contents[out_index * 8]);
+
+		    /* Code for EXIDX_CANTUNWIND.  */
+		    bfd_put_32 (output_bfd, 0x1,
+				&edited_contents[out_index * 8 + 4]);
+
+		    out_index++;
+		    add_to_offsets -= 8;
+		  }
+		  break;
+		}
+	      
+	      edit_node = edit_node->next;
+	    }
+	}
+      else
+	{
+	  /* No more edits, copy remaining entries verbatim.  */
+	  elf32_tic6x_copy_exidx_entry (output_bfd,
+	      edited_contents + out_index * 8,
+	      contents + in_index * 8, add_to_offsets);
+	  out_index++;
+	  in_index++;
+	}
+    }
+
+  if (!(sec->flags & SEC_EXCLUDE) && !(sec->flags & SEC_NEVER_LOAD))
+    bfd_set_section_contents (output_bfd, sec->output_section,
+			      edited_contents,
+			      (file_ptr) sec->output_offset, sec->size);
+
+  return TRUE;
+}
+
+static void
+elf32_tic6x_set_osabi (bfd *abfd, struct bfd_link_info *link_info)
+{
+  if (link_info != NULL && link_info->relocatable)
+    return;
+  _bfd_elf_set_osabi (abfd, link_info);
+}
+
+#define TARGET_LITTLE_SYM	bfd_elf32_tic6x_le_vec
+#define TARGET_LITTLE_NAME	"elf32-tic6x-le"
+#define TARGET_BIG_SYM		bfd_elf32_tic6x_be_vec
+#define TARGET_BIG_NAME		"elf32-tic6x-be"
+#define ELF_ARCH		bfd_arch_tic6x
+#define ELF_TARGET_ID		TIC6X_ELF_DATA
+#define ELF_MACHINE_CODE	EM_TI_C6000
+#define ELF_MAXPAGESIZE		0x1000
+#define bfd_elf32_bfd_reloc_type_lookup elf32_tic6x_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup elf32_tic6x_reloc_name_lookup
+#define bfd_elf32_bfd_copy_private_bfd_data	elf32_tic6x_copy_private_data
+#define bfd_elf32_bfd_merge_private_bfd_data	elf32_tic6x_merge_private_bfd_data
+#define bfd_elf32_mkobject		elf32_tic6x_mkobject
+#define bfd_elf32_bfd_link_hash_table_create  elf32_tic6x_link_hash_table_create
+#define bfd_elf32_bfd_link_hash_table_free    elf32_tic6x_link_hash_table_free
+#define bfd_elf32_new_section_hook	elf32_tic6x_new_section_hook
+#define elf_backend_can_gc_sections	1
+#define elf_backend_default_use_rela_p	1
+#define elf_backend_may_use_rel_p	1
+#define elf_backend_may_use_rela_p	1
+#define elf_backend_obj_attrs_arg_type	elf32_tic6x_obj_attrs_arg_type
+#define elf_backend_obj_attrs_handle_unknown	elf32_tic6x_obj_attrs_handle_unknown
+#define elf_backend_obj_attrs_order	elf32_tic6x_obj_attrs_order
+#define elf_backend_obj_attrs_section	".c6xabi.attributes"
+#define elf_backend_obj_attrs_section_type	SHT_C6000_ATTRIBUTES
+#define elf_backend_obj_attrs_vendor	"c6xabi"
+#define elf_backend_can_refcount	1
+#define elf_backend_want_got_plt	1
+#define elf_backend_want_dynbss		1
+#define elf_backend_plt_readonly	1
+#define elf_backend_rela_normal		1
+#define elf_backend_got_header_size     8
+#define elf_backend_fake_sections       elf32_tic6x_fake_sections
+#define elf_backend_gc_sweep_hook	elf32_tic6x_gc_sweep_hook
+#define elf_backend_gc_mark_extra_sections elf32_tic6x_gc_mark_extra_sections
+#define elf_backend_modify_program_headers \
+  elf32_tic6x_modify_program_headers
+#define elf_backend_create_dynamic_sections \
+  elf32_tic6x_create_dynamic_sections
+#define elf_backend_adjust_dynamic_symbol \
+  elf32_tic6x_adjust_dynamic_symbol
+#define elf_backend_check_relocs        elf32_tic6x_check_relocs
+#define elf_backend_add_symbol_hook     elf32_tic6x_add_symbol_hook
+#define elf_backend_symbol_processing   elf32_tic6x_symbol_processing
+#define elf_backend_link_output_symbol_hook \
+  elf32_tic6x_link_output_symbol_hook
+#define elf_backend_section_from_bfd_section \
+  elf32_tic6x_section_from_bfd_section
+#define elf_backend_relocate_section	elf32_tic6x_relocate_section
+#define elf_backend_relocs_compatible	_bfd_elf_relocs_compatible
+#define elf_backend_finish_dynamic_symbol \
+  elf32_tic6x_finish_dynamic_symbol
+#define elf_backend_always_size_sections \
+  elf32_tic6x_always_size_sections
+#define elf_backend_size_dynamic_sections \
+  elf32_tic6x_size_dynamic_sections
+#define elf_backend_finish_dynamic_sections \
+  elf32_tic6x_finish_dynamic_sections
+#define bfd_elf32_bfd_final_link \
+	elf32_tic6x_final_link
+#define elf_backend_write_section	elf32_tic6x_write_section
+#define elf_info_to_howto		elf32_tic6x_info_to_howto
+#define elf_info_to_howto_rel		elf32_tic6x_info_to_howto_rel
+
+#undef elf_backend_omit_section_dynsym
+#define elf_backend_omit_section_dynsym elf32_tic6x_link_omit_section_dynsym
+#define elf_backend_plt_sym_val		elf32_tic6x_plt_sym_val
+
+#include "elf32-target.h"
+
+#undef elf32_bed
+#define	elf32_bed		elf32_tic6x_linux_bed
+
+#undef TARGET_LITTLE_SYM
+#define	TARGET_LITTLE_SYM		bfd_elf32_tic6x_linux_le_vec
+#undef TARGET_LITTLE_NAME
+#define	TARGET_LITTLE_NAME		"elf32-tic6x-linux-le"
+#undef TARGET_BIG_SYM
+#define TARGET_BIG_SYM			bfd_elf32_tic6x_linux_be_vec
+#undef TARGET_BIG_NAME
+#define	TARGET_BIG_NAME			"elf32-tic6x-linux-be"
+#undef ELF_OSABI
+#define	ELF_OSABI			ELFOSABI_C6000_LINUX
+
+#undef elf_backend_post_process_headers
+#define elf_backend_post_process_headers	elf32_tic6x_set_osabi
+
+#include "elf32-target.h"
+
+#undef elf32_bed
+#define	elf32_bed		elf32_tic6x_elf_bed
+
+#undef TARGET_LITTLE_SYM
+#define	TARGET_LITTLE_SYM		bfd_elf32_tic6x_elf_le_vec
+#undef TARGET_LITTLE_NAME
+#define	TARGET_LITTLE_NAME		"elf32-tic6x-elf-le"
+#undef TARGET_BIG_SYM
+#define TARGET_BIG_SYM			bfd_elf32_tic6x_elf_be_vec
+#undef TARGET_BIG_NAME
+#define	TARGET_BIG_NAME			"elf32-tic6x-elf-be"
+#undef ELF_OSABI
+#define	ELF_OSABI			ELFOSABI_C6000_ELFABI
+
+#undef elf_backend_post_process_headers
+#define elf_backend_post_process_headers	elf32_tic6x_set_osabi
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-tic6x.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-tic6x.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-tic6x.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-tic6x.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,35 @@
+/* 32-bit ELF support for TI C6X
+   Copyright 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+extern int elf32_tic6x_merge_arch_attributes (int, int);
+
+/* This function is provided for use from the assembler.  */
+
+extern void elf32_tic6x_set_use_rela_p (bfd *, bfd_boolean);
+
+struct elf32_tic6x_params
+{
+  int dsbt_index;
+  int dsbt_size;
+};
+
+extern void elf32_tic6x_setup (struct bfd_link_info *,
+			       struct elf32_tic6x_params *);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-tilegx.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-tilegx.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-tilegx.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-tilegx.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,132 @@
+/* TILE-Gx-specific support for 32-bit ELF.
+   Copyright 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elfxx-tilegx.h"
+#include "elf32-tilegx.h"
+
+
+/* Support for core dump NOTE sections.  */
+
+static bfd_boolean
+tilegx_elf_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  int offset;
+  size_t size;
+
+  if (note->descsz != TILEGX_PRSTATUS_SIZEOF)
+    return FALSE;
+
+  /* pr_cursig */
+  elf_tdata (abfd)->core_signal =
+    bfd_get_16 (abfd, note->descdata + TILEGX_PRSTATUS_OFFSET_PR_CURSIG);
+
+  /* pr_pid */
+  elf_tdata (abfd)->core_pid =
+    bfd_get_32 (abfd, note->descdata + TILEGX_PRSTATUS_OFFSET_PR_PID);
+
+  /* pr_reg */
+  offset = TILEGX_PRSTATUS_OFFSET_PR_REG;
+  size   = TILEGX_GREGSET_T_SIZE;
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg",
+					  size, note->descpos + offset);
+}
+
+static bfd_boolean
+tilegx_elf_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  if (note->descsz != TILEGX_PRPSINFO_SIZEOF)
+    return FALSE;
+
+  elf_tdata (abfd)->core_program
+    = _bfd_elfcore_strndup (abfd, note->descdata + TILEGX_PRPSINFO_OFFSET_PR_FNAME, 16);
+  elf_tdata (abfd)->core_command
+    = _bfd_elfcore_strndup (abfd, note->descdata + TILEGX_PRPSINFO_OFFSET_PR_PSARGS, ELF_PR_PSARGS_SIZE);
+
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+  {
+    char *command = elf_tdata (abfd)->core_command;
+    int n = strlen (command);
+
+    if (0 < n && command[n - 1] == ' ')
+      command[n - 1] = '\0';
+  }
+
+  return TRUE;
+}
+
+
+#define ELF_ARCH		bfd_arch_tilegx
+#define ELF_TARGET_ID		TILEGX_ELF_DATA
+#define ELF_MACHINE_CODE	EM_TILEGX
+#define ELF_MAXPAGESIZE		0x10000
+#define ELF_COMMONPAGESIZE	0x10000
+
+#define TARGET_LITTLE_SYM       bfd_elf32_tilegx_vec
+#define TARGET_LITTLE_NAME	"elf32-tilegx"
+
+#define elf_backend_reloc_type_class	     tilegx_reloc_type_class
+
+#define bfd_elf32_bfd_reloc_name_lookup      tilegx_reloc_name_lookup
+#define bfd_elf32_bfd_link_hash_table_create tilegx_elf_link_hash_table_create
+#define bfd_elf32_bfd_reloc_type_lookup	     tilegx_reloc_type_lookup
+#define bfd_elf32_bfd_merge_private_bfd_data \
+  _bfd_tilegx_elf_merge_private_bfd_data
+
+#define elf_backend_copy_indirect_symbol     tilegx_elf_copy_indirect_symbol
+#define elf_backend_create_dynamic_sections  tilegx_elf_create_dynamic_sections
+#define elf_backend_check_relocs	     tilegx_elf_check_relocs
+#define elf_backend_adjust_dynamic_symbol    tilegx_elf_adjust_dynamic_symbol
+#define elf_backend_omit_section_dynsym	     tilegx_elf_omit_section_dynsym
+#define elf_backend_size_dynamic_sections    tilegx_elf_size_dynamic_sections
+#define elf_backend_relocate_section	     tilegx_elf_relocate_section
+#define elf_backend_finish_dynamic_symbol    tilegx_elf_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections  tilegx_elf_finish_dynamic_sections
+#define elf_backend_gc_mark_hook	     tilegx_elf_gc_mark_hook
+#define elf_backend_gc_sweep_hook            tilegx_elf_gc_sweep_hook
+#define elf_backend_plt_sym_val		     tilegx_elf_plt_sym_val
+#define elf_info_to_howto_rel                NULL
+#define elf_info_to_howto                    tilegx_info_to_howto_rela
+#define elf_backend_grok_prstatus            tilegx_elf_grok_prstatus
+#define elf_backend_grok_psinfo              tilegx_elf_grok_psinfo
+#define elf_backend_additional_program_headers tilegx_additional_program_headers
+
+#define elf_backend_init_index_section	_bfd_elf_init_1_index_section
+
+#define elf_backend_can_gc_sections 1
+#define elf_backend_can_refcount 1
+#define elf_backend_want_got_plt 1
+#define elf_backend_plt_readonly 1
+/* Align PLT mod 64 byte L2 line size. */
+#define elf_backend_plt_alignment 6
+#define elf_backend_want_plt_sym 1
+#define elf_backend_got_header_size 4
+#define elf_backend_rela_normal 1
+#define elf_backend_default_execstack 0
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-tilegx.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-tilegx.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-tilegx.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-tilegx.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,38 @@
+/* TILE-Gx-specific support for 32-bit ELF.
+   Copyright 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _ELF32_TILEGX_H
+#define _ELF32_TILEGX_H
+
+/* This file contains sizes and offsets of Linux data structures.  */
+
+#define TILEGX_PRSTATUS_SIZEOF           592
+#define TILEGX_PRSTATUS_OFFSET_PR_CURSIG  12
+#define TILEGX_PRSTATUS_OFFSET_PR_PID     24
+#define TILEGX_PRSTATUS_OFFSET_PR_REG     72
+
+#define TILEGX_PRPSINFO_SIZEOF           128
+#define TILEGX_PRPSINFO_OFFSET_PR_FNAME   32
+#define TILEGX_PRPSINFO_OFFSET_PR_PSARGS  48
+#define ELF_PR_PSARGS_SIZE                80
+
+#define TILEGX_GREGSET_T_SIZE            512
+
+#endif /* _ELF32_TILEGX_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-tilepro.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-tilepro.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-tilepro.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-tilepro.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3604 @@
+/* TILEPro-specific support for 32-bit ELF.
+   Copyright 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "bfd.h"
+#include "sysdep.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/tilepro.h"
+#include "opcode/tilepro.h"
+#include "libiberty.h"
+#include "elf32-tilepro.h"
+
+#define TILEPRO_BYTES_PER_WORD 4
+
+static reloc_howto_type tilepro_elf_howto_table [] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_TILEPRO_NONE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEPRO_NONE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32 bit absolute relocation.  */
+  HOWTO (R_TILEPRO_32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEPRO_32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit absolute relocation.  */
+  HOWTO (R_TILEPRO_16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEPRO_16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An 8 bit absolute relocation.  */
+  HOWTO (R_TILEPRO_8,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEPRO_8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32 bit pc-relative relocation.  */
+  HOWTO (R_TILEPRO_32_PCREL,/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEPRO_32_PCREL", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 16 bit pc-relative relocation.  */
+  HOWTO (R_TILEPRO_16_PCREL,/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEPRO_16_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* An 8 bit pc-relative relocation.  */
+  HOWTO (R_TILEPRO_8_PCREL,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEPRO_8_PCREL",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 16 bit relocation without overflow.  */
+  HOWTO (R_TILEPRO_LO16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEPRO_LO16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The high order 16 bits of an address.  */
+  HOWTO (R_TILEPRO_HI16,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEPRO_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The high order 16 bits of an address, plus 1 if the contents of
+     the low 16 bits, treated as a signed number, is negative.  */
+  HOWTO (R_TILEPRO_HA16,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_TILEPRO_HA16",  /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_TILEPRO_COPY,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEPRO_COPY",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_TILEPRO_GLOB_DAT,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEPRO_GLOB_DAT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_TILEPRO_JMP_SLOT,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEPRO_JMP_SLOT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_TILEPRO_RELATIVE,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEPRO_RELATIVE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_TILEPRO_BROFF_X1, /* type */
+	 TILEPRO_LOG2_BUNDLE_ALIGNMENT_IN_BYTES, /* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 17,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_TILEPRO_BROFF_X1", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 -1,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_TILEPRO_JOFFLONG_X1, /* type */
+	 TILEPRO_LOG2_BUNDLE_ALIGNMENT_IN_BYTES, /* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 29,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_TILEPRO_JOFFLONG_X1", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 -1,			/* dst_mask */
+	 TRUE), 		/* pcrel_offset */
+
+  HOWTO (R_TILEPRO_JOFFLONG_X1_PLT, /* type */
+	 TILEPRO_LOG2_BUNDLE_ALIGNMENT_IN_BYTES, /* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 29,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_TILEPRO_JOFFLONG_X1_PLT", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 -1,			/* dst_mask */
+	 TRUE), 		/* pcrel_offset */
+
+#define TILEPRO_IMM_HOWTO(name, size, bitsize) \
+  HOWTO (name, 0, size, bitsize, FALSE, 0, \
+         complain_overflow_signed, bfd_elf_generic_reloc, \
+         #name, FALSE, 0, -1, FALSE)
+
+#define TILEPRO_UIMM_HOWTO(name, size, bitsize) \
+  HOWTO (name, 0, size, bitsize, FALSE, 0, \
+         complain_overflow_unsigned, bfd_elf_generic_reloc, \
+         #name, FALSE, 0, -1, FALSE)
+
+  TILEPRO_IMM_HOWTO(R_TILEPRO_IMM8_X0,  0,  8),
+  TILEPRO_IMM_HOWTO(R_TILEPRO_IMM8_Y0,  0,  8),
+  TILEPRO_IMM_HOWTO(R_TILEPRO_IMM8_X1,  0,  8),
+  TILEPRO_IMM_HOWTO(R_TILEPRO_IMM8_Y1,  0,  8),
+  TILEPRO_UIMM_HOWTO(R_TILEPRO_MT_IMM15_X1, 1,  15),
+  TILEPRO_UIMM_HOWTO(R_TILEPRO_MF_IMM15_X1, 1,  15),
+  TILEPRO_IMM_HOWTO(R_TILEPRO_IMM16_X0, 1, 16),
+  TILEPRO_IMM_HOWTO(R_TILEPRO_IMM16_X1, 1, 16),
+
+#define TILEPRO_IMM16_HOWTO(name, rshift) \
+  HOWTO (name, rshift, 1, 16, FALSE, 0, \
+         complain_overflow_dont, bfd_elf_generic_reloc, \
+         #name, FALSE, 0, 0xffff, FALSE)
+
+  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X0_LO,  0),
+  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X1_LO,  0),
+  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X0_HI, 16),
+  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X1_HI, 16),
+  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X0_HA, 16),
+  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X1_HA, 16),
+
+  /* PC-relative offsets. */
+
+  HOWTO (R_TILEPRO_IMM16_X0_PCREL,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEPRO_IMM16_X0_PCREL",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 -1,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_TILEPRO_IMM16_X1_PCREL,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEPRO_IMM16_X1_PCREL",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 -1,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+#define TILEPRO_IMM16_HOWTO_PCREL(name, rshift) \
+  HOWTO (name, rshift, 1, 16, TRUE, 0, \
+         complain_overflow_dont, bfd_elf_generic_reloc, \
+         #name, FALSE, 0, 0xffff, TRUE)
+
+  TILEPRO_IMM16_HOWTO_PCREL (R_TILEPRO_IMM16_X0_LO_PCREL,  0),
+  TILEPRO_IMM16_HOWTO_PCREL (R_TILEPRO_IMM16_X1_LO_PCREL,  0),
+  TILEPRO_IMM16_HOWTO_PCREL (R_TILEPRO_IMM16_X0_HI_PCREL, 16),
+  TILEPRO_IMM16_HOWTO_PCREL (R_TILEPRO_IMM16_X1_HI_PCREL, 16),
+  TILEPRO_IMM16_HOWTO_PCREL (R_TILEPRO_IMM16_X0_HA_PCREL, 16),
+  TILEPRO_IMM16_HOWTO_PCREL (R_TILEPRO_IMM16_X1_HA_PCREL, 16),
+
+  /* Byte offset into GOT for a particular symbol. */
+  TILEPRO_IMM_HOWTO(R_TILEPRO_IMM16_X0_GOT, 1, 16),
+  TILEPRO_IMM_HOWTO(R_TILEPRO_IMM16_X1_GOT, 1, 16),
+  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X0_GOT_LO,  0),
+  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X1_GOT_LO,  0),
+  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X0_GOT_HI, 16),
+  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X1_GOT_HI, 16),
+  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X0_GOT_HA, 16),
+  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X1_GOT_HA, 16),
+
+  TILEPRO_UIMM_HOWTO(R_TILEPRO_MMSTART_X0, 0, 5),
+  TILEPRO_UIMM_HOWTO(R_TILEPRO_MMEND_X0,   0, 5),
+  TILEPRO_UIMM_HOWTO(R_TILEPRO_MMSTART_X1, 0, 5),
+  TILEPRO_UIMM_HOWTO(R_TILEPRO_MMEND_X1,   0, 5),
+
+  TILEPRO_UIMM_HOWTO(R_TILEPRO_SHAMT_X0, 0, 5),
+  TILEPRO_UIMM_HOWTO(R_TILEPRO_SHAMT_X1, 0, 5),
+  TILEPRO_UIMM_HOWTO(R_TILEPRO_SHAMT_Y0, 0, 5),
+  TILEPRO_UIMM_HOWTO(R_TILEPRO_SHAMT_Y1, 0, 5),
+
+  TILEPRO_IMM_HOWTO(R_TILEPRO_DEST_IMM8_X1, 0, 8),
+
+  /* These relocs are currently not defined.  */
+  EMPTY_HOWTO (56),
+  EMPTY_HOWTO (57),
+  EMPTY_HOWTO (58),
+  EMPTY_HOWTO (59),
+  EMPTY_HOWTO (60),
+  EMPTY_HOWTO (61),
+  EMPTY_HOWTO (62),
+  EMPTY_HOWTO (63),
+  EMPTY_HOWTO (64),
+  EMPTY_HOWTO (65),
+
+  /* Offsets into the GOT of TLS Descriptors. */
+
+  HOWTO (R_TILEPRO_IMM16_X0_TLS_GD,/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEPRO_IMM16_X0_TLS_GD",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_TILEPRO_IMM16_X1_TLS_GD,/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEPRO_IMM16_X1_TLS_GD",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X0_TLS_GD_LO,  0),
+  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X1_TLS_GD_LO,  0),
+  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X0_TLS_GD_HI, 16),
+  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X1_TLS_GD_HI, 16),
+  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X0_TLS_GD_HA, 16),
+  TILEPRO_IMM16_HOWTO (R_TILEPRO_IMM16_X1_TLS_GD_HA, 16),
+
+  /* Offsets into the GOT of TLS Descriptors. */
+
+  HOWTO (R_TILEPRO_IMM16_X0_TLS_IE,/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEPRO_IMM16_X0_TLS_IE",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 -1,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_TILEPRO_IMM16_X1_TLS_IE,/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEPRO_IMM16_X1_TLS_IE",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 -1,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+#define TILEPRO_IMM16_HOWTO_TLS_IE(name, rshift) \
+  HOWTO (name, rshift, 1, 16, FALSE, 0, \
+         complain_overflow_dont, bfd_elf_generic_reloc, \
+         #name, FALSE, 0, 0xffff, TRUE)
+
+  TILEPRO_IMM16_HOWTO_TLS_IE (R_TILEPRO_IMM16_X0_TLS_IE_LO,  0),
+  TILEPRO_IMM16_HOWTO_TLS_IE (R_TILEPRO_IMM16_X1_TLS_IE_LO,  0),
+  TILEPRO_IMM16_HOWTO_TLS_IE (R_TILEPRO_IMM16_X0_TLS_IE_HI, 16),
+  TILEPRO_IMM16_HOWTO_TLS_IE (R_TILEPRO_IMM16_X1_TLS_IE_HI, 16),
+  TILEPRO_IMM16_HOWTO_TLS_IE (R_TILEPRO_IMM16_X0_TLS_IE_HA, 16),
+  TILEPRO_IMM16_HOWTO_TLS_IE (R_TILEPRO_IMM16_X1_TLS_IE_HA, 16),
+
+  /* These are common with the Solaris TLS implementation. */
+  HOWTO(R_TILEPRO_TLS_DTPMOD32, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+        bfd_elf_generic_reloc, "R_TILEPRO_TLS_DTPMOD32",
+        FALSE, 0, 0, TRUE),
+  HOWTO(R_TILEPRO_TLS_DTPOFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+        bfd_elf_generic_reloc, "R_TILEPRO_TLS_DTPOFF32",
+        FALSE, 0, 0xFFFFFFFF, TRUE),
+  HOWTO(R_TILEPRO_TLS_TPOFF32, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+        bfd_elf_generic_reloc, "R_TILEPRO_TLS_TPOFF32",
+        FALSE, 0, 0, TRUE)
+
+};
+
+static reloc_howto_type tilepro_elf_howto_table2 [] =
+{
+  /* GNU extension to record C++ vtable hierarchy */
+  HOWTO (R_TILEPRO_GNU_VTINHERIT, /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         NULL,                  /* special_function */
+         "R_TILEPRO_GNU_VTINHERIT", /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage */
+  HOWTO (R_TILEPRO_GNU_VTENTRY,     /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
+         "R_TILEPRO_GNU_VTENTRY",   /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+};
+
+/* Map BFD reloc types to TILEPRO ELF reloc types.  */
+
+typedef struct tilepro_reloc_map
+{
+  bfd_reloc_code_real_type  bfd_reloc_val;
+  unsigned int              tilepro_reloc_val;
+  reloc_howto_type *        table;
+} reloc_map;
+
+static const reloc_map tilepro_reloc_map [] =
+{
+#define TH_REMAP(bfd, tilepro) \
+  { bfd, tilepro, tilepro_elf_howto_table },
+
+  /* Standard relocations. */
+  TH_REMAP (BFD_RELOC_NONE,                    R_TILEPRO_NONE)
+  TH_REMAP (BFD_RELOC_32,                      R_TILEPRO_32)
+  TH_REMAP (BFD_RELOC_16,                      R_TILEPRO_16)
+  TH_REMAP (BFD_RELOC_8,                       R_TILEPRO_8)
+  TH_REMAP (BFD_RELOC_32_PCREL,                R_TILEPRO_32_PCREL)
+  TH_REMAP (BFD_RELOC_16_PCREL,                R_TILEPRO_16_PCREL)
+  TH_REMAP (BFD_RELOC_8_PCREL,                 R_TILEPRO_8_PCREL)
+  TH_REMAP (BFD_RELOC_LO16,                    R_TILEPRO_LO16)
+  TH_REMAP (BFD_RELOC_HI16,                    R_TILEPRO_HI16)
+  TH_REMAP (BFD_RELOC_HI16_S,                  R_TILEPRO_HA16)
+
+  /* Custom relocations. */
+  TH_REMAP (BFD_RELOC_TILEPRO_COPY,            R_TILEPRO_COPY)
+  TH_REMAP (BFD_RELOC_TILEPRO_GLOB_DAT,        R_TILEPRO_GLOB_DAT)
+  TH_REMAP (BFD_RELOC_TILEPRO_JMP_SLOT,        R_TILEPRO_JMP_SLOT)
+  TH_REMAP (BFD_RELOC_TILEPRO_RELATIVE,        R_TILEPRO_RELATIVE)
+  TH_REMAP (BFD_RELOC_TILEPRO_BROFF_X1,        R_TILEPRO_BROFF_X1)
+  TH_REMAP (BFD_RELOC_TILEPRO_JOFFLONG_X1,     R_TILEPRO_JOFFLONG_X1)
+  TH_REMAP (BFD_RELOC_TILEPRO_JOFFLONG_X1_PLT, R_TILEPRO_JOFFLONG_X1_PLT)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM8_X0,         R_TILEPRO_IMM8_X0)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM8_Y0,         R_TILEPRO_IMM8_Y0)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM8_X1,         R_TILEPRO_IMM8_X1)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM8_Y1,         R_TILEPRO_IMM8_Y1)
+  TH_REMAP (BFD_RELOC_TILEPRO_DEST_IMM8_X1,    R_TILEPRO_DEST_IMM8_X1)
+  TH_REMAP (BFD_RELOC_TILEPRO_MT_IMM15_X1,     R_TILEPRO_MT_IMM15_X1)
+  TH_REMAP (BFD_RELOC_TILEPRO_MF_IMM15_X1,     R_TILEPRO_MF_IMM15_X1)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0,        R_TILEPRO_IMM16_X0)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1,        R_TILEPRO_IMM16_X1)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_LO,     R_TILEPRO_IMM16_X0_LO)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_LO,     R_TILEPRO_IMM16_X1_LO)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_HI,     R_TILEPRO_IMM16_X0_HI)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_HI,     R_TILEPRO_IMM16_X1_HI)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_HA,     R_TILEPRO_IMM16_X0_HA)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_HA,     R_TILEPRO_IMM16_X1_HA)
+
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_PCREL,    R_TILEPRO_IMM16_X0_PCREL)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_PCREL,    R_TILEPRO_IMM16_X1_PCREL)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_LO_PCREL, R_TILEPRO_IMM16_X0_LO_PCREL)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_LO_PCREL, R_TILEPRO_IMM16_X1_LO_PCREL)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_HI_PCREL, R_TILEPRO_IMM16_X0_HI_PCREL)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_HI_PCREL, R_TILEPRO_IMM16_X1_HI_PCREL)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_HA_PCREL, R_TILEPRO_IMM16_X0_HA_PCREL)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_HA_PCREL, R_TILEPRO_IMM16_X1_HA_PCREL)
+
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_GOT, R_TILEPRO_IMM16_X0_GOT)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_GOT, R_TILEPRO_IMM16_X1_GOT)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_GOT_LO, R_TILEPRO_IMM16_X0_GOT_LO)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_GOT_LO, R_TILEPRO_IMM16_X1_GOT_LO)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_GOT_HI, R_TILEPRO_IMM16_X0_GOT_HI)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_GOT_HI, R_TILEPRO_IMM16_X1_GOT_HI)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_GOT_HA, R_TILEPRO_IMM16_X0_GOT_HA)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_GOT_HA, R_TILEPRO_IMM16_X1_GOT_HA)
+
+  TH_REMAP (BFD_RELOC_TILEPRO_MMSTART_X0,  R_TILEPRO_MMSTART_X0)
+  TH_REMAP (BFD_RELOC_TILEPRO_MMEND_X0,    R_TILEPRO_MMEND_X0)
+  TH_REMAP (BFD_RELOC_TILEPRO_MMSTART_X1,  R_TILEPRO_MMSTART_X1)
+  TH_REMAP (BFD_RELOC_TILEPRO_MMEND_X1,    R_TILEPRO_MMEND_X1)
+  TH_REMAP (BFD_RELOC_TILEPRO_SHAMT_X0,    R_TILEPRO_SHAMT_X0)
+  TH_REMAP (BFD_RELOC_TILEPRO_SHAMT_X1,    R_TILEPRO_SHAMT_X1)
+  TH_REMAP (BFD_RELOC_TILEPRO_SHAMT_Y0,    R_TILEPRO_SHAMT_Y0)
+  TH_REMAP (BFD_RELOC_TILEPRO_SHAMT_Y1,    R_TILEPRO_SHAMT_Y1)
+
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD,    R_TILEPRO_IMM16_X0_TLS_GD)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD,    R_TILEPRO_IMM16_X1_TLS_GD)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_LO, R_TILEPRO_IMM16_X0_TLS_GD_LO)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_LO, R_TILEPRO_IMM16_X1_TLS_GD_LO)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_HI, R_TILEPRO_IMM16_X0_TLS_GD_HI)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_HI, R_TILEPRO_IMM16_X1_TLS_GD_HI)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_HA, R_TILEPRO_IMM16_X0_TLS_GD_HA)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_HA, R_TILEPRO_IMM16_X1_TLS_GD_HA)
+
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE,    R_TILEPRO_IMM16_X0_TLS_IE)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE,    R_TILEPRO_IMM16_X1_TLS_IE)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE_LO, R_TILEPRO_IMM16_X0_TLS_IE_LO)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE_LO, R_TILEPRO_IMM16_X1_TLS_IE_LO)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE_HI, R_TILEPRO_IMM16_X0_TLS_IE_HI)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE_HI, R_TILEPRO_IMM16_X1_TLS_IE_HI)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE_HA, R_TILEPRO_IMM16_X0_TLS_IE_HA)
+  TH_REMAP (BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE_HA, R_TILEPRO_IMM16_X1_TLS_IE_HA)
+
+  TH_REMAP (BFD_RELOC_TILEPRO_TLS_DTPMOD32, R_TILEPRO_TLS_DTPMOD32)
+  TH_REMAP (BFD_RELOC_TILEPRO_TLS_DTPOFF32, R_TILEPRO_TLS_DTPOFF32)
+  TH_REMAP (BFD_RELOC_TILEPRO_TLS_TPOFF32,  R_TILEPRO_TLS_TPOFF32)
+
+#undef TH_REMAP
+
+  { BFD_RELOC_VTABLE_INHERIT, R_TILEPRO_GNU_VTINHERIT, tilepro_elf_howto_table2 },
+  { BFD_RELOC_VTABLE_ENTRY,   R_TILEPRO_GNU_VTENTRY,   tilepro_elf_howto_table2 },
+};
+
+
+
+/* The TILEPro linker needs to keep track of the number of relocs that it
+   decides to copy as dynamic relocs in check_relocs for each symbol.
+   This is so that it can later discard them if they are found to be
+   unnecessary.  We store the information in a field extending the
+   regular ELF linker hash table.  */
+
+struct tilepro_elf_dyn_relocs
+{
+  struct tilepro_elf_dyn_relocs *next;
+
+  /* The input section of the reloc.  */
+  asection *sec;
+
+  /* Total number of relocs copied for the input section.  */
+  bfd_size_type count;
+
+  /* Number of pc-relative relocs copied for the input section.  */
+  bfd_size_type pc_count;
+};
+
+/* TILEPRO ELF linker hash entry.  */
+
+struct tilepro_elf_link_hash_entry
+{
+  struct elf_link_hash_entry elf;
+
+  /* Track dynamic relocs copied for this symbol.  */
+  struct tilepro_elf_dyn_relocs *dyn_relocs;
+
+#define GOT_UNKNOWN     0
+#define GOT_NORMAL      1
+#define GOT_TLS_GD      2
+#define GOT_TLS_IE      4
+  unsigned char tls_type;
+};
+
+#define tilepro_elf_hash_entry(ent) \
+  ((struct tilepro_elf_link_hash_entry *)(ent))
+
+struct _bfd_tilepro_elf_obj_tdata
+{
+  struct elf_obj_tdata root;
+
+  /* tls_type for each local got entry.  */
+  char *local_got_tls_type;
+};
+
+#define _bfd_tilepro_elf_tdata(abfd) \
+  ((struct _bfd_tilepro_elf_obj_tdata *) (abfd)->tdata.any)
+
+#define _bfd_tilepro_elf_local_got_tls_type(abfd) \
+  (_bfd_tilepro_elf_tdata (abfd)->local_got_tls_type)
+
+#define is_tilepro_elf(bfd)				\
+  (bfd_get_flavour (bfd) == bfd_target_elf_flavour	\
+   && elf_tdata (bfd) != NULL				\
+   && elf_object_id (bfd) == TILEPRO_ELF_DATA)
+
+#include "elf/common.h"
+#include "elf/internal.h"
+
+struct tilepro_elf_link_hash_table
+{
+  struct elf_link_hash_table elf;
+
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *sdynbss;
+  asection *srelbss;
+
+  /* Small local sym to section mapping cache.  */
+  struct sym_cache sym_cache;
+};
+
+/* Get the Tilepro ELF linker hash table from a link_info structure.  */
+#define tilepro_elf_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == TILEPRO_ELF_DATA \
+  ? ((struct tilepro_elf_link_hash_table *) ((p)->hash)) : NULL)
+
+static reloc_howto_type *
+tilepro_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
+                           bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = ARRAY_SIZE (tilepro_reloc_map); --i;)
+    {
+      const reloc_map * entry;
+
+      entry = tilepro_reloc_map + i;
+
+      if (entry->bfd_reloc_val == code)
+	return entry->table + (entry->tilepro_reloc_val
+			       - entry->table[0].type);
+    }
+
+  return NULL;
+}
+
+static reloc_howto_type *
+tilepro_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			   const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (tilepro_elf_howto_table)
+            / sizeof (tilepro_elf_howto_table[0]));
+       i++)
+    if (tilepro_elf_howto_table[i].name != NULL
+        && strcasecmp (tilepro_elf_howto_table[i].name, r_name) == 0)
+      return &tilepro_elf_howto_table[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for an TILEPro ELF reloc.  */
+
+static void
+tilepro_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED,
+                            arelent * cache_ptr,
+                            Elf_Internal_Rela * dst)
+{
+  unsigned int r_type = ELF32_R_TYPE (dst->r_info);
+
+  if (r_type <= (unsigned int) R_TILEPRO_TLS_TPOFF32)
+    cache_ptr->howto = &tilepro_elf_howto_table [r_type];
+  else if (r_type - R_TILEPRO_GNU_VTINHERIT
+	   <= (unsigned int) R_TILEPRO_GNU_VTENTRY)
+    cache_ptr->howto
+      = &tilepro_elf_howto_table2 [r_type - R_TILEPRO_GNU_VTINHERIT];
+  else
+    abort ();
+}
+
+typedef tilepro_bundle_bits (*tilepro_create_func)(int);
+
+static const tilepro_create_func reloc_to_create_func[] =
+{
+  /* The first fourteen relocation types don't correspond to operands */
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+
+  /* The remaining relocations are used for immediate operands */
+  create_BrOff_X1,
+  create_JOffLong_X1,
+  create_JOffLong_X1,
+  create_Imm8_X0,
+  create_Imm8_Y0,
+  create_Imm8_X1,
+  create_Imm8_Y1,
+  create_MT_Imm15_X1,
+  create_MF_Imm15_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_MMStart_X0,
+  create_MMEnd_X0,
+  create_MMStart_X1,
+  create_MMEnd_X1,
+  create_ShAmt_X0,
+  create_ShAmt_X1,
+  create_ShAmt_Y0,
+  create_ShAmt_Y1,
+
+  create_Dest_Imm8_X1,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1
+};
+
+#define NELEMS(a)	((int) (sizeof (a) / sizeof ((a)[0])))
+
+/* Support for core dump NOTE sections.  */
+
+static bfd_boolean
+tilepro_elf_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  int offset;
+  size_t size;
+
+  if (note->descsz != TILEPRO_PRSTATUS_SIZEOF)
+    return FALSE;
+
+  /* pr_cursig */
+  elf_tdata (abfd)->core_signal =
+    bfd_get_16 (abfd, note->descdata + TILEPRO_PRSTATUS_OFFSET_PR_CURSIG);
+
+  /* pr_pid */
+  elf_tdata (abfd)->core_pid =
+    bfd_get_32 (abfd, note->descdata + TILEPRO_PRSTATUS_OFFSET_PR_PID);
+
+  /* pr_reg */
+  offset = TILEPRO_PRSTATUS_OFFSET_PR_REG;
+  size   = TILEPRO_GREGSET_T_SIZE;
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg",
+					  size, note->descpos + offset);
+}
+
+static bfd_boolean
+tilepro_elf_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  if (note->descsz != TILEPRO_PRPSINFO_SIZEOF)
+    return FALSE;
+
+  elf_tdata (abfd)->core_program
+    = _bfd_elfcore_strndup (abfd,
+			    note->descdata + TILEPRO_PRPSINFO_OFFSET_PR_FNAME,
+			    16);
+  elf_tdata (abfd)->core_command
+    = _bfd_elfcore_strndup (abfd,
+			    note->descdata + TILEPRO_PRPSINFO_OFFSET_PR_PSARGS,
+			    ELF_PR_PSARGS_SIZE);
+
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+  {
+    char *command = elf_tdata (abfd)->core_command;
+    int n = strlen (command);
+
+    if (0 < n && command[n - 1] == ' ')
+      command[n - 1] = '\0';
+  }
+
+  return TRUE;
+}
+
+
+static void
+tilepro_elf_append_rela_32 (bfd *abfd, asection *s, Elf_Internal_Rela *rel)
+{
+  Elf32_External_Rela *loc32;
+
+  loc32 = (Elf32_External_Rela *) s->contents;
+  loc32 += s->reloc_count++;
+  bfd_elf32_swap_reloca_out (abfd, rel, (bfd_byte *) loc32);
+}
+
+/* PLT/GOT stuff */
+
+/* The procedure linkage table starts with the following header:
+
+   {
+    rli     r29, r29, 16
+    lwadd   r28, r27, 4
+   }
+    lw      r27, r27
+   {
+    info    10            ## SP not offset, return PC in LR
+    jr      r27
+   }
+
+   Subsequent entries are the following, jumping to the header at the end:
+
+   lnk     r28
+1:
+   {
+    auli    r28, r28, <_GLOBAL_OFFSET_TABLE_ - 1b + MY_GOT_OFFSET>
+    auli    r27, r28, <_GLOBAL_OFFSET_TABLE_ - 1b>
+   }
+   {
+    addli   r28, r28, <_GLOBAL_OFFSET_TABLE_ - 1b + MY_GOT_OFFSET>
+    addli   r27, r27, <_GLOBAL_OFFSET_TABLE_ - 1b>
+   }
+   {
+    auli    r29, zero, MY_PLT_INDEX
+    lw      r28, r28
+   }
+   {
+    info    10            ## SP not offset, return PC in LR
+    jr      r28
+   }
+
+   We initially store MY_PLT_INDEX in the high bits so that we can use the all
+   16 bits as an unsigned offset; if we use the low bits we would get an
+   unwanted sign extension.  The PLT header then rotates the index to get the
+   right value, before calling the resolution routine.  This computation can
+   fit in unused bundle slots so it's free.
+
+   This code sequence lets the code at at the start of the PLT determine
+   which PLT entry was executed by examining 'r29'.
+
+   Note that MY_PLT_INDEX skips over the header entries, so the first
+   actual jump table entry has index zero.
+*/
+
+#define PLT_HEADER_SIZE_IN_BUNDLES 3
+#define PLT_ENTRY_SIZE_IN_BUNDLES  5
+
+#define PLT_HEADER_SIZE \
+  (PLT_HEADER_SIZE_IN_BUNDLES * TILEPRO_BUNDLE_SIZE_IN_BYTES)
+#define PLT_ENTRY_SIZE \
+  (PLT_ENTRY_SIZE_IN_BUNDLES * TILEPRO_BUNDLE_SIZE_IN_BYTES)
+
+/* The size in bytes of an entry in the global offset table.  */
+
+#define GOT_ENTRY_SIZE TILEPRO_BYTES_PER_WORD
+
+#define GOTPLT_HEADER_SIZE (2 * GOT_ENTRY_SIZE)
+
+
+static const bfd_byte
+tilepro_plt0_entry[PLT_HEADER_SIZE] =
+{
+  0x5d, 0x07, 0x03, 0x70,
+  0x6e, 0x23, 0xd0, 0x30, /* { rli r29, r29, 16 ; lwadd r28, r27, 4 } */
+  0x00, 0x50, 0xba, 0x6d,
+  0x00, 0x08, 0x6d, 0xdc, /* { lw r27, r27 } */
+  0xff, 0xaf, 0x10, 0x50,
+  0x60, 0x03, 0x18, 0x08, /* { info 10 ; jr r27 } */
+};
+
+static const bfd_byte
+tilepro_short_plt_entry[PLT_ENTRY_SIZE] =
+{
+  0x00, 0x50, 0x16, 0x70,
+  0x0e, 0x00, 0x1a, 0x08, /* { lnk r28 } */
+  0x1c, 0x07, 0x00, 0xa0,
+  0x8d, 0x03, 0x00, 0x18, /* { addli r28, r28, 0 ; addli r27, r28, 0 } */
+  0xdd, 0x0f, 0x00, 0x30,
+  0x8e, 0x73, 0x0b, 0x40, /* { auli r29, zero, 0 ; lw r28, r28 } */
+  0xff, 0xaf, 0x10, 0x50,
+  0x80, 0x03, 0x18, 0x08, /* { info 10 ; jr r28 } */
+  0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00,
+};
+
+static const bfd_byte
+tilepro_long_plt_entry[PLT_ENTRY_SIZE] =
+{
+  0x00, 0x50, 0x16, 0x70,
+  0x0e, 0x00, 0x1a, 0x08, /* { lnk r28 } */
+  0x1c, 0x07, 0x00, 0xb0,
+  0x8d, 0x03, 0x00, 0x20, /* { auli r28, r28, 0 ; auli r27, r28, 0 } */
+  0x1c, 0x07, 0x00, 0xa0,
+  0x6d, 0x03, 0x00, 0x18, /* { addli r28, r28, 0 ; addli r27, r27, 0 } */
+  0xdd, 0x0f, 0x00, 0x30,
+  0x8e, 0x73, 0x0b, 0x40, /* { auli r29, zero, 0 ; lw r28, r28 } */
+  0xff, 0xaf, 0x10, 0x50,
+  0x80, 0x03, 0x18, 0x08, /* { info 10 ; jr r28 } */
+};
+
+static bfd_vma
+tilepro_ha16(bfd_vma vma)
+{
+  return ((vma >> 16) + ((vma >> 15) & 1)) & 0xffff;
+}
+
+static int
+tilepro_plt_entry_build (asection *splt, asection *sgotplt, bfd_vma offset,
+		      bfd_vma *r_offset)
+{
+  int plt_index = (offset - PLT_HEADER_SIZE) / PLT_ENTRY_SIZE;
+  int got_offset = plt_index * GOT_ENTRY_SIZE + GOTPLT_HEADER_SIZE;
+  tilepro_bundle_bits *pc;
+
+  /* Compute the distance from the got entry to the lnk.  */
+  bfd_signed_vma dist_got_entry = sgotplt->output_section->vma
+    + sgotplt->output_offset
+    + got_offset
+    - splt->output_section->vma
+    - splt->output_offset
+    - offset
+    - TILEPRO_BUNDLE_SIZE_IN_BYTES;
+
+  /* Compute the distance to GOTPLT[0].  */
+  bfd_signed_vma dist_got0 = dist_got_entry - got_offset;
+
+  /* Check whether we can use the short plt entry with 16-bit offset.  */
+  bfd_boolean short_plt_entry =
+    (dist_got_entry <= 0x7fff && dist_got0 >= -0x8000);
+
+  /* Copy the plt entry template.  */
+  memcpy (splt->contents + offset,
+	  short_plt_entry ? tilepro_short_plt_entry : tilepro_long_plt_entry,
+	  PLT_ENTRY_SIZE);
+
+  /* Write the immediate offsets.  */
+  pc = (tilepro_bundle_bits *)(splt->contents + offset);
+  pc++;
+
+  if (!short_plt_entry)
+    {
+      /* { auli r28, r28, &GOTPLT[MY_GOT_INDEX] ; auli r27, r28, &GOTPLT[0] } */
+      *pc++ |= create_Imm16_X0 (tilepro_ha16 (dist_got_entry))
+	| create_Imm16_X1 (tilepro_ha16 (dist_got0));
+    }
+
+  /* { addli r28, r28, &GOTPLT[MY_GOT_INDEX] ; addli r27, r28, &GOTPLT[0] } or
+     { addli r28, r28, &GOTPLT[MY_GOT_INDEX] ; addli r27, r27, &GOTPLT[0] } */
+  *pc++ |= create_Imm16_X0 (dist_got_entry)
+    | create_Imm16_X1 (dist_got0);
+
+  /* { auli r29, zero, MY_PLT_INDEX ; lw r28, r28 } */
+  *pc |= create_Imm16_X0 (plt_index);
+
+  /* Set the relocation offset.  */
+  *r_offset = got_offset;
+
+  return plt_index;
+}
+
+#define TILEPRO_ELF_RELA_BYTES (sizeof(Elf32_External_Rela))
+
+
+/* Create an entry in an TILEPro ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+link_hash_newfunc (struct bfd_hash_entry *entry,
+		   struct bfd_hash_table *table, const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry =
+        bfd_hash_allocate (table,
+                           sizeof (struct tilepro_elf_link_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = _bfd_elf_link_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct tilepro_elf_link_hash_entry *eh;
+
+      eh = (struct tilepro_elf_link_hash_entry *) entry;
+      eh->dyn_relocs = NULL;
+      eh->tls_type = GOT_UNKNOWN;
+    }
+
+  return entry;
+}
+
+/* Create a TILEPRO ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+tilepro_elf_link_hash_table_create (bfd *abfd)
+{
+  struct tilepro_elf_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct tilepro_elf_link_hash_table);
+
+  ret = (struct tilepro_elf_link_hash_table *) bfd_zmalloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd, link_hash_newfunc,
+				      sizeof (struct tilepro_elf_link_hash_entry),
+				      TILEPRO_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  return &ret->elf.root;
+}
+
+/* Create the .got section.  */
+
+static bfd_boolean
+tilepro_elf_create_got_section (bfd *abfd, struct bfd_link_info *info)
+{
+  flagword flags;
+  asection *s, *s_got;
+  struct elf_link_hash_entry *h;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  struct elf_link_hash_table *htab = elf_hash_table (info);
+
+  /* This function may be called more than once.  */
+  s = bfd_get_section_by_name (abfd, ".got");
+  if (s != NULL && (s->flags & SEC_LINKER_CREATED) != 0)
+    return TRUE;
+
+  flags = bed->dynamic_sec_flags;
+
+  s = bfd_make_section_with_flags (abfd,
+				   (bed->rela_plts_and_copies_p
+				    ? ".rela.got" : ".rel.got"),
+				   (bed->dynamic_sec_flags
+				    | SEC_READONLY));
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+    return FALSE;
+  htab->srelgot = s;
+
+  s = s_got = bfd_make_section_with_flags (abfd, ".got", flags);
+  if (s == NULL
+      || !bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+    return FALSE;
+  htab->sgot = s;
+
+  /* The first bit of the global offset table is the header.  */
+  s->size += bed->got_header_size;
+
+  if (bed->want_got_plt)
+    {
+      s = bfd_make_section_with_flags (abfd, ".got.plt", flags);
+      if (s == NULL
+	  || !bfd_set_section_alignment (abfd, s,
+					 bed->s->log_file_align))
+	return FALSE;
+      htab->sgotplt = s;
+
+      /* Reserve room for the header.  */
+      s->size += GOTPLT_HEADER_SIZE;
+    }
+
+  if (bed->want_got_sym)
+    {
+      /* Define the symbol _GLOBAL_OFFSET_TABLE_ at the start of the .got
+	 section.  We don't do this in the linker script because we don't want
+	 to define the symbol if we are not creating a global offset
+	 table.  */
+      h = _bfd_elf_define_linkage_sym (abfd, info, s_got,
+				       "_GLOBAL_OFFSET_TABLE_");
+      elf_hash_table (info)->hgot = h;
+      if (h == NULL)
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Create .plt, .rela.plt, .got, .got.plt, .rela.got, .dynbss, and
+   .rela.bss sections in DYNOBJ, and set up shortcuts to them in our
+   hash table.  */
+
+static bfd_boolean
+tilepro_elf_create_dynamic_sections (bfd *dynobj,
+				     struct bfd_link_info *info)
+{
+  struct tilepro_elf_link_hash_table *htab;
+
+  htab = tilepro_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  if (!tilepro_elf_create_got_section (dynobj, info))
+    return FALSE;
+
+  if (!_bfd_elf_create_dynamic_sections (dynobj, info))
+    return FALSE;
+
+  htab->sdynbss = bfd_get_section_by_name (dynobj, ".dynbss");
+  if (!info->shared)
+    htab->srelbss = bfd_get_section_by_name (dynobj, ".rela.bss");
+
+  if (!htab->elf.splt || !htab->elf.srelplt || !htab->sdynbss
+      || (!info->shared && !htab->srelbss))
+    abort ();
+
+  return TRUE;
+}
+
+/* Copy the extra info we tack onto an elf_link_hash_entry.  */
+
+static void
+tilepro_elf_copy_indirect_symbol (struct bfd_link_info *info,
+				  struct elf_link_hash_entry *dir,
+				  struct elf_link_hash_entry *ind)
+{
+  struct tilepro_elf_link_hash_entry *edir, *eind;
+
+  edir = (struct tilepro_elf_link_hash_entry *) dir;
+  eind = (struct tilepro_elf_link_hash_entry *) ind;
+
+  if (eind->dyn_relocs != NULL)
+    {
+      if (edir->dyn_relocs != NULL)
+	{
+	  struct tilepro_elf_dyn_relocs **pp;
+	  struct tilepro_elf_dyn_relocs *p;
+
+	  /* Add reloc counts against the indirect sym to the direct sym
+	     list.  Merge any entries against the same section.  */
+	  for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      struct tilepro_elf_dyn_relocs *q;
+
+	      for (q = edir->dyn_relocs; q != NULL; q = q->next)
+		if (q->sec == p->sec)
+		  {
+		    q->pc_count += p->pc_count;
+		    q->count += p->count;
+		    *pp = p->next;
+		    break;
+		  }
+	      if (q == NULL)
+		pp = &p->next;
+	    }
+	  *pp = edir->dyn_relocs;
+	}
+
+      edir->dyn_relocs = eind->dyn_relocs;
+      eind->dyn_relocs = NULL;
+    }
+
+  if (ind->root.type == bfd_link_hash_indirect
+      && dir->got.refcount <= 0)
+    {
+      edir->tls_type = eind->tls_type;
+      eind->tls_type = GOT_UNKNOWN;
+    }
+  _bfd_elf_link_hash_copy_indirect (info, dir, ind);
+}
+
+/* Look through the relocs for a section during the first phase, and
+   allocate space in the global offset table or procedure linkage
+   table.  */
+
+static bfd_boolean
+tilepro_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
+			  asection *sec, const Elf_Internal_Rela *relocs)
+{
+  struct tilepro_elf_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  asection *sreloc;
+  int num_relocs;
+
+  if (info->relocatable)
+    return TRUE;
+
+  htab = tilepro_elf_hash_table (info);
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  sreloc = NULL;
+
+  num_relocs = sec->reloc_count;
+
+  BFD_ASSERT (is_tilepro_elf (abfd) || num_relocs == 0);
+
+  if (htab->elf.dynobj == NULL)
+    htab->elf.dynobj = abfd;
+
+  rel_end = relocs + num_relocs;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      unsigned int r_type;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+      int tls_type;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
+	{
+	  (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
+				 abfd, r_symndx);
+	  return FALSE;
+	}
+
+      if (r_symndx < symtab_hdr->sh_info)
+	h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      switch (r_type)
+	{
+        case R_TILEPRO_IMM16_X0_TLS_GD:
+        case R_TILEPRO_IMM16_X1_TLS_GD:
+        case R_TILEPRO_IMM16_X0_TLS_GD_LO:
+        case R_TILEPRO_IMM16_X1_TLS_GD_LO:
+        case R_TILEPRO_IMM16_X0_TLS_GD_HI:
+        case R_TILEPRO_IMM16_X1_TLS_GD_HI:
+        case R_TILEPRO_IMM16_X0_TLS_GD_HA:
+        case R_TILEPRO_IMM16_X1_TLS_GD_HA:
+          tls_type = GOT_TLS_GD;
+          goto have_got_reference;
+
+        case R_TILEPRO_IMM16_X0_TLS_IE:
+        case R_TILEPRO_IMM16_X1_TLS_IE:
+        case R_TILEPRO_IMM16_X0_TLS_IE_LO:
+        case R_TILEPRO_IMM16_X1_TLS_IE_LO:
+        case R_TILEPRO_IMM16_X0_TLS_IE_HI:
+        case R_TILEPRO_IMM16_X1_TLS_IE_HI:
+        case R_TILEPRO_IMM16_X0_TLS_IE_HA:
+        case R_TILEPRO_IMM16_X1_TLS_IE_HA:
+          tls_type = GOT_TLS_IE;
+          if (info->shared)
+            info->flags |= DF_STATIC_TLS;
+          goto have_got_reference;
+
+        case R_TILEPRO_IMM16_X0_GOT:
+        case R_TILEPRO_IMM16_X1_GOT:
+        case R_TILEPRO_IMM16_X0_GOT_LO:
+        case R_TILEPRO_IMM16_X1_GOT_LO:
+        case R_TILEPRO_IMM16_X0_GOT_HI:
+        case R_TILEPRO_IMM16_X1_GOT_HI:
+        case R_TILEPRO_IMM16_X0_GOT_HA:
+        case R_TILEPRO_IMM16_X1_GOT_HA:
+           tls_type = GOT_NORMAL;
+           /* Fall Through */
+
+        have_got_reference:
+	  /* This symbol requires a global offset table entry.  */
+	  {
+            int old_tls_type;
+
+	    if (h != NULL)
+	      {
+		h->got.refcount += 1;
+		old_tls_type = tilepro_elf_hash_entry(h)->tls_type;
+	      }
+	    else
+	      {
+		bfd_signed_vma *local_got_refcounts;
+
+		/* This is a global offset table entry for a local symbol.  */
+		local_got_refcounts = elf_local_got_refcounts (abfd);
+		if (local_got_refcounts == NULL)
+		  {
+		    bfd_size_type size;
+
+		    size = symtab_hdr->sh_info;
+		    size *= (sizeof (bfd_signed_vma) + sizeof(char));
+		    local_got_refcounts = ((bfd_signed_vma *)
+					   bfd_zalloc (abfd, size));
+		    if (local_got_refcounts == NULL)
+		      return FALSE;
+		    elf_local_got_refcounts (abfd) = local_got_refcounts;
+		    _bfd_tilepro_elf_local_got_tls_type (abfd)
+		      = (char *) (local_got_refcounts + symtab_hdr->sh_info);
+		  }
+		local_got_refcounts[r_symndx] += 1;
+		old_tls_type =
+		  _bfd_tilepro_elf_local_got_tls_type (abfd) [r_symndx];
+	      }
+
+	    /* If a TLS symbol is accessed using IE at least once,
+	       there is no point to use dynamic model for it.  */
+	    if (old_tls_type != tls_type && old_tls_type != GOT_UNKNOWN
+		&& (old_tls_type != GOT_TLS_GD
+		    || tls_type != GOT_TLS_IE))
+	      {
+		if (old_tls_type == GOT_TLS_IE && tls_type == GOT_TLS_GD)
+		  tls_type = old_tls_type;
+		else
+		  {
+		    (*_bfd_error_handler)
+		      (_("%B: `%s' accessed both as normal and thread local symbol"),
+		       abfd, h ? h->root.root.string : "<local>");
+		    return FALSE;
+		  }
+	      }
+
+	    if (old_tls_type != tls_type)
+	      {
+		if (h != NULL)
+		  tilepro_elf_hash_entry (h)->tls_type = tls_type;
+		else
+		  _bfd_tilepro_elf_local_got_tls_type (abfd) [r_symndx] =
+		    tls_type;
+	      }
+	  }
+
+	  if (htab->elf.sgot == NULL)
+	    {
+	      if (!tilepro_elf_create_got_section (htab->elf.dynobj, info))
+		return FALSE;
+	    }
+	  break;
+
+        case R_TILEPRO_JOFFLONG_X1_PLT:
+	  /* This symbol requires a procedure linkage table entry.  We
+	     actually build the entry in adjust_dynamic_symbol,
+	     because this might be a case of linking PIC code without
+	     linking in any dynamic objects, in which case we don't
+	     need to generate a procedure linkage table after all.  */
+
+	  if (h != NULL)
+            {
+              h->needs_plt = 1;
+              h->plt.refcount += 1;
+            }
+	  break;
+
+        case R_TILEPRO_32_PCREL:
+        case R_TILEPRO_16_PCREL:
+        case R_TILEPRO_8_PCREL:
+        case R_TILEPRO_IMM16_X0_PCREL:
+        case R_TILEPRO_IMM16_X1_PCREL:
+        case R_TILEPRO_IMM16_X0_LO_PCREL:
+        case R_TILEPRO_IMM16_X1_LO_PCREL:
+        case R_TILEPRO_IMM16_X0_HI_PCREL:
+        case R_TILEPRO_IMM16_X1_HI_PCREL:
+        case R_TILEPRO_IMM16_X0_HA_PCREL:
+        case R_TILEPRO_IMM16_X1_HA_PCREL:
+	  if (h != NULL)
+	    h->non_got_ref = 1;
+
+	  if (h != NULL
+	      && strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
+	    break;
+	  /* Fall through.  */
+
+        case R_TILEPRO_32:
+        case R_TILEPRO_16:
+        case R_TILEPRO_8:
+        case R_TILEPRO_LO16:
+        case R_TILEPRO_HI16:
+        case R_TILEPRO_HA16:
+        case R_TILEPRO_COPY:
+        case R_TILEPRO_GLOB_DAT:
+        case R_TILEPRO_JMP_SLOT:
+        case R_TILEPRO_RELATIVE:
+        case R_TILEPRO_BROFF_X1:
+        case R_TILEPRO_JOFFLONG_X1:
+        case R_TILEPRO_IMM8_X0:
+        case R_TILEPRO_IMM8_Y0:
+        case R_TILEPRO_IMM8_X1:
+        case R_TILEPRO_IMM8_Y1:
+        case R_TILEPRO_DEST_IMM8_X1:
+        case R_TILEPRO_MT_IMM15_X1:
+        case R_TILEPRO_MF_IMM15_X1:
+        case R_TILEPRO_IMM16_X0:
+        case R_TILEPRO_IMM16_X1:
+        case R_TILEPRO_IMM16_X0_LO:
+        case R_TILEPRO_IMM16_X1_LO:
+        case R_TILEPRO_IMM16_X0_HI:
+        case R_TILEPRO_IMM16_X1_HI:
+        case R_TILEPRO_IMM16_X0_HA:
+        case R_TILEPRO_IMM16_X1_HA:
+        case R_TILEPRO_MMSTART_X0:
+        case R_TILEPRO_MMEND_X0:
+        case R_TILEPRO_MMSTART_X1:
+        case R_TILEPRO_MMEND_X1:
+        case R_TILEPRO_SHAMT_X0:
+        case R_TILEPRO_SHAMT_X1:
+        case R_TILEPRO_SHAMT_Y0:
+        case R_TILEPRO_SHAMT_Y1:
+	  if (h != NULL)
+            {
+              h->non_got_ref = 1;
+
+              if (!info->shared)
+                {
+                  /* We may need a .plt entry if the function this reloc
+                     refers to is in a shared lib.  */
+                  h->plt.refcount += 1;
+                }
+            }
+
+	  /* If we are creating a shared library, and this is a reloc
+	     against a global symbol, or a non PC relative reloc
+	     against a local symbol, then we need to copy the reloc
+	     into the shared library.  However, if we are linking with
+	     -Bsymbolic, we do not need to copy a reloc against a
+	     global symbol which is defined in an object we are
+	     including in the link (i.e., DEF_REGULAR is set).  At
+	     this point we have not seen all the input files, so it is
+	     possible that DEF_REGULAR is not set now but will be set
+	     later (it is never cleared).  In case of a weak definition,
+	     DEF_REGULAR may be cleared later by a strong definition in
+	     a shared library.  We account for that possibility below by
+	     storing information in the relocs_copied field of the hash
+	     table entry.  A similar situation occurs when creating
+	     shared libraries and symbol visibility changes render the
+	     symbol local.
+
+	     If on the other hand, we are creating an executable, we
+	     may need to keep relocations for symbols satisfied by a
+	     dynamic library if we manage to avoid copy relocs for the
+	     symbol.  */
+	  if ((info->shared
+	       && (sec->flags & SEC_ALLOC) != 0
+	       && (! tilepro_elf_howto_table[r_type].pc_relative
+		   || (h != NULL
+		       && (! info->symbolic
+			   || h->root.type == bfd_link_hash_defweak
+			   || !h->def_regular))))
+	      || (!info->shared
+		  && (sec->flags & SEC_ALLOC) != 0
+		  && h != NULL
+		  && (h->root.type == bfd_link_hash_defweak
+		      || !h->def_regular)))
+	    {
+	      struct tilepro_elf_dyn_relocs *p;
+	      struct tilepro_elf_dyn_relocs **head;
+
+	      /* When creating a shared object, we must copy these
+		 relocs into the output file.  We create a reloc
+		 section in dynobj and make room for the reloc.  */
+	      if (sreloc == NULL)
+		{
+		  sreloc = _bfd_elf_make_dynamic_reloc_section
+		    (sec, htab->elf.dynobj, 2, abfd, /*rela?*/ TRUE);
+
+		  if (sreloc == NULL)
+		    return FALSE;
+		}
+
+	      /* If this is a global symbol, we count the number of
+		 relocations we need for this symbol.  */
+	      if (h != NULL)
+		head =
+                  &((struct tilepro_elf_link_hash_entry *) h)->dyn_relocs;
+	      else
+		{
+		  /* Track dynamic relocs needed for local syms too.
+		     We really need local syms available to do this
+		     easily.  Oh well.  */
+
+		  asection *s;
+		  void *vpp;
+		  Elf_Internal_Sym *isym;
+
+		  isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+						abfd, r_symndx);
+		  if (isym == NULL)
+		    return FALSE;
+
+		  s = bfd_section_from_elf_index (abfd, isym->st_shndx);
+		  if (s == NULL)
+		    s = sec;
+
+		  vpp = &elf_section_data (s)->local_dynrel;
+		  head = (struct tilepro_elf_dyn_relocs **) vpp;
+		}
+
+	      p = *head;
+	      if (p == NULL || p->sec != sec)
+		{
+		  bfd_size_type amt = sizeof *p;
+		  p = ((struct tilepro_elf_dyn_relocs *)
+		       bfd_alloc (htab->elf.dynobj, amt));
+		  if (p == NULL)
+		    return FALSE;
+		  p->next = *head;
+		  *head = p;
+		  p->sec = sec;
+		  p->count = 0;
+		  p->pc_count = 0;
+		}
+
+	      p->count += 1;
+	      if (tilepro_elf_howto_table[r_type].pc_relative)
+		p->pc_count += 1;
+	    }
+
+	  break;
+
+	case R_TILEPRO_GNU_VTINHERIT:
+	  if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+	    return FALSE;
+	  break;
+
+	case R_TILEPRO_GNU_VTENTRY:
+	  if (!bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+	    return FALSE;
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+
+static asection *
+tilepro_elf_gc_mark_hook (asection *sec,
+                          struct bfd_link_info *info,
+                          Elf_Internal_Rela *rel,
+                          struct elf_link_hash_entry *h,
+                          Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    {
+      switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_TILEPRO_GNU_VTINHERIT:
+      case R_TILEPRO_GNU_VTENTRY:
+	break;
+      }
+    }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Update the got entry reference counts for the section being removed.  */
+static bfd_boolean
+tilepro_elf_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info,
+			   asection *sec, const Elf_Internal_Rela *relocs)
+{
+  struct tilepro_elf_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  const Elf_Internal_Rela *rel, *relend;
+
+  if (info->relocatable)
+    return TRUE;
+
+  BFD_ASSERT (is_tilepro_elf (abfd) || sec->reloc_count == 0);
+
+  elf_section_data (sec)->local_dynrel = NULL;
+
+  htab = tilepro_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      unsigned int r_type;
+      struct elf_link_hash_entry *h = NULL;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  struct tilepro_elf_link_hash_entry *eh;
+	  struct tilepro_elf_dyn_relocs **pp;
+	  struct tilepro_elf_dyn_relocs *p;
+
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	  eh = (struct tilepro_elf_link_hash_entry *) h;
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
+	    if (p->sec == sec)
+	      {
+		/* Everything must go for SEC.  */
+		*pp = p->next;
+		break;
+	      }
+	}
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      switch (r_type)
+	{
+        case R_TILEPRO_IMM16_X0_GOT:
+        case R_TILEPRO_IMM16_X1_GOT:
+        case R_TILEPRO_IMM16_X0_GOT_LO:
+        case R_TILEPRO_IMM16_X1_GOT_LO:
+        case R_TILEPRO_IMM16_X0_GOT_HI:
+        case R_TILEPRO_IMM16_X1_GOT_HI:
+        case R_TILEPRO_IMM16_X0_GOT_HA:
+        case R_TILEPRO_IMM16_X1_GOT_HA:
+        case R_TILEPRO_IMM16_X0_TLS_GD:
+        case R_TILEPRO_IMM16_X1_TLS_GD:
+        case R_TILEPRO_IMM16_X0_TLS_GD_LO:
+        case R_TILEPRO_IMM16_X1_TLS_GD_LO:
+        case R_TILEPRO_IMM16_X0_TLS_GD_HI:
+        case R_TILEPRO_IMM16_X1_TLS_GD_HI:
+        case R_TILEPRO_IMM16_X0_TLS_GD_HA:
+        case R_TILEPRO_IMM16_X1_TLS_GD_HA:
+        case R_TILEPRO_IMM16_X0_TLS_IE:
+        case R_TILEPRO_IMM16_X1_TLS_IE:
+        case R_TILEPRO_IMM16_X0_TLS_IE_LO:
+        case R_TILEPRO_IMM16_X1_TLS_IE_LO:
+        case R_TILEPRO_IMM16_X0_TLS_IE_HI:
+        case R_TILEPRO_IMM16_X1_TLS_IE_HI:
+        case R_TILEPRO_IMM16_X0_TLS_IE_HA:
+        case R_TILEPRO_IMM16_X1_TLS_IE_HA:
+	  if (h != NULL)
+	    {
+	      if (h->got.refcount > 0)
+		h->got.refcount--;
+	    }
+	  else
+	    {
+	      if (local_got_refcounts[r_symndx] > 0)
+		local_got_refcounts[r_symndx]--;
+	    }
+	  break;
+
+        case R_TILEPRO_32_PCREL:
+        case R_TILEPRO_16_PCREL:
+        case R_TILEPRO_8_PCREL:
+        case R_TILEPRO_IMM16_X0_PCREL:
+        case R_TILEPRO_IMM16_X1_PCREL:
+        case R_TILEPRO_IMM16_X0_LO_PCREL:
+        case R_TILEPRO_IMM16_X1_LO_PCREL:
+        case R_TILEPRO_IMM16_X0_HI_PCREL:
+        case R_TILEPRO_IMM16_X1_HI_PCREL:
+        case R_TILEPRO_IMM16_X0_HA_PCREL:
+        case R_TILEPRO_IMM16_X1_HA_PCREL:
+	  if (h != NULL
+	      && strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
+	    break;
+	  /* Fall through.  */
+
+        case R_TILEPRO_32:
+        case R_TILEPRO_16:
+        case R_TILEPRO_8:
+        case R_TILEPRO_LO16:
+        case R_TILEPRO_HI16:
+        case R_TILEPRO_HA16:
+        case R_TILEPRO_COPY:
+        case R_TILEPRO_GLOB_DAT:
+        case R_TILEPRO_JMP_SLOT:
+        case R_TILEPRO_RELATIVE:
+        case R_TILEPRO_BROFF_X1:
+        case R_TILEPRO_JOFFLONG_X1:
+        case R_TILEPRO_IMM8_X0:
+        case R_TILEPRO_IMM8_Y0:
+        case R_TILEPRO_IMM8_X1:
+        case R_TILEPRO_IMM8_Y1:
+        case R_TILEPRO_DEST_IMM8_X1:
+        case R_TILEPRO_MT_IMM15_X1:
+        case R_TILEPRO_MF_IMM15_X1:
+        case R_TILEPRO_IMM16_X0:
+        case R_TILEPRO_IMM16_X1:
+        case R_TILEPRO_IMM16_X0_LO:
+        case R_TILEPRO_IMM16_X1_LO:
+        case R_TILEPRO_IMM16_X0_HI:
+        case R_TILEPRO_IMM16_X1_HI:
+        case R_TILEPRO_IMM16_X0_HA:
+        case R_TILEPRO_IMM16_X1_HA:
+        case R_TILEPRO_MMSTART_X0:
+        case R_TILEPRO_MMEND_X0:
+        case R_TILEPRO_MMSTART_X1:
+        case R_TILEPRO_MMEND_X1:
+        case R_TILEPRO_SHAMT_X0:
+        case R_TILEPRO_SHAMT_X1:
+        case R_TILEPRO_SHAMT_Y0:
+        case R_TILEPRO_SHAMT_Y1:
+	  if (info->shared)
+	    break;
+	  /* Fall through.  */
+
+        case R_TILEPRO_JOFFLONG_X1_PLT:
+	  if (h != NULL)
+	    {
+	      if (h->plt.refcount > 0)
+		h->plt.refcount--;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+tilepro_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+				   struct elf_link_hash_entry *h)
+{
+  struct tilepro_elf_link_hash_table *htab;
+  struct tilepro_elf_link_hash_entry * eh;
+  struct tilepro_elf_dyn_relocs *p;
+  asection *s;
+
+  htab = tilepro_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (htab->elf.dynobj != NULL
+	      && (h->needs_plt
+		  || h->u.weakdef != NULL
+		  || (h->def_dynamic
+		      && h->ref_regular
+		      && !h->def_regular)));
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later
+     (although we could actually do it here). */
+  if (h->type == STT_FUNC || h->needs_plt)
+    {
+      if (h->plt.refcount <= 0
+	  || SYMBOL_CALLS_LOCAL (info, h)
+	  || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+	      && h->root.type == bfd_link_hash_undefweak))
+	{
+	  /* This case can occur if we saw a R_TILEPRO_JOFFLONG_X1_PLT
+             reloc in an input file, but the symbol was never referred
+             to by a dynamic object, or if all references were garbage
+             collected.  In such a case, we don't actually need to build
+             a procedure linkage table, and we can just do a
+             R_TILEPRO_JOFFLONG_X1 relocation instead. */
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	}
+
+      return TRUE;
+    }
+  else
+    h->plt.offset = (bfd_vma) -1;
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if (!h->non_got_ref)
+    return TRUE;
+
+  /* If -z nocopyreloc was given, we won't generate them either.  */
+  if (info->nocopyreloc)
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  eh = (struct tilepro_elf_link_hash_entry *) h;
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      s = p->sec->output_section;
+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
+	break;
+    }
+
+  /* If we didn't find any dynamic relocs in read-only sections, then
+     we'll be keeping the dynamic relocs and avoiding the copy reloc.  */
+  if (p == NULL)
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  /* We must generate a R_TILEPRO_COPY reloc to tell the dynamic linker
+     to copy the initial value out of the dynamic object and into the
+     runtime process image.  We need to remember the offset into the
+     .rel.bss section we are going to use.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      htab->srelbss->size += TILEPRO_ELF_RELA_BYTES;
+      h->needs_copy = 1;
+    }
+
+  return _bfd_elf_adjust_dynamic_copy (h, htab->sdynbss);
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   dynamic relocs.  */
+
+static bfd_boolean
+allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+{
+  struct bfd_link_info *info;
+  struct tilepro_elf_link_hash_table *htab;
+  struct tilepro_elf_link_hash_entry *eh;
+  struct tilepro_elf_dyn_relocs *p;
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  info = (struct bfd_link_info *) inf;
+  htab = tilepro_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  if (htab->elf.dynamic_sections_created
+      && h->plt.refcount > 0)
+    {
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info->shared, h))
+	{
+	  asection *s = htab->elf.splt;
+
+	  /* Allocate room for the header.  */
+	  if (s->size == 0)
+	    {
+	      s->size = PLT_HEADER_SIZE;
+	    }
+
+          h->plt.offset = s->size;
+
+	  /* If this symbol is not defined in a regular file, and we are
+	     not generating a shared library, then set the symbol to this
+	     location in the .plt.  This is required to make function
+	     pointers compare as equal between the normal executable and
+	     the shared library.  */
+	  if (! info->shared
+	      && !h->def_regular)
+	    {
+	      h->root.u.def.section = s;
+	      h->root.u.def.value = h->plt.offset;
+	    }
+
+	  /* Make room for this entry.  */
+	  s->size += PLT_ENTRY_SIZE;
+
+	  /* We also need to make an entry in the .got.plt section.  */
+	  htab->elf.sgotplt->size += GOT_ENTRY_SIZE;
+
+	  /* We also need to make an entry in the .rela.plt section.  */
+	  htab->elf.srelplt->size += TILEPRO_ELF_RELA_BYTES;
+	}
+      else
+	{
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	}
+    }
+  else
+    {
+      h->plt.offset = (bfd_vma) -1;
+      h->needs_plt = 0;
+    }
+
+  if (h->got.refcount > 0)
+    {
+      asection *s;
+      bfd_boolean dyn;
+      int tls_type = tilepro_elf_hash_entry(h)->tls_type;
+
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      s = htab->elf.sgot;
+      h->got.offset = s->size;
+      s->size += TILEPRO_BYTES_PER_WORD;
+      /* R_TILEPRO_IMM16_Xn_TLS_GD entries need 2 consecutive GOT slots. */
+      if (tls_type == GOT_TLS_GD)
+	s->size += TILEPRO_BYTES_PER_WORD;
+      dyn = htab->elf.dynamic_sections_created;
+      /* R_TILEPRO_IMM16_Xn_TLS_IE_xxx needs one dynamic relocation,
+	 R_TILEPRO_IMM16_Xn_TLS_GD_xxx needs two if local symbol and two if
+	 global.  */
+      if (tls_type == GOT_TLS_GD || tls_type == GOT_TLS_IE)
+	htab->elf.srelgot->size += 2 * TILEPRO_ELF_RELA_BYTES;
+      else if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h))
+	htab->elf.srelgot->size += TILEPRO_ELF_RELA_BYTES;
+    }
+  else
+    h->got.offset = (bfd_vma) -1;
+
+  eh = (struct tilepro_elf_link_hash_entry *) h;
+  if (eh->dyn_relocs == NULL)
+    return TRUE;
+
+  /* In the shared -Bsymbolic case, discard space allocated for
+     dynamic pc-relative relocs against symbols which turn out to be
+     defined in regular objects.  For the normal shared case, discard
+     space for pc-relative relocs that have become local due to symbol
+     visibility changes.  */
+
+  if (info->shared)
+    {
+      if (SYMBOL_CALLS_LOCAL (info, h))
+	{
+	  struct tilepro_elf_dyn_relocs **pp;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      p->count -= p->pc_count;
+	      p->pc_count = 0;
+	      if (p->count == 0)
+		*pp = p->next;
+	      else
+		pp = &p->next;
+	    }
+	}
+
+      /* Also discard relocs on undefined weak syms with non-default
+	 visibility.  */
+      if (eh->dyn_relocs != NULL
+	  && h->root.type == bfd_link_hash_undefweak)
+	{
+	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	    eh->dyn_relocs = NULL;
+
+	  /* Make sure undefined weak symbols are output as a dynamic
+	     symbol in PIEs.  */
+	  else if (h->dynindx == -1
+		   && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+	}
+    }
+  else
+    {
+      /* For the non-shared case, discard space for relocs against
+	 symbols which turn out to need copy relocs or are not
+	 dynamic.  */
+
+      if (!h->non_got_ref
+	  && ((h->def_dynamic
+	       && !h->def_regular)
+	      || (htab->elf.dynamic_sections_created
+		  && (h->root.type == bfd_link_hash_undefweak
+		      || h->root.type == bfd_link_hash_undefined))))
+	{
+	  /* Make sure this symbol is output as a dynamic symbol.
+	     Undefined weak syms won't yet be marked as dynamic.  */
+	  if (h->dynindx == -1
+	      && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+
+	  /* If that succeeded, we know we'll be keeping all the
+	     relocs.  */
+	  if (h->dynindx != -1)
+	    goto keep;
+	}
+
+      eh->dyn_relocs = NULL;
+
+    keep: ;
+    }
+
+  /* Finally, allocate space.  */
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *sreloc = elf_section_data (p->sec)->sreloc;
+      sreloc->size += p->count * TILEPRO_ELF_RELA_BYTES;
+    }
+
+  return TRUE;
+}
+
+/* Find any dynamic relocs that apply to read-only sections.  */
+
+static bfd_boolean
+readonly_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+{
+  struct tilepro_elf_link_hash_entry *eh;
+  struct tilepro_elf_dyn_relocs *p;
+
+  eh = (struct tilepro_elf_link_hash_entry *) h;
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *s = p->sec->output_section;
+
+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
+	{
+	  struct bfd_link_info *info = (struct bfd_link_info *) inf;
+
+	  info->flags |= DF_TEXTREL;
+
+	  /* Not an error, just cut short the traversal.  */
+	  return FALSE;
+	}
+    }
+  return TRUE;
+}
+
+/* Return true if the dynamic symbol for a given section should be
+   omitted when creating a shared library.  */
+
+static bfd_boolean
+tilepro_elf_omit_section_dynsym (bfd *output_bfd,
+				    struct bfd_link_info *info,
+				    asection *p)
+{
+  /* We keep the .got section symbol so that explicit relocations
+     against the _GLOBAL_OFFSET_TABLE_ symbol emitted in PIC mode
+     can be turned into relocations against the .got symbol.  */
+  if (strcmp (p->name, ".got") == 0)
+    return FALSE;
+
+  return _bfd_elf_link_omit_section_dynsym (output_bfd, info, p);
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+#define ELF32_DYNAMIC_INTERPRETER "/lib/ld.so.1"
+
+static bfd_boolean
+tilepro_elf_size_dynamic_sections (bfd *output_bfd,
+				      struct bfd_link_info *info)
+{
+  (void)output_bfd;
+
+  struct tilepro_elf_link_hash_table *htab;
+  bfd *dynobj;
+  asection *s;
+  bfd *ibfd;
+
+  htab = tilepro_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+  dynobj = htab->elf.dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (s != NULL);
+	  s->size = sizeof ELF32_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF32_DYNAMIC_INTERPRETER;
+	}
+    }
+
+  /* Set up .got offsets for local syms, and space for local dynamic
+     relocs.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      bfd_signed_vma *local_got;
+      bfd_signed_vma *end_local_got;
+      char *local_tls_type;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *srel;
+
+      if (! is_tilepro_elf (ibfd))
+	continue;
+
+      for (s = ibfd->sections; s != NULL; s = s->next)
+	{
+	  struct tilepro_elf_dyn_relocs *p;
+
+	  for (p = elf_section_data (s)->local_dynrel; p != NULL; p = p->next)
+	    {
+	      if (!bfd_is_abs_section (p->sec)
+		  && bfd_is_abs_section (p->sec->output_section))
+		{
+		  /* Input section has been discarded, either because
+		     it is a copy of a linkonce section or due to
+		     linker script /DISCARD/, so we'll be discarding
+		     the relocs too.  */
+		}
+	      else if (p->count != 0)
+		{
+		  srel = elf_section_data (p->sec)->sreloc;
+		  srel->size += p->count * TILEPRO_ELF_RELA_BYTES;
+		  if ((p->sec->output_section->flags & SEC_READONLY) != 0)
+		    info->flags |= DF_TEXTREL;
+		}
+	    }
+	}
+
+      local_got = elf_local_got_refcounts (ibfd);
+      if (!local_got)
+	continue;
+
+      symtab_hdr = &elf_symtab_hdr (ibfd);
+      locsymcount = symtab_hdr->sh_info;
+      end_local_got = local_got + locsymcount;
+      local_tls_type = _bfd_tilepro_elf_local_got_tls_type (ibfd);
+      s = htab->elf.sgot;
+      srel = htab->elf.srelgot;
+      for (; local_got < end_local_got; ++local_got, ++local_tls_type)
+	{
+	  if (*local_got > 0)
+	    {
+	      *local_got = s->size;
+	      s->size += TILEPRO_BYTES_PER_WORD;
+	      if (*local_tls_type == GOT_TLS_GD)
+		s->size += TILEPRO_BYTES_PER_WORD;
+	      if (info->shared
+		  || *local_tls_type == GOT_TLS_GD
+		  || *local_tls_type == GOT_TLS_IE)
+		srel->size += TILEPRO_ELF_RELA_BYTES;
+	    }
+	  else
+	    *local_got = (bfd_vma) -1;
+	}
+    }
+
+  /* Allocate global sym .plt and .got entries, and space for global
+     sym dynamic relocs.  */
+  elf_link_hash_traverse (&htab->elf, allocate_dynrelocs, info);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* If the .got section is more than 0x8000 bytes, we add
+	 0x8000 to the value of _GLOBAL_OFFSET_TABLE_, so that 16
+	 bit relocations have a greater chance of working. */
+      if (htab->elf.sgot->size >= 0x8000
+	  && elf_hash_table (info)->hgot->root.u.def.value == 0)
+	elf_hash_table (info)->hgot->root.u.def.value = 0x8000;
+    }
+
+  if (htab->elf.sgotplt)
+    {
+      struct elf_link_hash_entry *got;
+      got = elf_link_hash_lookup (elf_hash_table (info),
+				  "_GLOBAL_OFFSET_TABLE_",
+				  FALSE, FALSE, FALSE);
+
+      /* Don't allocate .got.plt section if there are no GOT nor PLT
+         entries and there is no refeence to _GLOBAL_OFFSET_TABLE_.  */
+      if ((got == NULL
+	   || !got->ref_regular_nonweak)
+	  && (htab->elf.sgotplt->size
+	      == GOTPLT_HEADER_SIZE)
+	  && (htab->elf.splt == NULL
+	      || htab->elf.splt->size == 0)
+	  && (htab->elf.sgot == NULL
+	      || (htab->elf.sgot->size
+		  == get_elf_backend_data (output_bfd)->got_header_size)))
+	htab->elf.sgotplt->size = 0;
+    }
+
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      if (s == htab->elf.splt
+	  || s == htab->elf.sgot
+	  || s == htab->elf.sgotplt
+	  || s == htab->sdynbss)
+	{
+	  /* Strip this section if we don't need it; see the
+	     comment below.  */
+	}
+      else if (strncmp (s->name, ".rela", 5) == 0)
+	{
+	  if (s->size != 0)
+	    {
+	      /* We use the reloc_count field as a counter if we need
+		 to copy relocs into the output file.  */
+	      s->reloc_count = 0;
+	    }
+	}
+      else
+	{
+	  /* It's not one of our sections.  */
+	  continue;
+	}
+
+      if (s->size == 0)
+	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is mostly to handle .rela.bss and
+	     .rela.plt.  We must create both sections in
+	     create_dynamic_sections, because they must be created
+	     before the linker maps input sections to output
+	     sections.  The linker does that before
+	     adjust_dynamic_symbol is called, and it is that
+	     function which decides whether anything needs to go
+	     into these sections.  */
+	  s->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents.  Zero the memory
+	 for the benefit of .rela.plt, which has 4 unused entries
+	 at the beginning, and we don't want garbage.  */
+      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in tilepro_elf_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (info->executable)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (htab->elf.srelplt->size != 0)
+	{
+	  if (!add_dynamic_entry (DT_PLTGOT, 0)
+	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+	      || !add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+	}
+
+      if (!add_dynamic_entry (DT_RELA, 0)
+	  || !add_dynamic_entry (DT_RELASZ, 0)
+	  || !add_dynamic_entry (DT_RELAENT, TILEPRO_ELF_RELA_BYTES))
+	return FALSE;
+
+      /* If any dynamic relocs apply to a read-only section,
+	 then we need a DT_TEXTREL entry.  */
+      if ((info->flags & DF_TEXTREL) == 0)
+	elf_link_hash_traverse (&htab->elf, readonly_dynrelocs, info);
+
+      if (info->flags & DF_TEXTREL)
+	{
+	  if (!add_dynamic_entry (DT_TEXTREL, 0))
+	    return FALSE;
+	}
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+/* Return the base VMA address which should be subtracted from real addresses
+   when resolving @dtpoff relocation.
+   This is PT_TLS segment p_vaddr.  */
+
+static bfd_vma
+dtpoff_base (struct bfd_link_info *info)
+{
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (elf_hash_table (info)->tls_sec == NULL)
+    return 0;
+  return elf_hash_table (info)->tls_sec->vma;
+}
+
+/* Return the relocation value for R_TILEPRO_TLS_TPOFF32. */
+
+static bfd_vma
+tpoff (struct bfd_link_info *info, bfd_vma address)
+{
+  struct elf_link_hash_table *htab = elf_hash_table (info);
+
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (htab->tls_sec == NULL)
+    return 0;
+
+  return (address - htab->tls_sec->vma);
+}
+
+/* Relocate an TILEPRO ELF section.
+
+   The RELOCATE_SECTION function is called by the new ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures.
+
+   This function is responsible for adjusting the section contents as
+   necessary, and (if generating a relocatable output file) adjusting
+   the reloc addend as necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.  */
+
+static bfd_boolean
+tilepro_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
+                              bfd *input_bfd, asection *input_section,
+                              bfd_byte *contents, Elf_Internal_Rela *relocs,
+                              Elf_Internal_Sym *local_syms,
+                              asection **local_sections)
+{
+  struct tilepro_elf_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_vma *local_got_offsets;
+  bfd_vma got_base;
+  asection *sreloc;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  int num_relocs;
+
+  htab = tilepro_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+  symtab_hdr = &elf_symtab_hdr (input_bfd);
+  sym_hashes = elf_sym_hashes (input_bfd);
+  local_got_offsets = elf_local_got_offsets (input_bfd);
+
+  if (elf_hash_table (info)->hgot == NULL)
+    got_base = 0;
+  else
+    got_base = elf_hash_table (info)->hgot->root.u.def.value;
+
+  sreloc = elf_section_data (input_section)->sreloc;
+
+  rel = relocs;
+  num_relocs = input_section->reloc_count;
+  relend = relocs + num_relocs;
+  for (; rel < relend; rel++)
+    {
+      int r_type, tls_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+      Elf_Internal_Sym *sym;
+      tilepro_create_func create_func;
+      asection *sec;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+      const char *name;
+      bfd_vma off;
+      bfd_boolean is_plt = FALSE;
+
+      bfd_boolean unresolved_reloc;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      if (r_type == R_TILEPRO_GNU_VTINHERIT
+	  || r_type == R_TILEPRO_GNU_VTENTRY)
+	continue;
+
+      if ((unsigned int)r_type >= NELEMS(tilepro_elf_howto_table))
+	{
+          /* Not clear if we need to check here, but just be paranoid. */
+	  (*_bfd_error_handler)
+	    (_("%B: unrecognized relocation (0x%x) in section `%A'"),
+	     input_bfd, r_type, input_section);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      howto = tilepro_elf_howto_table + r_type;
+
+      /* This is a final link.  */
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      unresolved_reloc = FALSE;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+      else
+	{
+	  bfd_boolean warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	  if (warned)
+	    {
+	      /* To avoid generating warning messages about truncated
+		 relocations, set the relocation's address to be the same as
+		 the start of this section.  */
+	      if (input_section->output_section != NULL)
+		relocation = input_section->output_section->vma;
+	      else
+		relocation = 0;
+	    }
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      if (h != NULL)
+	name = h->root.root.string;
+      else
+	{
+	  name = (bfd_elf_string_from_elf_section
+		  (input_bfd, symtab_hdr->sh_link, sym->st_name));
+	  if (name == NULL || *name == '\0')
+	    name = bfd_section_name (input_bfd, sec);
+	}
+
+      switch (r_type)
+	{
+        case R_TILEPRO_IMM16_X0_GOT:
+        case R_TILEPRO_IMM16_X1_GOT:
+        case R_TILEPRO_IMM16_X0_GOT_LO:
+        case R_TILEPRO_IMM16_X1_GOT_LO:
+        case R_TILEPRO_IMM16_X0_GOT_HI:
+        case R_TILEPRO_IMM16_X1_GOT_HI:
+        case R_TILEPRO_IMM16_X0_GOT_HA:
+        case R_TILEPRO_IMM16_X1_GOT_HA:
+	  /* Relocation is to the entry for this symbol in the global
+	     offset table.  */
+	  if (htab->elf.sgot == NULL)
+	    abort ();
+
+	  if (h != NULL)
+	    {
+	      bfd_boolean dyn;
+
+	      off = h->got.offset;
+	      BFD_ASSERT (off != (bfd_vma) -1);
+	      dyn = elf_hash_table (info)->dynamic_sections_created;
+
+	      if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+		  || (info->shared
+		      && SYMBOL_REFERENCES_LOCAL (info, h)))
+		{
+		  /* This is actually a static link, or it is a
+		     -Bsymbolic link and the symbol is defined
+		     locally, or the symbol was forced to be local
+		     because of a version file.  We must initialize
+		     this entry in the global offset table.  Since the
+		     offset must always be a multiple
+		     of 4 for 32-bit, we use the least significant bit
+		     to record whether we have initialized it already.
+
+		     When doing a dynamic link, we create a .rela.got
+		     relocation entry to initialize the value.  This
+		     is done in the finish_dynamic_symbol routine.  */
+		  if ((off & 1) != 0)
+		    off &= ~1;
+		  else
+		    {
+		      bfd_put_32 (output_bfd, relocation,
+					  htab->elf.sgot->contents + off);
+		      h->got.offset |= 1;
+		    }
+		}
+	      else
+		unresolved_reloc = FALSE;
+	    }
+	  else
+	    {
+	      BFD_ASSERT (local_got_offsets != NULL
+			  && local_got_offsets[r_symndx] != (bfd_vma) -1);
+
+	      off = local_got_offsets[r_symndx];
+
+	      /* The offset must always be a multiple of 4 on 32-bit.
+                 We use the least significant bit to record
+		 whether we have already processed this entry.  */
+	      if ((off & 1) != 0)
+		off &= ~1;
+	      else
+		{
+		  if (info->shared)
+		    {
+		      asection *s;
+		      Elf_Internal_Rela outrel;
+
+		      /* We need to generate a R_TILEPRO_RELATIVE reloc
+			 for the dynamic linker.  */
+		      s = htab->elf.srelgot;
+		      BFD_ASSERT (s != NULL);
+
+		      outrel.r_offset = (htab->elf.sgot->output_section->vma
+					 + htab->elf.sgot->output_offset
+					 + off);
+		      outrel.r_info = ELF32_R_INFO (0, R_TILEPRO_RELATIVE);
+		      outrel.r_addend = relocation;
+		      relocation = 0;
+		      tilepro_elf_append_rela_32 (output_bfd, s, &outrel);
+		    }
+
+		  bfd_put_32 (output_bfd, relocation,
+				      htab->elf.sgot->contents + off);
+		  local_got_offsets[r_symndx] |= 1;
+		}
+	    }
+	  relocation = htab->elf.sgot->output_offset + off - got_base;
+	  break;
+
+        case R_TILEPRO_JOFFLONG_X1_PLT:
+	  /* Relocation is to the entry for this symbol in the
+	     procedure linkage table.  */
+          BFD_ASSERT (h != NULL);
+
+	  if (h->plt.offset == (bfd_vma) -1 || htab->elf.splt == NULL)
+	    {
+	      /* We didn't make a PLT entry for this symbol.  This
+		 happens when statically linking PIC code, or when
+		 using -Bsymbolic.  */
+	      break;
+	    }
+
+	  relocation = (htab->elf.splt->output_section->vma
+			+ htab->elf.splt->output_offset
+			+ h->plt.offset);
+	  unresolved_reloc = FALSE;
+	  break;
+
+        case R_TILEPRO_32_PCREL:
+        case R_TILEPRO_16_PCREL:
+        case R_TILEPRO_8_PCREL:
+        case R_TILEPRO_IMM16_X0_PCREL:
+        case R_TILEPRO_IMM16_X1_PCREL:
+        case R_TILEPRO_IMM16_X0_LO_PCREL:
+        case R_TILEPRO_IMM16_X1_LO_PCREL:
+        case R_TILEPRO_IMM16_X0_HI_PCREL:
+        case R_TILEPRO_IMM16_X1_HI_PCREL:
+        case R_TILEPRO_IMM16_X0_HA_PCREL:
+        case R_TILEPRO_IMM16_X1_HA_PCREL:
+	  if (h != NULL
+	      && strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
+	    break;
+	  /* Fall through.  */
+        case R_TILEPRO_32:
+        case R_TILEPRO_16:
+        case R_TILEPRO_8:
+        case R_TILEPRO_LO16:
+        case R_TILEPRO_HI16:
+        case R_TILEPRO_HA16:
+        case R_TILEPRO_COPY:
+        case R_TILEPRO_GLOB_DAT:
+        case R_TILEPRO_JMP_SLOT:
+        case R_TILEPRO_RELATIVE:
+        case R_TILEPRO_BROFF_X1:
+        case R_TILEPRO_JOFFLONG_X1:
+        case R_TILEPRO_IMM8_X0:
+        case R_TILEPRO_IMM8_Y0:
+        case R_TILEPRO_IMM8_X1:
+        case R_TILEPRO_IMM8_Y1:
+        case R_TILEPRO_DEST_IMM8_X1:
+        case R_TILEPRO_MT_IMM15_X1:
+        case R_TILEPRO_MF_IMM15_X1:
+        case R_TILEPRO_IMM16_X0:
+        case R_TILEPRO_IMM16_X1:
+        case R_TILEPRO_IMM16_X0_LO:
+        case R_TILEPRO_IMM16_X1_LO:
+        case R_TILEPRO_IMM16_X0_HI:
+        case R_TILEPRO_IMM16_X1_HI:
+        case R_TILEPRO_IMM16_X0_HA:
+        case R_TILEPRO_IMM16_X1_HA:
+        case R_TILEPRO_MMSTART_X0:
+        case R_TILEPRO_MMEND_X0:
+        case R_TILEPRO_MMSTART_X1:
+        case R_TILEPRO_MMEND_X1:
+        case R_TILEPRO_SHAMT_X0:
+        case R_TILEPRO_SHAMT_X1:
+        case R_TILEPRO_SHAMT_Y0:
+        case R_TILEPRO_SHAMT_Y1:
+	  if ((input_section->flags & SEC_ALLOC) == 0)
+	    break;
+
+	  if ((info->shared
+	       && (h == NULL
+		   || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		   || h->root.type != bfd_link_hash_undefweak)
+	       && (! howto->pc_relative
+		   || !SYMBOL_CALLS_LOCAL (info, h)))
+	      || (!info->shared
+		  && h != NULL
+		  && h->dynindx != -1
+		  && !h->non_got_ref
+		  && ((h->def_dynamic
+		       && !h->def_regular)
+		      || h->root.type == bfd_link_hash_undefweak
+		      || h->root.type == bfd_link_hash_undefined)))
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_boolean skip, relocate = FALSE;
+
+	      /* When generating a shared object, these relocations
+		 are copied into the output file to be resolved at run
+		 time.  */
+
+	      BFD_ASSERT (sreloc != NULL);
+
+	      skip = FALSE;
+
+	      outrel.r_offset =
+		_bfd_elf_section_offset (output_bfd, info, input_section,
+					 rel->r_offset);
+	      if (outrel.r_offset == (bfd_vma) -1)
+		skip = TRUE;
+	      else if (outrel.r_offset == (bfd_vma) -2)
+		skip = TRUE, relocate = TRUE;
+	      outrel.r_offset += (input_section->output_section->vma
+				  + input_section->output_offset);
+
+	      switch (r_type)
+		{
+                case R_TILEPRO_32_PCREL:
+                case R_TILEPRO_16_PCREL:
+                case R_TILEPRO_8_PCREL:
+		  /* If the symbol is not dynamic, we should not keep
+		     a dynamic relocation.  But an .rela.* slot has been
+		     allocated for it, output R_TILEPRO_NONE.
+		     FIXME: Add code tracking needed dynamic relocs as
+		     e.g. i386 has.  */
+		  if (h->dynindx == -1)
+		    skip = TRUE, relocate = TRUE;
+		  break;
+		}
+
+	      if (skip)
+		memset (&outrel, 0, sizeof outrel);
+	      /* h->dynindx may be -1 if the symbol was marked to
+		 become local.  */
+	      else if (h != NULL &&
+		       h->dynindx != -1
+		       && (! is_plt
+			   || !info->shared
+			   || !SYMBOLIC_BIND (info, h)
+			   || !h->def_regular))
+		{
+		  BFD_ASSERT (h->dynindx != -1);
+		  outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
+		  outrel.r_addend = rel->r_addend;
+		}
+	      else
+		{
+		  if (r_type == R_TILEPRO_32)
+		    {
+		      outrel.r_info = ELF32_R_INFO (0, R_TILEPRO_RELATIVE);
+		      outrel.r_addend = relocation + rel->r_addend;
+		    }
+		  else
+		    {
+		      long indx;
+
+		      outrel.r_addend = relocation + rel->r_addend;
+
+		      if (is_plt)
+			sec = htab->elf.splt;
+
+		      if (bfd_is_abs_section (sec))
+			indx = 0;
+		      else if (sec == NULL || sec->owner == NULL)
+			{
+			  bfd_set_error (bfd_error_bad_value);
+			  return FALSE;
+			}
+		      else
+			{
+			  asection *osec;
+
+			  /* We are turning this relocation into one
+			     against a section symbol.  It would be
+			     proper to subtract the symbol's value,
+			     osec->vma, from the emitted reloc addend,
+			     but ld.so expects buggy relocs.  */
+			  osec = sec->output_section;
+			  indx = elf_section_data (osec)->dynindx;
+
+			  if (indx == 0)
+			    {
+			      osec = htab->elf.text_index_section;
+			      indx = elf_section_data (osec)->dynindx;
+			    }
+
+			  /* FIXME: we really should be able to link non-pic
+			     shared libraries.  */
+			  if (indx == 0)
+			    {
+			      BFD_FAIL ();
+			      (*_bfd_error_handler)
+				(_("%B: probably compiled without -fPIC?"),
+				 input_bfd);
+			      bfd_set_error (bfd_error_bad_value);
+			      return FALSE;
+			    }
+			}
+
+		      outrel.r_info = ELF32_R_INFO (indx, r_type);
+		    }
+		}
+
+	      tilepro_elf_append_rela_32 (output_bfd, sreloc, &outrel);
+
+	      /* This reloc will be computed at runtime, so there's no
+		 need to do anything now.  */
+	      if (! relocate)
+		continue;
+	    }
+	  break;
+
+        case R_TILEPRO_IMM16_X0_TLS_GD:
+        case R_TILEPRO_IMM16_X1_TLS_GD:
+        case R_TILEPRO_IMM16_X0_TLS_GD_LO:
+        case R_TILEPRO_IMM16_X1_TLS_GD_LO:
+        case R_TILEPRO_IMM16_X0_TLS_GD_HI:
+        case R_TILEPRO_IMM16_X1_TLS_GD_HI:
+        case R_TILEPRO_IMM16_X0_TLS_GD_HA:
+        case R_TILEPRO_IMM16_X1_TLS_GD_HA:
+          tls_type = GOT_TLS_GD;
+          goto have_tls_reference;
+
+        case R_TILEPRO_IMM16_X0_TLS_IE:
+        case R_TILEPRO_IMM16_X1_TLS_IE:
+        case R_TILEPRO_IMM16_X0_TLS_IE_LO:
+        case R_TILEPRO_IMM16_X1_TLS_IE_LO:
+        case R_TILEPRO_IMM16_X0_TLS_IE_HI:
+        case R_TILEPRO_IMM16_X1_TLS_IE_HI:
+        case R_TILEPRO_IMM16_X0_TLS_IE_HA:
+        case R_TILEPRO_IMM16_X1_TLS_IE_HA:
+          tls_type = GOT_TLS_IE;
+          /* Fall through. */
+
+        have_tls_reference:
+	  if (h == NULL && local_got_offsets)
+	    tls_type
+	      = _bfd_tilepro_elf_local_got_tls_type (input_bfd) [r_symndx];
+	  else if (h != NULL)
+	    {
+	      tls_type = tilepro_elf_hash_entry(h)->tls_type;
+	    }
+	  if (tls_type == GOT_TLS_IE)
+	    switch (r_type)
+	      {
+              case R_TILEPRO_IMM16_X0_TLS_GD:
+                r_type = R_TILEPRO_IMM16_X0_TLS_IE;
+                break;
+              case R_TILEPRO_IMM16_X1_TLS_GD:
+                r_type = R_TILEPRO_IMM16_X1_TLS_IE;
+                break;
+              case R_TILEPRO_IMM16_X0_TLS_GD_LO:
+                r_type = R_TILEPRO_IMM16_X0_TLS_IE_LO;
+                break;
+              case R_TILEPRO_IMM16_X1_TLS_GD_LO:
+                r_type = R_TILEPRO_IMM16_X1_TLS_IE_LO;
+                break;
+              case R_TILEPRO_IMM16_X0_TLS_GD_HI:
+                r_type = R_TILEPRO_IMM16_X0_TLS_IE_HI;
+                break;
+              case R_TILEPRO_IMM16_X1_TLS_GD_HI:
+                r_type = R_TILEPRO_IMM16_X1_TLS_IE_HI;
+                break;
+              case R_TILEPRO_IMM16_X0_TLS_GD_HA:
+                r_type = R_TILEPRO_IMM16_X0_TLS_IE_HA;
+                break;
+              case R_TILEPRO_IMM16_X1_TLS_GD_HA:
+                r_type = R_TILEPRO_IMM16_X1_TLS_IE_HA;
+                break;
+	      }
+
+	  if (h != NULL)
+	    {
+	      off = h->got.offset;
+	      h->got.offset |= 1;
+	    }
+	  else
+	    {
+	      BFD_ASSERT (local_got_offsets != NULL);
+	      off = local_got_offsets[r_symndx];
+	      local_got_offsets[r_symndx] |= 1;
+	    }
+
+	  if (htab->elf.sgot == NULL)
+	    abort ();
+
+	  if ((off & 1) != 0)
+	    off &= ~1;
+	  else
+	    {
+	      Elf_Internal_Rela outrel;
+	      int indx = 0;
+	      bfd_boolean need_relocs = FALSE;
+
+	      if (htab->elf.srelgot == NULL)
+		abort ();
+
+	      if (h != NULL)
+	      {
+	        bfd_boolean dyn;
+	        dyn = htab->elf.dynamic_sections_created;
+
+		if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+		    && (!info->shared
+			|| !SYMBOL_REFERENCES_LOCAL (info, h)))
+		  {
+		    indx = h->dynindx;
+		  }
+	      }
+
+	      /* The GOT entries have not been initialized yet.  Do it
+	         now, and emit any relocations. */
+	      if ((info->shared || indx != 0)
+		  && (h == NULL
+		      || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		      || h->root.type != bfd_link_hash_undefweak))
+		    need_relocs = TRUE;
+
+              switch (r_type)
+                {
+                  case R_TILEPRO_IMM16_X0_TLS_IE:
+                  case R_TILEPRO_IMM16_X1_TLS_IE:
+                  case R_TILEPRO_IMM16_X0_TLS_IE_LO:
+                  case R_TILEPRO_IMM16_X1_TLS_IE_LO:
+                  case R_TILEPRO_IMM16_X0_TLS_IE_HI:
+                  case R_TILEPRO_IMM16_X1_TLS_IE_HI:
+                  case R_TILEPRO_IMM16_X0_TLS_IE_HA:
+                  case R_TILEPRO_IMM16_X1_TLS_IE_HA:
+		    if (need_relocs) {
+	              bfd_put_32 (output_bfd, 0, htab->elf.sgot->contents + off);
+	              outrel.r_offset = (htab->elf.sgot->output_section->vma
+				       + htab->elf.sgot->output_offset + off);
+	              outrel.r_addend = 0;
+		      if (indx == 0)
+		        outrel.r_addend = relocation - dtpoff_base (info);
+		      outrel.r_info = ELF32_R_INFO (indx, R_TILEPRO_TLS_TPOFF32);
+		      tilepro_elf_append_rela_32 (output_bfd, htab->elf.srelgot,
+						  &outrel);
+                    } else {
+		      bfd_put_32 (output_bfd, tpoff (info, relocation),
+				  htab->elf.sgot->contents + off);
+                    }
+                    break;
+
+		  case R_TILEPRO_IMM16_X0_TLS_GD:
+		  case R_TILEPRO_IMM16_X1_TLS_GD:
+		  case R_TILEPRO_IMM16_X0_TLS_GD_LO:
+		  case R_TILEPRO_IMM16_X1_TLS_GD_LO:
+		  case R_TILEPRO_IMM16_X0_TLS_GD_HI:
+		  case R_TILEPRO_IMM16_X1_TLS_GD_HI:
+		  case R_TILEPRO_IMM16_X0_TLS_GD_HA:
+		  case R_TILEPRO_IMM16_X1_TLS_GD_HA:
+		    if (need_relocs) {
+ 	              outrel.r_offset = (htab->elf.sgot->output_section->vma
+				       + htab->elf.sgot->output_offset + off);
+	              outrel.r_addend = 0;
+	              outrel.r_info = ELF32_R_INFO (indx, R_TILEPRO_TLS_DTPMOD32);
+	              bfd_put_32 (output_bfd, 0, htab->elf.sgot->contents + off);
+	              tilepro_elf_append_rela_32 (output_bfd, htab->elf.srelgot,
+						  &outrel);
+		      if (indx == 0)
+		        {
+		      	  BFD_ASSERT (! unresolved_reloc);
+		          bfd_put_32 (output_bfd,
+				      relocation - dtpoff_base (info),
+				      (htab->elf.sgot->contents + off +
+				       TILEPRO_BYTES_PER_WORD));
+		        }
+		      else
+		        {
+		          bfd_put_32 (output_bfd, 0,
+				      (htab->elf.sgot->contents + off +
+				       TILEPRO_BYTES_PER_WORD));
+		          outrel.r_info = ELF32_R_INFO (indx,
+							R_TILEPRO_TLS_DTPOFF32);
+			  outrel.r_offset += TILEPRO_BYTES_PER_WORD;
+		          tilepro_elf_append_rela_32 (output_bfd,
+						      htab->elf.srelgot, &outrel);
+		        }
+                    }
+
+		    else {
+		      /* If we are not emitting relocations for a
+		         general dynamic reference, then we must be in a
+		         static link or an executable link with the
+		         symbol binding locally.  Mark it as belonging
+		         to module 1, the executable.  */
+		      bfd_put_32 (output_bfd, 1,
+				  htab->elf.sgot->contents + off );
+		      bfd_put_32 (output_bfd, relocation - dtpoff_base (info),
+				  htab->elf.sgot->contents + off +
+				  TILEPRO_BYTES_PER_WORD);
+		   }
+                   break;
+                }
+	    }
+
+	  if (off >= (bfd_vma) -2)
+	    abort ();
+
+	  relocation = htab->elf.sgot->output_offset + off - got_base;
+	  unresolved_reloc = FALSE;
+	  howto = tilepro_elf_howto_table + r_type;
+	  break;
+
+	default:
+	  break;
+	}
+
+      /* Dynamic relocs are not propagated for SEC_DEBUGGING sections
+	 because such sections are not SEC_ALLOC and thus ld.so will
+	 not process them.  */
+      if (unresolved_reloc
+	  && !((input_section->flags & SEC_DEBUGGING) != 0
+	       && h->def_dynamic))
+	(*_bfd_error_handler)
+	  (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+	   input_bfd,
+	   input_section,
+	   (long) rel->r_offset,
+	   howto->name,
+	   h->root.root.string);
+
+      r = bfd_reloc_continue;
+
+      /* For the _HA types, we add 0x8000 so that if bit 15 is set,
+       * we will increment bit 16.  The howto->rightshift takes care
+       * of the rest for us. */
+      switch (r_type)
+      {
+      case R_TILEPRO_HA16:
+      case R_TILEPRO_IMM16_X0_HA:
+      case R_TILEPRO_IMM16_X1_HA:
+      case R_TILEPRO_IMM16_X0_HA_PCREL:
+      case R_TILEPRO_IMM16_X1_HA_PCREL:
+      case R_TILEPRO_IMM16_X0_GOT_HA:
+      case R_TILEPRO_IMM16_X1_GOT_HA:
+      case R_TILEPRO_IMM16_X0_TLS_GD_HA:
+      case R_TILEPRO_IMM16_X1_TLS_GD_HA:
+      case R_TILEPRO_IMM16_X0_TLS_IE_HA:
+      case R_TILEPRO_IMM16_X1_TLS_IE_HA:
+        relocation += 0x8000;
+        break;
+      }
+
+      /* Get the operand creation function, if any. */
+      create_func = reloc_to_create_func[r_type];
+      if (create_func == NULL)
+      {
+        r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+                                      contents, rel->r_offset,
+                                      relocation, rel->r_addend);
+      }
+      else
+      {
+        if (howto->pc_relative)
+        {
+          relocation -=
+            input_section->output_section->vma + input_section->output_offset;
+          if (howto->pcrel_offset)
+            relocation -= rel->r_offset;
+        }
+
+        bfd_byte *data;
+
+        /* Add the relocation addend if any to the final target value */
+        relocation += rel->r_addend;
+
+        /* Do basic range checking */
+        r = bfd_check_overflow (howto->complain_on_overflow,
+                                howto->bitsize,
+                                howto->rightshift,
+                                32,
+                                relocation);
+
+        /*
+         * Write the relocated value out into the raw section data.
+         * Don't put a relocation out in the .rela section.
+         */
+        tilepro_bundle_bits mask = create_func(-1);
+        tilepro_bundle_bits value = create_func(relocation >> howto->rightshift);
+
+        /* Only touch bytes while the mask is not 0, so we
+           don't write to out of bounds memory if this is actually
+           a 16-bit switch instruction. */
+        for (data = contents + rel->r_offset; mask != 0; data++)
+          {
+            bfd_byte byte_mask = (bfd_byte)mask;
+            *data = (*data & ~byte_mask) | ((bfd_byte)value & byte_mask);
+            mask >>= 8;
+            value >>= 8;
+          }
+      }
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char *msg = NULL;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      r = info->callbacks->reloc_overflow
+		(info, (h ? &h->root : NULL), name, howto->name,
+		 (bfd_vma) 0, input_bfd, input_section, rel->r_offset);
+	      break;
+
+	    case bfd_reloc_undefined:
+	      r = info->callbacks->undefined_symbol
+		(info, name, input_bfd, input_section, rel->r_offset,
+		 TRUE);
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      break;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      break;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous relocation");
+	      break;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      break;
+	    }
+
+	  if (msg)
+	    r = info->callbacks->warning
+	      (info, msg, name, input_bfd, input_section, rel->r_offset);
+
+	  if (! r)
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+tilepro_elf_finish_dynamic_symbol (bfd *output_bfd,
+				   struct bfd_link_info *info,
+				   struct elf_link_hash_entry *h,
+				   Elf_Internal_Sym *sym)
+{
+  struct tilepro_elf_link_hash_table *htab;
+
+  htab = tilepro_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      asection *splt;
+      asection *srela;
+      asection *sgotplt;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+      bfd_vma r_offset;
+
+      int rela_index;
+
+      /* This symbol has an entry in the PLT.  Set it up.  */
+
+      BFD_ASSERT (h->dynindx != -1);
+
+      splt = htab->elf.splt;
+      srela = htab->elf.srelplt;
+      sgotplt = htab->elf.sgotplt;
+
+      if (splt == NULL || srela == NULL)
+       abort ();
+
+      /* Fill in the entry in the procedure linkage table.  */
+      rela_index = tilepro_plt_entry_build (splt, sgotplt, h->plt.offset,
+					    &r_offset);
+
+      /* Fill in the entry in the global offset table, which initially points
+	 to the beginning of the plt.  */
+      bfd_put_32 (output_bfd, splt->output_section->vma + splt->output_offset,
+		  sgotplt->contents + r_offset);
+
+      /* Fill in the entry in the .rela.plt section.  */
+      rela.r_offset = (sgotplt->output_section->vma
+		       + sgotplt->output_offset
+		       + r_offset);
+      rela.r_addend = 0;
+      rela.r_info = ELF32_R_INFO (h->dynindx, R_TILEPRO_JMP_SLOT);
+
+      loc = srela->contents + rela_index * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+
+      if (!h->def_regular)
+	{
+	  /* Mark the symbol as undefined, rather than as defined in
+	     the .plt section.  Leave the value alone.  */
+	  sym->st_shndx = SHN_UNDEF;
+	  /* If the symbol is weak, we do need to clear the value.
+	     Otherwise, the PLT entry would provide a definition for
+	     the symbol even if the symbol wasn't defined anywhere,
+	     and so the symbol would never be NULL.  */
+	  if (!h->ref_regular_nonweak)
+	    sym->st_value = 0;
+	}
+    }
+
+  if (h->got.offset != (bfd_vma) -1
+      && tilepro_elf_hash_entry(h)->tls_type != GOT_TLS_GD
+      && tilepro_elf_hash_entry(h)->tls_type != GOT_TLS_IE)
+    {
+      asection *sgot;
+      asection *srela;
+      Elf_Internal_Rela rela;
+
+      /* This symbol has an entry in the GOT.  Set it up.  */
+
+      sgot = htab->elf.sgot;
+      srela = htab->elf.srelgot;
+      BFD_ASSERT (sgot != NULL && srela != NULL);
+
+      rela.r_offset = (sgot->output_section->vma
+		       + sgot->output_offset
+		       + (h->got.offset &~ (bfd_vma) 1));
+
+      /* If this is a -Bsymbolic link, and the symbol is defined
+	 locally, we just want to emit a RELATIVE reloc.  Likewise if
+	 the symbol was forced to be local because of a version file.
+	 The entry in the global offset table will already have been
+	 initialized in the relocate_section function.  */
+      if (info->shared
+	  && (info->symbolic || h->dynindx == -1)
+	  && h->def_regular)
+	{
+	  asection *sec = h->root.u.def.section;
+	  rela.r_info = ELF32_R_INFO (0, R_TILEPRO_RELATIVE);
+	  rela.r_addend = (h->root.u.def.value
+			   + sec->output_section->vma
+			   + sec->output_offset);
+	}
+      else
+	{
+	  rela.r_info = ELF32_R_INFO (h->dynindx, R_TILEPRO_GLOB_DAT);
+	  rela.r_addend = 0;
+	}
+
+      bfd_put_32 (output_bfd, 0,
+			  sgot->contents + (h->got.offset & ~(bfd_vma) 1));
+      tilepro_elf_append_rela_32 (output_bfd, srela, &rela);
+    }
+
+  if (h->needs_copy)
+    {
+      asection *s;
+      Elf_Internal_Rela rela;
+
+      /* This symbols needs a copy reloc.  Set it up.  */
+      BFD_ASSERT (h->dynindx != -1);
+
+      s = bfd_get_section_by_name (h->root.u.def.section->owner,
+				   ".rela.bss");
+      BFD_ASSERT (s != NULL);
+
+      rela.r_offset = (h->root.u.def.value
+		       + h->root.u.def.section->output_section->vma
+		       + h->root.u.def.section->output_offset);
+      rela.r_info = ELF32_R_INFO (h->dynindx, R_TILEPRO_COPY);
+      rela.r_addend = 0;
+      tilepro_elf_append_rela_32 (output_bfd, s, &rela);
+    }
+
+  /* Mark some specially defined symbols as absolute. */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+      || (h == htab->elf.hgot || h == htab->elf.hplt))
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+tilepro_finish_dyn (bfd *output_bfd, struct bfd_link_info *info,
+		    bfd *dynobj, asection *sdyn,
+		    asection *splt ATTRIBUTE_UNUSED)
+{
+  Elf32_External_Dyn *dyncon, *dynconend;
+  struct tilepro_elf_link_hash_table *htab;
+
+  htab = tilepro_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+  dyncon = (Elf32_External_Dyn *) sdyn->contents;
+  dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+  for (; dyncon < dynconend; dyncon++)
+    {
+      Elf_Internal_Dyn dyn;
+      asection *s;
+
+      bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+      switch (dyn.d_tag)
+	{
+	case DT_PLTGOT:
+	  s = htab->elf.sgotplt;
+	  dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+	  break;
+	case DT_JMPREL:
+	  s = htab->elf.srelplt;
+	  dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+	  break;
+	case DT_PLTRELSZ:
+	  s = htab->elf.srelplt;
+	  dyn.d_un.d_val = s->size;
+	  break;
+	default:
+	  continue;
+	}
+
+      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+    }
+  return TRUE;
+}
+
+static bfd_boolean
+tilepro_elf_finish_dynamic_sections (bfd *output_bfd,
+                                     struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *sdyn;
+  struct tilepro_elf_link_hash_table *htab;
+
+  htab = tilepro_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+  dynobj = htab->elf.dynobj;
+
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      asection *splt;
+      bfd_boolean ret;
+
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      BFD_ASSERT (splt != NULL && sdyn != NULL);
+
+      ret = tilepro_finish_dyn (output_bfd, info, dynobj, sdyn, splt);
+
+      if (ret != TRUE)
+	return ret;
+
+      /* Fill in the first entry in the procedure linkage table.  */
+      if (splt->size > 0)
+        memcpy (splt->contents, tilepro_plt0_entry, PLT_HEADER_SIZE);
+
+      elf_section_data (splt->output_section)->this_hdr.sh_entsize
+	= PLT_ENTRY_SIZE;
+    }
+
+  if (htab->elf.sgotplt)
+    {
+      if (bfd_is_abs_section (htab->elf.sgotplt->output_section))
+	{
+	  (*_bfd_error_handler)
+	    (_("discarded output section: `%A'"), htab->elf.sgotplt);
+	  return FALSE;
+	}
+
+      if (htab->elf.sgotplt->size > 0)
+	{
+	  /* Write the first two entries in .got.plt, needed for the dynamic
+	     linker.  */
+	  bfd_put_32 (output_bfd, (bfd_vma) -1,
+		      htab->elf.sgotplt->contents);
+	  bfd_put_32 (output_bfd, (bfd_vma) 0,
+		      htab->elf.sgotplt->contents + GOT_ENTRY_SIZE);
+	}
+
+      elf_section_data (htab->elf.sgotplt->output_section)->this_hdr.sh_entsize
+	= GOT_ENTRY_SIZE;
+    }
+
+  if (htab->elf.sgot)
+    {
+      if (htab->elf.sgot->size > 0)
+	{
+	  /* Set the first entry in the global offset table to the address of
+	     the dynamic section.  */
+	  bfd_vma val = (sdyn ?
+			 sdyn->output_section->vma + sdyn->output_offset :
+			 0);
+	  bfd_put_32 (output_bfd, val, htab->elf.sgot->contents);
+	}
+
+      elf_section_data (htab->elf.sgot->output_section)->this_hdr.sh_entsize
+	= GOT_ENTRY_SIZE;
+    }
+
+  return TRUE;
+}
+
+
+
+/* Return address for Ith PLT stub in section PLT, for relocation REL
+   or (bfd_vma) -1 if it should not be included.  */
+
+static bfd_vma
+tilepro_elf_plt_sym_val (bfd_vma i, const asection *plt,
+                      const arelent *rel ATTRIBUTE_UNUSED)
+{
+  return plt->vma + PLT_HEADER_SIZE + i * PLT_ENTRY_SIZE;
+}
+
+static enum elf_reloc_type_class
+tilepro_reloc_type_class (const Elf_Internal_Rela *rela)
+{
+  switch ((int) ELF32_R_TYPE (rela->r_info))
+    {
+    case R_TILEPRO_RELATIVE:
+      return reloc_class_relative;
+    case R_TILEPRO_JMP_SLOT:
+      return reloc_class_plt;
+    case R_TILEPRO_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+static int
+tilepro_additional_program_headers (bfd *abfd,
+                                    struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  /* Each .intrpt section specified by the user adds another PT_LOAD
+     header since the sections are discontiguous. */
+  static const char intrpt_sections[4][9] =
+    {
+      ".intrpt0", ".intrpt1", ".intrpt2", ".intrpt3"
+    };
+  int count = 0;
+  int i;
+
+  for (i = 0; i < 4; i++)
+    {
+      asection *sec = bfd_get_section_by_name (abfd, intrpt_sections[i]);
+      if (sec != NULL && (sec->flags & SEC_LOAD) != 0)
+	++count;
+    }
+
+  /* Add four "padding" headers in to leave room in case a custom linker
+     script does something fancy. Otherwise ld complains that it ran
+     out of program headers and refuses to link. */
+  count += 4;
+
+  return count;
+}
+
+#define ELF_ARCH		bfd_arch_tilepro
+#define ELF_TARGET_ID		TILEPRO_ELF_DATA
+#define ELF_MACHINE_CODE	EM_TILEPRO
+#define ELF_MAXPAGESIZE		0x10000
+#define ELF_COMMONPAGESIZE	0x10000
+
+#define TARGET_LITTLE_SYM	bfd_elf32_tilepro_vec
+#define TARGET_LITTLE_NAME	"elf32-tilepro"
+
+#define elf_backend_reloc_type_class	     tilepro_reloc_type_class
+
+#define bfd_elf32_bfd_reloc_name_lookup      tilepro_reloc_name_lookup
+#define bfd_elf32_bfd_link_hash_table_create tilepro_elf_link_hash_table_create
+#define bfd_elf32_bfd_reloc_type_lookup	     tilepro_reloc_type_lookup
+
+#define elf_backend_copy_indirect_symbol     tilepro_elf_copy_indirect_symbol
+#define elf_backend_create_dynamic_sections  tilepro_elf_create_dynamic_sections
+#define elf_backend_check_relocs	     tilepro_elf_check_relocs
+#define elf_backend_adjust_dynamic_symbol    tilepro_elf_adjust_dynamic_symbol
+#define elf_backend_omit_section_dynsym	     tilepro_elf_omit_section_dynsym
+#define elf_backend_size_dynamic_sections    tilepro_elf_size_dynamic_sections
+#define elf_backend_relocate_section	     tilepro_elf_relocate_section
+#define elf_backend_finish_dynamic_symbol    tilepro_elf_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections  tilepro_elf_finish_dynamic_sections
+#define elf_backend_gc_mark_hook	     tilepro_elf_gc_mark_hook
+#define elf_backend_gc_sweep_hook            tilepro_elf_gc_sweep_hook
+#define elf_backend_plt_sym_val		     tilepro_elf_plt_sym_val
+#define elf_info_to_howto_rel                NULL
+#define elf_info_to_howto                    tilepro_info_to_howto_rela
+#define elf_backend_grok_prstatus            tilepro_elf_grok_prstatus
+#define elf_backend_grok_psinfo              tilepro_elf_grok_psinfo
+#define elf_backend_additional_program_headers tilepro_additional_program_headers
+
+#define elf_backend_init_index_section	_bfd_elf_init_1_index_section
+
+#define elf_backend_can_gc_sections 1
+#define elf_backend_can_refcount 1
+#define elf_backend_want_got_plt 1
+#define elf_backend_plt_readonly 1
+/* Align PLT mod 64 byte L2 line size. */
+#define elf_backend_plt_alignment 6
+#define elf_backend_want_plt_sym 1
+#define elf_backend_got_header_size GOT_ENTRY_SIZE
+#define elf_backend_rela_normal 1
+#define elf_backend_default_execstack 0
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-tilepro.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-tilepro.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-tilepro.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-tilepro.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,38 @@
+/* TILEPro-specific support for 32-bit ELF.
+   Copyright 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _ELF32_TILEPRO_H
+#define _ELF32_TILEPRO_H
+
+/* This file contains sizes and offsets of Linux data structures.  */
+
+#define TILEPRO_PRSTATUS_SIZEOF           332
+#define TILEPRO_PRSTATUS_OFFSET_PR_CURSIG  12
+#define TILEPRO_PRSTATUS_OFFSET_PR_PID     24
+#define TILEPRO_PRSTATUS_OFFSET_PR_REG     72
+
+#define TILEPRO_PRPSINFO_SIZEOF           128
+#define TILEPRO_PRPSINFO_OFFSET_PR_FNAME   32
+#define TILEPRO_PRPSINFO_OFFSET_PR_PSARGS  48
+#define ELF_PR_PSARGS_SIZE              80
+
+#define TILEPRO_GREGSET_T_SIZE            256
+
+#endif /* _ELF32_TILEPRO_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-v850.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-v850.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-v850.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-v850.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3573 @@
+/* V850-specific support for 32-bit ELF
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* XXX FIXME: This code is littered with 32bit int, 16bit short, 8bit char
+   dependencies.  As is the gas & simulator code for the v850.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/v850.h"
+#include "libiberty.h"
+
+/* Sign-extend a 17-bit number.  */
+#define SEXT17(x)	((((x) & 0x1ffff) ^ 0x10000) - 0x10000)
+
+/* Sign-extend a 22-bit number.  */
+#define SEXT22(x)	((((x) & 0x3fffff) ^ 0x200000) - 0x200000)
+
+static reloc_howto_type v850_elf_howto_table[];
+
+/* Look through the relocs for a section during the first phase, and
+   allocate space in the global offset table or procedure linkage
+   table.  */
+
+static bfd_boolean
+v850_elf_check_relocs (bfd *abfd,
+		       struct bfd_link_info *info,
+		       asection *sec,
+		       const Elf_Internal_Rela *relocs)
+{
+  bfd_boolean ret = TRUE;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  enum v850_reloc_type r_type;
+  int other = 0;
+  const char *common = NULL;
+
+  if (info->relocatable)
+    return TRUE;
+
+#ifdef DEBUG
+  _bfd_error_handler ("v850_elf_check_relocs called for section %A in %B",
+		      sec, abfd);
+#endif
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+	h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      r_type = (enum v850_reloc_type) ELF32_R_TYPE (rel->r_info);
+      switch (r_type)
+	{
+	default:
+	case R_V850_NONE:
+	case R_V850_9_PCREL:
+	case R_V850_16_PCREL:
+	case R_V850_17_PCREL:
+	case R_V850_22_PCREL:
+	case R_V850_32_PCREL:
+	case R_V850_32_ABS:
+	case R_V850_HI16:
+	case R_V850_HI16_S:
+	case R_V850_LO16:
+	case R_V850_LO16_S1:
+	case R_V850_LO16_SPLIT_OFFSET:
+	case R_V850_23:
+	case R_V850_ABS32:
+	case R_V850_REL32:
+	case R_V850_16:
+	case R_V850_16_S1:
+	case R_V850_16_SPLIT_OFFSET:
+	case R_V850_8:
+	case R_V850_CALLT_6_7_OFFSET:
+	case R_V850_CALLT_15_16_OFFSET:
+	case R_V850_CALLT_16_16_OFFSET:
+	  break;
+
+        /* This relocation describes the C++ object vtable hierarchy.
+           Reconstruct it for later use during GC.  */
+        case R_V850_GNU_VTINHERIT:
+          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+
+        /* This relocation describes which C++ vtable entries
+	   are actually used.  Record for later use during GC.  */
+        case R_V850_GNU_VTENTRY:
+          BFD_ASSERT (h != NULL);
+          if (h != NULL
+              && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+            return FALSE;
+          break;
+
+	case R_V850_SDA_16_16_SPLIT_OFFSET:
+	case R_V850_SDA_16_16_OFFSET:
+	case R_V850_SDA_15_16_OFFSET:
+	  other = V850_OTHER_SDA;
+	  common = ".scommon";
+	  goto small_data_common;
+
+	case R_V850_ZDA_16_16_SPLIT_OFFSET:
+	case R_V850_ZDA_16_16_OFFSET:
+	case R_V850_ZDA_15_16_OFFSET:
+	  other = V850_OTHER_ZDA;
+	  common = ".zcommon";
+	  goto small_data_common;
+
+	case R_V850_TDA_4_4_OFFSET:
+	case R_V850_TDA_4_5_OFFSET:
+	case R_V850_TDA_7_7_OFFSET:
+	case R_V850_TDA_6_8_OFFSET:
+	case R_V850_TDA_7_8_OFFSET:
+	case R_V850_TDA_16_16_OFFSET:
+	  other = V850_OTHER_TDA;
+	  common = ".tcommon";
+	  /* fall through */
+
+#define V850_OTHER_MASK (V850_OTHER_TDA | V850_OTHER_SDA | V850_OTHER_ZDA)
+
+	small_data_common:
+	  if (h)
+	    {
+	      /* Flag which type of relocation was used.  */
+	      h->other |= other;
+	      if ((h->other & V850_OTHER_MASK) != (other & V850_OTHER_MASK)
+		  && (h->other & V850_OTHER_ERROR) == 0)
+		{
+		  const char * msg;
+		  static char  buff[200]; /* XXX */
+
+		  switch (h->other & V850_OTHER_MASK)
+		    {
+		    default:
+		      msg = _("Variable `%s' cannot occupy in multiple small data regions");
+		      break;
+		    case V850_OTHER_SDA | V850_OTHER_ZDA | V850_OTHER_TDA:
+		      msg = _("Variable `%s' can only be in one of the small, zero, and tiny data regions");
+		      break;
+		    case V850_OTHER_SDA | V850_OTHER_ZDA:
+		      msg = _("Variable `%s' cannot be in both small and zero data regions simultaneously");
+		      break;
+		    case V850_OTHER_SDA | V850_OTHER_TDA:
+		      msg = _("Variable `%s' cannot be in both small and tiny data regions simultaneously");
+		      break;
+		    case V850_OTHER_ZDA | V850_OTHER_TDA:
+		      msg = _("Variable `%s' cannot be in both zero and tiny data regions simultaneously");
+		      break;
+		    }
+
+		  sprintf (buff, msg, h->root.root.string);
+		  info->callbacks->warning (info, buff, h->root.root.string,
+					    abfd, h->root.u.def.section,
+					    (bfd_vma) 0);
+
+		  bfd_set_error (bfd_error_bad_value);
+		  h->other |= V850_OTHER_ERROR;
+		  ret = FALSE;
+		}
+	    }
+
+	  if (h && h->root.type == bfd_link_hash_common
+	      && h->root.u.c.p
+	      && !strcmp (bfd_get_section_name (abfd, h->root.u.c.p->section), "COMMON"))
+	    {
+	      asection * section;
+
+	      section = h->root.u.c.p->section = bfd_make_section_old_way (abfd, common);
+	      section->flags |= SEC_IS_COMMON;
+	    }
+
+#ifdef DEBUG
+	  fprintf (stderr, "v850_elf_check_relocs, found %s relocation for %s%s\n",
+		   v850_elf_howto_table[ (int)r_type ].name,
+		   (h && h->root.root.string) ? h->root.root.string : "<unknown>",
+		   (h->root.type == bfd_link_hash_common) ? ", symbol is common" : "");
+#endif
+	  break;
+	}
+    }
+
+  return ret;
+}
+
+/* In the old version, when an entry was checked out from the table,
+   it was deleted.  This produced an error if the entry was needed
+   more than once, as the second attempted retry failed.
+
+   In the current version, the entry is not deleted, instead we set
+   the field 'found' to TRUE.  If a second lookup matches the same
+   entry, then we know that the hi16s reloc has already been updated
+   and does not need to be updated a second time.
+
+   TODO - TOFIX: If it is possible that we need to restore 2 different
+   addresses from the same table entry, where the first generates an
+   overflow, whilst the second do not, then this code will fail.  */
+
+typedef struct hi16s_location
+{
+  bfd_vma                 addend;
+  bfd_byte *              address;
+  unsigned long           counter;
+  bfd_boolean             found;
+  struct hi16s_location * next;
+}
+hi16s_location;
+
+static hi16s_location * previous_hi16s;
+static hi16s_location * free_hi16s;
+static unsigned long    hi16s_counter;
+
+static void
+remember_hi16s_reloc (bfd *abfd, bfd_vma addend, bfd_byte *address)
+{
+  hi16s_location * entry = NULL;
+  bfd_size_type amt = sizeof (* free_hi16s);
+
+  /* Find a free structure.  */
+  if (free_hi16s == NULL)
+    free_hi16s = bfd_zalloc (abfd, amt);
+
+  entry      = free_hi16s;
+  free_hi16s = free_hi16s->next;
+
+  entry->addend  = addend;
+  entry->address = address;
+  entry->counter = hi16s_counter ++;
+  entry->found   = FALSE;
+  entry->next    = previous_hi16s;
+  previous_hi16s = entry;
+
+  /* Cope with wrap around of our counter.  */
+  if (hi16s_counter == 0)
+    {
+      /* XXX: Assume that all counter entries differ only in their low 16 bits.  */
+      for (entry = previous_hi16s; entry != NULL; entry = entry->next)
+	entry->counter &= 0xffff;
+
+      hi16s_counter = 0x10000;
+    }
+}
+
+static bfd_byte *
+find_remembered_hi16s_reloc (bfd_vma addend, bfd_boolean *already_found)
+{
+  hi16s_location *match = NULL;
+  hi16s_location *entry;
+  bfd_byte *addr;
+
+  /* Search the table.  Record the most recent entry that matches.  */
+  for (entry = previous_hi16s; entry; entry = entry->next)
+    {
+      if (entry->addend == addend
+	  && (match == NULL || match->counter < entry->counter))
+	{
+	  match    = entry;
+	}
+    }
+
+  if (match == NULL)
+    return NULL;
+
+  /* Extract the address.  */
+  addr = match->address;
+
+  /* Remember if this entry has already been used before.  */
+  if (already_found)
+    * already_found = match->found;
+
+  /* Note that this entry has now been used.  */
+  match->found = TRUE;
+
+  return addr;
+}
+
+/* Calculate the final operand value for a R_V850_LO16 or
+   R_V850_LO16_SPLIT_OFFSET.  *INSN is the current operand value and
+   ADDEND is the sum of the relocation symbol and offset.  Store the
+   operand value in *INSN and return true on success.
+
+   The assembler has already done some of this: If the value stored in
+   the instruction has its 15th bit set, (counting from zero) then the
+   assembler will have added 1 to the value stored in the associated
+   HI16S reloc.  So for example, these relocations:
+
+       movhi hi( fred ), r0, r1
+       movea lo( fred ), r1, r1
+
+   will store 0 in the value fields for the MOVHI and MOVEA instructions
+   and addend will be the address of fred, but for these instructions:
+
+       movhi hi( fred + 0x123456 ), r0, r1
+       movea lo( fred + 0x123456 ), r1, r1
+
+   the value stored in the MOVHI instruction will be 0x12 and the value
+   stored in the MOVEA instruction will be 0x3456.  If however the
+   instructions were:
+
+       movhi hi( fred + 0x10ffff ), r0, r1
+       movea lo( fred + 0x10ffff ), r1, r1
+
+   then the value stored in the MOVHI instruction would be 0x11 (not
+   0x10) and the value stored in the MOVEA instruction would be 0xffff.
+   Thus (assuming for the moment that the addend is 0), at run time the
+   MOVHI instruction loads 0x110000 into r1, then the MOVEA instruction
+   adds 0xffffffff (sign extension!) producing 0x10ffff.  Similarly if
+   the instructions were:
+
+       movhi hi( fred - 1 ), r0, r1
+       movea lo( fred - 1 ), r1, r1
+
+   then 0 is stored in the MOVHI instruction and -1 is stored in the
+   MOVEA instruction.
+
+   Overflow can occur if the addition of the value stored in the
+   instruction plus the addend sets the 15th bit when before it was clear.
+   This is because the 15th bit will be sign extended into the high part,
+   thus reducing its value by one, but since the 15th bit was originally
+   clear, the assembler will not have added 1 to the previous HI16S reloc
+   to compensate for this effect.  For example:
+
+      movhi hi( fred + 0x123456 ), r0, r1
+      movea lo( fred + 0x123456 ), r1, r1
+
+   The value stored in HI16S reloc is 0x12, the value stored in the LO16
+   reloc is 0x3456.  If we assume that the address of fred is 0x00007000
+   then the relocations become:
+
+     HI16S: 0x0012 + (0x00007000 >> 16)    = 0x12
+     LO16:  0x3456 + (0x00007000 & 0xffff) = 0xa456
+
+   but when the instructions are executed, the MOVEA instruction's value
+   is signed extended, so the sum becomes:
+
+	0x00120000
+      + 0xffffa456
+      ------------
+	0x0011a456    but 'fred + 0x123456' = 0x0012a456
+
+   Note that if the 15th bit was set in the value stored in the LO16
+   reloc, then we do not have to do anything:
+
+      movhi hi( fred + 0x10ffff ), r0, r1
+      movea lo( fred + 0x10ffff ), r1, r1
+
+      HI16S:  0x0011 + (0x00007000 >> 16)    = 0x11
+      LO16:   0xffff + (0x00007000 & 0xffff) = 0x6fff
+
+	0x00110000
+      + 0x00006fff
+      ------------
+	0x00116fff  = fred + 0x10ffff = 0x7000 + 0x10ffff
+
+   Overflow can also occur if the computation carries into the 16th bit
+   and it also results in the 15th bit having the same value as the 15th
+   bit of the original value.   What happens is that the HI16S reloc
+   will have already examined the 15th bit of the original value and
+   added 1 to the high part if the bit is set.  This compensates for the
+   sign extension of 15th bit of the result of the computation.  But now
+   there is a carry into the 16th bit, and this has not been allowed for.
+
+   So, for example if fred is at address 0xf000:
+
+     movhi hi( fred + 0xffff ), r0, r1    [bit 15 of the offset is set]
+     movea lo( fred + 0xffff ), r1, r1
+
+     HI16S: 0x0001 + (0x0000f000 >> 16)    = 0x0001
+     LO16:  0xffff + (0x0000f000 & 0xffff) = 0xefff   (carry into bit 16 is lost)
+
+       0x00010000
+     + 0xffffefff
+     ------------
+       0x0000efff   but 'fred + 0xffff' = 0x0001efff
+
+   Similarly, if the 15th bit remains clear, but overflow occurs into
+   the 16th bit then (assuming the address of fred is 0xf000):
+
+     movhi hi( fred + 0x7000 ), r0, r1    [bit 15 of the offset is clear]
+     movea lo( fred + 0x7000 ), r1, r1
+
+     HI16S: 0x0000 + (0x0000f000 >> 16)    = 0x0000
+     LO16:  0x7000 + (0x0000f000 & 0xffff) = 0x6fff  (carry into bit 16 is lost)
+
+       0x00000000
+     + 0x00006fff
+     ------------
+       0x00006fff   but 'fred + 0x7000' = 0x00016fff
+
+   Note - there is no need to change anything if a carry occurs, and the
+   15th bit changes its value from being set to being clear, as the HI16S
+   reloc will have already added in 1 to the high part for us:
+
+     movhi hi( fred + 0xffff ), r0, r1     [bit 15 of the offset is set]
+     movea lo( fred + 0xffff ), r1, r1
+
+     HI16S: 0x0001 + (0x00007000 >> 16)
+     LO16:  0xffff + (0x00007000 & 0xffff) = 0x6fff  (carry into bit 16 is lost)
+
+       0x00010000
+     + 0x00006fff   (bit 15 not set, so the top half is zero)
+     ------------
+       0x00016fff   which is right (assuming that fred is at 0x7000)
+
+   but if the 15th bit goes from being clear to being set, then we must
+   once again handle overflow:
+
+     movhi hi( fred + 0x7000 ), r0, r1     [bit 15 of the offset is clear]
+     movea lo( fred + 0x7000 ), r1, r1
+
+     HI16S: 0x0000 + (0x0000ffff >> 16)
+     LO16:  0x7000 + (0x0000ffff & 0xffff) = 0x6fff  (carry into bit 16)
+
+       0x00000000
+     + 0x00006fff   (bit 15 not set, so the top half is zero)
+     ------------
+       0x00006fff   which is wrong (assuming that fred is at 0xffff).  */
+
+static bfd_boolean
+v850_elf_perform_lo16_relocation (bfd *abfd, unsigned long *insn,
+				  unsigned long addend)
+{
+#define BIT15_SET(x) ((x) & 0x8000)
+#define OVERFLOWS(a,i) ((((a) & 0xffff) + (i)) > 0xffff)
+
+  if ((BIT15_SET (*insn + addend) && ! BIT15_SET (addend))
+      || (OVERFLOWS (addend, *insn)
+	  && ((! BIT15_SET (*insn)) || (BIT15_SET (addend)))))
+    {
+      bfd_boolean already_updated;
+      bfd_byte *hi16s_address = find_remembered_hi16s_reloc
+	(addend, & already_updated);
+
+      /* Amend the matching HI16_S relocation.  */
+      if (hi16s_address != NULL)
+	{
+	  if (! already_updated)
+	    {
+	      unsigned long hi_insn = bfd_get_16 (abfd, hi16s_address);
+	      hi_insn += 1;
+	      bfd_put_16 (abfd, hi_insn, hi16s_address);
+	    }
+	}
+      else
+	{
+	  (*_bfd_error_handler) (_("FAILED to find previous HI16 reloc"));
+	  return FALSE;
+	}
+    }
+#undef OVERFLOWS
+#undef BIT15_SET
+
+  /* Do not complain if value has top bit set, as this has been
+     anticipated.  */
+  *insn = (*insn + addend) & 0xffff;
+  return TRUE;
+}
+
+/* FIXME:  The code here probably ought to be removed and the code in reloc.c
+   allowed to do its stuff instead.  At least for most of the relocs, anyway.  */
+
+static bfd_reloc_status_type
+v850_elf_perform_relocation (bfd *abfd,
+			     unsigned int r_type,
+			     bfd_vma addend,
+			     bfd_byte *address)
+{
+  unsigned long insn;
+  unsigned long result;
+  bfd_signed_vma saddend = (bfd_signed_vma) addend;
+
+  switch (r_type)
+    {
+    default:
+      return bfd_reloc_notsupported;
+
+    case R_V850_REL32:
+    case R_V850_ABS32:
+      bfd_put_32 (abfd, addend, address);
+      return bfd_reloc_ok;
+
+    case R_V850_23:
+      insn  = bfd_get_32 (abfd, address);
+      insn &= ~((0x7f << 4) | (0x7fff80 << (16-7)));
+      insn |= ((addend & 0x7f) << 4) | ((addend & 0x7fff80) << (16-7));
+      bfd_put_32 (abfd, (bfd_vma) insn, address);
+      return bfd_reloc_ok;
+
+    case R_V850_22_PCREL:
+      if (saddend > 0x1fffff || saddend < -0x200000)
+	return bfd_reloc_overflow;
+
+      if ((addend % 2) != 0)
+	return bfd_reloc_dangerous;
+
+      insn  = bfd_get_32 (abfd, address);
+      insn &= ~0xfffe003f;
+      insn |= (((addend & 0xfffe) << 16) | ((addend & 0x3f0000) >> 16));
+      bfd_put_32 (abfd, (bfd_vma) insn, address);
+      return bfd_reloc_ok;
+
+    case R_V850_17_PCREL:
+      if (saddend > 0xffff || saddend < -0x10000)
+	return bfd_reloc_overflow;
+
+      if ((addend % 2) != 0)
+	return bfd_reloc_dangerous;
+
+      insn  = bfd_get_32 (abfd, address);
+      insn &= ~ 0xfffe0010;
+      insn |= ((addend & 0xfffe) << 16) | ((addend & 0x10000) >> (16-4));
+      break;
+
+    case R_V850_16_PCREL:
+      if ((saddend < -0xffff) || (saddend > 0))
+	return bfd_reloc_overflow;
+
+      if ((addend % 2) != 0)
+	return bfd_reloc_dangerous;
+
+      insn  = bfd_get_16 (abfd, address);
+      insn &= ~0xfffe;
+      insn |= (-addend & 0xfffe);
+      break;
+
+    case R_V850_9_PCREL:
+      if (saddend > 0xff || saddend < -0x100)
+	return bfd_reloc_overflow;
+
+      if ((addend % 2) != 0)
+	return bfd_reloc_dangerous;
+
+      insn  = bfd_get_16 (abfd, address);
+      insn &= ~ 0xf870;
+      insn |= ((addend & 0x1f0) << 7) | ((addend & 0x0e) << 3);
+      break;
+
+    case R_V850_HI16:
+      addend += (bfd_get_16 (abfd, address) << 16);
+      addend = (addend >> 16);
+      insn = addend;
+      break;
+
+    case R_V850_HI16_S:
+      /* Remember where this relocation took place.  */
+      remember_hi16s_reloc (abfd, addend, address);
+
+      addend += (bfd_get_16 (abfd, address) << 16);
+      addend = (addend >> 16) + ((addend & 0x8000) != 0);
+
+      /* This relocation cannot overflow.  */
+      if (addend > 0xffff)
+	addend = 0;
+
+      insn = addend;
+      break;
+
+    case R_V850_LO16:
+      insn = bfd_get_16 (abfd, address);
+      if (! v850_elf_perform_lo16_relocation (abfd, &insn, addend))
+	return bfd_reloc_overflow;
+      break;
+
+    case R_V850_8:
+      addend += (char) bfd_get_8 (abfd, address);
+
+      saddend = (bfd_signed_vma) addend;
+
+      if (saddend > 0x7f || saddend < -0x80)
+	return bfd_reloc_overflow;
+
+      bfd_put_8 (abfd, addend, address);
+      return bfd_reloc_ok;
+
+    case R_V850_CALLT_16_16_OFFSET:
+      addend += bfd_get_16 (abfd, address);
+
+      saddend = (bfd_signed_vma) addend;
+
+      if (saddend > 0xffff || saddend < 0)
+	return bfd_reloc_overflow;
+
+      insn = addend;
+      break;
+
+    case R_V850_CALLT_15_16_OFFSET:
+      insn = bfd_get_16 (abfd, address);
+
+      addend += insn & 0xfffe;;
+
+      saddend = (bfd_signed_vma) addend;
+
+      if (saddend > 0xffff || saddend < 0)
+	return bfd_reloc_overflow;
+
+      insn = (0xfffe & addend)
+	| (insn & ~0xfffe);
+      break;
+
+    case R_V850_CALLT_6_7_OFFSET:
+      insn = bfd_get_16 (abfd, address);
+      addend += ((insn & 0x3f) << 1);
+
+      saddend = (bfd_signed_vma) addend;
+
+      if (saddend > 0x7e || saddend < 0)
+	return bfd_reloc_overflow;
+
+      if (addend & 1)
+	return bfd_reloc_dangerous;
+
+      insn &= 0xff80;
+      insn |= (addend >> 1);
+      break;
+
+    case R_V850_16:
+    case R_V850_SDA_16_16_OFFSET:
+    case R_V850_ZDA_16_16_OFFSET:
+    case R_V850_TDA_16_16_OFFSET:
+      addend += bfd_get_16 (abfd, address);
+
+      saddend = (bfd_signed_vma) addend;
+
+      if (saddend > 0x7fff || saddend < -0x8000)
+	return bfd_reloc_overflow;
+
+      insn = addend;
+      break;
+
+    case R_V850_16_S1:
+    case R_V850_SDA_15_16_OFFSET:
+    case R_V850_ZDA_15_16_OFFSET:
+      insn = bfd_get_16 (abfd, address);
+      addend += (insn & 0xfffe);
+
+      saddend = (bfd_signed_vma) addend;
+
+      if (saddend > 0x7ffe || saddend < -0x8000)
+	return bfd_reloc_overflow;
+
+      if (addend & 1)
+        return bfd_reloc_dangerous;
+
+      insn = (addend &~ (bfd_vma) 1) | (insn & 1);
+      break;
+
+    case R_V850_TDA_6_8_OFFSET:
+      insn = bfd_get_16 (abfd, address);
+      addend += ((insn & 0x7e) << 1);
+
+      saddend = (bfd_signed_vma) addend;
+
+      if (saddend > 0xfc || saddend < 0)
+	return bfd_reloc_overflow;
+
+      if (addend & 3)
+	return bfd_reloc_dangerous;
+
+      insn &= 0xff81;
+      insn |= (addend >> 1);
+      break;
+
+    case R_V850_TDA_7_8_OFFSET:
+      insn = bfd_get_16 (abfd, address);
+      addend += ((insn & 0x7f) << 1);
+
+      saddend = (bfd_signed_vma) addend;
+
+      if (saddend > 0xfe || saddend < 0)
+	return bfd_reloc_overflow;
+
+      if (addend & 1)
+	return bfd_reloc_dangerous;
+
+      insn &= 0xff80;
+      insn |= (addend >> 1);
+      break;
+
+    case R_V850_TDA_7_7_OFFSET:
+      insn = bfd_get_16 (abfd, address);
+      addend += insn & 0x7f;
+
+      saddend = (bfd_signed_vma) addend;
+
+      if (saddend > 0x7f || saddend < 0)
+	return bfd_reloc_overflow;
+
+      insn &= 0xff80;
+      insn |= addend;
+      break;
+
+    case R_V850_TDA_4_5_OFFSET:
+      insn = bfd_get_16 (abfd, address);
+      addend += ((insn & 0xf) << 1);
+
+      saddend = (bfd_signed_vma) addend;
+
+      if (saddend > 0x1e || saddend < 0)
+	return bfd_reloc_overflow;
+
+      if (addend & 1)
+	return bfd_reloc_dangerous;
+
+      insn &= 0xfff0;
+      insn |= (addend >> 1);
+      break;
+
+    case R_V850_TDA_4_4_OFFSET:
+      insn = bfd_get_16 (abfd, address);
+      addend += insn & 0xf;
+
+      saddend = (bfd_signed_vma) addend;
+
+      if (saddend > 0xf || saddend < 0)
+	return bfd_reloc_overflow;
+
+      insn &= 0xfff0;
+      insn |= addend;
+      break;
+
+    case R_V850_LO16_S1:
+      insn = bfd_get_16 (abfd, address);
+      result = insn & 0xfffe;
+      if (! v850_elf_perform_lo16_relocation (abfd, &result, addend))
+	return bfd_reloc_overflow;
+      if (result & 1)
+	return bfd_reloc_overflow;
+      insn = (result & 0xfffe)
+	| (insn & ~0xfffe);
+	bfd_put_16 (abfd, insn, address);
+      return bfd_reloc_ok;
+
+    case R_V850_LO16_SPLIT_OFFSET:
+      insn = bfd_get_32 (abfd, address);
+      result = ((insn & 0xfffe0000) >> 16) | ((insn & 0x20) >> 5);
+      if (! v850_elf_perform_lo16_relocation (abfd, &result, addend))
+	return bfd_reloc_overflow;
+      insn = (((result << 16) & 0xfffe0000)
+	      | ((result << 5) & 0x20)
+	      | (insn & ~0xfffe0020));
+      bfd_put_32 (abfd, insn, address);
+      return bfd_reloc_ok;
+
+    case R_V850_16_SPLIT_OFFSET:
+    case R_V850_SDA_16_16_SPLIT_OFFSET:
+    case R_V850_ZDA_16_16_SPLIT_OFFSET:
+      insn = bfd_get_32 (abfd, address);
+      addend += ((insn & 0xfffe0000) >> 16) + ((insn & 0x20) >> 5);
+
+      saddend = (bfd_signed_vma) addend;
+
+      if (saddend > 0x7fff || saddend < -0x8000)
+	return bfd_reloc_overflow;
+
+      insn &= 0x0001ffdf;
+      insn |= (addend & 1) << 5;
+      insn |= (addend &~ (bfd_vma) 1) << 16;
+
+      bfd_put_32 (abfd, (bfd_vma) insn, address);
+      return bfd_reloc_ok;
+
+    case R_V850_GNU_VTINHERIT:
+    case R_V850_GNU_VTENTRY:
+      return bfd_reloc_ok;
+
+    }
+
+  bfd_put_16 (abfd, (bfd_vma) insn, address);
+  return bfd_reloc_ok;
+}
+
+/* Insert the addend into the instruction.  */
+
+static bfd_reloc_status_type
+v850_elf_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+		arelent *reloc,
+		asymbol *symbol,
+		void * data ATTRIBUTE_UNUSED,
+		asection *isection,
+		bfd *obfd,
+		char **err ATTRIBUTE_UNUSED)
+{
+  long relocation;
+
+  /* If there is an output BFD,
+     and the symbol is not a section name (which is only defined at final link time),
+     and either we are not putting the addend into the instruction
+      or the addend is zero, so there is nothing to add into the instruction
+     then just fixup the address and return.  */
+  if (obfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (! reloc->howto->partial_inplace
+	  || reloc->addend == 0))
+    {
+      reloc->address += isection->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  /* Catch relocs involving undefined symbols.  */
+  if (bfd_is_und_section (symbol->section)
+      && (symbol->flags & BSF_WEAK) == 0
+      && obfd == NULL)
+    return bfd_reloc_undefined;
+
+  /* We handle final linking of some relocs ourselves.  */
+
+  /* Is the address of the relocation really within the section?  */
+  if (reloc->address > bfd_get_section_limit (abfd, isection))
+    return bfd_reloc_outofrange;
+
+  /* Work out which section the relocation is targeted at and the
+     initial relocation command value.  */
+
+  if (reloc->howto->pc_relative)
+    return bfd_reloc_ok;
+
+  /* Get symbol value.  (Common symbols are special.)  */
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  /* Convert input-section-relative symbol value to absolute + addend.  */
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  relocation += reloc->addend;
+
+  reloc->addend = relocation;
+  return bfd_reloc_ok;
+}
+
+/* This function is used for relocs which are only used
+   for relaxing, which the linker should otherwise ignore.  */
+
+static bfd_reloc_status_type
+v850_elf_ignore_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+		       arelent *reloc_entry,
+		       asymbol *symbol ATTRIBUTE_UNUSED,
+		       void * data ATTRIBUTE_UNUSED,
+		       asection *input_section,
+		       bfd *output_bfd,
+		       char **error_message ATTRIBUTE_UNUSED)
+{
+  if (output_bfd != NULL)
+    reloc_entry->address += input_section->output_offset;
+
+  return bfd_reloc_ok;
+}
+/* Note: It is REQUIRED that the 'type' value of each entry
+   in this array match the index of the entry in the array.
+   SeeAlso: RELOC_NUBMER in include/elf/v850.h  */
+static reloc_howto_type v850_elf_howto_table[] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_V850_NONE,			/* Type.  */
+	 0,				/* Rightshift.  */
+	 2,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_bitfield,	/* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc,		/* Special_function.  */
+	 "R_V850_NONE",			/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0,				/* Src_mask.  */
+	 0,				/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* A PC relative 9 bit branch.  */
+  HOWTO (R_V850_9_PCREL,		/* Type.  */
+	 0,				/* Rightshift.  */
+	 1,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 9,				/* Bitsize.  */
+	 TRUE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_bitfield,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_9_PCREL",		/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0x00ffffff,			/* Src_mask.  */
+	 0x00ffffff,			/* Dst_mask.  */
+	 TRUE),				/* PCrel_offset.  */
+
+  /* A PC relative 22 bit branch.  */
+  HOWTO (R_V850_22_PCREL,		/* Type.  */
+	 0,				/* Rightshift.  */
+	 2,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 22,				/* Bitsize.  */
+	 TRUE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_signed,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_22_PCREL",		/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0x07ffff80,			/* Src_mask.  */
+	 0x07ffff80,			/* Dst_mask.  */
+	 TRUE),				/* PCrel_offset.  */
+
+  /* High 16 bits of symbol value.  */
+  HOWTO (R_V850_HI16_S,			/* Type.  */
+	 0,				/* Rightshift.  */
+	 1,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_HI16_S",		/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0xffff,			/* Src_mask.  */
+	 0xffff,			/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* High 16 bits of symbol value.  */
+  HOWTO (R_V850_HI16,			/* Type.  */
+	 0,				/* Rightshift.  */
+	 1,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_HI16",			/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0xffff,			/* Src_mask.  */
+	 0xffff,			/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* Low 16 bits of symbol value.  */
+  HOWTO (R_V850_LO16,			/* Type.  */
+	 0,				/* Rightshift.  */
+	 1,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_LO16",			/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0xffff,			/* Src_mask.  */
+	 0xffff,			/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* Simple 32bit reloc.  */
+  HOWTO (R_V850_ABS32,			/* Type.  */
+	 0,				/* Rightshift.  */
+	 2,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_ABS32",		/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0xffffffff,			/* Src_mask.  */
+	 0xffffffff,			/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* Simple 16bit reloc.  */
+  HOWTO (R_V850_16,			/* Type.  */
+	 0,				/* Rightshift.  */
+	 1,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc,		/* Special_function.  */
+	 "R_V850_16",			/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0xffff,			/* Src_mask.  */
+	 0xffff,			/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* Simple 8bit reloc.	 */
+  HOWTO (R_V850_8,			/* Type.  */
+	 0,				/* Rightshift.  */
+	 0,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 8,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc,		/* Special_function.  */
+	 "R_V850_8",			/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0xff,				/* Src_mask.  */
+	 0xff,				/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* 16 bit offset from the short data area pointer.  */
+  HOWTO (R_V850_SDA_16_16_OFFSET,	/* Type.  */
+	 0,				/* Rightshift.  */
+	 1,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_SDA_16_16_OFFSET",	/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0xffff,			/* Src_mask.  */
+	 0xffff,			/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* 15 bit offset from the short data area pointer.  */
+  HOWTO (R_V850_SDA_15_16_OFFSET,	/* Type.  */
+	 1,				/* Rightshift.  */
+	 1,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 1,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_SDA_15_16_OFFSET",	/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0xfffe,			/* Src_mask.  */
+	 0xfffe,			/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* 16 bit offset from the zero data area pointer.  */
+  HOWTO (R_V850_ZDA_16_16_OFFSET,	/* Type.  */
+	 0,				/* Rightshift.  */
+	 1,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_ZDA_16_16_OFFSET",	/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0xffff,			/* Src_mask.  */
+	 0xffff,			/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* 15 bit offset from the zero data area pointer.  */
+  HOWTO (R_V850_ZDA_15_16_OFFSET,	/* Type.  */
+	 1,				/* Rightshift.  */
+	 1,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 1,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_ZDA_15_16_OFFSET",	/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0xfffe,			/* Src_mask.  */
+	 0xfffe,			/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* 6 bit offset from the tiny data area pointer.  */
+  HOWTO (R_V850_TDA_6_8_OFFSET,		/* Type.  */
+	 2,				/* Rightshift.  */
+	 1,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 8,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 1,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_TDA_6_8_OFFSET",	/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0x7e,				/* Src_mask.  */
+	 0x7e,				/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* 8 bit offset from the tiny data area pointer.  */
+  HOWTO (R_V850_TDA_7_8_OFFSET,		/* Type.  */
+	 1,				/* Rightshift.  */
+	 1,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 8,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_TDA_7_8_OFFSET",	/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0x7f,				/* Src_mask.  */
+	 0x7f,				/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* 7 bit offset from the tiny data area pointer.  */
+  HOWTO (R_V850_TDA_7_7_OFFSET,		/* Type.  */
+	 0,				/* Rightshift.  */
+	 1,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 7,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_TDA_7_7_OFFSET",	/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0x7f,				/* Src_mask.  */
+	 0x7f,				/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* 16 bit offset from the tiny data area pointer!  */
+  HOWTO (R_V850_TDA_16_16_OFFSET,	/* Type.  */
+	 0,				/* Rightshift.  */
+	 1,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_TDA_16_16_OFFSET",	/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0xffff,			/* Src_mask.  */
+	 0xfff,				/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* 5 bit offset from the tiny data area pointer.  */
+  HOWTO (R_V850_TDA_4_5_OFFSET,		/* Type.  */
+	 1,				/* Rightshift.  */
+	 1,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 5,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_TDA_4_5_OFFSET",	/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0x0f,				/* Src_mask.  */
+	 0x0f,				/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* 4 bit offset from the tiny data area pointer.  */
+  HOWTO (R_V850_TDA_4_4_OFFSET,		/* Type.  */
+	 0,				/* Rightshift.  */
+	 1,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 4,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_TDA_4_4_OFFSET",	/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0x0f,				/* Src_mask.  */
+	 0x0f,				/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* 16 bit offset from the short data area pointer.  */
+  HOWTO (R_V850_SDA_16_16_SPLIT_OFFSET,	/* Type.  */
+	 0,				/* Rightshift.  */
+	 2,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_SDA_16_16_SPLIT_OFFSET",/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0xfffe0020,			/* Src_mask.  */
+	 0xfffe0020,			/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* 16 bit offset from the zero data area pointer.  */
+  HOWTO (R_V850_ZDA_16_16_SPLIT_OFFSET,	/* Type.  */
+	 0,				/* Rightshift.  */
+	 2,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_ZDA_16_16_SPLIT_OFFSET",/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0xfffe0020,			/* Src_mask.  */
+	 0xfffe0020,			/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* 6 bit offset from the call table base pointer.  */
+  HOWTO (R_V850_CALLT_6_7_OFFSET,	/* Type.  */
+	 0,				/* Rightshift.  */
+	 1,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 7,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_CALLT_6_7_OFFSET",	/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0x3f,				/* Src_mask.  */
+	 0x3f,				/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* 16 bit offset from the call table base pointer.  */
+  HOWTO (R_V850_CALLT_16_16_OFFSET,	/* Type.  */
+	 0,				/* Rightshift.  */
+	 1,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_CALLT_16_16_OFFSET",	/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0xffff,			/* Src_mask.  */
+	 0xffff,			/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+
+  /* GNU extension to record C++ vtable hierarchy */
+  HOWTO (R_V850_GNU_VTINHERIT, /* Type.  */
+	 0,                     /* Rightshift.  */
+	 2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+	 0,                     /* Bitsize.  */
+	 FALSE,                 /* PC_relative.  */
+	 0,                     /* Bitpos.  */
+	 complain_overflow_dont, /* Complain_on_overflow.  */
+	 NULL,                  /* Special_function.  */
+	 "R_V850_GNU_VTINHERIT", /* Name.  */
+	 FALSE,                 /* Partial_inplace.  */
+	 0,                     /* Src_mask.  */
+	 0,                     /* Dst_mask.  */
+	 FALSE),                /* PCrel_offset.  */
+
+  /* GNU extension to record C++ vtable member usage.  */
+  HOWTO (R_V850_GNU_VTENTRY,     /* Type.  */
+	 0,                     /* Rightshift.  */
+	 2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+	 0,                     /* Bitsize.  */
+	 FALSE,                 /* PC_relative.  */
+	 0,                     /* Bitpos.  */
+	 complain_overflow_dont, /* Complain_on_overflow.  */
+	 _bfd_elf_rel_vtable_reloc_fn,  /* Special_function.  */
+	 "R_V850_GNU_VTENTRY",   /* Name.  */
+	 FALSE,                 /* Partial_inplace.  */
+	 0,                     /* Src_mask.  */
+	 0,                     /* Dst_mask.  */
+	 FALSE),                /* PCrel_offset.  */
+
+  /* Indicates a .longcall pseudo-op.  The compiler will generate a .longcall
+     pseudo-op when it finds a function call which can be relaxed.  */
+  HOWTO (R_V850_LONGCALL,     /* Type.  */
+	 0,                     /* Rightshift.  */
+	 2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,                    /* Bitsize.  */
+	 TRUE,                  /* PC_relative.  */
+	 0,                     /* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 v850_elf_ignore_reloc, /* Special_function.  */
+	 "R_V850_LONGCALL",     /* Name.  */
+	 FALSE,                 /* Partial_inplace.  */
+	 0,                     /* Src_mask.  */
+	 0,                     /* Dst_mask.  */
+	 TRUE),                 /* PCrel_offset.  */
+
+  /* Indicates a .longjump pseudo-op.  The compiler will generate a
+     .longjump pseudo-op when it finds a branch which can be relaxed.  */
+  HOWTO (R_V850_LONGJUMP,     /* Type.  */
+	 0,                     /* Rightshift.  */
+	 2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,                    /* Bitsize.  */
+	 TRUE,                  /* PC_relative.  */
+	 0,                     /* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 v850_elf_ignore_reloc, /* Special_function.  */
+	 "R_V850_LONGJUMP",     /* Name.  */
+	 FALSE,                 /* Partial_inplace.  */
+	 0,                     /* Src_mask.  */
+	 0,                     /* Dst_mask.  */
+	 TRUE),                 /* PCrel_offset.  */
+
+  HOWTO (R_V850_ALIGN,        /* Type.  */
+	 0,                     /* Rightshift.  */
+	 1,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+	 0,                     /* Bitsize.  */
+	 FALSE,                 /* PC_relative.  */
+	 0,                     /* Bitpos.  */
+	 complain_overflow_unsigned, /* Complain_on_overflow.  */
+	 v850_elf_ignore_reloc, /* Special_function.  */
+	 "R_V850_ALIGN",        /* Name.  */
+	 FALSE,                 /* Partial_inplace.  */
+	 0,                     /* Src_mask.  */
+	 0,                     /* Dst_mask.  */
+	 TRUE),                 /* PCrel_offset.  */
+
+  /* Simple pc-relative 32bit reloc.  */
+  HOWTO (R_V850_REL32,			/* Type.  */
+	 0,				/* Rightshift.  */
+	 2,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,				/* Bitsize.  */
+	 TRUE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_REL32",		/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0xffffffff,			/* Src_mask.  */
+	 0xffffffff,			/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* An ld.bu version of R_V850_LO16.  */
+  HOWTO (R_V850_LO16_SPLIT_OFFSET,	/* Type.  */
+	 0,				/* Rightshift.  */
+	 2,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_LO16_SPLIT_OFFSET",	/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0xfffe0020,			/* Src_mask.  */
+	 0xfffe0020,			/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* A unsigned PC relative 16 bit loop.  */
+  HOWTO (R_V850_16_PCREL,		/* Type.  */
+	 0,				/* Rightshift.  */
+	 1,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,				/* Bitsize.  */
+	 TRUE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_bitfield,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_16_PCREL",		/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0xfffe,			/* Src_mask.  */
+	 0xfffe,			/* Dst_mask.  */
+	 TRUE),				/* PCrel_offset.  */
+
+  /* A PC relative 17 bit branch.  */
+  HOWTO (R_V850_17_PCREL,		/* Type.  */
+	 0,				/* Rightshift.  */
+	 2,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 17,				/* Bitsize.  */
+	 TRUE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_bitfield,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_17_PCREL",		/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0x0010fffe,			/* Src_mask.  */
+	 0x0010fffe,			/* Dst_mask.  */
+	 TRUE),				/* PCrel_offset.  */
+
+  /* A 23bit offset ld/st.  */
+  HOWTO (R_V850_23,			/* type.  */
+	 0,				/* rightshift.  */
+	 2,				/* size (0 = byte, 1 = short, 2 = long).  */
+	 23,				/* bitsize.  */
+	 FALSE,				/* pc_relative.  */
+	 0,				/* bitpos.  */
+	 complain_overflow_dont,	/* complain_on_overflow.  */
+	 v850_elf_reloc,		/* special_function.  */
+	 "R_V850_23",			/* name.  */
+	 FALSE,				/* partial_inplace.  */
+	 0xffff07f0,			/* src_mask.  */
+	 0xffff07f0,			/* dst_mask.  */
+	 FALSE),			/* pcrel_offset.  */
+
+  /* A PC relative 32 bit branch.  */
+  HOWTO (R_V850_32_PCREL,		/* type.  */
+	 1,				/* rightshift.  */
+	 2,				/* size (0 = byte, 1 = short, 2 = long).  */
+	 32,				/* bitsize.  */
+	 TRUE,				/* pc_relative.  */
+	 1,				/* bitpos.  */
+	 complain_overflow_signed,	/* complain_on_overflow.  */
+	 v850_elf_reloc,		/* special_function.  */
+	 "R_V850_32_PCREL",		/* name.  */
+	 FALSE,				/* partial_inplace.  */
+	 0xfffffffe,			/* src_mask.  */
+	 0xfffffffe,			/* dst_mask.  */
+	 TRUE),				/* pcrel_offset.  */
+
+  /* A absolute 32 bit branch.	*/
+  HOWTO (R_V850_32_ABS,			/* type.  */
+	 1,				/* rightshift.  */
+	 2,				/* size (0 = byte, 1 = short, 2 = long).  */
+	 32,				/* bitsize.  */
+	 TRUE,				/* pc_relative.  */
+	 1,				/* bitpos.  */
+	 complain_overflow_signed,	/* complain_on_overflow.  */
+	 v850_elf_reloc,		/* special_function.  */
+	 "R_V850_32_ABS",		/* name.  */
+	 FALSE,				/* partial_inplace.  */
+	 0xfffffffe,			/* src_mask.  */
+	 0xfffffffe,			/* dst_mask.  */
+	 FALSE),			/* pcrel_offset.  */
+
+  /* High 16 bits of symbol value.  */
+  HOWTO (R_V850_HI16,			/* Type.  */
+	 0,				/* Rightshift.  */
+	 1,				/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,				/* Bitsize.  */
+	 FALSE,				/* PC_relative.  */
+	 0,				/* Bitpos.  */
+	 complain_overflow_dont,	/* Complain_on_overflow.  */
+	 v850_elf_reloc,		/* Special_function.  */
+	 "R_V850_HI16",			/* Name.  */
+	 FALSE,				/* Partial_inplace.  */
+	 0xffff,			/* Src_mask.  */
+	 0xffff,			/* Dst_mask.  */
+	 FALSE),			/* PCrel_offset.  */
+
+  /* Low 16 bits of symbol value.  */
+  HOWTO (R_V850_16_S1,			/* type.  */
+	 1,				/* rightshift.  */
+	 1,				/* size (0 = byte, 1 = short, 2 = long).  */
+	 16,				/* bitsize.  */
+	 FALSE,				/* pc_relative.  */
+	 1,				/* bitpos.  */
+	 complain_overflow_dont,	/* complain_on_overflow.  */
+	 v850_elf_reloc,		/* special_function.  */
+	 "R_V850_16_S1",		/* name.  */
+	 FALSE,				/* partial_inplace.  */
+	 0xfffe,			/* src_mask.  */
+	 0xfffe,			/* dst_mask.  */
+	 FALSE),			/* pcrel_offset.  */
+
+  /* Low 16 bits of symbol value.  */
+  HOWTO (R_V850_LO16_S1,		/* type.  */
+	 1,				/* rightshift.  */
+	 1,				/* size (0 = byte, 1 = short, 2 = long).  */
+	 16,				/* bitsize.  */
+	 FALSE,				/* pc_relative.  */
+	 1,				/* bitpos.  */
+	 complain_overflow_dont,	/* complain_on_overflow.  */
+	 v850_elf_reloc,		/* special_function.  */
+	 "R_V850_LO16_S1",		/* name.  */
+	 FALSE,				/* partial_inplace.  */
+	 0xfffe,			/* src_mask.  */
+	 0xfffe,			/* dst_mask.  */
+	 FALSE),			/* pcrel_offset.  */
+
+  /* 16 bit offset from the call table base pointer.  */
+  HOWTO (R_V850_CALLT_15_16_OFFSET,	/* type.  */
+	 1,				/* rightshift.  */
+	 1,				/* size (0 = byte, 1 = short, 2 = long).  */
+	 16,				/* bitsize.  */
+	 FALSE,				/* pc_relative.  */
+	 1,				/* bitpos.  */
+	 complain_overflow_dont,	/* complain_on_overflow.  */
+	 v850_elf_reloc,		/* special_function.  */
+	 "R_V850_CALLT_15_16_OFFSET",	/* name.  */
+	 FALSE,				/* partial_inplace.  */
+	 0xfffe,			/* src_mask.  */
+	 0xfffe,			/* dst_mask.  */
+	 FALSE),			/* pcrel_offset.  */
+
+  /* Like R_V850_32 PCREL, but referring to the GOT table entry for
+     the symbol.  */
+  HOWTO (R_V850_32_GOTPCREL,		/* type.  */
+	 0,				/* rightshift.  */
+	 2,				/* size (0 = byte, 1 = short, 2 = long).  */
+	 32,				/* bitsize.  */
+	 TRUE,				/* pc_relative.  */
+	 0,				/* bitpos.  */
+	 complain_overflow_unsigned,	/* complain_on_overflow.  */
+	 v850_elf_reloc,		/* special_function.  */
+	 "R_V850_32_GOTPCREL",		/* name.  */
+	 FALSE,				/* partial_inplace.  */
+	 0xffffffff,			/* src_mask.  */
+	 0xffffffff,			/* dst_mask.  */
+	 TRUE),				/* pcrel_offset.  */
+
+  /* Like R_V850_SDA_, but referring to the GOT table entry for
+     the symbol.  */
+  HOWTO (R_V850_16_GOT,			/* type.  */
+	 0,				/* rightshift.  */
+	 2,				/* size (0 = byte, 1 = short, 2 = long).  */
+	 16,				/* bitsize.  */
+	 FALSE,				/* pc_relative.  */
+	 0,				/* bitpos.  */
+	 complain_overflow_unsigned,	/* complain_on_overflow.  */
+	 bfd_elf_generic_reloc,		/* special_function.  */
+	 "R_V850_16_GOT",		/* name.  */
+	 FALSE,				/* partial_inplace.  */
+	 0xffff,			/* src_mask.  */
+	 0xffff,			/* dst_mask.  */
+	 FALSE),			/* pcrel_offset.  */
+
+  HOWTO (R_V850_32_GOT,			/* type.  */
+	 0,				/* rightshift.  */
+	 2,				/* size (0 = byte, 1 = short, 2 = long).  */
+	 32,				/* bitsize.  */
+	 FALSE,				/* pc_relative.  */
+	 0,				/* bitpos.  */
+	 complain_overflow_unsigned,	/* complain_on_overflow.  */
+	 bfd_elf_generic_reloc,		/* special_function.  */
+	 "R_V850_32_GOT",		/* name.  */
+	 FALSE,				/* partial_inplace.  */
+	 0xffffffff,			/* src_mask.  */
+	 0xffffffff,			/* dst_mask.  */
+	 FALSE),			/* pcrel_offset.  */
+
+  /* Like R_V850_22_PCREL, but referring to the procedure linkage table
+     entry for the symbol.  */
+  HOWTO (R_V850_22_PLT,			/* type.  */
+	 1,				/* rightshift.  */
+	 2,				/* size (0 = byte, 1 = short, 2 = long).  */
+	 22,				/* bitsize.  */
+	 TRUE,				/* pc_relative.  */
+	 7,				/* bitpos.  */
+	 complain_overflow_signed,	/* complain_on_overflow.  */
+	 bfd_elf_generic_reloc,		/* special_function.  */
+	 "R_V850_22_PLT",		/* name.  */
+	 FALSE,				/* partial_inplace.  */
+	 0x07ffff80,			/* src_mask.  */
+	 0x07ffff80,			/* dst_mask.  */
+	 TRUE),				/* pcrel_offset.  */
+
+  HOWTO (R_V850_32_PLT,			/* type.  */
+	 1,				/* rightshift.  */
+	 2,				/* size (0 = byte, 1 = short, 2 = long).  */
+	 32,				/* bitsize.  */
+	 TRUE,				/* pc_relative.  */
+	 1,				/* bitpos.  */
+	 complain_overflow_signed,	/* complain_on_overflow.  */
+	 bfd_elf_generic_reloc,		/* special_function.  */
+	 "R_V850_32_PLT",		/* name.  */
+	 FALSE,				/* partial_inplace.  */
+	 0xffffffff,			/* src_mask.  */
+	 0xffffffff,			/* dst_mask.  */
+	 TRUE),				/* pcrel_offset.  */
+
+  /* This is used only by the dynamic linker.  The symbol should exist
+     both in the object being run and in some shared library.  The
+     dynamic linker copies the data addressed by the symbol from the
+     shared library into the object, because the object being
+     run has to have the data at some particular address.  */
+  HOWTO (R_V850_COPY,			/* type.  */
+	 0,				/* rightshift.  */
+	 2,				/* size (0 = byte, 1 = short, 2 = long).  */
+	 32,				/* bitsize.  */
+	 FALSE,				/* pc_relative.  */
+	 0,				/* bitpos.  */
+	 complain_overflow_bitfield,	/* complain_on_overflow.  */
+	 bfd_elf_generic_reloc,		/* special_function.  */
+	 "R_V850_COPY",			/* name.  */
+	 FALSE,				/* partial_inplace.  */
+	 0xffffffff,			/* src_mask.  */
+	 0xffffffff,			/* dst_mask.  */
+	 FALSE),			/* pcrel_offset.  */
+
+  /* Like R_M32R_24, but used when setting global offset table
+     entries.  */
+  HOWTO (R_V850_GLOB_DAT,		/* type.  */
+	 0,				/* rightshift.  */
+	 2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 32,				/* bitsize.  */
+	 FALSE,				/* pc_relative.  */
+	 0,				/* bitpos.  */
+	 complain_overflow_bitfield,	/* complain_on_overflow.  */
+	 bfd_elf_generic_reloc,		/* special_function.  */
+	 "R_V850_GLOB_DAT",		/* name.  */
+	 FALSE,				/* partial_inplace.  */
+	 0xffffffff,			/* src_mask.  */
+	 0xffffffff,			/* dst_mask.  */
+	 FALSE),			/* pcrel_offset.  */
+
+  /* Marks a procedure linkage table entry for a symbol.  */
+  HOWTO (R_V850_JMP_SLOT,		/* type.  */
+	 0,				/* rightshift.  */
+	 2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 32,				/* bitsize.  */
+	 FALSE,				/* pc_relative.  */
+	 0,				/* bitpos.  */
+	 complain_overflow_bitfield,	/* complain_on_overflow.  */
+	 bfd_elf_generic_reloc,		/* special_function.  */
+	 "R_V850_JMP_SLOT",		/* name.  */
+	 FALSE,				/* partial_inplace.  */
+	 0xffffffff,			/* src_mask.  */
+	 0xffffffff,			/* dst_mask.  */
+	 FALSE),			/* pcrel_offset.  */
+
+  /* Used only by the dynamic linker.  When the object is run, this
+     longword is set to the load address of the object, plus the
+     addend.  */
+  HOWTO (R_V850_RELATIVE,		/* type.  */
+	 0,				/* rightshift.  */
+	 2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 32,				/* bitsize.  */
+	 FALSE,				/* pc_relative.  */
+	 0,				/* bitpos.  */
+	 complain_overflow_bitfield,	/* complain_on_overflow.  */
+	 bfd_elf_generic_reloc,		/* special_function.  */
+	 "R_V850_RELATIVE",		/* name.  */
+	 FALSE,				/* partial_inplace.  */
+	 0xffffffff,			/* src_mask.  */
+	 0xffffffff,			/* dst_mask.  */
+	 FALSE),			/* pcrel_offset.  */
+
+  HOWTO (R_V850_16_GOTOFF,		/* type.  */
+	 0,				/* rightshift.  */
+	 2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 16,				/* bitsize.  */
+	 FALSE,				/* pc_relative.  */
+	 0,				/* bitpos.  */
+	 complain_overflow_bitfield,	/* complain_on_overflow.  */
+	 bfd_elf_generic_reloc,		/* special_function.  */
+	 "R_V850_16_GOTOFF",		/* name.  */
+	 FALSE,				/* partial_inplace.  */
+	 0xffff,			/* src_mask.  */
+	 0xffff,			/* dst_mask.  */
+	 FALSE),			/* pcrel_offset.  */
+
+  HOWTO (R_V850_32_GOTOFF,		/* type.  */
+	 0,				/* rightshift.  */
+	 2,				/* size (0 = byte, 1 = short, 2 = long) */
+	 32,				/* bitsize.  */
+	 FALSE,				/* pc_relative.  */
+	 0,				/* bitpos.  */
+	 complain_overflow_bitfield,	/* complain_on_overflow.  */
+	 bfd_elf_generic_reloc,		/* special_function.  */
+	 "R_V850_32_GOTOFF",		/* name.  */
+	 FALSE,				/* partial_inplace.  */
+	 0xffffffff,			/* src_mask.  */
+	 0xffffffff,			/* dst_mask.  */
+	 FALSE),			/* pcrel_offset.  */
+
+  HOWTO (R_V850_CODE,			/* type.  */
+	 0,				/* rightshift.  */
+	 1,				/* size (0 = byte, 1 = short, 2 = long) */
+	 0,				/* bitsize.  */
+	 FALSE,				/* pc_relative.  */
+	 0,				/* bitpos.  */
+	 complain_overflow_unsigned,	/* complain_on_overflow.  */
+	 v850_elf_ignore_reloc,		/* special_function.  */
+	 "R_V850_CODE",			/* name.  */
+	 FALSE,				/* partial_inplace.  */
+	 0,				/* src_mask.  */
+	 0,				/* dst_mask.  */
+	 TRUE),				/* pcrel_offset.  */
+
+  HOWTO (R_V850_DATA,			/* type.  */
+	 0,				/* rightshift.  */
+	 1,				/* size (0 = byte, 1 = short, 2 = long) */
+	 0,				/* bitsize.  */
+	 FALSE,				/* pc_relative.  */
+	 0,				/* bitpos.  */
+	 complain_overflow_unsigned,	/* complain_on_overflow.  */
+	 v850_elf_ignore_reloc,		/* special_function.  */
+	 "R_V850_DATA",			/* name.  */
+	 FALSE,				/* partial_inplace.  */
+	 0,				/* src_mask.  */
+	 0,				/* dst_mask.  */
+	 TRUE),				/* pcrel_offset.  */
+
+};
+
+/* Map BFD reloc types to V850 ELF reloc types.  */
+
+struct v850_elf_reloc_map
+{
+  /* BFD_RELOC_V850_CALLT_16_16_OFFSET is 258, which will not fix in an
+     unsigned char.  */
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned int elf_reloc_val;
+};
+
+static const struct v850_elf_reloc_map v850_elf_reloc_map[] =
+{
+  { BFD_RELOC_NONE,                        R_V850_NONE                   },
+  { BFD_RELOC_V850_9_PCREL,                R_V850_9_PCREL                },
+  { BFD_RELOC_V850_22_PCREL,               R_V850_22_PCREL               },
+  { BFD_RELOC_HI16_S,                      R_V850_HI16_S                 },
+  { BFD_RELOC_HI16,                        R_V850_HI16                   },
+  { BFD_RELOC_LO16,                        R_V850_LO16                   },
+  { BFD_RELOC_32,                          R_V850_ABS32                  },
+  { BFD_RELOC_32_PCREL,                    R_V850_REL32                  },
+  { BFD_RELOC_16,                          R_V850_16                     },
+  { BFD_RELOC_8,                           R_V850_8                      },
+  { BFD_RELOC_V850_SDA_16_16_OFFSET,       R_V850_SDA_16_16_OFFSET       },
+  { BFD_RELOC_V850_SDA_15_16_OFFSET,       R_V850_SDA_15_16_OFFSET       },
+  { BFD_RELOC_V850_ZDA_16_16_OFFSET,       R_V850_ZDA_16_16_OFFSET       },
+  { BFD_RELOC_V850_ZDA_15_16_OFFSET,       R_V850_ZDA_15_16_OFFSET       },
+  { BFD_RELOC_V850_TDA_6_8_OFFSET,         R_V850_TDA_6_8_OFFSET         },
+  { BFD_RELOC_V850_TDA_7_8_OFFSET,         R_V850_TDA_7_8_OFFSET         },
+  { BFD_RELOC_V850_TDA_7_7_OFFSET,         R_V850_TDA_7_7_OFFSET         },
+  { BFD_RELOC_V850_TDA_16_16_OFFSET,       R_V850_TDA_16_16_OFFSET       },
+  { BFD_RELOC_V850_TDA_4_5_OFFSET,         R_V850_TDA_4_5_OFFSET         },
+  { BFD_RELOC_V850_TDA_4_4_OFFSET,         R_V850_TDA_4_4_OFFSET         },
+  { BFD_RELOC_V850_LO16_SPLIT_OFFSET,      R_V850_LO16_SPLIT_OFFSET      },
+  { BFD_RELOC_V850_SDA_16_16_SPLIT_OFFSET, R_V850_SDA_16_16_SPLIT_OFFSET },
+  { BFD_RELOC_V850_ZDA_16_16_SPLIT_OFFSET, R_V850_ZDA_16_16_SPLIT_OFFSET },
+  { BFD_RELOC_V850_CALLT_6_7_OFFSET,       R_V850_CALLT_6_7_OFFSET       },
+  { BFD_RELOC_V850_CALLT_16_16_OFFSET,     R_V850_CALLT_16_16_OFFSET     },
+  { BFD_RELOC_VTABLE_INHERIT,              R_V850_GNU_VTINHERIT          },
+  { BFD_RELOC_VTABLE_ENTRY,                R_V850_GNU_VTENTRY            },
+  { BFD_RELOC_V850_LONGCALL,               R_V850_LONGCALL               },
+  { BFD_RELOC_V850_LONGJUMP,               R_V850_LONGJUMP               },
+  { BFD_RELOC_V850_ALIGN,                  R_V850_ALIGN                  },
+  { BFD_RELOC_V850_16_PCREL,               R_V850_16_PCREL               },
+  { BFD_RELOC_V850_17_PCREL,               R_V850_17_PCREL               },
+  { BFD_RELOC_V850_23,                     R_V850_23                     },
+  { BFD_RELOC_V850_32_PCREL,               R_V850_32_PCREL               },
+  { BFD_RELOC_V850_32_ABS,                 R_V850_32_ABS                 },
+  { BFD_RELOC_V850_16_SPLIT_OFFSET,        R_V850_HI16                   },
+  { BFD_RELOC_V850_16_S1,                  R_V850_16_S1                  },
+  { BFD_RELOC_V850_LO16_S1,                R_V850_LO16_S1                },
+  { BFD_RELOC_V850_CALLT_15_16_OFFSET,     R_V850_CALLT_15_16_OFFSET     },
+  { BFD_RELOC_V850_32_GOTPCREL,            R_V850_32_GOTPCREL            },
+  { BFD_RELOC_V850_16_GOT,                 R_V850_16_GOT                 },
+  { BFD_RELOC_V850_32_GOT,                 R_V850_32_GOT                 },
+  { BFD_RELOC_V850_22_PLT_PCREL,           R_V850_22_PLT                 },
+  { BFD_RELOC_V850_32_PLT_PCREL,           R_V850_32_PLT                 },
+  { BFD_RELOC_V850_COPY,                   R_V850_COPY                   },
+  { BFD_RELOC_V850_GLOB_DAT,               R_V850_GLOB_DAT               },
+  { BFD_RELOC_V850_JMP_SLOT,               R_V850_JMP_SLOT               },
+  { BFD_RELOC_V850_RELATIVE,               R_V850_RELATIVE               },
+  { BFD_RELOC_V850_16_GOTOFF,              R_V850_16_GOTOFF              },
+  { BFD_RELOC_V850_32_GOTOFF,              R_V850_32_GOTOFF              },
+  { BFD_RELOC_V850_CODE,                   R_V850_CODE                   },
+  { BFD_RELOC_V850_DATA,                   R_V850_DATA                   },
+};
+
+/* Map a bfd relocation into the appropriate howto structure.  */
+
+static reloc_howto_type *
+v850_elf_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = ARRAY_SIZE (v850_elf_reloc_map); i --;)
+    if (v850_elf_reloc_map[i].bfd_reloc_val == code)
+      {
+	unsigned int elf_reloc_val = v850_elf_reloc_map[i].elf_reloc_val;
+
+	BFD_ASSERT (v850_elf_howto_table[elf_reloc_val].type == elf_reloc_val);
+
+	return v850_elf_howto_table + elf_reloc_val;
+      }
+
+  return NULL;
+}
+
+static reloc_howto_type *
+v850_elf_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (v850_elf_howto_table) / sizeof (v850_elf_howto_table[0]);
+       i++)
+    if (v850_elf_howto_table[i].name != NULL
+	&& strcasecmp (v850_elf_howto_table[i].name, r_name) == 0)
+      return &v850_elf_howto_table[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for an V850 ELF reloc.  */
+
+static void
+v850_elf_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+			    arelent *cache_ptr,
+			    Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_V850_max);
+  cache_ptr->howto = &v850_elf_howto_table[r_type];
+}
+
+/* Set the howto pointer for a V850 ELF reloc (type RELA).  */
+
+static void
+v850_elf_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
+			     arelent * cache_ptr,
+			     Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_V850_max);
+  cache_ptr->howto = &v850_elf_howto_table[r_type];
+}
+
+static bfd_boolean
+v850_elf_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED, const char *name)
+{
+  return (   (name[0] == '.' && (name[1] == 'L' || name[1] == '.'))
+	  || (name[0] == '_' &&  name[1] == '.' && name[2] == 'L' && name[3] == '_'));
+}
+
+/* We overload some of the bfd_reloc error codes for own purposes.  */
+#define bfd_reloc_gp_not_found		bfd_reloc_other
+#define bfd_reloc_ep_not_found		bfd_reloc_continue
+#define bfd_reloc_ctbp_not_found	(bfd_reloc_dangerous + 1)
+
+/* Perform a relocation as part of a final link.  */
+
+static bfd_reloc_status_type
+v850_elf_final_link_relocate (reloc_howto_type *howto,
+			      bfd *input_bfd,
+			      bfd *output_bfd ATTRIBUTE_UNUSED,
+			      asection *input_section,
+			      bfd_byte *contents,
+			      bfd_vma offset,
+			      bfd_vma value,
+			      bfd_vma addend,
+			      struct bfd_link_info *info,
+			      asection *sym_sec,
+			      int is_local ATTRIBUTE_UNUSED)
+{
+  unsigned int r_type = howto->type;
+  bfd_byte *hit_data = contents + offset;
+
+  /* Adjust the value according to the relocation.  */
+  switch (r_type)
+    {
+    case R_V850_9_PCREL:
+      value -= (input_section->output_section->vma
+		+ input_section->output_offset);
+      value -= offset;
+      break;
+
+    case R_V850_16_PCREL:
+      value -= (input_section->output_section->vma
+		+ input_section->output_offset
+		+ offset);
+
+      /* If the sign extension will corrupt the value then we have overflowed.  */
+      if ((value & 0xffff0000) != 0xffff0000)
+	return bfd_reloc_overflow;
+
+      break;
+
+    case R_V850_17_PCREL:
+      value -= (input_section->output_section->vma
+		+ input_section->output_offset
+		+ offset);
+
+      /* If the sign extension will corrupt the value then we have overflowed.  */
+      if (((value & 0xffff0000) != 0x0) && ((value & 0xffff0000) != 0xffff0000))
+	return bfd_reloc_overflow;
+
+      value = SEXT17 (value);
+      break;
+
+    case R_V850_22_PCREL:
+      value -= (input_section->output_section->vma
+		+ input_section->output_offset
+		+ offset);
+
+      /* If the sign extension will corrupt the value then we have overflowed.  */
+      if (((value & 0xffe00000) != 0x0) && ((value & 0xffe00000) != 0xffe00000))
+	return bfd_reloc_overflow;
+
+      /* Only the bottom 22 bits of the PC are valid.  */
+      value = SEXT22 (value);
+      break;
+
+    case R_V850_32_PCREL:
+      value -= (input_section->output_section->vma
+		+ input_section->output_offset
+		+ offset);
+      break;
+
+    case R_V850_32_ABS:
+    case R_V850_23:
+    case R_V850_HI16_S:
+    case R_V850_HI16:
+    case R_V850_LO16:
+    case R_V850_LO16_S1:
+    case R_V850_LO16_SPLIT_OFFSET:
+    case R_V850_16:
+    case R_V850_ABS32:
+    case R_V850_8:
+      break;
+
+    case R_V850_ZDA_15_16_OFFSET:
+    case R_V850_ZDA_16_16_OFFSET:
+    case R_V850_ZDA_16_16_SPLIT_OFFSET:
+      if (sym_sec == NULL)
+	return bfd_reloc_undefined;
+
+      value -= sym_sec->output_section->vma;
+      break;
+
+    case R_V850_SDA_15_16_OFFSET:
+    case R_V850_SDA_16_16_OFFSET:
+    case R_V850_SDA_16_16_SPLIT_OFFSET:
+      {
+	unsigned long                gp;
+	struct bfd_link_hash_entry * h;
+
+	if (sym_sec == NULL)
+	  return bfd_reloc_undefined;
+
+	/* Get the value of __gp.  */
+	h = bfd_link_hash_lookup (info->hash, "__gp", FALSE, FALSE, TRUE);
+	if (h == NULL
+	    || h->type != bfd_link_hash_defined)
+	  return bfd_reloc_gp_not_found;
+
+	gp = (h->u.def.value
+	      + h->u.def.section->output_section->vma
+	      + h->u.def.section->output_offset);
+
+	value -= sym_sec->output_section->vma;
+	value -= (gp - sym_sec->output_section->vma);
+      }
+    break;
+
+    case R_V850_TDA_4_4_OFFSET:
+    case R_V850_TDA_4_5_OFFSET:
+    case R_V850_TDA_7_7_OFFSET:
+    case R_V850_TDA_7_8_OFFSET:
+    case R_V850_TDA_6_8_OFFSET:
+    case R_V850_TDA_16_16_OFFSET:
+      {
+	unsigned long                ep;
+	struct bfd_link_hash_entry * h;
+
+	/* Get the value of __ep.  */
+	h = bfd_link_hash_lookup (info->hash, "__ep", FALSE, FALSE, TRUE);
+	if (h == NULL
+	    || h->type != bfd_link_hash_defined)
+	  return bfd_reloc_ep_not_found;
+
+	ep = (h->u.def.value
+	      + h->u.def.section->output_section->vma
+	      + h->u.def.section->output_offset);
+
+	value -= ep;
+      }
+    break;
+
+    case R_V850_CALLT_6_7_OFFSET:
+      {
+	unsigned long                ctbp;
+	struct bfd_link_hash_entry * h;
+
+	/* Get the value of __ctbp.  */
+	h = bfd_link_hash_lookup (info->hash, "__ctbp", FALSE, FALSE, TRUE);
+	if (h == NULL
+	    || h->type != bfd_link_hash_defined)
+	  return bfd_reloc_ctbp_not_found;
+
+	ctbp = (h->u.def.value
+	      + h->u.def.section->output_section->vma
+	      + h->u.def.section->output_offset);
+	value -= ctbp;
+      }
+    break;
+
+    case R_V850_CALLT_15_16_OFFSET:
+    case R_V850_CALLT_16_16_OFFSET:
+      {
+	unsigned long                ctbp;
+	struct bfd_link_hash_entry * h;
+
+	if (sym_sec == NULL)
+	  return bfd_reloc_undefined;
+
+	/* Get the value of __ctbp.  */
+	h = bfd_link_hash_lookup (info->hash, "__ctbp", FALSE, FALSE, TRUE);
+	if (h == NULL
+	    || h->type != bfd_link_hash_defined)
+	  return bfd_reloc_ctbp_not_found;
+
+	ctbp = (h->u.def.value
+	      + h->u.def.section->output_section->vma
+	      + h->u.def.section->output_offset);
+
+	value -= sym_sec->output_section->vma;
+	value -= (ctbp - sym_sec->output_section->vma);
+      }
+    break;
+
+    case R_V850_NONE:
+    case R_V850_GNU_VTINHERIT:
+    case R_V850_GNU_VTENTRY:
+    case R_V850_LONGCALL:
+    case R_V850_LONGJUMP:
+    case R_V850_ALIGN:
+      return bfd_reloc_ok;
+
+    default:
+      return bfd_reloc_notsupported;
+    }
+
+  /* Perform the relocation.  */
+  return v850_elf_perform_relocation (input_bfd, r_type, value + addend, hit_data);
+}
+
+/* Relocate an V850 ELF section.  */
+
+static bfd_boolean
+v850_elf_relocate_section (bfd *output_bfd,
+			   struct bfd_link_info *info,
+			   bfd *input_bfd,
+			   asection *input_section,
+			   bfd_byte *contents,
+			   Elf_Internal_Rela *relocs,
+			   Elf_Internal_Sym *local_syms,
+			   asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+
+  symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+
+  /* Reset the list of remembered HI16S relocs to empty.  */
+  free_hi16s     = previous_hi16s;
+  previous_hi16s = NULL;
+  hi16s_counter  = 0;
+
+  rel    = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type   = ELF32_R_TYPE (rel->r_info);
+
+      if (r_type == R_V850_GNU_VTENTRY
+          || r_type == R_V850_GNU_VTINHERIT)
+        continue;
+
+      howto = v850_elf_howto_table + r_type;
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc, warned;
+
+	  /* Note - this check is delayed until now as it is possible and
+	     valid to have a file without any symbols but with relocs that
+	     can be processed.  */
+	  if (sym_hashes == NULL)
+	    {
+	      info->callbacks->warning
+		(info, "no hash table available",
+		 NULL, input_bfd, input_section, (bfd_vma) 0);
+
+	      return FALSE;
+	    }
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      /* FIXME: We should use the addend, but the COFF relocations don't.  */
+      r = v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
+					input_section,
+					contents, rel->r_offset,
+					relocation, rel->r_addend,
+					info, sec, h == NULL);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char * name;
+	  const char * msg = NULL;
+
+	  if (h != NULL)
+	    name = h->root.root.string;
+	  else
+	    {
+	      name = (bfd_elf_string_from_elf_section
+		      (input_bfd, symtab_hdr->sh_link, sym->st_name));
+	      if (name == NULL || *name == '\0')
+		name = bfd_section_name (input_bfd, sec);
+	    }
+
+	  switch ((int) r)
+	    {
+	    case bfd_reloc_overflow:
+	      if (! ((*info->callbacks->reloc_overflow)
+		     (info, (h ? &h->root : NULL), name, howto->name,
+		      (bfd_vma) 0, input_bfd, input_section,
+		      rel->r_offset)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_undefined:
+	      if (! ((*info->callbacks->undefined_symbol)
+		     (info, name, input_bfd, input_section,
+		      rel->r_offset, TRUE)))
+		return FALSE;
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      goto common_error;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      goto common_error;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous relocation");
+	      goto common_error;
+
+	    case bfd_reloc_gp_not_found:
+	      msg = _("could not locate special linker symbol __gp");
+	      goto common_error;
+
+	    case bfd_reloc_ep_not_found:
+	      msg = _("could not locate special linker symbol __ep");
+	      goto common_error;
+
+	    case bfd_reloc_ctbp_not_found:
+	      msg = _("could not locate special linker symbol __ctbp");
+	      goto common_error;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      /* fall through */
+
+	    common_error:
+	      if (!((*info->callbacks->warning)
+		    (info, msg, name, input_bfd, input_section,
+		     rel->r_offset)))
+		return FALSE;
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+static asection *
+v850_elf_gc_mark_hook (asection *sec,
+		       struct bfd_link_info *info,
+		       Elf_Internal_Rela *rel,
+		       struct elf_link_hash_entry *h,
+		       Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_V850_GNU_VTINHERIT:
+      case R_V850_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Set the right machine number.  */
+
+static bfd_boolean
+v850_elf_object_p (bfd *abfd)
+{
+  switch (elf_elfheader (abfd)->e_flags & EF_V850_ARCH)
+    {
+    default:
+    case E_V850_ARCH:
+      bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850);
+      break;
+    case E_V850E_ARCH:
+      bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850e);
+      break;
+    case E_V850E1_ARCH:
+      bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850e1);
+      break;
+    case E_V850E2_ARCH:
+      bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850e2);
+      break;
+    case E_V850E2V3_ARCH:
+      bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850e2v3);
+      break;
+    }
+  return TRUE;
+}
+
+/* Store the machine number in the flags field.  */
+
+static void
+v850_elf_final_write_processing (bfd *abfd,
+				 bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  unsigned long val;
+
+  switch (bfd_get_mach (abfd))
+    {
+    default:
+    case bfd_mach_v850:   val = E_V850_ARCH; break;
+    case bfd_mach_v850e:  val = E_V850E_ARCH; break;
+    case bfd_mach_v850e1: val = E_V850E1_ARCH; break;
+    case bfd_mach_v850e2: val = E_V850E2_ARCH;  break;
+    case bfd_mach_v850e2v3: val = E_V850E2V3_ARCH;  break;
+    }
+
+  elf_elfheader (abfd)->e_flags &=~ EF_V850_ARCH;
+  elf_elfheader (abfd)->e_flags |= val;
+}
+
+/* Function to keep V850 specific file flags.  */
+
+static bfd_boolean
+v850_elf_set_private_flags (bfd *abfd, flagword flags)
+{
+  BFD_ASSERT (!elf_flags_init (abfd)
+	      || elf_elfheader (abfd)->e_flags == flags);
+
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
+}
+
+/* Merge backend specific data from an object file
+   to the output object file when linking.  */
+
+static bfd_boolean
+v850_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  flagword out_flags;
+  flagword in_flags;
+
+  if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  in_flags = elf_elfheader (ibfd)->e_flags;
+  out_flags = elf_elfheader (obfd)->e_flags;
+
+  if (! elf_flags_init (obfd))
+    {
+      /* If the input is the default architecture then do not
+	 bother setting the flags for the output architecture,
+	 instead allow future merges to do this.  If no future
+	 merges ever set these flags then they will retain their
+	 unitialised values, which surprise surprise, correspond
+	 to the default values.  */
+      if (bfd_get_arch_info (ibfd)->the_default)
+	return TRUE;
+
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = in_flags;
+
+      if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
+	  && bfd_get_arch_info (obfd)->the_default)
+	return bfd_set_arch_mach (obfd, bfd_get_arch (ibfd), bfd_get_mach (ibfd));
+
+      return TRUE;
+    }
+
+  /* Check flag compatibility.  */
+  if (in_flags == out_flags)
+    return TRUE;
+
+  if ((in_flags & EF_V850_ARCH) != (out_flags & EF_V850_ARCH)
+      && (in_flags & EF_V850_ARCH) != E_V850_ARCH)
+    {
+
+      /* Allow v850e1 binaries to be linked with v850e binaries.
+         Set the output binary to v850e.  */
+      if ((in_flags & EF_V850_ARCH) == E_V850E1_ARCH
+          && (out_flags & EF_V850_ARCH) == E_V850E_ARCH)
+        return TRUE;
+
+      if ((in_flags & EF_V850_ARCH) == E_V850_ARCH
+	  && (out_flags & EF_V850_ARCH) == E_V850E_ARCH)
+	{
+	  elf_elfheader (obfd)->e_flags =
+	    ((out_flags & ~ EF_V850_ARCH) | E_V850E_ARCH);
+	  return TRUE;
+	}
+
+      if (((in_flags & EF_V850_ARCH) == E_V850_ARCH
+	   || (in_flags & EF_V850_ARCH) == E_V850E_ARCH)
+	  && (out_flags & EF_V850_ARCH) == E_V850E2_ARCH)
+	{
+	  elf_elfheader (obfd)->e_flags =
+	    ((out_flags & ~ EF_V850_ARCH) | E_V850E2_ARCH);
+	  return TRUE;
+	}
+
+      if (((in_flags & EF_V850_ARCH) == E_V850_ARCH
+	   || (in_flags & EF_V850_ARCH) == E_V850E_ARCH
+	   || (in_flags & EF_V850_ARCH) == E_V850E2_ARCH)
+	  && (out_flags & EF_V850_ARCH) == E_V850E2V3_ARCH)
+	{
+	  elf_elfheader (obfd)->e_flags =
+	    ((out_flags & ~ EF_V850_ARCH) | E_V850E2V3_ARCH);
+	  return TRUE;
+	}
+
+      _bfd_error_handler (_("%B: Architecture mismatch with previous modules"),
+			  ibfd);
+    }
+
+  return TRUE;
+}
+
+/* Display the flags field.  */
+
+static bfd_boolean
+v850_elf_print_private_bfd_data (bfd *abfd, void * ptr)
+{
+  FILE * file = (FILE *) ptr;
+
+  BFD_ASSERT (abfd != NULL && ptr != NULL);
+
+  _bfd_elf_print_private_bfd_data (abfd, ptr);
+
+  /* xgettext:c-format.  */
+  fprintf (file, _("private flags = %lx: "), elf_elfheader (abfd)->e_flags);
+
+  switch (elf_elfheader (abfd)->e_flags & EF_V850_ARCH)
+    {
+    default:
+    case E_V850_ARCH: fprintf (file, _("v850 architecture")); break;
+    case E_V850E_ARCH: fprintf (file, _("v850e architecture")); break;
+    case E_V850E1_ARCH: fprintf (file, _("v850e1 architecture")); break;
+    case E_V850E2_ARCH: fprintf (file, _("v850e2 architecture")); break;
+    case E_V850E2V3_ARCH: fprintf (file, _("v850e2v3 architecture")); break;
+    }
+
+  fputc ('\n', file);
+
+  return TRUE;
+}
+
+/* V850 ELF uses four common sections.  One is the usual one, and the
+   others are for (small) objects in one of the special data areas:
+   small, tiny and zero.  All the objects are kept together, and then
+   referenced via the gp register, the ep register or the r0 register
+   respectively, which yields smaller, faster assembler code.  This
+   approach is copied from elf32-mips.c.  */
+
+static asection  v850_elf_scom_section;
+static asymbol   v850_elf_scom_symbol;
+static asymbol * v850_elf_scom_symbol_ptr;
+static asection  v850_elf_tcom_section;
+static asymbol   v850_elf_tcom_symbol;
+static asymbol * v850_elf_tcom_symbol_ptr;
+static asection  v850_elf_zcom_section;
+static asymbol   v850_elf_zcom_symbol;
+static asymbol * v850_elf_zcom_symbol_ptr;
+
+/* Given a BFD section, try to locate the
+   corresponding ELF section index.  */
+
+static bfd_boolean
+v850_elf_section_from_bfd_section (bfd *abfd ATTRIBUTE_UNUSED,
+				   asection *sec,
+				   int *retval)
+{
+  if (strcmp (bfd_get_section_name (abfd, sec), ".scommon") == 0)
+    *retval = SHN_V850_SCOMMON;
+  else if (strcmp (bfd_get_section_name (abfd, sec), ".tcommon") == 0)
+    *retval = SHN_V850_TCOMMON;
+  else if (strcmp (bfd_get_section_name (abfd, sec), ".zcommon") == 0)
+    *retval = SHN_V850_ZCOMMON;
+  else
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Handle the special V850 section numbers that a symbol may use.  */
+
+static void
+v850_elf_symbol_processing (bfd *abfd, asymbol *asym)
+{
+  elf_symbol_type * elfsym = (elf_symbol_type *) asym;
+  unsigned int indx;
+
+  indx = elfsym->internal_elf_sym.st_shndx;
+
+  /* If the section index is an "ordinary" index, then it may
+     refer to a v850 specific section created by the assembler.
+     Check the section's type and change the index it matches.
+
+     FIXME: Should we alter the st_shndx field as well ?  */
+
+  if (indx < elf_numsections (abfd))
+    switch (elf_elfsections (abfd)[indx]->sh_type)
+      {
+      case SHT_V850_SCOMMON:
+	indx = SHN_V850_SCOMMON;
+	break;
+
+      case SHT_V850_TCOMMON:
+	indx = SHN_V850_TCOMMON;
+	break;
+
+      case SHT_V850_ZCOMMON:
+	indx = SHN_V850_ZCOMMON;
+	break;
+
+      default:
+	break;
+      }
+
+  switch (indx)
+    {
+    case SHN_V850_SCOMMON:
+      if (v850_elf_scom_section.name == NULL)
+	{
+	  /* Initialize the small common section.  */
+	  v850_elf_scom_section.name           = ".scommon";
+	  v850_elf_scom_section.flags          = SEC_IS_COMMON | SEC_ALLOC | SEC_DATA;
+	  v850_elf_scom_section.output_section = & v850_elf_scom_section;
+	  v850_elf_scom_section.symbol         = & v850_elf_scom_symbol;
+	  v850_elf_scom_section.symbol_ptr_ptr = & v850_elf_scom_symbol_ptr;
+	  v850_elf_scom_symbol.name            = ".scommon";
+	  v850_elf_scom_symbol.flags           = BSF_SECTION_SYM;
+	  v850_elf_scom_symbol.section         = & v850_elf_scom_section;
+	  v850_elf_scom_symbol_ptr             = & v850_elf_scom_symbol;
+	}
+      asym->section = & v850_elf_scom_section;
+      asym->value = elfsym->internal_elf_sym.st_size;
+      break;
+
+    case SHN_V850_TCOMMON:
+      if (v850_elf_tcom_section.name == NULL)
+	{
+	  /* Initialize the tcommon section.  */
+	  v850_elf_tcom_section.name           = ".tcommon";
+	  v850_elf_tcom_section.flags          = SEC_IS_COMMON;
+	  v850_elf_tcom_section.output_section = & v850_elf_tcom_section;
+	  v850_elf_tcom_section.symbol         = & v850_elf_tcom_symbol;
+	  v850_elf_tcom_section.symbol_ptr_ptr = & v850_elf_tcom_symbol_ptr;
+	  v850_elf_tcom_symbol.name            = ".tcommon";
+	  v850_elf_tcom_symbol.flags           = BSF_SECTION_SYM;
+	  v850_elf_tcom_symbol.section         = & v850_elf_tcom_section;
+	  v850_elf_tcom_symbol_ptr             = & v850_elf_tcom_symbol;
+	}
+      asym->section = & v850_elf_tcom_section;
+      asym->value = elfsym->internal_elf_sym.st_size;
+      break;
+
+    case SHN_V850_ZCOMMON:
+      if (v850_elf_zcom_section.name == NULL)
+	{
+	  /* Initialize the zcommon section.  */
+	  v850_elf_zcom_section.name           = ".zcommon";
+	  v850_elf_zcom_section.flags          = SEC_IS_COMMON;
+	  v850_elf_zcom_section.output_section = & v850_elf_zcom_section;
+	  v850_elf_zcom_section.symbol         = & v850_elf_zcom_symbol;
+	  v850_elf_zcom_section.symbol_ptr_ptr = & v850_elf_zcom_symbol_ptr;
+	  v850_elf_zcom_symbol.name            = ".zcommon";
+	  v850_elf_zcom_symbol.flags           = BSF_SECTION_SYM;
+	  v850_elf_zcom_symbol.section         = & v850_elf_zcom_section;
+	  v850_elf_zcom_symbol_ptr             = & v850_elf_zcom_symbol;
+	}
+      asym->section = & v850_elf_zcom_section;
+      asym->value = elfsym->internal_elf_sym.st_size;
+      break;
+    }
+}
+
+/* Hook called by the linker routine which adds symbols from an object
+   file.  We must handle the special v850 section numbers here.  */
+
+static bfd_boolean
+v850_elf_add_symbol_hook (bfd *abfd,
+			  struct bfd_link_info *info ATTRIBUTE_UNUSED,
+			  Elf_Internal_Sym *sym,
+			  const char **namep ATTRIBUTE_UNUSED,
+			  flagword *flagsp ATTRIBUTE_UNUSED,
+			  asection **secp,
+			  bfd_vma *valp)
+{
+  unsigned int indx = sym->st_shndx;
+
+  /* If the section index is an "ordinary" index, then it may
+     refer to a v850 specific section created by the assembler.
+     Check the section's type and change the index it matches.
+
+     FIXME: Should we alter the st_shndx field as well ?  */
+
+  if (indx < elf_numsections (abfd))
+    switch (elf_elfsections (abfd)[indx]->sh_type)
+      {
+      case SHT_V850_SCOMMON:
+	indx = SHN_V850_SCOMMON;
+	break;
+
+      case SHT_V850_TCOMMON:
+	indx = SHN_V850_TCOMMON;
+	break;
+
+      case SHT_V850_ZCOMMON:
+	indx = SHN_V850_ZCOMMON;
+	break;
+
+      default:
+	break;
+      }
+
+  switch (indx)
+    {
+    case SHN_V850_SCOMMON:
+      *secp = bfd_make_section_old_way (abfd, ".scommon");
+      (*secp)->flags |= SEC_IS_COMMON;
+      *valp = sym->st_size;
+      break;
+
+    case SHN_V850_TCOMMON:
+      *secp = bfd_make_section_old_way (abfd, ".tcommon");
+      (*secp)->flags |= SEC_IS_COMMON;
+      *valp = sym->st_size;
+      break;
+
+    case SHN_V850_ZCOMMON:
+      *secp = bfd_make_section_old_way (abfd, ".zcommon");
+      (*secp)->flags |= SEC_IS_COMMON;
+      *valp = sym->st_size;
+      break;
+    }
+
+  return TRUE;
+}
+
+static int
+v850_elf_link_output_symbol_hook (struct bfd_link_info *info ATTRIBUTE_UNUSED,
+				  const char *name ATTRIBUTE_UNUSED,
+				  Elf_Internal_Sym *sym,
+				  asection *input_sec,
+				  struct elf_link_hash_entry *h ATTRIBUTE_UNUSED)
+{
+  /* If we see a common symbol, which implies a relocatable link, then
+     if a symbol was in a special common section in an input file, mark
+     it as a special common in the output file.  */
+
+  if (sym->st_shndx == SHN_COMMON)
+    {
+      if (strcmp (input_sec->name, ".scommon") == 0)
+	sym->st_shndx = SHN_V850_SCOMMON;
+      else if (strcmp (input_sec->name, ".tcommon") == 0)
+	sym->st_shndx = SHN_V850_TCOMMON;
+      else if (strcmp (input_sec->name, ".zcommon") == 0)
+	sym->st_shndx = SHN_V850_ZCOMMON;
+    }
+
+  /* The price we pay for using h->other unused bits as flags in the
+     linker is cleaning up after ourselves.  */
+
+  sym->st_other &= ~(V850_OTHER_SDA | V850_OTHER_ZDA | V850_OTHER_TDA
+		     | V850_OTHER_ERROR);
+
+  return 1;
+}
+
+static bfd_boolean
+v850_elf_section_from_shdr (bfd *abfd,
+			    Elf_Internal_Shdr *hdr,
+			    const char *name,
+			    int shindex)
+{
+  /* There ought to be a place to keep ELF backend specific flags, but
+     at the moment there isn't one.  We just keep track of the
+     sections by their name, instead.  */
+
+  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex))
+    return FALSE;
+
+  switch (hdr->sh_type)
+    {
+    case SHT_V850_SCOMMON:
+    case SHT_V850_TCOMMON:
+    case SHT_V850_ZCOMMON:
+      if (! bfd_set_section_flags (abfd, hdr->bfd_section,
+				   (bfd_get_section_flags (abfd,
+							   hdr->bfd_section)
+				    | SEC_IS_COMMON)))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Set the correct type for a V850 ELF section.  We do this
+   by the section name, which is a hack, but ought to work.  */
+
+static bfd_boolean
+v850_elf_fake_sections (bfd *abfd ATTRIBUTE_UNUSED,
+			Elf_Internal_Shdr *hdr,
+			asection *sec)
+{
+  const char * name;
+
+  name = bfd_get_section_name (abfd, sec);
+
+  if (strcmp (name, ".scommon") == 0)
+    hdr->sh_type = SHT_V850_SCOMMON;
+  else if (strcmp (name, ".tcommon") == 0)
+    hdr->sh_type = SHT_V850_TCOMMON;
+  else if (strcmp (name, ".zcommon") == 0)
+    hdr->sh_type = SHT_V850_ZCOMMON;
+
+  return TRUE;
+}
+
+/* Delete some bytes from a section while relaxing.  */
+
+static bfd_boolean
+v850_elf_relax_delete_bytes (bfd *abfd,
+			     asection *sec,
+			     bfd_vma addr,
+			     bfd_vma toaddr,
+			     int count)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf32_External_Sym *extsyms;
+  Elf32_External_Sym *esym;
+  Elf32_External_Sym *esymend;
+  int sym_index;
+  unsigned int sec_shndx;
+  bfd_byte *contents;
+  Elf_Internal_Rela *irel;
+  Elf_Internal_Rela *irelend;
+  struct elf_link_hash_entry *sym_hash;
+  Elf_Internal_Shdr *shndx_hdr;
+  Elf_External_Sym_Shndx *shndx;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  extsyms = (Elf32_External_Sym *) symtab_hdr->contents;
+
+  sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+  contents = elf_section_data (sec)->this_hdr.contents;
+
+  /* The deletion must stop at the next ALIGN reloc for an alignment
+     power larger than the number of bytes we are deleting.  */
+
+  /* Actually delete the bytes.  */
+#if (DEBUG_RELAX & 2)
+  fprintf (stderr, "relax_delete: contents: sec: %s  %p .. %p %x\n",
+	   sec->name, addr, toaddr, count );
+#endif
+  memmove (contents + addr, contents + addr + count,
+	   toaddr - addr - count);
+  memset (contents + toaddr-count, 0, count);
+
+  /* Adjust all the relocs.  */
+  irel = elf_section_data (sec)->relocs;
+  irelend = irel + sec->reloc_count;
+  shndx_hdr = &elf_tdata (abfd)->symtab_shndx_hdr;
+  shndx = (Elf_External_Sym_Shndx *) shndx_hdr->contents;
+
+  for (; irel < irelend; irel++)
+    {
+      bfd_vma raddr, paddr, symval;
+      Elf_Internal_Sym isym;
+
+      /* Get the new reloc address.  */
+      raddr = irel->r_offset;
+      if ((raddr >= (addr + count) && raddr < toaddr))
+	irel->r_offset -= count;
+
+      if (raddr >= addr && raddr < addr + count)
+	{
+	  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+				       (int) R_V850_NONE);
+	  continue;
+	}
+
+      if (ELF32_R_TYPE (irel->r_info) == (int) R_V850_ALIGN)
+	continue;
+
+      bfd_elf32_swap_symbol_in (abfd,
+				extsyms + ELF32_R_SYM (irel->r_info),
+				shndx ? shndx + ELF32_R_SYM (irel->r_info) : NULL,
+				& isym);
+
+      if (isym.st_shndx != sec_shndx)
+	continue;
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+	{
+	  symval = isym.st_value;
+#if (DEBUG_RELAX & 2)
+	  {
+	    char * name = bfd_elf_string_from_elf_section
+	                   (abfd, symtab_hdr->sh_link, isym.st_name);
+	    fprintf (stderr,
+	       "relax_delete: local: sec: %s, sym: %s (%d), value: %x + %x + %x addend %x\n",
+	       sec->name, name, isym.st_name,
+	       sec->output_section->vma, sec->output_offset,
+	       isym.st_value, irel->r_addend);
+	  }
+#endif
+	}
+      else
+	{
+	  unsigned long indx;
+	  struct elf_link_hash_entry * h;
+
+	  /* An external symbol.  */
+	  indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+
+	  h = elf_sym_hashes (abfd) [indx];
+	  BFD_ASSERT (h != NULL);
+
+	  symval = h->root.u.def.value;
+#if (DEBUG_RELAX & 2)
+	  fprintf (stderr,
+		   "relax_delete: defined: sec: %s, name: %s, value: %x + %x + %x addend %x\n",
+		   sec->name, h->root.root.string, h->root.u.def.value,
+		   sec->output_section->vma, sec->output_offset, irel->r_addend);
+#endif
+	}
+
+      paddr = symval + irel->r_addend;
+
+      if ( (symval >= addr + count && symval < toaddr)
+	  && (paddr < addr + count || paddr >= toaddr))
+	irel->r_addend += count;
+      else if (    (symval < addr + count || symval >= toaddr)
+	        && (paddr >= addr + count && paddr < toaddr))
+	irel->r_addend -= count;
+    }
+
+  /* Adjust the local symbols defined in this section.  */
+  esym = extsyms;
+  esymend = esym + symtab_hdr->sh_info;
+
+  for (; esym < esymend; esym++, shndx = (shndx ? shndx + 1 : NULL))
+    {
+      Elf_Internal_Sym isym;
+
+      bfd_elf32_swap_symbol_in (abfd, esym, shndx, & isym);
+
+      if (isym.st_shndx == sec_shndx
+	  && isym.st_value >= addr + count
+	  && isym.st_value < toaddr)
+	{
+	  isym.st_value -= count;
+
+	  if (isym.st_value + isym.st_size >= toaddr)
+	    isym.st_size += count;
+
+	  bfd_elf32_swap_symbol_out (abfd, & isym, esym, shndx);
+	}
+      else if (isym.st_shndx == sec_shndx
+	       && isym.st_value < addr + count)
+	{
+	  if (isym.st_value+isym.st_size >= addr + count
+	      && isym.st_value+isym.st_size < toaddr)
+	    isym.st_size -= count;
+
+	  if (isym.st_value >= addr
+	      && isym.st_value <  addr + count)
+	    isym.st_value = addr;
+
+	  bfd_elf32_swap_symbol_out (abfd, & isym, esym, shndx);
+	}
+    }
+
+  /* Now adjust the global symbols defined in this section.  */
+  esym = extsyms + symtab_hdr->sh_info;
+  esymend = extsyms + (symtab_hdr->sh_size / sizeof (Elf32_External_Sym));
+
+  for (sym_index = 0; esym < esymend; esym ++, sym_index ++)
+    {
+      Elf_Internal_Sym isym;
+
+      bfd_elf32_swap_symbol_in (abfd, esym, shndx, & isym);
+      sym_hash = elf_sym_hashes (abfd) [sym_index];
+
+      if (isym.st_shndx == sec_shndx
+	  && ((sym_hash)->root.type == bfd_link_hash_defined
+	      || (sym_hash)->root.type == bfd_link_hash_defweak)
+	  && (sym_hash)->root.u.def.section == sec
+	  && (sym_hash)->root.u.def.value >= addr + count
+	  && (sym_hash)->root.u.def.value < toaddr)
+	{
+	  if ((sym_hash)->root.u.def.value + isym.st_size >= toaddr)
+	    {
+	      isym.st_size += count;
+	      bfd_elf32_swap_symbol_out (abfd, & isym, esym, shndx);
+	    }
+
+	  (sym_hash)->root.u.def.value -= count;
+	}
+      else if (isym.st_shndx == sec_shndx
+	       && ((sym_hash)->root.type == bfd_link_hash_defined
+		   || (sym_hash)->root.type == bfd_link_hash_defweak)
+	       && (sym_hash)->root.u.def.section == sec
+	       && (sym_hash)->root.u.def.value < addr + count)
+	{
+	  if ((sym_hash)->root.u.def.value+isym.st_size >= addr + count
+	      && (sym_hash)->root.u.def.value+isym.st_size < toaddr)
+	    isym.st_size -= count;
+
+	  if ((sym_hash)->root.u.def.value >= addr
+	      && (sym_hash)->root.u.def.value < addr + count)
+	    (sym_hash)->root.u.def.value = addr;
+
+	  bfd_elf32_swap_symbol_out (abfd, & isym, esym, shndx);
+	}
+
+      if (shndx)
+	++ shndx;
+    }
+
+  return TRUE;
+}
+
+#define NOP_OPCODE 	(0x0000)
+#define MOVHI	    	0x0640				/* 4byte.  */
+#define MOVHI_MASK  	0x07e0
+#define MOVHI_R1(insn)	((insn) & 0x1f)			/* 4byte.  */
+#define MOVHI_R2(insn)	((insn) >> 11)
+#define MOVEA	    	0x0620				/* 2byte.  */
+#define MOVEA_MASK  	0x07e0
+#define MOVEA_R1(insn)	((insn) & 0x1f)
+#define MOVEA_R2(insn)	((insn) >> 11)
+#define JARL_4	    	0x00040780				/* 4byte.  */
+#define JARL_4_MASK 	0xFFFF07FF
+#define JARL_R2(insn)	(int)(((insn) & (~JARL_4_MASK)) >> 11)
+#define ADD_I       	0x0240					/* 2byte.  */
+#define ADD_I_MASK  	0x07e0
+#define ADD_I5(insn)	((((insn) & 0x001f) << 11) >> 11)	/* 2byte.  */
+#define ADD_R2(insn)	((insn) >> 11)
+#define JMP_R	    	0x0060					/* 2byte.  */
+#define JMP_R_MASK 	0xFFE0
+#define JMP_R1(insn)	((insn) & 0x1f)
+
+static bfd_boolean
+v850_elf_relax_section (bfd *abfd,
+			asection *sec,
+			struct bfd_link_info *link_info,
+			bfd_boolean *again)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *internal_relocs;
+  Elf_Internal_Rela *irel;
+  Elf_Internal_Rela *irelend;
+  Elf_Internal_Rela *irelalign = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+  bfd_byte *contents = NULL;
+  bfd_vma addr = 0;
+  bfd_vma toaddr;
+  int align_pad_size = 0;
+  bfd_boolean result = TRUE;
+
+  *again = FALSE;
+
+  if (link_info->relocatable
+      || (sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0)
+    return TRUE;
+
+  symtab_hdr = & elf_tdata (abfd)->symtab_hdr;
+
+  internal_relocs = (_bfd_elf_link_read_relocs
+		     (abfd, sec, NULL, NULL, link_info->keep_memory));
+  if (internal_relocs == NULL)
+    goto error_return;
+
+  irelend = internal_relocs + sec->reloc_count;
+
+  while (addr < sec->size)
+    {
+      toaddr = sec->size;
+
+      for (irel = internal_relocs; irel < irelend; irel ++)
+	if (ELF32_R_TYPE (irel->r_info) == (int) R_V850_ALIGN
+	    && irel->r_offset > addr
+	    && irel->r_offset < toaddr)
+	  toaddr = irel->r_offset;
+
+#ifdef DEBUG_RELAX
+      fprintf (stderr, "relax region 0x%x to 0x%x align pad %d\n",
+	       addr, toaddr, align_pad_size);
+#endif
+      if (irelalign)
+	{
+	  bfd_vma alignto;
+	  bfd_vma alignmoveto;
+
+	  alignmoveto = BFD_ALIGN (addr - align_pad_size, 1 << irelalign->r_addend);
+	  alignto = BFD_ALIGN (addr, 1 << irelalign->r_addend);
+
+	  if (alignmoveto < alignto)
+	    {
+	      unsigned int i;
+
+	      align_pad_size = alignto - alignmoveto;
+#ifdef DEBUG_RELAX
+	      fprintf (stderr, "relax move region 0x%x to 0x%x delete size 0x%x\n",
+		       alignmoveto, toaddr, align_pad_size);
+#endif
+	      if (!v850_elf_relax_delete_bytes (abfd, sec, alignmoveto,
+						toaddr, align_pad_size))
+		goto error_return;
+
+	      for (i  = BFD_ALIGN (toaddr - align_pad_size, 1);
+		   (i + 1) < toaddr; i += 2)
+		bfd_put_16 (abfd, NOP_OPCODE, contents + i);
+
+	      addr = alignmoveto;
+	    }
+	  else
+	    align_pad_size = 0;
+	}
+
+      for (irel = internal_relocs; irel < irelend; irel++)
+	{
+	  bfd_vma laddr;
+	  bfd_vma addend;
+	  bfd_vma symval;
+	  int insn[5];
+	  int no_match = -1;
+	  Elf_Internal_Rela *hi_irelfn;
+	  Elf_Internal_Rela *lo_irelfn;
+	  Elf_Internal_Rela *irelcall;
+	  bfd_signed_vma foff;
+
+	  if (! (irel->r_offset >= addr && irel->r_offset < toaddr
+		 && (ELF32_R_TYPE (irel->r_info) == (int) R_V850_LONGCALL
+		     || ELF32_R_TYPE (irel->r_info) == (int) R_V850_LONGJUMP)))
+	    continue;
+
+#ifdef DEBUG_RELAX
+	  fprintf (stderr, "relax check r_info 0x%x r_offset 0x%x r_addend 0x%x\n",
+		   irel->r_info,
+		   irel->r_offset,
+		   irel->r_addend );
+#endif
+
+	  /* Get the section contents.  */
+	  if (contents == NULL)
+	    {
+	      if (elf_section_data (sec)->this_hdr.contents != NULL)
+		contents = elf_section_data (sec)->this_hdr.contents;
+	      else
+		{
+		  if (! bfd_malloc_and_get_section (abfd, sec, &contents))
+		    goto error_return;
+		}
+	    }
+
+	  /* Read this BFD's local symbols if we haven't done so already.  */
+	  if (isymbuf == NULL && symtab_hdr->sh_info != 0)
+	    {
+	      isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	      if (isymbuf == NULL)
+		isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+						symtab_hdr->sh_info, 0,
+						NULL, NULL, NULL);
+	      if (isymbuf == NULL)
+		goto error_return;
+	    }
+
+	  laddr = irel->r_offset;
+
+	  if (ELF32_R_TYPE (irel->r_info) == (int) R_V850_LONGCALL)
+	    {
+	      /* Check code for -mlong-calls output. */
+	      if (laddr + 16 <= (bfd_vma) sec->size)
+		{
+		  insn[0] = bfd_get_16 (abfd, contents + laddr);
+		  insn[1] = bfd_get_16 (abfd, contents + laddr + 4);
+		  insn[2] = bfd_get_32 (abfd, contents + laddr + 8);
+		  insn[3] = bfd_get_16 (abfd, contents + laddr + 12);
+		  insn[4] = bfd_get_16 (abfd, contents + laddr + 14);
+
+		  if ((insn[0] & MOVHI_MASK) != MOVHI
+		       || MOVHI_R1 (insn[0]) != 0)
+		    no_match = 0;
+
+		  if (no_match < 0
+		      && ((insn[1] & MOVEA_MASK) != MOVEA
+			   || MOVHI_R2 (insn[0]) != MOVEA_R1 (insn[1])))
+		    no_match = 1;
+
+		  if (no_match < 0
+		      && (insn[2] & JARL_4_MASK) != JARL_4)
+		    no_match = 2;
+
+		  if (no_match < 0
+		      && ((insn[3] & ADD_I_MASK) != ADD_I
+			   || ADD_I5 (insn[3]) != 4
+			   || JARL_R2 (insn[2]) != ADD_R2 (insn[3])))
+		    no_match = 3;
+
+		  if (no_match < 0
+		      && ((insn[4] & JMP_R_MASK) != JMP_R
+			   || MOVEA_R2 (insn[1]) != JMP_R1 (insn[4])))
+		    no_match = 4;
+		}
+	      else
+		{
+		  ((*_bfd_error_handler)
+		   ("%s: 0x%lx: warning: R_V850_LONGCALL points to unrecognized insns",
+		    bfd_get_filename (abfd), (unsigned long) irel->r_offset));
+
+		  continue;
+		}
+
+	      if (no_match >= 0)
+		{
+		  ((*_bfd_error_handler)
+		   ("%s: 0x%lx: warning: R_V850_LONGCALL points to unrecognized insn 0x%x",
+		    bfd_get_filename (abfd), (unsigned long) irel->r_offset+no_match, insn[no_match]));
+
+		  continue;
+		}
+
+	      /* Get the reloc for the address from which the register is
+	         being loaded.  This reloc will tell us which function is
+	         actually being called.  */
+	      for (hi_irelfn = internal_relocs; hi_irelfn < irelend; hi_irelfn ++)
+		if (hi_irelfn->r_offset == laddr + 2
+		    && ELF32_R_TYPE (hi_irelfn->r_info)
+		        == (int) R_V850_HI16_S)
+		  break;
+
+	      for (lo_irelfn = internal_relocs; lo_irelfn < irelend; lo_irelfn ++)
+		if (lo_irelfn->r_offset == laddr + 6
+		    && ELF32_R_TYPE (lo_irelfn->r_info)
+		        == (int) R_V850_LO16)
+		  break;
+
+	      for (irelcall = internal_relocs; irelcall < irelend; irelcall ++)
+		if (irelcall->r_offset == laddr + 8
+		    && ELF32_R_TYPE (irelcall->r_info)
+                        == (int) R_V850_22_PCREL)
+		  break;
+
+	      if (   hi_irelfn == irelend
+		  || lo_irelfn == irelend
+		  || irelcall  == irelend)
+		{
+		  ((*_bfd_error_handler)
+		   ("%s: 0x%lx: warning: R_V850_LONGCALL points to unrecognized reloc",
+		    bfd_get_filename (abfd), (unsigned long) irel->r_offset ));
+
+		  continue;
+		}
+
+	      if (ELF32_R_SYM (irelcall->r_info) < symtab_hdr->sh_info)
+		{
+		  Elf_Internal_Sym *  isym;
+
+		  /* A local symbol.  */
+		  isym = isymbuf + ELF32_R_SYM (irelcall->r_info);
+
+		  symval = isym->st_value;
+		}
+	      else
+		{
+		  unsigned long indx;
+		  struct elf_link_hash_entry * h;
+
+		  /* An external symbol.  */
+		  indx = ELF32_R_SYM (irelcall->r_info) - symtab_hdr->sh_info;
+		  h = elf_sym_hashes (abfd)[indx];
+		  BFD_ASSERT (h != NULL);
+
+		  if (   h->root.type != bfd_link_hash_defined
+		      && h->root.type != bfd_link_hash_defweak)
+		    /* This appears to be a reference to an undefined
+		       symbol.  Just ignore it--it will be caught by the
+		       regular reloc processing.  */
+		    continue;
+
+		  symval = h->root.u.def.value;
+		}
+
+	      if (symval + irelcall->r_addend != irelcall->r_offset + 4)
+		{
+		  ((*_bfd_error_handler)
+		   ("%s: 0x%lx: warning: R_V850_LONGCALL points to unrecognized reloc 0x%lx",
+		    bfd_get_filename (abfd), (unsigned long) irel->r_offset, irelcall->r_offset ));
+
+		  continue;
+		}
+
+	      /* Get the value of the symbol referred to by the reloc.  */
+	      if (ELF32_R_SYM (hi_irelfn->r_info) < symtab_hdr->sh_info)
+		{
+		  Elf_Internal_Sym *isym;
+		  asection *sym_sec;
+
+		  /* A local symbol.  */
+		  isym = isymbuf + ELF32_R_SYM (hi_irelfn->r_info);
+
+		  if (isym->st_shndx == SHN_UNDEF)
+		    sym_sec = bfd_und_section_ptr;
+		  else if (isym->st_shndx == SHN_ABS)
+		    sym_sec = bfd_abs_section_ptr;
+		  else if (isym->st_shndx == SHN_COMMON)
+		    sym_sec = bfd_com_section_ptr;
+		  else
+		    sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+		  symval = (isym->st_value
+			    + sym_sec->output_section->vma
+			    + sym_sec->output_offset);
+		}
+	      else
+		{
+		  unsigned long indx;
+		  struct elf_link_hash_entry *h;
+
+		  /* An external symbol.  */
+		  indx = ELF32_R_SYM (hi_irelfn->r_info) - symtab_hdr->sh_info;
+		  h = elf_sym_hashes (abfd)[indx];
+		  BFD_ASSERT (h != NULL);
+
+		  if (   h->root.type != bfd_link_hash_defined
+		      && h->root.type != bfd_link_hash_defweak)
+		    /* This appears to be a reference to an undefined
+		       symbol.  Just ignore it--it will be caught by the
+		       regular reloc processing.  */
+		    continue;
+
+		  symval = (h->root.u.def.value
+			    + h->root.u.def.section->output_section->vma
+			    + h->root.u.def.section->output_offset);
+		}
+
+	      addend = irel->r_addend;
+
+	      foff = (symval + addend
+		      - (irel->r_offset
+			 + sec->output_section->vma
+			 + sec->output_offset
+			 + 4));
+#ifdef DEBUG_RELAX
+	      fprintf (stderr, "relax longcall r_offset 0x%x ptr 0x%x symbol 0x%x addend 0x%x distance 0x%x\n",
+		       irel->r_offset,
+		       (irel->r_offset
+			+ sec->output_section->vma
+			+ sec->output_offset),
+		       symval, addend, foff);
+#endif
+
+	      if (foff < -0x100000 || foff >= 0x100000)
+		/* After all that work, we can't shorten this function call.  */
+		continue;
+
+	      /* For simplicity of coding, we are going to modify the section
+	         contents, the section relocs, and the BFD symbol table.  We
+	         must tell the rest of the code not to free up this
+	         information.  It would be possible to instead create a table
+	         of changes which have to be made, as is done in coff-mips.c;
+	         that would be more work, but would require less memory when
+	         the linker is run.  */
+	      elf_section_data (sec)->relocs = internal_relocs;
+	      elf_section_data (sec)->this_hdr.contents = contents;
+	      symtab_hdr->contents = (bfd_byte *) isymbuf;
+
+	      /* Replace the long call with a jarl.  */
+	      irel->r_info = ELF32_R_INFO (ELF32_R_SYM (hi_irelfn->r_info), R_V850_22_PCREL);
+
+	      addend = 0;
+
+	      if (ELF32_R_SYM (hi_irelfn->r_info) < symtab_hdr->sh_info)
+		/* If this needs to be changed because of future relaxing,
+		   it will be handled here like other internal IND12W
+		   relocs.  */
+		bfd_put_32 (abfd,
+			    0x00000780 | (JARL_R2 (insn[2])<<11) | ((addend << 16) & 0xffff) | ((addend >> 16) & 0xf),
+			    contents + irel->r_offset);
+	      else
+		/* We can't fully resolve this yet, because the external
+		   symbol value may be changed by future relaxing.
+		   We let the final link phase handle it.  */
+		bfd_put_32 (abfd, 0x00000780 | (JARL_R2 (insn[2])<<11),
+			    contents + irel->r_offset);
+
+	      hi_irelfn->r_info =
+		ELF32_R_INFO (ELF32_R_SYM (hi_irelfn->r_info), R_V850_NONE);
+	      lo_irelfn->r_info =
+		ELF32_R_INFO (ELF32_R_SYM (lo_irelfn->r_info), R_V850_NONE);
+	      irelcall->r_info =
+		ELF32_R_INFO (ELF32_R_SYM (irelcall->r_info), R_V850_NONE);
+
+	      if (! v850_elf_relax_delete_bytes (abfd, sec,
+						 irel->r_offset + 4, toaddr, 12))
+		goto error_return;
+
+	      align_pad_size += 12;
+	    }
+	  else if (ELF32_R_TYPE (irel->r_info) == (int) R_V850_LONGJUMP)
+	    {
+	      /* Check code for -mlong-jumps output.  */
+	      if (laddr + 10 <= (bfd_vma) sec->size)
+		{
+		  insn[0] = bfd_get_16 (abfd, contents + laddr);
+		  insn[1] = bfd_get_16 (abfd, contents + laddr + 4);
+		  insn[2] = bfd_get_16 (abfd, contents + laddr + 8);
+
+		  if ((insn[0] & MOVHI_MASK) != MOVHI
+		       || MOVHI_R1 (insn[0]) != 0)
+		    no_match = 0;
+
+		  if (no_match < 0
+		      && ((insn[1] & MOVEA_MASK) != MOVEA
+			   || MOVHI_R2 (insn[0]) != MOVEA_R1 (insn[1])))
+		    no_match = 1;
+
+		  if (no_match < 0
+		      && ((insn[2] & JMP_R_MASK) != JMP_R
+			   || MOVEA_R2 (insn[1]) != JMP_R1 (insn[2])))
+		    no_match = 4;
+		}
+	      else
+		{
+		  ((*_bfd_error_handler)
+		   ("%s: 0x%lx: warning: R_V850_LONGJUMP points to unrecognized insns",
+		    bfd_get_filename (abfd), (unsigned long) irel->r_offset));
+
+		  continue;
+		}
+
+	      if (no_match >= 0)
+		{
+		  ((*_bfd_error_handler)
+		   ("%s: 0x%lx: warning: R_V850_LONGJUMP points to unrecognized insn 0x%x",
+		    bfd_get_filename (abfd), (unsigned long) irel->r_offset+no_match, insn[no_match]));
+
+		  continue;
+		}
+
+	      /* Get the reloc for the address from which the register is
+	         being loaded.  This reloc will tell us which function is
+	         actually being called.  */
+	      for (hi_irelfn = internal_relocs; hi_irelfn < irelend; hi_irelfn ++)
+		if (hi_irelfn->r_offset == laddr + 2
+		    && ELF32_R_TYPE (hi_irelfn->r_info) == (int) R_V850_HI16_S)
+		  break;
+
+	      for (lo_irelfn = internal_relocs; lo_irelfn < irelend; lo_irelfn ++)
+		if (lo_irelfn->r_offset == laddr + 6
+		    && ELF32_R_TYPE (lo_irelfn->r_info) == (int) R_V850_LO16)
+		  break;
+
+	      if (   hi_irelfn == irelend
+		  || lo_irelfn == irelend)
+		{
+		  ((*_bfd_error_handler)
+		   ("%s: 0x%lx: warning: R_V850_LONGJUMP points to unrecognized reloc",
+		    bfd_get_filename (abfd), (unsigned long) irel->r_offset ));
+
+		  continue;
+		}
+
+	      /* Get the value of the symbol referred to by the reloc.  */
+	      if (ELF32_R_SYM (hi_irelfn->r_info) < symtab_hdr->sh_info)
+		{
+		  Elf_Internal_Sym *  isym;
+		  asection *          sym_sec;
+
+		  /* A local symbol.  */
+		  isym = isymbuf + ELF32_R_SYM (hi_irelfn->r_info);
+
+		  if (isym->st_shndx == SHN_UNDEF)
+		    sym_sec = bfd_und_section_ptr;
+		  else if (isym->st_shndx == SHN_ABS)
+		    sym_sec = bfd_abs_section_ptr;
+		  else if (isym->st_shndx == SHN_COMMON)
+		    sym_sec = bfd_com_section_ptr;
+		  else
+		    sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+		  symval = (isym->st_value
+			    + sym_sec->output_section->vma
+			    + sym_sec->output_offset);
+#ifdef DEBUG_RELAX
+		  {
+		    char * name = bfd_elf_string_from_elf_section
+		      (abfd, symtab_hdr->sh_link, isym->st_name);
+
+		    fprintf (stderr, "relax long jump local: sec: %s, sym: %s (%d), value: %x + %x + %x addend %x\n",
+			     sym_sec->name, name, isym->st_name,
+			     sym_sec->output_section->vma,
+			     sym_sec->output_offset,
+			     isym->st_value, irel->r_addend);
+		  }
+#endif
+		}
+	      else
+		{
+		  unsigned long indx;
+		  struct elf_link_hash_entry * h;
+
+		  /* An external symbol.  */
+		  indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+		  h = elf_sym_hashes (abfd)[indx];
+		  BFD_ASSERT (h != NULL);
+
+		  if (   h->root.type != bfd_link_hash_defined
+		      && h->root.type != bfd_link_hash_defweak)
+		    /* This appears to be a reference to an undefined
+		       symbol.  Just ignore it--it will be caught by the
+		       regular reloc processing.  */
+		    continue;
+
+		  symval = (h->root.u.def.value
+			    + h->root.u.def.section->output_section->vma
+			    + h->root.u.def.section->output_offset);
+#ifdef DEBUG_RELAX
+		  fprintf (stderr,
+			   "relax longjump defined: sec: %s, name: %s, value: %x + %x + %x addend %x\n",
+			   sec->name, h->root.root.string, h->root.u.def.value,
+			   sec->output_section->vma, sec->output_offset, irel->r_addend);
+#endif
+		}
+
+	      addend = irel->r_addend;
+
+	      foff = (symval + addend
+		      - (irel->r_offset
+			 + sec->output_section->vma
+			 + sec->output_offset
+			 + 4));
+#ifdef DEBUG_RELAX
+	      fprintf (stderr, "relax longjump r_offset 0x%x ptr 0x%x symbol 0x%x addend 0x%x distance 0x%x\n",
+		       irel->r_offset,
+		       (irel->r_offset
+			+ sec->output_section->vma
+			+ sec->output_offset),
+		       symval, addend, foff);
+#endif
+	      if (foff < -0x100000 || foff >= 0x100000)
+		/* After all that work, we can't shorten this function call.  */
+		continue;
+
+	      /* For simplicity of coding, we are going to modify the section
+	         contents, the section relocs, and the BFD symbol table.  We
+	         must tell the rest of the code not to free up this
+	         information.  It would be possible to instead create a table
+	         of changes which have to be made, as is done in coff-mips.c;
+	         that would be more work, but would require less memory when
+	         the linker is run.  */
+	      elf_section_data (sec)->relocs = internal_relocs;
+	      elf_section_data (sec)->this_hdr.contents = contents;
+	      symtab_hdr->contents = (bfd_byte *) isymbuf;
+
+	      if (foff < -0x100 || foff >= 0x100)
+		{
+		  /* Replace the long jump with a jr.  */
+
+		  irel->r_info =
+		    ELF32_R_INFO (ELF32_R_SYM (irel->r_info), R_V850_22_PCREL);
+
+		  irel->r_addend = addend;
+		  addend = 0;
+
+		  if (ELF32_R_SYM (hi_irelfn->r_info) < symtab_hdr->sh_info)
+		    /* If this needs to be changed because of future relaxing,
+		       it will be handled here like other internal IND12W
+		       relocs.  */
+		    bfd_put_32 (abfd,
+				0x00000780 | ((addend << 15) & 0xffff0000) | ((addend >> 17) & 0xf),
+				contents + irel->r_offset);
+		  else
+		    /* We can't fully resolve this yet, because the external
+		       symbol value may be changed by future relaxing.
+		       We let the final link phase handle it.  */
+		    bfd_put_32 (abfd, 0x00000780, contents + irel->r_offset);
+
+		  hi_irelfn->r_info =
+			ELF32_R_INFO (ELF32_R_SYM (hi_irelfn->r_info), R_V850_NONE);
+		  lo_irelfn->r_info =
+			ELF32_R_INFO (ELF32_R_SYM (lo_irelfn->r_info), R_V850_NONE);
+		  if (!v850_elf_relax_delete_bytes (abfd, sec,
+						    irel->r_offset + 4, toaddr, 6))
+		    goto error_return;
+
+		  align_pad_size += 6;
+		}
+	      else
+		{
+		  /* Replace the long jump with a br.  */
+
+		  irel->r_info =
+			ELF32_R_INFO (ELF32_R_SYM (irel->r_info), R_V850_9_PCREL);
+
+		  irel->r_addend = addend;
+		  addend = 0;
+
+		  if (ELF32_R_SYM (hi_irelfn->r_info) < symtab_hdr->sh_info)
+		    /* If this needs to be changed because of future relaxing,
+		       it will be handled here like other internal IND12W
+		       relocs.  */
+		    bfd_put_16 (abfd,
+				0x0585 | ((addend << 10) & 0xf800) | ((addend << 3) & 0x0070),
+				contents + irel->r_offset);
+		  else
+		    /* We can't fully resolve this yet, because the external
+		       symbol value may be changed by future relaxing.
+		       We let the final link phase handle it.  */
+		    bfd_put_16 (abfd, 0x0585, contents + irel->r_offset);
+
+		  hi_irelfn->r_info =
+			ELF32_R_INFO (ELF32_R_SYM (hi_irelfn->r_info), R_V850_NONE);
+		  lo_irelfn->r_info =
+			ELF32_R_INFO (ELF32_R_SYM (lo_irelfn->r_info), R_V850_NONE);
+		  if (!v850_elf_relax_delete_bytes (abfd, sec,
+						    irel->r_offset + 2, toaddr, 8))
+		    goto error_return;
+
+		  align_pad_size += 8;
+		}
+	    }
+	}
+
+      irelalign = NULL;
+      for (irel = internal_relocs; irel < irelend; irel++)
+	{
+	  if (ELF32_R_TYPE (irel->r_info) == (int) R_V850_ALIGN
+	      && irel->r_offset == toaddr)
+	    {
+	      irel->r_offset -= align_pad_size;
+
+	      if (irelalign == NULL || irelalign->r_addend > irel->r_addend)
+		irelalign = irel;
+	    }
+	}
+
+      addr = toaddr;
+    }
+
+  if (!irelalign)
+    {
+#ifdef DEBUG_RELAX
+      fprintf (stderr, "relax pad %d shorten %d -> %d\n",
+	       align_pad_size,
+	       sec->size,
+	       sec->size - align_pad_size);
+#endif
+      sec->size -= align_pad_size;
+    }
+
+ finish:
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != (unsigned char *) contents)
+    free (contents);
+
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (bfd_byte *) isymbuf)
+    free (isymbuf);
+
+  return result;
+
+ error_return:
+  result = FALSE;
+  goto finish;
+}
+
+static const struct bfd_elf_special_section v850_elf_special_sections[] =
+{
+  { STRING_COMMA_LEN (".call_table_data"), 0, SHT_PROGBITS,     (SHF_ALLOC + SHF_WRITE) },
+  { STRING_COMMA_LEN (".call_table_text"), 0, SHT_PROGBITS,     (SHF_ALLOC + SHF_WRITE
+								 + SHF_EXECINSTR) },
+  { STRING_COMMA_LEN (".rosdata"),        -2, SHT_PROGBITS,     (SHF_ALLOC
+								 + SHF_V850_GPREL) },
+  { STRING_COMMA_LEN (".rozdata"),        -2, SHT_PROGBITS,     (SHF_ALLOC
+								 + SHF_V850_R0REL) },
+  { STRING_COMMA_LEN (".sbss"),           -2, SHT_NOBITS,       (SHF_ALLOC + SHF_WRITE
+								 + SHF_V850_GPREL) },
+  { STRING_COMMA_LEN (".scommon"),        -2, SHT_V850_SCOMMON, (SHF_ALLOC + SHF_WRITE
+								 + SHF_V850_GPREL) },
+  { STRING_COMMA_LEN (".sdata"),          -2, SHT_PROGBITS,     (SHF_ALLOC + SHF_WRITE
+								 + SHF_V850_GPREL) },
+  { STRING_COMMA_LEN (".tbss"),           -2, SHT_NOBITS,       (SHF_ALLOC + SHF_WRITE
+								 + SHF_V850_EPREL) },
+  { STRING_COMMA_LEN (".tcommon"),        -2, SHT_V850_TCOMMON, (SHF_ALLOC + SHF_WRITE
+								 + SHF_V850_R0REL) },
+  { STRING_COMMA_LEN (".tdata"),          -2, SHT_PROGBITS,     (SHF_ALLOC + SHF_WRITE
+								 + SHF_V850_EPREL) },
+  { STRING_COMMA_LEN (".zbss"),           -2, SHT_NOBITS,       (SHF_ALLOC + SHF_WRITE
+								 + SHF_V850_R0REL) },
+  { STRING_COMMA_LEN (".zcommon"),        -2, SHT_V850_ZCOMMON, (SHF_ALLOC + SHF_WRITE
+								 + SHF_V850_R0REL) },
+  { STRING_COMMA_LEN (".zdata"),          -2, SHT_PROGBITS,     (SHF_ALLOC + SHF_WRITE
+								 + SHF_V850_R0REL) },
+  { NULL,                     0,           0, 0,                0 }
+};
+
+#define TARGET_LITTLE_SYM			bfd_elf32_v850_vec
+#define TARGET_LITTLE_NAME			"elf32-v850"
+#define ELF_ARCH				bfd_arch_v850
+#define ELF_MACHINE_CODE			EM_V850
+#define ELF_MACHINE_ALT1			EM_CYGNUS_V850
+#define ELF_MACHINE_ALT2			EM_V800 /* This is the value used by the GreenHills toolchain.  */
+#define ELF_MAXPAGESIZE				0x1000
+
+#define elf_info_to_howto			v850_elf_info_to_howto_rela
+#define elf_info_to_howto_rel			v850_elf_info_to_howto_rel
+
+#define elf_backend_check_relocs		v850_elf_check_relocs
+#define elf_backend_relocate_section    	v850_elf_relocate_section
+#define elf_backend_object_p			v850_elf_object_p
+#define elf_backend_final_write_processing 	v850_elf_final_write_processing
+#define elf_backend_section_from_bfd_section 	v850_elf_section_from_bfd_section
+#define elf_backend_symbol_processing		v850_elf_symbol_processing
+#define elf_backend_add_symbol_hook		v850_elf_add_symbol_hook
+#define elf_backend_link_output_symbol_hook 	v850_elf_link_output_symbol_hook
+#define elf_backend_section_from_shdr		v850_elf_section_from_shdr
+#define elf_backend_fake_sections		v850_elf_fake_sections
+#define elf_backend_gc_mark_hook                v850_elf_gc_mark_hook
+#define elf_backend_special_sections		v850_elf_special_sections
+
+#define elf_backend_can_gc_sections 1
+#define elf_backend_rela_normal 1
+
+#define bfd_elf32_bfd_is_local_label_name	v850_elf_is_local_label_name
+#define bfd_elf32_bfd_reloc_type_lookup		v850_elf_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup	v850_elf_reloc_name_lookup
+#define bfd_elf32_bfd_merge_private_bfd_data 	v850_elf_merge_private_bfd_data
+#define bfd_elf32_bfd_set_private_flags		v850_elf_set_private_flags
+#define bfd_elf32_bfd_print_private_bfd_data	v850_elf_print_private_bfd_data
+#define bfd_elf32_bfd_relax_section		v850_elf_relax_section
+
+#define elf_symbol_leading_char			'_'
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-vax.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-vax.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-vax.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-vax.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2120 @@
+/* VAX series support for 32-bit ELF
+   Copyright 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Contributed by Matt Thomas <matt@3am-software.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/vax.h"
+
+static reloc_howto_type *reloc_type_lookup (bfd *, bfd_reloc_code_real_type);
+static void rtype_to_howto (bfd *, arelent *, Elf_Internal_Rela *);
+static struct bfd_hash_entry *elf_vax_link_hash_newfunc (struct bfd_hash_entry *,
+							 struct bfd_hash_table *,
+							 const char *);
+static struct bfd_link_hash_table *elf_vax_link_hash_table_create (bfd *);
+static bfd_boolean elf_vax_check_relocs (bfd *, struct bfd_link_info *,
+					 asection *, const Elf_Internal_Rela *);
+static bfd_boolean elf_vax_adjust_dynamic_symbol (struct bfd_link_info *,
+						  struct elf_link_hash_entry *);
+static bfd_boolean elf_vax_size_dynamic_sections (bfd *, struct bfd_link_info *);
+static bfd_boolean elf_vax_relocate_section (bfd *, struct bfd_link_info *,
+					     bfd *, asection *, bfd_byte *,
+					     Elf_Internal_Rela *,
+					     Elf_Internal_Sym *, asection **);
+static bfd_boolean elf_vax_finish_dynamic_symbol (bfd *, struct bfd_link_info *,
+						  struct elf_link_hash_entry *,
+						  Elf_Internal_Sym *);
+static bfd_boolean elf_vax_finish_dynamic_sections (bfd *,
+						    struct bfd_link_info *);
+static bfd_vma elf_vax_plt_sym_val (bfd_vma, const asection *,
+				    const arelent *);
+
+static bfd_boolean elf32_vax_set_private_flags (bfd *, flagword);
+static bfd_boolean elf32_vax_merge_private_bfd_data (bfd *, bfd *);
+static bfd_boolean elf32_vax_print_private_bfd_data (bfd *, PTR);
+
+static reloc_howto_type howto_table[] = {
+  HOWTO (R_VAX_NONE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_VAX_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x00000000,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_VAX_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_VAX_32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_VAX_16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_VAX_16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_VAX_8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_VAX_8",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x000000ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_VAX_PC32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_VAX_PC32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_VAX_PC16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_VAX_PC16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_VAX_PC8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_VAX_PC8",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x000000ff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_VAX_GOT32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_VAX_GOT32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  EMPTY_HOWTO (-1),
+  EMPTY_HOWTO (-1),
+  EMPTY_HOWTO (-1),
+  EMPTY_HOWTO (-1),
+  EMPTY_HOWTO (-1),
+
+  HOWTO (R_VAX_PLT32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_VAX_PLT32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  EMPTY_HOWTO (-1),
+  EMPTY_HOWTO (-1),
+  EMPTY_HOWTO (-1),
+  EMPTY_HOWTO (-1),
+  EMPTY_HOWTO (-1),
+
+  HOWTO (R_VAX_COPY,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_VAX_COPY",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_VAX_GLOB_DAT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_VAX_GLOB_DAT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_VAX_JMP_SLOT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_VAX_JMP_SLOT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_VAX_RELATIVE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_VAX_RELATIVE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable hierarchy */
+  HOWTO (R_VAX_GNU_VTINHERIT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_VAX_GNU_VTINHERIT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage */
+  HOWTO (R_VAX_GNU_VTENTRY,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_elf_rel_vtable_reloc_fn, /* special_function */
+	 "R_VAX_GNU_VTENTRY",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+static void
+rtype_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr,
+		Elf_Internal_Rela *dst)
+{
+  BFD_ASSERT (ELF32_R_TYPE(dst->r_info) < (unsigned int) R_VAX_max);
+  cache_ptr->howto = &howto_table[ELF32_R_TYPE(dst->r_info)];
+}
+
+#define elf_info_to_howto rtype_to_howto
+
+static const struct
+{
+  bfd_reloc_code_real_type bfd_val;
+  int elf_val;
+} reloc_map[] = {
+  { BFD_RELOC_NONE, R_VAX_NONE },
+  { BFD_RELOC_32, R_VAX_32 },
+  { BFD_RELOC_16, R_VAX_16 },
+  { BFD_RELOC_8, R_VAX_8 },
+  { BFD_RELOC_32_PCREL, R_VAX_PC32 },
+  { BFD_RELOC_16_PCREL, R_VAX_PC16 },
+  { BFD_RELOC_8_PCREL, R_VAX_PC8 },
+  { BFD_RELOC_32_GOT_PCREL, R_VAX_GOT32 },
+  { BFD_RELOC_32_PLT_PCREL, R_VAX_PLT32 },
+  { BFD_RELOC_NONE, R_VAX_COPY },
+  { BFD_RELOC_VAX_GLOB_DAT, R_VAX_GLOB_DAT },
+  { BFD_RELOC_VAX_JMP_SLOT, R_VAX_JMP_SLOT },
+  { BFD_RELOC_VAX_RELATIVE, R_VAX_RELATIVE },
+  { BFD_RELOC_CTOR, R_VAX_32 },
+  { BFD_RELOC_VTABLE_INHERIT, R_VAX_GNU_VTINHERIT },
+  { BFD_RELOC_VTABLE_ENTRY, R_VAX_GNU_VTENTRY },
+};
+
+static reloc_howto_type *
+reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+  for (i = 0; i < sizeof (reloc_map) / sizeof (reloc_map[0]); i++)
+    {
+      if (reloc_map[i].bfd_val == code)
+	return &howto_table[reloc_map[i].elf_val];
+    }
+  return 0;
+}
+
+static reloc_howto_type *
+reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+		   const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (howto_table) / sizeof (howto_table[0]); i++)
+    if (howto_table[i].name != NULL
+	&& strcasecmp (howto_table[i].name, r_name) == 0)
+      return &howto_table[i];
+
+  return NULL;
+}
+
+#define bfd_elf32_bfd_reloc_type_lookup reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup reloc_name_lookup
+#define ELF_ARCH bfd_arch_vax
+/* end code generated by elf.el */
+
+/* Functions for the VAX ELF linker.  */
+
+/* The name of the dynamic interpreter.  This is put in the .interp
+   section.  */
+
+#define ELF_DYNAMIC_INTERPRETER "/usr/libexec/ld.elf_so"
+
+/* The size in bytes of an entry in the procedure linkage table.  */
+
+#define PLT_ENTRY_SIZE 12
+
+/* The first entry in a procedure linkage table looks like this.  See
+   the SVR4 ABI VAX supplement to see how this works.  */
+
+static const bfd_byte elf_vax_plt0_entry[PLT_ENTRY_SIZE] =
+{
+  0xdd, 0xef,		/* pushl l^ */
+  0, 0, 0, 0,		/* offset to .plt.got + 4 */
+  0x17, 0xff,		/* jmp @L^(pc) */
+  0, 0, 0, 0,		/* offset to .plt.got + 8 */
+};
+
+/* Subsequent entries in a procedure linkage table look like this.  */
+
+static const bfd_byte elf_vax_plt_entry[PLT_ENTRY_SIZE] =
+{
+  0xfc, 0x0f,		/* .word ^M<r11:r2> */
+  0x16, 0xef,		/* jsb L^(pc) */
+  0, 0, 0, 0,		/* replaced with offset to start of .plt  */
+  0, 0, 0, 0,		/* index into .rela.plt */
+};
+
+/* The VAX linker needs to keep track of the number of relocs that it
+   decides to copy in check_relocs for each symbol.  This is so that it
+   can discard PC relative relocs if it doesn't need them when linking
+   with -Bsymbolic.  We store the information in a field extending the
+   regular ELF linker hash table.  */
+
+/* This structure keeps track of the number of PC relative relocs we have
+   copied for a given symbol.  */
+
+struct elf_vax_pcrel_relocs_copied
+{
+  /* Next section.  */
+  struct elf_vax_pcrel_relocs_copied *next;
+  /* A section in dynobj.  */
+  asection *section;
+  /* Number of relocs copied in this section.  */
+  bfd_size_type count;
+};
+
+/* VAX ELF linker hash entry.  */
+
+struct elf_vax_link_hash_entry
+{
+  struct elf_link_hash_entry root;
+
+  /* Number of PC relative relocs copied for this symbol.  */
+  struct elf_vax_pcrel_relocs_copied *pcrel_relocs_copied;
+
+  bfd_vma got_addend;
+};
+
+/* Declare this now that the above structures are defined.  */
+
+static bfd_boolean elf_vax_discard_copies (struct elf_vax_link_hash_entry *,
+					   void *);
+
+/* Declare this now that the above structures are defined.  */
+
+static bfd_boolean elf_vax_instantiate_got_entries (struct elf_link_hash_entry *,
+						    void *);
+
+/* Traverse an VAX ELF linker hash table.  */
+
+#define elf_vax_link_hash_traverse(table, func, info)			\
+  (elf_link_hash_traverse						\
+   ((table),								\
+    (bfd_boolean (*) (struct elf_link_hash_entry *, PTR)) (func),	\
+    (info)))
+
+/* Create an entry in an VAX ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+elf_vax_link_hash_newfunc (struct bfd_hash_entry *entry,
+			   struct bfd_hash_table *table,
+			   const char *string)
+{
+  struct elf_vax_link_hash_entry *ret =
+    (struct elf_vax_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = ((struct elf_vax_link_hash_entry *)
+	   bfd_hash_allocate (table,
+			      sizeof (struct elf_vax_link_hash_entry)));
+  if (ret == NULL)
+    return (struct bfd_hash_entry *) ret;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct elf_vax_link_hash_entry *)
+	 _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
+				     table, string));
+  if (ret != NULL)
+    {
+      ret->pcrel_relocs_copied = NULL;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Create an VAX ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+elf_vax_link_hash_table_create (bfd *abfd)
+{
+  struct elf_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct elf_link_hash_table);
+
+  ret = bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (ret, abfd,
+				      elf_vax_link_hash_newfunc,
+				      sizeof (struct elf_vax_link_hash_entry),
+				      GENERIC_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  return &ret->root;
+}
+
+/* Keep vax-specific flags in the ELF header */
+static bfd_boolean
+elf32_vax_set_private_flags (bfd *abfd, flagword flags)
+{
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+static bfd_boolean
+elf32_vax_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  flagword in_flags;
+
+  if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  in_flags  = elf_elfheader (ibfd)->e_flags;
+
+  if (!elf_flags_init (obfd))
+    {
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = in_flags;
+    }
+
+  return TRUE;
+}
+
+/* Display the flags field */
+static bfd_boolean
+elf32_vax_print_private_bfd_data (bfd *abfd, PTR ptr)
+{
+  FILE *file = (FILE *) ptr;
+
+  BFD_ASSERT (abfd != NULL && ptr != NULL);
+
+  /* Print normal ELF private data.  */
+  _bfd_elf_print_private_bfd_data (abfd, ptr);
+
+  /* Ignore init flag - it may not be set, despite the flags field containing valid data.  */
+
+  /* xgettext:c-format */
+  fprintf (file, _("private flags = %lx:"), elf_elfheader (abfd)->e_flags);
+
+  if (elf_elfheader (abfd)->e_flags & EF_VAX_NONPIC)
+    fprintf (file, _(" [nonpic]"));
+
+  if (elf_elfheader (abfd)->e_flags & EF_VAX_DFLOAT)
+    fprintf (file, _(" [d-float]"));
+
+  if (elf_elfheader (abfd)->e_flags & EF_VAX_GFLOAT)
+    fprintf (file, _(" [g-float]"));
+
+  fputc ('\n', file);
+
+  return TRUE;
+}
+/* Look through the relocs for a section during the first phase, and
+   allocate space in the global offset table or procedure linkage
+   table.  */
+
+static bfd_boolean
+elf_vax_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
+		      const Elf_Internal_Rela *relocs)
+{
+  bfd *dynobj;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  asection *sgot;
+  asection *srelgot;
+  asection *sreloc;
+
+  if (info->relocatable)
+    return TRUE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  sgot = NULL;
+  srelgot = NULL;
+  sreloc = NULL;
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      if (r_symndx < symtab_hdr->sh_info)
+	h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      switch (ELF32_R_TYPE (rel->r_info))
+	{
+	case R_VAX_GOT32:
+	  BFD_ASSERT (h != NULL);
+	  if (h->forced_local
+	      || h == elf_hash_table (info)->hgot
+	      || h == elf_hash_table (info)->hplt)
+	    break;
+
+	  /* If this is a local symbol, we resolve it directly without
+	     creating a global offset table entry.  */
+	  if (h == NULL || ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	    break;
+
+	  /* This symbol requires a global offset table entry.  */
+
+	  if (dynobj == NULL)
+	    {
+	      /* Create the .got section.  */
+	      elf_hash_table (info)->dynobj = dynobj = abfd;
+	      if (!_bfd_elf_create_got_section (dynobj, info))
+		return FALSE;
+	    }
+
+	  if (sgot == NULL)
+	    {
+	      sgot = bfd_get_section_by_name (dynobj, ".got");
+	      BFD_ASSERT (sgot != NULL);
+	    }
+
+	  if (srelgot == NULL
+	      && (h != NULL || info->shared))
+	    {
+	      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+	      if (srelgot == NULL)
+		{
+		  srelgot = bfd_make_section_with_flags (dynobj,
+							 ".rela.got",
+							 (SEC_ALLOC
+							  | SEC_LOAD
+							  | SEC_HAS_CONTENTS
+							  | SEC_IN_MEMORY
+							  | SEC_LINKER_CREATED
+							  | SEC_READONLY));
+		  if (srelgot == NULL
+		      || !bfd_set_section_alignment (dynobj, srelgot, 2))
+		    return FALSE;
+		}
+	    }
+
+	  if (h != NULL)
+	    {
+	      struct elf_vax_link_hash_entry *eh;
+
+	      eh = (struct elf_vax_link_hash_entry *) h;
+	      if (h->got.refcount == -1)
+		{
+		  h->got.refcount = 1;
+		  eh->got_addend = rel->r_addend;
+		}
+	      else
+		{
+		  h->got.refcount++;
+		  if (eh->got_addend != (bfd_vma) rel->r_addend)
+		    (*_bfd_error_handler)
+		      (_("%s: warning: GOT addend of %ld to `%s' does"
+			 " not match previous GOT addend of %ld"),
+			 bfd_get_filename (abfd), rel->r_addend,
+			 h->root.root.string,
+			 eh->got_addend);
+
+		}
+	    }
+	  break;
+
+	case R_VAX_PLT32:
+	  /* This symbol requires a procedure linkage table entry.  We
+	     actually build the entry in adjust_dynamic_symbol,
+             because this might be a case of linking PIC code which is
+             never referenced by a dynamic object, in which case we
+             don't need to generate a procedure linkage table entry
+             after all.  */
+
+	  /* If this is a local symbol, we resolve it directly without
+	     creating a procedure linkage table entry.  */
+	  BFD_ASSERT (h != NULL);
+	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT || h->forced_local)
+	    break;
+
+	  h->needs_plt = 1;
+	  if (h->plt.refcount == -1)
+	    h->plt.refcount = 1;
+	  else
+	    h->plt.refcount++;
+	  break;
+
+	case R_VAX_PC8:
+	case R_VAX_PC16:
+	case R_VAX_PC32:
+	  /* If we are creating a shared library and this is not a local
+	     symbol, we need to copy the reloc into the shared library.
+	     However when linking with -Bsymbolic and this is a global
+	     symbol which is defined in an object we are including in the
+	     link (i.e., DEF_REGULAR is set), then we can resolve the
+	     reloc directly.  At this point we have not seen all the input
+	     files, so it is possible that DEF_REGULAR is not set now but
+	     will be set later (it is never cleared).  We account for that
+	     possibility below by storing information in the
+	     pcrel_relocs_copied field of the hash table entry.  */
+	  if (!(info->shared
+		&& (sec->flags & SEC_ALLOC) != 0
+		&& h != NULL
+		&& (!info->symbolic
+		    || !h->def_regular)))
+	    {
+	      if (h != NULL
+		  && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		  && !h->forced_local)
+		{
+		  /* Make sure a plt entry is created for this symbol if
+		     it turns out to be a function defined by a dynamic
+		     object.  */
+		  if (h->plt.refcount == -1)
+		    h->plt.refcount = 1;
+		  else
+		    h->plt.refcount++;
+		}
+	      break;
+	    }
+	  /* If this is a local symbol, we can resolve it directly.  */
+	  if (h != NULL
+	      && (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+		  || h->forced_local))
+	    break;
+
+	  /* Fall through.  */
+	case R_VAX_8:
+	case R_VAX_16:
+	case R_VAX_32:
+	  if (h != NULL && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT)
+	    {
+	      /* Make sure a plt entry is created for this symbol if it
+		 turns out to be a function defined by a dynamic object.  */
+	      if (h->plt.refcount == -1)
+		h->plt.refcount = 1;
+	      else
+		h->plt.refcount++;
+	    }
+
+	  /* If we are creating a shared library, we need to copy the
+	     reloc into the shared library.  */
+	  if (info->shared
+	      && (sec->flags & SEC_ALLOC) != 0)
+	    {
+	      /* When creating a shared object, we must copy these
+		 reloc types into the output file.  We create a reloc
+		 section in dynobj and make room for this reloc.  */
+	      if (sreloc == NULL)
+		{
+		  sreloc = _bfd_elf_make_dynamic_reloc_section
+		    (sec, dynobj, 2, abfd, /*rela?*/ TRUE);
+
+		  if (sreloc == NULL)
+		    return FALSE;
+
+		  if (sec->flags & SEC_READONLY)
+		    info->flags |= DF_TEXTREL;
+		}
+
+	      sreloc->size += sizeof (Elf32_External_Rela);
+
+	      /* If we are linking with -Bsymbolic, we count the number of
+		 PC relative relocations we have entered for this symbol,
+		 so that we can discard them again if the symbol is later
+		 defined by a regular object.  Note that this function is
+		 only called if we are using a vaxelf linker hash table,
+		 which means that h is really a pointer to an
+		 elf_vax_link_hash_entry.  */
+	      if ((ELF32_R_TYPE (rel->r_info) == R_VAX_PC8
+		   || ELF32_R_TYPE (rel->r_info) == R_VAX_PC16
+		   || ELF32_R_TYPE (rel->r_info) == R_VAX_PC32)
+		  && info->symbolic)
+		{
+		  struct elf_vax_link_hash_entry *eh;
+		  struct elf_vax_pcrel_relocs_copied *p;
+
+		  eh = (struct elf_vax_link_hash_entry *) h;
+
+		  for (p = eh->pcrel_relocs_copied; p != NULL; p = p->next)
+		    if (p->section == sreloc)
+		      break;
+
+		  if (p == NULL)
+		    {
+		      p = ((struct elf_vax_pcrel_relocs_copied *)
+			   bfd_alloc (dynobj, (bfd_size_type) sizeof *p));
+		      if (p == NULL)
+			return FALSE;
+		      p->next = eh->pcrel_relocs_copied;
+		      eh->pcrel_relocs_copied = p;
+		      p->section = sreloc;
+		      p->count = 0;
+		    }
+
+		  ++p->count;
+		}
+	    }
+
+	  break;
+
+	  /* This relocation describes the C++ object vtable hierarchy.
+	     Reconstruct it for later use during GC.  */
+	case R_VAX_GNU_VTINHERIT:
+	  if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+	    return FALSE;
+	  break;
+
+	  /* This relocation describes which C++ vtable entries are actually
+	     used.  Record for later use during GC.  */
+	case R_VAX_GNU_VTENTRY:
+	  BFD_ASSERT (h != NULL);
+	  if (h != NULL
+	      && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+	    return FALSE;
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+static asection *
+elf_vax_gc_mark_hook (asection *sec,
+		      struct bfd_link_info *info,
+		      Elf_Internal_Rela *rel,
+		      struct elf_link_hash_entry *h,
+		      Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_VAX_GNU_VTINHERIT:
+      case R_VAX_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Update the got entry reference counts for the section being removed.  */
+
+static bfd_boolean
+elf_vax_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info, asection *sec,
+		       const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel, *relend;
+  bfd *dynobj;
+
+  if (info->relocatable)
+    return TRUE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  if (dynobj == NULL)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h = NULL;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      switch (ELF32_R_TYPE (rel->r_info))
+	{
+	case R_VAX_GOT32:
+	  if (h != NULL && h->got.refcount > 0)
+	    --h->got.refcount;
+	  break;
+
+	case R_VAX_PLT32:
+	case R_VAX_PC8:
+	case R_VAX_PC16:
+	case R_VAX_PC32:
+	case R_VAX_8:
+	case R_VAX_16:
+	case R_VAX_32:
+	  if (h != NULL && h->plt.refcount > 0)
+	    --h->plt.refcount;
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+elf_vax_adjust_dynamic_symbol (info, h)
+     struct bfd_link_info *info;
+     struct elf_link_hash_entry *h;
+{
+  bfd *dynobj;
+  asection *s;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (dynobj != NULL
+	      && (h->needs_plt
+		  || h->u.weakdef != NULL
+		  || (h->def_dynamic
+		      && h->ref_regular
+		      && !h->def_regular)));
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later,
+     when we know the address of the .got section.  */
+  if (h->type == STT_FUNC
+      || h->needs_plt)
+    {
+      if (! info->shared
+	  && !h->def_dynamic
+	  && !h->ref_dynamic
+	  /* We must always create the plt entry if it was referenced
+	     by a PLTxxO relocation.  In this case we already recorded
+	     it as a dynamic symbol.  */
+	  && h->dynindx == -1)
+	{
+	  /* This case can occur if we saw a PLTxx reloc in an input
+	     file, but the symbol was never referred to by a dynamic
+	     object.  In such a case, we don't actually need to build
+	     a procedure linkage table, and we can just do a PCxx
+	     reloc instead.  */
+	  BFD_ASSERT (h->needs_plt);
+	  h->plt.offset = (bfd_vma) -1;
+	  return TRUE;
+	}
+
+      /* GC may have rendered this entry unused.  */
+      if (h->plt.refcount <= 0)
+	{
+	  h->needs_plt = 0;
+	  h->plt.offset = (bfd_vma) -1;
+	  return TRUE;
+	}
+
+      /* Make sure this symbol is output as a dynamic symbol.  */
+      if (h->dynindx == -1)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      s = bfd_get_section_by_name (dynobj, ".plt");
+      BFD_ASSERT (s != NULL);
+
+      /* If this is the first .plt entry, make room for the special
+	 first entry.  */
+      if (s->size == 0)
+	{
+	  s->size += PLT_ENTRY_SIZE;
+	}
+
+      /* If this symbol is not defined in a regular file, and we are
+	 not generating a shared library, then set the symbol to this
+	 location in the .plt.  This is required to make function
+	 pointers compare as equal between the normal executable and
+	 the shared library.  */
+      if (!info->shared
+	  && !h->def_regular)
+	{
+	  h->root.u.def.section = s;
+	  h->root.u.def.value = s->size;
+	}
+
+      h->plt.offset = s->size;
+
+      /* Make room for this entry.  */
+      s->size += PLT_ENTRY_SIZE;
+
+      /* We also need to make an entry in the .got.plt section, which
+	 will be placed in the .got section by the linker script.  */
+
+      s = bfd_get_section_by_name (dynobj, ".got.plt");
+      BFD_ASSERT (s != NULL);
+      s->size += 4;
+
+      /* We also need to make an entry in the .rela.plt section.  */
+
+      s = bfd_get_section_by_name (dynobj, ".rela.plt");
+      BFD_ASSERT (s != NULL);
+      s->size += sizeof (Elf32_External_Rela);
+
+      return TRUE;
+    }
+
+  /* Reinitialize the plt offset now that it is not used as a reference
+     count any more.  */
+  h->plt.offset = (bfd_vma) -1;
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  s = bfd_get_section_by_name (dynobj, ".dynbss");
+  BFD_ASSERT (s != NULL);
+
+  /* We must generate a R_VAX_COPY reloc to tell the dynamic linker to
+     copy the initial value out of the dynamic object and into the
+     runtime process image.  We need to remember the offset into the
+     .rela.bss section we are going to use.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      asection *srel;
+
+      srel = bfd_get_section_by_name (dynobj, ".rela.bss");
+      BFD_ASSERT (srel != NULL);
+      srel->size += sizeof (Elf32_External_Rela);
+      h->needs_copy = 1;
+    }
+
+  return _bfd_elf_adjust_dynamic_copy (h, s);
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+elf_vax_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *s;
+  bfd_boolean plt;
+  bfd_boolean relocs;
+  bfd_boolean reltext;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (s != NULL);
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+  else
+    {
+      /* We may have created entries in the .rela.got and .got sections.
+	 However, if we are not creating the dynamic sections, we will
+	 not actually use these entries.  Reset the size of .rela.got
+	 and .got, which will cause it to get stripped from the output
+	 file below.  */
+      s = bfd_get_section_by_name (dynobj, ".rela.got");
+      if (s != NULL)
+	s->size = 0;
+      s = bfd_get_section_by_name (dynobj, ".got.plt");
+      if (s != NULL)
+	s->size = 0;
+      s = bfd_get_section_by_name (dynobj, ".got");
+      if (s != NULL)
+	s->size = 0;
+    }
+
+  /* If this is a -Bsymbolic shared link, then we need to discard all PC
+     relative relocs against symbols defined in a regular object.  We
+     allocated space for them in the check_relocs routine, but we will not
+     fill them in in the relocate_section routine.  */
+  if (info->shared && info->symbolic)
+    elf_vax_link_hash_traverse (elf_hash_table (info),
+				elf_vax_discard_copies,
+				NULL);
+
+  /* If this is a -Bsymbolic shared link or a static link, we need to
+     discard all the got entries we've recorded.  Otherwise, we need to
+     instantiate (allocate space for them).  */
+  elf_link_hash_traverse (elf_hash_table (info),
+			  elf_vax_instantiate_got_entries,
+			  (PTR) info);
+
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  plt = FALSE;
+  relocs = FALSE;
+  reltext = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      const char *name;
+
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      /* It's OK to base decisions on the section name, because none
+	 of the dynobj section names depend upon the input files.  */
+      name = bfd_get_section_name (dynobj, s);
+
+      if (strcmp (name, ".plt") == 0)
+	{
+	  /* Remember whether there is a PLT.  */
+	  plt = s->size != 0;
+	}
+      else if (CONST_STRNEQ (name, ".rela"))
+	{
+	  if (s->size != 0)
+	    {
+	      asection *target;
+
+	      /* Remember whether there are any reloc sections other
+                 than .rela.plt.  */
+	      if (strcmp (name, ".rela.plt") != 0)
+		{
+		  const char *outname;
+
+		  relocs = TRUE;
+
+		  /* If this relocation section applies to a read only
+		     section, then we probably need a DT_TEXTREL
+		     entry.  .rela.plt is actually associated with
+		     .got.plt, which is never readonly.  */
+		  outname = bfd_get_section_name (output_bfd,
+						  s->output_section);
+		  target = bfd_get_section_by_name (output_bfd, outname + 5);
+		  if (target != NULL
+		      && (target->flags & SEC_READONLY) != 0
+		      && (target->flags & SEC_ALLOC) != 0)
+		    reltext = TRUE;
+		}
+
+	      /* We use the reloc_count field as a counter if we need
+		 to copy relocs into the output file.  */
+	      s->reloc_count = 0;
+	    }
+	}
+      else if (! CONST_STRNEQ (name, ".got")
+	       && strcmp (name, ".dynbss") != 0)
+	{
+	  /* It's not one of our sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (s->size == 0)
+	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is mostly to handle .rela.bss and
+	     .rela.plt.  We must create both sections in
+	     create_dynamic_sections, because they must be created
+	     before the linker maps input sections to output
+	     sections.  The linker does that before
+	     adjust_dynamic_symbol is called, and it is that
+	     function which decides whether anything needs to go
+	     into these sections.  */
+	  s->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents.  */
+      s->contents = (bfd_byte *) bfd_alloc (dynobj, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in elf_vax_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (!info->shared)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (plt)
+	{
+	  if (!add_dynamic_entry (DT_PLTGOT, 0)
+	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+	      || !add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+	}
+
+      if (relocs)
+	{
+	  if (!add_dynamic_entry (DT_RELA, 0)
+	      || !add_dynamic_entry (DT_RELASZ, 0)
+	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
+	    return FALSE;
+	}
+
+      if (reltext || (info->flags & DF_TEXTREL) != 0)
+	{
+	  if (!add_dynamic_entry (DT_TEXTREL, 0))
+	    return FALSE;
+	}
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+/* This function is called via elf_vax_link_hash_traverse if we are
+   creating a shared object with -Bsymbolic.  It discards the space
+   allocated to copy PC relative relocs against symbols which are defined
+   in regular objects.  We allocated space for them in the check_relocs
+   routine, but we won't fill them in in the relocate_section routine.  */
+
+static bfd_boolean
+elf_vax_discard_copies (struct elf_vax_link_hash_entry *h,
+			PTR ignore ATTRIBUTE_UNUSED)
+{
+  struct elf_vax_pcrel_relocs_copied *s;
+
+  /* We only discard relocs for symbols defined in a regular object.  */
+  if (!h->root.def_regular)
+    return TRUE;
+
+  for (s = h->pcrel_relocs_copied; s != NULL; s = s->next)
+    s->section->size -= s->count * sizeof (Elf32_External_Rela);
+
+  return TRUE;
+}
+
+/* This function is called via elf_link_hash_traverse.  It looks for entries
+   that have GOT or PLT (.GOT) references.  If creating a static object or a
+   shared object with -Bsymbolic, it resets the reference count back to 0
+   and sets the offset to -1 so normal PC32 relocation will be done.  If
+   creating a shared object or executable, space in the .got and .rela.got
+   will be reserved for the symbol.  */
+
+static bfd_boolean
+elf_vax_instantiate_got_entries (struct elf_link_hash_entry *h, PTR infoptr)
+{
+  struct bfd_link_info *info = (struct bfd_link_info *) infoptr;
+  bfd *dynobj;
+  asection *sgot;
+  asection *srelgot;
+
+  /* We don't care about non-GOT (and non-PLT) entries.  */
+  if (h->got.refcount <= 0 && h->plt.refcount <= 0)
+    return TRUE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  if (dynobj == NULL)
+    return TRUE;
+
+  sgot = bfd_get_section_by_name (dynobj, ".got");
+  srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+
+  if (!elf_hash_table (info)->dynamic_sections_created
+      || (info->shared && info->symbolic)
+      || h->forced_local)
+    {
+      h->got.refcount = 0;
+      h->got.offset = (bfd_vma) -1;
+      h->plt.refcount = 0;
+      h->plt.offset = (bfd_vma) -1;
+    }
+  else if (h->got.refcount > 0)
+    {
+      bfd_boolean dyn;
+
+      /* Make sure this symbol is output as a dynamic symbol.  */
+      if (h->dynindx == -1)
+	{
+	  if (!bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      dyn = elf_hash_table (info)->dynamic_sections_created;
+      /* Allocate space in the .got and .rela.got sections.  */
+      if (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+	  && (info->shared
+	      || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h)))
+	{
+	  sgot->size += 4;
+	  srelgot->size += sizeof (Elf32_External_Rela);
+	}
+    }
+
+  return TRUE;
+}
+
+/* Relocate an VAX ELF section.  */
+
+static bfd_boolean
+elf_vax_relocate_section (bfd *output_bfd,
+			  struct bfd_link_info *info,
+			  bfd *input_bfd,
+			  asection *input_section,
+			  bfd_byte *contents,
+			  Elf_Internal_Rela *relocs,
+			  Elf_Internal_Sym *local_syms,
+			  asection **local_sections)
+{
+  bfd *dynobj;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_vma plt_index;
+  bfd_vma got_offset;
+  asection *sgot;
+  asection *splt;
+  asection *sgotplt;
+  asection *sreloc;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+
+  sgot = NULL;
+  splt = NULL;
+  sgotplt = NULL;
+  sreloc = NULL;
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      if (r_type < 0 || r_type >= (int) R_VAX_max)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+      howto = howto_table + r_type;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc;
+	  bfd_boolean warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+
+	  if ((h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	      && ((r_type == R_VAX_PLT32
+		   && h->plt.offset != (bfd_vma) -1
+		   && !h->forced_local
+		   && elf_hash_table (info)->dynamic_sections_created)
+		  || (r_type == R_VAX_GOT32
+		      && h->got.offset != (bfd_vma) -1
+		      && !h->forced_local
+		      && elf_hash_table (info)->dynamic_sections_created
+		      && (! info->shared
+			  || (! info->symbolic && h->dynindx != -1)
+			  || !h->def_regular))
+		  || (info->shared
+		      && ((! info->symbolic && h->dynindx != -1)
+			  || !h->def_regular)
+		      && ((input_section->flags & SEC_ALLOC) != 0
+			  /* DWARF will emit R_VAX_32 relocations in its
+			     sections against symbols defined externally
+			     in shared libraries.  We can't do anything
+			     with them here.  */
+
+			  || ((input_section->flags & SEC_DEBUGGING) != 0
+			      && h->def_dynamic))
+		      && (r_type == R_VAX_8
+			  || r_type == R_VAX_16
+			  || r_type == R_VAX_32))))
+	    /* In these cases, we don't need the relocation
+	       value.  We check specially because in some
+	       obscure cases sec->output_section will be NULL.  */
+	    relocation = 0;
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      switch (r_type)
+	{
+	case R_VAX_GOT32:
+	  /* Relocation is to the address of the entry for this symbol
+	     in the global offset table.  */
+	  if (h == NULL
+	      || ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+	      || h->got.offset == (bfd_vma) -1
+	      || h->forced_local)
+	    break;
+
+	  /* Relocation is the offset of the entry for this symbol in
+	     the global offset table.  */
+
+	  {
+	    bfd_boolean dyn;
+	    bfd_vma off;
+
+	    if (sgot == NULL)
+	      {
+		sgot = bfd_get_section_by_name (dynobj, ".got");
+		BFD_ASSERT (sgot != NULL);
+	      }
+
+	    BFD_ASSERT (h != NULL);
+	    off = h->got.offset;
+	    BFD_ASSERT (off != (bfd_vma) -1);
+	    BFD_ASSERT (off < sgot->size);
+
+	    dyn = elf_hash_table (info)->dynamic_sections_created;
+	    if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+		|| (info->shared
+		    && SYMBOL_REFERENCES_LOCAL (info, h)))
+	      {
+		/* The symbol was forced to be local
+		   because of a version file..  We must initialize
+		   this entry in the global offset table.  Since
+		   the offset must always be a multiple of 4, we
+		   use the least significant bit to record whether
+		   we have initialized it already.
+
+		   When doing a dynamic link, we create a .rela.got
+		   relocation entry to initialize the value.  This
+		   is done in the finish_dynamic_symbol routine.  */
+		if ((off & 1) != 0)
+		  off &= ~1;
+		else
+		  {
+		    bfd_put_32 (output_bfd, relocation + rel->r_addend,
+				sgot->contents + off);
+		    h->got.offset |= 1;
+		  }
+	      } else {
+		bfd_put_32 (output_bfd, rel->r_addend, sgot->contents + off);
+	      }
+
+	    relocation = sgot->output_offset + off;
+	    /* The GOT relocation uses the addend.  */
+	    rel->r_addend = 0;
+
+	    /* Change the reference to be indirect.  */
+	    contents[rel->r_offset - 1] |= 0x10;
+	    relocation += sgot->output_section->vma;
+	  }
+	  break;
+
+	case R_VAX_PC32:
+	  /* If we are creating an executable and the function this
+	     reloc refers to is in a shared lib, then we made a PLT
+	     entry for this symbol and need to handle the reloc like
+	     a PLT reloc.  */
+	  if (info->shared)
+	     goto r_vax_pc32_shared;
+	  /* Fall through.  */
+	case R_VAX_PLT32:
+	  /* Relocation is to the entry for this symbol in the
+	     procedure linkage table.  */
+
+	  /* Resolve a PLTxx reloc against a local symbol directly,
+	     without using the procedure linkage table.  */
+	  if (h == NULL
+	      || ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+	      || h->forced_local)
+	    break;
+
+	  if (h->plt.offset == (bfd_vma) -1
+	      || !elf_hash_table (info)->dynamic_sections_created)
+	    {
+	      /* We didn't make a PLT entry for this symbol.  This
+		 happens when statically linking PIC code, or when
+		 using -Bsymbolic.  */
+	      break;
+	    }
+
+	  if (splt == NULL)
+	    {
+	      splt = bfd_get_section_by_name (dynobj, ".plt");
+	      BFD_ASSERT (splt != NULL);
+	    }
+
+	  if (sgotplt == NULL)
+	    {
+	      sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");
+	      BFD_ASSERT (sgotplt != NULL);
+	    }
+
+	  plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1;
+
+	  /* Get the offset into the .got table of the entry that
+	     corresponds to this function.  Each .got entry is 4 bytes.
+	     The first two are reserved.  */
+	  got_offset = (plt_index + 3) * 4;
+
+	  /* We want the relocation to point into the .got.plt instead
+	     of the plt itself.  */
+	  relocation = (sgotplt->output_section->vma
+			+ sgotplt->output_offset
+			+ got_offset);
+	  contents[rel->r_offset-1] |= 0x10; /* make indirect */
+	  if (rel->r_addend == 2)
+	    {
+	      h->plt.offset |= 1;
+	    }
+	  else if (rel->r_addend != 0)
+	    (*_bfd_error_handler)
+	      (_("%s: warning: PLT addend of %d to `%s' from %s section ignored"),
+		      bfd_get_filename (input_bfd), rel->r_addend,
+		      h->root.root.string,
+		      bfd_get_section_name (input_bfd, input_section));
+	  rel->r_addend = 0;
+
+	  break;
+
+	case R_VAX_PC8:
+	case R_VAX_PC16:
+	r_vax_pc32_shared:
+	  if (h == NULL
+	      || ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+	      || h->forced_local)
+	    break;
+	  /* Fall through.  */
+	case R_VAX_8:
+	case R_VAX_16:
+	case R_VAX_32:
+	  if (info->shared
+	      && r_symndx != STN_UNDEF
+	      && (input_section->flags & SEC_ALLOC) != 0
+	      && ((r_type != R_VAX_PC8
+		   && r_type != R_VAX_PC16
+		   && r_type != R_VAX_PC32)
+		  || ((input_section->flags & SEC_CODE)
+		      && (!info->symbolic
+			  || (!h->def_regular && h->type != STT_SECTION)))))
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_byte *loc;
+	      bfd_boolean skip, relocate;
+
+	      /* When generating a shared object, these relocations
+		 are copied into the output file to be resolved at run
+		 time.  */
+	      if (sreloc == NULL)
+		{
+		  sreloc = _bfd_elf_get_dynamic_reloc_section
+		    (input_bfd, input_section, /*rela?*/ TRUE);
+		  if (sreloc == NULL)
+		    return FALSE;
+		}
+
+	      skip = FALSE;
+	      relocate = FALSE;
+
+	      outrel.r_offset =
+		_bfd_elf_section_offset (output_bfd, info, input_section,
+					 rel->r_offset);
+	      if (outrel.r_offset == (bfd_vma) -1)
+		skip = TRUE;
+	      if (outrel.r_offset == (bfd_vma) -2)
+		skip = TRUE, relocate = TRUE;
+	      outrel.r_offset += (input_section->output_section->vma
+				  + input_section->output_offset);
+
+	      if (skip)
+		  memset (&outrel, 0, sizeof outrel);
+	      /* h->dynindx may be -1 if the symbol was marked to
+                 become local.  */
+	      else if (h != NULL
+		       && ((! info->symbolic && h->dynindx != -1)
+			   || !h->def_regular))
+		{
+		  BFD_ASSERT (h->dynindx != -1);
+		  outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
+		  outrel.r_addend = relocation + rel->r_addend;
+		}
+	      else
+		{
+		  if (r_type == R_VAX_32)
+		    {
+		      relocate = TRUE;
+		      outrel.r_info = ELF32_R_INFO (0, R_VAX_RELATIVE);
+		      BFD_ASSERT (bfd_get_signed_32 (input_bfd,
+						     &contents[rel->r_offset]) == 0);
+		      outrel.r_addend = relocation + rel->r_addend;
+		    }
+		  else
+		    {
+		      long indx;
+
+		      if (bfd_is_abs_section (sec))
+			indx = 0;
+		      else if (sec == NULL || sec->owner == NULL)
+			{
+			  bfd_set_error (bfd_error_bad_value);
+			  return FALSE;
+			}
+		      else
+			{
+			  asection *osec;
+
+			  /* We are turning this relocation into one
+			     against a section symbol.  It would be
+			     proper to subtract the symbol's value,
+			     osec->vma, from the emitted reloc addend,
+			     but ld.so expects buggy relocs.  */
+			  osec = sec->output_section;
+			  indx = elf_section_data (osec)->dynindx;
+			  if (indx == 0)
+			    {
+			      struct elf_link_hash_table *htab;
+			      htab = elf_hash_table (info);
+			      osec = htab->text_index_section;
+			      indx = elf_section_data (osec)->dynindx;
+			    }
+			  BFD_ASSERT (indx != 0);
+			}
+
+		      outrel.r_info = ELF32_R_INFO (indx, r_type);
+		      outrel.r_addend = relocation + rel->r_addend;
+		    }
+		}
+
+	      if (!strcmp (bfd_get_section_name (input_bfd, input_section),
+			   ".text") != 0 ||
+		  (info->shared
+		   && ELF32_R_TYPE(outrel.r_info) != R_VAX_32
+		   && ELF32_R_TYPE(outrel.r_info) != R_VAX_RELATIVE
+		   && ELF32_R_TYPE(outrel.r_info) != R_VAX_COPY
+		   && ELF32_R_TYPE(outrel.r_info) != R_VAX_JMP_SLOT
+		   && ELF32_R_TYPE(outrel.r_info) != R_VAX_GLOB_DAT))
+		{
+		  if (h != NULL)
+		    (*_bfd_error_handler)
+		      (_("%s: warning: %s relocation against symbol `%s' from %s section"),
+		      bfd_get_filename (input_bfd), howto->name,
+		      h->root.root.string,
+		      bfd_get_section_name (input_bfd, input_section));
+		  else
+		    (*_bfd_error_handler)
+		      (_("%s: warning: %s relocation to 0x%x from %s section"),
+		      bfd_get_filename (input_bfd), howto->name,
+		      outrel.r_addend,
+		      bfd_get_section_name (input_bfd, input_section));
+		}
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rela);
+	      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+
+	      /* This reloc will be computed at runtime, so there's no
+                 need to do anything now, except for R_VAX_32
+                 relocations that have been turned into
+                 R_VAX_RELATIVE.  */
+	      if (!relocate)
+		continue;
+	    }
+
+	  break;
+
+	case R_VAX_GNU_VTINHERIT:
+	case R_VAX_GNU_VTENTRY:
+	  /* These are no-ops in the end.  */
+	  continue;
+
+	default:
+	  break;
+	}
+
+      /* VAX PCREL relocations are from the end of relocation, not the start.
+         So subtract the difference from the relocation amount since we can't
+         add it to the offset.  */
+      if (howto->pc_relative && howto->pcrel_offset)
+	relocation -= bfd_get_reloc_size(howto);
+
+      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+				    contents, rel->r_offset,
+				    relocation, rel->r_addend);
+
+      if (r != bfd_reloc_ok)
+	{
+	  switch (r)
+	    {
+	    default:
+	    case bfd_reloc_outofrange:
+	      abort ();
+	    case bfd_reloc_overflow:
+	      {
+		const char *name;
+
+		if (h != NULL)
+		  name = NULL;
+		else
+		  {
+		    name = bfd_elf_string_from_elf_section (input_bfd,
+							    symtab_hdr->sh_link,
+							    sym->st_name);
+		    if (name == NULL)
+		      return FALSE;
+		    if (*name == '\0')
+		      name = bfd_section_name (input_bfd, sec);
+		  }
+		if (!(info->callbacks->reloc_overflow
+		      (info, (h ? &h->root : NULL), name, howto->name,
+		       (bfd_vma) 0, input_bfd, input_section,
+		       rel->r_offset)))
+		  return FALSE;
+	      }
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+elf_vax_finish_dynamic_symbol (bfd *output_bfd, struct bfd_link_info *info,
+			       struct elf_link_hash_entry *h,
+			       Elf_Internal_Sym *sym)
+{
+  bfd *dynobj;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      asection *splt;
+      asection *sgot;
+      asection *srela;
+      bfd_vma plt_index;
+      bfd_vma got_offset;
+      bfd_vma addend;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+
+      /* This symbol has an entry in the procedure linkage table.  Set
+	 it up.  */
+      BFD_ASSERT (h->dynindx != -1);
+
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      sgot = bfd_get_section_by_name (dynobj, ".got.plt");
+      srela = bfd_get_section_by_name (dynobj, ".rela.plt");
+      BFD_ASSERT (splt != NULL && sgot != NULL && srela != NULL);
+
+      addend = 2 * (h->plt.offset & 1);
+      h->plt.offset &= ~1;
+
+      /* Get the index in the procedure linkage table which
+	 corresponds to this symbol.  This is the index of this symbol
+	 in all the symbols for which we are making plt entries.  The
+	 first entry in the procedure linkage table is reserved.  */
+      plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1;
+
+      /* Get the offset into the .got table of the entry that
+	 corresponds to this function.  Each .got entry is 4 bytes.
+	 The first two are reserved.  */
+      got_offset = (plt_index + 3) * 4;
+
+      /* Fill in the entry in the procedure linkage table.  */
+      memcpy (splt->contents + h->plt.offset, elf_vax_plt_entry,
+	          PLT_ENTRY_SIZE);
+
+      /* The offset is relative to the first extension word.  */
+      bfd_put_32 (output_bfd,
+		  -(h->plt.offset + 8),
+		  splt->contents + h->plt.offset + 4);
+
+      bfd_put_32 (output_bfd, plt_index * sizeof (Elf32_External_Rela),
+		  splt->contents + h->plt.offset + 8);
+
+      /* Fill in the entry in the global offset table.  */
+      bfd_put_32 (output_bfd,
+		  (splt->output_section->vma
+		   + splt->output_offset
+		   + h->plt.offset) + addend,
+		  sgot->contents + got_offset);
+
+      /* Fill in the entry in the .rela.plt section.  */
+      rela.r_offset = (sgot->output_section->vma
+		       + sgot->output_offset
+		       + got_offset);
+      rela.r_info = ELF32_R_INFO (h->dynindx, R_VAX_JMP_SLOT);
+      rela.r_addend = addend;
+      loc = srela->contents + plt_index * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+
+      if (!h->def_regular)
+	{
+	  /* Mark the symbol as undefined, rather than as defined in
+	     the .plt section.  Leave the value alone.  */
+	  sym->st_shndx = SHN_UNDEF;
+	}
+    }
+
+  if (h->got.offset != (bfd_vma) -1)
+    {
+      asection *sgot;
+      asection *srela;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+
+      /* This symbol has an entry in the global offset table.  Set it
+	 up.  */
+      sgot = bfd_get_section_by_name (dynobj, ".got");
+      srela = bfd_get_section_by_name (dynobj, ".rela.got");
+      BFD_ASSERT (sgot != NULL && srela != NULL);
+
+      rela.r_offset = (sgot->output_section->vma
+		       + sgot->output_offset
+		       + (h->got.offset &~ 1));
+
+      /* If the symbol was forced to be local because of a version file
+	 locally we just want to emit a RELATIVE reloc.  The entry in
+	 the global offset table will already have been initialized in
+	 the relocate_section function.  */
+      if (info->shared
+	  && h->dynindx == -1
+	  && h->def_regular)
+	{
+	  rela.r_info = ELF32_R_INFO (0, R_VAX_RELATIVE);
+	}
+      else
+	{
+	  rela.r_info = ELF32_R_INFO (h->dynindx, R_VAX_GLOB_DAT);
+	}
+      rela.r_addend = bfd_get_signed_32 (output_bfd,
+					 (sgot->contents
+					  + (h->got.offset & ~1)));
+
+      loc = srela->contents;
+      loc += srela->reloc_count++ * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+    }
+
+  if (h->needs_copy)
+    {
+      asection *s;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+
+      /* This symbol needs a copy reloc.  Set it up.  */
+      BFD_ASSERT (h->dynindx != -1
+		  && (h->root.type == bfd_link_hash_defined
+		      || h->root.type == bfd_link_hash_defweak));
+
+      s = bfd_get_section_by_name (h->root.u.def.section->owner,
+				   ".rela.bss");
+      BFD_ASSERT (s != NULL);
+
+      rela.r_offset = (h->root.u.def.value
+		       + h->root.u.def.section->output_section->vma
+		       + h->root.u.def.section->output_offset);
+      rela.r_info = ELF32_R_INFO (h->dynindx, R_VAX_COPY);
+      rela.r_addend = 0;
+      loc = s->contents + s->reloc_count++ * sizeof (Elf32_External_Rela);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+    }
+
+  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+      || h == elf_hash_table (info)->hgot)
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+elf_vax_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *sgot;
+  asection *sdyn;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  sgot = bfd_get_section_by_name (dynobj, ".got.plt");
+  BFD_ASSERT (sgot != NULL);
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      asection *splt;
+      Elf32_External_Dyn *dyncon, *dynconend;
+
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      BFD_ASSERT (splt != NULL && sdyn != NULL);
+
+      dyncon = (Elf32_External_Dyn *) sdyn->contents;
+      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+	  const char *name;
+	  asection *s;
+
+	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    default:
+	      break;
+
+	    case DT_PLTGOT:
+	      name = ".got";
+	      goto get_vma;
+	    case DT_JMPREL:
+	      name = ".rela.plt";
+	    get_vma:
+	      s = bfd_get_section_by_name (output_bfd, name);
+	      BFD_ASSERT (s != NULL);
+	      dyn.d_un.d_ptr = s->vma;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_PLTRELSZ:
+	      s = bfd_get_section_by_name (output_bfd, ".rela.plt");
+	      BFD_ASSERT (s != NULL);
+	      dyn.d_un.d_val = s->size;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_RELASZ:
+	      /* The procedure linkage table relocs (DT_JMPREL) should
+		 not be included in the overall relocs (DT_RELA).
+		 Therefore, we override the DT_RELASZ entry here to
+		 make it not include the JMPREL relocs.  Since the
+		 linker script arranges for .rela.plt to follow all
+		 other relocation sections, we don't have to worry
+		 about changing the DT_RELA entry.  */
+	      s = bfd_get_section_by_name (output_bfd, ".rela.plt");
+	      if (s != NULL)
+		dyn.d_un.d_val -= s->size;
+	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+	    }
+	}
+
+      /* Fill in the first entry in the procedure linkage table.  */
+      if (splt->size > 0)
+	{
+	  memcpy (splt->contents, elf_vax_plt0_entry, PLT_ENTRY_SIZE);
+	  bfd_put_32 (output_bfd,
+		          (sgot->output_section->vma
+		           + sgot->output_offset + 4
+		           - (splt->output_section->vma + 6)),
+		          splt->contents + 2);
+	  bfd_put_32 (output_bfd,
+		          (sgot->output_section->vma
+		           + sgot->output_offset + 8
+		           - (splt->output_section->vma + 12)),
+		          splt->contents + 8);
+          elf_section_data (splt->output_section)->this_hdr.sh_entsize
+           = PLT_ENTRY_SIZE;
+	}
+    }
+
+  /* Fill in the first three entries in the global offset table.  */
+  if (sgot->size > 0)
+    {
+      if (sdyn == NULL)
+	bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents);
+      else
+	bfd_put_32 (output_bfd,
+		    sdyn->output_section->vma + sdyn->output_offset,
+		    sgot->contents);
+      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 4);
+      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 8);
+    }
+
+  elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
+
+  return TRUE;
+}
+
+static enum elf_reloc_type_class
+elf_vax_reloc_type_class (const Elf_Internal_Rela *rela)
+{
+  switch ((int) ELF32_R_TYPE (rela->r_info))
+    {
+    case R_VAX_RELATIVE:
+      return reloc_class_relative;
+    case R_VAX_JMP_SLOT:
+      return reloc_class_plt;
+    case R_VAX_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+static bfd_vma
+elf_vax_plt_sym_val (bfd_vma i, const asection *plt,
+		     const arelent *rel ATTRIBUTE_UNUSED)
+{
+  return plt->vma + (i + 1) * PLT_ENTRY_SIZE;
+}
+
+#define TARGET_LITTLE_SYM		bfd_elf32_vax_vec
+#define TARGET_LITTLE_NAME		"elf32-vax"
+#define ELF_MACHINE_CODE		EM_VAX
+#define ELF_MAXPAGESIZE			0x1000
+
+#define elf_backend_create_dynamic_sections \
+					_bfd_elf_create_dynamic_sections
+#define bfd_elf32_bfd_link_hash_table_create \
+					elf_vax_link_hash_table_create
+#define bfd_elf32_bfd_final_link	bfd_elf_gc_common_final_link
+
+#define elf_backend_check_relocs	elf_vax_check_relocs
+#define elf_backend_adjust_dynamic_symbol \
+					elf_vax_adjust_dynamic_symbol
+#define elf_backend_size_dynamic_sections \
+					elf_vax_size_dynamic_sections
+#define elf_backend_init_index_section	_bfd_elf_init_1_index_section
+#define elf_backend_relocate_section	elf_vax_relocate_section
+#define elf_backend_finish_dynamic_symbol \
+					elf_vax_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections \
+					elf_vax_finish_dynamic_sections
+#define elf_backend_reloc_type_class	elf_vax_reloc_type_class
+#define elf_backend_gc_mark_hook	elf_vax_gc_mark_hook
+#define elf_backend_gc_sweep_hook	elf_vax_gc_sweep_hook
+#define elf_backend_plt_sym_val		elf_vax_plt_sym_val
+#define bfd_elf32_bfd_merge_private_bfd_data \
+                                        elf32_vax_merge_private_bfd_data
+#define bfd_elf32_bfd_set_private_flags \
+                                        elf32_vax_set_private_flags
+#define bfd_elf32_bfd_print_private_bfd_data \
+                                        elf32_vax_print_private_bfd_data
+
+#define elf_backend_can_gc_sections	1
+#define elf_backend_want_got_plt	1
+#define elf_backend_plt_readonly	1
+#define elf_backend_want_plt_sym	0
+#define elf_backend_got_header_size	16
+#define elf_backend_rela_normal		1
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-xc16x.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-xc16x.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-xc16x.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-xc16x.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,477 @@
+/* Infineon XC16X-specific support for 16-bit ELF.
+   Copyright 2006, 2007, 2009, 2010  Free Software Foundation, Inc.
+   Contributed by KPIT Cummins Infosystems 
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/xc16x.h"
+#include "dwarf2.h"
+#include "libiberty.h"
+
+static reloc_howto_type xc16x_elf_howto_table [] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_XC16X_NONE,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_XC16X_NONE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An 8 bit absolute relocation.  */
+  HOWTO (R_XC16X_ABS_8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 8,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_XC16X_ABS_8",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000,		/* src_mask */
+	 0x00ff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit absolute relocation.  */
+  HOWTO (R_XC16X_ABS_16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_XC16X_ABS_16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x00000000,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_XC16X_ABS_32,	/* type */
+  	 0,			/* rightshift */
+  	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+  	 32,			/* bitsize */
+  	 FALSE,			/* pc_relative */
+  	 0,			/* bitpos */
+  	 complain_overflow_bitfield, /* complain_on_overflow */
+  	 bfd_elf_generic_reloc,	/* special_function */
+  	 "R_XC16X_ABS_32",	/* name */
+  	 TRUE,			/* partial_inplace */
+  	 0x00000000,		/* src_mask */
+  	 0xffffffff,		/* dst_mask */
+  	 FALSE),		/* pcrel_offset */
+
+
+  /* A PC relative 8 bit relocation.  */
+  HOWTO (R_XC16X_8_PCREL,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 8,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_XC16X_8_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000,		/* src_mask */
+	 0x00ff,		/* dst_mask */
+	 TRUE),		/* pcrel_offset */
+
+  /* Relocation regarding page number.  */
+    HOWTO (R_XC16X_PAG,	/* type */
+  	 0,			/* rightshift */
+  	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+  	 16,			/* bitsize */
+  	 FALSE,			/* pc_relative */
+  	 0,			/* bitpos */
+  	 complain_overflow_signed, /* complain_on_overflow */
+  	 bfd_elf_generic_reloc, /* special_function */
+  	 "R_XC16X_PAG",	/* name */
+  	 TRUE,			/* partial_inplace */
+  	 0x00000000,		/* src_mask */
+  	 0x0000ffff,		/* dst_mask */
+  	 FALSE),		/* pcrel_offset */
+
+
+  /* Relocation regarding page number.  */
+      HOWTO (R_XC16X_POF,	/* type */
+    	 0,			/* rightshift */
+    	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+    	 16,			/* bitsize */
+    	 FALSE,			/* pc_relative */
+    	 0,			/* bitpos  */
+    	 complain_overflow_signed, /* complain_on_overflow  */
+    	 bfd_elf_generic_reloc, /* special_function  */
+    	 "R_XC16X_POF",	/* name  */
+    	 TRUE,			/* partial_inplace  */
+    	 0x00000000,		/* src_mask  */
+    	 0x0000ffff,		/* dst_mask  */
+    	 FALSE),		/* pcrel_offset  */
+
+
+  /* Relocation regarding segment number.   */
+      HOWTO (R_XC16X_SEG,	/* type  */
+    	 0,			/* rightshift  */
+    	 1,			/* size (0 = byte, 1 = short, 2 = long)  */
+    	 16,			/* bitsize  */
+    	 FALSE,			/* pc_relative  */
+    	 0,			/* bitpos  */
+    	 complain_overflow_signed, /* complain_on_overflow  */
+    	 bfd_elf_generic_reloc, /* special_function  */
+    	 "R_XC16X_SEG",	/* name  */
+    	 TRUE,			/* partial_inplace  */
+    	 0x00000000,		/* src_mask  */
+    	 0x0000ffff,		/* dst_mask  */
+    	 FALSE),		/* pcrel_offset  */
+
+  /* Relocation regarding segment offset.  */
+      HOWTO (R_XC16X_SOF,	/* type  */
+    	 0,			/* rightshift  */
+    	 1,			/* size (0 = byte, 1 = short, 2 = long)  */
+    	 16,			/* bitsize  */
+    	 FALSE,			/* pc_relative  */
+    	 0,			/* bitpos  */
+    	 complain_overflow_signed, /* complain_on_overflow  */
+    	 bfd_elf_generic_reloc, /* special_function  */
+    	 "R_XC16X_SOF",	/* name */
+    	 TRUE,			/* partial_inplace  */
+    	 0x00000000,		/* src_mask  */
+    	 0x0000ffff,		/* dst_mask  */
+    	 FALSE)			/* pcrel_offset  */
+};
+
+
+/* Map BFD reloc types to XC16X ELF reloc types.  */
+
+struct xc16x_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned int xc16x_reloc_val;
+};
+
+static const struct xc16x_reloc_map xc16x_reloc_map [] =
+{
+  { BFD_RELOC_NONE,           R_XC16X_NONE },
+  { BFD_RELOC_8,              R_XC16X_ABS_8 },
+  { BFD_RELOC_16,             R_XC16X_ABS_16 },
+  { BFD_RELOC_32,             R_XC16X_ABS_32 },
+  { BFD_RELOC_8_PCREL,        R_XC16X_8_PCREL },
+  { BFD_RELOC_XC16X_PAG,      R_XC16X_PAG},
+  { BFD_RELOC_XC16X_POF,      R_XC16X_POF},
+  { BFD_RELOC_XC16X_SEG,      R_XC16X_SEG},
+  { BFD_RELOC_XC16X_SOF,      R_XC16X_SOF},
+};
+
+
+/* This function is used to search for correct relocation type from
+   howto structure.  */
+
+static reloc_howto_type *
+xc16x_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			 bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = ARRAY_SIZE (xc16x_reloc_map); --i;)
+    if (xc16x_reloc_map [i].bfd_reloc_val == code)
+      return & xc16x_elf_howto_table [xc16x_reloc_map[i].xc16x_reloc_val];
+
+  return NULL;
+}
+
+static reloc_howto_type *
+xc16x_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			 const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (xc16x_elf_howto_table) / sizeof (xc16x_elf_howto_table[0]);
+       i++)
+    if (xc16x_elf_howto_table[i].name != NULL
+	&& strcasecmp (xc16x_elf_howto_table[i].name, r_name) == 0)
+      return &xc16x_elf_howto_table[i];
+
+  return NULL;
+}
+
+/* For a particular operand this function is
+   called to finalise the type of relocation.  */
+
+static void
+elf32_xc16x_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *bfd_reloc,
+			   Elf_Internal_Rela *elf_reloc)
+{
+  unsigned int r;
+  unsigned int i;
+
+  r = ELF32_R_TYPE (elf_reloc->r_info);
+  for (i = 0; i < ARRAY_SIZE (xc16x_elf_howto_table); i++)
+    if (xc16x_elf_howto_table[i].type == r)
+      {
+	bfd_reloc->howto = &xc16x_elf_howto_table[i];
+	return;
+      }
+  abort ();
+}
+
+static bfd_reloc_status_type
+elf32_xc16x_final_link_relocate (unsigned long r_type,
+				 bfd *input_bfd,
+				 bfd *output_bfd ATTRIBUTE_UNUSED,
+				 asection *input_section ATTRIBUTE_UNUSED,
+				 bfd_byte *contents,
+				 bfd_vma offset,
+				 bfd_vma value,
+				 bfd_vma addend,
+				 struct bfd_link_info *info ATTRIBUTE_UNUSED,
+				 asection *sym_sec ATTRIBUTE_UNUSED,
+				 int is_local ATTRIBUTE_UNUSED)
+{
+  bfd_byte *hit_data = contents + offset;
+  bfd_vma val1;
+
+  switch (r_type)
+    {
+    case R_XC16X_NONE:
+      return bfd_reloc_ok;
+
+    case R_XC16X_ABS_16:
+      value += addend;
+      bfd_put_16 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_XC16X_8_PCREL:
+      bfd_put_8 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+      /* Following case is to find page number from actual
+	 address for this divide value by 16k i.e. page size.  */
+
+    case R_XC16X_PAG:
+      value += addend;
+      value /= 0x4000;
+      bfd_put_16 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+      /* Following case is to find page offset from actual address
+	 for this take modulo of value by 16k i.e. page size.  */
+
+    case R_XC16X_POF:
+      value += addend;
+      value %= 0x4000;
+      bfd_put_16 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+      /* Following case is to find segment number from actual
+	 address for this divide value by 64k i.e. segment size.  */
+
+    case R_XC16X_SEG:
+      value += addend;
+      value /= 0x10000;
+      bfd_put_16 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+      /* Following case is to find segment offset from actual address
+	 for this take modulo of value by 64k i.e. segment size.  */
+
+    case R_XC16X_SOF:
+      value += addend;
+      value %= 0x10000;
+      bfd_put_16 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_XC16X_ABS_32:
+      if (!strstr (input_section->name,".debug"))
+	{
+	  value += addend;
+	  val1 = value;
+	  value %= 0x4000;
+	  val1 /= 0x4000;
+	  val1 = val1 << 16;
+	  value += val1;
+	  bfd_put_32 (input_bfd, value, hit_data);
+	}
+      else
+	{
+	  value += addend;
+	  bfd_put_32 (input_bfd, value, hit_data);
+	}
+      return bfd_reloc_ok;
+
+    default:
+      return bfd_reloc_notsupported;
+    }
+}
+
+static bfd_boolean
+elf32_xc16x_relocate_section (bfd *output_bfd,
+			      struct bfd_link_info *info,
+			      bfd *input_bfd,
+			      asection *input_section,
+			      bfd_byte *contents,
+			      Elf_Internal_Rela *relocs,
+			      Elf_Internal_Sym *local_syms,
+			      asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel, *relend;
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      unsigned int r_type;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+
+      /* This is a final link.  */
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc, warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	{
+	  /* For relocs against symbols from removed linkonce sections,
+	     or sections discarded by a linker script, we just want the
+	     section contents cleared.  Avoid any special processing.  */
+	  reloc_howto_type *howto;
+	  howto = xc16x_reloc_type_lookup (input_bfd, r_type);
+	  RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					   rel, relend, howto, contents);
+	}
+
+      if (info->relocatable)
+	continue;
+
+      elf32_xc16x_final_link_relocate (r_type, input_bfd, output_bfd,
+				       input_section,
+				       contents, rel->r_offset,
+				       relocation, rel->r_addend,
+				       info, sec, h == NULL);
+    }
+
+  return TRUE;
+}
+
+
+static void
+elf32_xc16x_final_write_processing (bfd *abfd,
+				    bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  unsigned long val;
+
+  switch (bfd_get_mach (abfd))
+    {
+    default:
+    case bfd_mach_xc16x:
+      val = 0x1000;
+      break;
+
+    case bfd_mach_xc16xl:
+      val = 0x1001;
+      break;
+
+    case bfd_mach_xc16xs:
+      val = 0x1002;
+      break;
+    }
+
+  elf_elfheader (abfd)->e_flags |= val;
+}
+
+static unsigned long
+elf32_xc16x_mach (flagword flags)
+{  
+  switch (flags)
+    {
+    case 0x1000:
+    default: 
+      return bfd_mach_xc16x;
+
+    case 0x1001:
+      return bfd_mach_xc16xl;
+
+    case 0x1002:
+      return bfd_mach_xc16xs;
+    }
+}
+
+
+static bfd_boolean
+elf32_xc16x_object_p (bfd *abfd)
+{
+  bfd_default_set_arch_mach (abfd, bfd_arch_xc16x,
+			     elf32_xc16x_mach (elf_elfheader (abfd)->e_flags));
+  return TRUE;
+}
+
+
+#define ELF_ARCH		bfd_arch_xc16x
+#define ELF_MACHINE_CODE	EM_XC16X
+#define ELF_MAXPAGESIZE		0x100
+
+#define TARGET_LITTLE_SYM       bfd_elf32_xc16x_vec
+#define TARGET_LITTLE_NAME	"elf32-xc16x"
+#define elf_backend_final_write_processing	elf32_xc16x_final_write_processing
+#define elf_backend_object_p   		elf32_xc16x_object_p
+#define elf_backend_can_gc_sections	1
+#define bfd_elf32_bfd_reloc_type_lookup	xc16x_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup xc16x_reloc_name_lookup
+#define elf_info_to_howto		elf32_xc16x_info_to_howto
+#define elf_info_to_howto_rel		elf32_xc16x_info_to_howto
+#define elf_backend_relocate_section  	elf32_xc16x_relocate_section
+#define elf_backend_rela_normal		1
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-xstormy16.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-xstormy16.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-xstormy16.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-xstormy16.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1040 @@
+/* Xstormy16-specific support for 32-bit ELF.
+   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/xstormy16.h"
+#include "libiberty.h"
+
+/* Handle the R_XSTORMY16_24 reloc, which has an odd bit arrangement.  */
+
+static bfd_reloc_status_type
+xstormy16_elf_24_reloc (bfd *abfd,
+			arelent *reloc_entry,
+			asymbol *symbol,
+			void * data,
+			asection *input_section,
+			bfd *output_bfd,
+			char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma relocation, x;
+
+  if (output_bfd != NULL)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  relocation += reloc_entry->addend;
+
+  x = bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
+  x &= 0x0000ff00;
+  x |= relocation & 0xff;
+  x |= (relocation << 8) & 0xffff0000;
+  bfd_put_32 (abfd, x, (bfd_byte *) data + reloc_entry->address);
+
+  if (relocation & ~ (bfd_vma) 0xffffff)
+    return bfd_reloc_overflow;
+
+  return bfd_reloc_ok;
+}
+
+static reloc_howto_type xstormy16_elf_howto_table [] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_XSTORMY16_NONE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_XSTORMY16_NONE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32 bit absolute relocation.  */
+  HOWTO (R_XSTORMY16_32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_XSTORMY16_32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit absolute relocation.  */
+  HOWTO (R_XSTORMY16_16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_XSTORMY16_16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An 8 bit absolute relocation.  */
+  HOWTO (R_XSTORMY16_8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_XSTORMY16_8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32 bit pc-relative relocation.  */
+  HOWTO (R_XSTORMY16_PC32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_XSTORMY16_PC32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 16 bit pc-relative relocation.  */
+  HOWTO (R_XSTORMY16_PC16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_XSTORMY16_PC16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* An 8 bit pc-relative relocation.  */
+  HOWTO (R_XSTORMY16_PC8,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_XSTORMY16_PC8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 12-bit pc-relative relocation suitable for the branch instructions.  */
+  HOWTO (R_XSTORMY16_REL_12,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 11,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 1,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_XSTORMY16_REL_12",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0ffe,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 24-bit absolute relocation suitable for the jump instructions.  */
+  HOWTO (R_XSTORMY16_24,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 xstormy16_elf_24_reloc,	/* special_function */
+	 "R_XSTORMY16_24",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff00ff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 16 bit absolute relocation to a function pointer.  */
+  HOWTO (R_XSTORMY16_FPTR16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_XSTORMY16_FPTR16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low order 16 bit value of a high memory address.  */
+  HOWTO (R_XSTORMY16_LO16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_XSTORMY16_LO16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High order 16 bit value of a high memory address.  */
+  HOWTO (R_XSTORMY16_HI16,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_XSTORMY16_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 12 bit absolute relocation.  */
+  HOWTO (R_XSTORMY16_12,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_XSTORMY16_12",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000,		/* src_mask */
+	 0x0fff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+static reloc_howto_type xstormy16_elf_howto_table2 [] =
+{
+  /* GNU extension to record C++ vtable hierarchy */
+  HOWTO (R_XSTORMY16_GNU_VTINHERIT, /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         NULL,                  /* special_function */
+         "R_XSTORMY16_GNU_VTINHERIT", /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage */
+  HOWTO (R_XSTORMY16_GNU_VTENTRY,     /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
+         "R_XSTORMY16_GNU_VTENTRY",   /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+};
+
+/* Map BFD reloc types to XSTORMY16 ELF reloc types.  */
+
+typedef struct xstormy16_reloc_map
+{
+  bfd_reloc_code_real_type  bfd_reloc_val;
+  unsigned int              xstormy16_reloc_val;
+  reloc_howto_type *        table;
+} reloc_map;
+
+static const reloc_map xstormy16_reloc_map [] =
+{
+  { BFD_RELOC_NONE,                 R_XSTORMY16_NONE,          xstormy16_elf_howto_table },
+  { BFD_RELOC_32,                   R_XSTORMY16_32,            xstormy16_elf_howto_table },
+  { BFD_RELOC_16,                   R_XSTORMY16_16,            xstormy16_elf_howto_table },
+  { BFD_RELOC_8,                    R_XSTORMY16_8,             xstormy16_elf_howto_table },
+  { BFD_RELOC_32_PCREL,             R_XSTORMY16_PC32,          xstormy16_elf_howto_table },
+  { BFD_RELOC_16_PCREL,             R_XSTORMY16_PC16,          xstormy16_elf_howto_table },
+  { BFD_RELOC_8_PCREL,              R_XSTORMY16_PC8,           xstormy16_elf_howto_table },
+  { BFD_RELOC_XSTORMY16_REL_12,     R_XSTORMY16_REL_12,        xstormy16_elf_howto_table },
+  { BFD_RELOC_XSTORMY16_24,	    R_XSTORMY16_24,            xstormy16_elf_howto_table },
+  { BFD_RELOC_XSTORMY16_FPTR16,	    R_XSTORMY16_FPTR16,        xstormy16_elf_howto_table },
+  { BFD_RELOC_LO16,                 R_XSTORMY16_LO16,          xstormy16_elf_howto_table },
+  { BFD_RELOC_HI16,                 R_XSTORMY16_HI16,          xstormy16_elf_howto_table },
+  { BFD_RELOC_XSTORMY16_12,         R_XSTORMY16_12,            xstormy16_elf_howto_table },
+  { BFD_RELOC_VTABLE_INHERIT,       R_XSTORMY16_GNU_VTINHERIT, xstormy16_elf_howto_table2 },
+  { BFD_RELOC_VTABLE_ENTRY,         R_XSTORMY16_GNU_VTENTRY,   xstormy16_elf_howto_table2 },
+};
+
+static reloc_howto_type *
+xstormy16_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
+			     bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = ARRAY_SIZE (xstormy16_reloc_map); --i;)
+    {
+      const reloc_map * entry;
+
+      entry = xstormy16_reloc_map + i;
+
+      if (entry->bfd_reloc_val == code)
+	return entry->table + (entry->xstormy16_reloc_val
+			       - entry->table[0].type);
+    }
+
+  return NULL;
+}
+
+static reloc_howto_type *
+xstormy16_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			     const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (xstormy16_elf_howto_table)
+	    / sizeof (xstormy16_elf_howto_table[0]));
+       i++)
+    if (xstormy16_elf_howto_table[i].name != NULL
+	&& strcasecmp (xstormy16_elf_howto_table[i].name, r_name) == 0)
+      return &xstormy16_elf_howto_table[i];
+
+  for (i = 0;
+       i < (sizeof (xstormy16_elf_howto_table2)
+	    / sizeof (xstormy16_elf_howto_table2[0]));
+       i++)
+    if (xstormy16_elf_howto_table2[i].name != NULL
+	&& strcasecmp (xstormy16_elf_howto_table2[i].name, r_name) == 0)
+      return &xstormy16_elf_howto_table2[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for an XSTORMY16 ELF reloc.  */
+
+static void
+xstormy16_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED,
+			      arelent * cache_ptr,
+			      Elf_Internal_Rela * dst)
+{
+  unsigned int r_type = ELF32_R_TYPE (dst->r_info);
+
+  if (r_type <= (unsigned int) R_XSTORMY16_12)
+    cache_ptr->howto = &xstormy16_elf_howto_table [r_type];
+  else if (r_type - R_XSTORMY16_GNU_VTINHERIT
+	   <= (unsigned int) R_XSTORMY16_GNU_VTENTRY)
+    cache_ptr->howto
+      = &xstormy16_elf_howto_table2 [r_type - R_XSTORMY16_GNU_VTINHERIT];
+  else
+    abort ();
+}
+
+/* We support 16-bit pointers to code above 64k by generating a thunk
+   below 64k containing a JMPF instruction to the final address.  We
+   cannot, unfortunately, minimize the number of thunks unless the
+   -relax switch is given, as otherwise we have no idea where the
+   sections will fall in the address space.  */
+
+static bfd_boolean
+xstormy16_elf_check_relocs (bfd *abfd,
+			    struct bfd_link_info *info,
+			    asection *sec,
+			    const Elf_Internal_Rela *relocs)
+{
+  const Elf_Internal_Rela *rel, *relend;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Shdr *symtab_hdr;
+  bfd_vma *local_plt_offsets;
+  asection *splt;
+  bfd *dynobj;
+
+  if (info->relocatable)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  local_plt_offsets = elf_local_got_offsets (abfd);
+  splt = NULL;
+  dynobj = elf_hash_table(info)->dynobj;
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; ++rel)
+    {
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+      bfd_vma *offset;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+	h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      switch (ELF32_R_TYPE (rel->r_info))
+        {
+	  /* This relocation describes a 16-bit pointer to a function.
+	     We may need to allocate a thunk in low memory; reserve memory
+	     for it now.  */
+	case R_XSTORMY16_FPTR16:
+	  if (rel->r_addend != 0)
+	    {
+	      (*info->callbacks->warning)
+		(info, _("non-zero addend in @fptr reloc"), 0,
+		 abfd, 0, 0);
+	    }
+
+	  if (dynobj == NULL)
+	    elf_hash_table (info)->dynobj = dynobj = abfd;
+	  if (splt == NULL)
+	    {
+	      splt = bfd_get_section_by_name (dynobj, ".plt");
+	      if (splt == NULL)
+		{
+		  splt = bfd_make_section_with_flags (dynobj, ".plt",
+						      (SEC_ALLOC
+						       | SEC_LOAD
+						       | SEC_HAS_CONTENTS
+						       | SEC_IN_MEMORY
+						       | SEC_LINKER_CREATED
+						       | SEC_READONLY
+						       | SEC_CODE));
+
+		  if (splt == NULL
+		      || ! bfd_set_section_alignment (dynobj, splt, 1))
+		    return FALSE;
+		}
+	    }
+
+	  if (h != NULL)
+	    offset = &h->plt.offset;
+	  else
+	    {
+	      if (local_plt_offsets == NULL)
+		{
+		  size_t size;
+		  unsigned int i;
+
+		  size = symtab_hdr->sh_info * sizeof (bfd_vma);
+		  local_plt_offsets = bfd_alloc (abfd, size);
+		  if (local_plt_offsets == NULL)
+		    return FALSE;
+		  elf_local_got_offsets (abfd) = local_plt_offsets;
+
+		  for (i = 0; i < symtab_hdr->sh_info; i++)
+		    local_plt_offsets[i] = (bfd_vma) -1;
+		}
+	      offset = &local_plt_offsets[r_symndx];
+	    }
+
+	  if (*offset == (bfd_vma) -1)
+	    {
+	      *offset = splt->size;
+	      splt->size += 4;
+	    }
+	  break;
+
+	  /* This relocation describes the C++ object vtable hierarchy.
+	     Reconstruct it for later use during GC.  */
+        case R_XSTORMY16_GNU_VTINHERIT:
+          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+
+	  /* This relocation describes which C++ vtable entries are actually
+	     used.  Record for later use during GC.  */
+        case R_XSTORMY16_GNU_VTENTRY:
+          BFD_ASSERT (h != NULL);
+          if (h != NULL
+              && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+            return FALSE;
+          break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* A subroutine of xstormy16_elf_relax_section.  If the global symbol H
+   is within the low 64k, remove any entry for it in the plt.  */
+
+struct relax_plt_data
+{
+  asection *splt;
+  bfd_boolean *again;
+};
+
+static bfd_boolean
+xstormy16_relax_plt_check (struct elf_link_hash_entry *h, void * xdata)
+{
+  struct relax_plt_data *data = (struct relax_plt_data *) xdata;
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      bfd_vma address;
+
+      if (h->root.type == bfd_link_hash_undefined
+	  || h->root.type == bfd_link_hash_undefweak)
+	address = 0;
+      else
+	address = (h->root.u.def.section->output_section->vma
+		   + h->root.u.def.section->output_offset
+		   + h->root.u.def.value);
+
+      if (address <= 0xffff)
+	{
+	  h->plt.offset = -1;
+	  data->splt->size -= 4;
+	  *data->again = TRUE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* A subroutine of xstormy16_elf_relax_section.  If the global symbol H
+   previously had a plt entry, give it a new entry offset.  */
+
+static bfd_boolean
+xstormy16_relax_plt_realloc (struct elf_link_hash_entry *h, void * xdata)
+{
+  bfd_vma *entry = (bfd_vma *) xdata;
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      h->plt.offset = *entry;
+      *entry += 4;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+xstormy16_elf_relax_section (bfd *dynobj,
+			     asection *splt,
+			     struct bfd_link_info *info,
+			     bfd_boolean *again)
+{
+  struct relax_plt_data relax_plt_data;
+  bfd *ibfd;
+
+  /* Assume nothing changes.  */
+  *again = FALSE;
+
+  if (info->relocatable)
+    return TRUE;
+
+  /* We only relax the .plt section at the moment.  */
+  if (dynobj != elf_hash_table (info)->dynobj
+      || strcmp (splt->name, ".plt") != 0)
+    return TRUE;
+
+  /* Quick check for an empty plt.  */
+  if (splt->size == 0)
+    return TRUE;
+
+  /* Map across all global symbols; see which ones happen to
+     fall in the low 64k.  */
+  relax_plt_data.splt = splt;
+  relax_plt_data.again = again;
+  elf_link_hash_traverse (elf_hash_table (info), xstormy16_relax_plt_check,
+			  &relax_plt_data);
+
+  /* Likewise for local symbols, though that's somewhat less convenient
+     as we have to walk the list of input bfds and swap in symbol data.  */
+  for (ibfd = info->input_bfds; ibfd ; ibfd = ibfd->link_next)
+    {
+      bfd_vma *local_plt_offsets = elf_local_got_offsets (ibfd);
+      Elf_Internal_Shdr *symtab_hdr;
+      Elf_Internal_Sym *isymbuf = NULL;
+      unsigned int idx;
+
+      if (! local_plt_offsets)
+	continue;
+
+      symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+      if (symtab_hdr->sh_info != 0)
+	{
+	  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	  if (isymbuf == NULL)
+	    isymbuf = bfd_elf_get_elf_syms (ibfd, symtab_hdr,
+					    symtab_hdr->sh_info, 0,
+					    NULL, NULL, NULL);
+	  if (isymbuf == NULL)
+	    return FALSE;
+	}
+
+      for (idx = 0; idx < symtab_hdr->sh_info; ++idx)
+	{
+	  Elf_Internal_Sym *isym;
+	  asection *tsec;
+	  bfd_vma address;
+
+	  if (local_plt_offsets[idx] == (bfd_vma) -1)
+	    continue;
+
+	  isym = &isymbuf[idx];
+	  if (isym->st_shndx == SHN_UNDEF)
+	    continue;
+	  else if (isym->st_shndx == SHN_ABS)
+	    tsec = bfd_abs_section_ptr;
+	  else if (isym->st_shndx == SHN_COMMON)
+	    tsec = bfd_com_section_ptr;
+	  else
+	    tsec = bfd_section_from_elf_index (ibfd, isym->st_shndx);
+
+	  address = (tsec->output_section->vma
+		     + tsec->output_offset
+		     + isym->st_value);
+	  if (address <= 0xffff)
+	    {
+	      local_plt_offsets[idx] = -1;
+	      splt->size -= 4;
+	      *again = TRUE;
+	    }
+	}
+
+      if (isymbuf != NULL
+	  && symtab_hdr->contents != (unsigned char *) isymbuf)
+	{
+	  if (! info->keep_memory)
+	    free (isymbuf);
+	  else
+	    {
+	      /* Cache the symbols for elf_link_input_bfd.  */
+	      symtab_hdr->contents = (unsigned char *) isymbuf;
+	    }
+	}
+    }
+
+  /* If we changed anything, walk the symbols again to reallocate
+     .plt entry addresses.  */
+  if (*again && splt->size > 0)
+    {
+      bfd_vma entry = 0;
+
+      elf_link_hash_traverse (elf_hash_table (info),
+			      xstormy16_relax_plt_realloc, &entry);
+
+      for (ibfd = info->input_bfds; ibfd ; ibfd = ibfd->link_next)
+	{
+	  bfd_vma *local_plt_offsets = elf_local_got_offsets (ibfd);
+	  unsigned int nlocals = elf_tdata (ibfd)->symtab_hdr.sh_info;
+	  unsigned int idx;
+
+	  if (! local_plt_offsets)
+	    continue;
+
+	  for (idx = 0; idx < nlocals; ++idx)
+	    if (local_plt_offsets[idx] != (bfd_vma) -1)
+	      {
+	        local_plt_offsets[idx] = entry;
+		entry += 4;
+	      }
+	}
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+xstormy16_elf_always_size_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+				    struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *splt;
+
+  if (info->relocatable)
+    return TRUE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  if (dynobj == NULL)
+    return TRUE;
+
+  splt = bfd_get_section_by_name (dynobj, ".plt");
+  BFD_ASSERT (splt != NULL);
+
+  splt->contents = bfd_zalloc (dynobj, splt->size);
+  if (splt->contents == NULL)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Relocate an XSTORMY16 ELF section.
+
+   The RELOCATE_SECTION function is called by the new ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures; if the section
+   actually uses Rel structures, the r_addend field will always be
+   zero.
+
+   This function is responsible for adjusting the section contents as
+   necessary, and (if using Rela relocs and generating a relocatable
+   output file) adjusting the reloc addend as necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.  */
+
+static bfd_boolean
+xstormy16_elf_relocate_section (bfd *                   output_bfd ATTRIBUTE_UNUSED,
+				struct bfd_link_info *  info,
+				bfd *                   input_bfd,
+				asection *              input_section,
+				bfd_byte *              contents,
+				Elf_Internal_Rela *     relocs,
+				Elf_Internal_Sym *      local_syms,
+				asection **             local_sections)
+{
+  Elf_Internal_Shdr *           symtab_hdr;
+  struct elf_link_hash_entry ** sym_hashes;
+  Elf_Internal_Rela *           rel;
+  Elf_Internal_Rela *           relend;
+  bfd *dynobj;
+  asection *splt;
+
+  symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+  relend     = relocs + input_section->reloc_count;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  splt = NULL;
+  if (dynobj != NULL)
+    splt = bfd_get_section_by_name (dynobj, ".plt");
+
+  for (rel = relocs; rel < relend; rel ++)
+    {
+      reloc_howto_type *           howto;
+      unsigned long                r_symndx;
+      Elf_Internal_Sym *           sym;
+      asection *                   sec;
+      struct elf_link_hash_entry * h;
+      bfd_vma                      relocation;
+      bfd_reloc_status_type        r;
+      const char *                 name = NULL;
+      int                          r_type;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      if (   r_type == R_XSTORMY16_GNU_VTINHERIT
+	  || r_type == R_XSTORMY16_GNU_VTENTRY)
+	continue;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      howto  = xstormy16_elf_howto_table + ELF32_R_TYPE (rel->r_info);
+      h      = NULL;
+      sym    = NULL;
+      sec    = NULL;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections [r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc, warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      if (h != NULL)
+	name = h->root.root.string;
+      else
+	{
+	  name = (bfd_elf_string_from_elf_section
+		  (input_bfd, symtab_hdr->sh_link, sym->st_name));
+	  if (name == NULL || *name == '\0')
+	    name = bfd_section_name (input_bfd, sec);
+	}
+
+      switch (ELF32_R_TYPE (rel->r_info))
+	{
+	case R_XSTORMY16_24:
+	  {
+	    bfd_vma reloc = relocation + rel->r_addend;
+	    unsigned int x;
+
+	    x = bfd_get_32 (input_bfd, contents + rel->r_offset);
+	    x &= 0x0000ff00;
+	    x |= reloc & 0xff;
+	    x |= (reloc << 8) & 0xffff0000;
+	    bfd_put_32 (input_bfd, x, contents + rel->r_offset);
+
+	    if (reloc & ~0xffffff)
+	      r = bfd_reloc_overflow;
+	    else
+	      r = bfd_reloc_ok;
+	    break;
+	  }
+
+	case R_XSTORMY16_FPTR16:
+	  {
+	    bfd_vma *plt_offset;
+
+	    if (h != NULL)
+	      plt_offset = &h->plt.offset;
+	    else
+	      plt_offset = elf_local_got_offsets (input_bfd) + r_symndx;
+
+	    if (relocation <= 0xffff)
+	      {
+	        /* If the symbol is in range for a 16-bit address, we should
+		   have deallocated the plt entry in relax_section.  */
+	        BFD_ASSERT (*plt_offset == (bfd_vma) -1);
+	      }
+	    else
+	      {
+		/* If the symbol is out of range for a 16-bit address,
+		   we must have allocated a plt entry.  */
+		BFD_ASSERT (*plt_offset != (bfd_vma) -1);
+
+		/* If this is the first time we've processed this symbol,
+		   fill in the plt entry with the correct symbol address.  */
+		if ((*plt_offset & 1) == 0)
+		  {
+		    unsigned int x;
+
+		    x = 0x00000200;  /* jmpf */
+		    x |= relocation & 0xff;
+		    x |= (relocation << 8) & 0xffff0000;
+		    bfd_put_32 (input_bfd, x, splt->contents + *plt_offset);
+		    *plt_offset |= 1;
+		  }
+
+		relocation = (splt->output_section->vma
+			      + splt->output_offset
+			      + (*plt_offset & -2));
+	      }
+	    r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+					  contents, rel->r_offset,
+					  relocation, 0);
+	    break;
+	  }
+
+	default:
+	  r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+					contents, rel->r_offset,
+					relocation, rel->r_addend);
+	  break;
+	}
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char * msg = NULL;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      r = info->callbacks->reloc_overflow
+		(info, (h ? &h->root : NULL), name, howto->name,
+		 (bfd_vma) 0, input_bfd, input_section, rel->r_offset);
+	      break;
+
+	    case bfd_reloc_undefined:
+	      r = info->callbacks->undefined_symbol
+		(info, name, input_bfd, input_section, rel->r_offset,
+		 TRUE);
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      break;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      break;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous relocation");
+	      break;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      break;
+	    }
+
+	  if (msg)
+	    r = info->callbacks->warning
+	      (info, msg, name, input_bfd, input_section, rel->r_offset);
+
+	  if (! r)
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* This must exist if dynobj is ever set.  */
+
+static bfd_boolean
+xstormy16_elf_finish_dynamic_sections (bfd *abfd ATTRIBUTE_UNUSED,
+				       struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *splt;
+
+  /* As an extra sanity check, verify that all plt entries have
+     been filled in.  */
+
+  if ((dynobj = elf_hash_table (info)->dynobj) != NULL
+      && (splt = bfd_get_section_by_name (dynobj, ".plt")) != NULL)
+    {
+      bfd_byte *contents = splt->contents;
+      unsigned int i, size = splt->size;
+
+      for (i = 0; i < size; i += 4)
+	{
+	  unsigned int x = bfd_get_32 (dynobj, contents + i);
+
+	  BFD_ASSERT (x != 0);
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+static asection *
+xstormy16_elf_gc_mark_hook (asection *sec,
+			    struct bfd_link_info *info,
+			    Elf_Internal_Rela *rel,
+			    struct elf_link_hash_entry *h,
+			    Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_XSTORMY16_GNU_VTINHERIT:
+      case R_XSTORMY16_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+#define ELF_ARCH		bfd_arch_xstormy16
+#define ELF_MACHINE_CODE	EM_XSTORMY16
+#define ELF_MAXPAGESIZE		0x100
+
+#define TARGET_LITTLE_SYM       bfd_elf32_xstormy16_vec
+#define TARGET_LITTLE_NAME	"elf32-xstormy16"
+
+#define elf_info_to_howto_rel			NULL
+#define elf_info_to_howto			xstormy16_info_to_howto_rela
+#define elf_backend_relocate_section		xstormy16_elf_relocate_section
+#define elf_backend_gc_mark_hook		xstormy16_elf_gc_mark_hook
+#define elf_backend_check_relocs                xstormy16_elf_check_relocs
+#define elf_backend_always_size_sections \
+  xstormy16_elf_always_size_sections
+#define elf_backend_omit_section_dynsym \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true)
+#define elf_backend_finish_dynamic_sections \
+  xstormy16_elf_finish_dynamic_sections
+
+#define elf_backend_can_gc_sections		1
+#define elf_backend_rela_normal			1
+
+#define bfd_elf32_bfd_reloc_type_lookup		xstormy16_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup \
+  xstormy16_reloc_name_lookup
+#define bfd_elf32_bfd_relax_section		xstormy16_elf_relax_section
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-xtensa.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-xtensa.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32-xtensa.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32-xtensa.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,10822 @@
+/* Xtensa-specific support for 32-bit ELF.
+   Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 3 of the
+   License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+
+#include <stdarg.h>
+#include <strings.h>
+
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/xtensa.h"
+#include "xtensa-isa.h"
+#include "xtensa-config.h"
+
+#define XTENSA_NO_NOP_REMOVAL 0
+
+/* Local helper functions.  */
+
+static bfd_boolean add_extra_plt_sections (struct bfd_link_info *, int);
+static char *vsprint_msg (const char *, const char *, int, ...) ATTRIBUTE_PRINTF(2,4);
+static bfd_reloc_status_type bfd_elf_xtensa_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_boolean do_fix_for_relocatable_link
+  (Elf_Internal_Rela *, bfd *, asection *, bfd_byte *);
+static void do_fix_for_final_link
+  (Elf_Internal_Rela *, bfd *, asection *, bfd_byte *, bfd_vma *);
+
+/* Local functions to handle Xtensa configurability.  */
+
+static bfd_boolean is_indirect_call_opcode (xtensa_opcode);
+static bfd_boolean is_direct_call_opcode (xtensa_opcode);
+static bfd_boolean is_windowed_call_opcode (xtensa_opcode);
+static xtensa_opcode get_const16_opcode (void);
+static xtensa_opcode get_l32r_opcode (void);
+static bfd_vma l32r_offset (bfd_vma, bfd_vma);
+static int get_relocation_opnd (xtensa_opcode, int);
+static int get_relocation_slot (int);
+static xtensa_opcode get_relocation_opcode
+  (bfd *, asection *, bfd_byte *, Elf_Internal_Rela *);
+static bfd_boolean is_l32r_relocation
+  (bfd *, asection *, bfd_byte *, Elf_Internal_Rela *);
+static bfd_boolean is_alt_relocation (int);
+static bfd_boolean is_operand_relocation (int);
+static bfd_size_type insn_decode_len
+  (bfd_byte *, bfd_size_type, bfd_size_type);
+static xtensa_opcode insn_decode_opcode
+  (bfd_byte *, bfd_size_type, bfd_size_type, int);
+static bfd_boolean check_branch_target_aligned
+  (bfd_byte *, bfd_size_type, bfd_vma, bfd_vma);
+static bfd_boolean check_loop_aligned
+  (bfd_byte *, bfd_size_type, bfd_vma, bfd_vma);
+static bfd_boolean check_branch_target_aligned_address (bfd_vma, int);
+static bfd_size_type get_asm_simplify_size
+  (bfd_byte *, bfd_size_type, bfd_size_type);
+
+/* Functions for link-time code simplifications.  */
+
+static bfd_reloc_status_type elf_xtensa_do_asm_simplify
+  (bfd_byte *, bfd_vma, bfd_vma, char **);
+static bfd_reloc_status_type contract_asm_expansion
+  (bfd_byte *, bfd_vma, Elf_Internal_Rela *, char **);
+static xtensa_opcode swap_callx_for_call_opcode (xtensa_opcode);
+static xtensa_opcode get_expanded_call_opcode (bfd_byte *, int, bfd_boolean *);
+
+/* Access to internal relocations, section contents and symbols.  */
+
+static Elf_Internal_Rela *retrieve_internal_relocs
+  (bfd *, asection *, bfd_boolean);
+static void pin_internal_relocs (asection *, Elf_Internal_Rela *);
+static void release_internal_relocs (asection *, Elf_Internal_Rela *);
+static bfd_byte *retrieve_contents (bfd *, asection *, bfd_boolean);
+static void pin_contents (asection *, bfd_byte *);
+static void release_contents (asection *, bfd_byte *);
+static Elf_Internal_Sym *retrieve_local_syms (bfd *);
+
+/* Miscellaneous utility functions.  */
+
+static asection *elf_xtensa_get_plt_section (struct bfd_link_info *, int);
+static asection *elf_xtensa_get_gotplt_section (struct bfd_link_info *, int);
+static asection *get_elf_r_symndx_section (bfd *, unsigned long);
+static struct elf_link_hash_entry *get_elf_r_symndx_hash_entry
+  (bfd *, unsigned long);
+static bfd_vma get_elf_r_symndx_offset (bfd *, unsigned long);
+static bfd_boolean is_reloc_sym_weak (bfd *, Elf_Internal_Rela *);
+static bfd_boolean pcrel_reloc_fits (xtensa_opcode, int, bfd_vma, bfd_vma);
+static bfd_boolean xtensa_is_property_section (asection *);
+static bfd_boolean xtensa_is_insntable_section (asection *);
+static bfd_boolean xtensa_is_littable_section (asection *);
+static bfd_boolean xtensa_is_proptable_section (asection *);
+static int internal_reloc_compare (const void *, const void *);
+static int internal_reloc_matches (const void *, const void *);
+static asection *xtensa_get_property_section (asection *, const char *);
+extern asection *xtensa_make_property_section (asection *, const char *);
+static flagword xtensa_get_property_predef_flags (asection *);
+
+/* Other functions called directly by the linker.  */
+
+typedef void (*deps_callback_t)
+  (asection *, bfd_vma, asection *, bfd_vma, void *);
+extern bfd_boolean xtensa_callback_required_dependence
+  (bfd *, asection *, struct bfd_link_info *, deps_callback_t, void *);
+
+
+/* Globally visible flag for choosing size optimization of NOP removal
+   instead of branch-target-aware minimization for NOP removal.
+   When nonzero, narrow all instructions and remove all NOPs possible
+   around longcall expansions.  */
+
+int elf32xtensa_size_opt;
+
+
+/* The "new_section_hook" is used to set up a per-section
+   "xtensa_relax_info" data structure with additional information used
+   during relaxation.  */
+
+typedef struct xtensa_relax_info_struct xtensa_relax_info;
+
+
+/* The GNU tools do not easily allow extending interfaces to pass around
+   the pointer to the Xtensa ISA information, so instead we add a global
+   variable here (in BFD) that can be used by any of the tools that need
+   this information. */
+
+xtensa_isa xtensa_default_isa;
+
+
+/* When this is true, relocations may have been modified to refer to
+   symbols from other input files.  The per-section list of "fix"
+   records needs to be checked when resolving relocations.  */
+
+static bfd_boolean relaxing_section = FALSE;
+
+/* When this is true, during final links, literals that cannot be
+   coalesced and their relocations may be moved to other sections.  */
+
+int elf32xtensa_no_literal_movement = 1;
+
+/* Rename one of the generic section flags to better document how it
+   is used here.  */
+/* Whether relocations have been processed.  */
+#define reloc_done sec_flg0
+
+static reloc_howto_type elf_howto_table[] =
+{
+  HOWTO (R_XTENSA_NONE, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_NONE",
+	 FALSE, 0, 0, FALSE),
+  HOWTO (R_XTENSA_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_32",
+	 TRUE, 0xffffffff, 0xffffffff, FALSE),
+
+  /* Replace a 32-bit value with a value from the runtime linker (only
+     used by linker-generated stub functions).  The r_addend value is
+     special: 1 means to substitute a pointer to the runtime linker's
+     dynamic resolver function; 2 means to substitute the link map for
+     the shared object.  */
+  HOWTO (R_XTENSA_RTLD, 0, 2, 32, FALSE, 0, complain_overflow_dont,
+	 NULL, "R_XTENSA_RTLD", FALSE, 0, 0, FALSE),
+
+  HOWTO (R_XTENSA_GLOB_DAT, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	 bfd_elf_generic_reloc, "R_XTENSA_GLOB_DAT",
+	 FALSE, 0, 0xffffffff, FALSE),
+  HOWTO (R_XTENSA_JMP_SLOT, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	 bfd_elf_generic_reloc, "R_XTENSA_JMP_SLOT",
+	 FALSE, 0, 0xffffffff, FALSE),
+  HOWTO (R_XTENSA_RELATIVE, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	 bfd_elf_generic_reloc, "R_XTENSA_RELATIVE",
+	 FALSE, 0, 0xffffffff, FALSE),
+  HOWTO (R_XTENSA_PLT, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_PLT",
+	 FALSE, 0, 0xffffffff, FALSE),
+
+  EMPTY_HOWTO (7),
+
+  /* Old relocations for backward compatibility.  */
+  HOWTO (R_XTENSA_OP0, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_OP0", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_OP1, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_OP1", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_OP2, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_OP2", FALSE, 0, 0, TRUE),
+
+  /* Assembly auto-expansion.  */
+  HOWTO (R_XTENSA_ASM_EXPAND, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_ASM_EXPAND", FALSE, 0, 0, TRUE),
+  /* Relax assembly auto-expansion.  */
+  HOWTO (R_XTENSA_ASM_SIMPLIFY, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_ASM_SIMPLIFY", FALSE, 0, 0, TRUE),
+
+  EMPTY_HOWTO (13),
+
+  HOWTO (R_XTENSA_32_PCREL, 0, 2, 32, TRUE, 0, complain_overflow_bitfield,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_32_PCREL",
+	 FALSE, 0, 0xffffffff, TRUE),
+
+  /* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_XTENSA_GNU_VTINHERIT, 0, 2, 0, FALSE, 0, complain_overflow_dont,
+         NULL, "R_XTENSA_GNU_VTINHERIT",
+	 FALSE, 0, 0, FALSE),
+  /* GNU extension to record C++ vtable member usage.  */
+  HOWTO (R_XTENSA_GNU_VTENTRY, 0, 2, 0, FALSE, 0, complain_overflow_dont,
+         _bfd_elf_rel_vtable_reloc_fn, "R_XTENSA_GNU_VTENTRY",
+	 FALSE, 0, 0, FALSE),
+
+  /* Relocations for supporting difference of symbols.  */
+  HOWTO (R_XTENSA_DIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_DIFF8", FALSE, 0, 0xff, FALSE),
+  HOWTO (R_XTENSA_DIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_DIFF16", FALSE, 0, 0xffff, FALSE),
+  HOWTO (R_XTENSA_DIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_DIFF32", FALSE, 0, 0xffffffff, FALSE),
+
+  /* General immediate operand relocations.  */
+  HOWTO (R_XTENSA_SLOT0_OP, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT0_OP", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT1_OP, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT1_OP", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT2_OP, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT2_OP", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT3_OP, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT3_OP", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT4_OP, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT4_OP", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT5_OP, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT5_OP", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT6_OP, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT6_OP", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT7_OP, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT7_OP", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT8_OP, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT8_OP", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT9_OP, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT9_OP", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT10_OP, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT10_OP", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT11_OP, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT11_OP", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT12_OP, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT12_OP", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT13_OP, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT13_OP", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT14_OP, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT14_OP", FALSE, 0, 0, TRUE),
+
+  /* "Alternate" relocations.  The meaning of these is opcode-specific.  */
+  HOWTO (R_XTENSA_SLOT0_ALT, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT0_ALT", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT1_ALT, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT1_ALT", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT2_ALT, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT2_ALT", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT3_ALT, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT3_ALT", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT4_ALT, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT4_ALT", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT5_ALT, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT5_ALT", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT6_ALT, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT6_ALT", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT7_ALT, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT7_ALT", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT8_ALT, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT8_ALT", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT9_ALT, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT9_ALT", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT10_ALT, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT10_ALT", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT11_ALT, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT11_ALT", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT12_ALT, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT12_ALT", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT13_ALT, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT13_ALT", FALSE, 0, 0, TRUE),
+  HOWTO (R_XTENSA_SLOT14_ALT, 0, 0, 0, TRUE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_SLOT14_ALT", FALSE, 0, 0, TRUE),
+
+  /* TLS relocations.  */
+  HOWTO (R_XTENSA_TLSDESC_FN, 0, 2, 32, FALSE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_TLSDESC_FN",
+	 FALSE, 0, 0xffffffff, FALSE),
+  HOWTO (R_XTENSA_TLSDESC_ARG, 0, 2, 32, FALSE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_TLSDESC_ARG",
+	 FALSE, 0, 0xffffffff, FALSE),
+  HOWTO (R_XTENSA_TLS_DTPOFF, 0, 2, 32, FALSE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_TLS_DTPOFF",
+	 FALSE, 0, 0xffffffff, FALSE),
+  HOWTO (R_XTENSA_TLS_TPOFF, 0, 2, 32, FALSE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_TLS_TPOFF",
+	 FALSE, 0, 0xffffffff, FALSE),
+  HOWTO (R_XTENSA_TLS_FUNC, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_TLS_FUNC",
+	 FALSE, 0, 0, FALSE),
+  HOWTO (R_XTENSA_TLS_ARG, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_TLS_ARG",
+	 FALSE, 0, 0, FALSE),
+  HOWTO (R_XTENSA_TLS_CALL, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+	 bfd_elf_xtensa_reloc, "R_XTENSA_TLS_CALL",
+	 FALSE, 0, 0, FALSE),
+};
+
+#if DEBUG_GEN_RELOC
+#define TRACE(str) \
+  fprintf (stderr, "Xtensa bfd reloc lookup %d (%s)\n", code, str)
+#else
+#define TRACE(str)
+#endif
+
+static reloc_howto_type *
+elf_xtensa_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			      bfd_reloc_code_real_type code)
+{
+  switch (code)
+    {
+    case BFD_RELOC_NONE:
+      TRACE ("BFD_RELOC_NONE");
+      return &elf_howto_table[(unsigned) R_XTENSA_NONE ];
+
+    case BFD_RELOC_32:
+      TRACE ("BFD_RELOC_32");
+      return &elf_howto_table[(unsigned) R_XTENSA_32 ];
+
+    case BFD_RELOC_32_PCREL:
+      TRACE ("BFD_RELOC_32_PCREL");
+      return &elf_howto_table[(unsigned) R_XTENSA_32_PCREL ];
+
+    case BFD_RELOC_XTENSA_DIFF8:
+      TRACE ("BFD_RELOC_XTENSA_DIFF8");
+      return &elf_howto_table[(unsigned) R_XTENSA_DIFF8 ];
+
+    case BFD_RELOC_XTENSA_DIFF16:
+      TRACE ("BFD_RELOC_XTENSA_DIFF16");
+      return &elf_howto_table[(unsigned) R_XTENSA_DIFF16 ];
+
+    case BFD_RELOC_XTENSA_DIFF32:
+      TRACE ("BFD_RELOC_XTENSA_DIFF32");
+      return &elf_howto_table[(unsigned) R_XTENSA_DIFF32 ];
+
+    case BFD_RELOC_XTENSA_RTLD:
+      TRACE ("BFD_RELOC_XTENSA_RTLD");
+      return &elf_howto_table[(unsigned) R_XTENSA_RTLD ];
+
+    case BFD_RELOC_XTENSA_GLOB_DAT:
+      TRACE ("BFD_RELOC_XTENSA_GLOB_DAT");
+      return &elf_howto_table[(unsigned) R_XTENSA_GLOB_DAT ];
+
+    case BFD_RELOC_XTENSA_JMP_SLOT:
+      TRACE ("BFD_RELOC_XTENSA_JMP_SLOT");
+      return &elf_howto_table[(unsigned) R_XTENSA_JMP_SLOT ];
+
+    case BFD_RELOC_XTENSA_RELATIVE:
+      TRACE ("BFD_RELOC_XTENSA_RELATIVE");
+      return &elf_howto_table[(unsigned) R_XTENSA_RELATIVE ];
+
+    case BFD_RELOC_XTENSA_PLT:
+      TRACE ("BFD_RELOC_XTENSA_PLT");
+      return &elf_howto_table[(unsigned) R_XTENSA_PLT ];
+
+    case BFD_RELOC_XTENSA_OP0:
+      TRACE ("BFD_RELOC_XTENSA_OP0");
+      return &elf_howto_table[(unsigned) R_XTENSA_OP0 ];
+
+    case BFD_RELOC_XTENSA_OP1:
+      TRACE ("BFD_RELOC_XTENSA_OP1");
+      return &elf_howto_table[(unsigned) R_XTENSA_OP1 ];
+
+    case BFD_RELOC_XTENSA_OP2:
+      TRACE ("BFD_RELOC_XTENSA_OP2");
+      return &elf_howto_table[(unsigned) R_XTENSA_OP2 ];
+
+    case BFD_RELOC_XTENSA_ASM_EXPAND:
+      TRACE ("BFD_RELOC_XTENSA_ASM_EXPAND");
+      return &elf_howto_table[(unsigned) R_XTENSA_ASM_EXPAND ];
+
+    case BFD_RELOC_XTENSA_ASM_SIMPLIFY:
+      TRACE ("BFD_RELOC_XTENSA_ASM_SIMPLIFY");
+      return &elf_howto_table[(unsigned) R_XTENSA_ASM_SIMPLIFY ];
+
+    case BFD_RELOC_VTABLE_INHERIT:
+      TRACE ("BFD_RELOC_VTABLE_INHERIT");
+      return &elf_howto_table[(unsigned) R_XTENSA_GNU_VTINHERIT ];
+
+    case BFD_RELOC_VTABLE_ENTRY:
+      TRACE ("BFD_RELOC_VTABLE_ENTRY");
+      return &elf_howto_table[(unsigned) R_XTENSA_GNU_VTENTRY ];
+
+    case BFD_RELOC_XTENSA_TLSDESC_FN:
+      TRACE ("BFD_RELOC_XTENSA_TLSDESC_FN");
+      return &elf_howto_table[(unsigned) R_XTENSA_TLSDESC_FN ];
+
+    case BFD_RELOC_XTENSA_TLSDESC_ARG:
+      TRACE ("BFD_RELOC_XTENSA_TLSDESC_ARG");
+      return &elf_howto_table[(unsigned) R_XTENSA_TLSDESC_ARG ];
+
+    case BFD_RELOC_XTENSA_TLS_DTPOFF:
+      TRACE ("BFD_RELOC_XTENSA_TLS_DTPOFF");
+      return &elf_howto_table[(unsigned) R_XTENSA_TLS_DTPOFF ];
+
+    case BFD_RELOC_XTENSA_TLS_TPOFF:
+      TRACE ("BFD_RELOC_XTENSA_TLS_TPOFF");
+      return &elf_howto_table[(unsigned) R_XTENSA_TLS_TPOFF ];
+
+    case BFD_RELOC_XTENSA_TLS_FUNC:
+      TRACE ("BFD_RELOC_XTENSA_TLS_FUNC");
+      return &elf_howto_table[(unsigned) R_XTENSA_TLS_FUNC ];
+
+    case BFD_RELOC_XTENSA_TLS_ARG:
+      TRACE ("BFD_RELOC_XTENSA_TLS_ARG");
+      return &elf_howto_table[(unsigned) R_XTENSA_TLS_ARG ];
+
+    case BFD_RELOC_XTENSA_TLS_CALL:
+      TRACE ("BFD_RELOC_XTENSA_TLS_CALL");
+      return &elf_howto_table[(unsigned) R_XTENSA_TLS_CALL ];
+
+    default:
+      if (code >= BFD_RELOC_XTENSA_SLOT0_OP
+	  && code <= BFD_RELOC_XTENSA_SLOT14_OP)
+	{
+	  unsigned n = (R_XTENSA_SLOT0_OP +
+			(code - BFD_RELOC_XTENSA_SLOT0_OP));
+	  return &elf_howto_table[n];
+	}
+
+      if (code >= BFD_RELOC_XTENSA_SLOT0_ALT
+	  && code <= BFD_RELOC_XTENSA_SLOT14_ALT)
+	{
+	  unsigned n = (R_XTENSA_SLOT0_ALT +
+			(code - BFD_RELOC_XTENSA_SLOT0_ALT));
+	  return &elf_howto_table[n];
+	}
+
+      break;
+    }
+
+  TRACE ("Unknown");
+  return NULL;
+}
+
+static reloc_howto_type *
+elf_xtensa_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			      const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (elf_howto_table) / sizeof (elf_howto_table[0]); i++)
+    if (elf_howto_table[i].name != NULL
+	&& strcasecmp (elf_howto_table[i].name, r_name) == 0)
+      return &elf_howto_table[i];
+
+  return NULL;
+}
+
+
+/* Given an ELF "rela" relocation, find the corresponding howto and record
+   it in the BFD internal arelent representation of the relocation.  */
+
+static void
+elf_xtensa_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
+			       arelent *cache_ptr,
+			       Elf_Internal_Rela *dst)
+{
+  unsigned int r_type = ELF32_R_TYPE (dst->r_info);
+
+  BFD_ASSERT (r_type < (unsigned int) R_XTENSA_max);
+  cache_ptr->howto = &elf_howto_table[r_type];
+}
+
+
+/* Functions for the Xtensa ELF linker.  */
+
+/* The name of the dynamic interpreter.  This is put in the .interp
+   section.  */
+
+#define ELF_DYNAMIC_INTERPRETER "/lib/ld.so"
+
+/* The size in bytes of an entry in the procedure linkage table.
+   (This does _not_ include the space for the literals associated with
+   the PLT entry.) */
+
+#define PLT_ENTRY_SIZE 16
+
+/* For _really_ large PLTs, we may need to alternate between literals
+   and code to keep the literals within the 256K range of the L32R
+   instructions in the code.  It's unlikely that anyone would ever need
+   such a big PLT, but an arbitrary limit on the PLT size would be bad.
+   Thus, we split the PLT into chunks.  Since there's very little
+   overhead (2 extra literals) for each chunk, the chunk size is kept
+   small so that the code for handling multiple chunks get used and
+   tested regularly.  With 254 entries, there are 1K of literals for
+   each chunk, and that seems like a nice round number.  */
+
+#define PLT_ENTRIES_PER_CHUNK 254
+
+/* PLT entries are actually used as stub functions for lazy symbol
+   resolution.  Once the symbol is resolved, the stub function is never
+   invoked.  Note: the 32-byte frame size used here cannot be changed
+   without a corresponding change in the runtime linker.  */
+
+static const bfd_byte elf_xtensa_be_plt_entry[PLT_ENTRY_SIZE] =
+{
+  0x6c, 0x10, 0x04,	/* entry sp, 32 */
+  0x18, 0x00, 0x00,	/* l32r  a8, [got entry for rtld's resolver] */
+  0x1a, 0x00, 0x00,	/* l32r  a10, [got entry for rtld's link map] */
+  0x1b, 0x00, 0x00,	/* l32r  a11, [literal for reloc index] */
+  0x0a, 0x80, 0x00,	/* jx    a8 */
+  0			/* unused */
+};
+
+static const bfd_byte elf_xtensa_le_plt_entry[PLT_ENTRY_SIZE] =
+{
+  0x36, 0x41, 0x00,	/* entry sp, 32 */
+  0x81, 0x00, 0x00,	/* l32r  a8, [got entry for rtld's resolver] */
+  0xa1, 0x00, 0x00,	/* l32r  a10, [got entry for rtld's link map] */
+  0xb1, 0x00, 0x00,	/* l32r  a11, [literal for reloc index] */
+  0xa0, 0x08, 0x00,	/* jx    a8 */
+  0			/* unused */
+};
+
+/* The size of the thread control block.  */
+#define TCB_SIZE	8
+
+struct elf_xtensa_link_hash_entry
+{
+  struct elf_link_hash_entry elf;
+
+  bfd_signed_vma tlsfunc_refcount;
+
+#define GOT_UNKNOWN	0
+#define GOT_NORMAL	1
+#define GOT_TLS_GD	2	/* global or local dynamic */
+#define GOT_TLS_IE	4	/* initial or local exec */
+#define GOT_TLS_ANY	(GOT_TLS_GD | GOT_TLS_IE)
+  unsigned char tls_type;
+};
+
+#define elf_xtensa_hash_entry(ent) ((struct elf_xtensa_link_hash_entry *)(ent))
+
+struct elf_xtensa_obj_tdata
+{
+  struct elf_obj_tdata root;
+
+  /* tls_type for each local got entry.  */
+  char *local_got_tls_type;
+
+  bfd_signed_vma *local_tlsfunc_refcounts;
+};
+
+#define elf_xtensa_tdata(abfd) \
+  ((struct elf_xtensa_obj_tdata *) (abfd)->tdata.any)
+
+#define elf_xtensa_local_got_tls_type(abfd) \
+  (elf_xtensa_tdata (abfd)->local_got_tls_type)
+
+#define elf_xtensa_local_tlsfunc_refcounts(abfd) \
+  (elf_xtensa_tdata (abfd)->local_tlsfunc_refcounts)
+
+#define is_xtensa_elf(bfd) \
+  (bfd_get_flavour (bfd) == bfd_target_elf_flavour \
+   && elf_tdata (bfd) != NULL \
+   && elf_object_id (bfd) == XTENSA_ELF_DATA)
+
+static bfd_boolean
+elf_xtensa_mkobject (bfd *abfd)
+{
+  return bfd_elf_allocate_object (abfd, sizeof (struct elf_xtensa_obj_tdata),
+				  XTENSA_ELF_DATA);
+}
+
+/* Xtensa ELF linker hash table.  */
+
+struct elf_xtensa_link_hash_table
+{
+  struct elf_link_hash_table elf;
+
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *sgot;
+  asection *sgotplt;
+  asection *srelgot;
+  asection *splt;
+  asection *srelplt;
+  asection *sgotloc;
+  asection *spltlittbl;
+
+  /* Total count of PLT relocations seen during check_relocs.
+     The actual PLT code must be split into multiple sections and all
+     the sections have to be created before size_dynamic_sections,
+     where we figure out the exact number of PLT entries that will be
+     needed.  It is OK if this count is an overestimate, e.g., some
+     relocations may be removed by GC.  */
+  int plt_reloc_count;
+
+  struct elf_xtensa_link_hash_entry *tlsbase;
+};
+
+/* Get the Xtensa ELF linker hash table from a link_info structure.  */
+
+#define elf_xtensa_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == XTENSA_ELF_DATA ? ((struct elf_xtensa_link_hash_table *) ((p)->hash)) : NULL)
+
+/* Create an entry in an Xtensa ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+elf_xtensa_link_hash_newfunc (struct bfd_hash_entry *entry,
+			      struct bfd_hash_table *table,
+			      const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table,
+				 sizeof (struct elf_xtensa_link_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = _bfd_elf_link_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct elf_xtensa_link_hash_entry *eh = elf_xtensa_hash_entry (entry);
+      eh->tlsfunc_refcount = 0;
+      eh->tls_type = GOT_UNKNOWN;
+    }
+
+  return entry;
+}
+
+/* Create an Xtensa ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+elf_xtensa_link_hash_table_create (bfd *abfd)
+{
+  struct elf_link_hash_entry *tlsbase;
+  struct elf_xtensa_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct elf_xtensa_link_hash_table);
+
+  ret = bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd,
+				      elf_xtensa_link_hash_newfunc,
+				      sizeof (struct elf_xtensa_link_hash_entry),
+				      XTENSA_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  ret->sgot = NULL;
+  ret->sgotplt = NULL;
+  ret->srelgot = NULL;
+  ret->splt = NULL;
+  ret->srelplt = NULL;
+  ret->sgotloc = NULL;
+  ret->spltlittbl = NULL;
+
+  ret->plt_reloc_count = 0;
+
+  /* Create a hash entry for "_TLS_MODULE_BASE_" to speed up checking
+     for it later.  */
+  tlsbase = elf_link_hash_lookup (&ret->elf, "_TLS_MODULE_BASE_",
+				  TRUE, FALSE, FALSE);
+  tlsbase->root.type = bfd_link_hash_new;
+  tlsbase->root.u.undef.abfd = NULL;
+  tlsbase->non_elf = 0;
+  ret->tlsbase = elf_xtensa_hash_entry (tlsbase);
+  ret->tlsbase->tls_type = GOT_UNKNOWN;
+
+  return &ret->elf.root;
+}
+
+/* Copy the extra info we tack onto an elf_link_hash_entry.  */
+
+static void
+elf_xtensa_copy_indirect_symbol (struct bfd_link_info *info,
+				 struct elf_link_hash_entry *dir,
+				 struct elf_link_hash_entry *ind)
+{
+  struct elf_xtensa_link_hash_entry *edir, *eind;
+
+  edir = elf_xtensa_hash_entry (dir);
+  eind = elf_xtensa_hash_entry (ind);
+
+  if (ind->root.type == bfd_link_hash_indirect)
+    {
+      edir->tlsfunc_refcount += eind->tlsfunc_refcount;
+      eind->tlsfunc_refcount = 0;
+
+      if (dir->got.refcount <= 0)
+	{
+	  edir->tls_type = eind->tls_type;
+	  eind->tls_type = GOT_UNKNOWN;
+	}
+    }
+
+  _bfd_elf_link_hash_copy_indirect (info, dir, ind);
+}
+
+static inline bfd_boolean
+elf_xtensa_dynamic_symbol_p (struct elf_link_hash_entry *h,
+			     struct bfd_link_info *info)
+{
+  /* Check if we should do dynamic things to this symbol.  The
+     "ignore_protected" argument need not be set, because Xtensa code
+     does not require special handling of STV_PROTECTED to make function
+     pointer comparisons work properly.  The PLT addresses are never
+     used for function pointers.  */
+
+  return _bfd_elf_dynamic_symbol_p (h, info, 0);
+}
+
+
+static int
+property_table_compare (const void *ap, const void *bp)
+{
+  const property_table_entry *a = (const property_table_entry *) ap;
+  const property_table_entry *b = (const property_table_entry *) bp;
+
+  if (a->address == b->address)
+    {
+      if (a->size != b->size)
+	return (a->size - b->size);
+
+      if ((a->flags & XTENSA_PROP_ALIGN) != (b->flags & XTENSA_PROP_ALIGN))
+	return ((b->flags & XTENSA_PROP_ALIGN)
+		- (a->flags & XTENSA_PROP_ALIGN));
+
+      if ((a->flags & XTENSA_PROP_ALIGN)
+	  && (GET_XTENSA_PROP_ALIGNMENT (a->flags)
+	      != GET_XTENSA_PROP_ALIGNMENT (b->flags)))
+	return (GET_XTENSA_PROP_ALIGNMENT (a->flags)
+		- GET_XTENSA_PROP_ALIGNMENT (b->flags));
+      
+      if ((a->flags & XTENSA_PROP_UNREACHABLE)
+	  != (b->flags & XTENSA_PROP_UNREACHABLE))
+	return ((b->flags & XTENSA_PROP_UNREACHABLE)
+		- (a->flags & XTENSA_PROP_UNREACHABLE));
+
+      return (a->flags - b->flags);
+    }
+
+  return (a->address - b->address);
+}
+
+
+static int
+property_table_matches (const void *ap, const void *bp)
+{
+  const property_table_entry *a = (const property_table_entry *) ap;
+  const property_table_entry *b = (const property_table_entry *) bp;
+
+  /* Check if one entry overlaps with the other.  */
+  if ((b->address >= a->address && b->address < (a->address + a->size))
+      || (a->address >= b->address && a->address < (b->address + b->size)))
+    return 0;
+
+  return (a->address - b->address);
+}
+
+
+/* Get the literal table or property table entries for the given
+   section.  Sets TABLE_P and returns the number of entries.  On
+   error, returns a negative value.  */
+
+static int
+xtensa_read_table_entries (bfd *abfd,
+			   asection *section,
+			   property_table_entry **table_p,
+			   const char *sec_name,
+			   bfd_boolean output_addr)
+{
+  asection *table_section;
+  bfd_size_type table_size = 0;
+  bfd_byte *table_data;
+  property_table_entry *blocks;
+  int blk, block_count;
+  bfd_size_type num_records;
+  Elf_Internal_Rela *internal_relocs, *irel, *rel_end;
+  bfd_vma section_addr, off;
+  flagword predef_flags;
+  bfd_size_type table_entry_size, section_limit;
+
+  if (!section
+      || !(section->flags & SEC_ALLOC)
+      || (section->flags & SEC_DEBUGGING))
+    {
+      *table_p = NULL;
+      return 0;
+    }
+
+  table_section = xtensa_get_property_section (section, sec_name);
+  if (table_section)
+    table_size = table_section->size;
+
+  if (table_size == 0) 
+    {
+      *table_p = NULL;
+      return 0;
+    }
+
+  predef_flags = xtensa_get_property_predef_flags (table_section);
+  table_entry_size = 12;
+  if (predef_flags)
+    table_entry_size -= 4;
+
+  num_records = table_size / table_entry_size;
+  table_data = retrieve_contents (abfd, table_section, TRUE);
+  blocks = (property_table_entry *)
+    bfd_malloc (num_records * sizeof (property_table_entry));
+  block_count = 0;
+
+  if (output_addr)
+    section_addr = section->output_section->vma + section->output_offset;
+  else
+    section_addr = section->vma;
+
+  internal_relocs = retrieve_internal_relocs (abfd, table_section, TRUE);
+  if (internal_relocs && !table_section->reloc_done)
+    {
+      qsort (internal_relocs, table_section->reloc_count,
+	     sizeof (Elf_Internal_Rela), internal_reloc_compare);
+      irel = internal_relocs;
+    }
+  else
+    irel = NULL;
+
+  section_limit = bfd_get_section_limit (abfd, section);
+  rel_end = internal_relocs + table_section->reloc_count;
+
+  for (off = 0; off < table_size; off += table_entry_size) 
+    {
+      bfd_vma address = bfd_get_32 (abfd, table_data + off);
+
+      /* Skip any relocations before the current offset.  This should help
+	 avoid confusion caused by unexpected relocations for the preceding
+	 table entry.  */
+      while (irel &&
+	     (irel->r_offset < off
+	      || (irel->r_offset == off
+		  && ELF32_R_TYPE (irel->r_info) == R_XTENSA_NONE)))
+	{
+	  irel += 1;
+	  if (irel >= rel_end)
+	    irel = 0;
+	}
+
+      if (irel && irel->r_offset == off)
+	{
+	  bfd_vma sym_off;
+	  unsigned long r_symndx = ELF32_R_SYM (irel->r_info);
+	  BFD_ASSERT (ELF32_R_TYPE (irel->r_info) == R_XTENSA_32);
+
+	  if (get_elf_r_symndx_section (abfd, r_symndx) != section)
+	    continue;
+
+	  sym_off = get_elf_r_symndx_offset (abfd, r_symndx);
+	  BFD_ASSERT (sym_off == 0);
+	  address += (section_addr + sym_off + irel->r_addend);
+	}
+      else
+	{
+	  if (address < section_addr
+	      || address >= section_addr + section_limit)
+	    continue;
+	}
+
+      blocks[block_count].address = address;
+      blocks[block_count].size = bfd_get_32 (abfd, table_data + off + 4);
+      if (predef_flags)
+	blocks[block_count].flags = predef_flags;
+      else
+	blocks[block_count].flags = bfd_get_32 (abfd, table_data + off + 8);
+      block_count++;
+    }
+
+  release_contents (table_section, table_data);
+  release_internal_relocs (table_section, internal_relocs);
+
+  if (block_count > 0)
+    {
+      /* Now sort them into address order for easy reference.  */
+      qsort (blocks, block_count, sizeof (property_table_entry),
+	     property_table_compare);
+
+      /* Check that the table contents are valid.  Problems may occur,
+         for example, if an unrelocated object file is stripped.  */
+      for (blk = 1; blk < block_count; blk++)
+	{
+	  /* The only circumstance where two entries may legitimately
+	     have the same address is when one of them is a zero-size
+	     placeholder to mark a place where fill can be inserted.
+	     The zero-size entry should come first.  */
+	  if (blocks[blk - 1].address == blocks[blk].address &&
+	      blocks[blk - 1].size != 0)
+	    {
+	      (*_bfd_error_handler) (_("%B(%A): invalid property table"),
+				     abfd, section);
+	      bfd_set_error (bfd_error_bad_value);
+	      free (blocks);
+	      return -1;
+	    }
+	}
+    }
+
+  *table_p = blocks;
+  return block_count;
+}
+
+
+static property_table_entry *
+elf_xtensa_find_property_entry (property_table_entry *property_table,
+				int property_table_size,
+				bfd_vma addr)
+{
+  property_table_entry entry;
+  property_table_entry *rv;
+
+  if (property_table_size == 0)
+    return NULL;
+
+  entry.address = addr;
+  entry.size = 1;
+  entry.flags = 0;
+
+  rv = bsearch (&entry, property_table, property_table_size,
+		sizeof (property_table_entry), property_table_matches);
+  return rv;
+}
+
+
+static bfd_boolean
+elf_xtensa_in_literal_pool (property_table_entry *lit_table,
+			    int lit_table_size,
+			    bfd_vma addr)
+{
+  if (elf_xtensa_find_property_entry (lit_table, lit_table_size, addr))
+    return TRUE;
+
+  return FALSE;
+}
+
+
+/* Look through the relocs for a section during the first phase, and
+   calculate needed space in the dynamic reloc sections.  */
+
+static bfd_boolean
+elf_xtensa_check_relocs (bfd *abfd,
+			 struct bfd_link_info *info,
+			 asection *sec,
+			 const Elf_Internal_Rela *relocs)
+{
+  struct elf_xtensa_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+
+  if (info->relocatable || (sec->flags & SEC_ALLOC) == 0)
+    return TRUE;
+
+  BFD_ASSERT (is_xtensa_elf (abfd));
+
+  htab = elf_xtensa_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      unsigned int r_type;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h = NULL;
+      struct elf_xtensa_link_hash_entry *eh;
+      int tls_type, old_tls_type;
+      bfd_boolean is_got = FALSE;
+      bfd_boolean is_plt = FALSE;
+      bfd_boolean is_tlsfunc = FALSE;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
+	{
+	  (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
+				 abfd, r_symndx);
+	  return FALSE;
+	}
+
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+      eh = elf_xtensa_hash_entry (h);
+
+      switch (r_type)
+	{
+	case R_XTENSA_TLSDESC_FN:
+	  if (info->shared)
+	    {
+	      tls_type = GOT_TLS_GD;
+	      is_got = TRUE;
+	      is_tlsfunc = TRUE;
+	    }
+	  else
+	    tls_type = GOT_TLS_IE;
+	  break;
+
+	case R_XTENSA_TLSDESC_ARG:
+	  if (info->shared)
+	    {
+	      tls_type = GOT_TLS_GD;
+	      is_got = TRUE;
+	    }
+	  else
+	    {
+	      tls_type = GOT_TLS_IE;
+	      if (h && elf_xtensa_hash_entry (h) != htab->tlsbase)
+		is_got = TRUE;
+	    }
+	  break;
+
+	case R_XTENSA_TLS_DTPOFF:
+	  if (info->shared)
+	    tls_type = GOT_TLS_GD;
+	  else
+	    tls_type = GOT_TLS_IE;
+	  break;
+
+	case R_XTENSA_TLS_TPOFF:
+	  tls_type = GOT_TLS_IE;
+	  if (info->shared)
+	    info->flags |= DF_STATIC_TLS;
+	  if (info->shared || h)
+	    is_got = TRUE;
+	  break;
+
+	case R_XTENSA_32:
+	  tls_type = GOT_NORMAL;
+	  is_got = TRUE;
+	  break;
+
+	case R_XTENSA_PLT:
+	  tls_type = GOT_NORMAL;
+	  is_plt = TRUE;
+	  break;
+
+	case R_XTENSA_GNU_VTINHERIT:
+	  /* This relocation describes the C++ object vtable hierarchy.
+	     Reconstruct it for later use during GC.  */
+	  if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+	    return FALSE;
+	  continue;
+
+	case R_XTENSA_GNU_VTENTRY:
+	  /* This relocation describes which C++ vtable entries are actually
+	     used.  Record for later use during GC.  */
+	  BFD_ASSERT (h != NULL);
+	  if (h != NULL
+	      && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+	    return FALSE;
+	  continue;
+
+	default:
+	  /* Nothing to do for any other relocations.  */
+	  continue;
+	}
+
+      if (h)
+	{
+	  if (is_plt)
+	    {
+	      if (h->plt.refcount <= 0)
+		{
+		  h->needs_plt = 1;
+		  h->plt.refcount = 1;
+		}
+	      else
+		h->plt.refcount += 1;
+
+	      /* Keep track of the total PLT relocation count even if we
+		 don't yet know whether the dynamic sections will be
+		 created.  */
+	      htab->plt_reloc_count += 1;
+
+	      if (elf_hash_table (info)->dynamic_sections_created)
+		{
+		  if (! add_extra_plt_sections (info, htab->plt_reloc_count))
+		    return FALSE;
+		}
+	    }
+	  else if (is_got)
+	    {
+	      if (h->got.refcount <= 0)
+		h->got.refcount = 1;
+	      else
+		h->got.refcount += 1;
+	    }
+
+	  if (is_tlsfunc)
+	    eh->tlsfunc_refcount += 1;
+
+	  old_tls_type = eh->tls_type;
+	}
+      else
+	{
+	  /* Allocate storage the first time.  */
+	  if (elf_local_got_refcounts (abfd) == NULL)
+	    {
+	      bfd_size_type size = symtab_hdr->sh_info;
+	      void *mem;
+
+	      mem = bfd_zalloc (abfd, size * sizeof (bfd_signed_vma));
+	      if (mem == NULL)
+		return FALSE;
+	      elf_local_got_refcounts (abfd) = (bfd_signed_vma *) mem;
+
+	      mem = bfd_zalloc (abfd, size);
+	      if (mem == NULL)
+		return FALSE;
+	      elf_xtensa_local_got_tls_type (abfd) = (char *) mem;
+
+	      mem = bfd_zalloc (abfd, size * sizeof (bfd_signed_vma));
+	      if (mem == NULL)
+		return FALSE;
+	      elf_xtensa_local_tlsfunc_refcounts (abfd)
+		= (bfd_signed_vma *) mem;
+	    }
+
+	  /* This is a global offset table entry for a local symbol.  */
+	  if (is_got || is_plt)
+	    elf_local_got_refcounts (abfd) [r_symndx] += 1;
+
+	  if (is_tlsfunc)
+	    elf_xtensa_local_tlsfunc_refcounts (abfd) [r_symndx] += 1;
+
+	  old_tls_type = elf_xtensa_local_got_tls_type (abfd) [r_symndx];
+	}
+
+      if ((old_tls_type & GOT_TLS_IE) && (tls_type & GOT_TLS_IE))
+	tls_type |= old_tls_type;
+      /* If a TLS symbol is accessed using IE at least once,
+	 there is no point to use a dynamic model for it.  */
+      else if (old_tls_type != tls_type && old_tls_type != GOT_UNKNOWN
+	       && ((old_tls_type & GOT_TLS_GD) == 0
+		   || (tls_type & GOT_TLS_IE) == 0))
+	{
+	  if ((old_tls_type & GOT_TLS_IE) && (tls_type & GOT_TLS_GD))
+	    tls_type = old_tls_type;
+	  else if ((old_tls_type & GOT_TLS_GD) && (tls_type & GOT_TLS_GD))
+	    tls_type |= old_tls_type;
+	  else
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: `%s' accessed both as normal and thread local symbol"),
+		 abfd,
+		 h ? h->root.root.string : "<local>");
+	      return FALSE;
+	    }
+	}
+
+      if (old_tls_type != tls_type)
+	{
+	  if (eh)
+	    eh->tls_type = tls_type;
+	  else
+	    elf_xtensa_local_got_tls_type (abfd) [r_symndx] = tls_type;
+	}
+    }
+
+  return TRUE;
+}
+
+
+static void
+elf_xtensa_make_sym_local (struct bfd_link_info *info,
+                           struct elf_link_hash_entry *h)
+{
+  if (info->shared)
+    {
+      if (h->plt.refcount > 0)
+        {
+	  /* For shared objects, there's no need for PLT entries for local
+	     symbols (use RELATIVE relocs instead of JMP_SLOT relocs).  */
+          if (h->got.refcount < 0)
+            h->got.refcount = 0;
+          h->got.refcount += h->plt.refcount;
+          h->plt.refcount = 0;
+        }
+    }
+  else
+    {
+      /* Don't need any dynamic relocations at all.  */
+      h->plt.refcount = 0;
+      h->got.refcount = 0;
+    }
+}
+
+
+static void
+elf_xtensa_hide_symbol (struct bfd_link_info *info,
+                        struct elf_link_hash_entry *h,
+                        bfd_boolean force_local)
+{
+  /* For a shared link, move the plt refcount to the got refcount to leave
+     space for RELATIVE relocs.  */
+  elf_xtensa_make_sym_local (info, h);
+
+  _bfd_elf_link_hash_hide_symbol (info, h, force_local);
+}
+
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+static asection *
+elf_xtensa_gc_mark_hook (asection *sec,
+			 struct bfd_link_info *info,
+			 Elf_Internal_Rela *rel,
+			 struct elf_link_hash_entry *h,
+			 Elf_Internal_Sym *sym)
+{
+  /* Property sections are marked "KEEP" in the linker scripts, but they
+     should not cause other sections to be marked.  (This approach relies
+     on elf_xtensa_discard_info to remove property table entries that
+     describe discarded sections.  Alternatively, it might be more
+     efficient to avoid using "KEEP" in the linker scripts and instead use
+     the gc_mark_extra_sections hook to mark only the property sections
+     that describe marked sections.  That alternative does not work well
+     with the current property table sections, which do not correspond
+     one-to-one with the sections they describe, but that should be fixed
+     someday.) */
+  if (xtensa_is_property_section (sec))
+    return NULL;
+
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_XTENSA_GNU_VTINHERIT:
+      case R_XTENSA_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+
+/* Update the GOT & PLT entry reference counts
+   for the section being removed.  */
+
+static bfd_boolean
+elf_xtensa_gc_sweep_hook (bfd *abfd,
+			  struct bfd_link_info *info,
+			  asection *sec,
+			  const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel, *relend;
+  struct elf_xtensa_link_hash_table *htab;
+
+  htab = elf_xtensa_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (info->relocatable)
+    return TRUE;
+
+  if ((sec->flags & SEC_ALLOC) == 0)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      unsigned int r_type;
+      struct elf_link_hash_entry *h = NULL;
+      struct elf_xtensa_link_hash_entry *eh;
+      bfd_boolean is_got = FALSE;
+      bfd_boolean is_plt = FALSE;
+      bfd_boolean is_tlsfunc = FALSE;
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+      eh = elf_xtensa_hash_entry (h);
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      switch (r_type)
+	{
+	case R_XTENSA_TLSDESC_FN:
+	  if (info->shared)
+	    {
+	      is_got = TRUE;
+	      is_tlsfunc = TRUE;
+	    }
+	  break;
+
+	case R_XTENSA_TLSDESC_ARG:
+	  if (info->shared)
+	    is_got = TRUE;
+	  else
+	    {
+	      if (h && elf_xtensa_hash_entry (h) != htab->tlsbase)
+		is_got = TRUE;
+	    }
+	  break;
+
+	case R_XTENSA_TLS_TPOFF:
+	  if (info->shared || h)
+	    is_got = TRUE;
+	  break;
+
+	case R_XTENSA_32:
+	  is_got = TRUE;
+	  break;
+
+	case R_XTENSA_PLT:
+	  is_plt = TRUE;
+	  break;
+
+	default:
+	  continue;
+	}
+
+      if (h)
+	{
+	  if (is_plt)
+	    {
+	      if (h->plt.refcount > 0)
+		h->plt.refcount--;
+	    }
+	  else if (is_got)
+	    {
+	      if (h->got.refcount > 0)
+		h->got.refcount--;
+	    }
+	  if (is_tlsfunc)
+	    {
+	      if (eh->tlsfunc_refcount > 0)
+		eh->tlsfunc_refcount--;
+	    }
+	}
+      else
+	{
+	  if (is_got || is_plt)
+	    {
+	      bfd_signed_vma *got_refcount
+		= &elf_local_got_refcounts (abfd) [r_symndx];
+	      if (*got_refcount > 0)
+		*got_refcount -= 1;
+	    }
+	  if (is_tlsfunc)
+	    {
+	      bfd_signed_vma *tlsfunc_refcount
+		= &elf_xtensa_local_tlsfunc_refcounts (abfd) [r_symndx];
+	      if (*tlsfunc_refcount > 0)
+		*tlsfunc_refcount -= 1;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+
+/* Create all the dynamic sections.  */
+
+static bfd_boolean
+elf_xtensa_create_dynamic_sections (bfd *dynobj, struct bfd_link_info *info)
+{
+  struct elf_xtensa_link_hash_table *htab;
+  flagword flags, noalloc_flags;
+
+  htab = elf_xtensa_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* First do all the standard stuff.  */
+  if (! _bfd_elf_create_dynamic_sections (dynobj, info))
+    return FALSE;
+  htab->splt = bfd_get_section_by_name (dynobj, ".plt");
+  htab->srelplt = bfd_get_section_by_name (dynobj, ".rela.plt");
+  htab->sgot = bfd_get_section_by_name (dynobj, ".got");
+  htab->sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");
+  htab->srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+
+  /* Create any extra PLT sections in case check_relocs has already
+     been called on all the non-dynamic input files.  */
+  if (! add_extra_plt_sections (info, htab->plt_reloc_count))
+    return FALSE;
+
+  noalloc_flags = (SEC_HAS_CONTENTS | SEC_IN_MEMORY
+		   | SEC_LINKER_CREATED | SEC_READONLY);
+  flags = noalloc_flags | SEC_ALLOC | SEC_LOAD;
+
+  /* Mark the ".got.plt" section READONLY.  */
+  if (htab->sgotplt == NULL
+      || ! bfd_set_section_flags (dynobj, htab->sgotplt, flags))
+    return FALSE;
+
+  /* Create ".got.loc" (literal tables for use by dynamic linker).  */
+  htab->sgotloc = bfd_make_section_with_flags (dynobj, ".got.loc", flags);
+  if (htab->sgotloc == NULL
+      || ! bfd_set_section_alignment (dynobj, htab->sgotloc, 2))
+    return FALSE;
+
+  /* Create ".xt.lit.plt" (literal table for ".got.plt*").  */
+  htab->spltlittbl = bfd_make_section_with_flags (dynobj, ".xt.lit.plt",
+						  noalloc_flags);
+  if (htab->spltlittbl == NULL
+      || ! bfd_set_section_alignment (dynobj, htab->spltlittbl, 2))
+    return FALSE;
+
+  return TRUE;
+}
+
+
+static bfd_boolean
+add_extra_plt_sections (struct bfd_link_info *info, int count)
+{
+  bfd *dynobj = elf_hash_table (info)->dynobj;
+  int chunk;
+
+  /* Iterate over all chunks except 0 which uses the standard ".plt" and
+     ".got.plt" sections.  */
+  for (chunk = count / PLT_ENTRIES_PER_CHUNK; chunk > 0; chunk--)
+    {
+      char *sname;
+      flagword flags;
+      asection *s;
+
+      /* Stop when we find a section has already been created.  */
+      if (elf_xtensa_get_plt_section (info, chunk))
+	break;
+
+      flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	       | SEC_LINKER_CREATED | SEC_READONLY);
+
+      sname = (char *) bfd_malloc (10);
+      sprintf (sname, ".plt.%u", chunk);
+      s = bfd_make_section_with_flags (dynobj, sname, flags | SEC_CODE);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (dynobj, s, 2))
+	return FALSE;
+
+      sname = (char *) bfd_malloc (14);
+      sprintf (sname, ".got.plt.%u", chunk);
+      s = bfd_make_section_with_flags (dynobj, sname, flags);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (dynobj, s, 2))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+elf_xtensa_adjust_dynamic_symbol (struct bfd_link_info *info ATTRIBUTE_UNUSED,
+				  struct elf_link_hash_entry *h)
+{
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object.  The
+     reference must go through the GOT, so there's no need for COPY relocs,
+     .dynbss, etc.  */
+
+  return TRUE;
+}
+
+
+static bfd_boolean
+elf_xtensa_allocate_dynrelocs (struct elf_link_hash_entry *h, void *arg)
+{
+  struct bfd_link_info *info;
+  struct elf_xtensa_link_hash_table *htab;
+  struct elf_xtensa_link_hash_entry *eh = elf_xtensa_hash_entry (h);
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  info = (struct bfd_link_info *) arg;
+  htab = elf_xtensa_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* If we saw any use of an IE model for this symbol, we can then optimize
+     away GOT entries for any TLSDESC_FN relocs.  */
+  if ((eh->tls_type & GOT_TLS_IE) != 0)
+    {
+      BFD_ASSERT (h->got.refcount >= eh->tlsfunc_refcount);
+      h->got.refcount -= eh->tlsfunc_refcount;
+    }
+
+  if (! elf_xtensa_dynamic_symbol_p (h, info))
+    elf_xtensa_make_sym_local (info, h);
+
+  if (h->plt.refcount > 0)
+    htab->srelplt->size += (h->plt.refcount * sizeof (Elf32_External_Rela));
+
+  if (h->got.refcount > 0)
+    htab->srelgot->size += (h->got.refcount * sizeof (Elf32_External_Rela));
+
+  return TRUE;
+}
+
+
+static void
+elf_xtensa_allocate_local_got_size (struct bfd_link_info *info)
+{
+  struct elf_xtensa_link_hash_table *htab;
+  bfd *i;
+
+  htab = elf_xtensa_hash_table (info);
+  if (htab == NULL)
+    return;
+
+  for (i = info->input_bfds; i; i = i->link_next)
+    {
+      bfd_signed_vma *local_got_refcounts;
+      bfd_size_type j, cnt;
+      Elf_Internal_Shdr *symtab_hdr;
+
+      local_got_refcounts = elf_local_got_refcounts (i);
+      if (!local_got_refcounts)
+	continue;
+
+      symtab_hdr = &elf_tdata (i)->symtab_hdr;
+      cnt = symtab_hdr->sh_info;
+
+      for (j = 0; j < cnt; ++j)
+	{
+	  /* If we saw any use of an IE model for this symbol, we can
+	     then optimize away GOT entries for any TLSDESC_FN relocs.  */
+	  if ((elf_xtensa_local_got_tls_type (i) [j] & GOT_TLS_IE) != 0)
+	    {
+	      bfd_signed_vma *tlsfunc_refcount
+		= &elf_xtensa_local_tlsfunc_refcounts (i) [j];
+	      BFD_ASSERT (local_got_refcounts[j] >= *tlsfunc_refcount);
+	      local_got_refcounts[j] -= *tlsfunc_refcount;
+	    }
+
+	  if (local_got_refcounts[j] > 0)
+	    htab->srelgot->size += (local_got_refcounts[j]
+				    * sizeof (Elf32_External_Rela));
+	}
+    }
+}
+
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+elf_xtensa_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+				  struct bfd_link_info *info)
+{
+  struct elf_xtensa_link_hash_table *htab;
+  bfd *dynobj, *abfd;
+  asection *s, *srelplt, *splt, *sgotplt, *srelgot, *spltlittbl, *sgotloc;
+  bfd_boolean relplt, relgot;
+  int plt_entries, plt_chunks, chunk;
+
+  plt_entries = 0;
+  plt_chunks = 0;
+
+  htab = elf_xtensa_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  if (dynobj == NULL)
+    abort ();
+  srelgot = htab->srelgot;
+  srelplt = htab->srelplt;
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      BFD_ASSERT (htab->srelgot != NULL
+		  && htab->srelplt != NULL
+		  && htab->sgot != NULL
+		  && htab->spltlittbl != NULL
+		  && htab->sgotloc != NULL);
+
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  if (s == NULL)
+	    abort ();
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+
+      /* Allocate room for one word in ".got".  */
+      htab->sgot->size = 4;
+
+      /* Allocate space in ".rela.got" for literals that reference global
+	 symbols and space in ".rela.plt" for literals that have PLT
+	 entries.  */
+      elf_link_hash_traverse (elf_hash_table (info),
+			      elf_xtensa_allocate_dynrelocs,
+			      (void *) info);
+
+      /* If we are generating a shared object, we also need space in
+	 ".rela.got" for R_XTENSA_RELATIVE relocs for literals that
+	 reference local symbols.  */
+      if (info->shared)
+	elf_xtensa_allocate_local_got_size (info);
+
+      /* Allocate space in ".plt" to match the size of ".rela.plt".  For
+	 each PLT entry, we need the PLT code plus a 4-byte literal.
+	 For each chunk of ".plt", we also need two more 4-byte
+	 literals, two corresponding entries in ".rela.got", and an
+	 8-byte entry in ".xt.lit.plt".  */
+      spltlittbl = htab->spltlittbl;
+      plt_entries = srelplt->size / sizeof (Elf32_External_Rela);
+      plt_chunks =
+	(plt_entries + PLT_ENTRIES_PER_CHUNK - 1) / PLT_ENTRIES_PER_CHUNK;
+
+      /* Iterate over all the PLT chunks, including any extra sections
+	 created earlier because the initial count of PLT relocations
+	 was an overestimate.  */
+      for (chunk = 0;
+	   (splt = elf_xtensa_get_plt_section (info, chunk)) != NULL;
+	   chunk++)
+	{
+	  int chunk_entries;
+
+	  sgotplt = elf_xtensa_get_gotplt_section (info, chunk);
+	  BFD_ASSERT (sgotplt != NULL);
+
+	  if (chunk < plt_chunks - 1)
+	    chunk_entries = PLT_ENTRIES_PER_CHUNK;
+	  else if (chunk == plt_chunks - 1)
+	    chunk_entries = plt_entries - (chunk * PLT_ENTRIES_PER_CHUNK);
+	  else
+	    chunk_entries = 0;
+
+	  if (chunk_entries != 0)
+	    {
+	      sgotplt->size = 4 * (chunk_entries + 2);
+	      splt->size = PLT_ENTRY_SIZE * chunk_entries;
+	      srelgot->size += 2 * sizeof (Elf32_External_Rela);
+	      spltlittbl->size += 8;
+	    }
+	  else
+	    {
+	      sgotplt->size = 0;
+	      splt->size = 0;
+	    }
+	}
+
+      /* Allocate space in ".got.loc" to match the total size of all the
+	 literal tables.  */
+      sgotloc = htab->sgotloc;
+      sgotloc->size = spltlittbl->size;
+      for (abfd = info->input_bfds; abfd != NULL; abfd = abfd->link_next)
+	{
+	  if (abfd->flags & DYNAMIC)
+	    continue;
+	  for (s = abfd->sections; s != NULL; s = s->next)
+	    {
+	      if (! elf_discarded_section (s)
+		  && xtensa_is_littable_section (s)
+		  && s != spltlittbl)
+		sgotloc->size += s->size;
+	    }
+	}
+    }
+
+  /* Allocate memory for dynamic sections.  */
+  relplt = FALSE;
+  relgot = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      const char *name;
+
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      /* It's OK to base decisions on the section name, because none
+	 of the dynobj section names depend upon the input files.  */
+      name = bfd_get_section_name (dynobj, s);
+
+      if (CONST_STRNEQ (name, ".rela"))
+	{
+	  if (s->size != 0)
+	    {
+	      if (strcmp (name, ".rela.plt") == 0)
+		relplt = TRUE;
+	      else if (strcmp (name, ".rela.got") == 0)
+		relgot = TRUE;
+
+	      /* We use the reloc_count field as a counter if we need
+		 to copy relocs into the output file.  */
+	      s->reloc_count = 0;
+	    }
+	}
+      else if (! CONST_STRNEQ (name, ".plt.")
+	       && ! CONST_STRNEQ (name, ".got.plt.")
+	       && strcmp (name, ".got") != 0
+	       && strcmp (name, ".plt") != 0
+	       && strcmp (name, ".got.plt") != 0
+	       && strcmp (name, ".xt.lit.plt") != 0
+	       && strcmp (name, ".got.loc") != 0)
+	{
+	  /* It's not one of our sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (s->size == 0)
+	{
+	  /* If we don't need this section, strip it from the output
+	     file.  We must create the ".plt*" and ".got.plt*"
+	     sections in create_dynamic_sections and/or check_relocs
+	     based on a conservative estimate of the PLT relocation
+	     count, because the sections must be created before the
+	     linker maps input sections to output sections.  The
+	     linker does that before size_dynamic_sections, where we
+	     compute the exact size of the PLT, so there may be more
+	     of these sections than are actually needed.  */
+	  s->flags |= SEC_EXCLUDE;
+	}
+      else if ((s->flags & SEC_HAS_CONTENTS) != 0)
+	{
+	  /* Allocate memory for the section contents.  */
+	  s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);
+	  if (s->contents == NULL)
+	    return FALSE;
+	}
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add the special XTENSA_RTLD relocations now.  The offsets won't be
+	 known until finish_dynamic_sections, but we need to get the relocs
+	 in place before they are sorted.  */
+      for (chunk = 0; chunk < plt_chunks; chunk++)
+	{
+	  Elf_Internal_Rela irela;
+	  bfd_byte *loc;
+
+	  irela.r_offset = 0;
+	  irela.r_info = ELF32_R_INFO (0, R_XTENSA_RTLD);
+	  irela.r_addend = 0;
+
+	  loc = (srelgot->contents
+		 + srelgot->reloc_count * sizeof (Elf32_External_Rela));
+	  bfd_elf32_swap_reloca_out (output_bfd, &irela, loc);
+	  bfd_elf32_swap_reloca_out (output_bfd, &irela,
+				     loc + sizeof (Elf32_External_Rela));
+	  srelgot->reloc_count += 2;
+	}
+
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in elf_xtensa_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (info->executable)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (relplt)
+	{
+	  if (!add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+	      || !add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+	}
+
+      if (relgot)
+	{
+	  if (!add_dynamic_entry (DT_RELA, 0)
+	      || !add_dynamic_entry (DT_RELASZ, 0)
+	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
+	    return FALSE;
+	}
+
+      if (!add_dynamic_entry (DT_PLTGOT, 0)
+	  || !add_dynamic_entry (DT_XTENSA_GOT_LOC_OFF, 0)
+	  || !add_dynamic_entry (DT_XTENSA_GOT_LOC_SZ, 0))
+	return FALSE;
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf_xtensa_always_size_sections (bfd *output_bfd,
+				 struct bfd_link_info *info)
+{
+  struct elf_xtensa_link_hash_table *htab;
+  asection *tls_sec;
+
+  htab = elf_xtensa_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  tls_sec = htab->elf.tls_sec;
+
+  if (tls_sec && (htab->tlsbase->tls_type & GOT_TLS_ANY) != 0)
+    {
+      struct elf_link_hash_entry *tlsbase = &htab->tlsbase->elf;
+      struct bfd_link_hash_entry *bh = &tlsbase->root;
+      const struct elf_backend_data *bed = get_elf_backend_data (output_bfd);
+
+      tlsbase->type = STT_TLS;
+      if (!(_bfd_generic_link_add_one_symbol
+	    (info, output_bfd, "_TLS_MODULE_BASE_", BSF_LOCAL,
+	     tls_sec, 0, NULL, FALSE,
+	     bed->collect, &bh)))
+	return FALSE;
+      tlsbase->def_regular = 1;
+      tlsbase->other = STV_HIDDEN;
+      (*bed->elf_backend_hide_symbol) (info, tlsbase, TRUE);
+    }
+
+  return TRUE;
+}
+
+
+/* Return the base VMA address which should be subtracted from real addresses
+   when resolving @dtpoff relocation.
+   This is PT_TLS segment p_vaddr.  */
+
+static bfd_vma
+dtpoff_base (struct bfd_link_info *info)
+{
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (elf_hash_table (info)->tls_sec == NULL)
+    return 0;
+  return elf_hash_table (info)->tls_sec->vma;
+}
+
+/* Return the relocation value for @tpoff relocation
+   if STT_TLS virtual address is ADDRESS.  */
+
+static bfd_vma
+tpoff (struct bfd_link_info *info, bfd_vma address)
+{
+  struct elf_link_hash_table *htab = elf_hash_table (info);
+  bfd_vma base;
+
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (htab->tls_sec == NULL)
+    return 0;
+  base = align_power ((bfd_vma) TCB_SIZE, htab->tls_sec->alignment_power);
+  return address - htab->tls_sec->vma + base;
+}
+
+/* Perform the specified relocation.  The instruction at (contents + address)
+   is modified to set one operand to represent the value in "relocation".  The
+   operand position is determined by the relocation type recorded in the
+   howto.  */
+
+#define CALL_SEGMENT_BITS (30)
+#define CALL_SEGMENT_SIZE (1 << CALL_SEGMENT_BITS)
+
+static bfd_reloc_status_type
+elf_xtensa_do_reloc (reloc_howto_type *howto,
+		     bfd *abfd,
+		     asection *input_section,
+		     bfd_vma relocation,
+		     bfd_byte *contents,
+		     bfd_vma address,
+		     bfd_boolean is_weak_undef,
+		     char **error_message)
+{
+  xtensa_format fmt;
+  xtensa_opcode opcode;
+  xtensa_isa isa = xtensa_default_isa;
+  static xtensa_insnbuf ibuff = NULL;
+  static xtensa_insnbuf sbuff = NULL;
+  bfd_vma self_address;
+  bfd_size_type input_size;
+  int opnd, slot;
+  uint32 newval;
+
+  if (!ibuff)
+    {
+      ibuff = xtensa_insnbuf_alloc (isa);
+      sbuff = xtensa_insnbuf_alloc (isa);
+    }
+
+  input_size = bfd_get_section_limit (abfd, input_section);
+
+  /* Calculate the PC address for this instruction.  */
+  self_address = (input_section->output_section->vma
+		  + input_section->output_offset
+		  + address);
+
+  switch (howto->type)
+    {
+    case R_XTENSA_NONE:
+    case R_XTENSA_DIFF8:
+    case R_XTENSA_DIFF16:
+    case R_XTENSA_DIFF32:
+    case R_XTENSA_TLS_FUNC:
+    case R_XTENSA_TLS_ARG:
+    case R_XTENSA_TLS_CALL:
+      return bfd_reloc_ok;
+
+    case R_XTENSA_ASM_EXPAND:
+      if (!is_weak_undef)
+	{
+	  /* Check for windowed CALL across a 1GB boundary.  */
+	  opcode = get_expanded_call_opcode (contents + address,
+					     input_size - address, 0);
+	  if (is_windowed_call_opcode (opcode))
+	    {
+	      if ((self_address >> CALL_SEGMENT_BITS)
+		  != (relocation >> CALL_SEGMENT_BITS)) 
+		{
+		  *error_message = "windowed longcall crosses 1GB boundary; "
+		    "return may fail";
+		  return bfd_reloc_dangerous;
+		}
+	    }
+	}
+      return bfd_reloc_ok;
+
+    case R_XTENSA_ASM_SIMPLIFY:
+      {
+        /* Convert the L32R/CALLX to CALL.  */
+	bfd_reloc_status_type retval =
+	  elf_xtensa_do_asm_simplify (contents, address, input_size,
+				      error_message);
+	if (retval != bfd_reloc_ok)
+	  return bfd_reloc_dangerous;
+
+	/* The CALL needs to be relocated.  Continue below for that part.  */
+	address += 3;
+	self_address += 3;
+	howto = &elf_howto_table[(unsigned) R_XTENSA_SLOT0_OP ];
+      }
+      break;
+
+    case R_XTENSA_32:
+      {
+	bfd_vma x;
+	x = bfd_get_32 (abfd, contents + address);
+	x = x + relocation;
+	bfd_put_32 (abfd, x, contents + address);
+      }
+      return bfd_reloc_ok;
+
+    case R_XTENSA_32_PCREL:
+      bfd_put_32 (abfd, relocation - self_address, contents + address);
+      return bfd_reloc_ok;
+
+    case R_XTENSA_PLT:
+    case R_XTENSA_TLSDESC_FN:
+    case R_XTENSA_TLSDESC_ARG:
+    case R_XTENSA_TLS_DTPOFF:
+    case R_XTENSA_TLS_TPOFF:
+      bfd_put_32 (abfd, relocation, contents + address);
+      return bfd_reloc_ok;
+    }
+
+  /* Only instruction slot-specific relocations handled below.... */
+  slot = get_relocation_slot (howto->type);
+  if (slot == XTENSA_UNDEFINED)
+    {
+      *error_message = "unexpected relocation";
+      return bfd_reloc_dangerous;
+    }
+
+  /* Read the instruction into a buffer and decode the opcode.  */
+  xtensa_insnbuf_from_chars (isa, ibuff, contents + address,
+			     input_size - address);
+  fmt = xtensa_format_decode (isa, ibuff);
+  if (fmt == XTENSA_UNDEFINED)
+    {
+      *error_message = "cannot decode instruction format";
+      return bfd_reloc_dangerous;
+    }
+
+  xtensa_format_get_slot (isa, fmt, slot, ibuff, sbuff);
+
+  opcode = xtensa_opcode_decode (isa, fmt, slot, sbuff);
+  if (opcode == XTENSA_UNDEFINED)
+    {
+      *error_message = "cannot decode instruction opcode";
+      return bfd_reloc_dangerous;
+    }
+
+  /* Check for opcode-specific "alternate" relocations.  */
+  if (is_alt_relocation (howto->type))
+    {
+      if (opcode == get_l32r_opcode ())
+	{
+	  /* Handle the special-case of non-PC-relative L32R instructions.  */
+	  bfd *output_bfd = input_section->output_section->owner;
+	  asection *lit4_sec = bfd_get_section_by_name (output_bfd, ".lit4");
+	  if (!lit4_sec)
+	    {
+	      *error_message = "relocation references missing .lit4 section";
+	      return bfd_reloc_dangerous;
+	    }
+	  self_address = ((lit4_sec->vma & ~0xfff)
+			  + 0x40000 - 3); /* -3 to compensate for do_reloc */
+	  newval = relocation;
+	  opnd = 1;
+	}
+      else if (opcode == get_const16_opcode ())
+	{
+	  /* ALT used for high 16 bits.  */
+	  newval = relocation >> 16;
+	  opnd = 1;
+	}
+      else
+	{
+	  /* No other "alternate" relocations currently defined.  */
+	  *error_message = "unexpected relocation";
+	  return bfd_reloc_dangerous;
+	}
+    }
+  else /* Not an "alternate" relocation.... */
+    {
+      if (opcode == get_const16_opcode ())
+	{
+	  newval = relocation & 0xffff;
+	  opnd = 1;
+	}
+      else
+	{
+	  /* ...normal PC-relative relocation.... */
+
+	  /* Determine which operand is being relocated.  */
+	  opnd = get_relocation_opnd (opcode, howto->type);
+	  if (opnd == XTENSA_UNDEFINED)
+	    {
+	      *error_message = "unexpected relocation";
+	      return bfd_reloc_dangerous;
+	    }
+
+	  if (!howto->pc_relative)
+	    {
+	      *error_message = "expected PC-relative relocation";
+	      return bfd_reloc_dangerous;
+	    }
+
+	  newval = relocation;
+	}
+    }
+
+  /* Apply the relocation.  */
+  if (xtensa_operand_do_reloc (isa, opcode, opnd, &newval, self_address)
+      || xtensa_operand_encode (isa, opcode, opnd, &newval)
+      || xtensa_operand_set_field (isa, opcode, opnd, fmt, slot,
+				   sbuff, newval))
+    {
+      const char *opname = xtensa_opcode_name (isa, opcode);
+      const char *msg;
+
+      msg = "cannot encode";
+      if (is_direct_call_opcode (opcode))
+	{
+	  if ((relocation & 0x3) != 0)
+	    msg = "misaligned call target";
+	  else
+	    msg = "call target out of range";
+	}
+      else if (opcode == get_l32r_opcode ())
+	{
+	  if ((relocation & 0x3) != 0)
+	    msg = "misaligned literal target";
+	  else if (is_alt_relocation (howto->type))
+	    msg = "literal target out of range (too many literals)";
+	  else if (self_address > relocation)
+	    msg = "literal target out of range (try using text-section-literals)";
+	  else
+	    msg = "literal placed after use";
+	}
+
+      *error_message = vsprint_msg (opname, ": %s", strlen (msg) + 2, msg);
+      return bfd_reloc_dangerous;
+    }
+
+  /* Check for calls across 1GB boundaries.  */
+  if (is_direct_call_opcode (opcode)
+      && is_windowed_call_opcode (opcode))
+    {
+      if ((self_address >> CALL_SEGMENT_BITS)
+	  != (relocation >> CALL_SEGMENT_BITS)) 
+	{
+	  *error_message =
+	    "windowed call crosses 1GB boundary; return may fail";
+	  return bfd_reloc_dangerous;
+	}
+    }
+
+  /* Write the modified instruction back out of the buffer.  */
+  xtensa_format_set_slot (isa, fmt, slot, ibuff, sbuff);
+  xtensa_insnbuf_to_chars (isa, ibuff, contents + address,
+			   input_size - address);
+  return bfd_reloc_ok;
+}
+
+
+static char *
+vsprint_msg (const char *origmsg, const char *fmt, int arglen, ...)
+{
+  /* To reduce the size of the memory leak,
+     we only use a single message buffer.  */
+  static bfd_size_type alloc_size = 0;
+  static char *message = NULL;
+  bfd_size_type orig_len, len = 0;
+  bfd_boolean is_append;
+
+  VA_OPEN (ap, arglen);
+  VA_FIXEDARG (ap, const char *, origmsg);
+  
+  is_append = (origmsg == message);  
+
+  orig_len = strlen (origmsg);
+  len = orig_len + strlen (fmt) + arglen + 20;
+  if (len > alloc_size)
+    {
+      message = (char *) bfd_realloc_or_free (message, len);
+      alloc_size = len;
+    }
+  if (message != NULL)
+    {
+      if (!is_append)
+	memcpy (message, origmsg, orig_len);
+      vsprintf (message + orig_len, fmt, ap);
+    }
+  VA_CLOSE (ap);
+  return message;
+}
+
+
+/* This function is registered as the "special_function" in the
+   Xtensa howto for handling simplify operations.
+   bfd_perform_relocation / bfd_install_relocation use it to
+   perform (install) the specified relocation.  Since this replaces the code
+   in bfd_perform_relocation, it is basically an Xtensa-specific,
+   stripped-down version of bfd_perform_relocation.  */
+
+static bfd_reloc_status_type
+bfd_elf_xtensa_reloc (bfd *abfd,
+		      arelent *reloc_entry,
+		      asymbol *symbol,
+		      void *data,
+		      asection *input_section,
+		      bfd *output_bfd,
+		      char **error_message)
+{
+  bfd_vma relocation;
+  bfd_reloc_status_type flag;
+  bfd_size_type octets = reloc_entry->address * bfd_octets_per_byte (abfd);
+  bfd_vma output_base = 0;
+  reloc_howto_type *howto = reloc_entry->howto;
+  asection *reloc_target_output_section;
+  bfd_boolean is_weak_undef;
+
+  if (!xtensa_default_isa)
+    xtensa_default_isa = xtensa_isa_init (0, 0);
+
+  /* ELF relocs are against symbols.  If we are producing relocatable
+     output, and the reloc is against an external symbol, the resulting
+     reloc will also be against the same symbol.  In such a case, we
+     don't want to change anything about the way the reloc is handled,
+     since it will all be done at final link time.  This test is similar
+     to what bfd_elf_generic_reloc does except that it lets relocs with
+     howto->partial_inplace go through even if the addend is non-zero.
+     (The real problem is that partial_inplace is set for XTENSA_32
+     relocs to begin with, but that's a long story and there's little we
+     can do about it now....)  */
+
+  if (output_bfd && (symbol->flags & BSF_SECTION_SYM) == 0)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  /* Is the address of the relocation really within the section?  */
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  /* Work out which section the relocation is targeted at and the
+     initial relocation command value.  */
+
+  /* Get symbol value.  (Common symbols are special.)  */
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  reloc_target_output_section = symbol->section->output_section;
+
+  /* Convert input-section-relative symbol value to absolute.  */
+  if ((output_bfd && !howto->partial_inplace)
+      || reloc_target_output_section == NULL)
+    output_base = 0;
+  else
+    output_base = reloc_target_output_section->vma;
+
+  relocation += output_base + symbol->section->output_offset;
+
+  /* Add in supplied addend.  */
+  relocation += reloc_entry->addend;
+
+  /* Here the variable relocation holds the final address of the
+     symbol we are relocating against, plus any addend.  */
+  if (output_bfd)
+    {
+      if (!howto->partial_inplace)
+	{
+	  /* This is a partial relocation, and we want to apply the relocation
+	     to the reloc entry rather than the raw data.  Everything except
+	     relocations against section symbols has already been handled
+	     above.  */
+
+	  BFD_ASSERT (symbol->flags & BSF_SECTION_SYM);
+	  reloc_entry->addend = relocation;
+	  reloc_entry->address += input_section->output_offset;
+	  return bfd_reloc_ok;
+	}
+      else
+	{
+	  reloc_entry->address += input_section->output_offset;
+	  reloc_entry->addend = 0;
+	}
+    }
+
+  is_weak_undef = (bfd_is_und_section (symbol->section)
+		   && (symbol->flags & BSF_WEAK) != 0);
+  flag = elf_xtensa_do_reloc (howto, abfd, input_section, relocation,
+			      (bfd_byte *) data, (bfd_vma) octets,
+			      is_weak_undef, error_message);
+
+  if (flag == bfd_reloc_dangerous)
+    {
+      /* Add the symbol name to the error message.  */
+      if (! *error_message)
+	*error_message = "";
+      *error_message = vsprint_msg (*error_message, ": (%s + 0x%lx)",
+				    strlen (symbol->name) + 17,
+				    symbol->name,
+				    (unsigned long) reloc_entry->addend);
+    }
+
+  return flag;
+}
+
+
+/* Set up an entry in the procedure linkage table.  */
+
+static bfd_vma
+elf_xtensa_create_plt_entry (struct bfd_link_info *info,
+			     bfd *output_bfd,
+			     unsigned reloc_index)
+{
+  asection *splt, *sgotplt;
+  bfd_vma plt_base, got_base;
+  bfd_vma code_offset, lit_offset;
+  int chunk;
+
+  chunk = reloc_index / PLT_ENTRIES_PER_CHUNK;
+  splt = elf_xtensa_get_plt_section (info, chunk);
+  sgotplt = elf_xtensa_get_gotplt_section (info, chunk);
+  BFD_ASSERT (splt != NULL && sgotplt != NULL);
+
+  plt_base = splt->output_section->vma + splt->output_offset;
+  got_base = sgotplt->output_section->vma + sgotplt->output_offset;
+
+  lit_offset = 8 + (reloc_index % PLT_ENTRIES_PER_CHUNK) * 4;
+  code_offset = (reloc_index % PLT_ENTRIES_PER_CHUNK) * PLT_ENTRY_SIZE;
+
+  /* Fill in the literal entry.  This is the offset of the dynamic
+     relocation entry.  */
+  bfd_put_32 (output_bfd, reloc_index * sizeof (Elf32_External_Rela),
+	      sgotplt->contents + lit_offset);
+
+  /* Fill in the entry in the procedure linkage table.  */
+  memcpy (splt->contents + code_offset,
+	  (bfd_big_endian (output_bfd)
+	   ? elf_xtensa_be_plt_entry
+	   : elf_xtensa_le_plt_entry),
+	  PLT_ENTRY_SIZE);
+  bfd_put_16 (output_bfd, l32r_offset (got_base + 0,
+				       plt_base + code_offset + 3),
+	      splt->contents + code_offset + 4);
+  bfd_put_16 (output_bfd, l32r_offset (got_base + 4,
+				       plt_base + code_offset + 6),
+	      splt->contents + code_offset + 7);
+  bfd_put_16 (output_bfd, l32r_offset (got_base + lit_offset,
+				       plt_base + code_offset + 9),
+	      splt->contents + code_offset + 10);
+
+  return plt_base + code_offset;
+}
+
+
+static bfd_boolean get_indirect_call_dest_reg (xtensa_opcode, unsigned *);
+
+static bfd_boolean
+replace_tls_insn (Elf_Internal_Rela *rel,
+		  bfd *abfd,
+		  asection *input_section,
+		  bfd_byte *contents,
+		  bfd_boolean is_ld_model,
+		  char **error_message)
+{
+  static xtensa_insnbuf ibuff = NULL;
+  static xtensa_insnbuf sbuff = NULL;
+  xtensa_isa isa = xtensa_default_isa;
+  xtensa_format fmt;
+  xtensa_opcode old_op, new_op;
+  bfd_size_type input_size;
+  int r_type;
+  unsigned dest_reg, src_reg;
+
+  if (ibuff == NULL)
+    {
+      ibuff = xtensa_insnbuf_alloc (isa);
+      sbuff = xtensa_insnbuf_alloc (isa);
+    }
+
+  input_size = bfd_get_section_limit (abfd, input_section);
+
+  /* Read the instruction into a buffer and decode the opcode.  */
+  xtensa_insnbuf_from_chars (isa, ibuff, contents + rel->r_offset,
+			     input_size - rel->r_offset);
+  fmt = xtensa_format_decode (isa, ibuff);
+  if (fmt == XTENSA_UNDEFINED)
+    {
+      *error_message = "cannot decode instruction format";
+      return FALSE;
+    }
+
+  BFD_ASSERT (xtensa_format_num_slots (isa, fmt) == 1);
+  xtensa_format_get_slot (isa, fmt, 0, ibuff, sbuff);
+
+  old_op = xtensa_opcode_decode (isa, fmt, 0, sbuff);
+  if (old_op == XTENSA_UNDEFINED)
+    {
+      *error_message = "cannot decode instruction opcode";
+      return FALSE;
+    }
+
+  r_type = ELF32_R_TYPE (rel->r_info);
+  switch (r_type)
+    {
+    case R_XTENSA_TLS_FUNC:
+    case R_XTENSA_TLS_ARG:
+      if (old_op != get_l32r_opcode ()
+	  || xtensa_operand_get_field (isa, old_op, 0, fmt, 0,
+				       sbuff, &dest_reg) != 0)
+	{
+	  *error_message = "cannot extract L32R destination for TLS access";
+	  return FALSE;
+	}
+      break;
+
+    case R_XTENSA_TLS_CALL:
+      if (! get_indirect_call_dest_reg (old_op, &dest_reg)
+	  || xtensa_operand_get_field (isa, old_op, 0, fmt, 0,
+				       sbuff, &src_reg) != 0)
+	{
+	  *error_message = "cannot extract CALLXn operands for TLS access";
+	  return FALSE;
+	}
+      break;
+
+    default:
+      abort ();
+    }
+
+  if (is_ld_model)
+    {
+      switch (r_type)
+	{
+	case R_XTENSA_TLS_FUNC:
+	case R_XTENSA_TLS_ARG:
+	  /* Change the instruction to a NOP (or "OR a1, a1, a1" for older
+	     versions of Xtensa).  */
+	  new_op = xtensa_opcode_lookup (isa, "nop");
+	  if (new_op == XTENSA_UNDEFINED)
+	    {
+	      new_op = xtensa_opcode_lookup (isa, "or");
+	      if (new_op == XTENSA_UNDEFINED
+		  || xtensa_opcode_encode (isa, fmt, 0, sbuff, new_op) != 0
+		  || xtensa_operand_set_field (isa, new_op, 0, fmt, 0,
+					       sbuff, 1) != 0
+		  || xtensa_operand_set_field (isa, new_op, 1, fmt, 0,
+					       sbuff, 1) != 0
+		  || xtensa_operand_set_field (isa, new_op, 2, fmt, 0,
+					       sbuff, 1) != 0)
+		{
+		  *error_message = "cannot encode OR for TLS access";
+		  return FALSE;
+		}
+	    }
+	  else
+	    {
+	      if (xtensa_opcode_encode (isa, fmt, 0, sbuff, new_op) != 0)
+		{
+		  *error_message = "cannot encode NOP for TLS access";
+		  return FALSE;
+		}
+	    }
+	  break;
+
+	case R_XTENSA_TLS_CALL:
+	  /* Read THREADPTR into the CALLX's return value register.  */
+	  new_op = xtensa_opcode_lookup (isa, "rur.threadptr");
+	  if (new_op == XTENSA_UNDEFINED
+	      || xtensa_opcode_encode (isa, fmt, 0, sbuff, new_op) != 0
+	      || xtensa_operand_set_field (isa, new_op, 0, fmt, 0,
+					   sbuff, dest_reg + 2) != 0)
+	    {
+	      *error_message = "cannot encode RUR.THREADPTR for TLS access";
+	      return FALSE;
+	    }
+	  break;
+	}
+    }
+  else
+    {
+      switch (r_type)
+	{
+	case R_XTENSA_TLS_FUNC:
+	  new_op = xtensa_opcode_lookup (isa, "rur.threadptr");
+	  if (new_op == XTENSA_UNDEFINED
+	      || xtensa_opcode_encode (isa, fmt, 0, sbuff, new_op) != 0
+	      || xtensa_operand_set_field (isa, new_op, 0, fmt, 0,
+					   sbuff, dest_reg) != 0)
+	    {
+	      *error_message = "cannot encode RUR.THREADPTR for TLS access";
+	      return FALSE;
+	    }
+	  break;
+
+	case R_XTENSA_TLS_ARG:
+	  /* Nothing to do.  Keep the original L32R instruction.  */
+	  return TRUE;
+
+	case R_XTENSA_TLS_CALL:
+	  /* Add the CALLX's src register (holding the THREADPTR value)
+	     to the first argument register (holding the offset) and put
+	     the result in the CALLX's return value register.  */
+	  new_op = xtensa_opcode_lookup (isa, "add");
+	  if (new_op == XTENSA_UNDEFINED
+	      || xtensa_opcode_encode (isa, fmt, 0, sbuff, new_op) != 0
+	      || xtensa_operand_set_field (isa, new_op, 0, fmt, 0,
+					   sbuff, dest_reg + 2) != 0
+	      || xtensa_operand_set_field (isa, new_op, 1, fmt, 0,
+					   sbuff, dest_reg + 2) != 0
+	      || xtensa_operand_set_field (isa, new_op, 2, fmt, 0,
+					   sbuff, src_reg) != 0)
+	    {
+	      *error_message = "cannot encode ADD for TLS access";
+	      return FALSE;
+	    }
+	  break;
+	}
+    }
+
+  xtensa_format_set_slot (isa, fmt, 0, ibuff, sbuff);
+  xtensa_insnbuf_to_chars (isa, ibuff, contents + rel->r_offset,
+                           input_size - rel->r_offset);
+
+  return TRUE;
+}
+
+
+#define IS_XTENSA_TLS_RELOC(R_TYPE) \
+  ((R_TYPE) == R_XTENSA_TLSDESC_FN \
+   || (R_TYPE) == R_XTENSA_TLSDESC_ARG \
+   || (R_TYPE) == R_XTENSA_TLS_DTPOFF \
+   || (R_TYPE) == R_XTENSA_TLS_TPOFF \
+   || (R_TYPE) == R_XTENSA_TLS_FUNC \
+   || (R_TYPE) == R_XTENSA_TLS_ARG \
+   || (R_TYPE) == R_XTENSA_TLS_CALL)
+
+/* Relocate an Xtensa ELF section.  This is invoked by the linker for
+   both relocatable and final links.  */
+
+static bfd_boolean
+elf_xtensa_relocate_section (bfd *output_bfd,
+			     struct bfd_link_info *info,
+			     bfd *input_bfd,
+			     asection *input_section,
+			     bfd_byte *contents,
+			     Elf_Internal_Rela *relocs,
+			     Elf_Internal_Sym *local_syms,
+			     asection **local_sections)
+{
+  struct elf_xtensa_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  struct elf_link_hash_entry **sym_hashes;
+  property_table_entry *lit_table = 0;
+  int ltblsize = 0;
+  char *local_got_tls_types;
+  char *error_message = NULL;
+  bfd_size_type input_size;
+  int tls_type;
+
+  if (!xtensa_default_isa)
+    xtensa_default_isa = xtensa_isa_init (0, 0);
+
+  BFD_ASSERT (is_xtensa_elf (input_bfd));
+
+  htab = elf_xtensa_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+  local_got_tls_types = elf_xtensa_local_got_tls_type (input_bfd);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      ltblsize = xtensa_read_table_entries (input_bfd, input_section,
+					    &lit_table, XTENSA_LIT_SEC_NAME,
+					    TRUE);
+      if (ltblsize < 0)
+	return FALSE;
+    }
+
+  input_size = bfd_get_section_limit (input_bfd, input_section);
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+      Elf_Internal_Sym *sym;
+      char sym_type;
+      const char *name;
+      asection *sec;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+      bfd_boolean is_weak_undef;
+      bfd_boolean unresolved_reloc;
+      bfd_boolean warned;
+      bfd_boolean dynamic_symbol;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      if (r_type == (int) R_XTENSA_GNU_VTINHERIT
+	  || r_type == (int) R_XTENSA_GNU_VTENTRY)
+	continue;
+
+      if (r_type < 0 || r_type >= (int) R_XTENSA_max)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+      howto = &elf_howto_table[r_type];
+
+      r_symndx = ELF32_R_SYM (rel->r_info);
+
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      is_weak_undef = FALSE;
+      unresolved_reloc = FALSE;
+      warned = FALSE;
+
+      if (howto->partial_inplace && !info->relocatable)
+	{
+	  /* Because R_XTENSA_32 was made partial_inplace to fix some
+	     problems with DWARF info in partial links, there may be
+	     an addend stored in the contents.  Take it out of there
+	     and move it back into the addend field of the reloc.  */
+	  rel->r_addend += bfd_get_32 (input_bfd, contents + rel->r_offset);
+	  bfd_put_32 (input_bfd, 0, contents + rel->r_offset);
+	}
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sym_type = ELF32_ST_TYPE (sym->st_info);
+	  sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+      else
+	{
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+
+	  if (relocation == 0
+	      && !unresolved_reloc
+	      && h->root.type == bfd_link_hash_undefweak)
+	    is_weak_undef = TRUE;
+
+	  sym_type = h->type;
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	{
+	  bfd_vma dest_addr;
+	  asection * sym_sec = get_elf_r_symndx_section (input_bfd, r_symndx);
+
+	  /* This is a relocatable link.
+	     1) If the reloc is against a section symbol, adjust
+	     according to the output section.
+	     2) If there is a new target for this relocation,
+	     the new target will be in the same output section.
+	     We adjust the relocation by the output section
+	     difference.  */
+
+	  if (relaxing_section)
+	    {
+	      /* Check if this references a section in another input file.  */
+	      if (!do_fix_for_relocatable_link (rel, input_bfd, input_section,
+						contents))
+		return FALSE;
+	    }
+
+	  dest_addr = sym_sec->output_section->vma + sym_sec->output_offset
+	    + get_elf_r_symndx_offset (input_bfd, r_symndx) + rel->r_addend;
+
+	  if (r_type == R_XTENSA_ASM_SIMPLIFY)
+	    {
+	      error_message = NULL;
+	      /* Convert ASM_SIMPLIFY into the simpler relocation
+		 so that they never escape a relaxing link.  */
+	      r = contract_asm_expansion (contents, input_size, rel,
+					  &error_message);
+	      if (r != bfd_reloc_ok)
+		{
+		  if (!((*info->callbacks->reloc_dangerous)
+			(info, error_message, input_bfd, input_section,
+			 rel->r_offset)))
+		    return FALSE;
+		}
+	      r_type = ELF32_R_TYPE (rel->r_info);
+	    }
+
+	  /* This is a relocatable link, so we don't have to change
+	     anything unless the reloc is against a section symbol,
+	     in which case we have to adjust according to where the
+	     section symbol winds up in the output section.  */
+	  if (r_symndx < symtab_hdr->sh_info)
+	    {
+	      sym = local_syms + r_symndx;
+	      if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+		{
+		  sec = local_sections[r_symndx];
+		  rel->r_addend += sec->output_offset + sym->st_value;
+		}
+	    }
+
+	  /* If there is an addend with a partial_inplace howto,
+	     then move the addend to the contents.  This is a hack
+	     to work around problems with DWARF in relocatable links
+	     with some previous version of BFD.  Now we can't easily get
+	     rid of the hack without breaking backward compatibility.... */
+	  r = bfd_reloc_ok;
+	  howto = &elf_howto_table[r_type];
+	  if (howto->partial_inplace && rel->r_addend)
+	    {
+	      r = elf_xtensa_do_reloc (howto, input_bfd, input_section,
+				       rel->r_addend, contents,
+				       rel->r_offset, FALSE,
+				       &error_message);
+	      rel->r_addend = 0;
+	    }
+	  else
+	    {
+	      /* Put the correct bits in the target instruction, even
+		 though the relocation will still be present in the output
+		 file.  This makes disassembly clearer, as well as
+		 allowing loadable kernel modules to work without needing
+		 relocations on anything other than calls and l32r's.  */
+
+	      /* If it is not in the same section, there is nothing we can do.  */
+	      if (r_type >= R_XTENSA_SLOT0_OP && r_type <= R_XTENSA_SLOT14_OP &&
+		  sym_sec->output_section == input_section->output_section)
+		{
+		  r = elf_xtensa_do_reloc (howto, input_bfd, input_section,
+					   dest_addr, contents,
+					   rel->r_offset, FALSE,
+					   &error_message);
+		}
+	    }
+	  if (r != bfd_reloc_ok)
+	    {
+	      if (!((*info->callbacks->reloc_dangerous)
+		    (info, error_message, input_bfd, input_section,
+		     rel->r_offset)))
+		return FALSE;
+	    }
+
+	  /* Done with work for relocatable link; continue with next reloc.  */
+	  continue;
+	}
+
+      /* This is a final link.  */
+
+      if (relaxing_section)
+	{
+	  /* Check if this references a section in another input file.  */
+	  do_fix_for_final_link (rel, input_bfd, input_section, contents,
+				 &relocation);
+	}
+
+      /* Sanity check the address.  */
+      if (rel->r_offset >= input_size
+	  && ELF32_R_TYPE (rel->r_info) != R_XTENSA_NONE)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B(%A+0x%lx): relocation offset out of range (size=0x%x)"),
+	     input_bfd, input_section, rel->r_offset, input_size);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      if (h != NULL)
+	name = h->root.root.string;
+      else
+	{
+	  name = (bfd_elf_string_from_elf_section
+		  (input_bfd, symtab_hdr->sh_link, sym->st_name));
+	  if (name == NULL || *name == '\0')
+	    name = bfd_section_name (input_bfd, sec);
+	}
+
+      if (r_symndx != STN_UNDEF
+	  && r_type != R_XTENSA_NONE
+	  && (h == NULL
+	      || h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	  && IS_XTENSA_TLS_RELOC (r_type) != (sym_type == STT_TLS))
+	{
+	  (*_bfd_error_handler)
+	    ((sym_type == STT_TLS
+	      ? _("%B(%A+0x%lx): %s used with TLS symbol %s")
+	      : _("%B(%A+0x%lx): %s used with non-TLS symbol %s")),
+	     input_bfd,
+	     input_section,
+	     (long) rel->r_offset,
+	     howto->name,
+	     name);
+	}
+
+      dynamic_symbol = elf_xtensa_dynamic_symbol_p (h, info);
+
+      tls_type = GOT_UNKNOWN;
+      if (h)
+	tls_type = elf_xtensa_hash_entry (h)->tls_type;
+      else if (local_got_tls_types)
+	tls_type = local_got_tls_types [r_symndx];
+
+      switch (r_type)
+	{
+	case R_XTENSA_32:
+	case R_XTENSA_PLT:
+	  if (elf_hash_table (info)->dynamic_sections_created
+	      && (input_section->flags & SEC_ALLOC) != 0
+	      && (dynamic_symbol || info->shared))
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_byte *loc;
+	      asection *srel;
+
+	      if (dynamic_symbol && r_type == R_XTENSA_PLT)
+		srel = htab->srelplt;
+	      else
+		srel = htab->srelgot;
+
+	      BFD_ASSERT (srel != NULL);
+
+	      outrel.r_offset =
+		_bfd_elf_section_offset (output_bfd, info,
+					 input_section, rel->r_offset);
+
+	      if ((outrel.r_offset | 1) == (bfd_vma) -1)
+		memset (&outrel, 0, sizeof outrel);
+	      else
+		{
+		  outrel.r_offset += (input_section->output_section->vma
+				      + input_section->output_offset);
+
+		  /* Complain if the relocation is in a read-only section
+		     and not in a literal pool.  */
+		  if ((input_section->flags & SEC_READONLY) != 0
+		      && !elf_xtensa_in_literal_pool (lit_table, ltblsize,
+						      outrel.r_offset))
+		    {
+		      error_message =
+			_("dynamic relocation in read-only section");
+		      if (!((*info->callbacks->reloc_dangerous)
+			    (info, error_message, input_bfd, input_section,
+			     rel->r_offset)))
+			return FALSE;
+		    }
+
+		  if (dynamic_symbol)
+		    {
+		      outrel.r_addend = rel->r_addend;
+		      rel->r_addend = 0;
+
+		      if (r_type == R_XTENSA_32)
+			{
+			  outrel.r_info =
+			    ELF32_R_INFO (h->dynindx, R_XTENSA_GLOB_DAT);
+			  relocation = 0;
+			}
+		      else /* r_type == R_XTENSA_PLT */
+			{
+			  outrel.r_info =
+			    ELF32_R_INFO (h->dynindx, R_XTENSA_JMP_SLOT);
+
+			  /* Create the PLT entry and set the initial
+			     contents of the literal entry to the address of
+			     the PLT entry.  */
+			  relocation =
+			    elf_xtensa_create_plt_entry (info, output_bfd,
+							 srel->reloc_count);
+			}
+		      unresolved_reloc = FALSE;
+		    }
+		  else
+		    {
+		      /* Generate a RELATIVE relocation.  */
+		      outrel.r_info = ELF32_R_INFO (0, R_XTENSA_RELATIVE);
+		      outrel.r_addend = 0;
+		    }
+		}
+
+	      loc = (srel->contents
+		     + srel->reloc_count++ * sizeof (Elf32_External_Rela));
+	      bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+	      BFD_ASSERT (sizeof (Elf32_External_Rela) * srel->reloc_count
+			  <= srel->size);
+	    }
+	  else if (r_type == R_XTENSA_ASM_EXPAND && dynamic_symbol)
+	    {
+	      /* This should only happen for non-PIC code, which is not
+		 supposed to be used on systems with dynamic linking.
+		 Just ignore these relocations.  */
+	      continue;
+	    }
+	  break;
+
+	case R_XTENSA_TLS_TPOFF:
+	  /* Switch to LE model for local symbols in an executable.  */
+	  if (! info->shared && ! dynamic_symbol)
+	    {
+	      relocation = tpoff (info, relocation);
+	      break;
+	    }
+	  /* fall through */
+
+	case R_XTENSA_TLSDESC_FN:
+	case R_XTENSA_TLSDESC_ARG:
+	  {
+	    if (r_type == R_XTENSA_TLSDESC_FN)
+	      {
+		if (! info->shared || (tls_type & GOT_TLS_IE) != 0)
+		  r_type = R_XTENSA_NONE;
+	      }
+	    else if (r_type == R_XTENSA_TLSDESC_ARG)
+	      {
+		if (info->shared)
+		  {
+		    if ((tls_type & GOT_TLS_IE) != 0)
+		      r_type = R_XTENSA_TLS_TPOFF;
+		  }
+		else
+		  {
+		    r_type = R_XTENSA_TLS_TPOFF;
+		    if (! dynamic_symbol)
+		      {
+			relocation = tpoff (info, relocation);
+			break;
+		      }
+		  }
+	      }
+
+	    if (r_type == R_XTENSA_NONE)
+	      /* Nothing to do here; skip to the next reloc.  */
+	      continue;
+
+	    if (! elf_hash_table (info)->dynamic_sections_created)
+	      {
+		error_message =
+		  _("TLS relocation invalid without dynamic sections");
+		if (!((*info->callbacks->reloc_dangerous)
+		      (info, error_message, input_bfd, input_section,
+		       rel->r_offset)))
+		  return FALSE;
+	      }
+	    else
+	      {
+		Elf_Internal_Rela outrel;
+		bfd_byte *loc;
+		asection *srel = htab->srelgot;
+		int indx;
+
+		outrel.r_offset = (input_section->output_section->vma
+				   + input_section->output_offset
+				   + rel->r_offset);
+
+		/* Complain if the relocation is in a read-only section
+		   and not in a literal pool.  */
+		if ((input_section->flags & SEC_READONLY) != 0
+		    && ! elf_xtensa_in_literal_pool (lit_table, ltblsize,
+						     outrel.r_offset))
+		  {
+		    error_message =
+		      _("dynamic relocation in read-only section");
+		    if (!((*info->callbacks->reloc_dangerous)
+			  (info, error_message, input_bfd, input_section,
+			   rel->r_offset)))
+		      return FALSE;
+		  }
+
+		indx = h && h->dynindx != -1 ? h->dynindx : 0;
+		if (indx == 0)
+		  outrel.r_addend = relocation - dtpoff_base (info);
+		else
+		  outrel.r_addend = 0;
+		rel->r_addend = 0;
+
+		outrel.r_info = ELF32_R_INFO (indx, r_type);
+		relocation = 0;
+		unresolved_reloc = FALSE;
+
+		BFD_ASSERT (srel);
+		loc = (srel->contents
+		       + srel->reloc_count++ * sizeof (Elf32_External_Rela));
+		bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc);
+		BFD_ASSERT (sizeof (Elf32_External_Rela) * srel->reloc_count
+			    <= srel->size);
+	      }
+	  }
+	  break;
+
+	case R_XTENSA_TLS_DTPOFF:
+	  if (! info->shared)
+	    /* Switch from LD model to LE model.  */
+	    relocation = tpoff (info, relocation);
+	  else
+	    relocation -= dtpoff_base (info);
+	  break;
+
+	case R_XTENSA_TLS_FUNC:
+	case R_XTENSA_TLS_ARG:
+	case R_XTENSA_TLS_CALL:
+	  /* Check if optimizing to IE or LE model.  */
+	  if ((tls_type & GOT_TLS_IE) != 0)
+	    {
+	      bfd_boolean is_ld_model =
+		(h && elf_xtensa_hash_entry (h) == htab->tlsbase);
+	      if (! replace_tls_insn (rel, input_bfd, input_section, contents,
+				      is_ld_model, &error_message))
+		{
+		  if (!((*info->callbacks->reloc_dangerous)
+			(info, error_message, input_bfd, input_section,
+			 rel->r_offset)))
+		    return FALSE;
+		}
+
+	      if (r_type != R_XTENSA_TLS_ARG || is_ld_model)
+		{
+		  /* Skip subsequent relocations on the same instruction.  */
+		  while (rel + 1 < relend && rel[1].r_offset == rel->r_offset)
+		    rel++;
+		}
+	    }
+	  continue;
+
+	default:
+	  if (elf_hash_table (info)->dynamic_sections_created
+	      && dynamic_symbol && (is_operand_relocation (r_type)
+				    || r_type == R_XTENSA_32_PCREL))
+	    {
+	      error_message =
+		vsprint_msg ("invalid relocation for dynamic symbol", ": %s",
+			     strlen (name) + 2, name);
+	      if (!((*info->callbacks->reloc_dangerous)
+		    (info, error_message, input_bfd, input_section,
+		     rel->r_offset)))
+		return FALSE;
+	      continue;
+	    }
+	  break;
+	}
+
+      /* Dynamic relocs are not propagated for SEC_DEBUGGING sections
+	 because such sections are not SEC_ALLOC and thus ld.so will
+	 not process them.  */
+      if (unresolved_reloc
+	  && !((input_section->flags & SEC_DEBUGGING) != 0
+	       && h->def_dynamic))
+	{
+	  (*_bfd_error_handler)
+	    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+	     input_bfd,
+	     input_section,
+	     (long) rel->r_offset,
+	     howto->name,
+	     name);
+	  return FALSE;
+	}
+
+      /* TLS optimizations may have changed r_type; update "howto".  */
+      howto = &elf_howto_table[r_type];
+
+      /* There's no point in calling bfd_perform_relocation here.
+	 Just go directly to our "special function".  */
+      r = elf_xtensa_do_reloc (howto, input_bfd, input_section,
+			       relocation + rel->r_addend,
+			       contents, rel->r_offset, is_weak_undef,
+			       &error_message);
+
+      if (r != bfd_reloc_ok && !warned)
+	{
+	  BFD_ASSERT (r == bfd_reloc_dangerous || r == bfd_reloc_other);
+	  BFD_ASSERT (error_message != NULL);
+
+	  if (rel->r_addend == 0)
+	    error_message = vsprint_msg (error_message, ": %s",
+					 strlen (name) + 2, name);
+	  else
+	    error_message = vsprint_msg (error_message, ": (%s+0x%x)",
+					 strlen (name) + 22,
+					 name, (int) rel->r_addend);
+
+	  if (!((*info->callbacks->reloc_dangerous)
+		(info, error_message, input_bfd, input_section,
+		 rel->r_offset)))
+	    return FALSE;
+	}
+    }
+
+  if (lit_table)
+    free (lit_table);
+
+  input_section->reloc_done = TRUE;
+
+  return TRUE;
+}
+
+
+/* Finish up dynamic symbol handling.  There's not much to do here since
+   the PLT and GOT entries are all set up by relocate_section.  */
+
+static bfd_boolean
+elf_xtensa_finish_dynamic_symbol (bfd *output_bfd ATTRIBUTE_UNUSED,
+				  struct bfd_link_info *info ATTRIBUTE_UNUSED,
+				  struct elf_link_hash_entry *h,
+				  Elf_Internal_Sym *sym)
+{
+  if (h->needs_plt && !h->def_regular)
+    {
+      /* Mark the symbol as undefined, rather than as defined in
+	 the .plt section.  Leave the value alone.  */
+      sym->st_shndx = SHN_UNDEF;
+      /* If the symbol is weak, we do need to clear the value.
+	 Otherwise, the PLT entry would provide a definition for
+	 the symbol even if the symbol wasn't defined anywhere,
+	 and so the symbol would never be NULL.  */
+      if (!h->ref_regular_nonweak)
+	sym->st_value = 0;
+    }
+
+  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+      || h == elf_hash_table (info)->hgot)
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+
+/* Combine adjacent literal table entries in the output.  Adjacent
+   entries within each input section may have been removed during
+   relaxation, but we repeat the process here, even though it's too late
+   to shrink the output section, because it's important to minimize the
+   number of literal table entries to reduce the start-up work for the
+   runtime linker.  Returns the number of remaining table entries or -1
+   on error.  */
+
+static int
+elf_xtensa_combine_prop_entries (bfd *output_bfd,
+				 asection *sxtlit,
+				 asection *sgotloc)
+{
+  bfd_byte *contents;
+  property_table_entry *table;
+  bfd_size_type section_size, sgotloc_size;
+  bfd_vma offset;
+  int n, m, num;
+
+  section_size = sxtlit->size;
+  BFD_ASSERT (section_size % 8 == 0);
+  num = section_size / 8;
+
+  sgotloc_size = sgotloc->size;
+  if (sgotloc_size != section_size)
+    {
+      (*_bfd_error_handler)
+	(_("internal inconsistency in size of .got.loc section"));
+      return -1;
+    }
+
+  table = bfd_malloc (num * sizeof (property_table_entry));
+  if (table == 0)
+    return -1;
+
+  /* The ".xt.lit.plt" section has the SEC_IN_MEMORY flag set and this
+     propagates to the output section, where it doesn't really apply and
+     where it breaks the following call to bfd_malloc_and_get_section.  */
+  sxtlit->flags &= ~SEC_IN_MEMORY;
+
+  if (!bfd_malloc_and_get_section (output_bfd, sxtlit, &contents))
+    {
+      if (contents != 0)
+	free (contents);
+      free (table);
+      return -1;
+    }
+
+  /* There should never be any relocations left at this point, so this
+     is quite a bit easier than what is done during relaxation.  */
+
+  /* Copy the raw contents into a property table array and sort it.  */
+  offset = 0;
+  for (n = 0; n < num; n++)
+    {
+      table[n].address = bfd_get_32 (output_bfd, &contents[offset]);
+      table[n].size = bfd_get_32 (output_bfd, &contents[offset + 4]);
+      offset += 8;
+    }
+  qsort (table, num, sizeof (property_table_entry), property_table_compare);
+
+  for (n = 0; n < num; n++)
+    {
+      bfd_boolean remove_entry = FALSE;
+
+      if (table[n].size == 0)
+	remove_entry = TRUE;
+      else if (n > 0
+	       && (table[n-1].address + table[n-1].size == table[n].address))
+	{
+	  table[n-1].size += table[n].size;
+	  remove_entry = TRUE;
+	}
+
+      if (remove_entry)
+	{
+	  for (m = n; m < num - 1; m++)
+	    {
+	      table[m].address = table[m+1].address;
+	      table[m].size = table[m+1].size;
+	    }
+
+	  n--;
+	  num--;
+	}
+    }
+
+  /* Copy the data back to the raw contents.  */
+  offset = 0;
+  for (n = 0; n < num; n++)
+    {
+      bfd_put_32 (output_bfd, table[n].address, &contents[offset]);
+      bfd_put_32 (output_bfd, table[n].size, &contents[offset + 4]);
+      offset += 8;
+    }
+
+  /* Clear the removed bytes.  */
+  if ((bfd_size_type) (num * 8) < section_size)
+    memset (&contents[num * 8], 0, section_size - num * 8);
+
+  if (! bfd_set_section_contents (output_bfd, sxtlit, contents, 0,
+				  section_size))
+    return -1;
+
+  /* Copy the contents to ".got.loc".  */
+  memcpy (sgotloc->contents, contents, section_size);
+
+  free (contents);
+  free (table);
+  return num;
+}
+
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+elf_xtensa_finish_dynamic_sections (bfd *output_bfd,
+				    struct bfd_link_info *info)
+{
+  struct elf_xtensa_link_hash_table *htab;
+  bfd *dynobj;
+  asection *sdyn, *srelplt, *sgot, *sxtlit, *sgotloc;
+  Elf32_External_Dyn *dyncon, *dynconend;
+  int num_xtlit_entries = 0;
+
+  if (! elf_hash_table (info)->dynamic_sections_created)
+    return TRUE;
+
+  htab = elf_xtensa_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+  BFD_ASSERT (sdyn != NULL);
+
+  /* Set the first entry in the global offset table to the address of
+     the dynamic section.  */
+  sgot = htab->sgot;
+  if (sgot)
+    {
+      BFD_ASSERT (sgot->size == 4);
+      if (sdyn == NULL)
+	bfd_put_32 (output_bfd, 0, sgot->contents);
+      else
+	bfd_put_32 (output_bfd,
+		    sdyn->output_section->vma + sdyn->output_offset,
+		    sgot->contents);
+    }
+
+  srelplt = htab->srelplt;
+  if (srelplt && srelplt->size != 0)
+    {
+      asection *sgotplt, *srelgot, *spltlittbl;
+      int chunk, plt_chunks, plt_entries;
+      Elf_Internal_Rela irela;
+      bfd_byte *loc;
+      unsigned rtld_reloc;
+
+      srelgot = htab->srelgot;
+      spltlittbl = htab->spltlittbl;
+      BFD_ASSERT (srelgot != NULL && spltlittbl != NULL);
+
+      /* Find the first XTENSA_RTLD relocation.  Presumably the rest
+	 of them follow immediately after....  */
+      for (rtld_reloc = 0; rtld_reloc < srelgot->reloc_count; rtld_reloc++)
+	{
+	  loc = srelgot->contents + rtld_reloc * sizeof (Elf32_External_Rela);
+	  bfd_elf32_swap_reloca_in (output_bfd, loc, &irela);
+	  if (ELF32_R_TYPE (irela.r_info) == R_XTENSA_RTLD)
+	    break;
+	}
+      BFD_ASSERT (rtld_reloc < srelgot->reloc_count);
+
+      plt_entries = srelplt->size / sizeof (Elf32_External_Rela);
+      plt_chunks =
+	(plt_entries + PLT_ENTRIES_PER_CHUNK - 1) / PLT_ENTRIES_PER_CHUNK;
+
+      for (chunk = 0; chunk < plt_chunks; chunk++)
+	{
+	  int chunk_entries = 0;
+
+	  sgotplt = elf_xtensa_get_gotplt_section (info, chunk);
+	  BFD_ASSERT (sgotplt != NULL);
+
+	  /* Emit special RTLD relocations for the first two entries in
+	     each chunk of the .got.plt section.  */
+
+	  loc = srelgot->contents + rtld_reloc * sizeof (Elf32_External_Rela);
+	  bfd_elf32_swap_reloca_in (output_bfd, loc, &irela);
+	  BFD_ASSERT (ELF32_R_TYPE (irela.r_info) == R_XTENSA_RTLD);
+	  irela.r_offset = (sgotplt->output_section->vma
+			    + sgotplt->output_offset);
+	  irela.r_addend = 1; /* tell rtld to set value to resolver function */
+	  bfd_elf32_swap_reloca_out (output_bfd, &irela, loc);
+	  rtld_reloc += 1;
+	  BFD_ASSERT (rtld_reloc <= srelgot->reloc_count);
+
+	  /* Next literal immediately follows the first.  */
+	  loc += sizeof (Elf32_External_Rela);
+	  bfd_elf32_swap_reloca_in (output_bfd, loc, &irela);
+	  BFD_ASSERT (ELF32_R_TYPE (irela.r_info) == R_XTENSA_RTLD);
+	  irela.r_offset = (sgotplt->output_section->vma
+			    + sgotplt->output_offset + 4);
+	  /* Tell rtld to set value to object's link map.  */
+	  irela.r_addend = 2;
+	  bfd_elf32_swap_reloca_out (output_bfd, &irela, loc);
+	  rtld_reloc += 1;
+	  BFD_ASSERT (rtld_reloc <= srelgot->reloc_count);
+
+	  /* Fill in the literal table.  */
+	  if (chunk < plt_chunks - 1)
+	    chunk_entries = PLT_ENTRIES_PER_CHUNK;
+	  else
+	    chunk_entries = plt_entries - (chunk * PLT_ENTRIES_PER_CHUNK);
+
+	  BFD_ASSERT ((unsigned) (chunk + 1) * 8 <= spltlittbl->size);
+	  bfd_put_32 (output_bfd,
+		      sgotplt->output_section->vma + sgotplt->output_offset,
+		      spltlittbl->contents + (chunk * 8) + 0);
+	  bfd_put_32 (output_bfd,
+		      8 + (chunk_entries * 4),
+		      spltlittbl->contents + (chunk * 8) + 4);
+	}
+
+      /* All the dynamic relocations have been emitted at this point.
+	 Make sure the relocation sections are the correct size.  */
+      if (srelgot->size != (sizeof (Elf32_External_Rela)
+			    * srelgot->reloc_count)
+	  || srelplt->size != (sizeof (Elf32_External_Rela)
+			       * srelplt->reloc_count))
+	abort ();
+
+     /* The .xt.lit.plt section has just been modified.  This must
+	happen before the code below which combines adjacent literal
+	table entries, and the .xt.lit.plt contents have to be forced to
+	the output here.  */
+      if (! bfd_set_section_contents (output_bfd,
+				      spltlittbl->output_section,
+				      spltlittbl->contents,
+				      spltlittbl->output_offset,
+				      spltlittbl->size))
+	return FALSE;
+      /* Clear SEC_HAS_CONTENTS so the contents won't be output again.  */
+      spltlittbl->flags &= ~SEC_HAS_CONTENTS;
+    }
+
+  /* Combine adjacent literal table entries.  */
+  BFD_ASSERT (! info->relocatable);
+  sxtlit = bfd_get_section_by_name (output_bfd, ".xt.lit");
+  sgotloc = htab->sgotloc;
+  BFD_ASSERT (sgotloc);
+  if (sxtlit)
+    {
+      num_xtlit_entries =
+	elf_xtensa_combine_prop_entries (output_bfd, sxtlit, sgotloc);
+      if (num_xtlit_entries < 0)
+	return FALSE;
+    }
+
+  dyncon = (Elf32_External_Dyn *) sdyn->contents;
+  dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
+  for (; dyncon < dynconend; dyncon++)
+    {
+      Elf_Internal_Dyn dyn;
+
+      bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
+
+      switch (dyn.d_tag)
+	{
+	default:
+	  break;
+
+	case DT_XTENSA_GOT_LOC_SZ:
+	  dyn.d_un.d_val = num_xtlit_entries;
+	  break;
+
+	case DT_XTENSA_GOT_LOC_OFF:
+	  dyn.d_un.d_ptr = htab->sgotloc->output_section->vma;
+	  break;
+
+	case DT_PLTGOT:
+	  dyn.d_un.d_ptr = htab->sgot->output_section->vma;
+	  break;
+
+	case DT_JMPREL:
+	  dyn.d_un.d_ptr = htab->srelplt->output_section->vma;
+	  break;
+
+	case DT_PLTRELSZ:
+	  dyn.d_un.d_val = htab->srelplt->output_section->size;
+	  break;
+
+	case DT_RELASZ:
+	  /* Adjust RELASZ to not include JMPREL.  This matches what
+	     glibc expects and what is done for several other ELF
+	     targets (e.g., i386, alpha), but the "correct" behavior
+	     seems to be unresolved.  Since the linker script arranges
+	     for .rela.plt to follow all other relocation sections, we
+	     don't have to worry about changing the DT_RELA entry.  */
+	  if (htab->srelplt)
+	    dyn.d_un.d_val -= htab->srelplt->output_section->size;
+	  break;
+	}
+
+      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+    }
+
+  return TRUE;
+}
+
+
+/* Functions for dealing with the e_flags field.  */
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+
+static bfd_boolean
+elf_xtensa_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  unsigned out_mach, in_mach;
+  flagword out_flag, in_flag;
+
+  /* Check if we have the same endianness.  */
+  if (!_bfd_generic_verify_endian_match (ibfd, obfd))
+    return FALSE;
+
+  /* Don't even pretend to support mixed-format linking.  */
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return FALSE;
+
+  out_flag = elf_elfheader (obfd)->e_flags;
+  in_flag = elf_elfheader (ibfd)->e_flags;
+
+  out_mach = out_flag & EF_XTENSA_MACH;
+  in_mach = in_flag & EF_XTENSA_MACH;
+  if (out_mach != in_mach)
+    {
+      (*_bfd_error_handler)
+	(_("%B: incompatible machine type. Output is 0x%x. Input is 0x%x"),
+	 ibfd, out_mach, in_mach);
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+
+  if (! elf_flags_init (obfd))
+    {
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = in_flag;
+
+      if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
+	  && bfd_get_arch_info (obfd)->the_default)
+	return bfd_set_arch_mach (obfd, bfd_get_arch (ibfd),
+				  bfd_get_mach (ibfd));
+
+      return TRUE;
+    }
+
+  if ((out_flag & EF_XTENSA_XT_INSN) != (in_flag & EF_XTENSA_XT_INSN)) 
+    elf_elfheader (obfd)->e_flags &= (~ EF_XTENSA_XT_INSN);
+
+  if ((out_flag & EF_XTENSA_XT_LIT) != (in_flag & EF_XTENSA_XT_LIT)) 
+    elf_elfheader (obfd)->e_flags &= (~ EF_XTENSA_XT_LIT);
+
+  return TRUE;
+}
+
+
+static bfd_boolean
+elf_xtensa_set_private_flags (bfd *abfd, flagword flags)
+{
+  BFD_ASSERT (!elf_flags_init (abfd)
+	      || elf_elfheader (abfd)->e_flags == flags);
+
+  elf_elfheader (abfd)->e_flags |= flags;
+  elf_flags_init (abfd) = TRUE;
+
+  return TRUE;
+}
+
+
+static bfd_boolean
+elf_xtensa_print_private_bfd_data (bfd *abfd, void *farg)
+{
+  FILE *f = (FILE *) farg;
+  flagword e_flags = elf_elfheader (abfd)->e_flags;
+
+  fprintf (f, "\nXtensa header:\n");
+  if ((e_flags & EF_XTENSA_MACH) == E_XTENSA_MACH)
+    fprintf (f, "\nMachine     = Base\n");
+  else
+    fprintf (f, "\nMachine Id  = 0x%x\n", e_flags & EF_XTENSA_MACH);
+
+  fprintf (f, "Insn tables = %s\n",
+	   (e_flags & EF_XTENSA_XT_INSN) ? "true" : "false");
+
+  fprintf (f, "Literal tables = %s\n",
+	   (e_flags & EF_XTENSA_XT_LIT) ? "true" : "false");
+
+  return _bfd_elf_print_private_bfd_data (abfd, farg);
+}
+
+
+/* Set the right machine number for an Xtensa ELF file.  */
+
+static bfd_boolean
+elf_xtensa_object_p (bfd *abfd)
+{
+  int mach;
+  unsigned long arch = elf_elfheader (abfd)->e_flags & EF_XTENSA_MACH;
+
+  switch (arch)
+    {
+    case E_XTENSA_MACH:
+      mach = bfd_mach_xtensa;
+      break;
+    default:
+      return FALSE;
+    }
+
+  (void) bfd_default_set_arch_mach (abfd, bfd_arch_xtensa, mach);
+  return TRUE;
+}
+
+
+/* The final processing done just before writing out an Xtensa ELF object
+   file.  This gets the Xtensa architecture right based on the machine
+   number.  */
+
+static void
+elf_xtensa_final_write_processing (bfd *abfd,
+				   bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  int mach;
+  unsigned long val;
+
+  switch (mach = bfd_get_mach (abfd))
+    {
+    case bfd_mach_xtensa:
+      val = E_XTENSA_MACH;
+      break;
+    default:
+      return;
+    }
+
+  elf_elfheader (abfd)->e_flags &=  (~ EF_XTENSA_MACH);
+  elf_elfheader (abfd)->e_flags |= val;
+}
+
+
+static enum elf_reloc_type_class
+elf_xtensa_reloc_type_class (const Elf_Internal_Rela *rela)
+{
+  switch ((int) ELF32_R_TYPE (rela->r_info))
+    {
+    case R_XTENSA_RELATIVE:
+      return reloc_class_relative;
+    case R_XTENSA_JMP_SLOT:
+      return reloc_class_plt;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+
+static bfd_boolean
+elf_xtensa_discard_info_for_section (bfd *abfd,
+				     struct elf_reloc_cookie *cookie,
+				     struct bfd_link_info *info,
+				     asection *sec)
+{
+  bfd_byte *contents;
+  bfd_vma offset, actual_offset;
+  bfd_size_type removed_bytes = 0;
+  bfd_size_type entry_size;
+
+  if (sec->output_section
+      && bfd_is_abs_section (sec->output_section))
+    return FALSE;
+
+  if (xtensa_is_proptable_section (sec))
+    entry_size = 12;
+  else
+    entry_size = 8;
+
+  if (sec->size == 0 || sec->size % entry_size != 0)
+    return FALSE;
+
+  contents = retrieve_contents (abfd, sec, info->keep_memory);
+  if (!contents)
+    return FALSE;
+
+  cookie->rels = retrieve_internal_relocs (abfd, sec, info->keep_memory);
+  if (!cookie->rels)
+    {
+      release_contents (sec, contents);
+      return FALSE;
+    }
+
+  /* Sort the relocations.  They should already be in order when
+     relaxation is enabled, but it might not be.  */
+  qsort (cookie->rels, sec->reloc_count, sizeof (Elf_Internal_Rela),
+	 internal_reloc_compare);
+
+  cookie->rel = cookie->rels;
+  cookie->relend = cookie->rels + sec->reloc_count;
+
+  for (offset = 0; offset < sec->size; offset += entry_size)
+    {
+      actual_offset = offset - removed_bytes;
+
+      /* The ...symbol_deleted_p function will skip over relocs but it
+	 won't adjust their offsets, so do that here.  */
+      while (cookie->rel < cookie->relend
+	     && cookie->rel->r_offset < offset)
+	{
+	  cookie->rel->r_offset -= removed_bytes;
+	  cookie->rel++;
+	}
+
+      while (cookie->rel < cookie->relend
+	     && cookie->rel->r_offset == offset)
+	{
+	  if (bfd_elf_reloc_symbol_deleted_p (offset, cookie))
+	    {
+	      /* Remove the table entry.  (If the reloc type is NONE, then
+		 the entry has already been merged with another and deleted
+		 during relaxation.)  */
+	      if (ELF32_R_TYPE (cookie->rel->r_info) != R_XTENSA_NONE)
+		{
+		  /* Shift the contents up.  */
+		  if (offset + entry_size < sec->size)
+		    memmove (&contents[actual_offset],
+			     &contents[actual_offset + entry_size],
+			     sec->size - offset - entry_size);
+		  removed_bytes += entry_size;
+		}
+
+	      /* Remove this relocation.  */
+	      cookie->rel->r_info = ELF32_R_INFO (0, R_XTENSA_NONE);
+	    }
+
+	  /* Adjust the relocation offset for previous removals.  This
+	     should not be done before calling ...symbol_deleted_p
+	     because it might mess up the offset comparisons there.
+	     Make sure the offset doesn't underflow in the case where
+	     the first entry is removed.  */
+	  if (cookie->rel->r_offset >= removed_bytes)
+	    cookie->rel->r_offset -= removed_bytes;
+	  else
+	    cookie->rel->r_offset = 0;
+
+	  cookie->rel++;
+	}
+    }
+
+  if (removed_bytes != 0)
+    {
+      /* Adjust any remaining relocs (shouldn't be any).  */
+      for (; cookie->rel < cookie->relend; cookie->rel++)
+	{
+	  if (cookie->rel->r_offset >= removed_bytes)
+	    cookie->rel->r_offset -= removed_bytes;
+	  else
+	    cookie->rel->r_offset = 0;
+	}
+
+      /* Clear the removed bytes.  */
+      memset (&contents[sec->size - removed_bytes], 0, removed_bytes);
+
+      pin_contents (sec, contents);
+      pin_internal_relocs (sec, cookie->rels);
+
+      /* Shrink size.  */
+      if (sec->rawsize == 0)
+	sec->rawsize = sec->size;
+      sec->size -= removed_bytes;
+
+      if (xtensa_is_littable_section (sec))
+	{
+	  asection *sgotloc = elf_xtensa_hash_table (info)->sgotloc;
+	  if (sgotloc)
+	    sgotloc->size -= removed_bytes;
+	}
+    }
+  else
+    {
+      release_contents (sec, contents);
+      release_internal_relocs (sec, cookie->rels);
+    }
+
+  return (removed_bytes != 0);
+}
+
+
+static bfd_boolean
+elf_xtensa_discard_info (bfd *abfd,
+			 struct elf_reloc_cookie *cookie,
+			 struct bfd_link_info *info)
+{
+  asection *sec;
+  bfd_boolean changed = FALSE;
+
+  for (sec = abfd->sections; sec != NULL; sec = sec->next)
+    {
+      if (xtensa_is_property_section (sec))
+	{
+	  if (elf_xtensa_discard_info_for_section (abfd, cookie, info, sec))
+	    changed = TRUE;
+	}
+    }
+
+  return changed;
+}
+
+
+static bfd_boolean
+elf_xtensa_ignore_discarded_relocs (asection *sec)
+{
+  return xtensa_is_property_section (sec);
+}
+
+
+static unsigned int
+elf_xtensa_action_discarded (asection *sec)
+{
+  if (strcmp (".xt_except_table", sec->name) == 0)
+    return 0;
+
+  if (strcmp (".xt_except_desc", sec->name) == 0)
+    return 0;
+
+  return _bfd_elf_default_action_discarded (sec);
+}
+
+
+/* Support for core dump NOTE sections.  */
+
+static bfd_boolean
+elf_xtensa_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  int offset;
+  unsigned int size;
+
+  /* The size for Xtensa is variable, so don't try to recognize the format
+     based on the size.  Just assume this is GNU/Linux.  */
+
+  /* pr_cursig */
+  elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12);
+
+  /* pr_pid */
+  elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 24);
+
+  /* pr_reg */
+  offset = 72;
+  size = note->descsz - offset - 4;
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg",
+					  size, note->descpos + offset);
+}
+
+
+static bfd_boolean
+elf_xtensa_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      case 128:		/* GNU/Linux elf_prpsinfo */
+	elf_tdata (abfd)->core_program
+	 = _bfd_elfcore_strndup (abfd, note->descdata + 32, 16);
+	elf_tdata (abfd)->core_command
+	 = _bfd_elfcore_strndup (abfd, note->descdata + 48, 80);
+    }
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+
+  {
+    char *command = elf_tdata (abfd)->core_command;
+    int n = strlen (command);
+
+    if (0 < n && command[n - 1] == ' ')
+      command[n - 1] = '\0';
+  }
+
+  return TRUE;
+}
+
+
+/* Generic Xtensa configurability stuff.  */
+
+static xtensa_opcode callx0_op = XTENSA_UNDEFINED;
+static xtensa_opcode callx4_op = XTENSA_UNDEFINED;
+static xtensa_opcode callx8_op = XTENSA_UNDEFINED;
+static xtensa_opcode callx12_op = XTENSA_UNDEFINED;
+static xtensa_opcode call0_op = XTENSA_UNDEFINED;
+static xtensa_opcode call4_op = XTENSA_UNDEFINED;
+static xtensa_opcode call8_op = XTENSA_UNDEFINED;
+static xtensa_opcode call12_op = XTENSA_UNDEFINED;
+
+static void
+init_call_opcodes (void)
+{
+  if (callx0_op == XTENSA_UNDEFINED)
+    {
+      callx0_op  = xtensa_opcode_lookup (xtensa_default_isa, "callx0");
+      callx4_op  = xtensa_opcode_lookup (xtensa_default_isa, "callx4");
+      callx8_op  = xtensa_opcode_lookup (xtensa_default_isa, "callx8");
+      callx12_op = xtensa_opcode_lookup (xtensa_default_isa, "callx12");
+      call0_op   = xtensa_opcode_lookup (xtensa_default_isa, "call0");
+      call4_op   = xtensa_opcode_lookup (xtensa_default_isa, "call4");
+      call8_op   = xtensa_opcode_lookup (xtensa_default_isa, "call8");
+      call12_op  = xtensa_opcode_lookup (xtensa_default_isa, "call12");
+    }
+}
+
+
+static bfd_boolean
+is_indirect_call_opcode (xtensa_opcode opcode)
+{
+  init_call_opcodes ();
+  return (opcode == callx0_op
+	  || opcode == callx4_op
+	  || opcode == callx8_op
+	  || opcode == callx12_op);
+}
+
+
+static bfd_boolean
+is_direct_call_opcode (xtensa_opcode opcode)
+{
+  init_call_opcodes ();
+  return (opcode == call0_op
+	  || opcode == call4_op
+	  || opcode == call8_op
+	  || opcode == call12_op);
+}
+
+
+static bfd_boolean
+is_windowed_call_opcode (xtensa_opcode opcode)
+{
+  init_call_opcodes ();
+  return (opcode == call4_op
+	  || opcode == call8_op
+	  || opcode == call12_op
+	  || opcode == callx4_op
+	  || opcode == callx8_op
+	  || opcode == callx12_op);
+}
+
+
+static bfd_boolean
+get_indirect_call_dest_reg (xtensa_opcode opcode, unsigned *pdst)
+{
+  unsigned dst = (unsigned) -1;
+
+  init_call_opcodes ();
+  if (opcode == callx0_op)
+    dst = 0;
+  else if (opcode == callx4_op)
+    dst = 4;
+  else if (opcode == callx8_op)
+    dst = 8;
+  else if (opcode == callx12_op)
+    dst = 12;
+
+  if (dst == (unsigned) -1)
+    return FALSE;
+
+  *pdst = dst;
+  return TRUE;
+}
+
+
+static xtensa_opcode
+get_const16_opcode (void)
+{
+  static bfd_boolean done_lookup = FALSE;
+  static xtensa_opcode const16_opcode = XTENSA_UNDEFINED;
+  if (!done_lookup)
+    {
+      const16_opcode = xtensa_opcode_lookup (xtensa_default_isa, "const16");
+      done_lookup = TRUE;
+    }
+  return const16_opcode;
+}
+
+
+static xtensa_opcode
+get_l32r_opcode (void)
+{
+  static xtensa_opcode l32r_opcode = XTENSA_UNDEFINED;
+  static bfd_boolean done_lookup = FALSE;
+
+  if (!done_lookup)
+    {
+      l32r_opcode = xtensa_opcode_lookup (xtensa_default_isa, "l32r");
+      done_lookup = TRUE;
+    }
+  return l32r_opcode;
+}
+
+
+static bfd_vma
+l32r_offset (bfd_vma addr, bfd_vma pc)
+{
+  bfd_vma offset;
+
+  offset = addr - ((pc+3) & -4);
+  BFD_ASSERT ((offset & ((1 << 2) - 1)) == 0);
+  offset = (signed int) offset >> 2;
+  BFD_ASSERT ((signed int) offset >> 16 == -1);
+  return offset;
+}
+
+
+static int
+get_relocation_opnd (xtensa_opcode opcode, int r_type)
+{
+  xtensa_isa isa = xtensa_default_isa;
+  int last_immed, last_opnd, opi;
+
+  if (opcode == XTENSA_UNDEFINED)
+    return XTENSA_UNDEFINED;
+
+  /* Find the last visible PC-relative immediate operand for the opcode.
+     If there are no PC-relative immediates, then choose the last visible
+     immediate; otherwise, fail and return XTENSA_UNDEFINED.  */
+  last_immed = XTENSA_UNDEFINED;
+  last_opnd = xtensa_opcode_num_operands (isa, opcode);
+  for (opi = last_opnd - 1; opi >= 0; opi--)
+    {
+      if (xtensa_operand_is_visible (isa, opcode, opi) == 0)
+	continue;
+      if (xtensa_operand_is_PCrelative (isa, opcode, opi) == 1)
+	{
+	  last_immed = opi;
+	  break;
+	}
+      if (last_immed == XTENSA_UNDEFINED
+	  && xtensa_operand_is_register (isa, opcode, opi) == 0)
+	last_immed = opi;
+    }
+  if (last_immed < 0)
+    return XTENSA_UNDEFINED;
+
+  /* If the operand number was specified in an old-style relocation,
+     check for consistency with the operand computed above.  */
+  if (r_type >= R_XTENSA_OP0 && r_type <= R_XTENSA_OP2)
+    {
+      int reloc_opnd = r_type - R_XTENSA_OP0;
+      if (reloc_opnd != last_immed)
+	return XTENSA_UNDEFINED;
+    }
+
+  return last_immed;
+}
+
+
+int
+get_relocation_slot (int r_type)
+{
+  switch (r_type)
+    {
+    case R_XTENSA_OP0:
+    case R_XTENSA_OP1:
+    case R_XTENSA_OP2:
+      return 0;
+
+    default:
+      if (r_type >= R_XTENSA_SLOT0_OP && r_type <= R_XTENSA_SLOT14_OP)
+	return r_type - R_XTENSA_SLOT0_OP;
+      if (r_type >= R_XTENSA_SLOT0_ALT && r_type <= R_XTENSA_SLOT14_ALT)
+	return r_type - R_XTENSA_SLOT0_ALT;
+      break;
+    }
+
+  return XTENSA_UNDEFINED;
+}
+
+
+/* Get the opcode for a relocation.  */
+
+static xtensa_opcode
+get_relocation_opcode (bfd *abfd,
+		       asection *sec,
+		       bfd_byte *contents,
+		       Elf_Internal_Rela *irel)
+{
+  static xtensa_insnbuf ibuff = NULL;
+  static xtensa_insnbuf sbuff = NULL;
+  xtensa_isa isa = xtensa_default_isa;
+  xtensa_format fmt;
+  int slot;
+
+  if (contents == NULL)
+    return XTENSA_UNDEFINED;
+
+  if (bfd_get_section_limit (abfd, sec) <= irel->r_offset)
+    return XTENSA_UNDEFINED;
+
+  if (ibuff == NULL)
+    {
+      ibuff = xtensa_insnbuf_alloc (isa);
+      sbuff = xtensa_insnbuf_alloc (isa);
+    }
+
+  /* Decode the instruction.  */
+  xtensa_insnbuf_from_chars (isa, ibuff, &contents[irel->r_offset],
+			     sec->size - irel->r_offset);
+  fmt = xtensa_format_decode (isa, ibuff);
+  slot = get_relocation_slot (ELF32_R_TYPE (irel->r_info));
+  if (slot == XTENSA_UNDEFINED)
+    return XTENSA_UNDEFINED;
+  xtensa_format_get_slot (isa, fmt, slot, ibuff, sbuff);
+  return xtensa_opcode_decode (isa, fmt, slot, sbuff);
+}
+
+
+bfd_boolean
+is_l32r_relocation (bfd *abfd,
+		    asection *sec,
+		    bfd_byte *contents,
+		    Elf_Internal_Rela *irel)
+{
+  xtensa_opcode opcode;
+  if (!is_operand_relocation (ELF32_R_TYPE (irel->r_info)))
+    return FALSE;
+  opcode = get_relocation_opcode (abfd, sec, contents, irel);
+  return (opcode == get_l32r_opcode ());
+}
+
+
+static bfd_size_type
+get_asm_simplify_size (bfd_byte *contents,
+		       bfd_size_type content_len,
+		       bfd_size_type offset)
+{
+  bfd_size_type insnlen, size = 0;
+
+  /* Decode the size of the next two instructions.  */
+  insnlen = insn_decode_len (contents, content_len, offset);
+  if (insnlen == 0)
+    return 0;
+
+  size += insnlen;
+  
+  insnlen = insn_decode_len (contents, content_len, offset + size);
+  if (insnlen == 0)
+    return 0;
+
+  size += insnlen;
+  return size;
+}
+
+
+bfd_boolean
+is_alt_relocation (int r_type)
+{
+  return (r_type >= R_XTENSA_SLOT0_ALT
+	  && r_type <= R_XTENSA_SLOT14_ALT);
+}
+
+
+bfd_boolean
+is_operand_relocation (int r_type)
+{
+  switch (r_type)
+    {
+    case R_XTENSA_OP0:
+    case R_XTENSA_OP1:
+    case R_XTENSA_OP2:
+      return TRUE;
+
+    default:
+      if (r_type >= R_XTENSA_SLOT0_OP && r_type <= R_XTENSA_SLOT14_OP)
+	return TRUE;
+      if (r_type >= R_XTENSA_SLOT0_ALT && r_type <= R_XTENSA_SLOT14_ALT)
+	return TRUE;
+      break;
+    }
+
+  return FALSE;
+}
+
+      
+#define MIN_INSN_LENGTH 2
+
+/* Return 0 if it fails to decode.  */
+
+bfd_size_type
+insn_decode_len (bfd_byte *contents,
+		 bfd_size_type content_len,
+		 bfd_size_type offset)
+{
+  int insn_len;
+  xtensa_isa isa = xtensa_default_isa;
+  xtensa_format fmt;
+  static xtensa_insnbuf ibuff = NULL;
+
+  if (offset + MIN_INSN_LENGTH > content_len)
+    return 0;
+
+  if (ibuff == NULL)
+    ibuff = xtensa_insnbuf_alloc (isa);
+  xtensa_insnbuf_from_chars (isa, ibuff, &contents[offset],
+			     content_len - offset);
+  fmt = xtensa_format_decode (isa, ibuff);
+  if (fmt == XTENSA_UNDEFINED)
+    return 0;
+  insn_len = xtensa_format_length (isa, fmt);
+  if (insn_len ==  XTENSA_UNDEFINED)
+    return 0;
+  return insn_len;
+}
+
+
+/* Decode the opcode for a single slot instruction.
+   Return 0 if it fails to decode or the instruction is multi-slot.  */
+
+xtensa_opcode
+insn_decode_opcode (bfd_byte *contents,
+		    bfd_size_type content_len,
+		    bfd_size_type offset,
+		    int slot)
+{
+  xtensa_isa isa = xtensa_default_isa;
+  xtensa_format fmt;
+  static xtensa_insnbuf insnbuf = NULL;
+  static xtensa_insnbuf slotbuf = NULL;
+
+  if (offset + MIN_INSN_LENGTH > content_len)
+    return XTENSA_UNDEFINED;
+
+  if (insnbuf == NULL)
+    {
+      insnbuf = xtensa_insnbuf_alloc (isa);
+      slotbuf = xtensa_insnbuf_alloc (isa);
+    }
+
+  xtensa_insnbuf_from_chars (isa, insnbuf, &contents[offset],
+			     content_len - offset);
+  fmt = xtensa_format_decode (isa, insnbuf);
+  if (fmt == XTENSA_UNDEFINED)
+    return XTENSA_UNDEFINED;
+
+  if (slot >= xtensa_format_num_slots (isa, fmt))
+    return XTENSA_UNDEFINED;
+
+  xtensa_format_get_slot (isa, fmt, slot, insnbuf, slotbuf);
+  return xtensa_opcode_decode (isa, fmt, slot, slotbuf);
+}
+
+
+/* The offset is the offset in the contents.
+   The address is the address of that offset.  */
+
+static bfd_boolean
+check_branch_target_aligned (bfd_byte *contents,
+			     bfd_size_type content_length,
+			     bfd_vma offset,
+			     bfd_vma address)
+{
+  bfd_size_type insn_len = insn_decode_len (contents, content_length, offset);
+  if (insn_len == 0)
+    return FALSE;
+  return check_branch_target_aligned_address (address, insn_len);
+}
+
+
+static bfd_boolean
+check_loop_aligned (bfd_byte *contents,
+		    bfd_size_type content_length,
+		    bfd_vma offset,
+		    bfd_vma address)
+{
+  bfd_size_type loop_len, insn_len;
+  xtensa_opcode opcode;
+
+  opcode = insn_decode_opcode (contents, content_length, offset, 0);
+  if (opcode == XTENSA_UNDEFINED
+      || xtensa_opcode_is_loop (xtensa_default_isa, opcode) != 1)
+    {
+      BFD_ASSERT (FALSE);
+      return FALSE;
+    }
+  
+  loop_len = insn_decode_len (contents, content_length, offset);
+  insn_len = insn_decode_len (contents, content_length, offset + loop_len);
+  if (loop_len == 0 || insn_len == 0)
+    {
+      BFD_ASSERT (FALSE);
+      return FALSE;
+    }
+
+  return check_branch_target_aligned_address (address + loop_len, insn_len);
+}
+
+
+static bfd_boolean
+check_branch_target_aligned_address (bfd_vma addr, int len)
+{
+  if (len == 8)
+    return (addr % 8 == 0);
+  return ((addr >> 2) == ((addr + len - 1) >> 2));
+}
+
+
+/* Instruction widening and narrowing.  */
+
+/* When FLIX is available we need to access certain instructions only
+   when they are 16-bit or 24-bit instructions.  This table caches
+   information about such instructions by walking through all the
+   opcodes and finding the smallest single-slot format into which each
+   can be encoded.  */
+
+static xtensa_format *op_single_fmt_table = NULL;
+
+
+static void
+init_op_single_format_table (void)
+{
+  xtensa_isa isa = xtensa_default_isa;
+  xtensa_insnbuf ibuf;
+  xtensa_opcode opcode;
+  xtensa_format fmt;
+  int num_opcodes;
+
+  if (op_single_fmt_table)
+    return;
+
+  ibuf = xtensa_insnbuf_alloc (isa);
+  num_opcodes = xtensa_isa_num_opcodes (isa);
+
+  op_single_fmt_table = (xtensa_format *)
+    bfd_malloc (sizeof (xtensa_format) * num_opcodes);
+  for (opcode = 0; opcode < num_opcodes; opcode++)
+    {
+      op_single_fmt_table[opcode] = XTENSA_UNDEFINED;
+      for (fmt = 0; fmt < xtensa_isa_num_formats (isa); fmt++)
+	{
+	  if (xtensa_format_num_slots (isa, fmt) == 1
+	      && xtensa_opcode_encode (isa, fmt, 0, ibuf, opcode) == 0)
+	    {
+	      xtensa_opcode old_fmt = op_single_fmt_table[opcode];
+	      int fmt_length = xtensa_format_length (isa, fmt);
+	      if (old_fmt == XTENSA_UNDEFINED
+		  || fmt_length < xtensa_format_length (isa, old_fmt))
+		op_single_fmt_table[opcode] = fmt;
+	    }
+	}
+    }
+  xtensa_insnbuf_free (isa, ibuf);
+}
+
+
+static xtensa_format
+get_single_format (xtensa_opcode opcode)
+{
+  init_op_single_format_table ();
+  return op_single_fmt_table[opcode];
+}
+
+
+/* For the set of narrowable instructions we do NOT include the
+   narrowings beqz -> beqz.n or bnez -> bnez.n because of complexities
+   involved during linker relaxation that may require these to
+   re-expand in some conditions.  Also, the narrowing "or" -> mov.n
+   requires special case code to ensure it only works when op1 == op2.  */
+
+struct string_pair
+{
+  const char *wide;
+  const char *narrow;
+};
+
+struct string_pair narrowable[] =
+{
+  { "add", "add.n" },
+  { "addi", "addi.n" },
+  { "addmi", "addi.n" },
+  { "l32i", "l32i.n" },
+  { "movi", "movi.n" },
+  { "ret", "ret.n" },
+  { "retw", "retw.n" },
+  { "s32i", "s32i.n" },
+  { "or", "mov.n" } /* special case only when op1 == op2 */
+};
+
+struct string_pair widenable[] =
+{
+  { "add", "add.n" },
+  { "addi", "addi.n" },
+  { "addmi", "addi.n" },
+  { "beqz", "beqz.n" },
+  { "bnez", "bnez.n" },
+  { "l32i", "l32i.n" },
+  { "movi", "movi.n" },
+  { "ret", "ret.n" },
+  { "retw", "retw.n" },
+  { "s32i", "s32i.n" },
+  { "or", "mov.n" } /* special case only when op1 == op2 */
+};
+
+
+/* Check if an instruction can be "narrowed", i.e., changed from a standard
+   3-byte instruction to a 2-byte "density" instruction.  If it is valid,
+   return the instruction buffer holding the narrow instruction.  Otherwise,
+   return 0.  The set of valid narrowing are specified by a string table
+   but require some special case operand checks in some cases.  */
+
+static xtensa_insnbuf
+can_narrow_instruction (xtensa_insnbuf slotbuf,
+			xtensa_format fmt,
+			xtensa_opcode opcode)
+{
+  xtensa_isa isa = xtensa_default_isa;
+  xtensa_format o_fmt;
+  unsigned opi;
+
+  static xtensa_insnbuf o_insnbuf = NULL;
+  static xtensa_insnbuf o_slotbuf = NULL;
+
+  if (o_insnbuf == NULL)
+    {
+      o_insnbuf = xtensa_insnbuf_alloc (isa);
+      o_slotbuf = xtensa_insnbuf_alloc (isa);
+    }
+
+  for (opi = 0; opi < (sizeof (narrowable)/sizeof (struct string_pair)); opi++)
+    {
+      bfd_boolean is_or = (strcmp ("or", narrowable[opi].wide) == 0);
+
+      if (opcode == xtensa_opcode_lookup (isa, narrowable[opi].wide))
+	{
+	  uint32 value, newval;
+	  int i, operand_count, o_operand_count;
+	  xtensa_opcode o_opcode;
+
+	  /* Address does not matter in this case.  We might need to
+	     fix it to handle branches/jumps.  */
+	  bfd_vma self_address = 0;
+
+	  o_opcode = xtensa_opcode_lookup (isa, narrowable[opi].narrow);
+	  if (o_opcode == XTENSA_UNDEFINED)
+	    return 0;
+	  o_fmt = get_single_format (o_opcode);
+	  if (o_fmt == XTENSA_UNDEFINED)
+	    return 0;
+
+	  if (xtensa_format_length (isa, fmt) != 3
+	      || xtensa_format_length (isa, o_fmt) != 2)
+	    return 0;
+
+	  xtensa_format_encode (isa, o_fmt, o_insnbuf);
+	  operand_count = xtensa_opcode_num_operands (isa, opcode);
+	  o_operand_count = xtensa_opcode_num_operands (isa, o_opcode);
+
+	  if (xtensa_opcode_encode (isa, o_fmt, 0, o_slotbuf, o_opcode) != 0)
+	    return 0;
+
+	  if (!is_or)
+	    {
+	      if (xtensa_opcode_num_operands (isa, o_opcode) != operand_count)
+		return 0;
+	    }
+	  else
+	    {
+	      uint32 rawval0, rawval1, rawval2;
+
+	      if (o_operand_count + 1 != operand_count
+		  || xtensa_operand_get_field (isa, opcode, 0,
+					       fmt, 0, slotbuf, &rawval0) != 0
+		  || xtensa_operand_get_field (isa, opcode, 1,
+					       fmt, 0, slotbuf, &rawval1) != 0
+		  || xtensa_operand_get_field (isa, opcode, 2,
+					       fmt, 0, slotbuf, &rawval2) != 0
+		  || rawval1 != rawval2
+		  || rawval0 == rawval1 /* it is a nop */)
+		return 0;
+	    }
+
+	  for (i = 0; i < o_operand_count; ++i)
+	    {
+	      if (xtensa_operand_get_field (isa, opcode, i, fmt, 0,
+					    slotbuf, &value)
+		  || xtensa_operand_decode (isa, opcode, i, &value))
+		return 0;
+
+	      /* PC-relative branches need adjustment, but
+		 the PC-rel operand will always have a relocation.  */
+	      newval = value;
+	      if (xtensa_operand_do_reloc (isa, o_opcode, i, &newval,
+					   self_address)
+		  || xtensa_operand_encode (isa, o_opcode, i, &newval)
+		  || xtensa_operand_set_field (isa, o_opcode, i, o_fmt, 0,
+					       o_slotbuf, newval))
+		return 0;
+	    }
+
+	  if (xtensa_format_set_slot (isa, o_fmt, 0, o_insnbuf, o_slotbuf))
+	    return 0;
+
+	  return o_insnbuf;
+	}
+    }
+  return 0;
+}
+
+
+/* Attempt to narrow an instruction.  If the narrowing is valid, perform
+   the action in-place directly into the contents and return TRUE.  Otherwise,
+   the return value is FALSE and the contents are not modified.  */
+
+static bfd_boolean
+narrow_instruction (bfd_byte *contents,
+		    bfd_size_type content_length,
+		    bfd_size_type offset)
+{
+  xtensa_opcode opcode;
+  bfd_size_type insn_len;
+  xtensa_isa isa = xtensa_default_isa;
+  xtensa_format fmt;
+  xtensa_insnbuf o_insnbuf;
+
+  static xtensa_insnbuf insnbuf = NULL;
+  static xtensa_insnbuf slotbuf = NULL;
+
+  if (insnbuf == NULL)
+    {
+      insnbuf = xtensa_insnbuf_alloc (isa);
+      slotbuf = xtensa_insnbuf_alloc (isa);
+    }
+
+  BFD_ASSERT (offset < content_length);
+
+  if (content_length < 2)
+    return FALSE;
+
+  /* We will hand-code a few of these for a little while.
+     These have all been specified in the assembler aleady.  */
+  xtensa_insnbuf_from_chars (isa, insnbuf, &contents[offset],
+			     content_length - offset);
+  fmt = xtensa_format_decode (isa, insnbuf);
+  if (xtensa_format_num_slots (isa, fmt) != 1)
+    return FALSE;
+
+  if (xtensa_format_get_slot (isa, fmt, 0, insnbuf, slotbuf) != 0)
+    return FALSE;
+
+  opcode = xtensa_opcode_decode (isa, fmt, 0, slotbuf);
+  if (opcode == XTENSA_UNDEFINED)
+    return FALSE;
+  insn_len = xtensa_format_length (isa, fmt);
+  if (insn_len > content_length)
+    return FALSE;
+
+  o_insnbuf = can_narrow_instruction (slotbuf, fmt, opcode);
+  if (o_insnbuf)
+    {
+      xtensa_insnbuf_to_chars (isa, o_insnbuf, contents + offset,
+			       content_length - offset);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+
+/* Check if an instruction can be "widened", i.e., changed from a 2-byte
+   "density" instruction to a standard 3-byte instruction.  If it is valid,
+   return the instruction buffer holding the wide instruction.  Otherwise,
+   return 0.  The set of valid widenings are specified by a string table
+   but require some special case operand checks in some cases.  */
+
+static xtensa_insnbuf
+can_widen_instruction (xtensa_insnbuf slotbuf,
+		       xtensa_format fmt,
+		       xtensa_opcode opcode)
+{
+  xtensa_isa isa = xtensa_default_isa;
+  xtensa_format o_fmt;
+  unsigned opi;
+
+  static xtensa_insnbuf o_insnbuf = NULL;
+  static xtensa_insnbuf o_slotbuf = NULL;
+
+  if (o_insnbuf == NULL)
+    {
+      o_insnbuf = xtensa_insnbuf_alloc (isa);
+      o_slotbuf = xtensa_insnbuf_alloc (isa);
+    }
+
+  for (opi = 0; opi < (sizeof (widenable)/sizeof (struct string_pair)); opi++)
+    {
+      bfd_boolean is_or = (strcmp ("or", widenable[opi].wide) == 0);
+      bfd_boolean is_branch = (strcmp ("beqz", widenable[opi].wide) == 0
+			       || strcmp ("bnez", widenable[opi].wide) == 0);
+
+      if (opcode == xtensa_opcode_lookup (isa, widenable[opi].narrow))
+	{
+	  uint32 value, newval;
+	  int i, operand_count, o_operand_count, check_operand_count;
+	  xtensa_opcode o_opcode;
+
+	  /* Address does not matter in this case.  We might need to fix it
+	     to handle branches/jumps.  */
+	  bfd_vma self_address = 0;
+
+	  o_opcode = xtensa_opcode_lookup (isa, widenable[opi].wide);
+	  if (o_opcode == XTENSA_UNDEFINED)
+	    return 0;
+	  o_fmt = get_single_format (o_opcode);
+	  if (o_fmt == XTENSA_UNDEFINED)
+	    return 0;
+
+	  if (xtensa_format_length (isa, fmt) != 2
+	      || xtensa_format_length (isa, o_fmt) != 3)
+	    return 0;
+
+	  xtensa_format_encode (isa, o_fmt, o_insnbuf);
+	  operand_count = xtensa_opcode_num_operands (isa, opcode);
+	  o_operand_count = xtensa_opcode_num_operands (isa, o_opcode);
+	  check_operand_count = o_operand_count;
+
+	  if (xtensa_opcode_encode (isa, o_fmt, 0, o_slotbuf, o_opcode) != 0)
+	    return 0;
+
+	  if (!is_or)
+	    {
+	      if (xtensa_opcode_num_operands (isa, o_opcode) != operand_count)
+		return 0;
+	    }
+	  else
+	    {
+	      uint32 rawval0, rawval1;
+
+	      if (o_operand_count != operand_count + 1
+		  || xtensa_operand_get_field (isa, opcode, 0,
+					       fmt, 0, slotbuf, &rawval0) != 0
+		  || xtensa_operand_get_field (isa, opcode, 1,
+					       fmt, 0, slotbuf, &rawval1) != 0
+		  || rawval0 == rawval1 /* it is a nop */)
+		return 0;
+	    }
+	  if (is_branch)
+	    check_operand_count--;
+
+	  for (i = 0; i < check_operand_count; i++)
+	    {
+	      int new_i = i;
+	      if (is_or && i == o_operand_count - 1)
+		new_i = i - 1;
+	      if (xtensa_operand_get_field (isa, opcode, new_i, fmt, 0,
+					    slotbuf, &value)
+		  || xtensa_operand_decode (isa, opcode, new_i, &value))
+		return 0;
+
+	      /* PC-relative branches need adjustment, but
+		 the PC-rel operand will always have a relocation.  */
+	      newval = value;
+	      if (xtensa_operand_do_reloc (isa, o_opcode, i, &newval,
+					   self_address)
+		  || xtensa_operand_encode (isa, o_opcode, i, &newval)
+		  || xtensa_operand_set_field (isa, o_opcode, i, o_fmt, 0,
+					       o_slotbuf, newval))
+		return 0;
+	    }
+
+	  if (xtensa_format_set_slot (isa, o_fmt, 0, o_insnbuf, o_slotbuf))
+	    return 0;
+
+	  return o_insnbuf;
+	}
+    }
+  return 0;
+}
+
+		       
+/* Attempt to widen an instruction.  If the widening is valid, perform
+   the action in-place directly into the contents and return TRUE.  Otherwise,
+   the return value is FALSE and the contents are not modified.  */
+
+static bfd_boolean
+widen_instruction (bfd_byte *contents,
+		   bfd_size_type content_length,
+		   bfd_size_type offset)
+{
+  xtensa_opcode opcode;
+  bfd_size_type insn_len;
+  xtensa_isa isa = xtensa_default_isa;
+  xtensa_format fmt;
+  xtensa_insnbuf o_insnbuf;
+
+  static xtensa_insnbuf insnbuf = NULL;
+  static xtensa_insnbuf slotbuf = NULL;
+
+  if (insnbuf == NULL)
+    {
+      insnbuf = xtensa_insnbuf_alloc (isa);
+      slotbuf = xtensa_insnbuf_alloc (isa);
+    }
+
+  BFD_ASSERT (offset < content_length);
+
+  if (content_length < 2)
+    return FALSE;
+
+  /* We will hand-code a few of these for a little while.
+     These have all been specified in the assembler aleady.  */
+  xtensa_insnbuf_from_chars (isa, insnbuf, &contents[offset],
+			     content_length - offset);
+  fmt = xtensa_format_decode (isa, insnbuf);
+  if (xtensa_format_num_slots (isa, fmt) != 1)
+    return FALSE;
+
+  if (xtensa_format_get_slot (isa, fmt, 0, insnbuf, slotbuf) != 0)
+    return FALSE;
+
+  opcode = xtensa_opcode_decode (isa, fmt, 0, slotbuf);
+  if (opcode == XTENSA_UNDEFINED)
+    return FALSE;
+  insn_len = xtensa_format_length (isa, fmt);
+  if (insn_len > content_length)
+    return FALSE;
+
+  o_insnbuf = can_widen_instruction (slotbuf, fmt, opcode);
+  if (o_insnbuf)
+    {
+      xtensa_insnbuf_to_chars (isa, o_insnbuf, contents + offset,
+			       content_length - offset);
+      return TRUE;
+    }
+  return FALSE;
+}
+
+
+/* Code for transforming CALLs at link-time.  */
+
+static bfd_reloc_status_type
+elf_xtensa_do_asm_simplify (bfd_byte *contents,
+			    bfd_vma address,
+			    bfd_vma content_length,
+			    char **error_message)
+{
+  static xtensa_insnbuf insnbuf = NULL;
+  static xtensa_insnbuf slotbuf = NULL;
+  xtensa_format core_format = XTENSA_UNDEFINED;
+  xtensa_opcode opcode;
+  xtensa_opcode direct_call_opcode;
+  xtensa_isa isa = xtensa_default_isa;
+  bfd_byte *chbuf = contents + address;
+  int opn;
+
+  if (insnbuf == NULL)
+    {
+      insnbuf = xtensa_insnbuf_alloc (isa);
+      slotbuf = xtensa_insnbuf_alloc (isa);
+    }
+
+  if (content_length < address)
+    {
+      *error_message = _("Attempt to convert L32R/CALLX to CALL failed");
+      return bfd_reloc_other;
+    }
+
+  opcode = get_expanded_call_opcode (chbuf, content_length - address, 0);
+  direct_call_opcode = swap_callx_for_call_opcode (opcode);
+  if (direct_call_opcode == XTENSA_UNDEFINED)
+    {
+      *error_message = _("Attempt to convert L32R/CALLX to CALL failed");
+      return bfd_reloc_other;
+    }
+  
+  /* Assemble a NOP ("or a1, a1, a1") into the 0 byte offset.  */
+  core_format = xtensa_format_lookup (isa, "x24");
+  opcode = xtensa_opcode_lookup (isa, "or");
+  xtensa_opcode_encode (isa, core_format, 0, slotbuf, opcode);
+  for (opn = 0; opn < 3; opn++) 
+    {
+      uint32 regno = 1;
+      xtensa_operand_encode (isa, opcode, opn, &regno);
+      xtensa_operand_set_field (isa, opcode, opn, core_format, 0,
+				slotbuf, regno);
+    }
+  xtensa_format_encode (isa, core_format, insnbuf);
+  xtensa_format_set_slot (isa, core_format, 0, insnbuf, slotbuf);
+  xtensa_insnbuf_to_chars (isa, insnbuf, chbuf, content_length - address);
+
+  /* Assemble a CALL ("callN 0") into the 3 byte offset.  */
+  xtensa_opcode_encode (isa, core_format, 0, slotbuf, direct_call_opcode);
+  xtensa_operand_set_field (isa, opcode, 0, core_format, 0, slotbuf, 0);
+
+  xtensa_format_encode (isa, core_format, insnbuf);
+  xtensa_format_set_slot (isa, core_format, 0, insnbuf, slotbuf);
+  xtensa_insnbuf_to_chars (isa, insnbuf, chbuf + 3,
+			   content_length - address - 3);
+
+  return bfd_reloc_ok;
+}
+
+
+static bfd_reloc_status_type
+contract_asm_expansion (bfd_byte *contents,
+			bfd_vma content_length,
+			Elf_Internal_Rela *irel,
+			char **error_message)
+{
+  bfd_reloc_status_type retval =
+    elf_xtensa_do_asm_simplify (contents, irel->r_offset, content_length,
+				error_message);
+
+  if (retval != bfd_reloc_ok)
+    return bfd_reloc_dangerous;
+
+  /* Update the irel->r_offset field so that the right immediate and
+     the right instruction are modified during the relocation.  */
+  irel->r_offset += 3;
+  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info), R_XTENSA_SLOT0_OP);
+  return bfd_reloc_ok;
+}
+
+
+static xtensa_opcode
+swap_callx_for_call_opcode (xtensa_opcode opcode)
+{
+  init_call_opcodes ();
+
+  if (opcode == callx0_op) return call0_op;
+  if (opcode == callx4_op) return call4_op;
+  if (opcode == callx8_op) return call8_op;
+  if (opcode == callx12_op) return call12_op;
+
+  /* Return XTENSA_UNDEFINED if the opcode is not an indirect call.  */
+  return XTENSA_UNDEFINED;
+}
+
+
+/* Check if "buf" is pointing to a "L32R aN; CALLX aN" or "CONST16 aN;
+   CONST16 aN; CALLX aN" sequence, and if so, return the CALLX opcode.
+   If not, return XTENSA_UNDEFINED.  */
+
+#define L32R_TARGET_REG_OPERAND 0
+#define CONST16_TARGET_REG_OPERAND 0
+#define CALLN_SOURCE_OPERAND 0
+
+static xtensa_opcode 
+get_expanded_call_opcode (bfd_byte *buf, int bufsize, bfd_boolean *p_uses_l32r)
+{
+  static xtensa_insnbuf insnbuf = NULL;
+  static xtensa_insnbuf slotbuf = NULL;
+  xtensa_format fmt;
+  xtensa_opcode opcode;
+  xtensa_isa isa = xtensa_default_isa;
+  uint32 regno, const16_regno, call_regno;
+  int offset = 0;
+
+  if (insnbuf == NULL)
+    {
+      insnbuf = xtensa_insnbuf_alloc (isa);
+      slotbuf = xtensa_insnbuf_alloc (isa);
+    }
+
+  xtensa_insnbuf_from_chars (isa, insnbuf, buf, bufsize);
+  fmt = xtensa_format_decode (isa, insnbuf);
+  if (fmt == XTENSA_UNDEFINED
+      || xtensa_format_get_slot (isa, fmt, 0, insnbuf, slotbuf))
+    return XTENSA_UNDEFINED;
+
+  opcode = xtensa_opcode_decode (isa, fmt, 0, slotbuf);
+  if (opcode == XTENSA_UNDEFINED)
+    return XTENSA_UNDEFINED;
+
+  if (opcode == get_l32r_opcode ())
+    {
+      if (p_uses_l32r)
+	*p_uses_l32r = TRUE;
+      if (xtensa_operand_get_field (isa, opcode, L32R_TARGET_REG_OPERAND,
+				    fmt, 0, slotbuf, &regno)
+	  || xtensa_operand_decode (isa, opcode, L32R_TARGET_REG_OPERAND,
+				    &regno))
+	return XTENSA_UNDEFINED;
+    }
+  else if (opcode == get_const16_opcode ())
+    {
+      if (p_uses_l32r)
+	*p_uses_l32r = FALSE;
+      if (xtensa_operand_get_field (isa, opcode, CONST16_TARGET_REG_OPERAND,
+				    fmt, 0, slotbuf, &regno)
+	  || xtensa_operand_decode (isa, opcode, CONST16_TARGET_REG_OPERAND,
+				    &regno))
+	return XTENSA_UNDEFINED;
+
+      /* Check that the next instruction is also CONST16.  */
+      offset += xtensa_format_length (isa, fmt);
+      xtensa_insnbuf_from_chars (isa, insnbuf, buf + offset, bufsize - offset);
+      fmt = xtensa_format_decode (isa, insnbuf);
+      if (fmt == XTENSA_UNDEFINED
+	  || xtensa_format_get_slot (isa, fmt, 0, insnbuf, slotbuf))
+	return XTENSA_UNDEFINED;
+      opcode = xtensa_opcode_decode (isa, fmt, 0, slotbuf);
+      if (opcode != get_const16_opcode ())
+	return XTENSA_UNDEFINED;
+
+      if (xtensa_operand_get_field (isa, opcode, CONST16_TARGET_REG_OPERAND,
+				    fmt, 0, slotbuf, &const16_regno)
+	  || xtensa_operand_decode (isa, opcode, CONST16_TARGET_REG_OPERAND,
+				    &const16_regno)
+	  || const16_regno != regno)
+	return XTENSA_UNDEFINED;
+    }
+  else
+    return XTENSA_UNDEFINED;
+
+  /* Next instruction should be an CALLXn with operand 0 == regno.  */
+  offset += xtensa_format_length (isa, fmt);
+  xtensa_insnbuf_from_chars (isa, insnbuf, buf + offset, bufsize - offset);
+  fmt = xtensa_format_decode (isa, insnbuf);
+  if (fmt == XTENSA_UNDEFINED
+      || xtensa_format_get_slot (isa, fmt, 0, insnbuf, slotbuf))
+    return XTENSA_UNDEFINED;
+  opcode = xtensa_opcode_decode (isa, fmt, 0, slotbuf);
+  if (opcode == XTENSA_UNDEFINED 
+      || !is_indirect_call_opcode (opcode))
+    return XTENSA_UNDEFINED;
+
+  if (xtensa_operand_get_field (isa, opcode, CALLN_SOURCE_OPERAND,
+				fmt, 0, slotbuf, &call_regno)
+      || xtensa_operand_decode (isa, opcode, CALLN_SOURCE_OPERAND,
+				&call_regno))
+    return XTENSA_UNDEFINED;
+
+  if (call_regno != regno)
+    return XTENSA_UNDEFINED;
+
+  return opcode;
+}
+
+
+/* Data structures used during relaxation.  */
+
+/* r_reloc: relocation values.  */
+
+/* Through the relaxation process, we need to keep track of the values
+   that will result from evaluating relocations.  The standard ELF
+   relocation structure is not sufficient for this purpose because we're
+   operating on multiple input files at once, so we need to know which
+   input file a relocation refers to.  The r_reloc structure thus
+   records both the input file (bfd) and ELF relocation.
+
+   For efficiency, an r_reloc also contains a "target_offset" field to
+   cache the target-section-relative offset value that is represented by
+   the relocation.
+   
+   The r_reloc also contains a virtual offset that allows multiple
+   inserted literals to be placed at the same "address" with
+   different offsets.  */
+
+typedef struct r_reloc_struct r_reloc;
+
+struct r_reloc_struct
+{
+  bfd *abfd;
+  Elf_Internal_Rela rela;
+  bfd_vma target_offset;
+  bfd_vma virtual_offset;
+};
+
+
+/* The r_reloc structure is included by value in literal_value, but not
+   every literal_value has an associated relocation -- some are simple
+   constants.  In such cases, we set all the fields in the r_reloc
+   struct to zero.  The r_reloc_is_const function should be used to
+   detect this case.  */
+
+static bfd_boolean
+r_reloc_is_const (const r_reloc *r_rel)
+{
+  return (r_rel->abfd == NULL);
+}
+
+
+static bfd_vma
+r_reloc_get_target_offset (const r_reloc *r_rel)
+{
+  bfd_vma target_offset;
+  unsigned long r_symndx;
+
+  BFD_ASSERT (!r_reloc_is_const (r_rel));
+  r_symndx = ELF32_R_SYM (r_rel->rela.r_info);
+  target_offset = get_elf_r_symndx_offset (r_rel->abfd, r_symndx);
+  return (target_offset + r_rel->rela.r_addend);
+}
+
+
+static struct elf_link_hash_entry *
+r_reloc_get_hash_entry (const r_reloc *r_rel)
+{
+  unsigned long r_symndx = ELF32_R_SYM (r_rel->rela.r_info);
+  return get_elf_r_symndx_hash_entry (r_rel->abfd, r_symndx);
+}
+
+
+static asection *
+r_reloc_get_section (const r_reloc *r_rel)
+{
+  unsigned long r_symndx = ELF32_R_SYM (r_rel->rela.r_info);
+  return get_elf_r_symndx_section (r_rel->abfd, r_symndx);
+}
+
+
+static bfd_boolean
+r_reloc_is_defined (const r_reloc *r_rel)
+{
+  asection *sec;
+  if (r_rel == NULL)
+    return FALSE;
+
+  sec = r_reloc_get_section (r_rel);
+  if (sec == bfd_abs_section_ptr
+      || sec == bfd_com_section_ptr
+      || sec == bfd_und_section_ptr)
+    return FALSE;
+  return TRUE;
+}
+
+
+static void
+r_reloc_init (r_reloc *r_rel,
+	      bfd *abfd,
+	      Elf_Internal_Rela *irel,
+	      bfd_byte *contents,
+	      bfd_size_type content_length)
+{
+  int r_type;
+  reloc_howto_type *howto;
+
+  if (irel)
+    {
+      r_rel->rela = *irel;
+      r_rel->abfd = abfd;
+      r_rel->target_offset = r_reloc_get_target_offset (r_rel);
+      r_rel->virtual_offset = 0;
+      r_type = ELF32_R_TYPE (r_rel->rela.r_info);
+      howto = &elf_howto_table[r_type];
+      if (howto->partial_inplace)
+	{
+	  bfd_vma inplace_val;
+	  BFD_ASSERT (r_rel->rela.r_offset < content_length);
+
+	  inplace_val = bfd_get_32 (abfd, &contents[r_rel->rela.r_offset]);
+	  r_rel->target_offset += inplace_val;
+	}
+    }
+  else
+    memset (r_rel, 0, sizeof (r_reloc));
+}
+
+
+#if DEBUG
+
+static void
+print_r_reloc (FILE *fp, const r_reloc *r_rel)
+{
+  if (r_reloc_is_defined (r_rel))
+    {
+      asection *sec = r_reloc_get_section (r_rel);
+      fprintf (fp, " %s(%s + ", sec->owner->filename, sec->name);
+    }
+  else if (r_reloc_get_hash_entry (r_rel))
+    fprintf (fp, " %s + ", r_reloc_get_hash_entry (r_rel)->root.root.string);
+  else
+    fprintf (fp, " ?? + ");
+
+  fprintf_vma (fp, r_rel->target_offset);
+  if (r_rel->virtual_offset)
+    {
+      fprintf (fp, " + ");
+      fprintf_vma (fp, r_rel->virtual_offset);
+    }
+    
+  fprintf (fp, ")");
+}
+
+#endif /* DEBUG */
+
+
+/* source_reloc: relocations that reference literals.  */
+
+/* To determine whether literals can be coalesced, we need to first
+   record all the relocations that reference the literals.  The
+   source_reloc structure below is used for this purpose.  The
+   source_reloc entries are kept in a per-literal-section array, sorted
+   by offset within the literal section (i.e., target offset).
+
+   The source_sec and r_rel.rela.r_offset fields identify the source of
+   the relocation.  The r_rel field records the relocation value, i.e.,
+   the offset of the literal being referenced.  The opnd field is needed
+   to determine the range of the immediate field to which the relocation
+   applies, so we can determine whether another literal with the same
+   value is within range.  The is_null field is true when the relocation
+   is being removed (e.g., when an L32R is being removed due to a CALLX
+   that is converted to a direct CALL).  */
+
+typedef struct source_reloc_struct source_reloc;
+
+struct source_reloc_struct
+{
+  asection *source_sec;
+  r_reloc r_rel;
+  xtensa_opcode opcode;
+  int opnd;
+  bfd_boolean is_null;
+  bfd_boolean is_abs_literal;
+};
+
+
+static void
+init_source_reloc (source_reloc *reloc,
+		   asection *source_sec,
+		   const r_reloc *r_rel,
+		   xtensa_opcode opcode,
+		   int opnd,
+		   bfd_boolean is_abs_literal)
+{
+  reloc->source_sec = source_sec;
+  reloc->r_rel = *r_rel;
+  reloc->opcode = opcode;
+  reloc->opnd = opnd;
+  reloc->is_null = FALSE;
+  reloc->is_abs_literal = is_abs_literal;
+}
+
+
+/* Find the source_reloc for a particular source offset and relocation
+   type.  Note that the array is sorted by _target_ offset, so this is
+   just a linear search.  */
+
+static source_reloc *
+find_source_reloc (source_reloc *src_relocs,
+		   int src_count,
+		   asection *sec,
+		   Elf_Internal_Rela *irel)
+{
+  int i;
+
+  for (i = 0; i < src_count; i++)
+    {
+      if (src_relocs[i].source_sec == sec
+	  && src_relocs[i].r_rel.rela.r_offset == irel->r_offset
+	  && (ELF32_R_TYPE (src_relocs[i].r_rel.rela.r_info)
+	      == ELF32_R_TYPE (irel->r_info)))
+	return &src_relocs[i];
+    }
+
+  return NULL;
+}
+
+
+static int
+source_reloc_compare (const void *ap, const void *bp)
+{
+  const source_reloc *a = (const source_reloc *) ap;
+  const source_reloc *b = (const source_reloc *) bp;
+
+  if (a->r_rel.target_offset != b->r_rel.target_offset)
+    return (a->r_rel.target_offset - b->r_rel.target_offset);
+
+  /* We don't need to sort on these criteria for correctness,
+     but enforcing a more strict ordering prevents unstable qsort
+     from behaving differently with different implementations.
+     Without the code below we get correct but different results
+     on Solaris 2.7 and 2.8.  We would like to always produce the
+     same results no matter the host. */
+
+  if ((!a->is_null) - (!b->is_null))
+    return ((!a->is_null) - (!b->is_null));
+  return internal_reloc_compare (&a->r_rel.rela, &b->r_rel.rela);
+}
+
+
+/* Literal values and value hash tables.  */
+
+/* Literals with the same value can be coalesced.  The literal_value
+   structure records the value of a literal: the "r_rel" field holds the
+   information from the relocation on the literal (if there is one) and
+   the "value" field holds the contents of the literal word itself.
+
+   The value_map structure records a literal value along with the
+   location of a literal holding that value.  The value_map hash table
+   is indexed by the literal value, so that we can quickly check if a
+   particular literal value has been seen before and is thus a candidate
+   for coalescing.  */
+
+typedef struct literal_value_struct literal_value;
+typedef struct value_map_struct value_map;
+typedef struct value_map_hash_table_struct value_map_hash_table;
+
+struct literal_value_struct
+{
+  r_reloc r_rel; 
+  unsigned long value;
+  bfd_boolean is_abs_literal;
+};
+
+struct value_map_struct
+{
+  literal_value val;			/* The literal value.  */
+  r_reloc loc;				/* Location of the literal.  */
+  value_map *next;
+};
+
+struct value_map_hash_table_struct
+{
+  unsigned bucket_count;
+  value_map **buckets;
+  unsigned count;
+  bfd_boolean has_last_loc;
+  r_reloc last_loc;
+};
+
+
+static void
+init_literal_value (literal_value *lit,
+		    const r_reloc *r_rel,
+		    unsigned long value,
+		    bfd_boolean is_abs_literal)
+{
+  lit->r_rel = *r_rel;
+  lit->value = value;
+  lit->is_abs_literal = is_abs_literal;
+}
+
+
+static bfd_boolean
+literal_value_equal (const literal_value *src1,
+		     const literal_value *src2,
+		     bfd_boolean final_static_link)
+{
+  struct elf_link_hash_entry *h1, *h2;
+
+  if (r_reloc_is_const (&src1->r_rel) != r_reloc_is_const (&src2->r_rel)) 
+    return FALSE;
+
+  if (r_reloc_is_const (&src1->r_rel))
+    return (src1->value == src2->value);
+
+  if (ELF32_R_TYPE (src1->r_rel.rela.r_info)
+      != ELF32_R_TYPE (src2->r_rel.rela.r_info))
+    return FALSE;
+
+  if (src1->r_rel.target_offset != src2->r_rel.target_offset)
+    return FALSE;
+   
+  if (src1->r_rel.virtual_offset != src2->r_rel.virtual_offset)
+    return FALSE;
+
+  if (src1->value != src2->value)
+    return FALSE;
+  
+  /* Now check for the same section (if defined) or the same elf_hash
+     (if undefined or weak).  */
+  h1 = r_reloc_get_hash_entry (&src1->r_rel);
+  h2 = r_reloc_get_hash_entry (&src2->r_rel);
+  if (r_reloc_is_defined (&src1->r_rel)
+      && (final_static_link
+	  || ((!h1 || h1->root.type != bfd_link_hash_defweak)
+	      && (!h2 || h2->root.type != bfd_link_hash_defweak))))
+    {
+      if (r_reloc_get_section (&src1->r_rel)
+	  != r_reloc_get_section (&src2->r_rel))
+	return FALSE;
+    }
+  else
+    {
+      /* Require that the hash entries (i.e., symbols) be identical.  */
+      if (h1 != h2 || h1 == 0)
+	return FALSE;
+    }
+
+  if (src1->is_abs_literal != src2->is_abs_literal)
+    return FALSE;
+
+  return TRUE;
+}
+
+
+/* Must be power of 2.  */
+#define INITIAL_HASH_RELOC_BUCKET_COUNT 1024
+
+static value_map_hash_table *
+value_map_hash_table_init (void)
+{
+  value_map_hash_table *values;
+
+  values = (value_map_hash_table *)
+    bfd_zmalloc (sizeof (value_map_hash_table));
+  values->bucket_count = INITIAL_HASH_RELOC_BUCKET_COUNT;
+  values->count = 0;
+  values->buckets = (value_map **)
+    bfd_zmalloc (sizeof (value_map *) * values->bucket_count);
+  if (values->buckets == NULL) 
+    {
+      free (values);
+      return NULL;
+    }
+  values->has_last_loc = FALSE;
+
+  return values;
+}
+
+
+static void
+value_map_hash_table_delete (value_map_hash_table *table)
+{
+  free (table->buckets);
+  free (table);
+}
+
+
+static unsigned
+hash_bfd_vma (bfd_vma val)
+{
+  return (val >> 2) + (val >> 10);
+}
+
+
+static unsigned
+literal_value_hash (const literal_value *src)
+{
+  unsigned hash_val;
+
+  hash_val = hash_bfd_vma (src->value);
+  if (!r_reloc_is_const (&src->r_rel))
+    {
+      void *sec_or_hash;
+
+      hash_val += hash_bfd_vma (src->is_abs_literal * 1000);
+      hash_val += hash_bfd_vma (src->r_rel.target_offset);
+      hash_val += hash_bfd_vma (src->r_rel.virtual_offset);
+  
+      /* Now check for the same section and the same elf_hash.  */
+      if (r_reloc_is_defined (&src->r_rel))
+	sec_or_hash = r_reloc_get_section (&src->r_rel);
+      else
+	sec_or_hash = r_reloc_get_hash_entry (&src->r_rel);
+      hash_val += hash_bfd_vma ((bfd_vma) (size_t) sec_or_hash);
+    }
+  return hash_val;
+}
+
+
+/* Check if the specified literal_value has been seen before.  */
+
+static value_map *
+value_map_get_cached_value (value_map_hash_table *map,
+			    const literal_value *val,
+			    bfd_boolean final_static_link)
+{
+  value_map *map_e;
+  value_map *bucket;
+  unsigned idx;
+
+  idx = literal_value_hash (val);
+  idx = idx & (map->bucket_count - 1);
+  bucket = map->buckets[idx];
+  for (map_e = bucket; map_e; map_e = map_e->next)
+    {
+      if (literal_value_equal (&map_e->val, val, final_static_link))
+	return map_e;
+    }
+  return NULL;
+}
+
+
+/* Record a new literal value.  It is illegal to call this if VALUE
+   already has an entry here.  */
+
+static value_map *
+add_value_map (value_map_hash_table *map,
+	       const literal_value *val,
+	       const r_reloc *loc,
+	       bfd_boolean final_static_link)
+{
+  value_map **bucket_p;
+  unsigned idx;
+
+  value_map *val_e = (value_map *) bfd_zmalloc (sizeof (value_map));
+  if (val_e == NULL)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+
+  BFD_ASSERT (!value_map_get_cached_value (map, val, final_static_link));
+  val_e->val = *val;
+  val_e->loc = *loc;
+
+  idx = literal_value_hash (val);
+  idx = idx & (map->bucket_count - 1);
+  bucket_p = &map->buckets[idx];
+
+  val_e->next = *bucket_p;
+  *bucket_p = val_e;
+  map->count++;
+  /* FIXME: Consider resizing the hash table if we get too many entries.  */
+  
+  return val_e;
+}
+
+
+/* Lists of text actions (ta_) for narrowing, widening, longcall
+   conversion, space fill, code & literal removal, etc.  */
+
+/* The following text actions are generated:
+
+   "ta_remove_insn"         remove an instruction or instructions
+   "ta_remove_longcall"     convert longcall to call
+   "ta_convert_longcall"    convert longcall to nop/call
+   "ta_narrow_insn"         narrow a wide instruction
+   "ta_widen"               widen a narrow instruction
+   "ta_fill"                add fill or remove fill
+      removed < 0 is a fill; branches to the fill address will be
+	changed to address + fill size (e.g., address - removed)
+      removed >= 0 branches to the fill address will stay unchanged
+   "ta_remove_literal"      remove a literal; this action is
+			    indicated when a literal is removed
+                            or replaced.
+   "ta_add_literal"         insert a new literal; this action is
+                            indicated when a literal has been moved.
+                            It may use a virtual_offset because
+			    multiple literals can be placed at the
+                            same location.
+
+   For each of these text actions, we also record the number of bytes
+   removed by performing the text action.  In the case of a "ta_widen"
+   or a "ta_fill" that adds space, the removed_bytes will be negative.  */
+
+typedef struct text_action_struct text_action;
+typedef struct text_action_list_struct text_action_list;
+typedef enum text_action_enum_t text_action_t;
+
+enum text_action_enum_t
+{
+  ta_none,
+  ta_remove_insn,        /* removed = -size */
+  ta_remove_longcall,    /* removed = -size */
+  ta_convert_longcall,   /* removed = 0 */
+  ta_narrow_insn,        /* removed = -1 */
+  ta_widen_insn,         /* removed = +1 */
+  ta_fill,               /* removed = +size */
+  ta_remove_literal,
+  ta_add_literal
+};
+
+
+/* Structure for a text action record.  */
+struct text_action_struct
+{
+  text_action_t action;
+  asection *sec;	/* Optional */
+  bfd_vma offset;
+  bfd_vma virtual_offset;  /* Zero except for adding literals.  */
+  int removed_bytes;
+  literal_value value;	/* Only valid when adding literals.  */
+
+  text_action *next;
+};
+
+
+/* List of all of the actions taken on a text section.  */
+struct text_action_list_struct
+{
+  text_action *head;
+};
+
+
+static text_action *
+find_fill_action (text_action_list *l, asection *sec, bfd_vma offset)
+{
+  text_action **m_p;
+
+  /* It is not necessary to fill at the end of a section.  */
+  if (sec->size == offset)
+    return NULL;
+
+  for (m_p = &l->head; *m_p && (*m_p)->offset <= offset; m_p = &(*m_p)->next)
+    {
+      text_action *t = *m_p;
+      /* When the action is another fill at the same address,
+	 just increase the size.  */
+      if (t->offset == offset && t->action == ta_fill)
+	return t;
+    }
+  return NULL;
+}
+
+
+static int
+compute_removed_action_diff (const text_action *ta,
+			     asection *sec,
+			     bfd_vma offset,
+			     int removed,
+			     int removable_space)
+{
+  int new_removed;
+  int current_removed = 0;
+
+  if (ta)
+    current_removed = ta->removed_bytes;
+
+  BFD_ASSERT (ta == NULL || ta->offset == offset);
+  BFD_ASSERT (ta == NULL || ta->action == ta_fill);
+
+  /* It is not necessary to fill at the end of a section.  Clean this up.  */
+  if (sec->size == offset)
+    new_removed = removable_space - 0;
+  else
+    {
+      int space;
+      int added = -removed - current_removed;
+      /* Ignore multiples of the section alignment.  */
+      added = ((1 << sec->alignment_power) - 1) & added;
+      new_removed = (-added);
+
+      /* Modify for removable.  */
+      space = removable_space - new_removed;
+      new_removed = (removable_space
+		     - (((1 << sec->alignment_power) - 1) & space));
+    }
+  return (new_removed - current_removed);
+}
+
+
+static void
+adjust_fill_action (text_action *ta, int fill_diff)
+{
+  ta->removed_bytes += fill_diff;
+}
+
+
+/* Add a modification action to the text.  For the case of adding or
+   removing space, modify any current fill and assume that
+   "unreachable_space" bytes can be freely contracted.  Note that a
+   negative removed value is a fill.  */
+
+static void 
+text_action_add (text_action_list *l,
+		 text_action_t action,
+		 asection *sec,
+		 bfd_vma offset,
+		 int removed)
+{
+  text_action **m_p;
+  text_action *ta;
+
+  /* It is not necessary to fill at the end of a section.  */
+  if (action == ta_fill && sec->size == offset)
+    return;
+
+  /* It is not necessary to fill 0 bytes.  */
+  if (action == ta_fill && removed == 0)
+    return;
+
+  for (m_p = &l->head; *m_p && (*m_p)->offset <= offset; m_p = &(*m_p)->next)
+    {
+      text_action *t = *m_p;
+      
+      if (action == ta_fill) 
+	{
+	  /* When the action is another fill at the same address,
+	     just increase the size.  */
+	  if (t->offset == offset && t->action == ta_fill)
+	    {
+	      t->removed_bytes += removed;
+	      return;
+	    }
+	  /* Fills need to happen before widens so that we don't
+	     insert fill bytes into the instruction stream.  */
+	  if (t->offset == offset && t->action == ta_widen_insn)
+	    break;
+	}
+    }
+
+  /* Create a new record and fill it up.  */
+  ta = (text_action *) bfd_zmalloc (sizeof (text_action));
+  ta->action = action;
+  ta->sec = sec;
+  ta->offset = offset;
+  ta->removed_bytes = removed;
+  ta->next = (*m_p);
+  *m_p = ta;
+}
+
+
+static void
+text_action_add_literal (text_action_list *l,
+			 text_action_t action,
+			 const r_reloc *loc,
+			 const literal_value *value,
+			 int removed)
+{
+  text_action **m_p;
+  text_action *ta;
+  asection *sec = r_reloc_get_section (loc);
+  bfd_vma offset = loc->target_offset;
+  bfd_vma virtual_offset = loc->virtual_offset;
+
+  BFD_ASSERT (action == ta_add_literal);
+
+  for (m_p = &l->head; *m_p != NULL; m_p = &(*m_p)->next)
+    {
+      if ((*m_p)->offset > offset
+	  && ((*m_p)->offset != offset
+	      || (*m_p)->virtual_offset > virtual_offset))
+	break;
+    }
+
+  /* Create a new record and fill it up.  */
+  ta = (text_action *) bfd_zmalloc (sizeof (text_action));
+  ta->action = action;
+  ta->sec = sec;
+  ta->offset = offset;
+  ta->virtual_offset = virtual_offset;
+  ta->value = *value;
+  ta->removed_bytes = removed;
+  ta->next = (*m_p);
+  *m_p = ta;
+}
+
+
+/* Find the total offset adjustment for the relaxations specified by
+   text_actions, beginning from a particular starting action.  This is
+   typically used from offset_with_removed_text to search an entire list of
+   actions, but it may also be called directly when adjusting adjacent offsets
+   so that each search may begin where the previous one left off.  */
+
+static int
+removed_by_actions (text_action **p_start_action,
+		    bfd_vma offset,
+		    bfd_boolean before_fill)
+{
+  text_action *r;
+  int removed = 0;
+
+  r = *p_start_action;
+  while (r)
+    {
+      if (r->offset > offset)
+	break;
+
+      if (r->offset == offset
+	  && (before_fill || r->action != ta_fill || r->removed_bytes >= 0))
+	break;
+
+      removed += r->removed_bytes;
+
+      r = r->next;
+    }
+
+  *p_start_action = r;
+  return removed;
+}
+
+
+static bfd_vma 
+offset_with_removed_text (text_action_list *action_list, bfd_vma offset)
+{
+  text_action *r = action_list->head;
+  return offset - removed_by_actions (&r, offset, FALSE);
+}
+
+
+static unsigned
+action_list_count (text_action_list *action_list)
+{
+  text_action *r = action_list->head;
+  unsigned count = 0;
+  for (r = action_list->head; r != NULL; r = r->next)
+    {
+      count++;
+    }
+  return count;
+}
+
+
+/* The find_insn_action routine will only find non-fill actions.  */
+
+static text_action *
+find_insn_action (text_action_list *action_list, bfd_vma offset)
+{
+  text_action *t;
+  for (t = action_list->head; t; t = t->next)
+    {
+      if (t->offset == offset)
+	{
+	  switch (t->action)
+	    {
+	    case ta_none:
+	    case ta_fill:
+	      break;
+	    case ta_remove_insn:
+	    case ta_remove_longcall:
+	    case ta_convert_longcall:
+	    case ta_narrow_insn:
+	    case ta_widen_insn:
+	      return t;
+	    case ta_remove_literal:
+	    case ta_add_literal:
+	      BFD_ASSERT (0);
+	      break;
+	    }
+	}
+    }
+  return NULL;
+}
+
+
+#if DEBUG
+
+static void
+print_action_list (FILE *fp, text_action_list *action_list)
+{
+  text_action *r;
+
+  fprintf (fp, "Text Action\n");
+  for (r = action_list->head; r != NULL; r = r->next)
+    {
+      const char *t = "unknown";
+      switch (r->action)
+	{
+	case ta_remove_insn:
+	  t = "remove_insn"; break;
+	case ta_remove_longcall:
+	  t = "remove_longcall"; break;
+	case ta_convert_longcall:
+	  t = "convert_longcall"; break;
+	case ta_narrow_insn:
+	  t = "narrow_insn"; break;
+	case ta_widen_insn:
+	  t = "widen_insn"; break;
+	case ta_fill:
+	  t = "fill"; break;
+	case ta_none:
+	  t = "none"; break;
+	case ta_remove_literal:
+	  t = "remove_literal"; break;
+	case ta_add_literal:
+	  t = "add_literal"; break;
+	}
+
+      fprintf (fp, "%s: %s[0x%lx] \"%s\" %d\n",
+	       r->sec->owner->filename,
+	       r->sec->name, (unsigned long) r->offset, t, r->removed_bytes);
+    }
+}
+
+#endif /* DEBUG */
+
+
+/* Lists of literals being coalesced or removed.  */
+
+/* In the usual case, the literal identified by "from" is being
+   coalesced with another literal identified by "to".  If the literal is
+   unused and is being removed altogether, "to.abfd" will be NULL.
+   The removed_literal entries are kept on a per-section list, sorted
+   by the "from" offset field.  */
+
+typedef struct removed_literal_struct removed_literal;
+typedef struct removed_literal_list_struct removed_literal_list;
+
+struct removed_literal_struct
+{
+  r_reloc from;
+  r_reloc to;
+  removed_literal *next;
+};
+
+struct removed_literal_list_struct
+{
+  removed_literal *head;
+  removed_literal *tail;
+};
+
+
+/* Record that the literal at "from" is being removed.  If "to" is not
+   NULL, the "from" literal is being coalesced with the "to" literal.  */
+
+static void
+add_removed_literal (removed_literal_list *removed_list,
+		     const r_reloc *from,
+		     const r_reloc *to)
+{
+  removed_literal *r, *new_r, *next_r;
+
+  new_r = (removed_literal *) bfd_zmalloc (sizeof (removed_literal));
+
+  new_r->from = *from;
+  if (to)
+    new_r->to = *to;
+  else
+    new_r->to.abfd = NULL;
+  new_r->next = NULL;
+  
+  r = removed_list->head;
+  if (r == NULL) 
+    {
+      removed_list->head = new_r;
+      removed_list->tail = new_r;
+    }
+  /* Special check for common case of append.  */
+  else if (removed_list->tail->from.target_offset < from->target_offset)
+    {
+      removed_list->tail->next = new_r;
+      removed_list->tail = new_r;
+    }
+  else
+    {
+      while (r->from.target_offset < from->target_offset && r->next) 
+	{
+	  r = r->next;
+	}
+      next_r = r->next;
+      r->next = new_r;
+      new_r->next = next_r;
+      if (next_r == NULL)
+	removed_list->tail = new_r;
+    }
+}
+
+
+/* Check if the list of removed literals contains an entry for the
+   given address.  Return the entry if found.  */
+
+static removed_literal *
+find_removed_literal (removed_literal_list *removed_list, bfd_vma addr)
+{
+  removed_literal *r = removed_list->head;
+  while (r && r->from.target_offset < addr)
+    r = r->next;
+  if (r && r->from.target_offset == addr)
+    return r;
+  return NULL;
+}
+
+
+#if DEBUG
+
+static void
+print_removed_literals (FILE *fp, removed_literal_list *removed_list)
+{
+  removed_literal *r;
+  r = removed_list->head;
+  if (r)
+    fprintf (fp, "Removed Literals\n");
+  for (; r != NULL; r = r->next)
+    {
+      print_r_reloc (fp, &r->from);
+      fprintf (fp, " => ");
+      if (r->to.abfd == NULL)
+	fprintf (fp, "REMOVED");
+      else
+	print_r_reloc (fp, &r->to);
+      fprintf (fp, "\n");
+    }
+}
+
+#endif /* DEBUG */
+
+
+/* Per-section data for relaxation.  */
+
+typedef struct reloc_bfd_fix_struct reloc_bfd_fix;
+
+struct xtensa_relax_info_struct
+{
+  bfd_boolean is_relaxable_literal_section;
+  bfd_boolean is_relaxable_asm_section;
+  int visited;				/* Number of times visited.  */
+
+  source_reloc *src_relocs;		/* Array[src_count].  */
+  int src_count;
+  int src_next;				/* Next src_relocs entry to assign.  */
+
+  removed_literal_list removed_list;
+  text_action_list action_list;
+
+  reloc_bfd_fix *fix_list;
+  reloc_bfd_fix *fix_array;
+  unsigned fix_array_count;
+
+  /* Support for expanding the reloc array that is stored
+     in the section structure.  If the relocations have been
+     reallocated, the newly allocated relocations will be referenced
+     here along with the actual size allocated.  The relocation
+     count will always be found in the section structure.  */
+  Elf_Internal_Rela *allocated_relocs; 
+  unsigned relocs_count;
+  unsigned allocated_relocs_count;
+};
+
+struct elf_xtensa_section_data
+{
+  struct bfd_elf_section_data elf;
+  xtensa_relax_info relax_info;
+};
+
+
+static bfd_boolean
+elf_xtensa_new_section_hook (bfd *abfd, asection *sec)
+{
+  if (!sec->used_by_bfd)
+    {
+      struct elf_xtensa_section_data *sdata;
+      bfd_size_type amt = sizeof (*sdata);
+
+      sdata = bfd_zalloc (abfd, amt);
+      if (sdata == NULL)
+	return FALSE;
+      sec->used_by_bfd = sdata;
+    }
+
+  return _bfd_elf_new_section_hook (abfd, sec);
+}
+
+
+static xtensa_relax_info *
+get_xtensa_relax_info (asection *sec)
+{
+  struct elf_xtensa_section_data *section_data;
+
+  /* No info available if no section or if it is an output section.  */
+  if (!sec || sec == sec->output_section)
+    return NULL;
+
+  section_data = (struct elf_xtensa_section_data *) elf_section_data (sec);
+  return &section_data->relax_info;
+}
+
+
+static void
+init_xtensa_relax_info (asection *sec)
+{
+  xtensa_relax_info *relax_info = get_xtensa_relax_info (sec);
+
+  relax_info->is_relaxable_literal_section = FALSE;
+  relax_info->is_relaxable_asm_section = FALSE;
+  relax_info->visited = 0;
+
+  relax_info->src_relocs = NULL;
+  relax_info->src_count = 0;
+  relax_info->src_next = 0;
+
+  relax_info->removed_list.head = NULL;
+  relax_info->removed_list.tail = NULL;
+
+  relax_info->action_list.head = NULL;
+
+  relax_info->fix_list = NULL;
+  relax_info->fix_array = NULL;
+  relax_info->fix_array_count = 0;
+
+  relax_info->allocated_relocs = NULL; 
+  relax_info->relocs_count = 0;
+  relax_info->allocated_relocs_count = 0;
+}
+
+
+/* Coalescing literals may require a relocation to refer to a section in
+   a different input file, but the standard relocation information
+   cannot express that.  Instead, the reloc_bfd_fix structures are used
+   to "fix" the relocations that refer to sections in other input files.
+   These structures are kept on per-section lists.  The "src_type" field
+   records the relocation type in case there are multiple relocations on
+   the same location.  FIXME: This is ugly; an alternative might be to
+   add new symbols with the "owner" field to some other input file.  */
+
+struct reloc_bfd_fix_struct
+{
+  asection *src_sec;
+  bfd_vma src_offset;
+  unsigned src_type;			/* Relocation type.  */
+  
+  asection *target_sec;
+  bfd_vma target_offset;
+  bfd_boolean translated;
+  
+  reloc_bfd_fix *next;
+};
+
+
+static reloc_bfd_fix *
+reloc_bfd_fix_init (asection *src_sec,
+		    bfd_vma src_offset,
+		    unsigned src_type,
+		    asection *target_sec,
+		    bfd_vma target_offset,
+		    bfd_boolean translated)
+{
+  reloc_bfd_fix *fix;
+
+  fix = (reloc_bfd_fix *) bfd_malloc (sizeof (reloc_bfd_fix));
+  fix->src_sec = src_sec;
+  fix->src_offset = src_offset;
+  fix->src_type = src_type;
+  fix->target_sec = target_sec;
+  fix->target_offset = target_offset;
+  fix->translated = translated;
+
+  return fix;
+}
+
+
+static void
+add_fix (asection *src_sec, reloc_bfd_fix *fix)
+{
+  xtensa_relax_info *relax_info;
+
+  relax_info = get_xtensa_relax_info (src_sec);
+  fix->next = relax_info->fix_list;
+  relax_info->fix_list = fix;
+}
+
+
+static int
+fix_compare (const void *ap, const void *bp)
+{
+  const reloc_bfd_fix *a = (const reloc_bfd_fix *) ap;
+  const reloc_bfd_fix *b = (const reloc_bfd_fix *) bp;
+
+  if (a->src_offset != b->src_offset)
+    return (a->src_offset - b->src_offset);
+  return (a->src_type - b->src_type);
+}
+
+
+static void
+cache_fix_array (asection *sec)
+{
+  unsigned i, count = 0;
+  reloc_bfd_fix *r;
+  xtensa_relax_info *relax_info = get_xtensa_relax_info (sec);
+
+  if (relax_info == NULL)
+    return;
+  if (relax_info->fix_list == NULL)
+    return;
+
+  for (r = relax_info->fix_list; r != NULL; r = r->next)
+    count++;
+
+  relax_info->fix_array =
+    (reloc_bfd_fix *) bfd_malloc (sizeof (reloc_bfd_fix) * count);
+  relax_info->fix_array_count = count;
+
+  r = relax_info->fix_list;
+  for (i = 0; i < count; i++, r = r->next)
+    {
+      relax_info->fix_array[count - 1 - i] = *r;
+      relax_info->fix_array[count - 1 - i].next = NULL;
+    }
+
+  qsort (relax_info->fix_array, relax_info->fix_array_count,
+	 sizeof (reloc_bfd_fix), fix_compare);
+}
+
+
+static reloc_bfd_fix *
+get_bfd_fix (asection *sec, bfd_vma offset, unsigned type)
+{
+  xtensa_relax_info *relax_info = get_xtensa_relax_info (sec);
+  reloc_bfd_fix *rv;
+  reloc_bfd_fix key;
+
+  if (relax_info == NULL)
+    return NULL;
+  if (relax_info->fix_list == NULL)
+    return NULL;
+
+  if (relax_info->fix_array == NULL)
+    cache_fix_array (sec);
+
+  key.src_offset = offset;
+  key.src_type = type;
+  rv = bsearch (&key, relax_info->fix_array,  relax_info->fix_array_count,
+		sizeof (reloc_bfd_fix), fix_compare);
+  return rv;
+}
+
+
+/* Section caching.  */
+
+typedef struct section_cache_struct section_cache_t;
+
+struct section_cache_struct
+{
+  asection *sec;
+
+  bfd_byte *contents;		/* Cache of the section contents.  */
+  bfd_size_type content_length;
+
+  property_table_entry *ptbl;	/* Cache of the section property table.  */
+  unsigned pte_count;
+
+  Elf_Internal_Rela *relocs;	/* Cache of the section relocations.  */
+  unsigned reloc_count;
+};
+
+
+static void
+init_section_cache (section_cache_t *sec_cache)
+{
+  memset (sec_cache, 0, sizeof (*sec_cache));
+}
+
+
+static void
+clear_section_cache (section_cache_t *sec_cache)
+{
+  if (sec_cache->sec)
+    {
+      release_contents (sec_cache->sec, sec_cache->contents);
+      release_internal_relocs (sec_cache->sec, sec_cache->relocs);
+      if (sec_cache->ptbl)
+	free (sec_cache->ptbl);
+      memset (sec_cache, 0, sizeof (sec_cache));
+    }
+}
+
+
+static bfd_boolean
+section_cache_section (section_cache_t *sec_cache,
+		       asection *sec,
+		       struct bfd_link_info *link_info)
+{
+  bfd *abfd;
+  property_table_entry *prop_table = NULL;
+  int ptblsize = 0;
+  bfd_byte *contents = NULL;
+  Elf_Internal_Rela *internal_relocs = NULL;
+  bfd_size_type sec_size;
+
+  if (sec == NULL)
+    return FALSE;
+  if (sec == sec_cache->sec)
+    return TRUE;
+
+  abfd = sec->owner;
+  sec_size = bfd_get_section_limit (abfd, sec);
+
+  /* Get the contents.  */
+  contents = retrieve_contents (abfd, sec, link_info->keep_memory);
+  if (contents == NULL && sec_size != 0)
+    goto err;
+
+  /* Get the relocations.  */
+  internal_relocs = retrieve_internal_relocs (abfd, sec,
+					      link_info->keep_memory);
+
+  /* Get the entry table.  */
+  ptblsize = xtensa_read_table_entries (abfd, sec, &prop_table,
+					XTENSA_PROP_SEC_NAME, FALSE);
+  if (ptblsize < 0)
+    goto err;
+
+  /* Fill in the new section cache.  */
+  clear_section_cache (sec_cache);
+  memset (sec_cache, 0, sizeof (sec_cache));
+
+  sec_cache->sec = sec;
+  sec_cache->contents = contents;
+  sec_cache->content_length = sec_size;
+  sec_cache->relocs = internal_relocs;
+  sec_cache->reloc_count = sec->reloc_count;
+  sec_cache->pte_count = ptblsize;
+  sec_cache->ptbl = prop_table;
+
+  return TRUE;
+
+ err:
+  release_contents (sec, contents);
+  release_internal_relocs (sec, internal_relocs);
+  if (prop_table)
+    free (prop_table);
+  return FALSE;
+}
+
+
+/* Extended basic blocks.  */
+
+/* An ebb_struct represents an Extended Basic Block.  Within this
+   range, we guarantee that all instructions are decodable, the
+   property table entries are contiguous, and no property table
+   specifies a segment that cannot have instructions moved.  This
+   structure contains caches of the contents, property table and
+   relocations for the specified section for easy use.  The range is
+   specified by ranges of indices for the byte offset, property table
+   offsets and relocation offsets.  These must be consistent.  */
+
+typedef struct ebb_struct ebb_t;
+
+struct ebb_struct
+{
+  asection *sec;
+
+  bfd_byte *contents;		/* Cache of the section contents.  */
+  bfd_size_type content_length;
+
+  property_table_entry *ptbl;	/* Cache of the section property table.  */
+  unsigned pte_count;
+
+  Elf_Internal_Rela *relocs;	/* Cache of the section relocations.  */
+  unsigned reloc_count;
+
+  bfd_vma start_offset;		/* Offset in section.  */
+  unsigned start_ptbl_idx;	/* Offset in the property table.  */
+  unsigned start_reloc_idx;	/* Offset in the relocations.  */
+
+  bfd_vma end_offset;
+  unsigned end_ptbl_idx;
+  unsigned end_reloc_idx;
+
+  bfd_boolean ends_section;	/* Is this the last ebb in a section?  */
+
+  /* The unreachable property table at the end of this set of blocks;
+     NULL if the end is not an unreachable block.  */
+  property_table_entry *ends_unreachable;
+};
+
+
+enum ebb_target_enum
+{
+  EBB_NO_ALIGN = 0,
+  EBB_DESIRE_TGT_ALIGN,
+  EBB_REQUIRE_TGT_ALIGN,
+  EBB_REQUIRE_LOOP_ALIGN,
+  EBB_REQUIRE_ALIGN
+};
+
+
+/* proposed_action_struct is similar to the text_action_struct except
+   that is represents a potential transformation, not one that will
+   occur.  We build a list of these for an extended basic block
+   and use them to compute the actual actions desired.  We must be
+   careful that the entire set of actual actions we perform do not
+   break any relocations that would fit if the actions were not
+   performed.  */
+
+typedef struct proposed_action_struct proposed_action;
+
+struct proposed_action_struct
+{
+  enum ebb_target_enum align_type; /* for the target alignment */
+  bfd_vma alignment_pow;
+  text_action_t action;
+  bfd_vma offset;
+  int removed_bytes;
+  bfd_boolean do_action; /* If false, then we will not perform the action.  */
+};
+
+
+/* The ebb_constraint_struct keeps a set of proposed actions for an
+   extended basic block.   */
+
+typedef struct ebb_constraint_struct ebb_constraint;
+
+struct ebb_constraint_struct
+{
+  ebb_t ebb;
+  bfd_boolean start_movable;
+
+  /* Bytes of extra space at the beginning if movable.  */
+  int start_extra_space;
+
+  enum ebb_target_enum start_align;
+
+  bfd_boolean end_movable;
+
+  /* Bytes of extra space at the end if movable.  */
+  int end_extra_space;
+
+  unsigned action_count;
+  unsigned action_allocated;
+
+  /* Array of proposed actions.  */
+  proposed_action *actions;
+
+  /* Action alignments -- one for each proposed action.  */
+  enum ebb_target_enum *action_aligns;
+};
+
+
+static void
+init_ebb_constraint (ebb_constraint *c)
+{
+  memset (c, 0, sizeof (ebb_constraint));
+}
+
+
+static void
+free_ebb_constraint (ebb_constraint *c)
+{
+  if (c->actions)
+    free (c->actions);
+}
+
+
+static void
+init_ebb (ebb_t *ebb,
+	  asection *sec,
+	  bfd_byte *contents,
+	  bfd_size_type content_length,
+	  property_table_entry *prop_table,
+	  unsigned ptblsize,
+	  Elf_Internal_Rela *internal_relocs,
+	  unsigned reloc_count)
+{
+  memset (ebb, 0, sizeof (ebb_t));
+  ebb->sec = sec;
+  ebb->contents = contents;
+  ebb->content_length = content_length;
+  ebb->ptbl = prop_table;
+  ebb->pte_count = ptblsize;
+  ebb->relocs = internal_relocs;
+  ebb->reloc_count = reloc_count;
+  ebb->start_offset = 0;
+  ebb->end_offset = ebb->content_length - 1;
+  ebb->start_ptbl_idx = 0;
+  ebb->end_ptbl_idx = ptblsize;
+  ebb->start_reloc_idx = 0;
+  ebb->end_reloc_idx = reloc_count;
+}
+
+
+/* Extend the ebb to all decodable contiguous sections.  The algorithm
+   for building a basic block around an instruction is to push it
+   forward until we hit the end of a section, an unreachable block or
+   a block that cannot be transformed.  Then we push it backwards
+   searching for similar conditions.  */
+
+static bfd_boolean extend_ebb_bounds_forward (ebb_t *);
+static bfd_boolean extend_ebb_bounds_backward (ebb_t *);
+static bfd_size_type insn_block_decodable_len
+  (bfd_byte *, bfd_size_type, bfd_vma, bfd_size_type);
+
+static bfd_boolean
+extend_ebb_bounds (ebb_t *ebb)
+{
+  if (!extend_ebb_bounds_forward (ebb))
+    return FALSE;
+  if (!extend_ebb_bounds_backward (ebb))
+    return FALSE;
+  return TRUE;
+}
+
+
+static bfd_boolean
+extend_ebb_bounds_forward (ebb_t *ebb)
+{
+  property_table_entry *the_entry, *new_entry;
+
+  the_entry = &ebb->ptbl[ebb->end_ptbl_idx];
+
+  /* Stop when (1) we cannot decode an instruction, (2) we are at
+     the end of the property tables, (3) we hit a non-contiguous property
+     table entry, (4) we hit a NO_TRANSFORM region.  */
+
+  while (1)
+    {
+      bfd_vma entry_end;
+      bfd_size_type insn_block_len;
+
+      entry_end = the_entry->address - ebb->sec->vma + the_entry->size;
+      insn_block_len =
+	insn_block_decodable_len (ebb->contents, ebb->content_length,
+				  ebb->end_offset,
+				  entry_end - ebb->end_offset);
+      if (insn_block_len != (entry_end - ebb->end_offset))
+	{
+	  (*_bfd_error_handler)
+	    (_("%B(%A+0x%lx): could not decode instruction; possible configuration mismatch"),
+	     ebb->sec->owner, ebb->sec, ebb->end_offset + insn_block_len);
+	  return FALSE;
+	}
+      ebb->end_offset += insn_block_len;
+
+      if (ebb->end_offset == ebb->sec->size)
+	ebb->ends_section = TRUE;
+
+      /* Update the reloc counter.  */
+      while (ebb->end_reloc_idx + 1 < ebb->reloc_count
+	     && (ebb->relocs[ebb->end_reloc_idx + 1].r_offset
+		 < ebb->end_offset))
+	{
+	  ebb->end_reloc_idx++;
+	}
+
+      if (ebb->end_ptbl_idx + 1 == ebb->pte_count)
+	return TRUE;
+
+      new_entry = &ebb->ptbl[ebb->end_ptbl_idx + 1];
+      if (((new_entry->flags & XTENSA_PROP_INSN) == 0)
+	  || ((new_entry->flags & XTENSA_PROP_NO_TRANSFORM) != 0)
+	  || ((the_entry->flags & XTENSA_PROP_ALIGN) != 0))
+	break;
+
+      if (the_entry->address + the_entry->size != new_entry->address)
+	break;
+
+      the_entry = new_entry;
+      ebb->end_ptbl_idx++;
+    }
+
+  /* Quick check for an unreachable or end of file just at the end.  */
+  if (ebb->end_ptbl_idx + 1 == ebb->pte_count)
+    {
+      if (ebb->end_offset == ebb->content_length)
+	ebb->ends_section = TRUE;
+    }
+  else
+    {
+      new_entry = &ebb->ptbl[ebb->end_ptbl_idx + 1];
+      if ((new_entry->flags & XTENSA_PROP_UNREACHABLE) != 0
+	  && the_entry->address + the_entry->size == new_entry->address)
+	ebb->ends_unreachable = new_entry;
+    }
+
+  /* Any other ending requires exact alignment.  */
+  return TRUE;
+}
+
+
+static bfd_boolean
+extend_ebb_bounds_backward (ebb_t *ebb)
+{
+  property_table_entry *the_entry, *new_entry;
+
+  the_entry = &ebb->ptbl[ebb->start_ptbl_idx];
+
+  /* Stop when (1) we cannot decode the instructions in the current entry.
+     (2) we are at the beginning of the property tables, (3) we hit a
+     non-contiguous property table entry, (4) we hit a NO_TRANSFORM region.  */
+
+  while (1)
+    {
+      bfd_vma block_begin;
+      bfd_size_type insn_block_len;
+
+      block_begin = the_entry->address - ebb->sec->vma;
+      insn_block_len =
+	insn_block_decodable_len (ebb->contents, ebb->content_length,
+				  block_begin,
+				  ebb->start_offset - block_begin);
+      if (insn_block_len != ebb->start_offset - block_begin)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B(%A+0x%lx): could not decode instruction; possible configuration mismatch"),
+	     ebb->sec->owner, ebb->sec, ebb->end_offset + insn_block_len);
+	  return FALSE;
+	}
+      ebb->start_offset -= insn_block_len;
+
+      /* Update the reloc counter.  */
+      while (ebb->start_reloc_idx > 0
+	     && (ebb->relocs[ebb->start_reloc_idx - 1].r_offset
+		 >= ebb->start_offset))
+	{
+	  ebb->start_reloc_idx--;
+	}
+
+      if (ebb->start_ptbl_idx == 0)
+	return TRUE;
+
+      new_entry = &ebb->ptbl[ebb->start_ptbl_idx - 1];
+      if ((new_entry->flags & XTENSA_PROP_INSN) == 0
+	  || ((new_entry->flags & XTENSA_PROP_NO_TRANSFORM) != 0)
+	  || ((new_entry->flags & XTENSA_PROP_ALIGN) != 0))
+	return TRUE;
+      if (new_entry->address + new_entry->size != the_entry->address)
+	return TRUE;
+
+      the_entry = new_entry;
+      ebb->start_ptbl_idx--;
+    }
+  return TRUE;
+}
+
+
+static bfd_size_type
+insn_block_decodable_len (bfd_byte *contents,
+			  bfd_size_type content_len,
+			  bfd_vma block_offset,
+			  bfd_size_type block_len)
+{
+  bfd_vma offset = block_offset;
+
+  while (offset < block_offset + block_len)
+    {
+      bfd_size_type insn_len = 0;
+
+      insn_len = insn_decode_len (contents, content_len, offset);
+      if (insn_len == 0)
+	return (offset - block_offset);
+      offset += insn_len;
+    }
+  return (offset - block_offset);
+}
+
+
+static void
+ebb_propose_action (ebb_constraint *c,
+		    enum ebb_target_enum align_type,
+		    bfd_vma alignment_pow,
+		    text_action_t action,
+		    bfd_vma offset,
+		    int removed_bytes,
+		    bfd_boolean do_action)
+{
+  proposed_action *act;
+
+  if (c->action_allocated <= c->action_count)
+    {
+      unsigned new_allocated, i;
+      proposed_action *new_actions;
+
+      new_allocated = (c->action_count + 2) * 2;
+      new_actions = (proposed_action *)
+	bfd_zmalloc (sizeof (proposed_action) * new_allocated);
+
+      for (i = 0; i < c->action_count; i++)
+	new_actions[i] = c->actions[i];
+      if (c->actions)
+	free (c->actions);
+      c->actions = new_actions;
+      c->action_allocated = new_allocated;
+    }
+
+  act = &c->actions[c->action_count];
+  act->align_type = align_type;
+  act->alignment_pow = alignment_pow;
+  act->action = action;
+  act->offset = offset;
+  act->removed_bytes = removed_bytes;
+  act->do_action = do_action;
+
+  c->action_count++;
+}
+
+
+/* Access to internal relocations, section contents and symbols.  */
+
+/* During relaxation, we need to modify relocations, section contents,
+   and symbol definitions, and we need to keep the original values from
+   being reloaded from the input files, i.e., we need to "pin" the
+   modified values in memory.  We also want to continue to observe the
+   setting of the "keep-memory" flag.  The following functions wrap the
+   standard BFD functions to take care of this for us.  */
+
+static Elf_Internal_Rela *
+retrieve_internal_relocs (bfd *abfd, asection *sec, bfd_boolean keep_memory)
+{
+  Elf_Internal_Rela *internal_relocs;
+
+  if ((sec->flags & SEC_LINKER_CREATED) != 0)
+    return NULL;
+
+  internal_relocs = elf_section_data (sec)->relocs;
+  if (internal_relocs == NULL)
+    internal_relocs = (_bfd_elf_link_read_relocs
+		       (abfd, sec, NULL, NULL, keep_memory));
+  return internal_relocs;
+}
+
+
+static void
+pin_internal_relocs (asection *sec, Elf_Internal_Rela *internal_relocs)
+{
+  elf_section_data (sec)->relocs = internal_relocs;
+}
+
+
+static void
+release_internal_relocs (asection *sec, Elf_Internal_Rela *internal_relocs)
+{
+  if (internal_relocs
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+}
+
+
+static bfd_byte *
+retrieve_contents (bfd *abfd, asection *sec, bfd_boolean keep_memory)
+{
+  bfd_byte *contents;
+  bfd_size_type sec_size;
+
+  sec_size = bfd_get_section_limit (abfd, sec);
+  contents = elf_section_data (sec)->this_hdr.contents;
+  
+  if (contents == NULL && sec_size != 0)
+    {
+      if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+	{
+	  if (contents)
+	    free (contents);
+	  return NULL;
+	}
+      if (keep_memory) 
+	elf_section_data (sec)->this_hdr.contents = contents;
+    }
+  return contents;
+}
+
+
+static void
+pin_contents (asection *sec, bfd_byte *contents)
+{
+  elf_section_data (sec)->this_hdr.contents = contents;
+}
+
+
+static void
+release_contents (asection *sec, bfd_byte *contents)
+{
+  if (contents && elf_section_data (sec)->this_hdr.contents != contents)
+    free (contents);
+}
+
+
+static Elf_Internal_Sym *
+retrieve_local_syms (bfd *input_bfd)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Sym *isymbuf;
+  size_t locsymcount;
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  locsymcount = symtab_hdr->sh_info;
+
+  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+  if (isymbuf == NULL && locsymcount != 0)
+    isymbuf = bfd_elf_get_elf_syms (input_bfd, symtab_hdr, locsymcount, 0,
+				    NULL, NULL, NULL);
+
+  /* Save the symbols for this input file so they won't be read again.  */
+  if (isymbuf && isymbuf != (Elf_Internal_Sym *) symtab_hdr->contents)
+    symtab_hdr->contents = (unsigned char *) isymbuf;
+
+  return isymbuf;
+}
+
+
+/* Code for link-time relaxation.  */
+
+/* Initialization for relaxation: */
+static bfd_boolean analyze_relocations (struct bfd_link_info *);
+static bfd_boolean find_relaxable_sections
+  (bfd *, asection *, struct bfd_link_info *, bfd_boolean *);
+static bfd_boolean collect_source_relocs
+  (bfd *, asection *, struct bfd_link_info *);
+static bfd_boolean is_resolvable_asm_expansion
+  (bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, struct bfd_link_info *,
+   bfd_boolean *);
+static Elf_Internal_Rela *find_associated_l32r_irel
+  (bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Rela *);
+static bfd_boolean compute_text_actions
+  (bfd *, asection *, struct bfd_link_info *);
+static bfd_boolean compute_ebb_proposed_actions (ebb_constraint *);
+static bfd_boolean compute_ebb_actions (ebb_constraint *);
+static bfd_boolean check_section_ebb_pcrels_fit
+  (bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, const ebb_constraint *,
+   const xtensa_opcode *);
+static bfd_boolean check_section_ebb_reduces (const ebb_constraint *);
+static void text_action_add_proposed
+  (text_action_list *, const ebb_constraint *, asection *);
+static int compute_fill_extra_space (property_table_entry *);
+
+/* First pass: */
+static bfd_boolean compute_removed_literals
+  (bfd *, asection *, struct bfd_link_info *, value_map_hash_table *);
+static Elf_Internal_Rela *get_irel_at_offset
+  (asection *, Elf_Internal_Rela *, bfd_vma);
+static bfd_boolean is_removable_literal 
+  (const source_reloc *, int, const source_reloc *, int, asection *,
+   property_table_entry *, int);
+static bfd_boolean remove_dead_literal
+  (bfd *, asection *, struct bfd_link_info *, Elf_Internal_Rela *,
+   Elf_Internal_Rela *, source_reloc *, property_table_entry *, int); 
+static bfd_boolean identify_literal_placement
+  (bfd *, asection *, bfd_byte *, struct bfd_link_info *,
+   value_map_hash_table *, bfd_boolean *, Elf_Internal_Rela *, int,
+   source_reloc *, property_table_entry *, int, section_cache_t *,
+   bfd_boolean);
+static bfd_boolean relocations_reach (source_reloc *, int, const r_reloc *);
+static bfd_boolean coalesce_shared_literal
+  (asection *, source_reloc *, property_table_entry *, int, value_map *);
+static bfd_boolean move_shared_literal
+  (asection *, struct bfd_link_info *, source_reloc *, property_table_entry *,
+   int, const r_reloc *, const literal_value *, section_cache_t *);
+
+/* Second pass: */
+static bfd_boolean relax_section (bfd *, asection *, struct bfd_link_info *);
+static bfd_boolean translate_section_fixes (asection *);
+static bfd_boolean translate_reloc_bfd_fix (reloc_bfd_fix *);
+static asection *translate_reloc (const r_reloc *, r_reloc *, asection *);
+static void shrink_dynamic_reloc_sections
+  (struct bfd_link_info *, bfd *, asection *, Elf_Internal_Rela *);
+static bfd_boolean move_literal
+  (bfd *, struct bfd_link_info *, asection *, bfd_vma, bfd_byte *,
+   xtensa_relax_info *, Elf_Internal_Rela **, const literal_value *);
+static bfd_boolean relax_property_section
+  (bfd *, asection *, struct bfd_link_info *);
+
+/* Third pass: */
+static bfd_boolean relax_section_symbols (bfd *, asection *);
+
+
+static bfd_boolean 
+elf_xtensa_relax_section (bfd *abfd,
+			  asection *sec,
+			  struct bfd_link_info *link_info,
+			  bfd_boolean *again)
+{
+  static value_map_hash_table *values = NULL;
+  static bfd_boolean relocations_analyzed = FALSE;
+  xtensa_relax_info *relax_info;
+
+  if (!relocations_analyzed)
+    {
+      /* Do some overall initialization for relaxation.  */
+      values = value_map_hash_table_init ();
+      if (values == NULL)
+	return FALSE;
+      relaxing_section = TRUE;
+      if (!analyze_relocations (link_info))
+	return FALSE;
+      relocations_analyzed = TRUE;
+    }
+  *again = FALSE;
+
+  /* Don't mess with linker-created sections.  */
+  if ((sec->flags & SEC_LINKER_CREATED) != 0)
+    return TRUE;
+
+  relax_info = get_xtensa_relax_info (sec);
+  BFD_ASSERT (relax_info != NULL);
+
+  switch (relax_info->visited)
+    {
+    case 0:
+      /* Note: It would be nice to fold this pass into
+	 analyze_relocations, but it is important for this step that the
+	 sections be examined in link order.  */
+      if (!compute_removed_literals (abfd, sec, link_info, values))
+	return FALSE;
+      *again = TRUE;
+      break;
+
+    case 1:
+      if (values)
+	value_map_hash_table_delete (values);
+      values = NULL;
+      if (!relax_section (abfd, sec, link_info))
+	return FALSE;
+      *again = TRUE;
+      break;
+
+    case 2:
+      if (!relax_section_symbols (abfd, sec))
+	return FALSE;
+      break;
+    }
+
+  relax_info->visited++;
+  return TRUE;
+}
+
+
+/* Initialization for relaxation.  */
+
+/* This function is called once at the start of relaxation.  It scans
+   all the input sections and marks the ones that are relaxable (i.e.,
+   literal sections with L32R relocations against them), and then
+   collects source_reloc information for all the relocations against
+   those relaxable sections.  During this process, it also detects
+   longcalls, i.e., calls relaxed by the assembler into indirect
+   calls, that can be optimized back into direct calls.  Within each
+   extended basic block (ebb) containing an optimized longcall, it
+   computes a set of "text actions" that can be performed to remove
+   the L32R associated with the longcall while optionally preserving
+   branch target alignments.  */
+
+static bfd_boolean
+analyze_relocations (struct bfd_link_info *link_info)
+{
+  bfd *abfd;
+  asection *sec;
+  bfd_boolean is_relaxable = FALSE;
+
+  /* Initialize the per-section relaxation info.  */
+  for (abfd = link_info->input_bfds; abfd != NULL; abfd = abfd->link_next)
+    for (sec = abfd->sections; sec != NULL; sec = sec->next)
+      {
+	init_xtensa_relax_info (sec);
+      }
+
+  /* Mark relaxable sections (and count relocations against each one).  */
+  for (abfd = link_info->input_bfds; abfd != NULL; abfd = abfd->link_next)
+    for (sec = abfd->sections; sec != NULL; sec = sec->next)
+      {
+	if (!find_relaxable_sections (abfd, sec, link_info, &is_relaxable))
+	  return FALSE;
+      }
+
+  /* Bail out if there are no relaxable sections.  */
+  if (!is_relaxable)
+    return TRUE;
+
+  /* Allocate space for source_relocs.  */
+  for (abfd = link_info->input_bfds; abfd != NULL; abfd = abfd->link_next)
+    for (sec = abfd->sections; sec != NULL; sec = sec->next)
+      {
+	xtensa_relax_info *relax_info;
+
+	relax_info = get_xtensa_relax_info (sec);
+	if (relax_info->is_relaxable_literal_section
+	    || relax_info->is_relaxable_asm_section)
+	  {
+	    relax_info->src_relocs = (source_reloc *)
+	      bfd_malloc (relax_info->src_count * sizeof (source_reloc));
+	  }
+	else
+	  relax_info->src_count = 0;
+      }
+
+  /* Collect info on relocations against each relaxable section.  */
+  for (abfd = link_info->input_bfds; abfd != NULL; abfd = abfd->link_next)
+    for (sec = abfd->sections; sec != NULL; sec = sec->next)
+      {
+	if (!collect_source_relocs (abfd, sec, link_info))
+	  return FALSE;
+      }
+
+  /* Compute the text actions.  */
+  for (abfd = link_info->input_bfds; abfd != NULL; abfd = abfd->link_next)
+    for (sec = abfd->sections; sec != NULL; sec = sec->next)
+      {
+	if (!compute_text_actions (abfd, sec, link_info))
+	  return FALSE;
+      }
+
+  return TRUE;
+}
+
+
+/* Find all the sections that might be relaxed.  The motivation for
+   this pass is that collect_source_relocs() needs to record _all_ the
+   relocations that target each relaxable section.  That is expensive
+   and unnecessary unless the target section is actually going to be
+   relaxed.  This pass identifies all such sections by checking if
+   they have L32Rs pointing to them.  In the process, the total number
+   of relocations targeting each section is also counted so that we
+   know how much space to allocate for source_relocs against each
+   relaxable literal section.  */
+
+static bfd_boolean
+find_relaxable_sections (bfd *abfd,
+			 asection *sec,
+			 struct bfd_link_info *link_info,
+			 bfd_boolean *is_relaxable_p)
+{
+  Elf_Internal_Rela *internal_relocs;
+  bfd_byte *contents;
+  bfd_boolean ok = TRUE;
+  unsigned i;
+  xtensa_relax_info *source_relax_info;
+  bfd_boolean is_l32r_reloc;
+
+  internal_relocs = retrieve_internal_relocs (abfd, sec,
+					      link_info->keep_memory);
+  if (internal_relocs == NULL) 
+    return ok;
+
+  contents = retrieve_contents (abfd, sec, link_info->keep_memory);
+  if (contents == NULL && sec->size != 0)
+    {
+      ok = FALSE;
+      goto error_return;
+    }
+
+  source_relax_info = get_xtensa_relax_info (sec);
+  for (i = 0; i < sec->reloc_count; i++) 
+    {
+      Elf_Internal_Rela *irel = &internal_relocs[i];
+      r_reloc r_rel;
+      asection *target_sec;
+      xtensa_relax_info *target_relax_info;
+
+      /* If this section has not already been marked as "relaxable", and
+	 if it contains any ASM_EXPAND relocations (marking expanded
+	 longcalls) that can be optimized into direct calls, then mark
+	 the section as "relaxable".  */
+      if (source_relax_info
+	  && !source_relax_info->is_relaxable_asm_section
+	  && ELF32_R_TYPE (irel->r_info) == R_XTENSA_ASM_EXPAND)
+	{
+	  bfd_boolean is_reachable = FALSE;
+	  if (is_resolvable_asm_expansion (abfd, sec, contents, irel,
+					   link_info, &is_reachable)
+	      && is_reachable)
+	    {
+	      source_relax_info->is_relaxable_asm_section = TRUE;
+	      *is_relaxable_p = TRUE;
+	    }
+	}
+
+      r_reloc_init (&r_rel, abfd, irel, contents,
+		    bfd_get_section_limit (abfd, sec));
+
+      target_sec = r_reloc_get_section (&r_rel);
+      target_relax_info = get_xtensa_relax_info (target_sec);
+      if (!target_relax_info)
+	continue;
+
+      /* Count PC-relative operand relocations against the target section.
+         Note: The conditions tested here must match the conditions under
+	 which init_source_reloc is called in collect_source_relocs().  */
+      is_l32r_reloc = FALSE;
+      if (is_operand_relocation (ELF32_R_TYPE (irel->r_info)))
+	{
+	  xtensa_opcode opcode =
+	    get_relocation_opcode (abfd, sec, contents, irel);
+	  if (opcode != XTENSA_UNDEFINED)
+	    {
+	      is_l32r_reloc = (opcode == get_l32r_opcode ());
+	      if (!is_alt_relocation (ELF32_R_TYPE (irel->r_info))
+		  || is_l32r_reloc)
+		target_relax_info->src_count++;
+	    }
+	}
+
+      if (is_l32r_reloc && r_reloc_is_defined (&r_rel))
+	{
+	  /* Mark the target section as relaxable.  */
+	  target_relax_info->is_relaxable_literal_section = TRUE;
+	  *is_relaxable_p = TRUE;
+	}
+    }
+
+ error_return:
+  release_contents (sec, contents);
+  release_internal_relocs (sec, internal_relocs);
+  return ok;
+}
+
+
+/* Record _all_ the relocations that point to relaxable sections, and
+   get rid of ASM_EXPAND relocs by either converting them to
+   ASM_SIMPLIFY or by removing them.  */
+
+static bfd_boolean
+collect_source_relocs (bfd *abfd,
+		       asection *sec,
+		       struct bfd_link_info *link_info)
+{
+  Elf_Internal_Rela *internal_relocs;
+  bfd_byte *contents;
+  bfd_boolean ok = TRUE;
+  unsigned i;
+  bfd_size_type sec_size;
+
+  internal_relocs = retrieve_internal_relocs (abfd, sec, 
+					      link_info->keep_memory);
+  if (internal_relocs == NULL) 
+    return ok;
+
+  sec_size = bfd_get_section_limit (abfd, sec);
+  contents = retrieve_contents (abfd, sec, link_info->keep_memory);
+  if (contents == NULL && sec_size != 0)
+    {
+      ok = FALSE;
+      goto error_return;
+    }
+
+  /* Record relocations against relaxable literal sections.  */
+  for (i = 0; i < sec->reloc_count; i++) 
+    {
+      Elf_Internal_Rela *irel = &internal_relocs[i];
+      r_reloc r_rel;
+      asection *target_sec;
+      xtensa_relax_info *target_relax_info;
+
+      r_reloc_init (&r_rel, abfd, irel, contents, sec_size);
+
+      target_sec = r_reloc_get_section (&r_rel);
+      target_relax_info = get_xtensa_relax_info (target_sec);
+
+      if (target_relax_info
+	  && (target_relax_info->is_relaxable_literal_section
+	      || target_relax_info->is_relaxable_asm_section))
+	{
+	  xtensa_opcode opcode = XTENSA_UNDEFINED;
+	  int opnd = -1;
+	  bfd_boolean is_abs_literal = FALSE;
+
+	  if (is_alt_relocation (ELF32_R_TYPE (irel->r_info)))
+	    {
+	      /* None of the current alternate relocs are PC-relative,
+		 and only PC-relative relocs matter here.  However, we
+		 still need to record the opcode for literal
+		 coalescing.  */
+	      opcode = get_relocation_opcode (abfd, sec, contents, irel);
+	      if (opcode == get_l32r_opcode ())
+		{
+		  is_abs_literal = TRUE;
+		  opnd = 1;
+		}
+	      else
+		opcode = XTENSA_UNDEFINED;
+	    }
+	  else if (is_operand_relocation (ELF32_R_TYPE (irel->r_info)))
+	    {
+	      opcode = get_relocation_opcode (abfd, sec, contents, irel);
+	      opnd = get_relocation_opnd (opcode, ELF32_R_TYPE (irel->r_info));
+	    }
+
+	  if (opcode != XTENSA_UNDEFINED)
+	    {
+	      int src_next = target_relax_info->src_next++;
+	      source_reloc *s_reloc = &target_relax_info->src_relocs[src_next];
+
+	      init_source_reloc (s_reloc, sec, &r_rel, opcode, opnd,
+				 is_abs_literal);
+	    }
+	}
+    }
+
+  /* Now get rid of ASM_EXPAND relocations.  At this point, the
+     src_relocs array for the target literal section may still be
+     incomplete, but it must at least contain the entries for the L32R
+     relocations associated with ASM_EXPANDs because they were just
+     added in the preceding loop over the relocations.  */
+
+  for (i = 0; i < sec->reloc_count; i++) 
+    {
+      Elf_Internal_Rela *irel = &internal_relocs[i];
+      bfd_boolean is_reachable;
+
+      if (!is_resolvable_asm_expansion (abfd, sec, contents, irel, link_info,
+					&is_reachable))
+	continue;
+
+      if (is_reachable)
+	{
+	  Elf_Internal_Rela *l32r_irel;
+	  r_reloc r_rel;
+	  asection *target_sec;
+	  xtensa_relax_info *target_relax_info;
+
+	  /* Mark the source_reloc for the L32R so that it will be
+	     removed in compute_removed_literals(), along with the
+	     associated literal.  */
+	  l32r_irel = find_associated_l32r_irel (abfd, sec, contents,
+						 irel, internal_relocs);
+	  if (l32r_irel == NULL)
+	    continue;
+
+	  r_reloc_init (&r_rel, abfd, l32r_irel, contents, sec_size);
+
+	  target_sec = r_reloc_get_section (&r_rel);
+	  target_relax_info = get_xtensa_relax_info (target_sec);
+
+	  if (target_relax_info
+	      && (target_relax_info->is_relaxable_literal_section
+		  || target_relax_info->is_relaxable_asm_section))
+	    {
+	      source_reloc *s_reloc;
+
+	      /* Search the source_relocs for the entry corresponding to
+		 the l32r_irel.  Note: The src_relocs array is not yet
+		 sorted, but it wouldn't matter anyway because we're
+		 searching by source offset instead of target offset.  */
+	      s_reloc = find_source_reloc (target_relax_info->src_relocs, 
+					   target_relax_info->src_next,
+					   sec, l32r_irel);
+	      BFD_ASSERT (s_reloc);
+	      s_reloc->is_null = TRUE;
+	    }
+
+	  /* Convert this reloc to ASM_SIMPLIFY.  */
+	  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+				       R_XTENSA_ASM_SIMPLIFY);
+	  l32r_irel->r_info = ELF32_R_INFO (0, R_XTENSA_NONE);
+
+	  pin_internal_relocs (sec, internal_relocs);
+	}
+      else
+	{
+	  /* It is resolvable but doesn't reach.  We resolve now
+	     by eliminating the relocation -- the call will remain
+	     expanded into L32R/CALLX.  */
+	  irel->r_info = ELF32_R_INFO (0, R_XTENSA_NONE);
+	  pin_internal_relocs (sec, internal_relocs);
+	}
+    }
+
+ error_return:
+  release_contents (sec, contents);
+  release_internal_relocs (sec, internal_relocs);
+  return ok;
+}
+
+
+/* Return TRUE if the asm expansion can be resolved.  Generally it can
+   be resolved on a final link or when a partial link locates it in the
+   same section as the target.  Set "is_reachable" flag if the target of
+   the call is within the range of a direct call, given the current VMA
+   for this section and the target section.  */
+
+bfd_boolean
+is_resolvable_asm_expansion (bfd *abfd,
+			     asection *sec,
+			     bfd_byte *contents,
+			     Elf_Internal_Rela *irel,
+			     struct bfd_link_info *link_info,
+			     bfd_boolean *is_reachable_p)
+{
+  asection *target_sec;
+  bfd_vma target_offset;
+  r_reloc r_rel;
+  xtensa_opcode opcode, direct_call_opcode;
+  bfd_vma self_address;
+  bfd_vma dest_address;
+  bfd_boolean uses_l32r;
+  bfd_size_type sec_size;
+
+  *is_reachable_p = FALSE;
+
+  if (contents == NULL)
+    return FALSE;
+
+  if (ELF32_R_TYPE (irel->r_info) != R_XTENSA_ASM_EXPAND) 
+    return FALSE;
+
+  sec_size = bfd_get_section_limit (abfd, sec);
+  opcode = get_expanded_call_opcode (contents + irel->r_offset,
+				     sec_size - irel->r_offset, &uses_l32r);
+  /* Optimization of longcalls that use CONST16 is not yet implemented.  */
+  if (!uses_l32r)
+    return FALSE;
+  
+  direct_call_opcode = swap_callx_for_call_opcode (opcode);
+  if (direct_call_opcode == XTENSA_UNDEFINED)
+    return FALSE;
+
+  /* Check and see that the target resolves.  */
+  r_reloc_init (&r_rel, abfd, irel, contents, sec_size);
+  if (!r_reloc_is_defined (&r_rel))
+    return FALSE;
+
+  target_sec = r_reloc_get_section (&r_rel);
+  target_offset = r_rel.target_offset;
+
+  /* If the target is in a shared library, then it doesn't reach.  This
+     isn't supposed to come up because the compiler should never generate
+     non-PIC calls on systems that use shared libraries, but the linker
+     shouldn't crash regardless.  */
+  if (!target_sec->output_section)
+    return FALSE;
+      
+  /* For relocatable sections, we can only simplify when the output
+     section of the target is the same as the output section of the
+     source.  */
+  if (link_info->relocatable
+      && (target_sec->output_section != sec->output_section
+	  || is_reloc_sym_weak (abfd, irel)))
+    return FALSE;
+
+  self_address = (sec->output_section->vma
+		  + sec->output_offset + irel->r_offset + 3);
+  dest_address = (target_sec->output_section->vma
+		  + target_sec->output_offset + target_offset);
+      
+  *is_reachable_p = pcrel_reloc_fits (direct_call_opcode, 0,
+				      self_address, dest_address);
+
+  if ((self_address >> CALL_SEGMENT_BITS) !=
+      (dest_address >> CALL_SEGMENT_BITS))
+    return FALSE;
+
+  return TRUE;
+}
+
+
+static Elf_Internal_Rela *
+find_associated_l32r_irel (bfd *abfd,
+			   asection *sec,
+			   bfd_byte *contents,
+			   Elf_Internal_Rela *other_irel,
+			   Elf_Internal_Rela *internal_relocs)
+{
+  unsigned i;
+
+  for (i = 0; i < sec->reloc_count; i++) 
+    {
+      Elf_Internal_Rela *irel = &internal_relocs[i];
+
+      if (irel == other_irel)
+	continue;
+      if (irel->r_offset != other_irel->r_offset)
+	continue;
+      if (is_l32r_relocation (abfd, sec, contents, irel))
+	return irel;
+    }
+
+  return NULL;
+}
+
+
+static xtensa_opcode *
+build_reloc_opcodes (bfd *abfd,
+		     asection *sec,
+		     bfd_byte *contents,
+		     Elf_Internal_Rela *internal_relocs)
+{
+  unsigned i;
+  xtensa_opcode *reloc_opcodes =
+    (xtensa_opcode *) bfd_malloc (sizeof (xtensa_opcode) * sec->reloc_count);
+  for (i = 0; i < sec->reloc_count; i++)
+    {
+      Elf_Internal_Rela *irel = &internal_relocs[i];
+      reloc_opcodes[i] = get_relocation_opcode (abfd, sec, contents, irel);
+    }
+  return reloc_opcodes;
+}
+
+
+/* The compute_text_actions function will build a list of potential
+   transformation actions for code in the extended basic block of each
+   longcall that is optimized to a direct call.  From this list we
+   generate a set of actions to actually perform that optimizes for
+   space and, if not using size_opt, maintains branch target
+   alignments.
+
+   These actions to be performed are placed on a per-section list.
+   The actual changes are performed by relax_section() in the second
+   pass.  */
+
+bfd_boolean
+compute_text_actions (bfd *abfd,
+		      asection *sec,
+		      struct bfd_link_info *link_info)
+{
+  xtensa_opcode *reloc_opcodes = NULL;
+  xtensa_relax_info *relax_info;
+  bfd_byte *contents;
+  Elf_Internal_Rela *internal_relocs;
+  bfd_boolean ok = TRUE;
+  unsigned i;
+  property_table_entry *prop_table = 0;
+  int ptblsize = 0;
+  bfd_size_type sec_size;
+
+  relax_info = get_xtensa_relax_info (sec);
+  BFD_ASSERT (relax_info);
+  BFD_ASSERT (relax_info->src_next == relax_info->src_count);
+
+  /* Do nothing if the section contains no optimized longcalls.  */
+  if (!relax_info->is_relaxable_asm_section)
+    return ok;
+
+  internal_relocs = retrieve_internal_relocs (abfd, sec,
+					      link_info->keep_memory);
+
+  if (internal_relocs)
+    qsort (internal_relocs, sec->reloc_count, sizeof (Elf_Internal_Rela),
+	   internal_reloc_compare);
+
+  sec_size = bfd_get_section_limit (abfd, sec);
+  contents = retrieve_contents (abfd, sec, link_info->keep_memory);
+  if (contents == NULL && sec_size != 0)
+    {
+      ok = FALSE;
+      goto error_return;
+    }
+
+  ptblsize = xtensa_read_table_entries (abfd, sec, &prop_table,
+					XTENSA_PROP_SEC_NAME, FALSE);
+  if (ptblsize < 0)
+    {
+      ok = FALSE;
+      goto error_return;
+    }
+
+  for (i = 0; i < sec->reloc_count; i++)
+    {
+      Elf_Internal_Rela *irel = &internal_relocs[i];
+      bfd_vma r_offset;
+      property_table_entry *the_entry;
+      int ptbl_idx;
+      ebb_t *ebb;
+      ebb_constraint ebb_table;
+      bfd_size_type simplify_size;
+
+      if (irel && ELF32_R_TYPE (irel->r_info) != R_XTENSA_ASM_SIMPLIFY)
+	continue;
+      r_offset = irel->r_offset;
+
+      simplify_size = get_asm_simplify_size (contents, sec_size, r_offset);
+      if (simplify_size == 0)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B(%A+0x%lx): could not decode instruction for XTENSA_ASM_SIMPLIFY relocation; possible configuration mismatch"),
+	     sec->owner, sec, r_offset);
+	  continue;
+	}
+
+      /* If the instruction table is not around, then don't do this
+	 relaxation.  */
+      the_entry = elf_xtensa_find_property_entry (prop_table, ptblsize,
+						  sec->vma + irel->r_offset);
+      if (the_entry == NULL || XTENSA_NO_NOP_REMOVAL)
+	{
+	  text_action_add (&relax_info->action_list,
+			   ta_convert_longcall, sec, r_offset,
+			   0);
+	  continue;
+	}
+
+      /* If the next longcall happens to be at the same address as an
+	 unreachable section of size 0, then skip forward.  */
+      ptbl_idx = the_entry - prop_table;
+      while ((the_entry->flags & XTENSA_PROP_UNREACHABLE)
+	     && the_entry->size == 0
+	     && ptbl_idx + 1 < ptblsize
+	     && (prop_table[ptbl_idx + 1].address
+		 == prop_table[ptbl_idx].address))
+	{
+	  ptbl_idx++;
+	  the_entry++;
+	}
+
+      if (the_entry->flags & XTENSA_PROP_NO_TRANSFORM)
+	  /* NO_REORDER is OK */
+	continue;
+
+      init_ebb_constraint (&ebb_table);
+      ebb = &ebb_table.ebb;
+      init_ebb (ebb, sec, contents, sec_size, prop_table, ptblsize,
+		internal_relocs, sec->reloc_count);
+      ebb->start_offset = r_offset + simplify_size;
+      ebb->end_offset = r_offset + simplify_size;
+      ebb->start_ptbl_idx = ptbl_idx;
+      ebb->end_ptbl_idx = ptbl_idx;
+      ebb->start_reloc_idx = i;
+      ebb->end_reloc_idx = i;
+
+      /* Precompute the opcode for each relocation.  */
+      if (reloc_opcodes == NULL)
+	reloc_opcodes = build_reloc_opcodes (abfd, sec, contents,
+					     internal_relocs);
+
+      if (!extend_ebb_bounds (ebb)
+	  || !compute_ebb_proposed_actions (&ebb_table)
+	  || !compute_ebb_actions (&ebb_table)
+	  || !check_section_ebb_pcrels_fit (abfd, sec, contents,
+					    internal_relocs, &ebb_table,
+					    reloc_opcodes)
+	  || !check_section_ebb_reduces (&ebb_table))
+	{
+	  /* If anything goes wrong or we get unlucky and something does
+	     not fit, with our plan because of expansion between
+	     critical branches, just convert to a NOP.  */
+
+	  text_action_add (&relax_info->action_list,
+			   ta_convert_longcall, sec, r_offset, 0);
+	  i = ebb_table.ebb.end_reloc_idx;
+	  free_ebb_constraint (&ebb_table);
+	  continue;
+	}
+
+      text_action_add_proposed (&relax_info->action_list, &ebb_table, sec);
+
+      /* Update the index so we do not go looking at the relocations
+	 we have already processed.  */
+      i = ebb_table.ebb.end_reloc_idx;
+      free_ebb_constraint (&ebb_table);
+    }
+
+#if DEBUG
+  if (relax_info->action_list.head)
+    print_action_list (stderr, &relax_info->action_list);
+#endif
+
+error_return:
+  release_contents (sec, contents);
+  release_internal_relocs (sec, internal_relocs);
+  if (prop_table)
+    free (prop_table);
+  if (reloc_opcodes)
+    free (reloc_opcodes);
+
+  return ok;
+}
+
+
+/* Do not widen an instruction if it is preceeded by a
+   loop opcode.  It might cause misalignment.  */
+
+static bfd_boolean
+prev_instr_is_a_loop (bfd_byte *contents,
+		      bfd_size_type content_length,
+		      bfd_size_type offset)
+{
+  xtensa_opcode prev_opcode;
+
+  if (offset < 3)
+    return FALSE;
+  prev_opcode = insn_decode_opcode (contents, content_length, offset-3, 0);
+  return (xtensa_opcode_is_loop (xtensa_default_isa, prev_opcode) == 1);
+} 
+
+
+/* Find all of the possible actions for an extended basic block.  */
+
+bfd_boolean
+compute_ebb_proposed_actions (ebb_constraint *ebb_table)
+{
+  const ebb_t *ebb = &ebb_table->ebb;
+  unsigned rel_idx = ebb->start_reloc_idx;
+  property_table_entry *entry, *start_entry, *end_entry;
+  bfd_vma offset = 0;
+  xtensa_isa isa = xtensa_default_isa;
+  xtensa_format fmt;
+  static xtensa_insnbuf insnbuf = NULL;
+  static xtensa_insnbuf slotbuf = NULL;
+
+  if (insnbuf == NULL)
+    {
+      insnbuf = xtensa_insnbuf_alloc (isa);
+      slotbuf = xtensa_insnbuf_alloc (isa);
+    }
+
+  start_entry = &ebb->ptbl[ebb->start_ptbl_idx];
+  end_entry = &ebb->ptbl[ebb->end_ptbl_idx];
+
+  for (entry = start_entry; entry <= end_entry; entry++)
+    {
+      bfd_vma start_offset, end_offset;
+      bfd_size_type insn_len;
+
+      start_offset = entry->address - ebb->sec->vma;
+      end_offset = entry->address + entry->size - ebb->sec->vma;
+
+      if (entry == start_entry)
+	start_offset = ebb->start_offset;
+      if (entry == end_entry)
+	end_offset = ebb->end_offset;
+      offset = start_offset;
+
+      if (offset == entry->address - ebb->sec->vma
+	  && (entry->flags & XTENSA_PROP_INSN_BRANCH_TARGET) != 0)
+	{
+	  enum ebb_target_enum align_type = EBB_DESIRE_TGT_ALIGN;
+	  BFD_ASSERT (offset != end_offset);
+	  if (offset == end_offset)
+	    return FALSE;
+
+	  insn_len = insn_decode_len (ebb->contents, ebb->content_length,
+				      offset);
+	  if (insn_len == 0) 
+	    goto decode_error;
+
+	  if (check_branch_target_aligned_address (offset, insn_len))
+	    align_type = EBB_REQUIRE_TGT_ALIGN;
+
+	  ebb_propose_action (ebb_table, align_type, 0,
+			      ta_none, offset, 0, TRUE);
+	}
+
+      while (offset != end_offset)
+	{
+	  Elf_Internal_Rela *irel;
+	  xtensa_opcode opcode;
+
+	  while (rel_idx < ebb->end_reloc_idx
+		 && (ebb->relocs[rel_idx].r_offset < offset
+		     || (ebb->relocs[rel_idx].r_offset == offset
+			 && (ELF32_R_TYPE (ebb->relocs[rel_idx].r_info)
+			     != R_XTENSA_ASM_SIMPLIFY))))
+	    rel_idx++;
+
+	  /* Check for longcall.  */
+	  irel = &ebb->relocs[rel_idx];
+	  if (irel->r_offset == offset
+	      && ELF32_R_TYPE (irel->r_info) == R_XTENSA_ASM_SIMPLIFY)
+	    {
+	      bfd_size_type simplify_size;
+
+	      simplify_size = get_asm_simplify_size (ebb->contents, 
+						     ebb->content_length,
+						     irel->r_offset);
+	      if (simplify_size == 0)
+		goto decode_error;
+
+	      ebb_propose_action (ebb_table, EBB_NO_ALIGN, 0,
+				  ta_convert_longcall, offset, 0, TRUE);
+	      
+	      offset += simplify_size;
+	      continue;
+	    }
+
+	  if (offset + MIN_INSN_LENGTH > ebb->content_length)
+	    goto decode_error;
+	  xtensa_insnbuf_from_chars (isa, insnbuf, &ebb->contents[offset],
+				     ebb->content_length - offset);
+	  fmt = xtensa_format_decode (isa, insnbuf);
+	  if (fmt == XTENSA_UNDEFINED)
+	    goto decode_error;
+	  insn_len = xtensa_format_length (isa, fmt);
+	  if (insn_len == (bfd_size_type) XTENSA_UNDEFINED)
+	    goto decode_error;
+
+	  if (xtensa_format_num_slots (isa, fmt) != 1)
+	    {
+	      offset += insn_len;
+	      continue;
+	    }
+
+	  xtensa_format_get_slot (isa, fmt, 0, insnbuf, slotbuf);
+	  opcode = xtensa_opcode_decode (isa, fmt, 0, slotbuf);
+	  if (opcode == XTENSA_UNDEFINED)
+	    goto decode_error;
+
+	  if ((entry->flags & XTENSA_PROP_INSN_NO_DENSITY) == 0
+	      && (entry->flags & XTENSA_PROP_NO_TRANSFORM) == 0
+	      && can_narrow_instruction (slotbuf, fmt, opcode) != 0)
+	    {
+	      /* Add an instruction narrow action.  */
+	      ebb_propose_action (ebb_table, EBB_NO_ALIGN, 0,
+				  ta_narrow_insn, offset, 0, FALSE);
+	    }
+	  else if ((entry->flags & XTENSA_PROP_NO_TRANSFORM) == 0
+		   && can_widen_instruction (slotbuf, fmt, opcode) != 0
+		   && ! prev_instr_is_a_loop (ebb->contents,
+					      ebb->content_length, offset))
+	    {
+	      /* Add an instruction widen action.  */
+	      ebb_propose_action (ebb_table, EBB_NO_ALIGN, 0,
+				  ta_widen_insn, offset, 0, FALSE);
+	    }
+	  else if (xtensa_opcode_is_loop (xtensa_default_isa, opcode) == 1)
+	    {
+	      /* Check for branch targets.  */
+	      ebb_propose_action (ebb_table, EBB_REQUIRE_LOOP_ALIGN, 0,
+				  ta_none, offset, 0, TRUE);
+	    }
+
+	  offset += insn_len;
+	}
+    }
+
+  if (ebb->ends_unreachable)
+    {
+      ebb_propose_action (ebb_table, EBB_NO_ALIGN, 0,
+			  ta_fill, ebb->end_offset, 0, TRUE);
+    }
+
+  return TRUE;
+
+ decode_error:
+  (*_bfd_error_handler)
+    (_("%B(%A+0x%lx): could not decode instruction; possible configuration mismatch"),
+     ebb->sec->owner, ebb->sec, offset);
+  return FALSE;
+}
+
+
+/* After all of the information has collected about the
+   transformations possible in an EBB, compute the appropriate actions
+   here in compute_ebb_actions.  We still must check later to make
+   sure that the actions do not break any relocations.  The algorithm
+   used here is pretty greedy.  Basically, it removes as many no-ops
+   as possible so that the end of the EBB has the same alignment
+   characteristics as the original.  First, it uses narrowing, then
+   fill space at the end of the EBB, and finally widenings.  If that
+   does not work, it tries again with one fewer no-op removed.  The
+   optimization will only be performed if all of the branch targets
+   that were aligned before transformation are also aligned after the
+   transformation.
+
+   When the size_opt flag is set, ignore the branch target alignments,
+   narrow all wide instructions, and remove all no-ops unless the end
+   of the EBB prevents it.  */
+
+bfd_boolean
+compute_ebb_actions (ebb_constraint *ebb_table)
+{
+  unsigned i = 0;
+  unsigned j;
+  int removed_bytes = 0;
+  ebb_t *ebb = &ebb_table->ebb;
+  unsigned seg_idx_start = 0;
+  unsigned seg_idx_end = 0;
+
+  /* We perform this like the assembler relaxation algorithm: Start by
+     assuming all instructions are narrow and all no-ops removed; then
+     walk through....  */
+
+  /* For each segment of this that has a solid constraint, check to
+     see if there are any combinations that will keep the constraint.
+     If so, use it.  */
+  for (seg_idx_end = 0; seg_idx_end < ebb_table->action_count; seg_idx_end++)
+    {
+      bfd_boolean requires_text_end_align = FALSE;
+      unsigned longcall_count = 0;
+      unsigned longcall_convert_count = 0;
+      unsigned narrowable_count = 0;
+      unsigned narrowable_convert_count = 0;
+      unsigned widenable_count = 0;
+      unsigned widenable_convert_count = 0;
+
+      proposed_action *action = NULL;
+      int align = (1 << ebb_table->ebb.sec->alignment_power);
+
+      seg_idx_start = seg_idx_end;
+
+      for (i = seg_idx_start; i < ebb_table->action_count; i++)
+	{
+	  action = &ebb_table->actions[i];
+	  if (action->action == ta_convert_longcall)
+	    longcall_count++;
+	  if (action->action == ta_narrow_insn)
+	    narrowable_count++;
+	  if (action->action == ta_widen_insn)
+	    widenable_count++;
+	  if (action->action == ta_fill)
+	    break;
+	  if (action->align_type == EBB_REQUIRE_LOOP_ALIGN)
+	    break;
+	  if (action->align_type == EBB_REQUIRE_TGT_ALIGN
+	      && !elf32xtensa_size_opt)
+	    break;
+	}
+      seg_idx_end = i;
+
+      if (seg_idx_end == ebb_table->action_count && !ebb->ends_unreachable)
+	requires_text_end_align = TRUE;
+
+      if (elf32xtensa_size_opt && !requires_text_end_align
+	  && action->align_type != EBB_REQUIRE_LOOP_ALIGN
+	  && action->align_type != EBB_REQUIRE_TGT_ALIGN)
+	{
+	  longcall_convert_count = longcall_count;
+	  narrowable_convert_count = narrowable_count;
+	  widenable_convert_count = 0;
+	}
+      else
+	{
+	  /* There is a constraint.  Convert the max number of longcalls.  */
+	  narrowable_convert_count = 0;
+	  longcall_convert_count = 0;
+	  widenable_convert_count = 0;
+
+	  for (j = 0; j < longcall_count; j++)
+	    {
+	      int removed = (longcall_count - j) * 3 & (align - 1);
+	      unsigned desire_narrow = (align - removed) & (align - 1);
+	      unsigned desire_widen = removed;
+	      if (desire_narrow <= narrowable_count)
+		{
+		  narrowable_convert_count = desire_narrow;
+		  narrowable_convert_count +=
+		    (align * ((narrowable_count - narrowable_convert_count)
+			      / align));
+		  longcall_convert_count = (longcall_count - j);
+		  widenable_convert_count = 0;
+		  break;
+		}
+	      if (desire_widen <= widenable_count && !elf32xtensa_size_opt)
+		{
+		  narrowable_convert_count = 0;
+		  longcall_convert_count = longcall_count - j;
+		  widenable_convert_count = desire_widen;
+		  break;
+		}
+	    }
+	}
+
+      /* Now the number of conversions are saved.  Do them.  */
+      for (i = seg_idx_start; i < seg_idx_end; i++)
+	{
+	  action = &ebb_table->actions[i];
+	  switch (action->action)
+	    {
+	    case ta_convert_longcall:
+	      if (longcall_convert_count != 0)
+		{
+		  action->action = ta_remove_longcall;
+		  action->do_action = TRUE;
+		  action->removed_bytes += 3;
+		  longcall_convert_count--;
+		}
+	      break;
+	    case ta_narrow_insn:
+	      if (narrowable_convert_count != 0)
+		{
+		  action->do_action = TRUE;
+		  action->removed_bytes += 1;
+		  narrowable_convert_count--;
+		}
+	      break;
+	    case ta_widen_insn:
+	      if (widenable_convert_count != 0)
+		{
+		  action->do_action = TRUE;
+		  action->removed_bytes -= 1;
+		  widenable_convert_count--;
+		}
+	      break;
+	    default:
+	      break;
+	    }
+	}
+    }
+
+  /* Now we move on to some local opts.  Try to remove each of the
+     remaining longcalls.  */
+
+  if (ebb_table->ebb.ends_section || ebb_table->ebb.ends_unreachable)
+    {
+      removed_bytes = 0;
+      for (i = 0; i < ebb_table->action_count; i++)
+	{
+	  int old_removed_bytes = removed_bytes;
+	  proposed_action *action = &ebb_table->actions[i];
+
+	  if (action->do_action && action->action == ta_convert_longcall)
+	    {
+	      bfd_boolean bad_alignment = FALSE;
+	      removed_bytes += 3;
+	      for (j = i + 1; j < ebb_table->action_count; j++)
+		{
+		  proposed_action *new_action = &ebb_table->actions[j];
+		  bfd_vma offset = new_action->offset;
+		  if (new_action->align_type == EBB_REQUIRE_TGT_ALIGN)
+		    {
+		      if (!check_branch_target_aligned
+			  (ebb_table->ebb.contents,
+			   ebb_table->ebb.content_length,
+			   offset, offset - removed_bytes))
+			{
+			  bad_alignment = TRUE;
+			  break;
+			}
+		    }
+		  if (new_action->align_type == EBB_REQUIRE_LOOP_ALIGN)
+		    {
+		      if (!check_loop_aligned (ebb_table->ebb.contents,
+					       ebb_table->ebb.content_length,
+					       offset,
+					       offset - removed_bytes))
+			{
+			  bad_alignment = TRUE;
+			  break;
+			}
+		    }
+		  if (new_action->action == ta_narrow_insn
+		      && !new_action->do_action
+		      && ebb_table->ebb.sec->alignment_power == 2)
+		    {
+		      /* Narrow an instruction and we are done.  */
+		      new_action->do_action = TRUE;
+		      new_action->removed_bytes += 1;
+		      bad_alignment = FALSE;
+		      break;
+		    }
+		  if (new_action->action == ta_widen_insn
+		      && new_action->do_action
+		      && ebb_table->ebb.sec->alignment_power == 2)
+		    {
+		      /* Narrow an instruction and we are done.  */
+		      new_action->do_action = FALSE;
+		      new_action->removed_bytes += 1;
+		      bad_alignment = FALSE;
+		      break;
+		    }
+		  if (new_action->do_action)
+		    removed_bytes += new_action->removed_bytes;
+		}
+	      if (!bad_alignment)
+		{
+		  action->removed_bytes += 3;
+		  action->action = ta_remove_longcall;
+		  action->do_action = TRUE;
+		}
+	    }
+	  removed_bytes = old_removed_bytes;
+	  if (action->do_action)
+	    removed_bytes += action->removed_bytes;
+	}
+    }
+
+  removed_bytes = 0;
+  for (i = 0; i < ebb_table->action_count; ++i)
+    {
+      proposed_action *action = &ebb_table->actions[i];
+      if (action->do_action)
+	removed_bytes += action->removed_bytes;
+    }
+
+  if ((removed_bytes % (1 << ebb_table->ebb.sec->alignment_power)) != 0
+      && ebb->ends_unreachable)
+    {
+      proposed_action *action;
+      int br;
+      int extra_space;
+
+      BFD_ASSERT (ebb_table->action_count != 0);
+      action = &ebb_table->actions[ebb_table->action_count - 1];
+      BFD_ASSERT (action->action == ta_fill);
+      BFD_ASSERT (ebb->ends_unreachable->flags & XTENSA_PROP_UNREACHABLE);
+
+      extra_space = compute_fill_extra_space (ebb->ends_unreachable);
+      br = action->removed_bytes + removed_bytes + extra_space;
+      br = br & ((1 << ebb->sec->alignment_power ) - 1);
+
+      action->removed_bytes = extra_space - br;
+    }
+  return TRUE;
+}
+
+
+/* The xlate_map is a sorted array of address mappings designed to
+   answer the offset_with_removed_text() query with a binary search instead
+   of a linear search through the section's action_list.  */
+
+typedef struct xlate_map_entry xlate_map_entry_t;
+typedef struct xlate_map xlate_map_t;
+
+struct xlate_map_entry
+{
+  unsigned orig_address;
+  unsigned new_address;
+  unsigned size;
+};
+
+struct xlate_map
+{
+  unsigned entry_count;
+  xlate_map_entry_t *entry;
+};
+
+
+static int 
+xlate_compare (const void *a_v, const void *b_v)
+{
+  const xlate_map_entry_t *a = (const xlate_map_entry_t *) a_v;
+  const xlate_map_entry_t *b = (const xlate_map_entry_t *) b_v;
+  if (a->orig_address < b->orig_address)
+    return -1;
+  if (a->orig_address > (b->orig_address + b->size - 1))
+    return 1;
+  return 0;
+}
+
+
+static bfd_vma
+xlate_offset_with_removed_text (const xlate_map_t *map,
+				text_action_list *action_list,
+				bfd_vma offset)
+{
+  void *r;
+  xlate_map_entry_t *e;
+
+  if (map == NULL)
+    return offset_with_removed_text (action_list, offset);
+
+  if (map->entry_count == 0)
+    return offset;
+
+  r = bsearch (&offset, map->entry, map->entry_count,
+	       sizeof (xlate_map_entry_t), &xlate_compare);
+  e = (xlate_map_entry_t *) r;
+  
+  BFD_ASSERT (e != NULL);
+  if (e == NULL)
+    return offset;
+  return e->new_address - e->orig_address + offset;
+}
+
+
+/* Build a binary searchable offset translation map from a section's
+   action list.  */
+
+static xlate_map_t *
+build_xlate_map (asection *sec, xtensa_relax_info *relax_info)
+{
+  xlate_map_t *map = (xlate_map_t *) bfd_malloc (sizeof (xlate_map_t));
+  text_action_list *action_list = &relax_info->action_list;
+  unsigned num_actions = 0;
+  text_action *r;
+  int removed;
+  xlate_map_entry_t *current_entry;
+
+  if (map == NULL)
+    return NULL;
+
+  num_actions = action_list_count (action_list);
+  map->entry = (xlate_map_entry_t *) 
+    bfd_malloc (sizeof (xlate_map_entry_t) * (num_actions + 1));
+  if (map->entry == NULL)
+    {
+      free (map);
+      return NULL;
+    }
+  map->entry_count = 0;
+  
+  removed = 0;
+  current_entry = &map->entry[0];
+
+  current_entry->orig_address = 0;
+  current_entry->new_address = 0;
+  current_entry->size = 0;
+
+  for (r = action_list->head; r != NULL; r = r->next)
+    {
+      unsigned orig_size = 0;
+      switch (r->action)
+	{
+	case ta_none:
+	case ta_remove_insn:
+	case ta_convert_longcall:
+	case ta_remove_literal:
+	case ta_add_literal:
+	  break;
+	case ta_remove_longcall:
+	  orig_size = 6;
+	  break;
+	case ta_narrow_insn:
+	  orig_size = 3;
+	  break;
+	case ta_widen_insn:
+	  orig_size = 2;
+	  break;
+	case ta_fill:
+	  break;
+	}
+      current_entry->size =
+	r->offset + orig_size - current_entry->orig_address;
+      if (current_entry->size != 0)
+	{
+	  current_entry++;
+	  map->entry_count++;
+	}
+      current_entry->orig_address = r->offset + orig_size;
+      removed += r->removed_bytes;
+      current_entry->new_address = r->offset + orig_size - removed;
+      current_entry->size = 0;
+    }
+
+  current_entry->size = (bfd_get_section_limit (sec->owner, sec)
+			 - current_entry->orig_address);
+  if (current_entry->size != 0)
+    map->entry_count++;
+
+  return map;
+}
+
+
+/* Free an offset translation map.  */
+
+static void 
+free_xlate_map (xlate_map_t *map)
+{
+  if (map && map->entry)
+    free (map->entry);
+  if (map)
+    free (map);
+}
+
+
+/* Use check_section_ebb_pcrels_fit to make sure that all of the
+   relocations in a section will fit if a proposed set of actions
+   are performed.  */
+
+static bfd_boolean
+check_section_ebb_pcrels_fit (bfd *abfd,
+			      asection *sec,
+			      bfd_byte *contents,
+			      Elf_Internal_Rela *internal_relocs,
+			      const ebb_constraint *constraint,
+			      const xtensa_opcode *reloc_opcodes)
+{
+  unsigned i, j;
+  Elf_Internal_Rela *irel;
+  xlate_map_t *xmap = NULL;
+  bfd_boolean ok = TRUE;
+  xtensa_relax_info *relax_info;
+
+  relax_info = get_xtensa_relax_info (sec);
+
+  if (relax_info && sec->reloc_count > 100)
+    {
+      xmap = build_xlate_map (sec, relax_info);
+      /* NULL indicates out of memory, but the slow version
+	 can still be used.  */
+    }
+
+  for (i = 0; i < sec->reloc_count; i++)
+    {
+      r_reloc r_rel;
+      bfd_vma orig_self_offset, orig_target_offset;
+      bfd_vma self_offset, target_offset;
+      int r_type;
+      reloc_howto_type *howto;
+      int self_removed_bytes, target_removed_bytes;
+
+      irel = &internal_relocs[i];
+      r_type = ELF32_R_TYPE (irel->r_info);
+
+      howto = &elf_howto_table[r_type];
+      /* We maintain the required invariant: PC-relative relocations
+	 that fit before linking must fit after linking.  Thus we only
+	 need to deal with relocations to the same section that are
+	 PC-relative.  */
+      if (r_type == R_XTENSA_ASM_SIMPLIFY
+	  || r_type == R_XTENSA_32_PCREL
+	  || !howto->pc_relative)
+	continue;
+
+      r_reloc_init (&r_rel, abfd, irel, contents,
+		    bfd_get_section_limit (abfd, sec));
+
+      if (r_reloc_get_section (&r_rel) != sec)
+	continue;
+
+      orig_self_offset = irel->r_offset;
+      orig_target_offset = r_rel.target_offset;
+
+      self_offset = orig_self_offset;
+      target_offset = orig_target_offset;
+
+      if (relax_info)
+	{
+	  self_offset =
+	    xlate_offset_with_removed_text (xmap, &relax_info->action_list,
+					    orig_self_offset);
+	  target_offset =
+	    xlate_offset_with_removed_text (xmap, &relax_info->action_list,
+					    orig_target_offset);
+	}
+
+      self_removed_bytes = 0;
+      target_removed_bytes = 0;
+
+      for (j = 0; j < constraint->action_count; ++j)
+	{
+	  proposed_action *action = &constraint->actions[j];
+	  bfd_vma offset = action->offset;
+	  int removed_bytes = action->removed_bytes;
+	  if (offset < orig_self_offset
+	      || (offset == orig_self_offset && action->action == ta_fill
+		  && action->removed_bytes < 0))
+	    self_removed_bytes += removed_bytes;
+	  if (offset < orig_target_offset
+	      || (offset == orig_target_offset && action->action == ta_fill
+		  && action->removed_bytes < 0))
+	    target_removed_bytes += removed_bytes;
+	}
+      self_offset -= self_removed_bytes;
+      target_offset -= target_removed_bytes;
+
+      /* Try to encode it.  Get the operand and check.  */
+      if (is_alt_relocation (ELF32_R_TYPE (irel->r_info)))
+	{
+	  /* None of the current alternate relocs are PC-relative,
+	     and only PC-relative relocs matter here.  */
+	}
+      else
+	{
+	  xtensa_opcode opcode;
+	  int opnum;
+
+	  if (reloc_opcodes)
+	    opcode = reloc_opcodes[i];
+	  else
+	    opcode = get_relocation_opcode (abfd, sec, contents, irel);
+	  if (opcode == XTENSA_UNDEFINED)
+	    {
+	      ok = FALSE;
+	      break;
+	    }
+
+	  opnum = get_relocation_opnd (opcode, ELF32_R_TYPE (irel->r_info));
+	  if (opnum == XTENSA_UNDEFINED)
+	    {
+	      ok = FALSE;
+	      break;
+	    }
+
+	  if (!pcrel_reloc_fits (opcode, opnum, self_offset, target_offset))
+	    {
+	      ok = FALSE;
+	      break;
+	    }
+	}
+    }
+
+  if (xmap)
+    free_xlate_map (xmap);
+
+  return ok;
+}
+
+
+static bfd_boolean
+check_section_ebb_reduces (const ebb_constraint *constraint)
+{
+  int removed = 0;
+  unsigned i;
+
+  for (i = 0; i < constraint->action_count; i++)
+    {
+      const proposed_action *action = &constraint->actions[i];
+      if (action->do_action)
+	removed += action->removed_bytes;
+    }
+  if (removed < 0)
+    return FALSE;
+
+  return TRUE;
+}
+
+
+void
+text_action_add_proposed (text_action_list *l,
+			  const ebb_constraint *ebb_table,
+			  asection *sec)
+{
+  unsigned i;
+
+  for (i = 0; i < ebb_table->action_count; i++)
+    {
+      proposed_action *action = &ebb_table->actions[i];
+
+      if (!action->do_action)
+	continue;
+      switch (action->action)
+	{
+	case ta_remove_insn:
+	case ta_remove_longcall:
+	case ta_convert_longcall:
+	case ta_narrow_insn:
+	case ta_widen_insn:
+	case ta_fill:
+	case ta_remove_literal:
+	  text_action_add (l, action->action, sec, action->offset,
+			   action->removed_bytes);
+	  break;
+	case ta_none:
+	  break;
+	default:
+	  BFD_ASSERT (0);
+	  break;
+	}
+    }
+}
+
+
+int
+compute_fill_extra_space (property_table_entry *entry)
+{
+  int fill_extra_space;
+
+  if (!entry)
+    return 0;
+
+  if ((entry->flags & XTENSA_PROP_UNREACHABLE) == 0)
+    return 0;
+
+  fill_extra_space = entry->size;
+  if ((entry->flags & XTENSA_PROP_ALIGN) != 0)
+    {
+      /* Fill bytes for alignment:
+	 (2**n)-1 - (addr + (2**n)-1) & (2**n -1) */
+      int pow = GET_XTENSA_PROP_ALIGNMENT (entry->flags);
+      int nsm = (1 << pow) - 1;
+      bfd_vma addr = entry->address + entry->size;
+      bfd_vma align_fill = nsm - ((addr + nsm) & nsm);
+      fill_extra_space += align_fill;
+    }
+  return fill_extra_space;
+}
+
+
+/* First relaxation pass.  */
+
+/* If the section contains relaxable literals, check each literal to
+   see if it has the same value as another literal that has already
+   been seen, either in the current section or a previous one.  If so,
+   add an entry to the per-section list of removed literals.  The
+   actual changes are deferred until the next pass.  */
+
+static bfd_boolean 
+compute_removed_literals (bfd *abfd,
+			  asection *sec,
+			  struct bfd_link_info *link_info,
+			  value_map_hash_table *values)
+{
+  xtensa_relax_info *relax_info;
+  bfd_byte *contents;
+  Elf_Internal_Rela *internal_relocs;
+  source_reloc *src_relocs, *rel;
+  bfd_boolean ok = TRUE;
+  property_table_entry *prop_table = NULL;
+  int ptblsize;
+  int i, prev_i;
+  bfd_boolean last_loc_is_prev = FALSE;
+  bfd_vma last_target_offset = 0;
+  section_cache_t target_sec_cache;
+  bfd_size_type sec_size;
+
+  init_section_cache (&target_sec_cache);
+
+  /* Do nothing if it is not a relaxable literal section.  */
+  relax_info = get_xtensa_relax_info (sec);
+  BFD_ASSERT (relax_info);
+  if (!relax_info->is_relaxable_literal_section)
+    return ok;
+
+  internal_relocs = retrieve_internal_relocs (abfd, sec, 
+					      link_info->keep_memory);
+
+  sec_size = bfd_get_section_limit (abfd, sec);
+  contents = retrieve_contents (abfd, sec, link_info->keep_memory);
+  if (contents == NULL && sec_size != 0)
+    {
+      ok = FALSE;
+      goto error_return;
+    }
+
+  /* Sort the source_relocs by target offset.  */
+  src_relocs = relax_info->src_relocs;
+  qsort (src_relocs, relax_info->src_count,
+	 sizeof (source_reloc), source_reloc_compare);
+  qsort (internal_relocs, sec->reloc_count, sizeof (Elf_Internal_Rela),
+	 internal_reloc_compare);
+
+  ptblsize = xtensa_read_table_entries (abfd, sec, &prop_table,
+					XTENSA_PROP_SEC_NAME, FALSE);
+  if (ptblsize < 0)
+    {
+      ok = FALSE;
+      goto error_return;
+    }
+
+  prev_i = -1;
+  for (i = 0; i < relax_info->src_count; i++)
+    {
+      Elf_Internal_Rela *irel = NULL;
+
+      rel = &src_relocs[i];
+      if (get_l32r_opcode () != rel->opcode)
+	continue;
+      irel = get_irel_at_offset (sec, internal_relocs,
+				 rel->r_rel.target_offset);
+
+      /* If the relocation on this is not a simple R_XTENSA_32 or
+	 R_XTENSA_PLT then do not consider it.  This may happen when
+	 the difference of two symbols is used in a literal.  */
+      if (irel && (ELF32_R_TYPE (irel->r_info) != R_XTENSA_32
+		   && ELF32_R_TYPE (irel->r_info) != R_XTENSA_PLT))
+	continue;
+
+      /* If the target_offset for this relocation is the same as the
+	 previous relocation, then we've already considered whether the
+	 literal can be coalesced.  Skip to the next one....  */
+      if (i != 0 && prev_i != -1
+	  && src_relocs[i-1].r_rel.target_offset == rel->r_rel.target_offset)
+	continue;
+      prev_i = i;
+
+      if (last_loc_is_prev && 
+	  last_target_offset + 4 != rel->r_rel.target_offset)
+	last_loc_is_prev = FALSE;
+
+      /* Check if the relocation was from an L32R that is being removed
+	 because a CALLX was converted to a direct CALL, and check if
+	 there are no other relocations to the literal.  */
+      if (is_removable_literal (rel, i, src_relocs, relax_info->src_count, 
+				sec, prop_table, ptblsize))
+	{
+	  if (!remove_dead_literal (abfd, sec, link_info, internal_relocs,
+				    irel, rel, prop_table, ptblsize))
+	    {
+	      ok = FALSE;
+	      goto error_return;
+	    }
+	  last_target_offset = rel->r_rel.target_offset;
+	  continue;
+	}
+
+      if (!identify_literal_placement (abfd, sec, contents, link_info,
+				       values, 
+				       &last_loc_is_prev, irel, 
+				       relax_info->src_count - i, rel,
+				       prop_table, ptblsize,
+				       &target_sec_cache, rel->is_abs_literal))
+	{
+	  ok = FALSE;
+	  goto error_return;
+	}
+      last_target_offset = rel->r_rel.target_offset;
+    }
+
+#if DEBUG
+  print_removed_literals (stderr, &relax_info->removed_list);
+  print_action_list (stderr, &relax_info->action_list);
+#endif /* DEBUG */
+
+error_return:
+  if (prop_table) free (prop_table);
+  clear_section_cache (&target_sec_cache);
+
+  release_contents (sec, contents);
+  release_internal_relocs (sec, internal_relocs);
+  return ok;
+}
+
+
+static Elf_Internal_Rela *
+get_irel_at_offset (asection *sec,
+		    Elf_Internal_Rela *internal_relocs,
+		    bfd_vma offset)
+{
+  unsigned i;
+  Elf_Internal_Rela *irel;
+  unsigned r_type;
+  Elf_Internal_Rela key;
+
+  if (!internal_relocs) 
+    return NULL;
+
+  key.r_offset = offset;
+  irel = bsearch (&key, internal_relocs, sec->reloc_count,
+		  sizeof (Elf_Internal_Rela), internal_reloc_matches);
+  if (!irel)
+    return NULL;
+
+  /* bsearch does not guarantee which will be returned if there are
+     multiple matches.  We need the first that is not an alignment.  */
+  i = irel - internal_relocs;
+  while (i > 0)
+    {
+      if (internal_relocs[i-1].r_offset != offset)
+	break;
+      i--;
+    }
+  for ( ; i < sec->reloc_count; i++)
+    {
+      irel = &internal_relocs[i];
+      r_type = ELF32_R_TYPE (irel->r_info);
+      if (irel->r_offset == offset && r_type != R_XTENSA_NONE)
+	return irel;
+    }
+
+  return NULL;
+}
+
+
+bfd_boolean
+is_removable_literal (const source_reloc *rel,
+		      int i,
+		      const source_reloc *src_relocs,
+		      int src_count,
+		      asection *sec,
+		      property_table_entry *prop_table,
+		      int ptblsize)
+{
+  const source_reloc *curr_rel;
+  property_table_entry *entry;
+
+  if (!rel->is_null)
+    return FALSE;
+  
+  entry = elf_xtensa_find_property_entry (prop_table, ptblsize, 
+					  sec->vma + rel->r_rel.target_offset);
+  if (entry && (entry->flags & XTENSA_PROP_NO_TRANSFORM))
+    return FALSE;
+
+  for (++i; i < src_count; ++i)
+    {
+      curr_rel = &src_relocs[i];
+      /* If all others have the same target offset....  */
+      if (curr_rel->r_rel.target_offset != rel->r_rel.target_offset)
+	return TRUE;
+
+      if (!curr_rel->is_null
+	  && !xtensa_is_property_section (curr_rel->source_sec)
+	  && !(curr_rel->source_sec->flags & SEC_DEBUGGING))
+	return FALSE;
+    }
+  return TRUE;
+}
+
+
+bfd_boolean 
+remove_dead_literal (bfd *abfd,
+		     asection *sec,
+		     struct bfd_link_info *link_info,
+		     Elf_Internal_Rela *internal_relocs,
+		     Elf_Internal_Rela *irel,
+		     source_reloc *rel,
+		     property_table_entry *prop_table,
+		     int ptblsize)
+{
+  property_table_entry *entry;
+  xtensa_relax_info *relax_info;
+
+  relax_info = get_xtensa_relax_info (sec);
+  if (!relax_info)
+    return FALSE;
+
+  entry = elf_xtensa_find_property_entry (prop_table, ptblsize,
+					  sec->vma + rel->r_rel.target_offset);
+
+  /* Mark the unused literal so that it will be removed.  */
+  add_removed_literal (&relax_info->removed_list, &rel->r_rel, NULL);
+
+  text_action_add (&relax_info->action_list,
+		   ta_remove_literal, sec, rel->r_rel.target_offset, 4);
+
+  /* If the section is 4-byte aligned, do not add fill.  */
+  if (sec->alignment_power > 2) 
+    {
+      int fill_extra_space;
+      bfd_vma entry_sec_offset;
+      text_action *fa;
+      property_table_entry *the_add_entry;
+      int removed_diff;
+
+      if (entry)
+	entry_sec_offset = entry->address - sec->vma + entry->size;
+      else
+	entry_sec_offset = rel->r_rel.target_offset + 4;
+
+      /* If the literal range is at the end of the section,
+	 do not add fill.  */
+      the_add_entry = elf_xtensa_find_property_entry (prop_table, ptblsize,
+						      entry_sec_offset);
+      fill_extra_space = compute_fill_extra_space (the_add_entry);
+
+      fa = find_fill_action (&relax_info->action_list, sec, entry_sec_offset);
+      removed_diff = compute_removed_action_diff (fa, sec, entry_sec_offset,
+						  -4, fill_extra_space);
+      if (fa)
+	adjust_fill_action (fa, removed_diff);
+      else
+	text_action_add (&relax_info->action_list,
+			 ta_fill, sec, entry_sec_offset, removed_diff);
+    }
+
+  /* Zero out the relocation on this literal location.  */
+  if (irel)
+    {
+      if (elf_hash_table (link_info)->dynamic_sections_created)
+	shrink_dynamic_reloc_sections (link_info, abfd, sec, irel);
+
+      irel->r_info = ELF32_R_INFO (0, R_XTENSA_NONE);
+      pin_internal_relocs (sec, internal_relocs);
+    }
+
+  /* Do not modify "last_loc_is_prev".  */
+  return TRUE;
+}
+
+
+bfd_boolean 
+identify_literal_placement (bfd *abfd,
+			    asection *sec,
+			    bfd_byte *contents,
+			    struct bfd_link_info *link_info,
+			    value_map_hash_table *values,
+			    bfd_boolean *last_loc_is_prev_p,
+			    Elf_Internal_Rela *irel,
+			    int remaining_src_rels,
+			    source_reloc *rel,
+			    property_table_entry *prop_table,
+			    int ptblsize,
+			    section_cache_t *target_sec_cache,
+			    bfd_boolean is_abs_literal)
+{
+  literal_value val;
+  value_map *val_map;
+  xtensa_relax_info *relax_info;
+  bfd_boolean literal_placed = FALSE;
+  r_reloc r_rel;
+  unsigned long value;
+  bfd_boolean final_static_link;
+  bfd_size_type sec_size;
+
+  relax_info = get_xtensa_relax_info (sec);
+  if (!relax_info)
+    return FALSE;
+
+  sec_size = bfd_get_section_limit (abfd, sec);
+
+  final_static_link =
+    (!link_info->relocatable
+     && !elf_hash_table (link_info)->dynamic_sections_created);
+
+  /* The placement algorithm first checks to see if the literal is
+     already in the value map.  If so and the value map is reachable
+     from all uses, then the literal is moved to that location.  If
+     not, then we identify the last location where a fresh literal was
+     placed.  If the literal can be safely moved there, then we do so.
+     If not, then we assume that the literal is not to move and leave
+     the literal where it is, marking it as the last literal
+     location.  */
+
+  /* Find the literal value.  */
+  value = 0;
+  r_reloc_init (&r_rel, abfd, irel, contents, sec_size);
+  if (!irel)
+    {
+      BFD_ASSERT (rel->r_rel.target_offset < sec_size);
+      value = bfd_get_32 (abfd, contents + rel->r_rel.target_offset);
+    }
+  init_literal_value (&val, &r_rel, value, is_abs_literal);
+
+  /* Check if we've seen another literal with the same value that
+     is in the same output section.  */
+  val_map = value_map_get_cached_value (values, &val, final_static_link);
+
+  if (val_map
+      && (r_reloc_get_section (&val_map->loc)->output_section
+	  == sec->output_section)
+      && relocations_reach (rel, remaining_src_rels, &val_map->loc)
+      && coalesce_shared_literal (sec, rel, prop_table, ptblsize, val_map))
+    {
+      /* No change to last_loc_is_prev.  */
+      literal_placed = TRUE;
+    }
+
+  /* For relocatable links, do not try to move literals.  To do it
+     correctly might increase the number of relocations in an input
+     section making the default relocatable linking fail.  */
+  if (!link_info->relocatable && !literal_placed 
+      && values->has_last_loc && !(*last_loc_is_prev_p))
+    {
+      asection *target_sec = r_reloc_get_section (&values->last_loc);
+      if (target_sec && target_sec->output_section == sec->output_section)
+	{
+	  /* Increment the virtual offset.  */
+	  r_reloc try_loc = values->last_loc;
+	  try_loc.virtual_offset += 4;
+
+	  /* There is a last loc that was in the same output section.  */
+	  if (relocations_reach (rel, remaining_src_rels, &try_loc)
+	      && move_shared_literal (sec, link_info, rel,
+				      prop_table, ptblsize, 
+				      &try_loc, &val, target_sec_cache))
+	    {
+	      values->last_loc.virtual_offset += 4;
+	      literal_placed = TRUE;
+	      if (!val_map)
+		val_map = add_value_map (values, &val, &try_loc,
+					 final_static_link);
+	      else
+		val_map->loc = try_loc;
+	    }
+	}
+    }
+
+  if (!literal_placed)
+    {
+      /* Nothing worked, leave the literal alone but update the last loc.  */
+      values->has_last_loc = TRUE;
+      values->last_loc = rel->r_rel;
+      if (!val_map)
+	val_map = add_value_map (values, &val, &rel->r_rel, final_static_link);
+      else
+	val_map->loc = rel->r_rel;
+      *last_loc_is_prev_p = TRUE;
+    }
+
+  return TRUE;
+}
+
+
+/* Check if the original relocations (presumably on L32R instructions)
+   identified by reloc[0..N] can be changed to reference the literal
+   identified by r_rel.  If r_rel is out of range for any of the
+   original relocations, then we don't want to coalesce the original
+   literal with the one at r_rel.  We only check reloc[0..N], where the
+   offsets are all the same as for reloc[0] (i.e., they're all
+   referencing the same literal) and where N is also bounded by the
+   number of remaining entries in the "reloc" array.  The "reloc" array
+   is sorted by target offset so we know all the entries for the same
+   literal will be contiguous.  */
+
+static bfd_boolean
+relocations_reach (source_reloc *reloc,
+		   int remaining_relocs,
+		   const r_reloc *r_rel)
+{
+  bfd_vma from_offset, source_address, dest_address;
+  asection *sec;
+  int i;
+
+  if (!r_reloc_is_defined (r_rel))
+    return FALSE;
+
+  sec = r_reloc_get_section (r_rel);
+  from_offset = reloc[0].r_rel.target_offset;
+
+  for (i = 0; i < remaining_relocs; i++)
+    {
+      if (reloc[i].r_rel.target_offset != from_offset)
+	break;
+
+      /* Ignore relocations that have been removed.  */
+      if (reloc[i].is_null)
+	continue;
+
+      /* The original and new output section for these must be the same
+         in order to coalesce.  */
+      if (r_reloc_get_section (&reloc[i].r_rel)->output_section
+	  != sec->output_section)
+	return FALSE;
+
+      /* Absolute literals in the same output section can always be
+	 combined.  */
+      if (reloc[i].is_abs_literal)
+	continue;
+
+      /* A literal with no PC-relative relocations can be moved anywhere.  */
+      if (reloc[i].opnd != -1)
+	{
+	  /* Otherwise, check to see that it fits.  */
+	  source_address = (reloc[i].source_sec->output_section->vma
+			    + reloc[i].source_sec->output_offset
+			    + reloc[i].r_rel.rela.r_offset);
+	  dest_address = (sec->output_section->vma
+			  + sec->output_offset
+			  + r_rel->target_offset);
+
+	  if (!pcrel_reloc_fits (reloc[i].opcode, reloc[i].opnd,
+				 source_address, dest_address))
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+
+/* Move a literal to another literal location because it is
+   the same as the other literal value.  */
+
+static bfd_boolean 
+coalesce_shared_literal (asection *sec,
+			 source_reloc *rel,
+			 property_table_entry *prop_table,
+			 int ptblsize,
+			 value_map *val_map)
+{
+  property_table_entry *entry;
+  text_action *fa;
+  property_table_entry *the_add_entry;
+  int removed_diff;
+  xtensa_relax_info *relax_info;
+
+  relax_info = get_xtensa_relax_info (sec);
+  if (!relax_info)
+    return FALSE;
+
+  entry = elf_xtensa_find_property_entry
+    (prop_table, ptblsize, sec->vma + rel->r_rel.target_offset);
+  if (entry && (entry->flags & XTENSA_PROP_NO_TRANSFORM))
+    return TRUE;
+
+  /* Mark that the literal will be coalesced.  */
+  add_removed_literal (&relax_info->removed_list, &rel->r_rel, &val_map->loc);
+
+  text_action_add (&relax_info->action_list,
+		   ta_remove_literal, sec, rel->r_rel.target_offset, 4);
+
+  /* If the section is 4-byte aligned, do not add fill.  */
+  if (sec->alignment_power > 2) 
+    {
+      int fill_extra_space;
+      bfd_vma entry_sec_offset;
+
+      if (entry)
+	entry_sec_offset = entry->address - sec->vma + entry->size;
+      else
+	entry_sec_offset = rel->r_rel.target_offset + 4;
+
+      /* If the literal range is at the end of the section,
+	 do not add fill.  */
+      fill_extra_space = 0;
+      the_add_entry = elf_xtensa_find_property_entry (prop_table, ptblsize,
+						      entry_sec_offset);
+      if (the_add_entry && (the_add_entry->flags & XTENSA_PROP_UNREACHABLE))
+	fill_extra_space = the_add_entry->size;
+
+      fa = find_fill_action (&relax_info->action_list, sec, entry_sec_offset);
+      removed_diff = compute_removed_action_diff (fa, sec, entry_sec_offset,
+						  -4, fill_extra_space);
+      if (fa)
+	adjust_fill_action (fa, removed_diff);
+      else
+	text_action_add (&relax_info->action_list,
+			 ta_fill, sec, entry_sec_offset, removed_diff);
+    }
+
+  return TRUE;
+}
+
+
+/* Move a literal to another location.  This may actually increase the
+   total amount of space used because of alignments so we need to do
+   this carefully.  Also, it may make a branch go out of range.  */
+
+static bfd_boolean 
+move_shared_literal (asection *sec,
+		     struct bfd_link_info *link_info,
+		     source_reloc *rel,
+		     property_table_entry *prop_table,
+		     int ptblsize,
+		     const r_reloc *target_loc,
+		     const literal_value *lit_value,
+		     section_cache_t *target_sec_cache)
+{
+  property_table_entry *the_add_entry, *src_entry, *target_entry = NULL;
+  text_action *fa, *target_fa;
+  int removed_diff;
+  xtensa_relax_info *relax_info, *target_relax_info;
+  asection *target_sec;
+  ebb_t *ebb;
+  ebb_constraint ebb_table;
+  bfd_boolean relocs_fit;
+
+  /* If this routine always returns FALSE, the literals that cannot be
+     coalesced will not be moved.  */
+  if (elf32xtensa_no_literal_movement)
+    return FALSE;
+
+  relax_info = get_xtensa_relax_info (sec);
+  if (!relax_info)
+    return FALSE;
+
+  target_sec = r_reloc_get_section (target_loc);
+  target_relax_info = get_xtensa_relax_info (target_sec);
+
+  /* Literals to undefined sections may not be moved because they
+     must report an error.  */
+  if (bfd_is_und_section (target_sec))
+    return FALSE;
+
+  src_entry = elf_xtensa_find_property_entry
+    (prop_table, ptblsize, sec->vma + rel->r_rel.target_offset);
+
+  if (!section_cache_section (target_sec_cache, target_sec, link_info))
+    return FALSE;
+
+  target_entry = elf_xtensa_find_property_entry
+    (target_sec_cache->ptbl, target_sec_cache->pte_count, 
+     target_sec->vma + target_loc->target_offset);
+
+  if (!target_entry)
+    return FALSE;
+
+  /* Make sure that we have not broken any branches.  */
+  relocs_fit = FALSE;
+
+  init_ebb_constraint (&ebb_table);
+  ebb = &ebb_table.ebb;
+  init_ebb (ebb, target_sec_cache->sec, target_sec_cache->contents, 
+	    target_sec_cache->content_length,
+	    target_sec_cache->ptbl, target_sec_cache->pte_count,
+	    target_sec_cache->relocs, target_sec_cache->reloc_count);
+
+  /* Propose to add 4 bytes + worst-case alignment size increase to
+     destination.  */
+  ebb_propose_action (&ebb_table, EBB_NO_ALIGN, 0,
+		      ta_fill, target_loc->target_offset,
+		      -4 - (1 << target_sec->alignment_power), TRUE);
+
+  /* Check all of the PC-relative relocations to make sure they still fit.  */
+  relocs_fit = check_section_ebb_pcrels_fit (target_sec->owner, target_sec, 
+					     target_sec_cache->contents,
+					     target_sec_cache->relocs,
+					     &ebb_table, NULL);
+
+  if (!relocs_fit) 
+    return FALSE;
+
+  text_action_add_literal (&target_relax_info->action_list,
+			   ta_add_literal, target_loc, lit_value, -4);
+
+  if (target_sec->alignment_power > 2 && target_entry != src_entry) 
+    {
+      /* May need to add or remove some fill to maintain alignment.  */
+      int fill_extra_space;
+      bfd_vma entry_sec_offset;
+
+      entry_sec_offset = 
+	target_entry->address - target_sec->vma + target_entry->size;
+
+      /* If the literal range is at the end of the section,
+	 do not add fill.  */
+      fill_extra_space = 0;
+      the_add_entry =
+	elf_xtensa_find_property_entry (target_sec_cache->ptbl,
+					target_sec_cache->pte_count,
+					entry_sec_offset);
+      if (the_add_entry && (the_add_entry->flags & XTENSA_PROP_UNREACHABLE))
+	fill_extra_space = the_add_entry->size;
+
+      target_fa = find_fill_action (&target_relax_info->action_list,
+				    target_sec, entry_sec_offset);
+      removed_diff = compute_removed_action_diff (target_fa, target_sec,
+						  entry_sec_offset, 4,
+						  fill_extra_space);
+      if (target_fa)
+	adjust_fill_action (target_fa, removed_diff);
+      else
+	text_action_add (&target_relax_info->action_list,
+			 ta_fill, target_sec, entry_sec_offset, removed_diff);
+    }
+
+  /* Mark that the literal will be moved to the new location.  */
+  add_removed_literal (&relax_info->removed_list, &rel->r_rel, target_loc);
+
+  /* Remove the literal.  */
+  text_action_add (&relax_info->action_list,
+		   ta_remove_literal, sec, rel->r_rel.target_offset, 4);
+
+  /* If the section is 4-byte aligned, do not add fill.  */
+  if (sec->alignment_power > 2 && target_entry != src_entry) 
+    {
+      int fill_extra_space;
+      bfd_vma entry_sec_offset;
+
+      if (src_entry)
+	entry_sec_offset = src_entry->address - sec->vma + src_entry->size;
+      else
+	entry_sec_offset = rel->r_rel.target_offset+4;
+
+      /* If the literal range is at the end of the section,
+	 do not add fill.  */
+      fill_extra_space = 0;
+      the_add_entry = elf_xtensa_find_property_entry (prop_table, ptblsize,
+						      entry_sec_offset);
+      if (the_add_entry && (the_add_entry->flags & XTENSA_PROP_UNREACHABLE))
+	fill_extra_space = the_add_entry->size;
+
+      fa = find_fill_action (&relax_info->action_list, sec, entry_sec_offset);
+      removed_diff = compute_removed_action_diff (fa, sec, entry_sec_offset,
+						  -4, fill_extra_space);
+      if (fa)
+	adjust_fill_action (fa, removed_diff);
+      else
+	text_action_add (&relax_info->action_list,
+			 ta_fill, sec, entry_sec_offset, removed_diff);
+    }
+
+  return TRUE;
+}
+
+
+/* Second relaxation pass.  */
+
+/* Modify all of the relocations to point to the right spot, and if this
+   is a relaxable section, delete the unwanted literals and fix the
+   section size.  */
+
+bfd_boolean
+relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+{
+  Elf_Internal_Rela *internal_relocs;
+  xtensa_relax_info *relax_info;
+  bfd_byte *contents;
+  bfd_boolean ok = TRUE;
+  unsigned i;
+  bfd_boolean rv = FALSE;
+  bfd_boolean virtual_action;
+  bfd_size_type sec_size;
+
+  sec_size = bfd_get_section_limit (abfd, sec);
+  relax_info = get_xtensa_relax_info (sec);
+  BFD_ASSERT (relax_info);
+
+  /* First translate any of the fixes that have been added already.  */
+  translate_section_fixes (sec);
+
+  /* Handle property sections (e.g., literal tables) specially.  */
+  if (xtensa_is_property_section (sec))
+    {
+      BFD_ASSERT (!relax_info->is_relaxable_literal_section);
+      return relax_property_section (abfd, sec, link_info);
+    }
+
+  internal_relocs = retrieve_internal_relocs (abfd, sec, 
+					      link_info->keep_memory);
+  if (!internal_relocs && !relax_info->action_list.head)
+    return TRUE;
+
+  contents = retrieve_contents (abfd, sec, link_info->keep_memory);
+  if (contents == NULL && sec_size != 0)
+    {
+      ok = FALSE;
+      goto error_return;
+    }
+
+  if (internal_relocs)
+    {
+      for (i = 0; i < sec->reloc_count; i++)
+	{
+	  Elf_Internal_Rela *irel;
+	  xtensa_relax_info *target_relax_info;
+	  bfd_vma source_offset, old_source_offset;
+	  r_reloc r_rel;
+	  unsigned r_type;
+	  asection *target_sec;
+
+	  /* Locally change the source address.
+	     Translate the target to the new target address.
+	     If it points to this section and has been removed,
+	     NULLify it.
+	     Write it back.  */
+
+	  irel = &internal_relocs[i];
+	  source_offset = irel->r_offset;
+	  old_source_offset = source_offset;
+
+	  r_type = ELF32_R_TYPE (irel->r_info);
+	  r_reloc_init (&r_rel, abfd, irel, contents,
+			bfd_get_section_limit (abfd, sec));
+
+	  /* If this section could have changed then we may need to
+	     change the relocation's offset.  */
+
+	  if (relax_info->is_relaxable_literal_section
+	      || relax_info->is_relaxable_asm_section)
+	    {
+	      pin_internal_relocs (sec, internal_relocs);
+
+	      if (r_type != R_XTENSA_NONE
+		  && find_removed_literal (&relax_info->removed_list,
+					   irel->r_offset))
+		{
+		  /* Remove this relocation.  */
+		  if (elf_hash_table (link_info)->dynamic_sections_created)
+		    shrink_dynamic_reloc_sections (link_info, abfd, sec, irel);
+		  irel->r_info = ELF32_R_INFO (0, R_XTENSA_NONE);
+		  irel->r_offset = offset_with_removed_text
+		    (&relax_info->action_list, irel->r_offset);
+		  continue;
+		}
+
+	      if (r_type == R_XTENSA_ASM_SIMPLIFY)
+		{
+		  text_action *action =
+		    find_insn_action (&relax_info->action_list,
+				      irel->r_offset);
+		  if (action && (action->action == ta_convert_longcall
+				 || action->action == ta_remove_longcall))
+		    {
+		      bfd_reloc_status_type retval;
+		      char *error_message = NULL;
+
+		      retval = contract_asm_expansion (contents, sec_size,
+						       irel, &error_message);
+		      if (retval != bfd_reloc_ok)
+			{
+			  (*link_info->callbacks->reloc_dangerous)
+			    (link_info, error_message, abfd, sec,
+			     irel->r_offset);
+			  goto error_return;
+			}
+		      /* Update the action so that the code that moves
+			 the contents will do the right thing.  */
+		      if (action->action == ta_remove_longcall)
+			action->action = ta_remove_insn;
+		      else
+			action->action = ta_none;
+		      /* Refresh the info in the r_rel.  */
+		      r_reloc_init (&r_rel, abfd, irel, contents, sec_size);
+		      r_type = ELF32_R_TYPE (irel->r_info);
+		    }
+		}
+
+	      source_offset = offset_with_removed_text
+		(&relax_info->action_list, irel->r_offset);
+	      irel->r_offset = source_offset;
+	    }
+
+	  /* If the target section could have changed then
+	     we may need to change the relocation's target offset.  */
+
+	  target_sec = r_reloc_get_section (&r_rel);
+
+	  /* For a reference to a discarded section from a DWARF section,
+	     i.e., where action_discarded is PRETEND, the symbol will
+	     eventually be modified to refer to the kept section (at least if
+	     the kept and discarded sections are the same size).  Anticipate
+	     that here and adjust things accordingly.  */
+	  if (! elf_xtensa_ignore_discarded_relocs (sec)
+	      && elf_xtensa_action_discarded (sec) == PRETEND
+	      && sec->sec_info_type != ELF_INFO_TYPE_STABS
+	      && target_sec != NULL
+	      && elf_discarded_section (target_sec))
+	    {
+	      /* It would be natural to call _bfd_elf_check_kept_section
+		 here, but it's not exported from elflink.c.  It's also a
+		 fairly expensive check.  Adjusting the relocations to the
+		 discarded section is fairly harmless; it will only adjust
+		 some addends and difference values.  If it turns out that
+		 _bfd_elf_check_kept_section fails later, it won't matter,
+		 so just compare the section names to find the right group
+		 member.  */
+	      asection *kept = target_sec->kept_section;
+	      if (kept != NULL)
+		{
+		  if ((kept->flags & SEC_GROUP) != 0)
+		    {
+		      asection *first = elf_next_in_group (kept);
+		      asection *s = first;
+
+		      kept = NULL;
+		      while (s != NULL)
+			{
+			  if (strcmp (s->name, target_sec->name) == 0)
+			    {
+			      kept = s;
+			      break;
+			    }
+			  s = elf_next_in_group (s);
+			  if (s == first)
+			    break;
+			}
+		    }
+		}
+	      if (kept != NULL
+		  && ((target_sec->rawsize != 0
+		       ? target_sec->rawsize : target_sec->size)
+		      == (kept->rawsize != 0 ? kept->rawsize : kept->size)))
+		target_sec = kept;
+	    }
+
+	  target_relax_info = get_xtensa_relax_info (target_sec);
+	  if (target_relax_info
+	      && (target_relax_info->is_relaxable_literal_section
+		  || target_relax_info->is_relaxable_asm_section))
+	    {
+	      r_reloc new_reloc;
+	      target_sec = translate_reloc (&r_rel, &new_reloc, target_sec);
+
+	      if (r_type == R_XTENSA_DIFF8
+		  || r_type == R_XTENSA_DIFF16
+		  || r_type == R_XTENSA_DIFF32)
+		{
+		  bfd_vma diff_value = 0, new_end_offset, diff_mask = 0;
+
+		  if (bfd_get_section_limit (abfd, sec) < old_source_offset)
+		    {
+		      (*link_info->callbacks->reloc_dangerous)
+			(link_info, _("invalid relocation address"),
+			 abfd, sec, old_source_offset);
+		      goto error_return;
+		    }
+
+		  switch (r_type)
+		    {
+		    case R_XTENSA_DIFF8:
+		      diff_value =
+			bfd_get_8 (abfd, &contents[old_source_offset]);
+		      break;
+		    case R_XTENSA_DIFF16:
+		      diff_value =
+			bfd_get_16 (abfd, &contents[old_source_offset]);
+		      break;
+		    case R_XTENSA_DIFF32:
+		      diff_value =
+			bfd_get_32 (abfd, &contents[old_source_offset]);
+		      break;
+		    }
+
+		  new_end_offset = offset_with_removed_text
+		    (&target_relax_info->action_list,
+		     r_rel.target_offset + diff_value);
+		  diff_value = new_end_offset - new_reloc.target_offset;
+
+		  switch (r_type)
+		    {
+		    case R_XTENSA_DIFF8:
+		      diff_mask = 0xff;
+		      bfd_put_8 (abfd, diff_value,
+				 &contents[old_source_offset]);
+		      break;
+		    case R_XTENSA_DIFF16:
+		      diff_mask = 0xffff;
+		      bfd_put_16 (abfd, diff_value,
+				  &contents[old_source_offset]);
+		      break;
+		    case R_XTENSA_DIFF32:
+		      diff_mask = 0xffffffff;
+		      bfd_put_32 (abfd, diff_value,
+				  &contents[old_source_offset]);
+		      break;
+		    }
+
+		  /* Check for overflow.  */
+		  if ((diff_value & ~diff_mask) != 0)
+		    {
+		      (*link_info->callbacks->reloc_dangerous)
+			(link_info, _("overflow after relaxation"),
+			 abfd, sec, old_source_offset);
+		      goto error_return;
+		    }
+
+		  pin_contents (sec, contents);
+		}
+
+	      /* If the relocation still references a section in the same
+		 input file, modify the relocation directly instead of
+		 adding a "fix" record.  */
+	      if (target_sec->owner == abfd)
+		{
+		  unsigned r_symndx = ELF32_R_SYM (new_reloc.rela.r_info);
+		  irel->r_info = ELF32_R_INFO (r_symndx, r_type);
+		  irel->r_addend = new_reloc.rela.r_addend;
+		  pin_internal_relocs (sec, internal_relocs);
+		}
+	      else
+		{
+		  bfd_vma addend_displacement;
+		  reloc_bfd_fix *fix;
+
+		  addend_displacement =
+		    new_reloc.target_offset + new_reloc.virtual_offset;
+		  fix = reloc_bfd_fix_init (sec, source_offset, r_type,
+					    target_sec,
+					    addend_displacement, TRUE);
+		  add_fix (sec, fix);
+		}
+	    }
+	}
+    }
+
+  if ((relax_info->is_relaxable_literal_section
+       || relax_info->is_relaxable_asm_section)
+      && relax_info->action_list.head)
+    {
+      /* Walk through the planned actions and build up a table
+	 of move, copy and fill records.  Use the move, copy and
+	 fill records to perform the actions once.  */
+
+      int removed = 0;
+      bfd_size_type final_size, copy_size, orig_insn_size;
+      bfd_byte *scratch = NULL;
+      bfd_byte *dup_contents = NULL;
+      bfd_size_type orig_size = sec->size;
+      bfd_vma orig_dot = 0;
+      bfd_vma orig_dot_copied = 0; /* Byte copied already from
+					    orig dot in physical memory.  */
+      bfd_vma orig_dot_vo = 0; /* Virtual offset from orig_dot.  */
+      bfd_vma dup_dot = 0;
+
+      text_action *action = relax_info->action_list.head;
+
+      final_size = sec->size;
+      for (action = relax_info->action_list.head; action;
+	   action = action->next)
+	{
+	  final_size -= action->removed_bytes;
+	}
+
+      scratch = (bfd_byte *) bfd_zmalloc (final_size);
+      dup_contents = (bfd_byte *) bfd_zmalloc (final_size);
+
+      /* The dot is the current fill location.  */
+#if DEBUG
+      print_action_list (stderr, &relax_info->action_list);
+#endif
+
+      for (action = relax_info->action_list.head; action;
+	   action = action->next)
+	{
+	  virtual_action = FALSE;
+	  if (action->offset > orig_dot)
+	    {
+	      orig_dot += orig_dot_copied;
+	      orig_dot_copied = 0;
+	      orig_dot_vo = 0;
+	      /* Out of the virtual world.  */
+	    }
+
+	  if (action->offset > orig_dot)
+	    {
+	      copy_size = action->offset - orig_dot;
+	      memmove (&dup_contents[dup_dot], &contents[orig_dot], copy_size);
+	      orig_dot += copy_size;
+	      dup_dot += copy_size;
+	      BFD_ASSERT (action->offset == orig_dot);
+	    }
+	  else if (action->offset < orig_dot)
+	    {
+	      if (action->action == ta_fill
+		  && action->offset - action->removed_bytes == orig_dot)
+		{
+		  /* This is OK because the fill only effects the dup_dot.  */
+		}
+	      else if (action->action == ta_add_literal)
+		{
+		  /* TBD.  Might need to handle this.  */
+		}
+	    }
+	  if (action->offset == orig_dot)
+	    {
+	      if (action->virtual_offset > orig_dot_vo)
+		{
+		  if (orig_dot_vo == 0)
+		    {
+		      /* Need to copy virtual_offset bytes.  Probably four.  */
+		      copy_size = action->virtual_offset - orig_dot_vo;
+		      memmove (&dup_contents[dup_dot],
+			       &contents[orig_dot], copy_size);
+		      orig_dot_copied = copy_size;
+		      dup_dot += copy_size;
+		    }
+		  virtual_action = TRUE;
+		} 
+	      else
+		BFD_ASSERT (action->virtual_offset <= orig_dot_vo);
+	    }
+	  switch (action->action)
+	    {
+	    case ta_remove_literal:
+	    case ta_remove_insn:
+	      BFD_ASSERT (action->removed_bytes >= 0);
+	      orig_dot += action->removed_bytes;
+	      break;
+
+	    case ta_narrow_insn:
+	      orig_insn_size = 3;
+	      copy_size = 2;
+	      memmove (scratch, &contents[orig_dot], orig_insn_size);
+	      BFD_ASSERT (action->removed_bytes == 1);
+	      rv = narrow_instruction (scratch, final_size, 0);
+	      BFD_ASSERT (rv);
+	      memmove (&dup_contents[dup_dot], scratch, copy_size);
+	      orig_dot += orig_insn_size;
+	      dup_dot += copy_size;
+	      break;
+
+	    case ta_fill:
+	      if (action->removed_bytes >= 0)
+		orig_dot += action->removed_bytes;
+	      else
+		{
+		  /* Already zeroed in dup_contents.  Just bump the
+		     counters.  */
+		  dup_dot += (-action->removed_bytes);
+		}
+	      break;
+
+	    case ta_none:
+	      BFD_ASSERT (action->removed_bytes == 0);
+	      break;
+
+	    case ta_convert_longcall:
+	    case ta_remove_longcall:
+	      /* These will be removed or converted before we get here.  */
+	      BFD_ASSERT (0);
+	      break;
+
+	    case ta_widen_insn:
+	      orig_insn_size = 2;
+	      copy_size = 3;
+	      memmove (scratch, &contents[orig_dot], orig_insn_size);
+	      BFD_ASSERT (action->removed_bytes == -1);
+	      rv = widen_instruction (scratch, final_size, 0);
+	      BFD_ASSERT (rv);
+	      memmove (&dup_contents[dup_dot], scratch, copy_size);
+	      orig_dot += orig_insn_size;
+	      dup_dot += copy_size;
+	      break;
+
+	    case ta_add_literal:
+	      orig_insn_size = 0;
+	      copy_size = 4;
+	      BFD_ASSERT (action->removed_bytes == -4);
+	      /* TBD -- place the literal value here and insert
+		 into the table.  */
+	      memset (&dup_contents[dup_dot], 0, 4);
+	      pin_internal_relocs (sec, internal_relocs);
+	      pin_contents (sec, contents);
+
+	      if (!move_literal (abfd, link_info, sec, dup_dot, dup_contents,
+				 relax_info, &internal_relocs, &action->value))
+		goto error_return;
+
+	      if (virtual_action) 
+		orig_dot_vo += copy_size;
+
+	      orig_dot += orig_insn_size;
+	      dup_dot += copy_size;
+	      break;
+
+	    default:
+	      /* Not implemented yet.  */
+	      BFD_ASSERT (0);
+	      break;
+	    }
+
+	  removed += action->removed_bytes;
+	  BFD_ASSERT (dup_dot <= final_size);
+	  BFD_ASSERT (orig_dot <= orig_size);
+	}
+
+      orig_dot += orig_dot_copied;
+      orig_dot_copied = 0;
+
+      if (orig_dot != orig_size)
+	{
+	  copy_size = orig_size - orig_dot;
+	  BFD_ASSERT (orig_size > orig_dot);
+	  BFD_ASSERT (dup_dot + copy_size == final_size);
+	  memmove (&dup_contents[dup_dot], &contents[orig_dot], copy_size);
+	  orig_dot += copy_size;
+	  dup_dot += copy_size;
+	}
+      BFD_ASSERT (orig_size == orig_dot);
+      BFD_ASSERT (final_size == dup_dot);
+
+      /* Move the dup_contents back.  */
+      if (final_size > orig_size)
+	{
+	  /* Contents need to be reallocated.  Swap the dup_contents into
+	     contents.  */
+	  sec->contents = dup_contents;
+	  free (contents);
+	  contents = dup_contents;
+	  pin_contents (sec, contents);
+	}
+      else
+	{
+	  BFD_ASSERT (final_size <= orig_size);
+	  memset (contents, 0, orig_size);
+	  memcpy (contents, dup_contents, final_size);
+	  free (dup_contents);
+	}
+      free (scratch);
+      pin_contents (sec, contents);
+
+      if (sec->rawsize == 0)
+	sec->rawsize = sec->size;
+      sec->size = final_size;
+    }
+
+ error_return:
+  release_internal_relocs (sec, internal_relocs);
+  release_contents (sec, contents);
+  return ok;
+}
+
+
+static bfd_boolean 
+translate_section_fixes (asection *sec)
+{
+  xtensa_relax_info *relax_info;
+  reloc_bfd_fix *r;
+
+  relax_info = get_xtensa_relax_info (sec);
+  if (!relax_info)
+    return TRUE;
+
+  for (r = relax_info->fix_list; r != NULL; r = r->next)
+    if (!translate_reloc_bfd_fix (r))
+      return FALSE;
+
+  return TRUE;
+}
+
+
+/* Translate a fix given the mapping in the relax info for the target
+   section.  If it has already been translated, no work is required.  */
+
+static bfd_boolean 
+translate_reloc_bfd_fix (reloc_bfd_fix *fix)
+{
+  reloc_bfd_fix new_fix;
+  asection *sec;
+  xtensa_relax_info *relax_info;
+  removed_literal *removed;
+  bfd_vma new_offset, target_offset;
+
+  if (fix->translated)
+    return TRUE;
+
+  sec = fix->target_sec;
+  target_offset = fix->target_offset;
+
+  relax_info = get_xtensa_relax_info (sec);
+  if (!relax_info)
+    {
+      fix->translated = TRUE;
+      return TRUE;
+    }
+
+  new_fix = *fix;
+
+  /* The fix does not need to be translated if the section cannot change.  */
+  if (!relax_info->is_relaxable_literal_section
+      && !relax_info->is_relaxable_asm_section)
+    {
+      fix->translated = TRUE;
+      return TRUE;
+    }
+
+  /* If the literal has been moved and this relocation was on an
+     opcode, then the relocation should move to the new literal
+     location.  Otherwise, the relocation should move within the
+     section.  */
+
+  removed = FALSE;
+  if (is_operand_relocation (fix->src_type))
+    {
+      /* Check if the original relocation is against a literal being
+	 removed.  */
+      removed = find_removed_literal (&relax_info->removed_list,
+				      target_offset);
+    }
+
+  if (removed) 
+    {
+      asection *new_sec;
+
+      /* The fact that there is still a relocation to this literal indicates
+	 that the literal is being coalesced, not simply removed.  */
+      BFD_ASSERT (removed->to.abfd != NULL);
+
+      /* This was moved to some other address (possibly another section).  */
+      new_sec = r_reloc_get_section (&removed->to);
+      if (new_sec != sec) 
+	{
+	  sec = new_sec;
+	  relax_info = get_xtensa_relax_info (sec);
+	  if (!relax_info || 
+	      (!relax_info->is_relaxable_literal_section
+	       && !relax_info->is_relaxable_asm_section))
+	    {
+	      target_offset = removed->to.target_offset;
+	      new_fix.target_sec = new_sec;
+	      new_fix.target_offset = target_offset;
+	      new_fix.translated = TRUE;
+	      *fix = new_fix;
+	      return TRUE;
+	    }
+	}
+      target_offset = removed->to.target_offset;
+      new_fix.target_sec = new_sec;
+    }
+
+  /* The target address may have been moved within its section.  */
+  new_offset = offset_with_removed_text (&relax_info->action_list,
+					 target_offset);
+
+  new_fix.target_offset = new_offset;
+  new_fix.target_offset = new_offset;
+  new_fix.translated = TRUE;
+  *fix = new_fix;
+  return TRUE;
+}
+
+
+/* Fix up a relocation to take account of removed literals.  */
+
+static asection *
+translate_reloc (const r_reloc *orig_rel, r_reloc *new_rel, asection *sec)
+{
+  xtensa_relax_info *relax_info;
+  removed_literal *removed;
+  bfd_vma target_offset, base_offset;
+  text_action *act;
+
+  *new_rel = *orig_rel;
+
+  if (!r_reloc_is_defined (orig_rel))
+    return sec ;
+
+  relax_info = get_xtensa_relax_info (sec);
+  BFD_ASSERT (relax_info && (relax_info->is_relaxable_literal_section
+			     || relax_info->is_relaxable_asm_section));
+
+  target_offset = orig_rel->target_offset;
+
+  removed = FALSE;
+  if (is_operand_relocation (ELF32_R_TYPE (orig_rel->rela.r_info)))
+    {
+      /* Check if the original relocation is against a literal being
+	 removed.  */
+      removed = find_removed_literal (&relax_info->removed_list,
+				      target_offset);
+    }
+  if (removed && removed->to.abfd)
+    {
+      asection *new_sec;
+
+      /* The fact that there is still a relocation to this literal indicates
+	 that the literal is being coalesced, not simply removed.  */
+      BFD_ASSERT (removed->to.abfd != NULL);
+
+      /* This was moved to some other address
+	 (possibly in another section).  */
+      *new_rel = removed->to;
+      new_sec = r_reloc_get_section (new_rel);
+      if (new_sec != sec)
+	{
+	  sec = new_sec;
+	  relax_info = get_xtensa_relax_info (sec);
+	  if (!relax_info
+	      || (!relax_info->is_relaxable_literal_section
+		  && !relax_info->is_relaxable_asm_section))
+	    return sec;
+	}
+      target_offset = new_rel->target_offset;
+    }
+
+  /* Find the base offset of the reloc symbol, excluding any addend from the
+     reloc or from the section contents (for a partial_inplace reloc).  Then
+     find the adjusted values of the offsets due to relaxation.  The base
+     offset is needed to determine the change to the reloc's addend; the reloc
+     addend should not be adjusted due to relaxations located before the base
+     offset.  */
+
+  base_offset = r_reloc_get_target_offset (new_rel) - new_rel->rela.r_addend;
+  act = relax_info->action_list.head;
+  if (base_offset <= target_offset)
+    {
+      int base_removed = removed_by_actions (&act, base_offset, FALSE);
+      int addend_removed = removed_by_actions (&act, target_offset, FALSE);
+      new_rel->target_offset = target_offset - base_removed - addend_removed;
+      new_rel->rela.r_addend -= addend_removed;
+    }
+  else
+    {
+      /* Handle a negative addend.  The base offset comes first.  */
+      int tgt_removed = removed_by_actions (&act, target_offset, FALSE);
+      int addend_removed = removed_by_actions (&act, base_offset, FALSE);
+      new_rel->target_offset = target_offset - tgt_removed;
+      new_rel->rela.r_addend += addend_removed;
+    }
+
+  return sec;
+}
+
+
+/* For dynamic links, there may be a dynamic relocation for each
+   literal.  The number of dynamic relocations must be computed in
+   size_dynamic_sections, which occurs before relaxation.  When a
+   literal is removed, this function checks if there is a corresponding
+   dynamic relocation and shrinks the size of the appropriate dynamic
+   relocation section accordingly.  At this point, the contents of the
+   dynamic relocation sections have not yet been filled in, so there's
+   nothing else that needs to be done.  */
+
+static void
+shrink_dynamic_reloc_sections (struct bfd_link_info *info,
+			       bfd *abfd,
+			       asection *input_section,
+			       Elf_Internal_Rela *rel)
+{
+  struct elf_xtensa_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  unsigned long r_symndx;
+  int r_type;
+  struct elf_link_hash_entry *h;
+  bfd_boolean dynamic_symbol;
+
+  htab = elf_xtensa_hash_table (info);
+  if (htab == NULL)
+    return;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  r_type = ELF32_R_TYPE (rel->r_info);
+  r_symndx = ELF32_R_SYM (rel->r_info);
+
+  if (r_symndx < symtab_hdr->sh_info)
+    h = NULL;
+  else
+    h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+
+  dynamic_symbol = elf_xtensa_dynamic_symbol_p (h, info);
+
+  if ((r_type == R_XTENSA_32 || r_type == R_XTENSA_PLT)
+      && (input_section->flags & SEC_ALLOC) != 0
+      && (dynamic_symbol || info->shared))
+    {
+      asection *srel;
+      bfd_boolean is_plt = FALSE;
+
+      if (dynamic_symbol && r_type == R_XTENSA_PLT)
+	{
+	  srel = htab->srelplt;
+	  is_plt = TRUE;
+	}
+      else
+	srel = htab->srelgot;
+
+      /* Reduce size of the .rela.* section by one reloc.  */
+      BFD_ASSERT (srel != NULL);
+      BFD_ASSERT (srel->size >= sizeof (Elf32_External_Rela));
+      srel->size -= sizeof (Elf32_External_Rela);
+
+      if (is_plt)
+	{
+	  asection *splt, *sgotplt, *srelgot;
+	  int reloc_index, chunk;
+
+	  /* Find the PLT reloc index of the entry being removed.  This
+	     is computed from the size of ".rela.plt".  It is needed to
+	     figure out which PLT chunk to resize.  Usually "last index
+	     = size - 1" since the index starts at zero, but in this
+	     context, the size has just been decremented so there's no
+	     need to subtract one.  */
+	  reloc_index = srel->size / sizeof (Elf32_External_Rela);
+
+	  chunk = reloc_index / PLT_ENTRIES_PER_CHUNK;
+	  splt = elf_xtensa_get_plt_section (info, chunk);
+	  sgotplt = elf_xtensa_get_gotplt_section (info, chunk);
+	  BFD_ASSERT (splt != NULL && sgotplt != NULL);
+
+	  /* Check if an entire PLT chunk has just been eliminated.  */
+	  if (reloc_index % PLT_ENTRIES_PER_CHUNK == 0)
+	    {
+	      /* The two magic GOT entries for that chunk can go away.  */
+	      srelgot = htab->srelgot;
+	      BFD_ASSERT (srelgot != NULL);
+	      srelgot->reloc_count -= 2;
+	      srelgot->size -= 2 * sizeof (Elf32_External_Rela);
+	      sgotplt->size -= 8;
+
+	      /* There should be only one entry left (and it will be
+		 removed below).  */
+	      BFD_ASSERT (sgotplt->size == 4);
+	      BFD_ASSERT (splt->size == PLT_ENTRY_SIZE);
+	    }
+
+	  BFD_ASSERT (sgotplt->size >= 4);
+	  BFD_ASSERT (splt->size >= PLT_ENTRY_SIZE);
+
+	  sgotplt->size -= 4;
+	  splt->size -= PLT_ENTRY_SIZE;
+	}
+    }
+}
+
+
+/* Take an r_rel and move it to another section.  This usually
+   requires extending the interal_relocation array and pinning it.  If
+   the original r_rel is from the same BFD, we can complete this here.
+   Otherwise, we add a fix record to let the final link fix the
+   appropriate address.  Contents and internal relocations for the
+   section must be pinned after calling this routine.  */
+
+static bfd_boolean
+move_literal (bfd *abfd,
+	      struct bfd_link_info *link_info,
+	      asection *sec,
+	      bfd_vma offset,
+	      bfd_byte *contents,
+	      xtensa_relax_info *relax_info,
+	      Elf_Internal_Rela **internal_relocs_p,
+	      const literal_value *lit)
+{
+  Elf_Internal_Rela *new_relocs = NULL;
+  size_t new_relocs_count = 0;
+  Elf_Internal_Rela this_rela;
+  const r_reloc *r_rel;
+
+  r_rel = &lit->r_rel;
+  BFD_ASSERT (elf_section_data (sec)->relocs == *internal_relocs_p);
+
+  if (r_reloc_is_const (r_rel))
+    bfd_put_32 (abfd, lit->value, contents + offset);
+  else
+    {
+      int r_type;
+      unsigned i;
+      reloc_bfd_fix *fix;
+      unsigned insert_at;
+
+      r_type = ELF32_R_TYPE (r_rel->rela.r_info);
+
+      /* This is the difficult case.  We have to create a fix up.  */
+      this_rela.r_offset = offset;
+      this_rela.r_info = ELF32_R_INFO (0, r_type);
+      this_rela.r_addend =
+	r_rel->target_offset - r_reloc_get_target_offset (r_rel);
+      bfd_put_32 (abfd, lit->value, contents + offset);
+
+      /* Currently, we cannot move relocations during a relocatable link.  */
+      BFD_ASSERT (!link_info->relocatable);
+      fix = reloc_bfd_fix_init (sec, offset, r_type,
+				r_reloc_get_section (r_rel),
+				r_rel->target_offset + r_rel->virtual_offset,
+				FALSE);
+      /* We also need to mark that relocations are needed here.  */
+      sec->flags |= SEC_RELOC;
+
+      translate_reloc_bfd_fix (fix);
+      /* This fix has not yet been translated.  */
+      add_fix (sec, fix);
+
+      /* Add the relocation.  If we have already allocated our own
+	 space for the relocations and we have room for more, then use
+	 it.  Otherwise, allocate new space and move the literals.  */
+      insert_at = sec->reloc_count;
+      for (i = 0; i < sec->reloc_count; ++i)
+	{
+	  if (this_rela.r_offset < (*internal_relocs_p)[i].r_offset)
+	    {
+	      insert_at = i;
+	      break;
+	    }
+	}
+
+      if (*internal_relocs_p != relax_info->allocated_relocs
+	  || sec->reloc_count + 1 > relax_info->allocated_relocs_count)
+	{
+	  BFD_ASSERT (relax_info->allocated_relocs == NULL
+		      || sec->reloc_count == relax_info->relocs_count);
+
+	  if (relax_info->allocated_relocs_count == 0) 
+	    new_relocs_count = (sec->reloc_count + 2) * 2;
+	  else
+	    new_relocs_count = (relax_info->allocated_relocs_count + 2) * 2;
+
+	  new_relocs = (Elf_Internal_Rela *)
+	    bfd_zmalloc (sizeof (Elf_Internal_Rela) * (new_relocs_count));
+	  if (!new_relocs)
+	    return FALSE;
+
+	  /* We could handle this more quickly by finding the split point.  */
+	  if (insert_at != 0)
+	    memcpy (new_relocs, *internal_relocs_p,
+		    insert_at * sizeof (Elf_Internal_Rela));
+
+	  new_relocs[insert_at] = this_rela;
+
+	  if (insert_at != sec->reloc_count)
+	    memcpy (new_relocs + insert_at + 1,
+		    (*internal_relocs_p) + insert_at,
+		    (sec->reloc_count - insert_at) 
+		    * sizeof (Elf_Internal_Rela));
+
+	  if (*internal_relocs_p != relax_info->allocated_relocs)
+	    {
+	      /* The first time we re-allocate, we can only free the
+		 old relocs if they were allocated with bfd_malloc.
+		 This is not true when keep_memory is in effect.  */
+	      if (!link_info->keep_memory)
+		free (*internal_relocs_p);
+	    }
+	  else
+	    free (*internal_relocs_p);
+	  relax_info->allocated_relocs = new_relocs;
+	  relax_info->allocated_relocs_count = new_relocs_count;
+	  elf_section_data (sec)->relocs = new_relocs;
+	  sec->reloc_count++;
+	  relax_info->relocs_count = sec->reloc_count;
+	  *internal_relocs_p = new_relocs;
+	}
+      else
+	{
+	  if (insert_at != sec->reloc_count)
+	    {
+	      unsigned idx;
+	      for (idx = sec->reloc_count; idx > insert_at; idx--)
+		(*internal_relocs_p)[idx] = (*internal_relocs_p)[idx-1];
+	    }
+	  (*internal_relocs_p)[insert_at] = this_rela;
+	  sec->reloc_count++;
+	  if (relax_info->allocated_relocs)
+	    relax_info->relocs_count = sec->reloc_count;
+	}
+    }
+  return TRUE;
+}
+
+
+/* This is similar to relax_section except that when a target is moved,
+   we shift addresses up.  We also need to modify the size.  This
+   algorithm does NOT allow for relocations into the middle of the
+   property sections.  */
+
+static bfd_boolean
+relax_property_section (bfd *abfd,
+			asection *sec,
+			struct bfd_link_info *link_info)
+{
+  Elf_Internal_Rela *internal_relocs;
+  bfd_byte *contents;
+  unsigned i;
+  bfd_boolean ok = TRUE;
+  bfd_boolean is_full_prop_section;
+  size_t last_zfill_target_offset = 0;
+  asection *last_zfill_target_sec = NULL;
+  bfd_size_type sec_size;
+  bfd_size_type entry_size;
+
+  sec_size = bfd_get_section_limit (abfd, sec);
+  internal_relocs = retrieve_internal_relocs (abfd, sec, 
+					      link_info->keep_memory);
+  contents = retrieve_contents (abfd, sec, link_info->keep_memory);
+  if (contents == NULL && sec_size != 0)
+    {
+      ok = FALSE;
+      goto error_return;
+    }
+
+  is_full_prop_section = xtensa_is_proptable_section (sec);
+  if (is_full_prop_section)
+    entry_size = 12;
+  else
+    entry_size = 8;
+
+  if (internal_relocs)
+    {
+      for (i = 0; i < sec->reloc_count; i++)
+	{
+	  Elf_Internal_Rela *irel;
+	  xtensa_relax_info *target_relax_info;
+	  unsigned r_type;
+	  asection *target_sec;
+	  literal_value val;
+	  bfd_byte *size_p, *flags_p;
+
+	  /* Locally change the source address.
+	     Translate the target to the new target address.
+	     If it points to this section and has been removed, MOVE IT.
+	     Also, don't forget to modify the associated SIZE at
+	     (offset + 4).  */
+
+	  irel = &internal_relocs[i];
+	  r_type = ELF32_R_TYPE (irel->r_info);
+	  if (r_type == R_XTENSA_NONE)
+	    continue;
+
+	  /* Find the literal value.  */
+	  r_reloc_init (&val.r_rel, abfd, irel, contents, sec_size);
+	  size_p = &contents[irel->r_offset + 4];
+	  flags_p = NULL;
+	  if (is_full_prop_section)
+	    flags_p = &contents[irel->r_offset + 8];
+	  BFD_ASSERT (irel->r_offset + entry_size <= sec_size);
+
+	  target_sec = r_reloc_get_section (&val.r_rel);
+	  target_relax_info = get_xtensa_relax_info (target_sec);
+
+	  if (target_relax_info
+	      && (target_relax_info->is_relaxable_literal_section
+		  || target_relax_info->is_relaxable_asm_section ))
+	    {
+	      /* Translate the relocation's destination.  */
+	      bfd_vma old_offset = val.r_rel.target_offset;
+	      bfd_vma new_offset;
+	      long old_size, new_size;
+	      text_action *act = target_relax_info->action_list.head;
+	      new_offset = old_offset -
+		removed_by_actions (&act, old_offset, FALSE);
+
+	      /* Assert that we are not out of bounds.  */
+	      old_size = bfd_get_32 (abfd, size_p);
+	      new_size = old_size;
+
+	      if (old_size == 0)
+		{
+		  /* Only the first zero-sized unreachable entry is
+		     allowed to expand.  In this case the new offset
+		     should be the offset before the fill and the new
+		     size is the expansion size.  For other zero-sized
+		     entries the resulting size should be zero with an
+		     offset before or after the fill address depending
+		     on whether the expanding unreachable entry
+		     preceeds it.  */
+		  if (last_zfill_target_sec == 0
+		      || last_zfill_target_sec != target_sec
+		      || last_zfill_target_offset != old_offset)
+		    {
+		      bfd_vma new_end_offset = new_offset;
+
+		      /* Recompute the new_offset, but this time don't
+			 include any fill inserted by relaxation.  */
+		      act = target_relax_info->action_list.head;
+		      new_offset = old_offset -
+			removed_by_actions (&act, old_offset, TRUE);
+
+		      /* If it is not unreachable and we have not yet
+			 seen an unreachable at this address, place it
+			 before the fill address.  */
+		      if (flags_p && (bfd_get_32 (abfd, flags_p)
+				      & XTENSA_PROP_UNREACHABLE) != 0)
+			{
+			  new_size = new_end_offset - new_offset;
+
+			  last_zfill_target_sec = target_sec;
+			  last_zfill_target_offset = old_offset;
+			}
+		    }
+		}
+	      else
+		new_size -=
+		    removed_by_actions (&act, old_offset + old_size, TRUE);
+
+	      if (new_size != old_size)
+		{
+		  bfd_put_32 (abfd, new_size, size_p);
+		  pin_contents (sec, contents);
+		}
+
+	      if (new_offset != old_offset)
+		{
+		  bfd_vma diff = new_offset - old_offset;
+		  irel->r_addend += diff;
+		  pin_internal_relocs (sec, internal_relocs);
+		}
+	    }
+	}
+    }
+
+  /* Combine adjacent property table entries.  This is also done in
+     finish_dynamic_sections() but at that point it's too late to
+     reclaim the space in the output section, so we do this twice.  */
+
+  if (internal_relocs && (!link_info->relocatable
+			  || xtensa_is_littable_section (sec)))
+    {
+      Elf_Internal_Rela *last_irel = NULL;
+      Elf_Internal_Rela *irel, *next_rel, *rel_end;
+      int removed_bytes = 0;
+      bfd_vma offset;
+      flagword predef_flags;
+
+      predef_flags = xtensa_get_property_predef_flags (sec);
+
+      /* Walk over memory and relocations at the same time.
+         This REQUIRES that the internal_relocs be sorted by offset.  */
+      qsort (internal_relocs, sec->reloc_count, sizeof (Elf_Internal_Rela),
+	     internal_reloc_compare);
+
+      pin_internal_relocs (sec, internal_relocs);
+      pin_contents (sec, contents);
+
+      next_rel = internal_relocs;
+      rel_end = internal_relocs + sec->reloc_count;
+
+      BFD_ASSERT (sec->size % entry_size == 0);
+
+      for (offset = 0; offset < sec->size; offset += entry_size)
+	{
+	  Elf_Internal_Rela *offset_rel, *extra_rel;
+	  bfd_vma bytes_to_remove, size, actual_offset;
+	  bfd_boolean remove_this_rel;
+	  flagword flags;
+
+	  /* Find the first relocation for the entry at the current offset.
+	     Adjust the offsets of any extra relocations for the previous
+	     entry.  */
+	  offset_rel = NULL;
+	  if (next_rel)
+	    {
+	      for (irel = next_rel; irel < rel_end; irel++)
+		{
+		  if ((irel->r_offset == offset
+		       && ELF32_R_TYPE (irel->r_info) != R_XTENSA_NONE)
+		      || irel->r_offset > offset)
+		    {
+		      offset_rel = irel;
+		      break;
+		    }
+		  irel->r_offset -= removed_bytes;
+		}
+	    }
+
+	  /* Find the next relocation (if there are any left).  */
+	  extra_rel = NULL;
+	  if (offset_rel)
+	    {
+	      for (irel = offset_rel + 1; irel < rel_end; irel++)
+		{
+		  if (ELF32_R_TYPE (irel->r_info) != R_XTENSA_NONE)
+		    {
+		      extra_rel = irel;
+		      break;
+		    }
+		}
+	    }
+
+	  /* Check if there are relocations on the current entry.  There
+	     should usually be a relocation on the offset field.  If there
+	     are relocations on the size or flags, then we can't optimize
+	     this entry.  Also, find the next relocation to examine on the
+	     next iteration.  */
+	  if (offset_rel)
+	    {
+	      if (offset_rel->r_offset >= offset + entry_size)
+		{
+		  next_rel = offset_rel;
+		  /* There are no relocations on the current entry, but we
+		     might still be able to remove it if the size is zero.  */
+		  offset_rel = NULL;
+		}
+	      else if (offset_rel->r_offset > offset
+		       || (extra_rel
+			   && extra_rel->r_offset < offset + entry_size))
+		{
+		  /* There is a relocation on the size or flags, so we can't
+		     do anything with this entry.  Continue with the next.  */
+		  next_rel = offset_rel;
+		  continue;
+		}
+	      else
+		{
+		  BFD_ASSERT (offset_rel->r_offset == offset);
+		  offset_rel->r_offset -= removed_bytes;
+		  next_rel = offset_rel + 1;
+		}
+	    }
+	  else
+	    next_rel = NULL;
+
+	  remove_this_rel = FALSE;
+	  bytes_to_remove = 0;
+	  actual_offset = offset - removed_bytes;
+	  size = bfd_get_32 (abfd, &contents[actual_offset + 4]);
+
+	  if (is_full_prop_section) 
+	    flags = bfd_get_32 (abfd, &contents[actual_offset + 8]);
+	  else
+	    flags = predef_flags;
+
+	  if (size == 0
+	      && (flags & XTENSA_PROP_ALIGN) == 0
+	      && (flags & XTENSA_PROP_UNREACHABLE) == 0)
+	    {
+	      /* Always remove entries with zero size and no alignment.  */
+	      bytes_to_remove = entry_size;
+	      if (offset_rel)
+		remove_this_rel = TRUE;
+	    }
+	  else if (offset_rel
+		   && ELF32_R_TYPE (offset_rel->r_info) == R_XTENSA_32)
+	    {
+	      if (last_irel)
+		{
+		  flagword old_flags;
+		  bfd_vma old_size =
+		    bfd_get_32 (abfd, &contents[last_irel->r_offset + 4]);
+		  bfd_vma old_address =
+		    (last_irel->r_addend
+		     + bfd_get_32 (abfd, &contents[last_irel->r_offset]));
+		  bfd_vma new_address =
+		    (offset_rel->r_addend
+		     + bfd_get_32 (abfd, &contents[actual_offset]));
+		  if (is_full_prop_section) 
+		    old_flags = bfd_get_32
+		      (abfd, &contents[last_irel->r_offset + 8]);
+		  else
+		    old_flags = predef_flags;
+
+		  if ((ELF32_R_SYM (offset_rel->r_info)
+		       == ELF32_R_SYM (last_irel->r_info))
+		      && old_address + old_size == new_address
+		      && old_flags == flags
+		      && (old_flags & XTENSA_PROP_INSN_BRANCH_TARGET) == 0
+		      && (old_flags & XTENSA_PROP_INSN_LOOP_TARGET) == 0)
+		    {
+		      /* Fix the old size.  */
+		      bfd_put_32 (abfd, old_size + size,
+				  &contents[last_irel->r_offset + 4]);
+		      bytes_to_remove = entry_size;
+		      remove_this_rel = TRUE;
+		    }
+		  else
+		    last_irel = offset_rel;
+		}
+	      else
+		last_irel = offset_rel;
+	    }
+
+	  if (remove_this_rel)
+	    {
+	      offset_rel->r_info = ELF32_R_INFO (0, R_XTENSA_NONE);
+	      offset_rel->r_offset = 0;
+	    }
+
+	  if (bytes_to_remove != 0)
+	    {
+	      removed_bytes += bytes_to_remove;
+	      if (offset + bytes_to_remove < sec->size)
+		memmove (&contents[actual_offset],
+			 &contents[actual_offset + bytes_to_remove],
+			 sec->size - offset - bytes_to_remove);
+	    }
+	}
+
+      if (removed_bytes)
+	{
+	  /* Fix up any extra relocations on the last entry.  */
+	  for (irel = next_rel; irel < rel_end; irel++)
+	    irel->r_offset -= removed_bytes;
+
+	  /* Clear the removed bytes.  */
+	  memset (&contents[sec->size - removed_bytes], 0, removed_bytes);
+
+	  if (sec->rawsize == 0)
+	    sec->rawsize = sec->size;
+	  sec->size -= removed_bytes;
+
+	  if (xtensa_is_littable_section (sec))
+	    {
+	      asection *sgotloc = elf_xtensa_hash_table (link_info)->sgotloc;
+	      if (sgotloc)
+		sgotloc->size -= removed_bytes;
+	    }
+	}
+    }
+
+ error_return:
+  release_internal_relocs (sec, internal_relocs);
+  release_contents (sec, contents);
+  return ok;
+}
+
+
+/* Third relaxation pass.  */
+
+/* Change symbol values to account for removed literals.  */
+
+bfd_boolean
+relax_section_symbols (bfd *abfd, asection *sec)
+{
+  xtensa_relax_info *relax_info;
+  unsigned int sec_shndx;
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Sym *isymbuf;
+  unsigned i, num_syms, num_locals;
+
+  relax_info = get_xtensa_relax_info (sec);
+  BFD_ASSERT (relax_info);
+
+  if (!relax_info->is_relaxable_literal_section
+      && !relax_info->is_relaxable_asm_section)
+    return TRUE;
+
+  sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  isymbuf = retrieve_local_syms (abfd);
+
+  num_syms = symtab_hdr->sh_size / sizeof (Elf32_External_Sym);
+  num_locals = symtab_hdr->sh_info;
+
+  /* Adjust the local symbols defined in this section.  */
+  for (i = 0; i < num_locals; i++)
+    {
+      Elf_Internal_Sym *isym = &isymbuf[i];
+
+      if (isym->st_shndx == sec_shndx)
+	{
+	  text_action *act = relax_info->action_list.head;
+	  bfd_vma orig_addr = isym->st_value;
+
+	  isym->st_value -= removed_by_actions (&act, orig_addr, FALSE);
+
+	  if (ELF32_ST_TYPE (isym->st_info) == STT_FUNC)
+	    isym->st_size -=
+	      removed_by_actions (&act, orig_addr + isym->st_size, FALSE);
+	}
+    }
+
+  /* Now adjust the global symbols defined in this section.  */
+  for (i = 0; i < (num_syms - num_locals); i++)
+    {
+      struct elf_link_hash_entry *sym_hash;
+
+      sym_hash = elf_sym_hashes (abfd)[i];
+
+      if (sym_hash->root.type == bfd_link_hash_warning)
+	sym_hash = (struct elf_link_hash_entry *) sym_hash->root.u.i.link;
+
+      if ((sym_hash->root.type == bfd_link_hash_defined
+	   || sym_hash->root.type == bfd_link_hash_defweak)
+	  && sym_hash->root.u.def.section == sec)
+	{
+	  text_action *act = relax_info->action_list.head;
+	  bfd_vma orig_addr = sym_hash->root.u.def.value;
+
+	  sym_hash->root.u.def.value -=
+	    removed_by_actions (&act, orig_addr, FALSE);
+
+	  if (sym_hash->type == STT_FUNC)
+	    sym_hash->size -=
+	      removed_by_actions (&act, orig_addr + sym_hash->size, FALSE);
+	}
+    }
+
+  return TRUE;
+}
+
+
+/* "Fix" handling functions, called while performing relocations.  */
+
+static bfd_boolean
+do_fix_for_relocatable_link (Elf_Internal_Rela *rel,
+			     bfd *input_bfd,
+			     asection *input_section,
+			     bfd_byte *contents)
+{
+  r_reloc r_rel;
+  asection *sec, *old_sec;
+  bfd_vma old_offset;
+  int r_type = ELF32_R_TYPE (rel->r_info);
+  reloc_bfd_fix *fix;
+
+  if (r_type == R_XTENSA_NONE)
+    return TRUE;
+
+  fix = get_bfd_fix (input_section, rel->r_offset, r_type);
+  if (!fix)
+    return TRUE;
+
+  r_reloc_init (&r_rel, input_bfd, rel, contents,
+		bfd_get_section_limit (input_bfd, input_section));
+  old_sec = r_reloc_get_section (&r_rel);
+  old_offset = r_rel.target_offset;
+
+  if (!old_sec || !r_reloc_is_defined (&r_rel))
+    {
+      if (r_type != R_XTENSA_ASM_EXPAND)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B(%A+0x%lx): unexpected fix for %s relocation"),
+	     input_bfd, input_section, rel->r_offset,
+	     elf_howto_table[r_type].name);
+	  return FALSE;
+	}
+      /* Leave it be.  Resolution will happen in a later stage.  */
+    }
+  else
+    {
+      sec = fix->target_sec;
+      rel->r_addend += ((sec->output_offset + fix->target_offset)
+			- (old_sec->output_offset + old_offset));
+    }
+  return TRUE;
+}
+
+
+static void
+do_fix_for_final_link (Elf_Internal_Rela *rel,
+		       bfd *input_bfd,
+		       asection *input_section,
+		       bfd_byte *contents,
+		       bfd_vma *relocationp)
+{
+  asection *sec;
+  int r_type = ELF32_R_TYPE (rel->r_info);
+  reloc_bfd_fix *fix;
+  bfd_vma fixup_diff;
+
+  if (r_type == R_XTENSA_NONE)
+    return;
+
+  fix = get_bfd_fix (input_section, rel->r_offset, r_type);
+  if (!fix)
+    return;
+
+  sec = fix->target_sec;
+
+  fixup_diff = rel->r_addend;
+  if (elf_howto_table[fix->src_type].partial_inplace)
+    {
+      bfd_vma inplace_val;
+      BFD_ASSERT (fix->src_offset
+		  < bfd_get_section_limit (input_bfd, input_section));
+      inplace_val = bfd_get_32 (input_bfd, &contents[fix->src_offset]);
+      fixup_diff += inplace_val;
+    }
+
+  *relocationp = (sec->output_section->vma
+		  + sec->output_offset
+		  + fix->target_offset - fixup_diff);
+}
+
+
+/* Miscellaneous utility functions....  */
+
+static asection *
+elf_xtensa_get_plt_section (struct bfd_link_info *info, int chunk)
+{
+  struct elf_xtensa_link_hash_table *htab;
+  bfd *dynobj;
+  char plt_name[10];
+
+  if (chunk == 0)
+    {
+      htab = elf_xtensa_hash_table (info);
+      if (htab == NULL)
+	return NULL;
+
+      return htab->splt;
+    }
+
+  dynobj = elf_hash_table (info)->dynobj;
+  sprintf (plt_name, ".plt.%u", chunk);
+  return bfd_get_section_by_name (dynobj, plt_name);
+}
+
+
+static asection *
+elf_xtensa_get_gotplt_section (struct bfd_link_info *info, int chunk)
+{
+  struct elf_xtensa_link_hash_table *htab;
+  bfd *dynobj;
+  char got_name[14];
+
+  if (chunk == 0)
+    {
+      htab = elf_xtensa_hash_table (info);
+      if (htab == NULL)
+	return NULL;
+      return htab->sgotplt;
+    }
+
+  dynobj = elf_hash_table (info)->dynobj;
+  sprintf (got_name, ".got.plt.%u", chunk);
+  return bfd_get_section_by_name (dynobj, got_name);
+}
+
+
+/* Get the input section for a given symbol index.
+   If the symbol is:
+   . a section symbol, return the section;
+   . a common symbol, return the common section;
+   . an undefined symbol, return the undefined section;
+   . an indirect symbol, follow the links;
+   . an absolute value, return the absolute section.  */
+
+static asection *
+get_elf_r_symndx_section (bfd *abfd, unsigned long r_symndx)
+{
+  Elf_Internal_Shdr *symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  asection *target_sec = NULL;
+  if (r_symndx < symtab_hdr->sh_info)
+    {
+      Elf_Internal_Sym *isymbuf;
+      unsigned int section_index;
+
+      isymbuf = retrieve_local_syms (abfd);
+      section_index = isymbuf[r_symndx].st_shndx;
+
+      if (section_index == SHN_UNDEF)
+	target_sec = bfd_und_section_ptr;
+      else if (section_index == SHN_ABS)
+	target_sec = bfd_abs_section_ptr;
+      else if (section_index == SHN_COMMON)
+	target_sec = bfd_com_section_ptr;
+      else
+	target_sec = bfd_section_from_elf_index (abfd, section_index);
+    }
+  else
+    {
+      unsigned long indx = r_symndx - symtab_hdr->sh_info;
+      struct elf_link_hash_entry *h = elf_sym_hashes (abfd)[indx];
+
+      while (h->root.type == bfd_link_hash_indirect
+             || h->root.type == bfd_link_hash_warning)
+        h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+      switch (h->root.type)
+	{
+	case bfd_link_hash_defined:
+	case  bfd_link_hash_defweak:
+	  target_sec = h->root.u.def.section;
+	  break;
+	case bfd_link_hash_common:
+	  target_sec = bfd_com_section_ptr;
+	  break;
+	case bfd_link_hash_undefined:
+	case bfd_link_hash_undefweak:
+	  target_sec = bfd_und_section_ptr;
+	  break;
+	default: /* New indirect warning.  */
+	  target_sec = bfd_und_section_ptr;
+	  break;
+	}
+    }
+  return target_sec;
+}
+
+
+static struct elf_link_hash_entry *
+get_elf_r_symndx_hash_entry (bfd *abfd, unsigned long r_symndx)
+{
+  unsigned long indx;
+  struct elf_link_hash_entry *h;
+  Elf_Internal_Shdr *symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+
+  if (r_symndx < symtab_hdr->sh_info)
+    return NULL;
+
+  indx = r_symndx - symtab_hdr->sh_info;
+  h = elf_sym_hashes (abfd)[indx];
+  while (h->root.type == bfd_link_hash_indirect
+	 || h->root.type == bfd_link_hash_warning)
+    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+  return h;
+}
+
+
+/* Get the section-relative offset for a symbol number.  */
+
+static bfd_vma
+get_elf_r_symndx_offset (bfd *abfd, unsigned long r_symndx)
+{
+  Elf_Internal_Shdr *symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  bfd_vma offset = 0;
+
+  if (r_symndx < symtab_hdr->sh_info)
+    {
+      Elf_Internal_Sym *isymbuf;
+      isymbuf = retrieve_local_syms (abfd);
+      offset = isymbuf[r_symndx].st_value;
+    }
+  else
+    {
+      unsigned long indx = r_symndx - symtab_hdr->sh_info;
+      struct elf_link_hash_entry *h =
+	elf_sym_hashes (abfd)[indx];
+
+      while (h->root.type == bfd_link_hash_indirect
+             || h->root.type == bfd_link_hash_warning)
+	h = (struct elf_link_hash_entry *) h->root.u.i.link;
+      if (h->root.type == bfd_link_hash_defined
+          || h->root.type == bfd_link_hash_defweak)
+	offset = h->root.u.def.value;
+    }
+  return offset;
+}
+
+
+static bfd_boolean
+is_reloc_sym_weak (bfd *abfd, Elf_Internal_Rela *rel)
+{
+  unsigned long r_symndx = ELF32_R_SYM (rel->r_info);
+  struct elf_link_hash_entry *h;
+
+  h = get_elf_r_symndx_hash_entry (abfd, r_symndx);
+  if (h && h->root.type == bfd_link_hash_defweak)
+    return TRUE;
+  return FALSE;
+}
+
+
+static bfd_boolean
+pcrel_reloc_fits (xtensa_opcode opc,
+		  int opnd,
+		  bfd_vma self_address,
+		  bfd_vma dest_address)
+{
+  xtensa_isa isa = xtensa_default_isa;
+  uint32 valp = dest_address;
+  if (xtensa_operand_do_reloc (isa, opc, opnd, &valp, self_address)
+      || xtensa_operand_encode (isa, opc, opnd, &valp))
+    return FALSE;
+  return TRUE;
+}
+
+
+static bfd_boolean 
+xtensa_is_property_section (asection *sec)
+{
+  if (xtensa_is_insntable_section (sec)
+      || xtensa_is_littable_section (sec)
+      || xtensa_is_proptable_section (sec))
+    return TRUE;
+
+  return FALSE;
+}
+
+
+static bfd_boolean 
+xtensa_is_insntable_section (asection *sec)
+{
+  if (CONST_STRNEQ (sec->name, XTENSA_INSN_SEC_NAME)
+      || CONST_STRNEQ (sec->name, ".gnu.linkonce.x."))
+    return TRUE;
+
+  return FALSE;
+}
+
+
+static bfd_boolean 
+xtensa_is_littable_section (asection *sec)
+{
+  if (CONST_STRNEQ (sec->name, XTENSA_LIT_SEC_NAME)
+      || CONST_STRNEQ (sec->name, ".gnu.linkonce.p."))
+    return TRUE;
+
+  return FALSE;
+}
+
+
+static bfd_boolean 
+xtensa_is_proptable_section (asection *sec)
+{
+  if (CONST_STRNEQ (sec->name, XTENSA_PROP_SEC_NAME)
+      || CONST_STRNEQ (sec->name, ".gnu.linkonce.prop."))
+    return TRUE;
+
+  return FALSE;
+}
+
+
+static int
+internal_reloc_compare (const void *ap, const void *bp)
+{
+  const Elf_Internal_Rela *a = (const Elf_Internal_Rela *) ap;
+  const Elf_Internal_Rela *b = (const Elf_Internal_Rela *) bp;
+
+  if (a->r_offset != b->r_offset)
+    return (a->r_offset - b->r_offset);
+
+  /* We don't need to sort on these criteria for correctness,
+     but enforcing a more strict ordering prevents unstable qsort
+     from behaving differently with different implementations.
+     Without the code below we get correct but different results
+     on Solaris 2.7 and 2.8.  We would like to always produce the
+     same results no matter the host.  */
+
+  if (a->r_info != b->r_info)
+    return (a->r_info - b->r_info);
+
+  return (a->r_addend - b->r_addend);
+}
+
+
+static int
+internal_reloc_matches (const void *ap, const void *bp)
+{
+  const Elf_Internal_Rela *a = (const Elf_Internal_Rela *) ap;
+  const Elf_Internal_Rela *b = (const Elf_Internal_Rela *) bp;
+
+  /* Check if one entry overlaps with the other; this shouldn't happen
+     except when searching for a match.  */
+  return (a->r_offset - b->r_offset);
+}
+
+
+/* Predicate function used to look up a section in a particular group.  */
+
+static bfd_boolean
+match_section_group (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *inf)
+{
+  const char *gname = inf;
+  const char *group_name = elf_group_name (sec);
+  
+  return (group_name == gname
+	  || (group_name != NULL
+	      && gname != NULL
+	      && strcmp (group_name, gname) == 0));
+}
+
+
+static int linkonce_len = sizeof (".gnu.linkonce.") - 1;
+
+static char *
+xtensa_property_section_name (asection *sec, const char *base_name)
+{
+  const char *suffix, *group_name;
+  char *prop_sec_name;
+
+  group_name = elf_group_name (sec);
+  if (group_name)
+    {
+      suffix = strrchr (sec->name, '.');
+      if (suffix == sec->name)
+	suffix = 0;
+      prop_sec_name = (char *) bfd_malloc (strlen (base_name) + 1
+					   + (suffix ? strlen (suffix) : 0));
+      strcpy (prop_sec_name, base_name);
+      if (suffix)
+	strcat (prop_sec_name, suffix);
+    }
+  else if (strncmp (sec->name, ".gnu.linkonce.", linkonce_len) == 0)
+    {
+      char *linkonce_kind = 0;
+
+      if (strcmp (base_name, XTENSA_INSN_SEC_NAME) == 0) 
+	linkonce_kind = "x.";
+      else if (strcmp (base_name, XTENSA_LIT_SEC_NAME) == 0) 
+	linkonce_kind = "p.";
+      else if (strcmp (base_name, XTENSA_PROP_SEC_NAME) == 0)
+	linkonce_kind = "prop.";
+      else
+	abort ();
+
+      prop_sec_name = (char *) bfd_malloc (strlen (sec->name)
+					   + strlen (linkonce_kind) + 1);
+      memcpy (prop_sec_name, ".gnu.linkonce.", linkonce_len);
+      strcpy (prop_sec_name + linkonce_len, linkonce_kind);
+
+      suffix = sec->name + linkonce_len;
+      /* For backward compatibility, replace "t." instead of inserting
+         the new linkonce_kind (but not for "prop" sections).  */
+      if (CONST_STRNEQ (suffix, "t.") && linkonce_kind[1] == '.')
+        suffix += 2;
+      strcat (prop_sec_name + linkonce_len, suffix);
+    }
+  else
+    prop_sec_name = strdup (base_name);
+
+  return prop_sec_name;
+}
+
+
+static asection *
+xtensa_get_property_section (asection *sec, const char *base_name)
+{
+  char *prop_sec_name;
+  asection *prop_sec;
+
+  prop_sec_name = xtensa_property_section_name (sec, base_name);
+  prop_sec = bfd_get_section_by_name_if (sec->owner, prop_sec_name,
+					 match_section_group,
+					 (void *) elf_group_name (sec));
+  free (prop_sec_name);
+  return prop_sec;
+}
+
+
+asection *
+xtensa_make_property_section (asection *sec, const char *base_name)
+{
+  char *prop_sec_name;
+  asection *prop_sec;
+
+  /* Check if the section already exists.  */
+  prop_sec_name = xtensa_property_section_name (sec, base_name);
+  prop_sec = bfd_get_section_by_name_if (sec->owner, prop_sec_name,
+					 match_section_group,
+					 (void *) elf_group_name (sec));
+  /* If not, create it.  */
+  if (! prop_sec)
+    {
+      flagword flags = (SEC_RELOC | SEC_HAS_CONTENTS | SEC_READONLY);
+      flags |= (bfd_get_section_flags (sec->owner, sec)
+		& (SEC_LINK_ONCE | SEC_LINK_DUPLICATES));
+
+      prop_sec = bfd_make_section_anyway_with_flags
+	(sec->owner, strdup (prop_sec_name), flags);
+      if (! prop_sec)
+	return 0;
+
+      elf_group_name (prop_sec) = elf_group_name (sec);
+    }
+
+  free (prop_sec_name);
+  return prop_sec;
+}
+
+
+flagword
+xtensa_get_property_predef_flags (asection *sec)
+{
+  if (xtensa_is_insntable_section (sec))
+    return (XTENSA_PROP_INSN
+	    | XTENSA_PROP_NO_TRANSFORM
+	    | XTENSA_PROP_INSN_NO_REORDER);
+
+  if (xtensa_is_littable_section (sec))
+    return (XTENSA_PROP_LITERAL
+	    | XTENSA_PROP_NO_TRANSFORM
+	    | XTENSA_PROP_INSN_NO_REORDER);
+
+  return 0;
+}
+
+
+/* Other functions called directly by the linker.  */
+
+bfd_boolean
+xtensa_callback_required_dependence (bfd *abfd,
+				     asection *sec,
+				     struct bfd_link_info *link_info,
+				     deps_callback_t callback,
+				     void *closure)
+{
+  Elf_Internal_Rela *internal_relocs;
+  bfd_byte *contents;
+  unsigned i;
+  bfd_boolean ok = TRUE;
+  bfd_size_type sec_size;
+
+  sec_size = bfd_get_section_limit (abfd, sec);
+
+  /* ".plt*" sections have no explicit relocations but they contain L32R
+     instructions that reference the corresponding ".got.plt*" sections.  */
+  if ((sec->flags & SEC_LINKER_CREATED) != 0
+      && CONST_STRNEQ (sec->name, ".plt"))
+    {
+      asection *sgotplt;
+
+      /* Find the corresponding ".got.plt*" section.  */
+      if (sec->name[4] == '\0')
+	sgotplt = bfd_get_section_by_name (sec->owner, ".got.plt");
+      else
+	{
+	  char got_name[14];
+	  int chunk = 0;
+
+	  BFD_ASSERT (sec->name[4] == '.');
+	  chunk = strtol (&sec->name[5], NULL, 10);
+
+	  sprintf (got_name, ".got.plt.%u", chunk);
+	  sgotplt = bfd_get_section_by_name (sec->owner, got_name);
+	}
+      BFD_ASSERT (sgotplt);
+
+      /* Assume worst-case offsets: L32R at the very end of the ".plt"
+	 section referencing a literal at the very beginning of
+	 ".got.plt".  This is very close to the real dependence, anyway.  */
+      (*callback) (sec, sec_size, sgotplt, 0, closure);
+    }
+
+  /* Only ELF files are supported for Xtensa.  Check here to avoid a segfault
+     when building uclibc, which runs "ld -b binary /dev/null".  */
+  if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
+    return ok;
+
+  internal_relocs = retrieve_internal_relocs (abfd, sec, 
+					      link_info->keep_memory);
+  if (internal_relocs == NULL
+      || sec->reloc_count == 0)
+    return ok;
+
+  /* Cache the contents for the duration of this scan.  */
+  contents = retrieve_contents (abfd, sec, link_info->keep_memory);
+  if (contents == NULL && sec_size != 0)
+    {
+      ok = FALSE;
+      goto error_return;
+    }
+
+  if (!xtensa_default_isa)
+    xtensa_default_isa = xtensa_isa_init (0, 0);
+
+  for (i = 0; i < sec->reloc_count; i++)
+    {
+      Elf_Internal_Rela *irel = &internal_relocs[i];
+      if (is_l32r_relocation (abfd, sec, contents, irel))
+	{
+	  r_reloc l32r_rel;
+	  asection *target_sec;
+	  bfd_vma target_offset;
+
+	  r_reloc_init (&l32r_rel, abfd, irel, contents, sec_size);
+	  target_sec = NULL;
+	  target_offset = 0;
+	  /* L32Rs must be local to the input file.  */
+	  if (r_reloc_is_defined (&l32r_rel))
+	    {
+	      target_sec = r_reloc_get_section (&l32r_rel);
+	      target_offset = l32r_rel.target_offset;
+	    }
+	  (*callback) (sec, irel->r_offset, target_sec, target_offset,
+		       closure);
+	}
+    }
+
+ error_return:
+  release_internal_relocs (sec, internal_relocs);
+  release_contents (sec, contents);
+  return ok;
+}
+
+/* The default literal sections should always be marked as "code" (i.e.,
+   SHF_EXECINSTR).  This is particularly important for the Linux kernel
+   module loader so that the literals are not placed after the text.  */
+static const struct bfd_elf_special_section elf_xtensa_special_sections[] =
+{
+  { STRING_COMMA_LEN (".fini.literal"), 0, SHT_PROGBITS, SHF_ALLOC + SHF_EXECINSTR },
+  { STRING_COMMA_LEN (".init.literal"), 0, SHT_PROGBITS, SHF_ALLOC + SHF_EXECINSTR },
+  { STRING_COMMA_LEN (".literal"),      0, SHT_PROGBITS, SHF_ALLOC + SHF_EXECINSTR },
+  { STRING_COMMA_LEN (".xtensa.info"),  0, SHT_NOTE,     0 },
+  { NULL,                       0,      0, 0,            0 }
+};
+
+#define ELF_TARGET_ID			XTENSA_ELF_DATA
+#ifndef ELF_ARCH
+#define TARGET_LITTLE_SYM		bfd_elf32_xtensa_le_vec
+#define TARGET_LITTLE_NAME		"elf32-xtensa-le"
+#define TARGET_BIG_SYM			bfd_elf32_xtensa_be_vec
+#define TARGET_BIG_NAME			"elf32-xtensa-be"
+#define ELF_ARCH			bfd_arch_xtensa
+
+#define ELF_MACHINE_CODE		EM_XTENSA
+#define ELF_MACHINE_ALT1		EM_XTENSA_OLD
+
+#if XCHAL_HAVE_MMU
+#define ELF_MAXPAGESIZE			(1 << XCHAL_MMU_MIN_PTE_PAGE_SIZE)
+#else /* !XCHAL_HAVE_MMU */
+#define ELF_MAXPAGESIZE			1
+#endif /* !XCHAL_HAVE_MMU */
+#endif /* ELF_ARCH */
+
+#define elf_backend_can_gc_sections	1
+#define elf_backend_can_refcount	1
+#define elf_backend_plt_readonly	1
+#define elf_backend_got_header_size	4
+#define elf_backend_want_dynbss		0
+#define elf_backend_want_got_plt	1
+
+#define elf_info_to_howto		     elf_xtensa_info_to_howto_rela
+
+#define bfd_elf32_mkobject		     elf_xtensa_mkobject
+
+#define bfd_elf32_bfd_merge_private_bfd_data elf_xtensa_merge_private_bfd_data
+#define bfd_elf32_new_section_hook	     elf_xtensa_new_section_hook
+#define bfd_elf32_bfd_print_private_bfd_data elf_xtensa_print_private_bfd_data
+#define bfd_elf32_bfd_relax_section	     elf_xtensa_relax_section
+#define bfd_elf32_bfd_reloc_type_lookup	     elf_xtensa_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup \
+  elf_xtensa_reloc_name_lookup
+#define bfd_elf32_bfd_set_private_flags	     elf_xtensa_set_private_flags
+#define bfd_elf32_bfd_link_hash_table_create elf_xtensa_link_hash_table_create
+
+#define elf_backend_adjust_dynamic_symbol    elf_xtensa_adjust_dynamic_symbol
+#define elf_backend_check_relocs	     elf_xtensa_check_relocs
+#define elf_backend_create_dynamic_sections  elf_xtensa_create_dynamic_sections
+#define elf_backend_discard_info	     elf_xtensa_discard_info
+#define elf_backend_ignore_discarded_relocs  elf_xtensa_ignore_discarded_relocs
+#define elf_backend_final_write_processing   elf_xtensa_final_write_processing
+#define elf_backend_finish_dynamic_sections  elf_xtensa_finish_dynamic_sections
+#define elf_backend_finish_dynamic_symbol    elf_xtensa_finish_dynamic_symbol
+#define elf_backend_gc_mark_hook	     elf_xtensa_gc_mark_hook
+#define elf_backend_gc_sweep_hook	     elf_xtensa_gc_sweep_hook
+#define elf_backend_grok_prstatus	     elf_xtensa_grok_prstatus
+#define elf_backend_grok_psinfo		     elf_xtensa_grok_psinfo
+#define elf_backend_hide_symbol		     elf_xtensa_hide_symbol
+#define elf_backend_object_p		     elf_xtensa_object_p
+#define elf_backend_reloc_type_class	     elf_xtensa_reloc_type_class
+#define elf_backend_relocate_section	     elf_xtensa_relocate_section
+#define elf_backend_size_dynamic_sections    elf_xtensa_size_dynamic_sections
+#define elf_backend_always_size_sections     elf_xtensa_always_size_sections
+#define elf_backend_omit_section_dynsym \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true)
+#define elf_backend_special_sections	     elf_xtensa_special_sections
+#define elf_backend_action_discarded	     elf_xtensa_action_discarded
+#define elf_backend_copy_indirect_symbol     elf_xtensa_copy_indirect_symbol
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf32.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf32.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,24 @@
+/* ELF 32-bit executable support for BFD.
+   Copyright 1993, 2001, 2004, 2005, 2006, 2007, 2008, 2009
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define ARCH_SIZE		32
+
+#include "elfcode.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-alpha.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-alpha.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-alpha.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-alpha.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,5528 @@
+/* Alpha specific support for 64-bit ELF
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+   Contributed by Richard Henderson <rth@tamu.edu>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* We need a published ABI spec for this.  Until one comes out, don't
+   assume this'll remain unchanged forever.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+
+#include "elf/alpha.h"
+
+#define ALPHAECOFF
+
+#define NO_COFF_RELOCS
+#define NO_COFF_SYMBOLS
+#define NO_COFF_LINENOS
+
+/* Get the ECOFF swapping routines.  Needed for the debug information.  */
+#include "coff/internal.h"
+#include "coff/sym.h"
+#include "coff/symconst.h"
+#include "coff/ecoff.h"
+#include "coff/alpha.h"
+#include "aout/ar.h"
+#include "libcoff.h"
+#include "libecoff.h"
+#define ECOFF_64
+#include "ecoffswap.h"
+
+
+/* Instruction data for plt generation and relaxation.  */
+
+#define OP_LDA		0x08
+#define OP_LDAH		0x09
+#define OP_LDQ		0x29
+#define OP_BR		0x30
+#define OP_BSR		0x34
+
+#define INSN_LDA	(OP_LDA << 26)
+#define INSN_LDAH	(OP_LDAH << 26)
+#define INSN_LDQ	(OP_LDQ << 26)
+#define INSN_BR		(OP_BR << 26)
+
+#define INSN_ADDQ	0x40000400
+#define INSN_RDUNIQ	0x0000009e
+#define INSN_SUBQ	0x40000520
+#define INSN_S4SUBQ	0x40000560
+#define INSN_UNOP	0x2ffe0000
+
+#define INSN_JSR	0x68004000
+#define INSN_JMP	0x68000000
+#define INSN_JSR_MASK	0xfc00c000
+
+#define INSN_A(I,A)		(I | (A << 21))
+#define INSN_AB(I,A,B)		(I | (A << 21) | (B << 16))
+#define INSN_ABC(I,A,B,C)	(I | (A << 21) | (B << 16) | C)
+#define INSN_ABO(I,A,B,O)	(I | (A << 21) | (B << 16) | ((O) & 0xffff))
+#define INSN_AD(I,A,D)		(I | (A << 21) | (((D) >> 2) & 0x1fffff))
+
+/* PLT/GOT Stuff */
+
+/* Set by ld emulation.  Putting this into the link_info or hash structure
+   is simply working too hard.  */
+#ifdef USE_SECUREPLT
+bfd_boolean elf64_alpha_use_secureplt = TRUE;
+#else
+bfd_boolean elf64_alpha_use_secureplt = FALSE;
+#endif
+
+#define OLD_PLT_HEADER_SIZE	32
+#define OLD_PLT_ENTRY_SIZE	12
+#define NEW_PLT_HEADER_SIZE	36
+#define NEW_PLT_ENTRY_SIZE	4
+
+#define PLT_HEADER_SIZE \
+  (elf64_alpha_use_secureplt ? NEW_PLT_HEADER_SIZE : OLD_PLT_HEADER_SIZE)
+#define PLT_ENTRY_SIZE \
+  (elf64_alpha_use_secureplt ? NEW_PLT_ENTRY_SIZE : OLD_PLT_ENTRY_SIZE)
+
+#define MAX_GOT_SIZE		(64*1024)
+
+#define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so"
+
+
+/* Used to implement multiple .got subsections.  */
+struct alpha_elf_got_entry
+{
+  struct alpha_elf_got_entry *next;
+
+  /* Which .got subsection?  */
+  bfd *gotobj;
+
+  /* The addend in effect for this entry.  */
+  bfd_vma addend;
+
+  /* The .got offset for this entry.  */
+  int got_offset;
+
+  /* The .plt offset for this entry.  */
+  int plt_offset;
+
+  /* How many references to this entry?  */
+  int use_count;
+
+  /* The relocation type of this entry.  */
+  unsigned char reloc_type;
+
+  /* How a LITERAL is used.  */
+  unsigned char flags;
+
+  /* Have we initialized the dynamic relocation for this entry?  */
+  unsigned char reloc_done;
+
+  /* Have we adjusted this entry for SEC_MERGE?  */
+  unsigned char reloc_xlated;
+};
+
+struct alpha_elf_reloc_entry
+{
+  struct alpha_elf_reloc_entry *next;
+
+  /* Which .reloc section? */
+  asection *srel;
+
+  /* What kind of relocation? */
+  unsigned int rtype;
+
+  /* Is this against read-only section? */
+  unsigned int reltext : 1;
+
+  /* How many did we find?  */
+  unsigned long count;
+};
+
+struct alpha_elf_link_hash_entry
+{
+  struct elf_link_hash_entry root;
+
+  /* External symbol information.  */
+  EXTR esym;
+
+  /* Cumulative flags for all the .got entries.  */
+  int flags;
+
+  /* Contexts in which a literal was referenced.  */
+#define ALPHA_ELF_LINK_HASH_LU_ADDR	 0x01
+#define ALPHA_ELF_LINK_HASH_LU_MEM	 0x02
+#define ALPHA_ELF_LINK_HASH_LU_BYTE	 0x04
+#define ALPHA_ELF_LINK_HASH_LU_JSR	 0x08
+#define ALPHA_ELF_LINK_HASH_LU_TLSGD	 0x10
+#define ALPHA_ELF_LINK_HASH_LU_TLSLDM	 0x20
+#define ALPHA_ELF_LINK_HASH_LU_JSRDIRECT 0x40
+#define ALPHA_ELF_LINK_HASH_LU_PLT	 0x38
+#define ALPHA_ELF_LINK_HASH_TLS_IE	 0x80
+
+  /* Used to implement multiple .got subsections.  */
+  struct alpha_elf_got_entry *got_entries;
+
+  /* Used to count non-got, non-plt relocations for delayed sizing
+     of relocation sections.  */
+  struct alpha_elf_reloc_entry *reloc_entries;
+};
+
+/* Alpha ELF linker hash table.  */
+
+struct alpha_elf_link_hash_table
+{
+  struct elf_link_hash_table root;
+
+  /* The head of a list of .got subsections linked through
+     alpha_elf_tdata(abfd)->got_link_next.  */
+  bfd *got_list;
+
+  /* The most recent relax pass that we've seen.  The GOTs
+     should be regenerated if this doesn't match.  */
+  int relax_trip;
+};
+
+/* Look up an entry in a Alpha ELF linker hash table.  */
+
+#define alpha_elf_link_hash_lookup(table, string, create, copy, follow)	\
+  ((struct alpha_elf_link_hash_entry *)					\
+   elf_link_hash_lookup (&(table)->root, (string), (create),		\
+			 (copy), (follow)))
+
+/* Traverse a Alpha ELF linker hash table.  */
+
+#define alpha_elf_link_hash_traverse(table, func, info)			\
+  (elf_link_hash_traverse						\
+   (&(table)->root,							\
+    (bfd_boolean (*) (struct elf_link_hash_entry *, PTR)) (func),	\
+    (info)))
+
+/* Get the Alpha ELF linker hash table from a link_info structure.  */
+
+#define alpha_elf_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == ALPHA_ELF_DATA ? ((struct alpha_elf_link_hash_table *) ((p)->hash)) : NULL)
+
+/* Get the object's symbols as our own entry type.  */
+
+#define alpha_elf_sym_hashes(abfd) \
+  ((struct alpha_elf_link_hash_entry **)elf_sym_hashes(abfd))
+
+/* Should we do dynamic things to this symbol?  This differs from the 
+   generic version in that we never need to consider function pointer
+   equality wrt PLT entries -- we don't create a PLT entry if a symbol's
+   address is ever taken.  */
+
+static inline bfd_boolean
+alpha_elf_dynamic_symbol_p (struct elf_link_hash_entry *h,
+			    struct bfd_link_info *info)
+{
+  return _bfd_elf_dynamic_symbol_p (h, info, 0);
+}
+
+/* Create an entry in a Alpha ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+elf64_alpha_link_hash_newfunc (struct bfd_hash_entry *entry,
+			       struct bfd_hash_table *table,
+			       const char *string)
+{
+  struct alpha_elf_link_hash_entry *ret =
+    (struct alpha_elf_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == (struct alpha_elf_link_hash_entry *) NULL)
+    ret = ((struct alpha_elf_link_hash_entry *)
+	   bfd_hash_allocate (table,
+			      sizeof (struct alpha_elf_link_hash_entry)));
+  if (ret == (struct alpha_elf_link_hash_entry *) NULL)
+    return (struct bfd_hash_entry *) ret;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct alpha_elf_link_hash_entry *)
+	 _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
+				     table, string));
+  if (ret != (struct alpha_elf_link_hash_entry *) NULL)
+    {
+      /* Set local fields.  */
+      memset (&ret->esym, 0, sizeof (EXTR));
+      /* We use -2 as a marker to indicate that the information has
+	 not been set.  -1 means there is no associated ifd.  */
+      ret->esym.ifd = -2;
+      ret->flags = 0;
+      ret->got_entries = NULL;
+      ret->reloc_entries = NULL;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Create a Alpha ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+elf64_alpha_bfd_link_hash_table_create (bfd *abfd)
+{
+  struct alpha_elf_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct alpha_elf_link_hash_table);
+
+  ret = (struct alpha_elf_link_hash_table *) bfd_zmalloc (amt);
+  if (ret == (struct alpha_elf_link_hash_table *) NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->root, abfd,
+				      elf64_alpha_link_hash_newfunc,
+				      sizeof (struct alpha_elf_link_hash_entry),
+				      ALPHA_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  return &ret->root.root;
+}
+
+/* We have some private fields hanging off of the elf_tdata structure.  */
+
+struct alpha_elf_obj_tdata
+{
+  struct elf_obj_tdata root;
+
+  /* For every input file, these are the got entries for that object's
+     local symbols.  */
+  struct alpha_elf_got_entry ** local_got_entries;
+
+  /* For every input file, this is the object that owns the got that
+     this input file uses.  */
+  bfd *gotobj;
+
+  /* For every got, this is a linked list through the objects using this got */
+  bfd *in_got_link_next;
+
+  /* For every got, this is a link to the next got subsegment.  */
+  bfd *got_link_next;
+
+  /* For every got, this is the section.  */
+  asection *got;
+
+  /* For every got, this is it's total number of words.  */
+  int total_got_size;
+
+  /* For every got, this is the sum of the number of words required
+     to hold all of the member object's local got.  */
+  int local_got_size;
+};
+
+#define alpha_elf_tdata(abfd) \
+  ((struct alpha_elf_obj_tdata *) (abfd)->tdata.any)
+
+#define is_alpha_elf(bfd) \
+  (bfd_get_flavour (bfd) == bfd_target_elf_flavour \
+   && elf_tdata (bfd) != NULL \
+   && elf_object_id (bfd) == ALPHA_ELF_DATA)
+
+static bfd_boolean
+elf64_alpha_mkobject (bfd *abfd)
+{
+  return bfd_elf_allocate_object (abfd, sizeof (struct alpha_elf_obj_tdata),
+				  ALPHA_ELF_DATA);
+}
+
+static bfd_boolean
+elf64_alpha_object_p (bfd *abfd)
+{
+  /* Set the right machine number for an Alpha ELF file.  */
+  return bfd_default_set_arch_mach (abfd, bfd_arch_alpha, 0);
+}
+
+/* A relocation function which doesn't do anything.  */
+
+static bfd_reloc_status_type
+elf64_alpha_reloc_nil (bfd *abfd ATTRIBUTE_UNUSED, arelent *reloc,
+		       asymbol *sym ATTRIBUTE_UNUSED,
+		       PTR data ATTRIBUTE_UNUSED, asection *sec,
+		       bfd *output_bfd, char **error_message ATTRIBUTE_UNUSED)
+{
+  if (output_bfd)
+    reloc->address += sec->output_offset;
+  return bfd_reloc_ok;
+}
+
+/* A relocation function used for an unsupported reloc.  */
+
+static bfd_reloc_status_type
+elf64_alpha_reloc_bad (bfd *abfd ATTRIBUTE_UNUSED, arelent *reloc,
+		       asymbol *sym ATTRIBUTE_UNUSED,
+		       PTR data ATTRIBUTE_UNUSED, asection *sec,
+		       bfd *output_bfd, char **error_message ATTRIBUTE_UNUSED)
+{
+  if (output_bfd)
+    reloc->address += sec->output_offset;
+  return bfd_reloc_notsupported;
+}
+
+/* Do the work of the GPDISP relocation.  */
+
+static bfd_reloc_status_type
+elf64_alpha_do_reloc_gpdisp (bfd *abfd, bfd_vma gpdisp, bfd_byte *p_ldah,
+			     bfd_byte *p_lda)
+{
+  bfd_reloc_status_type ret = bfd_reloc_ok;
+  bfd_vma addend;
+  unsigned long i_ldah, i_lda;
+
+  i_ldah = bfd_get_32 (abfd, p_ldah);
+  i_lda = bfd_get_32 (abfd, p_lda);
+
+  /* Complain if the instructions are not correct.  */
+  if (((i_ldah >> 26) & 0x3f) != 0x09
+      || ((i_lda >> 26) & 0x3f) != 0x08)
+    ret = bfd_reloc_dangerous;
+
+  /* Extract the user-supplied offset, mirroring the sign extensions
+     that the instructions perform.  */
+  addend = ((i_ldah & 0xffff) << 16) | (i_lda & 0xffff);
+  addend = (addend ^ 0x80008000) - 0x80008000;
+
+  gpdisp += addend;
+
+  if ((bfd_signed_vma) gpdisp < -(bfd_signed_vma) 0x80000000
+      || (bfd_signed_vma) gpdisp >= (bfd_signed_vma) 0x7fff8000)
+    ret = bfd_reloc_overflow;
+
+  /* compensate for the sign extension again.  */
+  i_ldah = ((i_ldah & 0xffff0000)
+	    | (((gpdisp >> 16) + ((gpdisp >> 15) & 1)) & 0xffff));
+  i_lda = (i_lda & 0xffff0000) | (gpdisp & 0xffff);
+
+  bfd_put_32 (abfd, (bfd_vma) i_ldah, p_ldah);
+  bfd_put_32 (abfd, (bfd_vma) i_lda, p_lda);
+
+  return ret;
+}
+
+/* The special function for the GPDISP reloc.  */
+
+static bfd_reloc_status_type
+elf64_alpha_reloc_gpdisp (bfd *abfd, arelent *reloc_entry,
+			  asymbol *sym ATTRIBUTE_UNUSED, PTR data,
+			  asection *input_section, bfd *output_bfd,
+			  char **err_msg)
+{
+  bfd_reloc_status_type ret;
+  bfd_vma gp, relocation;
+  bfd_vma high_address;
+  bfd_byte *p_ldah, *p_lda;
+
+  /* Don't do anything if we're not doing a final link.  */
+  if (output_bfd)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  high_address = bfd_get_section_limit (abfd, input_section);
+  if (reloc_entry->address > high_address
+      || reloc_entry->address + reloc_entry->addend > high_address)
+    return bfd_reloc_outofrange;
+
+  /* The gp used in the portion of the output object to which this
+     input object belongs is cached on the input bfd.  */
+  gp = _bfd_get_gp_value (abfd);
+
+  relocation = (input_section->output_section->vma
+		+ input_section->output_offset
+		+ reloc_entry->address);
+
+  p_ldah = (bfd_byte *) data + reloc_entry->address;
+  p_lda = p_ldah + reloc_entry->addend;
+
+  ret = elf64_alpha_do_reloc_gpdisp (abfd, gp - relocation, p_ldah, p_lda);
+
+  /* Complain if the instructions are not correct.  */
+  if (ret == bfd_reloc_dangerous)
+    *err_msg = _("GPDISP relocation did not find ldah and lda instructions");
+
+  return ret;
+}
+
+/* In case we're on a 32-bit machine, construct a 64-bit "-1" value
+   from smaller values.  Start with zero, widen, *then* decrement.  */
+#define MINUS_ONE	(((bfd_vma)0) - 1)
+
+
+#define SKIP_HOWTO(N) \
+  HOWTO(N, 0, 0, 0, 0, 0, complain_overflow_dont, elf64_alpha_reloc_bad, 0, 0, 0, 0, 0)
+
+static reloc_howto_type elf64_alpha_howto_table[] =
+{
+  HOWTO (R_ALPHA_NONE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 elf64_alpha_reloc_nil,	/* special_function */
+	 "NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 32 bit reference to a symbol.  */
+  HOWTO (R_ALPHA_REFLONG,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "REFLONG",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 64 bit reference to a symbol.  */
+  HOWTO (R_ALPHA_REFQUAD,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "REFQUAD",		/* name */
+	 FALSE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32 bit GP relative offset.  This is just like REFLONG except
+     that when the value is used the value of the gp register will be
+     added in.  */
+  HOWTO (R_ALPHA_GPREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "GPREL32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used for an instruction that refers to memory off the GP register.  */
+  HOWTO (R_ALPHA_LITERAL,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "ELF_LITERAL",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* This reloc only appears immediately following an ELF_LITERAL reloc.
+     It identifies a use of the literal.  The symbol index is special:
+     1 means the literal address is in the base register of a memory
+     format instruction; 2 means the literal address is in the byte
+     offset register of a byte-manipulation instruction; 3 means the
+     literal address is in the target register of a jsr instruction.
+     This does not actually do any relocation.  */
+  HOWTO (R_ALPHA_LITUSE,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 elf64_alpha_reloc_nil,	/* special_function */
+	 "LITUSE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Load the gp register.  This is always used for a ldah instruction
+     which loads the upper 16 bits of the gp register.  The symbol
+     index of the GPDISP instruction is an offset in bytes to the lda
+     instruction that loads the lower 16 bits.  The value to use for
+     the relocation is the difference between the GP value and the
+     current location; the load will always be done against a register
+     holding the current address.
+
+     NOTE: Unlike ECOFF, partial in-place relocation is not done.  If
+     any offset is present in the instructions, it is an offset from
+     the register to the ldah instruction.  This lets us avoid any
+     stupid hackery like inventing a gp value to do partial relocation
+     against.  Also unlike ECOFF, we do the whole relocation off of
+     the GPDISP rather than a GPDISP_HI16/GPDISP_LO16 pair.  An odd,
+     space consuming bit, that, since all the information was present
+     in the GPDISP_HI16 reloc.  */
+  HOWTO (R_ALPHA_GPDISP,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 elf64_alpha_reloc_gpdisp, /* special_function */
+	 "GPDISP",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 21 bit branch.  */
+  HOWTO (R_ALPHA_BRADDR,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 21,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "BRADDR",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x1fffff,		/* src_mask */
+	 0x1fffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A hint for a jump to a register.  */
+  HOWTO (R_ALPHA_HINT,		/* type */
+	 2,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 14,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "HINT",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x3fff,		/* src_mask */
+	 0x3fff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 16 bit PC relative offset.  */
+  HOWTO (R_ALPHA_SREL16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "SREL16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 32 bit PC relative offset.  */
+  HOWTO (R_ALPHA_SREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "SREL32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 64 bit PC relative offset.  */
+  HOWTO (R_ALPHA_SREL64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "SREL64",		/* name */
+	 FALSE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Skip 12 - 16; deprecated ECOFF relocs.  */
+  SKIP_HOWTO (12),
+  SKIP_HOWTO (13),
+  SKIP_HOWTO (14),
+  SKIP_HOWTO (15),
+  SKIP_HOWTO (16),
+
+  /* The high 16 bits of the displacement from GP to the target.  */
+  HOWTO (R_ALPHA_GPRELHIGH,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "GPRELHIGH",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The low 16 bits of the displacement from GP to the target.  */
+  HOWTO (R_ALPHA_GPRELLOW,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "GPRELLOW",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16-bit displacement from the GP to the target.  */
+  HOWTO (R_ALPHA_GPREL16,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "GPREL16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Skip 20 - 23; deprecated ECOFF relocs.  */
+  SKIP_HOWTO (20),
+  SKIP_HOWTO (21),
+  SKIP_HOWTO (22),
+  SKIP_HOWTO (23),
+
+  /* Misc ELF relocations.  */
+
+  /* A dynamic relocation to copy the target into our .dynbss section.  */
+  /* Not generated, as all Alpha objects use PIC, so it is not needed.  It
+     is present because every other ELF has one, but should not be used
+     because .dynbss is an ugly thing.  */
+  HOWTO (R_ALPHA_COPY,
+	 0,
+	 0,
+	 0,
+	 FALSE,
+	 0,
+	 complain_overflow_dont,
+	 bfd_elf_generic_reloc,
+	 "COPY",
+	 FALSE,
+	 0,
+	 0,
+	 TRUE),
+
+  /* A dynamic relocation for a .got entry.  */
+  HOWTO (R_ALPHA_GLOB_DAT,
+	 0,
+	 0,
+	 0,
+	 FALSE,
+	 0,
+	 complain_overflow_dont,
+	 bfd_elf_generic_reloc,
+	 "GLOB_DAT",
+	 FALSE,
+	 0,
+	 0,
+	 TRUE),
+
+  /* A dynamic relocation for a .plt entry.  */
+  HOWTO (R_ALPHA_JMP_SLOT,
+	 0,
+	 0,
+	 0,
+	 FALSE,
+	 0,
+	 complain_overflow_dont,
+	 bfd_elf_generic_reloc,
+	 "JMP_SLOT",
+	 FALSE,
+	 0,
+	 0,
+	 TRUE),
+
+  /* A dynamic relocation to add the base of the DSO to a 64-bit field.  */
+  HOWTO (R_ALPHA_RELATIVE,
+	 0,
+	 0,
+	 0,
+	 FALSE,
+	 0,
+	 complain_overflow_dont,
+	 bfd_elf_generic_reloc,
+	 "RELATIVE",
+	 FALSE,
+	 0,
+	 0,
+	 TRUE),
+
+  /* A 21 bit branch that adjusts for gp loads.  */
+  HOWTO (R_ALPHA_BRSGP,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 21,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "BRSGP",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x1fffff,		/* src_mask */
+	 0x1fffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Creates a tls_index for the symbol in the got.  */
+  HOWTO (R_ALPHA_TLSGD,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "TLSGD",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Creates a tls_index for the (current) module in the got.  */
+  HOWTO (R_ALPHA_TLSLDM,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "TLSLDM",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A dynamic relocation for a DTP module entry.  */
+  HOWTO (R_ALPHA_DTPMOD64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "DTPMOD64",		/* name */
+	 FALSE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Creates a 64-bit offset in the got for the displacement
+     from DTP to the target.  */
+  HOWTO (R_ALPHA_GOTDTPREL,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "GOTDTPREL",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A dynamic relocation for a displacement from DTP to the target.  */
+  HOWTO (R_ALPHA_DTPREL64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "DTPREL64",		/* name */
+	 FALSE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The high 16 bits of the displacement from DTP to the target.  */
+  HOWTO (R_ALPHA_DTPRELHI,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "DTPRELHI",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The low 16 bits of the displacement from DTP to the target.  */
+  HOWTO (R_ALPHA_DTPRELLO,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "DTPRELLO",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16-bit displacement from DTP to the target.  */
+  HOWTO (R_ALPHA_DTPREL16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "DTPREL16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Creates a 64-bit offset in the got for the displacement
+     from TP to the target.  */
+  HOWTO (R_ALPHA_GOTTPREL,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "GOTTPREL",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A dynamic relocation for a displacement from TP to the target.  */
+  HOWTO (R_ALPHA_TPREL64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "TPREL64",		/* name */
+	 FALSE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The high 16 bits of the displacement from TP to the target.  */
+  HOWTO (R_ALPHA_TPRELHI,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "TPRELHI",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The low 16 bits of the displacement from TP to the target.  */
+  HOWTO (R_ALPHA_TPRELLO,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "TPRELLO",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16-bit displacement from TP to the target.  */
+  HOWTO (R_ALPHA_TPREL16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "TPREL16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+/* A mapping from BFD reloc types to Alpha ELF reloc types.  */
+
+struct elf_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  int elf_reloc_val;
+};
+
+static const struct elf_reloc_map elf64_alpha_reloc_map[] =
+{
+  {BFD_RELOC_NONE,			R_ALPHA_NONE},
+  {BFD_RELOC_32,			R_ALPHA_REFLONG},
+  {BFD_RELOC_64,			R_ALPHA_REFQUAD},
+  {BFD_RELOC_CTOR,			R_ALPHA_REFQUAD},
+  {BFD_RELOC_GPREL32,			R_ALPHA_GPREL32},
+  {BFD_RELOC_ALPHA_ELF_LITERAL,		R_ALPHA_LITERAL},
+  {BFD_RELOC_ALPHA_LITUSE,		R_ALPHA_LITUSE},
+  {BFD_RELOC_ALPHA_GPDISP,		R_ALPHA_GPDISP},
+  {BFD_RELOC_23_PCREL_S2,		R_ALPHA_BRADDR},
+  {BFD_RELOC_ALPHA_HINT,		R_ALPHA_HINT},
+  {BFD_RELOC_16_PCREL,			R_ALPHA_SREL16},
+  {BFD_RELOC_32_PCREL,			R_ALPHA_SREL32},
+  {BFD_RELOC_64_PCREL,			R_ALPHA_SREL64},
+  {BFD_RELOC_ALPHA_GPREL_HI16,		R_ALPHA_GPRELHIGH},
+  {BFD_RELOC_ALPHA_GPREL_LO16,		R_ALPHA_GPRELLOW},
+  {BFD_RELOC_GPREL16,			R_ALPHA_GPREL16},
+  {BFD_RELOC_ALPHA_BRSGP,		R_ALPHA_BRSGP},
+  {BFD_RELOC_ALPHA_TLSGD,		R_ALPHA_TLSGD},
+  {BFD_RELOC_ALPHA_TLSLDM,		R_ALPHA_TLSLDM},
+  {BFD_RELOC_ALPHA_DTPMOD64,		R_ALPHA_DTPMOD64},
+  {BFD_RELOC_ALPHA_GOTDTPREL16,		R_ALPHA_GOTDTPREL},
+  {BFD_RELOC_ALPHA_DTPREL64,		R_ALPHA_DTPREL64},
+  {BFD_RELOC_ALPHA_DTPREL_HI16,		R_ALPHA_DTPRELHI},
+  {BFD_RELOC_ALPHA_DTPREL_LO16,		R_ALPHA_DTPRELLO},
+  {BFD_RELOC_ALPHA_DTPREL16,		R_ALPHA_DTPREL16},
+  {BFD_RELOC_ALPHA_GOTTPREL16,		R_ALPHA_GOTTPREL},
+  {BFD_RELOC_ALPHA_TPREL64,		R_ALPHA_TPREL64},
+  {BFD_RELOC_ALPHA_TPREL_HI16,		R_ALPHA_TPRELHI},
+  {BFD_RELOC_ALPHA_TPREL_LO16,		R_ALPHA_TPRELLO},
+  {BFD_RELOC_ALPHA_TPREL16,		R_ALPHA_TPREL16},
+};
+
+/* Given a BFD reloc type, return a HOWTO structure.  */
+
+static reloc_howto_type *
+elf64_alpha_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				   bfd_reloc_code_real_type code)
+{
+  const struct elf_reloc_map *i, *e;
+  i = e = elf64_alpha_reloc_map;
+  e += sizeof (elf64_alpha_reloc_map) / sizeof (struct elf_reloc_map);
+  for (; i != e; ++i)
+    {
+      if (i->bfd_reloc_val == code)
+	return &elf64_alpha_howto_table[i->elf_reloc_val];
+    }
+  return 0;
+}
+
+static reloc_howto_type *
+elf64_alpha_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				   const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (elf64_alpha_howto_table)
+	    / sizeof (elf64_alpha_howto_table[0]));
+       i++)
+    if (elf64_alpha_howto_table[i].name != NULL
+	&& strcasecmp (elf64_alpha_howto_table[i].name, r_name) == 0)
+      return &elf64_alpha_howto_table[i];
+
+  return NULL;
+}
+
+/* Given an Alpha ELF reloc type, fill in an arelent structure.  */
+
+static void
+elf64_alpha_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr,
+			   Elf_Internal_Rela *dst)
+{
+  unsigned r_type = ELF64_R_TYPE(dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_ALPHA_max);
+  cache_ptr->howto = &elf64_alpha_howto_table[r_type];
+}
+
+/* These two relocations create a two-word entry in the got.  */
+#define alpha_got_entry_size(r_type) \
+  (r_type == R_ALPHA_TLSGD || r_type == R_ALPHA_TLSLDM ? 16 : 8)
+
+/* This is PT_TLS segment p_vaddr.  */
+#define alpha_get_dtprel_base(info) \
+  (elf_hash_table (info)->tls_sec->vma)
+
+/* Main program TLS (whose template starts at PT_TLS p_vaddr)
+   is assigned offset round(16, PT_TLS p_align).  */
+#define alpha_get_tprel_base(info) \
+  (elf_hash_table (info)->tls_sec->vma					\
+   - align_power ((bfd_vma) 16,						\
+		  elf_hash_table (info)->tls_sec->alignment_power))
+
+/* Handle an Alpha specific section when reading an object file.  This
+   is called when bfd_section_from_shdr finds a section with an unknown
+   type.
+   FIXME: We need to handle the SHF_ALPHA_GPREL flag, but I'm not sure
+   how to.  */
+
+static bfd_boolean
+elf64_alpha_section_from_shdr (bfd *abfd,
+			       Elf_Internal_Shdr *hdr,
+			       const char *name,
+			       int shindex)
+{
+  asection *newsect;
+
+  /* There ought to be a place to keep ELF backend specific flags, but
+     at the moment there isn't one.  We just keep track of the
+     sections by their name, instead.  Fortunately, the ABI gives
+     suggested names for all the MIPS specific sections, so we will
+     probably get away with this.  */
+  switch (hdr->sh_type)
+    {
+    case SHT_ALPHA_DEBUG:
+      if (strcmp (name, ".mdebug") != 0)
+	return FALSE;
+      break;
+    default:
+      return FALSE;
+    }
+
+  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex))
+    return FALSE;
+  newsect = hdr->bfd_section;
+
+  if (hdr->sh_type == SHT_ALPHA_DEBUG)
+    {
+      if (! bfd_set_section_flags (abfd, newsect,
+				   (bfd_get_section_flags (abfd, newsect)
+				    | SEC_DEBUGGING)))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Convert Alpha specific section flags to bfd internal section flags.  */
+
+static bfd_boolean
+elf64_alpha_section_flags (flagword *flags, const Elf_Internal_Shdr *hdr)
+{
+  if (hdr->sh_flags & SHF_ALPHA_GPREL)
+    *flags |= SEC_SMALL_DATA;
+
+  return TRUE;
+}
+
+/* Set the correct type for an Alpha ELF section.  We do this by the
+   section name, which is a hack, but ought to work.  */
+
+static bfd_boolean
+elf64_alpha_fake_sections (bfd *abfd, Elf_Internal_Shdr *hdr, asection *sec)
+{
+  register const char *name;
+
+  name = bfd_get_section_name (abfd, sec);
+
+  if (strcmp (name, ".mdebug") == 0)
+    {
+      hdr->sh_type = SHT_ALPHA_DEBUG;
+      /* In a shared object on Irix 5.3, the .mdebug section has an
+         entsize of 0.  FIXME: Does this matter?  */
+      if ((abfd->flags & DYNAMIC) != 0 )
+	hdr->sh_entsize = 0;
+      else
+	hdr->sh_entsize = 1;
+    }
+  else if ((sec->flags & SEC_SMALL_DATA)
+	   || strcmp (name, ".sdata") == 0
+	   || strcmp (name, ".sbss") == 0
+	   || strcmp (name, ".lit4") == 0
+	   || strcmp (name, ".lit8") == 0)
+    hdr->sh_flags |= SHF_ALPHA_GPREL;
+
+  return TRUE;
+}
+
+/* Hook called by the linker routine which adds symbols from an object
+   file.  We use it to put .comm items in .sbss, and not .bss.  */
+
+static bfd_boolean
+elf64_alpha_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
+			     Elf_Internal_Sym *sym,
+			     const char **namep ATTRIBUTE_UNUSED,
+			     flagword *flagsp ATTRIBUTE_UNUSED,
+			     asection **secp, bfd_vma *valp)
+{
+  if (sym->st_shndx == SHN_COMMON
+      && !info->relocatable
+      && sym->st_size <= elf_gp_size (abfd))
+    {
+      /* Common symbols less than or equal to -G nn bytes are
+	 automatically put into .sbss.  */
+
+      asection *scomm = bfd_get_section_by_name (abfd, ".scommon");
+
+      if (scomm == NULL)
+	{
+	  scomm = bfd_make_section_with_flags (abfd, ".scommon",
+					       (SEC_ALLOC
+						| SEC_IS_COMMON
+						| SEC_LINKER_CREATED));
+	  if (scomm == NULL)
+	    return FALSE;
+	}
+
+      *secp = scomm;
+      *valp = sym->st_size;
+    }
+
+  return TRUE;
+}
+
+/* Create the .got section.  */
+
+static bfd_boolean
+elf64_alpha_create_got_section (bfd *abfd,
+				struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  flagword flags;
+  asection *s;
+
+  if (! is_alpha_elf (abfd))
+    return FALSE;
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	   | SEC_LINKER_CREATED);
+  s = bfd_make_section_anyway_with_flags (abfd, ".got", flags);
+  if (s == NULL
+      || !bfd_set_section_alignment (abfd, s, 3))
+    return FALSE;
+
+  alpha_elf_tdata (abfd)->got = s;
+
+  /* Make sure the object's gotobj is set to itself so that we default
+     to every object with its own .got.  We'll merge .gots later once
+     we've collected each object's info.  */
+  alpha_elf_tdata (abfd)->gotobj = abfd;
+
+  return TRUE;
+}
+
+/* Create all the dynamic sections.  */
+
+static bfd_boolean
+elf64_alpha_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  asection *s;
+  flagword flags;
+  struct elf_link_hash_entry *h;
+
+  if (! is_alpha_elf (abfd))
+    return FALSE;
+
+  /* We need to create .plt, .rela.plt, .got, and .rela.got sections.  */
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	   | SEC_LINKER_CREATED
+	   | (elf64_alpha_use_secureplt ? SEC_READONLY : 0));
+  s = bfd_make_section_anyway_with_flags (abfd, ".plt", flags);
+  if (s == NULL || ! bfd_set_section_alignment (abfd, s, 4))
+    return FALSE;
+
+  /* Define the symbol _PROCEDURE_LINKAGE_TABLE_ at the start of the
+     .plt section.  */
+  h = _bfd_elf_define_linkage_sym (abfd, info, s,
+				   "_PROCEDURE_LINKAGE_TABLE_");
+  elf_hash_table (info)->hplt = h;
+  if (h == NULL)
+    return FALSE;
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	   | SEC_LINKER_CREATED | SEC_READONLY);
+  s = bfd_make_section_anyway_with_flags (abfd, ".rela.plt", flags);
+  if (s == NULL || ! bfd_set_section_alignment (abfd, s, 3))
+    return FALSE;
+
+  if (elf64_alpha_use_secureplt)
+    {
+      flags = SEC_ALLOC | SEC_LINKER_CREATED;
+      s = bfd_make_section_anyway_with_flags (abfd, ".got.plt", flags);
+      if (s == NULL || ! bfd_set_section_alignment (abfd, s, 3))
+	return FALSE;
+    }
+
+  /* We may or may not have created a .got section for this object, but
+     we definitely havn't done the rest of the work.  */
+
+  if (alpha_elf_tdata(abfd)->gotobj == NULL)
+    {
+      if (!elf64_alpha_create_got_section (abfd, info))
+	return FALSE;
+    }
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	   | SEC_LINKER_CREATED | SEC_READONLY);
+  s = bfd_make_section_anyway_with_flags (abfd, ".rela.got", flags);
+  if (s == NULL
+      || !bfd_set_section_alignment (abfd, s, 3))
+    return FALSE;
+
+  /* Define the symbol _GLOBAL_OFFSET_TABLE_ at the start of the
+     dynobj's .got section.  We don't do this in the linker script
+     because we don't want to define the symbol if we are not creating
+     a global offset table.  */
+  h = _bfd_elf_define_linkage_sym (abfd, info, alpha_elf_tdata(abfd)->got,
+				   "_GLOBAL_OFFSET_TABLE_");
+  elf_hash_table (info)->hgot = h;
+  if (h == NULL)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Read ECOFF debugging information from a .mdebug section into a
+   ecoff_debug_info structure.  */
+
+static bfd_boolean
+elf64_alpha_read_ecoff_info (bfd *abfd, asection *section,
+			     struct ecoff_debug_info *debug)
+{
+  HDRR *symhdr;
+  const struct ecoff_debug_swap *swap;
+  char *ext_hdr = NULL;
+
+  swap = get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;
+  memset (debug, 0, sizeof (*debug));
+
+  ext_hdr = (char *) bfd_malloc (swap->external_hdr_size);
+  if (ext_hdr == NULL && swap->external_hdr_size != 0)
+    goto error_return;
+
+  if (! bfd_get_section_contents (abfd, section, ext_hdr, (file_ptr) 0,
+				  swap->external_hdr_size))
+    goto error_return;
+
+  symhdr = &debug->symbolic_header;
+  (*swap->swap_hdr_in) (abfd, ext_hdr, symhdr);
+
+  /* The symbolic header contains absolute file offsets and sizes to
+     read.  */
+#define READ(ptr, offset, count, size, type)				\
+  if (symhdr->count == 0)						\
+    debug->ptr = NULL;							\
+  else									\
+    {									\
+      bfd_size_type amt = (bfd_size_type) size * symhdr->count;		\
+      debug->ptr = (type) bfd_malloc (amt);				\
+      if (debug->ptr == NULL)						\
+	goto error_return;						\
+      if (bfd_seek (abfd, (file_ptr) symhdr->offset, SEEK_SET) != 0	\
+	  || bfd_bread (debug->ptr, amt, abfd) != amt)			\
+	goto error_return;						\
+    }
+
+  READ (line, cbLineOffset, cbLine, sizeof (unsigned char), unsigned char *);
+  READ (external_dnr, cbDnOffset, idnMax, swap->external_dnr_size, PTR);
+  READ (external_pdr, cbPdOffset, ipdMax, swap->external_pdr_size, PTR);
+  READ (external_sym, cbSymOffset, isymMax, swap->external_sym_size, PTR);
+  READ (external_opt, cbOptOffset, ioptMax, swap->external_opt_size, PTR);
+  READ (external_aux, cbAuxOffset, iauxMax, sizeof (union aux_ext),
+	union aux_ext *);
+  READ (ss, cbSsOffset, issMax, sizeof (char), char *);
+  READ (ssext, cbSsExtOffset, issExtMax, sizeof (char), char *);
+  READ (external_fdr, cbFdOffset, ifdMax, swap->external_fdr_size, PTR);
+  READ (external_rfd, cbRfdOffset, crfd, swap->external_rfd_size, PTR);
+  READ (external_ext, cbExtOffset, iextMax, swap->external_ext_size, PTR);
+#undef READ
+
+  debug->fdr = NULL;
+
+  return TRUE;
+
+ error_return:
+  if (ext_hdr != NULL)
+    free (ext_hdr);
+  if (debug->line != NULL)
+    free (debug->line);
+  if (debug->external_dnr != NULL)
+    free (debug->external_dnr);
+  if (debug->external_pdr != NULL)
+    free (debug->external_pdr);
+  if (debug->external_sym != NULL)
+    free (debug->external_sym);
+  if (debug->external_opt != NULL)
+    free (debug->external_opt);
+  if (debug->external_aux != NULL)
+    free (debug->external_aux);
+  if (debug->ss != NULL)
+    free (debug->ss);
+  if (debug->ssext != NULL)
+    free (debug->ssext);
+  if (debug->external_fdr != NULL)
+    free (debug->external_fdr);
+  if (debug->external_rfd != NULL)
+    free (debug->external_rfd);
+  if (debug->external_ext != NULL)
+    free (debug->external_ext);
+  return FALSE;
+}
+
+/* Alpha ELF local labels start with '$'.  */
+
+static bfd_boolean
+elf64_alpha_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED, const char *name)
+{
+  return name[0] == '$';
+}
+
+/* Alpha ELF follows MIPS ELF in using a special find_nearest_line
+   routine in order to handle the ECOFF debugging information.  We
+   still call this mips_elf_find_line because of the slot
+   find_line_info in elf_obj_tdata is declared that way.  */
+
+struct mips_elf_find_line
+{
+  struct ecoff_debug_info d;
+  struct ecoff_find_line i;
+};
+
+static bfd_boolean
+elf64_alpha_find_nearest_line (bfd *abfd, asection *section, asymbol **symbols,
+			       bfd_vma offset, const char **filename_ptr,
+			       const char **functionname_ptr,
+			       unsigned int *line_ptr)
+{
+  asection *msec;
+
+  if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
+				     filename_ptr, functionname_ptr,
+				     line_ptr, 0,
+				     &elf_tdata (abfd)->dwarf2_find_line_info))
+    return TRUE;
+
+  msec = bfd_get_section_by_name (abfd, ".mdebug");
+  if (msec != NULL)
+    {
+      flagword origflags;
+      struct mips_elf_find_line *fi;
+      const struct ecoff_debug_swap * const swap =
+	get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;
+
+      /* If we are called during a link, alpha_elf_final_link may have
+	 cleared the SEC_HAS_CONTENTS field.  We force it back on here
+	 if appropriate (which it normally will be).  */
+      origflags = msec->flags;
+      if (elf_section_data (msec)->this_hdr.sh_type != SHT_NOBITS)
+	msec->flags |= SEC_HAS_CONTENTS;
+
+      fi = elf_tdata (abfd)->find_line_info;
+      if (fi == NULL)
+	{
+	  bfd_size_type external_fdr_size;
+	  char *fraw_src;
+	  char *fraw_end;
+	  struct fdr *fdr_ptr;
+	  bfd_size_type amt = sizeof (struct mips_elf_find_line);
+
+	  fi = (struct mips_elf_find_line *) bfd_zalloc (abfd, amt);
+	  if (fi == NULL)
+	    {
+	      msec->flags = origflags;
+	      return FALSE;
+	    }
+
+	  if (!elf64_alpha_read_ecoff_info (abfd, msec, &fi->d))
+	    {
+	      msec->flags = origflags;
+	      return FALSE;
+	    }
+
+	  /* Swap in the FDR information.  */
+	  amt = fi->d.symbolic_header.ifdMax * sizeof (struct fdr);
+	  fi->d.fdr = (struct fdr *) bfd_alloc (abfd, amt);
+	  if (fi->d.fdr == NULL)
+	    {
+	      msec->flags = origflags;
+	      return FALSE;
+	    }
+	  external_fdr_size = swap->external_fdr_size;
+	  fdr_ptr = fi->d.fdr;
+	  fraw_src = (char *) fi->d.external_fdr;
+	  fraw_end = (fraw_src
+		      + fi->d.symbolic_header.ifdMax * external_fdr_size);
+	  for (; fraw_src < fraw_end; fraw_src += external_fdr_size, fdr_ptr++)
+	    (*swap->swap_fdr_in) (abfd, (PTR) fraw_src, fdr_ptr);
+
+	  elf_tdata (abfd)->find_line_info = fi;
+
+	  /* Note that we don't bother to ever free this information.
+             find_nearest_line is either called all the time, as in
+             objdump -l, so the information should be saved, or it is
+             rarely called, as in ld error messages, so the memory
+             wasted is unimportant.  Still, it would probably be a
+             good idea for free_cached_info to throw it away.  */
+	}
+
+      if (_bfd_ecoff_locate_line (abfd, section, offset, &fi->d, swap,
+				  &fi->i, filename_ptr, functionname_ptr,
+				  line_ptr))
+	{
+	  msec->flags = origflags;
+	  return TRUE;
+	}
+
+      msec->flags = origflags;
+    }
+
+  /* Fall back on the generic ELF find_nearest_line routine.  */
+
+  return _bfd_elf_find_nearest_line (abfd, section, symbols, offset,
+				     filename_ptr, functionname_ptr,
+				     line_ptr);
+}
+
+/* Structure used to pass information to alpha_elf_output_extsym.  */
+
+struct extsym_info
+{
+  bfd *abfd;
+  struct bfd_link_info *info;
+  struct ecoff_debug_info *debug;
+  const struct ecoff_debug_swap *swap;
+  bfd_boolean failed;
+};
+
+static bfd_boolean
+elf64_alpha_output_extsym (struct alpha_elf_link_hash_entry *h, PTR data)
+{
+  struct extsym_info *einfo = (struct extsym_info *) data;
+  bfd_boolean strip;
+  asection *sec, *output_section;
+
+  if (h->root.indx == -2)
+    strip = FALSE;
+  else if ((h->root.def_dynamic
+	    || h->root.ref_dynamic
+	    || h->root.root.type == bfd_link_hash_new)
+	   && !h->root.def_regular
+	   && !h->root.ref_regular)
+    strip = TRUE;
+  else if (einfo->info->strip == strip_all
+	   || (einfo->info->strip == strip_some
+	       && bfd_hash_lookup (einfo->info->keep_hash,
+				   h->root.root.root.string,
+				   FALSE, FALSE) == NULL))
+    strip = TRUE;
+  else
+    strip = FALSE;
+
+  if (strip)
+    return TRUE;
+
+  if (h->esym.ifd == -2)
+    {
+      h->esym.jmptbl = 0;
+      h->esym.cobol_main = 0;
+      h->esym.weakext = 0;
+      h->esym.reserved = 0;
+      h->esym.ifd = ifdNil;
+      h->esym.asym.value = 0;
+      h->esym.asym.st = stGlobal;
+
+      if (h->root.root.type != bfd_link_hash_defined
+	  && h->root.root.type != bfd_link_hash_defweak)
+	h->esym.asym.sc = scAbs;
+      else
+	{
+	  const char *name;
+
+	  sec = h->root.root.u.def.section;
+	  output_section = sec->output_section;
+
+	  /* When making a shared library and symbol h is the one from
+	     the another shared library, OUTPUT_SECTION may be null.  */
+	  if (output_section == NULL)
+	    h->esym.asym.sc = scUndefined;
+	  else
+	    {
+	      name = bfd_section_name (output_section->owner, output_section);
+
+	      if (strcmp (name, ".text") == 0)
+		h->esym.asym.sc = scText;
+	      else if (strcmp (name, ".data") == 0)
+		h->esym.asym.sc = scData;
+	      else if (strcmp (name, ".sdata") == 0)
+		h->esym.asym.sc = scSData;
+	      else if (strcmp (name, ".rodata") == 0
+		       || strcmp (name, ".rdata") == 0)
+		h->esym.asym.sc = scRData;
+	      else if (strcmp (name, ".bss") == 0)
+		h->esym.asym.sc = scBss;
+	      else if (strcmp (name, ".sbss") == 0)
+		h->esym.asym.sc = scSBss;
+	      else if (strcmp (name, ".init") == 0)
+		h->esym.asym.sc = scInit;
+	      else if (strcmp (name, ".fini") == 0)
+		h->esym.asym.sc = scFini;
+	      else
+		h->esym.asym.sc = scAbs;
+	    }
+	}
+
+      h->esym.asym.reserved = 0;
+      h->esym.asym.index = indexNil;
+    }
+
+  if (h->root.root.type == bfd_link_hash_common)
+    h->esym.asym.value = h->root.root.u.c.size;
+  else if (h->root.root.type == bfd_link_hash_defined
+	   || h->root.root.type == bfd_link_hash_defweak)
+    {
+      if (h->esym.asym.sc == scCommon)
+	h->esym.asym.sc = scBss;
+      else if (h->esym.asym.sc == scSCommon)
+	h->esym.asym.sc = scSBss;
+
+      sec = h->root.root.u.def.section;
+      output_section = sec->output_section;
+      if (output_section != NULL)
+	h->esym.asym.value = (h->root.root.u.def.value
+			      + sec->output_offset
+			      + output_section->vma);
+      else
+	h->esym.asym.value = 0;
+    }
+
+  if (! bfd_ecoff_debug_one_external (einfo->abfd, einfo->debug, einfo->swap,
+				      h->root.root.root.string,
+				      &h->esym))
+    {
+      einfo->failed = TRUE;
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Search for and possibly create a got entry.  */
+
+static struct alpha_elf_got_entry *
+get_got_entry (bfd *abfd, struct alpha_elf_link_hash_entry *h,
+	       unsigned long r_type, unsigned long r_symndx,
+	       bfd_vma r_addend)
+{
+  struct alpha_elf_got_entry *gotent;
+  struct alpha_elf_got_entry **slot;
+
+  if (h)
+    slot = &h->got_entries;
+  else
+    {
+      /* This is a local .got entry -- record for merge.  */
+
+      struct alpha_elf_got_entry **local_got_entries;
+
+      local_got_entries = alpha_elf_tdata(abfd)->local_got_entries;
+      if (!local_got_entries)
+	{
+	  bfd_size_type size;
+	  Elf_Internal_Shdr *symtab_hdr;
+
+	  symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
+	  size = symtab_hdr->sh_info;
+	  size *= sizeof (struct alpha_elf_got_entry *);
+
+	  local_got_entries
+	    = (struct alpha_elf_got_entry **) bfd_zalloc (abfd, size);
+	  if (!local_got_entries)
+	    return NULL;
+
+	  alpha_elf_tdata (abfd)->local_got_entries = local_got_entries;
+	}
+
+      slot = &local_got_entries[r_symndx];
+    }
+
+  for (gotent = *slot; gotent ; gotent = gotent->next)
+    if (gotent->gotobj == abfd
+	&& gotent->reloc_type == r_type
+	&& gotent->addend == r_addend)
+      break;
+
+  if (!gotent)
+    {
+      int entry_size;
+      bfd_size_type amt;
+
+      amt = sizeof (struct alpha_elf_got_entry);
+      gotent = (struct alpha_elf_got_entry *) bfd_alloc (abfd, amt);
+      if (!gotent)
+	return NULL;
+
+      gotent->gotobj = abfd;
+      gotent->addend = r_addend;
+      gotent->got_offset = -1;
+      gotent->plt_offset = -1;
+      gotent->use_count = 1;
+      gotent->reloc_type = r_type;
+      gotent->reloc_done = 0;
+      gotent->reloc_xlated = 0;
+
+      gotent->next = *slot;
+      *slot = gotent;
+
+      entry_size = alpha_got_entry_size (r_type);
+      alpha_elf_tdata (abfd)->total_got_size += entry_size;
+      if (!h)
+	alpha_elf_tdata(abfd)->local_got_size += entry_size;
+    }
+  else
+    gotent->use_count += 1;
+
+  return gotent;
+}
+
+static bfd_boolean
+elf64_alpha_want_plt (struct alpha_elf_link_hash_entry *ah)
+{
+  return ((ah->root.type == STT_FUNC
+	  || ah->root.root.type == bfd_link_hash_undefweak
+	  || ah->root.root.type == bfd_link_hash_undefined)
+	  && (ah->flags & ALPHA_ELF_LINK_HASH_LU_PLT) != 0
+	  && (ah->flags & ~ALPHA_ELF_LINK_HASH_LU_PLT) == 0);
+}
+
+/* Handle dynamic relocations when doing an Alpha ELF link.  */
+
+static bfd_boolean
+elf64_alpha_check_relocs (bfd *abfd, struct bfd_link_info *info,
+			  asection *sec, const Elf_Internal_Rela *relocs)
+{
+  bfd *dynobj;
+  asection *sreloc;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct alpha_elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel, *relend;
+  bfd_size_type amt;
+
+  if (info->relocatable)
+    return TRUE;
+
+  /* Don't do anything special with non-loaded, non-alloced sections.
+     In particular, any relocs in such sections should not affect GOT
+     and PLT reference counting (ie. we don't allow them to create GOT
+     or PLT entries), there's no possibility or desire to optimize TLS
+     relocs, and there's not much point in propagating relocs to shared
+     libs that the dynamic linker won't relocate.  */
+  if ((sec->flags & SEC_ALLOC) == 0)
+    return TRUE;
+
+  BFD_ASSERT (is_alpha_elf (abfd));
+
+  dynobj = elf_hash_table (info)->dynobj;
+  if (dynobj == NULL)
+    elf_hash_table (info)->dynobj = dynobj = abfd;
+
+  sreloc = NULL;
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = alpha_elf_sym_hashes (abfd);
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; ++rel)
+    {
+      enum {
+	NEED_GOT = 1,
+	NEED_GOT_ENTRY = 2,
+	NEED_DYNREL = 4
+      };
+
+      unsigned long r_symndx, r_type;
+      struct alpha_elf_link_hash_entry *h;
+      unsigned int gotent_flags;
+      bfd_boolean maybe_dynamic;
+      unsigned int need;
+      bfd_vma addend;
+
+      r_symndx = ELF64_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+	h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+
+	  while (h->root.root.type == bfd_link_hash_indirect
+		 || h->root.root.type == bfd_link_hash_warning)
+	    h = (struct alpha_elf_link_hash_entry *)h->root.root.u.i.link;
+
+	  h->root.ref_regular = 1;
+	}
+
+      /* We can only get preliminary data on whether a symbol is
+         locally or externally defined, as not all of the input files
+         have yet been processed.  Do something with what we know, as
+         this may help reduce memory usage and processing time later.  */
+      maybe_dynamic = FALSE;
+      if (h && ((info->shared
+		 && (!info->symbolic
+		     || info->unresolved_syms_in_shared_libs == RM_IGNORE))
+		|| !h->root.def_regular
+		|| h->root.root.type == bfd_link_hash_defweak))
+        maybe_dynamic = TRUE;
+
+      need = 0;
+      gotent_flags = 0;
+      r_type = ELF64_R_TYPE (rel->r_info);
+      addend = rel->r_addend;
+
+      switch (r_type)
+	{
+	case R_ALPHA_LITERAL:
+	  need = NEED_GOT | NEED_GOT_ENTRY;
+
+	  /* Remember how this literal is used from its LITUSEs.
+	     This will be important when it comes to decide if we can
+	     create a .plt entry for a function symbol.  */
+	  while (++rel < relend && ELF64_R_TYPE (rel->r_info) == R_ALPHA_LITUSE)
+	    if (rel->r_addend >= 1 && rel->r_addend <= 6)
+	      gotent_flags |= 1 << rel->r_addend;
+	  --rel;
+
+	  /* No LITUSEs -- presumably the address is used somehow.  */
+	  if (gotent_flags == 0)
+	    gotent_flags = ALPHA_ELF_LINK_HASH_LU_ADDR;
+	  break;
+
+	case R_ALPHA_GPDISP:
+	case R_ALPHA_GPREL16:
+	case R_ALPHA_GPREL32:
+	case R_ALPHA_GPRELHIGH:
+	case R_ALPHA_GPRELLOW:
+	case R_ALPHA_BRSGP:
+	  need = NEED_GOT;
+	  break;
+
+	case R_ALPHA_REFLONG:
+	case R_ALPHA_REFQUAD:
+	  if (info->shared || maybe_dynamic)
+	    need = NEED_DYNREL;
+	  break;
+
+	case R_ALPHA_TLSLDM:
+	  /* The symbol for a TLSLDM reloc is ignored.  Collapse the
+	     reloc to the STN_UNDEF (0) symbol so that they all match.  */
+	  r_symndx = STN_UNDEF;
+	  h = 0;
+	  maybe_dynamic = FALSE;
+	  /* FALLTHRU */
+
+	case R_ALPHA_TLSGD:
+	case R_ALPHA_GOTDTPREL:
+	  need = NEED_GOT | NEED_GOT_ENTRY;
+	  break;
+
+	case R_ALPHA_GOTTPREL:
+	  need = NEED_GOT | NEED_GOT_ENTRY;
+	  gotent_flags = ALPHA_ELF_LINK_HASH_TLS_IE;
+	  if (info->shared)
+	    info->flags |= DF_STATIC_TLS;
+	  break;
+
+	case R_ALPHA_TPREL64:
+	  if (info->shared && !info->pie)
+	    {
+	      info->flags |= DF_STATIC_TLS;
+	      need = NEED_DYNREL;
+	    }
+	  else if (maybe_dynamic)
+	    need = NEED_DYNREL;
+	  break;
+	}
+
+      if (need & NEED_GOT)
+	{
+	  if (alpha_elf_tdata(abfd)->gotobj == NULL)
+	    {
+	      if (!elf64_alpha_create_got_section (abfd, info))
+		return FALSE;
+	    }
+	}
+
+      if (need & NEED_GOT_ENTRY)
+	{
+	  struct alpha_elf_got_entry *gotent;
+
+	  gotent = get_got_entry (abfd, h, r_type, r_symndx, addend);
+	  if (!gotent)
+	    return FALSE;
+
+	  if (gotent_flags)
+	    {
+	      gotent->flags |= gotent_flags;
+	      if (h)
+		{
+		  gotent_flags |= h->flags;
+		  h->flags = gotent_flags;
+
+		  /* Make a guess as to whether a .plt entry is needed.  */
+		  /* ??? It appears that we won't make it into
+		     adjust_dynamic_symbol for symbols that remain
+		     totally undefined.  Copying this check here means
+		     we can create a plt entry for them too.  */
+		  h->root.needs_plt
+		    = (maybe_dynamic && elf64_alpha_want_plt (h));
+		}
+	    }
+	}
+
+      if (need & NEED_DYNREL)
+	{
+	  /* We need to create the section here now whether we eventually
+	     use it or not so that it gets mapped to an output section by
+	     the linker.  If not used, we'll kill it in size_dynamic_sections.  */
+	  if (sreloc == NULL)
+	    {
+	      sreloc = _bfd_elf_make_dynamic_reloc_section
+		(sec, dynobj, 3, abfd, /*rela?*/ TRUE);
+
+	      if (sreloc == NULL)
+		return FALSE;
+	    }
+
+	  if (h)
+	    {
+	      /* Since we havn't seen all of the input symbols yet, we
+		 don't know whether we'll actually need a dynamic relocation
+		 entry for this reloc.  So make a record of it.  Once we
+		 find out if this thing needs dynamic relocation we'll
+		 expand the relocation sections by the appropriate amount.  */
+
+	      struct alpha_elf_reloc_entry *rent;
+
+	      for (rent = h->reloc_entries; rent; rent = rent->next)
+		if (rent->rtype == r_type && rent->srel == sreloc)
+		  break;
+
+	      if (!rent)
+		{
+		  amt = sizeof (struct alpha_elf_reloc_entry);
+		  rent = (struct alpha_elf_reloc_entry *) bfd_alloc (abfd, amt);
+		  if (!rent)
+		    return FALSE;
+
+		  rent->srel = sreloc;
+		  rent->rtype = r_type;
+		  rent->count = 1;
+		  rent->reltext = (sec->flags & SEC_READONLY) != 0;
+
+		  rent->next = h->reloc_entries;
+		  h->reloc_entries = rent;
+		}
+	      else
+		rent->count++;
+	    }
+	  else if (info->shared)
+	    {
+	      /* If this is a shared library, and the section is to be
+		 loaded into memory, we need a RELATIVE reloc.  */
+	      sreloc->size += sizeof (Elf64_External_Rela);
+	      if (sec->flags & SEC_READONLY)
+		info->flags |= DF_TEXTREL;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+static asection *
+elf64_alpha_gc_mark_hook (asection *sec, struct bfd_link_info *info,
+			  Elf_Internal_Rela *rel,
+			  struct elf_link_hash_entry *h, Elf_Internal_Sym *sym)
+{
+  /* These relocations don't really reference a symbol.  Instead we store
+     extra data in their addend slot.  Ignore the symbol.  */
+  switch (ELF64_R_TYPE (rel->r_info))
+    {
+    case R_ALPHA_LITUSE:
+    case R_ALPHA_GPDISP:
+    case R_ALPHA_HINT:
+      return NULL;
+    }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Update the got entry reference counts for the section being removed.  */
+
+static bfd_boolean
+elf64_alpha_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info,
+			   asection *sec, const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct alpha_elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel, *relend;
+
+  if (info->relocatable)
+    return TRUE;
+
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = alpha_elf_sym_hashes (abfd);
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx, r_type;
+      struct alpha_elf_link_hash_entry *h = NULL;
+      struct alpha_elf_got_entry *gotent;
+
+      r_symndx = ELF64_R_SYM (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.root.type == bfd_link_hash_indirect
+		 || h->root.root.type == bfd_link_hash_warning)
+	    h = (struct alpha_elf_link_hash_entry *) h->root.root.u.i.link;
+	}
+
+      r_type = ELF64_R_TYPE (rel->r_info);
+      switch (r_type)
+	{
+	case R_ALPHA_LITERAL:
+	  /* ??? Ignore re-computation of gotent_flags.  We're not
+	     carrying a use-count for each bit in that mask.  */
+
+	case R_ALPHA_TLSGD:
+	case R_ALPHA_GOTDTPREL:
+	case R_ALPHA_GOTTPREL:
+	  /* Fetch the got entry from the tables.  */
+	  gotent = get_got_entry (abfd, h, r_type, r_symndx, rel->r_addend);
+
+	  /* The got entry *must* exist, since we should have created it
+	     before during check_relocs.  Also note that get_got_entry
+	     assumed this was going to be another use, and so incremented
+	     the use count again.  Thus the use count must be at least the
+	     one real use and the "use" we just added.  */
+	  if (gotent == NULL || gotent->use_count < 2)
+	    {
+	      abort ();
+	      return FALSE;
+	    }
+	  gotent->use_count -= 2;
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+elf64_alpha_adjust_dynamic_symbol (struct bfd_link_info *info,
+				   struct elf_link_hash_entry *h)
+{
+  bfd *dynobj;
+  asection *s;
+  struct alpha_elf_link_hash_entry *ah;
+
+  dynobj = elf_hash_table(info)->dynobj;
+  ah = (struct alpha_elf_link_hash_entry *)h;
+
+  /* Now that we've seen all of the input symbols, finalize our decision
+     about whether this symbol should get a .plt entry.  Irritatingly, it
+     is common for folk to leave undefined symbols in shared libraries,
+     and they still expect lazy binding; accept undefined symbols in lieu
+     of STT_FUNC.  */
+  if (alpha_elf_dynamic_symbol_p (h, info) && elf64_alpha_want_plt (ah))
+    {
+      h->needs_plt = TRUE;
+
+      s = bfd_get_section_by_name(dynobj, ".plt");
+      if (!s && !elf64_alpha_create_dynamic_sections (dynobj, info))
+	return FALSE;
+
+      /* We need one plt entry per got subsection.  Delay allocation of
+	 the actual plt entries until size_plt_section, called from
+	 size_dynamic_sections or during relaxation.  */
+
+      return TRUE;
+    }
+  else
+    h->needs_plt = FALSE;
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  The Alpha, since it uses .got entries for all
+     symbols even in regular objects, does not need the hackery of a
+     .dynbss section and COPY dynamic relocations.  */
+
+  return TRUE;
+}
+
+/* Record STO_ALPHA_NOPV and STO_ALPHA_STD_GPLOAD.  */
+
+static void
+elf64_alpha_merge_symbol_attribute (struct elf_link_hash_entry *h,
+				    const Elf_Internal_Sym *isym,
+				    bfd_boolean definition,
+				    bfd_boolean dynamic)
+{
+  if (!dynamic && definition)
+    h->other = ((h->other & ELF_ST_VISIBILITY (-1))
+		| (isym->st_other & ~ELF_ST_VISIBILITY (-1)));
+}
+
+/* Symbol versioning can create new symbols, and make our old symbols
+   indirect to the new ones.  Consolidate the got and reloc information
+   in these situations.  */
+
+static void
+elf64_alpha_copy_indirect_symbol (struct bfd_link_info *info,
+				  struct elf_link_hash_entry *dir,
+				  struct elf_link_hash_entry *ind)
+{
+  struct alpha_elf_link_hash_entry *hi
+    = (struct alpha_elf_link_hash_entry *) ind;
+  struct alpha_elf_link_hash_entry *hs
+    = (struct alpha_elf_link_hash_entry *) dir;
+
+  /* Do the merging in the superclass.  */
+  _bfd_elf_link_hash_copy_indirect(info, dir, ind);
+
+  /* Merge the flags.  Whee.  */
+  hs->flags |= hi->flags;
+
+  /* ??? It's unclear to me what's really supposed to happen when
+     "merging" defweak and defined symbols, given that we don't
+     actually throw away the defweak.  This more-or-less copies
+     the logic related to got and plt entries in the superclass.  */
+  if (ind->root.type != bfd_link_hash_indirect)
+    return;
+
+  /* Merge the .got entries.  Cannibalize the old symbol's list in
+     doing so, since we don't need it anymore.  */
+
+  if (hs->got_entries == NULL)
+    hs->got_entries = hi->got_entries;
+  else
+    {
+      struct alpha_elf_got_entry *gi, *gs, *gin, *gsh;
+
+      gsh = hs->got_entries;
+      for (gi = hi->got_entries; gi ; gi = gin)
+	{
+	  gin = gi->next;
+	  for (gs = gsh; gs ; gs = gs->next)
+	    if (gi->gotobj == gs->gotobj
+		&& gi->reloc_type == gs->reloc_type
+		&& gi->addend == gs->addend)
+	      {
+		gi->use_count += gs->use_count;
+	        goto got_found;
+	      }
+	  gi->next = hs->got_entries;
+	  hs->got_entries = gi;
+	got_found:;
+	}
+    }
+  hi->got_entries = NULL;
+
+  /* And similar for the reloc entries.  */
+
+  if (hs->reloc_entries == NULL)
+    hs->reloc_entries = hi->reloc_entries;
+  else
+    {
+      struct alpha_elf_reloc_entry *ri, *rs, *rin, *rsh;
+
+      rsh = hs->reloc_entries;
+      for (ri = hi->reloc_entries; ri ; ri = rin)
+	{
+	  rin = ri->next;
+	  for (rs = rsh; rs ; rs = rs->next)
+	    if (ri->rtype == rs->rtype && ri->srel == rs->srel)
+	      {
+		rs->count += ri->count;
+		goto found_reloc;
+	      }
+	  ri->next = hs->reloc_entries;
+	  hs->reloc_entries = ri;
+	found_reloc:;
+	}
+    }
+  hi->reloc_entries = NULL;
+}
+
+/* Is it possible to merge two object file's .got tables?  */
+
+static bfd_boolean
+elf64_alpha_can_merge_gots (bfd *a, bfd *b)
+{
+  int total = alpha_elf_tdata (a)->total_got_size;
+  bfd *bsub;
+
+  /* Trivial quick fallout test.  */
+  if (total + alpha_elf_tdata (b)->total_got_size <= MAX_GOT_SIZE)
+    return TRUE;
+
+  /* By their nature, local .got entries cannot be merged.  */
+  if ((total += alpha_elf_tdata (b)->local_got_size) > MAX_GOT_SIZE)
+    return FALSE;
+
+  /* Failing the common trivial comparison, we must effectively
+     perform the merge.  Not actually performing the merge means that
+     we don't have to store undo information in case we fail.  */
+  for (bsub = b; bsub ; bsub = alpha_elf_tdata (bsub)->in_got_link_next)
+    {
+      struct alpha_elf_link_hash_entry **hashes = alpha_elf_sym_hashes (bsub);
+      Elf_Internal_Shdr *symtab_hdr = &elf_tdata (bsub)->symtab_hdr;
+      int i, n;
+
+      n = NUM_SHDR_ENTRIES (symtab_hdr) - symtab_hdr->sh_info;
+      for (i = 0; i < n; ++i)
+	{
+	  struct alpha_elf_got_entry *ae, *be;
+	  struct alpha_elf_link_hash_entry *h;
+
+	  h = hashes[i];
+	  while (h->root.root.type == bfd_link_hash_indirect
+	         || h->root.root.type == bfd_link_hash_warning)
+	    h = (struct alpha_elf_link_hash_entry *)h->root.root.u.i.link;
+
+	  for (be = h->got_entries; be ; be = be->next)
+	    {
+	      if (be->use_count == 0)
+	        continue;
+	      if (be->gotobj != b)
+	        continue;
+
+	      for (ae = h->got_entries; ae ; ae = ae->next)
+	        if (ae->gotobj == a
+		    && ae->reloc_type == be->reloc_type
+		    && ae->addend == be->addend)
+		  goto global_found;
+
+	      total += alpha_got_entry_size (be->reloc_type);
+	      if (total > MAX_GOT_SIZE)
+	        return FALSE;
+	    global_found:;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Actually merge two .got tables.  */
+
+static void
+elf64_alpha_merge_gots (bfd *a, bfd *b)
+{
+  int total = alpha_elf_tdata (a)->total_got_size;
+  bfd *bsub;
+
+  /* Remember local expansion.  */
+  {
+    int e = alpha_elf_tdata (b)->local_got_size;
+    total += e;
+    alpha_elf_tdata (a)->local_got_size += e;
+  }
+
+  for (bsub = b; bsub ; bsub = alpha_elf_tdata (bsub)->in_got_link_next)
+    {
+      struct alpha_elf_got_entry **local_got_entries;
+      struct alpha_elf_link_hash_entry **hashes;
+      Elf_Internal_Shdr *symtab_hdr;
+      int i, n;
+
+      /* Let the local .got entries know they are part of a new subsegment.  */
+      local_got_entries = alpha_elf_tdata (bsub)->local_got_entries;
+      if (local_got_entries)
+        {
+	  n = elf_tdata (bsub)->symtab_hdr.sh_info;
+	  for (i = 0; i < n; ++i)
+	    {
+	      struct alpha_elf_got_entry *ent;
+	      for (ent = local_got_entries[i]; ent; ent = ent->next)
+	        ent->gotobj = a;
+	    }
+        }
+
+      /* Merge the global .got entries.  */
+      hashes = alpha_elf_sym_hashes (bsub);
+      symtab_hdr = &elf_tdata (bsub)->symtab_hdr;
+
+      n = NUM_SHDR_ENTRIES (symtab_hdr) - symtab_hdr->sh_info;
+      for (i = 0; i < n; ++i)
+        {
+	  struct alpha_elf_got_entry *ae, *be, **pbe, **start;
+	  struct alpha_elf_link_hash_entry *h;
+
+	  h = hashes[i];
+	  while (h->root.root.type == bfd_link_hash_indirect
+	         || h->root.root.type == bfd_link_hash_warning)
+	    h = (struct alpha_elf_link_hash_entry *)h->root.root.u.i.link;
+
+	  pbe = start = &h->got_entries;
+	  while ((be = *pbe) != NULL)
+	    {
+	      if (be->use_count == 0)
+	        {
+		  *pbe = be->next;
+		  memset (be, 0xa5, sizeof (*be));
+		  goto kill;
+	        }
+	      if (be->gotobj != b)
+	        goto next;
+
+	      for (ae = *start; ae ; ae = ae->next)
+	        if (ae->gotobj == a
+		    && ae->reloc_type == be->reloc_type
+		    && ae->addend == be->addend)
+		  {
+		    ae->flags |= be->flags;
+		    ae->use_count += be->use_count;
+		    *pbe = be->next;
+		    memset (be, 0xa5, sizeof (*be));
+		    goto kill;
+		  }
+	      be->gotobj = a;
+	      total += alpha_got_entry_size (be->reloc_type);
+
+	    next:;
+	      pbe = &be->next;
+	    kill:;
+	    }
+        }
+
+      alpha_elf_tdata (bsub)->gotobj = a;
+    }
+  alpha_elf_tdata (a)->total_got_size = total;
+
+  /* Merge the two in_got chains.  */
+  {
+    bfd *next;
+
+    bsub = a;
+    while ((next = alpha_elf_tdata (bsub)->in_got_link_next) != NULL)
+      bsub = next;
+
+    alpha_elf_tdata (bsub)->in_got_link_next = b;
+  }
+}
+
+/* Calculate the offsets for the got entries.  */
+
+static bfd_boolean
+elf64_alpha_calc_got_offsets_for_symbol (struct alpha_elf_link_hash_entry *h,
+					 PTR arg ATTRIBUTE_UNUSED)
+{
+  struct alpha_elf_got_entry *gotent;
+
+  for (gotent = h->got_entries; gotent; gotent = gotent->next)
+    if (gotent->use_count > 0)
+      {
+	struct alpha_elf_obj_tdata *td;
+	bfd_size_type *plge;
+
+	td = alpha_elf_tdata (gotent->gotobj);
+	plge = &td->got->size;
+	gotent->got_offset = *plge;
+	*plge += alpha_got_entry_size (gotent->reloc_type);
+      }
+
+  return TRUE;
+}
+
+static void
+elf64_alpha_calc_got_offsets (struct bfd_link_info *info)
+{
+  bfd *i, *got_list;
+  struct alpha_elf_link_hash_table * htab;
+
+  htab = alpha_elf_hash_table (info);
+  if (htab == NULL)
+    return;
+  got_list = htab->got_list;
+
+  /* First, zero out the .got sizes, as we may be recalculating the
+     .got after optimizing it.  */
+  for (i = got_list; i ; i = alpha_elf_tdata(i)->got_link_next)
+    alpha_elf_tdata(i)->got->size = 0;
+
+  /* Next, fill in the offsets for all the global entries.  */
+  alpha_elf_link_hash_traverse (htab,
+				elf64_alpha_calc_got_offsets_for_symbol,
+				NULL);
+
+  /* Finally, fill in the offsets for the local entries.  */
+  for (i = got_list; i ; i = alpha_elf_tdata(i)->got_link_next)
+    {
+      bfd_size_type got_offset = alpha_elf_tdata(i)->got->size;
+      bfd *j;
+
+      for (j = i; j ; j = alpha_elf_tdata(j)->in_got_link_next)
+	{
+	  struct alpha_elf_got_entry **local_got_entries, *gotent;
+	  int k, n;
+
+	  local_got_entries = alpha_elf_tdata(j)->local_got_entries;
+	  if (!local_got_entries)
+	    continue;
+
+	  for (k = 0, n = elf_tdata(j)->symtab_hdr.sh_info; k < n; ++k)
+	    for (gotent = local_got_entries[k]; gotent; gotent = gotent->next)
+	      if (gotent->use_count > 0)
+	        {
+		  gotent->got_offset = got_offset;
+		  got_offset += alpha_got_entry_size (gotent->reloc_type);
+	        }
+	}
+
+      alpha_elf_tdata(i)->got->size = got_offset;
+    }
+}
+
+/* Constructs the gots.  */
+
+static bfd_boolean
+elf64_alpha_size_got_sections (struct bfd_link_info *info)
+{
+  bfd *i, *got_list, *cur_got_obj = NULL;
+  struct alpha_elf_link_hash_table * htab;
+
+  htab = alpha_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+  got_list = htab->got_list;
+
+  /* On the first time through, pretend we have an existing got list
+     consisting of all of the input files.  */
+  if (got_list == NULL)
+    {
+      for (i = info->input_bfds; i ; i = i->link_next)
+	{
+	  bfd *this_got;
+
+	  if (! is_alpha_elf (i))
+	    continue;
+
+	  this_got = alpha_elf_tdata (i)->gotobj;
+	  if (this_got == NULL)
+	    continue;
+
+	  /* We are assuming no merging has yet occurred.  */
+	  BFD_ASSERT (this_got == i);
+
+          if (alpha_elf_tdata (this_got)->total_got_size > MAX_GOT_SIZE)
+	    {
+	      /* Yikes! A single object file has too many entries.  */
+	      (*_bfd_error_handler)
+	        (_("%B: .got subsegment exceeds 64K (size %d)"),
+	         i, alpha_elf_tdata (this_got)->total_got_size);
+	      return FALSE;
+	    }
+
+	  if (got_list == NULL)
+	    got_list = this_got;
+	  else
+	    alpha_elf_tdata(cur_got_obj)->got_link_next = this_got;
+	  cur_got_obj = this_got;
+	}
+
+      /* Strange degenerate case of no got references.  */
+      if (got_list == NULL)
+	return TRUE;
+
+      htab->got_list = got_list;
+    }
+
+  cur_got_obj = got_list;
+  if (cur_got_obj == NULL)
+    return FALSE;
+
+  i = alpha_elf_tdata(cur_got_obj)->got_link_next;
+  while (i != NULL)
+    {
+      if (elf64_alpha_can_merge_gots (cur_got_obj, i))
+	{
+	  elf64_alpha_merge_gots (cur_got_obj, i);
+
+	  alpha_elf_tdata(i)->got->size = 0;
+	  i = alpha_elf_tdata(i)->got_link_next;
+	  alpha_elf_tdata(cur_got_obj)->got_link_next = i;
+	}
+      else
+	{
+	  cur_got_obj = i;
+	  i = alpha_elf_tdata(i)->got_link_next;
+	}
+    }
+
+  /* Once the gots have been merged, fill in the got offsets for
+     everything therein.  */
+  elf64_alpha_calc_got_offsets (info);
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf64_alpha_size_plt_section_1 (struct alpha_elf_link_hash_entry *h, PTR data)
+{
+  asection *splt = (asection *) data;
+  struct alpha_elf_got_entry *gotent;
+  bfd_boolean saw_one = FALSE;
+
+  /* If we didn't need an entry before, we still don't.  */
+  if (!h->root.needs_plt)
+    return TRUE;
+
+  /* For each LITERAL got entry still in use, allocate a plt entry.  */
+  for (gotent = h->got_entries; gotent ; gotent = gotent->next)
+    if (gotent->reloc_type == R_ALPHA_LITERAL
+	&& gotent->use_count > 0)
+      {
+	if (splt->size == 0)
+	  splt->size = PLT_HEADER_SIZE;
+	gotent->plt_offset = splt->size;
+	splt->size += PLT_ENTRY_SIZE;
+	saw_one = TRUE;
+      }
+
+  /* If there weren't any, there's no longer a need for the PLT entry.  */
+  if (!saw_one)
+    h->root.needs_plt = FALSE;
+
+  return TRUE;
+}
+
+/* Called from relax_section to rebuild the PLT in light of potential changes
+   in the function's status.  */
+
+static void
+elf64_alpha_size_plt_section (struct bfd_link_info *info)
+{
+  asection *splt, *spltrel, *sgotplt;
+  unsigned long entries;
+  bfd *dynobj;
+  struct alpha_elf_link_hash_table * htab;
+
+  htab = alpha_elf_hash_table (info);
+  if (htab == NULL)
+    return;
+
+  dynobj = elf_hash_table(info)->dynobj;
+  splt = bfd_get_section_by_name (dynobj, ".plt");
+  if (splt == NULL)
+    return;
+
+  splt->size = 0;
+
+  alpha_elf_link_hash_traverse (htab,
+				elf64_alpha_size_plt_section_1, splt);
+
+  /* Every plt entry requires a JMP_SLOT relocation.  */
+  spltrel = bfd_get_section_by_name (dynobj, ".rela.plt");
+  entries = 0;
+  if (splt->size)
+    {
+      if (elf64_alpha_use_secureplt)
+	entries = (splt->size - NEW_PLT_HEADER_SIZE) / NEW_PLT_ENTRY_SIZE;
+      else
+	entries = (splt->size - OLD_PLT_HEADER_SIZE) / OLD_PLT_ENTRY_SIZE;
+    }
+  spltrel->size = entries * sizeof (Elf64_External_Rela);
+
+  /* When using the secureplt, we need two words somewhere in the data
+     segment for the dynamic linker to tell us where to go.  This is the
+     entire contents of the .got.plt section.  */
+  if (elf64_alpha_use_secureplt)
+    {
+      sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");
+      sgotplt->size = entries ? 16 : 0;
+    }
+}
+
+static bfd_boolean
+elf64_alpha_always_size_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+				  struct bfd_link_info *info)
+{
+  bfd *i;
+  struct alpha_elf_link_hash_table * htab;
+
+  if (info->relocatable)
+    return TRUE;
+
+  htab = alpha_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (!elf64_alpha_size_got_sections (info))
+    return FALSE;
+
+  /* Allocate space for all of the .got subsections.  */
+  i = htab->got_list;
+  for ( ; i ; i = alpha_elf_tdata(i)->got_link_next)
+    {
+      asection *s = alpha_elf_tdata(i)->got;
+      if (s->size > 0)
+	{
+	  s->contents = (bfd_byte *) bfd_zalloc (i, s->size);
+	  if (s->contents == NULL)
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* The number of dynamic relocations required by a static relocation.  */
+
+static int
+alpha_dynamic_entries_for_reloc (int r_type, int dynamic, int shared, int pie)
+{
+  switch (r_type)
+    {
+    /* May appear in GOT entries.  */
+    case R_ALPHA_TLSGD:
+      return (dynamic ? 2 : shared ? 1 : 0);
+    case R_ALPHA_TLSLDM:
+      return shared;
+    case R_ALPHA_LITERAL:
+      return dynamic || shared;
+    case R_ALPHA_GOTTPREL:
+      return dynamic || (shared && !pie);
+    case R_ALPHA_GOTDTPREL:
+      return dynamic;
+
+    /* May appear in data sections.  */
+    case R_ALPHA_REFLONG:
+    case R_ALPHA_REFQUAD:
+      return dynamic || shared;
+    case R_ALPHA_TPREL64:
+      return dynamic || (shared && !pie);
+
+    /* Everything else is illegal.  We'll issue an error during
+       relocate_section.  */
+    default:
+      return 0;
+    }
+}
+
+/* Work out the sizes of the dynamic relocation entries.  */
+
+static bfd_boolean
+elf64_alpha_calc_dynrel_sizes (struct alpha_elf_link_hash_entry *h,
+			       struct bfd_link_info *info)
+{
+  bfd_boolean dynamic;
+  struct alpha_elf_reloc_entry *relent;
+  unsigned long entries;
+
+  /* If the symbol was defined as a common symbol in a regular object
+     file, and there was no definition in any dynamic object, then the
+     linker will have allocated space for the symbol in a common
+     section but the ELF_LINK_HASH_DEF_REGULAR flag will not have been
+     set.  This is done for dynamic symbols in
+     elf_adjust_dynamic_symbol but this is not done for non-dynamic
+     symbols, somehow.  */
+  if (!h->root.def_regular
+      && h->root.ref_regular
+      && !h->root.def_dynamic
+      && (h->root.root.type == bfd_link_hash_defined
+	  || h->root.root.type == bfd_link_hash_defweak)
+      && !(h->root.root.u.def.section->owner->flags & DYNAMIC))
+    h->root.def_regular = 1;
+
+  /* If the symbol is dynamic, we'll need all the relocations in their
+     natural form.  If this is a shared object, and it has been forced
+     local, we'll need the same number of RELATIVE relocations.  */
+  dynamic = alpha_elf_dynamic_symbol_p (&h->root, info);
+
+  /* If the symbol is a hidden undefined weak, then we never have any
+     relocations.  Avoid the loop which may want to add RELATIVE relocs
+     based on info->shared.  */
+  if (h->root.root.type == bfd_link_hash_undefweak && !dynamic)
+    return TRUE;
+
+  for (relent = h->reloc_entries; relent; relent = relent->next)
+    {
+      entries = alpha_dynamic_entries_for_reloc (relent->rtype, dynamic,
+						 info->shared, info->pie);
+      if (entries)
+	{
+	  relent->srel->size +=
+	    entries * sizeof (Elf64_External_Rela) * relent->count;
+	  if (relent->reltext)
+	    info->flags |= DT_TEXTREL;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Subroutine of elf64_alpha_size_rela_got_section for doing the
+   global symbols.  */
+
+static bfd_boolean
+elf64_alpha_size_rela_got_1 (struct alpha_elf_link_hash_entry *h,
+			     struct bfd_link_info *info)
+{
+  bfd_boolean dynamic;
+  struct alpha_elf_got_entry *gotent;
+  unsigned long entries;
+
+  /* If we're using a plt for this symbol, then all of its relocations
+     for its got entries go into .rela.plt.  */
+  if (h->root.needs_plt)
+    return TRUE;
+
+  /* If the symbol is dynamic, we'll need all the relocations in their
+     natural form.  If this is a shared object, and it has been forced
+     local, we'll need the same number of RELATIVE relocations.  */
+  dynamic = alpha_elf_dynamic_symbol_p (&h->root, info);
+
+  /* If the symbol is a hidden undefined weak, then we never have any
+     relocations.  Avoid the loop which may want to add RELATIVE relocs
+     based on info->shared.  */
+  if (h->root.root.type == bfd_link_hash_undefweak && !dynamic)
+    return TRUE;
+
+  entries = 0;
+  for (gotent = h->got_entries; gotent ; gotent = gotent->next)
+    if (gotent->use_count > 0)
+      entries += alpha_dynamic_entries_for_reloc (gotent->reloc_type, dynamic,
+						  info->shared, info->pie);
+
+  if (entries > 0)
+    {
+      bfd *dynobj = elf_hash_table(info)->dynobj;
+      asection *srel = bfd_get_section_by_name (dynobj, ".rela.got");
+      BFD_ASSERT (srel != NULL);
+      srel->size += sizeof (Elf64_External_Rela) * entries;
+    }
+
+  return TRUE;
+}
+
+/* Set the sizes of the dynamic relocation sections.  */
+
+static void
+elf64_alpha_size_rela_got_section (struct bfd_link_info *info)
+{
+  unsigned long entries;
+  bfd *i, *dynobj;
+  asection *srel;
+  struct alpha_elf_link_hash_table * htab;
+
+  htab = alpha_elf_hash_table (info);
+  if (htab == NULL)
+    return;
+
+  /* Shared libraries often require RELATIVE relocs, and some relocs
+     require attention for the main application as well.  */
+
+  entries = 0;
+  for (i = htab->got_list;
+       i ; i = alpha_elf_tdata(i)->got_link_next)
+    {
+      bfd *j;
+
+      for (j = i; j ; j = alpha_elf_tdata(j)->in_got_link_next)
+	{
+	  struct alpha_elf_got_entry **local_got_entries, *gotent;
+	  int k, n;
+
+	  local_got_entries = alpha_elf_tdata(j)->local_got_entries;
+	  if (!local_got_entries)
+	    continue;
+
+	  for (k = 0, n = elf_tdata(j)->symtab_hdr.sh_info; k < n; ++k)
+	    for (gotent = local_got_entries[k];
+		 gotent ; gotent = gotent->next)
+	      if (gotent->use_count > 0)
+		entries += (alpha_dynamic_entries_for_reloc
+			    (gotent->reloc_type, 0, info->shared, info->pie));
+	}
+    }
+
+  dynobj = elf_hash_table(info)->dynobj;
+  srel = bfd_get_section_by_name (dynobj, ".rela.got");
+  if (!srel)
+    {
+      BFD_ASSERT (entries == 0);
+      return;
+    }
+  srel->size = sizeof (Elf64_External_Rela) * entries;
+
+  /* Now do the non-local symbols.  */
+  alpha_elf_link_hash_traverse (htab,
+				elf64_alpha_size_rela_got_1, info);
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+elf64_alpha_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+				   struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *s;
+  bfd_boolean relplt;
+  struct alpha_elf_link_hash_table * htab;
+
+  htab = alpha_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = elf_hash_table(info)->dynobj;
+  BFD_ASSERT(dynobj != NULL);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (s != NULL);
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+
+      /* Now that we've seen all of the input files, we can decide which
+	 symbols need dynamic relocation entries and which don't.  We've
+	 collected information in check_relocs that we can now apply to
+	 size the dynamic relocation sections.  */
+      alpha_elf_link_hash_traverse (htab,
+				    elf64_alpha_calc_dynrel_sizes, info);
+
+      elf64_alpha_size_rela_got_section (info);
+      elf64_alpha_size_plt_section (info);
+    }
+  /* else we're not dynamic and by definition we don't need such things.  */
+
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  relplt = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      const char *name;
+
+      if (!(s->flags & SEC_LINKER_CREATED))
+	continue;
+
+      /* It's OK to base decisions on the section name, because none
+	 of the dynobj section names depend upon the input files.  */
+      name = bfd_get_section_name (dynobj, s);
+
+      if (CONST_STRNEQ (name, ".rela"))
+	{
+	  if (s->size != 0)
+	    {
+	      if (strcmp (name, ".rela.plt") == 0)
+		relplt = TRUE;
+
+	      /* We use the reloc_count field as a counter if we need
+		 to copy relocs into the output file.  */
+	      s->reloc_count = 0;
+	    }
+	}
+      else if (! CONST_STRNEQ (name, ".got")
+	       && strcmp (name, ".plt") != 0
+	       && strcmp (name, ".dynbss") != 0)
+	{
+	  /* It's not one of our dynamic sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (s->size == 0)
+	{
+	  /* If we don't need this section, strip it from the output file.
+	     This is to handle .rela.bss and .rela.plt.  We must create it
+	     in create_dynamic_sections, because it must be created before
+	     the linker maps input sections to output sections.  The
+	     linker does that before adjust_dynamic_symbol is called, and
+	     it is that function which decides whether anything needs to
+	     go into these sections.  */
+	  if (!CONST_STRNEQ (name, ".got"))
+	    s->flags |= SEC_EXCLUDE;
+	}
+      else if ((s->flags & SEC_HAS_CONTENTS) != 0)
+	{
+	  /* Allocate memory for the section contents.  */
+	  s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);
+	  if (s->contents == NULL)
+	    return FALSE;
+	}
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in elf64_alpha_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (info->executable)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (relplt)
+	{
+	  if (!add_dynamic_entry (DT_PLTGOT, 0)
+	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+	      || !add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+
+	  if (elf64_alpha_use_secureplt
+	      && !add_dynamic_entry (DT_ALPHA_PLTRO, 1))
+	    return FALSE;
+	}
+
+      if (!add_dynamic_entry (DT_RELA, 0)
+	  || !add_dynamic_entry (DT_RELASZ, 0)
+	  || !add_dynamic_entry (DT_RELAENT, sizeof (Elf64_External_Rela)))
+	return FALSE;
+
+      if (info->flags & DF_TEXTREL)
+	{
+	  if (!add_dynamic_entry (DT_TEXTREL, 0))
+	    return FALSE;
+	}
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+/* These functions do relaxation for Alpha ELF.
+
+   Currently I'm only handling what I can do with existing compiler
+   and assembler support, which means no instructions are removed,
+   though some may be nopped.  At this time GCC does not emit enough
+   information to do all of the relaxing that is possible.  It will
+   take some not small amount of work for that to happen.
+
+   There are a couple of interesting papers that I once read on this
+   subject, that I cannot find references to at the moment, that
+   related to Alpha in particular.  They are by David Wall, then of
+   DEC WRL.  */
+
+struct alpha_relax_info
+{
+  bfd *abfd;
+  asection *sec;
+  bfd_byte *contents;
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *relocs, *relend;
+  struct bfd_link_info *link_info;
+  bfd_vma gp;
+  bfd *gotobj;
+  asection *tsec;
+  struct alpha_elf_link_hash_entry *h;
+  struct alpha_elf_got_entry **first_gotent;
+  struct alpha_elf_got_entry *gotent;
+  bfd_boolean changed_contents;
+  bfd_boolean changed_relocs;
+  unsigned char other;
+};
+
+static Elf_Internal_Rela *
+elf64_alpha_find_reloc_at_ofs (Elf_Internal_Rela *rel,
+			       Elf_Internal_Rela *relend,
+			       bfd_vma offset, int type)
+{
+  while (rel < relend)
+    {
+      if (rel->r_offset == offset
+	  && ELF64_R_TYPE (rel->r_info) == (unsigned int) type)
+	return rel;
+      ++rel;
+    }
+  return NULL;
+}
+
+static bfd_boolean
+elf64_alpha_relax_got_load (struct alpha_relax_info *info, bfd_vma symval,
+			    Elf_Internal_Rela *irel, unsigned long r_type)
+{
+  unsigned int insn;
+  bfd_signed_vma disp;
+
+  /* Get the instruction.  */
+  insn = bfd_get_32 (info->abfd, info->contents + irel->r_offset);
+
+  if (insn >> 26 != OP_LDQ)
+    {
+      reloc_howto_type *howto = elf64_alpha_howto_table + r_type;
+      ((*_bfd_error_handler)
+       ("%B: %A+0x%lx: warning: %s relocation against unexpected insn",
+	info->abfd, info->sec,
+	(unsigned long) irel->r_offset, howto->name));
+      return TRUE;
+    }
+
+  /* Can't relax dynamic symbols.  */
+  if (alpha_elf_dynamic_symbol_p (&info->h->root, info->link_info))
+    return TRUE;
+
+  /* Can't use local-exec relocations in shared libraries.  */
+  if (r_type == R_ALPHA_GOTTPREL
+      && (info->link_info->shared && !info->link_info->pie))
+    return TRUE;
+
+  if (r_type == R_ALPHA_LITERAL)
+    {
+      /* Look for nice constant addresses.  This includes the not-uncommon
+	 special case of 0 for undefweak symbols.  */
+      if ((info->h && info->h->root.root.type == bfd_link_hash_undefweak)
+	  || (!info->link_info->shared
+	      && (symval >= (bfd_vma)-0x8000 || symval < 0x8000)))
+	{
+	  disp = 0;
+	  insn = (OP_LDA << 26) | (insn & (31 << 21)) | (31 << 16);
+	  insn |= (symval & 0xffff);
+	  r_type = R_ALPHA_NONE;
+	}
+      else
+	{
+	  disp = symval - info->gp;
+	  insn = (OP_LDA << 26) | (insn & 0x03ff0000);
+	  r_type = R_ALPHA_GPREL16;
+	}
+    }
+  else
+    {
+      bfd_vma dtp_base, tp_base;
+
+      BFD_ASSERT (elf_hash_table (info->link_info)->tls_sec != NULL);
+      dtp_base = alpha_get_dtprel_base (info->link_info);
+      tp_base = alpha_get_tprel_base (info->link_info);
+      disp = symval - (r_type == R_ALPHA_GOTDTPREL ? dtp_base : tp_base);
+
+      insn = (OP_LDA << 26) | (insn & (31 << 21)) | (31 << 16);
+
+      switch (r_type)
+	{
+	case R_ALPHA_GOTDTPREL:
+	  r_type = R_ALPHA_DTPREL16;
+	  break;
+	case R_ALPHA_GOTTPREL:
+	  r_type = R_ALPHA_TPREL16;
+	  break;
+	default:
+	  BFD_ASSERT (0);
+	  return FALSE;
+	}
+    }
+
+  if (disp < -0x8000 || disp >= 0x8000)
+    return TRUE;
+
+  bfd_put_32 (info->abfd, (bfd_vma) insn, info->contents + irel->r_offset);
+  info->changed_contents = TRUE;
+
+  /* Reduce the use count on this got entry by one, possibly
+     eliminating it.  */
+  if (--info->gotent->use_count == 0)
+    {
+      int sz = alpha_got_entry_size (r_type);
+      alpha_elf_tdata (info->gotobj)->total_got_size -= sz;
+      if (!info->h)
+	alpha_elf_tdata (info->gotobj)->local_got_size -= sz;
+    }
+
+  /* Smash the existing GOT relocation for its 16-bit immediate pair.  */
+  irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info), r_type);
+  info->changed_relocs = TRUE;
+
+  /* ??? Search forward through this basic block looking for insns
+     that use the target register.  Stop after an insn modifying the
+     register is seen, or after a branch or call.
+
+     Any such memory load insn may be substituted by a load directly
+     off the GP.  This allows the memory load insn to be issued before
+     the calculated GP register would otherwise be ready.
+
+     Any such jsr insn can be replaced by a bsr if it is in range.
+
+     This would mean that we'd have to _add_ relocations, the pain of
+     which gives one pause.  */
+
+  return TRUE;
+}
+
+static bfd_vma
+elf64_alpha_relax_opt_call (struct alpha_relax_info *info, bfd_vma symval)
+{
+  /* If the function has the same gp, and we can identify that the
+     function does not use its function pointer, we can eliminate the
+     address load.  */
+
+  /* If the symbol is marked NOPV, we are being told the function never
+     needs its procedure value.  */
+  if ((info->other & STO_ALPHA_STD_GPLOAD) == STO_ALPHA_NOPV)
+    return symval;
+
+  /* If the symbol is marked STD_GP, we are being told the function does
+     a normal ldgp in the first two words.  */
+  else if ((info->other & STO_ALPHA_STD_GPLOAD) == STO_ALPHA_STD_GPLOAD)
+    ;
+
+  /* Otherwise, we may be able to identify a GP load in the first two
+     words, which we can then skip.  */
+  else
+    {
+      Elf_Internal_Rela *tsec_relocs, *tsec_relend, *tsec_free, *gpdisp;
+      bfd_vma ofs;
+
+      /* Load the relocations from the section that the target symbol is in.  */
+      if (info->sec == info->tsec)
+	{
+	  tsec_relocs = info->relocs;
+	  tsec_relend = info->relend;
+	  tsec_free = NULL;
+	}
+      else
+	{
+	  tsec_relocs = (_bfd_elf_link_read_relocs
+		         (info->abfd, info->tsec, (PTR) NULL,
+			 (Elf_Internal_Rela *) NULL,
+			 info->link_info->keep_memory));
+	  if (tsec_relocs == NULL)
+	    return 0;
+	  tsec_relend = tsec_relocs + info->tsec->reloc_count;
+	  tsec_free = (info->link_info->keep_memory ? NULL : tsec_relocs);
+	}
+
+      /* Recover the symbol's offset within the section.  */
+      ofs = (symval - info->tsec->output_section->vma
+	     - info->tsec->output_offset);
+
+      /* Look for a GPDISP reloc.  */
+      gpdisp = (elf64_alpha_find_reloc_at_ofs
+		(tsec_relocs, tsec_relend, ofs, R_ALPHA_GPDISP));
+
+      if (!gpdisp || gpdisp->r_addend != 4)
+	{
+	  if (tsec_free)
+	    free (tsec_free);
+	  return 0;
+	}
+      if (tsec_free)
+        free (tsec_free);
+    }
+
+  /* We've now determined that we can skip an initial gp load.  Verify
+     that the call and the target use the same gp.   */
+  if (info->link_info->output_bfd->xvec != info->tsec->owner->xvec
+      || info->gotobj != alpha_elf_tdata (info->tsec->owner)->gotobj)
+    return 0;
+
+  return symval + 8;
+}
+
+static bfd_boolean
+elf64_alpha_relax_with_lituse (struct alpha_relax_info *info,
+			       bfd_vma symval, Elf_Internal_Rela *irel)
+{
+  Elf_Internal_Rela *urel, *irelend = info->relend;
+  int flags, count, i;
+  bfd_signed_vma disp;
+  bfd_boolean fits16;
+  bfd_boolean fits32;
+  bfd_boolean lit_reused = FALSE;
+  bfd_boolean all_optimized = TRUE;
+  unsigned int lit_insn;
+
+  lit_insn = bfd_get_32 (info->abfd, info->contents + irel->r_offset);
+  if (lit_insn >> 26 != OP_LDQ)
+    {
+      ((*_bfd_error_handler)
+       ("%B: %A+0x%lx: warning: LITERAL relocation against unexpected insn",
+	info->abfd, info->sec,
+	(unsigned long) irel->r_offset));
+      return TRUE;
+    }
+
+  /* Can't relax dynamic symbols.  */
+  if (alpha_elf_dynamic_symbol_p (&info->h->root, info->link_info))
+    return TRUE;
+
+  /* Summarize how this particular LITERAL is used.  */
+  for (urel = irel+1, flags = count = 0; urel < irelend; ++urel, ++count)
+    {
+      if (ELF64_R_TYPE (urel->r_info) != R_ALPHA_LITUSE)
+	break;
+      if (urel->r_addend <= 6)
+	flags |= 1 << urel->r_addend;
+    }
+
+  /* A little preparation for the loop...  */
+  disp = symval - info->gp;
+
+  for (urel = irel+1, i = 0; i < count; ++i, ++urel)
+    {
+      unsigned int insn;
+      int insn_disp;
+      bfd_signed_vma xdisp;
+
+      insn = bfd_get_32 (info->abfd, info->contents + urel->r_offset);
+
+      switch (urel->r_addend)
+	{
+	case LITUSE_ALPHA_ADDR:
+	default:
+	  /* This type is really just a placeholder to note that all
+	     uses cannot be optimized, but to still allow some.  */
+	  all_optimized = FALSE;
+	  break;
+
+	case LITUSE_ALPHA_BASE:
+	  /* We can always optimize 16-bit displacements.  */
+
+	  /* Extract the displacement from the instruction, sign-extending
+	     it if necessary, then test whether it is within 16 or 32 bits
+	     displacement from GP.  */
+	  insn_disp = ((insn & 0xffff) ^ 0x8000) - 0x8000;
+
+	  xdisp = disp + insn_disp;
+	  fits16 = (xdisp >= - (bfd_signed_vma) 0x8000 && xdisp < 0x8000);
+	  fits32 = (xdisp >= - (bfd_signed_vma) 0x80000000
+		    && xdisp < 0x7fff8000);
+
+	  if (fits16)
+	    {
+	      /* Take the op code and dest from this insn, take the base
+		 register from the literal insn.  Leave the offset alone.  */
+	      insn = (insn & 0xffe0ffff) | (lit_insn & 0x001f0000);
+	      urel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
+					   R_ALPHA_GPREL16);
+	      urel->r_addend = irel->r_addend;
+	      info->changed_relocs = TRUE;
+
+	      bfd_put_32 (info->abfd, (bfd_vma) insn,
+			  info->contents + urel->r_offset);
+	      info->changed_contents = TRUE;
+	    }
+
+	  /* If all mem+byte, we can optimize 32-bit mem displacements.  */
+	  else if (fits32 && !(flags & ~6))
+	    {
+	      /* FIXME: sanity check that lit insn Ra is mem insn Rb.  */
+
+	      irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
+					   R_ALPHA_GPRELHIGH);
+	      lit_insn = (OP_LDAH << 26) | (lit_insn & 0x03ff0000);
+	      bfd_put_32 (info->abfd, (bfd_vma) lit_insn,
+			  info->contents + irel->r_offset);
+	      lit_reused = TRUE;
+	      info->changed_contents = TRUE;
+
+	      urel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
+					   R_ALPHA_GPRELLOW);
+	      urel->r_addend = irel->r_addend;
+	      info->changed_relocs = TRUE;
+	    }
+	  else
+	    all_optimized = FALSE;
+	  break;
+
+	case LITUSE_ALPHA_BYTOFF:
+	  /* We can always optimize byte instructions.  */
+
+	  /* FIXME: sanity check the insn for byte op.  Check that the
+	     literal dest reg is indeed Rb in the byte insn.  */
+
+	  insn &= ~ (unsigned) 0x001ff000;
+	  insn |= ((symval & 7) << 13) | 0x1000;
+
+	  urel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+	  urel->r_addend = 0;
+	  info->changed_relocs = TRUE;
+
+	  bfd_put_32 (info->abfd, (bfd_vma) insn,
+		      info->contents + urel->r_offset);
+	  info->changed_contents = TRUE;
+	  break;
+
+	case LITUSE_ALPHA_JSR:
+	case LITUSE_ALPHA_TLSGD:
+	case LITUSE_ALPHA_TLSLDM:
+	case LITUSE_ALPHA_JSRDIRECT:
+	  {
+	    bfd_vma optdest, org;
+	    bfd_signed_vma odisp;
+
+	    /* For undefined weak symbols, we're mostly interested in getting
+	       rid of the got entry whenever possible, so optimize this to a
+	       use of the zero register.  */
+	    if (info->h && info->h->root.root.type == bfd_link_hash_undefweak)
+	      {
+		insn |= 31 << 16;
+		bfd_put_32 (info->abfd, (bfd_vma) insn,
+			    info->contents + urel->r_offset);
+
+		info->changed_contents = TRUE;
+		break;
+	      }
+
+	    /* If not zero, place to jump without needing pv.  */
+	    optdest = elf64_alpha_relax_opt_call (info, symval);
+	    org = (info->sec->output_section->vma
+		   + info->sec->output_offset
+		   + urel->r_offset + 4);
+	    odisp = (optdest ? optdest : symval) - org;
+
+	    if (odisp >= -0x400000 && odisp < 0x400000)
+	      {
+		Elf_Internal_Rela *xrel;
+
+		/* Preserve branch prediction call stack when possible.  */
+		if ((insn & INSN_JSR_MASK) == INSN_JSR)
+		  insn = (OP_BSR << 26) | (insn & 0x03e00000);
+		else
+		  insn = (OP_BR << 26) | (insn & 0x03e00000);
+
+		urel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
+					     R_ALPHA_BRADDR);
+		urel->r_addend = irel->r_addend;
+
+		if (optdest)
+		  urel->r_addend += optdest - symval;
+		else
+		  all_optimized = FALSE;
+
+		bfd_put_32 (info->abfd, (bfd_vma) insn,
+			    info->contents + urel->r_offset);
+
+		/* Kill any HINT reloc that might exist for this insn.  */
+		xrel = (elf64_alpha_find_reloc_at_ofs
+			(info->relocs, info->relend, urel->r_offset,
+			 R_ALPHA_HINT));
+		if (xrel)
+		  xrel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+
+		info->changed_contents = TRUE;
+		info->changed_relocs = TRUE;
+	      }
+	    else
+	      all_optimized = FALSE;
+
+	    /* Even if the target is not in range for a direct branch,
+	       if we share a GP, we can eliminate the gp reload.  */
+	    if (optdest)
+	      {
+		Elf_Internal_Rela *gpdisp
+		  = (elf64_alpha_find_reloc_at_ofs
+		     (info->relocs, irelend, urel->r_offset + 4,
+		      R_ALPHA_GPDISP));
+		if (gpdisp)
+		  {
+		    bfd_byte *p_ldah = info->contents + gpdisp->r_offset;
+		    bfd_byte *p_lda = p_ldah + gpdisp->r_addend;
+		    unsigned int ldah = bfd_get_32 (info->abfd, p_ldah);
+		    unsigned int lda = bfd_get_32 (info->abfd, p_lda);
+
+		    /* Verify that the instruction is "ldah $29,0($26)".
+		       Consider a function that ends in a noreturn call,
+		       and that the next function begins with an ldgp,
+		       and that by accident there is no padding between.
+		       In that case the insn would use $27 as the base.  */
+		    if (ldah == 0x27ba0000 && lda == 0x23bd0000)
+		      {
+			bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, p_ldah);
+			bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, p_lda);
+
+			gpdisp->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+			info->changed_contents = TRUE;
+			info->changed_relocs = TRUE;
+		      }
+		  }
+	      }
+	  }
+	  break;
+	}
+    }
+
+  /* If all cases were optimized, we can reduce the use count on this
+     got entry by one, possibly eliminating it.  */
+  if (all_optimized)
+    {
+      if (--info->gotent->use_count == 0)
+	{
+	  int sz = alpha_got_entry_size (R_ALPHA_LITERAL);
+	  alpha_elf_tdata (info->gotobj)->total_got_size -= sz;
+	  if (!info->h)
+	    alpha_elf_tdata (info->gotobj)->local_got_size -= sz;
+	}
+
+      /* If the literal instruction is no longer needed (it may have been
+	 reused.  We can eliminate it.  */
+      /* ??? For now, I don't want to deal with compacting the section,
+	 so just nop it out.  */
+      if (!lit_reused)
+	{
+	  irel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+	  info->changed_relocs = TRUE;
+
+	  bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP,
+		      info->contents + irel->r_offset);
+	  info->changed_contents = TRUE;
+	}
+
+      return TRUE;
+    }
+  else
+    return elf64_alpha_relax_got_load (info, symval, irel, R_ALPHA_LITERAL);
+}
+
+static bfd_boolean
+elf64_alpha_relax_tls_get_addr (struct alpha_relax_info *info, bfd_vma symval,
+				Elf_Internal_Rela *irel, bfd_boolean is_gd)
+{
+  bfd_byte *pos[5];
+  unsigned int insn, tlsgd_reg;
+  Elf_Internal_Rela *gpdisp, *hint;
+  bfd_boolean dynamic, use_gottprel;
+  unsigned long new_symndx;
+
+  dynamic = alpha_elf_dynamic_symbol_p (&info->h->root, info->link_info);
+
+  /* If a TLS symbol is accessed using IE at least once, there is no point
+     to use dynamic model for it.  */
+  if (is_gd && info->h && (info->h->flags & ALPHA_ELF_LINK_HASH_TLS_IE))
+    ;
+
+  /* If the symbol is local, and we've already committed to DF_STATIC_TLS,
+     then we might as well relax to IE.  */
+  else if (info->link_info->shared && !dynamic
+	   && (info->link_info->flags & DF_STATIC_TLS))
+    ;
+
+  /* Otherwise we must be building an executable to do anything.  */
+  else if (info->link_info->shared)
+    return TRUE;
+
+  /* The TLSGD/TLSLDM relocation must be followed by a LITERAL and
+     the matching LITUSE_TLS relocations.  */
+  if (irel + 2 >= info->relend)
+    return TRUE;
+  if (ELF64_R_TYPE (irel[1].r_info) != R_ALPHA_LITERAL
+      || ELF64_R_TYPE (irel[2].r_info) != R_ALPHA_LITUSE
+      || irel[2].r_addend != (is_gd ? LITUSE_ALPHA_TLSGD : LITUSE_ALPHA_TLSLDM))
+    return TRUE;
+
+  /* There must be a GPDISP relocation positioned immediately after the
+     LITUSE relocation.  */
+  gpdisp = elf64_alpha_find_reloc_at_ofs (info->relocs, info->relend,
+					  irel[2].r_offset + 4, R_ALPHA_GPDISP);
+  if (!gpdisp)
+    return TRUE;
+
+  pos[0] = info->contents + irel[0].r_offset;
+  pos[1] = info->contents + irel[1].r_offset;
+  pos[2] = info->contents + irel[2].r_offset;
+  pos[3] = info->contents + gpdisp->r_offset;
+  pos[4] = pos[3] + gpdisp->r_addend;
+
+  /* Beware of the compiler hoisting part of the sequence out a loop
+     and adjusting the destination register for the TLSGD insn.  If this
+     happens, there will be a move into $16 before the JSR insn, so only
+     transformations of the first insn pair should use this register.  */
+  tlsgd_reg = bfd_get_32 (info->abfd, pos[0]);
+  tlsgd_reg = (tlsgd_reg >> 21) & 31;
+
+  /* Generally, the positions are not allowed to be out of order, lest the
+     modified insn sequence have different register lifetimes.  We can make
+     an exception when pos 1 is adjacent to pos 0.  */
+  if (pos[1] + 4 == pos[0])
+    {
+      bfd_byte *tmp = pos[0];
+      pos[0] = pos[1];
+      pos[1] = tmp;
+    }
+  if (pos[1] >= pos[2] || pos[2] >= pos[3])
+    return TRUE;
+
+  /* Reduce the use count on the LITERAL relocation.  Do this before we
+     smash the symndx when we adjust the relocations below.  */
+  {
+    struct alpha_elf_got_entry *lit_gotent;
+    struct alpha_elf_link_hash_entry *lit_h;
+    unsigned long indx;
+
+    BFD_ASSERT (ELF64_R_SYM (irel[1].r_info) >= info->symtab_hdr->sh_info);
+    indx = ELF64_R_SYM (irel[1].r_info) - info->symtab_hdr->sh_info;
+    lit_h = alpha_elf_sym_hashes (info->abfd)[indx];
+
+    while (lit_h->root.root.type == bfd_link_hash_indirect
+	   || lit_h->root.root.type == bfd_link_hash_warning)
+      lit_h = (struct alpha_elf_link_hash_entry *) lit_h->root.root.u.i.link;
+
+    for (lit_gotent = lit_h->got_entries; lit_gotent ;
+	 lit_gotent = lit_gotent->next)
+      if (lit_gotent->gotobj == info->gotobj
+	  && lit_gotent->reloc_type == R_ALPHA_LITERAL
+	  && lit_gotent->addend == irel[1].r_addend)
+	break;
+    BFD_ASSERT (lit_gotent);
+
+    if (--lit_gotent->use_count == 0)
+      {
+	int sz = alpha_got_entry_size (R_ALPHA_LITERAL);
+	alpha_elf_tdata (info->gotobj)->total_got_size -= sz;
+      }
+  }
+
+  /* Change
+
+	lda	$16,x($gp)			!tlsgd!1
+	ldq	$27,__tls_get_addr($gp)		!literal!1
+	jsr	$26,($27),__tls_get_addr	!lituse_tlsgd!1
+	ldah	$29,0($26)			!gpdisp!2
+	lda	$29,0($29)			!gpdisp!2
+     to
+	ldq	$16,x($gp)			!gottprel
+	unop
+	call_pal rduniq
+	addq	$16,$0,$0
+	unop
+     or the first pair to
+	lda	$16,x($gp)			!tprel
+	unop
+     or
+	ldah	$16,x($gp)			!tprelhi
+	lda	$16,x($16)			!tprello
+
+     as appropriate.  */
+
+  use_gottprel = FALSE;
+  new_symndx = is_gd ? ELF64_R_SYM (irel->r_info) : STN_UNDEF;
+
+  switch (!dynamic && !info->link_info->shared)
+    {
+    case 1:
+      {
+	bfd_vma tp_base;
+	bfd_signed_vma disp;
+
+	BFD_ASSERT (elf_hash_table (info->link_info)->tls_sec != NULL);
+	tp_base = alpha_get_tprel_base (info->link_info);
+	disp = symval - tp_base;
+
+	if (disp >= -0x8000 && disp < 0x8000)
+	  {
+	    insn = (OP_LDA << 26) | (tlsgd_reg << 21) | (31 << 16);
+	    bfd_put_32 (info->abfd, (bfd_vma) insn, pos[0]);
+	    bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, pos[1]);
+
+	    irel[0].r_offset = pos[0] - info->contents;
+	    irel[0].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_TPREL16);
+	    irel[1].r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+	    break;
+	  }
+	else if (disp >= -(bfd_signed_vma) 0x80000000
+		 && disp < (bfd_signed_vma) 0x7fff8000
+		 && pos[0] + 4 == pos[1])
+	  {
+	    insn = (OP_LDAH << 26) | (tlsgd_reg << 21) | (31 << 16);
+	    bfd_put_32 (info->abfd, (bfd_vma) insn, pos[0]);
+	    insn = (OP_LDA << 26) | (tlsgd_reg << 21) | (tlsgd_reg << 16);
+	    bfd_put_32 (info->abfd, (bfd_vma) insn, pos[1]);
+
+	    irel[0].r_offset = pos[0] - info->contents;
+	    irel[0].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_TPRELHI);
+	    irel[1].r_offset = pos[1] - info->contents;
+	    irel[1].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_TPRELLO);
+	    break;
+	  }
+      }
+      /* FALLTHRU */
+
+    default:
+      use_gottprel = TRUE;
+
+      insn = (OP_LDQ << 26) | (tlsgd_reg << 21) | (29 << 16);
+      bfd_put_32 (info->abfd, (bfd_vma) insn, pos[0]);
+      bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, pos[1]);
+
+      irel[0].r_offset = pos[0] - info->contents;
+      irel[0].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_GOTTPREL);
+      irel[1].r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+      break;
+    }
+
+  bfd_put_32 (info->abfd, (bfd_vma) INSN_RDUNIQ, pos[2]);
+
+  insn = INSN_ADDQ | (16 << 21) | (0 << 16) | (0 << 0);
+  bfd_put_32 (info->abfd, (bfd_vma) insn, pos[3]);
+
+  bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, pos[4]);
+
+  irel[2].r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+  gpdisp->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+
+  hint = elf64_alpha_find_reloc_at_ofs (info->relocs, info->relend,
+					irel[2].r_offset, R_ALPHA_HINT);
+  if (hint)
+    hint->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+
+  info->changed_contents = TRUE;
+  info->changed_relocs = TRUE;
+
+  /* Reduce the use count on the TLSGD/TLSLDM relocation.  */
+  if (--info->gotent->use_count == 0)
+    {
+      int sz = alpha_got_entry_size (info->gotent->reloc_type);
+      alpha_elf_tdata (info->gotobj)->total_got_size -= sz;
+      if (!info->h)
+	alpha_elf_tdata (info->gotobj)->local_got_size -= sz;
+    }
+
+  /* If we've switched to a GOTTPREL relocation, increment the reference
+     count on that got entry.  */
+  if (use_gottprel)
+    {
+      struct alpha_elf_got_entry *tprel_gotent;
+
+      for (tprel_gotent = *info->first_gotent; tprel_gotent ;
+	   tprel_gotent = tprel_gotent->next)
+	if (tprel_gotent->gotobj == info->gotobj
+	    && tprel_gotent->reloc_type == R_ALPHA_GOTTPREL
+	    && tprel_gotent->addend == irel->r_addend)
+	  break;
+      if (tprel_gotent)
+	tprel_gotent->use_count++;
+      else
+	{
+	  if (info->gotent->use_count == 0)
+	    tprel_gotent = info->gotent;
+	  else
+	    {
+	      tprel_gotent = (struct alpha_elf_got_entry *)
+		bfd_alloc (info->abfd, sizeof (struct alpha_elf_got_entry));
+	      if (!tprel_gotent)
+		return FALSE;
+
+	      tprel_gotent->next = *info->first_gotent;
+	      *info->first_gotent = tprel_gotent;
+
+	      tprel_gotent->gotobj = info->gotobj;
+	      tprel_gotent->addend = irel->r_addend;
+	      tprel_gotent->got_offset = -1;
+	      tprel_gotent->reloc_done = 0;
+	      tprel_gotent->reloc_xlated = 0;
+	    }
+
+	  tprel_gotent->use_count = 1;
+	  tprel_gotent->reloc_type = R_ALPHA_GOTTPREL;
+	}
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf64_alpha_relax_section (bfd *abfd, asection *sec,
+			   struct bfd_link_info *link_info, bfd_boolean *again)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *internal_relocs;
+  Elf_Internal_Rela *irel, *irelend;
+  Elf_Internal_Sym *isymbuf = NULL;
+  struct alpha_elf_got_entry **local_got_entries;
+  struct alpha_relax_info info;
+  struct alpha_elf_link_hash_table * htab;
+
+  htab = alpha_elf_hash_table (link_info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* There's nothing to change, yet.  */
+  *again = FALSE;
+
+  if (link_info->relocatable
+      || ((sec->flags & (SEC_CODE | SEC_RELOC | SEC_ALLOC))
+	  != (SEC_CODE | SEC_RELOC | SEC_ALLOC))
+      || sec->reloc_count == 0)
+    return TRUE;
+
+  BFD_ASSERT (is_alpha_elf (abfd));
+
+  /* Make sure our GOT and PLT tables are up-to-date.  */
+  if (htab->relax_trip != link_info->relax_trip)
+    {
+      htab->relax_trip = link_info->relax_trip;
+
+      /* This should never fail after the initial round, since the only
+	 error is GOT overflow, and relaxation only shrinks the table.  */
+      if (!elf64_alpha_size_got_sections (link_info))
+	abort ();
+      if (elf_hash_table (link_info)->dynamic_sections_created)
+	{
+	  elf64_alpha_size_plt_section (link_info);
+	  elf64_alpha_size_rela_got_section (link_info);
+	}
+    }
+
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  local_got_entries = alpha_elf_tdata(abfd)->local_got_entries;
+
+  /* Load the relocations for this section.  */
+  internal_relocs = (_bfd_elf_link_read_relocs
+		     (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
+		      link_info->keep_memory));
+  if (internal_relocs == NULL)
+    return FALSE;
+
+  memset(&info, 0, sizeof (info));
+  info.abfd = abfd;
+  info.sec = sec;
+  info.link_info = link_info;
+  info.symtab_hdr = symtab_hdr;
+  info.relocs = internal_relocs;
+  info.relend = irelend = internal_relocs + sec->reloc_count;
+
+  /* Find the GP for this object.  Do not store the result back via
+     _bfd_set_gp_value, since this could change again before final.  */
+  info.gotobj = alpha_elf_tdata (abfd)->gotobj;
+  if (info.gotobj)
+    {
+      asection *sgot = alpha_elf_tdata (info.gotobj)->got;
+      info.gp = (sgot->output_section->vma
+		 + sgot->output_offset
+		 + 0x8000);
+    }
+
+  /* Get the section contents.  */
+  if (elf_section_data (sec)->this_hdr.contents != NULL)
+    info.contents = elf_section_data (sec)->this_hdr.contents;
+  else
+    {
+      if (!bfd_malloc_and_get_section (abfd, sec, &info.contents))
+	goto error_return;
+    }
+
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      bfd_vma symval;
+      struct alpha_elf_got_entry *gotent;
+      unsigned long r_type = ELF64_R_TYPE (irel->r_info);
+      unsigned long r_symndx = ELF64_R_SYM (irel->r_info);
+
+      /* Early exit for unhandled or unrelaxable relocations.  */
+      switch (r_type)
+	{
+	case R_ALPHA_LITERAL:
+	case R_ALPHA_GPRELHIGH:
+	case R_ALPHA_GPRELLOW:
+	case R_ALPHA_GOTDTPREL:
+	case R_ALPHA_GOTTPREL:
+	case R_ALPHA_TLSGD:
+	  break;
+
+	case R_ALPHA_TLSLDM:
+	  /* The symbol for a TLSLDM reloc is ignored.  Collapse the
+             reloc to the STN_UNDEF (0) symbol so that they all match.  */
+	  r_symndx = STN_UNDEF;
+	  break;
+
+	default:
+	  continue;
+	}
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  /* A local symbol.  */
+	  Elf_Internal_Sym *isym;
+
+	  /* Read this BFD's local symbols.  */
+	  if (isymbuf == NULL)
+	    {
+	      isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	      if (isymbuf == NULL)
+		isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+						symtab_hdr->sh_info, 0,
+						NULL, NULL, NULL);
+	      if (isymbuf == NULL)
+		goto error_return;
+	    }
+
+	  isym = isymbuf + r_symndx;
+
+	  /* Given the symbol for a TLSLDM reloc is ignored, this also
+	     means forcing the symbol value to the tp base.  */
+	  if (r_type == R_ALPHA_TLSLDM)
+	    {
+	      info.tsec = bfd_abs_section_ptr;
+	      symval = alpha_get_tprel_base (info.link_info);
+	    }
+	  else
+	    {
+	      symval = isym->st_value;
+	      if (isym->st_shndx == SHN_UNDEF)
+	        continue;
+	      else if (isym->st_shndx == SHN_ABS)
+	        info.tsec = bfd_abs_section_ptr;
+	      else if (isym->st_shndx == SHN_COMMON)
+	        info.tsec = bfd_com_section_ptr;
+	      else
+	        info.tsec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+	    }
+
+	  info.h = NULL;
+	  info.other = isym->st_other;
+	  if (local_got_entries)
+	    info.first_gotent = &local_got_entries[r_symndx];
+	  else
+	    {
+	      info.first_gotent = &info.gotent;
+	      info.gotent = NULL;
+	    }
+	}
+      else
+	{
+	  unsigned long indx;
+	  struct alpha_elf_link_hash_entry *h;
+
+	  indx = r_symndx - symtab_hdr->sh_info;
+	  h = alpha_elf_sym_hashes (abfd)[indx];
+	  BFD_ASSERT (h != NULL);
+
+	  while (h->root.root.type == bfd_link_hash_indirect
+		 || h->root.root.type == bfd_link_hash_warning)
+	    h = (struct alpha_elf_link_hash_entry *)h->root.root.u.i.link;
+
+	  /* If the symbol is undefined, we can't do anything with it.  */
+	  if (h->root.root.type == bfd_link_hash_undefined)
+	    continue;
+
+	  /* If the symbol isn't defined in the current module,
+	     again we can't do anything.  */
+	  if (h->root.root.type == bfd_link_hash_undefweak)
+	    {
+	      info.tsec = bfd_abs_section_ptr;
+	      symval = 0;
+	    }
+	  else if (!h->root.def_regular)
+	    {
+	      /* Except for TLSGD relocs, which can sometimes be
+		 relaxed to GOTTPREL relocs.  */
+	      if (r_type != R_ALPHA_TLSGD)
+		continue;
+	      info.tsec = bfd_abs_section_ptr;
+	      symval = 0;
+	    }
+	  else
+	    {
+	      info.tsec = h->root.root.u.def.section;
+	      symval = h->root.root.u.def.value;
+	    }
+
+	  info.h = h;
+	  info.other = h->root.other;
+	  info.first_gotent = &h->got_entries;
+	}
+
+      /* Search for the got entry to be used by this relocation.  */
+      for (gotent = *info.first_gotent; gotent ; gotent = gotent->next)
+	if (gotent->gotobj == info.gotobj
+	    && gotent->reloc_type == r_type
+	    && gotent->addend == irel->r_addend)
+	  break;
+      info.gotent = gotent;
+
+      symval += info.tsec->output_section->vma + info.tsec->output_offset;
+      symval += irel->r_addend;
+
+      switch (r_type)
+	{
+	case R_ALPHA_LITERAL:
+	  BFD_ASSERT(info.gotent != NULL);
+
+	  /* If there exist LITUSE relocations immediately following, this
+	     opens up all sorts of interesting optimizations, because we
+	     now know every location that this address load is used.  */
+	  if (irel+1 < irelend
+	      && ELF64_R_TYPE (irel[1].r_info) == R_ALPHA_LITUSE)
+	    {
+	      if (!elf64_alpha_relax_with_lituse (&info, symval, irel))
+		goto error_return;
+	    }
+	  else
+	    {
+	      if (!elf64_alpha_relax_got_load (&info, symval, irel, r_type))
+		goto error_return;
+	    }
+	  break;
+
+	case R_ALPHA_GOTDTPREL:
+	case R_ALPHA_GOTTPREL:
+	  BFD_ASSERT(info.gotent != NULL);
+	  if (!elf64_alpha_relax_got_load (&info, symval, irel, r_type))
+	    goto error_return;
+	  break;
+
+	case R_ALPHA_TLSGD:
+	case R_ALPHA_TLSLDM:
+	  BFD_ASSERT(info.gotent != NULL);
+	  if (!elf64_alpha_relax_tls_get_addr (&info, symval, irel,
+					       r_type == R_ALPHA_TLSGD))
+	    goto error_return;
+	  break;
+	}
+    }
+
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    {
+      if (!link_info->keep_memory)
+	free (isymbuf);
+      else
+	{
+	  /* Cache the symbols for elf_link_input_bfd.  */
+	  symtab_hdr->contents = (unsigned char *) isymbuf;
+	}
+    }
+
+  if (info.contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != info.contents)
+    {
+      if (!info.changed_contents && !link_info->keep_memory)
+	free (info.contents);
+      else
+	{
+	  /* Cache the section contents for elf_link_input_bfd.  */
+	  elf_section_data (sec)->this_hdr.contents = info.contents;
+	}
+    }
+
+  if (elf_section_data (sec)->relocs != internal_relocs)
+    {
+      if (!info.changed_relocs)
+	free (internal_relocs);
+      else
+	elf_section_data (sec)->relocs = internal_relocs;
+    }
+
+  *again = info.changed_contents || info.changed_relocs;
+
+  return TRUE;
+
+ error_return:
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (info.contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != info.contents)
+    free (info.contents);
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+  return FALSE;
+}
+
+/* Emit a dynamic relocation for (DYNINDX, RTYPE, ADDEND) at (SEC, OFFSET)
+   into the next available slot in SREL.  */
+
+static void
+elf64_alpha_emit_dynrel (bfd *abfd, struct bfd_link_info *info,
+			 asection *sec, asection *srel, bfd_vma offset,
+			 long dynindx, long rtype, bfd_vma addend)
+{
+  Elf_Internal_Rela outrel;
+  bfd_byte *loc;
+
+  BFD_ASSERT (srel != NULL);
+
+  outrel.r_info = ELF64_R_INFO (dynindx, rtype);
+  outrel.r_addend = addend;
+
+  offset = _bfd_elf_section_offset (abfd, info, sec, offset);
+  if ((offset | 1) != (bfd_vma) -1)
+    outrel.r_offset = sec->output_section->vma + sec->output_offset + offset;
+  else
+    memset (&outrel, 0, sizeof (outrel));
+
+  loc = srel->contents;
+  loc += srel->reloc_count++ * sizeof (Elf64_External_Rela);
+  bfd_elf64_swap_reloca_out (abfd, &outrel, loc);
+  BFD_ASSERT (sizeof (Elf64_External_Rela) * srel->reloc_count <= srel->size);
+}
+
+/* Relocate an Alpha ELF section for a relocatable link.
+
+   We don't have to change anything unless the reloc is against a section
+   symbol, in which case we have to adjust according to where the section
+   symbol winds up in the output section.  */
+
+static bfd_boolean
+elf64_alpha_relocate_section_r (bfd *output_bfd ATTRIBUTE_UNUSED,
+				struct bfd_link_info *info ATTRIBUTE_UNUSED,
+				bfd *input_bfd, asection *input_section,
+				bfd_byte *contents ATTRIBUTE_UNUSED,
+				Elf_Internal_Rela *relocs,
+				Elf_Internal_Sym *local_syms,
+				asection **local_sections)
+{
+  unsigned long symtab_hdr_sh_info;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_boolean ret_val = TRUE;
+
+  symtab_hdr_sh_info = elf_symtab_hdr (input_bfd).sh_info;
+  sym_hashes = elf_sym_hashes (input_bfd);
+
+  relend = relocs + input_section->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      unsigned long r_type;
+
+      r_type = ELF64_R_TYPE (rel->r_info);
+      if (r_type >= R_ALPHA_max)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B: unknown relocation type %d"),
+	     input_bfd, (int) r_type);
+	  bfd_set_error (bfd_error_bad_value);
+	  ret_val = FALSE;
+	  continue;
+	}
+
+      /* The symbol associated with GPDISP and LITUSE is
+	 immaterial.  Only the addend is significant.  */
+      if (r_type == R_ALPHA_GPDISP || r_type == R_ALPHA_LITUSE)
+	continue;
+
+      r_symndx = ELF64_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr_sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	}
+      else
+	{
+	  struct elf_link_hash_entry *h;
+
+	  h = sym_hashes[r_symndx - symtab_hdr_sh_info];
+
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+	  if (h->root.type != bfd_link_hash_defined
+	      && h->root.type != bfd_link_hash_defweak)
+	    continue;
+
+	  sym = NULL;
+	  sec = h->root.u.def.section;
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend,
+					 elf64_alpha_howto_table + r_type,
+					 contents);
+
+      if (sym != NULL && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+	rel->r_addend += sec->output_offset;
+    }
+
+  return ret_val;
+}
+
+/* Relocate an Alpha ELF section.  */
+
+static bfd_boolean
+elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
+			      bfd *input_bfd, asection *input_section,
+			      bfd_byte *contents, Elf_Internal_Rela *relocs,
+			      Elf_Internal_Sym *local_syms,
+			      asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  asection *sgot, *srel, *srelgot;
+  bfd *dynobj, *gotobj;
+  bfd_vma gp, tp_base, dtp_base;
+  struct alpha_elf_got_entry **local_got_entries;
+  bfd_boolean ret_val;
+
+  BFD_ASSERT (is_alpha_elf (input_bfd));
+  
+  /* Handle relocatable links with a smaller loop.  */
+  if (info->relocatable)
+    return elf64_alpha_relocate_section_r (output_bfd, info, input_bfd,
+					   input_section, contents, relocs,
+					   local_syms, local_sections);
+
+  /* This is a final link.  */
+
+  ret_val = TRUE;
+
+  symtab_hdr = &elf_symtab_hdr (input_bfd);
+
+  dynobj = elf_hash_table (info)->dynobj;
+  if (dynobj)
+    srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+  else
+    srelgot = NULL;
+
+  if (input_section->flags & SEC_ALLOC)
+    {
+      const char *section_name;
+      section_name = (bfd_elf_string_from_elf_section
+		      (input_bfd, elf_elfheader(input_bfd)->e_shstrndx,
+		       _bfd_elf_single_rel_hdr (input_section)->sh_name));
+      BFD_ASSERT(section_name != NULL);
+      srel = bfd_get_section_by_name (dynobj, section_name);
+    }
+  else
+    srel = NULL;
+
+  /* Find the gp value for this input bfd.  */
+  gotobj = alpha_elf_tdata (input_bfd)->gotobj;
+  if (gotobj)
+    {
+      sgot = alpha_elf_tdata (gotobj)->got;
+      gp = _bfd_get_gp_value (gotobj);
+      if (gp == 0)
+	{
+	  gp = (sgot->output_section->vma
+		+ sgot->output_offset
+		+ 0x8000);
+	  _bfd_set_gp_value (gotobj, gp);
+	}
+    }
+  else
+    {
+      sgot = NULL;
+      gp = 0;
+    }
+
+  local_got_entries = alpha_elf_tdata(input_bfd)->local_got_entries;
+
+  if (elf_hash_table (info)->tls_sec != NULL)
+    {
+      dtp_base = alpha_get_dtprel_base (info);
+      tp_base = alpha_get_tprel_base (info);
+    }
+  else
+    dtp_base = tp_base = 0;
+
+  relend = relocs + input_section->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      struct alpha_elf_link_hash_entry *h = NULL;
+      struct alpha_elf_got_entry *gotent;
+      bfd_reloc_status_type r;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym = NULL;
+      asection *sec = NULL;
+      bfd_vma value;
+      bfd_vma addend;
+      bfd_boolean dynamic_symbol_p;
+      bfd_boolean undef_weak_ref = FALSE;
+      unsigned long r_type;
+
+      r_type = ELF64_R_TYPE(rel->r_info);
+      if (r_type >= R_ALPHA_max)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B: unknown relocation type %d"),
+	     input_bfd, (int) r_type);
+	  bfd_set_error (bfd_error_bad_value);
+	  ret_val = FALSE;
+	  continue;
+	}
+
+      howto = elf64_alpha_howto_table + r_type;
+      r_symndx = ELF64_R_SYM(rel->r_info);
+
+      /* The symbol for a TLSLDM reloc is ignored.  Collapse the
+	 reloc to the STN_UNDEF (0) symbol so that they all match.  */
+      if (r_type == R_ALPHA_TLSLDM)
+	r_symndx = STN_UNDEF;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  asection *msec;
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  msec = sec;
+	  value = _bfd_elf_rela_local_sym (output_bfd, sym, &msec, rel);
+
+	  /* If this is a tp-relative relocation against sym STN_UNDEF (0),
+	     this is hackery from relax_section.  Force the value to
+	     be the tls module base.  */
+	  if (r_symndx == STN_UNDEF
+	      && (r_type == R_ALPHA_TLSLDM
+		  || r_type == R_ALPHA_GOTTPREL
+		  || r_type == R_ALPHA_TPREL64
+		  || r_type == R_ALPHA_TPRELHI
+		  || r_type == R_ALPHA_TPRELLO
+		  || r_type == R_ALPHA_TPREL16))
+	    value = dtp_base;
+
+	  if (local_got_entries)
+	    gotent = local_got_entries[r_symndx];
+	  else
+	    gotent = NULL;
+
+	  /* Need to adjust local GOT entries' addends for SEC_MERGE
+	     unless it has been done already.  */
+	  if ((sec->flags & SEC_MERGE)
+	      && ELF_ST_TYPE (sym->st_info) == STT_SECTION
+	      && sec->sec_info_type == ELF_INFO_TYPE_MERGE
+	      && gotent
+	      && !gotent->reloc_xlated)
+	    {
+	      struct alpha_elf_got_entry *ent;
+
+	      for (ent = gotent; ent; ent = ent->next)
+		{
+		  ent->reloc_xlated = 1;
+		  if (ent->use_count == 0)
+		    continue;
+		  msec = sec;
+		  ent->addend =
+		    _bfd_merged_section_offset (output_bfd, &msec,
+						elf_section_data (sec)->
+						  sec_info,
+						sym->st_value + ent->addend);
+		  ent->addend -= sym->st_value;
+		  ent->addend += msec->output_section->vma
+				 + msec->output_offset
+				 - sec->output_section->vma
+				 - sec->output_offset;
+		}
+	    }
+
+	  dynamic_symbol_p = FALSE;
+	}
+      else
+	{
+	  bfd_boolean warned;
+	  bfd_boolean unresolved_reloc;
+	  struct elf_link_hash_entry *hh;
+	  struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd);
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   hh, sec, value,
+				   unresolved_reloc, warned);
+
+	  if (warned)
+	    continue;
+
+	  if (value == 0
+	      && ! unresolved_reloc
+	      && hh->root.type == bfd_link_hash_undefweak)
+	    undef_weak_ref = TRUE;
+
+	  h = (struct alpha_elf_link_hash_entry *) hh;
+          dynamic_symbol_p = alpha_elf_dynamic_symbol_p (&h->root, info);
+	  gotent = h->got_entries;
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      addend = rel->r_addend;
+      value += addend;
+
+      /* Search for the proper got entry.  */
+      for (; gotent ; gotent = gotent->next)
+	if (gotent->gotobj == gotobj
+	    && gotent->reloc_type == r_type
+	    && gotent->addend == addend)
+	  break;
+
+      switch (r_type)
+	{
+	case R_ALPHA_GPDISP:
+	  {
+	    bfd_byte *p_ldah, *p_lda;
+
+	    BFD_ASSERT(gp != 0);
+
+	    value = (input_section->output_section->vma
+		     + input_section->output_offset
+		     + rel->r_offset);
+
+	    p_ldah = contents + rel->r_offset;
+	    p_lda = p_ldah + rel->r_addend;
+
+	    r = elf64_alpha_do_reloc_gpdisp (input_bfd, gp - value,
+					     p_ldah, p_lda);
+	  }
+	  break;
+
+	case R_ALPHA_LITERAL:
+	  BFD_ASSERT(sgot != NULL);
+	  BFD_ASSERT(gp != 0);
+	  BFD_ASSERT(gotent != NULL);
+	  BFD_ASSERT(gotent->use_count >= 1);
+
+	  if (!gotent->reloc_done)
+	    {
+	      gotent->reloc_done = 1;
+
+	      bfd_put_64 (output_bfd, value,
+			  sgot->contents + gotent->got_offset);
+
+	      /* If the symbol has been forced local, output a
+		 RELATIVE reloc, otherwise it will be handled in
+		 finish_dynamic_symbol.  */
+	      if (info->shared && !dynamic_symbol_p && !undef_weak_ref)
+		elf64_alpha_emit_dynrel (output_bfd, info, sgot, srelgot,
+					 gotent->got_offset, 0,
+					 R_ALPHA_RELATIVE, value);
+	    }
+
+	  value = (sgot->output_section->vma
+		   + sgot->output_offset
+		   + gotent->got_offset);
+	  value -= gp;
+	  goto default_reloc;
+
+	case R_ALPHA_GPREL32:
+	case R_ALPHA_GPREL16:
+	case R_ALPHA_GPRELLOW:
+	  if (dynamic_symbol_p)
+            {
+              (*_bfd_error_handler)
+                (_("%B: gp-relative relocation against dynamic symbol %s"),
+                 input_bfd, h->root.root.root.string);
+              ret_val = FALSE;
+            }
+	  BFD_ASSERT(gp != 0);
+	  value -= gp;
+	  goto default_reloc;
+
+	case R_ALPHA_GPRELHIGH:
+	  if (dynamic_symbol_p)
+            {
+              (*_bfd_error_handler)
+                (_("%B: gp-relative relocation against dynamic symbol %s"),
+                 input_bfd, h->root.root.root.string);
+              ret_val = FALSE;
+            }
+	  BFD_ASSERT(gp != 0);
+	  value -= gp;
+	  value = ((bfd_signed_vma) value >> 16) + ((value >> 15) & 1);
+	  goto default_reloc;
+
+	case R_ALPHA_HINT:
+	  /* A call to a dynamic symbol is definitely out of range of
+	     the 16-bit displacement.  Don't bother writing anything.  */
+	  if (dynamic_symbol_p)
+	    {
+	      r = bfd_reloc_ok;
+	      break;
+	    }
+	  /* The regular PC-relative stuff measures from the start of
+	     the instruction rather than the end.  */
+	  value -= 4;
+	  goto default_reloc;
+
+	case R_ALPHA_BRADDR:
+	  if (dynamic_symbol_p)
+            {
+              (*_bfd_error_handler)
+                (_("%B: pc-relative relocation against dynamic symbol %s"),
+                 input_bfd, h->root.root.root.string);
+              ret_val = FALSE;
+            }
+	  /* The regular PC-relative stuff measures from the start of
+	     the instruction rather than the end.  */
+	  value -= 4;
+	  goto default_reloc;
+
+	case R_ALPHA_BRSGP:
+	  {
+	    int other;
+	    const char *name;
+
+	    /* The regular PC-relative stuff measures from the start of
+	       the instruction rather than the end.  */
+	    value -= 4;
+
+	    /* The source and destination gp must be the same.  Note that
+	       the source will always have an assigned gp, since we forced
+	       one in check_relocs, but that the destination may not, as
+	       it might not have had any relocations at all.  Also take
+	       care not to crash if H is an undefined symbol.  */
+	    if (h != NULL && sec != NULL
+		&& alpha_elf_tdata (sec->owner)->gotobj
+		&& gotobj != alpha_elf_tdata (sec->owner)->gotobj)
+	      {
+		(*_bfd_error_handler)
+		  (_("%B: change in gp: BRSGP %s"),
+		   input_bfd, h->root.root.root.string);
+		ret_val = FALSE;
+	      }
+
+	    /* The symbol should be marked either NOPV or STD_GPLOAD.  */
+	    if (h != NULL)
+	      other = h->root.other;
+	    else
+	      other = sym->st_other;
+	    switch (other & STO_ALPHA_STD_GPLOAD)
+	      {
+	      case STO_ALPHA_NOPV:
+	        break;
+	      case STO_ALPHA_STD_GPLOAD:
+		value += 8;
+		break;
+	      default:
+		if (h != NULL)
+		  name = h->root.root.root.string;
+		else
+		  {
+		    name = (bfd_elf_string_from_elf_section
+			    (input_bfd, symtab_hdr->sh_link, sym->st_name));
+		    if (name == NULL)
+		      name = _("<unknown>");
+		    else if (name[0] == 0)
+		      name = bfd_section_name (input_bfd, sec);
+		  }
+		(*_bfd_error_handler)
+		  (_("%B: !samegp reloc against symbol without .prologue: %s"),
+		   input_bfd, name);
+		ret_val = FALSE;
+		break;
+	      }
+
+	    goto default_reloc;
+	  }
+
+	case R_ALPHA_REFLONG:
+	case R_ALPHA_REFQUAD:
+	case R_ALPHA_DTPREL64:
+	case R_ALPHA_TPREL64:
+	  {
+	    long dynindx, dyntype = r_type;
+	    bfd_vma dynaddend;
+
+	    /* Careful here to remember RELATIVE relocations for global
+	       variables for symbolic shared objects.  */
+
+	    if (dynamic_symbol_p)
+	      {
+		BFD_ASSERT(h->root.dynindx != -1);
+		dynindx = h->root.dynindx;
+		dynaddend = addend;
+		addend = 0, value = 0;
+	      }
+	    else if (r_type == R_ALPHA_DTPREL64)
+	      {
+		BFD_ASSERT (elf_hash_table (info)->tls_sec != NULL);
+		value -= dtp_base;
+		goto default_reloc;
+	      }
+	    else if (r_type == R_ALPHA_TPREL64)
+	      {
+		BFD_ASSERT (elf_hash_table (info)->tls_sec != NULL);
+		if (!info->shared || info->pie)
+		  {
+		    value -= tp_base;
+		    goto default_reloc;
+		  }
+		dynindx = 0;
+		dynaddend = value - dtp_base;
+	      }
+	    else if (info->shared
+		     && r_symndx != STN_UNDEF
+		     && (input_section->flags & SEC_ALLOC)
+		     && !undef_weak_ref)
+	      {
+		if (r_type == R_ALPHA_REFLONG)
+		  {
+		    (*_bfd_error_handler)
+		      (_("%B: unhandled dynamic relocation against %s"),
+		       input_bfd,
+		       h->root.root.root.string);
+		    ret_val = FALSE;
+		  }
+		dynindx = 0;
+		dyntype = R_ALPHA_RELATIVE;
+		dynaddend = value;
+	      }
+	    else
+	      goto default_reloc;
+
+	    if (input_section->flags & SEC_ALLOC)
+	      elf64_alpha_emit_dynrel (output_bfd, info, input_section,
+				       srel, rel->r_offset, dynindx,
+				       dyntype, dynaddend);
+	  }
+	  goto default_reloc;
+
+	case R_ALPHA_SREL16:
+	case R_ALPHA_SREL32:
+	case R_ALPHA_SREL64:
+	  if (dynamic_symbol_p)
+            {
+              (*_bfd_error_handler)
+                (_("%B: pc-relative relocation against dynamic symbol %s"),
+                 input_bfd, h->root.root.root.string);
+              ret_val = FALSE;
+            }
+	  else if ((info->shared || info->pie) && undef_weak_ref)
+            {
+              (*_bfd_error_handler)
+                (_("%B: pc-relative relocation against undefined weak symbol %s"),
+                 input_bfd, h->root.root.root.string);
+              ret_val = FALSE;
+            }
+
+
+	  /* ??? .eh_frame references to discarded sections will be smashed
+	     to relocations against SHN_UNDEF.  The .eh_frame format allows
+	     NULL to be encoded as 0 in any format, so this works here.  */
+	  if (r_symndx == STN_UNDEF)
+	    howto = (elf64_alpha_howto_table
+		     + (r_type - R_ALPHA_SREL32 + R_ALPHA_REFLONG));
+	  goto default_reloc;
+
+	case R_ALPHA_TLSLDM:
+	  /* Ignore the symbol for the relocation.  The result is always
+	     the current module.  */
+	  dynamic_symbol_p = 0;
+	  /* FALLTHRU */
+
+	case R_ALPHA_TLSGD:
+	  if (!gotent->reloc_done)
+	    {
+	      gotent->reloc_done = 1;
+
+	      /* Note that the module index for the main program is 1.  */
+	      bfd_put_64 (output_bfd, !info->shared && !dynamic_symbol_p,
+			  sgot->contents + gotent->got_offset);
+
+	      /* If the symbol has been forced local, output a
+		 DTPMOD64 reloc, otherwise it will be handled in
+		 finish_dynamic_symbol.  */
+	      if (info->shared && !dynamic_symbol_p)
+		elf64_alpha_emit_dynrel (output_bfd, info, sgot, srelgot,
+					 gotent->got_offset, 0,
+					 R_ALPHA_DTPMOD64, 0);
+
+	      if (dynamic_symbol_p || r_type == R_ALPHA_TLSLDM)
+		value = 0;
+	      else
+		{
+		  BFD_ASSERT (elf_hash_table (info)->tls_sec != NULL);
+	          value -= dtp_base;
+		}
+	      bfd_put_64 (output_bfd, value,
+			  sgot->contents + gotent->got_offset + 8);
+	    }
+
+	  value = (sgot->output_section->vma
+		   + sgot->output_offset
+		   + gotent->got_offset);
+	  value -= gp;
+	  goto default_reloc;
+
+	case R_ALPHA_DTPRELHI:
+	case R_ALPHA_DTPRELLO:
+	case R_ALPHA_DTPREL16:
+	  if (dynamic_symbol_p)
+            {
+              (*_bfd_error_handler)
+                (_("%B: dtp-relative relocation against dynamic symbol %s"),
+                 input_bfd, h->root.root.root.string);
+              ret_val = FALSE;
+            }
+	  BFD_ASSERT (elf_hash_table (info)->tls_sec != NULL);
+	  value -= dtp_base;
+	  if (r_type == R_ALPHA_DTPRELHI)
+	    value = ((bfd_signed_vma) value >> 16) + ((value >> 15) & 1);
+	  goto default_reloc;
+
+	case R_ALPHA_TPRELHI:
+	case R_ALPHA_TPRELLO:
+	case R_ALPHA_TPREL16:
+	  if (info->shared && !info->pie)
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: TLS local exec code cannot be linked into shared objects"),
+		input_bfd);
+              ret_val = FALSE;
+	    }
+	  else if (dynamic_symbol_p)
+            {
+              (*_bfd_error_handler)
+                (_("%B: tp-relative relocation against dynamic symbol %s"),
+                 input_bfd, h->root.root.root.string);
+              ret_val = FALSE;
+            }
+	  BFD_ASSERT (elf_hash_table (info)->tls_sec != NULL);
+	  value -= tp_base;
+	  if (r_type == R_ALPHA_TPRELHI)
+	    value = ((bfd_signed_vma) value >> 16) + ((value >> 15) & 1);
+	  goto default_reloc;
+
+	case R_ALPHA_GOTDTPREL:
+	case R_ALPHA_GOTTPREL:
+	  BFD_ASSERT(sgot != NULL);
+	  BFD_ASSERT(gp != 0);
+	  BFD_ASSERT(gotent != NULL);
+	  BFD_ASSERT(gotent->use_count >= 1);
+
+	  if (!gotent->reloc_done)
+	    {
+	      gotent->reloc_done = 1;
+
+	      if (dynamic_symbol_p)
+		value = 0;
+	      else
+		{
+		  BFD_ASSERT (elf_hash_table (info)->tls_sec != NULL);
+		  if (r_type == R_ALPHA_GOTDTPREL)
+		    value -= dtp_base;
+		  else if (!info->shared)
+		    value -= tp_base;
+		  else
+		    {
+		      elf64_alpha_emit_dynrel (output_bfd, info, sgot, srelgot,
+					       gotent->got_offset, 0,
+					       R_ALPHA_TPREL64,
+					       value - dtp_base);
+		      value = 0;
+		    }
+		}
+	      bfd_put_64 (output_bfd, value,
+			  sgot->contents + gotent->got_offset);
+	    }
+
+	  value = (sgot->output_section->vma
+		   + sgot->output_offset
+		   + gotent->got_offset);
+	  value -= gp;
+	  goto default_reloc;
+
+	default:
+	default_reloc:
+	  r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+					contents, rel->r_offset, value, 0);
+	  break;
+	}
+
+      switch (r)
+	{
+	case bfd_reloc_ok:
+	  break;
+
+	case bfd_reloc_overflow:
+	  {
+	    const char *name;
+
+	    /* Don't warn if the overflow is due to pc relative reloc
+	       against discarded section.  Section optimization code should
+	       handle it.  */
+
+	    if (r_symndx < symtab_hdr->sh_info
+		&& sec != NULL && howto->pc_relative
+		&& elf_discarded_section (sec))
+	      break;
+
+	    if (h != NULL)
+	      name = NULL;
+	    else
+	      {
+		name = (bfd_elf_string_from_elf_section
+			(input_bfd, symtab_hdr->sh_link, sym->st_name));
+		if (name == NULL)
+		  return FALSE;
+		if (*name == '\0')
+		  name = bfd_section_name (input_bfd, sec);
+	      }
+	    if (! ((*info->callbacks->reloc_overflow)
+		   (info, (h ? &h->root.root : NULL), name, howto->name,
+		    (bfd_vma) 0, input_bfd, input_section,
+		    rel->r_offset)))
+	      ret_val = FALSE;
+	  }
+	  break;
+
+	default:
+	case bfd_reloc_outofrange:
+	  abort ();
+	}
+    }
+
+  return ret_val;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+elf64_alpha_finish_dynamic_symbol (bfd *output_bfd, struct bfd_link_info *info,
+				   struct elf_link_hash_entry *h,
+				   Elf_Internal_Sym *sym)
+{
+  struct alpha_elf_link_hash_entry *ah = (struct alpha_elf_link_hash_entry *)h;
+  bfd *dynobj = elf_hash_table(info)->dynobj;
+
+  if (h->needs_plt)
+    {
+      /* Fill in the .plt entry for this symbol.  */
+      asection *splt, *sgot, *srel;
+      Elf_Internal_Rela outrel;
+      bfd_byte *loc;
+      bfd_vma got_addr, plt_addr;
+      bfd_vma plt_index;
+      struct alpha_elf_got_entry *gotent;
+
+      BFD_ASSERT (h->dynindx != -1);
+
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      BFD_ASSERT (splt != NULL);
+      srel = bfd_get_section_by_name (dynobj, ".rela.plt");
+      BFD_ASSERT (srel != NULL);
+
+      for (gotent = ah->got_entries; gotent ; gotent = gotent->next)
+	if (gotent->reloc_type == R_ALPHA_LITERAL
+	    && gotent->use_count > 0)
+	  {
+	    unsigned int insn;
+	    int disp;
+
+	    sgot = alpha_elf_tdata (gotent->gotobj)->got;
+	    BFD_ASSERT (sgot != NULL);
+
+	    BFD_ASSERT (gotent->got_offset != -1);
+	    BFD_ASSERT (gotent->plt_offset != -1);
+
+	    got_addr = (sgot->output_section->vma
+			+ sgot->output_offset
+			+ gotent->got_offset);
+	    plt_addr = (splt->output_section->vma
+			+ splt->output_offset
+			+ gotent->plt_offset);
+
+	    plt_index = (gotent->plt_offset-PLT_HEADER_SIZE) / PLT_ENTRY_SIZE;
+
+	    /* Fill in the entry in the procedure linkage table.  */
+	    if (elf64_alpha_use_secureplt)
+	      {
+		disp = (PLT_HEADER_SIZE - 4) - (gotent->plt_offset + 4);
+		insn = INSN_AD (INSN_BR, 31, disp);
+		bfd_put_32 (output_bfd, insn,
+			    splt->contents + gotent->plt_offset);
+
+		plt_index = ((gotent->plt_offset - NEW_PLT_HEADER_SIZE)
+			     / NEW_PLT_ENTRY_SIZE);
+	      }
+	    else
+	      {
+		disp = -(gotent->plt_offset + 4);
+		insn = INSN_AD (INSN_BR, 28, disp);
+		bfd_put_32 (output_bfd, insn,
+			    splt->contents + gotent->plt_offset);
+		bfd_put_32 (output_bfd, INSN_UNOP,
+			    splt->contents + gotent->plt_offset + 4);
+		bfd_put_32 (output_bfd, INSN_UNOP,
+			    splt->contents + gotent->plt_offset + 8);
+
+		plt_index = ((gotent->plt_offset - OLD_PLT_HEADER_SIZE)
+			     / OLD_PLT_ENTRY_SIZE);
+	      }
+
+	    /* Fill in the entry in the .rela.plt section.  */
+	    outrel.r_offset = got_addr;
+	    outrel.r_info = ELF64_R_INFO(h->dynindx, R_ALPHA_JMP_SLOT);
+	    outrel.r_addend = 0;
+
+	    loc = srel->contents + plt_index * sizeof (Elf64_External_Rela);
+	    bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);
+
+	    /* Fill in the entry in the .got.  */
+	    bfd_put_64 (output_bfd, plt_addr,
+			sgot->contents + gotent->got_offset);
+	  }
+    }
+  else if (alpha_elf_dynamic_symbol_p (h, info))
+    {
+      /* Fill in the dynamic relocations for this symbol's .got entries.  */
+      asection *srel;
+      struct alpha_elf_got_entry *gotent;
+
+      srel = bfd_get_section_by_name (dynobj, ".rela.got");
+      BFD_ASSERT (srel != NULL);
+
+      for (gotent = ((struct alpha_elf_link_hash_entry *) h)->got_entries;
+	   gotent != NULL;
+	   gotent = gotent->next)
+	{
+	  asection *sgot;
+	  long r_type;
+
+	  if (gotent->use_count == 0)
+	    continue;
+
+	  sgot = alpha_elf_tdata (gotent->gotobj)->got;
+
+	  r_type = gotent->reloc_type;
+	  switch (r_type)
+	    {
+	    case R_ALPHA_LITERAL:
+	      r_type = R_ALPHA_GLOB_DAT;
+	      break;
+	    case R_ALPHA_TLSGD:
+	      r_type = R_ALPHA_DTPMOD64;
+	      break;
+	    case R_ALPHA_GOTDTPREL:
+	      r_type = R_ALPHA_DTPREL64;
+	      break;
+	    case R_ALPHA_GOTTPREL:
+	      r_type = R_ALPHA_TPREL64;
+	      break;
+	    case R_ALPHA_TLSLDM:
+	    default:
+	      abort ();
+	    }
+
+	  elf64_alpha_emit_dynrel (output_bfd, info, sgot, srel, 
+				   gotent->got_offset, h->dynindx,
+				   r_type, gotent->addend);
+
+	  if (gotent->reloc_type == R_ALPHA_TLSGD)
+	    elf64_alpha_emit_dynrel (output_bfd, info, sgot, srel, 
+				     gotent->got_offset + 8, h->dynindx,
+				     R_ALPHA_DTPREL64, gotent->addend);
+	}
+    }
+
+  /* Mark some specially defined symbols as absolute.  */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+      || h == elf_hash_table (info)->hgot
+      || h == elf_hash_table (info)->hplt)
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+elf64_alpha_finish_dynamic_sections (bfd *output_bfd,
+				     struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *sdyn;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      asection *splt, *sgotplt, *srelaplt;
+      Elf64_External_Dyn *dyncon, *dynconend;
+      bfd_vma plt_vma, gotplt_vma;
+
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      srelaplt = bfd_get_section_by_name (output_bfd, ".rela.plt");
+      BFD_ASSERT (splt != NULL && sdyn != NULL);
+
+      plt_vma = splt->output_section->vma + splt->output_offset;
+
+      gotplt_vma = 0;
+      if (elf64_alpha_use_secureplt)
+	{
+	  sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");
+	  BFD_ASSERT (sgotplt != NULL);
+	  if (sgotplt->size > 0)
+	    gotplt_vma = sgotplt->output_section->vma + sgotplt->output_offset;
+	}
+
+      dyncon = (Elf64_External_Dyn *) sdyn->contents;
+      dynconend = (Elf64_External_Dyn *) (sdyn->contents + sdyn->size);
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+
+	  bfd_elf64_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    case DT_PLTGOT:
+	      dyn.d_un.d_ptr
+		= elf64_alpha_use_secureplt ? gotplt_vma : plt_vma;
+	      break;
+	    case DT_PLTRELSZ:
+	      dyn.d_un.d_val = srelaplt ? srelaplt->size : 0;
+	      break;
+	    case DT_JMPREL:
+	      dyn.d_un.d_ptr = srelaplt ? srelaplt->vma : 0;
+	      break;
+
+	    case DT_RELASZ:
+	      /* My interpretation of the TIS v1.1 ELF document indicates
+		 that RELASZ should not include JMPREL.  This is not what
+		 the rest of the BFD does.  It is, however, what the
+		 glibc ld.so wants.  Do this fixup here until we found
+		 out who is right.  */
+	      if (srelaplt)
+		dyn.d_un.d_val -= srelaplt->size;
+	      break;
+	    }
+
+	  bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
+	}
+
+      /* Initialize the plt header.  */
+      if (splt->size > 0)
+	{
+	  unsigned int insn;
+	  int ofs;
+
+	  if (elf64_alpha_use_secureplt)
+	    {
+	      ofs = gotplt_vma - (plt_vma + PLT_HEADER_SIZE);
+
+	      insn = INSN_ABC (INSN_SUBQ, 27, 28, 25);
+	      bfd_put_32 (output_bfd, insn, splt->contents);
+
+	      insn = INSN_ABO (INSN_LDAH, 28, 28, (ofs + 0x8000) >> 16);
+	      bfd_put_32 (output_bfd, insn, splt->contents + 4);
+
+	      insn = INSN_ABC (INSN_S4SUBQ, 25, 25, 25);
+	      bfd_put_32 (output_bfd, insn, splt->contents + 8);
+
+	      insn = INSN_ABO (INSN_LDA, 28, 28, ofs);
+	      bfd_put_32 (output_bfd, insn, splt->contents + 12);
+
+	      insn = INSN_ABO (INSN_LDQ, 27, 28, 0);
+	      bfd_put_32 (output_bfd, insn, splt->contents + 16);
+
+	      insn = INSN_ABC (INSN_ADDQ, 25, 25, 25);
+	      bfd_put_32 (output_bfd, insn, splt->contents + 20);
+
+	      insn = INSN_ABO (INSN_LDQ, 28, 28, 8);
+	      bfd_put_32 (output_bfd, insn, splt->contents + 24);
+
+	      insn = INSN_AB (INSN_JMP, 31, 27);
+	      bfd_put_32 (output_bfd, insn, splt->contents + 28);
+
+	      insn = INSN_AD (INSN_BR, 28, -PLT_HEADER_SIZE);
+	      bfd_put_32 (output_bfd, insn, splt->contents + 32);
+	    }
+	  else
+	    {
+	      insn = INSN_AD (INSN_BR, 27, 0);	/* br $27, .+4 */
+	      bfd_put_32 (output_bfd, insn, splt->contents);
+
+	      insn = INSN_ABO (INSN_LDQ, 27, 27, 12);
+	      bfd_put_32 (output_bfd, insn, splt->contents + 4);
+
+	      insn = INSN_UNOP;
+	      bfd_put_32 (output_bfd, insn, splt->contents + 8);
+
+	      insn = INSN_AB (INSN_JMP, 27, 27);
+	      bfd_put_32 (output_bfd, insn, splt->contents + 12);
+
+	      /* The next two words will be filled in by ld.so.  */
+	      bfd_put_64 (output_bfd, 0, splt->contents + 16);
+	      bfd_put_64 (output_bfd, 0, splt->contents + 24);
+	    }
+
+	  elf_section_data (splt->output_section)->this_hdr.sh_entsize = 0;
+	}
+    }
+
+  return TRUE;
+}
+
+/* We need to use a special link routine to handle the .mdebug section.
+   We need to merge all instances of these sections together, not write
+   them all out sequentially.  */
+
+static bfd_boolean
+elf64_alpha_final_link (bfd *abfd, struct bfd_link_info *info)
+{
+  asection *o;
+  struct bfd_link_order *p;
+  asection *mdebug_sec;
+  struct ecoff_debug_info debug;
+  const struct ecoff_debug_swap *swap
+    = get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;
+  HDRR *symhdr = &debug.symbolic_header;
+  void * mdebug_handle = NULL;
+  struct alpha_elf_link_hash_table * htab;
+
+  htab = alpha_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* Go through the sections and collect the mdebug information.  */
+  mdebug_sec = NULL;
+  for (o = abfd->sections; o != (asection *) NULL; o = o->next)
+    {
+      if (strcmp (o->name, ".mdebug") == 0)
+	{
+	  struct extsym_info einfo;
+
+	  /* We have found the .mdebug section in the output file.
+	     Look through all the link_orders comprising it and merge
+	     the information together.  */
+	  symhdr->magic = swap->sym_magic;
+	  /* FIXME: What should the version stamp be?  */
+	  symhdr->vstamp = 0;
+	  symhdr->ilineMax = 0;
+	  symhdr->cbLine = 0;
+	  symhdr->idnMax = 0;
+	  symhdr->ipdMax = 0;
+	  symhdr->isymMax = 0;
+	  symhdr->ioptMax = 0;
+	  symhdr->iauxMax = 0;
+	  symhdr->issMax = 0;
+	  symhdr->issExtMax = 0;
+	  symhdr->ifdMax = 0;
+	  symhdr->crfd = 0;
+	  symhdr->iextMax = 0;
+
+	  /* We accumulate the debugging information itself in the
+	     debug_info structure.  */
+	  debug.line = NULL;
+	  debug.external_dnr = NULL;
+	  debug.external_pdr = NULL;
+	  debug.external_sym = NULL;
+	  debug.external_opt = NULL;
+	  debug.external_aux = NULL;
+	  debug.ss = NULL;
+	  debug.ssext = debug.ssext_end = NULL;
+	  debug.external_fdr = NULL;
+	  debug.external_rfd = NULL;
+	  debug.external_ext = debug.external_ext_end = NULL;
+
+	  mdebug_handle = bfd_ecoff_debug_init (abfd, &debug, swap, info);
+	  if (mdebug_handle == (PTR) NULL)
+	    return FALSE;
+
+	  if (1)
+	    {
+	      asection *s;
+	      EXTR esym;
+	      bfd_vma last = 0;
+	      unsigned int i;
+	      static const char * const name[] =
+		{
+		  ".text", ".init", ".fini", ".data",
+		  ".rodata", ".sdata", ".sbss", ".bss"
+		};
+	      static const int sc[] = { scText, scInit, scFini, scData,
+					  scRData, scSData, scSBss, scBss };
+
+	      esym.jmptbl = 0;
+	      esym.cobol_main = 0;
+	      esym.weakext = 0;
+	      esym.reserved = 0;
+	      esym.ifd = ifdNil;
+	      esym.asym.iss = issNil;
+	      esym.asym.st = stLocal;
+	      esym.asym.reserved = 0;
+	      esym.asym.index = indexNil;
+	      for (i = 0; i < 8; i++)
+		{
+		  esym.asym.sc = sc[i];
+		  s = bfd_get_section_by_name (abfd, name[i]);
+		  if (s != NULL)
+		    {
+		      esym.asym.value = s->vma;
+		      last = s->vma + s->size;
+		    }
+		  else
+		    esym.asym.value = last;
+
+		  if (! bfd_ecoff_debug_one_external (abfd, &debug, swap,
+						      name[i], &esym))
+		    return FALSE;
+		}
+	    }
+
+	  for (p = o->map_head.link_order;
+	       p != (struct bfd_link_order *) NULL;
+	       p = p->next)
+	    {
+	      asection *input_section;
+	      bfd *input_bfd;
+	      const struct ecoff_debug_swap *input_swap;
+	      struct ecoff_debug_info input_debug;
+	      char *eraw_src;
+	      char *eraw_end;
+
+	      if (p->type != bfd_indirect_link_order)
+		{
+		  if (p->type == bfd_data_link_order)
+		    continue;
+		  abort ();
+		}
+
+	      input_section = p->u.indirect.section;
+	      input_bfd = input_section->owner;
+
+	      if (! is_alpha_elf (input_bfd))
+		/* I don't know what a non ALPHA ELF bfd would be
+		   doing with a .mdebug section, but I don't really
+		   want to deal with it.  */
+		continue;
+
+	      input_swap = (get_elf_backend_data (input_bfd)
+			    ->elf_backend_ecoff_debug_swap);
+
+	      BFD_ASSERT (p->size == input_section->size);
+
+	      /* The ECOFF linking code expects that we have already
+		 read in the debugging information and set up an
+		 ecoff_debug_info structure, so we do that now.  */
+	      if (!elf64_alpha_read_ecoff_info (input_bfd, input_section,
+						&input_debug))
+		return FALSE;
+
+	      if (! (bfd_ecoff_debug_accumulate
+		     (mdebug_handle, abfd, &debug, swap, input_bfd,
+		      &input_debug, input_swap, info)))
+		return FALSE;
+
+	      /* Loop through the external symbols.  For each one with
+		 interesting information, try to find the symbol in
+		 the linker global hash table and save the information
+		 for the output external symbols.  */
+	      eraw_src = (char *) input_debug.external_ext;
+	      eraw_end = (eraw_src
+			  + (input_debug.symbolic_header.iextMax
+			     * input_swap->external_ext_size));
+	      for (;
+		   eraw_src < eraw_end;
+		   eraw_src += input_swap->external_ext_size)
+		{
+		  EXTR ext;
+		  const char *name;
+		  struct alpha_elf_link_hash_entry *h;
+
+		  (*input_swap->swap_ext_in) (input_bfd, (PTR) eraw_src, &ext);
+		  if (ext.asym.sc == scNil
+		      || ext.asym.sc == scUndefined
+		      || ext.asym.sc == scSUndefined)
+		    continue;
+
+		  name = input_debug.ssext + ext.asym.iss;
+		  h = alpha_elf_link_hash_lookup (htab, name, FALSE, FALSE, TRUE);
+		  if (h == NULL || h->esym.ifd != -2)
+		    continue;
+
+		  if (ext.ifd != -1)
+		    {
+		      BFD_ASSERT (ext.ifd
+				  < input_debug.symbolic_header.ifdMax);
+		      ext.ifd = input_debug.ifdmap[ext.ifd];
+		    }
+
+		  h->esym = ext;
+		}
+
+	      /* Free up the information we just read.  */
+	      free (input_debug.line);
+	      free (input_debug.external_dnr);
+	      free (input_debug.external_pdr);
+	      free (input_debug.external_sym);
+	      free (input_debug.external_opt);
+	      free (input_debug.external_aux);
+	      free (input_debug.ss);
+	      free (input_debug.ssext);
+	      free (input_debug.external_fdr);
+	      free (input_debug.external_rfd);
+	      free (input_debug.external_ext);
+
+	      /* Hack: reset the SEC_HAS_CONTENTS flag so that
+		 elf_link_input_bfd ignores this section.  */
+	      input_section->flags &=~ SEC_HAS_CONTENTS;
+	    }
+
+	  /* Build the external symbol information.  */
+	  einfo.abfd = abfd;
+	  einfo.info = info;
+	  einfo.debug = &debug;
+	  einfo.swap = swap;
+	  einfo.failed = FALSE;
+	  elf_link_hash_traverse (elf_hash_table (info),
+				  elf64_alpha_output_extsym,
+				  (PTR) &einfo);
+	  if (einfo.failed)
+	    return FALSE;
+
+	  /* Set the size of the .mdebug section.  */
+	  o->size = bfd_ecoff_debug_size (abfd, &debug, swap);
+
+	  /* Skip this section later on (I don't think this currently
+	     matters, but someday it might).  */
+	  o->map_head.link_order = (struct bfd_link_order *) NULL;
+
+	  mdebug_sec = o;
+	}
+    }
+
+  /* Invoke the regular ELF backend linker to do all the work.  */
+  if (! bfd_elf_final_link (abfd, info))
+    return FALSE;
+
+  /* Now write out the computed sections.  */
+
+  /* The .got subsections...  */
+  {
+    bfd *i, *dynobj = elf_hash_table(info)->dynobj;
+    for (i = htab->got_list;
+	 i != NULL;
+	 i = alpha_elf_tdata(i)->got_link_next)
+      {
+	asection *sgot;
+
+	/* elf_bfd_final_link already did everything in dynobj.  */
+	if (i == dynobj)
+	  continue;
+
+	sgot = alpha_elf_tdata(i)->got;
+	if (! bfd_set_section_contents (abfd, sgot->output_section,
+					sgot->contents,
+					(file_ptr) sgot->output_offset,
+					sgot->size))
+	  return FALSE;
+      }
+  }
+
+  if (mdebug_sec != (asection *) NULL)
+    {
+      BFD_ASSERT (abfd->output_has_begun);
+      if (! bfd_ecoff_write_accumulated_debug (mdebug_handle, abfd, &debug,
+					       swap, info,
+					       mdebug_sec->filepos))
+	return FALSE;
+
+      bfd_ecoff_debug_free (mdebug_handle, abfd, &debug, swap, info);
+    }
+
+  return TRUE;
+}
+
+static enum elf_reloc_type_class
+elf64_alpha_reloc_type_class (const Elf_Internal_Rela *rela)
+{
+  switch ((int) ELF64_R_TYPE (rela->r_info))
+    {
+    case R_ALPHA_RELATIVE:
+      return reloc_class_relative;
+    case R_ALPHA_JMP_SLOT:
+      return reloc_class_plt;
+    case R_ALPHA_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+static const struct bfd_elf_special_section elf64_alpha_special_sections[] =
+{
+  { STRING_COMMA_LEN (".sbss"),  -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE + SHF_ALPHA_GPREL },
+  { STRING_COMMA_LEN (".sdata"), -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_ALPHA_GPREL },
+  { NULL,                     0,  0, 0,            0 }
+};
+
+/* ECOFF swapping routines.  These are used when dealing with the
+   .mdebug section, which is in the ECOFF debugging format.  Copied
+   from elf32-mips.c.  */
+static const struct ecoff_debug_swap
+elf64_alpha_ecoff_debug_swap =
+{
+  /* Symbol table magic number.  */
+  magicSym2,
+  /* Alignment of debugging information.  E.g., 4.  */
+  8,
+  /* Sizes of external symbolic information.  */
+  sizeof (struct hdr_ext),
+  sizeof (struct dnr_ext),
+  sizeof (struct pdr_ext),
+  sizeof (struct sym_ext),
+  sizeof (struct opt_ext),
+  sizeof (struct fdr_ext),
+  sizeof (struct rfd_ext),
+  sizeof (struct ext_ext),
+  /* Functions to swap in external symbolic data.  */
+  ecoff_swap_hdr_in,
+  ecoff_swap_dnr_in,
+  ecoff_swap_pdr_in,
+  ecoff_swap_sym_in,
+  ecoff_swap_opt_in,
+  ecoff_swap_fdr_in,
+  ecoff_swap_rfd_in,
+  ecoff_swap_ext_in,
+  _bfd_ecoff_swap_tir_in,
+  _bfd_ecoff_swap_rndx_in,
+  /* Functions to swap out external symbolic data.  */
+  ecoff_swap_hdr_out,
+  ecoff_swap_dnr_out,
+  ecoff_swap_pdr_out,
+  ecoff_swap_sym_out,
+  ecoff_swap_opt_out,
+  ecoff_swap_fdr_out,
+  ecoff_swap_rfd_out,
+  ecoff_swap_ext_out,
+  _bfd_ecoff_swap_tir_out,
+  _bfd_ecoff_swap_rndx_out,
+  /* Function to read in symbolic data.  */
+  elf64_alpha_read_ecoff_info
+};
+
+/* Use a non-standard hash bucket size of 8.  */
+
+static const struct elf_size_info alpha_elf_size_info =
+{
+  sizeof (Elf64_External_Ehdr),
+  sizeof (Elf64_External_Phdr),
+  sizeof (Elf64_External_Shdr),
+  sizeof (Elf64_External_Rel),
+  sizeof (Elf64_External_Rela),
+  sizeof (Elf64_External_Sym),
+  sizeof (Elf64_External_Dyn),
+  sizeof (Elf_External_Note),
+  8,
+  1,
+  64, 3,
+  ELFCLASS64, EV_CURRENT,
+  bfd_elf64_write_out_phdrs,
+  bfd_elf64_write_shdrs_and_ehdr,
+  bfd_elf64_checksum_contents,
+  bfd_elf64_write_relocs,
+  bfd_elf64_swap_symbol_in,
+  bfd_elf64_swap_symbol_out,
+  bfd_elf64_slurp_reloc_table,
+  bfd_elf64_slurp_symbol_table,
+  bfd_elf64_swap_dyn_in,
+  bfd_elf64_swap_dyn_out,
+  bfd_elf64_swap_reloc_in,
+  bfd_elf64_swap_reloc_out,
+  bfd_elf64_swap_reloca_in,
+  bfd_elf64_swap_reloca_out
+};
+
+#define TARGET_LITTLE_SYM	bfd_elf64_alpha_vec
+#define TARGET_LITTLE_NAME	"elf64-alpha"
+#define ELF_ARCH		bfd_arch_alpha
+#define ELF_TARGET_ID		ALPHA_ELF_DATA
+#define ELF_MACHINE_CODE	EM_ALPHA
+#define ELF_MAXPAGESIZE	0x10000
+#define ELF_COMMONPAGESIZE	0x2000
+
+#define bfd_elf64_bfd_link_hash_table_create \
+  elf64_alpha_bfd_link_hash_table_create
+
+#define bfd_elf64_bfd_reloc_type_lookup \
+  elf64_alpha_bfd_reloc_type_lookup
+#define bfd_elf64_bfd_reloc_name_lookup \
+  elf64_alpha_bfd_reloc_name_lookup
+#define elf_info_to_howto \
+  elf64_alpha_info_to_howto
+
+#define bfd_elf64_mkobject \
+  elf64_alpha_mkobject
+#define elf_backend_object_p \
+  elf64_alpha_object_p
+
+#define elf_backend_section_from_shdr \
+  elf64_alpha_section_from_shdr
+#define elf_backend_section_flags \
+  elf64_alpha_section_flags
+#define elf_backend_fake_sections \
+  elf64_alpha_fake_sections
+
+#define bfd_elf64_bfd_is_local_label_name \
+  elf64_alpha_is_local_label_name
+#define bfd_elf64_find_nearest_line \
+  elf64_alpha_find_nearest_line
+#define bfd_elf64_bfd_relax_section \
+  elf64_alpha_relax_section
+
+#define elf_backend_add_symbol_hook \
+  elf64_alpha_add_symbol_hook
+#define elf_backend_relocs_compatible \
+  _bfd_elf_relocs_compatible
+#define elf_backend_check_relocs \
+  elf64_alpha_check_relocs
+#define elf_backend_create_dynamic_sections \
+  elf64_alpha_create_dynamic_sections
+#define elf_backend_adjust_dynamic_symbol \
+  elf64_alpha_adjust_dynamic_symbol
+#define elf_backend_merge_symbol_attribute \
+  elf64_alpha_merge_symbol_attribute
+#define elf_backend_copy_indirect_symbol \
+  elf64_alpha_copy_indirect_symbol
+#define elf_backend_always_size_sections \
+  elf64_alpha_always_size_sections
+#define elf_backend_size_dynamic_sections \
+  elf64_alpha_size_dynamic_sections
+#define elf_backend_omit_section_dynsym \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true)
+#define elf_backend_relocate_section \
+  elf64_alpha_relocate_section
+#define elf_backend_finish_dynamic_symbol \
+  elf64_alpha_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections \
+  elf64_alpha_finish_dynamic_sections
+#define bfd_elf64_bfd_final_link \
+  elf64_alpha_final_link
+#define elf_backend_reloc_type_class \
+  elf64_alpha_reloc_type_class
+
+#define elf_backend_can_gc_sections	1
+#define elf_backend_gc_mark_hook	elf64_alpha_gc_mark_hook
+#define elf_backend_gc_sweep_hook	elf64_alpha_gc_sweep_hook
+
+#define elf_backend_ecoff_debug_swap \
+  &elf64_alpha_ecoff_debug_swap
+
+#define elf_backend_size_info \
+  alpha_elf_size_info
+
+#define elf_backend_special_sections \
+  elf64_alpha_special_sections
+
+/* A few constants that determine how the .plt section is set up.  */
+#define elf_backend_want_got_plt 0
+#define elf_backend_plt_readonly 0
+#define elf_backend_want_plt_sym 1
+#define elf_backend_got_header_size 0
+
+#include "elf64-target.h"
+
+/* FreeBSD support.  */
+
+#undef TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM	bfd_elf64_alpha_freebsd_vec
+#undef TARGET_LITTLE_NAME
+#define TARGET_LITTLE_NAME	"elf64-alpha-freebsd"
+#undef	ELF_OSABI
+#define	ELF_OSABI		ELFOSABI_FREEBSD
+
+/* The kernel recognizes executables as valid only if they carry a
+   "FreeBSD" label in the ELF header.  So we put this label on all
+   executables and (for simplicity) also all other object files.  */
+
+static void
+elf64_alpha_fbsd_post_process_headers (bfd * abfd,
+	struct bfd_link_info * link_info ATTRIBUTE_UNUSED)
+{
+  Elf_Internal_Ehdr * i_ehdrp;	/* ELF file header, internal form.  */
+
+  i_ehdrp = elf_elfheader (abfd);
+
+  /* Put an ABI label supported by FreeBSD >= 4.1.  */
+  i_ehdrp->e_ident[EI_OSABI] = get_elf_backend_data (abfd)->elf_osabi;
+#ifdef OLD_FREEBSD_ABI_LABEL
+  /* The ABI label supported by FreeBSD <= 4.0 is quite nonstandard.  */
+  memcpy (&i_ehdrp->e_ident[EI_ABIVERSION], "FreeBSD", 8);
+#endif
+}
+
+#undef elf_backend_post_process_headers
+#define elf_backend_post_process_headers \
+  elf64_alpha_fbsd_post_process_headers
+
+#undef  elf64_bed
+#define elf64_bed elf64_alpha_fbsd_bed
+
+#include "elf64-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-gen.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-gen.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-gen.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-gen.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,103 @@
+/* Generic support for 64-bit ELF
+   Copyright 1993, 1995, 1998, 1999, 2001, 2002, 2004, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+
+/* This does not include any relocation information, but should be
+   good enough for GDB or objdump to read the file.  */
+
+static reloc_howto_type dummy =
+  HOWTO (0,			/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "UNKNOWN",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+static void
+elf_generic_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+			   arelent *bfd_reloc,
+			   Elf_Internal_Rela *elf_reloc ATTRIBUTE_UNUSED)
+{
+  bfd_reloc->howto = &dummy;
+}
+
+static void
+elf_generic_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+			       arelent *bfd_reloc,
+			       Elf_Internal_Rela *elf_reloc ATTRIBUTE_UNUSED)
+{
+  bfd_reloc->howto = &dummy;
+}
+
+static void
+check_for_relocs (bfd * abfd, asection * o, void * failed)
+{
+  if ((o->flags & SEC_RELOC) != 0)
+    {
+      Elf_Internal_Ehdr *ehdrp;
+
+      ehdrp = elf_elfheader (abfd);
+      _bfd_error_handler (_("%B: Relocations in generic ELF (EM: %d)"),
+			  abfd, ehdrp->e_machine);
+
+      bfd_set_error (bfd_error_wrong_format);
+      * (bfd_boolean *) failed = TRUE;
+    }
+}
+
+static bfd_boolean
+elf64_generic_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  bfd_boolean failed = FALSE;
+
+  /* Check if there are any relocations.  */
+  bfd_map_over_sections (abfd, check_for_relocs, & failed);
+
+  if (failed)
+    return FALSE;
+  return bfd_elf_link_add_symbols (abfd, info);
+}
+
+#define TARGET_LITTLE_SYM		bfd_elf64_little_generic_vec
+#define TARGET_LITTLE_NAME		"elf64-little"
+#define TARGET_BIG_SYM			bfd_elf64_big_generic_vec
+#define TARGET_BIG_NAME			"elf64-big"
+#define ELF_ARCH			bfd_arch_unknown
+#define ELF_MACHINE_CODE		EM_NONE
+#define ELF_MAXPAGESIZE			0x1
+#define bfd_elf64_bfd_reloc_type_lookup bfd_default_reloc_type_lookup
+#define bfd_elf64_bfd_reloc_name_lookup _bfd_norelocs_bfd_reloc_name_lookup
+#define bfd_elf64_bfd_link_add_symbols	elf64_generic_link_add_symbols
+#define elf_info_to_howto		elf_generic_info_to_howto
+#define elf_info_to_howto_rel		elf_generic_info_to_howto_rel
+
+#include "elf64-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-hppa.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-hppa.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-hppa.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-hppa.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4106 @@
+/* Support for HPPA 64-bit ELF
+   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+   2010, 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "alloca-conf.h"
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/hppa.h"
+#include "libhppa.h"
+#include "elf64-hppa.h"
+
+
+#define ARCH_SIZE	       64
+
+#define PLT_ENTRY_SIZE 0x10
+#define DLT_ENTRY_SIZE 0x8
+#define OPD_ENTRY_SIZE 0x20
+
+#define ELF_DYNAMIC_INTERPRETER "/usr/lib/pa20_64/dld.sl"
+
+/* The stub is supposed to load the target address and target's DP
+   value out of the PLT, then do an external branch to the target
+   address.
+
+   LDD PLTOFF(%r27),%r1
+   BVE (%r1)
+   LDD PLTOFF+8(%r27),%r27
+
+   Note that we must use the LDD with a 14 bit displacement, not the one
+   with a 5 bit displacement.  */
+static char plt_stub[] = {0x53, 0x61, 0x00, 0x00, 0xe8, 0x20, 0xd0, 0x00,
+			  0x53, 0x7b, 0x00, 0x00 };
+
+struct elf64_hppa_link_hash_entry
+{
+  struct elf_link_hash_entry eh;
+
+  /* Offsets for this symbol in various linker sections.  */
+  bfd_vma dlt_offset;
+  bfd_vma plt_offset;
+  bfd_vma opd_offset;
+  bfd_vma stub_offset;
+
+  /* The index of the (possibly local) symbol in the input bfd and its
+     associated BFD.  Needed so that we can have relocs against local
+     symbols in shared libraries.  */
+  long sym_indx;
+  bfd *owner;
+
+  /* Dynamic symbols may need to have two different values.  One for
+     the dynamic symbol table, one for the normal symbol table.
+
+     In such cases we store the symbol's real value and section
+     index here so we can restore the real value before we write
+     the normal symbol table.  */
+  bfd_vma st_value;
+  int st_shndx;
+
+  /* Used to count non-got, non-plt relocations for delayed sizing
+     of relocation sections.  */
+  struct elf64_hppa_dyn_reloc_entry
+  {
+    /* Next relocation in the chain.  */
+    struct elf64_hppa_dyn_reloc_entry *next;
+
+    /* The type of the relocation.  */
+    int type;
+
+    /* The input section of the relocation.  */
+    asection *sec;
+
+    /* Number of relocs copied in this section.  */
+    bfd_size_type count;
+
+    /* The index of the section symbol for the input section of
+       the relocation.  Only needed when building shared libraries.  */
+    int sec_symndx;
+
+    /* The offset within the input section of the relocation.  */
+    bfd_vma offset;
+
+    /* The addend for the relocation.  */
+    bfd_vma addend;
+
+  } *reloc_entries;
+
+  /* Nonzero if this symbol needs an entry in one of the linker
+     sections.  */
+  unsigned want_dlt;
+  unsigned want_plt;
+  unsigned want_opd;
+  unsigned want_stub;
+};
+
+struct elf64_hppa_link_hash_table
+{
+  struct elf_link_hash_table root;
+
+  /* Shortcuts to get to the various linker defined sections.  */
+  asection *dlt_sec;
+  asection *dlt_rel_sec;
+  asection *plt_sec;
+  asection *plt_rel_sec;
+  asection *opd_sec;
+  asection *opd_rel_sec;
+  asection *other_rel_sec;
+
+  /* Offset of __gp within .plt section.  When the PLT gets large we want
+     to slide __gp into the PLT section so that we can continue to use
+     single DP relative instructions to load values out of the PLT.  */
+  bfd_vma gp_offset;
+
+  /* Note this is not strictly correct.  We should create a stub section for
+     each input section with calls.  The stub section should be placed before
+     the section with the call.  */
+  asection *stub_sec;
+
+  bfd_vma text_segment_base;
+  bfd_vma data_segment_base;
+
+  /* We build tables to map from an input section back to its
+     symbol index.  This is the BFD for which we currently have
+     a map.  */
+  bfd *section_syms_bfd;
+
+  /* Array of symbol numbers for each input section attached to the
+     current BFD.  */
+  int *section_syms;
+};
+
+#define hppa_link_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == HPPA64_ELF_DATA ? ((struct elf64_hppa_link_hash_table *) ((p)->hash)) : NULL)
+
+#define hppa_elf_hash_entry(ent) \
+  ((struct elf64_hppa_link_hash_entry *)(ent))
+
+#define eh_name(eh) \
+  (eh ? eh->root.root.string : "<undef>")
+
+typedef struct bfd_hash_entry *(*new_hash_entry_func)
+  (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
+
+static struct bfd_link_hash_table *elf64_hppa_hash_table_create
+  (bfd *abfd);
+
+/* This must follow the definitions of the various derived linker
+   hash tables and shared functions.  */
+#include "elf-hppa.h"
+
+static bfd_boolean elf64_hppa_object_p
+  (bfd *);
+
+static void elf64_hppa_post_process_headers
+  (bfd *, struct bfd_link_info *);
+
+static bfd_boolean elf64_hppa_create_dynamic_sections
+  (bfd *, struct bfd_link_info *);
+
+static bfd_boolean elf64_hppa_adjust_dynamic_symbol
+  (struct bfd_link_info *, struct elf_link_hash_entry *);
+
+static bfd_boolean elf64_hppa_mark_milli_and_exported_functions
+  (struct elf_link_hash_entry *, void *);
+
+static bfd_boolean elf64_hppa_size_dynamic_sections
+  (bfd *, struct bfd_link_info *);
+
+static int elf64_hppa_link_output_symbol_hook
+  (struct bfd_link_info *, const char *, Elf_Internal_Sym *,
+   asection *, struct elf_link_hash_entry *);
+
+static bfd_boolean elf64_hppa_finish_dynamic_symbol
+  (bfd *, struct bfd_link_info *,
+   struct elf_link_hash_entry *, Elf_Internal_Sym *);
+
+static enum elf_reloc_type_class elf64_hppa_reloc_type_class
+  (const Elf_Internal_Rela *);
+
+static bfd_boolean elf64_hppa_finish_dynamic_sections
+  (bfd *, struct bfd_link_info *);
+
+static bfd_boolean elf64_hppa_check_relocs
+  (bfd *, struct bfd_link_info *,
+   asection *, const Elf_Internal_Rela *);
+
+static bfd_boolean elf64_hppa_dynamic_symbol_p
+  (struct elf_link_hash_entry *, struct bfd_link_info *);
+
+static bfd_boolean elf64_hppa_mark_exported_functions
+  (struct elf_link_hash_entry *, void *);
+
+static bfd_boolean elf64_hppa_finalize_opd
+  (struct elf_link_hash_entry *, void *);
+
+static bfd_boolean elf64_hppa_finalize_dlt
+  (struct elf_link_hash_entry *, void *);
+
+static bfd_boolean allocate_global_data_dlt
+  (struct elf_link_hash_entry *, void *);
+
+static bfd_boolean allocate_global_data_plt
+  (struct elf_link_hash_entry *, void *);
+
+static bfd_boolean allocate_global_data_stub
+  (struct elf_link_hash_entry *, void *);
+
+static bfd_boolean allocate_global_data_opd
+  (struct elf_link_hash_entry *, void *);
+
+static bfd_boolean get_reloc_section
+  (bfd *, struct elf64_hppa_link_hash_table *, asection *);
+
+static bfd_boolean count_dyn_reloc
+  (bfd *, struct elf64_hppa_link_hash_entry *,
+   int, asection *, int, bfd_vma, bfd_vma);
+
+static bfd_boolean allocate_dynrel_entries
+  (struct elf_link_hash_entry *, void *);
+
+static bfd_boolean elf64_hppa_finalize_dynreloc
+  (struct elf_link_hash_entry *, void *);
+
+static bfd_boolean get_opd
+  (bfd *, struct bfd_link_info *, struct elf64_hppa_link_hash_table *);
+
+static bfd_boolean get_plt
+  (bfd *, struct bfd_link_info *, struct elf64_hppa_link_hash_table *);
+
+static bfd_boolean get_dlt
+  (bfd *, struct bfd_link_info *, struct elf64_hppa_link_hash_table *);
+
+static bfd_boolean get_stub
+  (bfd *, struct bfd_link_info *, struct elf64_hppa_link_hash_table *);
+
+static int elf64_hppa_elf_get_symbol_type
+  (Elf_Internal_Sym *, int);
+
+/* Initialize an entry in the link hash table.  */
+
+static struct bfd_hash_entry *
+hppa64_link_hash_newfunc (struct bfd_hash_entry *entry,
+			  struct bfd_hash_table *table,
+			  const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table,
+				 sizeof (struct elf64_hppa_link_hash_entry));
+      if (entry == NULL)
+        return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = _bfd_elf_link_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct elf64_hppa_link_hash_entry *hh;
+
+      /* Initialize our local data.  All zeros.  */
+      hh = hppa_elf_hash_entry (entry);
+      memset (&hh->dlt_offset, 0,
+	      (sizeof (struct elf64_hppa_link_hash_entry)
+	       - offsetof (struct elf64_hppa_link_hash_entry, dlt_offset)));
+    }
+
+  return entry;
+}
+
+/* Create the derived linker hash table.  The PA64 ELF port uses this
+   derived hash table to keep information specific to the PA ElF
+   linker (without using static variables).  */
+
+static struct bfd_link_hash_table*
+elf64_hppa_hash_table_create (bfd *abfd)
+{
+  struct elf64_hppa_link_hash_table *htab;
+  bfd_size_type amt = sizeof (*htab);
+
+  htab = bfd_zalloc (abfd, amt);
+  if (htab == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&htab->root, abfd,
+				      hppa64_link_hash_newfunc,
+				      sizeof (struct elf64_hppa_link_hash_entry),
+				      HPPA64_ELF_DATA))
+    {
+      bfd_release (abfd, htab);
+      return NULL;
+    }
+
+  htab->text_segment_base = (bfd_vma) -1;
+  htab->data_segment_base = (bfd_vma) -1;
+
+  return &htab->root.root;
+}
+
+/* Return nonzero if ABFD represents a PA2.0 ELF64 file.
+
+   Additionally we set the default architecture and machine.  */
+static bfd_boolean
+elf64_hppa_object_p (bfd *abfd)
+{
+  Elf_Internal_Ehdr * i_ehdrp;
+  unsigned int flags;
+
+  i_ehdrp = elf_elfheader (abfd);
+  if (strcmp (bfd_get_target (abfd), "elf64-hppa-linux") == 0)
+    {
+      /* GCC on hppa-linux produces binaries with OSABI=GNU,
+	 but the kernel produces corefiles with OSABI=SysV.  */
+      if (i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_GNU
+	  && i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_NONE) /* aka SYSV */
+	return FALSE;
+    }
+  else
+    {
+      /* HPUX produces binaries with OSABI=HPUX,
+	 but the kernel produces corefiles with OSABI=SysV.  */
+      if (i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_HPUX
+	  && i_ehdrp->e_ident[EI_OSABI] != ELFOSABI_NONE) /* aka SYSV */
+	return FALSE;
+    }
+
+  flags = i_ehdrp->e_flags;
+  switch (flags & (EF_PARISC_ARCH | EF_PARISC_WIDE))
+    {
+    case EFA_PARISC_1_0:
+      return bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 10);
+    case EFA_PARISC_1_1:
+      return bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 11);
+    case EFA_PARISC_2_0:
+      if (i_ehdrp->e_ident[EI_CLASS] == ELFCLASS64)
+        return bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 25);
+      else
+        return bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 20);
+    case EFA_PARISC_2_0 | EF_PARISC_WIDE:
+      return bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 25);
+    }
+  /* Don't be fussy.  */
+  return TRUE;
+}
+
+/* Given section type (hdr->sh_type), return a boolean indicating
+   whether or not the section is an elf64-hppa specific section.  */
+static bfd_boolean
+elf64_hppa_section_from_shdr (bfd *abfd,
+			      Elf_Internal_Shdr *hdr,
+			      const char *name,
+			      int shindex)
+{
+  switch (hdr->sh_type)
+    {
+    case SHT_PARISC_EXT:
+      if (strcmp (name, ".PARISC.archext") != 0)
+	return FALSE;
+      break;
+    case SHT_PARISC_UNWIND:
+      if (strcmp (name, ".PARISC.unwind") != 0)
+	return FALSE;
+      break;
+    case SHT_PARISC_DOC:
+    case SHT_PARISC_ANNOT:
+    default:
+      return FALSE;
+    }
+
+  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* SEC is a section containing relocs for an input BFD when linking; return
+   a suitable section for holding relocs in the output BFD for a link.  */
+
+static bfd_boolean
+get_reloc_section (bfd *abfd,
+		   struct elf64_hppa_link_hash_table *hppa_info,
+		   asection *sec)
+{
+  const char *srel_name;
+  asection *srel;
+  bfd *dynobj;
+
+  srel_name = (bfd_elf_string_from_elf_section
+	       (abfd, elf_elfheader(abfd)->e_shstrndx,
+		_bfd_elf_single_rel_hdr(sec)->sh_name));
+  if (srel_name == NULL)
+    return FALSE;
+
+  dynobj = hppa_info->root.dynobj;
+  if (!dynobj)
+    hppa_info->root.dynobj = dynobj = abfd;
+
+  srel = bfd_get_section_by_name (dynobj, srel_name);
+  if (srel == NULL)
+    {
+      srel = bfd_make_section_with_flags (dynobj, srel_name,
+					  (SEC_ALLOC
+					   | SEC_LOAD
+					   | SEC_HAS_CONTENTS
+					   | SEC_IN_MEMORY
+					   | SEC_LINKER_CREATED
+					   | SEC_READONLY));
+      if (srel == NULL
+	  || !bfd_set_section_alignment (dynobj, srel, 3))
+	return FALSE;
+    }
+
+  hppa_info->other_rel_sec = srel;
+  return TRUE;
+}
+
+/* Add a new entry to the list of dynamic relocations against DYN_H.
+
+   We use this to keep a record of all the FPTR relocations against a
+   particular symbol so that we can create FPTR relocations in the
+   output file.  */
+
+static bfd_boolean
+count_dyn_reloc (bfd *abfd,
+		 struct elf64_hppa_link_hash_entry *hh,
+		 int type,
+		 asection *sec,
+	         int sec_symndx,
+	         bfd_vma offset,
+		 bfd_vma addend)
+{
+  struct elf64_hppa_dyn_reloc_entry *rent;
+
+  rent = (struct elf64_hppa_dyn_reloc_entry *)
+  bfd_alloc (abfd, (bfd_size_type) sizeof (*rent));
+  if (!rent)
+    return FALSE;
+
+  rent->next = hh->reloc_entries;
+  rent->type = type;
+  rent->sec = sec;
+  rent->sec_symndx = sec_symndx;
+  rent->offset = offset;
+  rent->addend = addend;
+  hh->reloc_entries = rent;
+
+  return TRUE;
+}
+
+/* Return a pointer to the local DLT, PLT and OPD reference counts
+   for ABFD.  Returns NULL if the storage allocation fails.  */
+
+static bfd_signed_vma *
+hppa64_elf_local_refcounts (bfd *abfd)
+{
+  Elf_Internal_Shdr *symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  bfd_signed_vma *local_refcounts;
+                  
+  local_refcounts = elf_local_got_refcounts (abfd);
+  if (local_refcounts == NULL)
+    {
+      bfd_size_type size;
+
+      /* Allocate space for local DLT, PLT and OPD reference
+	 counts.  Done this way to save polluting elf_obj_tdata
+	 with another target specific pointer.  */
+      size = symtab_hdr->sh_info;
+      size *= 3 * sizeof (bfd_signed_vma);
+      local_refcounts = bfd_zalloc (abfd, size);
+      elf_local_got_refcounts (abfd) = local_refcounts;
+    }
+  return local_refcounts;
+}
+
+/* Scan the RELOCS and record the type of dynamic entries that each
+   referenced symbol needs.  */
+
+static bfd_boolean
+elf64_hppa_check_relocs (bfd *abfd,
+			 struct bfd_link_info *info,
+			 asection *sec,
+			 const Elf_Internal_Rela *relocs)
+{
+  struct elf64_hppa_link_hash_table *hppa_info;
+  const Elf_Internal_Rela *relend;
+  Elf_Internal_Shdr *symtab_hdr;
+  const Elf_Internal_Rela *rel;
+  unsigned int sec_symndx;
+
+  if (info->relocatable)
+    return TRUE;
+
+  /* If this is the first dynamic object found in the link, create
+     the special sections required for dynamic linking.  */
+  if (! elf_hash_table (info)->dynamic_sections_created)
+    {
+      if (! _bfd_elf_link_create_dynamic_sections (abfd, info))
+	return FALSE;
+    }
+
+  hppa_info = hppa_link_hash_table (info);
+  if (hppa_info == NULL)
+    return FALSE;
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+
+  /* If necessary, build a new table holding section symbols indices
+     for this BFD.  */
+
+  if (info->shared && hppa_info->section_syms_bfd != abfd)
+    {
+      unsigned long i;
+      unsigned int highest_shndx;
+      Elf_Internal_Sym *local_syms = NULL;
+      Elf_Internal_Sym *isym, *isymend;
+      bfd_size_type amt;
+
+      /* We're done with the old cache of section index to section symbol
+	 index information.  Free it.
+
+	 ?!? Note we leak the last section_syms array.  Presumably we
+	 could free it in one of the later routines in this file.  */
+      if (hppa_info->section_syms)
+	free (hppa_info->section_syms);
+
+      /* Read this BFD's local symbols.  */
+      if (symtab_hdr->sh_info != 0)
+	{
+	  local_syms = (Elf_Internal_Sym *) symtab_hdr->contents;
+	  if (local_syms == NULL)
+	    local_syms = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+					       symtab_hdr->sh_info, 0,
+					       NULL, NULL, NULL);
+	  if (local_syms == NULL)
+	    return FALSE;
+	}
+
+      /* Record the highest section index referenced by the local symbols.  */
+      highest_shndx = 0;
+      isymend = local_syms + symtab_hdr->sh_info;
+      for (isym = local_syms; isym < isymend; isym++)
+	{
+	  if (isym->st_shndx > highest_shndx
+	      && isym->st_shndx < SHN_LORESERVE)
+	    highest_shndx = isym->st_shndx;
+	}
+
+      /* Allocate an array to hold the section index to section symbol index
+	 mapping.  Bump by one since we start counting at zero.  */
+      highest_shndx++;
+      amt = highest_shndx;
+      amt *= sizeof (int);
+      hppa_info->section_syms = (int *) bfd_malloc (amt);
+
+      /* Now walk the local symbols again.  If we find a section symbol,
+	 record the index of the symbol into the section_syms array.  */
+      for (i = 0, isym = local_syms; isym < isymend; i++, isym++)
+	{
+	  if (ELF_ST_TYPE (isym->st_info) == STT_SECTION)
+	    hppa_info->section_syms[isym->st_shndx] = i;
+	}
+
+      /* We are finished with the local symbols.  */
+      if (local_syms != NULL
+	  && symtab_hdr->contents != (unsigned char *) local_syms)
+	{
+	  if (! info->keep_memory)
+	    free (local_syms);
+	  else
+	    {
+	      /* Cache the symbols for elf_link_input_bfd.  */
+	      symtab_hdr->contents = (unsigned char *) local_syms;
+	    }
+	}
+
+      /* Record which BFD we built the section_syms mapping for.  */
+      hppa_info->section_syms_bfd = abfd;
+    }
+
+  /* Record the symbol index for this input section.  We may need it for
+     relocations when building shared libraries.  When not building shared
+     libraries this value is never really used, but assign it to zero to
+     prevent out of bounds memory accesses in other routines.  */
+  if (info->shared)
+    {
+      sec_symndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+      /* If we did not find a section symbol for this section, then
+	 something went terribly wrong above.  */
+      if (sec_symndx == SHN_BAD)
+	return FALSE;
+
+      if (sec_symndx < SHN_LORESERVE)
+	sec_symndx = hppa_info->section_syms[sec_symndx];
+      else
+	sec_symndx = 0;
+    }
+  else
+    sec_symndx = 0;
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; ++rel)
+    {
+      enum
+	{
+	  NEED_DLT = 1,
+	  NEED_PLT = 2,
+	  NEED_STUB = 4,
+	  NEED_OPD = 8,
+	  NEED_DYNREL = 16,
+	};
+
+      unsigned long r_symndx = ELF64_R_SYM (rel->r_info);
+      struct elf64_hppa_link_hash_entry *hh;
+      int need_entry;
+      bfd_boolean maybe_dynamic;
+      int dynrel_type = R_PARISC_NONE;
+      static reloc_howto_type *howto;
+
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  /* We're dealing with a global symbol -- find its hash entry
+	     and mark it as being referenced.  */
+	  long indx = r_symndx - symtab_hdr->sh_info;
+	  hh = hppa_elf_hash_entry (elf_sym_hashes (abfd)[indx]);
+	  while (hh->eh.root.type == bfd_link_hash_indirect
+		 || hh->eh.root.type == bfd_link_hash_warning)
+	    hh = hppa_elf_hash_entry (hh->eh.root.u.i.link);
+
+	  hh->eh.ref_regular = 1;
+	}
+      else
+	hh = NULL;
+
+      /* We can only get preliminary data on whether a symbol is
+	 locally or externally defined, as not all of the input files
+	 have yet been processed.  Do something with what we know, as
+	 this may help reduce memory usage and processing time later.  */
+      maybe_dynamic = FALSE;
+      if (hh && ((info->shared
+		 && (!info->symbolic
+		     || info->unresolved_syms_in_shared_libs == RM_IGNORE))
+		|| !hh->eh.def_regular
+		|| hh->eh.root.type == bfd_link_hash_defweak))
+	maybe_dynamic = TRUE;
+
+      howto = elf_hppa_howto_table + ELF64_R_TYPE (rel->r_info);
+      need_entry = 0;
+      switch (howto->type)
+	{
+	/* These are simple indirect references to symbols through the
+	   DLT.  We need to create a DLT entry for any symbols which
+	   appears in a DLTIND relocation.  */
+	case R_PARISC_DLTIND21L:
+	case R_PARISC_DLTIND14R:
+	case R_PARISC_DLTIND14F:
+	case R_PARISC_DLTIND14WR:
+	case R_PARISC_DLTIND14DR:
+	  need_entry = NEED_DLT;
+	  break;
+
+	/* ?!?  These need a DLT entry.  But I have no idea what to do with
+	   the "link time TP value.  */
+	case R_PARISC_LTOFF_TP21L:
+	case R_PARISC_LTOFF_TP14R:
+	case R_PARISC_LTOFF_TP14F:
+	case R_PARISC_LTOFF_TP64:
+	case R_PARISC_LTOFF_TP14WR:
+	case R_PARISC_LTOFF_TP14DR:
+	case R_PARISC_LTOFF_TP16F:
+	case R_PARISC_LTOFF_TP16WF:
+	case R_PARISC_LTOFF_TP16DF:
+	  need_entry = NEED_DLT;
+	  break;
+
+	/* These are function calls.  Depending on their precise target we
+	   may need to make a stub for them.  The stub uses the PLT, so we
+	   need to create PLT entries for these symbols too.  */
+	case R_PARISC_PCREL12F:
+	case R_PARISC_PCREL17F:
+	case R_PARISC_PCREL22F:
+	case R_PARISC_PCREL32:
+	case R_PARISC_PCREL64:
+	case R_PARISC_PCREL21L:
+	case R_PARISC_PCREL17R:
+	case R_PARISC_PCREL17C:
+	case R_PARISC_PCREL14R:
+	case R_PARISC_PCREL14F:
+	case R_PARISC_PCREL22C:
+	case R_PARISC_PCREL14WR:
+	case R_PARISC_PCREL14DR:
+	case R_PARISC_PCREL16F:
+	case R_PARISC_PCREL16WF:
+	case R_PARISC_PCREL16DF:
+	  /* Function calls might need to go through the .plt, and
+	     might need a long branch stub.  */
+	  if (hh != NULL && hh->eh.type != STT_PARISC_MILLI)
+	    need_entry = (NEED_PLT | NEED_STUB);
+	  else
+	    need_entry = 0;
+	  break;
+
+	case R_PARISC_PLTOFF21L:
+	case R_PARISC_PLTOFF14R:
+	case R_PARISC_PLTOFF14F:
+	case R_PARISC_PLTOFF14WR:
+	case R_PARISC_PLTOFF14DR:
+	case R_PARISC_PLTOFF16F:
+	case R_PARISC_PLTOFF16WF:
+	case R_PARISC_PLTOFF16DF:
+	  need_entry = (NEED_PLT);
+	  break;
+
+	case R_PARISC_DIR64:
+	  if (info->shared || maybe_dynamic)
+	    need_entry = (NEED_DYNREL);
+	  dynrel_type = R_PARISC_DIR64;
+	  break;
+
+	/* This is an indirect reference through the DLT to get the address
+	   of a OPD descriptor.  Thus we need to make a DLT entry that points
+	   to an OPD entry.  */
+	case R_PARISC_LTOFF_FPTR21L:
+	case R_PARISC_LTOFF_FPTR14R:
+	case R_PARISC_LTOFF_FPTR14WR:
+	case R_PARISC_LTOFF_FPTR14DR:
+	case R_PARISC_LTOFF_FPTR32:
+	case R_PARISC_LTOFF_FPTR64:
+	case R_PARISC_LTOFF_FPTR16F:
+	case R_PARISC_LTOFF_FPTR16WF:
+	case R_PARISC_LTOFF_FPTR16DF:
+	  if (info->shared || maybe_dynamic)
+	    need_entry = (NEED_DLT | NEED_OPD | NEED_PLT);
+	  else
+	    need_entry = (NEED_DLT | NEED_OPD | NEED_PLT);
+	  dynrel_type = R_PARISC_FPTR64;
+	  break;
+
+	/* This is a simple OPD entry.  */
+	case R_PARISC_FPTR64:
+	  if (info->shared || maybe_dynamic)
+	    need_entry = (NEED_OPD | NEED_PLT | NEED_DYNREL);
+	  else
+	    need_entry = (NEED_OPD | NEED_PLT);
+	  dynrel_type = R_PARISC_FPTR64;
+	  break;
+
+	/* Add more cases as needed.  */
+	}
+
+      if (!need_entry)
+	continue;
+
+      if (hh)
+	{
+	  /* Stash away enough information to be able to find this symbol
+	     regardless of whether or not it is local or global.  */
+	  hh->owner = abfd;
+	  hh->sym_indx = r_symndx;
+	}
+
+      /* Create what's needed.  */
+      if (need_entry & NEED_DLT)
+	{
+	  /* Allocate space for a DLT entry, as well as a dynamic
+	     relocation for this entry.  */
+	  if (! hppa_info->dlt_sec
+	      && ! get_dlt (abfd, info, hppa_info))
+	    goto err_out;
+
+	  if (hh != NULL)
+	    {
+	      hh->want_dlt = 1;
+	      hh->eh.got.refcount += 1;
+	    }
+	  else
+	    {
+	      bfd_signed_vma *local_dlt_refcounts;
+                  
+	      /* This is a DLT entry for a local symbol.  */
+	      local_dlt_refcounts = hppa64_elf_local_refcounts (abfd);
+	      if (local_dlt_refcounts == NULL)
+		return FALSE;
+	      local_dlt_refcounts[r_symndx] += 1;
+	    }
+	}
+
+      if (need_entry & NEED_PLT)
+	{
+	  if (! hppa_info->plt_sec
+	      && ! get_plt (abfd, info, hppa_info))
+	    goto err_out;
+
+	  if (hh != NULL)
+	    {
+	      hh->want_plt = 1;
+	      hh->eh.needs_plt = 1;
+	      hh->eh.plt.refcount += 1;
+	    }
+	  else
+	    {
+	      bfd_signed_vma *local_dlt_refcounts;
+	      bfd_signed_vma *local_plt_refcounts;
+                  
+	      /* This is a PLT entry for a local symbol.  */
+	      local_dlt_refcounts = hppa64_elf_local_refcounts (abfd);
+	      if (local_dlt_refcounts == NULL)
+		return FALSE;
+	      local_plt_refcounts = local_dlt_refcounts + symtab_hdr->sh_info;
+	      local_plt_refcounts[r_symndx] += 1;
+	    }
+	}
+
+      if (need_entry & NEED_STUB)
+	{
+	  if (! hppa_info->stub_sec
+	      && ! get_stub (abfd, info, hppa_info))
+	    goto err_out;
+	  if (hh)
+	    hh->want_stub = 1;
+	}
+
+      if (need_entry & NEED_OPD)
+	{
+	  if (! hppa_info->opd_sec
+	      && ! get_opd (abfd, info, hppa_info))
+	    goto err_out;
+
+	  /* FPTRs are not allocated by the dynamic linker for PA64,
+	     though it is possible that will change in the future.  */
+
+	  if (hh != NULL)
+	    hh->want_opd = 1;
+	  else
+	    {
+	      bfd_signed_vma *local_dlt_refcounts;
+	      bfd_signed_vma *local_opd_refcounts;
+                  
+	      /* This is a OPD for a local symbol.  */
+	      local_dlt_refcounts = hppa64_elf_local_refcounts (abfd);
+	      if (local_dlt_refcounts == NULL)
+		return FALSE;
+	      local_opd_refcounts = (local_dlt_refcounts
+				     + 2 * symtab_hdr->sh_info);
+	      local_opd_refcounts[r_symndx] += 1;
+	    }
+	}
+
+      /* Add a new dynamic relocation to the chain of dynamic
+	 relocations for this symbol.  */
+      if ((need_entry & NEED_DYNREL) && (sec->flags & SEC_ALLOC))
+	{
+	  if (! hppa_info->other_rel_sec
+	      && ! get_reloc_section (abfd, hppa_info, sec))
+	    goto err_out;
+
+	  /* Count dynamic relocations against global symbols.  */
+	  if (hh != NULL
+	      && !count_dyn_reloc (abfd, hh, dynrel_type, sec,
+				   sec_symndx, rel->r_offset, rel->r_addend))
+	    goto err_out;
+
+	  /* If we are building a shared library and we just recorded
+	     a dynamic R_PARISC_FPTR64 relocation, then make sure the
+	     section symbol for this section ends up in the dynamic
+	     symbol table.  */
+	  if (info->shared && dynrel_type == R_PARISC_FPTR64
+	      && ! (bfd_elf_link_record_local_dynamic_symbol
+		    (info, abfd, sec_symndx)))
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+
+ err_out:
+  return FALSE;
+}
+
+struct elf64_hppa_allocate_data
+{
+  struct bfd_link_info *info;
+  bfd_size_type ofs;
+};
+
+/* Should we do dynamic things to this symbol?  */
+
+static bfd_boolean
+elf64_hppa_dynamic_symbol_p (struct elf_link_hash_entry *eh,
+			     struct bfd_link_info *info)
+{
+  /* ??? What, if anything, needs to happen wrt STV_PROTECTED symbols
+     and relocations that retrieve a function descriptor?  Assume the
+     worst for now.  */
+  if (_bfd_elf_dynamic_symbol_p (eh, info, 1))
+    {
+      /* ??? Why is this here and not elsewhere is_local_label_name.  */
+      if (eh->root.root.string[0] == '$' && eh->root.root.string[1] == '$')
+	return FALSE;
+
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+/* Mark all functions exported by this file so that we can later allocate
+   entries in .opd for them.  */
+
+static bfd_boolean
+elf64_hppa_mark_exported_functions (struct elf_link_hash_entry *eh, void *data)
+{
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
+  struct bfd_link_info *info = (struct bfd_link_info *)data;
+  struct elf64_hppa_link_hash_table *hppa_info;
+
+  hppa_info = hppa_link_hash_table (info);
+  if (hppa_info == NULL)
+    return FALSE;
+
+  if (eh
+      && (eh->root.type == bfd_link_hash_defined
+	  || eh->root.type == bfd_link_hash_defweak)
+      && eh->root.u.def.section->output_section != NULL
+      && eh->type == STT_FUNC)
+    {
+      if (! hppa_info->opd_sec
+	  && ! get_opd (hppa_info->root.dynobj, info, hppa_info))
+	return FALSE;
+
+      hh->want_opd = 1;
+
+      /* Put a flag here for output_symbol_hook.  */
+      hh->st_shndx = -1;
+      eh->needs_plt = 1;
+    }
+
+  return TRUE;
+}
+
+/* Allocate space for a DLT entry.  */
+
+static bfd_boolean
+allocate_global_data_dlt (struct elf_link_hash_entry *eh, void *data)
+{
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
+  struct elf64_hppa_allocate_data *x = (struct elf64_hppa_allocate_data *)data;
+
+  if (hh->want_dlt)
+    {
+      if (x->info->shared)
+	{
+	  /* Possibly add the symbol to the local dynamic symbol
+	     table since we might need to create a dynamic relocation
+	     against it.  */
+	  if (eh->dynindx == -1 && eh->type != STT_PARISC_MILLI)
+	    {
+	      bfd *owner = eh->root.u.def.section->owner;
+
+	      if (! (bfd_elf_link_record_local_dynamic_symbol
+		     (x->info, owner, hh->sym_indx)))
+		return FALSE;
+	    }
+	}
+
+      hh->dlt_offset = x->ofs;
+      x->ofs += DLT_ENTRY_SIZE;
+    }
+  return TRUE;
+}
+
+/* Allocate space for a DLT.PLT entry.  */
+
+static bfd_boolean
+allocate_global_data_plt (struct elf_link_hash_entry *eh, void *data)
+{
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
+  struct elf64_hppa_allocate_data *x = (struct elf64_hppa_allocate_data *) data;
+
+  if (hh->want_plt
+      && elf64_hppa_dynamic_symbol_p (eh, x->info)
+      && !((eh->root.type == bfd_link_hash_defined
+	    || eh->root.type == bfd_link_hash_defweak)
+	   && eh->root.u.def.section->output_section != NULL))
+    {
+      hh->plt_offset = x->ofs;
+      x->ofs += PLT_ENTRY_SIZE;
+      if (hh->plt_offset < 0x2000)
+	{
+	  struct elf64_hppa_link_hash_table *hppa_info;
+
+	  hppa_info = hppa_link_hash_table (x->info);
+	  if (hppa_info == NULL)
+	    return FALSE;
+
+	  hppa_info->gp_offset = hh->plt_offset;
+	}
+    }
+  else
+    hh->want_plt = 0;
+
+  return TRUE;
+}
+
+/* Allocate space for a STUB entry.  */
+
+static bfd_boolean
+allocate_global_data_stub (struct elf_link_hash_entry *eh, void *data)
+{
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
+  struct elf64_hppa_allocate_data *x = (struct elf64_hppa_allocate_data *)data;
+
+  if (hh->want_stub
+      && elf64_hppa_dynamic_symbol_p (eh, x->info)
+      && !((eh->root.type == bfd_link_hash_defined
+	    || eh->root.type == bfd_link_hash_defweak)
+	   && eh->root.u.def.section->output_section != NULL))
+    {
+      hh->stub_offset = x->ofs;
+      x->ofs += sizeof (plt_stub);
+    }
+  else
+    hh->want_stub = 0;
+  return TRUE;
+}
+
+/* Allocate space for a FPTR entry.  */
+
+static bfd_boolean
+allocate_global_data_opd (struct elf_link_hash_entry *eh, void *data)
+{
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
+  struct elf64_hppa_allocate_data *x = (struct elf64_hppa_allocate_data *)data;
+
+  if (hh && hh->want_opd)
+    {
+      /* We never need an opd entry for a symbol which is not
+	 defined by this output file.  */
+      if (hh && (hh->eh.root.type == bfd_link_hash_undefined
+		 || hh->eh.root.type == bfd_link_hash_undefweak
+		 || hh->eh.root.u.def.section->output_section == NULL))
+	hh->want_opd = 0;
+
+      /* If we are creating a shared library, took the address of a local
+	 function or might export this function from this object file, then
+	 we have to create an opd descriptor.  */
+      else if (x->info->shared
+	       || hh == NULL
+	       || (hh->eh.dynindx == -1 && hh->eh.type != STT_PARISC_MILLI)
+	       || (hh->eh.root.type == bfd_link_hash_defined
+		   || hh->eh.root.type == bfd_link_hash_defweak))
+	{
+	  /* If we are creating a shared library, then we will have to
+	     create a runtime relocation for the symbol to properly
+	     initialize the .opd entry.  Make sure the symbol gets
+	     added to the dynamic symbol table.  */
+	  if (x->info->shared
+	      && (hh == NULL || (hh->eh.dynindx == -1)))
+	    {
+	      bfd *owner;
+	      /* PR 6511: Default to using the dynamic symbol table.  */
+	      owner = (hh->owner ? hh->owner: eh->root.u.def.section->owner);
+
+	      if (!bfd_elf_link_record_local_dynamic_symbol
+		    (x->info, owner, hh->sym_indx))
+		return FALSE;
+	    }
+
+	  /* This may not be necessary or desirable anymore now that
+	     we have some support for dealing with section symbols
+	     in dynamic relocs.  But name munging does make the result
+	     much easier to debug.  ie, the EPLT reloc will reference
+	     a symbol like .foobar, instead of .text + offset.  */
+	  if (x->info->shared && eh)
+	    {
+	      char *new_name;
+	      struct elf_link_hash_entry *nh;
+
+	      new_name = alloca (strlen (eh->root.root.string) + 2);
+	      new_name[0] = '.';
+	      strcpy (new_name + 1, eh->root.root.string);
+
+	      nh = elf_link_hash_lookup (elf_hash_table (x->info),
+					 new_name, TRUE, TRUE, TRUE);
+
+	      nh->root.type = eh->root.type;
+	      nh->root.u.def.value = eh->root.u.def.value;
+	      nh->root.u.def.section = eh->root.u.def.section;
+
+	      if (! bfd_elf_link_record_dynamic_symbol (x->info, nh))
+		return FALSE;
+
+	     }
+	  hh->opd_offset = x->ofs;
+	  x->ofs += OPD_ENTRY_SIZE;
+	}
+
+      /* Otherwise we do not need an opd entry.  */
+      else
+	hh->want_opd = 0;
+    }
+  return TRUE;
+}
+
+/* HP requires the EI_OSABI field to be filled in.  The assignment to
+   EI_ABIVERSION may not be strictly necessary.  */
+
+static void
+elf64_hppa_post_process_headers (bfd *abfd,
+			 struct bfd_link_info *link_info ATTRIBUTE_UNUSED)
+{
+  Elf_Internal_Ehdr * i_ehdrp;
+
+  i_ehdrp = elf_elfheader (abfd);
+  
+  i_ehdrp->e_ident[EI_OSABI] = get_elf_backend_data (abfd)->elf_osabi;
+  i_ehdrp->e_ident[EI_ABIVERSION] = 1;
+}
+
+/* Create function descriptor section (.opd).  This section is called .opd
+   because it contains "official procedure descriptors".  The "official"
+   refers to the fact that these descriptors are used when taking the address
+   of a procedure, thus ensuring a unique address for each procedure.  */
+
+static bfd_boolean
+get_opd (bfd *abfd,
+	 struct bfd_link_info *info ATTRIBUTE_UNUSED,
+	 struct elf64_hppa_link_hash_table *hppa_info)
+{
+  asection *opd;
+  bfd *dynobj;
+
+  opd = hppa_info->opd_sec;
+  if (!opd)
+    {
+      dynobj = hppa_info->root.dynobj;
+      if (!dynobj)
+	hppa_info->root.dynobj = dynobj = abfd;
+
+      opd = bfd_make_section_with_flags (dynobj, ".opd",
+					 (SEC_ALLOC
+					  | SEC_LOAD
+					  | SEC_HAS_CONTENTS
+					  | SEC_IN_MEMORY
+					  | SEC_LINKER_CREATED));
+      if (!opd
+	  || !bfd_set_section_alignment (abfd, opd, 3))
+	{
+	  BFD_ASSERT (0);
+	  return FALSE;
+	}
+
+      hppa_info->opd_sec = opd;
+    }
+
+  return TRUE;
+}
+
+/* Create the PLT section.  */
+
+static bfd_boolean
+get_plt (bfd *abfd,
+	 struct bfd_link_info *info ATTRIBUTE_UNUSED,
+	 struct elf64_hppa_link_hash_table *hppa_info)
+{
+  asection *plt;
+  bfd *dynobj;
+
+  plt = hppa_info->plt_sec;
+  if (!plt)
+    {
+      dynobj = hppa_info->root.dynobj;
+      if (!dynobj)
+	hppa_info->root.dynobj = dynobj = abfd;
+
+      plt = bfd_make_section_with_flags (dynobj, ".plt",
+					 (SEC_ALLOC
+					  | SEC_LOAD
+					  | SEC_HAS_CONTENTS
+					  | SEC_IN_MEMORY
+					  | SEC_LINKER_CREATED));
+      if (!plt
+	  || !bfd_set_section_alignment (abfd, plt, 3))
+	{
+	  BFD_ASSERT (0);
+	  return FALSE;
+	}
+
+      hppa_info->plt_sec = plt;
+    }
+
+  return TRUE;
+}
+
+/* Create the DLT section.  */
+
+static bfd_boolean
+get_dlt (bfd *abfd,
+	 struct bfd_link_info *info ATTRIBUTE_UNUSED,
+	 struct elf64_hppa_link_hash_table *hppa_info)
+{
+  asection *dlt;
+  bfd *dynobj;
+
+  dlt = hppa_info->dlt_sec;
+  if (!dlt)
+    {
+      dynobj = hppa_info->root.dynobj;
+      if (!dynobj)
+	hppa_info->root.dynobj = dynobj = abfd;
+
+      dlt = bfd_make_section_with_flags (dynobj, ".dlt",
+					 (SEC_ALLOC
+					  | SEC_LOAD
+					  | SEC_HAS_CONTENTS
+					  | SEC_IN_MEMORY
+					  | SEC_LINKER_CREATED));
+      if (!dlt
+	  || !bfd_set_section_alignment (abfd, dlt, 3))
+	{
+	  BFD_ASSERT (0);
+	  return FALSE;
+	}
+
+      hppa_info->dlt_sec = dlt;
+    }
+
+  return TRUE;
+}
+
+/* Create the stubs section.  */
+
+static bfd_boolean
+get_stub (bfd *abfd,
+	  struct bfd_link_info *info ATTRIBUTE_UNUSED,
+	  struct elf64_hppa_link_hash_table *hppa_info)
+{
+  asection *stub;
+  bfd *dynobj;
+
+  stub = hppa_info->stub_sec;
+  if (!stub)
+    {
+      dynobj = hppa_info->root.dynobj;
+      if (!dynobj)
+	hppa_info->root.dynobj = dynobj = abfd;
+
+      stub = bfd_make_section_with_flags (dynobj, ".stub",
+					  (SEC_ALLOC | SEC_LOAD
+					   | SEC_HAS_CONTENTS
+					   | SEC_IN_MEMORY
+					   | SEC_READONLY
+					   | SEC_LINKER_CREATED));
+      if (!stub
+	  || !bfd_set_section_alignment (abfd, stub, 3))
+	{
+	  BFD_ASSERT (0);
+	  return FALSE;
+	}
+
+      hppa_info->stub_sec = stub;
+    }
+
+  return TRUE;
+}
+
+/* Create sections necessary for dynamic linking.  This is only a rough
+   cut and will likely change as we learn more about the somewhat
+   unusual dynamic linking scheme HP uses.
+
+   .stub:
+	Contains code to implement cross-space calls.  The first time one
+	of the stubs is used it will call into the dynamic linker, later
+	calls will go straight to the target.
+
+	The only stub we support right now looks like
+
+	ldd OFFSET(%dp),%r1
+	bve %r0(%r1)
+	ldd OFFSET+8(%dp),%dp
+
+	Other stubs may be needed in the future.  We may want the remove
+	the break/nop instruction.  It is only used right now to keep the
+	offset of a .plt entry and a .stub entry in sync.
+
+   .dlt:
+	This is what most people call the .got.  HP used a different name.
+	Losers.
+
+   .rela.dlt:
+	Relocations for the DLT.
+
+   .plt:
+	Function pointers as address,gp pairs.
+
+   .rela.plt:
+	Should contain dynamic IPLT (and EPLT?) relocations.
+
+   .opd:
+	FPTRS
+
+   .rela.opd:
+	EPLT relocations for symbols exported from shared libraries.  */
+
+static bfd_boolean
+elf64_hppa_create_dynamic_sections (bfd *abfd,
+				    struct bfd_link_info *info)
+{
+  asection *s;
+  struct elf64_hppa_link_hash_table *hppa_info;
+
+  hppa_info = hppa_link_hash_table (info);
+  if (hppa_info == NULL)
+    return FALSE;
+
+  if (! get_stub (abfd, info, hppa_info))
+    return FALSE;
+
+  if (! get_dlt (abfd, info, hppa_info))
+    return FALSE;
+
+  if (! get_plt (abfd, info, hppa_info))
+    return FALSE;
+
+  if (! get_opd (abfd, info, hppa_info))
+    return FALSE;
+
+  s = bfd_make_section_with_flags (abfd, ".rela.dlt",
+				   (SEC_ALLOC | SEC_LOAD
+				    | SEC_HAS_CONTENTS
+				    | SEC_IN_MEMORY
+				    | SEC_READONLY
+				    | SEC_LINKER_CREATED));
+  if (s == NULL
+      || !bfd_set_section_alignment (abfd, s, 3))
+    return FALSE;
+  hppa_info->dlt_rel_sec = s;
+
+  s = bfd_make_section_with_flags (abfd, ".rela.plt",
+				   (SEC_ALLOC | SEC_LOAD
+				    | SEC_HAS_CONTENTS
+				    | SEC_IN_MEMORY
+				    | SEC_READONLY
+				    | SEC_LINKER_CREATED));
+  if (s == NULL
+      || !bfd_set_section_alignment (abfd, s, 3))
+    return FALSE;
+  hppa_info->plt_rel_sec = s;
+
+  s = bfd_make_section_with_flags (abfd, ".rela.data",
+				   (SEC_ALLOC | SEC_LOAD
+				    | SEC_HAS_CONTENTS
+				    | SEC_IN_MEMORY
+				    | SEC_READONLY
+				    | SEC_LINKER_CREATED));
+  if (s == NULL
+      || !bfd_set_section_alignment (abfd, s, 3))
+    return FALSE;
+  hppa_info->other_rel_sec = s;
+
+  s = bfd_make_section_with_flags (abfd, ".rela.opd",
+				   (SEC_ALLOC | SEC_LOAD
+				    | SEC_HAS_CONTENTS
+				    | SEC_IN_MEMORY
+				    | SEC_READONLY
+				    | SEC_LINKER_CREATED));
+  if (s == NULL
+      || !bfd_set_section_alignment (abfd, s, 3))
+    return FALSE;
+  hppa_info->opd_rel_sec = s;
+
+  return TRUE;
+}
+
+/* Allocate dynamic relocations for those symbols that turned out
+   to be dynamic.  */
+
+static bfd_boolean
+allocate_dynrel_entries (struct elf_link_hash_entry *eh, void *data)
+{
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
+  struct elf64_hppa_allocate_data *x = (struct elf64_hppa_allocate_data *)data;
+  struct elf64_hppa_link_hash_table *hppa_info;
+  struct elf64_hppa_dyn_reloc_entry *rent;
+  bfd_boolean dynamic_symbol, shared;
+
+  hppa_info = hppa_link_hash_table (x->info);
+  if (hppa_info == NULL)
+    return FALSE;
+
+  dynamic_symbol = elf64_hppa_dynamic_symbol_p (eh, x->info);
+  shared = x->info->shared;
+
+  /* We may need to allocate relocations for a non-dynamic symbol
+     when creating a shared library.  */
+  if (!dynamic_symbol && !shared)
+    return TRUE;
+
+  /* Take care of the normal data relocations.  */
+
+  for (rent = hh->reloc_entries; rent; rent = rent->next)
+    {
+      /* Allocate one iff we are building a shared library, the relocation
+	 isn't a R_PARISC_FPTR64, or we don't want an opd entry.  */
+      if (!shared && rent->type == R_PARISC_FPTR64 && hh->want_opd)
+	continue;
+
+      hppa_info->other_rel_sec->size += sizeof (Elf64_External_Rela);
+
+      /* Make sure this symbol gets into the dynamic symbol table if it is
+	 not already recorded.  ?!? This should not be in the loop since
+	 the symbol need only be added once.  */
+      if (eh->dynindx == -1 && eh->type != STT_PARISC_MILLI)
+	if (!bfd_elf_link_record_local_dynamic_symbol
+	    (x->info, rent->sec->owner, hh->sym_indx))
+	  return FALSE;
+    }
+
+  /* Take care of the GOT and PLT relocations.  */
+
+  if ((dynamic_symbol || shared) && hh->want_dlt)
+    hppa_info->dlt_rel_sec->size += sizeof (Elf64_External_Rela);
+
+  /* If we are building a shared library, then every symbol that has an
+     opd entry will need an EPLT relocation to relocate the symbol's address
+     and __gp value based on the runtime load address.  */
+  if (shared && hh->want_opd)
+    hppa_info->opd_rel_sec->size += sizeof (Elf64_External_Rela);
+
+  if (hh->want_plt && dynamic_symbol)
+    {
+      bfd_size_type t = 0;
+
+      /* Dynamic symbols get one IPLT relocation.  Local symbols in
+	 shared libraries get two REL relocations.  Local symbols in
+	 main applications get nothing.  */
+      if (dynamic_symbol)
+	t = sizeof (Elf64_External_Rela);
+      else if (shared)
+	t = 2 * sizeof (Elf64_External_Rela);
+
+      hppa_info->plt_rel_sec->size += t;
+    }
+
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  */
+
+static bfd_boolean
+elf64_hppa_adjust_dynamic_symbol (struct bfd_link_info *info ATTRIBUTE_UNUSED,
+				  struct elf_link_hash_entry *eh)
+{
+  /* ??? Undefined symbols with PLT entries should be re-defined
+     to be the PLT entry.  */
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (eh->u.weakdef != NULL)
+    {
+      BFD_ASSERT (eh->u.weakdef->root.type == bfd_link_hash_defined
+		  || eh->u.weakdef->root.type == bfd_link_hash_defweak);
+      eh->root.u.def.section = eh->u.weakdef->root.u.def.section;
+      eh->root.u.def.value = eh->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* If this is a reference to a symbol defined by a dynamic object which
+     is not a function, we might allocate the symbol in our .dynbss section
+     and allocate a COPY dynamic relocation.
+
+     But PA64 code is canonically PIC, so as a rule we can avoid this sort
+     of hackery.  */
+
+  return TRUE;
+}
+
+/* This function is called via elf_link_hash_traverse to mark millicode
+   symbols with a dynindx of -1 and to remove the string table reference
+   from the dynamic symbol table.  If the symbol is not a millicode symbol,
+   elf64_hppa_mark_exported_functions is called.  */
+
+static bfd_boolean
+elf64_hppa_mark_milli_and_exported_functions (struct elf_link_hash_entry *eh,
+					      void *data)
+{
+  struct bfd_link_info *info = (struct bfd_link_info *) data;
+
+  if (eh->type == STT_PARISC_MILLI)
+    {
+      if (eh->dynindx != -1)
+	{
+	  eh->dynindx = -1;
+	  _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
+				  eh->dynstr_index);
+	}
+      return TRUE;
+    }
+
+  return elf64_hppa_mark_exported_functions (eh, data);
+}
+
+/* Set the final sizes of the dynamic sections and allocate memory for
+   the contents of our special sections.  */
+
+static bfd_boolean
+elf64_hppa_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
+{
+  struct elf64_hppa_link_hash_table *hppa_info;
+  struct elf64_hppa_allocate_data data;
+  bfd *dynobj;
+  bfd *ibfd;
+  asection *sec;
+  bfd_boolean plt;
+  bfd_boolean relocs;
+  bfd_boolean reltext;
+
+  hppa_info = hppa_link_hash_table (info);
+  if (hppa_info == NULL)
+    return FALSE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  /* Mark each function this program exports so that we will allocate
+     space in the .opd section for each function's FPTR.  If we are
+     creating dynamic sections, change the dynamic index of millicode
+     symbols to -1 and remove them from the string table for .dynstr.
+
+     We have to traverse the main linker hash table since we have to
+     find functions which may not have been mentioned in any relocs.  */
+  elf_link_hash_traverse (elf_hash_table (info),
+			  (elf_hash_table (info)->dynamic_sections_created
+			   ? elf64_hppa_mark_milli_and_exported_functions
+			   : elf64_hppa_mark_exported_functions),
+			  info);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  sec = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (sec != NULL);
+	  sec->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  sec->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+  else
+    {
+      /* We may have created entries in the .rela.got section.
+	 However, if we are not creating the dynamic sections, we will
+	 not actually use these entries.  Reset the size of .rela.dlt,
+	 which will cause it to get stripped from the output file
+	 below.  */
+      sec = bfd_get_section_by_name (dynobj, ".rela.dlt");
+      if (sec != NULL)
+	sec->size = 0;
+    }
+
+  /* Set up DLT, PLT and OPD offsets for local syms, and space for local
+     dynamic relocs.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      bfd_signed_vma *local_dlt;
+      bfd_signed_vma *end_local_dlt;
+      bfd_signed_vma *local_plt;
+      bfd_signed_vma *end_local_plt;
+      bfd_signed_vma *local_opd;
+      bfd_signed_vma *end_local_opd;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *srel;
+
+      if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour)
+	continue;
+
+      for (sec = ibfd->sections; sec != NULL; sec = sec->next)
+	{
+	  struct elf64_hppa_dyn_reloc_entry *hdh_p;
+
+	  for (hdh_p = ((struct elf64_hppa_dyn_reloc_entry *)
+		    elf_section_data (sec)->local_dynrel);
+	       hdh_p != NULL;
+	       hdh_p = hdh_p->next)
+	    {
+	      if (!bfd_is_abs_section (hdh_p->sec)
+		  && bfd_is_abs_section (hdh_p->sec->output_section))
+		{
+		  /* Input section has been discarded, either because
+		     it is a copy of a linkonce section or due to
+		     linker script /DISCARD/, so we'll be discarding
+		     the relocs too.  */
+		}
+	      else if (hdh_p->count != 0)
+		{
+		  srel = elf_section_data (hdh_p->sec)->sreloc;
+		  srel->size += hdh_p->count * sizeof (Elf64_External_Rela);
+		  if ((hdh_p->sec->output_section->flags & SEC_READONLY) != 0)
+		    info->flags |= DF_TEXTREL;
+		}
+	    }
+	}
+
+      local_dlt = elf_local_got_refcounts (ibfd);
+      if (!local_dlt)
+	continue;
+
+      symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+      locsymcount = symtab_hdr->sh_info;
+      end_local_dlt = local_dlt + locsymcount;
+      sec = hppa_info->dlt_sec;
+      srel = hppa_info->dlt_rel_sec;
+      for (; local_dlt < end_local_dlt; ++local_dlt)
+	{
+	  if (*local_dlt > 0)
+	    {
+	      *local_dlt = sec->size;
+	      sec->size += DLT_ENTRY_SIZE;
+	      if (info->shared) 
+	        {
+		  srel->size += sizeof (Elf64_External_Rela);
+	        }
+	    }
+	  else
+	    *local_dlt = (bfd_vma) -1;
+	}
+
+      local_plt = end_local_dlt;
+      end_local_plt = local_plt + locsymcount;
+      if (! hppa_info->root.dynamic_sections_created)
+	{
+	  /* Won't be used, but be safe.  */
+	  for (; local_plt < end_local_plt; ++local_plt)
+	    *local_plt = (bfd_vma) -1;
+	}
+      else
+	{
+	  sec = hppa_info->plt_sec;
+	  srel = hppa_info->plt_rel_sec;
+	  for (; local_plt < end_local_plt; ++local_plt)
+	    {
+	      if (*local_plt > 0)
+		{
+		  *local_plt = sec->size;
+		  sec->size += PLT_ENTRY_SIZE;
+		  if (info->shared)
+		    srel->size += sizeof (Elf64_External_Rela);
+		}
+	      else
+		*local_plt = (bfd_vma) -1;
+	    }
+	}
+
+      local_opd = end_local_plt;
+      end_local_opd = local_opd + locsymcount;
+      if (! hppa_info->root.dynamic_sections_created)
+	{
+	  /* Won't be used, but be safe.  */
+	  for (; local_opd < end_local_opd; ++local_opd)
+	    *local_opd = (bfd_vma) -1;
+	}
+      else
+	{
+	  sec = hppa_info->opd_sec;
+	  srel = hppa_info->opd_rel_sec;
+	  for (; local_opd < end_local_opd; ++local_opd)
+	    {
+	      if (*local_opd > 0)
+		{
+		  *local_opd = sec->size;
+		  sec->size += OPD_ENTRY_SIZE;
+		  if (info->shared)
+		    srel->size += sizeof (Elf64_External_Rela);
+		}
+	      else
+		*local_opd = (bfd_vma) -1;
+	    }
+	}
+    }
+
+  /* Allocate the GOT entries.  */
+
+  data.info = info;
+  if (hppa_info->dlt_sec)
+    {
+      data.ofs = hppa_info->dlt_sec->size;
+      elf_link_hash_traverse (elf_hash_table (info),
+			      allocate_global_data_dlt, &data);
+      hppa_info->dlt_sec->size = data.ofs;
+    }
+
+  if (hppa_info->plt_sec)
+    {
+      data.ofs = hppa_info->plt_sec->size;
+      elf_link_hash_traverse (elf_hash_table (info),
+		              allocate_global_data_plt, &data);
+      hppa_info->plt_sec->size = data.ofs;
+    }
+
+  if (hppa_info->stub_sec)
+    {
+      data.ofs = 0x0;
+      elf_link_hash_traverse (elf_hash_table (info),
+			      allocate_global_data_stub, &data);
+      hppa_info->stub_sec->size = data.ofs;
+    }
+
+  /* Allocate space for entries in the .opd section.  */
+  if (hppa_info->opd_sec)
+    {
+      data.ofs = hppa_info->opd_sec->size;
+      elf_link_hash_traverse (elf_hash_table (info),
+			      allocate_global_data_opd, &data);
+      hppa_info->opd_sec->size = data.ofs;
+    }
+
+  /* Now allocate space for dynamic relocations, if necessary.  */
+  if (hppa_info->root.dynamic_sections_created)
+    elf_link_hash_traverse (elf_hash_table (info),
+			    allocate_dynrel_entries, &data);
+
+  /* The sizes of all the sections are set.  Allocate memory for them.  */
+  plt = FALSE;
+  relocs = FALSE;
+  reltext = FALSE;
+  for (sec = dynobj->sections; sec != NULL; sec = sec->next)
+    {
+      const char *name;
+
+      if ((sec->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      /* It's OK to base decisions on the section name, because none
+	 of the dynobj section names depend upon the input files.  */
+      name = bfd_get_section_name (dynobj, sec);
+
+      if (strcmp (name, ".plt") == 0)
+	{
+	  /* Remember whether there is a PLT.  */
+	  plt = sec->size != 0;
+	}
+      else if (strcmp (name, ".opd") == 0
+	       || CONST_STRNEQ (name, ".dlt")
+	       || strcmp (name, ".stub") == 0
+	       || strcmp (name, ".got") == 0)
+	{
+	  /* Strip this section if we don't need it; see the comment below.  */
+	}
+      else if (CONST_STRNEQ (name, ".rela"))
+	{
+	  if (sec->size != 0)
+	    {
+	      asection *target;
+
+	      /* Remember whether there are any reloc sections other
+		 than .rela.plt.  */
+	      if (strcmp (name, ".rela.plt") != 0)
+		{
+		  const char *outname;
+
+		  relocs = TRUE;
+
+		  /* If this relocation section applies to a read only
+		     section, then we probably need a DT_TEXTREL
+		     entry.  The entries in the .rela.plt section
+		     really apply to the .got section, which we
+		     created ourselves and so know is not readonly.  */
+		  outname = bfd_get_section_name (output_bfd,
+						  sec->output_section);
+		  target = bfd_get_section_by_name (output_bfd, outname + 4);
+		  if (target != NULL
+		      && (target->flags & SEC_READONLY) != 0
+		      && (target->flags & SEC_ALLOC) != 0)
+		    reltext = TRUE;
+		}
+
+	      /* We use the reloc_count field as a counter if we need
+		 to copy relocs into the output file.  */
+	      sec->reloc_count = 0;
+	    }
+	}
+      else
+	{
+	  /* It's not one of our sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (sec->size == 0)
+	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is mostly to handle .rela.bss and
+	     .rela.plt.  We must create both sections in
+	     create_dynamic_sections, because they must be created
+	     before the linker maps input sections to output
+	     sections.  The linker does that before
+	     adjust_dynamic_symbol is called, and it is that
+	     function which decides whether anything needs to go
+	     into these sections.  */
+	  sec->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      if ((sec->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents if it has not
+	 been allocated already.  We use bfd_zalloc here in case
+	 unused entries are not reclaimed before the section's
+	 contents are written out.  This should not happen, but this
+	 way if it does, we get a R_PARISC_NONE reloc instead of
+	 garbage.  */
+      if (sec->contents == NULL)
+	{
+	  sec->contents = (bfd_byte *) bfd_zalloc (dynobj, sec->size);
+	  if (sec->contents == NULL)
+	    return FALSE;
+	}
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Always create a DT_PLTGOT.  It actually has nothing to do with
+	 the PLT, it is how we communicate the __gp value of a load
+	 module to the dynamic linker.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (!add_dynamic_entry (DT_HP_DLD_FLAGS, 0)
+	  || !add_dynamic_entry (DT_PLTGOT, 0))
+	return FALSE;
+
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in elf64_hppa_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+      if (! info->shared)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0)
+	      || !add_dynamic_entry (DT_HP_DLD_HOOK, 0)
+	      || !add_dynamic_entry (DT_HP_LOAD_MAP, 0))
+	    return FALSE;
+	}
+
+      /* Force DT_FLAGS to always be set.
+	 Required by HPUX 11.00 patch PHSS_26559.  */
+      if (!add_dynamic_entry (DT_FLAGS, (info)->flags))
+	return FALSE;
+
+      if (plt)
+	{
+	  if (!add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+	      || !add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+	}
+
+      if (relocs)
+	{
+	  if (!add_dynamic_entry (DT_RELA, 0)
+	      || !add_dynamic_entry (DT_RELASZ, 0)
+	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf64_External_Rela)))
+	    return FALSE;
+	}
+
+      if (reltext)
+	{
+	  if (!add_dynamic_entry (DT_TEXTREL, 0))
+	    return FALSE;
+	  info->flags |= DF_TEXTREL;
+	}
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+/* Called after we have output the symbol into the dynamic symbol
+   table, but before we output the symbol into the normal symbol
+   table.
+
+   For some symbols we had to change their address when outputting
+   the dynamic symbol table.  We undo that change here so that
+   the symbols have their expected value in the normal symbol
+   table.  Ick.  */
+
+static int
+elf64_hppa_link_output_symbol_hook (struct bfd_link_info *info ATTRIBUTE_UNUSED,
+				    const char *name,
+				    Elf_Internal_Sym *sym,
+				    asection *input_sec ATTRIBUTE_UNUSED,
+				    struct elf_link_hash_entry *eh)
+{
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
+
+  /* We may be called with the file symbol or section symbols.
+     They never need munging, so it is safe to ignore them.  */
+  if (!name || !eh)
+    return 1;
+
+  /* Function symbols for which we created .opd entries *may* have been
+     munged by finish_dynamic_symbol and have to be un-munged here.
+
+     Note that finish_dynamic_symbol sometimes turns dynamic symbols
+     into non-dynamic ones, so we initialize st_shndx to -1 in
+     mark_exported_functions and check to see if it was overwritten
+     here instead of just checking eh->dynindx.  */
+  if (hh->want_opd && hh->st_shndx != -1)
+    {
+      /* Restore the saved value and section index.  */
+      sym->st_value = hh->st_value;
+      sym->st_shndx = hh->st_shndx;
+    }
+
+  return 1;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+elf64_hppa_finish_dynamic_symbol (bfd *output_bfd,
+				  struct bfd_link_info *info,
+				  struct elf_link_hash_entry *eh,
+				  Elf_Internal_Sym *sym)
+{
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
+  asection *stub, *splt, *sopd, *spltrel;
+  struct elf64_hppa_link_hash_table *hppa_info;
+
+  hppa_info = hppa_link_hash_table (info);
+  if (hppa_info == NULL)
+    return FALSE;
+
+  stub = hppa_info->stub_sec;
+  splt = hppa_info->plt_sec;
+  sopd = hppa_info->opd_sec;
+  spltrel = hppa_info->plt_rel_sec;
+
+  /* Incredible.  It is actually necessary to NOT use the symbol's real
+     value when building the dynamic symbol table for a shared library.
+     At least for symbols that refer to functions.
+
+     We will store a new value and section index into the symbol long
+     enough to output it into the dynamic symbol table, then we restore
+     the original values (in elf64_hppa_link_output_symbol_hook).  */
+  if (hh->want_opd)
+    {
+      BFD_ASSERT (sopd != NULL);
+
+      /* Save away the original value and section index so that we
+	 can restore them later.  */
+      hh->st_value = sym->st_value;
+      hh->st_shndx = sym->st_shndx;
+
+      /* For the dynamic symbol table entry, we want the value to be
+	 address of this symbol's entry within the .opd section.  */
+      sym->st_value = (hh->opd_offset
+		       + sopd->output_offset
+		       + sopd->output_section->vma);
+      sym->st_shndx = _bfd_elf_section_from_bfd_section (output_bfd,
+							 sopd->output_section);
+    }
+
+  /* Initialize a .plt entry if requested.  */
+  if (hh->want_plt
+      && elf64_hppa_dynamic_symbol_p (eh, info))
+    {
+      bfd_vma value;
+      Elf_Internal_Rela rel;
+      bfd_byte *loc;
+
+      BFD_ASSERT (splt != NULL && spltrel != NULL);
+
+      /* We do not actually care about the value in the PLT entry
+	 if we are creating a shared library and the symbol is
+	 still undefined, we create a dynamic relocation to fill
+	 in the correct value.  */
+      if (info->shared && eh->root.type == bfd_link_hash_undefined)
+	value = 0;
+      else
+	value = (eh->root.u.def.value + eh->root.u.def.section->vma);
+
+      /* Fill in the entry in the procedure linkage table.
+
+	 The format of a plt entry is
+	 <funcaddr> <__gp>.
+
+	 plt_offset is the offset within the PLT section at which to
+	 install the PLT entry.
+
+	 We are modifying the in-memory PLT contents here, so we do not add
+	 in the output_offset of the PLT section.  */
+
+      bfd_put_64 (splt->owner, value, splt->contents + hh->plt_offset);
+      value = _bfd_get_gp_value (splt->output_section->owner);
+      bfd_put_64 (splt->owner, value, splt->contents + hh->plt_offset + 0x8);
+
+      /* Create a dynamic IPLT relocation for this entry.
+
+	 We are creating a relocation in the output file's PLT section,
+	 which is included within the DLT secton.  So we do need to include
+	 the PLT's output_offset in the computation of the relocation's
+	 address.  */
+      rel.r_offset = (hh->plt_offset + splt->output_offset
+		      + splt->output_section->vma);
+      rel.r_info = ELF64_R_INFO (hh->eh.dynindx, R_PARISC_IPLT);
+      rel.r_addend = 0;
+
+      loc = spltrel->contents;
+      loc += spltrel->reloc_count++ * sizeof (Elf64_External_Rela);
+      bfd_elf64_swap_reloca_out (splt->output_section->owner, &rel, loc);
+    }
+
+  /* Initialize an external call stub entry if requested.  */
+  if (hh->want_stub
+      && elf64_hppa_dynamic_symbol_p (eh, info))
+    {
+      bfd_vma value;
+      int insn;
+      unsigned int max_offset;
+
+      BFD_ASSERT (stub != NULL);
+
+      /* Install the generic stub template.
+
+	 We are modifying the contents of the stub section, so we do not
+	 need to include the stub section's output_offset here.  */
+      memcpy (stub->contents + hh->stub_offset, plt_stub, sizeof (plt_stub));
+
+      /* Fix up the first ldd instruction.
+
+	 We are modifying the contents of the STUB section in memory,
+	 so we do not need to include its output offset in this computation.
+
+	 Note the plt_offset value is the value of the PLT entry relative to
+	 the start of the PLT section.  These instructions will reference
+	 data relative to the value of __gp, which may not necessarily have
+	 the same address as the start of the PLT section.
+
+	 gp_offset contains the offset of __gp within the PLT section.  */
+      value = hh->plt_offset - hppa_info->gp_offset;
+
+      insn = bfd_get_32 (stub->owner, stub->contents + hh->stub_offset);
+      if (output_bfd->arch_info->mach >= 25)
+	{
+	  /* Wide mode allows 16 bit offsets.  */
+	  max_offset = 32768;
+	  insn &= ~ 0xfff1;
+	  insn |= re_assemble_16 ((int) value);
+	}
+      else
+	{
+	  max_offset = 8192;
+	  insn &= ~ 0x3ff1;
+	  insn |= re_assemble_14 ((int) value);
+	}
+
+      if ((value & 7) || value + max_offset >= 2*max_offset - 8)
+	{
+	  (*_bfd_error_handler) (_("stub entry for %s cannot load .plt, dp offset = %ld"),
+				 hh->eh.root.root.string,
+				 (long) value);
+	  return FALSE;
+	}
+
+      bfd_put_32 (stub->owner, (bfd_vma) insn,
+		  stub->contents + hh->stub_offset);
+
+      /* Fix up the second ldd instruction.  */
+      value += 8;
+      insn = bfd_get_32 (stub->owner, stub->contents + hh->stub_offset + 8);
+      if (output_bfd->arch_info->mach >= 25)
+	{
+	  insn &= ~ 0xfff1;
+	  insn |= re_assemble_16 ((int) value);
+	}
+      else
+	{
+	  insn &= ~ 0x3ff1;
+	  insn |= re_assemble_14 ((int) value);
+	}
+      bfd_put_32 (stub->owner, (bfd_vma) insn,
+		  stub->contents + hh->stub_offset + 8);
+    }
+
+  return TRUE;
+}
+
+/* The .opd section contains FPTRs for each function this file
+   exports.  Initialize the FPTR entries.  */
+
+static bfd_boolean
+elf64_hppa_finalize_opd (struct elf_link_hash_entry *eh, void *data)
+{
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
+  struct bfd_link_info *info = (struct bfd_link_info *)data;
+  struct elf64_hppa_link_hash_table *hppa_info;
+  asection *sopd;
+  asection *sopdrel;
+
+  hppa_info = hppa_link_hash_table (info);
+  if (hppa_info == NULL)
+    return FALSE;
+
+  sopd = hppa_info->opd_sec;
+  sopdrel = hppa_info->opd_rel_sec;
+
+  if (hh->want_opd)
+    {
+      bfd_vma value;
+
+      /* The first two words of an .opd entry are zero.
+
+	 We are modifying the contents of the OPD section in memory, so we
+	 do not need to include its output offset in this computation.  */
+      memset (sopd->contents + hh->opd_offset, 0, 16);
+
+      value = (eh->root.u.def.value
+	       + eh->root.u.def.section->output_section->vma
+	       + eh->root.u.def.section->output_offset);
+
+      /* The next word is the address of the function.  */
+      bfd_put_64 (sopd->owner, value, sopd->contents + hh->opd_offset + 16);
+
+      /* The last word is our local __gp value.  */
+      value = _bfd_get_gp_value (sopd->output_section->owner);
+      bfd_put_64 (sopd->owner, value, sopd->contents + hh->opd_offset + 24);
+    }
+
+  /* If we are generating a shared library, we must generate EPLT relocations
+     for each entry in the .opd, even for static functions (they may have
+     had their address taken).  */
+  if (info->shared && hh->want_opd)
+    {
+      Elf_Internal_Rela rel;
+      bfd_byte *loc;
+      int dynindx;
+
+      /* We may need to do a relocation against a local symbol, in
+	 which case we have to look up it's dynamic symbol index off
+	 the local symbol hash table.  */
+      if (eh->dynindx != -1)
+	dynindx = eh->dynindx;
+      else
+	dynindx
+	  = _bfd_elf_link_lookup_local_dynindx (info, hh->owner,
+						hh->sym_indx);
+
+      /* The offset of this relocation is the absolute address of the
+	 .opd entry for this symbol.  */
+      rel.r_offset = (hh->opd_offset + sopd->output_offset
+		      + sopd->output_section->vma);
+
+      /* If H is non-null, then we have an external symbol.
+
+	 It is imperative that we use a different dynamic symbol for the
+	 EPLT relocation if the symbol has global scope.
+
+	 In the dynamic symbol table, the function symbol will have a value
+	 which is address of the function's .opd entry.
+
+	 Thus, we can not use that dynamic symbol for the EPLT relocation
+	 (if we did, the data in the .opd would reference itself rather
+	 than the actual address of the function).  Instead we have to use
+	 a new dynamic symbol which has the same value as the original global
+	 function symbol.
+
+	 We prefix the original symbol with a "." and use the new symbol in
+	 the EPLT relocation.  This new symbol has already been recorded in
+	 the symbol table, we just have to look it up and use it.
+
+	 We do not have such problems with static functions because we do
+	 not make their addresses in the dynamic symbol table point to
+	 the .opd entry.  Ultimately this should be safe since a static
+	 function can not be directly referenced outside of its shared
+	 library.
+
+	 We do have to play similar games for FPTR relocations in shared
+	 libraries, including those for static symbols.  See the FPTR
+	 handling in elf64_hppa_finalize_dynreloc.  */
+      if (eh)
+	{
+	  char *new_name;
+	  struct elf_link_hash_entry *nh;
+
+	  new_name = alloca (strlen (eh->root.root.string) + 2);
+	  new_name[0] = '.';
+	  strcpy (new_name + 1, eh->root.root.string);
+
+	  nh = elf_link_hash_lookup (elf_hash_table (info),
+				     new_name, TRUE, TRUE, FALSE);
+ 
+	  /* All we really want from the new symbol is its dynamic
+	     symbol index.  */
+	  if (nh)
+	    dynindx = nh->dynindx;
+	}
+
+      rel.r_addend = 0;
+      rel.r_info = ELF64_R_INFO (dynindx, R_PARISC_EPLT);
+
+      loc = sopdrel->contents;
+      loc += sopdrel->reloc_count++ * sizeof (Elf64_External_Rela);
+      bfd_elf64_swap_reloca_out (sopd->output_section->owner, &rel, loc);
+    }
+  return TRUE;
+}
+
+/* The .dlt section contains addresses for items referenced through the
+   dlt.  Note that we can have a DLTIND relocation for a local symbol, thus
+   we can not depend on finish_dynamic_symbol to initialize the .dlt.  */
+
+static bfd_boolean
+elf64_hppa_finalize_dlt (struct elf_link_hash_entry *eh, void *data)
+{
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
+  struct bfd_link_info *info = (struct bfd_link_info *)data;
+  struct elf64_hppa_link_hash_table *hppa_info;
+  asection *sdlt, *sdltrel;
+
+  hppa_info = hppa_link_hash_table (info);
+  if (hppa_info == NULL)
+    return FALSE;
+
+  sdlt = hppa_info->dlt_sec;
+  sdltrel = hppa_info->dlt_rel_sec;
+
+  /* H/DYN_H may refer to a local variable and we know it's
+     address, so there is no need to create a relocation.  Just install
+     the proper value into the DLT, note this shortcut can not be
+     skipped when building a shared library.  */
+  if (! info->shared && hh && hh->want_dlt)
+    {
+      bfd_vma value;
+
+      /* If we had an LTOFF_FPTR style relocation we want the DLT entry
+	 to point to the FPTR entry in the .opd section.
+
+	 We include the OPD's output offset in this computation as
+	 we are referring to an absolute address in the resulting
+	 object file.  */
+      if (hh->want_opd)
+	{
+	  value = (hh->opd_offset
+		   + hppa_info->opd_sec->output_offset
+		   + hppa_info->opd_sec->output_section->vma);
+	}
+      else if ((eh->root.type == bfd_link_hash_defined
+		|| eh->root.type == bfd_link_hash_defweak)
+	       && eh->root.u.def.section)
+	{
+	  value = eh->root.u.def.value + eh->root.u.def.section->output_offset;
+	  if (eh->root.u.def.section->output_section)
+	    value += eh->root.u.def.section->output_section->vma;
+	  else
+	    value += eh->root.u.def.section->vma;
+	}
+      else
+	/* We have an undefined function reference.  */
+	value = 0;
+
+      /* We do not need to include the output offset of the DLT section
+	 here because we are modifying the in-memory contents.  */
+      bfd_put_64 (sdlt->owner, value, sdlt->contents + hh->dlt_offset);
+    }
+
+  /* Create a relocation for the DLT entry associated with this symbol.
+     When building a shared library the symbol does not have to be dynamic.  */
+  if (hh->want_dlt
+      && (elf64_hppa_dynamic_symbol_p (eh, info) || info->shared))
+    {
+      Elf_Internal_Rela rel;
+      bfd_byte *loc;
+      int dynindx;
+
+      /* We may need to do a relocation against a local symbol, in
+	 which case we have to look up it's dynamic symbol index off
+	 the local symbol hash table.  */
+      if (eh && eh->dynindx != -1)
+	dynindx = eh->dynindx;
+      else
+	dynindx
+	  = _bfd_elf_link_lookup_local_dynindx (info, hh->owner,
+						hh->sym_indx);
+
+      /* Create a dynamic relocation for this entry.  Do include the output
+	 offset of the DLT entry since we need an absolute address in the
+	 resulting object file.  */
+      rel.r_offset = (hh->dlt_offset + sdlt->output_offset
+		      + sdlt->output_section->vma);
+      if (eh && eh->type == STT_FUNC)
+	  rel.r_info = ELF64_R_INFO (dynindx, R_PARISC_FPTR64);
+      else
+	  rel.r_info = ELF64_R_INFO (dynindx, R_PARISC_DIR64);
+      rel.r_addend = 0;
+
+      loc = sdltrel->contents;
+      loc += sdltrel->reloc_count++ * sizeof (Elf64_External_Rela);
+      bfd_elf64_swap_reloca_out (sdlt->output_section->owner, &rel, loc);
+    }
+  return TRUE;
+}
+
+/* Finalize the dynamic relocations.  Specifically the FPTR relocations
+   for dynamic functions used to initialize static data.  */
+
+static bfd_boolean
+elf64_hppa_finalize_dynreloc (struct elf_link_hash_entry *eh,
+			      void *data)
+{
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
+  struct bfd_link_info *info = (struct bfd_link_info *)data;
+  struct elf64_hppa_link_hash_table *hppa_info;
+  int dynamic_symbol;
+
+  dynamic_symbol = elf64_hppa_dynamic_symbol_p (eh, info);
+
+  if (!dynamic_symbol && !info->shared)
+    return TRUE;
+
+  if (hh->reloc_entries)
+    {
+      struct elf64_hppa_dyn_reloc_entry *rent;
+      int dynindx;
+
+      hppa_info = hppa_link_hash_table (info);
+      if (hppa_info == NULL)
+	return FALSE;
+
+      /* We may need to do a relocation against a local symbol, in
+	 which case we have to look up it's dynamic symbol index off
+	 the local symbol hash table.  */
+      if (eh->dynindx != -1)
+	dynindx = eh->dynindx;
+      else
+	dynindx
+	  = _bfd_elf_link_lookup_local_dynindx (info, hh->owner,
+						hh->sym_indx);
+
+      for (rent = hh->reloc_entries; rent; rent = rent->next)
+	{
+	  Elf_Internal_Rela rel;
+	  bfd_byte *loc;
+
+	  /* Allocate one iff we are building a shared library, the relocation
+	     isn't a R_PARISC_FPTR64, or we don't want an opd entry.  */
+	  if (!info->shared && rent->type == R_PARISC_FPTR64 && hh->want_opd)
+	    continue;
+
+	  /* Create a dynamic relocation for this entry.
+
+	     We need the output offset for the reloc's section because
+	     we are creating an absolute address in the resulting object
+	     file.  */
+	  rel.r_offset = (rent->offset + rent->sec->output_offset
+			  + rent->sec->output_section->vma);
+
+	  /* An FPTR64 relocation implies that we took the address of
+	     a function and that the function has an entry in the .opd
+	     section.  We want the FPTR64 relocation to reference the
+	     entry in .opd.
+
+	     We could munge the symbol value in the dynamic symbol table
+	     (in fact we already do for functions with global scope) to point
+	     to the .opd entry.  Then we could use that dynamic symbol in
+	     this relocation.
+
+	     Or we could do something sensible, not munge the symbol's
+	     address and instead just use a different symbol to reference
+	     the .opd entry.  At least that seems sensible until you
+	     realize there's no local dynamic symbols we can use for that
+	     purpose.  Thus the hair in the check_relocs routine.
+
+	     We use a section symbol recorded by check_relocs as the
+	     base symbol for the relocation.  The addend is the difference
+	     between the section symbol and the address of the .opd entry.  */
+	  if (info->shared && rent->type == R_PARISC_FPTR64 && hh->want_opd)
+	    {
+	      bfd_vma value, value2;
+
+	      /* First compute the address of the opd entry for this symbol.  */
+	      value = (hh->opd_offset
+		       + hppa_info->opd_sec->output_section->vma
+		       + hppa_info->opd_sec->output_offset);
+
+	      /* Compute the value of the start of the section with
+		 the relocation.  */
+	      value2 = (rent->sec->output_section->vma
+			+ rent->sec->output_offset);
+
+	      /* Compute the difference between the start of the section
+		 with the relocation and the opd entry.  */
+	      value -= value2;
+
+	      /* The result becomes the addend of the relocation.  */
+	      rel.r_addend = value;
+
+	      /* The section symbol becomes the symbol for the dynamic
+		 relocation.  */
+	      dynindx
+		= _bfd_elf_link_lookup_local_dynindx (info,
+						      rent->sec->owner,
+						      rent->sec_symndx);
+	    }
+	  else
+	    rel.r_addend = rent->addend;
+
+	  rel.r_info = ELF64_R_INFO (dynindx, rent->type);
+
+	  loc = hppa_info->other_rel_sec->contents;
+	  loc += (hppa_info->other_rel_sec->reloc_count++
+		  * sizeof (Elf64_External_Rela));
+	  bfd_elf64_swap_reloca_out (hppa_info->other_rel_sec->output_section->owner,
+				     &rel, loc);
+	}
+    }
+
+  return TRUE;
+}
+
+/* Used to decide how to sort relocs in an optimal manner for the
+   dynamic linker, before writing them out.  */
+
+static enum elf_reloc_type_class
+elf64_hppa_reloc_type_class (const Elf_Internal_Rela *rela)
+{
+  if (ELF64_R_SYM (rela->r_info) == STN_UNDEF)
+    return reloc_class_relative;
+
+  switch ((int) ELF64_R_TYPE (rela->r_info))
+    {
+    case R_PARISC_IPLT:
+      return reloc_class_plt;
+    case R_PARISC_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+elf64_hppa_finish_dynamic_sections (bfd *output_bfd,
+				    struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *sdyn;
+  struct elf64_hppa_link_hash_table *hppa_info;
+
+  hppa_info = hppa_link_hash_table (info);
+  if (hppa_info == NULL)
+    return FALSE;
+
+  /* Finalize the contents of the .opd section.  */
+  elf_link_hash_traverse (elf_hash_table (info),
+			  elf64_hppa_finalize_opd,
+			  info);
+
+  elf_link_hash_traverse (elf_hash_table (info),
+			  elf64_hppa_finalize_dynreloc,
+			  info);
+
+  /* Finalize the contents of the .dlt section.  */
+  dynobj = elf_hash_table (info)->dynobj;
+  /* Finalize the contents of the .dlt section.  */
+  elf_link_hash_traverse (elf_hash_table (info),
+			  elf64_hppa_finalize_dlt,
+			  info);
+
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      Elf64_External_Dyn *dyncon, *dynconend;
+
+      BFD_ASSERT (sdyn != NULL);
+
+      dyncon = (Elf64_External_Dyn *) sdyn->contents;
+      dynconend = (Elf64_External_Dyn *) (sdyn->contents + sdyn->size);
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+	  asection *s;
+
+	  bfd_elf64_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    default:
+	      break;
+
+	    case DT_HP_LOAD_MAP:
+	      /* Compute the absolute address of 16byte scratchpad area
+		 for the dynamic linker.
+
+		 By convention the linker script will allocate the scratchpad
+		 area at the start of the .data section.  So all we have to
+		 to is find the start of the .data section.  */
+	      s = bfd_get_section_by_name (output_bfd, ".data");
+	      dyn.d_un.d_ptr = s->vma;
+	      bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_PLTGOT:
+	      /* HP's use PLTGOT to set the GOT register.  */
+	      dyn.d_un.d_ptr = _bfd_get_gp_value (output_bfd);
+	      bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_JMPREL:
+	      s = hppa_info->plt_rel_sec;
+	      dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+	      bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_PLTRELSZ:
+	      s = hppa_info->plt_rel_sec;
+	      dyn.d_un.d_val = s->size;
+	      bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_RELA:
+	      s = hppa_info->other_rel_sec;
+	      if (! s || ! s->size)
+		s = hppa_info->dlt_rel_sec;
+	      if (! s || ! s->size)
+		s = hppa_info->opd_rel_sec;
+	      dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+	      bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_RELASZ:
+	      s = hppa_info->other_rel_sec;
+	      dyn.d_un.d_val = s->size;
+	      s = hppa_info->dlt_rel_sec;
+	      dyn.d_un.d_val += s->size;
+	      s = hppa_info->opd_rel_sec;
+	      dyn.d_un.d_val += s->size;
+	      /* There is some question about whether or not the size of
+		 the PLT relocs should be included here.  HP's tools do
+		 it, so we'll emulate them.  */
+	      s = hppa_info->plt_rel_sec;
+	      dyn.d_un.d_val += s->size;
+	      bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Support for core dump NOTE sections.  */
+
+static bfd_boolean
+elf64_hppa_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  int offset;
+  size_t size;
+
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      case 760:		/* Linux/hppa */
+	/* pr_cursig */
+	elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12);
+
+	/* pr_pid */
+	elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 32);
+
+	/* pr_reg */
+	offset = 112;
+	size = 640;
+
+	break;
+    }
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg",
+					  size, note->descpos + offset);
+}
+
+static bfd_boolean
+elf64_hppa_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  char * command;
+  int n;
+
+  switch (note->descsz)
+    {
+    default:
+      return FALSE;
+
+    case 136:		/* Linux/hppa elf_prpsinfo.  */
+      elf_tdata (abfd)->core_program
+	= _bfd_elfcore_strndup (abfd, note->descdata + 40, 16);
+      elf_tdata (abfd)->core_command
+	= _bfd_elfcore_strndup (abfd, note->descdata + 56, 80);
+    }
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+  command = elf_tdata (abfd)->core_command;
+  n = strlen (command);
+
+  if (0 < n && command[n - 1] == ' ')
+    command[n - 1] = '\0';
+
+  return TRUE;
+}
+
+/* Return the number of additional phdrs we will need.
+
+   The generic ELF code only creates PT_PHDRs for executables.  The HP
+   dynamic linker requires PT_PHDRs for dynamic libraries too.
+
+   This routine indicates that the backend needs one additional program
+   header for that case.
+
+   Note we do not have access to the link info structure here, so we have
+   to guess whether or not we are building a shared library based on the
+   existence of a .interp section.  */
+
+static int
+elf64_hppa_additional_program_headers (bfd *abfd,
+				struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  asection *s;
+
+  /* If we are creating a shared library, then we have to create a
+     PT_PHDR segment.  HP's dynamic linker chokes without it.  */
+  s = bfd_get_section_by_name (abfd, ".interp");
+  if (! s)
+    return 1;
+  return 0;
+}
+
+/* Allocate and initialize any program headers required by this
+   specific backend.
+
+   The generic ELF code only creates PT_PHDRs for executables.  The HP
+   dynamic linker requires PT_PHDRs for dynamic libraries too.
+
+   This allocates the PT_PHDR and initializes it in a manner suitable
+   for the HP linker.
+
+   Note we do not have access to the link info structure here, so we have
+   to guess whether or not we are building a shared library based on the
+   existence of a .interp section.  */
+
+static bfd_boolean
+elf64_hppa_modify_segment_map (bfd *abfd,
+			       struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  struct elf_segment_map *m;
+  asection *s;
+
+  s = bfd_get_section_by_name (abfd, ".interp");
+  if (! s)
+    {
+      for (m = elf_tdata (abfd)->segment_map; m != NULL; m = m->next)
+	if (m->p_type == PT_PHDR)
+	  break;
+      if (m == NULL)
+	{
+	  m = ((struct elf_segment_map *)
+	       bfd_zalloc (abfd, (bfd_size_type) sizeof *m));
+	  if (m == NULL)
+	    return FALSE;
+
+	  m->p_type = PT_PHDR;
+	  m->p_flags = PF_R | PF_X;
+	  m->p_flags_valid = 1;
+	  m->p_paddr_valid = 1;
+	  m->includes_phdrs = 1;
+
+	  m->next = elf_tdata (abfd)->segment_map;
+	  elf_tdata (abfd)->segment_map = m;
+	}
+    }
+
+  for (m = elf_tdata (abfd)->segment_map; m != NULL; m = m->next)
+    if (m->p_type == PT_LOAD)
+      {
+	unsigned int i;
+
+	for (i = 0; i < m->count; i++)
+	  {
+	    /* The code "hint" is not really a hint.  It is a requirement
+	       for certain versions of the HP dynamic linker.  Worse yet,
+	       it must be set even if the shared library does not have
+	       any code in its "text" segment (thus the check for .hash
+	       to catch this situation).  */
+	    if (m->sections[i]->flags & SEC_CODE
+		|| (strcmp (m->sections[i]->name, ".hash") == 0))
+	      m->p_flags |= (PF_X | PF_HP_CODE);
+	  }
+      }
+
+  return TRUE;
+}
+
+/* Called when writing out an object file to decide the type of a
+   symbol.  */
+static int
+elf64_hppa_elf_get_symbol_type (Elf_Internal_Sym *elf_sym,
+				int type)
+{
+  if (ELF_ST_TYPE (elf_sym->st_info) == STT_PARISC_MILLI)
+    return STT_PARISC_MILLI;
+  else
+    return type;
+}
+
+/* Support HP specific sections for core files.  */
+
+static bfd_boolean
+elf64_hppa_section_from_phdr (bfd *abfd, Elf_Internal_Phdr *hdr, int sec_index,
+			      const char *typename)
+{
+  if (hdr->p_type == PT_HP_CORE_KERNEL)
+    {
+      asection *sect;
+
+      if (!_bfd_elf_make_section_from_phdr (abfd, hdr, sec_index, typename))
+	return FALSE;
+
+      sect = bfd_make_section_anyway (abfd, ".kernel");
+      if (sect == NULL)
+	return FALSE;
+      sect->size = hdr->p_filesz;
+      sect->filepos = hdr->p_offset;
+      sect->flags = SEC_HAS_CONTENTS | SEC_READONLY;
+      return TRUE;
+    }
+
+  if (hdr->p_type == PT_HP_CORE_PROC)
+    {
+      int sig;
+
+      if (bfd_seek (abfd, hdr->p_offset, SEEK_SET) != 0)
+	return FALSE;
+      if (bfd_bread (&sig, 4, abfd) != 4)
+	return FALSE;
+
+      elf_tdata (abfd)->core_signal = sig;
+
+      if (!_bfd_elf_make_section_from_phdr (abfd, hdr, sec_index, typename))
+	return FALSE;
+
+      /* GDB uses the ".reg" section to read register contents.  */
+      return _bfd_elfcore_make_pseudosection (abfd, ".reg", hdr->p_filesz,
+					      hdr->p_offset);
+    }
+
+  if (hdr->p_type == PT_HP_CORE_LOADABLE
+      || hdr->p_type == PT_HP_CORE_STACK
+      || hdr->p_type == PT_HP_CORE_MMF)
+    hdr->p_type = PT_LOAD;
+
+  return _bfd_elf_make_section_from_phdr (abfd, hdr, sec_index, typename);
+}
+
+/* Hook called by the linker routine which adds symbols from an object
+   file.  HP's libraries define symbols with HP specific section
+   indices, which we have to handle.  */
+
+static bfd_boolean
+elf_hppa_add_symbol_hook (bfd *abfd,
+			  struct bfd_link_info *info ATTRIBUTE_UNUSED,
+			  Elf_Internal_Sym *sym,
+			  const char **namep ATTRIBUTE_UNUSED,
+			  flagword *flagsp ATTRIBUTE_UNUSED,
+			  asection **secp,
+			  bfd_vma *valp)
+{
+  unsigned int sec_index = sym->st_shndx;
+
+  switch (sec_index)
+    {
+    case SHN_PARISC_ANSI_COMMON:
+      *secp = bfd_make_section_old_way (abfd, ".PARISC.ansi.common");
+      (*secp)->flags |= SEC_IS_COMMON;
+      *valp = sym->st_size;
+      break;
+
+    case SHN_PARISC_HUGE_COMMON:
+      *secp = bfd_make_section_old_way (abfd, ".PARISC.huge.common");
+      (*secp)->flags |= SEC_IS_COMMON;
+      *valp = sym->st_size;
+      break;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf_hppa_unmark_useless_dynamic_symbols (struct elf_link_hash_entry *h,
+					 void *data)
+{
+  struct bfd_link_info *info = data;
+
+  /* If we are not creating a shared library, and this symbol is
+     referenced by a shared library but is not defined anywhere, then
+     the generic code will warn that it is undefined.
+
+     This behavior is undesirable on HPs since the standard shared
+     libraries contain references to undefined symbols.
+
+     So we twiddle the flags associated with such symbols so that they
+     will not trigger the warning.  ?!? FIXME.  This is horribly fragile.
+
+     Ultimately we should have better controls over the generic ELF BFD
+     linker code.  */
+  if (! info->relocatable
+      && info->unresolved_syms_in_shared_libs != RM_IGNORE
+      && h->root.type == bfd_link_hash_undefined
+      && h->ref_dynamic
+      && !h->ref_regular)
+    {
+      h->ref_dynamic = 0;
+      h->pointer_equality_needed = 1;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf_hppa_remark_useless_dynamic_symbols (struct elf_link_hash_entry *h,
+					 void *data)
+{
+  struct bfd_link_info *info = data;
+
+  /* If we are not creating a shared library, and this symbol is
+     referenced by a shared library but is not defined anywhere, then
+     the generic code will warn that it is undefined.
+
+     This behavior is undesirable on HPs since the standard shared
+     libraries contain references to undefined symbols.
+
+     So we twiddle the flags associated with such symbols so that they
+     will not trigger the warning.  ?!? FIXME.  This is horribly fragile.
+
+     Ultimately we should have better controls over the generic ELF BFD
+     linker code.  */
+  if (! info->relocatable
+      && info->unresolved_syms_in_shared_libs != RM_IGNORE
+      && h->root.type == bfd_link_hash_undefined
+      && !h->ref_dynamic
+      && !h->ref_regular
+      && h->pointer_equality_needed)
+    {
+      h->ref_dynamic = 1;
+      h->pointer_equality_needed = 0;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf_hppa_is_dynamic_loader_symbol (const char *name)
+{
+  return (! strcmp (name, "__CPU_REVISION")
+	  || ! strcmp (name, "__CPU_KEYBITS_1")
+	  || ! strcmp (name, "__SYSTEM_ID_D")
+	  || ! strcmp (name, "__FPU_MODEL")
+	  || ! strcmp (name, "__FPU_REVISION")
+	  || ! strcmp (name, "__ARGC")
+	  || ! strcmp (name, "__ARGV")
+	  || ! strcmp (name, "__ENVP")
+	  || ! strcmp (name, "__TLS_SIZE_D")
+	  || ! strcmp (name, "__LOAD_INFO")
+	  || ! strcmp (name, "__systab"));
+}
+
+/* Record the lowest address for the data and text segments.  */
+static void
+elf_hppa_record_segment_addrs (bfd *abfd,
+			       asection *section,
+			       void *data)
+{
+  struct elf64_hppa_link_hash_table *hppa_info = data;
+
+  if ((section->flags & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD))
+    {
+      bfd_vma value;
+      Elf_Internal_Phdr *p;
+
+      p = _bfd_elf_find_segment_containing_section (abfd, section->output_section);
+      BFD_ASSERT (p != NULL);
+      value = p->p_vaddr;
+
+      if (section->flags & SEC_READONLY)
+	{
+	  if (value < hppa_info->text_segment_base)
+	    hppa_info->text_segment_base = value;
+	}
+      else
+	{
+	  if (value < hppa_info->data_segment_base)
+	    hppa_info->data_segment_base = value;
+	}
+    }
+}
+
+/* Called after we have seen all the input files/sections, but before
+   final symbol resolution and section placement has been determined.
+
+   We use this hook to (possibly) provide a value for __gp, then we
+   fall back to the generic ELF final link routine.  */
+
+static bfd_boolean
+elf_hppa_final_link (bfd *abfd, struct bfd_link_info *info)
+{
+  bfd_boolean retval;
+  struct elf64_hppa_link_hash_table *hppa_info = hppa_link_hash_table (info);
+
+  if (hppa_info == NULL)
+    return FALSE;
+
+  if (! info->relocatable)
+    {
+      struct elf_link_hash_entry *gp;
+      bfd_vma gp_val;
+
+      /* The linker script defines a value for __gp iff it was referenced
+	 by one of the objects being linked.  First try to find the symbol
+	 in the hash table.  If that fails, just compute the value __gp
+	 should have had.  */
+      gp = elf_link_hash_lookup (elf_hash_table (info), "__gp", FALSE,
+				 FALSE, FALSE);
+
+      if (gp)
+	{
+
+	  /* Adjust the value of __gp as we may want to slide it into the
+	     .plt section so that the stubs can access PLT entries without
+	     using an addil sequence.  */
+	  gp->root.u.def.value += hppa_info->gp_offset;
+
+	  gp_val = (gp->root.u.def.section->output_section->vma
+		    + gp->root.u.def.section->output_offset
+		    + gp->root.u.def.value);
+	}
+      else
+	{
+	  asection *sec;
+
+	  /* First look for a .plt section.  If found, then __gp is the
+	     address of the .plt + gp_offset.
+
+	     If no .plt is found, then look for .dlt, .opd and .data (in
+	     that order) and set __gp to the base address of whichever
+	     section is found first.  */
+
+	  sec = hppa_info->plt_sec;
+	  if (sec && ! (sec->flags & SEC_EXCLUDE))
+	    gp_val = (sec->output_offset
+		      + sec->output_section->vma
+		      + hppa_info->gp_offset);
+	  else
+	    {
+	      sec = hppa_info->dlt_sec;
+	      if (!sec || (sec->flags & SEC_EXCLUDE))
+		sec = hppa_info->opd_sec;
+	      if (!sec || (sec->flags & SEC_EXCLUDE))
+		sec = bfd_get_section_by_name (abfd, ".data");
+	      if (!sec || (sec->flags & SEC_EXCLUDE))
+		gp_val = 0;
+	      else
+		gp_val = sec->output_offset + sec->output_section->vma;
+	    }
+	}
+
+      /* Install whatever value we found/computed for __gp.  */
+      _bfd_set_gp_value (abfd, gp_val);
+    }
+
+  /* We need to know the base of the text and data segments so that we
+     can perform SEGREL relocations.  We will record the base addresses
+     when we encounter the first SEGREL relocation.  */
+  hppa_info->text_segment_base = (bfd_vma)-1;
+  hppa_info->data_segment_base = (bfd_vma)-1;
+
+  /* HP's shared libraries have references to symbols that are not
+     defined anywhere.  The generic ELF BFD linker code will complain
+     about such symbols.
+
+     So we detect the losing case and arrange for the flags on the symbol
+     to indicate that it was never referenced.  This keeps the generic
+     ELF BFD link code happy and appears to not create any secondary
+     problems.  Ultimately we need a way to control the behavior of the
+     generic ELF BFD link code better.  */
+  elf_link_hash_traverse (elf_hash_table (info),
+			  elf_hppa_unmark_useless_dynamic_symbols,
+			  info);
+
+  /* Invoke the regular ELF backend linker to do all the work.  */
+  retval = bfd_elf_final_link (abfd, info);
+
+  elf_link_hash_traverse (elf_hash_table (info),
+			  elf_hppa_remark_useless_dynamic_symbols,
+			  info);
+
+  /* If we're producing a final executable, sort the contents of the
+     unwind section. */
+  if (retval && !info->relocatable)
+    retval = elf_hppa_sort_unwind (abfd);
+
+  return retval;
+}
+
+/* Relocate the given INSN.  VALUE should be the actual value we want
+   to insert into the instruction, ie by this point we should not be
+   concerned with computing an offset relative to the DLT, PC, etc.
+   Instead this routine is meant to handle the bit manipulations needed
+   to insert the relocation into the given instruction.  */
+
+static int
+elf_hppa_relocate_insn (int insn, int sym_value, unsigned int r_type)
+{
+  switch (r_type)
+    {
+    /* This is any 22 bit branch.  In PA2.0 syntax it corresponds to
+       the "B" instruction.  */
+    case R_PARISC_PCREL22F:
+    case R_PARISC_PCREL22C:
+      return (insn & ~0x3ff1ffd) | re_assemble_22 (sym_value);
+
+      /* This is any 12 bit branch.  */
+    case R_PARISC_PCREL12F:
+      return (insn & ~0x1ffd) | re_assemble_12 (sym_value);
+
+    /* This is any 17 bit branch.  In PA2.0 syntax it also corresponds
+       to the "B" instruction as well as BE.  */
+    case R_PARISC_PCREL17F:
+    case R_PARISC_DIR17F:
+    case R_PARISC_DIR17R:
+    case R_PARISC_PCREL17C:
+    case R_PARISC_PCREL17R:
+      return (insn & ~0x1f1ffd) | re_assemble_17 (sym_value);
+
+    /* ADDIL or LDIL instructions.  */
+    case R_PARISC_DLTREL21L:
+    case R_PARISC_DLTIND21L:
+    case R_PARISC_LTOFF_FPTR21L:
+    case R_PARISC_PCREL21L:
+    case R_PARISC_LTOFF_TP21L:
+    case R_PARISC_DPREL21L:
+    case R_PARISC_PLTOFF21L:
+    case R_PARISC_DIR21L:
+      return (insn & ~0x1fffff) | re_assemble_21 (sym_value);
+
+    /* LDO and integer loads/stores with 14 bit displacements.  */
+    case R_PARISC_DLTREL14R:
+    case R_PARISC_DLTREL14F:
+    case R_PARISC_DLTIND14R:
+    case R_PARISC_DLTIND14F:
+    case R_PARISC_LTOFF_FPTR14R:
+    case R_PARISC_PCREL14R:
+    case R_PARISC_PCREL14F:
+    case R_PARISC_LTOFF_TP14R:
+    case R_PARISC_LTOFF_TP14F:
+    case R_PARISC_DPREL14R:
+    case R_PARISC_DPREL14F:
+    case R_PARISC_PLTOFF14R:
+    case R_PARISC_PLTOFF14F:
+    case R_PARISC_DIR14R:
+    case R_PARISC_DIR14F:
+      return (insn & ~0x3fff) | low_sign_unext (sym_value, 14);
+
+    /* PA2.0W LDO and integer loads/stores with 16 bit displacements.  */
+    case R_PARISC_LTOFF_FPTR16F:
+    case R_PARISC_PCREL16F:
+    case R_PARISC_LTOFF_TP16F:
+    case R_PARISC_GPREL16F:
+    case R_PARISC_PLTOFF16F:
+    case R_PARISC_DIR16F:
+    case R_PARISC_LTOFF16F:
+      return (insn & ~0xffff) | re_assemble_16 (sym_value);
+
+    /* Doubleword loads and stores with a 14 bit displacement.  */
+    case R_PARISC_DLTREL14DR:
+    case R_PARISC_DLTIND14DR:
+    case R_PARISC_LTOFF_FPTR14DR:
+    case R_PARISC_LTOFF_FPTR16DF:
+    case R_PARISC_PCREL14DR:
+    case R_PARISC_PCREL16DF:
+    case R_PARISC_LTOFF_TP14DR:
+    case R_PARISC_LTOFF_TP16DF:
+    case R_PARISC_DPREL14DR:
+    case R_PARISC_GPREL16DF:
+    case R_PARISC_PLTOFF14DR:
+    case R_PARISC_PLTOFF16DF:
+    case R_PARISC_DIR14DR:
+    case R_PARISC_DIR16DF:
+    case R_PARISC_LTOFF16DF:
+      return (insn & ~0x3ff1) | (((sym_value & 0x2000) >> 13)
+				 | ((sym_value & 0x1ff8) << 1));
+
+    /* Floating point single word load/store instructions.  */
+    case R_PARISC_DLTREL14WR:
+    case R_PARISC_DLTIND14WR:
+    case R_PARISC_LTOFF_FPTR14WR:
+    case R_PARISC_LTOFF_FPTR16WF:
+    case R_PARISC_PCREL14WR:
+    case R_PARISC_PCREL16WF:
+    case R_PARISC_LTOFF_TP14WR:
+    case R_PARISC_LTOFF_TP16WF:
+    case R_PARISC_DPREL14WR:
+    case R_PARISC_GPREL16WF:
+    case R_PARISC_PLTOFF14WR:
+    case R_PARISC_PLTOFF16WF:
+    case R_PARISC_DIR16WF:
+    case R_PARISC_DIR14WR:
+    case R_PARISC_LTOFF16WF:
+      return (insn & ~0x3ff9) | (((sym_value & 0x2000) >> 13)
+				 | ((sym_value & 0x1ffc) << 1));
+
+    default:
+      return insn;
+    }
+}
+
+/* Compute the value for a relocation (REL) during a final link stage,
+   then insert the value into the proper location in CONTENTS.
+
+   VALUE is a tentative value for the relocation and may be overridden
+   and modified here based on the specific relocation to be performed.
+
+   For example we do conversions for PC-relative branches in this routine
+   or redirection of calls to external routines to stubs.
+
+   The work of actually applying the relocation is left to a helper
+   routine in an attempt to reduce the complexity and size of this
+   function.  */
+
+static bfd_reloc_status_type
+elf_hppa_final_link_relocate (Elf_Internal_Rela *rel,
+			      bfd *input_bfd,
+			      bfd *output_bfd,
+			      asection *input_section,
+			      bfd_byte *contents,
+			      bfd_vma value,
+			      struct bfd_link_info *info,
+			      asection *sym_sec,
+			      struct elf_link_hash_entry *eh)
+{
+  struct elf64_hppa_link_hash_table *hppa_info = hppa_link_hash_table (info);
+  struct elf64_hppa_link_hash_entry *hh = hppa_elf_hash_entry (eh);
+  bfd_vma *local_offsets;
+  Elf_Internal_Shdr *symtab_hdr;
+  int insn;
+  bfd_vma max_branch_offset = 0;
+  bfd_vma offset = rel->r_offset;
+  bfd_signed_vma addend = rel->r_addend;
+  reloc_howto_type *howto = elf_hppa_howto_table + ELF_R_TYPE (rel->r_info);
+  unsigned int r_symndx = ELF_R_SYM (rel->r_info);
+  unsigned int r_type = howto->type;
+  bfd_byte *hit_data = contents + offset;
+
+  if (hppa_info == NULL)
+    return bfd_reloc_notsupported;
+  
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  local_offsets = elf_local_got_offsets (input_bfd);
+  insn = bfd_get_32 (input_bfd, hit_data);
+
+  switch (r_type)
+    {
+    case R_PARISC_NONE:
+      break;
+
+    /* Basic function call support.
+
+       Note for a call to a function defined in another dynamic library
+       we want to redirect the call to a stub.  */
+
+    /* PC relative relocs without an implicit offset.  */
+    case R_PARISC_PCREL21L:
+    case R_PARISC_PCREL14R:
+    case R_PARISC_PCREL14F:
+    case R_PARISC_PCREL14WR:
+    case R_PARISC_PCREL14DR:
+    case R_PARISC_PCREL16F:
+    case R_PARISC_PCREL16WF:
+    case R_PARISC_PCREL16DF:
+      {
+	/* If this is a call to a function defined in another dynamic
+	   library, then redirect the call to the local stub for this
+	   function.  */
+	if (sym_sec == NULL || sym_sec->output_section == NULL)
+	  value = (hh->stub_offset + hppa_info->stub_sec->output_offset
+		   + hppa_info->stub_sec->output_section->vma);
+
+	/* Turn VALUE into a proper PC relative address.  */
+	value -= (offset + input_section->output_offset
+		  + input_section->output_section->vma);
+
+	/* Adjust for any field selectors.  */
+	if (r_type == R_PARISC_PCREL21L)
+	  value = hppa_field_adjust (value, -8 + addend, e_lsel);
+	else if (r_type == R_PARISC_PCREL14F
+		 || r_type == R_PARISC_PCREL16F
+		 || r_type == R_PARISC_PCREL16WF
+		 || r_type == R_PARISC_PCREL16DF)
+	  value = hppa_field_adjust (value, -8 + addend, e_fsel);
+	else
+	  value = hppa_field_adjust (value, -8 + addend, e_rsel);
+
+	/* Apply the relocation to the given instruction.  */
+	insn = elf_hppa_relocate_insn (insn, (int) value, r_type);
+	break;
+      }
+
+    case R_PARISC_PCREL12F:
+    case R_PARISC_PCREL22F:
+    case R_PARISC_PCREL17F:
+    case R_PARISC_PCREL22C:
+    case R_PARISC_PCREL17C:
+    case R_PARISC_PCREL17R:
+      {
+	/* If this is a call to a function defined in another dynamic
+	   library, then redirect the call to the local stub for this
+	   function.  */
+	if (sym_sec == NULL || sym_sec->output_section == NULL)
+	  value = (hh->stub_offset + hppa_info->stub_sec->output_offset
+		   + hppa_info->stub_sec->output_section->vma);
+
+	/* Turn VALUE into a proper PC relative address.  */
+	value -= (offset + input_section->output_offset
+		  + input_section->output_section->vma);
+	addend -= 8;
+
+	if (r_type == (unsigned int) R_PARISC_PCREL22F)
+	  max_branch_offset = (1 << (22-1)) << 2;
+	else if (r_type == (unsigned int) R_PARISC_PCREL17F)
+	  max_branch_offset = (1 << (17-1)) << 2;
+	else if (r_type == (unsigned int) R_PARISC_PCREL12F)
+	  max_branch_offset = (1 << (12-1)) << 2;
+
+	/* Make sure we can reach the branch target.  */
+	if (max_branch_offset != 0
+	    && value + addend + max_branch_offset >= 2*max_branch_offset)
+	  {
+	    (*_bfd_error_handler)
+	      (_("%B(%A+0x" BFD_VMA_FMT "x): cannot reach %s"),
+	      input_bfd,
+	      input_section,
+	      offset,
+	      eh ? eh->root.root.string : "unknown");
+	    bfd_set_error (bfd_error_bad_value);
+	    return bfd_reloc_overflow;
+	  }
+
+	/* Adjust for any field selectors.  */
+	if (r_type == R_PARISC_PCREL17R)
+	  value = hppa_field_adjust (value, addend, e_rsel);
+	else
+	  value = hppa_field_adjust (value, addend, e_fsel);
+
+	/* All branches are implicitly shifted by 2 places.  */
+	value >>= 2;
+
+	/* Apply the relocation to the given instruction.  */
+	insn = elf_hppa_relocate_insn (insn, (int) value, r_type);
+	break;
+      }
+
+    /* Indirect references to data through the DLT.  */
+    case R_PARISC_DLTIND14R:
+    case R_PARISC_DLTIND14F:
+    case R_PARISC_DLTIND14DR:
+    case R_PARISC_DLTIND14WR:
+    case R_PARISC_DLTIND21L:
+    case R_PARISC_LTOFF_FPTR14R:
+    case R_PARISC_LTOFF_FPTR14DR:
+    case R_PARISC_LTOFF_FPTR14WR:
+    case R_PARISC_LTOFF_FPTR21L:
+    case R_PARISC_LTOFF_FPTR16F:
+    case R_PARISC_LTOFF_FPTR16WF:
+    case R_PARISC_LTOFF_FPTR16DF:
+    case R_PARISC_LTOFF_TP21L:
+    case R_PARISC_LTOFF_TP14R:
+    case R_PARISC_LTOFF_TP14F:
+    case R_PARISC_LTOFF_TP14WR:
+    case R_PARISC_LTOFF_TP14DR:
+    case R_PARISC_LTOFF_TP16F:
+    case R_PARISC_LTOFF_TP16WF:
+    case R_PARISC_LTOFF_TP16DF:
+    case R_PARISC_LTOFF16F:
+    case R_PARISC_LTOFF16WF:
+    case R_PARISC_LTOFF16DF:
+      {
+	bfd_vma off;
+
+	/* If this relocation was against a local symbol, then we still
+	   have not set up the DLT entry (it's not convenient to do so
+	   in the "finalize_dlt" routine because it is difficult to get
+	   to the local symbol's value).
+
+	   So, if this is a local symbol (h == NULL), then we need to
+	   fill in its DLT entry.
+
+	   Similarly we may still need to set up an entry in .opd for
+	   a local function which had its address taken.  */
+	if (hh == NULL)
+	  {
+	    bfd_vma *local_opd_offsets, *local_dlt_offsets;
+
+            if (local_offsets == NULL)
+              abort ();
+
+	    /* Now do .opd creation if needed.  */
+	    if (r_type == R_PARISC_LTOFF_FPTR14R
+		|| r_type == R_PARISC_LTOFF_FPTR14DR
+		|| r_type == R_PARISC_LTOFF_FPTR14WR
+		|| r_type == R_PARISC_LTOFF_FPTR21L
+		|| r_type == R_PARISC_LTOFF_FPTR16F
+		|| r_type == R_PARISC_LTOFF_FPTR16WF
+		|| r_type == R_PARISC_LTOFF_FPTR16DF)
+	      {
+		local_opd_offsets = local_offsets + 2 * symtab_hdr->sh_info;
+		off = local_opd_offsets[r_symndx];
+
+		/* The last bit records whether we've already initialised
+		   this local .opd entry.  */
+		if ((off & 1) != 0)
+		  {
+		    BFD_ASSERT (off != (bfd_vma) -1);
+		    off &= ~1;
+		  }
+		else
+		  {
+		    local_opd_offsets[r_symndx] |= 1;
+
+		    /* The first two words of an .opd entry are zero.  */
+		    memset (hppa_info->opd_sec->contents + off, 0, 16);
+
+		    /* The next word is the address of the function.  */
+		    bfd_put_64 (hppa_info->opd_sec->owner, value + addend,
+				(hppa_info->opd_sec->contents + off + 16));
+
+		    /* The last word is our local __gp value.  */
+		    value = _bfd_get_gp_value
+			      (hppa_info->opd_sec->output_section->owner);
+		    bfd_put_64 (hppa_info->opd_sec->owner, value,
+				(hppa_info->opd_sec->contents + off + 24));
+		  }
+
+		/* The DLT value is the address of the .opd entry.  */
+		value = (off
+			 + hppa_info->opd_sec->output_offset
+			 + hppa_info->opd_sec->output_section->vma);
+		addend = 0;
+	      }
+
+	    local_dlt_offsets = local_offsets;
+	    off = local_dlt_offsets[r_symndx];
+
+	    if ((off & 1) != 0)
+	      {
+		BFD_ASSERT (off != (bfd_vma) -1);
+		off &= ~1;
+	      }
+	    else
+	      {
+		local_dlt_offsets[r_symndx] |= 1;
+		bfd_put_64 (hppa_info->dlt_sec->owner,
+			    value + addend,
+			    hppa_info->dlt_sec->contents + off);
+	      }
+	  }
+	else
+	  off = hh->dlt_offset;
+
+	/* We want the value of the DLT offset for this symbol, not
+	   the symbol's actual address.  Note that __gp may not point
+	   to the start of the DLT, so we have to compute the absolute
+	   address, then subtract out the value of __gp.  */
+	value = (off
+		 + hppa_info->dlt_sec->output_offset
+		 + hppa_info->dlt_sec->output_section->vma);
+	value -= _bfd_get_gp_value (output_bfd);
+
+	/* All DLTIND relocations are basically the same at this point,
+	   except that we need different field selectors for the 21bit
+	   version vs the 14bit versions.  */
+	if (r_type == R_PARISC_DLTIND21L
+	    || r_type == R_PARISC_LTOFF_FPTR21L
+	    || r_type == R_PARISC_LTOFF_TP21L)
+	  value = hppa_field_adjust (value, 0, e_lsel);
+	else if (r_type == R_PARISC_DLTIND14F
+		 || r_type == R_PARISC_LTOFF_FPTR16F
+		 || r_type == R_PARISC_LTOFF_FPTR16WF
+		 || r_type == R_PARISC_LTOFF_FPTR16DF
+		 || r_type == R_PARISC_LTOFF16F
+		 || r_type == R_PARISC_LTOFF16DF
+		 || r_type == R_PARISC_LTOFF16WF
+		 || r_type == R_PARISC_LTOFF_TP16F
+		 || r_type == R_PARISC_LTOFF_TP16WF
+		 || r_type == R_PARISC_LTOFF_TP16DF)
+	  value = hppa_field_adjust (value, 0, e_fsel);
+	else
+	  value = hppa_field_adjust (value, 0, e_rsel);
+
+	insn = elf_hppa_relocate_insn (insn, (int) value, r_type);
+	break;
+      }
+
+    case R_PARISC_DLTREL14R:
+    case R_PARISC_DLTREL14F:
+    case R_PARISC_DLTREL14DR:
+    case R_PARISC_DLTREL14WR:
+    case R_PARISC_DLTREL21L:
+    case R_PARISC_DPREL21L:
+    case R_PARISC_DPREL14WR:
+    case R_PARISC_DPREL14DR:
+    case R_PARISC_DPREL14R:
+    case R_PARISC_DPREL14F:
+    case R_PARISC_GPREL16F:
+    case R_PARISC_GPREL16WF:
+    case R_PARISC_GPREL16DF:
+      {
+	/* Subtract out the global pointer value to make value a DLT
+	   relative address.  */
+	value -= _bfd_get_gp_value (output_bfd);
+
+	/* All DLTREL relocations are basically the same at this point,
+	   except that we need different field selectors for the 21bit
+	   version vs the 14bit versions.  */
+	if (r_type == R_PARISC_DLTREL21L
+	    || r_type == R_PARISC_DPREL21L)
+	  value = hppa_field_adjust (value, addend, e_lrsel);
+	else if (r_type == R_PARISC_DLTREL14F
+		 || r_type == R_PARISC_DPREL14F
+		 || r_type == R_PARISC_GPREL16F
+		 || r_type == R_PARISC_GPREL16WF
+		 || r_type == R_PARISC_GPREL16DF)
+	  value = hppa_field_adjust (value, addend, e_fsel);
+	else
+	  value = hppa_field_adjust (value, addend, e_rrsel);
+
+	insn = elf_hppa_relocate_insn (insn, (int) value, r_type);
+	break;
+      }
+
+    case R_PARISC_DIR21L:
+    case R_PARISC_DIR17R:
+    case R_PARISC_DIR17F:
+    case R_PARISC_DIR14R:
+    case R_PARISC_DIR14F:
+    case R_PARISC_DIR14WR:
+    case R_PARISC_DIR14DR:
+    case R_PARISC_DIR16F:
+    case R_PARISC_DIR16WF:
+    case R_PARISC_DIR16DF:
+      {
+	/* All DIR relocations are basically the same at this point,
+	   except that branch offsets need to be divided by four, and
+	   we need different field selectors.  Note that we don't
+	   redirect absolute calls to local stubs.  */
+
+	if (r_type == R_PARISC_DIR21L)
+	  value = hppa_field_adjust (value, addend, e_lrsel);
+	else if (r_type == R_PARISC_DIR17F
+		 || r_type == R_PARISC_DIR16F
+		 || r_type == R_PARISC_DIR16WF
+		 || r_type == R_PARISC_DIR16DF
+		 || r_type == R_PARISC_DIR14F)
+	  value = hppa_field_adjust (value, addend, e_fsel);
+	else
+	  value = hppa_field_adjust (value, addend, e_rrsel);
+
+	if (r_type == R_PARISC_DIR17R || r_type == R_PARISC_DIR17F)
+	  /* All branches are implicitly shifted by 2 places.  */
+	  value >>= 2;
+
+	insn = elf_hppa_relocate_insn (insn, (int) value, r_type);
+	break;
+      }
+
+    case R_PARISC_PLTOFF21L:
+    case R_PARISC_PLTOFF14R:
+    case R_PARISC_PLTOFF14F:
+    case R_PARISC_PLTOFF14WR:
+    case R_PARISC_PLTOFF14DR:
+    case R_PARISC_PLTOFF16F:
+    case R_PARISC_PLTOFF16WF:
+    case R_PARISC_PLTOFF16DF:
+      {
+	/* We want the value of the PLT offset for this symbol, not
+	   the symbol's actual address.  Note that __gp may not point
+	   to the start of the DLT, so we have to compute the absolute
+	   address, then subtract out the value of __gp.  */
+	value = (hh->plt_offset
+		 + hppa_info->plt_sec->output_offset
+		 + hppa_info->plt_sec->output_section->vma);
+	value -= _bfd_get_gp_value (output_bfd);
+
+	/* All PLTOFF relocations are basically the same at this point,
+	   except that we need different field selectors for the 21bit
+	   version vs the 14bit versions.  */
+	if (r_type == R_PARISC_PLTOFF21L)
+	  value = hppa_field_adjust (value, addend, e_lrsel);
+	else if (r_type == R_PARISC_PLTOFF14F
+		 || r_type == R_PARISC_PLTOFF16F
+		 || r_type == R_PARISC_PLTOFF16WF
+		 || r_type == R_PARISC_PLTOFF16DF)
+	  value = hppa_field_adjust (value, addend, e_fsel);
+	else
+	  value = hppa_field_adjust (value, addend, e_rrsel);
+
+	insn = elf_hppa_relocate_insn (insn, (int) value, r_type);
+	break;
+      }
+
+    case R_PARISC_LTOFF_FPTR32:
+      {
+	/* We may still need to create the FPTR itself if it was for
+	   a local symbol.  */
+	if (hh == NULL)
+	  {
+	    /* The first two words of an .opd entry are zero.  */
+	    memset (hppa_info->opd_sec->contents + hh->opd_offset, 0, 16);
+
+	    /* The next word is the address of the function.  */
+	    bfd_put_64 (hppa_info->opd_sec->owner, value + addend,
+			(hppa_info->opd_sec->contents
+			 + hh->opd_offset + 16));
+
+	    /* The last word is our local __gp value.  */
+	    value = _bfd_get_gp_value
+		      (hppa_info->opd_sec->output_section->owner);
+	    bfd_put_64 (hppa_info->opd_sec->owner, value,
+			hppa_info->opd_sec->contents + hh->opd_offset + 24);
+
+	    /* The DLT value is the address of the .opd entry.  */
+	    value = (hh->opd_offset
+		     + hppa_info->opd_sec->output_offset
+		     + hppa_info->opd_sec->output_section->vma);
+
+	    bfd_put_64 (hppa_info->dlt_sec->owner,
+			value,
+			hppa_info->dlt_sec->contents + hh->dlt_offset);
+	  }
+
+	/* We want the value of the DLT offset for this symbol, not
+	   the symbol's actual address.  Note that __gp may not point
+	   to the start of the DLT, so we have to compute the absolute
+	   address, then subtract out the value of __gp.  */
+	value = (hh->dlt_offset
+		 + hppa_info->dlt_sec->output_offset
+		 + hppa_info->dlt_sec->output_section->vma);
+	value -= _bfd_get_gp_value (output_bfd);
+	bfd_put_32 (input_bfd, value, hit_data);
+	return bfd_reloc_ok;
+      }
+
+    case R_PARISC_LTOFF_FPTR64:
+    case R_PARISC_LTOFF_TP64:
+      {
+	/* We may still need to create the FPTR itself if it was for
+	   a local symbol.  */
+	if (eh == NULL && r_type == R_PARISC_LTOFF_FPTR64)
+	  {
+	    /* The first two words of an .opd entry are zero.  */
+	    memset (hppa_info->opd_sec->contents + hh->opd_offset, 0, 16);
+
+	    /* The next word is the address of the function.  */
+	    bfd_put_64 (hppa_info->opd_sec->owner, value + addend,
+			(hppa_info->opd_sec->contents
+			 + hh->opd_offset + 16));
+
+	    /* The last word is our local __gp value.  */
+	    value = _bfd_get_gp_value
+		      (hppa_info->opd_sec->output_section->owner);
+	    bfd_put_64 (hppa_info->opd_sec->owner, value,
+			hppa_info->opd_sec->contents + hh->opd_offset + 24);
+
+	    /* The DLT value is the address of the .opd entry.  */
+	    value = (hh->opd_offset
+		     + hppa_info->opd_sec->output_offset
+		     + hppa_info->opd_sec->output_section->vma);
+
+	    bfd_put_64 (hppa_info->dlt_sec->owner,
+			value,
+			hppa_info->dlt_sec->contents + hh->dlt_offset);
+	  }
+
+	/* We want the value of the DLT offset for this symbol, not
+	   the symbol's actual address.  Note that __gp may not point
+	   to the start of the DLT, so we have to compute the absolute
+	   address, then subtract out the value of __gp.  */
+	value = (hh->dlt_offset
+		 + hppa_info->dlt_sec->output_offset
+		 + hppa_info->dlt_sec->output_section->vma);
+	value -= _bfd_get_gp_value (output_bfd);
+	bfd_put_64 (input_bfd, value, hit_data);
+	return bfd_reloc_ok;
+      }
+
+    case R_PARISC_DIR32:
+      bfd_put_32 (input_bfd, value + addend, hit_data);
+      return bfd_reloc_ok;
+
+    case R_PARISC_DIR64:
+      bfd_put_64 (input_bfd, value + addend, hit_data);
+      return bfd_reloc_ok;
+
+    case R_PARISC_GPREL64:
+      /* Subtract out the global pointer value to make value a DLT
+	 relative address.  */
+      value -= _bfd_get_gp_value (output_bfd);
+
+      bfd_put_64 (input_bfd, value + addend, hit_data);
+      return bfd_reloc_ok;
+
+    case R_PARISC_LTOFF64:
+	/* We want the value of the DLT offset for this symbol, not
+	   the symbol's actual address.  Note that __gp may not point
+	   to the start of the DLT, so we have to compute the absolute
+	   address, then subtract out the value of __gp.  */
+      value = (hh->dlt_offset
+	       + hppa_info->dlt_sec->output_offset
+	       + hppa_info->dlt_sec->output_section->vma);
+      value -= _bfd_get_gp_value (output_bfd);
+
+      bfd_put_64 (input_bfd, value + addend, hit_data);
+      return bfd_reloc_ok;
+
+    case R_PARISC_PCREL32:
+      {
+	/* If this is a call to a function defined in another dynamic
+	   library, then redirect the call to the local stub for this
+	   function.  */
+	if (sym_sec == NULL || sym_sec->output_section == NULL)
+	  value = (hh->stub_offset + hppa_info->stub_sec->output_offset
+		   + hppa_info->stub_sec->output_section->vma);
+
+	/* Turn VALUE into a proper PC relative address.  */
+	value -= (offset + input_section->output_offset
+		  + input_section->output_section->vma);
+
+	value += addend;
+	value -= 8;
+	bfd_put_32 (input_bfd, value, hit_data);
+	return bfd_reloc_ok;
+      }
+
+    case R_PARISC_PCREL64:
+      {
+	/* If this is a call to a function defined in another dynamic
+	   library, then redirect the call to the local stub for this
+	   function.  */
+	if (sym_sec == NULL || sym_sec->output_section == NULL)
+	  value = (hh->stub_offset + hppa_info->stub_sec->output_offset
+		   + hppa_info->stub_sec->output_section->vma);
+
+	/* Turn VALUE into a proper PC relative address.  */
+	value -= (offset + input_section->output_offset
+		  + input_section->output_section->vma);
+
+	value += addend;
+	value -= 8;
+	bfd_put_64 (input_bfd, value, hit_data);
+	return bfd_reloc_ok;
+      }
+
+    case R_PARISC_FPTR64:
+      {
+	bfd_vma off;
+
+	/* We may still need to create the FPTR itself if it was for
+	   a local symbol.  */
+	if (hh == NULL)
+	  {
+	    bfd_vma *local_opd_offsets;
+
+            if (local_offsets == NULL)
+              abort ();
+
+	    local_opd_offsets = local_offsets + 2 * symtab_hdr->sh_info;
+	    off = local_opd_offsets[r_symndx];
+
+	    /* The last bit records whether we've already initialised
+	       this local .opd entry.  */
+	    if ((off & 1) != 0)
+	      {
+		BFD_ASSERT (off != (bfd_vma) -1);
+	        off &= ~1;
+	      }
+	    else
+	      {
+		/* The first two words of an .opd entry are zero.  */
+		memset (hppa_info->opd_sec->contents + off, 0, 16);
+
+		/* The next word is the address of the function.  */
+		bfd_put_64 (hppa_info->opd_sec->owner, value + addend,
+			    (hppa_info->opd_sec->contents + off + 16));
+
+		/* The last word is our local __gp value.  */
+		value = _bfd_get_gp_value
+			  (hppa_info->opd_sec->output_section->owner);
+		bfd_put_64 (hppa_info->opd_sec->owner, value,
+			    hppa_info->opd_sec->contents + off + 24);
+	      }
+	  }
+	else
+	  off = hh->opd_offset;
+
+	if (hh == NULL || hh->want_opd)
+	  /* We want the value of the OPD offset for this symbol.  */
+	  value = (off
+		   + hppa_info->opd_sec->output_offset
+		   + hppa_info->opd_sec->output_section->vma);
+	else
+	  /* We want the address of the symbol.  */
+	  value += addend;
+
+	bfd_put_64 (input_bfd, value, hit_data);
+	return bfd_reloc_ok;
+      }
+
+    case R_PARISC_SECREL32:
+      if (sym_sec)
+	value -= sym_sec->output_section->vma;
+      bfd_put_32 (input_bfd, value + addend, hit_data);
+      return bfd_reloc_ok;
+
+    case R_PARISC_SEGREL32:
+    case R_PARISC_SEGREL64:
+      {
+	/* If this is the first SEGREL relocation, then initialize
+	   the segment base values.  */
+	if (hppa_info->text_segment_base == (bfd_vma) -1)
+	  bfd_map_over_sections (output_bfd, elf_hppa_record_segment_addrs,
+				 hppa_info);
+
+	/* VALUE holds the absolute address.  We want to include the
+	   addend, then turn it into a segment relative address.
+
+	   The segment is derived from SYM_SEC.  We assume that there are
+	   only two segments of note in the resulting executable/shlib.
+	   A readonly segment (.text) and a readwrite segment (.data).  */
+	value += addend;
+
+	if (sym_sec->flags & SEC_CODE)
+	  value -= hppa_info->text_segment_base;
+	else
+	  value -= hppa_info->data_segment_base;
+
+	if (r_type == R_PARISC_SEGREL32)
+	  bfd_put_32 (input_bfd, value, hit_data);
+	else
+	  bfd_put_64 (input_bfd, value, hit_data);
+	return bfd_reloc_ok;
+      }
+
+    /* Something we don't know how to handle.  */
+    default:
+      return bfd_reloc_notsupported;
+    }
+
+  /* Update the instruction word.  */
+  bfd_put_32 (input_bfd, (bfd_vma) insn, hit_data);
+  return bfd_reloc_ok;
+}
+
+/* Relocate an HPPA ELF section.  */
+
+static bfd_boolean
+elf64_hppa_relocate_section (bfd *output_bfd,
+			   struct bfd_link_info *info,
+			   bfd *input_bfd,
+			   asection *input_section,
+			   bfd_byte *contents,
+			   Elf_Internal_Rela *relocs,
+			   Elf_Internal_Sym *local_syms,
+			   asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  struct elf64_hppa_link_hash_table *hppa_info;
+
+  hppa_info = hppa_link_hash_table (info);
+  if (hppa_info == NULL)
+    return FALSE;
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      int r_type;
+      reloc_howto_type *howto = elf_hppa_howto_table + ELF_R_TYPE (rel->r_info);
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *eh;
+      Elf_Internal_Sym *sym;
+      asection *sym_sec;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+
+      r_type = ELF_R_TYPE (rel->r_info);
+      if (r_type < 0 || r_type >= (int) R_PARISC_UNIMPLEMENTED)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+      if (r_type == (unsigned int) R_PARISC_GNU_VTENTRY
+	  || r_type == (unsigned int) R_PARISC_GNU_VTINHERIT)
+	continue;
+
+      /* This is a final link.  */
+      r_symndx = ELF_R_SYM (rel->r_info);
+      eh = NULL;
+      sym = NULL;
+      sym_sec = NULL;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  /* This is a local symbol, hh defaults to NULL.  */
+	  sym = local_syms + r_symndx;
+	  sym_sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sym_sec, rel);
+	}
+      else
+	{
+	  /* This is not a local symbol.  */
+	  struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd);
+
+	  /* It seems this can happen with erroneous or unsupported 
+	     input (mixing a.out and elf in an archive, for example.)  */
+	  if (sym_hashes == NULL)
+	    return FALSE;
+
+	  eh = sym_hashes[r_symndx - symtab_hdr->sh_info];
+
+	  while (eh->root.type == bfd_link_hash_indirect 
+		 || eh->root.type == bfd_link_hash_warning)
+	    eh = (struct elf_link_hash_entry *) eh->root.u.i.link;
+
+	  relocation = 0;
+	  if (eh->root.type == bfd_link_hash_defined
+	      || eh->root.type == bfd_link_hash_defweak)
+	    {
+	      sym_sec = eh->root.u.def.section;
+	      if (sym_sec != NULL
+		  && sym_sec->output_section != NULL)
+		relocation = (eh->root.u.def.value
+			      + sym_sec->output_section->vma
+			      + sym_sec->output_offset);
+	    }
+	  else if (eh->root.type == bfd_link_hash_undefweak)
+	    ;
+	  else if (info->unresolved_syms_in_objects == RM_IGNORE
+		   && ELF_ST_VISIBILITY (eh->other) == STV_DEFAULT)
+	    ;
+	  else if (!info->relocatable
+		   && elf_hppa_is_dynamic_loader_symbol (eh->root.root.string))
+	    continue;
+	  else if (!info->relocatable)
+	    {
+	      bfd_boolean err;
+	      err = (info->unresolved_syms_in_objects == RM_GENERATE_ERROR
+		     || ELF_ST_VISIBILITY (eh->other) != STV_DEFAULT);
+	      if (!info->callbacks->undefined_symbol (info,
+						      eh->root.root.string,
+						      input_bfd,
+						      input_section,
+						      rel->r_offset, err))
+		return FALSE;
+	    }
+
+          if (!info->relocatable
+              && relocation == 0
+              && eh->root.type != bfd_link_hash_defined
+              && eh->root.type != bfd_link_hash_defweak
+              && eh->root.type != bfd_link_hash_undefweak)
+            {
+              if (info->unresolved_syms_in_objects == RM_IGNORE
+                  && ELF_ST_VISIBILITY (eh->other) == STV_DEFAULT
+                  && eh->type == STT_PARISC_MILLI)
+                {
+                  if (! info->callbacks->undefined_symbol
+                      (info, eh_name (eh), input_bfd,
+                       input_section, rel->r_offset, FALSE))
+                    return FALSE;
+                }
+            }
+	}
+
+      if (sym_sec != NULL && elf_discarded_section (sym_sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      r = elf_hppa_final_link_relocate (rel, input_bfd, output_bfd,
+					input_section, contents,
+					relocation, info, sym_sec,
+					eh);
+
+      if (r != bfd_reloc_ok)
+	{
+	  switch (r)
+	    {
+	    default:
+	      abort ();
+	    case bfd_reloc_overflow:
+	      {
+		const char *sym_name;
+
+		if (eh != NULL)
+		  sym_name = NULL;
+		else
+		  {
+		    sym_name = bfd_elf_string_from_elf_section (input_bfd,
+								symtab_hdr->sh_link,
+								sym->st_name);
+		    if (sym_name == NULL)
+		      return FALSE;
+		    if (*sym_name == '\0')
+		      sym_name = bfd_section_name (input_bfd, sym_sec);
+		  }
+
+		if (!((*info->callbacks->reloc_overflow)
+		      (info, (eh ? &eh->root : NULL), sym_name,
+		       howto->name, (bfd_vma) 0, input_bfd,
+		       input_section, rel->r_offset)))
+		  return FALSE;
+	      }
+	      break;
+	    }
+	}
+    }
+  return TRUE;
+}
+
+static const struct bfd_elf_special_section elf64_hppa_special_sections[] =
+{
+  { STRING_COMMA_LEN (".fini"),  0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".init"),  0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".plt"),   0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_PARISC_SHORT },
+  { STRING_COMMA_LEN (".dlt"),   0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_PARISC_SHORT },
+  { STRING_COMMA_LEN (".sdata"), 0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_PARISC_SHORT },
+  { STRING_COMMA_LEN (".sbss"),  0, SHT_NOBITS, SHF_ALLOC + SHF_WRITE + SHF_PARISC_SHORT },
+  { STRING_COMMA_LEN (".tbss"),  0, SHT_NOBITS, SHF_ALLOC + SHF_WRITE + SHF_HP_TLS },
+  { NULL,                    0,  0, 0,            0 }
+};
+
+/* The hash bucket size is the standard one, namely 4.  */
+
+const struct elf_size_info hppa64_elf_size_info =
+{
+  sizeof (Elf64_External_Ehdr),
+  sizeof (Elf64_External_Phdr),
+  sizeof (Elf64_External_Shdr),
+  sizeof (Elf64_External_Rel),
+  sizeof (Elf64_External_Rela),
+  sizeof (Elf64_External_Sym),
+  sizeof (Elf64_External_Dyn),
+  sizeof (Elf_External_Note),
+  4,
+  1,
+  64, 3,
+  ELFCLASS64, EV_CURRENT,
+  bfd_elf64_write_out_phdrs,
+  bfd_elf64_write_shdrs_and_ehdr,
+  bfd_elf64_checksum_contents,
+  bfd_elf64_write_relocs,
+  bfd_elf64_swap_symbol_in,
+  bfd_elf64_swap_symbol_out,
+  bfd_elf64_slurp_reloc_table,
+  bfd_elf64_slurp_symbol_table,
+  bfd_elf64_swap_dyn_in,
+  bfd_elf64_swap_dyn_out,
+  bfd_elf64_swap_reloc_in,
+  bfd_elf64_swap_reloc_out,
+  bfd_elf64_swap_reloca_in,
+  bfd_elf64_swap_reloca_out
+};
+
+#define TARGET_BIG_SYM			bfd_elf64_hppa_vec
+#define TARGET_BIG_NAME			"elf64-hppa"
+#define ELF_ARCH			bfd_arch_hppa
+#define ELF_TARGET_ID			HPPA64_ELF_DATA
+#define ELF_MACHINE_CODE		EM_PARISC
+/* This is not strictly correct.  The maximum page size for PA2.0 is
+   64M.  But everything still uses 4k.  */
+#define ELF_MAXPAGESIZE			0x1000
+#define ELF_OSABI			ELFOSABI_HPUX
+
+#define bfd_elf64_bfd_reloc_type_lookup elf_hppa_reloc_type_lookup
+#define bfd_elf64_bfd_reloc_name_lookup elf_hppa_reloc_name_lookup
+#define bfd_elf64_bfd_is_local_label_name       elf_hppa_is_local_label_name
+#define elf_info_to_howto		elf_hppa_info_to_howto
+#define elf_info_to_howto_rel		elf_hppa_info_to_howto_rel
+
+#define elf_backend_section_from_shdr	elf64_hppa_section_from_shdr
+#define elf_backend_object_p		elf64_hppa_object_p
+#define elf_backend_final_write_processing \
+					elf_hppa_final_write_processing
+#define elf_backend_fake_sections	elf_hppa_fake_sections
+#define elf_backend_add_symbol_hook	elf_hppa_add_symbol_hook
+
+#define elf_backend_relocate_section	elf_hppa_relocate_section
+
+#define bfd_elf64_bfd_final_link	elf_hppa_final_link
+
+#define elf_backend_create_dynamic_sections \
+					elf64_hppa_create_dynamic_sections
+#define elf_backend_post_process_headers	elf64_hppa_post_process_headers
+
+#define elf_backend_omit_section_dynsym \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true)
+#define elf_backend_adjust_dynamic_symbol \
+					elf64_hppa_adjust_dynamic_symbol
+
+#define elf_backend_size_dynamic_sections \
+					elf64_hppa_size_dynamic_sections
+
+#define elf_backend_finish_dynamic_symbol \
+					elf64_hppa_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections \
+					elf64_hppa_finish_dynamic_sections
+#define elf_backend_grok_prstatus	elf64_hppa_grok_prstatus
+#define elf_backend_grok_psinfo		elf64_hppa_grok_psinfo
+ 
+/* Stuff for the BFD linker: */
+#define bfd_elf64_bfd_link_hash_table_create \
+	elf64_hppa_hash_table_create
+
+#define elf_backend_check_relocs \
+	elf64_hppa_check_relocs
+
+#define elf_backend_size_info \
+  hppa64_elf_size_info
+
+#define elf_backend_additional_program_headers \
+	elf64_hppa_additional_program_headers
+
+#define elf_backend_modify_segment_map \
+	elf64_hppa_modify_segment_map
+
+#define elf_backend_link_output_symbol_hook \
+	elf64_hppa_link_output_symbol_hook
+
+#define elf_backend_want_got_plt	0
+#define elf_backend_plt_readonly	0
+#define elf_backend_want_plt_sym	0
+#define elf_backend_got_header_size     0
+#define elf_backend_type_change_ok	TRUE
+#define elf_backend_get_symbol_type	elf64_hppa_elf_get_symbol_type
+#define elf_backend_reloc_type_class	elf64_hppa_reloc_type_class
+#define elf_backend_rela_normal		1
+#define elf_backend_special_sections	elf64_hppa_special_sections
+#define elf_backend_action_discarded	elf_hppa_action_discarded
+#define elf_backend_section_from_phdr   elf64_hppa_section_from_phdr
+
+#define elf64_bed			elf64_hppa_hpux_bed
+
+#include "elf64-target.h"
+
+#undef TARGET_BIG_SYM
+#define TARGET_BIG_SYM			bfd_elf64_hppa_linux_vec
+#undef TARGET_BIG_NAME
+#define TARGET_BIG_NAME			"elf64-hppa-linux"
+#undef ELF_OSABI
+#define ELF_OSABI			ELFOSABI_GNU
+#undef elf_backend_post_process_headers
+#define elf_backend_post_process_headers _bfd_elf_set_osabi
+#undef elf64_bed
+#define elf64_bed			elf64_hppa_linux_bed
+
+#include "elf64-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-hppa.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-hppa.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-hppa.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-hppa.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,51 @@
+/* ELF64/HPPA support
+
+   Copyright 1999, 2000, 2002, 2005, 2007, 2009 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _ELF64_HPPA_H
+#define _ELF64_HPPA_H
+
+#include "elf-bfd.h"
+#include "libhppa.h"
+#include "elf/hppa.h"
+
+extern elf_hppa_reloc_type elf64_hppa_reloc_final_type
+  (bfd *, elf_hppa_reloc_type, int, unsigned int);
+
+extern elf_hppa_reloc_type ** _bfd_elf64_hppa_gen_reloc_type
+  (bfd *, elf_hppa_reloc_type, int, unsigned int, int, asymbol *);
+
+/* Define groups of basic relocations.  FIXME:  These should
+   be the only basic relocations created by GAS.  The rest
+   should be internal to the BFD backend.
+
+   The idea is both SOM and ELF define these basic relocation
+   types so they map into a SOM or ELF specific relocation
+   as appropriate.  This allows GAS to share much more code
+   between the two target object formats.  */
+
+#define R_HPPA_NONE			R_PARISC_NONE
+#define R_HPPA				R_PARISC_DIR64
+#define R_HPPA_GOTOFF			R_PARISC_DLTREL21L
+#define R_HPPA_PCREL_CALL		R_PARISC_PCREL21L
+#define R_HPPA_ABS_CALL			R_PARISC_DIR17F
+#define R_HPPA_COMPLEX			R_PARISC_UNIMPLEMENTED
+
+#endif /* _ELF64_HPPA_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-mips.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-mips.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-mips.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-mips.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4036 @@
+/* MIPS-specific support for 64-bit ELF
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006, 2007, 2008, 2009, 2010
+   Free Software Foundation, Inc.
+   Ian Lance Taylor, Cygnus Support
+   Linker support added by Mark Mitchell, CodeSourcery, LLC.
+   <mark@codesourcery.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* This file supports the 64-bit MIPS ELF ABI.
+
+   The MIPS 64-bit ELF ABI uses an unusual reloc format.  This file
+   overrides the usual ELF reloc handling, and handles reading and
+   writing the relocations here.  */
+
+/* TODO: Many things are unsupported, even if there is some code for it
+ .       (which was mostly stolen from elf32-mips.c and slightly adapted).
+ .
+ .   - Relocation handling for REL relocs is wrong in many cases and
+ .     generally untested.
+ .   - Relocation handling for RELA relocs related to GOT support are
+ .     also likely to be wrong.
+ .   - Support for MIPS16 is untested.
+ .   - Combined relocs with RSS_* entries are unsupported.
+ .   - The whole GOT handling for NewABI is missing, some parts of
+ .     the OldABI version is still lying around and should be removed.
+ */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "aout/ar.h"
+#include "bfdlink.h"
+#include "genlink.h"
+#include "elf-bfd.h"
+#include "elfxx-mips.h"
+#include "elf/mips.h"
+
+/* Get the ECOFF swapping routines.  The 64-bit ABI is not supposed to
+   use ECOFF.  However, we support it anyhow for an easier changeover.  */
+#include "coff/sym.h"
+#include "coff/symconst.h"
+#include "coff/internal.h"
+#include "coff/ecoff.h"
+/* The 64 bit versions of the mdebug data structures are in alpha.h.  */
+#include "coff/alpha.h"
+#define ECOFF_SIGNED_64
+#include "ecoffswap.h"
+
+static void mips_elf64_swap_reloc_in
+  (bfd *, const Elf64_Mips_External_Rel *, Elf64_Mips_Internal_Rela *);
+static void mips_elf64_swap_reloca_in
+  (bfd *, const Elf64_Mips_External_Rela *, Elf64_Mips_Internal_Rela *);
+static void mips_elf64_swap_reloc_out
+  (bfd *, const Elf64_Mips_Internal_Rela *, Elf64_Mips_External_Rel *);
+static void mips_elf64_swap_reloca_out
+  (bfd *, const Elf64_Mips_Internal_Rela *, Elf64_Mips_External_Rela *);
+static void mips_elf64_be_swap_reloc_in
+  (bfd *, const bfd_byte *, Elf_Internal_Rela *);
+static void mips_elf64_be_swap_reloc_out
+  (bfd *, const Elf_Internal_Rela *, bfd_byte *);
+static void mips_elf64_be_swap_reloca_in
+  (bfd *, const bfd_byte *, Elf_Internal_Rela *);
+static void mips_elf64_be_swap_reloca_out
+  (bfd *, const Elf_Internal_Rela *, bfd_byte *);
+static reloc_howto_type *bfd_elf64_bfd_reloc_type_lookup
+  (bfd *, bfd_reloc_code_real_type);
+static reloc_howto_type *mips_elf64_rtype_to_howto
+  (unsigned int, bfd_boolean);
+static void mips_elf64_info_to_howto_rel
+  (bfd *, arelent *, Elf_Internal_Rela *);
+static void mips_elf64_info_to_howto_rela
+  (bfd *, arelent *, Elf_Internal_Rela *);
+static long mips_elf64_get_reloc_upper_bound
+  (bfd *, asection *);
+static long mips_elf64_canonicalize_reloc
+  (bfd *, asection *, arelent **, asymbol **);
+static long mips_elf64_get_dynamic_reloc_upper_bound
+  (bfd *);
+static long mips_elf64_canonicalize_dynamic_reloc
+  (bfd *, arelent **, asymbol **);
+static bfd_boolean mips_elf64_slurp_one_reloc_table
+  (bfd *, asection *, Elf_Internal_Shdr *, bfd_size_type, arelent *,
+   asymbol **, bfd_boolean);
+static bfd_boolean mips_elf64_slurp_reloc_table
+  (bfd *, asection *, asymbol **, bfd_boolean);
+static void mips_elf64_write_relocs
+  (bfd *, asection *, void *);
+static void mips_elf64_write_rel
+  (bfd *, asection *, Elf_Internal_Shdr *, int *, void *);
+static void mips_elf64_write_rela
+  (bfd *, asection *, Elf_Internal_Shdr *, int *, void *);
+static bfd_reloc_status_type mips_elf64_gprel16_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type mips_elf64_literal_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type mips_elf64_gprel32_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type mips_elf64_shift6_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type mips16_gprel_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_boolean mips_elf64_assign_gp
+  (bfd *, bfd_vma *);
+static bfd_reloc_status_type mips_elf64_final_gp
+  (bfd *, asymbol *, bfd_boolean, char **, bfd_vma *);
+static bfd_boolean mips_elf64_object_p
+  (bfd *);
+static irix_compat_t elf64_mips_irix_compat
+  (bfd *);
+static bfd_boolean elf64_mips_grok_prstatus
+  (bfd *, Elf_Internal_Note *);
+static bfd_boolean elf64_mips_grok_psinfo
+  (bfd *, Elf_Internal_Note *);
+
+extern const bfd_target bfd_elf64_bigmips_vec;
+extern const bfd_target bfd_elf64_littlemips_vec;
+
+/* In case we're on a 32-bit machine, construct a 64-bit "-1" value
+   from smaller values.  Start with zero, widen, *then* decrement.  */
+#define MINUS_ONE	(((bfd_vma)0) - 1)
+
+/* The number of local .got entries we reserve.  */
+#define MIPS_RESERVED_GOTNO (2)
+
+/* The relocation table used for SHT_REL sections.  */
+
+static reloc_howto_type mips_elf64_howto_table_rel[] =
+{
+  /* No relocation.  */
+  HOWTO (R_MIPS_NONE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit relocation.  */
+  HOWTO (R_MIPS_16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit relocation.  */
+  HOWTO (R_MIPS_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit symbol relative relocation.  */
+  HOWTO (R_MIPS_REL32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_REL32",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 26 bit jump address.  */
+  HOWTO (R_MIPS_26,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+				/* This needs complex overflow
+				   detection, because the upper 36
+				   bits must match the PC + 4.  */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_26",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x03ffffff,		/* src_mask */
+	 0x03ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* R_MIPS_HI16 and R_MIPS_LO16 are unsupported for NewABI REL.
+     However, the native IRIX6 tools use them, so we try our best. */
+
+  /* High 16 bits of symbol value.  */
+  HOWTO (R_MIPS_HI16,		/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_hi16_reloc, /* special_function */
+	 "R_MIPS_HI16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of symbol value.  */
+  HOWTO (R_MIPS_LO16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_lo16_reloc, /* special_function */
+	 "R_MIPS_LO16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GP relative reference.  */
+  HOWTO (R_MIPS_GPREL16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mips_elf64_gprel16_reloc, /* special_function */
+	 "R_MIPS_GPREL16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Reference to literal section.  */
+  HOWTO (R_MIPS_LITERAL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mips_elf64_literal_reloc, /* special_function */
+	 "R_MIPS_LITERAL",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Reference to global offset table.  */
+  HOWTO (R_MIPS_GOT16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_got16_reloc, /* special_function */
+	 "R_MIPS_GOT16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit PC relative reference.  Note that the ABI document has a typo
+     and claims R_MIPS_PC16 to be not rightshifted, rendering it useless.
+     We do the right thing here.  */
+  HOWTO (R_MIPS_PC16,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_PC16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 16 bit call through global offset table.  */
+  HOWTO (R_MIPS_CALL16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_CALL16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit GP relative reference.  */
+  HOWTO (R_MIPS_GPREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 mips_elf64_gprel32_reloc, /* special_function */
+	 "R_MIPS_GPREL32",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (13),
+  EMPTY_HOWTO (14),
+  EMPTY_HOWTO (15),
+
+  /* A 5 bit shift field.  */
+  HOWTO (R_MIPS_SHIFT5,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 5,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 6,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_SHIFT5",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x000007c0,		/* src_mask */
+	 0x000007c0,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 6 bit shift field.  */
+  HOWTO (R_MIPS_SHIFT6,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 6,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 6,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 mips_elf64_shift6_reloc, /* special_function */
+	 "R_MIPS_SHIFT6",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x000007c4,		/* src_mask */
+	 0x000007c4,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 64 bit relocation.  */
+  HOWTO (R_MIPS_64,		/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_64",		/* name */
+	 TRUE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Displacement in the global offset table.  */
+  HOWTO (R_MIPS_GOT_DISP,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_GOT_DISP",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Displacement to page pointer in the global offset table.  */
+  HOWTO (R_MIPS_GOT_PAGE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_GOT_PAGE",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Offset from page pointer in the global offset table.  */
+  HOWTO (R_MIPS_GOT_OFST,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_GOT_OFST",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of displacement in global offset table.  */
+  HOWTO (R_MIPS_GOT_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_GOT_HI16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_MIPS_GOT_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_GOT_LO16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 64 bit subtraction.  */
+  HOWTO (R_MIPS_SUB,		/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_SUB",		/* name */
+	 TRUE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Insert the addend as an instruction.  */
+  /* FIXME: Not handled correctly.  */
+  HOWTO (R_MIPS_INSERT_A,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_INSERT_A",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Insert the addend as an instruction, and change all relocations
+     to refer to the old instruction at the address.  */
+  /* FIXME: Not handled correctly.  */
+  HOWTO (R_MIPS_INSERT_B,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_INSERT_B",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Delete a 32 bit instruction.  */
+  /* FIXME: Not handled correctly.  */
+  HOWTO (R_MIPS_DELETE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_DELETE",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The MIPS ELF64 ABI Draft wants us to support these for REL relocations.
+     We don't, because
+       a) It means building the addend from a R_MIPS_HIGHEST/R_MIPS_HIGHER/
+	  R_MIPS_HI16/R_MIPS_LO16 sequence with varying ordering, using
+	  fallable heuristics.
+       b) No other NewABI toolchain actually emits such relocations.  */
+  EMPTY_HOWTO (R_MIPS_HIGHER),
+  EMPTY_HOWTO (R_MIPS_HIGHEST),
+
+  /* High 16 bits of displacement in global offset table.  */
+  HOWTO (R_MIPS_CALL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_CALL_HI16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_MIPS_CALL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_CALL_LO16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Section displacement, used by an associated event location section.  */
+  HOWTO (R_MIPS_SCN_DISP,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_SCN_DISP",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MIPS_REL16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_REL16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* These two are obsolete.  */
+  EMPTY_HOWTO (R_MIPS_ADD_IMMEDIATE),
+  EMPTY_HOWTO (R_MIPS_PJUMP),
+
+  /* Similiar to R_MIPS_REL32, but used for relocations in a GOT section.
+     It must be used for multigot GOT's (and only there).  */
+  HOWTO (R_MIPS_RELGOT,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_RELGOT",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Protected jump conversion.  This is an optimization hint.  No
+     relocation is required for correctness.  */
+  HOWTO (R_MIPS_JALR,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_JALR",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x00000000,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS relocations.  */
+  EMPTY_HOWTO (R_MIPS_TLS_DTPMOD32),
+  EMPTY_HOWTO (R_MIPS_TLS_DTPREL32),
+
+  HOWTO (R_MIPS_TLS_DTPMOD64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_DTPMOD64",	/* name */
+	 TRUE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MIPS_TLS_DTPREL64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_DTPREL64",	/* name */
+	 TRUE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS general dynamic variable reference.  */
+  HOWTO (R_MIPS_TLS_GD,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_GD",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS local dynamic variable reference.  */
+  HOWTO (R_MIPS_TLS_LDM,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_LDM",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS local dynamic offset.  */
+  HOWTO (R_MIPS_TLS_DTPREL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_DTPREL_HI16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS local dynamic offset.  */
+  HOWTO (R_MIPS_TLS_DTPREL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_DTPREL_LO16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS thread pointer offset.  */
+  HOWTO (R_MIPS_TLS_GOTTPREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_GOTTPREL",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS IE dynamic relocations.  */
+  EMPTY_HOWTO (R_MIPS_TLS_TPREL32),
+
+  HOWTO (R_MIPS_TLS_TPREL64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_TPREL64",	/* name */
+	 TRUE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS thread pointer offset.  */
+  HOWTO (R_MIPS_TLS_TPREL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_TPREL_HI16", /* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS thread pointer offset.  */
+  HOWTO (R_MIPS_TLS_TPREL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_TPREL_LO16", /* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit relocation with no addend.  */
+  HOWTO (R_MIPS_GLOB_DAT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GLOB_DAT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+/* The relocation table used for SHT_RELA sections.  */
+
+static reloc_howto_type mips_elf64_howto_table_rela[] =
+{
+  /* No relocation.  */
+  HOWTO (R_MIPS_NONE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit relocation.  */
+  HOWTO (R_MIPS_16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit relocation.  */
+  HOWTO (R_MIPS_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit symbol relative relocation.  */
+  HOWTO (R_MIPS_REL32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_REL32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 26 bit jump address.  */
+  HOWTO (R_MIPS_26,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+				/* This needs complex overflow
+				   detection, because the upper 36
+				   bits must match the PC + 4.  */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_26",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x03ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of symbol value.  */
+  HOWTO (R_MIPS_HI16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_HI16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of symbol value.  */
+  HOWTO (R_MIPS_LO16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_LO16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GP relative reference.  */
+  HOWTO (R_MIPS_GPREL16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mips_elf64_gprel16_reloc, /* special_function */
+	 "R_MIPS_GPREL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Reference to literal section.  */
+  HOWTO (R_MIPS_LITERAL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mips_elf64_literal_reloc, /* special_function */
+	 "R_MIPS_LITERAL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Reference to global offset table.  */
+  HOWTO (R_MIPS_GOT16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GOT16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit PC relative reference.  Note that the ABI document has a typo
+     and claims R_MIPS_PC16 to be not rightshifted, rendering it useless.
+     We do the right thing here.  */
+  HOWTO (R_MIPS_PC16,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_PC16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 16 bit call through global offset table.  */
+  HOWTO (R_MIPS_CALL16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_CALL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit GP relative reference.  */
+  HOWTO (R_MIPS_GPREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 mips_elf64_gprel32_reloc, /* special_function */
+	 "R_MIPS_GPREL32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (13),
+  EMPTY_HOWTO (14),
+  EMPTY_HOWTO (15),
+
+  /* A 5 bit shift field.  */
+  HOWTO (R_MIPS_SHIFT5,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 5,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 6,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_SHIFT5",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x000007c0,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 6 bit shift field.  */
+  HOWTO (R_MIPS_SHIFT6,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 6,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 6,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 mips_elf64_shift6_reloc, /* special_function */
+	 "R_MIPS_SHIFT6",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x000007c4,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 64 bit relocation.  */
+  HOWTO (R_MIPS_64,		/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_64",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Displacement in the global offset table.  */
+  HOWTO (R_MIPS_GOT_DISP,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_GOT_DISP",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Displacement to page pointer in the global offset table.  */
+  HOWTO (R_MIPS_GOT_PAGE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_GOT_PAGE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Offset from page pointer in the global offset table.  */
+  HOWTO (R_MIPS_GOT_OFST,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_GOT_OFST",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of displacement in global offset table.  */
+  HOWTO (R_MIPS_GOT_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_GOT_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_MIPS_GOT_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_GOT_LO16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 64 bit subtraction.  */
+  HOWTO (R_MIPS_SUB,		/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_SUB",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Insert the addend as an instruction.  */
+  /* FIXME: Not handled correctly.  */
+  HOWTO (R_MIPS_INSERT_A,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_INSERT_A",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Insert the addend as an instruction, and change all relocations
+     to refer to the old instruction at the address.  */
+  /* FIXME: Not handled correctly.  */
+  HOWTO (R_MIPS_INSERT_B,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_INSERT_B",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Delete a 32 bit instruction.  */
+  /* FIXME: Not handled correctly.  */
+  HOWTO (R_MIPS_DELETE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_DELETE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Get the higher value of a 64 bit addend.  */
+  HOWTO (R_MIPS_HIGHER,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_HIGHER",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Get the highest value of a 64 bit addend.  */
+  HOWTO (R_MIPS_HIGHEST,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_HIGHEST",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of displacement in global offset table.  */
+  HOWTO (R_MIPS_CALL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_CALL_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_MIPS_CALL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_CALL_LO16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Section displacement, used by an associated event location section.  */
+  HOWTO (R_MIPS_SCN_DISP,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_SCN_DISP",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MIPS_REL16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_REL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* These two are obsolete.  */
+  EMPTY_HOWTO (R_MIPS_ADD_IMMEDIATE),
+  EMPTY_HOWTO (R_MIPS_PJUMP),
+
+  /* Similiar to R_MIPS_REL32, but used for relocations in a GOT section.
+     It must be used for multigot GOT's (and only there).  */
+  HOWTO (R_MIPS_RELGOT,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_RELGOT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Protected jump conversion.  This is an optimization hint.  No
+     relocation is required for correctness.  */
+  HOWTO (R_MIPS_JALR,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_JALR",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x00000000,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS relocations.  */
+  EMPTY_HOWTO (R_MIPS_TLS_DTPMOD32),
+  EMPTY_HOWTO (R_MIPS_TLS_DTPREL32),
+
+  HOWTO (R_MIPS_TLS_DTPMOD64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_DTPMOD64", /* name */
+	 FALSE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MIPS_TLS_DTPREL64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_DTPREL64",	/* name */
+	 FALSE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS general dynamic variable reference.  */
+  HOWTO (R_MIPS_TLS_GD,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_GD",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS local dynamic variable reference.  */
+  HOWTO (R_MIPS_TLS_LDM,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_LDM",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS local dynamic offset.  */
+  HOWTO (R_MIPS_TLS_DTPREL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_DTPREL_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS local dynamic offset.  */
+  HOWTO (R_MIPS_TLS_DTPREL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_DTPREL_LO16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS thread pointer offset.  */
+  HOWTO (R_MIPS_TLS_GOTTPREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_GOTTPREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS IE dynamic relocations.  */
+  EMPTY_HOWTO (R_MIPS_TLS_TPREL32),
+
+  HOWTO (R_MIPS_TLS_TPREL64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_TPREL64",	/* name */
+	 FALSE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS thread pointer offset.  */
+  HOWTO (R_MIPS_TLS_TPREL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_TPREL_HI16", /* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS thread pointer offset.  */
+  HOWTO (R_MIPS_TLS_TPREL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_TPREL_LO16", /* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit relocation with no addend.  */
+  HOWTO (R_MIPS_GLOB_DAT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GLOB_DAT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+static reloc_howto_type mips16_elf64_howto_table_rel[] =
+{
+  /* The reloc used for the mips16 jump instruction.  */
+  HOWTO (R_MIPS16_26,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 			/* This needs complex overflow
+				   detection, because the upper four
+				   bits must match the PC.  */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS16_26",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x3ffffff,		/* src_mask */
+	 0x3ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The reloc used for the mips16 gprel instruction.  */
+  HOWTO (R_MIPS16_GPREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mips16_gprel_reloc,	/* special_function */
+	 "R_MIPS16_GPREL",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,	        /* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A MIPS16 reference to the global offset table.  */
+  HOWTO (R_MIPS16_GOT16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_got16_reloc, /* special_function */
+	 "R_MIPS16_GOT16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,	        /* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A MIPS16 call through the global offset table.  */
+  HOWTO (R_MIPS16_CALL16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS16_CALL16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,	        /* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* MIPS16 high 16 bits of symbol value.  */
+  HOWTO (R_MIPS16_HI16,		/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_hi16_reloc, /* special_function */
+	 "R_MIPS16_HI16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* MIPS16 low 16 bits of symbol value.  */
+  HOWTO (R_MIPS16_LO16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_lo16_reloc, /* special_function */
+	 "R_MIPS16_LO16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+static reloc_howto_type mips16_elf64_howto_table_rela[] =
+{
+  /* The reloc used for the mips16 jump instruction.  */
+  HOWTO (R_MIPS16_26,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 			/* This needs complex overflow
+				   detection, because the upper four
+				   bits must match the PC.  */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS16_26",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x3ffffff,		/* src_mask */
+	 0x3ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The reloc used for the mips16 gprel instruction.  */
+  HOWTO (R_MIPS16_GPREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mips16_gprel_reloc,	/* special_function */
+	 "R_MIPS16_GPREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,	        /* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A MIPS16 reference to the global offset table.  */
+  HOWTO (R_MIPS16_GOT16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_got16_reloc, /* special_function */
+	 "R_MIPS16_GOT16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,	        /* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A MIPS16 call through the global offset table.  */
+  HOWTO (R_MIPS16_CALL16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS16_CALL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,	        /* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* MIPS16 high 16 bits of symbol value.  */
+  HOWTO (R_MIPS16_HI16,		/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_hi16_reloc, /* special_function */
+	 "R_MIPS16_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* MIPS16 low 16 bits of symbol value.  */
+  HOWTO (R_MIPS16_LO16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_lo16_reloc, /* special_function */
+	 "R_MIPS16_LO16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+static reloc_howto_type micromips_elf64_howto_table_rel[] =
+{
+  EMPTY_HOWTO (130),
+  EMPTY_HOWTO (131),
+  EMPTY_HOWTO (132),
+
+  /* 26 bit jump address.  */
+  HOWTO (R_MICROMIPS_26_S1,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 			/* This needs complex overflow
+				   detection, because the upper four
+				   bits must match the PC.  */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_26_S1",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x3ffffff,		/* src_mask */
+	 0x3ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of symbol value.  */
+  HOWTO (R_MICROMIPS_HI16,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_hi16_reloc, /* special_function */
+	 "R_MICROMIPS_HI16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of symbol value.  */
+  HOWTO (R_MICROMIPS_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_lo16_reloc, /* special_function */
+	 "R_MICROMIPS_LO16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GP relative reference.  */
+  HOWTO (R_MICROMIPS_GPREL16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf32_gprel16_reloc, /* special_function */
+	 "R_MICROMIPS_GPREL16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Reference to literal section.  */
+  HOWTO (R_MICROMIPS_LITERAL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf32_gprel16_reloc, /* special_function */
+	 "R_MICROMIPS_LITERAL",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Reference to global offset table.  */
+  HOWTO (R_MICROMIPS_GOT16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_got16_reloc, /* special_function */
+	 "R_MICROMIPS_GOT16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* This is for microMIPS branches.  */
+  HOWTO (R_MICROMIPS_PC7_S1,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 7,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_PC7_S1",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000007f,		/* src_mask */
+	 0x0000007f,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MICROMIPS_PC10_S1,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 10,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_PC10_S1",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x000003ff,		/* src_mask */
+	 0x000003ff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MICROMIPS_PC16_S1,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_PC16_S1",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 16 bit call through global offset table.  */
+  HOWTO (R_MICROMIPS_CALL16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_CALL16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (143),
+  EMPTY_HOWTO (144),
+
+  /* Displacement in the global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_DISP,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_DISP",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Displacement to page pointer in the global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_PAGE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_PAGE",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Offset from page pointer in the global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_OFST,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_OFST",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of displacement in global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_HI16",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_LO16",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 64 bit subtraction.  Used in the N32 ABI.  */
+  HOWTO (R_MICROMIPS_SUB,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_SUB",	/* name */
+	 TRUE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* We don't support these for REL relocations, because it means building
+     the addend from a R_MICROMIPS_HIGHEST/R_MICROMIPS_HIGHER/
+     R_MICROMIPS_HI16/R_MICROMIPS_LO16 sequence with varying ordering,
+     using fallable heuristics.  */
+  EMPTY_HOWTO (R_MICROMIPS_HIGHER),
+  EMPTY_HOWTO (R_MICROMIPS_HIGHEST),
+
+  /* High 16 bits of displacement in global offset table.  */
+  HOWTO (R_MICROMIPS_CALL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_CALL_HI16",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_MICROMIPS_CALL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_CALL_LO16",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+static reloc_howto_type micromips_elf64_howto_table_rela[] =
+{
+  EMPTY_HOWTO (130),
+  EMPTY_HOWTO (131),
+  EMPTY_HOWTO (132),
+
+  /* 26 bit jump address.  */
+  HOWTO (R_MICROMIPS_26_S1,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 			/* This needs complex overflow
+				   detection, because the upper four
+				   bits must match the PC.  */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_26_S1",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x3ffffff,		/* src_mask */
+	 0x3ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of symbol value.  */
+  HOWTO (R_MICROMIPS_HI16,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_hi16_reloc, /* special_function */
+	 "R_MICROMIPS_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of symbol value.  */
+  HOWTO (R_MICROMIPS_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_lo16_reloc, /* special_function */
+	 "R_MICROMIPS_LO16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GP relative reference.  */
+  HOWTO (R_MICROMIPS_GPREL16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf32_gprel16_reloc, /* special_function */
+	 "R_MICROMIPS_GPREL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Reference to literal section.  */
+  HOWTO (R_MICROMIPS_LITERAL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf32_gprel16_reloc, /* special_function */
+	 "R_MICROMIPS_LITERAL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Reference to global offset table.  */
+  HOWTO (R_MICROMIPS_GOT16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_got16_reloc, /* special_function */
+	 "R_MICROMIPS_GOT16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* This is for microMIPS branches.  */
+  HOWTO (R_MICROMIPS_PC7_S1,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 7,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_PC7_S1",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000007f,		/* src_mask */
+	 0x0000007f,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MICROMIPS_PC10_S1,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 10,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_PC10_S1",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x000003ff,		/* src_mask */
+	 0x000003ff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MICROMIPS_PC16_S1,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_PC16_S1",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 16 bit call through global offset table.  */
+  HOWTO (R_MICROMIPS_CALL16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_CALL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (143),
+  EMPTY_HOWTO (144),
+
+  /* Displacement in the global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_DISP,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_DISP",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Displacement to page pointer in the global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_PAGE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_PAGE",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Offset from page pointer in the global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_OFST,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_OFST",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of displacement in global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_HI16",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_LO16",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 64 bit subtraction.  Used in the N32 ABI.  */
+  HOWTO (R_MICROMIPS_SUB,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_SUB",	/* name */
+	 FALSE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Get the higher value of a 64 bit addend.  */
+  HOWTO (R_MICROMIPS_HIGHER,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_HIGHER",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Get the highest value of a 64 bit addend.  */
+  HOWTO (R_MICROMIPS_HIGHEST,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_HIGHEST",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of displacement in global offset table.  */
+  HOWTO (R_MICROMIPS_CALL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_CALL_HI16",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_MICROMIPS_CALL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_CALL_LO16",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+/* GNU extension to record C++ vtable hierarchy */
+static reloc_howto_type elf_mips_gnu_vtinherit_howto =
+  HOWTO (R_MIPS_GNU_VTINHERIT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_MIPS_GNU_VTINHERIT", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+/* GNU extension to record C++ vtable member usage */
+static reloc_howto_type elf_mips_gnu_vtentry_howto =
+  HOWTO (R_MIPS_GNU_VTENTRY,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_elf_rel_vtable_reloc_fn, /* special_function */
+	 "R_MIPS_GNU_VTENTRY",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+/* 16 bit offset for pc-relative branches.  */
+static reloc_howto_type elf_mips_gnu_rel16_s2 =
+  HOWTO (R_MIPS_GNU_REL16_S2,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_GNU_REL16_S2",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 TRUE);			/* pcrel_offset */
+
+/* 16 bit offset for pc-relative branches.  */
+static reloc_howto_type elf_mips_gnu_rela16_s2 =
+  HOWTO (R_MIPS_GNU_REL16_S2,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_GNU_REL16_S2",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 TRUE);			/* pcrel_offset */
+
+/* Originally a VxWorks extension, but now used for other systems too.  */
+static reloc_howto_type elf_mips_copy_howto =
+  HOWTO (R_MIPS_COPY,		/* type */
+	 0,			/* rightshift */
+	 0,			/* this one is variable size */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_COPY",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,         		/* src_mask */
+	 0x0,		        /* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+/* Originally a VxWorks extension, but now used for other systems too.  */
+static reloc_howto_type elf_mips_jump_slot_howto =
+  HOWTO (R_MIPS_JUMP_SLOT,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_JUMP_SLOT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,         		/* src_mask */
+	 0x0,		        /* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+/* Swap in a MIPS 64-bit Rel reloc.  */
+
+static void
+mips_elf64_swap_reloc_in (bfd *abfd, const Elf64_Mips_External_Rel *src,
+			  Elf64_Mips_Internal_Rela *dst)
+{
+  dst->r_offset = H_GET_64 (abfd, src->r_offset);
+  dst->r_sym = H_GET_32 (abfd, src->r_sym);
+  dst->r_ssym = H_GET_8 (abfd, src->r_ssym);
+  dst->r_type3 = H_GET_8 (abfd, src->r_type3);
+  dst->r_type2 = H_GET_8 (abfd, src->r_type2);
+  dst->r_type = H_GET_8 (abfd, src->r_type);
+  dst->r_addend = 0;
+}
+
+/* Swap in a MIPS 64-bit Rela reloc.  */
+
+static void
+mips_elf64_swap_reloca_in (bfd *abfd, const Elf64_Mips_External_Rela *src,
+			   Elf64_Mips_Internal_Rela *dst)
+{
+  dst->r_offset = H_GET_64 (abfd, src->r_offset);
+  dst->r_sym = H_GET_32 (abfd, src->r_sym);
+  dst->r_ssym = H_GET_8 (abfd, src->r_ssym);
+  dst->r_type3 = H_GET_8 (abfd, src->r_type3);
+  dst->r_type2 = H_GET_8 (abfd, src->r_type2);
+  dst->r_type = H_GET_8 (abfd, src->r_type);
+  dst->r_addend = H_GET_S64 (abfd, src->r_addend);
+}
+
+/* Swap out a MIPS 64-bit Rel reloc.  */
+
+static void
+mips_elf64_swap_reloc_out (bfd *abfd, const Elf64_Mips_Internal_Rela *src,
+			   Elf64_Mips_External_Rel *dst)
+{
+  H_PUT_64 (abfd, src->r_offset, dst->r_offset);
+  H_PUT_32 (abfd, src->r_sym, dst->r_sym);
+  H_PUT_8 (abfd, src->r_ssym, dst->r_ssym);
+  H_PUT_8 (abfd, src->r_type3, dst->r_type3);
+  H_PUT_8 (abfd, src->r_type2, dst->r_type2);
+  H_PUT_8 (abfd, src->r_type, dst->r_type);
+}
+
+/* Swap out a MIPS 64-bit Rela reloc.  */
+
+static void
+mips_elf64_swap_reloca_out (bfd *abfd, const Elf64_Mips_Internal_Rela *src,
+			    Elf64_Mips_External_Rela *dst)
+{
+  H_PUT_64 (abfd, src->r_offset, dst->r_offset);
+  H_PUT_32 (abfd, src->r_sym, dst->r_sym);
+  H_PUT_8 (abfd, src->r_ssym, dst->r_ssym);
+  H_PUT_8 (abfd, src->r_type3, dst->r_type3);
+  H_PUT_8 (abfd, src->r_type2, dst->r_type2);
+  H_PUT_8 (abfd, src->r_type, dst->r_type);
+  H_PUT_S64 (abfd, src->r_addend, dst->r_addend);
+}
+
+/* Swap in a MIPS 64-bit Rel reloc.  */
+
+static void
+mips_elf64_be_swap_reloc_in (bfd *abfd, const bfd_byte *src,
+			     Elf_Internal_Rela *dst)
+{
+  Elf64_Mips_Internal_Rela mirel;
+
+  mips_elf64_swap_reloc_in (abfd,
+			    (const Elf64_Mips_External_Rel *) src,
+			    &mirel);
+
+  dst[0].r_offset = mirel.r_offset;
+  dst[0].r_info = ELF64_R_INFO (mirel.r_sym, mirel.r_type);
+  dst[0].r_addend = 0;
+  dst[1].r_offset = mirel.r_offset;
+  dst[1].r_info = ELF64_R_INFO (mirel.r_ssym, mirel.r_type2);
+  dst[1].r_addend = 0;
+  dst[2].r_offset = mirel.r_offset;
+  dst[2].r_info = ELF64_R_INFO (STN_UNDEF, mirel.r_type3);
+  dst[2].r_addend = 0;
+}
+
+/* Swap in a MIPS 64-bit Rela reloc.  */
+
+static void
+mips_elf64_be_swap_reloca_in (bfd *abfd, const bfd_byte *src,
+			      Elf_Internal_Rela *dst)
+{
+  Elf64_Mips_Internal_Rela mirela;
+
+  mips_elf64_swap_reloca_in (abfd,
+			     (const Elf64_Mips_External_Rela *) src,
+			     &mirela);
+
+  dst[0].r_offset = mirela.r_offset;
+  dst[0].r_info = ELF64_R_INFO (mirela.r_sym, mirela.r_type);
+  dst[0].r_addend = mirela.r_addend;
+  dst[1].r_offset = mirela.r_offset;
+  dst[1].r_info = ELF64_R_INFO (mirela.r_ssym, mirela.r_type2);
+  dst[1].r_addend = 0;
+  dst[2].r_offset = mirela.r_offset;
+  dst[2].r_info = ELF64_R_INFO (STN_UNDEF, mirela.r_type3);
+  dst[2].r_addend = 0;
+}
+
+/* Swap out a MIPS 64-bit Rel reloc.  */
+
+static void
+mips_elf64_be_swap_reloc_out (bfd *abfd, const Elf_Internal_Rela *src,
+			      bfd_byte *dst)
+{
+  Elf64_Mips_Internal_Rela mirel;
+
+  mirel.r_offset = src[0].r_offset;
+  BFD_ASSERT(src[0].r_offset == src[1].r_offset);
+
+  mirel.r_type = ELF64_MIPS_R_TYPE (src[0].r_info);
+  mirel.r_sym = ELF64_R_SYM (src[0].r_info);
+  mirel.r_type2 = ELF64_MIPS_R_TYPE (src[1].r_info);
+  mirel.r_ssym = ELF64_MIPS_R_SSYM (src[1].r_info);
+  mirel.r_type3 = ELF64_MIPS_R_TYPE (src[2].r_info);
+
+  mips_elf64_swap_reloc_out (abfd, &mirel,
+			     (Elf64_Mips_External_Rel *) dst);
+}
+
+/* Swap out a MIPS 64-bit Rela reloc.  */
+
+static void
+mips_elf64_be_swap_reloca_out (bfd *abfd, const Elf_Internal_Rela *src,
+			       bfd_byte *dst)
+{
+  Elf64_Mips_Internal_Rela mirela;
+
+  mirela.r_offset = src[0].r_offset;
+  BFD_ASSERT(src[0].r_offset == src[1].r_offset);
+  BFD_ASSERT(src[0].r_offset == src[2].r_offset);
+
+  mirela.r_type = ELF64_MIPS_R_TYPE (src[0].r_info);
+  mirela.r_sym = ELF64_R_SYM (src[0].r_info);
+  mirela.r_addend = src[0].r_addend;
+  BFD_ASSERT(src[1].r_addend == 0);
+  BFD_ASSERT(src[2].r_addend == 0);
+
+  mirela.r_type2 = ELF64_MIPS_R_TYPE (src[1].r_info);
+  mirela.r_ssym = ELF64_MIPS_R_SSYM (src[1].r_info);
+  mirela.r_type3 = ELF64_MIPS_R_TYPE (src[2].r_info);
+
+  mips_elf64_swap_reloca_out (abfd, &mirela,
+			      (Elf64_Mips_External_Rela *) dst);
+}
+
+/* Set the GP value for OUTPUT_BFD.  Returns FALSE if this is a
+   dangerous relocation.  */
+
+static bfd_boolean
+mips_elf64_assign_gp (bfd *output_bfd, bfd_vma *pgp)
+{
+  unsigned int count;
+  asymbol **sym;
+  unsigned int i;
+
+  /* If we've already figured out what GP will be, just return it.  */
+  *pgp = _bfd_get_gp_value (output_bfd);
+  if (*pgp)
+    return TRUE;
+
+  count = bfd_get_symcount (output_bfd);
+  sym = bfd_get_outsymbols (output_bfd);
+
+  /* The linker script will have created a symbol named `_gp' with the
+     appropriate value.  */
+  if (sym == NULL)
+    i = count;
+  else
+    {
+      for (i = 0; i < count; i++, sym++)
+	{
+	  register const char *name;
+
+	  name = bfd_asymbol_name (*sym);
+	  if (*name == '_' && strcmp (name, "_gp") == 0)
+	    {
+	      *pgp = bfd_asymbol_value (*sym);
+	      _bfd_set_gp_value (output_bfd, *pgp);
+	      break;
+	    }
+	}
+    }
+
+  if (i >= count)
+    {
+      /* Only get the error once.  */
+      *pgp = 4;
+      _bfd_set_gp_value (output_bfd, *pgp);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* We have to figure out the gp value, so that we can adjust the
+   symbol value correctly.  We look up the symbol _gp in the output
+   BFD.  If we can't find it, we're stuck.  We cache it in the ELF
+   target data.  We don't need to adjust the symbol value for an
+   external symbol if we are producing relocatable output.  */
+
+static bfd_reloc_status_type
+mips_elf64_final_gp (bfd *output_bfd, asymbol *symbol, bfd_boolean relocatable,
+		     char **error_message, bfd_vma *pgp)
+{
+  if (bfd_is_und_section (symbol->section)
+      && ! relocatable)
+    {
+      *pgp = 0;
+      return bfd_reloc_undefined;
+    }
+
+  *pgp = _bfd_get_gp_value (output_bfd);
+  if (*pgp == 0
+      && (! relocatable
+	  || (symbol->flags & BSF_SECTION_SYM) != 0))
+    {
+      if (relocatable)
+	{
+	  /* Make up a value.  */
+	  *pgp = symbol->section->output_section->vma /*+ 0x4000*/;
+	  _bfd_set_gp_value (output_bfd, *pgp);
+	}
+      else if (!mips_elf64_assign_gp (output_bfd, pgp))
+	{
+	  *error_message =
+	    (char *) _("GP relative relocation when _gp not defined");
+	  return bfd_reloc_dangerous;
+	}
+    }
+
+  return bfd_reloc_ok;
+}
+
+/* Do a R_MIPS_GPREL16 relocation.  This is a 16 bit value which must
+   become the offset from the gp register.  */
+
+static bfd_reloc_status_type
+mips_elf64_gprel16_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+			  void *data, asection *input_section, bfd *output_bfd,
+			  char **error_message)
+{
+  bfd_boolean relocatable;
+  bfd_reloc_status_type ret;
+  bfd_vma gp;
+
+  /* If we're relocating, and this is an external symbol, we don't want
+     to change anything.  */
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (symbol->flags & BSF_LOCAL) != 0)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  if (output_bfd != NULL)
+    relocatable = TRUE;
+  else
+    {
+      relocatable = FALSE;
+      output_bfd = symbol->section->output_section->owner;
+    }
+
+  ret = mips_elf64_final_gp (output_bfd, symbol, relocatable, error_message,
+			     &gp);
+  if (ret != bfd_reloc_ok)
+    return ret;
+
+  return _bfd_mips_elf_gprel16_with_gp (abfd, symbol, reloc_entry,
+					input_section, relocatable,
+					data, gp);
+}
+
+/* Do a R_MIPS_LITERAL relocation.  */
+
+static bfd_reloc_status_type
+mips_elf64_literal_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+			  void *data, asection *input_section, bfd *output_bfd,
+			  char **error_message)
+{
+  bfd_boolean relocatable;
+  bfd_reloc_status_type ret;
+  bfd_vma gp;
+
+  /* R_MIPS_LITERAL relocations are defined for local symbols only.  */
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (symbol->flags & BSF_LOCAL) != 0)
+    {
+      *error_message = (char *)
+	_("literal relocation occurs for an external symbol");
+      return bfd_reloc_outofrange;
+    }
+
+  /* FIXME: The entries in the .lit8 and .lit4 sections should be merged.  */
+  if (output_bfd != NULL)
+    relocatable = TRUE;
+  else
+    {
+      relocatable = FALSE;
+      output_bfd = symbol->section->output_section->owner;
+    }
+
+  ret = mips_elf64_final_gp (output_bfd, symbol, relocatable, error_message,
+			     &gp);
+  if (ret != bfd_reloc_ok)
+    return ret;
+
+  return _bfd_mips_elf_gprel16_with_gp (abfd, symbol, reloc_entry,
+					input_section, relocatable,
+					data, gp);
+}
+
+/* Do a R_MIPS_GPREL32 relocation.  This is a 32 bit value which must
+   become the offset from the gp register.  */
+
+static bfd_reloc_status_type
+mips_elf64_gprel32_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+			  void *data, asection *input_section, bfd *output_bfd,
+			  char **error_message)
+{
+  bfd_boolean relocatable;
+  bfd_reloc_status_type ret;
+  bfd_vma gp;
+  bfd_vma relocation;
+  bfd_vma val;
+
+  /* R_MIPS_GPREL32 relocations are defined for local symbols only.  */
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (symbol->flags & BSF_LOCAL) != 0)
+    {
+      *error_message = (char *)
+	_("32bits gp relative relocation occurs for an external symbol");
+      return bfd_reloc_outofrange;
+    }
+
+  if (output_bfd != NULL)
+    relocatable = TRUE;
+  else
+    {
+      relocatable = FALSE;
+      output_bfd = symbol->section->output_section->owner;
+    }
+
+  ret = mips_elf64_final_gp (output_bfd, symbol, relocatable,
+			     error_message, &gp);
+  if (ret != bfd_reloc_ok)
+    return ret;
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  /* Set val to the offset into the section or symbol.  */
+  val = reloc_entry->addend;
+
+  if (reloc_entry->howto->partial_inplace)
+    val += bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
+
+  /* Adjust val for the final section location and GP value.  If we
+     are producing relocatable output, we don't want to do this for
+     an external symbol.  */
+  if (! relocatable
+      || (symbol->flags & BSF_SECTION_SYM) != 0)
+    val += relocation - gp;
+
+  if (reloc_entry->howto->partial_inplace)
+    bfd_put_32 (abfd, val, (bfd_byte *) data + reloc_entry->address);
+  else
+    reloc_entry->addend = val;
+
+  if (relocatable)
+    reloc_entry->address += input_section->output_offset;
+
+  return bfd_reloc_ok;
+}
+
+/* Do a R_MIPS_SHIFT6 relocation. The MSB of the shift is stored at bit 2,
+   the rest is at bits 6-10. The bitpos already got right by the howto.  */
+
+static bfd_reloc_status_type
+mips_elf64_shift6_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+			 void *data, asection *input_section, bfd *output_bfd,
+			 char **error_message)
+{
+  if (reloc_entry->howto->partial_inplace)
+    {
+      reloc_entry->addend = ((reloc_entry->addend & 0x00007c0)
+			     | (reloc_entry->addend & 0x00000800) >> 9);
+    }
+
+  return _bfd_mips_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+				      input_section, output_bfd,
+				      error_message);
+}
+
+/* Handle a mips16 GP relative reloc.  */
+
+static bfd_reloc_status_type
+mips16_gprel_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+		    void *data, asection *input_section, bfd *output_bfd,
+		    char **error_message)
+{
+  bfd_boolean relocatable;
+  bfd_reloc_status_type ret;
+  bfd_byte *location;
+  bfd_vma gp;
+
+  /* If we're relocating, and this is an external symbol, we don't want
+     to change anything.  */
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (symbol->flags & BSF_LOCAL) != 0)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  if (output_bfd != NULL)
+    relocatable = TRUE;
+  else
+    {
+      relocatable = FALSE;
+      output_bfd = symbol->section->output_section->owner;
+    }
+
+  ret = mips_elf64_final_gp (output_bfd, symbol, relocatable, error_message,
+			     &gp);
+  if (ret != bfd_reloc_ok)
+    return ret;
+
+  location = (bfd_byte *) data + reloc_entry->address;
+  _bfd_mips_elf_reloc_unshuffle (abfd, reloc_entry->howto->type, FALSE,
+				 location);
+  ret = _bfd_mips_elf_gprel16_with_gp (abfd, symbol, reloc_entry,
+				       input_section, relocatable,
+				       data, gp);
+  _bfd_mips_elf_reloc_shuffle (abfd, reloc_entry->howto->type, !relocatable,
+			       location);
+
+  return ret;
+}
+
+/* A mapping from BFD reloc types to MIPS ELF reloc types.  */
+
+struct elf_reloc_map {
+  bfd_reloc_code_real_type bfd_val;
+  enum elf_mips_reloc_type elf_val;
+};
+
+static const struct elf_reloc_map mips_reloc_map[] =
+{
+  { BFD_RELOC_NONE, R_MIPS_NONE },
+  { BFD_RELOC_16, R_MIPS_16 },
+  { BFD_RELOC_32, R_MIPS_32 },
+  /* There is no BFD reloc for R_MIPS_REL32.  */
+  { BFD_RELOC_64, R_MIPS_64 },
+  { BFD_RELOC_CTOR, R_MIPS_64 },
+  { BFD_RELOC_16_PCREL_S2, R_MIPS_PC16 },
+  { BFD_RELOC_HI16_S, R_MIPS_HI16 },
+  { BFD_RELOC_LO16, R_MIPS_LO16 },
+  { BFD_RELOC_GPREL16, R_MIPS_GPREL16 },
+  { BFD_RELOC_GPREL32, R_MIPS_GPREL32 },
+  { BFD_RELOC_MIPS_JMP, R_MIPS_26 },
+  { BFD_RELOC_MIPS_LITERAL, R_MIPS_LITERAL },
+  { BFD_RELOC_MIPS_GOT16, R_MIPS_GOT16 },
+  { BFD_RELOC_MIPS_CALL16, R_MIPS_CALL16 },
+  { BFD_RELOC_MIPS_SHIFT5, R_MIPS_SHIFT5 },
+  { BFD_RELOC_MIPS_SHIFT6, R_MIPS_SHIFT6 },
+  { BFD_RELOC_MIPS_GOT_DISP, R_MIPS_GOT_DISP },
+  { BFD_RELOC_MIPS_GOT_PAGE, R_MIPS_GOT_PAGE },
+  { BFD_RELOC_MIPS_GOT_OFST, R_MIPS_GOT_OFST },
+  { BFD_RELOC_MIPS_GOT_HI16, R_MIPS_GOT_HI16 },
+  { BFD_RELOC_MIPS_GOT_LO16, R_MIPS_GOT_LO16 },
+  { BFD_RELOC_MIPS_SUB, R_MIPS_SUB },
+  { BFD_RELOC_MIPS_INSERT_A, R_MIPS_INSERT_A },
+  { BFD_RELOC_MIPS_INSERT_B, R_MIPS_INSERT_B },
+  { BFD_RELOC_MIPS_DELETE, R_MIPS_DELETE },
+  { BFD_RELOC_MIPS_HIGHEST, R_MIPS_HIGHEST },
+  { BFD_RELOC_MIPS_HIGHER, R_MIPS_HIGHER },
+  { BFD_RELOC_MIPS_CALL_HI16, R_MIPS_CALL_HI16 },
+  { BFD_RELOC_MIPS_CALL_LO16, R_MIPS_CALL_LO16 },
+  { BFD_RELOC_MIPS_SCN_DISP, R_MIPS_SCN_DISP },
+  { BFD_RELOC_MIPS_REL16, R_MIPS_REL16 },
+  /* Use of R_MIPS_ADD_IMMEDIATE and R_MIPS_PJUMP is deprecated.  */
+  { BFD_RELOC_MIPS_RELGOT, R_MIPS_RELGOT },
+  { BFD_RELOC_MIPS_JALR, R_MIPS_JALR },
+  { BFD_RELOC_MIPS_TLS_DTPMOD32, R_MIPS_TLS_DTPMOD32 },
+  { BFD_RELOC_MIPS_TLS_DTPREL32, R_MIPS_TLS_DTPREL32 },
+  { BFD_RELOC_MIPS_TLS_DTPMOD64, R_MIPS_TLS_DTPMOD64 },
+  { BFD_RELOC_MIPS_TLS_DTPREL64, R_MIPS_TLS_DTPREL64 },
+  { BFD_RELOC_MIPS_TLS_GD, R_MIPS_TLS_GD },
+  { BFD_RELOC_MIPS_TLS_LDM, R_MIPS_TLS_LDM },
+  { BFD_RELOC_MIPS_TLS_DTPREL_HI16, R_MIPS_TLS_DTPREL_HI16 },
+  { BFD_RELOC_MIPS_TLS_DTPREL_LO16, R_MIPS_TLS_DTPREL_LO16 },
+  { BFD_RELOC_MIPS_TLS_GOTTPREL, R_MIPS_TLS_GOTTPREL },
+  { BFD_RELOC_MIPS_TLS_TPREL32, R_MIPS_TLS_TPREL32 },
+  { BFD_RELOC_MIPS_TLS_TPREL64, R_MIPS_TLS_TPREL64 },
+  { BFD_RELOC_MIPS_TLS_TPREL_HI16, R_MIPS_TLS_TPREL_HI16 },
+  { BFD_RELOC_MIPS_TLS_TPREL_LO16, R_MIPS_TLS_TPREL_LO16 }
+};
+
+static const struct elf_reloc_map mips16_reloc_map[] =
+{
+  { BFD_RELOC_MIPS16_JMP, R_MIPS16_26 - R_MIPS16_min },
+  { BFD_RELOC_MIPS16_GPREL, R_MIPS16_GPREL - R_MIPS16_min },
+  { BFD_RELOC_MIPS16_GOT16, R_MIPS16_GOT16 - R_MIPS16_min },
+  { BFD_RELOC_MIPS16_CALL16, R_MIPS16_CALL16 - R_MIPS16_min },
+  { BFD_RELOC_MIPS16_HI16_S, R_MIPS16_HI16 - R_MIPS16_min },
+  { BFD_RELOC_MIPS16_LO16, R_MIPS16_LO16 - R_MIPS16_min },
+};
+
+static const struct elf_reloc_map micromips_reloc_map[] =
+{
+  { BFD_RELOC_MICROMIPS_JMP, R_MICROMIPS_26_S1 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_HI16_S, R_MICROMIPS_HI16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_LO16, R_MICROMIPS_LO16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GPREL16, R_MICROMIPS_GPREL16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_LITERAL, R_MICROMIPS_LITERAL - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GOT16, R_MICROMIPS_GOT16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_7_PCREL_S1, R_MICROMIPS_PC7_S1 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_10_PCREL_S1, R_MICROMIPS_PC10_S1 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_16_PCREL_S1, R_MICROMIPS_PC16_S1 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_CALL16, R_MICROMIPS_CALL16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GOT_DISP, R_MICROMIPS_GOT_DISP - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GOT_PAGE, R_MICROMIPS_GOT_PAGE - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GOT_OFST, R_MICROMIPS_GOT_OFST - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GOT_HI16, R_MICROMIPS_GOT_HI16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GOT_LO16, R_MICROMIPS_GOT_LO16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_SUB, R_MICROMIPS_SUB - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_HIGHER, R_MICROMIPS_HIGHER - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_HIGHEST, R_MICROMIPS_HIGHEST - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_CALL_HI16, R_MICROMIPS_CALL_HI16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_CALL_LO16, R_MICROMIPS_CALL_LO16 - R_MICROMIPS_min },
+};
+/* Given a BFD reloc type, return a howto structure.  */
+
+static reloc_howto_type *
+bfd_elf64_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+  /* FIXME: We default to RELA here instead of choosing the right
+     relocation variant.  */
+  reloc_howto_type *howto_table = mips_elf64_howto_table_rela;
+  reloc_howto_type *howto16_table = mips16_elf64_howto_table_rela;
+  reloc_howto_type *howto_micromips_table = micromips_elf64_howto_table_rela;
+
+  for (i = 0; i < sizeof (mips_reloc_map) / sizeof (struct elf_reloc_map);
+       i++)
+    {
+      if (mips_reloc_map[i].bfd_val == code)
+	return &howto_table[(int) mips_reloc_map[i].elf_val];
+    }
+
+  for (i = 0; i < sizeof (mips16_reloc_map) / sizeof (struct elf_reloc_map);
+       i++)
+    {
+      if (mips16_reloc_map[i].bfd_val == code)
+	return &howto16_table[(int) mips16_reloc_map[i].elf_val];
+    }
+
+  for (i = 0; i < sizeof (micromips_reloc_map) / sizeof (struct elf_reloc_map);
+       i++)
+    {
+      if (micromips_reloc_map[i].bfd_val == code)
+	return &howto_micromips_table[(int) micromips_reloc_map[i].elf_val];
+    }
+
+  switch (code)
+    {
+    case BFD_RELOC_VTABLE_INHERIT:
+      return &elf_mips_gnu_vtinherit_howto;
+    case BFD_RELOC_VTABLE_ENTRY:
+      return &elf_mips_gnu_vtentry_howto;
+    case BFD_RELOC_MIPS_COPY:
+      return &elf_mips_copy_howto;
+    case BFD_RELOC_MIPS_JUMP_SLOT:
+      return &elf_mips_jump_slot_howto;
+    default:
+      bfd_set_error (bfd_error_bad_value);
+      return NULL;
+    }
+}
+
+static reloc_howto_type *
+bfd_elf64_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (mips_elf64_howto_table_rela)
+	    / sizeof (mips_elf64_howto_table_rela[0])); i++)
+    if (mips_elf64_howto_table_rela[i].name != NULL
+	&& strcasecmp (mips_elf64_howto_table_rela[i].name, r_name) == 0)
+      return &mips_elf64_howto_table_rela[i];
+
+  for (i = 0;
+       i < (sizeof (mips16_elf64_howto_table_rela)
+	    / sizeof (mips16_elf64_howto_table_rela[0]));
+       i++)
+    if (mips16_elf64_howto_table_rela[i].name != NULL
+	&& strcasecmp (mips16_elf64_howto_table_rela[i].name, r_name) == 0)
+      return &mips16_elf64_howto_table_rela[i];
+
+  for (i = 0;
+       i < (sizeof (micromips_elf64_howto_table_rela)
+	    / sizeof (micromips_elf64_howto_table_rela[0]));
+       i++)
+    if (micromips_elf64_howto_table_rela[i].name != NULL
+	&& strcasecmp (micromips_elf64_howto_table_rela[i].name, r_name) == 0)
+      return &micromips_elf64_howto_table_rela[i];
+
+  if (strcasecmp (elf_mips_gnu_vtinherit_howto.name, r_name) == 0)
+    return &elf_mips_gnu_vtinherit_howto;
+  if (strcasecmp (elf_mips_gnu_vtentry_howto.name, r_name) == 0)
+    return &elf_mips_gnu_vtentry_howto;
+  if (strcasecmp (elf_mips_gnu_rel16_s2.name, r_name) == 0)
+    return &elf_mips_gnu_rel16_s2;
+  if (strcasecmp (elf_mips_gnu_rela16_s2.name, r_name) == 0)
+    return &elf_mips_gnu_rela16_s2;
+  if (strcasecmp (elf_mips_copy_howto.name, r_name) == 0)
+    return &elf_mips_copy_howto;
+  if (strcasecmp (elf_mips_jump_slot_howto.name, r_name) == 0)
+    return &elf_mips_jump_slot_howto;
+
+  return NULL;
+}
+
+/* Given a MIPS Elf_Internal_Rel, fill in an arelent structure.  */
+
+static reloc_howto_type *
+mips_elf64_rtype_to_howto (unsigned int r_type, bfd_boolean rela_p)
+{
+  switch (r_type)
+    {
+    case R_MIPS_GNU_VTINHERIT:
+      return &elf_mips_gnu_vtinherit_howto;
+    case R_MIPS_GNU_VTENTRY:
+      return &elf_mips_gnu_vtentry_howto;
+    case R_MIPS_GNU_REL16_S2:
+      if (rela_p)
+	return &elf_mips_gnu_rela16_s2;
+      else
+	return &elf_mips_gnu_rel16_s2;
+    case R_MIPS_COPY:
+      return &elf_mips_copy_howto;
+    case R_MIPS_JUMP_SLOT:
+      return &elf_mips_jump_slot_howto;
+    default:
+      if (r_type >= R_MICROMIPS_min && r_type < R_MICROMIPS_max)
+	{
+	  if (rela_p)
+	    return &micromips_elf64_howto_table_rela[r_type - R_MICROMIPS_min];
+	  else
+	    return &micromips_elf64_howto_table_rel[r_type - R_MICROMIPS_min];
+	}
+      if (r_type >= R_MIPS16_min && r_type < R_MIPS16_max)
+	{
+	  if (rela_p)
+	    return &mips16_elf64_howto_table_rela[r_type - R_MIPS16_min];
+	  else
+	    return &mips16_elf64_howto_table_rel[r_type - R_MIPS16_min];
+	}
+      BFD_ASSERT (r_type < (unsigned int) R_MIPS_max);
+      if (rela_p)
+	return &mips_elf64_howto_table_rela[r_type];
+      else
+	return &mips_elf64_howto_table_rel[r_type];
+      break;
+    }
+}
+
+/* Prevent relocation handling by bfd for MIPS ELF64.  */
+
+static void
+mips_elf64_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+			      arelent *cache_ptr ATTRIBUTE_UNUSED,
+			      Elf_Internal_Rela *dst ATTRIBUTE_UNUSED)
+{
+  BFD_ASSERT (0);
+}
+
+static void
+mips_elf64_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
+			       arelent *cache_ptr ATTRIBUTE_UNUSED,
+			       Elf_Internal_Rela *dst ATTRIBUTE_UNUSED)
+{
+  BFD_ASSERT (0);
+}
+
+/* Since each entry in an SHT_REL or SHT_RELA section can represent up
+   to three relocs, we must tell the user to allocate more space.  */
+
+static long
+mips_elf64_get_reloc_upper_bound (bfd *abfd ATTRIBUTE_UNUSED, asection *sec)
+{
+  return (sec->reloc_count * 3 + 1) * sizeof (arelent *);
+}
+
+static long
+mips_elf64_get_dynamic_reloc_upper_bound (bfd *abfd)
+{
+  return _bfd_elf_get_dynamic_reloc_upper_bound (abfd) * 3;
+}
+
+/* We must also copy more relocations than the corresponding functions
+   in elf.c would, so the two following functions are slightly
+   modified from elf.c, that multiply the external relocation count by
+   3 to obtain the internal relocation count.  */
+
+static long
+mips_elf64_canonicalize_reloc (bfd *abfd, sec_ptr section,
+			       arelent **relptr, asymbol **symbols)
+{
+  arelent *tblptr;
+  unsigned int i;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+
+  if (! bed->s->slurp_reloc_table (abfd, section, symbols, FALSE))
+    return -1;
+
+  tblptr = section->relocation;
+  for (i = 0; i < section->reloc_count * 3; i++)
+    *relptr++ = tblptr++;
+
+  *relptr = NULL;
+
+  return section->reloc_count * 3;
+}
+
+static long
+mips_elf64_canonicalize_dynamic_reloc (bfd *abfd, arelent **storage,
+				       asymbol **syms)
+{
+  bfd_boolean (*slurp_relocs) (bfd *, asection *, asymbol **, bfd_boolean);
+  asection *s;
+  long ret;
+
+  if (elf_dynsymtab (abfd) == 0)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return -1;
+    }
+
+  slurp_relocs = get_elf_backend_data (abfd)->s->slurp_reloc_table;
+  ret = 0;
+  for (s = abfd->sections; s != NULL; s = s->next)
+    {
+      if (elf_section_data (s)->this_hdr.sh_link == elf_dynsymtab (abfd)
+	  && (elf_section_data (s)->this_hdr.sh_type == SHT_REL
+	      || elf_section_data (s)->this_hdr.sh_type == SHT_RELA))
+	{
+	  arelent *p;
+	  long count, i;
+
+	  if (! (*slurp_relocs) (abfd, s, syms, TRUE))
+	    return -1;
+	  count = s->size / elf_section_data (s)->this_hdr.sh_entsize * 3;
+	  p = s->relocation;
+	  for (i = 0; i < count; i++)
+	    *storage++ = p++;
+	  ret += count;
+	}
+    }
+
+  *storage = NULL;
+
+  return ret;
+}
+
+/* Read the relocations from one reloc section.  This is mostly copied
+   from elfcode.h, except for the changes to expand one external
+   relocation to 3 internal ones.  We must unfortunately set
+   reloc_count to the number of external relocations, because a lot of
+   generic code seems to depend on this.  */
+
+static bfd_boolean
+mips_elf64_slurp_one_reloc_table (bfd *abfd, asection *asect,
+				  Elf_Internal_Shdr *rel_hdr,
+				  bfd_size_type reloc_count,
+				  arelent *relents, asymbol **symbols,
+				  bfd_boolean dynamic)
+{
+  void *allocated;
+  bfd_byte *native_relocs;
+  arelent *relent;
+  bfd_vma i;
+  int entsize;
+  bfd_boolean rela_p;
+
+  allocated = bfd_malloc (rel_hdr->sh_size);
+  if (allocated == NULL)
+    return FALSE;
+
+  if (bfd_seek (abfd, rel_hdr->sh_offset, SEEK_SET) != 0
+      || (bfd_bread (allocated, rel_hdr->sh_size, abfd)
+	  != rel_hdr->sh_size))
+    goto error_return;
+
+  native_relocs = allocated;
+
+  entsize = rel_hdr->sh_entsize;
+  BFD_ASSERT (entsize == sizeof (Elf64_Mips_External_Rel)
+	      || entsize == sizeof (Elf64_Mips_External_Rela));
+
+  if (entsize == sizeof (Elf64_Mips_External_Rel))
+    rela_p = FALSE;
+  else
+    rela_p = TRUE;
+
+  for (i = 0, relent = relents;
+       i < reloc_count;
+       i++, native_relocs += entsize)
+    {
+      Elf64_Mips_Internal_Rela rela;
+      bfd_boolean used_sym, used_ssym;
+      int ir;
+
+      if (entsize == sizeof (Elf64_Mips_External_Rela))
+	mips_elf64_swap_reloca_in (abfd,
+				   (Elf64_Mips_External_Rela *) native_relocs,
+				   &rela);
+      else
+	mips_elf64_swap_reloc_in (abfd,
+				  (Elf64_Mips_External_Rel *) native_relocs,
+				  &rela);
+
+      /* Each entry represents exactly three actual relocations.  */
+
+      used_sym = FALSE;
+      used_ssym = FALSE;
+      for (ir = 0; ir < 3; ir++)
+	{
+	  enum elf_mips_reloc_type type;
+
+	  switch (ir)
+	    {
+	    default:
+	      abort ();
+	    case 0:
+	      type = (enum elf_mips_reloc_type) rela.r_type;
+	      break;
+	    case 1:
+	      type = (enum elf_mips_reloc_type) rela.r_type2;
+	      break;
+	    case 2:
+	      type = (enum elf_mips_reloc_type) rela.r_type3;
+	      break;
+	    }
+
+	  /* Some types require symbols, whereas some do not.  */
+	  switch (type)
+	    {
+	    case R_MIPS_NONE:
+	    case R_MIPS_LITERAL:
+	    case R_MIPS_INSERT_A:
+	    case R_MIPS_INSERT_B:
+	    case R_MIPS_DELETE:
+	      relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+	      break;
+
+	    default:
+	      if (! used_sym)
+		{
+		  if (rela.r_sym == STN_UNDEF)
+		    relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+		  else
+		    {
+		      asymbol **ps, *s;
+
+		      ps = symbols + rela.r_sym - 1;
+		      s = *ps;
+		      if ((s->flags & BSF_SECTION_SYM) == 0)
+			relent->sym_ptr_ptr = ps;
+		      else
+			relent->sym_ptr_ptr = s->section->symbol_ptr_ptr;
+		    }
+
+		  used_sym = TRUE;
+		}
+	      else if (! used_ssym)
+		{
+		  switch (rela.r_ssym)
+		    {
+		    case RSS_UNDEF:
+		      relent->sym_ptr_ptr =
+			bfd_abs_section_ptr->symbol_ptr_ptr;
+		      break;
+
+		    case RSS_GP:
+		    case RSS_GP0:
+		    case RSS_LOC:
+		      /* FIXME: I think these need to be handled using
+			 special howto structures.  */
+		      BFD_ASSERT (0);
+		      break;
+
+		    default:
+		      BFD_ASSERT (0);
+		      break;
+		    }
+
+		  used_ssym = TRUE;
+		}
+	      else
+		relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+
+	      break;
+	    }
+
+	  /* The address of an ELF reloc is section relative for an
+	     object file, and absolute for an executable file or
+	     shared library.  The address of a BFD reloc is always
+	     section relative.  */
+	  if ((abfd->flags & (EXEC_P | DYNAMIC)) == 0 || dynamic)
+	    relent->address = rela.r_offset;
+	  else
+	    relent->address = rela.r_offset - asect->vma;
+
+	  relent->addend = rela.r_addend;
+
+	  relent->howto = mips_elf64_rtype_to_howto (type, rela_p);
+
+	  ++relent;
+	}
+    }
+
+  asect->reloc_count += (relent - relents) / 3;
+
+  if (allocated != NULL)
+    free (allocated);
+
+  return TRUE;
+
+ error_return:
+  if (allocated != NULL)
+    free (allocated);
+  return FALSE;
+}
+
+/* Read the relocations.  On Irix 6, there can be two reloc sections
+   associated with a single data section.  This is copied from
+   elfcode.h as well, with changes as small as accounting for 3
+   internal relocs per external reloc and resetting reloc_count to
+   zero before processing the relocs of a section.  */
+
+static bfd_boolean
+mips_elf64_slurp_reloc_table (bfd *abfd, asection *asect,
+			      asymbol **symbols, bfd_boolean dynamic)
+{
+  struct bfd_elf_section_data * const d = elf_section_data (asect);
+  Elf_Internal_Shdr *rel_hdr;
+  Elf_Internal_Shdr *rel_hdr2;
+  bfd_size_type reloc_count;
+  bfd_size_type reloc_count2;
+  arelent *relents;
+  bfd_size_type amt;
+
+  if (asect->relocation != NULL)
+    return TRUE;
+
+  if (! dynamic)
+    {
+      if ((asect->flags & SEC_RELOC) == 0
+	  || asect->reloc_count == 0)
+	return TRUE;
+
+      rel_hdr = d->rel.hdr;
+      reloc_count = rel_hdr ? NUM_SHDR_ENTRIES (rel_hdr) : 0;
+      rel_hdr2 = d->rela.hdr;
+      reloc_count2 = (rel_hdr2 ? NUM_SHDR_ENTRIES (rel_hdr2) : 0);
+
+      BFD_ASSERT (asect->reloc_count == reloc_count + reloc_count2);
+      BFD_ASSERT ((rel_hdr && asect->rel_filepos == rel_hdr->sh_offset)
+		  || (rel_hdr2 && asect->rel_filepos == rel_hdr2->sh_offset));
+
+    }
+  else
+    {
+      /* Note that ASECT->RELOC_COUNT tends not to be accurate in this
+	 case because relocations against this section may use the
+	 dynamic symbol table, and in that case bfd_section_from_shdr
+	 in elf.c does not update the RELOC_COUNT.  */
+      if (asect->size == 0)
+	return TRUE;
+
+      rel_hdr = &d->this_hdr;
+      reloc_count = NUM_SHDR_ENTRIES (rel_hdr);
+      rel_hdr2 = NULL;
+      reloc_count2 = 0;
+    }
+
+  /* Allocate space for 3 arelent structures for each Rel structure.  */
+  amt = (reloc_count + reloc_count2) * 3 * sizeof (arelent);
+  relents = bfd_alloc (abfd, amt);
+  if (relents == NULL)
+    return FALSE;
+
+  /* The slurp_one_reloc_table routine increments reloc_count.  */
+  asect->reloc_count = 0;
+
+  if (rel_hdr != NULL
+      && ! mips_elf64_slurp_one_reloc_table (abfd, asect,
+					     rel_hdr, reloc_count,
+					     relents,
+					     symbols, dynamic))
+    return FALSE;
+  if (rel_hdr2 != NULL
+      && ! mips_elf64_slurp_one_reloc_table (abfd, asect,
+					     rel_hdr2, reloc_count2,
+					     relents + reloc_count * 3,
+					     symbols, dynamic))
+    return FALSE;
+
+  asect->relocation = relents;
+  return TRUE;
+}
+
+/* Write out the relocations.  */
+
+static void
+mips_elf64_write_relocs (bfd *abfd, asection *sec, void *data)
+{
+  bfd_boolean *failedp = data;
+  int count;
+  Elf_Internal_Shdr *rel_hdr;
+  unsigned int idx;
+
+  /* If we have already failed, don't do anything.  */
+  if (*failedp)
+    return;
+
+  if ((sec->flags & SEC_RELOC) == 0)
+    return;
+
+  /* The linker backend writes the relocs out itself, and sets the
+     reloc_count field to zero to inhibit writing them here.  Also,
+     sometimes the SEC_RELOC flag gets set even when there aren't any
+     relocs.  */
+  if (sec->reloc_count == 0)
+    return;
+
+  /* We can combine up to three relocs that refer to the same address
+     if the latter relocs have no associated symbol.  */
+  count = 0;
+  for (idx = 0; idx < sec->reloc_count; idx++)
+    {
+      bfd_vma addr;
+      unsigned int i;
+
+      ++count;
+
+      addr = sec->orelocation[idx]->address;
+      for (i = 0; i < 2; i++)
+	{
+	  arelent *r;
+
+	  if (idx + 1 >= sec->reloc_count)
+	    break;
+	  r = sec->orelocation[idx + 1];
+	  if (r->address != addr
+	      || ! bfd_is_abs_section ((*r->sym_ptr_ptr)->section)
+	      || (*r->sym_ptr_ptr)->value != 0)
+	    break;
+
+	  /* We can merge the reloc at IDX + 1 with the reloc at IDX.  */
+
+	  ++idx;
+	}
+    }
+
+  rel_hdr = _bfd_elf_single_rel_hdr (sec);
+
+  /* Do the actual relocation.  */
+
+  if (rel_hdr->sh_entsize == sizeof(Elf64_Mips_External_Rel))
+    mips_elf64_write_rel (abfd, sec, rel_hdr, &count, data);
+  else if (rel_hdr->sh_entsize == sizeof(Elf64_Mips_External_Rela))
+    mips_elf64_write_rela (abfd, sec, rel_hdr, &count, data);
+  else
+    BFD_ASSERT (0);
+}
+
+static void
+mips_elf64_write_rel (bfd *abfd, asection *sec,
+		      Elf_Internal_Shdr *rel_hdr,
+		      int *count, void *data)
+{
+  bfd_boolean *failedp = data;
+  Elf64_Mips_External_Rel *ext_rel;
+  unsigned int idx;
+  asymbol *last_sym = 0;
+  int last_sym_idx = 0;
+
+  rel_hdr->sh_size = rel_hdr->sh_entsize * *count;
+  rel_hdr->contents = bfd_alloc (abfd, rel_hdr->sh_size);
+  if (rel_hdr->contents == NULL)
+    {
+      *failedp = TRUE;
+      return;
+    }
+
+  ext_rel = (Elf64_Mips_External_Rel *) rel_hdr->contents;
+  for (idx = 0; idx < sec->reloc_count; idx++, ext_rel++)
+    {
+      arelent *ptr;
+      Elf64_Mips_Internal_Rela int_rel;
+      asymbol *sym;
+      int n;
+      unsigned int i;
+
+      ptr = sec->orelocation[idx];
+
+      /* The address of an ELF reloc is section relative for an object
+	 file, and absolute for an executable file or shared library.
+	 The address of a BFD reloc is always section relative.  */
+      if ((abfd->flags & (EXEC_P | DYNAMIC)) == 0)
+	int_rel.r_offset = ptr->address;
+      else
+	int_rel.r_offset = ptr->address + sec->vma;
+
+      sym = *ptr->sym_ptr_ptr;
+      if (sym == last_sym)
+	n = last_sym_idx;
+      else if (bfd_is_abs_section (sym->section) && sym->value == 0)
+	n = STN_UNDEF;
+      else
+	{
+	  last_sym = sym;
+	  n = _bfd_elf_symbol_from_bfd_symbol (abfd, &sym);
+	  if (n < 0)
+	    {
+	      *failedp = TRUE;
+	      return;
+	    }
+	  last_sym_idx = n;
+	}
+
+      int_rel.r_sym = n;
+      int_rel.r_ssym = RSS_UNDEF;
+
+      if ((*ptr->sym_ptr_ptr)->the_bfd->xvec != abfd->xvec
+	  && ! _bfd_elf_validate_reloc (abfd, ptr))
+	{
+	  *failedp = TRUE;
+	  return;
+	}
+
+      int_rel.r_type = ptr->howto->type;
+      int_rel.r_type2 = (int) R_MIPS_NONE;
+      int_rel.r_type3 = (int) R_MIPS_NONE;
+
+      for (i = 0; i < 2; i++)
+	{
+	  arelent *r;
+
+	  if (idx + 1 >= sec->reloc_count)
+	    break;
+	  r = sec->orelocation[idx + 1];
+	  if (r->address != ptr->address
+	      || ! bfd_is_abs_section ((*r->sym_ptr_ptr)->section)
+	      || (*r->sym_ptr_ptr)->value != 0)
+	    break;
+
+	  /* We can merge the reloc at IDX + 1 with the reloc at IDX.  */
+
+	  if (i == 0)
+	    int_rel.r_type2 = r->howto->type;
+	  else
+	    int_rel.r_type3 = r->howto->type;
+
+	  ++idx;
+	}
+
+      mips_elf64_swap_reloc_out (abfd, &int_rel, ext_rel);
+    }
+
+  BFD_ASSERT (ext_rel - (Elf64_Mips_External_Rel *) rel_hdr->contents
+	      == *count);
+}
+
+static void
+mips_elf64_write_rela (bfd *abfd, asection *sec,
+		       Elf_Internal_Shdr *rela_hdr,
+		       int *count, void *data)
+{
+  bfd_boolean *failedp = data;
+  Elf64_Mips_External_Rela *ext_rela;
+  unsigned int idx;
+  asymbol *last_sym = 0;
+  int last_sym_idx = 0;
+
+  rela_hdr->sh_size = rela_hdr->sh_entsize * *count;
+  rela_hdr->contents = bfd_alloc (abfd, rela_hdr->sh_size);
+  if (rela_hdr->contents == NULL)
+    {
+      *failedp = TRUE;
+      return;
+    }
+
+  ext_rela = (Elf64_Mips_External_Rela *) rela_hdr->contents;
+  for (idx = 0; idx < sec->reloc_count; idx++, ext_rela++)
+    {
+      arelent *ptr;
+      Elf64_Mips_Internal_Rela int_rela;
+      asymbol *sym;
+      int n;
+      unsigned int i;
+
+      ptr = sec->orelocation[idx];
+
+      /* The address of an ELF reloc is section relative for an object
+	 file, and absolute for an executable file or shared library.
+	 The address of a BFD reloc is always section relative.  */
+      if ((abfd->flags & (EXEC_P | DYNAMIC)) == 0)
+	int_rela.r_offset = ptr->address;
+      else
+	int_rela.r_offset = ptr->address + sec->vma;
+
+      sym = *ptr->sym_ptr_ptr;
+      if (sym == last_sym)
+	n = last_sym_idx;
+      else if (bfd_is_abs_section (sym->section) && sym->value == 0)
+	n = STN_UNDEF;
+      else
+	{
+	  last_sym = sym;
+	  n = _bfd_elf_symbol_from_bfd_symbol (abfd, &sym);
+	  if (n < 0)
+	    {
+	      *failedp = TRUE;
+	      return;
+	    }
+	  last_sym_idx = n;
+	}
+
+      int_rela.r_sym = n;
+      int_rela.r_addend = ptr->addend;
+      int_rela.r_ssym = RSS_UNDEF;
+
+      if ((*ptr->sym_ptr_ptr)->the_bfd->xvec != abfd->xvec
+	  && ! _bfd_elf_validate_reloc (abfd, ptr))
+	{
+	  *failedp = TRUE;
+	  return;
+	}
+
+      int_rela.r_type = ptr->howto->type;
+      int_rela.r_type2 = (int) R_MIPS_NONE;
+      int_rela.r_type3 = (int) R_MIPS_NONE;
+
+      for (i = 0; i < 2; i++)
+	{
+	  arelent *r;
+
+	  if (idx + 1 >= sec->reloc_count)
+	    break;
+	  r = sec->orelocation[idx + 1];
+	  if (r->address != ptr->address
+	      || ! bfd_is_abs_section ((*r->sym_ptr_ptr)->section)
+	      || (*r->sym_ptr_ptr)->value != 0)
+	    break;
+
+	  /* We can merge the reloc at IDX + 1 with the reloc at IDX.  */
+
+	  if (i == 0)
+	    int_rela.r_type2 = r->howto->type;
+	  else
+	    int_rela.r_type3 = r->howto->type;
+
+	  ++idx;
+	}
+
+      mips_elf64_swap_reloca_out (abfd, &int_rela, ext_rela);
+    }
+
+  BFD_ASSERT (ext_rela - (Elf64_Mips_External_Rela *) rela_hdr->contents
+	      == *count);
+}
+
+/* Set the right machine number for a MIPS ELF file.  */
+
+static bfd_boolean
+mips_elf64_object_p (bfd *abfd)
+{
+  unsigned long mach;
+
+  /* Irix 6 is broken.  Object file symbol tables are not always
+     sorted correctly such that local symbols precede global symbols,
+     and the sh_info field in the symbol table is not always right.  */
+  if (elf64_mips_irix_compat (abfd) != ict_none)
+    elf_bad_symtab (abfd) = TRUE;
+
+  mach = _bfd_elf_mips_mach (elf_elfheader (abfd)->e_flags);
+  bfd_default_set_arch_mach (abfd, bfd_arch_mips, mach);
+  return TRUE;
+}
+
+/* Depending on the target vector we generate some version of Irix
+   executables or "normal" MIPS ELF ABI executables.  */
+static irix_compat_t
+elf64_mips_irix_compat (bfd *abfd)
+{
+  if ((abfd->xvec == &bfd_elf64_bigmips_vec)
+      || (abfd->xvec == &bfd_elf64_littlemips_vec))
+    return ict_irix6;
+  else
+    return ict_none;
+}
+
+/* Support for core dump NOTE sections.  */
+static bfd_boolean
+elf64_mips_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  int offset;
+  unsigned int size;
+
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      case 480:		/* Linux/MIPS - N64 kernel */
+	/* pr_cursig */
+	elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12);
+
+	/* pr_pid */
+	elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 32);
+
+	/* pr_reg */
+	offset = 112;
+	size = 360;
+
+	break;
+    }
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg",
+					  size, note->descpos + offset);
+}
+
+static bfd_boolean
+elf64_mips_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      case 136:		/* Linux/MIPS - N64 kernel elf_prpsinfo */
+	elf_tdata (abfd)->core_program
+	 = _bfd_elfcore_strndup (abfd, note->descdata + 40, 16);
+	elf_tdata (abfd)->core_command
+	 = _bfd_elfcore_strndup (abfd, note->descdata + 56, 80);
+    }
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+
+  {
+    char *command = elf_tdata (abfd)->core_command;
+    int n = strlen (command);
+
+    if (0 < n && command[n - 1] == ' ')
+      command[n - 1] = '\0';
+  }
+
+  return TRUE;
+}
+
+/* ECOFF swapping routines.  These are used when dealing with the
+   .mdebug section, which is in the ECOFF debugging format.  */
+static const struct ecoff_debug_swap mips_elf64_ecoff_debug_swap =
+{
+  /* Symbol table magic number.  */
+  magicSym2,
+  /* Alignment of debugging information.  E.g., 4.  */
+  8,
+  /* Sizes of external symbolic information.  */
+  sizeof (struct hdr_ext),
+  sizeof (struct dnr_ext),
+  sizeof (struct pdr_ext),
+  sizeof (struct sym_ext),
+  sizeof (struct opt_ext),
+  sizeof (struct fdr_ext),
+  sizeof (struct rfd_ext),
+  sizeof (struct ext_ext),
+  /* Functions to swap in external symbolic data.  */
+  ecoff_swap_hdr_in,
+  ecoff_swap_dnr_in,
+  ecoff_swap_pdr_in,
+  ecoff_swap_sym_in,
+  ecoff_swap_opt_in,
+  ecoff_swap_fdr_in,
+  ecoff_swap_rfd_in,
+  ecoff_swap_ext_in,
+  _bfd_ecoff_swap_tir_in,
+  _bfd_ecoff_swap_rndx_in,
+  /* Functions to swap out external symbolic data.  */
+  ecoff_swap_hdr_out,
+  ecoff_swap_dnr_out,
+  ecoff_swap_pdr_out,
+  ecoff_swap_sym_out,
+  ecoff_swap_opt_out,
+  ecoff_swap_fdr_out,
+  ecoff_swap_rfd_out,
+  ecoff_swap_ext_out,
+  _bfd_ecoff_swap_tir_out,
+  _bfd_ecoff_swap_rndx_out,
+  /* Function to read in symbolic data.  */
+  _bfd_mips_elf_read_ecoff_info
+};
+
+/* Relocations in the 64 bit MIPS ELF ABI are more complex than in
+   standard ELF.  This structure is used to redirect the relocation
+   handling routines.  */
+
+const struct elf_size_info mips_elf64_size_info =
+{
+  sizeof (Elf64_External_Ehdr),
+  sizeof (Elf64_External_Phdr),
+  sizeof (Elf64_External_Shdr),
+  sizeof (Elf64_Mips_External_Rel),
+  sizeof (Elf64_Mips_External_Rela),
+  sizeof (Elf64_External_Sym),
+  sizeof (Elf64_External_Dyn),
+  sizeof (Elf_External_Note),
+  4,		/* hash-table entry size */
+  3,		/* internal relocations per external relocations */
+  64,		/* arch_size */
+  3,		/* log_file_align */
+  ELFCLASS64,
+  EV_CURRENT,
+  bfd_elf64_write_out_phdrs,
+  bfd_elf64_write_shdrs_and_ehdr,
+  bfd_elf64_checksum_contents,
+  mips_elf64_write_relocs,
+  bfd_elf64_swap_symbol_in,
+  bfd_elf64_swap_symbol_out,
+  mips_elf64_slurp_reloc_table,
+  bfd_elf64_slurp_symbol_table,
+  bfd_elf64_swap_dyn_in,
+  bfd_elf64_swap_dyn_out,
+  mips_elf64_be_swap_reloc_in,
+  mips_elf64_be_swap_reloc_out,
+  mips_elf64_be_swap_reloca_in,
+  mips_elf64_be_swap_reloca_out
+};
+
+#define ELF_ARCH			bfd_arch_mips
+#define ELF_TARGET_ID			MIPS_ELF_DATA
+#define ELF_MACHINE_CODE		EM_MIPS
+
+#define elf_backend_collect		TRUE
+#define elf_backend_type_change_ok	TRUE
+#define elf_backend_can_gc_sections	TRUE
+#define elf_info_to_howto		mips_elf64_info_to_howto_rela
+#define elf_info_to_howto_rel		mips_elf64_info_to_howto_rel
+#define elf_backend_object_p		mips_elf64_object_p
+#define elf_backend_symbol_processing	_bfd_mips_elf_symbol_processing
+#define elf_backend_section_processing	_bfd_mips_elf_section_processing
+#define elf_backend_section_from_shdr	_bfd_mips_elf_section_from_shdr
+#define elf_backend_fake_sections	_bfd_mips_elf_fake_sections
+#define elf_backend_section_from_bfd_section \
+				_bfd_mips_elf_section_from_bfd_section
+#define elf_backend_add_symbol_hook	_bfd_mips_elf_add_symbol_hook
+#define elf_backend_link_output_symbol_hook \
+				_bfd_mips_elf_link_output_symbol_hook
+#define elf_backend_create_dynamic_sections \
+				_bfd_mips_elf_create_dynamic_sections
+#define elf_backend_check_relocs	_bfd_mips_elf_check_relocs
+#define elf_backend_merge_symbol_attribute \
+				_bfd_mips_elf_merge_symbol_attribute
+#define elf_backend_get_target_dtag	_bfd_mips_elf_get_target_dtag
+#define elf_backend_adjust_dynamic_symbol \
+				_bfd_mips_elf_adjust_dynamic_symbol
+#define elf_backend_always_size_sections \
+				_bfd_mips_elf_always_size_sections
+#define elf_backend_size_dynamic_sections \
+				_bfd_mips_elf_size_dynamic_sections
+#define elf_backend_init_index_section	_bfd_elf_init_1_index_section
+#define elf_backend_relocate_section    _bfd_mips_elf_relocate_section
+#define elf_backend_finish_dynamic_symbol \
+				_bfd_mips_elf_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections \
+				_bfd_mips_elf_finish_dynamic_sections
+#define elf_backend_final_write_processing \
+				_bfd_mips_elf_final_write_processing
+#define elf_backend_additional_program_headers \
+				_bfd_mips_elf_additional_program_headers
+#define elf_backend_modify_segment_map	_bfd_mips_elf_modify_segment_map
+#define elf_backend_gc_mark_hook	_bfd_mips_elf_gc_mark_hook
+#define elf_backend_gc_sweep_hook	_bfd_mips_elf_gc_sweep_hook
+#define elf_backend_copy_indirect_symbol \
+					_bfd_mips_elf_copy_indirect_symbol
+#define elf_backend_ignore_discarded_relocs \
+					_bfd_mips_elf_ignore_discarded_relocs
+#define elf_backend_mips_irix_compat	elf64_mips_irix_compat
+#define elf_backend_mips_rtype_to_howto	mips_elf64_rtype_to_howto
+#define elf_backend_ecoff_debug_swap	&mips_elf64_ecoff_debug_swap
+#define elf_backend_size_info		mips_elf64_size_info
+
+#define elf_backend_grok_prstatus	elf64_mips_grok_prstatus
+#define elf_backend_grok_psinfo		elf64_mips_grok_psinfo
+
+#define elf_backend_got_header_size	(4 * MIPS_RESERVED_GOTNO)
+
+/* MIPS ELF64 can use a mixture of REL and RELA, but some Relocations
+   work better/work only in RELA, so we default to this.  */
+#define elf_backend_may_use_rel_p	1
+#define elf_backend_may_use_rela_p	1
+#define elf_backend_default_use_rela_p	1
+#define elf_backend_rela_plts_and_copies_p 0
+#define elf_backend_plt_readonly	1
+#define elf_backend_plt_sym_val		_bfd_mips_elf_plt_sym_val
+
+#define elf_backend_sign_extend_vma	TRUE
+
+#define elf_backend_write_section	_bfd_mips_elf_write_section
+
+/* We don't set bfd_elf64_bfd_is_local_label_name because the 32-bit
+   MIPS-specific function only applies to IRIX5, which had no 64-bit
+   ABI.  */
+#define bfd_elf64_bfd_is_target_special_symbol \
+					_bfd_mips_elf_is_target_special_symbol
+#define bfd_elf64_find_nearest_line	_bfd_mips_elf_find_nearest_line
+#define bfd_elf64_find_inliner_info	_bfd_mips_elf_find_inliner_info
+#define bfd_elf64_new_section_hook	_bfd_mips_elf_new_section_hook
+#define bfd_elf64_set_section_contents	_bfd_mips_elf_set_section_contents
+#define bfd_elf64_bfd_get_relocated_section_contents \
+				_bfd_elf_mips_get_relocated_section_contents
+#define bfd_elf64_bfd_link_hash_table_create \
+				_bfd_mips_elf_link_hash_table_create
+#define bfd_elf64_bfd_final_link	_bfd_mips_elf_final_link
+#define bfd_elf64_bfd_merge_private_bfd_data \
+				_bfd_mips_elf_merge_private_bfd_data
+#define bfd_elf64_bfd_set_private_flags	_bfd_mips_elf_set_private_flags
+#define bfd_elf64_bfd_print_private_bfd_data \
+				_bfd_mips_elf_print_private_bfd_data
+
+#define bfd_elf64_get_reloc_upper_bound mips_elf64_get_reloc_upper_bound
+#define bfd_elf64_canonicalize_reloc mips_elf64_canonicalize_reloc
+#define bfd_elf64_get_dynamic_reloc_upper_bound mips_elf64_get_dynamic_reloc_upper_bound
+#define bfd_elf64_canonicalize_dynamic_reloc mips_elf64_canonicalize_dynamic_reloc
+#define bfd_elf64_bfd_relax_section     _bfd_mips_relax_section
+
+/* MIPS ELF64 archive functions.  */
+#define bfd_elf64_archive_functions
+extern bfd_boolean bfd_elf64_archive_slurp_armap
+  (bfd *);
+extern bfd_boolean bfd_elf64_archive_write_armap
+  (bfd *, unsigned int, struct orl *, unsigned int, int);
+#define bfd_elf64_archive_slurp_extended_name_table \
+			_bfd_archive_coff_slurp_extended_name_table
+#define bfd_elf64_archive_construct_extended_name_table \
+			_bfd_archive_coff_construct_extended_name_table
+#define bfd_elf64_archive_truncate_arname \
+			_bfd_archive_coff_truncate_arname
+#define bfd_elf64_archive_read_ar_hdr	_bfd_archive_coff_read_ar_hdr
+#define bfd_elf64_archive_write_ar_hdr	_bfd_archive_coff_write_ar_hdr
+#define bfd_elf64_archive_openr_next_archived_file \
+			_bfd_archive_coff_openr_next_archived_file
+#define bfd_elf64_archive_get_elt_at_index \
+			_bfd_archive_coff_get_elt_at_index
+#define bfd_elf64_archive_generic_stat_arch_elt \
+			_bfd_archive_coff_generic_stat_arch_elt
+#define bfd_elf64_archive_update_armap_timestamp \
+			_bfd_archive_coff_update_armap_timestamp
+
+/* The SGI style (n)64 NewABI.  */
+#define TARGET_LITTLE_SYM		bfd_elf64_littlemips_vec
+#define TARGET_LITTLE_NAME		"elf64-littlemips"
+#define TARGET_BIG_SYM			bfd_elf64_bigmips_vec
+#define TARGET_BIG_NAME			"elf64-bigmips"
+
+#define ELF_MAXPAGESIZE			0x10000
+#define ELF_COMMONPAGESIZE		0x1000
+
+#include "elf64-target.h"
+
+/* The SYSV-style 'traditional' (n)64 NewABI.  */
+#undef TARGET_LITTLE_SYM
+#undef TARGET_LITTLE_NAME
+#undef TARGET_BIG_SYM
+#undef TARGET_BIG_NAME
+
+#undef ELF_MAXPAGESIZE
+#undef ELF_COMMONPAGESIZE
+
+#define TARGET_LITTLE_SYM		bfd_elf64_tradlittlemips_vec
+#define TARGET_LITTLE_NAME		"elf64-tradlittlemips"
+#define TARGET_BIG_SYM			bfd_elf64_tradbigmips_vec
+#define TARGET_BIG_NAME			"elf64-tradbigmips"
+
+#define ELF_MAXPAGESIZE			0x10000
+#define ELF_COMMONPAGESIZE		0x1000
+#define elf64_bed			elf64_tradbed
+
+/* Include the target file again for this target.  */
+#include "elf64-target.h"
+
+
+/* FreeBSD support.  */
+
+#undef TARGET_LITTLE_SYM
+#undef TARGET_LITTLE_NAME
+#undef TARGET_BIG_SYM
+#undef TARGET_BIG_NAME
+
+#define	TARGET_LITTLE_SYM		bfd_elf64_tradlittlemips_freebsd_vec
+#define	TARGET_LITTLE_NAME		"elf64-tradlittlemips-freebsd"
+#define	TARGET_BIG_SYM			bfd_elf64_tradbigmips_freebsd_vec
+#define	TARGET_BIG_NAME			"elf64-tradbigmips-freebsd"
+
+#undef	ELF_OSABI
+#define	ELF_OSABI			ELFOSABI_FREEBSD
+
+/* The kernel recognizes executables as valid only if they carry a
+   "FreeBSD" label in the ELF header.  So we put this label on all
+   executables and (for simplicity) also all other object files.  */
+
+static void
+elf_fbsd_post_process_headers (bfd *abfd, struct bfd_link_info *info)
+{
+  _bfd_elf_set_osabi (abfd, info);
+}
+
+#undef	elf_backend_post_process_headers
+#define	elf_backend_post_process_headers	elf_fbsd_post_process_headers
+#undef	elf64_bed
+#define elf64_bed				elf64_fbsd_tradbed
+
+#include "elf64-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-mmix.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-mmix.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-mmix.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-mmix.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3005 @@
+/* MMIX-specific support for 64-bit ELF.
+   Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010
+   Free Software Foundation, Inc.
+   Contributed by Hans-Peter Nilsson <hp@bitrange.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* No specific ABI or "processor-specific supplement" defined.  */
+
+/* TODO:
+   - "Traditional" linker relaxation (shrinking whole sections).
+   - Merge reloc stubs jumping to same location.
+   - GETA stub relaxation (call a stub for out of range new
+     R_MMIX_GETA_STUBBABLE).  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/mmix.h"
+#include "opcode/mmix.h"
+
+#define MINUS_ONE	(((bfd_vma) 0) - 1)
+
+#define MAX_PUSHJ_STUB_SIZE (5 * 4)
+
+/* Put these everywhere in new code.  */
+#define FATAL_DEBUG						\
+ _bfd_abort (__FILE__, __LINE__,				\
+	     "Internal: Non-debugged code (test-case missing)")
+
+#define BAD_CASE(x)				\
+ _bfd_abort (__FILE__, __LINE__,		\
+	     "bad case for " #x)
+
+struct _mmix_elf_section_data
+{
+  struct bfd_elf_section_data elf;
+  union
+  {
+    struct bpo_reloc_section_info *reloc;
+    struct bpo_greg_section_info *greg;
+  } bpo;
+
+  struct pushj_stub_info
+  {
+    /* Maximum number of stubs needed for this section.  */
+    bfd_size_type n_pushj_relocs;
+
+    /* Size of stubs after a mmix_elf_relax_section round.  */
+    bfd_size_type stubs_size_sum;
+
+    /* Per-reloc stubs_size_sum information.  The stubs_size_sum member is the sum
+       of these.  Allocated in mmix_elf_check_common_relocs.  */
+    bfd_size_type *stub_size;
+
+    /* Offset of next stub during relocation.  Somewhat redundant with the
+       above: error coverage is easier and we don't have to reset the
+       stubs_size_sum for relocation.  */
+    bfd_size_type stub_offset;
+  } pjs;
+
+  /* Whether there has been a warning that this section could not be
+     linked due to a specific cause.  FIXME: a way to access the
+     linker info or output section, then stuff the limiter guard
+     there. */
+  bfd_boolean has_warned_bpo;
+  bfd_boolean has_warned_pushj;
+};
+
+#define mmix_elf_section_data(sec) \
+  ((struct _mmix_elf_section_data *) elf_section_data (sec))
+
+/* For each section containing a base-plus-offset (BPO) reloc, we attach
+   this struct as mmix_elf_section_data (section)->bpo, which is otherwise
+   NULL.  */
+struct bpo_reloc_section_info
+  {
+    /* The base is 1; this is the first number in this section.  */
+    size_t first_base_plus_offset_reloc;
+
+    /* Number of BPO-relocs in this section.  */
+    size_t n_bpo_relocs_this_section;
+
+    /* Running index, used at relocation time.  */
+    size_t bpo_index;
+
+    /* We don't have access to the bfd_link_info struct in
+       mmix_final_link_relocate.  What we really want to get at is the
+       global single struct greg_relocation, so we stash it here.  */
+    asection *bpo_greg_section;
+  };
+
+/* Helper struct (in global context) for the one below.
+   There's one of these created for every BPO reloc.  */
+struct bpo_reloc_request
+  {
+    bfd_vma value;
+
+    /* Valid after relaxation.  The base is 0; the first register number
+       must be added.  The offset is in range 0..255.  */
+    size_t regindex;
+    size_t offset;
+
+    /* The order number for this BPO reloc, corresponding to the order in
+       which BPO relocs were found.  Used to create an index after reloc
+       requests are sorted.  */
+    size_t bpo_reloc_no;
+
+    /* Set when the value is computed.  Better than coding "guard values"
+       into the other members.  Is FALSE only for BPO relocs in a GC:ed
+       section.  */
+    bfd_boolean valid;
+  };
+
+/* We attach this as mmix_elf_section_data (sec)->bpo in the linker-allocated
+   greg contents section (MMIX_LD_ALLOCATED_REG_CONTENTS_SECTION_NAME),
+   which is linked into the register contents section
+   (MMIX_REG_CONTENTS_SECTION_NAME).  This section is created by the
+   linker; using the same hook as for usual with BPO relocs does not
+   collide.  */
+struct bpo_greg_section_info
+  {
+    /* After GC, this reflects the number of remaining, non-excluded
+       BPO-relocs.  */
+    size_t n_bpo_relocs;
+
+    /* This is the number of allocated bpo_reloc_requests; the size of
+       sorted_indexes.  Valid after the check.*relocs functions are called
+       for all incoming sections.  It includes the number of BPO relocs in
+       sections that were GC:ed.  */
+    size_t n_max_bpo_relocs;
+
+    /* A counter used to find out when to fold the BPO gregs, since we
+       don't have a single "after-relaxation" hook.  */
+    size_t n_remaining_bpo_relocs_this_relaxation_round;
+
+    /* The number of linker-allocated GREGs resulting from BPO relocs.
+       This is an approximation after _bfd_mmix_before_linker_allocation
+       and supposedly accurate after mmix_elf_relax_section is called for
+       all incoming non-collected sections.  */
+    size_t n_allocated_bpo_gregs;
+
+    /* Index into reloc_request[], sorted on increasing "value", secondary
+       by increasing index for strict sorting order.  */
+    size_t *bpo_reloc_indexes;
+
+    /* An array of all relocations, with the "value" member filled in by
+       the relaxation function.  */
+    struct bpo_reloc_request *reloc_request;
+  };
+
+static int mmix_elf_link_output_symbol_hook
+  PARAMS ((struct bfd_link_info *, const char *, Elf_Internal_Sym *,
+	   asection *, struct elf_link_hash_entry *));
+
+static bfd_reloc_status_type mmix_elf_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+
+static reloc_howto_type *bfd_elf64_bfd_reloc_type_lookup
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
+
+static void mmix_info_to_howto_rela
+  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
+
+static int mmix_elf_sort_relocs PARAMS ((const PTR, const PTR));
+
+static bfd_boolean mmix_elf_new_section_hook
+  PARAMS ((bfd *, asection *));
+
+static bfd_boolean mmix_elf_check_relocs
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+	   const Elf_Internal_Rela *));
+
+static bfd_boolean mmix_elf_check_common_relocs
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+	   const Elf_Internal_Rela *));
+
+static bfd_boolean mmix_elf_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
+
+static bfd_reloc_status_type mmix_final_link_relocate
+  (reloc_howto_type *, asection *, bfd_byte *, bfd_vma, bfd_signed_vma,
+   bfd_vma, const char *, asection *, char **);
+
+static bfd_reloc_status_type mmix_elf_perform_relocation
+  (asection *, reloc_howto_type *, void *, bfd_vma, bfd_vma, char **);
+
+static bfd_boolean mmix_elf_section_from_bfd_section
+  PARAMS ((bfd *, asection *, int *));
+
+static bfd_boolean mmix_elf_add_symbol_hook
+  PARAMS ((bfd *, struct bfd_link_info *, Elf_Internal_Sym *,
+	   const char **, flagword *, asection **, bfd_vma *));
+
+static bfd_boolean mmix_elf_is_local_label_name
+  PARAMS ((bfd *, const char *));
+
+static int bpo_reloc_request_sort_fn PARAMS ((const PTR, const PTR));
+
+static bfd_boolean mmix_elf_relax_section
+  PARAMS ((bfd *abfd, asection *sec, struct bfd_link_info *link_info,
+	   bfd_boolean *again));
+
+extern bfd_boolean mmix_elf_final_link PARAMS ((bfd *, struct bfd_link_info *));
+
+extern void mmix_elf_symbol_processing PARAMS ((bfd *, asymbol *));
+
+/* Only intended to be called from a debugger.  */
+extern void mmix_dump_bpo_gregs
+  PARAMS ((struct bfd_link_info *, bfd_error_handler_type));
+
+static void
+mmix_set_relaxable_size
+  PARAMS ((bfd *, asection *, void *));
+
+
+/* Watch out: this currently needs to have elements with the same index as
+   their R_MMIX_ number.  */
+static reloc_howto_type elf_mmix_howto_table[] =
+ {
+  /* This reloc does nothing.  */
+  HOWTO (R_MMIX_NONE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MMIX_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An 8 bit absolute relocation.  */
+  HOWTO (R_MMIX_8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MMIX_8",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An 16 bit absolute relocation.  */
+  HOWTO (R_MMIX_16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MMIX_16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An 24 bit absolute relocation.  */
+  HOWTO (R_MMIX_24,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MMIX_24",		/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0xffffff,		/* src_mask */
+	 0xffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 32 bit absolute relocation.  */
+  HOWTO (R_MMIX_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MMIX_32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 64 bit relocation.  */
+  HOWTO (R_MMIX_64,		/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MMIX_64",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An 8 bit PC-relative relocation.  */
+  HOWTO (R_MMIX_PC_8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MMIX_PC_8",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* An 16 bit PC-relative relocation.  */
+  HOWTO (R_MMIX_PC_16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MMIX_PC_16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* An 24 bit PC-relative relocation.  */
+  HOWTO (R_MMIX_PC_24,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 24,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MMIX_PC_24",	/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0xffffff,		/* src_mask */
+	 0xffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 32 bit absolute PC-relative relocation.  */
+  HOWTO (R_MMIX_PC_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MMIX_PC_32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 64 bit PC-relative relocation.  */
+  HOWTO (R_MMIX_PC_64,		/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MMIX_PC_64",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_MMIX_GNU_VTINHERIT, /* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_MMIX_GNU_VTINHERIT", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage.  */
+  HOWTO (R_MMIX_GNU_VTENTRY,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_elf_rel_vtable_reloc_fn,	/* special_function */
+	 "R_MMIX_GNU_VTENTRY", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The GETA relocation is supposed to get any address that could
+     possibly be reached by the GETA instruction.  It can silently expand
+     to get a 64-bit operand, but will complain if any of the two least
+     significant bits are set.  The howto members reflect a simple GETA.  */
+  HOWTO (R_MMIX_GETA,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 19,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_GETA",		/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0x0100ffff,		/* src_mask */
+	 0x0100ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MMIX_GETA_1,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 19,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_GETA_1",		/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0x0100ffff,		/* src_mask */
+	 0x0100ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MMIX_GETA_2,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 19,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_GETA_2",		/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0x0100ffff,		/* src_mask */
+	 0x0100ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MMIX_GETA_3,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 19,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_GETA_3",		/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0x0100ffff,		/* src_mask */
+	 0x0100ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* The conditional branches are supposed to reach any (code) address.
+     It can silently expand to a 64-bit operand, but will emit an error if
+     any of the two least significant bits are set.  The howto members
+     reflect a simple branch.  */
+  HOWTO (R_MMIX_CBRANCH,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 19,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_CBRANCH",	/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0x0100ffff,		/* src_mask */
+	 0x0100ffff,		/* dst_mask */
+	 TRUE),		       	/* pcrel_offset */
+
+  HOWTO (R_MMIX_CBRANCH_J,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 19,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_CBRANCH_J",	/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0x0100ffff,		/* src_mask */
+	 0x0100ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MMIX_CBRANCH_1,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 19,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_CBRANCH_1",	/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0x0100ffff,		/* src_mask */
+	 0x0100ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MMIX_CBRANCH_2,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 19,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_CBRANCH_2",	/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0x0100ffff,		/* src_mask */
+	 0x0100ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MMIX_CBRANCH_3,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 19,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_CBRANCH_3",	/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0x0100ffff,		/* src_mask */
+	 0x0100ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* The PUSHJ instruction can reach any (code) address, as long as it's
+     the beginning of a function (no usable restriction).  It can silently
+     expand to a 64-bit operand, but will emit an error if any of the two
+     least significant bits are set.  It can also expand into a call to a
+     stub; see R_MMIX_PUSHJ_STUBBABLE.  The howto members reflect a simple
+     PUSHJ.  */
+  HOWTO (R_MMIX_PUSHJ,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 19,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_PUSHJ",	/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0x0100ffff,		/* src_mask */
+	 0x0100ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MMIX_PUSHJ_1,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 19,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_PUSHJ_1",	/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0x0100ffff,		/* src_mask */
+	 0x0100ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MMIX_PUSHJ_2,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 19,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_PUSHJ_2",	/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0x0100ffff,		/* src_mask */
+	 0x0100ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MMIX_PUSHJ_3,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 19,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_PUSHJ_3",	/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0x0100ffff,		/* src_mask */
+	 0x0100ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A JMP is supposed to reach any (code) address.  By itself, it can
+     reach +-64M; the expansion can reach all 64 bits.  Note that the 64M
+     limit is soon reached if you link the program in wildly different
+     memory segments.  The howto members reflect a trivial JMP.  */
+  HOWTO (R_MMIX_JMP,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 27,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_JMP",		/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0x1ffffff,		/* src_mask */
+	 0x1ffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MMIX_JMP_1,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 27,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_JMP_1",	/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0x1ffffff,		/* src_mask */
+	 0x1ffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MMIX_JMP_2,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 27,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_JMP_2",	/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0x1ffffff,		/* src_mask */
+	 0x1ffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MMIX_JMP_3,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 27,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_JMP_3",	/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0x1ffffff,		/* src_mask */
+	 0x1ffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* When we don't emit link-time-relaxable code from the assembler, or
+     when relaxation has done all it can do, these relocs are used.  For
+     GETA/PUSHJ/branches.  */
+  HOWTO (R_MMIX_ADDR19,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 19,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_ADDR19",	/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0x0100ffff,		/* src_mask */
+	 0x0100ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* For JMP.  */
+  HOWTO (R_MMIX_ADDR27,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 27,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_ADDR27",	/* name */
+	 FALSE,			/* partial_inplace */
+	 ~0x1ffffff,		/* src_mask */
+	 0x1ffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A general register or the value 0..255.  If a value, then the
+     instruction (offset -3) needs adjusting.  */
+  HOWTO (R_MMIX_REG_OR_BYTE,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_REG_OR_BYTE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A general register.  */
+  HOWTO (R_MMIX_REG,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_REG",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A register plus an index, corresponding to the relocation expression.
+     The sizes must correspond to the valid range of the expression, while
+     the bitmasks correspond to what we store in the image.  */
+  HOWTO (R_MMIX_BASE_PLUS_OFFSET,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_BASE_PLUS_OFFSET", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A "magic" relocation for a LOCAL expression, asserting that the
+     expression is less than the number of global registers.  No actual
+     modification of the contents is done.  Implementing this as a
+     relocation was less intrusive than e.g. putting such expressions in a
+     section to discard *after* relocation.  */
+  HOWTO (R_MMIX_LOCAL,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_LOCAL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MMIX_PUSHJ_STUBBABLE, /* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 19,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mmix_elf_reloc,	/* special_function */
+	 "R_MMIX_PUSHJ_STUBBABLE", /* name */
+	 FALSE,			/* partial_inplace */
+	 ~0x0100ffff,		/* src_mask */
+	 0x0100ffff,		/* dst_mask */
+	 TRUE)			/* pcrel_offset */
+ };
+
+
+/* Map BFD reloc types to MMIX ELF reloc types.  */
+
+struct mmix_reloc_map
+  {
+    bfd_reloc_code_real_type bfd_reloc_val;
+    enum elf_mmix_reloc_type elf_reloc_val;
+  };
+
+
+static const struct mmix_reloc_map mmix_reloc_map[] =
+  {
+    {BFD_RELOC_NONE, R_MMIX_NONE},
+    {BFD_RELOC_8, R_MMIX_8},
+    {BFD_RELOC_16, R_MMIX_16},
+    {BFD_RELOC_24, R_MMIX_24},
+    {BFD_RELOC_32, R_MMIX_32},
+    {BFD_RELOC_64, R_MMIX_64},
+    {BFD_RELOC_8_PCREL, R_MMIX_PC_8},
+    {BFD_RELOC_16_PCREL, R_MMIX_PC_16},
+    {BFD_RELOC_24_PCREL, R_MMIX_PC_24},
+    {BFD_RELOC_32_PCREL, R_MMIX_PC_32},
+    {BFD_RELOC_64_PCREL, R_MMIX_PC_64},
+    {BFD_RELOC_VTABLE_INHERIT, R_MMIX_GNU_VTINHERIT},
+    {BFD_RELOC_VTABLE_ENTRY, R_MMIX_GNU_VTENTRY},
+    {BFD_RELOC_MMIX_GETA, R_MMIX_GETA},
+    {BFD_RELOC_MMIX_CBRANCH, R_MMIX_CBRANCH},
+    {BFD_RELOC_MMIX_PUSHJ, R_MMIX_PUSHJ},
+    {BFD_RELOC_MMIX_JMP, R_MMIX_JMP},
+    {BFD_RELOC_MMIX_ADDR19, R_MMIX_ADDR19},
+    {BFD_RELOC_MMIX_ADDR27, R_MMIX_ADDR27},
+    {BFD_RELOC_MMIX_REG_OR_BYTE, R_MMIX_REG_OR_BYTE},
+    {BFD_RELOC_MMIX_REG, R_MMIX_REG},
+    {BFD_RELOC_MMIX_BASE_PLUS_OFFSET, R_MMIX_BASE_PLUS_OFFSET},
+    {BFD_RELOC_MMIX_LOCAL, R_MMIX_LOCAL},
+    {BFD_RELOC_MMIX_PUSHJ_STUBBABLE, R_MMIX_PUSHJ_STUBBABLE}
+  };
+
+static reloc_howto_type *
+bfd_elf64_bfd_reloc_type_lookup (abfd, code)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     bfd_reloc_code_real_type code;
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (mmix_reloc_map) / sizeof (mmix_reloc_map[0]);
+       i++)
+    {
+      if (mmix_reloc_map[i].bfd_reloc_val == code)
+	return &elf_mmix_howto_table[mmix_reloc_map[i].elf_reloc_val];
+    }
+
+  return NULL;
+}
+
+static reloc_howto_type *
+bfd_elf64_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (elf_mmix_howto_table) / sizeof (elf_mmix_howto_table[0]);
+       i++)
+    if (elf_mmix_howto_table[i].name != NULL
+	&& strcasecmp (elf_mmix_howto_table[i].name, r_name) == 0)
+      return &elf_mmix_howto_table[i];
+
+  return NULL;
+}
+
+static bfd_boolean
+mmix_elf_new_section_hook (abfd, sec)
+     bfd *abfd;
+     asection *sec;
+{
+  if (!sec->used_by_bfd)
+    {
+      struct _mmix_elf_section_data *sdata;
+      bfd_size_type amt = sizeof (*sdata);
+
+      sdata = bfd_zalloc (abfd, amt);
+      if (sdata == NULL)
+	return FALSE;
+      sec->used_by_bfd = sdata;
+    }
+
+  return _bfd_elf_new_section_hook (abfd, sec);
+}
+
+
+/* This function performs the actual bitfiddling and sanity check for a
+   final relocation.  Each relocation gets its *worst*-case expansion
+   in size when it arrives here; any reduction in size should have been
+   caught in linker relaxation earlier.  When we get here, the relocation
+   looks like the smallest instruction with SWYM:s (nop:s) appended to the
+   max size.  We fill in those nop:s.
+
+   R_MMIX_GETA: (FIXME: Relaxation should break this up in 1, 2, 3 tetra)
+    GETA $N,foo
+   ->
+    SETL $N,foo & 0xffff
+    INCML $N,(foo >> 16) & 0xffff
+    INCMH $N,(foo >> 32) & 0xffff
+    INCH $N,(foo >> 48) & 0xffff
+
+   R_MMIX_CBRANCH: (FIXME: Relaxation should break this up, but
+   condbranches needing relaxation might be rare enough to not be
+   worthwhile.)
+    [P]Bcc $N,foo
+   ->
+    [~P]B~cc $N,.+20
+    SETL $255,foo & ...
+    INCML ...
+    INCMH ...
+    INCH ...
+    GO $255,$255,0
+
+   R_MMIX_PUSHJ: (FIXME: Relaxation...)
+    PUSHJ $N,foo
+   ->
+    SETL $255,foo & ...
+    INCML ...
+    INCMH ...
+    INCH ...
+    PUSHGO $N,$255,0
+
+   R_MMIX_JMP: (FIXME: Relaxation...)
+    JMP foo
+   ->
+    SETL $255,foo & ...
+    INCML ...
+    INCMH ...
+    INCH ...
+    GO $255,$255,0
+
+   R_MMIX_ADDR19 and R_MMIX_ADDR27 are just filled in.  */
+
+static bfd_reloc_status_type
+mmix_elf_perform_relocation (asection *isec, reloc_howto_type *howto,
+			     void *datap, bfd_vma addr, bfd_vma value,
+			     char **error_message)
+{
+  bfd *abfd = isec->owner;
+  bfd_reloc_status_type flag = bfd_reloc_ok;
+  bfd_reloc_status_type r;
+  int offs = 0;
+  int reg = 255;
+
+  /* The worst case bits are all similar SETL/INCML/INCMH/INCH sequences.
+     We handle the differences here and the common sequence later.  */
+  switch (howto->type)
+    {
+    case R_MMIX_GETA:
+      offs = 0;
+      reg = bfd_get_8 (abfd, (bfd_byte *) datap + 1);
+
+      /* We change to an absolute value.  */
+      value += addr;
+      break;
+
+    case R_MMIX_CBRANCH:
+      {
+	int in1 = bfd_get_16 (abfd, (bfd_byte *) datap) << 16;
+
+	/* Invert the condition and prediction bit, and set the offset
+	   to five instructions ahead.
+
+	   We *can* do better if we want to.  If the branch is found to be
+	   within limits, we could leave the branch as is; there'll just
+	   be a bunch of NOP:s after it.  But we shouldn't see this
+	   sequence often enough that it's worth doing it.  */
+
+	bfd_put_32 (abfd,
+		    (((in1 ^ ((PRED_INV_BIT | COND_INV_BIT) << 24)) & ~0xffff)
+		     | (24/4)),
+		    (bfd_byte *) datap);
+
+	/* Put a "GO $255,$255,0" after the common sequence.  */
+	bfd_put_32 (abfd,
+		    ((GO_INSN_BYTE | IMM_OFFSET_BIT) << 24) | 0xffff00,
+		    (bfd_byte *) datap + 20);
+
+	/* Common sequence starts at offset 4.  */
+	offs = 4;
+
+	/* We change to an absolute value.  */
+	value += addr;
+      }
+      break;
+
+    case R_MMIX_PUSHJ_STUBBABLE:
+      /* If the address fits, we're fine.  */
+      if ((value & 3) == 0
+	  /* Note rightshift 0; see R_MMIX_JMP case below.  */
+	  && (r = bfd_check_overflow (complain_overflow_signed,
+				      howto->bitsize,
+				      0,
+				      bfd_arch_bits_per_address (abfd),
+				      value)) == bfd_reloc_ok)
+	goto pcrel_mmix_reloc_fits;
+      else
+	{
+	  bfd_size_type size = isec->rawsize ? isec->rawsize : isec->size;
+
+	  /* We have the bytes at the PUSHJ insn and need to get the
+	     position for the stub.  There's supposed to be room allocated
+	     for the stub.  */
+	  bfd_byte *stubcontents
+	    = ((bfd_byte *) datap
+	       - (addr - (isec->output_section->vma + isec->output_offset))
+	       + size
+	       + mmix_elf_section_data (isec)->pjs.stub_offset);
+	  bfd_vma stubaddr;
+
+	  if (mmix_elf_section_data (isec)->pjs.n_pushj_relocs == 0)
+	    {
+	      /* This shouldn't happen when linking to ELF or mmo, so
+		 this is an attempt to link to "binary", right?  We
+		 can't access the output bfd, so we can't verify that
+		 assumption.  We only know that the critical
+		 mmix_elf_check_common_relocs has not been called,
+		 which happens when the output format is different
+		 from the input format (and is not mmo).  */
+	      if (! mmix_elf_section_data (isec)->has_warned_pushj)
+		{
+		  /* For the first such error per input section, produce
+		     a verbose message.  */
+		  *error_message
+		    = _("invalid input relocation when producing"
+			" non-ELF, non-mmo format output."
+			"\n Please use the objcopy program to convert from"
+			" ELF or mmo,"
+			"\n or assemble using"
+			" \"-no-expand\" (for gcc, \"-Wa,-no-expand\"");
+		  mmix_elf_section_data (isec)->has_warned_pushj = TRUE;
+		  return bfd_reloc_dangerous;
+		}
+
+	      /* For subsequent errors, return this one, which is
+		 rate-limited but looks a little bit different,
+		 hopefully without affecting user-friendliness.  */
+	      return bfd_reloc_overflow;
+	    }
+
+	  /* The address doesn't fit, so redirect the PUSHJ to the
+	     location of the stub.  */
+	  r = mmix_elf_perform_relocation (isec,
+					   &elf_mmix_howto_table
+					   [R_MMIX_ADDR19],
+					   datap,
+					   addr,
+					   isec->output_section->vma
+					   + isec->output_offset
+					   + size
+					   + (mmix_elf_section_data (isec)
+					      ->pjs.stub_offset)
+					   - addr,
+					   error_message);
+	  if (r != bfd_reloc_ok)
+	    return r;
+
+	  stubaddr
+	    = (isec->output_section->vma
+	       + isec->output_offset
+	       + size
+	       + mmix_elf_section_data (isec)->pjs.stub_offset);
+
+	  /* We generate a simple JMP if that suffices, else the whole 5
+	     insn stub.  */
+	  if (bfd_check_overflow (complain_overflow_signed,
+				  elf_mmix_howto_table[R_MMIX_ADDR27].bitsize,
+				  0,
+				  bfd_arch_bits_per_address (abfd),
+				  addr + value - stubaddr) == bfd_reloc_ok)
+	    {
+	      bfd_put_32 (abfd, JMP_INSN_BYTE << 24, stubcontents);
+	      r = mmix_elf_perform_relocation (isec,
+					       &elf_mmix_howto_table
+					       [R_MMIX_ADDR27],
+					       stubcontents,
+					       stubaddr,
+					       value + addr - stubaddr,
+					       error_message);
+	      mmix_elf_section_data (isec)->pjs.stub_offset += 4;
+
+	      if (size + mmix_elf_section_data (isec)->pjs.stub_offset
+		  > isec->size)
+		abort ();
+
+	      return r;
+	    }
+	  else
+	    {
+	      /* Put a "GO $255,0" after the common sequence.  */
+	      bfd_put_32 (abfd,
+			  ((GO_INSN_BYTE | IMM_OFFSET_BIT) << 24)
+			  | 0xff00, (bfd_byte *) stubcontents + 16);
+
+	      /* Prepare for the general code to set the first part of the
+		 linker stub, and */
+	      value += addr;
+	      datap = stubcontents;
+	      mmix_elf_section_data (isec)->pjs.stub_offset
+		+= MAX_PUSHJ_STUB_SIZE;
+	    }
+	}
+      break;
+
+    case R_MMIX_PUSHJ:
+      {
+	int inreg = bfd_get_8 (abfd, (bfd_byte *) datap + 1);
+
+	/* Put a "PUSHGO $N,$255,0" after the common sequence.  */
+	bfd_put_32 (abfd,
+		    ((PUSHGO_INSN_BYTE | IMM_OFFSET_BIT) << 24)
+		    | (inreg << 16)
+		    | 0xff00,
+		    (bfd_byte *) datap + 16);
+
+	/* We change to an absolute value.  */
+	value += addr;
+      }
+      break;
+
+    case R_MMIX_JMP:
+      /* This one is a little special.  If we get here on a non-relaxing
+	 link, and the destination is actually in range, we don't need to
+	 execute the nops.
+	 If so, we fall through to the bit-fiddling relocs.
+
+	 FIXME: bfd_check_overflow seems broken; the relocation is
+	 rightshifted before testing, so supply a zero rightshift.  */
+
+      if (! ((value & 3) == 0
+	     && (r = bfd_check_overflow (complain_overflow_signed,
+					 howto->bitsize,
+					 0,
+					 bfd_arch_bits_per_address (abfd),
+					 value)) == bfd_reloc_ok))
+	{
+	  /* If the relocation doesn't fit in a JMP, we let the NOP:s be
+	     modified below, and put a "GO $255,$255,0" after the
+	     address-loading sequence.  */
+	  bfd_put_32 (abfd,
+		      ((GO_INSN_BYTE | IMM_OFFSET_BIT) << 24)
+		      | 0xffff00,
+		      (bfd_byte *) datap + 16);
+
+	  /* We change to an absolute value.  */
+	  value += addr;
+	  break;
+	}
+      /* FALLTHROUGH.  */
+    case R_MMIX_ADDR19:
+    case R_MMIX_ADDR27:
+    pcrel_mmix_reloc_fits:
+      /* These must be in range, or else we emit an error.  */
+      if ((value & 3) == 0
+	  /* Note rightshift 0; see above.  */
+	  && (r = bfd_check_overflow (complain_overflow_signed,
+				      howto->bitsize,
+				      0,
+				      bfd_arch_bits_per_address (abfd),
+				      value)) == bfd_reloc_ok)
+	{
+	  bfd_vma in1
+	    = bfd_get_32 (abfd, (bfd_byte *) datap);
+	  bfd_vma highbit;
+
+	  if ((bfd_signed_vma) value < 0)
+	    {
+	      highbit = 1 << 24;
+	      value += (1 << (howto->bitsize - 1));
+	    }
+	  else
+	    highbit = 0;
+
+	  value >>= 2;
+
+	  bfd_put_32 (abfd,
+		      (in1 & howto->src_mask)
+		      | highbit
+		      | (value & howto->dst_mask),
+		      (bfd_byte *) datap);
+
+	  return bfd_reloc_ok;
+	}
+      else
+	return bfd_reloc_overflow;
+
+    case R_MMIX_BASE_PLUS_OFFSET:
+      {
+	struct bpo_reloc_section_info *bpodata
+	  = mmix_elf_section_data (isec)->bpo.reloc;
+	asection *bpo_greg_section;
+	struct bpo_greg_section_info *gregdata;
+	size_t bpo_index;
+
+	if (bpodata == NULL)
+	  {
+	    /* This shouldn't happen when linking to ELF or mmo, so
+	       this is an attempt to link to "binary", right?  We
+	       can't access the output bfd, so we can't verify that
+	       assumption.  We only know that the critical
+	       mmix_elf_check_common_relocs has not been called, which
+	       happens when the output format is different from the
+	       input format (and is not mmo).  */
+	    if (! mmix_elf_section_data (isec)->has_warned_bpo)
+	      {
+		/* For the first such error per input section, produce
+		   a verbose message.  */
+		*error_message
+		  = _("invalid input relocation when producing"
+		      " non-ELF, non-mmo format output."
+		      "\n Please use the objcopy program to convert from"
+		      " ELF or mmo,"
+		      "\n or compile using the gcc-option"
+		      " \"-mno-base-addresses\".");
+		mmix_elf_section_data (isec)->has_warned_bpo = TRUE;
+		return bfd_reloc_dangerous;
+	      }
+
+	    /* For subsequent errors, return this one, which is
+	       rate-limited but looks a little bit different,
+	       hopefully without affecting user-friendliness.  */
+	    return bfd_reloc_overflow;
+	  }
+
+	bpo_greg_section = bpodata->bpo_greg_section;
+	gregdata = mmix_elf_section_data (bpo_greg_section)->bpo.greg;
+	bpo_index = gregdata->bpo_reloc_indexes[bpodata->bpo_index++];
+
+	/* A consistency check: The value we now have in "relocation" must
+	   be the same as the value we stored for that relocation.  It
+	   doesn't cost much, so can be left in at all times.  */
+	if (value != gregdata->reloc_request[bpo_index].value)
+	  {
+	    (*_bfd_error_handler)
+	      (_("%s: Internal inconsistency error for value for\n\
+ linker-allocated global register: linked: 0x%lx%08lx != relaxed: 0x%lx%08lx\n"),
+	       bfd_get_filename (isec->owner),
+	       (unsigned long) (value >> 32), (unsigned long) value,
+	       (unsigned long) (gregdata->reloc_request[bpo_index].value
+				>> 32),
+	       (unsigned long) gregdata->reloc_request[bpo_index].value);
+	    bfd_set_error (bfd_error_bad_value);
+	    return bfd_reloc_overflow;
+	  }
+
+	/* Then store the register number and offset for that register
+	   into datap and datap + 1 respectively.  */
+	bfd_put_8 (abfd,
+		   gregdata->reloc_request[bpo_index].regindex
+		   + bpo_greg_section->output_section->vma / 8,
+		   datap);
+	bfd_put_8 (abfd,
+		   gregdata->reloc_request[bpo_index].offset,
+		   ((unsigned char *) datap) + 1);
+	return bfd_reloc_ok;
+      }
+
+    case R_MMIX_REG_OR_BYTE:
+    case R_MMIX_REG:
+      if (value > 255)
+	return bfd_reloc_overflow;
+      bfd_put_8 (abfd, value, datap);
+      return bfd_reloc_ok;
+
+    default:
+      BAD_CASE (howto->type);
+    }
+
+  /* This code adds the common SETL/INCML/INCMH/INCH worst-case
+     sequence.  */
+
+  /* Lowest two bits must be 0.  We return bfd_reloc_overflow for
+     everything that looks strange.  */
+  if (value & 3)
+    flag = bfd_reloc_overflow;
+
+  bfd_put_32 (abfd,
+	      (SETL_INSN_BYTE << 24) | (value & 0xffff) | (reg << 16),
+	      (bfd_byte *) datap + offs);
+  bfd_put_32 (abfd,
+	      (INCML_INSN_BYTE << 24) | ((value >> 16) & 0xffff) | (reg << 16),
+	      (bfd_byte *) datap + offs + 4);
+  bfd_put_32 (abfd,
+	      (INCMH_INSN_BYTE << 24) | ((value >> 32) & 0xffff) | (reg << 16),
+	      (bfd_byte *) datap + offs + 8);
+  bfd_put_32 (abfd,
+	      (INCH_INSN_BYTE << 24) | ((value >> 48) & 0xffff) | (reg << 16),
+	      (bfd_byte *) datap + offs + 12);
+
+  return flag;
+}
+
+/* Set the howto pointer for an MMIX ELF reloc (type RELA).  */
+
+static void
+mmix_info_to_howto_rela (abfd, cache_ptr, dst)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *cache_ptr;
+     Elf_Internal_Rela *dst;
+{
+  unsigned int r_type;
+
+  r_type = ELF64_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_MMIX_max);
+  cache_ptr->howto = &elf_mmix_howto_table[r_type];
+}
+
+/* Any MMIX-specific relocation gets here at assembly time or when linking
+   to other formats (such as mmo); this is the relocation function from
+   the reloc_table.  We don't get here for final pure ELF linking.  */
+
+static bfd_reloc_status_type
+mmix_elf_reloc (abfd, reloc_entry, symbol, data, input_section,
+		output_bfd, error_message)
+     bfd *abfd;
+     arelent *reloc_entry;
+     asymbol *symbol;
+     PTR data;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message;
+{
+  bfd_vma relocation;
+  bfd_reloc_status_type r;
+  asection *reloc_target_output_section;
+  bfd_reloc_status_type flag = bfd_reloc_ok;
+  bfd_vma output_base = 0;
+
+  r = bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+			     input_section, output_bfd, error_message);
+
+  /* If that was all that was needed (i.e. this isn't a final link, only
+     some segment adjustments), we're done.  */
+  if (r != bfd_reloc_continue)
+    return r;
+
+  if (bfd_is_und_section (symbol->section)
+      && (symbol->flags & BSF_WEAK) == 0
+      && output_bfd == (bfd *) NULL)
+    return bfd_reloc_undefined;
+
+  /* Is the address of the relocation really within the section?  */
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  /* Work out which section the relocation is targeted at and the
+     initial relocation command value.  */
+
+  /* Get symbol value.  (Common symbols are special.)  */
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  reloc_target_output_section = bfd_get_output_section (symbol);
+
+  /* Here the variable relocation holds the final address of the symbol we
+     are relocating against, plus any addend.  */
+  if (output_bfd)
+    output_base = 0;
+  else
+    output_base = reloc_target_output_section->vma;
+
+  relocation += output_base + symbol->section->output_offset;
+
+  if (output_bfd != (bfd *) NULL)
+    {
+      /* Add in supplied addend.  */
+      relocation += reloc_entry->addend;
+
+      /* This is a partial relocation, and we want to apply the
+	 relocation to the reloc entry rather than the raw data.
+	 Modify the reloc inplace to reflect what we now know.  */
+      reloc_entry->addend = relocation;
+      reloc_entry->address += input_section->output_offset;
+      return flag;
+    }
+
+  return mmix_final_link_relocate (reloc_entry->howto, input_section,
+				   data, reloc_entry->address,
+				   reloc_entry->addend, relocation,
+				   bfd_asymbol_name (symbol),
+				   reloc_target_output_section,
+				   error_message);
+}
+
+/* Relocate an MMIX ELF section.  Modified from elf32-fr30.c; look to it
+   for guidance if you're thinking of copying this.  */
+
+static bfd_boolean
+mmix_elf_relocate_section (output_bfd, info, input_bfd, input_section,
+			   contents, relocs, local_syms, local_sections)
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     Elf_Internal_Rela *relocs;
+     Elf_Internal_Sym *local_syms;
+     asection **local_sections;
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  bfd_size_type size;
+  size_t pjsno = 0;
+
+  size = input_section->rawsize ? input_section->rawsize : input_section->size;
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+  relend = relocs + input_section->reloc_count;
+
+  /* Zero the stub area before we start.  */
+  if (input_section->rawsize != 0
+      && input_section->size > input_section->rawsize)
+    memset (contents + input_section->rawsize, 0,
+	    input_section->size - input_section->rawsize);
+
+  for (rel = relocs; rel < relend; rel ++)
+    {
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+      const char *name = NULL;
+      int r_type;
+      bfd_boolean undefined_signalled = FALSE;
+
+      r_type = ELF64_R_TYPE (rel->r_info);
+
+      if (r_type == R_MMIX_GNU_VTINHERIT
+	  || r_type == R_MMIX_GNU_VTENTRY)
+	continue;
+
+      r_symndx = ELF64_R_SYM (rel->r_info);
+
+      howto = elf_mmix_howto_table + ELF64_R_TYPE (rel->r_info);
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections [r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+
+	  name = bfd_elf_string_from_elf_section (input_bfd,
+						  symtab_hdr->sh_link,
+						  sym->st_name);
+	  if (name == NULL)
+	    name = bfd_section_name (input_bfd, sec);
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, undefined_signalled);
+	  name = h->root.root.string;
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	{
+	  /* This is a relocatable link.  For most relocs we don't have to
+	     change anything, unless the reloc is against a section
+	     symbol, in which case we have to adjust according to where
+	     the section symbol winds up in the output section.  */
+	  if (sym != NULL && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+	    rel->r_addend += sec->output_offset;
+
+	  /* For PUSHJ stub relocs however, we may need to change the
+	     reloc and the section contents, if the reloc doesn't reach
+	     beyond the end of the output section and previous stubs.
+	     Then we change the section contents to be a PUSHJ to the end
+	     of the input section plus stubs (we can do that without using
+	     a reloc), and then we change the reloc to be a R_MMIX_PUSHJ
+	     at the stub location.  */
+	  if (r_type == R_MMIX_PUSHJ_STUBBABLE)
+	    {
+	      /* We've already checked whether we need a stub; use that
+		 knowledge.  */
+	      if (mmix_elf_section_data (input_section)->pjs.stub_size[pjsno]
+		  != 0)
+		{
+		  Elf_Internal_Rela relcpy;
+
+		  if (mmix_elf_section_data (input_section)
+		      ->pjs.stub_size[pjsno] != MAX_PUSHJ_STUB_SIZE)
+		    abort ();
+
+		  /* There's already a PUSHJ insn there, so just fill in
+		     the offset bits to the stub.  */
+		  if (mmix_final_link_relocate (elf_mmix_howto_table
+						+ R_MMIX_ADDR19,
+						input_section,
+						contents,
+						rel->r_offset,
+						0,
+						input_section
+						->output_section->vma
+						+ input_section->output_offset
+						+ size
+						+ mmix_elf_section_data (input_section)
+						->pjs.stub_offset,
+						NULL, NULL, NULL) != bfd_reloc_ok)
+		    return FALSE;
+
+		  /* Put a JMP insn at the stub; it goes with the
+		     R_MMIX_JMP reloc.  */
+		  bfd_put_32 (output_bfd, JMP_INSN_BYTE << 24,
+			      contents
+			      + size
+			      + mmix_elf_section_data (input_section)
+			      ->pjs.stub_offset);
+
+		  /* Change the reloc to be at the stub, and to a full
+		     R_MMIX_JMP reloc.  */
+		  rel->r_info = ELF64_R_INFO (r_symndx, R_MMIX_JMP);
+		  rel->r_offset
+		    = (size
+		       + mmix_elf_section_data (input_section)
+		       ->pjs.stub_offset);
+
+		  mmix_elf_section_data (input_section)->pjs.stub_offset
+		    += MAX_PUSHJ_STUB_SIZE;
+
+		  /* Shift this reloc to the end of the relocs to maintain
+		     the r_offset sorted reloc order.  */
+		  relcpy = *rel;
+		  memmove (rel, rel + 1, (char *) relend - (char *) rel);
+		  relend[-1] = relcpy;
+
+		  /* Back up one reloc, or else we'd skip the next reloc
+		   in turn.  */
+		  rel--;
+		}
+
+	      pjsno++;
+	    }
+	  continue;
+	}
+
+      r = mmix_final_link_relocate (howto, input_section,
+				    contents, rel->r_offset,
+				    rel->r_addend, relocation, name, sec, NULL);
+
+      if (r != bfd_reloc_ok)
+	{
+	  bfd_boolean check_ok = TRUE;
+	  const char * msg = (const char *) NULL;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      check_ok = info->callbacks->reloc_overflow
+		(info, (h ? &h->root : NULL), name, howto->name,
+		 (bfd_vma) 0, input_bfd, input_section, rel->r_offset);
+	      break;
+
+	    case bfd_reloc_undefined:
+	      /* We may have sent this message above.  */
+	      if (! undefined_signalled)
+		check_ok = info->callbacks->undefined_symbol
+		  (info, name, input_bfd, input_section, rel->r_offset,
+		   TRUE);
+	      undefined_signalled = TRUE;
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      break;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      break;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous relocation");
+	      break;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      break;
+	    }
+
+	  if (msg)
+	    check_ok = info->callbacks->warning
+	      (info, msg, name, input_bfd, input_section, rel->r_offset);
+
+	  if (! check_ok)
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Perform a single relocation.  By default we use the standard BFD
+   routines.  A few relocs we have to do ourselves.  */
+
+static bfd_reloc_status_type
+mmix_final_link_relocate (reloc_howto_type *howto, asection *input_section,
+			  bfd_byte *contents, bfd_vma r_offset,
+			  bfd_signed_vma r_addend, bfd_vma relocation,
+			  const char *symname, asection *symsec,
+			  char **error_message)
+{
+  bfd_reloc_status_type r = bfd_reloc_ok;
+  bfd_vma addr
+    = (input_section->output_section->vma
+       + input_section->output_offset
+       + r_offset);
+  bfd_signed_vma srel
+    = (bfd_signed_vma) relocation + r_addend;
+
+  switch (howto->type)
+    {
+      /* All these are PC-relative.  */
+    case R_MMIX_PUSHJ_STUBBABLE:
+    case R_MMIX_PUSHJ:
+    case R_MMIX_CBRANCH:
+    case R_MMIX_ADDR19:
+    case R_MMIX_GETA:
+    case R_MMIX_ADDR27:
+    case R_MMIX_JMP:
+      contents += r_offset;
+
+      srel -= (input_section->output_section->vma
+	       + input_section->output_offset
+	       + r_offset);
+
+      r = mmix_elf_perform_relocation (input_section, howto, contents,
+				       addr, srel, error_message);
+      break;
+
+    case R_MMIX_BASE_PLUS_OFFSET:
+      if (symsec == NULL)
+	return bfd_reloc_undefined;
+
+      /* Check that we're not relocating against a register symbol.  */
+      if (strcmp (bfd_get_section_name (symsec->owner, symsec),
+		  MMIX_REG_CONTENTS_SECTION_NAME) == 0
+	  || strcmp (bfd_get_section_name (symsec->owner, symsec),
+		     MMIX_REG_SECTION_NAME) == 0)
+	{
+	  /* Note: This is separated out into two messages in order
+	     to ease the translation into other languages.  */
+	  if (symname == NULL || *symname == 0)
+	    (*_bfd_error_handler)
+	      (_("%s: base-plus-offset relocation against register symbol: (unknown) in %s"),
+	       bfd_get_filename (input_section->owner),
+	       bfd_get_section_name (symsec->owner, symsec));
+	  else
+	    (*_bfd_error_handler)
+	      (_("%s: base-plus-offset relocation against register symbol: %s in %s"),
+	       bfd_get_filename (input_section->owner), symname,
+	       bfd_get_section_name (symsec->owner, symsec));
+	  return bfd_reloc_overflow;
+	}
+      goto do_mmix_reloc;
+
+    case R_MMIX_REG_OR_BYTE:
+    case R_MMIX_REG:
+      /* For now, we handle these alike.  They must refer to an register
+	 symbol, which is either relative to the register section and in
+	 the range 0..255, or is in the register contents section with vma
+	 regno * 8.  */
+
+      /* FIXME: A better way to check for reg contents section?
+	 FIXME: Postpone section->scaling to mmix_elf_perform_relocation? */
+      if (symsec == NULL)
+	return bfd_reloc_undefined;
+
+      if (strcmp (bfd_get_section_name (symsec->owner, symsec),
+		  MMIX_REG_CONTENTS_SECTION_NAME) == 0)
+	{
+	  if ((srel & 7) != 0 || srel < 32*8 || srel > 255*8)
+	    {
+	      /* The bfd_reloc_outofrange return value, though intuitively
+		 a better value, will not get us an error.  */
+	      return bfd_reloc_overflow;
+	    }
+	  srel /= 8;
+	}
+      else if (strcmp (bfd_get_section_name (symsec->owner, symsec),
+		       MMIX_REG_SECTION_NAME) == 0)
+	{
+	  if (srel < 0 || srel > 255)
+	    /* The bfd_reloc_outofrange return value, though intuitively a
+	       better value, will not get us an error.  */
+	    return bfd_reloc_overflow;
+	}
+      else
+	{
+	  /* Note: This is separated out into two messages in order
+	     to ease the translation into other languages.  */
+	  if (symname == NULL || *symname == 0)
+	    (*_bfd_error_handler)
+	      (_("%s: register relocation against non-register symbol: (unknown) in %s"),
+	       bfd_get_filename (input_section->owner),
+	       bfd_get_section_name (symsec->owner, symsec));
+	  else
+	    (*_bfd_error_handler)
+	      (_("%s: register relocation against non-register symbol: %s in %s"),
+	       bfd_get_filename (input_section->owner), symname,
+	       bfd_get_section_name (symsec->owner, symsec));
+
+	  /* The bfd_reloc_outofrange return value, though intuitively a
+	     better value, will not get us an error.  */
+	  return bfd_reloc_overflow;
+	}
+    do_mmix_reloc:
+      contents += r_offset;
+      r = mmix_elf_perform_relocation (input_section, howto, contents,
+				       addr, srel, error_message);
+      break;
+
+    case R_MMIX_LOCAL:
+      /* This isn't a real relocation, it's just an assertion that the
+	 final relocation value corresponds to a local register.  We
+	 ignore the actual relocation; nothing is changed.  */
+      {
+	asection *regsec
+	  = bfd_get_section_by_name (input_section->output_section->owner,
+				     MMIX_REG_CONTENTS_SECTION_NAME);
+	bfd_vma first_global;
+
+	/* Check that this is an absolute value, or a reference to the
+	   register contents section or the register (symbol) section.
+	   Absolute numbers can get here as undefined section.  Undefined
+	   symbols are signalled elsewhere, so there's no conflict in us
+	   accidentally handling it.  */
+	if (!bfd_is_abs_section (symsec)
+	    && !bfd_is_und_section (symsec)
+	    && strcmp (bfd_get_section_name (symsec->owner, symsec),
+		       MMIX_REG_CONTENTS_SECTION_NAME) != 0
+	    && strcmp (bfd_get_section_name (symsec->owner, symsec),
+		       MMIX_REG_SECTION_NAME) != 0)
+	{
+	  (*_bfd_error_handler)
+	    (_("%s: directive LOCAL valid only with a register or absolute value"),
+	     bfd_get_filename (input_section->owner));
+
+	  return bfd_reloc_overflow;
+	}
+
+      /* If we don't have a register contents section, then $255 is the
+	 first global register.  */
+      if (regsec == NULL)
+	first_global = 255;
+      else
+	{
+	  first_global = bfd_get_section_vma (abfd, regsec) / 8;
+	  if (strcmp (bfd_get_section_name (symsec->owner, symsec),
+		      MMIX_REG_CONTENTS_SECTION_NAME) == 0)
+	    {
+	      if ((srel & 7) != 0 || srel < 32*8 || srel > 255*8)
+		/* The bfd_reloc_outofrange return value, though
+		   intuitively a better value, will not get us an error.  */
+		return bfd_reloc_overflow;
+	      srel /= 8;
+	    }
+	}
+
+	if ((bfd_vma) srel >= first_global)
+	  {
+	    /* FIXME: Better error message.  */
+	    (*_bfd_error_handler)
+	      (_("%s: LOCAL directive: Register $%ld is not a local register.  First global register is $%ld."),
+	       bfd_get_filename (input_section->owner), (long) srel, (long) first_global);
+
+	    return bfd_reloc_overflow;
+	  }
+      }
+      r = bfd_reloc_ok;
+      break;
+
+    default:
+      r = _bfd_final_link_relocate (howto, input_section->owner, input_section,
+				    contents, r_offset,
+				    relocation, r_addend);
+    }
+
+  return r;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+static asection *
+mmix_elf_gc_mark_hook (asection *sec,
+		       struct bfd_link_info *info,
+		       Elf_Internal_Rela *rel,
+		       struct elf_link_hash_entry *h,
+		       Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF64_R_TYPE (rel->r_info))
+      {
+      case R_MMIX_GNU_VTINHERIT:
+      case R_MMIX_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Update relocation info for a GC-excluded section.  We could supposedly
+   perform the allocation after GC, but there's no suitable hook between
+   GC (or section merge) and the point when all input sections must be
+   present.  Better to waste some memory and (perhaps) a little time.  */
+
+static bfd_boolean
+mmix_elf_gc_sweep_hook (bfd *abfd ATTRIBUTE_UNUSED,
+			struct bfd_link_info *info ATTRIBUTE_UNUSED,
+			asection *sec,
+			const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED)
+{
+  struct bpo_reloc_section_info *bpodata
+    = mmix_elf_section_data (sec)->bpo.reloc;
+  asection *allocated_gregs_section;
+
+  /* If no bpodata here, we have nothing to do.  */
+  if (bpodata == NULL)
+    return TRUE;
+
+  allocated_gregs_section = bpodata->bpo_greg_section;
+
+  mmix_elf_section_data (allocated_gregs_section)->bpo.greg->n_bpo_relocs
+    -= bpodata->n_bpo_relocs_this_section;
+
+  return TRUE;
+}
+
+/* Sort register relocs to come before expanding relocs.  */
+
+static int
+mmix_elf_sort_relocs (p1, p2)
+     const PTR p1;
+     const PTR p2;
+{
+  const Elf_Internal_Rela *r1 = (const Elf_Internal_Rela *) p1;
+  const Elf_Internal_Rela *r2 = (const Elf_Internal_Rela *) p2;
+  int r1_is_reg, r2_is_reg;
+
+  /* Sort primarily on r_offset & ~3, so relocs are done to consecutive
+     insns.  */
+  if ((r1->r_offset & ~(bfd_vma) 3) > (r2->r_offset & ~(bfd_vma) 3))
+    return 1;
+  else if ((r1->r_offset & ~(bfd_vma) 3) < (r2->r_offset & ~(bfd_vma) 3))
+    return -1;
+
+  r1_is_reg
+    = (ELF64_R_TYPE (r1->r_info) == R_MMIX_REG_OR_BYTE
+       || ELF64_R_TYPE (r1->r_info) == R_MMIX_REG);
+  r2_is_reg
+    = (ELF64_R_TYPE (r2->r_info) == R_MMIX_REG_OR_BYTE
+       || ELF64_R_TYPE (r2->r_info) == R_MMIX_REG);
+  if (r1_is_reg != r2_is_reg)
+    return r2_is_reg - r1_is_reg;
+
+  /* Neither or both are register relocs.  Then sort on full offset.  */
+  if (r1->r_offset > r2->r_offset)
+    return 1;
+  else if (r1->r_offset < r2->r_offset)
+    return -1;
+  return 0;
+}
+
+/* Subset of mmix_elf_check_relocs, common to ELF and mmo linking.  */
+
+static bfd_boolean
+mmix_elf_check_common_relocs  (abfd, info, sec, relocs)
+     bfd *abfd;
+     struct bfd_link_info *info;
+     asection *sec;
+     const Elf_Internal_Rela *relocs;
+{
+  bfd *bpo_greg_owner = NULL;
+  asection *allocated_gregs_section = NULL;
+  struct bpo_greg_section_info *gregdata = NULL;
+  struct bpo_reloc_section_info *bpodata = NULL;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+
+  /* We currently have to abuse this COFF-specific member, since there's
+     no target-machine-dedicated member.  There's no alternative outside
+     the bfd_link_info struct; we can't specialize a hash-table since
+     they're different between ELF and mmo.  */
+  bpo_greg_owner = (bfd *) info->base_file;
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      switch (ELF64_R_TYPE (rel->r_info))
+        {
+	  /* This relocation causes a GREG allocation.  We need to count
+	     them, and we need to create a section for them, so we need an
+	     object to fake as the owner of that section.  We can't use
+	     the ELF dynobj for this, since the ELF bits assume lots of
+	     DSO-related stuff if that member is non-NULL.  */
+	case R_MMIX_BASE_PLUS_OFFSET:
+	  /* We don't do anything with this reloc for a relocatable link.  */
+	  if (info->relocatable)
+	    break;
+
+	  if (bpo_greg_owner == NULL)
+	    {
+	      bpo_greg_owner = abfd;
+	      info->base_file = (PTR) bpo_greg_owner;
+	    }
+
+	  if (allocated_gregs_section == NULL)
+	    allocated_gregs_section
+	      = bfd_get_section_by_name (bpo_greg_owner,
+					 MMIX_LD_ALLOCATED_REG_CONTENTS_SECTION_NAME);
+
+	  if (allocated_gregs_section == NULL)
+	    {
+	      allocated_gregs_section
+		= bfd_make_section_with_flags (bpo_greg_owner,
+					       MMIX_LD_ALLOCATED_REG_CONTENTS_SECTION_NAME,
+					       (SEC_HAS_CONTENTS
+						| SEC_IN_MEMORY
+						| SEC_LINKER_CREATED));
+	      /* Setting both SEC_ALLOC and SEC_LOAD means the section is
+		 treated like any other section, and we'd get errors for
+		 address overlap with the text section.  Let's set none of
+		 those flags, as that is what currently happens for usual
+		 GREG allocations, and that works.  */
+	      if (allocated_gregs_section == NULL
+		  || !bfd_set_section_alignment (bpo_greg_owner,
+						 allocated_gregs_section,
+						 3))
+		return FALSE;
+
+	      gregdata = (struct bpo_greg_section_info *)
+		bfd_zalloc (bpo_greg_owner, sizeof (struct bpo_greg_section_info));
+	      if (gregdata == NULL)
+		return FALSE;
+	      mmix_elf_section_data (allocated_gregs_section)->bpo.greg
+		= gregdata;
+	    }
+	  else if (gregdata == NULL)
+	    gregdata
+	      = mmix_elf_section_data (allocated_gregs_section)->bpo.greg;
+
+	  /* Get ourselves some auxiliary info for the BPO-relocs.  */
+	  if (bpodata == NULL)
+	    {
+	      /* No use doing a separate iteration pass to find the upper
+		 limit - just use the number of relocs.  */
+	      bpodata = (struct bpo_reloc_section_info *)
+		bfd_alloc (bpo_greg_owner,
+			   sizeof (struct bpo_reloc_section_info)
+			   * (sec->reloc_count + 1));
+	      if (bpodata == NULL)
+		return FALSE;
+	      mmix_elf_section_data (sec)->bpo.reloc = bpodata;
+	      bpodata->first_base_plus_offset_reloc
+		= bpodata->bpo_index
+		= gregdata->n_max_bpo_relocs;
+	      bpodata->bpo_greg_section
+		= allocated_gregs_section;
+	      bpodata->n_bpo_relocs_this_section = 0;
+	    }
+
+	  bpodata->n_bpo_relocs_this_section++;
+	  gregdata->n_max_bpo_relocs++;
+
+	  /* We don't get another chance to set this before GC; we've not
+	     set up any hook that runs before GC.  */
+	  gregdata->n_bpo_relocs
+	    = gregdata->n_max_bpo_relocs;
+	  break;
+
+	case R_MMIX_PUSHJ_STUBBABLE:
+	  mmix_elf_section_data (sec)->pjs.n_pushj_relocs++;
+	  break;
+	}
+    }
+
+  /* Allocate per-reloc stub storage and initialize it to the max stub
+     size.  */
+  if (mmix_elf_section_data (sec)->pjs.n_pushj_relocs != 0)
+    {
+      size_t i;
+
+      mmix_elf_section_data (sec)->pjs.stub_size
+	= bfd_alloc (abfd, mmix_elf_section_data (sec)->pjs.n_pushj_relocs
+		     * sizeof (mmix_elf_section_data (sec)
+			       ->pjs.stub_size[0]));
+      if (mmix_elf_section_data (sec)->pjs.stub_size == NULL)
+	return FALSE;
+
+      for (i = 0; i < mmix_elf_section_data (sec)->pjs.n_pushj_relocs; i++)
+	mmix_elf_section_data (sec)->pjs.stub_size[i] = MAX_PUSHJ_STUB_SIZE;
+    }
+
+  return TRUE;
+}
+
+/* Look through the relocs for a section during the first phase.  */
+
+static bfd_boolean
+mmix_elf_check_relocs (abfd, info, sec, relocs)
+     bfd *abfd;
+     struct bfd_link_info *info;
+     asection *sec;
+     const Elf_Internal_Rela *relocs;
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  /* First we sort the relocs so that any register relocs come before
+     expansion-relocs to the same insn.  FIXME: Not done for mmo.  */
+  qsort ((PTR) relocs, sec->reloc_count, sizeof (Elf_Internal_Rela),
+	 mmix_elf_sort_relocs);
+
+  /* Do the common part.  */
+  if (!mmix_elf_check_common_relocs (abfd, info, sec, relocs))
+    return FALSE;
+
+  if (info->relocatable)
+    return TRUE;
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+
+      r_symndx = ELF64_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+        h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      switch (ELF64_R_TYPE (rel->r_info))
+	{
+        /* This relocation describes the C++ object vtable hierarchy.
+           Reconstruct it for later use during GC.  */
+        case R_MMIX_GNU_VTINHERIT:
+          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+
+        /* This relocation describes which C++ vtable entries are actually
+           used.  Record for later use during GC.  */
+        case R_MMIX_GNU_VTENTRY:
+          BFD_ASSERT (h != NULL);
+          if (h != NULL
+              && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+            return FALSE;
+          break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Wrapper for mmix_elf_check_common_relocs, called when linking to mmo.
+   Copied from elf_link_add_object_symbols.  */
+
+bfd_boolean
+_bfd_mmix_check_all_relocs (abfd, info)
+     bfd *abfd;
+     struct bfd_link_info *info;
+{
+  asection *o;
+
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      Elf_Internal_Rela *internal_relocs;
+      bfd_boolean ok;
+
+      if ((o->flags & SEC_RELOC) == 0
+	  || o->reloc_count == 0
+	  || ((info->strip == strip_all || info->strip == strip_debugger)
+	      && (o->flags & SEC_DEBUGGING) != 0)
+	  || bfd_is_abs_section (o->output_section))
+	continue;
+
+      internal_relocs
+	= _bfd_elf_link_read_relocs (abfd, o, (PTR) NULL,
+				     (Elf_Internal_Rela *) NULL,
+				     info->keep_memory);
+      if (internal_relocs == NULL)
+	return FALSE;
+
+      ok = mmix_elf_check_common_relocs (abfd, info, o, internal_relocs);
+
+      if (! info->keep_memory)
+	free (internal_relocs);
+
+      if (! ok)
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Change symbols relative to the reg contents section to instead be to
+   the register section, and scale them down to correspond to the register
+   number.  */
+
+static int
+mmix_elf_link_output_symbol_hook (info, name, sym, input_sec, h)
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+     const char *name ATTRIBUTE_UNUSED;
+     Elf_Internal_Sym *sym;
+     asection *input_sec;
+     struct elf_link_hash_entry *h ATTRIBUTE_UNUSED;
+{
+  if (input_sec != NULL
+      && input_sec->name != NULL
+      && ELF_ST_TYPE (sym->st_info) != STT_SECTION
+      && strcmp (input_sec->name, MMIX_REG_CONTENTS_SECTION_NAME) == 0)
+    {
+      sym->st_value /= 8;
+      sym->st_shndx = SHN_REGISTER;
+    }
+
+  return 1;
+}
+
+/* We fake a register section that holds values that are register numbers.
+   Having a SHN_REGISTER and register section translates better to other
+   formats (e.g. mmo) than for example a STT_REGISTER attribute.
+   This section faking is based on a construct in elf32-mips.c.  */
+static asection mmix_elf_reg_section;
+static asymbol mmix_elf_reg_section_symbol;
+static asymbol *mmix_elf_reg_section_symbol_ptr;
+
+/* Handle the special section numbers that a symbol may use.  */
+
+void
+mmix_elf_symbol_processing (abfd, asym)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     asymbol *asym;
+{
+  elf_symbol_type *elfsym;
+
+  elfsym = (elf_symbol_type *) asym;
+  switch (elfsym->internal_elf_sym.st_shndx)
+    {
+    case SHN_REGISTER:
+      if (mmix_elf_reg_section.name == NULL)
+	{
+	  /* Initialize the register section.  */
+	  mmix_elf_reg_section.name = MMIX_REG_SECTION_NAME;
+	  mmix_elf_reg_section.flags = SEC_NO_FLAGS;
+	  mmix_elf_reg_section.output_section = &mmix_elf_reg_section;
+	  mmix_elf_reg_section.symbol = &mmix_elf_reg_section_symbol;
+	  mmix_elf_reg_section.symbol_ptr_ptr = &mmix_elf_reg_section_symbol_ptr;
+	  mmix_elf_reg_section_symbol.name = MMIX_REG_SECTION_NAME;
+	  mmix_elf_reg_section_symbol.flags = BSF_SECTION_SYM;
+	  mmix_elf_reg_section_symbol.section = &mmix_elf_reg_section;
+	  mmix_elf_reg_section_symbol_ptr = &mmix_elf_reg_section_symbol;
+	}
+      asym->section = &mmix_elf_reg_section;
+      break;
+
+    default:
+      break;
+    }
+}
+
+/* Given a BFD section, try to locate the corresponding ELF section
+   index.  */
+
+static bfd_boolean
+mmix_elf_section_from_bfd_section (abfd, sec, retval)
+     bfd *                 abfd ATTRIBUTE_UNUSED;
+     asection *            sec;
+     int *                 retval;
+{
+  if (strcmp (bfd_get_section_name (abfd, sec), MMIX_REG_SECTION_NAME) == 0)
+    *retval = SHN_REGISTER;
+  else
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Hook called by the linker routine which adds symbols from an object
+   file.  We must handle the special SHN_REGISTER section number here.
+
+   We also check that we only have *one* each of the section-start
+   symbols, since otherwise having two with the same value would cause
+   them to be "merged", but with the contents serialized.  */
+
+bfd_boolean
+mmix_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
+     bfd *abfd;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+     Elf_Internal_Sym *sym;
+     const char **namep ATTRIBUTE_UNUSED;
+     flagword *flagsp ATTRIBUTE_UNUSED;
+     asection **secp;
+     bfd_vma *valp ATTRIBUTE_UNUSED;
+{
+  if (sym->st_shndx == SHN_REGISTER)
+    {
+      *secp = bfd_make_section_old_way (abfd, MMIX_REG_SECTION_NAME);
+      (*secp)->flags |= SEC_LINKER_CREATED;
+    }
+  else if ((*namep)[0] == '_' && (*namep)[1] == '_' && (*namep)[2] == '.'
+	   && CONST_STRNEQ (*namep, MMIX_LOC_SECTION_START_SYMBOL_PREFIX))
+    {
+      /* See if we have another one.  */
+      struct bfd_link_hash_entry *h = bfd_link_hash_lookup (info->hash,
+							    *namep,
+							    FALSE,
+							    FALSE,
+							    FALSE);
+
+      if (h != NULL && h->type != bfd_link_hash_undefined)
+	{
+	  /* How do we get the asymbol (or really: the filename) from h?
+	     h->u.def.section->owner is NULL.  */
+	  ((*_bfd_error_handler)
+	   (_("%s: Error: multiple definition of `%s'; start of %s is set in a earlier linked file\n"),
+	    bfd_get_filename (abfd), *namep,
+	    *namep + strlen (MMIX_LOC_SECTION_START_SYMBOL_PREFIX)));
+	   bfd_set_error (bfd_error_bad_value);
+	   return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* We consider symbols matching "L.*:[0-9]+" to be local symbols.  */
+
+bfd_boolean
+mmix_elf_is_local_label_name (abfd, name)
+     bfd *abfd;
+     const char *name;
+{
+  const char *colpos;
+  int digits;
+
+  /* Also include the default local-label definition.  */
+  if (_bfd_elf_is_local_label_name (abfd, name))
+    return TRUE;
+
+  if (*name != 'L')
+    return FALSE;
+
+  /* If there's no ":", or more than one, it's not a local symbol.  */
+  colpos = strchr (name, ':');
+  if (colpos == NULL || strchr (colpos + 1, ':') != NULL)
+    return FALSE;
+
+  /* Check that there are remaining characters and that they are digits.  */
+  if (colpos[1] == 0)
+    return FALSE;
+
+  digits = strspn (colpos + 1, "0123456789");
+  return digits != 0 && colpos[1 + digits] == 0;
+}
+
+/* We get rid of the register section here.  */
+
+bfd_boolean
+mmix_elf_final_link (abfd, info)
+     bfd *abfd;
+     struct bfd_link_info *info;
+{
+  /* We never output a register section, though we create one for
+     temporary measures.  Check that nobody entered contents into it.  */
+  asection *reg_section;
+
+  reg_section = bfd_get_section_by_name (abfd, MMIX_REG_SECTION_NAME);
+
+  if (reg_section != NULL)
+    {
+      /* FIXME: Pass error state gracefully.  */
+      if (bfd_get_section_flags (abfd, reg_section) & SEC_HAS_CONTENTS)
+	_bfd_abort (__FILE__, __LINE__, _("Register section has contents\n"));
+
+      /* Really remove the section, if it hasn't already been done.  */
+      if (!bfd_section_removed_from_list (abfd, reg_section))
+	{
+	  bfd_section_list_remove (abfd, reg_section);
+	  --abfd->section_count;
+	}
+    }
+
+  if (! bfd_elf_final_link (abfd, info))
+    return FALSE;
+
+  /* Since this section is marked SEC_LINKER_CREATED, it isn't output by
+     the regular linker machinery.  We do it here, like other targets with
+     special sections.  */
+  if (info->base_file != NULL)
+    {
+      asection *greg_section
+	= bfd_get_section_by_name ((bfd *) info->base_file,
+				   MMIX_LD_ALLOCATED_REG_CONTENTS_SECTION_NAME);
+      if (!bfd_set_section_contents (abfd,
+				     greg_section->output_section,
+				     greg_section->contents,
+				     (file_ptr) greg_section->output_offset,
+				     greg_section->size))
+	return FALSE;
+    }
+  return TRUE;
+}
+
+/* We need to include the maximum size of PUSHJ-stubs in the initial
+   section size.  This is expected to shrink during linker relaxation.  */
+
+static void
+mmix_set_relaxable_size (abfd, sec, ptr)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     asection *sec;
+     void *ptr;
+{
+  struct bfd_link_info *info = ptr;
+
+  /* Make sure we only do this for section where we know we want this,
+     otherwise we might end up resetting the size of COMMONs.  */
+  if (mmix_elf_section_data (sec)->pjs.n_pushj_relocs == 0)
+    return;
+
+  sec->rawsize = sec->size;
+  sec->size += (mmix_elf_section_data (sec)->pjs.n_pushj_relocs
+		* MAX_PUSHJ_STUB_SIZE);
+
+  /* For use in relocatable link, we start with a max stubs size.  See
+     mmix_elf_relax_section.  */
+  if (info->relocatable && sec->output_section)
+    mmix_elf_section_data (sec->output_section)->pjs.stubs_size_sum
+      += (mmix_elf_section_data (sec)->pjs.n_pushj_relocs
+	  * MAX_PUSHJ_STUB_SIZE);
+}
+
+/* Initialize stuff for the linker-generated GREGs to match
+   R_MMIX_BASE_PLUS_OFFSET relocs seen by the linker.  */
+
+bfd_boolean
+_bfd_mmix_before_linker_allocation (abfd, info)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info;
+{
+  asection *bpo_gregs_section;
+  bfd *bpo_greg_owner;
+  struct bpo_greg_section_info *gregdata;
+  size_t n_gregs;
+  bfd_vma gregs_size;
+  size_t i;
+  size_t *bpo_reloc_indexes;
+  bfd *ibfd;
+
+  /* Set the initial size of sections.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    bfd_map_over_sections (ibfd, mmix_set_relaxable_size, info);
+
+  /* The bpo_greg_owner bfd is supposed to have been set by
+     mmix_elf_check_relocs when the first R_MMIX_BASE_PLUS_OFFSET is seen.
+     If there is no such object, there was no R_MMIX_BASE_PLUS_OFFSET.  */
+  bpo_greg_owner = (bfd *) info->base_file;
+  if (bpo_greg_owner == NULL)
+    return TRUE;
+
+  bpo_gregs_section
+    = bfd_get_section_by_name (bpo_greg_owner,
+			       MMIX_LD_ALLOCATED_REG_CONTENTS_SECTION_NAME);
+
+  if (bpo_gregs_section == NULL)
+    return TRUE;
+
+  /* We use the target-data handle in the ELF section data.  */
+  gregdata = mmix_elf_section_data (bpo_gregs_section)->bpo.greg;
+  if (gregdata == NULL)
+    return FALSE;
+
+  n_gregs = gregdata->n_bpo_relocs;
+  gregdata->n_allocated_bpo_gregs = n_gregs;
+
+  /* When this reaches zero during relaxation, all entries have been
+     filled in and the size of the linker gregs can be calculated.  */
+  gregdata->n_remaining_bpo_relocs_this_relaxation_round = n_gregs;
+
+  /* Set the zeroth-order estimate for the GREGs size.  */
+  gregs_size = n_gregs * 8;
+
+  if (!bfd_set_section_size (bpo_greg_owner, bpo_gregs_section, gregs_size))
+    return FALSE;
+
+  /* Allocate and set up the GREG arrays.  They're filled in at relaxation
+     time.  Note that we must use the max number ever noted for the array,
+     since the index numbers were created before GC.  */
+  gregdata->reloc_request
+    = bfd_zalloc (bpo_greg_owner,
+		  sizeof (struct bpo_reloc_request)
+		  * gregdata->n_max_bpo_relocs);
+
+  gregdata->bpo_reloc_indexes
+    = bpo_reloc_indexes
+    = bfd_alloc (bpo_greg_owner,
+		 gregdata->n_max_bpo_relocs
+		 * sizeof (size_t));
+  if (bpo_reloc_indexes == NULL)
+    return FALSE;
+
+  /* The default order is an identity mapping.  */
+  for (i = 0; i < gregdata->n_max_bpo_relocs; i++)
+    {
+      bpo_reloc_indexes[i] = i;
+      gregdata->reloc_request[i].bpo_reloc_no = i;
+    }
+
+  return TRUE;
+}
+
+/* Fill in contents in the linker allocated gregs.  Everything is
+   calculated at this point; we just move the contents into place here.  */
+
+bfd_boolean
+_bfd_mmix_after_linker_allocation (abfd, link_info)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *link_info;
+{
+  asection *bpo_gregs_section;
+  bfd *bpo_greg_owner;
+  struct bpo_greg_section_info *gregdata;
+  size_t n_gregs;
+  size_t i, j;
+  size_t lastreg;
+  bfd_byte *contents;
+
+  /* The bpo_greg_owner bfd is supposed to have been set by mmix_elf_check_relocs
+     when the first R_MMIX_BASE_PLUS_OFFSET is seen.  If there is no such
+     object, there was no R_MMIX_BASE_PLUS_OFFSET.  */
+  bpo_greg_owner = (bfd *) link_info->base_file;
+  if (bpo_greg_owner == NULL)
+    return TRUE;
+
+  bpo_gregs_section
+    = bfd_get_section_by_name (bpo_greg_owner,
+			       MMIX_LD_ALLOCATED_REG_CONTENTS_SECTION_NAME);
+
+  /* This can't happen without DSO handling.  When DSOs are handled
+     without any R_MMIX_BASE_PLUS_OFFSET seen, there will be no such
+     section.  */
+  if (bpo_gregs_section == NULL)
+    return TRUE;
+
+  /* We use the target-data handle in the ELF section data.  */
+
+  gregdata = mmix_elf_section_data (bpo_gregs_section)->bpo.greg;
+  if (gregdata == NULL)
+    return FALSE;
+
+  n_gregs = gregdata->n_allocated_bpo_gregs;
+
+  bpo_gregs_section->contents
+    = contents = bfd_alloc (bpo_greg_owner, bpo_gregs_section->size);
+  if (contents == NULL)
+    return FALSE;
+
+  /* Sanity check: If these numbers mismatch, some relocation has not been
+     accounted for and the rest of gregdata is probably inconsistent.
+     It's a bug, but it's more helpful to identify it than segfaulting
+     below.  */
+  if (gregdata->n_remaining_bpo_relocs_this_relaxation_round
+      != gregdata->n_bpo_relocs)
+    {
+      (*_bfd_error_handler)
+	(_("Internal inconsistency: remaining %u != max %u.\n\
+  Please report this bug."),
+	 gregdata->n_remaining_bpo_relocs_this_relaxation_round,
+	 gregdata->n_bpo_relocs);
+      return FALSE;
+    }
+
+  for (lastreg = 255, i = 0, j = 0; j < n_gregs; i++)
+    if (gregdata->reloc_request[i].regindex != lastreg)
+      {
+	bfd_put_64 (bpo_greg_owner, gregdata->reloc_request[i].value,
+		    contents + j * 8);
+	lastreg = gregdata->reloc_request[i].regindex;
+	j++;
+      }
+
+  return TRUE;
+}
+
+/* Sort valid relocs to come before non-valid relocs, then on increasing
+   value.  */
+
+static int
+bpo_reloc_request_sort_fn (p1, p2)
+     const PTR p1;
+     const PTR p2;
+{
+  const struct bpo_reloc_request *r1 = (const struct bpo_reloc_request *) p1;
+  const struct bpo_reloc_request *r2 = (const struct bpo_reloc_request *) p2;
+
+  /* Primary function is validity; non-valid relocs sorted after valid
+     ones.  */
+  if (r1->valid != r2->valid)
+    return r2->valid - r1->valid;
+
+  /* Then sort on value.  Don't simplify and return just the difference of
+     the values: the upper bits of the 64-bit value would be truncated on
+     a host with 32-bit ints.  */
+  if (r1->value != r2->value)
+    return r1->value > r2->value ? 1 : -1;
+
+  /* As a last re-sort, use the relocation number, so we get a stable
+     sort.  The *addresses* aren't stable since items are swapped during
+     sorting.  It depends on the qsort implementation if this actually
+     happens.  */
+  return r1->bpo_reloc_no > r2->bpo_reloc_no
+    ? 1 : (r1->bpo_reloc_no < r2->bpo_reloc_no ? -1 : 0);
+}
+
+/* For debug use only.  Dumps the global register allocations resulting
+   from base-plus-offset relocs.  */
+
+void
+mmix_dump_bpo_gregs (link_info, pf)
+     struct bfd_link_info *link_info;
+     bfd_error_handler_type pf;
+{
+  bfd *bpo_greg_owner;
+  asection *bpo_gregs_section;
+  struct bpo_greg_section_info *gregdata;
+  unsigned int i;
+
+  if (link_info == NULL || link_info->base_file == NULL)
+    return;
+
+  bpo_greg_owner = (bfd *) link_info->base_file;
+
+  bpo_gregs_section
+    = bfd_get_section_by_name (bpo_greg_owner,
+			       MMIX_LD_ALLOCATED_REG_CONTENTS_SECTION_NAME);
+
+  if (bpo_gregs_section == NULL)
+    return;
+
+  gregdata = mmix_elf_section_data (bpo_gregs_section)->bpo.greg;
+  if (gregdata == NULL)
+    return;
+
+  if (pf == NULL)
+    pf = _bfd_error_handler;
+
+  /* These format strings are not translated.  They are for debug purposes
+     only and never displayed to an end user.  Should they escape, we
+     surely want them in original.  */
+  (*pf) (" n_bpo_relocs: %u\n n_max_bpo_relocs: %u\n n_remain...round: %u\n\
+ n_allocated_bpo_gregs: %u\n", gregdata->n_bpo_relocs,
+     gregdata->n_max_bpo_relocs,
+     gregdata->n_remaining_bpo_relocs_this_relaxation_round,
+     gregdata->n_allocated_bpo_gregs);
+
+  if (gregdata->reloc_request)
+    for (i = 0; i < gregdata->n_max_bpo_relocs; i++)
+      (*pf) ("%4u (%4u)/%4u#%u: 0x%08lx%08lx  r: %3u o: %3u\n",
+	     i,
+	     (gregdata->bpo_reloc_indexes != NULL
+	      ? gregdata->bpo_reloc_indexes[i] : (size_t) -1),
+	     gregdata->reloc_request[i].bpo_reloc_no,
+	     gregdata->reloc_request[i].valid,
+
+	     (unsigned long) (gregdata->reloc_request[i].value >> 32),
+	     (unsigned long) gregdata->reloc_request[i].value,
+	     gregdata->reloc_request[i].regindex,
+	     gregdata->reloc_request[i].offset);
+}
+
+/* This links all R_MMIX_BASE_PLUS_OFFSET relocs into a special array, and
+   when the last such reloc is done, an index-array is sorted according to
+   the values and iterated over to produce register numbers (indexed by 0
+   from the first allocated register number) and offsets for use in real
+   relocation.  (N.B.: Relocatable runs are handled, not just punted.)
+
+   PUSHJ stub accounting is also done here.
+
+   Symbol- and reloc-reading infrastructure copied from elf-m10200.c.  */
+
+static bfd_boolean
+mmix_elf_relax_section (abfd, sec, link_info, again)
+     bfd *abfd;
+     asection *sec;
+     struct bfd_link_info *link_info;
+     bfd_boolean *again;
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *internal_relocs;
+  Elf_Internal_Rela *irel, *irelend;
+  asection *bpo_gregs_section = NULL;
+  struct bpo_greg_section_info *gregdata;
+  struct bpo_reloc_section_info *bpodata
+    = mmix_elf_section_data (sec)->bpo.reloc;
+  /* The initialization is to quiet compiler warnings.  The value is to
+     spot a missing actual initialization.  */
+  size_t bpono = (size_t) -1;
+  size_t pjsno = 0;
+  Elf_Internal_Sym *isymbuf = NULL;
+  bfd_size_type size = sec->rawsize ? sec->rawsize : sec->size;
+
+  mmix_elf_section_data (sec)->pjs.stubs_size_sum = 0;
+
+  /* Assume nothing changes.  */
+  *again = FALSE;
+
+  /* We don't have to do anything if this section does not have relocs, or
+     if this is not a code section.  */
+  if ((sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0
+      || (sec->flags & SEC_CODE) == 0
+      || (sec->flags & SEC_LINKER_CREATED) != 0
+      /* If no R_MMIX_BASE_PLUS_OFFSET relocs and no PUSHJ-stub relocs,
+         then nothing to do.  */
+      || (bpodata == NULL
+	  && mmix_elf_section_data (sec)->pjs.n_pushj_relocs == 0))
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+
+  if (bpodata != NULL)
+    {
+      bpo_gregs_section = bpodata->bpo_greg_section;
+      gregdata = mmix_elf_section_data (bpo_gregs_section)->bpo.greg;
+      bpono = bpodata->first_base_plus_offset_reloc;
+    }
+  else
+    gregdata = NULL;
+
+  /* Get a copy of the native relocations.  */
+  internal_relocs
+    = _bfd_elf_link_read_relocs (abfd, sec, (PTR) NULL,
+				 (Elf_Internal_Rela *) NULL,
+				 link_info->keep_memory);
+  if (internal_relocs == NULL)
+    goto error_return;
+
+  /* Walk through them looking for relaxing opportunities.  */
+  irelend = internal_relocs + sec->reloc_count;
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      bfd_vma symval;
+      struct elf_link_hash_entry *h = NULL;
+
+      /* We only process two relocs.  */
+      if (ELF64_R_TYPE (irel->r_info) != (int) R_MMIX_BASE_PLUS_OFFSET
+	  && ELF64_R_TYPE (irel->r_info) != (int) R_MMIX_PUSHJ_STUBBABLE)
+	continue;
+
+      /* We process relocs in a distinctly different way when this is a
+	 relocatable link (for one, we don't look at symbols), so we avoid
+	 mixing its code with that for the "normal" relaxation.  */
+      if (link_info->relocatable)
+	{
+	  /* The only transformation in a relocatable link is to generate
+	     a full stub at the location of the stub calculated for the
+	     input section, if the relocated stub location, the end of the
+	     output section plus earlier stubs, cannot be reached.  Thus
+	     relocatable linking can only lead to worse code, but it still
+	     works.  */
+	  if (ELF64_R_TYPE (irel->r_info) == R_MMIX_PUSHJ_STUBBABLE)
+	    {
+	      /* If we can reach the end of the output-section and beyond
+		 any current stubs, then we don't need a stub for this
+		 reloc.  The relaxed order of output stub allocation may
+		 not exactly match the straightforward order, so we always
+		 assume presence of output stubs, which will allow
+		 relaxation only on relocations indifferent to the
+		 presence of output stub allocations for other relocations
+		 and thus the order of output stub allocation.  */
+	      if (bfd_check_overflow (complain_overflow_signed,
+				      19,
+				      0,
+				      bfd_arch_bits_per_address (abfd),
+				      /* Output-stub location.  */
+				      sec->output_section->rawsize
+				      + (mmix_elf_section_data (sec
+							       ->output_section)
+					 ->pjs.stubs_size_sum)
+				      /* Location of this PUSHJ reloc.  */
+				      - (sec->output_offset + irel->r_offset)
+				      /* Don't count *this* stub twice.  */
+				      - (mmix_elf_section_data (sec)
+					 ->pjs.stub_size[pjsno]
+					 + MAX_PUSHJ_STUB_SIZE))
+		  == bfd_reloc_ok)
+		mmix_elf_section_data (sec)->pjs.stub_size[pjsno] = 0;
+
+	      mmix_elf_section_data (sec)->pjs.stubs_size_sum
+		+= mmix_elf_section_data (sec)->pjs.stub_size[pjsno];
+
+	      pjsno++;
+	    }
+
+	  continue;
+	}
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      if (ELF64_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+	{
+	  /* A local symbol.  */
+	  Elf_Internal_Sym *isym;
+	  asection *sym_sec;
+
+	  /* Read this BFD's local symbols if we haven't already.  */
+	  if (isymbuf == NULL)
+	    {
+	      isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	      if (isymbuf == NULL)
+		isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+						symtab_hdr->sh_info, 0,
+						NULL, NULL, NULL);
+	      if (isymbuf == 0)
+		goto error_return;
+	    }
+
+	  isym = isymbuf + ELF64_R_SYM (irel->r_info);
+	  if (isym->st_shndx == SHN_UNDEF)
+	    sym_sec = bfd_und_section_ptr;
+	  else if (isym->st_shndx == SHN_ABS)
+	    sym_sec = bfd_abs_section_ptr;
+	  else if (isym->st_shndx == SHN_COMMON)
+	    sym_sec = bfd_com_section_ptr;
+	  else
+	    sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+	  symval = (isym->st_value
+		    + sym_sec->output_section->vma
+		    + sym_sec->output_offset);
+	}
+      else
+	{
+	  unsigned long indx;
+
+	  /* An external symbol.  */
+	  indx = ELF64_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+	  h = elf_sym_hashes (abfd)[indx];
+	  BFD_ASSERT (h != NULL);
+	  if (h->root.type != bfd_link_hash_defined
+	      && h->root.type != bfd_link_hash_defweak)
+	    {
+	      /* This appears to be a reference to an undefined symbol.  Just
+		 ignore it--it will be caught by the regular reloc processing.
+		 We need to keep BPO reloc accounting consistent, though
+		 else we'll abort instead of emitting an error message.  */
+	      if (ELF64_R_TYPE (irel->r_info) == R_MMIX_BASE_PLUS_OFFSET
+		  && gregdata != NULL)
+		{
+		  gregdata->n_remaining_bpo_relocs_this_relaxation_round--;
+		  bpono++;
+		}
+	      continue;
+	    }
+
+	  symval = (h->root.u.def.value
+		    + h->root.u.def.section->output_section->vma
+		    + h->root.u.def.section->output_offset);
+	}
+
+      if (ELF64_R_TYPE (irel->r_info) == (int) R_MMIX_PUSHJ_STUBBABLE)
+	{
+	  bfd_vma value = symval + irel->r_addend;
+	  bfd_vma dot
+	    = (sec->output_section->vma
+	       + sec->output_offset
+	       + irel->r_offset);
+	  bfd_vma stubaddr
+	    = (sec->output_section->vma
+	       + sec->output_offset
+	       + size
+	       + mmix_elf_section_data (sec)->pjs.stubs_size_sum);
+
+	  if ((value & 3) == 0
+	      && bfd_check_overflow (complain_overflow_signed,
+				     19,
+				     0,
+				     bfd_arch_bits_per_address (abfd),
+				     value - dot
+				     - (value > dot
+					? mmix_elf_section_data (sec)
+					->pjs.stub_size[pjsno]
+					: 0))
+	      == bfd_reloc_ok)
+	    /* If the reloc fits, no stub is needed.  */
+	    mmix_elf_section_data (sec)->pjs.stub_size[pjsno] = 0;
+	  else
+	    /* Maybe we can get away with just a JMP insn?  */
+	    if ((value & 3) == 0
+		&& bfd_check_overflow (complain_overflow_signed,
+				       27,
+				       0,
+				       bfd_arch_bits_per_address (abfd),
+				       value - stubaddr
+				       - (value > dot
+					  ? mmix_elf_section_data (sec)
+					  ->pjs.stub_size[pjsno] - 4
+					  : 0))
+		== bfd_reloc_ok)
+	      /* Yep, account for a stub consisting of a single JMP insn.  */
+	      mmix_elf_section_data (sec)->pjs.stub_size[pjsno] = 4;
+	  else
+	    /* Nope, go for the full insn stub.  It doesn't seem useful to
+	       emit the intermediate sizes; those will only be useful for
+	       a >64M program assuming contiguous code.  */
+	    mmix_elf_section_data (sec)->pjs.stub_size[pjsno]
+	      = MAX_PUSHJ_STUB_SIZE;
+
+	  mmix_elf_section_data (sec)->pjs.stubs_size_sum
+	    += mmix_elf_section_data (sec)->pjs.stub_size[pjsno];
+	  pjsno++;
+	  continue;
+	}
+
+      /* We're looking at a R_MMIX_BASE_PLUS_OFFSET reloc.  */
+
+      gregdata->reloc_request[gregdata->bpo_reloc_indexes[bpono]].value
+	= symval + irel->r_addend;
+      gregdata->reloc_request[gregdata->bpo_reloc_indexes[bpono++]].valid = TRUE;
+      gregdata->n_remaining_bpo_relocs_this_relaxation_round--;
+    }
+
+  /* Check if that was the last BPO-reloc.  If so, sort the values and
+     calculate how many registers we need to cover them.  Set the size of
+     the linker gregs, and if the number of registers changed, indicate
+     that we need to relax some more because we have more work to do.  */
+  if (gregdata != NULL
+      && gregdata->n_remaining_bpo_relocs_this_relaxation_round == 0)
+    {
+      size_t i;
+      bfd_vma prev_base;
+      size_t regindex;
+
+      /* First, reset the remaining relocs for the next round.  */
+      gregdata->n_remaining_bpo_relocs_this_relaxation_round
+	= gregdata->n_bpo_relocs;
+
+      qsort ((PTR) gregdata->reloc_request,
+	     gregdata->n_max_bpo_relocs,
+	     sizeof (struct bpo_reloc_request),
+	     bpo_reloc_request_sort_fn);
+
+      /* Recalculate indexes.  When we find a change (however unlikely
+	 after the initial iteration), we know we need to relax again,
+	 since items in the GREG-array are sorted by increasing value and
+	 stored in the relaxation phase.  */
+      for (i = 0; i < gregdata->n_max_bpo_relocs; i++)
+	if (gregdata->bpo_reloc_indexes[gregdata->reloc_request[i].bpo_reloc_no]
+	    != i)
+	  {
+	    gregdata->bpo_reloc_indexes[gregdata->reloc_request[i].bpo_reloc_no]
+	      = i;
+	    *again = TRUE;
+	  }
+
+      /* Allocate register numbers (indexing from 0).  Stop at the first
+	 non-valid reloc.  */
+      for (i = 0, regindex = 0, prev_base = gregdata->reloc_request[0].value;
+	   i < gregdata->n_bpo_relocs;
+	   i++)
+	{
+	  if (gregdata->reloc_request[i].value > prev_base + 255)
+	    {
+	      regindex++;
+	      prev_base = gregdata->reloc_request[i].value;
+	    }
+	  gregdata->reloc_request[i].regindex = regindex;
+	  gregdata->reloc_request[i].offset
+	    = gregdata->reloc_request[i].value - prev_base;
+	}
+
+      /* If it's not the same as the last time, we need to relax again,
+	 because the size of the section has changed.  I'm not sure we
+	 actually need to do any adjustments since the shrinking happens
+	 at the start of this section, but better safe than sorry.  */
+      if (gregdata->n_allocated_bpo_gregs != regindex + 1)
+	{
+	  gregdata->n_allocated_bpo_gregs = regindex + 1;
+	  *again = TRUE;
+	}
+
+      bpo_gregs_section->size = (regindex + 1) * 8;
+    }
+
+  if (isymbuf != NULL && (unsigned char *) isymbuf != symtab_hdr->contents)
+    {
+      if (! link_info->keep_memory)
+	free (isymbuf);
+      else
+	{
+	  /* Cache the symbols for elf_link_input_bfd.  */
+	  symtab_hdr->contents = (unsigned char *) isymbuf;
+	}
+    }
+
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  if (sec->size < size + mmix_elf_section_data (sec)->pjs.stubs_size_sum)
+    abort ();
+
+  if (sec->size > size + mmix_elf_section_data (sec)->pjs.stubs_size_sum)
+    {
+      sec->size = size + mmix_elf_section_data (sec)->pjs.stubs_size_sum;
+      *again = TRUE;
+    }
+
+  return TRUE;
+
+ error_return:
+  if (isymbuf != NULL && (unsigned char *) isymbuf != symtab_hdr->contents)
+    free (isymbuf);
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+  return FALSE;
+}
+
+#define ELF_ARCH		bfd_arch_mmix
+#define ELF_MACHINE_CODE 	EM_MMIX
+
+/* According to mmix-doc page 36 (paragraph 45), this should be (1LL << 48LL).
+   However, that's too much for something somewhere in the linker part of
+   BFD; perhaps the start-address has to be a non-zero multiple of this
+   number, or larger than this number.  The symptom is that the linker
+   complains: "warning: allocated section `.text' not in segment".  We
+   settle for 64k; the page-size used in examples is 8k.
+   #define ELF_MAXPAGESIZE 0x10000
+
+   Unfortunately, this causes excessive padding in the supposedly small
+   for-education programs that are the expected usage (where people would
+   inspect output).  We stick to 256 bytes just to have *some* default
+   alignment.  */
+#define ELF_MAXPAGESIZE 0x100
+
+#define TARGET_BIG_SYM		bfd_elf64_mmix_vec
+#define TARGET_BIG_NAME		"elf64-mmix"
+
+#define elf_info_to_howto_rel		NULL
+#define elf_info_to_howto		mmix_info_to_howto_rela
+#define elf_backend_relocate_section	mmix_elf_relocate_section
+#define elf_backend_gc_mark_hook	mmix_elf_gc_mark_hook
+#define elf_backend_gc_sweep_hook	mmix_elf_gc_sweep_hook
+
+#define elf_backend_link_output_symbol_hook \
+	mmix_elf_link_output_symbol_hook
+#define elf_backend_add_symbol_hook	mmix_elf_add_symbol_hook
+
+#define elf_backend_check_relocs	mmix_elf_check_relocs
+#define elf_backend_symbol_processing	mmix_elf_symbol_processing
+#define elf_backend_omit_section_dynsym \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true)
+
+#define bfd_elf64_bfd_is_local_label_name \
+	mmix_elf_is_local_label_name
+
+#define elf_backend_may_use_rel_p	0
+#define elf_backend_may_use_rela_p	1
+#define elf_backend_default_use_rela_p	1
+
+#define elf_backend_can_gc_sections	1
+#define elf_backend_section_from_bfd_section \
+	mmix_elf_section_from_bfd_section
+
+#define bfd_elf64_new_section_hook	mmix_elf_new_section_hook
+#define bfd_elf64_bfd_final_link	mmix_elf_final_link
+#define bfd_elf64_bfd_relax_section	mmix_elf_relax_section
+
+#include "elf64-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-ppc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-ppc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-ppc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-ppc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,13899 @@
+/* PowerPC64-specific support for 64-bit ELF.
+   Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+   2009, 2010, 2011 Free Software Foundation, Inc.
+   Written by Linus Nordberg, Swox AB <info@swox.com>,
+   based on elf32-ppc.c by Ian Lance Taylor.
+   Largely rewritten by Alan Modra.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+
+/* The 64-bit PowerPC ELF ABI may be found at
+   http://www.linuxbase.org/spec/ELF/ppc64/PPC-elf64abi.txt, and
+   http://www.linuxbase.org/spec/ELF/ppc64/spec/book1.html  */
+
+#include "sysdep.h"
+#include <stdarg.h>
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/ppc64.h"
+#include "elf64-ppc.h"
+#include "dwarf2.h"
+
+static bfd_reloc_status_type ppc64_elf_ha_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type ppc64_elf_branch_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type ppc64_elf_brtaken_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type ppc64_elf_sectoff_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type ppc64_elf_sectoff_ha_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type ppc64_elf_toc_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type ppc64_elf_toc_ha_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type ppc64_elf_toc64_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type ppc64_elf_unhandled_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_vma opd_entry_value
+  (asection *, bfd_vma, asection **, bfd_vma *);
+
+#define TARGET_LITTLE_SYM	bfd_elf64_powerpcle_vec
+#define TARGET_LITTLE_NAME	"elf64-powerpcle"
+#define TARGET_BIG_SYM		bfd_elf64_powerpc_vec
+#define TARGET_BIG_NAME		"elf64-powerpc"
+#define ELF_ARCH		bfd_arch_powerpc
+#define ELF_TARGET_ID		PPC64_ELF_DATA
+#define ELF_MACHINE_CODE	EM_PPC64
+#define ELF_MAXPAGESIZE		0x10000
+#define ELF_COMMONPAGESIZE	0x1000
+#define elf_info_to_howto	ppc64_elf_info_to_howto
+
+#define elf_backend_want_got_sym 0
+#define elf_backend_want_plt_sym 0
+#define elf_backend_plt_alignment 3
+#define elf_backend_plt_not_loaded 1
+#define elf_backend_got_header_size 8
+#define elf_backend_can_gc_sections 1
+#define elf_backend_can_refcount 1
+#define elf_backend_rela_normal 1
+#define elf_backend_default_execstack 0
+
+#define bfd_elf64_mkobject		      ppc64_elf_mkobject
+#define bfd_elf64_bfd_reloc_type_lookup	      ppc64_elf_reloc_type_lookup
+#define bfd_elf64_bfd_reloc_name_lookup	      ppc64_elf_reloc_name_lookup
+#define bfd_elf64_bfd_merge_private_bfd_data  _bfd_generic_verify_endian_match
+#define bfd_elf64_new_section_hook	      ppc64_elf_new_section_hook
+#define bfd_elf64_bfd_link_hash_table_create  ppc64_elf_link_hash_table_create
+#define bfd_elf64_bfd_link_hash_table_free    ppc64_elf_link_hash_table_free
+#define bfd_elf64_get_synthetic_symtab	      ppc64_elf_get_synthetic_symtab
+#define bfd_elf64_bfd_link_just_syms	      ppc64_elf_link_just_syms
+
+#define elf_backend_object_p		      ppc64_elf_object_p
+#define elf_backend_grok_prstatus	      ppc64_elf_grok_prstatus
+#define elf_backend_grok_psinfo		      ppc64_elf_grok_psinfo
+#define elf_backend_write_core_note	      ppc64_elf_write_core_note
+#define elf_backend_create_dynamic_sections   ppc64_elf_create_dynamic_sections
+#define elf_backend_copy_indirect_symbol      ppc64_elf_copy_indirect_symbol
+#define elf_backend_add_symbol_hook	      ppc64_elf_add_symbol_hook
+#define elf_backend_check_directives	      ppc64_elf_process_dot_syms
+#define elf_backend_as_needed_cleanup	      ppc64_elf_as_needed_cleanup
+#define elf_backend_archive_symbol_lookup     ppc64_elf_archive_symbol_lookup
+#define elf_backend_check_relocs	      ppc64_elf_check_relocs
+#define elf_backend_gc_keep		      ppc64_elf_gc_keep
+#define elf_backend_gc_mark_dynamic_ref       ppc64_elf_gc_mark_dynamic_ref
+#define elf_backend_gc_mark_hook	      ppc64_elf_gc_mark_hook
+#define elf_backend_gc_sweep_hook	      ppc64_elf_gc_sweep_hook
+#define elf_backend_adjust_dynamic_symbol     ppc64_elf_adjust_dynamic_symbol
+#define elf_backend_hide_symbol		      ppc64_elf_hide_symbol
+#define elf_backend_always_size_sections      ppc64_elf_func_desc_adjust
+#define elf_backend_size_dynamic_sections     ppc64_elf_size_dynamic_sections
+#define elf_backend_init_index_section	      _bfd_elf_init_2_index_sections
+#define elf_backend_action_discarded	      ppc64_elf_action_discarded
+#define elf_backend_relocate_section	      ppc64_elf_relocate_section
+#define elf_backend_finish_dynamic_symbol     ppc64_elf_finish_dynamic_symbol
+#define elf_backend_reloc_type_class	      ppc64_elf_reloc_type_class
+#define elf_backend_finish_dynamic_sections   ppc64_elf_finish_dynamic_sections
+#define elf_backend_link_output_symbol_hook   ppc64_elf_output_symbol_hook
+#define elf_backend_special_sections	      ppc64_elf_special_sections
+#define elf_backend_post_process_headers      _bfd_elf_set_osabi
+
+/* The name of the dynamic interpreter.  This is put in the .interp
+   section.  */
+#define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so.1"
+
+/* The size in bytes of an entry in the procedure linkage table.  */
+#define PLT_ENTRY_SIZE 24
+
+/* The initial size of the plt reserved for the dynamic linker.  */
+#define PLT_INITIAL_ENTRY_SIZE PLT_ENTRY_SIZE
+
+/* TOC base pointers offset from start of TOC.  */
+#define TOC_BASE_OFF	0x8000
+
+/* Offset of tp and dtp pointers from start of TLS block.  */
+#define TP_OFFSET	0x7000
+#define DTP_OFFSET	0x8000
+
+/* .plt call stub instructions.  The normal stub is like this, but
+   sometimes the .plt entry crosses a 64k boundary and we need to
+   insert an addi to adjust r12.  */
+#define PLT_CALL_STUB_SIZE (7*4)
+#define ADDIS_R12_R2	0x3d820000	/* addis %r12,%r2,xxx@ha     */
+#define STD_R2_40R1	0xf8410028	/* std	 %r2,40(%r1)	     */
+#define LD_R11_0R12	0xe96c0000	/* ld	 %r11,xxx+0@l(%r12)  */
+#define MTCTR_R11	0x7d6903a6	/* mtctr %r11		     */
+#define LD_R2_0R12	0xe84c0000	/* ld	 %r2,xxx+8@l(%r12)   */
+					/* ld	 %r11,xxx+16@l(%r12) */
+#define BCTR		0x4e800420	/* bctr			     */
+
+
+#define ADDIS_R12_R12	0x3d8c0000	/* addis %r12,%r12,off@ha  */
+#define ADDI_R12_R12	0x398c0000	/* addi %r12,%r12,off@l  */
+#define ADDIS_R2_R2	0x3c420000	/* addis %r2,%r2,off@ha  */
+#define ADDI_R2_R2	0x38420000	/* addi  %r2,%r2,off@l   */
+
+#define LD_R11_0R2	0xe9620000	/* ld	 %r11,xxx+0(%r2) */
+#define LD_R2_0R2	0xe8420000	/* ld	 %r2,xxx+0(%r2)  */
+
+#define LD_R2_40R1	0xe8410028	/* ld    %r2,40(%r1)     */
+
+/* glink call stub instructions.  We enter with the index in R0.  */
+#define GLINK_CALL_STUB_SIZE (16*4)
+					/* 0:				*/
+					/*  .quad plt0-1f		*/
+					/* __glink:			*/
+#define MFLR_R12	0x7d8802a6	/*  mflr %12			*/
+#define BCL_20_31	0x429f0005	/*  bcl 20,31,1f		*/
+					/* 1:				*/
+#define MFLR_R11	0x7d6802a6	/*  mflr %11			*/
+#define LD_R2_M16R11	0xe84bfff0	/*  ld %2,(0b-1b)(%11)		*/
+#define MTLR_R12	0x7d8803a6	/*  mtlr %12			*/
+#define ADD_R12_R2_R11	0x7d825a14	/*  add %12,%2,%11		*/
+					/*  ld %11,0(%12)		*/
+					/*  ld %2,8(%12)		*/
+					/*  mtctr %11			*/
+					/*  ld %11,16(%12)		*/
+					/*  bctr			*/
+
+/* Pad with this.  */
+#define NOP		0x60000000
+
+/* Some other nops.  */
+#define CROR_151515	0x4def7b82
+#define CROR_313131	0x4ffffb82
+
+/* .glink entries for the first 32k functions are two instructions.  */
+#define LI_R0_0		0x38000000	/* li    %r0,0		*/
+#define B_DOT		0x48000000	/* b     .		*/
+
+/* After that, we need two instructions to load the index, followed by
+   a branch.  */
+#define LIS_R0_0	0x3c000000	/* lis   %r0,0		*/
+#define ORI_R0_R0_0	0x60000000	/* ori	 %r0,%r0,0	*/
+
+/* Instructions used by the save and restore reg functions.  */
+#define STD_R0_0R1	0xf8010000	/* std   %r0,0(%r1)	*/
+#define STD_R0_0R12	0xf80c0000	/* std   %r0,0(%r12)	*/
+#define LD_R0_0R1	0xe8010000	/* ld    %r0,0(%r1)	*/
+#define LD_R0_0R12	0xe80c0000	/* ld    %r0,0(%r12)	*/
+#define STFD_FR0_0R1	0xd8010000	/* stfd  %fr0,0(%r1)	*/
+#define LFD_FR0_0R1	0xc8010000	/* lfd   %fr0,0(%r1)	*/
+#define LI_R12_0	0x39800000	/* li    %r12,0		*/
+#define STVX_VR0_R12_R0	0x7c0c01ce	/* stvx  %v0,%r12,%r0	*/
+#define LVX_VR0_R12_R0	0x7c0c00ce	/* lvx   %v0,%r12,%r0	*/
+#define MTLR_R0		0x7c0803a6	/* mtlr  %r0		*/
+#define BLR		0x4e800020	/* blr			*/
+
+/* Since .opd is an array of descriptors and each entry will end up
+   with identical R_PPC64_RELATIVE relocs, there is really no need to
+   propagate .opd relocs;  The dynamic linker should be taught to
+   relocate .opd without reloc entries.  */
+#ifndef NO_OPD_RELOCS
+#define NO_OPD_RELOCS 0
+#endif
+
+#define ONES(n) (((bfd_vma) 1 << ((n) - 1) << 1) - 1)
+
+/* Relocation HOWTO's.  */
+static reloc_howto_type *ppc64_elf_howto_table[(int) R_PPC64_max];
+
+static reloc_howto_type ppc64_elf_howto_raw[] = {
+  /* This reloc does nothing.  */
+  HOWTO (R_PPC64_NONE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_NONE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A standard 32 bit relocation.  */
+  HOWTO (R_PPC64_ADDR32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_ADDR32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An absolute 26 bit branch; the lower two bits must be zero.
+     FIXME: we don't check that, we just clear them.  */
+  HOWTO (R_PPC64_ADDR24,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_ADDR24",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x03fffffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A standard 16 bit relocation.  */
+  HOWTO (R_PPC64_ADDR16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_ADDR16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit relocation without overflow.  */
+  HOWTO (R_PPC64_ADDR16_LO,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_ADDR16_LO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Bits 16-31 of an address.  */
+  HOWTO (R_PPC64_ADDR16_HI,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_ADDR16_HI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Bits 16-31 of an address, plus 1 if the contents of the low 16
+     bits, treated as a signed number, is negative.  */
+  HOWTO (R_PPC64_ADDR16_HA,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_ha_reloc,	/* special_function */
+	 "R_PPC64_ADDR16_HA",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An absolute 16 bit branch; the lower two bits must be zero.
+     FIXME: we don't check that, we just clear them.  */
+  HOWTO (R_PPC64_ADDR14,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 ppc64_elf_branch_reloc, /* special_function */
+	 "R_PPC64_ADDR14",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000fffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An absolute 16 bit branch, for which bit 10 should be set to
+     indicate that the branch is expected to be taken.  The lower two
+     bits must be zero.  */
+  HOWTO (R_PPC64_ADDR14_BRTAKEN, /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 ppc64_elf_brtaken_reloc, /* special_function */
+	 "R_PPC64_ADDR14_BRTAKEN",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000fffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An absolute 16 bit branch, for which bit 10 should be set to
+     indicate that the branch is not expected to be taken.  The lower
+     two bits must be zero.  */
+  HOWTO (R_PPC64_ADDR14_BRNTAKEN, /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 ppc64_elf_brtaken_reloc, /* special_function */
+	 "R_PPC64_ADDR14_BRNTAKEN",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000fffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A relative 26 bit branch; the lower two bits must be zero.  */
+  HOWTO (R_PPC64_REL24,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc64_elf_branch_reloc, /* special_function */
+	 "R_PPC64_REL24",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x03fffffc,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A relative 16 bit branch; the lower two bits must be zero.  */
+  HOWTO (R_PPC64_REL14,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc64_elf_branch_reloc, /* special_function */
+	 "R_PPC64_REL14",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000fffc,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A relative 16 bit branch.  Bit 10 should be set to indicate that
+     the branch is expected to be taken.  The lower two bits must be
+     zero.  */
+  HOWTO (R_PPC64_REL14_BRTAKEN,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc64_elf_brtaken_reloc, /* special_function */
+	 "R_PPC64_REL14_BRTAKEN", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000fffc,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A relative 16 bit branch.  Bit 10 should be set to indicate that
+     the branch is not expected to be taken.  The lower two bits must
+     be zero.  */
+  HOWTO (R_PPC64_REL14_BRNTAKEN, /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc64_elf_brtaken_reloc, /* special_function */
+	 "R_PPC64_REL14_BRNTAKEN",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000fffc,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Like R_PPC64_ADDR16, but referring to the GOT table entry for the
+     symbol.  */
+  HOWTO (R_PPC64_GOT16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_ADDR16_LO, but referring to the GOT table entry for
+     the symbol.  */
+  HOWTO (R_PPC64_GOT16_LO,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT16_LO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_ADDR16_HI, but referring to the GOT table entry for
+     the symbol.  */
+  HOWTO (R_PPC64_GOT16_HI,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT16_HI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_ADDR16_HA, but referring to the GOT table entry for
+     the symbol.  */
+  HOWTO (R_PPC64_GOT16_HA,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT16_HA",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* This is used only by the dynamic linker.  The symbol should exist
+     both in the object being run and in some shared library.  The
+     dynamic linker copies the data addressed by the symbol from the
+     shared library into the object, because the object being
+     run has to have the data at some particular address.  */
+  HOWTO (R_PPC64_COPY,		/* type */
+	 0,			/* rightshift */
+	 0,			/* this one is variable size */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_COPY",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_ADDR64, but used when setting global offset table
+     entries.  */
+  HOWTO (R_PPC64_GLOB_DAT,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0=byte, 1=short, 2=long, 4=64 bits) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc,  /* special_function */
+	 "R_PPC64_GLOB_DAT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ONES (64),		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Created by the link editor.  Marks a procedure linkage table
+     entry for a symbol.  */
+  HOWTO (R_PPC64_JMP_SLOT,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_JMP_SLOT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Used only by the dynamic linker.  When the object is run, this
+     doubleword64 is set to the load address of the object, plus the
+     addend.  */
+  HOWTO (R_PPC64_RELATIVE,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0=byte, 1=short, 2=long, 4=64 bits) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_RELATIVE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ONES (64),		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_ADDR32, but may be unaligned.  */
+  HOWTO (R_PPC64_UADDR32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_UADDR32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_ADDR16, but may be unaligned.  */
+  HOWTO (R_PPC64_UADDR16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_UADDR16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32-bit PC relative.  */
+  HOWTO (R_PPC64_REL32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 /* FIXME: Verify.  Was complain_overflow_bitfield.  */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_REL32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 32-bit relocation to the symbol's procedure linkage table.  */
+  HOWTO (R_PPC64_PLT32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_PLT32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32-bit PC relative relocation to the symbol's procedure linkage table.
+     FIXME: R_PPC64_PLTREL32 not supported.  */
+  HOWTO (R_PPC64_PLTREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_PLTREL32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Like R_PPC64_ADDR16_LO, but referring to the PLT table entry for
+     the symbol.  */
+  HOWTO (R_PPC64_PLT16_LO,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_PLT16_LO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_ADDR16_HI, but referring to the PLT table entry for
+     the symbol.  */
+  HOWTO (R_PPC64_PLT16_HI,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_PLT16_HI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_ADDR16_HA, but referring to the PLT table entry for
+     the symbol.  */
+  HOWTO (R_PPC64_PLT16_HA,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_PLT16_HA",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16-bit section relative relocation.  */
+  HOWTO (R_PPC64_SECTOFF,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 ppc64_elf_sectoff_reloc, /* special_function */
+	 "R_PPC64_SECTOFF",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_SECTOFF, but no overflow warning.  */
+  HOWTO (R_PPC64_SECTOFF_LO,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_sectoff_reloc, /* special_function */
+	 "R_PPC64_SECTOFF_LO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16-bit upper half section relative relocation.  */
+  HOWTO (R_PPC64_SECTOFF_HI,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_sectoff_reloc, /* special_function */
+	 "R_PPC64_SECTOFF_HI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16-bit upper half adjusted section relative relocation.  */
+  HOWTO (R_PPC64_SECTOFF_HA,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_sectoff_ha_reloc, /* special_function */
+	 "R_PPC64_SECTOFF_HA",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_REL24 without touching the two least significant bits.  */
+  HOWTO (R_PPC64_REL30,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 30,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_PPC64_REL30",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffffffc,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Relocs in the 64-bit PowerPC ELF ABI, not in the 32-bit ABI.  */
+
+  /* A standard 64-bit relocation.  */
+  HOWTO (R_PPC64_ADDR64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0=byte, 1=short, 2=long, 4=64 bits) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_ADDR64",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ONES (64),		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The bits 32-47 of an address.  */
+  HOWTO (R_PPC64_ADDR16_HIGHER,	/* type */
+	 32,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_ADDR16_HIGHER", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The bits 32-47 of an address, plus 1 if the contents of the low
+     16 bits, treated as a signed number, is negative.  */
+  HOWTO (R_PPC64_ADDR16_HIGHERA, /* type */
+	 32,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_ha_reloc,	/* special_function */
+	 "R_PPC64_ADDR16_HIGHERA", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The bits 48-63 of an address.  */
+  HOWTO (R_PPC64_ADDR16_HIGHEST,/* type */
+	 48,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_ADDR16_HIGHEST", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The bits 48-63 of an address, plus 1 if the contents of the low
+     16 bits, treated as a signed number, is negative.  */
+  HOWTO (R_PPC64_ADDR16_HIGHESTA,/* type */
+	 48,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_ha_reloc,	/* special_function */
+	 "R_PPC64_ADDR16_HIGHESTA", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like ADDR64, but may be unaligned.  */
+  HOWTO (R_PPC64_UADDR64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0=byte, 1=short, 2=long, 4=64 bits) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_UADDR64",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ONES (64),		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 64-bit relative relocation.  */
+  HOWTO (R_PPC64_REL64,		/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0=byte, 1=short, 2=long, 4=64 bits) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_REL64",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ONES (64),		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 64-bit relocation to the symbol's procedure linkage table.  */
+  HOWTO (R_PPC64_PLT64,		/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0=byte, 1=short, 2=long, 4=64 bits) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_PLT64",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ONES (64),		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 64-bit PC relative relocation to the symbol's procedure linkage
+     table.  */
+  /* FIXME: R_PPC64_PLTREL64 not supported.  */
+  HOWTO (R_PPC64_PLTREL64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0=byte, 1=short, 2=long, 4=64 bits) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_PLTREL64",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ONES (64),		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 16 bit TOC-relative relocation.  */
+
+  /* R_PPC64_TOC16	  47	   half16*	S + A - .TOC.  */
+  HOWTO (R_PPC64_TOC16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc64_elf_toc_reloc,	/* special_function */
+	 "R_PPC64_TOC16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit TOC-relative relocation without overflow.  */
+
+  /* R_PPC64_TOC16_LO	  48	   half16	 #lo (S + A - .TOC.)  */
+  HOWTO (R_PPC64_TOC16_LO,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_toc_reloc,	/* special_function */
+	 "R_PPC64_TOC16_LO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit TOC-relative relocation, high 16 bits.  */
+
+  /* R_PPC64_TOC16_HI	  49	   half16	 #hi (S + A - .TOC.)  */
+  HOWTO (R_PPC64_TOC16_HI,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_toc_reloc,	/* special_function */
+	 "R_PPC64_TOC16_HI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit TOC-relative relocation, high 16 bits, plus 1 if the
+     contents of the low 16 bits, treated as a signed number, is
+     negative.  */
+
+  /* R_PPC64_TOC16_HA	  50	   half16	 #ha (S + A - .TOC.)  */
+  HOWTO (R_PPC64_TOC16_HA,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_toc_ha_reloc, /* special_function */
+	 "R_PPC64_TOC16_HA",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 64-bit relocation; insert value of TOC base (.TOC.).  */
+
+  /* R_PPC64_TOC		  51	   doubleword64	 .TOC.  */
+  HOWTO (R_PPC64_TOC,		/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0=byte, 1=short, 2=long, 4=64 bits) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 ppc64_elf_toc64_reloc,	/* special_function */
+	 "R_PPC64_TOC",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ONES (64),		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_GOT16, but also informs the link editor that the
+     value to relocate may (!) refer to a PLT entry which the link
+     editor (a) may replace with the symbol value.  If the link editor
+     is unable to fully resolve the symbol, it may (b) create a PLT
+     entry and store the address to the new PLT entry in the GOT.
+     This permits lazy resolution of function symbols at run time.
+     The link editor may also skip all of this and just (c) emit a
+     R_PPC64_GLOB_DAT to tie the symbol to the GOT entry.  */
+  /* FIXME: R_PPC64_PLTGOT16 not implemented.  */
+    HOWTO (R_PPC64_PLTGOT16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_PLTGOT16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_PLTGOT16, but without overflow.  */
+  /* FIXME: R_PPC64_PLTGOT16_LO not implemented.  */
+  HOWTO (R_PPC64_PLTGOT16_LO,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_PLTGOT16_LO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_PLT_GOT16, but using bits 16-31 of the address.  */
+  /* FIXME: R_PPC64_PLTGOT16_HI not implemented.  */
+  HOWTO (R_PPC64_PLTGOT16_HI,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_PLTGOT16_HI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_PLT_GOT16, but using bits 16-31 of the address, plus
+     1 if the contents of the low 16 bits, treated as a signed number,
+     is negative.  */
+  /* FIXME: R_PPC64_PLTGOT16_HA not implemented.  */
+  HOWTO (R_PPC64_PLTGOT16_HA,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_PLTGOT16_HA",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_ADDR16, but for instructions with a DS field.  */
+  HOWTO (R_PPC64_ADDR16_DS,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_ADDR16_DS",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_ADDR16_LO, but for instructions with a DS field.  */
+  HOWTO (R_PPC64_ADDR16_LO_DS,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_ADDR16_LO_DS",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_GOT16, but for instructions with a DS field.  */
+  HOWTO (R_PPC64_GOT16_DS,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT16_DS",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_GOT16_LO, but for instructions with a DS field.  */
+  HOWTO (R_PPC64_GOT16_LO_DS,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT16_LO_DS",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_PLT16_LO, but for instructions with a DS field.  */
+  HOWTO (R_PPC64_PLT16_LO_DS,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_PLT16_LO_DS",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_SECTOFF, but for instructions with a DS field.  */
+  HOWTO (R_PPC64_SECTOFF_DS,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 ppc64_elf_sectoff_reloc, /* special_function */
+	 "R_PPC64_SECTOFF_DS",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_SECTOFF_LO, but for instructions with a DS field.  */
+  HOWTO (R_PPC64_SECTOFF_LO_DS, /* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_sectoff_reloc, /* special_function */
+	 "R_PPC64_SECTOFF_LO_DS",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_TOC16, but for instructions with a DS field.  */
+  HOWTO (R_PPC64_TOC16_DS,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc64_elf_toc_reloc,	/* special_function */
+	 "R_PPC64_TOC16_DS",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_TOC16_LO, but for instructions with a DS field.  */
+  HOWTO (R_PPC64_TOC16_LO_DS,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_toc_reloc,	/* special_function */
+	 "R_PPC64_TOC16_LO_DS",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_PLTGOT16, but for instructions with a DS field.  */
+  /* FIXME: R_PPC64_PLTGOT16_DS not implemented.  */
+  HOWTO (R_PPC64_PLTGOT16_DS,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_PLTGOT16_DS",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like R_PPC64_PLTGOT16_LO, but for instructions with a DS field.  */
+  /* FIXME: R_PPC64_PLTGOT16_LO not implemented.  */
+  HOWTO (R_PPC64_PLTGOT16_LO_DS,/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_PLTGOT16_LO_DS",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Marker relocs for TLS.  */
+  HOWTO (R_PPC64_TLS,
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_TLS",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_PPC64_TLSGD,
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_TLSGD",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_PPC64_TLSLD,
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_TLSLD",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_PPC64_TOCSAVE,
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_TOCSAVE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Computes the load module index of the load module that contains the
+     definition of its TLS sym.  */
+  HOWTO (R_PPC64_DTPMOD64,
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_DTPMOD64",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ONES (64),		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Computes a dtv-relative displacement, the difference between the value
+     of sym+add and the base address of the thread-local storage block that
+     contains the definition of sym, minus 0x8000.  */
+  HOWTO (R_PPC64_DTPREL64,
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_DTPREL64",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ONES (64),		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit dtprel reloc.  */
+  HOWTO (R_PPC64_DTPREL16,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_DTPREL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like DTPREL16, but no overflow.  */
+  HOWTO (R_PPC64_DTPREL16_LO,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_DTPREL16_LO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like DTPREL16_LO, but next higher group of 16 bits.  */
+  HOWTO (R_PPC64_DTPREL16_HI,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_DTPREL16_HI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like DTPREL16_HI, but adjust for low 16 bits.  */
+  HOWTO (R_PPC64_DTPREL16_HA,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_DTPREL16_HA",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like DTPREL16_HI, but next higher group of 16 bits.  */
+  HOWTO (R_PPC64_DTPREL16_HIGHER,
+	 32,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_DTPREL16_HIGHER", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like DTPREL16_HIGHER, but adjust for low 16 bits.  */
+  HOWTO (R_PPC64_DTPREL16_HIGHERA,
+	 32,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_DTPREL16_HIGHERA", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like DTPREL16_HIGHER, but next higher group of 16 bits.  */
+  HOWTO (R_PPC64_DTPREL16_HIGHEST,
+	 48,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_DTPREL16_HIGHEST", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like DTPREL16_HIGHEST, but adjust for low 16 bits.  */
+  HOWTO (R_PPC64_DTPREL16_HIGHESTA,
+	 48,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_DTPREL16_HIGHESTA", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like DTPREL16, but for insns with a DS field.  */
+  HOWTO (R_PPC64_DTPREL16_DS,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_DTPREL16_DS",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like DTPREL16_DS, but no overflow.  */
+  HOWTO (R_PPC64_DTPREL16_LO_DS,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_DTPREL16_LO_DS", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Computes a tp-relative displacement, the difference between the value of
+     sym+add and the value of the thread pointer (r13).  */
+  HOWTO (R_PPC64_TPREL64,
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_TPREL64",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ONES (64),		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit tprel reloc.  */
+  HOWTO (R_PPC64_TPREL16,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_TPREL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like TPREL16, but no overflow.  */
+  HOWTO (R_PPC64_TPREL16_LO,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_TPREL16_LO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like TPREL16_LO, but next higher group of 16 bits.  */
+  HOWTO (R_PPC64_TPREL16_HI,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_TPREL16_HI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like TPREL16_HI, but adjust for low 16 bits.  */
+  HOWTO (R_PPC64_TPREL16_HA,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_TPREL16_HA",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like TPREL16_HI, but next higher group of 16 bits.  */
+  HOWTO (R_PPC64_TPREL16_HIGHER,
+	 32,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_TPREL16_HIGHER",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like TPREL16_HIGHER, but adjust for low 16 bits.  */
+  HOWTO (R_PPC64_TPREL16_HIGHERA,
+	 32,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_TPREL16_HIGHERA", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like TPREL16_HIGHER, but next higher group of 16 bits.  */
+  HOWTO (R_PPC64_TPREL16_HIGHEST,
+	 48,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_TPREL16_HIGHEST", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like TPREL16_HIGHEST, but adjust for low 16 bits.  */
+  HOWTO (R_PPC64_TPREL16_HIGHESTA,
+	 48,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_TPREL16_HIGHESTA", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like TPREL16, but for insns with a DS field.  */
+  HOWTO (R_PPC64_TPREL16_DS,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_TPREL16_DS",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like TPREL16_DS, but no overflow.  */
+  HOWTO (R_PPC64_TPREL16_LO_DS,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_TPREL16_LO_DS", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Allocates two contiguous entries in the GOT to hold a tls_index structure,
+     with values (sym+add)@dtpmod and (sym+add)@dtprel, and computes the offset
+     to the first entry relative to the TOC base (r2).  */
+  HOWTO (R_PPC64_GOT_TLSGD16,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT_TLSGD16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_TLSGD16, but no overflow.  */
+  HOWTO (R_PPC64_GOT_TLSGD16_LO,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT_TLSGD16_LO", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_TLSGD16_LO, but next higher group of 16 bits.  */
+  HOWTO (R_PPC64_GOT_TLSGD16_HI,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT_TLSGD16_HI", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_TLSGD16_HI, but adjust for low 16 bits.  */
+  HOWTO (R_PPC64_GOT_TLSGD16_HA,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT_TLSGD16_HA", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Allocates two contiguous entries in the GOT to hold a tls_index structure,
+     with values (sym+add)@dtpmod and zero, and computes the offset to the
+     first entry relative to the TOC base (r2).  */
+  HOWTO (R_PPC64_GOT_TLSLD16,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT_TLSLD16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_TLSLD16, but no overflow.  */
+  HOWTO (R_PPC64_GOT_TLSLD16_LO,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT_TLSLD16_LO", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_TLSLD16_LO, but next higher group of 16 bits.  */
+  HOWTO (R_PPC64_GOT_TLSLD16_HI,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT_TLSLD16_HI", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_TLSLD16_HI, but adjust for low 16 bits.  */
+  HOWTO (R_PPC64_GOT_TLSLD16_HA,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT_TLSLD16_HA", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Allocates an entry in the GOT with value (sym+add)@dtprel, and computes
+     the offset to the entry relative to the TOC base (r2).  */
+  HOWTO (R_PPC64_GOT_DTPREL16_DS,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT_DTPREL16_DS", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_DTPREL16_DS, but no overflow.  */
+  HOWTO (R_PPC64_GOT_DTPREL16_LO_DS,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT_DTPREL16_LO_DS", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_DTPREL16_LO_DS, but next higher group of 16 bits.  */
+  HOWTO (R_PPC64_GOT_DTPREL16_HI,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT_DTPREL16_HI", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_DTPREL16_HI, but adjust for low 16 bits.  */
+  HOWTO (R_PPC64_GOT_DTPREL16_HA,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT_DTPREL16_HA", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Allocates an entry in the GOT with value (sym+add)@tprel, and computes the
+     offset to the entry relative to the TOC base (r2).  */
+  HOWTO (R_PPC64_GOT_TPREL16_DS,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT_TPREL16_DS", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_TPREL16_DS, but no overflow.  */
+  HOWTO (R_PPC64_GOT_TPREL16_LO_DS,
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT_TPREL16_LO_DS", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfffc,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_TPREL16_LO_DS, but next higher group of 16 bits.  */
+  HOWTO (R_PPC64_GOT_TPREL16_HI,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT_TPREL16_HI", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Like GOT_TPREL16_HI, but adjust for low 16 bits.  */
+  HOWTO (R_PPC64_GOT_TPREL16_HA,
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_GOT_TPREL16_HA", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_PPC64_JMP_IREL,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0=byte, 1=short, 2=long, 4=64 bits) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_unhandled_reloc, /* special_function */
+	 "R_PPC64_JMP_IREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_PPC64_IRELATIVE,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0=byte, 1=short, 2=long, 4=64 bits) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_IRELATIVE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ONES (64),		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit relative relocation.  */
+  HOWTO (R_PPC64_REL16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_REL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 16 bit relative relocation without overflow.  */
+  HOWTO (R_PPC64_REL16_LO,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_REL16_LO",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* The high order 16 bits of a relative address.  */
+  HOWTO (R_PPC64_REL16_HI,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_PPC64_REL16_HI",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* The high order 16 bits of a relative address, plus 1 if the contents of
+     the low 16 bits, treated as a signed number, is negative.  */
+  HOWTO (R_PPC64_REL16_HA,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 ppc64_elf_ha_reloc,	/* special_function */
+	 "R_PPC64_REL16_HA",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_PPC64_GNU_VTINHERIT,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_PPC64_GNU_VTINHERIT", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage.  */
+  HOWTO (R_PPC64_GNU_VTENTRY,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_PPC64_GNU_VTENTRY",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+
+/* Initialize the ppc64_elf_howto_table, so that linear accesses can
+   be done.  */
+
+static void
+ppc_howto_init (void)
+{
+  unsigned int i, type;
+
+  for (i = 0;
+       i < sizeof (ppc64_elf_howto_raw) / sizeof (ppc64_elf_howto_raw[0]);
+       i++)
+    {
+      type = ppc64_elf_howto_raw[i].type;
+      BFD_ASSERT (type < (sizeof (ppc64_elf_howto_table)
+			  / sizeof (ppc64_elf_howto_table[0])));
+      ppc64_elf_howto_table[type] = &ppc64_elf_howto_raw[i];
+    }
+}
+
+static reloc_howto_type *
+ppc64_elf_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			     bfd_reloc_code_real_type code)
+{
+  enum elf_ppc64_reloc_type r = R_PPC64_NONE;
+
+  if (!ppc64_elf_howto_table[R_PPC64_ADDR32])
+    /* Initialize howto table if needed.  */
+    ppc_howto_init ();
+
+  switch (code)
+    {
+    default:
+      return NULL;
+
+    case BFD_RELOC_NONE:			r = R_PPC64_NONE;
+      break;
+    case BFD_RELOC_32:				r = R_PPC64_ADDR32;
+      break;
+    case BFD_RELOC_PPC_BA26:			r = R_PPC64_ADDR24;
+      break;
+    case BFD_RELOC_16:				r = R_PPC64_ADDR16;
+      break;
+    case BFD_RELOC_LO16:			r = R_PPC64_ADDR16_LO;
+      break;
+    case BFD_RELOC_HI16:			r = R_PPC64_ADDR16_HI;
+      break;
+    case BFD_RELOC_HI16_S:			r = R_PPC64_ADDR16_HA;
+      break;
+    case BFD_RELOC_PPC_BA16:			r = R_PPC64_ADDR14;
+      break;
+    case BFD_RELOC_PPC_BA16_BRTAKEN:		r = R_PPC64_ADDR14_BRTAKEN;
+      break;
+    case BFD_RELOC_PPC_BA16_BRNTAKEN:		r = R_PPC64_ADDR14_BRNTAKEN;
+      break;
+    case BFD_RELOC_PPC_B26:			r = R_PPC64_REL24;
+      break;
+    case BFD_RELOC_PPC_B16:			r = R_PPC64_REL14;
+      break;
+    case BFD_RELOC_PPC_B16_BRTAKEN:		r = R_PPC64_REL14_BRTAKEN;
+      break;
+    case BFD_RELOC_PPC_B16_BRNTAKEN:		r = R_PPC64_REL14_BRNTAKEN;
+      break;
+    case BFD_RELOC_16_GOTOFF:			r = R_PPC64_GOT16;
+      break;
+    case BFD_RELOC_LO16_GOTOFF:			r = R_PPC64_GOT16_LO;
+      break;
+    case BFD_RELOC_HI16_GOTOFF:			r = R_PPC64_GOT16_HI;
+      break;
+    case BFD_RELOC_HI16_S_GOTOFF:		r = R_PPC64_GOT16_HA;
+      break;
+    case BFD_RELOC_PPC_COPY:			r = R_PPC64_COPY;
+      break;
+    case BFD_RELOC_PPC_GLOB_DAT:		r = R_PPC64_GLOB_DAT;
+      break;
+    case BFD_RELOC_32_PCREL:			r = R_PPC64_REL32;
+      break;
+    case BFD_RELOC_32_PLTOFF:			r = R_PPC64_PLT32;
+      break;
+    case BFD_RELOC_32_PLT_PCREL:		r = R_PPC64_PLTREL32;
+      break;
+    case BFD_RELOC_LO16_PLTOFF:			r = R_PPC64_PLT16_LO;
+      break;
+    case BFD_RELOC_HI16_PLTOFF:			r = R_PPC64_PLT16_HI;
+      break;
+    case BFD_RELOC_HI16_S_PLTOFF:		r = R_PPC64_PLT16_HA;
+      break;
+    case BFD_RELOC_16_BASEREL:			r = R_PPC64_SECTOFF;
+      break;
+    case BFD_RELOC_LO16_BASEREL:		r = R_PPC64_SECTOFF_LO;
+      break;
+    case BFD_RELOC_HI16_BASEREL:		r = R_PPC64_SECTOFF_HI;
+      break;
+    case BFD_RELOC_HI16_S_BASEREL:		r = R_PPC64_SECTOFF_HA;
+      break;
+    case BFD_RELOC_CTOR:			r = R_PPC64_ADDR64;
+      break;
+    case BFD_RELOC_64:				r = R_PPC64_ADDR64;
+      break;
+    case BFD_RELOC_PPC64_HIGHER:		r = R_PPC64_ADDR16_HIGHER;
+      break;
+    case BFD_RELOC_PPC64_HIGHER_S:		r = R_PPC64_ADDR16_HIGHERA;
+      break;
+    case BFD_RELOC_PPC64_HIGHEST:		r = R_PPC64_ADDR16_HIGHEST;
+      break;
+    case BFD_RELOC_PPC64_HIGHEST_S:		r = R_PPC64_ADDR16_HIGHESTA;
+      break;
+    case BFD_RELOC_64_PCREL:			r = R_PPC64_REL64;
+      break;
+    case BFD_RELOC_64_PLTOFF:			r = R_PPC64_PLT64;
+      break;
+    case BFD_RELOC_64_PLT_PCREL:		r = R_PPC64_PLTREL64;
+      break;
+    case BFD_RELOC_PPC_TOC16:			r = R_PPC64_TOC16;
+      break;
+    case BFD_RELOC_PPC64_TOC16_LO:		r = R_PPC64_TOC16_LO;
+      break;
+    case BFD_RELOC_PPC64_TOC16_HI:		r = R_PPC64_TOC16_HI;
+      break;
+    case BFD_RELOC_PPC64_TOC16_HA:		r = R_PPC64_TOC16_HA;
+      break;
+    case BFD_RELOC_PPC64_TOC:			r = R_PPC64_TOC;
+      break;
+    case BFD_RELOC_PPC64_PLTGOT16:		r = R_PPC64_PLTGOT16;
+      break;
+    case BFD_RELOC_PPC64_PLTGOT16_LO:		r = R_PPC64_PLTGOT16_LO;
+      break;
+    case BFD_RELOC_PPC64_PLTGOT16_HI:		r = R_PPC64_PLTGOT16_HI;
+      break;
+    case BFD_RELOC_PPC64_PLTGOT16_HA:		r = R_PPC64_PLTGOT16_HA;
+      break;
+    case BFD_RELOC_PPC64_ADDR16_DS:		r = R_PPC64_ADDR16_DS;
+      break;
+    case BFD_RELOC_PPC64_ADDR16_LO_DS:		r = R_PPC64_ADDR16_LO_DS;
+      break;
+    case BFD_RELOC_PPC64_GOT16_DS:		r = R_PPC64_GOT16_DS;
+      break;
+    case BFD_RELOC_PPC64_GOT16_LO_DS:		r = R_PPC64_GOT16_LO_DS;
+      break;
+    case BFD_RELOC_PPC64_PLT16_LO_DS:		r = R_PPC64_PLT16_LO_DS;
+      break;
+    case BFD_RELOC_PPC64_SECTOFF_DS:		r = R_PPC64_SECTOFF_DS;
+      break;
+    case BFD_RELOC_PPC64_SECTOFF_LO_DS:		r = R_PPC64_SECTOFF_LO_DS;
+      break;
+    case BFD_RELOC_PPC64_TOC16_DS:		r = R_PPC64_TOC16_DS;
+      break;
+    case BFD_RELOC_PPC64_TOC16_LO_DS:		r = R_PPC64_TOC16_LO_DS;
+      break;
+    case BFD_RELOC_PPC64_PLTGOT16_DS:		r = R_PPC64_PLTGOT16_DS;
+      break;
+    case BFD_RELOC_PPC64_PLTGOT16_LO_DS:	r = R_PPC64_PLTGOT16_LO_DS;
+      break;
+    case BFD_RELOC_PPC_TLS:			r = R_PPC64_TLS;
+      break;
+    case BFD_RELOC_PPC_TLSGD:			r = R_PPC64_TLSGD;
+      break;
+    case BFD_RELOC_PPC_TLSLD:			r = R_PPC64_TLSLD;
+      break;
+    case BFD_RELOC_PPC_DTPMOD:			r = R_PPC64_DTPMOD64;
+      break;
+    case BFD_RELOC_PPC_TPREL16:			r = R_PPC64_TPREL16;
+      break;
+    case BFD_RELOC_PPC_TPREL16_LO:		r = R_PPC64_TPREL16_LO;
+      break;
+    case BFD_RELOC_PPC_TPREL16_HI:		r = R_PPC64_TPREL16_HI;
+      break;
+    case BFD_RELOC_PPC_TPREL16_HA:		r = R_PPC64_TPREL16_HA;
+      break;
+    case BFD_RELOC_PPC_TPREL:			r = R_PPC64_TPREL64;
+      break;
+    case BFD_RELOC_PPC_DTPREL16:		r = R_PPC64_DTPREL16;
+      break;
+    case BFD_RELOC_PPC_DTPREL16_LO:		r = R_PPC64_DTPREL16_LO;
+      break;
+    case BFD_RELOC_PPC_DTPREL16_HI:		r = R_PPC64_DTPREL16_HI;
+      break;
+    case BFD_RELOC_PPC_DTPREL16_HA:		r = R_PPC64_DTPREL16_HA;
+      break;
+    case BFD_RELOC_PPC_DTPREL:			r = R_PPC64_DTPREL64;
+      break;
+    case BFD_RELOC_PPC_GOT_TLSGD16:		r = R_PPC64_GOT_TLSGD16;
+      break;
+    case BFD_RELOC_PPC_GOT_TLSGD16_LO:		r = R_PPC64_GOT_TLSGD16_LO;
+      break;
+    case BFD_RELOC_PPC_GOT_TLSGD16_HI:		r = R_PPC64_GOT_TLSGD16_HI;
+      break;
+    case BFD_RELOC_PPC_GOT_TLSGD16_HA:		r = R_PPC64_GOT_TLSGD16_HA;
+      break;
+    case BFD_RELOC_PPC_GOT_TLSLD16:		r = R_PPC64_GOT_TLSLD16;
+      break;
+    case BFD_RELOC_PPC_GOT_TLSLD16_LO:		r = R_PPC64_GOT_TLSLD16_LO;
+      break;
+    case BFD_RELOC_PPC_GOT_TLSLD16_HI:		r = R_PPC64_GOT_TLSLD16_HI;
+      break;
+    case BFD_RELOC_PPC_GOT_TLSLD16_HA:		r = R_PPC64_GOT_TLSLD16_HA;
+      break;
+    case BFD_RELOC_PPC_GOT_TPREL16:		r = R_PPC64_GOT_TPREL16_DS;
+      break;
+    case BFD_RELOC_PPC_GOT_TPREL16_LO:		r = R_PPC64_GOT_TPREL16_LO_DS;
+      break;
+    case BFD_RELOC_PPC_GOT_TPREL16_HI:		r = R_PPC64_GOT_TPREL16_HI;
+      break;
+    case BFD_RELOC_PPC_GOT_TPREL16_HA:		r = R_PPC64_GOT_TPREL16_HA;
+      break;
+    case BFD_RELOC_PPC_GOT_DTPREL16:		r = R_PPC64_GOT_DTPREL16_DS;
+      break;
+    case BFD_RELOC_PPC_GOT_DTPREL16_LO:		r = R_PPC64_GOT_DTPREL16_LO_DS;
+      break;
+    case BFD_RELOC_PPC_GOT_DTPREL16_HI:		r = R_PPC64_GOT_DTPREL16_HI;
+      break;
+    case BFD_RELOC_PPC_GOT_DTPREL16_HA:		r = R_PPC64_GOT_DTPREL16_HA;
+      break;
+    case BFD_RELOC_PPC64_TPREL16_DS:		r = R_PPC64_TPREL16_DS;
+      break;
+    case BFD_RELOC_PPC64_TPREL16_LO_DS:		r = R_PPC64_TPREL16_LO_DS;
+      break;
+    case BFD_RELOC_PPC64_TPREL16_HIGHER:	r = R_PPC64_TPREL16_HIGHER;
+      break;
+    case BFD_RELOC_PPC64_TPREL16_HIGHERA:	r = R_PPC64_TPREL16_HIGHERA;
+      break;
+    case BFD_RELOC_PPC64_TPREL16_HIGHEST:	r = R_PPC64_TPREL16_HIGHEST;
+      break;
+    case BFD_RELOC_PPC64_TPREL16_HIGHESTA:	r = R_PPC64_TPREL16_HIGHESTA;
+      break;
+    case BFD_RELOC_PPC64_DTPREL16_DS:		r = R_PPC64_DTPREL16_DS;
+      break;
+    case BFD_RELOC_PPC64_DTPREL16_LO_DS:	r = R_PPC64_DTPREL16_LO_DS;
+      break;
+    case BFD_RELOC_PPC64_DTPREL16_HIGHER:	r = R_PPC64_DTPREL16_HIGHER;
+      break;
+    case BFD_RELOC_PPC64_DTPREL16_HIGHERA:	r = R_PPC64_DTPREL16_HIGHERA;
+      break;
+    case BFD_RELOC_PPC64_DTPREL16_HIGHEST:	r = R_PPC64_DTPREL16_HIGHEST;
+      break;
+    case BFD_RELOC_PPC64_DTPREL16_HIGHESTA:	r = R_PPC64_DTPREL16_HIGHESTA;
+      break;
+    case BFD_RELOC_16_PCREL:			r = R_PPC64_REL16;
+      break;
+    case BFD_RELOC_LO16_PCREL:			r = R_PPC64_REL16_LO;
+      break;
+    case BFD_RELOC_HI16_PCREL:			r = R_PPC64_REL16_HI;
+      break;
+    case BFD_RELOC_HI16_S_PCREL:		r = R_PPC64_REL16_HA;
+      break;
+    case BFD_RELOC_VTABLE_INHERIT:		r = R_PPC64_GNU_VTINHERIT;
+      break;
+    case BFD_RELOC_VTABLE_ENTRY:		r = R_PPC64_GNU_VTENTRY;
+      break;
+    }
+
+  return ppc64_elf_howto_table[r];
+};
+
+static reloc_howto_type *
+ppc64_elf_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			     const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (ppc64_elf_howto_raw) / sizeof (ppc64_elf_howto_raw[0]);
+       i++)
+    if (ppc64_elf_howto_raw[i].name != NULL
+	&& strcasecmp (ppc64_elf_howto_raw[i].name, r_name) == 0)
+      return &ppc64_elf_howto_raw[i];
+
+  return NULL;
+}
+
+/* Set the howto pointer for a PowerPC ELF reloc.  */
+
+static void
+ppc64_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr,
+			 Elf_Internal_Rela *dst)
+{
+  unsigned int type;
+
+  /* Initialize howto table if needed.  */
+  if (!ppc64_elf_howto_table[R_PPC64_ADDR32])
+    ppc_howto_init ();
+
+  type = ELF64_R_TYPE (dst->r_info);
+  if (type >= (sizeof (ppc64_elf_howto_table)
+	       / sizeof (ppc64_elf_howto_table[0])))
+    {
+      (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
+			     abfd, (int) type);
+      type = R_PPC64_NONE;
+    }
+  cache_ptr->howto = ppc64_elf_howto_table[type];
+}
+
+/* Handle the R_PPC64_ADDR16_HA and similar relocs.  */
+
+static bfd_reloc_status_type
+ppc64_elf_ha_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+		    void *data, asection *input_section,
+		    bfd *output_bfd, char **error_message)
+{
+  /* If this is a relocatable link (output_bfd test tells us), just
+     call the generic function.  Any adjustment will be done at final
+     link time.  */
+  if (output_bfd != NULL)
+    return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+				  input_section, output_bfd, error_message);
+
+  /* Adjust the addend for sign extension of the low 16 bits.
+     We won't actually be using the low 16 bits, so trashing them
+     doesn't matter.  */
+  reloc_entry->addend += 0x8000;
+  return bfd_reloc_continue;
+}
+
+static bfd_reloc_status_type
+ppc64_elf_branch_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+			void *data, asection *input_section,
+			bfd *output_bfd, char **error_message)
+{
+  if (output_bfd != NULL)
+    return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+				  input_section, output_bfd, error_message);
+
+  if (strcmp (symbol->section->name, ".opd") == 0
+      && (symbol->section->owner->flags & DYNAMIC) == 0)
+    {
+      bfd_vma dest = opd_entry_value (symbol->section,
+				      symbol->value + reloc_entry->addend,
+				      NULL, NULL);
+      if (dest != (bfd_vma) -1)
+	reloc_entry->addend = dest - (symbol->value
+				      + symbol->section->output_section->vma
+				      + symbol->section->output_offset);
+    }
+  return bfd_reloc_continue;
+}
+
+static bfd_reloc_status_type
+ppc64_elf_brtaken_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+			 void *data, asection *input_section,
+			 bfd *output_bfd, char **error_message)
+{
+  long insn;
+  enum elf_ppc64_reloc_type r_type;
+  bfd_size_type octets;
+  /* Disabled until we sort out how ld should choose 'y' vs 'at'.  */
+  bfd_boolean is_power4 = FALSE;
+
+  /* If this is a relocatable link (output_bfd test tells us), just
+     call the generic function.  Any adjustment will be done at final
+     link time.  */
+  if (output_bfd != NULL)
+    return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+				  input_section, output_bfd, error_message);
+
+  octets = reloc_entry->address * bfd_octets_per_byte (abfd);
+  insn = bfd_get_32 (abfd, (bfd_byte *) data + octets);
+  insn &= ~(0x01 << 21);
+  r_type = reloc_entry->howto->type;
+  if (r_type == R_PPC64_ADDR14_BRTAKEN
+      || r_type == R_PPC64_REL14_BRTAKEN)
+    insn |= 0x01 << 21; /* 'y' or 't' bit, lowest bit of BO field.  */
+
+  if (is_power4)
+    {
+      /* Set 'a' bit.  This is 0b00010 in BO field for branch
+	 on CR(BI) insns (BO == 001at or 011at), and 0b01000
+	 for branch on CTR insns (BO == 1a00t or 1a01t).  */
+      if ((insn & (0x14 << 21)) == (0x04 << 21))
+	insn |= 0x02 << 21;
+      else if ((insn & (0x14 << 21)) == (0x10 << 21))
+	insn |= 0x08 << 21;
+      else
+	goto out;
+    }
+  else
+    {
+      bfd_vma target = 0;
+      bfd_vma from;
+
+      if (!bfd_is_com_section (symbol->section))
+	target = symbol->value;
+      target += symbol->section->output_section->vma;
+      target += symbol->section->output_offset;
+      target += reloc_entry->addend;
+
+      from = (reloc_entry->address
+	      + input_section->output_offset
+	      + input_section->output_section->vma);
+
+      /* Invert 'y' bit if not the default.  */
+      if ((bfd_signed_vma) (target - from) < 0)
+	insn ^= 0x01 << 21;
+    }
+  bfd_put_32 (abfd, insn, (bfd_byte *) data + octets);
+ out:
+  return ppc64_elf_branch_reloc (abfd, reloc_entry, symbol, data,
+				 input_section, output_bfd, error_message);
+}
+
+static bfd_reloc_status_type
+ppc64_elf_sectoff_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+			 void *data, asection *input_section,
+			 bfd *output_bfd, char **error_message)
+{
+  /* If this is a relocatable link (output_bfd test tells us), just
+     call the generic function.  Any adjustment will be done at final
+     link time.  */
+  if (output_bfd != NULL)
+    return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+				  input_section, output_bfd, error_message);
+
+  /* Subtract the symbol section base address.  */
+  reloc_entry->addend -= symbol->section->output_section->vma;
+  return bfd_reloc_continue;
+}
+
+static bfd_reloc_status_type
+ppc64_elf_sectoff_ha_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+			    void *data, asection *input_section,
+			    bfd *output_bfd, char **error_message)
+{
+  /* If this is a relocatable link (output_bfd test tells us), just
+     call the generic function.  Any adjustment will be done at final
+     link time.  */
+  if (output_bfd != NULL)
+    return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+				  input_section, output_bfd, error_message);
+
+  /* Subtract the symbol section base address.  */
+  reloc_entry->addend -= symbol->section->output_section->vma;
+
+  /* Adjust the addend for sign extension of the low 16 bits.  */
+  reloc_entry->addend += 0x8000;
+  return bfd_reloc_continue;
+}
+
+static bfd_reloc_status_type
+ppc64_elf_toc_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+		     void *data, asection *input_section,
+		     bfd *output_bfd, char **error_message)
+{
+  bfd_vma TOCstart;
+
+  /* If this is a relocatable link (output_bfd test tells us), just
+     call the generic function.  Any adjustment will be done at final
+     link time.  */
+  if (output_bfd != NULL)
+    return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+				  input_section, output_bfd, error_message);
+
+  TOCstart = _bfd_get_gp_value (input_section->output_section->owner);
+  if (TOCstart == 0)
+    TOCstart = ppc64_elf_toc (input_section->output_section->owner);
+
+  /* Subtract the TOC base address.  */
+  reloc_entry->addend -= TOCstart + TOC_BASE_OFF;
+  return bfd_reloc_continue;
+}
+
+static bfd_reloc_status_type
+ppc64_elf_toc_ha_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+			void *data, asection *input_section,
+			bfd *output_bfd, char **error_message)
+{
+  bfd_vma TOCstart;
+
+  /* If this is a relocatable link (output_bfd test tells us), just
+     call the generic function.  Any adjustment will be done at final
+     link time.  */
+  if (output_bfd != NULL)
+    return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+				  input_section, output_bfd, error_message);
+
+  TOCstart = _bfd_get_gp_value (input_section->output_section->owner);
+  if (TOCstart == 0)
+    TOCstart = ppc64_elf_toc (input_section->output_section->owner);
+
+  /* Subtract the TOC base address.  */
+  reloc_entry->addend -= TOCstart + TOC_BASE_OFF;
+
+  /* Adjust the addend for sign extension of the low 16 bits.  */
+  reloc_entry->addend += 0x8000;
+  return bfd_reloc_continue;
+}
+
+static bfd_reloc_status_type
+ppc64_elf_toc64_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+		       void *data, asection *input_section,
+		       bfd *output_bfd, char **error_message)
+{
+  bfd_vma TOCstart;
+  bfd_size_type octets;
+
+  /* If this is a relocatable link (output_bfd test tells us), just
+     call the generic function.  Any adjustment will be done at final
+     link time.  */
+  if (output_bfd != NULL)
+    return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+				  input_section, output_bfd, error_message);
+
+  TOCstart = _bfd_get_gp_value (input_section->output_section->owner);
+  if (TOCstart == 0)
+    TOCstart = ppc64_elf_toc (input_section->output_section->owner);
+
+  octets = reloc_entry->address * bfd_octets_per_byte (abfd);
+  bfd_put_64 (abfd, TOCstart + TOC_BASE_OFF, (bfd_byte *) data + octets);
+  return bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type
+ppc64_elf_unhandled_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+			   void *data, asection *input_section,
+			   bfd *output_bfd, char **error_message)
+{
+  /* If this is a relocatable link (output_bfd test tells us), just
+     call the generic function.  Any adjustment will be done at final
+     link time.  */
+  if (output_bfd != NULL)
+    return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+				  input_section, output_bfd, error_message);
+
+  if (error_message != NULL)
+    {
+      static char buf[60];
+      sprintf (buf, "generic linker can't handle %s",
+	       reloc_entry->howto->name);
+      *error_message = buf;
+    }
+  return bfd_reloc_dangerous;
+}
+
+/* Track GOT entries needed for a given symbol.  We might need more
+   than one got entry per symbol.  */
+struct got_entry
+{
+  struct got_entry *next;
+
+  /* The symbol addend that we'll be placing in the GOT.  */
+  bfd_vma addend;
+
+  /* Unlike other ELF targets, we use separate GOT entries for the same
+     symbol referenced from different input files.  This is to support
+     automatic multiple TOC/GOT sections, where the TOC base can vary
+     from one input file to another.  After partitioning into TOC groups
+     we merge entries within the group.
+
+     Point to the BFD owning this GOT entry.  */
+  bfd *owner;
+
+  /* Zero for non-tls entries, or TLS_TLS and one of TLS_GD, TLS_LD,
+     TLS_TPREL or TLS_DTPREL for tls entries.  */
+  unsigned char tls_type;
+
+  /* Non-zero if got.ent points to real entry.  */
+  unsigned char is_indirect;
+
+  /* Reference count until size_dynamic_sections, GOT offset thereafter.  */
+  union
+    {
+      bfd_signed_vma refcount;
+      bfd_vma offset;
+      struct got_entry *ent;
+    } got;
+};
+
+/* The same for PLT.  */
+struct plt_entry
+{
+  struct plt_entry *next;
+
+  bfd_vma addend;
+
+  union
+    {
+      bfd_signed_vma refcount;
+      bfd_vma offset;
+    } plt;
+};
+
+struct ppc64_elf_obj_tdata
+{
+  struct elf_obj_tdata elf;
+
+  /* Shortcuts to dynamic linker sections.  */
+  asection *got;
+  asection *relgot;
+
+  /* Used during garbage collection.  We attach global symbols defined
+     on removed .opd entries to this section so that the sym is removed.  */
+  asection *deleted_section;
+
+  /* TLS local dynamic got entry handling.  Support for multiple GOT
+     sections means we potentially need one of these for each input bfd.  */
+  struct got_entry tlsld_got;
+
+  /* A copy of relocs before they are modified for --emit-relocs.  */
+  Elf_Internal_Rela *opd_relocs;
+
+  /* Nonzero if this bfd has small toc/got relocs, ie. that expect
+     the reloc to be in the range -32768 to 32767.  */
+  unsigned int has_small_toc_reloc : 1;
+
+  /* Set if toc/got ha relocs detected not using r2, or lo reloc
+     instruction not one we handle.  */
+  unsigned int unexpected_toc_insn : 1;
+};
+
+#define ppc64_elf_tdata(bfd) \
+  ((struct ppc64_elf_obj_tdata *) (bfd)->tdata.any)
+
+#define ppc64_tlsld_got(bfd) \
+  (&ppc64_elf_tdata (bfd)->tlsld_got)
+
+#define is_ppc64_elf(bfd) \
+  (bfd_get_flavour (bfd) == bfd_target_elf_flavour \
+   && elf_object_id (bfd) == PPC64_ELF_DATA)
+
+/* Override the generic function because we store some extras.  */
+
+static bfd_boolean
+ppc64_elf_mkobject (bfd *abfd)
+{
+  return bfd_elf_allocate_object (abfd, sizeof (struct ppc64_elf_obj_tdata),
+				  PPC64_ELF_DATA);
+}
+
+/* Fix bad default arch selected for a 64 bit input bfd when the
+   default is 32 bit.  */
+
+static bfd_boolean
+ppc64_elf_object_p (bfd *abfd)
+{
+  if (abfd->arch_info->the_default && abfd->arch_info->bits_per_word == 32)
+    {
+      Elf_Internal_Ehdr *i_ehdr = elf_elfheader (abfd);
+
+      if (i_ehdr->e_ident[EI_CLASS] == ELFCLASS64)
+	{
+	  /* Relies on arch after 32 bit default being 64 bit default.  */
+	  abfd->arch_info = abfd->arch_info->next;
+	  BFD_ASSERT (abfd->arch_info->bits_per_word == 64);
+	}
+    }
+  return TRUE;
+}
+
+/* Support for core dump NOTE sections.  */
+
+static bfd_boolean
+ppc64_elf_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  size_t offset, size;
+
+  if (note->descsz != 504)
+    return FALSE;
+
+  /* pr_cursig */
+  elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12);
+
+  /* pr_pid */
+  elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 32);
+
+  /* pr_reg */
+  offset = 112;
+  size = 384;
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg",
+					  size, note->descpos + offset);
+}
+
+static bfd_boolean
+ppc64_elf_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  if (note->descsz != 136)
+    return FALSE;
+
+  elf_tdata (abfd)->core_pid
+    = bfd_get_32 (abfd, note->descdata + 24);
+  elf_tdata (abfd)->core_program
+    = _bfd_elfcore_strndup (abfd, note->descdata + 40, 16);
+  elf_tdata (abfd)->core_command
+    = _bfd_elfcore_strndup (abfd, note->descdata + 56, 80);
+
+  return TRUE;
+}
+
+static char *
+ppc64_elf_write_core_note (bfd *abfd, char *buf, int *bufsiz, int note_type,
+			   ...)
+{
+  switch (note_type)
+    {
+    default:
+      return NULL;
+
+    case NT_PRPSINFO:
+      {
+	char data[136];
+	va_list ap;
+
+	va_start (ap, note_type);
+	memset (data, 0, 40);
+	strncpy (data + 40, va_arg (ap, const char *), 16);
+	strncpy (data + 56, va_arg (ap, const char *), 80);
+	va_end (ap);
+	return elfcore_write_note (abfd, buf, bufsiz,
+				   "CORE", note_type, data, sizeof (data));
+      }
+
+    case NT_PRSTATUS:
+      {
+	char data[504];
+	va_list ap;
+	long pid;
+	int cursig;
+	const void *greg;
+
+	va_start (ap, note_type);
+	memset (data, 0, 112);
+	pid = va_arg (ap, long);
+	bfd_put_32 (abfd, pid, data + 32);
+	cursig = va_arg (ap, int);
+	bfd_put_16 (abfd, cursig, data + 12);
+	greg = va_arg (ap, const void *);
+	memcpy (data + 112, greg, 384);
+	memset (data + 496, 0, 8);
+	va_end (ap);
+	return elfcore_write_note (abfd, buf, bufsiz,
+				   "CORE", note_type, data, sizeof (data));
+      }
+    }
+}
+
+/* Add extra PPC sections.  */
+
+static const struct bfd_elf_special_section ppc64_elf_special_sections[]=
+{
+  { STRING_COMMA_LEN (".plt"),    0, SHT_NOBITS,   0 },
+  { STRING_COMMA_LEN (".sbss"),  -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".sdata"), -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".toc"),    0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".toc1"),   0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE },
+  { STRING_COMMA_LEN (".tocbss"), 0, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE },
+  { NULL,                     0,  0, 0,            0 }
+};
+
+enum _ppc64_sec_type {
+  sec_normal = 0,
+  sec_opd = 1,
+  sec_toc = 2
+};
+
+struct _ppc64_elf_section_data
+{
+  struct bfd_elf_section_data elf;
+
+  union
+  {
+    /* An array with one entry for each opd function descriptor.  */
+    struct _opd_sec_data
+    {
+      /* Points to the function code section for local opd entries.  */
+      asection **func_sec;
+
+      /* After editing .opd, adjust references to opd local syms.  */
+      long *adjust;
+    } opd;
+
+    /* An array for toc sections, indexed by offset/8.  */
+    struct _toc_sec_data
+    {
+      /* Specifies the relocation symbol index used at a given toc offset.  */
+      unsigned *symndx;
+
+      /* And the relocation addend.  */
+      bfd_vma *add;
+    } toc;
+  } u;
+
+  enum _ppc64_sec_type sec_type:2;
+
+  /* Flag set when small branches are detected.  Used to
+     select suitable defaults for the stub group size.  */
+  unsigned int has_14bit_branch:1;
+};
+
+#define ppc64_elf_section_data(sec) \
+  ((struct _ppc64_elf_section_data *) elf_section_data (sec))
+
+static bfd_boolean
+ppc64_elf_new_section_hook (bfd *abfd, asection *sec)
+{
+  if (!sec->used_by_bfd)
+    {
+      struct _ppc64_elf_section_data *sdata;
+      bfd_size_type amt = sizeof (*sdata);
+
+      sdata = bfd_zalloc (abfd, amt);
+      if (sdata == NULL)
+	return FALSE;
+      sec->used_by_bfd = sdata;
+    }
+
+  return _bfd_elf_new_section_hook (abfd, sec);
+}
+
+static struct _opd_sec_data *
+get_opd_info (asection * sec)
+{
+  if (sec != NULL
+      && ppc64_elf_section_data (sec) != NULL
+      && ppc64_elf_section_data (sec)->sec_type == sec_opd)
+    return &ppc64_elf_section_data (sec)->u.opd;
+  return NULL;
+}
+
+/* Parameters for the qsort hook.  */
+static bfd_boolean synthetic_relocatable;
+
+/* qsort comparison function for ppc64_elf_get_synthetic_symtab.  */
+
+static int
+compare_symbols (const void *ap, const void *bp)
+{
+  const asymbol *a = * (const asymbol **) ap;
+  const asymbol *b = * (const asymbol **) bp;
+
+  /* Section symbols first.  */
+  if ((a->flags & BSF_SECTION_SYM) && !(b->flags & BSF_SECTION_SYM))
+    return -1;
+  if (!(a->flags & BSF_SECTION_SYM) && (b->flags & BSF_SECTION_SYM))
+    return 1;
+
+  /* then .opd symbols.  */
+  if (strcmp (a->section->name, ".opd") == 0
+      && strcmp (b->section->name, ".opd") != 0)
+    return -1;
+  if (strcmp (a->section->name, ".opd") != 0
+      && strcmp (b->section->name, ".opd") == 0)
+    return 1;
+
+  /* then other code symbols.  */
+  if ((a->section->flags & (SEC_CODE | SEC_ALLOC | SEC_THREAD_LOCAL))
+      == (SEC_CODE | SEC_ALLOC)
+      && (b->section->flags & (SEC_CODE | SEC_ALLOC | SEC_THREAD_LOCAL))
+	 != (SEC_CODE | SEC_ALLOC))
+    return -1;
+
+  if ((a->section->flags & (SEC_CODE | SEC_ALLOC | SEC_THREAD_LOCAL))
+      != (SEC_CODE | SEC_ALLOC)
+      && (b->section->flags & (SEC_CODE | SEC_ALLOC | SEC_THREAD_LOCAL))
+	 == (SEC_CODE | SEC_ALLOC))
+    return 1;
+
+  if (synthetic_relocatable)
+    {
+      if (a->section->id < b->section->id)
+	return -1;
+
+      if (a->section->id > b->section->id)
+	return 1;
+    }
+
+  if (a->value + a->section->vma < b->value + b->section->vma)
+    return -1;
+
+  if (a->value + a->section->vma > b->value + b->section->vma)
+    return 1;
+
+  /* For syms with the same value, prefer strong dynamic global function
+     syms over other syms.  */
+  if ((a->flags & BSF_GLOBAL) != 0 && (b->flags & BSF_GLOBAL) == 0)
+    return -1;
+
+  if ((a->flags & BSF_GLOBAL) == 0 && (b->flags & BSF_GLOBAL) != 0)
+    return 1;
+
+  if ((a->flags & BSF_FUNCTION) != 0 && (b->flags & BSF_FUNCTION) == 0)
+    return -1;
+
+  if ((a->flags & BSF_FUNCTION) == 0 && (b->flags & BSF_FUNCTION) != 0)
+    return 1;
+
+  if ((a->flags & BSF_WEAK) == 0 && (b->flags & BSF_WEAK) != 0)
+    return -1;
+
+  if ((a->flags & BSF_WEAK) != 0 && (b->flags & BSF_WEAK) == 0)
+    return 1;
+
+  if ((a->flags & BSF_DYNAMIC) != 0 && (b->flags & BSF_DYNAMIC) == 0)
+    return -1;
+
+  if ((a->flags & BSF_DYNAMIC) == 0 && (b->flags & BSF_DYNAMIC) != 0)
+    return 1;
+
+  return 0;
+}
+
+/* Search SYMS for a symbol of the given VALUE.  */
+
+static asymbol *
+sym_exists_at (asymbol **syms, long lo, long hi, int id, bfd_vma value)
+{
+  long mid;
+
+  if (id == -1)
+    {
+      while (lo < hi)
+	{
+	  mid = (lo + hi) >> 1;
+	  if (syms[mid]->value + syms[mid]->section->vma < value)
+	    lo = mid + 1;
+	  else if (syms[mid]->value + syms[mid]->section->vma > value)
+	    hi = mid;
+	  else
+	    return syms[mid];
+	}
+    }
+  else
+    {
+      while (lo < hi)
+	{
+	  mid = (lo + hi) >> 1;
+	  if (syms[mid]->section->id < id)
+	    lo = mid + 1;
+	  else if (syms[mid]->section->id > id)
+	    hi = mid;
+	  else if (syms[mid]->value < value)
+	    lo = mid + 1;
+	  else if (syms[mid]->value > value)
+	    hi = mid;
+	  else
+	    return syms[mid];
+	}
+    }
+  return NULL;
+}
+
+static bfd_boolean
+section_covers_vma (bfd *abfd ATTRIBUTE_UNUSED, asection *section, void *ptr)
+{
+  bfd_vma vma = *(bfd_vma *) ptr;
+  return ((section->flags & SEC_ALLOC) != 0
+	  && section->vma <= vma
+	  && vma < section->vma + section->size);
+}
+
+/* Create synthetic symbols, effectively restoring "dot-symbol" function
+   entry syms.  Also generate @plt symbols for the glink branch table.  */
+
+static long
+ppc64_elf_get_synthetic_symtab (bfd *abfd,
+				long static_count, asymbol **static_syms,
+				long dyn_count, asymbol **dyn_syms,
+				asymbol **ret)
+{
+  asymbol *s;
+  long i;
+  long count;
+  char *names;
+  long symcount, codesecsym, codesecsymend, secsymend, opdsymend;
+  asection *opd;
+  bfd_boolean relocatable = (abfd->flags & (EXEC_P | DYNAMIC)) == 0;
+  asymbol **syms;
+
+  *ret = NULL;
+
+  opd = bfd_get_section_by_name (abfd, ".opd");
+  if (opd == NULL)
+    return 0;
+
+  symcount = static_count;
+  if (!relocatable)
+    symcount += dyn_count;
+  if (symcount == 0)
+    return 0;
+
+  syms = bfd_malloc ((symcount + 1) * sizeof (*syms));
+  if (syms == NULL)
+    return -1;
+
+  if (!relocatable && static_count != 0 && dyn_count != 0)
+    {
+      /* Use both symbol tables.  */
+      memcpy (syms, static_syms, static_count * sizeof (*syms));
+      memcpy (syms + static_count, dyn_syms, (dyn_count + 1) * sizeof (*syms));
+    }
+  else if (!relocatable && static_count == 0)
+    memcpy (syms, dyn_syms, (symcount + 1) * sizeof (*syms));
+  else
+    memcpy (syms, static_syms, (symcount + 1) * sizeof (*syms));
+
+  synthetic_relocatable = relocatable;
+  qsort (syms, symcount, sizeof (*syms), compare_symbols);
+
+  if (!relocatable && symcount > 1)
+    {
+      long j;
+      /* Trim duplicate syms, since we may have merged the normal and
+	 dynamic symbols.  Actually, we only care about syms that have
+	 different values, so trim any with the same value.  */
+      for (i = 1, j = 1; i < symcount; ++i)
+	if (syms[i - 1]->value + syms[i - 1]->section->vma
+	    != syms[i]->value + syms[i]->section->vma)
+	  syms[j++] = syms[i];
+      symcount = j;
+    }
+
+  i = 0;
+  if (strcmp (syms[i]->section->name, ".opd") == 0)
+    ++i;
+  codesecsym = i;
+
+  for (; i < symcount; ++i)
+    if (((syms[i]->section->flags & (SEC_CODE | SEC_ALLOC | SEC_THREAD_LOCAL))
+	 != (SEC_CODE | SEC_ALLOC))
+	|| (syms[i]->flags & BSF_SECTION_SYM) == 0)
+      break;
+  codesecsymend = i;
+
+  for (; i < symcount; ++i)
+    if ((syms[i]->flags & BSF_SECTION_SYM) == 0)
+      break;
+  secsymend = i;
+
+  for (; i < symcount; ++i)
+    if (strcmp (syms[i]->section->name, ".opd") != 0)
+      break;
+  opdsymend = i;
+
+  for (; i < symcount; ++i)
+    if ((syms[i]->section->flags & (SEC_CODE | SEC_ALLOC | SEC_THREAD_LOCAL))
+	!= (SEC_CODE | SEC_ALLOC))
+      break;
+  symcount = i;
+
+  count = 0;
+
+  if (relocatable)
+    {
+      bfd_boolean (*slurp_relocs) (bfd *, asection *, asymbol **, bfd_boolean);
+      arelent *r;
+      size_t size;
+      long relcount;
+
+      if (opdsymend == secsymend)
+	goto done;
+
+      slurp_relocs = get_elf_backend_data (abfd)->s->slurp_reloc_table;
+      relcount = (opd->flags & SEC_RELOC) ? opd->reloc_count : 0;
+      if (relcount == 0)
+	goto done;
+
+      if (!(*slurp_relocs) (abfd, opd, static_syms, FALSE))
+	{
+	  count = -1;
+	  goto done;
+	}
+
+      size = 0;
+      for (i = secsymend, r = opd->relocation; i < opdsymend; ++i)
+	{
+	  asymbol *sym;
+
+	  while (r < opd->relocation + relcount
+		 && r->address < syms[i]->value + opd->vma)
+	    ++r;
+
+	  if (r == opd->relocation + relcount)
+	    break;
+
+	  if (r->address != syms[i]->value + opd->vma)
+	    continue;
+
+	  if (r->howto->type != R_PPC64_ADDR64)
+	    continue;
+
+	  sym = *r->sym_ptr_ptr;
+	  if (!sym_exists_at (syms, opdsymend, symcount,
+			      sym->section->id, sym->value + r->addend))
+	    {
+	      ++count;
+	      size += sizeof (asymbol);
+	      size += strlen (syms[i]->name) + 2;
+	    }
+	}
+
+      s = *ret = bfd_malloc (size);
+      if (s == NULL)
+	{
+	  count = -1;
+	  goto done;
+	}
+
+      names = (char *) (s + count);
+
+      for (i = secsymend, r = opd->relocation; i < opdsymend; ++i)
+	{
+	  asymbol *sym;
+
+	  while (r < opd->relocation + relcount
+		 && r->address < syms[i]->value + opd->vma)
+	    ++r;
+
+	  if (r == opd->relocation + relcount)
+	    break;
+
+	  if (r->address != syms[i]->value + opd->vma)
+	    continue;
+
+	  if (r->howto->type != R_PPC64_ADDR64)
+	    continue;
+
+	  sym = *r->sym_ptr_ptr;
+	  if (!sym_exists_at (syms, opdsymend, symcount,
+			      sym->section->id, sym->value + r->addend))
+	    {
+	      size_t len;
+
+	      *s = *syms[i];
+	      s->flags |= BSF_SYNTHETIC;
+	      s->section = sym->section;
+	      s->value = sym->value + r->addend;
+	      s->name = names;
+	      *names++ = '.';
+	      len = strlen (syms[i]->name);
+	      memcpy (names, syms[i]->name, len + 1);
+	      names += len + 1;
+	      /* Have udata.p point back to the original symbol this
+		 synthetic symbol was derived from.  */
+	      s->udata.p = syms[i];
+	      s++;
+	    }
+	}
+    }
+  else
+    {
+      bfd_boolean (*slurp_relocs) (bfd *, asection *, asymbol **, bfd_boolean);
+      bfd_byte *contents;
+      size_t size;
+      long plt_count = 0;
+      bfd_vma glink_vma = 0, resolv_vma = 0;
+      asection *dynamic, *glink = NULL, *relplt = NULL;
+      arelent *p;
+
+      if (!bfd_malloc_and_get_section (abfd, opd, &contents))
+	{
+	  if (contents)
+	    {
+	    free_contents_and_exit:
+	      free (contents);
+	    }
+	  count = -1;
+	  goto done;
+	}
+
+      size = 0;
+      for (i = secsymend; i < opdsymend; ++i)
+	{
+	  bfd_vma ent;
+
+	  /* Ignore bogus symbols.  */
+	  if (syms[i]->value > opd->size - 8)
+	    continue;
+
+	  ent = bfd_get_64 (abfd, contents + syms[i]->value);
+	  if (!sym_exists_at (syms, opdsymend, symcount, -1, ent))
+	    {
+	      ++count;
+	      size += sizeof (asymbol);
+	      size += strlen (syms[i]->name) + 2;
+	    }
+	}
+
+      /* Get start of .glink stubs from DT_PPC64_GLINK.  */
+      if (dyn_count != 0
+	  && (dynamic = bfd_get_section_by_name (abfd, ".dynamic")) != NULL)
+	{
+	  bfd_byte *dynbuf, *extdyn, *extdynend;
+	  size_t extdynsize;
+	  void (*swap_dyn_in) (bfd *, const void *, Elf_Internal_Dyn *);
+
+	  if (!bfd_malloc_and_get_section (abfd, dynamic, &dynbuf))
+	    goto free_contents_and_exit;
+
+	  extdynsize = get_elf_backend_data (abfd)->s->sizeof_dyn;
+	  swap_dyn_in = get_elf_backend_data (abfd)->s->swap_dyn_in;
+
+	  extdyn = dynbuf;
+	  extdynend = extdyn + dynamic->size;
+	  for (; extdyn < extdynend; extdyn += extdynsize)
+	    {
+	      Elf_Internal_Dyn dyn;
+	      (*swap_dyn_in) (abfd, extdyn, &dyn);
+
+	      if (dyn.d_tag == DT_NULL)
+		break;
+
+	      if (dyn.d_tag == DT_PPC64_GLINK)
+		{
+		  /* The first glink stub starts at offset 32; see comment in
+		     ppc64_elf_finish_dynamic_sections. */
+		  glink_vma = dyn.d_un.d_val + 32;
+		  /* The .glink section usually does not survive the final
+		     link; search for the section (usually .text) where the
+		     glink stubs now reside.  */
+		  glink = bfd_sections_find_if (abfd, section_covers_vma,
+						&glink_vma);
+		  break;
+		}
+	    }
+
+	  free (dynbuf);
+	}
+
+      if (glink != NULL)
+	{
+	  /* Determine __glink trampoline by reading the relative branch
+	     from the first glink stub.  */
+	  bfd_byte buf[4];
+	  if (bfd_get_section_contents (abfd, glink, buf,
+					glink_vma + 4 - glink->vma, 4))
+	    {
+	      unsigned int insn = bfd_get_32 (abfd, buf);
+	      insn ^= B_DOT;
+	      if ((insn & ~0x3fffffc) == 0)
+		resolv_vma = glink_vma + 4 + (insn ^ 0x2000000) - 0x2000000;
+	    }
+
+	  if (resolv_vma)
+	    size += sizeof (asymbol) + sizeof ("__glink_PLTresolve");
+
+	  relplt = bfd_get_section_by_name (abfd, ".rela.plt");
+	  if (relplt != NULL)
+	    {
+	      slurp_relocs = get_elf_backend_data (abfd)->s->slurp_reloc_table;
+	      if (! (*slurp_relocs) (abfd, relplt, dyn_syms, TRUE))
+		goto free_contents_and_exit;
+	
+	      plt_count = relplt->size / sizeof (Elf64_External_Rela);
+	      size += plt_count * sizeof (asymbol);
+
+	      p = relplt->relocation;
+	      for (i = 0; i < plt_count; i++, p++)
+		{
+		  size += strlen ((*p->sym_ptr_ptr)->name) + sizeof ("@plt");
+		  if (p->addend != 0)
+		    size += sizeof ("+0x") - 1 + 16;
+		}
+	    }
+	}
+
+      s = *ret = bfd_malloc (size);
+      if (s == NULL)
+	goto free_contents_and_exit;
+
+      names = (char *) (s + count + plt_count + (resolv_vma != 0));
+
+      for (i = secsymend; i < opdsymend; ++i)
+	{
+	  bfd_vma ent;
+
+	  if (syms[i]->value > opd->size - 8)
+	    continue;
+
+	  ent = bfd_get_64 (abfd, contents + syms[i]->value);
+	  if (!sym_exists_at (syms, opdsymend, symcount, -1, ent))
+	    {
+	      long lo, hi;
+	      size_t len;
+	      asection *sec = abfd->sections;
+
+	      *s = *syms[i];
+	      lo = codesecsym;
+	      hi = codesecsymend;
+	      while (lo < hi)
+		{
+		  long mid = (lo + hi) >> 1;
+		  if (syms[mid]->section->vma < ent)
+		    lo = mid + 1;
+		  else if (syms[mid]->section->vma > ent)
+		    hi = mid;
+		  else
+		    {
+		      sec = syms[mid]->section;
+		      break;
+		    }
+		}
+
+	      if (lo >= hi && lo > codesecsym)
+		sec = syms[lo - 1]->section;
+
+	      for (; sec != NULL; sec = sec->next)
+		{
+		  if (sec->vma > ent)
+		    break;
+		  /* SEC_LOAD may not be set if SEC is from a separate debug
+		     info file.  */
+		  if ((sec->flags & SEC_ALLOC) == 0)
+		    break;
+		  if ((sec->flags & SEC_CODE) != 0)
+		    s->section = sec;
+		}
+	      s->flags |= BSF_SYNTHETIC;
+	      s->value = ent - s->section->vma;
+	      s->name = names;
+	      *names++ = '.';
+	      len = strlen (syms[i]->name);
+	      memcpy (names, syms[i]->name, len + 1);
+	      names += len + 1;
+	      /* Have udata.p point back to the original symbol this
+		 synthetic symbol was derived from.  */
+	      s->udata.p = syms[i];
+	      s++;
+	    }
+	}
+      free (contents);
+
+      if (glink != NULL && relplt != NULL)
+	{
+	  if (resolv_vma)
+	    {
+	      /* Add a symbol for the main glink trampoline.  */
+	      memset (s, 0, sizeof *s);
+	      s->the_bfd = abfd;
+	      s->flags = BSF_GLOBAL | BSF_SYNTHETIC;
+	      s->section = glink;
+	      s->value = resolv_vma - glink->vma;
+	      s->name = names;
+	      memcpy (names, "__glink_PLTresolve", sizeof ("__glink_PLTresolve"));
+	      names += sizeof ("__glink_PLTresolve");
+	      s++;
+	      count++;
+	    }
+
+	  /* FIXME: It would be very much nicer to put sym@plt on the
+	     stub rather than on the glink branch table entry.  The
+	     objdump disassembler would then use a sensible symbol
+	     name on plt calls.  The difficulty in doing so is
+	     a) finding the stubs, and,
+	     b) matching stubs against plt entries, and,
+	     c) there can be multiple stubs for a given plt entry.
+
+	     Solving (a) could be done by code scanning, but older
+	     ppc64 binaries used different stubs to current code.
+	     (b) is the tricky one since you need to known the toc
+	     pointer for at least one function that uses a pic stub to
+	     be able to calculate the plt address referenced.
+	     (c) means gdb would need to set multiple breakpoints (or
+	     find the glink branch itself) when setting breakpoints
+	     for pending shared library loads.  */
+	  p = relplt->relocation;
+	  for (i = 0; i < plt_count; i++, p++)
+	    {
+	      size_t len;
+
+	      *s = **p->sym_ptr_ptr;
+	      /* Undefined syms won't have BSF_LOCAL or BSF_GLOBAL set.  Since
+		 we are defining a symbol, ensure one of them is set.  */
+	      if ((s->flags & BSF_LOCAL) == 0)
+		s->flags |= BSF_GLOBAL;
+	      s->flags |= BSF_SYNTHETIC;
+	      s->section = glink;
+	      s->value = glink_vma - glink->vma;
+	      s->name = names;
+	      s->udata.p = NULL;
+	      len = strlen ((*p->sym_ptr_ptr)->name);
+	      memcpy (names, (*p->sym_ptr_ptr)->name, len);
+	      names += len;
+	      if (p->addend != 0)
+		{
+		  memcpy (names, "+0x", sizeof ("+0x") - 1);
+		  names += sizeof ("+0x") - 1;
+		  bfd_sprintf_vma (abfd, names, p->addend);
+		  names += strlen (names);
+		}
+	      memcpy (names, "@plt", sizeof ("@plt"));
+	      names += sizeof ("@plt");
+	      s++;
+	      glink_vma += 8;
+	      if (i >= 0x8000)
+		glink_vma += 4;
+	    }
+	  count += plt_count;
+	}
+    }
+
+ done:
+  free (syms);
+  return count;
+}
+
+/* The following functions are specific to the ELF linker, while
+   functions above are used generally.  Those named ppc64_elf_* are
+   called by the main ELF linker code.  They appear in this file more
+   or less in the order in which they are called.  eg.
+   ppc64_elf_check_relocs is called early in the link process,
+   ppc64_elf_finish_dynamic_sections is one of the last functions
+   called.
+
+   PowerPC64-ELF uses a similar scheme to PowerPC64-XCOFF in that
+   functions have both a function code symbol and a function descriptor
+   symbol.  A call to foo in a relocatable object file looks like:
+
+   .		.text
+   .	x:
+   .		bl	.foo
+   .		nop
+
+   The function definition in another object file might be:
+
+   .		.section .opd
+   .	foo:	.quad	.foo
+   .		.quad	.TOC.@tocbase
+   .		.quad	0
+   .
+   .		.text
+   .	.foo:	blr
+
+   When the linker resolves the call during a static link, the branch
+   unsurprisingly just goes to .foo and the .opd information is unused.
+   If the function definition is in a shared library, things are a little
+   different:  The call goes via a plt call stub, the opd information gets
+   copied to the plt, and the linker patches the nop.
+
+   .	x:
+   .		bl	.foo_stub
+   .		ld	2,40(1)
+   .
+   .
+   .	.foo_stub:
+   .		addis	12,2,Lfoo@toc@ha	# in practice, the call stub
+   .		addi	12,12,Lfoo@toc@l	# is slightly optimized, but
+   .		std	2,40(1)			# this is the general idea
+   .		ld	11,0(12)
+   .		ld	2,8(12)
+   .		mtctr	11
+   .		ld	11,16(12)
+   .		bctr
+   .
+   .		.section .plt
+   .	Lfoo:	reloc (R_PPC64_JMP_SLOT, foo)
+
+   The "reloc ()" notation is supposed to indicate that the linker emits
+   an R_PPC64_JMP_SLOT reloc against foo.  The dynamic linker does the opd
+   copying.
+
+   What are the difficulties here?  Well, firstly, the relocations
+   examined by the linker in check_relocs are against the function code
+   sym .foo, while the dynamic relocation in the plt is emitted against
+   the function descriptor symbol, foo.  Somewhere along the line, we need
+   to carefully copy dynamic link information from one symbol to the other.
+   Secondly, the generic part of the elf linker will make .foo a dynamic
+   symbol as is normal for most other backends.  We need foo dynamic
+   instead, at least for an application final link.  However, when
+   creating a shared library containing foo, we need to have both symbols
+   dynamic so that references to .foo are satisfied during the early
+   stages of linking.  Otherwise the linker might decide to pull in a
+   definition from some other object, eg. a static library.
+
+   Update: As of August 2004, we support a new convention.  Function
+   calls may use the function descriptor symbol, ie. "bl foo".  This
+   behaves exactly as "bl .foo".  */
+
+/* Of those relocs that might be copied as dynamic relocs, this function
+   selects those that must be copied when linking a shared library,
+   even when the symbol is local.  */
+
+static int
+must_be_dyn_reloc (struct bfd_link_info *info,
+		   enum elf_ppc64_reloc_type r_type)
+{
+  switch (r_type)
+    {
+    default:
+      return 1;
+
+    case R_PPC64_REL32:
+    case R_PPC64_REL64:
+    case R_PPC64_REL30:
+      return 0;
+
+    case R_PPC64_TPREL16:
+    case R_PPC64_TPREL16_LO:
+    case R_PPC64_TPREL16_HI:
+    case R_PPC64_TPREL16_HA:
+    case R_PPC64_TPREL16_DS:
+    case R_PPC64_TPREL16_LO_DS:
+    case R_PPC64_TPREL16_HIGHER:
+    case R_PPC64_TPREL16_HIGHERA:
+    case R_PPC64_TPREL16_HIGHEST:
+    case R_PPC64_TPREL16_HIGHESTA:
+    case R_PPC64_TPREL64:
+      return !info->executable;
+    }
+}
+
+/* If ELIMINATE_COPY_RELOCS is non-zero, the linker will try to avoid
+   copying dynamic variables from a shared lib into an app's dynbss
+   section, and instead use a dynamic relocation to point into the
+   shared lib.  With code that gcc generates, it's vital that this be
+   enabled;  In the PowerPC64 ABI, the address of a function is actually
+   the address of a function descriptor, which resides in the .opd
+   section.  gcc uses the descriptor directly rather than going via the
+   GOT as some other ABI's do, which means that initialized function
+   pointers must reference the descriptor.  Thus, a function pointer
+   initialized to the address of a function in a shared library will
+   either require a copy reloc, or a dynamic reloc.  Using a copy reloc
+   redefines the function descriptor symbol to point to the copy.  This
+   presents a problem as a plt entry for that function is also
+   initialized from the function descriptor symbol and the copy reloc
+   may not be initialized first.  */
+#define ELIMINATE_COPY_RELOCS 1
+
+/* Section name for stubs is the associated section name plus this
+   string.  */
+#define STUB_SUFFIX ".stub"
+
+/* Linker stubs.
+   ppc_stub_long_branch:
+   Used when a 14 bit branch (or even a 24 bit branch) can't reach its
+   destination, but a 24 bit branch in a stub section will reach.
+   .	b	dest
+
+   ppc_stub_plt_branch:
+   Similar to the above, but a 24 bit branch in the stub section won't
+   reach its destination.
+   .	addis	%r12,%r2,xxx@toc@ha
+   .	ld	%r11,xxx@toc@l(%r12)
+   .	mtctr	%r11
+   .	bctr
+
+   ppc_stub_plt_call:
+   Used to call a function in a shared library.  If it so happens that
+   the plt entry referenced crosses a 64k boundary, then an extra
+   "addi %r12,%r12,xxx@toc@l" will be inserted before the "mtctr".
+   .	addis	%r12,%r2,xxx@toc@ha
+   .	std	%r2,40(%r1)
+   .	ld	%r11,xxx+0@toc@l(%r12)
+   .	mtctr	%r11
+   .	ld	%r2,xxx+8@toc@l(%r12)
+   .	ld	%r11,xxx+16@toc@l(%r12)
+   .	bctr
+
+   ppc_stub_long_branch and ppc_stub_plt_branch may also have additional
+   code to adjust the value and save r2 to support multiple toc sections.
+   A ppc_stub_long_branch with an r2 offset looks like:
+   .	std	%r2,40(%r1)
+   .	addis	%r2,%r2,off@ha
+   .	addi	%r2,%r2,off@l
+   .	b	dest
+
+   A ppc_stub_plt_branch with an r2 offset looks like:
+   .	std	%r2,40(%r1)
+   .	addis	%r12,%r2,xxx@toc@ha
+   .	ld	%r11,xxx@toc@l(%r12)
+   .	addis	%r2,%r2,off@ha
+   .	addi	%r2,%r2,off@l
+   .	mtctr	%r11
+   .	bctr
+
+   In cases where the "addis" instruction would add zero, the "addis" is
+   omitted and following instructions modified slightly in some cases.
+*/
+
+enum ppc_stub_type {
+  ppc_stub_none,
+  ppc_stub_long_branch,
+  ppc_stub_long_branch_r2off,
+  ppc_stub_plt_branch,
+  ppc_stub_plt_branch_r2off,
+  ppc_stub_plt_call
+};
+
+struct ppc_stub_hash_entry {
+
+  /* Base hash table entry structure.  */
+  struct bfd_hash_entry root;
+
+  enum ppc_stub_type stub_type;
+
+  /* The stub section.  */
+  asection *stub_sec;
+
+  /* Offset within stub_sec of the beginning of this stub.  */
+  bfd_vma stub_offset;
+
+  /* Given the symbol's value and its section we can determine its final
+     value when building the stubs (so the stub knows where to jump.  */
+  bfd_vma target_value;
+  asection *target_section;
+
+  /* The symbol table entry, if any, that this was derived from.  */
+  struct ppc_link_hash_entry *h;
+  struct plt_entry *plt_ent;
+
+  /* And the reloc addend that this was derived from.  */
+  bfd_vma addend;
+
+  /* Where this stub is being called from, or, in the case of combined
+     stub sections, the first input section in the group.  */
+  asection *id_sec;
+};
+
+struct ppc_branch_hash_entry {
+
+  /* Base hash table entry structure.  */
+  struct bfd_hash_entry root;
+
+  /* Offset within branch lookup table.  */
+  unsigned int offset;
+
+  /* Generation marker.  */
+  unsigned int iter;
+};
+
+struct ppc_link_hash_entry
+{
+  struct elf_link_hash_entry elf;
+
+  union {
+    /* A pointer to the most recently used stub hash entry against this
+       symbol.  */
+    struct ppc_stub_hash_entry *stub_cache;
+
+    /* A pointer to the next symbol starting with a '.'  */
+    struct ppc_link_hash_entry *next_dot_sym;
+  } u;
+
+  /* Track dynamic relocs copied for this symbol.  */
+  struct elf_dyn_relocs *dyn_relocs;
+
+  /* Link between function code and descriptor symbols.  */
+  struct ppc_link_hash_entry *oh;
+
+  /* Flag function code and descriptor symbols.  */
+  unsigned int is_func:1;
+  unsigned int is_func_descriptor:1;
+  unsigned int fake:1;
+
+  /* Whether global opd/toc sym has been adjusted or not.
+     After ppc64_elf_edit_opd/ppc64_elf_edit_toc has run, this flag
+     should be set for all globals defined in any opd/toc section.  */
+  unsigned int adjust_done:1;
+
+  /* Set if we twiddled this symbol to weak at some stage.  */
+  unsigned int was_undefined:1;
+
+  /* Contexts in which symbol is used in the GOT (or TOC).
+     TLS_GD .. TLS_EXPLICIT bits are or'd into the mask as the
+     corresponding relocs are encountered during check_relocs.
+     tls_optimize clears TLS_GD .. TLS_TPREL when optimizing to
+     indicate the corresponding GOT entry type is not needed.
+     tls_optimize may also set TLS_TPRELGD when a GD reloc turns into
+     a TPREL one.  We use a separate flag rather than setting TPREL
+     just for convenience in distinguishing the two cases.  */
+#define TLS_GD		 1	/* GD reloc. */
+#define TLS_LD		 2	/* LD reloc. */
+#define TLS_TPREL	 4	/* TPREL reloc, => IE. */
+#define TLS_DTPREL	 8	/* DTPREL reloc, => LD. */
+#define TLS_TLS		16	/* Any TLS reloc.  */
+#define TLS_EXPLICIT	32	/* Marks TOC section TLS relocs. */
+#define TLS_TPRELGD	64	/* TPREL reloc resulting from GD->IE. */
+#define PLT_IFUNC      128	/* STT_GNU_IFUNC.  */
+  unsigned char tls_mask;
+};
+
+/* ppc64 ELF linker hash table.  */
+
+struct ppc_link_hash_table
+{
+  struct elf_link_hash_table elf;
+
+  /* The stub hash table.  */
+  struct bfd_hash_table stub_hash_table;
+
+  /* Another hash table for plt_branch stubs.  */
+  struct bfd_hash_table branch_hash_table;
+
+  /* Hash table for function prologue tocsave.  */
+  htab_t tocsave_htab;
+
+  /* Linker stub bfd.  */
+  bfd *stub_bfd;
+
+  /* Linker call-backs.  */
+  asection * (*add_stub_section) (const char *, asection *);
+  void (*layout_sections_again) (void);
+
+  /* Array to keep track of which stub sections have been created, and
+     information on stub grouping.  */
+  struct map_stub {
+    /* This is the section to which stubs in the group will be attached.  */
+    asection *link_sec;
+    /* The stub section.  */
+    asection *stub_sec;
+    /* Along with elf_gp, specifies the TOC pointer used in this group.  */
+    bfd_vma toc_off;
+  } *stub_group;
+
+  /* Temp used when calculating TOC pointers.  */
+  bfd_vma toc_curr;
+  bfd *toc_bfd;
+  asection *toc_first_sec;
+
+  /* Highest input section id.  */
+  int top_id;
+
+  /* Highest output section index.  */
+  int top_index;
+
+  /* Used when adding symbols.  */
+  struct ppc_link_hash_entry *dot_syms;
+
+  /* List of input sections for each output section.  */
+  asection **input_list;
+
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *got;
+  asection *plt;
+  asection *relplt;
+  asection *iplt;
+  asection *reliplt;
+  asection *dynbss;
+  asection *relbss;
+  asection *glink;
+  asection *sfpr;
+  asection *brlt;
+  asection *relbrlt;
+  asection *glink_eh_frame;
+
+  /* Shortcut to .__tls_get_addr and __tls_get_addr.  */
+  struct ppc_link_hash_entry *tls_get_addr;
+  struct ppc_link_hash_entry *tls_get_addr_fd;
+
+  /* The size of reliplt used by got entry relocs.  */
+  bfd_size_type got_reli_size;
+
+  /* Statistics.  */
+  unsigned long stub_count[ppc_stub_plt_call];
+
+  /* Number of stubs against global syms.  */
+  unsigned long stub_globals;
+
+  /* Set if PLT call stubs should load r11.  */
+  unsigned int plt_static_chain:1;
+
+  /* Set if we should emit symbols for stubs.  */
+  unsigned int emit_stub_syms:1;
+
+  /* Set if __tls_get_addr optimization should not be done.  */
+  unsigned int no_tls_get_addr_opt:1;
+
+  /* Support for multiple toc sections.  */
+  unsigned int do_multi_toc:1;
+  unsigned int multi_toc_needed:1;
+  unsigned int second_toc_pass:1;
+  unsigned int do_toc_opt:1;
+
+  /* Set on error.  */
+  unsigned int stub_error:1;
+
+  /* Temp used by ppc64_elf_process_dot_syms.  */
+  unsigned int twiddled_syms:1;
+
+  /* Incremented every time we size stubs.  */
+  unsigned int stub_iteration;
+
+  /* Small local sym cache.  */
+  struct sym_cache sym_cache;
+};
+
+/* Rename some of the generic section flags to better document how they
+   are used here.  */
+
+/* Nonzero if this section has TLS related relocations.  */
+#define has_tls_reloc sec_flg0
+
+/* Nonzero if this section has a call to __tls_get_addr.  */
+#define has_tls_get_addr_call sec_flg1
+
+/* Nonzero if this section has any toc or got relocs.  */
+#define has_toc_reloc sec_flg2
+
+/* Nonzero if this section has a call to another section that uses
+   the toc or got.  */
+#define makes_toc_func_call sec_flg3
+
+/* Recursion protection when determining above flag.  */
+#define call_check_in_progress sec_flg4
+#define call_check_done sec_flg5
+
+/* Get the ppc64 ELF linker hash table from a link_info structure.  */
+
+#define ppc_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == PPC64_ELF_DATA ? ((struct ppc_link_hash_table *) ((p)->hash)) : NULL)
+
+#define ppc_stub_hash_lookup(table, string, create, copy) \
+  ((struct ppc_stub_hash_entry *) \
+   bfd_hash_lookup ((table), (string), (create), (copy)))
+
+#define ppc_branch_hash_lookup(table, string, create, copy) \
+  ((struct ppc_branch_hash_entry *) \
+   bfd_hash_lookup ((table), (string), (create), (copy)))
+
+/* Create an entry in the stub hash table.  */
+
+static struct bfd_hash_entry *
+stub_hash_newfunc (struct bfd_hash_entry *entry,
+		   struct bfd_hash_table *table,
+		   const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table, sizeof (struct ppc_stub_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = bfd_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct ppc_stub_hash_entry *eh;
+
+      /* Initialize the local fields.  */
+      eh = (struct ppc_stub_hash_entry *) entry;
+      eh->stub_type = ppc_stub_none;
+      eh->stub_sec = NULL;
+      eh->stub_offset = 0;
+      eh->target_value = 0;
+      eh->target_section = NULL;
+      eh->h = NULL;
+      eh->id_sec = NULL;
+    }
+
+  return entry;
+}
+
+/* Create an entry in the branch hash table.  */
+
+static struct bfd_hash_entry *
+branch_hash_newfunc (struct bfd_hash_entry *entry,
+		     struct bfd_hash_table *table,
+		     const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table, sizeof (struct ppc_branch_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = bfd_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct ppc_branch_hash_entry *eh;
+
+      /* Initialize the local fields.  */
+      eh = (struct ppc_branch_hash_entry *) entry;
+      eh->offset = 0;
+      eh->iter = 0;
+    }
+
+  return entry;
+}
+
+/* Create an entry in a ppc64 ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+link_hash_newfunc (struct bfd_hash_entry *entry,
+		   struct bfd_hash_table *table,
+		   const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table, sizeof (struct ppc_link_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = _bfd_elf_link_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct ppc_link_hash_entry *eh = (struct ppc_link_hash_entry *) entry;
+
+      memset (&eh->u.stub_cache, 0,
+	      (sizeof (struct ppc_link_hash_entry)
+	       - offsetof (struct ppc_link_hash_entry, u.stub_cache)));
+
+      /* When making function calls, old ABI code references function entry
+	 points (dot symbols), while new ABI code references the function
+	 descriptor symbol.  We need to make any combination of reference and
+	 definition work together, without breaking archive linking.
+
+	 For a defined function "foo" and an undefined call to "bar":
+	 An old object defines "foo" and ".foo", references ".bar" (possibly
+	 "bar" too).
+	 A new object defines "foo" and references "bar".
+
+	 A new object thus has no problem with its undefined symbols being
+	 satisfied by definitions in an old object.  On the other hand, the
+	 old object won't have ".bar" satisfied by a new object.
+
+	 Keep a list of newly added dot-symbols.  */
+
+      if (string[0] == '.')
+	{
+	  struct ppc_link_hash_table *htab;
+
+	  htab = (struct ppc_link_hash_table *) table;
+	  eh->u.next_dot_sym = htab->dot_syms;
+	  htab->dot_syms = eh;
+	}
+    }
+
+  return entry;
+}
+
+struct tocsave_entry {
+  asection *sec;
+  bfd_vma offset;
+};
+
+static hashval_t
+tocsave_htab_hash (const void *p)
+{
+  const struct tocsave_entry *e = (const struct tocsave_entry *) p;
+  return ((bfd_vma)(intptr_t) e->sec ^ e->offset) >> 3;
+}
+
+static int
+tocsave_htab_eq (const void *p1, const void *p2)
+{
+  const struct tocsave_entry *e1 = (const struct tocsave_entry *) p1;
+  const struct tocsave_entry *e2 = (const struct tocsave_entry *) p2;
+  return e1->sec == e2->sec && e1->offset == e2->offset;
+}
+
+/* Create a ppc64 ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+ppc64_elf_link_hash_table_create (bfd *abfd)
+{
+  struct ppc_link_hash_table *htab;
+  bfd_size_type amt = sizeof (struct ppc_link_hash_table);
+
+  htab = bfd_zmalloc (amt);
+  if (htab == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&htab->elf, abfd, link_hash_newfunc,
+				      sizeof (struct ppc_link_hash_entry),
+				      PPC64_ELF_DATA))
+    {
+      free (htab);
+      return NULL;
+    }
+
+  /* Init the stub hash table too.  */
+  if (!bfd_hash_table_init (&htab->stub_hash_table, stub_hash_newfunc,
+			    sizeof (struct ppc_stub_hash_entry)))
+    return NULL;
+
+  /* And the branch hash table.  */
+  if (!bfd_hash_table_init (&htab->branch_hash_table, branch_hash_newfunc,
+			    sizeof (struct ppc_branch_hash_entry)))
+    return NULL;
+
+  htab->tocsave_htab = htab_try_create (1024,
+					tocsave_htab_hash,
+					tocsave_htab_eq,
+					NULL);
+  if (htab->tocsave_htab == NULL)
+    return NULL;
+
+  /* Initializing two fields of the union is just cosmetic.  We really
+     only care about glist, but when compiled on a 32-bit host the
+     bfd_vma fields are larger.  Setting the bfd_vma to zero makes
+     debugger inspection of these fields look nicer.  */
+  htab->elf.init_got_refcount.refcount = 0;
+  htab->elf.init_got_refcount.glist = NULL;
+  htab->elf.init_plt_refcount.refcount = 0;
+  htab->elf.init_plt_refcount.glist = NULL;
+  htab->elf.init_got_offset.offset = 0;
+  htab->elf.init_got_offset.glist = NULL;
+  htab->elf.init_plt_offset.offset = 0;
+  htab->elf.init_plt_offset.glist = NULL;
+
+  return &htab->elf.root;
+}
+
+/* Free the derived linker hash table.  */
+
+static void
+ppc64_elf_link_hash_table_free (struct bfd_link_hash_table *hash)
+{
+  struct ppc_link_hash_table *htab = (struct ppc_link_hash_table *) hash;
+
+  bfd_hash_table_free (&htab->stub_hash_table);
+  bfd_hash_table_free (&htab->branch_hash_table);
+  if (htab->tocsave_htab)
+    htab_delete (htab->tocsave_htab);
+  _bfd_generic_link_hash_table_free (hash);
+}
+
+/* Satisfy the ELF linker by filling in some fields in our fake bfd.  */
+
+void
+ppc64_elf_init_stub_bfd (bfd *abfd, struct bfd_link_info *info)
+{
+  struct ppc_link_hash_table *htab;
+
+  elf_elfheader (abfd)->e_ident[EI_CLASS] = ELFCLASS64;
+
+/* Always hook our dynamic sections into the first bfd, which is the
+   linker created stub bfd.  This ensures that the GOT header is at
+   the start of the output TOC section.  */
+  htab = ppc_hash_table (info);
+  if (htab == NULL)
+    return;
+  htab->stub_bfd = abfd;
+  htab->elf.dynobj = abfd;
+}
+
+/* Build a name for an entry in the stub hash table.  */
+
+static char *
+ppc_stub_name (const asection *input_section,
+	       const asection *sym_sec,
+	       const struct ppc_link_hash_entry *h,
+	       const Elf_Internal_Rela *rel)
+{
+  char *stub_name;
+  bfd_size_type len;
+
+  /* rel->r_addend is actually 64 bit, but who uses more than +/- 2^31
+     offsets from a sym as a branch target?  In fact, we could
+     probably assume the addend is always zero.  */
+  BFD_ASSERT (((int) rel->r_addend & 0xffffffff) == rel->r_addend);
+
+  if (h)
+    {
+      len = 8 + 1 + strlen (h->elf.root.root.string) + 1 + 8 + 1;
+      stub_name = bfd_malloc (len);
+      if (stub_name == NULL)
+	return stub_name;
+
+      sprintf (stub_name, "%08x.%s+%x",
+	       input_section->id & 0xffffffff,
+	       h->elf.root.root.string,
+	       (int) rel->r_addend & 0xffffffff);
+    }
+  else
+    {
+      len = 8 + 1 + 8 + 1 + 8 + 1 + 8 + 1;
+      stub_name = bfd_malloc (len);
+      if (stub_name == NULL)
+	return stub_name;
+
+      sprintf (stub_name, "%08x.%x:%x+%x",
+	       input_section->id & 0xffffffff,
+	       sym_sec->id & 0xffffffff,
+	       (int) ELF64_R_SYM (rel->r_info) & 0xffffffff,
+	       (int) rel->r_addend & 0xffffffff);
+    }
+  if (stub_name[len - 2] == '+' && stub_name[len - 1] == '0')
+    stub_name[len - 2] = 0;
+  return stub_name;
+}
+
+/* Look up an entry in the stub hash.  Stub entries are cached because
+   creating the stub name takes a bit of time.  */
+
+static struct ppc_stub_hash_entry *
+ppc_get_stub_entry (const asection *input_section,
+		    const asection *sym_sec,
+		    struct ppc_link_hash_entry *h,
+		    const Elf_Internal_Rela *rel,
+		    struct ppc_link_hash_table *htab)
+{
+  struct ppc_stub_hash_entry *stub_entry;
+  const asection *id_sec;
+
+  /* If this input section is part of a group of sections sharing one
+     stub section, then use the id of the first section in the group.
+     Stub names need to include a section id, as there may well be
+     more than one stub used to reach say, printf, and we need to
+     distinguish between them.  */
+  id_sec = htab->stub_group[input_section->id].link_sec;
+
+  if (h != NULL && h->u.stub_cache != NULL
+      && h->u.stub_cache->h == h
+      && h->u.stub_cache->id_sec == id_sec)
+    {
+      stub_entry = h->u.stub_cache;
+    }
+  else
+    {
+      char *stub_name;
+
+      stub_name = ppc_stub_name (id_sec, sym_sec, h, rel);
+      if (stub_name == NULL)
+	return NULL;
+
+      stub_entry = ppc_stub_hash_lookup (&htab->stub_hash_table,
+					 stub_name, FALSE, FALSE);
+      if (h != NULL)
+	h->u.stub_cache = stub_entry;
+
+      free (stub_name);
+    }
+
+  return stub_entry;
+}
+
+/* Add a new stub entry to the stub hash.  Not all fields of the new
+   stub entry are initialised.  */
+
+static struct ppc_stub_hash_entry *
+ppc_add_stub (const char *stub_name,
+	      asection *section,
+	      struct bfd_link_info *info)
+{
+  struct ppc_link_hash_table *htab = ppc_hash_table (info);
+  asection *link_sec;
+  asection *stub_sec;
+  struct ppc_stub_hash_entry *stub_entry;
+
+  link_sec = htab->stub_group[section->id].link_sec;
+  stub_sec = htab->stub_group[section->id].stub_sec;
+  if (stub_sec == NULL)
+    {
+      stub_sec = htab->stub_group[link_sec->id].stub_sec;
+      if (stub_sec == NULL)
+	{
+	  size_t namelen;
+	  bfd_size_type len;
+	  char *s_name;
+
+	  namelen = strlen (link_sec->name);
+	  len = namelen + sizeof (STUB_SUFFIX);
+	  s_name = bfd_alloc (htab->stub_bfd, len);
+	  if (s_name == NULL)
+	    return NULL;
+
+	  memcpy (s_name, link_sec->name, namelen);
+	  memcpy (s_name + namelen, STUB_SUFFIX, sizeof (STUB_SUFFIX));
+	  stub_sec = (*htab->add_stub_section) (s_name, link_sec);
+	  if (stub_sec == NULL)
+	    return NULL;
+	  htab->stub_group[link_sec->id].stub_sec = stub_sec;
+	}
+      htab->stub_group[section->id].stub_sec = stub_sec;
+    }
+
+  /* Enter this entry into the linker stub hash table.  */
+  stub_entry = ppc_stub_hash_lookup (&htab->stub_hash_table, stub_name,
+				     TRUE, FALSE);
+  if (stub_entry == NULL)
+    {
+      info->callbacks->einfo (_("%P: %B: cannot create stub entry %s\n"),
+			      section->owner, stub_name);
+      return NULL;
+    }
+
+  stub_entry->stub_sec = stub_sec;
+  stub_entry->stub_offset = 0;
+  stub_entry->id_sec = link_sec;
+  return stub_entry;
+}
+
+/* Create sections for linker generated code.  */
+
+static bfd_boolean
+create_linkage_sections (bfd *dynobj, struct bfd_link_info *info)
+{
+  struct ppc_link_hash_table *htab;
+  flagword flags;
+
+  htab = ppc_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* Create .sfpr for code to save and restore fp regs.  */
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_READONLY
+	   | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED);
+  htab->sfpr = bfd_make_section_anyway_with_flags (dynobj, ".sfpr",
+						   flags);
+  if (htab->sfpr == NULL
+      || ! bfd_set_section_alignment (dynobj, htab->sfpr, 2))
+    return FALSE;
+
+  /* Create .glink for lazy dynamic linking support.  */
+  htab->glink = bfd_make_section_anyway_with_flags (dynobj, ".glink",
+						    flags);
+  if (htab->glink == NULL
+      || ! bfd_set_section_alignment (dynobj, htab->glink, 3))
+    return FALSE;
+
+  if (!info->no_ld_generated_unwind_info)
+    {
+      flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_HAS_CONTENTS
+	       | SEC_IN_MEMORY | SEC_LINKER_CREATED);
+      htab->glink_eh_frame = bfd_make_section_anyway_with_flags (dynobj,
+								 ".eh_frame",
+								 flags);
+      if (htab->glink_eh_frame == NULL
+	  || !bfd_set_section_alignment (abfd, htab->glink_eh_frame, 2))
+	return FALSE;
+    }
+
+  flags = SEC_ALLOC | SEC_LINKER_CREATED;
+  htab->iplt = bfd_make_section_anyway_with_flags (dynobj, ".iplt", flags);
+  if (htab->iplt == NULL
+      || ! bfd_set_section_alignment (dynobj, htab->iplt, 3))
+    return FALSE;
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY
+	   | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED);
+  htab->reliplt = bfd_make_section_anyway_with_flags (dynobj,
+						      ".rela.iplt",
+						      flags);
+  if (htab->reliplt == NULL
+      || ! bfd_set_section_alignment (dynobj, htab->reliplt, 3))
+    return FALSE;
+
+  /* Create branch lookup table for plt_branch stubs.  */
+  flags = (SEC_ALLOC | SEC_LOAD
+	   | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED);
+  htab->brlt = bfd_make_section_anyway_with_flags (dynobj, ".branch_lt",
+						   flags);
+  if (htab->brlt == NULL
+      || ! bfd_set_section_alignment (dynobj, htab->brlt, 3))
+    return FALSE;
+
+  if (!info->shared)
+    return TRUE;
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY
+	   | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED);
+  htab->relbrlt = bfd_make_section_anyway_with_flags (dynobj,
+						      ".rela.branch_lt",
+						      flags);
+  if (htab->relbrlt == NULL
+      || ! bfd_set_section_alignment (dynobj, htab->relbrlt, 3))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Create .got and .rela.got sections in ABFD, and .got in dynobj if
+   not already done.  */
+
+static bfd_boolean
+create_got_section (bfd *abfd, struct bfd_link_info *info)
+{
+  asection *got, *relgot;
+  flagword flags;
+  struct ppc_link_hash_table *htab = ppc_hash_table (info);
+
+  if (!is_ppc64_elf (abfd))
+    return FALSE;
+  if (htab == NULL)
+    return FALSE;
+
+  if (!htab->got)
+    {
+      if (! _bfd_elf_create_got_section (htab->elf.dynobj, info))
+	return FALSE;
+
+      htab->got = bfd_get_section_by_name (htab->elf.dynobj, ".got");
+      if (!htab->got)
+	abort ();
+    }
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	   | SEC_LINKER_CREATED);
+
+  got = bfd_make_section_anyway_with_flags (abfd, ".got", flags);
+  if (!got
+      || !bfd_set_section_alignment (abfd, got, 3))
+    return FALSE;
+
+  relgot = bfd_make_section_anyway_with_flags (abfd, ".rela.got",
+					       flags | SEC_READONLY);
+  if (!relgot
+      || ! bfd_set_section_alignment (abfd, relgot, 3))
+    return FALSE;
+
+  ppc64_elf_tdata (abfd)->got = got;
+  ppc64_elf_tdata (abfd)->relgot = relgot;
+  return TRUE;
+}
+
+/* Create the dynamic sections, and set up shortcuts.  */
+
+static bfd_boolean
+ppc64_elf_create_dynamic_sections (bfd *dynobj, struct bfd_link_info *info)
+{
+  struct ppc_link_hash_table *htab;
+
+  if (!_bfd_elf_create_dynamic_sections (dynobj, info))
+    return FALSE;
+
+  htab = ppc_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (!htab->got)
+    htab->got = bfd_get_section_by_name (dynobj, ".got");
+  htab->plt = bfd_get_section_by_name (dynobj, ".plt");
+  htab->relplt = bfd_get_section_by_name (dynobj, ".rela.plt");
+  htab->dynbss = bfd_get_section_by_name (dynobj, ".dynbss");
+  if (!info->shared)
+    htab->relbss = bfd_get_section_by_name (dynobj, ".rela.bss");
+
+  if (!htab->got || !htab->plt || !htab->relplt || !htab->dynbss
+      || (!info->shared && !htab->relbss))
+    abort ();
+
+  return TRUE;
+}
+
+/* Follow indirect and warning symbol links.  */
+
+static inline struct bfd_link_hash_entry *
+follow_link (struct bfd_link_hash_entry *h)
+{
+  while (h->type == bfd_link_hash_indirect
+	 || h->type == bfd_link_hash_warning)
+    h = h->u.i.link;
+  return h;
+}
+
+static inline struct elf_link_hash_entry *
+elf_follow_link (struct elf_link_hash_entry *h)
+{
+  return (struct elf_link_hash_entry *) follow_link (&h->root);
+}
+
+static inline struct ppc_link_hash_entry *
+ppc_follow_link (struct ppc_link_hash_entry *h)
+{
+  return (struct ppc_link_hash_entry *) follow_link (&h->elf.root);
+}
+
+/* Merge PLT info on FROM with that on TO.  */
+
+static void
+move_plt_plist (struct ppc_link_hash_entry *from,
+		struct ppc_link_hash_entry *to)
+{
+  if (from->elf.plt.plist != NULL)
+    {
+      if (to->elf.plt.plist != NULL)
+	{
+	  struct plt_entry **entp;
+	  struct plt_entry *ent;
+
+	  for (entp = &from->elf.plt.plist; (ent = *entp) != NULL; )
+	    {
+	      struct plt_entry *dent;
+
+	      for (dent = to->elf.plt.plist; dent != NULL; dent = dent->next)
+		if (dent->addend == ent->addend)
+		  {
+		    dent->plt.refcount += ent->plt.refcount;
+		    *entp = ent->next;
+		    break;
+		  }
+	      if (dent == NULL)
+		entp = &ent->next;
+	    }
+	  *entp = to->elf.plt.plist;
+	}
+
+      to->elf.plt.plist = from->elf.plt.plist;
+      from->elf.plt.plist = NULL;
+    }
+}
+
+/* Copy the extra info we tack onto an elf_link_hash_entry.  */
+
+static void
+ppc64_elf_copy_indirect_symbol (struct bfd_link_info *info,
+				struct elf_link_hash_entry *dir,
+				struct elf_link_hash_entry *ind)
+{
+  struct ppc_link_hash_entry *edir, *eind;
+
+  edir = (struct ppc_link_hash_entry *) dir;
+  eind = (struct ppc_link_hash_entry *) ind;
+
+  edir->is_func |= eind->is_func;
+  edir->is_func_descriptor |= eind->is_func_descriptor;
+  edir->tls_mask |= eind->tls_mask;
+  if (eind->oh != NULL)
+    edir->oh = ppc_follow_link (eind->oh);
+
+  /* If called to transfer flags for a weakdef during processing
+     of elf_adjust_dynamic_symbol, don't copy NON_GOT_REF.
+     We clear it ourselves for ELIMINATE_COPY_RELOCS.  */
+  if (!(ELIMINATE_COPY_RELOCS
+	&& eind->elf.root.type != bfd_link_hash_indirect
+	&& edir->elf.dynamic_adjusted))
+    edir->elf.non_got_ref |= eind->elf.non_got_ref;
+
+  edir->elf.ref_dynamic |= eind->elf.ref_dynamic;
+  edir->elf.ref_regular |= eind->elf.ref_regular;
+  edir->elf.ref_regular_nonweak |= eind->elf.ref_regular_nonweak;
+  edir->elf.needs_plt |= eind->elf.needs_plt;
+
+  /* If we were called to copy over info for a weak sym, that's all.  */
+  if (eind->elf.root.type != bfd_link_hash_indirect)
+    return;
+
+  /* Copy over any dynamic relocs we may have on the indirect sym.  */
+  if (eind->dyn_relocs != NULL)
+    {
+      if (edir->dyn_relocs != NULL)
+	{
+	  struct elf_dyn_relocs **pp;
+	  struct elf_dyn_relocs *p;
+
+	  /* Add reloc counts against the indirect sym to the direct sym
+	     list.  Merge any entries against the same section.  */
+	  for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      struct elf_dyn_relocs *q;
+
+	      for (q = edir->dyn_relocs; q != NULL; q = q->next)
+		if (q->sec == p->sec)
+		  {
+		    q->pc_count += p->pc_count;
+		    q->count += p->count;
+		    *pp = p->next;
+		    break;
+		  }
+	      if (q == NULL)
+		pp = &p->next;
+	    }
+	  *pp = edir->dyn_relocs;
+	}
+
+      edir->dyn_relocs = eind->dyn_relocs;
+      eind->dyn_relocs = NULL;
+    }
+
+  /* Copy over got entries that we may have already seen to the
+     symbol which just became indirect.  */
+  if (eind->elf.got.glist != NULL)
+    {
+      if (edir->elf.got.glist != NULL)
+	{
+	  struct got_entry **entp;
+	  struct got_entry *ent;
+
+	  for (entp = &eind->elf.got.glist; (ent = *entp) != NULL; )
+	    {
+	      struct got_entry *dent;
+
+	      for (dent = edir->elf.got.glist; dent != NULL; dent = dent->next)
+		if (dent->addend == ent->addend
+		    && dent->owner == ent->owner
+		    && dent->tls_type == ent->tls_type)
+		  {
+		    dent->got.refcount += ent->got.refcount;
+		    *entp = ent->next;
+		    break;
+		  }
+	      if (dent == NULL)
+		entp = &ent->next;
+	    }
+	  *entp = edir->elf.got.glist;
+	}
+
+      edir->elf.got.glist = eind->elf.got.glist;
+      eind->elf.got.glist = NULL;
+    }
+
+  /* And plt entries.  */
+  move_plt_plist (eind, edir);
+
+  if (eind->elf.dynindx != -1)
+    {
+      if (edir->elf.dynindx != -1)
+	_bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
+				edir->elf.dynstr_index);
+      edir->elf.dynindx = eind->elf.dynindx;
+      edir->elf.dynstr_index = eind->elf.dynstr_index;
+      eind->elf.dynindx = -1;
+      eind->elf.dynstr_index = 0;
+    }
+}
+
+/* Find the function descriptor hash entry from the given function code
+   hash entry FH.  Link the entries via their OH fields.  */
+
+static struct ppc_link_hash_entry *
+lookup_fdh (struct ppc_link_hash_entry *fh, struct ppc_link_hash_table *htab)
+{
+  struct ppc_link_hash_entry *fdh = fh->oh;
+
+  if (fdh == NULL)
+    {
+      const char *fd_name = fh->elf.root.root.string + 1;
+
+      fdh = (struct ppc_link_hash_entry *)
+	elf_link_hash_lookup (&htab->elf, fd_name, FALSE, FALSE, FALSE);
+      if (fdh == NULL)
+	return fdh;
+
+      fdh->is_func_descriptor = 1;
+      fdh->oh = fh;
+      fh->is_func = 1;
+      fh->oh = fdh;
+    }
+
+  return ppc_follow_link (fdh);
+}
+
+/* Make a fake function descriptor sym for the code sym FH.  */
+
+static struct ppc_link_hash_entry *
+make_fdh (struct bfd_link_info *info,
+	  struct ppc_link_hash_entry *fh)
+{
+  bfd *abfd;
+  asymbol *newsym;
+  struct bfd_link_hash_entry *bh;
+  struct ppc_link_hash_entry *fdh;
+
+  abfd = fh->elf.root.u.undef.abfd;
+  newsym = bfd_make_empty_symbol (abfd);
+  newsym->name = fh->elf.root.root.string + 1;
+  newsym->section = bfd_und_section_ptr;
+  newsym->value = 0;
+  newsym->flags = BSF_WEAK;
+
+  bh = NULL;
+  if (!_bfd_generic_link_add_one_symbol (info, abfd, newsym->name,
+					 newsym->flags, newsym->section,
+					 newsym->value, NULL, FALSE, FALSE,
+					 &bh))
+    return NULL;
+
+  fdh = (struct ppc_link_hash_entry *) bh;
+  fdh->elf.non_elf = 0;
+  fdh->fake = 1;
+  fdh->is_func_descriptor = 1;
+  fdh->oh = fh;
+  fh->is_func = 1;
+  fh->oh = fdh;
+  return fdh;
+}
+
+/* Fix function descriptor symbols defined in .opd sections to be
+   function type.  */
+
+static bfd_boolean
+ppc64_elf_add_symbol_hook (bfd *ibfd,
+			   struct bfd_link_info *info,
+			   Elf_Internal_Sym *isym,
+			   const char **name ATTRIBUTE_UNUSED,
+			   flagword *flags ATTRIBUTE_UNUSED,
+			   asection **sec,
+			   bfd_vma *value ATTRIBUTE_UNUSED)
+{
+  if ((ibfd->flags & DYNAMIC) == 0
+      && ELF_ST_BIND (isym->st_info) == STB_GNU_UNIQUE)
+    elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE;
+
+  if (ELF_ST_TYPE (isym->st_info) == STT_GNU_IFUNC)
+    {
+      if ((ibfd->flags & DYNAMIC) == 0)
+	elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE;
+    }
+  else if (ELF_ST_TYPE (isym->st_info) == STT_FUNC)
+    ;
+  else if (*sec != NULL
+	   && strcmp ((*sec)->name, ".opd") == 0)
+    isym->st_info = ELF_ST_INFO (ELF_ST_BIND (isym->st_info), STT_FUNC);
+
+  return TRUE;
+}
+
+/* This function makes an old ABI object reference to ".bar" cause the
+   inclusion of a new ABI object archive that defines "bar".
+   NAME is a symbol defined in an archive.  Return a symbol in the hash
+   table that might be satisfied by the archive symbols.  */
+
+static struct elf_link_hash_entry *
+ppc64_elf_archive_symbol_lookup (bfd *abfd,
+				 struct bfd_link_info *info,
+				 const char *name)
+{
+  struct elf_link_hash_entry *h;
+  char *dot_name;
+  size_t len;
+
+  h = _bfd_elf_archive_symbol_lookup (abfd, info, name);
+  if (h != NULL
+      /* Don't return this sym if it is a fake function descriptor
+	 created by add_symbol_adjust.  */
+      && !(h->root.type == bfd_link_hash_undefweak
+	   && ((struct ppc_link_hash_entry *) h)->fake))
+    return h;
+
+  if (name[0] == '.')
+    return h;
+
+  len = strlen (name);
+  dot_name = bfd_alloc (abfd, len + 2);
+  if (dot_name == NULL)
+    return (struct elf_link_hash_entry *) 0 - 1;
+  dot_name[0] = '.';
+  memcpy (dot_name + 1, name, len + 1);
+  h = _bfd_elf_archive_symbol_lookup (abfd, info, dot_name);
+  bfd_release (abfd, dot_name);
+  return h;
+}
+
+/* This function satisfies all old ABI object references to ".bar" if a
+   new ABI object defines "bar".  Well, at least, undefined dot symbols
+   are made weak.  This stops later archive searches from including an
+   object if we already have a function descriptor definition.  It also
+   prevents the linker complaining about undefined symbols.
+   We also check and correct mismatched symbol visibility here.  The
+   most restrictive visibility of the function descriptor and the
+   function entry symbol is used.  */
+
+static bfd_boolean
+add_symbol_adjust (struct ppc_link_hash_entry *eh, struct bfd_link_info *info)
+{
+  struct ppc_link_hash_table *htab;
+  struct ppc_link_hash_entry *fdh;
+
+  if (eh->elf.root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  if (eh->elf.root.type == bfd_link_hash_warning)
+    eh = (struct ppc_link_hash_entry *) eh->elf.root.u.i.link;
+
+  if (eh->elf.root.root.string[0] != '.')
+    abort ();
+
+  htab = ppc_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  fdh = lookup_fdh (eh, htab);
+  if (fdh == NULL)
+    {
+      if (!info->relocatable
+	  && (eh->elf.root.type == bfd_link_hash_undefined
+	      || eh->elf.root.type == bfd_link_hash_undefweak)
+	  && eh->elf.ref_regular)
+	{
+	  /* Make an undefweak function descriptor sym, which is enough to
+	     pull in an --as-needed shared lib, but won't cause link
+	     errors.  Archives are handled elsewhere.  */
+	  fdh = make_fdh (info, eh);
+	  if (fdh == NULL)
+	    return FALSE;
+	  fdh->elf.ref_regular = 1;
+	}
+    }
+  else
+    {
+      unsigned entry_vis = ELF_ST_VISIBILITY (eh->elf.other) - 1;
+      unsigned descr_vis = ELF_ST_VISIBILITY (fdh->elf.other) - 1;
+      if (entry_vis < descr_vis)
+	fdh->elf.other += entry_vis - descr_vis;
+      else if (entry_vis > descr_vis)
+	eh->elf.other += descr_vis - entry_vis;
+
+      if ((fdh->elf.root.type == bfd_link_hash_defined
+	   || fdh->elf.root.type == bfd_link_hash_defweak)
+	  && eh->elf.root.type == bfd_link_hash_undefined)
+	{
+	  eh->elf.root.type = bfd_link_hash_undefweak;
+	  eh->was_undefined = 1;
+	  htab->twiddled_syms = 1;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Process list of dot-symbols we made in link_hash_newfunc.  */
+
+static bfd_boolean
+ppc64_elf_process_dot_syms (bfd *ibfd, struct bfd_link_info *info)
+{
+  struct ppc_link_hash_table *htab;
+  struct ppc_link_hash_entry **p, *eh;
+
+  if (!is_ppc64_elf (info->output_bfd))
+    return TRUE;
+  htab = ppc_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (is_ppc64_elf (ibfd))
+    {
+      p = &htab->dot_syms;
+      while ((eh = *p) != NULL)
+	{
+	  *p = NULL;
+	  if (!add_symbol_adjust (eh, info))
+	    return FALSE;
+	  p = &eh->u.next_dot_sym;
+	}
+    }
+
+  /* Clear the list for non-ppc64 input files.  */
+  p = &htab->dot_syms;
+  while ((eh = *p) != NULL)
+    {
+      *p = NULL;
+      p = &eh->u.next_dot_sym;
+    }
+
+  /* We need to fix the undefs list for any syms we have twiddled to
+     undef_weak.  */
+  if (htab->twiddled_syms)
+    {
+      bfd_link_repair_undef_list (&htab->elf.root);
+      htab->twiddled_syms = 0;
+    }
+  return TRUE;
+}
+
+/* Undo hash table changes when an --as-needed input file is determined
+   not to be needed.  */
+
+static bfd_boolean
+ppc64_elf_as_needed_cleanup (bfd *ibfd ATTRIBUTE_UNUSED,
+			     struct bfd_link_info *info)
+{
+  struct ppc_link_hash_table *htab = ppc_hash_table (info);
+
+  if (htab == NULL)
+    return FALSE;
+
+  htab->dot_syms = NULL;
+  return TRUE;
+}
+
+/* If --just-symbols against a final linked binary, then assume we need
+   toc adjusting stubs when calling functions defined there.  */
+
+static void
+ppc64_elf_link_just_syms (asection *sec, struct bfd_link_info *info)
+{
+  if ((sec->flags & SEC_CODE) != 0
+      && (sec->owner->flags & (EXEC_P | DYNAMIC)) != 0
+      && is_ppc64_elf (sec->owner))
+    {
+      asection *got = bfd_get_section_by_name (sec->owner, ".got");
+      if (got != NULL
+	  && got->size >= elf_backend_got_header_size
+	  && bfd_get_section_by_name (sec->owner, ".opd") != NULL)
+	sec->has_toc_reloc = 1;
+    }
+  _bfd_elf_link_just_syms (sec, info);
+}
+
+static struct plt_entry **
+update_local_sym_info (bfd *abfd, Elf_Internal_Shdr *symtab_hdr,
+		       unsigned long r_symndx, bfd_vma r_addend, int tls_type)
+{
+  struct got_entry **local_got_ents = elf_local_got_ents (abfd);
+  struct plt_entry **local_plt;
+  unsigned char *local_got_tls_masks;
+
+  if (local_got_ents == NULL)
+    {
+      bfd_size_type size = symtab_hdr->sh_info;
+
+      size *= (sizeof (*local_got_ents)
+	       + sizeof (*local_plt)
+	       + sizeof (*local_got_tls_masks));
+      local_got_ents = bfd_zalloc (abfd, size);
+      if (local_got_ents == NULL)
+	return NULL;
+      elf_local_got_ents (abfd) = local_got_ents;
+    }
+
+  if ((tls_type & (PLT_IFUNC | TLS_EXPLICIT)) == 0)
+    {
+      struct got_entry *ent;
+
+      for (ent = local_got_ents[r_symndx]; ent != NULL; ent = ent->next)
+	if (ent->addend == r_addend
+	    && ent->owner == abfd
+	    && ent->tls_type == tls_type)
+	  break;
+      if (ent == NULL)
+	{
+	  bfd_size_type amt = sizeof (*ent);
+	  ent = bfd_alloc (abfd, amt);
+	  if (ent == NULL)
+	    return FALSE;
+	  ent->next = local_got_ents[r_symndx];
+	  ent->addend = r_addend;
+	  ent->owner = abfd;
+	  ent->tls_type = tls_type;
+	  ent->is_indirect = FALSE;
+	  ent->got.refcount = 0;
+	  local_got_ents[r_symndx] = ent;
+	}
+      ent->got.refcount += 1;
+    }
+
+  local_plt = (struct plt_entry **) (local_got_ents + symtab_hdr->sh_info);
+  local_got_tls_masks = (unsigned char *) (local_plt + symtab_hdr->sh_info);
+  local_got_tls_masks[r_symndx] |= tls_type;
+
+  return local_plt + r_symndx;
+}
+
+static bfd_boolean
+update_plt_info (bfd *abfd, struct plt_entry **plist, bfd_vma addend)
+{
+  struct plt_entry *ent;
+
+  for (ent = *plist; ent != NULL; ent = ent->next)
+    if (ent->addend == addend)
+      break;
+  if (ent == NULL)
+    {
+      bfd_size_type amt = sizeof (*ent);
+      ent = bfd_alloc (abfd, amt);
+      if (ent == NULL)
+	return FALSE;
+      ent->next = *plist;
+      ent->addend = addend;
+      ent->plt.refcount = 0;
+      *plist = ent;
+    }
+  ent->plt.refcount += 1;
+  return TRUE;
+}
+
+static bfd_boolean
+is_branch_reloc (enum elf_ppc64_reloc_type r_type)
+{
+  return (r_type == R_PPC64_REL24
+	  || r_type == R_PPC64_REL14
+	  || r_type == R_PPC64_REL14_BRTAKEN
+	  || r_type == R_PPC64_REL14_BRNTAKEN
+	  || r_type == R_PPC64_ADDR24
+	  || r_type == R_PPC64_ADDR14
+	  || r_type == R_PPC64_ADDR14_BRTAKEN
+	  || r_type == R_PPC64_ADDR14_BRNTAKEN);
+}
+
+/* Look through the relocs for a section during the first phase, and
+   calculate needed space in the global offset table, procedure
+   linkage table, and dynamic reloc sections.  */
+
+static bfd_boolean
+ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
+			asection *sec, const Elf_Internal_Rela *relocs)
+{
+  struct ppc_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  asection *sreloc;
+  asection **opd_sym_map;
+  struct elf_link_hash_entry *tga, *dottga;
+
+  if (info->relocatable)
+    return TRUE;
+
+  /* Don't do anything special with non-loaded, non-alloced sections.
+     In particular, any relocs in such sections should not affect GOT
+     and PLT reference counting (ie. we don't allow them to create GOT
+     or PLT entries), there's no possibility or desire to optimize TLS
+     relocs, and there's not much point in propagating relocs to shared
+     libs that the dynamic linker won't relocate.  */
+  if ((sec->flags & SEC_ALLOC) == 0)
+    return TRUE;
+
+  BFD_ASSERT (is_ppc64_elf (abfd));
+
+  htab = ppc_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  tga = elf_link_hash_lookup (&htab->elf, "__tls_get_addr",
+			      FALSE, FALSE, TRUE);
+  dottga = elf_link_hash_lookup (&htab->elf, ".__tls_get_addr",
+				 FALSE, FALSE, TRUE);
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+  sreloc = NULL;
+  opd_sym_map = NULL;
+  if (strcmp (sec->name, ".opd") == 0)
+    {
+      /* Garbage collection needs some extra help with .opd sections.
+	 We don't want to necessarily keep everything referenced by
+	 relocs in .opd, as that would keep all functions.  Instead,
+	 if we reference an .opd symbol (a function descriptor), we
+	 want to keep the function code symbol's section.  This is
+	 easy for global symbols, but for local syms we need to keep
+	 information about the associated function section.  */
+      bfd_size_type amt;
+
+      amt = sec->size * sizeof (*opd_sym_map) / 8;
+      opd_sym_map = bfd_zalloc (abfd, amt);
+      if (opd_sym_map == NULL)
+	return FALSE;
+      ppc64_elf_section_data (sec)->u.opd.func_sec = opd_sym_map;
+      BFD_ASSERT (ppc64_elf_section_data (sec)->sec_type == sec_normal);
+      ppc64_elf_section_data (sec)->sec_type = sec_opd;
+    }
+
+  if (htab->sfpr == NULL
+      && !create_linkage_sections (htab->elf.dynobj, info))
+    return FALSE;
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+      enum elf_ppc64_reloc_type r_type;
+      int tls_type;
+      struct _ppc64_elf_section_data *ppc64_sec;
+      struct plt_entry **ifunc;
+
+      r_symndx = ELF64_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+	h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  h = elf_follow_link (h);
+	}
+
+      tls_type = 0;
+      ifunc = NULL;
+      if (h != NULL)
+	{
+	  if (h->type == STT_GNU_IFUNC)
+	    {
+	      h->needs_plt = 1;
+	      ifunc = &h->plt.plist;
+	    }
+	}
+      else
+	{
+	  Elf_Internal_Sym *isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+							  abfd, r_symndx);
+	  if (isym == NULL)
+	    return FALSE;
+
+	  if (ELF_ST_TYPE (isym->st_info) == STT_GNU_IFUNC)
+	    {
+	      ifunc = update_local_sym_info (abfd, symtab_hdr, r_symndx,
+					     rel->r_addend, PLT_IFUNC);
+	      if (ifunc == NULL)
+		return FALSE;
+	    }
+	}
+      r_type = ELF64_R_TYPE (rel->r_info);
+      if (is_branch_reloc (r_type))
+	{
+	  if (h != NULL && (h == tga || h == dottga))
+	    {
+	      if (rel != relocs
+		  && (ELF64_R_TYPE (rel[-1].r_info) == R_PPC64_TLSGD
+		      || ELF64_R_TYPE (rel[-1].r_info) == R_PPC64_TLSLD))
+		/* We have a new-style __tls_get_addr call with a marker
+		   reloc.  */
+		;
+	      else
+		/* Mark this section as having an old-style call.  */
+		sec->has_tls_get_addr_call = 1;
+	    }
+
+	  /* STT_GNU_IFUNC symbols must have a PLT entry.  */
+	  if (ifunc != NULL
+	      && !update_plt_info (abfd, ifunc, rel->r_addend))
+	    return FALSE;
+	}
+
+      switch (r_type)
+	{
+	case R_PPC64_TLSGD:
+	case R_PPC64_TLSLD:
+	  /* These special tls relocs tie a call to __tls_get_addr with
+	     its parameter symbol.  */
+	  break;
+
+	case R_PPC64_GOT_TLSLD16:
+	case R_PPC64_GOT_TLSLD16_LO:
+	case R_PPC64_GOT_TLSLD16_HI:
+	case R_PPC64_GOT_TLSLD16_HA:
+	  tls_type = TLS_TLS | TLS_LD;
+	  goto dogottls;
+
+	case R_PPC64_GOT_TLSGD16:
+	case R_PPC64_GOT_TLSGD16_LO:
+	case R_PPC64_GOT_TLSGD16_HI:
+	case R_PPC64_GOT_TLSGD16_HA:
+	  tls_type = TLS_TLS | TLS_GD;
+	  goto dogottls;
+
+	case R_PPC64_GOT_TPREL16_DS:
+	case R_PPC64_GOT_TPREL16_LO_DS:
+	case R_PPC64_GOT_TPREL16_HI:
+	case R_PPC64_GOT_TPREL16_HA:
+	  if (!info->executable)
+	    info->flags |= DF_STATIC_TLS;
+	  tls_type = TLS_TLS | TLS_TPREL;
+	  goto dogottls;
+
+	case R_PPC64_GOT_DTPREL16_DS:
+	case R_PPC64_GOT_DTPREL16_LO_DS:
+	case R_PPC64_GOT_DTPREL16_HI:
+	case R_PPC64_GOT_DTPREL16_HA:
+	  tls_type = TLS_TLS | TLS_DTPREL;
+	dogottls:
+	  sec->has_tls_reloc = 1;
+	  /* Fall thru */
+
+	case R_PPC64_GOT16:
+	case R_PPC64_GOT16_DS:
+	case R_PPC64_GOT16_HA:
+	case R_PPC64_GOT16_HI:
+	case R_PPC64_GOT16_LO:
+	case R_PPC64_GOT16_LO_DS:
+	  /* This symbol requires a global offset table entry.  */
+	  sec->has_toc_reloc = 1;
+	  if (r_type == R_PPC64_GOT_TLSLD16
+	      || r_type == R_PPC64_GOT_TLSGD16
+	      || r_type == R_PPC64_GOT_TPREL16_DS
+	      || r_type == R_PPC64_GOT_DTPREL16_DS
+	      || r_type == R_PPC64_GOT16
+	      || r_type == R_PPC64_GOT16_DS)
+	    {
+	      htab->do_multi_toc = 1;
+	      ppc64_elf_tdata (abfd)->has_small_toc_reloc = 1;
+	    }
+
+	  if (ppc64_elf_tdata (abfd)->got == NULL
+	      && !create_got_section (abfd, info))
+	    return FALSE;
+
+	  if (h != NULL)
+	    {
+	      struct ppc_link_hash_entry *eh;
+	      struct got_entry *ent;
+
+	      eh = (struct ppc_link_hash_entry *) h;
+	      for (ent = eh->elf.got.glist; ent != NULL; ent = ent->next)
+		if (ent->addend == rel->r_addend
+		    && ent->owner == abfd
+		    && ent->tls_type == tls_type)
+		  break;
+	      if (ent == NULL)
+		{
+		  bfd_size_type amt = sizeof (*ent);
+		  ent = bfd_alloc (abfd, amt);
+		  if (ent == NULL)
+		    return FALSE;
+		  ent->next = eh->elf.got.glist;
+		  ent->addend = rel->r_addend;
+		  ent->owner = abfd;
+		  ent->tls_type = tls_type;
+		  ent->is_indirect = FALSE;
+		  ent->got.refcount = 0;
+		  eh->elf.got.glist = ent;
+		}
+	      ent->got.refcount += 1;
+	      eh->tls_mask |= tls_type;
+	    }
+	  else
+	    /* This is a global offset table entry for a local symbol.  */
+	    if (!update_local_sym_info (abfd, symtab_hdr, r_symndx,
+					rel->r_addend, tls_type))
+	      return FALSE;
+	  break;
+
+	case R_PPC64_PLT16_HA:
+	case R_PPC64_PLT16_HI:
+	case R_PPC64_PLT16_LO:
+	case R_PPC64_PLT32:
+	case R_PPC64_PLT64:
+	  /* This symbol requires a procedure linkage table entry.  We
+	     actually build the entry in adjust_dynamic_symbol,
+	     because this might be a case of linking PIC code without
+	     linking in any dynamic objects, in which case we don't
+	     need to generate a procedure linkage table after all.  */
+	  if (h == NULL)
+	    {
+	      /* It does not make sense to have a procedure linkage
+		 table entry for a local symbol.  */
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	  else
+	    {
+	      if (!update_plt_info (abfd, &h->plt.plist, rel->r_addend))
+		return FALSE;
+	      h->needs_plt = 1;
+	      if (h->root.root.string[0] == '.'
+		  && h->root.root.string[1] != '\0')
+		((struct ppc_link_hash_entry *) h)->is_func = 1;
+	    }
+	  break;
+
+	  /* The following relocations don't need to propagate the
+	     relocation if linking a shared object since they are
+	     section relative.  */
+	case R_PPC64_SECTOFF:
+	case R_PPC64_SECTOFF_LO:
+	case R_PPC64_SECTOFF_HI:
+	case R_PPC64_SECTOFF_HA:
+	case R_PPC64_SECTOFF_DS:
+	case R_PPC64_SECTOFF_LO_DS:
+	case R_PPC64_DTPREL16:
+	case R_PPC64_DTPREL16_LO:
+	case R_PPC64_DTPREL16_HI:
+	case R_PPC64_DTPREL16_HA:
+	case R_PPC64_DTPREL16_DS:
+	case R_PPC64_DTPREL16_LO_DS:
+	case R_PPC64_DTPREL16_HIGHER:
+	case R_PPC64_DTPREL16_HIGHERA:
+	case R_PPC64_DTPREL16_HIGHEST:
+	case R_PPC64_DTPREL16_HIGHESTA:
+	  break;
+
+	  /* Nor do these.  */
+	case R_PPC64_REL16:
+	case R_PPC64_REL16_LO:
+	case R_PPC64_REL16_HI:
+	case R_PPC64_REL16_HA:
+	  break;
+
+	case R_PPC64_TOC16:
+	case R_PPC64_TOC16_DS:
+	  htab->do_multi_toc = 1;
+	  ppc64_elf_tdata (abfd)->has_small_toc_reloc = 1;
+	case R_PPC64_TOC16_LO:
+	case R_PPC64_TOC16_HI:
+	case R_PPC64_TOC16_HA:
+	case R_PPC64_TOC16_LO_DS:
+	  sec->has_toc_reloc = 1;
+	  break;
+
+	  /* This relocation describes the C++ object vtable hierarchy.
+	     Reconstruct it for later use during GC.  */
+	case R_PPC64_GNU_VTINHERIT:
+	  if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+	    return FALSE;
+	  break;
+
+	  /* This relocation describes which C++ vtable entries are actually
+	     used.  Record for later use during GC.  */
+	case R_PPC64_GNU_VTENTRY:
+	  BFD_ASSERT (h != NULL);
+	  if (h != NULL
+	      && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+	    return FALSE;
+	  break;
+
+	case R_PPC64_REL14:
+	case R_PPC64_REL14_BRTAKEN:
+	case R_PPC64_REL14_BRNTAKEN:
+	  {
+	    asection *dest = NULL;
+
+	    /* Heuristic: If jumping outside our section, chances are
+	       we are going to need a stub.  */
+	    if (h != NULL)
+	      {
+		/* If the sym is weak it may be overridden later, so
+		   don't assume we know where a weak sym lives.  */
+		if (h->root.type == bfd_link_hash_defined)
+		  dest = h->root.u.def.section;
+	      }
+	    else
+	      {
+		Elf_Internal_Sym *isym;
+
+		isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+					      abfd, r_symndx);
+		if (isym == NULL)
+		  return FALSE;
+
+		dest = bfd_section_from_elf_index (abfd, isym->st_shndx);
+	      }
+
+	    if (dest != sec)
+	      ppc64_elf_section_data (sec)->has_14bit_branch = 1;
+	  }
+	  /* Fall through.  */
+
+	case R_PPC64_REL24:
+	  if (h != NULL && ifunc == NULL)
+	    {
+	      /* We may need a .plt entry if the function this reloc
+		 refers to is in a shared lib.  */
+	      if (!update_plt_info (abfd, &h->plt.plist, rel->r_addend))
+		return FALSE;
+	      h->needs_plt = 1;
+	      if (h->root.root.string[0] == '.'
+		  && h->root.root.string[1] != '\0')
+		((struct ppc_link_hash_entry *) h)->is_func = 1;
+	      if (h == tga || h == dottga)
+		sec->has_tls_reloc = 1;
+	    }
+	  break;
+
+	case R_PPC64_TPREL64:
+	  tls_type = TLS_EXPLICIT | TLS_TLS | TLS_TPREL;
+	  if (!info->executable)
+	    info->flags |= DF_STATIC_TLS;
+	  goto dotlstoc;
+
+	case R_PPC64_DTPMOD64:
+	  if (rel + 1 < rel_end
+	      && rel[1].r_info == ELF64_R_INFO (r_symndx, R_PPC64_DTPREL64)
+	      && rel[1].r_offset == rel->r_offset + 8)
+	    tls_type = TLS_EXPLICIT | TLS_TLS | TLS_GD;
+	  else
+	    tls_type = TLS_EXPLICIT | TLS_TLS | TLS_LD;
+	  goto dotlstoc;
+
+	case R_PPC64_DTPREL64:
+	  tls_type = TLS_EXPLICIT | TLS_TLS | TLS_DTPREL;
+	  if (rel != relocs
+	      && rel[-1].r_info == ELF64_R_INFO (r_symndx, R_PPC64_DTPMOD64)
+	      && rel[-1].r_offset == rel->r_offset - 8)
+	    /* This is the second reloc of a dtpmod, dtprel pair.
+	       Don't mark with TLS_DTPREL.  */
+	    goto dodyn;
+
+	dotlstoc:
+	  sec->has_tls_reloc = 1;
+	  if (h != NULL)
+	    {
+	      struct ppc_link_hash_entry *eh;
+	      eh = (struct ppc_link_hash_entry *) h;
+	      eh->tls_mask |= tls_type;
+	    }
+	  else
+	    if (!update_local_sym_info (abfd, symtab_hdr, r_symndx,
+					rel->r_addend, tls_type))
+	      return FALSE;
+
+	  ppc64_sec = ppc64_elf_section_data (sec);
+	  if (ppc64_sec->sec_type != sec_toc)
+	    {
+	      bfd_size_type amt;
+
+	      /* One extra to simplify get_tls_mask.  */
+	      amt = sec->size * sizeof (unsigned) / 8 + sizeof (unsigned);
+	      ppc64_sec->u.toc.symndx = bfd_zalloc (abfd, amt);
+	      if (ppc64_sec->u.toc.symndx == NULL)
+		return FALSE;
+	      amt = sec->size * sizeof (bfd_vma) / 8;
+	      ppc64_sec->u.toc.add = bfd_zalloc (abfd, amt);
+	      if (ppc64_sec->u.toc.add == NULL)
+		return FALSE;
+	      BFD_ASSERT (ppc64_sec->sec_type == sec_normal);
+	      ppc64_sec->sec_type = sec_toc;
+	    }
+	  BFD_ASSERT (rel->r_offset % 8 == 0);
+	  ppc64_sec->u.toc.symndx[rel->r_offset / 8] = r_symndx;
+	  ppc64_sec->u.toc.add[rel->r_offset / 8] = rel->r_addend;
+
+	  /* Mark the second slot of a GD or LD entry.
+	     -1 to indicate GD and -2 to indicate LD.  */
+	  if (tls_type == (TLS_EXPLICIT | TLS_TLS | TLS_GD))
+	    ppc64_sec->u.toc.symndx[rel->r_offset / 8 + 1] = -1;
+	  else if (tls_type == (TLS_EXPLICIT | TLS_TLS | TLS_LD))
+	    ppc64_sec->u.toc.symndx[rel->r_offset / 8 + 1] = -2;
+	  goto dodyn;
+
+	case R_PPC64_TPREL16:
+	case R_PPC64_TPREL16_LO:
+	case R_PPC64_TPREL16_HI:
+	case R_PPC64_TPREL16_HA:
+	case R_PPC64_TPREL16_DS:
+	case R_PPC64_TPREL16_LO_DS:
+	case R_PPC64_TPREL16_HIGHER:
+	case R_PPC64_TPREL16_HIGHERA:
+	case R_PPC64_TPREL16_HIGHEST:
+	case R_PPC64_TPREL16_HIGHESTA:
+	  if (info->shared)
+	    {
+	      if (!info->executable)
+		info->flags |= DF_STATIC_TLS;
+	      goto dodyn;
+	    }
+	  break;
+
+	case R_PPC64_ADDR64:
+	  if (opd_sym_map != NULL
+	      && rel + 1 < rel_end
+	      && ELF64_R_TYPE ((rel + 1)->r_info) == R_PPC64_TOC)
+	    {
+	      if (h != NULL)
+		{
+		  if (h->root.root.string[0] == '.'
+		      && h->root.root.string[1] != 0
+		      && lookup_fdh ((struct ppc_link_hash_entry *) h, htab))
+		    ;
+		  else
+		    ((struct ppc_link_hash_entry *) h)->is_func = 1;
+		}
+	      else
+		{
+		  asection *s;
+		  Elf_Internal_Sym *isym;
+
+		  isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+						abfd, r_symndx);
+		  if (isym == NULL)
+		    return FALSE;
+
+		  s = bfd_section_from_elf_index (abfd, isym->st_shndx);
+		  if (s != NULL && s != sec)
+		    opd_sym_map[rel->r_offset / 8] = s;
+		}
+	    }
+	  /* Fall through.  */
+
+	case R_PPC64_REL30:
+	case R_PPC64_REL32:
+	case R_PPC64_REL64:
+	case R_PPC64_ADDR14:
+	case R_PPC64_ADDR14_BRNTAKEN:
+	case R_PPC64_ADDR14_BRTAKEN:
+	case R_PPC64_ADDR16:
+	case R_PPC64_ADDR16_DS:
+	case R_PPC64_ADDR16_HA:
+	case R_PPC64_ADDR16_HI:
+	case R_PPC64_ADDR16_HIGHER:
+	case R_PPC64_ADDR16_HIGHERA:
+	case R_PPC64_ADDR16_HIGHEST:
+	case R_PPC64_ADDR16_HIGHESTA:
+	case R_PPC64_ADDR16_LO:
+	case R_PPC64_ADDR16_LO_DS:
+	case R_PPC64_ADDR24:
+	case R_PPC64_ADDR32:
+	case R_PPC64_UADDR16:
+	case R_PPC64_UADDR32:
+	case R_PPC64_UADDR64:
+	case R_PPC64_TOC:
+	  if (h != NULL && !info->shared)
+	    /* We may need a copy reloc.  */
+	    h->non_got_ref = 1;
+
+	  /* Don't propagate .opd relocs.  */
+	  if (NO_OPD_RELOCS && opd_sym_map != NULL)
+	    break;
+
+	  /* If we are creating a shared library, and this is a reloc
+	     against a global symbol, or a non PC relative reloc
+	     against a local symbol, then we need to copy the reloc
+	     into the shared library.  However, if we are linking with
+	     -Bsymbolic, we do not need to copy a reloc against a
+	     global symbol which is defined in an object we are
+	     including in the link (i.e., DEF_REGULAR is set).  At
+	     this point we have not seen all the input files, so it is
+	     possible that DEF_REGULAR is not set now but will be set
+	     later (it is never cleared).  In case of a weak definition,
+	     DEF_REGULAR may be cleared later by a strong definition in
+	     a shared library.  We account for that possibility below by
+	     storing information in the dyn_relocs field of the hash
+	     table entry.  A similar situation occurs when creating
+	     shared libraries and symbol visibility changes render the
+	     symbol local.
+
+	     If on the other hand, we are creating an executable, we
+	     may need to keep relocations for symbols satisfied by a
+	     dynamic library if we manage to avoid copy relocs for the
+	     symbol.  */
+	dodyn:
+	  if ((info->shared
+	       && (must_be_dyn_reloc (info, r_type)
+		   || (h != NULL
+		       && (! info->symbolic
+			   || h->root.type == bfd_link_hash_defweak
+			   || !h->def_regular))))
+	      || (ELIMINATE_COPY_RELOCS
+		  && !info->shared
+		  && h != NULL
+		  && (h->root.type == bfd_link_hash_defweak
+		      || !h->def_regular))
+	      || (!info->shared
+		  && ifunc != NULL))
+	    {
+	      struct elf_dyn_relocs *p;
+	      struct elf_dyn_relocs **head;
+
+	      /* We must copy these reloc types into the output file.
+		 Create a reloc section in dynobj and make room for
+		 this reloc.  */
+	      if (sreloc == NULL)
+		{
+		  sreloc = _bfd_elf_make_dynamic_reloc_section
+		    (sec, htab->elf.dynobj, 3, abfd, /*rela?*/ TRUE);
+
+		  if (sreloc == NULL)
+		    return FALSE;
+		}
+
+	      /* If this is a global symbol, we count the number of
+		 relocations we need for this symbol.  */
+	      if (h != NULL)
+		{
+		  head = &((struct ppc_link_hash_entry *) h)->dyn_relocs;
+		}
+	      else
+		{
+		  /* Track dynamic relocs needed for local syms too.
+		     We really need local syms available to do this
+		     easily.  Oh well.  */
+		  asection *s;
+		  void *vpp;
+		  Elf_Internal_Sym *isym;
+
+		  isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+						abfd, r_symndx);
+		  if (isym == NULL)
+		    return FALSE;
+
+		  s = bfd_section_from_elf_index (abfd, isym->st_shndx);
+		  if (s == NULL)
+		    s = sec;
+
+		  vpp = &elf_section_data (s)->local_dynrel;
+		  head = (struct elf_dyn_relocs **) vpp;
+		}
+
+	      p = *head;
+	      if (p == NULL || p->sec != sec)
+		{
+		  p = bfd_alloc (htab->elf.dynobj, sizeof *p);
+		  if (p == NULL)
+		    return FALSE;
+		  p->next = *head;
+		  *head = p;
+		  p->sec = sec;
+		  p->count = 0;
+		  p->pc_count = 0;
+		}
+
+	      p->count += 1;
+	      if (!must_be_dyn_reloc (info, r_type))
+		p->pc_count += 1;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* OFFSET in OPD_SEC specifies a function descriptor.  Return the address
+   of the code entry point, and its section.  */
+
+static bfd_vma
+opd_entry_value (asection *opd_sec,
+		 bfd_vma offset,
+		 asection **code_sec,
+		 bfd_vma *code_off)
+{
+  bfd *opd_bfd = opd_sec->owner;
+  Elf_Internal_Rela *relocs;
+  Elf_Internal_Rela *lo, *hi, *look;
+  bfd_vma val;
+
+  /* No relocs implies we are linking a --just-symbols object.  */
+  if (opd_sec->reloc_count == 0)
+    {
+      char buf[8];
+
+      if (!bfd_get_section_contents (opd_bfd, opd_sec, buf, offset, 8))
+	return (bfd_vma) -1;
+
+      val = bfd_get_64 (opd_bfd, buf);
+      if (code_sec != NULL)
+	{
+	  asection *sec, *likely = NULL;
+	  for (sec = opd_bfd->sections; sec != NULL; sec = sec->next)
+	    if (sec->vma <= val
+		&& (sec->flags & SEC_LOAD) != 0
+		&& (sec->flags & SEC_ALLOC) != 0)
+	      likely = sec;
+	  if (likely != NULL)
+	    {
+	      *code_sec = likely;
+	      if (code_off != NULL)
+		*code_off = val - likely->vma;
+	    }
+	}
+      return val;
+    }
+
+  BFD_ASSERT (is_ppc64_elf (opd_bfd));
+
+  relocs = ppc64_elf_tdata (opd_bfd)->opd_relocs;
+  if (relocs == NULL)
+    relocs = _bfd_elf_link_read_relocs (opd_bfd, opd_sec, NULL, NULL, TRUE);
+
+  /* Go find the opd reloc at the sym address.  */
+  lo = relocs;
+  BFD_ASSERT (lo != NULL);
+  hi = lo + opd_sec->reloc_count - 1; /* ignore last reloc */
+  val = (bfd_vma) -1;
+  while (lo < hi)
+    {
+      look = lo + (hi - lo) / 2;
+      if (look->r_offset < offset)
+	lo = look + 1;
+      else if (look->r_offset > offset)
+	hi = look;
+      else
+	{
+	  Elf_Internal_Shdr *symtab_hdr = &elf_symtab_hdr (opd_bfd);
+
+	  if (ELF64_R_TYPE (look->r_info) == R_PPC64_ADDR64
+	      && ELF64_R_TYPE ((look + 1)->r_info) == R_PPC64_TOC)
+	    {
+	      unsigned long symndx = ELF64_R_SYM (look->r_info);
+	      asection *sec;
+
+	      if (symndx < symtab_hdr->sh_info)
+		{
+		  Elf_Internal_Sym *sym;
+
+		  sym = (Elf_Internal_Sym *) symtab_hdr->contents;
+		  if (sym == NULL)
+		    {
+		      sym = bfd_elf_get_elf_syms (opd_bfd, symtab_hdr,
+						  symtab_hdr->sh_info,
+						  0, NULL, NULL, NULL);
+		      if (sym == NULL)
+			break;
+		      symtab_hdr->contents = (bfd_byte *) sym;
+		    }
+
+		  sym += symndx;
+		  val = sym->st_value;
+		  sec = bfd_section_from_elf_index (opd_bfd, sym->st_shndx);
+		  BFD_ASSERT ((sec->flags & SEC_MERGE) == 0);
+		}
+	      else
+		{
+		  struct elf_link_hash_entry **sym_hashes;
+		  struct elf_link_hash_entry *rh;
+
+		  sym_hashes = elf_sym_hashes (opd_bfd);
+		  rh = sym_hashes[symndx - symtab_hdr->sh_info];
+		  rh = elf_follow_link (rh);
+		  BFD_ASSERT (rh->root.type == bfd_link_hash_defined
+			      || rh->root.type == bfd_link_hash_defweak);
+		  val = rh->root.u.def.value;
+		  sec = rh->root.u.def.section;
+		}
+	      val += look->r_addend;
+	      if (code_off != NULL)
+		*code_off = val;
+	      if (code_sec != NULL)
+		*code_sec = sec;
+	      if (sec != NULL && sec->output_section != NULL)
+		val += sec->output_section->vma + sec->output_offset;
+	    }
+	  break;
+	}
+    }
+
+  return val;
+}
+
+/* Return true if symbol is defined in a regular object file.  */
+
+static bfd_boolean
+is_static_defined (struct elf_link_hash_entry *h)
+{
+  return ((h->root.type == bfd_link_hash_defined
+	   || h->root.type == bfd_link_hash_defweak)
+	  && h->root.u.def.section != NULL
+	  && h->root.u.def.section->output_section != NULL);
+}
+
+/* If FDH is a function descriptor symbol, return the associated code
+   entry symbol if it is defined.  Return NULL otherwise.  */
+
+static struct ppc_link_hash_entry *
+defined_code_entry (struct ppc_link_hash_entry *fdh)
+{
+  if (fdh->is_func_descriptor)
+    {
+      struct ppc_link_hash_entry *fh = ppc_follow_link (fdh->oh);
+      if (fh->elf.root.type == bfd_link_hash_defined
+	  || fh->elf.root.type == bfd_link_hash_defweak)
+	return fh;
+    }
+  return NULL;
+}
+
+/* If FH is a function code entry symbol, return the associated
+   function descriptor symbol if it is defined.  Return NULL otherwise.  */
+
+static struct ppc_link_hash_entry *
+defined_func_desc (struct ppc_link_hash_entry *fh)
+{
+  if (fh->oh != NULL
+      && fh->oh->is_func_descriptor)
+    {
+      struct ppc_link_hash_entry *fdh = ppc_follow_link (fh->oh);
+      if (fdh->elf.root.type == bfd_link_hash_defined
+	  || fdh->elf.root.type == bfd_link_hash_defweak)
+	return fdh;
+    }
+  return NULL;
+}
+
+/* Mark all our entry sym sections, both opd and code section.  */
+
+static void
+ppc64_elf_gc_keep (struct bfd_link_info *info)
+{
+  struct ppc_link_hash_table *htab = ppc_hash_table (info);
+  struct bfd_sym_chain *sym;
+
+  if (htab == NULL)
+    return;
+
+  for (sym = info->gc_sym_list; sym != NULL; sym = sym->next)
+    {
+      struct ppc_link_hash_entry *eh, *fh;
+      asection *sec;
+
+      eh = (struct ppc_link_hash_entry *)
+	elf_link_hash_lookup (&htab->elf, sym->name, FALSE, FALSE, TRUE);
+      if (eh == NULL)
+	continue;
+      if (eh->elf.root.type != bfd_link_hash_defined
+	  && eh->elf.root.type != bfd_link_hash_defweak)
+	continue;
+
+      fh = defined_code_entry (eh);
+      if (fh != NULL)
+	{
+	  sec = fh->elf.root.u.def.section;
+	  sec->flags |= SEC_KEEP;
+	}
+      else if (get_opd_info (eh->elf.root.u.def.section) != NULL
+	       && opd_entry_value (eh->elf.root.u.def.section,
+				   eh->elf.root.u.def.value,
+				   &sec, NULL) != (bfd_vma) -1)
+	sec->flags |= SEC_KEEP;
+
+      sec = eh->elf.root.u.def.section;
+      sec->flags |= SEC_KEEP;
+    }
+}
+
+/* Mark sections containing dynamically referenced symbols.  When
+   building shared libraries, we must assume that any visible symbol is
+   referenced.  */
+
+static bfd_boolean
+ppc64_elf_gc_mark_dynamic_ref (struct elf_link_hash_entry *h, void *inf)
+{
+  struct bfd_link_info *info = (struct bfd_link_info *) inf;
+  struct ppc_link_hash_entry *eh = (struct ppc_link_hash_entry *) h;
+  struct ppc_link_hash_entry *fdh;
+
+  /* Dynamic linking info is on the func descriptor sym.  */
+  fdh = defined_func_desc (eh);
+  if (fdh != NULL)
+    eh = fdh;
+
+  if ((eh->elf.root.type == bfd_link_hash_defined
+       || eh->elf.root.type == bfd_link_hash_defweak)
+      && (eh->elf.ref_dynamic
+	  || (!info->executable
+	      && eh->elf.def_regular
+	      && ELF_ST_VISIBILITY (eh->elf.other) != STV_INTERNAL
+	      && ELF_ST_VISIBILITY (eh->elf.other) != STV_HIDDEN
+	      && (strchr (eh->elf.root.root.string, ELF_VER_CHR) != NULL
+		  || !bfd_hide_sym_by_version (info->version_info,
+					       eh->elf.root.root.string)))))
+    {
+      asection *code_sec;
+      struct ppc_link_hash_entry *fh;
+
+      eh->elf.root.u.def.section->flags |= SEC_KEEP;
+
+      /* Function descriptor syms cause the associated
+	 function code sym section to be marked.  */
+      fh = defined_code_entry (eh);
+      if (fh != NULL)
+	{
+	  code_sec = fh->elf.root.u.def.section;
+	  code_sec->flags |= SEC_KEEP;
+	}
+      else if (get_opd_info (eh->elf.root.u.def.section) != NULL
+	       && opd_entry_value (eh->elf.root.u.def.section,
+				   eh->elf.root.u.def.value,
+				   &code_sec, NULL) != (bfd_vma) -1)
+	code_sec->flags |= SEC_KEEP;
+    }
+
+  return TRUE;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+static asection *
+ppc64_elf_gc_mark_hook (asection *sec,
+			struct bfd_link_info *info,
+			Elf_Internal_Rela *rel,
+			struct elf_link_hash_entry *h,
+			Elf_Internal_Sym *sym)
+{
+  asection *rsec;
+
+  /* Syms return NULL if we're marking .opd, so we avoid marking all
+     function sections, as all functions are referenced in .opd.  */
+  rsec = NULL;
+  if (get_opd_info (sec) != NULL)
+    return rsec;
+
+  if (h != NULL)
+    {
+      enum elf_ppc64_reloc_type r_type;
+      struct ppc_link_hash_entry *eh, *fh, *fdh;
+
+      r_type = ELF64_R_TYPE (rel->r_info);
+      switch (r_type)
+	{
+	case R_PPC64_GNU_VTINHERIT:
+	case R_PPC64_GNU_VTENTRY:
+	  break;
+
+	default:
+	  switch (h->root.type)
+	    {
+	    case bfd_link_hash_defined:
+	    case bfd_link_hash_defweak:
+	      eh = (struct ppc_link_hash_entry *) h;
+	      fdh = defined_func_desc (eh);
+	      if (fdh != NULL)
+		eh = fdh;
+
+	      /* Function descriptor syms cause the associated
+		 function code sym section to be marked.  */
+	      fh = defined_code_entry (eh);
+	      if (fh != NULL)
+		{
+		  /* They also mark their opd section.  */
+		  eh->elf.root.u.def.section->gc_mark = 1;
+
+		  rsec = fh->elf.root.u.def.section;
+		}
+	      else if (get_opd_info (eh->elf.root.u.def.section) != NULL
+		       && opd_entry_value (eh->elf.root.u.def.section,
+					   eh->elf.root.u.def.value,
+					   &rsec, NULL) != (bfd_vma) -1)
+		eh->elf.root.u.def.section->gc_mark = 1;
+	      else
+		rsec = h->root.u.def.section;
+	      break;
+
+	    case bfd_link_hash_common:
+	      rsec = h->root.u.c.p->section;
+	      break;
+
+	    default:
+	      return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+	    }
+	}
+    }
+  else
+    {
+      struct _opd_sec_data *opd;
+
+      rsec = bfd_section_from_elf_index (sec->owner, sym->st_shndx);
+      opd = get_opd_info (rsec);
+      if (opd != NULL && opd->func_sec != NULL)
+	{
+	  rsec->gc_mark = 1;
+
+	  rsec = opd->func_sec[(sym->st_value + rel->r_addend) / 8];
+	}
+    }
+
+  return rsec;
+}
+
+/* Update the .got, .plt. and dynamic reloc reference counts for the
+   section being removed.  */
+
+static bfd_boolean
+ppc64_elf_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info,
+			 asection *sec, const Elf_Internal_Rela *relocs)
+{
+  struct ppc_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  struct got_entry **local_got_ents;
+  const Elf_Internal_Rela *rel, *relend;
+
+  if (info->relocatable)
+    return TRUE;
+
+  if ((sec->flags & SEC_ALLOC) == 0)
+    return TRUE;
+
+  elf_section_data (sec)->local_dynrel = NULL;
+
+  htab = ppc_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_ents = elf_local_got_ents (abfd);
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      enum elf_ppc64_reloc_type r_type;
+      struct elf_link_hash_entry *h = NULL;
+      unsigned char tls_type = 0;
+
+      r_symndx = ELF64_R_SYM (rel->r_info);
+      r_type = ELF64_R_TYPE (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  struct ppc_link_hash_entry *eh;
+	  struct elf_dyn_relocs **pp;
+	  struct elf_dyn_relocs *p;
+
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  h = elf_follow_link (h);
+	  eh = (struct ppc_link_hash_entry *) h;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
+	    if (p->sec == sec)
+	      {
+		/* Everything must go for SEC.  */
+		*pp = p->next;
+		break;
+	      }
+	}
+
+      if (is_branch_reloc (r_type))
+	{
+	  struct plt_entry **ifunc = NULL;
+	  if (h != NULL)
+	    {
+	      if (h->type == STT_GNU_IFUNC)
+		ifunc = &h->plt.plist;
+	    }
+	  else if (local_got_ents != NULL)
+	    {
+	      struct plt_entry **local_plt = (struct plt_entry **)
+		(local_got_ents + symtab_hdr->sh_info);
+	      unsigned char *local_got_tls_masks = (unsigned char *)
+		(local_plt + symtab_hdr->sh_info);
+	      if ((local_got_tls_masks[r_symndx] & PLT_IFUNC) != 0)
+		ifunc = local_plt + r_symndx;
+	    }
+	  if (ifunc != NULL)
+	    {
+	      struct plt_entry *ent;
+
+	      for (ent = *ifunc; ent != NULL; ent = ent->next)
+		if (ent->addend == rel->r_addend)
+		  break;
+	      if (ent == NULL)
+		abort ();
+	      if (ent->plt.refcount > 0)
+		ent->plt.refcount -= 1;
+	      continue;
+	    }
+	}
+
+      switch (r_type)
+	{
+	case R_PPC64_GOT_TLSLD16:
+	case R_PPC64_GOT_TLSLD16_LO:
+	case R_PPC64_GOT_TLSLD16_HI:
+	case R_PPC64_GOT_TLSLD16_HA:
+	  tls_type = TLS_TLS | TLS_LD;
+	  goto dogot;
+
+	case R_PPC64_GOT_TLSGD16:
+	case R_PPC64_GOT_TLSGD16_LO:
+	case R_PPC64_GOT_TLSGD16_HI:
+	case R_PPC64_GOT_TLSGD16_HA:
+	  tls_type = TLS_TLS | TLS_GD;
+	  goto dogot;
+
+	case R_PPC64_GOT_TPREL16_DS:
+	case R_PPC64_GOT_TPREL16_LO_DS:
+	case R_PPC64_GOT_TPREL16_HI:
+	case R_PPC64_GOT_TPREL16_HA:
+	  tls_type = TLS_TLS | TLS_TPREL;
+	  goto dogot;
+
+	case R_PPC64_GOT_DTPREL16_DS:
+	case R_PPC64_GOT_DTPREL16_LO_DS:
+	case R_PPC64_GOT_DTPREL16_HI:
+	case R_PPC64_GOT_DTPREL16_HA:
+	  tls_type = TLS_TLS | TLS_DTPREL;
+	  goto dogot;
+
+	case R_PPC64_GOT16:
+	case R_PPC64_GOT16_DS:
+	case R_PPC64_GOT16_HA:
+	case R_PPC64_GOT16_HI:
+	case R_PPC64_GOT16_LO:
+	case R_PPC64_GOT16_LO_DS:
+	dogot:
+	  {
+	    struct got_entry *ent;
+
+	    if (h != NULL)
+	      ent = h->got.glist;
+	    else
+	      ent = local_got_ents[r_symndx];
+
+	    for (; ent != NULL; ent = ent->next)
+	      if (ent->addend == rel->r_addend
+		  && ent->owner == abfd
+		  && ent->tls_type == tls_type)
+		break;
+	    if (ent == NULL)
+	      abort ();
+	    if (ent->got.refcount > 0)
+	      ent->got.refcount -= 1;
+	  }
+	  break;
+
+	case R_PPC64_PLT16_HA:
+	case R_PPC64_PLT16_HI:
+	case R_PPC64_PLT16_LO:
+	case R_PPC64_PLT32:
+	case R_PPC64_PLT64:
+	case R_PPC64_REL14:
+	case R_PPC64_REL14_BRNTAKEN:
+	case R_PPC64_REL14_BRTAKEN:
+	case R_PPC64_REL24:
+	  if (h != NULL)
+	    {
+	      struct plt_entry *ent;
+
+	      for (ent = h->plt.plist; ent != NULL; ent = ent->next)
+		if (ent->addend == rel->r_addend)
+		  break;
+	      if (ent != NULL && ent->plt.refcount > 0)
+		ent->plt.refcount -= 1;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+  return TRUE;
+}
+
+/* The maximum size of .sfpr.  */
+#define SFPR_MAX (218*4)
+
+struct sfpr_def_parms
+{
+  const char name[12];
+  unsigned char lo, hi;
+  bfd_byte * (*write_ent) (bfd *, bfd_byte *, int);
+  bfd_byte * (*write_tail) (bfd *, bfd_byte *, int);
+};
+
+/* Auto-generate _save*, _rest* functions in .sfpr.  */
+
+static bfd_boolean
+sfpr_define (struct bfd_link_info *info, const struct sfpr_def_parms *parm)
+{
+  struct ppc_link_hash_table *htab = ppc_hash_table (info);
+  unsigned int i;
+  size_t len = strlen (parm->name);
+  bfd_boolean writing = FALSE;
+  char sym[16];
+
+  if (htab == NULL)
+    return FALSE;
+
+  memcpy (sym, parm->name, len);
+  sym[len + 2] = 0;
+
+  for (i = parm->lo; i <= parm->hi; i++)
+    {
+      struct elf_link_hash_entry *h;
+
+      sym[len + 0] = i / 10 + '0';
+      sym[len + 1] = i % 10 + '0';
+      h = elf_link_hash_lookup (&htab->elf, sym, FALSE, FALSE, TRUE);
+      if (h != NULL
+	  && !h->def_regular)
+	{
+	  h->root.type = bfd_link_hash_defined;
+	  h->root.u.def.section = htab->sfpr;
+	  h->root.u.def.value = htab->sfpr->size;
+	  h->type = STT_FUNC;
+	  h->def_regular = 1;
+	  _bfd_elf_link_hash_hide_symbol (info, h, TRUE);
+	  writing = TRUE;
+	  if (htab->sfpr->contents == NULL)
+	    {
+	      htab->sfpr->contents = bfd_alloc (htab->elf.dynobj, SFPR_MAX);
+	      if (htab->sfpr->contents == NULL)
+		return FALSE;
+	    }
+	}
+      if (writing)
+	{
+	  bfd_byte *p = htab->sfpr->contents + htab->sfpr->size;
+	  if (i != parm->hi)
+	    p = (*parm->write_ent) (htab->elf.dynobj, p, i);
+	  else
+	    p = (*parm->write_tail) (htab->elf.dynobj, p, i);
+	  htab->sfpr->size = p - htab->sfpr->contents;
+	}
+    }
+
+  return TRUE;
+}
+
+static bfd_byte *
+savegpr0 (bfd *abfd, bfd_byte *p, int r)
+{
+  bfd_put_32 (abfd, STD_R0_0R1 + (r << 21) + (1 << 16) - (32 - r) * 8, p);
+  return p + 4;
+}
+
+static bfd_byte *
+savegpr0_tail (bfd *abfd, bfd_byte *p, int r)
+{
+  p = savegpr0 (abfd, p, r);
+  bfd_put_32 (abfd, STD_R0_0R1 + 16, p);
+  p = p + 4;
+  bfd_put_32 (abfd, BLR, p);
+  return p + 4;
+}
+
+static bfd_byte *
+restgpr0 (bfd *abfd, bfd_byte *p, int r)
+{
+  bfd_put_32 (abfd, LD_R0_0R1 + (r << 21) + (1 << 16) - (32 - r) * 8, p);
+  return p + 4;
+}
+
+static bfd_byte *
+restgpr0_tail (bfd *abfd, bfd_byte *p, int r)
+{
+  bfd_put_32 (abfd, LD_R0_0R1 + 16, p);
+  p = p + 4;
+  p = restgpr0 (abfd, p, r);
+  bfd_put_32 (abfd, MTLR_R0, p);
+  p = p + 4;
+  if (r == 29)
+    {
+      p = restgpr0 (abfd, p, 30);
+      p = restgpr0 (abfd, p, 31);
+    }
+  bfd_put_32 (abfd, BLR, p);
+  return p + 4;
+}
+
+static bfd_byte *
+savegpr1 (bfd *abfd, bfd_byte *p, int r)
+{
+  bfd_put_32 (abfd, STD_R0_0R12 + (r << 21) + (1 << 16) - (32 - r) * 8, p);
+  return p + 4;
+}
+
+static bfd_byte *
+savegpr1_tail (bfd *abfd, bfd_byte *p, int r)
+{
+  p = savegpr1 (abfd, p, r);
+  bfd_put_32 (abfd, BLR, p);
+  return p + 4;
+}
+
+static bfd_byte *
+restgpr1 (bfd *abfd, bfd_byte *p, int r)
+{
+  bfd_put_32 (abfd, LD_R0_0R12 + (r << 21) + (1 << 16) - (32 - r) * 8, p);
+  return p + 4;
+}
+
+static bfd_byte *
+restgpr1_tail (bfd *abfd, bfd_byte *p, int r)
+{
+  p = restgpr1 (abfd, p, r);
+  bfd_put_32 (abfd, BLR, p);
+  return p + 4;
+}
+
+static bfd_byte *
+savefpr (bfd *abfd, bfd_byte *p, int r)
+{
+  bfd_put_32 (abfd, STFD_FR0_0R1 + (r << 21) + (1 << 16) - (32 - r) * 8, p);
+  return p + 4;
+}
+
+static bfd_byte *
+savefpr0_tail (bfd *abfd, bfd_byte *p, int r)
+{
+  p = savefpr (abfd, p, r);
+  bfd_put_32 (abfd, STD_R0_0R1 + 16, p);
+  p = p + 4;
+  bfd_put_32 (abfd, BLR, p);
+  return p + 4;
+}
+
+static bfd_byte *
+restfpr (bfd *abfd, bfd_byte *p, int r)
+{
+  bfd_put_32 (abfd, LFD_FR0_0R1 + (r << 21) + (1 << 16) - (32 - r) * 8, p);
+  return p + 4;
+}
+
+static bfd_byte *
+restfpr0_tail (bfd *abfd, bfd_byte *p, int r)
+{
+  bfd_put_32 (abfd, LD_R0_0R1 + 16, p);
+  p = p + 4;
+  p = restfpr (abfd, p, r);
+  bfd_put_32 (abfd, MTLR_R0, p);
+  p = p + 4;
+  if (r == 29)
+    {
+      p = restfpr (abfd, p, 30);
+      p = restfpr (abfd, p, 31);
+    }
+  bfd_put_32 (abfd, BLR, p);
+  return p + 4;
+}
+
+static bfd_byte *
+savefpr1_tail (bfd *abfd, bfd_byte *p, int r)
+{
+  p = savefpr (abfd, p, r);
+  bfd_put_32 (abfd, BLR, p);
+  return p + 4;
+}
+
+static bfd_byte *
+restfpr1_tail (bfd *abfd, bfd_byte *p, int r)
+{
+  p = restfpr (abfd, p, r);
+  bfd_put_32 (abfd, BLR, p);
+  return p + 4;
+}
+
+static bfd_byte *
+savevr (bfd *abfd, bfd_byte *p, int r)
+{
+  bfd_put_32 (abfd, LI_R12_0 + (1 << 16) - (32 - r) * 16, p);
+  p = p + 4;
+  bfd_put_32 (abfd, STVX_VR0_R12_R0 + (r << 21), p);
+  return p + 4;
+}
+
+static bfd_byte *
+savevr_tail (bfd *abfd, bfd_byte *p, int r)
+{
+  p = savevr (abfd, p, r);
+  bfd_put_32 (abfd, BLR, p);
+  return p + 4;
+}
+
+static bfd_byte *
+restvr (bfd *abfd, bfd_byte *p, int r)
+{
+  bfd_put_32 (abfd, LI_R12_0 + (1 << 16) - (32 - r) * 16, p);
+  p = p + 4;
+  bfd_put_32 (abfd, LVX_VR0_R12_R0 + (r << 21), p);
+  return p + 4;
+}
+
+static bfd_byte *
+restvr_tail (bfd *abfd, bfd_byte *p, int r)
+{
+  p = restvr (abfd, p, r);
+  bfd_put_32 (abfd, BLR, p);
+  return p + 4;
+}
+
+/* Called via elf_link_hash_traverse to transfer dynamic linking
+   information on function code symbol entries to their corresponding
+   function descriptor symbol entries.  */
+
+static bfd_boolean
+func_desc_adjust (struct elf_link_hash_entry *h, void *inf)
+{
+  struct bfd_link_info *info;
+  struct ppc_link_hash_table *htab;
+  struct plt_entry *ent;
+  struct ppc_link_hash_entry *fh;
+  struct ppc_link_hash_entry *fdh;
+  bfd_boolean force_local;
+
+  fh = (struct ppc_link_hash_entry *) h;
+  if (fh->elf.root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  info = inf;
+  htab = ppc_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* Resolve undefined references to dot-symbols as the value
+     in the function descriptor, if we have one in a regular object.
+     This is to satisfy cases like ".quad .foo".  Calls to functions
+     in dynamic objects are handled elsewhere.  */
+  if (fh->elf.root.type == bfd_link_hash_undefweak
+      && fh->was_undefined
+      && (fdh = defined_func_desc (fh)) != NULL
+      && get_opd_info (fdh->elf.root.u.def.section) != NULL
+      && opd_entry_value (fdh->elf.root.u.def.section,
+			  fdh->elf.root.u.def.value,
+			  &fh->elf.root.u.def.section,
+			  &fh->elf.root.u.def.value) != (bfd_vma) -1)
+    {
+      fh->elf.root.type = fdh->elf.root.type;
+      fh->elf.forced_local = 1;
+      fh->elf.def_regular = fdh->elf.def_regular;
+      fh->elf.def_dynamic = fdh->elf.def_dynamic;
+    }
+
+  /* If this is a function code symbol, transfer dynamic linking
+     information to the function descriptor symbol.  */
+  if (!fh->is_func)
+    return TRUE;
+
+  for (ent = fh->elf.plt.plist; ent != NULL; ent = ent->next)
+    if (ent->plt.refcount > 0)
+      break;
+  if (ent == NULL
+      || fh->elf.root.root.string[0] != '.'
+      || fh->elf.root.root.string[1] == '\0')
+    return TRUE;
+
+  /* Find the corresponding function descriptor symbol.  Create it
+     as undefined if necessary.  */
+
+  fdh = lookup_fdh (fh, htab);
+  if (fdh == NULL
+      && !info->executable
+      && (fh->elf.root.type == bfd_link_hash_undefined
+	  || fh->elf.root.type == bfd_link_hash_undefweak))
+    {
+      fdh = make_fdh (info, fh);
+      if (fdh == NULL)
+	return FALSE;
+    }
+
+  /* Fake function descriptors are made undefweak.  If the function
+     code symbol is strong undefined, make the fake sym the same.
+     If the function code symbol is defined, then force the fake
+     descriptor local;  We can't support overriding of symbols in a
+     shared library on a fake descriptor.  */
+
+  if (fdh != NULL
+      && fdh->fake
+      && fdh->elf.root.type == bfd_link_hash_undefweak)
+    {
+      if (fh->elf.root.type == bfd_link_hash_undefined)
+	{
+	  fdh->elf.root.type = bfd_link_hash_undefined;
+	  bfd_link_add_undef (&htab->elf.root, &fdh->elf.root);
+	}
+      else if (fh->elf.root.type == bfd_link_hash_defined
+	       || fh->elf.root.type == bfd_link_hash_defweak)
+	{
+	  _bfd_elf_link_hash_hide_symbol (info, &fdh->elf, TRUE);
+	}
+    }
+
+  if (fdh != NULL
+      && !fdh->elf.forced_local
+      && (!info->executable
+	  || fdh->elf.def_dynamic
+	  || fdh->elf.ref_dynamic
+	  || (fdh->elf.root.type == bfd_link_hash_undefweak
+	      && ELF_ST_VISIBILITY (fdh->elf.other) == STV_DEFAULT)))
+    {
+      if (fdh->elf.dynindx == -1)
+	if (! bfd_elf_link_record_dynamic_symbol (info, &fdh->elf))
+	  return FALSE;
+      fdh->elf.ref_regular |= fh->elf.ref_regular;
+      fdh->elf.ref_dynamic |= fh->elf.ref_dynamic;
+      fdh->elf.ref_regular_nonweak |= fh->elf.ref_regular_nonweak;
+      fdh->elf.non_got_ref |= fh->elf.non_got_ref;
+      if (ELF_ST_VISIBILITY (fh->elf.other) == STV_DEFAULT)
+	{
+	  move_plt_plist (fh, fdh);
+	  fdh->elf.needs_plt = 1;
+	}
+      fdh->is_func_descriptor = 1;
+      fdh->oh = fh;
+      fh->oh = fdh;
+    }
+
+  /* Now that the info is on the function descriptor, clear the
+     function code sym info.  Any function code syms for which we
+     don't have a definition in a regular file, we force local.
+     This prevents a shared library from exporting syms that have
+     been imported from another library.  Function code syms that
+     are really in the library we must leave global to prevent the
+     linker dragging in a definition from a static library.  */
+  force_local = (!fh->elf.def_regular
+		 || fdh == NULL
+		 || !fdh->elf.def_regular
+		 || fdh->elf.forced_local);
+  _bfd_elf_link_hash_hide_symbol (info, &fh->elf, force_local);
+
+  return TRUE;
+}
+
+/* Called near the start of bfd_elf_size_dynamic_sections.  We use
+   this hook to a) provide some gcc support functions, and b) transfer
+   dynamic linking information gathered so far on function code symbol
+   entries, to their corresponding function descriptor symbol entries.  */
+
+static bfd_boolean
+ppc64_elf_func_desc_adjust (bfd *obfd ATTRIBUTE_UNUSED,
+			    struct bfd_link_info *info)
+{
+  struct ppc_link_hash_table *htab;
+  unsigned int i;
+  const struct sfpr_def_parms funcs[] =
+    {
+      { "_savegpr0_", 14, 31, savegpr0, savegpr0_tail },
+      { "_restgpr0_", 14, 29, restgpr0, restgpr0_tail },
+      { "_restgpr0_", 30, 31, restgpr0, restgpr0_tail },
+      { "_savegpr1_", 14, 31, savegpr1, savegpr1_tail },
+      { "_restgpr1_", 14, 31, restgpr1, restgpr1_tail },
+      { "_savefpr_", 14, 31, savefpr, savefpr0_tail },
+      { "_restfpr_", 14, 29, restfpr, restfpr0_tail },
+      { "_restfpr_", 30, 31, restfpr, restfpr0_tail },
+      { "._savef", 14, 31, savefpr, savefpr1_tail },
+      { "._restf", 14, 31, restfpr, restfpr1_tail },
+      { "_savevr_", 20, 31, savevr, savevr_tail },
+      { "_restvr_", 20, 31, restvr, restvr_tail }
+    };
+
+  htab = ppc_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (htab->sfpr == NULL)
+    /* We don't have any relocs.  */
+    return TRUE;
+
+  /* Provide any missing _save* and _rest* functions.  */
+  htab->sfpr->size = 0;
+  for (i = 0; i < sizeof (funcs) / sizeof (funcs[0]); i++)
+    if (!sfpr_define (info, &funcs[i]))
+      return FALSE;
+
+  elf_link_hash_traverse (&htab->elf, func_desc_adjust, info);
+
+  if (htab->sfpr->size == 0)
+    htab->sfpr->flags |= SEC_EXCLUDE;
+
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+				 struct elf_link_hash_entry *h)
+{
+  struct ppc_link_hash_table *htab;
+  asection *s;
+
+  htab = ppc_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* Deal with function syms.  */
+  if (h->type == STT_FUNC
+      || h->type == STT_GNU_IFUNC
+      || h->needs_plt)
+    {
+      /* Clear procedure linkage table information for any symbol that
+	 won't need a .plt entry.  */
+      struct plt_entry *ent;
+      for (ent = h->plt.plist; ent != NULL; ent = ent->next)
+	if (ent->plt.refcount > 0)
+	  break;
+      if (ent == NULL
+	  || (h->type != STT_GNU_IFUNC
+	      && (SYMBOL_CALLS_LOCAL (info, h)
+		  || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+		      && h->root.type == bfd_link_hash_undefweak))))
+	{
+	  h->plt.plist = NULL;
+	  h->needs_plt = 0;
+	}
+    }
+  else
+    h->plt.plist = NULL;
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      if (ELIMINATE_COPY_RELOCS)
+	h->non_got_ref = h->u.weakdef->non_got_ref;
+      return TRUE;
+    }
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if (!h->non_got_ref)
+    return TRUE;
+
+  /* Don't generate a copy reloc for symbols defined in the executable.  */
+  if (!h->def_dynamic || !h->ref_regular || h->def_regular)
+    return TRUE;
+
+  if (ELIMINATE_COPY_RELOCS)
+    {
+      struct ppc_link_hash_entry * eh;
+      struct elf_dyn_relocs *p;
+
+      eh = (struct ppc_link_hash_entry *) h;
+      for (p = eh->dyn_relocs; p != NULL; p = p->next)
+	{
+	  s = p->sec->output_section;
+	  if (s != NULL && (s->flags & SEC_READONLY) != 0)
+	    break;
+	}
+
+      /* If we didn't find any dynamic relocs in read-only sections, then
+	 we'll be keeping the dynamic relocs and avoiding the copy reloc.  */
+      if (p == NULL)
+	{
+	  h->non_got_ref = 0;
+	  return TRUE;
+	}
+    }
+
+  if (h->plt.plist != NULL)
+    {
+      /* We should never get here, but unfortunately there are versions
+	 of gcc out there that improperly (for this ABI) put initialized
+	 function pointers, vtable refs and suchlike in read-only
+	 sections.  Allow them to proceed, but warn that this might
+	 break at runtime.  */
+      info->callbacks->einfo
+	(_("%P: copy reloc against `%s' requires lazy plt linking; "
+	   "avoid setting LD_BIND_NOW=1 or upgrade gcc\n"),
+	 h->root.root.string);
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  if (h->size == 0)
+    {
+      info->callbacks->einfo (_("%P: dynamic variable `%s' is zero size\n"),
+			      h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  /* We must generate a R_PPC64_COPY reloc to tell the dynamic linker
+     to copy the initial value out of the dynamic object and into the
+     runtime process image.  We need to remember the offset into the
+     .rela.bss section we are going to use.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      htab->relbss->size += sizeof (Elf64_External_Rela);
+      h->needs_copy = 1;
+    }
+
+  s = htab->dynbss;
+
+  return _bfd_elf_adjust_dynamic_copy (h, s);
+}
+
+/* If given a function descriptor symbol, hide both the function code
+   sym and the descriptor.  */
+static void
+ppc64_elf_hide_symbol (struct bfd_link_info *info,
+		       struct elf_link_hash_entry *h,
+		       bfd_boolean force_local)
+{
+  struct ppc_link_hash_entry *eh;
+  _bfd_elf_link_hash_hide_symbol (info, h, force_local);
+
+  eh = (struct ppc_link_hash_entry *) h;
+  if (eh->is_func_descriptor)
+    {
+      struct ppc_link_hash_entry *fh = eh->oh;
+
+      if (fh == NULL)
+	{
+	  const char *p, *q;
+	  struct ppc_link_hash_table *htab;
+	  char save;
+
+	  /* We aren't supposed to use alloca in BFD because on
+	     systems which do not have alloca the version in libiberty
+	     calls xmalloc, which might cause the program to crash
+	     when it runs out of memory.  This function doesn't have a
+	     return status, so there's no way to gracefully return an
+	     error.  So cheat.  We know that string[-1] can be safely
+	     accessed;  It's either a string in an ELF string table,
+	     or allocated in an objalloc structure.  */
+
+	  p = eh->elf.root.root.string - 1;
+	  save = *p;
+	  *(char *) p = '.';
+	  htab = ppc_hash_table (info);
+	  if (htab == NULL)
+	    return;
+
+	  fh = (struct ppc_link_hash_entry *)
+	    elf_link_hash_lookup (&htab->elf, p, FALSE, FALSE, FALSE);
+	  *(char *) p = save;
+
+	  /* Unfortunately, if it so happens that the string we were
+	     looking for was allocated immediately before this string,
+	     then we overwrote the string terminator.  That's the only
+	     reason the lookup should fail.  */
+	  if (fh == NULL)
+	    {
+	      q = eh->elf.root.root.string + strlen (eh->elf.root.root.string);
+	      while (q >= eh->elf.root.root.string && *q == *p)
+		--q, --p;
+	      if (q < eh->elf.root.root.string && *p == '.')
+		fh = (struct ppc_link_hash_entry *)
+		  elf_link_hash_lookup (&htab->elf, p, FALSE, FALSE, FALSE);
+	    }
+	  if (fh != NULL)
+	    {
+	      eh->oh = fh;
+	      fh->oh = eh;
+	    }
+	}
+      if (fh != NULL)
+	_bfd_elf_link_hash_hide_symbol (info, &fh->elf, force_local);
+    }
+}
+
+static bfd_boolean
+get_sym_h (struct elf_link_hash_entry **hp,
+	   Elf_Internal_Sym **symp,
+	   asection **symsecp,
+	   unsigned char **tls_maskp,
+	   Elf_Internal_Sym **locsymsp,
+	   unsigned long r_symndx,
+	   bfd *ibfd)
+{
+  Elf_Internal_Shdr *symtab_hdr = &elf_symtab_hdr (ibfd);
+
+  if (r_symndx >= symtab_hdr->sh_info)
+    {
+      struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (ibfd);
+      struct elf_link_hash_entry *h;
+
+      h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+      h = elf_follow_link (h);
+
+      if (hp != NULL)
+	*hp = h;
+
+      if (symp != NULL)
+	*symp = NULL;
+
+      if (symsecp != NULL)
+	{
+	  asection *symsec = NULL;
+	  if (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	    symsec = h->root.u.def.section;
+	  *symsecp = symsec;
+	}
+
+      if (tls_maskp != NULL)
+	{
+	  struct ppc_link_hash_entry *eh;
+
+	  eh = (struct ppc_link_hash_entry *) h;
+	  *tls_maskp = &eh->tls_mask;
+	}
+    }
+  else
+    {
+      Elf_Internal_Sym *sym;
+      Elf_Internal_Sym *locsyms = *locsymsp;
+
+      if (locsyms == NULL)
+	{
+	  locsyms = (Elf_Internal_Sym *) symtab_hdr->contents;
+	  if (locsyms == NULL)
+	    locsyms = bfd_elf_get_elf_syms (ibfd, symtab_hdr,
+					    symtab_hdr->sh_info,
+					    0, NULL, NULL, NULL);
+	  if (locsyms == NULL)
+	    return FALSE;
+	  *locsymsp = locsyms;
+	}
+      sym = locsyms + r_symndx;
+
+      if (hp != NULL)
+	*hp = NULL;
+
+      if (symp != NULL)
+	*symp = sym;
+
+      if (symsecp != NULL)
+	*symsecp = bfd_section_from_elf_index (ibfd, sym->st_shndx);
+
+      if (tls_maskp != NULL)
+	{
+	  struct got_entry **lgot_ents;
+	  unsigned char *tls_mask;
+
+	  tls_mask = NULL;
+	  lgot_ents = elf_local_got_ents (ibfd);
+	  if (lgot_ents != NULL)
+	    {
+	      struct plt_entry **local_plt = (struct plt_entry **)
+		(lgot_ents + symtab_hdr->sh_info);
+	      unsigned char *lgot_masks = (unsigned char *)
+		(local_plt + symtab_hdr->sh_info);
+	      tls_mask = &lgot_masks[r_symndx];
+	    }
+	  *tls_maskp = tls_mask;
+	}
+    }
+  return TRUE;
+}
+
+/* Returns TLS_MASKP for the given REL symbol.  Function return is 0 on
+   error, 2 on a toc GD type suitable for optimization, 3 on a toc LD
+   type suitable for optimization, and 1 otherwise.  */
+
+static int
+get_tls_mask (unsigned char **tls_maskp,
+	      unsigned long *toc_symndx,
+	      bfd_vma *toc_addend,
+	      Elf_Internal_Sym **locsymsp,
+	      const Elf_Internal_Rela *rel,
+	      bfd *ibfd)
+{
+  unsigned long r_symndx;
+  int next_r;
+  struct elf_link_hash_entry *h;
+  Elf_Internal_Sym *sym;
+  asection *sec;
+  bfd_vma off;
+
+  r_symndx = ELF64_R_SYM (rel->r_info);
+  if (!get_sym_h (&h, &sym, &sec, tls_maskp, locsymsp, r_symndx, ibfd))
+    return 0;
+
+  if ((*tls_maskp != NULL && **tls_maskp != 0)
+      || sec == NULL
+      || ppc64_elf_section_data (sec) == NULL
+      || ppc64_elf_section_data (sec)->sec_type != sec_toc)
+    return 1;
+
+  /* Look inside a TOC section too.  */
+  if (h != NULL)
+    {
+      BFD_ASSERT (h->root.type == bfd_link_hash_defined);
+      off = h->root.u.def.value;
+    }
+  else
+    off = sym->st_value;
+  off += rel->r_addend;
+  BFD_ASSERT (off % 8 == 0);
+  r_symndx = ppc64_elf_section_data (sec)->u.toc.symndx[off / 8];
+  next_r = ppc64_elf_section_data (sec)->u.toc.symndx[off / 8 + 1];
+  if (toc_symndx != NULL)
+    *toc_symndx = r_symndx;
+  if (toc_addend != NULL)
+    *toc_addend = ppc64_elf_section_data (sec)->u.toc.add[off / 8];
+  if (!get_sym_h (&h, &sym, &sec, tls_maskp, locsymsp, r_symndx, ibfd))
+    return 0;
+  if ((h == NULL || is_static_defined (h))
+      && (next_r == -1 || next_r == -2))
+    return 1 - next_r;
+  return 1;
+}
+
+/* Find (or create) an entry in the tocsave hash table.  */
+
+static struct tocsave_entry *
+tocsave_find (struct ppc_link_hash_table *htab,
+	      enum insert_option insert,
+	      Elf_Internal_Sym **local_syms,
+	      const Elf_Internal_Rela *irela,
+	      bfd *ibfd)
+{
+  unsigned long r_indx;
+  struct elf_link_hash_entry *h;
+  Elf_Internal_Sym *sym;
+  struct tocsave_entry ent, *p;
+  hashval_t hash;
+  struct tocsave_entry **slot;
+
+  r_indx = ELF64_R_SYM (irela->r_info);
+  if (!get_sym_h (&h, &sym, &ent.sec, NULL, local_syms, r_indx, ibfd))
+    return NULL;
+  if (ent.sec == NULL || ent.sec->output_section == NULL)
+    {
+      (*_bfd_error_handler)
+	(_("%B: undefined symbol on R_PPC64_TOCSAVE relocation"));
+      return NULL;
+    }
+
+  if (h != NULL)
+    ent.offset = h->root.u.def.value;
+  else
+    ent.offset = sym->st_value;
+  ent.offset += irela->r_addend;
+
+  hash = tocsave_htab_hash (&ent);
+  slot = ((struct tocsave_entry **)
+	  htab_find_slot_with_hash (htab->tocsave_htab, &ent, hash, insert));
+  if (slot == NULL)
+    return NULL;
+
+  if (*slot == NULL)
+    {
+      p = (struct tocsave_entry *) bfd_alloc (ibfd, sizeof (*p));
+      if (p == NULL)
+	return NULL;
+      *p = ent;
+      *slot = p;
+    }
+  return *slot;
+}
+
+/* Adjust all global syms defined in opd sections.  In gcc generated
+   code for the old ABI, these will already have been done.  */
+
+static bfd_boolean
+adjust_opd_syms (struct elf_link_hash_entry *h, void *inf ATTRIBUTE_UNUSED)
+{
+  struct ppc_link_hash_entry *eh;
+  asection *sym_sec;
+  struct _opd_sec_data *opd;
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  if (h->root.type != bfd_link_hash_defined
+      && h->root.type != bfd_link_hash_defweak)
+    return TRUE;
+
+  eh = (struct ppc_link_hash_entry *) h;
+  if (eh->adjust_done)
+    return TRUE;
+
+  sym_sec = eh->elf.root.u.def.section;
+  opd = get_opd_info (sym_sec);
+  if (opd != NULL && opd->adjust != NULL)
+    {
+      long adjust = opd->adjust[eh->elf.root.u.def.value / 8];
+      if (adjust == -1)
+	{
+	  /* This entry has been deleted.  */
+	  asection *dsec = ppc64_elf_tdata (sym_sec->owner)->deleted_section;
+	  if (dsec == NULL)
+	    {
+	      for (dsec = sym_sec->owner->sections; dsec; dsec = dsec->next)
+		if (elf_discarded_section (dsec))
+		  {
+		    ppc64_elf_tdata (sym_sec->owner)->deleted_section = dsec;
+		    break;
+		  }
+	    }
+	  eh->elf.root.u.def.value = 0;
+	  eh->elf.root.u.def.section = dsec;
+	}
+      else
+	eh->elf.root.u.def.value += adjust;
+      eh->adjust_done = 1;
+    }
+  return TRUE;
+}
+
+/* Handles decrementing dynamic reloc counts for the reloc specified by
+   R_INFO in section SEC.  If LOCAL_SYMS is NULL, then H and SYM_SEC
+   have already been determined.  */
+
+static bfd_boolean
+dec_dynrel_count (bfd_vma r_info,
+		  asection *sec,
+		  struct bfd_link_info *info,
+		  Elf_Internal_Sym **local_syms,
+		  struct elf_link_hash_entry *h,
+		  asection *sym_sec)
+{
+  enum elf_ppc64_reloc_type r_type;
+  struct elf_dyn_relocs *p;
+  struct elf_dyn_relocs **pp;
+
+  /* Can this reloc be dynamic?  This switch, and later tests here
+     should be kept in sync with the code in check_relocs.  */
+  r_type = ELF64_R_TYPE (r_info);
+  switch (r_type)
+    {
+    default:
+      return TRUE;
+
+    case R_PPC64_TPREL16:
+    case R_PPC64_TPREL16_LO:
+    case R_PPC64_TPREL16_HI:
+    case R_PPC64_TPREL16_HA:
+    case R_PPC64_TPREL16_DS:
+    case R_PPC64_TPREL16_LO_DS:
+    case R_PPC64_TPREL16_HIGHER:
+    case R_PPC64_TPREL16_HIGHERA:
+    case R_PPC64_TPREL16_HIGHEST:
+    case R_PPC64_TPREL16_HIGHESTA:
+      if (!info->shared)
+	return TRUE;
+
+    case R_PPC64_TPREL64:
+    case R_PPC64_DTPMOD64:
+    case R_PPC64_DTPREL64:
+    case R_PPC64_ADDR64:
+    case R_PPC64_REL30:
+    case R_PPC64_REL32:
+    case R_PPC64_REL64:
+    case R_PPC64_ADDR14:
+    case R_PPC64_ADDR14_BRNTAKEN:
+    case R_PPC64_ADDR14_BRTAKEN:
+    case R_PPC64_ADDR16:
+    case R_PPC64_ADDR16_DS:
+    case R_PPC64_ADDR16_HA:
+    case R_PPC64_ADDR16_HI:
+    case R_PPC64_ADDR16_HIGHER:
+    case R_PPC64_ADDR16_HIGHERA:
+    case R_PPC64_ADDR16_HIGHEST:
+    case R_PPC64_ADDR16_HIGHESTA:
+    case R_PPC64_ADDR16_LO:
+    case R_PPC64_ADDR16_LO_DS:
+    case R_PPC64_ADDR24:
+    case R_PPC64_ADDR32:
+    case R_PPC64_UADDR16:
+    case R_PPC64_UADDR32:
+    case R_PPC64_UADDR64:
+    case R_PPC64_TOC:
+      break;
+    }
+
+  if (local_syms != NULL)
+    {
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      bfd *ibfd = sec->owner;
+
+      r_symndx = ELF64_R_SYM (r_info);
+      if (!get_sym_h (&h, &sym, &sym_sec, NULL, local_syms, r_symndx, ibfd))
+	return FALSE;
+    }
+
+  if ((info->shared
+       && (must_be_dyn_reloc (info, r_type)
+	   || (h != NULL
+	       && (!info->symbolic
+		   || h->root.type == bfd_link_hash_defweak
+		   || !h->def_regular))))
+      || (ELIMINATE_COPY_RELOCS
+	  && !info->shared
+	  && h != NULL
+	  && (h->root.type == bfd_link_hash_defweak
+	      || !h->def_regular)))
+    ;
+  else
+    return TRUE;
+
+  if (h != NULL)
+    pp = &((struct ppc_link_hash_entry *) h)->dyn_relocs;
+  else
+    {
+      if (sym_sec != NULL)
+	{
+	  void *vpp = &elf_section_data (sym_sec)->local_dynrel;
+	  pp = (struct elf_dyn_relocs **) vpp;
+	}
+      else
+	{
+	  void *vpp = &elf_section_data (sec)->local_dynrel;
+	  pp = (struct elf_dyn_relocs **) vpp;
+	}
+
+      /* elf_gc_sweep may have already removed all dyn relocs associated
+	 with local syms for a given section.  Don't report a dynreloc
+	 miscount.  */
+      if (*pp == NULL)
+	return TRUE;
+    }
+
+  while ((p = *pp) != NULL)
+    {
+      if (p->sec == sec)
+	{
+	  if (!must_be_dyn_reloc (info, r_type))
+	    p->pc_count -= 1;
+	  p->count -= 1;
+	  if (p->count == 0)
+	    *pp = p->next;
+	  return TRUE;
+	}
+      pp = &p->next;
+    }
+
+  info->callbacks->einfo (_("%P: dynreloc miscount for %B, section %A\n"),
+			  sec->owner, sec);
+  bfd_set_error (bfd_error_bad_value);
+  return FALSE;
+}
+
+/* Remove unused Official Procedure Descriptor entries.  Currently we
+   only remove those associated with functions in discarded link-once
+   sections, or weakly defined functions that have been overridden.  It
+   would be possible to remove many more entries for statically linked
+   applications.  */
+
+bfd_boolean
+ppc64_elf_edit_opd (struct bfd_link_info *info, bfd_boolean non_overlapping)
+{
+  bfd *ibfd;
+  bfd_boolean some_edited = FALSE;
+  asection *need_pad = NULL;
+
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      asection *sec;
+      Elf_Internal_Rela *relstart, *rel, *relend;
+      Elf_Internal_Shdr *symtab_hdr;
+      Elf_Internal_Sym *local_syms;
+      bfd_vma offset;
+      struct _opd_sec_data *opd;
+      bfd_boolean need_edit, add_aux_fields;
+      bfd_size_type cnt_16b = 0;
+
+      if (!is_ppc64_elf (ibfd))
+	continue;
+
+      sec = bfd_get_section_by_name (ibfd, ".opd");
+      if (sec == NULL || sec->size == 0)
+	continue;
+
+      if (sec->sec_info_type == ELF_INFO_TYPE_JUST_SYMS)
+	continue;
+
+      if (sec->output_section == bfd_abs_section_ptr)
+	continue;
+
+      /* Look through the section relocs.  */
+      if ((sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0)
+	continue;
+
+      local_syms = NULL;
+      symtab_hdr = &elf_symtab_hdr (ibfd);
+
+      /* Read the relocations.  */
+      relstart = _bfd_elf_link_read_relocs (ibfd, sec, NULL, NULL,
+					    info->keep_memory);
+      if (relstart == NULL)
+	return FALSE;
+
+      /* First run through the relocs to check they are sane, and to
+	 determine whether we need to edit this opd section.  */
+      need_edit = FALSE;
+      need_pad = sec;
+      offset = 0;
+      relend = relstart + sec->reloc_count;
+      for (rel = relstart; rel < relend; )
+	{
+	  enum elf_ppc64_reloc_type r_type;
+	  unsigned long r_symndx;
+	  asection *sym_sec;
+	  struct elf_link_hash_entry *h;
+	  Elf_Internal_Sym *sym;
+
+	  /* .opd contains a regular array of 16 or 24 byte entries.  We're
+	     only interested in the reloc pointing to a function entry
+	     point.  */
+	  if (rel->r_offset != offset
+	      || rel + 1 >= relend
+	      || (rel + 1)->r_offset != offset + 8)
+	    {
+	      /* If someone messes with .opd alignment then after a
+		 "ld -r" we might have padding in the middle of .opd.
+		 Also, there's nothing to prevent someone putting
+		 something silly in .opd with the assembler.  No .opd
+		 optimization for them!  */
+	    broken_opd:
+	      (*_bfd_error_handler)
+		(_("%B: .opd is not a regular array of opd entries"), ibfd);
+	      need_edit = FALSE;
+	      break;
+	    }
+
+	  if ((r_type = ELF64_R_TYPE (rel->r_info)) != R_PPC64_ADDR64
+	      || (r_type = ELF64_R_TYPE ((rel + 1)->r_info)) != R_PPC64_TOC)
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: unexpected reloc type %u in .opd section"),
+		 ibfd, r_type);
+	      need_edit = FALSE;
+	      break;
+	    }
+
+	  r_symndx = ELF64_R_SYM (rel->r_info);
+	  if (!get_sym_h (&h, &sym, &sym_sec, NULL, &local_syms,
+			  r_symndx, ibfd))
+	    goto error_ret;
+
+	  if (sym_sec == NULL || sym_sec->owner == NULL)
+	    {
+	      const char *sym_name;
+	      if (h != NULL)
+		sym_name = h->root.root.string;
+	      else
+		sym_name = bfd_elf_sym_name (ibfd, symtab_hdr, sym,
+					     sym_sec);
+
+	      (*_bfd_error_handler)
+		(_("%B: undefined sym `%s' in .opd section"),
+		 ibfd, sym_name);
+	      need_edit = FALSE;
+	      break;
+	    }
+
+	  /* opd entries are always for functions defined in the
+	     current input bfd.  If the symbol isn't defined in the
+	     input bfd, then we won't be using the function in this
+	     bfd;  It must be defined in a linkonce section in another
+	     bfd, or is weak.  It's also possible that we are
+	     discarding the function due to a linker script /DISCARD/,
+	     which we test for via the output_section.  */
+	  if (sym_sec->owner != ibfd
+	      || sym_sec->output_section == bfd_abs_section_ptr)
+	    need_edit = TRUE;
+
+	  rel += 2;
+	  if (rel == relend
+	      || (rel + 1 == relend && rel->r_offset == offset + 16))
+	    {
+	      if (sec->size == offset + 24)
+		{
+		  need_pad = NULL;
+		  break;
+		}
+	      if (rel == relend && sec->size == offset + 16)
+		{
+		  cnt_16b++;
+		  break;
+		}
+	      goto broken_opd;
+	    }
+
+	  if (rel->r_offset == offset + 24)
+	    offset += 24;
+	  else if (rel->r_offset != offset + 16)
+	    goto broken_opd;
+	  else if (rel + 1 < relend
+		   && ELF64_R_TYPE (rel[0].r_info) == R_PPC64_ADDR64
+		   && ELF64_R_TYPE (rel[1].r_info) == R_PPC64_TOC)
+	    {
+	      offset += 16;
+	      cnt_16b++;
+	    }
+	  else if (rel + 2 < relend
+		   && ELF64_R_TYPE (rel[1].r_info) == R_PPC64_ADDR64
+		   && ELF64_R_TYPE (rel[2].r_info) == R_PPC64_TOC)
+	    {
+	      offset += 24;
+	      rel += 1;
+	    }
+	  else
+	    goto broken_opd;
+	}
+
+      add_aux_fields = non_overlapping && cnt_16b > 0;
+
+      if (need_edit || add_aux_fields)
+	{
+	  Elf_Internal_Rela *write_rel;
+	  Elf_Internal_Shdr *rel_hdr;
+	  bfd_byte *rptr, *wptr;
+	  bfd_byte *new_contents;
+	  bfd_boolean skip;
+	  long opd_ent_size;
+	  bfd_size_type amt;
+
+	  new_contents = NULL;
+	  amt = sec->size * sizeof (long) / 8;
+	  opd = &ppc64_elf_section_data (sec)->u.opd;
+	  opd->adjust = bfd_zalloc (sec->owner, amt);
+	  if (opd->adjust == NULL)
+	    return FALSE;
+	  ppc64_elf_section_data (sec)->sec_type = sec_opd;
+
+	  /* This seems a waste of time as input .opd sections are all
+	     zeros as generated by gcc, but I suppose there's no reason
+	     this will always be so.  We might start putting something in
+	     the third word of .opd entries.  */
+	  if ((sec->flags & SEC_IN_MEMORY) == 0)
+	    {
+	      bfd_byte *loc;
+	      if (!bfd_malloc_and_get_section (ibfd, sec, &loc))
+		{
+		  if (loc != NULL)
+		    free (loc);
+		error_ret:
+		  if (local_syms != NULL
+		      && symtab_hdr->contents != (unsigned char *) local_syms)
+		    free (local_syms);
+		  if (elf_section_data (sec)->relocs != relstart)
+		    free (relstart);
+		  return FALSE;
+		}
+	      sec->contents = loc;
+	      sec->flags |= (SEC_IN_MEMORY | SEC_HAS_CONTENTS);
+	    }
+
+	  elf_section_data (sec)->relocs = relstart;
+
+	  new_contents = sec->contents;
+	  if (add_aux_fields)
+	    {
+	      new_contents = bfd_malloc (sec->size + cnt_16b * 8);
+	      if (new_contents == NULL)
+		return FALSE;
+	      need_pad = FALSE;
+	    }
+	  wptr = new_contents;
+	  rptr = sec->contents;
+
+	  write_rel = relstart;
+	  skip = FALSE;
+	  offset = 0;
+	  opd_ent_size = 0;
+	  for (rel = relstart; rel < relend; rel++)
+	    {
+	      unsigned long r_symndx;
+	      asection *sym_sec;
+	      struct elf_link_hash_entry *h;
+	      Elf_Internal_Sym *sym;
+
+	      r_symndx = ELF64_R_SYM (rel->r_info);
+	      if (!get_sym_h (&h, &sym, &sym_sec, NULL, &local_syms,
+			      r_symndx, ibfd))
+		goto error_ret;
+
+	      if (rel->r_offset == offset)
+		{
+		  struct ppc_link_hash_entry *fdh = NULL;
+
+		  /* See if the .opd entry is full 24 byte or
+		     16 byte (with fd_aux entry overlapped with next
+		     fd_func).  */
+		  opd_ent_size = 24;
+		  if ((rel + 2 == relend && sec->size == offset + 16)
+		      || (rel + 3 < relend
+			  && rel[2].r_offset == offset + 16
+			  && rel[3].r_offset == offset + 24
+			  && ELF64_R_TYPE (rel[2].r_info) == R_PPC64_ADDR64
+			  && ELF64_R_TYPE (rel[3].r_info) == R_PPC64_TOC))
+		    opd_ent_size = 16;
+
+		  if (h != NULL
+		      && h->root.root.string[0] == '.')
+		    {
+		      struct ppc_link_hash_table *htab;
+
+		      htab = ppc_hash_table (info);
+		      if (htab != NULL)
+			fdh = lookup_fdh ((struct ppc_link_hash_entry *) h,
+					  htab);
+		      if (fdh != NULL
+			  && fdh->elf.root.type != bfd_link_hash_defined
+			  && fdh->elf.root.type != bfd_link_hash_defweak)
+			fdh = NULL;
+		    }
+
+		  skip = (sym_sec->owner != ibfd
+			  || sym_sec->output_section == bfd_abs_section_ptr);
+		  if (skip)
+		    {
+		      if (fdh != NULL && sym_sec->owner == ibfd)
+			{
+			  /* Arrange for the function descriptor sym
+			     to be dropped.  */
+			  fdh->elf.root.u.def.value = 0;
+			  fdh->elf.root.u.def.section = sym_sec;
+			}
+		      opd->adjust[rel->r_offset / 8] = -1;
+		    }
+		  else
+		    {
+		      /* We'll be keeping this opd entry.  */
+
+		      if (fdh != NULL)
+			{
+			  /* Redefine the function descriptor symbol to
+			     this location in the opd section.  It is
+			     necessary to update the value here rather
+			     than using an array of adjustments as we do
+			     for local symbols, because various places
+			     in the generic ELF code use the value
+			     stored in u.def.value.  */
+			  fdh->elf.root.u.def.value = wptr - new_contents;
+			  fdh->adjust_done = 1;
+			}
+
+		      /* Local syms are a bit tricky.  We could
+			 tweak them as they can be cached, but
+			 we'd need to look through the local syms
+			 for the function descriptor sym which we
+			 don't have at the moment.  So keep an
+			 array of adjustments.  */
+		      opd->adjust[rel->r_offset / 8]
+			= (wptr - new_contents) - (rptr - sec->contents);
+
+		      if (wptr != rptr)
+			memcpy (wptr, rptr, opd_ent_size);
+		      wptr += opd_ent_size;
+		      if (add_aux_fields && opd_ent_size == 16)
+			{
+			  memset (wptr, '\0', 8);
+			  wptr += 8;
+			}
+		    }
+		  rptr += opd_ent_size;
+		  offset += opd_ent_size;
+		}
+
+	      if (skip)
+		{
+		  if (!NO_OPD_RELOCS
+		      && !info->relocatable
+		      && !dec_dynrel_count (rel->r_info, sec, info,
+					    NULL, h, sym_sec))
+		    goto error_ret;
+		}
+	      else
+		{
+		  /* We need to adjust any reloc offsets to point to the
+		     new opd entries.  While we're at it, we may as well
+		     remove redundant relocs.  */
+		  rel->r_offset += opd->adjust[(offset - opd_ent_size) / 8];
+		  if (write_rel != rel)
+		    memcpy (write_rel, rel, sizeof (*rel));
+		  ++write_rel;
+		}
+	    }
+
+	  sec->size = wptr - new_contents;
+	  sec->reloc_count = write_rel - relstart;
+	  if (add_aux_fields)
+	    {
+	      free (sec->contents);
+	      sec->contents = new_contents;
+	    }
+
+	  /* Fudge the header size too, as this is used later in
+	     elf_bfd_final_link if we are emitting relocs.  */
+	  rel_hdr = _bfd_elf_single_rel_hdr (sec);
+	  rel_hdr->sh_size = sec->reloc_count * rel_hdr->sh_entsize;
+	  some_edited = TRUE;
+	}
+      else if (elf_section_data (sec)->relocs != relstart)
+	free (relstart);
+
+      if (local_syms != NULL
+	  && symtab_hdr->contents != (unsigned char *) local_syms)
+	{
+	  if (!info->keep_memory)
+	    free (local_syms);
+	  else
+	    symtab_hdr->contents = (unsigned char *) local_syms;
+	}
+    }
+
+  if (some_edited)
+    elf_link_hash_traverse (elf_hash_table (info), adjust_opd_syms, NULL);
+
+  /* If we are doing a final link and the last .opd entry is just 16 byte
+     long, add a 8 byte padding after it.  */
+  if (need_pad != NULL && !info->relocatable)
+    {
+      bfd_byte *p;
+
+      if ((need_pad->flags & SEC_IN_MEMORY) == 0)
+	{
+	  BFD_ASSERT (need_pad->size > 0);
+
+	  p = bfd_malloc (need_pad->size + 8);
+	  if (p == NULL)
+	    return FALSE;
+
+	  if (! bfd_get_section_contents (need_pad->owner, need_pad,
+					  p, 0, need_pad->size))
+	    return FALSE;
+
+	  need_pad->contents = p;
+	  need_pad->flags |= (SEC_IN_MEMORY | SEC_HAS_CONTENTS);
+	}
+      else
+	{
+	  p = bfd_realloc (need_pad->contents, need_pad->size + 8);
+	  if (p == NULL)
+	    return FALSE;
+
+	  need_pad->contents = p;
+	}
+
+      memset (need_pad->contents + need_pad->size, 0, 8);
+      need_pad->size += 8;
+    }
+
+  return TRUE;
+}
+
+/* Set htab->tls_get_addr and call the generic ELF tls_setup function.  */
+
+asection *
+ppc64_elf_tls_setup (struct bfd_link_info *info,
+		     int no_tls_get_addr_opt,
+		     int *no_multi_toc)
+{
+  struct ppc_link_hash_table *htab;
+
+  htab = ppc_hash_table (info);
+  if (htab == NULL)
+    return NULL;
+
+  if (*no_multi_toc)
+    htab->do_multi_toc = 0;
+  else if (!htab->do_multi_toc)
+    *no_multi_toc = 1;
+
+  htab->tls_get_addr = ((struct ppc_link_hash_entry *)
+			elf_link_hash_lookup (&htab->elf, ".__tls_get_addr",
+					      FALSE, FALSE, TRUE));
+  /* Move dynamic linking info to the function descriptor sym.  */
+  if (htab->tls_get_addr != NULL)
+    func_desc_adjust (&htab->tls_get_addr->elf, info);
+  htab->tls_get_addr_fd = ((struct ppc_link_hash_entry *)
+			   elf_link_hash_lookup (&htab->elf, "__tls_get_addr",
+						 FALSE, FALSE, TRUE));
+  if (!no_tls_get_addr_opt)
+    {
+      struct elf_link_hash_entry *opt, *opt_fd, *tga, *tga_fd;
+
+      opt = elf_link_hash_lookup (&htab->elf, ".__tls_get_addr_opt",
+				  FALSE, FALSE, TRUE);
+      if (opt != NULL)
+	func_desc_adjust (opt, info);
+      opt_fd = elf_link_hash_lookup (&htab->elf, "__tls_get_addr_opt",
+				     FALSE, FALSE, TRUE);
+      if (opt_fd != NULL
+	  && (opt_fd->root.type == bfd_link_hash_defined
+	      || opt_fd->root.type == bfd_link_hash_defweak))
+	{
+	  /* If glibc supports an optimized __tls_get_addr call stub,
+	     signalled by the presence of __tls_get_addr_opt, and we'll
+	     be calling __tls_get_addr via a plt call stub, then
+	     make __tls_get_addr point to __tls_get_addr_opt.  */
+	  tga_fd = &htab->tls_get_addr_fd->elf;
+	  if (htab->elf.dynamic_sections_created
+	      && tga_fd != NULL
+	      && (tga_fd->type == STT_FUNC
+		  || tga_fd->needs_plt)
+	      && !(SYMBOL_CALLS_LOCAL (info, tga_fd)
+		   || (ELF_ST_VISIBILITY (tga_fd->other) != STV_DEFAULT
+		       && tga_fd->root.type == bfd_link_hash_undefweak)))
+	    {
+	      struct plt_entry *ent;
+
+	      for (ent = tga_fd->plt.plist; ent != NULL; ent = ent->next)
+		if (ent->plt.refcount > 0)
+		  break;
+	      if (ent != NULL)
+		{
+		  tga_fd->root.type = bfd_link_hash_indirect;
+		  tga_fd->root.u.i.link = &opt_fd->root;
+		  ppc64_elf_copy_indirect_symbol (info, opt_fd, tga_fd);
+		  if (opt_fd->dynindx != -1)
+		    {
+		      /* Use __tls_get_addr_opt in dynamic relocations.  */
+		      opt_fd->dynindx = -1;
+		      _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
+					      opt_fd->dynstr_index);
+		      if (!bfd_elf_link_record_dynamic_symbol (info, opt_fd))
+			return NULL;
+		    }
+		  htab->tls_get_addr_fd = (struct ppc_link_hash_entry *) opt_fd;
+		  tga = &htab->tls_get_addr->elf;
+		  if (opt != NULL && tga != NULL)
+		    {
+		      tga->root.type = bfd_link_hash_indirect;
+		      tga->root.u.i.link = &opt->root;
+		      ppc64_elf_copy_indirect_symbol (info, opt, tga);
+		      _bfd_elf_link_hash_hide_symbol (info, opt,
+						      tga->forced_local);
+		      htab->tls_get_addr = (struct ppc_link_hash_entry *) opt;
+		    }
+		  htab->tls_get_addr_fd->oh = htab->tls_get_addr;
+		  htab->tls_get_addr_fd->is_func_descriptor = 1;
+		  if (htab->tls_get_addr != NULL)
+		    {
+		      htab->tls_get_addr->oh = htab->tls_get_addr_fd;
+		      htab->tls_get_addr->is_func = 1;
+		    }
+		}
+	    }
+	}
+      else
+	no_tls_get_addr_opt = TRUE;
+    }
+  htab->no_tls_get_addr_opt = no_tls_get_addr_opt;
+  return _bfd_elf_tls_setup (info->output_bfd, info);
+}
+
+/* Return TRUE iff REL is a branch reloc with a global symbol matching
+   HASH1 or HASH2.  */
+
+static bfd_boolean
+branch_reloc_hash_match (const bfd *ibfd,
+			 const Elf_Internal_Rela *rel,
+			 const struct ppc_link_hash_entry *hash1,
+			 const struct ppc_link_hash_entry *hash2)
+{
+  Elf_Internal_Shdr *symtab_hdr = &elf_symtab_hdr (ibfd);
+  enum elf_ppc64_reloc_type r_type = ELF64_R_TYPE (rel->r_info);
+  unsigned int r_symndx = ELF64_R_SYM (rel->r_info);
+
+  if (r_symndx >= symtab_hdr->sh_info && is_branch_reloc (r_type))
+    {
+      struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (ibfd);
+      struct elf_link_hash_entry *h;
+
+      h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+      h = elf_follow_link (h);
+      if (h == &hash1->elf || h == &hash2->elf)
+	return TRUE;
+    }
+  return FALSE;
+}
+
+/* Run through all the TLS relocs looking for optimization
+   opportunities.  The linker has been hacked (see ppc64elf.em) to do
+   a preliminary section layout so that we know the TLS segment
+   offsets.  We can't optimize earlier because some optimizations need
+   to know the tp offset, and we need to optimize before allocating
+   dynamic relocations.  */
+
+bfd_boolean
+ppc64_elf_tls_optimize (struct bfd_link_info *info)
+{
+  bfd *ibfd;
+  asection *sec;
+  struct ppc_link_hash_table *htab;
+  unsigned char *toc_ref;
+  int pass;
+
+  if (info->relocatable || !info->executable)
+    return TRUE;
+
+  htab = ppc_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* Make two passes over the relocs.  On the first pass, mark toc
+     entries involved with tls relocs, and check that tls relocs
+     involved in setting up a tls_get_addr call are indeed followed by
+     such a call.  If they are not, we can't do any tls optimization.
+     On the second pass twiddle tls_mask flags to notify
+     relocate_section that optimization can be done, and adjust got
+     and plt refcounts.  */
+  toc_ref = NULL;
+  for (pass = 0; pass < 2; ++pass)
+    for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+      {
+	Elf_Internal_Sym *locsyms = NULL;
+	asection *toc = bfd_get_section_by_name (ibfd, ".toc");
+
+	for (sec = ibfd->sections; sec != NULL; sec = sec->next)
+	  if (sec->has_tls_reloc && !bfd_is_abs_section (sec->output_section))
+	    {
+	      Elf_Internal_Rela *relstart, *rel, *relend;
+	      bfd_boolean found_tls_get_addr_arg = 0;
+
+	      /* Read the relocations.  */
+	      relstart = _bfd_elf_link_read_relocs (ibfd, sec, NULL, NULL,
+						    info->keep_memory);
+	      if (relstart == NULL)
+		return FALSE;
+
+	      relend = relstart + sec->reloc_count;
+	      for (rel = relstart; rel < relend; rel++)
+		{
+		  enum elf_ppc64_reloc_type r_type;
+		  unsigned long r_symndx;
+		  struct elf_link_hash_entry *h;
+		  Elf_Internal_Sym *sym;
+		  asection *sym_sec;
+		  unsigned char *tls_mask;
+		  unsigned char tls_set, tls_clear, tls_type = 0;
+		  bfd_vma value;
+		  bfd_boolean ok_tprel, is_local;
+		  long toc_ref_index = 0;
+		  int expecting_tls_get_addr = 0;
+		  bfd_boolean ret = FALSE;
+
+		  r_symndx = ELF64_R_SYM (rel->r_info);
+		  if (!get_sym_h (&h, &sym, &sym_sec, &tls_mask, &locsyms,
+				  r_symndx, ibfd))
+		    {
+		    err_free_rel:
+		      if (elf_section_data (sec)->relocs != relstart)
+			free (relstart);
+		      if (toc_ref != NULL)
+			free (toc_ref);
+		      if (locsyms != NULL
+			  && (elf_symtab_hdr (ibfd).contents
+			      != (unsigned char *) locsyms))
+			free (locsyms);
+		      return ret;
+		    }
+
+		  if (h != NULL)
+		    {
+		      if (h->root.type == bfd_link_hash_defined
+			  || h->root.type == bfd_link_hash_defweak)
+			value = h->root.u.def.value;
+		      else if (h->root.type == bfd_link_hash_undefweak)
+			value = 0;
+		      else
+			{
+			  found_tls_get_addr_arg = 0;
+			  continue;
+			}
+		    }
+		  else
+		    /* Symbols referenced by TLS relocs must be of type
+		       STT_TLS.  So no need for .opd local sym adjust.  */
+		    value = sym->st_value;
+
+		  ok_tprel = FALSE;
+		  is_local = FALSE;
+		  if (h == NULL
+		      || !h->def_dynamic)
+		    {
+		      is_local = TRUE;
+		      if (h != NULL
+			  && h->root.type == bfd_link_hash_undefweak)
+			ok_tprel = TRUE;
+		      else
+			{
+			  value += sym_sec->output_offset;
+			  value += sym_sec->output_section->vma;
+			  value -= htab->elf.tls_sec->vma;
+			  ok_tprel = (value + TP_OFFSET + ((bfd_vma) 1 << 31)
+				      < (bfd_vma) 1 << 32);
+			}
+		    }
+
+		  r_type = ELF64_R_TYPE (rel->r_info);
+		  /* If this section has old-style __tls_get_addr calls
+		     without marker relocs, then check that each
+		     __tls_get_addr call reloc is preceded by a reloc
+		     that conceivably belongs to the __tls_get_addr arg
+		     setup insn.  If we don't find matching arg setup
+		     relocs, don't do any tls optimization.  */
+		  if (pass == 0
+		      && sec->has_tls_get_addr_call
+		      && h != NULL
+		      && (h == &htab->tls_get_addr->elf
+			  || h == &htab->tls_get_addr_fd->elf)
+		      && !found_tls_get_addr_arg
+		      && is_branch_reloc (r_type))
+		    {
+		      info->callbacks->minfo (_("%H __tls_get_addr lost arg, "
+						"TLS optimization disabled\n"),
+					      ibfd, sec, rel->r_offset);
+		      ret = TRUE;
+		      goto err_free_rel;
+		    }
+
+		  found_tls_get_addr_arg = 0;
+		  switch (r_type)
+		    {
+		    case R_PPC64_GOT_TLSLD16:
+		    case R_PPC64_GOT_TLSLD16_LO:
+		      expecting_tls_get_addr = 1;
+		      found_tls_get_addr_arg = 1;
+		      /* Fall thru */
+
+		    case R_PPC64_GOT_TLSLD16_HI:
+		    case R_PPC64_GOT_TLSLD16_HA:
+		      /* These relocs should never be against a symbol
+			 defined in a shared lib.  Leave them alone if
+			 that turns out to be the case.  */
+		      if (!is_local)
+			continue;
+
+		      /* LD -> LE */
+		      tls_set = 0;
+		      tls_clear = TLS_LD;
+		      tls_type = TLS_TLS | TLS_LD;
+		      break;
+
+		    case R_PPC64_GOT_TLSGD16:
+		    case R_PPC64_GOT_TLSGD16_LO:
+		      expecting_tls_get_addr = 1;
+		      found_tls_get_addr_arg = 1;
+		      /* Fall thru */
+
+		    case R_PPC64_GOT_TLSGD16_HI:
+		    case R_PPC64_GOT_TLSGD16_HA:
+		      if (ok_tprel)
+			/* GD -> LE */
+			tls_set = 0;
+		      else
+			/* GD -> IE */
+			tls_set = TLS_TLS | TLS_TPRELGD;
+		      tls_clear = TLS_GD;
+		      tls_type = TLS_TLS | TLS_GD;
+		      break;
+
+		    case R_PPC64_GOT_TPREL16_DS:
+		    case R_PPC64_GOT_TPREL16_LO_DS:
+		    case R_PPC64_GOT_TPREL16_HI:
+		    case R_PPC64_GOT_TPREL16_HA:
+		      if (ok_tprel)
+			{
+			  /* IE -> LE */
+			  tls_set = 0;
+			  tls_clear = TLS_TPREL;
+			  tls_type = TLS_TLS | TLS_TPREL;
+			  break;
+			}
+		      continue;
+
+		    case R_PPC64_TLSGD:
+		    case R_PPC64_TLSLD:
+		      found_tls_get_addr_arg = 1;
+		      /* Fall thru */
+
+		    case R_PPC64_TLS:
+		    case R_PPC64_TOC16:
+		    case R_PPC64_TOC16_LO:
+		      if (sym_sec == NULL || sym_sec != toc)
+			continue;
+
+		      /* Mark this toc entry as referenced by a TLS
+			 code sequence.  We can do that now in the
+			 case of R_PPC64_TLS, and after checking for
+			 tls_get_addr for the TOC16 relocs.  */
+		      if (toc_ref == NULL)
+			toc_ref = bfd_zmalloc (toc->output_section->rawsize / 8);
+		      if (toc_ref == NULL)
+			goto err_free_rel;
+
+		      if (h != NULL)
+			value = h->root.u.def.value;
+		      else
+			value = sym->st_value;
+		      value += rel->r_addend;
+		      BFD_ASSERT (value < toc->size && value % 8 == 0);
+		      toc_ref_index = (value + toc->output_offset) / 8;
+		      if (r_type == R_PPC64_TLS
+			  || r_type == R_PPC64_TLSGD
+			  || r_type == R_PPC64_TLSLD)
+			{
+			  toc_ref[toc_ref_index] = 1;
+			  continue;
+			}
+
+		      if (pass != 0 && toc_ref[toc_ref_index] == 0)
+			continue;
+
+		      tls_set = 0;
+		      tls_clear = 0;
+		      expecting_tls_get_addr = 2;
+		      break;
+
+		    case R_PPC64_TPREL64:
+		      if (pass == 0
+			  || sec != toc
+			  || toc_ref == NULL
+			  || !toc_ref[(rel->r_offset + toc->output_offset) / 8])
+			continue;
+		      if (ok_tprel)
+			{
+			  /* IE -> LE */
+			  tls_set = TLS_EXPLICIT;
+			  tls_clear = TLS_TPREL;
+			  break;
+			}
+		      continue;
+
+		    case R_PPC64_DTPMOD64:
+		      if (pass == 0
+			  || sec != toc
+			  || toc_ref == NULL
+			  || !toc_ref[(rel->r_offset + toc->output_offset) / 8])
+			continue;
+		      if (rel + 1 < relend
+			  && (rel[1].r_info
+			      == ELF64_R_INFO (r_symndx, R_PPC64_DTPREL64))
+			  && rel[1].r_offset == rel->r_offset + 8)
+			{
+			  if (ok_tprel)
+			    /* GD -> LE */
+			    tls_set = TLS_EXPLICIT | TLS_GD;
+			  else
+			    /* GD -> IE */
+			    tls_set = TLS_EXPLICIT | TLS_GD | TLS_TPRELGD;
+			  tls_clear = TLS_GD;
+			}
+		      else
+			{
+			  if (!is_local)
+			    continue;
+
+			  /* LD -> LE */
+			  tls_set = TLS_EXPLICIT;
+			  tls_clear = TLS_LD;
+			}
+		      break;
+
+		    default:
+		      continue;
+		    }
+
+		  if (pass == 0)
+		    {
+		      if (!expecting_tls_get_addr
+			  || !sec->has_tls_get_addr_call)
+			continue;
+
+		      if (rel + 1 < relend
+			  && branch_reloc_hash_match (ibfd, rel + 1,
+						      htab->tls_get_addr,
+						      htab->tls_get_addr_fd))
+			{
+			  if (expecting_tls_get_addr == 2)
+			    {
+			      /* Check for toc tls entries.  */
+			      unsigned char *toc_tls;
+			      int retval;
+
+			      retval = get_tls_mask (&toc_tls, NULL, NULL,
+						     &locsyms,
+						     rel, ibfd);
+			      if (retval == 0)
+				goto err_free_rel;
+			      if (toc_tls != NULL)
+				{
+				  if ((*toc_tls & (TLS_GD | TLS_LD)) != 0)
+				    found_tls_get_addr_arg = 1;
+				  if (retval > 1)
+				    toc_ref[toc_ref_index] = 1;
+				}
+			    }
+			  continue;
+			}
+
+		      if (expecting_tls_get_addr != 1)
+			continue;
+
+		      /* Uh oh, we didn't find the expected call.  We
+			 could just mark this symbol to exclude it
+			 from tls optimization but it's safer to skip
+			 the entire optimization.  */
+		      info->callbacks->minfo (_("%H arg lost __tls_get_addr, "
+						"TLS optimization disabled\n"),
+					      ibfd, sec, rel->r_offset);
+		      ret = TRUE;
+		      goto err_free_rel;
+		    }
+
+		  if (expecting_tls_get_addr && htab->tls_get_addr != NULL)
+		    {
+		      struct plt_entry *ent;
+		      for (ent = htab->tls_get_addr->elf.plt.plist;
+			   ent != NULL;
+			   ent = ent->next)
+			if (ent->addend == 0)
+			  {
+			    if (ent->plt.refcount > 0)
+			      {
+				ent->plt.refcount -= 1;
+				expecting_tls_get_addr = 0;
+			      }
+			    break;
+			  }
+		    }
+
+		  if (expecting_tls_get_addr && htab->tls_get_addr_fd != NULL)
+		    {
+		      struct plt_entry *ent;
+		      for (ent = htab->tls_get_addr_fd->elf.plt.plist;
+			   ent != NULL;
+			   ent = ent->next)
+			if (ent->addend == 0)
+			  {
+			    if (ent->plt.refcount > 0)
+			      ent->plt.refcount -= 1;
+			    break;
+			  }
+		    }
+
+		  if (tls_clear == 0)
+		    continue;
+
+		  if ((tls_set & TLS_EXPLICIT) == 0)
+		    {
+		      struct got_entry *ent;
+
+		      /* Adjust got entry for this reloc.  */
+		      if (h != NULL)
+			ent = h->got.glist;
+		      else
+			ent = elf_local_got_ents (ibfd)[r_symndx];
+
+		      for (; ent != NULL; ent = ent->next)
+			if (ent->addend == rel->r_addend
+			    && ent->owner == ibfd
+			    && ent->tls_type == tls_type)
+			  break;
+		      if (ent == NULL)
+			abort ();
+
+		      if (tls_set == 0)
+			{
+			  /* We managed to get rid of a got entry.  */
+			  if (ent->got.refcount > 0)
+			    ent->got.refcount -= 1;
+			}
+		    }
+		  else
+		    {
+		      /* If we got rid of a DTPMOD/DTPREL reloc pair then
+			 we'll lose one or two dyn relocs.  */
+		      if (!dec_dynrel_count (rel->r_info, sec, info,
+					     NULL, h, sym_sec))
+			return FALSE;
+
+		      if (tls_set == (TLS_EXPLICIT | TLS_GD))
+			{
+			  if (!dec_dynrel_count ((rel + 1)->r_info, sec, info,
+						 NULL, h, sym_sec))
+			    return FALSE;
+			}
+		    }
+
+		  *tls_mask |= tls_set;
+		  *tls_mask &= ~tls_clear;
+		}
+
+	      if (elf_section_data (sec)->relocs != relstart)
+		free (relstart);
+	    }
+
+	if (locsyms != NULL
+	    && (elf_symtab_hdr (ibfd).contents != (unsigned char *) locsyms))
+	  {
+	    if (!info->keep_memory)
+	      free (locsyms);
+	    else
+	      elf_symtab_hdr (ibfd).contents = (unsigned char *) locsyms;
+	  }
+      }
+
+  if (toc_ref != NULL)
+    free (toc_ref);
+  return TRUE;
+}
+
+/* Called via elf_link_hash_traverse from ppc64_elf_edit_toc to adjust
+   the values of any global symbols in a toc section that has been
+   edited.  Globals in toc sections should be a rarity, so this function
+   sets a flag if any are found in toc sections other than the one just
+   edited, so that futher hash table traversals can be avoided.  */
+
+struct adjust_toc_info
+{
+  asection *toc;
+  unsigned long *skip;
+  bfd_boolean global_toc_syms;
+};
+
+enum toc_skip_enum { ref_from_discarded = 1, can_optimize = 2 };
+
+static bfd_boolean
+adjust_toc_syms (struct elf_link_hash_entry *h, void *inf)
+{
+  struct ppc_link_hash_entry *eh;
+  struct adjust_toc_info *toc_inf = (struct adjust_toc_info *) inf;
+  unsigned long i;
+
+  if (h->root.type != bfd_link_hash_defined
+      && h->root.type != bfd_link_hash_defweak)
+    return TRUE;
+
+  eh = (struct ppc_link_hash_entry *) h;
+  if (eh->adjust_done)
+    return TRUE;
+
+  if (eh->elf.root.u.def.section == toc_inf->toc)
+    {
+      if (eh->elf.root.u.def.value > toc_inf->toc->rawsize)
+	i = toc_inf->toc->rawsize >> 3;
+      else
+	i = eh->elf.root.u.def.value >> 3;
+
+      if ((toc_inf->skip[i] & (ref_from_discarded | can_optimize)) != 0)
+	{
+	  (*_bfd_error_handler)
+	    (_("%s defined on removed toc entry"), eh->elf.root.root.string);
+	  do
+	    ++i;
+	  while ((toc_inf->skip[i] & (ref_from_discarded | can_optimize)) != 0);
+	  eh->elf.root.u.def.value = (bfd_vma) i << 3;
+	}
+
+      eh->elf.root.u.def.value -= toc_inf->skip[i];
+      eh->adjust_done = 1;
+    }
+  else if (strcmp (eh->elf.root.u.def.section->name, ".toc") == 0)
+    toc_inf->global_toc_syms = TRUE;
+
+  return TRUE;
+}
+
+/* Return TRUE iff INSN is one we expect on a _LO variety toc/got reloc.  */
+
+static bfd_boolean
+ok_lo_toc_insn (unsigned int insn)
+{
+  return ((insn & (0x3f << 26)) == 14u << 26 /* addi */
+	  || (insn & (0x3f << 26)) == 32u << 26 /* lwz */
+	  || (insn & (0x3f << 26)) == 34u << 26 /* lbz */
+	  || (insn & (0x3f << 26)) == 36u << 26 /* stw */
+	  || (insn & (0x3f << 26)) == 38u << 26 /* stb */
+	  || (insn & (0x3f << 26)) == 40u << 26 /* lhz */
+	  || (insn & (0x3f << 26)) == 42u << 26 /* lha */
+	  || (insn & (0x3f << 26)) == 44u << 26 /* sth */
+	  || (insn & (0x3f << 26)) == 46u << 26 /* lmw */
+	  || (insn & (0x3f << 26)) == 47u << 26 /* stmw */
+	  || (insn & (0x3f << 26)) == 48u << 26 /* lfs */
+	  || (insn & (0x3f << 26)) == 50u << 26 /* lfd */
+	  || (insn & (0x3f << 26)) == 52u << 26 /* stfs */
+	  || (insn & (0x3f << 26)) == 54u << 26 /* stfd */
+	  || ((insn & (0x3f << 26)) == 58u << 26 /* lwa,ld,lmd */
+	      && (insn & 3) != 1)
+	  || ((insn & (0x3f << 26)) == 62u << 26 /* std, stmd */
+	      && ((insn & 3) == 0 || (insn & 3) == 3))
+	  || (insn & (0x3f << 26)) == 12u << 26 /* addic */);
+}
+
+/* Examine all relocs referencing .toc sections in order to remove
+   unused .toc entries.  */
+
+bfd_boolean
+ppc64_elf_edit_toc (struct bfd_link_info *info)
+{
+  bfd *ibfd;
+  struct adjust_toc_info toc_inf;
+  struct ppc_link_hash_table *htab = ppc_hash_table (info);
+
+  htab->do_toc_opt = 1;
+  toc_inf.global_toc_syms = TRUE;
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      asection *toc, *sec;
+      Elf_Internal_Shdr *symtab_hdr;
+      Elf_Internal_Sym *local_syms;
+      Elf_Internal_Rela *relstart, *rel, *toc_relocs;
+      unsigned long *skip, *drop;
+      unsigned char *used;
+      unsigned char *keep, last, some_unused;
+
+      if (!is_ppc64_elf (ibfd))
+	continue;
+
+      toc = bfd_get_section_by_name (ibfd, ".toc");
+      if (toc == NULL
+	  || toc->size == 0
+	  || toc->sec_info_type == ELF_INFO_TYPE_JUST_SYMS
+	  || elf_discarded_section (toc))
+	continue;
+
+      toc_relocs = NULL;
+      local_syms = NULL;
+      symtab_hdr = &elf_symtab_hdr (ibfd);
+
+      /* Look at sections dropped from the final link.  */
+      skip = NULL;
+      relstart = NULL;
+      for (sec = ibfd->sections; sec != NULL; sec = sec->next)
+	{
+	  if (sec->reloc_count == 0
+	      || !elf_discarded_section (sec)
+	      || get_opd_info (sec)
+	      || (sec->flags & SEC_ALLOC) == 0
+	      || (sec->flags & SEC_DEBUGGING) != 0)
+	    continue;
+
+	  relstart = _bfd_elf_link_read_relocs (ibfd, sec, NULL, NULL, FALSE);
+	  if (relstart == NULL)
+	    goto error_ret;
+
+	  /* Run through the relocs to see which toc entries might be
+	     unused.  */
+	  for (rel = relstart; rel < relstart + sec->reloc_count; ++rel)
+	    {
+	      enum elf_ppc64_reloc_type r_type;
+	      unsigned long r_symndx;
+	      asection *sym_sec;
+	      struct elf_link_hash_entry *h;
+	      Elf_Internal_Sym *sym;
+	      bfd_vma val;
+
+	      r_type = ELF64_R_TYPE (rel->r_info);
+	      switch (r_type)
+		{
+		default:
+		  continue;
+
+		case R_PPC64_TOC16:
+		case R_PPC64_TOC16_LO:
+		case R_PPC64_TOC16_HI:
+		case R_PPC64_TOC16_HA:
+		case R_PPC64_TOC16_DS:
+		case R_PPC64_TOC16_LO_DS:
+		  break;
+		}
+
+	      r_symndx = ELF64_R_SYM (rel->r_info);
+	      if (!get_sym_h (&h, &sym, &sym_sec, NULL, &local_syms,
+			      r_symndx, ibfd))
+		goto error_ret;
+
+	      if (sym_sec != toc)
+		continue;
+
+	      if (h != NULL)
+		val = h->root.u.def.value;
+	      else
+		val = sym->st_value;
+	      val += rel->r_addend;
+
+	      if (val >= toc->size)
+		continue;
+
+	      /* Anything in the toc ought to be aligned to 8 bytes.
+		 If not, don't mark as unused.  */
+	      if (val & 7)
+		continue;
+
+	      if (skip == NULL)
+		{
+		  skip = bfd_zmalloc (sizeof (*skip) * (toc->size + 15) / 8);
+		  if (skip == NULL)
+		    goto error_ret;
+		}
+
+	      skip[val >> 3] = ref_from_discarded;
+	    }
+
+	  if (elf_section_data (sec)->relocs != relstart)
+	    free (relstart);
+	}
+
+      /* For largetoc loads of address constants, we can convert
+	 .  addis rx,2,addr@got@ha
+	 .  ld ry,addr@got@l(rx)
+	 to
+	 .  addis rx,2,addr@toc@ha
+	 .  addi ry,rx,addr@toc@l
+	 when addr is within 2G of the toc pointer.  This then means
+	 that the word storing "addr" in the toc is no longer needed.  */
+	 
+      if (!ppc64_elf_tdata (ibfd)->has_small_toc_reloc
+	  && toc->output_section->rawsize < (bfd_vma) 1 << 31
+	  && toc->reloc_count != 0)
+	{
+	  /* Read toc relocs.  */
+	  toc_relocs = _bfd_elf_link_read_relocs (ibfd, toc, NULL, NULL,
+						  info->keep_memory);
+	  if (toc_relocs == NULL)
+	    goto error_ret;
+
+	  for (rel = toc_relocs; rel < toc_relocs + toc->reloc_count; ++rel)
+	    {
+	      enum elf_ppc64_reloc_type r_type;
+	      unsigned long r_symndx;
+	      asection *sym_sec;
+	      struct elf_link_hash_entry *h;
+	      Elf_Internal_Sym *sym;
+	      bfd_vma val, addr;
+
+	      r_type = ELF64_R_TYPE (rel->r_info);
+	      if (r_type != R_PPC64_ADDR64)
+		continue;
+
+	      r_symndx = ELF64_R_SYM (rel->r_info);
+	      if (!get_sym_h (&h, &sym, &sym_sec, NULL, &local_syms,
+			      r_symndx, ibfd))
+		goto error_ret;
+
+	      if (sym_sec == NULL
+		  || elf_discarded_section (sym_sec))
+		continue;
+
+	      if (!SYMBOL_CALLS_LOCAL (info, h))
+		continue;
+
+	      if (h != NULL)
+		{
+		  if (h->type == STT_GNU_IFUNC)
+		    continue;
+		  val = h->root.u.def.value;
+		}
+	      else
+		{
+		  if (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
+		    continue;
+		  val = sym->st_value;
+		}
+	      val += rel->r_addend;
+	      val += sym_sec->output_section->vma + sym_sec->output_offset;
+
+	      /* We don't yet know the exact toc pointer value, but we
+		 know it will be somewhere in the toc section.  Don't
+		 optimize if the difference from any possible toc
+		 pointer is outside [ff..f80008000, 7fff7fff].  */
+	      addr = toc->output_section->vma + TOC_BASE_OFF;
+	      if (val - addr + (bfd_vma) 0x80008000 >= (bfd_vma) 1 << 32)
+		continue;
+
+	      addr = toc->output_section->vma + toc->output_section->rawsize;
+	      if (val - addr + (bfd_vma) 0x80008000 >= (bfd_vma) 1 << 32)
+		continue;
+
+	      if (skip == NULL)
+		{
+		  skip = bfd_zmalloc (sizeof (*skip) * (toc->size + 15) / 8);
+		  if (skip == NULL)
+		    goto error_ret;
+		}
+
+	      skip[rel->r_offset >> 3]
+		|= can_optimize | ((rel - toc_relocs) << 2);
+	    }
+	}
+
+      if (skip == NULL)
+	continue;
+
+      used = bfd_zmalloc (sizeof (*used) * (toc->size + 7) / 8);
+      if (used == NULL)
+	{
+	error_ret:
+	  if (local_syms != NULL
+	      && symtab_hdr->contents != (unsigned char *) local_syms)
+	    free (local_syms);
+	  if (sec != NULL
+	      && relstart != NULL
+	      && elf_section_data (sec)->relocs != relstart)
+	    free (relstart);
+	  if (toc_relocs != NULL
+	      && elf_section_data (toc)->relocs != toc_relocs)
+	    free (toc_relocs);
+	  if (skip != NULL)
+	    free (skip);
+	  return FALSE;
+	}
+
+      /* Now check all kept sections that might reference the toc.
+	 Check the toc itself last.  */
+      for (sec = (ibfd->sections == toc && toc->next ? toc->next
+		  : ibfd->sections);
+	   sec != NULL;
+	   sec = (sec == toc ? NULL
+		  : sec->next == NULL ? toc
+		  : sec->next == toc && toc->next ? toc->next
+		  : sec->next))
+	{
+	  int repeat;
+
+	  if (sec->reloc_count == 0
+	      || elf_discarded_section (sec)
+	      || get_opd_info (sec)
+	      || (sec->flags & SEC_ALLOC) == 0
+	      || (sec->flags & SEC_DEBUGGING) != 0)
+	    continue;
+
+	  relstart = _bfd_elf_link_read_relocs (ibfd, sec, NULL, NULL,
+						info->keep_memory);
+	  if (relstart == NULL)
+	    goto error_ret;
+
+	  /* Mark toc entries referenced as used.  */
+	  repeat = 0;
+	  do
+	    for (rel = relstart; rel < relstart + sec->reloc_count; ++rel)
+	      {
+		enum elf_ppc64_reloc_type r_type;
+		unsigned long r_symndx;
+		asection *sym_sec;
+		struct elf_link_hash_entry *h;
+		Elf_Internal_Sym *sym;
+		bfd_vma val;
+		enum {no_check, check_lo, check_ha} insn_check;
+
+		r_type = ELF64_R_TYPE (rel->r_info);
+		switch (r_type)
+		  {
+		  default:
+		    insn_check = no_check;
+		    break;
+
+		  case R_PPC64_GOT_TLSLD16_HA:
+		  case R_PPC64_GOT_TLSGD16_HA:
+		  case R_PPC64_GOT_TPREL16_HA:
+		  case R_PPC64_GOT_DTPREL16_HA:
+		  case R_PPC64_GOT16_HA:
+		  case R_PPC64_TOC16_HA:
+		    insn_check = check_ha;
+		    break;
+
+		  case R_PPC64_GOT_TLSLD16_LO:
+		  case R_PPC64_GOT_TLSGD16_LO:
+		  case R_PPC64_GOT_TPREL16_LO_DS:
+		  case R_PPC64_GOT_DTPREL16_LO_DS:
+		  case R_PPC64_GOT16_LO:
+		  case R_PPC64_GOT16_LO_DS:
+		  case R_PPC64_TOC16_LO:
+		  case R_PPC64_TOC16_LO_DS:
+		    insn_check = check_lo;
+		    break;
+		  }
+
+		if (insn_check != no_check)
+		  {
+		    bfd_vma off = rel->r_offset & ~3;
+		    unsigned char buf[4];
+		    unsigned int insn;
+
+		    if (!bfd_get_section_contents (ibfd, sec, buf, off, 4))
+		      {
+			free (used);
+			goto error_ret;
+		      }
+		    insn = bfd_get_32 (ibfd, buf);
+		    if (insn_check == check_lo
+			? !ok_lo_toc_insn (insn)
+			: ((insn & ((0x3f << 26) | 0x1f << 16))
+			   != ((15u << 26) | (2 << 16)) /* addis rt,2,imm */))
+		      {
+			char str[12];
+
+			ppc64_elf_tdata (ibfd)->unexpected_toc_insn = 1;
+			sprintf (str, "%#08x", insn);
+			info->callbacks->einfo
+			  (_("%P: %H: toc optimization is not supported for"
+			     " %s instruction.\n"),
+			   ibfd, sec, rel->r_offset & ~3, str);
+		      }
+		  }
+
+		switch (r_type)
+		  {
+		  case R_PPC64_TOC16:
+		  case R_PPC64_TOC16_LO:
+		  case R_PPC64_TOC16_HI:
+		  case R_PPC64_TOC16_HA:
+		  case R_PPC64_TOC16_DS:
+		  case R_PPC64_TOC16_LO_DS:
+		    /* In case we're taking addresses of toc entries.  */
+		  case R_PPC64_ADDR64:
+		    break;
+
+		  default:
+		    continue;
+		  }
+
+		r_symndx = ELF64_R_SYM (rel->r_info);
+		if (!get_sym_h (&h, &sym, &sym_sec, NULL, &local_syms,
+				r_symndx, ibfd))
+		  {
+		    free (used);
+		    goto error_ret;
+		  }
+
+		if (sym_sec != toc)
+		  continue;
+
+		if (h != NULL)
+		  val = h->root.u.def.value;
+		else
+		  val = sym->st_value;
+		val += rel->r_addend;
+
+		if (val >= toc->size)
+		  continue;
+
+		if ((skip[val >> 3] & can_optimize) != 0)
+		  {
+		    bfd_vma off;
+		    unsigned char opc;
+
+		    switch (r_type)
+		      {
+		      case R_PPC64_TOC16_HA:
+			break;
+
+		      case R_PPC64_TOC16_LO_DS:
+			off = rel->r_offset + (bfd_big_endian (ibfd) ? -2 : 3);
+			if (!bfd_get_section_contents (ibfd, sec, &opc, off, 1))
+			  {
+			    free (used);
+			    goto error_ret;
+			  }
+			if ((opc & (0x3f << 2)) == (58u << 2))
+			  break;
+			/* Fall thru */
+
+		      default:
+			/* Wrong sort of reloc, or not a ld.  We may
+			   as well clear ref_from_discarded too.  */
+			skip[val >> 3] = 0;
+		      }
+		  }
+
+		/* For the toc section, we only mark as used if
+		   this entry itself isn't unused.  */
+		if (sec == toc
+		    && !used[val >> 3]
+		    && (used[rel->r_offset >> 3]
+			|| !(skip[rel->r_offset >> 3] & ref_from_discarded)))
+		  /* Do all the relocs again, to catch reference
+		     chains.  */
+		  repeat = 1;
+
+		used[val >> 3] = 1;
+	      }
+	  while (repeat);
+
+	  if (elf_section_data (sec)->relocs != relstart)
+	    free (relstart);
+	}
+
+      /* Merge the used and skip arrays.  Assume that TOC
+	 doublewords not appearing as either used or unused belong
+	 to to an entry more than one doubleword in size.  */
+      for (drop = skip, keep = used, last = 0, some_unused = 0;
+	   drop < skip + (toc->size + 7) / 8;
+	   ++drop, ++keep)
+	{
+	  if (*keep)
+	    {
+	      *drop &= ~ref_from_discarded;
+	      if ((*drop & can_optimize) != 0)
+		some_unused = 1;
+	      last = 0;
+	    }
+	  else if ((*drop & ref_from_discarded) != 0)
+	    {
+	      some_unused = 1;
+	      last = ref_from_discarded;
+	    }
+	  else
+	    *drop = last;
+	}
+
+      free (used);
+
+      if (some_unused)
+	{
+	  bfd_byte *contents, *src;
+	  unsigned long off;
+	  Elf_Internal_Sym *sym;
+	  bfd_boolean local_toc_syms = FALSE;
+
+	  /* Shuffle the toc contents, and at the same time convert the
+	     skip array from booleans into offsets.  */
+	  if (!bfd_malloc_and_get_section (ibfd, toc, &contents))
+	    goto error_ret;
+
+	  elf_section_data (toc)->this_hdr.contents = contents;
+
+	  for (src = contents, off = 0, drop = skip;
+	       src < contents + toc->size;
+	       src += 8, ++drop)
+	    {
+	      if ((*drop & (can_optimize | ref_from_discarded)) != 0)
+		off += 8;
+	      else if (off != 0)
+		{
+		  *drop = off;
+		  memcpy (src - off, src, 8);
+		}
+	    }
+	  *drop = off;
+	  toc->rawsize = toc->size;
+	  toc->size = src - contents - off;
+
+	  /* Adjust addends for relocs against the toc section sym,
+	     and optimize any accesses we can.  */
+	  for (sec = ibfd->sections; sec != NULL; sec = sec->next)
+	    {
+	      if (sec->reloc_count == 0
+		  || elf_discarded_section (sec))
+		continue;
+
+	      relstart = _bfd_elf_link_read_relocs (ibfd, sec, NULL, NULL,
+						    info->keep_memory);
+	      if (relstart == NULL)
+		goto error_ret;
+
+	      for (rel = relstart; rel < relstart + sec->reloc_count; ++rel)
+		{
+		  enum elf_ppc64_reloc_type r_type;
+		  unsigned long r_symndx;
+		  asection *sym_sec;
+		  struct elf_link_hash_entry *h;
+		  bfd_vma val;
+
+		  r_type = ELF64_R_TYPE (rel->r_info);
+		  switch (r_type)
+		    {
+		    default:
+		      continue;
+
+		    case R_PPC64_TOC16:
+		    case R_PPC64_TOC16_LO:
+		    case R_PPC64_TOC16_HI:
+		    case R_PPC64_TOC16_HA:
+		    case R_PPC64_TOC16_DS:
+		    case R_PPC64_TOC16_LO_DS:
+		    case R_PPC64_ADDR64:
+		      break;
+		    }
+
+		  r_symndx = ELF64_R_SYM (rel->r_info);
+		  if (!get_sym_h (&h, &sym, &sym_sec, NULL, &local_syms,
+				  r_symndx, ibfd))
+		    goto error_ret;
+
+		  if (sym_sec != toc)
+		    continue;
+
+		  if (h != NULL)
+		    val = h->root.u.def.value;
+		  else
+		    {
+		      val = sym->st_value;
+		      if (val != 0)
+			local_toc_syms = TRUE;
+		    }
+
+		  val += rel->r_addend;
+
+		  if (val > toc->rawsize)
+		    val = toc->rawsize;
+		  else if ((skip[val >> 3] & ref_from_discarded) != 0)
+		    continue;
+		  else if ((skip[val >> 3] & can_optimize) != 0)
+		    {
+		      Elf_Internal_Rela *tocrel
+			= toc_relocs + (skip[val >> 3] >> 2);
+		      unsigned long tsym = ELF64_R_SYM (tocrel->r_info);
+
+		      switch (r_type)
+			{
+			case R_PPC64_TOC16_HA:
+			  rel->r_info = ELF64_R_INFO (tsym, R_PPC64_TOC16_HA);
+			  break;
+
+			case R_PPC64_TOC16_LO_DS:
+			  rel->r_info = ELF64_R_INFO (tsym, R_PPC64_LO_DS_OPT);
+			  break;
+
+			default:
+			  if (!ppc64_elf_howto_table[R_PPC64_ADDR32])
+			    ppc_howto_init ();
+			  info->callbacks->einfo
+			    (_("%P: %H: %s relocation references "
+			       "optimized away TOC entry\n"),
+			     ibfd, sec, rel->r_offset,
+			     ppc64_elf_howto_table[r_type]->name);
+			  bfd_set_error (bfd_error_bad_value);
+			  goto error_ret;
+			}
+		      rel->r_addend = tocrel->r_addend;
+		      elf_section_data (sec)->relocs = relstart;
+		      continue;
+		    }
+
+		  if (h != NULL || sym->st_value != 0)
+		    continue;
+
+		  rel->r_addend -= skip[val >> 3];
+		  elf_section_data (sec)->relocs = relstart;
+		}
+
+	      if (elf_section_data (sec)->relocs != relstart)
+		free (relstart);
+	    }
+
+	  /* We shouldn't have local or global symbols defined in the TOC,
+	     but handle them anyway.  */
+	  if (local_syms != NULL)
+	    for (sym = local_syms;
+		 sym < local_syms + symtab_hdr->sh_info;
+		 ++sym)
+	      if (sym->st_value != 0
+		  && bfd_section_from_elf_index (ibfd, sym->st_shndx) == toc)
+		{
+		  unsigned long i;
+
+		  if (sym->st_value > toc->rawsize)
+		    i = toc->rawsize >> 3;
+		  else
+		    i = sym->st_value >> 3;
+
+		  if ((skip[i] & (ref_from_discarded | can_optimize)) != 0)
+		    {
+		      if (local_toc_syms)
+			(*_bfd_error_handler)
+			  (_("%s defined on removed toc entry"),
+			   bfd_elf_sym_name (ibfd, symtab_hdr, sym, NULL));
+		      do
+			++i;
+		      while ((skip[i] & (ref_from_discarded | can_optimize)));
+		      sym->st_value = (bfd_vma) i << 3;
+		    }
+
+		  sym->st_value -= skip[i];
+		  symtab_hdr->contents = (unsigned char *) local_syms;
+		}
+
+	  /* Adjust any global syms defined in this toc input section.  */
+	  if (toc_inf.global_toc_syms)
+	    {
+	      toc_inf.toc = toc;
+	      toc_inf.skip = skip;
+	      toc_inf.global_toc_syms = FALSE;
+	      elf_link_hash_traverse (elf_hash_table (info), adjust_toc_syms,
+				      &toc_inf);
+	    }
+
+	  if (toc->reloc_count != 0)
+	    {
+	      Elf_Internal_Shdr *rel_hdr;
+	      Elf_Internal_Rela *wrel;
+	      bfd_size_type sz;
+
+	      /* Remove unused toc relocs, and adjust those we keep.  */
+	      if (toc_relocs == NULL)
+		toc_relocs = _bfd_elf_link_read_relocs (ibfd, toc, NULL, NULL,
+							info->keep_memory);
+	      if (toc_relocs == NULL)
+		goto error_ret;
+
+	      wrel = toc_relocs;
+	      for (rel = toc_relocs; rel < toc_relocs + toc->reloc_count; ++rel)
+		if ((skip[rel->r_offset >> 3]
+		     & (ref_from_discarded | can_optimize)) == 0)
+		  {
+		    wrel->r_offset = rel->r_offset - skip[rel->r_offset >> 3];
+		    wrel->r_info = rel->r_info;
+		    wrel->r_addend = rel->r_addend;
+		    ++wrel;
+		  }
+		else if (!dec_dynrel_count (rel->r_info, toc, info,
+					    &local_syms, NULL, NULL))
+		  goto error_ret;
+
+	      elf_section_data (toc)->relocs = toc_relocs;
+	      toc->reloc_count = wrel - toc_relocs;
+	      rel_hdr = _bfd_elf_single_rel_hdr (toc);
+	      sz = rel_hdr->sh_entsize;
+	      rel_hdr->sh_size = toc->reloc_count * sz;
+	    }
+	}
+      else if (toc_relocs != NULL
+	       && elf_section_data (toc)->relocs != toc_relocs)
+	free (toc_relocs);
+
+      if (local_syms != NULL
+	  && symtab_hdr->contents != (unsigned char *) local_syms)
+	{
+	  if (!info->keep_memory)
+	    free (local_syms);
+	  else
+	    symtab_hdr->contents = (unsigned char *) local_syms;
+	}
+      free (skip);
+    }
+
+  return TRUE;
+}
+
+/* Return true iff input section I references the TOC using
+   instructions limited to +/-32k offsets.  */
+
+bfd_boolean
+ppc64_elf_has_small_toc_reloc (asection *i)
+{
+  return (is_ppc64_elf (i->owner)
+	  && ppc64_elf_tdata (i->owner)->has_small_toc_reloc);
+}
+
+/* Allocate space for one GOT entry.  */
+
+static void
+allocate_got (struct elf_link_hash_entry *h,
+	      struct bfd_link_info *info,
+	      struct got_entry *gent)
+{
+  struct ppc_link_hash_table *htab = ppc_hash_table (info);
+  bfd_boolean dyn;
+  struct ppc_link_hash_entry *eh = (struct ppc_link_hash_entry *) h;
+  int entsize = (gent->tls_type & eh->tls_mask & (TLS_GD | TLS_LD)
+		 ? 16 : 8);
+  int rentsize = (gent->tls_type & eh->tls_mask & TLS_GD
+		  ? 2 : 1) * sizeof (Elf64_External_Rela);
+  asection *got = ppc64_elf_tdata (gent->owner)->got;
+
+  gent->got.offset = got->size;
+  got->size += entsize;
+
+  dyn = htab->elf.dynamic_sections_created;
+  if ((info->shared
+       || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h))
+	    && (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		|| h->root.type != bfd_link_hash_undefweak))
+    {
+      asection *relgot = ppc64_elf_tdata (gent->owner)->relgot;
+      relgot->size += rentsize;
+    }
+  else if (h->type == STT_GNU_IFUNC)
+    {
+      asection *relgot = htab->reliplt;
+      relgot->size += rentsize;
+      htab->got_reli_size += rentsize;
+    }
+}
+
+/* This function merges got entries in the same toc group.  */
+
+static void
+merge_got_entries (struct got_entry **pent)
+{
+  struct got_entry *ent, *ent2;
+
+  for (ent = *pent; ent != NULL; ent = ent->next)
+    if (!ent->is_indirect)
+      for (ent2 = ent->next; ent2 != NULL; ent2 = ent2->next)
+	if (!ent2->is_indirect
+	    && ent2->addend == ent->addend
+	    && ent2->tls_type == ent->tls_type
+	    && elf_gp (ent2->owner) == elf_gp (ent->owner))
+	  {
+	    ent2->is_indirect = TRUE;
+	    ent2->got.ent = ent;
+	  }
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   dynamic relocs.  */
+
+static bfd_boolean
+allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+{
+  struct bfd_link_info *info;
+  struct ppc_link_hash_table *htab;
+  asection *s;
+  struct ppc_link_hash_entry *eh;
+  struct elf_dyn_relocs *p;
+  struct got_entry **pgent, *gent;
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  info = (struct bfd_link_info *) inf;
+  htab = ppc_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if ((htab->elf.dynamic_sections_created
+       && h->dynindx != -1
+       && WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info->shared, h))
+      || h->type == STT_GNU_IFUNC)
+    {
+      struct plt_entry *pent;
+      bfd_boolean doneone = FALSE;
+      for (pent = h->plt.plist; pent != NULL; pent = pent->next)
+	if (pent->plt.refcount > 0)
+	  {
+	    if (!htab->elf.dynamic_sections_created
+		|| h->dynindx == -1)
+	      {
+		s = htab->iplt;
+		pent->plt.offset = s->size;
+		s->size += PLT_ENTRY_SIZE;
+		s = htab->reliplt;
+	      }
+	    else
+	      {
+		/* If this is the first .plt entry, make room for the special
+		   first entry.  */
+		s = htab->plt;
+		if (s->size == 0)
+		  s->size += PLT_INITIAL_ENTRY_SIZE;
+
+		pent->plt.offset = s->size;
+
+		/* Make room for this entry.  */
+		s->size += PLT_ENTRY_SIZE;
+
+		/* Make room for the .glink code.  */
+		s = htab->glink;
+		if (s->size == 0)
+		  s->size += GLINK_CALL_STUB_SIZE;
+		/* We need bigger stubs past index 32767.  */
+		if (s->size >= GLINK_CALL_STUB_SIZE + 32768*2*4)
+		  s->size += 4;
+		s->size += 2*4;
+
+		/* We also need to make an entry in the .rela.plt section.  */
+		s = htab->relplt;
+	      }
+	    s->size += sizeof (Elf64_External_Rela);
+	    doneone = TRUE;
+	  }
+	else
+	  pent->plt.offset = (bfd_vma) -1;
+      if (!doneone)
+	{
+	  h->plt.plist = NULL;
+	  h->needs_plt = 0;
+	}
+    }
+  else
+    {
+      h->plt.plist = NULL;
+      h->needs_plt = 0;
+    }
+
+  eh = (struct ppc_link_hash_entry *) h;
+  /* Run through the TLS GD got entries first if we're changing them
+     to TPREL.  */
+  if ((eh->tls_mask & TLS_TPRELGD) != 0)
+    for (gent = h->got.glist; gent != NULL; gent = gent->next)
+      if (gent->got.refcount > 0
+	  && (gent->tls_type & TLS_GD) != 0)
+	{
+	  /* This was a GD entry that has been converted to TPREL.  If
+	     there happens to be a TPREL entry we can use that one.  */
+	  struct got_entry *ent;
+	  for (ent = h->got.glist; ent != NULL; ent = ent->next)
+	    if (ent->got.refcount > 0
+		&& (ent->tls_type & TLS_TPREL) != 0
+		&& ent->addend == gent->addend
+		&& ent->owner == gent->owner)
+	      {
+		gent->got.refcount = 0;
+		break;
+	      }
+
+	  /* If not, then we'll be using our own TPREL entry.  */
+	  if (gent->got.refcount != 0)
+	    gent->tls_type = TLS_TLS | TLS_TPREL;
+	}
+
+  /* Remove any list entry that won't generate a word in the GOT before
+     we call merge_got_entries.  Otherwise we risk merging to empty
+     entries.  */
+  pgent = &h->got.glist;
+  while ((gent = *pgent) != NULL)
+    if (gent->got.refcount > 0)
+      {
+	if ((gent->tls_type & TLS_LD) != 0
+	    && !h->def_dynamic)
+	  {
+	    ppc64_tlsld_got (gent->owner)->got.refcount += 1;
+	    *pgent = gent->next;
+	  }
+	else
+	  pgent = &gent->next;
+      }
+    else
+      *pgent = gent->next;
+
+  if (!htab->do_multi_toc)
+    merge_got_entries (&h->got.glist);
+
+  for (gent = h->got.glist; gent != NULL; gent = gent->next)
+    if (!gent->is_indirect)
+      {
+	/* Make sure this symbol is output as a dynamic symbol.
+	   Undefined weak syms won't yet be marked as dynamic,
+	   nor will all TLS symbols.  */
+	if (h->dynindx == -1
+	    && !h->forced_local
+	    && h->type != STT_GNU_IFUNC
+	    && htab->elf.dynamic_sections_created)
+	  {
+	    if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	      return FALSE;
+	  }
+
+	if (!is_ppc64_elf (gent->owner))
+	  abort ();
+
+	allocate_got (h, info, gent);
+      }
+
+  if (eh->dyn_relocs == NULL
+      || (!htab->elf.dynamic_sections_created
+	  && h->type != STT_GNU_IFUNC))
+    return TRUE;
+
+  /* In the shared -Bsymbolic case, discard space allocated for
+     dynamic pc-relative relocs against symbols which turn out to be
+     defined in regular objects.  For the normal shared case, discard
+     space for relocs that have become local due to symbol visibility
+     changes.  */
+
+  if (info->shared)
+    {
+      /* Relocs that use pc_count are those that appear on a call insn,
+	 or certain REL relocs (see must_be_dyn_reloc) that can be
+	 generated via assembly.  We want calls to protected symbols to
+	 resolve directly to the function rather than going via the plt.
+	 If people want function pointer comparisons to work as expected
+	 then they should avoid writing weird assembly.  */
+      if (SYMBOL_CALLS_LOCAL (info, h))
+	{
+	  struct elf_dyn_relocs **pp;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      p->count -= p->pc_count;
+	      p->pc_count = 0;
+	      if (p->count == 0)
+		*pp = p->next;
+	      else
+		pp = &p->next;
+	    }
+	}
+
+      /* Also discard relocs on undefined weak syms with non-default
+	 visibility.  */
+      if (eh->dyn_relocs != NULL
+	  && h->root.type == bfd_link_hash_undefweak)
+	{
+	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	    eh->dyn_relocs = NULL;
+
+	  /* Make sure this symbol is output as a dynamic symbol.
+	     Undefined weak syms won't yet be marked as dynamic.  */
+	  else if (h->dynindx == -1
+		   && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+	}
+    }
+  else if (h->type == STT_GNU_IFUNC)
+    {
+      if (!h->non_got_ref)
+	eh->dyn_relocs = NULL;
+    }
+  else if (ELIMINATE_COPY_RELOCS)
+    {
+      /* For the non-shared case, discard space for relocs against
+	 symbols which turn out to need copy relocs or are not
+	 dynamic.  */
+
+      if (!h->non_got_ref
+	  && !h->def_regular)
+	{
+	  /* Make sure this symbol is output as a dynamic symbol.
+	     Undefined weak syms won't yet be marked as dynamic.  */
+	  if (h->dynindx == -1
+	      && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+
+	  /* If that succeeded, we know we'll be keeping all the
+	     relocs.  */
+	  if (h->dynindx != -1)
+	    goto keep;
+	}
+
+      eh->dyn_relocs = NULL;
+
+    keep: ;
+    }
+
+  /* Finally, allocate space.  */
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *sreloc = elf_section_data (p->sec)->sreloc;
+      if (!htab->elf.dynamic_sections_created)
+	sreloc = htab->reliplt;
+      sreloc->size += p->count * sizeof (Elf64_External_Rela);
+    }
+
+  return TRUE;
+}
+
+/* Find any dynamic relocs that apply to read-only sections.  */
+
+static bfd_boolean
+readonly_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+{
+  struct ppc_link_hash_entry *eh;
+  struct elf_dyn_relocs *p;
+
+  eh = (struct ppc_link_hash_entry *) h;
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *s = p->sec->output_section;
+
+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
+	{
+	  struct bfd_link_info *info = inf;
+
+	  info->flags |= DF_TEXTREL;
+
+	  /* Not an error, just cut short the traversal.  */
+	  return FALSE;
+	}
+    }
+  return TRUE;
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+ppc64_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+				 struct bfd_link_info *info)
+{
+  struct ppc_link_hash_table *htab;
+  bfd *dynobj;
+  asection *s;
+  bfd_boolean relocs;
+  bfd *ibfd;
+  struct got_entry *first_tlsld;
+
+  htab = ppc_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = htab->elf.dynobj;
+  if (dynobj == NULL)
+    abort ();
+
+  if (htab->elf.dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  if (s == NULL)
+	    abort ();
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+
+  /* Set up .got offsets for local syms, and space for local dynamic
+     relocs.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      struct got_entry **lgot_ents;
+      struct got_entry **end_lgot_ents;
+      struct plt_entry **local_plt;
+      struct plt_entry **end_local_plt;
+      unsigned char *lgot_masks;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *srel;
+
+      if (!is_ppc64_elf (ibfd))
+	continue;
+
+      for (s = ibfd->sections; s != NULL; s = s->next)
+	{
+	  struct elf_dyn_relocs *p;
+
+	  for (p = elf_section_data (s)->local_dynrel; p != NULL; p = p->next)
+	    {
+	      if (!bfd_is_abs_section (p->sec)
+		  && bfd_is_abs_section (p->sec->output_section))
+		{
+		  /* Input section has been discarded, either because
+		     it is a copy of a linkonce section or due to
+		     linker script /DISCARD/, so we'll be discarding
+		     the relocs too.  */
+		}
+	      else if (p->count != 0)
+		{
+		  srel = elf_section_data (p->sec)->sreloc;
+		  if (!htab->elf.dynamic_sections_created)
+		    srel = htab->reliplt;
+		  srel->size += p->count * sizeof (Elf64_External_Rela);
+		  if ((p->sec->output_section->flags & SEC_READONLY) != 0)
+		    info->flags |= DF_TEXTREL;
+		}
+	    }
+	}
+
+      lgot_ents = elf_local_got_ents (ibfd);
+      if (!lgot_ents)
+	continue;
+
+      symtab_hdr = &elf_symtab_hdr (ibfd);
+      locsymcount = symtab_hdr->sh_info;
+      end_lgot_ents = lgot_ents + locsymcount;
+      local_plt = (struct plt_entry **) end_lgot_ents;
+      end_local_plt = local_plt + locsymcount;
+      lgot_masks = (unsigned char *) end_local_plt;
+      s = ppc64_elf_tdata (ibfd)->got;
+      srel = ppc64_elf_tdata (ibfd)->relgot;
+      for (; lgot_ents < end_lgot_ents; ++lgot_ents, ++lgot_masks)
+	{
+	  struct got_entry **pent, *ent;
+
+	  pent = lgot_ents;
+	  while ((ent = *pent) != NULL)
+	    if (ent->got.refcount > 0)
+	      {
+		if ((ent->tls_type & *lgot_masks & TLS_LD) != 0)
+		  {
+		    ppc64_tlsld_got (ibfd)->got.refcount += 1;
+		    *pent = ent->next;
+		  }
+		else
+		  {
+		    unsigned int num = 1;
+		    ent->got.offset = s->size;
+		    if ((ent->tls_type & *lgot_masks & TLS_GD) != 0)
+		      num = 2;
+		    s->size += num * 8;
+		    if (info->shared)
+		      srel->size += num * sizeof (Elf64_External_Rela);
+		    else if ((*lgot_masks & PLT_IFUNC) != 0)
+		      {
+			htab->reliplt->size
+			  += num * sizeof (Elf64_External_Rela);
+			htab->got_reli_size
+			  += num * sizeof (Elf64_External_Rela);
+		      }
+		    pent = &ent->next;
+		  }
+	      }
+	    else
+	      *pent = ent->next;
+	}
+
+      /* Allocate space for calls to local STT_GNU_IFUNC syms in .iplt.  */
+      for (; local_plt < end_local_plt; ++local_plt)
+	{
+	  struct plt_entry *ent;
+
+	  for (ent = *local_plt; ent != NULL; ent = ent->next)
+	    if (ent->plt.refcount > 0)
+	      {
+		s = htab->iplt;
+		ent->plt.offset = s->size;
+		s->size += PLT_ENTRY_SIZE;
+
+		htab->reliplt->size += sizeof (Elf64_External_Rela);
+	      }
+	    else
+	      ent->plt.offset = (bfd_vma) -1;
+	}
+    }
+
+  /* Allocate global sym .plt and .got entries, and space for global
+     sym dynamic relocs.  */
+  elf_link_hash_traverse (&htab->elf, allocate_dynrelocs, info);
+
+  first_tlsld = NULL;
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      struct got_entry *ent;
+
+      if (!is_ppc64_elf (ibfd))
+	continue;
+
+      ent = ppc64_tlsld_got (ibfd);
+      if (ent->got.refcount > 0)
+	{
+	  if (!htab->do_multi_toc && first_tlsld != NULL)
+	    {
+	      ent->is_indirect = TRUE;
+	      ent->got.ent = first_tlsld;
+	    }
+	  else
+	    {
+	      if (first_tlsld == NULL)
+		first_tlsld = ent;
+	      s = ppc64_elf_tdata (ibfd)->got;
+	      ent->got.offset = s->size;
+	      ent->owner = ibfd;
+	      s->size += 16;
+	      if (info->shared)
+		{
+		  asection *srel = ppc64_elf_tdata (ibfd)->relgot;
+		  srel->size += sizeof (Elf64_External_Rela);
+		}
+	    }
+	}
+      else
+	ent->got.offset = (bfd_vma) -1;
+    }
+
+  /* We now have determined the sizes of the various dynamic sections.
+     Allocate memory for them.  */
+  relocs = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      if (s == htab->brlt || s == htab->relbrlt)
+	/* These haven't been allocated yet;  don't strip.  */
+	continue;
+      else if (s == htab->got
+	       || s == htab->plt
+	       || s == htab->iplt
+	       || s == htab->glink
+	       || s == htab->dynbss)
+	{
+	  /* Strip this section if we don't need it; see the
+	     comment below.  */
+	}
+      else if (s == htab->glink_eh_frame)
+	{
+	  if (!bfd_is_abs_section (s->output_section))
+	    /* Not sized yet.  */
+	    continue;
+	}
+      else if (CONST_STRNEQ (s->name, ".rela"))
+	{
+	  if (s->size != 0)
+	    {
+	      if (s != htab->relplt)
+		relocs = TRUE;
+
+	      /* We use the reloc_count field as a counter if we need
+		 to copy relocs into the output file.  */
+	      s->reloc_count = 0;
+	    }
+	}
+      else
+	{
+	  /* It's not one of our sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (s->size == 0)
+	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is mostly to handle .rela.bss and
+	     .rela.plt.  We must create both sections in
+	     create_dynamic_sections, because they must be created
+	     before the linker maps input sections to output
+	     sections.  The linker does that before
+	     adjust_dynamic_symbol is called, and it is that
+	     function which decides whether anything needs to go
+	     into these sections.  */
+	  s->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents.  We use bfd_zalloc
+	 here in case unused entries are not reclaimed before the
+	 section's contents are written out.  This should not happen,
+	 but this way if it does we get a R_PPC64_NONE reloc in .rela
+	 sections instead of garbage.
+	 We also rely on the section contents being zero when writing
+	 the GOT.  */
+      s->contents = bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      if (!is_ppc64_elf (ibfd))
+	continue;
+
+      s = ppc64_elf_tdata (ibfd)->got;
+      if (s != NULL && s != htab->got)
+	{
+	  if (s->size == 0)
+	    s->flags |= SEC_EXCLUDE;
+	  else
+	    {
+	      s->contents = bfd_zalloc (ibfd, s->size);
+	      if (s->contents == NULL)
+		return FALSE;
+	    }
+	}
+      s = ppc64_elf_tdata (ibfd)->relgot;
+      if (s != NULL)
+	{
+	  if (s->size == 0)
+	    s->flags |= SEC_EXCLUDE;
+	  else
+	    {
+	      s->contents = bfd_zalloc (ibfd, s->size);
+	      if (s->contents == NULL)
+		return FALSE;
+	      relocs = TRUE;
+	      s->reloc_count = 0;
+	    }
+	}
+    }
+
+  if (htab->elf.dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in ppc64_elf_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (info->executable)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (htab->plt != NULL && htab->plt->size != 0)
+	{
+	  if (!add_dynamic_entry (DT_PLTGOT, 0)
+	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+	      || !add_dynamic_entry (DT_JMPREL, 0)
+	      || !add_dynamic_entry (DT_PPC64_GLINK, 0))
+	    return FALSE;
+	}
+
+      if (NO_OPD_RELOCS)
+	{
+	  if (!add_dynamic_entry (DT_PPC64_OPD, 0)
+	      || !add_dynamic_entry (DT_PPC64_OPDSZ, 0))
+	    return FALSE;
+	}
+
+      if (!htab->no_tls_get_addr_opt
+	  && htab->tls_get_addr_fd != NULL
+	  && htab->tls_get_addr_fd->elf.plt.plist != NULL
+	  && !add_dynamic_entry (DT_PPC64_TLSOPT, 0))
+	return FALSE;
+
+      if (relocs)
+	{
+	  if (!add_dynamic_entry (DT_RELA, 0)
+	      || !add_dynamic_entry (DT_RELASZ, 0)
+	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf64_External_Rela)))
+	    return FALSE;
+
+	  /* If any dynamic relocs apply to a read-only section,
+	     then we need a DT_TEXTREL entry.  */
+	  if ((info->flags & DF_TEXTREL) == 0)
+	    elf_link_hash_traverse (&htab->elf, readonly_dynrelocs, info);
+
+	  if ((info->flags & DF_TEXTREL) != 0)
+	    {
+	      if (!add_dynamic_entry (DT_TEXTREL, 0))
+		return FALSE;
+	    }
+	}
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+/* Determine the type of stub needed, if any, for a call.  */
+
+static inline enum ppc_stub_type
+ppc_type_of_stub (asection *input_sec,
+		  const Elf_Internal_Rela *rel,
+		  struct ppc_link_hash_entry **hash,
+		  struct plt_entry **plt_ent,
+		  bfd_vma destination)
+{
+  struct ppc_link_hash_entry *h = *hash;
+  bfd_vma location;
+  bfd_vma branch_offset;
+  bfd_vma max_branch_offset;
+  enum elf_ppc64_reloc_type r_type;
+
+  if (h != NULL)
+    {
+      struct plt_entry *ent;
+      struct ppc_link_hash_entry *fdh = h;
+      if (h->oh != NULL
+	  && h->oh->is_func_descriptor)
+	{
+	  fdh = ppc_follow_link (h->oh);
+	  *hash = fdh;
+	}
+
+      for (ent = fdh->elf.plt.plist; ent != NULL; ent = ent->next)
+	if (ent->addend == rel->r_addend
+	    && ent->plt.offset != (bfd_vma) -1)
+	  {
+	    *plt_ent = ent;
+	    return ppc_stub_plt_call;
+	  }
+
+      /* Here, we know we don't have a plt entry.  If we don't have a
+	 either a defined function descriptor or a defined entry symbol
+	 in a regular object file, then it is pointless trying to make
+	 any other type of stub.  */
+      if (!is_static_defined (&fdh->elf)
+	  && !is_static_defined (&h->elf))
+	return ppc_stub_none;
+    }
+  else if (elf_local_got_ents (input_sec->owner) != NULL)
+    {
+      Elf_Internal_Shdr *symtab_hdr = &elf_symtab_hdr (input_sec->owner);
+      struct plt_entry **local_plt = (struct plt_entry **)
+	elf_local_got_ents (input_sec->owner) + symtab_hdr->sh_info;
+      unsigned long r_symndx = ELF64_R_SYM (rel->r_info);
+
+      if (local_plt[r_symndx] != NULL)
+	{
+	  struct plt_entry *ent;
+
+	  for (ent = local_plt[r_symndx]; ent != NULL; ent = ent->next)
+	    if (ent->addend == rel->r_addend
+		&& ent->plt.offset != (bfd_vma) -1)
+	      {
+		*plt_ent = ent;
+		return ppc_stub_plt_call;
+	      }
+	}
+    }
+
+  /* Determine where the call point is.  */
+  location = (input_sec->output_offset
+	      + input_sec->output_section->vma
+	      + rel->r_offset);
+
+  branch_offset = destination - location;
+  r_type = ELF64_R_TYPE (rel->r_info);
+
+  /* Determine if a long branch stub is needed.  */
+  max_branch_offset = 1 << 25;
+  if (r_type != R_PPC64_REL24)
+    max_branch_offset = 1 << 15;
+
+  if (branch_offset + max_branch_offset >= 2 * max_branch_offset)
+    /* We need a stub.  Figure out whether a long_branch or plt_branch
+       is needed later.  */
+    return ppc_stub_long_branch;
+
+  return ppc_stub_none;
+}
+
+/* Build a .plt call stub.  */
+
+static inline bfd_byte *
+build_plt_stub (bfd *obfd, bfd_byte *p, int offset, Elf_Internal_Rela *r,
+		bfd_boolean plt_static_chain)
+{
+#define PPC_LO(v) ((v) & 0xffff)
+#define PPC_HI(v) (((v) >> 16) & 0xffff)
+#define PPC_HA(v) PPC_HI ((v) + 0x8000)
+
+  if (PPC_HA (offset) != 0)
+    {
+      if (r != NULL)
+	{
+	  r[0].r_offset += 4;
+	  r[0].r_info = ELF64_R_INFO (0, R_PPC64_TOC16_HA);
+	  r[1].r_offset = r[0].r_offset + 4;
+	  r[1].r_info = ELF64_R_INFO (0, R_PPC64_TOC16_LO_DS);
+	  r[1].r_addend = r[0].r_addend;
+	  if (PPC_HA (offset + 8 + 8 * plt_static_chain) != PPC_HA (offset))
+	    {
+	      r[2].r_offset = r[1].r_offset + 4;
+	      r[2].r_info = ELF64_R_INFO (0, R_PPC64_TOC16_LO);
+	      r[2].r_addend = r[0].r_addend;
+	    }
+	  else
+	    {
+	      r[2].r_offset = r[1].r_offset + 8;
+	      r[2].r_info = ELF64_R_INFO (0, R_PPC64_TOC16_LO_DS);
+	      r[2].r_addend = r[0].r_addend + 8;
+	      if (plt_static_chain)
+		{
+		  r[3].r_offset = r[2].r_offset + 4;
+		  r[3].r_info = ELF64_R_INFO (0, R_PPC64_TOC16_LO_DS);
+		  r[3].r_addend = r[0].r_addend + 16;
+		}
+	    }
+	}
+      bfd_put_32 (obfd, STD_R2_40R1, p),			p += 4;
+      bfd_put_32 (obfd, ADDIS_R12_R2 | PPC_HA (offset), p),	p += 4;
+      bfd_put_32 (obfd, LD_R11_0R12 | PPC_LO (offset), p),	p += 4;
+      if (PPC_HA (offset + 8 + 8 * plt_static_chain) != PPC_HA (offset))
+	{
+	  bfd_put_32 (obfd, ADDI_R12_R12 | PPC_LO (offset), p),	p += 4;
+	  offset = 0;
+	}
+      bfd_put_32 (obfd, MTCTR_R11, p),				p += 4;
+      bfd_put_32 (obfd, LD_R2_0R12 | PPC_LO (offset + 8), p),	p += 4;
+      if (plt_static_chain)
+	bfd_put_32 (obfd, LD_R11_0R12 | PPC_LO (offset + 16), p), p += 4;
+      bfd_put_32 (obfd, BCTR, p),				p += 4;
+    }
+  else
+    {
+      if (r != NULL)
+	{
+	  r[0].r_offset += 4;
+	  r[0].r_info = ELF64_R_INFO (0, R_PPC64_TOC16_DS);
+	  if (PPC_HA (offset + 8 + 8 * plt_static_chain) != PPC_HA (offset))
+	    {
+	      r[1].r_offset = r[0].r_offset + 4;
+	      r[1].r_info = ELF64_R_INFO (0, R_PPC64_TOC16);
+	      r[1].r_addend = r[0].r_addend;
+	    }
+	  else
+	    {
+	      r[1].r_offset = r[0].r_offset + 8;
+	      r[1].r_info = ELF64_R_INFO (0, R_PPC64_TOC16_DS);
+	      r[1].r_addend = r[0].r_addend + 8 + 8 * plt_static_chain;
+	      if (plt_static_chain)
+		{
+		  r[2].r_offset = r[1].r_offset + 4;
+		  r[2].r_info = ELF64_R_INFO (0, R_PPC64_TOC16_DS);
+		  r[2].r_addend = r[0].r_addend + 8;
+		}
+	    }
+	}
+      bfd_put_32 (obfd, STD_R2_40R1, p),			p += 4;
+      bfd_put_32 (obfd, LD_R11_0R2 | PPC_LO (offset), p),	p += 4;
+      if (PPC_HA (offset + 8 + 8 * plt_static_chain) != PPC_HA (offset))
+	{
+	  bfd_put_32 (obfd, ADDI_R2_R2 | PPC_LO (offset), p),	p += 4;
+	  offset = 0;
+	}
+      bfd_put_32 (obfd, MTCTR_R11, p),				p += 4;
+      if (plt_static_chain)
+	bfd_put_32 (obfd, LD_R11_0R2 | PPC_LO (offset + 16), p), p += 4;
+      bfd_put_32 (obfd, LD_R2_0R2 | PPC_LO (offset + 8), p),	p += 4;
+      bfd_put_32 (obfd, BCTR, p),				p += 4;
+    }
+  return p;
+}
+
+/* Build a special .plt call stub for __tls_get_addr.  */
+
+#define LD_R11_0R3	0xe9630000
+#define LD_R12_0R3	0xe9830000
+#define MR_R0_R3	0x7c601b78
+#define CMPDI_R11_0	0x2c2b0000
+#define ADD_R3_R12_R13	0x7c6c6a14
+#define BEQLR		0x4d820020
+#define MR_R3_R0	0x7c030378
+#define MFLR_R11	0x7d6802a6
+#define STD_R11_0R1	0xf9610000
+#define BCTRL		0x4e800421
+#define LD_R11_0R1	0xe9610000
+#define LD_R2_0R1	0xe8410000
+#define MTLR_R11	0x7d6803a6
+
+static inline bfd_byte *
+build_tls_get_addr_stub (bfd *obfd, bfd_byte *p, int offset,
+			 Elf_Internal_Rela *r, bfd_boolean plt_static_chain)
+{
+  bfd_put_32 (obfd, LD_R11_0R3 + 0, p),		p += 4;
+  bfd_put_32 (obfd, LD_R12_0R3 + 8, p),		p += 4;
+  bfd_put_32 (obfd, MR_R0_R3, p),		p += 4;
+  bfd_put_32 (obfd, CMPDI_R11_0, p),		p += 4;
+  bfd_put_32 (obfd, ADD_R3_R12_R13, p),		p += 4;
+  bfd_put_32 (obfd, BEQLR, p),			p += 4;
+  bfd_put_32 (obfd, MR_R3_R0, p),		p += 4;
+  bfd_put_32 (obfd, MFLR_R11, p),		p += 4;
+  bfd_put_32 (obfd, STD_R11_0R1 + 32, p),	p += 4;
+
+  if (r != NULL)
+    r[0].r_offset += 9 * 4;
+  p = build_plt_stub (obfd, p, offset, r, plt_static_chain);
+  bfd_put_32 (obfd, BCTRL, p - 4);
+
+  bfd_put_32 (obfd, LD_R11_0R1 + 32, p),	p += 4;
+  bfd_put_32 (obfd, LD_R2_0R1 + 40, p),		p += 4;
+  bfd_put_32 (obfd, MTLR_R11, p),		p += 4;
+  bfd_put_32 (obfd, BLR, p),			p += 4;
+
+  return p;
+}
+
+static Elf_Internal_Rela *
+get_relocs (asection *sec, int count)
+{
+  Elf_Internal_Rela *relocs;
+  struct bfd_elf_section_data *elfsec_data;
+
+  elfsec_data = elf_section_data (sec);
+  relocs = elfsec_data->relocs;
+  if (relocs == NULL)
+    {
+      bfd_size_type relsize;
+      relsize = sec->reloc_count * sizeof (*relocs);
+      relocs = bfd_alloc (sec->owner, relsize);
+      if (relocs == NULL)
+	return NULL;
+      elfsec_data->relocs = relocs;
+      elfsec_data->rela.hdr = bfd_zalloc (sec->owner,
+					  sizeof (Elf_Internal_Shdr));
+      if (elfsec_data->rela.hdr == NULL)
+	return NULL;
+      elfsec_data->rela.hdr->sh_size = (sec->reloc_count
+					* sizeof (Elf64_External_Rela));
+      elfsec_data->rela.hdr->sh_entsize = sizeof (Elf64_External_Rela);
+      sec->reloc_count = 0;
+    }
+  relocs += sec->reloc_count;
+  sec->reloc_count += count;
+  return relocs;
+}
+
+static bfd_vma
+get_r2off (struct bfd_link_info *info,
+	   struct ppc_stub_hash_entry *stub_entry)
+{
+  struct ppc_link_hash_table *htab = ppc_hash_table (info);
+  bfd_vma r2off = htab->stub_group[stub_entry->target_section->id].toc_off;
+
+  if (r2off == 0)
+    {
+      /* Support linking -R objects.  Get the toc pointer from the
+	 opd entry.  */
+      char buf[8];
+      asection *opd = stub_entry->h->elf.root.u.def.section;
+      bfd_vma opd_off = stub_entry->h->elf.root.u.def.value;
+
+      if (strcmp (opd->name, ".opd") != 0
+	  || opd->reloc_count != 0)
+	{
+	  info->callbacks->einfo (_("%P: cannot find opd entry toc for %s\n"),
+				  stub_entry->h->elf.root.root.string);
+	  bfd_set_error (bfd_error_bad_value);
+	  return 0;
+	}
+      if (!bfd_get_section_contents (opd->owner, opd, buf, opd_off + 8, 8))
+	return 0;
+      r2off = bfd_get_64 (opd->owner, buf);
+      r2off -= elf_gp (info->output_bfd);
+    }
+  r2off -= htab->stub_group[stub_entry->id_sec->id].toc_off;
+  return r2off;
+}
+
+static bfd_boolean
+ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+{
+  struct ppc_stub_hash_entry *stub_entry;
+  struct ppc_branch_hash_entry *br_entry;
+  struct bfd_link_info *info;
+  struct ppc_link_hash_table *htab;
+  bfd_byte *loc;
+  bfd_byte *p;
+  bfd_vma dest, off;
+  int size;
+  Elf_Internal_Rela *r;
+  asection *plt;
+
+  /* Massage our args to the form they really have.  */
+  stub_entry = (struct ppc_stub_hash_entry *) gen_entry;
+  info = in_arg;
+
+  htab = ppc_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* Make a note of the offset within the stubs for this entry.  */
+  stub_entry->stub_offset = stub_entry->stub_sec->size;
+  loc = stub_entry->stub_sec->contents + stub_entry->stub_offset;
+
+  htab->stub_count[stub_entry->stub_type - 1] += 1;
+  switch (stub_entry->stub_type)
+    {
+    case ppc_stub_long_branch:
+    case ppc_stub_long_branch_r2off:
+      /* Branches are relative.  This is where we are going to.  */
+      off = dest = (stub_entry->target_value
+		    + stub_entry->target_section->output_offset
+		    + stub_entry->target_section->output_section->vma);
+
+      /* And this is where we are coming from.  */
+      off -= (stub_entry->stub_offset
+	      + stub_entry->stub_sec->output_offset
+	      + stub_entry->stub_sec->output_section->vma);
+
+      size = 4;
+      if (stub_entry->stub_type == ppc_stub_long_branch_r2off)
+	{
+	  bfd_vma r2off = get_r2off (info, stub_entry);
+
+	  if (r2off == 0)
+	    {
+	      htab->stub_error = TRUE;
+	      return FALSE;
+	    }
+	  bfd_put_32 (htab->stub_bfd, STD_R2_40R1, loc);
+	  loc += 4;
+	  size = 12;
+	  if (PPC_HA (r2off) != 0)
+	    {
+	      size = 16;
+	      bfd_put_32 (htab->stub_bfd, ADDIS_R2_R2 | PPC_HA (r2off), loc);
+	      loc += 4;
+	    }
+	  bfd_put_32 (htab->stub_bfd, ADDI_R2_R2 | PPC_LO (r2off), loc);
+	  loc += 4;
+	  off -= size - 4;
+	}
+      bfd_put_32 (htab->stub_bfd, B_DOT | (off & 0x3fffffc), loc);
+
+      if (off + (1 << 25) >= (bfd_vma) (1 << 26))
+	{
+	  info->callbacks->einfo (_("%P: long branch stub `%s' offset overflow\n"),
+				  stub_entry->root.string);
+	  htab->stub_error = TRUE;
+	  return FALSE;
+	}
+
+      if (info->emitrelocations)
+	{
+	  r = get_relocs (stub_entry->stub_sec, 1);
+	  if (r == NULL)
+	    return FALSE;
+	  r->r_offset = loc - stub_entry->stub_sec->contents;
+	  r->r_info = ELF64_R_INFO (0, R_PPC64_REL24);
+	  r->r_addend = dest;
+	  if (stub_entry->h != NULL)
+	    {
+	      struct elf_link_hash_entry **hashes;
+	      unsigned long symndx;
+	      struct ppc_link_hash_entry *h;
+
+	      hashes = elf_sym_hashes (htab->stub_bfd);
+	      if (hashes == NULL)
+		{
+		  bfd_size_type hsize;
+
+		  hsize = (htab->stub_globals + 1) * sizeof (*hashes);
+		  hashes = bfd_zalloc (htab->stub_bfd, hsize);
+		  if (hashes == NULL)
+		    return FALSE;
+		  elf_sym_hashes (htab->stub_bfd) = hashes;
+		  htab->stub_globals = 1;
+		}
+	      symndx = htab->stub_globals++;
+	      h = stub_entry->h;
+	      hashes[symndx] = &h->elf;
+	      r->r_info = ELF64_R_INFO (symndx, R_PPC64_REL24);
+	      if (h->oh != NULL && h->oh->is_func)
+		h = ppc_follow_link (h->oh);
+	      if (h->elf.root.u.def.section != stub_entry->target_section)
+		/* H is an opd symbol.  The addend must be zero.  */
+		r->r_addend = 0;
+	      else
+		{
+		  off = (h->elf.root.u.def.value
+			 + h->elf.root.u.def.section->output_offset
+			 + h->elf.root.u.def.section->output_section->vma);
+		  r->r_addend -= off;
+		}
+	    }
+	}
+      break;
+
+    case ppc_stub_plt_branch:
+    case ppc_stub_plt_branch_r2off:
+      br_entry = ppc_branch_hash_lookup (&htab->branch_hash_table,
+					 stub_entry->root.string + 9,
+					 FALSE, FALSE);
+      if (br_entry == NULL)
+	{
+	  info->callbacks->einfo (_("%P: can't find branch stub `%s'\n"),
+				  stub_entry->root.string);
+	  htab->stub_error = TRUE;
+	  return FALSE;
+	}
+
+      dest = (stub_entry->target_value
+	      + stub_entry->target_section->output_offset
+	      + stub_entry->target_section->output_section->vma);
+
+      bfd_put_64 (htab->brlt->owner, dest,
+		  htab->brlt->contents + br_entry->offset);
+
+      if (br_entry->iter == htab->stub_iteration)
+	{
+	  br_entry->iter = 0;
+
+	  if (htab->relbrlt != NULL)
+	    {
+	      /* Create a reloc for the branch lookup table entry.  */
+	      Elf_Internal_Rela rela;
+	      bfd_byte *rl;
+
+	      rela.r_offset = (br_entry->offset
+			       + htab->brlt->output_offset
+			       + htab->brlt->output_section->vma);
+	      rela.r_info = ELF64_R_INFO (0, R_PPC64_RELATIVE);
+	      rela.r_addend = dest;
+
+	      rl = htab->relbrlt->contents;
+	      rl += (htab->relbrlt->reloc_count++
+		     * sizeof (Elf64_External_Rela));
+	      bfd_elf64_swap_reloca_out (htab->relbrlt->owner, &rela, rl);
+	    }
+	  else if (info->emitrelocations)
+	    {
+	      r = get_relocs (htab->brlt, 1);
+	      if (r == NULL)
+		return FALSE;
+	      /* brlt, being SEC_LINKER_CREATED does not go through the
+		 normal reloc processing.  Symbols and offsets are not
+		 translated from input file to output file form, so
+		 set up the offset per the output file.  */
+	      r->r_offset = (br_entry->offset
+			     + htab->brlt->output_offset
+			     + htab->brlt->output_section->vma);
+	      r->r_info = ELF64_R_INFO (0, R_PPC64_RELATIVE);
+	      r->r_addend = dest;
+	    }
+	}
+
+      dest = (br_entry->offset
+	      + htab->brlt->output_offset
+	      + htab->brlt->output_section->vma);
+
+      off = (dest
+	     - elf_gp (htab->brlt->output_section->owner)
+	     - htab->stub_group[stub_entry->id_sec->id].toc_off);
+
+      if (off + 0x80008000 > 0xffffffff || (off & 7) != 0)
+	{
+	  info->callbacks->einfo
+	    (_("%P: linkage table error against `%s'\n"),
+	     stub_entry->root.string);
+	  bfd_set_error (bfd_error_bad_value);
+	  htab->stub_error = TRUE;
+	  return FALSE;
+	}
+
+      if (info->emitrelocations)
+	{
+	  r = get_relocs (stub_entry->stub_sec, 1 + (PPC_HA (off) != 0));
+	  if (r == NULL)
+	    return FALSE;
+	  r[0].r_offset = loc - stub_entry->stub_sec->contents;
+	  if (bfd_big_endian (info->output_bfd))
+	    r[0].r_offset += 2;
+	  if (stub_entry->stub_type == ppc_stub_plt_branch_r2off)
+	    r[0].r_offset += 4;
+	  r[0].r_info = ELF64_R_INFO (0, R_PPC64_TOC16_DS);
+	  r[0].r_addend = dest;
+	  if (PPC_HA (off) != 0)
+	    {
+	      r[0].r_info = ELF64_R_INFO (0, R_PPC64_TOC16_HA);
+	      r[1].r_offset = r[0].r_offset + 4;
+	      r[1].r_info = ELF64_R_INFO (0, R_PPC64_TOC16_LO_DS);
+	      r[1].r_addend = r[0].r_addend;
+	    }
+	}
+
+      if (stub_entry->stub_type != ppc_stub_plt_branch_r2off)
+	{
+	  if (PPC_HA (off) != 0)
+	    {
+	      size = 16;
+	      bfd_put_32 (htab->stub_bfd, ADDIS_R12_R2 | PPC_HA (off), loc);
+	      loc += 4;
+	      bfd_put_32 (htab->stub_bfd, LD_R11_0R12 | PPC_LO (off), loc);
+	    }
+	  else
+	    {
+	      size = 12;
+	      bfd_put_32 (htab->stub_bfd, LD_R11_0R2 | PPC_LO (off), loc);
+	    }
+	}
+      else
+	{
+	  bfd_vma r2off = get_r2off (info, stub_entry);
+
+	  if (r2off == 0)
+	    {
+	      htab->stub_error = TRUE;
+	      return FALSE;
+	    }
+
+	  bfd_put_32 (htab->stub_bfd, STD_R2_40R1, loc);
+	  loc += 4;
+	  size = 20;
+	  if (PPC_HA (off) != 0)
+	    {
+	      size += 4;
+	      bfd_put_32 (htab->stub_bfd, ADDIS_R12_R2 | PPC_HA (off), loc);
+	      loc += 4;
+	      bfd_put_32 (htab->stub_bfd, LD_R11_0R12 | PPC_LO (off), loc);
+	      loc += 4;
+	    }
+	  else
+	    {
+	      bfd_put_32 (htab->stub_bfd, LD_R11_0R2 | PPC_LO (off), loc);
+	      loc += 4;
+	    }
+
+	  if (PPC_HA (r2off) != 0)
+	    {
+	      size += 4;
+	      bfd_put_32 (htab->stub_bfd, ADDIS_R2_R2 | PPC_HA (r2off), loc);
+	      loc += 4;
+	    }
+	  bfd_put_32 (htab->stub_bfd, ADDI_R2_R2 | PPC_LO (r2off), loc);
+	}
+      loc += 4;
+      bfd_put_32 (htab->stub_bfd, MTCTR_R11, loc);
+      loc += 4;
+      bfd_put_32 (htab->stub_bfd, BCTR, loc);
+      break;
+
+    case ppc_stub_plt_call:
+      if (stub_entry->h != NULL
+	  && stub_entry->h->is_func_descriptor
+	  && stub_entry->h->oh != NULL)
+	{
+	  struct ppc_link_hash_entry *fh = ppc_follow_link (stub_entry->h->oh);
+
+	  /* If the old-ABI "dot-symbol" is undefined make it weak so
+	     we don't get a link error from RELOC_FOR_GLOBAL_SYMBOL.
+	     FIXME: We used to define the symbol on one of the call
+	     stubs instead, which is why we test symbol section id
+	     against htab->top_id in various places.  Likely all
+	     these checks could now disappear.  */
+	  if (fh->elf.root.type == bfd_link_hash_undefined)
+	    fh->elf.root.type = bfd_link_hash_undefweak;
+	  /* Stop undo_symbol_twiddle changing it back to undefined.  */
+	  fh->was_undefined = 0;
+	}
+
+      /* Now build the stub.  */
+      dest = stub_entry->plt_ent->plt.offset & ~1;
+      if (dest >= (bfd_vma) -2)
+	abort ();
+
+      plt = htab->plt;
+      if (!htab->elf.dynamic_sections_created
+	  || stub_entry->h == NULL
+	  || stub_entry->h->elf.dynindx == -1)
+	plt = htab->iplt;
+
+      dest += plt->output_offset + plt->output_section->vma;
+
+      if (stub_entry->h == NULL
+	  && (stub_entry->plt_ent->plt.offset & 1) == 0)
+	{
+	  Elf_Internal_Rela rela;
+	  bfd_byte *rl;
+
+	  rela.r_offset = dest;
+	  rela.r_info = ELF64_R_INFO (0, R_PPC64_JMP_IREL);
+	  rela.r_addend = (stub_entry->target_value
+			   + stub_entry->target_section->output_offset
+			   + stub_entry->target_section->output_section->vma);
+
+	  rl = (htab->reliplt->contents
+		+ (htab->reliplt->reloc_count++
+		   * sizeof (Elf64_External_Rela)));
+	  bfd_elf64_swap_reloca_out (info->output_bfd, &rela, rl);
+	  stub_entry->plt_ent->plt.offset |= 1;
+	}
+
+      off = (dest
+	     - elf_gp (plt->output_section->owner)
+	     - htab->stub_group[stub_entry->id_sec->id].toc_off);
+
+      if (off + 0x80008000 > 0xffffffff || (off & 7) != 0)
+	{
+	  info->callbacks->einfo
+	    (_("%P: linkage table error against `%s'\n"),
+	     stub_entry->h != NULL
+	     ? stub_entry->h->elf.root.root.string
+	     : "<local sym>");
+	  bfd_set_error (bfd_error_bad_value);
+	  htab->stub_error = TRUE;
+	  return FALSE;
+	}
+
+      r = NULL;
+      if (info->emitrelocations)
+	{
+	  r = get_relocs (stub_entry->stub_sec,
+			  (2
+			   + (PPC_HA (off) != 0)
+			   + (htab->plt_static_chain
+			      && PPC_HA (off + 16) == PPC_HA (off))));
+	  if (r == NULL)
+	    return FALSE;
+	  r[0].r_offset = loc - stub_entry->stub_sec->contents;
+	  if (bfd_big_endian (info->output_bfd))
+	    r[0].r_offset += 2;
+	  r[0].r_addend = dest;
+	}
+      if (stub_entry->h != NULL
+	  && (stub_entry->h == htab->tls_get_addr_fd
+	      || stub_entry->h == htab->tls_get_addr)
+	  && !htab->no_tls_get_addr_opt)
+	p = build_tls_get_addr_stub (htab->stub_bfd, loc, off, r,
+				     htab->plt_static_chain);
+      else
+	p = build_plt_stub (htab->stub_bfd, loc, off, r,
+			    htab->plt_static_chain);
+      size = p - loc;
+      break;
+
+    default:
+      BFD_FAIL ();
+      return FALSE;
+    }
+
+  stub_entry->stub_sec->size += size;
+
+  if (htab->emit_stub_syms)
+    {
+      struct elf_link_hash_entry *h;
+      size_t len1, len2;
+      char *name;
+      const char *const stub_str[] = { "long_branch",
+				       "long_branch_r2off",
+				       "plt_branch",
+				       "plt_branch_r2off",
+				       "plt_call" };
+
+      len1 = strlen (stub_str[stub_entry->stub_type - 1]);
+      len2 = strlen (stub_entry->root.string);
+      name = bfd_malloc (len1 + len2 + 2);
+      if (name == NULL)
+	return FALSE;
+      memcpy (name, stub_entry->root.string, 9);
+      memcpy (name + 9, stub_str[stub_entry->stub_type - 1], len1);
+      memcpy (name + len1 + 9, stub_entry->root.string + 8, len2 - 8 + 1);
+      h = elf_link_hash_lookup (&htab->elf, name, TRUE, FALSE, FALSE);
+      if (h == NULL)
+	return FALSE;
+      if (h->root.type == bfd_link_hash_new)
+	{
+	  h->root.type = bfd_link_hash_defined;
+	  h->root.u.def.section = stub_entry->stub_sec;
+	  h->root.u.def.value = stub_entry->stub_offset;
+	  h->ref_regular = 1;
+	  h->def_regular = 1;
+	  h->ref_regular_nonweak = 1;
+	  h->forced_local = 1;
+	  h->non_elf = 0;
+	}
+    }
+
+  return TRUE;
+}
+
+/* As above, but don't actually build the stub.  Just bump offset so
+   we know stub section sizes, and select plt_branch stubs where
+   long_branch stubs won't do.  */
+
+static bfd_boolean
+ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+{
+  struct ppc_stub_hash_entry *stub_entry;
+  struct bfd_link_info *info;
+  struct ppc_link_hash_table *htab;
+  bfd_vma off;
+  int size;
+
+  /* Massage our args to the form they really have.  */
+  stub_entry = (struct ppc_stub_hash_entry *) gen_entry;
+  info = in_arg;
+
+  htab = ppc_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (stub_entry->stub_type == ppc_stub_plt_call)
+    {
+      asection *plt;
+      off = stub_entry->plt_ent->plt.offset & ~(bfd_vma) 1;
+      if (off >= (bfd_vma) -2)
+	abort ();
+      plt = htab->plt;
+      if (!htab->elf.dynamic_sections_created
+	  || stub_entry->h == NULL
+	  || stub_entry->h->elf.dynindx == -1)
+	plt = htab->iplt;
+      off += (plt->output_offset
+	      + plt->output_section->vma
+	      - elf_gp (plt->output_section->owner)
+	      - htab->stub_group[stub_entry->id_sec->id].toc_off);
+
+      size = PLT_CALL_STUB_SIZE;
+      if (!htab->plt_static_chain)
+	size -= 4;
+      if (PPC_HA (off) == 0)
+	size -= 4;
+      if (PPC_HA (off + 8 + 8 * htab->plt_static_chain) != PPC_HA (off))
+	size += 4;
+      if (stub_entry->h != NULL
+	  && (stub_entry->h == htab->tls_get_addr_fd
+	      || stub_entry->h == htab->tls_get_addr)
+	  && !htab->no_tls_get_addr_opt)
+	size += 13 * 4;
+      if (info->emitrelocations)
+	{
+	  stub_entry->stub_sec->reloc_count
+	    += (2
+		+ (PPC_HA (off) != 0)
+		+ (htab->plt_static_chain
+		   && PPC_HA (off + 16) == PPC_HA (off)));
+	  stub_entry->stub_sec->flags |= SEC_RELOC;
+	}
+    }
+  else
+    {
+      /* ppc_stub_long_branch or ppc_stub_plt_branch, or their r2off
+	 variants.  */
+      bfd_vma r2off = 0;
+
+      off = (stub_entry->target_value
+	     + stub_entry->target_section->output_offset
+	     + stub_entry->target_section->output_section->vma);
+      off -= (stub_entry->stub_sec->size
+	      + stub_entry->stub_sec->output_offset
+	      + stub_entry->stub_sec->output_section->vma);
+
+      /* Reset the stub type from the plt variant in case we now
+	 can reach with a shorter stub.  */
+      if (stub_entry->stub_type >= ppc_stub_plt_branch)
+	stub_entry->stub_type += ppc_stub_long_branch - ppc_stub_plt_branch;
+
+      size = 4;
+      if (stub_entry->stub_type == ppc_stub_long_branch_r2off)
+	{
+	  r2off = get_r2off (info, stub_entry);
+	  if (r2off == 0)
+	    {
+	      htab->stub_error = TRUE;
+	      return FALSE;
+	    }
+	  size = 12;
+	  if (PPC_HA (r2off) != 0)
+	    size = 16;
+	  off -= size - 4;
+	}
+
+      /* If the branch offset if too big, use a ppc_stub_plt_branch.  */
+      if (off + (1 << 25) >= (bfd_vma) (1 << 26))
+	{
+	  struct ppc_branch_hash_entry *br_entry;
+
+	  br_entry = ppc_branch_hash_lookup (&htab->branch_hash_table,
+					     stub_entry->root.string + 9,
+					     TRUE, FALSE);
+	  if (br_entry == NULL)
+	    {
+	      info->callbacks->einfo (_("%P: can't build branch stub `%s'\n"),
+				      stub_entry->root.string);
+	      htab->stub_error = TRUE;
+	      return FALSE;
+	    }
+
+	  if (br_entry->iter != htab->stub_iteration)
+	    {
+	      br_entry->iter = htab->stub_iteration;
+	      br_entry->offset = htab->brlt->size;
+	      htab->brlt->size += 8;
+
+	      if (htab->relbrlt != NULL)
+		htab->relbrlt->size += sizeof (Elf64_External_Rela);
+	      else if (info->emitrelocations)
+		{
+		  htab->brlt->reloc_count += 1;
+		  htab->brlt->flags |= SEC_RELOC;
+		}
+	    }
+
+	  stub_entry->stub_type += ppc_stub_plt_branch - ppc_stub_long_branch;
+	  off = (br_entry->offset
+		 + htab->brlt->output_offset
+		 + htab->brlt->output_section->vma
+		 - elf_gp (htab->brlt->output_section->owner)
+		 - htab->stub_group[stub_entry->id_sec->id].toc_off);
+
+	  if (info->emitrelocations)
+	    {
+	      stub_entry->stub_sec->reloc_count += 1 + (PPC_HA (off) != 0);
+	      stub_entry->stub_sec->flags |= SEC_RELOC;
+	    }
+
+	  if (stub_entry->stub_type != ppc_stub_plt_branch_r2off)
+	    {
+	      size = 12;
+	      if (PPC_HA (off) != 0)
+		size = 16;
+	    }
+	  else
+	    {
+	      size = 20;
+	      if (PPC_HA (off) != 0)
+		size += 4;
+
+	      if (PPC_HA (r2off) != 0)
+		size += 4;
+	    }
+	}
+      else if (info->emitrelocations)
+	{
+	  stub_entry->stub_sec->reloc_count += 1;
+	  stub_entry->stub_sec->flags |= SEC_RELOC;
+	}
+    }
+
+  stub_entry->stub_sec->size += size;
+  return TRUE;
+}
+
+/* Set up various things so that we can make a list of input sections
+   for each output section included in the link.  Returns -1 on error,
+   0 when no stubs will be needed, and 1 on success.  */
+
+int
+ppc64_elf_setup_section_lists
+  (struct bfd_link_info *info,
+   asection *(*add_stub_section) (const char *, asection *),
+   void (*layout_sections_again) (void))
+{
+  bfd *input_bfd;
+  int top_id, top_index, id;
+  asection *section;
+  asection **input_list;
+  bfd_size_type amt;
+  struct ppc_link_hash_table *htab = ppc_hash_table (info);
+
+  if (htab == NULL)
+    return -1;
+  /* Stash our params away.  */
+  htab->add_stub_section = add_stub_section;
+  htab->layout_sections_again = layout_sections_again;
+
+  if (htab->brlt == NULL)
+    return 0;
+
+  /* Find the top input section id.  */
+  for (input_bfd = info->input_bfds, top_id = 3;
+       input_bfd != NULL;
+       input_bfd = input_bfd->link_next)
+    {
+      for (section = input_bfd->sections;
+	   section != NULL;
+	   section = section->next)
+	{
+	  if (top_id < section->id)
+	    top_id = section->id;
+	}
+    }
+
+  htab->top_id = top_id;
+  amt = sizeof (struct map_stub) * (top_id + 1);
+  htab->stub_group = bfd_zmalloc (amt);
+  if (htab->stub_group == NULL)
+    return -1;
+
+  /* Set toc_off for com, und, abs and ind sections.  */
+  for (id = 0; id < 3; id++)
+    htab->stub_group[id].toc_off = TOC_BASE_OFF;
+
+  /* We can't use output_bfd->section_count here to find the top output
+     section index as some sections may have been removed, and
+     strip_excluded_output_sections doesn't renumber the indices.  */
+  for (section = info->output_bfd->sections, top_index = 0;
+       section != NULL;
+       section = section->next)
+    {
+      if (top_index < section->index)
+	top_index = section->index;
+    }
+
+  htab->top_index = top_index;
+  amt = sizeof (asection *) * (top_index + 1);
+  input_list = bfd_zmalloc (amt);
+  htab->input_list = input_list;
+  if (input_list == NULL)
+    return -1;
+
+  return 1;
+}
+
+/* Set up for first pass at multitoc partitioning.  */
+
+void
+ppc64_elf_start_multitoc_partition (struct bfd_link_info *info)
+{
+  struct ppc_link_hash_table *htab = ppc_hash_table (info);
+
+  elf_gp (info->output_bfd) = ppc64_elf_toc (info->output_bfd);
+  htab->toc_curr = elf_gp (info->output_bfd);
+  htab->toc_bfd = NULL;
+  htab->toc_first_sec = NULL;
+}
+
+/* The linker repeatedly calls this function for each TOC input section
+   and linker generated GOT section.  Group input bfds such that the toc
+   within a group is less than 64k in size.  */
+
+bfd_boolean
+ppc64_elf_next_toc_section (struct bfd_link_info *info, asection *isec)
+{
+  struct ppc_link_hash_table *htab = ppc_hash_table (info);
+  bfd_vma addr, off, limit;
+
+  if (htab == NULL)
+    return FALSE;
+
+  if (!htab->second_toc_pass)
+    {
+      /* Keep track of the first .toc or .got section for this input bfd.  */
+      if (htab->toc_bfd != isec->owner)
+	{
+	  htab->toc_bfd = isec->owner;
+	  htab->toc_first_sec = isec;
+	}
+
+      addr = isec->output_offset + isec->output_section->vma;
+      off = addr - htab->toc_curr;
+      limit = 0x80008000;
+      if (ppc64_elf_tdata (isec->owner)->has_small_toc_reloc)
+	limit = 0x10000;
+      if (off + isec->size > limit)
+	{
+	  addr = (htab->toc_first_sec->output_offset
+		  + htab->toc_first_sec->output_section->vma);
+	  htab->toc_curr = addr;
+	}
+
+      /* toc_curr is the base address of this toc group.  Set elf_gp
+	 for the input section to be the offset relative to the
+	 output toc base plus 0x8000.  Making the input elf_gp an
+	 offset allows us to move the toc as a whole without
+	 recalculating input elf_gp.  */
+      off = htab->toc_curr - elf_gp (isec->output_section->owner);
+      off += TOC_BASE_OFF;
+
+      /* Die if someone uses a linker script that doesn't keep input
+	 file .toc and .got together.  */
+      if (elf_gp (isec->owner) != 0
+	  && elf_gp (isec->owner) != off)
+	return FALSE;
+
+      elf_gp (isec->owner) = off;
+      return TRUE;
+    }
+
+  /* During the second pass toc_first_sec points to the start of
+     a toc group, and toc_curr is used to track the old elf_gp.
+     We use toc_bfd to ensure we only look at each bfd once.  */
+  if (htab->toc_bfd == isec->owner)
+    return TRUE;
+  htab->toc_bfd = isec->owner;
+
+  if (htab->toc_first_sec == NULL
+      || htab->toc_curr != elf_gp (isec->owner))
+    {
+      htab->toc_curr = elf_gp (isec->owner);
+      htab->toc_first_sec = isec;
+    }
+  addr = (htab->toc_first_sec->output_offset
+	  + htab->toc_first_sec->output_section->vma);
+  off = addr - elf_gp (isec->output_section->owner) + TOC_BASE_OFF;
+  elf_gp (isec->owner) = off;
+
+  return TRUE;
+}
+
+/* Called via elf_link_hash_traverse to merge GOT entries for global
+   symbol H.  */
+
+static bfd_boolean
+merge_global_got (struct elf_link_hash_entry *h, void *inf ATTRIBUTE_UNUSED)
+{
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  merge_got_entries (&h->got.glist);
+
+  return TRUE;
+}
+
+/* Called via elf_link_hash_traverse to allocate GOT entries for global
+   symbol H.  */
+
+static bfd_boolean
+reallocate_got (struct elf_link_hash_entry *h, void *inf)
+{
+  struct got_entry *gent;
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  for (gent = h->got.glist; gent != NULL; gent = gent->next)
+    if (!gent->is_indirect)
+      allocate_got (h, (struct bfd_link_info *) inf, gent);
+  return TRUE;
+}
+
+/* Called on the first multitoc pass after the last call to
+   ppc64_elf_next_toc_section.  This function removes duplicate GOT
+   entries.  */
+
+bfd_boolean
+ppc64_elf_layout_multitoc (struct bfd_link_info *info)
+{
+  struct ppc_link_hash_table *htab = ppc_hash_table (info);
+  struct bfd *ibfd, *ibfd2;
+  bfd_boolean done_something;
+
+  htab->multi_toc_needed = htab->toc_curr != elf_gp (info->output_bfd);
+
+  if (!htab->do_multi_toc)
+    return FALSE;
+
+  /* Merge global sym got entries within a toc group.  */
+  elf_link_hash_traverse (&htab->elf, merge_global_got, info);
+
+  /* And tlsld_got.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      struct got_entry *ent, *ent2;
+
+      if (!is_ppc64_elf (ibfd))
+	continue;
+
+      ent = ppc64_tlsld_got (ibfd);
+      if (!ent->is_indirect
+	  && ent->got.offset != (bfd_vma) -1)
+	{
+	  for (ibfd2 = ibfd->link_next; ibfd2 != NULL; ibfd2 = ibfd2->link_next)
+	    {
+	      if (!is_ppc64_elf (ibfd2))
+		continue;
+
+	      ent2 = ppc64_tlsld_got (ibfd2);
+	      if (!ent2->is_indirect
+		  && ent2->got.offset != (bfd_vma) -1
+		  && elf_gp (ibfd2) == elf_gp (ibfd))
+		{
+		  ent2->is_indirect = TRUE;
+		  ent2->got.ent = ent;
+		}
+	    }
+	}
+    }
+
+  /* Zap sizes of got sections.  */
+  htab->reliplt->rawsize = htab->reliplt->size;
+  htab->reliplt->size -= htab->got_reli_size;
+  htab->got_reli_size = 0;
+
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      asection *got, *relgot;
+
+      if (!is_ppc64_elf (ibfd))
+	continue;
+
+      got = ppc64_elf_tdata (ibfd)->got;
+      if (got != NULL)
+	{
+	  got->rawsize = got->size;
+	  got->size = 0;
+	  relgot = ppc64_elf_tdata (ibfd)->relgot;
+	  relgot->rawsize = relgot->size;
+	  relgot->size = 0;
+	}
+    }
+
+  /* Now reallocate the got, local syms first.  We don't need to
+     allocate section contents again since we never increase size.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      struct got_entry **lgot_ents;
+      struct got_entry **end_lgot_ents;
+      struct plt_entry **local_plt;
+      struct plt_entry **end_local_plt;
+      unsigned char *lgot_masks;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *s, *srel;
+
+      if (!is_ppc64_elf (ibfd))
+	continue;
+
+      lgot_ents = elf_local_got_ents (ibfd);
+      if (!lgot_ents)
+	continue;
+
+      symtab_hdr = &elf_symtab_hdr (ibfd);
+      locsymcount = symtab_hdr->sh_info;
+      end_lgot_ents = lgot_ents + locsymcount;
+      local_plt = (struct plt_entry **) end_lgot_ents;
+      end_local_plt = local_plt + locsymcount;
+      lgot_masks = (unsigned char *) end_local_plt;
+      s = ppc64_elf_tdata (ibfd)->got;
+      srel = ppc64_elf_tdata (ibfd)->relgot;
+      for (; lgot_ents < end_lgot_ents; ++lgot_ents, ++lgot_masks)
+	{
+	  struct got_entry *ent;
+
+	  for (ent = *lgot_ents; ent != NULL; ent = ent->next)
+	    {
+	      unsigned int num = 1;
+	      ent->got.offset = s->size;
+	      if ((ent->tls_type & *lgot_masks & TLS_GD) != 0)
+		num = 2;
+	      s->size += num * 8;
+	      if (info->shared)
+		srel->size += num * sizeof (Elf64_External_Rela);
+	      else if ((*lgot_masks & PLT_IFUNC) != 0)
+		{
+		  htab->reliplt->size
+		    += num * sizeof (Elf64_External_Rela);
+		  htab->got_reli_size
+		    += num * sizeof (Elf64_External_Rela);
+		}
+	    }
+	}
+    }
+
+  elf_link_hash_traverse (&htab->elf, reallocate_got, info);
+
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      struct got_entry *ent;
+
+      if (!is_ppc64_elf (ibfd))
+	continue;
+
+      ent = ppc64_tlsld_got (ibfd);
+      if (!ent->is_indirect
+	  && ent->got.offset != (bfd_vma) -1)
+	{
+	  asection *s = ppc64_elf_tdata (ibfd)->got;
+	  ent->got.offset = s->size;
+	  s->size += 16;
+	  if (info->shared)
+	    {
+	      asection *srel = ppc64_elf_tdata (ibfd)->relgot;
+	      srel->size += sizeof (Elf64_External_Rela);
+	    }
+	}
+    }
+
+  done_something = htab->reliplt->rawsize != htab->reliplt->size;
+  if (!done_something)
+    for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+      {
+	asection *got;
+
+	if (!is_ppc64_elf (ibfd))
+	  continue;
+
+	got = ppc64_elf_tdata (ibfd)->got;
+	if (got != NULL)
+	  {
+	    done_something = got->rawsize != got->size;
+	    if (done_something)
+	      break;
+	  }
+      }
+
+  if (done_something)
+    (*htab->layout_sections_again) ();
+
+  /* Set up for second pass over toc sections to recalculate elf_gp
+     on input sections.  */
+  htab->toc_bfd = NULL;
+  htab->toc_first_sec = NULL;
+  htab->second_toc_pass = TRUE;
+  return done_something;
+}
+
+/* Called after second pass of multitoc partitioning.  */
+
+void
+ppc64_elf_finish_multitoc_partition (struct bfd_link_info *info)
+{
+  struct ppc_link_hash_table *htab = ppc_hash_table (info);
+
+  /* After the second pass, toc_curr tracks the TOC offset used
+     for code sections below in ppc64_elf_next_input_section.  */
+  htab->toc_curr = TOC_BASE_OFF;
+}
+
+/* No toc references were found in ISEC.  If the code in ISEC makes no
+   calls, then there's no need to use toc adjusting stubs when branching
+   into ISEC.  Actually, indirect calls from ISEC are OK as they will
+   load r2.  Returns -1 on error, 0 for no stub needed, 1 for stub
+   needed, and 2 if a cyclical call-graph was found but no other reason
+   for a stub was detected.  If called from the top level, a return of
+   2 means the same as a return of 0.  */
+
+static int
+toc_adjusting_stub_needed (struct bfd_link_info *info, asection *isec)
+{
+  int ret;
+
+  /* Mark this section as checked.  */
+  isec->call_check_done = 1;
+
+  /* We know none of our code bearing sections will need toc stubs.  */
+  if ((isec->flags & SEC_LINKER_CREATED) != 0)
+    return 0;
+
+  if (isec->size == 0)
+    return 0;
+
+  if (isec->output_section == NULL)
+    return 0;
+
+  ret = 0;
+  if (isec->reloc_count != 0)
+    {
+      Elf_Internal_Rela *relstart, *rel;
+      Elf_Internal_Sym *local_syms;
+      struct ppc_link_hash_table *htab;
+
+      relstart = _bfd_elf_link_read_relocs (isec->owner, isec, NULL, NULL,
+					    info->keep_memory);
+      if (relstart == NULL)
+	return -1;
+
+      /* Look for branches to outside of this section.  */
+      local_syms = NULL;
+      htab = ppc_hash_table (info);
+      if (htab == NULL)
+	return -1;
+
+      for (rel = relstart; rel < relstart + isec->reloc_count; ++rel)
+	{
+	  enum elf_ppc64_reloc_type r_type;
+	  unsigned long r_symndx;
+	  struct elf_link_hash_entry *h;
+	  struct ppc_link_hash_entry *eh;
+	  Elf_Internal_Sym *sym;
+	  asection *sym_sec;
+	  struct _opd_sec_data *opd;
+	  bfd_vma sym_value;
+	  bfd_vma dest;
+
+	  r_type = ELF64_R_TYPE (rel->r_info);
+	  if (r_type != R_PPC64_REL24
+	      && r_type != R_PPC64_REL14
+	      && r_type != R_PPC64_REL14_BRTAKEN
+	      && r_type != R_PPC64_REL14_BRNTAKEN)
+	    continue;
+
+	  r_symndx = ELF64_R_SYM (rel->r_info);
+	  if (!get_sym_h (&h, &sym, &sym_sec, NULL, &local_syms, r_symndx,
+			  isec->owner))
+	    {
+	      ret = -1;
+	      break;
+	    }
+
+	  /* Calls to dynamic lib functions go through a plt call stub
+	     that uses r2.  */
+	  eh = (struct ppc_link_hash_entry *) h;
+	  if (eh != NULL
+	      && (eh->elf.plt.plist != NULL
+		  || (eh->oh != NULL
+		      && ppc_follow_link (eh->oh)->elf.plt.plist != NULL)))
+	    {
+	      ret = 1;
+	      break;
+	    }
+
+	  if (sym_sec == NULL)
+	    /* Ignore other undefined symbols.  */
+	    continue;
+
+	  /* Assume branches to other sections not included in the
+	     link need stubs too, to cover -R and absolute syms.  */
+	  if (sym_sec->output_section == NULL)
+	    {
+	      ret = 1;
+	      break;
+	    }
+
+	  if (h == NULL)
+	    sym_value = sym->st_value;
+	  else
+	    {
+	      if (h->root.type != bfd_link_hash_defined
+		  && h->root.type != bfd_link_hash_defweak)
+		abort ();
+	      sym_value = h->root.u.def.value;
+	    }
+	  sym_value += rel->r_addend;
+
+	  /* If this branch reloc uses an opd sym, find the code section.  */
+	  opd = get_opd_info (sym_sec);
+	  if (opd != NULL)
+	    {
+	      if (h == NULL && opd->adjust != NULL)
+		{
+		  long adjust;
+
+		  adjust = opd->adjust[sym->st_value / 8];
+		  if (adjust == -1)
+		    /* Assume deleted functions won't ever be called.  */
+		    continue;
+		  sym_value += adjust;
+		}
+
+	      dest = opd_entry_value (sym_sec, sym_value, &sym_sec, NULL);
+	      if (dest == (bfd_vma) -1)
+		continue;
+	    }
+	  else
+	    dest = (sym_value
+		    + sym_sec->output_offset
+		    + sym_sec->output_section->vma);
+
+	  /* Ignore branch to self.  */
+	  if (sym_sec == isec)
+	    continue;
+
+	  /* If the called function uses the toc, we need a stub.  */
+	  if (sym_sec->has_toc_reloc
+	      || sym_sec->makes_toc_func_call)
+	    {
+	      ret = 1;
+	      break;
+	    }
+
+	  /* Assume any branch that needs a long branch stub might in fact
+	     need a plt_branch stub.  A plt_branch stub uses r2.  */
+	  else if (dest - (isec->output_offset
+			   + isec->output_section->vma
+			   + rel->r_offset) + (1 << 25) >= (2 << 25))
+	    {
+	      ret = 1;
+	      break;
+	    }
+
+	  /* If calling back to a section in the process of being
+	     tested, we can't say for sure that no toc adjusting stubs
+	     are needed, so don't return zero.  */
+	  else if (sym_sec->call_check_in_progress)
+	    ret = 2;
+
+	  /* Branches to another section that itself doesn't have any TOC
+	     references are OK.  Recursively call ourselves to check.  */
+	  else if (!sym_sec->call_check_done)
+	    {
+	      int recur;
+
+	      /* Mark current section as indeterminate, so that other
+		 sections that call back to current won't be marked as
+		 known.  */
+	      isec->call_check_in_progress = 1;
+	      recur = toc_adjusting_stub_needed (info, sym_sec);
+	      isec->call_check_in_progress = 0;
+
+	      if (recur != 0)
+		{
+		  ret = recur;
+		  if (recur != 2)
+		    break;
+		}
+	    }
+	}
+
+      if (local_syms != NULL
+	  && (elf_symtab_hdr (isec->owner).contents
+	      != (unsigned char *) local_syms))
+	free (local_syms);
+      if (elf_section_data (isec)->relocs != relstart)
+	free (relstart);
+    }
+
+  if ((ret & 1) == 0
+      && isec->map_head.s != NULL
+      && (strcmp (isec->output_section->name, ".init") == 0
+	  || strcmp (isec->output_section->name, ".fini") == 0))
+    {
+      if (isec->map_head.s->has_toc_reloc
+	  || isec->map_head.s->makes_toc_func_call)
+	ret = 1;
+      else if (!isec->map_head.s->call_check_done)
+	{
+	  int recur;
+	  isec->call_check_in_progress = 1;
+	  recur = toc_adjusting_stub_needed (info, isec->map_head.s);
+	  isec->call_check_in_progress = 0;
+	  if (recur != 0)
+	    ret = recur;
+	}
+    }
+
+  if (ret == 1)
+    isec->makes_toc_func_call = 1;
+
+  return ret;
+}
+
+/* The linker repeatedly calls this function for each input section,
+   in the order that input sections are linked into output sections.
+   Build lists of input sections to determine groupings between which
+   we may insert linker stubs.  */
+
+bfd_boolean
+ppc64_elf_next_input_section (struct bfd_link_info *info, asection *isec)
+{
+  struct ppc_link_hash_table *htab = ppc_hash_table (info);
+
+  if (htab == NULL)
+    return FALSE;
+
+  if ((isec->output_section->flags & SEC_CODE) != 0
+      && isec->output_section->index <= htab->top_index)
+    {
+      asection **list = htab->input_list + isec->output_section->index;
+      /* Steal the link_sec pointer for our list.  */
+#define PREV_SEC(sec) (htab->stub_group[(sec)->id].link_sec)
+      /* This happens to make the list in reverse order,
+	 which is what we want.  */
+      PREV_SEC (isec) = *list;
+      *list = isec;
+    }
+
+  if (htab->multi_toc_needed)
+    {
+      /* If a code section has a function that uses the TOC then we need
+	 to use the right TOC (obviously).  Also, make sure that .opd gets
+	 the correct TOC value for R_PPC64_TOC relocs that don't have or
+	 can't find their function symbol (shouldn't ever happen now).
+	 Also specially treat .fixup for the linux kernel.  .fixup
+	 contains branches, but only back to the function that hit an
+	 exception.  */
+      if (isec->has_toc_reloc
+	  || (isec->flags & SEC_CODE) == 0
+	  || strcmp (isec->name, ".fixup") == 0)
+	{
+	  if (elf_gp (isec->owner) != 0)
+	    htab->toc_curr = elf_gp (isec->owner);
+	}
+      else
+	{
+	  if (!isec->call_check_done
+	      && toc_adjusting_stub_needed (info, isec) < 0)
+	    return FALSE;
+	  /* If we make a local call from this section, ie. a branch
+	     without a following nop, then we have no place to put a
+	     toc restoring insn.  We must use the same toc group as
+	     the callee.
+	     Testing makes_toc_func_call actually tests for *any*
+	     calls to functions that need a good toc pointer.  A more
+	     precise test would be better, as this one will set
+	     incorrect values for pasted .init/.fini fragments.
+	     (Fixed later in check_pasted_section.)  */
+	  if (isec->makes_toc_func_call
+	      && elf_gp (isec->owner) != 0)
+	    htab->toc_curr = elf_gp (isec->owner);
+	}
+    }
+
+  /* Functions that don't use the TOC can belong in any TOC group.
+     Use the last TOC base.  */
+  htab->stub_group[isec->id].toc_off = htab->toc_curr;
+  return TRUE;
+}
+
+/* Check that all .init and .fini sections use the same toc, if they
+   have toc relocs.  */
+
+static bfd_boolean
+check_pasted_section (struct bfd_link_info *info, const char *name)
+{
+  asection *o = bfd_get_section_by_name (info->output_bfd, name);
+
+  if (o != NULL)
+    {
+      struct ppc_link_hash_table *htab = ppc_hash_table (info);
+      bfd_vma toc_off = 0;
+      asection *i;
+
+      for (i = o->map_head.s; i != NULL; i = i->map_head.s)
+	if (i->has_toc_reloc)
+	  {
+	    if (toc_off == 0)
+	      toc_off = htab->stub_group[i->id].toc_off;
+	    else if (toc_off != htab->stub_group[i->id].toc_off)
+	      return FALSE;
+	  }
+
+      if (toc_off == 0)
+	for (i = o->map_head.s; i != NULL; i = i->map_head.s)
+	  if (i->makes_toc_func_call)
+	    {
+	      toc_off = htab->stub_group[i->id].toc_off;
+	      break;
+	    }
+
+      /* Make sure the whole pasted function uses the same toc offset.  */
+      if (toc_off != 0)
+	for (i = o->map_head.s; i != NULL; i = i->map_head.s)
+	  htab->stub_group[i->id].toc_off = toc_off;
+    }
+  return TRUE;
+}
+
+bfd_boolean
+ppc64_elf_check_init_fini (struct bfd_link_info *info)
+{
+  return (check_pasted_section (info, ".init")
+	  & check_pasted_section (info, ".fini"));
+}
+
+/* See whether we can group stub sections together.  Grouping stub
+   sections may result in fewer stubs.  More importantly, we need to
+   put all .init* and .fini* stubs at the beginning of the .init or
+   .fini output sections respectively, because glibc splits the
+   _init and _fini functions into multiple parts.  Putting a stub in
+   the middle of a function is not a good idea.  */
+
+static void
+group_sections (struct ppc_link_hash_table *htab,
+		bfd_size_type stub_group_size,
+		bfd_boolean stubs_always_before_branch)
+{
+  asection **list;
+  bfd_size_type stub14_group_size;
+  bfd_boolean suppress_size_errors;
+
+  suppress_size_errors = FALSE;
+  stub14_group_size = stub_group_size;
+  if (stub_group_size == 1)
+    {
+      /* Default values.  */
+      if (stubs_always_before_branch)
+	{
+	  stub_group_size = 0x1e00000;
+	  stub14_group_size = 0x7800;
+	}
+      else
+	{
+	  stub_group_size = 0x1c00000;
+	  stub14_group_size = 0x7000;
+	}
+      suppress_size_errors = TRUE;
+    }
+
+  list = htab->input_list + htab->top_index;
+  do
+    {
+      asection *tail = *list;
+      while (tail != NULL)
+	{
+	  asection *curr;
+	  asection *prev;
+	  bfd_size_type total;
+	  bfd_boolean big_sec;
+	  bfd_vma curr_toc;
+
+	  curr = tail;
+	  total = tail->size;
+	  big_sec = total > (ppc64_elf_section_data (tail) != NULL
+			     && ppc64_elf_section_data (tail)->has_14bit_branch
+			     ? stub14_group_size : stub_group_size);
+	  if (big_sec && !suppress_size_errors)
+	    (*_bfd_error_handler) (_("%B section %A exceeds stub group size"),
+				     tail->owner, tail);
+	  curr_toc = htab->stub_group[tail->id].toc_off;
+
+	  while ((prev = PREV_SEC (curr)) != NULL
+		 && ((total += curr->output_offset - prev->output_offset)
+		     < (ppc64_elf_section_data (prev) != NULL
+			&& ppc64_elf_section_data (prev)->has_14bit_branch
+			? stub14_group_size : stub_group_size))
+		 && htab->stub_group[prev->id].toc_off == curr_toc)
+	    curr = prev;
+
+	  /* OK, the size from the start of CURR to the end is less
+	     than stub_group_size and thus can be handled by one stub
+	     section.  (or the tail section is itself larger than
+	     stub_group_size, in which case we may be toast.)  We
+	     should really be keeping track of the total size of stubs
+	     added here, as stubs contribute to the final output
+	     section size.  That's a little tricky, and this way will
+	     only break if stubs added make the total size more than
+	     2^25, ie. for the default stub_group_size, if stubs total
+	     more than 2097152 bytes, or nearly 75000 plt call stubs.  */
+	  do
+	    {
+	      prev = PREV_SEC (tail);
+	      /* Set up this stub group.  */
+	      htab->stub_group[tail->id].link_sec = curr;
+	    }
+	  while (tail != curr && (tail = prev) != NULL);
+
+	  /* But wait, there's more!  Input sections up to stub_group_size
+	     bytes before the stub section can be handled by it too.
+	     Don't do this if we have a really large section after the
+	     stubs, as adding more stubs increases the chance that
+	     branches may not reach into the stub section.  */
+	  if (!stubs_always_before_branch && !big_sec)
+	    {
+	      total = 0;
+	      while (prev != NULL
+		     && ((total += tail->output_offset - prev->output_offset)
+			 < (ppc64_elf_section_data (prev) != NULL
+			    && ppc64_elf_section_data (prev)->has_14bit_branch
+			    ? stub14_group_size : stub_group_size))
+		     && htab->stub_group[prev->id].toc_off == curr_toc)
+		{
+		  tail = prev;
+		  prev = PREV_SEC (tail);
+		  htab->stub_group[tail->id].link_sec = curr;
+		}
+	    }
+	  tail = prev;
+	}
+    }
+  while (list-- != htab->input_list);
+  free (htab->input_list);
+#undef PREV_SEC
+}
+
+static const unsigned char glink_eh_frame_cie[] =
+{
+  0, 0, 0, 16,				/* length.  */
+  0, 0, 0, 0,				/* id.  */
+  1,					/* CIE version.  */
+  'z', 'R', 0,				/* Augmentation string.  */
+  4,					/* Code alignment.  */
+  0x78,					/* Data alignment.  */
+  65,					/* RA reg.  */
+  1,					/* Augmentation size.  */
+  DW_EH_PE_pcrel | DW_EH_PE_sdata4,	/* FDE encoding.  */
+  DW_CFA_def_cfa, 1, 0			/* def_cfa: r1 offset 0.  */
+};
+
+/* Stripping output sections is normally done before dynamic section
+   symbols have been allocated.  This function is called later, and
+   handles cases like htab->brlt which is mapped to its own output
+   section.  */
+
+static void
+maybe_strip_output (struct bfd_link_info *info, asection *isec)
+{
+  if (isec->size == 0
+      && isec->output_section->size == 0
+      && !bfd_section_removed_from_list (info->output_bfd,
+					 isec->output_section)
+      && elf_section_data (isec->output_section)->dynindx == 0)
+    {
+      isec->output_section->flags |= SEC_EXCLUDE;
+      bfd_section_list_remove (info->output_bfd, isec->output_section);
+      info->output_bfd->section_count--;
+    }
+}
+
+/* Determine and set the size of the stub section for a final link.
+
+   The basic idea here is to examine all the relocations looking for
+   PC-relative calls to a target that is unreachable with a "bl"
+   instruction.  */
+
+bfd_boolean
+ppc64_elf_size_stubs (struct bfd_link_info *info, bfd_signed_vma group_size,
+		      bfd_boolean plt_static_chain)
+{
+  bfd_size_type stub_group_size;
+  bfd_boolean stubs_always_before_branch;
+  struct ppc_link_hash_table *htab = ppc_hash_table (info);
+
+  if (htab == NULL)
+    return FALSE;
+
+  htab->plt_static_chain = plt_static_chain;
+  stubs_always_before_branch = group_size < 0;
+  if (group_size < 0)
+    stub_group_size = -group_size;
+  else
+    stub_group_size = group_size;
+
+  group_sections (htab, stub_group_size, stubs_always_before_branch);
+
+  while (1)
+    {
+      bfd *input_bfd;
+      unsigned int bfd_indx;
+      asection *stub_sec;
+
+      htab->stub_iteration += 1;
+
+      for (input_bfd = info->input_bfds, bfd_indx = 0;
+	   input_bfd != NULL;
+	   input_bfd = input_bfd->link_next, bfd_indx++)
+	{
+	  Elf_Internal_Shdr *symtab_hdr;
+	  asection *section;
+	  Elf_Internal_Sym *local_syms = NULL;
+
+	  if (!is_ppc64_elf (input_bfd))
+	    continue;
+
+	  /* We'll need the symbol table in a second.  */
+	  symtab_hdr = &elf_symtab_hdr (input_bfd);
+	  if (symtab_hdr->sh_info == 0)
+	    continue;
+
+	  /* Walk over each section attached to the input bfd.  */
+	  for (section = input_bfd->sections;
+	       section != NULL;
+	       section = section->next)
+	    {
+	      Elf_Internal_Rela *internal_relocs, *irelaend, *irela;
+
+	      /* If there aren't any relocs, then there's nothing more
+		 to do.  */
+	      if ((section->flags & SEC_RELOC) == 0
+		  || (section->flags & SEC_ALLOC) == 0
+		  || (section->flags & SEC_LOAD) == 0
+		  || (section->flags & SEC_CODE) == 0
+		  || section->reloc_count == 0)
+		continue;
+
+	      /* If this section is a link-once section that will be
+		 discarded, then don't create any stubs.  */
+	      if (section->output_section == NULL
+		  || section->output_section->owner != info->output_bfd)
+		continue;
+
+	      /* Get the relocs.  */
+	      internal_relocs
+		= _bfd_elf_link_read_relocs (input_bfd, section, NULL, NULL,
+					     info->keep_memory);
+	      if (internal_relocs == NULL)
+		goto error_ret_free_local;
+
+	      /* Now examine each relocation.  */
+	      irela = internal_relocs;
+	      irelaend = irela + section->reloc_count;
+	      for (; irela < irelaend; irela++)
+		{
+		  enum elf_ppc64_reloc_type r_type;
+		  unsigned int r_indx;
+		  enum ppc_stub_type stub_type;
+		  struct ppc_stub_hash_entry *stub_entry;
+		  asection *sym_sec, *code_sec;
+		  bfd_vma sym_value, code_value;
+		  bfd_vma destination;
+		  bfd_boolean ok_dest;
+		  struct ppc_link_hash_entry *hash;
+		  struct ppc_link_hash_entry *fdh;
+		  struct elf_link_hash_entry *h;
+		  Elf_Internal_Sym *sym;
+		  char *stub_name;
+		  const asection *id_sec;
+		  struct _opd_sec_data *opd;
+		  struct plt_entry *plt_ent;
+
+		  r_type = ELF64_R_TYPE (irela->r_info);
+		  r_indx = ELF64_R_SYM (irela->r_info);
+
+		  if (r_type >= R_PPC64_max)
+		    {
+		      bfd_set_error (bfd_error_bad_value);
+		      goto error_ret_free_internal;
+		    }
+
+		  /* Only look for stubs on branch instructions.  */
+		  if (r_type != R_PPC64_REL24
+		      && r_type != R_PPC64_REL14
+		      && r_type != R_PPC64_REL14_BRTAKEN
+		      && r_type != R_PPC64_REL14_BRNTAKEN)
+		    continue;
+
+		  /* Now determine the call target, its name, value,
+		     section.  */
+		  if (!get_sym_h (&h, &sym, &sym_sec, NULL, &local_syms,
+				  r_indx, input_bfd))
+		    goto error_ret_free_internal;
+		  hash = (struct ppc_link_hash_entry *) h;
+
+		  ok_dest = FALSE;
+		  fdh = NULL;
+		  sym_value = 0;
+		  if (hash == NULL)
+		    {
+		      sym_value = sym->st_value;
+		      ok_dest = TRUE;
+		    }
+		  else if (hash->elf.root.type == bfd_link_hash_defined
+			   || hash->elf.root.type == bfd_link_hash_defweak)
+		    {
+		      sym_value = hash->elf.root.u.def.value;
+		      if (sym_sec->output_section != NULL)
+			ok_dest = TRUE;
+		    }
+		  else if (hash->elf.root.type == bfd_link_hash_undefweak
+			   || hash->elf.root.type == bfd_link_hash_undefined)
+		    {
+		      /* Recognise an old ABI func code entry sym, and
+			 use the func descriptor sym instead if it is
+			 defined.  */
+		      if (hash->elf.root.root.string[0] == '.'
+			  && (fdh = lookup_fdh (hash, htab)) != NULL)
+			{
+			  if (fdh->elf.root.type == bfd_link_hash_defined
+			      || fdh->elf.root.type == bfd_link_hash_defweak)
+			    {
+			      sym_sec = fdh->elf.root.u.def.section;
+			      sym_value = fdh->elf.root.u.def.value;
+			      if (sym_sec->output_section != NULL)
+				ok_dest = TRUE;
+			    }
+			  else
+			    fdh = NULL;
+			}
+		    }
+		  else
+		    {
+		      bfd_set_error (bfd_error_bad_value);
+		      goto error_ret_free_internal;
+		    }
+
+		  destination = 0;
+		  if (ok_dest)
+		    {
+		      sym_value += irela->r_addend;
+		      destination = (sym_value
+				     + sym_sec->output_offset
+				     + sym_sec->output_section->vma);
+		    }
+
+		  code_sec = sym_sec;
+		  code_value = sym_value;
+		  opd = get_opd_info (sym_sec);
+		  if (opd != NULL)
+		    {
+		      bfd_vma dest;
+
+		      if (hash == NULL && opd->adjust != NULL)
+			{
+			  long adjust = opd->adjust[sym_value / 8];
+			  if (adjust == -1)
+			    continue;
+			  code_value += adjust;
+			  sym_value += adjust;
+			}
+		      dest = opd_entry_value (sym_sec, sym_value,
+					      &code_sec, &code_value);
+		      if (dest != (bfd_vma) -1)
+			{
+			  destination = dest;
+			  if (fdh != NULL)
+			    {
+			      /* Fixup old ABI sym to point at code
+				 entry.  */
+			      hash->elf.root.type = bfd_link_hash_defweak;
+			      hash->elf.root.u.def.section = code_sec;
+			      hash->elf.root.u.def.value = code_value;
+			    }
+			}
+		    }
+
+		  /* Determine what (if any) linker stub is needed.  */
+		  plt_ent = NULL;
+		  stub_type = ppc_type_of_stub (section, irela, &hash,
+						&plt_ent, destination);
+
+		  if (stub_type != ppc_stub_plt_call)
+		    {
+		      /* Check whether we need a TOC adjusting stub.
+			 Since the linker pastes together pieces from
+			 different object files when creating the
+			 _init and _fini functions, it may be that a
+			 call to what looks like a local sym is in
+			 fact a call needing a TOC adjustment.  */
+		      if (code_sec != NULL
+			  && code_sec->output_section != NULL
+			  && (htab->stub_group[code_sec->id].toc_off
+			      != htab->stub_group[section->id].toc_off)
+			  && (code_sec->has_toc_reloc
+			      || code_sec->makes_toc_func_call))
+			stub_type = ppc_stub_long_branch_r2off;
+		    }
+
+		  if (stub_type == ppc_stub_none)
+		    continue;
+
+		  /* __tls_get_addr calls might be eliminated.  */
+		  if (stub_type != ppc_stub_plt_call
+		      && hash != NULL
+		      && (hash == htab->tls_get_addr
+			  || hash == htab->tls_get_addr_fd)
+		      && section->has_tls_reloc
+		      && irela != internal_relocs)
+		    {
+		      /* Get tls info.  */
+		      unsigned char *tls_mask;
+
+		      if (!get_tls_mask (&tls_mask, NULL, NULL, &local_syms,
+					 irela - 1, input_bfd))
+			goto error_ret_free_internal;
+		      if (*tls_mask != 0)
+			continue;
+		    }
+
+		  if (stub_type == ppc_stub_plt_call
+		      && irela + 1 < irelaend
+		      && irela[1].r_offset == irela->r_offset + 4
+		      && ELF64_R_TYPE (irela[1].r_info) == R_PPC64_TOCSAVE
+		      && !tocsave_find (htab, INSERT,
+					&local_syms, irela + 1, input_bfd))
+		    goto error_ret_free_internal;
+
+		  /* Support for grouping stub sections.  */
+		  id_sec = htab->stub_group[section->id].link_sec;
+
+		  /* Get the name of this stub.  */
+		  stub_name = ppc_stub_name (id_sec, sym_sec, hash, irela);
+		  if (!stub_name)
+		    goto error_ret_free_internal;
+
+		  stub_entry = ppc_stub_hash_lookup (&htab->stub_hash_table,
+						     stub_name, FALSE, FALSE);
+		  if (stub_entry != NULL)
+		    {
+		      /* The proper stub has already been created.  */
+		      free (stub_name);
+		      continue;
+		    }
+
+		  stub_entry = ppc_add_stub (stub_name, section, info);
+		  if (stub_entry == NULL)
+		    {
+		      free (stub_name);
+		    error_ret_free_internal:
+		      if (elf_section_data (section)->relocs == NULL)
+			free (internal_relocs);
+		    error_ret_free_local:
+		      if (local_syms != NULL
+			  && (symtab_hdr->contents
+			      != (unsigned char *) local_syms))
+			free (local_syms);
+		      return FALSE;
+		    }
+
+		  stub_entry->stub_type = stub_type;
+		  if (stub_type != ppc_stub_plt_call)
+		    {
+		      stub_entry->target_value = code_value;
+		      stub_entry->target_section = code_sec;
+		    }
+		  else
+		    {
+		      stub_entry->target_value = sym_value;
+		      stub_entry->target_section = sym_sec;
+		    }
+		  stub_entry->h = hash;
+		  stub_entry->plt_ent = plt_ent;
+		  stub_entry->addend = irela->r_addend;
+
+		  if (stub_entry->h != NULL)
+		    htab->stub_globals += 1;
+		}
+
+	      /* We're done with the internal relocs, free them.  */
+	      if (elf_section_data (section)->relocs != internal_relocs)
+		free (internal_relocs);
+	    }
+
+	  if (local_syms != NULL
+	      && symtab_hdr->contents != (unsigned char *) local_syms)
+	    {
+	      if (!info->keep_memory)
+		free (local_syms);
+	      else
+		symtab_hdr->contents = (unsigned char *) local_syms;
+	    }
+	}
+
+      /* We may have added some stubs.  Find out the new size of the
+	 stub sections.  */
+      for (stub_sec = htab->stub_bfd->sections;
+	   stub_sec != NULL;
+	   stub_sec = stub_sec->next)
+	if ((stub_sec->flags & SEC_LINKER_CREATED) == 0)
+	  {
+	    stub_sec->rawsize = stub_sec->size;
+	    stub_sec->size = 0;
+	    stub_sec->reloc_count = 0;
+	    stub_sec->flags &= ~SEC_RELOC;
+	  }
+
+      htab->brlt->size = 0;
+      htab->brlt->reloc_count = 0;
+      htab->brlt->flags &= ~SEC_RELOC;
+      if (htab->relbrlt != NULL)
+	htab->relbrlt->size = 0;
+
+      bfd_hash_traverse (&htab->stub_hash_table, ppc_size_one_stub, info);
+
+      if (info->emitrelocations
+	  && htab->glink != NULL && htab->glink->size != 0)
+	{
+	  htab->glink->reloc_count = 1;
+	  htab->glink->flags |= SEC_RELOC;
+	}
+
+      if (htab->glink_eh_frame != NULL
+	  && !bfd_is_abs_section (htab->glink_eh_frame->output_section)
+	  && (htab->glink_eh_frame->flags & SEC_EXCLUDE) == 0)
+	{
+	  bfd_size_type size = 0;
+
+	  for (stub_sec = htab->stub_bfd->sections;
+	       stub_sec != NULL;
+	       stub_sec = stub_sec->next)
+	    if ((stub_sec->flags & SEC_LINKER_CREATED) == 0)
+	      size += 20;
+	  if (htab->glink != NULL && htab->glink->size != 0)
+	    size += 24;
+	  if (size != 0)
+	    size += sizeof (glink_eh_frame_cie);
+	  htab->glink_eh_frame->rawsize = htab->glink_eh_frame->size;
+	  htab->glink_eh_frame->size = size;
+	}
+
+      for (stub_sec = htab->stub_bfd->sections;
+	   stub_sec != NULL;
+	   stub_sec = stub_sec->next)
+	if ((stub_sec->flags & SEC_LINKER_CREATED) == 0
+	    && stub_sec->rawsize != stub_sec->size)
+	  break;
+
+      /* Exit from this loop when no stubs have been added, and no stubs
+	 have changed size.  */
+      if (stub_sec == NULL
+	  && (htab->glink_eh_frame == NULL
+	      || htab->glink_eh_frame->rawsize == htab->glink_eh_frame->size))
+	break;
+
+      /* Ask the linker to do its stuff.  */
+      (*htab->layout_sections_again) ();
+    }
+
+  maybe_strip_output (info, htab->brlt);
+  if (htab->glink_eh_frame != NULL)
+    maybe_strip_output (info, htab->glink_eh_frame);
+
+  return TRUE;
+}
+
+/* Called after we have determined section placement.  If sections
+   move, we'll be called again.  Provide a value for TOCstart.  */
+
+bfd_vma
+ppc64_elf_toc (bfd *obfd)
+{
+  asection *s;
+  bfd_vma TOCstart;
+
+  /* The TOC consists of sections .got, .toc, .tocbss, .plt in that
+     order.  The TOC starts where the first of these sections starts.  */
+  s = bfd_get_section_by_name (obfd, ".got");
+  if (s == NULL || (s->flags & SEC_EXCLUDE) != 0)
+    s = bfd_get_section_by_name (obfd, ".toc");
+  if (s == NULL || (s->flags & SEC_EXCLUDE) != 0)
+    s = bfd_get_section_by_name (obfd, ".tocbss");
+  if (s == NULL || (s->flags & SEC_EXCLUDE) != 0)
+    s = bfd_get_section_by_name (obfd, ".plt");
+  if (s == NULL || (s->flags & SEC_EXCLUDE) != 0)
+    {
+      /* This may happen for
+	 o  references to TOC base (SYM@toc / TOC[tc0]) without a
+	 .toc directive
+	 o  bad linker script
+	 o --gc-sections and empty TOC sections
+
+	 FIXME: Warn user?  */
+
+      /* Look for a likely section.  We probably won't even be
+	 using TOCstart.  */
+      for (s = obfd->sections; s != NULL; s = s->next)
+	if ((s->flags & (SEC_ALLOC | SEC_SMALL_DATA | SEC_READONLY
+			 | SEC_EXCLUDE))
+	    == (SEC_ALLOC | SEC_SMALL_DATA))
+	  break;
+      if (s == NULL)
+	for (s = obfd->sections; s != NULL; s = s->next)
+	  if ((s->flags & (SEC_ALLOC | SEC_SMALL_DATA | SEC_EXCLUDE))
+	      == (SEC_ALLOC | SEC_SMALL_DATA))
+	    break;
+      if (s == NULL)
+	for (s = obfd->sections; s != NULL; s = s->next)
+	  if ((s->flags & (SEC_ALLOC | SEC_READONLY | SEC_EXCLUDE))
+	      == SEC_ALLOC)
+	    break;
+      if (s == NULL)
+	for (s = obfd->sections; s != NULL; s = s->next)
+	  if ((s->flags & (SEC_ALLOC | SEC_EXCLUDE)) == SEC_ALLOC)
+	    break;
+    }
+
+  TOCstart = 0;
+  if (s != NULL)
+    TOCstart = s->output_section->vma + s->output_offset;
+
+  return TOCstart;
+}
+
+/* Build all the stubs associated with the current output file.
+   The stubs are kept in a hash table attached to the main linker
+   hash table.  This function is called via gldelf64ppc_finish.  */
+
+bfd_boolean
+ppc64_elf_build_stubs (bfd_boolean emit_stub_syms,
+		       struct bfd_link_info *info,
+		       char **stats)
+{
+  struct ppc_link_hash_table *htab = ppc_hash_table (info);
+  asection *stub_sec;
+  bfd_byte *p;
+  int stub_sec_count = 0;
+
+  if (htab == NULL)
+    return FALSE;
+
+  htab->emit_stub_syms = emit_stub_syms;
+
+  /* Allocate memory to hold the linker stubs.  */
+  for (stub_sec = htab->stub_bfd->sections;
+       stub_sec != NULL;
+       stub_sec = stub_sec->next)
+    if ((stub_sec->flags & SEC_LINKER_CREATED) == 0
+	&& stub_sec->size != 0)
+      {
+	stub_sec->contents = bfd_zalloc (htab->stub_bfd, stub_sec->size);
+	if (stub_sec->contents == NULL)
+	  return FALSE;
+	/* We want to check that built size is the same as calculated
+	   size.  rawsize is a convenient location to use.  */
+	stub_sec->rawsize = stub_sec->size;
+	stub_sec->size = 0;
+      }
+
+  if (htab->glink != NULL && htab->glink->size != 0)
+    {
+      unsigned int indx;
+      bfd_vma plt0;
+
+      /* Build the .glink plt call stub.  */
+      if (htab->emit_stub_syms)
+	{
+	  struct elf_link_hash_entry *h;
+	  h = elf_link_hash_lookup (&htab->elf, "__glink_PLTresolve",
+				    TRUE, FALSE, FALSE);
+	  if (h == NULL)
+	    return FALSE;
+	  if (h->root.type == bfd_link_hash_new)
+	    {
+	      h->root.type = bfd_link_hash_defined;
+	      h->root.u.def.section = htab->glink;
+	      h->root.u.def.value = 8;
+	      h->ref_regular = 1;
+	      h->def_regular = 1;
+	      h->ref_regular_nonweak = 1;
+	      h->forced_local = 1;
+	      h->non_elf = 0;
+	    }
+	}
+      plt0 = htab->plt->output_section->vma + htab->plt->output_offset - 16;
+      if (info->emitrelocations)
+	{
+	  Elf_Internal_Rela *r = get_relocs (htab->glink, 1);
+	  if (r == NULL)
+	    return FALSE;
+	  r->r_offset = (htab->glink->output_offset
+			 + htab->glink->output_section->vma);
+	  r->r_info = ELF64_R_INFO (0, R_PPC64_REL64);
+	  r->r_addend = plt0;
+	}
+      p = htab->glink->contents;
+      plt0 -= htab->glink->output_section->vma + htab->glink->output_offset;
+      bfd_put_64 (htab->glink->owner, plt0, p);
+      p += 8;
+      bfd_put_32 (htab->glink->owner, MFLR_R12, p);
+      p += 4;
+      bfd_put_32 (htab->glink->owner, BCL_20_31, p);
+      p += 4;
+      bfd_put_32 (htab->glink->owner, MFLR_R11, p);
+      p += 4;
+      bfd_put_32 (htab->glink->owner, LD_R2_M16R11, p);
+      p += 4;
+      bfd_put_32 (htab->glink->owner, MTLR_R12, p);
+      p += 4;
+      bfd_put_32 (htab->glink->owner, ADD_R12_R2_R11, p);
+      p += 4;
+      bfd_put_32 (htab->glink->owner, LD_R11_0R12, p);
+      p += 4;
+      bfd_put_32 (htab->glink->owner, LD_R2_0R12 | 8, p);
+      p += 4;
+      bfd_put_32 (htab->glink->owner, MTCTR_R11, p);
+      p += 4;
+      bfd_put_32 (htab->glink->owner, LD_R11_0R12 | 16, p);
+      p += 4;
+      bfd_put_32 (htab->glink->owner, BCTR, p);
+      p += 4;
+      while (p - htab->glink->contents < GLINK_CALL_STUB_SIZE)
+	{
+	  bfd_put_32 (htab->glink->owner, NOP, p);
+	  p += 4;
+	}
+
+      /* Build the .glink lazy link call stubs.  */
+      indx = 0;
+      while (p < htab->glink->contents + htab->glink->size)
+	{
+	  if (indx < 0x8000)
+	    {
+	      bfd_put_32 (htab->glink->owner, LI_R0_0 | indx, p);
+	      p += 4;
+	    }
+	  else
+	    {
+	      bfd_put_32 (htab->glink->owner, LIS_R0_0 | PPC_HI (indx), p);
+	      p += 4;
+	      bfd_put_32 (htab->glink->owner, ORI_R0_R0_0 | PPC_LO (indx), p);
+	      p += 4;
+	    }
+	  bfd_put_32 (htab->glink->owner,
+		      B_DOT | ((htab->glink->contents - p + 8) & 0x3fffffc), p);
+	  indx++;
+	  p += 4;
+	}
+      htab->glink->rawsize = p - htab->glink->contents;
+    }
+
+  if (htab->brlt->size != 0)
+    {
+      htab->brlt->contents = bfd_zalloc (htab->brlt->owner,
+					 htab->brlt->size);
+      if (htab->brlt->contents == NULL)
+	return FALSE;
+    }
+  if (htab->relbrlt != NULL && htab->relbrlt->size != 0)
+    {
+      htab->relbrlt->contents = bfd_zalloc (htab->relbrlt->owner,
+					    htab->relbrlt->size);
+      if (htab->relbrlt->contents == NULL)
+	return FALSE;
+    }
+
+  if (htab->glink_eh_frame != NULL
+      && htab->glink_eh_frame->size != 0)
+    {
+      bfd_vma val;
+
+      p = bfd_zalloc (htab->glink_eh_frame->owner, htab->glink_eh_frame->size);
+      if (p == NULL)
+	return FALSE;
+      htab->glink_eh_frame->contents = p;
+
+      htab->glink_eh_frame->rawsize = htab->glink_eh_frame->size;
+
+      memcpy (p, glink_eh_frame_cie, sizeof (glink_eh_frame_cie));
+      /* CIE length (rewrite in case little-endian).  */
+      bfd_put_32 (htab->elf.dynobj, sizeof (glink_eh_frame_cie) - 4, p);
+      p += sizeof (glink_eh_frame_cie);
+
+      for (stub_sec = htab->stub_bfd->sections;
+	   stub_sec != NULL;
+	   stub_sec = stub_sec->next)
+	if ((stub_sec->flags & SEC_LINKER_CREATED) == 0)
+	  {
+	    /* FDE length.  */
+	    bfd_put_32 (htab->elf.dynobj, 16, p);
+	    p += 4;
+	    /* CIE pointer.  */
+	    val = p - htab->glink_eh_frame->contents;
+	    bfd_put_32 (htab->elf.dynobj, val, p);
+	    p += 4;
+	    /* Offset to stub section.  */
+	    val = (stub_sec->output_section->vma
+		   + stub_sec->output_offset);
+	    val -= (htab->glink_eh_frame->output_section->vma
+		    + htab->glink_eh_frame->output_offset);
+	    val -= p - htab->glink_eh_frame->contents;
+	    if (val + 0x80000000 > 0xffffffff)
+	      {
+		info->callbacks->einfo
+		  (_("%P: %s offset too large for .eh_frame sdata4 encoding"),
+		   stub_sec->name);
+		return FALSE;
+	      }
+	    bfd_put_32 (htab->elf.dynobj, val, p);
+	    p += 4;
+	    /* stub section size.  */
+	    bfd_put_32 (htab->elf.dynobj, stub_sec->rawsize, p);
+	    p += 4;
+	    /* Augmentation.  */
+	    p += 1;
+	    /* Pad.  */
+	    p += 3;
+	  }
+      if (htab->glink != NULL && htab->glink->size != 0)
+	{
+	  /* FDE length.  */
+	  bfd_put_32 (htab->elf.dynobj, 20, p);
+	  p += 4;
+	  /* CIE pointer.  */
+	  val = p - htab->glink_eh_frame->contents;
+	  bfd_put_32 (htab->elf.dynobj, val, p);
+	  p += 4;
+	  /* Offset to .glink.  */
+	  val = (htab->glink->output_section->vma
+		 + htab->glink->output_offset
+		 + 8);
+	  val -= (htab->glink_eh_frame->output_section->vma
+		  + htab->glink_eh_frame->output_offset);
+	  val -= p - htab->glink_eh_frame->contents;
+	  if (val + 0x80000000 > 0xffffffff)
+	    {
+	      info->callbacks->einfo
+		(_("%P: %s offset too large for .eh_frame sdata4 encoding"),
+		 htab->glink->name);
+	      return FALSE;
+	    }
+	  bfd_put_32 (htab->elf.dynobj, val, p);
+	  p += 4;
+	  /* .glink size.  */
+	  bfd_put_32 (htab->elf.dynobj, htab->glink->rawsize - 8, p);
+	  p += 4;
+	  /* Augmentation.  */
+	  p += 1;
+
+	  *p++ = DW_CFA_advance_loc + 1;
+	  *p++ = DW_CFA_register;
+	  *p++ = 65;
+	  *p++ = 12;
+	  *p++ = DW_CFA_advance_loc + 4;
+	  *p++ = DW_CFA_restore_extended;
+	  *p++ = 65;
+	}
+      htab->glink_eh_frame->size = p - htab->glink_eh_frame->contents;
+    }
+
+  /* Build the stubs as directed by the stub hash table.  */
+  bfd_hash_traverse (&htab->stub_hash_table, ppc_build_one_stub, info);
+
+  if (htab->relbrlt != NULL)
+    htab->relbrlt->reloc_count = 0;
+
+  for (stub_sec = htab->stub_bfd->sections;
+       stub_sec != NULL;
+       stub_sec = stub_sec->next)
+    if ((stub_sec->flags & SEC_LINKER_CREATED) == 0)
+      {
+	stub_sec_count += 1;
+	if (stub_sec->rawsize != stub_sec->size)
+	  break;
+      }
+
+  if (stub_sec != NULL
+      || htab->glink->rawsize != htab->glink->size
+      || (htab->glink_eh_frame != NULL
+	  && htab->glink_eh_frame->rawsize != htab->glink_eh_frame->size))
+    {
+      htab->stub_error = TRUE;
+      info->callbacks->einfo (_("%P: stubs don't match calculated size\n"));
+    }
+
+  if (htab->stub_error)
+    return FALSE;
+
+  if (stats != NULL)
+    {
+      *stats = bfd_malloc (500);
+      if (*stats == NULL)
+	return FALSE;
+
+      sprintf (*stats, _("linker stubs in %u group%s\n"
+			 "  branch       %lu\n"
+			 "  toc adjust   %lu\n"
+			 "  long branch  %lu\n"
+			 "  long toc adj %lu\n"
+			 "  plt call     %lu"),
+	       stub_sec_count,
+	       stub_sec_count == 1 ? "" : "s",
+	       htab->stub_count[ppc_stub_long_branch - 1],
+	       htab->stub_count[ppc_stub_long_branch_r2off - 1],
+	       htab->stub_count[ppc_stub_plt_branch - 1],
+	       htab->stub_count[ppc_stub_plt_branch_r2off - 1],
+	       htab->stub_count[ppc_stub_plt_call - 1]);
+    }
+  return TRUE;
+}
+
+/* This function undoes the changes made by add_symbol_adjust.  */
+
+static bfd_boolean
+undo_symbol_twiddle (struct elf_link_hash_entry *h, void *inf ATTRIBUTE_UNUSED)
+{
+  struct ppc_link_hash_entry *eh;
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  eh = (struct ppc_link_hash_entry *) h;
+  if (eh->elf.root.type != bfd_link_hash_undefweak || !eh->was_undefined)
+    return TRUE;
+
+  eh->elf.root.type = bfd_link_hash_undefined;
+  return TRUE;
+}
+
+void
+ppc64_elf_restore_symbols (struct bfd_link_info *info)
+{
+  struct ppc_link_hash_table *htab = ppc_hash_table (info);
+
+  if (htab != NULL)
+    elf_link_hash_traverse (&htab->elf, undo_symbol_twiddle, info);
+}
+
+/* What to do when ld finds relocations against symbols defined in
+   discarded sections.  */
+
+static unsigned int
+ppc64_elf_action_discarded (asection *sec)
+{
+  if (strcmp (".opd", sec->name) == 0)
+    return 0;
+
+  if (strcmp (".toc", sec->name) == 0)
+    return 0;
+
+  if (strcmp (".toc1", sec->name) == 0)
+    return 0;
+
+  return _bfd_elf_default_action_discarded (sec);
+}
+
+/* The RELOCATE_SECTION function is called by the ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures; if the section
+   actually uses Rel structures, the r_addend field will always be
+   zero.
+
+   This function is responsible for adjust the section contents as
+   necessary, and (if using Rela relocs and generating a
+   relocatable output file) adjusting the reloc addend as
+   necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.  */
+
+static bfd_boolean
+ppc64_elf_relocate_section (bfd *output_bfd,
+			    struct bfd_link_info *info,
+			    bfd *input_bfd,
+			    asection *input_section,
+			    bfd_byte *contents,
+			    Elf_Internal_Rela *relocs,
+			    Elf_Internal_Sym *local_syms,
+			    asection **local_sections)
+{
+  struct ppc_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  Elf_Internal_Rela outrel;
+  bfd_byte *loc;
+  struct got_entry **local_got_ents;
+  bfd_vma TOCstart;
+  bfd_boolean ret = TRUE;
+  bfd_boolean is_opd;
+  /* Disabled until we sort out how ld should choose 'y' vs 'at'.  */
+  bfd_boolean is_power4 = FALSE;
+  bfd_vma d_offset = (bfd_big_endian (output_bfd) ? 2 : 0);
+
+  /* Initialize howto table if needed.  */
+  if (!ppc64_elf_howto_table[R_PPC64_ADDR32])
+    ppc_howto_init ();
+
+  htab = ppc_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* Don't relocate stub sections.  */
+  if (input_section->owner == htab->stub_bfd)
+    return TRUE;
+
+  BFD_ASSERT (is_ppc64_elf (input_bfd));
+
+  local_got_ents = elf_local_got_ents (input_bfd);
+  TOCstart = elf_gp (output_bfd);
+  symtab_hdr = &elf_symtab_hdr (input_bfd);
+  sym_hashes = elf_sym_hashes (input_bfd);
+  is_opd = ppc64_elf_section_data (input_section)->sec_type == sec_opd;
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      enum elf_ppc64_reloc_type r_type;
+      bfd_vma addend, orig_addend;
+      bfd_reloc_status_type r;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h_elf;
+      struct ppc_link_hash_entry *h;
+      struct ppc_link_hash_entry *fdh;
+      const char *sym_name;
+      unsigned long r_symndx, toc_symndx;
+      bfd_vma toc_addend;
+      unsigned char tls_mask, tls_gd, tls_type;
+      unsigned char sym_type;
+      bfd_vma relocation;
+      bfd_boolean unresolved_reloc;
+      bfd_boolean warned;
+      unsigned int insn;
+      unsigned int mask;
+      struct ppc_stub_hash_entry *stub_entry;
+      bfd_vma max_br_offset;
+      bfd_vma from;
+
+      r_type = ELF64_R_TYPE (rel->r_info);
+      r_symndx = ELF64_R_SYM (rel->r_info);
+
+      /* For old style R_PPC64_TOC relocs with a zero symbol, use the
+	 symbol of the previous ADDR64 reloc.  The symbol gives us the
+	 proper TOC base to use.  */
+      if (rel->r_info == ELF64_R_INFO (0, R_PPC64_TOC)
+	  && rel != relocs
+	  && ELF64_R_TYPE (rel[-1].r_info) == R_PPC64_ADDR64
+	  && is_opd)
+	r_symndx = ELF64_R_SYM (rel[-1].r_info);
+
+      sym = NULL;
+      sec = NULL;
+      h_elf = NULL;
+      sym_name = NULL;
+      unresolved_reloc = FALSE;
+      warned = FALSE;
+      orig_addend = rel->r_addend;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  /* It's a local symbol.  */
+	  struct _opd_sec_data *opd;
+
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  sym_name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym, sec);
+	  sym_type = ELF64_ST_TYPE (sym->st_info);
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	  opd = get_opd_info (sec);
+	  if (opd != NULL && opd->adjust != NULL)
+	    {
+	      long adjust = opd->adjust[(sym->st_value + rel->r_addend) / 8];
+	      if (adjust == -1)
+		relocation = 0;
+	      else
+		{
+		  /* If this is a relocation against the opd section sym
+		     and we have edited .opd, adjust the reloc addend so
+		     that ld -r and ld --emit-relocs output is correct.
+		     If it is a reloc against some other .opd symbol,
+		     then the symbol value will be adjusted later.  */
+		  if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+		    rel->r_addend += adjust;
+		  else
+		    relocation += adjust;
+		}
+	    }
+	}
+      else
+	{
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h_elf, sec, relocation,
+				   unresolved_reloc, warned);
+	  sym_name = h_elf->root.root.string;
+	  sym_type = h_elf->type;
+	}
+      h = (struct ppc_link_hash_entry *) h_elf;
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend,
+					 ppc64_elf_howto_table[r_type],
+					 contents);
+
+      if (info->relocatable)
+	continue;
+
+      /* TLS optimizations.  Replace instruction sequences and relocs
+	 based on information we collected in tls_optimize.  We edit
+	 RELOCS so that --emit-relocs will output something sensible
+	 for the final instruction stream.  */
+      tls_mask = 0;
+      tls_gd = 0;
+      toc_symndx = 0;
+      if (h != NULL)
+	tls_mask = h->tls_mask;
+      else if (local_got_ents != NULL)
+	{
+	  struct plt_entry **local_plt = (struct plt_entry **)
+	    (local_got_ents + symtab_hdr->sh_info);
+	  unsigned char *lgot_masks = (unsigned char *)
+	    (local_plt + symtab_hdr->sh_info);
+	  tls_mask = lgot_masks[r_symndx];
+	}
+      if (tls_mask == 0
+	  && (r_type == R_PPC64_TLS
+	      || r_type == R_PPC64_TLSGD
+	      || r_type == R_PPC64_TLSLD))
+	{
+	  /* Check for toc tls entries.  */
+	  unsigned char *toc_tls;
+
+	  if (!get_tls_mask (&toc_tls, &toc_symndx, &toc_addend,
+			     &local_syms, rel, input_bfd))
+	    return FALSE;
+
+	  if (toc_tls)
+	    tls_mask = *toc_tls;
+	}
+
+      /* Check that tls relocs are used with tls syms, and non-tls
+	 relocs are used with non-tls syms.  */
+      if (r_symndx != STN_UNDEF
+	  && r_type != R_PPC64_NONE
+	  && (h == NULL
+	      || h->elf.root.type == bfd_link_hash_defined
+	      || h->elf.root.type == bfd_link_hash_defweak)
+	  && (IS_PPC64_TLS_RELOC (r_type)
+	      != (sym_type == STT_TLS
+		  || (sym_type == STT_SECTION
+		      && (sec->flags & SEC_THREAD_LOCAL) != 0))))
+	{
+	  if (tls_mask != 0
+	      && (r_type == R_PPC64_TLS
+		  || r_type == R_PPC64_TLSGD
+		  || r_type == R_PPC64_TLSLD))
+	    /* R_PPC64_TLS is OK against a symbol in the TOC.  */
+	    ;
+	  else
+	    info->callbacks->einfo
+	      (!IS_PPC64_TLS_RELOC (r_type)
+	       ? _("%P: %H: %s used with TLS symbol %s\n")
+	       : _("%P: %H: %s used with non-TLS symbol %s\n"),
+	       input_bfd, input_section, rel->r_offset,
+	       ppc64_elf_howto_table[r_type]->name,
+	       sym_name);
+	}
+
+      /* Ensure reloc mapping code below stays sane.  */
+      if (R_PPC64_TOC16_LO_DS != R_PPC64_TOC16_DS + 1
+	  || R_PPC64_TOC16_LO != R_PPC64_TOC16 + 1
+	  || (R_PPC64_GOT_TLSLD16 & 3)    != (R_PPC64_GOT_TLSGD16 & 3)
+	  || (R_PPC64_GOT_TLSLD16_LO & 3) != (R_PPC64_GOT_TLSGD16_LO & 3)
+	  || (R_PPC64_GOT_TLSLD16_HI & 3) != (R_PPC64_GOT_TLSGD16_HI & 3)
+	  || (R_PPC64_GOT_TLSLD16_HA & 3) != (R_PPC64_GOT_TLSGD16_HA & 3)
+	  || (R_PPC64_GOT_TLSLD16 & 3)    != (R_PPC64_GOT_TPREL16_DS & 3)
+	  || (R_PPC64_GOT_TLSLD16_LO & 3) != (R_PPC64_GOT_TPREL16_LO_DS & 3)
+	  || (R_PPC64_GOT_TLSLD16_HI & 3) != (R_PPC64_GOT_TPREL16_HI & 3)
+	  || (R_PPC64_GOT_TLSLD16_HA & 3) != (R_PPC64_GOT_TPREL16_HA & 3))
+	abort ();
+
+      switch (r_type)
+	{
+	default:
+	  break;
+
+	case R_PPC64_LO_DS_OPT:
+	  insn = bfd_get_32 (output_bfd, contents + rel->r_offset - d_offset);
+	  if ((insn & (0x3f << 26)) != 58u << 26)
+	    abort ();
+	  insn += (14u << 26) - (58u << 26);
+	  bfd_put_32 (output_bfd, insn, contents + rel->r_offset - d_offset);
+	  r_type = R_PPC64_TOC16_LO;
+	  rel->r_info = ELF64_R_INFO (r_symndx, r_type);
+	  break;
+
+	case R_PPC64_TOC16:
+	case R_PPC64_TOC16_LO:
+	case R_PPC64_TOC16_DS:
+	case R_PPC64_TOC16_LO_DS:
+	  {
+	    /* Check for toc tls entries.  */
+	    unsigned char *toc_tls;
+	    int retval;
+
+	    retval = get_tls_mask (&toc_tls, &toc_symndx, &toc_addend,
+				   &local_syms, rel, input_bfd);
+	    if (retval == 0)
+	      return FALSE;
+
+	    if (toc_tls)
+	      {
+		tls_mask = *toc_tls;
+		if (r_type == R_PPC64_TOC16_DS
+		    || r_type == R_PPC64_TOC16_LO_DS)
+		  {
+		    if (tls_mask != 0
+			&& (tls_mask & (TLS_DTPREL | TLS_TPREL)) == 0)
+		      goto toctprel;
+		  }
+		else
+		  {
+		    /* If we found a GD reloc pair, then we might be
+		       doing a GD->IE transition.  */
+		    if (retval == 2)
+		      {
+			tls_gd = TLS_TPRELGD;
+			if (tls_mask != 0 && (tls_mask & TLS_GD) == 0)
+			  goto tls_ldgd_opt;
+		      }
+		    else if (retval == 3)
+		      {
+			if (tls_mask != 0 && (tls_mask & TLS_LD) == 0)
+			  goto tls_ldgd_opt;
+		      }
+		  }
+	      }
+	  }
+	  break;
+
+	case R_PPC64_GOT_TPREL16_HI:
+	case R_PPC64_GOT_TPREL16_HA:
+	  if (tls_mask != 0
+	      && (tls_mask & TLS_TPREL) == 0)
+	    {
+	      rel->r_offset -= d_offset;
+	      bfd_put_32 (output_bfd, NOP, contents + rel->r_offset);
+	      r_type = R_PPC64_NONE;
+	      rel->r_info = ELF64_R_INFO (r_symndx, r_type);
+	    }
+	  break;
+
+	case R_PPC64_GOT_TPREL16_DS:
+	case R_PPC64_GOT_TPREL16_LO_DS:
+	  if (tls_mask != 0
+	      && (tls_mask & TLS_TPREL) == 0)
+	    {
+	    toctprel:
+	      insn = bfd_get_32 (output_bfd, contents + rel->r_offset - d_offset);
+	      insn &= 31 << 21;
+	      insn |= 0x3c0d0000;	/* addis 0,13,0 */
+	      bfd_put_32 (output_bfd, insn, contents + rel->r_offset - d_offset);
+	      r_type = R_PPC64_TPREL16_HA;
+	      if (toc_symndx != 0)
+		{
+		  rel->r_info = ELF64_R_INFO (toc_symndx, r_type);
+		  rel->r_addend = toc_addend;
+		  /* We changed the symbol.  Start over in order to
+		     get h, sym, sec etc. right.  */
+		  rel--;
+		  continue;
+		}
+	      else
+		rel->r_info = ELF64_R_INFO (r_symndx, r_type);
+	    }
+	  break;
+
+	case R_PPC64_TLS:
+	  if (tls_mask != 0
+	      && (tls_mask & TLS_TPREL) == 0)
+	    {
+	      insn = bfd_get_32 (output_bfd, contents + rel->r_offset);
+	      insn = _bfd_elf_ppc_at_tls_transform (insn, 13);
+	      if (insn == 0)
+		abort ();
+	      bfd_put_32 (output_bfd, insn, contents + rel->r_offset);
+	      /* Was PPC64_TLS which sits on insn boundary, now
+		 PPC64_TPREL16_LO which is at low-order half-word.  */
+	      rel->r_offset += d_offset;
+	      r_type = R_PPC64_TPREL16_LO;
+	      if (toc_symndx != 0)
+		{
+		  rel->r_info = ELF64_R_INFO (toc_symndx, r_type);
+		  rel->r_addend = toc_addend;
+		  /* We changed the symbol.  Start over in order to
+		     get h, sym, sec etc. right.  */
+		  rel--;
+		  continue;
+		}
+	      else
+		rel->r_info = ELF64_R_INFO (r_symndx, r_type);
+	    }
+	  break;
+
+	case R_PPC64_GOT_TLSGD16_HI:
+	case R_PPC64_GOT_TLSGD16_HA:
+	  tls_gd = TLS_TPRELGD;
+	  if (tls_mask != 0 && (tls_mask & TLS_GD) == 0)
+	    goto tls_gdld_hi;
+	  break;
+
+	case R_PPC64_GOT_TLSLD16_HI:
+	case R_PPC64_GOT_TLSLD16_HA:
+	  if (tls_mask != 0 && (tls_mask & TLS_LD) == 0)
+	    {
+	    tls_gdld_hi:
+	      if ((tls_mask & tls_gd) != 0)
+		r_type = (((r_type - (R_PPC64_GOT_TLSGD16 & 3)) & 3)
+			  + R_PPC64_GOT_TPREL16_DS);
+	      else
+		{
+		  rel->r_offset -= d_offset;
+		  bfd_put_32 (output_bfd, NOP, contents + rel->r_offset);
+		  r_type = R_PPC64_NONE;
+		}
+	      rel->r_info = ELF64_R_INFO (r_symndx, r_type);
+	    }
+	  break;
+
+	case R_PPC64_GOT_TLSGD16:
+	case R_PPC64_GOT_TLSGD16_LO:
+	  tls_gd = TLS_TPRELGD;
+	  if (tls_mask != 0 && (tls_mask & TLS_GD) == 0)
+	    goto tls_ldgd_opt;
+	  break;
+
+	case R_PPC64_GOT_TLSLD16:
+	case R_PPC64_GOT_TLSLD16_LO:
+	  if (tls_mask != 0 && (tls_mask & TLS_LD) == 0)
+	    {
+	      unsigned int insn1, insn2, insn3;
+	      bfd_vma offset;
+
+	    tls_ldgd_opt:
+	      offset = (bfd_vma) -1;
+	      /* If not using the newer R_PPC64_TLSGD/LD to mark
+		 __tls_get_addr calls, we must trust that the call
+		 stays with its arg setup insns, ie. that the next
+		 reloc is the __tls_get_addr call associated with
+		 the current reloc.  Edit both insns.  */
+	      if (input_section->has_tls_get_addr_call
+		  && rel + 1 < relend
+		  && branch_reloc_hash_match (input_bfd, rel + 1,
+					      htab->tls_get_addr,
+					      htab->tls_get_addr_fd))
+		offset = rel[1].r_offset;
+	      if ((tls_mask & tls_gd) != 0)
+		{
+		  /* IE */
+		  insn1 = bfd_get_32 (output_bfd,
+				      contents + rel->r_offset - d_offset);
+		  insn1 &= (1 << 26) - (1 << 2);
+		  insn1 |= 58 << 26;	/* ld */
+		  insn2 = 0x7c636a14;	/* add 3,3,13 */
+		  if (offset != (bfd_vma) -1)
+		    rel[1].r_info = ELF64_R_INFO (STN_UNDEF, R_PPC64_NONE);
+		  if ((tls_mask & TLS_EXPLICIT) == 0)
+		    r_type = (((r_type - (R_PPC64_GOT_TLSGD16 & 3)) & 3)
+			      + R_PPC64_GOT_TPREL16_DS);
+		  else
+		    r_type += R_PPC64_TOC16_DS - R_PPC64_TOC16;
+		  rel->r_info = ELF64_R_INFO (r_symndx, r_type);
+		}
+	      else
+		{
+		  /* LE */
+		  insn1 = 0x3c6d0000;	/* addis 3,13,0 */
+		  insn2 = 0x38630000;	/* addi 3,3,0 */
+		  if (tls_gd == 0)
+		    {
+		      /* Was an LD reloc.  */
+		      if (toc_symndx)
+			sec = local_sections[toc_symndx];
+		      for (r_symndx = 0;
+			   r_symndx < symtab_hdr->sh_info;
+			   r_symndx++)
+			if (local_sections[r_symndx] == sec)
+			  break;
+		      if (r_symndx >= symtab_hdr->sh_info)
+			r_symndx = STN_UNDEF;
+		      rel->r_addend = htab->elf.tls_sec->vma + DTP_OFFSET;
+		      if (r_symndx != STN_UNDEF)
+			rel->r_addend -= (local_syms[r_symndx].st_value
+					  + sec->output_offset
+					  + sec->output_section->vma);
+		    }
+		  else if (toc_symndx != 0)
+		    {
+		      r_symndx = toc_symndx;
+		      rel->r_addend = toc_addend;
+		    }
+		  r_type = R_PPC64_TPREL16_HA;
+		  rel->r_info = ELF64_R_INFO (r_symndx, r_type);
+		  if (offset != (bfd_vma) -1)
+		    {
+		      rel[1].r_info = ELF64_R_INFO (r_symndx,
+						    R_PPC64_TPREL16_LO);
+		      rel[1].r_offset = offset + d_offset;
+		      rel[1].r_addend = rel->r_addend;
+		    }
+		}
+	      bfd_put_32 (output_bfd, insn1,
+			  contents + rel->r_offset - d_offset);
+	      if (offset != (bfd_vma) -1)
+		{
+		  insn3 = bfd_get_32 (output_bfd,
+				      contents + offset + 4);
+		  if (insn3 == NOP
+		      || insn3 == CROR_151515 || insn3 == CROR_313131)
+		    {
+		      rel[1].r_offset += 4;
+		      bfd_put_32 (output_bfd, insn2, contents + offset + 4);
+		      insn2 = NOP;
+		    }
+		  bfd_put_32 (output_bfd, insn2, contents + offset);
+		}
+	      if ((tls_mask & tls_gd) == 0
+		  && (tls_gd == 0 || toc_symndx != 0))
+		{
+		  /* We changed the symbol.  Start over in order
+		     to get h, sym, sec etc. right.  */
+		  rel--;
+		  continue;
+		}
+	    }
+	  break;
+
+	case R_PPC64_TLSGD:
+	  if (tls_mask != 0 && (tls_mask & TLS_GD) == 0)
+	    {
+	      unsigned int insn2, insn3;
+	      bfd_vma offset = rel->r_offset;
+
+	      if ((tls_mask & TLS_TPRELGD) != 0)
+		{
+		  /* IE */
+		  r_type = R_PPC64_NONE;
+		  insn2 = 0x7c636a14;	/* add 3,3,13 */
+		}
+	      else
+		{
+		  /* LE */
+		  if (toc_symndx != 0)
+		    {
+		      r_symndx = toc_symndx;
+		      rel->r_addend = toc_addend;
+		    }
+		  r_type = R_PPC64_TPREL16_LO;
+		  rel->r_offset = offset + d_offset;
+		  insn2 = 0x38630000;	/* addi 3,3,0 */
+		}
+	      rel->r_info = ELF64_R_INFO (r_symndx, r_type);
+	      /* Zap the reloc on the _tls_get_addr call too.  */
+	      BFD_ASSERT (offset == rel[1].r_offset);
+	      rel[1].r_info = ELF64_R_INFO (STN_UNDEF, R_PPC64_NONE);
+	      insn3 = bfd_get_32 (output_bfd,
+				  contents + offset + 4);
+	      if (insn3 == NOP
+		  || insn3 == CROR_151515 || insn3 == CROR_313131)
+		{
+		  rel->r_offset += 4;
+		  bfd_put_32 (output_bfd, insn2, contents + offset + 4);
+		  insn2 = NOP;
+		}
+	      bfd_put_32 (output_bfd, insn2, contents + offset);
+	      if ((tls_mask & TLS_TPRELGD) == 0 && toc_symndx != 0)
+		{
+		  rel--;
+		  continue;
+		}
+	    }
+	  break;
+
+	case R_PPC64_TLSLD:
+	  if (tls_mask != 0 && (tls_mask & TLS_LD) == 0)
+	    {
+	      unsigned int insn2, insn3;
+	      bfd_vma offset = rel->r_offset;
+
+	      if (toc_symndx)
+		sec = local_sections[toc_symndx];
+	      for (r_symndx = 0;
+		   r_symndx < symtab_hdr->sh_info;
+		   r_symndx++)
+		if (local_sections[r_symndx] == sec)
+		  break;
+	      if (r_symndx >= symtab_hdr->sh_info)
+		r_symndx = STN_UNDEF;
+	      rel->r_addend = htab->elf.tls_sec->vma + DTP_OFFSET;
+	      if (r_symndx != STN_UNDEF)
+		rel->r_addend -= (local_syms[r_symndx].st_value
+				  + sec->output_offset
+				  + sec->output_section->vma);
+
+	      r_type = R_PPC64_TPREL16_LO;
+	      rel->r_info = ELF64_R_INFO (r_symndx, r_type);
+	      rel->r_offset = offset + d_offset;
+	      /* Zap the reloc on the _tls_get_addr call too.  */
+	      BFD_ASSERT (offset == rel[1].r_offset);
+	      rel[1].r_info = ELF64_R_INFO (STN_UNDEF, R_PPC64_NONE);
+	      insn2 = 0x38630000;	/* addi 3,3,0 */
+	      insn3 = bfd_get_32 (output_bfd,
+				  contents + offset + 4);
+	      if (insn3 == NOP
+		  || insn3 == CROR_151515 || insn3 == CROR_313131)
+		{
+		  rel->r_offset += 4;
+		  bfd_put_32 (output_bfd, insn2, contents + offset + 4);
+		  insn2 = NOP;
+		}
+	      bfd_put_32 (output_bfd, insn2, contents + offset);
+	      rel--;
+	      continue;
+	    }
+	  break;
+
+	case R_PPC64_DTPMOD64:
+	  if (rel + 1 < relend
+	      && rel[1].r_info == ELF64_R_INFO (r_symndx, R_PPC64_DTPREL64)
+	      && rel[1].r_offset == rel->r_offset + 8)
+	    {
+	      if ((tls_mask & TLS_GD) == 0)
+		{
+		  rel[1].r_info = ELF64_R_INFO (r_symndx, R_PPC64_NONE);
+		  if ((tls_mask & TLS_TPRELGD) != 0)
+		    r_type = R_PPC64_TPREL64;
+		  else
+		    {
+		      bfd_put_64 (output_bfd, 1, contents + rel->r_offset);
+		      r_type = R_PPC64_NONE;
+		    }
+		  rel->r_info = ELF64_R_INFO (r_symndx, r_type);
+		}
+	    }
+	  else
+	    {
+	      if ((tls_mask & TLS_LD) == 0)
+		{
+		  bfd_put_64 (output_bfd, 1, contents + rel->r_offset);
+		  r_type = R_PPC64_NONE;
+		  rel->r_info = ELF64_R_INFO (r_symndx, r_type);
+		}
+	    }
+	  break;
+
+	case R_PPC64_TPREL64:
+	  if ((tls_mask & TLS_TPREL) == 0)
+	    {
+	      r_type = R_PPC64_NONE;
+	      rel->r_info = ELF64_R_INFO (r_symndx, r_type);
+	    }
+	  break;
+	}
+
+      /* Handle other relocations that tweak non-addend part of insn.  */
+      insn = 0;
+      max_br_offset = 1 << 25;
+      addend = rel->r_addend;
+      switch (r_type)
+	{
+	default:
+	  break;
+
+	case R_PPC64_TOCSAVE:
+	  if (relocation + addend == (rel->r_offset
+				      + input_section->output_offset
+				      + input_section->output_section->vma)
+	      && tocsave_find (htab, NO_INSERT,
+			       &local_syms, rel, input_bfd))
+	    {
+	      insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+	      if (insn == NOP
+		  || insn == CROR_151515 || insn == CROR_313131)
+		bfd_put_32 (input_bfd, STD_R2_40R1,
+			    contents + rel->r_offset);
+	    }
+	  break;
+
+	  /* Branch taken prediction relocations.  */
+	case R_PPC64_ADDR14_BRTAKEN:
+	case R_PPC64_REL14_BRTAKEN:
+	  insn = 0x01 << 21; /* 'y' or 't' bit, lowest bit of BO field.  */
+	  /* Fall thru.  */
+
+	  /* Branch not taken prediction relocations.  */
+	case R_PPC64_ADDR14_BRNTAKEN:
+	case R_PPC64_REL14_BRNTAKEN:
+	  insn |= bfd_get_32 (output_bfd,
+			      contents + rel->r_offset) & ~(0x01 << 21);
+	  /* Fall thru.  */
+
+	case R_PPC64_REL14:
+	  max_br_offset = 1 << 15;
+	  /* Fall thru.  */
+
+	case R_PPC64_REL24:
+	  /* Calls to functions with a different TOC, such as calls to
+	     shared objects, need to alter the TOC pointer.  This is
+	     done using a linkage stub.  A REL24 branching to these
+	     linkage stubs needs to be followed by a nop, as the nop
+	     will be replaced with an instruction to restore the TOC
+	     base pointer.  */
+	  fdh = h;
+	  if (h != NULL
+	      && h->oh != NULL
+	      && h->oh->is_func_descriptor)
+	    fdh = ppc_follow_link (h->oh);
+	  stub_entry = ppc_get_stub_entry (input_section, sec, fdh, rel, htab);
+	  if (stub_entry != NULL
+	      && (stub_entry->stub_type == ppc_stub_plt_call
+		  || stub_entry->stub_type == ppc_stub_plt_branch_r2off
+		  || stub_entry->stub_type == ppc_stub_long_branch_r2off))
+	    {
+	      bfd_boolean can_plt_call = FALSE;
+
+	      if (rel->r_offset + 8 <= input_section->size)
+		{
+		  unsigned long nop;
+		  nop = bfd_get_32 (input_bfd, contents + rel->r_offset + 4);
+		  if (nop == NOP
+		      || nop == CROR_151515 || nop == CROR_313131)
+		    {
+		      if (h != NULL
+			  && (h == htab->tls_get_addr_fd
+			      || h == htab->tls_get_addr)
+			  && !htab->no_tls_get_addr_opt)
+			{
+			  /* Special stub used, leave nop alone.  */
+			}
+		      else
+			bfd_put_32 (input_bfd, LD_R2_40R1,
+				    contents + rel->r_offset + 4);
+		      can_plt_call = TRUE;
+		    }
+		}
+
+	      if (!can_plt_call)
+		{
+		  if (stub_entry->stub_type == ppc_stub_plt_call)
+		    {
+		      /* If this is a plain branch rather than a branch
+			 and link, don't require a nop.  However, don't
+			 allow tail calls in a shared library as they
+			 will result in r2 being corrupted.  */
+		      unsigned long br;
+		      br = bfd_get_32 (input_bfd, contents + rel->r_offset);
+		      if (info->executable && (br & 1) == 0)
+			can_plt_call = TRUE;
+		      else
+			stub_entry = NULL;
+		    }
+		  else if (h != NULL
+			   && strcmp (h->elf.root.root.string,
+				      ".__libc_start_main") == 0)
+		    {
+		      /* Allow crt1 branch to go via a toc adjusting stub.  */
+		      can_plt_call = TRUE;
+		    }
+		  else
+		    {
+		      if (strcmp (input_section->output_section->name,
+				  ".init") == 0
+			  || strcmp (input_section->output_section->name,
+				     ".fini") == 0)
+			info->callbacks->einfo
+			  (_("%P: %H: automatic multiple TOCs "
+			     "not supported using your crt files; "
+			     "recompile with -mminimal-toc or upgrade gcc\n"),
+			   input_bfd, input_section, rel->r_offset);
+		      else
+			info->callbacks->einfo
+			  (_("%P: %H: sibling call optimization to `%s' "
+			     "does not allow automatic multiple TOCs; "
+			     "recompile with -mminimal-toc or "
+			     "-fno-optimize-sibling-calls, "
+			     "or make `%s' extern\n"),
+			   input_bfd, input_section, rel->r_offset,
+			   sym_name,
+			   sym_name);
+		      bfd_set_error (bfd_error_bad_value);
+		      ret = FALSE;
+		    }
+		}
+
+	      if (can_plt_call
+		  && stub_entry->stub_type == ppc_stub_plt_call)
+		unresolved_reloc = FALSE;
+	    }
+
+	  if ((stub_entry == NULL
+	       || stub_entry->stub_type == ppc_stub_long_branch
+	       || stub_entry->stub_type == ppc_stub_plt_branch)
+	      && get_opd_info (sec) != NULL)
+	    {
+	      /* The branch destination is the value of the opd entry. */
+	      bfd_vma off = (relocation + addend
+			     - sec->output_section->vma
+			     - sec->output_offset);
+	      bfd_vma dest = opd_entry_value (sec, off, NULL, NULL);
+	      if (dest != (bfd_vma) -1)
+		{
+		  relocation = dest;
+		  addend = 0;
+		}
+	    }
+
+	  /* If the branch is out of reach we ought to have a long
+	     branch stub.  */
+	  from = (rel->r_offset
+		  + input_section->output_offset
+		  + input_section->output_section->vma);
+
+	  if (stub_entry != NULL
+	      && (stub_entry->stub_type == ppc_stub_long_branch
+		  || stub_entry->stub_type == ppc_stub_plt_branch)
+	      && (r_type == R_PPC64_ADDR14_BRTAKEN
+		  || r_type == R_PPC64_ADDR14_BRNTAKEN
+		  || (relocation + addend - from + max_br_offset
+		      < 2 * max_br_offset)))
+	    /* Don't use the stub if this branch is in range.  */
+	    stub_entry = NULL;
+
+	  if (stub_entry != NULL)
+	    {
+	      /* Munge up the value and addend so that we call the stub
+		 rather than the procedure directly.  */
+	      relocation = (stub_entry->stub_offset
+			    + stub_entry->stub_sec->output_offset
+			    + stub_entry->stub_sec->output_section->vma);
+	      addend = 0;
+
+ 	      if (stub_entry->stub_type == ppc_stub_plt_call
+		  && rel + 1 < relend
+		  && rel[1].r_offset == rel->r_offset + 4
+		  && ELF64_R_TYPE (rel[1].r_info) == R_PPC64_TOCSAVE)
+		relocation += 4;
+	    }
+
+	  if (insn != 0)
+	    {
+	      if (is_power4)
+		{
+		  /* Set 'a' bit.  This is 0b00010 in BO field for branch
+		     on CR(BI) insns (BO == 001at or 011at), and 0b01000
+		     for branch on CTR insns (BO == 1a00t or 1a01t).  */
+		  if ((insn & (0x14 << 21)) == (0x04 << 21))
+		    insn |= 0x02 << 21;
+		  else if ((insn & (0x14 << 21)) == (0x10 << 21))
+		    insn |= 0x08 << 21;
+		  else
+		    break;
+		}
+	      else
+		{
+		  /* Invert 'y' bit if not the default.  */
+		  if ((bfd_signed_vma) (relocation + addend - from) < 0)
+		    insn ^= 0x01 << 21;
+		}
+
+	      bfd_put_32 (output_bfd, insn, contents + rel->r_offset);
+	    }
+
+	  /* NOP out calls to undefined weak functions.
+	     We can thus call a weak function without first
+	     checking whether the function is defined.  */
+	  else if (h != NULL
+		   && h->elf.root.type == bfd_link_hash_undefweak
+		   && h->elf.dynindx == -1
+		   && r_type == R_PPC64_REL24
+		   && relocation == 0
+		   && addend == 0)
+	    {
+	      bfd_put_32 (output_bfd, NOP, contents + rel->r_offset);
+	      continue;
+	    }
+	  break;
+	}
+
+      /* Set `addend'.  */
+      tls_type = 0;
+      switch (r_type)
+	{
+	default:
+	  info->callbacks->einfo
+	    (_("%P: %B: unknown relocation type %d for symbol %s\n"),
+	     input_bfd, (int) r_type, sym_name);
+
+	  bfd_set_error (bfd_error_bad_value);
+	  ret = FALSE;
+	  continue;
+
+	case R_PPC64_NONE:
+	case R_PPC64_TLS:
+	case R_PPC64_TLSGD:
+	case R_PPC64_TLSLD:
+	case R_PPC64_TOCSAVE:
+	case R_PPC64_GNU_VTINHERIT:
+	case R_PPC64_GNU_VTENTRY:
+	  continue;
+
+	  /* GOT16 relocations.  Like an ADDR16 using the symbol's
+	     address in the GOT as relocation value instead of the
+	     symbol's value itself.  Also, create a GOT entry for the
+	     symbol and put the symbol value there.  */
+	case R_PPC64_GOT_TLSGD16:
+	case R_PPC64_GOT_TLSGD16_LO:
+	case R_PPC64_GOT_TLSGD16_HI:
+	case R_PPC64_GOT_TLSGD16_HA:
+	  tls_type = TLS_TLS | TLS_GD;
+	  goto dogot;
+
+	case R_PPC64_GOT_TLSLD16:
+	case R_PPC64_GOT_TLSLD16_LO:
+	case R_PPC64_GOT_TLSLD16_HI:
+	case R_PPC64_GOT_TLSLD16_HA:
+	  tls_type = TLS_TLS | TLS_LD;
+	  goto dogot;
+
+	case R_PPC64_GOT_TPREL16_DS:
+	case R_PPC64_GOT_TPREL16_LO_DS:
+	case R_PPC64_GOT_TPREL16_HI:
+	case R_PPC64_GOT_TPREL16_HA:
+	  tls_type = TLS_TLS | TLS_TPREL;
+	  goto dogot;
+
+	case R_PPC64_GOT_DTPREL16_DS:
+	case R_PPC64_GOT_DTPREL16_LO_DS:
+	case R_PPC64_GOT_DTPREL16_HI:
+	case R_PPC64_GOT_DTPREL16_HA:
+	  tls_type = TLS_TLS | TLS_DTPREL;
+	  goto dogot;
+
+	case R_PPC64_GOT16:
+	case R_PPC64_GOT16_LO:
+	case R_PPC64_GOT16_HI:
+	case R_PPC64_GOT16_HA:
+	case R_PPC64_GOT16_DS:
+	case R_PPC64_GOT16_LO_DS:
+	dogot:
+	  {
+	    /* Relocation is to the entry for this symbol in the global
+	       offset table.  */
+	    asection *got;
+	    bfd_vma *offp;
+	    bfd_vma off;
+	    unsigned long indx = 0;
+	    struct got_entry *ent;
+
+	    if (tls_type == (TLS_TLS | TLS_LD)
+		&& (h == NULL
+		    || !h->elf.def_dynamic))
+	      ent = ppc64_tlsld_got (input_bfd);
+	    else
+	      {
+
+		if (h != NULL)
+		  {
+		    bfd_boolean dyn = htab->elf.dynamic_sections_created;
+		    if (!WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared,
+							  &h->elf)
+			|| (info->shared
+			    && SYMBOL_CALLS_LOCAL (info, &h->elf)))
+		      /* This is actually a static link, or it is a
+			 -Bsymbolic link and the symbol is defined
+			 locally, or the symbol was forced to be local
+			 because of a version file.  */
+		      ;
+		    else
+		      {
+			indx = h->elf.dynindx;
+			unresolved_reloc = FALSE;
+		      }
+		    ent = h->elf.got.glist;
+		  }
+		else
+		  {
+		    if (local_got_ents == NULL)
+		      abort ();
+		    ent = local_got_ents[r_symndx];
+		  }
+
+		for (; ent != NULL; ent = ent->next)
+		  if (ent->addend == orig_addend
+		      && ent->owner == input_bfd
+		      && ent->tls_type == tls_type)
+		    break;
+	      }
+
+	    if (ent == NULL)
+	      abort ();
+	    if (ent->is_indirect)
+	      ent = ent->got.ent;
+	    offp = &ent->got.offset;
+	    got = ppc64_elf_tdata (ent->owner)->got;
+	    if (got == NULL)
+	      abort ();
+
+	    /* The offset must always be a multiple of 8.  We use the
+	       least significant bit to record whether we have already
+	       processed this entry.  */
+	    off = *offp;
+	    if ((off & 1) != 0)
+	      off &= ~1;
+	    else
+	      {
+		/* Generate relocs for the dynamic linker, except in
+		   the case of TLSLD where we'll use one entry per
+		   module.  */
+		asection *relgot;
+		bfd_boolean ifunc;
+
+		*offp = off | 1;
+		relgot = NULL;
+		ifunc = (h != NULL
+			 ? h->elf.type == STT_GNU_IFUNC
+			 : ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC);
+		if ((info->shared || indx != 0)
+		    && (h == NULL
+			|| (tls_type == (TLS_TLS | TLS_LD)
+			    && !h->elf.def_dynamic)
+			|| ELF_ST_VISIBILITY (h->elf.other) == STV_DEFAULT
+			|| h->elf.root.type != bfd_link_hash_undefweak))
+		  relgot = ppc64_elf_tdata (ent->owner)->relgot;
+		else if (ifunc)
+		  relgot = htab->reliplt;
+		if (relgot != NULL)
+		  {
+		    outrel.r_offset = (got->output_section->vma
+				       + got->output_offset
+				       + off);
+		    outrel.r_addend = addend;
+		    if (tls_type & (TLS_LD | TLS_GD))
+		      {
+			outrel.r_addend = 0;
+			outrel.r_info = ELF64_R_INFO (indx, R_PPC64_DTPMOD64);
+			if (tls_type == (TLS_TLS | TLS_GD))
+			  {
+			    loc = relgot->contents;
+			    loc += (relgot->reloc_count++
+				    * sizeof (Elf64_External_Rela));
+			    bfd_elf64_swap_reloca_out (output_bfd,
+						       &outrel, loc);
+			    outrel.r_offset += 8;
+			    outrel.r_addend = addend;
+			    outrel.r_info
+			      = ELF64_R_INFO (indx, R_PPC64_DTPREL64);
+			  }
+		      }
+		    else if (tls_type == (TLS_TLS | TLS_DTPREL))
+		      outrel.r_info = ELF64_R_INFO (indx, R_PPC64_DTPREL64);
+		    else if (tls_type == (TLS_TLS | TLS_TPREL))
+		      outrel.r_info = ELF64_R_INFO (indx, R_PPC64_TPREL64);
+		    else if (indx != 0)
+		      outrel.r_info = ELF64_R_INFO (indx, R_PPC64_GLOB_DAT);
+		    else
+		      {
+			if (ifunc)
+			  outrel.r_info = ELF64_R_INFO (0, R_PPC64_IRELATIVE);
+			else
+			  outrel.r_info = ELF64_R_INFO (0, R_PPC64_RELATIVE);
+
+			/* Write the .got section contents for the sake
+			   of prelink.  */
+			loc = got->contents + off;
+			bfd_put_64 (output_bfd, outrel.r_addend + relocation,
+				    loc);
+		      }
+
+		    if (indx == 0 && tls_type != (TLS_TLS | TLS_LD))
+		      {
+			outrel.r_addend += relocation;
+			if (tls_type & (TLS_GD | TLS_DTPREL | TLS_TPREL))
+			  outrel.r_addend -= htab->elf.tls_sec->vma;
+		      }
+		    loc = relgot->contents;
+		    loc += (relgot->reloc_count++
+			    * sizeof (Elf64_External_Rela));
+		    bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);
+		  }
+
+		/* Init the .got section contents here if we're not
+		   emitting a reloc.  */
+		else
+		  {
+		    relocation += addend;
+		    if (tls_type == (TLS_TLS | TLS_LD))
+		      relocation = 1;
+		    else if (tls_type != 0)
+		      {
+			relocation -= htab->elf.tls_sec->vma + DTP_OFFSET;
+			if (tls_type == (TLS_TLS | TLS_TPREL))
+			  relocation += DTP_OFFSET - TP_OFFSET;
+
+			if (tls_type == (TLS_TLS | TLS_GD))
+			  {
+			    bfd_put_64 (output_bfd, relocation,
+					got->contents + off + 8);
+			    relocation = 1;
+			  }
+		      }
+
+		    bfd_put_64 (output_bfd, relocation,
+				got->contents + off);
+		  }
+	      }
+
+	    if (off >= (bfd_vma) -2)
+	      abort ();
+
+	    relocation = got->output_section->vma + got->output_offset + off;
+	    addend = -(TOCstart + htab->stub_group[input_section->id].toc_off);
+	  }
+	  break;
+
+	case R_PPC64_PLT16_HA:
+	case R_PPC64_PLT16_HI:
+	case R_PPC64_PLT16_LO:
+	case R_PPC64_PLT32:
+	case R_PPC64_PLT64:
+	  /* Relocation is to the entry for this symbol in the
+	     procedure linkage table.  */
+
+	  /* Resolve a PLT reloc against a local symbol directly,
+	     without using the procedure linkage table.  */
+	  if (h == NULL)
+	    break;
+
+	  /* It's possible that we didn't make a PLT entry for this
+	     symbol.  This happens when statically linking PIC code,
+	     or when using -Bsymbolic.  Go find a match if there is a
+	     PLT entry.  */
+	  if (htab->plt != NULL)
+	    {
+	      struct plt_entry *ent;
+	      for (ent = h->elf.plt.plist; ent != NULL; ent = ent->next)
+		if (ent->addend == orig_addend
+		    && ent->plt.offset != (bfd_vma) -1)
+		  {
+		    relocation = (htab->plt->output_section->vma
+				  + htab->plt->output_offset
+				  + ent->plt.offset);
+		    unresolved_reloc = FALSE;
+		  }
+	    }
+	  break;
+
+	case R_PPC64_TOC:
+	  /* Relocation value is TOC base.  */
+	  relocation = TOCstart;
+	  if (r_symndx == STN_UNDEF)
+	    relocation += htab->stub_group[input_section->id].toc_off;
+	  else if (unresolved_reloc)
+	    ;
+	  else if (sec != NULL && sec->id <= htab->top_id)
+	    relocation += htab->stub_group[sec->id].toc_off;
+	  else
+	    unresolved_reloc = TRUE;
+	  goto dodyn;
+
+	  /* TOC16 relocs.  We want the offset relative to the TOC base,
+	     which is the address of the start of the TOC plus 0x8000.
+	     The TOC consists of sections .got, .toc, .tocbss, and .plt,
+	     in this order.  */
+	case R_PPC64_TOC16:
+	case R_PPC64_TOC16_LO:
+	case R_PPC64_TOC16_HI:
+	case R_PPC64_TOC16_DS:
+	case R_PPC64_TOC16_LO_DS:
+	case R_PPC64_TOC16_HA:
+	  addend -= TOCstart + htab->stub_group[input_section->id].toc_off;
+	  break;
+
+	  /* Relocate against the beginning of the section.  */
+	case R_PPC64_SECTOFF:
+	case R_PPC64_SECTOFF_LO:
+	case R_PPC64_SECTOFF_HI:
+	case R_PPC64_SECTOFF_DS:
+	case R_PPC64_SECTOFF_LO_DS:
+	case R_PPC64_SECTOFF_HA:
+	  if (sec != NULL)
+	    addend -= sec->output_section->vma;
+	  break;
+
+	case R_PPC64_REL16:
+	case R_PPC64_REL16_LO:
+	case R_PPC64_REL16_HI:
+	case R_PPC64_REL16_HA:
+	  break;
+
+	case R_PPC64_REL14:
+	case R_PPC64_REL14_BRNTAKEN:
+	case R_PPC64_REL14_BRTAKEN:
+	case R_PPC64_REL24:
+	  break;
+
+	case R_PPC64_TPREL16:
+	case R_PPC64_TPREL16_LO:
+	case R_PPC64_TPREL16_HI:
+	case R_PPC64_TPREL16_HA:
+	case R_PPC64_TPREL16_DS:
+	case R_PPC64_TPREL16_LO_DS:
+	case R_PPC64_TPREL16_HIGHER:
+	case R_PPC64_TPREL16_HIGHERA:
+	case R_PPC64_TPREL16_HIGHEST:
+	case R_PPC64_TPREL16_HIGHESTA:
+	  if (h != NULL
+	      && h->elf.root.type == bfd_link_hash_undefweak
+	      && h->elf.dynindx == -1)
+	    {
+	      /* Make this relocation against an undefined weak symbol
+		 resolve to zero.  This is really just a tweak, since
+		 code using weak externs ought to check that they are
+		 defined before using them.  */
+	      bfd_byte *p = contents + rel->r_offset - d_offset;
+
+	      insn = bfd_get_32 (output_bfd, p);
+	      insn = _bfd_elf_ppc_at_tprel_transform (insn, 13);
+	      if (insn != 0)
+		bfd_put_32 (output_bfd, insn, p);
+	      break;
+	    }
+	  addend -= htab->elf.tls_sec->vma + TP_OFFSET;
+	  if (info->shared)
+	    /* The TPREL16 relocs shouldn't really be used in shared
+	       libs as they will result in DT_TEXTREL being set, but
+	       support them anyway.  */
+	    goto dodyn;
+	  break;
+
+	case R_PPC64_DTPREL16:
+	case R_PPC64_DTPREL16_LO:
+	case R_PPC64_DTPREL16_HI:
+	case R_PPC64_DTPREL16_HA:
+	case R_PPC64_DTPREL16_DS:
+	case R_PPC64_DTPREL16_LO_DS:
+	case R_PPC64_DTPREL16_HIGHER:
+	case R_PPC64_DTPREL16_HIGHERA:
+	case R_PPC64_DTPREL16_HIGHEST:
+	case R_PPC64_DTPREL16_HIGHESTA:
+	  addend -= htab->elf.tls_sec->vma + DTP_OFFSET;
+	  break;
+
+	case R_PPC64_DTPMOD64:
+	  relocation = 1;
+	  addend = 0;
+	  goto dodyn;
+
+	case R_PPC64_TPREL64:
+	  addend -= htab->elf.tls_sec->vma + TP_OFFSET;
+	  goto dodyn;
+
+	case R_PPC64_DTPREL64:
+	  addend -= htab->elf.tls_sec->vma + DTP_OFFSET;
+	  /* Fall thru */
+
+	  /* Relocations that may need to be propagated if this is a
+	     dynamic object.  */
+	case R_PPC64_REL30:
+	case R_PPC64_REL32:
+	case R_PPC64_REL64:
+	case R_PPC64_ADDR14:
+	case R_PPC64_ADDR14_BRNTAKEN:
+	case R_PPC64_ADDR14_BRTAKEN:
+	case R_PPC64_ADDR16:
+	case R_PPC64_ADDR16_DS:
+	case R_PPC64_ADDR16_HA:
+	case R_PPC64_ADDR16_HI:
+	case R_PPC64_ADDR16_HIGHER:
+	case R_PPC64_ADDR16_HIGHERA:
+	case R_PPC64_ADDR16_HIGHEST:
+	case R_PPC64_ADDR16_HIGHESTA:
+	case R_PPC64_ADDR16_LO:
+	case R_PPC64_ADDR16_LO_DS:
+	case R_PPC64_ADDR24:
+	case R_PPC64_ADDR32:
+	case R_PPC64_ADDR64:
+	case R_PPC64_UADDR16:
+	case R_PPC64_UADDR32:
+	case R_PPC64_UADDR64:
+	dodyn:
+	  if ((input_section->flags & SEC_ALLOC) == 0)
+	    break;
+
+	  if (NO_OPD_RELOCS && is_opd)
+	    break;
+
+	  if ((info->shared
+	       && (h == NULL
+		   || ELF_ST_VISIBILITY (h->elf.other) == STV_DEFAULT
+		   || h->elf.root.type != bfd_link_hash_undefweak)
+	       && (must_be_dyn_reloc (info, r_type)
+		   || !SYMBOL_CALLS_LOCAL (info, &h->elf)))
+	      || (ELIMINATE_COPY_RELOCS
+		  && !info->shared
+		  && h != NULL
+		  && h->elf.dynindx != -1
+		  && !h->elf.non_got_ref
+		  && !h->elf.def_regular)
+	      || (!info->shared
+		  && (h != NULL
+		      ? h->elf.type == STT_GNU_IFUNC
+		      : ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)))
+	    {
+	      bfd_boolean skip, relocate;
+	      asection *sreloc;
+	      bfd_vma out_off;
+
+	      /* When generating a dynamic object, these relocations
+		 are copied into the output file to be resolved at run
+		 time.  */
+
+	      skip = FALSE;
+	      relocate = FALSE;
+
+	      out_off = _bfd_elf_section_offset (output_bfd, info,
+						 input_section, rel->r_offset);
+	      if (out_off == (bfd_vma) -1)
+		skip = TRUE;
+	      else if (out_off == (bfd_vma) -2)
+		skip = TRUE, relocate = TRUE;
+	      out_off += (input_section->output_section->vma
+			  + input_section->output_offset);
+	      outrel.r_offset = out_off;
+	      outrel.r_addend = rel->r_addend;
+
+	      /* Optimize unaligned reloc use.  */
+	      if ((r_type == R_PPC64_ADDR64 && (out_off & 7) != 0)
+		  || (r_type == R_PPC64_UADDR64 && (out_off & 7) == 0))
+		r_type ^= R_PPC64_ADDR64 ^ R_PPC64_UADDR64;
+	      else if ((r_type == R_PPC64_ADDR32 && (out_off & 3) != 0)
+		       || (r_type == R_PPC64_UADDR32 && (out_off & 3) == 0))
+		r_type ^= R_PPC64_ADDR32 ^ R_PPC64_UADDR32;
+	      else if ((r_type == R_PPC64_ADDR16 && (out_off & 1) != 0)
+		       || (r_type == R_PPC64_UADDR16 && (out_off & 1) == 0))
+		r_type ^= R_PPC64_ADDR16 ^ R_PPC64_UADDR16;
+
+	      if (skip)
+		memset (&outrel, 0, sizeof outrel);
+	      else if (!SYMBOL_CALLS_LOCAL (info, &h->elf)
+		       && !is_opd
+		       && r_type != R_PPC64_TOC)
+		outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type);
+	      else
+		{
+		  /* This symbol is local, or marked to become local,
+		     or this is an opd section reloc which must point
+		     at a local function.  */
+		  outrel.r_addend += relocation;
+		  if (r_type == R_PPC64_ADDR64 || r_type == R_PPC64_TOC)
+		    {
+		      if (is_opd && h != NULL)
+			{
+			  /* Lie about opd entries.  This case occurs
+			     when building shared libraries and we
+			     reference a function in another shared
+			     lib.  The same thing happens for a weak
+			     definition in an application that's
+			     overridden by a strong definition in a
+			     shared lib.  (I believe this is a generic
+			     bug in binutils handling of weak syms.)
+			     In these cases we won't use the opd
+			     entry in this lib.  */
+			  unresolved_reloc = FALSE;
+			}
+		      if (!is_opd
+			  && r_type == R_PPC64_ADDR64
+			  && (h != NULL
+			      ? h->elf.type == STT_GNU_IFUNC
+			      : ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC))
+			outrel.r_info = ELF64_R_INFO (0, R_PPC64_IRELATIVE);
+		      else
+			{
+			  outrel.r_info = ELF64_R_INFO (0, R_PPC64_RELATIVE);
+
+			  /* We need to relocate .opd contents for ld.so.
+			     Prelink also wants simple and consistent rules
+			     for relocs.  This make all RELATIVE relocs have
+			     *r_offset equal to r_addend.  */
+			  relocate = TRUE;
+			}
+		    }
+		  else
+		    {
+		      long indx = 0;
+
+		      if (h != NULL
+			  ? h->elf.type == STT_GNU_IFUNC
+			  : ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
+			{
+			  info->callbacks->einfo
+			    (_("%P: %H: relocation %s for indirect "
+			       "function %s unsupported\n"),
+			     input_bfd, input_section, rel->r_offset,
+			     ppc64_elf_howto_table[r_type]->name,
+			     sym_name);
+			  ret = FALSE;
+			}
+		      else if (r_symndx == STN_UNDEF || bfd_is_abs_section (sec))
+			;
+		      else if (sec == NULL || sec->owner == NULL)
+			{
+			  bfd_set_error (bfd_error_bad_value);
+			  return FALSE;
+			}
+		      else
+			{
+			  asection *osec;
+
+			  osec = sec->output_section;
+			  indx = elf_section_data (osec)->dynindx;
+
+			  if (indx == 0)
+			    {
+			      if ((osec->flags & SEC_READONLY) == 0
+				  && htab->elf.data_index_section != NULL)
+				osec = htab->elf.data_index_section;
+			      else
+				osec = htab->elf.text_index_section;
+			      indx = elf_section_data (osec)->dynindx;
+			    }
+			  BFD_ASSERT (indx != 0);
+
+			  /* We are turning this relocation into one
+			     against a section symbol, so subtract out
+			     the output section's address but not the
+			     offset of the input section in the output
+			     section.  */
+			  outrel.r_addend -= osec->vma;
+			}
+
+		      outrel.r_info = ELF64_R_INFO (indx, r_type);
+		    }
+		}
+
+	      sreloc = elf_section_data (input_section)->sreloc;
+	      if (!htab->elf.dynamic_sections_created)
+		sreloc = htab->reliplt;
+	      if (sreloc == NULL)
+		abort ();
+
+	      if (sreloc->reloc_count * sizeof (Elf64_External_Rela)
+		  >= sreloc->size)
+		abort ();
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf64_External_Rela);
+	      bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);
+
+	      /* If this reloc is against an external symbol, it will
+		 be computed at runtime, so there's no need to do
+		 anything now.  However, for the sake of prelink ensure
+		 that the section contents are a known value.  */
+	      if (! relocate)
+		{
+		  unresolved_reloc = FALSE;
+		  /* The value chosen here is quite arbitrary as ld.so
+		     ignores section contents except for the special
+		     case of .opd where the contents might be accessed
+		     before relocation.  Choose zero, as that won't
+		     cause reloc overflow.  */
+		  relocation = 0;
+		  addend = 0;
+		  /* Use *r_offset == r_addend for R_PPC64_ADDR64 relocs
+		     to improve backward compatibility with older
+		     versions of ld.  */
+		  if (r_type == R_PPC64_ADDR64)
+		    addend = outrel.r_addend;
+		  /* Adjust pc_relative relocs to have zero in *r_offset.  */
+		  else if (ppc64_elf_howto_table[r_type]->pc_relative)
+		    addend = (input_section->output_section->vma
+			      + input_section->output_offset
+			      + rel->r_offset);
+		}
+	    }
+	  break;
+
+	case R_PPC64_COPY:
+	case R_PPC64_GLOB_DAT:
+	case R_PPC64_JMP_SLOT:
+	case R_PPC64_JMP_IREL:
+	case R_PPC64_RELATIVE:
+	  /* We shouldn't ever see these dynamic relocs in relocatable
+	     files.  */
+	  /* Fall through.  */
+
+	case R_PPC64_PLTGOT16:
+	case R_PPC64_PLTGOT16_DS:
+	case R_PPC64_PLTGOT16_HA:
+	case R_PPC64_PLTGOT16_HI:
+	case R_PPC64_PLTGOT16_LO:
+	case R_PPC64_PLTGOT16_LO_DS:
+	case R_PPC64_PLTREL32:
+	case R_PPC64_PLTREL64:
+	  /* These ones haven't been implemented yet.  */
+
+	  info->callbacks->einfo
+	    (_("%P: %B: relocation %s is not supported for symbol %s\n"),
+	     input_bfd,
+	     ppc64_elf_howto_table[r_type]->name, sym_name);
+
+	  bfd_set_error (bfd_error_invalid_operation);
+	  ret = FALSE;
+	  continue;
+	}
+
+      /* Multi-instruction sequences that access the TOC can be
+	 optimized, eg. addis ra,r2,0; addi rb,ra,x;
+	 to             nop;           addi rb,r2,x;  */
+      switch (r_type)
+	{
+	default:
+	  break;
+
+	case R_PPC64_GOT_TLSLD16_HI:
+	case R_PPC64_GOT_TLSGD16_HI:
+	case R_PPC64_GOT_TPREL16_HI:
+	case R_PPC64_GOT_DTPREL16_HI:
+	case R_PPC64_GOT16_HI:
+	case R_PPC64_TOC16_HI:
+	  /* These relocs would only be useful if building up an
+	     offset to later add to r2, perhaps in an indexed
+	     addressing mode instruction.  Don't try to optimize.
+	     Unfortunately, the possibility of someone building up an
+	     offset like this or even with the HA relocs, means that
+	     we need to check the high insn when optimizing the low
+	     insn.  */
+	  break;
+
+	case R_PPC64_GOT_TLSLD16_HA:
+	case R_PPC64_GOT_TLSGD16_HA:
+	case R_PPC64_GOT_TPREL16_HA:
+	case R_PPC64_GOT_DTPREL16_HA:
+	case R_PPC64_GOT16_HA:
+	case R_PPC64_TOC16_HA:
+	  if (htab->do_toc_opt && relocation + addend + 0x8000 < 0x10000
+	      && !ppc64_elf_tdata (input_bfd)->unexpected_toc_insn)
+	    {
+	      bfd_byte *p = contents + (rel->r_offset & ~3);
+	      bfd_put_32 (input_bfd, NOP, p);
+	    }
+	  break;
+
+	case R_PPC64_GOT_TLSLD16_LO:
+	case R_PPC64_GOT_TLSGD16_LO:
+	case R_PPC64_GOT_TPREL16_LO_DS:
+	case R_PPC64_GOT_DTPREL16_LO_DS:
+	case R_PPC64_GOT16_LO:
+	case R_PPC64_GOT16_LO_DS:
+	case R_PPC64_TOC16_LO:
+	case R_PPC64_TOC16_LO_DS:
+	  if (htab->do_toc_opt && relocation + addend + 0x8000 < 0x10000
+	      && !ppc64_elf_tdata (input_bfd)->unexpected_toc_insn)
+	    {
+	      bfd_byte *p = contents + (rel->r_offset & ~3);
+	      insn = bfd_get_32 (input_bfd, p);
+	      if ((insn & (0x3f << 26)) == 12u << 26 /* addic */)
+		{
+		  /* Transform addic to addi when we change reg.  */
+		  insn &= ~((0x3f << 26) | (0x1f << 16));
+		  insn |= (14u << 26) | (2 << 16);
+		}
+	      else
+		{
+		  insn &= ~(0x1f << 16);
+		  insn |= 2 << 16;
+		}
+	      bfd_put_32 (input_bfd, insn, p);
+	    }
+	  break;
+	}
+
+      /* Do any further special processing.  */
+      switch (r_type)
+	{
+	default:
+	  break;
+
+	case R_PPC64_ADDR16_HA:
+	case R_PPC64_REL16_HA:
+	case R_PPC64_ADDR16_HIGHERA:
+	case R_PPC64_ADDR16_HIGHESTA:
+	case R_PPC64_TOC16_HA:
+	case R_PPC64_SECTOFF_HA:
+	case R_PPC64_TPREL16_HA:
+	case R_PPC64_DTPREL16_HA:
+	case R_PPC64_TPREL16_HIGHER:
+	case R_PPC64_TPREL16_HIGHERA:
+	case R_PPC64_TPREL16_HIGHEST:
+	case R_PPC64_TPREL16_HIGHESTA:
+	case R_PPC64_DTPREL16_HIGHER:
+	case R_PPC64_DTPREL16_HIGHERA:
+	case R_PPC64_DTPREL16_HIGHEST:
+	case R_PPC64_DTPREL16_HIGHESTA:
+	  /* It's just possible that this symbol is a weak symbol
+	     that's not actually defined anywhere. In that case,
+	     'sec' would be NULL, and we should leave the symbol
+	     alone (it will be set to zero elsewhere in the link).  */
+	  if (sec == NULL)
+	    break;
+	  /* Fall thru */
+
+	case R_PPC64_GOT16_HA:
+	case R_PPC64_PLTGOT16_HA:
+	case R_PPC64_PLT16_HA:
+	case R_PPC64_GOT_TLSGD16_HA:
+	case R_PPC64_GOT_TLSLD16_HA:
+	case R_PPC64_GOT_TPREL16_HA:
+	case R_PPC64_GOT_DTPREL16_HA:
+	  /* Add 0x10000 if sign bit in 0:15 is set.
+	     Bits 0:15 are not used.  */
+	  addend += 0x8000;
+	  break;
+
+	case R_PPC64_ADDR16_DS:
+	case R_PPC64_ADDR16_LO_DS:
+	case R_PPC64_GOT16_DS:
+	case R_PPC64_GOT16_LO_DS:
+	case R_PPC64_PLT16_LO_DS:
+	case R_PPC64_SECTOFF_DS:
+	case R_PPC64_SECTOFF_LO_DS:
+	case R_PPC64_TOC16_DS:
+	case R_PPC64_TOC16_LO_DS:
+	case R_PPC64_PLTGOT16_DS:
+	case R_PPC64_PLTGOT16_LO_DS:
+	case R_PPC64_GOT_TPREL16_DS:
+	case R_PPC64_GOT_TPREL16_LO_DS:
+	case R_PPC64_GOT_DTPREL16_DS:
+	case R_PPC64_GOT_DTPREL16_LO_DS:
+	case R_PPC64_TPREL16_DS:
+	case R_PPC64_TPREL16_LO_DS:
+	case R_PPC64_DTPREL16_DS:
+	case R_PPC64_DTPREL16_LO_DS:
+	  insn = bfd_get_32 (input_bfd, contents + (rel->r_offset & ~3));
+	  mask = 3;
+	  /* If this reloc is against an lq insn, then the value must be
+	     a multiple of 16.  This is somewhat of a hack, but the
+	     "correct" way to do this by defining _DQ forms of all the
+	     _DS relocs bloats all reloc switches in this file.  It
+	     doesn't seem to make much sense to use any of these relocs
+	     in data, so testing the insn should be safe.  */
+	  if ((insn & (0x3f << 26)) == (56u << 26))
+	    mask = 15;
+	  if (((relocation + addend) & mask) != 0)
+	    {
+	      info->callbacks->einfo
+		(_("%P: %H: error: %s not a multiple of %u\n"),
+		 input_bfd, input_section, rel->r_offset,
+		 ppc64_elf_howto_table[r_type]->name,
+		 mask + 1);
+	      bfd_set_error (bfd_error_bad_value);
+	      ret = FALSE;
+	      continue;
+	    }
+	  break;
+	}
+
+      /* Dynamic relocs are not propagated for SEC_DEBUGGING sections
+	 because such sections are not SEC_ALLOC and thus ld.so will
+	 not process them.  */
+      if (unresolved_reloc
+	  && !((input_section->flags & SEC_DEBUGGING) != 0
+	       && h->elf.def_dynamic))
+	{
+	  info->callbacks->einfo
+	    (_("%P: %H: unresolvable %s relocation against symbol `%s'\n"),
+	     input_bfd, input_section, rel->r_offset,
+	     ppc64_elf_howto_table[(int) r_type]->name,
+	     h->elf.root.root.string);
+	  ret = FALSE;
+	}
+
+      r = _bfd_final_link_relocate (ppc64_elf_howto_table[(int) r_type],
+				    input_bfd,
+				    input_section,
+				    contents,
+				    rel->r_offset,
+				    relocation,
+				    addend);
+
+      if (r != bfd_reloc_ok)
+	{
+	  if (sym_name == NULL)
+	    sym_name = "(null)";
+	  if (r == bfd_reloc_overflow)
+	    {
+	      if (warned)
+		continue;
+	      if (h != NULL
+		  && h->elf.root.type == bfd_link_hash_undefweak
+		  && ppc64_elf_howto_table[r_type]->pc_relative)
+		{
+		  /* Assume this is a call protected by other code that
+		     detects the symbol is undefined.  If this is the case,
+		     we can safely ignore the overflow.  If not, the
+		     program is hosed anyway, and a little warning isn't
+		     going to help.  */
+
+		  continue;
+		}
+
+	      if (!((*info->callbacks->reloc_overflow)
+		    (info, (h ? &h->elf.root : NULL), sym_name,
+		     ppc64_elf_howto_table[r_type]->name,
+		     orig_addend, input_bfd, input_section, rel->r_offset)))
+		return FALSE;
+	    }
+	  else
+	    {
+	      info->callbacks->einfo
+		(_("%P: %H: %s reloc against `%s': error %d\n"),
+		 input_bfd, input_section, rel->r_offset,
+		 ppc64_elf_howto_table[r_type]->name,
+		 sym_name,
+		 (int) r);
+	      ret = FALSE;
+	    }
+	}
+    }
+
+  /* If we're emitting relocations, then shortly after this function
+     returns, reloc offsets and addends for this section will be
+     adjusted.  Worse, reloc symbol indices will be for the output
+     file rather than the input.  Save a copy of the relocs for
+     opd_entry_value.  */
+  if (is_opd && (info->emitrelocations || info->relocatable))
+    {
+      bfd_size_type amt;
+      amt = input_section->reloc_count * sizeof (Elf_Internal_Rela);
+      rel = bfd_alloc (input_bfd, amt);
+      BFD_ASSERT (ppc64_elf_tdata (input_bfd)->opd_relocs == NULL);
+      ppc64_elf_tdata (input_bfd)->opd_relocs = rel;
+      if (rel == NULL)
+	return FALSE;
+      memcpy (rel, relocs, amt);
+    }
+  return ret;
+}
+
+/* Adjust the value of any local symbols in opd sections.  */
+
+static int
+ppc64_elf_output_symbol_hook (struct bfd_link_info *info,
+			      const char *name ATTRIBUTE_UNUSED,
+			      Elf_Internal_Sym *elfsym,
+			      asection *input_sec,
+			      struct elf_link_hash_entry *h)
+{
+  struct _opd_sec_data *opd;
+  long adjust;
+  bfd_vma value;
+
+  if (h != NULL)
+    return 1;
+
+  opd = get_opd_info (input_sec);
+  if (opd == NULL || opd->adjust == NULL)
+    return 1;
+
+  value = elfsym->st_value - input_sec->output_offset;
+  if (!info->relocatable)
+    value -= input_sec->output_section->vma;
+
+  adjust = opd->adjust[value / 8];
+  if (adjust == -1)
+    return 2;
+
+  elfsym->st_value += adjust;
+  return 1;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+ppc64_elf_finish_dynamic_symbol (bfd *output_bfd,
+				 struct bfd_link_info *info,
+				 struct elf_link_hash_entry *h,
+				 Elf_Internal_Sym *sym)
+{
+  struct ppc_link_hash_table *htab;
+  struct plt_entry *ent;
+  Elf_Internal_Rela rela;
+  bfd_byte *loc;
+
+  htab = ppc_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  for (ent = h->plt.plist; ent != NULL; ent = ent->next)
+    if (ent->plt.offset != (bfd_vma) -1)
+      {
+	/* This symbol has an entry in the procedure linkage
+	   table.  Set it up.  */
+	if (!htab->elf.dynamic_sections_created
+	    || h->dynindx == -1)
+	  {
+	    BFD_ASSERT (h->type == STT_GNU_IFUNC
+			&& h->def_regular
+			&& (h->root.type == bfd_link_hash_defined
+			    || h->root.type == bfd_link_hash_defweak));
+	    rela.r_offset = (htab->iplt->output_section->vma
+			     + htab->iplt->output_offset
+			     + ent->plt.offset);
+	    rela.r_info = ELF64_R_INFO (0, R_PPC64_JMP_IREL);
+	    rela.r_addend = (h->root.u.def.value
+			     + h->root.u.def.section->output_offset
+			     + h->root.u.def.section->output_section->vma
+			     + ent->addend);
+	    loc = (htab->reliplt->contents
+		   + (htab->reliplt->reloc_count++
+		      * sizeof (Elf64_External_Rela)));
+	  }
+	else
+	  {
+	    rela.r_offset = (htab->plt->output_section->vma
+			     + htab->plt->output_offset
+			     + ent->plt.offset);
+	    rela.r_info = ELF64_R_INFO (h->dynindx, R_PPC64_JMP_SLOT);
+	    rela.r_addend = ent->addend;
+	    loc = (htab->relplt->contents
+		   + ((ent->plt.offset - PLT_INITIAL_ENTRY_SIZE)
+		      / (PLT_ENTRY_SIZE / sizeof (Elf64_External_Rela))));
+	  }
+	bfd_elf64_swap_reloca_out (output_bfd, &rela, loc);
+      }
+
+  if (h->needs_copy)
+    {
+      /* This symbol needs a copy reloc.  Set it up.  */
+
+      if (h->dynindx == -1
+	  || (h->root.type != bfd_link_hash_defined
+	      && h->root.type != bfd_link_hash_defweak)
+	  || htab->relbss == NULL)
+	abort ();
+
+      rela.r_offset = (h->root.u.def.value
+		       + h->root.u.def.section->output_section->vma
+		       + h->root.u.def.section->output_offset);
+      rela.r_info = ELF64_R_INFO (h->dynindx, R_PPC64_COPY);
+      rela.r_addend = 0;
+      loc = htab->relbss->contents;
+      loc += htab->relbss->reloc_count++ * sizeof (Elf64_External_Rela);
+      bfd_elf64_swap_reloca_out (output_bfd, &rela, loc);
+    }
+
+  /* Mark some specially defined symbols as absolute.  */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0)
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+/* Used to decide how to sort relocs in an optimal manner for the
+   dynamic linker, before writing them out.  */
+
+static enum elf_reloc_type_class
+ppc64_elf_reloc_type_class (const Elf_Internal_Rela *rela)
+{
+  enum elf_ppc64_reloc_type r_type;
+
+  r_type = ELF64_R_TYPE (rela->r_info);
+  switch (r_type)
+    {
+    case R_PPC64_RELATIVE:
+      return reloc_class_relative;
+    case R_PPC64_JMP_SLOT:
+      return reloc_class_plt;
+    case R_PPC64_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+ppc64_elf_finish_dynamic_sections (bfd *output_bfd,
+				   struct bfd_link_info *info)
+{
+  struct ppc_link_hash_table *htab;
+  bfd *dynobj;
+  asection *sdyn;
+
+  htab = ppc_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = htab->elf.dynobj;
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (htab->elf.dynamic_sections_created)
+    {
+      Elf64_External_Dyn *dyncon, *dynconend;
+
+      if (sdyn == NULL || htab->got == NULL)
+	abort ();
+
+      dyncon = (Elf64_External_Dyn *) sdyn->contents;
+      dynconend = (Elf64_External_Dyn *) (sdyn->contents + sdyn->size);
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+	  asection *s;
+
+	  bfd_elf64_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    default:
+	      continue;
+
+	    case DT_PPC64_GLINK:
+	      s = htab->glink;
+	      dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+	      /* We stupidly defined DT_PPC64_GLINK to be the start
+		 of glink rather than the first entry point, which is
+		 what ld.so needs, and now have a bigger stub to
+		 support automatic multiple TOCs.  */
+	      dyn.d_un.d_ptr += GLINK_CALL_STUB_SIZE - 32;
+	      break;
+
+	    case DT_PPC64_OPD:
+	      s = bfd_get_section_by_name (output_bfd, ".opd");
+	      if (s == NULL)
+		continue;
+	      dyn.d_un.d_ptr = s->vma;
+	      break;
+
+	    case DT_PPC64_OPDSZ:
+	      s = bfd_get_section_by_name (output_bfd, ".opd");
+	      if (s == NULL)
+		continue;
+	      dyn.d_un.d_val = s->size;
+	      break;
+
+	    case DT_PLTGOT:
+	      s = htab->plt;
+	      dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+	      break;
+
+	    case DT_JMPREL:
+	      s = htab->relplt;
+	      dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+	      break;
+
+	    case DT_PLTRELSZ:
+	      dyn.d_un.d_val = htab->relplt->size;
+	      break;
+
+	    case DT_RELASZ:
+	      /* Don't count procedure linkage table relocs in the
+		 overall reloc count.  */
+	      s = htab->relplt;
+	      if (s == NULL)
+		continue;
+	      dyn.d_un.d_val -= s->size;
+	      break;
+
+	    case DT_RELA:
+	      /* We may not be using the standard ELF linker script.
+		 If .rela.plt is the first .rela section, we adjust
+		 DT_RELA to not include it.  */
+	      s = htab->relplt;
+	      if (s == NULL)
+		continue;
+	      if (dyn.d_un.d_ptr != s->output_section->vma + s->output_offset)
+		continue;
+	      dyn.d_un.d_ptr += s->size;
+	      break;
+	    }
+
+	  bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
+	}
+    }
+
+  if (htab->got != NULL && htab->got->size != 0)
+    {
+      /* Fill in the first entry in the global offset table.
+	 We use it to hold the link-time TOCbase.  */
+      bfd_put_64 (output_bfd,
+		  elf_gp (output_bfd) + TOC_BASE_OFF,
+		  htab->got->contents);
+
+      /* Set .got entry size.  */
+      elf_section_data (htab->got->output_section)->this_hdr.sh_entsize = 8;
+    }
+
+  if (htab->plt != NULL && htab->plt->size != 0)
+    {
+      /* Set .plt entry size.  */
+      elf_section_data (htab->plt->output_section)->this_hdr.sh_entsize
+	= PLT_ENTRY_SIZE;
+    }
+
+  /* brlt is SEC_LINKER_CREATED, so we need to write out relocs for
+     brlt ourselves if emitrelocations.  */
+  if (htab->brlt != NULL
+      && htab->brlt->reloc_count != 0
+      && !_bfd_elf_link_output_relocs (output_bfd,
+				       htab->brlt,
+				       elf_section_data (htab->brlt)->rela.hdr,
+				       elf_section_data (htab->brlt)->relocs,
+				       NULL))
+    return FALSE;
+
+  if (htab->glink != NULL
+      && htab->glink->reloc_count != 0
+      && !_bfd_elf_link_output_relocs (output_bfd,
+				       htab->glink,
+				       elf_section_data (htab->glink)->rela.hdr,
+				       elf_section_data (htab->glink)->relocs,
+				       NULL))
+    return FALSE;
+
+
+  if (htab->glink_eh_frame != NULL
+      && htab->glink_eh_frame->sec_info_type == ELF_INFO_TYPE_EH_FRAME
+      && !_bfd_elf_write_section_eh_frame (output_bfd, info,
+					   htab->glink_eh_frame,
+					   htab->glink_eh_frame->contents))
+    return FALSE;
+
+  /* We need to handle writing out multiple GOT sections ourselves,
+     since we didn't add them to DYNOBJ.  We know dynobj is the first
+     bfd.  */
+  while ((dynobj = dynobj->link_next) != NULL)
+    {
+      asection *s;
+
+      if (!is_ppc64_elf (dynobj))
+	continue;
+
+      s = ppc64_elf_tdata (dynobj)->got;
+      if (s != NULL
+	  && s->size != 0
+	  && s->output_section != bfd_abs_section_ptr
+	  && !bfd_set_section_contents (output_bfd, s->output_section,
+					s->contents, s->output_offset,
+					s->size))
+	return FALSE;
+      s = ppc64_elf_tdata (dynobj)->relgot;
+      if (s != NULL
+	  && s->size != 0
+	  && s->output_section != bfd_abs_section_ptr
+	  && !bfd_set_section_contents (output_bfd, s->output_section,
+					s->contents, s->output_offset,
+					s->size))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+#include "elf64-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-ppc.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-ppc.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-ppc.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-ppc.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,56 @@
+/* PowerPC64-specific support for 64-bit ELF.
+   Copyright 2002, 2003, 2004, 2005, 2007, 2008, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+void ppc64_elf_init_stub_bfd
+  (bfd *, struct bfd_link_info *);
+bfd_boolean ppc64_elf_edit_opd
+  (struct bfd_link_info *, bfd_boolean);
+asection *ppc64_elf_tls_setup
+  (struct bfd_link_info *, int, int *);
+bfd_boolean ppc64_elf_tls_optimize
+  (struct bfd_link_info *);
+bfd_boolean ppc64_elf_edit_toc
+  (struct bfd_link_info *);
+bfd_boolean ppc64_elf_has_small_toc_reloc
+  (asection *);
+bfd_vma ppc64_elf_toc
+  (bfd *);
+int ppc64_elf_setup_section_lists
+  (struct bfd_link_info *, asection *(*) (const char *, asection *),
+   void (*) (void));
+void ppc64_elf_start_multitoc_partition
+  (struct bfd_link_info *);
+bfd_boolean ppc64_elf_next_toc_section
+  (struct bfd_link_info *, asection *);
+bfd_boolean ppc64_elf_layout_multitoc
+  (struct bfd_link_info *);
+void ppc64_elf_finish_multitoc_partition
+  (struct bfd_link_info *);
+bfd_boolean ppc64_elf_check_init_fini
+  (struct bfd_link_info *);
+bfd_boolean ppc64_elf_next_input_section
+  (struct bfd_link_info *, asection *);
+bfd_boolean ppc64_elf_size_stubs
+  (struct bfd_link_info *, bfd_signed_vma, bfd_boolean);
+bfd_boolean ppc64_elf_build_stubs
+  (bfd_boolean, struct bfd_link_info *, char **);
+void ppc64_elf_restore_symbols
+  (struct bfd_link_info *info);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-s390.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-s390.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-s390.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-s390.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3442 @@
+/* IBM S/390-specific support for 64-bit ELF
+   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+   2010, 2011 Free Software Foundation, Inc.
+   Contributed Martin Schwidefsky (schwidefsky@de.ibm.com).
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+
+static reloc_howto_type *elf_s390_reloc_type_lookup
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
+static void elf_s390_info_to_howto
+  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
+static bfd_boolean elf_s390_is_local_label_name
+  PARAMS ((bfd *, const char *));
+static struct bfd_hash_entry *link_hash_newfunc
+  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
+static struct bfd_link_hash_table *elf_s390_link_hash_table_create
+  PARAMS ((bfd *));
+static bfd_boolean create_got_section
+  PARAMS((bfd *, struct bfd_link_info *));
+static bfd_boolean elf_s390_create_dynamic_sections
+  PARAMS((bfd *, struct bfd_link_info *));
+static void elf_s390_copy_indirect_symbol
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *,
+	   struct elf_link_hash_entry *));
+static bfd_boolean elf_s390_check_relocs
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+	   const Elf_Internal_Rela *));
+struct elf_s390_link_hash_entry;
+static void elf_s390_adjust_gotplt
+  PARAMS ((struct elf_s390_link_hash_entry *));
+static bfd_boolean elf_s390_adjust_dynamic_symbol
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
+static bfd_boolean allocate_dynrelocs
+  PARAMS ((struct elf_link_hash_entry *, PTR));
+static bfd_boolean readonly_dynrelocs
+  PARAMS ((struct elf_link_hash_entry *, PTR));
+static bfd_boolean elf_s390_size_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean elf_s390_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
+static bfd_boolean elf_s390_finish_dynamic_symbol
+  PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
+	   Elf_Internal_Sym *));
+static enum elf_reloc_type_class elf_s390_reloc_type_class
+  PARAMS ((const Elf_Internal_Rela *));
+static bfd_boolean elf_s390_finish_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean elf_s390_object_p
+  PARAMS ((bfd *));
+static int elf_s390_tls_transition
+  PARAMS ((struct bfd_link_info *, int, int));
+static bfd_reloc_status_type s390_tls_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_vma dtpoff_base
+  PARAMS ((struct bfd_link_info *));
+static bfd_vma tpoff
+  PARAMS ((struct bfd_link_info *, bfd_vma));
+static void invalid_tls_insn
+  PARAMS ((bfd *, asection *, Elf_Internal_Rela *));
+static bfd_reloc_status_type s390_elf_ldisp_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+
+#include "elf/s390.h"
+
+/* In case we're on a 32-bit machine, construct a 64-bit "-1" value
+   from smaller values.  Start with zero, widen, *then* decrement.  */
+#define MINUS_ONE      (((bfd_vma)0) - 1)
+
+/* The relocation "howto" table.  */
+static reloc_howto_type elf_howto_table[] =
+{
+  HOWTO (R_390_NONE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_390_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO(R_390_8,         0, 0,  8, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_8",        FALSE, 0,0x000000ff, FALSE),
+  HOWTO(R_390_12,        0, 1, 12, FALSE, 0, complain_overflow_dont,
+	bfd_elf_generic_reloc, "R_390_12",       FALSE, 0,0x00000fff, FALSE),
+  HOWTO(R_390_16,        0, 1, 16, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_16",       FALSE, 0,0x0000ffff, FALSE),
+  HOWTO(R_390_32,        0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_32",       FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_PC32,	 0, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PC32",     FALSE, 0,0xffffffff, TRUE),
+  HOWTO(R_390_GOT12,	 0, 1, 12, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOT12",    FALSE, 0,0x00000fff, FALSE),
+  HOWTO(R_390_GOT32,	 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOT32",    FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_PLT32,	 0, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PLT32",    FALSE, 0,0xffffffff, TRUE),
+  HOWTO(R_390_COPY,      0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_COPY",     FALSE, 0,MINUS_ONE,  FALSE),
+  HOWTO(R_390_GLOB_DAT,  0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GLOB_DAT", FALSE, 0,MINUS_ONE,  FALSE),
+  HOWTO(R_390_JMP_SLOT,  0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_JMP_SLOT", FALSE, 0,MINUS_ONE,  FALSE),
+  HOWTO(R_390_RELATIVE,  0, 4, 64,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_RELATIVE", FALSE, 0,MINUS_ONE,  FALSE),
+  HOWTO(R_390_GOTOFF32,  0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOTOFF32", FALSE, 0,MINUS_ONE,  FALSE),
+  HOWTO(R_390_GOTPC,     0, 4, 64,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOTPC",    FALSE, 0,MINUS_ONE,  TRUE),
+  HOWTO(R_390_GOT16,     0, 1, 16, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOT16",    FALSE, 0,0x0000ffff, FALSE),
+  HOWTO(R_390_PC16,      0, 1, 16,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PC16",     FALSE, 0,0x0000ffff, TRUE),
+  HOWTO(R_390_PC16DBL,   1, 1, 16,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PC16DBL",  FALSE, 0,0x0000ffff, TRUE),
+  HOWTO(R_390_PLT16DBL,  1, 1, 16,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PLT16DBL", FALSE, 0,0x0000ffff, TRUE),
+  HOWTO(R_390_PC32DBL,	 1, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PC32DBL",  FALSE, 0,0xffffffff, TRUE),
+  HOWTO(R_390_PLT32DBL,	 1, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PLT32DBL", FALSE, 0,0xffffffff, TRUE),
+  HOWTO(R_390_GOTPCDBL,  1, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOTPCDBL", FALSE, 0,MINUS_ONE,  TRUE),
+  HOWTO(R_390_64,        0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_64",       FALSE, 0,MINUS_ONE,  FALSE),
+  HOWTO(R_390_PC64,	 0, 4, 64,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PC64",     FALSE, 0,MINUS_ONE,  TRUE),
+  HOWTO(R_390_GOT64,	 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOT64",    FALSE, 0,MINUS_ONE,  FALSE),
+  HOWTO(R_390_PLT64,	 0, 4, 64,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PLT64",    FALSE, 0,MINUS_ONE,  TRUE),
+  HOWTO(R_390_GOTENT,	 1, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOTENT",   FALSE, 0,MINUS_ONE,  TRUE),
+  HOWTO(R_390_GOTOFF16,  0, 1, 16, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOTOFF16", FALSE, 0,0x0000ffff, FALSE),
+  HOWTO(R_390_GOTOFF64,  0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOTOFF64", FALSE, 0,MINUS_ONE,  FALSE),
+  HOWTO(R_390_GOTPLT12,	 0, 1, 12, FALSE, 0, complain_overflow_dont,
+	bfd_elf_generic_reloc, "R_390_GOTPLT12", FALSE, 0,0x00000fff, FALSE),
+  HOWTO(R_390_GOTPLT16,  0, 1, 16, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOTPLT16", FALSE, 0,0x0000ffff, FALSE),
+  HOWTO(R_390_GOTPLT32,	 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOTPLT32", FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_GOTPLT64,	 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOTPLT64", FALSE, 0,MINUS_ONE,  FALSE),
+  HOWTO(R_390_GOTPLTENT, 1, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_GOTPLTENT",FALSE, 0,MINUS_ONE,  TRUE),
+  HOWTO(R_390_PLTOFF16,  0, 1, 16, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PLTOFF16", FALSE, 0,0x0000ffff, FALSE),
+  HOWTO(R_390_PLTOFF32,  0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PLTOFF32", FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_PLTOFF64,  0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_PLTOFF64", FALSE, 0,MINUS_ONE,  FALSE),
+  HOWTO(R_390_TLS_LOAD, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+	s390_tls_reloc, "R_390_TLS_LOAD", FALSE, 0, 0, FALSE),
+  HOWTO(R_390_TLS_GDCALL, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+	s390_tls_reloc, "R_390_TLS_GDCALL", FALSE, 0, 0, FALSE),
+  HOWTO(R_390_TLS_LDCALL, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+	s390_tls_reloc, "R_390_TLS_LDCALL", FALSE, 0, 0, FALSE),
+  EMPTY_HOWTO (R_390_TLS_GD32),	/* Empty entry for R_390_TLS_GD32.  */
+  HOWTO(R_390_TLS_GD64,  0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_TLS_GD64", FALSE, 0, MINUS_ONE, FALSE),
+  HOWTO(R_390_TLS_GOTIE12, 0, 1, 12, FALSE, 0, complain_overflow_dont,
+	bfd_elf_generic_reloc, "R_390_TLS_GOTIE12", FALSE, 0, 0x00000fff, FALSE),
+  EMPTY_HOWTO (R_390_TLS_GOTIE32),	/* Empty entry for R_390_TLS_GOTIE32.  */
+  HOWTO(R_390_TLS_GOTIE64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_TLS_GOTIE64", FALSE, 0, MINUS_ONE, FALSE),
+  EMPTY_HOWTO (R_390_TLS_LDM32),	/* Empty entry for R_390_TLS_LDM32.  */
+  HOWTO(R_390_TLS_LDM64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_TLS_LDM64", FALSE, 0, MINUS_ONE, FALSE),
+  EMPTY_HOWTO (R_390_TLS_IE32),	/* Empty entry for R_390_TLS_IE32.  */
+  HOWTO(R_390_TLS_IE64,  0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_TLS_IE64", FALSE, 0, MINUS_ONE, FALSE),
+  HOWTO(R_390_TLS_IEENT, 1, 2, 32, TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_TLS_IEENT", FALSE, 0, MINUS_ONE, TRUE),
+  EMPTY_HOWTO (R_390_TLS_LE32),	/* Empty entry for R_390_TLS_LE32.  */
+  HOWTO(R_390_TLS_LE64,  0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_TLS_LE64", FALSE, 0, MINUS_ONE, FALSE),
+  EMPTY_HOWTO (R_390_TLS_LDO32),	/* Empty entry for R_390_TLS_LDO32.  */
+  HOWTO(R_390_TLS_LDO64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_TLS_LDO64", FALSE, 0, MINUS_ONE, FALSE),
+  HOWTO(R_390_TLS_DTPMOD, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_TLS_DTPMOD", FALSE, 0, MINUS_ONE, FALSE),
+  HOWTO(R_390_TLS_DTPOFF, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_TLS_DTPOFF", FALSE, 0, MINUS_ONE, FALSE),
+  HOWTO(R_390_TLS_TPOFF, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_390_TLS_TPOFF", FALSE, 0, MINUS_ONE, FALSE),
+  HOWTO(R_390_20,        0, 2, 20, FALSE, 8, complain_overflow_dont,
+	s390_elf_ldisp_reloc, "R_390_20",      FALSE, 0,0x0fffff00, FALSE),
+  HOWTO(R_390_GOT20,	 0, 2, 20, FALSE, 8, complain_overflow_dont,
+	s390_elf_ldisp_reloc, "R_390_GOT20",   FALSE, 0,0x0fffff00, FALSE),
+  HOWTO(R_390_GOTPLT20,  0, 2, 20, FALSE, 8, complain_overflow_dont,
+	s390_elf_ldisp_reloc, "R_390_GOTPLT20", FALSE, 0,0x0fffff00, FALSE),
+  HOWTO(R_390_TLS_GOTIE20, 0, 2, 20, FALSE, 8, complain_overflow_dont,
+	s390_elf_ldisp_reloc, "R_390_TLS_GOTIE20", FALSE, 0,0x0fffff00, FALSE),
+};
+
+/* GNU extension to record C++ vtable hierarchy.  */
+static reloc_howto_type elf64_s390_vtinherit_howto =
+  HOWTO (R_390_GNU_VTINHERIT, 0,4,0,FALSE,0,complain_overflow_dont, NULL, "R_390_GNU_VTINHERIT", FALSE,0, 0, FALSE);
+static reloc_howto_type elf64_s390_vtentry_howto =
+  HOWTO (R_390_GNU_VTENTRY, 0,4,0,FALSE,0,complain_overflow_dont, _bfd_elf_rel_vtable_reloc_fn,"R_390_GNU_VTENTRY", FALSE,0,0, FALSE);
+
+static reloc_howto_type *
+elf_s390_reloc_type_lookup (abfd, code)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     bfd_reloc_code_real_type code;
+{
+  switch (code)
+    {
+    case BFD_RELOC_NONE:
+      return &elf_howto_table[(int) R_390_NONE];
+    case BFD_RELOC_8:
+      return &elf_howto_table[(int) R_390_8];
+    case BFD_RELOC_390_12:
+      return &elf_howto_table[(int) R_390_12];
+    case BFD_RELOC_16:
+      return &elf_howto_table[(int) R_390_16];
+    case BFD_RELOC_32:
+      return &elf_howto_table[(int) R_390_32];
+    case BFD_RELOC_CTOR:
+      return &elf_howto_table[(int) R_390_32];
+    case BFD_RELOC_32_PCREL:
+      return &elf_howto_table[(int) R_390_PC32];
+    case BFD_RELOC_390_GOT12:
+      return &elf_howto_table[(int) R_390_GOT12];
+    case BFD_RELOC_32_GOT_PCREL:
+      return &elf_howto_table[(int) R_390_GOT32];
+    case BFD_RELOC_390_PLT32:
+      return &elf_howto_table[(int) R_390_PLT32];
+    case BFD_RELOC_390_COPY:
+      return &elf_howto_table[(int) R_390_COPY];
+    case BFD_RELOC_390_GLOB_DAT:
+      return &elf_howto_table[(int) R_390_GLOB_DAT];
+    case BFD_RELOC_390_JMP_SLOT:
+      return &elf_howto_table[(int) R_390_JMP_SLOT];
+    case BFD_RELOC_390_RELATIVE:
+      return &elf_howto_table[(int) R_390_RELATIVE];
+    case BFD_RELOC_32_GOTOFF:
+      return &elf_howto_table[(int) R_390_GOTOFF32];
+    case BFD_RELOC_390_GOTPC:
+      return &elf_howto_table[(int) R_390_GOTPC];
+    case BFD_RELOC_390_GOT16:
+      return &elf_howto_table[(int) R_390_GOT16];
+    case BFD_RELOC_16_PCREL:
+      return &elf_howto_table[(int) R_390_PC16];
+    case BFD_RELOC_390_PC16DBL:
+      return &elf_howto_table[(int) R_390_PC16DBL];
+    case BFD_RELOC_390_PLT16DBL:
+      return &elf_howto_table[(int) R_390_PLT16DBL];
+    case BFD_RELOC_390_PC32DBL:
+      return &elf_howto_table[(int) R_390_PC32DBL];
+    case BFD_RELOC_390_PLT32DBL:
+      return &elf_howto_table[(int) R_390_PLT32DBL];
+    case BFD_RELOC_390_GOTPCDBL:
+      return &elf_howto_table[(int) R_390_GOTPCDBL];
+    case BFD_RELOC_64:
+      return &elf_howto_table[(int) R_390_64];
+    case BFD_RELOC_64_PCREL:
+      return &elf_howto_table[(int) R_390_PC64];
+    case BFD_RELOC_390_GOT64:
+      return &elf_howto_table[(int) R_390_GOT64];
+    case BFD_RELOC_390_PLT64:
+      return &elf_howto_table[(int) R_390_PLT64];
+    case BFD_RELOC_390_GOTENT:
+      return &elf_howto_table[(int) R_390_GOTENT];
+    case BFD_RELOC_16_GOTOFF:
+      return &elf_howto_table[(int) R_390_GOTOFF16];
+    case BFD_RELOC_390_GOTOFF64:
+      return &elf_howto_table[(int) R_390_GOTOFF64];
+    case BFD_RELOC_390_GOTPLT12:
+      return &elf_howto_table[(int) R_390_GOTPLT12];
+    case BFD_RELOC_390_GOTPLT16:
+      return &elf_howto_table[(int) R_390_GOTPLT16];
+    case BFD_RELOC_390_GOTPLT32:
+      return &elf_howto_table[(int) R_390_GOTPLT32];
+    case BFD_RELOC_390_GOTPLT64:
+      return &elf_howto_table[(int) R_390_GOTPLT64];
+    case BFD_RELOC_390_GOTPLTENT:
+      return &elf_howto_table[(int) R_390_GOTPLTENT];
+    case BFD_RELOC_390_PLTOFF16:
+      return &elf_howto_table[(int) R_390_PLTOFF16];
+    case BFD_RELOC_390_PLTOFF32:
+      return &elf_howto_table[(int) R_390_PLTOFF32];
+    case BFD_RELOC_390_PLTOFF64:
+      return &elf_howto_table[(int) R_390_PLTOFF64];
+    case BFD_RELOC_390_TLS_LOAD:
+      return &elf_howto_table[(int) R_390_TLS_LOAD];
+    case BFD_RELOC_390_TLS_GDCALL:
+      return &elf_howto_table[(int) R_390_TLS_GDCALL];
+    case BFD_RELOC_390_TLS_LDCALL:
+      return &elf_howto_table[(int) R_390_TLS_LDCALL];
+    case BFD_RELOC_390_TLS_GD64:
+      return &elf_howto_table[(int) R_390_TLS_GD64];
+    case BFD_RELOC_390_TLS_GOTIE12:
+      return &elf_howto_table[(int) R_390_TLS_GOTIE12];
+    case BFD_RELOC_390_TLS_GOTIE64:
+      return &elf_howto_table[(int) R_390_TLS_GOTIE64];
+    case BFD_RELOC_390_TLS_LDM64:
+      return &elf_howto_table[(int) R_390_TLS_LDM64];
+    case BFD_RELOC_390_TLS_IE64:
+      return &elf_howto_table[(int) R_390_TLS_IE64];
+    case BFD_RELOC_390_TLS_IEENT:
+      return &elf_howto_table[(int) R_390_TLS_IEENT];
+    case BFD_RELOC_390_TLS_LE64:
+      return &elf_howto_table[(int) R_390_TLS_LE64];
+    case BFD_RELOC_390_TLS_LDO64:
+      return &elf_howto_table[(int) R_390_TLS_LDO64];
+    case BFD_RELOC_390_TLS_DTPMOD:
+      return &elf_howto_table[(int) R_390_TLS_DTPMOD];
+    case BFD_RELOC_390_TLS_DTPOFF:
+      return &elf_howto_table[(int) R_390_TLS_DTPOFF];
+    case BFD_RELOC_390_TLS_TPOFF:
+      return &elf_howto_table[(int) R_390_TLS_TPOFF];
+    case BFD_RELOC_390_20:
+      return &elf_howto_table[(int) R_390_20];
+    case BFD_RELOC_390_GOT20:
+      return &elf_howto_table[(int) R_390_GOT20];
+    case BFD_RELOC_390_GOTPLT20:
+      return &elf_howto_table[(int) R_390_GOTPLT20];
+    case BFD_RELOC_390_TLS_GOTIE20:
+      return &elf_howto_table[(int) R_390_TLS_GOTIE20];
+    case BFD_RELOC_VTABLE_INHERIT:
+      return &elf64_s390_vtinherit_howto;
+    case BFD_RELOC_VTABLE_ENTRY:
+      return &elf64_s390_vtentry_howto;
+    default:
+      break;
+    }
+  return 0;
+}
+
+static reloc_howto_type *
+elf_s390_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (elf_howto_table) / sizeof (elf_howto_table[0]);
+       i++)
+    if (elf_howto_table[i].name != NULL
+	&& strcasecmp (elf_howto_table[i].name, r_name) == 0)
+      return &elf_howto_table[i];
+
+    if (strcasecmp (elf64_s390_vtinherit_howto.name, r_name) == 0)
+      return &elf64_s390_vtinherit_howto;
+    if (strcasecmp (elf64_s390_vtentry_howto.name, r_name) == 0)
+      return &elf64_s390_vtentry_howto;
+
+  return NULL;
+}
+
+/* We need to use ELF64_R_TYPE so we have our own copy of this function,
+   and elf64-s390.c has its own copy.  */
+
+static void
+elf_s390_info_to_howto (abfd, cache_ptr, dst)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *cache_ptr;
+     Elf_Internal_Rela *dst;
+{
+  unsigned int r_type = ELF64_R_TYPE(dst->r_info);
+  switch (r_type)
+    {
+    case R_390_GNU_VTINHERIT:
+      cache_ptr->howto = &elf64_s390_vtinherit_howto;
+      break;
+
+    case R_390_GNU_VTENTRY:
+      cache_ptr->howto = &elf64_s390_vtentry_howto;
+      break;
+
+    default:
+      if (r_type >= sizeof (elf_howto_table) / sizeof (elf_howto_table[0]))
+	{
+	  (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
+				 abfd, (int) r_type);
+	  r_type = R_390_NONE;
+	}
+      cache_ptr->howto = &elf_howto_table[r_type];
+    }
+}
+
+/* A relocation function which doesn't do anything.  */
+static bfd_reloc_status_type
+s390_tls_reloc (abfd, reloc_entry, symbol, data, input_section,
+		output_bfd, error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry;
+     asymbol *symbol ATTRIBUTE_UNUSED;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  if (output_bfd)
+    reloc_entry->address += input_section->output_offset;
+  return bfd_reloc_ok;
+}
+
+/* Handle the large displacement relocs.  */
+static bfd_reloc_status_type
+s390_elf_ldisp_reloc (abfd, reloc_entry, symbol, data, input_section,
+                      output_bfd, error_message)
+     bfd *abfd;
+     arelent *reloc_entry;
+     asymbol *symbol;
+     PTR data;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  reloc_howto_type *howto = reloc_entry->howto;
+  bfd_vma relocation;
+  bfd_vma insn;
+
+  if (output_bfd != (bfd *) NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (! howto->partial_inplace
+	  || reloc_entry->addend == 0))
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+  if (output_bfd != NULL)
+    return bfd_reloc_continue;
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  relocation = (symbol->value
+		+ symbol->section->output_section->vma
+		+ symbol->section->output_offset);
+  relocation += reloc_entry->addend;
+  if (howto->pc_relative)
+    {
+      relocation -= (input_section->output_section->vma
+		     + input_section->output_offset);
+      relocation -= reloc_entry->address;
+    }
+
+  insn = bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address); 
+  insn |= (relocation & 0xfff) << 16 | (relocation & 0xff000) >> 4;
+  bfd_put_32 (abfd, insn, (bfd_byte *) data + reloc_entry->address);
+
+  if ((bfd_signed_vma) relocation < - 0x80000
+      || (bfd_signed_vma) relocation > 0x7ffff)
+    return bfd_reloc_overflow;
+  else
+    return bfd_reloc_ok;
+}
+
+static bfd_boolean
+elf_s390_is_local_label_name (abfd, name)
+     bfd *abfd;
+     const char *name;
+{
+  if (name[0] == '.' && (name[1] == 'X' || name[1] == 'L'))
+    return TRUE;
+
+  return _bfd_elf_is_local_label_name (abfd, name);
+}
+
+/* Functions for the 390 ELF linker.  */
+
+/* The name of the dynamic interpreter.  This is put in the .interp
+   section.  */
+
+#define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so.1"
+
+/* If ELIMINATE_COPY_RELOCS is non-zero, the linker will try to avoid
+   copying dynamic variables from a shared lib into an app's dynbss
+   section, and instead use a dynamic relocation to point into the
+   shared lib.  */
+#define ELIMINATE_COPY_RELOCS 1
+
+/* The size in bytes of the first entry in the procedure linkage table.  */
+#define PLT_FIRST_ENTRY_SIZE 32
+/* The size in bytes of an entry in the procedure linkage table.  */
+#define PLT_ENTRY_SIZE 32
+
+#define GOT_ENTRY_SIZE 8
+
+/* The first three entries in a procedure linkage table are reserved,
+   and the initial contents are unimportant (we zero them out).
+   Subsequent entries look like this.  See the SVR4 ABI 386
+   supplement to see how this works.  */
+
+/* For the s390, simple addr offset can only be 0 - 4096.
+   To use the full 16777216 TB address space, several instructions
+   are needed to load an address in a register and execute
+   a branch( or just saving the address)
+
+   Furthermore, only r 0 and 1 are free to use!!!  */
+
+/* The first 3 words in the GOT are then reserved.
+   Word 0 is the address of the dynamic table.
+   Word 1 is a pointer to a structure describing the object
+   Word 2 is used to point to the loader entry address.
+
+   The code for PLT entries looks like this:
+
+   The GOT holds the address in the PLT to be executed.
+   The loader then gets:
+   24(15) =  Pointer to the structure describing the object.
+   28(15) =  Offset in symbol table
+   The loader  must  then find the module where the function is
+   and insert the address in the GOT.
+
+   PLT1: LARL 1,<fn>@GOTENT # 6 bytes  Load address of GOT entry in r1
+         LG   1,0(1)      # 6 bytes  Load address from GOT in r1
+         BCR  15,1        # 2 bytes  Jump to address
+   RET1: BASR 1,0         # 2 bytes  Return from GOT 1st time
+         LGF  1,12(1)     # 6 bytes  Load offset in symbl table in r1
+         BRCL 15,-x       # 6 bytes  Jump to start of PLT
+         .long ?          # 4 bytes  offset into symbol table
+
+   Total = 32 bytes per PLT entry
+   Fixup at offset 2: relative address to GOT entry
+   Fixup at offset 22: relative branch to PLT0
+   Fixup at offset 28: 32 bit offset into symbol table
+
+   A 32 bit offset into the symbol table is enough. It allows for symbol
+   tables up to a size of 2 gigabyte. A single dynamic object (the main
+   program, any shared library) is limited to 4GB in size and I want to see
+   the program that manages to have a symbol table of more than 2 GB with a
+   total size of at max 4 GB.  */
+
+#define PLT_ENTRY_WORD0     (bfd_vma) 0xc0100000
+#define PLT_ENTRY_WORD1     (bfd_vma) 0x0000e310
+#define PLT_ENTRY_WORD2     (bfd_vma) 0x10000004
+#define PLT_ENTRY_WORD3     (bfd_vma) 0x07f10d10
+#define PLT_ENTRY_WORD4     (bfd_vma) 0xe310100c
+#define PLT_ENTRY_WORD5     (bfd_vma) 0x0014c0f4
+#define PLT_ENTRY_WORD6     (bfd_vma) 0x00000000
+#define PLT_ENTRY_WORD7     (bfd_vma) 0x00000000
+
+/* The first PLT entry pushes the offset into the symbol table
+   from R1 onto the stack at 8(15) and the loader object info
+   at 12(15), loads the loader address in R1 and jumps to it.  */
+
+/* The first entry in the PLT:
+
+  PLT0:
+     STG  1,56(15)  # r1 contains the offset into the symbol table
+     LARL 1,_GLOBAL_OFFSET_TABLE # load address of global offset table
+     MVC  48(8,15),8(1) # move loader ino (object struct address) to stack
+     LG   1,16(1)   # get entry address of loader
+     BCR  15,1      # jump to loader
+
+     Fixup at offset 8: relative address to start of GOT.  */
+
+#define PLT_FIRST_ENTRY_WORD0     (bfd_vma) 0xe310f038
+#define PLT_FIRST_ENTRY_WORD1     (bfd_vma) 0x0024c010
+#define PLT_FIRST_ENTRY_WORD2     (bfd_vma) 0x00000000
+#define PLT_FIRST_ENTRY_WORD3     (bfd_vma) 0xd207f030
+#define PLT_FIRST_ENTRY_WORD4     (bfd_vma) 0x1008e310
+#define PLT_FIRST_ENTRY_WORD5     (bfd_vma) 0x10100004
+#define PLT_FIRST_ENTRY_WORD6     (bfd_vma) 0x07f10700
+#define PLT_FIRST_ENTRY_WORD7     (bfd_vma) 0x07000700
+
+/* The s390 linker needs to keep track of the number of relocs that it
+   decides to copy as dynamic relocs in check_relocs for each symbol.
+   This is so that it can later discard them if they are found to be
+   unnecessary.  We store the information in a field extending the
+   regular ELF linker hash table.  */
+
+struct elf_s390_dyn_relocs
+{
+  struct elf_s390_dyn_relocs *next;
+
+  /* The input section of the reloc.  */
+  asection *sec;
+
+  /* Total number of relocs copied for the input section.  */
+  bfd_size_type count;
+
+  /* Number of pc-relative relocs copied for the input section.  */
+  bfd_size_type pc_count;
+};
+
+/* s390 ELF linker hash entry.  */
+
+struct elf_s390_link_hash_entry
+{
+  struct elf_link_hash_entry elf;
+
+  /* Track dynamic relocs copied for this symbol.  */
+  struct elf_s390_dyn_relocs *dyn_relocs;
+
+  /* Number of GOTPLT references for a function.  */
+  bfd_signed_vma gotplt_refcount;
+
+#define GOT_UNKNOWN	0
+#define GOT_NORMAL	1
+#define GOT_TLS_GD	2
+#define GOT_TLS_IE	3
+#define GOT_TLS_IE_NLT	3
+  unsigned char tls_type;
+};
+
+#define elf_s390_hash_entry(ent) \
+  ((struct elf_s390_link_hash_entry *)(ent))
+
+/* NOTE: Keep this structure in sync with
+   the one declared in elf32-s390.c.  */
+struct elf_s390_obj_tdata
+{
+  struct elf_obj_tdata root;
+
+  /* TLS type for each local got entry.  */
+  char *local_got_tls_type;
+};
+
+#define elf_s390_tdata(abfd) \
+  ((struct elf_s390_obj_tdata *) (abfd)->tdata.any)
+
+#define elf_s390_local_got_tls_type(abfd) \
+  (elf_s390_tdata (abfd)->local_got_tls_type)
+
+#define is_s390_elf(bfd)				\
+  (bfd_get_flavour (bfd) == bfd_target_elf_flavour	\
+   && elf_tdata (bfd) != NULL				\
+   && elf_object_id (bfd) == S390_ELF_DATA)
+
+static bfd_boolean
+elf_s390_mkobject (bfd *abfd)
+{
+  return bfd_elf_allocate_object (abfd, sizeof (struct elf_s390_obj_tdata),
+				  S390_ELF_DATA);
+}
+
+static bfd_boolean
+elf_s390_object_p (abfd)
+     bfd *abfd;
+{
+  /* Set the right machine number for an s390 elf32 file.  */
+  return bfd_default_set_arch_mach (abfd, bfd_arch_s390, bfd_mach_s390_64);
+}
+
+/* s390 ELF linker hash table.  */
+
+struct elf_s390_link_hash_table
+{
+  struct elf_link_hash_table elf;
+
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *sgot;
+  asection *sgotplt;
+  asection *srelgot;
+  asection *splt;
+  asection *srelplt;
+  asection *sdynbss;
+  asection *srelbss;
+
+  union {
+    bfd_signed_vma refcount;
+    bfd_vma offset;
+  } tls_ldm_got;
+
+  /* Small local sym cache.  */
+  struct sym_cache sym_cache;
+};
+
+/* Get the s390 ELF linker hash table from a link_info structure.  */
+
+#define elf_s390_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == S390_ELF_DATA ? ((struct elf_s390_link_hash_table *) ((p)->hash)) : NULL)
+
+/* Create an entry in an s390 ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+link_hash_newfunc (entry, table, string)
+     struct bfd_hash_entry *entry;
+     struct bfd_hash_table *table;
+     const char *string;
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table,
+				 sizeof (struct elf_s390_link_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = _bfd_elf_link_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct elf_s390_link_hash_entry *eh;
+
+      eh = (struct elf_s390_link_hash_entry *) entry;
+      eh->dyn_relocs = NULL;
+      eh->gotplt_refcount = 0;
+      eh->tls_type = GOT_UNKNOWN;
+    }
+
+  return entry;
+}
+
+/* Create an s390 ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+elf_s390_link_hash_table_create (abfd)
+     bfd *abfd;
+{
+  struct elf_s390_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct elf_s390_link_hash_table);
+
+  ret = (struct elf_s390_link_hash_table *) bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd, link_hash_newfunc,
+				      sizeof (struct elf_s390_link_hash_entry),
+				      S390_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  ret->sgot = NULL;
+  ret->sgotplt = NULL;
+  ret->srelgot = NULL;
+  ret->splt = NULL;
+  ret->srelplt = NULL;
+  ret->sdynbss = NULL;
+  ret->srelbss = NULL;
+  ret->tls_ldm_got.refcount = 0;
+  ret->sym_cache.abfd = NULL;
+
+  return &ret->elf.root;
+}
+
+/* Create .got, .gotplt, and .rela.got sections in DYNOBJ, and set up
+   shortcuts to them in our hash table.  */
+
+static bfd_boolean
+create_got_section (bfd *dynobj,
+		    struct bfd_link_info *info)
+{
+  struct elf_s390_link_hash_table *htab;
+
+  if (! _bfd_elf_create_got_section (dynobj, info))
+    return FALSE;
+
+  htab = elf_s390_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  htab->sgot = bfd_get_section_by_name (dynobj, ".got");
+  htab->sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");
+  htab->srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+  if (!htab->sgot || !htab->sgotplt || !htab->srelgot)
+    abort ();
+  return TRUE;
+}
+
+/* Create .plt, .rela.plt, .got, .got.plt, .rela.got, .dynbss, and
+   .rela.bss sections in DYNOBJ, and set up shortcuts to them in our
+   hash table.  */
+
+static bfd_boolean
+elf_s390_create_dynamic_sections (bfd *dynobj,
+				  struct bfd_link_info *info)
+{
+  struct elf_s390_link_hash_table *htab;
+
+  htab = elf_s390_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (!htab->sgot && !create_got_section (dynobj, info))
+    return FALSE;
+
+  if (!_bfd_elf_create_dynamic_sections (dynobj, info))
+    return FALSE;
+
+  htab->splt = bfd_get_section_by_name (dynobj, ".plt");
+  htab->srelplt = bfd_get_section_by_name (dynobj, ".rela.plt");
+  htab->sdynbss = bfd_get_section_by_name (dynobj, ".dynbss");
+  if (!info->shared)
+    htab->srelbss = bfd_get_section_by_name (dynobj, ".rela.bss");
+
+  if (!htab->splt || !htab->srelplt || !htab->sdynbss
+      || (!info->shared && !htab->srelbss))
+    abort ();
+
+  return TRUE;
+}
+
+/* Copy the extra info we tack onto an elf_link_hash_entry.  */
+
+static void
+elf_s390_copy_indirect_symbol (info, dir, ind)
+     struct bfd_link_info *info;
+     struct elf_link_hash_entry *dir, *ind;
+{
+  struct elf_s390_link_hash_entry *edir, *eind;
+
+  edir = (struct elf_s390_link_hash_entry *) dir;
+  eind = (struct elf_s390_link_hash_entry *) ind;
+
+  if (eind->dyn_relocs != NULL)
+    {
+      if (edir->dyn_relocs != NULL)
+	{
+	  struct elf_s390_dyn_relocs **pp;
+	  struct elf_s390_dyn_relocs *p;
+
+	  /* Add reloc counts against the indirect sym to the direct sym
+	     list.  Merge any entries against the same section.  */
+	  for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      struct elf_s390_dyn_relocs *q;
+
+	      for (q = edir->dyn_relocs; q != NULL; q = q->next)
+		if (q->sec == p->sec)
+		  {
+		    q->pc_count += p->pc_count;
+		    q->count += p->count;
+		    *pp = p->next;
+		    break;
+		  }
+	      if (q == NULL)
+		pp = &p->next;
+	    }
+	  *pp = edir->dyn_relocs;
+	}
+
+      edir->dyn_relocs = eind->dyn_relocs;
+      eind->dyn_relocs = NULL;
+    }
+
+  if (ind->root.type == bfd_link_hash_indirect
+      && dir->got.refcount <= 0)
+    {
+      edir->tls_type = eind->tls_type;
+      eind->tls_type = GOT_UNKNOWN;
+    }
+
+  if (ELIMINATE_COPY_RELOCS
+      && ind->root.type != bfd_link_hash_indirect
+      && dir->dynamic_adjusted)
+    {
+      /* If called to transfer flags for a weakdef during processing
+	 of elf_adjust_dynamic_symbol, don't copy non_got_ref.
+	 We clear it ourselves for ELIMINATE_COPY_RELOCS.  */
+      dir->ref_dynamic |= ind->ref_dynamic;
+      dir->ref_regular |= ind->ref_regular;
+      dir->ref_regular_nonweak |= ind->ref_regular_nonweak;
+      dir->needs_plt |= ind->needs_plt;
+    }
+  else
+    _bfd_elf_link_hash_copy_indirect (info, dir, ind);
+}
+
+static int
+elf_s390_tls_transition (info, r_type, is_local)
+     struct bfd_link_info *info;
+     int r_type;
+     int is_local;
+{
+  if (info->shared)
+    return r_type;
+
+  switch (r_type)
+    {
+    case R_390_TLS_GD64:
+    case R_390_TLS_IE64:
+      if (is_local)
+	return R_390_TLS_LE64;
+      return R_390_TLS_IE64;
+    case R_390_TLS_GOTIE64:
+      if (is_local)
+	return R_390_TLS_LE64;
+      return R_390_TLS_GOTIE64;
+    case R_390_TLS_LDM64:
+      return R_390_TLS_LE64;
+    }
+
+  return r_type;
+}
+
+/* Look through the relocs for a section during the first phase, and
+   allocate space in the global offset table or procedure linkage
+   table.  */
+
+static bfd_boolean
+elf_s390_check_relocs (bfd *abfd,
+		       struct bfd_link_info *info,
+		       asection *sec,
+		       const Elf_Internal_Rela *relocs)
+{
+  struct elf_s390_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  asection *sreloc;
+  bfd_signed_vma *local_got_refcounts;
+  int tls_type, old_tls_type;
+
+  if (info->relocatable)
+    return TRUE;
+
+  BFD_ASSERT (is_s390_elf (abfd));
+
+  htab = elf_s390_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+
+  sreloc = NULL;
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      unsigned int r_type;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+
+      r_symndx = ELF64_R_SYM (rel->r_info);
+
+      if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
+	{
+	  (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
+				 abfd,
+				 r_symndx);
+	  return FALSE;
+	}
+
+      if (r_symndx < symtab_hdr->sh_info)
+	h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      /* Create got section and local_got_refcounts array if they
+	 are needed.  */
+      r_type = elf_s390_tls_transition (info,
+					ELF64_R_TYPE (rel->r_info),
+					h == NULL);
+      switch (r_type)
+	{
+	case R_390_GOT12:
+	case R_390_GOT16:
+	case R_390_GOT20:
+	case R_390_GOT32:
+	case R_390_GOT64:
+	case R_390_GOTENT:
+	case R_390_GOTPLT12:
+	case R_390_GOTPLT16:
+	case R_390_GOTPLT20:
+	case R_390_GOTPLT32:
+	case R_390_GOTPLT64:
+	case R_390_GOTPLTENT:
+	case R_390_TLS_GD64:
+	case R_390_TLS_GOTIE12:
+	case R_390_TLS_GOTIE20:
+	case R_390_TLS_GOTIE64:
+	case R_390_TLS_IEENT:
+	case R_390_TLS_IE64:
+	case R_390_TLS_LDM64:
+	  if (h == NULL
+	      && local_got_refcounts == NULL)
+	    {
+	      bfd_size_type size;
+
+	      size = symtab_hdr->sh_info;
+	      size *= (sizeof (bfd_signed_vma) + sizeof(char));
+	      local_got_refcounts = ((bfd_signed_vma *)
+				     bfd_zalloc (abfd, size));
+	      if (local_got_refcounts == NULL)
+		return FALSE;
+	      elf_local_got_refcounts (abfd) = local_got_refcounts;
+	      elf_s390_local_got_tls_type (abfd)
+		= (char *) (local_got_refcounts + symtab_hdr->sh_info);
+	    }
+	  /* Fall through.  */
+	case R_390_GOTOFF16:
+	case R_390_GOTOFF32:
+	case R_390_GOTOFF64:
+	case R_390_GOTPC:
+	case R_390_GOTPCDBL:
+	  if (htab->sgot == NULL)
+	    {
+	      if (htab->elf.dynobj == NULL)
+		htab->elf.dynobj = abfd;
+	      if (!create_got_section (htab->elf.dynobj, info))
+		return FALSE;
+	    }
+	}
+
+      switch (r_type)
+	{
+	case R_390_GOTOFF16:
+	case R_390_GOTOFF32:
+	case R_390_GOTOFF64:
+	case R_390_GOTPC:
+	case R_390_GOTPCDBL:
+	  /* Got is created, nothing to be done.  */
+	  break;
+
+	case R_390_PLT16DBL:
+	case R_390_PLT32:
+	case R_390_PLT32DBL:
+	case R_390_PLT64:
+	case R_390_PLTOFF16:
+	case R_390_PLTOFF32:
+	case R_390_PLTOFF64:
+	  /* This symbol requires a procedure linkage table entry.  We
+	     actually build the entry in adjust_dynamic_symbol,
+	     because this might be a case of linking PIC code which is
+	     never referenced by a dynamic object, in which case we
+	     don't need to generate a procedure linkage table entry
+	     after all.  */
+
+	  /* If this is a local symbol, we resolve it directly without
+	     creating a procedure linkage table entry.  */
+	  if (h != NULL)
+	    {
+	      h->needs_plt = 1;
+	      h->plt.refcount += 1;
+	    }
+	  break;
+
+	case R_390_GOTPLT12:
+	case R_390_GOTPLT16:
+	case R_390_GOTPLT20:
+	case R_390_GOTPLT32:
+	case R_390_GOTPLT64:
+	case R_390_GOTPLTENT:
+	  /* This symbol requires either a procedure linkage table entry
+	     or an entry in the local got. We actually build the entry
+	     in adjust_dynamic_symbol because whether this is really a
+	     global reference can change and with it the fact if we have
+	     to create a plt entry or a local got entry. To be able to
+	     make a once global symbol a local one we have to keep track
+	     of the number of gotplt references that exist for this
+	     symbol.  */
+	  if (h != NULL)
+	    {
+	      ((struct elf_s390_link_hash_entry *) h)->gotplt_refcount++;
+	      h->needs_plt = 1;
+	      h->plt.refcount += 1;
+	    }
+	  else
+	    local_got_refcounts[r_symndx] += 1;
+	  break;
+
+	case R_390_TLS_LDM64:
+	  htab->tls_ldm_got.refcount += 1;
+	  break;
+
+	case R_390_TLS_IE64:
+	case R_390_TLS_GOTIE12:
+	case R_390_TLS_GOTIE20:
+	case R_390_TLS_GOTIE64:
+	case R_390_TLS_IEENT:
+	  if (info->shared)
+	    info->flags |= DF_STATIC_TLS;
+	  /* Fall through */
+
+	case R_390_GOT12:
+	case R_390_GOT16:
+	case R_390_GOT20:
+	case R_390_GOT32:
+	case R_390_GOT64:
+	case R_390_GOTENT:
+	case R_390_TLS_GD64:
+	  /* This symbol requires a global offset table entry.  */
+	  switch (r_type)
+	    {
+	    default:
+	    case R_390_GOT12:
+	    case R_390_GOT16:
+	    case R_390_GOT20:
+	    case R_390_GOT32:
+	    case R_390_GOTENT:
+	      tls_type = GOT_NORMAL;
+	      break;
+	    case R_390_TLS_GD64:
+	      tls_type = GOT_TLS_GD;
+	      break;
+	    case R_390_TLS_IE64:
+	    case R_390_TLS_GOTIE64:
+	      tls_type = GOT_TLS_IE;
+	      break;
+	    case R_390_TLS_GOTIE12:
+	    case R_390_TLS_GOTIE20:
+	    case R_390_TLS_IEENT:
+	      tls_type = GOT_TLS_IE_NLT;
+	      break;
+	    }
+
+	  if (h != NULL)
+	    {
+	      h->got.refcount += 1;
+	      old_tls_type = elf_s390_hash_entry(h)->tls_type;
+	    }
+	  else
+	    {
+	      local_got_refcounts[r_symndx] += 1;
+	      old_tls_type = elf_s390_local_got_tls_type (abfd) [r_symndx];
+	    }
+	  /* If a TLS symbol is accessed using IE at least once,
+	     there is no point to use dynamic model for it.  */
+	  if (old_tls_type != tls_type && old_tls_type != GOT_UNKNOWN)
+	    {
+	      if (old_tls_type == GOT_NORMAL || tls_type == GOT_NORMAL)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B: `%s' accessed both as normal and thread local symbol"),
+		     abfd, h->root.root.string);
+		  return FALSE;
+		}
+	      if (old_tls_type > tls_type)
+		tls_type = old_tls_type;
+	    }
+
+	  if (old_tls_type != tls_type)
+	    {
+	      if (h != NULL)
+		elf_s390_hash_entry (h)->tls_type = tls_type;
+	      else
+		elf_s390_local_got_tls_type (abfd) [r_symndx] = tls_type;
+	    }
+
+	  if (r_type != R_390_TLS_IE64)
+	    break;
+	  /* Fall through */
+
+	case R_390_TLS_LE64:
+	  if (!info->shared)
+	    break;
+	  info->flags |= DF_STATIC_TLS;
+	  /* Fall through */
+
+	case R_390_8:
+	case R_390_16:
+	case R_390_32:
+	case R_390_64:
+	case R_390_PC16:
+	case R_390_PC16DBL:
+	case R_390_PC32:
+	case R_390_PC32DBL:
+	case R_390_PC64:
+	  if (h != NULL && !info->shared)
+	    {
+	      /* If this reloc is in a read-only section, we might
+		 need a copy reloc.  We can't check reliably at this
+		 stage whether the section is read-only, as input
+		 sections have not yet been mapped to output sections.
+		 Tentatively set the flag for now, and correct in
+		 adjust_dynamic_symbol.  */
+	      h->non_got_ref = 1;
+
+	      /* We may need a .plt entry if the function this reloc
+		 refers to is in a shared lib.  */
+	      h->plt.refcount += 1;
+	    }
+
+	  /* If we are creating a shared library, and this is a reloc
+	     against a global symbol, or a non PC relative reloc
+	     against a local symbol, then we need to copy the reloc
+	     into the shared library.  However, if we are linking with
+	     -Bsymbolic, we do not need to copy a reloc against a
+	     global symbol which is defined in an object we are
+	     including in the link (i.e., DEF_REGULAR is set).  At
+	     this point we have not seen all the input files, so it is
+	     possible that DEF_REGULAR is not set now but will be set
+	     later (it is never cleared).  In case of a weak definition,
+	     DEF_REGULAR may be cleared later by a strong definition in
+	     a shared library. We account for that possibility below by
+	     storing information in the relocs_copied field of the hash
+	     table entry.  A similar situation occurs when creating
+	     shared libraries and symbol visibility changes render the
+	     symbol local.
+
+	     If on the other hand, we are creating an executable, we
+	     may need to keep relocations for symbols satisfied by a
+	     dynamic library if we manage to avoid copy relocs for the
+	     symbol.  */
+	  if ((info->shared
+	       && (sec->flags & SEC_ALLOC) != 0
+	       && ((ELF64_R_TYPE (rel->r_info) != R_390_PC16
+		    && ELF64_R_TYPE (rel->r_info) != R_390_PC16DBL
+		    && ELF64_R_TYPE (rel->r_info) != R_390_PC32
+		    && ELF64_R_TYPE (rel->r_info) != R_390_PC32DBL
+		    && ELF64_R_TYPE (rel->r_info) != R_390_PC64)
+		   || (h != NULL
+		       && (! SYMBOLIC_BIND (info, h)
+			   || h->root.type == bfd_link_hash_defweak
+			   || !h->def_regular))))
+	      || (ELIMINATE_COPY_RELOCS
+		  && !info->shared
+		  && (sec->flags & SEC_ALLOC) != 0
+		  && h != NULL
+		  && (h->root.type == bfd_link_hash_defweak
+		      || !h->def_regular)))
+	    {
+	      struct elf_s390_dyn_relocs *p;
+	      struct elf_s390_dyn_relocs **head;
+
+	      /* We must copy these reloc types into the output file.
+		 Create a reloc section in dynobj and make room for
+		 this reloc.  */
+	      if (sreloc == NULL)
+		{
+		  if (htab->elf.dynobj == NULL)
+		    htab->elf.dynobj = abfd;
+
+		  sreloc = _bfd_elf_make_dynamic_reloc_section
+		    (sec, htab->elf.dynobj, 3, abfd, /*rela?*/ TRUE);
+
+		  if (sreloc == NULL)
+		    return FALSE;
+		}
+
+	      /* If this is a global symbol, we count the number of
+		 relocations we need for this symbol.  */
+	      if (h != NULL)
+		{
+		  head = &((struct elf_s390_link_hash_entry *) h)->dyn_relocs;
+		}
+	      else
+		{
+		  /* Track dynamic relocs needed for local syms too.
+		     We really need local syms available to do this
+		     easily.  Oh well.  */
+		  asection *s;
+		  void *vpp;
+		  Elf_Internal_Sym *isym;
+
+		  isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+						abfd, r_symndx);
+		  if (isym == NULL)
+		    return FALSE;
+
+		  s = bfd_section_from_elf_index (abfd, isym->st_shndx);
+		  if (s == NULL)
+		    s = sec;
+
+		  vpp = &elf_section_data (s)->local_dynrel;
+		  head = (struct elf_s390_dyn_relocs **) vpp;
+		}
+
+	      p = *head;
+	      if (p == NULL || p->sec != sec)
+		{
+		  bfd_size_type amt = sizeof *p;
+		  p = ((struct elf_s390_dyn_relocs *)
+		       bfd_alloc (htab->elf.dynobj, amt));
+		  if (p == NULL)
+		    return FALSE;
+		  p->next = *head;
+		  *head = p;
+		  p->sec = sec;
+		  p->count = 0;
+		  p->pc_count = 0;
+		}
+
+	      p->count += 1;
+	      if (ELF64_R_TYPE (rel->r_info) == R_390_PC16
+		  || ELF64_R_TYPE (rel->r_info) == R_390_PC16DBL
+		  || ELF64_R_TYPE (rel->r_info) == R_390_PC32
+		  || ELF64_R_TYPE (rel->r_info) == R_390_PC32DBL
+		  || ELF64_R_TYPE (rel->r_info) == R_390_PC64)
+		p->pc_count += 1;
+	    }
+	  break;
+
+	  /* This relocation describes the C++ object vtable hierarchy.
+	     Reconstruct it for later use during GC.  */
+	case R_390_GNU_VTINHERIT:
+	  if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+	    return FALSE;
+	  break;
+
+	  /* This relocation describes which C++ vtable entries are actually
+	     used.  Record for later use during GC.  */
+	case R_390_GNU_VTENTRY:
+	  BFD_ASSERT (h != NULL);
+	  if (h != NULL
+	      && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+	    return FALSE;
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+static asection *
+elf_s390_gc_mark_hook (asection *sec,
+		       struct bfd_link_info *info,
+		       Elf_Internal_Rela *rel,
+		       struct elf_link_hash_entry *h,
+		       Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF64_R_TYPE (rel->r_info))
+      {
+      case R_390_GNU_VTINHERIT:
+      case R_390_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Update the got entry reference counts for the section being removed.  */
+
+static bfd_boolean
+elf_s390_gc_sweep_hook (bfd *abfd,
+			struct bfd_link_info *info,
+			asection *sec,
+			const Elf_Internal_Rela *relocs)
+{
+  struct elf_s390_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  const Elf_Internal_Rela *rel, *relend;
+
+  if (info->relocatable)
+    return TRUE;
+
+  htab = elf_s390_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  elf_section_data (sec)->local_dynrel = NULL;
+
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      unsigned int r_type;
+      struct elf_link_hash_entry *h = NULL;
+
+      r_symndx = ELF64_R_SYM (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  struct elf_s390_link_hash_entry *eh;
+	  struct elf_s390_dyn_relocs **pp;
+	  struct elf_s390_dyn_relocs *p;
+
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	  eh = (struct elf_s390_link_hash_entry *) h;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
+	    if (p->sec == sec)
+	      {
+		/* Everything must go for SEC.  */
+		*pp = p->next;
+		break;
+	      }
+	}
+
+      r_type = ELF64_R_TYPE (rel->r_info);
+      r_type = elf_s390_tls_transition (info, r_type, h != NULL);
+      switch (r_type)
+	{
+	case R_390_TLS_LDM64:
+	  if (htab->tls_ldm_got.refcount > 0)
+	    htab->tls_ldm_got.refcount -= 1;
+	  break;
+
+	case R_390_TLS_GD64:
+	case R_390_TLS_IE64:
+	case R_390_TLS_GOTIE12:
+	case R_390_TLS_GOTIE20:
+	case R_390_TLS_GOTIE64:
+	case R_390_TLS_IEENT:
+	case R_390_GOT12:
+	case R_390_GOT16:
+	case R_390_GOT20:
+	case R_390_GOT32:
+	case R_390_GOT64:
+	case R_390_GOTOFF16:
+	case R_390_GOTOFF32:
+	case R_390_GOTOFF64:
+	case R_390_GOTPC:
+	case R_390_GOTPCDBL:
+	case R_390_GOTENT:
+	  if (h != NULL)
+	    {
+	      if (h->got.refcount > 0)
+		h->got.refcount -= 1;
+	    }
+	  else if (local_got_refcounts != NULL)
+	    {
+	      if (local_got_refcounts[r_symndx] > 0)
+		local_got_refcounts[r_symndx] -= 1;
+	    }
+	  break;
+
+	case R_390_8:
+	case R_390_12:
+	case R_390_16:
+	case R_390_20:
+	case R_390_32:
+	case R_390_64:
+	case R_390_PC16:
+	case R_390_PC16DBL:
+	case R_390_PC32:
+	case R_390_PC32DBL:
+	case R_390_PC64:
+	  if (info->shared)
+	    break;
+	  /* Fall through */
+
+	case R_390_PLT16DBL:
+	case R_390_PLT32:
+	case R_390_PLT32DBL:
+	case R_390_PLT64:
+	case R_390_PLTOFF16:
+	case R_390_PLTOFF32:
+	case R_390_PLTOFF64:
+	  if (h != NULL)
+	    {
+	      if (h->plt.refcount > 0)
+		h->plt.refcount -= 1;
+	    }
+	  break;
+
+	case R_390_GOTPLT12:
+	case R_390_GOTPLT16:
+	case R_390_GOTPLT20:
+	case R_390_GOTPLT32:
+	case R_390_GOTPLT64:
+	case R_390_GOTPLTENT:
+	  if (h != NULL)
+	    {
+	      if (h->plt.refcount > 0)
+		{
+		  ((struct elf_s390_link_hash_entry *) h)->gotplt_refcount--;
+		  h->plt.refcount -= 1;
+		}
+	    }
+	  else if (local_got_refcounts != NULL)
+	    {
+	      if (local_got_refcounts[r_symndx] > 0)
+		local_got_refcounts[r_symndx] -= 1;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Make sure we emit a GOT entry if the symbol was supposed to have a PLT
+   entry but we found we will not create any.  Called when we find we will
+   not have any PLT for this symbol, by for example
+   elf_s390_adjust_dynamic_symbol when we're doing a proper dynamic link,
+   or elf_s390_size_dynamic_sections if no dynamic sections will be
+   created (we're only linking static objects).  */
+
+static void
+elf_s390_adjust_gotplt (h)
+     struct elf_s390_link_hash_entry *h;
+{
+  if (h->elf.root.type == bfd_link_hash_warning)
+    h = (struct elf_s390_link_hash_entry *) h->elf.root.u.i.link;
+
+  if (h->gotplt_refcount <= 0)
+    return;
+
+  /* We simply add the number of gotplt references to the number
+   * of got references for this symbol.  */
+  h->elf.got.refcount += h->gotplt_refcount;
+  h->gotplt_refcount = -1;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+elf_s390_adjust_dynamic_symbol (struct bfd_link_info *info,
+				struct elf_link_hash_entry *h)
+{
+  struct elf_s390_link_hash_table *htab;
+  asection *s;
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later
+     (although we could actually do it here).  */
+  if (h->type == STT_FUNC
+      || h->needs_plt)
+    {
+      if (h->plt.refcount <= 0
+	  || SYMBOL_CALLS_LOCAL (info, h)
+	  || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+	      && h->root.type == bfd_link_hash_undefweak))
+	{
+	  /* This case can occur if we saw a PLT32 reloc in an input
+	     file, but the symbol was never referred to by a dynamic
+	     object, or if all references were garbage collected.  In
+	     such a case, we don't actually need to build a procedure
+	     linkage table, and we can just do a PC32 reloc instead.  */
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	  elf_s390_adjust_gotplt((struct elf_s390_link_hash_entry *) h);
+	}
+
+      return TRUE;
+    }
+  else
+    /* It's possible that we incorrectly decided a .plt reloc was
+       needed for an R_390_PC32 reloc to a non-function sym in
+       check_relocs.  We can't decide accurately between function and
+       non-function syms in check-relocs;  Objects loaded later in
+       the link may change h->type.  So fix it now.  */
+    h->plt.offset = (bfd_vma) -1;
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      if (ELIMINATE_COPY_RELOCS || info->nocopyreloc)
+	h->non_got_ref = h->u.weakdef->non_got_ref;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if (!h->non_got_ref)
+    return TRUE;
+
+  /* If -z nocopyreloc was given, we won't generate them either.  */
+  if (info->nocopyreloc)
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  if (ELIMINATE_COPY_RELOCS)
+    {
+      struct elf_s390_link_hash_entry * eh;
+      struct elf_s390_dyn_relocs *p;
+
+      eh = (struct elf_s390_link_hash_entry *) h;
+      for (p = eh->dyn_relocs; p != NULL; p = p->next)
+	{
+	  s = p->sec->output_section;
+	  if (s != NULL && (s->flags & SEC_READONLY) != 0)
+	    break;
+	}
+
+      /* If we didn't find any dynamic relocs in read-only sections, then
+	 we'll be keeping the dynamic relocs and avoiding the copy reloc.  */
+      if (p == NULL)
+	{
+	  h->non_got_ref = 0;
+	  return TRUE;
+	}
+    }
+
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  htab = elf_s390_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* We must generate a R_390_COPY reloc to tell the dynamic linker to
+     copy the initial value out of the dynamic object and into the
+     runtime process image.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      htab->srelbss->size += sizeof (Elf64_External_Rela);
+      h->needs_copy = 1;
+    }
+
+  s = htab->sdynbss;
+
+  return _bfd_elf_adjust_dynamic_copy (h, s);
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   dynamic relocs.  */
+
+static bfd_boolean
+allocate_dynrelocs (struct elf_link_hash_entry *h,
+		    void * inf)
+{
+  struct bfd_link_info *info;
+  struct elf_s390_link_hash_table *htab;
+  struct elf_s390_link_hash_entry *eh;
+  struct elf_s390_dyn_relocs *p;
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  info = (struct bfd_link_info *) inf;
+  htab = elf_s390_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (htab->elf.dynamic_sections_created
+      && h->plt.refcount > 0)
+    {
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      if (info->shared
+	  || WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, 0, h))
+	{
+	  asection *s = htab->splt;
+
+	  /* If this is the first .plt entry, make room for the special
+	     first entry.  */
+	  if (s->size == 0)
+	    s->size += PLT_FIRST_ENTRY_SIZE;
+
+	  h->plt.offset = s->size;
+
+	  /* If this symbol is not defined in a regular file, and we are
+	     not generating a shared library, then set the symbol to this
+	     location in the .plt.  This is required to make function
+	     pointers compare as equal between the normal executable and
+	     the shared library.  */
+	  if (! info->shared
+	      && !h->def_regular)
+	    {
+	      h->root.u.def.section = s;
+	      h->root.u.def.value = h->plt.offset;
+	    }
+
+	  /* Make room for this entry.  */
+	  s->size += PLT_ENTRY_SIZE;
+
+	  /* We also need to make an entry in the .got.plt section, which
+	     will be placed in the .got section by the linker script.  */
+	  htab->sgotplt->size += GOT_ENTRY_SIZE;
+
+	  /* We also need to make an entry in the .rela.plt section.  */
+	  htab->srelplt->size += sizeof (Elf64_External_Rela);
+	}
+      else
+	{
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	  elf_s390_adjust_gotplt((struct elf_s390_link_hash_entry *) h);
+	}
+    }
+  else
+    {
+      h->plt.offset = (bfd_vma) -1;
+      h->needs_plt = 0;
+      elf_s390_adjust_gotplt((struct elf_s390_link_hash_entry *) h);
+    }
+
+  /* If R_390_TLS_{IE64,GOTIE64,GOTIE12,IEENT} symbol is now local to
+     the binary, we can optimize a bit. IE64 and GOTIE64 get converted
+     to R_390_TLS_LE64 requiring no TLS entry. For GOTIE12 and IEENT
+     we can save the dynamic TLS relocation.  */
+  if (h->got.refcount > 0
+      && !info->shared
+      && h->dynindx == -1
+      && elf_s390_hash_entry(h)->tls_type >= GOT_TLS_IE)
+    {
+      if (elf_s390_hash_entry(h)->tls_type == GOT_TLS_IE_NLT)
+	/* For the GOTIE access without a literal pool entry the offset has
+	   to be stored somewhere. The immediate value in the instruction
+	   is not bit enough so the value is stored in the got.  */
+	{
+	  h->got.offset = htab->sgot->size;
+	  htab->sgot->size += GOT_ENTRY_SIZE;
+	}
+      else
+	h->got.offset = (bfd_vma) -1;
+    }
+  else if (h->got.refcount > 0)
+    {
+      asection *s;
+      bfd_boolean dyn;
+      int tls_type = elf_s390_hash_entry(h)->tls_type;
+
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      s = htab->sgot;
+      h->got.offset = s->size;
+      s->size += GOT_ENTRY_SIZE;
+      /* R_390_TLS_GD64 needs 2 consecutive GOT slots.  */
+      if (tls_type == GOT_TLS_GD)
+	s->size += GOT_ENTRY_SIZE;
+      dyn = htab->elf.dynamic_sections_created;
+      /* R_390_TLS_IE64 needs one dynamic relocation,
+	 R_390_TLS_GD64 needs one if local symbol and two if global.  */
+      if ((tls_type == GOT_TLS_GD && h->dynindx == -1)
+	  || tls_type >= GOT_TLS_IE)
+	htab->srelgot->size += sizeof (Elf64_External_Rela);
+      else if (tls_type == GOT_TLS_GD)
+	htab->srelgot->size += 2 * sizeof (Elf64_External_Rela);
+      else if ((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		|| h->root.type != bfd_link_hash_undefweak)
+	       && (info->shared
+		   || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h)))
+	htab->srelgot->size += sizeof (Elf64_External_Rela);
+    }
+  else
+    h->got.offset = (bfd_vma) -1;
+
+  eh = (struct elf_s390_link_hash_entry *) h;
+  if (eh->dyn_relocs == NULL)
+    return TRUE;
+
+  /* In the shared -Bsymbolic case, discard space allocated for
+     dynamic pc-relative relocs against symbols which turn out to be
+     defined in regular objects.  For the normal shared case, discard
+     space for pc-relative relocs that have become local due to symbol
+     visibility changes.  */
+
+  if (info->shared)
+    {
+      if (SYMBOL_CALLS_LOCAL (info, h))
+	{
+	  struct elf_s390_dyn_relocs **pp;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      p->count -= p->pc_count;
+	      p->pc_count = 0;
+	      if (p->count == 0)
+		*pp = p->next;
+	      else
+		pp = &p->next;
+	    }
+	}
+
+      /* Also discard relocs on undefined weak syms with non-default
+	 visibility.  */
+      if (eh->dyn_relocs != NULL
+	  && h->root.type == bfd_link_hash_undefweak)
+	{
+	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	    eh->dyn_relocs = NULL;
+
+	  /* Make sure undefined weak symbols are output as a dynamic
+	     symbol in PIEs.  */
+	  else if (h->dynindx == -1
+		   && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+	}
+    }
+  else if (ELIMINATE_COPY_RELOCS)
+    {
+      /* For the non-shared case, discard space for relocs against
+	 symbols which turn out to need copy relocs or are not
+	 dynamic.  */
+
+      if (!h->non_got_ref
+	  && ((h->def_dynamic
+	       && !h->def_regular)
+	      || (htab->elf.dynamic_sections_created
+		  && (h->root.type == bfd_link_hash_undefweak
+		      || h->root.type == bfd_link_hash_undefined))))
+	{
+	  /* Make sure this symbol is output as a dynamic symbol.
+	     Undefined weak syms won't yet be marked as dynamic.  */
+	  if (h->dynindx == -1
+	      && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+
+	  /* If that succeeded, we know we'll be keeping all the
+	     relocs.  */
+	  if (h->dynindx != -1)
+	    goto keep;
+	}
+
+      eh->dyn_relocs = NULL;
+
+    keep: ;
+    }
+
+  /* Finally, allocate space.  */
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *sreloc = elf_section_data (p->sec)->sreloc;
+      sreloc->size += p->count * sizeof (Elf64_External_Rela);
+    }
+
+  return TRUE;
+}
+
+/* Find any dynamic relocs that apply to read-only sections.  */
+
+static bfd_boolean
+readonly_dynrelocs (h, inf)
+     struct elf_link_hash_entry *h;
+     PTR inf;
+{
+  struct elf_s390_link_hash_entry *eh;
+  struct elf_s390_dyn_relocs *p;
+
+  eh = (struct elf_s390_link_hash_entry *) h;
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *s = p->sec->output_section;
+
+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
+	{
+	  struct bfd_link_info *info = (struct bfd_link_info *) inf;
+
+	  info->flags |= DF_TEXTREL;
+
+	  /* Not an error, just cut short the traversal.  */
+	  return FALSE;
+	}
+    }
+  return TRUE;
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+elf_s390_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+				struct bfd_link_info *info)
+{
+  struct elf_s390_link_hash_table *htab;
+  bfd *dynobj;
+  asection *s;
+  bfd_boolean relocs;
+  bfd *ibfd;
+
+  htab = elf_s390_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = htab->elf.dynobj;
+  if (dynobj == NULL)
+    abort ();
+
+  if (htab->elf.dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  if (s == NULL)
+	    abort ();
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+
+  /* Set up .got offsets for local syms, and space for local dynamic
+     relocs.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      bfd_signed_vma *local_got;
+      bfd_signed_vma *end_local_got;
+      char *local_tls_type;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *srela;
+
+      if (! is_s390_elf (ibfd))
+	continue;
+
+      for (s = ibfd->sections; s != NULL; s = s->next)
+	{
+	  struct elf_s390_dyn_relocs *p;
+
+	  for (p = elf_section_data (s)->local_dynrel; p != NULL; p = p->next)
+	    {
+	      if (!bfd_is_abs_section (p->sec)
+		  && bfd_is_abs_section (p->sec->output_section))
+		{
+		  /* Input section has been discarded, either because
+		     it is a copy of a linkonce section or due to
+		     linker script /DISCARD/, so we'll be discarding
+		     the relocs too.  */
+		}
+	      else if (p->count != 0)
+		{
+		  srela = elf_section_data (p->sec)->sreloc;
+		  srela->size += p->count * sizeof (Elf64_External_Rela);
+		  if ((p->sec->output_section->flags & SEC_READONLY) != 0)
+		    info->flags |= DF_TEXTREL;
+		}
+	    }
+	}
+
+      local_got = elf_local_got_refcounts (ibfd);
+      if (!local_got)
+	continue;
+
+      symtab_hdr = &elf_symtab_hdr (ibfd);
+      locsymcount = symtab_hdr->sh_info;
+      end_local_got = local_got + locsymcount;
+      local_tls_type = elf_s390_local_got_tls_type (ibfd);
+      s = htab->sgot;
+      srela = htab->srelgot;
+      for (; local_got < end_local_got; ++local_got, ++local_tls_type)
+	{
+	  if (*local_got > 0)
+	    {
+	      *local_got = s->size;
+	      s->size += GOT_ENTRY_SIZE;
+	      if (*local_tls_type == GOT_TLS_GD)
+		s->size += GOT_ENTRY_SIZE;
+	      if (info->shared)
+		srela->size += sizeof (Elf64_External_Rela);
+	    }
+	  else
+	    *local_got = (bfd_vma) -1;
+	}
+    }
+
+  if (htab->tls_ldm_got.refcount > 0)
+    {
+      /* Allocate 2 got entries and 1 dynamic reloc for R_390_TLS_LDM64
+	 relocs.  */
+      htab->tls_ldm_got.offset = htab->sgot->size;
+      htab->sgot->size += 2 * GOT_ENTRY_SIZE;
+      htab->srelgot->size += sizeof (Elf64_External_Rela);
+    }
+  else
+    htab->tls_ldm_got.offset = -1;
+
+  /* Allocate global sym .plt and .got entries, and space for global
+     sym dynamic relocs.  */
+  elf_link_hash_traverse (&htab->elf, allocate_dynrelocs, (PTR) info);
+
+  /* We now have determined the sizes of the various dynamic sections.
+     Allocate memory for them.  */
+  relocs = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      if (s == htab->splt
+	  || s == htab->sgot
+	  || s == htab->sgotplt
+	  || s == htab->sdynbss)
+	{
+	  /* Strip this section if we don't need it; see the
+	     comment below.  */
+	}
+      else if (CONST_STRNEQ (bfd_get_section_name (dynobj, s), ".rela"))
+	{
+	  if (s->size != 0 && s != htab->srelplt)
+	    relocs = TRUE;
+
+	  /* We use the reloc_count field as a counter if we need
+	     to copy relocs into the output file.  */
+	  s->reloc_count = 0;
+	}
+      else
+	{
+	  /* It's not one of our sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (s->size == 0)
+	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is to handle .rela.bss and
+	     .rela.plt.  We must create it in
+	     create_dynamic_sections, because it must be created
+	     before the linker maps input sections to output
+	     sections.  The linker does that before
+	     adjust_dynamic_symbol is called, and it is that
+	     function which decides whether anything needs to go
+	     into these sections.  */
+
+	  s->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents.  We use bfd_zalloc
+	 here in case unused entries are not reclaimed before the
+	 section's contents are written out.  This should not happen,
+	 but this way if it does, we get a R_390_NONE reloc instead
+	 of garbage.  */
+      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+
+  if (htab->elf.dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in elf_s390_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (info->executable)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (htab->splt->size != 0)
+	{
+	  if (!add_dynamic_entry (DT_PLTGOT, 0)
+	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+	      || !add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+	}
+
+      if (relocs)
+	{
+	  if (!add_dynamic_entry (DT_RELA, 0)
+	      || !add_dynamic_entry (DT_RELASZ, 0)
+	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf64_External_Rela)))
+	    return FALSE;
+
+	  /* If any dynamic relocs apply to a read-only section,
+	     then we need a DT_TEXTREL entry.  */
+	  if ((info->flags & DF_TEXTREL) == 0)
+	    elf_link_hash_traverse (&htab->elf, readonly_dynrelocs,
+				    (PTR) info);
+
+	  if ((info->flags & DF_TEXTREL) != 0)
+	    {
+	      if (!add_dynamic_entry (DT_TEXTREL, 0))
+		return FALSE;
+	    }
+	}
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+/* Return the base VMA address which should be subtracted from real addresses
+   when resolving @dtpoff relocation.
+   This is PT_TLS segment p_vaddr.  */
+
+static bfd_vma
+dtpoff_base (info)
+     struct bfd_link_info *info;
+{
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (elf_hash_table (info)->tls_sec == NULL)
+    return 0;
+  return elf_hash_table (info)->tls_sec->vma;
+}
+
+/* Return the relocation value for @tpoff relocation
+   if STT_TLS virtual address is ADDRESS.  */
+
+static bfd_vma
+tpoff (info, address)
+     struct bfd_link_info *info;
+     bfd_vma address;
+{
+  struct elf_link_hash_table *htab = elf_hash_table (info);
+
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (htab->tls_sec == NULL)
+    return 0;
+  return htab->tls_size + htab->tls_sec->vma - address;
+}
+
+/* Complain if TLS instruction relocation is against an invalid
+   instruction.  */
+
+static void
+invalid_tls_insn (input_bfd, input_section, rel)
+     bfd *input_bfd;
+     asection *input_section;
+     Elf_Internal_Rela *rel;
+{
+  reloc_howto_type *howto;
+
+  howto = elf_howto_table + ELF64_R_TYPE (rel->r_info);
+  (*_bfd_error_handler)
+    (_("%B(%A+0x%lx): invalid instruction for TLS relocation %s"),
+     input_bfd,
+     input_section,
+     (long) rel->r_offset,
+     howto->name);
+  bfd_set_error (bfd_error_bad_value);
+}
+
+/* Relocate a 390 ELF section.  */
+
+static bfd_boolean
+elf_s390_relocate_section (bfd *output_bfd,
+			   struct bfd_link_info *info,
+			   bfd *input_bfd,
+			   asection *input_section,
+			   bfd_byte *contents,
+			   Elf_Internal_Rela *relocs,
+			   Elf_Internal_Sym *local_syms,
+			   asection **local_sections)
+{
+  struct elf_s390_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_vma *local_got_offsets;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+
+  BFD_ASSERT (is_s390_elf (input_bfd));
+
+  htab = elf_s390_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  symtab_hdr = &elf_symtab_hdr (input_bfd);
+  sym_hashes = elf_sym_hashes (input_bfd);
+  local_got_offsets = elf_local_got_offsets (input_bfd);
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      unsigned int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      bfd_vma off;
+      bfd_vma relocation;
+      bfd_boolean unresolved_reloc;
+      bfd_reloc_status_type r;
+      int tls_type;
+
+      r_type = ELF64_R_TYPE (rel->r_info);
+      if (r_type == (int) R_390_GNU_VTINHERIT
+	  || r_type == (int) R_390_GNU_VTENTRY)
+	continue;
+      if (r_type >= (int) R_390_max)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      howto = elf_howto_table + r_type;
+      r_symndx = ELF64_R_SYM (rel->r_info);
+
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      unresolved_reloc = FALSE;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+      else
+	{
+	  bfd_boolean warned ATTRIBUTE_UNUSED;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      switch (r_type)
+	{
+	case R_390_GOTPLT12:
+	case R_390_GOTPLT16:
+	case R_390_GOTPLT20:
+	case R_390_GOTPLT32:
+	case R_390_GOTPLT64:
+	case R_390_GOTPLTENT:
+	  /* There are three cases for a GOTPLT relocation. 1) The
+	     relocation is against the jump slot entry of a plt that
+	     will get emitted to the output file. 2) The relocation
+	     is against the jump slot of a plt entry that has been
+	     removed. elf_s390_adjust_gotplt has created a GOT entry
+	     as replacement. 3) The relocation is against a local symbol.
+	     Cases 2) and 3) are the same as the GOT relocation code
+	     so we just have to test for case 1 and fall through for
+	     the other two.  */
+	  if (h != NULL && h->plt.offset != (bfd_vma) -1)
+	    {
+	      bfd_vma plt_index;
+
+	      /* Calc. index no.
+		 Current offset - size first entry / entry size.  */
+	      plt_index = (h->plt.offset - PLT_FIRST_ENTRY_SIZE) /
+		PLT_ENTRY_SIZE;
+
+	      /* Offset in GOT is PLT index plus GOT headers(3) times 4,
+		 addr & GOT addr.  */
+	      relocation = (plt_index + 3) * GOT_ENTRY_SIZE;
+	      unresolved_reloc = FALSE;
+
+	      if (r_type == R_390_GOTPLTENT)
+		relocation += htab->sgot->output_section->vma;
+	      break;
+	    }
+	  /* Fall through.  */
+
+	case R_390_GOT12:
+	case R_390_GOT16:
+	case R_390_GOT20:
+	case R_390_GOT32:
+	case R_390_GOT64:
+	case R_390_GOTENT:
+	  /* Relocation is to the entry for this symbol in the global
+	     offset table.  */
+	  if (htab->sgot == NULL)
+	    abort ();
+
+	  if (h != NULL)
+	    {
+	      bfd_boolean dyn;
+
+	      off = h->got.offset;
+	      dyn = htab->elf.dynamic_sections_created;
+	      if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+		  || (info->shared
+		      && SYMBOL_REFERENCES_LOCAL (info, h))
+		  || (ELF_ST_VISIBILITY (h->other)
+		      && h->root.type == bfd_link_hash_undefweak))
+		{
+		  /* This is actually a static link, or it is a
+		     -Bsymbolic link and the symbol is defined
+		     locally, or the symbol was forced to be local
+		     because of a version file.  We must initialize
+		     this entry in the global offset table.  Since the
+		     offset must always be a multiple of 2, we use the
+		     least significant bit to record whether we have
+		     initialized it already.
+
+		     When doing a dynamic link, we create a .rel.got
+		     relocation entry to initialize the value.  This
+		     is done in the finish_dynamic_symbol routine.  */
+		  if ((off & 1) != 0)
+		    off &= ~1;
+		  else
+		    {
+		      bfd_put_64 (output_bfd, relocation,
+				  htab->sgot->contents + off);
+		      h->got.offset |= 1;
+		    }
+		}
+	      else
+		unresolved_reloc = FALSE;
+	    }
+	  else
+	    {
+	      if (local_got_offsets == NULL)
+		abort ();
+
+	      off = local_got_offsets[r_symndx];
+
+	      /* The offset must always be a multiple of 8.  We use
+		 the least significant bit to record whether we have
+		 already generated the necessary reloc.  */
+	      if ((off & 1) != 0)
+		off &= ~1;
+	      else
+		{
+		  bfd_put_64 (output_bfd, relocation,
+			      htab->sgot->contents + off);
+
+		  if (info->shared)
+		    {
+		      asection *s;
+		      Elf_Internal_Rela outrel;
+		      bfd_byte *loc;
+
+		      s = htab->srelgot;
+		      if (s == NULL)
+			abort ();
+
+		      outrel.r_offset = (htab->sgot->output_section->vma
+					 + htab->sgot->output_offset
+					 + off);
+		      outrel.r_info = ELF64_R_INFO (0, R_390_RELATIVE);
+		      outrel.r_addend = relocation;
+		      loc = s->contents;
+		      loc += s->reloc_count++ * sizeof (Elf64_External_Rela);
+		      bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);
+		    }
+
+		  local_got_offsets[r_symndx] |= 1;
+		}
+	    }
+
+	  if (off >= (bfd_vma) -2)
+	    abort ();
+
+	  relocation = htab->sgot->output_offset + off;
+
+	  /* For @GOTENT the relocation is against the offset between
+	     the instruction and the symbols entry in the GOT and not
+	     between the start of the GOT and the symbols entry. We
+	     add the vma of the GOT to get the correct value.  */
+	  if (   r_type == R_390_GOTENT
+	      || r_type == R_390_GOTPLTENT)
+	    relocation += htab->sgot->output_section->vma;
+
+	  break;
+
+	case R_390_GOTOFF16:
+	case R_390_GOTOFF32:
+	case R_390_GOTOFF64:
+	  /* Relocation is relative to the start of the global offset
+	     table.  */
+
+	  /* Note that sgot->output_offset is not involved in this
+	     calculation.  We always want the start of .got.  If we
+	     defined _GLOBAL_OFFSET_TABLE in a different way, as is
+	     permitted by the ABI, we might have to change this
+	     calculation.  */
+	  relocation -= htab->sgot->output_section->vma;
+	  break;
+
+	case R_390_GOTPC:
+	case R_390_GOTPCDBL:
+	  /* Use global offset table as symbol value.  */
+	  relocation = htab->sgot->output_section->vma;
+	  unresolved_reloc = FALSE;
+	  break;
+
+	case R_390_PLT16DBL:
+	case R_390_PLT32:
+	case R_390_PLT32DBL:
+	case R_390_PLT64:
+	  /* Relocation is to the entry for this symbol in the
+	     procedure linkage table.  */
+
+	  /* Resolve a PLT32 reloc against a local symbol directly,
+	     without using the procedure linkage table.  */
+	  if (h == NULL)
+	    break;
+
+	  if (h->plt.offset == (bfd_vma) -1
+	      || htab->splt == NULL)
+	    {
+	      /* We didn't make a PLT entry for this symbol.  This
+		 happens when statically linking PIC code, or when
+		 using -Bsymbolic.  */
+	      break;
+	    }
+
+	  relocation = (htab->splt->output_section->vma
+			+ htab->splt->output_offset
+			+ h->plt.offset);
+	  unresolved_reloc = FALSE;
+	  break;
+
+	case R_390_PLTOFF16:
+	case R_390_PLTOFF32:
+	case R_390_PLTOFF64:
+	  /* Relocation is to the entry for this symbol in the
+	     procedure linkage table relative to the start of the GOT.  */
+
+	  /* For local symbols or if we didn't make a PLT entry for
+	     this symbol resolve the symbol directly.  */
+	  if (   h == NULL
+	      || h->plt.offset == (bfd_vma) -1
+	      || htab->splt == NULL)
+	    {
+	      relocation -= htab->sgot->output_section->vma;
+	      break;
+	    }
+
+	  relocation = (htab->splt->output_section->vma
+			+ htab->splt->output_offset
+			+ h->plt.offset
+			- htab->sgot->output_section->vma);
+	  unresolved_reloc = FALSE;
+	  break;
+
+	case R_390_8:
+	case R_390_16:
+	case R_390_32:
+	case R_390_64:
+	case R_390_PC16:
+	case R_390_PC16DBL:
+	case R_390_PC32:
+	case R_390_PC32DBL:
+	case R_390_PC64:
+	  if ((input_section->flags & SEC_ALLOC) == 0)
+	    break;
+
+	  if ((info->shared
+	       && (h == NULL
+		   || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		   || h->root.type != bfd_link_hash_undefweak)
+	       && ((r_type != R_390_PC16
+		    && r_type != R_390_PC16DBL
+		    && r_type != R_390_PC32
+		    && r_type != R_390_PC32DBL
+		    && r_type != R_390_PC64)
+		   || !SYMBOL_CALLS_LOCAL (info, h)))
+	      || (ELIMINATE_COPY_RELOCS
+		  && !info->shared
+		  && h != NULL
+		  && h->dynindx != -1
+		  && !h->non_got_ref
+		  && ((h->def_dynamic
+		       && !h->def_regular)
+		      || h->root.type == bfd_link_hash_undefweak
+		      || h->root.type == bfd_link_hash_undefined)))
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_boolean skip, relocate;
+	      asection *sreloc;
+	      bfd_byte *loc;
+
+	      /* When generating a shared object, these relocations
+		 are copied into the output file to be resolved at run
+		 time.  */
+	      skip = FALSE;
+	      relocate = FALSE;
+
+	      outrel.r_offset =
+		_bfd_elf_section_offset (output_bfd, info, input_section,
+					 rel->r_offset);
+	      if (outrel.r_offset == (bfd_vma) -1)
+		skip = TRUE;
+	      else if (outrel.r_offset == (bfd_vma) -2)
+		skip = TRUE, relocate = TRUE;
+
+	      outrel.r_offset += (input_section->output_section->vma
+				  + input_section->output_offset);
+
+	      if (skip)
+		memset (&outrel, 0, sizeof outrel);
+	      else if (h != NULL
+		       && h->dynindx != -1
+		       && (r_type == R_390_PC16
+			   || r_type == R_390_PC16DBL
+			   || r_type == R_390_PC32
+			   || r_type == R_390_PC32DBL
+			   || r_type == R_390_PC64
+			   || !info->shared
+			   || !SYMBOLIC_BIND (info, h)
+			   || !h->def_regular))
+		{
+		  outrel.r_info = ELF64_R_INFO (h->dynindx, r_type);
+		  outrel.r_addend = rel->r_addend;
+		}
+	      else
+		{
+		  /* This symbol is local, or marked to become local.  */
+		  outrel.r_addend = relocation + rel->r_addend;
+		  if (r_type == R_390_64)
+		    {
+		      relocate = TRUE;
+		      outrel.r_info = ELF64_R_INFO (0, R_390_RELATIVE);
+		    }
+		  else
+		    {
+		      long sindx;
+
+		      if (bfd_is_abs_section (sec))
+			sindx = 0;
+		      else if (sec == NULL || sec->owner == NULL)
+			{
+			  bfd_set_error(bfd_error_bad_value);
+			  return FALSE;
+			}
+		      else
+			{
+			  asection *osec;
+
+			  osec = sec->output_section;
+			  sindx = elf_section_data (osec)->dynindx;
+
+			  if (sindx == 0)
+			    {
+			      osec = htab->elf.text_index_section;
+			      sindx = elf_section_data (osec)->dynindx;
+			    }
+			  BFD_ASSERT (sindx != 0);
+
+			  /* We are turning this relocation into one
+			     against a section symbol, so subtract out
+			     the output section's address but not the
+			     offset of the input section in the output
+			     section.  */
+			  outrel.r_addend -= osec->vma;
+			}
+		      outrel.r_info = ELF64_R_INFO (sindx, r_type);
+		    }
+		}
+
+	      sreloc = elf_section_data (input_section)->sreloc;
+	      if (sreloc == NULL)
+		abort ();
+
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf64_External_Rela);
+	      bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);
+
+	      /* If this reloc is against an external symbol, we do
+		 not want to fiddle with the addend.  Otherwise, we
+		 need to include the symbol value so that it becomes
+		 an addend for the dynamic reloc.  */
+	      if (! relocate)
+		continue;
+	    }
+
+	  break;
+
+	  /* Relocations for tls literal pool entries.  */
+	case R_390_TLS_IE64:
+	  if (info->shared)
+	    {
+	      Elf_Internal_Rela outrel;
+	      asection *sreloc;
+	      bfd_byte *loc;
+
+	      outrel.r_offset = rel->r_offset
+				+ input_section->output_section->vma
+				+ input_section->output_offset;
+	      outrel.r_info = ELF64_R_INFO (0, R_390_RELATIVE);
+	      sreloc = elf_section_data (input_section)->sreloc;
+	      if (sreloc == NULL)
+		abort ();
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf64_External_Rela);
+	      bfd_elf64_swap_reloc_out (output_bfd, &outrel, loc);
+	    }
+	  /* Fall through.  */
+
+	case R_390_TLS_GD64:
+	case R_390_TLS_GOTIE64:
+	  r_type = elf_s390_tls_transition (info, r_type, h == NULL);
+	  tls_type = GOT_UNKNOWN;
+	  if (h == NULL && local_got_offsets)
+	    tls_type = elf_s390_local_got_tls_type (input_bfd) [r_symndx];
+	  else if (h != NULL)
+	    {
+	      tls_type = elf_s390_hash_entry(h)->tls_type;
+	      if (!info->shared && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
+		r_type = R_390_TLS_LE64;
+	    }
+	  if (r_type == R_390_TLS_GD64 && tls_type >= GOT_TLS_IE)
+	    r_type = R_390_TLS_IE64;
+
+	  if (r_type == R_390_TLS_LE64)
+	    {
+	      /* This relocation gets optimized away by the local exec
+		 access optimization.  */
+	      BFD_ASSERT (! unresolved_reloc);
+	      bfd_put_64 (output_bfd, -tpoff (info, relocation),
+			  contents + rel->r_offset);
+	      continue;
+	    }
+
+	  if (htab->sgot == NULL)
+	    abort ();
+
+	  if (h != NULL)
+	    off = h->got.offset;
+	  else
+	    {
+	      if (local_got_offsets == NULL)
+		abort ();
+
+	      off = local_got_offsets[r_symndx];
+	    }
+
+	emit_tls_relocs:
+
+	  if ((off & 1) != 0)
+	    off &= ~1;
+	  else
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_byte *loc;
+	      int dr_type, indx;
+
+	      if (htab->srelgot == NULL)
+		abort ();
+
+	      outrel.r_offset = (htab->sgot->output_section->vma
+				 + htab->sgot->output_offset + off);
+
+	      indx = h && h->dynindx != -1 ? h->dynindx : 0;
+	      if (r_type == R_390_TLS_GD64)
+		dr_type = R_390_TLS_DTPMOD;
+	      else
+		dr_type = R_390_TLS_TPOFF;
+	      if (dr_type == R_390_TLS_TPOFF && indx == 0)
+		outrel.r_addend = relocation - dtpoff_base (info);
+	      else
+		outrel.r_addend = 0;
+	      outrel.r_info = ELF64_R_INFO (indx, dr_type);
+	      loc = htab->srelgot->contents;
+	      loc += htab->srelgot->reloc_count++
+		* sizeof (Elf64_External_Rela);
+	      bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);
+
+	      if (r_type == R_390_TLS_GD64)
+		{
+		  if (indx == 0)
+		    {
+	    	      BFD_ASSERT (! unresolved_reloc);
+		      bfd_put_64 (output_bfd,
+				  relocation - dtpoff_base (info),
+				  htab->sgot->contents + off + GOT_ENTRY_SIZE);
+		    }
+		  else
+		    {
+		      outrel.r_info = ELF64_R_INFO (indx, R_390_TLS_DTPOFF);
+		      outrel.r_offset += GOT_ENTRY_SIZE;
+		      outrel.r_addend = 0;
+		      htab->srelgot->reloc_count++;
+		      loc += sizeof (Elf64_External_Rela);
+		      bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);
+		    }
+		}
+
+	      if (h != NULL)
+		h->got.offset |= 1;
+	      else
+		local_got_offsets[r_symndx] |= 1;
+	    }
+
+	  if (off >= (bfd_vma) -2)
+	    abort ();
+	  if (r_type == ELF64_R_TYPE (rel->r_info))
+	    {
+	      relocation = htab->sgot->output_offset + off;
+	      if (r_type == R_390_TLS_IE64 || r_type == R_390_TLS_IEENT)
+		relocation += htab->sgot->output_section->vma;
+	      unresolved_reloc = FALSE;
+	    }
+	  else
+	    {
+	      bfd_put_64 (output_bfd, htab->sgot->output_offset + off,
+			  contents + rel->r_offset);
+	      continue;
+	    }
+	  break;
+
+	case R_390_TLS_GOTIE12:
+	case R_390_TLS_GOTIE20:
+	case R_390_TLS_IEENT:
+	  if (h == NULL)
+	    {
+	      if (local_got_offsets == NULL)
+		abort();
+	      off = local_got_offsets[r_symndx];
+	      if (info->shared)
+		goto emit_tls_relocs;
+	    }
+	  else
+	    {
+	      off = h->got.offset;
+	      tls_type = elf_s390_hash_entry(h)->tls_type;
+	      if (info->shared || h->dynindx != -1 || tls_type < GOT_TLS_IE)
+		goto emit_tls_relocs;
+	    }
+
+	  if (htab->sgot == NULL)
+	    abort ();
+
+	  BFD_ASSERT (! unresolved_reloc);
+	  bfd_put_64 (output_bfd, -tpoff (info, relocation),
+		      htab->sgot->contents + off);
+	  relocation = htab->sgot->output_offset + off;
+	  if (r_type == R_390_TLS_IEENT)
+	    relocation += htab->sgot->output_section->vma;
+	  unresolved_reloc = FALSE;
+	  break;
+
+	case R_390_TLS_LDM64:
+	  if (! info->shared)
+	    /* The literal pool entry this relocation refers to gets ignored
+	       by the optimized code of the local exec model. Do nothing
+	       and the value will turn out zero.  */
+	    continue;
+
+	  if (htab->sgot == NULL)
+	    abort ();
+
+	  off = htab->tls_ldm_got.offset;
+	  if (off & 1)
+	    off &= ~1;
+	  else
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_byte *loc;
+
+	      if (htab->srelgot == NULL)
+		abort ();
+
+	      outrel.r_offset = (htab->sgot->output_section->vma
+				 + htab->sgot->output_offset + off);
+
+	      bfd_put_64 (output_bfd, 0,
+			  htab->sgot->contents + off + GOT_ENTRY_SIZE);
+	      outrel.r_info = ELF64_R_INFO (0, R_390_TLS_DTPMOD);
+	      outrel.r_addend = 0;
+	      loc = htab->srelgot->contents;
+	      loc += htab->srelgot->reloc_count++
+		* sizeof (Elf64_External_Rela);
+	      bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);
+	      htab->tls_ldm_got.offset |= 1;
+	    }
+	  relocation = htab->sgot->output_offset + off;
+	  unresolved_reloc = FALSE;
+	  break;
+
+	case R_390_TLS_LE64:
+	  if (info->shared)
+	    {
+	      /* Linking a shared library with non-fpic code requires
+		 a R_390_TLS_TPOFF relocation.  */
+	      Elf_Internal_Rela outrel;
+	      asection *sreloc;
+	      bfd_byte *loc;
+	      int indx;
+
+	      outrel.r_offset = rel->r_offset
+				+ input_section->output_section->vma
+				+ input_section->output_offset;
+	      if (h != NULL && h->dynindx != -1)
+		indx = h->dynindx;
+	      else
+		indx = 0;
+	      outrel.r_info = ELF64_R_INFO (indx, R_390_TLS_TPOFF);
+	      if (indx == 0)
+		outrel.r_addend = relocation - dtpoff_base (info);
+	      else
+		outrel.r_addend = 0;
+	      sreloc = elf_section_data (input_section)->sreloc;
+	      if (sreloc == NULL)
+		abort ();
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf64_External_Rela);
+	      bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);
+	    }
+	  else
+	    {
+	      BFD_ASSERT (! unresolved_reloc);
+	      bfd_put_64 (output_bfd, -tpoff (info, relocation),
+			  contents + rel->r_offset);
+	    }
+	  continue;
+
+	case R_390_TLS_LDO64:
+	  if (info->shared)
+	    relocation -= dtpoff_base (info);
+	  else
+	    /* When converting LDO to LE, we must negate.  */
+	    relocation = -tpoff (info, relocation);
+	  break;
+
+	  /* Relocations for tls instructions.  */
+	case R_390_TLS_LOAD:
+	case R_390_TLS_GDCALL:
+	case R_390_TLS_LDCALL:
+	  tls_type = GOT_UNKNOWN;
+	  if (h == NULL && local_got_offsets)
+	    tls_type = elf_s390_local_got_tls_type (input_bfd) [r_symndx];
+	  else if (h != NULL)
+	    tls_type = elf_s390_hash_entry(h)->tls_type;
+
+	  if (tls_type == GOT_TLS_GD)
+	    continue;
+
+	  if (r_type == R_390_TLS_LOAD)
+	    {
+	      if (!info->shared && (h == NULL || h->dynindx == -1))
+		{
+		  /* IE->LE transition. Four valid cases:
+		     lg %rx,(0,%ry)    -> sllg %rx,%ry,0
+		     lg %rx,(%ry,0)    -> sllg %rx,%ry,0
+		     lg %rx,(%ry,%r12) -> sllg %rx,%ry,0
+		     lg %rx,(%r12,%ry) -> sllg %rx,%ry,0  */
+		  unsigned int insn0, insn1, ry;
+
+		  insn0 = bfd_get_32 (input_bfd, contents + rel->r_offset);
+		  insn1 = bfd_get_16 (input_bfd, contents + rel->r_offset + 4);
+		  if (insn1 != 0x0004)
+		    invalid_tls_insn (input_bfd, input_section, rel);
+		  ry = 0;
+		  if ((insn0 & 0xff00f000) == 0xe3000000)
+		    /* lg %rx,0(%ry,0) -> sllg %rx,%ry,0  */
+		    ry = (insn0 & 0x000f0000);
+		  else if ((insn0 & 0xff0f0000) == 0xe3000000)
+		    /* lg %rx,0(0,%ry) -> sllg %rx,%ry,0  */
+		    ry = (insn0 & 0x0000f000) << 4;
+		  else if ((insn0 & 0xff00f000) == 0xe300c000)
+		    /* lg %rx,0(%ry,%r12) -> sllg %rx,%ry,0  */
+		    ry = (insn0 & 0x000f0000);
+		  else if ((insn0 & 0xff0f0000) == 0xe30c0000)
+		    /* lg %rx,0(%r12,%ry) -> sllg %rx,%ry,0  */
+		    ry = (insn0 & 0x0000f000) << 4;
+		  else
+		    invalid_tls_insn (input_bfd, input_section, rel);
+		  insn0 = 0xeb000000 | (insn0 & 0x00f00000) | ry;
+		  insn1 = 0x000d;
+		  bfd_put_32 (output_bfd, insn0, contents + rel->r_offset);
+		  bfd_put_16 (output_bfd, insn1, contents + rel->r_offset + 4);
+		}
+	    }
+	  else if (r_type == R_390_TLS_GDCALL)
+	    {
+	      unsigned int insn0, insn1;
+
+	      insn0 = bfd_get_32 (input_bfd, contents + rel->r_offset);
+	      insn1 = bfd_get_16 (input_bfd, contents + rel->r_offset + 4);
+	      if ((insn0 & 0xffff0000) != 0xc0e50000)
+		invalid_tls_insn (input_bfd, input_section, rel);
+	      if (!info->shared && (h == NULL || h->dynindx == -1))
+		{
+		  /* GD->LE transition.
+		     brasl %r14,__tls_get_addr@plt -> brcl 0,. */
+		  insn0 = 0xc0040000;
+		  insn1 = 0x0000;
+		}
+	      else
+		{
+		  /* GD->IE transition.
+		     brasl %r14,__tls_get_addr@plt -> lg %r2,0(%r2,%r12)  */
+		  insn0 = 0xe322c000;
+		  insn1 = 0x0004;
+		}
+	      bfd_put_32 (output_bfd, insn0, contents + rel->r_offset);
+	      bfd_put_16 (output_bfd, insn1, contents + rel->r_offset + 4);
+	    }
+	  else if (r_type == R_390_TLS_LDCALL)
+	    {
+	      if (!info->shared)
+		{
+		  unsigned int insn0, insn1;
+
+		  insn0 = bfd_get_32 (input_bfd, contents + rel->r_offset);
+		  insn1 = bfd_get_16 (input_bfd, contents + rel->r_offset + 4);
+		  if ((insn0 & 0xffff0000) != 0xc0e50000)
+		    invalid_tls_insn (input_bfd, input_section, rel);
+		  /* LD->LE transition.
+		     brasl %r14,__tls_get_addr@plt -> brcl 0,. */
+		  insn0 = 0xc0040000;
+		  insn1 = 0x0000;
+		  bfd_put_32 (output_bfd, insn0, contents + rel->r_offset);
+		  bfd_put_16 (output_bfd, insn1, contents + rel->r_offset + 4);
+		}
+	    }
+	  continue;
+
+	default:
+	  break;
+	}
+
+      /* Dynamic relocs are not propagated for SEC_DEBUGGING sections
+	 because such sections are not SEC_ALLOC and thus ld.so will
+	 not process them.  */
+      if (unresolved_reloc
+	  && !((input_section->flags & SEC_DEBUGGING) != 0
+	       && h->def_dynamic))
+	(*_bfd_error_handler)
+	  (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+	   input_bfd,
+	   input_section,
+	   (long) rel->r_offset,
+	   howto->name,
+	   h->root.root.string);
+
+      if (r_type == R_390_20
+	  || r_type == R_390_GOT20
+	  || r_type == R_390_GOTPLT20
+	  || r_type == R_390_TLS_GOTIE20)
+	{
+	  relocation += rel->r_addend;
+	  relocation = (relocation&0xfff) << 8 | (relocation&0xff000) >> 12;
+	  r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+					contents, rel->r_offset,
+					relocation, 0);
+	}
+      else
+	r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+				      contents, rel->r_offset,
+				      relocation, rel->r_addend);
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char *name;
+
+	  if (h != NULL)
+	    name = h->root.root.string;
+	  else
+	    {
+	      name = bfd_elf_string_from_elf_section (input_bfd,
+						      symtab_hdr->sh_link,
+						      sym->st_name);
+	      if (name == NULL)
+		return FALSE;
+	      if (*name == '\0')
+		name = bfd_section_name (input_bfd, sec);
+	    }
+
+	  if (r == bfd_reloc_overflow)
+	    {
+
+	      if (! ((*info->callbacks->reloc_overflow)
+		     (info, (h ? &h->root : NULL), name, howto->name,
+		      (bfd_vma) 0, input_bfd, input_section,
+		      rel->r_offset)))
+		return FALSE;
+	    }
+	  else
+	    {
+	      (*_bfd_error_handler)
+		(_("%B(%A+0x%lx): reloc against `%s': error %d"),
+		 input_bfd, input_section,
+		 (long) rel->r_offset, name, (int) r);
+	      return FALSE;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+elf_s390_finish_dynamic_symbol (bfd *output_bfd,
+				struct bfd_link_info *info,
+				struct elf_link_hash_entry *h,
+				Elf_Internal_Sym *sym)
+{
+  struct elf_s390_link_hash_table *htab;
+
+  htab = elf_s390_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      bfd_vma plt_index;
+      bfd_vma got_offset;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+
+      /* This symbol has an entry in the procedure linkage table.  Set
+	 it up.  */
+
+      if (h->dynindx == -1
+	  || htab->splt == NULL
+	  || htab->sgotplt == NULL
+	  || htab->srelplt == NULL)
+	abort ();
+
+      /* Calc. index no.
+	 Current offset - size first entry / entry size.  */
+      plt_index = (h->plt.offset - PLT_FIRST_ENTRY_SIZE) / PLT_ENTRY_SIZE;
+
+      /* Offset in GOT is PLT index plus GOT headers(3) times 8,
+	 addr & GOT addr.  */
+      got_offset = (plt_index + 3) * GOT_ENTRY_SIZE;
+
+      /* Fill in the blueprint of a PLT.  */
+      bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD0,
+		  htab->splt->contents + h->plt.offset);
+      bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD1,
+		  htab->splt->contents + h->plt.offset + 4);
+      bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD2,
+		  htab->splt->contents + h->plt.offset + 8);
+      bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD3,
+		  htab->splt->contents + h->plt.offset + 12);
+      bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD4,
+		  htab->splt->contents + h->plt.offset + 16);
+      bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD5,
+		  htab->splt->contents + h->plt.offset + 20);
+      bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD6,
+		  htab->splt->contents + h->plt.offset + 24);
+      bfd_put_32 (output_bfd, (bfd_vma) PLT_ENTRY_WORD7,
+		  htab->splt->contents + h->plt.offset + 28);
+      /* Fixup the relative address to the GOT entry */
+      bfd_put_32 (output_bfd,
+		  (htab->sgotplt->output_section->vma +
+		   htab->sgotplt->output_offset + got_offset
+		   - (htab->splt->output_section->vma + h->plt.offset))/2,
+		  htab->splt->contents + h->plt.offset + 2);
+      /* Fixup the relative branch to PLT 0 */
+      bfd_put_32 (output_bfd, - (PLT_FIRST_ENTRY_SIZE +
+				 (PLT_ENTRY_SIZE * plt_index) + 22)/2,
+		  htab->splt->contents + h->plt.offset + 24);
+      /* Fixup offset into symbol table */
+      bfd_put_32 (output_bfd, plt_index * sizeof (Elf64_External_Rela),
+		  htab->splt->contents + h->plt.offset + 28);
+
+      /* Fill in the entry in the global offset table.
+	 Points to instruction after GOT offset.  */
+      bfd_put_64 (output_bfd,
+		  (htab->splt->output_section->vma
+		   + htab->splt->output_offset
+		   + h->plt.offset
+		   + 14),
+		  htab->sgotplt->contents + got_offset);
+
+      /* Fill in the entry in the .rela.plt section.  */
+      rela.r_offset = (htab->sgotplt->output_section->vma
+		       + htab->sgotplt->output_offset
+		       + got_offset);
+      rela.r_info = ELF64_R_INFO (h->dynindx, R_390_JMP_SLOT);
+      rela.r_addend = 0;
+      loc = htab->srelplt->contents + plt_index * sizeof (Elf64_External_Rela);
+      bfd_elf64_swap_reloca_out (output_bfd, &rela, loc);
+
+      if (!h->def_regular)
+	{
+	  /* Mark the symbol as undefined, rather than as defined in
+	     the .plt section.  Leave the value alone.  This is a clue
+	     for the dynamic linker, to make function pointer
+	     comparisons work between an application and shared
+	     library.  */
+	  sym->st_shndx = SHN_UNDEF;
+	}
+    }
+
+  if (h->got.offset != (bfd_vma) -1
+      && elf_s390_hash_entry(h)->tls_type != GOT_TLS_GD
+      && elf_s390_hash_entry(h)->tls_type != GOT_TLS_IE
+      && elf_s390_hash_entry(h)->tls_type != GOT_TLS_IE_NLT)
+    {
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+
+      /* This symbol has an entry in the global offset table.  Set it
+	 up.  */
+      if (htab->sgot == NULL || htab->srelgot == NULL)
+	abort ();
+
+      rela.r_offset = (htab->sgot->output_section->vma
+		       + htab->sgot->output_offset
+		       + (h->got.offset &~ (bfd_vma) 1));
+
+      /* If this is a static link, or it is a -Bsymbolic link and the
+	 symbol is defined locally or was forced to be local because
+	 of a version file, we just want to emit a RELATIVE reloc.
+	 The entry in the global offset table will already have been
+	 initialized in the relocate_section function.  */
+      if (info->shared
+	  && SYMBOL_REFERENCES_LOCAL (info, h))
+	{
+	  if (!h->def_regular)
+	    return FALSE;
+	  BFD_ASSERT((h->got.offset & 1) != 0);
+	  rela.r_info = ELF64_R_INFO (0, R_390_RELATIVE);
+	  rela.r_addend = (h->root.u.def.value
+			   + h->root.u.def.section->output_section->vma
+			   + h->root.u.def.section->output_offset);
+	}
+      else
+	{
+	  BFD_ASSERT((h->got.offset & 1) == 0);
+	  bfd_put_64 (output_bfd, (bfd_vma) 0, htab->sgot->contents + h->got.offset);
+	  rela.r_info = ELF64_R_INFO (h->dynindx, R_390_GLOB_DAT);
+	  rela.r_addend = 0;
+	}
+
+      loc = htab->srelgot->contents;
+      loc += htab->srelgot->reloc_count++ * sizeof (Elf64_External_Rela);
+      bfd_elf64_swap_reloca_out (output_bfd, &rela, loc);
+    }
+
+  if (h->needs_copy)
+    {
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+
+      /* This symbols needs a copy reloc.  Set it up.  */
+
+      if (h->dynindx == -1
+	  || (h->root.type != bfd_link_hash_defined
+	      && h->root.type != bfd_link_hash_defweak)
+	  || htab->srelbss == NULL)
+	abort ();
+
+      rela.r_offset = (h->root.u.def.value
+		       + h->root.u.def.section->output_section->vma
+		       + h->root.u.def.section->output_offset);
+      rela.r_info = ELF64_R_INFO (h->dynindx, R_390_COPY);
+      rela.r_addend = 0;
+      loc = htab->srelbss->contents;
+      loc += htab->srelbss->reloc_count++ * sizeof (Elf64_External_Rela);
+      bfd_elf64_swap_reloca_out (output_bfd, &rela, loc);
+    }
+
+  /* Mark some specially defined symbols as absolute.  */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+      || h == htab->elf.hgot
+      || h == htab->elf.hplt)
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+/* Used to decide how to sort relocs in an optimal manner for the
+   dynamic linker, before writing them out.  */
+
+static enum elf_reloc_type_class
+elf_s390_reloc_type_class (rela)
+     const Elf_Internal_Rela *rela;
+{
+  switch ((int) ELF64_R_TYPE (rela->r_info))
+    {
+    case R_390_RELATIVE:
+      return reloc_class_relative;
+    case R_390_JMP_SLOT:
+      return reloc_class_plt;
+    case R_390_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+elf_s390_finish_dynamic_sections (bfd *output_bfd,
+				  struct bfd_link_info *info)
+{
+  struct elf_s390_link_hash_table *htab;
+  bfd *dynobj;
+  asection *sdyn;
+
+  htab = elf_s390_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = htab->elf.dynobj;
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (htab->elf.dynamic_sections_created)
+    {
+      Elf64_External_Dyn *dyncon, *dynconend;
+
+      if (sdyn == NULL || htab->sgot == NULL)
+	abort ();
+
+      dyncon = (Elf64_External_Dyn *) sdyn->contents;
+      dynconend = (Elf64_External_Dyn *) (sdyn->contents + sdyn->size);
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+	  asection *s;
+
+	  bfd_elf64_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    default:
+	      continue;
+
+	    case DT_PLTGOT:
+	      dyn.d_un.d_ptr = htab->sgot->output_section->vma;
+	      break;
+
+	    case DT_JMPREL:
+	      dyn.d_un.d_ptr = htab->srelplt->output_section->vma;
+	      break;
+
+	    case DT_PLTRELSZ:
+	      s = htab->srelplt->output_section;
+	      dyn.d_un.d_val = s->size;
+	      break;
+
+	    case DT_RELASZ:
+	      /* The procedure linkage table relocs (DT_JMPREL) should
+		 not be included in the overall relocs (DT_RELA).
+		 Therefore, we override the DT_RELASZ entry here to
+		 make it not include the JMPREL relocs.  Since the
+		 linker script arranges for .rela.plt to follow all
+		 other relocation sections, we don't have to worry
+		 about changing the DT_RELA entry.  */
+	      s = htab->srelplt->output_section;
+	      dyn.d_un.d_val -= s->size;
+	      break;
+	    }
+
+	  bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
+	}
+
+      /* Fill in the special first entry in the procedure linkage table.  */
+      if (htab->splt && htab->splt->size > 0)
+	{
+	  /* fill in blueprint for plt 0 entry */
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD0,
+		      htab->splt->contents );
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD1,
+		      htab->splt->contents +4 );
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD3,
+		      htab->splt->contents +12 );
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD4,
+		      htab->splt->contents +16 );
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD5,
+		      htab->splt->contents +20 );
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD6,
+		      htab->splt->contents + 24);
+	  bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD7,
+		      htab->splt->contents + 28 );
+	  /* Fixup relative address to start of GOT */
+	  bfd_put_32 (output_bfd,
+		      (htab->sgotplt->output_section->vma +
+		       htab->sgotplt->output_offset
+		       - htab->splt->output_section->vma - 6)/2,
+		      htab->splt->contents + 8);
+	}
+      elf_section_data (htab->splt->output_section)
+	->this_hdr.sh_entsize = PLT_ENTRY_SIZE;
+    }
+
+  if (htab->sgotplt)
+    {
+      /* Fill in the first three entries in the global offset table.  */
+      if (htab->sgotplt->size > 0)
+	{
+	  bfd_put_64 (output_bfd,
+		      (sdyn == NULL ? (bfd_vma) 0
+		       : sdyn->output_section->vma + sdyn->output_offset),
+		      htab->sgotplt->contents);
+	  /* One entry for shared object struct ptr.  */
+	  bfd_put_64 (output_bfd, (bfd_vma) 0, htab->sgotplt->contents + 8);
+	  /* One entry for _dl_runtime_resolve.  */
+	  bfd_put_64 (output_bfd, (bfd_vma) 0, htab->sgotplt->contents + 12);
+	}
+
+      elf_section_data (htab->sgot->output_section)
+	->this_hdr.sh_entsize = 8;
+    }
+  return TRUE;
+}
+
+/* Return address for Ith PLT stub in section PLT, for relocation REL
+   or (bfd_vma) -1 if it should not be included.  */
+
+static bfd_vma
+elf_s390_plt_sym_val (bfd_vma i, const asection *plt,
+		      const arelent *rel ATTRIBUTE_UNUSED)
+{
+  return plt->vma + PLT_FIRST_ENTRY_SIZE + i * PLT_ENTRY_SIZE;
+}
+
+
+/* Why was the hash table entry size definition changed from
+   ARCH_SIZE/8 to 4? This breaks the 64 bit dynamic linker and
+   this is the only reason for the s390_elf64_size_info structure.  */
+
+const struct elf_size_info s390_elf64_size_info =
+{
+  sizeof (Elf64_External_Ehdr),
+  sizeof (Elf64_External_Phdr),
+  sizeof (Elf64_External_Shdr),
+  sizeof (Elf64_External_Rel),
+  sizeof (Elf64_External_Rela),
+  sizeof (Elf64_External_Sym),
+  sizeof (Elf64_External_Dyn),
+  sizeof (Elf_External_Note),
+  8,		/* hash-table entry size.  */
+  1,		/* internal relocations per external relocations.  */
+  64,		/* arch_size.  */
+  3,		/* log_file_align.  */
+  ELFCLASS64, EV_CURRENT,
+  bfd_elf64_write_out_phdrs,
+  bfd_elf64_write_shdrs_and_ehdr,
+  bfd_elf64_checksum_contents,
+  bfd_elf64_write_relocs,
+  bfd_elf64_swap_symbol_in,
+  bfd_elf64_swap_symbol_out,
+  bfd_elf64_slurp_reloc_table,
+  bfd_elf64_slurp_symbol_table,
+  bfd_elf64_swap_dyn_in,
+  bfd_elf64_swap_dyn_out,
+  bfd_elf64_swap_reloc_in,
+  bfd_elf64_swap_reloc_out,
+  bfd_elf64_swap_reloca_in,
+  bfd_elf64_swap_reloca_out
+};
+
+#define TARGET_BIG_SYM	bfd_elf64_s390_vec
+#define TARGET_BIG_NAME	"elf64-s390"
+#define ELF_ARCH	bfd_arch_s390
+#define ELF_TARGET_ID	S390_ELF_DATA
+#define ELF_MACHINE_CODE EM_S390
+#define ELF_MACHINE_ALT1 EM_S390_OLD
+#define ELF_MAXPAGESIZE 0x1000
+
+#define elf_backend_size_info		s390_elf64_size_info
+
+#define elf_backend_can_gc_sections	1
+#define elf_backend_can_refcount	1
+#define elf_backend_want_got_plt	1
+#define elf_backend_plt_readonly	1
+#define elf_backend_want_plt_sym	0
+#define elf_backend_got_header_size	24
+#define elf_backend_rela_normal		1
+
+#define elf_info_to_howto		elf_s390_info_to_howto
+
+#define bfd_elf64_bfd_is_local_label_name     elf_s390_is_local_label_name
+#define bfd_elf64_bfd_link_hash_table_create  elf_s390_link_hash_table_create
+#define bfd_elf64_bfd_reloc_type_lookup	      elf_s390_reloc_type_lookup
+#define bfd_elf64_bfd_reloc_name_lookup elf_s390_reloc_name_lookup
+
+#define elf_backend_adjust_dynamic_symbol     elf_s390_adjust_dynamic_symbol
+#define elf_backend_check_relocs	      elf_s390_check_relocs
+#define elf_backend_copy_indirect_symbol      elf_s390_copy_indirect_symbol
+#define elf_backend_create_dynamic_sections   elf_s390_create_dynamic_sections
+#define elf_backend_finish_dynamic_sections   elf_s390_finish_dynamic_sections
+#define elf_backend_finish_dynamic_symbol     elf_s390_finish_dynamic_symbol
+#define elf_backend_gc_mark_hook	      elf_s390_gc_mark_hook
+#define elf_backend_gc_sweep_hook	      elf_s390_gc_sweep_hook
+#define elf_backend_reloc_type_class	      elf_s390_reloc_type_class
+#define elf_backend_relocate_section	      elf_s390_relocate_section
+#define elf_backend_size_dynamic_sections     elf_s390_size_dynamic_sections
+#define elf_backend_init_index_section	      _bfd_elf_init_1_index_section
+#define elf_backend_reloc_type_class	      elf_s390_reloc_type_class
+#define elf_backend_plt_sym_val		      elf_s390_plt_sym_val
+
+#define bfd_elf64_mkobject		elf_s390_mkobject
+#define elf_backend_object_p		elf_s390_object_p
+
+#include "elf64-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-sh64.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-sh64.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-sh64.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-sh64.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4086 @@
+/* SuperH SH64-specific support for 64-bit ELF
+   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+   2010, 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define SH64_ELF64
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/sh.h"
+
+/* Add a suffix for datalabel indirection symbols.  It must not match any
+   other symbols; user symbols with or without version or other
+   decoration.  It must only be used internally and not emitted by any
+   means.  */
+#define DATALABEL_SUFFIX " DL"
+
+#define GOT_BIAS (-((long)-32768))
+
+#define PLT_ENTRY_SIZE 64
+
+/* Return size of a PLT entry.  */
+#define elf_sh64_sizeof_plt(info) PLT_ENTRY_SIZE
+
+/* Return offset of the PLT0 address in an absolute PLT entry.  */
+#define elf_sh64_plt_plt0_offset(info) 32
+
+/* Return offset of the linker in PLT0 entry.  */
+#define elf_sh64_plt0_gotplt_offset(info) 0
+
+/* Return offset of the trampoline in PLT entry */
+#define elf_sh64_plt_temp_offset(info) 33 /* Add one because it's SHmedia.  */
+
+/* Return offset of the symbol in PLT entry.  */
+#define elf_sh64_plt_symbol_offset(info) 0
+
+/* Return offset of the relocation in PLT entry.  */
+#define elf_sh64_plt_reloc_offset(info) (info->shared ? 52 : 44)
+
+#define ELF_DYNAMIC_INTERPRETER "/usr/lib/libc.so.1"
+
+/* The sh linker needs to keep track of the number of relocs that it
+   decides to copy in check_relocs for each symbol.  This is so that
+   it can discard PC relative relocs if it doesn't need them when
+   linking with -Bsymbolic.  We store the information in a field
+   extending the regular ELF linker hash table.  */
+
+/* This structure keeps track of the number of PC relative relocs we
+   have copied for a given symbol.  */
+
+struct elf_sh64_pcrel_relocs_copied
+{
+  /* Next section.  */
+  struct elf_sh64_pcrel_relocs_copied *next;
+  /* A section in dynobj.  */
+  asection *section;
+  /* Number of relocs copied in this section.  */
+  bfd_size_type count;
+};
+
+/* sh ELF linker hash entry.  */
+
+struct elf_sh64_link_hash_entry
+{
+  struct elf_link_hash_entry root;
+
+  bfd_vma datalabel_got_offset;
+
+  /* Number of PC relative relocs copied for this symbol.  */
+  struct elf_sh64_pcrel_relocs_copied *pcrel_relocs_copied;
+};
+
+/* Traverse an sh ELF linker hash table.  */
+
+#define sh64_elf64_link_hash_traverse(table, func, info)	\
+  (elf_link_hash_traverse					\
+   ((table),							\
+    (bfd_boolean (*) (struct elf_link_hash_entry *, void *)) (func), \
+    (info)))
+
+static bfd_reloc_status_type sh_elf64_ignore_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type sh_elf64_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+
+static reloc_howto_type sh_elf64_howto_table[] = {
+  /* No relocation.  */
+  HOWTO (R_SH_NONE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 sh_elf64_ignore_reloc,	/* special_function */
+	 "R_SH_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit absolute relocation.  Setting partial_inplace to TRUE and
+     src_mask to a non-zero value is similar to the COFF toolchain.  */
+  HOWTO (R_SH_DIR32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 sh_elf64_reloc,		/* special_function */
+	 "R_SH_DIR32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit PC relative relocation.  */
+  HOWTO (R_SH_REL32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 sh_elf64_ignore_reloc,	/* special_function */
+	 "R_SH_REL32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* For 32-bit sh, this is R_SH_DIR8WPN.  */
+  EMPTY_HOWTO (3),
+
+  /* For 32-bit sh, this is R_SH_IND12W.  */
+  EMPTY_HOWTO (4),
+
+  /* For 32-bit sh, this is R_SH_DIR8WPL.  */
+  EMPTY_HOWTO (5),
+
+  /* For 32-bit sh, this is R_SH_DIR8WPZ.  */
+  EMPTY_HOWTO (6),
+
+  /* For 32-bit sh, this is R_SH_DIR8BP.  */
+  EMPTY_HOWTO (7),
+
+  /* For 32-bit sh, this is R_SH_DIR8W.  */
+  EMPTY_HOWTO (8),
+
+  /* For 32-bit sh, this is R_SH_DIR8L.  */
+  EMPTY_HOWTO (9),
+
+  EMPTY_HOWTO (10),
+  EMPTY_HOWTO (11),
+  EMPTY_HOWTO (12),
+  EMPTY_HOWTO (13),
+  EMPTY_HOWTO (14),
+  EMPTY_HOWTO (15),
+  EMPTY_HOWTO (16),
+  EMPTY_HOWTO (17),
+  EMPTY_HOWTO (18),
+  EMPTY_HOWTO (19),
+  EMPTY_HOWTO (20),
+  EMPTY_HOWTO (21),
+  EMPTY_HOWTO (22),
+  EMPTY_HOWTO (23),
+  EMPTY_HOWTO (24),
+
+  /* The remaining relocs are a GNU extension used for relaxing.  The
+     final pass of the linker never needs to do anything with any of
+     these relocs.  Any required operations are handled by the
+     relaxation code.  */
+
+  /* A 16 bit switch table entry.  This is generated for an expression
+     such as ``.word L1 - L2''.  The offset holds the difference
+     between the reloc address and L2.  */
+  HOWTO (R_SH_SWITCH16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_elf64_ignore_reloc,	/* special_function */
+	 "R_SH_SWITCH16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 32 bit switch table entry.  This is generated for an expression
+     such as ``.long L1 - L2''.  The offset holds the difference
+     between the reloc address and L2.  */
+  HOWTO (R_SH_SWITCH32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_elf64_ignore_reloc,	/* special_function */
+	 "R_SH_SWITCH32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* For 32-bit sh, this is R_SH_USES.  */
+  EMPTY_HOWTO (27),
+
+  /* For 32-bit sh, this is R_SH_COUNT.  */
+  EMPTY_HOWTO (28),
+
+  /* For 32-bit sh, this is R_SH_ALIGN.  FIXME: For linker relaxation,
+     this might be emitted.  When linker relaxation is implemented, we
+     might want to use it.  */
+  EMPTY_HOWTO (29),
+
+  /* For 32-bit sh, this is R_SH_CODE.  FIXME: For linker relaxation,
+     this might be emitted.  When linker relaxation is implemented, we
+     might want to use it.  */
+  EMPTY_HOWTO (30),
+
+  /* For 32-bit sh, this is R_SH_DATA.  FIXME: For linker relaxation,
+     this might be emitted.  When linker relaxation is implemented, we
+     might want to use it.  */
+  EMPTY_HOWTO (31),
+
+  /* For 32-bit sh, this is R_SH_LABEL.  FIXME: For linker relaxation,
+     this might be emitted.  When linker relaxation is implemented, we
+     might want to use it.  */
+  EMPTY_HOWTO (32),
+
+  /* An 8 bit switch table entry.  This is generated for an expression
+     such as ``.word L1 - L2''.  The offset holds the difference
+     between the reloc address and L2.  */
+  HOWTO (R_SH_SWITCH8,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_elf64_ignore_reloc,	/* special_function */
+	 "R_SH_SWITCH8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* GNU extension to record C++ vtable hierarchy */
+  HOWTO (R_SH_GNU_VTINHERIT, /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         NULL,                  /* special_function */
+         "R_SH_GNU_VTINHERIT", /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage */
+  HOWTO (R_SH_GNU_VTENTRY,     /* type */
+         0,                     /* rightshift */
+         2,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
+         "R_SH_GNU_VTENTRY",   /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* For 32-bit sh, this is R_SH_LOOP_START.  */
+  EMPTY_HOWTO (36),
+
+  /* For 32-bit sh, this is R_SH_LOOP_END.  */
+  EMPTY_HOWTO (37),
+
+  EMPTY_HOWTO (38),
+  EMPTY_HOWTO (39),
+  EMPTY_HOWTO (40),
+  EMPTY_HOWTO (41),
+  EMPTY_HOWTO (42),
+  EMPTY_HOWTO (43),
+  EMPTY_HOWTO (44),
+
+  /* Used in SHLLI.L and SHLRI.L.  */
+  HOWTO (R_SH_DIR5U,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 5,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR5U",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in SHARI, SHLLI et al.  */
+  HOWTO (R_SH_DIR6U,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 6,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR6U",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in BxxI, LDHI.L et al.  */
+  HOWTO (R_SH_DIR6S,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 6,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR6S",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xfc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in ADDI, ANDI et al.  */
+  HOWTO (R_SH_DIR10S,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 10,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR10S",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in LD.UW, ST.W et al.  */
+  HOWTO (R_SH_DIR10SW,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 11,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR10SW",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in LD.L, FLD.S et al.  */
+  HOWTO (R_SH_DIR10SL,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR10SL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in FLD.D, FST.P et al.  */
+  HOWTO (R_SH_DIR10SQ,	/* type */
+	 3,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 13,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_DIR10SQ",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  EMPTY_HOWTO (52),
+  EMPTY_HOWTO (53),
+  EMPTY_HOWTO (54),
+  EMPTY_HOWTO (55),
+  EMPTY_HOWTO (56),
+  EMPTY_HOWTO (57),
+  EMPTY_HOWTO (58),
+  EMPTY_HOWTO (59),
+  EMPTY_HOWTO (60),
+  EMPTY_HOWTO (61),
+  EMPTY_HOWTO (62),
+  EMPTY_HOWTO (63),
+  EMPTY_HOWTO (64),
+  EMPTY_HOWTO (65),
+  EMPTY_HOWTO (66),
+  EMPTY_HOWTO (67),
+  EMPTY_HOWTO (68),
+  EMPTY_HOWTO (69),
+  EMPTY_HOWTO (70),
+  EMPTY_HOWTO (71),
+  EMPTY_HOWTO (72),
+  EMPTY_HOWTO (73),
+  EMPTY_HOWTO (74),
+  EMPTY_HOWTO (75),
+  EMPTY_HOWTO (76),
+  EMPTY_HOWTO (77),
+  EMPTY_HOWTO (78),
+  EMPTY_HOWTO (79),
+  EMPTY_HOWTO (80),
+  EMPTY_HOWTO (81),
+  EMPTY_HOWTO (82),
+  EMPTY_HOWTO (83),
+  EMPTY_HOWTO (84),
+  EMPTY_HOWTO (85),
+  EMPTY_HOWTO (86),
+  EMPTY_HOWTO (87),
+  EMPTY_HOWTO (88),
+  EMPTY_HOWTO (89),
+  EMPTY_HOWTO (90),
+  EMPTY_HOWTO (91),
+  EMPTY_HOWTO (92),
+  EMPTY_HOWTO (93),
+  EMPTY_HOWTO (94),
+  EMPTY_HOWTO (95),
+  EMPTY_HOWTO (96),
+  EMPTY_HOWTO (97),
+  EMPTY_HOWTO (98),
+  EMPTY_HOWTO (99),
+  EMPTY_HOWTO (100),
+  EMPTY_HOWTO (101),
+  EMPTY_HOWTO (102),
+  EMPTY_HOWTO (103),
+  EMPTY_HOWTO (104),
+  EMPTY_HOWTO (105),
+  EMPTY_HOWTO (106),
+  EMPTY_HOWTO (107),
+  EMPTY_HOWTO (108),
+  EMPTY_HOWTO (109),
+  EMPTY_HOWTO (110),
+  EMPTY_HOWTO (111),
+  EMPTY_HOWTO (112),
+  EMPTY_HOWTO (113),
+  EMPTY_HOWTO (114),
+  EMPTY_HOWTO (115),
+  EMPTY_HOWTO (116),
+  EMPTY_HOWTO (117),
+  EMPTY_HOWTO (118),
+  EMPTY_HOWTO (119),
+  EMPTY_HOWTO (120),
+  EMPTY_HOWTO (121),
+  EMPTY_HOWTO (122),
+  EMPTY_HOWTO (123),
+  EMPTY_HOWTO (124),
+  EMPTY_HOWTO (125),
+  EMPTY_HOWTO (126),
+  EMPTY_HOWTO (127),
+  EMPTY_HOWTO (128),
+  EMPTY_HOWTO (129),
+  EMPTY_HOWTO (130),
+  EMPTY_HOWTO (131),
+  EMPTY_HOWTO (132),
+  EMPTY_HOWTO (133),
+  EMPTY_HOWTO (134),
+  EMPTY_HOWTO (135),
+  EMPTY_HOWTO (136),
+  EMPTY_HOWTO (137),
+  EMPTY_HOWTO (138),
+  EMPTY_HOWTO (139),
+  EMPTY_HOWTO (140),
+  EMPTY_HOWTO (141),
+  EMPTY_HOWTO (142),
+  EMPTY_HOWTO (143),
+  EMPTY_HOWTO (144),
+  EMPTY_HOWTO (145),
+  EMPTY_HOWTO (146),
+  EMPTY_HOWTO (147),
+  EMPTY_HOWTO (148),
+  EMPTY_HOWTO (149),
+  EMPTY_HOWTO (150),
+  EMPTY_HOWTO (151),
+  EMPTY_HOWTO (152),
+  EMPTY_HOWTO (153),
+  EMPTY_HOWTO (154),
+  EMPTY_HOWTO (155),
+  EMPTY_HOWTO (156),
+  EMPTY_HOWTO (157),
+  EMPTY_HOWTO (158),
+  EMPTY_HOWTO (159),
+
+  /* Relocs for dynamic linking for 32-bit SH would follow.  We don't have
+     any dynamic linking support for 64-bit SH at present.  */
+
+  EMPTY_HOWTO (160),
+  EMPTY_HOWTO (161),
+  EMPTY_HOWTO (162),
+  EMPTY_HOWTO (163),
+  EMPTY_HOWTO (164),
+  EMPTY_HOWTO (165),
+  EMPTY_HOWTO (166),
+  EMPTY_HOWTO (167),
+  EMPTY_HOWTO (168),
+
+  /* Back to SH5 relocations.  */
+  /* Used in MOVI and SHORI (x & 65536).  */
+  HOWTO (R_SH_GOT_LOW16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOT_LOW16",    	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
+  HOWTO (R_SH_GOT_MEDLOW16,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOT_MEDLOW16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
+  HOWTO (R_SH_GOT_MEDHI16,	/* type */
+	 32,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOT_MEDHI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
+  HOWTO (R_SH_GOT_HI16,		/* type */
+	 48,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOT_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI (x & 65536).  */
+  HOWTO (R_SH_GOTPLT_LOW16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTPLT_LOW16",   /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
+  HOWTO (R_SH_GOTPLT_MEDLOW16,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTPLT_MEDLOW16", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
+  HOWTO (R_SH_GOTPLT_MEDHI16,	/* type */
+	 32,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTPLT_MEDHI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
+  HOWTO (R_SH_GOTPLT_HI16,	/* type */
+	 48,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTPLT_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI (x & 65536).  */
+  HOWTO (R_SH_PLT_LOW16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_PLT_LOW16",    	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),		       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
+  HOWTO (R_SH_PLT_MEDLOW16,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_PLT_MEDLOW16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),		       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
+  HOWTO (R_SH_PLT_MEDHI16,	/* type */
+	 32,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_PLT_MEDHI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),		       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
+  HOWTO (R_SH_PLT_HI16,		/* type */
+	 48,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_PLT_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),		       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI (x & 65536).  */
+  HOWTO (R_SH_GOTOFF_LOW16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTOFF_LOW16",   /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
+  HOWTO (R_SH_GOTOFF_MEDLOW16,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTOFF_MEDLOW16", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
+  HOWTO (R_SH_GOTOFF_MEDHI16,	/* type */
+	 32,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTOFF_MEDHI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
+  HOWTO (R_SH_GOTOFF_HI16,	/* type */
+	 48,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTOFF_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI (x & 65536).  */
+  HOWTO (R_SH_GOTPC_LOW16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTPC_LOW16",    /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),		       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
+  HOWTO (R_SH_GOTPC_MEDLOW16,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTPC_MEDLOW16", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),		       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
+  HOWTO (R_SH_GOTPC_MEDHI16,	/* type */
+	 32,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTPC_MEDHI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),		       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
+  HOWTO (R_SH_GOTPC_HI16,	/* type */
+	 48,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTPC_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),		       	/* pcrel_offset */
+
+  /* Used in LD.L, FLD.S et al.  */
+  HOWTO (R_SH_GOT10BY4,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOT10BY4",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in LD.L, FLD.S et al.  */
+  HOWTO (R_SH_GOTPLT10BY4,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 12,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTPLT10BY4",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in FLD.D, FST.P et al.  */
+  HOWTO (R_SH_GOT10BY8,		/* type */
+	 3,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 13,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOT10BY8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in FLD.D, FST.P et al.  */
+  HOWTO (R_SH_GOTPLT10BY8,	/* type */
+	 3,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 13,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GOTPLT10BY8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  HOWTO (R_SH_COPY64,		/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_COPY64", 	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ((bfd_vma) 0) - 1,	/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  HOWTO (R_SH_GLOB_DAT64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_GLOB_DAT64", 	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ((bfd_vma) 0) - 1,	/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  HOWTO (R_SH_JMP_SLOT64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_JMP_SLOT64", 	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ((bfd_vma) 0) - 1,	/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  HOWTO (R_SH_RELATIVE64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_RELATIVE64", 	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ((bfd_vma) 0) - 1,	/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  EMPTY_HOWTO (197),
+  EMPTY_HOWTO (198),
+  EMPTY_HOWTO (199),
+  EMPTY_HOWTO (200),
+  EMPTY_HOWTO (201),
+  EMPTY_HOWTO (202),
+  EMPTY_HOWTO (203),
+  EMPTY_HOWTO (204),
+  EMPTY_HOWTO (205),
+  EMPTY_HOWTO (206),
+  EMPTY_HOWTO (207),
+  EMPTY_HOWTO (208),
+  EMPTY_HOWTO (209),
+  EMPTY_HOWTO (210),
+  EMPTY_HOWTO (211),
+  EMPTY_HOWTO (212),
+  EMPTY_HOWTO (213),
+  EMPTY_HOWTO (214),
+  EMPTY_HOWTO (215),
+  EMPTY_HOWTO (216),
+  EMPTY_HOWTO (217),
+  EMPTY_HOWTO (218),
+  EMPTY_HOWTO (219),
+  EMPTY_HOWTO (220),
+  EMPTY_HOWTO (221),
+  EMPTY_HOWTO (222),
+  EMPTY_HOWTO (223),
+  EMPTY_HOWTO (224),
+  EMPTY_HOWTO (225),
+  EMPTY_HOWTO (226),
+  EMPTY_HOWTO (227),
+  EMPTY_HOWTO (228),
+  EMPTY_HOWTO (229),
+  EMPTY_HOWTO (230),
+  EMPTY_HOWTO (231),
+  EMPTY_HOWTO (232),
+  EMPTY_HOWTO (233),
+  EMPTY_HOWTO (234),
+  EMPTY_HOWTO (235),
+  EMPTY_HOWTO (236),
+  EMPTY_HOWTO (237),
+  EMPTY_HOWTO (238),
+  EMPTY_HOWTO (239),
+  EMPTY_HOWTO (240),
+  EMPTY_HOWTO (241),
+
+  /* Relocations for SHmedia code.  None of these are partial_inplace or
+     use the field being relocated.  */
+
+  /* The assembler will generate this reloc before a block of SHmedia
+     instructions.  A section should be processed as assuming it contains
+     data, unless this reloc is seen.  Note that a block of SHcompact
+     instructions are instead preceded by R_SH_CODE.
+     This is currently not implemented, but should be used for SHmedia
+     linker relaxation.  */
+  HOWTO (R_SH_SHMEDIA_CODE,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 sh_elf64_ignore_reloc,	/* special_function */
+	 "R_SH_SHMEDIA_CODE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The assembler will generate this reloc at a PTA or PTB instruction,
+     and the linker checks the right type of target, or changes a PTA to a
+     PTB, if the original insn was PT.  */
+  HOWTO (R_SH_PT_16,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 18,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_PT_16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Used in unexpanded MOVI.  */
+  HOWTO (R_SH_IMMS16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_IMMS16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in SHORI.  */
+  HOWTO (R_SH_IMMU16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_IMMU16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI (x & 65536).  */
+  HOWTO (R_SH_IMM_LOW16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_IMM_LOW16",    	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x - $) & 65536).  */
+  HOWTO (R_SH_IMM_LOW16_PCREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_IMM_LOW16_PCREL", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 16) & 65536).  */
+  HOWTO (R_SH_IMM_MEDLOW16,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_IMM_MEDLOW16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI (((x - $) >> 16) & 65536).  */
+  HOWTO (R_SH_IMM_MEDLOW16_PCREL, /* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_IMM_MEDLOW16_PCREL", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 32) & 65536).  */
+  HOWTO (R_SH_IMM_MEDHI16,	/* type */
+	 32,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_IMM_MEDHI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI (((x - $) >> 32) & 65536).  */
+  HOWTO (R_SH_IMM_MEDHI16_PCREL, /* type */
+	 32,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_IMM_MEDHI16_PCREL", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* Used in MOVI and SHORI ((x >> 48) & 65536).  */
+  HOWTO (R_SH_IMM_HI16,		/* type */
+	 48,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_IMM_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* Used in MOVI and SHORI (((x - $) >> 48) & 65536).  */
+  HOWTO (R_SH_IMM_HI16_PCREL,	/* type */
+	 48,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_IMM_HI16_PCREL", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x3fffc00,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* For the .uaquad pseudo.  */
+  HOWTO (R_SH_64,		/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_64", 		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ((bfd_vma) 0) - 1,	/* dst_mask */
+	 FALSE),	       	/* pcrel_offset */
+
+  /* For the .uaquad pseudo, (x - $).  */
+  HOWTO (R_SH_64_PCREL,		/* type */
+	 48,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 10,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_SH_64_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 ((bfd_vma) 0) - 1,	/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+};
+
+/* This function is used for relocs which are only used for relaxing,
+   which the linker should otherwise ignore.  */
+
+static bfd_reloc_status_type
+sh_elf64_ignore_reloc (bfd *abfd ATTRIBUTE_UNUSED, arelent *reloc_entry,
+		       asymbol *symbol ATTRIBUTE_UNUSED,
+		       void *data ATTRIBUTE_UNUSED, asection *input_section,
+		       bfd *output_bfd,
+		       char **error_message ATTRIBUTE_UNUSED)
+{
+  if (output_bfd != NULL)
+    reloc_entry->address += input_section->output_offset;
+  return bfd_reloc_ok;
+}
+
+/* This function is used for normal relocs.  This used to be like the COFF
+   function, and is almost certainly incorrect for other ELF targets.
+
+   See sh_elf_reloc in elf32-sh.c for the original.  */
+
+static bfd_reloc_status_type
+sh_elf64_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol_in,
+		void *data, asection *input_section, bfd *output_bfd,
+		char **error_message ATTRIBUTE_UNUSED)
+{
+  unsigned long insn;
+  bfd_vma sym_value;
+  enum elf_sh_reloc_type r_type;
+  bfd_vma addr = reloc_entry->address;
+  bfd_byte *hit_data = addr + (bfd_byte *) data;
+
+  r_type = (enum elf_sh_reloc_type) reloc_entry->howto->type;
+
+  if (output_bfd != NULL)
+    {
+      /* Partial linking--do nothing.  */
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  if (symbol_in != NULL
+      && bfd_is_und_section (symbol_in->section))
+    return bfd_reloc_undefined;
+
+  if (bfd_is_com_section (symbol_in->section))
+    sym_value = 0;
+  else
+    sym_value = (symbol_in->value +
+		 symbol_in->section->output_section->vma +
+		 symbol_in->section->output_offset);
+
+  switch (r_type)
+    {
+    case R_SH_DIR32:
+      insn = bfd_get_32 (abfd, hit_data);
+      insn += sym_value + reloc_entry->addend;
+      bfd_put_32 (abfd, insn, hit_data);
+      break;
+
+    default:
+      abort ();
+      break;
+    }
+
+  return bfd_reloc_ok;
+}
+
+/* This structure is used to map BFD reloc codes to SH ELF relocs.  */
+
+struct elf_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned char elf_reloc_val;
+};
+
+/* An array mapping BFD reloc codes to SH ELF relocs.  */
+
+static const struct elf_reloc_map sh64_reloc_map[] =
+{
+  { BFD_RELOC_NONE, R_SH_NONE },
+  { BFD_RELOC_32, R_SH_DIR32 },
+  { BFD_RELOC_CTOR, R_SH_DIR32 },
+  { BFD_RELOC_32_PCREL, R_SH_REL32 },
+  { BFD_RELOC_8_PCREL, R_SH_SWITCH8 },
+  { BFD_RELOC_SH_SWITCH16, R_SH_SWITCH16 },
+  { BFD_RELOC_SH_SWITCH32, R_SH_SWITCH32 },
+  { BFD_RELOC_VTABLE_INHERIT, R_SH_GNU_VTINHERIT },
+  { BFD_RELOC_VTABLE_ENTRY, R_SH_GNU_VTENTRY },
+  { BFD_RELOC_SH_GOT_LOW16, R_SH_GOT_LOW16 },
+  { BFD_RELOC_SH_GOT_MEDLOW16, R_SH_GOT_MEDLOW16 },
+  { BFD_RELOC_SH_GOT_MEDHI16, R_SH_GOT_MEDHI16 },
+  { BFD_RELOC_SH_GOT_HI16, R_SH_GOT_HI16 },
+  { BFD_RELOC_SH_GOTPLT_LOW16, R_SH_GOTPLT_LOW16 },
+  { BFD_RELOC_SH_GOTPLT_MEDLOW16, R_SH_GOTPLT_MEDLOW16 },
+  { BFD_RELOC_SH_GOTPLT_MEDHI16, R_SH_GOTPLT_MEDHI16 },
+  { BFD_RELOC_SH_GOTPLT_HI16, R_SH_GOTPLT_HI16 },
+  { BFD_RELOC_SH_PLT_LOW16, R_SH_PLT_LOW16 },
+  { BFD_RELOC_SH_PLT_MEDLOW16, R_SH_PLT_MEDLOW16 },
+  { BFD_RELOC_SH_PLT_MEDHI16, R_SH_PLT_MEDHI16 },
+  { BFD_RELOC_SH_PLT_HI16, R_SH_PLT_HI16 },
+  { BFD_RELOC_SH_GOTOFF_LOW16, R_SH_GOTOFF_LOW16 },
+  { BFD_RELOC_SH_GOTOFF_MEDLOW16, R_SH_GOTOFF_MEDLOW16 },
+  { BFD_RELOC_SH_GOTOFF_MEDHI16, R_SH_GOTOFF_MEDHI16 },
+  { BFD_RELOC_SH_GOTOFF_HI16, R_SH_GOTOFF_HI16 },
+  { BFD_RELOC_SH_GOTPC_LOW16, R_SH_GOTPC_LOW16 },
+  { BFD_RELOC_SH_GOTPC_MEDLOW16, R_SH_GOTPC_MEDLOW16 },
+  { BFD_RELOC_SH_GOTPC_MEDHI16, R_SH_GOTPC_MEDHI16 },
+  { BFD_RELOC_SH_GOTPC_HI16, R_SH_GOTPC_HI16 },
+  { BFD_RELOC_SH_COPY64, R_SH_COPY64 },
+  { BFD_RELOC_SH_GLOB_DAT64, R_SH_GLOB_DAT64 },
+  { BFD_RELOC_SH_JMP_SLOT64, R_SH_JMP_SLOT64 },
+  { BFD_RELOC_SH_RELATIVE64, R_SH_RELATIVE64 },
+  { BFD_RELOC_SH_GOT10BY4, R_SH_GOT10BY4 },
+  { BFD_RELOC_SH_GOT10BY8, R_SH_GOT10BY8 },
+  { BFD_RELOC_SH_GOTPLT10BY4, R_SH_GOTPLT10BY4 },
+  { BFD_RELOC_SH_GOTPLT10BY8, R_SH_GOTPLT10BY8 },
+  { BFD_RELOC_SH_PT_16, R_SH_PT_16 },
+  { BFD_RELOC_SH_SHMEDIA_CODE, R_SH_SHMEDIA_CODE },
+  { BFD_RELOC_SH_IMMU5, R_SH_DIR5U },
+  { BFD_RELOC_SH_IMMS6, R_SH_DIR6S },
+  { BFD_RELOC_SH_IMMU6, R_SH_DIR6U },
+  { BFD_RELOC_SH_IMMS10, R_SH_DIR10S },
+  { BFD_RELOC_SH_IMMS10BY2, R_SH_DIR10SW },
+  { BFD_RELOC_SH_IMMS10BY4, R_SH_DIR10SL },
+  { BFD_RELOC_SH_IMMS10BY8, R_SH_DIR10SQ },
+  { BFD_RELOC_SH_IMMS16, R_SH_IMMS16 },
+  { BFD_RELOC_SH_IMMU16, R_SH_IMMU16 },
+  { BFD_RELOC_SH_IMM_LOW16, R_SH_IMM_LOW16 },
+  { BFD_RELOC_SH_IMM_LOW16_PCREL, R_SH_IMM_LOW16_PCREL },
+  { BFD_RELOC_SH_IMM_MEDLOW16, R_SH_IMM_MEDLOW16 },
+  { BFD_RELOC_SH_IMM_MEDLOW16_PCREL, R_SH_IMM_MEDLOW16_PCREL },
+  { BFD_RELOC_SH_IMM_MEDHI16, R_SH_IMM_MEDHI16 },
+  { BFD_RELOC_SH_IMM_MEDHI16_PCREL, R_SH_IMM_MEDHI16_PCREL },
+  { BFD_RELOC_SH_IMM_HI16, R_SH_IMM_HI16 },
+  { BFD_RELOC_SH_IMM_HI16_PCREL, R_SH_IMM_HI16_PCREL },
+  { BFD_RELOC_64, R_SH_64 },
+  { BFD_RELOC_64_PCREL, R_SH_64_PCREL },
+};
+
+/* Given a BFD reloc code, return the howto structure for the
+   corresponding SH ELf reloc.  */
+
+static reloc_howto_type *
+sh_elf64_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (sh64_reloc_map) / sizeof (struct elf_reloc_map); i++)
+    {
+      if (sh64_reloc_map[i].bfd_reloc_val == code)
+	return &sh_elf64_howto_table[(int) sh64_reloc_map[i].elf_reloc_val];
+    }
+
+  return NULL;
+}
+
+static reloc_howto_type *
+sh_elf64_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			    const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (sh_elf64_howto_table) / sizeof (sh_elf64_howto_table[0]);
+       i++)
+    if (sh_elf64_howto_table[i].name != NULL
+	&& strcasecmp (sh_elf64_howto_table[i].name, r_name) == 0)
+      return &sh_elf64_howto_table[i];
+
+  return NULL;
+}
+
+/* Given an ELF reloc, fill in the howto field of a relent.
+
+   See sh_elf_info_to_howto in elf32-sh.c for the original.  */
+
+static void
+sh_elf64_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr,
+			Elf_Internal_Rela *dst)
+{
+  unsigned int r;
+
+  r = ELF64_R_TYPE (dst->r_info);
+
+  BFD_ASSERT (r <= (unsigned int) R_SH_64_PCREL);
+  BFD_ASSERT (r < R_SH_FIRST_INVALID_RELOC || r > R_SH_LAST_INVALID_RELOC);
+  BFD_ASSERT (r < R_SH_DIR8WPN || r > R_SH_LAST_INVALID_RELOC_2);
+  BFD_ASSERT (r < R_SH_FIRST_INVALID_RELOC_3 || r > R_SH_GOTPLT32);
+  BFD_ASSERT (r < R_SH_FIRST_INVALID_RELOC_4 || r > R_SH_LAST_INVALID_RELOC_4);
+
+  cache_ptr->howto = &sh_elf64_howto_table[r];
+}
+
+/* Relocate an SH ELF section.
+
+   See sh_elf_info_to_howto in elf32-sh.c for the original.  */
+
+static bfd_boolean
+sh_elf64_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
+			   struct bfd_link_info *info, bfd *input_bfd,
+			   asection *input_section, bfd_byte *contents,
+			   Elf_Internal_Rela *relocs,
+			   Elf_Internal_Sym *local_syms,
+			   asection **local_sections)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel, *relend;
+  bfd *dynobj;
+  bfd_vma *local_got_offsets;
+  asection *sgot;
+  asection *sgotplt;
+  asection *splt;
+  asection *sreloc;
+  bfd_vma disp, dropped;
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (input_bfd);
+  dynobj = elf_hash_table (info)->dynobj;
+  local_got_offsets = elf_local_got_offsets (input_bfd);
+
+  sgot = NULL;
+  sgotplt = NULL;
+  splt = NULL;
+  sreloc = NULL;
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      struct elf_link_hash_entry *h;
+      bfd_vma relocation;
+      bfd_vma addend = (bfd_vma)0;
+      bfd_reloc_status_type r;
+      int seen_stt_datalabel = 0;
+
+      r_symndx = ELF64_R_SYM (rel->r_info);
+
+      r_type = ELF64_R_TYPE (rel->r_info);
+
+      if (r_type == (int) R_SH_NONE)
+	continue;
+
+      if (r_type < 0
+	  || r_type > R_SH_64_PCREL
+	  || (r_type >= (int) R_SH_FIRST_INVALID_RELOC
+	      && r_type <= (int) R_SH_LAST_INVALID_RELOC)
+	  || (r_type >= (int) R_SH_DIR8WPN
+	      && r_type <= (int) R_SH_LAST_INVALID_RELOC)
+	  || (r_type >= (int) R_SH_GNU_VTINHERIT
+	      && r_type <= (int) R_SH_PSHL)
+	  || (r_type >= (int) R_SH_FIRST_INVALID_RELOC_2
+	      && r_type <= R_SH_GOTPLT32)
+	  || (r_type >= (int) R_SH_FIRST_INVALID_RELOC_4
+	      && r_type <= (int) R_SH_LAST_INVALID_RELOC_4))
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      howto = sh_elf64_howto_table + r_type;
+
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      relocation = 0;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = ((sec->output_section->vma
+			 + sec->output_offset
+			 + sym->st_value)
+			| ((sym->st_other & STO_SH5_ISA32) != 0));
+
+	  /* A local symbol never has STO_SH5_ISA32, so we don't need
+	     datalabel processing here.  Make sure this does not change
+	     without notice.  */
+	  if ((sym->st_other & STO_SH5_ISA32) != 0)
+	    ((*info->callbacks->reloc_dangerous)
+	     (info,
+	      _("Unexpected STO_SH5_ISA32 on local symbol is not handled"),
+	      input_bfd, input_section, rel->r_offset));
+
+	  if (sec != NULL && elf_discarded_section (sec))
+	    /* Handled below.  */
+	    ;
+	  else if (info->relocatable)
+	    {
+	      /* This is a relocatable link.  We don't have to change
+		 anything, unless the reloc is against a section symbol,
+		 in which case we have to adjust according to where the
+		 section symbol winds up in the output section.  */
+	      if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+		goto final_link_relocate;
+
+	      continue;
+	    }
+	  else if (! howto->partial_inplace)
+	    {
+	      relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	      relocation |= ((sym->st_other & STO_SH5_ISA32) != 0);
+	    }
+	  else if ((sec->flags & SEC_MERGE)
+		   && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+	    {
+	      asection *msec;
+
+	      if (howto->rightshift || howto->src_mask != 0xffffffff)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B(%A+0x%lx): %s relocation against SEC_MERGE section"),
+		     input_bfd, input_section,
+		     (long) rel->r_offset, howto->name);
+		  return FALSE;
+		}
+
+              addend = bfd_get_32 (input_bfd, contents + rel->r_offset);
+              msec = sec;
+              addend =
+		_bfd_elf_rel_local_sym (output_bfd, sym, &msec, addend)
+		- relocation;
+	      addend += msec->output_section->vma + msec->output_offset;
+	      bfd_put_32 (input_bfd, addend, contents + rel->r_offset);
+	      addend = 0;
+	    }
+	}
+      else
+	{
+	  /* ??? Could we use the RELOC_FOR_GLOBAL_SYMBOL macro here ?  */
+
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    {
+	      /* If the reference passes a symbol marked with
+		 STT_DATALABEL, then any STO_SH5_ISA32 on the final value
+		 doesn't count.  */
+	      seen_stt_datalabel |= h->type == STT_DATALABEL;
+	      h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	    }
+
+	  if (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	    {
+	      sec = h->root.u.def.section;
+	      /* In these cases, we don't need the relocation value.
+		 We check specially because in some obscure cases
+		 sec->output_section will be NULL.  */
+	      if (r_type == R_SH_GOTPC_LOW16
+		  || r_type == R_SH_GOTPC_MEDLOW16
+		  || r_type == R_SH_GOTPC_MEDHI16
+		  || r_type == R_SH_GOTPC_HI16
+		  || ((r_type == R_SH_PLT_LOW16
+		       || r_type == R_SH_PLT_MEDLOW16
+		       || r_type == R_SH_PLT_MEDHI16
+		       || r_type == R_SH_PLT_HI16)
+		      && h->plt.offset != (bfd_vma) -1)
+		  || ((r_type == R_SH_GOT_LOW16
+		       || r_type == R_SH_GOT_MEDLOW16
+		       || r_type == R_SH_GOT_MEDHI16
+		       || r_type == R_SH_GOT_HI16)
+		      && elf_hash_table (info)->dynamic_sections_created
+		      && (! info->shared
+			  || (! info->symbolic && h->dynindx != -1)
+			  || !h->def_regular))
+		  /* The cases above are those in which relocation is
+		     overwritten in the switch block below.  The cases
+		     below are those in which we must defer relocation
+		     to run-time, because we can't resolve absolute
+		     addresses when creating a shared library.  */
+		  || (info->shared
+		      && ((! info->symbolic && h->dynindx != -1)
+			  || !h->def_regular)
+		      && ((r_type == R_SH_64
+			   && !(ELF_ST_VISIBILITY (h->other) == STV_INTERNAL
+				|| ELF_ST_VISIBILITY (h->other) == STV_HIDDEN))
+			  || r_type == R_SH_64_PCREL)
+		      && ((input_section->flags & SEC_ALLOC) != 0
+			  /* DWARF will emit R_SH_DIR32 relocations in its
+			     sections against symbols defined externally
+			     in shared libraries.  We can't do anything
+			     with them here.  */
+			  || (input_section->flags & SEC_DEBUGGING) != 0))
+		  /* Dynamic relocs are not propagated for SEC_DEBUGGING
+		     sections because such sections are not SEC_ALLOC and
+		     thus ld.so will not process them.  */
+		  || (sec->output_section == NULL
+		      && ((input_section->flags & SEC_DEBUGGING) != 0
+			  && h->def_dynamic)))
+		;
+	      else if (sec->output_section != NULL)
+		relocation = ((h->root.u.def.value
+			       + sec->output_section->vma
+			       + sec->output_offset)
+			      /* A STO_SH5_ISA32 causes a "bitor 1" to the
+				 symbol value, unless we've seen
+				 STT_DATALABEL on the way to it.  */
+			      | ((h->other & STO_SH5_ISA32) != 0
+				 && ! seen_stt_datalabel));
+	      else if (!info->relocatable)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+		     input_bfd,
+		     input_section,
+		     (long) rel->r_offset,
+		     howto->name,
+		     h->root.root.string);
+		}
+	    }
+	  else if (h->root.type == bfd_link_hash_undefweak)
+	    ;
+	  else if (info->unresolved_syms_in_objects == RM_IGNORE
+		   && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT)
+	    ;
+	  else if (!info->relocatable)
+	    {
+	      if (! ((*info->callbacks->undefined_symbol)
+		     (info, h->root.root.string, input_bfd,
+		      input_section, rel->r_offset,
+		      (info->unresolved_syms_in_objects == RM_GENERATE_ERROR
+		       || ELF_ST_VISIBILITY (h->other)))))
+		return FALSE;
+	    }
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      disp = (relocation
+	      - input_section->output_section->vma
+	      - input_section->output_offset
+	      - rel->r_offset);
+      dropped = 0;
+      switch ((int)r_type)
+	{
+	case R_SH_PT_16:     dropped = disp & 2; break;
+	case R_SH_DIR10SW: dropped = disp & 1; break;
+	case R_SH_DIR10SL: dropped = disp & 3; break;
+	case R_SH_DIR10SQ: dropped = disp & 7; break;
+	}
+      if (dropped != 0)
+	{
+	  (*_bfd_error_handler)
+	    (_("%s: error: unaligned relocation type %d at %08x reloc %08x\n"),
+	     bfd_get_filename (input_bfd), (int)r_type, (unsigned)rel->r_offset, (unsigned)relocation);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+      switch ((int)r_type)
+	{
+	case R_SH_64:
+	case R_SH_64_PCREL:
+	  if (info->shared
+	      && (input_section->flags & SEC_ALLOC) != 0
+	      && (r_type != R_SH_64_PCREL
+		  || (h != NULL
+		      && h->dynindx != -1
+		      && (! info->symbolic
+			  || !h->def_regular))))
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_byte *loc;
+	      bfd_boolean skip, relocate;
+
+	      /* When generating a shared object, these relocations
+		 are copied into the output file to be resolved at run
+		 time.  */
+
+	      if (sreloc == NULL)
+		{
+		  sreloc = _bfd_elf_get_dynamic_reloc_section
+		    (input_bfd, input_section, /*rela?*/ TRUE);
+		  if (sreloc == NULL)
+		    return FALSE;
+		}
+
+	      skip = FALSE;
+	      relocate = FALSE;
+
+	      outrel.r_offset
+		= _bfd_elf_section_offset (output_bfd, info,
+					   input_section, rel->r_offset);
+
+	      if (outrel.r_offset == (bfd_vma) -1)
+		skip = TRUE;
+	      else if (outrel.r_offset == (bfd_vma) -2)
+		skip = TRUE, relocate = TRUE;
+
+	      outrel.r_offset += (input_section->output_section->vma
+				  + input_section->output_offset);
+
+	      if (skip)
+		memset (&outrel, 0, sizeof outrel);
+	      else if (r_type == R_SH_64_PCREL)
+		{
+		  BFD_ASSERT (h != NULL && h->dynindx != -1);
+		  outrel.r_info = ELF64_R_INFO (h->dynindx, R_SH_64_PCREL);
+		  outrel.r_addend = rel->r_addend;
+		}
+	      else
+		{
+		  /* h->dynindx may be -1 if this symbol was marked to
+		     become local.  */
+		  if (h == NULL
+		      || ((info->symbolic || h->dynindx == -1)
+			  && h->def_regular))
+		    {
+		      relocate = TRUE;
+		      outrel.r_info = ELF64_R_INFO (0, R_SH_RELATIVE64);
+		      outrel.r_addend = relocation + rel->r_addend;
+		    }
+		  else
+		    {
+		      BFD_ASSERT (h->dynindx != -1);
+		      outrel.r_info = ELF64_R_INFO (h->dynindx, R_SH_64);
+		      outrel.r_addend = relocation + rel->r_addend;
+		    }
+		}
+
+	      loc = sreloc->contents;
+	      loc += sreloc->reloc_count++ * sizeof (Elf64_External_Rela);
+	      bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);
+
+	      /* If this reloc is against an external symbol, we do
+		 not want to fiddle with the addend.  Otherwise, we
+		 need to include the symbol value so that it becomes
+		 an addend for the dynamic reloc.  */
+	      if (! relocate)
+		continue;
+	    }
+	  else if (r_type == R_SH_64)
+	    addend = rel->r_addend;
+	  goto final_link_relocate;
+
+	case R_SH_GOTPLT_LOW16:
+	case R_SH_GOTPLT_MEDLOW16:
+	case R_SH_GOTPLT_MEDHI16:
+	case R_SH_GOTPLT_HI16:
+	case R_SH_GOTPLT10BY4:
+	case R_SH_GOTPLT10BY8:
+	  /* Relocation is to the entry for this symbol in the
+	     procedure linkage table.  */
+
+	  if (h == NULL
+	      || ELF_ST_VISIBILITY (h->other) == STV_INTERNAL
+	      || ELF_ST_VISIBILITY (h->other) == STV_HIDDEN
+	      || ! info->shared
+	      || info->symbolic
+	      || h->dynindx == -1
+	      || h->plt.offset == (bfd_vma) -1
+	      || h->got.offset != (bfd_vma) -1)
+	    goto force_got;
+
+	  /* Relocation is to the entry for this symbol in the global
+	     offset table extension for the procedure linkage table.  */
+	  if (sgotplt == NULL)
+	    {
+	      sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");
+	      BFD_ASSERT (sgotplt != NULL);
+	    }
+
+	  relocation = (sgotplt->output_offset
+			+ ((h->plt.offset / elf_sh64_sizeof_plt (info)
+			    - 1 + 3) * 8));
+
+	  relocation -= GOT_BIAS;
+
+	  goto final_link_relocate;
+
+	force_got:
+	case R_SH_GOT_LOW16:
+	case R_SH_GOT_MEDLOW16:
+	case R_SH_GOT_MEDHI16:
+	case R_SH_GOT_HI16:
+	case R_SH_GOT10BY4:
+	case R_SH_GOT10BY8:
+	  /* Relocation is to the entry for this symbol in the global
+	     offset table.  */
+	  if (sgot == NULL)
+	    {
+	      sgot = bfd_get_section_by_name (dynobj, ".got");
+	      BFD_ASSERT (sgot != NULL);
+	    }
+
+	  if (h != NULL)
+	    {
+	      bfd_vma off;
+
+	      off = h->got.offset;
+	      if (seen_stt_datalabel)
+		{
+		  struct elf_sh64_link_hash_entry *hsh;
+
+		  hsh = (struct elf_sh64_link_hash_entry *)h;
+		  off = hsh->datalabel_got_offset;
+		}
+	      BFD_ASSERT (off != (bfd_vma) -1);
+
+	      if (! elf_hash_table (info)->dynamic_sections_created
+		  || (info->shared
+		      && (info->symbolic || h->dynindx == -1
+			  || ELF_ST_VISIBILITY (h->other) == STV_INTERNAL
+			  || ELF_ST_VISIBILITY (h->other) == STV_HIDDEN)
+		      && h->def_regular))
+		{
+		  /* This is actually a static link, or it is a
+		     -Bsymbolic link and the symbol is defined
+		     locally, or the symbol was forced to be local
+		     because of a version file.  We must initialize
+		     this entry in the global offset table.  Since the
+		     offset must always be a multiple of 4, we use the
+		     least significant bit to record whether we have
+		     initialized it already.
+
+		     When doing a dynamic link, we create a .rela.got
+		     relocation entry to initialize the value.  This
+		     is done in the finish_dynamic_symbol routine.  */
+		  if ((off & 1) != 0)
+		    off &= ~1;
+		  else
+		    {
+		      bfd_put_64 (output_bfd, relocation,
+				  sgot->contents + off);
+		      if (seen_stt_datalabel)
+			{
+			  struct elf_sh64_link_hash_entry *hsh;
+
+			  hsh = (struct elf_sh64_link_hash_entry *)h;
+			  hsh->datalabel_got_offset |= 1;
+			}
+		      else
+			h->got.offset |= 1;
+		    }
+		}
+
+	      relocation = sgot->output_offset + off;
+	    }
+	  else
+	    {
+	      bfd_vma off;
+
+	      if (rel->r_addend)
+		{
+		  BFD_ASSERT (local_got_offsets != NULL
+			      && (local_got_offsets[symtab_hdr->sh_info
+						    + r_symndx]
+				  != (bfd_vma) -1));
+
+		  off = local_got_offsets[symtab_hdr->sh_info
+					  + r_symndx];
+		}
+	      else
+		{
+		  BFD_ASSERT (local_got_offsets != NULL
+			      && local_got_offsets[r_symndx] != (bfd_vma) -1);
+
+		  off = local_got_offsets[r_symndx];
+		}
+
+	      /* The offset must always be a multiple of 8.  We use
+		 the least significant bit to record whether we have
+		 already generated the necessary reloc.  */
+	      if ((off & 1) != 0)
+		off &= ~1;
+	      else
+		{
+		  bfd_put_64 (output_bfd, relocation, sgot->contents + off);
+
+		  if (info->shared)
+		    {
+		      asection *s;
+		      Elf_Internal_Rela outrel;
+		      bfd_byte *loc;
+
+		      s = bfd_get_section_by_name (dynobj, ".rela.got");
+		      BFD_ASSERT (s != NULL);
+
+		      outrel.r_offset = (sgot->output_section->vma
+					 + sgot->output_offset
+					 + off);
+		      outrel.r_info = ELF64_R_INFO (0, R_SH_RELATIVE64);
+		      outrel.r_addend = relocation;
+		      loc = s->contents;
+		      loc += s->reloc_count++ * sizeof (Elf64_External_Rela);
+		      bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);
+		    }
+
+		  if (rel->r_addend)
+		    local_got_offsets[symtab_hdr->sh_info + r_symndx] |= 1;
+		  else
+		    local_got_offsets[r_symndx] |= 1;
+		}
+
+	      relocation = sgot->output_offset + off;
+	    }
+
+ 	  relocation -= GOT_BIAS;
+
+	  goto final_link_relocate;
+
+	case R_SH_GOTOFF_LOW16:
+	case R_SH_GOTOFF_MEDLOW16:
+	case R_SH_GOTOFF_MEDHI16:
+	case R_SH_GOTOFF_HI16:
+	  /* Relocation is relative to the start of the global offset
+	     table.  */
+
+	  if (sgot == NULL)
+	    {
+	      sgot = bfd_get_section_by_name (dynobj, ".got");
+	      BFD_ASSERT (sgot != NULL);
+	    }
+
+	  /* Note that sgot->output_offset is not involved in this
+	     calculation.  We always want the start of .got.  If we
+	     defined _GLOBAL_OFFSET_TABLE in a different way, as is
+	     permitted by the ABI, we might have to change this
+	     calculation.  */
+	  relocation -= sgot->output_section->vma;
+
+	  relocation -= GOT_BIAS;
+
+	  addend = rel->r_addend;
+
+	  goto final_link_relocate;
+
+	case R_SH_GOTPC_LOW16:
+	case R_SH_GOTPC_MEDLOW16:
+	case R_SH_GOTPC_MEDHI16:
+	case R_SH_GOTPC_HI16:
+	  /* Use global offset table as symbol value.  */
+
+	  if (sgot == NULL)
+	    {
+	      sgot = bfd_get_section_by_name (dynobj, ".got");
+	      BFD_ASSERT (sgot != NULL);
+	    }
+
+	  relocation = sgot->output_section->vma;
+
+	  relocation += GOT_BIAS;
+
+	  addend = rel->r_addend;
+
+	  goto final_link_relocate;
+
+	case R_SH_PLT_LOW16:
+	case R_SH_PLT_MEDLOW16:
+	case R_SH_PLT_MEDHI16:
+	case R_SH_PLT_HI16:
+	  /* Relocation is to the entry for this symbol in the
+	     procedure linkage table.  */
+
+	  /* Resolve a PLT reloc against a local symbol directly,
+	     without using the procedure linkage table.  */
+	  if (h == NULL)
+	    goto final_link_relocate;
+
+	  if (ELF_ST_VISIBILITY (h->other) == STV_INTERNAL
+	      || ELF_ST_VISIBILITY (h->other) == STV_HIDDEN)
+	    goto final_link_relocate;
+
+	  if (h->plt.offset == (bfd_vma) -1)
+	    {
+	      /* We didn't make a PLT entry for this symbol.  This
+		 happens when statically linking PIC code, or when
+		 using -Bsymbolic.  */
+	      goto final_link_relocate;
+	    }
+
+	  if (splt == NULL)
+	    {
+	      splt = bfd_get_section_by_name (dynobj, ".plt");
+	      BFD_ASSERT (splt != NULL);
+	    }
+
+	  relocation = (splt->output_section->vma
+			+ splt->output_offset
+			+ h->plt.offset);
+	  relocation++;
+
+	  addend = rel->r_addend;
+
+	  goto final_link_relocate;
+
+	case R_SH_DIR32:
+	case R_SH_SHMEDIA_CODE:
+	case R_SH_PT_16:
+	case R_SH_DIR5U:
+	case R_SH_DIR6S:
+	case R_SH_DIR6U:
+	case R_SH_DIR10S:
+	case R_SH_DIR10SW:
+	case R_SH_DIR10SL:
+	case R_SH_DIR10SQ:
+	case R_SH_IMMS16:
+	case R_SH_IMMU16:
+	case R_SH_IMM_LOW16:
+	case R_SH_IMM_LOW16_PCREL:
+	case R_SH_IMM_MEDLOW16:
+	case R_SH_IMM_MEDLOW16_PCREL:
+	case R_SH_IMM_MEDHI16:
+	case R_SH_IMM_MEDHI16_PCREL:
+	case R_SH_IMM_HI16:
+	case R_SH_IMM_HI16_PCREL:
+	  addend = rel->r_addend;
+	  /* Fall through.  */
+	case R_SH_REL32:
+	final_link_relocate:
+	  r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+					contents, rel->r_offset,
+					relocation, addend);
+	  break;
+
+	default:
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+
+	}
+
+      if (r != bfd_reloc_ok)
+	{
+	  switch (r)
+	    {
+	    default:
+	    case bfd_reloc_outofrange:
+	      abort ();
+	    case bfd_reloc_overflow:
+	      {
+		const char *name;
+
+		if (h != NULL)
+		  name = NULL;
+		else
+		  {
+		    name = (bfd_elf_string_from_elf_section
+			    (input_bfd, symtab_hdr->sh_link, sym->st_name));
+		    if (name == NULL)
+		      return FALSE;
+		    if (*name == '\0')
+		      name = bfd_section_name (input_bfd, sec);
+		  }
+		if (! ((*info->callbacks->reloc_overflow)
+		       (info, (h ? &h->root : NULL), name, howto->name,
+			(bfd_vma) 0, input_bfd, input_section,
+			rel->r_offset)))
+		  return FALSE;
+	      }
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* This is a version of bfd_generic_get_relocated_section_contents
+   that uses sh_elf64_relocate_section.
+
+   See sh_elf_relocate_section in elf32-sh.c for the original.  */
+
+static bfd_byte *
+sh_elf64_get_relocated_section_contents (bfd *output_bfd,
+					 struct bfd_link_info *link_info,
+					 struct bfd_link_order *link_order,
+					 bfd_byte *data,
+					 bfd_boolean relocatable,
+					 asymbol **symbols)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  asection *input_section = link_order->u.indirect.section;
+  bfd *input_bfd = input_section->owner;
+  asection **sections = NULL;
+  Elf_Internal_Rela *internal_relocs = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+
+  /* We only need to handle the case of relaxing, or of having a
+     particular set of section contents, specially.  */
+  if (relocatable
+      || elf_section_data (input_section)->this_hdr.contents == NULL)
+    return bfd_generic_get_relocated_section_contents (output_bfd, link_info,
+						       link_order, data,
+						       relocatable,
+						       symbols);
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+
+  memcpy (data, elf_section_data (input_section)->this_hdr.contents,
+	  input_section->size);
+
+  if ((input_section->flags & SEC_RELOC) != 0
+      && input_section->reloc_count > 0)
+    {
+      Elf_Internal_Sym *isymp;
+      Elf_Internal_Sym *isymend;
+      asection **secpp;
+
+      /* Read this BFD's local symbols.  */
+      if (symtab_hdr->sh_info != 0)
+	{
+	  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	  if (isymbuf == NULL)
+	    isymbuf = bfd_elf_get_elf_syms (input_bfd, symtab_hdr,
+					    symtab_hdr->sh_info, 0,
+					    NULL, NULL, NULL);
+	  if (isymbuf == NULL)
+	    goto error_return;
+	}
+
+      internal_relocs = (_bfd_elf_link_read_relocs
+			 (input_bfd, input_section, NULL,
+			  (Elf_Internal_Rela *) NULL, FALSE));
+      if (internal_relocs == NULL)
+	goto error_return;
+
+      sections = (asection **) bfd_malloc (symtab_hdr->sh_info
+					   * sizeof (asection *));
+      if (sections == NULL && symtab_hdr->sh_info > 0)
+	goto error_return;
+
+      secpp = sections;
+      isymend = isymbuf + symtab_hdr->sh_info;
+      for (isymp = isymbuf; isymp < isymend; ++isymp, ++secpp)
+	{
+	  asection *isec;
+
+	  if (isymp->st_shndx == SHN_UNDEF)
+	    isec = bfd_und_section_ptr;
+	  else if (isymp->st_shndx == SHN_ABS)
+	    isec = bfd_abs_section_ptr;
+	  else if (isymp->st_shndx == SHN_COMMON)
+	    isec = bfd_com_section_ptr;
+	  else
+	    isec = bfd_section_from_elf_index (input_bfd, isymp->st_shndx);
+
+	  *secpp = isec;
+	}
+
+      if (! sh_elf64_relocate_section (output_bfd, link_info, input_bfd,
+				       input_section, data, internal_relocs,
+				       isymbuf, sections))
+	goto error_return;
+
+      if (sections != NULL)
+	free (sections);
+      if (internal_relocs != elf_section_data (input_section)->relocs)
+	free (internal_relocs);
+      if (isymbuf != NULL
+	  && (unsigned char *) isymbuf != symtab_hdr->contents)
+	free (isymbuf);
+    }
+
+  return data;
+
+ error_return:
+  if (sections != NULL)
+    free (sections);
+  if (internal_relocs != NULL
+      && internal_relocs != elf_section_data (input_section)->relocs)
+    free (internal_relocs);
+  if (isymbuf != NULL
+      && (unsigned char *) isymbuf != symtab_hdr->contents)
+    free (isymbuf);
+  return NULL;
+}
+
+/* Set the SHF_SH5_ISA32 flag for ISA SHmedia code sections.  */
+
+static bfd_boolean
+sh64_elf64_fake_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+			  Elf_Internal_Shdr *elf_section_hdr,
+			  asection *asect)
+{
+  /* Code sections can only contain SH64 code, so mark them as such.  */
+  if (bfd_get_section_flags (output_bfd, asect) & SEC_CODE)
+    elf_section_hdr->sh_flags |= SHF_SH5_ISA32;
+
+  return TRUE;
+}
+
+static bfd_boolean
+sh_elf64_set_mach_from_flags (bfd *abfd)
+{
+  flagword flags = elf_elfheader (abfd)->e_flags;
+
+  switch (flags & EF_SH_MACH_MASK)
+    {
+    case EF_SH5:
+      /* Just one, but keep the switch construct to make additions easy.  */
+      bfd_default_set_arch_mach (abfd, bfd_arch_sh, bfd_mach_sh5);
+      break;
+
+    default:
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+  return TRUE;
+}
+
+/* Function to keep SH64 specific file flags.
+
+   See sh64_elf_set_private_flags in elf32-sh64.c for the original.  */
+
+static bfd_boolean
+sh_elf64_set_private_flags (bfd *abfd, flagword flags)
+{
+  BFD_ASSERT (! elf_flags_init (abfd)
+	      || elf_elfheader (abfd)->e_flags == flags);
+
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = TRUE;
+  return sh_elf64_set_mach_from_flags (abfd);
+}
+
+/* Copy the SHF_SH5_ISA32 attribute that we keep on all sections with
+   code, to keep attributes the same as for SHmedia in 32-bit ELF.  */
+
+static bfd_boolean
+sh_elf64_copy_private_data_internal (bfd *ibfd, bfd *obfd)
+{
+  Elf_Internal_Shdr **o_shdrp;
+  asection *isec;
+  asection *osec;
+
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  o_shdrp = elf_elfsections (obfd);
+  for (osec = obfd->sections; osec; osec = osec->next)
+    {
+      int oIndex = ((struct bfd_elf_section_data *) elf_section_data (osec))->this_idx;
+      for (isec = ibfd->sections; isec; isec = isec->next)
+	{
+	  if (strcmp (osec->name, isec->name) == 0)
+	    {
+	      /* Note that we're not disallowing mixing data and code.  */
+	      if ((elf_section_data (isec)->this_hdr.sh_flags
+		   & SHF_SH5_ISA32) != 0)
+		o_shdrp[oIndex]->sh_flags |= SHF_SH5_ISA32;
+	      break;
+	    }
+	}
+    }
+
+  /* Copy object attributes.  */
+  _bfd_elf_copy_obj_attributes (ibfd, obfd);
+
+  return sh_elf64_set_private_flags (obfd, elf_elfheader (ibfd)->e_flags);
+}
+
+static bfd_boolean
+sh_elf64_copy_private_data (bfd *ibfd, bfd *obfd)
+{
+  return sh_elf64_copy_private_data_internal (ibfd, obfd);
+}
+
+static bfd_boolean
+sh_elf64_merge_private_data (bfd *ibfd, bfd *obfd)
+{
+  flagword old_flags, new_flags;
+
+  if (! _bfd_generic_verify_endian_match (ibfd, obfd))
+    return FALSE;
+
+  if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  if (bfd_get_arch_size (ibfd) != bfd_get_arch_size (obfd))
+    {
+      const char *msg;
+
+      if (bfd_get_arch_size (ibfd) == 32
+	  && bfd_get_arch_size (obfd) == 64)
+	msg = _("%s: compiled as 32-bit object and %s is 64-bit");
+      else if (bfd_get_arch_size (ibfd) == 64
+	       && bfd_get_arch_size (obfd) == 32)
+	msg = _("%s: compiled as 64-bit object and %s is 32-bit");
+      else
+	msg = _("%s: object size does not match that of target %s");
+
+      (*_bfd_error_handler) (msg, bfd_get_filename (ibfd),
+			     bfd_get_filename (obfd));
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+
+  old_flags = elf_elfheader (obfd)->e_flags;
+  new_flags = elf_elfheader (ibfd)->e_flags;
+  if (! elf_flags_init (obfd))
+    {
+      /* This happens when ld starts out with a 'blank' output file.  */
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = old_flags = new_flags;
+    }
+  /* We don't allow linking in anything else than SH64 code, and since
+     this is a 64-bit ELF, we assume the 64-bit ABI is used.  Add code
+     here as things change.  */
+  else if ((new_flags & EF_SH_MACH_MASK) != EF_SH5)
+    {
+      (*_bfd_error_handler)
+	("%s: does not use the SH64 64-bit ABI as previous modules do",
+	 bfd_get_filename (ibfd));
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  sh_elf64_copy_private_data_internal (ibfd, obfd);
+
+  /* I can't think of anything sane other than old_flags being EF_SH5 and
+     that we need to preserve that.  */
+  elf_elfheader (obfd)->e_flags = old_flags;
+
+  return sh_elf64_set_mach_from_flags (obfd);
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+static asection *
+sh_elf64_gc_mark_hook (asection *sec,
+		       struct bfd_link_info *info,
+		       Elf_Internal_Rela *rel,
+		       struct elf_link_hash_entry *h,
+		       Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF64_R_TYPE (rel->r_info))
+      {
+      case R_SH_GNU_VTINHERIT:
+      case R_SH_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Look through the relocs for a section during the first phase.
+   Since we don't do .gots or .plts, we just need to consider the
+   virtual table relocs for gc.  */
+
+static bfd_boolean
+sh_elf64_check_relocs (bfd *abfd, struct bfd_link_info *info,
+		       asection *sec, const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  bfd *dynobj;
+  bfd_vma *local_got_offsets;
+  asection *sgot;
+  asection *srelgot;
+  asection *sreloc;
+
+  sgot = NULL;
+  srelgot = NULL;
+  sreloc = NULL;
+
+  if (info->relocatable)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  dynobj = elf_hash_table (info)->dynobj;
+  local_got_offsets = elf_local_got_offsets (abfd);
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      struct elf_link_hash_entry *h;
+      unsigned long r_symndx;
+
+      r_symndx = ELF64_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+        h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      /* Some relocs require a global offset table.  */
+      if (dynobj == NULL)
+	{
+	  switch (ELF64_R_TYPE (rel->r_info))
+	    {
+	    case R_SH_GOTPLT_LOW16:
+	    case R_SH_GOTPLT_MEDLOW16:
+	    case R_SH_GOTPLT_MEDHI16:
+	    case R_SH_GOTPLT_HI16:
+	    case R_SH_GOTPLT10BY4:
+	    case R_SH_GOTPLT10BY8:
+	    case R_SH_GOT_LOW16:
+	    case R_SH_GOT_MEDLOW16:
+	    case R_SH_GOT_MEDHI16:
+	    case R_SH_GOT_HI16:
+	    case R_SH_GOT10BY4:
+	    case R_SH_GOT10BY8:
+	    case R_SH_GOTOFF_LOW16:
+	    case R_SH_GOTOFF_MEDLOW16:
+	    case R_SH_GOTOFF_MEDHI16:
+	    case R_SH_GOTOFF_HI16:
+	    case R_SH_GOTPC_LOW16:
+	    case R_SH_GOTPC_MEDLOW16:
+	    case R_SH_GOTPC_MEDHI16:
+	    case R_SH_GOTPC_HI16:
+	      elf_hash_table (info)->dynobj = dynobj = abfd;
+	      if (! _bfd_elf_create_got_section (dynobj, info))
+		return FALSE;
+	      break;
+
+	    default:
+	      break;
+	    }
+	}
+
+      switch (ELF64_R_TYPE (rel->r_info))
+        {
+	  /* This relocation describes the C++ object vtable hierarchy.
+	     Reconstruct it for later use during GC.  */
+        case R_SH_GNU_VTINHERIT:
+          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+            return FALSE;
+          break;
+
+	  /* This relocation describes which C++ vtable entries are actually
+	     used.  Record for later use during GC.  */
+        case R_SH_GNU_VTENTRY:
+          BFD_ASSERT (h != NULL);
+          if (h != NULL
+              && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+            return FALSE;
+          break;
+
+	force_got:
+	case R_SH_GOT_LOW16:
+	case R_SH_GOT_MEDLOW16:
+	case R_SH_GOT_MEDHI16:
+	case R_SH_GOT_HI16:
+	case R_SH_GOT10BY4:
+	case R_SH_GOT10BY8:
+	  /* This symbol requires a global offset table entry.  */
+
+	  if (sgot == NULL)
+	    {
+	      sgot = bfd_get_section_by_name (dynobj, ".got");
+	      BFD_ASSERT (sgot != NULL);
+	    }
+
+	  if (srelgot == NULL
+	      && (h != NULL || info->shared))
+	    {
+	      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+	      if (srelgot == NULL)
+		{
+		  srelgot = bfd_make_section_with_flags (dynobj,
+							 ".rela.got",
+							 (SEC_ALLOC
+							  | SEC_LOAD
+							  | SEC_HAS_CONTENTS
+							  | SEC_IN_MEMORY
+							  | SEC_LINKER_CREATED
+							  | SEC_READONLY));
+		  if (srelgot == NULL
+		      || ! bfd_set_section_alignment (dynobj, srelgot, 2))
+		    return FALSE;
+		}
+	    }
+
+	  if (h != NULL)
+	    {
+	      if (h->type == STT_DATALABEL)
+		{
+		  struct elf_sh64_link_hash_entry *hsh;
+
+		  h = (struct elf_link_hash_entry *) h->root.u.i.link;
+		  hsh = (struct elf_sh64_link_hash_entry *)h;
+		  if (hsh->datalabel_got_offset != (bfd_vma) -1)
+		    break;
+
+		  hsh->datalabel_got_offset = sgot->size;
+		}
+	      else
+		{
+		  if (h->got.offset != (bfd_vma) -1)
+		    {
+		      /* We have already allocated space in the .got.  */
+		      break;
+		    }
+		  h->got.offset = sgot->size;
+		}
+
+	      /* Make sure this symbol is output as a dynamic symbol.  */
+	      if (h->dynindx == -1)
+		{
+		  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		    return FALSE;
+		}
+
+	      srelgot->size += sizeof (Elf64_External_Rela);
+	    }
+	  else
+	    {
+     	      /* This is a global offset table entry for a local
+		 symbol.  */
+	      if (local_got_offsets == NULL)
+		{
+		  size_t size;
+		  register unsigned int i;
+
+		  size = symtab_hdr->sh_info * sizeof (bfd_vma);
+		  /* Reserve space for both the datalabel and
+		     codelabel local GOT offsets.  */
+		  size *= 2;
+		  local_got_offsets = (bfd_vma *) bfd_alloc (abfd, size);
+		  if (local_got_offsets == NULL)
+		    return FALSE;
+		  elf_local_got_offsets (abfd) = local_got_offsets;
+		  for (i = 0; i < symtab_hdr->sh_info; i++)
+		    local_got_offsets[i] = (bfd_vma) -1;
+		  for (; i < 2 * symtab_hdr->sh_info; i++)
+		    local_got_offsets[i] = (bfd_vma) -1;
+		}
+	      if ((rel->r_addend & 1) != 0)
+		{
+		  if (local_got_offsets[symtab_hdr->sh_info
+					+ r_symndx] != (bfd_vma) -1)
+		    {
+		      /* We have already allocated space in the .got.  */
+		      break;
+		    }
+		  local_got_offsets[symtab_hdr->sh_info
+				    + r_symndx] = sgot->size;
+		}
+	      else
+		{
+		  if (local_got_offsets[r_symndx] != (bfd_vma) -1)
+		    {
+		      /* We have already allocated space in the .got.  */
+		      break;
+		    }
+		  local_got_offsets[r_symndx] = sgot->size;
+		}
+
+	      if (info->shared)
+		{
+		  /* If we are generating a shared object, we need to
+		     output a R_SH_RELATIVE reloc so that the dynamic
+		     linker can adjust this GOT entry.  */
+		  srelgot->size += sizeof (Elf64_External_Rela);
+		}
+	    }
+
+	  sgot->size += 8;
+
+	  break;
+
+	case R_SH_GOTPLT_LOW16:
+	case R_SH_GOTPLT_MEDLOW16:
+	case R_SH_GOTPLT_MEDHI16:
+	case R_SH_GOTPLT_HI16:
+	case R_SH_GOTPLT10BY4:
+	case R_SH_GOTPLT10BY8:
+	  /* If this is a local symbol, we resolve it directly without
+	     creating a procedure linkage table entry.  */
+
+	  if (h == NULL
+	      || ELF_ST_VISIBILITY (h->other) == STV_INTERNAL
+	      || ELF_ST_VISIBILITY (h->other) == STV_HIDDEN
+	      || ! info->shared
+	      || info->symbolic
+	      || h->dynindx == -1
+	      || h->got.offset != (bfd_vma) -1)
+	    goto force_got;
+
+	  /* Make sure this symbol is output as a dynamic symbol.  */
+	  if (h->dynindx == -1)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+
+	  h->needs_plt = 1;
+
+	  break;
+
+	case R_SH_PLT_LOW16:
+	case R_SH_PLT_MEDLOW16:
+	case R_SH_PLT_MEDHI16:
+	case R_SH_PLT_HI16:
+	  /* This symbol requires a procedure linkage table entry.  We
+	     actually build the entry in adjust_dynamic_symbol,
+	     because this might be a case of linking PIC code which is
+	     never referenced by a dynamic object, in which case we
+	     don't need to generate a procedure linkage table entry
+	     after all.  */
+
+	  /* If this is a local symbol, we resolve it directly without
+	     creating a procedure linkage table entry.  */
+	  if (h == NULL)
+	    continue;
+
+	  if (ELF_ST_VISIBILITY (h->other) == STV_INTERNAL
+	      || ELF_ST_VISIBILITY (h->other) == STV_HIDDEN)
+	    break;
+
+	  h->needs_plt = 1;
+
+	  break;
+
+	case R_SH_64:
+	case R_SH_64_PCREL:
+	  if (h != NULL)
+	    h->non_got_ref = 1;
+
+	  /* If we are creating a shared library, and this is a reloc
+	     against a global symbol, or a non PC relative reloc
+	     against a local symbol, then we need to copy the reloc
+	     into the shared library.  However, if we are linking with
+	     -Bsymbolic, we do not need to copy a reloc against a
+	     global symbol which is defined in an object we are
+	     including in the link (i.e., DEF_REGULAR is set).  At
+	     this point we have not seen all the input files, so it is
+	     possible that DEF_REGULAR is not set now but will be set
+	     later (it is never cleared).  We account for that
+	     possibility below by storing information in the
+	     pcrel_relocs_copied field of the hash table entry.  */
+	  if (info->shared
+	      && (sec->flags & SEC_ALLOC) != 0
+	      && (ELF32_R_TYPE (rel->r_info) != R_SH_64_PCREL
+		  || (h != NULL
+		      && (! info->symbolic
+			  || !h->def_regular))))
+	    {
+	      /* When creating a shared object, we must copy these
+		 reloc types into the output file.  We create a reloc
+		 section in dynobj and make room for this reloc.  */
+	      if (sreloc == NULL)
+		{
+		  sreloc = _bfd_elf_make_dynamic_reloc_section
+		    (sec, dynobj, 2, abfd, /*rela?*/ TRUE);
+
+		  if (sreloc == NULL)
+		    return FALSE;
+		}
+
+	      sreloc->size += sizeof (Elf64_External_Rela);
+
+	      /* If we are linking with -Bsymbolic, and this is a
+		 global symbol, we count the number of PC relative
+		 relocations we have entered for this symbol, so that
+		 we can discard them again if the symbol is later
+		 defined by a regular object.  Note that this function
+		 is only called if we are using an elf_sh linker
+		 hash table, which means that h is really a pointer to
+		 an elf_sh_link_hash_entry.  */
+	      if (h != NULL && info->symbolic
+		  && ELF64_R_TYPE (rel->r_info) == R_SH_64_PCREL)
+		{
+		  struct elf_sh64_link_hash_entry *eh;
+		  struct elf_sh64_pcrel_relocs_copied *p;
+
+		  eh = (struct elf_sh64_link_hash_entry *) h;
+
+		  for (p = eh->pcrel_relocs_copied; p != NULL; p = p->next)
+		    if (p->section == sreloc)
+		      break;
+
+		  if (p == NULL)
+		    {
+		      p = ((struct elf_sh64_pcrel_relocs_copied *)
+			   bfd_alloc (dynobj, sizeof *p));
+		      if (p == NULL)
+			return FALSE;
+		      p->next = eh->pcrel_relocs_copied;
+		      eh->pcrel_relocs_copied = p;
+		      p->section = sreloc;
+		      p->count = 0;
+		    }
+
+		  ++p->count;
+		}
+	    }
+
+	  break;
+        }
+    }
+
+  return TRUE;
+}
+
+static int
+sh64_elf64_get_symbol_type (Elf_Internal_Sym * elf_sym, int type)
+{
+  if (ELF_ST_TYPE (elf_sym->st_info) == STT_DATALABEL)
+    return STT_DATALABEL;
+
+  return type;
+}
+
+/* FIXME: This is a copy of sh64_elf_add_symbol_hook in elf32-sh64.c.
+   Either file can presumably exist without the other, but do not differ
+   in elf-size-ness.  How to share?
+
+   Hook called by the linker routine which adds symbols from an object
+   file.  We must make indirect symbols for undefined symbols marked with
+   STT_DATALABEL, so relocations passing them will pick up that attribute
+   and neutralize STO_SH5_ISA32 found on the symbol definition.
+
+   There is a problem, though: We want to fill in the hash-table entry for
+   this symbol and signal to the caller that no further processing is
+   needed.  But we don't have the index for this hash-table entry.  We
+   rely here on that the current entry is the first hash-entry with NULL,
+   which seems brittle.  Also, iterating over the hash-table to find that
+   entry is a linear operation on the number of symbols in this input
+   file, and this function should take constant time, so that's not good
+   too.  Only comfort is that DataLabel references should only be found in
+   hand-written assembly code and thus be rare.  FIXME: Talk maintainers
+   into adding an option to elf_add_symbol_hook (preferably) for the index
+   or the hash entry, alternatively adding the index to Elf_Internal_Sym
+   (not so good).  */
+
+static bfd_boolean
+sh64_elf64_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
+			    Elf_Internal_Sym *sym, const char **namep,
+			    flagword *flagsp ATTRIBUTE_UNUSED,
+			    asection **secp, bfd_vma *valp)
+{
+  /* We want to do this for relocatable as well as final linking.  */
+  if (ELF_ST_TYPE (sym->st_info) == STT_DATALABEL
+      && is_elf_hash_table (info->hash))
+    {
+      struct elf_link_hash_entry *h;
+
+      /* For relocatable links, we register the DataLabel sym in its own
+	 right, and tweak the name when it's output.  Otherwise, we make
+	 an indirect symbol of it.  */
+      flagword flags
+	= info->relocatable || info->emitrelocations
+	? BSF_GLOBAL : BSF_GLOBAL | BSF_INDIRECT;
+
+      char *dl_name
+	= bfd_malloc (strlen (*namep) + sizeof (DATALABEL_SUFFIX));
+      struct elf_link_hash_entry ** sym_hash = elf_sym_hashes (abfd);
+
+      BFD_ASSERT (sym_hash != NULL);
+
+      /* Allocation may fail.  */
+      if (dl_name == NULL)
+	return FALSE;
+
+      strcpy (dl_name, *namep);
+      strcat (dl_name, DATALABEL_SUFFIX);
+
+      h = (struct elf_link_hash_entry *)
+	bfd_link_hash_lookup (info->hash, dl_name, FALSE, FALSE, FALSE);
+
+      if (h == NULL)
+	{
+	  /* No previous datalabel symbol.  Make one.  */
+	  struct bfd_link_hash_entry *bh = NULL;
+	  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+
+	  if (! _bfd_generic_link_add_one_symbol (info, abfd, dl_name,
+						  flags, *secp, *valp,
+						  *namep, FALSE,
+						  bed->collect, &bh))
+	    {
+	      free (dl_name);
+	      return FALSE;
+	    }
+
+	  h = (struct elf_link_hash_entry *) bh;
+	  h->non_elf = 0;
+	  h->type = STT_DATALABEL;
+	}
+      else
+	/* If a new symbol was created, it holds the allocated name.
+	   Otherwise, we don't need it anymore and should deallocate it.  */
+	free (dl_name);
+
+      if (h->type != STT_DATALABEL
+	  || ((info->relocatable || info->emitrelocations)
+	      && h->root.type != bfd_link_hash_undefined)
+	  || (! info->relocatable && !info->emitrelocations
+	      && h->root.type != bfd_link_hash_indirect))
+	{
+	  /* Make sure we don't get confused on invalid input.  */
+	  (*_bfd_error_handler)
+	    (_("%s: encountered datalabel symbol in input"),
+	     bfd_get_filename (abfd));
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      /* Now find the hash-table slot for this entry and fill it in.  */
+      while (*sym_hash != NULL)
+	sym_hash++;
+      *sym_hash = h;
+
+      /* Signal to caller to skip this symbol - we've handled it.  */
+      *namep = NULL;
+    }
+
+  return TRUE;
+}
+
+/* This hook function is called before the linker writes out a global
+   symbol.  For relocatable links, DataLabel symbols will be present in
+   linker output.  We cut off the special suffix on those symbols, so the
+   right name appears in the output.
+
+   When linking and emitting relocations, there can appear global symbols
+   that are not referenced by relocs, but rather only implicitly through
+   DataLabel references, a relation that is not visible to the linker.
+   Since no stripping of global symbols in done when doing such linking,
+   we don't need to look up and make sure to emit the main symbol for each
+   DataLabel symbol.  */
+
+static int
+sh64_elf64_link_output_symbol_hook (struct bfd_link_info *info,
+				    const char *cname,
+				    Elf_Internal_Sym *sym,
+				    asection *input_sec ATTRIBUTE_UNUSED,
+				    struct elf_link_hash_entry *h ATTRIBUTE_UNUSED)
+{
+  char *name = (char *) cname;
+
+  if (info->relocatable || info->emitrelocations)
+    {
+      if (ELF_ST_TYPE (sym->st_info) == STT_DATALABEL)
+	name[strlen (name) - strlen (DATALABEL_SUFFIX)] = 0;
+    }
+
+  return 1;
+}
+
+/* Set bit 0 on the entry address; it always points to SHmedia code.  This
+   is mostly for symmetry with the 32-bit format, where code can be
+   SHcompact and we need to make a distinction to make sure execution
+   starts in the right ISA mode.  It is also convenient for a loader,
+   which would otherwise have to set this bit when loading a TR register
+   before jumping to the program entry.  */
+
+static void
+sh64_elf64_final_write_processing (bfd *abfd,
+				   bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  /* FIXME: Perhaps we shouldn't do this if the entry address was supplied
+     numerically, but we currently lack the infrastructure to recognize
+     that: The entry symbol, and info whether it is numeric or a symbol
+     name is kept private in the linker.  */
+  if (elf_elfheader (abfd)->e_type == ET_EXEC)
+    elf_elfheader (abfd)->e_entry |= 1;
+}
+
+/* First entry in an absolute procedure linkage table look like this.  */
+
+static const bfd_byte elf_sh64_plt0_entry_be[PLT_ENTRY_SIZE] =
+{
+  0xcc, 0x00, 0x01, 0x10, /* movi  .got.plt >> 48, r17 */
+  0xc8, 0x00, 0x01, 0x10, /* shori (.got.plt >> 32) & 65535, r17 */
+  0xc8, 0x00, 0x01, 0x10, /* shori (.got.plt >> 16) & 65535, r17 */
+  0xc8, 0x00, 0x01, 0x10, /* shori .got.plt & 65535, r17 */
+  0x8d, 0x10, 0x09, 0x90, /* ld.q  r17, 16, r25 */
+  0x6b, 0xf1, 0x66, 0x00, /* ptabs r25, tr0 */
+  0x8d, 0x10, 0x05, 0x10, /* ld.q  r17, 8, r17 */
+  0x44, 0x01, 0xff, 0xf0, /* blink tr0, r63 */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+};
+
+static const bfd_byte elf_sh64_plt0_entry_le[PLT_ENTRY_SIZE] =
+{
+  0x10, 0x01, 0x00, 0xcc, /* movi  .got.plt >> 16, r17 */
+  0x10, 0x01, 0x00, 0xc8, /* shori (.got.plt >> 32) & 65535, r17 */
+  0x10, 0x01, 0x00, 0xc8, /* shori (.got.plt >> 16) & 65535, r17 */
+  0x10, 0x01, 0x00, 0xc8, /* shori .got.plt & 65535, r17 */
+  0x90, 0x09, 0x10, 0x8d, /* ld.q  r17, 16, r25 */
+  0x00, 0x66, 0xf1, 0x6b, /* ptabs r25, tr0 */
+  0x10, 0x05, 0x10, 0x8d, /* ld.q  r17, 8, r17 */
+  0xf0, 0xff, 0x01, 0x44, /* blink tr0, r63 */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+};
+
+/* Sebsequent entries in an absolute procedure linkage table look like
+   this.  */
+
+static const bfd_byte elf_sh64_plt_entry_be[PLT_ENTRY_SIZE] =
+{
+  0xcc, 0x00, 0x01, 0x90, /* movi  nameN-in-GOT >> 48, r25 */
+  0xc8, 0x00, 0x01, 0x90, /* shori (nameN-in-GOT >> 32) & 65535, r25 */
+  0xc8, 0x00, 0x01, 0x90, /* shori (nameN-in-GOT >> 16) & 65535, r25 */
+  0xc8, 0x00, 0x01, 0x90, /* shori nameN-in-GOT & 65535, r25 */
+  0x8d, 0x90, 0x01, 0x90, /* ld.q  r25, 0, r25 */
+  0x6b, 0xf1, 0x66, 0x00, /* ptabs r25, tr0 */
+  0x44, 0x01, 0xff, 0xf0, /* blink tr0, r63 */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0xcc, 0x00, 0x01, 0x90, /* movi  (.+8-.PLT0) >> 16, r25 */
+  0xc8, 0x00, 0x01, 0x90, /* shori (.+4-.PLT0) & 65535, r25 */
+  0x6b, 0xf5, 0x66, 0x00, /* ptrel r25, tr0 */
+  0xcc, 0x00, 0x01, 0x50, /* movi  reloc-offset >> 16, r21 */
+  0xc8, 0x00, 0x01, 0x50, /* shori reloc-offset & 65535, r21 */
+  0x44, 0x01, 0xff, 0xf0, /* blink tr0, r63 */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+};
+
+static const bfd_byte elf_sh64_plt_entry_le[PLT_ENTRY_SIZE] =
+{
+  0x90, 0x01, 0x00, 0xcc, /* movi  nameN-in-GOT >> 16, r25 */
+  0x90, 0x01, 0x00, 0xc8, /* shori nameN-in-GOT & 65535, r25 */
+  0x90, 0x01, 0x00, 0xc8, /* shori nameN-in-GOT & 65535, r25 */
+  0x90, 0x01, 0x00, 0xc8, /* shori nameN-in-GOT & 65535, r25 */
+  0x90, 0x01, 0x90, 0x8d, /* ld.q  r25, 0, r25 */
+  0x00, 0x66, 0xf1, 0x6b, /* ptabs r25, tr0 */
+  0xf0, 0xff, 0x01, 0x44, /* blink tr0, r63 */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0x90, 0x01, 0x00, 0xcc, /* movi  (.+8-.PLT0) >> 16, r25 */
+  0x90, 0x01, 0x00, 0xc8, /* shori (.+4-.PLT0) & 65535, r25 */
+  0x00, 0x66, 0xf5, 0x6b, /* ptrel r25, tr0 */
+  0x50, 0x01, 0x00, 0xcc, /* movi  reloc-offset >> 16, r21 */
+  0x50, 0x01, 0x00, 0xc8, /* shori reloc-offset & 65535, r21 */
+  0xf0, 0xff, 0x01, 0x44, /* blink tr0, r63 */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+};
+
+/* Entries in a PIC procedure linkage table look like this.  */
+
+static const bfd_byte elf_sh64_pic_plt_entry_be[PLT_ENTRY_SIZE] =
+{
+  0xcc, 0x00, 0x01, 0x90, /* movi  nameN@GOT >> 16, r25 */
+  0xc8, 0x00, 0x01, 0x90, /* shori nameN@GOT & 65535, r25 */
+  0x40, 0xc3, 0x65, 0x90, /* ldx.q r12, r25, r25 */
+  0x6b, 0xf1, 0x66, 0x00, /* ptabs r25, tr0 */
+  0x44, 0x01, 0xff, 0xf0, /* blink tr0, r63 */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0x6f, 0xf0, 0xff, 0xf0, /* nop */
+  0xce, 0x00, 0x01, 0x10, /* movi  -GOT_BIAS, r17 */
+  0x00, 0xc9, 0x45, 0x10, /* add   r12, r17, r17 */
+  0x8d, 0x10, 0x09, 0x90, /* ld.q  r17, 16, r25 */
+  0x6b, 0xf1, 0x66, 0x00, /* ptabs r25, tr0 */
+  0x8d, 0x10, 0x05, 0x10, /* ld.q  r17, 8, r17 */
+  0xcc, 0x00, 0x01, 0x50, /* movi  reloc-offset >> 16, r21 */
+  0xc8, 0x00, 0x01, 0x50, /* shori reloc-offset & 65535, r21 */
+  0x44, 0x01, 0xff, 0xf0, /* blink tr0, r63 */
+};
+
+static const bfd_byte elf_sh64_pic_plt_entry_le[PLT_ENTRY_SIZE] =
+{
+  0x90, 0x01, 0x00, 0xcc, /* movi  nameN@GOT >> 16, r25 */
+  0x90, 0x01, 0x00, 0xc8, /* shori nameN@GOT & 65535, r25 */
+  0x90, 0x65, 0xc3, 0x40, /* ldx.q r12, r25, r25 */
+  0x00, 0x66, 0xf1, 0x6b, /* ptabs r25, tr0 */
+  0xf0, 0xff, 0x01, 0x44, /* blink tr0, r63 */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0xf0, 0xff, 0xf0, 0x6f, /* nop */
+  0x10, 0x01, 0x00, 0xce, /* movi  -GOT_BIAS, r17 */
+  0x10, 0x45, 0xc9, 0x00, /* add   r12, r17, r17 */
+  0x90, 0x09, 0x10, 0x8d, /* ld.q  r17, 16, r25 */
+  0x00, 0x66, 0xf1, 0x6b, /* ptabs r25, tr0 */
+  0x10, 0x05, 0x10, 0x8d, /* ld.q  r17, 8, r17 */
+  0x50, 0x01, 0x00, 0xcc, /* movi  reloc-offset >> 16, r21 */
+  0x50, 0x01, 0x00, 0xc8, /* shori reloc-offset & 65535, r21 */
+  0xf0, 0xff, 0x01, 0x44, /* blink tr0, r63 */
+};
+
+static const bfd_byte *elf_sh64_plt0_entry;
+static const bfd_byte *elf_sh64_plt_entry;
+static const bfd_byte *elf_sh64_pic_plt_entry;
+
+/* Create an entry in an sh ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+sh64_elf64_link_hash_newfunc (struct bfd_hash_entry *entry,
+			      struct bfd_hash_table *table,
+			      const char *string)
+{
+  struct elf_sh64_link_hash_entry *ret =
+    (struct elf_sh64_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == (struct elf_sh64_link_hash_entry *) NULL)
+    ret = ((struct elf_sh64_link_hash_entry *)
+	   bfd_hash_allocate (table,
+			      sizeof (struct elf_sh64_link_hash_entry)));
+  if (ret == (struct elf_sh64_link_hash_entry *) NULL)
+    return (struct bfd_hash_entry *) ret;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct elf_sh64_link_hash_entry *)
+	 _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
+				     table, string));
+  if (ret != (struct elf_sh64_link_hash_entry *) NULL)
+    {
+      ret->pcrel_relocs_copied = NULL;
+      ret->datalabel_got_offset = (bfd_vma) -1;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Create an sh64 ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+sh64_elf64_link_hash_table_create (bfd *abfd)
+{
+  struct elf_link_hash_table *ret;
+
+  ret = (struct elf_link_hash_table *) bfd_malloc (sizeof (* ret));
+  if (ret == (struct elf_link_hash_table *) NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (ret, abfd,
+				      sh64_elf64_link_hash_newfunc,
+				      sizeof (struct elf_sh64_link_hash_entry),
+				      GENERIC_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  return &ret->root;
+}
+
+inline static void
+movi_shori_putval (bfd *output_bfd, unsigned long value, bfd_byte *addr)
+{
+  bfd_put_32 (output_bfd,
+	      bfd_get_32 (output_bfd, addr)
+	      | ((value >> 6) & 0x3fffc00),
+	      addr);
+  bfd_put_32 (output_bfd,
+	      bfd_get_32 (output_bfd, addr + 4)
+	      | ((value << 10) & 0x3fffc00),
+	      addr + 4);
+}
+
+inline static void
+movi_3shori_putval (bfd *output_bfd, bfd_vma value, bfd_byte *addr)
+{
+  bfd_put_32 (output_bfd,
+	      bfd_get_32 (output_bfd, addr)
+	      | ((value >> 38) & 0x3fffc00),
+	      addr);
+  bfd_put_32 (output_bfd,
+	      bfd_get_32 (output_bfd, addr + 4)
+	      | ((value >> 22) & 0x3fffc00),
+	      addr + 4);
+  bfd_put_32 (output_bfd,
+	      bfd_get_32 (output_bfd, addr + 8)
+	      | ((value >> 6) & 0x3fffc00),
+	      addr + 8);
+  bfd_put_32 (output_bfd,
+	      bfd_get_32 (output_bfd, addr + 12)
+	      | ((value << 10) & 0x3fffc00),
+	      addr + 12);
+}
+
+/* Create dynamic sections when linking against a dynamic object.  */
+
+static bfd_boolean
+sh64_elf64_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  flagword flags, pltflags;
+  register asection *s;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  int ptralign = 0;
+
+  switch (bed->s->arch_size)
+    {
+    case 32:
+      ptralign = 2;
+      break;
+
+    case 64:
+      ptralign = 3;
+      break;
+
+    default:
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  /* We need to create .plt, .rel[a].plt, .got, .got.plt, .dynbss, and
+     .rel[a].bss sections.  */
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	   | SEC_LINKER_CREATED);
+
+  pltflags = flags;
+  pltflags |= SEC_CODE;
+  if (bed->plt_not_loaded)
+    pltflags &= ~ (SEC_LOAD | SEC_HAS_CONTENTS);
+  if (bed->plt_readonly)
+    pltflags |= SEC_READONLY;
+
+  s = bfd_make_section_with_flags (abfd, ".plt", pltflags);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, bed->plt_alignment))
+    return FALSE;
+
+  if (bed->want_plt_sym)
+    {
+      /* Define the symbol _PROCEDURE_LINKAGE_TABLE_ at the start of the
+	 .plt section.  */
+      struct elf_link_hash_entry *h;
+      struct bfd_link_hash_entry *bh = NULL;
+
+      if (! (_bfd_generic_link_add_one_symbol
+	     (info, abfd, "_PROCEDURE_LINKAGE_TABLE_", BSF_GLOBAL, s,
+	      (bfd_vma) 0, (const char *) NULL, FALSE, bed->collect, &bh)))
+	return FALSE;
+
+      h = (struct elf_link_hash_entry *) bh;
+      h->def_regular = 1;
+      h->type = STT_OBJECT;
+      elf_hash_table (info)->hplt = h;
+
+      if (info->shared
+	  && ! bfd_elf_link_record_dynamic_symbol (info, h))
+	return FALSE;
+    }
+
+  s = bfd_make_section_with_flags (abfd,
+				   bed->default_use_rela_p ? ".rela.plt" : ".rel.plt",
+				   flags | SEC_READONLY);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, ptralign))
+    return FALSE;
+
+  if (! _bfd_elf_create_got_section (abfd, info))
+    return FALSE;
+
+  {
+    const char *secname;
+    char *relname;
+    flagword secflags;
+    asection *sec;
+
+    for (sec = abfd->sections; sec; sec = sec->next)
+      {
+	secflags = bfd_get_section_flags (abfd, sec);
+	if ((secflags & (SEC_DATA | SEC_LINKER_CREATED))
+	    || ((secflags & SEC_HAS_CONTENTS) != SEC_HAS_CONTENTS))
+	  continue;
+	secname = bfd_get_section_name (abfd, sec);
+	relname = (char *) bfd_malloc (strlen (secname) + 6);
+	strcpy (relname, ".rela");
+	strcat (relname, secname);
+	s = bfd_make_section_with_flags (abfd, relname,
+					 flags | SEC_READONLY);
+	if (s == NULL
+	    || ! bfd_set_section_alignment (abfd, s, ptralign))
+	  return FALSE;
+      }
+  }
+
+  if (bed->want_dynbss)
+    {
+      /* The .dynbss section is a place to put symbols which are defined
+	 by dynamic objects, are referenced by regular objects, and are
+	 not functions.  We must allocate space for them in the process
+	 image and use a R_*_COPY reloc to tell the dynamic linker to
+	 initialize them at run time.  The linker script puts the .dynbss
+	 section into the .bss section of the final image.  */
+      s = bfd_make_section_with_flags (abfd, ".dynbss",
+				       SEC_ALLOC | SEC_LINKER_CREATED);
+      if (s == NULL)
+	return FALSE;
+
+      /* The .rel[a].bss section holds copy relocs.  This section is not
+	 normally needed.  We need to create it here, though, so that the
+	 linker will map it to an output section.  We can't just create it
+	 only if we need it, because we will not know whether we need it
+	 until we have seen all the input files, and the first time the
+	 main linker code calls BFD after examining all the input files
+	 (size_dynamic_sections) the input sections have already been
+	 mapped to the output sections.  If the section turns out not to
+	 be needed, we can discard it later.  We will never need this
+	 section when generating a shared object, since they do not use
+	 copy relocs.  */
+      if (! info->shared)
+	{
+	  s = bfd_make_section_with_flags (abfd,
+					   (bed->default_use_rela_p
+					    ? ".rela.bss" : ".rel.bss"),
+					   flags | SEC_READONLY);
+	  if (s == NULL
+	      || ! bfd_set_section_alignment (abfd, s, ptralign))
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+static bfd_boolean
+sh64_elf64_adjust_dynamic_symbol (struct bfd_link_info *info,
+				  struct elf_link_hash_entry *h)
+{
+  bfd *dynobj;
+  asection *s;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (dynobj != NULL
+	      && (h->needs_plt
+		  || h->u.weakdef != NULL
+		  || (h->def_dynamic
+		      && h->ref_regular
+		      && !h->def_regular)));
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later,
+     when we know the address of the .got section.  */
+  if (h->type == STT_FUNC
+      || h->needs_plt)
+    {
+      if (! info->shared
+	  && !h->def_dynamic
+	  && !h->ref_dynamic)
+	{
+	  /* This case can occur if we saw a PLT reloc in an input
+	     file, but the symbol was never referred to by a dynamic
+	     object.  In such a case, we don't actually need to build
+	     a procedure linkage table, and we can just do a REL64
+	     reloc instead.  */
+	  BFD_ASSERT (h->needs_plt);
+	  return TRUE;
+	}
+
+      /* Make sure this symbol is output as a dynamic symbol.  */
+      if (h->dynindx == -1)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      s = bfd_get_section_by_name (dynobj, ".plt");
+      BFD_ASSERT (s != NULL);
+
+      /* If this is the first .plt entry, make room for the special
+	 first entry.  */
+      if (s->size == 0)
+	s->size += PLT_ENTRY_SIZE;
+
+      /* If this symbol is not defined in a regular file, and we are
+	 not generating a shared library, then set the symbol to this
+	 location in the .plt.  This is required to make function
+	 pointers compare as equal between the normal executable and
+	 the shared library.  */
+      if (! info->shared
+	  && !h->def_regular)
+	{
+	  h->root.u.def.section = s;
+	  h->root.u.def.value = s->size;
+	}
+
+      h->plt.offset = s->size;
+
+      /* Make room for this entry.  */
+      s->size += elf_sh64_sizeof_plt (info);
+
+      /* We also need to make an entry in the .got.plt section, which
+	 will be placed in the .got section by the linker script.  */
+
+      s = bfd_get_section_by_name (dynobj, ".got.plt");
+      BFD_ASSERT (s != NULL);
+      s->size += 8;
+
+      /* We also need to make an entry in the .rela.plt section.  */
+
+      s = bfd_get_section_by_name (dynobj, ".rela.plt");
+      BFD_ASSERT (s != NULL);
+      s->size += sizeof (Elf64_External_Rela);
+
+      return TRUE;
+    }
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if (!h->non_got_ref)
+    return TRUE;
+
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  s = bfd_get_section_by_name (dynobj, ".dynbss");
+  BFD_ASSERT (s != NULL);
+
+  /* We must generate a R_SH_COPY reloc to tell the dynamic linker to
+     copy the initial value out of the dynamic object and into the
+     runtime process image.  We need to remember the offset into the
+     .rela.bss section we are going to use.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      asection *srel;
+
+      srel = bfd_get_section_by_name (dynobj, ".rela.bss");
+      BFD_ASSERT (srel != NULL);
+      srel->size += sizeof (Elf64_External_Rela);
+      h->needs_copy = 1;
+    }
+
+  return _bfd_elf_adjust_dynamic_copy (h, s);
+}
+
+/* This function is called via sh_elf_link_hash_traverse if we are
+   creating a shared object with -Bsymbolic.  It discards the space
+   allocated to copy PC relative relocs against symbols which are
+   defined in regular objects.  We allocated space for them in the
+   check_relocs routine, but we won't fill them in in the
+   relocate_section routine.  */
+
+static bfd_boolean
+sh64_elf64_discard_copies (struct elf_sh64_link_hash_entry *h,
+			   void *ignore ATTRIBUTE_UNUSED)
+{
+  struct elf_sh64_pcrel_relocs_copied *s;
+
+  /* We only discard relocs for symbols defined in a regular object.  */
+  if (!h->root.def_regular)
+    return TRUE;
+
+  for (s = h->pcrel_relocs_copied; s != NULL; s = s->next)
+    s->section->size -= s->count * sizeof (Elf64_External_Rela);
+
+  return TRUE;
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+sh64_elf64_size_dynamic_sections (bfd *output_bfd,
+				  struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *s;
+  bfd_boolean plt;
+  bfd_boolean relocs;
+  bfd_boolean reltext;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (s != NULL);
+	  s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+	}
+    }
+  else
+    {
+      /* We may have created entries in the .rela.got section.
+	 However, if we are not creating the dynamic sections, we will
+	 not actually use these entries.  Reset the size of .rela.got,
+	 which will cause it to get stripped from the output file
+	 below.  */
+      s = bfd_get_section_by_name (dynobj, ".rela.got");
+      if (s != NULL)
+	s->size = 0;
+    }
+
+  /* If this is a -Bsymbolic shared link, then we need to discard all
+     PC relative relocs against symbols defined in a regular object.
+     We allocated space for them in the check_relocs routine, but we
+     will not fill them in in the relocate_section routine.  */
+  if (info->shared && info->symbolic)
+    sh64_elf64_link_hash_traverse (elf_hash_table (info),
+				   sh64_elf64_discard_copies, NULL);
+
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  plt = FALSE;
+  relocs = FALSE;
+  reltext = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      const char *name;
+
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      /* It's OK to base decisions on the section name, because none
+	 of the dynobj section names depend upon the input files.  */
+      name = bfd_get_section_name (dynobj, s);
+
+      if (strcmp (name, ".plt") == 0)
+	{
+	  /* Remember whether there is a PLT.  */
+	  plt = s->size != 0;
+	}
+      else if (CONST_STRNEQ (name, ".rela"))
+	{
+	  if (s->size != 0)
+	    {
+	      asection *target;
+
+	      /* Remember whether there are any reloc sections other
+		 than .rela.plt.  */
+	      if (strcmp (name, ".rela.plt") != 0)
+		{
+		  const char *outname;
+
+		  relocs = TRUE;
+
+		  /* If this relocation section applies to a read only
+		     section, then we probably need a DT_TEXTREL
+		     entry.  The entries in the .rela.plt section
+		     really apply to the .got section, which we
+		     created ourselves and so know is not readonly.  */
+		  outname = bfd_get_section_name (output_bfd,
+						  s->output_section);
+		  target = bfd_get_section_by_name (output_bfd, outname + 5);
+		  if (target != NULL
+		      && (target->flags & SEC_READONLY) != 0
+		      && (target->flags & SEC_ALLOC) != 0)
+		    reltext = TRUE;
+		}
+
+	      /* We use the reloc_count field as a counter if we need
+		 to copy relocs into the output file.  */
+	      s->reloc_count = 0;
+	    }
+	}
+      else if (! CONST_STRNEQ (name, ".got")
+	       && strcmp (name, ".dynbss") != 0)
+	{
+	  /* It's not one of our sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (s->size == 0)
+	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is mostly to handle .rela.bss and
+	     .rela.plt.  We must create both sections in
+	     create_dynamic_sections, because they must be created
+	     before the linker maps input sections to output
+	     sections.  The linker does that before
+	     adjust_dynamic_symbol is called, and it is that
+	     function which decides whether anything needs to go
+	     into these sections.  */
+	  s->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents.  */
+      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in sh64_elf64_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+      if (info->executable)
+	{
+	  if (!_bfd_elf_add_dynamic_entry (info, DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (plt)
+	{
+	  if (!_bfd_elf_add_dynamic_entry (info, DT_PLTGOT, 0)
+	      || !_bfd_elf_add_dynamic_entry (info, DT_PLTRELSZ, 0)
+	      || !_bfd_elf_add_dynamic_entry (info, DT_PLTREL, DT_RELA)
+	      || !_bfd_elf_add_dynamic_entry (info, DT_JMPREL, 0))
+	    return FALSE;
+	}
+
+      if (relocs)
+	{
+	  if (!_bfd_elf_add_dynamic_entry (info, DT_RELA, 0)
+	      || !_bfd_elf_add_dynamic_entry (info, DT_RELASZ, 0)
+	      || !_bfd_elf_add_dynamic_entry (info, DT_RELAENT,
+					      sizeof (Elf64_External_Rela)))
+	    return FALSE;
+	}
+
+      if (reltext)
+	{
+	  if (!_bfd_elf_add_dynamic_entry (info, DT_TEXTREL, 0))
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+sh64_elf64_finish_dynamic_symbol (bfd *output_bfd,
+				  struct bfd_link_info *info,
+				  struct elf_link_hash_entry *h,
+				  Elf_Internal_Sym *sym)
+{
+  bfd *dynobj;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      asection *splt;
+      asection *sgot;
+      asection *srel;
+
+      bfd_vma plt_index;
+      bfd_vma got_offset;
+      Elf_Internal_Rela rel;
+      bfd_byte *loc;
+
+      /* This symbol has an entry in the procedure linkage table.  Set
+	 it up.  */
+
+      BFD_ASSERT (h->dynindx != -1);
+
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      sgot = bfd_get_section_by_name (dynobj, ".got.plt");
+      srel = bfd_get_section_by_name (dynobj, ".rela.plt");
+      BFD_ASSERT (splt != NULL && sgot != NULL && srel != NULL);
+
+      /* Get the index in the procedure linkage table which
+	 corresponds to this symbol.  This is the index of this symbol
+	 in all the symbols for which we are making plt entries.  The
+	 first entry in the procedure linkage table is reserved.  */
+      plt_index = h->plt.offset / elf_sh64_sizeof_plt (info) - 1;
+
+      /* Get the offset into the .got table of the entry that
+	 corresponds to this function.  Each .got entry is 8 bytes.
+	 The first three are reserved.  */
+      got_offset = (plt_index + 3) * 8;
+
+      if (info->shared)
+	got_offset -= GOT_BIAS;
+
+      /* Fill in the entry in the procedure linkage table.  */
+      if (! info->shared)
+	{
+	  if (elf_sh64_plt_entry == NULL)
+	    {
+	      elf_sh64_plt_entry = (bfd_big_endian (output_bfd) ?
+				  elf_sh64_plt_entry_be : elf_sh64_plt_entry_le);
+	    }
+	  memcpy (splt->contents + h->plt.offset, elf_sh64_plt_entry,
+		  elf_sh64_sizeof_plt (info));
+	  movi_3shori_putval (output_bfd,
+			      (sgot->output_section->vma
+			       + sgot->output_offset
+			       + got_offset),
+			      (splt->contents + h->plt.offset
+			       + elf_sh64_plt_symbol_offset (info)));
+
+	  /* Set bottom bit because its for a branch to SHmedia */
+	  movi_shori_putval (output_bfd,
+			     -(h->plt.offset
+			      + elf_sh64_plt_plt0_offset (info) + 8)
+			     | 1,
+			     (splt->contents + h->plt.offset
+			      + elf_sh64_plt_plt0_offset (info)));
+	}
+      else
+	{
+	  if (elf_sh64_pic_plt_entry == NULL)
+	    {
+	      elf_sh64_pic_plt_entry = (bfd_big_endian (output_bfd) ?
+				      elf_sh64_pic_plt_entry_be :
+				      elf_sh64_pic_plt_entry_le);
+	    }
+	  memcpy (splt->contents + h->plt.offset, elf_sh64_pic_plt_entry,
+		  elf_sh64_sizeof_plt (info));
+	  movi_shori_putval (output_bfd, got_offset,
+			     (splt->contents + h->plt.offset
+			      + elf_sh64_plt_symbol_offset (info)));
+	}
+
+      if (info->shared)
+	got_offset += GOT_BIAS;
+
+      movi_shori_putval (output_bfd,
+			 plt_index * sizeof (Elf64_External_Rela),
+			 (splt->contents + h->plt.offset
+			  + elf_sh64_plt_reloc_offset (info)));
+
+      /* Fill in the entry in the global offset table.  */
+      bfd_put_64 (output_bfd,
+		  (splt->output_section->vma
+		   + splt->output_offset
+		   + h->plt.offset
+		   + elf_sh64_plt_temp_offset (info)),
+		  sgot->contents + got_offset);
+
+      /* Fill in the entry in the .rela.plt section.  */
+      rel.r_offset = (sgot->output_section->vma
+		      + sgot->output_offset
+		      + got_offset);
+      rel.r_info = ELF64_R_INFO (h->dynindx, R_SH_JMP_SLOT64);
+      rel.r_addend = 0;
+      rel.r_addend = GOT_BIAS;
+      loc = srel->contents + plt_index * sizeof (Elf64_External_Rela);
+      bfd_elf64_swap_reloca_out (output_bfd, &rel, loc);
+
+      if (!h->def_regular)
+	{
+	  /* Mark the symbol as undefined, rather than as defined in
+	     the .plt section.  Leave the value alone.  */
+	  sym->st_shndx = SHN_UNDEF;
+	}
+    }
+
+  if (h->got.offset != (bfd_vma) -1)
+    {
+      asection *sgot;
+      asection *srel;
+      Elf_Internal_Rela rel;
+      bfd_byte *loc;
+
+      /* This symbol has an entry in the global offset table.  Set it
+	 up.  */
+
+      sgot = bfd_get_section_by_name (dynobj, ".got");
+      srel = bfd_get_section_by_name (dynobj, ".rela.got");
+      BFD_ASSERT (sgot != NULL && srel != NULL);
+
+      rel.r_offset = (sgot->output_section->vma
+		      + sgot->output_offset
+		      + (h->got.offset &~ 1));
+
+      /* If this is a -Bsymbolic link, and the symbol is defined
+	 locally, we just want to emit a RELATIVE reloc.  Likewise if
+	 the symbol was forced to be local because of a version file.
+	 The entry in the global offset table will already have been
+	 initialized in the relocate_section function.  */
+      if (info->shared
+	  && (info->symbolic || h->dynindx == -1)
+	  && h->def_regular)
+	{
+	  rel.r_info = ELF64_R_INFO (0, R_SH_RELATIVE64);
+	  rel.r_addend = (h->root.u.def.value
+			  + h->root.u.def.section->output_section->vma
+			  + h->root.u.def.section->output_offset);
+	}
+      else
+	{
+	  bfd_put_64 (output_bfd, (bfd_vma) 0, sgot->contents + h->got.offset);
+	  rel.r_info = ELF64_R_INFO (h->dynindx, R_SH_GLOB_DAT64);
+	  rel.r_addend = 0;
+	}
+
+      loc = srel->contents;
+      loc += srel->reloc_count++ * sizeof (Elf64_External_Rela);
+      bfd_elf64_swap_reloca_out (output_bfd, &rel, loc);
+    }
+
+  if (h->needs_copy)
+    {
+      asection *s;
+      Elf_Internal_Rela rel;
+      bfd_byte *loc;
+
+      /* This symbol needs a copy reloc.  Set it up.  */
+
+      BFD_ASSERT (h->dynindx != -1
+		  && (h->root.type == bfd_link_hash_defined
+		      || h->root.type == bfd_link_hash_defweak));
+
+      s = bfd_get_section_by_name (h->root.u.def.section->owner,
+				   ".rela.bss");
+      BFD_ASSERT (s != NULL);
+
+      rel.r_offset = (h->root.u.def.value
+		      + h->root.u.def.section->output_section->vma
+		      + h->root.u.def.section->output_offset);
+      rel.r_info = ELF64_R_INFO (h->dynindx, R_SH_COPY64);
+      rel.r_addend = 0;
+      loc = s->contents;
+      loc += s->reloc_count++ * sizeof (Elf64_External_Rela);
+      bfd_elf64_swap_reloca_out (output_bfd, &rel, loc);
+    }
+
+  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+      || h == elf_hash_table (info)->hgot)
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+sh64_elf64_finish_dynamic_sections (bfd *output_bfd,
+				    struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *sgot;
+  asection *sdyn;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  sgot = bfd_get_section_by_name (dynobj, ".got.plt");
+  BFD_ASSERT (sgot != NULL);
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      asection *splt;
+      Elf64_External_Dyn *dyncon, *dynconend;
+
+      BFD_ASSERT (sdyn != NULL);
+
+      dyncon = (Elf64_External_Dyn *) sdyn->contents;
+      dynconend = (Elf64_External_Dyn *) (sdyn->contents + sdyn->size);
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+	  const char *name;
+	  asection *s;
+	  struct elf_link_hash_entry *h;
+
+	  bfd_elf64_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    default:
+	      break;
+
+	    case DT_INIT:
+	      name = info->init_function;
+	      goto get_sym;
+
+	    case DT_FINI:
+	      name = info->fini_function;
+	    get_sym:
+	      if (dyn.d_un.d_val != 0)
+		{
+		  h = elf_link_hash_lookup (elf_hash_table (info), name,
+					    FALSE, FALSE, TRUE);
+		  if (h != NULL && (h->other & STO_SH5_ISA32))
+		    {
+		      dyn.d_un.d_val |= 1;
+		      bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
+		    }
+		}
+	      break;
+
+	    case DT_PLTGOT:
+	      name = ".got";
+	      goto get_vma;
+
+	    case DT_JMPREL:
+	      name = ".rela.plt";
+	    get_vma:
+	      s = bfd_get_section_by_name (output_bfd, name);
+	      BFD_ASSERT (s != NULL);
+	      dyn.d_un.d_ptr = s->vma;
+	      bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_PLTRELSZ:
+	      s = bfd_get_section_by_name (output_bfd, ".rela.plt");
+	      BFD_ASSERT (s != NULL);
+	      dyn.d_un.d_val = s->size;
+	      bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+
+	    case DT_RELASZ:
+	      /* My reading of the SVR4 ABI indicates that the
+		 procedure linkage table relocs (DT_JMPREL) should be
+		 included in the overall relocs (DT_RELA).  This is
+		 what Solaris does.  However, UnixWare can not handle
+		 that case.  Therefore, we override the DT_RELASZ entry
+		 here to make it not include the JMPREL relocs.  Since
+		 the linker script arranges for .rela.plt to follow all
+		 other relocation sections, we don't have to worry
+		 about changing the DT_RELA entry.  */
+	      s = bfd_get_section_by_name (output_bfd, ".rela.plt");
+	      if (s != NULL)
+		dyn.d_un.d_val -= s->size;
+	      bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
+	      break;
+	    }
+	}
+
+      /* Fill in the first entry in the procedure linkage table.  */
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      if (splt && splt->size > 0)
+	{
+	  if (info->shared)
+	    {
+	      if (elf_sh64_pic_plt_entry == NULL)
+		{
+		  elf_sh64_pic_plt_entry = (bfd_big_endian (output_bfd) ?
+					  elf_sh64_pic_plt_entry_be :
+					  elf_sh64_pic_plt_entry_le);
+		}
+	      memcpy (splt->contents, elf_sh64_pic_plt_entry,
+		      elf_sh64_sizeof_plt (info));
+	    }
+	  else
+	    {
+	      if (elf_sh64_plt0_entry == NULL)
+		{
+		  elf_sh64_plt0_entry = (bfd_big_endian (output_bfd) ?
+				       elf_sh64_plt0_entry_be :
+				       elf_sh64_plt0_entry_le);
+		}
+	      memcpy (splt->contents, elf_sh64_plt0_entry, PLT_ENTRY_SIZE);
+	      movi_3shori_putval (output_bfd,
+				  sgot->output_section->vma
+				  + sgot->output_offset,
+				  splt->contents
+				  + elf_sh64_plt0_gotplt_offset (info));
+	    }
+
+	  /* UnixWare sets the entsize of .plt to 8, although that doesn't
+	     really seem like the right value.  */
+	  elf_section_data (splt->output_section)->this_hdr.sh_entsize = 8;
+	}
+    }
+
+  /* Fill in the first three entries in the global offset table.  */
+  if (sgot->size > 0)
+    {
+      if (sdyn == NULL)
+	bfd_put_64 (output_bfd, (bfd_vma) 0, sgot->contents);
+      else
+	bfd_put_64 (output_bfd,
+		    sdyn->output_section->vma + sdyn->output_offset,
+		    sgot->contents);
+      bfd_put_64 (output_bfd, (bfd_vma) 0, sgot->contents + 8);
+      bfd_put_64 (output_bfd, (bfd_vma) 0, sgot->contents + 16);
+    }
+
+  elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 8;
+
+  return TRUE;
+}
+
+/* Merge non visibility st_other attribute when the symbol comes from
+   a dynamic object.  */
+static void
+sh64_elf64_merge_symbol_attribute (struct elf_link_hash_entry *h,
+				   const Elf_Internal_Sym *isym,
+				   bfd_boolean definition,
+				   bfd_boolean dynamic ATTRIBUTE_UNUSED)
+{
+  if ((isym->st_other & ~ELF_ST_VISIBILITY (-1)) != 0)
+    {
+      unsigned char other;
+
+      /* Take the balance of OTHER from the definition.  */
+      other = (definition ? isym->st_other : h->other);
+      other &= ~ ELF_ST_VISIBILITY (-1);
+      h->other = other | ELF_ST_VISIBILITY (h->other);
+    }
+
+  return;
+}
+
+static const struct bfd_elf_special_section sh64_elf64_special_sections[]=
+{
+  { STRING_COMMA_LEN (".cranges"), 0, SHT_PROGBITS, 0 },
+  { NULL,                       0, 0, 0,            0 }
+};
+
+#define TARGET_BIG_SYM		bfd_elf64_sh64_vec
+#define TARGET_BIG_NAME		"elf64-sh64"
+#define TARGET_LITTLE_SYM	bfd_elf64_sh64l_vec
+#define TARGET_LITTLE_NAME	"elf64-sh64l"
+#define ELF_ARCH		bfd_arch_sh
+#define ELF_MACHINE_CODE	EM_SH
+#define ELF_MAXPAGESIZE		128
+
+#define elf_symbol_leading_char '_'
+
+#define bfd_elf64_bfd_reloc_type_lookup	sh_elf64_reloc_type_lookup
+#define bfd_elf64_bfd_reloc_name_lookup \
+					sh_elf64_reloc_name_lookup
+#define elf_info_to_howto		sh_elf64_info_to_howto
+
+/* Note: there's no relaxation at present.  */
+
+#define elf_backend_relocate_section	sh_elf64_relocate_section
+#define bfd_elf64_bfd_get_relocated_section_contents \
+					sh_elf64_get_relocated_section_contents
+#define elf_backend_object_p		sh_elf64_set_mach_from_flags
+#define bfd_elf64_bfd_set_private_flags \
+					sh_elf64_set_private_flags
+#define bfd_elf64_bfd_copy_private_bfd_data \
+					sh_elf64_copy_private_data
+#define bfd_elf64_bfd_merge_private_bfd_data \
+					sh_elf64_merge_private_data
+#define elf_backend_fake_sections	sh64_elf64_fake_sections
+
+#define elf_backend_gc_mark_hook        sh_elf64_gc_mark_hook
+#define elf_backend_check_relocs        sh_elf64_check_relocs
+
+#define elf_backend_can_gc_sections	1
+
+#define elf_backend_get_symbol_type	sh64_elf64_get_symbol_type
+
+#define elf_backend_add_symbol_hook	sh64_elf64_add_symbol_hook
+
+#define elf_backend_link_output_symbol_hook \
+	sh64_elf64_link_output_symbol_hook
+
+#define	elf_backend_merge_symbol_attribute \
+	sh64_elf64_merge_symbol_attribute
+
+#define elf_backend_final_write_processing \
+ 	sh64_elf64_final_write_processing
+
+#define elf_backend_create_dynamic_sections \
+					sh64_elf64_create_dynamic_sections
+#define bfd_elf64_bfd_link_hash_table_create \
+					sh64_elf64_link_hash_table_create
+#define elf_backend_adjust_dynamic_symbol \
+					sh64_elf64_adjust_dynamic_symbol
+#define elf_backend_size_dynamic_sections \
+					sh64_elf64_size_dynamic_sections
+#define elf_backend_omit_section_dynsym \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true)
+#define elf_backend_finish_dynamic_symbol \
+					sh64_elf64_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections \
+					sh64_elf64_finish_dynamic_sections
+#define elf_backend_special_sections	sh64_elf64_special_sections
+
+#define elf_backend_want_got_plt	1
+#define elf_backend_plt_readonly	1
+#define elf_backend_want_plt_sym	0
+#define elf_backend_got_header_size	24
+
+#include "elf64-target.h"
+
+/* NetBSD support.  */
+#undef	TARGET_BIG_SYM
+#define	TARGET_BIG_SYM			bfd_elf64_sh64nbsd_vec
+#undef	TARGET_BIG_NAME
+#define	TARGET_BIG_NAME			"elf64-sh64-nbsd"
+#undef	TARGET_LITTLE_SYM
+#define	TARGET_LITTLE_SYM		bfd_elf64_sh64lnbsd_vec
+#undef	TARGET_LITTLE_NAME
+#define	TARGET_LITTLE_NAME		"elf64-sh64l-nbsd"
+#undef	ELF_MAXPAGESIZE
+#define	ELF_MAXPAGESIZE			0x10000
+#undef	elf_symbol_leading_char
+#define	elf_symbol_leading_char		0
+
+#define	elf64_bed			elf64_sh64_nbsd_bed
+
+#include "elf64-target.h"
+
+/* Linux support.  */
+#undef	TARGET_BIG_SYM
+#define	TARGET_BIG_SYM			bfd_elf64_sh64blin_vec
+#undef	TARGET_BIG_NAME
+#define	TARGET_BIG_NAME			"elf64-sh64big-linux"
+#undef	TARGET_LITTLE_SYM
+#define	TARGET_LITTLE_SYM		bfd_elf64_sh64lin_vec
+#undef	TARGET_LITTLE_NAME
+#define	TARGET_LITTLE_NAME		"elf64-sh64-linux"
+#undef elf64_bed
+#define	elf64_bed			elf64_sh64_linux_bed
+
+#include "elf64-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-sparc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-sparc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-sparc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-sparc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,959 @@
+/* SPARC-specific support for 64-bit ELF
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/sparc.h"
+#include "opcode/sparc.h"
+#include "elfxx-sparc.h"
+
+/* In case we're on a 32-bit machine, construct a 64-bit "-1" value.  */
+#define MINUS_ONE (~ (bfd_vma) 0)
+
+/* Due to the way how we handle R_SPARC_OLO10, each entry in a SHT_RELA
+   section can represent up to two relocs, we must tell the user to allocate
+   more space.  */
+
+static long
+elf64_sparc_get_reloc_upper_bound (bfd *abfd ATTRIBUTE_UNUSED, asection *sec)
+{
+  return (sec->reloc_count * 2 + 1) * sizeof (arelent *);
+}
+
+static long
+elf64_sparc_get_dynamic_reloc_upper_bound (bfd *abfd)
+{
+  return _bfd_elf_get_dynamic_reloc_upper_bound (abfd) * 2;
+}
+
+/* Read  relocations for ASECT from REL_HDR.  There are RELOC_COUNT of
+   them.  We cannot use generic elf routines for this,  because R_SPARC_OLO10
+   has secondary addend in ELF64_R_TYPE_DATA.  We handle it as two relocations
+   for the same location,  R_SPARC_LO10 and R_SPARC_13.  */
+
+static bfd_boolean
+elf64_sparc_slurp_one_reloc_table (bfd *abfd, asection *asect,
+				   Elf_Internal_Shdr *rel_hdr,
+				   asymbol **symbols, bfd_boolean dynamic)
+{
+  PTR allocated = NULL;
+  bfd_byte *native_relocs;
+  arelent *relent;
+  unsigned int i;
+  int entsize;
+  bfd_size_type count;
+  arelent *relents;
+
+  allocated = (PTR) bfd_malloc (rel_hdr->sh_size);
+  if (allocated == NULL)
+    goto error_return;
+
+  if (bfd_seek (abfd, rel_hdr->sh_offset, SEEK_SET) != 0
+      || bfd_bread (allocated, rel_hdr->sh_size, abfd) != rel_hdr->sh_size)
+    goto error_return;
+
+  native_relocs = (bfd_byte *) allocated;
+
+  relents = asect->relocation + canon_reloc_count (asect);
+
+  entsize = rel_hdr->sh_entsize;
+  BFD_ASSERT (entsize == sizeof (Elf64_External_Rela));
+
+  count = rel_hdr->sh_size / entsize;
+
+  for (i = 0, relent = relents; i < count;
+       i++, relent++, native_relocs += entsize)
+    {
+      Elf_Internal_Rela rela;
+      unsigned int r_type;
+
+      bfd_elf64_swap_reloca_in (abfd, native_relocs, &rela);
+
+      /* The address of an ELF reloc is section relative for an object
+	 file, and absolute for an executable file or shared library.
+	 The address of a normal BFD reloc is always section relative,
+	 and the address of a dynamic reloc is absolute..  */
+      if ((abfd->flags & (EXEC_P | DYNAMIC)) == 0 || dynamic)
+	relent->address = rela.r_offset;
+      else
+	relent->address = rela.r_offset - asect->vma;
+
+      if (ELF64_R_SYM (rela.r_info) == STN_UNDEF)
+	relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+      else
+	{
+	  asymbol **ps, *s;
+
+	  ps = symbols + ELF64_R_SYM (rela.r_info) - 1;
+	  s = *ps;
+
+	  /* Canonicalize ELF section symbols.  FIXME: Why?  */
+	  if ((s->flags & BSF_SECTION_SYM) == 0)
+	    relent->sym_ptr_ptr = ps;
+	  else
+	    relent->sym_ptr_ptr = s->section->symbol_ptr_ptr;
+	}
+
+      relent->addend = rela.r_addend;
+
+      r_type = ELF64_R_TYPE_ID (rela.r_info);
+      if (r_type == R_SPARC_OLO10)
+	{
+	  relent->howto = _bfd_sparc_elf_info_to_howto_ptr (R_SPARC_LO10);
+	  relent[1].address = relent->address;
+	  relent++;
+	  relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+	  relent->addend = ELF64_R_TYPE_DATA (rela.r_info);
+	  relent->howto = _bfd_sparc_elf_info_to_howto_ptr (R_SPARC_13);
+	}
+      else
+	relent->howto = _bfd_sparc_elf_info_to_howto_ptr (r_type);
+    }
+
+  canon_reloc_count (asect) += relent - relents;
+
+  if (allocated != NULL)
+    free (allocated);
+
+  return TRUE;
+
+ error_return:
+  if (allocated != NULL)
+    free (allocated);
+  return FALSE;
+}
+
+/* Read in and swap the external relocs.  */
+
+static bfd_boolean
+elf64_sparc_slurp_reloc_table (bfd *abfd, asection *asect,
+			       asymbol **symbols, bfd_boolean dynamic)
+{
+  struct bfd_elf_section_data * const d = elf_section_data (asect);
+  Elf_Internal_Shdr *rel_hdr;
+  Elf_Internal_Shdr *rel_hdr2;
+  bfd_size_type amt;
+
+  if (asect->relocation != NULL)
+    return TRUE;
+
+  if (! dynamic)
+    {
+      if ((asect->flags & SEC_RELOC) == 0
+	  || asect->reloc_count == 0)
+	return TRUE;
+
+      rel_hdr = d->rel.hdr;
+      rel_hdr2 = d->rela.hdr;
+
+      BFD_ASSERT ((rel_hdr && asect->rel_filepos == rel_hdr->sh_offset)
+		  || (rel_hdr2 && asect->rel_filepos == rel_hdr2->sh_offset));
+    }
+  else
+    {
+      /* Note that ASECT->RELOC_COUNT tends not to be accurate in this
+	 case because relocations against this section may use the
+	 dynamic symbol table, and in that case bfd_section_from_shdr
+	 in elf.c does not update the RELOC_COUNT.  */
+      if (asect->size == 0)
+	return TRUE;
+
+      rel_hdr = &d->this_hdr;
+      asect->reloc_count = NUM_SHDR_ENTRIES (rel_hdr);
+      rel_hdr2 = NULL;
+    }
+
+  amt = asect->reloc_count;
+  amt *= 2 * sizeof (arelent);
+  asect->relocation = (arelent *) bfd_alloc (abfd, amt);
+  if (asect->relocation == NULL)
+    return FALSE;
+
+  /* The elf64_sparc_slurp_one_reloc_table routine increments
+     canon_reloc_count.  */
+  canon_reloc_count (asect) = 0;
+
+  if (rel_hdr
+      && !elf64_sparc_slurp_one_reloc_table (abfd, asect, rel_hdr, symbols,
+					     dynamic))
+    return FALSE;
+
+  if (rel_hdr2
+      && !elf64_sparc_slurp_one_reloc_table (abfd, asect, rel_hdr2, symbols,
+					     dynamic))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Canonicalize the relocs.  */
+
+static long
+elf64_sparc_canonicalize_reloc (bfd *abfd, sec_ptr section,
+				arelent **relptr, asymbol **symbols)
+{
+  arelent *tblptr;
+  unsigned int i;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+
+  if (! bed->s->slurp_reloc_table (abfd, section, symbols, FALSE))
+    return -1;
+
+  tblptr = section->relocation;
+  for (i = 0; i < canon_reloc_count (section); i++)
+    *relptr++ = tblptr++;
+
+  *relptr = NULL;
+
+  return canon_reloc_count (section);
+}
+
+
+/* Canonicalize the dynamic relocation entries.  Note that we return
+   the dynamic relocations as a single block, although they are
+   actually associated with particular sections; the interface, which
+   was designed for SunOS style shared libraries, expects that there
+   is only one set of dynamic relocs.  Any section that was actually
+   installed in the BFD, and has type SHT_REL or SHT_RELA, and uses
+   the dynamic symbol table, is considered to be a dynamic reloc
+   section.  */
+
+static long
+elf64_sparc_canonicalize_dynamic_reloc (bfd *abfd, arelent **storage,
+					asymbol **syms)
+{
+  asection *s;
+  long ret;
+
+  if (elf_dynsymtab (abfd) == 0)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return -1;
+    }
+
+  ret = 0;
+  for (s = abfd->sections; s != NULL; s = s->next)
+    {
+      if (elf_section_data (s)->this_hdr.sh_link == elf_dynsymtab (abfd)
+	  && (elf_section_data (s)->this_hdr.sh_type == SHT_RELA))
+	{
+	  arelent *p;
+	  long count, i;
+
+	  if (! elf64_sparc_slurp_reloc_table (abfd, s, syms, TRUE))
+	    return -1;
+	  count = canon_reloc_count (s);
+	  p = s->relocation;
+	  for (i = 0; i < count; i++)
+	    *storage++ = p++;
+	  ret += count;
+	}
+    }
+
+  *storage = NULL;
+
+  return ret;
+}
+
+/* Write out the relocs.  */
+
+static void
+elf64_sparc_write_relocs (bfd *abfd, asection *sec, PTR data)
+{
+  bfd_boolean *failedp = (bfd_boolean *) data;
+  Elf_Internal_Shdr *rela_hdr;
+  bfd_vma addr_offset;
+  Elf64_External_Rela *outbound_relocas, *src_rela;
+  unsigned int idx, count;
+  asymbol *last_sym = 0;
+  int last_sym_idx = 0;
+
+  /* If we have already failed, don't do anything.  */
+  if (*failedp)
+    return;
+
+  if ((sec->flags & SEC_RELOC) == 0)
+    return;
+
+  /* The linker backend writes the relocs out itself, and sets the
+     reloc_count field to zero to inhibit writing them here.  Also,
+     sometimes the SEC_RELOC flag gets set even when there aren't any
+     relocs.  */
+  if (sec->reloc_count == 0)
+    return;
+
+  /* We can combine two relocs that refer to the same address
+     into R_SPARC_OLO10 if first one is R_SPARC_LO10 and the
+     latter is R_SPARC_13 with no associated symbol.  */
+  count = 0;
+  for (idx = 0; idx < sec->reloc_count; idx++)
+    {
+      bfd_vma addr;
+
+      ++count;
+
+      addr = sec->orelocation[idx]->address;
+      if (sec->orelocation[idx]->howto->type == R_SPARC_LO10
+	  && idx < sec->reloc_count - 1)
+	{
+	  arelent *r = sec->orelocation[idx + 1];
+
+	  if (r->howto->type == R_SPARC_13
+	      && r->address == addr
+	      && bfd_is_abs_section ((*r->sym_ptr_ptr)->section)
+	      && (*r->sym_ptr_ptr)->value == 0)
+	    ++idx;
+	}
+    }
+
+  rela_hdr = elf_section_data (sec)->rela.hdr;
+
+  rela_hdr->sh_size = rela_hdr->sh_entsize * count;
+  rela_hdr->contents = (PTR) bfd_alloc (abfd, rela_hdr->sh_size);
+  if (rela_hdr->contents == NULL)
+    {
+      *failedp = TRUE;
+      return;
+    }
+
+  /* Figure out whether the relocations are RELA or REL relocations.  */
+  if (rela_hdr->sh_type != SHT_RELA)
+    abort ();
+
+  /* The address of an ELF reloc is section relative for an object
+     file, and absolute for an executable file or shared library.
+     The address of a BFD reloc is always section relative.  */
+  addr_offset = 0;
+  if ((abfd->flags & (EXEC_P | DYNAMIC)) != 0)
+    addr_offset = sec->vma;
+
+  /* orelocation has the data, reloc_count has the count...  */
+  outbound_relocas = (Elf64_External_Rela *) rela_hdr->contents;
+  src_rela = outbound_relocas;
+
+  for (idx = 0; idx < sec->reloc_count; idx++)
+    {
+      Elf_Internal_Rela dst_rela;
+      arelent *ptr;
+      asymbol *sym;
+      int n;
+
+      ptr = sec->orelocation[idx];
+      sym = *ptr->sym_ptr_ptr;
+      if (sym == last_sym)
+	n = last_sym_idx;
+      else if (bfd_is_abs_section (sym->section) && sym->value == 0)
+	n = STN_UNDEF;
+      else
+	{
+	  last_sym = sym;
+	  n = _bfd_elf_symbol_from_bfd_symbol (abfd, &sym);
+	  if (n < 0)
+	    {
+	      *failedp = TRUE;
+	      return;
+	    }
+	  last_sym_idx = n;
+	}
+
+      if ((*ptr->sym_ptr_ptr)->the_bfd != NULL
+	  && (*ptr->sym_ptr_ptr)->the_bfd->xvec != abfd->xvec
+	  && ! _bfd_elf_validate_reloc (abfd, ptr))
+	{
+	  *failedp = TRUE;
+	  return;
+	}
+
+      if (ptr->howto->type == R_SPARC_LO10
+	  && idx < sec->reloc_count - 1)
+	{
+	  arelent *r = sec->orelocation[idx + 1];
+
+	  if (r->howto->type == R_SPARC_13
+	      && r->address == ptr->address
+	      && bfd_is_abs_section ((*r->sym_ptr_ptr)->section)
+	      && (*r->sym_ptr_ptr)->value == 0)
+	    {
+	      idx++;
+	      dst_rela.r_info
+		= ELF64_R_INFO (n, ELF64_R_TYPE_INFO (r->addend,
+						      R_SPARC_OLO10));
+	    }
+	  else
+	    dst_rela.r_info = ELF64_R_INFO (n, R_SPARC_LO10);
+	}
+      else
+	dst_rela.r_info = ELF64_R_INFO (n, ptr->howto->type);
+
+      dst_rela.r_offset = ptr->address + addr_offset;
+      dst_rela.r_addend = ptr->addend;
+
+      bfd_elf64_swap_reloca_out (abfd, &dst_rela, (bfd_byte *) src_rela);
+      ++src_rela;
+    }
+}
+
+/* Hook called by the linker routine which adds symbols from an object
+   file.  We use it for STT_REGISTER symbols.  */
+
+static bfd_boolean
+elf64_sparc_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
+			     Elf_Internal_Sym *sym, const char **namep,
+			     flagword *flagsp ATTRIBUTE_UNUSED,
+			     asection **secp ATTRIBUTE_UNUSED,
+			     bfd_vma *valp ATTRIBUTE_UNUSED)
+{
+  static const char *const stt_types[] = { "NOTYPE", "OBJECT", "FUNCTION" };
+
+  if ((abfd->flags & DYNAMIC) == 0
+      && (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC
+	  || ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE))
+    elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE;
+
+  if (ELF_ST_TYPE (sym->st_info) == STT_REGISTER)
+    {
+      int reg;
+      struct _bfd_sparc_elf_app_reg *p;
+
+      reg = (int)sym->st_value;
+      switch (reg & ~1)
+	{
+	case 2: reg -= 2; break;
+	case 6: reg -= 4; break;
+	default:
+          (*_bfd_error_handler)
+            (_("%B: Only registers %%g[2367] can be declared using STT_REGISTER"),
+             abfd);
+	  return FALSE;
+	}
+
+      if (info->output_bfd->xvec != abfd->xvec
+	  || (abfd->flags & DYNAMIC) != 0)
+        {
+	  /* STT_REGISTER only works when linking an elf64_sparc object.
+	     If STT_REGISTER comes from a dynamic object, don't put it into
+	     the output bfd.  The dynamic linker will recheck it.  */
+	  *namep = NULL;
+	  return TRUE;
+        }
+
+      p = _bfd_sparc_elf_hash_table(info)->app_regs + reg;
+
+      if (p->name != NULL && strcmp (p->name, *namep))
+	{
+          (*_bfd_error_handler)
+            (_("Register %%g%d used incompatibly: %s in %B, previously %s in %B"),
+             abfd, p->abfd, (int) sym->st_value,
+             **namep ? *namep : "#scratch",
+             *p->name ? p->name : "#scratch");
+	  return FALSE;
+	}
+
+      if (p->name == NULL)
+	{
+	  if (**namep)
+	    {
+	      struct elf_link_hash_entry *h;
+
+	      h = (struct elf_link_hash_entry *)
+		bfd_link_hash_lookup (info->hash, *namep, FALSE, FALSE, FALSE);
+
+	      if (h != NULL)
+		{
+		  unsigned char type = h->type;
+
+		  if (type > STT_FUNC)
+		    type = 0;
+		  (*_bfd_error_handler)
+		    (_("Symbol `%s' has differing types: REGISTER in %B, previously %s in %B"),
+		     abfd, p->abfd, *namep, stt_types[type]);
+		  return FALSE;
+		}
+
+	      p->name = bfd_hash_allocate (&info->hash->table,
+					   strlen (*namep) + 1);
+	      if (!p->name)
+		return FALSE;
+
+	      strcpy (p->name, *namep);
+	    }
+	  else
+	    p->name = "";
+	  p->bind = ELF_ST_BIND (sym->st_info);
+	  p->abfd = abfd;
+	  p->shndx = sym->st_shndx;
+	}
+      else
+	{
+	  if (p->bind == STB_WEAK
+	      && ELF_ST_BIND (sym->st_info) == STB_GLOBAL)
+	    {
+	      p->bind = STB_GLOBAL;
+	      p->abfd = abfd;
+	    }
+	}
+      *namep = NULL;
+      return TRUE;
+    }
+  else if (*namep && **namep
+	   && info->output_bfd->xvec == abfd->xvec)
+    {
+      int i;
+      struct _bfd_sparc_elf_app_reg *p;
+
+      p = _bfd_sparc_elf_hash_table(info)->app_regs;
+      for (i = 0; i < 4; i++, p++)
+	if (p->name != NULL && ! strcmp (p->name, *namep))
+	  {
+	    unsigned char type = ELF_ST_TYPE (sym->st_info);
+
+	    if (type > STT_FUNC)
+	      type = 0;
+	    (*_bfd_error_handler)
+	      (_("Symbol `%s' has differing types: %s in %B, previously REGISTER in %B"),
+	       abfd, p->abfd, *namep, stt_types[type]);
+	    return FALSE;
+	  }
+    }
+  return TRUE;
+}
+
+/* This function takes care of emitting STT_REGISTER symbols
+   which we cannot easily keep in the symbol hash table.  */
+
+static bfd_boolean
+elf64_sparc_output_arch_syms (bfd *output_bfd ATTRIBUTE_UNUSED,
+			      struct bfd_link_info *info,
+			      PTR finfo,
+			      int (*func) (PTR, const char *,
+					   Elf_Internal_Sym *,
+					   asection *,
+					   struct elf_link_hash_entry *))
+{
+  int reg;
+  struct _bfd_sparc_elf_app_reg *app_regs =
+    _bfd_sparc_elf_hash_table(info)->app_regs;
+  Elf_Internal_Sym sym;
+
+  /* We arranged in size_dynamic_sections to put the STT_REGISTER entries
+     at the end of the dynlocal list, so they came at the end of the local
+     symbols in the symtab.  Except that they aren't STB_LOCAL, so we need
+     to back up symtab->sh_info.  */
+  if (elf_hash_table (info)->dynlocal)
+    {
+      bfd * dynobj = elf_hash_table (info)->dynobj;
+      asection *dynsymsec = bfd_get_section_by_name (dynobj, ".dynsym");
+      struct elf_link_local_dynamic_entry *e;
+
+      for (e = elf_hash_table (info)->dynlocal; e ; e = e->next)
+	if (e->input_indx == -1)
+	  break;
+      if (e)
+	{
+	  elf_section_data (dynsymsec->output_section)->this_hdr.sh_info
+	    = e->dynindx;
+	}
+    }
+
+  if (info->strip == strip_all)
+    return TRUE;
+
+  for (reg = 0; reg < 4; reg++)
+    if (app_regs [reg].name != NULL)
+      {
+	if (info->strip == strip_some
+	    && bfd_hash_lookup (info->keep_hash,
+				app_regs [reg].name,
+				FALSE, FALSE) == NULL)
+	  continue;
+
+	sym.st_value = reg < 2 ? reg + 2 : reg + 4;
+	sym.st_size = 0;
+	sym.st_other = 0;
+	sym.st_info = ELF_ST_INFO (app_regs [reg].bind, STT_REGISTER);
+	sym.st_shndx = app_regs [reg].shndx;
+	sym.st_target_internal = 0;
+	if ((*func) (finfo, app_regs [reg].name, &sym,
+		     sym.st_shndx == SHN_ABS
+		     ? bfd_abs_section_ptr : bfd_und_section_ptr,
+		     NULL) != 1)
+	  return FALSE;
+      }
+
+  return TRUE;
+}
+
+static int
+elf64_sparc_get_symbol_type (Elf_Internal_Sym *elf_sym, int type)
+{
+  if (ELF_ST_TYPE (elf_sym->st_info) == STT_REGISTER)
+    return STT_REGISTER;
+  else
+    return type;
+}
+
+/* A STB_GLOBAL,STT_REGISTER symbol should be BSF_GLOBAL
+   even in SHN_UNDEF section.  */
+
+static void
+elf64_sparc_symbol_processing (bfd *abfd ATTRIBUTE_UNUSED, asymbol *asym)
+{
+  elf_symbol_type *elfsym;
+
+  elfsym = (elf_symbol_type *) asym;
+  if (elfsym->internal_elf_sym.st_info
+      == ELF_ST_INFO (STB_GLOBAL, STT_REGISTER))
+    {
+      asym->flags |= BSF_GLOBAL;
+    }
+}
+
+
+/* Functions for dealing with the e_flags field.  */
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+
+static bfd_boolean
+elf64_sparc_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  bfd_boolean error;
+  flagword new_flags, old_flags;
+  int new_mm, old_mm;
+
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return TRUE;
+
+  new_flags = elf_elfheader (ibfd)->e_flags;
+  old_flags = elf_elfheader (obfd)->e_flags;
+
+  if (!elf_flags_init (obfd))   /* First call, no flags set */
+    {
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = new_flags;
+    }
+
+  else if (new_flags == old_flags)      /* Compatible flags are ok */
+    ;
+
+  else                                  /* Incompatible flags */
+    {
+      error = FALSE;
+
+#define EF_SPARC_ISA_EXTENSIONS \
+  (EF_SPARC_SUN_US1 | EF_SPARC_SUN_US3 | EF_SPARC_HAL_R1)
+
+      if ((ibfd->flags & DYNAMIC) != 0)
+	{
+	  /* We don't want dynamic objects memory ordering and
+	     architecture to have any role. That's what dynamic linker
+	     should do.  */
+	  new_flags &= ~(EF_SPARCV9_MM | EF_SPARC_ISA_EXTENSIONS);
+	  new_flags |= (old_flags
+			& (EF_SPARCV9_MM | EF_SPARC_ISA_EXTENSIONS));
+	}
+      else
+	{
+	  /* Choose the highest architecture requirements.  */
+	  old_flags |= (new_flags & EF_SPARC_ISA_EXTENSIONS);
+	  new_flags |= (old_flags & EF_SPARC_ISA_EXTENSIONS);
+	  if ((old_flags & (EF_SPARC_SUN_US1 | EF_SPARC_SUN_US3))
+	      && (old_flags & EF_SPARC_HAL_R1))
+	    {
+	      error = TRUE;
+	      (*_bfd_error_handler)
+		(_("%B: linking UltraSPARC specific with HAL specific code"),
+		 ibfd);
+	    }
+	  /* Choose the most restrictive memory ordering.  */
+	  old_mm = (old_flags & EF_SPARCV9_MM);
+	  new_mm = (new_flags & EF_SPARCV9_MM);
+	  old_flags &= ~EF_SPARCV9_MM;
+	  new_flags &= ~EF_SPARCV9_MM;
+	  if (new_mm < old_mm)
+	    old_mm = new_mm;
+	  old_flags |= old_mm;
+	  new_flags |= old_mm;
+	}
+
+      /* Warn about any other mismatches */
+      if (new_flags != old_flags)
+        {
+          error = TRUE;
+          (*_bfd_error_handler)
+            (_("%B: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"),
+             ibfd, (long) new_flags, (long) old_flags);
+        }
+
+      elf_elfheader (obfd)->e_flags = old_flags;
+
+      if (error)
+        {
+          bfd_set_error (bfd_error_bad_value);
+          return FALSE;
+        }
+    }
+  return _bfd_sparc_elf_merge_private_bfd_data (ibfd, obfd);
+}
+
+/* MARCO: Set the correct entry size for the .stab section.  */
+
+static bfd_boolean
+elf64_sparc_fake_sections (bfd *abfd ATTRIBUTE_UNUSED,
+			   Elf_Internal_Shdr *hdr ATTRIBUTE_UNUSED,
+			   asection *sec)
+{
+  const char *name;
+
+  name = bfd_get_section_name (abfd, sec);
+
+  if (strcmp (name, ".stab") == 0)
+    {
+      /* Even in the 64bit case the stab entries are only 12 bytes long.  */
+      elf_section_data (sec)->this_hdr.sh_entsize = 12;
+    }
+
+  return TRUE;
+}
+
+/* Print a STT_REGISTER symbol to file FILE.  */
+
+static const char *
+elf64_sparc_print_symbol_all (bfd *abfd ATTRIBUTE_UNUSED, PTR filep,
+			      asymbol *symbol)
+{
+  FILE *file = (FILE *) filep;
+  int reg, type;
+
+  if (ELF_ST_TYPE (((elf_symbol_type *) symbol)->internal_elf_sym.st_info)
+      != STT_REGISTER)
+    return NULL;
+
+  reg = ((elf_symbol_type *) symbol)->internal_elf_sym.st_value;
+  type = symbol->flags;
+  fprintf (file, "REG_%c%c%11s%c%c    R", "GOLI" [reg / 8], '0' + (reg & 7), "",
+		 ((type & BSF_LOCAL)
+		  ? (type & BSF_GLOBAL) ? '!' : 'l'
+	          : (type & BSF_GLOBAL) ? 'g' : ' '),
+	         (type & BSF_WEAK) ? 'w' : ' ');
+  if (symbol->name == NULL || symbol->name [0] == '\0')
+    return "#scratch";
+  else
+    return symbol->name;
+}
+
+static enum elf_reloc_type_class
+elf64_sparc_reloc_type_class (const Elf_Internal_Rela *rela)
+{
+  switch ((int) ELF64_R_TYPE (rela->r_info))
+    {
+    case R_SPARC_RELATIVE:
+      return reloc_class_relative;
+    case R_SPARC_JMP_SLOT:
+      return reloc_class_plt;
+    case R_SPARC_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+/* Relocations in the 64 bit SPARC ELF ABI are more complex than in
+   standard ELF, because R_SPARC_OLO10 has secondary addend in
+   ELF64_R_TYPE_DATA field.  This structure is used to redirect the
+   relocation handling routines.  */
+
+const struct elf_size_info elf64_sparc_size_info =
+{
+  sizeof (Elf64_External_Ehdr),
+  sizeof (Elf64_External_Phdr),
+  sizeof (Elf64_External_Shdr),
+  sizeof (Elf64_External_Rel),
+  sizeof (Elf64_External_Rela),
+  sizeof (Elf64_External_Sym),
+  sizeof (Elf64_External_Dyn),
+  sizeof (Elf_External_Note),
+  4,		/* hash-table entry size.  */
+  /* Internal relocations per external relocations.
+     For link purposes we use just 1 internal per
+     1 external, for assembly and slurp symbol table
+     we use 2.  */
+  1,
+  64,		/* arch_size.  */
+  3,		/* log_file_align.  */
+  ELFCLASS64,
+  EV_CURRENT,
+  bfd_elf64_write_out_phdrs,
+  bfd_elf64_write_shdrs_and_ehdr,
+  bfd_elf64_checksum_contents,
+  elf64_sparc_write_relocs,
+  bfd_elf64_swap_symbol_in,
+  bfd_elf64_swap_symbol_out,
+  elf64_sparc_slurp_reloc_table,
+  bfd_elf64_slurp_symbol_table,
+  bfd_elf64_swap_dyn_in,
+  bfd_elf64_swap_dyn_out,
+  bfd_elf64_swap_reloc_in,
+  bfd_elf64_swap_reloc_out,
+  bfd_elf64_swap_reloca_in,
+  bfd_elf64_swap_reloca_out
+};
+
+#define TARGET_BIG_SYM	bfd_elf64_sparc_vec
+#define TARGET_BIG_NAME	"elf64-sparc"
+#define ELF_ARCH	bfd_arch_sparc
+#define ELF_MAXPAGESIZE 0x100000
+#define ELF_COMMONPAGESIZE 0x2000
+
+/* This is the official ABI value.  */
+#define ELF_MACHINE_CODE EM_SPARCV9
+
+/* This is the value that we used before the ABI was released.  */
+#define ELF_MACHINE_ALT1 EM_OLD_SPARCV9
+
+#define elf_backend_reloc_type_class \
+  elf64_sparc_reloc_type_class
+#define bfd_elf64_get_reloc_upper_bound \
+  elf64_sparc_get_reloc_upper_bound
+#define bfd_elf64_get_dynamic_reloc_upper_bound \
+  elf64_sparc_get_dynamic_reloc_upper_bound
+#define bfd_elf64_canonicalize_reloc \
+  elf64_sparc_canonicalize_reloc
+#define bfd_elf64_canonicalize_dynamic_reloc \
+  elf64_sparc_canonicalize_dynamic_reloc
+#define elf_backend_add_symbol_hook \
+  elf64_sparc_add_symbol_hook
+#define elf_backend_get_symbol_type \
+  elf64_sparc_get_symbol_type
+#define elf_backend_symbol_processing \
+  elf64_sparc_symbol_processing
+#define elf_backend_print_symbol_all \
+  elf64_sparc_print_symbol_all
+#define elf_backend_output_arch_syms \
+  elf64_sparc_output_arch_syms
+#define bfd_elf64_bfd_merge_private_bfd_data \
+  elf64_sparc_merge_private_bfd_data
+#define elf_backend_fake_sections \
+  elf64_sparc_fake_sections
+#define elf_backend_size_info \
+  elf64_sparc_size_info
+
+#define elf_backend_plt_sym_val	\
+  _bfd_sparc_elf_plt_sym_val
+#define bfd_elf64_bfd_link_hash_table_create \
+  _bfd_sparc_elf_link_hash_table_create
+#define bfd_elf64_bfd_link_hash_table_free \
+  _bfd_sparc_elf_link_hash_table_free
+#define elf_info_to_howto \
+  _bfd_sparc_elf_info_to_howto
+#define elf_backend_copy_indirect_symbol \
+  _bfd_sparc_elf_copy_indirect_symbol
+#define bfd_elf64_bfd_reloc_type_lookup \
+  _bfd_sparc_elf_reloc_type_lookup
+#define bfd_elf64_bfd_reloc_name_lookup \
+  _bfd_sparc_elf_reloc_name_lookup
+#define bfd_elf64_bfd_relax_section \
+  _bfd_sparc_elf_relax_section
+#define bfd_elf64_new_section_hook \
+  _bfd_sparc_elf_new_section_hook
+
+#define elf_backend_create_dynamic_sections \
+  _bfd_sparc_elf_create_dynamic_sections
+#define elf_backend_relocs_compatible \
+  _bfd_elf_relocs_compatible
+#define elf_backend_check_relocs \
+  _bfd_sparc_elf_check_relocs
+#define elf_backend_adjust_dynamic_symbol \
+  _bfd_sparc_elf_adjust_dynamic_symbol
+#define elf_backend_omit_section_dynsym \
+  _bfd_sparc_elf_omit_section_dynsym
+#define elf_backend_size_dynamic_sections \
+  _bfd_sparc_elf_size_dynamic_sections
+#define elf_backend_relocate_section \
+  _bfd_sparc_elf_relocate_section
+#define elf_backend_finish_dynamic_symbol \
+  _bfd_sparc_elf_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections \
+  _bfd_sparc_elf_finish_dynamic_sections
+
+#define bfd_elf64_mkobject \
+  _bfd_sparc_elf_mkobject
+#define elf_backend_object_p \
+  _bfd_sparc_elf_object_p
+#define elf_backend_gc_mark_hook \
+  _bfd_sparc_elf_gc_mark_hook
+#define elf_backend_gc_sweep_hook \
+  _bfd_sparc_elf_gc_sweep_hook
+#define elf_backend_init_index_section \
+  _bfd_elf_init_1_index_section
+
+#define elf_backend_can_gc_sections 1
+#define elf_backend_can_refcount 1
+#define elf_backend_want_got_plt 0
+#define elf_backend_plt_readonly 0
+#define elf_backend_want_plt_sym 1
+#define elf_backend_got_header_size 8
+#define elf_backend_rela_normal 1
+
+/* Section 5.2.4 of the ABI specifies a 256-byte boundary for the table.  */
+#define elf_backend_plt_alignment 8
+
+#define elf_backend_post_process_headers	_bfd_elf_set_osabi
+
+#include "elf64-target.h"
+
+/* FreeBSD support */
+#undef  TARGET_BIG_SYM
+#define TARGET_BIG_SYM bfd_elf64_sparc_freebsd_vec
+#undef  TARGET_BIG_NAME
+#define TARGET_BIG_NAME "elf64-sparc-freebsd"
+#undef	ELF_OSABI
+#define	ELF_OSABI ELFOSABI_FREEBSD
+
+#undef  elf64_bed
+#define elf64_bed				elf64_sparc_fbsd_bed
+
+#include "elf64-target.h"
+
+/* Solaris 2.  */
+
+#undef	TARGET_BIG_SYM
+#define	TARGET_BIG_SYM				bfd_elf64_sparc_sol2_vec
+#undef	TARGET_BIG_NAME
+#define	TARGET_BIG_NAME				"elf64-sparc-sol2"
+
+/* Restore default: we cannot use ELFOSABI_SOLARIS, otherwise ELFOSABI_NONE
+   objects won't be recognized.  */
+#undef	ELF_OSABI
+
+#undef elf64_bed
+#define elf64_bed				elf64_sparc_sol2_bed
+
+/* The 64-bit static TLS arena size is rounded to the nearest 16-byte
+   boundary.  */
+#undef elf_backend_static_tls_alignment
+#define elf_backend_static_tls_alignment	16
+
+#include "elf64-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-tilegx.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-tilegx.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-tilegx.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-tilegx.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,132 @@
+/* TILE-Gx-specific support for 64-bit ELF.
+   Copyright 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elfxx-tilegx.h"
+#include "elf64-tilegx.h"
+
+
+/* Support for core dump NOTE sections.  */
+
+static bfd_boolean
+tilegx_elf_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  int offset;
+  size_t size;
+
+  if (note->descsz != TILEGX_PRSTATUS_SIZEOF)
+    return FALSE;
+
+  /* pr_cursig */
+  elf_tdata (abfd)->core_signal =
+    bfd_get_16 (abfd, note->descdata + TILEGX_PRSTATUS_OFFSET_PR_CURSIG);
+
+  /* pr_pid */
+  elf_tdata (abfd)->core_pid =
+    bfd_get_32 (abfd, note->descdata + TILEGX_PRSTATUS_OFFSET_PR_PID);
+
+  /* pr_reg */
+  offset = TILEGX_PRSTATUS_OFFSET_PR_REG;
+  size   = TILEGX_GREGSET_T_SIZE;
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg",
+					  size, note->descpos + offset);
+}
+
+static bfd_boolean
+tilegx_elf_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  if (note->descsz != TILEGX_PRPSINFO_SIZEOF)
+    return FALSE;
+
+  elf_tdata (abfd)->core_program
+    = _bfd_elfcore_strndup (abfd, note->descdata + TILEGX_PRPSINFO_OFFSET_PR_FNAME, 16);
+  elf_tdata (abfd)->core_command
+    = _bfd_elfcore_strndup (abfd, note->descdata + TILEGX_PRPSINFO_OFFSET_PR_PSARGS, ELF_PR_PSARGS_SIZE);
+
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+  {
+    char *command = elf_tdata (abfd)->core_command;
+    int n = strlen (command);
+
+    if (0 < n && command[n - 1] == ' ')
+      command[n - 1] = '\0';
+  }
+
+  return TRUE;
+}
+
+
+#define ELF_ARCH		bfd_arch_tilegx
+#define ELF_TARGET_ID		TILEGX_ELF_DATA
+#define ELF_MACHINE_CODE	EM_TILEGX
+#define ELF_MAXPAGESIZE		0x10000
+#define ELF_COMMONPAGESIZE	0x10000
+
+#define TARGET_LITTLE_SYM       bfd_elf64_tilegx_vec
+#define TARGET_LITTLE_NAME	"elf64-tilegx"
+
+#define elf_backend_reloc_type_class	     tilegx_reloc_type_class
+
+#define bfd_elf64_bfd_reloc_name_lookup      tilegx_reloc_name_lookup
+#define bfd_elf64_bfd_link_hash_table_create tilegx_elf_link_hash_table_create
+#define bfd_elf64_bfd_reloc_type_lookup	     tilegx_reloc_type_lookup
+#define bfd_elf64_bfd_merge_private_bfd_data \
+  _bfd_tilegx_elf_merge_private_bfd_data
+
+#define elf_backend_copy_indirect_symbol     tilegx_elf_copy_indirect_symbol
+#define elf_backend_create_dynamic_sections  tilegx_elf_create_dynamic_sections
+#define elf_backend_check_relocs	     tilegx_elf_check_relocs
+#define elf_backend_adjust_dynamic_symbol    tilegx_elf_adjust_dynamic_symbol
+#define elf_backend_omit_section_dynsym	     tilegx_elf_omit_section_dynsym
+#define elf_backend_size_dynamic_sections    tilegx_elf_size_dynamic_sections
+#define elf_backend_relocate_section	     tilegx_elf_relocate_section
+#define elf_backend_finish_dynamic_symbol    tilegx_elf_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections  tilegx_elf_finish_dynamic_sections
+#define elf_backend_gc_mark_hook	     tilegx_elf_gc_mark_hook
+#define elf_backend_gc_sweep_hook            tilegx_elf_gc_sweep_hook
+#define elf_backend_plt_sym_val		     tilegx_elf_plt_sym_val
+#define elf_info_to_howto_rel                NULL
+#define elf_info_to_howto                    tilegx_info_to_howto_rela
+#define elf_backend_grok_prstatus            tilegx_elf_grok_prstatus
+#define elf_backend_grok_psinfo              tilegx_elf_grok_psinfo
+#define elf_backend_additional_program_headers tilegx_additional_program_headers
+
+#define elf_backend_init_index_section	_bfd_elf_init_1_index_section
+
+#define elf_backend_can_gc_sections 1
+#define elf_backend_can_refcount 1
+#define elf_backend_want_got_plt 1
+#define elf_backend_plt_readonly 1
+/* Align PLT mod 64 byte L2 line size. */
+#define elf_backend_plt_alignment 6
+#define elf_backend_want_plt_sym 1
+#define elf_backend_got_header_size 8
+#define elf_backend_rela_normal 1
+#define elf_backend_default_execstack 0
+
+#include "elf64-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-tilegx.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-tilegx.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-tilegx.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-tilegx.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,38 @@
+/* TILE-Gx-specific support for 64-bit ELF.
+   Copyright 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _ELF64_TILEGX_H
+#define _ELF64_TILEGX_H
+
+/* This file contains sizes and offsets of Linux data structures.  */
+
+#define TILEGX_PRSTATUS_SIZEOF           632
+#define TILEGX_PRSTATUS_OFFSET_PR_CURSIG  12
+#define TILEGX_PRSTATUS_OFFSET_PR_PID     32
+#define TILEGX_PRSTATUS_OFFSET_PR_REG    112
+
+#define TILEGX_PRPSINFO_SIZEOF           136
+#define TILEGX_PRPSINFO_OFFSET_PR_FNAME   40
+#define TILEGX_PRPSINFO_OFFSET_PR_PSARGS  56
+#define ELF_PR_PSARGS_SIZE                80
+
+#define TILEGX_GREGSET_T_SIZE            512
+
+#endif /* _ELF64_TILEGX_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-x86-64.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-x86-64.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64-x86-64.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64-x86-64.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,5156 @@
+/* X86-64 specific support for ELF
+   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+   2010, 2011
+   Free Software Foundation, Inc.
+   Contributed by Jan Hubicka <jh@suse.cz>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "bfd_stdint.h"
+#include "objalloc.h"
+#include "hashtab.h"
+#include "dwarf2.h"
+#include "libiberty.h"
+
+#include "elf/x86-64.h"
+
+#ifdef CORE_HEADER
+#include <stdarg.h>
+#include CORE_HEADER
+#endif
+
+/* In case we're on a 32-bit machine, construct a 64-bit "-1" value.  */
+#define MINUS_ONE (~ (bfd_vma) 0)
+
+/* Since both 32-bit and 64-bit x86-64 encode relocation type in the
+   identical manner, we use ELF32_R_TYPE instead of ELF64_R_TYPE to get
+   relocation type.  We also use ELF_ST_TYPE instead of ELF64_ST_TYPE
+   since they are the same.  */
+
+#define ABI_64_P(abfd) \
+  (get_elf_backend_data (abfd)->s->elfclass == ELFCLASS64)
+
+/* The relocation "howto" table.  Order of fields:
+   type, rightshift, size, bitsize, pc_relative, bitpos, complain_on_overflow,
+   special_function, name, partial_inplace, src_mask, dst_mask, pcrel_offset.  */
+static reloc_howto_type x86_64_elf_howto_table[] =
+{
+  HOWTO(R_X86_64_NONE, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+	bfd_elf_generic_reloc, "R_X86_64_NONE",	FALSE, 0x00000000, 0x00000000,
+	FALSE),
+  HOWTO(R_X86_64_64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_64", FALSE, MINUS_ONE, MINUS_ONE,
+	FALSE),
+  HOWTO(R_X86_64_PC32, 0, 2, 32, TRUE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_PC32", FALSE, 0xffffffff, 0xffffffff,
+	TRUE),
+  HOWTO(R_X86_64_GOT32, 0, 2, 32, FALSE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_GOT32", FALSE, 0xffffffff, 0xffffffff,
+	FALSE),
+  HOWTO(R_X86_64_PLT32, 0, 2, 32, TRUE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_PLT32", FALSE, 0xffffffff, 0xffffffff,
+	TRUE),
+  HOWTO(R_X86_64_COPY, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_COPY", FALSE, 0xffffffff, 0xffffffff,
+	FALSE),
+  HOWTO(R_X86_64_GLOB_DAT, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_GLOB_DAT", FALSE, MINUS_ONE,
+	MINUS_ONE, FALSE),
+  HOWTO(R_X86_64_JUMP_SLOT, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_JUMP_SLOT", FALSE, MINUS_ONE,
+	MINUS_ONE, FALSE),
+  HOWTO(R_X86_64_RELATIVE, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_RELATIVE", FALSE, MINUS_ONE,
+	MINUS_ONE, FALSE),
+  HOWTO(R_X86_64_GOTPCREL, 0, 2, 32, TRUE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_GOTPCREL", FALSE, 0xffffffff,
+	0xffffffff, TRUE),
+  HOWTO(R_X86_64_32, 0, 2, 32, FALSE, 0, complain_overflow_unsigned,
+	bfd_elf_generic_reloc, "R_X86_64_32", FALSE, 0xffffffff, 0xffffffff,
+	FALSE),
+  HOWTO(R_X86_64_32S, 0, 2, 32, FALSE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_32S", FALSE, 0xffffffff, 0xffffffff,
+	FALSE),
+  HOWTO(R_X86_64_16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_16", FALSE, 0xffff, 0xffff, FALSE),
+  HOWTO(R_X86_64_PC16,0, 1, 16, TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_PC16", FALSE, 0xffff, 0xffff, TRUE),
+  HOWTO(R_X86_64_8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_8", FALSE, 0xff, 0xff, FALSE),
+  HOWTO(R_X86_64_PC8, 0, 0, 8, TRUE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_PC8", FALSE, 0xff, 0xff, TRUE),
+  HOWTO(R_X86_64_DTPMOD64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_DTPMOD64", FALSE, MINUS_ONE,
+	MINUS_ONE, FALSE),
+  HOWTO(R_X86_64_DTPOFF64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_DTPOFF64", FALSE, MINUS_ONE,
+	MINUS_ONE, FALSE),
+  HOWTO(R_X86_64_TPOFF64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_TPOFF64", FALSE, MINUS_ONE,
+	MINUS_ONE, FALSE),
+  HOWTO(R_X86_64_TLSGD, 0, 2, 32, TRUE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_TLSGD", FALSE, 0xffffffff,
+	0xffffffff, TRUE),
+  HOWTO(R_X86_64_TLSLD, 0, 2, 32, TRUE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_TLSLD", FALSE, 0xffffffff,
+	0xffffffff, TRUE),
+  HOWTO(R_X86_64_DTPOFF32, 0, 2, 32, FALSE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_DTPOFF32", FALSE, 0xffffffff,
+	0xffffffff, FALSE),
+  HOWTO(R_X86_64_GOTTPOFF, 0, 2, 32, TRUE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_GOTTPOFF", FALSE, 0xffffffff,
+	0xffffffff, TRUE),
+  HOWTO(R_X86_64_TPOFF32, 0, 2, 32, FALSE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_TPOFF32", FALSE, 0xffffffff,
+	0xffffffff, FALSE),
+  HOWTO(R_X86_64_PC64, 0, 4, 64, TRUE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_PC64", FALSE, MINUS_ONE, MINUS_ONE,
+	TRUE),
+  HOWTO(R_X86_64_GOTOFF64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_GOTOFF64",
+	FALSE, MINUS_ONE, MINUS_ONE, FALSE),
+  HOWTO(R_X86_64_GOTPC32, 0, 2, 32, TRUE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_GOTPC32",
+	FALSE, 0xffffffff, 0xffffffff, TRUE),
+  HOWTO(R_X86_64_GOT64, 0, 4, 64, FALSE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_GOT64", FALSE, MINUS_ONE, MINUS_ONE,
+	FALSE),
+  HOWTO(R_X86_64_GOTPCREL64, 0, 4, 64, TRUE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_GOTPCREL64", FALSE, MINUS_ONE,
+	MINUS_ONE, TRUE),
+  HOWTO(R_X86_64_GOTPC64, 0, 4, 64, TRUE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_GOTPC64",
+	FALSE, MINUS_ONE, MINUS_ONE, TRUE),
+  HOWTO(R_X86_64_GOTPLT64, 0, 4, 64, FALSE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_GOTPLT64", FALSE, MINUS_ONE,
+	MINUS_ONE, FALSE),
+  HOWTO(R_X86_64_PLTOFF64, 0, 4, 64, FALSE, 0, complain_overflow_signed,
+	bfd_elf_generic_reloc, "R_X86_64_PLTOFF64", FALSE, MINUS_ONE,
+	MINUS_ONE, FALSE),
+  EMPTY_HOWTO (32),
+  EMPTY_HOWTO (33),
+  HOWTO(R_X86_64_GOTPC32_TLSDESC, 0, 2, 32, TRUE, 0,
+	complain_overflow_bitfield, bfd_elf_generic_reloc,
+	"R_X86_64_GOTPC32_TLSDESC",
+	FALSE, 0xffffffff, 0xffffffff, TRUE),
+  HOWTO(R_X86_64_TLSDESC_CALL, 0, 0, 0, FALSE, 0,
+	complain_overflow_dont, bfd_elf_generic_reloc,
+	"R_X86_64_TLSDESC_CALL",
+	FALSE, 0, 0, FALSE),
+  HOWTO(R_X86_64_TLSDESC, 0, 4, 64, FALSE, 0,
+	complain_overflow_bitfield, bfd_elf_generic_reloc,
+	"R_X86_64_TLSDESC",
+	FALSE, MINUS_ONE, MINUS_ONE, FALSE),
+  HOWTO(R_X86_64_IRELATIVE, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_IRELATIVE", FALSE, MINUS_ONE,
+	MINUS_ONE, FALSE),
+  HOWTO(R_X86_64_RELATIVE64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_RELATIVE64", FALSE, MINUS_ONE,
+	MINUS_ONE, FALSE),
+
+  /* We have a gap in the reloc numbers here.
+     R_X86_64_standard counts the number up to this point, and
+     R_X86_64_vt_offset is the value to subtract from a reloc type of
+     R_X86_64_GNU_VT* to form an index into this table.  */
+#define R_X86_64_standard (R_X86_64_IRELATIVE + 1)
+#define R_X86_64_vt_offset (R_X86_64_GNU_VTINHERIT - R_X86_64_standard)
+
+/* GNU extension to record C++ vtable hierarchy.  */
+  HOWTO (R_X86_64_GNU_VTINHERIT, 0, 4, 0, FALSE, 0, complain_overflow_dont,
+	 NULL, "R_X86_64_GNU_VTINHERIT", FALSE, 0, 0, FALSE),
+
+/* GNU extension to record C++ vtable member usage.  */
+  HOWTO (R_X86_64_GNU_VTENTRY, 0, 4, 0, FALSE, 0, complain_overflow_dont,
+	 _bfd_elf_rel_vtable_reloc_fn, "R_X86_64_GNU_VTENTRY", FALSE, 0, 0,
+	 FALSE),
+
+/* Use complain_overflow_bitfield on R_X86_64_32 for x32.  */
+  HOWTO(R_X86_64_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+	bfd_elf_generic_reloc, "R_X86_64_32", FALSE, 0xffffffff, 0xffffffff,
+	FALSE)
+};
+
+#define IS_X86_64_PCREL_TYPE(TYPE)	\
+  (   ((TYPE) == R_X86_64_PC8)		\
+   || ((TYPE) == R_X86_64_PC16)		\
+   || ((TYPE) == R_X86_64_PC32)		\
+   || ((TYPE) == R_X86_64_PC64))
+
+/* Map BFD relocs to the x86_64 elf relocs.  */
+struct elf_reloc_map
+{
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned char elf_reloc_val;
+};
+
+static const struct elf_reloc_map x86_64_reloc_map[] =
+{
+  { BFD_RELOC_NONE,		R_X86_64_NONE, },
+  { BFD_RELOC_64,		R_X86_64_64,   },
+  { BFD_RELOC_32_PCREL,		R_X86_64_PC32, },
+  { BFD_RELOC_X86_64_GOT32,	R_X86_64_GOT32,},
+  { BFD_RELOC_X86_64_PLT32,	R_X86_64_PLT32,},
+  { BFD_RELOC_X86_64_COPY,	R_X86_64_COPY, },
+  { BFD_RELOC_X86_64_GLOB_DAT,	R_X86_64_GLOB_DAT, },
+  { BFD_RELOC_X86_64_JUMP_SLOT, R_X86_64_JUMP_SLOT, },
+  { BFD_RELOC_X86_64_RELATIVE,	R_X86_64_RELATIVE, },
+  { BFD_RELOC_X86_64_GOTPCREL,	R_X86_64_GOTPCREL, },
+  { BFD_RELOC_32,		R_X86_64_32, },
+  { BFD_RELOC_X86_64_32S,	R_X86_64_32S, },
+  { BFD_RELOC_16,		R_X86_64_16, },
+  { BFD_RELOC_16_PCREL,		R_X86_64_PC16, },
+  { BFD_RELOC_8,		R_X86_64_8, },
+  { BFD_RELOC_8_PCREL,		R_X86_64_PC8, },
+  { BFD_RELOC_X86_64_DTPMOD64,	R_X86_64_DTPMOD64, },
+  { BFD_RELOC_X86_64_DTPOFF64,	R_X86_64_DTPOFF64, },
+  { BFD_RELOC_X86_64_TPOFF64,	R_X86_64_TPOFF64, },
+  { BFD_RELOC_X86_64_TLSGD,	R_X86_64_TLSGD, },
+  { BFD_RELOC_X86_64_TLSLD,	R_X86_64_TLSLD, },
+  { BFD_RELOC_X86_64_DTPOFF32,	R_X86_64_DTPOFF32, },
+  { BFD_RELOC_X86_64_GOTTPOFF,	R_X86_64_GOTTPOFF, },
+  { BFD_RELOC_X86_64_TPOFF32,	R_X86_64_TPOFF32, },
+  { BFD_RELOC_64_PCREL,		R_X86_64_PC64, },
+  { BFD_RELOC_X86_64_GOTOFF64,	R_X86_64_GOTOFF64, },
+  { BFD_RELOC_X86_64_GOTPC32,	R_X86_64_GOTPC32, },
+  { BFD_RELOC_X86_64_GOT64,	R_X86_64_GOT64, },
+  { BFD_RELOC_X86_64_GOTPCREL64,R_X86_64_GOTPCREL64, },
+  { BFD_RELOC_X86_64_GOTPC64,	R_X86_64_GOTPC64, },
+  { BFD_RELOC_X86_64_GOTPLT64,	R_X86_64_GOTPLT64, },
+  { BFD_RELOC_X86_64_PLTOFF64,	R_X86_64_PLTOFF64, },
+  { BFD_RELOC_X86_64_GOTPC32_TLSDESC, R_X86_64_GOTPC32_TLSDESC, },
+  { BFD_RELOC_X86_64_TLSDESC_CALL, R_X86_64_TLSDESC_CALL, },
+  { BFD_RELOC_X86_64_TLSDESC,	R_X86_64_TLSDESC, },
+  { BFD_RELOC_X86_64_IRELATIVE,	R_X86_64_IRELATIVE, },
+  { BFD_RELOC_VTABLE_INHERIT,	R_X86_64_GNU_VTINHERIT, },
+  { BFD_RELOC_VTABLE_ENTRY,	R_X86_64_GNU_VTENTRY, },
+};
+
+static reloc_howto_type *
+elf_x86_64_rtype_to_howto (bfd *abfd, unsigned r_type)
+{
+  unsigned i;
+
+  if (r_type == (unsigned int) R_X86_64_32)
+    {
+      if (ABI_64_P (abfd))
+	i = r_type;
+      else
+	i = ARRAY_SIZE (x86_64_elf_howto_table) - 1;
+    }
+  else if (r_type < (unsigned int) R_X86_64_GNU_VTINHERIT
+	   || r_type >= (unsigned int) R_X86_64_max)
+    {
+      if (r_type >= (unsigned int) R_X86_64_standard)
+	{
+	  (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
+				 abfd, (int) r_type);
+	  r_type = R_X86_64_NONE;
+	}
+      i = r_type;
+    }
+  else
+    i = r_type - (unsigned int) R_X86_64_vt_offset;
+  BFD_ASSERT (x86_64_elf_howto_table[i].type == r_type);
+  return &x86_64_elf_howto_table[i];
+}
+
+/* Given a BFD reloc type, return a HOWTO structure.  */
+static reloc_howto_type *
+elf_x86_64_reloc_type_lookup (bfd *abfd,
+			      bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (x86_64_reloc_map) / sizeof (struct elf_reloc_map);
+       i++)
+    {
+      if (x86_64_reloc_map[i].bfd_reloc_val == code)
+	return elf_x86_64_rtype_to_howto (abfd,
+					  x86_64_reloc_map[i].elf_reloc_val);
+    }
+  return 0;
+}
+
+static reloc_howto_type *
+elf_x86_64_reloc_name_lookup (bfd *abfd,
+			      const char *r_name)
+{
+  unsigned int i;
+
+  if (!ABI_64_P (abfd) && strcasecmp (r_name, "R_X86_64_32") == 0)
+    {
+      /* Get x32 R_X86_64_32.  */
+      reloc_howto_type *reloc
+	= &x86_64_elf_howto_table[ARRAY_SIZE (x86_64_elf_howto_table) - 1];
+      BFD_ASSERT (reloc->type == (unsigned int) R_X86_64_32);
+      return reloc;
+    }
+
+  for (i = 0; i < ARRAY_SIZE (x86_64_elf_howto_table); i++)
+    if (x86_64_elf_howto_table[i].name != NULL
+	&& strcasecmp (x86_64_elf_howto_table[i].name, r_name) == 0)
+      return &x86_64_elf_howto_table[i];
+
+  return NULL;
+}
+
+/* Given an x86_64 ELF reloc type, fill in an arelent structure.  */
+
+static void
+elf_x86_64_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr,
+			  Elf_Internal_Rela *dst)
+{
+  unsigned r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  cache_ptr->howto = elf_x86_64_rtype_to_howto (abfd, r_type);
+  BFD_ASSERT (r_type == cache_ptr->howto->type);
+}
+
+/* Support for core dump NOTE sections.  */
+static bfd_boolean
+elf_x86_64_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  int offset;
+  size_t size;
+
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      case 296:		/* sizeof(istruct elf_prstatus) on Linux/x32 */
+	/* pr_cursig */
+	elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12);
+
+	/* pr_pid */
+	elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 24);
+
+	/* pr_reg */
+	offset = 72;
+	size = 216;
+
+	break;
+
+      case 336:		/* sizeof(istruct elf_prstatus) on Linux/x86_64 */
+	/* pr_cursig */
+	elf_tdata (abfd)->core_signal
+	  = bfd_get_16 (abfd, note->descdata + 12);
+
+	/* pr_pid */
+	elf_tdata (abfd)->core_lwpid
+	  = bfd_get_32 (abfd, note->descdata + 32);
+
+	/* pr_reg */
+	offset = 112;
+	size = 216;
+
+	break;
+    }
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg",
+					  size, note->descpos + offset);
+}
+
+static bfd_boolean
+elf_x86_64_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      case 124:		/* sizeof(struct elf_prpsinfo) on Linux/x32 */
+	elf_tdata (abfd)->core_pid
+	  = bfd_get_32 (abfd, note->descdata + 12);
+	elf_tdata (abfd)->core_program
+	  = _bfd_elfcore_strndup (abfd, note->descdata + 28, 16);
+	elf_tdata (abfd)->core_command
+	  = _bfd_elfcore_strndup (abfd, note->descdata + 44, 80);
+	break;
+
+      case 136:		/* sizeof(struct elf_prpsinfo) on Linux/x86_64 */
+	elf_tdata (abfd)->core_pid
+	  = bfd_get_32 (abfd, note->descdata + 24);
+	elf_tdata (abfd)->core_program
+	 = _bfd_elfcore_strndup (abfd, note->descdata + 40, 16);
+	elf_tdata (abfd)->core_command
+	 = _bfd_elfcore_strndup (abfd, note->descdata + 56, 80);
+    }
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+
+  {
+    char *command = elf_tdata (abfd)->core_command;
+    int n = strlen (command);
+
+    if (0 < n && command[n - 1] == ' ')
+      command[n - 1] = '\0';
+  }
+
+  return TRUE;
+}
+
+#ifdef CORE_HEADER
+static char *
+elf_x86_64_write_core_note (bfd *abfd, char *buf, int *bufsiz,
+			    int note_type, ...)
+{
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  const void *p;
+  int size;
+  va_list ap;
+  const char *fname, *psargs;
+  long pid;
+  int cursig;
+  const void *gregs;
+
+  switch (note_type)
+    {
+    default:
+      return NULL;
+
+    case NT_PRPSINFO:
+      va_start (ap, note_type);
+      fname = va_arg (ap, const char *);
+      psargs = va_arg (ap, const char *);
+      va_end (ap);
+
+      if (bed->s->elfclass == ELFCLASS32)
+	{
+	  prpsinfo32_t data;
+	  memset (&data, 0, sizeof (data));
+	  strncpy (data.pr_fname, fname, sizeof (data.pr_fname));
+	  strncpy (data.pr_psargs, psargs, sizeof (data.pr_psargs));
+	  p = (const void *) &data;
+	  size = sizeof (data);
+	}
+      else
+	{
+	  prpsinfo_t data;
+	  memset (&data, 0, sizeof (data));
+	  strncpy (data.pr_fname, fname, sizeof (data.pr_fname));
+	  strncpy (data.pr_psargs, psargs, sizeof (data.pr_psargs));
+	  p = (const void *) &data;
+	  size = sizeof (data);
+	}
+      break;
+
+    case NT_PRSTATUS:
+      va_start (ap, note_type);
+      pid = va_arg (ap, long);
+      cursig = va_arg (ap, int);
+      gregs = va_arg (ap, const void *);
+      va_end (ap);
+
+      if (bed->s->elfclass == ELFCLASS32)
+	{
+	  if (bed->elf_machine_code == EM_X86_64)
+	    {
+	      prstatusx32_t prstat;
+	      memset (&prstat, 0, sizeof (prstat));
+	      prstat.pr_pid = pid;
+	      prstat.pr_cursig = cursig;
+	      memcpy (&prstat.pr_reg, gregs, sizeof (prstat.pr_reg));
+	      p = (const void *) &prstat;
+	      size = sizeof (prstat);
+	    }
+	  else
+	    {
+	      prstatus32_t prstat;
+	      memset (&prstat, 0, sizeof (prstat));
+	      prstat.pr_pid = pid;
+	      prstat.pr_cursig = cursig;
+	      memcpy (&prstat.pr_reg, gregs, sizeof (prstat.pr_reg));
+	      p = (const void *) &prstat;
+	      size = sizeof (prstat);
+	    }
+	}
+      else
+	{
+	  prstatus_t prstat;
+	  memset (&prstat, 0, sizeof (prstat));
+	  prstat.pr_pid = pid;
+	  prstat.pr_cursig = cursig;
+	  memcpy (&prstat.pr_reg, gregs, sizeof (prstat.pr_reg));
+	  p = (const void *) &prstat;
+	  size = sizeof (prstat);
+	}
+      break;
+    }
+
+  return elfcore_write_note (abfd, buf, bufsiz, "CORE", note_type, p,
+			     size);
+}
+#endif
+
+/* Functions for the x86-64 ELF linker.	 */
+
+/* The name of the dynamic interpreter.	 This is put in the .interp
+   section.  */
+
+#define ELF64_DYNAMIC_INTERPRETER "/lib/ld64.so.1"
+#define ELF32_DYNAMIC_INTERPRETER "/lib/ld32.so.1"
+
+/* If ELIMINATE_COPY_RELOCS is non-zero, the linker will try to avoid
+   copying dynamic variables from a shared lib into an app's dynbss
+   section, and instead use a dynamic relocation to point into the
+   shared lib.  */
+#define ELIMINATE_COPY_RELOCS 1
+
+/* The size in bytes of an entry in the global offset table.  */
+
+#define GOT_ENTRY_SIZE 8
+
+/* The size in bytes of an entry in the procedure linkage table.  */
+
+#define PLT_ENTRY_SIZE 16
+
+/* The first entry in a procedure linkage table looks like this.  See the
+   SVR4 ABI i386 supplement and the x86-64 ABI to see how this works.  */
+
+static const bfd_byte elf_x86_64_plt0_entry[PLT_ENTRY_SIZE] =
+{
+  0xff, 0x35, 8, 0, 0, 0,	/* pushq GOT+8(%rip)  */
+  0xff, 0x25, 16, 0, 0, 0,	/* jmpq *GOT+16(%rip) */
+  0x0f, 0x1f, 0x40, 0x00	/* nopl 0(%rax)       */
+};
+
+/* Subsequent entries in a procedure linkage table look like this.  */
+
+static const bfd_byte elf_x86_64_plt_entry[PLT_ENTRY_SIZE] =
+{
+  0xff, 0x25,	/* jmpq *name@GOTPC(%rip) */
+  0, 0, 0, 0,	/* replaced with offset to this symbol in .got.	 */
+  0x68,		/* pushq immediate */
+  0, 0, 0, 0,	/* replaced with index into relocation table.  */
+  0xe9,		/* jmp relative */
+  0, 0, 0, 0	/* replaced with offset to start of .plt0.  */
+};
+
+/* .eh_frame covering the .plt section.  */
+
+static const bfd_byte elf_x86_64_eh_frame_plt[] =
+{
+#define PLT_CIE_LENGTH		20
+#define PLT_FDE_LENGTH		36
+#define PLT_FDE_START_OFFSET	4 + PLT_CIE_LENGTH + 8
+#define PLT_FDE_LEN_OFFSET	4 + PLT_CIE_LENGTH + 12
+  PLT_CIE_LENGTH, 0, 0, 0,	/* CIE length */
+  0, 0, 0, 0,			/* CIE ID */
+  1,				/* CIE version */
+  'z', 'R', 0,			/* Augmentation string */
+  1,				/* Code alignment factor */
+  0x78,				/* Data alignment factor */
+  16,				/* Return address column */
+  1,				/* Augmentation size */
+  DW_EH_PE_pcrel | DW_EH_PE_sdata4, /* FDE encoding */
+  DW_CFA_def_cfa, 7, 8,		/* DW_CFA_def_cfa: r7 (rsp) ofs 8 */
+  DW_CFA_offset + 16, 1,	/* DW_CFA_offset: r16 (rip) at cfa-8 */
+  DW_CFA_nop, DW_CFA_nop,
+
+  PLT_FDE_LENGTH, 0, 0, 0,	/* FDE length */
+  PLT_CIE_LENGTH + 8, 0, 0, 0,	/* CIE pointer */
+  0, 0, 0, 0,			/* R_X86_64_PC32 .plt goes here */
+  0, 0, 0, 0,			/* .plt size goes here */
+  0,				/* Augmentation size */
+  DW_CFA_def_cfa_offset, 16,	/* DW_CFA_def_cfa_offset: 16 */
+  DW_CFA_advance_loc + 6,	/* DW_CFA_advance_loc: 6 to __PLT__+6 */
+  DW_CFA_def_cfa_offset, 24,	/* DW_CFA_def_cfa_offset: 24 */
+  DW_CFA_advance_loc + 10,	/* DW_CFA_advance_loc: 10 to __PLT__+16 */
+  DW_CFA_def_cfa_expression,	/* DW_CFA_def_cfa_expression */
+  11,				/* Block length */
+  DW_OP_breg7, 8,		/* DW_OP_breg7 (rsp): 8 */
+  DW_OP_breg16, 0,		/* DW_OP_breg16 (rip): 0 */
+  DW_OP_lit15, DW_OP_and, DW_OP_lit11, DW_OP_ge,
+  DW_OP_lit3, DW_OP_shl, DW_OP_plus,
+  DW_CFA_nop, DW_CFA_nop, DW_CFA_nop, DW_CFA_nop
+};
+
+/* x86-64 ELF linker hash entry.  */
+
+struct elf_x86_64_link_hash_entry
+{
+  struct elf_link_hash_entry elf;
+
+  /* Track dynamic relocs copied for this symbol.  */
+  struct elf_dyn_relocs *dyn_relocs;
+
+#define GOT_UNKNOWN	0
+#define GOT_NORMAL	1
+#define GOT_TLS_GD	2
+#define GOT_TLS_IE	3
+#define GOT_TLS_GDESC	4
+#define GOT_TLS_GD_BOTH_P(type) \
+  ((type) == (GOT_TLS_GD | GOT_TLS_GDESC))
+#define GOT_TLS_GD_P(type) \
+  ((type) == GOT_TLS_GD || GOT_TLS_GD_BOTH_P (type))
+#define GOT_TLS_GDESC_P(type) \
+  ((type) == GOT_TLS_GDESC || GOT_TLS_GD_BOTH_P (type))
+#define GOT_TLS_GD_ANY_P(type) \
+  (GOT_TLS_GD_P (type) || GOT_TLS_GDESC_P (type))
+  unsigned char tls_type;
+
+  /* Offset of the GOTPLT entry reserved for the TLS descriptor,
+     starting at the end of the jump table.  */
+  bfd_vma tlsdesc_got;
+};
+
+#define elf_x86_64_hash_entry(ent) \
+  ((struct elf_x86_64_link_hash_entry *)(ent))
+
+struct elf_x86_64_obj_tdata
+{
+  struct elf_obj_tdata root;
+
+  /* tls_type for each local got entry.  */
+  char *local_got_tls_type;
+
+  /* GOTPLT entries for TLS descriptors.  */
+  bfd_vma *local_tlsdesc_gotent;
+};
+
+#define elf_x86_64_tdata(abfd) \
+  ((struct elf_x86_64_obj_tdata *) (abfd)->tdata.any)
+
+#define elf_x86_64_local_got_tls_type(abfd) \
+  (elf_x86_64_tdata (abfd)->local_got_tls_type)
+
+#define elf_x86_64_local_tlsdesc_gotent(abfd) \
+  (elf_x86_64_tdata (abfd)->local_tlsdesc_gotent)
+
+#define is_x86_64_elf(bfd)				\
+  (bfd_get_flavour (bfd) == bfd_target_elf_flavour	\
+   && elf_tdata (bfd) != NULL				\
+   && elf_object_id (bfd) == X86_64_ELF_DATA)
+
+static bfd_boolean
+elf_x86_64_mkobject (bfd *abfd)
+{
+  return bfd_elf_allocate_object (abfd, sizeof (struct elf_x86_64_obj_tdata),
+				  X86_64_ELF_DATA);
+}
+
+/* x86-64 ELF linker hash table.  */
+
+struct elf_x86_64_link_hash_table
+{
+  struct elf_link_hash_table elf;
+
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *sdynbss;
+  asection *srelbss;
+  asection *plt_eh_frame;
+
+  union
+  {
+    bfd_signed_vma refcount;
+    bfd_vma offset;
+  } tls_ld_got;
+
+  /* The amount of space used by the jump slots in the GOT.  */
+  bfd_vma sgotplt_jump_table_size;
+
+  /* Small local sym cache.  */
+  struct sym_cache sym_cache;
+
+  bfd_vma (*r_info) (bfd_vma, bfd_vma);
+  bfd_vma (*r_sym) (bfd_vma);
+  unsigned int pointer_r_type;
+  const char *dynamic_interpreter;
+  int dynamic_interpreter_size;
+
+  /* _TLS_MODULE_BASE_ symbol.  */
+  struct bfd_link_hash_entry *tls_module_base;
+
+  /* Used by local STT_GNU_IFUNC symbols.  */
+  htab_t loc_hash_table;
+  void * loc_hash_memory;
+
+  /* The offset into splt of the PLT entry for the TLS descriptor
+     resolver.  Special values are 0, if not necessary (or not found
+     to be necessary yet), and -1 if needed but not determined
+     yet.  */
+  bfd_vma tlsdesc_plt;
+  /* The offset into sgot of the GOT entry used by the PLT entry
+     above.  */
+  bfd_vma tlsdesc_got;
+};
+
+/* Get the x86-64 ELF linker hash table from a link_info structure.  */
+
+#define elf_x86_64_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == X86_64_ELF_DATA ? ((struct elf_x86_64_link_hash_table *) ((p)->hash)) : NULL)
+
+#define elf_x86_64_compute_jump_table_size(htab) \
+  ((htab)->elf.srelplt->reloc_count * GOT_ENTRY_SIZE)
+
+/* Create an entry in an x86-64 ELF linker hash table.	*/
+
+static struct bfd_hash_entry *
+elf_x86_64_link_hash_newfunc (struct bfd_hash_entry *entry,
+			      struct bfd_hash_table *table,
+			      const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = (struct bfd_hash_entry *)
+          bfd_hash_allocate (table,
+                             sizeof (struct elf_x86_64_link_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = _bfd_elf_link_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct elf_x86_64_link_hash_entry *eh;
+
+      eh = (struct elf_x86_64_link_hash_entry *) entry;
+      eh->dyn_relocs = NULL;
+      eh->tls_type = GOT_UNKNOWN;
+      eh->tlsdesc_got = (bfd_vma) -1;
+    }
+
+  return entry;
+}
+
+/* Compute a hash of a local hash entry.  We use elf_link_hash_entry
+  for local symbol so that we can handle local STT_GNU_IFUNC symbols
+  as global symbol.  We reuse indx and dynstr_index for local symbol
+  hash since they aren't used by global symbols in this backend.  */
+
+static hashval_t
+elf_x86_64_local_htab_hash (const void *ptr)
+{
+  struct elf_link_hash_entry *h
+    = (struct elf_link_hash_entry *) ptr;
+  return ELF_LOCAL_SYMBOL_HASH (h->indx, h->dynstr_index);
+}
+
+/* Compare local hash entries.  */
+
+static int
+elf_x86_64_local_htab_eq (const void *ptr1, const void *ptr2)
+{
+  struct elf_link_hash_entry *h1
+     = (struct elf_link_hash_entry *) ptr1;
+  struct elf_link_hash_entry *h2
+    = (struct elf_link_hash_entry *) ptr2;
+
+  return h1->indx == h2->indx && h1->dynstr_index == h2->dynstr_index;
+}
+
+/* Find and/or create a hash entry for local symbol.  */
+
+static struct elf_link_hash_entry *
+elf_x86_64_get_local_sym_hash (struct elf_x86_64_link_hash_table *htab,
+			       bfd *abfd, const Elf_Internal_Rela *rel,
+			       bfd_boolean create)
+{
+  struct elf_x86_64_link_hash_entry e, *ret;
+  asection *sec = abfd->sections;
+  hashval_t h = ELF_LOCAL_SYMBOL_HASH (sec->id,
+				       htab->r_sym (rel->r_info));
+  void **slot;
+
+  e.elf.indx = sec->id;
+  e.elf.dynstr_index = htab->r_sym (rel->r_info);
+  slot = htab_find_slot_with_hash (htab->loc_hash_table, &e, h,
+				   create ? INSERT : NO_INSERT);
+
+  if (!slot)
+    return NULL;
+
+  if (*slot)
+    {
+      ret = (struct elf_x86_64_link_hash_entry *) *slot;
+      return &ret->elf;
+    }
+
+  ret = (struct elf_x86_64_link_hash_entry *)
+	objalloc_alloc ((struct objalloc *) htab->loc_hash_memory,
+			sizeof (struct elf_x86_64_link_hash_entry));
+  if (ret)
+    {
+      memset (ret, 0, sizeof (*ret));
+      ret->elf.indx = sec->id;
+      ret->elf.dynstr_index = htab->r_sym (rel->r_info);
+      ret->elf.dynindx = -1;
+      *slot = ret;
+    }
+  return &ret->elf;
+}
+
+/* Create an X86-64 ELF linker hash table.  */
+
+static struct bfd_link_hash_table *
+elf_x86_64_link_hash_table_create (bfd *abfd)
+{
+  struct elf_x86_64_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct elf_x86_64_link_hash_table);
+
+  ret = (struct elf_x86_64_link_hash_table *) bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd,
+				      elf_x86_64_link_hash_newfunc,
+				      sizeof (struct elf_x86_64_link_hash_entry),
+				      X86_64_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  ret->sdynbss = NULL;
+  ret->srelbss = NULL;
+  ret->plt_eh_frame = NULL;
+  ret->sym_cache.abfd = NULL;
+  ret->tlsdesc_plt = 0;
+  ret->tlsdesc_got = 0;
+  ret->tls_ld_got.refcount = 0;
+  ret->sgotplt_jump_table_size = 0;
+  ret->tls_module_base = NULL;
+
+  if (ABI_64_P (abfd))
+    {
+      ret->r_info = elf64_r_info;
+      ret->r_sym = elf64_r_sym;
+      ret->pointer_r_type = R_X86_64_64;
+      ret->dynamic_interpreter = ELF64_DYNAMIC_INTERPRETER;
+      ret->dynamic_interpreter_size = sizeof ELF64_DYNAMIC_INTERPRETER;
+    }
+  else
+    {
+      ret->r_info = elf32_r_info;
+      ret->r_sym = elf32_r_sym;
+      ret->pointer_r_type = R_X86_64_32;
+      ret->dynamic_interpreter = ELF32_DYNAMIC_INTERPRETER;
+      ret->dynamic_interpreter_size = sizeof ELF32_DYNAMIC_INTERPRETER;
+    }
+
+  ret->loc_hash_table = htab_try_create (1024,
+					 elf_x86_64_local_htab_hash,
+					 elf_x86_64_local_htab_eq,
+					 NULL);
+  ret->loc_hash_memory = objalloc_create ();
+  if (!ret->loc_hash_table || !ret->loc_hash_memory)
+    {
+      free (ret);
+      return NULL;
+    }
+
+  return &ret->elf.root;
+}
+
+/* Destroy an X86-64 ELF linker hash table.  */
+
+static void
+elf_x86_64_link_hash_table_free (struct bfd_link_hash_table *hash)
+{
+  struct elf_x86_64_link_hash_table *htab
+    = (struct elf_x86_64_link_hash_table *) hash;
+
+  if (htab->loc_hash_table)
+    htab_delete (htab->loc_hash_table);
+  if (htab->loc_hash_memory)
+    objalloc_free ((struct objalloc *) htab->loc_hash_memory);
+  _bfd_generic_link_hash_table_free (hash);
+}
+
+/* Create .plt, .rela.plt, .got, .got.plt, .rela.got, .dynbss, and
+   .rela.bss sections in DYNOBJ, and set up shortcuts to them in our
+   hash table.  */
+
+static bfd_boolean
+elf_x86_64_create_dynamic_sections (bfd *dynobj,
+				    struct bfd_link_info *info)
+{
+  struct elf_x86_64_link_hash_table *htab;
+
+  if (!_bfd_elf_create_dynamic_sections (dynobj, info))
+    return FALSE;
+
+  htab = elf_x86_64_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  htab->sdynbss = bfd_get_section_by_name (dynobj, ".dynbss");
+  if (!info->shared)
+    htab->srelbss = bfd_get_section_by_name (dynobj, ".rela.bss");
+
+  if (!htab->sdynbss
+      || (!info->shared && !htab->srelbss))
+    abort ();
+
+  if (!info->no_ld_generated_unwind_info
+      && bfd_get_section_by_name (dynobj, ".eh_frame") == NULL
+      && htab->elf.splt != NULL)
+    {
+      flagword flags = get_elf_backend_data (dynobj)->dynamic_sec_flags;
+      htab->plt_eh_frame
+	= bfd_make_section_with_flags (dynobj, ".eh_frame",
+				       flags | SEC_READONLY);
+      if (htab->plt_eh_frame == NULL
+	  || !bfd_set_section_alignment (dynobj, htab->plt_eh_frame, 3))
+	return FALSE;
+
+      htab->plt_eh_frame->size = sizeof (elf_x86_64_eh_frame_plt);
+      htab->plt_eh_frame->contents
+	= bfd_alloc (dynobj, htab->plt_eh_frame->size);
+      memcpy (htab->plt_eh_frame->contents, elf_x86_64_eh_frame_plt,
+	      sizeof (elf_x86_64_eh_frame_plt));
+    }
+  return TRUE;
+}
+
+/* Copy the extra info we tack onto an elf_link_hash_entry.  */
+
+static void
+elf_x86_64_copy_indirect_symbol (struct bfd_link_info *info,
+				 struct elf_link_hash_entry *dir,
+				 struct elf_link_hash_entry *ind)
+{
+  struct elf_x86_64_link_hash_entry *edir, *eind;
+
+  edir = (struct elf_x86_64_link_hash_entry *) dir;
+  eind = (struct elf_x86_64_link_hash_entry *) ind;
+
+  if (eind->dyn_relocs != NULL)
+    {
+      if (edir->dyn_relocs != NULL)
+	{
+	  struct elf_dyn_relocs **pp;
+	  struct elf_dyn_relocs *p;
+
+	  /* Add reloc counts against the indirect sym to the direct sym
+	     list.  Merge any entries against the same section.  */
+	  for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      struct elf_dyn_relocs *q;
+
+	      for (q = edir->dyn_relocs; q != NULL; q = q->next)
+		if (q->sec == p->sec)
+		  {
+		    q->pc_count += p->pc_count;
+		    q->count += p->count;
+		    *pp = p->next;
+		    break;
+		  }
+	      if (q == NULL)
+		pp = &p->next;
+	    }
+	  *pp = edir->dyn_relocs;
+	}
+
+      edir->dyn_relocs = eind->dyn_relocs;
+      eind->dyn_relocs = NULL;
+    }
+
+  if (ind->root.type == bfd_link_hash_indirect
+      && dir->got.refcount <= 0)
+    {
+      edir->tls_type = eind->tls_type;
+      eind->tls_type = GOT_UNKNOWN;
+    }
+
+  if (ELIMINATE_COPY_RELOCS
+      && ind->root.type != bfd_link_hash_indirect
+      && dir->dynamic_adjusted)
+    {
+      /* If called to transfer flags for a weakdef during processing
+	 of elf_adjust_dynamic_symbol, don't copy non_got_ref.
+	 We clear it ourselves for ELIMINATE_COPY_RELOCS.  */
+      dir->ref_dynamic |= ind->ref_dynamic;
+      dir->ref_regular |= ind->ref_regular;
+      dir->ref_regular_nonweak |= ind->ref_regular_nonweak;
+      dir->needs_plt |= ind->needs_plt;
+      dir->pointer_equality_needed |= ind->pointer_equality_needed;
+    }
+  else
+    _bfd_elf_link_hash_copy_indirect (info, dir, ind);
+}
+
+static bfd_boolean
+elf64_x86_64_elf_object_p (bfd *abfd)
+{
+  /* Set the right machine number for an x86-64 elf64 file.  */
+  bfd_default_set_arch_mach (abfd, bfd_arch_i386, bfd_mach_x86_64);
+  return TRUE;
+}
+
+/* Return TRUE if the TLS access code sequence support transition
+   from R_TYPE.  */
+
+static bfd_boolean
+elf_x86_64_check_tls_transition (bfd *abfd,
+				 struct bfd_link_info *info,
+				 asection *sec,
+				 bfd_byte *contents,
+				 Elf_Internal_Shdr *symtab_hdr,
+				 struct elf_link_hash_entry **sym_hashes,
+				 unsigned int r_type,
+				 const Elf_Internal_Rela *rel,
+				 const Elf_Internal_Rela *relend)
+{
+  unsigned int val;
+  unsigned long r_symndx;
+  struct elf_link_hash_entry *h;
+  bfd_vma offset;
+  struct elf_x86_64_link_hash_table *htab;
+
+  /* Get the section contents.  */
+  if (contents == NULL)
+    {
+      if (elf_section_data (sec)->this_hdr.contents != NULL)
+	contents = elf_section_data (sec)->this_hdr.contents;
+      else
+	{
+	  /* FIXME: How to better handle error condition?  */
+	  if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+	    return FALSE;
+
+	  /* Cache the section contents for elf_link_input_bfd.  */
+	  elf_section_data (sec)->this_hdr.contents = contents;
+	}
+    }
+
+  htab = elf_x86_64_hash_table (info);
+  offset = rel->r_offset;
+  switch (r_type)
+    {
+    case R_X86_64_TLSGD:
+    case R_X86_64_TLSLD:
+      if ((rel + 1) >= relend)
+	return FALSE;
+
+      if (r_type == R_X86_64_TLSGD)
+	{
+	  /* Check transition from GD access model.  For 64bit, only
+		.byte 0x66; leaq foo@tlsgd(%rip), %rdi
+		.word 0x6666; rex64; call __tls_get_addr
+	     can transit to different access model.  For 32bit, only
+		leaq foo@tlsgd(%rip), %rdi
+		.word 0x6666; rex64; call __tls_get_addr
+	     can transit to different access model.  */
+
+	  static const unsigned char call[] = { 0x66, 0x66, 0x48, 0xe8 };
+	  static const unsigned char leaq[] = { 0x66, 0x48, 0x8d, 0x3d };
+
+	  if ((offset + 12) > sec->size
+	      || memcmp (contents + offset + 4, call, 4) != 0)
+	    return FALSE;
+
+	  if (ABI_64_P (abfd))
+	    {
+	      if (offset < 4
+		  || memcmp (contents + offset - 4, leaq, 4) != 0)
+		return FALSE;
+	    }
+	  else
+	    {
+	      if (offset < 3
+		  || memcmp (contents + offset - 3, leaq + 1, 3) != 0)
+		return FALSE;
+	    }
+	}
+      else
+	{
+	  /* Check transition from LD access model.  Only
+		leaq foo@tlsld(%rip), %rdi;
+		call __tls_get_addr
+	     can transit to different access model.  */
+
+	  static const unsigned char lea[] = { 0x48, 0x8d, 0x3d };
+
+	  if (offset < 3 || (offset + 9) > sec->size)
+	    return FALSE;
+
+	  if (memcmp (contents + offset - 3, lea, 3) != 0
+	      || 0xe8 != *(contents + offset + 4))
+	    return FALSE;
+	}
+
+      r_symndx = htab->r_sym (rel[1].r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+	return FALSE;
+
+      h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+      /* Use strncmp to check __tls_get_addr since __tls_get_addr
+	 may be versioned.  */ 
+      return (h != NULL
+	      && h->root.root.string != NULL
+	      && (ELF32_R_TYPE (rel[1].r_info) == R_X86_64_PC32
+		  || ELF32_R_TYPE (rel[1].r_info) == R_X86_64_PLT32)
+	      && (strncmp (h->root.root.string,
+			   "__tls_get_addr", 14) == 0));
+
+    case R_X86_64_GOTTPOFF:
+      /* Check transition from IE access model:
+		mov foo@gottpoff(%rip), %reg
+		add foo@gottpoff(%rip), %reg
+       */
+
+      /* Check REX prefix first.  */
+      if (offset >= 3 && (offset + 4) <= sec->size)
+	{
+	  val = bfd_get_8 (abfd, contents + offset - 3);
+	  if (val != 0x48 && val != 0x4c)
+	    {
+	      /* X32 may have 0x44 REX prefix or no REX prefix.  */
+	      if (ABI_64_P (abfd))
+		return FALSE;
+	    }
+	}
+      else
+	{
+	  /* X32 may not have any REX prefix.  */
+	  if (ABI_64_P (abfd))
+	    return FALSE;
+	  if (offset < 2 || (offset + 3) > sec->size)
+	    return FALSE;
+	}
+
+      val = bfd_get_8 (abfd, contents + offset - 2);
+      if (val != 0x8b && val != 0x03)
+	return FALSE;
+
+      val = bfd_get_8 (abfd, contents + offset - 1);
+      return (val & 0xc7) == 5;
+
+    case R_X86_64_GOTPC32_TLSDESC:
+      /* Check transition from GDesc access model:
+		leaq x@tlsdesc(%rip), %rax
+
+	 Make sure it's a leaq adding rip to a 32-bit offset
+	 into any register, although it's probably almost always
+	 going to be rax.  */
+
+      if (offset < 3 || (offset + 4) > sec->size)
+	return FALSE;
+
+      val = bfd_get_8 (abfd, contents + offset - 3);
+      if ((val & 0xfb) != 0x48)
+	return FALSE;
+
+      if (bfd_get_8 (abfd, contents + offset - 2) != 0x8d)
+	return FALSE;
+
+      val = bfd_get_8 (abfd, contents + offset - 1);
+      return (val & 0xc7) == 0x05;
+
+    case R_X86_64_TLSDESC_CALL:
+      /* Check transition from GDesc access model:
+		call *x@tlsdesc(%rax)
+       */
+      if (offset + 2 <= sec->size)
+	{
+	  /* Make sure that it's a call *x@tlsdesc(%rax).  */
+	  static const unsigned char call[] = { 0xff, 0x10 };
+	  return memcmp (contents + offset, call, 2) == 0;
+	}
+
+      return FALSE;
+
+    default:
+      abort ();
+    }
+}
+
+/* Return TRUE if the TLS access transition is OK or no transition
+   will be performed.  Update R_TYPE if there is a transition.  */
+
+static bfd_boolean
+elf_x86_64_tls_transition (struct bfd_link_info *info, bfd *abfd,
+			   asection *sec, bfd_byte *contents,
+			   Elf_Internal_Shdr *symtab_hdr,
+			   struct elf_link_hash_entry **sym_hashes,
+			   unsigned int *r_type, int tls_type,
+			   const Elf_Internal_Rela *rel,
+			   const Elf_Internal_Rela *relend,
+			   struct elf_link_hash_entry *h,
+			   unsigned long r_symndx)
+{
+  unsigned int from_type = *r_type;
+  unsigned int to_type = from_type;
+  bfd_boolean check = TRUE;
+
+  /* Skip TLS transition for functions.  */
+  if (h != NULL
+      && (h->type == STT_FUNC
+	  || h->type == STT_GNU_IFUNC))
+    return TRUE;
+
+  switch (from_type)
+    {
+    case R_X86_64_TLSGD:
+    case R_X86_64_GOTPC32_TLSDESC:
+    case R_X86_64_TLSDESC_CALL:
+    case R_X86_64_GOTTPOFF:
+      if (info->executable)
+	{
+	  if (h == NULL)
+	    to_type = R_X86_64_TPOFF32;
+	  else
+	    to_type = R_X86_64_GOTTPOFF;
+	}
+
+      /* When we are called from elf_x86_64_relocate_section,
+	 CONTENTS isn't NULL and there may be additional transitions
+	 based on TLS_TYPE.  */
+      if (contents != NULL)
+	{
+	  unsigned int new_to_type = to_type;
+
+	  if (info->executable
+	      && h != NULL
+	      && h->dynindx == -1
+	      && tls_type == GOT_TLS_IE)
+	    new_to_type = R_X86_64_TPOFF32;
+
+	  if (to_type == R_X86_64_TLSGD
+	      || to_type == R_X86_64_GOTPC32_TLSDESC
+	      || to_type == R_X86_64_TLSDESC_CALL)
+	    {
+	      if (tls_type == GOT_TLS_IE)
+		new_to_type = R_X86_64_GOTTPOFF;
+	    }
+
+	  /* We checked the transition before when we were called from
+	     elf_x86_64_check_relocs.  We only want to check the new
+	     transition which hasn't been checked before.  */
+	  check = new_to_type != to_type && from_type == to_type;
+	  to_type = new_to_type;
+	}
+
+      break;
+
+    case R_X86_64_TLSLD:
+      if (info->executable)
+	to_type = R_X86_64_TPOFF32;
+      break;
+
+    default:
+      return TRUE;
+    }
+
+  /* Return TRUE if there is no transition.  */
+  if (from_type == to_type)
+    return TRUE;
+
+  /* Check if the transition can be performed.  */
+  if (check
+      && ! elf_x86_64_check_tls_transition (abfd, info, sec, contents,
+					    symtab_hdr, sym_hashes,
+					    from_type, rel, relend))
+    {
+      reloc_howto_type *from, *to;
+      const char *name;
+
+      from = elf_x86_64_rtype_to_howto (abfd, from_type);
+      to = elf_x86_64_rtype_to_howto (abfd, to_type);
+
+      if (h)
+	name = h->root.root.string;
+      else
+	{
+	  struct elf_x86_64_link_hash_table *htab;
+
+	  htab = elf_x86_64_hash_table (info);
+	  if (htab == NULL)
+	    name = "*unknown*";
+	  else
+	    {
+	      Elf_Internal_Sym *isym;
+
+	      isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+					    abfd, r_symndx);
+	      name = bfd_elf_sym_name (abfd, symtab_hdr, isym, NULL);
+	    }
+	}
+
+      (*_bfd_error_handler)
+	(_("%B: TLS transition from %s to %s against `%s' at 0x%lx "
+	   "in section `%A' failed"),
+	 abfd, sec, from->name, to->name, name,
+	 (unsigned long) rel->r_offset);
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  *r_type = to_type;
+  return TRUE;
+}
+
+/* Look through the relocs for a section during the first phase, and
+   calculate needed space in the global offset table, procedure
+   linkage table, and dynamic reloc sections.  */
+
+static bfd_boolean
+elf_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info,
+			 asection *sec,
+			 const Elf_Internal_Rela *relocs)
+{
+  struct elf_x86_64_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  asection *sreloc;
+
+  if (info->relocatable)
+    return TRUE;
+
+  BFD_ASSERT (is_x86_64_elf (abfd));
+
+  htab = elf_x86_64_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+
+  sreloc = NULL;
+
+  rel_end = relocs + sec->reloc_count;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      unsigned int r_type;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+      Elf_Internal_Sym *isym;
+      const char *name;
+
+      r_symndx = htab->r_sym (rel->r_info);
+      r_type = ELF32_R_TYPE (rel->r_info);
+
+      if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
+	{
+	  (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
+				 abfd, r_symndx);
+	  return FALSE;
+	}
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  /* A local symbol.  */
+	  isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+					abfd, r_symndx);
+	  if (isym == NULL)
+	    return FALSE;
+
+	  /* Check relocation against local STT_GNU_IFUNC symbol.  */
+	  if (ELF_ST_TYPE (isym->st_info) == STT_GNU_IFUNC)
+	    {
+	      h = elf_x86_64_get_local_sym_hash (htab, abfd, rel,
+						 TRUE);
+	      if (h == NULL)
+		return FALSE;
+
+	      /* Fake a STT_GNU_IFUNC symbol.  */
+	      h->type = STT_GNU_IFUNC;
+	      h->def_regular = 1;
+	      h->ref_regular = 1;
+	      h->forced_local = 1;
+	      h->root.type = bfd_link_hash_defined;
+	    }
+	  else
+	    h = NULL;
+	}
+      else
+	{
+	  isym = NULL;
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      /* Check invalid x32 relocations.  */
+      if (!ABI_64_P (abfd))
+	switch (r_type)
+	  {
+	  default:
+	    break;
+
+	  case R_X86_64_DTPOFF64:
+	  case R_X86_64_TPOFF64:
+	  case R_X86_64_PC64:
+	  case R_X86_64_GOTOFF64:
+	  case R_X86_64_GOT64:
+	  case R_X86_64_GOTPCREL64:
+	  case R_X86_64_GOTPC64:
+	  case R_X86_64_GOTPLT64:
+	  case R_X86_64_PLTOFF64:
+	      {
+		if (h)
+		  name = h->root.root.string;
+		else
+		  name = bfd_elf_sym_name (abfd, symtab_hdr, isym,
+					   NULL);
+		(*_bfd_error_handler)
+		  (_("%B: relocation %s against symbol `%s' isn't "
+		     "supported in x32 mode"), abfd,
+		   x86_64_elf_howto_table[r_type].name, name);
+		bfd_set_error (bfd_error_bad_value);
+		return FALSE;
+	      }
+	    break;
+	  }
+
+      if (h != NULL)
+	{
+	  /* Create the ifunc sections for static executables.  If we
+	     never see an indirect function symbol nor we are building
+	     a static executable, those sections will be empty and
+	     won't appear in output.  */
+	  switch (r_type)
+	    {
+	    default:
+	      break;
+
+	    case R_X86_64_32S:
+	    case R_X86_64_32:
+	    case R_X86_64_64:
+	    case R_X86_64_PC32:
+	    case R_X86_64_PC64:
+	    case R_X86_64_PLT32:
+	    case R_X86_64_GOTPCREL:
+	    case R_X86_64_GOTPCREL64:
+	      if (htab->elf.dynobj == NULL)
+		htab->elf.dynobj = abfd;
+	      if (!_bfd_elf_create_ifunc_sections (htab->elf.dynobj, info))
+		return FALSE;
+	      break;
+	    }
+
+	  /* Since STT_GNU_IFUNC symbol must go through PLT, we handle
+	     it here if it is defined in a non-shared object.  */
+	  if (h->type == STT_GNU_IFUNC
+	      && h->def_regular)
+	    {
+	      /* It is referenced by a non-shared object. */
+	      h->ref_regular = 1;
+	      h->needs_plt = 1;
+
+	      /* STT_GNU_IFUNC symbol must go through PLT.  */
+	      h->plt.refcount += 1;
+
+	      /* STT_GNU_IFUNC needs dynamic sections.  */
+	      if (htab->elf.dynobj == NULL)
+		htab->elf.dynobj = abfd;
+
+	      switch (r_type)
+		{
+		default:
+		  if (h->root.root.string)
+		    name = h->root.root.string;
+		  else
+		    name = bfd_elf_sym_name (abfd, symtab_hdr, isym,
+					     NULL);
+		  (*_bfd_error_handler)
+		    (_("%B: relocation %s against STT_GNU_IFUNC "
+		       "symbol `%s' isn't handled by %s"), abfd,
+		     x86_64_elf_howto_table[r_type].name,
+		     name, __FUNCTION__);
+		  bfd_set_error (bfd_error_bad_value);
+		  return FALSE;
+
+		case R_X86_64_32:
+		  if (ABI_64_P (abfd))
+		    goto not_pointer;
+		case R_X86_64_64:
+		  h->non_got_ref = 1;
+		  h->pointer_equality_needed = 1;
+		  if (info->shared)
+		    {
+		      /* We must copy these reloc types into the output
+			 file.  Create a reloc section in dynobj and
+			 make room for this reloc.  */
+		      sreloc = _bfd_elf_create_ifunc_dyn_reloc
+			(abfd, info, sec, sreloc,
+			 &((struct elf_x86_64_link_hash_entry *) h)->dyn_relocs);
+		      if (sreloc == NULL)
+			return FALSE;
+		    }
+		  break;
+
+		case R_X86_64_32S:
+		case R_X86_64_PC32:
+		case R_X86_64_PC64:
+not_pointer:
+		  h->non_got_ref = 1;
+		  if (r_type != R_X86_64_PC32
+		      && r_type != R_X86_64_PC64)
+		    h->pointer_equality_needed = 1;
+		  break;
+
+		case R_X86_64_PLT32:
+		  break;
+
+		case R_X86_64_GOTPCREL:
+		case R_X86_64_GOTPCREL64:
+		  h->got.refcount += 1;
+		  if (htab->elf.sgot == NULL
+		      && !_bfd_elf_create_got_section (htab->elf.dynobj,
+						       info))
+		    return FALSE;
+		  break;
+		}
+
+	      continue;
+	    }
+	}
+
+      if (! elf_x86_64_tls_transition (info, abfd, sec, NULL,
+				       symtab_hdr, sym_hashes,
+				       &r_type, GOT_UNKNOWN,
+				       rel, rel_end, h, r_symndx))
+	return FALSE;
+
+      switch (r_type)
+	{
+	case R_X86_64_TLSLD:
+	  htab->tls_ld_got.refcount += 1;
+	  goto create_got;
+
+	case R_X86_64_TPOFF32:
+	  if (!info->executable && ABI_64_P (abfd))
+	    {
+	      if (h)
+		name = h->root.root.string;
+	      else
+		name = bfd_elf_sym_name (abfd, symtab_hdr, isym,
+					 NULL);
+	      (*_bfd_error_handler)
+		(_("%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"),
+		 abfd,
+		 x86_64_elf_howto_table[r_type].name, name);
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	  break;
+
+	case R_X86_64_GOTTPOFF:
+	  if (!info->executable)
+	    info->flags |= DF_STATIC_TLS;
+	  /* Fall through */
+
+	case R_X86_64_GOT32:
+	case R_X86_64_GOTPCREL:
+	case R_X86_64_TLSGD:
+	case R_X86_64_GOT64:
+	case R_X86_64_GOTPCREL64:
+	case R_X86_64_GOTPLT64:
+	case R_X86_64_GOTPC32_TLSDESC:
+	case R_X86_64_TLSDESC_CALL:
+	  /* This symbol requires a global offset table entry.	*/
+	  {
+	    int tls_type, old_tls_type;
+
+	    switch (r_type)
+	      {
+	      default: tls_type = GOT_NORMAL; break;
+	      case R_X86_64_TLSGD: tls_type = GOT_TLS_GD; break;
+	      case R_X86_64_GOTTPOFF: tls_type = GOT_TLS_IE; break;
+	      case R_X86_64_GOTPC32_TLSDESC:
+	      case R_X86_64_TLSDESC_CALL:
+		tls_type = GOT_TLS_GDESC; break;
+	      }
+
+	    if (h != NULL)
+	      {
+		if (r_type == R_X86_64_GOTPLT64)
+		  {
+		    /* This relocation indicates that we also need
+		       a PLT entry, as this is a function.  We don't need
+		       a PLT entry for local symbols.  */
+		    h->needs_plt = 1;
+		    h->plt.refcount += 1;
+		  }
+		h->got.refcount += 1;
+		old_tls_type = elf_x86_64_hash_entry (h)->tls_type;
+	      }
+	    else
+	      {
+		bfd_signed_vma *local_got_refcounts;
+
+		/* This is a global offset table entry for a local symbol.  */
+		local_got_refcounts = elf_local_got_refcounts (abfd);
+		if (local_got_refcounts == NULL)
+		  {
+		    bfd_size_type size;
+
+		    size = symtab_hdr->sh_info;
+		    size *= sizeof (bfd_signed_vma)
+		      + sizeof (bfd_vma) + sizeof (char);
+		    local_got_refcounts = ((bfd_signed_vma *)
+					   bfd_zalloc (abfd, size));
+		    if (local_got_refcounts == NULL)
+		      return FALSE;
+		    elf_local_got_refcounts (abfd) = local_got_refcounts;
+		    elf_x86_64_local_tlsdesc_gotent (abfd)
+		      = (bfd_vma *) (local_got_refcounts + symtab_hdr->sh_info);
+		    elf_x86_64_local_got_tls_type (abfd)
+		      = (char *) (local_got_refcounts + 2 * symtab_hdr->sh_info);
+		  }
+		local_got_refcounts[r_symndx] += 1;
+		old_tls_type
+		  = elf_x86_64_local_got_tls_type (abfd) [r_symndx];
+	      }
+
+	    /* If a TLS symbol is accessed using IE at least once,
+	       there is no point to use dynamic model for it.  */
+	    if (old_tls_type != tls_type && old_tls_type != GOT_UNKNOWN
+		&& (! GOT_TLS_GD_ANY_P (old_tls_type)
+		    || tls_type != GOT_TLS_IE))
+	      {
+		if (old_tls_type == GOT_TLS_IE && GOT_TLS_GD_ANY_P (tls_type))
+		  tls_type = old_tls_type;
+		else if (GOT_TLS_GD_ANY_P (old_tls_type)
+			 && GOT_TLS_GD_ANY_P (tls_type))
+		  tls_type |= old_tls_type;
+		else
+		  {
+		    if (h)
+		      name = h->root.root.string;
+		    else
+		      name = bfd_elf_sym_name (abfd, symtab_hdr,
+					       isym, NULL);
+		    (*_bfd_error_handler)
+		      (_("%B: '%s' accessed both as normal and thread local symbol"),
+		       abfd, name);
+		    return FALSE;
+		  }
+	      }
+
+	    if (old_tls_type != tls_type)
+	      {
+		if (h != NULL)
+		  elf_x86_64_hash_entry (h)->tls_type = tls_type;
+		else
+		  elf_x86_64_local_got_tls_type (abfd) [r_symndx] = tls_type;
+	      }
+	  }
+	  /* Fall through */
+
+	case R_X86_64_GOTOFF64:
+	case R_X86_64_GOTPC32:
+	case R_X86_64_GOTPC64:
+	create_got:
+	  if (htab->elf.sgot == NULL)
+	    {
+	      if (htab->elf.dynobj == NULL)
+		htab->elf.dynobj = abfd;
+	      if (!_bfd_elf_create_got_section (htab->elf.dynobj,
+						info))
+		return FALSE;
+	    }
+	  break;
+
+	case R_X86_64_PLT32:
+	  /* This symbol requires a procedure linkage table entry.  We
+	     actually build the entry in adjust_dynamic_symbol,
+	     because this might be a case of linking PIC code which is
+	     never referenced by a dynamic object, in which case we
+	     don't need to generate a procedure linkage table entry
+	     after all.	 */
+
+	  /* If this is a local symbol, we resolve it directly without
+	     creating a procedure linkage table entry.	*/
+	  if (h == NULL)
+	    continue;
+
+	  h->needs_plt = 1;
+	  h->plt.refcount += 1;
+	  break;
+
+	case R_X86_64_PLTOFF64:
+	  /* This tries to form the 'address' of a function relative
+	     to GOT.  For global symbols we need a PLT entry.  */
+	  if (h != NULL)
+	    {
+	      h->needs_plt = 1;
+	      h->plt.refcount += 1;
+	    }
+	  goto create_got;
+
+	case R_X86_64_32:
+	  if (!ABI_64_P (abfd))
+	    goto pointer;
+	case R_X86_64_8:
+	case R_X86_64_16:
+	case R_X86_64_32S:
+	  /* Let's help debug shared library creation.  These relocs
+	     cannot be used in shared libs.  Don't error out for
+	     sections we don't care about, such as debug sections or
+	     non-constant sections.  */
+	  if (info->shared
+	      && (sec->flags & SEC_ALLOC) != 0
+	      && (sec->flags & SEC_READONLY) != 0)
+	    {
+	      if (h)
+		name = h->root.root.string;
+	      else
+		name = bfd_elf_sym_name (abfd, symtab_hdr, isym, NULL);
+	      (*_bfd_error_handler)
+		(_("%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"),
+		 abfd, x86_64_elf_howto_table[r_type].name, name);
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	  /* Fall through.  */
+
+	case R_X86_64_PC8:
+	case R_X86_64_PC16:
+	case R_X86_64_PC32:
+	case R_X86_64_PC64:
+	case R_X86_64_64:
+pointer:
+	  if (h != NULL && info->executable)
+	    {
+	      /* If this reloc is in a read-only section, we might
+		 need a copy reloc.  We can't check reliably at this
+		 stage whether the section is read-only, as input
+		 sections have not yet been mapped to output sections.
+		 Tentatively set the flag for now, and correct in
+		 adjust_dynamic_symbol.  */
+	      h->non_got_ref = 1;
+
+	      /* We may need a .plt entry if the function this reloc
+		 refers to is in a shared lib.  */
+	      h->plt.refcount += 1;
+	      if (r_type != R_X86_64_PC32 && r_type != R_X86_64_PC64)
+		h->pointer_equality_needed = 1;
+	    }
+
+	  /* If we are creating a shared library, and this is a reloc
+	     against a global symbol, or a non PC relative reloc
+	     against a local symbol, then we need to copy the reloc
+	     into the shared library.  However, if we are linking with
+	     -Bsymbolic, we do not need to copy a reloc against a
+	     global symbol which is defined in an object we are
+	     including in the link (i.e., DEF_REGULAR is set).	At
+	     this point we have not seen all the input files, so it is
+	     possible that DEF_REGULAR is not set now but will be set
+	     later (it is never cleared).  In case of a weak definition,
+	     DEF_REGULAR may be cleared later by a strong definition in
+	     a shared library.  We account for that possibility below by
+	     storing information in the relocs_copied field of the hash
+	     table entry.  A similar situation occurs when creating
+	     shared libraries and symbol visibility changes render the
+	     symbol local.
+
+	     If on the other hand, we are creating an executable, we
+	     may need to keep relocations for symbols satisfied by a
+	     dynamic library if we manage to avoid copy relocs for the
+	     symbol.  */
+	  if ((info->shared
+	       && (sec->flags & SEC_ALLOC) != 0
+	       && (! IS_X86_64_PCREL_TYPE (r_type)
+		   || (h != NULL
+		       && (! SYMBOLIC_BIND (info, h)
+			   || h->root.type == bfd_link_hash_defweak
+			   || !h->def_regular))))
+	      || (ELIMINATE_COPY_RELOCS
+		  && !info->shared
+		  && (sec->flags & SEC_ALLOC) != 0
+		  && h != NULL
+		  && (h->root.type == bfd_link_hash_defweak
+		      || !h->def_regular)))
+	    {
+	      struct elf_dyn_relocs *p;
+	      struct elf_dyn_relocs **head;
+
+	      /* We must copy these reloc types into the output file.
+		 Create a reloc section in dynobj and make room for
+		 this reloc.  */
+	      if (sreloc == NULL)
+		{
+		  if (htab->elf.dynobj == NULL)
+		    htab->elf.dynobj = abfd;
+
+		  sreloc = _bfd_elf_make_dynamic_reloc_section
+		    (sec, htab->elf.dynobj, ABI_64_P (abfd) ? 3 : 2,
+		     abfd, /*rela?*/ TRUE);
+
+		  if (sreloc == NULL)
+		    return FALSE;
+		}
+
+	      /* If this is a global symbol, we count the number of
+		 relocations we need for this symbol.  */
+	      if (h != NULL)
+		{
+		  head = &((struct elf_x86_64_link_hash_entry *) h)->dyn_relocs;
+		}
+	      else
+		{
+		  /* Track dynamic relocs needed for local syms too.
+		     We really need local syms available to do this
+		     easily.  Oh well.  */
+		  asection *s;
+		  void **vpp;
+
+		  isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+						abfd, r_symndx);
+		  if (isym == NULL)
+		    return FALSE;
+
+		  s = bfd_section_from_elf_index (abfd, isym->st_shndx);
+		  if (s == NULL)
+		    s = sec;
+
+		  /* Beware of type punned pointers vs strict aliasing
+		     rules.  */
+		  vpp = &(elf_section_data (s)->local_dynrel);
+		  head = (struct elf_dyn_relocs **)vpp;
+		}
+
+	      p = *head;
+	      if (p == NULL || p->sec != sec)
+		{
+		  bfd_size_type amt = sizeof *p;
+
+		  p = ((struct elf_dyn_relocs *)
+		       bfd_alloc (htab->elf.dynobj, amt));
+		  if (p == NULL)
+		    return FALSE;
+		  p->next = *head;
+		  *head = p;
+		  p->sec = sec;
+		  p->count = 0;
+		  p->pc_count = 0;
+		}
+
+	      p->count += 1;
+	      if (IS_X86_64_PCREL_TYPE (r_type))
+		p->pc_count += 1;
+	    }
+	  break;
+
+	  /* This relocation describes the C++ object vtable hierarchy.
+	     Reconstruct it for later use during GC.  */
+	case R_X86_64_GNU_VTINHERIT:
+	  if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+	    return FALSE;
+	  break;
+
+	  /* This relocation describes which C++ vtable entries are actually
+	     used.  Record for later use during GC.  */
+	case R_X86_64_GNU_VTENTRY:
+	  BFD_ASSERT (h != NULL);
+	  if (h != NULL
+	      && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+	    return FALSE;
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.	*/
+
+static asection *
+elf_x86_64_gc_mark_hook (asection *sec,
+			 struct bfd_link_info *info,
+			 Elf_Internal_Rela *rel,
+			 struct elf_link_hash_entry *h,
+			 Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (ELF32_R_TYPE (rel->r_info))
+      {
+      case R_X86_64_GNU_VTINHERIT:
+      case R_X86_64_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Update the got entry reference counts for the section being removed.	 */
+
+static bfd_boolean
+elf_x86_64_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info,
+			  asection *sec,
+			  const Elf_Internal_Rela *relocs)
+{
+  struct elf_x86_64_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  const Elf_Internal_Rela *rel, *relend;
+
+  if (info->relocatable)
+    return TRUE;
+
+  htab = elf_x86_64_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  elf_section_data (sec)->local_dynrel = NULL;
+
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+
+  htab = elf_x86_64_hash_table (info);
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      unsigned int r_type;
+      struct elf_link_hash_entry *h = NULL;
+
+      r_symndx = htab->r_sym (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+      else
+	{
+	  /* A local symbol.  */
+	  Elf_Internal_Sym *isym;
+
+	  isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+					abfd, r_symndx);
+
+	  /* Check relocation against local STT_GNU_IFUNC symbol.  */
+	  if (isym != NULL
+	      && ELF_ST_TYPE (isym->st_info) == STT_GNU_IFUNC)
+	    {
+	      h = elf_x86_64_get_local_sym_hash (htab, abfd, rel, FALSE);
+	      if (h == NULL)
+		abort ();
+	    }
+	}
+
+      if (h)
+	{
+	  struct elf_x86_64_link_hash_entry *eh;
+	  struct elf_dyn_relocs **pp;
+	  struct elf_dyn_relocs *p;
+
+	  eh = (struct elf_x86_64_link_hash_entry *) h;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
+	    if (p->sec == sec)
+	      {
+		/* Everything must go for SEC.  */
+		*pp = p->next;
+		break;
+	      }
+	}
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      if (! elf_x86_64_tls_transition (info, abfd, sec, NULL,
+				       symtab_hdr, sym_hashes,
+				       &r_type, GOT_UNKNOWN,
+				       rel, relend, h, r_symndx))
+	return FALSE;
+
+      switch (r_type)
+	{
+	case R_X86_64_TLSLD:
+	  if (htab->tls_ld_got.refcount > 0)
+	    htab->tls_ld_got.refcount -= 1;
+	  break;
+
+	case R_X86_64_TLSGD:
+	case R_X86_64_GOTPC32_TLSDESC:
+	case R_X86_64_TLSDESC_CALL:
+	case R_X86_64_GOTTPOFF:
+	case R_X86_64_GOT32:
+	case R_X86_64_GOTPCREL:
+	case R_X86_64_GOT64:
+	case R_X86_64_GOTPCREL64:
+	case R_X86_64_GOTPLT64:
+	  if (h != NULL)
+	    {
+	      if (r_type == R_X86_64_GOTPLT64 && h->plt.refcount > 0)
+	        h->plt.refcount -= 1;
+	      if (h->got.refcount > 0)
+		h->got.refcount -= 1;
+	      if (h->type == STT_GNU_IFUNC)
+		{
+		  if (h->plt.refcount > 0)
+		    h->plt.refcount -= 1;
+		}
+	    }
+	  else if (local_got_refcounts != NULL)
+	    {
+	      if (local_got_refcounts[r_symndx] > 0)
+		local_got_refcounts[r_symndx] -= 1;
+	    }
+	  break;
+
+	case R_X86_64_8:
+	case R_X86_64_16:
+	case R_X86_64_32:
+	case R_X86_64_64:
+	case R_X86_64_32S:
+	case R_X86_64_PC8:
+	case R_X86_64_PC16:
+	case R_X86_64_PC32:
+	case R_X86_64_PC64:
+	  if (info->shared
+	      && (h == NULL || h->type != STT_GNU_IFUNC))
+	    break;
+	  /* Fall thru */
+
+	case R_X86_64_PLT32:
+	case R_X86_64_PLTOFF64:
+	  if (h != NULL)
+	    {
+	      if (h->plt.refcount > 0)
+		h->plt.refcount -= 1;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.	*/
+
+static bfd_boolean
+elf_x86_64_adjust_dynamic_symbol (struct bfd_link_info *info,
+				  struct elf_link_hash_entry *h)
+{
+  struct elf_x86_64_link_hash_table *htab;
+  asection *s;
+
+  /* STT_GNU_IFUNC symbol must go through PLT. */
+  if (h->type == STT_GNU_IFUNC)
+    {
+      if (h->plt.refcount <= 0)
+	{
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	}
+      return TRUE;
+    }
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later,
+     when we know the address of the .got section.  */
+  if (h->type == STT_FUNC
+      || h->needs_plt)
+    {
+      if (h->plt.refcount <= 0
+	  || SYMBOL_CALLS_LOCAL (info, h)
+	  || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+	      && h->root.type == bfd_link_hash_undefweak))
+	{
+	  /* This case can occur if we saw a PLT32 reloc in an input
+	     file, but the symbol was never referred to by a dynamic
+	     object, or if all references were garbage collected.  In
+	     such a case, we don't actually need to build a procedure
+	     linkage table, and we can just do a PC32 reloc instead.  */
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	}
+
+      return TRUE;
+    }
+  else
+    /* It's possible that we incorrectly decided a .plt reloc was
+       needed for an R_X86_64_PC32 reloc to a non-function sym in
+       check_relocs.  We can't decide accurately between function and
+       non-function syms in check-relocs;  Objects loaded later in
+       the link may change h->type.  So fix it now.  */
+    h->plt.offset = (bfd_vma) -1;
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.	 */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      if (ELIMINATE_COPY_RELOCS || info->nocopyreloc)
+	h->non_got_ref = h->u.weakdef->non_got_ref;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.	 */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.	*/
+  if (info->shared)
+    return TRUE;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if (!h->non_got_ref)
+    return TRUE;
+
+  /* If -z nocopyreloc was given, we won't generate them either.  */
+  if (info->nocopyreloc)
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  if (ELIMINATE_COPY_RELOCS)
+    {
+      struct elf_x86_64_link_hash_entry * eh;
+      struct elf_dyn_relocs *p;
+
+      eh = (struct elf_x86_64_link_hash_entry *) h;
+      for (p = eh->dyn_relocs; p != NULL; p = p->next)
+	{
+	  s = p->sec->output_section;
+	  if (s != NULL && (s->flags & SEC_READONLY) != 0)
+	    break;
+	}
+
+      /* If we didn't find any dynamic relocs in read-only sections, then
+	 we'll be keeping the dynamic relocs and avoiding the copy reloc.  */
+      if (p == NULL)
+	{
+	  h->non_got_ref = 0;
+	  return TRUE;
+	}
+    }
+
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.	 There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  htab = elf_x86_64_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* We must generate a R_X86_64_COPY reloc to tell the dynamic linker
+     to copy the initial value out of the dynamic object and into the
+     runtime process image.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      const struct elf_backend_data *bed;
+      bed = get_elf_backend_data (info->output_bfd);
+      htab->srelbss->size += bed->s->sizeof_rela;
+      h->needs_copy = 1;
+    }
+
+  s = htab->sdynbss;
+
+  return _bfd_elf_adjust_dynamic_copy (h, s);
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   dynamic relocs.  */
+
+static bfd_boolean
+elf_x86_64_allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
+{
+  struct bfd_link_info *info;
+  struct elf_x86_64_link_hash_table *htab;
+  struct elf_x86_64_link_hash_entry *eh;
+  struct elf_dyn_relocs *p;
+  const struct elf_backend_data *bed;
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  eh = (struct elf_x86_64_link_hash_entry *) h;
+
+  info = (struct bfd_link_info *) inf;
+  htab = elf_x86_64_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+  bed = get_elf_backend_data (info->output_bfd);
+
+  /* Since STT_GNU_IFUNC symbol must go through PLT, we handle it
+     here if it is defined and referenced in a non-shared object.  */
+  if (h->type == STT_GNU_IFUNC
+      && h->def_regular)
+    return _bfd_elf_allocate_ifunc_dyn_relocs (info, h,
+					       &eh->dyn_relocs,
+					       PLT_ENTRY_SIZE,
+					       GOT_ENTRY_SIZE);
+  else if (htab->elf.dynamic_sections_created
+	   && h->plt.refcount > 0)
+    {
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      if (info->shared
+	  || WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, 0, h))
+	{
+	  asection *s = htab->elf.splt;
+
+	  /* If this is the first .plt entry, make room for the special
+	     first entry.  */
+	  if (s->size == 0)
+	    s->size += PLT_ENTRY_SIZE;
+
+	  h->plt.offset = s->size;
+
+	  /* If this symbol is not defined in a regular file, and we are
+	     not generating a shared library, then set the symbol to this
+	     location in the .plt.  This is required to make function
+	     pointers compare as equal between the normal executable and
+	     the shared library.  */
+	  if (! info->shared
+	      && !h->def_regular)
+	    {
+	      h->root.u.def.section = s;
+	      h->root.u.def.value = h->plt.offset;
+	    }
+
+	  /* Make room for this entry.  */
+	  s->size += PLT_ENTRY_SIZE;
+
+	  /* We also need to make an entry in the .got.plt section, which
+	     will be placed in the .got section by the linker script.  */
+	  htab->elf.sgotplt->size += GOT_ENTRY_SIZE;
+
+	  /* We also need to make an entry in the .rela.plt section.  */
+	  htab->elf.srelplt->size += bed->s->sizeof_rela;
+	  htab->elf.srelplt->reloc_count++;
+	}
+      else
+	{
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	}
+    }
+  else
+    {
+      h->plt.offset = (bfd_vma) -1;
+      h->needs_plt = 0;
+    }
+
+  eh->tlsdesc_got = (bfd_vma) -1;
+
+  /* If R_X86_64_GOTTPOFF symbol is now local to the binary,
+     make it a R_X86_64_TPOFF32 requiring no GOT entry.  */
+  if (h->got.refcount > 0
+      && info->executable
+      && h->dynindx == -1
+      && elf_x86_64_hash_entry (h)->tls_type == GOT_TLS_IE)
+    {
+      h->got.offset = (bfd_vma) -1;
+    }
+  else if (h->got.refcount > 0)
+    {
+      asection *s;
+      bfd_boolean dyn;
+      int tls_type = elf_x86_64_hash_entry (h)->tls_type;
+
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      if (GOT_TLS_GDESC_P (tls_type))
+	{
+	  eh->tlsdesc_got = htab->elf.sgotplt->size
+	    - elf_x86_64_compute_jump_table_size (htab);
+	  htab->elf.sgotplt->size += 2 * GOT_ENTRY_SIZE;
+	  h->got.offset = (bfd_vma) -2;
+	}
+      if (! GOT_TLS_GDESC_P (tls_type)
+	  || GOT_TLS_GD_P (tls_type))
+	{
+	  s = htab->elf.sgot;
+	  h->got.offset = s->size;
+	  s->size += GOT_ENTRY_SIZE;
+	  if (GOT_TLS_GD_P (tls_type))
+	    s->size += GOT_ENTRY_SIZE;
+	}
+      dyn = htab->elf.dynamic_sections_created;
+      /* R_X86_64_TLSGD needs one dynamic relocation if local symbol
+	 and two if global.
+	 R_X86_64_GOTTPOFF needs one dynamic relocation.  */
+      if ((GOT_TLS_GD_P (tls_type) && h->dynindx == -1)
+	  || tls_type == GOT_TLS_IE)
+	htab->elf.srelgot->size += bed->s->sizeof_rela;
+      else if (GOT_TLS_GD_P (tls_type))
+	htab->elf.srelgot->size += 2 * bed->s->sizeof_rela;
+      else if (! GOT_TLS_GDESC_P (tls_type)
+	       && (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		   || h->root.type != bfd_link_hash_undefweak)
+	       && (info->shared
+		   || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h)))
+	htab->elf.srelgot->size += bed->s->sizeof_rela;
+      if (GOT_TLS_GDESC_P (tls_type))
+	{
+	  htab->elf.srelplt->size += bed->s->sizeof_rela;
+	  htab->tlsdesc_plt = (bfd_vma) -1;
+	}
+    }
+  else
+    h->got.offset = (bfd_vma) -1;
+
+  if (eh->dyn_relocs == NULL)
+    return TRUE;
+
+  /* In the shared -Bsymbolic case, discard space allocated for
+     dynamic pc-relative relocs against symbols which turn out to be
+     defined in regular objects.  For the normal shared case, discard
+     space for pc-relative relocs that have become local due to symbol
+     visibility changes.  */
+
+  if (info->shared)
+    {
+      /* Relocs that use pc_count are those that appear on a call
+	 insn, or certain REL relocs that can generated via assembly.
+	 We want calls to protected symbols to resolve directly to the
+	 function rather than going via the plt.  If people want
+	 function pointer comparisons to work as expected then they
+	 should avoid writing weird assembly.  */
+      if (SYMBOL_CALLS_LOCAL (info, h))
+	{
+	  struct elf_dyn_relocs **pp;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      p->count -= p->pc_count;
+	      p->pc_count = 0;
+	      if (p->count == 0)
+		*pp = p->next;
+	      else
+		pp = &p->next;
+	    }
+	}
+
+      /* Also discard relocs on undefined weak syms with non-default
+	 visibility.  */
+      if (eh->dyn_relocs != NULL
+	  && h->root.type == bfd_link_hash_undefweak)
+	{
+	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	    eh->dyn_relocs = NULL;
+
+	  /* Make sure undefined weak symbols are output as a dynamic
+	     symbol in PIEs.  */
+	  else if (h->dynindx == -1
+		   && ! h->forced_local
+		   && ! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+    }
+  else if (ELIMINATE_COPY_RELOCS)
+    {
+      /* For the non-shared case, discard space for relocs against
+	 symbols which turn out to need copy relocs or are not
+	 dynamic.  */
+
+      if (!h->non_got_ref
+	  && ((h->def_dynamic
+	       && !h->def_regular)
+	      || (htab->elf.dynamic_sections_created
+		  && (h->root.type == bfd_link_hash_undefweak
+		      || h->root.type == bfd_link_hash_undefined))))
+	{
+	  /* Make sure this symbol is output as a dynamic symbol.
+	     Undefined weak syms won't yet be marked as dynamic.  */
+	  if (h->dynindx == -1
+	      && ! h->forced_local
+	      && ! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+
+	  /* If that succeeded, we know we'll be keeping all the
+	     relocs.  */
+	  if (h->dynindx != -1)
+	    goto keep;
+	}
+
+      eh->dyn_relocs = NULL;
+
+    keep: ;
+    }
+
+  /* Finally, allocate space.  */
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection * sreloc;
+
+      sreloc = elf_section_data (p->sec)->sreloc;
+
+      BFD_ASSERT (sreloc != NULL);
+
+      sreloc->size += p->count * bed->s->sizeof_rela;
+    }
+
+  return TRUE;
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   local dynamic relocs.  */
+
+static bfd_boolean
+elf_x86_64_allocate_local_dynrelocs (void **slot, void *inf)
+{
+  struct elf_link_hash_entry *h
+    = (struct elf_link_hash_entry *) *slot;
+
+  if (h->type != STT_GNU_IFUNC
+      || !h->def_regular
+      || !h->ref_regular
+      || !h->forced_local
+      || h->root.type != bfd_link_hash_defined)
+    abort ();
+
+  return elf_x86_64_allocate_dynrelocs (h, inf);
+}
+
+/* Find any dynamic relocs that apply to read-only sections.  */
+
+static bfd_boolean
+elf_x86_64_readonly_dynrelocs (struct elf_link_hash_entry *h,
+			       void * inf)
+{
+  struct elf_x86_64_link_hash_entry *eh;
+  struct elf_dyn_relocs *p;
+
+  /* Skip local IFUNC symbols. */
+  if (h->forced_local && h->type == STT_GNU_IFUNC)
+    return TRUE;
+
+  eh = (struct elf_x86_64_link_hash_entry *) h;
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *s = p->sec->output_section;
+
+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
+	{
+	  struct bfd_link_info *info = (struct bfd_link_info *) inf;
+
+	  info->flags |= DF_TEXTREL;
+
+	  if (info->warn_shared_textrel && info->shared)
+	    info->callbacks->einfo (_("%P: %B: warning: relocation against `%s' in readonly section `%A'.\n"),
+				    p->sec->owner, h->root.root.string,
+				    p->sec);
+
+	  /* Not an error, just cut short the traversal.  */
+	  return FALSE;
+	}
+    }
+  return TRUE;
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+static bfd_boolean
+elf_x86_64_size_dynamic_sections (bfd *output_bfd,
+				  struct bfd_link_info *info)
+{
+  struct elf_x86_64_link_hash_table *htab;
+  bfd *dynobj;
+  asection *s;
+  bfd_boolean relocs;
+  bfd *ibfd;
+  const struct elf_backend_data *bed;
+
+  htab = elf_x86_64_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+  bed = get_elf_backend_data (output_bfd);
+
+  dynobj = htab->elf.dynobj;
+  if (dynobj == NULL)
+    abort ();
+
+  if (htab->elf.dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  if (s == NULL)
+	    abort ();
+	  s->size = htab->dynamic_interpreter_size;
+	  s->contents = (unsigned char *) htab->dynamic_interpreter;
+	}
+    }
+
+  /* Set up .got offsets for local syms, and space for local dynamic
+     relocs.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      bfd_signed_vma *local_got;
+      bfd_signed_vma *end_local_got;
+      char *local_tls_type;
+      bfd_vma *local_tlsdesc_gotent;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *srel;
+
+      if (! is_x86_64_elf (ibfd))
+	continue;
+
+      for (s = ibfd->sections; s != NULL; s = s->next)
+	{
+	  struct elf_dyn_relocs *p;
+
+	  for (p = (struct elf_dyn_relocs *)
+		    (elf_section_data (s)->local_dynrel);
+	       p != NULL;
+	       p = p->next)
+	    {
+	      if (!bfd_is_abs_section (p->sec)
+		  && bfd_is_abs_section (p->sec->output_section))
+		{
+		  /* Input section has been discarded, either because
+		     it is a copy of a linkonce section or due to
+		     linker script /DISCARD/, so we'll be discarding
+		     the relocs too.  */
+		}
+	      else if (p->count != 0)
+		{
+		  srel = elf_section_data (p->sec)->sreloc;
+		  srel->size += p->count * bed->s->sizeof_rela;
+		  if ((p->sec->output_section->flags & SEC_READONLY) != 0
+		      && (info->flags & DF_TEXTREL) == 0)
+		    {
+		      info->flags |= DF_TEXTREL;
+		      if (info->warn_shared_textrel && info->shared)
+			info->callbacks->einfo (_("%P: %B: warning: relocation in readonly section `%A'.\n"),
+						p->sec->owner, p->sec);
+		    }
+		}
+	    }
+	}
+
+      local_got = elf_local_got_refcounts (ibfd);
+      if (!local_got)
+	continue;
+
+      symtab_hdr = &elf_symtab_hdr (ibfd);
+      locsymcount = symtab_hdr->sh_info;
+      end_local_got = local_got + locsymcount;
+      local_tls_type = elf_x86_64_local_got_tls_type (ibfd);
+      local_tlsdesc_gotent = elf_x86_64_local_tlsdesc_gotent (ibfd);
+      s = htab->elf.sgot;
+      srel = htab->elf.srelgot;
+      for (; local_got < end_local_got;
+	   ++local_got, ++local_tls_type, ++local_tlsdesc_gotent)
+	{
+	  *local_tlsdesc_gotent = (bfd_vma) -1;
+	  if (*local_got > 0)
+	    {
+	      if (GOT_TLS_GDESC_P (*local_tls_type))
+		{
+		  *local_tlsdesc_gotent = htab->elf.sgotplt->size
+		    - elf_x86_64_compute_jump_table_size (htab);
+		  htab->elf.sgotplt->size += 2 * GOT_ENTRY_SIZE;
+		  *local_got = (bfd_vma) -2;
+		}
+	      if (! GOT_TLS_GDESC_P (*local_tls_type)
+		  || GOT_TLS_GD_P (*local_tls_type))
+		{
+		  *local_got = s->size;
+		  s->size += GOT_ENTRY_SIZE;
+		  if (GOT_TLS_GD_P (*local_tls_type))
+		    s->size += GOT_ENTRY_SIZE;
+		}
+	      if (info->shared
+		  || GOT_TLS_GD_ANY_P (*local_tls_type)
+		  || *local_tls_type == GOT_TLS_IE)
+		{
+		  if (GOT_TLS_GDESC_P (*local_tls_type))
+		    {
+		      htab->elf.srelplt->size
+			+= bed->s->sizeof_rela;
+		      htab->tlsdesc_plt = (bfd_vma) -1;
+		    }
+		  if (! GOT_TLS_GDESC_P (*local_tls_type)
+		      || GOT_TLS_GD_P (*local_tls_type))
+		    srel->size += bed->s->sizeof_rela;
+		}
+	    }
+	  else
+	    *local_got = (bfd_vma) -1;
+	}
+    }
+
+  if (htab->tls_ld_got.refcount > 0)
+    {
+      /* Allocate 2 got entries and 1 dynamic reloc for R_X86_64_TLSLD
+	 relocs.  */
+      htab->tls_ld_got.offset = htab->elf.sgot->size;
+      htab->elf.sgot->size += 2 * GOT_ENTRY_SIZE;
+      htab->elf.srelgot->size += bed->s->sizeof_rela;
+    }
+  else
+    htab->tls_ld_got.offset = -1;
+
+  /* Allocate global sym .plt and .got entries, and space for global
+     sym dynamic relocs.  */
+  elf_link_hash_traverse (&htab->elf, elf_x86_64_allocate_dynrelocs,
+			  info);
+
+  /* Allocate .plt and .got entries, and space for local symbols.  */
+  htab_traverse (htab->loc_hash_table,
+		 elf_x86_64_allocate_local_dynrelocs,
+		 info);
+
+  /* For every jump slot reserved in the sgotplt, reloc_count is
+     incremented.  However, when we reserve space for TLS descriptors,
+     it's not incremented, so in order to compute the space reserved
+     for them, it suffices to multiply the reloc count by the jump
+     slot size.  */
+  if (htab->elf.srelplt)
+    htab->sgotplt_jump_table_size
+      = elf_x86_64_compute_jump_table_size (htab);
+
+  if (htab->tlsdesc_plt)
+    {
+      /* If we're not using lazy TLS relocations, don't generate the
+	 PLT and GOT entries they require.  */
+      if ((info->flags & DF_BIND_NOW))
+	htab->tlsdesc_plt = 0;
+      else
+	{
+	  htab->tlsdesc_got = htab->elf.sgot->size;
+	  htab->elf.sgot->size += GOT_ENTRY_SIZE;
+	  /* Reserve room for the initial entry.
+	     FIXME: we could probably do away with it in this case.  */
+	  if (htab->elf.splt->size == 0)
+	    htab->elf.splt->size += PLT_ENTRY_SIZE;
+	  htab->tlsdesc_plt = htab->elf.splt->size;
+	  htab->elf.splt->size += PLT_ENTRY_SIZE;
+	}
+    }
+
+  if (htab->elf.sgotplt)
+    {
+      struct elf_link_hash_entry *got;
+      got = elf_link_hash_lookup (elf_hash_table (info),
+				  "_GLOBAL_OFFSET_TABLE_",
+				  FALSE, FALSE, FALSE);
+
+      /* Don't allocate .got.plt section if there are no GOT nor PLT
+         entries and there is no refeence to _GLOBAL_OFFSET_TABLE_.  */
+      if ((got == NULL
+	   || !got->ref_regular_nonweak)
+	  && (htab->elf.sgotplt->size
+	      == get_elf_backend_data (output_bfd)->got_header_size)
+	  && (htab->elf.splt == NULL
+	      || htab->elf.splt->size == 0)
+	  && (htab->elf.sgot == NULL
+	      || htab->elf.sgot->size == 0)
+	  && (htab->elf.iplt == NULL
+	      || htab->elf.iplt->size == 0)
+	  && (htab->elf.igotplt == NULL
+	      || htab->elf.igotplt->size == 0))
+	htab->elf.sgotplt->size = 0;
+    }
+
+  /* We now have determined the sizes of the various dynamic sections.
+     Allocate memory for them.  */
+  relocs = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      if (s == htab->elf.splt
+	  || s == htab->elf.sgot
+	  || s == htab->elf.sgotplt
+	  || s == htab->elf.iplt
+	  || s == htab->elf.igotplt
+	  || s == htab->sdynbss)
+	{
+	  /* Strip this section if we don't need it; see the
+	     comment below.  */
+	}
+      else if (CONST_STRNEQ (bfd_get_section_name (dynobj, s), ".rela"))
+	{
+	  if (s->size != 0 && s != htab->elf.srelplt)
+	    relocs = TRUE;
+
+	  /* We use the reloc_count field as a counter if we need
+	     to copy relocs into the output file.  */
+	  if (s != htab->elf.srelplt)
+	    s->reloc_count = 0;
+	}
+      else
+	{
+	  /* It's not one of our sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (s->size == 0)
+	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is mostly to handle .rela.bss and
+	     .rela.plt.  We must create both sections in
+	     create_dynamic_sections, because they must be created
+	     before the linker maps input sections to output
+	     sections.  The linker does that before
+	     adjust_dynamic_symbol is called, and it is that
+	     function which decides whether anything needs to go
+	     into these sections.  */
+
+	  s->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents.  We use bfd_zalloc
+	 here in case unused entries are not reclaimed before the
+	 section's contents are written out.  This should not happen,
+	 but this way if it does, we get a R_X86_64_NONE reloc instead
+	 of garbage.  */
+      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+
+  if (htab->plt_eh_frame != NULL
+      && htab->elf.splt != NULL
+      && htab->elf.splt->size != 0
+      && (htab->elf.splt->flags & SEC_EXCLUDE) == 0)
+    bfd_put_32 (dynobj, htab->elf.splt->size,
+		htab->plt_eh_frame->contents + PLT_FDE_LEN_OFFSET);
+
+  if (htab->elf.dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in elf_x86_64_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.	The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (info->executable)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (htab->elf.splt->size != 0)
+	{
+	  if (!add_dynamic_entry (DT_PLTGOT, 0)
+	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+	      || !add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+
+	  if (htab->tlsdesc_plt
+	      && (!add_dynamic_entry (DT_TLSDESC_PLT, 0)
+		  || !add_dynamic_entry (DT_TLSDESC_GOT, 0)))
+	    return FALSE;
+	}
+
+      if (relocs)
+	{
+	  if (!add_dynamic_entry (DT_RELA, 0)
+	      || !add_dynamic_entry (DT_RELASZ, 0)
+	      || !add_dynamic_entry (DT_RELAENT, bed->s->sizeof_rela))
+	    return FALSE;
+
+	  /* If any dynamic relocs apply to a read-only section,
+	     then we need a DT_TEXTREL entry.  */
+	  if ((info->flags & DF_TEXTREL) == 0)
+	    elf_link_hash_traverse (&htab->elf, 
+				    elf_x86_64_readonly_dynrelocs,
+				    info);
+
+	  if ((info->flags & DF_TEXTREL) != 0)
+	    {
+	      if (!add_dynamic_entry (DT_TEXTREL, 0))
+		return FALSE;
+	    }
+	}
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf_x86_64_always_size_sections (bfd *output_bfd,
+				 struct bfd_link_info *info)
+{
+  asection *tls_sec = elf_hash_table (info)->tls_sec;
+
+  if (tls_sec)
+    {
+      struct elf_link_hash_entry *tlsbase;
+
+      tlsbase = elf_link_hash_lookup (elf_hash_table (info),
+				      "_TLS_MODULE_BASE_",
+				      FALSE, FALSE, FALSE);
+
+      if (tlsbase && tlsbase->type == STT_TLS)
+	{
+	  struct elf_x86_64_link_hash_table *htab;
+	  struct bfd_link_hash_entry *bh = NULL;
+	  const struct elf_backend_data *bed
+	    = get_elf_backend_data (output_bfd);
+
+	  htab = elf_x86_64_hash_table (info);
+	  if (htab == NULL)
+	    return FALSE;
+
+	  if (!(_bfd_generic_link_add_one_symbol
+		(info, output_bfd, "_TLS_MODULE_BASE_", BSF_LOCAL,
+		 tls_sec, 0, NULL, FALSE,
+		 bed->collect, &bh)))
+	    return FALSE;
+
+	  htab->tls_module_base = bh;
+
+	  tlsbase = (struct elf_link_hash_entry *)bh;
+	  tlsbase->def_regular = 1;
+	  tlsbase->other = STV_HIDDEN;
+	  (*bed->elf_backend_hide_symbol) (info, tlsbase, TRUE);
+	}
+    }
+
+  return TRUE;
+}
+
+/* _TLS_MODULE_BASE_ needs to be treated especially when linking
+   executables.  Rather than setting it to the beginning of the TLS
+   section, we have to set it to the end.  This function may be called
+   multiple times, it is idempotent.  */
+
+static void
+elf_x86_64_set_tls_module_base (struct bfd_link_info *info)
+{
+  struct elf_x86_64_link_hash_table *htab;
+  struct bfd_link_hash_entry *base;
+
+  if (!info->executable)
+    return;
+
+  htab = elf_x86_64_hash_table (info);
+  if (htab == NULL)
+    return;
+
+  base = htab->tls_module_base;
+  if (base == NULL)
+    return;
+
+  base->u.def.value = htab->elf.tls_size;
+}
+
+/* Return the base VMA address which should be subtracted from real addresses
+   when resolving @dtpoff relocation.
+   This is PT_TLS segment p_vaddr.  */
+
+static bfd_vma
+elf_x86_64_dtpoff_base (struct bfd_link_info *info)
+{
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (elf_hash_table (info)->tls_sec == NULL)
+    return 0;
+  return elf_hash_table (info)->tls_sec->vma;
+}
+
+/* Return the relocation value for @tpoff relocation
+   if STT_TLS virtual address is ADDRESS.  */
+
+static bfd_vma
+elf_x86_64_tpoff (struct bfd_link_info *info, bfd_vma address)
+{
+  struct elf_link_hash_table *htab = elf_hash_table (info);
+  const struct elf_backend_data *bed = get_elf_backend_data (info->output_bfd);
+  bfd_vma static_tls_size;
+
+  /* If tls_segment is NULL, we should have signalled an error already.  */
+  if (htab->tls_sec == NULL)
+    return 0;
+
+  /* Consider special static TLS alignment requirements.  */
+  static_tls_size = BFD_ALIGN (htab->tls_size, bed->static_tls_alignment);
+  return address - static_tls_size - htab->tls_sec->vma;
+}
+
+/* Is the instruction before OFFSET in CONTENTS a 32bit relative
+   branch?  */
+
+static bfd_boolean
+is_32bit_relative_branch (bfd_byte *contents, bfd_vma offset)
+{
+  /* Opcode		Instruction
+     0xe8		call
+     0xe9		jump
+     0x0f 0x8x		conditional jump */
+  return ((offset > 0
+	   && (contents [offset - 1] == 0xe8
+	       || contents [offset - 1] == 0xe9))
+	  || (offset > 1
+	      && contents [offset - 2] == 0x0f
+	      && (contents [offset - 1] & 0xf0) == 0x80));
+}
+
+/* Relocate an x86_64 ELF section.  */
+
+static bfd_boolean
+elf_x86_64_relocate_section (bfd *output_bfd,
+			     struct bfd_link_info *info,
+			     bfd *input_bfd,
+			     asection *input_section,
+			     bfd_byte *contents,
+			     Elf_Internal_Rela *relocs,
+			     Elf_Internal_Sym *local_syms,
+			     asection **local_sections)
+{
+  struct elf_x86_64_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_vma *local_got_offsets;
+  bfd_vma *local_tlsdesc_gotents;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+
+  BFD_ASSERT (is_x86_64_elf (input_bfd));
+
+  htab = elf_x86_64_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+  symtab_hdr = &elf_symtab_hdr (input_bfd);
+  sym_hashes = elf_sym_hashes (input_bfd);
+  local_got_offsets = elf_local_got_offsets (input_bfd);
+  local_tlsdesc_gotents = elf_x86_64_local_tlsdesc_gotent (input_bfd);
+
+  elf_x86_64_set_tls_module_base (info);
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; rel++)
+    {
+      unsigned int r_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      bfd_vma off, offplt;
+      bfd_vma relocation;
+      bfd_boolean unresolved_reloc;
+      bfd_reloc_status_type r;
+      int tls_type;
+      asection *base_got;
+
+      r_type = ELF32_R_TYPE (rel->r_info);
+      if (r_type == (int) R_X86_64_GNU_VTINHERIT
+	  || r_type == (int) R_X86_64_GNU_VTENTRY)
+	continue;
+
+      if (r_type >= R_X86_64_max)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      if (r_type != (int) R_X86_64_32
+	  || ABI_64_P (output_bfd)) 
+	howto = x86_64_elf_howto_table + r_type;
+      else
+	howto = (x86_64_elf_howto_table
+		 + ARRAY_SIZE (x86_64_elf_howto_table) - 1);
+      r_symndx = htab->r_sym (rel->r_info);
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      unresolved_reloc = FALSE;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym,
+						&sec, rel);
+
+	  /* Relocate against local STT_GNU_IFUNC symbol.  */
+	  if (!info->relocatable
+	      && ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
+	    {
+	      h = elf_x86_64_get_local_sym_hash (htab, input_bfd,
+						 rel, FALSE);
+	      if (h == NULL)
+		abort ();
+
+	      /* Set STT_GNU_IFUNC symbol value.  */ 
+	      h->root.u.def.value = sym->st_value;
+	      h->root.u.def.section = sec;
+	    }
+	}
+      else
+	{
+	  bfd_boolean warned ATTRIBUTE_UNUSED;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      if (rel->r_addend == 0
+	  && r_type == R_X86_64_64
+	  && !ABI_64_P (output_bfd))
+	{
+	  /* For x32, treat R_X86_64_64 like R_X86_64_32 and zero-extend
+	     it to 64bit if addend is zero.  */
+	  r_type = R_X86_64_32;
+	  memset (contents + rel->r_offset + 4, 0, 4);
+	}
+
+      /* Since STT_GNU_IFUNC symbol must go through PLT, we handle
+	 it here if it is defined in a non-shared object.  */
+      if (h != NULL
+	  && h->type == STT_GNU_IFUNC
+	  && h->def_regular)
+	{
+	  asection *plt;
+	  bfd_vma plt_index;
+	  const char *name;
+
+	  if ((input_section->flags & SEC_ALLOC) == 0
+	      || h->plt.offset == (bfd_vma) -1)
+	    abort ();
+
+	  /* STT_GNU_IFUNC symbol must go through PLT.  */
+	  plt = htab->elf.splt ? htab->elf.splt : htab->elf.iplt;
+	  relocation = (plt->output_section->vma
+			+ plt->output_offset + h->plt.offset);
+
+	  switch (r_type)
+	    {
+	    default:
+	      if (h->root.root.string)
+		name = h->root.root.string;
+	      else
+		name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym,
+					 NULL);
+	      (*_bfd_error_handler)
+		(_("%B: relocation %s against STT_GNU_IFUNC "
+		   "symbol `%s' isn't handled by %s"), input_bfd,
+		 x86_64_elf_howto_table[r_type].name,
+		 name, __FUNCTION__);
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+
+	    case R_X86_64_32S:
+	      if (info->shared)
+		abort ();
+	      goto do_relocation;
+
+	    case R_X86_64_32:
+	      if (ABI_64_P (output_bfd))
+		goto do_relocation;
+	      /* FALLTHROUGH */
+	    case R_X86_64_64: 
+	      if (rel->r_addend != 0)
+		{
+		  if (h->root.root.string)
+		    name = h->root.root.string;
+		  else
+		    name = bfd_elf_sym_name (input_bfd, symtab_hdr,
+					     sym, NULL);
+		  (*_bfd_error_handler)
+		    (_("%B: relocation %s against STT_GNU_IFUNC "
+		       "symbol `%s' has non-zero addend: %d"),
+		     input_bfd, x86_64_elf_howto_table[r_type].name,
+		     name, rel->r_addend);
+		  bfd_set_error (bfd_error_bad_value);
+		  return FALSE;
+		}
+
+	      /* Generate dynamic relcoation only when there is a
+		 non-GOF reference in a shared object.  */
+	      if (info->shared && h->non_got_ref)
+		{
+		  Elf_Internal_Rela outrel;
+		  asection *sreloc;
+
+		  /* Need a dynamic relocation to get the real function
+		     address.  */
+		  outrel.r_offset = _bfd_elf_section_offset (output_bfd,
+							     info,
+							     input_section,
+							     rel->r_offset);
+		  if (outrel.r_offset == (bfd_vma) -1
+		      || outrel.r_offset == (bfd_vma) -2)
+		    abort ();
+
+		  outrel.r_offset += (input_section->output_section->vma
+				      + input_section->output_offset);
+
+		  if (h->dynindx == -1
+		      || h->forced_local
+		      || info->executable)
+		    {
+		      /* This symbol is resolved locally.  */
+		      outrel.r_info = htab->r_info (0, R_X86_64_IRELATIVE);
+		      outrel.r_addend = (h->root.u.def.value
+					 + h->root.u.def.section->output_section->vma
+					 + h->root.u.def.section->output_offset);
+		    }
+		  else
+		    {
+		      outrel.r_info = htab->r_info (h->dynindx, r_type);
+		      outrel.r_addend = 0;
+		    }
+
+		  sreloc = htab->elf.irelifunc;
+		  elf_append_rela (output_bfd, sreloc, &outrel);
+
+		  /* If this reloc is against an external symbol, we
+		     do not want to fiddle with the addend.  Otherwise,
+		     we need to include the symbol value so that it
+		     becomes an addend for the dynamic reloc.  For an
+		     internal symbol, we have updated addend.  */
+		  continue;
+		}
+	      /* FALLTHROUGH */
+	    case R_X86_64_PC32:
+	    case R_X86_64_PC64:
+	    case R_X86_64_PLT32:
+	      goto do_relocation;
+
+	    case R_X86_64_GOTPCREL:
+	    case R_X86_64_GOTPCREL64:
+	      base_got = htab->elf.sgot;
+	      off = h->got.offset;
+
+	      if (base_got == NULL)
+		abort ();
+
+	      if (off == (bfd_vma) -1)
+		{
+		  /* We can't use h->got.offset here to save state, or
+		     even just remember the offset, as finish_dynamic_symbol
+		     would use that as offset into .got.  */
+
+		  if (htab->elf.splt != NULL)
+		    {
+		      plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1;
+		      off = (plt_index + 3) * GOT_ENTRY_SIZE;
+		      base_got = htab->elf.sgotplt;
+		    }
+		  else
+		    {
+		      plt_index = h->plt.offset / PLT_ENTRY_SIZE;
+		      off = plt_index * GOT_ENTRY_SIZE;
+		      base_got = htab->elf.igotplt;
+		    }
+
+		  if (h->dynindx == -1
+		      || h->forced_local
+		      || info->symbolic)
+		    {
+		      /* This references the local defitionion.  We must 
+			 initialize this entry in the global offset table.
+			 Since the offset must always be a multiple of 8, 
+			 we use the least significant bit to record
+			 whether we have initialized it already.
+
+			 When doing a dynamic link, we create a .rela.got
+			 relocation entry to initialize the value.  This
+			 is done in the finish_dynamic_symbol routine.	 */
+		      if ((off & 1) != 0)
+			off &= ~1;
+		      else
+			{
+			  bfd_put_64 (output_bfd, relocation,
+				      base_got->contents + off);
+			  /* Note that this is harmless for the GOTPLT64
+			     case, as -1 | 1 still is -1.  */
+			  h->got.offset |= 1;
+			}
+		    }
+		}
+
+	      relocation = (base_got->output_section->vma
+			    + base_got->output_offset + off);
+
+	      goto do_relocation;
+	    }
+	}
+
+      /* When generating a shared object, the relocations handled here are
+	 copied into the output file to be resolved at run time.  */
+      switch (r_type)
+	{
+	case R_X86_64_GOT32:
+	case R_X86_64_GOT64:
+	  /* Relocation is to the entry for this symbol in the global
+	     offset table.  */
+	case R_X86_64_GOTPCREL:
+	case R_X86_64_GOTPCREL64:
+	  /* Use global offset table entry as symbol value.  */
+	case R_X86_64_GOTPLT64:
+	  /* This is the same as GOT64 for relocation purposes, but
+	     indicates the existence of a PLT entry.  The difficulty is,
+	     that we must calculate the GOT slot offset from the PLT
+	     offset, if this symbol got a PLT entry (it was global).
+	     Additionally if it's computed from the PLT entry, then that
+	     GOT offset is relative to .got.plt, not to .got.  */
+	  base_got = htab->elf.sgot;
+
+	  if (htab->elf.sgot == NULL)
+	    abort ();
+
+	  if (h != NULL)
+	    {
+	      bfd_boolean dyn;
+
+	      off = h->got.offset;
+	      if (h->needs_plt
+	          && h->plt.offset != (bfd_vma)-1
+		  && off == (bfd_vma)-1)
+		{
+		  /* We can't use h->got.offset here to save
+		     state, or even just remember the offset, as
+		     finish_dynamic_symbol would use that as offset into
+		     .got.  */
+		  bfd_vma plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1;
+		  off = (plt_index + 3) * GOT_ENTRY_SIZE;
+		  base_got = htab->elf.sgotplt;
+		}
+
+	      dyn = htab->elf.dynamic_sections_created;
+
+	      if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+		  || (info->shared
+		      && SYMBOL_REFERENCES_LOCAL (info, h))
+		  || (ELF_ST_VISIBILITY (h->other)
+		      && h->root.type == bfd_link_hash_undefweak))
+		{
+		  /* This is actually a static link, or it is a -Bsymbolic
+		     link and the symbol is defined locally, or the symbol
+		     was forced to be local because of a version file.	We
+		     must initialize this entry in the global offset table.
+		     Since the offset must always be a multiple of 8, we
+		     use the least significant bit to record whether we
+		     have initialized it already.
+
+		     When doing a dynamic link, we create a .rela.got
+		     relocation entry to initialize the value.	This is
+		     done in the finish_dynamic_symbol routine.	 */
+		  if ((off & 1) != 0)
+		    off &= ~1;
+		  else
+		    {
+		      bfd_put_64 (output_bfd, relocation,
+				  base_got->contents + off);
+		      /* Note that this is harmless for the GOTPLT64 case,
+		         as -1 | 1 still is -1.  */
+		      h->got.offset |= 1;
+		    }
+		}
+	      else
+		unresolved_reloc = FALSE;
+	    }
+	  else
+	    {
+	      if (local_got_offsets == NULL)
+		abort ();
+
+	      off = local_got_offsets[r_symndx];
+
+	      /* The offset must always be a multiple of 8.  We use
+		 the least significant bit to record whether we have
+		 already generated the necessary reloc.	 */
+	      if ((off & 1) != 0)
+		off &= ~1;
+	      else
+		{
+		  bfd_put_64 (output_bfd, relocation,
+			      base_got->contents + off);
+
+		  if (info->shared)
+		    {
+		      asection *s;
+		      Elf_Internal_Rela outrel;
+
+		      /* We need to generate a R_X86_64_RELATIVE reloc
+			 for the dynamic linker.  */
+		      s = htab->elf.srelgot;
+		      if (s == NULL)
+			abort ();
+
+		      outrel.r_offset = (base_got->output_section->vma
+					 + base_got->output_offset
+					 + off);
+		      outrel.r_info = htab->r_info (0, R_X86_64_RELATIVE);
+		      outrel.r_addend = relocation;
+		      elf_append_rela (output_bfd, s, &outrel);
+		    }
+
+		  local_got_offsets[r_symndx] |= 1;
+		}
+	    }
+
+	  if (off >= (bfd_vma) -2)
+	    abort ();
+
+	  relocation = base_got->output_section->vma
+		       + base_got->output_offset + off;
+	  if (r_type != R_X86_64_GOTPCREL && r_type != R_X86_64_GOTPCREL64)
+	    relocation -= htab->elf.sgotplt->output_section->vma
+			  - htab->elf.sgotplt->output_offset;
+
+	  break;
+
+	case R_X86_64_GOTOFF64:
+	  /* Relocation is relative to the start of the global offset
+	     table.  */
+
+	  /* Check to make sure it isn't a protected function symbol
+	     for shared library since it may not be local when used
+	     as function address.  */
+	  if (info->shared
+	      && h
+	      && h->def_regular
+	      && h->type == STT_FUNC
+	      && ELF_ST_VISIBILITY (h->other) == STV_PROTECTED)
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: relocation R_X86_64_GOTOFF64 against protected function `%s' can not be used when making a shared object"),
+		 input_bfd, h->root.root.string);
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+
+	  /* Note that sgot is not involved in this
+	     calculation.  We always want the start of .got.plt.  If we
+	     defined _GLOBAL_OFFSET_TABLE_ in a different way, as is
+	     permitted by the ABI, we might have to change this
+	     calculation.  */
+	  relocation -= htab->elf.sgotplt->output_section->vma
+			+ htab->elf.sgotplt->output_offset;
+	  break;
+
+	case R_X86_64_GOTPC32:
+	case R_X86_64_GOTPC64:
+	  /* Use global offset table as symbol value.  */
+	  relocation = htab->elf.sgotplt->output_section->vma
+		       + htab->elf.sgotplt->output_offset;
+	  unresolved_reloc = FALSE;
+	  break;
+
+	case R_X86_64_PLTOFF64:
+	  /* Relocation is PLT entry relative to GOT.  For local
+	     symbols it's the symbol itself relative to GOT.  */
+          if (h != NULL
+	      /* See PLT32 handling.  */
+	      && h->plt.offset != (bfd_vma) -1
+	      && htab->elf.splt != NULL)
+	    {
+	      relocation = (htab->elf.splt->output_section->vma
+			    + htab->elf.splt->output_offset
+			    + h->plt.offset);
+	      unresolved_reloc = FALSE;
+	    }
+
+	  relocation -= htab->elf.sgotplt->output_section->vma
+			+ htab->elf.sgotplt->output_offset;
+	  break;
+
+	case R_X86_64_PLT32:
+	  /* Relocation is to the entry for this symbol in the
+	     procedure linkage table.  */
+
+	  /* Resolve a PLT32 reloc against a local symbol directly,
+	     without using the procedure linkage table.	 */
+	  if (h == NULL)
+	    break;
+
+	  if (h->plt.offset == (bfd_vma) -1
+	      || htab->elf.splt == NULL)
+	    {
+	      /* We didn't make a PLT entry for this symbol.  This
+		 happens when statically linking PIC code, or when
+		 using -Bsymbolic.  */
+	      break;
+	    }
+
+	  relocation = (htab->elf.splt->output_section->vma
+			+ htab->elf.splt->output_offset
+			+ h->plt.offset);
+	  unresolved_reloc = FALSE;
+	  break;
+
+	case R_X86_64_PC8:
+	case R_X86_64_PC16:
+	case R_X86_64_PC32:
+	  if (info->shared
+	      && ABI_64_P (output_bfd)
+	      && (input_section->flags & SEC_ALLOC) != 0
+	      && (input_section->flags & SEC_READONLY) != 0
+	      && h != NULL)
+	    {
+	      bfd_boolean fail = FALSE;
+	      bfd_boolean branch
+		= (r_type == R_X86_64_PC32
+		   && is_32bit_relative_branch (contents, rel->r_offset));
+
+	      if (SYMBOL_REFERENCES_LOCAL (info, h))
+		{
+		  /* Symbol is referenced locally.  Make sure it is
+		     defined locally or for a branch.  */
+		  fail = !h->def_regular && !branch;
+		}
+	      else
+		{
+		  /* Symbol isn't referenced locally.  We only allow
+		     branch to symbol with non-default visibility. */
+		  fail = (!branch
+			  || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT);
+		}
+
+	      if (fail)
+		{
+		  const char *fmt;
+		  const char *v;
+		  const char *pic = "";
+
+		  switch (ELF_ST_VISIBILITY (h->other))
+		    {
+		    case STV_HIDDEN:
+		      v = _("hidden symbol");
+		      break;
+		    case STV_INTERNAL:
+		      v = _("internal symbol");
+		      break;
+		    case STV_PROTECTED:
+		      v = _("protected symbol");
+		      break;
+		    default:
+		      v = _("symbol");
+		      pic = _("; recompile with -fPIC");
+		      break;
+		    }
+
+		  if (h->def_regular)
+		    fmt = _("%B: relocation %s against %s `%s' can not be used when making a shared object%s");
+		  else
+		    fmt = _("%B: relocation %s against undefined %s `%s' can not be used when making a shared object%s");
+
+		  (*_bfd_error_handler) (fmt, input_bfd,
+					 x86_64_elf_howto_table[r_type].name,
+					 v,  h->root.root.string, pic);
+		  bfd_set_error (bfd_error_bad_value);
+		  return FALSE;
+		}
+	    }
+	  /* Fall through.  */
+
+	case R_X86_64_8:
+	case R_X86_64_16:
+	case R_X86_64_32:
+	case R_X86_64_PC64:
+	case R_X86_64_64:
+	  /* FIXME: The ABI says the linker should make sure the value is
+	     the same when it's zeroextended to 64 bit.	 */
+
+	  if ((input_section->flags & SEC_ALLOC) == 0)
+	    break;
+
+	  if ((info->shared
+	       && (h == NULL
+		   || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		   || h->root.type != bfd_link_hash_undefweak)
+	       && (! IS_X86_64_PCREL_TYPE (r_type)
+		   || ! SYMBOL_CALLS_LOCAL (info, h)))
+	      || (ELIMINATE_COPY_RELOCS
+		  && !info->shared
+		  && h != NULL
+		  && h->dynindx != -1
+		  && !h->non_got_ref
+		  && ((h->def_dynamic
+		       && !h->def_regular)
+		      || h->root.type == bfd_link_hash_undefweak
+		      || h->root.type == bfd_link_hash_undefined)))
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_boolean skip, relocate;
+	      asection *sreloc;
+
+	      /* When generating a shared object, these relocations
+		 are copied into the output file to be resolved at run
+		 time.	*/
+	      skip = FALSE;
+	      relocate = FALSE;
+
+	      outrel.r_offset =
+		_bfd_elf_section_offset (output_bfd, info, input_section,
+					 rel->r_offset);
+	      if (outrel.r_offset == (bfd_vma) -1)
+		skip = TRUE;
+	      else if (outrel.r_offset == (bfd_vma) -2)
+		skip = TRUE, relocate = TRUE;
+
+	      outrel.r_offset += (input_section->output_section->vma
+				  + input_section->output_offset);
+
+	      if (skip)
+		memset (&outrel, 0, sizeof outrel);
+
+	      /* h->dynindx may be -1 if this symbol was marked to
+		 become local.  */
+	      else if (h != NULL
+		       && h->dynindx != -1
+		       && (IS_X86_64_PCREL_TYPE (r_type)
+			   || ! info->shared
+			   || ! SYMBOLIC_BIND (info, h)
+			   || ! h->def_regular))
+		{
+		  outrel.r_info = htab->r_info (h->dynindx, r_type);
+		  outrel.r_addend = rel->r_addend;
+		}
+	      else
+		{
+		  /* This symbol is local, or marked to become local.  */
+		  if (r_type == htab->pointer_r_type)
+		    {
+		      relocate = TRUE;
+		      outrel.r_info = htab->r_info (0, R_X86_64_RELATIVE);
+		      outrel.r_addend = relocation + rel->r_addend;
+		    }
+		  else if (r_type == R_X86_64_64
+			   && !ABI_64_P (output_bfd))
+		    {
+		      relocate = TRUE;
+		      outrel.r_info = htab->r_info (0,
+						    R_X86_64_RELATIVE64);
+		      outrel.r_addend = relocation + rel->r_addend;
+		    }
+		  else
+		    {
+		      long sindx;
+
+		      if (bfd_is_abs_section (sec))
+			sindx = 0;
+		      else if (sec == NULL || sec->owner == NULL)
+			{
+			  bfd_set_error (bfd_error_bad_value);
+			  return FALSE;
+			}
+		      else
+			{
+			  asection *osec;
+
+			  /* We are turning this relocation into one
+			     against a section symbol.  It would be
+			     proper to subtract the symbol's value,
+			     osec->vma, from the emitted reloc addend,
+			     but ld.so expects buggy relocs.  */
+			  osec = sec->output_section;
+			  sindx = elf_section_data (osec)->dynindx;
+			  if (sindx == 0)
+			    {
+			      asection *oi = htab->elf.text_index_section;
+			      sindx = elf_section_data (oi)->dynindx;
+			    }
+			  BFD_ASSERT (sindx != 0);
+			}
+
+		      outrel.r_info = htab->r_info (sindx, r_type);
+		      outrel.r_addend = relocation + rel->r_addend;
+		    }
+		}
+
+	      sreloc = elf_section_data (input_section)->sreloc;
+
+	      if (sreloc == NULL || sreloc->contents == NULL)
+		{
+		  r = bfd_reloc_notsupported;
+		  goto check_relocation_error;
+		}
+
+	      elf_append_rela (output_bfd, sreloc, &outrel);
+
+	      /* If this reloc is against an external symbol, we do
+		 not want to fiddle with the addend.  Otherwise, we
+		 need to include the symbol value so that it becomes
+		 an addend for the dynamic reloc.  */
+	      if (! relocate)
+		continue;
+	    }
+
+	  break;
+
+	case R_X86_64_TLSGD:
+	case R_X86_64_GOTPC32_TLSDESC:
+	case R_X86_64_TLSDESC_CALL:
+	case R_X86_64_GOTTPOFF:
+	  tls_type = GOT_UNKNOWN;
+	  if (h == NULL && local_got_offsets)
+	    tls_type = elf_x86_64_local_got_tls_type (input_bfd) [r_symndx];
+	  else if (h != NULL)
+	    tls_type = elf_x86_64_hash_entry (h)->tls_type;
+
+	  if (! elf_x86_64_tls_transition (info, input_bfd,
+					   input_section, contents,
+					   symtab_hdr, sym_hashes,
+					   &r_type, tls_type, rel,
+					   relend, h, r_symndx))
+	    return FALSE;
+
+	  if (r_type == R_X86_64_TPOFF32)
+	    {
+	      bfd_vma roff = rel->r_offset;
+
+	      BFD_ASSERT (! unresolved_reloc);
+
+	      if (ELF32_R_TYPE (rel->r_info) == R_X86_64_TLSGD)
+		{
+		  /* GD->LE transition.  For 64bit, change
+		     .byte 0x66; leaq foo@tlsgd(%rip), %rdi
+		     .word 0x6666; rex64; call __tls_get_addr
+		     into:
+		     movq %fs:0, %rax
+		     leaq foo@tpoff(%rax), %rax
+		     For 32bit, change
+		     leaq foo@tlsgd(%rip), %rdi
+		     .word 0x6666; rex64; call __tls_get_addr
+		     into:
+		     movl %fs:0, %eax
+		     leaq foo@tpoff(%rax), %rax */
+		  if (ABI_64_P (output_bfd))
+		    memcpy (contents + roff - 4,
+			    "\x64\x48\x8b\x04\x25\0\0\0\0\x48\x8d\x80\0\0\0",
+			    16);
+		  else
+		    memcpy (contents + roff - 3,
+			    "\x64\x8b\x04\x25\0\0\0\0\x48\x8d\x80\0\0\0",
+			    15);
+		  bfd_put_32 (output_bfd,
+			      elf_x86_64_tpoff (info, relocation),
+			      contents + roff + 8);
+		  /* Skip R_X86_64_PC32/R_X86_64_PLT32.  */
+		  rel++;
+		  continue;
+		}
+	      else if (ELF32_R_TYPE (rel->r_info) == R_X86_64_GOTPC32_TLSDESC)
+		{
+		  /* GDesc -> LE transition.
+		     It's originally something like:
+		     leaq x@tlsdesc(%rip), %rax
+
+		     Change it to:
+		     movl $x@tpoff, %rax.  */
+
+		  unsigned int val, type;
+
+		  type = bfd_get_8 (input_bfd, contents + roff - 3);
+		  val = bfd_get_8 (input_bfd, contents + roff - 1);
+		  bfd_put_8 (output_bfd, 0x48 | ((type >> 2) & 1),
+			     contents + roff - 3);
+		  bfd_put_8 (output_bfd, 0xc7, contents + roff - 2);
+		  bfd_put_8 (output_bfd, 0xc0 | ((val >> 3) & 7),
+			     contents + roff - 1);
+		  bfd_put_32 (output_bfd,
+			      elf_x86_64_tpoff (info, relocation),
+			      contents + roff);
+		  continue;
+		}
+	      else if (ELF32_R_TYPE (rel->r_info) == R_X86_64_TLSDESC_CALL)
+		{
+		  /* GDesc -> LE transition.
+		     It's originally:
+		     call *(%rax)
+		     Turn it into:
+		     xchg %ax,%ax.  */
+		  bfd_put_8 (output_bfd, 0x66, contents + roff);
+		  bfd_put_8 (output_bfd, 0x90, contents + roff + 1);
+		  continue;
+		}
+	      else if (ELF32_R_TYPE (rel->r_info) == R_X86_64_GOTTPOFF)
+		{
+		  /* IE->LE transition:
+		     Originally it can be one of:
+		     movq foo@gottpoff(%rip), %reg
+		     addq foo@gottpoff(%rip), %reg
+		     We change it into:
+		     movq $foo, %reg
+		     leaq foo(%reg), %reg
+		     addq $foo, %reg.  */
+
+		  unsigned int val, type, reg;
+
+		  val = bfd_get_8 (input_bfd, contents + roff - 3);
+		  type = bfd_get_8 (input_bfd, contents + roff - 2);
+		  reg = bfd_get_8 (input_bfd, contents + roff - 1);
+		  reg >>= 3;
+		  if (type == 0x8b)
+		    {
+		      /* movq */
+		      if (val == 0x4c)
+			bfd_put_8 (output_bfd, 0x49,
+				   contents + roff - 3);
+		      else if (!ABI_64_P (output_bfd) && val == 0x44)
+			bfd_put_8 (output_bfd, 0x41,
+				   contents + roff - 3);
+		      bfd_put_8 (output_bfd, 0xc7,
+				 contents + roff - 2);
+		      bfd_put_8 (output_bfd, 0xc0 | reg,
+				 contents + roff - 1);
+		    }
+		  else if (reg == 4)
+		    {
+		      /* addq -> addq - addressing with %rsp/%r12 is
+			 special  */
+		      if (val == 0x4c)
+			bfd_put_8 (output_bfd, 0x49,
+				   contents + roff - 3);
+		      else if (!ABI_64_P (output_bfd) && val == 0x44)
+			bfd_put_8 (output_bfd, 0x41,
+				   contents + roff - 3);
+		      bfd_put_8 (output_bfd, 0x81,
+				 contents + roff - 2);
+		      bfd_put_8 (output_bfd, 0xc0 | reg,
+				 contents + roff - 1);
+		    }
+		  else
+		    {
+		      /* addq -> leaq */
+		      if (val == 0x4c)
+			bfd_put_8 (output_bfd, 0x4d,
+				   contents + roff - 3);
+		      else if (!ABI_64_P (output_bfd) && val == 0x44)
+			bfd_put_8 (output_bfd, 0x45,
+				   contents + roff - 3);
+		      bfd_put_8 (output_bfd, 0x8d,
+				 contents + roff - 2);
+		      bfd_put_8 (output_bfd, 0x80 | reg | (reg << 3),
+				 contents + roff - 1);
+		    }
+		  bfd_put_32 (output_bfd,
+			      elf_x86_64_tpoff (info, relocation),
+			      contents + roff);
+		  continue;
+		}
+	      else
+		BFD_ASSERT (FALSE);
+	    }
+
+	  if (htab->elf.sgot == NULL)
+	    abort ();
+
+	  if (h != NULL)
+	    {
+	      off = h->got.offset;
+	      offplt = elf_x86_64_hash_entry (h)->tlsdesc_got;
+	    }
+	  else
+	    {
+	      if (local_got_offsets == NULL)
+		abort ();
+
+	      off = local_got_offsets[r_symndx];
+	      offplt = local_tlsdesc_gotents[r_symndx];
+	    }
+
+	  if ((off & 1) != 0)
+	    off &= ~1;
+	  else
+	    {
+	      Elf_Internal_Rela outrel;
+	      int dr_type, indx;
+	      asection *sreloc;
+
+	      if (htab->elf.srelgot == NULL)
+		abort ();
+
+	      indx = h && h->dynindx != -1 ? h->dynindx : 0;
+
+	      if (GOT_TLS_GDESC_P (tls_type))
+		{
+		  outrel.r_info = htab->r_info (indx, R_X86_64_TLSDESC);
+		  BFD_ASSERT (htab->sgotplt_jump_table_size + offplt
+			      + 2 * GOT_ENTRY_SIZE <= htab->elf.sgotplt->size);
+		  outrel.r_offset = (htab->elf.sgotplt->output_section->vma
+				     + htab->elf.sgotplt->output_offset
+				     + offplt
+				     + htab->sgotplt_jump_table_size);
+		  sreloc = htab->elf.srelplt;
+		  if (indx == 0)
+		    outrel.r_addend = relocation - elf_x86_64_dtpoff_base (info);
+		  else
+		    outrel.r_addend = 0;
+		  elf_append_rela (output_bfd, sreloc, &outrel);
+		}
+
+	      sreloc = htab->elf.srelgot;
+
+	      outrel.r_offset = (htab->elf.sgot->output_section->vma
+				 + htab->elf.sgot->output_offset + off);
+
+	      if (GOT_TLS_GD_P (tls_type))
+		dr_type = R_X86_64_DTPMOD64;
+	      else if (GOT_TLS_GDESC_P (tls_type))
+		goto dr_done;
+	      else
+		dr_type = R_X86_64_TPOFF64;
+
+	      bfd_put_64 (output_bfd, 0, htab->elf.sgot->contents + off);
+	      outrel.r_addend = 0;
+	      if ((dr_type == R_X86_64_TPOFF64
+		   || dr_type == R_X86_64_TLSDESC) && indx == 0)
+		outrel.r_addend = relocation - elf_x86_64_dtpoff_base (info);
+	      outrel.r_info = htab->r_info (indx, dr_type);
+
+	      elf_append_rela (output_bfd, sreloc, &outrel);
+
+	      if (GOT_TLS_GD_P (tls_type))
+		{
+		  if (indx == 0)
+		    {
+		      BFD_ASSERT (! unresolved_reloc);
+		      bfd_put_64 (output_bfd,
+				  relocation - elf_x86_64_dtpoff_base (info),
+				  htab->elf.sgot->contents + off + GOT_ENTRY_SIZE);
+		    }
+		  else
+		    {
+		      bfd_put_64 (output_bfd, 0,
+				  htab->elf.sgot->contents + off + GOT_ENTRY_SIZE);
+		      outrel.r_info = htab->r_info (indx,
+						    R_X86_64_DTPOFF64);
+		      outrel.r_offset += GOT_ENTRY_SIZE;
+		      elf_append_rela (output_bfd, sreloc,
+						&outrel);
+		    }
+		}
+
+	    dr_done:
+	      if (h != NULL)
+		h->got.offset |= 1;
+	      else
+		local_got_offsets[r_symndx] |= 1;
+	    }
+
+	  if (off >= (bfd_vma) -2
+	      && ! GOT_TLS_GDESC_P (tls_type))
+	    abort ();
+	  if (r_type == ELF32_R_TYPE (rel->r_info))
+	    {
+	      if (r_type == R_X86_64_GOTPC32_TLSDESC
+		  || r_type == R_X86_64_TLSDESC_CALL)
+		relocation = htab->elf.sgotplt->output_section->vma
+		  + htab->elf.sgotplt->output_offset
+		  + offplt + htab->sgotplt_jump_table_size;
+	      else
+		relocation = htab->elf.sgot->output_section->vma
+		  + htab->elf.sgot->output_offset + off;
+	      unresolved_reloc = FALSE;
+	    }
+	  else
+	    {
+	      bfd_vma roff = rel->r_offset;
+
+	      if (ELF32_R_TYPE (rel->r_info) == R_X86_64_TLSGD)
+		{
+		  /* GD->IE transition.  For 64bit, change
+		     .byte 0x66; leaq foo@tlsgd(%rip), %rdi
+		     .word 0x6666; rex64; call __tls_get_addr@plt
+		     into:
+		     movq %fs:0, %rax
+		     addq foo@gottpoff(%rip), %rax
+		     For 32bit, change
+		     leaq foo@tlsgd(%rip), %rdi
+		     .word 0x6666; rex64; call __tls_get_addr@plt
+		     into:
+		     movl %fs:0, %eax
+		     addq foo@gottpoff(%rip), %rax */
+		  if (ABI_64_P (output_bfd))
+		    memcpy (contents + roff - 4,
+			    "\x64\x48\x8b\x04\x25\0\0\0\0\x48\x03\x05\0\0\0",
+			    16);
+		  else
+		    memcpy (contents + roff - 3,
+			    "\x64\x8b\x04\x25\0\0\0\0\x48\x03\x05\0\0\0",
+			    15);
+
+		  relocation = (htab->elf.sgot->output_section->vma
+				+ htab->elf.sgot->output_offset + off
+				- roff
+				- input_section->output_section->vma
+				- input_section->output_offset
+				- 12);
+		  bfd_put_32 (output_bfd, relocation,
+			      contents + roff + 8);
+		  /* Skip R_X86_64_PLT32.  */
+		  rel++;
+		  continue;
+		}
+	      else if (ELF32_R_TYPE (rel->r_info) == R_X86_64_GOTPC32_TLSDESC)
+		{
+		  /* GDesc -> IE transition.
+		     It's originally something like:
+		     leaq x@tlsdesc(%rip), %rax
+
+		     Change it to:
+		     movq x@gottpoff(%rip), %rax # before xchg %ax,%ax.  */
+
+		  /* Now modify the instruction as appropriate. To
+		     turn a leaq into a movq in the form we use it, it
+		     suffices to change the second byte from 0x8d to
+		     0x8b.  */
+		  bfd_put_8 (output_bfd, 0x8b, contents + roff - 2);
+
+		  bfd_put_32 (output_bfd,
+			      htab->elf.sgot->output_section->vma
+			      + htab->elf.sgot->output_offset + off
+			      - rel->r_offset
+			      - input_section->output_section->vma
+			      - input_section->output_offset
+			      - 4,
+			      contents + roff);
+		  continue;
+		}
+	      else if (ELF32_R_TYPE (rel->r_info) == R_X86_64_TLSDESC_CALL)
+		{
+		  /* GDesc -> IE transition.
+		     It's originally:
+		     call *(%rax)
+
+		     Change it to:
+		     xchg %ax, %ax.  */
+
+		  bfd_put_8 (output_bfd, 0x66, contents + roff);
+		  bfd_put_8 (output_bfd, 0x90, contents + roff + 1);
+		  continue;
+		}
+	      else
+		BFD_ASSERT (FALSE);
+	    }
+	  break;
+
+	case R_X86_64_TLSLD:
+	  if (! elf_x86_64_tls_transition (info, input_bfd,
+					   input_section, contents,
+					   symtab_hdr, sym_hashes,
+					   &r_type, GOT_UNKNOWN,
+					   rel, relend, h, r_symndx))
+	    return FALSE;
+
+	  if (r_type != R_X86_64_TLSLD)
+	    {
+	      /* LD->LE transition:
+		 leaq foo@tlsld(%rip), %rdi; call __tls_get_addr.
+		 For 64bit, we change it into:
+		 .word 0x6666; .byte 0x66; movq %fs:0, %rax.
+		 For 32bit, we change it into:
+		 nopl 0x0(%rax); movl %fs:0, %eax.  */
+
+	      BFD_ASSERT (r_type == R_X86_64_TPOFF32);
+	      if (ABI_64_P (output_bfd))
+		memcpy (contents + rel->r_offset - 3,
+			"\x66\x66\x66\x64\x48\x8b\x04\x25\0\0\0", 12);
+	      else
+		memcpy (contents + rel->r_offset - 3,
+			"\x0f\x1f\x40\x00\x64\x8b\x04\x25\0\0\0", 12);
+	      /* Skip R_X86_64_PC32/R_X86_64_PLT32.  */
+	      rel++;
+	      continue;
+	    }
+
+	  if (htab->elf.sgot == NULL)
+	    abort ();
+
+	  off = htab->tls_ld_got.offset;
+	  if (off & 1)
+	    off &= ~1;
+	  else
+	    {
+	      Elf_Internal_Rela outrel;
+
+	      if (htab->elf.srelgot == NULL)
+		abort ();
+
+	      outrel.r_offset = (htab->elf.sgot->output_section->vma
+				 + htab->elf.sgot->output_offset + off);
+
+	      bfd_put_64 (output_bfd, 0,
+			  htab->elf.sgot->contents + off);
+	      bfd_put_64 (output_bfd, 0,
+			  htab->elf.sgot->contents + off + GOT_ENTRY_SIZE);
+	      outrel.r_info = htab->r_info (0, R_X86_64_DTPMOD64);
+	      outrel.r_addend = 0;
+	      elf_append_rela (output_bfd, htab->elf.srelgot,
+					&outrel);
+	      htab->tls_ld_got.offset |= 1;
+	    }
+	  relocation = htab->elf.sgot->output_section->vma
+		       + htab->elf.sgot->output_offset + off;
+	  unresolved_reloc = FALSE;
+	  break;
+
+	case R_X86_64_DTPOFF32:
+	  if (!info->executable|| (input_section->flags & SEC_CODE) == 0)
+	    relocation -= elf_x86_64_dtpoff_base (info);
+	  else
+	    relocation = elf_x86_64_tpoff (info, relocation);
+	  break;
+
+	case R_X86_64_TPOFF32:
+	case R_X86_64_TPOFF64:
+	  BFD_ASSERT (info->executable);
+	  relocation = elf_x86_64_tpoff (info, relocation);
+	  break;
+
+	default:
+	  break;
+	}
+
+      /* Dynamic relocs are not propagated for SEC_DEBUGGING sections
+	 because such sections are not SEC_ALLOC and thus ld.so will
+	 not process them.  */
+      if (unresolved_reloc
+	  && !((input_section->flags & SEC_DEBUGGING) != 0
+	       && h->def_dynamic))
+	(*_bfd_error_handler)
+	  (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+	   input_bfd,
+	   input_section,
+	   (long) rel->r_offset,
+	   howto->name,
+	   h->root.root.string);
+
+do_relocation:
+      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+				    contents, rel->r_offset,
+				    relocation, rel->r_addend);
+
+check_relocation_error:
+      if (r != bfd_reloc_ok)
+	{
+	  const char *name;
+
+	  if (h != NULL)
+	    name = h->root.root.string;
+	  else
+	    {
+	      name = bfd_elf_string_from_elf_section (input_bfd,
+						      symtab_hdr->sh_link,
+						      sym->st_name);
+	      if (name == NULL)
+		return FALSE;
+	      if (*name == '\0')
+		name = bfd_section_name (input_bfd, sec);
+	    }
+
+	  if (r == bfd_reloc_overflow)
+	    {
+	      if (! ((*info->callbacks->reloc_overflow)
+		     (info, (h ? &h->root : NULL), name, howto->name,
+		      (bfd_vma) 0, input_bfd, input_section,
+		      rel->r_offset)))
+		return FALSE;
+	    }
+	  else
+	    {
+	      (*_bfd_error_handler)
+		(_("%B(%A+0x%lx): reloc against `%s': error %d"),
+		 input_bfd, input_section,
+		 (long) rel->r_offset, name, (int) r);
+	      return FALSE;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+static bfd_boolean
+elf_x86_64_finish_dynamic_symbol (bfd *output_bfd,
+				  struct bfd_link_info *info,
+				  struct elf_link_hash_entry *h,
+				  Elf_Internal_Sym *sym)
+{
+  struct elf_x86_64_link_hash_table *htab;
+
+  htab = elf_x86_64_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      bfd_vma plt_index;
+      bfd_vma got_offset;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+      asection *plt, *gotplt, *relplt;
+      const struct elf_backend_data *bed;
+
+      /* When building a static executable, use .iplt, .igot.plt and
+	 .rela.iplt sections for STT_GNU_IFUNC symbols.  */
+      if (htab->elf.splt != NULL)
+	{
+	  plt = htab->elf.splt;
+	  gotplt = htab->elf.sgotplt;
+	  relplt = htab->elf.srelplt;
+	}
+      else
+	{
+	  plt = htab->elf.iplt;
+	  gotplt = htab->elf.igotplt;
+	  relplt = htab->elf.irelplt;
+	}
+
+      /* This symbol has an entry in the procedure linkage table.  Set
+	 it up.	 */
+      if ((h->dynindx == -1
+	   && !((h->forced_local || info->executable)
+		&& h->def_regular
+		&& h->type == STT_GNU_IFUNC))
+	  || plt == NULL
+	  || gotplt == NULL
+	  || relplt == NULL)
+	return FALSE;
+
+      /* Get the index in the procedure linkage table which
+	 corresponds to this symbol.  This is the index of this symbol
+	 in all the symbols for which we are making plt entries.  The
+	 first entry in the procedure linkage table is reserved.
+
+	 Get the offset into the .got table of the entry that
+	 corresponds to this function.	Each .got entry is GOT_ENTRY_SIZE
+	 bytes. The first three are reserved for the dynamic linker.
+
+	 For static executables, we don't reserve anything.  */
+
+      if (plt == htab->elf.splt)
+	{
+	  plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1;
+	  got_offset = (plt_index + 3) * GOT_ENTRY_SIZE;
+	}
+      else
+	{
+	  plt_index = h->plt.offset / PLT_ENTRY_SIZE;
+	  got_offset = plt_index * GOT_ENTRY_SIZE;
+	}
+
+      /* Fill in the entry in the procedure linkage table.  */
+      memcpy (plt->contents + h->plt.offset, elf_x86_64_plt_entry,
+	      PLT_ENTRY_SIZE);
+
+      /* Insert the relocation positions of the plt section.  The magic
+	 numbers at the end of the statements are the positions of the
+	 relocations in the plt section.  */
+      /* Put offset for jmp *name@GOTPCREL(%rip), since the
+	 instruction uses 6 bytes, subtract this value.  */
+      bfd_put_32 (output_bfd,
+		      (gotplt->output_section->vma
+		       + gotplt->output_offset
+		       + got_offset
+		       - plt->output_section->vma
+		       - plt->output_offset
+		       - h->plt.offset
+		       - 6),
+		  plt->contents + h->plt.offset + 2);
+
+      /* Don't fill PLT entry for static executables.  */
+      if (plt == htab->elf.splt)
+	{
+	  /* Put relocation index.  */
+	  bfd_put_32 (output_bfd, plt_index,
+		      plt->contents + h->plt.offset + 7);
+	  /* Put offset for jmp .PLT0.  */
+	  bfd_put_32 (output_bfd, - (h->plt.offset + PLT_ENTRY_SIZE),
+		      plt->contents + h->plt.offset + 12);
+	}
+
+      /* Fill in the entry in the global offset table, initially this
+	 points to the pushq instruction in the PLT which is at offset 6.  */
+      bfd_put_64 (output_bfd, (plt->output_section->vma
+			       + plt->output_offset
+			       + h->plt.offset + 6),
+		  gotplt->contents + got_offset);
+
+      /* Fill in the entry in the .rela.plt section.  */
+      rela.r_offset = (gotplt->output_section->vma
+		       + gotplt->output_offset
+		       + got_offset);
+      if (h->dynindx == -1
+	  || ((info->executable
+	       || ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	      && h->def_regular
+	      && h->type == STT_GNU_IFUNC))
+	{
+	  /* If an STT_GNU_IFUNC symbol is locally defined, generate
+	     R_X86_64_IRELATIVE instead of R_X86_64_JUMP_SLOT.  */
+	  rela.r_info = htab->r_info (0, R_X86_64_IRELATIVE);
+	  rela.r_addend = (h->root.u.def.value
+			   + h->root.u.def.section->output_section->vma
+			   + h->root.u.def.section->output_offset);
+	}
+      else
+	{
+	  rela.r_info = htab->r_info (h->dynindx, R_X86_64_JUMP_SLOT);
+	  rela.r_addend = 0;
+	}
+
+      bed = get_elf_backend_data (output_bfd);
+      loc = relplt->contents + plt_index * bed->s->sizeof_rela;
+      bed->s->swap_reloca_out (output_bfd, &rela, loc);
+
+      if (!h->def_regular)
+	{
+	  /* Mark the symbol as undefined, rather than as defined in
+	     the .plt section.  Leave the value if there were any
+	     relocations where pointer equality matters (this is a clue
+	     for the dynamic linker, to make function pointer
+	     comparisons work between an application and shared
+	     library), otherwise set it to zero.  If a function is only
+	     called from a binary, there is no need to slow down
+	     shared libraries because of that.  */
+	  sym->st_shndx = SHN_UNDEF;
+	  if (!h->pointer_equality_needed)
+	    sym->st_value = 0;
+	}
+    }
+
+  if (h->got.offset != (bfd_vma) -1
+      && ! GOT_TLS_GD_ANY_P (elf_x86_64_hash_entry (h)->tls_type)
+      && elf_x86_64_hash_entry (h)->tls_type != GOT_TLS_IE)
+    {
+      Elf_Internal_Rela rela;
+
+      /* This symbol has an entry in the global offset table.  Set it
+	 up.  */
+      if (htab->elf.sgot == NULL || htab->elf.srelgot == NULL)
+	abort ();
+
+      rela.r_offset = (htab->elf.sgot->output_section->vma
+		       + htab->elf.sgot->output_offset
+		       + (h->got.offset &~ (bfd_vma) 1));
+
+      /* If this is a static link, or it is a -Bsymbolic link and the
+	 symbol is defined locally or was forced to be local because
+	 of a version file, we just want to emit a RELATIVE reloc.
+	 The entry in the global offset table will already have been
+	 initialized in the relocate_section function.  */
+      if (h->def_regular
+	  && h->type == STT_GNU_IFUNC)
+	{
+	  if (info->shared)
+	    {
+	      /* Generate R_X86_64_GLOB_DAT.  */
+	      goto do_glob_dat;
+	    }
+	  else
+	    {
+	      asection *plt;
+
+	      if (!h->pointer_equality_needed)
+		abort ();
+
+	      /* For non-shared object, we can't use .got.plt, which
+		 contains the real function addres if we need pointer
+		 equality.  We load the GOT entry with the PLT entry.  */
+	      plt = htab->elf.splt ? htab->elf.splt : htab->elf.iplt;
+	      bfd_put_64 (output_bfd, (plt->output_section->vma
+				       + plt->output_offset
+				       + h->plt.offset),
+			  htab->elf.sgot->contents + h->got.offset);
+	      return TRUE;
+	    }
+	}
+      else if (info->shared
+	       && SYMBOL_REFERENCES_LOCAL (info, h))
+	{
+	  if (!h->def_regular)
+	    return FALSE;
+	  BFD_ASSERT((h->got.offset & 1) != 0);
+	  rela.r_info = htab->r_info (0, R_X86_64_RELATIVE);
+	  rela.r_addend = (h->root.u.def.value
+			   + h->root.u.def.section->output_section->vma
+			   + h->root.u.def.section->output_offset);
+	}
+      else
+	{
+	  BFD_ASSERT((h->got.offset & 1) == 0);
+do_glob_dat:
+	  bfd_put_64 (output_bfd, (bfd_vma) 0,
+		      htab->elf.sgot->contents + h->got.offset);
+	  rela.r_info = htab->r_info (h->dynindx, R_X86_64_GLOB_DAT);
+	  rela.r_addend = 0;
+	}
+
+      elf_append_rela (output_bfd, htab->elf.srelgot, &rela);
+    }
+
+  if (h->needs_copy)
+    {
+      Elf_Internal_Rela rela;
+
+      /* This symbol needs a copy reloc.  Set it up.  */
+
+      if (h->dynindx == -1
+	  || (h->root.type != bfd_link_hash_defined
+	      && h->root.type != bfd_link_hash_defweak)
+	  || htab->srelbss == NULL)
+	abort ();
+
+      rela.r_offset = (h->root.u.def.value
+		       + h->root.u.def.section->output_section->vma
+		       + h->root.u.def.section->output_offset);
+      rela.r_info = htab->r_info (h->dynindx, R_X86_64_COPY);
+      rela.r_addend = 0;
+      elf_append_rela (output_bfd, htab->srelbss, &rela);
+    }
+
+  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  SYM may
+     be NULL for local symbols.  */
+  if (sym != NULL
+      && (strcmp (h->root.root.string, "_DYNAMIC") == 0
+	  || h == htab->elf.hgot))
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+/* Finish up local dynamic symbol handling.  We set the contents of
+   various dynamic sections here.  */
+
+static bfd_boolean
+elf_x86_64_finish_local_dynamic_symbol (void **slot, void *inf)
+{
+  struct elf_link_hash_entry *h
+    = (struct elf_link_hash_entry *) *slot;
+  struct bfd_link_info *info
+    = (struct bfd_link_info *) inf; 
+
+  return elf_x86_64_finish_dynamic_symbol (info->output_bfd,
+					     info, h, NULL);
+}
+
+/* Used to decide how to sort relocs in an optimal manner for the
+   dynamic linker, before writing them out.  */
+
+static enum elf_reloc_type_class
+elf_x86_64_reloc_type_class (const Elf_Internal_Rela *rela)
+{
+  switch ((int) ELF32_R_TYPE (rela->r_info))
+    {
+    case R_X86_64_RELATIVE:
+      return reloc_class_relative;
+    case R_X86_64_JUMP_SLOT:
+      return reloc_class_plt;
+    case R_X86_64_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+elf_x86_64_finish_dynamic_sections (bfd *output_bfd,
+				    struct bfd_link_info *info)
+{
+  struct elf_x86_64_link_hash_table *htab;
+  bfd *dynobj;
+  asection *sdyn;
+
+  htab = elf_x86_64_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  dynobj = htab->elf.dynobj;
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (htab->elf.dynamic_sections_created)
+    {
+      bfd_byte *dyncon, *dynconend;
+      const struct elf_backend_data *bed;
+      bfd_size_type sizeof_dyn;
+
+      if (sdyn == NULL || htab->elf.sgot == NULL)
+	abort ();
+
+      bed = get_elf_backend_data (dynobj);
+      sizeof_dyn = bed->s->sizeof_dyn;
+      dyncon = sdyn->contents;
+      dynconend = sdyn->contents + sdyn->size;
+      for (; dyncon < dynconend; dyncon += sizeof_dyn)
+	{
+	  Elf_Internal_Dyn dyn;
+	  asection *s;
+
+	  (*bed->s->swap_dyn_in) (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    default:
+	      continue;
+
+	    case DT_PLTGOT:
+	      s = htab->elf.sgotplt;
+	      dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+	      break;
+
+	    case DT_JMPREL:
+	      dyn.d_un.d_ptr = htab->elf.srelplt->output_section->vma;
+	      break;
+
+	    case DT_PLTRELSZ:
+	      s = htab->elf.srelplt->output_section;
+	      dyn.d_un.d_val = s->size;
+	      break;
+
+	    case DT_RELASZ:
+	      /* The procedure linkage table relocs (DT_JMPREL) should
+		 not be included in the overall relocs (DT_RELA).
+		 Therefore, we override the DT_RELASZ entry here to
+		 make it not include the JMPREL relocs.  Since the
+		 linker script arranges for .rela.plt to follow all
+		 other relocation sections, we don't have to worry
+		 about changing the DT_RELA entry.  */
+	      if (htab->elf.srelplt != NULL)
+		{
+		  s = htab->elf.srelplt->output_section;
+		  dyn.d_un.d_val -= s->size;
+		}
+	      break;
+
+	    case DT_TLSDESC_PLT:
+	      s = htab->elf.splt;
+	      dyn.d_un.d_ptr = s->output_section->vma + s->output_offset
+		+ htab->tlsdesc_plt;
+	      break;
+
+	    case DT_TLSDESC_GOT:
+	      s = htab->elf.sgot;
+	      dyn.d_un.d_ptr = s->output_section->vma + s->output_offset
+		+ htab->tlsdesc_got;
+	      break;
+	    }
+
+	  (*bed->s->swap_dyn_out) (output_bfd, &dyn, dyncon);
+	}
+
+      /* Fill in the special first entry in the procedure linkage table.  */
+      if (htab->elf.splt && htab->elf.splt->size > 0)
+	{
+	  /* Fill in the first entry in the procedure linkage table.  */
+	  memcpy (htab->elf.splt->contents, elf_x86_64_plt0_entry,
+		  PLT_ENTRY_SIZE);
+	  /* Add offset for pushq GOT+8(%rip), since the instruction
+	     uses 6 bytes subtract this value.  */
+	  bfd_put_32 (output_bfd,
+		      (htab->elf.sgotplt->output_section->vma
+		       + htab->elf.sgotplt->output_offset
+		       + 8
+		       - htab->elf.splt->output_section->vma
+		       - htab->elf.splt->output_offset
+		       - 6),
+		      htab->elf.splt->contents + 2);
+	  /* Add offset for jmp *GOT+16(%rip). The 12 is the offset to
+	     the end of the instruction.  */
+	  bfd_put_32 (output_bfd,
+		      (htab->elf.sgotplt->output_section->vma
+		       + htab->elf.sgotplt->output_offset
+		       + 16
+		       - htab->elf.splt->output_section->vma
+		       - htab->elf.splt->output_offset
+		       - 12),
+		      htab->elf.splt->contents + 8);
+
+	  elf_section_data (htab->elf.splt->output_section)->this_hdr.sh_entsize =
+	    PLT_ENTRY_SIZE;
+
+	  if (htab->tlsdesc_plt)
+	    {
+	      bfd_put_64 (output_bfd, (bfd_vma) 0,
+			  htab->elf.sgot->contents + htab->tlsdesc_got);
+
+	      memcpy (htab->elf.splt->contents + htab->tlsdesc_plt,
+		      elf_x86_64_plt0_entry,
+		      PLT_ENTRY_SIZE);
+
+	      /* Add offset for pushq GOT+8(%rip), since the
+		 instruction uses 6 bytes subtract this value.  */
+	      bfd_put_32 (output_bfd,
+			  (htab->elf.sgotplt->output_section->vma
+			   + htab->elf.sgotplt->output_offset
+			   + 8
+			   - htab->elf.splt->output_section->vma
+			   - htab->elf.splt->output_offset
+			   - htab->tlsdesc_plt
+			   - 6),
+			  htab->elf.splt->contents + htab->tlsdesc_plt + 2);
+	      /* Add offset for jmp *GOT+TDG(%rip), where TGD stands for
+		 htab->tlsdesc_got. The 12 is the offset to the end of
+		 the instruction.  */
+	      bfd_put_32 (output_bfd,
+			  (htab->elf.sgot->output_section->vma
+			   + htab->elf.sgot->output_offset
+			   + htab->tlsdesc_got
+			   - htab->elf.splt->output_section->vma
+			   - htab->elf.splt->output_offset
+			   - htab->tlsdesc_plt
+			   - 12),
+			  htab->elf.splt->contents + htab->tlsdesc_plt + 8);
+	    }
+	}
+    }
+
+  if (htab->elf.sgotplt)
+    {
+      if (bfd_is_abs_section (htab->elf.sgotplt->output_section))
+	{
+	  (*_bfd_error_handler)
+	    (_("discarded output section: `%A'"), htab->elf.sgotplt);
+	  return FALSE;
+	}
+
+      /* Fill in the first three entries in the global offset table.  */
+      if (htab->elf.sgotplt->size > 0)
+	{
+	  /* Set the first entry in the global offset table to the address of
+	     the dynamic section.  */
+	  if (sdyn == NULL)
+	    bfd_put_64 (output_bfd, (bfd_vma) 0, htab->elf.sgotplt->contents);
+	  else
+	    bfd_put_64 (output_bfd,
+			sdyn->output_section->vma + sdyn->output_offset,
+			htab->elf.sgotplt->contents);
+	  /* Write GOT[1] and GOT[2], needed for the dynamic linker.  */
+	  bfd_put_64 (output_bfd, (bfd_vma) 0, htab->elf.sgotplt->contents + GOT_ENTRY_SIZE);
+	  bfd_put_64 (output_bfd, (bfd_vma) 0, htab->elf.sgotplt->contents + GOT_ENTRY_SIZE*2);
+	}
+
+      elf_section_data (htab->elf.sgotplt->output_section)->this_hdr.sh_entsize =
+	GOT_ENTRY_SIZE;
+    }
+
+  /* Adjust .eh_frame for .plt section.  */
+  if (htab->plt_eh_frame != NULL)
+    {
+      if (htab->elf.splt != NULL
+	  && htab->elf.splt->size != 0
+	  && (htab->elf.splt->flags & SEC_EXCLUDE) == 0
+	  && htab->elf.splt->output_section != NULL
+	  && htab->plt_eh_frame->output_section != NULL)
+	{
+	  bfd_vma plt_start = htab->elf.splt->output_section->vma;
+	  bfd_vma eh_frame_start = htab->plt_eh_frame->output_section->vma
+				   + htab->plt_eh_frame->output_offset
+				   + PLT_FDE_START_OFFSET;
+	  bfd_put_signed_32 (dynobj, plt_start - eh_frame_start,
+			     htab->plt_eh_frame->contents
+			     + PLT_FDE_START_OFFSET);
+	}
+      if (htab->plt_eh_frame->sec_info_type
+	  == ELF_INFO_TYPE_EH_FRAME)
+	{
+	  if (! _bfd_elf_write_section_eh_frame (output_bfd, info,
+						 htab->plt_eh_frame,
+						 htab->plt_eh_frame->contents))
+	    return FALSE;
+	}
+    }
+
+  if (htab->elf.sgot && htab->elf.sgot->size > 0)
+    elf_section_data (htab->elf.sgot->output_section)->this_hdr.sh_entsize
+      = GOT_ENTRY_SIZE;
+
+  /* Fill PLT and GOT entries for local STT_GNU_IFUNC symbols.  */
+  htab_traverse (htab->loc_hash_table,
+		 elf_x86_64_finish_local_dynamic_symbol,
+		 info);
+
+  return TRUE;
+}
+
+/* Return address for Ith PLT stub in section PLT, for relocation REL
+   or (bfd_vma) -1 if it should not be included.  */
+
+static bfd_vma
+elf_x86_64_plt_sym_val (bfd_vma i, const asection *plt,
+			const arelent *rel ATTRIBUTE_UNUSED)
+{
+  return plt->vma + (i + 1) * PLT_ENTRY_SIZE;
+}
+
+/* Handle an x86-64 specific section when reading an object file.  This
+   is called when elfcode.h finds a section with an unknown type.  */
+
+static bfd_boolean
+elf_x86_64_section_from_shdr (bfd *abfd,
+				Elf_Internal_Shdr *hdr,
+				const char *name,
+				int shindex)
+{
+  if (hdr->sh_type != SHT_X86_64_UNWIND)
+    return FALSE;
+
+  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Hook called by the linker routine which adds symbols from an object
+   file.  We use it to put SHN_X86_64_LCOMMON items in .lbss, instead
+   of .bss.  */
+
+static bfd_boolean
+elf_x86_64_add_symbol_hook (bfd *abfd,
+			    struct bfd_link_info *info,
+			    Elf_Internal_Sym *sym,
+			    const char **namep ATTRIBUTE_UNUSED,
+			    flagword *flagsp ATTRIBUTE_UNUSED,
+			    asection **secp,
+			    bfd_vma *valp)
+{
+  asection *lcomm;
+
+  switch (sym->st_shndx)
+    {
+    case SHN_X86_64_LCOMMON:
+      lcomm = bfd_get_section_by_name (abfd, "LARGE_COMMON");
+      if (lcomm == NULL)
+	{
+	  lcomm = bfd_make_section_with_flags (abfd,
+					       "LARGE_COMMON",
+					       (SEC_ALLOC
+						| SEC_IS_COMMON
+						| SEC_LINKER_CREATED));
+	  if (lcomm == NULL)
+	    return FALSE;
+	  elf_section_flags (lcomm) |= SHF_X86_64_LARGE;
+	}
+      *secp = lcomm;
+      *valp = sym->st_size;
+      return TRUE;
+    }
+
+  if ((abfd->flags & DYNAMIC) == 0
+      && (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC
+	  || ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE))
+    elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE;
+
+  return TRUE;
+}
+
+
+/* Given a BFD section, try to locate the corresponding ELF section
+   index.  */
+
+static bfd_boolean
+elf_x86_64_elf_section_from_bfd_section (bfd *abfd ATTRIBUTE_UNUSED,
+					 asection *sec, int *index_return)
+{
+  if (sec == &_bfd_elf_large_com_section)
+    {
+      *index_return = SHN_X86_64_LCOMMON;
+      return TRUE;
+    }
+  return FALSE;
+}
+
+/* Process a symbol.  */
+
+static void
+elf_x86_64_symbol_processing (bfd *abfd ATTRIBUTE_UNUSED,
+			      asymbol *asym)
+{
+  elf_symbol_type *elfsym = (elf_symbol_type *) asym;
+
+  switch (elfsym->internal_elf_sym.st_shndx)
+    {
+    case SHN_X86_64_LCOMMON:
+      asym->section = &_bfd_elf_large_com_section;
+      asym->value = elfsym->internal_elf_sym.st_size;
+      /* Common symbol doesn't set BSF_GLOBAL.  */
+      asym->flags &= ~BSF_GLOBAL;
+      break;
+    }
+}
+
+static bfd_boolean
+elf_x86_64_common_definition (Elf_Internal_Sym *sym)
+{
+  return (sym->st_shndx == SHN_COMMON
+	  || sym->st_shndx == SHN_X86_64_LCOMMON);
+}
+
+static unsigned int
+elf_x86_64_common_section_index (asection *sec)
+{
+  if ((elf_section_flags (sec) & SHF_X86_64_LARGE) == 0)
+    return SHN_COMMON;
+  else
+    return SHN_X86_64_LCOMMON;
+}
+
+static asection *
+elf_x86_64_common_section (asection *sec)
+{
+  if ((elf_section_flags (sec) & SHF_X86_64_LARGE) == 0)
+    return bfd_com_section_ptr;
+  else
+    return &_bfd_elf_large_com_section;
+}
+
+static bfd_boolean
+elf_x86_64_merge_symbol (struct bfd_link_info *info ATTRIBUTE_UNUSED,
+			 struct elf_link_hash_entry **sym_hash ATTRIBUTE_UNUSED,
+			 struct elf_link_hash_entry *h,
+			 Elf_Internal_Sym *sym,
+			 asection **psec,
+			 bfd_vma *pvalue ATTRIBUTE_UNUSED,
+			 unsigned int *pold_alignment ATTRIBUTE_UNUSED,
+			 bfd_boolean *skip ATTRIBUTE_UNUSED,
+			 bfd_boolean *override ATTRIBUTE_UNUSED,
+			 bfd_boolean *type_change_ok ATTRIBUTE_UNUSED,
+			 bfd_boolean *size_change_ok ATTRIBUTE_UNUSED,
+			 bfd_boolean *newdyn ATTRIBUTE_UNUSED,
+			 bfd_boolean *newdef,
+			 bfd_boolean *newdyncommon ATTRIBUTE_UNUSED,
+			 bfd_boolean *newweak ATTRIBUTE_UNUSED,
+			 bfd *abfd ATTRIBUTE_UNUSED,
+			 asection **sec,
+			 bfd_boolean *olddyn ATTRIBUTE_UNUSED,
+			 bfd_boolean *olddef,
+			 bfd_boolean *olddyncommon ATTRIBUTE_UNUSED,
+			 bfd_boolean *oldweak ATTRIBUTE_UNUSED,
+			 bfd *oldbfd,
+			 asection **oldsec)
+{
+  /* A normal common symbol and a large common symbol result in a
+     normal common symbol.  We turn the large common symbol into a
+     normal one.  */
+  if (!*olddef
+      && h->root.type == bfd_link_hash_common
+      && !*newdef
+      && bfd_is_com_section (*sec)
+      && *oldsec != *sec)
+    {
+      if (sym->st_shndx == SHN_COMMON
+	  && (elf_section_flags (*oldsec) & SHF_X86_64_LARGE) != 0)
+	{
+	  h->root.u.c.p->section
+	    = bfd_make_section_old_way (oldbfd, "COMMON");
+	  h->root.u.c.p->section->flags = SEC_ALLOC;
+	}
+      else if (sym->st_shndx == SHN_X86_64_LCOMMON
+	       && (elf_section_flags (*oldsec) & SHF_X86_64_LARGE) == 0)
+	*psec = *sec = bfd_com_section_ptr;
+    }
+
+  return TRUE;
+}
+
+static int
+elf_x86_64_additional_program_headers (bfd *abfd,
+				       struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  asection *s;
+  int count = 0;
+
+  /* Check to see if we need a large readonly segment.  */
+  s = bfd_get_section_by_name (abfd, ".lrodata");
+  if (s && (s->flags & SEC_LOAD))
+    count++;
+
+  /* Check to see if we need a large data segment.  Since .lbss sections
+     is placed right after the .bss section, there should be no need for
+     a large data segment just because of .lbss.  */
+  s = bfd_get_section_by_name (abfd, ".ldata");
+  if (s && (s->flags & SEC_LOAD))
+    count++;
+
+  return count;
+}
+
+/* Return TRUE if symbol should be hashed in the `.gnu.hash' section.  */
+
+static bfd_boolean
+elf_x86_64_hash_symbol (struct elf_link_hash_entry *h)
+{
+  if (h->plt.offset != (bfd_vma) -1
+      && !h->def_regular
+      && !h->pointer_equality_needed)
+    return FALSE;
+
+  return _bfd_elf_hash_symbol (h);
+}
+
+/* Return TRUE iff relocations for INPUT are compatible with OUTPUT. */
+
+static bfd_boolean
+elf_x86_64_relocs_compatible (const bfd_target *input,
+			      const bfd_target *output)
+{
+  return ((xvec_get_elf_backend_data (input)->s->elfclass
+	   == xvec_get_elf_backend_data (output)->s->elfclass)
+	  && _bfd_elf_relocs_compatible (input, output));
+}
+
+static const struct bfd_elf_special_section
+  elf_x86_64_special_sections[]=
+{
+  { STRING_COMMA_LEN (".gnu.linkonce.lb"), -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE + SHF_X86_64_LARGE},
+  { STRING_COMMA_LEN (".gnu.linkonce.lr"), -2, SHT_PROGBITS, SHF_ALLOC + SHF_X86_64_LARGE},
+  { STRING_COMMA_LEN (".gnu.linkonce.lt"), -2, SHT_PROGBITS, SHF_ALLOC + SHF_EXECINSTR + SHF_X86_64_LARGE},
+  { STRING_COMMA_LEN (".lbss"),	           -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE + SHF_X86_64_LARGE},
+  { STRING_COMMA_LEN (".ldata"),	   -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_X86_64_LARGE},
+  { STRING_COMMA_LEN (".lrodata"),	   -2, SHT_PROGBITS, SHF_ALLOC + SHF_X86_64_LARGE},
+  { NULL,	                0,          0, 0,            0 }
+};
+
+#define TARGET_LITTLE_SYM		    bfd_elf64_x86_64_vec
+#define TARGET_LITTLE_NAME		    "elf64-x86-64"
+#define ELF_ARCH			    bfd_arch_i386
+#define ELF_TARGET_ID			    X86_64_ELF_DATA
+#define ELF_MACHINE_CODE		    EM_X86_64
+#define ELF_MAXPAGESIZE			    0x200000
+#define ELF_MINPAGESIZE			    0x1000
+#define ELF_COMMONPAGESIZE		    0x1000
+
+#define elf_backend_can_gc_sections	    1
+#define elf_backend_can_refcount	    1
+#define elf_backend_want_got_plt	    1
+#define elf_backend_plt_readonly	    1
+#define elf_backend_want_plt_sym	    0
+#define elf_backend_got_header_size	    (GOT_ENTRY_SIZE*3)
+#define elf_backend_rela_normal		    1
+#define elf_backend_plt_alignment           4
+
+#define elf_info_to_howto		    elf_x86_64_info_to_howto
+
+#define bfd_elf64_bfd_link_hash_table_create \
+  elf_x86_64_link_hash_table_create
+#define bfd_elf64_bfd_link_hash_table_free \
+  elf_x86_64_link_hash_table_free
+#define bfd_elf64_bfd_reloc_type_lookup	    elf_x86_64_reloc_type_lookup
+#define bfd_elf64_bfd_reloc_name_lookup \
+  elf_x86_64_reloc_name_lookup
+
+#define elf_backend_adjust_dynamic_symbol   elf_x86_64_adjust_dynamic_symbol
+#define elf_backend_relocs_compatible	    elf_x86_64_relocs_compatible
+#define elf_backend_check_relocs	    elf_x86_64_check_relocs
+#define elf_backend_copy_indirect_symbol    elf_x86_64_copy_indirect_symbol
+#define elf_backend_create_dynamic_sections elf_x86_64_create_dynamic_sections
+#define elf_backend_finish_dynamic_sections elf_x86_64_finish_dynamic_sections
+#define elf_backend_finish_dynamic_symbol   elf_x86_64_finish_dynamic_symbol
+#define elf_backend_gc_mark_hook	    elf_x86_64_gc_mark_hook
+#define elf_backend_gc_sweep_hook	    elf_x86_64_gc_sweep_hook
+#define elf_backend_grok_prstatus	    elf_x86_64_grok_prstatus
+#define elf_backend_grok_psinfo		    elf_x86_64_grok_psinfo
+#ifdef CORE_HEADER
+#define elf_backend_write_core_note	    elf_x86_64_write_core_note
+#endif
+#define elf_backend_reloc_type_class	    elf_x86_64_reloc_type_class
+#define elf_backend_relocate_section	    elf_x86_64_relocate_section
+#define elf_backend_size_dynamic_sections   elf_x86_64_size_dynamic_sections
+#define elf_backend_always_size_sections    elf_x86_64_always_size_sections
+#define elf_backend_init_index_section	    _bfd_elf_init_1_index_section
+#define elf_backend_plt_sym_val		    elf_x86_64_plt_sym_val
+#define elf_backend_object_p		    elf64_x86_64_elf_object_p
+#define bfd_elf64_mkobject		    elf_x86_64_mkobject
+
+#define elf_backend_section_from_shdr \
+	elf_x86_64_section_from_shdr
+
+#define elf_backend_section_from_bfd_section \
+  elf_x86_64_elf_section_from_bfd_section
+#define elf_backend_add_symbol_hook \
+  elf_x86_64_add_symbol_hook
+#define elf_backend_symbol_processing \
+  elf_x86_64_symbol_processing
+#define elf_backend_common_section_index \
+  elf_x86_64_common_section_index
+#define elf_backend_common_section \
+  elf_x86_64_common_section
+#define elf_backend_common_definition \
+  elf_x86_64_common_definition
+#define elf_backend_merge_symbol \
+  elf_x86_64_merge_symbol
+#define elf_backend_special_sections \
+  elf_x86_64_special_sections
+#define elf_backend_additional_program_headers \
+  elf_x86_64_additional_program_headers
+#define elf_backend_hash_symbol \
+  elf_x86_64_hash_symbol
+
+#define elf_backend_post_process_headers  _bfd_elf_set_osabi
+
+#include "elf64-target.h"
+
+/* FreeBSD support.  */
+
+#undef  TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM		    bfd_elf64_x86_64_freebsd_vec
+#undef  TARGET_LITTLE_NAME
+#define TARGET_LITTLE_NAME		    "elf64-x86-64-freebsd"
+
+#undef	ELF_OSABI
+#define	ELF_OSABI			    ELFOSABI_FREEBSD
+
+#undef  elf64_bed
+#define elf64_bed elf64_x86_64_fbsd_bed
+
+#include "elf64-target.h"
+
+/* Solaris 2 support.  */
+
+#undef  TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM		    bfd_elf64_x86_64_sol2_vec
+#undef  TARGET_LITTLE_NAME
+#define TARGET_LITTLE_NAME		    "elf64-x86-64-sol2"
+
+/* Restore default: we cannot use ELFOSABI_SOLARIS, otherwise ELFOSABI_NONE
+   objects won't be recognized.  */
+#undef ELF_OSABI
+
+#undef  elf64_bed
+#define elf64_bed			    elf64_x86_64_sol2_bed
+
+/* The 64-bit static TLS arena size is rounded to the nearest 16-byte
+   boundary.  */
+#undef elf_backend_static_tls_alignment
+#define elf_backend_static_tls_alignment    16
+
+/* The Solaris 2 ABI requires a plt symbol on all platforms.
+
+   Cf. Linker and Libraries Guide, Ch. 2, Link-Editor, Generating the Output
+   File, p.63.  */
+#undef elf_backend_want_plt_sym
+#define elf_backend_want_plt_sym	    1
+
+#include "elf64-target.h"
+
+/* Intel L1OM support.  */
+
+static bfd_boolean
+elf64_l1om_elf_object_p (bfd *abfd)
+{
+  /* Set the right machine number for an L1OM elf64 file.  */
+  bfd_default_set_arch_mach (abfd, bfd_arch_l1om, bfd_mach_l1om);
+  return TRUE;
+}
+
+#undef  TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM		    bfd_elf64_l1om_vec
+#undef  TARGET_LITTLE_NAME
+#define TARGET_LITTLE_NAME		    "elf64-l1om"
+#undef ELF_ARCH
+#define ELF_ARCH			    bfd_arch_l1om
+
+#undef	ELF_MACHINE_CODE
+#define ELF_MACHINE_CODE		    EM_L1OM
+
+#undef	ELF_OSABI
+
+#undef  elf64_bed
+#define elf64_bed elf64_l1om_bed
+
+#undef elf_backend_object_p
+#define elf_backend_object_p		    elf64_l1om_elf_object_p
+
+#undef  elf_backend_static_tls_alignment
+
+#undef elf_backend_want_plt_sym
+#define elf_backend_want_plt_sym	    0
+
+#include "elf64-target.h"
+
+/* FreeBSD L1OM support.  */
+
+#undef  TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM		    bfd_elf64_l1om_freebsd_vec
+#undef  TARGET_LITTLE_NAME
+#define TARGET_LITTLE_NAME		    "elf64-l1om-freebsd"
+
+#undef	ELF_OSABI
+#define	ELF_OSABI			    ELFOSABI_FREEBSD
+
+#undef  elf64_bed
+#define elf64_bed elf64_l1om_fbsd_bed
+
+#include "elf64-target.h"
+
+/* Intel K1OM support.  */
+
+static bfd_boolean
+elf64_k1om_elf_object_p (bfd *abfd)
+{
+  /* Set the right machine number for an K1OM elf64 file.  */
+  bfd_default_set_arch_mach (abfd, bfd_arch_k1om, bfd_mach_k1om);
+  return TRUE;
+}
+
+#undef  TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM		    bfd_elf64_k1om_vec
+#undef  TARGET_LITTLE_NAME
+#define TARGET_LITTLE_NAME		    "elf64-k1om"
+#undef ELF_ARCH
+#define ELF_ARCH			    bfd_arch_k1om
+
+#undef	ELF_MACHINE_CODE
+#define ELF_MACHINE_CODE		    EM_K1OM
+
+#undef	ELF_OSABI
+
+#undef  elf64_bed
+#define elf64_bed elf64_k1om_bed
+
+#undef elf_backend_object_p
+#define elf_backend_object_p		    elf64_k1om_elf_object_p
+
+#undef  elf_backend_static_tls_alignment
+
+#undef elf_backend_want_plt_sym
+#define elf_backend_want_plt_sym	    0
+
+#include "elf64-target.h"
+
+/* FreeBSD K1OM support.  */
+
+#undef  TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM		    bfd_elf64_k1om_freebsd_vec
+#undef  TARGET_LITTLE_NAME
+#define TARGET_LITTLE_NAME		    "elf64-k1om-freebsd"
+
+#undef	ELF_OSABI
+#define	ELF_OSABI			    ELFOSABI_FREEBSD
+
+#undef  elf64_bed
+#define elf64_bed elf64_k1om_fbsd_bed
+
+#include "elf64-target.h"
+
+/* 32bit x86-64 support.  */
+
+static bfd_boolean
+elf32_x86_64_elf_object_p (bfd *abfd)
+{
+  /* Set the right machine number for an x86-64 elf32 file.  */
+  bfd_default_set_arch_mach (abfd, bfd_arch_i386, bfd_mach_x64_32);
+  return TRUE;
+}
+
+#undef  TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM		    bfd_elf32_x86_64_vec
+#undef  TARGET_LITTLE_NAME
+#define TARGET_LITTLE_NAME		    "elf32-x86-64"
+
+#undef ELF_ARCH
+#define ELF_ARCH			    bfd_arch_i386
+
+#undef	ELF_MACHINE_CODE
+#define ELF_MACHINE_CODE		    EM_X86_64
+
+#define bfd_elf32_bfd_link_hash_table_create \
+  elf_x86_64_link_hash_table_create
+#define bfd_elf32_bfd_link_hash_table_free \
+  elf_x86_64_link_hash_table_free
+#define bfd_elf32_bfd_reloc_type_lookup	\
+  elf_x86_64_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup \
+  elf_x86_64_reloc_name_lookup
+#define bfd_elf32_mkobject \
+  elf_x86_64_mkobject
+
+#undef	ELF_OSABI
+
+#undef elf_backend_object_p
+#define elf_backend_object_p \
+  elf32_x86_64_elf_object_p
+
+#undef elf_backend_bfd_from_remote_memory
+#define elf_backend_bfd_from_remote_memory \
+  _bfd_elf32_bfd_from_remote_memory
+
+#undef elf_backend_size_info
+#define elf_backend_size_info \
+  _bfd_elf32_size_info
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elf64.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elf64.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,23 @@
+/* ELF 64-bit executable support for BFD.
+   Copyright 1993, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define ARCH_SIZE		64
+
+#include "elfcode.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfcode.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfcode.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfcode.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfcode.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1860 @@
+/* ELF executable support for BFD.
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   Written by Fred Fish @ Cygnus Support, from information published
+   in "UNIX System V Release 4, Programmers Guide: ANSI C and
+   Programming Support Tools".  Sufficient support for gdb.
+
+   Rewritten by Mark Eichin @ Cygnus Support, from information
+   published in "System V Application Binary Interface", chapters 4
+   and 5, as well as the various "Processor Supplement" documents
+   derived from it. Added support for assembler and other object file
+   utilities.  Further work done by Ken Raeburn (Cygnus Support), Michael
+   Meissner (Open Software Foundation), and Peter Hoogenboom (University
+   of Utah) to finish and extend this.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* Problems and other issues to resolve.
+
+   (1)	BFD expects there to be some fixed number of "sections" in
+	the object file.  I.E. there is a "section_count" variable in the
+	bfd structure which contains the number of sections.  However, ELF
+	supports multiple "views" of a file.  In particular, with current
+	implementations, executable files typically have two tables, a
+	program header table and a section header table, both of which
+	partition the executable.
+
+	In ELF-speak, the "linking view" of the file uses the section header
+	table to access "sections" within the file, and the "execution view"
+	uses the program header table to access "segments" within the file.
+	"Segments" typically may contain all the data from one or more
+	"sections".
+
+	Note that the section header table is optional in ELF executables,
+	but it is this information that is most useful to gdb.  If the
+	section header table is missing, then gdb should probably try
+	to make do with the program header table.  (FIXME)
+
+   (2)  The code in this file is compiled twice, once in 32-bit mode and
+	once in 64-bit mode.  More of it should be made size-independent
+	and moved into elf.c.
+
+   (3)	ELF section symbols are handled rather sloppily now.  This should
+	be cleaned up, and ELF section symbols reconciled with BFD section
+	symbols.
+
+   (4)  We need a published spec for 64-bit ELF.  We've got some stuff here
+	that we're using for SPARC V9 64-bit chips, but don't assume that
+	it's cast in stone.
+ */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libiberty.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+
+/* Renaming structures, typedefs, macros and functions to be size-specific.  */
+#define Elf_External_Ehdr	NAME(Elf,External_Ehdr)
+#define Elf_External_Sym	NAME(Elf,External_Sym)
+#define Elf_External_Shdr	NAME(Elf,External_Shdr)
+#define Elf_External_Phdr	NAME(Elf,External_Phdr)
+#define Elf_External_Rel	NAME(Elf,External_Rel)
+#define Elf_External_Rela	NAME(Elf,External_Rela)
+#define Elf_External_Dyn	NAME(Elf,External_Dyn)
+
+#define elf_core_file_failing_command	NAME(bfd_elf,core_file_failing_command)
+#define elf_core_file_failing_signal	NAME(bfd_elf,core_file_failing_signal)
+#define elf_core_file_matches_executable_p \
+  NAME(bfd_elf,core_file_matches_executable_p)
+#define elf_core_file_pid		NAME(bfd_elf,core_file_pid)
+#define elf_object_p			NAME(bfd_elf,object_p)
+#define elf_core_file_p			NAME(bfd_elf,core_file_p)
+#define elf_get_symtab_upper_bound	NAME(bfd_elf,get_symtab_upper_bound)
+#define elf_get_dynamic_symtab_upper_bound \
+  NAME(bfd_elf,get_dynamic_symtab_upper_bound)
+#define elf_swap_reloc_in		NAME(bfd_elf,swap_reloc_in)
+#define elf_swap_reloca_in		NAME(bfd_elf,swap_reloca_in)
+#define elf_swap_reloc_out		NAME(bfd_elf,swap_reloc_out)
+#define elf_swap_reloca_out		NAME(bfd_elf,swap_reloca_out)
+#define elf_swap_symbol_in		NAME(bfd_elf,swap_symbol_in)
+#define elf_swap_symbol_out		NAME(bfd_elf,swap_symbol_out)
+#define elf_swap_phdr_in		NAME(bfd_elf,swap_phdr_in)
+#define elf_swap_phdr_out		NAME(bfd_elf,swap_phdr_out)
+#define elf_swap_dyn_in			NAME(bfd_elf,swap_dyn_in)
+#define elf_swap_dyn_out		NAME(bfd_elf,swap_dyn_out)
+#define elf_get_reloc_upper_bound	NAME(bfd_elf,get_reloc_upper_bound)
+#define elf_canonicalize_reloc		NAME(bfd_elf,canonicalize_reloc)
+#define elf_slurp_symbol_table		NAME(bfd_elf,slurp_symbol_table)
+#define elf_canonicalize_symtab		NAME(bfd_elf,canonicalize_symtab)
+#define elf_canonicalize_dynamic_symtab \
+  NAME(bfd_elf,canonicalize_dynamic_symtab)
+#define elf_get_synthetic_symtab \
+  NAME(bfd_elf,get_synthetic_symtab)
+#define elf_make_empty_symbol		NAME(bfd_elf,make_empty_symbol)
+#define elf_get_symbol_info		NAME(bfd_elf,get_symbol_info)
+#define elf_get_lineno			NAME(bfd_elf,get_lineno)
+#define elf_set_arch_mach		NAME(bfd_elf,set_arch_mach)
+#define elf_find_nearest_line		NAME(bfd_elf,find_nearest_line)
+#define elf_sizeof_headers		NAME(bfd_elf,sizeof_headers)
+#define elf_set_section_contents	NAME(bfd_elf,set_section_contents)
+#define elf_no_info_to_howto		NAME(bfd_elf,no_info_to_howto)
+#define elf_no_info_to_howto_rel	NAME(bfd_elf,no_info_to_howto_rel)
+#define elf_find_section		NAME(bfd_elf,find_section)
+#define elf_write_shdrs_and_ehdr	NAME(bfd_elf,write_shdrs_and_ehdr)
+#define elf_write_out_phdrs		NAME(bfd_elf,write_out_phdrs)
+#define elf_checksum_contents		NAME(bfd_elf,checksum_contents)
+#define elf_write_relocs		NAME(bfd_elf,write_relocs)
+#define elf_slurp_reloc_table		NAME(bfd_elf,slurp_reloc_table)
+
+#if ARCH_SIZE == 64
+#define ELF_R_INFO(X,Y)	ELF64_R_INFO(X,Y)
+#define ELF_R_SYM(X)	ELF64_R_SYM(X)
+#define ELF_R_TYPE(X)	ELF64_R_TYPE(X)
+#define ELFCLASS	ELFCLASS64
+#define FILE_ALIGN	8
+#define LOG_FILE_ALIGN	3
+#endif
+#if ARCH_SIZE == 32
+#define ELF_R_INFO(X,Y)	ELF32_R_INFO(X,Y)
+#define ELF_R_SYM(X)	ELF32_R_SYM(X)
+#define ELF_R_TYPE(X)	ELF32_R_TYPE(X)
+#define ELFCLASS	ELFCLASS32
+#define FILE_ALIGN	4
+#define LOG_FILE_ALIGN	2
+#endif
+
+#if DEBUG & 2
+static void elf_debug_section (int, Elf_Internal_Shdr *);
+#endif
+#if DEBUG & 1
+static void elf_debug_file (Elf_Internal_Ehdr *);
+#endif
+
+/* Structure swapping routines */
+
+/* Should perhaps use put_offset, put_word, etc.  For now, the two versions
+   can be handled by explicitly specifying 32 bits or "the long type".  */
+#if ARCH_SIZE == 64
+#define H_PUT_WORD		H_PUT_64
+#define H_PUT_SIGNED_WORD	H_PUT_S64
+#define H_GET_WORD		H_GET_64
+#define H_GET_SIGNED_WORD	H_GET_S64
+#endif
+#if ARCH_SIZE == 32
+#define H_PUT_WORD		H_PUT_32
+#define H_PUT_SIGNED_WORD	H_PUT_S32
+#define H_GET_WORD		H_GET_32
+#define H_GET_SIGNED_WORD	H_GET_S32
+#endif
+
+/* Translate an ELF symbol in external format into an ELF symbol in internal
+   format.  */
+
+bfd_boolean
+elf_swap_symbol_in (bfd *abfd,
+		    const void *psrc,
+		    const void *pshn,
+		    Elf_Internal_Sym *dst)
+{
+  const Elf_External_Sym *src = (const Elf_External_Sym *) psrc;
+  const Elf_External_Sym_Shndx *shndx = (const Elf_External_Sym_Shndx *) pshn;
+  int signed_vma = get_elf_backend_data (abfd)->sign_extend_vma;
+
+  dst->st_name = H_GET_32 (abfd, src->st_name);
+  if (signed_vma)
+    dst->st_value = H_GET_SIGNED_WORD (abfd, src->st_value);
+  else
+    dst->st_value = H_GET_WORD (abfd, src->st_value);
+  dst->st_size = H_GET_WORD (abfd, src->st_size);
+  dst->st_info = H_GET_8 (abfd, src->st_info);
+  dst->st_other = H_GET_8 (abfd, src->st_other);
+  dst->st_shndx = H_GET_16 (abfd, src->st_shndx);
+  if (dst->st_shndx == (SHN_XINDEX & 0xffff))
+    {
+      if (shndx == NULL)
+	return FALSE;
+      dst->st_shndx = H_GET_32 (abfd, shndx->est_shndx);
+    }
+  else if (dst->st_shndx >= (SHN_LORESERVE & 0xffff))
+    dst->st_shndx += SHN_LORESERVE - (SHN_LORESERVE & 0xffff);
+  dst->st_target_internal = 0;
+  return TRUE;
+}
+
+/* Translate an ELF symbol in internal format into an ELF symbol in external
+   format.  */
+
+void
+elf_swap_symbol_out (bfd *abfd,
+		     const Elf_Internal_Sym *src,
+		     void *cdst,
+		     void *shndx)
+{
+  unsigned int tmp;
+  Elf_External_Sym *dst = (Elf_External_Sym *) cdst;
+  H_PUT_32 (abfd, src->st_name, dst->st_name);
+  H_PUT_WORD (abfd, src->st_value, dst->st_value);
+  H_PUT_WORD (abfd, src->st_size, dst->st_size);
+  H_PUT_8 (abfd, src->st_info, dst->st_info);
+  H_PUT_8 (abfd, src->st_other, dst->st_other);
+  tmp = src->st_shndx;
+  if (tmp >= (SHN_LORESERVE & 0xffff) && tmp < SHN_LORESERVE)
+    {
+      if (shndx == NULL)
+	abort ();
+      H_PUT_32 (abfd, tmp, shndx);
+      tmp = SHN_XINDEX & 0xffff;
+    }
+  H_PUT_16 (abfd, tmp, dst->st_shndx);
+}
+
+/* Translate an ELF file header in external format into an ELF file header in
+   internal format.  */
+
+static void
+elf_swap_ehdr_in (bfd *abfd,
+		  const Elf_External_Ehdr *src,
+		  Elf_Internal_Ehdr *dst)
+{
+  int signed_vma = get_elf_backend_data (abfd)->sign_extend_vma;
+  memcpy (dst->e_ident, src->e_ident, EI_NIDENT);
+  dst->e_type = H_GET_16 (abfd, src->e_type);
+  dst->e_machine = H_GET_16 (abfd, src->e_machine);
+  dst->e_version = H_GET_32 (abfd, src->e_version);
+  if (signed_vma)
+    dst->e_entry = H_GET_SIGNED_WORD (abfd, src->e_entry);
+  else
+    dst->e_entry = H_GET_WORD (abfd, src->e_entry);
+  dst->e_phoff = H_GET_WORD (abfd, src->e_phoff);
+  dst->e_shoff = H_GET_WORD (abfd, src->e_shoff);
+  dst->e_flags = H_GET_32 (abfd, src->e_flags);
+  dst->e_ehsize = H_GET_16 (abfd, src->e_ehsize);
+  dst->e_phentsize = H_GET_16 (abfd, src->e_phentsize);
+  dst->e_phnum = H_GET_16 (abfd, src->e_phnum);
+  dst->e_shentsize = H_GET_16 (abfd, src->e_shentsize);
+  dst->e_shnum = H_GET_16 (abfd, src->e_shnum);
+  dst->e_shstrndx = H_GET_16 (abfd, src->e_shstrndx);
+}
+
+/* Translate an ELF file header in internal format into an ELF file header in
+   external format.  */
+
+static void
+elf_swap_ehdr_out (bfd *abfd,
+		   const Elf_Internal_Ehdr *src,
+		   Elf_External_Ehdr *dst)
+{
+  unsigned int tmp;
+  int signed_vma = get_elf_backend_data (abfd)->sign_extend_vma;
+  memcpy (dst->e_ident, src->e_ident, EI_NIDENT);
+  /* note that all elements of dst are *arrays of unsigned char* already...  */
+  H_PUT_16 (abfd, src->e_type, dst->e_type);
+  H_PUT_16 (abfd, src->e_machine, dst->e_machine);
+  H_PUT_32 (abfd, src->e_version, dst->e_version);
+  if (signed_vma)
+    H_PUT_SIGNED_WORD (abfd, src->e_entry, dst->e_entry);
+  else
+    H_PUT_WORD (abfd, src->e_entry, dst->e_entry);
+  H_PUT_WORD (abfd, src->e_phoff, dst->e_phoff);
+  H_PUT_WORD (abfd, src->e_shoff, dst->e_shoff);
+  H_PUT_32 (abfd, src->e_flags, dst->e_flags);
+  H_PUT_16 (abfd, src->e_ehsize, dst->e_ehsize);
+  H_PUT_16 (abfd, src->e_phentsize, dst->e_phentsize);
+  tmp = src->e_phnum;
+  if (tmp > PN_XNUM)
+    tmp = PN_XNUM;
+  H_PUT_16 (abfd, tmp, dst->e_phnum);
+  H_PUT_16 (abfd, src->e_shentsize, dst->e_shentsize);
+  tmp = src->e_shnum;
+  if (tmp >= (SHN_LORESERVE & 0xffff))
+    tmp = SHN_UNDEF;
+  H_PUT_16 (abfd, tmp, dst->e_shnum);
+  tmp = src->e_shstrndx;
+  if (tmp >= (SHN_LORESERVE & 0xffff))
+    tmp = SHN_XINDEX & 0xffff;
+  H_PUT_16 (abfd, tmp, dst->e_shstrndx);
+}
+
+/* Translate an ELF section header table entry in external format into an
+   ELF section header table entry in internal format.  */
+
+static void
+elf_swap_shdr_in (bfd *abfd,
+		  const Elf_External_Shdr *src,
+		  Elf_Internal_Shdr *dst)
+{
+  int signed_vma = get_elf_backend_data (abfd)->sign_extend_vma;
+
+  dst->sh_name = H_GET_32 (abfd, src->sh_name);
+  dst->sh_type = H_GET_32 (abfd, src->sh_type);
+  dst->sh_flags = H_GET_WORD (abfd, src->sh_flags);
+  if (signed_vma)
+    dst->sh_addr = H_GET_SIGNED_WORD (abfd, src->sh_addr);
+  else
+    dst->sh_addr = H_GET_WORD (abfd, src->sh_addr);
+  dst->sh_offset = H_GET_WORD (abfd, src->sh_offset);
+  dst->sh_size = H_GET_WORD (abfd, src->sh_size);
+  dst->sh_link = H_GET_32 (abfd, src->sh_link);
+  dst->sh_info = H_GET_32 (abfd, src->sh_info);
+  dst->sh_addralign = H_GET_WORD (abfd, src->sh_addralign);
+  dst->sh_entsize = H_GET_WORD (abfd, src->sh_entsize);
+  dst->bfd_section = NULL;
+  dst->contents = NULL;
+}
+
+/* Translate an ELF section header table entry in internal format into an
+   ELF section header table entry in external format.  */
+
+static void
+elf_swap_shdr_out (bfd *abfd,
+		   const Elf_Internal_Shdr *src,
+		   Elf_External_Shdr *dst)
+{
+  /* note that all elements of dst are *arrays of unsigned char* already...  */
+  H_PUT_32 (abfd, src->sh_name, dst->sh_name);
+  H_PUT_32 (abfd, src->sh_type, dst->sh_type);
+  H_PUT_WORD (abfd, src->sh_flags, dst->sh_flags);
+  H_PUT_WORD (abfd, src->sh_addr, dst->sh_addr);
+  H_PUT_WORD (abfd, src->sh_offset, dst->sh_offset);
+  H_PUT_WORD (abfd, src->sh_size, dst->sh_size);
+  H_PUT_32 (abfd, src->sh_link, dst->sh_link);
+  H_PUT_32 (abfd, src->sh_info, dst->sh_info);
+  H_PUT_WORD (abfd, src->sh_addralign, dst->sh_addralign);
+  H_PUT_WORD (abfd, src->sh_entsize, dst->sh_entsize);
+}
+
+/* Translate an ELF program header table entry in external format into an
+   ELF program header table entry in internal format.  */
+
+void
+elf_swap_phdr_in (bfd *abfd,
+		  const Elf_External_Phdr *src,
+		  Elf_Internal_Phdr *dst)
+{
+  int signed_vma = get_elf_backend_data (abfd)->sign_extend_vma;
+
+  dst->p_type = H_GET_32 (abfd, src->p_type);
+  dst->p_flags = H_GET_32 (abfd, src->p_flags);
+  dst->p_offset = H_GET_WORD (abfd, src->p_offset);
+  if (signed_vma)
+    {
+      dst->p_vaddr = H_GET_SIGNED_WORD (abfd, src->p_vaddr);
+      dst->p_paddr = H_GET_SIGNED_WORD (abfd, src->p_paddr);
+    }
+  else
+    {
+      dst->p_vaddr = H_GET_WORD (abfd, src->p_vaddr);
+      dst->p_paddr = H_GET_WORD (abfd, src->p_paddr);
+    }
+  dst->p_filesz = H_GET_WORD (abfd, src->p_filesz);
+  dst->p_memsz = H_GET_WORD (abfd, src->p_memsz);
+  dst->p_align = H_GET_WORD (abfd, src->p_align);
+}
+
+void
+elf_swap_phdr_out (bfd *abfd,
+		   const Elf_Internal_Phdr *src,
+		   Elf_External_Phdr *dst)
+{
+  const struct elf_backend_data *bed;
+  bfd_vma p_paddr;
+
+  bed = get_elf_backend_data (abfd);
+  p_paddr = bed->want_p_paddr_set_to_zero ? 0 : src->p_paddr;
+
+  /* note that all elements of dst are *arrays of unsigned char* already...  */
+  H_PUT_32 (abfd, src->p_type, dst->p_type);
+  H_PUT_WORD (abfd, src->p_offset, dst->p_offset);
+  H_PUT_WORD (abfd, src->p_vaddr, dst->p_vaddr);
+  H_PUT_WORD (abfd, p_paddr, dst->p_paddr);
+  H_PUT_WORD (abfd, src->p_filesz, dst->p_filesz);
+  H_PUT_WORD (abfd, src->p_memsz, dst->p_memsz);
+  H_PUT_32 (abfd, src->p_flags, dst->p_flags);
+  H_PUT_WORD (abfd, src->p_align, dst->p_align);
+}
+
+/* Translate an ELF reloc from external format to internal format.  */
+void
+elf_swap_reloc_in (bfd *abfd,
+		   const bfd_byte *s,
+		   Elf_Internal_Rela *dst)
+{
+  const Elf_External_Rel *src = (const Elf_External_Rel *) s;
+  dst->r_offset = H_GET_WORD (abfd, src->r_offset);
+  dst->r_info = H_GET_WORD (abfd, src->r_info);
+  dst->r_addend = 0;
+}
+
+void
+elf_swap_reloca_in (bfd *abfd,
+		    const bfd_byte *s,
+		    Elf_Internal_Rela *dst)
+{
+  const Elf_External_Rela *src = (const Elf_External_Rela *) s;
+  dst->r_offset = H_GET_WORD (abfd, src->r_offset);
+  dst->r_info = H_GET_WORD (abfd, src->r_info);
+  dst->r_addend = H_GET_SIGNED_WORD (abfd, src->r_addend);
+}
+
+/* Translate an ELF reloc from internal format to external format.  */
+void
+elf_swap_reloc_out (bfd *abfd,
+		    const Elf_Internal_Rela *src,
+		    bfd_byte *d)
+{
+  Elf_External_Rel *dst = (Elf_External_Rel *) d;
+  H_PUT_WORD (abfd, src->r_offset, dst->r_offset);
+  H_PUT_WORD (abfd, src->r_info, dst->r_info);
+}
+
+void
+elf_swap_reloca_out (bfd *abfd,
+		     const Elf_Internal_Rela *src,
+		     bfd_byte *d)
+{
+  Elf_External_Rela *dst = (Elf_External_Rela *) d;
+  H_PUT_WORD (abfd, src->r_offset, dst->r_offset);
+  H_PUT_WORD (abfd, src->r_info, dst->r_info);
+  H_PUT_SIGNED_WORD (abfd, src->r_addend, dst->r_addend);
+}
+
+void
+elf_swap_dyn_in (bfd *abfd,
+		 const void *p,
+		 Elf_Internal_Dyn *dst)
+{
+  const Elf_External_Dyn *src = (const Elf_External_Dyn *) p;
+
+  dst->d_tag = H_GET_WORD (abfd, src->d_tag);
+  dst->d_un.d_val = H_GET_WORD (abfd, src->d_un.d_val);
+}
+
+void
+elf_swap_dyn_out (bfd *abfd,
+		  const Elf_Internal_Dyn *src,
+		  void *p)
+{
+  Elf_External_Dyn *dst = (Elf_External_Dyn *) p;
+
+  H_PUT_WORD (abfd, src->d_tag, dst->d_tag);
+  H_PUT_WORD (abfd, src->d_un.d_val, dst->d_un.d_val);
+}
+
+/* ELF .o/exec file reading */
+
+/* Begin processing a given object.
+
+   First we validate the file by reading in the ELF header and checking
+   the magic number.  */
+
+static inline bfd_boolean
+elf_file_p (Elf_External_Ehdr *x_ehdrp)
+{
+  return ((x_ehdrp->e_ident[EI_MAG0] == ELFMAG0)
+	  && (x_ehdrp->e_ident[EI_MAG1] == ELFMAG1)
+	  && (x_ehdrp->e_ident[EI_MAG2] == ELFMAG2)
+	  && (x_ehdrp->e_ident[EI_MAG3] == ELFMAG3));
+}
+
+/* Check to see if the file associated with ABFD matches the target vector
+   that ABFD points to.
+
+   Note that we may be called several times with the same ABFD, but different
+   target vectors, most of which will not match.  We have to avoid leaving
+   any side effects in ABFD, or any data it points to (like tdata), if the
+   file does not match the target vector.  */
+
+const bfd_target *
+elf_object_p (bfd *abfd)
+{
+  Elf_External_Ehdr x_ehdr;	/* Elf file header, external form */
+  Elf_Internal_Ehdr *i_ehdrp;	/* Elf file header, internal form */
+  Elf_External_Shdr x_shdr;	/* Section header table entry, external form */
+  Elf_Internal_Shdr i_shdr;
+  Elf_Internal_Shdr *i_shdrp;	/* Section header table, internal form */
+  unsigned int shindex;
+  const struct elf_backend_data *ebd;
+  struct bfd_preserve preserve;
+  asection *s;
+  bfd_size_type amt;
+  const bfd_target *target;
+
+  preserve.marker = NULL;
+
+  /* Read in the ELF header in external format.  */
+
+  if (bfd_bread (&x_ehdr, sizeof (x_ehdr), abfd) != sizeof (x_ehdr))
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	goto got_wrong_format_error;
+      else
+	goto got_no_match;
+    }
+
+  /* Now check to see if we have a valid ELF file, and one that BFD can
+     make use of.  The magic number must match, the address size ('class')
+     and byte-swapping must match our XVEC entry, and it must have a
+     section header table (FIXME: See comments re sections at top of this
+     file).  */
+
+  if (! elf_file_p (&x_ehdr)
+      || x_ehdr.e_ident[EI_VERSION] != EV_CURRENT
+      || x_ehdr.e_ident[EI_CLASS] != ELFCLASS)
+    goto got_wrong_format_error;
+
+  /* Check that file's byte order matches xvec's */
+  switch (x_ehdr.e_ident[EI_DATA])
+    {
+    case ELFDATA2MSB:		/* Big-endian */
+      if (! bfd_header_big_endian (abfd))
+	goto got_wrong_format_error;
+      break;
+    case ELFDATA2LSB:		/* Little-endian */
+      if (! bfd_header_little_endian (abfd))
+	goto got_wrong_format_error;
+      break;
+    case ELFDATANONE:		/* No data encoding specified */
+    default:			/* Unknown data encoding specified */
+      goto got_wrong_format_error;
+    }
+
+  if (!bfd_preserve_save (abfd, &preserve))
+    goto got_no_match;
+
+  target = abfd->xvec;
+
+  /* Allocate an instance of the elf_obj_tdata structure and hook it up to
+     the tdata pointer in the bfd.  */
+
+  if (! (*target->_bfd_set_format[bfd_object]) (abfd))
+    goto got_no_match;
+  preserve.marker = elf_tdata (abfd);
+
+  /* Now that we know the byte order, swap in the rest of the header */
+  i_ehdrp = elf_elfheader (abfd);
+  elf_swap_ehdr_in (abfd, &x_ehdr, i_ehdrp);
+#if DEBUG & 1
+  elf_debug_file (i_ehdrp);
+#endif
+
+  /* Reject ET_CORE (header indicates core file, not object file) */
+  if (i_ehdrp->e_type == ET_CORE)
+    goto got_wrong_format_error;
+
+  /* If this is a relocatable file and there is no section header
+     table, then we're hosed.  */
+  if (i_ehdrp->e_shoff == 0 && i_ehdrp->e_type == ET_REL)
+    goto got_wrong_format_error;
+
+  /* As a simple sanity check, verify that what BFD thinks is the
+     size of each section header table entry actually matches the size
+     recorded in the file, but only if there are any sections.  */
+  if (i_ehdrp->e_shentsize != sizeof (x_shdr) && i_ehdrp->e_shnum != 0)
+    goto got_wrong_format_error;
+
+  /* Further sanity check.  */
+  if (i_ehdrp->e_shoff == 0 && i_ehdrp->e_shnum != 0)
+    goto got_wrong_format_error;
+
+  ebd = get_elf_backend_data (abfd);
+  if (ebd->s->arch_size != ARCH_SIZE)
+    goto got_wrong_format_error;
+
+  /* Check that the ELF e_machine field matches what this particular
+     BFD format expects.  */
+  if (ebd->elf_machine_code != i_ehdrp->e_machine
+      && (ebd->elf_machine_alt1 == 0
+	  || i_ehdrp->e_machine != ebd->elf_machine_alt1)
+      && (ebd->elf_machine_alt2 == 0
+	  || i_ehdrp->e_machine != ebd->elf_machine_alt2)
+      && ebd->elf_machine_code != EM_NONE)
+    goto got_wrong_format_error;
+
+  if (i_ehdrp->e_type == ET_EXEC)
+    abfd->flags |= EXEC_P;
+  else if (i_ehdrp->e_type == ET_DYN)
+    abfd->flags |= DYNAMIC;
+
+  if (i_ehdrp->e_phnum > 0)
+    abfd->flags |= D_PAGED;
+
+  if (! bfd_default_set_arch_mach (abfd, ebd->arch, 0))
+    {
+      /* It's OK if this fails for the generic target.  */
+      if (ebd->elf_machine_code != EM_NONE)
+	goto got_no_match;
+    }
+
+  if (ebd->elf_machine_code != EM_NONE
+      && i_ehdrp->e_ident[EI_OSABI] != ebd->elf_osabi
+      && ebd->elf_osabi != ELFOSABI_NONE)
+    goto got_wrong_format_error;
+
+  if (i_ehdrp->e_shoff != 0)
+    {
+      bfd_signed_vma where = i_ehdrp->e_shoff;
+
+      if (where != (file_ptr) where)
+	goto got_wrong_format_error;
+
+      /* Seek to the section header table in the file.  */
+      if (bfd_seek (abfd, (file_ptr) where, SEEK_SET) != 0)
+	goto got_no_match;
+
+      /* Read the first section header at index 0, and convert to internal
+	 form.  */
+      if (bfd_bread (&x_shdr, sizeof x_shdr, abfd) != sizeof (x_shdr))
+	goto got_no_match;
+      elf_swap_shdr_in (abfd, &x_shdr, &i_shdr);
+
+      /* If the section count is zero, the actual count is in the first
+	 section header.  */
+      if (i_ehdrp->e_shnum == SHN_UNDEF)
+	{
+	  i_ehdrp->e_shnum = i_shdr.sh_size;
+	  if (i_ehdrp->e_shnum != i_shdr.sh_size
+	      || i_ehdrp->e_shnum == 0)
+	    goto got_wrong_format_error;
+	}
+
+      /* And similarly for the string table index.  */
+      if (i_ehdrp->e_shstrndx == (SHN_XINDEX & 0xffff))
+	{
+	  i_ehdrp->e_shstrndx = i_shdr.sh_link;
+	  if (i_ehdrp->e_shstrndx != i_shdr.sh_link)
+	    goto got_wrong_format_error;
+	}
+
+      /* And program headers.  */
+      if (i_ehdrp->e_phnum == PN_XNUM && i_shdr.sh_info != 0)
+	{
+	  i_ehdrp->e_phnum = i_shdr.sh_info;
+	  if (i_ehdrp->e_phnum != i_shdr.sh_info)
+	    goto got_wrong_format_error;
+	}
+
+      /* Sanity check that we can read all of the section headers.
+	 It ought to be good enough to just read the last one.  */
+      if (i_ehdrp->e_shnum != 1)
+	{
+	  /* Check that we don't have a totally silly number of sections.  */
+	  if (i_ehdrp->e_shnum > (unsigned int) -1 / sizeof (x_shdr)
+	      || i_ehdrp->e_shnum > (unsigned int) -1 / sizeof (i_shdr))
+	    goto got_wrong_format_error;
+
+	  where += (i_ehdrp->e_shnum - 1) * sizeof (x_shdr);
+	  if (where != (file_ptr) where)
+	    goto got_wrong_format_error;
+	  if ((bfd_size_type) where <= i_ehdrp->e_shoff)
+	    goto got_wrong_format_error;
+
+	  if (bfd_seek (abfd, (file_ptr) where, SEEK_SET) != 0)
+	    goto got_no_match;
+	  if (bfd_bread (&x_shdr, sizeof x_shdr, abfd) != sizeof (x_shdr))
+	    goto got_no_match;
+
+	  /* Back to where we were.  */
+	  where = i_ehdrp->e_shoff + sizeof (x_shdr);
+	  if (bfd_seek (abfd, (file_ptr) where, SEEK_SET) != 0)
+	    goto got_no_match;
+	}
+    }
+
+  /* Allocate space for a copy of the section header table in
+     internal form.  */
+  if (i_ehdrp->e_shnum != 0)
+    {
+      Elf_Internal_Shdr *shdrp;
+      unsigned int num_sec;
+
+      amt = sizeof (*i_shdrp) * i_ehdrp->e_shnum;
+      i_shdrp = (Elf_Internal_Shdr *) bfd_alloc (abfd, amt);
+      if (!i_shdrp)
+	goto got_no_match;
+      num_sec = i_ehdrp->e_shnum;
+      elf_numsections (abfd) = num_sec;
+      amt = sizeof (i_shdrp) * num_sec;
+      elf_elfsections (abfd) = (Elf_Internal_Shdr **) bfd_alloc (abfd, amt);
+      if (!elf_elfsections (abfd))
+	goto got_no_match;
+
+      memcpy (i_shdrp, &i_shdr, sizeof (*i_shdrp));
+      for (shdrp = i_shdrp, shindex = 0; shindex < num_sec; shindex++)
+	elf_elfsections (abfd)[shindex] = shdrp++;
+
+      /* Read in the rest of the section header table and convert it
+	 to internal form.  */
+      for (shindex = 1; shindex < i_ehdrp->e_shnum; shindex++)
+	{
+	  if (bfd_bread (&x_shdr, sizeof x_shdr, abfd) != sizeof (x_shdr))
+	    goto got_no_match;
+	  elf_swap_shdr_in (abfd, &x_shdr, i_shdrp + shindex);
+
+	  /* Sanity check sh_link and sh_info.  */
+	  if (i_shdrp[shindex].sh_link >= num_sec)
+	    {
+	      /* PR 10478: Accept Solaris binaries with a sh_link
+		 field set to SHN_BEFORE or SHN_AFTER.  */
+	      switch (ebd->elf_machine_code)
+		{
+		case EM_386:
+		case EM_486:
+		case EM_X86_64:
+		case EM_OLD_SPARCV9:
+		case EM_SPARC32PLUS:
+		case EM_SPARCV9:
+		case EM_SPARC:
+		  if (i_shdrp[shindex].sh_link == (SHN_LORESERVE & 0xffff) /* SHN_BEFORE */
+		      || i_shdrp[shindex].sh_link == ((SHN_LORESERVE + 1) & 0xffff) /* SHN_AFTER */)
+		    break;
+		  /* Otherwise fall through.  */
+		default:
+		  goto got_wrong_format_error;
+		}
+	    }
+
+	  if (((i_shdrp[shindex].sh_flags & SHF_INFO_LINK)
+	       || i_shdrp[shindex].sh_type == SHT_RELA
+	       || i_shdrp[shindex].sh_type == SHT_REL)
+	      && i_shdrp[shindex].sh_info >= num_sec)
+	    goto got_wrong_format_error;
+
+	  /* If the section is loaded, but not page aligned, clear
+	     D_PAGED.  */
+	  if (i_shdrp[shindex].sh_size != 0
+	      && (i_shdrp[shindex].sh_flags & SHF_ALLOC) != 0
+	      && i_shdrp[shindex].sh_type != SHT_NOBITS
+	      && (((i_shdrp[shindex].sh_addr - i_shdrp[shindex].sh_offset)
+		   % ebd->minpagesize)
+		  != 0))
+	    abfd->flags &= ~D_PAGED;
+	}
+    }
+
+  /* A further sanity check.  */
+  if (i_ehdrp->e_shnum != 0)
+    {
+      if (i_ehdrp->e_shstrndx >= elf_numsections (abfd))
+	{
+	  /* PR 2257:
+	     We used to just goto got_wrong_format_error here
+	     but there are binaries in existance for which this test
+	     will prevent the binutils from working with them at all.
+	     So we are kind, and reset the string index value to 0
+	     so that at least some processing can be done.  */
+	  i_ehdrp->e_shstrndx = SHN_UNDEF;
+	  _bfd_error_handler (_("warning: %s has a corrupt string table index - ignoring"), abfd->filename);
+	}
+    }
+  else if (i_ehdrp->e_shstrndx != SHN_UNDEF)
+    goto got_wrong_format_error;
+
+  /* Read in the program headers.  */
+  if (i_ehdrp->e_phnum == 0)
+    elf_tdata (abfd)->phdr = NULL;
+  else
+    {
+      Elf_Internal_Phdr *i_phdr;
+      unsigned int i;
+
+      amt = i_ehdrp->e_phnum * sizeof (Elf_Internal_Phdr);
+      elf_tdata (abfd)->phdr = (Elf_Internal_Phdr *) bfd_alloc (abfd, amt);
+      if (elf_tdata (abfd)->phdr == NULL)
+	goto got_no_match;
+      if (bfd_seek (abfd, (file_ptr) i_ehdrp->e_phoff, SEEK_SET) != 0)
+	goto got_no_match;
+      i_phdr = elf_tdata (abfd)->phdr;
+      for (i = 0; i < i_ehdrp->e_phnum; i++, i_phdr++)
+	{
+	  Elf_External_Phdr x_phdr;
+
+	  if (bfd_bread (&x_phdr, sizeof x_phdr, abfd) != sizeof x_phdr)
+	    goto got_no_match;
+	  elf_swap_phdr_in (abfd, &x_phdr, i_phdr);
+	}
+    }
+
+  if (i_ehdrp->e_shstrndx != 0 && i_ehdrp->e_shoff != 0)
+    {
+      unsigned int num_sec;
+
+      /* Once all of the section headers have been read and converted, we
+	 can start processing them.  Note that the first section header is
+	 a dummy placeholder entry, so we ignore it.  */
+      num_sec = elf_numsections (abfd);
+      for (shindex = 1; shindex < num_sec; shindex++)
+	if (!bfd_section_from_shdr (abfd, shindex))
+	  goto got_no_match;
+
+      /* Set up ELF sections for SHF_GROUP and SHF_LINK_ORDER.  */
+      if (! _bfd_elf_setup_sections (abfd))
+	goto got_wrong_format_error;
+    }
+
+  /* Let the backend double check the format and override global
+     information.  */
+  if (ebd->elf_backend_object_p)
+    {
+      if (! (*ebd->elf_backend_object_p) (abfd))
+	goto got_wrong_format_error;
+    }
+
+  /* Remember the entry point specified in the ELF file header.  */
+  bfd_set_start_address (abfd, i_ehdrp->e_entry);
+
+  /* If we have created any reloc sections that are associated with
+     debugging sections, mark the reloc sections as debugging as well.  */
+  for (s = abfd->sections; s != NULL; s = s->next)
+    {
+      if ((elf_section_data (s)->this_hdr.sh_type == SHT_REL
+	   || elf_section_data (s)->this_hdr.sh_type == SHT_RELA)
+	  && elf_section_data (s)->this_hdr.sh_info > 0)
+	{
+	  unsigned long targ_index;
+	  asection *targ_sec;
+
+	  targ_index = elf_section_data (s)->this_hdr.sh_info;
+	  targ_sec = bfd_section_from_elf_index (abfd, targ_index);
+	  if (targ_sec != NULL
+	      && (targ_sec->flags & SEC_DEBUGGING) != 0)
+	    s->flags |= SEC_DEBUGGING;
+	}
+    }
+
+  bfd_preserve_finish (abfd, &preserve);
+  return target;
+
+ got_wrong_format_error:
+  /* There is way too much undoing of half-known state here.  The caller,
+     bfd_check_format_matches, really shouldn't iterate on live bfd's to
+     check match/no-match like it does.  We have to rely on that a call to
+     bfd_default_set_arch_mach with the previously known mach, undoes what
+     was done by the first bfd_default_set_arch_mach (with mach 0) here.
+     For this to work, only elf-data and the mach may be changed by the
+     target-specific elf_backend_object_p function.  Note that saving the
+     whole bfd here and restoring it would be even worse; the first thing
+     you notice is that the cached bfd file position gets out of sync.  */
+  bfd_set_error (bfd_error_wrong_format);
+
+ got_no_match:
+  if (preserve.marker != NULL)
+    bfd_preserve_restore (abfd, &preserve);
+  return NULL;
+}
+
+/* ELF .o/exec file writing */
+
+/* Write out the relocs.  */
+
+void
+elf_write_relocs (bfd *abfd, asection *sec, void *data)
+{
+  bfd_boolean *failedp = (bfd_boolean *) data;
+  Elf_Internal_Shdr *rela_hdr;
+  bfd_vma addr_offset;
+  void (*swap_out) (bfd *, const Elf_Internal_Rela *, bfd_byte *);
+  size_t extsize;
+  bfd_byte *dst_rela;
+  unsigned int idx;
+  asymbol *last_sym;
+  int last_sym_idx;
+
+  /* If we have already failed, don't do anything.  */
+  if (*failedp)
+    return;
+
+  if ((sec->flags & SEC_RELOC) == 0)
+    return;
+
+  /* The linker backend writes the relocs out itself, and sets the
+     reloc_count field to zero to inhibit writing them here.  Also,
+     sometimes the SEC_RELOC flag gets set even when there aren't any
+     relocs.  */
+  if (sec->reloc_count == 0)
+    return;
+
+  /* If we have opened an existing file for update, reloc_count may be
+     set even though we are not linking.  In that case we have nothing
+     to do.  */
+  if (sec->orelocation == NULL)
+    return;
+
+  rela_hdr = elf_section_data (sec)->rela.hdr;
+  if (rela_hdr == NULL)
+    rela_hdr = elf_section_data (sec)->rel.hdr;
+
+  rela_hdr->sh_size = rela_hdr->sh_entsize * sec->reloc_count;
+  rela_hdr->contents = (unsigned char *) bfd_alloc (abfd, rela_hdr->sh_size);
+  if (rela_hdr->contents == NULL)
+    {
+      *failedp = TRUE;
+      return;
+    }
+
+  /* Figure out whether the relocations are RELA or REL relocations.  */
+  if (rela_hdr->sh_type == SHT_RELA)
+    {
+      swap_out = elf_swap_reloca_out;
+      extsize = sizeof (Elf_External_Rela);
+    }
+  else if (rela_hdr->sh_type == SHT_REL)
+    {
+      swap_out = elf_swap_reloc_out;
+      extsize = sizeof (Elf_External_Rel);
+    }
+  else
+    /* Every relocation section should be either an SHT_RELA or an
+       SHT_REL section.  */
+    abort ();
+
+  /* The address of an ELF reloc is section relative for an object
+     file, and absolute for an executable file or shared library.
+     The address of a BFD reloc is always section relative.  */
+  addr_offset = 0;
+  if ((abfd->flags & (EXEC_P | DYNAMIC)) != 0)
+    addr_offset = sec->vma;
+
+  /* orelocation has the data, reloc_count has the count...  */
+  last_sym = 0;
+  last_sym_idx = 0;
+  dst_rela = rela_hdr->contents;
+
+  for (idx = 0; idx < sec->reloc_count; idx++, dst_rela += extsize)
+    {
+      Elf_Internal_Rela src_rela;
+      arelent *ptr;
+      asymbol *sym;
+      int n;
+
+      ptr = sec->orelocation[idx];
+      sym = *ptr->sym_ptr_ptr;
+      if (sym == last_sym)
+	n = last_sym_idx;
+      else if (bfd_is_abs_section (sym->section) && sym->value == 0)
+	n = STN_UNDEF;
+      else
+	{
+	  last_sym = sym;
+	  n = _bfd_elf_symbol_from_bfd_symbol (abfd, &sym);
+	  if (n < 0)
+	    {
+	      *failedp = TRUE;
+	      return;
+	    }
+	  last_sym_idx = n;
+	}
+
+      if ((*ptr->sym_ptr_ptr)->the_bfd != NULL
+	  && (*ptr->sym_ptr_ptr)->the_bfd->xvec != abfd->xvec
+	  && ! _bfd_elf_validate_reloc (abfd, ptr))
+	{
+	  *failedp = TRUE;
+	  return;
+	}
+
+      src_rela.r_offset = ptr->address + addr_offset;
+      src_rela.r_info = ELF_R_INFO (n, ptr->howto->type);
+      src_rela.r_addend = ptr->addend;
+      (*swap_out) (abfd, &src_rela, dst_rela);
+    }
+}
+
+/* Write out the program headers.  */
+
+int
+elf_write_out_phdrs (bfd *abfd,
+		     const Elf_Internal_Phdr *phdr,
+		     unsigned int count)
+{
+  while (count--)
+    {
+      Elf_External_Phdr extphdr;
+      elf_swap_phdr_out (abfd, phdr, &extphdr);
+      if (bfd_bwrite (&extphdr, sizeof (Elf_External_Phdr), abfd)
+	  != sizeof (Elf_External_Phdr))
+	return -1;
+      phdr++;
+    }
+  return 0;
+}
+
+/* Write out the section headers and the ELF file header.  */
+
+bfd_boolean
+elf_write_shdrs_and_ehdr (bfd *abfd)
+{
+  Elf_External_Ehdr x_ehdr;	/* Elf file header, external form */
+  Elf_Internal_Ehdr *i_ehdrp;	/* Elf file header, internal form */
+  Elf_External_Shdr *x_shdrp;	/* Section header table, external form */
+  Elf_Internal_Shdr **i_shdrp;	/* Section header table, internal form */
+  unsigned int count;
+  bfd_size_type amt;
+
+  i_ehdrp = elf_elfheader (abfd);
+  i_shdrp = elf_elfsections (abfd);
+
+  /* swap the header before spitting it out...  */
+
+#if DEBUG & 1
+  elf_debug_file (i_ehdrp);
+#endif
+  elf_swap_ehdr_out (abfd, i_ehdrp, &x_ehdr);
+  amt = sizeof (x_ehdr);
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
+      || bfd_bwrite (&x_ehdr, amt, abfd) != amt)
+    return FALSE;
+
+  /* Some fields in the first section header handle overflow of ehdr
+     fields.  */
+  if (i_ehdrp->e_phnum >= PN_XNUM)
+    i_shdrp[0]->sh_info = i_ehdrp->e_phnum;
+  if (i_ehdrp->e_shnum >= (SHN_LORESERVE & 0xffff))
+    i_shdrp[0]->sh_size = i_ehdrp->e_shnum;
+  if (i_ehdrp->e_shstrndx >= (SHN_LORESERVE & 0xffff))
+    i_shdrp[0]->sh_link = i_ehdrp->e_shstrndx;
+
+  /* at this point we've concocted all the ELF sections...  */
+  amt = i_ehdrp->e_shnum;
+  amt *= sizeof (*x_shdrp);
+  x_shdrp = (Elf_External_Shdr *) bfd_alloc (abfd, amt);
+  if (!x_shdrp)
+    return FALSE;
+
+  for (count = 0; count < i_ehdrp->e_shnum; i_shdrp++, count++)
+    {
+#if DEBUG & 2
+      elf_debug_section (count, *i_shdrp);
+#endif
+      elf_swap_shdr_out (abfd, *i_shdrp, x_shdrp + count);
+    }
+  if (bfd_seek (abfd, (file_ptr) i_ehdrp->e_shoff, SEEK_SET) != 0
+      || bfd_bwrite (x_shdrp, amt, abfd) != amt)
+    return FALSE;
+
+  /* need to dump the string table too...  */
+
+  return TRUE;
+}
+
+bfd_boolean
+elf_checksum_contents (bfd *abfd,
+		       void (*process) (const void *, size_t, void *),
+		       void *arg)
+{
+  Elf_Internal_Ehdr *i_ehdrp = elf_elfheader (abfd);
+  Elf_Internal_Shdr **i_shdrp = elf_elfsections (abfd);
+  Elf_Internal_Phdr *i_phdrp = elf_tdata (abfd)->phdr;
+  unsigned int count, num;
+
+  {
+    Elf_External_Ehdr x_ehdr;
+    Elf_Internal_Ehdr i_ehdr;
+
+    i_ehdr = *i_ehdrp;
+    i_ehdr.e_phoff = i_ehdr.e_shoff = 0;
+    elf_swap_ehdr_out (abfd, &i_ehdr, &x_ehdr);
+    (*process) (&x_ehdr, sizeof x_ehdr, arg);
+  }
+
+  num = i_ehdrp->e_phnum;
+  for (count = 0; count < num; count++)
+    {
+      Elf_External_Phdr x_phdr;
+      elf_swap_phdr_out (abfd, &i_phdrp[count], &x_phdr);
+      (*process) (&x_phdr, sizeof x_phdr, arg);
+    }
+
+  num = elf_numsections (abfd);
+  for (count = 0; count < num; count++)
+    {
+      Elf_Internal_Shdr i_shdr;
+      Elf_External_Shdr x_shdr;
+
+      i_shdr = *i_shdrp[count];
+      i_shdr.sh_offset = 0;
+
+      elf_swap_shdr_out (abfd, &i_shdr, &x_shdr);
+      (*process) (&x_shdr, sizeof x_shdr, arg);
+
+      if (i_shdr.contents)
+	(*process) (i_shdr.contents, i_shdr.sh_size, arg);
+    }
+
+  return TRUE;
+}
+
+long
+elf_slurp_symbol_table (bfd *abfd, asymbol **symptrs, bfd_boolean dynamic)
+{
+  Elf_Internal_Shdr *hdr;
+  Elf_Internal_Shdr *verhdr;
+  unsigned long symcount;	/* Number of external ELF symbols */
+  elf_symbol_type *sym;		/* Pointer to current bfd symbol */
+  elf_symbol_type *symbase;	/* Buffer for generated bfd symbols */
+  Elf_Internal_Sym *isym;
+  Elf_Internal_Sym *isymend;
+  Elf_Internal_Sym *isymbuf = NULL;
+  Elf_External_Versym *xver;
+  Elf_External_Versym *xverbuf = NULL;
+  const struct elf_backend_data *ebd;
+  bfd_size_type amt;
+
+  /* Read each raw ELF symbol, converting from external ELF form to
+     internal ELF form, and then using the information to create a
+     canonical bfd symbol table entry.
+
+     Note that we allocate the initial bfd canonical symbol buffer
+     based on a one-to-one mapping of the ELF symbols to canonical
+     symbols.  We actually use all the ELF symbols, so there will be no
+     space left over at the end.  When we have all the symbols, we
+     build the caller's pointer vector.  */
+
+  if (! dynamic)
+    {
+      hdr = &elf_tdata (abfd)->symtab_hdr;
+      verhdr = NULL;
+    }
+  else
+    {
+      hdr = &elf_tdata (abfd)->dynsymtab_hdr;
+      if (elf_dynversym (abfd) == 0)
+	verhdr = NULL;
+      else
+	verhdr = &elf_tdata (abfd)->dynversym_hdr;
+      if ((elf_tdata (abfd)->dynverdef_section != 0
+	   && elf_tdata (abfd)->verdef == NULL)
+	  || (elf_tdata (abfd)->dynverref_section != 0
+	      && elf_tdata (abfd)->verref == NULL))
+	{
+	  if (!_bfd_elf_slurp_version_tables (abfd, FALSE))
+	    return -1;
+	}
+    }
+
+  ebd = get_elf_backend_data (abfd);
+  symcount = hdr->sh_size / sizeof (Elf_External_Sym);
+  if (symcount == 0)
+    sym = symbase = NULL;
+  else
+    {
+      isymbuf = bfd_elf_get_elf_syms (abfd, hdr, symcount, 0,
+				      NULL, NULL, NULL);
+      if (isymbuf == NULL)
+	return -1;
+
+      amt = symcount;
+      amt *= sizeof (elf_symbol_type);
+      symbase = (elf_symbol_type *) bfd_zalloc (abfd, amt);
+      if (symbase == (elf_symbol_type *) NULL)
+	goto error_return;
+
+      /* Read the raw ELF version symbol information.  */
+      if (verhdr != NULL
+	  && verhdr->sh_size / sizeof (Elf_External_Versym) != symcount)
+	{
+	  (*_bfd_error_handler)
+	    (_("%s: version count (%ld) does not match symbol count (%ld)"),
+	     abfd->filename,
+	     (long) (verhdr->sh_size / sizeof (Elf_External_Versym)),
+	     symcount);
+
+	  /* Slurp in the symbols without the version information,
+	     since that is more helpful than just quitting.  */
+	  verhdr = NULL;
+	}
+
+      if (verhdr != NULL)
+	{
+	  if (bfd_seek (abfd, verhdr->sh_offset, SEEK_SET) != 0)
+	    goto error_return;
+
+	  xverbuf = (Elf_External_Versym *) bfd_malloc (verhdr->sh_size);
+	  if (xverbuf == NULL && verhdr->sh_size != 0)
+	    goto error_return;
+
+	  if (bfd_bread (xverbuf, verhdr->sh_size, abfd) != verhdr->sh_size)
+	    goto error_return;
+	}
+
+      /* Skip first symbol, which is a null dummy.  */
+      xver = xverbuf;
+      if (xver != NULL)
+	++xver;
+      isymend = isymbuf + symcount;
+      for (isym = isymbuf + 1, sym = symbase; isym < isymend; isym++, sym++)
+	{
+	  memcpy (&sym->internal_elf_sym, isym, sizeof (Elf_Internal_Sym));
+	  sym->symbol.the_bfd = abfd;
+
+	  sym->symbol.name = bfd_elf_sym_name (abfd, hdr, isym, NULL);
+
+	  sym->symbol.value = isym->st_value;
+
+	  if (isym->st_shndx == SHN_UNDEF)
+	    {
+	      sym->symbol.section = bfd_und_section_ptr;
+	    }
+	  else if (isym->st_shndx == SHN_ABS)
+	    {
+	      sym->symbol.section = bfd_abs_section_ptr;
+	    }
+	  else if (isym->st_shndx == SHN_COMMON)
+	    {
+	      sym->symbol.section = bfd_com_section_ptr;
+	      if ((abfd->flags & BFD_PLUGIN) != 0)
+		{
+		  asection *xc = bfd_get_section_by_name (abfd, "COMMON");
+
+		  if (xc == NULL)
+		    {
+		      flagword flags = (SEC_ALLOC | SEC_IS_COMMON | SEC_KEEP
+					| SEC_EXCLUDE);
+		      xc = bfd_make_section_with_flags (abfd, "COMMON", flags);
+		      if (xc == NULL)
+			goto error_return;
+		    }
+		  sym->symbol.section = xc;
+		}
+	      /* Elf puts the alignment into the `value' field, and
+		 the size into the `size' field.  BFD wants to see the
+		 size in the value field, and doesn't care (at the
+		 moment) about the alignment.  */
+	      sym->symbol.value = isym->st_size;
+	    }
+	  else
+	    {
+	      sym->symbol.section
+		= bfd_section_from_elf_index (abfd, isym->st_shndx);
+	      if (sym->symbol.section == NULL)
+		{
+		  /* This symbol is in a section for which we did not
+		     create a BFD section.  Just use bfd_abs_section,
+		     although it is wrong.  FIXME.  */
+		  sym->symbol.section = bfd_abs_section_ptr;
+		}
+	    }
+
+	  /* If this is a relocatable file, then the symbol value is
+	     already section relative.  */
+	  if ((abfd->flags & (EXEC_P | DYNAMIC)) != 0)
+	    sym->symbol.value -= sym->symbol.section->vma;
+
+	  switch (ELF_ST_BIND (isym->st_info))
+	    {
+	    case STB_LOCAL:
+	      sym->symbol.flags |= BSF_LOCAL;
+	      break;
+	    case STB_GLOBAL:
+	      if (isym->st_shndx != SHN_UNDEF && isym->st_shndx != SHN_COMMON)
+		sym->symbol.flags |= BSF_GLOBAL;
+	      break;
+	    case STB_WEAK:
+	      sym->symbol.flags |= BSF_WEAK;
+	      break;
+	    case STB_GNU_UNIQUE:
+	      sym->symbol.flags |= BSF_GNU_UNIQUE;
+	      break;
+	    }
+
+	  switch (ELF_ST_TYPE (isym->st_info))
+	    {
+	    case STT_SECTION:
+	      sym->symbol.flags |= BSF_SECTION_SYM | BSF_DEBUGGING;
+	      break;
+	    case STT_FILE:
+	      sym->symbol.flags |= BSF_FILE | BSF_DEBUGGING;
+	      break;
+	    case STT_FUNC:
+	      sym->symbol.flags |= BSF_FUNCTION;
+	      break;
+	    case STT_COMMON:
+	      /* FIXME: Do we have to put the size field into the value field
+		 as we do with symbols in SHN_COMMON sections (see above) ?  */
+	      /* Fall through.  */
+	    case STT_OBJECT:
+	      sym->symbol.flags |= BSF_OBJECT;
+	      break;
+	    case STT_TLS:
+	      sym->symbol.flags |= BSF_THREAD_LOCAL;
+	      break;
+	    case STT_RELC:
+	      sym->symbol.flags |= BSF_RELC;
+	      break;
+	    case STT_SRELC:
+	      sym->symbol.flags |= BSF_SRELC;
+	      break;
+	    case STT_GNU_IFUNC:
+	      sym->symbol.flags |= BSF_GNU_INDIRECT_FUNCTION;
+	      break;
+	    }
+
+	  if (dynamic)
+	    sym->symbol.flags |= BSF_DYNAMIC;
+
+	  if (xver != NULL)
+	    {
+	      Elf_Internal_Versym iversym;
+
+	      _bfd_elf_swap_versym_in (abfd, xver, &iversym);
+	      sym->version = iversym.vs_vers;
+	      xver++;
+	    }
+
+	  /* Do some backend-specific processing on this symbol.  */
+	  if (ebd->elf_backend_symbol_processing)
+	    (*ebd->elf_backend_symbol_processing) (abfd, &sym->symbol);
+	}
+    }
+
+  /* Do some backend-specific processing on this symbol table.  */
+  if (ebd->elf_backend_symbol_table_processing)
+    (*ebd->elf_backend_symbol_table_processing) (abfd, symbase, symcount);
+
+  /* We rely on the zalloc to clear out the final symbol entry.  */
+
+  symcount = sym - symbase;
+
+  /* Fill in the user's symbol pointer vector if needed.  */
+  if (symptrs)
+    {
+      long l = symcount;
+
+      sym = symbase;
+      while (l-- > 0)
+	{
+	  *symptrs++ = &sym->symbol;
+	  sym++;
+	}
+      *symptrs = 0;		/* Final null pointer */
+    }
+
+  if (xverbuf != NULL)
+    free (xverbuf);
+  if (isymbuf != NULL && hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  return symcount;
+
+error_return:
+  if (xverbuf != NULL)
+    free (xverbuf);
+  if (isymbuf != NULL && hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  return -1;
+}
+
+/* Read relocations for ASECT from REL_HDR.  There are RELOC_COUNT of
+   them.  */
+
+static bfd_boolean
+elf_slurp_reloc_table_from_section (bfd *abfd,
+				    asection *asect,
+				    Elf_Internal_Shdr *rel_hdr,
+				    bfd_size_type reloc_count,
+				    arelent *relents,
+				    asymbol **symbols,
+				    bfd_boolean dynamic)
+{
+  const struct elf_backend_data * const ebd = get_elf_backend_data (abfd);
+  void *allocated = NULL;
+  bfd_byte *native_relocs;
+  arelent *relent;
+  unsigned int i;
+  int entsize;
+  unsigned int symcount;
+
+  allocated = bfd_malloc (rel_hdr->sh_size);
+  if (allocated == NULL)
+    goto error_return;
+
+  if (bfd_seek (abfd, rel_hdr->sh_offset, SEEK_SET) != 0
+      || (bfd_bread (allocated, rel_hdr->sh_size, abfd)
+	  != rel_hdr->sh_size))
+    goto error_return;
+
+  native_relocs = (bfd_byte *) allocated;
+
+  entsize = rel_hdr->sh_entsize;
+  BFD_ASSERT (entsize == sizeof (Elf_External_Rel)
+	      || entsize == sizeof (Elf_External_Rela));
+
+  if (dynamic)
+    symcount = bfd_get_dynamic_symcount (abfd);
+  else
+    symcount = bfd_get_symcount (abfd);
+
+  for (i = 0, relent = relents;
+       i < reloc_count;
+       i++, relent++, native_relocs += entsize)
+    {
+      Elf_Internal_Rela rela;
+
+      if (entsize == sizeof (Elf_External_Rela))
+	elf_swap_reloca_in (abfd, native_relocs, &rela);
+      else
+	elf_swap_reloc_in (abfd, native_relocs, &rela);
+
+      /* The address of an ELF reloc is section relative for an object
+	 file, and absolute for an executable file or shared library.
+	 The address of a normal BFD reloc is always section relative,
+	 and the address of a dynamic reloc is absolute..  */
+      if ((abfd->flags & (EXEC_P | DYNAMIC)) == 0 || dynamic)
+	relent->address = rela.r_offset;
+      else
+	relent->address = rela.r_offset - asect->vma;
+
+      if (ELF_R_SYM (rela.r_info) == STN_UNDEF)
+	relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+      else if (ELF_R_SYM (rela.r_info) > symcount)
+	{
+	  (*_bfd_error_handler)
+	    (_("%s(%s): relocation %d has invalid symbol index %ld"),
+	     abfd->filename, asect->name, i, ELF_R_SYM (rela.r_info));
+	  relent->sym_ptr_ptr = bfd_abs_section.symbol_ptr_ptr;
+	}
+      else
+	{
+	  asymbol **ps;
+
+	  ps = symbols + ELF_R_SYM (rela.r_info) - 1;
+
+	  relent->sym_ptr_ptr = ps;
+	}
+
+      relent->addend = rela.r_addend;
+
+      if ((entsize == sizeof (Elf_External_Rela)
+	   && ebd->elf_info_to_howto != NULL)
+	  || ebd->elf_info_to_howto_rel == NULL)
+	(*ebd->elf_info_to_howto) (abfd, relent, &rela);
+      else
+	(*ebd->elf_info_to_howto_rel) (abfd, relent, &rela);
+    }
+
+  if (allocated != NULL)
+    free (allocated);
+
+  return TRUE;
+
+ error_return:
+  if (allocated != NULL)
+    free (allocated);
+  return FALSE;
+}
+
+/* Read in and swap the external relocs.  */
+
+bfd_boolean
+elf_slurp_reloc_table (bfd *abfd,
+		       asection *asect,
+		       asymbol **symbols,
+		       bfd_boolean dynamic)
+{
+  struct bfd_elf_section_data * const d = elf_section_data (asect);
+  Elf_Internal_Shdr *rel_hdr;
+  Elf_Internal_Shdr *rel_hdr2;
+  bfd_size_type reloc_count;
+  bfd_size_type reloc_count2;
+  arelent *relents;
+  bfd_size_type amt;
+
+  if (asect->relocation != NULL)
+    return TRUE;
+
+  if (! dynamic)
+    {
+      if ((asect->flags & SEC_RELOC) == 0
+	  || asect->reloc_count == 0)
+	return TRUE;
+
+      rel_hdr = d->rel.hdr;
+      reloc_count = rel_hdr ? NUM_SHDR_ENTRIES (rel_hdr) : 0;
+      rel_hdr2 = d->rela.hdr;
+      reloc_count2 = rel_hdr2 ? NUM_SHDR_ENTRIES (rel_hdr2) : 0;
+
+      BFD_ASSERT (asect->reloc_count == reloc_count + reloc_count2);
+      BFD_ASSERT ((rel_hdr && asect->rel_filepos == rel_hdr->sh_offset)
+		  || (rel_hdr2 && asect->rel_filepos == rel_hdr2->sh_offset));
+
+    }
+  else
+    {
+      /* Note that ASECT->RELOC_COUNT tends not to be accurate in this
+	 case because relocations against this section may use the
+	 dynamic symbol table, and in that case bfd_section_from_shdr
+	 in elf.c does not update the RELOC_COUNT.  */
+      if (asect->size == 0)
+	return TRUE;
+
+      rel_hdr = &d->this_hdr;
+      reloc_count = NUM_SHDR_ENTRIES (rel_hdr);
+      rel_hdr2 = NULL;
+      reloc_count2 = 0;
+    }
+
+  amt = (reloc_count + reloc_count2) * sizeof (arelent);
+  relents = (arelent *) bfd_alloc (abfd, amt);
+  if (relents == NULL)
+    return FALSE;
+
+  if (rel_hdr
+      && !elf_slurp_reloc_table_from_section (abfd, asect,
+					      rel_hdr, reloc_count,
+					      relents,
+					      symbols, dynamic))
+    return FALSE;
+
+  if (rel_hdr2
+      && !elf_slurp_reloc_table_from_section (abfd, asect,
+					      rel_hdr2, reloc_count2,
+					      relents + reloc_count,
+					      symbols, dynamic))
+    return FALSE;
+
+  asect->relocation = relents;
+  return TRUE;
+}
+
+#if DEBUG & 2
+static void
+elf_debug_section (int num, Elf_Internal_Shdr *hdr)
+{
+  fprintf (stderr, "\nSection#%d '%s' 0x%.8lx\n", num,
+	   hdr->bfd_section != NULL ? hdr->bfd_section->name : "",
+	   (long) hdr);
+  fprintf (stderr,
+	   "sh_name      = %ld\tsh_type      = %ld\tsh_flags     = %ld\n",
+	   (long) hdr->sh_name,
+	   (long) hdr->sh_type,
+	   (long) hdr->sh_flags);
+  fprintf (stderr,
+	   "sh_addr      = %ld\tsh_offset    = %ld\tsh_size      = %ld\n",
+	   (long) hdr->sh_addr,
+	   (long) hdr->sh_offset,
+	   (long) hdr->sh_size);
+  fprintf (stderr,
+	   "sh_link      = %ld\tsh_info      = %ld\tsh_addralign = %ld\n",
+	   (long) hdr->sh_link,
+	   (long) hdr->sh_info,
+	   (long) hdr->sh_addralign);
+  fprintf (stderr, "sh_entsize   = %ld\n",
+	   (long) hdr->sh_entsize);
+  fflush (stderr);
+}
+#endif
+
+#if DEBUG & 1
+static void
+elf_debug_file (Elf_Internal_Ehdr *ehdrp)
+{
+  fprintf (stderr, "e_entry      = 0x%.8lx\n", (long) ehdrp->e_entry);
+  fprintf (stderr, "e_phoff      = %ld\n", (long) ehdrp->e_phoff);
+  fprintf (stderr, "e_phnum      = %ld\n", (long) ehdrp->e_phnum);
+  fprintf (stderr, "e_phentsize  = %ld\n", (long) ehdrp->e_phentsize);
+  fprintf (stderr, "e_shoff      = %ld\n", (long) ehdrp->e_shoff);
+  fprintf (stderr, "e_shnum      = %ld\n", (long) ehdrp->e_shnum);
+  fprintf (stderr, "e_shentsize  = %ld\n", (long) ehdrp->e_shentsize);
+}
+#endif
+
+/* Create a new BFD as if by bfd_openr.  Rather than opening a file,
+   reconstruct an ELF file by reading the segments out of remote memory
+   based on the ELF file header at EHDR_VMA and the ELF program headers it
+   points to.  If not null, *LOADBASEP is filled in with the difference
+   between the VMAs from which the segments were read, and the VMAs the
+   file headers (and hence BFD's idea of each section's VMA) put them at.
+
+   The function TARGET_READ_MEMORY is called to copy LEN bytes from the
+   remote memory at target address VMA into the local buffer at MYADDR; it
+   should return zero on success or an `errno' code on failure.  TEMPL must
+   be a BFD for a target with the word size and byte order found in the
+   remote memory.  */
+
+bfd *
+NAME(_bfd_elf,bfd_from_remote_memory)
+  (bfd *templ,
+   bfd_vma ehdr_vma,
+   bfd_vma *loadbasep,
+   int (*target_read_memory) (bfd_vma, bfd_byte *, int))
+{
+  Elf_External_Ehdr x_ehdr;	/* Elf file header, external form */
+  Elf_Internal_Ehdr i_ehdr;	/* Elf file header, internal form */
+  Elf_External_Phdr *x_phdrs;
+  Elf_Internal_Phdr *i_phdrs, *last_phdr;
+  bfd *nbfd;
+  struct bfd_in_memory *bim;
+  int contents_size;
+  bfd_byte *contents;
+  int err;
+  unsigned int i;
+  bfd_vma loadbase;
+  bfd_boolean loadbase_set;
+
+  /* Read in the ELF header in external format.  */
+  err = target_read_memory (ehdr_vma, (bfd_byte *) &x_ehdr, sizeof x_ehdr);
+  if (err)
+    {
+      bfd_set_error (bfd_error_system_call);
+      errno = err;
+      return NULL;
+    }
+
+  /* Now check to see if we have a valid ELF file, and one that BFD can
+     make use of.  The magic number must match, the address size ('class')
+     and byte-swapping must match our XVEC entry.  */
+
+  if (! elf_file_p (&x_ehdr)
+      || x_ehdr.e_ident[EI_VERSION] != EV_CURRENT
+      || x_ehdr.e_ident[EI_CLASS] != ELFCLASS)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  /* Check that file's byte order matches xvec's */
+  switch (x_ehdr.e_ident[EI_DATA])
+    {
+    case ELFDATA2MSB:		/* Big-endian */
+      if (! bfd_header_big_endian (templ))
+	{
+	  bfd_set_error (bfd_error_wrong_format);
+	  return NULL;
+	}
+      break;
+    case ELFDATA2LSB:		/* Little-endian */
+      if (! bfd_header_little_endian (templ))
+	{
+	  bfd_set_error (bfd_error_wrong_format);
+	  return NULL;
+	}
+      break;
+    case ELFDATANONE:		/* No data encoding specified */
+    default:			/* Unknown data encoding specified */
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  elf_swap_ehdr_in (templ, &x_ehdr, &i_ehdr);
+
+  /* The file header tells where to find the program headers.
+     These are what we use to actually choose what to read.  */
+
+  if (i_ehdr.e_phentsize != sizeof (Elf_External_Phdr) || i_ehdr.e_phnum == 0)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  x_phdrs = (Elf_External_Phdr *)
+      bfd_malloc (i_ehdr.e_phnum * (sizeof *x_phdrs + sizeof *i_phdrs));
+  if (x_phdrs == NULL)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+  err = target_read_memory (ehdr_vma + i_ehdr.e_phoff, (bfd_byte *) x_phdrs,
+			    i_ehdr.e_phnum * sizeof x_phdrs[0]);
+  if (err)
+    {
+      free (x_phdrs);
+      bfd_set_error (bfd_error_system_call);
+      errno = err;
+      return NULL;
+    }
+  i_phdrs = (Elf_Internal_Phdr *) &x_phdrs[i_ehdr.e_phnum];
+
+  contents_size = 0;
+  last_phdr = NULL;
+  loadbase = ehdr_vma;
+  loadbase_set = FALSE;
+  for (i = 0; i < i_ehdr.e_phnum; ++i)
+    {
+      elf_swap_phdr_in (templ, &x_phdrs[i], &i_phdrs[i]);
+      if (i_phdrs[i].p_type == PT_LOAD)
+	{
+	  bfd_vma segment_end;
+	  segment_end = (i_phdrs[i].p_offset + i_phdrs[i].p_filesz
+			 + i_phdrs[i].p_align - 1) & -i_phdrs[i].p_align;
+	  if (segment_end > (bfd_vma) contents_size)
+	    contents_size = segment_end;
+
+	  /* LOADADDR is the `Base address' from the gELF specification:
+	     `lowest p_vaddr value for a PT_LOAD segment' is P_VADDR from the
+	     first PT_LOAD as PT_LOADs are ordered by P_VADDR.  */
+	  if (!loadbase_set && (i_phdrs[i].p_offset & -i_phdrs[i].p_align) == 0)
+	    {
+	      loadbase = ehdr_vma - (i_phdrs[i].p_vaddr & -i_phdrs[i].p_align);
+	      loadbase_set = TRUE;
+	    }
+
+	  last_phdr = &i_phdrs[i];
+	}
+    }
+  if (last_phdr == NULL)
+    {
+      /* There were no PT_LOAD segments, so we don't have anything to read.  */
+      free (x_phdrs);
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  /* Trim the last segment so we don't bother with zeros in the last page
+     that are off the end of the file.  However, if the extra bit in that
+     page includes the section headers, keep them.  */
+  if ((bfd_vma) contents_size > last_phdr->p_offset + last_phdr->p_filesz
+      && (bfd_vma) contents_size >= (i_ehdr.e_shoff
+				     + i_ehdr.e_shnum * i_ehdr.e_shentsize))
+    {
+      contents_size = last_phdr->p_offset + last_phdr->p_filesz;
+      if ((bfd_vma) contents_size < (i_ehdr.e_shoff
+				     + i_ehdr.e_shnum * i_ehdr.e_shentsize))
+	contents_size = i_ehdr.e_shoff + i_ehdr.e_shnum * i_ehdr.e_shentsize;
+    }
+  else
+    contents_size = last_phdr->p_offset + last_phdr->p_filesz;
+
+  /* Now we know the size of the whole image we want read in.  */
+  contents = (bfd_byte *) bfd_zmalloc (contents_size);
+  if (contents == NULL)
+    {
+      free (x_phdrs);
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+
+  for (i = 0; i < i_ehdr.e_phnum; ++i)
+    if (i_phdrs[i].p_type == PT_LOAD)
+      {
+	bfd_vma start = i_phdrs[i].p_offset & -i_phdrs[i].p_align;
+	bfd_vma end = (i_phdrs[i].p_offset + i_phdrs[i].p_filesz
+		       + i_phdrs[i].p_align - 1) & -i_phdrs[i].p_align;
+	if (end > (bfd_vma) contents_size)
+	  end = contents_size;
+	err = target_read_memory ((loadbase + i_phdrs[i].p_vaddr)
+				  & -i_phdrs[i].p_align,
+				  contents + start, end - start);
+	if (err)
+	  {
+	    free (x_phdrs);
+	    free (contents);
+	    bfd_set_error (bfd_error_system_call);
+	    errno = err;
+	    return NULL;
+	  }
+      }
+  free (x_phdrs);
+
+  /* If the segments visible in memory didn't include the section headers,
+     then clear them from the file header.  */
+  if ((bfd_vma) contents_size < (i_ehdr.e_shoff
+				 + i_ehdr.e_shnum * i_ehdr.e_shentsize))
+    {
+      memset (&x_ehdr.e_shoff, 0, sizeof x_ehdr.e_shoff);
+      memset (&x_ehdr.e_shnum, 0, sizeof x_ehdr.e_shnum);
+      memset (&x_ehdr.e_shstrndx, 0, sizeof x_ehdr.e_shstrndx);
+    }
+
+  /* This will normally have been in the first PT_LOAD segment.  But it
+     conceivably could be missing, and we might have just changed it.  */
+  memcpy (contents, &x_ehdr, sizeof x_ehdr);
+
+  /* Now we have a memory image of the ELF file contents.  Make a BFD.  */
+  bim = (struct bfd_in_memory *) bfd_malloc (sizeof (struct bfd_in_memory));
+  if (bim == NULL)
+    {
+      free (contents);
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+  nbfd = _bfd_new_bfd ();
+  if (nbfd == NULL)
+    {
+      free (bim);
+      free (contents);
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+  nbfd->filename = "<in-memory>";
+  nbfd->xvec = templ->xvec;
+  bim->size = contents_size;
+  bim->buffer = contents;
+  nbfd->iostream = bim;
+  nbfd->flags = BFD_IN_MEMORY;
+  nbfd->iovec = &_bfd_memory_iovec;
+  nbfd->origin = 0;
+  nbfd->direction = read_direction;
+  nbfd->mtime = time (NULL);
+  nbfd->mtime_set = TRUE;
+
+  if (loadbasep)
+    *loadbasep = loadbase;
+  return nbfd;
+}
+
+/* Function for ELF_R_INFO.  */
+
+bfd_vma
+NAME(elf,r_info) (bfd_vma sym, bfd_vma type)
+{
+  return ELF_R_INFO (sym, type);
+}
+
+/* Function for ELF_R_SYM.  */
+
+bfd_vma
+NAME(elf,r_sym) (bfd_vma r_info)
+{
+  return ELF_R_SYM (r_info);
+}
+
+#include "elfcore.h"
+
+/* Size-dependent data and functions.  */
+const struct elf_size_info NAME(_bfd_elf,size_info) = {
+  sizeof (Elf_External_Ehdr),
+  sizeof (Elf_External_Phdr),
+  sizeof (Elf_External_Shdr),
+  sizeof (Elf_External_Rel),
+  sizeof (Elf_External_Rela),
+  sizeof (Elf_External_Sym),
+  sizeof (Elf_External_Dyn),
+  sizeof (Elf_External_Note),
+  4,
+  1,
+  ARCH_SIZE, LOG_FILE_ALIGN,
+  ELFCLASS, EV_CURRENT,
+  elf_write_out_phdrs,
+  elf_write_shdrs_and_ehdr,
+  elf_checksum_contents,
+  elf_write_relocs,
+  elf_swap_symbol_in,
+  elf_swap_symbol_out,
+  elf_slurp_reloc_table,
+  elf_slurp_symbol_table,
+  elf_swap_dyn_in,
+  elf_swap_dyn_out,
+  elf_swap_reloc_in,
+  elf_swap_reloc_out,
+  elf_swap_reloca_in,
+  elf_swap_reloca_out
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfcore.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfcore.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfcore.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfcore.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,341 @@
+/* ELF core file support for BFD.
+   Copyright 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2007,
+   2008, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+char*
+elf_core_file_failing_command (bfd *abfd)
+{
+  return elf_tdata (abfd)->core_command;
+}
+
+int
+elf_core_file_failing_signal (bfd *abfd)
+{
+  return elf_tdata (abfd)->core_signal;
+}
+
+int
+elf_core_file_pid (bfd *abfd)
+{
+  return elf_tdata (abfd)->core_pid;
+}
+
+bfd_boolean
+elf_core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)
+{
+  char* corename;
+
+  /* xvecs must match if both are ELF files for the same target.  */
+
+  if (core_bfd->xvec != exec_bfd->xvec)
+    {
+      bfd_set_error (bfd_error_system_call);
+      return FALSE;
+    }
+
+  /* See if the name in the corefile matches the executable name.  */
+  corename = elf_tdata (core_bfd)->core_program;
+  if (corename != NULL)
+    {
+      const char* execname = strrchr (exec_bfd->filename, '/');
+
+      execname = execname ? execname + 1 : exec_bfd->filename;
+
+      if (strcmp (execname, corename) != 0)
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/*  Core files are simply standard ELF formatted files that partition
+    the file using the execution view of the file (program header table)
+    rather than the linking view.  In fact, there is no section header
+    table in a core file.
+
+    The process status information (including the contents of the general
+    register set) and the floating point register set are stored in a
+    segment of type PT_NOTE.  We handcraft a couple of extra bfd sections
+    that allow standard bfd access to the general registers (.reg) and the
+    floating point registers (.reg2).  */
+
+const bfd_target *
+elf_core_file_p (bfd *abfd)
+{
+  Elf_External_Ehdr x_ehdr;	/* Elf file header, external form.  */
+  Elf_Internal_Ehdr *i_ehdrp;	/* Elf file header, internal form.  */
+  Elf_Internal_Phdr *i_phdrp;	/* Elf program header, internal form.  */
+  unsigned int phindex;
+  const struct elf_backend_data *ebd;
+  struct bfd_preserve preserve;
+  bfd_size_type amt;
+
+  preserve.marker = NULL;
+
+  /* Read in the ELF header in external format.  */
+  if (bfd_bread (&x_ehdr, sizeof (x_ehdr), abfd) != sizeof (x_ehdr))
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	goto wrong;
+      else
+	goto fail;
+    }
+
+  /* Check the magic number.  */
+  if (! elf_file_p (&x_ehdr))
+    goto wrong;
+
+  /* FIXME: Check EI_VERSION here !  */
+
+  /* Check the address size ("class").  */
+  if (x_ehdr.e_ident[EI_CLASS] != ELFCLASS)
+    goto wrong;
+
+  /* Check the byteorder.  */
+  switch (x_ehdr.e_ident[EI_DATA])
+    {
+    case ELFDATA2MSB:		/* Big-endian.  */
+      if (! bfd_big_endian (abfd))
+	goto wrong;
+      break;
+    case ELFDATA2LSB:		/* Little-endian.  */
+      if (! bfd_little_endian (abfd))
+	goto wrong;
+      break;
+    default:
+      goto wrong;
+    }
+
+  if (!bfd_preserve_save (abfd, &preserve))
+    goto fail;
+
+  /* Give abfd an elf_obj_tdata.  */
+  if (! (*abfd->xvec->_bfd_set_format[bfd_core]) (abfd))
+    goto fail;
+  preserve.marker = elf_tdata (abfd);
+
+  /* Swap in the rest of the header, now that we have the byte order.  */
+  i_ehdrp = elf_elfheader (abfd);
+  elf_swap_ehdr_in (abfd, &x_ehdr, i_ehdrp);
+
+#if DEBUG & 1
+  elf_debug_file (i_ehdrp);
+#endif
+
+  ebd = get_elf_backend_data (abfd);
+
+  /* Check that the ELF e_machine field matches what this particular
+     BFD format expects.  */
+
+  if (ebd->elf_machine_code != i_ehdrp->e_machine
+      && (ebd->elf_machine_alt1 == 0
+	  || i_ehdrp->e_machine != ebd->elf_machine_alt1)
+      && (ebd->elf_machine_alt2 == 0
+	  || i_ehdrp->e_machine != ebd->elf_machine_alt2))
+    {
+      const bfd_target * const *target_ptr;
+
+      if (ebd->elf_machine_code != EM_NONE)
+	goto wrong;
+
+      /* This is the generic ELF target.  Let it match any ELF target
+	 for which we do not have a specific backend.  */
+
+      for (target_ptr = bfd_target_vector; *target_ptr != NULL; target_ptr++)
+	{
+	  const struct elf_backend_data *back;
+
+	  if ((*target_ptr)->flavour != bfd_target_elf_flavour)
+	    continue;
+	  back = xvec_get_elf_backend_data (*target_ptr);
+	  if (back->s->arch_size != ARCH_SIZE)
+	    continue;
+	  if (back->elf_machine_code == i_ehdrp->e_machine
+	      || (back->elf_machine_alt1 != 0
+	          && i_ehdrp->e_machine == back->elf_machine_alt1)
+	      || (back->elf_machine_alt2 != 0
+	          && i_ehdrp->e_machine == back->elf_machine_alt2))
+	    {
+	      /* target_ptr is an ELF backend which matches this
+		 object file, so reject the generic ELF target.  */
+	      goto wrong;
+	    }
+	}
+    }
+
+  /* If there is no program header, or the type is not a core file, then
+     we are hosed.  */
+  if (i_ehdrp->e_phoff == 0 || i_ehdrp->e_type != ET_CORE)
+    goto wrong;
+
+  /* Does BFD's idea of the phdr size match the size
+     recorded in the file? */
+  if (i_ehdrp->e_phentsize != sizeof (Elf_External_Phdr))
+    goto wrong;
+
+  /* If the program header count is PN_XNUM(0xffff), the actual
+     count is in the first section header.  */
+  if (i_ehdrp->e_shoff != 0 && i_ehdrp->e_phnum == PN_XNUM)
+    {
+      Elf_External_Shdr x_shdr;
+      Elf_Internal_Shdr i_shdr;
+      bfd_signed_vma where = i_ehdrp->e_shoff;
+
+      if (where != (file_ptr) where)
+	goto wrong;
+
+      /* Seek to the section header table in the file.  */
+      if (bfd_seek (abfd, (file_ptr) where, SEEK_SET) != 0)
+	goto fail;
+
+      /* Read the first section header at index 0, and convert to internal
+	 form.  */
+      if (bfd_bread (&x_shdr, sizeof (x_shdr), abfd) != sizeof (x_shdr))
+	goto fail;
+      elf_swap_shdr_in (abfd, &x_shdr, &i_shdr);
+
+      if (i_shdr.sh_info != 0)
+	{
+	  i_ehdrp->e_phnum = i_shdr.sh_info;
+	  if (i_ehdrp->e_phnum != i_shdr.sh_info)
+	    goto wrong;
+	}
+    }
+
+  /* Sanity check that we can read all of the program headers.
+     It ought to be good enough to just read the last one.  */
+  if (i_ehdrp->e_phnum > 1)
+    {
+      Elf_External_Phdr x_phdr;
+      Elf_Internal_Phdr i_phdr;
+      bfd_signed_vma where;
+
+      /* Check that we don't have a totally silly number of
+	 program headers.  */
+      if (i_ehdrp->e_phnum > (unsigned int) -1 / sizeof (x_phdr)
+	  || i_ehdrp->e_phnum > (unsigned int) -1 / sizeof (i_phdr))
+	goto wrong;
+
+      where = i_ehdrp->e_phoff + (i_ehdrp->e_phnum - 1) * sizeof (x_phdr);
+      if (where != (file_ptr) where)
+	goto wrong;
+      if ((bfd_size_type) where <= i_ehdrp->e_phoff)
+	goto wrong;
+
+      if (bfd_seek (abfd, (file_ptr) where, SEEK_SET) != 0)
+	goto fail;
+      if (bfd_bread (&x_phdr, sizeof (x_phdr), abfd) != sizeof (x_phdr))
+	goto fail;
+    }
+
+  /* Move to the start of the program headers.  */
+  if (bfd_seek (abfd, (file_ptr) i_ehdrp->e_phoff, SEEK_SET) != 0)
+    goto wrong;
+
+  /* Allocate space for the program headers.  */
+  amt = sizeof (*i_phdrp) * i_ehdrp->e_phnum;
+  i_phdrp = (Elf_Internal_Phdr *) bfd_alloc (abfd, amt);
+  if (!i_phdrp)
+    goto fail;
+
+  elf_tdata (abfd)->phdr = i_phdrp;
+
+  /* Read and convert to internal form.  */
+  for (phindex = 0; phindex < i_ehdrp->e_phnum; ++phindex)
+    {
+      Elf_External_Phdr x_phdr;
+
+      if (bfd_bread (&x_phdr, sizeof (x_phdr), abfd) != sizeof (x_phdr))
+	goto fail;
+
+      elf_swap_phdr_in (abfd, &x_phdr, i_phdrp + phindex);
+    }
+
+  /* Set the machine architecture.  Do this before processing the
+     program headers since we need to know the architecture type
+     when processing the notes of some systems' core files.  */
+  if (! bfd_default_set_arch_mach (abfd, ebd->arch, 0)
+      /* It's OK if this fails for the generic target.  */
+      && ebd->elf_machine_code != EM_NONE)
+    goto fail;
+
+  /* Let the backend double check the format and override global
+     information.  We do this before processing the program headers
+     to allow the correct machine (as opposed to just the default
+     machine) to be set, making it possible for grok_prstatus and
+     grok_psinfo to rely on the mach setting.  */
+  if (ebd->elf_backend_object_p != NULL
+      && ! ebd->elf_backend_object_p (abfd))
+    goto wrong;
+
+  /* Process each program header.  */
+  for (phindex = 0; phindex < i_ehdrp->e_phnum; ++phindex)
+    if (! bfd_section_from_phdr (abfd, i_phdrp + phindex, (int) phindex))
+      goto fail;
+
+  /* Check for core truncation.  */
+  {
+    bfd_size_type high = 0;
+    struct stat statbuf;
+    for (phindex = 0; phindex < i_ehdrp->e_phnum; ++phindex) 
+      {
+	Elf_Internal_Phdr *p = i_phdrp + phindex;
+	if (p->p_filesz)
+	  {
+	    bfd_size_type current = p->p_offset + p->p_filesz;
+	    if (high < current)
+	      high = current;
+	  }
+      }
+    if (bfd_stat (abfd, &statbuf) == 0)
+      {
+	if ((bfd_size_type) statbuf.st_size < high)
+	  {
+	    (*_bfd_error_handler)
+	      (_("Warning: %B is truncated: expected core file "
+		 "size >= %lu, found: %lu."),
+	       abfd, (unsigned long) high, (unsigned long) statbuf.st_size);
+	  }
+      }
+  }
+  
+  /* Save the entry point from the ELF header.  */
+  bfd_get_start_address (abfd) = i_ehdrp->e_entry;
+
+  bfd_preserve_finish (abfd, &preserve);
+  return abfd->xvec;
+
+wrong:
+  /* There is way too much undoing of half-known state here.  The caller,
+     bfd_check_format_matches, really shouldn't iterate on live bfd's to
+     check match/no-match like it does.  We have to rely on that a call to
+     bfd_default_set_arch_mach with the previously known mach, undoes what
+     was done by the first bfd_default_set_arch_mach (with mach 0) here.
+     For this to work, only elf-data and the mach may be changed by the
+     target-specific elf_backend_object_p function.  Note that saving the
+     whole bfd here and restoring it would be even worse; the first thing
+     you notice is that the cached bfd file position gets out of sync.  */
+  bfd_set_error (bfd_error_wrong_format);
+
+fail:
+  if (preserve.marker != NULL)
+    bfd_preserve_restore (abfd, &preserve);
+  return NULL;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elflink.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elflink.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elflink.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elflink.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,12848 @@
+/* ELF linking support for BFD.
+   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#define ARCH_SIZE 0
+#include "elf-bfd.h"
+#include "safe-ctype.h"
+#include "libiberty.h"
+#include "objalloc.h"
+
+/* This struct is used to pass information to routines called via
+   elf_link_hash_traverse which must return failure.  */
+
+struct elf_info_failed
+{
+  struct bfd_link_info *info;
+  bfd_boolean failed;
+};
+
+/* This structure is used to pass information to
+   _bfd_elf_link_find_version_dependencies.  */
+
+struct elf_find_verdep_info
+{
+  /* General link information.  */
+  struct bfd_link_info *info;
+  /* The number of dependencies.  */
+  unsigned int vers;
+  /* Whether we had a failure.  */
+  bfd_boolean failed;
+};
+
+static bfd_boolean _bfd_elf_fix_symbol_flags
+  (struct elf_link_hash_entry *, struct elf_info_failed *);
+
+/* Define a symbol in a dynamic linkage section.  */
+
+struct elf_link_hash_entry *
+_bfd_elf_define_linkage_sym (bfd *abfd,
+			     struct bfd_link_info *info,
+			     asection *sec,
+			     const char *name)
+{
+  struct elf_link_hash_entry *h;
+  struct bfd_link_hash_entry *bh;
+  const struct elf_backend_data *bed;
+
+  h = elf_link_hash_lookup (elf_hash_table (info), name, FALSE, FALSE, FALSE);
+  if (h != NULL)
+    {
+      /* Zap symbol defined in an as-needed lib that wasn't linked.
+	 This is a symptom of a larger problem:  Absolute symbols
+	 defined in shared libraries can't be overridden, because we
+	 lose the link to the bfd which is via the symbol section.  */
+      h->root.type = bfd_link_hash_new;
+    }
+
+  bh = &h->root;
+  if (!_bfd_generic_link_add_one_symbol (info, abfd, name, BSF_GLOBAL,
+					 sec, 0, NULL, FALSE,
+					 get_elf_backend_data (abfd)->collect,
+					 &bh))
+    return NULL;
+  h = (struct elf_link_hash_entry *) bh;
+  h->def_regular = 1;
+  h->non_elf = 0;
+  h->type = STT_OBJECT;
+  h->other = (h->other & ~ELF_ST_VISIBILITY (-1)) | STV_HIDDEN;
+
+  bed = get_elf_backend_data (abfd);
+  (*bed->elf_backend_hide_symbol) (info, h, TRUE);
+  return h;
+}
+
+bfd_boolean
+_bfd_elf_create_got_section (bfd *abfd, struct bfd_link_info *info)
+{
+  flagword flags;
+  asection *s;
+  struct elf_link_hash_entry *h;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  struct elf_link_hash_table *htab = elf_hash_table (info);
+
+  /* This function may be called more than once.  */
+  s = bfd_get_section_by_name (abfd, ".got");
+  if (s != NULL && (s->flags & SEC_LINKER_CREATED) != 0)
+    return TRUE;
+
+  flags = bed->dynamic_sec_flags;
+
+  s = bfd_make_section_anyway_with_flags (abfd,
+					  (bed->rela_plts_and_copies_p
+					   ? ".rela.got" : ".rel.got"),
+					  (bed->dynamic_sec_flags
+					   | SEC_READONLY));
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+    return FALSE;
+  htab->srelgot = s;
+
+  s = bfd_make_section_anyway_with_flags (abfd, ".got", flags);
+  if (s == NULL
+      || !bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+    return FALSE;
+  htab->sgot = s;
+
+  if (bed->want_got_plt)
+    {
+      s = bfd_make_section_anyway_with_flags (abfd, ".got.plt", flags);
+      if (s == NULL
+	  || !bfd_set_section_alignment (abfd, s,
+					 bed->s->log_file_align))
+	return FALSE;
+      htab->sgotplt = s;
+    }
+
+  /* The first bit of the global offset table is the header.  */
+  s->size += bed->got_header_size;
+
+  if (bed->want_got_sym)
+    {
+      /* Define the symbol _GLOBAL_OFFSET_TABLE_ at the start of the .got
+	 (or .got.plt) section.  We don't do this in the linker script
+	 because we don't want to define the symbol if we are not creating
+	 a global offset table.  */
+      h = _bfd_elf_define_linkage_sym (abfd, info, s,
+				       "_GLOBAL_OFFSET_TABLE_");
+      elf_hash_table (info)->hgot = h;
+      if (h == NULL)
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Create a strtab to hold the dynamic symbol names.  */
+static bfd_boolean
+_bfd_elf_link_create_dynstrtab (bfd *abfd, struct bfd_link_info *info)
+{
+  struct elf_link_hash_table *hash_table;
+
+  hash_table = elf_hash_table (info);
+  if (hash_table->dynobj == NULL)
+    hash_table->dynobj = abfd;
+
+  if (hash_table->dynstr == NULL)
+    {
+      hash_table->dynstr = _bfd_elf_strtab_init ();
+      if (hash_table->dynstr == NULL)
+	return FALSE;
+    }
+  return TRUE;
+}
+
+/* Create some sections which will be filled in with dynamic linking
+   information.  ABFD is an input file which requires dynamic sections
+   to be created.  The dynamic sections take up virtual memory space
+   when the final executable is run, so we need to create them before
+   addresses are assigned to the output sections.  We work out the
+   actual contents and size of these sections later.  */
+
+bfd_boolean
+_bfd_elf_link_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  flagword flags;
+  asection *s;
+  const struct elf_backend_data *bed;
+
+  if (! is_elf_hash_table (info->hash))
+    return FALSE;
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    return TRUE;
+
+  if (!_bfd_elf_link_create_dynstrtab (abfd, info))
+    return FALSE;
+
+  abfd = elf_hash_table (info)->dynobj;
+  bed = get_elf_backend_data (abfd);
+
+  flags = bed->dynamic_sec_flags;
+
+  /* A dynamically linked executable has a .interp section, but a
+     shared library does not.  */
+  if (info->executable)
+    {
+      s = bfd_make_section_anyway_with_flags (abfd, ".interp",
+					      flags | SEC_READONLY);
+      if (s == NULL)
+	return FALSE;
+    }
+
+  /* Create sections to hold version informations.  These are removed
+     if they are not needed.  */
+  s = bfd_make_section_anyway_with_flags (abfd, ".gnu.version_d",
+					  flags | SEC_READONLY);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+    return FALSE;
+
+  s = bfd_make_section_anyway_with_flags (abfd, ".gnu.version",
+					  flags | SEC_READONLY);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, 1))
+    return FALSE;
+
+  s = bfd_make_section_anyway_with_flags (abfd, ".gnu.version_r",
+					  flags | SEC_READONLY);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+    return FALSE;
+
+  s = bfd_make_section_anyway_with_flags (abfd, ".dynsym",
+					  flags | SEC_READONLY);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+    return FALSE;
+
+  s = bfd_make_section_anyway_with_flags (abfd, ".dynstr",
+					  flags | SEC_READONLY);
+  if (s == NULL)
+    return FALSE;
+
+  s = bfd_make_section_anyway_with_flags (abfd, ".dynamic", flags);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+    return FALSE;
+
+  /* The special symbol _DYNAMIC is always set to the start of the
+     .dynamic section.  We could set _DYNAMIC in a linker script, but we
+     only want to define it if we are, in fact, creating a .dynamic
+     section.  We don't want to define it if there is no .dynamic
+     section, since on some ELF platforms the start up code examines it
+     to decide how to initialize the process.  */
+  if (!_bfd_elf_define_linkage_sym (abfd, info, s, "_DYNAMIC"))
+    return FALSE;
+
+  if (info->emit_hash)
+    {
+      s = bfd_make_section_anyway_with_flags (abfd, ".hash",
+					      flags | SEC_READONLY);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+	return FALSE;
+      elf_section_data (s)->this_hdr.sh_entsize = bed->s->sizeof_hash_entry;
+    }
+
+  if (info->emit_gnu_hash)
+    {
+      s = bfd_make_section_anyway_with_flags (abfd, ".gnu.hash",
+					      flags | SEC_READONLY);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+	return FALSE;
+      /* For 64-bit ELF, .gnu.hash is a non-uniform entity size section:
+	 4 32-bit words followed by variable count of 64-bit words, then
+	 variable count of 32-bit words.  */
+      if (bed->s->arch_size == 64)
+	elf_section_data (s)->this_hdr.sh_entsize = 0;
+      else
+	elf_section_data (s)->this_hdr.sh_entsize = 4;
+    }
+
+  /* Let the backend create the rest of the sections.  This lets the
+     backend set the right flags.  The backend will normally create
+     the .got and .plt sections.  */
+  if (bed->elf_backend_create_dynamic_sections == NULL
+      || ! (*bed->elf_backend_create_dynamic_sections) (abfd, info))
+    return FALSE;
+
+  elf_hash_table (info)->dynamic_sections_created = TRUE;
+
+  return TRUE;
+}
+
+/* Create dynamic sections when linking against a dynamic object.  */
+
+bfd_boolean
+_bfd_elf_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  flagword flags, pltflags;
+  struct elf_link_hash_entry *h;
+  asection *s;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  struct elf_link_hash_table *htab = elf_hash_table (info);
+
+  /* We need to create .plt, .rel[a].plt, .got, .got.plt, .dynbss, and
+     .rel[a].bss sections.  */
+  flags = bed->dynamic_sec_flags;
+
+  pltflags = flags;
+  if (bed->plt_not_loaded)
+    /* We do not clear SEC_ALLOC here because we still want the OS to
+       allocate space for the section; it's just that there's nothing
+       to read in from the object file.  */
+    pltflags &= ~ (SEC_CODE | SEC_LOAD | SEC_HAS_CONTENTS);
+  else
+    pltflags |= SEC_ALLOC | SEC_CODE | SEC_LOAD;
+  if (bed->plt_readonly)
+    pltflags |= SEC_READONLY;
+
+  s = bfd_make_section_anyway_with_flags (abfd, ".plt", pltflags);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, bed->plt_alignment))
+    return FALSE;
+  htab->splt = s;
+
+  /* Define the symbol _PROCEDURE_LINKAGE_TABLE_ at the start of the
+     .plt section.  */
+  if (bed->want_plt_sym)
+    {
+      h = _bfd_elf_define_linkage_sym (abfd, info, s,
+				       "_PROCEDURE_LINKAGE_TABLE_");
+      elf_hash_table (info)->hplt = h;
+      if (h == NULL)
+	return FALSE;
+    }
+
+  s = bfd_make_section_anyway_with_flags (abfd,
+					  (bed->rela_plts_and_copies_p
+					   ? ".rela.plt" : ".rel.plt"),
+					  flags | SEC_READONLY);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+    return FALSE;
+  htab->srelplt = s;
+
+  if (! _bfd_elf_create_got_section (abfd, info))
+    return FALSE;
+
+  if (bed->want_dynbss)
+    {
+      /* The .dynbss section is a place to put symbols which are defined
+	 by dynamic objects, are referenced by regular objects, and are
+	 not functions.  We must allocate space for them in the process
+	 image and use a R_*_COPY reloc to tell the dynamic linker to
+	 initialize them at run time.  The linker script puts the .dynbss
+	 section into the .bss section of the final image.  */
+      s = bfd_make_section_anyway_with_flags (abfd, ".dynbss",
+					      (SEC_ALLOC | SEC_LINKER_CREATED));
+      if (s == NULL)
+	return FALSE;
+
+      /* The .rel[a].bss section holds copy relocs.  This section is not
+	 normally needed.  We need to create it here, though, so that the
+	 linker will map it to an output section.  We can't just create it
+	 only if we need it, because we will not know whether we need it
+	 until we have seen all the input files, and the first time the
+	 main linker code calls BFD after examining all the input files
+	 (size_dynamic_sections) the input sections have already been
+	 mapped to the output sections.  If the section turns out not to
+	 be needed, we can discard it later.  We will never need this
+	 section when generating a shared object, since they do not use
+	 copy relocs.  */
+      if (! info->shared)
+	{
+	  s = bfd_make_section_anyway_with_flags (abfd,
+						  (bed->rela_plts_and_copies_p
+						   ? ".rela.bss" : ".rel.bss"),
+						  flags | SEC_READONLY);
+	  if (s == NULL
+	      || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Record a new dynamic symbol.  We record the dynamic symbols as we
+   read the input files, since we need to have a list of all of them
+   before we can determine the final sizes of the output sections.
+   Note that we may actually call this function even though we are not
+   going to output any dynamic symbols; in some cases we know that a
+   symbol should be in the dynamic symbol table, but only if there is
+   one.  */
+
+bfd_boolean
+bfd_elf_link_record_dynamic_symbol (struct bfd_link_info *info,
+				    struct elf_link_hash_entry *h)
+{
+  if (h->dynindx == -1)
+    {
+      struct elf_strtab_hash *dynstr;
+      char *p;
+      const char *name;
+      bfd_size_type indx;
+
+      /* XXX: The ABI draft says the linker must turn hidden and
+	 internal symbols into STB_LOCAL symbols when producing the
+	 DSO. However, if ld.so honors st_other in the dynamic table,
+	 this would not be necessary.  */
+      switch (ELF_ST_VISIBILITY (h->other))
+	{
+	case STV_INTERNAL:
+	case STV_HIDDEN:
+	  if (h->root.type != bfd_link_hash_undefined
+	      && h->root.type != bfd_link_hash_undefweak)
+	    {
+	      h->forced_local = 1;
+	      if (!elf_hash_table (info)->is_relocatable_executable)
+		return TRUE;
+	    }
+
+	default:
+	  break;
+	}
+
+      h->dynindx = elf_hash_table (info)->dynsymcount;
+      ++elf_hash_table (info)->dynsymcount;
+
+      dynstr = elf_hash_table (info)->dynstr;
+      if (dynstr == NULL)
+	{
+	  /* Create a strtab to hold the dynamic symbol names.  */
+	  elf_hash_table (info)->dynstr = dynstr = _bfd_elf_strtab_init ();
+	  if (dynstr == NULL)
+	    return FALSE;
+	}
+
+      /* We don't put any version information in the dynamic string
+	 table.  */
+      name = h->root.root.string;
+      p = strchr (name, ELF_VER_CHR);
+      if (p != NULL)
+	/* We know that the p points into writable memory.  In fact,
+	   there are only a few symbols that have read-only names, being
+	   those like _GLOBAL_OFFSET_TABLE_ that are created specially
+	   by the backends.  Most symbols will have names pointing into
+	   an ELF string table read from a file, or to objalloc memory.  */
+	*p = 0;
+
+      indx = _bfd_elf_strtab_add (dynstr, name, p != NULL);
+
+      if (p != NULL)
+	*p = ELF_VER_CHR;
+
+      if (indx == (bfd_size_type) -1)
+	return FALSE;
+      h->dynstr_index = indx;
+    }
+
+  return TRUE;
+}
+
+/* Mark a symbol dynamic.  */
+
+static void
+bfd_elf_link_mark_dynamic_symbol (struct bfd_link_info *info,
+				  struct elf_link_hash_entry *h,
+				  Elf_Internal_Sym *sym)
+{
+  struct bfd_elf_dynamic_list *d = info->dynamic_list;
+
+  /* It may be called more than once on the same H.  */
+  if(h->dynamic || info->relocatable)
+    return;
+
+  if ((info->dynamic_data
+       && (h->type == STT_OBJECT
+	   || (sym != NULL
+	       && ELF_ST_TYPE (sym->st_info) == STT_OBJECT)))
+      || (d != NULL
+	  && h->root.type == bfd_link_hash_new
+	  && (*d->match) (&d->head, NULL, h->root.root.string)))
+    h->dynamic = 1;
+}
+
+/* Record an assignment to a symbol made by a linker script.  We need
+   this in case some dynamic object refers to this symbol.  */
+
+bfd_boolean
+bfd_elf_record_link_assignment (bfd *output_bfd,
+				struct bfd_link_info *info,
+				const char *name,
+				bfd_boolean provide,
+				bfd_boolean hidden)
+{
+  struct elf_link_hash_entry *h, *hv;
+  struct elf_link_hash_table *htab;
+  const struct elf_backend_data *bed;
+
+  if (!is_elf_hash_table (info->hash))
+    return TRUE;
+
+  htab = elf_hash_table (info);
+  h = elf_link_hash_lookup (htab, name, !provide, TRUE, FALSE);
+  if (h == NULL)
+    return provide;
+
+  switch (h->root.type)
+    {
+    case bfd_link_hash_defined:
+    case bfd_link_hash_defweak:
+    case bfd_link_hash_common:
+      break;
+    case bfd_link_hash_undefweak:
+    case bfd_link_hash_undefined:
+      /* Since we're defining the symbol, don't let it seem to have not
+	 been defined.  record_dynamic_symbol and size_dynamic_sections
+	 may depend on this.  */
+      h->root.type = bfd_link_hash_new;
+      if (h->root.u.undef.next != NULL || htab->root.undefs_tail == &h->root)
+	bfd_link_repair_undef_list (&htab->root);
+      break;
+    case bfd_link_hash_new:
+      bfd_elf_link_mark_dynamic_symbol (info, h, NULL);
+      h->non_elf = 0;
+      break;
+    case bfd_link_hash_indirect:
+      /* We had a versioned symbol in a dynamic library.  We make the
+	 the versioned symbol point to this one.  */
+      bed = get_elf_backend_data (output_bfd);
+      hv = h;
+      while (hv->root.type == bfd_link_hash_indirect
+	     || hv->root.type == bfd_link_hash_warning)
+	hv = (struct elf_link_hash_entry *) hv->root.u.i.link;
+      /* We don't need to update h->root.u since linker will set them
+	 later.  */
+      h->root.type = bfd_link_hash_undefined;
+      hv->root.type = bfd_link_hash_indirect;
+      hv->root.u.i.link = (struct bfd_link_hash_entry *) h;
+      (*bed->elf_backend_copy_indirect_symbol) (info, h, hv);
+      break;
+    case bfd_link_hash_warning:
+      abort ();
+      break;
+    }
+
+  /* If this symbol is being provided by the linker script, and it is
+     currently defined by a dynamic object, but not by a regular
+     object, then mark it as undefined so that the generic linker will
+     force the correct value.  */
+  if (provide
+      && h->def_dynamic
+      && !h->def_regular)
+    h->root.type = bfd_link_hash_undefined;
+
+  /* If this symbol is not being provided by the linker script, and it is
+     currently defined by a dynamic object, but not by a regular object,
+     then clear out any version information because the symbol will not be
+     associated with the dynamic object any more.  */
+  if (!provide
+      && h->def_dynamic
+      && !h->def_regular)
+    h->verinfo.verdef = NULL;
+
+  h->def_regular = 1;
+
+  if (provide && hidden)
+    {
+      bed = get_elf_backend_data (output_bfd);
+      h->other = (h->other & ~ELF_ST_VISIBILITY (-1)) | STV_HIDDEN;
+      (*bed->elf_backend_hide_symbol) (info, h, TRUE);
+    }
+
+  /* STV_HIDDEN and STV_INTERNAL symbols must be STB_LOCAL in shared objects
+     and executables.  */
+  if (!info->relocatable
+      && h->dynindx != -1
+      && (ELF_ST_VISIBILITY (h->other) == STV_HIDDEN
+	  || ELF_ST_VISIBILITY (h->other) == STV_INTERNAL))
+    h->forced_local = 1;
+
+  if ((h->def_dynamic
+       || h->ref_dynamic
+       || info->shared
+       || (info->executable && elf_hash_table (info)->is_relocatable_executable))
+      && h->dynindx == -1)
+    {
+      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	return FALSE;
+
+      /* If this is a weak defined symbol, and we know a corresponding
+	 real symbol from the same dynamic object, make sure the real
+	 symbol is also made into a dynamic symbol.  */
+      if (h->u.weakdef != NULL
+	  && h->u.weakdef->dynindx == -1)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h->u.weakdef))
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Record a new local dynamic symbol.  Returns 0 on failure, 1 on
+   success, and 2 on a failure caused by attempting to record a symbol
+   in a discarded section, eg. a discarded link-once section symbol.  */
+
+int
+bfd_elf_link_record_local_dynamic_symbol (struct bfd_link_info *info,
+					  bfd *input_bfd,
+					  long input_indx)
+{
+  bfd_size_type amt;
+  struct elf_link_local_dynamic_entry *entry;
+  struct elf_link_hash_table *eht;
+  struct elf_strtab_hash *dynstr;
+  unsigned long dynstr_index;
+  char *name;
+  Elf_External_Sym_Shndx eshndx;
+  char esym[sizeof (Elf64_External_Sym)];
+
+  if (! is_elf_hash_table (info->hash))
+    return 0;
+
+  /* See if the entry exists already.  */
+  for (entry = elf_hash_table (info)->dynlocal; entry ; entry = entry->next)
+    if (entry->input_bfd == input_bfd && entry->input_indx == input_indx)
+      return 1;
+
+  amt = sizeof (*entry);
+  entry = (struct elf_link_local_dynamic_entry *) bfd_alloc (input_bfd, amt);
+  if (entry == NULL)
+    return 0;
+
+  /* Go find the symbol, so that we can find it's name.  */
+  if (!bfd_elf_get_elf_syms (input_bfd, &elf_tdata (input_bfd)->symtab_hdr,
+			     1, input_indx, &entry->isym, esym, &eshndx))
+    {
+      bfd_release (input_bfd, entry);
+      return 0;
+    }
+
+  if (entry->isym.st_shndx != SHN_UNDEF
+      && entry->isym.st_shndx < SHN_LORESERVE)
+    {
+      asection *s;
+
+      s = bfd_section_from_elf_index (input_bfd, entry->isym.st_shndx);
+      if (s == NULL || bfd_is_abs_section (s->output_section))
+	{
+	  /* We can still bfd_release here as nothing has done another
+	     bfd_alloc.  We can't do this later in this function.  */
+	  bfd_release (input_bfd, entry);
+	  return 2;
+	}
+    }
+
+  name = (bfd_elf_string_from_elf_section
+	  (input_bfd, elf_tdata (input_bfd)->symtab_hdr.sh_link,
+	   entry->isym.st_name));
+
+  dynstr = elf_hash_table (info)->dynstr;
+  if (dynstr == NULL)
+    {
+      /* Create a strtab to hold the dynamic symbol names.  */
+      elf_hash_table (info)->dynstr = dynstr = _bfd_elf_strtab_init ();
+      if (dynstr == NULL)
+	return 0;
+    }
+
+  dynstr_index = _bfd_elf_strtab_add (dynstr, name, FALSE);
+  if (dynstr_index == (unsigned long) -1)
+    return 0;
+  entry->isym.st_name = dynstr_index;
+
+  eht = elf_hash_table (info);
+
+  entry->next = eht->dynlocal;
+  eht->dynlocal = entry;
+  entry->input_bfd = input_bfd;
+  entry->input_indx = input_indx;
+  eht->dynsymcount++;
+
+  /* Whatever binding the symbol had before, it's now local.  */
+  entry->isym.st_info
+    = ELF_ST_INFO (STB_LOCAL, ELF_ST_TYPE (entry->isym.st_info));
+
+  /* The dynindx will be set at the end of size_dynamic_sections.  */
+
+  return 1;
+}
+
+/* Return the dynindex of a local dynamic symbol.  */
+
+long
+_bfd_elf_link_lookup_local_dynindx (struct bfd_link_info *info,
+				    bfd *input_bfd,
+				    long input_indx)
+{
+  struct elf_link_local_dynamic_entry *e;
+
+  for (e = elf_hash_table (info)->dynlocal; e ; e = e->next)
+    if (e->input_bfd == input_bfd && e->input_indx == input_indx)
+      return e->dynindx;
+  return -1;
+}
+
+/* This function is used to renumber the dynamic symbols, if some of
+   them are removed because they are marked as local.  This is called
+   via elf_link_hash_traverse.  */
+
+static bfd_boolean
+elf_link_renumber_hash_table_dynsyms (struct elf_link_hash_entry *h,
+				      void *data)
+{
+  size_t *count = (size_t *) data;
+
+  if (h->forced_local)
+    return TRUE;
+
+  if (h->dynindx != -1)
+    h->dynindx = ++(*count);
+
+  return TRUE;
+}
+
+
+/* Like elf_link_renumber_hash_table_dynsyms, but just number symbols with
+   STB_LOCAL binding.  */
+
+static bfd_boolean
+elf_link_renumber_local_hash_table_dynsyms (struct elf_link_hash_entry *h,
+					    void *data)
+{
+  size_t *count = (size_t *) data;
+
+  if (!h->forced_local)
+    return TRUE;
+
+  if (h->dynindx != -1)
+    h->dynindx = ++(*count);
+
+  return TRUE;
+}
+
+/* Return true if the dynamic symbol for a given section should be
+   omitted when creating a shared library.  */
+bfd_boolean
+_bfd_elf_link_omit_section_dynsym (bfd *output_bfd ATTRIBUTE_UNUSED,
+				   struct bfd_link_info *info,
+				   asection *p)
+{
+  struct elf_link_hash_table *htab;
+
+  switch (elf_section_data (p)->this_hdr.sh_type)
+    {
+    case SHT_PROGBITS:
+    case SHT_NOBITS:
+      /* If sh_type is yet undecided, assume it could be
+	 SHT_PROGBITS/SHT_NOBITS.  */
+    case SHT_NULL:
+      htab = elf_hash_table (info);
+      if (p == htab->tls_sec)
+	return FALSE;
+
+      if (htab->text_index_section != NULL)
+	return p != htab->text_index_section && p != htab->data_index_section;
+
+      if (strcmp (p->name, ".got") == 0
+	  || strcmp (p->name, ".got.plt") == 0
+	  || strcmp (p->name, ".plt") == 0)
+	{
+	  asection *ip;
+
+	  if (htab->dynobj != NULL
+	      && (ip = bfd_get_section_by_name (htab->dynobj, p->name)) != NULL
+	      && (ip->flags & SEC_LINKER_CREATED)
+	      && ip->output_section == p)
+	    return TRUE;
+	}
+      return FALSE;
+
+      /* There shouldn't be section relative relocations
+	 against any other section.  */
+    default:
+      return TRUE;
+    }
+}
+
+/* Assign dynsym indices.  In a shared library we generate a section
+   symbol for each output section, which come first.  Next come symbols
+   which have been forced to local binding.  Then all of the back-end
+   allocated local dynamic syms, followed by the rest of the global
+   symbols.  */
+
+static unsigned long
+_bfd_elf_link_renumber_dynsyms (bfd *output_bfd,
+				struct bfd_link_info *info,
+				unsigned long *section_sym_count)
+{
+  unsigned long dynsymcount = 0;
+
+  if (info->shared || elf_hash_table (info)->is_relocatable_executable)
+    {
+      const struct elf_backend_data *bed = get_elf_backend_data (output_bfd);
+      asection *p;
+      for (p = output_bfd->sections; p ; p = p->next)
+	if ((p->flags & SEC_EXCLUDE) == 0
+	    && (p->flags & SEC_ALLOC) != 0
+	    && !(*bed->elf_backend_omit_section_dynsym) (output_bfd, info, p))
+	  elf_section_data (p)->dynindx = ++dynsymcount;
+	else
+	  elf_section_data (p)->dynindx = 0;
+    }
+  *section_sym_count = dynsymcount;
+
+  elf_link_hash_traverse (elf_hash_table (info),
+			  elf_link_renumber_local_hash_table_dynsyms,
+			  &dynsymcount);
+
+  if (elf_hash_table (info)->dynlocal)
+    {
+      struct elf_link_local_dynamic_entry *p;
+      for (p = elf_hash_table (info)->dynlocal; p ; p = p->next)
+	p->dynindx = ++dynsymcount;
+    }
+
+  elf_link_hash_traverse (elf_hash_table (info),
+			  elf_link_renumber_hash_table_dynsyms,
+			  &dynsymcount);
+
+  /* There is an unused NULL entry at the head of the table which
+     we must account for in our count.  Unless there weren't any
+     symbols, which means we'll have no table at all.  */
+  if (dynsymcount != 0)
+    ++dynsymcount;
+
+  elf_hash_table (info)->dynsymcount = dynsymcount;
+  return dynsymcount;
+}
+
+/* Merge st_other field.  */
+
+static void
+elf_merge_st_other (bfd *abfd, struct elf_link_hash_entry *h,
+		    Elf_Internal_Sym *isym, bfd_boolean definition,
+		    bfd_boolean dynamic)
+{
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+
+  /* If st_other has a processor-specific meaning, specific
+     code might be needed here. We never merge the visibility
+     attribute with the one from a dynamic object.  */
+  if (bed->elf_backend_merge_symbol_attribute)
+    (*bed->elf_backend_merge_symbol_attribute) (h, isym, definition,
+						dynamic);
+
+  /* If this symbol has default visibility and the user has requested
+     we not re-export it, then mark it as hidden.  */
+  if (definition
+      && !dynamic
+      && (abfd->no_export
+	  || (abfd->my_archive && abfd->my_archive->no_export))
+      && ELF_ST_VISIBILITY (isym->st_other) != STV_INTERNAL)
+    isym->st_other = (STV_HIDDEN
+		      | (isym->st_other & ~ELF_ST_VISIBILITY (-1)));
+
+  if (!dynamic && ELF_ST_VISIBILITY (isym->st_other) != 0)
+    {
+      unsigned char hvis, symvis, other, nvis;
+
+      /* Only merge the visibility. Leave the remainder of the
+	 st_other field to elf_backend_merge_symbol_attribute.  */
+      other = h->other & ~ELF_ST_VISIBILITY (-1);
+
+      /* Combine visibilities, using the most constraining one.  */
+      hvis = ELF_ST_VISIBILITY (h->other);
+      symvis = ELF_ST_VISIBILITY (isym->st_other);
+      if (! hvis)
+	nvis = symvis;
+      else if (! symvis)
+	nvis = hvis;
+      else
+	nvis = hvis < symvis ? hvis : symvis;
+
+      h->other = other | nvis;
+    }
+}
+
+/* This function is called when we want to define a new symbol.  It
+   handles the various cases which arise when we find a definition in
+   a dynamic object, or when there is already a definition in a
+   dynamic object.  The new symbol is described by NAME, SYM, PSEC,
+   and PVALUE.  We set SYM_HASH to the hash table entry.  We set
+   OVERRIDE if the old symbol is overriding a new definition.  We set
+   TYPE_CHANGE_OK if it is OK for the type to change.  We set
+   SIZE_CHANGE_OK if it is OK for the size to change.  By OK to
+   change, we mean that we shouldn't warn if the type or size does
+   change.  We set POLD_ALIGNMENT if an old common symbol in a dynamic
+   object is overridden by a regular object.  */
+
+bfd_boolean
+_bfd_elf_merge_symbol (bfd *abfd,
+		       struct bfd_link_info *info,
+		       const char *name,
+		       Elf_Internal_Sym *sym,
+		       asection **psec,
+		       bfd_vma *pvalue,
+		       unsigned int *pold_alignment,
+		       struct elf_link_hash_entry **sym_hash,
+		       bfd_boolean *skip,
+		       bfd_boolean *override,
+		       bfd_boolean *type_change_ok,
+		       bfd_boolean *size_change_ok)
+{
+  asection *sec, *oldsec;
+  struct elf_link_hash_entry *h;
+  struct elf_link_hash_entry *flip;
+  int bind;
+  bfd *oldbfd;
+  bfd_boolean newdyn, olddyn, olddef, newdef, newdyncommon, olddyncommon;
+  bfd_boolean newweak, oldweak, newfunc, oldfunc;
+  const struct elf_backend_data *bed;
+
+  *skip = FALSE;
+  *override = FALSE;
+
+  sec = *psec;
+  bind = ELF_ST_BIND (sym->st_info);
+
+  /* Silently discard TLS symbols from --just-syms.  There's no way to
+     combine a static TLS block with a new TLS block for this executable.  */
+  if (ELF_ST_TYPE (sym->st_info) == STT_TLS
+      && sec->sec_info_type == ELF_INFO_TYPE_JUST_SYMS)
+    {
+      *skip = TRUE;
+      return TRUE;
+    }
+
+  if (! bfd_is_und_section (sec))
+    h = elf_link_hash_lookup (elf_hash_table (info), name, TRUE, FALSE, FALSE);
+  else
+    h = ((struct elf_link_hash_entry *)
+	 bfd_wrapped_link_hash_lookup (abfd, info, name, TRUE, FALSE, FALSE));
+  if (h == NULL)
+    return FALSE;
+  *sym_hash = h;
+
+  bed = get_elf_backend_data (abfd);
+
+  /* This code is for coping with dynamic objects, and is only useful
+     if we are doing an ELF link.  */
+  if (!(*bed->relocs_compatible) (abfd->xvec, info->output_bfd->xvec))
+    return TRUE;
+
+  /* For merging, we only care about real symbols.  */
+
+  while (h->root.type == bfd_link_hash_indirect
+	 || h->root.type == bfd_link_hash_warning)
+    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+  /* We have to check it for every instance since the first few may be
+     refereences and not all compilers emit symbol type for undefined
+     symbols.  */
+  bfd_elf_link_mark_dynamic_symbol (info, h, sym);
+
+  /* If we just created the symbol, mark it as being an ELF symbol.
+     Other than that, there is nothing to do--there is no merge issue
+     with a newly defined symbol--so we just return.  */
+
+  if (h->root.type == bfd_link_hash_new)
+    {
+      h->non_elf = 0;
+      return TRUE;
+    }
+
+  /* OLDBFD and OLDSEC are a BFD and an ASECTION associated with the
+     existing symbol.  */
+
+  switch (h->root.type)
+    {
+    default:
+      oldbfd = NULL;
+      oldsec = NULL;
+      break;
+
+    case bfd_link_hash_undefined:
+    case bfd_link_hash_undefweak:
+      oldbfd = h->root.u.undef.abfd;
+      oldsec = NULL;
+      break;
+
+    case bfd_link_hash_defined:
+    case bfd_link_hash_defweak:
+      oldbfd = h->root.u.def.section->owner;
+      oldsec = h->root.u.def.section;
+      break;
+
+    case bfd_link_hash_common:
+      oldbfd = h->root.u.c.p->section->owner;
+      oldsec = h->root.u.c.p->section;
+      break;
+    }
+
+  /* Differentiate strong and weak symbols.  */
+  newweak = bind == STB_WEAK;
+  oldweak = (h->root.type == bfd_link_hash_defweak
+	     || h->root.type == bfd_link_hash_undefweak);
+
+  /* In cases involving weak versioned symbols, we may wind up trying
+     to merge a symbol with itself.  Catch that here, to avoid the
+     confusion that results if we try to override a symbol with
+     itself.  The additional tests catch cases like
+     _GLOBAL_OFFSET_TABLE_, which are regular symbols defined in a
+     dynamic object, which we do want to handle here.  */
+  if (abfd == oldbfd
+      && (newweak || oldweak)
+      && ((abfd->flags & DYNAMIC) == 0
+	  || !h->def_regular))
+    return TRUE;
+
+  /* NEWDYN and OLDDYN indicate whether the new or old symbol,
+     respectively, is from a dynamic object.  */
+
+  newdyn = (abfd->flags & DYNAMIC) != 0;
+
+  olddyn = FALSE;
+  if (oldbfd != NULL)
+    olddyn = (oldbfd->flags & DYNAMIC) != 0;
+  else if (oldsec != NULL)
+    {
+      /* This handles the special SHN_MIPS_{TEXT,DATA} section
+	 indices used by MIPS ELF.  */
+      olddyn = (oldsec->symbol->flags & BSF_DYNAMIC) != 0;
+    }
+
+  /* NEWDEF and OLDDEF indicate whether the new or old symbol,
+     respectively, appear to be a definition rather than reference.  */
+
+  newdef = !bfd_is_und_section (sec) && !bfd_is_com_section (sec);
+
+  olddef = (h->root.type != bfd_link_hash_undefined
+	    && h->root.type != bfd_link_hash_undefweak
+	    && h->root.type != bfd_link_hash_common);
+
+  /* NEWFUNC and OLDFUNC indicate whether the new or old symbol,
+     respectively, appear to be a function.  */
+
+  newfunc = (ELF_ST_TYPE (sym->st_info) != STT_NOTYPE
+	     && bed->is_function_type (ELF_ST_TYPE (sym->st_info)));
+
+  oldfunc = (h->type != STT_NOTYPE
+	     && bed->is_function_type (h->type));
+
+  /* When we try to create a default indirect symbol from the dynamic
+     definition with the default version, we skip it if its type and
+     the type of existing regular definition mismatch.  We only do it
+     if the existing regular definition won't be dynamic.  */
+  if (pold_alignment == NULL
+      && !info->shared
+      && !info->export_dynamic
+      && !h->ref_dynamic
+      && newdyn
+      && newdef
+      && !olddyn
+      && (olddef || h->root.type == bfd_link_hash_common)
+      && ELF_ST_TYPE (sym->st_info) != h->type
+      && ELF_ST_TYPE (sym->st_info) != STT_NOTYPE
+      && h->type != STT_NOTYPE
+      && !(newfunc && oldfunc))
+    {
+      *skip = TRUE;
+      return TRUE;
+    }
+
+  /* Plugin symbol type isn't currently set.  Stop bogus errors.  */
+  if (oldbfd != NULL && (oldbfd->flags & BFD_PLUGIN) != 0)
+    *type_change_ok = TRUE;
+
+  /* Check TLS symbol.  We don't check undefined symbol introduced by
+     "ld -u".  */
+  else if (oldbfd != NULL
+	   && ELF_ST_TYPE (sym->st_info) != h->type
+	   && (ELF_ST_TYPE (sym->st_info) == STT_TLS || h->type == STT_TLS))
+    {
+      bfd *ntbfd, *tbfd;
+      bfd_boolean ntdef, tdef;
+      asection *ntsec, *tsec;
+
+      if (h->type == STT_TLS)
+	{
+	  ntbfd = abfd;
+	  ntsec = sec;
+	  ntdef = newdef;
+	  tbfd = oldbfd;
+	  tsec = oldsec;
+	  tdef = olddef;
+	}
+      else
+	{
+	  ntbfd = oldbfd;
+	  ntsec = oldsec;
+	  ntdef = olddef;
+	  tbfd = abfd;
+	  tsec = sec;
+	  tdef = newdef;
+	}
+
+      if (tdef && ntdef)
+	(*_bfd_error_handler)
+	  (_("%s: TLS definition in %B section %A mismatches non-TLS definition in %B section %A"),
+	   tbfd, tsec, ntbfd, ntsec, h->root.root.string);
+      else if (!tdef && !ntdef)
+	(*_bfd_error_handler)
+	  (_("%s: TLS reference in %B mismatches non-TLS reference in %B"),
+	   tbfd, ntbfd, h->root.root.string);
+      else if (tdef)
+	(*_bfd_error_handler)
+	  (_("%s: TLS definition in %B section %A mismatches non-TLS reference in %B"),
+	   tbfd, tsec, ntbfd, h->root.root.string);
+      else
+	(*_bfd_error_handler)
+	  (_("%s: TLS reference in %B mismatches non-TLS definition in %B section %A"),
+	   tbfd, ntbfd, ntsec, h->root.root.string);
+
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  /* We need to remember if a symbol has a definition in a dynamic
+     object or is weak in all dynamic objects. Internal and hidden
+     visibility will make it unavailable to dynamic objects.  */
+  if (newdyn && !h->dynamic_def)
+    {
+      if (!bfd_is_und_section (sec))
+	h->dynamic_def = 1;
+      else
+	{
+	  /* Check if this symbol is weak in all dynamic objects. If it
+	     is the first time we see it in a dynamic object, we mark
+	     if it is weak. Otherwise, we clear it.  */
+	  if (!h->ref_dynamic)
+	    {
+	      if (bind == STB_WEAK)
+		h->dynamic_weak = 1;
+	    }
+	  else if (bind != STB_WEAK)
+	    h->dynamic_weak = 0;
+	}
+    }
+
+  /* If the old symbol has non-default visibility, we ignore the new
+     definition from a dynamic object.  */
+  if (newdyn
+      && ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+      && !bfd_is_und_section (sec))
+    {
+      *skip = TRUE;
+      /* Make sure this symbol is dynamic.  */
+      h->ref_dynamic = 1;
+      /* A protected symbol has external availability. Make sure it is
+	 recorded as dynamic.
+
+	 FIXME: Should we check type and size for protected symbol?  */
+      if (ELF_ST_VISIBILITY (h->other) == STV_PROTECTED)
+	return bfd_elf_link_record_dynamic_symbol (info, h);
+      else
+	return TRUE;
+    }
+  else if (!newdyn
+	   && ELF_ST_VISIBILITY (sym->st_other) != STV_DEFAULT
+	   && h->def_dynamic)
+    {
+      /* If the new symbol with non-default visibility comes from a
+	 relocatable file and the old definition comes from a dynamic
+	 object, we remove the old definition.  */
+      if ((*sym_hash)->root.type == bfd_link_hash_indirect)
+	{
+	  /* Handle the case where the old dynamic definition is
+	     default versioned.  We need to copy the symbol info from
+	     the symbol with default version to the normal one if it
+	     was referenced before.  */
+	  if (h->ref_regular)
+	    {
+	      struct elf_link_hash_entry *vh = *sym_hash;
+
+	      vh->root.type = h->root.type;
+	      h->root.type = bfd_link_hash_indirect;
+	      (*bed->elf_backend_copy_indirect_symbol) (info, vh, h);
+	      /* Protected symbols will override the dynamic definition
+		 with default version.  */
+	      if (ELF_ST_VISIBILITY (sym->st_other) == STV_PROTECTED)
+		{
+		  h->root.u.i.link = (struct bfd_link_hash_entry *) vh;
+		  vh->dynamic_def = 1;
+		  vh->ref_dynamic = 1;
+		}
+	      else
+		{
+		  h->root.type = vh->root.type;
+		  vh->ref_dynamic = 0;
+		  /* We have to hide it here since it was made dynamic
+		     global with extra bits when the symbol info was
+		     copied from the old dynamic definition.  */
+		  (*bed->elf_backend_hide_symbol) (info, vh, TRUE);
+		}
+	      h = vh;
+	    }
+	  else
+	    h = *sym_hash;
+	}
+
+      if ((h->root.u.undef.next || info->hash->undefs_tail == &h->root)
+	  && bfd_is_und_section (sec))
+	{
+	  /* If the new symbol is undefined and the old symbol was
+	     also undefined before, we need to make sure
+	     _bfd_generic_link_add_one_symbol doesn't mess
+	     up the linker hash table undefs list.  Since the old
+	     definition came from a dynamic object, it is still on the
+	     undefs list.  */
+	  h->root.type = bfd_link_hash_undefined;
+	  h->root.u.undef.abfd = abfd;
+	}
+      else
+	{
+	  h->root.type = bfd_link_hash_new;
+	  h->root.u.undef.abfd = NULL;
+	}
+
+      if (h->def_dynamic)
+	{
+	  h->def_dynamic = 0;
+	  h->ref_dynamic = 1;
+	}
+      /* FIXME: Should we check type and size for protected symbol?  */
+      h->size = 0;
+      h->type = 0;
+      return TRUE;
+    }
+
+  if (bind == STB_GNU_UNIQUE)
+    h->unique_global = 1;
+
+  /* If a new weak symbol definition comes from a regular file and the
+     old symbol comes from a dynamic library, we treat the new one as
+     strong.  Similarly, an old weak symbol definition from a regular
+     file is treated as strong when the new symbol comes from a dynamic
+     library.  Further, an old weak symbol from a dynamic library is
+     treated as strong if the new symbol is from a dynamic library.
+     This reflects the way glibc's ld.so works.
+
+     Do this before setting *type_change_ok or *size_change_ok so that
+     we warn properly when dynamic library symbols are overridden.  */
+
+  if (newdef && !newdyn && olddyn)
+    newweak = FALSE;
+  if (olddef && newdyn)
+    oldweak = FALSE;
+
+  /* Allow changes between different types of function symbol.  */
+  if (newfunc && oldfunc)
+    *type_change_ok = TRUE;
+
+  /* It's OK to change the type if either the existing symbol or the
+     new symbol is weak.  A type change is also OK if the old symbol
+     is undefined and the new symbol is defined.  */
+
+  if (oldweak
+      || newweak
+      || (newdef
+	  && h->root.type == bfd_link_hash_undefined))
+    *type_change_ok = TRUE;
+
+  /* It's OK to change the size if either the existing symbol or the
+     new symbol is weak, or if the old symbol is undefined.  */
+
+  if (*type_change_ok
+      || h->root.type == bfd_link_hash_undefined)
+    *size_change_ok = TRUE;
+
+  /* NEWDYNCOMMON and OLDDYNCOMMON indicate whether the new or old
+     symbol, respectively, appears to be a common symbol in a dynamic
+     object.  If a symbol appears in an uninitialized section, and is
+     not weak, and is not a function, then it may be a common symbol
+     which was resolved when the dynamic object was created.  We want
+     to treat such symbols specially, because they raise special
+     considerations when setting the symbol size: if the symbol
+     appears as a common symbol in a regular object, and the size in
+     the regular object is larger, we must make sure that we use the
+     larger size.  This problematic case can always be avoided in C,
+     but it must be handled correctly when using Fortran shared
+     libraries.
+
+     Note that if NEWDYNCOMMON is set, NEWDEF will be set, and
+     likewise for OLDDYNCOMMON and OLDDEF.
+
+     Note that this test is just a heuristic, and that it is quite
+     possible to have an uninitialized symbol in a shared object which
+     is really a definition, rather than a common symbol.  This could
+     lead to some minor confusion when the symbol really is a common
+     symbol in some regular object.  However, I think it will be
+     harmless.  */
+
+  if (newdyn
+      && newdef
+      && !newweak
+      && (sec->flags & SEC_ALLOC) != 0
+      && (sec->flags & SEC_LOAD) == 0
+      && sym->st_size > 0
+      && !newfunc)
+    newdyncommon = TRUE;
+  else
+    newdyncommon = FALSE;
+
+  if (olddyn
+      && olddef
+      && h->root.type == bfd_link_hash_defined
+      && h->def_dynamic
+      && (h->root.u.def.section->flags & SEC_ALLOC) != 0
+      && (h->root.u.def.section->flags & SEC_LOAD) == 0
+      && h->size > 0
+      && !oldfunc)
+    olddyncommon = TRUE;
+  else
+    olddyncommon = FALSE;
+
+  /* We now know everything about the old and new symbols.  We ask the
+     backend to check if we can merge them.  */
+  if (bed->merge_symbol
+      && !bed->merge_symbol (info, sym_hash, h, sym, psec, pvalue,
+			     pold_alignment, skip, override,
+			     type_change_ok, size_change_ok,
+			     &newdyn, &newdef, &newdyncommon, &newweak,
+			     abfd, &sec,
+			     &olddyn, &olddef, &olddyncommon, &oldweak,
+			     oldbfd, &oldsec))
+    return FALSE;
+
+  /* If both the old and the new symbols look like common symbols in a
+     dynamic object, set the size of the symbol to the larger of the
+     two.  */
+
+  if (olddyncommon
+      && newdyncommon
+      && sym->st_size != h->size)
+    {
+      /* Since we think we have two common symbols, issue a multiple
+	 common warning if desired.  Note that we only warn if the
+	 size is different.  If the size is the same, we simply let
+	 the old symbol override the new one as normally happens with
+	 symbols defined in dynamic objects.  */
+
+      if (! ((*info->callbacks->multiple_common)
+	     (info, &h->root, abfd, bfd_link_hash_common, sym->st_size)))
+	return FALSE;
+
+      if (sym->st_size > h->size)
+	h->size = sym->st_size;
+
+      *size_change_ok = TRUE;
+    }
+
+  /* If we are looking at a dynamic object, and we have found a
+     definition, we need to see if the symbol was already defined by
+     some other object.  If so, we want to use the existing
+     definition, and we do not want to report a multiple symbol
+     definition error; we do this by clobbering *PSEC to be
+     bfd_und_section_ptr.
+
+     We treat a common symbol as a definition if the symbol in the
+     shared library is a function, since common symbols always
+     represent variables; this can cause confusion in principle, but
+     any such confusion would seem to indicate an erroneous program or
+     shared library.  We also permit a common symbol in a regular
+     object to override a weak symbol in a shared object.  */
+
+  if (newdyn
+      && newdef
+      && (olddef
+	  || (h->root.type == bfd_link_hash_common
+	      && (newweak || newfunc))))
+    {
+      *override = TRUE;
+      newdef = FALSE;
+      newdyncommon = FALSE;
+
+      *psec = sec = bfd_und_section_ptr;
+      *size_change_ok = TRUE;
+
+      /* If we get here when the old symbol is a common symbol, then
+	 we are explicitly letting it override a weak symbol or
+	 function in a dynamic object, and we don't want to warn about
+	 a type change.  If the old symbol is a defined symbol, a type
+	 change warning may still be appropriate.  */
+
+      if (h->root.type == bfd_link_hash_common)
+	*type_change_ok = TRUE;
+    }
+
+  /* Handle the special case of an old common symbol merging with a
+     new symbol which looks like a common symbol in a shared object.
+     We change *PSEC and *PVALUE to make the new symbol look like a
+     common symbol, and let _bfd_generic_link_add_one_symbol do the
+     right thing.  */
+
+  if (newdyncommon
+      && h->root.type == bfd_link_hash_common)
+    {
+      *override = TRUE;
+      newdef = FALSE;
+      newdyncommon = FALSE;
+      *pvalue = sym->st_size;
+      *psec = sec = bed->common_section (oldsec);
+      *size_change_ok = TRUE;
+    }
+
+  /* Skip weak definitions of symbols that are already defined.  */
+  if (newdef && olddef && newweak)
+    {
+      /* Don't skip new non-IR weak syms.  */
+      if (!(oldbfd != NULL
+	    && (oldbfd->flags & BFD_PLUGIN) != 0
+	    && (abfd->flags & BFD_PLUGIN) == 0))
+	*skip = TRUE;
+
+      /* Merge st_other.  If the symbol already has a dynamic index,
+	 but visibility says it should not be visible, turn it into a
+	 local symbol.  */
+      elf_merge_st_other (abfd, h, sym, newdef, newdyn);
+      if (h->dynindx != -1)
+	switch (ELF_ST_VISIBILITY (h->other))
+	  {
+	  case STV_INTERNAL:
+	  case STV_HIDDEN:
+	    (*bed->elf_backend_hide_symbol) (info, h, TRUE);
+	    break;
+	  }
+    }
+
+  /* If the old symbol is from a dynamic object, and the new symbol is
+     a definition which is not from a dynamic object, then the new
+     symbol overrides the old symbol.  Symbols from regular files
+     always take precedence over symbols from dynamic objects, even if
+     they are defined after the dynamic object in the link.
+
+     As above, we again permit a common symbol in a regular object to
+     override a definition in a shared object if the shared object
+     symbol is a function or is weak.  */
+
+  flip = NULL;
+  if (!newdyn
+      && (newdef
+	  || (bfd_is_com_section (sec)
+	      && (oldweak || oldfunc)))
+      && olddyn
+      && olddef
+      && h->def_dynamic)
+    {
+      /* Change the hash table entry to undefined, and let
+	 _bfd_generic_link_add_one_symbol do the right thing with the
+	 new definition.  */
+
+      h->root.type = bfd_link_hash_undefined;
+      h->root.u.undef.abfd = h->root.u.def.section->owner;
+      *size_change_ok = TRUE;
+
+      olddef = FALSE;
+      olddyncommon = FALSE;
+
+      /* We again permit a type change when a common symbol may be
+	 overriding a function.  */
+
+      if (bfd_is_com_section (sec))
+	{
+	  if (oldfunc)
+	    {
+	      /* If a common symbol overrides a function, make sure
+		 that it isn't defined dynamically nor has type
+		 function.  */
+	      h->def_dynamic = 0;
+	      h->type = STT_NOTYPE;
+	    }
+	  *type_change_ok = TRUE;
+	}
+
+      if ((*sym_hash)->root.type == bfd_link_hash_indirect)
+	flip = *sym_hash;
+      else
+	/* This union may have been set to be non-NULL when this symbol
+	   was seen in a dynamic object.  We must force the union to be
+	   NULL, so that it is correct for a regular symbol.  */
+	h->verinfo.vertree = NULL;
+    }
+
+  /* Handle the special case of a new common symbol merging with an
+     old symbol that looks like it might be a common symbol defined in
+     a shared object.  Note that we have already handled the case in
+     which a new common symbol should simply override the definition
+     in the shared library.  */
+
+  if (! newdyn
+      && bfd_is_com_section (sec)
+      && olddyncommon)
+    {
+      /* It would be best if we could set the hash table entry to a
+	 common symbol, but we don't know what to use for the section
+	 or the alignment.  */
+      if (! ((*info->callbacks->multiple_common)
+	     (info, &h->root, abfd, bfd_link_hash_common, sym->st_size)))
+	return FALSE;
+
+      /* If the presumed common symbol in the dynamic object is
+	 larger, pretend that the new symbol has its size.  */
+
+      if (h->size > *pvalue)
+	*pvalue = h->size;
+
+      /* We need to remember the alignment required by the symbol
+	 in the dynamic object.  */
+      BFD_ASSERT (pold_alignment);
+      *pold_alignment = h->root.u.def.section->alignment_power;
+
+      olddef = FALSE;
+      olddyncommon = FALSE;
+
+      h->root.type = bfd_link_hash_undefined;
+      h->root.u.undef.abfd = h->root.u.def.section->owner;
+
+      *size_change_ok = TRUE;
+      *type_change_ok = TRUE;
+
+      if ((*sym_hash)->root.type == bfd_link_hash_indirect)
+	flip = *sym_hash;
+      else
+	h->verinfo.vertree = NULL;
+    }
+
+  if (flip != NULL)
+    {
+      /* Handle the case where we had a versioned symbol in a dynamic
+	 library and now find a definition in a normal object.  In this
+	 case, we make the versioned symbol point to the normal one.  */
+      flip->root.type = h->root.type;
+      flip->root.u.undef.abfd = h->root.u.undef.abfd;
+      h->root.type = bfd_link_hash_indirect;
+      h->root.u.i.link = (struct bfd_link_hash_entry *) flip;
+      (*bed->elf_backend_copy_indirect_symbol) (info, flip, h);
+      if (h->def_dynamic)
+	{
+	  h->def_dynamic = 0;
+	  flip->ref_dynamic = 1;
+	}
+    }
+
+  return TRUE;
+}
+
+/* This function is called to create an indirect symbol from the
+   default for the symbol with the default version if needed. The
+   symbol is described by H, NAME, SYM, PSEC, VALUE, and OVERRIDE.  We
+   set DYNSYM if the new indirect symbol is dynamic.  */
+
+static bfd_boolean
+_bfd_elf_add_default_symbol (bfd *abfd,
+			     struct bfd_link_info *info,
+			     struct elf_link_hash_entry *h,
+			     const char *name,
+			     Elf_Internal_Sym *sym,
+			     asection **psec,
+			     bfd_vma *value,
+			     bfd_boolean *dynsym,
+			     bfd_boolean override)
+{
+  bfd_boolean type_change_ok;
+  bfd_boolean size_change_ok;
+  bfd_boolean skip;
+  char *shortname;
+  struct elf_link_hash_entry *hi;
+  struct bfd_link_hash_entry *bh;
+  const struct elf_backend_data *bed;
+  bfd_boolean collect;
+  bfd_boolean dynamic;
+  char *p;
+  size_t len, shortlen;
+  asection *sec;
+
+  /* If this symbol has a version, and it is the default version, we
+     create an indirect symbol from the default name to the fully
+     decorated name.  This will cause external references which do not
+     specify a version to be bound to this version of the symbol.  */
+  p = strchr (name, ELF_VER_CHR);
+  if (p == NULL || p[1] != ELF_VER_CHR)
+    return TRUE;
+
+  if (override)
+    {
+      /* We are overridden by an old definition. We need to check if we
+	 need to create the indirect symbol from the default name.  */
+      hi = elf_link_hash_lookup (elf_hash_table (info), name, TRUE,
+				 FALSE, FALSE);
+      BFD_ASSERT (hi != NULL);
+      if (hi == h)
+	return TRUE;
+      while (hi->root.type == bfd_link_hash_indirect
+	     || hi->root.type == bfd_link_hash_warning)
+	{
+	  hi = (struct elf_link_hash_entry *) hi->root.u.i.link;
+	  if (hi == h)
+	    return TRUE;
+	}
+    }
+
+  bed = get_elf_backend_data (abfd);
+  collect = bed->collect;
+  dynamic = (abfd->flags & DYNAMIC) != 0;
+
+  shortlen = p - name;
+  shortname = (char *) bfd_hash_allocate (&info->hash->table, shortlen + 1);
+  if (shortname == NULL)
+    return FALSE;
+  memcpy (shortname, name, shortlen);
+  shortname[shortlen] = '\0';
+
+  /* We are going to create a new symbol.  Merge it with any existing
+     symbol with this name.  For the purposes of the merge, act as
+     though we were defining the symbol we just defined, although we
+     actually going to define an indirect symbol.  */
+  type_change_ok = FALSE;
+  size_change_ok = FALSE;
+  sec = *psec;
+  if (!_bfd_elf_merge_symbol (abfd, info, shortname, sym, &sec, value,
+			      NULL, &hi, &skip, &override,
+			      &type_change_ok, &size_change_ok))
+    return FALSE;
+
+  if (skip)
+    goto nondefault;
+
+  if (! override)
+    {
+      bh = &hi->root;
+      if (! (_bfd_generic_link_add_one_symbol
+	     (info, abfd, shortname, BSF_INDIRECT, bfd_ind_section_ptr,
+	      0, name, FALSE, collect, &bh)))
+	return FALSE;
+      hi = (struct elf_link_hash_entry *) bh;
+    }
+  else
+    {
+      /* In this case the symbol named SHORTNAME is overriding the
+	 indirect symbol we want to add.  We were planning on making
+	 SHORTNAME an indirect symbol referring to NAME.  SHORTNAME
+	 is the name without a version.  NAME is the fully versioned
+	 name, and it is the default version.
+
+	 Overriding means that we already saw a definition for the
+	 symbol SHORTNAME in a regular object, and it is overriding
+	 the symbol defined in the dynamic object.
+
+	 When this happens, we actually want to change NAME, the
+	 symbol we just added, to refer to SHORTNAME.  This will cause
+	 references to NAME in the shared object to become references
+	 to SHORTNAME in the regular object.  This is what we expect
+	 when we override a function in a shared object: that the
+	 references in the shared object will be mapped to the
+	 definition in the regular object.  */
+
+      while (hi->root.type == bfd_link_hash_indirect
+	     || hi->root.type == bfd_link_hash_warning)
+	hi = (struct elf_link_hash_entry *) hi->root.u.i.link;
+
+      h->root.type = bfd_link_hash_indirect;
+      h->root.u.i.link = (struct bfd_link_hash_entry *) hi;
+      if (h->def_dynamic)
+	{
+	  h->def_dynamic = 0;
+	  hi->ref_dynamic = 1;
+	  if (hi->ref_regular
+	      || hi->def_regular)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, hi))
+		return FALSE;
+	    }
+	}
+
+      /* Now set HI to H, so that the following code will set the
+	 other fields correctly.  */
+      hi = h;
+    }
+
+  /* Check if HI is a warning symbol.  */
+  if (hi->root.type == bfd_link_hash_warning)
+    hi = (struct elf_link_hash_entry *) hi->root.u.i.link;
+
+  /* If there is a duplicate definition somewhere, then HI may not
+     point to an indirect symbol.  We will have reported an error to
+     the user in that case.  */
+
+  if (hi->root.type == bfd_link_hash_indirect)
+    {
+      struct elf_link_hash_entry *ht;
+
+      ht = (struct elf_link_hash_entry *) hi->root.u.i.link;
+      (*bed->elf_backend_copy_indirect_symbol) (info, ht, hi);
+
+      /* See if the new flags lead us to realize that the symbol must
+	 be dynamic.  */
+      if (! *dynsym)
+	{
+	  if (! dynamic)
+	    {
+	      if (! info->executable
+		  || hi->ref_dynamic)
+		*dynsym = TRUE;
+	    }
+	  else
+	    {
+	      if (hi->ref_regular)
+		*dynsym = TRUE;
+	    }
+	}
+    }
+
+  /* We also need to define an indirection from the nondefault version
+     of the symbol.  */
+
+nondefault:
+  len = strlen (name);
+  shortname = (char *) bfd_hash_allocate (&info->hash->table, len);
+  if (shortname == NULL)
+    return FALSE;
+  memcpy (shortname, name, shortlen);
+  memcpy (shortname + shortlen, p + 1, len - shortlen);
+
+  /* Once again, merge with any existing symbol.  */
+  type_change_ok = FALSE;
+  size_change_ok = FALSE;
+  sec = *psec;
+  if (!_bfd_elf_merge_symbol (abfd, info, shortname, sym, &sec, value,
+			      NULL, &hi, &skip, &override,
+			      &type_change_ok, &size_change_ok))
+    return FALSE;
+
+  if (skip)
+    return TRUE;
+
+  if (override)
+    {
+      /* Here SHORTNAME is a versioned name, so we don't expect to see
+	 the type of override we do in the case above unless it is
+	 overridden by a versioned definition.  */
+      if (hi->root.type != bfd_link_hash_defined
+	  && hi->root.type != bfd_link_hash_defweak)
+	(*_bfd_error_handler)
+	  (_("%B: unexpected redefinition of indirect versioned symbol `%s'"),
+	   abfd, shortname);
+    }
+  else
+    {
+      bh = &hi->root;
+      if (! (_bfd_generic_link_add_one_symbol
+	     (info, abfd, shortname, BSF_INDIRECT,
+	      bfd_ind_section_ptr, 0, name, FALSE, collect, &bh)))
+	return FALSE;
+      hi = (struct elf_link_hash_entry *) bh;
+
+      /* If there is a duplicate definition somewhere, then HI may not
+	 point to an indirect symbol.  We will have reported an error
+	 to the user in that case.  */
+
+      if (hi->root.type == bfd_link_hash_indirect)
+	{
+	  (*bed->elf_backend_copy_indirect_symbol) (info, h, hi);
+
+	  /* See if the new flags lead us to realize that the symbol
+	     must be dynamic.  */
+	  if (! *dynsym)
+	    {
+	      if (! dynamic)
+		{
+		  if (! info->executable
+		      || hi->ref_dynamic)
+		    *dynsym = TRUE;
+		}
+	      else
+		{
+		  if (hi->ref_regular)
+		    *dynsym = TRUE;
+		}
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* This routine is used to export all defined symbols into the dynamic
+   symbol table.  It is called via elf_link_hash_traverse.  */
+
+static bfd_boolean
+_bfd_elf_export_symbol (struct elf_link_hash_entry *h, void *data)
+{
+  struct elf_info_failed *eif = (struct elf_info_failed *) data;
+
+  /* Ignore indirect symbols.  These are added by the versioning code.  */
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  /* Ignore this if we won't export it.  */
+  if (!eif->info->export_dynamic && !h->dynamic)
+    return TRUE;
+
+  if (h->dynindx == -1
+      && (h->def_regular || h->ref_regular)
+      && ! bfd_hide_sym_by_version (eif->info->version_info,
+				    h->root.root.string))
+    {
+      if (! bfd_elf_link_record_dynamic_symbol (eif->info, h))
+	{
+	  eif->failed = TRUE;
+	  return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Look through the symbols which are defined in other shared
+   libraries and referenced here.  Update the list of version
+   dependencies.  This will be put into the .gnu.version_r section.
+   This function is called via elf_link_hash_traverse.  */
+
+static bfd_boolean
+_bfd_elf_link_find_version_dependencies (struct elf_link_hash_entry *h,
+					 void *data)
+{
+  struct elf_find_verdep_info *rinfo = (struct elf_find_verdep_info *) data;
+  Elf_Internal_Verneed *t;
+  Elf_Internal_Vernaux *a;
+  bfd_size_type amt;
+
+  /* We only care about symbols defined in shared objects with version
+     information.  */
+  if (!h->def_dynamic
+      || h->def_regular
+      || h->dynindx == -1
+      || h->verinfo.verdef == NULL)
+    return TRUE;
+
+  /* See if we already know about this version.  */
+  for (t = elf_tdata (rinfo->info->output_bfd)->verref;
+       t != NULL;
+       t = t->vn_nextref)
+    {
+      if (t->vn_bfd != h->verinfo.verdef->vd_bfd)
+	continue;
+
+      for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr)
+	if (a->vna_nodename == h->verinfo.verdef->vd_nodename)
+	  return TRUE;
+
+      break;
+    }
+
+  /* This is a new version.  Add it to tree we are building.  */
+
+  if (t == NULL)
+    {
+      amt = sizeof *t;
+      t = (Elf_Internal_Verneed *) bfd_zalloc (rinfo->info->output_bfd, amt);
+      if (t == NULL)
+	{
+	  rinfo->failed = TRUE;
+	  return FALSE;
+	}
+
+      t->vn_bfd = h->verinfo.verdef->vd_bfd;
+      t->vn_nextref = elf_tdata (rinfo->info->output_bfd)->verref;
+      elf_tdata (rinfo->info->output_bfd)->verref = t;
+    }
+
+  amt = sizeof *a;
+  a = (Elf_Internal_Vernaux *) bfd_zalloc (rinfo->info->output_bfd, amt);
+  if (a == NULL)
+    {
+      rinfo->failed = TRUE;
+      return FALSE;
+    }
+
+  /* Note that we are copying a string pointer here, and testing it
+     above.  If bfd_elf_string_from_elf_section is ever changed to
+     discard the string data when low in memory, this will have to be
+     fixed.  */
+  a->vna_nodename = h->verinfo.verdef->vd_nodename;
+
+  a->vna_flags = h->verinfo.verdef->vd_flags;
+  a->vna_nextptr = t->vn_auxptr;
+
+  h->verinfo.verdef->vd_exp_refno = rinfo->vers;
+  ++rinfo->vers;
+
+  a->vna_other = h->verinfo.verdef->vd_exp_refno + 1;
+
+  t->vn_auxptr = a;
+
+  return TRUE;
+}
+
+/* Figure out appropriate versions for all the symbols.  We may not
+   have the version number script until we have read all of the input
+   files, so until that point we don't know which symbols should be
+   local.  This function is called via elf_link_hash_traverse.  */
+
+static bfd_boolean
+_bfd_elf_link_assign_sym_version (struct elf_link_hash_entry *h, void *data)
+{
+  struct elf_info_failed *sinfo;
+  struct bfd_link_info *info;
+  const struct elf_backend_data *bed;
+  struct elf_info_failed eif;
+  char *p;
+  bfd_size_type amt;
+
+  sinfo = (struct elf_info_failed *) data;
+  info = sinfo->info;
+
+  /* Fix the symbol flags.  */
+  eif.failed = FALSE;
+  eif.info = info;
+  if (! _bfd_elf_fix_symbol_flags (h, &eif))
+    {
+      if (eif.failed)
+	sinfo->failed = TRUE;
+      return FALSE;
+    }
+
+  /* We only need version numbers for symbols defined in regular
+     objects.  */
+  if (!h->def_regular)
+    return TRUE;
+
+  bed = get_elf_backend_data (info->output_bfd);
+  p = strchr (h->root.root.string, ELF_VER_CHR);
+  if (p != NULL && h->verinfo.vertree == NULL)
+    {
+      struct bfd_elf_version_tree *t;
+      bfd_boolean hidden;
+
+      hidden = TRUE;
+
+      /* There are two consecutive ELF_VER_CHR characters if this is
+	 not a hidden symbol.  */
+      ++p;
+      if (*p == ELF_VER_CHR)
+	{
+	  hidden = FALSE;
+	  ++p;
+	}
+
+      /* If there is no version string, we can just return out.  */
+      if (*p == '\0')
+	{
+	  if (hidden)
+	    h->hidden = 1;
+	  return TRUE;
+	}
+
+      /* Look for the version.  If we find it, it is no longer weak.  */
+      for (t = sinfo->info->version_info; t != NULL; t = t->next)
+	{
+	  if (strcmp (t->name, p) == 0)
+	    {
+	      size_t len;
+	      char *alc;
+	      struct bfd_elf_version_expr *d;
+
+	      len = p - h->root.root.string;
+	      alc = (char *) bfd_malloc (len);
+	      if (alc == NULL)
+		{
+		  sinfo->failed = TRUE;
+		  return FALSE;
+		}
+	      memcpy (alc, h->root.root.string, len - 1);
+	      alc[len - 1] = '\0';
+	      if (alc[len - 2] == ELF_VER_CHR)
+		alc[len - 2] = '\0';
+
+	      h->verinfo.vertree = t;
+	      t->used = TRUE;
+	      d = NULL;
+
+	      if (t->globals.list != NULL)
+		d = (*t->match) (&t->globals, NULL, alc);
+
+	      /* See if there is anything to force this symbol to
+		 local scope.  */
+	      if (d == NULL && t->locals.list != NULL)
+		{
+		  d = (*t->match) (&t->locals, NULL, alc);
+		  if (d != NULL
+		      && h->dynindx != -1
+		      && ! info->export_dynamic)
+		    (*bed->elf_backend_hide_symbol) (info, h, TRUE);
+		}
+
+	      free (alc);
+	      break;
+	    }
+	}
+
+      /* If we are building an application, we need to create a
+	 version node for this version.  */
+      if (t == NULL && info->executable)
+	{
+	  struct bfd_elf_version_tree **pp;
+	  int version_index;
+
+	  /* If we aren't going to export this symbol, we don't need
+	     to worry about it.  */
+	  if (h->dynindx == -1)
+	    return TRUE;
+
+	  amt = sizeof *t;
+	  t = (struct bfd_elf_version_tree *) bfd_zalloc (info->output_bfd, amt);
+	  if (t == NULL)
+	    {
+	      sinfo->failed = TRUE;
+	      return FALSE;
+	    }
+
+	  t->name = p;
+	  t->name_indx = (unsigned int) -1;
+	  t->used = TRUE;
+
+	  version_index = 1;
+	  /* Don't count anonymous version tag.  */
+	  if (sinfo->info->version_info != NULL
+	      && sinfo->info->version_info->vernum == 0)
+	    version_index = 0;
+	  for (pp = &sinfo->info->version_info;
+	       *pp != NULL;
+	       pp = &(*pp)->next)
+	    ++version_index;
+	  t->vernum = version_index;
+
+	  *pp = t;
+
+	  h->verinfo.vertree = t;
+	}
+      else if (t == NULL)
+	{
+	  /* We could not find the version for a symbol when
+	     generating a shared archive.  Return an error.  */
+	  (*_bfd_error_handler)
+	    (_("%B: version node not found for symbol %s"),
+	     info->output_bfd, h->root.root.string);
+	  bfd_set_error (bfd_error_bad_value);
+	  sinfo->failed = TRUE;
+	  return FALSE;
+	}
+
+      if (hidden)
+	h->hidden = 1;
+    }
+
+  /* If we don't have a version for this symbol, see if we can find
+     something.  */
+  if (h->verinfo.vertree == NULL && sinfo->info->version_info != NULL)
+    {
+      bfd_boolean hide;
+
+      h->verinfo.vertree
+	= bfd_find_version_for_sym (sinfo->info->version_info,
+				    h->root.root.string, &hide);
+      if (h->verinfo.vertree != NULL && hide)
+	(*bed->elf_backend_hide_symbol) (info, h, TRUE);
+    }
+
+  return TRUE;
+}
+
+/* Read and swap the relocs from the section indicated by SHDR.  This
+   may be either a REL or a RELA section.  The relocations are
+   translated into RELA relocations and stored in INTERNAL_RELOCS,
+   which should have already been allocated to contain enough space.
+   The EXTERNAL_RELOCS are a buffer where the external form of the
+   relocations should be stored.
+
+   Returns FALSE if something goes wrong.  */
+
+static bfd_boolean
+elf_link_read_relocs_from_section (bfd *abfd,
+				   asection *sec,
+				   Elf_Internal_Shdr *shdr,
+				   void *external_relocs,
+				   Elf_Internal_Rela *internal_relocs)
+{
+  const struct elf_backend_data *bed;
+  void (*swap_in) (bfd *, const bfd_byte *, Elf_Internal_Rela *);
+  const bfd_byte *erela;
+  const bfd_byte *erelaend;
+  Elf_Internal_Rela *irela;
+  Elf_Internal_Shdr *symtab_hdr;
+  size_t nsyms;
+
+  /* Position ourselves at the start of the section.  */
+  if (bfd_seek (abfd, shdr->sh_offset, SEEK_SET) != 0)
+    return FALSE;
+
+  /* Read the relocations.  */
+  if (bfd_bread (external_relocs, shdr->sh_size, abfd) != shdr->sh_size)
+    return FALSE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  nsyms = NUM_SHDR_ENTRIES (symtab_hdr);
+
+  bed = get_elf_backend_data (abfd);
+
+  /* Convert the external relocations to the internal format.  */
+  if (shdr->sh_entsize == bed->s->sizeof_rel)
+    swap_in = bed->s->swap_reloc_in;
+  else if (shdr->sh_entsize == bed->s->sizeof_rela)
+    swap_in = bed->s->swap_reloca_in;
+  else
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+
+  erela = (const bfd_byte *) external_relocs;
+  erelaend = erela + shdr->sh_size;
+  irela = internal_relocs;
+  while (erela < erelaend)
+    {
+      bfd_vma r_symndx;
+
+      (*swap_in) (abfd, erela, irela);
+      r_symndx = ELF32_R_SYM (irela->r_info);
+      if (bed->s->arch_size == 64)
+	r_symndx >>= 24;
+      if (nsyms > 0)
+	{
+	  if ((size_t) r_symndx >= nsyms)
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: bad reloc symbol index (0x%lx >= 0x%lx)"
+		   " for offset 0x%lx in section `%A'"),
+		 abfd, sec,
+		 (unsigned long) r_symndx, (unsigned long) nsyms, irela->r_offset);
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	}
+      else if (r_symndx != STN_UNDEF)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B: non-zero symbol index (0x%lx) for offset 0x%lx in section `%A'"
+	       " when the object file has no symbol table"),
+	     abfd, sec,
+	     (unsigned long) r_symndx, (unsigned long) nsyms, irela->r_offset);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+      irela += bed->s->int_rels_per_ext_rel;
+      erela += shdr->sh_entsize;
+    }
+
+  return TRUE;
+}
+
+/* Read and swap the relocs for a section O.  They may have been
+   cached.  If the EXTERNAL_RELOCS and INTERNAL_RELOCS arguments are
+   not NULL, they are used as buffers to read into.  They are known to
+   be large enough.  If the INTERNAL_RELOCS relocs argument is NULL,
+   the return value is allocated using either malloc or bfd_alloc,
+   according to the KEEP_MEMORY argument.  If O has two relocation
+   sections (both REL and RELA relocations), then the REL_HDR
+   relocations will appear first in INTERNAL_RELOCS, followed by the
+   RELA_HDR relocations.  */
+
+Elf_Internal_Rela *
+_bfd_elf_link_read_relocs (bfd *abfd,
+			   asection *o,
+			   void *external_relocs,
+			   Elf_Internal_Rela *internal_relocs,
+			   bfd_boolean keep_memory)
+{
+  void *alloc1 = NULL;
+  Elf_Internal_Rela *alloc2 = NULL;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  struct bfd_elf_section_data *esdo = elf_section_data (o);
+  Elf_Internal_Rela *internal_rela_relocs;
+
+  if (esdo->relocs != NULL)
+    return esdo->relocs;
+
+  if (o->reloc_count == 0)
+    return NULL;
+
+  if (internal_relocs == NULL)
+    {
+      bfd_size_type size;
+
+      size = o->reloc_count;
+      size *= bed->s->int_rels_per_ext_rel * sizeof (Elf_Internal_Rela);
+      if (keep_memory)
+	internal_relocs = alloc2 = (Elf_Internal_Rela *) bfd_alloc (abfd, size);
+      else
+	internal_relocs = alloc2 = (Elf_Internal_Rela *) bfd_malloc (size);
+      if (internal_relocs == NULL)
+	goto error_return;
+    }
+
+  if (external_relocs == NULL)
+    {
+      bfd_size_type size = 0;
+
+      if (esdo->rel.hdr)
+	size += esdo->rel.hdr->sh_size;
+      if (esdo->rela.hdr)
+	size += esdo->rela.hdr->sh_size;
+
+      alloc1 = bfd_malloc (size);
+      if (alloc1 == NULL)
+	goto error_return;
+      external_relocs = alloc1;
+    }
+
+  internal_rela_relocs = internal_relocs;
+  if (esdo->rel.hdr)
+    {
+      if (!elf_link_read_relocs_from_section (abfd, o, esdo->rel.hdr,
+					      external_relocs,
+					      internal_relocs))
+	goto error_return;
+      external_relocs = (((bfd_byte *) external_relocs)
+			 + esdo->rel.hdr->sh_size);
+      internal_rela_relocs += (NUM_SHDR_ENTRIES (esdo->rel.hdr)
+			       * bed->s->int_rels_per_ext_rel);
+    }
+
+  if (esdo->rela.hdr
+      && (!elf_link_read_relocs_from_section (abfd, o, esdo->rela.hdr,
+					      external_relocs,
+					      internal_rela_relocs)))
+    goto error_return;
+
+  /* Cache the results for next time, if we can.  */
+  if (keep_memory)
+    esdo->relocs = internal_relocs;
+
+  if (alloc1 != NULL)
+    free (alloc1);
+
+  /* Don't free alloc2, since if it was allocated we are passing it
+     back (under the name of internal_relocs).  */
+
+  return internal_relocs;
+
+ error_return:
+  if (alloc1 != NULL)
+    free (alloc1);
+  if (alloc2 != NULL)
+    {
+      if (keep_memory)
+	bfd_release (abfd, alloc2);
+      else
+	free (alloc2);
+    }
+  return NULL;
+}
+
+/* Compute the size of, and allocate space for, REL_HDR which is the
+   section header for a section containing relocations for O.  */
+
+static bfd_boolean
+_bfd_elf_link_size_reloc_section (bfd *abfd,
+				  struct bfd_elf_section_reloc_data *reldata)
+{
+  Elf_Internal_Shdr *rel_hdr = reldata->hdr;
+
+  /* That allows us to calculate the size of the section.  */
+  rel_hdr->sh_size = rel_hdr->sh_entsize * reldata->count;
+
+  /* The contents field must last into write_object_contents, so we
+     allocate it with bfd_alloc rather than malloc.  Also since we
+     cannot be sure that the contents will actually be filled in,
+     we zero the allocated space.  */
+  rel_hdr->contents = (unsigned char *) bfd_zalloc (abfd, rel_hdr->sh_size);
+  if (rel_hdr->contents == NULL && rel_hdr->sh_size != 0)
+    return FALSE;
+
+  if (reldata->hashes == NULL && reldata->count)
+    {
+      struct elf_link_hash_entry **p;
+
+      p = (struct elf_link_hash_entry **)
+          bfd_zmalloc (reldata->count * sizeof (struct elf_link_hash_entry *));
+      if (p == NULL)
+	return FALSE;
+
+      reldata->hashes = p;
+    }
+
+  return TRUE;
+}
+
+/* Copy the relocations indicated by the INTERNAL_RELOCS (which
+   originated from the section given by INPUT_REL_HDR) to the
+   OUTPUT_BFD.  */
+
+bfd_boolean
+_bfd_elf_link_output_relocs (bfd *output_bfd,
+			     asection *input_section,
+			     Elf_Internal_Shdr *input_rel_hdr,
+			     Elf_Internal_Rela *internal_relocs,
+			     struct elf_link_hash_entry **rel_hash
+			       ATTRIBUTE_UNUSED)
+{
+  Elf_Internal_Rela *irela;
+  Elf_Internal_Rela *irelaend;
+  bfd_byte *erel;
+  struct bfd_elf_section_reloc_data *output_reldata;
+  asection *output_section;
+  const struct elf_backend_data *bed;
+  void (*swap_out) (bfd *, const Elf_Internal_Rela *, bfd_byte *);
+  struct bfd_elf_section_data *esdo;
+
+  output_section = input_section->output_section;
+
+  bed = get_elf_backend_data (output_bfd);
+  esdo = elf_section_data (output_section);
+  if (esdo->rel.hdr && esdo->rel.hdr->sh_entsize == input_rel_hdr->sh_entsize)
+    {
+      output_reldata = &esdo->rel;
+      swap_out = bed->s->swap_reloc_out;
+    }
+  else if (esdo->rela.hdr
+	   && esdo->rela.hdr->sh_entsize == input_rel_hdr->sh_entsize)
+    {
+      output_reldata = &esdo->rela;
+      swap_out = bed->s->swap_reloca_out;
+    }
+  else
+    {
+      (*_bfd_error_handler)
+	(_("%B: relocation size mismatch in %B section %A"),
+	 output_bfd, input_section->owner, input_section);
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+
+  erel = output_reldata->hdr->contents;
+  erel += output_reldata->count * input_rel_hdr->sh_entsize;
+  irela = internal_relocs;
+  irelaend = irela + (NUM_SHDR_ENTRIES (input_rel_hdr)
+		      * bed->s->int_rels_per_ext_rel);
+  while (irela < irelaend)
+    {
+      (*swap_out) (output_bfd, irela, erel);
+      irela += bed->s->int_rels_per_ext_rel;
+      erel += input_rel_hdr->sh_entsize;
+    }
+
+  /* Bump the counter, so that we know where to add the next set of
+     relocations.  */
+  output_reldata->count += NUM_SHDR_ENTRIES (input_rel_hdr);
+
+  return TRUE;
+}
+
+/* Make weak undefined symbols in PIE dynamic.  */
+
+bfd_boolean
+_bfd_elf_link_hash_fixup_symbol (struct bfd_link_info *info,
+				 struct elf_link_hash_entry *h)
+{
+  if (info->pie
+      && h->dynindx == -1
+      && h->root.type == bfd_link_hash_undefweak)
+    return bfd_elf_link_record_dynamic_symbol (info, h);
+
+  return TRUE;
+}
+
+/* Fix up the flags for a symbol.  This handles various cases which
+   can only be fixed after all the input files are seen.  This is
+   currently called by both adjust_dynamic_symbol and
+   assign_sym_version, which is unnecessary but perhaps more robust in
+   the face of future changes.  */
+
+static bfd_boolean
+_bfd_elf_fix_symbol_flags (struct elf_link_hash_entry *h,
+			   struct elf_info_failed *eif)
+{
+  const struct elf_backend_data *bed;
+
+  /* If this symbol was mentioned in a non-ELF file, try to set
+     DEF_REGULAR and REF_REGULAR correctly.  This is the only way to
+     permit a non-ELF file to correctly refer to a symbol defined in
+     an ELF dynamic object.  */
+  if (h->non_elf)
+    {
+      while (h->root.type == bfd_link_hash_indirect)
+	h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+      if (h->root.type != bfd_link_hash_defined
+	  && h->root.type != bfd_link_hash_defweak)
+	{
+	  h->ref_regular = 1;
+	  h->ref_regular_nonweak = 1;
+	}
+      else
+	{
+	  if (h->root.u.def.section->owner != NULL
+	      && (bfd_get_flavour (h->root.u.def.section->owner)
+		  == bfd_target_elf_flavour))
+	    {
+	      h->ref_regular = 1;
+	      h->ref_regular_nonweak = 1;
+	    }
+	  else
+	    h->def_regular = 1;
+	}
+
+      if (h->dynindx == -1
+	  && (h->def_dynamic
+	      || h->ref_dynamic))
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (eif->info, h))
+	    {
+	      eif->failed = TRUE;
+	      return FALSE;
+	    }
+	}
+    }
+  else
+    {
+      /* Unfortunately, NON_ELF is only correct if the symbol
+	 was first seen in a non-ELF file.  Fortunately, if the symbol
+	 was first seen in an ELF file, we're probably OK unless the
+	 symbol was defined in a non-ELF file.  Catch that case here.
+	 FIXME: We're still in trouble if the symbol was first seen in
+	 a dynamic object, and then later in a non-ELF regular object.  */
+      if ((h->root.type == bfd_link_hash_defined
+	   || h->root.type == bfd_link_hash_defweak)
+	  && !h->def_regular
+	  && (h->root.u.def.section->owner != NULL
+	      ? (bfd_get_flavour (h->root.u.def.section->owner)
+		 != bfd_target_elf_flavour)
+	      : (bfd_is_abs_section (h->root.u.def.section)
+		 && !h->def_dynamic)))
+	h->def_regular = 1;
+    }
+
+  /* Backend specific symbol fixup.  */
+  bed = get_elf_backend_data (elf_hash_table (eif->info)->dynobj);
+  if (bed->elf_backend_fixup_symbol
+      && !(*bed->elf_backend_fixup_symbol) (eif->info, h))
+    return FALSE;
+
+  /* If this is a final link, and the symbol was defined as a common
+     symbol in a regular object file, and there was no definition in
+     any dynamic object, then the linker will have allocated space for
+     the symbol in a common section but the DEF_REGULAR
+     flag will not have been set.  */
+  if (h->root.type == bfd_link_hash_defined
+      && !h->def_regular
+      && h->ref_regular
+      && !h->def_dynamic
+      && (h->root.u.def.section->owner->flags & DYNAMIC) == 0)
+    h->def_regular = 1;
+
+  /* If -Bsymbolic was used (which means to bind references to global
+     symbols to the definition within the shared object), and this
+     symbol was defined in a regular object, then it actually doesn't
+     need a PLT entry.  Likewise, if the symbol has non-default
+     visibility.  If the symbol has hidden or internal visibility, we
+     will force it local.  */
+  if (h->needs_plt
+      && eif->info->shared
+      && is_elf_hash_table (eif->info->hash)
+      && (SYMBOLIC_BIND (eif->info, h)
+	  || ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+      && h->def_regular)
+    {
+      bfd_boolean force_local;
+
+      force_local = (ELF_ST_VISIBILITY (h->other) == STV_INTERNAL
+		     || ELF_ST_VISIBILITY (h->other) == STV_HIDDEN);
+      (*bed->elf_backend_hide_symbol) (eif->info, h, force_local);
+    }
+
+  /* If a weak undefined symbol has non-default visibility, we also
+     hide it from the dynamic linker.  */
+  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+      && h->root.type == bfd_link_hash_undefweak)
+    (*bed->elf_backend_hide_symbol) (eif->info, h, TRUE);
+
+  /* If this is a weak defined symbol in a dynamic object, and we know
+     the real definition in the dynamic object, copy interesting flags
+     over to the real definition.  */
+  if (h->u.weakdef != NULL)
+    {
+      struct elf_link_hash_entry *weakdef;
+
+      weakdef = h->u.weakdef;
+      while (h->root.type == bfd_link_hash_indirect)
+	h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+      BFD_ASSERT (h->root.type == bfd_link_hash_defined
+		  || h->root.type == bfd_link_hash_defweak);
+      BFD_ASSERT (weakdef->def_dynamic);
+
+      /* If the real definition is defined by a regular object file,
+	 don't do anything special.  See the longer description in
+	 _bfd_elf_adjust_dynamic_symbol, below.  */
+      if (weakdef->def_regular)
+	h->u.weakdef = NULL;
+      else
+	{
+	  BFD_ASSERT (weakdef->root.type == bfd_link_hash_defined
+		      || weakdef->root.type == bfd_link_hash_defweak);
+	  (*bed->elf_backend_copy_indirect_symbol) (eif->info, weakdef, h);
+	}
+    }
+
+  return TRUE;
+}
+
+/* Make the backend pick a good value for a dynamic symbol.  This is
+   called via elf_link_hash_traverse, and also calls itself
+   recursively.  */
+
+static bfd_boolean
+_bfd_elf_adjust_dynamic_symbol (struct elf_link_hash_entry *h, void *data)
+{
+  struct elf_info_failed *eif = (struct elf_info_failed *) data;
+  bfd *dynobj;
+  const struct elf_backend_data *bed;
+
+  if (! is_elf_hash_table (eif->info->hash))
+    return FALSE;
+
+  /* Ignore indirect symbols.  These are added by the versioning code.  */
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  /* Fix the symbol flags.  */
+  if (! _bfd_elf_fix_symbol_flags (h, eif))
+    return FALSE;
+
+  /* If this symbol does not require a PLT entry, and it is not
+     defined by a dynamic object, or is not referenced by a regular
+     object, ignore it.  We do have to handle a weak defined symbol,
+     even if no regular object refers to it, if we decided to add it
+     to the dynamic symbol table.  FIXME: Do we normally need to worry
+     about symbols which are defined by one dynamic object and
+     referenced by another one?  */
+  if (!h->needs_plt
+      && h->type != STT_GNU_IFUNC
+      && (h->def_regular
+	  || !h->def_dynamic
+	  || (!h->ref_regular
+	      && (h->u.weakdef == NULL || h->u.weakdef->dynindx == -1))))
+    {
+      h->plt = elf_hash_table (eif->info)->init_plt_offset;
+      return TRUE;
+    }
+
+  /* If we've already adjusted this symbol, don't do it again.  This
+     can happen via a recursive call.  */
+  if (h->dynamic_adjusted)
+    return TRUE;
+
+  /* Don't look at this symbol again.  Note that we must set this
+     after checking the above conditions, because we may look at a
+     symbol once, decide not to do anything, and then get called
+     recursively later after REF_REGULAR is set below.  */
+  h->dynamic_adjusted = 1;
+
+  /* If this is a weak definition, and we know a real definition, and
+     the real symbol is not itself defined by a regular object file,
+     then get a good value for the real definition.  We handle the
+     real symbol first, for the convenience of the backend routine.
+
+     Note that there is a confusing case here.  If the real definition
+     is defined by a regular object file, we don't get the real symbol
+     from the dynamic object, but we do get the weak symbol.  If the
+     processor backend uses a COPY reloc, then if some routine in the
+     dynamic object changes the real symbol, we will not see that
+     change in the corresponding weak symbol.  This is the way other
+     ELF linkers work as well, and seems to be a result of the shared
+     library model.
+
+     I will clarify this issue.  Most SVR4 shared libraries define the
+     variable _timezone and define timezone as a weak synonym.  The
+     tzset call changes _timezone.  If you write
+       extern int timezone;
+       int _timezone = 5;
+       int main () { tzset (); printf ("%d %d\n", timezone, _timezone); }
+     you might expect that, since timezone is a synonym for _timezone,
+     the same number will print both times.  However, if the processor
+     backend uses a COPY reloc, then actually timezone will be copied
+     into your process image, and, since you define _timezone
+     yourself, _timezone will not.  Thus timezone and _timezone will
+     wind up at different memory locations.  The tzset call will set
+     _timezone, leaving timezone unchanged.  */
+
+  if (h->u.weakdef != NULL)
+    {
+      /* If we get to this point, there is an implicit reference to
+	 H->U.WEAKDEF by a regular object file via the weak symbol H.  */
+      h->u.weakdef->ref_regular = 1;
+
+      /* Ensure that the backend adjust_dynamic_symbol function sees
+	 H->U.WEAKDEF before H by recursively calling ourselves.  */
+      if (! _bfd_elf_adjust_dynamic_symbol (h->u.weakdef, eif))
+	return FALSE;
+    }
+
+  /* If a symbol has no type and no size and does not require a PLT
+     entry, then we are probably about to do the wrong thing here: we
+     are probably going to create a COPY reloc for an empty object.
+     This case can arise when a shared object is built with assembly
+     code, and the assembly code fails to set the symbol type.  */
+  if (h->size == 0
+      && h->type == STT_NOTYPE
+      && !h->needs_plt)
+    (*_bfd_error_handler)
+      (_("warning: type and size of dynamic symbol `%s' are not defined"),
+       h->root.root.string);
+
+  dynobj = elf_hash_table (eif->info)->dynobj;
+  bed = get_elf_backend_data (dynobj);
+
+  if (! (*bed->elf_backend_adjust_dynamic_symbol) (eif->info, h))
+    {
+      eif->failed = TRUE;
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Adjust the dynamic symbol, H, for copy in the dynamic bss section,
+   DYNBSS.  */
+
+bfd_boolean
+_bfd_elf_adjust_dynamic_copy (struct elf_link_hash_entry *h,
+			      asection *dynbss)
+{
+  unsigned int power_of_two;
+  bfd_vma mask;
+  asection *sec = h->root.u.def.section;
+
+  /* The section aligment of definition is the maximum alignment
+     requirement of symbols defined in the section.  Since we don't
+     know the symbol alignment requirement, we start with the
+     maximum alignment and check low bits of the symbol address
+     for the minimum alignment.  */
+  power_of_two = bfd_get_section_alignment (sec->owner, sec);
+  mask = ((bfd_vma) 1 << power_of_two) - 1;
+  while ((h->root.u.def.value & mask) != 0)
+    {
+       mask >>= 1;
+       --power_of_two;
+    }
+
+  if (power_of_two > bfd_get_section_alignment (dynbss->owner,
+						dynbss))
+    {
+      /* Adjust the section alignment if needed.  */
+      if (! bfd_set_section_alignment (dynbss->owner, dynbss,
+				       power_of_two))
+	return FALSE;
+    }
+
+  /* We make sure that the symbol will be aligned properly.  */
+  dynbss->size = BFD_ALIGN (dynbss->size, mask + 1);
+
+  /* Define the symbol as being at this point in DYNBSS.  */
+  h->root.u.def.section = dynbss;
+  h->root.u.def.value = dynbss->size;
+
+  /* Increment the size of DYNBSS to make room for the symbol.  */
+  dynbss->size += h->size;
+
+  return TRUE;
+}
+
+/* Adjust all external symbols pointing into SEC_MERGE sections
+   to reflect the object merging within the sections.  */
+
+static bfd_boolean
+_bfd_elf_link_sec_merge_syms (struct elf_link_hash_entry *h, void *data)
+{
+  asection *sec;
+
+  if ((h->root.type == bfd_link_hash_defined
+       || h->root.type == bfd_link_hash_defweak)
+      && ((sec = h->root.u.def.section)->flags & SEC_MERGE)
+      && sec->sec_info_type == ELF_INFO_TYPE_MERGE)
+    {
+      bfd *output_bfd = (bfd *) data;
+
+      h->root.u.def.value =
+	_bfd_merged_section_offset (output_bfd,
+				    &h->root.u.def.section,
+				    elf_section_data (sec)->sec_info,
+				    h->root.u.def.value);
+    }
+
+  return TRUE;
+}
+
+/* Returns false if the symbol referred to by H should be considered
+   to resolve local to the current module, and true if it should be
+   considered to bind dynamically.  */
+
+bfd_boolean
+_bfd_elf_dynamic_symbol_p (struct elf_link_hash_entry *h,
+			   struct bfd_link_info *info,
+			   bfd_boolean not_local_protected)
+{
+  bfd_boolean binding_stays_local_p;
+  const struct elf_backend_data *bed;
+  struct elf_link_hash_table *hash_table;
+
+  if (h == NULL)
+    return FALSE;
+
+  while (h->root.type == bfd_link_hash_indirect
+	 || h->root.type == bfd_link_hash_warning)
+    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+  /* If it was forced local, then clearly it's not dynamic.  */
+  if (h->dynindx == -1)
+    return FALSE;
+  if (h->forced_local)
+    return FALSE;
+
+  /* Identify the cases where name binding rules say that a
+     visible symbol resolves locally.  */
+  binding_stays_local_p = info->executable || SYMBOLIC_BIND (info, h);
+
+  switch (ELF_ST_VISIBILITY (h->other))
+    {
+    case STV_INTERNAL:
+    case STV_HIDDEN:
+      return FALSE;
+
+    case STV_PROTECTED:
+      hash_table = elf_hash_table (info);
+      if (!is_elf_hash_table (hash_table))
+	return FALSE;
+
+      bed = get_elf_backend_data (hash_table->dynobj);
+
+      /* Proper resolution for function pointer equality may require
+	 that these symbols perhaps be resolved dynamically, even though
+	 we should be resolving them to the current module.  */
+      if (!not_local_protected || !bed->is_function_type (h->type))
+	binding_stays_local_p = TRUE;
+      break;
+
+    default:
+      break;
+    }
+
+  /* If it isn't defined locally, then clearly it's dynamic.  */
+  if (!h->def_regular && !ELF_COMMON_DEF_P (h))
+    return TRUE;
+
+  /* Otherwise, the symbol is dynamic if binding rules don't tell
+     us that it remains local.  */
+  return !binding_stays_local_p;
+}
+
+/* Return true if the symbol referred to by H should be considered
+   to resolve local to the current module, and false otherwise.  Differs
+   from (the inverse of) _bfd_elf_dynamic_symbol_p in the treatment of
+   undefined symbols.  The two functions are virtually identical except
+   for the place where forced_local and dynindx == -1 are tested.  If
+   either of those tests are true, _bfd_elf_dynamic_symbol_p will say
+   the symbol is local, while _bfd_elf_symbol_refs_local_p will say
+   the symbol is local only for defined symbols.
+   It might seem that _bfd_elf_dynamic_symbol_p could be rewritten as
+   !_bfd_elf_symbol_refs_local_p, except that targets differ in their
+   treatment of undefined weak symbols.  For those that do not make
+   undefined weak symbols dynamic, both functions may return false.  */
+
+bfd_boolean
+_bfd_elf_symbol_refs_local_p (struct elf_link_hash_entry *h,
+			      struct bfd_link_info *info,
+			      bfd_boolean local_protected)
+{
+  const struct elf_backend_data *bed;
+  struct elf_link_hash_table *hash_table;
+
+  /* If it's a local sym, of course we resolve locally.  */
+  if (h == NULL)
+    return TRUE;
+
+  /* STV_HIDDEN or STV_INTERNAL ones must be local.  */
+  if (ELF_ST_VISIBILITY (h->other) == STV_HIDDEN
+      || ELF_ST_VISIBILITY (h->other) == STV_INTERNAL)
+    return TRUE;
+
+  /* Common symbols that become definitions don't get the DEF_REGULAR
+     flag set, so test it first, and don't bail out.  */
+  if (ELF_COMMON_DEF_P (h))
+    /* Do nothing.  */;
+  /* If we don't have a definition in a regular file, then we can't
+     resolve locally.  The sym is either undefined or dynamic.  */
+  else if (!h->def_regular)
+    return FALSE;
+
+  /* Forced local symbols resolve locally.  */
+  if (h->forced_local)
+    return TRUE;
+
+  /* As do non-dynamic symbols.  */
+  if (h->dynindx == -1)
+    return TRUE;
+
+  /* At this point, we know the symbol is defined and dynamic.  In an
+     executable it must resolve locally, likewise when building symbolic
+     shared libraries.  */
+  if (info->executable || SYMBOLIC_BIND (info, h))
+    return TRUE;
+
+  /* Now deal with defined dynamic symbols in shared libraries.  Ones
+     with default visibility might not resolve locally.  */
+  if (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT)
+    return FALSE;
+
+  hash_table = elf_hash_table (info);
+  if (!is_elf_hash_table (hash_table))
+    return TRUE;
+
+  bed = get_elf_backend_data (hash_table->dynobj);
+
+  /* STV_PROTECTED non-function symbols are local.  */
+  if (!bed->is_function_type (h->type))
+    return TRUE;
+
+  /* Function pointer equality tests may require that STV_PROTECTED
+     symbols be treated as dynamic symbols.  If the address of a
+     function not defined in an executable is set to that function's
+     plt entry in the executable, then the address of the function in
+     a shared library must also be the plt entry in the executable.  */
+  return local_protected;
+}
+
+/* Caches some TLS segment info, and ensures that the TLS segment vma is
+   aligned.  Returns the first TLS output section.  */
+
+struct bfd_section *
+_bfd_elf_tls_setup (bfd *obfd, struct bfd_link_info *info)
+{
+  struct bfd_section *sec, *tls;
+  unsigned int align = 0;
+
+  for (sec = obfd->sections; sec != NULL; sec = sec->next)
+    if ((sec->flags & SEC_THREAD_LOCAL) != 0)
+      break;
+  tls = sec;
+
+  for (; sec != NULL && (sec->flags & SEC_THREAD_LOCAL) != 0; sec = sec->next)
+    if (sec->alignment_power > align)
+      align = sec->alignment_power;
+
+  elf_hash_table (info)->tls_sec = tls;
+
+  /* Ensure the alignment of the first section is the largest alignment,
+     so that the tls segment starts aligned.  */
+  if (tls != NULL)
+    tls->alignment_power = align;
+
+  return tls;
+}
+
+/* Return TRUE iff this is a non-common, definition of a non-function symbol.  */
+static bfd_boolean
+is_global_data_symbol_definition (bfd *abfd ATTRIBUTE_UNUSED,
+				  Elf_Internal_Sym *sym)
+{
+  const struct elf_backend_data *bed;
+
+  /* Local symbols do not count, but target specific ones might.  */
+  if (ELF_ST_BIND (sym->st_info) != STB_GLOBAL
+      && ELF_ST_BIND (sym->st_info) < STB_LOOS)
+    return FALSE;
+
+  bed = get_elf_backend_data (abfd);
+  /* Function symbols do not count.  */
+  if (bed->is_function_type (ELF_ST_TYPE (sym->st_info)))
+    return FALSE;
+
+  /* If the section is undefined, then so is the symbol.  */
+  if (sym->st_shndx == SHN_UNDEF)
+    return FALSE;
+
+  /* If the symbol is defined in the common section, then
+     it is a common definition and so does not count.  */
+  if (bed->common_definition (sym))
+    return FALSE;
+
+  /* If the symbol is in a target specific section then we
+     must rely upon the backend to tell us what it is.  */
+  if (sym->st_shndx >= SHN_LORESERVE && sym->st_shndx < SHN_ABS)
+    /* FIXME - this function is not coded yet:
+
+       return _bfd_is_global_symbol_definition (abfd, sym);
+
+       Instead for now assume that the definition is not global,
+       Even if this is wrong, at least the linker will behave
+       in the same way that it used to do.  */
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Search the symbol table of the archive element of the archive ABFD
+   whose archive map contains a mention of SYMDEF, and determine if
+   the symbol is defined in this element.  */
+static bfd_boolean
+elf_link_is_defined_archive_symbol (bfd * abfd, carsym * symdef)
+{
+  Elf_Internal_Shdr * hdr;
+  bfd_size_type symcount;
+  bfd_size_type extsymcount;
+  bfd_size_type extsymoff;
+  Elf_Internal_Sym *isymbuf;
+  Elf_Internal_Sym *isym;
+  Elf_Internal_Sym *isymend;
+  bfd_boolean result;
+
+  abfd = _bfd_get_elt_at_filepos (abfd, symdef->file_offset);
+  if (abfd == NULL)
+    return FALSE;
+
+  if (! bfd_check_format (abfd, bfd_object))
+    return FALSE;
+
+  /* If we have already included the element containing this symbol in the
+     link then we do not need to include it again.  Just claim that any symbol
+     it contains is not a definition, so that our caller will not decide to
+     (re)include this element.  */
+  if (abfd->archive_pass)
+    return FALSE;
+
+  /* Select the appropriate symbol table.  */
+  if ((abfd->flags & DYNAMIC) == 0 || elf_dynsymtab (abfd) == 0)
+    hdr = &elf_tdata (abfd)->symtab_hdr;
+  else
+    hdr = &elf_tdata (abfd)->dynsymtab_hdr;
+
+  symcount = hdr->sh_size / get_elf_backend_data (abfd)->s->sizeof_sym;
+
+  /* The sh_info field of the symtab header tells us where the
+     external symbols start.  We don't care about the local symbols.  */
+  if (elf_bad_symtab (abfd))
+    {
+      extsymcount = symcount;
+      extsymoff = 0;
+    }
+  else
+    {
+      extsymcount = symcount - hdr->sh_info;
+      extsymoff = hdr->sh_info;
+    }
+
+  if (extsymcount == 0)
+    return FALSE;
+
+  /* Read in the symbol table.  */
+  isymbuf = bfd_elf_get_elf_syms (abfd, hdr, extsymcount, extsymoff,
+				  NULL, NULL, NULL);
+  if (isymbuf == NULL)
+    return FALSE;
+
+  /* Scan the symbol table looking for SYMDEF.  */
+  result = FALSE;
+  for (isym = isymbuf, isymend = isymbuf + extsymcount; isym < isymend; isym++)
+    {
+      const char *name;
+
+      name = bfd_elf_string_from_elf_section (abfd, hdr->sh_link,
+					      isym->st_name);
+      if (name == NULL)
+	break;
+
+      if (strcmp (name, symdef->name) == 0)
+	{
+	  result = is_global_data_symbol_definition (abfd, isym);
+	  break;
+	}
+    }
+
+  free (isymbuf);
+
+  return result;
+}
+
+/* Add an entry to the .dynamic table.  */
+
+bfd_boolean
+_bfd_elf_add_dynamic_entry (struct bfd_link_info *info,
+			    bfd_vma tag,
+			    bfd_vma val)
+{
+  struct elf_link_hash_table *hash_table;
+  const struct elf_backend_data *bed;
+  asection *s;
+  bfd_size_type newsize;
+  bfd_byte *newcontents;
+  Elf_Internal_Dyn dyn;
+
+  hash_table = elf_hash_table (info);
+  if (! is_elf_hash_table (hash_table))
+    return FALSE;
+
+  bed = get_elf_backend_data (hash_table->dynobj);
+  s = bfd_get_section_by_name (hash_table->dynobj, ".dynamic");
+  BFD_ASSERT (s != NULL);
+
+  newsize = s->size + bed->s->sizeof_dyn;
+  newcontents = (bfd_byte *) bfd_realloc (s->contents, newsize);
+  if (newcontents == NULL)
+    return FALSE;
+
+  dyn.d_tag = tag;
+  dyn.d_un.d_val = val;
+  bed->s->swap_dyn_out (hash_table->dynobj, &dyn, newcontents + s->size);
+
+  s->size = newsize;
+  s->contents = newcontents;
+
+  return TRUE;
+}
+
+/* Add a DT_NEEDED entry for this dynamic object if DO_IT is true,
+   otherwise just check whether one already exists.  Returns -1 on error,
+   1 if a DT_NEEDED tag already exists, and 0 on success.  */
+
+static int
+elf_add_dt_needed_tag (bfd *abfd,
+		       struct bfd_link_info *info,
+		       const char *soname,
+		       bfd_boolean do_it)
+{
+  struct elf_link_hash_table *hash_table;
+  bfd_size_type oldsize;
+  bfd_size_type strindex;
+
+  if (!_bfd_elf_link_create_dynstrtab (abfd, info))
+    return -1;
+
+  hash_table = elf_hash_table (info);
+  oldsize = _bfd_elf_strtab_size (hash_table->dynstr);
+  strindex = _bfd_elf_strtab_add (hash_table->dynstr, soname, FALSE);
+  if (strindex == (bfd_size_type) -1)
+    return -1;
+
+  if (oldsize == _bfd_elf_strtab_size (hash_table->dynstr))
+    {
+      asection *sdyn;
+      const struct elf_backend_data *bed;
+      bfd_byte *extdyn;
+
+      bed = get_elf_backend_data (hash_table->dynobj);
+      sdyn = bfd_get_section_by_name (hash_table->dynobj, ".dynamic");
+      if (sdyn != NULL)
+	for (extdyn = sdyn->contents;
+	     extdyn < sdyn->contents + sdyn->size;
+	     extdyn += bed->s->sizeof_dyn)
+	  {
+	    Elf_Internal_Dyn dyn;
+
+	    bed->s->swap_dyn_in (hash_table->dynobj, extdyn, &dyn);
+	    if (dyn.d_tag == DT_NEEDED
+		&& dyn.d_un.d_val == strindex)
+	      {
+		_bfd_elf_strtab_delref (hash_table->dynstr, strindex);
+		return 1;
+	      }
+	  }
+    }
+
+  if (do_it)
+    {
+      if (!_bfd_elf_link_create_dynamic_sections (hash_table->dynobj, info))
+	return -1;
+
+      if (!_bfd_elf_add_dynamic_entry (info, DT_NEEDED, strindex))
+	return -1;
+    }
+  else
+    /* We were just checking for existence of the tag.  */
+    _bfd_elf_strtab_delref (hash_table->dynstr, strindex);
+
+  return 0;
+}
+
+static bfd_boolean
+on_needed_list (const char *soname, struct bfd_link_needed_list *needed)
+{
+  for (; needed != NULL; needed = needed->next)
+    if (strcmp (soname, needed->name) == 0)
+      return TRUE;
+
+  return FALSE;
+}
+
+/* Sort symbol by value and section.  */
+static int
+elf_sort_symbol (const void *arg1, const void *arg2)
+{
+  const struct elf_link_hash_entry *h1;
+  const struct elf_link_hash_entry *h2;
+  bfd_signed_vma vdiff;
+
+  h1 = *(const struct elf_link_hash_entry **) arg1;
+  h2 = *(const struct elf_link_hash_entry **) arg2;
+  vdiff = h1->root.u.def.value - h2->root.u.def.value;
+  if (vdiff != 0)
+    return vdiff > 0 ? 1 : -1;
+  else
+    {
+      long sdiff = h1->root.u.def.section->id - h2->root.u.def.section->id;
+      if (sdiff != 0)
+	return sdiff > 0 ? 1 : -1;
+    }
+  return 0;
+}
+
+/* This function is used to adjust offsets into .dynstr for
+   dynamic symbols.  This is called via elf_link_hash_traverse.  */
+
+static bfd_boolean
+elf_adjust_dynstr_offsets (struct elf_link_hash_entry *h, void *data)
+{
+  struct elf_strtab_hash *dynstr = (struct elf_strtab_hash *) data;
+
+  if (h->dynindx != -1)
+    h->dynstr_index = _bfd_elf_strtab_offset (dynstr, h->dynstr_index);
+  return TRUE;
+}
+
+/* Assign string offsets in .dynstr, update all structures referencing
+   them.  */
+
+static bfd_boolean
+elf_finalize_dynstr (bfd *output_bfd, struct bfd_link_info *info)
+{
+  struct elf_link_hash_table *hash_table = elf_hash_table (info);
+  struct elf_link_local_dynamic_entry *entry;
+  struct elf_strtab_hash *dynstr = hash_table->dynstr;
+  bfd *dynobj = hash_table->dynobj;
+  asection *sdyn;
+  bfd_size_type size;
+  const struct elf_backend_data *bed;
+  bfd_byte *extdyn;
+
+  _bfd_elf_strtab_finalize (dynstr);
+  size = _bfd_elf_strtab_size (dynstr);
+
+  bed = get_elf_backend_data (dynobj);
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+  BFD_ASSERT (sdyn != NULL);
+
+  /* Update all .dynamic entries referencing .dynstr strings.  */
+  for (extdyn = sdyn->contents;
+       extdyn < sdyn->contents + sdyn->size;
+       extdyn += bed->s->sizeof_dyn)
+    {
+      Elf_Internal_Dyn dyn;
+
+      bed->s->swap_dyn_in (dynobj, extdyn, &dyn);
+      switch (dyn.d_tag)
+	{
+	case DT_STRSZ:
+	  dyn.d_un.d_val = size;
+	  break;
+	case DT_NEEDED:
+	case DT_SONAME:
+	case DT_RPATH:
+	case DT_RUNPATH:
+	case DT_FILTER:
+	case DT_AUXILIARY:
+	case DT_AUDIT:
+	case DT_DEPAUDIT:
+	  dyn.d_un.d_val = _bfd_elf_strtab_offset (dynstr, dyn.d_un.d_val);
+	  break;
+	default:
+	  continue;
+	}
+      bed->s->swap_dyn_out (dynobj, &dyn, extdyn);
+    }
+
+  /* Now update local dynamic symbols.  */
+  for (entry = hash_table->dynlocal; entry ; entry = entry->next)
+    entry->isym.st_name = _bfd_elf_strtab_offset (dynstr,
+						  entry->isym.st_name);
+
+  /* And the rest of dynamic symbols.  */
+  elf_link_hash_traverse (hash_table, elf_adjust_dynstr_offsets, dynstr);
+
+  /* Adjust version definitions.  */
+  if (elf_tdata (output_bfd)->cverdefs)
+    {
+      asection *s;
+      bfd_byte *p;
+      bfd_size_type i;
+      Elf_Internal_Verdef def;
+      Elf_Internal_Verdaux defaux;
+
+      s = bfd_get_section_by_name (dynobj, ".gnu.version_d");
+      p = s->contents;
+      do
+	{
+	  _bfd_elf_swap_verdef_in (output_bfd, (Elf_External_Verdef *) p,
+				   &def);
+	  p += sizeof (Elf_External_Verdef);
+	  if (def.vd_aux != sizeof (Elf_External_Verdef))
+	    continue;
+	  for (i = 0; i < def.vd_cnt; ++i)
+	    {
+	      _bfd_elf_swap_verdaux_in (output_bfd,
+					(Elf_External_Verdaux *) p, &defaux);
+	      defaux.vda_name = _bfd_elf_strtab_offset (dynstr,
+							defaux.vda_name);
+	      _bfd_elf_swap_verdaux_out (output_bfd,
+					 &defaux, (Elf_External_Verdaux *) p);
+	      p += sizeof (Elf_External_Verdaux);
+	    }
+	}
+      while (def.vd_next);
+    }
+
+  /* Adjust version references.  */
+  if (elf_tdata (output_bfd)->verref)
+    {
+      asection *s;
+      bfd_byte *p;
+      bfd_size_type i;
+      Elf_Internal_Verneed need;
+      Elf_Internal_Vernaux needaux;
+
+      s = bfd_get_section_by_name (dynobj, ".gnu.version_r");
+      p = s->contents;
+      do
+	{
+	  _bfd_elf_swap_verneed_in (output_bfd, (Elf_External_Verneed *) p,
+				    &need);
+	  need.vn_file = _bfd_elf_strtab_offset (dynstr, need.vn_file);
+	  _bfd_elf_swap_verneed_out (output_bfd, &need,
+				     (Elf_External_Verneed *) p);
+	  p += sizeof (Elf_External_Verneed);
+	  for (i = 0; i < need.vn_cnt; ++i)
+	    {
+	      _bfd_elf_swap_vernaux_in (output_bfd,
+					(Elf_External_Vernaux *) p, &needaux);
+	      needaux.vna_name = _bfd_elf_strtab_offset (dynstr,
+							 needaux.vna_name);
+	      _bfd_elf_swap_vernaux_out (output_bfd,
+					 &needaux,
+					 (Elf_External_Vernaux *) p);
+	      p += sizeof (Elf_External_Vernaux);
+	    }
+	}
+      while (need.vn_next);
+    }
+
+  return TRUE;
+}
+
+/* Return TRUE iff relocations for INPUT are compatible with OUTPUT.
+   The default is to only match when the INPUT and OUTPUT are exactly
+   the same target.  */
+
+bfd_boolean
+_bfd_elf_default_relocs_compatible (const bfd_target *input,
+				    const bfd_target *output)
+{
+  return input == output;
+}
+
+/* Return TRUE iff relocations for INPUT are compatible with OUTPUT.
+   This version is used when different targets for the same architecture
+   are virtually identical.  */
+
+bfd_boolean
+_bfd_elf_relocs_compatible (const bfd_target *input,
+			    const bfd_target *output)
+{
+  const struct elf_backend_data *obed, *ibed;
+
+  if (input == output)
+    return TRUE;
+
+  ibed = xvec_get_elf_backend_data (input);
+  obed = xvec_get_elf_backend_data (output);
+
+  if (ibed->arch != obed->arch)
+    return FALSE;
+
+  /* If both backends are using this function, deem them compatible.  */
+  return ibed->relocs_compatible == obed->relocs_compatible;
+}
+
+/* Add symbols from an ELF object file to the linker hash table.  */
+
+static bfd_boolean
+elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  Elf_Internal_Ehdr *ehdr;
+  Elf_Internal_Shdr *hdr;
+  bfd_size_type symcount;
+  bfd_size_type extsymcount;
+  bfd_size_type extsymoff;
+  struct elf_link_hash_entry **sym_hash;
+  bfd_boolean dynamic;
+  Elf_External_Versym *extversym = NULL;
+  Elf_External_Versym *ever;
+  struct elf_link_hash_entry *weaks;
+  struct elf_link_hash_entry **nondeflt_vers = NULL;
+  bfd_size_type nondeflt_vers_cnt = 0;
+  Elf_Internal_Sym *isymbuf = NULL;
+  Elf_Internal_Sym *isym;
+  Elf_Internal_Sym *isymend;
+  const struct elf_backend_data *bed;
+  bfd_boolean add_needed;
+  struct elf_link_hash_table *htab;
+  bfd_size_type amt;
+  void *alloc_mark = NULL;
+  struct bfd_hash_entry **old_table = NULL;
+  unsigned int old_size = 0;
+  unsigned int old_count = 0;
+  void *old_tab = NULL;
+  void *old_hash;
+  void *old_ent;
+  struct bfd_link_hash_entry *old_undefs = NULL;
+  struct bfd_link_hash_entry *old_undefs_tail = NULL;
+  long old_dynsymcount = 0;
+  size_t tabsize = 0;
+  size_t hashsize = 0;
+
+  htab = elf_hash_table (info);
+  bed = get_elf_backend_data (abfd);
+
+  if ((abfd->flags & DYNAMIC) == 0)
+    dynamic = FALSE;
+  else
+    {
+      dynamic = TRUE;
+
+      /* You can't use -r against a dynamic object.  Also, there's no
+	 hope of using a dynamic object which does not exactly match
+	 the format of the output file.  */
+      if (info->relocatable
+	  || !is_elf_hash_table (htab)
+	  || info->output_bfd->xvec != abfd->xvec)
+	{
+	  if (info->relocatable)
+	    bfd_set_error (bfd_error_invalid_operation);
+	  else
+	    bfd_set_error (bfd_error_wrong_format);
+	  goto error_return;
+	}
+    }
+
+  ehdr = elf_elfheader (abfd);
+  if (info->warn_alternate_em
+      && bed->elf_machine_code != ehdr->e_machine
+      && ((bed->elf_machine_alt1 != 0
+	   && ehdr->e_machine == bed->elf_machine_alt1)
+	  || (bed->elf_machine_alt2 != 0
+	      && ehdr->e_machine == bed->elf_machine_alt2)))
+    info->callbacks->einfo
+      (_("%P: alternate ELF machine code found (%d) in %B, expecting %d\n"),
+       ehdr->e_machine, abfd, bed->elf_machine_code);
+
+  /* As a GNU extension, any input sections which are named
+     .gnu.warning.SYMBOL are treated as warning symbols for the given
+     symbol.  This differs from .gnu.warning sections, which generate
+     warnings when they are included in an output file.  */
+  /* PR 12761: Also generate this warning when building shared libraries.  */
+  if (info->executable || info->shared)
+    {
+      asection *s;
+
+      for (s = abfd->sections; s != NULL; s = s->next)
+	{
+	  const char *name;
+
+	  name = bfd_get_section_name (abfd, s);
+	  if (CONST_STRNEQ (name, ".gnu.warning."))
+	    {
+	      char *msg;
+	      bfd_size_type sz;
+
+	      name += sizeof ".gnu.warning." - 1;
+
+	      /* If this is a shared object, then look up the symbol
+		 in the hash table.  If it is there, and it is already
+		 been defined, then we will not be using the entry
+		 from this shared object, so we don't need to warn.
+		 FIXME: If we see the definition in a regular object
+		 later on, we will warn, but we shouldn't.  The only
+		 fix is to keep track of what warnings we are supposed
+		 to emit, and then handle them all at the end of the
+		 link.  */
+	      if (dynamic)
+		{
+		  struct elf_link_hash_entry *h;
+
+		  h = elf_link_hash_lookup (htab, name, FALSE, FALSE, TRUE);
+
+		  /* FIXME: What about bfd_link_hash_common?  */
+		  if (h != NULL
+		      && (h->root.type == bfd_link_hash_defined
+			  || h->root.type == bfd_link_hash_defweak))
+		    {
+		      /* We don't want to issue this warning.  Clobber
+			 the section size so that the warning does not
+			 get copied into the output file.  */
+		      s->size = 0;
+		      continue;
+		    }
+		}
+
+	      sz = s->size;
+	      msg = (char *) bfd_alloc (abfd, sz + 1);
+	      if (msg == NULL)
+		goto error_return;
+
+	      if (! bfd_get_section_contents (abfd, s, msg, 0, sz))
+		goto error_return;
+
+	      msg[sz] = '\0';
+
+	      if (! (_bfd_generic_link_add_one_symbol
+		     (info, abfd, name, BSF_WARNING, s, 0, msg,
+		      FALSE, bed->collect, NULL)))
+		goto error_return;
+
+	      if (! info->relocatable)
+		{
+		  /* Clobber the section size so that the warning does
+		     not get copied into the output file.  */
+		  s->size = 0;
+
+		  /* Also set SEC_EXCLUDE, so that symbols defined in
+		     the warning section don't get copied to the output.  */
+		  s->flags |= SEC_EXCLUDE;
+		}
+	    }
+	}
+    }
+
+  add_needed = TRUE;
+  if (! dynamic)
+    {
+      /* If we are creating a shared library, create all the dynamic
+	 sections immediately.  We need to attach them to something,
+	 so we attach them to this BFD, provided it is the right
+	 format.  FIXME: If there are no input BFD's of the same
+	 format as the output, we can't make a shared library.  */
+      if (info->shared
+	  && is_elf_hash_table (htab)
+	  && info->output_bfd->xvec == abfd->xvec
+	  && !htab->dynamic_sections_created)
+	{
+	  if (! _bfd_elf_link_create_dynamic_sections (abfd, info))
+	    goto error_return;
+	}
+    }
+  else if (!is_elf_hash_table (htab))
+    goto error_return;
+  else
+    {
+      asection *s;
+      const char *soname = NULL;
+      char *audit = NULL;
+      struct bfd_link_needed_list *rpath = NULL, *runpath = NULL;
+      int ret;
+
+      /* ld --just-symbols and dynamic objects don't mix very well.
+	 ld shouldn't allow it.  */
+      if ((s = abfd->sections) != NULL
+	  && s->sec_info_type == ELF_INFO_TYPE_JUST_SYMS)
+	abort ();
+
+      /* If this dynamic lib was specified on the command line with
+	 --as-needed in effect, then we don't want to add a DT_NEEDED
+	 tag unless the lib is actually used.  Similary for libs brought
+	 in by another lib's DT_NEEDED.  When --no-add-needed is used
+	 on a dynamic lib, we don't want to add a DT_NEEDED entry for
+	 any dynamic library in DT_NEEDED tags in the dynamic lib at
+	 all.  */
+      add_needed = (elf_dyn_lib_class (abfd)
+		    & (DYN_AS_NEEDED | DYN_DT_NEEDED
+		       | DYN_NO_NEEDED)) == 0;
+
+      s = bfd_get_section_by_name (abfd, ".dynamic");
+      if (s != NULL)
+	{
+	  bfd_byte *dynbuf;
+	  bfd_byte *extdyn;
+	  unsigned int elfsec;
+	  unsigned long shlink;
+
+	  if (!bfd_malloc_and_get_section (abfd, s, &dynbuf))
+	    {
+error_free_dyn:
+	      free (dynbuf);
+	      goto error_return;
+	    }
+
+	  elfsec = _bfd_elf_section_from_bfd_section (abfd, s);
+	  if (elfsec == SHN_BAD)
+	    goto error_free_dyn;
+	  shlink = elf_elfsections (abfd)[elfsec]->sh_link;
+
+	  for (extdyn = dynbuf;
+	       extdyn < dynbuf + s->size;
+	       extdyn += bed->s->sizeof_dyn)
+	    {
+	      Elf_Internal_Dyn dyn;
+
+	      bed->s->swap_dyn_in (abfd, extdyn, &dyn);
+	      if (dyn.d_tag == DT_SONAME)
+		{
+		  unsigned int tagv = dyn.d_un.d_val;
+		  soname = bfd_elf_string_from_elf_section (abfd, shlink, tagv);
+		  if (soname == NULL)
+		    goto error_free_dyn;
+		}
+	      if (dyn.d_tag == DT_NEEDED)
+		{
+		  struct bfd_link_needed_list *n, **pn;
+		  char *fnm, *anm;
+		  unsigned int tagv = dyn.d_un.d_val;
+
+		  amt = sizeof (struct bfd_link_needed_list);
+		  n = (struct bfd_link_needed_list *) bfd_alloc (abfd, amt);
+		  fnm = bfd_elf_string_from_elf_section (abfd, shlink, tagv);
+		  if (n == NULL || fnm == NULL)
+		    goto error_free_dyn;
+		  amt = strlen (fnm) + 1;
+		  anm = (char *) bfd_alloc (abfd, amt);
+		  if (anm == NULL)
+		    goto error_free_dyn;
+		  memcpy (anm, fnm, amt);
+		  n->name = anm;
+		  n->by = abfd;
+		  n->next = NULL;
+		  for (pn = &htab->needed; *pn != NULL; pn = &(*pn)->next)
+		    ;
+		  *pn = n;
+		}
+	      if (dyn.d_tag == DT_RUNPATH)
+		{
+		  struct bfd_link_needed_list *n, **pn;
+		  char *fnm, *anm;
+		  unsigned int tagv = dyn.d_un.d_val;
+
+		  amt = sizeof (struct bfd_link_needed_list);
+		  n = (struct bfd_link_needed_list *) bfd_alloc (abfd, amt);
+		  fnm = bfd_elf_string_from_elf_section (abfd, shlink, tagv);
+		  if (n == NULL || fnm == NULL)
+		    goto error_free_dyn;
+		  amt = strlen (fnm) + 1;
+		  anm = (char *) bfd_alloc (abfd, amt);
+		  if (anm == NULL)
+		    goto error_free_dyn;
+		  memcpy (anm, fnm, amt);
+		  n->name = anm;
+		  n->by = abfd;
+		  n->next = NULL;
+		  for (pn = & runpath;
+		       *pn != NULL;
+		       pn = &(*pn)->next)
+		    ;
+		  *pn = n;
+		}
+	      /* Ignore DT_RPATH if we have seen DT_RUNPATH.  */
+	      if (!runpath && dyn.d_tag == DT_RPATH)
+		{
+		  struct bfd_link_needed_list *n, **pn;
+		  char *fnm, *anm;
+		  unsigned int tagv = dyn.d_un.d_val;
+
+		  amt = sizeof (struct bfd_link_needed_list);
+		  n = (struct bfd_link_needed_list *) bfd_alloc (abfd, amt);
+		  fnm = bfd_elf_string_from_elf_section (abfd, shlink, tagv);
+		  if (n == NULL || fnm == NULL)
+		    goto error_free_dyn;
+		  amt = strlen (fnm) + 1;
+		  anm = (char *) bfd_alloc (abfd, amt);
+		  if (anm == NULL)
+		    goto error_free_dyn;
+		  memcpy (anm, fnm, amt);
+		  n->name = anm;
+		  n->by = abfd;
+		  n->next = NULL;
+		  for (pn = & rpath;
+		       *pn != NULL;
+		       pn = &(*pn)->next)
+		    ;
+		  *pn = n;
+		}
+	      if (dyn.d_tag == DT_AUDIT)
+		{
+		  unsigned int tagv = dyn.d_un.d_val;
+		  audit = bfd_elf_string_from_elf_section (abfd, shlink, tagv);
+		}
+	    }
+
+	  free (dynbuf);
+	}
+
+      /* DT_RUNPATH overrides DT_RPATH.  Do _NOT_ bfd_release, as that
+	 frees all more recently bfd_alloc'd blocks as well.  */
+      if (runpath)
+	rpath = runpath;
+
+      if (rpath)
+	{
+	  struct bfd_link_needed_list **pn;
+	  for (pn = &htab->runpath; *pn != NULL; pn = &(*pn)->next)
+	    ;
+	  *pn = rpath;
+	}
+
+      /* We do not want to include any of the sections in a dynamic
+	 object in the output file.  We hack by simply clobbering the
+	 list of sections in the BFD.  This could be handled more
+	 cleanly by, say, a new section flag; the existing
+	 SEC_NEVER_LOAD flag is not the one we want, because that one
+	 still implies that the section takes up space in the output
+	 file.  */
+      bfd_section_list_clear (abfd);
+
+      /* Find the name to use in a DT_NEEDED entry that refers to this
+	 object.  If the object has a DT_SONAME entry, we use it.
+	 Otherwise, if the generic linker stuck something in
+	 elf_dt_name, we use that.  Otherwise, we just use the file
+	 name.  */
+      if (soname == NULL || *soname == '\0')
+	{
+	  soname = elf_dt_name (abfd);
+	  if (soname == NULL || *soname == '\0')
+	    soname = bfd_get_filename (abfd);
+	}
+
+      /* Save the SONAME because sometimes the linker emulation code
+	 will need to know it.  */
+      elf_dt_name (abfd) = soname;
+
+      ret = elf_add_dt_needed_tag (abfd, info, soname, add_needed);
+      if (ret < 0)
+	goto error_return;
+
+      /* If we have already included this dynamic object in the
+	 link, just ignore it.  There is no reason to include a
+	 particular dynamic object more than once.  */
+      if (ret > 0)
+	return TRUE;
+
+      /* Save the DT_AUDIT entry for the linker emulation code. */
+      elf_dt_audit (abfd) = audit; 
+    }
+
+  /* If this is a dynamic object, we always link against the .dynsym
+     symbol table, not the .symtab symbol table.  The dynamic linker
+     will only see the .dynsym symbol table, so there is no reason to
+     look at .symtab for a dynamic object.  */
+
+  if (! dynamic || elf_dynsymtab (abfd) == 0)
+    hdr = &elf_tdata (abfd)->symtab_hdr;
+  else
+    hdr = &elf_tdata (abfd)->dynsymtab_hdr;
+
+  symcount = hdr->sh_size / bed->s->sizeof_sym;
+
+  /* The sh_info field of the symtab header tells us where the
+     external symbols start.  We don't care about the local symbols at
+     this point.  */
+  if (elf_bad_symtab (abfd))
+    {
+      extsymcount = symcount;
+      extsymoff = 0;
+    }
+  else
+    {
+      extsymcount = symcount - hdr->sh_info;
+      extsymoff = hdr->sh_info;
+    }
+
+  sym_hash = NULL;
+  if (extsymcount != 0)
+    {
+      isymbuf = bfd_elf_get_elf_syms (abfd, hdr, extsymcount, extsymoff,
+				      NULL, NULL, NULL);
+      if (isymbuf == NULL)
+	goto error_return;
+
+      /* We store a pointer to the hash table entry for each external
+	 symbol.  */
+      amt = extsymcount * sizeof (struct elf_link_hash_entry *);
+      sym_hash = (struct elf_link_hash_entry **) bfd_alloc (abfd, amt);
+      if (sym_hash == NULL)
+	goto error_free_sym;
+      elf_sym_hashes (abfd) = sym_hash;
+    }
+
+  if (dynamic)
+    {
+      /* Read in any version definitions.  */
+      if (!_bfd_elf_slurp_version_tables (abfd,
+					  info->default_imported_symver))
+	goto error_free_sym;
+
+      /* Read in the symbol versions, but don't bother to convert them
+	 to internal format.  */
+      if (elf_dynversym (abfd) != 0)
+	{
+	  Elf_Internal_Shdr *versymhdr;
+
+	  versymhdr = &elf_tdata (abfd)->dynversym_hdr;
+	  extversym = (Elf_External_Versym *) bfd_malloc (versymhdr->sh_size);
+	  if (extversym == NULL)
+	    goto error_free_sym;
+	  amt = versymhdr->sh_size;
+	  if (bfd_seek (abfd, versymhdr->sh_offset, SEEK_SET) != 0
+	      || bfd_bread (extversym, amt, abfd) != amt)
+	    goto error_free_vers;
+	}
+    }
+
+  /* If we are loading an as-needed shared lib, save the symbol table
+     state before we start adding symbols.  If the lib turns out
+     to be unneeded, restore the state.  */
+  if ((elf_dyn_lib_class (abfd) & DYN_AS_NEEDED) != 0)
+    {
+      unsigned int i;
+      size_t entsize;
+
+      for (entsize = 0, i = 0; i < htab->root.table.size; i++)
+	{
+	  struct bfd_hash_entry *p;
+	  struct elf_link_hash_entry *h;
+
+	  for (p = htab->root.table.table[i]; p != NULL; p = p->next)
+	    {
+	      h = (struct elf_link_hash_entry *) p;
+	      entsize += htab->root.table.entsize;
+	      if (h->root.type == bfd_link_hash_warning)
+		entsize += htab->root.table.entsize;
+	    }
+	}
+
+      tabsize = htab->root.table.size * sizeof (struct bfd_hash_entry *);
+      hashsize = extsymcount * sizeof (struct elf_link_hash_entry *);
+      old_tab = bfd_malloc (tabsize + entsize + hashsize);
+      if (old_tab == NULL)
+	goto error_free_vers;
+
+      /* Remember the current objalloc pointer, so that all mem for
+	 symbols added can later be reclaimed.  */
+      alloc_mark = bfd_hash_allocate (&htab->root.table, 1);
+      if (alloc_mark == NULL)
+	goto error_free_vers;
+
+      /* Make a special call to the linker "notice" function to
+	 tell it that we are about to handle an as-needed lib.  */
+      if (!(*info->callbacks->notice) (info, NULL, abfd, NULL,
+				       notice_as_needed, 0, NULL))
+	goto error_free_vers;
+
+      /* Clone the symbol table and sym hashes.  Remember some
+	 pointers into the symbol table, and dynamic symbol count.  */
+      old_hash = (char *) old_tab + tabsize;
+      old_ent = (char *) old_hash + hashsize;
+      memcpy (old_tab, htab->root.table.table, tabsize);
+      memcpy (old_hash, sym_hash, hashsize);
+      old_undefs = htab->root.undefs;
+      old_undefs_tail = htab->root.undefs_tail;
+      old_table = htab->root.table.table;
+      old_size = htab->root.table.size;
+      old_count = htab->root.table.count;
+      old_dynsymcount = htab->dynsymcount;
+
+      for (i = 0; i < htab->root.table.size; i++)
+	{
+	  struct bfd_hash_entry *p;
+	  struct elf_link_hash_entry *h;
+
+	  for (p = htab->root.table.table[i]; p != NULL; p = p->next)
+	    {
+	      memcpy (old_ent, p, htab->root.table.entsize);
+	      old_ent = (char *) old_ent + htab->root.table.entsize;
+	      h = (struct elf_link_hash_entry *) p;
+	      if (h->root.type == bfd_link_hash_warning)
+		{
+		  memcpy (old_ent, h->root.u.i.link, htab->root.table.entsize);
+		  old_ent = (char *) old_ent + htab->root.table.entsize;
+		}
+	    }
+	}
+    }
+
+  weaks = NULL;
+  ever = extversym != NULL ? extversym + extsymoff : NULL;
+  for (isym = isymbuf, isymend = isymbuf + extsymcount;
+       isym < isymend;
+       isym++, sym_hash++, ever = (ever != NULL ? ever + 1 : NULL))
+    {
+      int bind;
+      bfd_vma value;
+      asection *sec, *new_sec;
+      flagword flags;
+      const char *name;
+      struct elf_link_hash_entry *h;
+      bfd_boolean definition;
+      bfd_boolean size_change_ok;
+      bfd_boolean type_change_ok;
+      bfd_boolean new_weakdef;
+      bfd_boolean override;
+      bfd_boolean common;
+      unsigned int old_alignment;
+      bfd *old_bfd;
+      bfd * undef_bfd = NULL;
+
+      override = FALSE;
+
+      flags = BSF_NO_FLAGS;
+      sec = NULL;
+      value = isym->st_value;
+      *sym_hash = NULL;
+      common = bed->common_definition (isym);
+
+      bind = ELF_ST_BIND (isym->st_info);
+      switch (bind)
+	{
+	case STB_LOCAL:
+	  /* This should be impossible, since ELF requires that all
+	     global symbols follow all local symbols, and that sh_info
+	     point to the first global symbol.  Unfortunately, Irix 5
+	     screws this up.  */
+	  continue;
+
+	case STB_GLOBAL:
+	  if (isym->st_shndx != SHN_UNDEF && !common)
+	    flags = BSF_GLOBAL;
+	  break;
+
+	case STB_WEAK:
+	  flags = BSF_WEAK;
+	  break;
+
+	case STB_GNU_UNIQUE:
+	  flags = BSF_GNU_UNIQUE;
+	  break;
+
+	default:
+	  /* Leave it up to the processor backend.  */
+	  break;
+	}
+
+      if (isym->st_shndx == SHN_UNDEF)
+	sec = bfd_und_section_ptr;
+      else if (isym->st_shndx == SHN_ABS)
+	sec = bfd_abs_section_ptr;
+      else if (isym->st_shndx == SHN_COMMON)
+	{
+	  sec = bfd_com_section_ptr;
+	  /* What ELF calls the size we call the value.  What ELF
+	     calls the value we call the alignment.  */
+	  value = isym->st_size;
+	}
+      else
+	{
+	  sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+	  if (sec == NULL)
+	    sec = bfd_abs_section_ptr;
+	  else if (elf_discarded_section (sec))
+	    {
+	      /* Symbols from discarded section are undefined.  We keep
+		 its visibility.  */
+	      sec = bfd_und_section_ptr;
+	      isym->st_shndx = SHN_UNDEF;
+	    }
+	  else if ((abfd->flags & (EXEC_P | DYNAMIC)) != 0)
+	    value -= sec->vma;
+	}
+
+      name = bfd_elf_string_from_elf_section (abfd, hdr->sh_link,
+					      isym->st_name);
+      if (name == NULL)
+	goto error_free_vers;
+
+      if (isym->st_shndx == SHN_COMMON
+	  && (abfd->flags & BFD_PLUGIN) != 0)
+	{
+	  asection *xc = bfd_get_section_by_name (abfd, "COMMON");
+
+	  if (xc == NULL)
+	    {
+	      flagword sflags = (SEC_ALLOC | SEC_IS_COMMON | SEC_KEEP
+				 | SEC_EXCLUDE);
+	      xc = bfd_make_section_with_flags (abfd, "COMMON", sflags);
+	      if (xc == NULL)
+		goto error_free_vers;
+	    }
+	  sec = xc;
+	}
+      else if (isym->st_shndx == SHN_COMMON
+	       && ELF_ST_TYPE (isym->st_info) == STT_TLS
+	       && !info->relocatable)
+	{
+	  asection *tcomm = bfd_get_section_by_name (abfd, ".tcommon");
+
+	  if (tcomm == NULL)
+	    {
+	      flagword sflags = (SEC_ALLOC | SEC_THREAD_LOCAL | SEC_IS_COMMON
+				 | SEC_LINKER_CREATED);
+	      tcomm = bfd_make_section_with_flags (abfd, ".tcommon", sflags);
+	      if (tcomm == NULL)
+		goto error_free_vers;
+	    }
+	  sec = tcomm;
+	}
+      else if (bed->elf_add_symbol_hook)
+	{
+	  if (! (*bed->elf_add_symbol_hook) (abfd, info, isym, &name, &flags,
+					     &sec, &value))
+	    goto error_free_vers;
+
+	  /* The hook function sets the name to NULL if this symbol
+	     should be skipped for some reason.  */
+	  if (name == NULL)
+	    continue;
+	}
+
+      /* Sanity check that all possibilities were handled.  */
+      if (sec == NULL)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  goto error_free_vers;
+	}
+
+      if (bfd_is_und_section (sec)
+	  || bfd_is_com_section (sec))
+	definition = FALSE;
+      else
+	definition = TRUE;
+
+      size_change_ok = FALSE;
+      type_change_ok = bed->type_change_ok;
+      old_alignment = 0;
+      old_bfd = NULL;
+      new_sec = sec;
+
+      if (is_elf_hash_table (htab))
+	{
+	  Elf_Internal_Versym iver;
+	  unsigned int vernum = 0;
+	  bfd_boolean skip;
+
+	  /* If this is a definition of a symbol which was previously
+	     referenced in a non-weak manner then make a note of the bfd
+	     that contained the reference.  This is used if we need to
+	     refer to the source of the reference later on.  */
+	  if (! bfd_is_und_section (sec))
+	    {
+	      h = elf_link_hash_lookup (elf_hash_table (info), name, FALSE, FALSE, FALSE);
+
+	      if (h != NULL
+		  && h->root.type == bfd_link_hash_undefined
+		  && h->root.u.undef.abfd)
+		undef_bfd = h->root.u.undef.abfd;
+	    }
+	  
+	  if (ever == NULL)
+	    {
+	      if (info->default_imported_symver)
+		/* Use the default symbol version created earlier.  */
+		iver.vs_vers = elf_tdata (abfd)->cverdefs;
+	      else
+		iver.vs_vers = 0;
+	    }
+	  else
+	    _bfd_elf_swap_versym_in (abfd, ever, &iver);
+
+	  vernum = iver.vs_vers & VERSYM_VERSION;
+
+	  /* If this is a hidden symbol, or if it is not version
+	     1, we append the version name to the symbol name.
+	     However, we do not modify a non-hidden absolute symbol
+	     if it is not a function, because it might be the version
+	     symbol itself.  FIXME: What if it isn't?  */
+	  if ((iver.vs_vers & VERSYM_HIDDEN) != 0
+	      || (vernum > 1
+		  && (!bfd_is_abs_section (sec)
+		      || bed->is_function_type (ELF_ST_TYPE (isym->st_info)))))
+	    {
+	      const char *verstr;
+	      size_t namelen, verlen, newlen;
+	      char *newname, *p;
+
+	      if (isym->st_shndx != SHN_UNDEF)
+		{
+		  if (vernum > elf_tdata (abfd)->cverdefs)
+		    verstr = NULL;
+		  else if (vernum > 1)
+		    verstr =
+		      elf_tdata (abfd)->verdef[vernum - 1].vd_nodename;
+		  else
+		    verstr = "";
+
+		  if (verstr == NULL)
+		    {
+		      (*_bfd_error_handler)
+			(_("%B: %s: invalid version %u (max %d)"),
+			 abfd, name, vernum,
+			 elf_tdata (abfd)->cverdefs);
+		      bfd_set_error (bfd_error_bad_value);
+		      goto error_free_vers;
+		    }
+		}
+	      else
+		{
+		  /* We cannot simply test for the number of
+		     entries in the VERNEED section since the
+		     numbers for the needed versions do not start
+		     at 0.  */
+		  Elf_Internal_Verneed *t;
+
+		  verstr = NULL;
+		  for (t = elf_tdata (abfd)->verref;
+		       t != NULL;
+		       t = t->vn_nextref)
+		    {
+		      Elf_Internal_Vernaux *a;
+
+		      for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr)
+			{
+			  if (a->vna_other == vernum)
+			    {
+			      verstr = a->vna_nodename;
+			      break;
+			    }
+			}
+		      if (a != NULL)
+			break;
+		    }
+		  if (verstr == NULL)
+		    {
+		      (*_bfd_error_handler)
+			(_("%B: %s: invalid needed version %d"),
+			 abfd, name, vernum);
+		      bfd_set_error (bfd_error_bad_value);
+		      goto error_free_vers;
+		    }
+		}
+
+	      namelen = strlen (name);
+	      verlen = strlen (verstr);
+	      newlen = namelen + verlen + 2;
+	      if ((iver.vs_vers & VERSYM_HIDDEN) == 0
+		  && isym->st_shndx != SHN_UNDEF)
+		++newlen;
+
+	      newname = (char *) bfd_hash_allocate (&htab->root.table, newlen);
+	      if (newname == NULL)
+		goto error_free_vers;
+	      memcpy (newname, name, namelen);
+	      p = newname + namelen;
+	      *p++ = ELF_VER_CHR;
+	      /* If this is a defined non-hidden version symbol,
+		 we add another @ to the name.  This indicates the
+		 default version of the symbol.  */
+	      if ((iver.vs_vers & VERSYM_HIDDEN) == 0
+		  && isym->st_shndx != SHN_UNDEF)
+		*p++ = ELF_VER_CHR;
+	      memcpy (p, verstr, verlen + 1);
+
+	      name = newname;
+	    }
+
+	  /* If necessary, make a second attempt to locate the bfd
+	     containing an unresolved, non-weak reference to the
+	     current symbol.  */
+	  if (! bfd_is_und_section (sec) && undef_bfd == NULL)
+	    {
+	      h = elf_link_hash_lookup (elf_hash_table (info), name, FALSE, FALSE, FALSE);
+
+	      if (h != NULL
+		  && h->root.type == bfd_link_hash_undefined
+		  && h->root.u.undef.abfd)
+		undef_bfd = h->root.u.undef.abfd;
+	    }
+
+	  if (!_bfd_elf_merge_symbol (abfd, info, name, isym, &sec,
+				      &value, &old_alignment,
+				      sym_hash, &skip, &override,
+				      &type_change_ok, &size_change_ok))
+	    goto error_free_vers;
+
+	  if (skip)
+	    continue;
+
+	  if (override)
+	    definition = FALSE;
+
+	  h = *sym_hash;
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+	  /* Remember the old alignment if this is a common symbol, so
+	     that we don't reduce the alignment later on.  We can't
+	     check later, because _bfd_generic_link_add_one_symbol
+	     will set a default for the alignment which we want to
+	     override. We also remember the old bfd where the existing
+	     definition comes from.  */
+	  switch (h->root.type)
+	    {
+	    default:
+	      break;
+
+	    case bfd_link_hash_defined:
+	    case bfd_link_hash_defweak:
+	      old_bfd = h->root.u.def.section->owner;
+	      break;
+
+	    case bfd_link_hash_common:
+	      old_bfd = h->root.u.c.p->section->owner;
+	      old_alignment = h->root.u.c.p->alignment_power;
+	      break;
+	    }
+
+	  if (elf_tdata (abfd)->verdef != NULL
+	      && ! override
+	      && vernum > 1
+	      && definition)
+	    h->verinfo.verdef = &elf_tdata (abfd)->verdef[vernum - 1];
+	}
+
+      if (! (_bfd_generic_link_add_one_symbol
+	     (info, abfd, name, flags, sec, value, NULL, FALSE, bed->collect,
+	      (struct bfd_link_hash_entry **) sym_hash)))
+	goto error_free_vers;
+
+      h = *sym_hash;
+      while (h->root.type == bfd_link_hash_indirect
+	     || h->root.type == bfd_link_hash_warning)
+	h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+      *sym_hash = h;
+      if (is_elf_hash_table (htab))
+	h->unique_global = (flags & BSF_GNU_UNIQUE) != 0;
+
+      new_weakdef = FALSE;
+      if (dynamic
+	  && definition
+	  && (flags & BSF_WEAK) != 0
+	  && !bed->is_function_type (ELF_ST_TYPE (isym->st_info))
+	  && is_elf_hash_table (htab)
+	  && h->u.weakdef == NULL)
+	{
+	  /* Keep a list of all weak defined non function symbols from
+	     a dynamic object, using the weakdef field.  Later in this
+	     function we will set the weakdef field to the correct
+	     value.  We only put non-function symbols from dynamic
+	     objects on this list, because that happens to be the only
+	     time we need to know the normal symbol corresponding to a
+	     weak symbol, and the information is time consuming to
+	     figure out.  If the weakdef field is not already NULL,
+	     then this symbol was already defined by some previous
+	     dynamic object, and we will be using that previous
+	     definition anyhow.  */
+
+	  h->u.weakdef = weaks;
+	  weaks = h;
+	  new_weakdef = TRUE;
+	}
+
+      /* Set the alignment of a common symbol.  */
+      if ((common || bfd_is_com_section (sec))
+	  && h->root.type == bfd_link_hash_common)
+	{
+	  unsigned int align;
+
+	  if (common)
+	    align = bfd_log2 (isym->st_value);
+	  else
+	    {
+	      /* The new symbol is a common symbol in a shared object.
+		 We need to get the alignment from the section.  */
+	      align = new_sec->alignment_power;
+	    }
+	  if (align > old_alignment)
+	    h->root.u.c.p->alignment_power = align;
+	  else
+	    h->root.u.c.p->alignment_power = old_alignment;
+	}
+
+      if (is_elf_hash_table (htab))
+	{
+	  bfd_boolean dynsym;
+
+	  /* Check the alignment when a common symbol is involved. This
+	     can change when a common symbol is overridden by a normal
+	     definition or a common symbol is ignored due to the old
+	     normal definition. We need to make sure the maximum
+	     alignment is maintained.  */
+	  if ((old_alignment || common)
+	      && h->root.type != bfd_link_hash_common)
+	    {
+	      unsigned int common_align;
+	      unsigned int normal_align;
+	      unsigned int symbol_align;
+	      bfd *normal_bfd;
+	      bfd *common_bfd;
+
+	      symbol_align = ffs (h->root.u.def.value) - 1;
+	      if (h->root.u.def.section->owner != NULL
+		  && (h->root.u.def.section->owner->flags & DYNAMIC) == 0)
+		{
+		  normal_align = h->root.u.def.section->alignment_power;
+		  if (normal_align > symbol_align)
+		    normal_align = symbol_align;
+		}
+	      else
+		normal_align = symbol_align;
+
+	      if (old_alignment)
+		{
+		  common_align = old_alignment;
+		  common_bfd = old_bfd;
+		  normal_bfd = abfd;
+		}
+	      else
+		{
+		  common_align = bfd_log2 (isym->st_value);
+		  common_bfd = abfd;
+		  normal_bfd = old_bfd;
+		}
+
+	      if (normal_align < common_align)
+		{
+		  /* PR binutils/2735 */
+		  if (normal_bfd == NULL)
+		    (*_bfd_error_handler)
+		      (_("Warning: alignment %u of common symbol `%s' in %B"
+			 " is greater than the alignment (%u) of its section %A"),
+		       common_bfd, h->root.u.def.section,
+		       1 << common_align, name, 1 << normal_align);
+		  else
+		    (*_bfd_error_handler)
+		      (_("Warning: alignment %u of symbol `%s' in %B"
+			 " is smaller than %u in %B"),
+		       normal_bfd, common_bfd,
+		       1 << normal_align, name, 1 << common_align);
+		}
+	    }
+
+	  /* Remember the symbol size if it isn't undefined.  */
+	  if ((isym->st_size != 0 && isym->st_shndx != SHN_UNDEF)
+	      && (definition || h->size == 0))
+	    {
+	      if (h->size != 0
+		  && h->size != isym->st_size
+		  && ! size_change_ok)
+		(*_bfd_error_handler)
+		  (_("Warning: size of symbol `%s' changed"
+		     " from %lu in %B to %lu in %B"),
+		   old_bfd, abfd,
+		   name, (unsigned long) h->size,
+		   (unsigned long) isym->st_size);
+
+	      h->size = isym->st_size;
+	    }
+
+	  /* If this is a common symbol, then we always want H->SIZE
+	     to be the size of the common symbol.  The code just above
+	     won't fix the size if a common symbol becomes larger.  We
+	     don't warn about a size change here, because that is
+	     covered by --warn-common.  Allow changed between different
+	     function types.  */
+	  if (h->root.type == bfd_link_hash_common)
+	    h->size = h->root.u.c.size;
+
+	  if (ELF_ST_TYPE (isym->st_info) != STT_NOTYPE
+	      && (definition || h->type == STT_NOTYPE))
+	    {
+	      unsigned int type = ELF_ST_TYPE (isym->st_info);
+
+	      /* Turn an IFUNC symbol from a DSO into a normal FUNC
+		 symbol.  */
+	      if (type == STT_GNU_IFUNC
+		  && (abfd->flags & DYNAMIC) != 0)
+		type = STT_FUNC;
+
+	      if (h->type != type)
+		{
+		  if (h->type != STT_NOTYPE && ! type_change_ok)
+		    (*_bfd_error_handler)
+		      (_("Warning: type of symbol `%s' changed"
+			 " from %d to %d in %B"),
+		       abfd, name, h->type, type);
+
+		  h->type = type;
+		}
+	    }
+
+	  /* Merge st_other field.  */
+	  elf_merge_st_other (abfd, h, isym, definition, dynamic);
+
+	  /* Set a flag in the hash table entry indicating the type of
+	     reference or definition we just found.  Keep a count of
+	     the number of dynamic symbols we find.  A dynamic symbol
+	     is one which is referenced or defined by both a regular
+	     object and a shared object.  */
+	  dynsym = FALSE;
+	  if (! dynamic)
+	    {
+	      if (! definition)
+		{
+		  h->ref_regular = 1;
+		  if (bind != STB_WEAK)
+		    h->ref_regular_nonweak = 1;
+		}
+	      else
+		{
+		  h->def_regular = 1;
+		  if (h->def_dynamic)
+		    {
+		      h->def_dynamic = 0;
+		      h->ref_dynamic = 1;
+		    }
+		}
+	      if (! info->executable
+		  || h->def_dynamic
+		  || h->ref_dynamic)
+		dynsym = TRUE;
+	    }
+	  else
+	    {
+	      if (! definition)
+		h->ref_dynamic = 1;
+	      else
+		{
+		  h->def_dynamic = 1;
+		  h->dynamic_def = 1;
+		}
+	      if (h->def_regular
+		  || h->ref_regular
+		  || (h->u.weakdef != NULL
+		      && ! new_weakdef
+		      && h->u.weakdef->dynindx != -1))
+		dynsym = TRUE;
+	    }
+
+	  /* We don't want to make debug symbol dynamic.  */
+	  if (definition && (sec->flags & SEC_DEBUGGING) && !info->relocatable)
+	    dynsym = FALSE;
+
+	  /* Nor should we make plugin symbols dynamic.  */
+	  if ((abfd->flags & BFD_PLUGIN) != 0)
+	    dynsym = FALSE;
+
+	  if (definition)
+	    h->target_internal = isym->st_target_internal;
+
+	  /* Check to see if we need to add an indirect symbol for
+	     the default name.  */
+	  if (definition || h->root.type == bfd_link_hash_common)
+	    if (!_bfd_elf_add_default_symbol (abfd, info, h, name, isym,
+					      &sec, &value, &dynsym,
+					      override))
+	      goto error_free_vers;
+
+	  if (definition && !dynamic)
+	    {
+	      char *p = strchr (name, ELF_VER_CHR);
+	      if (p != NULL && p[1] != ELF_VER_CHR)
+		{
+		  /* Queue non-default versions so that .symver x, x@FOO
+		     aliases can be checked.  */
+		  if (!nondeflt_vers)
+		    {
+		      amt = ((isymend - isym + 1)
+			     * sizeof (struct elf_link_hash_entry *));
+		      nondeflt_vers =
+                          (struct elf_link_hash_entry **) bfd_malloc (amt);
+		      if (!nondeflt_vers)
+			goto error_free_vers;
+		    }
+		  nondeflt_vers[nondeflt_vers_cnt++] = h;
+		}
+	    }
+
+	  if (dynsym && h->dynindx == -1)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		goto error_free_vers;
+	      if (h->u.weakdef != NULL
+		  && ! new_weakdef
+		  && h->u.weakdef->dynindx == -1)
+		{
+		  if (!bfd_elf_link_record_dynamic_symbol (info, h->u.weakdef))
+		    goto error_free_vers;
+		}
+	    }
+	  else if (dynsym && h->dynindx != -1)
+	    /* If the symbol already has a dynamic index, but
+	       visibility says it should not be visible, turn it into
+	       a local symbol.  */
+	    switch (ELF_ST_VISIBILITY (h->other))
+	      {
+	      case STV_INTERNAL:
+	      case STV_HIDDEN:
+		(*bed->elf_backend_hide_symbol) (info, h, TRUE);
+		dynsym = FALSE;
+		break;
+	      }
+
+	  if (!add_needed
+	      && definition
+	      && ((dynsym
+		   && h->ref_regular)
+		  || (h->ref_dynamic
+		      && (elf_dyn_lib_class (abfd) & DYN_AS_NEEDED) != 0
+		      && !on_needed_list (elf_dt_name (abfd), htab->needed))))
+	    {
+	      int ret;
+	      const char *soname = elf_dt_name (abfd);
+
+	      /* A symbol from a library loaded via DT_NEEDED of some
+		 other library is referenced by a regular object.
+		 Add a DT_NEEDED entry for it.  Issue an error if
+		 --no-add-needed is used and the reference was not
+		 a weak one.  */
+	      if (undef_bfd != NULL
+		  && (elf_dyn_lib_class (abfd) & DYN_NO_NEEDED) != 0)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B: undefined reference to symbol '%s'"),
+		     undef_bfd, name);
+		  (*_bfd_error_handler)
+		    (_("note: '%s' is defined in DSO %B so try adding it to the linker command line"),
+		     abfd, name);
+		  bfd_set_error (bfd_error_invalid_operation);
+		  goto error_free_vers;
+		}
+
+	      elf_dyn_lib_class (abfd) = (enum dynamic_lib_link_class)
+                  (elf_dyn_lib_class (abfd) & ~DYN_AS_NEEDED);
+
+	      add_needed = TRUE;
+	      ret = elf_add_dt_needed_tag (abfd, info, soname, add_needed);
+	      if (ret < 0)
+		goto error_free_vers;
+
+	      BFD_ASSERT (ret == 0);
+	    }
+	}
+    }
+
+  if (extversym != NULL)
+    {
+      free (extversym);
+      extversym = NULL;
+    }
+
+  if (isymbuf != NULL)
+    {
+      free (isymbuf);
+      isymbuf = NULL;
+    }
+
+  if ((elf_dyn_lib_class (abfd) & DYN_AS_NEEDED) != 0)
+    {
+      unsigned int i;
+
+      /* Restore the symbol table.  */
+      if (bed->as_needed_cleanup)
+	(*bed->as_needed_cleanup) (abfd, info);
+      old_hash = (char *) old_tab + tabsize;
+      old_ent = (char *) old_hash + hashsize;
+      sym_hash = elf_sym_hashes (abfd);
+      htab->root.table.table = old_table;
+      htab->root.table.size = old_size;
+      htab->root.table.count = old_count;
+      memcpy (htab->root.table.table, old_tab, tabsize);
+      memcpy (sym_hash, old_hash, hashsize);
+      htab->root.undefs = old_undefs;
+      htab->root.undefs_tail = old_undefs_tail;
+      for (i = 0; i < htab->root.table.size; i++)
+	{
+	  struct bfd_hash_entry *p;
+	  struct elf_link_hash_entry *h;
+	  bfd_size_type size;
+	  unsigned int alignment_power;
+
+	  for (p = htab->root.table.table[i]; p != NULL; p = p->next)
+	    {
+	      h = (struct elf_link_hash_entry *) p;
+	      if (h->root.type == bfd_link_hash_warning)
+		h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	      if (h->dynindx >= old_dynsymcount)
+		_bfd_elf_strtab_delref (htab->dynstr, h->dynstr_index);
+
+	      /* Preserve the maximum alignment and size for common
+		 symbols even if this dynamic lib isn't on DT_NEEDED
+		 since it can still be loaded at the run-time by another
+		 dynamic lib.  */
+	      if (h->root.type == bfd_link_hash_common)
+		{
+		  size = h->root.u.c.size;
+		  alignment_power = h->root.u.c.p->alignment_power;
+		}
+	      else
+		{
+		  size = 0;
+		  alignment_power = 0;
+		}
+	      memcpy (p, old_ent, htab->root.table.entsize);
+	      old_ent = (char *) old_ent + htab->root.table.entsize;
+	      h = (struct elf_link_hash_entry *) p;
+	      if (h->root.type == bfd_link_hash_warning)
+		{
+		  memcpy (h->root.u.i.link, old_ent, htab->root.table.entsize);
+		  old_ent = (char *) old_ent + htab->root.table.entsize;
+		}
+	      else if (h->root.type == bfd_link_hash_common)
+		{
+		  if (size > h->root.u.c.size)
+		    h->root.u.c.size = size;
+		  if (alignment_power > h->root.u.c.p->alignment_power)
+		    h->root.u.c.p->alignment_power = alignment_power;
+		}
+	    }
+	}
+
+      /* Make a special call to the linker "notice" function to
+	 tell it that symbols added for crefs may need to be removed.  */
+      if (!(*info->callbacks->notice) (info, NULL, abfd, NULL,
+				       notice_not_needed, 0, NULL))
+	goto error_free_vers;
+
+      free (old_tab);
+      objalloc_free_block ((struct objalloc *) htab->root.table.memory,
+			   alloc_mark);
+      if (nondeflt_vers != NULL)
+	free (nondeflt_vers);
+      return TRUE;
+    }
+
+  if (old_tab != NULL)
+    {
+      if (!(*info->callbacks->notice) (info, NULL, abfd, NULL,
+				       notice_needed, 0, NULL))
+	goto error_free_vers;
+      free (old_tab);
+      old_tab = NULL;
+    }
+
+  /* Now that all the symbols from this input file are created, handle
+     .symver foo, foo@BAR such that any relocs against foo become foo@BAR.  */
+  if (nondeflt_vers != NULL)
+    {
+      bfd_size_type cnt, symidx;
+
+      for (cnt = 0; cnt < nondeflt_vers_cnt; ++cnt)
+	{
+	  struct elf_link_hash_entry *h = nondeflt_vers[cnt], *hi;
+	  char *shortname, *p;
+
+	  p = strchr (h->root.root.string, ELF_VER_CHR);
+	  if (p == NULL
+	      || (h->root.type != bfd_link_hash_defined
+		  && h->root.type != bfd_link_hash_defweak))
+	    continue;
+
+	  amt = p - h->root.root.string;
+	  shortname = (char *) bfd_malloc (amt + 1);
+	  if (!shortname)
+	    goto error_free_vers;
+	  memcpy (shortname, h->root.root.string, amt);
+	  shortname[amt] = '\0';
+
+	  hi = (struct elf_link_hash_entry *)
+	       bfd_link_hash_lookup (&htab->root, shortname,
+				     FALSE, FALSE, FALSE);
+	  if (hi != NULL
+	      && hi->root.type == h->root.type
+	      && hi->root.u.def.value == h->root.u.def.value
+	      && hi->root.u.def.section == h->root.u.def.section)
+	    {
+	      (*bed->elf_backend_hide_symbol) (info, hi, TRUE);
+	      hi->root.type = bfd_link_hash_indirect;
+	      hi->root.u.i.link = (struct bfd_link_hash_entry *) h;
+	      (*bed->elf_backend_copy_indirect_symbol) (info, h, hi);
+	      sym_hash = elf_sym_hashes (abfd);
+	      if (sym_hash)
+		for (symidx = 0; symidx < extsymcount; ++symidx)
+		  if (sym_hash[symidx] == hi)
+		    {
+		      sym_hash[symidx] = h;
+		      break;
+		    }
+	    }
+	  free (shortname);
+	}
+      free (nondeflt_vers);
+      nondeflt_vers = NULL;
+    }
+
+  /* Now set the weakdefs field correctly for all the weak defined
+     symbols we found.  The only way to do this is to search all the
+     symbols.  Since we only need the information for non functions in
+     dynamic objects, that's the only time we actually put anything on
+     the list WEAKS.  We need this information so that if a regular
+     object refers to a symbol defined weakly in a dynamic object, the
+     real symbol in the dynamic object is also put in the dynamic
+     symbols; we also must arrange for both symbols to point to the
+     same memory location.  We could handle the general case of symbol
+     aliasing, but a general symbol alias can only be generated in
+     assembler code, handling it correctly would be very time
+     consuming, and other ELF linkers don't handle general aliasing
+     either.  */
+  if (weaks != NULL)
+    {
+      struct elf_link_hash_entry **hpp;
+      struct elf_link_hash_entry **hppend;
+      struct elf_link_hash_entry **sorted_sym_hash;
+      struct elf_link_hash_entry *h;
+      size_t sym_count;
+
+      /* Since we have to search the whole symbol list for each weak
+	 defined symbol, search time for N weak defined symbols will be
+	 O(N^2). Binary search will cut it down to O(NlogN).  */
+      amt = extsymcount * sizeof (struct elf_link_hash_entry *);
+      sorted_sym_hash = (struct elf_link_hash_entry **) bfd_malloc (amt);
+      if (sorted_sym_hash == NULL)
+	goto error_return;
+      sym_hash = sorted_sym_hash;
+      hpp = elf_sym_hashes (abfd);
+      hppend = hpp + extsymcount;
+      sym_count = 0;
+      for (; hpp < hppend; hpp++)
+	{
+	  h = *hpp;
+	  if (h != NULL
+	      && h->root.type == bfd_link_hash_defined
+	      && !bed->is_function_type (h->type))
+	    {
+	      *sym_hash = h;
+	      sym_hash++;
+	      sym_count++;
+	    }
+	}
+
+      qsort (sorted_sym_hash, sym_count,
+	     sizeof (struct elf_link_hash_entry *),
+	     elf_sort_symbol);
+
+      while (weaks != NULL)
+	{
+	  struct elf_link_hash_entry *hlook;
+	  asection *slook;
+	  bfd_vma vlook;
+	  long ilook;
+	  size_t i, j, idx;
+
+	  hlook = weaks;
+	  weaks = hlook->u.weakdef;
+	  hlook->u.weakdef = NULL;
+
+	  BFD_ASSERT (hlook->root.type == bfd_link_hash_defined
+		      || hlook->root.type == bfd_link_hash_defweak
+		      || hlook->root.type == bfd_link_hash_common
+		      || hlook->root.type == bfd_link_hash_indirect);
+	  slook = hlook->root.u.def.section;
+	  vlook = hlook->root.u.def.value;
+
+	  ilook = -1;
+	  i = 0;
+	  j = sym_count;
+	  while (i < j)
+	    {
+	      bfd_signed_vma vdiff;
+	      idx = (i + j) / 2;
+	      h = sorted_sym_hash [idx];
+	      vdiff = vlook - h->root.u.def.value;
+	      if (vdiff < 0)
+		j = idx;
+	      else if (vdiff > 0)
+		i = idx + 1;
+	      else
+		{
+		  long sdiff = slook->id - h->root.u.def.section->id;
+		  if (sdiff < 0)
+		    j = idx;
+		  else if (sdiff > 0)
+		    i = idx + 1;
+		  else
+		    {
+		      ilook = idx;
+		      break;
+		    }
+		}
+	    }
+
+	  /* We didn't find a value/section match.  */
+	  if (ilook == -1)
+	    continue;
+
+	  for (i = ilook; i < sym_count; i++)
+	    {
+	      h = sorted_sym_hash [i];
+
+	      /* Stop if value or section doesn't match.  */
+	      if (h->root.u.def.value != vlook
+		  || h->root.u.def.section != slook)
+		break;
+	      else if (h != hlook)
+		{
+		  hlook->u.weakdef = h;
+
+		  /* If the weak definition is in the list of dynamic
+		     symbols, make sure the real definition is put
+		     there as well.  */
+		  if (hlook->dynindx != -1 && h->dynindx == -1)
+		    {
+		      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+			{
+			err_free_sym_hash:
+			  free (sorted_sym_hash);
+			  goto error_return;
+			}
+		    }
+
+		  /* If the real definition is in the list of dynamic
+		     symbols, make sure the weak definition is put
+		     there as well.  If we don't do this, then the
+		     dynamic loader might not merge the entries for the
+		     real definition and the weak definition.  */
+		  if (h->dynindx != -1 && hlook->dynindx == -1)
+		    {
+		      if (! bfd_elf_link_record_dynamic_symbol (info, hlook))
+			goto err_free_sym_hash;
+		    }
+		  break;
+		}
+	    }
+	}
+
+      free (sorted_sym_hash);
+    }
+
+  if (bed->check_directives
+      && !(*bed->check_directives) (abfd, info))
+    return FALSE;
+
+  /* If this object is the same format as the output object, and it is
+     not a shared library, then let the backend look through the
+     relocs.
+
+     This is required to build global offset table entries and to
+     arrange for dynamic relocs.  It is not required for the
+     particular common case of linking non PIC code, even when linking
+     against shared libraries, but unfortunately there is no way of
+     knowing whether an object file has been compiled PIC or not.
+     Looking through the relocs is not particularly time consuming.
+     The problem is that we must either (1) keep the relocs in memory,
+     which causes the linker to require additional runtime memory or
+     (2) read the relocs twice from the input file, which wastes time.
+     This would be a good case for using mmap.
+
+     I have no idea how to handle linking PIC code into a file of a
+     different format.  It probably can't be done.  */
+  if (! dynamic
+      && is_elf_hash_table (htab)
+      && bed->check_relocs != NULL
+      && elf_object_id (abfd) == elf_hash_table_id (htab)
+      && (*bed->relocs_compatible) (abfd->xvec, info->output_bfd->xvec))
+    {
+      asection *o;
+
+      for (o = abfd->sections; o != NULL; o = o->next)
+	{
+	  Elf_Internal_Rela *internal_relocs;
+	  bfd_boolean ok;
+
+	  if ((o->flags & SEC_RELOC) == 0
+	      || o->reloc_count == 0
+	      || ((info->strip == strip_all || info->strip == strip_debugger)
+		  && (o->flags & SEC_DEBUGGING) != 0)
+	      || bfd_is_abs_section (o->output_section))
+	    continue;
+
+	  internal_relocs = _bfd_elf_link_read_relocs (abfd, o, NULL, NULL,
+						       info->keep_memory);
+	  if (internal_relocs == NULL)
+	    goto error_return;
+
+	  ok = (*bed->check_relocs) (abfd, info, o, internal_relocs);
+
+	  if (elf_section_data (o)->relocs != internal_relocs)
+	    free (internal_relocs);
+
+	  if (! ok)
+	    goto error_return;
+	}
+    }
+
+  /* If this is a non-traditional link, try to optimize the handling
+     of the .stab/.stabstr sections.  */
+  if (! dynamic
+      && ! info->traditional_format
+      && is_elf_hash_table (htab)
+      && (info->strip != strip_all && info->strip != strip_debugger))
+    {
+      asection *stabstr;
+
+      stabstr = bfd_get_section_by_name (abfd, ".stabstr");
+      if (stabstr != NULL)
+	{
+	  bfd_size_type string_offset = 0;
+	  asection *stab;
+
+	  for (stab = abfd->sections; stab; stab = stab->next)
+	    if (CONST_STRNEQ (stab->name, ".stab")
+		&& (!stab->name[5] ||
+		    (stab->name[5] == '.' && ISDIGIT (stab->name[6])))
+		&& (stab->flags & SEC_MERGE) == 0
+		&& !bfd_is_abs_section (stab->output_section))
+	      {
+		struct bfd_elf_section_data *secdata;
+
+		secdata = elf_section_data (stab);
+		if (! _bfd_link_section_stabs (abfd, &htab->stab_info, stab,
+					       stabstr, &secdata->sec_info,
+					       &string_offset))
+		  goto error_return;
+		if (secdata->sec_info)
+		  stab->sec_info_type = ELF_INFO_TYPE_STABS;
+	    }
+	}
+    }
+
+  if (is_elf_hash_table (htab) && add_needed)
+    {
+      /* Add this bfd to the loaded list.  */
+      struct elf_link_loaded_list *n;
+
+      n = (struct elf_link_loaded_list *)
+          bfd_alloc (abfd, sizeof (struct elf_link_loaded_list));
+      if (n == NULL)
+	goto error_return;
+      n->abfd = abfd;
+      n->next = htab->loaded;
+      htab->loaded = n;
+    }
+
+  return TRUE;
+
+ error_free_vers:
+  if (old_tab != NULL)
+    free (old_tab);
+  if (nondeflt_vers != NULL)
+    free (nondeflt_vers);
+  if (extversym != NULL)
+    free (extversym);
+ error_free_sym:
+  if (isymbuf != NULL)
+    free (isymbuf);
+ error_return:
+  return FALSE;
+}
+
+/* Return the linker hash table entry of a symbol that might be
+   satisfied by an archive symbol.  Return -1 on error.  */
+
+struct elf_link_hash_entry *
+_bfd_elf_archive_symbol_lookup (bfd *abfd,
+				struct bfd_link_info *info,
+				const char *name)
+{
+  struct elf_link_hash_entry *h;
+  char *p, *copy;
+  size_t len, first;
+
+  h = elf_link_hash_lookup (elf_hash_table (info), name, FALSE, FALSE, TRUE);
+  if (h != NULL)
+    return h;
+
+  /* If this is a default version (the name contains @@), look up the
+     symbol again with only one `@' as well as without the version.
+     The effect is that references to the symbol with and without the
+     version will be matched by the default symbol in the archive.  */
+
+  p = strchr (name, ELF_VER_CHR);
+  if (p == NULL || p[1] != ELF_VER_CHR)
+    return h;
+
+  /* First check with only one `@'.  */
+  len = strlen (name);
+  copy = (char *) bfd_alloc (abfd, len);
+  if (copy == NULL)
+    return (struct elf_link_hash_entry *) 0 - 1;
+
+  first = p - name + 1;
+  memcpy (copy, name, first);
+  memcpy (copy + first, name + first + 1, len - first);
+
+  h = elf_link_hash_lookup (elf_hash_table (info), copy, FALSE, FALSE, TRUE);
+  if (h == NULL)
+    {
+      /* We also need to check references to the symbol without the
+	 version.  */
+      copy[first - 1] = '\0';
+      h = elf_link_hash_lookup (elf_hash_table (info), copy,
+				FALSE, FALSE, TRUE);
+    }
+
+  bfd_release (abfd, copy);
+  return h;
+}
+
+/* Add symbols from an ELF archive file to the linker hash table.  We
+   don't use _bfd_generic_link_add_archive_symbols because of a
+   problem which arises on UnixWare.  The UnixWare libc.so is an
+   archive which includes an entry libc.so.1 which defines a bunch of
+   symbols.  The libc.so archive also includes a number of other
+   object files, which also define symbols, some of which are the same
+   as those defined in libc.so.1.  Correct linking requires that we
+   consider each object file in turn, and include it if it defines any
+   symbols we need.  _bfd_generic_link_add_archive_symbols does not do
+   this; it looks through the list of undefined symbols, and includes
+   any object file which defines them.  When this algorithm is used on
+   UnixWare, it winds up pulling in libc.so.1 early and defining a
+   bunch of symbols.  This means that some of the other objects in the
+   archive are not included in the link, which is incorrect since they
+   precede libc.so.1 in the archive.
+
+   Fortunately, ELF archive handling is simpler than that done by
+   _bfd_generic_link_add_archive_symbols, which has to allow for a.out
+   oddities.  In ELF, if we find a symbol in the archive map, and the
+   symbol is currently undefined, we know that we must pull in that
+   object file.
+
+   Unfortunately, we do have to make multiple passes over the symbol
+   table until nothing further is resolved.  */
+
+static bfd_boolean
+elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  symindex c;
+  bfd_boolean *defined = NULL;
+  bfd_boolean *included = NULL;
+  carsym *symdefs;
+  bfd_boolean loop;
+  bfd_size_type amt;
+  const struct elf_backend_data *bed;
+  struct elf_link_hash_entry * (*archive_symbol_lookup)
+    (bfd *, struct bfd_link_info *, const char *);
+
+  if (! bfd_has_map (abfd))
+    {
+      /* An empty archive is a special case.  */
+      if (bfd_openr_next_archived_file (abfd, NULL) == NULL)
+	return TRUE;
+      bfd_set_error (bfd_error_no_armap);
+      return FALSE;
+    }
+
+  /* Keep track of all symbols we know to be already defined, and all
+     files we know to be already included.  This is to speed up the
+     second and subsequent passes.  */
+  c = bfd_ardata (abfd)->symdef_count;
+  if (c == 0)
+    return TRUE;
+  amt = c;
+  amt *= sizeof (bfd_boolean);
+  defined = (bfd_boolean *) bfd_zmalloc (amt);
+  included = (bfd_boolean *) bfd_zmalloc (amt);
+  if (defined == NULL || included == NULL)
+    goto error_return;
+
+  symdefs = bfd_ardata (abfd)->symdefs;
+  bed = get_elf_backend_data (abfd);
+  archive_symbol_lookup = bed->elf_backend_archive_symbol_lookup;
+
+  do
+    {
+      file_ptr last;
+      symindex i;
+      carsym *symdef;
+      carsym *symdefend;
+
+      loop = FALSE;
+      last = -1;
+
+      symdef = symdefs;
+      symdefend = symdef + c;
+      for (i = 0; symdef < symdefend; symdef++, i++)
+	{
+	  struct elf_link_hash_entry *h;
+	  bfd *element;
+	  struct bfd_link_hash_entry *undefs_tail;
+	  symindex mark;
+
+	  if (defined[i] || included[i])
+	    continue;
+	  if (symdef->file_offset == last)
+	    {
+	      included[i] = TRUE;
+	      continue;
+	    }
+
+	  h = archive_symbol_lookup (abfd, info, symdef->name);
+	  if (h == (struct elf_link_hash_entry *) 0 - 1)
+	    goto error_return;
+
+	  if (h == NULL)
+	    continue;
+
+	  if (h->root.type == bfd_link_hash_common)
+	    {
+	      /* We currently have a common symbol.  The archive map contains
+		 a reference to this symbol, so we may want to include it.  We
+		 only want to include it however, if this archive element
+		 contains a definition of the symbol, not just another common
+		 declaration of it.
+
+		 Unfortunately some archivers (including GNU ar) will put
+		 declarations of common symbols into their archive maps, as
+		 well as real definitions, so we cannot just go by the archive
+		 map alone.  Instead we must read in the element's symbol
+		 table and check that to see what kind of symbol definition
+		 this is.  */
+	      if (! elf_link_is_defined_archive_symbol (abfd, symdef))
+		continue;
+	    }
+	  else if (h->root.type != bfd_link_hash_undefined)
+	    {
+	      if (h->root.type != bfd_link_hash_undefweak)
+		defined[i] = TRUE;
+	      continue;
+	    }
+
+	  /* We need to include this archive member.  */
+	  element = _bfd_get_elt_at_filepos (abfd, symdef->file_offset);
+	  if (element == NULL)
+	    goto error_return;
+
+	  if (! bfd_check_format (element, bfd_object))
+	    goto error_return;
+
+	  /* Doublecheck that we have not included this object
+	     already--it should be impossible, but there may be
+	     something wrong with the archive.  */
+	  if (element->archive_pass != 0)
+	    {
+	      bfd_set_error (bfd_error_bad_value);
+	      goto error_return;
+	    }
+	  element->archive_pass = 1;
+
+	  undefs_tail = info->hash->undefs_tail;
+
+	  if (!(*info->callbacks
+		->add_archive_element) (info, element, symdef->name, &element))
+	    goto error_return;
+	  if (!bfd_link_add_symbols (element, info))
+	    goto error_return;
+
+	  /* If there are any new undefined symbols, we need to make
+	     another pass through the archive in order to see whether
+	     they can be defined.  FIXME: This isn't perfect, because
+	     common symbols wind up on undefs_tail and because an
+	     undefined symbol which is defined later on in this pass
+	     does not require another pass.  This isn't a bug, but it
+	     does make the code less efficient than it could be.  */
+	  if (undefs_tail != info->hash->undefs_tail)
+	    loop = TRUE;
+
+	  /* Look backward to mark all symbols from this object file
+	     which we have already seen in this pass.  */
+	  mark = i;
+	  do
+	    {
+	      included[mark] = TRUE;
+	      if (mark == 0)
+		break;
+	      --mark;
+	    }
+	  while (symdefs[mark].file_offset == symdef->file_offset);
+
+	  /* We mark subsequent symbols from this object file as we go
+	     on through the loop.  */
+	  last = symdef->file_offset;
+	}
+    }
+  while (loop);
+
+  free (defined);
+  free (included);
+
+  return TRUE;
+
+ error_return:
+  if (defined != NULL)
+    free (defined);
+  if (included != NULL)
+    free (included);
+  return FALSE;
+}
+
+/* Given an ELF BFD, add symbols to the global hash table as
+   appropriate.  */
+
+bfd_boolean
+bfd_elf_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  switch (bfd_get_format (abfd))
+    {
+    case bfd_object:
+      return elf_link_add_object_symbols (abfd, info);
+    case bfd_archive:
+      return elf_link_add_archive_symbols (abfd, info);
+    default:
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+}
+
+struct hash_codes_info
+{
+  unsigned long *hashcodes;
+  bfd_boolean error;
+};
+
+/* This function will be called though elf_link_hash_traverse to store
+   all hash value of the exported symbols in an array.  */
+
+static bfd_boolean
+elf_collect_hash_codes (struct elf_link_hash_entry *h, void *data)
+{
+  struct hash_codes_info *inf = (struct hash_codes_info *) data;
+  const char *name;
+  char *p;
+  unsigned long ha;
+  char *alc = NULL;
+
+  /* Ignore indirect symbols.  These are added by the versioning code.  */
+  if (h->dynindx == -1)
+    return TRUE;
+
+  name = h->root.root.string;
+  p = strchr (name, ELF_VER_CHR);
+  if (p != NULL)
+    {
+      alc = (char *) bfd_malloc (p - name + 1);
+      if (alc == NULL)
+	{
+	  inf->error = TRUE;
+	  return FALSE;
+	}
+      memcpy (alc, name, p - name);
+      alc[p - name] = '\0';
+      name = alc;
+    }
+
+  /* Compute the hash value.  */
+  ha = bfd_elf_hash (name);
+
+  /* Store the found hash value in the array given as the argument.  */
+  *(inf->hashcodes)++ = ha;
+
+  /* And store it in the struct so that we can put it in the hash table
+     later.  */
+  h->u.elf_hash_value = ha;
+
+  if (alc != NULL)
+    free (alc);
+
+  return TRUE;
+}
+
+struct collect_gnu_hash_codes
+{
+  bfd *output_bfd;
+  const struct elf_backend_data *bed;
+  unsigned long int nsyms;
+  unsigned long int maskbits;
+  unsigned long int *hashcodes;
+  unsigned long int *hashval;
+  unsigned long int *indx;
+  unsigned long int *counts;
+  bfd_vma *bitmask;
+  bfd_byte *contents;
+  long int min_dynindx;
+  unsigned long int bucketcount;
+  unsigned long int symindx;
+  long int local_indx;
+  long int shift1, shift2;
+  unsigned long int mask;
+  bfd_boolean error;
+};
+
+/* This function will be called though elf_link_hash_traverse to store
+   all hash value of the exported symbols in an array.  */
+
+static bfd_boolean
+elf_collect_gnu_hash_codes (struct elf_link_hash_entry *h, void *data)
+{
+  struct collect_gnu_hash_codes *s = (struct collect_gnu_hash_codes *) data;
+  const char *name;
+  char *p;
+  unsigned long ha;
+  char *alc = NULL;
+
+  /* Ignore indirect symbols.  These are added by the versioning code.  */
+  if (h->dynindx == -1)
+    return TRUE;
+
+  /* Ignore also local symbols and undefined symbols.  */
+  if (! (*s->bed->elf_hash_symbol) (h))
+    return TRUE;
+
+  name = h->root.root.string;
+  p = strchr (name, ELF_VER_CHR);
+  if (p != NULL)
+    {
+      alc = (char *) bfd_malloc (p - name + 1);
+      if (alc == NULL)
+	{
+	  s->error = TRUE;
+	  return FALSE;
+	}
+      memcpy (alc, name, p - name);
+      alc[p - name] = '\0';
+      name = alc;
+    }
+
+  /* Compute the hash value.  */
+  ha = bfd_elf_gnu_hash (name);
+
+  /* Store the found hash value in the array for compute_bucket_count,
+     and also for .dynsym reordering purposes.  */
+  s->hashcodes[s->nsyms] = ha;
+  s->hashval[h->dynindx] = ha;
+  ++s->nsyms;
+  if (s->min_dynindx < 0 || s->min_dynindx > h->dynindx)
+    s->min_dynindx = h->dynindx;
+
+  if (alc != NULL)
+    free (alc);
+
+  return TRUE;
+}
+
+/* This function will be called though elf_link_hash_traverse to do
+   final dynaminc symbol renumbering.  */
+
+static bfd_boolean
+elf_renumber_gnu_hash_syms (struct elf_link_hash_entry *h, void *data)
+{
+  struct collect_gnu_hash_codes *s = (struct collect_gnu_hash_codes *) data;
+  unsigned long int bucket;
+  unsigned long int val;
+
+  /* Ignore indirect symbols.  */
+  if (h->dynindx == -1)
+    return TRUE;
+
+  /* Ignore also local symbols and undefined symbols.  */
+  if (! (*s->bed->elf_hash_symbol) (h))
+    {
+      if (h->dynindx >= s->min_dynindx)
+	h->dynindx = s->local_indx++;
+      return TRUE;
+    }
+
+  bucket = s->hashval[h->dynindx] % s->bucketcount;
+  val = (s->hashval[h->dynindx] >> s->shift1)
+	& ((s->maskbits >> s->shift1) - 1);
+  s->bitmask[val] |= ((bfd_vma) 1) << (s->hashval[h->dynindx] & s->mask);
+  s->bitmask[val]
+    |= ((bfd_vma) 1) << ((s->hashval[h->dynindx] >> s->shift2) & s->mask);
+  val = s->hashval[h->dynindx] & ~(unsigned long int) 1;
+  if (s->counts[bucket] == 1)
+    /* Last element terminates the chain.  */
+    val |= 1;
+  bfd_put_32 (s->output_bfd, val,
+	      s->contents + (s->indx[bucket] - s->symindx) * 4);
+  --s->counts[bucket];
+  h->dynindx = s->indx[bucket]++;
+  return TRUE;
+}
+
+/* Return TRUE if symbol should be hashed in the `.gnu.hash' section.  */
+
+bfd_boolean
+_bfd_elf_hash_symbol (struct elf_link_hash_entry *h)
+{
+  return !(h->forced_local
+	   || h->root.type == bfd_link_hash_undefined
+	   || h->root.type == bfd_link_hash_undefweak
+	   || ((h->root.type == bfd_link_hash_defined
+		|| h->root.type == bfd_link_hash_defweak)
+	       && h->root.u.def.section->output_section == NULL));
+}
+
+/* Array used to determine the number of hash table buckets to use
+   based on the number of symbols there are.  If there are fewer than
+   3 symbols we use 1 bucket, fewer than 17 symbols we use 3 buckets,
+   fewer than 37 we use 17 buckets, and so forth.  We never use more
+   than 32771 buckets.  */
+
+static const size_t elf_buckets[] =
+{
+  1, 3, 17, 37, 67, 97, 131, 197, 263, 521, 1031, 2053, 4099, 8209,
+  16411, 32771, 0
+};
+
+/* Compute bucket count for hashing table.  We do not use a static set
+   of possible tables sizes anymore.  Instead we determine for all
+   possible reasonable sizes of the table the outcome (i.e., the
+   number of collisions etc) and choose the best solution.  The
+   weighting functions are not too simple to allow the table to grow
+   without bounds.  Instead one of the weighting factors is the size.
+   Therefore the result is always a good payoff between few collisions
+   (= short chain lengths) and table size.  */
+static size_t
+compute_bucket_count (struct bfd_link_info *info ATTRIBUTE_UNUSED,
+		      unsigned long int *hashcodes ATTRIBUTE_UNUSED,
+		      unsigned long int nsyms,
+		      int gnu_hash)
+{
+  size_t best_size = 0;
+  unsigned long int i;
+
+  /* We have a problem here.  The following code to optimize the table
+     size requires an integer type with more the 32 bits.  If
+     BFD_HOST_U_64_BIT is set we know about such a type.  */
+#ifdef BFD_HOST_U_64_BIT
+  if (info->optimize)
+    {
+      size_t minsize;
+      size_t maxsize;
+      BFD_HOST_U_64_BIT best_chlen = ~((BFD_HOST_U_64_BIT) 0);
+      bfd *dynobj = elf_hash_table (info)->dynobj;
+      size_t dynsymcount = elf_hash_table (info)->dynsymcount;
+      const struct elf_backend_data *bed = get_elf_backend_data (dynobj);
+      unsigned long int *counts;
+      bfd_size_type amt;
+      unsigned int no_improvement_count = 0;
+
+      /* Possible optimization parameters: if we have NSYMS symbols we say
+	 that the hashing table must at least have NSYMS/4 and at most
+	 2*NSYMS buckets.  */
+      minsize = nsyms / 4;
+      if (minsize == 0)
+	minsize = 1;
+      best_size = maxsize = nsyms * 2;
+      if (gnu_hash)
+	{
+	  if (minsize < 2)
+	    minsize = 2;
+	  if ((best_size & 31) == 0)
+	    ++best_size;
+	}
+
+      /* Create array where we count the collisions in.  We must use bfd_malloc
+	 since the size could be large.  */
+      amt = maxsize;
+      amt *= sizeof (unsigned long int);
+      counts = (unsigned long int *) bfd_malloc (amt);
+      if (counts == NULL)
+	return 0;
+
+      /* Compute the "optimal" size for the hash table.  The criteria is a
+	 minimal chain length.  The minor criteria is (of course) the size
+	 of the table.  */
+      for (i = minsize; i < maxsize; ++i)
+	{
+	  /* Walk through the array of hashcodes and count the collisions.  */
+	  BFD_HOST_U_64_BIT max;
+	  unsigned long int j;
+	  unsigned long int fact;
+
+	  if (gnu_hash && (i & 31) == 0)
+	    continue;
+
+	  memset (counts, '\0', i * sizeof (unsigned long int));
+
+	  /* Determine how often each hash bucket is used.  */
+	  for (j = 0; j < nsyms; ++j)
+	    ++counts[hashcodes[j] % i];
+
+	  /* For the weight function we need some information about the
+	     pagesize on the target.  This is information need not be 100%
+	     accurate.  Since this information is not available (so far) we
+	     define it here to a reasonable default value.  If it is crucial
+	     to have a better value some day simply define this value.  */
+# ifndef BFD_TARGET_PAGESIZE
+#  define BFD_TARGET_PAGESIZE	(4096)
+# endif
+
+	  /* We in any case need 2 + DYNSYMCOUNT entries for the size values
+	     and the chains.  */
+	  max = (2 + dynsymcount) * bed->s->sizeof_hash_entry;
+
+# if 1
+	  /* Variant 1: optimize for short chains.  We add the squares
+	     of all the chain lengths (which favors many small chain
+	     over a few long chains).  */
+	  for (j = 0; j < i; ++j)
+	    max += counts[j] * counts[j];
+
+	  /* This adds penalties for the overall size of the table.  */
+	  fact = i / (BFD_TARGET_PAGESIZE / bed->s->sizeof_hash_entry) + 1;
+	  max *= fact * fact;
+# else
+	  /* Variant 2: Optimize a lot more for small table.  Here we
+	     also add squares of the size but we also add penalties for
+	     empty slots (the +1 term).  */
+	  for (j = 0; j < i; ++j)
+	    max += (1 + counts[j]) * (1 + counts[j]);
+
+	  /* The overall size of the table is considered, but not as
+	     strong as in variant 1, where it is squared.  */
+	  fact = i / (BFD_TARGET_PAGESIZE / bed->s->sizeof_hash_entry) + 1;
+	  max *= fact;
+# endif
+
+	  /* Compare with current best results.  */
+	  if (max < best_chlen)
+	    {
+	      best_chlen = max;
+	      best_size = i;
+              no_improvement_count = 0;
+	    }
+	  /* PR 11843: Avoid futile long searches for the best bucket size
+	     when there are a large number of symbols.  */
+	  else if (++no_improvement_count == 100)
+	    break;
+	}
+
+      free (counts);
+    }
+  else
+#endif /* defined (BFD_HOST_U_64_BIT) */
+    {
+      /* This is the fallback solution if no 64bit type is available or if we
+	 are not supposed to spend much time on optimizations.  We select the
+	 bucket count using a fixed set of numbers.  */
+      for (i = 0; elf_buckets[i] != 0; i++)
+	{
+	  best_size = elf_buckets[i];
+	  if (nsyms < elf_buckets[i + 1])
+	    break;
+	}
+      if (gnu_hash && best_size < 2)
+	best_size = 2;
+    }
+
+  return best_size;
+}
+
+/* Size any SHT_GROUP section for ld -r.  */
+
+bfd_boolean
+_bfd_elf_size_group_sections (struct bfd_link_info *info)
+{
+  bfd *ibfd;
+
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    if (bfd_get_flavour (ibfd) == bfd_target_elf_flavour
+	&& !_bfd_elf_fixup_group_sections (ibfd, bfd_abs_section_ptr))
+      return FALSE;
+  return TRUE;
+}
+
+/* Set up the sizes and contents of the ELF dynamic sections.  This is
+   called by the ELF linker emulation before_allocation routine.  We
+   must set the sizes of the sections before the linker sets the
+   addresses of the various sections.  */
+
+bfd_boolean
+bfd_elf_size_dynamic_sections (bfd *output_bfd,
+			       const char *soname,
+			       const char *rpath,
+			       const char *filter_shlib,
+			       const char *audit,
+			       const char *depaudit,
+			       const char * const *auxiliary_filters,
+			       struct bfd_link_info *info,
+			       asection **sinterpptr)
+{
+  bfd_size_type soname_indx;
+  bfd *dynobj;
+  const struct elf_backend_data *bed;
+  struct elf_info_failed asvinfo;
+
+  *sinterpptr = NULL;
+
+  soname_indx = (bfd_size_type) -1;
+
+  if (!is_elf_hash_table (info->hash))
+    return TRUE;
+
+  bed = get_elf_backend_data (output_bfd);
+  if (info->execstack)
+    elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
+  else if (info->noexecstack)
+    elf_tdata (output_bfd)->stack_flags = PF_R | PF_W;
+  else
+    {
+      bfd *inputobj;
+      asection *notesec = NULL;
+      int exec = 0;
+
+      for (inputobj = info->input_bfds;
+	   inputobj;
+	   inputobj = inputobj->link_next)
+	{
+	  asection *s;
+
+	  if (inputobj->flags
+	      & (DYNAMIC | EXEC_P | BFD_PLUGIN | BFD_LINKER_CREATED))
+	    continue;
+	  s = bfd_get_section_by_name (inputobj, ".note.GNU-stack");
+	  if (s)
+	    {
+	      if (s->flags & SEC_CODE)
+		exec = PF_X;
+	      notesec = s;
+	    }
+	  else if (bed->default_execstack)
+	    exec = PF_X;
+	}
+      if (notesec)
+	{
+	  elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | exec;
+	  if (exec && info->relocatable
+	      && notesec->output_section != bfd_abs_section_ptr)
+	    notesec->output_section->flags |= SEC_CODE;
+	}
+    }
+
+  /* Any syms created from now on start with -1 in
+     got.refcount/offset and plt.refcount/offset.  */
+  elf_hash_table (info)->init_got_refcount
+    = elf_hash_table (info)->init_got_offset;
+  elf_hash_table (info)->init_plt_refcount
+    = elf_hash_table (info)->init_plt_offset;
+
+  if (info->relocatable
+      && !_bfd_elf_size_group_sections (info))
+    return FALSE;
+
+  /* The backend may have to create some sections regardless of whether
+     we're dynamic or not.  */
+  if (bed->elf_backend_always_size_sections
+      && ! (*bed->elf_backend_always_size_sections) (output_bfd, info))
+    return FALSE;
+
+  if (! _bfd_elf_maybe_strip_eh_frame_hdr (info))
+    return FALSE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  /* If there were no dynamic objects in the link, there is nothing to
+     do here.  */
+  if (dynobj == NULL)
+    return TRUE;
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      struct elf_info_failed eif;
+      struct elf_link_hash_entry *h;
+      asection *dynstr;
+      struct bfd_elf_version_tree *t;
+      struct bfd_elf_version_expr *d;
+      asection *s;
+      bfd_boolean all_defined;
+
+      *sinterpptr = bfd_get_section_by_name (dynobj, ".interp");
+      BFD_ASSERT (*sinterpptr != NULL || !info->executable);
+
+      if (soname != NULL)
+	{
+	  soname_indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr,
+					     soname, TRUE);
+	  if (soname_indx == (bfd_size_type) -1
+	      || !_bfd_elf_add_dynamic_entry (info, DT_SONAME, soname_indx))
+	    return FALSE;
+	}
+
+      if (info->symbolic)
+	{
+	  if (!_bfd_elf_add_dynamic_entry (info, DT_SYMBOLIC, 0))
+	    return FALSE;
+	  info->flags |= DF_SYMBOLIC;
+	}
+
+      if (rpath != NULL)
+	{
+	  bfd_size_type indx;
+
+	  indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr, rpath,
+				      TRUE);
+	  if (indx == (bfd_size_type) -1
+	      || !_bfd_elf_add_dynamic_entry (info, DT_RPATH, indx))
+	    return FALSE;
+
+	  if  (info->new_dtags)
+	    {
+	      _bfd_elf_strtab_addref (elf_hash_table (info)->dynstr, indx);
+	      if (!_bfd_elf_add_dynamic_entry (info, DT_RUNPATH, indx))
+		return FALSE;
+	    }
+	}
+
+      if (filter_shlib != NULL)
+	{
+	  bfd_size_type indx;
+
+	  indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr,
+				      filter_shlib, TRUE);
+	  if (indx == (bfd_size_type) -1
+	      || !_bfd_elf_add_dynamic_entry (info, DT_FILTER, indx))
+	    return FALSE;
+	}
+
+      if (auxiliary_filters != NULL)
+	{
+	  const char * const *p;
+
+	  for (p = auxiliary_filters; *p != NULL; p++)
+	    {
+	      bfd_size_type indx;
+
+	      indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr,
+					  *p, TRUE);
+	      if (indx == (bfd_size_type) -1
+		  || !_bfd_elf_add_dynamic_entry (info, DT_AUXILIARY, indx))
+		return FALSE;
+	    }
+	}
+
+      if (audit != NULL)
+	{
+	  bfd_size_type indx;
+
+	  indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr, audit,
+				      TRUE);
+	  if (indx == (bfd_size_type) -1
+	      || !_bfd_elf_add_dynamic_entry (info, DT_AUDIT, indx))
+	    return FALSE;
+	}
+
+      if (depaudit != NULL)
+	{
+	  bfd_size_type indx;
+
+	  indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr, depaudit,
+				      TRUE);
+	  if (indx == (bfd_size_type) -1
+	      || !_bfd_elf_add_dynamic_entry (info, DT_DEPAUDIT, indx))
+	    return FALSE;
+	}
+
+      eif.info = info;
+      eif.failed = FALSE;
+
+      /* If we are supposed to export all symbols into the dynamic symbol
+	 table (this is not the normal case), then do so.  */
+      if (info->export_dynamic
+	  || (info->executable && info->dynamic))
+	{
+	  elf_link_hash_traverse (elf_hash_table (info),
+				  _bfd_elf_export_symbol,
+				  &eif);
+	  if (eif.failed)
+	    return FALSE;
+	}
+
+      /* Make all global versions with definition.  */
+      for (t = info->version_info; t != NULL; t = t->next)
+	for (d = t->globals.list; d != NULL; d = d->next)
+	  if (!d->symver && d->literal)
+	    {
+	      const char *verstr, *name;
+	      size_t namelen, verlen, newlen;
+	      char *newname, *p, leading_char;
+	      struct elf_link_hash_entry *newh;
+
+	      leading_char = bfd_get_symbol_leading_char (output_bfd);
+	      name = d->pattern;
+	      namelen = strlen (name) + (leading_char != '\0');
+	      verstr = t->name;
+	      verlen = strlen (verstr);
+	      newlen = namelen + verlen + 3;
+
+	      newname = (char *) bfd_malloc (newlen);
+	      if (newname == NULL)
+		return FALSE;
+	      newname[0] = leading_char;
+	      memcpy (newname + (leading_char != '\0'), name, namelen);
+
+	      /* Check the hidden versioned definition.  */
+	      p = newname + namelen;
+	      *p++ = ELF_VER_CHR;
+	      memcpy (p, verstr, verlen + 1);
+	      newh = elf_link_hash_lookup (elf_hash_table (info),
+					   newname, FALSE, FALSE,
+					   FALSE);
+	      if (newh == NULL
+		  || (newh->root.type != bfd_link_hash_defined
+		      && newh->root.type != bfd_link_hash_defweak))
+		{
+		  /* Check the default versioned definition.  */
+		  *p++ = ELF_VER_CHR;
+		  memcpy (p, verstr, verlen + 1);
+		  newh = elf_link_hash_lookup (elf_hash_table (info),
+					       newname, FALSE, FALSE,
+					       FALSE);
+		}
+	      free (newname);
+
+	      /* Mark this version if there is a definition and it is
+		 not defined in a shared object.  */
+	      if (newh != NULL
+		  && !newh->def_dynamic
+		  && (newh->root.type == bfd_link_hash_defined
+		      || newh->root.type == bfd_link_hash_defweak))
+		d->symver = 1;
+	    }
+
+      /* Attach all the symbols to their version information.  */
+      asvinfo.info = info;
+      asvinfo.failed = FALSE;
+
+      elf_link_hash_traverse (elf_hash_table (info),
+			      _bfd_elf_link_assign_sym_version,
+			      &asvinfo);
+      if (asvinfo.failed)
+	return FALSE;
+
+      if (!info->allow_undefined_version)
+	{
+	  /* Check if all global versions have a definition.  */
+	  all_defined = TRUE;
+	  for (t = info->version_info; t != NULL; t = t->next)
+	    for (d = t->globals.list; d != NULL; d = d->next)
+	      if (d->literal && !d->symver && !d->script)
+		{
+		  (*_bfd_error_handler)
+		    (_("%s: undefined version: %s"),
+		     d->pattern, t->name);
+		  all_defined = FALSE;
+		}
+
+	  if (!all_defined)
+	    {
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	}
+
+      /* Find all symbols which were defined in a dynamic object and make
+	 the backend pick a reasonable value for them.  */
+      elf_link_hash_traverse (elf_hash_table (info),
+			      _bfd_elf_adjust_dynamic_symbol,
+			      &eif);
+      if (eif.failed)
+	return FALSE;
+
+      /* Add some entries to the .dynamic section.  We fill in some of the
+	 values later, in bfd_elf_final_link, but we must add the entries
+	 now so that we know the final size of the .dynamic section.  */
+
+      /* If there are initialization and/or finalization functions to
+	 call then add the corresponding DT_INIT/DT_FINI entries.  */
+      h = (info->init_function
+	   ? elf_link_hash_lookup (elf_hash_table (info),
+				   info->init_function, FALSE,
+				   FALSE, FALSE)
+	   : NULL);
+      if (h != NULL
+	  && (h->ref_regular
+	      || h->def_regular))
+	{
+	  if (!_bfd_elf_add_dynamic_entry (info, DT_INIT, 0))
+	    return FALSE;
+	}
+      h = (info->fini_function
+	   ? elf_link_hash_lookup (elf_hash_table (info),
+				   info->fini_function, FALSE,
+				   FALSE, FALSE)
+	   : NULL);
+      if (h != NULL
+	  && (h->ref_regular
+	      || h->def_regular))
+	{
+	  if (!_bfd_elf_add_dynamic_entry (info, DT_FINI, 0))
+	    return FALSE;
+	}
+
+      s = bfd_get_section_by_name (output_bfd, ".preinit_array");
+      if (s != NULL && s->linker_has_input)
+	{
+	  /* DT_PREINIT_ARRAY is not allowed in shared library.  */
+	  if (! info->executable)
+	    {
+	      bfd *sub;
+	      asection *o;
+
+	      for (sub = info->input_bfds; sub != NULL;
+		   sub = sub->link_next)
+		if (bfd_get_flavour (sub) == bfd_target_elf_flavour)
+		  for (o = sub->sections; o != NULL; o = o->next)
+		    if (elf_section_data (o)->this_hdr.sh_type
+			== SHT_PREINIT_ARRAY)
+		      {
+			(*_bfd_error_handler)
+			  (_("%B: .preinit_array section is not allowed in DSO"),
+			   sub);
+			break;
+		      }
+
+	      bfd_set_error (bfd_error_nonrepresentable_section);
+	      return FALSE;
+	    }
+
+	  if (!_bfd_elf_add_dynamic_entry (info, DT_PREINIT_ARRAY, 0)
+	      || !_bfd_elf_add_dynamic_entry (info, DT_PREINIT_ARRAYSZ, 0))
+	    return FALSE;
+	}
+      s = bfd_get_section_by_name (output_bfd, ".init_array");
+      if (s != NULL && s->linker_has_input)
+	{
+	  if (!_bfd_elf_add_dynamic_entry (info, DT_INIT_ARRAY, 0)
+	      || !_bfd_elf_add_dynamic_entry (info, DT_INIT_ARRAYSZ, 0))
+	    return FALSE;
+	}
+      s = bfd_get_section_by_name (output_bfd, ".fini_array");
+      if (s != NULL && s->linker_has_input)
+	{
+	  if (!_bfd_elf_add_dynamic_entry (info, DT_FINI_ARRAY, 0)
+	      || !_bfd_elf_add_dynamic_entry (info, DT_FINI_ARRAYSZ, 0))
+	    return FALSE;
+	}
+
+      dynstr = bfd_get_section_by_name (dynobj, ".dynstr");
+      /* If .dynstr is excluded from the link, we don't want any of
+	 these tags.  Strictly, we should be checking each section
+	 individually;  This quick check covers for the case where
+	 someone does a /DISCARD/ : { *(*) }.  */
+      if (dynstr != NULL && dynstr->output_section != bfd_abs_section_ptr)
+	{
+	  bfd_size_type strsize;
+
+	  strsize = _bfd_elf_strtab_size (elf_hash_table (info)->dynstr);
+	  if ((info->emit_hash
+	       && !_bfd_elf_add_dynamic_entry (info, DT_HASH, 0))
+	      || (info->emit_gnu_hash
+		  && !_bfd_elf_add_dynamic_entry (info, DT_GNU_HASH, 0))
+	      || !_bfd_elf_add_dynamic_entry (info, DT_STRTAB, 0)
+	      || !_bfd_elf_add_dynamic_entry (info, DT_SYMTAB, 0)
+	      || !_bfd_elf_add_dynamic_entry (info, DT_STRSZ, strsize)
+	      || !_bfd_elf_add_dynamic_entry (info, DT_SYMENT,
+					      bed->s->sizeof_sym))
+	    return FALSE;
+	}
+    }
+
+  /* The backend must work out the sizes of all the other dynamic
+     sections.  */
+  if (bed->elf_backend_size_dynamic_sections
+      && ! (*bed->elf_backend_size_dynamic_sections) (output_bfd, info))
+    return FALSE;
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      unsigned long section_sym_count;
+      struct bfd_elf_version_tree *verdefs;
+      asection *s;
+
+      /* Set up the version definition section.  */
+      s = bfd_get_section_by_name (dynobj, ".gnu.version_d");
+      BFD_ASSERT (s != NULL);
+
+      /* We may have created additional version definitions if we are
+	 just linking a regular application.  */
+      verdefs = info->version_info;
+
+      /* Skip anonymous version tag.  */
+      if (verdefs != NULL && verdefs->vernum == 0)
+	verdefs = verdefs->next;
+
+      if (verdefs == NULL && !info->create_default_symver)
+	s->flags |= SEC_EXCLUDE;
+      else
+	{
+	  unsigned int cdefs;
+	  bfd_size_type size;
+	  struct bfd_elf_version_tree *t;
+	  bfd_byte *p;
+	  Elf_Internal_Verdef def;
+	  Elf_Internal_Verdaux defaux;
+	  struct bfd_link_hash_entry *bh;
+	  struct elf_link_hash_entry *h;
+	  const char *name;
+
+	  cdefs = 0;
+	  size = 0;
+
+	  /* Make space for the base version.  */
+	  size += sizeof (Elf_External_Verdef);
+	  size += sizeof (Elf_External_Verdaux);
+	  ++cdefs;
+
+	  /* Make space for the default version.  */
+	  if (info->create_default_symver)
+	    {
+	      size += sizeof (Elf_External_Verdef);
+	      ++cdefs;
+	    }
+
+	  for (t = verdefs; t != NULL; t = t->next)
+	    {
+	      struct bfd_elf_version_deps *n;
+
+	      /* Don't emit base version twice.  */
+	      if (t->vernum == 0)
+		continue;
+
+	      size += sizeof (Elf_External_Verdef);
+	      size += sizeof (Elf_External_Verdaux);
+	      ++cdefs;
+
+	      for (n = t->deps; n != NULL; n = n->next)
+		size += sizeof (Elf_External_Verdaux);
+	    }
+
+	  s->size = size;
+	  s->contents = (unsigned char *) bfd_alloc (output_bfd, s->size);
+	  if (s->contents == NULL && s->size != 0)
+	    return FALSE;
+
+	  /* Fill in the version definition section.  */
+
+	  p = s->contents;
+
+	  def.vd_version = VER_DEF_CURRENT;
+	  def.vd_flags = VER_FLG_BASE;
+	  def.vd_ndx = 1;
+	  def.vd_cnt = 1;
+	  if (info->create_default_symver)
+	    {
+	      def.vd_aux = 2 * sizeof (Elf_External_Verdef);
+	      def.vd_next = sizeof (Elf_External_Verdef);
+	    }
+	  else
+	    {
+	      def.vd_aux = sizeof (Elf_External_Verdef);
+	      def.vd_next = (sizeof (Elf_External_Verdef)
+			     + sizeof (Elf_External_Verdaux));
+	    }
+
+	  if (soname_indx != (bfd_size_type) -1)
+	    {
+	      _bfd_elf_strtab_addref (elf_hash_table (info)->dynstr,
+				      soname_indx);
+	      def.vd_hash = bfd_elf_hash (soname);
+	      defaux.vda_name = soname_indx;
+	      name = soname;
+	    }
+	  else
+	    {
+	      bfd_size_type indx;
+
+	      name = lbasename (output_bfd->filename);
+	      def.vd_hash = bfd_elf_hash (name);
+	      indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr,
+					  name, FALSE);
+	      if (indx == (bfd_size_type) -1)
+		return FALSE;
+	      defaux.vda_name = indx;
+	    }
+	  defaux.vda_next = 0;
+
+	  _bfd_elf_swap_verdef_out (output_bfd, &def,
+				    (Elf_External_Verdef *) p);
+	  p += sizeof (Elf_External_Verdef);
+	  if (info->create_default_symver)
+	    {
+	      /* Add a symbol representing this version.  */
+	      bh = NULL;
+	      if (! (_bfd_generic_link_add_one_symbol
+		     (info, dynobj, name, BSF_GLOBAL, bfd_abs_section_ptr,
+		      0, NULL, FALSE,
+		      get_elf_backend_data (dynobj)->collect, &bh)))
+		return FALSE;
+	      h = (struct elf_link_hash_entry *) bh;
+	      h->non_elf = 0;
+	      h->def_regular = 1;
+	      h->type = STT_OBJECT;
+	      h->verinfo.vertree = NULL;
+
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+
+	      /* Create a duplicate of the base version with the same
+		 aux block, but different flags.  */
+	      def.vd_flags = 0;
+	      def.vd_ndx = 2;
+	      def.vd_aux = sizeof (Elf_External_Verdef);
+	      if (verdefs)
+		def.vd_next = (sizeof (Elf_External_Verdef)
+			       + sizeof (Elf_External_Verdaux));
+	      else
+		def.vd_next = 0;
+	      _bfd_elf_swap_verdef_out (output_bfd, &def,
+					(Elf_External_Verdef *) p);
+	      p += sizeof (Elf_External_Verdef);
+	    }
+	  _bfd_elf_swap_verdaux_out (output_bfd, &defaux,
+				     (Elf_External_Verdaux *) p);
+	  p += sizeof (Elf_External_Verdaux);
+
+	  for (t = verdefs; t != NULL; t = t->next)
+	    {
+	      unsigned int cdeps;
+	      struct bfd_elf_version_deps *n;
+
+	      /* Don't emit the base version twice.  */
+	      if (t->vernum == 0)
+		continue;
+
+	      cdeps = 0;
+	      for (n = t->deps; n != NULL; n = n->next)
+		++cdeps;
+
+	      /* Add a symbol representing this version.  */
+	      bh = NULL;
+	      if (! (_bfd_generic_link_add_one_symbol
+		     (info, dynobj, t->name, BSF_GLOBAL, bfd_abs_section_ptr,
+		      0, NULL, FALSE,
+		      get_elf_backend_data (dynobj)->collect, &bh)))
+		return FALSE;
+	      h = (struct elf_link_hash_entry *) bh;
+	      h->non_elf = 0;
+	      h->def_regular = 1;
+	      h->type = STT_OBJECT;
+	      h->verinfo.vertree = t;
+
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+
+	      def.vd_version = VER_DEF_CURRENT;
+	      def.vd_flags = 0;
+	      if (t->globals.list == NULL
+		  && t->locals.list == NULL
+		  && ! t->used)
+		def.vd_flags |= VER_FLG_WEAK;
+	      def.vd_ndx = t->vernum + (info->create_default_symver ? 2 : 1);
+	      def.vd_cnt = cdeps + 1;
+	      def.vd_hash = bfd_elf_hash (t->name);
+	      def.vd_aux = sizeof (Elf_External_Verdef);
+	      def.vd_next = 0;
+
+	      /* If a basever node is next, it *must* be the last node in
+		 the chain, otherwise Verdef construction breaks.  */
+	      if (t->next != NULL && t->next->vernum == 0)
+		BFD_ASSERT (t->next->next == NULL);
+
+	      if (t->next != NULL && t->next->vernum != 0)
+		def.vd_next = (sizeof (Elf_External_Verdef)
+			       + (cdeps + 1) * sizeof (Elf_External_Verdaux));
+
+	      _bfd_elf_swap_verdef_out (output_bfd, &def,
+					(Elf_External_Verdef *) p);
+	      p += sizeof (Elf_External_Verdef);
+
+	      defaux.vda_name = h->dynstr_index;
+	      _bfd_elf_strtab_addref (elf_hash_table (info)->dynstr,
+				      h->dynstr_index);
+	      defaux.vda_next = 0;
+	      if (t->deps != NULL)
+		defaux.vda_next = sizeof (Elf_External_Verdaux);
+	      t->name_indx = defaux.vda_name;
+
+	      _bfd_elf_swap_verdaux_out (output_bfd, &defaux,
+					 (Elf_External_Verdaux *) p);
+	      p += sizeof (Elf_External_Verdaux);
+
+	      for (n = t->deps; n != NULL; n = n->next)
+		{
+		  if (n->version_needed == NULL)
+		    {
+		      /* This can happen if there was an error in the
+			 version script.  */
+		      defaux.vda_name = 0;
+		    }
+		  else
+		    {
+		      defaux.vda_name = n->version_needed->name_indx;
+		      _bfd_elf_strtab_addref (elf_hash_table (info)->dynstr,
+					      defaux.vda_name);
+		    }
+		  if (n->next == NULL)
+		    defaux.vda_next = 0;
+		  else
+		    defaux.vda_next = sizeof (Elf_External_Verdaux);
+
+		  _bfd_elf_swap_verdaux_out (output_bfd, &defaux,
+					     (Elf_External_Verdaux *) p);
+		  p += sizeof (Elf_External_Verdaux);
+		}
+	    }
+
+	  if (!_bfd_elf_add_dynamic_entry (info, DT_VERDEF, 0)
+	      || !_bfd_elf_add_dynamic_entry (info, DT_VERDEFNUM, cdefs))
+	    return FALSE;
+
+	  elf_tdata (output_bfd)->cverdefs = cdefs;
+	}
+
+      if ((info->new_dtags && info->flags) || (info->flags & DF_STATIC_TLS))
+	{
+	  if (!_bfd_elf_add_dynamic_entry (info, DT_FLAGS, info->flags))
+	    return FALSE;
+	}
+      else if (info->flags & DF_BIND_NOW)
+	{
+	  if (!_bfd_elf_add_dynamic_entry (info, DT_BIND_NOW, 0))
+	    return FALSE;
+	}
+
+      if (info->flags_1)
+	{
+	  if (info->executable)
+	    info->flags_1 &= ~ (DF_1_INITFIRST
+				| DF_1_NODELETE
+				| DF_1_NOOPEN);
+	  if (!_bfd_elf_add_dynamic_entry (info, DT_FLAGS_1, info->flags_1))
+	    return FALSE;
+	}
+
+      /* Work out the size of the version reference section.  */
+
+      s = bfd_get_section_by_name (dynobj, ".gnu.version_r");
+      BFD_ASSERT (s != NULL);
+      {
+	struct elf_find_verdep_info sinfo;
+
+	sinfo.info = info;
+	sinfo.vers = elf_tdata (output_bfd)->cverdefs;
+	if (sinfo.vers == 0)
+	  sinfo.vers = 1;
+	sinfo.failed = FALSE;
+
+	elf_link_hash_traverse (elf_hash_table (info),
+				_bfd_elf_link_find_version_dependencies,
+				&sinfo);
+	if (sinfo.failed)
+	  return FALSE;
+
+	if (elf_tdata (output_bfd)->verref == NULL)
+	  s->flags |= SEC_EXCLUDE;
+	else
+	  {
+	    Elf_Internal_Verneed *t;
+	    unsigned int size;
+	    unsigned int crefs;
+	    bfd_byte *p;
+
+	    /* Build the version dependency section.  */
+	    size = 0;
+	    crefs = 0;
+	    for (t = elf_tdata (output_bfd)->verref;
+		 t != NULL;
+		 t = t->vn_nextref)
+	      {
+		Elf_Internal_Vernaux *a;
+
+		size += sizeof (Elf_External_Verneed);
+		++crefs;
+		for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr)
+		  size += sizeof (Elf_External_Vernaux);
+	      }
+
+	    s->size = size;
+	    s->contents = (unsigned char *) bfd_alloc (output_bfd, s->size);
+	    if (s->contents == NULL)
+	      return FALSE;
+
+	    p = s->contents;
+	    for (t = elf_tdata (output_bfd)->verref;
+		 t != NULL;
+		 t = t->vn_nextref)
+	      {
+		unsigned int caux;
+		Elf_Internal_Vernaux *a;
+		bfd_size_type indx;
+
+		caux = 0;
+		for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr)
+		  ++caux;
+
+		t->vn_version = VER_NEED_CURRENT;
+		t->vn_cnt = caux;
+		indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr,
+					    elf_dt_name (t->vn_bfd) != NULL
+					    ? elf_dt_name (t->vn_bfd)
+					    : lbasename (t->vn_bfd->filename),
+					    FALSE);
+		if (indx == (bfd_size_type) -1)
+		  return FALSE;
+		t->vn_file = indx;
+		t->vn_aux = sizeof (Elf_External_Verneed);
+		if (t->vn_nextref == NULL)
+		  t->vn_next = 0;
+		else
+		  t->vn_next = (sizeof (Elf_External_Verneed)
+				+ caux * sizeof (Elf_External_Vernaux));
+
+		_bfd_elf_swap_verneed_out (output_bfd, t,
+					   (Elf_External_Verneed *) p);
+		p += sizeof (Elf_External_Verneed);
+
+		for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr)
+		  {
+		    a->vna_hash = bfd_elf_hash (a->vna_nodename);
+		    indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr,
+						a->vna_nodename, FALSE);
+		    if (indx == (bfd_size_type) -1)
+		      return FALSE;
+		    a->vna_name = indx;
+		    if (a->vna_nextptr == NULL)
+		      a->vna_next = 0;
+		    else
+		      a->vna_next = sizeof (Elf_External_Vernaux);
+
+		    _bfd_elf_swap_vernaux_out (output_bfd, a,
+					       (Elf_External_Vernaux *) p);
+		    p += sizeof (Elf_External_Vernaux);
+		  }
+	      }
+
+	    if (!_bfd_elf_add_dynamic_entry (info, DT_VERNEED, 0)
+		|| !_bfd_elf_add_dynamic_entry (info, DT_VERNEEDNUM, crefs))
+	      return FALSE;
+
+	    elf_tdata (output_bfd)->cverrefs = crefs;
+	  }
+      }
+
+      if ((elf_tdata (output_bfd)->cverrefs == 0
+	   && elf_tdata (output_bfd)->cverdefs == 0)
+	  || _bfd_elf_link_renumber_dynsyms (output_bfd, info,
+					     &section_sym_count) == 0)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".gnu.version");
+	  s->flags |= SEC_EXCLUDE;
+	}
+    }
+  return TRUE;
+}
+
+/* Find the first non-excluded output section.  We'll use its
+   section symbol for some emitted relocs.  */
+void
+_bfd_elf_init_1_index_section (bfd *output_bfd, struct bfd_link_info *info)
+{
+  asection *s;
+
+  for (s = output_bfd->sections; s != NULL; s = s->next)
+    if ((s->flags & (SEC_EXCLUDE | SEC_ALLOC)) == SEC_ALLOC
+	&& !_bfd_elf_link_omit_section_dynsym (output_bfd, info, s))
+      {
+	elf_hash_table (info)->text_index_section = s;
+	break;
+      }
+}
+
+/* Find two non-excluded output sections, one for code, one for data.
+   We'll use their section symbols for some emitted relocs.  */
+void
+_bfd_elf_init_2_index_sections (bfd *output_bfd, struct bfd_link_info *info)
+{
+  asection *s;
+
+  /* Data first, since setting text_index_section changes
+     _bfd_elf_link_omit_section_dynsym.  */
+  for (s = output_bfd->sections; s != NULL; s = s->next)
+    if (((s->flags & (SEC_EXCLUDE | SEC_ALLOC | SEC_READONLY)) == SEC_ALLOC)
+	&& !_bfd_elf_link_omit_section_dynsym (output_bfd, info, s))
+      {
+	elf_hash_table (info)->data_index_section = s;
+	break;
+      }
+
+  for (s = output_bfd->sections; s != NULL; s = s->next)
+    if (((s->flags & (SEC_EXCLUDE | SEC_ALLOC | SEC_READONLY))
+	 == (SEC_ALLOC | SEC_READONLY))
+	&& !_bfd_elf_link_omit_section_dynsym (output_bfd, info, s))
+      {
+	elf_hash_table (info)->text_index_section = s;
+	break;
+      }
+
+  if (elf_hash_table (info)->text_index_section == NULL)
+    elf_hash_table (info)->text_index_section
+      = elf_hash_table (info)->data_index_section;
+}
+
+bfd_boolean
+bfd_elf_size_dynsym_hash_dynstr (bfd *output_bfd, struct bfd_link_info *info)
+{
+  const struct elf_backend_data *bed;
+
+  if (!is_elf_hash_table (info->hash))
+    return TRUE;
+
+  bed = get_elf_backend_data (output_bfd);
+  (*bed->elf_backend_init_index_section) (output_bfd, info);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      bfd *dynobj;
+      asection *s;
+      bfd_size_type dynsymcount;
+      unsigned long section_sym_count;
+      unsigned int dtagcount;
+
+      dynobj = elf_hash_table (info)->dynobj;
+
+      /* Assign dynsym indicies.  In a shared library we generate a
+	 section symbol for each output section, which come first.
+	 Next come all of the back-end allocated local dynamic syms,
+	 followed by the rest of the global symbols.  */
+
+      dynsymcount = _bfd_elf_link_renumber_dynsyms (output_bfd, info,
+						    &section_sym_count);
+
+      /* Work out the size of the symbol version section.  */
+      s = bfd_get_section_by_name (dynobj, ".gnu.version");
+      BFD_ASSERT (s != NULL);
+      if (dynsymcount != 0
+	  && (s->flags & SEC_EXCLUDE) == 0)
+	{
+	  s->size = dynsymcount * sizeof (Elf_External_Versym);
+	  s->contents = (unsigned char *) bfd_zalloc (output_bfd, s->size);
+	  if (s->contents == NULL)
+	    return FALSE;
+
+	  if (!_bfd_elf_add_dynamic_entry (info, DT_VERSYM, 0))
+	    return FALSE;
+	}
+
+      /* Set the size of the .dynsym and .hash sections.  We counted
+	 the number of dynamic symbols in elf_link_add_object_symbols.
+	 We will build the contents of .dynsym and .hash when we build
+	 the final symbol table, because until then we do not know the
+	 correct value to give the symbols.  We built the .dynstr
+	 section as we went along in elf_link_add_object_symbols.  */
+      s = bfd_get_section_by_name (dynobj, ".dynsym");
+      BFD_ASSERT (s != NULL);
+      s->size = dynsymcount * bed->s->sizeof_sym;
+
+      if (dynsymcount != 0)
+	{
+	  s->contents = (unsigned char *) bfd_alloc (output_bfd, s->size);
+	  if (s->contents == NULL)
+	    return FALSE;
+
+	  /* The first entry in .dynsym is a dummy symbol.
+	     Clear all the section syms, in case we don't output them all.  */
+	  ++section_sym_count;
+	  memset (s->contents, 0, section_sym_count * bed->s->sizeof_sym);
+	}
+
+      elf_hash_table (info)->bucketcount = 0;
+
+      /* Compute the size of the hashing table.  As a side effect this
+	 computes the hash values for all the names we export.  */
+      if (info->emit_hash)
+	{
+	  unsigned long int *hashcodes;
+	  struct hash_codes_info hashinf;
+	  bfd_size_type amt;
+	  unsigned long int nsyms;
+	  size_t bucketcount;
+	  size_t hash_entry_size;
+
+	  /* Compute the hash values for all exported symbols.  At the same
+	     time store the values in an array so that we could use them for
+	     optimizations.  */
+	  amt = dynsymcount * sizeof (unsigned long int);
+	  hashcodes = (unsigned long int *) bfd_malloc (amt);
+	  if (hashcodes == NULL)
+	    return FALSE;
+	  hashinf.hashcodes = hashcodes;
+	  hashinf.error = FALSE;
+
+	  /* Put all hash values in HASHCODES.  */
+	  elf_link_hash_traverse (elf_hash_table (info),
+				  elf_collect_hash_codes, &hashinf);
+	  if (hashinf.error)
+	    {
+	      free (hashcodes);
+	      return FALSE;
+	    }
+
+	  nsyms = hashinf.hashcodes - hashcodes;
+	  bucketcount
+	    = compute_bucket_count (info, hashcodes, nsyms, 0);
+	  free (hashcodes);
+
+	  if (bucketcount == 0)
+	    return FALSE;
+
+	  elf_hash_table (info)->bucketcount = bucketcount;
+
+	  s = bfd_get_section_by_name (dynobj, ".hash");
+	  BFD_ASSERT (s != NULL);
+	  hash_entry_size = elf_section_data (s)->this_hdr.sh_entsize;
+	  s->size = ((2 + bucketcount + dynsymcount) * hash_entry_size);
+	  s->contents = (unsigned char *) bfd_zalloc (output_bfd, s->size);
+	  if (s->contents == NULL)
+	    return FALSE;
+
+	  bfd_put (8 * hash_entry_size, output_bfd, bucketcount, s->contents);
+	  bfd_put (8 * hash_entry_size, output_bfd, dynsymcount,
+		   s->contents + hash_entry_size);
+	}
+
+      if (info->emit_gnu_hash)
+	{
+	  size_t i, cnt;
+	  unsigned char *contents;
+	  struct collect_gnu_hash_codes cinfo;
+	  bfd_size_type amt;
+	  size_t bucketcount;
+
+	  memset (&cinfo, 0, sizeof (cinfo));
+
+	  /* Compute the hash values for all exported symbols.  At the same
+	     time store the values in an array so that we could use them for
+	     optimizations.  */
+	  amt = dynsymcount * 2 * sizeof (unsigned long int);
+	  cinfo.hashcodes = (long unsigned int *) bfd_malloc (amt);
+	  if (cinfo.hashcodes == NULL)
+	    return FALSE;
+
+	  cinfo.hashval = cinfo.hashcodes + dynsymcount;
+	  cinfo.min_dynindx = -1;
+	  cinfo.output_bfd = output_bfd;
+	  cinfo.bed = bed;
+
+	  /* Put all hash values in HASHCODES.  */
+	  elf_link_hash_traverse (elf_hash_table (info),
+				  elf_collect_gnu_hash_codes, &cinfo);
+	  if (cinfo.error)
+	    {
+	      free (cinfo.hashcodes);
+	      return FALSE;
+	    }
+
+	  bucketcount
+	    = compute_bucket_count (info, cinfo.hashcodes, cinfo.nsyms, 1);
+
+	  if (bucketcount == 0)
+	    {
+	      free (cinfo.hashcodes);
+	      return FALSE;
+	    }
+
+	  s = bfd_get_section_by_name (dynobj, ".gnu.hash");
+	  BFD_ASSERT (s != NULL);
+
+	  if (cinfo.nsyms == 0)
+	    {
+	      /* Empty .gnu.hash section is special.  */
+	      BFD_ASSERT (cinfo.min_dynindx == -1);
+	      free (cinfo.hashcodes);
+	      s->size = 5 * 4 + bed->s->arch_size / 8;
+	      contents = (unsigned char *) bfd_zalloc (output_bfd, s->size);
+	      if (contents == NULL)
+		return FALSE;
+	      s->contents = contents;
+	      /* 1 empty bucket.  */
+	      bfd_put_32 (output_bfd, 1, contents);
+	      /* SYMIDX above the special symbol 0.  */
+	      bfd_put_32 (output_bfd, 1, contents + 4);
+	      /* Just one word for bitmask.  */
+	      bfd_put_32 (output_bfd, 1, contents + 8);
+	      /* Only hash fn bloom filter.  */
+	      bfd_put_32 (output_bfd, 0, contents + 12);
+	      /* No hashes are valid - empty bitmask.  */
+	      bfd_put (bed->s->arch_size, output_bfd, 0, contents + 16);
+	      /* No hashes in the only bucket.  */
+	      bfd_put_32 (output_bfd, 0,
+			  contents + 16 + bed->s->arch_size / 8);
+	    }
+	  else
+	    {
+	      unsigned long int maskwords, maskbitslog2, x;
+	      BFD_ASSERT (cinfo.min_dynindx != -1);
+
+	      x = cinfo.nsyms;
+	      maskbitslog2 = 1;
+	      while ((x >>= 1) != 0)
+		++maskbitslog2;
+	      if (maskbitslog2 < 3)
+		maskbitslog2 = 5;
+	      else if ((1 << (maskbitslog2 - 2)) & cinfo.nsyms)
+		maskbitslog2 = maskbitslog2 + 3;
+	      else
+		maskbitslog2 = maskbitslog2 + 2;
+	      if (bed->s->arch_size == 64)
+		{
+		  if (maskbitslog2 == 5)
+		    maskbitslog2 = 6;
+		  cinfo.shift1 = 6;
+		}
+	      else
+		cinfo.shift1 = 5;
+	      cinfo.mask = (1 << cinfo.shift1) - 1;
+	      cinfo.shift2 = maskbitslog2;
+	      cinfo.maskbits = 1 << maskbitslog2;
+	      maskwords = 1 << (maskbitslog2 - cinfo.shift1);
+	      amt = bucketcount * sizeof (unsigned long int) * 2;
+	      amt += maskwords * sizeof (bfd_vma);
+	      cinfo.bitmask = (bfd_vma *) bfd_malloc (amt);
+	      if (cinfo.bitmask == NULL)
+		{
+		  free (cinfo.hashcodes);
+		  return FALSE;
+		}
+
+	      cinfo.counts = (long unsigned int *) (cinfo.bitmask + maskwords);
+	      cinfo.indx = cinfo.counts + bucketcount;
+	      cinfo.symindx = dynsymcount - cinfo.nsyms;
+	      memset (cinfo.bitmask, 0, maskwords * sizeof (bfd_vma));
+
+	      /* Determine how often each hash bucket is used.  */
+	      memset (cinfo.counts, 0, bucketcount * sizeof (cinfo.counts[0]));
+	      for (i = 0; i < cinfo.nsyms; ++i)
+		++cinfo.counts[cinfo.hashcodes[i] % bucketcount];
+
+	      for (i = 0, cnt = cinfo.symindx; i < bucketcount; ++i)
+		if (cinfo.counts[i] != 0)
+		  {
+		    cinfo.indx[i] = cnt;
+		    cnt += cinfo.counts[i];
+		  }
+	      BFD_ASSERT (cnt == dynsymcount);
+	      cinfo.bucketcount = bucketcount;
+	      cinfo.local_indx = cinfo.min_dynindx;
+
+	      s->size = (4 + bucketcount + cinfo.nsyms) * 4;
+	      s->size += cinfo.maskbits / 8;
+	      contents = (unsigned char *) bfd_zalloc (output_bfd, s->size);
+	      if (contents == NULL)
+		{
+		  free (cinfo.bitmask);
+		  free (cinfo.hashcodes);
+		  return FALSE;
+		}
+
+	      s->contents = contents;
+	      bfd_put_32 (output_bfd, bucketcount, contents);
+	      bfd_put_32 (output_bfd, cinfo.symindx, contents + 4);
+	      bfd_put_32 (output_bfd, maskwords, contents + 8);
+	      bfd_put_32 (output_bfd, cinfo.shift2, contents + 12);
+	      contents += 16 + cinfo.maskbits / 8;
+
+	      for (i = 0; i < bucketcount; ++i)
+		{
+		  if (cinfo.counts[i] == 0)
+		    bfd_put_32 (output_bfd, 0, contents);
+		  else
+		    bfd_put_32 (output_bfd, cinfo.indx[i], contents);
+		  contents += 4;
+		}
+
+	      cinfo.contents = contents;
+
+	      /* Renumber dynamic symbols, populate .gnu.hash section.  */
+	      elf_link_hash_traverse (elf_hash_table (info),
+				      elf_renumber_gnu_hash_syms, &cinfo);
+
+	      contents = s->contents + 16;
+	      for (i = 0; i < maskwords; ++i)
+		{
+		  bfd_put (bed->s->arch_size, output_bfd, cinfo.bitmask[i],
+			   contents);
+		  contents += bed->s->arch_size / 8;
+		}
+
+	      free (cinfo.bitmask);
+	      free (cinfo.hashcodes);
+	    }
+	}
+
+      s = bfd_get_section_by_name (dynobj, ".dynstr");
+      BFD_ASSERT (s != NULL);
+
+      elf_finalize_dynstr (output_bfd, info);
+
+      s->size = _bfd_elf_strtab_size (elf_hash_table (info)->dynstr);
+
+      for (dtagcount = 0; dtagcount <= info->spare_dynamic_tags; ++dtagcount)
+	if (!_bfd_elf_add_dynamic_entry (info, DT_NULL, 0))
+	  return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Indicate that we are only retrieving symbol values from this
+   section.  */
+
+void
+_bfd_elf_link_just_syms (asection *sec, struct bfd_link_info *info)
+{
+  if (is_elf_hash_table (info->hash))
+    sec->sec_info_type = ELF_INFO_TYPE_JUST_SYMS;
+  _bfd_generic_link_just_syms (sec, info);
+}
+
+/* Make sure sec_info_type is cleared if sec_info is cleared too.  */
+
+static void
+merge_sections_remove_hook (bfd *abfd ATTRIBUTE_UNUSED,
+			    asection *sec)
+{
+  BFD_ASSERT (sec->sec_info_type == ELF_INFO_TYPE_MERGE);
+  sec->sec_info_type = ELF_INFO_TYPE_NONE;
+}
+
+/* Finish SHF_MERGE section merging.  */
+
+bfd_boolean
+_bfd_elf_merge_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  bfd *ibfd;
+  asection *sec;
+
+  if (!is_elf_hash_table (info->hash))
+    return FALSE;
+
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    if ((ibfd->flags & DYNAMIC) == 0)
+      for (sec = ibfd->sections; sec != NULL; sec = sec->next)
+	if ((sec->flags & SEC_MERGE) != 0
+	    && !bfd_is_abs_section (sec->output_section))
+	  {
+	    struct bfd_elf_section_data *secdata;
+
+	    secdata = elf_section_data (sec);
+	    if (! _bfd_add_merge_section (abfd,
+					  &elf_hash_table (info)->merge_info,
+					  sec, &secdata->sec_info))
+	      return FALSE;
+	    else if (secdata->sec_info)
+	      sec->sec_info_type = ELF_INFO_TYPE_MERGE;
+	  }
+
+  if (elf_hash_table (info)->merge_info != NULL)
+    _bfd_merge_sections (abfd, info, elf_hash_table (info)->merge_info,
+			 merge_sections_remove_hook);
+  return TRUE;
+}
+
+/* Create an entry in an ELF linker hash table.  */
+
+struct bfd_hash_entry *
+_bfd_elf_link_hash_newfunc (struct bfd_hash_entry *entry,
+			    struct bfd_hash_table *table,
+			    const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = (struct bfd_hash_entry *)
+          bfd_hash_allocate (table, sizeof (struct elf_link_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = _bfd_link_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct elf_link_hash_entry *ret = (struct elf_link_hash_entry *) entry;
+      struct elf_link_hash_table *htab = (struct elf_link_hash_table *) table;
+
+      /* Set local fields.  */
+      ret->indx = -1;
+      ret->dynindx = -1;
+      ret->got = htab->init_got_refcount;
+      ret->plt = htab->init_plt_refcount;
+      memset (&ret->size, 0, (sizeof (struct elf_link_hash_entry)
+			      - offsetof (struct elf_link_hash_entry, size)));
+      /* Assume that we have been called by a non-ELF symbol reader.
+	 This flag is then reset by the code which reads an ELF input
+	 file.  This ensures that a symbol created by a non-ELF symbol
+	 reader will have the flag set correctly.  */
+      ret->non_elf = 1;
+    }
+
+  return entry;
+}
+
+/* Copy data from an indirect symbol to its direct symbol, hiding the
+   old indirect symbol.  Also used for copying flags to a weakdef.  */
+
+void
+_bfd_elf_link_hash_copy_indirect (struct bfd_link_info *info,
+				  struct elf_link_hash_entry *dir,
+				  struct elf_link_hash_entry *ind)
+{
+  struct elf_link_hash_table *htab;
+
+  /* Copy down any references that we may have already seen to the
+     symbol which just became indirect.  */
+
+  dir->ref_dynamic |= ind->ref_dynamic;
+  dir->ref_regular |= ind->ref_regular;
+  dir->ref_regular_nonweak |= ind->ref_regular_nonweak;
+  dir->non_got_ref |= ind->non_got_ref;
+  dir->needs_plt |= ind->needs_plt;
+  dir->pointer_equality_needed |= ind->pointer_equality_needed;
+
+  if (ind->root.type != bfd_link_hash_indirect)
+    return;
+
+  /* Copy over the global and procedure linkage table refcount entries.
+     These may have been already set up by a check_relocs routine.  */
+  htab = elf_hash_table (info);
+  if (ind->got.refcount > htab->init_got_refcount.refcount)
+    {
+      if (dir->got.refcount < 0)
+	dir->got.refcount = 0;
+      dir->got.refcount += ind->got.refcount;
+      ind->got.refcount = htab->init_got_refcount.refcount;
+    }
+
+  if (ind->plt.refcount > htab->init_plt_refcount.refcount)
+    {
+      if (dir->plt.refcount < 0)
+	dir->plt.refcount = 0;
+      dir->plt.refcount += ind->plt.refcount;
+      ind->plt.refcount = htab->init_plt_refcount.refcount;
+    }
+
+  if (ind->dynindx != -1)
+    {
+      if (dir->dynindx != -1)
+	_bfd_elf_strtab_delref (htab->dynstr, dir->dynstr_index);
+      dir->dynindx = ind->dynindx;
+      dir->dynstr_index = ind->dynstr_index;
+      ind->dynindx = -1;
+      ind->dynstr_index = 0;
+    }
+}
+
+void
+_bfd_elf_link_hash_hide_symbol (struct bfd_link_info *info,
+				struct elf_link_hash_entry *h,
+				bfd_boolean force_local)
+{
+  /* STT_GNU_IFUNC symbol must go through PLT.  */
+  if (h->type != STT_GNU_IFUNC)
+    {
+      h->plt = elf_hash_table (info)->init_plt_offset;
+      h->needs_plt = 0;
+    }
+  if (force_local)
+    {
+      h->forced_local = 1;
+      if (h->dynindx != -1)
+	{
+	  h->dynindx = -1;
+	  _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
+				  h->dynstr_index);
+	}
+    }
+}
+
+/* Initialize an ELF linker hash table.  */
+
+bfd_boolean
+_bfd_elf_link_hash_table_init
+  (struct elf_link_hash_table *table,
+   bfd *abfd,
+   struct bfd_hash_entry *(*newfunc) (struct bfd_hash_entry *,
+				      struct bfd_hash_table *,
+				      const char *),
+   unsigned int entsize,
+   enum elf_target_id target_id)
+{
+  bfd_boolean ret;
+  int can_refcount = get_elf_backend_data (abfd)->can_refcount;
+
+  memset (table, 0, sizeof * table);
+  table->init_got_refcount.refcount = can_refcount - 1;
+  table->init_plt_refcount.refcount = can_refcount - 1;
+  table->init_got_offset.offset = -(bfd_vma) 1;
+  table->init_plt_offset.offset = -(bfd_vma) 1;
+  /* The first dynamic symbol is a dummy.  */
+  table->dynsymcount = 1;
+
+  ret = _bfd_link_hash_table_init (&table->root, abfd, newfunc, entsize);
+
+  table->root.type = bfd_link_elf_hash_table;
+  table->hash_table_id = target_id;
+
+  return ret;
+}
+
+/* Create an ELF linker hash table.  */
+
+struct bfd_link_hash_table *
+_bfd_elf_link_hash_table_create (bfd *abfd)
+{
+  struct elf_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct elf_link_hash_table);
+
+  ret = (struct elf_link_hash_table *) bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (! _bfd_elf_link_hash_table_init (ret, abfd, _bfd_elf_link_hash_newfunc,
+				       sizeof (struct elf_link_hash_entry),
+				       GENERIC_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  return &ret->root;
+}
+
+/* This is a hook for the ELF emulation code in the generic linker to
+   tell the backend linker what file name to use for the DT_NEEDED
+   entry for a dynamic object.  */
+
+void
+bfd_elf_set_dt_needed_name (bfd *abfd, const char *name)
+{
+  if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
+      && bfd_get_format (abfd) == bfd_object)
+    elf_dt_name (abfd) = name;
+}
+
+int
+bfd_elf_get_dyn_lib_class (bfd *abfd)
+{
+  int lib_class;
+  if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
+      && bfd_get_format (abfd) == bfd_object)
+    lib_class = elf_dyn_lib_class (abfd);
+  else
+    lib_class = 0;
+  return lib_class;
+}
+
+void
+bfd_elf_set_dyn_lib_class (bfd *abfd, enum dynamic_lib_link_class lib_class)
+{
+  if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
+      && bfd_get_format (abfd) == bfd_object)
+    elf_dyn_lib_class (abfd) = lib_class;
+}
+
+/* Get the list of DT_NEEDED entries for a link.  This is a hook for
+   the linker ELF emulation code.  */
+
+struct bfd_link_needed_list *
+bfd_elf_get_needed_list (bfd *abfd ATTRIBUTE_UNUSED,
+			 struct bfd_link_info *info)
+{
+  if (! is_elf_hash_table (info->hash))
+    return NULL;
+  return elf_hash_table (info)->needed;
+}
+
+/* Get the list of DT_RPATH/DT_RUNPATH entries for a link.  This is a
+   hook for the linker ELF emulation code.  */
+
+struct bfd_link_needed_list *
+bfd_elf_get_runpath_list (bfd *abfd ATTRIBUTE_UNUSED,
+			  struct bfd_link_info *info)
+{
+  if (! is_elf_hash_table (info->hash))
+    return NULL;
+  return elf_hash_table (info)->runpath;
+}
+
+/* Get the name actually used for a dynamic object for a link.  This
+   is the SONAME entry if there is one.  Otherwise, it is the string
+   passed to bfd_elf_set_dt_needed_name, or it is the filename.  */
+
+const char *
+bfd_elf_get_dt_soname (bfd *abfd)
+{
+  if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
+      && bfd_get_format (abfd) == bfd_object)
+    return elf_dt_name (abfd);
+  return NULL;
+}
+
+/* Get the list of DT_NEEDED entries from a BFD.  This is a hook for
+   the ELF linker emulation code.  */
+
+bfd_boolean
+bfd_elf_get_bfd_needed_list (bfd *abfd,
+			     struct bfd_link_needed_list **pneeded)
+{
+  asection *s;
+  bfd_byte *dynbuf = NULL;
+  unsigned int elfsec;
+  unsigned long shlink;
+  bfd_byte *extdyn, *extdynend;
+  size_t extdynsize;
+  void (*swap_dyn_in) (bfd *, const void *, Elf_Internal_Dyn *);
+
+  *pneeded = NULL;
+
+  if (bfd_get_flavour (abfd) != bfd_target_elf_flavour
+      || bfd_get_format (abfd) != bfd_object)
+    return TRUE;
+
+  s = bfd_get_section_by_name (abfd, ".dynamic");
+  if (s == NULL || s->size == 0)
+    return TRUE;
+
+  if (!bfd_malloc_and_get_section (abfd, s, &dynbuf))
+    goto error_return;
+
+  elfsec = _bfd_elf_section_from_bfd_section (abfd, s);
+  if (elfsec == SHN_BAD)
+    goto error_return;
+
+  shlink = elf_elfsections (abfd)[elfsec]->sh_link;
+
+  extdynsize = get_elf_backend_data (abfd)->s->sizeof_dyn;
+  swap_dyn_in = get_elf_backend_data (abfd)->s->swap_dyn_in;
+
+  extdyn = dynbuf;
+  extdynend = extdyn + s->size;
+  for (; extdyn < extdynend; extdyn += extdynsize)
+    {
+      Elf_Internal_Dyn dyn;
+
+      (*swap_dyn_in) (abfd, extdyn, &dyn);
+
+      if (dyn.d_tag == DT_NULL)
+	break;
+
+      if (dyn.d_tag == DT_NEEDED)
+	{
+	  const char *string;
+	  struct bfd_link_needed_list *l;
+	  unsigned int tagv = dyn.d_un.d_val;
+	  bfd_size_type amt;
+
+	  string = bfd_elf_string_from_elf_section (abfd, shlink, tagv);
+	  if (string == NULL)
+	    goto error_return;
+
+	  amt = sizeof *l;
+	  l = (struct bfd_link_needed_list *) bfd_alloc (abfd, amt);
+	  if (l == NULL)
+	    goto error_return;
+
+	  l->by = abfd;
+	  l->name = string;
+	  l->next = *pneeded;
+	  *pneeded = l;
+	}
+    }
+
+  free (dynbuf);
+
+  return TRUE;
+
+ error_return:
+  if (dynbuf != NULL)
+    free (dynbuf);
+  return FALSE;
+}
+
+struct elf_symbuf_symbol
+{
+  unsigned long st_name;	/* Symbol name, index in string tbl */
+  unsigned char st_info;	/* Type and binding attributes */
+  unsigned char st_other;	/* Visibilty, and target specific */
+};
+
+struct elf_symbuf_head
+{
+  struct elf_symbuf_symbol *ssym;
+  bfd_size_type count;
+  unsigned int st_shndx;
+};
+
+struct elf_symbol
+{
+  union
+    {
+      Elf_Internal_Sym *isym;
+      struct elf_symbuf_symbol *ssym;
+    } u;
+  const char *name;
+};
+
+/* Sort references to symbols by ascending section number.  */
+
+static int
+elf_sort_elf_symbol (const void *arg1, const void *arg2)
+{
+  const Elf_Internal_Sym *s1 = *(const Elf_Internal_Sym **) arg1;
+  const Elf_Internal_Sym *s2 = *(const Elf_Internal_Sym **) arg2;
+
+  return s1->st_shndx - s2->st_shndx;
+}
+
+static int
+elf_sym_name_compare (const void *arg1, const void *arg2)
+{
+  const struct elf_symbol *s1 = (const struct elf_symbol *) arg1;
+  const struct elf_symbol *s2 = (const struct elf_symbol *) arg2;
+  return strcmp (s1->name, s2->name);
+}
+
+static struct elf_symbuf_head *
+elf_create_symbuf (bfd_size_type symcount, Elf_Internal_Sym *isymbuf)
+{
+  Elf_Internal_Sym **ind, **indbufend, **indbuf;
+  struct elf_symbuf_symbol *ssym;
+  struct elf_symbuf_head *ssymbuf, *ssymhead;
+  bfd_size_type i, shndx_count, total_size;
+
+  indbuf = (Elf_Internal_Sym **) bfd_malloc2 (symcount, sizeof (*indbuf));
+  if (indbuf == NULL)
+    return NULL;
+
+  for (ind = indbuf, i = 0; i < symcount; i++)
+    if (isymbuf[i].st_shndx != SHN_UNDEF)
+      *ind++ = &isymbuf[i];
+  indbufend = ind;
+
+  qsort (indbuf, indbufend - indbuf, sizeof (Elf_Internal_Sym *),
+	 elf_sort_elf_symbol);
+
+  shndx_count = 0;
+  if (indbufend > indbuf)
+    for (ind = indbuf, shndx_count++; ind < indbufend - 1; ind++)
+      if (ind[0]->st_shndx != ind[1]->st_shndx)
+	shndx_count++;
+
+  total_size = ((shndx_count + 1) * sizeof (*ssymbuf)
+		+ (indbufend - indbuf) * sizeof (*ssym));
+  ssymbuf = (struct elf_symbuf_head *) bfd_malloc (total_size);
+  if (ssymbuf == NULL)
+    {
+      free (indbuf);
+      return NULL;
+    }
+
+  ssym = (struct elf_symbuf_symbol *) (ssymbuf + shndx_count + 1);
+  ssymbuf->ssym = NULL;
+  ssymbuf->count = shndx_count;
+  ssymbuf->st_shndx = 0;
+  for (ssymhead = ssymbuf, ind = indbuf; ind < indbufend; ssym++, ind++)
+    {
+      if (ind == indbuf || ssymhead->st_shndx != (*ind)->st_shndx)
+	{
+	  ssymhead++;
+	  ssymhead->ssym = ssym;
+	  ssymhead->count = 0;
+	  ssymhead->st_shndx = (*ind)->st_shndx;
+	}
+      ssym->st_name = (*ind)->st_name;
+      ssym->st_info = (*ind)->st_info;
+      ssym->st_other = (*ind)->st_other;
+      ssymhead->count++;
+    }
+  BFD_ASSERT ((bfd_size_type) (ssymhead - ssymbuf) == shndx_count
+	      && (((bfd_hostptr_t) ssym - (bfd_hostptr_t) ssymbuf)
+		  == total_size));
+
+  free (indbuf);
+  return ssymbuf;
+}
+
+/* Check if 2 sections define the same set of local and global
+   symbols.  */
+
+static bfd_boolean
+bfd_elf_match_symbols_in_sections (asection *sec1, asection *sec2,
+				   struct bfd_link_info *info)
+{
+  bfd *bfd1, *bfd2;
+  const struct elf_backend_data *bed1, *bed2;
+  Elf_Internal_Shdr *hdr1, *hdr2;
+  bfd_size_type symcount1, symcount2;
+  Elf_Internal_Sym *isymbuf1, *isymbuf2;
+  struct elf_symbuf_head *ssymbuf1, *ssymbuf2;
+  Elf_Internal_Sym *isym, *isymend;
+  struct elf_symbol *symtable1 = NULL, *symtable2 = NULL;
+  bfd_size_type count1, count2, i;
+  unsigned int shndx1, shndx2;
+  bfd_boolean result;
+
+  bfd1 = sec1->owner;
+  bfd2 = sec2->owner;
+
+  /* Both sections have to be in ELF.  */
+  if (bfd_get_flavour (bfd1) != bfd_target_elf_flavour
+      || bfd_get_flavour (bfd2) != bfd_target_elf_flavour)
+    return FALSE;
+
+  if (elf_section_type (sec1) != elf_section_type (sec2))
+    return FALSE;
+
+  shndx1 = _bfd_elf_section_from_bfd_section (bfd1, sec1);
+  shndx2 = _bfd_elf_section_from_bfd_section (bfd2, sec2);
+  if (shndx1 == SHN_BAD || shndx2 == SHN_BAD)
+    return FALSE;
+
+  bed1 = get_elf_backend_data (bfd1);
+  bed2 = get_elf_backend_data (bfd2);
+  hdr1 = &elf_tdata (bfd1)->symtab_hdr;
+  symcount1 = hdr1->sh_size / bed1->s->sizeof_sym;
+  hdr2 = &elf_tdata (bfd2)->symtab_hdr;
+  symcount2 = hdr2->sh_size / bed2->s->sizeof_sym;
+
+  if (symcount1 == 0 || symcount2 == 0)
+    return FALSE;
+
+  result = FALSE;
+  isymbuf1 = NULL;
+  isymbuf2 = NULL;
+  ssymbuf1 = (struct elf_symbuf_head *) elf_tdata (bfd1)->symbuf;
+  ssymbuf2 = (struct elf_symbuf_head *) elf_tdata (bfd2)->symbuf;
+
+  if (ssymbuf1 == NULL)
+    {
+      isymbuf1 = bfd_elf_get_elf_syms (bfd1, hdr1, symcount1, 0,
+				       NULL, NULL, NULL);
+      if (isymbuf1 == NULL)
+	goto done;
+
+      if (!info->reduce_memory_overheads)
+	elf_tdata (bfd1)->symbuf = ssymbuf1
+	  = elf_create_symbuf (symcount1, isymbuf1);
+    }
+
+  if (ssymbuf1 == NULL || ssymbuf2 == NULL)
+    {
+      isymbuf2 = bfd_elf_get_elf_syms (bfd2, hdr2, symcount2, 0,
+				       NULL, NULL, NULL);
+      if (isymbuf2 == NULL)
+	goto done;
+
+      if (ssymbuf1 != NULL && !info->reduce_memory_overheads)
+	elf_tdata (bfd2)->symbuf = ssymbuf2
+	  = elf_create_symbuf (symcount2, isymbuf2);
+    }
+
+  if (ssymbuf1 != NULL && ssymbuf2 != NULL)
+    {
+      /* Optimized faster version.  */
+      bfd_size_type lo, hi, mid;
+      struct elf_symbol *symp;
+      struct elf_symbuf_symbol *ssym, *ssymend;
+
+      lo = 0;
+      hi = ssymbuf1->count;
+      ssymbuf1++;
+      count1 = 0;
+      while (lo < hi)
+	{
+	  mid = (lo + hi) / 2;
+	  if (shndx1 < ssymbuf1[mid].st_shndx)
+	    hi = mid;
+	  else if (shndx1 > ssymbuf1[mid].st_shndx)
+	    lo = mid + 1;
+	  else
+	    {
+	      count1 = ssymbuf1[mid].count;
+	      ssymbuf1 += mid;
+	      break;
+	    }
+	}
+
+      lo = 0;
+      hi = ssymbuf2->count;
+      ssymbuf2++;
+      count2 = 0;
+      while (lo < hi)
+	{
+	  mid = (lo + hi) / 2;
+	  if (shndx2 < ssymbuf2[mid].st_shndx)
+	    hi = mid;
+	  else if (shndx2 > ssymbuf2[mid].st_shndx)
+	    lo = mid + 1;
+	  else
+	    {
+	      count2 = ssymbuf2[mid].count;
+	      ssymbuf2 += mid;
+	      break;
+	    }
+	}
+
+      if (count1 == 0 || count2 == 0 || count1 != count2)
+	goto done;
+
+      symtable1 = (struct elf_symbol *)
+          bfd_malloc (count1 * sizeof (struct elf_symbol));
+      symtable2 = (struct elf_symbol *)
+          bfd_malloc (count2 * sizeof (struct elf_symbol));
+      if (symtable1 == NULL || symtable2 == NULL)
+	goto done;
+
+      symp = symtable1;
+      for (ssym = ssymbuf1->ssym, ssymend = ssym + count1;
+	   ssym < ssymend; ssym++, symp++)
+	{
+	  symp->u.ssym = ssym;
+	  symp->name = bfd_elf_string_from_elf_section (bfd1,
+							hdr1->sh_link,
+							ssym->st_name);
+	}
+
+      symp = symtable2;
+      for (ssym = ssymbuf2->ssym, ssymend = ssym + count2;
+	   ssym < ssymend; ssym++, symp++)
+	{
+	  symp->u.ssym = ssym;
+	  symp->name = bfd_elf_string_from_elf_section (bfd2,
+							hdr2->sh_link,
+							ssym->st_name);
+	}
+
+      /* Sort symbol by name.  */
+      qsort (symtable1, count1, sizeof (struct elf_symbol),
+	     elf_sym_name_compare);
+      qsort (symtable2, count1, sizeof (struct elf_symbol),
+	     elf_sym_name_compare);
+
+      for (i = 0; i < count1; i++)
+	/* Two symbols must have the same binding, type and name.  */
+	if (symtable1 [i].u.ssym->st_info != symtable2 [i].u.ssym->st_info
+	    || symtable1 [i].u.ssym->st_other != symtable2 [i].u.ssym->st_other
+	    || strcmp (symtable1 [i].name, symtable2 [i].name) != 0)
+	  goto done;
+
+      result = TRUE;
+      goto done;
+    }
+
+  symtable1 = (struct elf_symbol *)
+      bfd_malloc (symcount1 * sizeof (struct elf_symbol));
+  symtable2 = (struct elf_symbol *)
+      bfd_malloc (symcount2 * sizeof (struct elf_symbol));
+  if (symtable1 == NULL || symtable2 == NULL)
+    goto done;
+
+  /* Count definitions in the section.  */
+  count1 = 0;
+  for (isym = isymbuf1, isymend = isym + symcount1; isym < isymend; isym++)
+    if (isym->st_shndx == shndx1)
+      symtable1[count1++].u.isym = isym;
+
+  count2 = 0;
+  for (isym = isymbuf2, isymend = isym + symcount2; isym < isymend; isym++)
+    if (isym->st_shndx == shndx2)
+      symtable2[count2++].u.isym = isym;
+
+  if (count1 == 0 || count2 == 0 || count1 != count2)
+    goto done;
+
+  for (i = 0; i < count1; i++)
+    symtable1[i].name
+      = bfd_elf_string_from_elf_section (bfd1, hdr1->sh_link,
+					 symtable1[i].u.isym->st_name);
+
+  for (i = 0; i < count2; i++)
+    symtable2[i].name
+      = bfd_elf_string_from_elf_section (bfd2, hdr2->sh_link,
+					 symtable2[i].u.isym->st_name);
+
+  /* Sort symbol by name.  */
+  qsort (symtable1, count1, sizeof (struct elf_symbol),
+	 elf_sym_name_compare);
+  qsort (symtable2, count1, sizeof (struct elf_symbol),
+	 elf_sym_name_compare);
+
+  for (i = 0; i < count1; i++)
+    /* Two symbols must have the same binding, type and name.  */
+    if (symtable1 [i].u.isym->st_info != symtable2 [i].u.isym->st_info
+	|| symtable1 [i].u.isym->st_other != symtable2 [i].u.isym->st_other
+	|| strcmp (symtable1 [i].name, symtable2 [i].name) != 0)
+      goto done;
+
+  result = TRUE;
+
+done:
+  if (symtable1)
+    free (symtable1);
+  if (symtable2)
+    free (symtable2);
+  if (isymbuf1)
+    free (isymbuf1);
+  if (isymbuf2)
+    free (isymbuf2);
+
+  return result;
+}
+
+/* Return TRUE if 2 section types are compatible.  */
+
+bfd_boolean
+_bfd_elf_match_sections_by_type (bfd *abfd, const asection *asec,
+				 bfd *bbfd, const asection *bsec)
+{
+  if (asec == NULL
+      || bsec == NULL
+      || abfd->xvec->flavour != bfd_target_elf_flavour
+      || bbfd->xvec->flavour != bfd_target_elf_flavour)
+    return TRUE;
+
+  return elf_section_type (asec) == elf_section_type (bsec);
+}
+
+/* Final phase of ELF linker.  */
+
+/* A structure we use to avoid passing large numbers of arguments.  */
+
+struct elf_final_link_info
+{
+  /* General link information.  */
+  struct bfd_link_info *info;
+  /* Output BFD.  */
+  bfd *output_bfd;
+  /* Symbol string table.  */
+  struct bfd_strtab_hash *symstrtab;
+  /* .dynsym section.  */
+  asection *dynsym_sec;
+  /* .hash section.  */
+  asection *hash_sec;
+  /* symbol version section (.gnu.version).  */
+  asection *symver_sec;
+  /* Buffer large enough to hold contents of any section.  */
+  bfd_byte *contents;
+  /* Buffer large enough to hold external relocs of any section.  */
+  void *external_relocs;
+  /* Buffer large enough to hold internal relocs of any section.  */
+  Elf_Internal_Rela *internal_relocs;
+  /* Buffer large enough to hold external local symbols of any input
+     BFD.  */
+  bfd_byte *external_syms;
+  /* And a buffer for symbol section indices.  */
+  Elf_External_Sym_Shndx *locsym_shndx;
+  /* Buffer large enough to hold internal local symbols of any input
+     BFD.  */
+  Elf_Internal_Sym *internal_syms;
+  /* Array large enough to hold a symbol index for each local symbol
+     of any input BFD.  */
+  long *indices;
+  /* Array large enough to hold a section pointer for each local
+     symbol of any input BFD.  */
+  asection **sections;
+  /* Buffer to hold swapped out symbols.  */
+  bfd_byte *symbuf;
+  /* And one for symbol section indices.  */
+  Elf_External_Sym_Shndx *symshndxbuf;
+  /* Number of swapped out symbols in buffer.  */
+  size_t symbuf_count;
+  /* Number of symbols which fit in symbuf.  */
+  size_t symbuf_size;
+  /* And same for symshndxbuf.  */
+  size_t shndxbuf_size;
+};
+
+/* This struct is used to pass information to elf_link_output_extsym.  */
+
+struct elf_outext_info
+{
+  bfd_boolean failed;
+  bfd_boolean localsyms;
+  struct elf_final_link_info *finfo;
+};
+
+
+/* Support for evaluating a complex relocation.
+
+   Complex relocations are generalized, self-describing relocations.  The
+   implementation of them consists of two parts: complex symbols, and the
+   relocations themselves.
+
+   The relocations are use a reserved elf-wide relocation type code (R_RELC
+   external / BFD_RELOC_RELC internal) and an encoding of relocation field
+   information (start bit, end bit, word width, etc) into the addend.  This
+   information is extracted from CGEN-generated operand tables within gas.
+
+   Complex symbols are mangled symbols (BSF_RELC external / STT_RELC
+   internal) representing prefix-notation expressions, including but not
+   limited to those sorts of expressions normally encoded as addends in the
+   addend field.  The symbol mangling format is:
+
+   <node> := <literal>
+          |  <unary-operator> ':' <node>
+          |  <binary-operator> ':' <node> ':' <node>
+	  ;
+
+   <literal> := 's' <digits=N> ':' <N character symbol name>
+             |  'S' <digits=N> ':' <N character section name>
+	     |  '#' <hexdigits>
+	     ;
+
+   <binary-operator> := as in C
+   <unary-operator> := as in C, plus "0-" for unambiguous negation.  */
+
+static void
+set_symbol_value (bfd *bfd_with_globals,
+		  Elf_Internal_Sym *isymbuf,
+		  size_t locsymcount,
+		  size_t symidx,
+		  bfd_vma val)
+{
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_link_hash_entry *h;
+  size_t extsymoff = locsymcount;
+
+  if (symidx < locsymcount)
+    {
+      Elf_Internal_Sym *sym;
+
+      sym = isymbuf + symidx;
+      if (ELF_ST_BIND (sym->st_info) == STB_LOCAL)
+	{
+	  /* It is a local symbol: move it to the
+	     "absolute" section and give it a value.  */
+	  sym->st_shndx = SHN_ABS;
+	  sym->st_value = val;
+	  return;
+	}
+      BFD_ASSERT (elf_bad_symtab (bfd_with_globals));
+      extsymoff = 0;
+    }
+
+  /* It is a global symbol: set its link type
+     to "defined" and give it a value.  */
+
+  sym_hashes = elf_sym_hashes (bfd_with_globals);
+  h = sym_hashes [symidx - extsymoff];
+  while (h->root.type == bfd_link_hash_indirect
+	 || h->root.type == bfd_link_hash_warning)
+    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+  h->root.type = bfd_link_hash_defined;
+  h->root.u.def.value = val;
+  h->root.u.def.section = bfd_abs_section_ptr;
+}
+
+static bfd_boolean
+resolve_symbol (const char *name,
+		bfd *input_bfd,
+		struct elf_final_link_info *finfo,
+		bfd_vma *result,
+		Elf_Internal_Sym *isymbuf,
+		size_t locsymcount)
+{
+  Elf_Internal_Sym *sym;
+  struct bfd_link_hash_entry *global_entry;
+  const char *candidate = NULL;
+  Elf_Internal_Shdr *symtab_hdr;
+  size_t i;
+
+  symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
+
+  for (i = 0; i < locsymcount; ++ i)
+    {
+      sym = isymbuf + i;
+
+      if (ELF_ST_BIND (sym->st_info) != STB_LOCAL)
+	continue;
+
+      candidate = bfd_elf_string_from_elf_section (input_bfd,
+						   symtab_hdr->sh_link,
+						   sym->st_name);
+#ifdef DEBUG
+      printf ("Comparing string: '%s' vs. '%s' = 0x%lx\n",
+	      name, candidate, (unsigned long) sym->st_value);
+#endif
+      if (candidate && strcmp (candidate, name) == 0)
+	{
+	  asection *sec = finfo->sections [i];
+
+	  *result = _bfd_elf_rel_local_sym (input_bfd, sym, &sec, 0);
+	  *result += sec->output_offset + sec->output_section->vma;
+#ifdef DEBUG
+	  printf ("Found symbol with value %8.8lx\n",
+		  (unsigned long) *result);
+#endif
+	  return TRUE;
+	}
+    }
+
+  /* Hmm, haven't found it yet. perhaps it is a global.  */
+  global_entry = bfd_link_hash_lookup (finfo->info->hash, name,
+				       FALSE, FALSE, TRUE);
+  if (!global_entry)
+    return FALSE;
+
+  if (global_entry->type == bfd_link_hash_defined
+      || global_entry->type == bfd_link_hash_defweak)
+    {
+      *result = (global_entry->u.def.value
+		 + global_entry->u.def.section->output_section->vma
+		 + global_entry->u.def.section->output_offset);
+#ifdef DEBUG
+      printf ("Found GLOBAL symbol '%s' with value %8.8lx\n",
+	      global_entry->root.string, (unsigned long) *result);
+#endif
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static bfd_boolean
+resolve_section (const char *name,
+		 asection *sections,
+		 bfd_vma *result)
+{
+  asection *curr;
+  unsigned int len;
+
+  for (curr = sections; curr; curr = curr->next)
+    if (strcmp (curr->name, name) == 0)
+      {
+	*result = curr->vma;
+	return TRUE;
+      }
+
+  /* Hmm. still haven't found it. try pseudo-section names.  */
+  for (curr = sections; curr; curr = curr->next)
+    {
+      len = strlen (curr->name);
+      if (len > strlen (name))
+	continue;
+
+      if (strncmp (curr->name, name, len) == 0)
+	{
+	  if (strncmp (".end", name + len, 4) == 0)
+	    {
+	      *result = curr->vma + curr->size;
+	      return TRUE;
+	    }
+
+	  /* Insert more pseudo-section names here, if you like.  */
+	}
+    }
+
+  return FALSE;
+}
+
+static void
+undefined_reference (const char *reftype, const char *name)
+{
+  _bfd_error_handler (_("undefined %s reference in complex symbol: %s"),
+		      reftype, name);
+}
+
+static bfd_boolean
+eval_symbol (bfd_vma *result,
+	     const char **symp,
+	     bfd *input_bfd,
+	     struct elf_final_link_info *finfo,
+	     bfd_vma dot,
+	     Elf_Internal_Sym *isymbuf,
+	     size_t locsymcount,
+	     int signed_p)
+{
+  size_t len;
+  size_t symlen;
+  bfd_vma a;
+  bfd_vma b;
+  char symbuf[4096];
+  const char *sym = *symp;
+  const char *symend;
+  bfd_boolean symbol_is_section = FALSE;
+
+  len = strlen (sym);
+  symend = sym + len;
+
+  if (len < 1 || len > sizeof (symbuf))
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  switch (* sym)
+    {
+    case '.':
+      *result = dot;
+      *symp = sym + 1;
+      return TRUE;
+
+    case '#':
+      ++sym;
+      *result = strtoul (sym, (char **) symp, 16);
+      return TRUE;
+
+    case 'S':
+      symbol_is_section = TRUE;
+    case 's':
+      ++sym;
+      symlen = strtol (sym, (char **) symp, 10);
+      sym = *symp + 1; /* Skip the trailing ':'.  */
+
+      if (symend < sym || symlen + 1 > sizeof (symbuf))
+	{
+	  bfd_set_error (bfd_error_invalid_operation);
+	  return FALSE;
+	}
+
+      memcpy (symbuf, sym, symlen);
+      symbuf[symlen] = '\0';
+      *symp = sym + symlen;
+
+      /* Is it always possible, with complex symbols, that gas "mis-guessed"
+	 the symbol as a section, or vice-versa. so we're pretty liberal in our
+	 interpretation here; section means "try section first", not "must be a
+	 section", and likewise with symbol.  */
+
+      if (symbol_is_section)
+	{
+	  if (!resolve_section (symbuf, finfo->output_bfd->sections, result)
+	      && !resolve_symbol (symbuf, input_bfd, finfo, result,
+				  isymbuf, locsymcount))
+	    {
+	      undefined_reference ("section", symbuf);
+	      return FALSE;
+	    }
+	}
+      else
+	{
+	  if (!resolve_symbol (symbuf, input_bfd, finfo, result,
+			       isymbuf, locsymcount)
+	      && !resolve_section (symbuf, finfo->output_bfd->sections,
+				   result))
+	    {
+	      undefined_reference ("symbol", symbuf);
+	      return FALSE;
+	    }
+	}
+
+      return TRUE;
+
+      /* All that remains are operators.  */
+
+#define UNARY_OP(op)						\
+  if (strncmp (sym, #op, strlen (#op)) == 0)			\
+    {								\
+      sym += strlen (#op);					\
+      if (*sym == ':')						\
+	++sym;							\
+      *symp = sym;						\
+      if (!eval_symbol (&a, symp, input_bfd, finfo, dot,	\
+			isymbuf, locsymcount, signed_p))	\
+	return FALSE;						\
+      if (signed_p)						\
+	*result = op ((bfd_signed_vma) a);			\
+      else							\
+	*result = op a;						\
+      return TRUE;						\
+    }
+
+#define BINARY_OP(op)						\
+  if (strncmp (sym, #op, strlen (#op)) == 0)			\
+    {								\
+      sym += strlen (#op);					\
+      if (*sym == ':')						\
+	++sym;							\
+      *symp = sym;						\
+      if (!eval_symbol (&a, symp, input_bfd, finfo, dot,	\
+			isymbuf, locsymcount, signed_p))	\
+	return FALSE;						\
+      ++*symp;							\
+      if (!eval_symbol (&b, symp, input_bfd, finfo, dot,	\
+			isymbuf, locsymcount, signed_p))	\
+	return FALSE;						\
+      if (signed_p)						\
+	*result = ((bfd_signed_vma) a) op ((bfd_signed_vma) b);	\
+      else							\
+	*result = a op b;					\
+      return TRUE;						\
+    }
+
+    default:
+      UNARY_OP  (0-);
+      BINARY_OP (<<);
+      BINARY_OP (>>);
+      BINARY_OP (==);
+      BINARY_OP (!=);
+      BINARY_OP (<=);
+      BINARY_OP (>=);
+      BINARY_OP (&&);
+      BINARY_OP (||);
+      UNARY_OP  (~);
+      UNARY_OP  (!);
+      BINARY_OP (*);
+      BINARY_OP (/);
+      BINARY_OP (%);
+      BINARY_OP (^);
+      BINARY_OP (|);
+      BINARY_OP (&);
+      BINARY_OP (+);
+      BINARY_OP (-);
+      BINARY_OP (<);
+      BINARY_OP (>);
+#undef UNARY_OP
+#undef BINARY_OP
+      _bfd_error_handler (_("unknown operator '%c' in complex symbol"), * sym);
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+}
+
+static void
+put_value (bfd_vma size,
+	   unsigned long chunksz,
+	   bfd *input_bfd,
+	   bfd_vma x,
+	   bfd_byte *location)
+{
+  location += (size - chunksz);
+
+  for (; size; size -= chunksz, location -= chunksz, x >>= (chunksz * 8))
+    {
+      switch (chunksz)
+	{
+	default:
+	case 0:
+	  abort ();
+	case 1:
+	  bfd_put_8 (input_bfd, x, location);
+	  break;
+	case 2:
+	  bfd_put_16 (input_bfd, x, location);
+	  break;
+	case 4:
+	  bfd_put_32 (input_bfd, x, location);
+	  break;
+	case 8:
+#ifdef BFD64
+	  bfd_put_64 (input_bfd, x, location);
+#else
+	  abort ();
+#endif
+	  break;
+	}
+    }
+}
+
+static bfd_vma
+get_value (bfd_vma size,
+	   unsigned long chunksz,
+	   bfd *input_bfd,
+	   bfd_byte *location)
+{
+  bfd_vma x = 0;
+
+  for (; size; size -= chunksz, location += chunksz)
+    {
+      switch (chunksz)
+	{
+	default:
+	case 0:
+	  abort ();
+	case 1:
+	  x = (x << (8 * chunksz)) | bfd_get_8 (input_bfd, location);
+	  break;
+	case 2:
+	  x = (x << (8 * chunksz)) | bfd_get_16 (input_bfd, location);
+	  break;
+	case 4:
+	  x = (x << (8 * chunksz)) | bfd_get_32 (input_bfd, location);
+	  break;
+	case 8:
+#ifdef BFD64
+	  x = (x << (8 * chunksz)) | bfd_get_64 (input_bfd, location);
+#else
+	  abort ();
+#endif
+	  break;
+	}
+    }
+  return x;
+}
+
+static void
+decode_complex_addend (unsigned long *start,   /* in bits */
+		       unsigned long *oplen,   /* in bits */
+		       unsigned long *len,     /* in bits */
+		       unsigned long *wordsz,  /* in bytes */
+		       unsigned long *chunksz, /* in bytes */
+		       unsigned long *lsb0_p,
+		       unsigned long *signed_p,
+		       unsigned long *trunc_p,
+		       unsigned long encoded)
+{
+  * start     =  encoded        & 0x3F;
+  * len       = (encoded >>  6) & 0x3F;
+  * oplen     = (encoded >> 12) & 0x3F;
+  * wordsz    = (encoded >> 18) & 0xF;
+  * chunksz   = (encoded >> 22) & 0xF;
+  * lsb0_p    = (encoded >> 27) & 1;
+  * signed_p  = (encoded >> 28) & 1;
+  * trunc_p   = (encoded >> 29) & 1;
+}
+
+bfd_reloc_status_type
+bfd_elf_perform_complex_relocation (bfd *input_bfd,
+				    asection *input_section ATTRIBUTE_UNUSED,
+				    bfd_byte *contents,
+				    Elf_Internal_Rela *rel,
+				    bfd_vma relocation)
+{
+  bfd_vma shift, x, mask;
+  unsigned long start, oplen, len, wordsz, chunksz, lsb0_p, signed_p, trunc_p;
+  bfd_reloc_status_type r;
+
+  /*  Perform this reloc, since it is complex.
+      (this is not to say that it necessarily refers to a complex
+      symbol; merely that it is a self-describing CGEN based reloc.
+      i.e. the addend has the complete reloc information (bit start, end,
+      word size, etc) encoded within it.).  */
+
+  decode_complex_addend (&start, &oplen, &len, &wordsz,
+			 &chunksz, &lsb0_p, &signed_p,
+			 &trunc_p, rel->r_addend);
+
+  mask = (((1L << (len - 1)) - 1) << 1) | 1;
+
+  if (lsb0_p)
+    shift = (start + 1) - len;
+  else
+    shift = (8 * wordsz) - (start + len);
+
+  /* FIXME: octets_per_byte.  */
+  x = get_value (wordsz, chunksz, input_bfd, contents + rel->r_offset);
+
+#ifdef DEBUG
+  printf ("Doing complex reloc: "
+	  "lsb0? %ld, signed? %ld, trunc? %ld, wordsz %ld, "
+	  "chunksz %ld, start %ld, len %ld, oplen %ld\n"
+	  "    dest: %8.8lx, mask: %8.8lx, reloc: %8.8lx\n",
+	  lsb0_p, signed_p, trunc_p, wordsz, chunksz, start, len,
+	  oplen, (unsigned long) x, (unsigned long) mask,
+	  (unsigned long) relocation);
+#endif
+
+  r = bfd_reloc_ok;
+  if (! trunc_p)
+    /* Now do an overflow check.  */
+    r = bfd_check_overflow ((signed_p
+			     ? complain_overflow_signed
+			     : complain_overflow_unsigned),
+			    len, 0, (8 * wordsz),
+			    relocation);
+
+  /* Do the deed.  */
+  x = (x & ~(mask << shift)) | ((relocation & mask) << shift);
+
+#ifdef DEBUG
+  printf ("           relocation: %8.8lx\n"
+	  "         shifted mask: %8.8lx\n"
+	  " shifted/masked reloc: %8.8lx\n"
+	  "               result: %8.8lx\n",
+	  (unsigned long) relocation, (unsigned long) (mask << shift),
+	  (unsigned long) ((relocation & mask) << shift), (unsigned long) x);
+#endif
+  /* FIXME: octets_per_byte.  */
+  put_value (wordsz, chunksz, input_bfd, x, contents + rel->r_offset);
+  return r;
+}
+
+/* When performing a relocatable link, the input relocations are
+   preserved.  But, if they reference global symbols, the indices
+   referenced must be updated.  Update all the relocations found in
+   RELDATA.  */
+
+static void
+elf_link_adjust_relocs (bfd *abfd,
+			struct bfd_elf_section_reloc_data *reldata)
+{
+  unsigned int i;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  bfd_byte *erela;
+  void (*swap_in) (bfd *, const bfd_byte *, Elf_Internal_Rela *);
+  void (*swap_out) (bfd *, const Elf_Internal_Rela *, bfd_byte *);
+  bfd_vma r_type_mask;
+  int r_sym_shift;
+  unsigned int count = reldata->count;
+  struct elf_link_hash_entry **rel_hash = reldata->hashes;
+
+  if (reldata->hdr->sh_entsize == bed->s->sizeof_rel)
+    {
+      swap_in = bed->s->swap_reloc_in;
+      swap_out = bed->s->swap_reloc_out;
+    }
+  else if (reldata->hdr->sh_entsize == bed->s->sizeof_rela)
+    {
+      swap_in = bed->s->swap_reloca_in;
+      swap_out = bed->s->swap_reloca_out;
+    }
+  else
+    abort ();
+
+  if (bed->s->int_rels_per_ext_rel > MAX_INT_RELS_PER_EXT_REL)
+    abort ();
+
+  if (bed->s->arch_size == 32)
+    {
+      r_type_mask = 0xff;
+      r_sym_shift = 8;
+    }
+  else
+    {
+      r_type_mask = 0xffffffff;
+      r_sym_shift = 32;
+    }
+
+  erela = reldata->hdr->contents;
+  for (i = 0; i < count; i++, rel_hash++, erela += reldata->hdr->sh_entsize)
+    {
+      Elf_Internal_Rela irela[MAX_INT_RELS_PER_EXT_REL];
+      unsigned int j;
+
+      if (*rel_hash == NULL)
+	continue;
+
+      BFD_ASSERT ((*rel_hash)->indx >= 0);
+
+      (*swap_in) (abfd, erela, irela);
+      for (j = 0; j < bed->s->int_rels_per_ext_rel; j++)
+	irela[j].r_info = ((bfd_vma) (*rel_hash)->indx << r_sym_shift
+			   | (irela[j].r_info & r_type_mask));
+      (*swap_out) (abfd, irela, erela);
+    }
+}
+
+struct elf_link_sort_rela
+{
+  union {
+    bfd_vma offset;
+    bfd_vma sym_mask;
+  } u;
+  enum elf_reloc_type_class type;
+  /* We use this as an array of size int_rels_per_ext_rel.  */
+  Elf_Internal_Rela rela[1];
+};
+
+static int
+elf_link_sort_cmp1 (const void *A, const void *B)
+{
+  const struct elf_link_sort_rela *a = (const struct elf_link_sort_rela *) A;
+  const struct elf_link_sort_rela *b = (const struct elf_link_sort_rela *) B;
+  int relativea, relativeb;
+
+  relativea = a->type == reloc_class_relative;
+  relativeb = b->type == reloc_class_relative;
+
+  if (relativea < relativeb)
+    return 1;
+  if (relativea > relativeb)
+    return -1;
+  if ((a->rela->r_info & a->u.sym_mask) < (b->rela->r_info & b->u.sym_mask))
+    return -1;
+  if ((a->rela->r_info & a->u.sym_mask) > (b->rela->r_info & b->u.sym_mask))
+    return 1;
+  if (a->rela->r_offset < b->rela->r_offset)
+    return -1;
+  if (a->rela->r_offset > b->rela->r_offset)
+    return 1;
+  return 0;
+}
+
+static int
+elf_link_sort_cmp2 (const void *A, const void *B)
+{
+  const struct elf_link_sort_rela *a = (const struct elf_link_sort_rela *) A;
+  const struct elf_link_sort_rela *b = (const struct elf_link_sort_rela *) B;
+  int copya, copyb;
+
+  if (a->u.offset < b->u.offset)
+    return -1;
+  if (a->u.offset > b->u.offset)
+    return 1;
+  copya = (a->type == reloc_class_copy) * 2 + (a->type == reloc_class_plt);
+  copyb = (b->type == reloc_class_copy) * 2 + (b->type == reloc_class_plt);
+  if (copya < copyb)
+    return -1;
+  if (copya > copyb)
+    return 1;
+  if (a->rela->r_offset < b->rela->r_offset)
+    return -1;
+  if (a->rela->r_offset > b->rela->r_offset)
+    return 1;
+  return 0;
+}
+
+static size_t
+elf_link_sort_relocs (bfd *abfd, struct bfd_link_info *info, asection **psec)
+{
+  asection *dynamic_relocs;
+  asection *rela_dyn;
+  asection *rel_dyn;
+  bfd_size_type count, size;
+  size_t i, ret, sort_elt, ext_size;
+  bfd_byte *sort, *s_non_relative, *p;
+  struct elf_link_sort_rela *sq;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  int i2e = bed->s->int_rels_per_ext_rel;
+  void (*swap_in) (bfd *, const bfd_byte *, Elf_Internal_Rela *);
+  void (*swap_out) (bfd *, const Elf_Internal_Rela *, bfd_byte *);
+  struct bfd_link_order *lo;
+  bfd_vma r_sym_mask;
+  bfd_boolean use_rela;
+
+  /* Find a dynamic reloc section.  */
+  rela_dyn = bfd_get_section_by_name (abfd, ".rela.dyn");
+  rel_dyn  = bfd_get_section_by_name (abfd, ".rel.dyn");
+  if (rela_dyn != NULL && rela_dyn->size > 0
+      && rel_dyn != NULL && rel_dyn->size > 0)
+    {
+      bfd_boolean use_rela_initialised = FALSE;
+
+      /* This is just here to stop gcc from complaining.
+	 It's initialization checking code is not perfect.  */
+      use_rela = TRUE;
+
+      /* Both sections are present.  Examine the sizes
+	 of the indirect sections to help us choose.  */
+      for (lo = rela_dyn->map_head.link_order; lo != NULL; lo = lo->next)
+	if (lo->type == bfd_indirect_link_order)
+	  {
+	    asection *o = lo->u.indirect.section;
+
+	    if ((o->size % bed->s->sizeof_rela) == 0)
+	      {
+		if ((o->size % bed->s->sizeof_rel) == 0)
+		  /* Section size is divisible by both rel and rela sizes.
+		     It is of no help to us.  */
+		  ;
+		else
+		  {
+		    /* Section size is only divisible by rela.  */
+		    if (use_rela_initialised && (use_rela == FALSE))
+		      {
+			_bfd_error_handler
+			  (_("%B: Unable to sort relocs - they are in more than one size"), abfd);
+			bfd_set_error (bfd_error_invalid_operation);
+			return 0;
+		      }
+		    else
+		      {
+			use_rela = TRUE;
+			use_rela_initialised = TRUE;
+		      }
+		  }
+	      }
+	    else if ((o->size % bed->s->sizeof_rel) == 0)
+	      {
+		/* Section size is only divisible by rel.  */
+		if (use_rela_initialised && (use_rela == TRUE))
+		  {
+		    _bfd_error_handler
+		      (_("%B: Unable to sort relocs - they are in more than one size"), abfd);
+		    bfd_set_error (bfd_error_invalid_operation);
+		    return 0;
+		  }
+		else
+		  {
+		    use_rela = FALSE;
+		    use_rela_initialised = TRUE;
+		  }
+	      }
+	    else
+	      {
+		/* The section size is not divisible by either - something is wrong.  */
+		_bfd_error_handler
+		  (_("%B: Unable to sort relocs - they are of an unknown size"), abfd);
+		bfd_set_error (bfd_error_invalid_operation);
+		return 0;
+	      }
+	  }
+
+      for (lo = rel_dyn->map_head.link_order; lo != NULL; lo = lo->next)
+	if (lo->type == bfd_indirect_link_order)
+	  {
+	    asection *o = lo->u.indirect.section;
+
+	    if ((o->size % bed->s->sizeof_rela) == 0)
+	      {
+		if ((o->size % bed->s->sizeof_rel) == 0)
+		  /* Section size is divisible by both rel and rela sizes.
+		     It is of no help to us.  */
+		  ;
+		else
+		  {
+		    /* Section size is only divisible by rela.  */
+		    if (use_rela_initialised && (use_rela == FALSE))
+		      {
+			_bfd_error_handler
+			  (_("%B: Unable to sort relocs - they are in more than one size"), abfd);
+			bfd_set_error (bfd_error_invalid_operation);
+			return 0;
+		      }
+		    else
+		      {
+			use_rela = TRUE;
+			use_rela_initialised = TRUE;
+		      }
+		  }
+	      }
+	    else if ((o->size % bed->s->sizeof_rel) == 0)
+	      {
+		/* Section size is only divisible by rel.  */
+		if (use_rela_initialised && (use_rela == TRUE))
+		  {
+		    _bfd_error_handler
+		      (_("%B: Unable to sort relocs - they are in more than one size"), abfd);
+		    bfd_set_error (bfd_error_invalid_operation);
+		    return 0;
+		  }
+		else
+		  {
+		    use_rela = FALSE;
+		    use_rela_initialised = TRUE;
+		  }
+	      }
+	    else
+	      {
+		/* The section size is not divisible by either - something is wrong.  */
+		_bfd_error_handler
+		  (_("%B: Unable to sort relocs - they are of an unknown size"), abfd);
+		bfd_set_error (bfd_error_invalid_operation);
+		return 0;
+	      }
+	  }
+
+      if (! use_rela_initialised)
+	/* Make a guess.  */
+	use_rela = TRUE;
+    }
+  else if (rela_dyn != NULL && rela_dyn->size > 0)
+    use_rela = TRUE;
+  else if (rel_dyn != NULL && rel_dyn->size > 0)
+    use_rela = FALSE;
+  else
+    return 0;
+
+  if (use_rela)
+    {
+      dynamic_relocs = rela_dyn;
+      ext_size = bed->s->sizeof_rela;
+      swap_in = bed->s->swap_reloca_in;
+      swap_out = bed->s->swap_reloca_out;
+    }
+  else
+    {
+      dynamic_relocs = rel_dyn;
+      ext_size = bed->s->sizeof_rel;
+      swap_in = bed->s->swap_reloc_in;
+      swap_out = bed->s->swap_reloc_out;
+    }
+
+  size = 0;
+  for (lo = dynamic_relocs->map_head.link_order; lo != NULL; lo = lo->next)
+    if (lo->type == bfd_indirect_link_order)
+      size += lo->u.indirect.section->size;
+
+  if (size != dynamic_relocs->size)
+    return 0;
+
+  sort_elt = (sizeof (struct elf_link_sort_rela)
+	      + (i2e - 1) * sizeof (Elf_Internal_Rela));
+
+  count = dynamic_relocs->size / ext_size;
+  if (count == 0)
+    return 0;
+  sort = (bfd_byte *) bfd_zmalloc (sort_elt * count);
+
+  if (sort == NULL)
+    {
+      (*info->callbacks->warning)
+	(info, _("Not enough memory to sort relocations"), 0, abfd, 0, 0);
+      return 0;
+    }
+
+  if (bed->s->arch_size == 32)
+    r_sym_mask = ~(bfd_vma) 0xff;
+  else
+    r_sym_mask = ~(bfd_vma) 0xffffffff;
+
+  for (lo = dynamic_relocs->map_head.link_order; lo != NULL; lo = lo->next)
+    if (lo->type == bfd_indirect_link_order)
+      {
+	bfd_byte *erel, *erelend;
+	asection *o = lo->u.indirect.section;
+
+	if (o->contents == NULL && o->size != 0)
+	  {
+	    /* This is a reloc section that is being handled as a normal
+	       section.  See bfd_section_from_shdr.  We can't combine
+	       relocs in this case.  */
+	    free (sort);
+	    return 0;
+	  }
+	erel = o->contents;
+	erelend = o->contents + o->size;
+	/* FIXME: octets_per_byte.  */
+	p = sort + o->output_offset / ext_size * sort_elt;
+
+	while (erel < erelend)
+	  {
+	    struct elf_link_sort_rela *s = (struct elf_link_sort_rela *) p;
+
+	    (*swap_in) (abfd, erel, s->rela);
+	    s->type = (*bed->elf_backend_reloc_type_class) (s->rela);
+	    s->u.sym_mask = r_sym_mask;
+	    p += sort_elt;
+	    erel += ext_size;
+	  }
+      }
+
+  qsort (sort, count, sort_elt, elf_link_sort_cmp1);
+
+  for (i = 0, p = sort; i < count; i++, p += sort_elt)
+    {
+      struct elf_link_sort_rela *s = (struct elf_link_sort_rela *) p;
+      if (s->type != reloc_class_relative)
+	break;
+    }
+  ret = i;
+  s_non_relative = p;
+
+  sq = (struct elf_link_sort_rela *) s_non_relative;
+  for (; i < count; i++, p += sort_elt)
+    {
+      struct elf_link_sort_rela *sp = (struct elf_link_sort_rela *) p;
+      if (((sp->rela->r_info ^ sq->rela->r_info) & r_sym_mask) != 0)
+	sq = sp;
+      sp->u.offset = sq->rela->r_offset;
+    }
+
+  qsort (s_non_relative, count - ret, sort_elt, elf_link_sort_cmp2);
+
+  for (lo = dynamic_relocs->map_head.link_order; lo != NULL; lo = lo->next)
+    if (lo->type == bfd_indirect_link_order)
+      {
+	bfd_byte *erel, *erelend;
+	asection *o = lo->u.indirect.section;
+
+	erel = o->contents;
+	erelend = o->contents + o->size;
+	/* FIXME: octets_per_byte.  */
+	p = sort + o->output_offset / ext_size * sort_elt;
+	while (erel < erelend)
+	  {
+	    struct elf_link_sort_rela *s = (struct elf_link_sort_rela *) p;
+	    (*swap_out) (abfd, s->rela, erel);
+	    p += sort_elt;
+	    erel += ext_size;
+	  }
+      }
+
+  free (sort);
+  *psec = dynamic_relocs;
+  return ret;
+}
+
+/* Flush the output symbols to the file.  */
+
+static bfd_boolean
+elf_link_flush_output_syms (struct elf_final_link_info *finfo,
+			    const struct elf_backend_data *bed)
+{
+  if (finfo->symbuf_count > 0)
+    {
+      Elf_Internal_Shdr *hdr;
+      file_ptr pos;
+      bfd_size_type amt;
+
+      hdr = &elf_tdata (finfo->output_bfd)->symtab_hdr;
+      pos = hdr->sh_offset + hdr->sh_size;
+      amt = finfo->symbuf_count * bed->s->sizeof_sym;
+      if (bfd_seek (finfo->output_bfd, pos, SEEK_SET) != 0
+	  || bfd_bwrite (finfo->symbuf, amt, finfo->output_bfd) != amt)
+	return FALSE;
+
+      hdr->sh_size += amt;
+      finfo->symbuf_count = 0;
+    }
+
+  return TRUE;
+}
+
+/* Add a symbol to the output symbol table.  */
+
+static int
+elf_link_output_sym (struct elf_final_link_info *finfo,
+		     const char *name,
+		     Elf_Internal_Sym *elfsym,
+		     asection *input_sec,
+		     struct elf_link_hash_entry *h)
+{
+  bfd_byte *dest;
+  Elf_External_Sym_Shndx *destshndx;
+  int (*output_symbol_hook)
+    (struct bfd_link_info *, const char *, Elf_Internal_Sym *, asection *,
+     struct elf_link_hash_entry *);
+  const struct elf_backend_data *bed;
+
+  bed = get_elf_backend_data (finfo->output_bfd);
+  output_symbol_hook = bed->elf_backend_link_output_symbol_hook;
+  if (output_symbol_hook != NULL)
+    {
+      int ret = (*output_symbol_hook) (finfo->info, name, elfsym, input_sec, h);
+      if (ret != 1)
+	return ret;
+    }
+
+  if (name == NULL || *name == '\0')
+    elfsym->st_name = 0;
+  else if (input_sec->flags & SEC_EXCLUDE)
+    elfsym->st_name = 0;
+  else
+    {
+      elfsym->st_name = (unsigned long) _bfd_stringtab_add (finfo->symstrtab,
+							    name, TRUE, FALSE);
+      if (elfsym->st_name == (unsigned long) -1)
+	return 0;
+    }
+
+  if (finfo->symbuf_count >= finfo->symbuf_size)
+    {
+      if (! elf_link_flush_output_syms (finfo, bed))
+	return 0;
+    }
+
+  dest = finfo->symbuf + finfo->symbuf_count * bed->s->sizeof_sym;
+  destshndx = finfo->symshndxbuf;
+  if (destshndx != NULL)
+    {
+      if (bfd_get_symcount (finfo->output_bfd) >= finfo->shndxbuf_size)
+	{
+	  bfd_size_type amt;
+
+	  amt = finfo->shndxbuf_size * sizeof (Elf_External_Sym_Shndx);
+	  destshndx = (Elf_External_Sym_Shndx *) bfd_realloc (destshndx,
+                                                              amt * 2);
+	  if (destshndx == NULL)
+	    return 0;
+	  finfo->symshndxbuf = destshndx;
+	  memset ((char *) destshndx + amt, 0, amt);
+	  finfo->shndxbuf_size *= 2;
+	}
+      destshndx += bfd_get_symcount (finfo->output_bfd);
+    }
+
+  bed->s->swap_symbol_out (finfo->output_bfd, elfsym, dest, destshndx);
+  finfo->symbuf_count += 1;
+  bfd_get_symcount (finfo->output_bfd) += 1;
+
+  return 1;
+}
+
+/* Return TRUE if the dynamic symbol SYM in ABFD is supported.  */
+
+static bfd_boolean
+check_dynsym (bfd *abfd, Elf_Internal_Sym *sym)
+{
+  if (sym->st_shndx >= (SHN_LORESERVE & 0xffff)
+      && sym->st_shndx < SHN_LORESERVE)
+    {
+      /* The gABI doesn't support dynamic symbols in output sections
+	 beyond 64k.  */
+      (*_bfd_error_handler)
+	(_("%B: Too many sections: %d (>= %d)"),
+	 abfd, bfd_count_sections (abfd), SHN_LORESERVE & 0xffff);
+      bfd_set_error (bfd_error_nonrepresentable_section);
+      return FALSE;
+    }
+  return TRUE;
+}
+
+/* For DSOs loaded in via a DT_NEEDED entry, emulate ld.so in
+   allowing an unsatisfied unversioned symbol in the DSO to match a
+   versioned symbol that would normally require an explicit version.
+   We also handle the case that a DSO references a hidden symbol
+   which may be satisfied by a versioned symbol in another DSO.  */
+
+static bfd_boolean
+elf_link_check_versioned_symbol (struct bfd_link_info *info,
+				 const struct elf_backend_data *bed,
+				 struct elf_link_hash_entry *h)
+{
+  bfd *abfd;
+  struct elf_link_loaded_list *loaded;
+
+  if (!is_elf_hash_table (info->hash))
+    return FALSE;
+
+  switch (h->root.type)
+    {
+    default:
+      abfd = NULL;
+      break;
+
+    case bfd_link_hash_undefined:
+    case bfd_link_hash_undefweak:
+      abfd = h->root.u.undef.abfd;
+      if ((abfd->flags & DYNAMIC) == 0
+	  || (elf_dyn_lib_class (abfd) & DYN_DT_NEEDED) == 0)
+	return FALSE;
+      break;
+
+    case bfd_link_hash_defined:
+    case bfd_link_hash_defweak:
+      abfd = h->root.u.def.section->owner;
+      break;
+
+    case bfd_link_hash_common:
+      abfd = h->root.u.c.p->section->owner;
+      break;
+    }
+  BFD_ASSERT (abfd != NULL);
+
+  for (loaded = elf_hash_table (info)->loaded;
+       loaded != NULL;
+       loaded = loaded->next)
+    {
+      bfd *input;
+      Elf_Internal_Shdr *hdr;
+      bfd_size_type symcount;
+      bfd_size_type extsymcount;
+      bfd_size_type extsymoff;
+      Elf_Internal_Shdr *versymhdr;
+      Elf_Internal_Sym *isym;
+      Elf_Internal_Sym *isymend;
+      Elf_Internal_Sym *isymbuf;
+      Elf_External_Versym *ever;
+      Elf_External_Versym *extversym;
+
+      input = loaded->abfd;
+
+      /* We check each DSO for a possible hidden versioned definition.  */
+      if (input == abfd
+	  || (input->flags & DYNAMIC) == 0
+	  || elf_dynversym (input) == 0)
+	continue;
+
+      hdr = &elf_tdata (input)->dynsymtab_hdr;
+
+      symcount = hdr->sh_size / bed->s->sizeof_sym;
+      if (elf_bad_symtab (input))
+	{
+	  extsymcount = symcount;
+	  extsymoff = 0;
+	}
+      else
+	{
+	  extsymcount = symcount - hdr->sh_info;
+	  extsymoff = hdr->sh_info;
+	}
+
+      if (extsymcount == 0)
+	continue;
+
+      isymbuf = bfd_elf_get_elf_syms (input, hdr, extsymcount, extsymoff,
+				      NULL, NULL, NULL);
+      if (isymbuf == NULL)
+	return FALSE;
+
+      /* Read in any version definitions.  */
+      versymhdr = &elf_tdata (input)->dynversym_hdr;
+      extversym = (Elf_External_Versym *) bfd_malloc (versymhdr->sh_size);
+      if (extversym == NULL)
+	goto error_ret;
+
+      if (bfd_seek (input, versymhdr->sh_offset, SEEK_SET) != 0
+	  || (bfd_bread (extversym, versymhdr->sh_size, input)
+	      != versymhdr->sh_size))
+	{
+	  free (extversym);
+	error_ret:
+	  free (isymbuf);
+	  return FALSE;
+	}
+
+      ever = extversym + extsymoff;
+      isymend = isymbuf + extsymcount;
+      for (isym = isymbuf; isym < isymend; isym++, ever++)
+	{
+	  const char *name;
+	  Elf_Internal_Versym iver;
+	  unsigned short version_index;
+
+	  if (ELF_ST_BIND (isym->st_info) == STB_LOCAL
+	      || isym->st_shndx == SHN_UNDEF)
+	    continue;
+
+	  name = bfd_elf_string_from_elf_section (input,
+						  hdr->sh_link,
+						  isym->st_name);
+	  if (strcmp (name, h->root.root.string) != 0)
+	    continue;
+
+	  _bfd_elf_swap_versym_in (input, ever, &iver);
+
+	  if ((iver.vs_vers & VERSYM_HIDDEN) == 0
+	      && !(h->def_regular
+		   && h->forced_local))
+	    {
+	      /* If we have a non-hidden versioned sym, then it should
+		 have provided a definition for the undefined sym unless
+		 it is defined in a non-shared object and forced local.
+	       */
+	      abort ();
+	    }
+
+	  version_index = iver.vs_vers & VERSYM_VERSION;
+	  if (version_index == 1 || version_index == 2)
+	    {
+	      /* This is the base or first version.  We can use it.  */
+	      free (extversym);
+	      free (isymbuf);
+	      return TRUE;
+	    }
+	}
+
+      free (extversym);
+      free (isymbuf);
+    }
+
+  return FALSE;
+}
+
+/* Add an external symbol to the symbol table.  This is called from
+   the hash table traversal routine.  When generating a shared object,
+   we go through the symbol table twice.  The first time we output
+   anything that might have been forced to local scope in a version
+   script.  The second time we output the symbols that are still
+   global symbols.  */
+
+static bfd_boolean
+elf_link_output_extsym (struct bfd_hash_entry *bh, void *data)
+{
+  struct elf_link_hash_entry *h = (struct elf_link_hash_entry *) bh;
+  struct elf_outext_info *eoinfo = (struct elf_outext_info *) data;
+  struct elf_final_link_info *finfo = eoinfo->finfo;
+  bfd_boolean strip;
+  Elf_Internal_Sym sym;
+  asection *input_sec;
+  const struct elf_backend_data *bed;
+  long indx;
+  int ret;
+
+  if (h->root.type == bfd_link_hash_warning)
+    {
+      h = (struct elf_link_hash_entry *) h->root.u.i.link;
+      if (h->root.type == bfd_link_hash_new)
+	return TRUE;
+    }
+
+  /* Decide whether to output this symbol in this pass.  */
+  if (eoinfo->localsyms)
+    {
+      if (!h->forced_local)
+	return TRUE;
+    }
+  else
+    {
+      if (h->forced_local)
+	return TRUE;
+    }
+
+  bed = get_elf_backend_data (finfo->output_bfd);
+
+  if (h->root.type == bfd_link_hash_undefined)
+    {
+      /* If we have an undefined symbol reference here then it must have
+	 come from a shared library that is being linked in.  (Undefined
+	 references in regular files have already been handled unless
+	 they are in unreferenced sections which are removed by garbage
+	 collection).  */
+      bfd_boolean ignore_undef = FALSE;
+
+      /* Some symbols may be special in that the fact that they're
+	 undefined can be safely ignored - let backend determine that.  */
+      if (bed->elf_backend_ignore_undef_symbol)
+	ignore_undef = bed->elf_backend_ignore_undef_symbol (h);
+
+      /* If we are reporting errors for this situation then do so now.  */
+      if (!ignore_undef
+	  && h->ref_dynamic
+	  && (!h->ref_regular || finfo->info->gc_sections)
+	  && ! elf_link_check_versioned_symbol (finfo->info, bed, h)
+	  && finfo->info->unresolved_syms_in_shared_libs != RM_IGNORE)
+	{
+	  if (! (finfo->info->callbacks->undefined_symbol
+		 (finfo->info, h->root.root.string,
+		  h->ref_regular ? NULL : h->root.u.undef.abfd,
+		  NULL, 0, finfo->info->unresolved_syms_in_shared_libs == RM_GENERATE_ERROR)))
+	    {
+	      bfd_set_error (bfd_error_bad_value);
+	      eoinfo->failed = TRUE;
+	      return FALSE;
+	    }
+	}
+    }
+
+  /* We should also warn if a forced local symbol is referenced from
+     shared libraries.  */
+  if (!finfo->info->relocatable
+      && finfo->info->executable
+      && h->forced_local
+      && h->ref_dynamic
+      && h->def_regular
+      && !h->dynamic_def
+      && !h->dynamic_weak
+      && ! elf_link_check_versioned_symbol (finfo->info, bed, h))
+    {
+      bfd *def_bfd;
+      const char *msg;
+
+      if (ELF_ST_VISIBILITY (h->other) == STV_INTERNAL)
+	msg = _("%B: internal symbol `%s' in %B is referenced by DSO");
+      else if (ELF_ST_VISIBILITY (h->other) == STV_HIDDEN)
+	msg = _("%B: hidden symbol `%s' in %B is referenced by DSO");
+      else
+	msg = _("%B: local symbol `%s' in %B is referenced by DSO");
+      def_bfd = finfo->output_bfd;
+      if (h->root.u.def.section != bfd_abs_section_ptr)
+	def_bfd = h->root.u.def.section->owner;
+      (*_bfd_error_handler) (msg, finfo->output_bfd, def_bfd,
+			     h->root.root.string);
+      bfd_set_error (bfd_error_bad_value);
+      eoinfo->failed = TRUE;
+      return FALSE;
+    }
+
+  /* We don't want to output symbols that have never been mentioned by
+     a regular file, or that we have been told to strip.  However, if
+     h->indx is set to -2, the symbol is used by a reloc and we must
+     output it.  */
+  if (h->indx == -2)
+    strip = FALSE;
+  else if ((h->def_dynamic
+	    || h->ref_dynamic
+	    || h->root.type == bfd_link_hash_new)
+	   && !h->def_regular
+	   && !h->ref_regular)
+    strip = TRUE;
+  else if (finfo->info->strip == strip_all)
+    strip = TRUE;
+  else if (finfo->info->strip == strip_some
+	   && bfd_hash_lookup (finfo->info->keep_hash,
+			       h->root.root.string, FALSE, FALSE) == NULL)
+    strip = TRUE;
+  else if ((h->root.type == bfd_link_hash_defined
+	    || h->root.type == bfd_link_hash_defweak)
+	   && ((finfo->info->strip_discarded
+		&& elf_discarded_section (h->root.u.def.section))
+	       || (h->root.u.def.section->owner != NULL
+		   && (h->root.u.def.section->owner->flags & BFD_PLUGIN) != 0)))
+    strip = TRUE;
+  else if ((h->root.type == bfd_link_hash_undefined
+	    || h->root.type == bfd_link_hash_undefweak)
+	   && h->root.u.undef.abfd != NULL
+	   && (h->root.u.undef.abfd->flags & BFD_PLUGIN) != 0)
+    strip = TRUE;
+  else
+    strip = FALSE;
+
+  /* If we're stripping it, and it's not a dynamic symbol, there's
+     nothing else to do unless it is a forced local symbol or a
+     STT_GNU_IFUNC symbol.  */
+  if (strip
+      && h->dynindx == -1
+      && h->type != STT_GNU_IFUNC
+      && !h->forced_local)
+    return TRUE;
+
+  sym.st_value = 0;
+  sym.st_size = h->size;
+  sym.st_other = h->other;
+  if (h->forced_local)
+    {
+      sym.st_info = ELF_ST_INFO (STB_LOCAL, h->type);
+      /* Turn off visibility on local symbol.  */
+      sym.st_other &= ~ELF_ST_VISIBILITY (-1);
+    }
+  else if (h->unique_global)
+    sym.st_info = ELF_ST_INFO (STB_GNU_UNIQUE, h->type);
+  else if (h->root.type == bfd_link_hash_undefweak
+	   || h->root.type == bfd_link_hash_defweak)
+    sym.st_info = ELF_ST_INFO (STB_WEAK, h->type);
+  else
+    sym.st_info = ELF_ST_INFO (STB_GLOBAL, h->type);
+  sym.st_target_internal = h->target_internal;
+
+  switch (h->root.type)
+    {
+    default:
+    case bfd_link_hash_new:
+    case bfd_link_hash_warning:
+      abort ();
+      return FALSE;
+
+    case bfd_link_hash_undefined:
+    case bfd_link_hash_undefweak:
+      input_sec = bfd_und_section_ptr;
+      sym.st_shndx = SHN_UNDEF;
+      break;
+
+    case bfd_link_hash_defined:
+    case bfd_link_hash_defweak:
+      {
+	input_sec = h->root.u.def.section;
+	if (input_sec->output_section != NULL)
+	  {
+	    sym.st_shndx =
+	      _bfd_elf_section_from_bfd_section (finfo->output_bfd,
+						 input_sec->output_section);
+	    if (sym.st_shndx == SHN_BAD)
+	      {
+		(*_bfd_error_handler)
+		  (_("%B: could not find output section %A for input section %A"),
+		   finfo->output_bfd, input_sec->output_section, input_sec);
+		bfd_set_error (bfd_error_nonrepresentable_section);
+		eoinfo->failed = TRUE;
+		return FALSE;
+	      }
+
+	    /* ELF symbols in relocatable files are section relative,
+	       but in nonrelocatable files they are virtual
+	       addresses.  */
+	    sym.st_value = h->root.u.def.value + input_sec->output_offset;
+	    if (! finfo->info->relocatable)
+	      {
+		sym.st_value += input_sec->output_section->vma;
+		if (h->type == STT_TLS)
+		  {
+		    asection *tls_sec = elf_hash_table (finfo->info)->tls_sec;
+		    if (tls_sec != NULL)
+		      sym.st_value -= tls_sec->vma;
+		    else
+		      {
+			/* The TLS section may have been garbage collected.  */
+			BFD_ASSERT (finfo->info->gc_sections
+				    && !input_sec->gc_mark);
+		      }
+		  }
+	      }
+	  }
+	else
+	  {
+	    BFD_ASSERT (input_sec->owner == NULL
+			|| (input_sec->owner->flags & DYNAMIC) != 0);
+	    sym.st_shndx = SHN_UNDEF;
+	    input_sec = bfd_und_section_ptr;
+	  }
+      }
+      break;
+
+    case bfd_link_hash_common:
+      input_sec = h->root.u.c.p->section;
+      sym.st_shndx = bed->common_section_index (input_sec);
+      sym.st_value = 1 << h->root.u.c.p->alignment_power;
+      break;
+
+    case bfd_link_hash_indirect:
+      /* These symbols are created by symbol versioning.  They point
+	 to the decorated version of the name.  For example, if the
+	 symbol foo@@GNU_1.2 is the default, which should be used when
+	 foo is used with no version, then we add an indirect symbol
+	 foo which points to foo@@GNU_1.2.  We ignore these symbols,
+	 since the indirected symbol is already in the hash table.  */
+      return TRUE;
+    }
+
+  /* Give the processor backend a chance to tweak the symbol value,
+     and also to finish up anything that needs to be done for this
+     symbol.  FIXME: Not calling elf_backend_finish_dynamic_symbol for
+     forced local syms when non-shared is due to a historical quirk.
+     STT_GNU_IFUNC symbol must go through PLT.  */
+  if ((h->type == STT_GNU_IFUNC
+       && h->def_regular
+       && !finfo->info->relocatable)
+      || ((h->dynindx != -1
+	   || h->forced_local)
+	  && ((finfo->info->shared
+	       && (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		   || h->root.type != bfd_link_hash_undefweak))
+	      || !h->forced_local)
+	  && elf_hash_table (finfo->info)->dynamic_sections_created))
+    {
+      if (! ((*bed->elf_backend_finish_dynamic_symbol)
+	     (finfo->output_bfd, finfo->info, h, &sym)))
+	{
+	  eoinfo->failed = TRUE;
+	  return FALSE;
+	}
+    }
+
+  /* If we are marking the symbol as undefined, and there are no
+     non-weak references to this symbol from a regular object, then
+     mark the symbol as weak undefined; if there are non-weak
+     references, mark the symbol as strong.  We can't do this earlier,
+     because it might not be marked as undefined until the
+     finish_dynamic_symbol routine gets through with it.  */
+  if (sym.st_shndx == SHN_UNDEF
+      && h->ref_regular
+      && (ELF_ST_BIND (sym.st_info) == STB_GLOBAL
+	  || ELF_ST_BIND (sym.st_info) == STB_WEAK))
+    {
+      int bindtype;
+      unsigned int type = ELF_ST_TYPE (sym.st_info);
+
+      /* Turn an undefined IFUNC symbol into a normal FUNC symbol. */
+      if (type == STT_GNU_IFUNC)
+	type = STT_FUNC;
+
+      if (h->ref_regular_nonweak)
+	bindtype = STB_GLOBAL;
+      else
+	bindtype = STB_WEAK;
+      sym.st_info = ELF_ST_INFO (bindtype, type);
+    }
+
+  /* If this is a symbol defined in a dynamic library, don't use the
+     symbol size from the dynamic library.  Relinking an executable
+     against a new library may introduce gratuitous changes in the
+     executable's symbols if we keep the size.  */
+  if (sym.st_shndx == SHN_UNDEF
+      && !h->def_regular
+      && h->def_dynamic)
+    sym.st_size = 0;
+
+  /* If a non-weak symbol with non-default visibility is not defined
+     locally, it is a fatal error.  */
+  if (! finfo->info->relocatable
+      && ELF_ST_VISIBILITY (sym.st_other) != STV_DEFAULT
+      && ELF_ST_BIND (sym.st_info) != STB_WEAK
+      && h->root.type == bfd_link_hash_undefined
+      && !h->def_regular)
+    {
+      const char *msg;
+
+      if (ELF_ST_VISIBILITY (sym.st_other) == STV_PROTECTED)
+	msg = _("%B: protected symbol `%s' isn't defined");
+      else if (ELF_ST_VISIBILITY (sym.st_other) == STV_INTERNAL)
+	msg = _("%B: internal symbol `%s' isn't defined");
+      else
+	msg = _("%B: hidden symbol `%s' isn't defined");
+      (*_bfd_error_handler) (msg, finfo->output_bfd, h->root.root.string);
+      bfd_set_error (bfd_error_bad_value);
+      eoinfo->failed = TRUE;
+      return FALSE;
+    }
+
+  /* If this symbol should be put in the .dynsym section, then put it
+     there now.  We already know the symbol index.  We also fill in
+     the entry in the .hash section.  */
+  if (h->dynindx != -1
+      && elf_hash_table (finfo->info)->dynamic_sections_created)
+    {
+      bfd_byte *esym;
+
+      sym.st_name = h->dynstr_index;
+      esym = finfo->dynsym_sec->contents + h->dynindx * bed->s->sizeof_sym;
+      if (! check_dynsym (finfo->output_bfd, &sym))
+	{
+	  eoinfo->failed = TRUE;
+	  return FALSE;
+	}
+      bed->s->swap_symbol_out (finfo->output_bfd, &sym, esym, 0);
+
+      if (finfo->hash_sec != NULL)
+	{
+	  size_t hash_entry_size;
+	  bfd_byte *bucketpos;
+	  bfd_vma chain;
+	  size_t bucketcount;
+	  size_t bucket;
+
+	  bucketcount = elf_hash_table (finfo->info)->bucketcount;
+	  bucket = h->u.elf_hash_value % bucketcount;
+
+	  hash_entry_size
+	    = elf_section_data (finfo->hash_sec)->this_hdr.sh_entsize;
+	  bucketpos = ((bfd_byte *) finfo->hash_sec->contents
+		       + (bucket + 2) * hash_entry_size);
+	  chain = bfd_get (8 * hash_entry_size, finfo->output_bfd, bucketpos);
+	  bfd_put (8 * hash_entry_size, finfo->output_bfd, h->dynindx, bucketpos);
+	  bfd_put (8 * hash_entry_size, finfo->output_bfd, chain,
+		   ((bfd_byte *) finfo->hash_sec->contents
+		    + (bucketcount + 2 + h->dynindx) * hash_entry_size));
+	}
+
+      if (finfo->symver_sec != NULL && finfo->symver_sec->contents != NULL)
+	{
+	  Elf_Internal_Versym iversym;
+	  Elf_External_Versym *eversym;
+
+	  if (!h->def_regular)
+	    {
+	      if (h->verinfo.verdef == NULL)
+		iversym.vs_vers = 0;
+	      else
+		iversym.vs_vers = h->verinfo.verdef->vd_exp_refno + 1;
+	    }
+	  else
+	    {
+	      if (h->verinfo.vertree == NULL)
+		iversym.vs_vers = 1;
+	      else
+		iversym.vs_vers = h->verinfo.vertree->vernum + 1;
+	      if (finfo->info->create_default_symver)
+		iversym.vs_vers++;
+	    }
+
+	  if (h->hidden)
+	    iversym.vs_vers |= VERSYM_HIDDEN;
+
+	  eversym = (Elf_External_Versym *) finfo->symver_sec->contents;
+	  eversym += h->dynindx;
+	  _bfd_elf_swap_versym_out (finfo->output_bfd, &iversym, eversym);
+	}
+    }
+
+  /* If we're stripping it, then it was just a dynamic symbol, and
+     there's nothing else to do.  */
+  if (strip || (input_sec->flags & SEC_EXCLUDE) != 0)
+    return TRUE;
+
+  indx = bfd_get_symcount (finfo->output_bfd);
+  ret = elf_link_output_sym (finfo, h->root.root.string, &sym, input_sec, h);
+  if (ret == 0)
+    {
+      eoinfo->failed = TRUE;
+      return FALSE;
+    }
+  else if (ret == 1)
+    h->indx = indx;
+  else if (h->indx == -2)
+    abort();
+
+  return TRUE;
+}
+
+/* Return TRUE if special handling is done for relocs in SEC against
+   symbols defined in discarded sections.  */
+
+static bfd_boolean
+elf_section_ignore_discarded_relocs (asection *sec)
+{
+  const struct elf_backend_data *bed;
+
+  switch (sec->sec_info_type)
+    {
+    case ELF_INFO_TYPE_STABS:
+    case ELF_INFO_TYPE_EH_FRAME:
+      return TRUE;
+    default:
+      break;
+    }
+
+  bed = get_elf_backend_data (sec->owner);
+  if (bed->elf_backend_ignore_discarded_relocs != NULL
+      && (*bed->elf_backend_ignore_discarded_relocs) (sec))
+    return TRUE;
+
+  return FALSE;
+}
+
+/* Return a mask saying how ld should treat relocations in SEC against
+   symbols defined in discarded sections.  If this function returns
+   COMPLAIN set, ld will issue a warning message.  If this function
+   returns PRETEND set, and the discarded section was link-once and the
+   same size as the kept link-once section, ld will pretend that the
+   symbol was actually defined in the kept section.  Otherwise ld will
+   zero the reloc (at least that is the intent, but some cooperation by
+   the target dependent code is needed, particularly for REL targets).  */
+
+unsigned int
+_bfd_elf_default_action_discarded (asection *sec)
+{
+  if (sec->flags & SEC_DEBUGGING)
+    return PRETEND;
+
+  if (strcmp (".eh_frame", sec->name) == 0)
+    return 0;
+
+  if (strcmp (".gcc_except_table", sec->name) == 0)
+    return 0;
+
+  return COMPLAIN | PRETEND;
+}
+
+/* Find a match between a section and a member of a section group.  */
+
+static asection *
+match_group_member (asection *sec, asection *group,
+		    struct bfd_link_info *info)
+{
+  asection *first = elf_next_in_group (group);
+  asection *s = first;
+
+  while (s != NULL)
+    {
+      if (bfd_elf_match_symbols_in_sections (s, sec, info))
+	return s;
+
+      s = elf_next_in_group (s);
+      if (s == first)
+	break;
+    }
+
+  return NULL;
+}
+
+/* Check if the kept section of a discarded section SEC can be used
+   to replace it.  Return the replacement if it is OK.  Otherwise return
+   NULL.  */
+
+asection *
+_bfd_elf_check_kept_section (asection *sec, struct bfd_link_info *info)
+{
+  asection *kept;
+
+  kept = sec->kept_section;
+  if (kept != NULL)
+    {
+      if ((kept->flags & SEC_GROUP) != 0)
+	kept = match_group_member (sec, kept, info);
+      if (kept != NULL
+	  && ((sec->rawsize != 0 ? sec->rawsize : sec->size)
+	      != (kept->rawsize != 0 ? kept->rawsize : kept->size)))
+	kept = NULL;
+      sec->kept_section = kept;
+    }
+  return kept;
+}
+
+/* Link an input file into the linker output file.  This function
+   handles all the sections and relocations of the input file at once.
+   This is so that we only have to read the local symbols once, and
+   don't have to keep them in memory.  */
+
+static bfd_boolean
+elf_link_input_bfd (struct elf_final_link_info *finfo, bfd *input_bfd)
+{
+  int (*relocate_section)
+    (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+     Elf_Internal_Rela *, Elf_Internal_Sym *, asection **);
+  bfd *output_bfd;
+  Elf_Internal_Shdr *symtab_hdr;
+  size_t locsymcount;
+  size_t extsymoff;
+  Elf_Internal_Sym *isymbuf;
+  Elf_Internal_Sym *isym;
+  Elf_Internal_Sym *isymend;
+  long *pindex;
+  asection **ppsection;
+  asection *o;
+  const struct elf_backend_data *bed;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_size_type address_size;
+  bfd_vma r_type_mask;
+  int r_sym_shift;
+
+  output_bfd = finfo->output_bfd;
+  bed = get_elf_backend_data (output_bfd);
+  relocate_section = bed->elf_backend_relocate_section;
+
+  /* If this is a dynamic object, we don't want to do anything here:
+     we don't want the local symbols, and we don't want the section
+     contents.  */
+  if ((input_bfd->flags & DYNAMIC) != 0)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  if (elf_bad_symtab (input_bfd))
+    {
+      locsymcount = symtab_hdr->sh_size / bed->s->sizeof_sym;
+      extsymoff = 0;
+    }
+  else
+    {
+      locsymcount = symtab_hdr->sh_info;
+      extsymoff = symtab_hdr->sh_info;
+    }
+
+  /* Read the local symbols.  */
+  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+  if (isymbuf == NULL && locsymcount != 0)
+    {
+      isymbuf = bfd_elf_get_elf_syms (input_bfd, symtab_hdr, locsymcount, 0,
+				      finfo->internal_syms,
+				      finfo->external_syms,
+				      finfo->locsym_shndx);
+      if (isymbuf == NULL)
+	return FALSE;
+    }
+
+  /* Find local symbol sections and adjust values of symbols in
+     SEC_MERGE sections.  Write out those local symbols we know are
+     going into the output file.  */
+  isymend = isymbuf + locsymcount;
+  for (isym = isymbuf, pindex = finfo->indices, ppsection = finfo->sections;
+       isym < isymend;
+       isym++, pindex++, ppsection++)
+    {
+      asection *isec;
+      const char *name;
+      Elf_Internal_Sym osym;
+      long indx;
+      int ret;
+
+      *pindex = -1;
+
+      if (elf_bad_symtab (input_bfd))
+	{
+	  if (ELF_ST_BIND (isym->st_info) != STB_LOCAL)
+	    {
+	      *ppsection = NULL;
+	      continue;
+	    }
+	}
+
+      if (isym->st_shndx == SHN_UNDEF)
+	isec = bfd_und_section_ptr;
+      else if (isym->st_shndx == SHN_ABS)
+	isec = bfd_abs_section_ptr;
+      else if (isym->st_shndx == SHN_COMMON)
+	isec = bfd_com_section_ptr;
+      else
+	{
+	  isec = bfd_section_from_elf_index (input_bfd, isym->st_shndx);
+	  if (isec == NULL)
+	    {
+	      /* Don't attempt to output symbols with st_shnx in the
+		 reserved range other than SHN_ABS and SHN_COMMON.  */
+	      *ppsection = NULL;
+	      continue;
+	    }
+	  else if (isec->sec_info_type == ELF_INFO_TYPE_MERGE
+		   && ELF_ST_TYPE (isym->st_info) != STT_SECTION)
+	    isym->st_value =
+	      _bfd_merged_section_offset (output_bfd, &isec,
+					  elf_section_data (isec)->sec_info,
+					  isym->st_value);
+	}
+
+      *ppsection = isec;
+
+      /* Don't output the first, undefined, symbol.  */
+      if (ppsection == finfo->sections)
+	continue;
+
+      if (ELF_ST_TYPE (isym->st_info) == STT_SECTION)
+	{
+	  /* We never output section symbols.  Instead, we use the
+	     section symbol of the corresponding section in the output
+	     file.  */
+	  continue;
+	}
+
+      /* If we are stripping all symbols, we don't want to output this
+	 one.  */
+      if (finfo->info->strip == strip_all)
+	continue;
+
+      /* If we are discarding all local symbols, we don't want to
+	 output this one.  If we are generating a relocatable output
+	 file, then some of the local symbols may be required by
+	 relocs; we output them below as we discover that they are
+	 needed.  */
+      if (finfo->info->discard == discard_all)
+	continue;
+
+      /* If this symbol is defined in a section which we are
+	 discarding, we don't need to keep it.  */
+      if (isym->st_shndx != SHN_UNDEF
+	  && isym->st_shndx < SHN_LORESERVE
+	  && bfd_section_removed_from_list (output_bfd,
+					    isec->output_section))
+	continue;
+
+      /* Get the name of the symbol.  */
+      name = bfd_elf_string_from_elf_section (input_bfd, symtab_hdr->sh_link,
+					      isym->st_name);
+      if (name == NULL)
+	return FALSE;
+
+      /* See if we are discarding symbols with this name.  */
+      if ((finfo->info->strip == strip_some
+	   && (bfd_hash_lookup (finfo->info->keep_hash, name, FALSE, FALSE)
+	       == NULL))
+	  || (((finfo->info->discard == discard_sec_merge
+		&& (isec->flags & SEC_MERGE) && ! finfo->info->relocatable)
+	       || finfo->info->discard == discard_l)
+	      && bfd_is_local_label_name (input_bfd, name)))
+	continue;
+
+      osym = *isym;
+
+      /* Adjust the section index for the output file.  */
+      osym.st_shndx = _bfd_elf_section_from_bfd_section (output_bfd,
+							 isec->output_section);
+      if (osym.st_shndx == SHN_BAD)
+	return FALSE;
+
+      /* ELF symbols in relocatable files are section relative, but
+	 in executable files they are virtual addresses.  Note that
+	 this code assumes that all ELF sections have an associated
+	 BFD section with a reasonable value for output_offset; below
+	 we assume that they also have a reasonable value for
+	 output_section.  Any special sections must be set up to meet
+	 these requirements.  */
+      osym.st_value += isec->output_offset;
+      if (! finfo->info->relocatable)
+	{
+	  osym.st_value += isec->output_section->vma;
+	  if (ELF_ST_TYPE (osym.st_info) == STT_TLS)
+	    {
+	      /* STT_TLS symbols are relative to PT_TLS segment base.  */
+	      BFD_ASSERT (elf_hash_table (finfo->info)->tls_sec != NULL);
+	      osym.st_value -= elf_hash_table (finfo->info)->tls_sec->vma;
+	    }
+	}
+
+      indx = bfd_get_symcount (output_bfd);
+      ret = elf_link_output_sym (finfo, name, &osym, isec, NULL);
+      if (ret == 0)
+	return FALSE;
+      else if (ret == 1)
+	*pindex = indx;
+    }
+
+  if (bed->s->arch_size == 32)
+    {
+      r_type_mask = 0xff;
+      r_sym_shift = 8;
+      address_size = 4;
+    }
+  else
+    {
+      r_type_mask = 0xffffffff;
+      r_sym_shift = 32;
+      address_size = 8;
+    }
+
+  /* Relocate the contents of each section.  */
+  sym_hashes = elf_sym_hashes (input_bfd);
+  for (o = input_bfd->sections; o != NULL; o = o->next)
+    {
+      bfd_byte *contents;
+
+      if (! o->linker_mark)
+	{
+	  /* This section was omitted from the link.  */
+	  continue;
+	}
+
+      if (finfo->info->relocatable
+	  && (o->flags & (SEC_LINKER_CREATED | SEC_GROUP)) == SEC_GROUP)
+	{
+	  /* Deal with the group signature symbol.  */
+	  struct bfd_elf_section_data *sec_data = elf_section_data (o);
+	  unsigned long symndx = sec_data->this_hdr.sh_info;
+	  asection *osec = o->output_section;
+
+	  if (symndx >= locsymcount
+	      || (elf_bad_symtab (input_bfd)
+		  && finfo->sections[symndx] == NULL))
+	    {
+	      struct elf_link_hash_entry *h = sym_hashes[symndx - extsymoff];
+	      while (h->root.type == bfd_link_hash_indirect
+		     || h->root.type == bfd_link_hash_warning)
+		h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	      /* Arrange for symbol to be output.  */
+	      h->indx = -2;
+	      elf_section_data (osec)->this_hdr.sh_info = -2;
+	    }
+	  else if (ELF_ST_TYPE (isymbuf[symndx].st_info) == STT_SECTION)
+	    {
+	      /* We'll use the output section target_index.  */
+	      asection *sec = finfo->sections[symndx]->output_section;
+	      elf_section_data (osec)->this_hdr.sh_info = sec->target_index;
+	    }
+	  else
+	    {
+	      if (finfo->indices[symndx] == -1)
+		{
+		  /* Otherwise output the local symbol now.  */
+		  Elf_Internal_Sym sym = isymbuf[symndx];
+		  asection *sec = finfo->sections[symndx]->output_section;
+		  const char *name;
+		  long indx;
+		  int ret;
+
+		  name = bfd_elf_string_from_elf_section (input_bfd,
+							  symtab_hdr->sh_link,
+							  sym.st_name);
+		  if (name == NULL)
+		    return FALSE;
+
+		  sym.st_shndx = _bfd_elf_section_from_bfd_section (output_bfd,
+								    sec);
+		  if (sym.st_shndx == SHN_BAD)
+		    return FALSE;
+
+		  sym.st_value += o->output_offset;
+
+		  indx = bfd_get_symcount (output_bfd);
+		  ret = elf_link_output_sym (finfo, name, &sym, o, NULL);
+		  if (ret == 0)
+		    return FALSE;
+		  else if (ret == 1)
+		    finfo->indices[symndx] = indx;
+		  else
+		    abort ();
+		}
+	      elf_section_data (osec)->this_hdr.sh_info
+		= finfo->indices[symndx];
+	    }
+	}
+
+      if ((o->flags & SEC_HAS_CONTENTS) == 0
+	  || (o->size == 0 && (o->flags & SEC_RELOC) == 0))
+	continue;
+
+      if ((o->flags & SEC_LINKER_CREATED) != 0)
+	{
+	  /* Section was created by _bfd_elf_link_create_dynamic_sections
+	     or somesuch.  */
+	  continue;
+	}
+
+      /* Get the contents of the section.  They have been cached by a
+	 relaxation routine.  Note that o is a section in an input
+	 file, so the contents field will not have been set by any of
+	 the routines which work on output files.  */
+      if (elf_section_data (o)->this_hdr.contents != NULL)
+	contents = elf_section_data (o)->this_hdr.contents;
+      else
+	{
+	  contents = finfo->contents;
+	  if (! bfd_get_full_section_contents (input_bfd, o, &contents))
+	    return FALSE;
+	}
+
+      if ((o->flags & SEC_RELOC) != 0)
+	{
+	  Elf_Internal_Rela *internal_relocs;
+	  Elf_Internal_Rela *rel, *relend;
+	  int action_discarded;
+	  int ret;
+
+	  /* Get the swapped relocs.  */
+	  internal_relocs
+	    = _bfd_elf_link_read_relocs (input_bfd, o, finfo->external_relocs,
+					 finfo->internal_relocs, FALSE);
+	  if (internal_relocs == NULL
+	      && o->reloc_count > 0)
+	    return FALSE;
+
+	  /* We need to reverse-copy input .ctors/.dtors sections if
+	     they are placed in .init_array/.finit_array for output.  */
+	  if (o->size > address_size
+	      && ((strncmp (o->name, ".ctors", 6) == 0
+		   && strcmp (o->output_section->name,
+			      ".init_array") == 0)
+		  || (strncmp (o->name, ".dtors", 6) == 0
+		      && strcmp (o->output_section->name,
+				 ".fini_array") == 0))
+	      && (o->name[6] == 0 || o->name[6] == '.'))
+	    {
+	      if (o->size != o->reloc_count * address_size)
+		{
+		  (*_bfd_error_handler)
+		    (_("error: %B: size of section %A is not "
+		       "multiple of address size"),
+		     input_bfd, o);
+		  bfd_set_error (bfd_error_on_input);
+		  return FALSE;
+		}
+	      o->flags |= SEC_ELF_REVERSE_COPY;
+	    }
+
+	  action_discarded = -1;
+	  if (!elf_section_ignore_discarded_relocs (o))
+	    action_discarded = (*bed->action_discarded) (o);
+
+	  /* Run through the relocs evaluating complex reloc symbols and
+	     looking for relocs against symbols from discarded sections
+	     or section symbols from removed link-once sections.
+	     Complain about relocs against discarded sections.  Zero
+	     relocs against removed link-once sections.  */
+
+	  rel = internal_relocs;
+	  relend = rel + o->reloc_count * bed->s->int_rels_per_ext_rel;
+	  for ( ; rel < relend; rel++)
+	    {
+	      unsigned long r_symndx = rel->r_info >> r_sym_shift;
+	      unsigned int s_type;
+	      asection **ps, *sec;
+	      struct elf_link_hash_entry *h = NULL;
+	      const char *sym_name;
+
+	      if (r_symndx == STN_UNDEF)
+		continue;
+
+	      if (r_symndx >= locsymcount
+		  || (elf_bad_symtab (input_bfd)
+		      && finfo->sections[r_symndx] == NULL))
+		{
+		  h = sym_hashes[r_symndx - extsymoff];
+
+		  /* Badly formatted input files can contain relocs that
+		     reference non-existant symbols.  Check here so that
+		     we do not seg fault.  */
+		  if (h == NULL)
+		    {
+		      char buffer [32];
+
+		      sprintf_vma (buffer, rel->r_info);
+		      (*_bfd_error_handler)
+			(_("error: %B contains a reloc (0x%s) for section %A "
+			   "that references a non-existent global symbol"),
+			 input_bfd, o, buffer);
+		      bfd_set_error (bfd_error_bad_value);
+		      return FALSE;
+		    }
+
+		  while (h->root.type == bfd_link_hash_indirect
+			 || h->root.type == bfd_link_hash_warning)
+		    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+		  s_type = h->type;
+
+		  ps = NULL;
+		  if (h->root.type == bfd_link_hash_defined
+		      || h->root.type == bfd_link_hash_defweak)
+		    ps = &h->root.u.def.section;
+
+		  sym_name = h->root.root.string;
+		}
+	      else
+		{
+		  Elf_Internal_Sym *sym = isymbuf + r_symndx;
+
+		  s_type = ELF_ST_TYPE (sym->st_info);
+		  ps = &finfo->sections[r_symndx];
+		  sym_name = bfd_elf_sym_name (input_bfd, symtab_hdr,
+					       sym, *ps);
+		}
+
+	      if ((s_type == STT_RELC || s_type == STT_SRELC)
+		  && !finfo->info->relocatable)
+		{
+		  bfd_vma val;
+		  bfd_vma dot = (rel->r_offset
+				 + o->output_offset + o->output_section->vma);
+#ifdef DEBUG
+		  printf ("Encountered a complex symbol!");
+		  printf (" (input_bfd %s, section %s, reloc %ld\n",
+			  input_bfd->filename, o->name,
+			  (long) (rel - internal_relocs));
+		  printf (" symbol: idx  %8.8lx, name %s\n",
+			  r_symndx, sym_name);
+		  printf (" reloc : info %8.8lx, addr %8.8lx\n",
+			  (unsigned long) rel->r_info,
+			  (unsigned long) rel->r_offset);
+#endif
+		  if (!eval_symbol (&val, &sym_name, input_bfd, finfo, dot,
+				    isymbuf, locsymcount, s_type == STT_SRELC))
+		    return FALSE;
+
+		  /* Symbol evaluated OK.  Update to absolute value.  */
+		  set_symbol_value (input_bfd, isymbuf, locsymcount,
+				    r_symndx, val);
+		  continue;
+		}
+
+	      if (action_discarded != -1 && ps != NULL)
+		{
+		  /* Complain if the definition comes from a
+		     discarded section.  */
+		  if ((sec = *ps) != NULL && elf_discarded_section (sec))
+		    {
+		      BFD_ASSERT (r_symndx != STN_UNDEF);
+		      if (action_discarded & COMPLAIN)
+			(*finfo->info->callbacks->einfo)
+			  (_("%X`%s' referenced in section `%A' of %B: "
+			     "defined in discarded section `%A' of %B\n"),
+			   sym_name, o, input_bfd, sec, sec->owner);
+
+		      /* Try to do the best we can to support buggy old
+			 versions of gcc.  Pretend that the symbol is
+			 really defined in the kept linkonce section.
+			 FIXME: This is quite broken.  Modifying the
+			 symbol here means we will be changing all later
+			 uses of the symbol, not just in this section.  */
+		      if (action_discarded & PRETEND)
+			{
+			  asection *kept;
+
+			  kept = _bfd_elf_check_kept_section (sec,
+							      finfo->info);
+			  if (kept != NULL)
+			    {
+			      *ps = kept;
+			      continue;
+			    }
+			}
+		    }
+		}
+	    }
+
+	  /* Relocate the section by invoking a back end routine.
+
+	     The back end routine is responsible for adjusting the
+	     section contents as necessary, and (if using Rela relocs
+	     and generating a relocatable output file) adjusting the
+	     reloc addend as necessary.
+
+	     The back end routine does not have to worry about setting
+	     the reloc address or the reloc symbol index.
+
+	     The back end routine is given a pointer to the swapped in
+	     internal symbols, and can access the hash table entries
+	     for the external symbols via elf_sym_hashes (input_bfd).
+
+	     When generating relocatable output, the back end routine
+	     must handle STB_LOCAL/STT_SECTION symbols specially.  The
+	     output symbol is going to be a section symbol
+	     corresponding to the output section, which will require
+	     the addend to be adjusted.  */
+
+	  ret = (*relocate_section) (output_bfd, finfo->info,
+				     input_bfd, o, contents,
+				     internal_relocs,
+				     isymbuf,
+				     finfo->sections);
+	  if (!ret)
+	    return FALSE;
+
+	  if (ret == 2
+	      || finfo->info->relocatable
+	      || finfo->info->emitrelocations)
+	    {
+	      Elf_Internal_Rela *irela;
+	      Elf_Internal_Rela *irelaend, *irelamid;
+	      bfd_vma last_offset;
+	      struct elf_link_hash_entry **rel_hash;
+	      struct elf_link_hash_entry **rel_hash_list, **rela_hash_list;
+	      Elf_Internal_Shdr *input_rel_hdr, *input_rela_hdr;
+	      unsigned int next_erel;
+	      bfd_boolean rela_normal;
+	      struct bfd_elf_section_data *esdi, *esdo;
+
+	      esdi = elf_section_data (o);
+	      esdo = elf_section_data (o->output_section);
+	      rela_normal = FALSE;
+
+	      /* Adjust the reloc addresses and symbol indices.  */
+
+	      irela = internal_relocs;
+	      irelaend = irela + o->reloc_count * bed->s->int_rels_per_ext_rel;
+	      rel_hash = esdo->rel.hashes + esdo->rel.count;
+	      /* We start processing the REL relocs, if any.  When we reach
+		 IRELAMID in the loop, we switch to the RELA relocs.  */
+	      irelamid = irela;
+	      if (esdi->rel.hdr != NULL)
+		irelamid += (NUM_SHDR_ENTRIES (esdi->rel.hdr)
+			     * bed->s->int_rels_per_ext_rel);
+	      rel_hash_list = rel_hash;
+	      rela_hash_list = NULL;
+	      last_offset = o->output_offset;
+	      if (!finfo->info->relocatable)
+		last_offset += o->output_section->vma;
+	      for (next_erel = 0; irela < irelaend; irela++, next_erel++)
+		{
+		  unsigned long r_symndx;
+		  asection *sec;
+		  Elf_Internal_Sym sym;
+
+		  if (next_erel == bed->s->int_rels_per_ext_rel)
+		    {
+		      rel_hash++;
+		      next_erel = 0;
+		    }
+
+		  if (irela == irelamid)
+		    {
+		      rel_hash = esdo->rela.hashes + esdo->rela.count;
+		      rela_hash_list = rel_hash;
+		      rela_normal = bed->rela_normal;
+		    }
+
+		  irela->r_offset = _bfd_elf_section_offset (output_bfd,
+							     finfo->info, o,
+							     irela->r_offset);
+		  if (irela->r_offset >= (bfd_vma) -2)
+		    {
+		      /* This is a reloc for a deleted entry or somesuch.
+			 Turn it into an R_*_NONE reloc, at the same
+			 offset as the last reloc.  elf_eh_frame.c and
+			 bfd_elf_discard_info rely on reloc offsets
+			 being ordered.  */
+		      irela->r_offset = last_offset;
+		      irela->r_info = 0;
+		      irela->r_addend = 0;
+		      continue;
+		    }
+
+		  irela->r_offset += o->output_offset;
+
+		  /* Relocs in an executable have to be virtual addresses.  */
+		  if (!finfo->info->relocatable)
+		    irela->r_offset += o->output_section->vma;
+
+		  last_offset = irela->r_offset;
+
+		  r_symndx = irela->r_info >> r_sym_shift;
+		  if (r_symndx == STN_UNDEF)
+		    continue;
+
+		  if (r_symndx >= locsymcount
+		      || (elf_bad_symtab (input_bfd)
+			  && finfo->sections[r_symndx] == NULL))
+		    {
+		      struct elf_link_hash_entry *rh;
+		      unsigned long indx;
+
+		      /* This is a reloc against a global symbol.  We
+			 have not yet output all the local symbols, so
+			 we do not know the symbol index of any global
+			 symbol.  We set the rel_hash entry for this
+			 reloc to point to the global hash table entry
+			 for this symbol.  The symbol index is then
+			 set at the end of bfd_elf_final_link.  */
+		      indx = r_symndx - extsymoff;
+		      rh = elf_sym_hashes (input_bfd)[indx];
+		      while (rh->root.type == bfd_link_hash_indirect
+			     || rh->root.type == bfd_link_hash_warning)
+			rh = (struct elf_link_hash_entry *) rh->root.u.i.link;
+
+		      /* Setting the index to -2 tells
+			 elf_link_output_extsym that this symbol is
+			 used by a reloc.  */
+		      BFD_ASSERT (rh->indx < 0);
+		      rh->indx = -2;
+
+		      *rel_hash = rh;
+
+		      continue;
+		    }
+
+		  /* This is a reloc against a local symbol.  */
+
+		  *rel_hash = NULL;
+		  sym = isymbuf[r_symndx];
+		  sec = finfo->sections[r_symndx];
+		  if (ELF_ST_TYPE (sym.st_info) == STT_SECTION)
+		    {
+		      /* I suppose the backend ought to fill in the
+			 section of any STT_SECTION symbol against a
+			 processor specific section.  */
+		      r_symndx = STN_UNDEF;
+		      if (bfd_is_abs_section (sec))
+			;
+		      else if (sec == NULL || sec->owner == NULL)
+			{
+			  bfd_set_error (bfd_error_bad_value);
+			  return FALSE;
+			}
+		      else
+			{
+			  asection *osec = sec->output_section;
+
+			  /* If we have discarded a section, the output
+			     section will be the absolute section.  In
+			     case of discarded SEC_MERGE sections, use
+			     the kept section.  relocate_section should
+			     have already handled discarded linkonce
+			     sections.  */
+			  if (bfd_is_abs_section (osec)
+			      && sec->kept_section != NULL
+			      && sec->kept_section->output_section != NULL)
+			    {
+			      osec = sec->kept_section->output_section;
+			      irela->r_addend -= osec->vma;
+			    }
+
+			  if (!bfd_is_abs_section (osec))
+			    {
+			      r_symndx = osec->target_index;
+			      if (r_symndx == STN_UNDEF)
+				{
+				  struct elf_link_hash_table *htab;
+				  asection *oi;
+
+				  htab = elf_hash_table (finfo->info);
+				  oi = htab->text_index_section;
+				  if ((osec->flags & SEC_READONLY) == 0
+				      && htab->data_index_section != NULL)
+				    oi = htab->data_index_section;
+
+				  if (oi != NULL)
+				    {
+				      irela->r_addend += osec->vma - oi->vma;
+				      r_symndx = oi->target_index;
+				    }
+				}
+
+			      BFD_ASSERT (r_symndx != STN_UNDEF);
+			    }
+			}
+
+		      /* Adjust the addend according to where the
+			 section winds up in the output section.  */
+		      if (rela_normal)
+			irela->r_addend += sec->output_offset;
+		    }
+		  else
+		    {
+		      if (finfo->indices[r_symndx] == -1)
+			{
+			  unsigned long shlink;
+			  const char *name;
+			  asection *osec;
+			  long indx;
+
+			  if (finfo->info->strip == strip_all)
+			    {
+			      /* You can't do ld -r -s.  */
+			      bfd_set_error (bfd_error_invalid_operation);
+			      return FALSE;
+			    }
+
+			  /* This symbol was skipped earlier, but
+			     since it is needed by a reloc, we
+			     must output it now.  */
+			  shlink = symtab_hdr->sh_link;
+			  name = (bfd_elf_string_from_elf_section
+				  (input_bfd, shlink, sym.st_name));
+			  if (name == NULL)
+			    return FALSE;
+
+			  osec = sec->output_section;
+			  sym.st_shndx =
+			    _bfd_elf_section_from_bfd_section (output_bfd,
+							       osec);
+			  if (sym.st_shndx == SHN_BAD)
+			    return FALSE;
+
+			  sym.st_value += sec->output_offset;
+			  if (! finfo->info->relocatable)
+			    {
+			      sym.st_value += osec->vma;
+			      if (ELF_ST_TYPE (sym.st_info) == STT_TLS)
+				{
+				  /* STT_TLS symbols are relative to PT_TLS
+				     segment base.  */
+				  BFD_ASSERT (elf_hash_table (finfo->info)
+					      ->tls_sec != NULL);
+				  sym.st_value -= (elf_hash_table (finfo->info)
+						   ->tls_sec->vma);
+				}
+			    }
+
+			  indx = bfd_get_symcount (output_bfd);
+			  ret = elf_link_output_sym (finfo, name, &sym, sec,
+						     NULL);
+			  if (ret == 0)
+			    return FALSE;
+			  else if (ret == 1)
+			    finfo->indices[r_symndx] = indx;
+			  else
+			    abort ();
+			}
+
+		      r_symndx = finfo->indices[r_symndx];
+		    }
+
+		  irela->r_info = ((bfd_vma) r_symndx << r_sym_shift
+				   | (irela->r_info & r_type_mask));
+		}
+
+	      /* Swap out the relocs.  */
+	      input_rel_hdr = esdi->rel.hdr;
+	      if (input_rel_hdr && input_rel_hdr->sh_size != 0)
+		{
+		  if (!bed->elf_backend_emit_relocs (output_bfd, o,
+						     input_rel_hdr,
+						     internal_relocs,
+						     rel_hash_list))
+		    return FALSE;
+		  internal_relocs += (NUM_SHDR_ENTRIES (input_rel_hdr)
+				      * bed->s->int_rels_per_ext_rel);
+		  rel_hash_list += NUM_SHDR_ENTRIES (input_rel_hdr);
+		}
+
+	      input_rela_hdr = esdi->rela.hdr;
+	      if (input_rela_hdr && input_rela_hdr->sh_size != 0)
+		{
+		  if (!bed->elf_backend_emit_relocs (output_bfd, o,
+						     input_rela_hdr,
+						     internal_relocs,
+						     rela_hash_list))
+		    return FALSE;
+		}
+	    }
+	}
+
+      /* Write out the modified section contents.  */
+      if (bed->elf_backend_write_section
+	  && (*bed->elf_backend_write_section) (output_bfd, finfo->info, o,
+						contents))
+	{
+	  /* Section written out.  */
+	}
+      else switch (o->sec_info_type)
+	{
+	case ELF_INFO_TYPE_STABS:
+	  if (! (_bfd_write_section_stabs
+		 (output_bfd,
+		  &elf_hash_table (finfo->info)->stab_info,
+		  o, &elf_section_data (o)->sec_info, contents)))
+	    return FALSE;
+	  break;
+	case ELF_INFO_TYPE_MERGE:
+	  if (! _bfd_write_merged_section (output_bfd, o,
+					   elf_section_data (o)->sec_info))
+	    return FALSE;
+	  break;
+	case ELF_INFO_TYPE_EH_FRAME:
+	  {
+	    if (! _bfd_elf_write_section_eh_frame (output_bfd, finfo->info,
+						   o, contents))
+	      return FALSE;
+	  }
+	  break;
+	default:
+	  {
+	    /* FIXME: octets_per_byte.  */
+	    if (! (o->flags & SEC_EXCLUDE))
+	      {
+		file_ptr offset = (file_ptr) o->output_offset;
+		bfd_size_type todo = o->size;
+		if ((o->flags & SEC_ELF_REVERSE_COPY))
+		  {
+		    /* Reverse-copy input section to output.  */
+		    do
+		      {
+			todo -= address_size;
+			if (! bfd_set_section_contents (output_bfd,
+							o->output_section,
+							contents + todo,
+							offset,
+							address_size))
+			  return FALSE;
+			if (todo == 0)
+			  break;
+			offset += address_size;
+		      }
+		    while (1);
+		  }
+		else if (! bfd_set_section_contents (output_bfd,
+						     o->output_section,
+						     contents,
+						     offset, todo))
+		  return FALSE;
+	      }
+	  }
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Generate a reloc when linking an ELF file.  This is a reloc
+   requested by the linker, and does not come from any input file.  This
+   is used to build constructor and destructor tables when linking
+   with -Ur.  */
+
+static bfd_boolean
+elf_reloc_link_order (bfd *output_bfd,
+		      struct bfd_link_info *info,
+		      asection *output_section,
+		      struct bfd_link_order *link_order)
+{
+  reloc_howto_type *howto;
+  long indx;
+  bfd_vma offset;
+  bfd_vma addend;
+  struct bfd_elf_section_reloc_data *reldata;
+  struct elf_link_hash_entry **rel_hash_ptr;
+  Elf_Internal_Shdr *rel_hdr;
+  const struct elf_backend_data *bed = get_elf_backend_data (output_bfd);
+  Elf_Internal_Rela irel[MAX_INT_RELS_PER_EXT_REL];
+  bfd_byte *erel;
+  unsigned int i;
+  struct bfd_elf_section_data *esdo = elf_section_data (output_section);
+
+  howto = bfd_reloc_type_lookup (output_bfd, link_order->u.reloc.p->reloc);
+  if (howto == NULL)
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  addend = link_order->u.reloc.p->addend;
+
+  if (esdo->rel.hdr)
+    reldata = &esdo->rel;
+  else if (esdo->rela.hdr)
+    reldata = &esdo->rela;
+  else
+    {
+      reldata = NULL;
+      BFD_ASSERT (0);
+    }
+
+  /* Figure out the symbol index.  */
+  rel_hash_ptr = reldata->hashes + reldata->count;
+  if (link_order->type == bfd_section_reloc_link_order)
+    {
+      indx = link_order->u.reloc.p->u.section->target_index;
+      BFD_ASSERT (indx != 0);
+      *rel_hash_ptr = NULL;
+    }
+  else
+    {
+      struct elf_link_hash_entry *h;
+
+      /* Treat a reloc against a defined symbol as though it were
+	 actually against the section.  */
+      h = ((struct elf_link_hash_entry *)
+	   bfd_wrapped_link_hash_lookup (output_bfd, info,
+					 link_order->u.reloc.p->u.name,
+					 FALSE, FALSE, TRUE));
+      if (h != NULL
+	  && (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak))
+	{
+	  asection *section;
+
+	  section = h->root.u.def.section;
+	  indx = section->output_section->target_index;
+	  *rel_hash_ptr = NULL;
+	  /* It seems that we ought to add the symbol value to the
+	     addend here, but in practice it has already been added
+	     because it was passed to constructor_callback.  */
+	  addend += section->output_section->vma + section->output_offset;
+	}
+      else if (h != NULL)
+	{
+	  /* Setting the index to -2 tells elf_link_output_extsym that
+	     this symbol is used by a reloc.  */
+	  h->indx = -2;
+	  *rel_hash_ptr = h;
+	  indx = 0;
+	}
+      else
+	{
+	  if (! ((*info->callbacks->unattached_reloc)
+		 (info, link_order->u.reloc.p->u.name, NULL, NULL, 0)))
+	    return FALSE;
+	  indx = 0;
+	}
+    }
+
+  /* If this is an inplace reloc, we must write the addend into the
+     object file.  */
+  if (howto->partial_inplace && addend != 0)
+    {
+      bfd_size_type size;
+      bfd_reloc_status_type rstat;
+      bfd_byte *buf;
+      bfd_boolean ok;
+      const char *sym_name;
+
+      size = (bfd_size_type) bfd_get_reloc_size (howto);
+      buf = (bfd_byte *) bfd_zmalloc (size);
+      if (buf == NULL)
+	return FALSE;
+      rstat = _bfd_relocate_contents (howto, output_bfd, addend, buf);
+      switch (rstat)
+	{
+	case bfd_reloc_ok:
+	  break;
+
+	default:
+	case bfd_reloc_outofrange:
+	  abort ();
+
+	case bfd_reloc_overflow:
+	  if (link_order->type == bfd_section_reloc_link_order)
+	    sym_name = bfd_section_name (output_bfd,
+					 link_order->u.reloc.p->u.section);
+	  else
+	    sym_name = link_order->u.reloc.p->u.name;
+	  if (! ((*info->callbacks->reloc_overflow)
+		 (info, NULL, sym_name, howto->name, addend, NULL,
+		  NULL, (bfd_vma) 0)))
+	    {
+	      free (buf);
+	      return FALSE;
+	    }
+	  break;
+	}
+      ok = bfd_set_section_contents (output_bfd, output_section, buf,
+				     link_order->offset, size);
+      free (buf);
+      if (! ok)
+	return FALSE;
+    }
+
+  /* The address of a reloc is relative to the section in a
+     relocatable file, and is a virtual address in an executable
+     file.  */
+  offset = link_order->offset;
+  if (! info->relocatable)
+    offset += output_section->vma;
+
+  for (i = 0; i < bed->s->int_rels_per_ext_rel; i++)
+    {
+      irel[i].r_offset = offset;
+      irel[i].r_info = 0;
+      irel[i].r_addend = 0;
+    }
+  if (bed->s->arch_size == 32)
+    irel[0].r_info = ELF32_R_INFO (indx, howto->type);
+  else
+    irel[0].r_info = ELF64_R_INFO (indx, howto->type);
+
+  rel_hdr = reldata->hdr;
+  erel = rel_hdr->contents;
+  if (rel_hdr->sh_type == SHT_REL)
+    {
+      erel += reldata->count * bed->s->sizeof_rel;
+      (*bed->s->swap_reloc_out) (output_bfd, irel, erel);
+    }
+  else
+    {
+      irel[0].r_addend = addend;
+      erel += reldata->count * bed->s->sizeof_rela;
+      (*bed->s->swap_reloca_out) (output_bfd, irel, erel);
+    }
+
+  ++reldata->count;
+
+  return TRUE;
+}
+
+
+/* Get the output vma of the section pointed to by the sh_link field.  */
+
+static bfd_vma
+elf_get_linked_section_vma (struct bfd_link_order *p)
+{
+  Elf_Internal_Shdr **elf_shdrp;
+  asection *s;
+  int elfsec;
+
+  s = p->u.indirect.section;
+  elf_shdrp = elf_elfsections (s->owner);
+  elfsec = _bfd_elf_section_from_bfd_section (s->owner, s);
+  elfsec = elf_shdrp[elfsec]->sh_link;
+  /* PR 290:
+     The Intel C compiler generates SHT_IA_64_UNWIND with
+     SHF_LINK_ORDER.  But it doesn't set the sh_link or
+     sh_info fields.  Hence we could get the situation
+     where elfsec is 0.  */
+  if (elfsec == 0)
+    {
+      const struct elf_backend_data *bed
+	= get_elf_backend_data (s->owner);
+      if (bed->link_order_error_handler)
+	bed->link_order_error_handler
+	  (_("%B: warning: sh_link not set for section `%A'"), s->owner, s);
+      return 0;
+    }
+  else
+    {
+      s = elf_shdrp[elfsec]->bfd_section;
+      return s->output_section->vma + s->output_offset;
+    }
+}
+
+
+/* Compare two sections based on the locations of the sections they are
+   linked to.  Used by elf_fixup_link_order.  */
+
+static int
+compare_link_order (const void * a, const void * b)
+{
+  bfd_vma apos;
+  bfd_vma bpos;
+
+  apos = elf_get_linked_section_vma (*(struct bfd_link_order **)a);
+  bpos = elf_get_linked_section_vma (*(struct bfd_link_order **)b);
+  if (apos < bpos)
+    return -1;
+  return apos > bpos;
+}
+
+
+/* Looks for sections with SHF_LINK_ORDER set.  Rearranges them into the same
+   order as their linked sections.  Returns false if this could not be done
+   because an output section includes both ordered and unordered
+   sections.  Ideally we'd do this in the linker proper.  */
+
+static bfd_boolean
+elf_fixup_link_order (bfd *abfd, asection *o)
+{
+  int seen_linkorder;
+  int seen_other;
+  int n;
+  struct bfd_link_order *p;
+  bfd *sub;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  unsigned elfsec;
+  struct bfd_link_order **sections;
+  asection *s, *other_sec, *linkorder_sec;
+  bfd_vma offset;
+
+  other_sec = NULL;
+  linkorder_sec = NULL;
+  seen_other = 0;
+  seen_linkorder = 0;
+  for (p = o->map_head.link_order; p != NULL; p = p->next)
+    {
+      if (p->type == bfd_indirect_link_order)
+	{
+	  s = p->u.indirect.section;
+	  sub = s->owner;
+	  if (bfd_get_flavour (sub) == bfd_target_elf_flavour
+	      && elf_elfheader (sub)->e_ident[EI_CLASS] == bed->s->elfclass
+	      && (elfsec = _bfd_elf_section_from_bfd_section (sub, s))
+	      && elfsec < elf_numsections (sub)
+	      && elf_elfsections (sub)[elfsec]->sh_flags & SHF_LINK_ORDER
+	      && elf_elfsections (sub)[elfsec]->sh_link < elf_numsections (sub))
+	    {
+	      seen_linkorder++;
+	      linkorder_sec = s;
+	    }
+	  else
+	    {
+	      seen_other++;
+	      other_sec = s;
+	    }
+	}
+      else
+	seen_other++;
+
+      if (seen_other && seen_linkorder)
+	{
+	  if (other_sec && linkorder_sec)
+	    (*_bfd_error_handler) (_("%A has both ordered [`%A' in %B] and unordered [`%A' in %B] sections"),
+				   o, linkorder_sec,
+				   linkorder_sec->owner, other_sec,
+				   other_sec->owner);
+	  else
+	    (*_bfd_error_handler) (_("%A has both ordered and unordered sections"),
+				   o);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+    }
+
+  if (!seen_linkorder)
+    return TRUE;
+
+  sections = (struct bfd_link_order **)
+    bfd_malloc (seen_linkorder * sizeof (struct bfd_link_order *));
+  if (sections == NULL)
+    return FALSE;
+  seen_linkorder = 0;
+
+  for (p = o->map_head.link_order; p != NULL; p = p->next)
+    {
+      sections[seen_linkorder++] = p;
+    }
+  /* Sort the input sections in the order of their linked section.  */
+  qsort (sections, seen_linkorder, sizeof (struct bfd_link_order *),
+	 compare_link_order);
+
+  /* Change the offsets of the sections.  */
+  offset = 0;
+  for (n = 0; n < seen_linkorder; n++)
+    {
+      s = sections[n]->u.indirect.section;
+      offset &= ~(bfd_vma) 0 << s->alignment_power;
+      s->output_offset = offset;
+      sections[n]->offset = offset;
+      /* FIXME: octets_per_byte.  */
+      offset += sections[n]->size;
+    }
+
+  free (sections);
+  return TRUE;
+}
+
+
+/* Do the final step of an ELF link.  */
+
+bfd_boolean
+bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info)
+{
+  bfd_boolean dynamic;
+  bfd_boolean emit_relocs;
+  bfd *dynobj;
+  struct elf_final_link_info finfo;
+  asection *o;
+  struct bfd_link_order *p;
+  bfd *sub;
+  bfd_size_type max_contents_size;
+  bfd_size_type max_external_reloc_size;
+  bfd_size_type max_internal_reloc_count;
+  bfd_size_type max_sym_count;
+  bfd_size_type max_sym_shndx_count;
+  file_ptr off;
+  Elf_Internal_Sym elfsym;
+  unsigned int i;
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Shdr *symtab_shndx_hdr;
+  Elf_Internal_Shdr *symstrtab_hdr;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  struct elf_outext_info eoinfo;
+  bfd_boolean merged;
+  size_t relativecount = 0;
+  asection *reldyn = 0;
+  bfd_size_type amt;
+  asection *attr_section = NULL;
+  bfd_vma attr_size = 0;
+  const char *std_attrs_section;
+
+  if (! is_elf_hash_table (info->hash))
+    return FALSE;
+
+  if (info->shared)
+    abfd->flags |= DYNAMIC;
+
+  dynamic = elf_hash_table (info)->dynamic_sections_created;
+  dynobj = elf_hash_table (info)->dynobj;
+
+  emit_relocs = (info->relocatable
+		 || info->emitrelocations);
+
+  finfo.info = info;
+  finfo.output_bfd = abfd;
+  finfo.symstrtab = _bfd_elf_stringtab_init ();
+  if (finfo.symstrtab == NULL)
+    return FALSE;
+
+  if (! dynamic)
+    {
+      finfo.dynsym_sec = NULL;
+      finfo.hash_sec = NULL;
+      finfo.symver_sec = NULL;
+    }
+  else
+    {
+      finfo.dynsym_sec = bfd_get_section_by_name (dynobj, ".dynsym");
+      finfo.hash_sec = bfd_get_section_by_name (dynobj, ".hash");
+      BFD_ASSERT (finfo.dynsym_sec != NULL);
+      finfo.symver_sec = bfd_get_section_by_name (dynobj, ".gnu.version");
+      /* Note that it is OK if symver_sec is NULL.  */
+    }
+
+  finfo.contents = NULL;
+  finfo.external_relocs = NULL;
+  finfo.internal_relocs = NULL;
+  finfo.external_syms = NULL;
+  finfo.locsym_shndx = NULL;
+  finfo.internal_syms = NULL;
+  finfo.indices = NULL;
+  finfo.sections = NULL;
+  finfo.symbuf = NULL;
+  finfo.symshndxbuf = NULL;
+  finfo.symbuf_count = 0;
+  finfo.shndxbuf_size = 0;
+
+  /* The object attributes have been merged.  Remove the input
+     sections from the link, and set the contents of the output
+     secton.  */
+  std_attrs_section = get_elf_backend_data (abfd)->obj_attrs_section;
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      if ((std_attrs_section && strcmp (o->name, std_attrs_section) == 0)
+	  || strcmp (o->name, ".gnu.attributes") == 0)
+	{
+	  for (p = o->map_head.link_order; p != NULL; p = p->next)
+	    {
+	      asection *input_section;
+
+	      if (p->type != bfd_indirect_link_order)
+		continue;
+	      input_section = p->u.indirect.section;
+	      /* Hack: reset the SEC_HAS_CONTENTS flag so that
+		 elf_link_input_bfd ignores this section.  */
+	      input_section->flags &= ~SEC_HAS_CONTENTS;
+	    }
+
+	  attr_size = bfd_elf_obj_attr_size (abfd);
+	  if (attr_size)
+	    {
+	      bfd_set_section_size (abfd, o, attr_size);
+	      attr_section = o;
+	      /* Skip this section later on.  */
+	      o->map_head.link_order = NULL;
+	    }
+	  else
+	    o->flags |= SEC_EXCLUDE;
+	}
+    }
+
+  /* Count up the number of relocations we will output for each output
+     section, so that we know the sizes of the reloc sections.  We
+     also figure out some maximum sizes.  */
+  max_contents_size = 0;
+  max_external_reloc_size = 0;
+  max_internal_reloc_count = 0;
+  max_sym_count = 0;
+  max_sym_shndx_count = 0;
+  merged = FALSE;
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      struct bfd_elf_section_data *esdo = elf_section_data (o);
+      o->reloc_count = 0;
+
+      for (p = o->map_head.link_order; p != NULL; p = p->next)
+	{
+	  unsigned int reloc_count = 0;
+	  struct bfd_elf_section_data *esdi = NULL;
+
+	  if (p->type == bfd_section_reloc_link_order
+	      || p->type == bfd_symbol_reloc_link_order)
+	    reloc_count = 1;
+	  else if (p->type == bfd_indirect_link_order)
+	    {
+	      asection *sec;
+
+	      sec = p->u.indirect.section;
+	      esdi = elf_section_data (sec);
+
+	      /* Mark all sections which are to be included in the
+		 link.  This will normally be every section.  We need
+		 to do this so that we can identify any sections which
+		 the linker has decided to not include.  */
+	      sec->linker_mark = TRUE;
+
+	      if (sec->flags & SEC_MERGE)
+		merged = TRUE;
+
+	      if (info->relocatable || info->emitrelocations)
+		reloc_count = sec->reloc_count;
+	      else if (bed->elf_backend_count_relocs)
+		reloc_count = (*bed->elf_backend_count_relocs) (info, sec);
+
+	      if (sec->rawsize > max_contents_size)
+		max_contents_size = sec->rawsize;
+	      if (sec->size > max_contents_size)
+		max_contents_size = sec->size;
+
+	      /* We are interested in just local symbols, not all
+		 symbols.  */
+	      if (bfd_get_flavour (sec->owner) == bfd_target_elf_flavour
+		  && (sec->owner->flags & DYNAMIC) == 0)
+		{
+		  size_t sym_count;
+
+		  if (elf_bad_symtab (sec->owner))
+		    sym_count = (elf_tdata (sec->owner)->symtab_hdr.sh_size
+				 / bed->s->sizeof_sym);
+		  else
+		    sym_count = elf_tdata (sec->owner)->symtab_hdr.sh_info;
+
+		  if (sym_count > max_sym_count)
+		    max_sym_count = sym_count;
+
+		  if (sym_count > max_sym_shndx_count
+		      && elf_symtab_shndx (sec->owner) != 0)
+		    max_sym_shndx_count = sym_count;
+
+		  if ((sec->flags & SEC_RELOC) != 0)
+		    {
+		      size_t ext_size = 0;
+
+		      if (esdi->rel.hdr != NULL)
+			ext_size = esdi->rel.hdr->sh_size;
+		      if (esdi->rela.hdr != NULL)
+			ext_size += esdi->rela.hdr->sh_size;
+
+		      if (ext_size > max_external_reloc_size)
+			max_external_reloc_size = ext_size;
+		      if (sec->reloc_count > max_internal_reloc_count)
+			max_internal_reloc_count = sec->reloc_count;
+		    }
+		}
+	    }
+
+	  if (reloc_count == 0)
+	    continue;
+
+	  o->reloc_count += reloc_count;
+
+	  if (p->type == bfd_indirect_link_order
+	      && (info->relocatable || info->emitrelocations))
+	    {
+	      if (esdi->rel.hdr)
+		esdo->rel.count += NUM_SHDR_ENTRIES (esdi->rel.hdr);
+	      if (esdi->rela.hdr)
+		esdo->rela.count += NUM_SHDR_ENTRIES (esdi->rela.hdr);
+	    }
+	  else
+	    {
+	      if (o->use_rela_p)
+		esdo->rela.count += reloc_count;
+	      else
+		esdo->rel.count += reloc_count;
+	    }
+	}
+
+      if (o->reloc_count > 0)
+	o->flags |= SEC_RELOC;
+      else
+	{
+	  /* Explicitly clear the SEC_RELOC flag.  The linker tends to
+	     set it (this is probably a bug) and if it is set
+	     assign_section_numbers will create a reloc section.  */
+	  o->flags &=~ SEC_RELOC;
+	}
+
+      /* If the SEC_ALLOC flag is not set, force the section VMA to
+	 zero.  This is done in elf_fake_sections as well, but forcing
+	 the VMA to 0 here will ensure that relocs against these
+	 sections are handled correctly.  */
+      if ((o->flags & SEC_ALLOC) == 0
+	  && ! o->user_set_vma)
+	o->vma = 0;
+    }
+
+  if (! info->relocatable && merged)
+    elf_link_hash_traverse (elf_hash_table (info),
+			    _bfd_elf_link_sec_merge_syms, abfd);
+
+  /* Figure out the file positions for everything but the symbol table
+     and the relocs.  We set symcount to force assign_section_numbers
+     to create a symbol table.  */
+  bfd_get_symcount (abfd) = info->strip == strip_all ? 0 : 1;
+  BFD_ASSERT (! abfd->output_has_begun);
+  if (! _bfd_elf_compute_section_file_positions (abfd, info))
+    goto error_return;
+
+  /* Set sizes, and assign file positions for reloc sections.  */
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      struct bfd_elf_section_data *esdo = elf_section_data (o);
+      if ((o->flags & SEC_RELOC) != 0)
+	{
+	  if (esdo->rel.hdr
+	      && !(_bfd_elf_link_size_reloc_section (abfd, &esdo->rel)))
+	    goto error_return;
+
+	  if (esdo->rela.hdr
+	      && !(_bfd_elf_link_size_reloc_section (abfd, &esdo->rela)))
+	    goto error_return;
+	}
+
+      /* Now, reset REL_COUNT and REL_COUNT2 so that we can use them
+	 to count upwards while actually outputting the relocations.  */
+      esdo->rel.count = 0;
+      esdo->rela.count = 0;
+    }
+
+  _bfd_elf_assign_file_positions_for_relocs (abfd);
+
+  /* We have now assigned file positions for all the sections except
+     .symtab and .strtab.  We start the .symtab section at the current
+     file position, and write directly to it.  We build the .strtab
+     section in memory.  */
+  bfd_get_symcount (abfd) = 0;
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  /* sh_name is set in prep_headers.  */
+  symtab_hdr->sh_type = SHT_SYMTAB;
+  /* sh_flags, sh_addr and sh_size all start off zero.  */
+  symtab_hdr->sh_entsize = bed->s->sizeof_sym;
+  /* sh_link is set in assign_section_numbers.  */
+  /* sh_info is set below.  */
+  /* sh_offset is set just below.  */
+  symtab_hdr->sh_addralign = (bfd_vma) 1 << bed->s->log_file_align;
+
+  off = elf_tdata (abfd)->next_file_pos;
+  off = _bfd_elf_assign_file_position_for_section (symtab_hdr, off, TRUE);
+
+  /* Note that at this point elf_tdata (abfd)->next_file_pos is
+     incorrect.  We do not yet know the size of the .symtab section.
+     We correct next_file_pos below, after we do know the size.  */
+
+  /* Allocate a buffer to hold swapped out symbols.  This is to avoid
+     continuously seeking to the right position in the file.  */
+  if (! info->keep_memory || max_sym_count < 20)
+    finfo.symbuf_size = 20;
+  else
+    finfo.symbuf_size = max_sym_count;
+  amt = finfo.symbuf_size;
+  amt *= bed->s->sizeof_sym;
+  finfo.symbuf = (bfd_byte *) bfd_malloc (amt);
+  if (finfo.symbuf == NULL)
+    goto error_return;
+  if (elf_numsections (abfd) > (SHN_LORESERVE & 0xFFFF))
+    {
+      /* Wild guess at number of output symbols.  realloc'd as needed.  */
+      amt = 2 * max_sym_count + elf_numsections (abfd) + 1000;
+      finfo.shndxbuf_size = amt;
+      amt *= sizeof (Elf_External_Sym_Shndx);
+      finfo.symshndxbuf = (Elf_External_Sym_Shndx *) bfd_zmalloc (amt);
+      if (finfo.symshndxbuf == NULL)
+	goto error_return;
+    }
+
+  /* Start writing out the symbol table.  The first symbol is always a
+     dummy symbol.  */
+  if (info->strip != strip_all
+      || emit_relocs)
+    {
+      elfsym.st_value = 0;
+      elfsym.st_size = 0;
+      elfsym.st_info = 0;
+      elfsym.st_other = 0;
+      elfsym.st_shndx = SHN_UNDEF;
+      elfsym.st_target_internal = 0;
+      if (elf_link_output_sym (&finfo, NULL, &elfsym, bfd_und_section_ptr,
+			       NULL) != 1)
+	goto error_return;
+    }
+
+  /* Output a symbol for each section.  We output these even if we are
+     discarding local symbols, since they are used for relocs.  These
+     symbols have no names.  We store the index of each one in the
+     index field of the section, so that we can find it again when
+     outputting relocs.  */
+  if (info->strip != strip_all
+      || emit_relocs)
+    {
+      elfsym.st_size = 0;
+      elfsym.st_info = ELF_ST_INFO (STB_LOCAL, STT_SECTION);
+      elfsym.st_other = 0;
+      elfsym.st_value = 0;
+      elfsym.st_target_internal = 0;
+      for (i = 1; i < elf_numsections (abfd); i++)
+	{
+	  o = bfd_section_from_elf_index (abfd, i);
+	  if (o != NULL)
+	    {
+	      o->target_index = bfd_get_symcount (abfd);
+	      elfsym.st_shndx = i;
+	      if (!info->relocatable)
+		elfsym.st_value = o->vma;
+	      if (elf_link_output_sym (&finfo, NULL, &elfsym, o, NULL) != 1)
+		goto error_return;
+	    }
+	}
+    }
+
+  /* Allocate some memory to hold information read in from the input
+     files.  */
+  if (max_contents_size != 0)
+    {
+      finfo.contents = (bfd_byte *) bfd_malloc (max_contents_size);
+      if (finfo.contents == NULL)
+	goto error_return;
+    }
+
+  if (max_external_reloc_size != 0)
+    {
+      finfo.external_relocs = bfd_malloc (max_external_reloc_size);
+      if (finfo.external_relocs == NULL)
+	goto error_return;
+    }
+
+  if (max_internal_reloc_count != 0)
+    {
+      amt = max_internal_reloc_count * bed->s->int_rels_per_ext_rel;
+      amt *= sizeof (Elf_Internal_Rela);
+      finfo.internal_relocs = (Elf_Internal_Rela *) bfd_malloc (amt);
+      if (finfo.internal_relocs == NULL)
+	goto error_return;
+    }
+
+  if (max_sym_count != 0)
+    {
+      amt = max_sym_count * bed->s->sizeof_sym;
+      finfo.external_syms = (bfd_byte *) bfd_malloc (amt);
+      if (finfo.external_syms == NULL)
+	goto error_return;
+
+      amt = max_sym_count * sizeof (Elf_Internal_Sym);
+      finfo.internal_syms = (Elf_Internal_Sym *) bfd_malloc (amt);
+      if (finfo.internal_syms == NULL)
+	goto error_return;
+
+      amt = max_sym_count * sizeof (long);
+      finfo.indices = (long int *) bfd_malloc (amt);
+      if (finfo.indices == NULL)
+	goto error_return;
+
+      amt = max_sym_count * sizeof (asection *);
+      finfo.sections = (asection **) bfd_malloc (amt);
+      if (finfo.sections == NULL)
+	goto error_return;
+    }
+
+  if (max_sym_shndx_count != 0)
+    {
+      amt = max_sym_shndx_count * sizeof (Elf_External_Sym_Shndx);
+      finfo.locsym_shndx = (Elf_External_Sym_Shndx *) bfd_malloc (amt);
+      if (finfo.locsym_shndx == NULL)
+	goto error_return;
+    }
+
+  if (elf_hash_table (info)->tls_sec)
+    {
+      bfd_vma base, end = 0;
+      asection *sec;
+
+      for (sec = elf_hash_table (info)->tls_sec;
+	   sec && (sec->flags & SEC_THREAD_LOCAL);
+	   sec = sec->next)
+	{
+	  bfd_size_type size = sec->size;
+
+	  if (size == 0
+	      && (sec->flags & SEC_HAS_CONTENTS) == 0)
+	    {
+	      struct bfd_link_order *ord = sec->map_tail.link_order;
+
+	      if (ord != NULL)
+		size = ord->offset + ord->size;
+	    }
+	  end = sec->vma + size;
+	}
+      base = elf_hash_table (info)->tls_sec->vma;
+      /* Only align end of TLS section if static TLS doesn't have special
+	 alignment requirements.  */
+      if (bed->static_tls_alignment == 1)
+	end = align_power (end,
+			   elf_hash_table (info)->tls_sec->alignment_power);
+      elf_hash_table (info)->tls_size = end - base;
+    }
+
+  /* Reorder SHF_LINK_ORDER sections.  */
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      if (!elf_fixup_link_order (abfd, o))
+	return FALSE;
+    }
+
+  /* Since ELF permits relocations to be against local symbols, we
+     must have the local symbols available when we do the relocations.
+     Since we would rather only read the local symbols once, and we
+     would rather not keep them in memory, we handle all the
+     relocations for a single input file at the same time.
+
+     Unfortunately, there is no way to know the total number of local
+     symbols until we have seen all of them, and the local symbol
+     indices precede the global symbol indices.  This means that when
+     we are generating relocatable output, and we see a reloc against
+     a global symbol, we can not know the symbol index until we have
+     finished examining all the local symbols to see which ones we are
+     going to output.  To deal with this, we keep the relocations in
+     memory, and don't output them until the end of the link.  This is
+     an unfortunate waste of memory, but I don't see a good way around
+     it.  Fortunately, it only happens when performing a relocatable
+     link, which is not the common case.  FIXME: If keep_memory is set
+     we could write the relocs out and then read them again; I don't
+     know how bad the memory loss will be.  */
+
+  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+    sub->output_has_begun = FALSE;
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      for (p = o->map_head.link_order; p != NULL; p = p->next)
+	{
+	  if (p->type == bfd_indirect_link_order
+	      && (bfd_get_flavour ((sub = p->u.indirect.section->owner))
+		  == bfd_target_elf_flavour)
+	      && elf_elfheader (sub)->e_ident[EI_CLASS] == bed->s->elfclass)
+	    {
+	      if (! sub->output_has_begun)
+		{
+		  if (! elf_link_input_bfd (&finfo, sub))
+		    goto error_return;
+		  sub->output_has_begun = TRUE;
+		}
+	    }
+	  else if (p->type == bfd_section_reloc_link_order
+		   || p->type == bfd_symbol_reloc_link_order)
+	    {
+	      if (! elf_reloc_link_order (abfd, info, o, p))
+		goto error_return;
+	    }
+	  else
+	    {
+	      if (! _bfd_default_link_order (abfd, info, o, p))
+		{
+		  if (p->type == bfd_indirect_link_order
+		      && (bfd_get_flavour (sub)
+			  == bfd_target_elf_flavour)
+		      && (elf_elfheader (sub)->e_ident[EI_CLASS]
+			  != bed->s->elfclass))
+		    {
+		      const char *iclass, *oclass;
+
+		      if (bed->s->elfclass == ELFCLASS64)
+			{
+			  iclass = "ELFCLASS32";
+			  oclass = "ELFCLASS64";
+			}
+		      else
+			{
+			  iclass = "ELFCLASS64";
+			  oclass = "ELFCLASS32";
+			}
+
+		      bfd_set_error (bfd_error_wrong_format);
+		      (*_bfd_error_handler)
+			(_("%B: file class %s incompatible with %s"),
+			 sub, iclass, oclass);
+		    }
+
+		  goto error_return;
+		}
+	    }
+	}
+    }
+
+  /* Free symbol buffer if needed.  */
+  if (!info->reduce_memory_overheads)
+    {
+      for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+	if (bfd_get_flavour (sub) == bfd_target_elf_flavour
+	    && elf_tdata (sub)->symbuf)
+	  {
+	    free (elf_tdata (sub)->symbuf);
+	    elf_tdata (sub)->symbuf = NULL;
+	  }
+    }
+
+  /* Output any global symbols that got converted to local in a
+     version script or due to symbol visibility.  We do this in a
+     separate step since ELF requires all local symbols to appear
+     prior to any global symbols.  FIXME: We should only do this if
+     some global symbols were, in fact, converted to become local.
+     FIXME: Will this work correctly with the Irix 5 linker?  */
+  eoinfo.failed = FALSE;
+  eoinfo.finfo = &finfo;
+  eoinfo.localsyms = TRUE;
+  bfd_hash_traverse (&info->hash->table, elf_link_output_extsym, &eoinfo);
+  if (eoinfo.failed)
+    return FALSE;
+
+  /* If backend needs to output some local symbols not present in the hash
+     table, do it now.  */
+  if (bed->elf_backend_output_arch_local_syms)
+    {
+      typedef int (*out_sym_func)
+	(void *, const char *, Elf_Internal_Sym *, asection *,
+	 struct elf_link_hash_entry *);
+
+      if (! ((*bed->elf_backend_output_arch_local_syms)
+	     (abfd, info, &finfo, (out_sym_func) elf_link_output_sym)))
+	return FALSE;
+    }
+
+  /* That wrote out all the local symbols.  Finish up the symbol table
+     with the global symbols. Even if we want to strip everything we
+     can, we still need to deal with those global symbols that got
+     converted to local in a version script.  */
+
+  /* The sh_info field records the index of the first non local symbol.  */
+  symtab_hdr->sh_info = bfd_get_symcount (abfd);
+
+  if (dynamic
+      && finfo.dynsym_sec->output_section != bfd_abs_section_ptr)
+    {
+      Elf_Internal_Sym sym;
+      bfd_byte *dynsym = finfo.dynsym_sec->contents;
+      long last_local = 0;
+
+      /* Write out the section symbols for the output sections.  */
+      if (info->shared || elf_hash_table (info)->is_relocatable_executable)
+	{
+	  asection *s;
+
+	  sym.st_size = 0;
+	  sym.st_name = 0;
+	  sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_SECTION);
+	  sym.st_other = 0;
+	  sym.st_target_internal = 0;
+
+	  for (s = abfd->sections; s != NULL; s = s->next)
+	    {
+	      int indx;
+	      bfd_byte *dest;
+	      long dynindx;
+
+	      dynindx = elf_section_data (s)->dynindx;
+	      if (dynindx <= 0)
+		continue;
+	      indx = elf_section_data (s)->this_idx;
+	      BFD_ASSERT (indx > 0);
+	      sym.st_shndx = indx;
+	      if (! check_dynsym (abfd, &sym))
+		return FALSE;
+	      sym.st_value = s->vma;
+	      dest = dynsym + dynindx * bed->s->sizeof_sym;
+	      if (last_local < dynindx)
+		last_local = dynindx;
+	      bed->s->swap_symbol_out (abfd, &sym, dest, 0);
+	    }
+	}
+
+      /* Write out the local dynsyms.  */
+      if (elf_hash_table (info)->dynlocal)
+	{
+	  struct elf_link_local_dynamic_entry *e;
+	  for (e = elf_hash_table (info)->dynlocal; e ; e = e->next)
+	    {
+	      asection *s;
+	      bfd_byte *dest;
+
+	      /* Copy the internal symbol and turn off visibility.
+		 Note that we saved a word of storage and overwrote
+		 the original st_name with the dynstr_index.  */
+	      sym = e->isym;
+	      sym.st_other &= ~ELF_ST_VISIBILITY (-1);
+
+	      s = bfd_section_from_elf_index (e->input_bfd,
+					      e->isym.st_shndx);
+	      if (s != NULL)
+		{
+		  sym.st_shndx =
+		    elf_section_data (s->output_section)->this_idx;
+		  if (! check_dynsym (abfd, &sym))
+		    return FALSE;
+		  sym.st_value = (s->output_section->vma
+				  + s->output_offset
+				  + e->isym.st_value);
+		}
+
+	      if (last_local < e->dynindx)
+		last_local = e->dynindx;
+
+	      dest = dynsym + e->dynindx * bed->s->sizeof_sym;
+	      bed->s->swap_symbol_out (abfd, &sym, dest, 0);
+	    }
+	}
+
+      elf_section_data (finfo.dynsym_sec->output_section)->this_hdr.sh_info =
+	last_local + 1;
+    }
+
+  /* We get the global symbols from the hash table.  */
+  eoinfo.failed = FALSE;
+  eoinfo.localsyms = FALSE;
+  eoinfo.finfo = &finfo;
+  bfd_hash_traverse (&info->hash->table, elf_link_output_extsym, &eoinfo);
+  if (eoinfo.failed)
+    return FALSE;
+
+  /* If backend needs to output some symbols not present in the hash
+     table, do it now.  */
+  if (bed->elf_backend_output_arch_syms)
+    {
+      typedef int (*out_sym_func)
+	(void *, const char *, Elf_Internal_Sym *, asection *,
+	 struct elf_link_hash_entry *);
+
+      if (! ((*bed->elf_backend_output_arch_syms)
+	     (abfd, info, &finfo, (out_sym_func) elf_link_output_sym)))
+	return FALSE;
+    }
+
+  /* Flush all symbols to the file.  */
+  if (! elf_link_flush_output_syms (&finfo, bed))
+    return FALSE;
+
+  /* Now we know the size of the symtab section.  */
+  off += symtab_hdr->sh_size;
+
+  symtab_shndx_hdr = &elf_tdata (abfd)->symtab_shndx_hdr;
+  if (symtab_shndx_hdr->sh_name != 0)
+    {
+      symtab_shndx_hdr->sh_type = SHT_SYMTAB_SHNDX;
+      symtab_shndx_hdr->sh_entsize = sizeof (Elf_External_Sym_Shndx);
+      symtab_shndx_hdr->sh_addralign = sizeof (Elf_External_Sym_Shndx);
+      amt = bfd_get_symcount (abfd) * sizeof (Elf_External_Sym_Shndx);
+      symtab_shndx_hdr->sh_size = amt;
+
+      off = _bfd_elf_assign_file_position_for_section (symtab_shndx_hdr,
+						       off, TRUE);
+
+      if (bfd_seek (abfd, symtab_shndx_hdr->sh_offset, SEEK_SET) != 0
+	  || (bfd_bwrite (finfo.symshndxbuf, amt, abfd) != amt))
+	return FALSE;
+    }
+
+
+  /* Finish up and write out the symbol string table (.strtab)
+     section.  */
+  symstrtab_hdr = &elf_tdata (abfd)->strtab_hdr;
+  /* sh_name was set in prep_headers.  */
+  symstrtab_hdr->sh_type = SHT_STRTAB;
+  symstrtab_hdr->sh_flags = 0;
+  symstrtab_hdr->sh_addr = 0;
+  symstrtab_hdr->sh_size = _bfd_stringtab_size (finfo.symstrtab);
+  symstrtab_hdr->sh_entsize = 0;
+  symstrtab_hdr->sh_link = 0;
+  symstrtab_hdr->sh_info = 0;
+  /* sh_offset is set just below.  */
+  symstrtab_hdr->sh_addralign = 1;
+
+  off = _bfd_elf_assign_file_position_for_section (symstrtab_hdr, off, TRUE);
+  elf_tdata (abfd)->next_file_pos = off;
+
+  if (bfd_get_symcount (abfd) > 0)
+    {
+      if (bfd_seek (abfd, symstrtab_hdr->sh_offset, SEEK_SET) != 0
+	  || ! _bfd_stringtab_emit (abfd, finfo.symstrtab))
+	return FALSE;
+    }
+
+  /* Adjust the relocs to have the correct symbol indices.  */
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      struct bfd_elf_section_data *esdo = elf_section_data (o);
+      if ((o->flags & SEC_RELOC) == 0)
+	continue;
+
+      if (esdo->rel.hdr != NULL)
+	elf_link_adjust_relocs (abfd, &esdo->rel);
+      if (esdo->rela.hdr != NULL)
+	elf_link_adjust_relocs (abfd, &esdo->rela);
+
+      /* Set the reloc_count field to 0 to prevent write_relocs from
+	 trying to swap the relocs out itself.  */
+      o->reloc_count = 0;
+    }
+
+  if (dynamic && info->combreloc && dynobj != NULL)
+    relativecount = elf_link_sort_relocs (abfd, info, &reldyn);
+
+  /* If we are linking against a dynamic object, or generating a
+     shared library, finish up the dynamic linking information.  */
+  if (dynamic)
+    {
+      bfd_byte *dyncon, *dynconend;
+
+      /* Fix up .dynamic entries.  */
+      o = bfd_get_section_by_name (dynobj, ".dynamic");
+      BFD_ASSERT (o != NULL);
+
+      dyncon = o->contents;
+      dynconend = o->contents + o->size;
+      for (; dyncon < dynconend; dyncon += bed->s->sizeof_dyn)
+	{
+	  Elf_Internal_Dyn dyn;
+	  const char *name;
+	  unsigned int type;
+
+	  bed->s->swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    default:
+	      continue;
+	    case DT_NULL:
+	      if (relativecount > 0 && dyncon + bed->s->sizeof_dyn < dynconend)
+		{
+		  switch (elf_section_data (reldyn)->this_hdr.sh_type)
+		    {
+		    case SHT_REL: dyn.d_tag = DT_RELCOUNT; break;
+		    case SHT_RELA: dyn.d_tag = DT_RELACOUNT; break;
+		    default: continue;
+		    }
+		  dyn.d_un.d_val = relativecount;
+		  relativecount = 0;
+		  break;
+		}
+	      continue;
+
+	    case DT_INIT:
+	      name = info->init_function;
+	      goto get_sym;
+	    case DT_FINI:
+	      name = info->fini_function;
+	    get_sym:
+	      {
+		struct elf_link_hash_entry *h;
+
+		h = elf_link_hash_lookup (elf_hash_table (info), name,
+					  FALSE, FALSE, TRUE);
+		if (h != NULL
+		    && (h->root.type == bfd_link_hash_defined
+			|| h->root.type == bfd_link_hash_defweak))
+		  {
+		    dyn.d_un.d_ptr = h->root.u.def.value;
+		    o = h->root.u.def.section;
+		    if (o->output_section != NULL)
+		      dyn.d_un.d_ptr += (o->output_section->vma
+					 + o->output_offset);
+		    else
+		      {
+			/* The symbol is imported from another shared
+			   library and does not apply to this one.  */
+			dyn.d_un.d_ptr = 0;
+		      }
+		    break;
+		  }
+	      }
+	      continue;
+
+	    case DT_PREINIT_ARRAYSZ:
+	      name = ".preinit_array";
+	      goto get_size;
+	    case DT_INIT_ARRAYSZ:
+	      name = ".init_array";
+	      goto get_size;
+	    case DT_FINI_ARRAYSZ:
+	      name = ".fini_array";
+	    get_size:
+	      o = bfd_get_section_by_name (abfd, name);
+	      if (o == NULL)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B: could not find output section %s"), abfd, name);
+		  goto error_return;
+		}
+	      if (o->size == 0)
+		(*_bfd_error_handler)
+		  (_("warning: %s section has zero size"), name);
+	      dyn.d_un.d_val = o->size;
+	      break;
+
+	    case DT_PREINIT_ARRAY:
+	      name = ".preinit_array";
+	      goto get_vma;
+	    case DT_INIT_ARRAY:
+	      name = ".init_array";
+	      goto get_vma;
+	    case DT_FINI_ARRAY:
+	      name = ".fini_array";
+	      goto get_vma;
+
+	    case DT_HASH:
+	      name = ".hash";
+	      goto get_vma;
+	    case DT_GNU_HASH:
+	      name = ".gnu.hash";
+	      goto get_vma;
+	    case DT_STRTAB:
+	      name = ".dynstr";
+	      goto get_vma;
+	    case DT_SYMTAB:
+	      name = ".dynsym";
+	      goto get_vma;
+	    case DT_VERDEF:
+	      name = ".gnu.version_d";
+	      goto get_vma;
+	    case DT_VERNEED:
+	      name = ".gnu.version_r";
+	      goto get_vma;
+	    case DT_VERSYM:
+	      name = ".gnu.version";
+	    get_vma:
+	      o = bfd_get_section_by_name (abfd, name);
+	      if (o == NULL)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B: could not find output section %s"), abfd, name);
+		  goto error_return;
+		}
+	      if (elf_section_data (o->output_section)->this_hdr.sh_type == SHT_NOTE)
+		{
+		  (*_bfd_error_handler)
+		    (_("warning: section '%s' is being made into a note"), name);
+		  bfd_set_error (bfd_error_nonrepresentable_section);
+		  goto error_return;
+		}
+	      dyn.d_un.d_ptr = o->vma;
+	      break;
+
+	    case DT_REL:
+	    case DT_RELA:
+	    case DT_RELSZ:
+	    case DT_RELASZ:
+	      if (dyn.d_tag == DT_REL || dyn.d_tag == DT_RELSZ)
+		type = SHT_REL;
+	      else
+		type = SHT_RELA;
+	      dyn.d_un.d_val = 0;
+	      dyn.d_un.d_ptr = 0;
+	      for (i = 1; i < elf_numsections (abfd); i++)
+		{
+		  Elf_Internal_Shdr *hdr;
+
+		  hdr = elf_elfsections (abfd)[i];
+		  if (hdr->sh_type == type
+		      && (hdr->sh_flags & SHF_ALLOC) != 0)
+		    {
+		      if (dyn.d_tag == DT_RELSZ || dyn.d_tag == DT_RELASZ)
+			dyn.d_un.d_val += hdr->sh_size;
+		      else
+			{
+			  if (dyn.d_un.d_ptr == 0
+			      || hdr->sh_addr < dyn.d_un.d_ptr)
+			    dyn.d_un.d_ptr = hdr->sh_addr;
+			}
+		    }
+		}
+	      break;
+	    }
+	  bed->s->swap_dyn_out (dynobj, &dyn, dyncon);
+	}
+    }
+
+  /* If we have created any dynamic sections, then output them.  */
+  if (dynobj != NULL)
+    {
+      if (! (*bed->elf_backend_finish_dynamic_sections) (abfd, info))
+	goto error_return;
+
+      /* Check for DT_TEXTREL (late, in case the backend removes it).  */
+      if ((info->warn_shared_textrel && info->shared)
+	  || info->error_textrel)
+	{
+	  bfd_byte *dyncon, *dynconend;
+
+	  /* Fix up .dynamic entries.  */
+	  o = bfd_get_section_by_name (dynobj, ".dynamic");
+	  BFD_ASSERT (o != NULL);
+
+	  dyncon = o->contents;
+	  dynconend = o->contents + o->size;
+	  for (; dyncon < dynconend; dyncon += bed->s->sizeof_dyn)
+	    {
+	      Elf_Internal_Dyn dyn;
+
+	      bed->s->swap_dyn_in (dynobj, dyncon, &dyn);
+
+	      if (dyn.d_tag == DT_TEXTREL)
+		{
+		  if (info->error_textrel)
+		    info->callbacks->einfo
+		      (_("%P%X: read-only segment has dynamic relocations.\n"));
+		  else
+		    info->callbacks->einfo
+		      (_("%P: warning: creating a DT_TEXTREL in a shared object.\n"));
+		  break;
+		}
+	    }
+	}
+
+      for (o = dynobj->sections; o != NULL; o = o->next)
+	{
+	  if ((o->flags & SEC_HAS_CONTENTS) == 0
+	      || o->size == 0
+	      || o->output_section == bfd_abs_section_ptr)
+	    continue;
+	  if ((o->flags & SEC_LINKER_CREATED) == 0)
+	    {
+	      /* At this point, we are only interested in sections
+		 created by _bfd_elf_link_create_dynamic_sections.  */
+	      continue;
+	    }
+	  if (elf_hash_table (info)->stab_info.stabstr == o)
+	    continue;
+	  if (elf_hash_table (info)->eh_info.hdr_sec == o)
+	    continue;
+	  if ((elf_section_data (o->output_section)->this_hdr.sh_type
+	       != SHT_STRTAB)
+	      && (strcmp (bfd_get_section_name (abfd, o), ".dynstr") != 0))
+	    {
+	      /* FIXME: octets_per_byte.  */
+	      if (! bfd_set_section_contents (abfd, o->output_section,
+					      o->contents,
+					      (file_ptr) o->output_offset,
+					      o->size))
+		goto error_return;
+	    }
+	  else
+	    {
+	      /* The contents of the .dynstr section are actually in a
+		 stringtab.  */
+	      off = elf_section_data (o->output_section)->this_hdr.sh_offset;
+	      if (bfd_seek (abfd, off, SEEK_SET) != 0
+		  || ! _bfd_elf_strtab_emit (abfd,
+					     elf_hash_table (info)->dynstr))
+		goto error_return;
+	    }
+	}
+    }
+
+  if (info->relocatable)
+    {
+      bfd_boolean failed = FALSE;
+
+      bfd_map_over_sections (abfd, bfd_elf_set_group_contents, &failed);
+      if (failed)
+	goto error_return;
+    }
+
+  /* If we have optimized stabs strings, output them.  */
+  if (elf_hash_table (info)->stab_info.stabstr != NULL)
+    {
+      if (! _bfd_write_stab_strings (abfd, &elf_hash_table (info)->stab_info))
+	goto error_return;
+    }
+
+  if (info->eh_frame_hdr)
+    {
+      if (! _bfd_elf_write_section_eh_frame_hdr (abfd, info))
+	goto error_return;
+    }
+
+  if (finfo.symstrtab != NULL)
+    _bfd_stringtab_free (finfo.symstrtab);
+  if (finfo.contents != NULL)
+    free (finfo.contents);
+  if (finfo.external_relocs != NULL)
+    free (finfo.external_relocs);
+  if (finfo.internal_relocs != NULL)
+    free (finfo.internal_relocs);
+  if (finfo.external_syms != NULL)
+    free (finfo.external_syms);
+  if (finfo.locsym_shndx != NULL)
+    free (finfo.locsym_shndx);
+  if (finfo.internal_syms != NULL)
+    free (finfo.internal_syms);
+  if (finfo.indices != NULL)
+    free (finfo.indices);
+  if (finfo.sections != NULL)
+    free (finfo.sections);
+  if (finfo.symbuf != NULL)
+    free (finfo.symbuf);
+  if (finfo.symshndxbuf != NULL)
+    free (finfo.symshndxbuf);
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      struct bfd_elf_section_data *esdo = elf_section_data (o);
+      if ((o->flags & SEC_RELOC) != 0 && esdo->rel.hashes != NULL)
+	free (esdo->rel.hashes);
+      if ((o->flags & SEC_RELOC) != 0 && esdo->rela.hashes != NULL)
+	free (esdo->rela.hashes);
+    }
+
+  elf_tdata (abfd)->linker = TRUE;
+
+  if (attr_section)
+    {
+      bfd_byte *contents = (bfd_byte *) bfd_malloc (attr_size);
+      if (contents == NULL)
+	return FALSE;	/* Bail out and fail.  */
+      bfd_elf_set_obj_attr_contents (abfd, contents, attr_size);
+      bfd_set_section_contents (abfd, attr_section, contents, 0, attr_size);
+      free (contents);
+    }
+
+  return TRUE;
+
+ error_return:
+  if (finfo.symstrtab != NULL)
+    _bfd_stringtab_free (finfo.symstrtab);
+  if (finfo.contents != NULL)
+    free (finfo.contents);
+  if (finfo.external_relocs != NULL)
+    free (finfo.external_relocs);
+  if (finfo.internal_relocs != NULL)
+    free (finfo.internal_relocs);
+  if (finfo.external_syms != NULL)
+    free (finfo.external_syms);
+  if (finfo.locsym_shndx != NULL)
+    free (finfo.locsym_shndx);
+  if (finfo.internal_syms != NULL)
+    free (finfo.internal_syms);
+  if (finfo.indices != NULL)
+    free (finfo.indices);
+  if (finfo.sections != NULL)
+    free (finfo.sections);
+  if (finfo.symbuf != NULL)
+    free (finfo.symbuf);
+  if (finfo.symshndxbuf != NULL)
+    free (finfo.symshndxbuf);
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      struct bfd_elf_section_data *esdo = elf_section_data (o);
+      if ((o->flags & SEC_RELOC) != 0 && esdo->rel.hashes != NULL)
+	free (esdo->rel.hashes);
+      if ((o->flags & SEC_RELOC) != 0 && esdo->rela.hashes != NULL)
+	free (esdo->rela.hashes);
+    }
+
+  return FALSE;
+}
+
+/* Initialize COOKIE for input bfd ABFD.  */
+
+static bfd_boolean
+init_reloc_cookie (struct elf_reloc_cookie *cookie,
+		   struct bfd_link_info *info, bfd *abfd)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  const struct elf_backend_data *bed;
+
+  bed = get_elf_backend_data (abfd);
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+
+  cookie->abfd = abfd;
+  cookie->sym_hashes = elf_sym_hashes (abfd);
+  cookie->bad_symtab = elf_bad_symtab (abfd);
+  if (cookie->bad_symtab)
+    {
+      cookie->locsymcount = symtab_hdr->sh_size / bed->s->sizeof_sym;
+      cookie->extsymoff = 0;
+    }
+  else
+    {
+      cookie->locsymcount = symtab_hdr->sh_info;
+      cookie->extsymoff = symtab_hdr->sh_info;
+    }
+
+  if (bed->s->arch_size == 32)
+    cookie->r_sym_shift = 8;
+  else
+    cookie->r_sym_shift = 32;
+
+  cookie->locsyms = (Elf_Internal_Sym *) symtab_hdr->contents;
+  if (cookie->locsyms == NULL && cookie->locsymcount != 0)
+    {
+      cookie->locsyms = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+					      cookie->locsymcount, 0,
+					      NULL, NULL, NULL);
+      if (cookie->locsyms == NULL)
+	{
+	  info->callbacks->einfo (_("%P%X: can not read symbols: %E\n"));
+	  return FALSE;
+	}
+      if (info->keep_memory)
+	symtab_hdr->contents = (bfd_byte *) cookie->locsyms;
+    }
+  return TRUE;
+}
+
+/* Free the memory allocated by init_reloc_cookie, if appropriate.  */
+
+static void
+fini_reloc_cookie (struct elf_reloc_cookie *cookie, bfd *abfd)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  if (cookie->locsyms != NULL
+      && symtab_hdr->contents != (unsigned char *) cookie->locsyms)
+    free (cookie->locsyms);
+}
+
+/* Initialize the relocation information in COOKIE for input section SEC
+   of input bfd ABFD.  */
+
+static bfd_boolean
+init_reloc_cookie_rels (struct elf_reloc_cookie *cookie,
+			struct bfd_link_info *info, bfd *abfd,
+			asection *sec)
+{
+  const struct elf_backend_data *bed;
+
+  if (sec->reloc_count == 0)
+    {
+      cookie->rels = NULL;
+      cookie->relend = NULL;
+    }
+  else
+    {
+      bed = get_elf_backend_data (abfd);
+
+      cookie->rels = _bfd_elf_link_read_relocs (abfd, sec, NULL, NULL,
+						info->keep_memory);
+      if (cookie->rels == NULL)
+	return FALSE;
+      cookie->rel = cookie->rels;
+      cookie->relend = (cookie->rels
+			+ sec->reloc_count * bed->s->int_rels_per_ext_rel);
+    }
+  cookie->rel = cookie->rels;
+  return TRUE;
+}
+
+/* Free the memory allocated by init_reloc_cookie_rels,
+   if appropriate.  */
+
+static void
+fini_reloc_cookie_rels (struct elf_reloc_cookie *cookie,
+			asection *sec)
+{
+  if (cookie->rels && elf_section_data (sec)->relocs != cookie->rels)
+    free (cookie->rels);
+}
+
+/* Initialize the whole of COOKIE for input section SEC.  */
+
+static bfd_boolean
+init_reloc_cookie_for_section (struct elf_reloc_cookie *cookie,
+			       struct bfd_link_info *info,
+			       asection *sec)
+{
+  if (!init_reloc_cookie (cookie, info, sec->owner))
+    goto error1;
+  if (!init_reloc_cookie_rels (cookie, info, sec->owner, sec))
+    goto error2;
+  return TRUE;
+
+ error2:
+  fini_reloc_cookie (cookie, sec->owner);
+ error1:
+  return FALSE;
+}
+
+/* Free the memory allocated by init_reloc_cookie_for_section,
+   if appropriate.  */
+
+static void
+fini_reloc_cookie_for_section (struct elf_reloc_cookie *cookie,
+			       asection *sec)
+{
+  fini_reloc_cookie_rels (cookie, sec);
+  fini_reloc_cookie (cookie, sec->owner);
+}
+
+/* Garbage collect unused sections.  */
+
+/* Default gc_mark_hook.  */
+
+asection *
+_bfd_elf_gc_mark_hook (asection *sec,
+		       struct bfd_link_info *info ATTRIBUTE_UNUSED,
+		       Elf_Internal_Rela *rel ATTRIBUTE_UNUSED,
+		       struct elf_link_hash_entry *h,
+		       Elf_Internal_Sym *sym)
+{
+  const char *sec_name;
+
+  if (h != NULL)
+    {
+      switch (h->root.type)
+	{
+	case bfd_link_hash_defined:
+	case bfd_link_hash_defweak:
+	  return h->root.u.def.section;
+
+	case bfd_link_hash_common:
+	  return h->root.u.c.p->section;
+
+	case bfd_link_hash_undefined:
+	case bfd_link_hash_undefweak:
+	  /* To work around a glibc bug, keep all XXX input sections
+	     when there is an as yet undefined reference to __start_XXX
+	     or __stop_XXX symbols.  The linker will later define such
+	     symbols for orphan input sections that have a name
+	     representable as a C identifier.  */
+	  if (strncmp (h->root.root.string, "__start_", 8) == 0)
+	    sec_name = h->root.root.string + 8;
+	  else if (strncmp (h->root.root.string, "__stop_", 7) == 0)
+	    sec_name = h->root.root.string + 7;
+	  else
+	    sec_name = NULL;
+
+	  if (sec_name && *sec_name != '\0')
+	    {
+	      bfd *i;
+	      
+	      for (i = info->input_bfds; i; i = i->link_next)
+		{
+		  sec = bfd_get_section_by_name (i, sec_name);
+		  if (sec)
+		    sec->flags |= SEC_KEEP;
+		}
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+  else
+    return bfd_section_from_elf_index (sec->owner, sym->st_shndx);
+
+  return NULL;
+}
+
+/* COOKIE->rel describes a relocation against section SEC, which is
+   a section we've decided to keep.  Return the section that contains
+   the relocation symbol, or NULL if no section contains it.  */
+
+asection *
+_bfd_elf_gc_mark_rsec (struct bfd_link_info *info, asection *sec,
+		       elf_gc_mark_hook_fn gc_mark_hook,
+		       struct elf_reloc_cookie *cookie)
+{
+  unsigned long r_symndx;
+  struct elf_link_hash_entry *h;
+
+  r_symndx = cookie->rel->r_info >> cookie->r_sym_shift;
+  if (r_symndx == STN_UNDEF)
+    return NULL;
+
+  if (r_symndx >= cookie->locsymcount
+      || ELF_ST_BIND (cookie->locsyms[r_symndx].st_info) != STB_LOCAL)
+    {
+      h = cookie->sym_hashes[r_symndx - cookie->extsymoff];
+      while (h->root.type == bfd_link_hash_indirect
+	     || h->root.type == bfd_link_hash_warning)
+	h = (struct elf_link_hash_entry *) h->root.u.i.link;
+      return (*gc_mark_hook) (sec, info, cookie->rel, h, NULL);
+    }
+
+  return (*gc_mark_hook) (sec, info, cookie->rel, NULL,
+			  &cookie->locsyms[r_symndx]);
+}
+
+/* COOKIE->rel describes a relocation against section SEC, which is
+   a section we've decided to keep.  Mark the section that contains
+   the relocation symbol.  */
+
+bfd_boolean
+_bfd_elf_gc_mark_reloc (struct bfd_link_info *info,
+			asection *sec,
+			elf_gc_mark_hook_fn gc_mark_hook,
+			struct elf_reloc_cookie *cookie)
+{
+  asection *rsec;
+
+  rsec = _bfd_elf_gc_mark_rsec (info, sec, gc_mark_hook, cookie);
+  if (rsec && !rsec->gc_mark)
+    {
+      if (bfd_get_flavour (rsec->owner) != bfd_target_elf_flavour)
+	rsec->gc_mark = 1;
+      else if (!_bfd_elf_gc_mark (info, rsec, gc_mark_hook))
+	return FALSE;
+    }
+  return TRUE;
+}
+
+/* The mark phase of garbage collection.  For a given section, mark
+   it and any sections in this section's group, and all the sections
+   which define symbols to which it refers.  */
+
+bfd_boolean
+_bfd_elf_gc_mark (struct bfd_link_info *info,
+		  asection *sec,
+		  elf_gc_mark_hook_fn gc_mark_hook)
+{
+  bfd_boolean ret;
+  asection *group_sec, *eh_frame;
+
+  sec->gc_mark = 1;
+
+  /* Mark all the sections in the group.  */
+  group_sec = elf_section_data (sec)->next_in_group;
+  if (group_sec && !group_sec->gc_mark)
+    if (!_bfd_elf_gc_mark (info, group_sec, gc_mark_hook))
+      return FALSE;
+
+  /* Look through the section relocs.  */
+  ret = TRUE;
+  eh_frame = elf_eh_frame_section (sec->owner);
+  if ((sec->flags & SEC_RELOC) != 0
+      && sec->reloc_count > 0
+      && sec != eh_frame)
+    {
+      struct elf_reloc_cookie cookie;
+
+      if (!init_reloc_cookie_for_section (&cookie, info, sec))
+	ret = FALSE;
+      else
+	{
+	  for (; cookie.rel < cookie.relend; cookie.rel++)
+	    if (!_bfd_elf_gc_mark_reloc (info, sec, gc_mark_hook, &cookie))
+	      {
+		ret = FALSE;
+		break;
+	      }
+	  fini_reloc_cookie_for_section (&cookie, sec);
+	}
+    }
+
+  if (ret && eh_frame && elf_fde_list (sec))
+    {
+      struct elf_reloc_cookie cookie;
+
+      if (!init_reloc_cookie_for_section (&cookie, info, eh_frame))
+	ret = FALSE;
+      else
+	{
+	  if (!_bfd_elf_gc_mark_fdes (info, sec, eh_frame,
+				      gc_mark_hook, &cookie))
+	    ret = FALSE;
+	  fini_reloc_cookie_for_section (&cookie, eh_frame);
+	}
+    }
+
+  return ret;
+}
+
+/* Keep debug and special sections.  */
+
+bfd_boolean
+_bfd_elf_gc_mark_extra_sections (struct bfd_link_info *info,
+				 elf_gc_mark_hook_fn mark_hook ATTRIBUTE_UNUSED)
+{
+  bfd *ibfd;
+
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      asection *isec;
+      bfd_boolean some_kept;
+
+      if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour)
+	continue;
+
+      /* Ensure all linker created sections are kept, and see whether
+	 any other section is already marked.  */
+      some_kept = FALSE;
+      for (isec = ibfd->sections; isec != NULL; isec = isec->next)
+	{
+	  if ((isec->flags & SEC_LINKER_CREATED) != 0)
+	    isec->gc_mark = 1;
+	  else if (isec->gc_mark)
+	    some_kept = TRUE;
+	}
+
+      /* If no section in this file will be kept, then we can
+	 toss out debug sections.  */
+      if (!some_kept)
+	continue;
+
+      /* Keep debug and special sections like .comment when they are
+	 not part of a group, or when we have single-member groups.  */
+      for (isec = ibfd->sections; isec != NULL; isec = isec->next)
+	if ((elf_next_in_group (isec) == NULL
+	     || elf_next_in_group (isec) == isec)
+	    && ((isec->flags & SEC_DEBUGGING) != 0
+		|| (isec->flags & (SEC_ALLOC | SEC_LOAD | SEC_RELOC)) == 0))
+	  isec->gc_mark = 1;
+    }
+  return TRUE;
+}
+
+/* Sweep symbols in swept sections.  Called via elf_link_hash_traverse.  */
+
+struct elf_gc_sweep_symbol_info
+{
+  struct bfd_link_info *info;
+  void (*hide_symbol) (struct bfd_link_info *, struct elf_link_hash_entry *,
+		       bfd_boolean);
+};
+
+static bfd_boolean
+elf_gc_sweep_symbol (struct elf_link_hash_entry *h, void *data)
+{
+  if ((h->root.type == bfd_link_hash_defined
+       || h->root.type == bfd_link_hash_defweak)
+      && !h->root.u.def.section->gc_mark
+      && !(h->root.u.def.section->owner->flags & DYNAMIC))
+    {
+      struct elf_gc_sweep_symbol_info *inf =
+          (struct elf_gc_sweep_symbol_info *) data;
+      (*inf->hide_symbol) (inf->info, h, TRUE);
+    }
+
+  return TRUE;
+}
+
+/* The sweep phase of garbage collection.  Remove all garbage sections.  */
+
+typedef bfd_boolean (*gc_sweep_hook_fn)
+  (bfd *, struct bfd_link_info *, asection *, const Elf_Internal_Rela *);
+
+static bfd_boolean
+elf_gc_sweep (bfd *abfd, struct bfd_link_info *info)
+{
+  bfd *sub;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  gc_sweep_hook_fn gc_sweep_hook = bed->gc_sweep_hook;
+  unsigned long section_sym_count;
+  struct elf_gc_sweep_symbol_info sweep_info;
+
+  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+    {
+      asection *o;
+
+      if (bfd_get_flavour (sub) != bfd_target_elf_flavour)
+	continue;
+
+      for (o = sub->sections; o != NULL; o = o->next)
+	{
+	  /* When any section in a section group is kept, we keep all
+	     sections in the section group.  If the first member of
+	     the section group is excluded, we will also exclude the
+	     group section.  */
+	  if (o->flags & SEC_GROUP)
+	    {
+	      asection *first = elf_next_in_group (o);
+	      o->gc_mark = first->gc_mark;
+	    }
+
+	  if (o->gc_mark)
+	    continue;
+
+	  /* Skip sweeping sections already excluded.  */
+	  if (o->flags & SEC_EXCLUDE)
+	    continue;
+
+	  /* Since this is early in the link process, it is simple
+	     to remove a section from the output.  */
+	  o->flags |= SEC_EXCLUDE;
+
+	  if (info->print_gc_sections && o->size != 0)
+	    _bfd_error_handler (_("Removing unused section '%s' in file '%B'"), sub, o->name);
+
+	  /* But we also have to update some of the relocation
+	     info we collected before.  */
+	  if (gc_sweep_hook
+	      && (o->flags & SEC_RELOC) != 0
+	      && o->reloc_count > 0
+	      && !bfd_is_abs_section (o->output_section))
+	    {
+	      Elf_Internal_Rela *internal_relocs;
+	      bfd_boolean r;
+
+	      internal_relocs
+		= _bfd_elf_link_read_relocs (o->owner, o, NULL, NULL,
+					     info->keep_memory);
+	      if (internal_relocs == NULL)
+		return FALSE;
+
+	      r = (*gc_sweep_hook) (o->owner, info, o, internal_relocs);
+
+	      if (elf_section_data (o)->relocs != internal_relocs)
+		free (internal_relocs);
+
+	      if (!r)
+		return FALSE;
+	    }
+	}
+    }
+
+  /* Remove the symbols that were in the swept sections from the dynamic
+     symbol table.  GCFIXME: Anyone know how to get them out of the
+     static symbol table as well?  */
+  sweep_info.info = info;
+  sweep_info.hide_symbol = bed->elf_backend_hide_symbol;
+  elf_link_hash_traverse (elf_hash_table (info), elf_gc_sweep_symbol,
+			  &sweep_info);
+
+  _bfd_elf_link_renumber_dynsyms (abfd, info, &section_sym_count);
+  return TRUE;
+}
+
+/* Propagate collected vtable information.  This is called through
+   elf_link_hash_traverse.  */
+
+static bfd_boolean
+elf_gc_propagate_vtable_entries_used (struct elf_link_hash_entry *h, void *okp)
+{
+  /* Those that are not vtables.  */
+  if (h->vtable == NULL || h->vtable->parent == NULL)
+    return TRUE;
+
+  /* Those vtables that do not have parents, we cannot merge.  */
+  if (h->vtable->parent == (struct elf_link_hash_entry *) -1)
+    return TRUE;
+
+  /* If we've already been done, exit.  */
+  if (h->vtable->used && h->vtable->used[-1])
+    return TRUE;
+
+  /* Make sure the parent's table is up to date.  */
+  elf_gc_propagate_vtable_entries_used (h->vtable->parent, okp);
+
+  if (h->vtable->used == NULL)
+    {
+      /* None of this table's entries were referenced.  Re-use the
+	 parent's table.  */
+      h->vtable->used = h->vtable->parent->vtable->used;
+      h->vtable->size = h->vtable->parent->vtable->size;
+    }
+  else
+    {
+      size_t n;
+      bfd_boolean *cu, *pu;
+
+      /* Or the parent's entries into ours.  */
+      cu = h->vtable->used;
+      cu[-1] = TRUE;
+      pu = h->vtable->parent->vtable->used;
+      if (pu != NULL)
+	{
+	  const struct elf_backend_data *bed;
+	  unsigned int log_file_align;
+
+	  bed = get_elf_backend_data (h->root.u.def.section->owner);
+	  log_file_align = bed->s->log_file_align;
+	  n = h->vtable->parent->vtable->size >> log_file_align;
+	  while (n--)
+	    {
+	      if (*pu)
+		*cu = TRUE;
+	      pu++;
+	      cu++;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf_gc_smash_unused_vtentry_relocs (struct elf_link_hash_entry *h, void *okp)
+{
+  asection *sec;
+  bfd_vma hstart, hend;
+  Elf_Internal_Rela *relstart, *relend, *rel;
+  const struct elf_backend_data *bed;
+  unsigned int log_file_align;
+
+  /* Take care of both those symbols that do not describe vtables as
+     well as those that are not loaded.  */
+  if (h->vtable == NULL || h->vtable->parent == NULL)
+    return TRUE;
+
+  BFD_ASSERT (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak);
+
+  sec = h->root.u.def.section;
+  hstart = h->root.u.def.value;
+  hend = hstart + h->size;
+
+  relstart = _bfd_elf_link_read_relocs (sec->owner, sec, NULL, NULL, TRUE);
+  if (!relstart)
+    return *(bfd_boolean *) okp = FALSE;
+  bed = get_elf_backend_data (sec->owner);
+  log_file_align = bed->s->log_file_align;
+
+  relend = relstart + sec->reloc_count * bed->s->int_rels_per_ext_rel;
+
+  for (rel = relstart; rel < relend; ++rel)
+    if (rel->r_offset >= hstart && rel->r_offset < hend)
+      {
+	/* If the entry is in use, do nothing.  */
+	if (h->vtable->used
+	    && (rel->r_offset - hstart) < h->vtable->size)
+	  {
+	    bfd_vma entry = (rel->r_offset - hstart) >> log_file_align;
+	    if (h->vtable->used[entry])
+	      continue;
+	  }
+	/* Otherwise, kill it.  */
+	rel->r_offset = rel->r_info = rel->r_addend = 0;
+      }
+
+  return TRUE;
+}
+
+/* Mark sections containing dynamically referenced symbols.  When
+   building shared libraries, we must assume that any visible symbol is
+   referenced.  */
+
+bfd_boolean
+bfd_elf_gc_mark_dynamic_ref_symbol (struct elf_link_hash_entry *h, void *inf)
+{
+  struct bfd_link_info *info = (struct bfd_link_info *) inf;
+
+  if ((h->root.type == bfd_link_hash_defined
+       || h->root.type == bfd_link_hash_defweak)
+      && (h->ref_dynamic
+	  || ((!info->executable || info->export_dynamic)
+	      && h->def_regular
+	      && ELF_ST_VISIBILITY (h->other) != STV_INTERNAL
+	      && ELF_ST_VISIBILITY (h->other) != STV_HIDDEN
+	      && (strchr (h->root.root.string, ELF_VER_CHR) != NULL
+		  || !bfd_hide_sym_by_version (info->version_info,
+					       h->root.root.string)))))
+    h->root.u.def.section->flags |= SEC_KEEP;
+
+  return TRUE;
+}
+
+/* Keep all sections containing symbols undefined on the command-line,
+   and the section containing the entry symbol.  */
+
+void
+_bfd_elf_gc_keep (struct bfd_link_info *info)
+{
+  struct bfd_sym_chain *sym;
+
+  for (sym = info->gc_sym_list; sym != NULL; sym = sym->next)
+    {
+      struct elf_link_hash_entry *h;
+
+      h = elf_link_hash_lookup (elf_hash_table (info), sym->name,
+				FALSE, FALSE, FALSE);
+
+      if (h != NULL
+	  && (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	  && !bfd_is_abs_section (h->root.u.def.section))
+	h->root.u.def.section->flags |= SEC_KEEP;
+    }
+}
+
+/* Do mark and sweep of unused sections.  */
+
+bfd_boolean
+bfd_elf_gc_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  bfd_boolean ok = TRUE;
+  bfd *sub;
+  elf_gc_mark_hook_fn gc_mark_hook;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+
+  if (!bed->can_gc_sections
+      || !is_elf_hash_table (info->hash))
+    {
+      (*_bfd_error_handler)(_("Warning: gc-sections option ignored"));
+      return TRUE;
+    }
+
+  bed->gc_keep (info);
+
+  /* Try to parse each bfd's .eh_frame section.  Point elf_eh_frame_section
+     at the .eh_frame section if we can mark the FDEs individually.  */
+  _bfd_elf_begin_eh_frame_parsing (info);
+  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+    {
+      asection *sec;
+      struct elf_reloc_cookie cookie;
+
+      sec = bfd_get_section_by_name (sub, ".eh_frame");
+      if (sec && init_reloc_cookie_for_section (&cookie, info, sec))
+	{
+	  _bfd_elf_parse_eh_frame (sub, info, sec, &cookie);
+	  if (elf_section_data (sec)->sec_info)
+	    elf_eh_frame_section (sub) = sec;
+	  fini_reloc_cookie_for_section (&cookie, sec);
+	}
+    }
+  _bfd_elf_end_eh_frame_parsing (info);
+
+  /* Apply transitive closure to the vtable entry usage info.  */
+  elf_link_hash_traverse (elf_hash_table (info),
+			  elf_gc_propagate_vtable_entries_used,
+			  &ok);
+  if (!ok)
+    return FALSE;
+
+  /* Kill the vtable relocations that were not used.  */
+  elf_link_hash_traverse (elf_hash_table (info),
+			  elf_gc_smash_unused_vtentry_relocs,
+			  &ok);
+  if (!ok)
+    return FALSE;
+
+  /* Mark dynamically referenced symbols.  */
+  if (elf_hash_table (info)->dynamic_sections_created)
+    elf_link_hash_traverse (elf_hash_table (info),
+			    bed->gc_mark_dynamic_ref,
+			    info);
+
+  /* Grovel through relocs to find out who stays ...  */
+  gc_mark_hook = bed->gc_mark_hook;
+  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+    {
+      asection *o;
+
+      if (bfd_get_flavour (sub) != bfd_target_elf_flavour)
+	continue;
+
+      /* Start at sections marked with SEC_KEEP (ref _bfd_elf_gc_keep).
+	 Also treat note sections as a root, if the section is not part
+	 of a group.  */
+      for (o = sub->sections; o != NULL; o = o->next)
+	if (!o->gc_mark
+	    && (o->flags & SEC_EXCLUDE) == 0
+	    && ((o->flags & SEC_KEEP) != 0
+		|| (elf_section_data (o)->this_hdr.sh_type == SHT_NOTE
+		    && elf_next_in_group (o) == NULL )))
+	  {
+	    if (!_bfd_elf_gc_mark (info, o, gc_mark_hook))
+	      return FALSE;
+	  }
+    }
+
+  /* Allow the backend to mark additional target specific sections.  */
+  bed->gc_mark_extra_sections (info, gc_mark_hook);
+
+  /* ... and mark SEC_EXCLUDE for those that go.  */
+  return elf_gc_sweep (abfd, info);
+}
+
+/* Called from check_relocs to record the existence of a VTINHERIT reloc.  */
+
+bfd_boolean
+bfd_elf_gc_record_vtinherit (bfd *abfd,
+			     asection *sec,
+			     struct elf_link_hash_entry *h,
+			     bfd_vma offset)
+{
+  struct elf_link_hash_entry **sym_hashes, **sym_hashes_end;
+  struct elf_link_hash_entry **search, *child;
+  bfd_size_type extsymcount;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+
+  /* The sh_info field of the symtab header tells us where the
+     external symbols start.  We don't care about the local symbols at
+     this point.  */
+  extsymcount = elf_tdata (abfd)->symtab_hdr.sh_size / bed->s->sizeof_sym;
+  if (!elf_bad_symtab (abfd))
+    extsymcount -= elf_tdata (abfd)->symtab_hdr.sh_info;
+
+  sym_hashes = elf_sym_hashes (abfd);
+  sym_hashes_end = sym_hashes + extsymcount;
+
+  /* Hunt down the child symbol, which is in this section at the same
+     offset as the relocation.  */
+  for (search = sym_hashes; search != sym_hashes_end; ++search)
+    {
+      if ((child = *search) != NULL
+	  && (child->root.type == bfd_link_hash_defined
+	      || child->root.type == bfd_link_hash_defweak)
+	  && child->root.u.def.section == sec
+	  && child->root.u.def.value == offset)
+	goto win;
+    }
+
+  (*_bfd_error_handler) ("%B: %A+%lu: No symbol found for INHERIT",
+			 abfd, sec, (unsigned long) offset);
+  bfd_set_error (bfd_error_invalid_operation);
+  return FALSE;
+
+ win:
+  if (!child->vtable)
+    {
+      child->vtable = (struct elf_link_virtual_table_entry *)
+          bfd_zalloc (abfd, sizeof (*child->vtable));
+      if (!child->vtable)
+	return FALSE;
+    }
+  if (!h)
+    {
+      /* This *should* only be the absolute section.  It could potentially
+	 be that someone has defined a non-global vtable though, which
+	 would be bad.  It isn't worth paging in the local symbols to be
+	 sure though; that case should simply be handled by the assembler.  */
+
+      child->vtable->parent = (struct elf_link_hash_entry *) -1;
+    }
+  else
+    child->vtable->parent = h;
+
+  return TRUE;
+}
+
+/* Called from check_relocs to record the existence of a VTENTRY reloc.  */
+
+bfd_boolean
+bfd_elf_gc_record_vtentry (bfd *abfd ATTRIBUTE_UNUSED,
+			   asection *sec ATTRIBUTE_UNUSED,
+			   struct elf_link_hash_entry *h,
+			   bfd_vma addend)
+{
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  unsigned int log_file_align = bed->s->log_file_align;
+
+  if (!h->vtable)
+    {
+      h->vtable = (struct elf_link_virtual_table_entry *)
+          bfd_zalloc (abfd, sizeof (*h->vtable));
+      if (!h->vtable)
+	return FALSE;
+    }
+
+  if (addend >= h->vtable->size)
+    {
+      size_t size, bytes, file_align;
+      bfd_boolean *ptr = h->vtable->used;
+
+      /* While the symbol is undefined, we have to be prepared to handle
+	 a zero size.  */
+      file_align = 1 << log_file_align;
+      if (h->root.type == bfd_link_hash_undefined)
+	size = addend + file_align;
+      else
+	{
+	  size = h->size;
+	  if (addend >= size)
+	    {
+	      /* Oops!  We've got a reference past the defined end of
+		 the table.  This is probably a bug -- shall we warn?  */
+	      size = addend + file_align;
+	    }
+	}
+      size = (size + file_align - 1) & -file_align;
+
+      /* Allocate one extra entry for use as a "done" flag for the
+	 consolidation pass.  */
+      bytes = ((size >> log_file_align) + 1) * sizeof (bfd_boolean);
+
+      if (ptr)
+	{
+	  ptr = (bfd_boolean *) bfd_realloc (ptr - 1, bytes);
+
+	  if (ptr != NULL)
+	    {
+	      size_t oldbytes;
+
+	      oldbytes = (((h->vtable->size >> log_file_align) + 1)
+			  * sizeof (bfd_boolean));
+	      memset (((char *) ptr) + oldbytes, 0, bytes - oldbytes);
+	    }
+	}
+      else
+	ptr = (bfd_boolean *) bfd_zmalloc (bytes);
+
+      if (ptr == NULL)
+	return FALSE;
+
+      /* And arrange for that done flag to be at index -1.  */
+      h->vtable->used = ptr + 1;
+      h->vtable->size = size;
+    }
+
+  h->vtable->used[addend >> log_file_align] = TRUE;
+
+  return TRUE;
+}
+
+/* Map an ELF section header flag to its corresponding string.  */
+typedef struct
+{
+  char *flag_name;
+  flagword flag_value;
+} elf_flags_to_name_table;
+
+static elf_flags_to_name_table elf_flags_to_names [] =
+{
+  { "SHF_WRITE", SHF_WRITE },
+  { "SHF_ALLOC", SHF_ALLOC },
+  { "SHF_EXECINSTR", SHF_EXECINSTR },
+  { "SHF_MERGE", SHF_MERGE },
+  { "SHF_STRINGS", SHF_STRINGS },
+  { "SHF_INFO_LINK", SHF_INFO_LINK},
+  { "SHF_LINK_ORDER", SHF_LINK_ORDER},
+  { "SHF_OS_NONCONFORMING", SHF_OS_NONCONFORMING},
+  { "SHF_GROUP", SHF_GROUP },
+  { "SHF_TLS", SHF_TLS },
+  { "SHF_MASKOS", SHF_MASKOS },
+  { "SHF_EXCLUDE", SHF_EXCLUDE },
+};
+
+void
+bfd_elf_lookup_section_flags (struct bfd_link_info *info,
+			      struct flag_info *finfo)
+{
+  bfd *output_bfd = info->output_bfd;
+  const struct elf_backend_data *bed = get_elf_backend_data (output_bfd);
+  struct flag_info_list *tf = finfo->flag_list;
+  int with_hex = 0;
+  int without_hex = 0;
+
+  for (tf = finfo->flag_list; tf != NULL; tf = tf->next)
+    {
+      int i;
+      if (bed->elf_backend_lookup_section_flags_hook)
+	{
+	  flagword hexval =
+	     (*bed->elf_backend_lookup_section_flags_hook) ((char *) tf->name);
+
+	  if (hexval != 0)
+	    {
+	      if (tf->with == with_flags)
+		with_hex |= hexval;
+	      else if (tf->with == without_flags)
+		without_hex |= hexval;
+	      tf->valid = TRUE;
+	      continue;
+	    }
+	}
+      for (i = 0; i < 12; i++)
+	{
+	  if (!strcmp (tf->name, elf_flags_to_names[i].flag_name))
+	    {
+	      if (tf->with == with_flags)
+		with_hex |= elf_flags_to_names[i].flag_value;
+	      else if (tf->with == without_flags)
+		without_hex |= elf_flags_to_names[i].flag_value;
+	      tf->valid = TRUE;
+	      continue;
+	    }
+	}
+      if (tf->valid == FALSE)
+	{
+	  info->callbacks->einfo 
+		(_("Unrecognized INPUT_SECTION_FLAG %s\n"), tf->name);
+	  return;
+	}
+    }
+ finfo->flags_initialized = TRUE;
+ finfo->only_with_flags |= with_hex;
+ finfo->not_with_flags |= without_hex;
+
+ return;
+}
+
+struct alloc_got_off_arg {
+  bfd_vma gotoff;
+  struct bfd_link_info *info;
+};
+
+/* We need a special top-level link routine to convert got reference counts
+   to real got offsets.  */
+
+static bfd_boolean
+elf_gc_allocate_got_offsets (struct elf_link_hash_entry *h, void *arg)
+{
+  struct alloc_got_off_arg *gofarg = (struct alloc_got_off_arg *) arg;
+  bfd *obfd = gofarg->info->output_bfd;
+  const struct elf_backend_data *bed = get_elf_backend_data (obfd);
+
+  if (h->got.refcount > 0)
+    {
+      h->got.offset = gofarg->gotoff;
+      gofarg->gotoff += bed->got_elt_size (obfd, gofarg->info, h, NULL, 0);
+    }
+  else
+    h->got.offset = (bfd_vma) -1;
+
+  return TRUE;
+}
+
+/* And an accompanying bit to work out final got entry offsets once
+   we're done.  Should be called from final_link.  */
+
+bfd_boolean
+bfd_elf_gc_common_finalize_got_offsets (bfd *abfd,
+					struct bfd_link_info *info)
+{
+  bfd *i;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  bfd_vma gotoff;
+  struct alloc_got_off_arg gofarg;
+
+  BFD_ASSERT (abfd == info->output_bfd);
+
+  if (! is_elf_hash_table (info->hash))
+    return FALSE;
+
+  /* The GOT offset is relative to the .got section, but the GOT header is
+     put into the .got.plt section, if the backend uses it.  */
+  if (bed->want_got_plt)
+    gotoff = 0;
+  else
+    gotoff = bed->got_header_size;
+
+  /* Do the local .got entries first.  */
+  for (i = info->input_bfds; i; i = i->link_next)
+    {
+      bfd_signed_vma *local_got;
+      bfd_size_type j, locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+
+      if (bfd_get_flavour (i) != bfd_target_elf_flavour)
+	continue;
+
+      local_got = elf_local_got_refcounts (i);
+      if (!local_got)
+	continue;
+
+      symtab_hdr = &elf_tdata (i)->symtab_hdr;
+      if (elf_bad_symtab (i))
+	locsymcount = symtab_hdr->sh_size / bed->s->sizeof_sym;
+      else
+	locsymcount = symtab_hdr->sh_info;
+
+      for (j = 0; j < locsymcount; ++j)
+	{
+	  if (local_got[j] > 0)
+	    {
+	      local_got[j] = gotoff;
+	      gotoff += bed->got_elt_size (abfd, info, NULL, i, j);
+	    }
+	  else
+	    local_got[j] = (bfd_vma) -1;
+	}
+    }
+
+  /* Then the global .got entries.  .plt refcounts are handled by
+     adjust_dynamic_symbol  */
+  gofarg.gotoff = gotoff;
+  gofarg.info = info;
+  elf_link_hash_traverse (elf_hash_table (info),
+			  elf_gc_allocate_got_offsets,
+			  &gofarg);
+  return TRUE;
+}
+
+/* Many folk need no more in the way of final link than this, once
+   got entry reference counting is enabled.  */
+
+bfd_boolean
+bfd_elf_gc_common_final_link (bfd *abfd, struct bfd_link_info *info)
+{
+  if (!bfd_elf_gc_common_finalize_got_offsets (abfd, info))
+    return FALSE;
+
+  /* Invoke the regular ELF backend linker to do all the work.  */
+  return bfd_elf_final_link (abfd, info);
+}
+
+bfd_boolean
+bfd_elf_reloc_symbol_deleted_p (bfd_vma offset, void *cookie)
+{
+  struct elf_reloc_cookie *rcookie = (struct elf_reloc_cookie *) cookie;
+
+  if (rcookie->bad_symtab)
+    rcookie->rel = rcookie->rels;
+
+  for (; rcookie->rel < rcookie->relend; rcookie->rel++)
+    {
+      unsigned long r_symndx;
+
+      if (! rcookie->bad_symtab)
+	if (rcookie->rel->r_offset > offset)
+	  return FALSE;
+      if (rcookie->rel->r_offset != offset)
+	continue;
+
+      r_symndx = rcookie->rel->r_info >> rcookie->r_sym_shift;
+      if (r_symndx == STN_UNDEF)
+	return TRUE;
+
+      if (r_symndx >= rcookie->locsymcount
+	  || ELF_ST_BIND (rcookie->locsyms[r_symndx].st_info) != STB_LOCAL)
+	{
+	  struct elf_link_hash_entry *h;
+
+	  h = rcookie->sym_hashes[r_symndx - rcookie->extsymoff];
+
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+	  if ((h->root.type == bfd_link_hash_defined
+	       || h->root.type == bfd_link_hash_defweak)
+	      && elf_discarded_section (h->root.u.def.section))
+	    return TRUE;
+	  else
+	    return FALSE;
+	}
+      else
+	{
+	  /* It's not a relocation against a global symbol,
+	     but it could be a relocation against a local
+	     symbol for a discarded section.  */
+	  asection *isec;
+	  Elf_Internal_Sym *isym;
+
+	  /* Need to: get the symbol; get the section.  */
+	  isym = &rcookie->locsyms[r_symndx];
+	  isec = bfd_section_from_elf_index (rcookie->abfd, isym->st_shndx);
+	  if (isec != NULL && elf_discarded_section (isec))
+	    return TRUE;
+	}
+      return FALSE;
+    }
+  return FALSE;
+}
+
+/* Discard unneeded references to discarded sections.
+   Returns TRUE if any section's size was changed.  */
+/* This function assumes that the relocations are in sorted order,
+   which is true for all known assemblers.  */
+
+bfd_boolean
+bfd_elf_discard_info (bfd *output_bfd, struct bfd_link_info *info)
+{
+  struct elf_reloc_cookie cookie;
+  asection *stab, *eh;
+  const struct elf_backend_data *bed;
+  bfd *abfd;
+  bfd_boolean ret = FALSE;
+
+  if (info->traditional_format
+      || !is_elf_hash_table (info->hash))
+    return FALSE;
+
+  _bfd_elf_begin_eh_frame_parsing (info);
+  for (abfd = info->input_bfds; abfd != NULL; abfd = abfd->link_next)
+    {
+      if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
+	continue;
+
+      bed = get_elf_backend_data (abfd);
+
+      if ((abfd->flags & DYNAMIC) != 0)
+	continue;
+
+      eh = NULL;
+      if (!info->relocatable)
+	{
+	  eh = bfd_get_section_by_name (abfd, ".eh_frame");
+	  if (eh != NULL
+	      && (eh->size == 0
+		  || bfd_is_abs_section (eh->output_section)))
+	    eh = NULL;
+	}
+
+      stab = bfd_get_section_by_name (abfd, ".stab");
+      if (stab != NULL
+	  && (stab->size == 0
+	      || bfd_is_abs_section (stab->output_section)
+	      || stab->sec_info_type != ELF_INFO_TYPE_STABS))
+	stab = NULL;
+
+      if (stab == NULL
+	  && eh == NULL
+	  && bed->elf_backend_discard_info == NULL)
+	continue;
+
+      if (!init_reloc_cookie (&cookie, info, abfd))
+	return FALSE;
+
+      if (stab != NULL
+	  && stab->reloc_count > 0
+	  && init_reloc_cookie_rels (&cookie, info, abfd, stab))
+	{
+	  if (_bfd_discard_section_stabs (abfd, stab,
+					  elf_section_data (stab)->sec_info,
+					  bfd_elf_reloc_symbol_deleted_p,
+					  &cookie))
+	    ret = TRUE;
+	  fini_reloc_cookie_rels (&cookie, stab);
+	}
+
+      if (eh != NULL
+	  && init_reloc_cookie_rels (&cookie, info, abfd, eh))
+	{
+	  _bfd_elf_parse_eh_frame (abfd, info, eh, &cookie);
+	  if (_bfd_elf_discard_section_eh_frame (abfd, info, eh,
+						 bfd_elf_reloc_symbol_deleted_p,
+						 &cookie))
+	    ret = TRUE;
+	  fini_reloc_cookie_rels (&cookie, eh);
+	}
+
+      if (bed->elf_backend_discard_info != NULL
+	  && (*bed->elf_backend_discard_info) (abfd, &cookie, info))
+	ret = TRUE;
+
+      fini_reloc_cookie (&cookie, abfd);
+    }
+  _bfd_elf_end_eh_frame_parsing (info);
+
+  if (info->eh_frame_hdr
+      && !info->relocatable
+      && _bfd_elf_discard_section_eh_frame_hdr (output_bfd, info))
+    ret = TRUE;
+
+  return ret;
+}
+
+bfd_boolean
+_bfd_elf_section_already_linked (bfd *abfd,
+				 asection *sec,
+				 struct bfd_link_info *info)
+{
+  flagword flags;
+  const char *name, *key;
+  struct bfd_section_already_linked *l;
+  struct bfd_section_already_linked_hash_entry *already_linked_list;
+
+  if (sec->output_section == bfd_abs_section_ptr)
+    return FALSE;
+
+  flags = sec->flags;
+
+  /* Return if it isn't a linkonce section.  A comdat group section
+     also has SEC_LINK_ONCE set.  */
+  if ((flags & SEC_LINK_ONCE) == 0)
+    return FALSE;
+
+  /* Don't put group member sections on our list of already linked
+     sections.  They are handled as a group via their group section.  */
+  if (elf_sec_group (sec) != NULL)
+    return FALSE;
+
+  /* For a SHT_GROUP section, use the group signature as the key.  */
+  name = sec->name;
+  if ((flags & SEC_GROUP) != 0
+      && elf_next_in_group (sec) != NULL
+      && elf_group_name (elf_next_in_group (sec)) != NULL)
+    key = elf_group_name (elf_next_in_group (sec));
+  else
+    {
+      /* Otherwise we should have a .gnu.linkonce.<type>.<key> section.  */
+      if (CONST_STRNEQ (name, ".gnu.linkonce.")
+	  && (key = strchr (name + sizeof (".gnu.linkonce.") - 1, '.')) != NULL)
+	key++;
+      else
+	/* Must be a user linkonce section that doesn't follow gcc's
+	   naming convention.  In this case we won't be matching
+	   single member groups.  */
+	key = name;
+    }
+
+  already_linked_list = bfd_section_already_linked_table_lookup (key);
+
+  for (l = already_linked_list->entry; l != NULL; l = l->next)
+    {
+      /* We may have 2 different types of sections on the list: group
+	 sections with a signature of <key> (<key> is some string),
+	 and linkonce sections named .gnu.linkonce.<type>.<key>.
+	 Match like sections.  LTO plugin sections are an exception.
+	 They are always named .gnu.linkonce.t.<key> and match either
+	 type of section.  */
+      if (((flags & SEC_GROUP) == (l->sec->flags & SEC_GROUP)
+	   && ((flags & SEC_GROUP) != 0
+	       || strcmp (name, l->sec->name) == 0))
+	  || (l->sec->owner->flags & BFD_PLUGIN) != 0)
+	{
+	  /* The section has already been linked.  See if we should
+	     issue a warning.  */
+	  if (!_bfd_handle_already_linked (sec, l, info))
+	    return FALSE;
+
+	  if (flags & SEC_GROUP)
+	    {
+	      asection *first = elf_next_in_group (sec);
+	      asection *s = first;
+
+	      while (s != NULL)
+		{
+		  s->output_section = bfd_abs_section_ptr;
+		  /* Record which group discards it.  */
+		  s->kept_section = l->sec;
+		  s = elf_next_in_group (s);
+		  /* These lists are circular.  */
+		  if (s == first)
+		    break;
+		}
+	    }
+
+	  return TRUE;
+	}
+    }
+
+  /* A single member comdat group section may be discarded by a
+     linkonce section and vice versa.  */
+  if ((flags & SEC_GROUP) != 0)
+    {
+      asection *first = elf_next_in_group (sec);
+
+      if (first != NULL && elf_next_in_group (first) == first)
+	/* Check this single member group against linkonce sections.  */
+	for (l = already_linked_list->entry; l != NULL; l = l->next)
+	  if ((l->sec->flags & SEC_GROUP) == 0
+	      && bfd_elf_match_symbols_in_sections (l->sec, first, info))
+	    {
+	      first->output_section = bfd_abs_section_ptr;
+	      first->kept_section = l->sec;
+	      sec->output_section = bfd_abs_section_ptr;
+	      break;
+	    }
+    }
+  else
+    /* Check this linkonce section against single member groups.  */
+    for (l = already_linked_list->entry; l != NULL; l = l->next)
+      if (l->sec->flags & SEC_GROUP)
+	{
+	  asection *first = elf_next_in_group (l->sec);
+
+	  if (first != NULL
+	      && elf_next_in_group (first) == first
+	      && bfd_elf_match_symbols_in_sections (first, sec, info))
+	    {
+	      sec->output_section = bfd_abs_section_ptr;
+	      sec->kept_section = first;
+	      break;
+	    }
+	}
+
+  /* Do not complain on unresolved relocations in `.gnu.linkonce.r.F'
+     referencing its discarded `.gnu.linkonce.t.F' counterpart - g++-3.4
+     specific as g++-4.x is using COMDAT groups (without the `.gnu.linkonce'
+     prefix) instead.  `.gnu.linkonce.r.*' were the `.rodata' part of its
+     matching `.gnu.linkonce.t.*'.  If `.gnu.linkonce.r.F' is not discarded
+     but its `.gnu.linkonce.t.F' is discarded means we chose one-only
+     `.gnu.linkonce.t.F' section from a different bfd not requiring any
+     `.gnu.linkonce.r.F'.  Thus `.gnu.linkonce.r.F' should be discarded.
+     The reverse order cannot happen as there is never a bfd with only the
+     `.gnu.linkonce.r.F' section.  The order of sections in a bfd does not
+     matter as here were are looking only for cross-bfd sections.  */
+
+  if ((flags & SEC_GROUP) == 0 && CONST_STRNEQ (name, ".gnu.linkonce.r."))
+    for (l = already_linked_list->entry; l != NULL; l = l->next)
+      if ((l->sec->flags & SEC_GROUP) == 0
+	  && CONST_STRNEQ (l->sec->name, ".gnu.linkonce.t."))
+	{
+	  if (abfd != l->sec->owner)
+	    sec->output_section = bfd_abs_section_ptr;
+	  break;
+	}
+
+  /* This is the first section with this name.  Record it.  */
+  if (!bfd_section_already_linked_table_insert (already_linked_list, sec))
+    info->callbacks->einfo (_("%F%P: already_linked_table: %E\n"));
+  return sec->output_section == bfd_abs_section_ptr;
+}
+
+bfd_boolean
+_bfd_elf_common_definition (Elf_Internal_Sym *sym)
+{
+  return sym->st_shndx == SHN_COMMON;
+}
+
+unsigned int
+_bfd_elf_common_section_index (asection *sec ATTRIBUTE_UNUSED)
+{
+  return SHN_COMMON;
+}
+
+asection *
+_bfd_elf_common_section (asection *sec ATTRIBUTE_UNUSED)
+{
+  return bfd_com_section_ptr;
+}
+
+bfd_vma
+_bfd_elf_default_got_elt_size (bfd *abfd,
+			       struct bfd_link_info *info ATTRIBUTE_UNUSED,
+			       struct elf_link_hash_entry *h ATTRIBUTE_UNUSED,
+			       bfd *ibfd ATTRIBUTE_UNUSED,
+			       unsigned long symndx ATTRIBUTE_UNUSED)
+{
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  return bed->s->arch_size / 8;
+}
+
+/* Routines to support the creation of dynamic relocs.  */
+
+/* Returns the name of the dynamic reloc section associated with SEC.  */
+
+static const char *
+get_dynamic_reloc_section_name (bfd *       abfd,
+				asection *  sec,
+				bfd_boolean is_rela)
+{
+  char *name;
+  const char *old_name = bfd_get_section_name (NULL, sec);
+  const char *prefix = is_rela ? ".rela" : ".rel";
+
+  if (old_name == NULL)
+    return NULL;
+
+  name = bfd_alloc (abfd, strlen (prefix) + strlen (old_name) + 1);
+  sprintf (name, "%s%s", prefix, old_name); 
+
+  return name;
+}
+
+/* Returns the dynamic reloc section associated with SEC.
+   If necessary compute the name of the dynamic reloc section based
+   on SEC's name (looked up in ABFD's string table) and the setting
+   of IS_RELA.  */
+
+asection *
+_bfd_elf_get_dynamic_reloc_section (bfd *       abfd,
+				    asection *  sec,
+				    bfd_boolean is_rela)
+{
+  asection * reloc_sec = elf_section_data (sec)->sreloc;
+
+  if (reloc_sec == NULL)
+    {
+      const char * name = get_dynamic_reloc_section_name (abfd, sec, is_rela);
+
+      if (name != NULL)
+	{
+	  reloc_sec = bfd_get_section_by_name (abfd, name);
+
+	  if (reloc_sec != NULL)
+	    elf_section_data (sec)->sreloc = reloc_sec;
+	}
+    }
+
+  return reloc_sec;
+}
+
+/* Returns the dynamic reloc section associated with SEC.  If the
+   section does not exist it is created and attached to the DYNOBJ
+   bfd and stored in the SRELOC field of SEC's elf_section_data
+   structure.
+
+   ALIGNMENT is the alignment for the newly created section and
+   IS_RELA defines whether the name should be .rela.<SEC's name>
+   or .rel.<SEC's name>.  The section name is looked up in the
+   string table associated with ABFD.  */
+
+asection *
+_bfd_elf_make_dynamic_reloc_section (asection *         sec,
+				     bfd *		dynobj,
+				     unsigned int	alignment,
+				     bfd *              abfd,
+				     bfd_boolean        is_rela)
+{
+  asection * reloc_sec = elf_section_data (sec)->sreloc;
+
+  if (reloc_sec == NULL)
+    {
+      const char * name = get_dynamic_reloc_section_name (abfd, sec, is_rela);
+
+      if (name == NULL)
+	return NULL;
+
+      reloc_sec = bfd_get_section_by_name (dynobj, name);
+
+      if (reloc_sec == NULL)
+	{
+	  flagword flags;
+
+	  flags = (SEC_HAS_CONTENTS | SEC_READONLY | SEC_IN_MEMORY | SEC_LINKER_CREATED);
+	  if ((sec->flags & SEC_ALLOC) != 0)
+	    flags |= SEC_ALLOC | SEC_LOAD;
+
+	  reloc_sec = bfd_make_section_with_flags (dynobj, name, flags);
+	  if (reloc_sec != NULL)
+	    {
+	      if (! bfd_set_section_alignment (dynobj, reloc_sec, alignment))
+		reloc_sec = NULL;
+	    }
+	}
+
+      elf_section_data (sec)->sreloc = reloc_sec;
+    }
+
+  return reloc_sec;
+}
+
+/* Copy the ELF symbol type associated with a linker hash entry.  */
+void
+_bfd_elf_copy_link_hash_symbol_type (bfd *abfd ATTRIBUTE_UNUSED,
+    struct bfd_link_hash_entry * hdest,
+    struct bfd_link_hash_entry * hsrc)
+{
+  struct elf_link_hash_entry *ehdest = (struct elf_link_hash_entry *)hdest;
+  struct elf_link_hash_entry *ehsrc = (struct elf_link_hash_entry *)hsrc;
+
+  ehdest->type = ehsrc->type;
+  ehdest->target_internal = ehsrc->target_internal;
+}
+
+/* Append a RELA relocation REL to section S in BFD.  */
+
+void
+elf_append_rela (bfd *abfd, asection *s, Elf_Internal_Rela *rel)
+{
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  bfd_byte *loc = s->contents + (s->reloc_count++ * bed->s->sizeof_rela);
+  BFD_ASSERT (loc + bed->s->sizeof_rela <= s->contents + s->size);
+  bed->s->swap_reloca_out (abfd, rel, loc);
+}
+
+/* Append a REL relocation REL to section S in BFD.  */
+
+void
+elf_append_rel (bfd *abfd, asection *s, Elf_Internal_Rela *rel)
+{
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  bfd_byte *loc = s->contents + (s->reloc_count++ * bed->s->sizeof_rel);
+  BFD_ASSERT (loc + bed->s->sizeof_rel <= s->contents + s->size);
+  bed->s->swap_reloca_out (abfd, rel, loc);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfn32-mips.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfn32-mips.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfn32-mips.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfn32-mips.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3230 @@
+/* MIPS-specific support for 32-bit ELF
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+   Most of the information added by Ian Lance Taylor, Cygnus Support,
+   <ian@cygnus.com>.
+   N32/64 ABI support added by Mark Mitchell, CodeSourcery, LLC.
+   <mark@codesourcery.com>
+   Traditional MIPS targets support added by Koundinya.K, Dansk Data
+   Elektronik & Operations Research Group. <kk@ddeorg.soft.net>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* This file handles MIPS ELF targets.  SGI Irix 5 uses a slightly
+   different MIPS ELF from other targets.  This matters when linking.
+   This file supports both, switching at runtime.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "bfdlink.h"
+#include "genlink.h"
+#include "elf-bfd.h"
+#include "elfxx-mips.h"
+#include "elf/mips.h"
+
+/* Get the ECOFF swapping routines.  */
+#include "coff/sym.h"
+#include "coff/symconst.h"
+#include "coff/internal.h"
+#include "coff/ecoff.h"
+#include "coff/mips.h"
+#define ECOFF_SIGNED_32
+#include "ecoffswap.h"
+
+static bfd_boolean mips_elf_assign_gp
+  (bfd *, bfd_vma *);
+static bfd_reloc_status_type mips_elf_final_gp
+  (bfd *, asymbol *, bfd_boolean, char **, bfd_vma *);
+static bfd_reloc_status_type mips_elf_gprel16_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type mips_elf_literal_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type mips_elf_gprel32_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type gprel32_with_gp
+  (bfd *, asymbol *, arelent *, asection *, bfd_boolean, void *, bfd_vma);
+static bfd_reloc_status_type mips_elf_shift6_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type mips16_gprel_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
+  (bfd *, bfd_reloc_code_real_type);
+static reloc_howto_type *mips_elf_n32_rtype_to_howto
+  (unsigned int, bfd_boolean);
+static void mips_info_to_howto_rel
+  (bfd *, arelent *, Elf_Internal_Rela *);
+static void mips_info_to_howto_rela
+  (bfd *, arelent *, Elf_Internal_Rela *);
+static bfd_boolean mips_elf_sym_is_global
+  (bfd *, asymbol *);
+static bfd_boolean mips_elf_n32_object_p
+  (bfd *);
+static bfd_boolean elf32_mips_grok_prstatus
+  (bfd *, Elf_Internal_Note *);
+static bfd_boolean elf32_mips_grok_psinfo
+  (bfd *, Elf_Internal_Note *);
+static irix_compat_t elf_n32_mips_irix_compat
+  (bfd *);
+
+extern const bfd_target bfd_elf32_nbigmips_vec;
+extern const bfd_target bfd_elf32_nlittlemips_vec;
+
+/* Nonzero if ABFD is using the N32 ABI.  */
+#define ABI_N32_P(abfd) \
+  ((elf_elfheader (abfd)->e_flags & EF_MIPS_ABI2) != 0)
+
+/* Whether we are trying to be compatible with IRIX at all.  */
+#define SGI_COMPAT(abfd) \
+  (elf_n32_mips_irix_compat (abfd) != ict_none)
+
+/* The number of local .got entries we reserve.  */
+#define MIPS_RESERVED_GOTNO (2)
+
+/* In case we're on a 32-bit machine, construct a 64-bit "-1" value
+   from smaller values.  Start with zero, widen, *then* decrement.  */
+#define MINUS_ONE	(((bfd_vma)0) - 1)
+
+/* The relocation table used for SHT_REL sections.  */
+
+static reloc_howto_type elf_mips_howto_table_rel[] =
+{
+  /* No relocation.  */
+  HOWTO (R_MIPS_NONE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit relocation.  */
+  HOWTO (R_MIPS_16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit relocation.  */
+  HOWTO (R_MIPS_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_32",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit symbol relative relocation.  */
+  HOWTO (R_MIPS_REL32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_REL32",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 26 bit jump address.  */
+  HOWTO (R_MIPS_26,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 			/* This needs complex overflow
+				   detection, because the upper four
+				   bits must match the PC + 4.  */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_26",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x03ffffff,		/* src_mask */
+	 0x03ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* R_MIPS_HI16 and R_MIPS_LO16 are unsupported for NewABI REL.
+     However, the native IRIX6 tools use them, so we try our best. */
+
+  /* High 16 bits of symbol value.  */
+  HOWTO (R_MIPS_HI16,		/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_hi16_reloc, /* special_function */
+	 "R_MIPS_HI16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of symbol value.  */
+  HOWTO (R_MIPS_LO16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_lo16_reloc, /* special_function */
+	 "R_MIPS_LO16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GP relative reference.  */
+  HOWTO (R_MIPS_GPREL16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mips_elf_gprel16_reloc, /* special_function */
+	 "R_MIPS_GPREL16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Reference to literal section.  */
+  HOWTO (R_MIPS_LITERAL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mips_elf_literal_reloc, /* special_function */
+	 "R_MIPS_LITERAL",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Reference to global offset table.  */
+  HOWTO (R_MIPS_GOT16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_got16_reloc, /* special_function */
+	 "R_MIPS_GOT16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit PC relative reference.  Note that the ABI document has a typo
+     and claims R_MIPS_PC16 to be not rightshifted, rendering it useless.
+     We do the right thing here.  */
+  HOWTO (R_MIPS_PC16,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_PC16",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 16 bit call through global offset table.  */
+  HOWTO (R_MIPS_CALL16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_CALL16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit GP relative reference.  */
+  HOWTO (R_MIPS_GPREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 mips_elf_gprel32_reloc, /* special_function */
+	 "R_MIPS_GPREL32",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The remaining relocs are defined on Irix 5, although they are
+     not defined by the ABI.  */
+  EMPTY_HOWTO (13),
+  EMPTY_HOWTO (14),
+  EMPTY_HOWTO (15),
+
+  /* A 5 bit shift field.  */
+  HOWTO (R_MIPS_SHIFT5,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 5,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 6,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_SHIFT5",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x000007c0,		/* src_mask */
+	 0x000007c0,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 6 bit shift field.  */
+  HOWTO (R_MIPS_SHIFT6,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 6,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 6,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 mips_elf_shift6_reloc,	/* special_function */
+	 "R_MIPS_SHIFT6",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x000007c4,		/* src_mask */
+	 0x000007c4,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 64 bit relocation.  */
+  HOWTO (R_MIPS_64,		/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_64",		/* name */
+	 TRUE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Displacement in the global offset table.  */
+  HOWTO (R_MIPS_GOT_DISP,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GOT_DISP",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Displacement to page pointer in the global offset table.  */
+  HOWTO (R_MIPS_GOT_PAGE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GOT_PAGE",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Offset from page pointer in the global offset table.  */
+  HOWTO (R_MIPS_GOT_OFST,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GOT_OFST",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of displacement in global offset table.  */
+  HOWTO (R_MIPS_GOT_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GOT_HI16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_MIPS_GOT_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GOT_LO16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 64 bit subtraction.  */
+  HOWTO (R_MIPS_SUB,		/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_SUB",		/* name */
+	 TRUE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Insert the addend as an instruction.  */
+  /* FIXME: Not handled correctly.  */
+  HOWTO (R_MIPS_INSERT_A,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_INSERT_A",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Insert the addend as an instruction, and change all relocations
+     to refer to the old instruction at the address.  */
+  /* FIXME: Not handled correctly.  */
+  HOWTO (R_MIPS_INSERT_B,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_INSERT_B",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Delete a 32 bit instruction.  */
+  /* FIXME: Not handled correctly.  */
+  HOWTO (R_MIPS_DELETE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_DELETE",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The MIPS ELF64 ABI Draft wants us to support these for REL relocations.
+     We don't, because
+       a) It means building the addend from a R_MIPS_HIGHEST/R_MIPS_HIGHER/
+	  R_MIPS_HI16/R_MIPS_LO16 sequence with varying ordering, using
+	  fallable heuristics.
+       b) No other NewABI toolchain actually emits such relocations.  */
+  EMPTY_HOWTO (R_MIPS_HIGHER),
+  EMPTY_HOWTO (R_MIPS_HIGHEST),
+
+  /* High 16 bits of displacement in global offset table.  */
+  HOWTO (R_MIPS_CALL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_CALL_HI16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_MIPS_CALL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_CALL_LO16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Section displacement.  */
+  HOWTO (R_MIPS_SCN_DISP,       /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_SCN_DISP",     /* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MIPS_REL16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_REL16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffff,		/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* These two are obsolete.  */
+  EMPTY_HOWTO (R_MIPS_ADD_IMMEDIATE),
+  EMPTY_HOWTO (R_MIPS_PJUMP),
+
+  /* Similiar to R_MIPS_REL32, but used for relocations in a GOT section.
+     It must be used for multigot GOT's (and only there).  */
+  HOWTO (R_MIPS_RELGOT,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_RELGOT",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Protected jump conversion.  This is an optimization hint.  No
+     relocation is required for correctness.  */
+  HOWTO (R_MIPS_JALR,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_JALR",	        /* name */
+	 FALSE,			/* partial_inplace */
+	 0x00000000,		/* src_mask */
+	 0x00000000,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS GD/LD dynamic relocations.  */
+  HOWTO (R_MIPS_TLS_DTPMOD32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_DTPMOD32",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MIPS_TLS_DTPREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_DTPREL32",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (R_MIPS_TLS_DTPMOD64),
+  EMPTY_HOWTO (R_MIPS_TLS_DTPREL64),
+
+  /* TLS general dynamic variable reference.  */
+  HOWTO (R_MIPS_TLS_GD,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_GD",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS local dynamic variable reference.  */
+  HOWTO (R_MIPS_TLS_LDM,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_LDM",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS local dynamic offset.  */
+  HOWTO (R_MIPS_TLS_DTPREL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_DTPREL_HI16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS local dynamic offset.  */
+  HOWTO (R_MIPS_TLS_DTPREL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_DTPREL_LO16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS thread pointer offset.  */
+  HOWTO (R_MIPS_TLS_GOTTPREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_GOTTPREL",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS IE dynamic relocations.  */
+  HOWTO (R_MIPS_TLS_TPREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_TPREL32",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (R_MIPS_TLS_TPREL64),
+
+  /* TLS thread pointer offset.  */
+  HOWTO (R_MIPS_TLS_TPREL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_TPREL_HI16", /* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS thread pointer offset.  */
+  HOWTO (R_MIPS_TLS_TPREL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_TPREL_LO16", /* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit relocation with no addend.  */
+  HOWTO (R_MIPS_GLOB_DAT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GLOB_DAT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+/* The relocation table used for SHT_RELA sections.  */
+
+static reloc_howto_type elf_mips_howto_table_rela[] =
+{
+  /* No relocation.  */
+  HOWTO (R_MIPS_NONE,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_NONE",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit relocation.  */
+  HOWTO (R_MIPS_16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit relocation.  */
+  HOWTO (R_MIPS_32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_32",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit symbol relative relocation.  */
+  HOWTO (R_MIPS_REL32,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_REL32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 26 bit jump address.  */
+  HOWTO (R_MIPS_26,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+				/* This needs complex overflow
+				   detection, because the upper 36
+				   bits must match the PC + 4.  */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_26",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x03ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of symbol value.  */
+  HOWTO (R_MIPS_HI16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_HI16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of symbol value.  */
+  HOWTO (R_MIPS_LO16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_LO16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GP relative reference.  */
+  HOWTO (R_MIPS_GPREL16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mips_elf_gprel16_reloc, /* special_function */
+	 "R_MIPS_GPREL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Reference to literal section.  */
+  HOWTO (R_MIPS_LITERAL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mips_elf_literal_reloc, /* special_function */
+	 "R_MIPS_LITERAL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Reference to global offset table.  */
+  HOWTO (R_MIPS_GOT16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GOT16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit PC relative reference.  Note that the ABI document has a typo
+     and claims R_MIPS_PC16 to be not rightshifted, rendering it useless.
+     We do the right thing here.  */
+  HOWTO (R_MIPS_PC16,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_PC16",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 16 bit call through global offset table.  */
+  HOWTO (R_MIPS_CALL16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_CALL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit GP relative reference.  */
+  HOWTO (R_MIPS_GPREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 mips_elf_gprel32_reloc, /* special_function */
+	 "R_MIPS_GPREL32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (13),
+  EMPTY_HOWTO (14),
+  EMPTY_HOWTO (15),
+
+  /* A 5 bit shift field.  */
+  HOWTO (R_MIPS_SHIFT5,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 5,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 6,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_SHIFT5",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x000007c0,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 6 bit shift field.  */
+  HOWTO (R_MIPS_SHIFT6,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 6,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 6,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 mips_elf_shift6_reloc,	/* special_function */
+	 "R_MIPS_SHIFT6",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x000007c4,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 64 bit relocation.  */
+  HOWTO (R_MIPS_64,		/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_64",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Displacement in the global offset table.  */
+  HOWTO (R_MIPS_GOT_DISP,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GOT_DISP",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Displacement to page pointer in the global offset table.  */
+  HOWTO (R_MIPS_GOT_PAGE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GOT_PAGE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Offset from page pointer in the global offset table.  */
+  HOWTO (R_MIPS_GOT_OFST,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GOT_OFST",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of displacement in global offset table.  */
+  HOWTO (R_MIPS_GOT_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GOT_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_MIPS_GOT_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GOT_LO16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 64 bit subtraction.  */
+  HOWTO (R_MIPS_SUB,		/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_SUB",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Insert the addend as an instruction.  */
+  /* FIXME: Not handled correctly.  */
+  HOWTO (R_MIPS_INSERT_A,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_INSERT_A",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Insert the addend as an instruction, and change all relocations
+     to refer to the old instruction at the address.  */
+  /* FIXME: Not handled correctly.  */
+  HOWTO (R_MIPS_INSERT_B,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_INSERT_B",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Delete a 32 bit instruction.  */
+  /* FIXME: Not handled correctly.  */
+  HOWTO (R_MIPS_DELETE,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_DELETE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Get the higher value of a 64 bit addend.  */
+  HOWTO (R_MIPS_HIGHER,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_HIGHER",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Get the highest value of a 64 bit addend.  */
+  HOWTO (R_MIPS_HIGHEST,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_HIGHEST",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of displacement in global offset table.  */
+  HOWTO (R_MIPS_CALL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_CALL_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_MIPS_CALL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_CALL_LO16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Section displacement, used by an associated event location section.  */
+  HOWTO (R_MIPS_SCN_DISP,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_SCN_DISP",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 16 bit relocation.  */
+  HOWTO (R_MIPS_REL16,		/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_REL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* These two are obsolete.  */
+  EMPTY_HOWTO (R_MIPS_ADD_IMMEDIATE),
+  EMPTY_HOWTO (R_MIPS_PJUMP),
+
+  /* Similiar to R_MIPS_REL32, but used for relocations in a GOT section.
+     It must be used for multigot GOT's (and only there).  */
+  HOWTO (R_MIPS_RELGOT,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_RELGOT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Protected jump conversion.  This is an optimization hint.  No
+     relocation is required for correctness.  */
+  HOWTO (R_MIPS_JALR,	        /* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_JALR",	        /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS GD/LD dynamic relocations.  */
+  HOWTO (R_MIPS_TLS_DTPMOD32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_DTPMOD32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_MIPS_TLS_DTPREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_DTPREL32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (R_MIPS_TLS_DTPMOD64),
+  EMPTY_HOWTO (R_MIPS_TLS_DTPREL64),
+
+  /* TLS general dynamic variable reference.  */
+  HOWTO (R_MIPS_TLS_GD,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_GD",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS local dynamic variable reference.  */
+  HOWTO (R_MIPS_TLS_LDM,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_LDM",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS local dynamic offset.  */
+  HOWTO (R_MIPS_TLS_DTPREL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_DTPREL_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS local dynamic offset.  */
+  HOWTO (R_MIPS_TLS_DTPREL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_DTPREL_LO16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS thread pointer offset.  */
+  HOWTO (R_MIPS_TLS_GOTTPREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_GOTTPREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS IE dynamic relocations.  */
+  HOWTO (R_MIPS_TLS_TPREL32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_TPREL32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0xffffffff,		/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (R_MIPS_TLS_TPREL64),
+
+  /* TLS thread pointer offset.  */
+  HOWTO (R_MIPS_TLS_TPREL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_TPREL_HI16", /* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* TLS thread pointer offset.  */
+  HOWTO (R_MIPS_TLS_TPREL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_TLS_TPREL_LO16", /* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 32 bit relocation with no addend.  */
+  HOWTO (R_MIPS_GLOB_DAT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GLOB_DAT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+static reloc_howto_type elf_mips16_howto_table_rel[] =
+{
+  /* The reloc used for the mips16 jump instruction.  */
+  HOWTO (R_MIPS16_26,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 			/* This needs complex overflow
+				   detection, because the upper four
+				   bits must match the PC.  */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS16_26",		/* name */
+	 TRUE,			/* partial_inplace */
+	 0x3ffffff,		/* src_mask */
+	 0x3ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The reloc used for the mips16 gprel instruction.  */
+  HOWTO (R_MIPS16_GPREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mips16_gprel_reloc,	/* special_function */
+	 "R_MIPS16_GPREL",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,	        /* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A MIPS16 reference to the global offset table.  */
+  HOWTO (R_MIPS16_GOT16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_got16_reloc, /* special_function */
+	 "R_MIPS16_GOT16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,	        /* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A MIPS16 call through the global offset table.  */
+  HOWTO (R_MIPS16_CALL16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS16_CALL16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,	        /* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* MIPS16 high 16 bits of symbol value.  */
+  HOWTO (R_MIPS16_HI16,		/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_hi16_reloc, /* special_function */
+	 "R_MIPS16_HI16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* MIPS16 low 16 bits of symbol value.  */
+  HOWTO (R_MIPS16_LO16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_lo16_reloc, /* special_function */
+	 "R_MIPS16_LO16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+static reloc_howto_type elf_mips16_howto_table_rela[] =
+{
+  /* The reloc used for the mips16 jump instruction.  */
+  HOWTO (R_MIPS16_26,		/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 			/* This needs complex overflow
+				   detection, because the upper four
+				   bits must match the PC.  */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS16_26",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x3ffffff,		/* src_mask */
+	 0x3ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* The reloc used for the mips16 gprel instruction.  */
+  HOWTO (R_MIPS16_GPREL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 mips16_gprel_reloc,	/* special_function */
+	 "R_MIPS16_GPREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,	        /* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A MIPS16 reference to the global offset table.  */
+  HOWTO (R_MIPS16_GOT16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_got16_reloc, /* special_function */
+	 "R_MIPS16_GOT16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,	        /* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A MIPS16 call through the global offset table.  */
+  HOWTO (R_MIPS16_CALL16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS16_CALL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,	        /* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* MIPS16 high 16 bits of symbol value.  */
+  HOWTO (R_MIPS16_HI16,		/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_hi16_reloc, /* special_function */
+	 "R_MIPS16_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* MIPS16 low 16 bits of symbol value.  */
+  HOWTO (R_MIPS16_LO16,		/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_lo16_reloc, /* special_function */
+	 "R_MIPS16_LO16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+static reloc_howto_type elf_micromips_howto_table_rel[] =
+{
+  EMPTY_HOWTO (130),
+  EMPTY_HOWTO (131),
+  EMPTY_HOWTO (132),
+
+  /* 26 bit jump address.  */
+  HOWTO (R_MICROMIPS_26_S1,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 			/* This needs complex overflow
+				   detection, because the upper four
+				   bits must match the PC.  */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_26_S1",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x3ffffff,		/* src_mask */
+	 0x3ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of symbol value.  */
+  HOWTO (R_MICROMIPS_HI16,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_hi16_reloc, /* special_function */
+	 "R_MICROMIPS_HI16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of symbol value.  */
+  HOWTO (R_MICROMIPS_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_lo16_reloc, /* special_function */
+	 "R_MICROMIPS_LO16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GP relative reference.  */
+  HOWTO (R_MICROMIPS_GPREL16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf32_gprel16_reloc, /* special_function */
+	 "R_MICROMIPS_GPREL16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Reference to literal section.  */
+  HOWTO (R_MICROMIPS_LITERAL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf32_gprel16_reloc, /* special_function */
+	 "R_MICROMIPS_LITERAL",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Reference to global offset table.  */
+  HOWTO (R_MICROMIPS_GOT16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_got16_reloc, /* special_function */
+	 "R_MICROMIPS_GOT16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* This is for microMIPS branches.  */
+  HOWTO (R_MICROMIPS_PC7_S1,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 7,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_PC7_S1",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000007f,		/* src_mask */
+	 0x0000007f,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MICROMIPS_PC10_S1,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 10,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_PC10_S1",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x000003ff,		/* src_mask */
+	 0x000003ff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MICROMIPS_PC16_S1,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_PC16_S1",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 16 bit call through global offset table.  */
+  HOWTO (R_MICROMIPS_CALL16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_CALL16",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (143),
+  EMPTY_HOWTO (144),
+
+  /* Displacement in the global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_DISP,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_DISP",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Displacement to page pointer in the global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_PAGE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_PAGE",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Offset from page pointer in the global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_OFST,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_OFST",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of displacement in global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_HI16",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_LO16",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 64 bit subtraction.  Used in the N32 ABI.  */
+  HOWTO (R_MICROMIPS_SUB,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_SUB",	/* name */
+	 TRUE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* We don't support these for REL relocations, because it means building
+     the addend from a R_MICROMIPS_HIGHEST/R_MICROMIPS_HIGHER/
+     R_MICROMIPS_HI16/R_MICROMIPS_LO16 sequence with varying ordering,
+     using fallable heuristics.  */
+  EMPTY_HOWTO (R_MICROMIPS_HIGHER),
+  EMPTY_HOWTO (R_MICROMIPS_HIGHEST),
+
+  /* High 16 bits of displacement in global offset table.  */
+  HOWTO (R_MICROMIPS_CALL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_CALL_HI16",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_MICROMIPS_CALL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_CALL_LO16",/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+static reloc_howto_type elf_micromips_howto_table_rela[] =
+{
+  EMPTY_HOWTO (130),
+  EMPTY_HOWTO (131),
+  EMPTY_HOWTO (132),
+
+  /* 26 bit jump address.  */
+  HOWTO (R_MICROMIPS_26_S1,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 26,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 			/* This needs complex overflow
+				   detection, because the upper four
+				   bits must match the PC.  */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_26_S1",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x3ffffff,		/* src_mask */
+	 0x3ffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of symbol value.  */
+  HOWTO (R_MICROMIPS_HI16,	/* type */
+	 16,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_hi16_reloc, /* special_function */
+	 "R_MICROMIPS_HI16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of symbol value.  */
+  HOWTO (R_MICROMIPS_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_lo16_reloc, /* special_function */
+	 "R_MICROMIPS_LO16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* GP relative reference.  */
+  HOWTO (R_MICROMIPS_GPREL16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf32_gprel16_reloc, /* special_function */
+	 "R_MICROMIPS_GPREL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Reference to literal section.  */
+  HOWTO (R_MICROMIPS_LITERAL,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf32_gprel16_reloc, /* special_function */
+	 "R_MICROMIPS_LITERAL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Reference to global offset table.  */
+  HOWTO (R_MICROMIPS_GOT16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_got16_reloc, /* special_function */
+	 "R_MICROMIPS_GOT16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* This is for microMIPS branches.  */
+  HOWTO (R_MICROMIPS_PC7_S1,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 7,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_PC7_S1",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000007f,		/* src_mask */
+	 0x0000007f,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MICROMIPS_PC10_S1,	/* type */
+	 1,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 10,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_PC10_S1",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x000003ff,		/* src_mask */
+	 0x000003ff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_MICROMIPS_PC16_S1,	/* type */
+	 1,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_PC16_S1",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* 16 bit call through global offset table.  */
+  HOWTO (R_MICROMIPS_CALL16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_CALL16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  EMPTY_HOWTO (143),
+  EMPTY_HOWTO (144),
+
+  /* Displacement in the global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_DISP,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_DISP",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Displacement to page pointer in the global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_PAGE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_PAGE",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Offset from page pointer in the global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_OFST,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_OFST",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of displacement in global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_HI16",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_MICROMIPS_GOT_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_GOT_LO16",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* 64 bit subtraction.  Used in the N32 ABI.  */
+  HOWTO (R_MICROMIPS_SUB,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_SUB",	/* name */
+	 FALSE,			/* partial_inplace */
+	 MINUS_ONE,		/* src_mask */
+	 MINUS_ONE,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Get the higher value of a 64 bit addend.  */
+  HOWTO (R_MICROMIPS_HIGHER,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_HIGHER",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Get the highest value of a 64 bit addend.  */
+  HOWTO (R_MICROMIPS_HIGHEST,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_HIGHEST",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* High 16 bits of displacement in global offset table.  */
+  HOWTO (R_MICROMIPS_CALL_HI16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_CALL_HI16",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* Low 16 bits of displacement in global offset table.  */
+  HOWTO (R_MICROMIPS_CALL_LO16,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MICROMIPS_CALL_LO16",/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+};
+
+/* GNU extension to record C++ vtable hierarchy */
+static reloc_howto_type elf_mips_gnu_vtinherit_howto =
+  HOWTO (R_MIPS_GNU_VTINHERIT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 NULL,			/* special_function */
+	 "R_MIPS_GNU_VTINHERIT", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+/* GNU extension to record C++ vtable member usage */
+static reloc_howto_type elf_mips_gnu_vtentry_howto =
+  HOWTO (R_MIPS_GNU_VTENTRY,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 _bfd_elf_rel_vtable_reloc_fn, /* special_function */
+	 "R_MIPS_GNU_VTENTRY",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+/* 16 bit offset for pc-relative branches.  */
+static reloc_howto_type elf_mips_gnu_rel16_s2 =
+  HOWTO (R_MIPS_GNU_REL16_S2,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GNU_REL16_S2",	/* name */
+	 TRUE,			/* partial_inplace */
+	 0x0000ffff,		/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 TRUE);			/* pcrel_offset */
+
+/* 16 bit offset for pc-relative branches.  */
+static reloc_howto_type elf_mips_gnu_rela16_s2 =
+  HOWTO (R_MIPS_GNU_REL16_S2,	/* type */
+	 2,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 _bfd_mips_elf_generic_reloc, /* special_function */
+	 "R_MIPS_GNU_REL16_S2",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0x0000ffff,		/* dst_mask */
+	 TRUE);			/* pcrel_offset */
+
+/* Originally a VxWorks extension, but now used for other systems too.  */
+static reloc_howto_type elf_mips_copy_howto =
+  HOWTO (R_MIPS_COPY,		/* type */
+	 0,			/* rightshift */
+	 0,			/* this one is variable size */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_COPY",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,         		/* src_mask */
+	 0x0,		        /* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+/* Originally a VxWorks extension, but now used for other systems too.  */
+static reloc_howto_type elf_mips_jump_slot_howto =
+  HOWTO (R_MIPS_JUMP_SLOT,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_MIPS_JUMP_SLOT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x0,         		/* src_mask */
+	 0x0,		        /* dst_mask */
+	 FALSE);		/* pcrel_offset */
+
+/* Set the GP value for OUTPUT_BFD.  Returns FALSE if this is a
+   dangerous relocation.  */
+
+static bfd_boolean
+mips_elf_assign_gp (bfd *output_bfd, bfd_vma *pgp)
+{
+  unsigned int count;
+  asymbol **sym;
+  unsigned int i;
+
+  /* If we've already figured out what GP will be, just return it.  */
+  *pgp = _bfd_get_gp_value (output_bfd);
+  if (*pgp)
+    return TRUE;
+
+  count = bfd_get_symcount (output_bfd);
+  sym = bfd_get_outsymbols (output_bfd);
+
+  /* The linker script will have created a symbol named `_gp' with the
+     appropriate value.  */
+  if (sym == NULL)
+    i = count;
+  else
+    {
+      for (i = 0; i < count; i++, sym++)
+	{
+	  register const char *name;
+
+	  name = bfd_asymbol_name (*sym);
+	  if (*name == '_' && strcmp (name, "_gp") == 0)
+	    {
+	      *pgp = bfd_asymbol_value (*sym);
+	      _bfd_set_gp_value (output_bfd, *pgp);
+	      break;
+	    }
+	}
+    }
+
+  if (i >= count)
+    {
+      /* Only get the error once.  */
+      *pgp = 4;
+      _bfd_set_gp_value (output_bfd, *pgp);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* We have to figure out the gp value, so that we can adjust the
+   symbol value correctly.  We look up the symbol _gp in the output
+   BFD.  If we can't find it, we're stuck.  We cache it in the ELF
+   target data.  We don't need to adjust the symbol value for an
+   external symbol if we are producing relocatable output.  */
+
+static bfd_reloc_status_type
+mips_elf_final_gp (bfd *output_bfd, asymbol *symbol, bfd_boolean relocatable,
+		   char **error_message, bfd_vma *pgp)
+{
+  if (bfd_is_und_section (symbol->section)
+      && ! relocatable)
+    {
+      *pgp = 0;
+      return bfd_reloc_undefined;
+    }
+
+  *pgp = _bfd_get_gp_value (output_bfd);
+  if (*pgp == 0
+      && (! relocatable
+	  || (symbol->flags & BSF_SECTION_SYM) != 0))
+    {
+      if (relocatable)
+	{
+	  /* Make up a value.  */
+	  *pgp = symbol->section->output_section->vma /*+ 0x4000*/;
+	  _bfd_set_gp_value (output_bfd, *pgp);
+	}
+      else if (!mips_elf_assign_gp (output_bfd, pgp))
+	{
+	  *error_message =
+	    (char *) _("GP relative relocation when _gp not defined");
+	  return bfd_reloc_dangerous;
+	}
+    }
+
+  return bfd_reloc_ok;
+}
+
+/* Do a R_MIPS_GPREL16 relocation.  This is a 16 bit value which must
+   become the offset from the gp register.  */
+
+static bfd_reloc_status_type
+mips_elf_gprel16_reloc (bfd *abfd ATTRIBUTE_UNUSED, arelent *reloc_entry,
+			asymbol *symbol, void *data ATTRIBUTE_UNUSED,
+			asection *input_section, bfd *output_bfd,
+			char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_boolean relocatable;
+  bfd_reloc_status_type ret;
+  bfd_vma gp;
+
+  if (output_bfd != NULL)
+    relocatable = TRUE;
+  else
+    {
+      relocatable = FALSE;
+      output_bfd = symbol->section->output_section->owner;
+    }
+
+  ret = mips_elf_final_gp (output_bfd, symbol, relocatable, error_message,
+			   &gp);
+  if (ret != bfd_reloc_ok)
+    return ret;
+
+  return _bfd_mips_elf_gprel16_with_gp (abfd, symbol, reloc_entry,
+					input_section, relocatable,
+					data, gp);
+}
+
+/* Do a R_MIPS_LITERAL relocation.  */
+
+static bfd_reloc_status_type
+mips_elf_literal_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+			void *data, asection *input_section, bfd *output_bfd,
+			char **error_message)
+{
+  bfd_boolean relocatable;
+  bfd_reloc_status_type ret;
+  bfd_vma gp;
+
+  /* R_MIPS_LITERAL relocations are defined for local symbols only.  */
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (symbol->flags & BSF_LOCAL) != 0)
+    {
+      *error_message = (char *)
+	_("literal relocation occurs for an external symbol");
+      return bfd_reloc_outofrange;
+    }
+
+  /* FIXME: The entries in the .lit8 and .lit4 sections should be merged.  */
+  if (output_bfd != NULL)
+    relocatable = TRUE;
+  else
+    {
+      relocatable = FALSE;
+      output_bfd = symbol->section->output_section->owner;
+    }
+
+  ret = mips_elf_final_gp (output_bfd, symbol, relocatable, error_message,
+			   &gp);
+  if (ret != bfd_reloc_ok)
+    return ret;
+
+  return _bfd_mips_elf_gprel16_with_gp (abfd, symbol, reloc_entry,
+					input_section, relocatable,
+					data, gp);
+}
+
+/* Do a R_MIPS_GPREL32 relocation.  This is a 32 bit value which must
+   become the offset from the gp register.  */
+
+static bfd_reloc_status_type
+mips_elf_gprel32_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+			void *data, asection *input_section, bfd *output_bfd,
+			char **error_message)
+{
+  bfd_boolean relocatable;
+  bfd_reloc_status_type ret;
+  bfd_vma gp;
+
+  /* R_MIPS_GPREL32 relocations are defined for local symbols only.  */
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (symbol->flags & BSF_LOCAL) != 0)
+    {
+      *error_message = (char *)
+	_("32bits gp relative relocation occurs for an external symbol");
+      return bfd_reloc_outofrange;
+    }
+
+  if (output_bfd != NULL)
+    {
+      relocatable = TRUE;
+      gp = _bfd_get_gp_value (output_bfd);
+    }
+  else
+    {
+      relocatable = FALSE;
+      output_bfd = symbol->section->output_section->owner;
+
+      ret = mips_elf_final_gp (output_bfd, symbol, relocatable,
+			       error_message, &gp);
+      if (ret != bfd_reloc_ok)
+	return ret;
+    }
+
+  return gprel32_with_gp (abfd, symbol, reloc_entry, input_section,
+			  relocatable, data, gp);
+}
+
+static bfd_reloc_status_type
+gprel32_with_gp (bfd *abfd, asymbol *symbol, arelent *reloc_entry,
+		 asection *input_section, bfd_boolean relocatable,
+		 void *data, bfd_vma gp)
+{
+  bfd_vma relocation;
+  unsigned long val;
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  if (reloc_entry->howto->src_mask == 0)
+    val = 0;
+  else
+    val = bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
+
+  /* Set val to the offset into the section or symbol.  */
+  val += reloc_entry->addend;
+
+  /* Adjust val for the final section location and GP value.  If we
+     are producing relocatable output, we don't want to do this for
+     an external symbol.  */
+  if (! relocatable
+      || (symbol->flags & BSF_SECTION_SYM) != 0)
+    val += relocation - gp;
+
+  bfd_put_32 (abfd, val, (bfd_byte *) data + reloc_entry->address);
+
+  if (relocatable)
+    reloc_entry->address += input_section->output_offset;
+
+  return bfd_reloc_ok;
+}
+
+/* Do a R_MIPS_SHIFT6 relocation. The MSB of the shift is stored at bit 2,
+   the rest is at bits 6-10. The bitpos already got right by the howto.  */
+
+static bfd_reloc_status_type
+mips_elf_shift6_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+		       void *data, asection *input_section, bfd *output_bfd,
+		       char **error_message)
+{
+  if (reloc_entry->howto->partial_inplace)
+    {
+      reloc_entry->addend = ((reloc_entry->addend & 0x00007c0)
+			     | (reloc_entry->addend & 0x00000800) >> 9);
+    }
+
+  return _bfd_mips_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+				      input_section, output_bfd,
+				      error_message);
+}
+
+/* Handle a mips16 GP relative reloc.  */
+
+static bfd_reloc_status_type
+mips16_gprel_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+		    void *data, asection *input_section, bfd *output_bfd,
+		    char **error_message)
+{
+  bfd_boolean relocatable;
+  bfd_reloc_status_type ret;
+  bfd_byte *location;
+  bfd_vma gp;
+
+  /* If we're relocating, and this is an external symbol, we don't want
+     to change anything.  */
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (symbol->flags & BSF_LOCAL) != 0)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  if (output_bfd != NULL)
+    relocatable = TRUE;
+  else
+    {
+      relocatable = FALSE;
+      output_bfd = symbol->section->output_section->owner;
+    }
+
+  ret = mips_elf_final_gp (output_bfd, symbol, relocatable, error_message,
+			   &gp);
+  if (ret != bfd_reloc_ok)
+    return ret;
+
+  location = (bfd_byte *) data + reloc_entry->address;
+  _bfd_mips_elf_reloc_unshuffle (abfd, reloc_entry->howto->type, FALSE,
+				 location);
+  ret = _bfd_mips_elf_gprel16_with_gp (abfd, symbol, reloc_entry,
+				       input_section, relocatable,
+				       data, gp);
+  _bfd_mips_elf_reloc_shuffle (abfd, reloc_entry->howto->type, !relocatable,
+			       location);
+
+  return ret;
+}
+
+/* A mapping from BFD reloc types to MIPS ELF reloc types.  */
+
+struct elf_reloc_map {
+  bfd_reloc_code_real_type bfd_val;
+  enum elf_mips_reloc_type elf_val;
+};
+
+static const struct elf_reloc_map mips_reloc_map[] =
+{
+  { BFD_RELOC_NONE, R_MIPS_NONE },
+  { BFD_RELOC_16, R_MIPS_16 },
+  { BFD_RELOC_32, R_MIPS_32 },
+  /* There is no BFD reloc for R_MIPS_REL32.  */
+  { BFD_RELOC_CTOR, R_MIPS_32 },
+  { BFD_RELOC_64, R_MIPS_64 },
+  { BFD_RELOC_16_PCREL_S2, R_MIPS_PC16 },
+  { BFD_RELOC_HI16_S, R_MIPS_HI16 },
+  { BFD_RELOC_LO16, R_MIPS_LO16 },
+  { BFD_RELOC_GPREL16, R_MIPS_GPREL16 },
+  { BFD_RELOC_GPREL32, R_MIPS_GPREL32 },
+  { BFD_RELOC_MIPS_JMP, R_MIPS_26 },
+  { BFD_RELOC_MIPS_LITERAL, R_MIPS_LITERAL },
+  { BFD_RELOC_MIPS_GOT16, R_MIPS_GOT16 },
+  { BFD_RELOC_MIPS_CALL16, R_MIPS_CALL16 },
+  { BFD_RELOC_MIPS_SHIFT5, R_MIPS_SHIFT5 },
+  { BFD_RELOC_MIPS_SHIFT6, R_MIPS_SHIFT6 },
+  { BFD_RELOC_MIPS_GOT_DISP, R_MIPS_GOT_DISP },
+  { BFD_RELOC_MIPS_GOT_PAGE, R_MIPS_GOT_PAGE },
+  { BFD_RELOC_MIPS_GOT_OFST, R_MIPS_GOT_OFST },
+  { BFD_RELOC_MIPS_GOT_HI16, R_MIPS_GOT_HI16 },
+  { BFD_RELOC_MIPS_GOT_LO16, R_MIPS_GOT_LO16 },
+  { BFD_RELOC_MIPS_SUB, R_MIPS_SUB },
+  { BFD_RELOC_MIPS_INSERT_A, R_MIPS_INSERT_A },
+  { BFD_RELOC_MIPS_INSERT_B, R_MIPS_INSERT_B },
+  { BFD_RELOC_MIPS_DELETE, R_MIPS_DELETE },
+  { BFD_RELOC_MIPS_HIGHEST, R_MIPS_HIGHEST },
+  { BFD_RELOC_MIPS_HIGHER, R_MIPS_HIGHER },
+  { BFD_RELOC_MIPS_CALL_HI16, R_MIPS_CALL_HI16 },
+  { BFD_RELOC_MIPS_CALL_LO16, R_MIPS_CALL_LO16 },
+  { BFD_RELOC_MIPS_SCN_DISP, R_MIPS_SCN_DISP },
+  { BFD_RELOC_MIPS_REL16, R_MIPS_REL16 },
+  /* Use of R_MIPS_ADD_IMMEDIATE and R_MIPS_PJUMP is deprecated.  */
+  { BFD_RELOC_MIPS_RELGOT, R_MIPS_RELGOT },
+  { BFD_RELOC_MIPS_JALR, R_MIPS_JALR },
+  { BFD_RELOC_MIPS_TLS_DTPMOD32, R_MIPS_TLS_DTPMOD32 },
+  { BFD_RELOC_MIPS_TLS_DTPREL32, R_MIPS_TLS_DTPREL32 },
+  { BFD_RELOC_MIPS_TLS_DTPMOD64, R_MIPS_TLS_DTPMOD64 },
+  { BFD_RELOC_MIPS_TLS_DTPREL64, R_MIPS_TLS_DTPREL64 },
+  { BFD_RELOC_MIPS_TLS_GD, R_MIPS_TLS_GD },
+  { BFD_RELOC_MIPS_TLS_LDM, R_MIPS_TLS_LDM },
+  { BFD_RELOC_MIPS_TLS_DTPREL_HI16, R_MIPS_TLS_DTPREL_HI16 },
+  { BFD_RELOC_MIPS_TLS_DTPREL_LO16, R_MIPS_TLS_DTPREL_LO16 },
+  { BFD_RELOC_MIPS_TLS_GOTTPREL, R_MIPS_TLS_GOTTPREL },
+  { BFD_RELOC_MIPS_TLS_TPREL32, R_MIPS_TLS_TPREL32 },
+  { BFD_RELOC_MIPS_TLS_TPREL64, R_MIPS_TLS_TPREL64 },
+  { BFD_RELOC_MIPS_TLS_TPREL_HI16, R_MIPS_TLS_TPREL_HI16 },
+  { BFD_RELOC_MIPS_TLS_TPREL_LO16, R_MIPS_TLS_TPREL_LO16 }
+};
+
+static const struct elf_reloc_map mips16_reloc_map[] =
+{
+  { BFD_RELOC_MIPS16_JMP, R_MIPS16_26 - R_MIPS16_min },
+  { BFD_RELOC_MIPS16_GPREL, R_MIPS16_GPREL - R_MIPS16_min },
+  { BFD_RELOC_MIPS16_GOT16, R_MIPS16_GOT16 - R_MIPS16_min },
+  { BFD_RELOC_MIPS16_CALL16, R_MIPS16_CALL16 - R_MIPS16_min },
+  { BFD_RELOC_MIPS16_HI16_S, R_MIPS16_HI16 - R_MIPS16_min },
+  { BFD_RELOC_MIPS16_LO16, R_MIPS16_LO16 - R_MIPS16_min },
+};
+
+static const struct elf_reloc_map micromips_reloc_map[] =
+{
+  { BFD_RELOC_MICROMIPS_JMP, R_MICROMIPS_26_S1 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_HI16_S, R_MICROMIPS_HI16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_LO16, R_MICROMIPS_LO16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GPREL16, R_MICROMIPS_GPREL16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_LITERAL, R_MICROMIPS_LITERAL - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GOT16, R_MICROMIPS_GOT16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_7_PCREL_S1, R_MICROMIPS_PC7_S1 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_10_PCREL_S1, R_MICROMIPS_PC10_S1 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_16_PCREL_S1, R_MICROMIPS_PC16_S1 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_CALL16, R_MICROMIPS_CALL16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GOT_DISP, R_MICROMIPS_GOT_DISP - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GOT_PAGE, R_MICROMIPS_GOT_PAGE - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GOT_OFST, R_MICROMIPS_GOT_OFST - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GOT_HI16, R_MICROMIPS_GOT_HI16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_GOT_LO16, R_MICROMIPS_GOT_LO16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_SUB, R_MICROMIPS_SUB - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_HIGHER, R_MICROMIPS_HIGHER - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_HIGHEST, R_MICROMIPS_HIGHEST - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_CALL_HI16, R_MICROMIPS_CALL_HI16 - R_MICROMIPS_min },
+  { BFD_RELOC_MICROMIPS_CALL_LO16, R_MICROMIPS_CALL_LO16 - R_MICROMIPS_min },
+};
+
+/* Given a BFD reloc type, return a howto structure.  */
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+  /* FIXME: We default to RELA here instead of choosing the right
+     relocation variant.  */
+  reloc_howto_type *howto_table = elf_mips_howto_table_rela;
+  reloc_howto_type *howto16_table = elf_mips16_howto_table_rela;
+  reloc_howto_type *howto_micromips_table = elf_micromips_howto_table_rela;
+
+  for (i = 0; i < sizeof (mips_reloc_map) / sizeof (struct elf_reloc_map);
+       i++)
+    {
+      if (mips_reloc_map[i].bfd_val == code)
+	return &howto_table[(int) mips_reloc_map[i].elf_val];
+    }
+
+  for (i = 0; i < sizeof (mips16_reloc_map) / sizeof (struct elf_reloc_map);
+       i++)
+    {
+      if (mips16_reloc_map[i].bfd_val == code)
+	return &howto16_table[(int) mips16_reloc_map[i].elf_val];
+    }
+
+  for (i = 0; i < sizeof (micromips_reloc_map) / sizeof (struct elf_reloc_map);
+       i++)
+    {
+      if (micromips_reloc_map[i].bfd_val == code)
+	return &howto_micromips_table[(int) micromips_reloc_map[i].elf_val];
+    }
+
+  switch (code)
+    {
+    case BFD_RELOC_VTABLE_INHERIT:
+      return &elf_mips_gnu_vtinherit_howto;
+    case BFD_RELOC_VTABLE_ENTRY:
+      return &elf_mips_gnu_vtentry_howto;
+    case BFD_RELOC_MIPS_COPY:
+      return &elf_mips_copy_howto;
+    case BFD_RELOC_MIPS_JUMP_SLOT:
+      return &elf_mips_jump_slot_howto;
+    default:
+      bfd_set_error (bfd_error_bad_value);
+      return NULL;
+    }
+}
+
+static reloc_howto_type *
+bfd_elf32_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (elf_mips_howto_table_rela)
+	    / sizeof (elf_mips_howto_table_rela[0]));
+       i++)
+    if (elf_mips_howto_table_rela[i].name != NULL
+	&& strcasecmp (elf_mips_howto_table_rela[i].name, r_name) == 0)
+      return &elf_mips_howto_table_rela[i];
+
+  for (i = 0;
+       i < (sizeof (elf_mips16_howto_table_rela)
+	    / sizeof (elf_mips16_howto_table_rela[0]));
+       i++)
+    if (elf_mips16_howto_table_rela[i].name != NULL
+	&& strcasecmp (elf_mips16_howto_table_rela[i].name, r_name) == 0)
+      return &elf_mips16_howto_table_rela[i];
+
+  for (i = 0;
+       i < (sizeof (elf_micromips_howto_table_rela)
+	    / sizeof (elf_micromips_howto_table_rela[0]));
+       i++)
+    if (elf_micromips_howto_table_rela[i].name != NULL
+	&& strcasecmp (elf_micromips_howto_table_rela[i].name, r_name) == 0)
+      return &elf_micromips_howto_table_rela[i];
+
+  if (strcasecmp (elf_mips_gnu_vtinherit_howto.name, r_name) == 0)
+    return &elf_mips_gnu_vtinherit_howto;
+  if (strcasecmp (elf_mips_gnu_vtentry_howto.name, r_name) == 0)
+    return &elf_mips_gnu_vtentry_howto;
+  if (strcasecmp (elf_mips_gnu_rel16_s2.name, r_name) == 0)
+    return &elf_mips_gnu_rel16_s2;
+  if (strcasecmp (elf_mips_gnu_rela16_s2.name, r_name) == 0)
+    return &elf_mips_gnu_rela16_s2;
+  if (strcasecmp (elf_mips_copy_howto.name, r_name) == 0)
+    return &elf_mips_copy_howto;
+  if (strcasecmp (elf_mips_jump_slot_howto.name, r_name) == 0)
+    return &elf_mips_jump_slot_howto;
+
+  return NULL;
+}
+
+/* Given a MIPS Elf_Internal_Rel, fill in an arelent structure.  */
+
+static reloc_howto_type *
+mips_elf_n32_rtype_to_howto (unsigned int r_type, bfd_boolean rela_p)
+{
+  switch (r_type)
+    {
+    case R_MIPS_GNU_VTINHERIT:
+      return &elf_mips_gnu_vtinherit_howto;
+    case R_MIPS_GNU_VTENTRY:
+      return &elf_mips_gnu_vtentry_howto;
+    case R_MIPS_GNU_REL16_S2:
+      if (rela_p)
+	return &elf_mips_gnu_rela16_s2;
+      else
+	return &elf_mips_gnu_rel16_s2;
+    case R_MIPS_COPY:
+      return &elf_mips_copy_howto;
+    case R_MIPS_JUMP_SLOT:
+      return &elf_mips_jump_slot_howto;
+    default:
+      if (r_type >= R_MICROMIPS_min && r_type < R_MICROMIPS_max)
+	{
+	  if (rela_p)
+	    return &elf_micromips_howto_table_rela[r_type - R_MICROMIPS_min];
+	  else
+	    return &elf_micromips_howto_table_rel[r_type - R_MICROMIPS_min];
+	}
+      if (r_type >= R_MIPS16_min && r_type < R_MIPS16_max)
+	{
+	  if (rela_p)
+	    return &elf_mips16_howto_table_rela[r_type - R_MIPS16_min];
+	  else
+	    return &elf_mips16_howto_table_rel[r_type - R_MIPS16_min];
+	}
+      BFD_ASSERT (r_type < (unsigned int) R_MIPS_max);
+      if (rela_p)
+	return &elf_mips_howto_table_rela[r_type];
+      else
+	return &elf_mips_howto_table_rel[r_type];
+      break;
+    }
+}
+
+/* Given a MIPS Elf_Internal_Rel, fill in an arelent structure.  */
+
+static void
+mips_info_to_howto_rel (bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  cache_ptr->howto = mips_elf_n32_rtype_to_howto (r_type, FALSE);
+
+  /* The addend for a GPREL16 or LITERAL relocation comes from the GP
+     value for the object file.  We get the addend now, rather than
+     when we do the relocation, because the symbol manipulations done
+     by the linker may cause us to lose track of the input BFD.  */
+  if (((*cache_ptr->sym_ptr_ptr)->flags & BSF_SECTION_SYM) != 0
+      && (gprel16_reloc_p (r_type) || r_type == (unsigned int) R_MIPS_LITERAL))
+    cache_ptr->addend = elf_gp (abfd);
+}
+
+/* Given a MIPS Elf_Internal_Rela, fill in an arelent structure.  */
+
+static void
+mips_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
+			 arelent *cache_ptr, Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  cache_ptr->howto = mips_elf_n32_rtype_to_howto (r_type, TRUE);
+  cache_ptr->addend = dst->r_addend;
+}
+
+/* Determine whether a symbol is global for the purposes of splitting
+   the symbol table into global symbols and local symbols.  At least
+   on Irix 5, this split must be between section symbols and all other
+   symbols.  On most ELF targets the split is between static symbols
+   and externally visible symbols.  */
+
+static bfd_boolean
+mips_elf_sym_is_global (bfd *abfd ATTRIBUTE_UNUSED, asymbol *sym)
+{
+  if (SGI_COMPAT (abfd))
+    return (sym->flags & BSF_SECTION_SYM) == 0;
+  else
+    return ((sym->flags & (BSF_GLOBAL | BSF_WEAK | BSF_GNU_UNIQUE)) != 0
+	    || bfd_is_und_section (bfd_get_section (sym))
+	    || bfd_is_com_section (bfd_get_section (sym)));
+}
+
+/* Set the right machine number for a MIPS ELF file.  */
+
+static bfd_boolean
+mips_elf_n32_object_p (bfd *abfd)
+{
+  unsigned long mach;
+
+  /* Irix 5 and 6 are broken.  Object file symbol tables are not always
+     sorted correctly such that local symbols precede global symbols,
+     and the sh_info field in the symbol table is not always right.  */
+  if (SGI_COMPAT (abfd))
+    elf_bad_symtab (abfd) = TRUE;
+
+  mach = _bfd_elf_mips_mach (elf_elfheader (abfd)->e_flags);
+  bfd_default_set_arch_mach (abfd, bfd_arch_mips, mach);
+
+  if (! ABI_N32_P(abfd))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Support for core dump NOTE sections.  */
+static bfd_boolean
+elf32_mips_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
+{
+  int offset;
+  unsigned int size;
+
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      case 440:		/* Linux/MIPS N32 */
+	/* pr_cursig */
+	elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12);
+
+	/* pr_pid */
+	elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 24);
+
+	/* pr_reg */
+	offset = 72;
+	size = 360;
+
+	break;
+    }
+
+  /* Make a ".reg/999" section.  */
+  return _bfd_elfcore_make_pseudosection (abfd, ".reg", size,
+					  note->descpos + offset);
+}
+
+static bfd_boolean
+elf32_mips_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
+{
+  switch (note->descsz)
+    {
+      default:
+	return FALSE;
+
+      case 128:		/* Linux/MIPS elf_prpsinfo */
+	elf_tdata (abfd)->core_program
+	 = _bfd_elfcore_strndup (abfd, note->descdata + 32, 16);
+	elf_tdata (abfd)->core_command
+	 = _bfd_elfcore_strndup (abfd, note->descdata + 48, 80);
+    }
+
+  /* Note that for some reason, a spurious space is tacked
+     onto the end of the args in some (at least one anyway)
+     implementations, so strip it off if it exists.  */
+
+  {
+    char *command = elf_tdata (abfd)->core_command;
+    int n = strlen (command);
+
+    if (0 < n && command[n - 1] == ' ')
+      command[n - 1] = '\0';
+  }
+
+  return TRUE;
+}
+
+/* Depending on the target vector we generate some version of Irix
+   executables or "normal" MIPS ELF ABI executables.  */
+static irix_compat_t
+elf_n32_mips_irix_compat (bfd *abfd)
+{
+  if ((abfd->xvec == &bfd_elf32_nbigmips_vec)
+      || (abfd->xvec == &bfd_elf32_nlittlemips_vec))
+    return ict_irix6;
+  else
+    return ict_none;
+}
+
+/* ECOFF swapping routines.  These are used when dealing with the
+   .mdebug section, which is in the ECOFF debugging format.  */
+static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = {
+  /* Symbol table magic number.  */
+  magicSym,
+  /* Alignment of debugging information.  E.g., 4.  */
+  4,
+  /* Sizes of external symbolic information.  */
+  sizeof (struct hdr_ext),
+  sizeof (struct dnr_ext),
+  sizeof (struct pdr_ext),
+  sizeof (struct sym_ext),
+  sizeof (struct opt_ext),
+  sizeof (struct fdr_ext),
+  sizeof (struct rfd_ext),
+  sizeof (struct ext_ext),
+  /* Functions to swap in external symbolic data.  */
+  ecoff_swap_hdr_in,
+  ecoff_swap_dnr_in,
+  ecoff_swap_pdr_in,
+  ecoff_swap_sym_in,
+  ecoff_swap_opt_in,
+  ecoff_swap_fdr_in,
+  ecoff_swap_rfd_in,
+  ecoff_swap_ext_in,
+  _bfd_ecoff_swap_tir_in,
+  _bfd_ecoff_swap_rndx_in,
+  /* Functions to swap out external symbolic data.  */
+  ecoff_swap_hdr_out,
+  ecoff_swap_dnr_out,
+  ecoff_swap_pdr_out,
+  ecoff_swap_sym_out,
+  ecoff_swap_opt_out,
+  ecoff_swap_fdr_out,
+  ecoff_swap_rfd_out,
+  ecoff_swap_ext_out,
+  _bfd_ecoff_swap_tir_out,
+  _bfd_ecoff_swap_rndx_out,
+  /* Function to read in symbolic data.  */
+  _bfd_mips_elf_read_ecoff_info
+};
+
+#define ELF_ARCH			bfd_arch_mips
+#define ELF_TARGET_ID			MIPS_ELF_DATA
+#define ELF_MACHINE_CODE		EM_MIPS
+
+#define elf_backend_collect		TRUE
+#define elf_backend_type_change_ok	TRUE
+#define elf_backend_can_gc_sections	TRUE
+#define elf_info_to_howto		mips_info_to_howto_rela
+#define elf_info_to_howto_rel		mips_info_to_howto_rel
+#define elf_backend_sym_is_global	mips_elf_sym_is_global
+#define elf_backend_object_p		mips_elf_n32_object_p
+#define elf_backend_symbol_processing	_bfd_mips_elf_symbol_processing
+#define elf_backend_section_processing	_bfd_mips_elf_section_processing
+#define elf_backend_section_from_shdr	_bfd_mips_elf_section_from_shdr
+#define elf_backend_fake_sections	_bfd_mips_elf_fake_sections
+#define elf_backend_section_from_bfd_section \
+					_bfd_mips_elf_section_from_bfd_section
+#define elf_backend_add_symbol_hook	_bfd_mips_elf_add_symbol_hook
+#define elf_backend_link_output_symbol_hook \
+					_bfd_mips_elf_link_output_symbol_hook
+#define elf_backend_create_dynamic_sections \
+					_bfd_mips_elf_create_dynamic_sections
+#define elf_backend_check_relocs	_bfd_mips_elf_check_relocs
+#define elf_backend_merge_symbol_attribute \
+					_bfd_mips_elf_merge_symbol_attribute
+#define elf_backend_get_target_dtag	_bfd_mips_elf_get_target_dtag
+#define elf_backend_adjust_dynamic_symbol \
+					_bfd_mips_elf_adjust_dynamic_symbol
+#define elf_backend_always_size_sections \
+					_bfd_mips_elf_always_size_sections
+#define elf_backend_size_dynamic_sections \
+					_bfd_mips_elf_size_dynamic_sections
+#define elf_backend_init_index_section	_bfd_elf_init_1_index_section
+#define elf_backend_relocate_section	_bfd_mips_elf_relocate_section
+#define elf_backend_finish_dynamic_symbol \
+					_bfd_mips_elf_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections \
+					_bfd_mips_elf_finish_dynamic_sections
+#define elf_backend_final_write_processing \
+					_bfd_mips_elf_final_write_processing
+#define elf_backend_additional_program_headers \
+					_bfd_mips_elf_additional_program_headers
+#define elf_backend_modify_segment_map	_bfd_mips_elf_modify_segment_map
+#define elf_backend_gc_mark_hook	_bfd_mips_elf_gc_mark_hook
+#define elf_backend_gc_sweep_hook	_bfd_mips_elf_gc_sweep_hook
+#define elf_backend_copy_indirect_symbol \
+					_bfd_mips_elf_copy_indirect_symbol
+#define elf_backend_grok_prstatus	elf32_mips_grok_prstatus
+#define elf_backend_grok_psinfo		elf32_mips_grok_psinfo
+#define elf_backend_ecoff_debug_swap	&mips_elf32_ecoff_debug_swap
+
+#define elf_backend_got_header_size	(4 * MIPS_RESERVED_GOTNO)
+
+/* MIPS n32 ELF can use a mixture of REL and RELA, but some Relocations
+   work better/work only in RELA, so we default to this.  */
+#define elf_backend_may_use_rel_p	1
+#define elf_backend_may_use_rela_p	1
+#define elf_backend_default_use_rela_p	1
+#define elf_backend_rela_plts_and_copies_p 0
+#define elf_backend_sign_extend_vma	TRUE
+#define elf_backend_plt_readonly	1
+#define elf_backend_plt_sym_val		_bfd_mips_elf_plt_sym_val
+
+#define elf_backend_discard_info	_bfd_mips_elf_discard_info
+#define elf_backend_ignore_discarded_relocs \
+					_bfd_mips_elf_ignore_discarded_relocs
+#define elf_backend_write_section	_bfd_mips_elf_write_section
+#define elf_backend_mips_irix_compat	elf_n32_mips_irix_compat
+#define elf_backend_mips_rtype_to_howto	mips_elf_n32_rtype_to_howto
+#define bfd_elf32_bfd_is_target_special_symbol \
+					_bfd_mips_elf_is_target_special_symbol
+#define bfd_elf32_find_nearest_line	_bfd_mips_elf_find_nearest_line
+#define bfd_elf32_find_inliner_info	_bfd_mips_elf_find_inliner_info
+#define bfd_elf32_new_section_hook	_bfd_mips_elf_new_section_hook
+#define bfd_elf32_set_section_contents	_bfd_mips_elf_set_section_contents
+#define bfd_elf32_bfd_get_relocated_section_contents \
+				_bfd_elf_mips_get_relocated_section_contents
+#define bfd_elf32_bfd_link_hash_table_create \
+					_bfd_mips_elf_link_hash_table_create
+#define bfd_elf32_bfd_final_link	_bfd_mips_elf_final_link
+#define bfd_elf32_bfd_merge_private_bfd_data \
+					_bfd_mips_elf_merge_private_bfd_data
+#define bfd_elf32_bfd_set_private_flags	_bfd_mips_elf_set_private_flags
+#define bfd_elf32_bfd_print_private_bfd_data \
+					_bfd_mips_elf_print_private_bfd_data
+#define bfd_elf32_bfd_relax_section     _bfd_mips_relax_section
+
+/* Support for SGI-ish mips targets using n32 ABI.  */
+
+#define TARGET_LITTLE_SYM               bfd_elf32_nlittlemips_vec
+#define TARGET_LITTLE_NAME              "elf32-nlittlemips"
+#define TARGET_BIG_SYM                  bfd_elf32_nbigmips_vec
+#define TARGET_BIG_NAME                 "elf32-nbigmips"
+
+#define ELF_MAXPAGESIZE			0x10000
+#define ELF_COMMONPAGESIZE		0x1000
+
+#include "elf32-target.h"
+
+/* Support for traditional mips targets using n32 ABI.  */
+#undef TARGET_LITTLE_SYM
+#undef TARGET_LITTLE_NAME
+#undef TARGET_BIG_SYM
+#undef TARGET_BIG_NAME
+
+#undef ELF_MAXPAGESIZE
+#undef ELF_COMMONPAGESIZE
+
+#define TARGET_LITTLE_SYM               bfd_elf32_ntradlittlemips_vec
+#define TARGET_LITTLE_NAME              "elf32-ntradlittlemips"
+#define TARGET_BIG_SYM                  bfd_elf32_ntradbigmips_vec
+#define TARGET_BIG_NAME                 "elf32-ntradbigmips"
+
+#define ELF_MAXPAGESIZE			0x10000
+#define ELF_COMMONPAGESIZE		0x1000
+#define elf32_bed			elf32_tradbed
+
+/* Include the target file again for this target.  */
+#include "elf32-target.h"
+
+
+/* FreeBSD support.  */
+
+#undef TARGET_LITTLE_SYM
+#undef TARGET_LITTLE_NAME
+#undef TARGET_BIG_SYM
+#undef TARGET_BIG_NAME
+
+#define	TARGET_LITTLE_SYM		bfd_elf32_ntradlittlemips_freebsd_vec
+#define	TARGET_LITTLE_NAME		"elf32-ntradlittlemips-freebsd"
+#define	TARGET_BIG_SYM			bfd_elf32_ntradbigmips_freebsd_vec
+#define	TARGET_BIG_NAME			"elf32-ntradbigmips-freebsd"
+
+#undef	ELF_OSABI
+#define	ELF_OSABI			ELFOSABI_FREEBSD
+
+/* The kernel recognizes executables as valid only if they carry a
+   "FreeBSD" label in the ELF header.  So we put this label on all
+   executables and (for simplicity) also all other object files.  */
+
+static void
+elf_fbsd_post_process_headers (bfd *abfd, struct bfd_link_info *info)
+{
+  _bfd_elf_set_osabi (abfd, info);
+}
+
+#undef	elf_backend_post_process_headers
+#define	elf_backend_post_process_headers	elf_fbsd_post_process_headers
+#undef	elf32_bed
+#define elf32_bed				elf32_fbsd_tradbed
+
+#include "elf32-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfnn-ia64.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfnn-ia64.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfnn-ia64.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfnn-ia64.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,5457 @@
+/* IA-64 support for 64-bit ELF
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+   2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+   Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "opcode/ia64.h"
+#include "elf/ia64.h"
+#include "objalloc.h"
+#include "hashtab.h"
+#include "bfd_stdint.h"
+#include "elfxx-ia64.h"
+
+#define ARCH_SIZE	NN
+
+#if ARCH_SIZE == 64
+#define	LOG_SECTION_ALIGN	3
+#endif
+
+#if ARCH_SIZE == 32
+#define	LOG_SECTION_ALIGN	2
+#endif
+
+/* Only add code for vms when the vms target is enabled.  This is required
+   because it depends on vms-lib.c for its archive format and we don't want
+   to compile that code if it is not used.  */
+#if ARCH_SIZE == 64 && \
+  (defined (HAVE_bfd_elf64_ia64_vms_vec) || defined (HAVE_all_vecs))
+#define INCLUDE_IA64_VMS
+#endif
+
+typedef struct bfd_hash_entry *(*new_hash_entry_func)
+  (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
+
+/* In dynamically (linker-) created sections, we generally need to keep track
+   of the place a symbol or expression got allocated to. This is done via hash
+   tables that store entries of the following type.  */
+
+struct elfNN_ia64_dyn_sym_info
+{
+  /* The addend for which this entry is relevant.  */
+  bfd_vma addend;
+
+  bfd_vma got_offset;
+  bfd_vma fptr_offset;
+  bfd_vma pltoff_offset;
+  bfd_vma plt_offset;
+  bfd_vma plt2_offset;
+  bfd_vma tprel_offset;
+  bfd_vma dtpmod_offset;
+  bfd_vma dtprel_offset;
+
+  /* The symbol table entry, if any, that this was derived from.  */
+  struct elf_link_hash_entry *h;
+
+  /* Used to count non-got, non-plt relocations for delayed sizing
+     of relocation sections.  */
+  struct elfNN_ia64_dyn_reloc_entry
+  {
+    struct elfNN_ia64_dyn_reloc_entry *next;
+    asection *srel;
+    int type;
+    int count;
+
+    /* Is this reloc against readonly section? */
+    bfd_boolean reltext;
+  } *reloc_entries;
+
+  /* TRUE when the section contents have been updated.  */
+  unsigned got_done : 1;
+  unsigned fptr_done : 1;
+  unsigned pltoff_done : 1;
+  unsigned tprel_done : 1;
+  unsigned dtpmod_done : 1;
+  unsigned dtprel_done : 1;
+
+  /* TRUE for the different kinds of linker data we want created.  */
+  unsigned want_got : 1;
+  unsigned want_gotx : 1;
+  unsigned want_fptr : 1;
+  unsigned want_ltoff_fptr : 1;
+  unsigned want_plt : 1;
+  unsigned want_plt2 : 1;
+  unsigned want_pltoff : 1;
+  unsigned want_tprel : 1;
+  unsigned want_dtpmod : 1;
+  unsigned want_dtprel : 1;
+};
+
+struct elfNN_ia64_local_hash_entry
+{
+  int id;
+  unsigned int r_sym;
+  /* The number of elements in elfNN_ia64_dyn_sym_info array.  */
+  unsigned int count;
+  /* The number of sorted elements in elfNN_ia64_dyn_sym_info array.  */
+  unsigned int sorted_count;
+  /* The size of elfNN_ia64_dyn_sym_info array.  */
+  unsigned int size;
+  /* The array of elfNN_ia64_dyn_sym_info.  */
+  struct elfNN_ia64_dyn_sym_info *info;
+
+  /* TRUE if this hash entry's addends was translated for
+     SHF_MERGE optimization.  */
+  unsigned sec_merge_done : 1;
+};
+
+struct elfNN_ia64_link_hash_entry
+{
+  struct elf_link_hash_entry root;
+  /* The number of elements in elfNN_ia64_dyn_sym_info array.  */
+  unsigned int count;
+  /* The number of sorted elements in elfNN_ia64_dyn_sym_info array.  */
+  unsigned int sorted_count;
+  /* The size of elfNN_ia64_dyn_sym_info array.  */
+  unsigned int size;
+  /* The array of elfNN_ia64_dyn_sym_info.  */
+  struct elfNN_ia64_dyn_sym_info *info;
+};
+
+struct elfNN_ia64_link_hash_table
+{
+  /* The main hash table.  */
+  struct elf_link_hash_table root;
+
+  asection *fptr_sec;		/* Function descriptor table (or NULL).  */
+  asection *rel_fptr_sec;	/* Dynamic relocation section for same.  */
+  asection *pltoff_sec;		/* Private descriptors for plt (or NULL).  */
+  asection *rel_pltoff_sec;	/* Dynamic relocation section for same.  */
+
+  bfd_size_type minplt_entries;	/* Number of minplt entries.  */
+  unsigned reltext : 1;		/* Are there relocs against readonly sections?  */
+  unsigned self_dtpmod_done : 1;/* Has self DTPMOD entry been finished?  */
+  bfd_vma self_dtpmod_offset;	/* .got offset to self DTPMOD entry.  */
+  /* There are maybe R_IA64_GPREL22 relocations, including those
+     optimized from R_IA64_LTOFF22X, against non-SHF_IA_64_SHORT
+     sections.  We need to record those sections so that we can choose
+     a proper GP to cover all R_IA64_GPREL22 relocations.  */
+  asection *max_short_sec;	/* Maximum short output section.  */
+  bfd_vma max_short_offset;	/* Maximum short offset.  */
+  asection *min_short_sec;	/* Minimum short output section.  */
+  bfd_vma min_short_offset;	/* Minimum short offset.  */
+
+  htab_t loc_hash_table;
+  void *loc_hash_memory;
+};
+
+struct elfNN_ia64_allocate_data
+{
+  struct bfd_link_info *info;
+  bfd_size_type ofs;
+  bfd_boolean only_got;
+};
+
+#define elfNN_ia64_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == IA64_ELF_DATA ? ((struct elfNN_ia64_link_hash_table *) ((p)->hash)) : NULL)
+
+static struct elfNN_ia64_dyn_sym_info * get_dyn_sym_info
+  (struct elfNN_ia64_link_hash_table *ia64_info,
+   struct elf_link_hash_entry *h,
+   bfd *abfd, const Elf_Internal_Rela *rel, bfd_boolean create);
+static bfd_boolean elfNN_ia64_dynamic_symbol_p
+  (struct elf_link_hash_entry *h, struct bfd_link_info *info, int);
+static bfd_boolean elfNN_ia64_choose_gp
+  (bfd *abfd, struct bfd_link_info *info, bfd_boolean final);
+static void elfNN_ia64_dyn_sym_traverse
+  (struct elfNN_ia64_link_hash_table *ia64_info,
+   bfd_boolean (*func) (struct elfNN_ia64_dyn_sym_info *, PTR),
+   PTR info);
+static bfd_boolean allocate_global_data_got
+  (struct elfNN_ia64_dyn_sym_info *dyn_i, PTR data);
+static bfd_boolean allocate_global_fptr_got
+  (struct elfNN_ia64_dyn_sym_info *dyn_i, PTR data);
+static bfd_boolean allocate_local_got
+  (struct elfNN_ia64_dyn_sym_info *dyn_i, PTR data);
+static bfd_boolean elfNN_ia64_hpux_vec
+  (const bfd_target *vec);
+static bfd_boolean allocate_dynrel_entries
+  (struct elfNN_ia64_dyn_sym_info *dyn_i, PTR data);
+static asection *get_pltoff
+  (bfd *abfd, struct bfd_link_info *info,
+   struct elfNN_ia64_link_hash_table *ia64_info);
+
+/* ia64-specific relocation.  */
+
+/* Given a ELF reloc, return the matching HOWTO structure.  */
+
+static void
+elfNN_ia64_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+			  arelent *bfd_reloc,
+			  Elf_Internal_Rela *elf_reloc)
+{
+  bfd_reloc->howto
+    = ia64_elf_lookup_howto ((unsigned int) ELFNN_R_TYPE (elf_reloc->r_info));
+}
+
+#define PLT_HEADER_SIZE		(3 * 16)
+#define PLT_MIN_ENTRY_SIZE	(1 * 16)
+#define PLT_FULL_ENTRY_SIZE	(2 * 16)
+#define PLT_RESERVED_WORDS	3
+
+static const bfd_byte plt_header[PLT_HEADER_SIZE] =
+{
+  0x0b, 0x10, 0x00, 0x1c, 0x00, 0x21,  /*   [MMI]       mov r2=r14;;       */
+  0xe0, 0x00, 0x08, 0x00, 0x48, 0x00,  /*               addl r14=0,r2      */
+  0x00, 0x00, 0x04, 0x00,              /*               nop.i 0x0;;        */
+  0x0b, 0x80, 0x20, 0x1c, 0x18, 0x14,  /*   [MMI]       ld8 r16=[r14],8;;  */
+  0x10, 0x41, 0x38, 0x30, 0x28, 0x00,  /*               ld8 r17=[r14],8    */
+  0x00, 0x00, 0x04, 0x00,              /*               nop.i 0x0;;        */
+  0x11, 0x08, 0x00, 0x1c, 0x18, 0x10,  /*   [MIB]       ld8 r1=[r14]       */
+  0x60, 0x88, 0x04, 0x80, 0x03, 0x00,  /*               mov b6=r17         */
+  0x60, 0x00, 0x80, 0x00               /*               br.few b6;;        */
+};
+
+static const bfd_byte plt_min_entry[PLT_MIN_ENTRY_SIZE] =
+{
+  0x11, 0x78, 0x00, 0x00, 0x00, 0x24,  /*   [MIB]       mov r15=0          */
+  0x00, 0x00, 0x00, 0x02, 0x00, 0x00,  /*               nop.i 0x0          */
+  0x00, 0x00, 0x00, 0x40               /*               br.few 0 <PLT0>;;  */
+};
+
+static const bfd_byte plt_full_entry[PLT_FULL_ENTRY_SIZE] =
+{
+  0x0b, 0x78, 0x00, 0x02, 0x00, 0x24,  /*   [MMI]       addl r15=0,r1;;    */
+  0x00, 0x41, 0x3c, 0x70, 0x29, 0xc0,  /*               ld8.acq r16=[r15],8*/
+  0x01, 0x08, 0x00, 0x84,              /*               mov r14=r1;;       */
+  0x11, 0x08, 0x00, 0x1e, 0x18, 0x10,  /*   [MIB]       ld8 r1=[r15]       */
+  0x60, 0x80, 0x04, 0x80, 0x03, 0x00,  /*               mov b6=r16         */
+  0x60, 0x00, 0x80, 0x00               /*               br.few b6;;        */
+};
+
+#define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so.1"
+
+static const bfd_byte oor_brl[16] =
+{
+  0x05, 0x00, 0x00, 0x00, 0x01, 0x00,  /*  [MLX]        nop.m 0            */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /*               brl.sptk.few tgt;; */
+  0x00, 0x00, 0x00, 0xc0
+};
+
+static const bfd_byte oor_ip[48] =
+{
+  0x04, 0x00, 0x00, 0x00, 0x01, 0x00,  /*  [MLX]        nop.m 0            */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xe0,  /*               movl r15=0         */
+  0x01, 0x00, 0x00, 0x60,
+  0x03, 0x00, 0x00, 0x00, 0x01, 0x00,  /*  [MII]        nop.m 0            */
+  0x00, 0x01, 0x00, 0x60, 0x00, 0x00,  /*               mov r16=ip;;       */
+  0xf2, 0x80, 0x00, 0x80,              /*               add r16=r15,r16;;  */
+  0x11, 0x00, 0x00, 0x00, 0x01, 0x00,  /*  [MIB]        nop.m 0            */
+  0x60, 0x80, 0x04, 0x80, 0x03, 0x00,  /*               mov b6=r16         */
+  0x60, 0x00, 0x80, 0x00               /*               br b6;;            */
+};
+
+static size_t oor_branch_size = sizeof (oor_brl);
+
+void
+bfd_elfNN_ia64_after_parse (int itanium)
+{
+  oor_branch_size = itanium ? sizeof (oor_ip) : sizeof (oor_brl);
+}
+
+
+/* Rename some of the generic section flags to better document how they
+   are used here.  */
+#define skip_relax_pass_0 sec_flg0
+#define skip_relax_pass_1 sec_flg1
+
+/* These functions do relaxation for IA-64 ELF.  */
+
+static void
+elfNN_ia64_update_short_info (asection *sec, bfd_vma offset,
+			      struct elfNN_ia64_link_hash_table *ia64_info)
+{
+  /* Skip ABS and SHF_IA_64_SHORT sections.  */
+  if (sec == bfd_abs_section_ptr
+      || (sec->flags & SEC_SMALL_DATA) != 0)
+    return;
+
+  if (!ia64_info->min_short_sec)
+    {
+      ia64_info->max_short_sec = sec;
+      ia64_info->max_short_offset = offset;
+      ia64_info->min_short_sec = sec;
+      ia64_info->min_short_offset = offset;
+    }
+  else if (sec == ia64_info->max_short_sec
+	   && offset > ia64_info->max_short_offset)
+    ia64_info->max_short_offset = offset;
+  else if (sec == ia64_info->min_short_sec
+	   && offset < ia64_info->min_short_offset)
+    ia64_info->min_short_offset = offset;
+  else if (sec->output_section->vma
+	   > ia64_info->max_short_sec->vma)
+    {
+      ia64_info->max_short_sec = sec;
+      ia64_info->max_short_offset = offset;
+    }
+  else if (sec->output_section->vma
+	   < ia64_info->min_short_sec->vma)
+    {
+      ia64_info->min_short_sec = sec;
+      ia64_info->min_short_offset = offset;
+    }
+}
+
+static bfd_boolean
+elfNN_ia64_relax_section (bfd *abfd, asection *sec,
+			  struct bfd_link_info *link_info,
+			  bfd_boolean *again)
+{
+  struct one_fixup
+    {
+      struct one_fixup *next;
+      asection *tsec;
+      bfd_vma toff;
+      bfd_vma trampoff;
+    };
+
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *internal_relocs;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_byte *contents;
+  Elf_Internal_Sym *isymbuf = NULL;
+  struct elfNN_ia64_link_hash_table *ia64_info;
+  struct one_fixup *fixups = NULL;
+  bfd_boolean changed_contents = FALSE;
+  bfd_boolean changed_relocs = FALSE;
+  bfd_boolean changed_got = FALSE;
+  bfd_boolean skip_relax_pass_0 = TRUE;
+  bfd_boolean skip_relax_pass_1 = TRUE;
+  bfd_vma gp = 0;
+
+  /* Assume we're not going to change any sizes, and we'll only need
+     one pass.  */
+  *again = FALSE;
+
+  if (link_info->relocatable)
+    (*link_info->callbacks->einfo)
+      (_("%P%F: --relax and -r may not be used together\n"));
+
+  /* Don't even try to relax for non-ELF outputs.  */
+  if (!is_elf_hash_table (link_info->hash))
+    return FALSE;
+
+  /* Nothing to do if there are no relocations or there is no need for
+     the current pass.  */
+  if ((sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0
+      || (link_info->relax_pass == 0 && sec->skip_relax_pass_0)
+      || (link_info->relax_pass == 1 && sec->skip_relax_pass_1))
+    return TRUE;
+
+  ia64_info = elfNN_ia64_hash_table (link_info);
+  if (ia64_info == NULL)
+    return FALSE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+
+  /* Load the relocations for this section.  */
+  internal_relocs = (_bfd_elf_link_read_relocs
+		     (abfd, sec, NULL, (Elf_Internal_Rela *) NULL,
+		      link_info->keep_memory));
+  if (internal_relocs == NULL)
+    return FALSE;
+
+  irelend = internal_relocs + sec->reloc_count;
+
+  /* Get the section contents.  */
+  if (elf_section_data (sec)->this_hdr.contents != NULL)
+    contents = elf_section_data (sec)->this_hdr.contents;
+  else
+    {
+      if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+	goto error_return;
+    }
+
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      unsigned long r_type = ELFNN_R_TYPE (irel->r_info);
+      bfd_vma symaddr, reladdr, trampoff, toff, roff;
+      asection *tsec;
+      struct one_fixup *f;
+      bfd_size_type amt;
+      bfd_boolean is_branch;
+      struct elfNN_ia64_dyn_sym_info *dyn_i;
+      char symtype;
+
+      switch (r_type)
+	{
+	case R_IA64_PCREL21B:
+	case R_IA64_PCREL21BI:
+	case R_IA64_PCREL21M:
+	case R_IA64_PCREL21F:
+	  /* In pass 1, all br relaxations are done. We can skip it. */
+	  if (link_info->relax_pass == 1)
+	    continue;
+	  skip_relax_pass_0 = FALSE;
+	  is_branch = TRUE;
+	  break;
+
+	case R_IA64_PCREL60B:
+	  /* We can't optimize brl to br in pass 0 since br relaxations
+	     will increase the code size. Defer it to pass 1.  */
+	  if (link_info->relax_pass == 0)
+	    {
+	      skip_relax_pass_1 = FALSE;
+	      continue;
+	    }
+	  is_branch = TRUE;
+	  break;
+
+	case R_IA64_GPREL22:
+	  /* Update max_short_sec/min_short_sec.  */
+
+	case R_IA64_LTOFF22X:
+	case R_IA64_LDXMOV:
+	  /* We can't relax ldx/mov in pass 0 since br relaxations will
+	     increase the code size. Defer it to pass 1.  */
+	  if (link_info->relax_pass == 0)
+	    {
+	      skip_relax_pass_1 = FALSE;
+	      continue;
+	    }
+	  is_branch = FALSE;
+	  break;
+
+	default:
+	  continue;
+	}
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      if (ELFNN_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+	{
+	  /* A local symbol.  */
+	  Elf_Internal_Sym *isym;
+
+	  /* Read this BFD's local symbols.  */
+	  if (isymbuf == NULL)
+	    {
+	      isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	      if (isymbuf == NULL)
+		isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+						symtab_hdr->sh_info, 0,
+						NULL, NULL, NULL);
+	      if (isymbuf == 0)
+		goto error_return;
+	    }
+
+	  isym = isymbuf + ELFNN_R_SYM (irel->r_info);
+	  if (isym->st_shndx == SHN_UNDEF)
+	    continue;	/* We can't do anything with undefined symbols.  */
+	  else if (isym->st_shndx == SHN_ABS)
+	    tsec = bfd_abs_section_ptr;
+	  else if (isym->st_shndx == SHN_COMMON)
+	    tsec = bfd_com_section_ptr;
+	  else if (isym->st_shndx == SHN_IA_64_ANSI_COMMON)
+	    tsec = bfd_com_section_ptr;
+	  else
+	    tsec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+
+	  toff = isym->st_value;
+	  dyn_i = get_dyn_sym_info (ia64_info, NULL, abfd, irel, FALSE);
+	  symtype = ELF_ST_TYPE (isym->st_info);
+	}
+      else
+	{
+	  unsigned long indx;
+	  struct elf_link_hash_entry *h;
+
+	  indx = ELFNN_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+	  h = elf_sym_hashes (abfd)[indx];
+	  BFD_ASSERT (h != NULL);
+
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+	  dyn_i = get_dyn_sym_info (ia64_info, h, abfd, irel, FALSE);
+
+	  /* For branches to dynamic symbols, we're interested instead
+	     in a branch to the PLT entry.  */
+	  if (is_branch && dyn_i && dyn_i->want_plt2)
+	    {
+	      /* Internal branches shouldn't be sent to the PLT.
+		 Leave this for now and we'll give an error later.  */
+	      if (r_type != R_IA64_PCREL21B)
+		continue;
+
+	      tsec = ia64_info->root.splt;
+	      toff = dyn_i->plt2_offset;
+	      BFD_ASSERT (irel->r_addend == 0);
+	    }
+
+	  /* Can't do anything else with dynamic symbols.  */
+	  else if (elfNN_ia64_dynamic_symbol_p (h, link_info, r_type))
+	    continue;
+
+	  else
+	    {
+	      /* We can't do anything with undefined symbols.  */
+	      if (h->root.type == bfd_link_hash_undefined
+		  || h->root.type == bfd_link_hash_undefweak)
+		continue;
+
+	      tsec = h->root.u.def.section;
+	      toff = h->root.u.def.value;
+	    }
+
+	  symtype = h->type;
+	}
+
+      if (tsec->sec_info_type == ELF_INFO_TYPE_MERGE)
+	{
+	  /* At this stage in linking, no SEC_MERGE symbol has been
+	     adjusted, so all references to such symbols need to be
+	     passed through _bfd_merged_section_offset.  (Later, in
+	     relocate_section, all SEC_MERGE symbols *except* for
+	     section symbols have been adjusted.)
+
+	     gas may reduce relocations against symbols in SEC_MERGE
+	     sections to a relocation against the section symbol when
+	     the original addend was zero.  When the reloc is against
+	     a section symbol we should include the addend in the
+	     offset passed to _bfd_merged_section_offset, since the
+	     location of interest is the original symbol.  On the
+	     other hand, an access to "sym+addend" where "sym" is not
+	     a section symbol should not include the addend;  Such an
+	     access is presumed to be an offset from "sym";  The
+	     location of interest is just "sym".  */
+	   if (symtype == STT_SECTION)
+	     toff += irel->r_addend;
+
+	   toff = _bfd_merged_section_offset (abfd, &tsec,
+					      elf_section_data (tsec)->sec_info,
+					      toff);
+
+	   if (symtype != STT_SECTION)
+	     toff += irel->r_addend;
+	}
+      else
+	toff += irel->r_addend;
+
+      symaddr = tsec->output_section->vma + tsec->output_offset + toff;
+
+      roff = irel->r_offset;
+
+      if (is_branch)
+	{
+	  bfd_signed_vma offset;
+
+	  reladdr = (sec->output_section->vma
+		     + sec->output_offset
+		     + roff) & (bfd_vma) -4;
+
+	  /* The .plt section is aligned at 32byte and the .text section
+	     is aligned at 64byte. The .text section is right after the
+	     .plt section.  After the first relaxation pass, linker may
+	     increase the gap between the .plt and .text sections up
+	     to 32byte.  We assume linker will always insert 32byte
+	     between the .plt and .text sections after the the first
+	     relaxation pass.  */
+	  if (tsec == ia64_info->root.splt)
+	    offset = -0x1000000 + 32;
+	  else
+	    offset = -0x1000000;
+
+	  /* If the branch is in range, no need to do anything.  */
+	  if ((bfd_signed_vma) (symaddr - reladdr) >= offset
+	      && (bfd_signed_vma) (symaddr - reladdr) <= 0x0FFFFF0)
+	    {
+	      /* If the 60-bit branch is in 21-bit range, optimize it. */
+	      if (r_type == R_IA64_PCREL60B)
+		{
+		  ia64_elf_relax_brl (contents, roff);
+
+		  irel->r_info
+		    = ELFNN_R_INFO (ELFNN_R_SYM (irel->r_info),
+				    R_IA64_PCREL21B);
+
+		  /* If the original relocation offset points to slot
+		     1, change it to slot 2.  */
+		  if ((irel->r_offset & 3) == 1)
+		    irel->r_offset += 1;
+		}
+
+	      continue;
+	    }
+	  else if (r_type == R_IA64_PCREL60B)
+	    continue;
+	  else if (ia64_elf_relax_br (contents, roff))
+	    {
+	      irel->r_info
+		= ELFNN_R_INFO (ELFNN_R_SYM (irel->r_info),
+				R_IA64_PCREL60B);
+
+	      /* Make the relocation offset point to slot 1.  */
+	      irel->r_offset = (irel->r_offset & ~((bfd_vma) 0x3)) + 1;
+	      continue;
+	    }
+
+	  /* We can't put a trampoline in a .init/.fini section. Issue
+	     an error.  */
+	  if (strcmp (sec->output_section->name, ".init") == 0
+	      || strcmp (sec->output_section->name, ".fini") == 0)
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: Can't relax br at 0x%lx in section `%A'. Please use brl or indirect branch."),
+		 sec->owner, sec, (unsigned long) roff);
+	      bfd_set_error (bfd_error_bad_value);
+	      goto error_return;
+	    }
+
+	  /* If the branch and target are in the same section, you've
+	     got one honking big section and we can't help you unless
+	     you are branching backwards.  You'll get an error message
+	     later.  */
+	  if (tsec == sec && toff > roff)
+	    continue;
+
+	  /* Look for an existing fixup to this address.  */
+	  for (f = fixups; f ; f = f->next)
+	    if (f->tsec == tsec && f->toff == toff)
+	      break;
+
+	  if (f == NULL)
+	    {
+	      /* Two alternatives: If it's a branch to a PLT entry, we can
+		 make a copy of the FULL_PLT entry.  Otherwise, we'll have
+		 to use a `brl' insn to get where we're going.  */
+
+	      size_t size;
+
+	      if (tsec == ia64_info->root.splt)
+		size = sizeof (plt_full_entry);
+	      else
+		size = oor_branch_size;
+
+	      /* Resize the current section to make room for the new branch. */
+	      trampoff = (sec->size + 15) & (bfd_vma) -16;
+
+	      /* If trampoline is out of range, there is nothing we
+		 can do.  */
+	      offset = trampoff - (roff & (bfd_vma) -4);
+	      if (offset < -0x1000000 || offset > 0x0FFFFF0)
+		continue;
+
+	      amt = trampoff + size;
+	      contents = (bfd_byte *) bfd_realloc (contents, amt);
+	      if (contents == NULL)
+		goto error_return;
+	      sec->size = amt;
+
+	      if (tsec == ia64_info->root.splt)
+		{
+		  memcpy (contents + trampoff, plt_full_entry, size);
+
+		  /* Hijack the old relocation for use as the PLTOFF reloc.  */
+		  irel->r_info = ELFNN_R_INFO (ELFNN_R_SYM (irel->r_info),
+					       R_IA64_PLTOFF22);
+		  irel->r_offset = trampoff;
+		}
+	      else
+		{
+		  if (size == sizeof (oor_ip))
+		    {
+		      memcpy (contents + trampoff, oor_ip, size);
+		      irel->r_info = ELFNN_R_INFO (ELFNN_R_SYM (irel->r_info),
+						   R_IA64_PCREL64I);
+		      irel->r_addend -= 16;
+		      irel->r_offset = trampoff + 2;
+		    }
+		  else
+		    {
+		      memcpy (contents + trampoff, oor_brl, size);
+		      irel->r_info = ELFNN_R_INFO (ELFNN_R_SYM (irel->r_info),
+						   R_IA64_PCREL60B);
+		      irel->r_offset = trampoff + 2;
+		    }
+
+		}
+
+	      /* Record the fixup so we don't do it again this section.  */
+	      f = (struct one_fixup *)
+		bfd_malloc ((bfd_size_type) sizeof (*f));
+	      f->next = fixups;
+	      f->tsec = tsec;
+	      f->toff = toff;
+	      f->trampoff = trampoff;
+	      fixups = f;
+	    }
+	  else
+	    {
+	      /* If trampoline is out of range, there is nothing we
+		 can do.  */
+	      offset = f->trampoff - (roff & (bfd_vma) -4);
+	      if (offset < -0x1000000 || offset > 0x0FFFFF0)
+		continue;
+
+	      /* Nop out the reloc, since we're finalizing things here.  */
+	      irel->r_info = ELFNN_R_INFO (0, R_IA64_NONE);
+	    }
+
+	  /* Fix up the existing branch to hit the trampoline.  */
+	  if (ia64_elf_install_value (contents + roff, offset, r_type)
+	      != bfd_reloc_ok)
+	    goto error_return;
+
+	  changed_contents = TRUE;
+	  changed_relocs = TRUE;
+	}
+      else
+	{
+	  /* Fetch the gp.  */
+	  if (gp == 0)
+	    {
+	      bfd *obfd = sec->output_section->owner;
+	      gp = _bfd_get_gp_value (obfd);
+	      if (gp == 0)
+		{
+		  if (!elfNN_ia64_choose_gp (obfd, link_info, FALSE))
+		    goto error_return;
+		  gp = _bfd_get_gp_value (obfd);
+		}
+	    }
+
+	  /* If the data is out of range, do nothing.  */
+	  if ((bfd_signed_vma) (symaddr - gp) >= 0x200000
+	      ||(bfd_signed_vma) (symaddr - gp) < -0x200000)
+	    continue;
+
+	  if (r_type == R_IA64_GPREL22)
+	    elfNN_ia64_update_short_info (tsec->output_section,
+					  tsec->output_offset + toff,
+					  ia64_info);
+	  else if (r_type == R_IA64_LTOFF22X)
+	    {
+	      irel->r_info = ELFNN_R_INFO (ELFNN_R_SYM (irel->r_info),
+					   R_IA64_GPREL22);
+	      changed_relocs = TRUE;
+	      if (dyn_i->want_gotx)
+		{
+		  dyn_i->want_gotx = 0;
+		  changed_got |= !dyn_i->want_got;
+		}
+
+	      elfNN_ia64_update_short_info (tsec->output_section,
+					    tsec->output_offset + toff,
+					    ia64_info);
+	    }
+	  else
+	    {
+	      ia64_elf_relax_ldxmov (contents, roff);
+	      irel->r_info = ELFNN_R_INFO (0, R_IA64_NONE);
+	      changed_contents = TRUE;
+	      changed_relocs = TRUE;
+	    }
+	}
+    }
+
+  /* ??? If we created fixups, this may push the code segment large
+     enough that the data segment moves, which will change the GP.
+     Reset the GP so that we re-calculate next round.  We need to
+     do this at the _beginning_ of the next round; now will not do.  */
+
+  /* Clean up and go home.  */
+  while (fixups)
+    {
+      struct one_fixup *f = fixups;
+      fixups = fixups->next;
+      free (f);
+    }
+
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    {
+      if (! link_info->keep_memory)
+	free (isymbuf);
+      else
+	{
+	  /* Cache the symbols for elf_link_input_bfd.  */
+	  symtab_hdr->contents = (unsigned char *) isymbuf;
+	}
+    }
+
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    {
+      if (!changed_contents && !link_info->keep_memory)
+	free (contents);
+      else
+	{
+	  /* Cache the section contents for elf_link_input_bfd.  */
+	  elf_section_data (sec)->this_hdr.contents = contents;
+	}
+    }
+
+  if (elf_section_data (sec)->relocs != internal_relocs)
+    {
+      if (!changed_relocs)
+	free (internal_relocs);
+      else
+	elf_section_data (sec)->relocs = internal_relocs;
+    }
+
+  if (changed_got)
+    {
+      struct elfNN_ia64_allocate_data data;
+      data.info = link_info;
+      data.ofs = 0;
+      ia64_info->self_dtpmod_offset = (bfd_vma) -1;
+
+      elfNN_ia64_dyn_sym_traverse (ia64_info, allocate_global_data_got, &data);
+      elfNN_ia64_dyn_sym_traverse (ia64_info, allocate_global_fptr_got, &data);
+      elfNN_ia64_dyn_sym_traverse (ia64_info, allocate_local_got, &data);
+      ia64_info->root.sgot->size = data.ofs;
+
+      if (ia64_info->root.dynamic_sections_created
+	  && ia64_info->root.srelgot != NULL)
+	{
+	  /* Resize .rela.got.  */
+	  ia64_info->root.srelgot->size = 0;
+	  if (link_info->shared
+	      && ia64_info->self_dtpmod_offset != (bfd_vma) -1)
+	    ia64_info->root.srelgot->size += sizeof (ElfNN_External_Rela);
+	  data.only_got = TRUE;
+	  elfNN_ia64_dyn_sym_traverse (ia64_info, allocate_dynrel_entries,
+				       &data);
+	}
+    }
+
+  if (link_info->relax_pass == 0)
+    {
+      /* Pass 0 is only needed to relax br.  */
+      sec->skip_relax_pass_0 = skip_relax_pass_0;
+      sec->skip_relax_pass_1 = skip_relax_pass_1;
+    }
+
+  *again = changed_contents || changed_relocs;
+  return TRUE;
+
+ error_return:
+  if (isymbuf != NULL && (unsigned char *) isymbuf != symtab_hdr->contents)
+    free (isymbuf);
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    free (contents);
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+  return FALSE;
+}
+#undef skip_relax_pass_0
+#undef skip_relax_pass_1
+
+/* Return TRUE if NAME is an unwind table section name.  */
+
+static inline bfd_boolean
+is_unwind_section_name (bfd *abfd, const char *name)
+{
+  if (elfNN_ia64_hpux_vec (abfd->xvec)
+      && !strcmp (name, ELF_STRING_ia64_unwind_hdr))
+    return FALSE;
+
+  return ((CONST_STRNEQ (name, ELF_STRING_ia64_unwind)
+	   && ! CONST_STRNEQ (name, ELF_STRING_ia64_unwind_info))
+	  || CONST_STRNEQ (name, ELF_STRING_ia64_unwind_once));
+}
+
+/* Handle an IA-64 specific section when reading an object file.  This
+   is called when bfd_section_from_shdr finds a section with an unknown
+   type.  */
+
+static bfd_boolean
+elfNN_ia64_section_from_shdr (bfd *abfd,
+			      Elf_Internal_Shdr *hdr,
+			      const char *name,
+			      int shindex)
+{
+  /* There ought to be a place to keep ELF backend specific flags, but
+     at the moment there isn't one.  We just keep track of the
+     sections by their name, instead.  Fortunately, the ABI gives
+     suggested names for all the MIPS specific sections, so we will
+     probably get away with this.  */
+  switch (hdr->sh_type)
+    {
+    case SHT_IA_64_UNWIND:
+    case SHT_IA_64_HP_OPT_ANOT:
+      break;
+
+    case SHT_IA_64_EXT:
+      if (strcmp (name, ELF_STRING_ia64_archext) != 0)
+	return FALSE;
+      break;
+
+    default:
+      return FALSE;
+    }
+
+  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Convert IA-64 specific section flags to bfd internal section flags.  */
+
+/* ??? There is no bfd internal flag equivalent to the SHF_IA_64_NORECOV
+   flag.  */
+
+static bfd_boolean
+elfNN_ia64_section_flags (flagword *flags,
+			  const Elf_Internal_Shdr *hdr)
+{
+  if (hdr->sh_flags & SHF_IA_64_SHORT)
+    *flags |= SEC_SMALL_DATA;
+
+  return TRUE;
+}
+
+/* Set the correct type for an IA-64 ELF section.  We do this by the
+   section name, which is a hack, but ought to work.  */
+
+static bfd_boolean
+elfNN_ia64_fake_sections (bfd *abfd, Elf_Internal_Shdr *hdr,
+			  asection *sec)
+{
+  const char *name;
+
+  name = bfd_get_section_name (abfd, sec);
+
+  if (is_unwind_section_name (abfd, name))
+    {
+      /* We don't have the sections numbered at this point, so sh_info
+	 is set later, in elfNN_ia64_final_write_processing.  */
+      hdr->sh_type = SHT_IA_64_UNWIND;
+      hdr->sh_flags |= SHF_LINK_ORDER;
+    }
+  else if (strcmp (name, ELF_STRING_ia64_archext) == 0)
+    hdr->sh_type = SHT_IA_64_EXT;
+  else if (strcmp (name, ".HP.opt_annot") == 0)
+    hdr->sh_type = SHT_IA_64_HP_OPT_ANOT;
+  else if (strcmp (name, ".reloc") == 0)
+    /* This is an ugly, but unfortunately necessary hack that is
+       needed when producing EFI binaries on IA-64. It tells
+       elf.c:elf_fake_sections() not to consider ".reloc" as a section
+       containing ELF relocation info.  We need this hack in order to
+       be able to generate ELF binaries that can be translated into
+       EFI applications (which are essentially COFF objects).  Those
+       files contain a COFF ".reloc" section inside an ELFNN object,
+       which would normally cause BFD to segfault because it would
+       attempt to interpret this section as containing relocation
+       entries for section "oc".  With this hack enabled, ".reloc"
+       will be treated as a normal data section, which will avoid the
+       segfault.  However, you won't be able to create an ELFNN binary
+       with a section named "oc" that needs relocations, but that's
+       the kind of ugly side-effects you get when detecting section
+       types based on their names...  In practice, this limitation is
+       unlikely to bite.  */
+    hdr->sh_type = SHT_PROGBITS;
+
+  if (sec->flags & SEC_SMALL_DATA)
+    hdr->sh_flags |= SHF_IA_64_SHORT;
+
+  /* Some HP linkers look for the SHF_IA_64_HP_TLS flag instead of SHF_TLS. */
+
+  if (elfNN_ia64_hpux_vec (abfd->xvec) && (sec->flags & SHF_TLS))
+    hdr->sh_flags |= SHF_IA_64_HP_TLS;
+
+  return TRUE;
+}
+
+/* The final processing done just before writing out an IA-64 ELF
+   object file.  */
+
+static void
+elfNN_ia64_final_write_processing (bfd *abfd,
+				   bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  Elf_Internal_Shdr *hdr;
+  asection *s;
+
+  for (s = abfd->sections; s; s = s->next)
+    {
+      hdr = &elf_section_data (s)->this_hdr;
+      switch (hdr->sh_type)
+	{
+	case SHT_IA_64_UNWIND:
+	  /* The IA-64 processor-specific ABI requires setting sh_link
+	     to the unwind section, whereas HP-UX requires sh_info to
+	     do so.  For maximum compatibility, we'll set both for
+	     now... */
+	  hdr->sh_info = hdr->sh_link;
+	  break;
+	}
+    }
+
+  if (! elf_flags_init (abfd))
+    {
+      unsigned long flags = 0;
+
+      if (abfd->xvec->byteorder == BFD_ENDIAN_BIG)
+	flags |= EF_IA_64_BE;
+      if (bfd_get_mach (abfd) == bfd_mach_ia64_elf64)
+	flags |= EF_IA_64_ABI64;
+
+      elf_elfheader(abfd)->e_flags = flags;
+      elf_flags_init (abfd) = TRUE;
+    }
+}
+
+/* Hook called by the linker routine which adds symbols from an object
+   file.  We use it to put .comm items in .sbss, and not .bss.  */
+
+static bfd_boolean
+elfNN_ia64_add_symbol_hook (bfd *abfd,
+			    struct bfd_link_info *info,
+			    Elf_Internal_Sym *sym,
+			    const char **namep ATTRIBUTE_UNUSED,
+			    flagword *flagsp ATTRIBUTE_UNUSED,
+			    asection **secp,
+			    bfd_vma *valp)
+{
+  if (sym->st_shndx == SHN_COMMON
+      && !info->relocatable
+      && sym->st_size <= elf_gp_size (abfd))
+    {
+      /* Common symbols less than or equal to -G nn bytes are
+	 automatically put into .sbss.  */
+
+      asection *scomm = bfd_get_section_by_name (abfd, ".scommon");
+
+      if (scomm == NULL)
+	{
+	  scomm = bfd_make_section_with_flags (abfd, ".scommon",
+					       (SEC_ALLOC
+						| SEC_IS_COMMON
+						| SEC_LINKER_CREATED));
+	  if (scomm == NULL)
+	    return FALSE;
+	}
+
+      *secp = scomm;
+      *valp = sym->st_size;
+    }
+
+  return TRUE;
+}
+
+/* Return the number of additional phdrs we will need.  */
+
+static int
+elfNN_ia64_additional_program_headers (bfd *abfd,
+				       struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  asection *s;
+  int ret = 0;
+
+  /* See if we need a PT_IA_64_ARCHEXT segment.  */
+  s = bfd_get_section_by_name (abfd, ELF_STRING_ia64_archext);
+  if (s && (s->flags & SEC_LOAD))
+    ++ret;
+
+  /* Count how many PT_IA_64_UNWIND segments we need.  */
+  for (s = abfd->sections; s; s = s->next)
+    if (is_unwind_section_name (abfd, s->name) && (s->flags & SEC_LOAD))
+      ++ret;
+
+  return ret;
+}
+
+static bfd_boolean
+elfNN_ia64_modify_segment_map (bfd *abfd,
+			       struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  struct elf_segment_map *m, **pm;
+  Elf_Internal_Shdr *hdr;
+  asection *s;
+
+  /* If we need a PT_IA_64_ARCHEXT segment, it must come before
+     all PT_LOAD segments.  */
+  s = bfd_get_section_by_name (abfd, ELF_STRING_ia64_archext);
+  if (s && (s->flags & SEC_LOAD))
+    {
+      for (m = elf_tdata (abfd)->segment_map; m != NULL; m = m->next)
+	if (m->p_type == PT_IA_64_ARCHEXT)
+	  break;
+      if (m == NULL)
+	{
+	  m = ((struct elf_segment_map *)
+	       bfd_zalloc (abfd, (bfd_size_type) sizeof *m));
+	  if (m == NULL)
+	    return FALSE;
+
+	  m->p_type = PT_IA_64_ARCHEXT;
+	  m->count = 1;
+	  m->sections[0] = s;
+
+	  /* We want to put it after the PHDR and INTERP segments.  */
+	  pm = &elf_tdata (abfd)->segment_map;
+	  while (*pm != NULL
+		 && ((*pm)->p_type == PT_PHDR
+		     || (*pm)->p_type == PT_INTERP))
+	    pm = &(*pm)->next;
+
+	  m->next = *pm;
+	  *pm = m;
+	}
+    }
+
+  /* Install PT_IA_64_UNWIND segments, if needed.  */
+  for (s = abfd->sections; s; s = s->next)
+    {
+      hdr = &elf_section_data (s)->this_hdr;
+      if (hdr->sh_type != SHT_IA_64_UNWIND)
+	continue;
+
+      if (s && (s->flags & SEC_LOAD))
+	{
+	  for (m = elf_tdata (abfd)->segment_map; m != NULL; m = m->next)
+	    if (m->p_type == PT_IA_64_UNWIND)
+	      {
+		int i;
+
+		/* Look through all sections in the unwind segment
+		   for a match since there may be multiple sections
+		   to a segment.  */
+		for (i = m->count - 1; i >= 0; --i)
+		  if (m->sections[i] == s)
+		    break;
+
+		if (i >= 0)
+		  break;
+	      }
+
+	  if (m == NULL)
+	    {
+	      m = ((struct elf_segment_map *)
+		   bfd_zalloc (abfd, (bfd_size_type) sizeof *m));
+	      if (m == NULL)
+		return FALSE;
+
+	      m->p_type = PT_IA_64_UNWIND;
+	      m->count = 1;
+	      m->sections[0] = s;
+	      m->next = NULL;
+
+	      /* We want to put it last.  */
+	      pm = &elf_tdata (abfd)->segment_map;
+	      while (*pm != NULL)
+		pm = &(*pm)->next;
+	      *pm = m;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Turn on PF_IA_64_NORECOV if needed.  This involves traversing all of
+   the input sections for each output section in the segment and testing
+   for SHF_IA_64_NORECOV on each.  */
+
+static bfd_boolean
+elfNN_ia64_modify_program_headers (bfd *abfd,
+				   struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  struct elf_obj_tdata *tdata = elf_tdata (abfd);
+  struct elf_segment_map *m;
+  Elf_Internal_Phdr *p;
+
+  for (p = tdata->phdr, m = tdata->segment_map; m != NULL; m = m->next, p++)
+    if (m->p_type == PT_LOAD)
+      {
+	int i;
+	for (i = m->count - 1; i >= 0; --i)
+	  {
+	    struct bfd_link_order *order = m->sections[i]->map_head.link_order;
+
+	    while (order != NULL)
+	      {
+		if (order->type == bfd_indirect_link_order)
+		  {
+		    asection *is = order->u.indirect.section;
+		    bfd_vma flags = elf_section_data(is)->this_hdr.sh_flags;
+		    if (flags & SHF_IA_64_NORECOV)
+		      {
+			p->p_flags |= PF_IA_64_NORECOV;
+			goto found;
+		      }
+		  }
+		order = order->next;
+	      }
+	  }
+      found:;
+      }
+
+  return TRUE;
+}
+
+/* According to the Tahoe assembler spec, all labels starting with a
+   '.' are local.  */
+
+static bfd_boolean
+elfNN_ia64_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED,
+				const char *name)
+{
+  return name[0] == '.';
+}
+
+/* Should we do dynamic things to this symbol?  */
+
+static bfd_boolean
+elfNN_ia64_dynamic_symbol_p (struct elf_link_hash_entry *h,
+			     struct bfd_link_info *info, int r_type)
+{
+  bfd_boolean ignore_protected
+    = ((r_type & 0xf8) == 0x40		/* FPTR relocs */
+       || (r_type & 0xf8) == 0x50);	/* LTOFF_FPTR relocs */
+
+  return _bfd_elf_dynamic_symbol_p (h, info, ignore_protected);
+}
+
+static struct bfd_hash_entry*
+elfNN_ia64_new_elf_hash_entry (struct bfd_hash_entry *entry,
+			       struct bfd_hash_table *table,
+			       const char *string)
+{
+  struct elfNN_ia64_link_hash_entry *ret;
+  ret = (struct elfNN_ia64_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (!ret)
+    ret = bfd_hash_allocate (table, sizeof (*ret));
+
+  if (!ret)
+    return 0;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct elfNN_ia64_link_hash_entry *)
+	 _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
+				     table, string));
+
+  ret->info = NULL;
+  ret->count = 0;
+  ret->sorted_count = 0;
+  ret->size = 0;
+  return (struct bfd_hash_entry *) ret;
+}
+
+static void
+elfNN_ia64_hash_copy_indirect (struct bfd_link_info *info,
+			       struct elf_link_hash_entry *xdir,
+			       struct elf_link_hash_entry *xind)
+{
+  struct elfNN_ia64_link_hash_entry *dir, *ind;
+
+  dir = (struct elfNN_ia64_link_hash_entry *) xdir;
+  ind = (struct elfNN_ia64_link_hash_entry *) xind;
+
+  /* Copy down any references that we may have already seen to the
+     symbol which just became indirect.  */
+
+  dir->root.ref_dynamic |= ind->root.ref_dynamic;
+  dir->root.ref_regular |= ind->root.ref_regular;
+  dir->root.ref_regular_nonweak |= ind->root.ref_regular_nonweak;
+  dir->root.needs_plt |= ind->root.needs_plt;
+
+  if (ind->root.root.type != bfd_link_hash_indirect)
+    return;
+
+  /* Copy over the got and plt data.  This would have been done
+     by check_relocs.  */
+
+  if (ind->info != NULL)
+    {
+      struct elfNN_ia64_dyn_sym_info *dyn_i;
+      unsigned int count;
+
+      if (dir->info)
+	free (dir->info);
+
+      dir->info = ind->info;
+      dir->count = ind->count;
+      dir->sorted_count = ind->sorted_count;
+      dir->size = ind->size;
+
+      ind->info = NULL;
+      ind->count = 0;
+      ind->sorted_count = 0;
+      ind->size = 0;
+
+      /* Fix up the dyn_sym_info pointers to the global symbol.  */
+      for (count = dir->count, dyn_i = dir->info;
+	   count != 0;
+	   count--, dyn_i++)
+	dyn_i->h = &dir->root;
+    }
+
+  /* Copy over the dynindx.  */
+
+  if (ind->root.dynindx != -1)
+    {
+      if (dir->root.dynindx != -1)
+	_bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
+				dir->root.dynstr_index);
+      dir->root.dynindx = ind->root.dynindx;
+      dir->root.dynstr_index = ind->root.dynstr_index;
+      ind->root.dynindx = -1;
+      ind->root.dynstr_index = 0;
+    }
+}
+
+static void
+elfNN_ia64_hash_hide_symbol (struct bfd_link_info *info,
+			     struct elf_link_hash_entry *xh,
+			     bfd_boolean force_local)
+{
+  struct elfNN_ia64_link_hash_entry *h;
+  struct elfNN_ia64_dyn_sym_info *dyn_i;
+  unsigned int count;
+
+  h = (struct elfNN_ia64_link_hash_entry *)xh;
+
+  _bfd_elf_link_hash_hide_symbol (info, &h->root, force_local);
+
+  for (count = h->count, dyn_i = h->info;
+       count != 0;
+       count--, dyn_i++)
+    {
+      dyn_i->want_plt2 = 0;
+      dyn_i->want_plt = 0;
+    }
+}
+
+/* Compute a hash of a local hash entry.  */
+
+static hashval_t
+elfNN_ia64_local_htab_hash (const void *ptr)
+{
+  struct elfNN_ia64_local_hash_entry *entry
+    = (struct elfNN_ia64_local_hash_entry *) ptr;
+
+  return ELF_LOCAL_SYMBOL_HASH (entry->id, entry->r_sym);
+}
+
+/* Compare local hash entries.  */
+
+static int
+elfNN_ia64_local_htab_eq (const void *ptr1, const void *ptr2)
+{
+  struct elfNN_ia64_local_hash_entry *entry1
+    = (struct elfNN_ia64_local_hash_entry *) ptr1;
+  struct elfNN_ia64_local_hash_entry *entry2
+    = (struct elfNN_ia64_local_hash_entry *) ptr2;
+
+  return entry1->id == entry2->id && entry1->r_sym == entry2->r_sym;
+}
+
+/* Create the derived linker hash table.  The IA-64 ELF port uses this
+   derived hash table to keep information specific to the IA-64 ElF
+   linker (without using static variables).  */
+
+static struct bfd_link_hash_table *
+elfNN_ia64_hash_table_create (bfd *abfd)
+{
+  struct elfNN_ia64_link_hash_table *ret;
+
+  ret = bfd_zmalloc ((bfd_size_type) sizeof (*ret));
+  if (!ret)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->root, abfd,
+				      elfNN_ia64_new_elf_hash_entry,
+				      sizeof (struct elfNN_ia64_link_hash_entry),
+				      IA64_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  ret->loc_hash_table = htab_try_create (1024, elfNN_ia64_local_htab_hash,
+					 elfNN_ia64_local_htab_eq, NULL);
+  ret->loc_hash_memory = objalloc_create ();
+  if (!ret->loc_hash_table || !ret->loc_hash_memory)
+    {
+      free (ret);
+      return NULL;
+    }
+
+  return &ret->root.root;
+}
+
+/* Free the global elfNN_ia64_dyn_sym_info array.  */
+
+static bfd_boolean
+elfNN_ia64_global_dyn_info_free (void **xentry,
+				PTR unused ATTRIBUTE_UNUSED)
+{
+  struct elfNN_ia64_link_hash_entry *entry
+    = (struct elfNN_ia64_link_hash_entry *) xentry;
+
+  if (entry->info)
+    {
+      free (entry->info);
+      entry->info = NULL;
+      entry->count = 0;
+      entry->sorted_count = 0;
+      entry->size = 0;
+    }
+
+  return TRUE;
+}
+
+/* Free the local elfNN_ia64_dyn_sym_info array.  */
+
+static bfd_boolean
+elfNN_ia64_local_dyn_info_free (void **slot,
+				PTR unused ATTRIBUTE_UNUSED)
+{
+  struct elfNN_ia64_local_hash_entry *entry
+    = (struct elfNN_ia64_local_hash_entry *) *slot;
+
+  if (entry->info)
+    {
+      free (entry->info);
+      entry->info = NULL;
+      entry->count = 0;
+      entry->sorted_count = 0;
+      entry->size = 0;
+    }
+
+  return TRUE;
+}
+
+/* Destroy IA-64 linker hash table.  */
+
+static void
+elfNN_ia64_hash_table_free (struct bfd_link_hash_table *hash)
+{
+  struct elfNN_ia64_link_hash_table *ia64_info
+    = (struct elfNN_ia64_link_hash_table *) hash;
+  if (ia64_info->loc_hash_table)
+    {
+      htab_traverse (ia64_info->loc_hash_table,
+		     elfNN_ia64_local_dyn_info_free, NULL);
+      htab_delete (ia64_info->loc_hash_table);
+    }
+  if (ia64_info->loc_hash_memory)
+    objalloc_free ((struct objalloc *) ia64_info->loc_hash_memory);
+  elf_link_hash_traverse (&ia64_info->root,
+			  elfNN_ia64_global_dyn_info_free, NULL);
+  _bfd_generic_link_hash_table_free (hash);
+}
+
+/* Traverse both local and global hash tables.  */
+
+struct elfNN_ia64_dyn_sym_traverse_data
+{
+  bfd_boolean (*func) (struct elfNN_ia64_dyn_sym_info *, PTR);
+  PTR data;
+};
+
+static bfd_boolean
+elfNN_ia64_global_dyn_sym_thunk (struct bfd_hash_entry *xentry,
+				 PTR xdata)
+{
+  struct elfNN_ia64_link_hash_entry *entry
+    = (struct elfNN_ia64_link_hash_entry *) xentry;
+  struct elfNN_ia64_dyn_sym_traverse_data *data
+    = (struct elfNN_ia64_dyn_sym_traverse_data *) xdata;
+  struct elfNN_ia64_dyn_sym_info *dyn_i;
+  unsigned int count;
+
+  for (count = entry->count, dyn_i = entry->info;
+       count != 0;
+       count--, dyn_i++)
+    if (! (*data->func) (dyn_i, data->data))
+      return FALSE;
+  return TRUE;
+}
+
+static bfd_boolean
+elfNN_ia64_local_dyn_sym_thunk (void **slot, PTR xdata)
+{
+  struct elfNN_ia64_local_hash_entry *entry
+    = (struct elfNN_ia64_local_hash_entry *) *slot;
+  struct elfNN_ia64_dyn_sym_traverse_data *data
+    = (struct elfNN_ia64_dyn_sym_traverse_data *) xdata;
+  struct elfNN_ia64_dyn_sym_info *dyn_i;
+  unsigned int count;
+
+  for (count = entry->count, dyn_i = entry->info;
+       count != 0;
+       count--, dyn_i++)
+    if (! (*data->func) (dyn_i, data->data))
+      return FALSE;
+  return TRUE;
+}
+
+static void
+elfNN_ia64_dyn_sym_traverse (struct elfNN_ia64_link_hash_table *ia64_info,
+			     bfd_boolean (*func) (struct elfNN_ia64_dyn_sym_info *, PTR),
+			     PTR data)
+{
+  struct elfNN_ia64_dyn_sym_traverse_data xdata;
+
+  xdata.func = func;
+  xdata.data = data;
+
+  elf_link_hash_traverse (&ia64_info->root,
+			  elfNN_ia64_global_dyn_sym_thunk, &xdata);
+  htab_traverse (ia64_info->loc_hash_table,
+		 elfNN_ia64_local_dyn_sym_thunk, &xdata);
+}
+
+static bfd_boolean
+elfNN_ia64_create_dynamic_sections (bfd *abfd,
+				    struct bfd_link_info *info)
+{
+  struct elfNN_ia64_link_hash_table *ia64_info;
+  asection *s;
+
+  if (! _bfd_elf_create_dynamic_sections (abfd, info))
+    return FALSE;
+
+  ia64_info = elfNN_ia64_hash_table (info);
+  if (ia64_info == NULL)
+    return FALSE;
+
+  {
+    flagword flags = bfd_get_section_flags (abfd, ia64_info->root.sgot);
+    bfd_set_section_flags (abfd, ia64_info->root.sgot,
+			   SEC_SMALL_DATA | flags);
+    /* The .got section is always aligned at 8 bytes.  */
+    bfd_set_section_alignment (abfd, ia64_info->root.sgot, 3);
+  }
+
+  if (!get_pltoff (abfd, info, ia64_info))
+    return FALSE;
+
+  s = bfd_make_section_with_flags (abfd, ".rela.IA_64.pltoff",
+				   (SEC_ALLOC | SEC_LOAD
+				    | SEC_HAS_CONTENTS
+				    | SEC_IN_MEMORY
+				    | SEC_LINKER_CREATED
+				    | SEC_READONLY));
+  if (s == NULL
+      || !bfd_set_section_alignment (abfd, s, LOG_SECTION_ALIGN))
+    return FALSE;
+  ia64_info->rel_pltoff_sec = s;
+
+  return TRUE;
+}
+
+/* Find and/or create a hash entry for local symbol.  */
+static struct elfNN_ia64_local_hash_entry *
+get_local_sym_hash (struct elfNN_ia64_link_hash_table *ia64_info,
+		    bfd *abfd, const Elf_Internal_Rela *rel,
+		    bfd_boolean create)
+{
+  struct elfNN_ia64_local_hash_entry e, *ret;
+  asection *sec = abfd->sections;
+  hashval_t h = ELF_LOCAL_SYMBOL_HASH (sec->id,
+				       ELFNN_R_SYM (rel->r_info));
+  void **slot;
+
+  e.id = sec->id;
+  e.r_sym = ELFNN_R_SYM (rel->r_info);
+  slot = htab_find_slot_with_hash (ia64_info->loc_hash_table, &e, h,
+				   create ? INSERT : NO_INSERT);
+
+  if (!slot)
+    return NULL;
+
+  if (*slot)
+    return (struct elfNN_ia64_local_hash_entry *) *slot;
+
+  ret = (struct elfNN_ia64_local_hash_entry *)
+	objalloc_alloc ((struct objalloc *) ia64_info->loc_hash_memory,
+			sizeof (struct elfNN_ia64_local_hash_entry));
+  if (ret)
+    {
+      memset (ret, 0, sizeof (*ret));
+      ret->id = sec->id;
+      ret->r_sym = ELFNN_R_SYM (rel->r_info);
+      *slot = ret;
+    }
+  return ret;
+}
+
+/* Used to sort elfNN_ia64_dyn_sym_info array.  */
+
+static int
+addend_compare (const void *xp, const void *yp)
+{
+  const struct elfNN_ia64_dyn_sym_info *x
+    = (const struct elfNN_ia64_dyn_sym_info *) xp;
+  const struct elfNN_ia64_dyn_sym_info *y
+    = (const struct elfNN_ia64_dyn_sym_info *) yp;
+
+  return x->addend < y->addend ? -1 : x->addend > y->addend ? 1 : 0;
+}
+
+/* Sort elfNN_ia64_dyn_sym_info array and remove duplicates.  */
+
+static unsigned int
+sort_dyn_sym_info (struct elfNN_ia64_dyn_sym_info *info,
+		   unsigned int count)
+{
+  bfd_vma curr, prev, got_offset;
+  unsigned int i, kept, dupes, diff, dest, src, len;
+
+  qsort (info, count, sizeof (*info), addend_compare);
+
+  /* Find the first duplicate.  */
+  prev = info [0].addend;
+  got_offset = info [0].got_offset;
+  for (i = 1; i < count; i++)
+    {
+      curr = info [i].addend;
+      if (curr == prev)
+	{
+	  /* For duplicates, make sure that GOT_OFFSET is valid.  */
+	  if (got_offset == (bfd_vma) -1)
+	    got_offset = info [i].got_offset;
+	  break;
+	}
+      got_offset = info [i].got_offset;
+      prev = curr;
+    }
+
+  /* We may move a block of elements to here.  */
+  dest = i++;
+
+  /* Remove duplicates.  */
+  if (i < count)
+    {
+      while (i < count)
+	{
+	  /* For duplicates, make sure that the kept one has a valid
+	     got_offset.  */
+	  kept = dest - 1;
+	  if (got_offset != (bfd_vma) -1)
+	    info [kept].got_offset = got_offset;
+
+	  curr = info [i].addend;
+	  got_offset = info [i].got_offset;
+
+	  /* Move a block of elements whose first one is different from
+	     the previous.  */
+	  if (curr == prev)
+	    {
+	      for (src = i + 1; src < count; src++)
+		{
+		  if (info [src].addend != curr)
+		    break;
+		  /* For duplicates, make sure that GOT_OFFSET is
+		     valid.  */
+		  if (got_offset == (bfd_vma) -1)
+		    got_offset = info [src].got_offset;
+		}
+
+	      /* Make sure that the kept one has a valid got_offset.  */
+	      if (got_offset != (bfd_vma) -1)
+		info [kept].got_offset = got_offset;
+	    }
+	  else
+	    src = i;
+
+	  if (src >= count)
+	    break;
+
+	  /* Find the next duplicate.  SRC will be kept.  */
+	  prev = info [src].addend;
+	  got_offset = info [src].got_offset;
+	  for (dupes = src + 1; dupes < count; dupes ++)
+	    {
+	      curr = info [dupes].addend;
+	      if (curr == prev)
+		{
+		  /* Make sure that got_offset is valid.  */
+		  if (got_offset == (bfd_vma) -1)
+		    got_offset = info [dupes].got_offset;
+
+		  /* For duplicates, make sure that the kept one has
+		     a valid got_offset.  */
+		  if (got_offset != (bfd_vma) -1)
+		    info [dupes - 1].got_offset = got_offset;
+		  break;
+		}
+	      got_offset = info [dupes].got_offset;
+	      prev = curr;
+	    }
+
+	  /* How much to move.  */
+	  len = dupes - src;
+	  i = dupes + 1;
+
+	  if (len == 1 && dupes < count)
+	    {
+	      /* If we only move 1 element, we combine it with the next
+		 one.  There must be at least a duplicate.  Find the
+		 next different one.  */
+	      for (diff = dupes + 1, src++; diff < count; diff++, src++)
+		{
+		  if (info [diff].addend != curr)
+		    break;
+		  /* Make sure that got_offset is valid.  */
+		  if (got_offset == (bfd_vma) -1)
+		    got_offset = info [diff].got_offset;
+		}
+
+	      /* Makre sure that the last duplicated one has an valid
+		 offset.  */
+	      BFD_ASSERT (curr == prev);
+	      if (got_offset != (bfd_vma) -1)
+		info [diff - 1].got_offset = got_offset;
+
+	      if (diff < count)
+		{
+		  /* Find the next duplicate.  Track the current valid
+		     offset.  */
+		  prev = info [diff].addend;
+		  got_offset = info [diff].got_offset;
+		  for (dupes = diff + 1; dupes < count; dupes ++)
+		    {
+		      curr = info [dupes].addend;
+		      if (curr == prev)
+			{
+			  /* For duplicates, make sure that GOT_OFFSET
+			     is valid.  */
+			  if (got_offset == (bfd_vma) -1)
+			    got_offset = info [dupes].got_offset;
+			  break;
+			}
+		      got_offset = info [dupes].got_offset;
+		      prev = curr;
+		      diff++;
+		    }
+
+		  len = diff - src + 1;
+		  i = diff + 1;
+		}
+	    }
+
+	  memmove (&info [dest], &info [src], len * sizeof (*info));
+
+	  dest += len;
+	}
+
+      count = dest;
+    }
+  else
+    {
+      /* When we get here, either there is no duplicate at all or
+	 the only duplicate is the last element.  */
+      if (dest < count)
+	{
+	  /* If the last element is a duplicate, make sure that the
+	     kept one has a valid got_offset.  We also update count.  */
+	  if (got_offset != (bfd_vma) -1)
+	    info [dest - 1].got_offset = got_offset;
+	  count = dest;
+	}
+    }
+
+  return count;
+}
+
+/* Find and/or create a descriptor for dynamic symbol info.  This will
+   vary based on global or local symbol, and the addend to the reloc.
+
+   We don't sort when inserting.  Also, we sort and eliminate
+   duplicates if there is an unsorted section.  Typically, this will
+   only happen once, because we do all insertions before lookups.  We
+   then use bsearch to do a lookup.  This also allows lookups to be
+   fast.  So we have fast insertion (O(log N) due to duplicate check),
+   fast lookup (O(log N)) and one sort (O(N log N) expected time).
+   Previously, all lookups were O(N) because of the use of the linked
+   list and also all insertions were O(N) because of the check for
+   duplicates.  There are some complications here because the array
+   size grows occasionally, which may add an O(N) factor, but this
+   should be rare.  Also,  we free the excess array allocation, which
+   requires a copy which is O(N), but this only happens once.  */
+
+static struct elfNN_ia64_dyn_sym_info *
+get_dyn_sym_info (struct elfNN_ia64_link_hash_table *ia64_info,
+		  struct elf_link_hash_entry *h, bfd *abfd,
+		  const Elf_Internal_Rela *rel, bfd_boolean create)
+{
+  struct elfNN_ia64_dyn_sym_info **info_p, *info, *dyn_i, key;
+  unsigned int *count_p, *sorted_count_p, *size_p;
+  unsigned int count, sorted_count, size;
+  bfd_vma addend = rel ? rel->r_addend : 0;
+  bfd_size_type amt;
+
+  if (h)
+    {
+      struct elfNN_ia64_link_hash_entry *global_h;
+
+      global_h = (struct elfNN_ia64_link_hash_entry *) h;
+      info_p = &global_h->info;
+      count_p = &global_h->count;
+      sorted_count_p = &global_h->sorted_count;
+      size_p = &global_h->size;
+    }
+  else
+    {
+      struct elfNN_ia64_local_hash_entry *loc_h;
+
+      loc_h = get_local_sym_hash (ia64_info, abfd, rel, create);
+      if (!loc_h)
+	{
+	  BFD_ASSERT (!create);
+	  return NULL;
+	}
+
+      info_p = &loc_h->info;
+      count_p = &loc_h->count;
+      sorted_count_p = &loc_h->sorted_count;
+      size_p = &loc_h->size;
+    }
+
+  count = *count_p;
+  sorted_count = *sorted_count_p;
+  size = *size_p;
+  info = *info_p;
+  if (create)
+    {
+      /* When we create the array, we don't check for duplicates,
+         except in the previously sorted section if one exists, and
+	 against the last inserted entry.  This allows insertions to
+	 be fast.  */
+      if (info)
+	{
+	  if (sorted_count)
+	    {
+	      /* Try bsearch first on the sorted section.  */
+	      key.addend = addend;
+	      dyn_i = bsearch (&key, info, sorted_count,
+			       sizeof (*info), addend_compare);
+
+	      if (dyn_i)
+		{
+		  return dyn_i;
+		}
+	    }
+
+	  /* Do a quick check for the last inserted entry.  */
+	  dyn_i = info + count - 1;
+	  if (dyn_i->addend == addend)
+	    {
+	      return dyn_i;
+	    }
+	}
+
+      if (size == 0)
+	{
+	  /* It is the very first element. We create the array of size
+	     1.  */
+	  size = 1;
+	  amt = size * sizeof (*info);
+	  info = bfd_malloc (amt);
+	}
+      else if (size <= count)
+	{
+	  /* We double the array size every time when we reach the
+	     size limit.  */
+	  size += size;
+	  amt = size * sizeof (*info);
+	  info = bfd_realloc (info, amt);
+	}
+      else
+	goto has_space;
+
+      if (info == NULL)
+	return NULL;
+      *size_p = size;
+      *info_p = info;
+
+has_space:
+      /* Append the new one to the array.  */
+      dyn_i = info + count;
+      memset (dyn_i, 0, sizeof (*dyn_i));
+      dyn_i->got_offset = (bfd_vma) -1;
+      dyn_i->addend = addend;
+
+      /* We increment count only since the new ones are unsorted and
+	 may have duplicate.  */
+      (*count_p)++;
+    }
+  else
+    {
+      /* It is a lookup without insertion.  Sort array if part of the
+	 array isn't sorted.  */
+      if (count != sorted_count)
+	{
+	  count = sort_dyn_sym_info (info, count);
+	  *count_p = count;
+	  *sorted_count_p = count;
+	}
+
+      /* Free unused memory.  */
+      if (size != count)
+	{
+	  amt = count * sizeof (*info);
+	  info = bfd_malloc (amt);
+	  if (info != NULL)
+	    {
+	      memcpy (info, *info_p, amt);
+	      free (*info_p);
+	      *size_p = count;
+	      *info_p = info;
+	    }
+	}
+
+      key.addend = addend;
+      dyn_i = bsearch (&key, info, count,
+		       sizeof (*info), addend_compare);
+    }
+
+  return dyn_i;
+}
+
+static asection *
+get_got (bfd *abfd, struct bfd_link_info *info,
+	 struct elfNN_ia64_link_hash_table *ia64_info)
+{
+  asection *got;
+  bfd *dynobj;
+
+  got = ia64_info->root.sgot;
+  if (!got)
+    {
+      flagword flags;
+
+      dynobj = ia64_info->root.dynobj;
+      if (!dynobj)
+	ia64_info->root.dynobj = dynobj = abfd;
+      if (!_bfd_elf_create_got_section (dynobj, info))
+	return 0;
+
+      got = ia64_info->root.sgot;
+
+      /* The .got section is always aligned at 8 bytes.  */
+      if (!bfd_set_section_alignment (abfd, got, 3))
+	return 0;
+
+      flags = bfd_get_section_flags (abfd, got);
+      bfd_set_section_flags (abfd, got, SEC_SMALL_DATA | flags);
+    }
+
+  return got;
+}
+
+/* Create function descriptor section (.opd).  This section is called .opd
+   because it contains "official procedure descriptors".  The "official"
+   refers to the fact that these descriptors are used when taking the address
+   of a procedure, thus ensuring a unique address for each procedure.  */
+
+static asection *
+get_fptr (bfd *abfd, struct bfd_link_info *info,
+	  struct elfNN_ia64_link_hash_table *ia64_info)
+{
+  asection *fptr;
+  bfd *dynobj;
+
+  fptr = ia64_info->fptr_sec;
+  if (!fptr)
+    {
+      dynobj = ia64_info->root.dynobj;
+      if (!dynobj)
+	ia64_info->root.dynobj = dynobj = abfd;
+
+      fptr = bfd_make_section_with_flags (dynobj, ".opd",
+					  (SEC_ALLOC
+					   | SEC_LOAD
+					   | SEC_HAS_CONTENTS
+					   | SEC_IN_MEMORY
+					   | (info->pie ? 0 : SEC_READONLY)
+					   | SEC_LINKER_CREATED));
+      if (!fptr
+	  || !bfd_set_section_alignment (abfd, fptr, 4))
+	{
+	  BFD_ASSERT (0);
+	  return NULL;
+	}
+
+      ia64_info->fptr_sec = fptr;
+
+      if (info->pie)
+	{
+	  asection *fptr_rel;
+	  fptr_rel = bfd_make_section_with_flags (dynobj, ".rela.opd",
+						  (SEC_ALLOC | SEC_LOAD
+						   | SEC_HAS_CONTENTS
+						   | SEC_IN_MEMORY
+						   | SEC_LINKER_CREATED
+						   | SEC_READONLY));
+	  if (fptr_rel == NULL
+	      || !bfd_set_section_alignment (abfd, fptr_rel,
+					     LOG_SECTION_ALIGN))
+	    {
+	      BFD_ASSERT (0);
+	      return NULL;
+	    }
+
+	  ia64_info->rel_fptr_sec = fptr_rel;
+	}
+    }
+
+  return fptr;
+}
+
+static asection *
+get_pltoff (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED,
+	    struct elfNN_ia64_link_hash_table *ia64_info)
+{
+  asection *pltoff;
+  bfd *dynobj;
+
+  pltoff = ia64_info->pltoff_sec;
+  if (!pltoff)
+    {
+      dynobj = ia64_info->root.dynobj;
+      if (!dynobj)
+	ia64_info->root.dynobj = dynobj = abfd;
+
+      pltoff = bfd_make_section_with_flags (dynobj,
+					    ELF_STRING_ia64_pltoff,
+					    (SEC_ALLOC
+					     | SEC_LOAD
+					     | SEC_HAS_CONTENTS
+					     | SEC_IN_MEMORY
+					     | SEC_SMALL_DATA
+					     | SEC_LINKER_CREATED));
+      if (!pltoff
+	  || !bfd_set_section_alignment (abfd, pltoff, 4))
+	{
+	  BFD_ASSERT (0);
+	  return NULL;
+	}
+
+      ia64_info->pltoff_sec = pltoff;
+    }
+
+  return pltoff;
+}
+
+static asection *
+get_reloc_section (bfd *abfd,
+		   struct elfNN_ia64_link_hash_table *ia64_info,
+		   asection *sec, bfd_boolean create)
+{
+  const char *srel_name;
+  asection *srel;
+  bfd *dynobj;
+
+  srel_name = (bfd_elf_string_from_elf_section
+	       (abfd, elf_elfheader(abfd)->e_shstrndx,
+		_bfd_elf_single_rel_hdr (sec)->sh_name));
+  if (srel_name == NULL)
+    return NULL;
+
+  dynobj = ia64_info->root.dynobj;
+  if (!dynobj)
+    ia64_info->root.dynobj = dynobj = abfd;
+
+  srel = bfd_get_section_by_name (dynobj, srel_name);
+  if (srel == NULL && create)
+    {
+      srel = bfd_make_section_with_flags (dynobj, srel_name,
+					  (SEC_ALLOC | SEC_LOAD
+					   | SEC_HAS_CONTENTS
+					   | SEC_IN_MEMORY
+					   | SEC_LINKER_CREATED
+					   | SEC_READONLY));
+      if (srel == NULL
+	  || !bfd_set_section_alignment (dynobj, srel,
+					 LOG_SECTION_ALIGN))
+	return NULL;
+    }
+
+  return srel;
+}
+
+static bfd_boolean
+count_dyn_reloc (bfd *abfd, struct elfNN_ia64_dyn_sym_info *dyn_i,
+		 asection *srel, int type, bfd_boolean reltext)
+{
+  struct elfNN_ia64_dyn_reloc_entry *rent;
+
+  for (rent = dyn_i->reloc_entries; rent; rent = rent->next)
+    if (rent->srel == srel && rent->type == type)
+      break;
+
+  if (!rent)
+    {
+      rent = ((struct elfNN_ia64_dyn_reloc_entry *)
+	      bfd_alloc (abfd, (bfd_size_type) sizeof (*rent)));
+      if (!rent)
+	return FALSE;
+
+      rent->next = dyn_i->reloc_entries;
+      rent->srel = srel;
+      rent->type = type;
+      rent->count = 0;
+      dyn_i->reloc_entries = rent;
+    }
+  rent->reltext = reltext;
+  rent->count++;
+
+  return TRUE;
+}
+
+static bfd_boolean
+elfNN_ia64_check_relocs (bfd *abfd, struct bfd_link_info *info,
+			 asection *sec,
+			 const Elf_Internal_Rela *relocs)
+{
+  struct elfNN_ia64_link_hash_table *ia64_info;
+  const Elf_Internal_Rela *relend;
+  Elf_Internal_Shdr *symtab_hdr;
+  const Elf_Internal_Rela *rel;
+  asection *got, *fptr, *srel, *pltoff;
+  enum {
+    NEED_GOT = 1,
+    NEED_GOTX = 2,
+    NEED_FPTR = 4,
+    NEED_PLTOFF = 8,
+    NEED_MIN_PLT = 16,
+    NEED_FULL_PLT = 32,
+    NEED_DYNREL = 64,
+    NEED_LTOFF_FPTR = 128,
+    NEED_TPREL = 256,
+    NEED_DTPMOD = 512,
+    NEED_DTPREL = 1024
+  };
+  int need_entry;
+  struct elf_link_hash_entry *h;
+  unsigned long r_symndx;
+  bfd_boolean maybe_dynamic;
+
+  if (info->relocatable)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  ia64_info = elfNN_ia64_hash_table (info);
+  if (ia64_info == NULL)
+    return FALSE;
+
+  got = fptr = srel = pltoff = NULL;
+
+  relend = relocs + sec->reloc_count;
+
+  /* We scan relocations first to create dynamic relocation arrays.  We
+     modified get_dyn_sym_info to allow fast insertion and support fast
+     lookup in the next loop.  */
+  for (rel = relocs; rel < relend; ++rel)
+    {
+      r_symndx = ELFNN_R_SYM (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  long indx = r_symndx - symtab_hdr->sh_info;
+	  h = elf_sym_hashes (abfd)[indx];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+      else
+	h = NULL;
+
+      /* We can only get preliminary data on whether a symbol is
+	 locally or externally defined, as not all of the input files
+	 have yet been processed.  Do something with what we know, as
+	 this may help reduce memory usage and processing time later.  */
+      maybe_dynamic = (h && ((!info->executable
+			      && (!SYMBOLIC_BIND (info, h)
+				  || info->unresolved_syms_in_shared_libs == RM_IGNORE))
+			     || !h->def_regular
+			     || h->root.type == bfd_link_hash_defweak));
+
+      need_entry = 0;
+      switch (ELFNN_R_TYPE (rel->r_info))
+	{
+	case R_IA64_TPREL64MSB:
+	case R_IA64_TPREL64LSB:
+	  if (info->shared || maybe_dynamic)
+	    need_entry = NEED_DYNREL;
+	  break;
+
+	case R_IA64_LTOFF_TPREL22:
+	  need_entry = NEED_TPREL;
+	  if (info->shared)
+	    info->flags |= DF_STATIC_TLS;
+	  break;
+
+	case R_IA64_DTPREL32MSB:
+	case R_IA64_DTPREL32LSB:
+	case R_IA64_DTPREL64MSB:
+	case R_IA64_DTPREL64LSB:
+	  if (info->shared || maybe_dynamic)
+	    need_entry = NEED_DYNREL;
+	  break;
+
+	case R_IA64_LTOFF_DTPREL22:
+	  need_entry = NEED_DTPREL;
+	  break;
+
+	case R_IA64_DTPMOD64MSB:
+	case R_IA64_DTPMOD64LSB:
+	  if (info->shared || maybe_dynamic)
+	    need_entry = NEED_DYNREL;
+	  break;
+
+	case R_IA64_LTOFF_DTPMOD22:
+	  need_entry = NEED_DTPMOD;
+	  break;
+
+	case R_IA64_LTOFF_FPTR22:
+	case R_IA64_LTOFF_FPTR64I:
+	case R_IA64_LTOFF_FPTR32MSB:
+	case R_IA64_LTOFF_FPTR32LSB:
+	case R_IA64_LTOFF_FPTR64MSB:
+	case R_IA64_LTOFF_FPTR64LSB:
+	  need_entry = NEED_FPTR | NEED_GOT | NEED_LTOFF_FPTR;
+	  break;
+
+	case R_IA64_FPTR64I:
+	case R_IA64_FPTR32MSB:
+	case R_IA64_FPTR32LSB:
+	case R_IA64_FPTR64MSB:
+	case R_IA64_FPTR64LSB:
+	  if (info->shared || h)
+	    need_entry = NEED_FPTR | NEED_DYNREL;
+	  else
+	    need_entry = NEED_FPTR;
+	  break;
+
+	case R_IA64_LTOFF22:
+	case R_IA64_LTOFF64I:
+	  need_entry = NEED_GOT;
+	  break;
+
+	case R_IA64_LTOFF22X:
+	  need_entry = NEED_GOTX;
+	  break;
+
+	case R_IA64_PLTOFF22:
+	case R_IA64_PLTOFF64I:
+	case R_IA64_PLTOFF64MSB:
+	case R_IA64_PLTOFF64LSB:
+	  need_entry = NEED_PLTOFF;
+	  if (h)
+	    {
+	      if (maybe_dynamic)
+		need_entry |= NEED_MIN_PLT;
+	    }
+	  else
+	    {
+	      (*info->callbacks->warning)
+		(info, _("@pltoff reloc against local symbol"), 0,
+		 abfd, 0, (bfd_vma) 0);
+	    }
+	  break;
+
+	case R_IA64_PCREL21B:
+        case R_IA64_PCREL60B:
+	  /* Depending on where this symbol is defined, we may or may not
+	     need a full plt entry.  Only skip if we know we'll not need
+	     the entry -- static or symbolic, and the symbol definition
+	     has already been seen.  */
+	  if (maybe_dynamic && rel->r_addend == 0)
+	    need_entry = NEED_FULL_PLT;
+	  break;
+
+	case R_IA64_IMM14:
+	case R_IA64_IMM22:
+	case R_IA64_IMM64:
+	case R_IA64_DIR32MSB:
+	case R_IA64_DIR32LSB:
+	case R_IA64_DIR64MSB:
+	case R_IA64_DIR64LSB:
+	  /* Shared objects will always need at least a REL relocation.  */
+	  if (info->shared || maybe_dynamic)
+	    need_entry = NEED_DYNREL;
+	  break;
+
+	case R_IA64_IPLTMSB:
+	case R_IA64_IPLTLSB:
+	  /* Shared objects will always need at least a REL relocation.  */
+	  if (info->shared || maybe_dynamic)
+	    need_entry = NEED_DYNREL;
+	  break;
+
+	case R_IA64_PCREL22:
+	case R_IA64_PCREL64I:
+	case R_IA64_PCREL32MSB:
+	case R_IA64_PCREL32LSB:
+	case R_IA64_PCREL64MSB:
+	case R_IA64_PCREL64LSB:
+	  if (maybe_dynamic)
+	    need_entry = NEED_DYNREL;
+	  break;
+	}
+
+      if (!need_entry)
+	continue;
+
+      if ((need_entry & NEED_FPTR) != 0
+	  && rel->r_addend)
+	{
+	  (*info->callbacks->warning)
+	    (info, _("non-zero addend in @fptr reloc"), 0,
+	     abfd, 0, (bfd_vma) 0);
+	}
+
+      if (get_dyn_sym_info (ia64_info, h, abfd, rel, TRUE) == NULL)
+	return FALSE;
+    }
+
+  /* Now, we only do lookup without insertion, which is very fast
+     with the modified get_dyn_sym_info.  */
+  for (rel = relocs; rel < relend; ++rel)
+    {
+      struct elfNN_ia64_dyn_sym_info *dyn_i;
+      int dynrel_type = R_IA64_NONE;
+
+      r_symndx = ELFNN_R_SYM (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  /* We're dealing with a global symbol -- find its hash entry
+	     and mark it as being referenced.  */
+	  long indx = r_symndx - symtab_hdr->sh_info;
+	  h = elf_sym_hashes (abfd)[indx];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+	  h->ref_regular = 1;
+	}
+      else
+	h = NULL;
+
+      /* We can only get preliminary data on whether a symbol is
+	 locally or externally defined, as not all of the input files
+	 have yet been processed.  Do something with what we know, as
+	 this may help reduce memory usage and processing time later.  */
+      maybe_dynamic = (h && ((!info->executable
+			      && (!SYMBOLIC_BIND (info, h)
+				  || info->unresolved_syms_in_shared_libs == RM_IGNORE))
+			     || !h->def_regular
+			     || h->root.type == bfd_link_hash_defweak));
+
+      need_entry = 0;
+      switch (ELFNN_R_TYPE (rel->r_info))
+	{
+	case R_IA64_TPREL64MSB:
+	case R_IA64_TPREL64LSB:
+	  if (info->shared || maybe_dynamic)
+	    need_entry = NEED_DYNREL;
+	  dynrel_type = R_IA64_TPREL64LSB;
+	  if (info->shared)
+	    info->flags |= DF_STATIC_TLS;
+	  break;
+
+	case R_IA64_LTOFF_TPREL22:
+	  need_entry = NEED_TPREL;
+	  if (info->shared)
+	    info->flags |= DF_STATIC_TLS;
+	  break;
+
+	case R_IA64_DTPREL32MSB:
+	case R_IA64_DTPREL32LSB:
+	case R_IA64_DTPREL64MSB:
+	case R_IA64_DTPREL64LSB:
+	  if (info->shared || maybe_dynamic)
+	    need_entry = NEED_DYNREL;
+	  dynrel_type = R_IA64_DTPRELNNLSB;
+	  break;
+
+	case R_IA64_LTOFF_DTPREL22:
+	  need_entry = NEED_DTPREL;
+	  break;
+
+	case R_IA64_DTPMOD64MSB:
+	case R_IA64_DTPMOD64LSB:
+	  if (info->shared || maybe_dynamic)
+	    need_entry = NEED_DYNREL;
+	  dynrel_type = R_IA64_DTPMOD64LSB;
+	  break;
+
+	case R_IA64_LTOFF_DTPMOD22:
+	  need_entry = NEED_DTPMOD;
+	  break;
+
+	case R_IA64_LTOFF_FPTR22:
+	case R_IA64_LTOFF_FPTR64I:
+	case R_IA64_LTOFF_FPTR32MSB:
+	case R_IA64_LTOFF_FPTR32LSB:
+	case R_IA64_LTOFF_FPTR64MSB:
+	case R_IA64_LTOFF_FPTR64LSB:
+	  need_entry = NEED_FPTR | NEED_GOT | NEED_LTOFF_FPTR;
+	  break;
+
+	case R_IA64_FPTR64I:
+	case R_IA64_FPTR32MSB:
+	case R_IA64_FPTR32LSB:
+	case R_IA64_FPTR64MSB:
+	case R_IA64_FPTR64LSB:
+	  if (info->shared || h)
+	    need_entry = NEED_FPTR | NEED_DYNREL;
+	  else
+	    need_entry = NEED_FPTR;
+	  dynrel_type = R_IA64_FPTRNNLSB;
+	  break;
+
+	case R_IA64_LTOFF22:
+	case R_IA64_LTOFF64I:
+	  need_entry = NEED_GOT;
+	  break;
+
+	case R_IA64_LTOFF22X:
+	  need_entry = NEED_GOTX;
+	  break;
+
+	case R_IA64_PLTOFF22:
+	case R_IA64_PLTOFF64I:
+	case R_IA64_PLTOFF64MSB:
+	case R_IA64_PLTOFF64LSB:
+	  need_entry = NEED_PLTOFF;
+	  if (h)
+	    {
+	      if (maybe_dynamic)
+		need_entry |= NEED_MIN_PLT;
+	    }
+	  break;
+
+	case R_IA64_PCREL21B:
+        case R_IA64_PCREL60B:
+	  /* Depending on where this symbol is defined, we may or may not
+	     need a full plt entry.  Only skip if we know we'll not need
+	     the entry -- static or symbolic, and the symbol definition
+	     has already been seen.  */
+	  if (maybe_dynamic && rel->r_addend == 0)
+	    need_entry = NEED_FULL_PLT;
+	  break;
+
+	case R_IA64_IMM14:
+	case R_IA64_IMM22:
+	case R_IA64_IMM64:
+	case R_IA64_DIR32MSB:
+	case R_IA64_DIR32LSB:
+	case R_IA64_DIR64MSB:
+	case R_IA64_DIR64LSB:
+	  /* Shared objects will always need at least a REL relocation.  */
+	  if (info->shared || maybe_dynamic)
+	    need_entry = NEED_DYNREL;
+	  dynrel_type = R_IA64_DIRNNLSB;
+	  break;
+
+	case R_IA64_IPLTMSB:
+	case R_IA64_IPLTLSB:
+	  /* Shared objects will always need at least a REL relocation.  */
+	  if (info->shared || maybe_dynamic)
+	    need_entry = NEED_DYNREL;
+	  dynrel_type = R_IA64_IPLTLSB;
+	  break;
+
+	case R_IA64_PCREL22:
+	case R_IA64_PCREL64I:
+	case R_IA64_PCREL32MSB:
+	case R_IA64_PCREL32LSB:
+	case R_IA64_PCREL64MSB:
+	case R_IA64_PCREL64LSB:
+	  if (maybe_dynamic)
+	    need_entry = NEED_DYNREL;
+	  dynrel_type = R_IA64_PCRELNNLSB;
+	  break;
+	}
+
+      if (!need_entry)
+	continue;
+
+      dyn_i = get_dyn_sym_info (ia64_info, h, abfd, rel, FALSE);
+
+      /* Record whether or not this is a local symbol.  */
+      dyn_i->h = h;
+
+      /* Create what's needed.  */
+      if (need_entry & (NEED_GOT | NEED_GOTX | NEED_TPREL
+			| NEED_DTPMOD | NEED_DTPREL))
+	{
+	  if (!got)
+	    {
+	      got = get_got (abfd, info, ia64_info);
+	      if (!got)
+		return FALSE;
+	    }
+	  if (need_entry & NEED_GOT)
+	    dyn_i->want_got = 1;
+	  if (need_entry & NEED_GOTX)
+	    dyn_i->want_gotx = 1;
+	  if (need_entry & NEED_TPREL)
+	    dyn_i->want_tprel = 1;
+	  if (need_entry & NEED_DTPMOD)
+	    dyn_i->want_dtpmod = 1;
+	  if (need_entry & NEED_DTPREL)
+	    dyn_i->want_dtprel = 1;
+	}
+      if (need_entry & NEED_FPTR)
+	{
+	  if (!fptr)
+	    {
+	      fptr = get_fptr (abfd, info, ia64_info);
+	      if (!fptr)
+		return FALSE;
+	    }
+
+	  /* FPTRs for shared libraries are allocated by the dynamic
+	     linker.  Make sure this local symbol will appear in the
+	     dynamic symbol table.  */
+	  if (!h && info->shared)
+	    {
+	      if (! (bfd_elf_link_record_local_dynamic_symbol
+		     (info, abfd, (long) r_symndx)))
+		return FALSE;
+	    }
+
+	  dyn_i->want_fptr = 1;
+	}
+      if (need_entry & NEED_LTOFF_FPTR)
+	dyn_i->want_ltoff_fptr = 1;
+      if (need_entry & (NEED_MIN_PLT | NEED_FULL_PLT))
+	{
+          if (!ia64_info->root.dynobj)
+	    ia64_info->root.dynobj = abfd;
+	  h->needs_plt = 1;
+	  dyn_i->want_plt = 1;
+	}
+      if (need_entry & NEED_FULL_PLT)
+	dyn_i->want_plt2 = 1;
+      if (need_entry & NEED_PLTOFF)
+	{
+	  /* This is needed here, in case @pltoff is used in a non-shared
+	     link.  */
+	  if (!pltoff)
+	    {
+	      pltoff = get_pltoff (abfd, info, ia64_info);
+	      if (!pltoff)
+		return FALSE;
+	    }
+
+	  dyn_i->want_pltoff = 1;
+	}
+      if ((need_entry & NEED_DYNREL) && (sec->flags & SEC_ALLOC))
+	{
+	  if (!srel)
+	    {
+	      srel = get_reloc_section (abfd, ia64_info, sec, TRUE);
+	      if (!srel)
+		return FALSE;
+	    }
+	  if (!count_dyn_reloc (abfd, dyn_i, srel, dynrel_type,
+				(sec->flags & SEC_READONLY) != 0))
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* For cleanliness, and potentially faster dynamic loading, allocate
+   external GOT entries first.  */
+
+static bfd_boolean
+allocate_global_data_got (struct elfNN_ia64_dyn_sym_info *dyn_i,
+			  void * data)
+{
+  struct elfNN_ia64_allocate_data *x = (struct elfNN_ia64_allocate_data *)data;
+
+  if ((dyn_i->want_got || dyn_i->want_gotx)
+      && ! dyn_i->want_fptr
+      && elfNN_ia64_dynamic_symbol_p (dyn_i->h, x->info, 0))
+     {
+       dyn_i->got_offset = x->ofs;
+       x->ofs += 8;
+     }
+  if (dyn_i->want_tprel)
+    {
+      dyn_i->tprel_offset = x->ofs;
+      x->ofs += 8;
+    }
+  if (dyn_i->want_dtpmod)
+    {
+      if (elfNN_ia64_dynamic_symbol_p (dyn_i->h, x->info, 0))
+	{
+	  dyn_i->dtpmod_offset = x->ofs;
+	  x->ofs += 8;
+	}
+      else
+	{
+	  struct elfNN_ia64_link_hash_table *ia64_info;
+
+	  ia64_info = elfNN_ia64_hash_table (x->info);
+	  if (ia64_info == NULL)
+	    return FALSE;
+
+	  if (ia64_info->self_dtpmod_offset == (bfd_vma) -1)
+	    {
+	      ia64_info->self_dtpmod_offset = x->ofs;
+	      x->ofs += 8;
+	    }
+	  dyn_i->dtpmod_offset = ia64_info->self_dtpmod_offset;
+	}
+    }
+  if (dyn_i->want_dtprel)
+    {
+      dyn_i->dtprel_offset = x->ofs;
+      x->ofs += 8;
+    }
+  return TRUE;
+}
+
+/* Next, allocate all the GOT entries used by LTOFF_FPTR relocs.  */
+
+static bfd_boolean
+allocate_global_fptr_got (struct elfNN_ia64_dyn_sym_info *dyn_i,
+			  void * data)
+{
+  struct elfNN_ia64_allocate_data *x = (struct elfNN_ia64_allocate_data *)data;
+
+  if (dyn_i->want_got
+      && dyn_i->want_fptr
+      && elfNN_ia64_dynamic_symbol_p (dyn_i->h, x->info, R_IA64_FPTRNNLSB))
+    {
+      dyn_i->got_offset = x->ofs;
+      x->ofs += 8;
+    }
+  return TRUE;
+}
+
+/* Lastly, allocate all the GOT entries for local data.  */
+
+static bfd_boolean
+allocate_local_got (struct elfNN_ia64_dyn_sym_info *dyn_i,
+		    PTR data)
+{
+  struct elfNN_ia64_allocate_data *x = (struct elfNN_ia64_allocate_data *)data;
+
+  if ((dyn_i->want_got || dyn_i->want_gotx)
+      && !elfNN_ia64_dynamic_symbol_p (dyn_i->h, x->info, 0))
+    {
+      dyn_i->got_offset = x->ofs;
+      x->ofs += 8;
+    }
+  return TRUE;
+}
+
+/* Search for the index of a global symbol in it's defining object file.  */
+
+static long
+global_sym_index (struct elf_link_hash_entry *h)
+{
+  struct elf_link_hash_entry **p;
+  bfd *obj;
+
+  BFD_ASSERT (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak);
+
+  obj = h->root.u.def.section->owner;
+  for (p = elf_sym_hashes (obj); *p != h; ++p)
+    continue;
+
+  return p - elf_sym_hashes (obj) + elf_tdata (obj)->symtab_hdr.sh_info;
+}
+
+/* Allocate function descriptors.  We can do these for every function
+   in a main executable that is not exported.  */
+
+static bfd_boolean
+allocate_fptr (struct elfNN_ia64_dyn_sym_info *dyn_i, PTR data)
+{
+  struct elfNN_ia64_allocate_data *x = (struct elfNN_ia64_allocate_data *)data;
+
+  if (dyn_i->want_fptr)
+    {
+      struct elf_link_hash_entry *h = dyn_i->h;
+
+      if (h)
+	while (h->root.type == bfd_link_hash_indirect
+	       || h->root.type == bfd_link_hash_warning)
+	  h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+      if (!x->info->executable
+	  && (!h
+	      || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+	      || (h->root.type != bfd_link_hash_undefweak
+		  && h->root.type != bfd_link_hash_undefined)))
+	{
+	  if (h && h->dynindx == -1)
+	    {
+	      BFD_ASSERT ((h->root.type == bfd_link_hash_defined)
+			  || (h->root.type == bfd_link_hash_defweak));
+
+	      if (!bfd_elf_link_record_local_dynamic_symbol
+		    (x->info, h->root.u.def.section->owner,
+		     global_sym_index (h)))
+		return FALSE;
+	    }
+
+	  dyn_i->want_fptr = 0;
+	}
+      else if (h == NULL || h->dynindx == -1)
+	{
+	  dyn_i->fptr_offset = x->ofs;
+	  x->ofs += 16;
+	}
+      else
+	dyn_i->want_fptr = 0;
+    }
+  return TRUE;
+}
+
+/* Allocate all the minimal PLT entries.  */
+
+static bfd_boolean
+allocate_plt_entries (struct elfNN_ia64_dyn_sym_info *dyn_i,
+		      PTR data)
+{
+  struct elfNN_ia64_allocate_data *x = (struct elfNN_ia64_allocate_data *)data;
+
+  if (dyn_i->want_plt)
+    {
+      struct elf_link_hash_entry *h = dyn_i->h;
+
+      if (h)
+	while (h->root.type == bfd_link_hash_indirect
+	       || h->root.type == bfd_link_hash_warning)
+	  h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+      /* ??? Versioned symbols seem to lose NEEDS_PLT.  */
+      if (elfNN_ia64_dynamic_symbol_p (h, x->info, 0))
+	{
+	  bfd_size_type offset = x->ofs;
+	  if (offset == 0)
+	    offset = PLT_HEADER_SIZE;
+	  dyn_i->plt_offset = offset;
+	  x->ofs = offset + PLT_MIN_ENTRY_SIZE;
+
+	  dyn_i->want_pltoff = 1;
+	}
+      else
+	{
+	  dyn_i->want_plt = 0;
+	  dyn_i->want_plt2 = 0;
+	}
+    }
+  return TRUE;
+}
+
+/* Allocate all the full PLT entries.  */
+
+static bfd_boolean
+allocate_plt2_entries (struct elfNN_ia64_dyn_sym_info *dyn_i,
+		       PTR data)
+{
+  struct elfNN_ia64_allocate_data *x = (struct elfNN_ia64_allocate_data *)data;
+
+  if (dyn_i->want_plt2)
+    {
+      struct elf_link_hash_entry *h = dyn_i->h;
+      bfd_size_type ofs = x->ofs;
+
+      dyn_i->plt2_offset = ofs;
+      x->ofs = ofs + PLT_FULL_ENTRY_SIZE;
+
+      while (h->root.type == bfd_link_hash_indirect
+	     || h->root.type == bfd_link_hash_warning)
+	h = (struct elf_link_hash_entry *) h->root.u.i.link;
+      dyn_i->h->plt.offset = ofs;
+    }
+  return TRUE;
+}
+
+/* Allocate all the PLTOFF entries requested by relocations and
+   plt entries.  We can't share space with allocated FPTR entries,
+   because the latter are not necessarily addressable by the GP.
+   ??? Relaxation might be able to determine that they are.  */
+
+static bfd_boolean
+allocate_pltoff_entries (struct elfNN_ia64_dyn_sym_info *dyn_i,
+			 PTR data)
+{
+  struct elfNN_ia64_allocate_data *x = (struct elfNN_ia64_allocate_data *)data;
+
+  if (dyn_i->want_pltoff)
+    {
+      dyn_i->pltoff_offset = x->ofs;
+      x->ofs += 16;
+    }
+  return TRUE;
+}
+
+/* Allocate dynamic relocations for those symbols that turned out
+   to be dynamic.  */
+
+static bfd_boolean
+allocate_dynrel_entries (struct elfNN_ia64_dyn_sym_info *dyn_i,
+			 PTR data)
+{
+  struct elfNN_ia64_allocate_data *x = (struct elfNN_ia64_allocate_data *)data;
+  struct elfNN_ia64_link_hash_table *ia64_info;
+  struct elfNN_ia64_dyn_reloc_entry *rent;
+  bfd_boolean dynamic_symbol, shared, resolved_zero;
+
+  ia64_info = elfNN_ia64_hash_table (x->info);
+  if (ia64_info == NULL)
+    return FALSE;
+
+  /* Note that this can't be used in relation to FPTR relocs below.  */
+  dynamic_symbol = elfNN_ia64_dynamic_symbol_p (dyn_i->h, x->info, 0);
+
+  shared = x->info->shared;
+  resolved_zero = (dyn_i->h
+		   && ELF_ST_VISIBILITY (dyn_i->h->other)
+		   && dyn_i->h->root.type == bfd_link_hash_undefweak);
+
+  /* Take care of the GOT and PLT relocations.  */
+
+  if ((!resolved_zero
+       && (dynamic_symbol || shared)
+       && (dyn_i->want_got || dyn_i->want_gotx))
+      || (dyn_i->want_ltoff_fptr
+	  && dyn_i->h
+	  && dyn_i->h->dynindx != -1))
+    {
+      if (!dyn_i->want_ltoff_fptr
+	  || !x->info->pie
+	  || dyn_i->h == NULL
+	  || dyn_i->h->root.type != bfd_link_hash_undefweak)
+	ia64_info->root.srelgot->size += sizeof (ElfNN_External_Rela);
+    }
+  if ((dynamic_symbol || shared) && dyn_i->want_tprel)
+    ia64_info->root.srelgot->size += sizeof (ElfNN_External_Rela);
+  if (dynamic_symbol && dyn_i->want_dtpmod)
+    ia64_info->root.srelgot->size += sizeof (ElfNN_External_Rela);
+  if (dynamic_symbol && dyn_i->want_dtprel)
+    ia64_info->root.srelgot->size += sizeof (ElfNN_External_Rela);
+
+  if (x->only_got)
+    return TRUE;
+
+  if (ia64_info->rel_fptr_sec && dyn_i->want_fptr)
+    {
+      if (dyn_i->h == NULL || dyn_i->h->root.type != bfd_link_hash_undefweak)
+	ia64_info->rel_fptr_sec->size += sizeof (ElfNN_External_Rela);
+    }
+
+  if (!resolved_zero && dyn_i->want_pltoff)
+    {
+      bfd_size_type t = 0;
+
+      /* Dynamic symbols get one IPLT relocation.  Local symbols in
+	 shared libraries get two REL relocations.  Local symbols in
+	 main applications get nothing.  */
+      if (dynamic_symbol)
+	t = sizeof (ElfNN_External_Rela);
+      else if (shared)
+	t = 2 * sizeof (ElfNN_External_Rela);
+
+      ia64_info->rel_pltoff_sec->size += t;
+    }
+
+  /* Take care of the normal data relocations.  */
+
+  for (rent = dyn_i->reloc_entries; rent; rent = rent->next)
+    {
+      int count = rent->count;
+
+      switch (rent->type)
+	{
+	case R_IA64_FPTR32LSB:
+	case R_IA64_FPTR64LSB:
+	  /* Allocate one iff !want_fptr and not PIE, which by this point
+	     will be true only if we're actually allocating one statically
+	     in the main executable.  Position independent executables
+	     need a relative reloc.  */
+	  if (dyn_i->want_fptr && !x->info->pie)
+	    continue;
+	  break;
+	case R_IA64_PCREL32LSB:
+	case R_IA64_PCREL64LSB:
+	  if (!dynamic_symbol)
+	    continue;
+	  break;
+	case R_IA64_DIR32LSB:
+	case R_IA64_DIR64LSB:
+	  if (!dynamic_symbol && !shared)
+	    continue;
+	  break;
+	case R_IA64_IPLTLSB:
+	  if (!dynamic_symbol && !shared)
+	    continue;
+	  /* Use two REL relocations for IPLT relocations
+	     against local symbols.  */
+	  if (!dynamic_symbol)
+	    count *= 2;
+	  break;
+	case R_IA64_DTPREL32LSB:
+	case R_IA64_TPREL64LSB:
+	case R_IA64_DTPREL64LSB:
+	case R_IA64_DTPMOD64LSB:
+	  break;
+	default:
+	  abort ();
+	}
+      if (rent->reltext)
+	ia64_info->reltext = 1;
+      rent->srel->size += sizeof (ElfNN_External_Rela) * count;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+elfNN_ia64_adjust_dynamic_symbol (struct bfd_link_info *info ATTRIBUTE_UNUSED,
+				  struct elf_link_hash_entry *h)
+{
+  /* ??? Undefined symbols with PLT entries should be re-defined
+     to be the PLT entry.  */
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+                  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* If this is a reference to a symbol defined by a dynamic object which
+     is not a function, we might allocate the symbol in our .dynbss section
+     and allocate a COPY dynamic relocation.
+
+     But IA-64 code is canonically PIC, so as a rule we can avoid this sort
+     of hackery.  */
+
+  return TRUE;
+}
+
+static bfd_boolean
+elfNN_ia64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+				  struct bfd_link_info *info)
+{
+  struct elfNN_ia64_allocate_data data;
+  struct elfNN_ia64_link_hash_table *ia64_info;
+  asection *sec;
+  bfd *dynobj;
+  bfd_boolean relplt = FALSE;
+
+  dynobj = elf_hash_table(info)->dynobj;
+  ia64_info = elfNN_ia64_hash_table (info);
+  if (ia64_info == NULL)
+    return FALSE;
+  ia64_info->self_dtpmod_offset = (bfd_vma) -1;
+  BFD_ASSERT(dynobj != NULL);
+  data.info = info;
+
+  /* Set the contents of the .interp section to the interpreter.  */
+  if (ia64_info->root.dynamic_sections_created
+      && info->executable)
+    {
+      sec = bfd_get_section_by_name (dynobj, ".interp");
+      BFD_ASSERT (sec != NULL);
+      sec->contents = (bfd_byte *) ELF_DYNAMIC_INTERPRETER;
+      sec->size = strlen (ELF_DYNAMIC_INTERPRETER) + 1;
+    }
+
+  /* Allocate the GOT entries.  */
+
+  if (ia64_info->root.sgot)
+    {
+      data.ofs = 0;
+      elfNN_ia64_dyn_sym_traverse (ia64_info, allocate_global_data_got, &data);
+      elfNN_ia64_dyn_sym_traverse (ia64_info, allocate_global_fptr_got, &data);
+      elfNN_ia64_dyn_sym_traverse (ia64_info, allocate_local_got, &data);
+      ia64_info->root.sgot->size = data.ofs;
+    }
+
+  /* Allocate the FPTR entries.  */
+
+  if (ia64_info->fptr_sec)
+    {
+      data.ofs = 0;
+      elfNN_ia64_dyn_sym_traverse (ia64_info, allocate_fptr, &data);
+      ia64_info->fptr_sec->size = data.ofs;
+    }
+
+  /* Now that we've seen all of the input files, we can decide which
+     symbols need plt entries.  Allocate the minimal PLT entries first.
+     We do this even though dynamic_sections_created may be FALSE, because
+     this has the side-effect of clearing want_plt and want_plt2.  */
+
+  data.ofs = 0;
+  elfNN_ia64_dyn_sym_traverse (ia64_info, allocate_plt_entries, &data);
+
+  ia64_info->minplt_entries = 0;
+  if (data.ofs)
+    {
+      ia64_info->minplt_entries
+	= (data.ofs - PLT_HEADER_SIZE) / PLT_MIN_ENTRY_SIZE;
+    }
+
+  /* Align the pointer for the plt2 entries.  */
+  data.ofs = (data.ofs + 31) & (bfd_vma) -32;
+
+  elfNN_ia64_dyn_sym_traverse (ia64_info, allocate_plt2_entries, &data);
+  if (data.ofs != 0 || ia64_info->root.dynamic_sections_created)
+    {
+      /* FIXME: we always reserve the memory for dynamic linker even if
+	 there are no PLT entries since dynamic linker may assume the
+	 reserved memory always exists.  */
+
+      BFD_ASSERT (ia64_info->root.dynamic_sections_created);
+
+      ia64_info->root.splt->size = data.ofs;
+
+      /* If we've got a .plt, we need some extra memory for the dynamic
+	 linker.  We stuff these in .got.plt.  */
+      sec = bfd_get_section_by_name (dynobj, ".got.plt");
+      sec->size = 8 * PLT_RESERVED_WORDS;
+    }
+
+  /* Allocate the PLTOFF entries.  */
+
+  if (ia64_info->pltoff_sec)
+    {
+      data.ofs = 0;
+      elfNN_ia64_dyn_sym_traverse (ia64_info, allocate_pltoff_entries, &data);
+      ia64_info->pltoff_sec->size = data.ofs;
+    }
+
+  if (ia64_info->root.dynamic_sections_created)
+    {
+      /* Allocate space for the dynamic relocations that turned out to be
+	 required.  */
+
+      if (info->shared && ia64_info->self_dtpmod_offset != (bfd_vma) -1)
+	ia64_info->root.srelgot->size += sizeof (ElfNN_External_Rela);
+      data.only_got = FALSE;
+      elfNN_ia64_dyn_sym_traverse (ia64_info, allocate_dynrel_entries, &data);
+    }
+
+  /* We have now determined the sizes of the various dynamic sections.
+     Allocate memory for them.  */
+  for (sec = dynobj->sections; sec != NULL; sec = sec->next)
+    {
+      bfd_boolean strip;
+
+      if (!(sec->flags & SEC_LINKER_CREATED))
+	continue;
+
+      /* If we don't need this section, strip it from the output file.
+	 There were several sections primarily related to dynamic
+	 linking that must be create before the linker maps input
+	 sections to output sections.  The linker does that before
+	 bfd_elf_size_dynamic_sections is called, and it is that
+	 function which decides whether anything needs to go into
+	 these sections.  */
+
+      strip = (sec->size == 0);
+
+      if (sec == ia64_info->root.sgot)
+	strip = FALSE;
+      else if (sec == ia64_info->root.srelgot)
+	{
+	  if (strip)
+	    ia64_info->root.srelgot = NULL;
+	  else
+	    /* We use the reloc_count field as a counter if we need to
+	       copy relocs into the output file.  */
+	    sec->reloc_count = 0;
+	}
+      else if (sec == ia64_info->fptr_sec)
+	{
+	  if (strip)
+	    ia64_info->fptr_sec = NULL;
+	}
+      else if (sec == ia64_info->rel_fptr_sec)
+	{
+	  if (strip)
+	    ia64_info->rel_fptr_sec = NULL;
+	  else
+	    /* We use the reloc_count field as a counter if we need to
+	       copy relocs into the output file.  */
+	    sec->reloc_count = 0;
+	}
+      else if (sec == ia64_info->root.splt)
+	{
+	  if (strip)
+	    ia64_info->root.splt = NULL;
+	}
+      else if (sec == ia64_info->pltoff_sec)
+	{
+	  if (strip)
+	    ia64_info->pltoff_sec = NULL;
+	}
+      else if (sec == ia64_info->rel_pltoff_sec)
+	{
+	  if (strip)
+	    ia64_info->rel_pltoff_sec = NULL;
+	  else
+	    {
+	      relplt = TRUE;
+	      /* We use the reloc_count field as a counter if we need to
+		 copy relocs into the output file.  */
+	      sec->reloc_count = 0;
+	    }
+	}
+      else
+	{
+	  const char *name;
+
+	  /* It's OK to base decisions on the section name, because none
+	     of the dynobj section names depend upon the input files.  */
+	  name = bfd_get_section_name (dynobj, sec);
+
+	  if (strcmp (name, ".got.plt") == 0)
+	    strip = FALSE;
+	  else if (CONST_STRNEQ (name, ".rel"))
+	    {
+	      if (!strip)
+		{
+		  /* We use the reloc_count field as a counter if we need to
+		     copy relocs into the output file.  */
+		  sec->reloc_count = 0;
+		}
+	    }
+	  else
+	    continue;
+	}
+
+      if (strip)
+	sec->flags |= SEC_EXCLUDE;
+      else
+	{
+	  /* Allocate memory for the section contents.  */
+	  sec->contents = (bfd_byte *) bfd_zalloc (dynobj, sec->size);
+	  if (sec->contents == NULL && sec->size != 0)
+	    return FALSE;
+	}
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the values
+	 later (in finish_dynamic_sections) but we must add the entries now
+	 so that we get the correct size for the .dynamic section.  */
+
+      if (info->executable)
+	{
+	  /* The DT_DEBUG entry is filled in by the dynamic linker and used
+	     by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (!add_dynamic_entry (DT_IA_64_PLT_RESERVE, 0))
+	return FALSE;
+      if (!add_dynamic_entry (DT_PLTGOT, 0))
+	return FALSE;
+
+      if (relplt)
+	{
+	  if (!add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+	      || !add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+	}
+
+      if (!add_dynamic_entry (DT_RELA, 0)
+	  || !add_dynamic_entry (DT_RELASZ, 0)
+	  || !add_dynamic_entry (DT_RELAENT, sizeof (ElfNN_External_Rela)))
+	return FALSE;
+
+      if (ia64_info->reltext)
+	{
+	  if (!add_dynamic_entry (DT_TEXTREL, 0))
+	    return FALSE;
+	  info->flags |= DF_TEXTREL;
+	}
+    }
+
+  /* ??? Perhaps force __gp local.  */
+
+  return TRUE;
+}
+
+static void
+elfNN_ia64_install_dyn_reloc (bfd *abfd, struct bfd_link_info *info,
+			      asection *sec, asection *srel,
+			      bfd_vma offset, unsigned int type,
+			      long dynindx, bfd_vma addend)
+{
+  Elf_Internal_Rela outrel;
+  bfd_byte *loc;
+
+  BFD_ASSERT (dynindx != -1);
+  outrel.r_info = ELFNN_R_INFO (dynindx, type);
+  outrel.r_addend = addend;
+  outrel.r_offset = _bfd_elf_section_offset (abfd, info, sec, offset);
+  if (outrel.r_offset >= (bfd_vma) -2)
+    {
+      /* Run for the hills.  We shouldn't be outputting a relocation
+	 for this.  So do what everyone else does and output a no-op.  */
+      outrel.r_info = ELFNN_R_INFO (0, R_IA64_NONE);
+      outrel.r_addend = 0;
+      outrel.r_offset = 0;
+    }
+  else
+    outrel.r_offset += sec->output_section->vma + sec->output_offset;
+
+  loc = srel->contents;
+  loc += srel->reloc_count++ * sizeof (ElfNN_External_Rela);
+  bfd_elfNN_swap_reloca_out (abfd, &outrel, loc);
+  BFD_ASSERT (sizeof (ElfNN_External_Rela) * srel->reloc_count <= srel->size);
+}
+
+/* Store an entry for target address TARGET_ADDR in the linkage table
+   and return the gp-relative address of the linkage table entry.  */
+
+static bfd_vma
+set_got_entry (bfd *abfd, struct bfd_link_info *info,
+	       struct elfNN_ia64_dyn_sym_info *dyn_i,
+	       long dynindx, bfd_vma addend, bfd_vma value,
+	       unsigned int dyn_r_type)
+{
+  struct elfNN_ia64_link_hash_table *ia64_info;
+  asection *got_sec;
+  bfd_boolean done;
+  bfd_vma got_offset;
+
+  ia64_info = elfNN_ia64_hash_table (info);
+  if (ia64_info == NULL)
+    return 0;
+
+  got_sec = ia64_info->root.sgot;
+
+  switch (dyn_r_type)
+    {
+    case R_IA64_TPREL64LSB:
+      done = dyn_i->tprel_done;
+      dyn_i->tprel_done = TRUE;
+      got_offset = dyn_i->tprel_offset;
+      break;
+    case R_IA64_DTPMOD64LSB:
+      if (dyn_i->dtpmod_offset != ia64_info->self_dtpmod_offset)
+	{
+	  done = dyn_i->dtpmod_done;
+	  dyn_i->dtpmod_done = TRUE;
+	}
+      else
+	{
+	  done = ia64_info->self_dtpmod_done;
+	  ia64_info->self_dtpmod_done = TRUE;
+	  dynindx = 0;
+	}
+      got_offset = dyn_i->dtpmod_offset;
+      break;
+    case R_IA64_DTPREL32LSB:
+    case R_IA64_DTPREL64LSB:
+      done = dyn_i->dtprel_done;
+      dyn_i->dtprel_done = TRUE;
+      got_offset = dyn_i->dtprel_offset;
+      break;
+    default:
+      done = dyn_i->got_done;
+      dyn_i->got_done = TRUE;
+      got_offset = dyn_i->got_offset;
+      break;
+    }
+
+  BFD_ASSERT ((got_offset & 7) == 0);
+
+  if (! done)
+    {
+      /* Store the target address in the linkage table entry.  */
+      bfd_put_64 (abfd, value, got_sec->contents + got_offset);
+
+      /* Install a dynamic relocation if needed.  */
+      if (((info->shared
+	    && (!dyn_i->h
+		|| ELF_ST_VISIBILITY (dyn_i->h->other) == STV_DEFAULT
+		|| dyn_i->h->root.type != bfd_link_hash_undefweak)
+	    && dyn_r_type != R_IA64_DTPREL32LSB
+	    && dyn_r_type != R_IA64_DTPREL64LSB)
+           || elfNN_ia64_dynamic_symbol_p (dyn_i->h, info, dyn_r_type)
+	   || (dynindx != -1
+	       && (dyn_r_type == R_IA64_FPTR32LSB
+		   || dyn_r_type == R_IA64_FPTR64LSB)))
+	  && (!dyn_i->want_ltoff_fptr
+	      || !info->pie
+	      || !dyn_i->h
+	      || dyn_i->h->root.type != bfd_link_hash_undefweak))
+	{
+	  if (dynindx == -1
+	      && dyn_r_type != R_IA64_TPREL64LSB
+	      && dyn_r_type != R_IA64_DTPMOD64LSB
+	      && dyn_r_type != R_IA64_DTPREL32LSB
+	      && dyn_r_type != R_IA64_DTPREL64LSB)
+	    {
+	      dyn_r_type = R_IA64_RELNNLSB;
+	      dynindx = 0;
+	      addend = value;
+	    }
+
+	  if (bfd_big_endian (abfd))
+	    {
+	      switch (dyn_r_type)
+		{
+		case R_IA64_REL32LSB:
+		  dyn_r_type = R_IA64_REL32MSB;
+		  break;
+		case R_IA64_DIR32LSB:
+		  dyn_r_type = R_IA64_DIR32MSB;
+		  break;
+		case R_IA64_FPTR32LSB:
+		  dyn_r_type = R_IA64_FPTR32MSB;
+		  break;
+		case R_IA64_DTPREL32LSB:
+		  dyn_r_type = R_IA64_DTPREL32MSB;
+		  break;
+		case R_IA64_REL64LSB:
+		  dyn_r_type = R_IA64_REL64MSB;
+		  break;
+		case R_IA64_DIR64LSB:
+		  dyn_r_type = R_IA64_DIR64MSB;
+		  break;
+		case R_IA64_FPTR64LSB:
+		  dyn_r_type = R_IA64_FPTR64MSB;
+		  break;
+		case R_IA64_TPREL64LSB:
+		  dyn_r_type = R_IA64_TPREL64MSB;
+		  break;
+		case R_IA64_DTPMOD64LSB:
+		  dyn_r_type = R_IA64_DTPMOD64MSB;
+		  break;
+		case R_IA64_DTPREL64LSB:
+		  dyn_r_type = R_IA64_DTPREL64MSB;
+		  break;
+		default:
+		  BFD_ASSERT (FALSE);
+		  break;
+		}
+	    }
+
+	  elfNN_ia64_install_dyn_reloc (abfd, NULL, got_sec,
+					ia64_info->root.srelgot,
+					got_offset, dyn_r_type,
+					dynindx, addend);
+	}
+    }
+
+  /* Return the address of the linkage table entry.  */
+  value = (got_sec->output_section->vma
+	   + got_sec->output_offset
+	   + got_offset);
+
+  return value;
+}
+
+/* Fill in a function descriptor consisting of the function's code
+   address and its global pointer.  Return the descriptor's address.  */
+
+static bfd_vma
+set_fptr_entry (bfd *abfd, struct bfd_link_info *info,
+		struct elfNN_ia64_dyn_sym_info *dyn_i,
+		bfd_vma value)
+{
+  struct elfNN_ia64_link_hash_table *ia64_info;
+  asection *fptr_sec;
+
+  ia64_info = elfNN_ia64_hash_table (info);
+  if (ia64_info == NULL)
+    return 0;
+
+  fptr_sec = ia64_info->fptr_sec;
+
+  if (!dyn_i->fptr_done)
+    {
+      dyn_i->fptr_done = 1;
+
+      /* Fill in the function descriptor.  */
+      bfd_put_64 (abfd, value, fptr_sec->contents + dyn_i->fptr_offset);
+      bfd_put_64 (abfd, _bfd_get_gp_value (abfd),
+		  fptr_sec->contents + dyn_i->fptr_offset + 8);
+      if (ia64_info->rel_fptr_sec)
+	{
+	  Elf_Internal_Rela outrel;
+	  bfd_byte *loc;
+
+	  if (bfd_little_endian (abfd))
+	    outrel.r_info = ELFNN_R_INFO (0, R_IA64_IPLTLSB);
+	  else
+	    outrel.r_info = ELFNN_R_INFO (0, R_IA64_IPLTMSB);
+	  outrel.r_addend = value;
+	  outrel.r_offset = (fptr_sec->output_section->vma
+			     + fptr_sec->output_offset
+			     + dyn_i->fptr_offset);
+	  loc = ia64_info->rel_fptr_sec->contents;
+	  loc += ia64_info->rel_fptr_sec->reloc_count++
+		 * sizeof (ElfNN_External_Rela);
+	  bfd_elfNN_swap_reloca_out (abfd, &outrel, loc);
+	}
+    }
+
+  /* Return the descriptor's address.  */
+  value = (fptr_sec->output_section->vma
+	   + fptr_sec->output_offset
+	   + dyn_i->fptr_offset);
+
+  return value;
+}
+
+/* Fill in a PLTOFF entry consisting of the function's code address
+   and its global pointer.  Return the descriptor's address.  */
+
+static bfd_vma
+set_pltoff_entry (bfd *abfd, struct bfd_link_info *info,
+		  struct elfNN_ia64_dyn_sym_info *dyn_i,
+		  bfd_vma value, bfd_boolean is_plt)
+{
+  struct elfNN_ia64_link_hash_table *ia64_info;
+  asection *pltoff_sec;
+
+  ia64_info = elfNN_ia64_hash_table (info);
+  if (ia64_info == NULL)
+    return 0;
+
+  pltoff_sec = ia64_info->pltoff_sec;
+
+  /* Don't do anything if this symbol uses a real PLT entry.  In
+     that case, we'll fill this in during finish_dynamic_symbol.  */
+  if ((! dyn_i->want_plt || is_plt)
+      && !dyn_i->pltoff_done)
+    {
+      bfd_vma gp = _bfd_get_gp_value (abfd);
+
+      /* Fill in the function descriptor.  */
+      bfd_put_64 (abfd, value, pltoff_sec->contents + dyn_i->pltoff_offset);
+      bfd_put_64 (abfd, gp, pltoff_sec->contents + dyn_i->pltoff_offset + 8);
+
+      /* Install dynamic relocations if needed.  */
+      if (!is_plt
+	  && info->shared
+	  && (!dyn_i->h
+	      || ELF_ST_VISIBILITY (dyn_i->h->other) == STV_DEFAULT
+	      || dyn_i->h->root.type != bfd_link_hash_undefweak))
+	{
+	  unsigned int dyn_r_type;
+
+	  if (bfd_big_endian (abfd))
+	    dyn_r_type = R_IA64_RELNNMSB;
+	  else
+	    dyn_r_type = R_IA64_RELNNLSB;
+
+	  elfNN_ia64_install_dyn_reloc (abfd, NULL, pltoff_sec,
+					ia64_info->rel_pltoff_sec,
+					dyn_i->pltoff_offset,
+					dyn_r_type, 0, value);
+	  elfNN_ia64_install_dyn_reloc (abfd, NULL, pltoff_sec,
+					ia64_info->rel_pltoff_sec,
+					dyn_i->pltoff_offset + ARCH_SIZE / 8,
+					dyn_r_type, 0, gp);
+	}
+
+      dyn_i->pltoff_done = 1;
+    }
+
+  /* Return the descriptor's address.  */
+  value = (pltoff_sec->output_section->vma
+	   + pltoff_sec->output_offset
+	   + dyn_i->pltoff_offset);
+
+  return value;
+}
+
+/* Return the base VMA address which should be subtracted from real addresses
+   when resolving @tprel() relocation.
+   Main program TLS (whose template starts at PT_TLS p_vaddr)
+   is assigned offset round(2 * size of pointer, PT_TLS p_align).  */
+
+static bfd_vma
+elfNN_ia64_tprel_base (struct bfd_link_info *info)
+{
+  asection *tls_sec = elf_hash_table (info)->tls_sec;
+  return tls_sec->vma - align_power ((bfd_vma) ARCH_SIZE / 4,
+				     tls_sec->alignment_power);
+}
+
+/* Return the base VMA address which should be subtracted from real addresses
+   when resolving @dtprel() relocation.
+   This is PT_TLS segment p_vaddr.  */
+
+static bfd_vma
+elfNN_ia64_dtprel_base (struct bfd_link_info *info)
+{
+  return elf_hash_table (info)->tls_sec->vma;
+}
+
+/* Called through qsort to sort the .IA_64.unwind section during a
+   non-relocatable link.  Set elfNN_ia64_unwind_entry_compare_bfd
+   to the output bfd so we can do proper endianness frobbing.  */
+
+static bfd *elfNN_ia64_unwind_entry_compare_bfd;
+
+static int
+elfNN_ia64_unwind_entry_compare (const PTR a, const PTR b)
+{
+  bfd_vma av, bv;
+
+  av = bfd_get_64 (elfNN_ia64_unwind_entry_compare_bfd, a);
+  bv = bfd_get_64 (elfNN_ia64_unwind_entry_compare_bfd, b);
+
+  return (av < bv ? -1 : av > bv ? 1 : 0);
+}
+
+/* Make sure we've got ourselves a nice fat __gp value.  */
+static bfd_boolean
+elfNN_ia64_choose_gp (bfd *abfd, struct bfd_link_info *info, bfd_boolean final)
+{
+  bfd_vma min_vma = (bfd_vma) -1, max_vma = 0;
+  bfd_vma min_short_vma = min_vma, max_short_vma = 0;
+  struct elf_link_hash_entry *gp;
+  bfd_vma gp_val;
+  asection *os;
+  struct elfNN_ia64_link_hash_table *ia64_info;
+
+  ia64_info = elfNN_ia64_hash_table (info);
+  if (ia64_info == NULL)
+    return FALSE;
+
+  /* Find the min and max vma of all sections marked short.  Also collect
+     min and max vma of any type, for use in selecting a nice gp.  */
+  for (os = abfd->sections; os ; os = os->next)
+    {
+      bfd_vma lo, hi;
+
+      if ((os->flags & SEC_ALLOC) == 0)
+	continue;
+
+      lo = os->vma;
+      /* When this function is called from elfNN_ia64_final_link
+	 the correct value to use is os->size.  When called from
+	 elfNN_ia64_relax_section we are in the middle of section
+	 sizing; some sections will already have os->size set, others
+	 will have os->size zero and os->rawsize the previous size.  */
+      hi = os->vma + (!final && os->rawsize ? os->rawsize : os->size);
+      if (hi < lo)
+	hi = (bfd_vma) -1;
+
+      if (min_vma > lo)
+	min_vma = lo;
+      if (max_vma < hi)
+	max_vma = hi;
+      if (os->flags & SEC_SMALL_DATA)
+	{
+	  if (min_short_vma > lo)
+	    min_short_vma = lo;
+	  if (max_short_vma < hi)
+	    max_short_vma = hi;
+	}
+    }
+
+  if (ia64_info->min_short_sec)
+    {
+      if (min_short_vma
+	  > (ia64_info->min_short_sec->vma
+	     + ia64_info->min_short_offset))
+	min_short_vma = (ia64_info->min_short_sec->vma
+			 + ia64_info->min_short_offset);
+      if (max_short_vma
+	  < (ia64_info->max_short_sec->vma
+	     + ia64_info->max_short_offset))
+	max_short_vma = (ia64_info->max_short_sec->vma
+			 + ia64_info->max_short_offset);
+    }
+
+  /* See if the user wants to force a value.  */
+  gp = elf_link_hash_lookup (elf_hash_table (info), "__gp", FALSE,
+			     FALSE, FALSE);
+
+  if (gp
+      && (gp->root.type == bfd_link_hash_defined
+	  || gp->root.type == bfd_link_hash_defweak))
+    {
+      asection *gp_sec = gp->root.u.def.section;
+      gp_val = (gp->root.u.def.value
+		+ gp_sec->output_section->vma
+		+ gp_sec->output_offset);
+    }
+  else
+    {
+      /* Pick a sensible value.  */
+
+      if (ia64_info->min_short_sec)
+	{
+	  bfd_vma short_range = max_short_vma - min_short_vma;
+
+	  /* If min_short_sec is set, pick one in the middle bewteen
+	     min_short_vma and max_short_vma.  */
+	  if (short_range >= 0x400000)
+	    goto overflow;
+	  gp_val = min_short_vma + short_range / 2;
+	}
+      else
+	{
+	  asection *got_sec = ia64_info->root.sgot;
+
+	  /* Start with just the address of the .got.  */
+	  if (got_sec)
+	    gp_val = got_sec->output_section->vma;
+	  else if (max_short_vma != 0)
+	    gp_val = min_short_vma;
+	  else if (max_vma - min_vma < 0x200000)
+	    gp_val = min_vma;
+	  else
+	    gp_val = max_vma - 0x200000 + 8;
+	}
+
+      /* If it is possible to address the entire image, but we
+	 don't with the choice above, adjust.  */
+      if (max_vma - min_vma < 0x400000
+	  && (max_vma - gp_val >= 0x200000
+	      || gp_val - min_vma > 0x200000))
+	gp_val = min_vma + 0x200000;
+      else if (max_short_vma != 0)
+	{
+	  /* If we don't cover all the short data, adjust.  */
+	  if (max_short_vma - gp_val >= 0x200000)
+	    gp_val = min_short_vma + 0x200000;
+
+	  /* If we're addressing stuff past the end, adjust back.  */
+	  if (gp_val > max_vma)
+	    gp_val = max_vma - 0x200000 + 8;
+	}
+    }
+
+  /* Validate whether all SHF_IA_64_SHORT sections are within
+     range of the chosen GP.  */
+
+  if (max_short_vma != 0)
+    {
+      if (max_short_vma - min_short_vma >= 0x400000)
+	{
+overflow:
+	  (*_bfd_error_handler)
+	    (_("%s: short data segment overflowed (0x%lx >= 0x400000)"),
+	     bfd_get_filename (abfd),
+	     (unsigned long) (max_short_vma - min_short_vma));
+	  return FALSE;
+	}
+      else if ((gp_val > min_short_vma
+		&& gp_val - min_short_vma > 0x200000)
+	       || (gp_val < max_short_vma
+		   && max_short_vma - gp_val >= 0x200000))
+	{
+	  (*_bfd_error_handler)
+	    (_("%s: __gp does not cover short data segment"),
+	     bfd_get_filename (abfd));
+	  return FALSE;
+	}
+    }
+
+  _bfd_set_gp_value (abfd, gp_val);
+
+  return TRUE;
+}
+
+static bfd_boolean
+elfNN_ia64_final_link (bfd *abfd, struct bfd_link_info *info)
+{
+  struct elfNN_ia64_link_hash_table *ia64_info;
+  asection *unwind_output_sec;
+
+  ia64_info = elfNN_ia64_hash_table (info);
+  if (ia64_info == NULL)
+    return FALSE;
+
+  /* Make sure we've got ourselves a nice fat __gp value.  */
+  if (!info->relocatable)
+    {
+      bfd_vma gp_val;
+      struct elf_link_hash_entry *gp;
+
+      /* We assume after gp is set, section size will only decrease. We
+	 need to adjust gp for it.  */
+      _bfd_set_gp_value (abfd, 0);
+      if (! elfNN_ia64_choose_gp (abfd, info, TRUE))
+	return FALSE;
+      gp_val = _bfd_get_gp_value (abfd);
+
+      gp = elf_link_hash_lookup (elf_hash_table (info), "__gp", FALSE,
+			         FALSE, FALSE);
+      if (gp)
+	{
+	  gp->root.type = bfd_link_hash_defined;
+	  gp->root.u.def.value = gp_val;
+	  gp->root.u.def.section = bfd_abs_section_ptr;
+	}
+    }
+
+  /* If we're producing a final executable, we need to sort the contents
+     of the .IA_64.unwind section.  Force this section to be relocated
+     into memory rather than written immediately to the output file.  */
+  unwind_output_sec = NULL;
+  if (!info->relocatable)
+    {
+      asection *s = bfd_get_section_by_name (abfd, ELF_STRING_ia64_unwind);
+      if (s)
+	{
+	  unwind_output_sec = s->output_section;
+	  unwind_output_sec->contents
+	    = bfd_malloc (unwind_output_sec->size);
+	  if (unwind_output_sec->contents == NULL)
+	    return FALSE;
+	}
+    }
+
+  /* Invoke the regular ELF backend linker to do all the work.  */
+  if (!bfd_elf_final_link (abfd, info))
+    return FALSE;
+
+  if (unwind_output_sec)
+    {
+      elfNN_ia64_unwind_entry_compare_bfd = abfd;
+      qsort (unwind_output_sec->contents,
+	     (size_t) (unwind_output_sec->size / 24),
+	     24,
+	     elfNN_ia64_unwind_entry_compare);
+
+      if (! bfd_set_section_contents (abfd, unwind_output_sec,
+				      unwind_output_sec->contents, (bfd_vma) 0,
+				      unwind_output_sec->size))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+elfNN_ia64_relocate_section (bfd *output_bfd,
+			     struct bfd_link_info *info,
+			     bfd *input_bfd,
+			     asection *input_section,
+			     bfd_byte *contents,
+			     Elf_Internal_Rela *relocs,
+			     Elf_Internal_Sym *local_syms,
+			     asection **local_sections)
+{
+  struct elfNN_ia64_link_hash_table *ia64_info;
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  asection *srel;
+  bfd_boolean ret_val = TRUE;	/* for non-fatal errors */
+  bfd_vma gp_val;
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  ia64_info = elfNN_ia64_hash_table (info);
+  if (ia64_info == NULL)
+    return FALSE;
+
+  /* Infect various flags from the input section to the output section.  */
+  if (info->relocatable)
+    {
+      bfd_vma flags;
+
+      flags = elf_section_data(input_section)->this_hdr.sh_flags;
+      flags &= SHF_IA_64_NORECOV;
+
+      elf_section_data(input_section->output_section)
+	->this_hdr.sh_flags |= flags;
+    }
+
+  gp_val = _bfd_get_gp_value (output_bfd);
+  srel = get_reloc_section (input_bfd, ia64_info, input_section, FALSE);
+
+  rel = relocs;
+  relend = relocs + input_section->reloc_count;
+  for (; rel < relend; ++rel)
+    {
+      struct elf_link_hash_entry *h;
+      struct elfNN_ia64_dyn_sym_info *dyn_i;
+      bfd_reloc_status_type r;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      unsigned int r_type;
+      bfd_vma value;
+      asection *sym_sec;
+      bfd_byte *hit_addr;
+      bfd_boolean dynamic_symbol_p;
+      bfd_boolean undef_weak_ref;
+
+      r_type = ELFNN_R_TYPE (rel->r_info);
+      if (r_type > R_IA64_MAX_RELOC_CODE)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B: unknown relocation type %d"),
+	     input_bfd, (int) r_type);
+	  bfd_set_error (bfd_error_bad_value);
+	  ret_val = FALSE;
+	  continue;
+	}
+
+      howto = ia64_elf_lookup_howto (r_type);
+      r_symndx = ELFNN_R_SYM (rel->r_info);
+      h = NULL;
+      sym = NULL;
+      sym_sec = NULL;
+      undef_weak_ref = FALSE;
+
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  /* Reloc against local symbol.  */
+	  asection *msec;
+	  sym = local_syms + r_symndx;
+	  sym_sec = local_sections[r_symndx];
+	  msec = sym_sec;
+	  value = _bfd_elf_rela_local_sym (output_bfd, sym, &msec, rel);
+	  if (!info->relocatable
+	      && (sym_sec->flags & SEC_MERGE) != 0
+	      && ELF_ST_TYPE (sym->st_info) == STT_SECTION
+	      && sym_sec->sec_info_type == ELF_INFO_TYPE_MERGE)
+	    {
+	      struct elfNN_ia64_local_hash_entry *loc_h;
+
+	      loc_h = get_local_sym_hash (ia64_info, input_bfd, rel, FALSE);
+	      if (loc_h && ! loc_h->sec_merge_done)
+		{
+		  struct elfNN_ia64_dyn_sym_info *dynent;
+		  unsigned int count;
+
+		  for (count = loc_h->count, dynent = loc_h->info;
+		       count != 0;
+		       count--, dynent++)
+		    {
+		      msec = sym_sec;
+		      dynent->addend =
+			_bfd_merged_section_offset (output_bfd, &msec,
+						    elf_section_data (msec)->
+						    sec_info,
+						    sym->st_value
+						    + dynent->addend);
+		      dynent->addend -= sym->st_value;
+		      dynent->addend += msec->output_section->vma
+					+ msec->output_offset
+					- sym_sec->output_section->vma
+					- sym_sec->output_offset;
+		    }
+
+		  /* We may have introduced duplicated entries. We need
+		     to remove them properly.  */
+		  count = sort_dyn_sym_info (loc_h->info, loc_h->count);
+		  if (count != loc_h->count)
+		    {
+		      loc_h->count = count;
+		      loc_h->sorted_count = count;
+		    }
+
+		  loc_h->sec_merge_done = 1;
+		}
+	    }
+	}
+      else
+	{
+	  bfd_boolean unresolved_reloc;
+	  bfd_boolean warned;
+	  struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd);
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sym_sec, value,
+				   unresolved_reloc, warned);
+
+	  if (h->root.type == bfd_link_hash_undefweak)
+	    undef_weak_ref = TRUE;
+	  else if (warned)
+	    continue;
+	}
+
+      if (sym_sec != NULL && elf_discarded_section (sym_sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      hit_addr = contents + rel->r_offset;
+      value += rel->r_addend;
+      dynamic_symbol_p = elfNN_ia64_dynamic_symbol_p (h, info, r_type);
+
+      switch (r_type)
+	{
+	case R_IA64_NONE:
+	case R_IA64_LDXMOV:
+	  continue;
+
+	case R_IA64_IMM14:
+	case R_IA64_IMM22:
+	case R_IA64_IMM64:
+	case R_IA64_DIR32MSB:
+	case R_IA64_DIR32LSB:
+	case R_IA64_DIR64MSB:
+	case R_IA64_DIR64LSB:
+	  /* Install a dynamic relocation for this reloc.  */
+	  if ((dynamic_symbol_p || info->shared)
+	      && r_symndx != STN_UNDEF
+	      && (input_section->flags & SEC_ALLOC) != 0)
+	    {
+	      unsigned int dyn_r_type;
+	      long dynindx;
+	      bfd_vma addend;
+
+	      BFD_ASSERT (srel != NULL);
+
+	      switch (r_type)
+		{
+		case R_IA64_IMM14:
+		case R_IA64_IMM22:
+		case R_IA64_IMM64:
+		  /* ??? People shouldn't be doing non-pic code in
+		     shared libraries nor dynamic executables.  */
+		  (*_bfd_error_handler)
+		    (_("%B: non-pic code with imm relocation against dynamic symbol `%s'"),
+		     input_bfd,
+		     h ? h->root.root.string
+		       : bfd_elf_sym_name (input_bfd, symtab_hdr, sym,
+					   sym_sec));
+		  ret_val = FALSE;
+		  continue;
+
+		default:
+		  break;
+		}
+
+	      /* If we don't need dynamic symbol lookup, find a
+		 matching RELATIVE relocation.  */
+	      dyn_r_type = r_type;
+	      if (dynamic_symbol_p)
+		{
+		  dynindx = h->dynindx;
+		  addend = rel->r_addend;
+		  value = 0;
+		}
+	      else
+		{
+		  switch (r_type)
+		    {
+		    case R_IA64_DIR32MSB:
+		      dyn_r_type = R_IA64_REL32MSB;
+		      break;
+		    case R_IA64_DIR32LSB:
+		      dyn_r_type = R_IA64_REL32LSB;
+		      break;
+		    case R_IA64_DIR64MSB:
+		      dyn_r_type = R_IA64_REL64MSB;
+		      break;
+		    case R_IA64_DIR64LSB:
+		      dyn_r_type = R_IA64_REL64LSB;
+		      break;
+
+		    default:
+		      break;
+		    }
+		  dynindx = 0;
+		  addend = value;
+		}
+
+	      elfNN_ia64_install_dyn_reloc (output_bfd, info, input_section,
+					    srel, rel->r_offset, dyn_r_type,
+					    dynindx, addend);
+	    }
+	  /* Fall through.  */
+
+	case R_IA64_LTV32MSB:
+	case R_IA64_LTV32LSB:
+	case R_IA64_LTV64MSB:
+	case R_IA64_LTV64LSB:
+	  r = ia64_elf_install_value (hit_addr, value, r_type);
+	  break;
+
+	case R_IA64_GPREL22:
+	case R_IA64_GPREL64I:
+	case R_IA64_GPREL32MSB:
+	case R_IA64_GPREL32LSB:
+	case R_IA64_GPREL64MSB:
+	case R_IA64_GPREL64LSB:
+	  if (dynamic_symbol_p)
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: @gprel relocation against dynamic symbol %s"),
+		 input_bfd,
+		 h ? h->root.root.string
+		   : bfd_elf_sym_name (input_bfd, symtab_hdr, sym,
+				       sym_sec));
+	      ret_val = FALSE;
+	      continue;
+	    }
+	  value -= gp_val;
+	  r = ia64_elf_install_value (hit_addr, value, r_type);
+	  break;
+
+	case R_IA64_LTOFF22:
+	case R_IA64_LTOFF22X:
+	case R_IA64_LTOFF64I:
+          dyn_i = get_dyn_sym_info (ia64_info, h, input_bfd, rel, FALSE);
+	  value = set_got_entry (input_bfd, info, dyn_i, (h ? h->dynindx : -1),
+				 rel->r_addend, value, R_IA64_DIRNNLSB);
+	  value -= gp_val;
+	  r = ia64_elf_install_value (hit_addr, value, r_type);
+	  break;
+
+	case R_IA64_PLTOFF22:
+	case R_IA64_PLTOFF64I:
+	case R_IA64_PLTOFF64MSB:
+	case R_IA64_PLTOFF64LSB:
+          dyn_i = get_dyn_sym_info (ia64_info, h, input_bfd, rel, FALSE);
+	  value = set_pltoff_entry (output_bfd, info, dyn_i, value, FALSE);
+	  value -= gp_val;
+	  r = ia64_elf_install_value (hit_addr, value, r_type);
+	  break;
+
+	case R_IA64_FPTR64I:
+	case R_IA64_FPTR32MSB:
+	case R_IA64_FPTR32LSB:
+	case R_IA64_FPTR64MSB:
+	case R_IA64_FPTR64LSB:
+          dyn_i = get_dyn_sym_info (ia64_info, h, input_bfd, rel, FALSE);
+	  if (dyn_i->want_fptr)
+	    {
+	      if (!undef_weak_ref)
+		value = set_fptr_entry (output_bfd, info, dyn_i, value);
+	    }
+	  if (!dyn_i->want_fptr || info->pie)
+	    {
+	      long dynindx;
+	      unsigned int dyn_r_type = r_type;
+	      bfd_vma addend = rel->r_addend;
+
+	      /* Otherwise, we expect the dynamic linker to create
+		 the entry.  */
+
+	      if (dyn_i->want_fptr)
+		{
+		  if (r_type == R_IA64_FPTR64I)
+		    {
+		      /* We can't represent this without a dynamic symbol.
+			 Adjust the relocation to be against an output
+			 section symbol, which are always present in the
+			 dynamic symbol table.  */
+		      /* ??? People shouldn't be doing non-pic code in
+			 shared libraries.  Hork.  */
+		      (*_bfd_error_handler)
+			(_("%B: linking non-pic code in a position independent executable"),
+			 input_bfd);
+		      ret_val = FALSE;
+		      continue;
+		    }
+		  dynindx = 0;
+		  addend = value;
+		  dyn_r_type = r_type + R_IA64_RELNNLSB - R_IA64_FPTRNNLSB;
+		}
+	      else if (h)
+		{
+		  if (h->dynindx != -1)
+		    dynindx = h->dynindx;
+		  else
+		    dynindx = (_bfd_elf_link_lookup_local_dynindx
+			       (info, h->root.u.def.section->owner,
+				global_sym_index (h)));
+		  value = 0;
+		}
+	      else
+		{
+		  dynindx = (_bfd_elf_link_lookup_local_dynindx
+			     (info, input_bfd, (long) r_symndx));
+		  value = 0;
+		}
+
+	      elfNN_ia64_install_dyn_reloc (output_bfd, info, input_section,
+					    srel, rel->r_offset, dyn_r_type,
+					    dynindx, addend);
+	    }
+
+	  r = ia64_elf_install_value (hit_addr, value, r_type);
+	  break;
+
+	case R_IA64_LTOFF_FPTR22:
+	case R_IA64_LTOFF_FPTR64I:
+	case R_IA64_LTOFF_FPTR32MSB:
+	case R_IA64_LTOFF_FPTR32LSB:
+	case R_IA64_LTOFF_FPTR64MSB:
+	case R_IA64_LTOFF_FPTR64LSB:
+	  {
+	    long dynindx;
+
+	    dyn_i = get_dyn_sym_info (ia64_info, h, input_bfd, rel, FALSE);
+	    if (dyn_i->want_fptr)
+	      {
+		BFD_ASSERT (h == NULL || h->dynindx == -1);
+	        if (!undef_weak_ref)
+	          value = set_fptr_entry (output_bfd, info, dyn_i, value);
+		dynindx = -1;
+	      }
+	    else
+	      {
+	        /* Otherwise, we expect the dynamic linker to create
+		   the entry.  */
+	        if (h)
+		  {
+		    if (h->dynindx != -1)
+		      dynindx = h->dynindx;
+		    else
+		      dynindx = (_bfd_elf_link_lookup_local_dynindx
+				 (info, h->root.u.def.section->owner,
+				  global_sym_index (h)));
+		  }
+		else
+		  dynindx = (_bfd_elf_link_lookup_local_dynindx
+			     (info, input_bfd, (long) r_symndx));
+		value = 0;
+	      }
+
+	    value = set_got_entry (output_bfd, info, dyn_i, dynindx,
+				   rel->r_addend, value, R_IA64_FPTRNNLSB);
+	    value -= gp_val;
+	    r = ia64_elf_install_value (hit_addr, value, r_type);
+	  }
+	  break;
+
+	case R_IA64_PCREL32MSB:
+	case R_IA64_PCREL32LSB:
+	case R_IA64_PCREL64MSB:
+	case R_IA64_PCREL64LSB:
+	  /* Install a dynamic relocation for this reloc.  */
+	  if (dynamic_symbol_p && r_symndx != STN_UNDEF)
+	    {
+	      BFD_ASSERT (srel != NULL);
+
+	      elfNN_ia64_install_dyn_reloc (output_bfd, info, input_section,
+					    srel, rel->r_offset, r_type,
+					    h->dynindx, rel->r_addend);
+	    }
+	  goto finish_pcrel;
+
+	case R_IA64_PCREL21B:
+	case R_IA64_PCREL60B:
+	  /* We should have created a PLT entry for any dynamic symbol.  */
+	  dyn_i = NULL;
+	  if (h)
+	    dyn_i = get_dyn_sym_info (ia64_info, h, NULL, NULL, FALSE);
+
+	  if (dyn_i && dyn_i->want_plt2)
+	    {
+	      /* Should have caught this earlier.  */
+	      BFD_ASSERT (rel->r_addend == 0);
+
+	      value = (ia64_info->root.splt->output_section->vma
+		       + ia64_info->root.splt->output_offset
+		       + dyn_i->plt2_offset);
+	    }
+	  else
+	    {
+	      /* Since there's no PLT entry, Validate that this is
+		 locally defined.  */
+	      BFD_ASSERT (undef_weak_ref || sym_sec->output_section != NULL);
+
+	      /* If the symbol is undef_weak, we shouldn't be trying
+		 to call it.  There's every chance that we'd wind up
+		 with an out-of-range fixup here.  Don't bother setting
+		 any value at all.  */
+	      if (undef_weak_ref)
+		continue;
+	    }
+	  goto finish_pcrel;
+
+	case R_IA64_PCREL21BI:
+	case R_IA64_PCREL21F:
+	case R_IA64_PCREL21M:
+	case R_IA64_PCREL22:
+	case R_IA64_PCREL64I:
+	  /* The PCREL21BI reloc is specifically not intended for use with
+	     dynamic relocs.  PCREL21F and PCREL21M are used for speculation
+	     fixup code, and thus probably ought not be dynamic.  The
+	     PCREL22 and PCREL64I relocs aren't emitted as dynamic relocs.  */
+	  if (dynamic_symbol_p)
+	    {
+	      const char *msg;
+
+	      if (r_type == R_IA64_PCREL21BI)
+		msg = _("%B: @internal branch to dynamic symbol %s");
+	      else if (r_type == R_IA64_PCREL21F || r_type == R_IA64_PCREL21M)
+		msg = _("%B: speculation fixup to dynamic symbol %s");
+	      else
+		msg = _("%B: @pcrel relocation against dynamic symbol %s");
+	      (*_bfd_error_handler) (msg, input_bfd,
+				     h ? h->root.root.string
+				       : bfd_elf_sym_name (input_bfd,
+							   symtab_hdr,
+							   sym,
+							   sym_sec));
+	      ret_val = FALSE;
+	      continue;
+	    }
+	  goto finish_pcrel;
+
+	finish_pcrel:
+	  /* Make pc-relative.  */
+	  value -= (input_section->output_section->vma
+		    + input_section->output_offset
+		    + rel->r_offset) & ~ (bfd_vma) 0x3;
+	  r = ia64_elf_install_value (hit_addr, value, r_type);
+	  break;
+
+	case R_IA64_SEGREL32MSB:
+	case R_IA64_SEGREL32LSB:
+	case R_IA64_SEGREL64MSB:
+	case R_IA64_SEGREL64LSB:
+	    {
+	      /* Find the segment that contains the output_section.  */
+	      Elf_Internal_Phdr *p = _bfd_elf_find_segment_containing_section
+		(output_bfd, input_section->output_section);
+
+	      if (p == NULL)
+		{
+		  r = bfd_reloc_notsupported;
+		}
+	      else
+		{
+		  /* The VMA of the segment is the vaddr of the associated
+		     program header.  */
+		  if (value > p->p_vaddr)
+		    value -= p->p_vaddr;
+		  else
+		    value = 0;
+		  r = ia64_elf_install_value (hit_addr, value, r_type);
+		}
+	      break;
+	    }
+
+	case R_IA64_SECREL32MSB:
+	case R_IA64_SECREL32LSB:
+	case R_IA64_SECREL64MSB:
+	case R_IA64_SECREL64LSB:
+	  /* Make output-section relative to section where the symbol
+	     is defined. PR 475  */
+	  if (sym_sec)
+	    value -= sym_sec->output_section->vma;
+	  r = ia64_elf_install_value (hit_addr, value, r_type);
+	  break;
+
+	case R_IA64_IPLTMSB:
+	case R_IA64_IPLTLSB:
+	  /* Install a dynamic relocation for this reloc.  */
+	  if ((dynamic_symbol_p || info->shared)
+	      && (input_section->flags & SEC_ALLOC) != 0)
+	    {
+	      BFD_ASSERT (srel != NULL);
+
+	      /* If we don't need dynamic symbol lookup, install two
+		 RELATIVE relocations.  */
+	      if (!dynamic_symbol_p)
+		{
+		  unsigned int dyn_r_type;
+
+		  if (r_type == R_IA64_IPLTMSB)
+		    dyn_r_type = R_IA64_REL64MSB;
+		  else
+		    dyn_r_type = R_IA64_REL64LSB;
+
+		  elfNN_ia64_install_dyn_reloc (output_bfd, info,
+						input_section,
+						srel, rel->r_offset,
+						dyn_r_type, 0, value);
+		  elfNN_ia64_install_dyn_reloc (output_bfd, info,
+						input_section,
+						srel, rel->r_offset + 8,
+						dyn_r_type, 0, gp_val);
+		}
+	      else
+		elfNN_ia64_install_dyn_reloc (output_bfd, info, input_section,
+					      srel, rel->r_offset, r_type,
+					      h->dynindx, rel->r_addend);
+	    }
+
+	  if (r_type == R_IA64_IPLTMSB)
+	    r_type = R_IA64_DIR64MSB;
+	  else
+	    r_type = R_IA64_DIR64LSB;
+	  ia64_elf_install_value (hit_addr, value, r_type);
+	  r = ia64_elf_install_value (hit_addr + 8, gp_val, r_type);
+	  break;
+
+	case R_IA64_TPREL14:
+	case R_IA64_TPREL22:
+	case R_IA64_TPREL64I:
+	  if (elf_hash_table (info)->tls_sec == NULL)
+	    goto missing_tls_sec;
+	  value -= elfNN_ia64_tprel_base (info);
+	  r = ia64_elf_install_value (hit_addr, value, r_type);
+	  break;
+
+	case R_IA64_DTPREL14:
+	case R_IA64_DTPREL22:
+	case R_IA64_DTPREL64I:
+	case R_IA64_DTPREL32LSB:
+	case R_IA64_DTPREL32MSB:
+	case R_IA64_DTPREL64LSB:
+	case R_IA64_DTPREL64MSB:
+	  if (elf_hash_table (info)->tls_sec == NULL)
+	    goto missing_tls_sec;
+	  value -= elfNN_ia64_dtprel_base (info);
+	  r = ia64_elf_install_value (hit_addr, value, r_type);
+	  break;
+
+	case R_IA64_LTOFF_TPREL22:
+	case R_IA64_LTOFF_DTPMOD22:
+	case R_IA64_LTOFF_DTPREL22:
+	  {
+	    int got_r_type;
+	    long dynindx = h ? h->dynindx : -1;
+	    bfd_vma r_addend = rel->r_addend;
+
+	    switch (r_type)
+	      {
+	      default:
+	      case R_IA64_LTOFF_TPREL22:
+		if (!dynamic_symbol_p)
+		  {
+		    if (elf_hash_table (info)->tls_sec == NULL)
+		      goto missing_tls_sec;
+		    if (!info->shared)
+		      value -= elfNN_ia64_tprel_base (info);
+		    else
+		      {
+			r_addend += value - elfNN_ia64_dtprel_base (info);
+			dynindx = 0;
+		      }
+		  }
+		got_r_type = R_IA64_TPREL64LSB;
+		break;
+	      case R_IA64_LTOFF_DTPMOD22:
+		if (!dynamic_symbol_p && !info->shared)
+		  value = 1;
+		got_r_type = R_IA64_DTPMOD64LSB;
+		break;
+	      case R_IA64_LTOFF_DTPREL22:
+		if (!dynamic_symbol_p)
+		  {
+		    if (elf_hash_table (info)->tls_sec == NULL)
+		      goto missing_tls_sec;
+		    value -= elfNN_ia64_dtprel_base (info);
+		  }
+		got_r_type = R_IA64_DTPRELNNLSB;
+		break;
+	      }
+	    dyn_i = get_dyn_sym_info (ia64_info, h, input_bfd, rel, FALSE);
+	    value = set_got_entry (input_bfd, info, dyn_i, dynindx, r_addend,
+				   value, got_r_type);
+	    value -= gp_val;
+	    r = ia64_elf_install_value (hit_addr, value, r_type);
+	  }
+	  break;
+
+	default:
+	  r = bfd_reloc_notsupported;
+	  break;
+	}
+
+      switch (r)
+	{
+	case bfd_reloc_ok:
+	  break;
+
+	case bfd_reloc_undefined:
+	  /* This can happen for global table relative relocs if
+	     __gp is undefined.  This is a panic situation so we
+	     don't try to continue.  */
+	  (*info->callbacks->undefined_symbol)
+	    (info, "__gp", input_bfd, input_section, rel->r_offset, 1);
+	  return FALSE;
+
+	case bfd_reloc_notsupported:
+	  {
+	    const char *name;
+
+	    if (h)
+	      name = h->root.root.string;
+	    else
+	      name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym,
+				       sym_sec);
+	    if (!(*info->callbacks->warning) (info, _("unsupported reloc"),
+					      name, input_bfd,
+					      input_section, rel->r_offset))
+	      return FALSE;
+	    ret_val = FALSE;
+	  }
+	  break;
+
+	case bfd_reloc_dangerous:
+	case bfd_reloc_outofrange:
+	case bfd_reloc_overflow:
+	default:
+missing_tls_sec:
+	  {
+	    const char *name;
+
+	    if (h)
+	      name = h->root.root.string;
+	    else
+	      name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym,
+				       sym_sec);
+
+	    switch (r_type)
+	      {
+	      case R_IA64_TPREL14:
+	      case R_IA64_TPREL22:
+	      case R_IA64_TPREL64I:
+	      case R_IA64_DTPREL14:
+	      case R_IA64_DTPREL22:
+	      case R_IA64_DTPREL64I:
+	      case R_IA64_DTPREL32LSB:
+	      case R_IA64_DTPREL32MSB:
+	      case R_IA64_DTPREL64LSB:
+	      case R_IA64_DTPREL64MSB:
+	      case R_IA64_LTOFF_TPREL22:
+	      case R_IA64_LTOFF_DTPMOD22:
+	      case R_IA64_LTOFF_DTPREL22:
+		(*_bfd_error_handler)
+		  (_("%B: missing TLS section for relocation %s against `%s' at 0x%lx in section `%A'."),
+		   input_bfd, input_section, howto->name, name,
+		   rel->r_offset);
+		break;
+
+	      case R_IA64_PCREL21B:
+	      case R_IA64_PCREL21BI:
+	      case R_IA64_PCREL21M:
+	      case R_IA64_PCREL21F:
+		if (is_elf_hash_table (info->hash))
+		  {
+		    /* Relaxtion is always performed for ELF output.
+		       Overflow failures for those relocations mean
+		       that the section is too big to relax.  */
+		    (*_bfd_error_handler)
+		      (_("%B: Can't relax br (%s) to `%s' at 0x%lx in section `%A' with size 0x%lx (> 0x1000000)."),
+		       input_bfd, input_section, howto->name, name,
+		       rel->r_offset, input_section->size);
+		    break;
+		  }
+	      default:
+		if (!(*info->callbacks->reloc_overflow) (info,
+							 &h->root,
+							 name,
+							 howto->name,
+							 (bfd_vma) 0,
+							 input_bfd,
+							 input_section,
+							 rel->r_offset))
+		  return FALSE;
+		break;
+	      }
+
+	    ret_val = FALSE;
+	  }
+	  break;
+	}
+    }
+
+  return ret_val;
+}
+
+static bfd_boolean
+elfNN_ia64_finish_dynamic_symbol (bfd *output_bfd,
+				  struct bfd_link_info *info,
+				  struct elf_link_hash_entry *h,
+				  Elf_Internal_Sym *sym)
+{
+  struct elfNN_ia64_link_hash_table *ia64_info;
+  struct elfNN_ia64_dyn_sym_info *dyn_i;
+
+  ia64_info = elfNN_ia64_hash_table (info);
+  if (ia64_info == NULL)
+    return FALSE;
+
+  dyn_i = get_dyn_sym_info (ia64_info, h, NULL, NULL, FALSE);
+
+  /* Fill in the PLT data, if required.  */
+  if (dyn_i && dyn_i->want_plt)
+    {
+      Elf_Internal_Rela outrel;
+      bfd_byte *loc;
+      asection *plt_sec;
+      bfd_vma plt_addr, pltoff_addr, gp_val, plt_index;
+
+      gp_val = _bfd_get_gp_value (output_bfd);
+
+      /* Initialize the minimal PLT entry.  */
+
+      plt_index = (dyn_i->plt_offset - PLT_HEADER_SIZE) / PLT_MIN_ENTRY_SIZE;
+      plt_sec = ia64_info->root.splt;
+      loc = plt_sec->contents + dyn_i->plt_offset;
+
+      memcpy (loc, plt_min_entry, PLT_MIN_ENTRY_SIZE);
+      ia64_elf_install_value (loc, plt_index, R_IA64_IMM22);
+      ia64_elf_install_value (loc+2, -dyn_i->plt_offset, R_IA64_PCREL21B);
+
+      plt_addr = (plt_sec->output_section->vma
+		  + plt_sec->output_offset
+		  + dyn_i->plt_offset);
+      pltoff_addr = set_pltoff_entry (output_bfd, info, dyn_i, plt_addr, TRUE);
+
+      /* Initialize the FULL PLT entry, if needed.  */
+      if (dyn_i->want_plt2)
+	{
+	  loc = plt_sec->contents + dyn_i->plt2_offset;
+
+	  memcpy (loc, plt_full_entry, PLT_FULL_ENTRY_SIZE);
+	  ia64_elf_install_value (loc, pltoff_addr - gp_val, R_IA64_IMM22);
+
+	  /* Mark the symbol as undefined, rather than as defined in the
+	     plt section.  Leave the value alone.  */
+	  /* ??? We didn't redefine it in adjust_dynamic_symbol in the
+	     first place.  But perhaps elflink.c did some for us.  */
+	  if (!h->def_regular)
+	    sym->st_shndx = SHN_UNDEF;
+	}
+
+      /* Create the dynamic relocation.  */
+      outrel.r_offset = pltoff_addr;
+      if (bfd_little_endian (output_bfd))
+	outrel.r_info = ELFNN_R_INFO (h->dynindx, R_IA64_IPLTLSB);
+      else
+	outrel.r_info = ELFNN_R_INFO (h->dynindx, R_IA64_IPLTMSB);
+      outrel.r_addend = 0;
+
+      /* This is fun.  In the .IA_64.pltoff section, we've got entries
+	 that correspond both to real PLT entries, and those that
+	 happened to resolve to local symbols but need to be created
+	 to satisfy @pltoff relocations.  The .rela.IA_64.pltoff
+	 relocations for the real PLT should come at the end of the
+	 section, so that they can be indexed by plt entry at runtime.
+
+	 We emitted all of the relocations for the non-PLT @pltoff
+	 entries during relocate_section.  So we can consider the
+	 existing sec->reloc_count to be the base of the array of
+	 PLT relocations.  */
+
+      loc = ia64_info->rel_pltoff_sec->contents;
+      loc += ((ia64_info->rel_pltoff_sec->reloc_count + plt_index)
+	      * sizeof (ElfNN_External_Rela));
+      bfd_elfNN_swap_reloca_out (output_bfd, &outrel, loc);
+    }
+
+  /* Mark some specially defined symbols as absolute.  */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+      || h == ia64_info->root.hgot
+      || h == ia64_info->root.hplt)
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+static bfd_boolean
+elfNN_ia64_finish_dynamic_sections (bfd *abfd,
+				    struct bfd_link_info *info)
+{
+  struct elfNN_ia64_link_hash_table *ia64_info;
+  bfd *dynobj;
+
+  ia64_info = elfNN_ia64_hash_table (info);
+  if (ia64_info == NULL)
+    return FALSE;
+
+  dynobj = ia64_info->root.dynobj;
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      ElfNN_External_Dyn *dyncon, *dynconend;
+      asection *sdyn, *sgotplt;
+      bfd_vma gp_val;
+
+      sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+      sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");
+      BFD_ASSERT (sdyn != NULL);
+      dyncon = (ElfNN_External_Dyn *) sdyn->contents;
+      dynconend = (ElfNN_External_Dyn *) (sdyn->contents + sdyn->size);
+
+      gp_val = _bfd_get_gp_value (abfd);
+
+      for (; dyncon < dynconend; dyncon++)
+	{
+	  Elf_Internal_Dyn dyn;
+
+	  bfd_elfNN_swap_dyn_in (dynobj, dyncon, &dyn);
+
+	  switch (dyn.d_tag)
+	    {
+	    case DT_PLTGOT:
+	      dyn.d_un.d_ptr = gp_val;
+	      break;
+
+	    case DT_PLTRELSZ:
+	      dyn.d_un.d_val = (ia64_info->minplt_entries
+				* sizeof (ElfNN_External_Rela));
+	      break;
+
+	    case DT_JMPREL:
+	      /* See the comment above in finish_dynamic_symbol.  */
+	      dyn.d_un.d_ptr = (ia64_info->rel_pltoff_sec->output_section->vma
+				+ ia64_info->rel_pltoff_sec->output_offset
+				+ (ia64_info->rel_pltoff_sec->reloc_count
+				   * sizeof (ElfNN_External_Rela)));
+	      break;
+
+	    case DT_IA_64_PLT_RESERVE:
+	      dyn.d_un.d_ptr = (sgotplt->output_section->vma
+				+ sgotplt->output_offset);
+	      break;
+
+	    case DT_RELASZ:
+	      /* Do not have RELASZ include JMPREL.  This makes things
+		 easier on ld.so.  This is not what the rest of BFD set up.  */
+	      dyn.d_un.d_val -= (ia64_info->minplt_entries
+				 * sizeof (ElfNN_External_Rela));
+	      break;
+	    }
+
+	  bfd_elfNN_swap_dyn_out (abfd, &dyn, dyncon);
+	}
+
+      /* Initialize the PLT0 entry.  */
+      if (ia64_info->root.splt)
+	{
+	  bfd_byte *loc = ia64_info->root.splt->contents;
+	  bfd_vma pltres;
+
+	  memcpy (loc, plt_header, PLT_HEADER_SIZE);
+
+	  pltres = (sgotplt->output_section->vma
+		    + sgotplt->output_offset
+		    - gp_val);
+
+	  ia64_elf_install_value (loc+1, pltres, R_IA64_GPREL22);
+	}
+    }
+
+  return TRUE;
+}
+
+/* ELF file flag handling:  */
+
+/* Function to keep IA-64 specific file flags.  */
+static bfd_boolean
+elfNN_ia64_set_private_flags (bfd *abfd, flagword flags)
+{
+  BFD_ASSERT (!elf_flags_init (abfd)
+	      || elf_elfheader (abfd)->e_flags == flags);
+
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+static bfd_boolean
+elfNN_ia64_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  flagword out_flags;
+  flagword in_flags;
+  bfd_boolean ok = TRUE;
+
+  /* Don't even pretend to support mixed-format linking.  */
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return FALSE;
+
+  in_flags  = elf_elfheader (ibfd)->e_flags;
+  out_flags = elf_elfheader (obfd)->e_flags;
+
+  if (! elf_flags_init (obfd))
+    {
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = in_flags;
+
+      if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
+	  && bfd_get_arch_info (obfd)->the_default)
+	{
+	  return bfd_set_arch_mach (obfd, bfd_get_arch (ibfd),
+				    bfd_get_mach (ibfd));
+	}
+
+      return TRUE;
+    }
+
+  /* Check flag compatibility.  */
+  if (in_flags == out_flags)
+    return TRUE;
+
+  /* Output has EF_IA_64_REDUCEDFP set only if all inputs have it set.  */
+  if (!(in_flags & EF_IA_64_REDUCEDFP) && (out_flags & EF_IA_64_REDUCEDFP))
+    elf_elfheader (obfd)->e_flags &= ~EF_IA_64_REDUCEDFP;
+
+  if ((in_flags & EF_IA_64_TRAPNIL) != (out_flags & EF_IA_64_TRAPNIL))
+    {
+      (*_bfd_error_handler)
+	(_("%B: linking trap-on-NULL-dereference with non-trapping files"),
+	 ibfd);
+
+      bfd_set_error (bfd_error_bad_value);
+      ok = FALSE;
+    }
+  if ((in_flags & EF_IA_64_BE) != (out_flags & EF_IA_64_BE))
+    {
+      (*_bfd_error_handler)
+	(_("%B: linking big-endian files with little-endian files"),
+	 ibfd);
+
+      bfd_set_error (bfd_error_bad_value);
+      ok = FALSE;
+    }
+  if ((in_flags & EF_IA_64_ABI64) != (out_flags & EF_IA_64_ABI64))
+    {
+      (*_bfd_error_handler)
+	(_("%B: linking 64-bit files with 32-bit files"),
+	 ibfd);
+
+      bfd_set_error (bfd_error_bad_value);
+      ok = FALSE;
+    }
+  if ((in_flags & EF_IA_64_CONS_GP) != (out_flags & EF_IA_64_CONS_GP))
+    {
+      (*_bfd_error_handler)
+	(_("%B: linking constant-gp files with non-constant-gp files"),
+	 ibfd);
+
+      bfd_set_error (bfd_error_bad_value);
+      ok = FALSE;
+    }
+  if ((in_flags & EF_IA_64_NOFUNCDESC_CONS_GP)
+      != (out_flags & EF_IA_64_NOFUNCDESC_CONS_GP))
+    {
+      (*_bfd_error_handler)
+	(_("%B: linking auto-pic files with non-auto-pic files"),
+	 ibfd);
+
+      bfd_set_error (bfd_error_bad_value);
+      ok = FALSE;
+    }
+
+  return ok;
+}
+
+static bfd_boolean
+elfNN_ia64_print_private_bfd_data (bfd *abfd, PTR ptr)
+{
+  FILE *file = (FILE *) ptr;
+  flagword flags = elf_elfheader (abfd)->e_flags;
+
+  BFD_ASSERT (abfd != NULL && ptr != NULL);
+
+  fprintf (file, "private flags = %s%s%s%s%s%s%s%s\n",
+	   (flags & EF_IA_64_TRAPNIL) ? "TRAPNIL, " : "",
+	   (flags & EF_IA_64_EXT) ? "EXT, " : "",
+	   (flags & EF_IA_64_BE) ? "BE, " : "LE, ",
+	   (flags & EF_IA_64_REDUCEDFP) ? "REDUCEDFP, " : "",
+	   (flags & EF_IA_64_CONS_GP) ? "CONS_GP, " : "",
+	   (flags & EF_IA_64_NOFUNCDESC_CONS_GP) ? "NOFUNCDESC_CONS_GP, " : "",
+	   (flags & EF_IA_64_ABSOLUTE) ? "ABSOLUTE, " : "",
+	   (flags & EF_IA_64_ABI64) ? "ABI64" : "ABI32");
+
+  _bfd_elf_print_private_bfd_data (abfd, ptr);
+  return TRUE;
+}
+
+static enum elf_reloc_type_class
+elfNN_ia64_reloc_type_class (const Elf_Internal_Rela *rela)
+{
+  switch ((int) ELFNN_R_TYPE (rela->r_info))
+    {
+    case R_IA64_REL32MSB:
+    case R_IA64_REL32LSB:
+    case R_IA64_REL64MSB:
+    case R_IA64_REL64LSB:
+      return reloc_class_relative;
+    case R_IA64_IPLTMSB:
+    case R_IA64_IPLTLSB:
+      return reloc_class_plt;
+    case R_IA64_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+static const struct bfd_elf_special_section elfNN_ia64_special_sections[] =
+{
+  { STRING_COMMA_LEN (".sbss"),  -1, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE + SHF_IA_64_SHORT },
+  { STRING_COMMA_LEN (".sdata"), -1, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_IA_64_SHORT },
+  { NULL,                    0,   0, 0,            0 }
+};
+
+static bfd_boolean
+elfNN_ia64_object_p (bfd *abfd)
+{
+  asection *sec;
+  asection *group, *unwi, *unw;
+  flagword flags;
+  const char *name;
+  char *unwi_name, *unw_name;
+  bfd_size_type amt;
+
+  if (abfd->flags & DYNAMIC)
+    return TRUE;
+
+  /* Flags for fake group section.  */
+  flags = (SEC_LINKER_CREATED | SEC_GROUP | SEC_LINK_ONCE
+	   | SEC_EXCLUDE);
+
+  /* We add a fake section group for each .gnu.linkonce.t.* section,
+     which isn't in a section group, and its unwind sections.  */
+  for (sec = abfd->sections; sec != NULL; sec = sec->next)
+    {
+      if (elf_sec_group (sec) == NULL
+	  && ((sec->flags & (SEC_LINK_ONCE | SEC_CODE | SEC_GROUP))
+	      == (SEC_LINK_ONCE | SEC_CODE))
+	  && CONST_STRNEQ (sec->name, ".gnu.linkonce.t."))
+	{
+	  name = sec->name + 16;
+
+	  amt = strlen (name) + sizeof (".gnu.linkonce.ia64unwi.");
+	  unwi_name = bfd_alloc (abfd, amt);
+	  if (!unwi_name)
+	    return FALSE;
+
+	  strcpy (stpcpy (unwi_name, ".gnu.linkonce.ia64unwi."), name);
+	  unwi = bfd_get_section_by_name (abfd, unwi_name);
+
+	  amt = strlen (name) + sizeof (".gnu.linkonce.ia64unw.");
+	  unw_name = bfd_alloc (abfd, amt);
+	  if (!unw_name)
+	    return FALSE;
+
+	  strcpy (stpcpy (unw_name, ".gnu.linkonce.ia64unw."), name);
+	  unw = bfd_get_section_by_name (abfd, unw_name);
+
+	  /* We need to create a fake group section for it and its
+	     unwind sections.  */
+	  group = bfd_make_section_anyway_with_flags (abfd, name,
+						      flags);
+	  if (group == NULL)
+	    return FALSE;
+
+	  /* Move the fake group section to the beginning.  */
+	  bfd_section_list_remove (abfd, group);
+	  bfd_section_list_prepend (abfd, group);
+
+	  elf_next_in_group (group) = sec;
+
+	  elf_group_name (sec) = name;
+	  elf_next_in_group (sec) = sec;
+	  elf_sec_group (sec) = group;
+
+	  if (unwi)
+	    {
+	      elf_group_name (unwi) = name;
+	      elf_next_in_group (unwi) = sec;
+	      elf_next_in_group (sec) = unwi;
+	      elf_sec_group (unwi) = group;
+	    }
+
+	   if (unw)
+	     {
+	       elf_group_name (unw) = name;
+	       if (unwi)
+		 {
+		   elf_next_in_group (unw) = elf_next_in_group (unwi);
+		   elf_next_in_group (unwi) = unw;
+		 }
+	       else
+		 {
+		   elf_next_in_group (unw) = sec;
+		   elf_next_in_group (sec) = unw;
+		 }
+	       elf_sec_group (unw) = group;
+	     }
+
+	   /* Fake SHT_GROUP section header.  */
+	  elf_section_data (group)->this_hdr.bfd_section = group;
+	  elf_section_data (group)->this_hdr.sh_type = SHT_GROUP;
+	}
+    }
+  return TRUE;
+}
+
+static bfd_boolean
+elfNN_ia64_hpux_vec (const bfd_target *vec)
+{
+  extern const bfd_target bfd_elfNN_ia64_hpux_big_vec;
+  return (vec == & bfd_elfNN_ia64_hpux_big_vec);
+}
+
+static void
+elfNN_hpux_post_process_headers (bfd *abfd,
+				 struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  Elf_Internal_Ehdr *i_ehdrp = elf_elfheader (abfd);
+
+  i_ehdrp->e_ident[EI_OSABI] = get_elf_backend_data (abfd)->elf_osabi;
+  i_ehdrp->e_ident[EI_ABIVERSION] = 1;
+}
+
+static bfd_boolean
+elfNN_hpux_backend_section_from_bfd_section (bfd *abfd ATTRIBUTE_UNUSED,
+					     asection *sec, int *retval)
+{
+  if (bfd_is_com_section (sec))
+    {
+      *retval = SHN_IA_64_ANSI_COMMON;
+      return TRUE;
+    }
+  return FALSE;
+}
+
+static void
+elfNN_hpux_backend_symbol_processing (bfd *abfd ATTRIBUTE_UNUSED,
+				      asymbol *asym)
+{
+  elf_symbol_type *elfsym = (elf_symbol_type *) asym;
+
+  switch (elfsym->internal_elf_sym.st_shndx)
+    {
+    case SHN_IA_64_ANSI_COMMON:
+      asym->section = bfd_com_section_ptr;
+      asym->value = elfsym->internal_elf_sym.st_size;
+      asym->flags &= ~BSF_GLOBAL;
+      break;
+    }
+}
+
+#ifdef INCLUDE_IA64_VMS
+
+static bfd_boolean
+elfNN_vms_section_from_shdr (bfd *abfd,
+			     Elf_Internal_Shdr *hdr,
+			     const char *name,
+			     int shindex)
+{
+  switch (hdr->sh_type)
+    {
+    case SHT_IA_64_VMS_TRACE:
+    case SHT_IA_64_VMS_DEBUG:
+    case SHT_IA_64_VMS_DEBUG_STR:
+      break;
+
+    default:
+      return elfNN_ia64_section_from_shdr (abfd, hdr, name, shindex);
+    }
+
+  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex))
+    return FALSE;
+
+  return TRUE;
+}
+
+static bfd_boolean
+elfNN_vms_object_p (bfd *abfd)
+{
+  Elf_Internal_Ehdr *i_ehdrp = elf_elfheader (abfd);
+  Elf_Internal_Phdr *i_phdr = elf_tdata (abfd)->phdr;
+  unsigned int i;
+  unsigned int num_text = 0;
+  unsigned int num_data = 0;
+  unsigned int num_rodata = 0;
+  char name[16];
+
+  if (!elfNN_ia64_object_p (abfd))
+    return FALSE;
+
+  for (i = 0; i < i_ehdrp->e_phnum; i++, i_phdr++)
+    {
+      /* Is there a section for this segment?  */
+      bfd_vma base_vma = i_phdr->p_vaddr;
+      bfd_vma limit_vma = base_vma + i_phdr->p_filesz;
+
+      if (i_phdr->p_type != PT_LOAD)
+	continue;
+
+    again:
+      while (base_vma < limit_vma)
+	{
+	  bfd_vma next_vma = limit_vma;
+	  asection *nsec;
+	  asection *sec;
+	  flagword flags;
+	  char *nname = NULL;
+
+	  /* Find a section covering base_vma.  */
+	  for (sec = abfd->sections; sec != NULL; sec = sec->next)
+	    {
+	      if ((sec->flags & (SEC_ALLOC | SEC_LOAD)) == 0)
+		continue;
+	      if (sec->vma <= base_vma && sec->vma + sec->size > base_vma)
+		{
+		  base_vma = sec->vma + sec->size;
+		  goto again;
+		}
+	      if (sec->vma < next_vma && sec->vma + sec->size >= base_vma)
+		next_vma = sec->vma;
+	    }
+
+	  /* No section covering [base_vma; next_vma).  Create a fake one.  */
+	  flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;
+	  if (i_phdr->p_flags & PF_X)
+	    {
+	      flags |= SEC_CODE;
+	      if (num_text++ == 0)
+		nname = ".text";
+	      else
+		sprintf (name, ".text$%u", num_text);
+	    }
+	  else if ((i_phdr->p_flags & (PF_R | PF_W)) == PF_R)
+	    {
+	      flags |= SEC_READONLY;
+	      sprintf (name, ".rodata$%u", num_rodata++);
+	    }
+	  else
+	    {
+	      flags |= SEC_DATA;
+	      sprintf (name, ".data$%u", num_data++);
+	    }
+
+	  /* Allocate name.  */
+	  if (nname == NULL)
+	    {
+	      size_t name_len = strlen (name) + 1;
+	      nname = bfd_alloc (abfd, name_len);
+	      if (nname == NULL)
+		return FALSE;
+	      memcpy (nname, name, name_len);
+	    }
+
+	  /* Create and fill new section.  */
+	  nsec = bfd_make_section_anyway_with_flags (abfd, nname, flags);
+	  if (nsec == NULL)
+	    return FALSE;
+	  nsec->vma = base_vma;
+	  nsec->size = next_vma - base_vma;
+	  nsec->filepos = i_phdr->p_offset + (base_vma - i_phdr->p_vaddr);
+
+	  base_vma = next_vma;
+	}
+    }
+  return TRUE;
+}
+
+static void
+elfNN_vms_post_process_headers (bfd *abfd,
+				struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  Elf_Internal_Ehdr *i_ehdrp = elf_elfheader (abfd);
+
+  i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_OPENVMS;
+  i_ehdrp->e_ident[EI_ABIVERSION] = 2;
+}
+
+static bfd_boolean
+elfNN_vms_section_processing (bfd *abfd ATTRIBUTE_UNUSED,
+			      Elf_Internal_Shdr *hdr)
+{
+  if (hdr->bfd_section != NULL)
+    {
+      const char *name = bfd_get_section_name (abfd, hdr->bfd_section);
+
+      if (strcmp (name, ".text") == 0)
+	hdr->sh_flags |= SHF_IA_64_VMS_SHARED;
+      else if ((strcmp (name, ".debug") == 0)
+	    || (strcmp (name, ".debug_abbrev") == 0)
+	    || (strcmp (name, ".debug_aranges") == 0)
+	    || (strcmp (name, ".debug_frame") == 0)
+	    || (strcmp (name, ".debug_info") == 0)
+	    || (strcmp (name, ".debug_loc") == 0)
+	    || (strcmp (name, ".debug_macinfo") == 0)
+	    || (strcmp (name, ".debug_pubnames") == 0)
+	    || (strcmp (name, ".debug_pubtypes") == 0))
+	hdr->sh_type = SHT_IA_64_VMS_DEBUG;
+      else if ((strcmp (name, ".debug_line") == 0)
+	    || (strcmp (name, ".debug_ranges") == 0))
+	hdr->sh_type = SHT_IA_64_VMS_TRACE;
+      else if (strcmp (name, ".debug_str") == 0)
+	hdr->sh_type = SHT_IA_64_VMS_DEBUG_STR;
+      else if (strcmp (name, ".vms_display_name_info") == 0)
+	{
+	  int idx, symcount;
+	  asymbol **syms;
+	  struct elf_obj_tdata *t = elf_tdata (abfd);
+	  int buf[2];
+	  int demangler_sym_idx = -1;
+
+	  symcount = bfd_get_symcount (abfd);
+	  syms = bfd_get_outsymbols (abfd);
+	  for (idx = 0; idx < symcount; idx++)
+	    {
+	      asymbol *sym;
+	      sym = syms[idx];
+	      if ((sym->flags & (BSF_DEBUGGING | BSF_DYNAMIC))
+	          && strchr (sym->name, '@')
+		  && (strcmp (sym->section->name, BFD_ABS_SECTION_NAME) == 0))
+		{
+		  demangler_sym_idx = sym->udata.i;
+		  break;
+		}
+	    }
+
+	  hdr->sh_type = SHT_IA_64_VMS_DISPLAY_NAME_INFO;
+	  hdr->sh_entsize = 4;
+	  hdr->sh_addralign = 0;
+	  hdr->sh_link = t->symtab_section;
+
+	  /* Find symtab index of demangler routine and stuff it in
+	     the second long word of section data.  */
+
+	  if (demangler_sym_idx > -1)
+	    {
+	      bfd_seek (abfd, hdr->sh_offset, SEEK_SET);
+	      bfd_bread (buf, hdr->sh_size, abfd);
+	      buf [1] = demangler_sym_idx;
+	      bfd_seek (abfd, hdr->sh_offset, SEEK_SET);
+	      bfd_bwrite (buf, hdr->sh_size, abfd);
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* The final processing done just before writing out a VMS IA-64 ELF
+   object file.  */
+
+static void
+elfNN_vms_final_write_processing (bfd *abfd,
+				  bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  Elf_Internal_Shdr *hdr;
+  asection *s;
+  int unwind_info_sect_idx = 0;
+
+  for (s = abfd->sections; s; s = s->next)
+    {
+      hdr = &elf_section_data (s)->this_hdr;
+
+      if (strcmp (bfd_get_section_name (abfd, hdr->bfd_section),
+		  ".IA_64.unwind_info") == 0)
+	unwind_info_sect_idx = elf_section_data (s)->this_idx;
+
+      switch (hdr->sh_type)
+	{
+	case SHT_IA_64_UNWIND:
+	  /* VMS requires sh_info to point to the unwind info section.  */
+          hdr->sh_info = unwind_info_sect_idx;
+	  break;
+	}
+    }
+
+  if (! elf_flags_init (abfd))
+    {
+      unsigned long flags = 0;
+
+      if (abfd->xvec->byteorder == BFD_ENDIAN_BIG)
+	flags |= EF_IA_64_BE;
+      if (bfd_get_mach (abfd) == bfd_mach_ia64_elf64)
+	flags |= EF_IA_64_ABI64;
+
+      elf_elfheader(abfd)->e_flags = flags;
+      elf_flags_init (abfd) = TRUE;
+    }
+}
+
+static bfd_boolean
+elfNN_vms_close_and_cleanup (bfd *abfd)
+{
+  if (bfd_get_format (abfd) == bfd_object)
+    {
+      long isize, irsize;
+
+      if (elf_shstrtab (abfd) != NULL)
+	_bfd_elf_strtab_free (elf_shstrtab (abfd));
+
+      /* Pad to 8 byte boundary for IPF/VMS.  */
+      isize = bfd_get_size (abfd);
+      if ((irsize = isize/8*8) < isize)
+	{
+	  int ishort = (irsize + 8) - isize;
+	  bfd_seek (abfd, isize, SEEK_SET);
+	  bfd_bwrite (bfd_zmalloc (ishort), ishort, abfd);
+	}
+    }
+
+  return _bfd_generic_close_and_cleanup (abfd);
+}
+#endif /* INCLUDE_IA64_VMS */
+
+#define TARGET_LITTLE_SYM		bfd_elfNN_ia64_little_vec
+#define TARGET_LITTLE_NAME		"elfNN-ia64-little"
+#define TARGET_BIG_SYM			bfd_elfNN_ia64_big_vec
+#define TARGET_BIG_NAME			"elfNN-ia64-big"
+#define ELF_ARCH			bfd_arch_ia64
+#define ELF_TARGET_ID			IA64_ELF_DATA
+#define ELF_MACHINE_CODE		EM_IA_64
+#define ELF_MACHINE_ALT1		1999	/* EAS2.3 */
+#define ELF_MACHINE_ALT2		1998	/* EAS2.2 */
+#define ELF_MAXPAGESIZE			0x10000	/* 64KB */
+#define ELF_COMMONPAGESIZE		0x4000	/* 16KB */
+
+#define elf_backend_section_from_shdr \
+	elfNN_ia64_section_from_shdr
+#define elf_backend_section_flags \
+	elfNN_ia64_section_flags
+#define elf_backend_fake_sections \
+	elfNN_ia64_fake_sections
+#define elf_backend_final_write_processing \
+	elfNN_ia64_final_write_processing
+#define elf_backend_add_symbol_hook \
+	elfNN_ia64_add_symbol_hook
+#define elf_backend_additional_program_headers \
+	elfNN_ia64_additional_program_headers
+#define elf_backend_modify_segment_map \
+	elfNN_ia64_modify_segment_map
+#define elf_backend_modify_program_headers \
+	elfNN_ia64_modify_program_headers
+#define elf_info_to_howto \
+	elfNN_ia64_info_to_howto
+
+#define bfd_elfNN_bfd_reloc_type_lookup \
+	ia64_elf_reloc_type_lookup
+#define bfd_elfNN_bfd_reloc_name_lookup \
+	ia64_elf_reloc_name_lookup
+#define bfd_elfNN_bfd_is_local_label_name \
+	elfNN_ia64_is_local_label_name
+#define bfd_elfNN_bfd_relax_section \
+	elfNN_ia64_relax_section
+
+#define elf_backend_object_p \
+	elfNN_ia64_object_p
+
+/* Stuff for the BFD linker: */
+#define bfd_elfNN_bfd_link_hash_table_create \
+	elfNN_ia64_hash_table_create
+#define bfd_elfNN_bfd_link_hash_table_free \
+	elfNN_ia64_hash_table_free
+#define elf_backend_create_dynamic_sections \
+	elfNN_ia64_create_dynamic_sections
+#define elf_backend_check_relocs \
+	elfNN_ia64_check_relocs
+#define elf_backend_adjust_dynamic_symbol \
+	elfNN_ia64_adjust_dynamic_symbol
+#define elf_backend_size_dynamic_sections \
+	elfNN_ia64_size_dynamic_sections
+#define elf_backend_omit_section_dynsym \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true)
+#define elf_backend_relocate_section \
+	elfNN_ia64_relocate_section
+#define elf_backend_finish_dynamic_symbol \
+	elfNN_ia64_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_sections \
+	elfNN_ia64_finish_dynamic_sections
+#define bfd_elfNN_bfd_final_link \
+	elfNN_ia64_final_link
+
+#define bfd_elfNN_bfd_merge_private_bfd_data \
+	elfNN_ia64_merge_private_bfd_data
+#define bfd_elfNN_bfd_set_private_flags \
+	elfNN_ia64_set_private_flags
+#define bfd_elfNN_bfd_print_private_bfd_data \
+	elfNN_ia64_print_private_bfd_data
+
+#define elf_backend_plt_readonly	1
+#define elf_backend_want_plt_sym	0
+#define elf_backend_plt_alignment	5
+#define elf_backend_got_header_size	0
+#define elf_backend_want_got_plt	1
+#define elf_backend_may_use_rel_p	1
+#define elf_backend_may_use_rela_p	1
+#define elf_backend_default_use_rela_p	1
+#define elf_backend_want_dynbss		0
+#define elf_backend_copy_indirect_symbol elfNN_ia64_hash_copy_indirect
+#define elf_backend_hide_symbol		elfNN_ia64_hash_hide_symbol
+#define elf_backend_fixup_symbol	_bfd_elf_link_hash_fixup_symbol
+#define elf_backend_reloc_type_class	elfNN_ia64_reloc_type_class
+#define elf_backend_rela_normal		1
+#define elf_backend_special_sections	elfNN_ia64_special_sections
+#define elf_backend_default_execstack	0
+
+/* FIXME: PR 290: The Intel C compiler generates SHT_IA_64_UNWIND with
+   SHF_LINK_ORDER. But it doesn't set the sh_link or sh_info fields.
+   We don't want to flood users with so many error messages. We turn
+   off the warning for now. It will be turned on later when the Intel
+   compiler is fixed.   */
+#define elf_backend_link_order_error_handler NULL
+
+#include "elfNN-target.h"
+
+/* HPUX-specific vectors.  */
+
+#undef  TARGET_LITTLE_SYM
+#undef  TARGET_LITTLE_NAME
+#undef  TARGET_BIG_SYM
+#define TARGET_BIG_SYM                  bfd_elfNN_ia64_hpux_big_vec
+#undef  TARGET_BIG_NAME
+#define TARGET_BIG_NAME                 "elfNN-ia64-hpux-big"
+
+/* These are HP-UX specific functions.  */
+
+#undef  elf_backend_post_process_headers
+#define elf_backend_post_process_headers elfNN_hpux_post_process_headers
+
+#undef  elf_backend_section_from_bfd_section
+#define elf_backend_section_from_bfd_section elfNN_hpux_backend_section_from_bfd_section
+
+#undef elf_backend_symbol_processing
+#define elf_backend_symbol_processing elfNN_hpux_backend_symbol_processing
+
+#undef  elf_backend_want_p_paddr_set_to_zero
+#define elf_backend_want_p_paddr_set_to_zero 1
+
+#undef ELF_COMMONPAGESIZE
+#undef ELF_OSABI
+#define ELF_OSABI			ELFOSABI_HPUX
+
+#undef  elfNN_bed
+#define elfNN_bed elfNN_ia64_hpux_bed
+
+#include "elfNN-target.h"
+
+/* VMS-specific vectors.  */
+#ifdef INCLUDE_IA64_VMS
+
+#undef  TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM		bfd_elfNN_ia64_vms_vec
+#undef  TARGET_LITTLE_NAME
+#define TARGET_LITTLE_NAME		"elfNN-ia64-vms"
+#undef  TARGET_BIG_SYM
+#undef  TARGET_BIG_NAME
+
+/* These are VMS specific functions.  */
+
+#undef  elf_backend_object_p
+#define elf_backend_object_p elfNN_vms_object_p
+
+#undef  elf_backend_section_from_shdr
+#define elf_backend_section_from_shdr elfNN_vms_section_from_shdr
+
+#undef  elf_backend_post_process_headers
+#define elf_backend_post_process_headers elfNN_vms_post_process_headers
+
+#undef  elf_backend_section_processing
+#define elf_backend_section_processing elfNN_vms_section_processing
+
+#undef  elf_backend_final_write_processing
+#define elf_backend_final_write_processing elfNN_vms_final_write_processing
+
+#undef  bfd_elfNN_close_and_cleanup
+#define bfd_elfNN_close_and_cleanup elfNN_vms_close_and_cleanup
+
+#undef  elf_backend_section_from_bfd_section
+
+#undef  elf_backend_symbol_processing
+
+#undef  elf_backend_want_p_paddr_set_to_zero
+
+#undef ELF_OSABI
+#define ELF_OSABI			ELFOSABI_OPENVMS
+
+#undef  ELF_MAXPAGESIZE
+#define ELF_MAXPAGESIZE			0x10000	/* 64KB */
+
+#undef  elfNN_bed
+#define elfNN_bed elfNN_ia64_vms_bed
+
+/* Use VMS-style archives (in particular, don't use the standard coff
+   archive format).  */
+#define bfd_elfNN_archive_functions
+
+#undef bfd_elfNN_archive_p
+#define bfd_elfNN_archive_p _bfd_vms_lib_ia64_archive_p
+#undef bfd_elfNN_write_archive_contents
+#define bfd_elfNN_write_archive_contents _bfd_vms_lib_write_archive_contents
+#undef bfd_elfNN_mkarchive
+#define bfd_elfNN_mkarchive _bfd_vms_lib_ia64_mkarchive
+
+#define bfd_elfNN_archive_slurp_armap \
+  _bfd_vms_lib_slurp_armap
+#define bfd_elfNN_archive_slurp_extended_name_table \
+  _bfd_vms_lib_slurp_extended_name_table
+#define bfd_elfNN_archive_construct_extended_name_table \
+  _bfd_vms_lib_construct_extended_name_table
+#define bfd_elfNN_archive_truncate_arname \
+  _bfd_vms_lib_truncate_arname
+#define bfd_elfNN_archive_write_armap \
+  _bfd_vms_lib_write_armap
+#define bfd_elfNN_archive_read_ar_hdr \
+  _bfd_vms_lib_read_ar_hdr
+#define bfd_elfNN_archive_write_ar_hdr \
+  _bfd_vms_lib_write_ar_hdr
+#define bfd_elfNN_archive_openr_next_archived_file \
+  _bfd_vms_lib_openr_next_archived_file
+#define bfd_elfNN_archive_get_elt_at_index \
+  _bfd_vms_lib_get_elt_at_index
+#define bfd_elfNN_archive_generic_stat_arch_elt \
+  _bfd_vms_lib_generic_stat_arch_elt
+#define bfd_elfNN_archive_update_armap_timestamp \
+  _bfd_vms_lib_update_armap_timestamp
+
+#include "elfNN-target.h"
+
+#endif /* INCLUDE_IA64_VMS */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfxx-ia64.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfxx-ia64.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfxx-ia64.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfxx-ia64.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,765 @@
+/* IA-64 support for 64-bit ELF
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+   2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+   Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "opcode/ia64.h"
+#include "elf/ia64.h"
+#include "objalloc.h"
+#include "hashtab.h"
+#include "bfd_stdint.h"
+#include "elfxx-ia64.h"
+
+/* THE RULES for all the stuff the linker creates --
+
+  GOT		Entries created in response to LTOFF or LTOFF_FPTR
+ 		relocations.  Dynamic relocs created for dynamic
+ 		symbols in an application; REL relocs for locals
+ 		in a shared library.
+
+  FPTR		The canonical function descriptor.  Created for local
+ 		symbols in applications.  Descriptors for dynamic symbols
+ 		and local symbols in shared libraries are created by
+ 		ld.so.  Thus there are no dynamic relocs against these
+ 		objects.  The FPTR relocs for such _are_ passed through
+ 		to the dynamic relocation tables.
+
+  FULL_PLT	Created for a PCREL21B relocation against a dynamic symbol.
+ 		Requires the creation of a PLTOFF entry.  This does not
+ 		require any dynamic relocations.
+
+  PLTOFF	Created by PLTOFF relocations.  For local symbols, this
+ 		is an alternate function descriptor, and in shared libraries
+ 		requires two REL relocations.  Note that this cannot be
+ 		transformed into an FPTR relocation, since it must be in
+ 		range of the GP.  For dynamic symbols, this is a function
+ 		descriptor for a MIN_PLT entry, and requires one IPLT reloc.
+
+  MIN_PLT	Created by PLTOFF entries against dynamic symbols.  This
+ 		does not require dynamic relocations.  */
+
+/* ia64-specific relocation.  */
+
+#define NELEMS(a)	((int) (sizeof (a) / sizeof ((a)[0])))
+
+/* Perform a relocation.  Not much to do here as all the hard work is
+   done in elfNN_ia64_final_link_relocate.  */
+static bfd_reloc_status_type
+ia64_elf_reloc (bfd *abfd ATTRIBUTE_UNUSED, arelent *reloc,
+                asymbol *sym ATTRIBUTE_UNUSED,
+                PTR data ATTRIBUTE_UNUSED, asection *input_section,
+                bfd *output_bfd, char **error_message)
+{
+  if (output_bfd)
+    {
+      reloc->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  if (input_section->flags & SEC_DEBUGGING)
+    return bfd_reloc_continue;
+
+  *error_message = "Unsupported call to ia64_elf_reloc";
+  return bfd_reloc_notsupported;
+}
+
+#define IA64_HOWTO(TYPE, NAME, SIZE, PCREL, IN)			\
+  HOWTO (TYPE, 0, SIZE, 0, PCREL, 0, complain_overflow_signed,	\
+	 ia64_elf_reloc, NAME, FALSE, 0, -1, IN)
+
+/* This table has to be sorted according to increasing number of the
+   TYPE field.  */
+static reloc_howto_type ia64_howto_table[] =
+  {
+    IA64_HOWTO (R_IA64_NONE,	    "NONE",	   0, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_IMM14,	    "IMM14",	   0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_IMM22,	    "IMM22",	   0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_IMM64,	    "IMM64",	   0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_DIR32MSB,    "DIR32MSB",	   2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_DIR32LSB,    "DIR32LSB",	   2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_DIR64MSB,    "DIR64MSB",	   4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_DIR64LSB,    "DIR64LSB",	   4, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_GPREL22,	    "GPREL22",	   0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_GPREL64I,    "GPREL64I",	   0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_GPREL32MSB,  "GPREL32MSB",  2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_GPREL32LSB,  "GPREL32LSB",  2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_GPREL64MSB,  "GPREL64MSB",  4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_GPREL64LSB,  "GPREL64LSB",  4, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_LTOFF22,	    "LTOFF22",	   0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LTOFF64I,    "LTOFF64I",	   0, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_PLTOFF22,    "PLTOFF22",	   0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_PLTOFF64I,   "PLTOFF64I",   0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_PLTOFF64MSB, "PLTOFF64MSB", 4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_PLTOFF64LSB, "PLTOFF64LSB", 4, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_FPTR64I,	    "FPTR64I",	   0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_FPTR32MSB,   "FPTR32MSB",   2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_FPTR32LSB,   "FPTR32LSB",   2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_FPTR64MSB,   "FPTR64MSB",   4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_FPTR64LSB,   "FPTR64LSB",   4, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_PCREL60B,    "PCREL60B",	   0, TRUE, TRUE),
+    IA64_HOWTO (R_IA64_PCREL21B,    "PCREL21B",	   0, TRUE, TRUE),
+    IA64_HOWTO (R_IA64_PCREL21M,    "PCREL21M",	   0, TRUE, TRUE),
+    IA64_HOWTO (R_IA64_PCREL21F,    "PCREL21F",	   0, TRUE, TRUE),
+    IA64_HOWTO (R_IA64_PCREL32MSB,  "PCREL32MSB",  2, TRUE, TRUE),
+    IA64_HOWTO (R_IA64_PCREL32LSB,  "PCREL32LSB",  2, TRUE, TRUE),
+    IA64_HOWTO (R_IA64_PCREL64MSB,  "PCREL64MSB",  4, TRUE, TRUE),
+    IA64_HOWTO (R_IA64_PCREL64LSB,  "PCREL64LSB",  4, TRUE, TRUE),
+
+    IA64_HOWTO (R_IA64_LTOFF_FPTR22, "LTOFF_FPTR22", 0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LTOFF_FPTR64I, "LTOFF_FPTR64I", 0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LTOFF_FPTR32MSB, "LTOFF_FPTR32MSB", 2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LTOFF_FPTR32LSB, "LTOFF_FPTR32LSB", 2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LTOFF_FPTR64MSB, "LTOFF_FPTR64MSB", 4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LTOFF_FPTR64LSB, "LTOFF_FPTR64LSB", 4, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_SEGREL32MSB, "SEGREL32MSB", 2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_SEGREL32LSB, "SEGREL32LSB", 2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_SEGREL64MSB, "SEGREL64MSB", 4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_SEGREL64LSB, "SEGREL64LSB", 4, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_SECREL32MSB, "SECREL32MSB", 2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_SECREL32LSB, "SECREL32LSB", 2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_SECREL64MSB, "SECREL64MSB", 4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_SECREL64LSB, "SECREL64LSB", 4, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_REL32MSB,    "REL32MSB",	   2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_REL32LSB,    "REL32LSB",	   2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_REL64MSB,    "REL64MSB",	   4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_REL64LSB,    "REL64LSB",	   4, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_LTV32MSB,    "LTV32MSB",	   2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LTV32LSB,    "LTV32LSB",	   2, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LTV64MSB,    "LTV64MSB",	   4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LTV64LSB,    "LTV64LSB",	   4, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_PCREL21BI,   "PCREL21BI",   0, TRUE, TRUE),
+    IA64_HOWTO (R_IA64_PCREL22,     "PCREL22",     0, TRUE, TRUE),
+    IA64_HOWTO (R_IA64_PCREL64I,    "PCREL64I",    0, TRUE, TRUE),
+
+    IA64_HOWTO (R_IA64_IPLTMSB,	    "IPLTMSB",	   4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_IPLTLSB,	    "IPLTLSB",	   4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_COPY,	    "COPY",	   4, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LTOFF22X,    "LTOFF22X",	   0, FALSE, TRUE),
+    IA64_HOWTO (R_IA64_LDXMOV,	    "LDXMOV",	   0, FALSE, TRUE),
+
+    IA64_HOWTO (R_IA64_TPREL14,	    "TPREL14",	   0, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_TPREL22,	    "TPREL22",	   0, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_TPREL64I,    "TPREL64I",	   0, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_TPREL64MSB,  "TPREL64MSB",  4, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_TPREL64LSB,  "TPREL64LSB",  4, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_LTOFF_TPREL22, "LTOFF_TPREL22",  0, FALSE, FALSE),
+
+    IA64_HOWTO (R_IA64_DTPMOD64MSB, "DTPMOD64MSB",  4, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_DTPMOD64LSB, "DTPMOD64LSB",  4, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_LTOFF_DTPMOD22, "LTOFF_DTPMOD22", 0, FALSE, FALSE),
+
+    IA64_HOWTO (R_IA64_DTPREL14,    "DTPREL14",	   0, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_DTPREL22,    "DTPREL22",	   0, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_DTPREL64I,   "DTPREL64I",   0, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_DTPREL32MSB, "DTPREL32MSB", 2, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_DTPREL32LSB, "DTPREL32LSB", 2, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_DTPREL64MSB, "DTPREL64MSB", 4, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_DTPREL64LSB, "DTPREL64LSB", 4, FALSE, FALSE),
+    IA64_HOWTO (R_IA64_LTOFF_DTPREL22, "LTOFF_DTPREL22", 0, FALSE, FALSE),
+  };
+
+static unsigned char elf_code_to_howto_index[R_IA64_MAX_RELOC_CODE + 1];
+
+/* Given a BFD reloc type, return the matching HOWTO structure.  */
+
+reloc_howto_type *
+ia64_elf_lookup_howto (unsigned int rtype)
+{
+  static int inited = 0;
+  int i;
+
+  if (!inited)
+    {
+      inited = 1;
+
+      memset (elf_code_to_howto_index, 0xff, sizeof (elf_code_to_howto_index));
+      for (i = 0; i < NELEMS (ia64_howto_table); ++i)
+	elf_code_to_howto_index[ia64_howto_table[i].type] = i;
+    }
+
+  if (rtype > R_IA64_MAX_RELOC_CODE)
+    return 0;
+  i = elf_code_to_howto_index[rtype];
+  if (i >= NELEMS (ia64_howto_table))
+    return 0;
+  return ia64_howto_table + i;
+}
+
+reloc_howto_type*
+ia64_elf_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                            bfd_reloc_code_real_type bfd_code)
+{
+  unsigned int rtype;
+
+  switch (bfd_code)
+    {
+    case BFD_RELOC_NONE:		rtype = R_IA64_NONE; break;
+
+    case BFD_RELOC_IA64_IMM14:		rtype = R_IA64_IMM14; break;
+    case BFD_RELOC_IA64_IMM22:		rtype = R_IA64_IMM22; break;
+    case BFD_RELOC_IA64_IMM64:		rtype = R_IA64_IMM64; break;
+
+    case BFD_RELOC_IA64_DIR32MSB:	rtype = R_IA64_DIR32MSB; break;
+    case BFD_RELOC_IA64_DIR32LSB:	rtype = R_IA64_DIR32LSB; break;
+    case BFD_RELOC_IA64_DIR64MSB:	rtype = R_IA64_DIR64MSB; break;
+    case BFD_RELOC_IA64_DIR64LSB:	rtype = R_IA64_DIR64LSB; break;
+
+    case BFD_RELOC_IA64_GPREL22:	rtype = R_IA64_GPREL22; break;
+    case BFD_RELOC_IA64_GPREL64I:	rtype = R_IA64_GPREL64I; break;
+    case BFD_RELOC_IA64_GPREL32MSB:	rtype = R_IA64_GPREL32MSB; break;
+    case BFD_RELOC_IA64_GPREL32LSB:	rtype = R_IA64_GPREL32LSB; break;
+    case BFD_RELOC_IA64_GPREL64MSB:	rtype = R_IA64_GPREL64MSB; break;
+    case BFD_RELOC_IA64_GPREL64LSB:	rtype = R_IA64_GPREL64LSB; break;
+
+    case BFD_RELOC_IA64_LTOFF22:	rtype = R_IA64_LTOFF22; break;
+    case BFD_RELOC_IA64_LTOFF64I:	rtype = R_IA64_LTOFF64I; break;
+
+    case BFD_RELOC_IA64_PLTOFF22:	rtype = R_IA64_PLTOFF22; break;
+    case BFD_RELOC_IA64_PLTOFF64I:	rtype = R_IA64_PLTOFF64I; break;
+    case BFD_RELOC_IA64_PLTOFF64MSB:	rtype = R_IA64_PLTOFF64MSB; break;
+    case BFD_RELOC_IA64_PLTOFF64LSB:	rtype = R_IA64_PLTOFF64LSB; break;
+    case BFD_RELOC_IA64_FPTR64I:	rtype = R_IA64_FPTR64I; break;
+    case BFD_RELOC_IA64_FPTR32MSB:	rtype = R_IA64_FPTR32MSB; break;
+    case BFD_RELOC_IA64_FPTR32LSB:	rtype = R_IA64_FPTR32LSB; break;
+    case BFD_RELOC_IA64_FPTR64MSB:	rtype = R_IA64_FPTR64MSB; break;
+    case BFD_RELOC_IA64_FPTR64LSB:	rtype = R_IA64_FPTR64LSB; break;
+
+    case BFD_RELOC_IA64_PCREL21B:	rtype = R_IA64_PCREL21B; break;
+    case BFD_RELOC_IA64_PCREL21BI:	rtype = R_IA64_PCREL21BI; break;
+    case BFD_RELOC_IA64_PCREL21M:	rtype = R_IA64_PCREL21M; break;
+    case BFD_RELOC_IA64_PCREL21F:	rtype = R_IA64_PCREL21F; break;
+    case BFD_RELOC_IA64_PCREL22:	rtype = R_IA64_PCREL22; break;
+    case BFD_RELOC_IA64_PCREL60B:	rtype = R_IA64_PCREL60B; break;
+    case BFD_RELOC_IA64_PCREL64I:	rtype = R_IA64_PCREL64I; break;
+    case BFD_RELOC_IA64_PCREL32MSB:	rtype = R_IA64_PCREL32MSB; break;
+    case BFD_RELOC_IA64_PCREL32LSB:	rtype = R_IA64_PCREL32LSB; break;
+    case BFD_RELOC_IA64_PCREL64MSB:	rtype = R_IA64_PCREL64MSB; break;
+    case BFD_RELOC_IA64_PCREL64LSB:	rtype = R_IA64_PCREL64LSB; break;
+
+    case BFD_RELOC_IA64_LTOFF_FPTR22:	rtype = R_IA64_LTOFF_FPTR22; break;
+    case BFD_RELOC_IA64_LTOFF_FPTR64I:	rtype = R_IA64_LTOFF_FPTR64I; break;
+    case BFD_RELOC_IA64_LTOFF_FPTR32MSB: rtype = R_IA64_LTOFF_FPTR32MSB; break;
+    case BFD_RELOC_IA64_LTOFF_FPTR32LSB: rtype = R_IA64_LTOFF_FPTR32LSB; break;
+    case BFD_RELOC_IA64_LTOFF_FPTR64MSB: rtype = R_IA64_LTOFF_FPTR64MSB; break;
+    case BFD_RELOC_IA64_LTOFF_FPTR64LSB: rtype = R_IA64_LTOFF_FPTR64LSB; break;
+
+    case BFD_RELOC_IA64_SEGREL32MSB:	rtype = R_IA64_SEGREL32MSB; break;
+    case BFD_RELOC_IA64_SEGREL32LSB:	rtype = R_IA64_SEGREL32LSB; break;
+    case BFD_RELOC_IA64_SEGREL64MSB:	rtype = R_IA64_SEGREL64MSB; break;
+    case BFD_RELOC_IA64_SEGREL64LSB:	rtype = R_IA64_SEGREL64LSB; break;
+
+    case BFD_RELOC_IA64_SECREL32MSB:	rtype = R_IA64_SECREL32MSB; break;
+    case BFD_RELOC_IA64_SECREL32LSB:	rtype = R_IA64_SECREL32LSB; break;
+    case BFD_RELOC_IA64_SECREL64MSB:	rtype = R_IA64_SECREL64MSB; break;
+    case BFD_RELOC_IA64_SECREL64LSB:	rtype = R_IA64_SECREL64LSB; break;
+
+    case BFD_RELOC_IA64_REL32MSB:	rtype = R_IA64_REL32MSB; break;
+    case BFD_RELOC_IA64_REL32LSB:	rtype = R_IA64_REL32LSB; break;
+    case BFD_RELOC_IA64_REL64MSB:	rtype = R_IA64_REL64MSB; break;
+    case BFD_RELOC_IA64_REL64LSB:	rtype = R_IA64_REL64LSB; break;
+
+    case BFD_RELOC_IA64_LTV32MSB:	rtype = R_IA64_LTV32MSB; break;
+    case BFD_RELOC_IA64_LTV32LSB:	rtype = R_IA64_LTV32LSB; break;
+    case BFD_RELOC_IA64_LTV64MSB:	rtype = R_IA64_LTV64MSB; break;
+    case BFD_RELOC_IA64_LTV64LSB:	rtype = R_IA64_LTV64LSB; break;
+
+    case BFD_RELOC_IA64_IPLTMSB:	rtype = R_IA64_IPLTMSB; break;
+    case BFD_RELOC_IA64_IPLTLSB:	rtype = R_IA64_IPLTLSB; break;
+    case BFD_RELOC_IA64_COPY:		rtype = R_IA64_COPY; break;
+    case BFD_RELOC_IA64_LTOFF22X:	rtype = R_IA64_LTOFF22X; break;
+    case BFD_RELOC_IA64_LDXMOV:		rtype = R_IA64_LDXMOV; break;
+
+    case BFD_RELOC_IA64_TPREL14:	rtype = R_IA64_TPREL14; break;
+    case BFD_RELOC_IA64_TPREL22:	rtype = R_IA64_TPREL22; break;
+    case BFD_RELOC_IA64_TPREL64I:	rtype = R_IA64_TPREL64I; break;
+    case BFD_RELOC_IA64_TPREL64MSB:	rtype = R_IA64_TPREL64MSB; break;
+    case BFD_RELOC_IA64_TPREL64LSB:	rtype = R_IA64_TPREL64LSB; break;
+    case BFD_RELOC_IA64_LTOFF_TPREL22:	rtype = R_IA64_LTOFF_TPREL22; break;
+
+    case BFD_RELOC_IA64_DTPMOD64MSB:	rtype = R_IA64_DTPMOD64MSB; break;
+    case BFD_RELOC_IA64_DTPMOD64LSB:	rtype = R_IA64_DTPMOD64LSB; break;
+    case BFD_RELOC_IA64_LTOFF_DTPMOD22:	rtype = R_IA64_LTOFF_DTPMOD22; break;
+
+    case BFD_RELOC_IA64_DTPREL14:	rtype = R_IA64_DTPREL14; break;
+    case BFD_RELOC_IA64_DTPREL22:	rtype = R_IA64_DTPREL22; break;
+    case BFD_RELOC_IA64_DTPREL64I:	rtype = R_IA64_DTPREL64I; break;
+    case BFD_RELOC_IA64_DTPREL32MSB:	rtype = R_IA64_DTPREL32MSB; break;
+    case BFD_RELOC_IA64_DTPREL32LSB:	rtype = R_IA64_DTPREL32LSB; break;
+    case BFD_RELOC_IA64_DTPREL64MSB:	rtype = R_IA64_DTPREL64MSB; break;
+    case BFD_RELOC_IA64_DTPREL64LSB:	rtype = R_IA64_DTPREL64LSB; break;
+    case BFD_RELOC_IA64_LTOFF_DTPREL22:	rtype = R_IA64_LTOFF_DTPREL22; break;
+
+    default: return 0;
+    }
+  return ia64_elf_lookup_howto (rtype);
+}
+
+reloc_howto_type *
+ia64_elf_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                            const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (ia64_howto_table) / sizeof (ia64_howto_table[0]);
+       i++)
+    if (ia64_howto_table[i].name != NULL
+	&& strcasecmp (ia64_howto_table[i].name, r_name) == 0)
+      return &ia64_howto_table[i];
+
+  return NULL;
+}
+
+#define BTYPE_SHIFT	6
+#define Y_SHIFT		26
+#define X6_SHIFT	27
+#define X4_SHIFT	27
+#define X3_SHIFT	33
+#define X2_SHIFT	31
+#define X_SHIFT		33
+#define OPCODE_SHIFT	37
+
+#define OPCODE_BITS	(0xfLL << OPCODE_SHIFT)
+#define X6_BITS		(0x3fLL << X6_SHIFT)
+#define X4_BITS		(0xfLL << X4_SHIFT)
+#define X3_BITS		(0x7LL << X3_SHIFT)
+#define X2_BITS		(0x3LL << X2_SHIFT)
+#define X_BITS		(0x1LL << X_SHIFT)
+#define Y_BITS		(0x1LL << Y_SHIFT)
+#define BTYPE_BITS	(0x7LL << BTYPE_SHIFT)
+#define PREDICATE_BITS	(0x3fLL)
+
+#define IS_NOP_B(i) \
+  (((i) & (OPCODE_BITS | X6_BITS)) == (2LL << OPCODE_SHIFT))
+#define IS_NOP_F(i) \
+  (((i) & (OPCODE_BITS | X_BITS | X6_BITS | Y_BITS)) \
+   == (0x1LL << X6_SHIFT))
+#define IS_NOP_I(i) \
+  (((i) & (OPCODE_BITS | X3_BITS | X6_BITS | Y_BITS)) \
+   == (0x1LL << X6_SHIFT))
+#define IS_NOP_M(i) \
+  (((i) & (OPCODE_BITS | X3_BITS | X2_BITS | X4_BITS | Y_BITS)) \
+   == (0x1LL << X4_SHIFT))
+#define IS_BR_COND(i) \
+  (((i) & (OPCODE_BITS | BTYPE_BITS)) == (0x4LL << OPCODE_SHIFT))
+#define IS_BR_CALL(i) \
+  (((i) & OPCODE_BITS) == (0x5LL << OPCODE_SHIFT))
+
+bfd_boolean
+ia64_elf_relax_br (bfd_byte *contents, bfd_vma off)
+{
+  unsigned int template_val, mlx;
+  bfd_vma t0, t1, s0, s1, s2, br_code;
+  long br_slot;
+  bfd_byte *hit_addr;
+
+  hit_addr = (bfd_byte *) (contents + off);
+  br_slot = (intptr_t) hit_addr & 0x3;
+  hit_addr -= br_slot;
+  t0 = bfd_getl64 (hit_addr + 0);
+  t1 = bfd_getl64 (hit_addr + 8);
+
+  /* Check if we can turn br into brl.  A label is always at the start
+     of the bundle.  Even if there are predicates on NOPs, we still
+     perform this optimization.  */
+  template_val = t0 & 0x1e;
+  s0 = (t0 >> 5) & 0x1ffffffffffLL;
+  s1 = ((t0 >> 46) | (t1 << 18)) & 0x1ffffffffffLL;
+  s2 = (t1 >> 23) & 0x1ffffffffffLL;
+  switch (br_slot)
+    {
+    case 0:
+      /* Check if slot 1 and slot 2 are NOPs. Possible template is
+         BBB.  We only need to check nop.b.  */
+      if (!(IS_NOP_B (s1) && IS_NOP_B (s2)))
+	return FALSE;
+      br_code = s0;
+      break;
+    case 1:
+      /* Check if slot 2 is NOP. Possible templates are MBB and BBB.
+	 For BBB, slot 0 also has to be nop.b.  */
+      if (!((template_val == 0x12				/* MBB */
+	     && IS_NOP_B (s2))
+	    || (template_val == 0x16			/* BBB */
+		&& IS_NOP_B (s0)
+		&& IS_NOP_B (s2))))
+	return FALSE;
+      br_code = s1;
+      break;
+    case 2:
+      /* Check if slot 1 is NOP. Possible templates are MIB, MBB, BBB,
+	 MMB and MFB. For BBB, slot 0 also has to be nop.b.  */
+      if (!((template_val == 0x10				/* MIB */
+	     && IS_NOP_I (s1))
+	    || (template_val == 0x12			/* MBB */
+		&& IS_NOP_B (s1))
+	    || (template_val == 0x16			/* BBB */
+		&& IS_NOP_B (s0)
+		&& IS_NOP_B (s1))
+	    || (template_val == 0x18			/* MMB */
+		&& IS_NOP_M (s1))
+	    || (template_val == 0x1c			/* MFB */
+		&& IS_NOP_F (s1))))
+	return FALSE;
+      br_code = s2;
+      break;
+    default:
+      /* It should never happen.  */
+      abort ();
+    }
+
+  /* We can turn br.cond/br.call into brl.cond/brl.call.  */
+  if (!(IS_BR_COND (br_code) || IS_BR_CALL (br_code)))
+    return FALSE;
+
+  /* Turn br into brl by setting bit 40.  */
+  br_code |= 0x1LL << 40;
+
+  /* Turn the old bundle into a MLX bundle with the same stop-bit
+     variety.  */
+  if (t0 & 0x1)
+    mlx = 0x5;
+  else
+    mlx = 0x4;
+
+  if (template_val == 0x16)
+    {
+      /* For BBB, we need to put nop.m in slot 0.  We keep the original
+	 predicate only if slot 0 isn't br.  */
+      if (br_slot == 0)
+	t0 = 0LL;
+      else
+	t0 &= PREDICATE_BITS << 5;
+      t0 |= 0x1LL << (X4_SHIFT + 5);
+    }
+  else
+    {
+      /* Keep the original instruction in slot 0.  */
+      t0 &= 0x1ffffffffffLL << 5;
+    }
+
+  t0 |= mlx;
+
+  /* Put brl in slot 1.  */
+  t1 = br_code << 23;
+
+  bfd_putl64 (t0, hit_addr);
+  bfd_putl64 (t1, hit_addr + 8);
+  return TRUE;
+}
+
+void
+ia64_elf_relax_brl (bfd_byte *contents, bfd_vma off)
+{
+  int template_val;
+  bfd_byte *hit_addr;
+  bfd_vma t0, t1, i0, i1, i2;
+
+  hit_addr = (bfd_byte *) (contents + off);
+  hit_addr -= (intptr_t) hit_addr & 0x3;
+  t0 = bfd_getl64 (hit_addr);
+  t1 = bfd_getl64 (hit_addr + 8);
+
+  /* Keep the instruction in slot 0. */
+  i0 = (t0 >> 5) & 0x1ffffffffffLL;
+  /* Use nop.b for slot 1. */
+  i1 = 0x4000000000LL;
+  /* For slot 2, turn brl into br by masking out bit 40.  */
+  i2 = (t1 >> 23) & 0x0ffffffffffLL;
+
+  /* Turn a MLX bundle into a MBB bundle with the same stop-bit
+     variety.  */
+  if (t0 & 0x1)
+    template_val = 0x13;
+  else
+    template_val = 0x12;
+  t0 = (i1 << 46) | (i0 << 5) | template_val;
+  t1 = (i2 << 23) | (i1 >> 18);
+
+  bfd_putl64 (t0, hit_addr);
+  bfd_putl64 (t1, hit_addr + 8);
+}
+
+void
+ia64_elf_relax_ldxmov (bfd_byte *contents, bfd_vma off)
+{
+  int shift, r1, r3;
+  bfd_vma dword, insn;
+
+  switch ((int)off & 0x3)
+    {
+    case 0: shift =  5; break;
+    case 1: shift = 14; off += 3; break;
+    case 2: shift = 23; off += 6; break;
+    default:
+      abort ();
+    }
+
+  dword = bfd_getl64 (contents + off);
+  insn = (dword >> shift) & 0x1ffffffffffLL;
+
+  r1 = (insn >> 6) & 127;
+  r3 = (insn >> 20) & 127;
+  if (r1 == r3)
+    insn = 0x8000000;				   /* nop */
+  else
+    insn = (insn & 0x7f01fff) | 0x10800000000LL;   /* (qp) mov r1 = r3 */
+
+  dword &= ~(0x1ffffffffffLL << shift);
+  dword |= (insn << shift);
+  bfd_putl64 (dword, contents + off);
+}
+
+bfd_reloc_status_type
+ia64_elf_install_value (bfd_byte *hit_addr, bfd_vma v, unsigned int r_type)
+{
+  const struct ia64_operand *op;
+  int bigendian = 0, shift = 0;
+  bfd_vma t0, t1, dword;
+  ia64_insn insn;
+  enum ia64_opnd opnd;
+  const char *err;
+  size_t size = 8;
+#ifdef BFD_HOST_U_64_BIT
+  BFD_HOST_U_64_BIT val = (BFD_HOST_U_64_BIT) v;
+#else
+  bfd_vma val = v;
+#endif
+
+  opnd = IA64_OPND_NIL;
+  switch (r_type)
+    {
+    case R_IA64_NONE:
+    case R_IA64_LDXMOV:
+      return bfd_reloc_ok;
+
+      /* Instruction relocations.  */
+
+    case R_IA64_IMM14:
+    case R_IA64_TPREL14:
+    case R_IA64_DTPREL14:
+      opnd = IA64_OPND_IMM14;
+      break;
+
+    case R_IA64_PCREL21F:	opnd = IA64_OPND_TGT25; break;
+    case R_IA64_PCREL21M:	opnd = IA64_OPND_TGT25b; break;
+    case R_IA64_PCREL60B:	opnd = IA64_OPND_TGT64; break;
+    case R_IA64_PCREL21B:
+    case R_IA64_PCREL21BI:
+      opnd = IA64_OPND_TGT25c;
+      break;
+
+    case R_IA64_IMM22:
+    case R_IA64_GPREL22:
+    case R_IA64_LTOFF22:
+    case R_IA64_LTOFF22X:
+    case R_IA64_PLTOFF22:
+    case R_IA64_PCREL22:
+    case R_IA64_LTOFF_FPTR22:
+    case R_IA64_TPREL22:
+    case R_IA64_DTPREL22:
+    case R_IA64_LTOFF_TPREL22:
+    case R_IA64_LTOFF_DTPMOD22:
+    case R_IA64_LTOFF_DTPREL22:
+      opnd = IA64_OPND_IMM22;
+      break;
+
+    case R_IA64_IMM64:
+    case R_IA64_GPREL64I:
+    case R_IA64_LTOFF64I:
+    case R_IA64_PLTOFF64I:
+    case R_IA64_PCREL64I:
+    case R_IA64_FPTR64I:
+    case R_IA64_LTOFF_FPTR64I:
+    case R_IA64_TPREL64I:
+    case R_IA64_DTPREL64I:
+      opnd = IA64_OPND_IMMU64;
+      break;
+
+      /* Data relocations.  */
+
+    case R_IA64_DIR32MSB:
+    case R_IA64_GPREL32MSB:
+    case R_IA64_FPTR32MSB:
+    case R_IA64_PCREL32MSB:
+    case R_IA64_LTOFF_FPTR32MSB:
+    case R_IA64_SEGREL32MSB:
+    case R_IA64_SECREL32MSB:
+    case R_IA64_LTV32MSB:
+    case R_IA64_DTPREL32MSB:
+      size = 4; bigendian = 1;
+      break;
+
+    case R_IA64_DIR32LSB:
+    case R_IA64_GPREL32LSB:
+    case R_IA64_FPTR32LSB:
+    case R_IA64_PCREL32LSB:
+    case R_IA64_LTOFF_FPTR32LSB:
+    case R_IA64_SEGREL32LSB:
+    case R_IA64_SECREL32LSB:
+    case R_IA64_LTV32LSB:
+    case R_IA64_DTPREL32LSB:
+      size = 4; bigendian = 0;
+      break;
+
+    case R_IA64_DIR64MSB:
+    case R_IA64_GPREL64MSB:
+    case R_IA64_PLTOFF64MSB:
+    case R_IA64_FPTR64MSB:
+    case R_IA64_PCREL64MSB:
+    case R_IA64_LTOFF_FPTR64MSB:
+    case R_IA64_SEGREL64MSB:
+    case R_IA64_SECREL64MSB:
+    case R_IA64_LTV64MSB:
+    case R_IA64_TPREL64MSB:
+    case R_IA64_DTPMOD64MSB:
+    case R_IA64_DTPREL64MSB:
+      size = 8; bigendian = 1;
+      break;
+
+    case R_IA64_DIR64LSB:
+    case R_IA64_GPREL64LSB:
+    case R_IA64_PLTOFF64LSB:
+    case R_IA64_FPTR64LSB:
+    case R_IA64_PCREL64LSB:
+    case R_IA64_LTOFF_FPTR64LSB:
+    case R_IA64_SEGREL64LSB:
+    case R_IA64_SECREL64LSB:
+    case R_IA64_LTV64LSB:
+    case R_IA64_TPREL64LSB:
+    case R_IA64_DTPMOD64LSB:
+    case R_IA64_DTPREL64LSB:
+      size = 8; bigendian = 0;
+      break;
+
+      /* Unsupported / Dynamic relocations.  */
+    default:
+      return bfd_reloc_notsupported;
+    }
+
+  switch (opnd)
+    {
+    case IA64_OPND_IMMU64:
+      hit_addr -= (intptr_t) hit_addr & 0x3;
+      t0 = bfd_getl64 (hit_addr);
+      t1 = bfd_getl64 (hit_addr + 8);
+
+      /* tmpl/s: bits  0.. 5 in t0
+	 slot 0: bits  5..45 in t0
+	 slot 1: bits 46..63 in t0, bits 0..22 in t1
+	 slot 2: bits 23..63 in t1 */
+
+      /* First, clear the bits that form the 64 bit constant.  */
+      t0 &= ~(0x3ffffLL << 46);
+      t1 &= ~(0x7fffffLL
+	      | ((  (0x07fLL << 13) | (0x1ffLL << 27)
+		    | (0x01fLL << 22) | (0x001LL << 21)
+		    | (0x001LL << 36)) << 23));
+
+      t0 |= ((val >> 22) & 0x03ffffLL) << 46;		/* 18 lsbs of imm41 */
+      t1 |= ((val >> 40) & 0x7fffffLL) <<  0;		/* 23 msbs of imm41 */
+      t1 |= (  (((val >>  0) & 0x07f) << 13)		/* imm7b */
+	       | (((val >>  7) & 0x1ff) << 27)		/* imm9d */
+	       | (((val >> 16) & 0x01f) << 22)		/* imm5c */
+	       | (((val >> 21) & 0x001) << 21)		/* ic */
+	       | (((val >> 63) & 0x001) << 36)) << 23;	/* i */
+
+      bfd_putl64 (t0, hit_addr);
+      bfd_putl64 (t1, hit_addr + 8);
+      break;
+
+    case IA64_OPND_TGT64:
+      hit_addr -= (intptr_t) hit_addr & 0x3;
+      t0 = bfd_getl64 (hit_addr);
+      t1 = bfd_getl64 (hit_addr + 8);
+
+      /* tmpl/s: bits  0.. 5 in t0
+	 slot 0: bits  5..45 in t0
+	 slot 1: bits 46..63 in t0, bits 0..22 in t1
+	 slot 2: bits 23..63 in t1 */
+
+      /* First, clear the bits that form the 64 bit constant.  */
+      t0 &= ~(0x3ffffLL << 46);
+      t1 &= ~(0x7fffffLL
+	      | ((1LL << 36 | 0xfffffLL << 13) << 23));
+
+      val >>= 4;
+      t0 |= ((val >> 20) & 0xffffLL) << 2 << 46;	/* 16 lsbs of imm39 */
+      t1 |= ((val >> 36) & 0x7fffffLL) << 0;		/* 23 msbs of imm39 */
+      t1 |= ((((val >> 0) & 0xfffffLL) << 13)		/* imm20b */
+	      | (((val >> 59) & 0x1LL) << 36)) << 23;	/* i */
+
+      bfd_putl64 (t0, hit_addr);
+      bfd_putl64 (t1, hit_addr + 8);
+      break;
+
+    default:
+      switch ((intptr_t) hit_addr & 0x3)
+	{
+	case 0: shift =  5; break;
+	case 1: shift = 14; hit_addr += 3; break;
+	case 2: shift = 23; hit_addr += 6; break;
+	case 3: return bfd_reloc_notsupported; /* shouldn't happen...  */
+	}
+      dword = bfd_getl64 (hit_addr);
+      insn = (dword >> shift) & 0x1ffffffffffLL;
+
+      op = elf64_ia64_operands + opnd;
+      err = (*op->insert) (op, val, &insn);
+      if (err)
+	return bfd_reloc_overflow;
+
+      dword &= ~(0x1ffffffffffLL << shift);
+      dword |= (insn << shift);
+      bfd_putl64 (dword, hit_addr);
+      break;
+
+    case IA64_OPND_NIL:
+      /* A data relocation.  */
+      if (bigendian)
+	if (size == 4)
+	  bfd_putb32 (val, hit_addr);
+	else
+	  bfd_putb64 (val, hit_addr);
+      else
+	if (size == 4)
+	  bfd_putl32 (val, hit_addr);
+	else
+	  bfd_putl64 (val, hit_addr);
+      break;
+    }
+
+  return bfd_reloc_ok;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfxx-ia64.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfxx-ia64.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfxx-ia64.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfxx-ia64.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,34 @@
+/* IA-64 support for 64-bit ELF
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+   2008, 2009, 2010  Free Software Foundation, Inc.
+   Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+reloc_howto_type *ia64_elf_reloc_type_lookup (bfd *, bfd_reloc_code_real_type);
+
+reloc_howto_type *ia64_elf_reloc_name_lookup (bfd *, const char *);
+
+reloc_howto_type *ia64_elf_lookup_howto (unsigned int rtype);
+
+bfd_boolean ia64_elf_relax_br (bfd_byte *contents, bfd_vma off);
+void ia64_elf_relax_brl (bfd_byte *contents, bfd_vma off);
+void ia64_elf_relax_ldxmov (bfd_byte *contents, bfd_vma off);
+
+bfd_reloc_status_type ia64_elf_install_value (bfd_byte *hit_addr, bfd_vma v,
+                                              unsigned int r_type);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfxx-mips.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfxx-mips.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfxx-mips.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfxx-mips.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,14255 @@
+/* MIPS-specific support for ELF
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   Most of the information added by Ian Lance Taylor, Cygnus Support,
+   <ian@cygnus.com>.
+   N32/64 ABI support added by Mark Mitchell, CodeSourcery, LLC.
+   <mark@codesourcery.com>
+   Traditional MIPS targets support added by Koundinya.K, Dansk Data
+   Elektronik & Operations Research Group. <kk@ddeorg.soft.net>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* This file handles functionality common to the different MIPS ABI's.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libiberty.h"
+#include "elf-bfd.h"
+#include "elfxx-mips.h"
+#include "elf/mips.h"
+#include "elf-vxworks.h"
+
+/* Get the ECOFF swapping routines.  */
+#include "coff/sym.h"
+#include "coff/symconst.h"
+#include "coff/ecoff.h"
+#include "coff/mips.h"
+
+#include "hashtab.h"
+
+/* This structure is used to hold information about one GOT entry.
+   There are three types of entry:
+
+      (1) absolute addresses
+	    (abfd == NULL)
+      (2) SYMBOL + OFFSET addresses, where SYMBOL is local to an input bfd
+	    (abfd != NULL, symndx >= 0)
+      (3) SYMBOL addresses, where SYMBOL is not local to an input bfd
+	    (abfd != NULL, symndx == -1)
+
+   Type (3) entries are treated differently for different types of GOT.
+   In the "master" GOT -- i.e.  the one that describes every GOT
+   reference needed in the link -- the mips_got_entry is keyed on both
+   the symbol and the input bfd that references it.  If it turns out
+   that we need multiple GOTs, we can then use this information to
+   create separate GOTs for each input bfd.
+
+   However, we want each of these separate GOTs to have at most one
+   entry for a given symbol, so their type (3) entries are keyed only
+   on the symbol.  The input bfd given by the "abfd" field is somewhat
+   arbitrary in this case.
+
+   This means that when there are multiple GOTs, each GOT has a unique
+   mips_got_entry for every symbol within it.  We can therefore use the
+   mips_got_entry fields (tls_type and gotidx) to track the symbol's
+   GOT index.
+
+   However, if it turns out that we need only a single GOT, we continue
+   to use the master GOT to describe it.  There may therefore be several
+   mips_got_entries for the same symbol, each with a different input bfd.
+   We want to make sure that each symbol gets a unique GOT entry, so when
+   there's a single GOT, we use the symbol's hash entry, not the
+   mips_got_entry fields, to track a symbol's GOT index.  */
+struct mips_got_entry
+{
+  /* The input bfd in which the symbol is defined.  */
+  bfd *abfd;
+  /* The index of the symbol, as stored in the relocation r_info, if
+     we have a local symbol; -1 otherwise.  */
+  long symndx;
+  union
+  {
+    /* If abfd == NULL, an address that must be stored in the got.  */
+    bfd_vma address;
+    /* If abfd != NULL && symndx != -1, the addend of the relocation
+       that should be added to the symbol value.  */
+    bfd_vma addend;
+    /* If abfd != NULL && symndx == -1, the hash table entry
+       corresponding to symbol in the GOT.  The symbol's entry
+       is in the local area if h->global_got_area is GGA_NONE,
+       otherwise it is in the global area.  */
+    struct mips_elf_link_hash_entry *h;
+  } d;
+
+  /* The TLS types included in this GOT entry (specifically, GD and
+     IE).  The GD and IE flags can be added as we encounter new
+     relocations.  LDM can also be set; it will always be alone, not
+     combined with any GD or IE flags.  An LDM GOT entry will be
+     a local symbol entry with r_symndx == 0.  */
+  unsigned char tls_type;
+
+  /* The offset from the beginning of the .got section to the entry
+     corresponding to this symbol+addend.  If it's a global symbol
+     whose offset is yet to be decided, it's going to be -1.  */
+  long gotidx;
+};
+
+/* This structure describes a range of addends: [MIN_ADDEND, MAX_ADDEND].
+   The structures form a non-overlapping list that is sorted by increasing
+   MIN_ADDEND.  */
+struct mips_got_page_range
+{
+  struct mips_got_page_range *next;
+  bfd_signed_vma min_addend;
+  bfd_signed_vma max_addend;
+};
+
+/* This structure describes the range of addends that are applied to page
+   relocations against a given symbol.  */
+struct mips_got_page_entry
+{
+  /* The input bfd in which the symbol is defined.  */
+  bfd *abfd;
+  /* The index of the symbol, as stored in the relocation r_info.  */
+  long symndx;
+  /* The ranges for this page entry.  */
+  struct mips_got_page_range *ranges;
+  /* The maximum number of page entries needed for RANGES.  */
+  bfd_vma num_pages;
+};
+
+/* This structure is used to hold .got information when linking.  */
+
+struct mips_got_info
+{
+  /* The global symbol in the GOT with the lowest index in the dynamic
+     symbol table.  */
+  struct elf_link_hash_entry *global_gotsym;
+  /* The number of global .got entries.  */
+  unsigned int global_gotno;
+  /* The number of global .got entries that are in the GGA_RELOC_ONLY area.  */
+  unsigned int reloc_only_gotno;
+  /* The number of .got slots used for TLS.  */
+  unsigned int tls_gotno;
+  /* The first unused TLS .got entry.  Used only during
+     mips_elf_initialize_tls_index.  */
+  unsigned int tls_assigned_gotno;
+  /* The number of local .got entries, eventually including page entries.  */
+  unsigned int local_gotno;
+  /* The maximum number of page entries needed.  */
+  unsigned int page_gotno;
+  /* The number of local .got entries we have used.  */
+  unsigned int assigned_gotno;
+  /* A hash table holding members of the got.  */
+  struct htab *got_entries;
+  /* A hash table of mips_got_page_entry structures.  */
+  struct htab *got_page_entries;
+  /* A hash table mapping input bfds to other mips_got_info.  NULL
+     unless multi-got was necessary.  */
+  struct htab *bfd2got;
+  /* In multi-got links, a pointer to the next got (err, rather, most
+     of the time, it points to the previous got).  */
+  struct mips_got_info *next;
+  /* This is the GOT index of the TLS LDM entry for the GOT, MINUS_ONE
+     for none, or MINUS_TWO for not yet assigned.  This is needed
+     because a single-GOT link may have multiple hash table entries
+     for the LDM.  It does not get initialized in multi-GOT mode.  */
+  bfd_vma tls_ldm_offset;
+};
+
+/* Map an input bfd to a got in a multi-got link.  */
+
+struct mips_elf_bfd2got_hash
+{
+  bfd *bfd;
+  struct mips_got_info *g;
+};
+
+/* Structure passed when traversing the bfd2got hash table, used to
+   create and merge bfd's gots.  */
+
+struct mips_elf_got_per_bfd_arg
+{
+  /* A hashtable that maps bfds to gots.  */
+  htab_t bfd2got;
+  /* The output bfd.  */
+  bfd *obfd;
+  /* The link information.  */
+  struct bfd_link_info *info;
+  /* A pointer to the primary got, i.e., the one that's going to get
+     the implicit relocations from DT_MIPS_LOCAL_GOTNO and
+     DT_MIPS_GOTSYM.  */
+  struct mips_got_info *primary;
+  /* A non-primary got we're trying to merge with other input bfd's
+     gots.  */
+  struct mips_got_info *current;
+  /* The maximum number of got entries that can be addressed with a
+     16-bit offset.  */
+  unsigned int max_count;
+  /* The maximum number of page entries needed by each got.  */
+  unsigned int max_pages;
+  /* The total number of global entries which will live in the
+     primary got and be automatically relocated.  This includes
+     those not referenced by the primary GOT but included in
+     the "master" GOT.  */
+  unsigned int global_count;
+};
+
+/* Another structure used to pass arguments for got entries traversal.  */
+
+struct mips_elf_set_global_got_offset_arg
+{
+  struct mips_got_info *g;
+  int value;
+  unsigned int needed_relocs;
+  struct bfd_link_info *info;
+};
+
+/* A structure used to count TLS relocations or GOT entries, for GOT
+   entry or ELF symbol table traversal.  */
+
+struct mips_elf_count_tls_arg
+{
+  struct bfd_link_info *info;
+  unsigned int needed;
+};
+
+struct _mips_elf_section_data
+{
+  struct bfd_elf_section_data elf;
+  union
+  {
+    bfd_byte *tdata;
+  } u;
+};
+
+#define mips_elf_section_data(sec) \
+  ((struct _mips_elf_section_data *) elf_section_data (sec))
+
+#define is_mips_elf(bfd)				\
+  (bfd_get_flavour (bfd) == bfd_target_elf_flavour	\
+   && elf_tdata (bfd) != NULL				\
+   && elf_object_id (bfd) == MIPS_ELF_DATA)
+
+/* The ABI says that every symbol used by dynamic relocations must have
+   a global GOT entry.  Among other things, this provides the dynamic
+   linker with a free, directly-indexed cache.  The GOT can therefore
+   contain symbols that are not referenced by GOT relocations themselves
+   (in other words, it may have symbols that are not referenced by things
+   like R_MIPS_GOT16 and R_MIPS_GOT_PAGE).
+
+   GOT relocations are less likely to overflow if we put the associated
+   GOT entries towards the beginning.  We therefore divide the global
+   GOT entries into two areas: "normal" and "reloc-only".  Entries in
+   the first area can be used for both dynamic relocations and GP-relative
+   accesses, while those in the "reloc-only" area are for dynamic
+   relocations only.
+
+   These GGA_* ("Global GOT Area") values are organised so that lower
+   values are more general than higher values.  Also, non-GGA_NONE
+   values are ordered by the position of the area in the GOT.  */
+#define GGA_NORMAL 0
+#define GGA_RELOC_ONLY 1
+#define GGA_NONE 2
+
+/* Information about a non-PIC interface to a PIC function.  There are
+   two ways of creating these interfaces.  The first is to add:
+
+	lui	$25,%hi(func)
+	addiu	$25,$25,%lo(func)
+
+   immediately before a PIC function "func".  The second is to add:
+
+	lui	$25,%hi(func)
+	j	func
+	addiu	$25,$25,%lo(func)
+
+   to a separate trampoline section.
+
+   Stubs of the first kind go in a new section immediately before the
+   target function.  Stubs of the second kind go in a single section
+   pointed to by the hash table's "strampoline" field.  */
+struct mips_elf_la25_stub {
+  /* The generated section that contains this stub.  */
+  asection *stub_section;
+
+  /* The offset of the stub from the start of STUB_SECTION.  */
+  bfd_vma offset;
+
+  /* One symbol for the original function.  Its location is available
+     in H->root.root.u.def.  */
+  struct mips_elf_link_hash_entry *h;
+};
+
+/* Macros for populating a mips_elf_la25_stub.  */
+
+#define LA25_LUI(VAL) (0x3c190000 | (VAL))	/* lui t9,VAL */
+#define LA25_J(VAL) (0x08000000 | (((VAL) >> 2) & 0x3ffffff)) /* j VAL */
+#define LA25_ADDIU(VAL) (0x27390000 | (VAL))	/* addiu t9,t9,VAL */
+#define LA25_LUI_MICROMIPS_1(VAL) (0x41b9)	/* lui t9,VAL */
+#define LA25_LUI_MICROMIPS_2(VAL) (VAL)
+#define LA25_J_MICROMIPS_1(VAL) (0xd400 | (((VAL) >> 17) & 0x3ff)) /* j VAL */
+#define LA25_J_MICROMIPS_2(VAL) ((VAL) >> 1)
+#define LA25_ADDIU_MICROMIPS_1(VAL) (0x3339)	/* addiu t9,t9,VAL */
+#define LA25_ADDIU_MICROMIPS_2(VAL) (VAL)
+
+/* This structure is passed to mips_elf_sort_hash_table_f when sorting
+   the dynamic symbols.  */
+
+struct mips_elf_hash_sort_data
+{
+  /* The symbol in the global GOT with the lowest dynamic symbol table
+     index.  */
+  struct elf_link_hash_entry *low;
+  /* The least dynamic symbol table index corresponding to a non-TLS
+     symbol with a GOT entry.  */
+  long min_got_dynindx;
+  /* The greatest dynamic symbol table index corresponding to a symbol
+     with a GOT entry that is not referenced (e.g., a dynamic symbol
+     with dynamic relocations pointing to it from non-primary GOTs).  */
+  long max_unref_got_dynindx;
+  /* The greatest dynamic symbol table index not corresponding to a
+     symbol without a GOT entry.  */
+  long max_non_got_dynindx;
+};
+
+/* The MIPS ELF linker needs additional information for each symbol in
+   the global hash table.  */
+
+struct mips_elf_link_hash_entry
+{
+  struct elf_link_hash_entry root;
+
+  /* External symbol information.  */
+  EXTR esym;
+
+  /* The la25 stub we have created for ths symbol, if any.  */
+  struct mips_elf_la25_stub *la25_stub;
+
+  /* Number of R_MIPS_32, R_MIPS_REL32, or R_MIPS_64 relocs against
+     this symbol.  */
+  unsigned int possibly_dynamic_relocs;
+
+  /* If there is a stub that 32 bit functions should use to call this
+     16 bit function, this points to the section containing the stub.  */
+  asection *fn_stub;
+
+  /* If there is a stub that 16 bit functions should use to call this
+     32 bit function, this points to the section containing the stub.  */
+  asection *call_stub;
+
+  /* This is like the call_stub field, but it is used if the function
+     being called returns a floating point value.  */
+  asection *call_fp_stub;
+
+#define GOT_NORMAL	0
+#define GOT_TLS_GD	1
+#define GOT_TLS_LDM	2
+#define GOT_TLS_IE	4
+#define GOT_TLS_OFFSET_DONE    0x40
+#define GOT_TLS_DONE    0x80
+  unsigned char tls_type;
+
+  /* This is only used in single-GOT mode; in multi-GOT mode there
+     is one mips_got_entry per GOT entry, so the offset is stored
+     there.  In single-GOT mode there may be many mips_got_entry
+     structures all referring to the same GOT slot.  It might be
+     possible to use root.got.offset instead, but that field is
+     overloaded already.  */
+  bfd_vma tls_got_offset;
+
+  /* The highest GGA_* value that satisfies all references to this symbol.  */
+  unsigned int global_got_area : 2;
+
+  /* True if all GOT relocations against this symbol are for calls.  This is
+     a looser condition than no_fn_stub below, because there may be other
+     non-call non-GOT relocations against the symbol.  */
+  unsigned int got_only_for_calls : 1;
+
+  /* True if one of the relocations described by possibly_dynamic_relocs
+     is against a readonly section.  */
+  unsigned int readonly_reloc : 1;
+
+  /* True if there is a relocation against this symbol that must be
+     resolved by the static linker (in other words, if the relocation
+     cannot possibly be made dynamic).  */
+  unsigned int has_static_relocs : 1;
+
+  /* True if we must not create a .MIPS.stubs entry for this symbol.
+     This is set, for example, if there are relocations related to
+     taking the function's address, i.e. any but R_MIPS_CALL*16 ones.
+     See "MIPS ABI Supplement, 3rd Edition", p. 4-20.  */
+  unsigned int no_fn_stub : 1;
+
+  /* Whether we need the fn_stub; this is true if this symbol appears
+     in any relocs other than a 16 bit call.  */
+  unsigned int need_fn_stub : 1;
+
+  /* True if this symbol is referenced by branch relocations from
+     any non-PIC input file.  This is used to determine whether an
+     la25 stub is required.  */
+  unsigned int has_nonpic_branches : 1;
+
+  /* Does this symbol need a traditional MIPS lazy-binding stub
+     (as opposed to a PLT entry)?  */
+  unsigned int needs_lazy_stub : 1;
+};
+
+/* MIPS ELF linker hash table.  */
+
+struct mips_elf_link_hash_table
+{
+  struct elf_link_hash_table root;
+#if 0
+  /* We no longer use this.  */
+  /* String section indices for the dynamic section symbols.  */
+  bfd_size_type dynsym_sec_strindex[SIZEOF_MIPS_DYNSYM_SECNAMES];
+#endif
+
+  /* The number of .rtproc entries.  */
+  bfd_size_type procedure_count;
+
+  /* The size of the .compact_rel section (if SGI_COMPAT).  */
+  bfd_size_type compact_rel_size;
+
+  /* This flag indicates that the value of DT_MIPS_RLD_MAP dynamic
+     entry is set to the address of __rld_obj_head as in IRIX5.  */
+  bfd_boolean use_rld_obj_head;
+
+  /* This is the value of the __rld_map or __rld_obj_head symbol.  */
+  bfd_vma rld_value;
+
+  /* This is set if we see any mips16 stub sections.  */
+  bfd_boolean mips16_stubs_seen;
+
+  /* True if we can generate copy relocs and PLTs.  */
+  bfd_boolean use_plts_and_copy_relocs;
+
+  /* True if we're generating code for VxWorks.  */
+  bfd_boolean is_vxworks;
+
+  /* True if we already reported the small-data section overflow.  */
+  bfd_boolean small_data_overflow_reported;
+
+  /* Shortcuts to some dynamic sections, or NULL if they are not
+     being used.  */
+  asection *srelbss;
+  asection *sdynbss;
+  asection *srelplt;
+  asection *srelplt2;
+  asection *sgotplt;
+  asection *splt;
+  asection *sstubs;
+  asection *sgot;
+
+  /* The master GOT information.  */
+  struct mips_got_info *got_info;
+
+  /* The size of the PLT header in bytes.  */
+  bfd_vma plt_header_size;
+
+  /* The size of a PLT entry in bytes.  */
+  bfd_vma plt_entry_size;
+
+  /* The number of functions that need a lazy-binding stub.  */
+  bfd_vma lazy_stub_count;
+
+  /* The size of a function stub entry in bytes.  */
+  bfd_vma function_stub_size;
+
+  /* The number of reserved entries at the beginning of the GOT.  */
+  unsigned int reserved_gotno;
+
+  /* The section used for mips_elf_la25_stub trampolines.
+     See the comment above that structure for details.  */
+  asection *strampoline;
+
+  /* A table of mips_elf_la25_stubs, indexed by (input_section, offset)
+     pairs.  */
+  htab_t la25_stubs;
+
+  /* A function FN (NAME, IS, OS) that creates a new input section
+     called NAME and links it to output section OS.  If IS is nonnull,
+     the new section should go immediately before it, otherwise it
+     should go at the (current) beginning of OS.
+
+     The function returns the new section on success, otherwise it
+     returns null.  */
+  asection *(*add_stub_section) (const char *, asection *, asection *);
+};
+
+/* Get the MIPS ELF linker hash table from a link_info structure.  */
+
+#define mips_elf_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == MIPS_ELF_DATA ? ((struct mips_elf_link_hash_table *) ((p)->hash)) : NULL)
+
+/* A structure used to communicate with htab_traverse callbacks.  */
+struct mips_htab_traverse_info
+{
+  /* The usual link-wide information.  */
+  struct bfd_link_info *info;
+  bfd *output_bfd;
+
+  /* Starts off FALSE and is set to TRUE if the link should be aborted.  */
+  bfd_boolean error;
+};
+
+#define TLS_RELOC_P(r_type) \
+  (r_type == R_MIPS_TLS_DTPMOD32		\
+   || r_type == R_MIPS_TLS_DTPMOD64		\
+   || r_type == R_MIPS_TLS_DTPREL32		\
+   || r_type == R_MIPS_TLS_DTPREL64		\
+   || r_type == R_MIPS_TLS_GD			\
+   || r_type == R_MIPS_TLS_LDM			\
+   || r_type == R_MIPS_TLS_DTPREL_HI16		\
+   || r_type == R_MIPS_TLS_DTPREL_LO16		\
+   || r_type == R_MIPS_TLS_GOTTPREL		\
+   || r_type == R_MIPS_TLS_TPREL32		\
+   || r_type == R_MIPS_TLS_TPREL64		\
+   || r_type == R_MIPS_TLS_TPREL_HI16		\
+   || r_type == R_MIPS_TLS_TPREL_LO16		\
+   || r_type == R_MICROMIPS_TLS_GD		\
+   || r_type == R_MICROMIPS_TLS_LDM		\
+   || r_type == R_MICROMIPS_TLS_DTPREL_HI16	\
+   || r_type == R_MICROMIPS_TLS_DTPREL_LO16	\
+   || r_type == R_MICROMIPS_TLS_GOTTPREL	\
+   || r_type == R_MICROMIPS_TLS_TPREL_HI16	\
+   || r_type == R_MICROMIPS_TLS_TPREL_LO16)
+
+/* Structure used to pass information to mips_elf_output_extsym.  */
+
+struct extsym_info
+{
+  bfd *abfd;
+  struct bfd_link_info *info;
+  struct ecoff_debug_info *debug;
+  const struct ecoff_debug_swap *swap;
+  bfd_boolean failed;
+};
+
+/* The names of the runtime procedure table symbols used on IRIX5.  */
+
+static const char * const mips_elf_dynsym_rtproc_names[] =
+{
+  "_procedure_table",
+  "_procedure_string_table",
+  "_procedure_table_size",
+  NULL
+};
+
+/* These structures are used to generate the .compact_rel section on
+   IRIX5.  */
+
+typedef struct
+{
+  unsigned long id1;		/* Always one?  */
+  unsigned long num;		/* Number of compact relocation entries.  */
+  unsigned long id2;		/* Always two?  */
+  unsigned long offset;		/* The file offset of the first relocation.  */
+  unsigned long reserved0;	/* Zero?  */
+  unsigned long reserved1;	/* Zero?  */
+} Elf32_compact_rel;
+
+typedef struct
+{
+  bfd_byte id1[4];
+  bfd_byte num[4];
+  bfd_byte id2[4];
+  bfd_byte offset[4];
+  bfd_byte reserved0[4];
+  bfd_byte reserved1[4];
+} Elf32_External_compact_rel;
+
+typedef struct
+{
+  unsigned int ctype : 1;	/* 1: long 0: short format. See below.  */
+  unsigned int rtype : 4;	/* Relocation types. See below.  */
+  unsigned int dist2to : 8;
+  unsigned int relvaddr : 19;	/* (VADDR - vaddr of the previous entry)/ 4 */
+  unsigned long konst;		/* KONST field. See below.  */
+  unsigned long vaddr;		/* VADDR to be relocated.  */
+} Elf32_crinfo;
+
+typedef struct
+{
+  unsigned int ctype : 1;	/* 1: long 0: short format. See below.  */
+  unsigned int rtype : 4;	/* Relocation types. See below.  */
+  unsigned int dist2to : 8;
+  unsigned int relvaddr : 19;	/* (VADDR - vaddr of the previous entry)/ 4 */
+  unsigned long konst;		/* KONST field. See below.  */
+} Elf32_crinfo2;
+
+typedef struct
+{
+  bfd_byte info[4];
+  bfd_byte konst[4];
+  bfd_byte vaddr[4];
+} Elf32_External_crinfo;
+
+typedef struct
+{
+  bfd_byte info[4];
+  bfd_byte konst[4];
+} Elf32_External_crinfo2;
+
+/* These are the constants used to swap the bitfields in a crinfo.  */
+
+#define CRINFO_CTYPE (0x1)
+#define CRINFO_CTYPE_SH (31)
+#define CRINFO_RTYPE (0xf)
+#define CRINFO_RTYPE_SH (27)
+#define CRINFO_DIST2TO (0xff)
+#define CRINFO_DIST2TO_SH (19)
+#define CRINFO_RELVADDR (0x7ffff)
+#define CRINFO_RELVADDR_SH (0)
+
+/* A compact relocation info has long (3 words) or short (2 words)
+   formats.  A short format doesn't have VADDR field and relvaddr
+   fields contains ((VADDR - vaddr of the previous entry) >> 2).  */
+#define CRF_MIPS_LONG			1
+#define CRF_MIPS_SHORT			0
+
+/* There are 4 types of compact relocation at least. The value KONST
+   has different meaning for each type:
+
+   (type)		(konst)
+   CT_MIPS_REL32	Address in data
+   CT_MIPS_WORD		Address in word (XXX)
+   CT_MIPS_GPHI_LO	GP - vaddr
+   CT_MIPS_JMPAD	Address to jump
+   */
+
+#define CRT_MIPS_REL32			0xa
+#define CRT_MIPS_WORD			0xb
+#define CRT_MIPS_GPHI_LO		0xc
+#define CRT_MIPS_JMPAD			0xd
+
+#define mips_elf_set_cr_format(x,format)	((x).ctype = (format))
+#define mips_elf_set_cr_type(x,type)		((x).rtype = (type))
+#define mips_elf_set_cr_dist2to(x,v)		((x).dist2to = (v))
+#define mips_elf_set_cr_relvaddr(x,d)		((x).relvaddr = (d)<<2)
+
+/* The structure of the runtime procedure descriptor created by the
+   loader for use by the static exception system.  */
+
+typedef struct runtime_pdr {
+	bfd_vma	adr;		/* Memory address of start of procedure.  */
+	long	regmask;	/* Save register mask.  */
+	long	regoffset;	/* Save register offset.  */
+	long	fregmask;	/* Save floating point register mask.  */
+	long	fregoffset;	/* Save floating point register offset.  */
+	long	frameoffset;	/* Frame size.  */
+	short	framereg;	/* Frame pointer register.  */
+	short	pcreg;		/* Offset or reg of return pc.  */
+	long	irpss;		/* Index into the runtime string table.  */
+	long	reserved;
+	struct exception_info *exception_info;/* Pointer to exception array.  */
+} RPDR, *pRPDR;
+#define cbRPDR sizeof (RPDR)
+#define rpdNil ((pRPDR) 0)
+
+static struct mips_got_entry *mips_elf_create_local_got_entry
+  (bfd *, struct bfd_link_info *, bfd *, bfd_vma, unsigned long,
+   struct mips_elf_link_hash_entry *, int);
+static bfd_boolean mips_elf_sort_hash_table_f
+  (struct mips_elf_link_hash_entry *, void *);
+static bfd_vma mips_elf_high
+  (bfd_vma);
+static bfd_boolean mips_elf_create_dynamic_relocation
+  (bfd *, struct bfd_link_info *, const Elf_Internal_Rela *,
+   struct mips_elf_link_hash_entry *, asection *, bfd_vma,
+   bfd_vma *, asection *);
+static hashval_t mips_elf_got_entry_hash
+  (const void *);
+static bfd_vma mips_elf_adjust_gp
+  (bfd *, struct mips_got_info *, bfd *);
+static struct mips_got_info *mips_elf_got_for_ibfd
+  (struct mips_got_info *, bfd *);
+
+/* This will be used when we sort the dynamic relocation records.  */
+static bfd *reldyn_sorting_bfd;
+
+/* True if ABFD is for CPUs with load interlocking that include
+   non-MIPS1 CPUs and R3900.  */
+#define LOAD_INTERLOCKS_P(abfd) \
+  (   ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) != E_MIPS_ARCH_1) \
+   || ((elf_elfheader (abfd)->e_flags & EF_MIPS_MACH) == E_MIPS_MACH_3900))
+
+/* True if ABFD is for CPUs that are faster if JAL is converted to BAL.
+   This should be safe for all architectures.  We enable this predicate
+   for RM9000 for now.  */
+#define JAL_TO_BAL_P(abfd) \
+  ((elf_elfheader (abfd)->e_flags & EF_MIPS_MACH) == E_MIPS_MACH_9000)
+
+/* True if ABFD is for CPUs that are faster if JALR is converted to BAL.
+   This should be safe for all architectures.  We enable this predicate for
+   all CPUs.  */
+#define JALR_TO_BAL_P(abfd) 1
+
+/* True if ABFD is for CPUs that are faster if JR is converted to B.
+   This should be safe for all architectures.  We enable this predicate for
+   all CPUs.  */
+#define JR_TO_B_P(abfd) 1
+
+/* True if ABFD is a PIC object.  */
+#define PIC_OBJECT_P(abfd) \
+  ((elf_elfheader (abfd)->e_flags & EF_MIPS_PIC) != 0)
+
+/* Nonzero if ABFD is using the N32 ABI.  */
+#define ABI_N32_P(abfd) \
+  ((elf_elfheader (abfd)->e_flags & EF_MIPS_ABI2) != 0)
+
+/* Nonzero if ABFD is using the N64 ABI.  */
+#define ABI_64_P(abfd) \
+  (get_elf_backend_data (abfd)->s->elfclass == ELFCLASS64)
+
+/* Nonzero if ABFD is using NewABI conventions.  */
+#define NEWABI_P(abfd) (ABI_N32_P (abfd) || ABI_64_P (abfd))
+
+/* The IRIX compatibility level we are striving for.  */
+#define IRIX_COMPAT(abfd) \
+  (get_elf_backend_data (abfd)->elf_backend_mips_irix_compat (abfd))
+
+/* Whether we are trying to be compatible with IRIX at all.  */
+#define SGI_COMPAT(abfd) \
+  (IRIX_COMPAT (abfd) != ict_none)
+
+/* The name of the options section.  */
+#define MIPS_ELF_OPTIONS_SECTION_NAME(abfd) \
+  (NEWABI_P (abfd) ? ".MIPS.options" : ".options")
+
+/* True if NAME is the recognized name of any SHT_MIPS_OPTIONS section.
+   Some IRIX system files do not use MIPS_ELF_OPTIONS_SECTION_NAME.  */
+#define MIPS_ELF_OPTIONS_SECTION_NAME_P(NAME) \
+  (strcmp (NAME, ".MIPS.options") == 0 || strcmp (NAME, ".options") == 0)
+
+/* Whether the section is readonly.  */
+#define MIPS_ELF_READONLY_SECTION(sec) \
+  ((sec->flags & (SEC_ALLOC | SEC_LOAD | SEC_READONLY))		\
+   == (SEC_ALLOC | SEC_LOAD | SEC_READONLY))
+
+/* The name of the stub section.  */
+#define MIPS_ELF_STUB_SECTION_NAME(abfd) ".MIPS.stubs"
+
+/* The size of an external REL relocation.  */
+#define MIPS_ELF_REL_SIZE(abfd) \
+  (get_elf_backend_data (abfd)->s->sizeof_rel)
+
+/* The size of an external RELA relocation.  */
+#define MIPS_ELF_RELA_SIZE(abfd) \
+  (get_elf_backend_data (abfd)->s->sizeof_rela)
+
+/* The size of an external dynamic table entry.  */
+#define MIPS_ELF_DYN_SIZE(abfd) \
+  (get_elf_backend_data (abfd)->s->sizeof_dyn)
+
+/* The size of a GOT entry.  */
+#define MIPS_ELF_GOT_SIZE(abfd) \
+  (get_elf_backend_data (abfd)->s->arch_size / 8)
+
+/* The size of a symbol-table entry.  */
+#define MIPS_ELF_SYM_SIZE(abfd) \
+  (get_elf_backend_data (abfd)->s->sizeof_sym)
+
+/* The default alignment for sections, as a power of two.  */
+#define MIPS_ELF_LOG_FILE_ALIGN(abfd)				\
+  (get_elf_backend_data (abfd)->s->log_file_align)
+
+/* Get word-sized data.  */
+#define MIPS_ELF_GET_WORD(abfd, ptr) \
+  (ABI_64_P (abfd) ? bfd_get_64 (abfd, ptr) : bfd_get_32 (abfd, ptr))
+
+/* Put out word-sized data.  */
+#define MIPS_ELF_PUT_WORD(abfd, val, ptr)	\
+  (ABI_64_P (abfd) 				\
+   ? bfd_put_64 (abfd, val, ptr) 		\
+   : bfd_put_32 (abfd, val, ptr))
+
+/* The opcode for word-sized loads (LW or LD).  */
+#define MIPS_ELF_LOAD_WORD(abfd) \
+  (ABI_64_P (abfd) ? 0xdc000000 : 0x8c000000)
+
+/* Add a dynamic symbol table-entry.  */
+#define MIPS_ELF_ADD_DYNAMIC_ENTRY(info, tag, val)	\
+  _bfd_elf_add_dynamic_entry (info, tag, val)
+
+#define MIPS_ELF_RTYPE_TO_HOWTO(abfd, rtype, rela)			\
+  (get_elf_backend_data (abfd)->elf_backend_mips_rtype_to_howto (rtype, rela))
+
+/* The name of the dynamic relocation section.  */
+#define MIPS_ELF_REL_DYN_NAME(INFO) \
+  (mips_elf_hash_table (INFO)->is_vxworks ? ".rela.dyn" : ".rel.dyn")
+
+/* In case we're on a 32-bit machine, construct a 64-bit "-1" value
+   from smaller values.  Start with zero, widen, *then* decrement.  */
+#define MINUS_ONE	(((bfd_vma)0) - 1)
+#define MINUS_TWO	(((bfd_vma)0) - 2)
+
+/* The value to write into got[1] for SVR4 targets, to identify it is
+   a GNU object.  The dynamic linker can then use got[1] to store the
+   module pointer.  */
+#define MIPS_ELF_GNU_GOT1_MASK(abfd) \
+  ((bfd_vma) 1 << (ABI_64_P (abfd) ? 63 : 31))
+
+/* The offset of $gp from the beginning of the .got section.  */
+#define ELF_MIPS_GP_OFFSET(INFO) \
+  (mips_elf_hash_table (INFO)->is_vxworks ? 0x0 : 0x7ff0)
+
+/* The maximum size of the GOT for it to be addressable using 16-bit
+   offsets from $gp.  */
+#define MIPS_ELF_GOT_MAX_SIZE(INFO) (ELF_MIPS_GP_OFFSET (INFO) + 0x7fff)
+
+/* Instructions which appear in a stub.  */
+#define STUB_LW(abfd)							\
+  ((ABI_64_P (abfd)							\
+    ? 0xdf998010				/* ld t9,0x8010(gp) */	\
+    : 0x8f998010))              		/* lw t9,0x8010(gp) */
+#define STUB_MOVE(abfd)							\
+   ((ABI_64_P (abfd)							\
+     ? 0x03e0782d				/* daddu t7,ra */	\
+     : 0x03e07821))				/* addu t7,ra */
+#define STUB_LUI(VAL) (0x3c180000 + (VAL))	/* lui t8,VAL */
+#define STUB_JALR 0x0320f809			/* jalr t9,ra */
+#define STUB_ORI(VAL) (0x37180000 + (VAL))	/* ori t8,t8,VAL */
+#define STUB_LI16U(VAL) (0x34180000 + (VAL))	/* ori t8,zero,VAL unsigned */
+#define STUB_LI16S(abfd, VAL)						\
+   ((ABI_64_P (abfd)							\
+    ? (0x64180000 + (VAL))	/* daddiu t8,zero,VAL sign extended */	\
+    : (0x24180000 + (VAL))))	/* addiu t8,zero,VAL sign extended */
+
+#define MIPS_FUNCTION_STUB_NORMAL_SIZE 16
+#define MIPS_FUNCTION_STUB_BIG_SIZE 20
+
+/* The name of the dynamic interpreter.  This is put in the .interp
+   section.  */
+
+#define ELF_DYNAMIC_INTERPRETER(abfd) 		\
+   (ABI_N32_P (abfd) ? "/usr/lib32/libc.so.1" 	\
+    : ABI_64_P (abfd) ? "/usr/lib64/libc.so.1" 	\
+    : "/usr/lib/libc.so.1")
+
+#ifdef BFD64
+#define MNAME(bfd,pre,pos) \
+  (ABI_64_P (bfd) ? CONCAT4 (pre,64,_,pos) : CONCAT4 (pre,32,_,pos))
+#define ELF_R_SYM(bfd, i)					\
+  (ABI_64_P (bfd) ? ELF64_R_SYM (i) : ELF32_R_SYM (i))
+#define ELF_R_TYPE(bfd, i)					\
+  (ABI_64_P (bfd) ? ELF64_MIPS_R_TYPE (i) : ELF32_R_TYPE (i))
+#define ELF_R_INFO(bfd, s, t)					\
+  (ABI_64_P (bfd) ? ELF64_R_INFO (s, t) : ELF32_R_INFO (s, t))
+#else
+#define MNAME(bfd,pre,pos) CONCAT4 (pre,32,_,pos)
+#define ELF_R_SYM(bfd, i)					\
+  (ELF32_R_SYM (i))
+#define ELF_R_TYPE(bfd, i)					\
+  (ELF32_R_TYPE (i))
+#define ELF_R_INFO(bfd, s, t)					\
+  (ELF32_R_INFO (s, t))
+#endif
+
+  /* The mips16 compiler uses a couple of special sections to handle
+     floating point arguments.
+
+     Section names that look like .mips16.fn.FNNAME contain stubs that
+     copy floating point arguments from the fp regs to the gp regs and
+     then jump to FNNAME.  If any 32 bit function calls FNNAME, the
+     call should be redirected to the stub instead.  If no 32 bit
+     function calls FNNAME, the stub should be discarded.  We need to
+     consider any reference to the function, not just a call, because
+     if the address of the function is taken we will need the stub,
+     since the address might be passed to a 32 bit function.
+
+     Section names that look like .mips16.call.FNNAME contain stubs
+     that copy floating point arguments from the gp regs to the fp
+     regs and then jump to FNNAME.  If FNNAME is a 32 bit function,
+     then any 16 bit function that calls FNNAME should be redirected
+     to the stub instead.  If FNNAME is not a 32 bit function, the
+     stub should be discarded.
+
+     .mips16.call.fp.FNNAME sections are similar, but contain stubs
+     which call FNNAME and then copy the return value from the fp regs
+     to the gp regs.  These stubs store the return value in $18 while
+     calling FNNAME; any function which might call one of these stubs
+     must arrange to save $18 around the call.  (This case is not
+     needed for 32 bit functions that call 16 bit functions, because
+     16 bit functions always return floating point values in both
+     $f0/$f1 and $2/$3.)
+
+     Note that in all cases FNNAME might be defined statically.
+     Therefore, FNNAME is not used literally.  Instead, the relocation
+     information will indicate which symbol the section is for.
+
+     We record any stubs that we find in the symbol table.  */
+
+#define FN_STUB ".mips16.fn."
+#define CALL_STUB ".mips16.call."
+#define CALL_FP_STUB ".mips16.call.fp."
+
+#define FN_STUB_P(name) CONST_STRNEQ (name, FN_STUB)
+#define CALL_STUB_P(name) CONST_STRNEQ (name, CALL_STUB)
+#define CALL_FP_STUB_P(name) CONST_STRNEQ (name, CALL_FP_STUB)
+
+/* The format of the first PLT entry in an O32 executable.  */
+static const bfd_vma mips_o32_exec_plt0_entry[] =
+{
+  0x3c1c0000,	/* lui $28, %hi(&GOTPLT[0])				*/
+  0x8f990000,	/* lw $25, %lo(&GOTPLT[0])($28)				*/
+  0x279c0000,	/* addiu $28, $28, %lo(&GOTPLT[0])			*/
+  0x031cc023,	/* subu $24, $24, $28					*/
+  0x03e07821,	/* move $15, $31	# 32-bit move (addu)		*/
+  0x0018c082,	/* srl $24, $24, 2					*/
+  0x0320f809,	/* jalr $25						*/
+  0x2718fffe	/* subu $24, $24, 2					*/
+};
+
+/* The format of the first PLT entry in an N32 executable.  Different
+   because gp ($28) is not available; we use t2 ($14) instead.  */
+static const bfd_vma mips_n32_exec_plt0_entry[] =
+{
+  0x3c0e0000,	/* lui $14, %hi(&GOTPLT[0])				*/
+  0x8dd90000,	/* lw $25, %lo(&GOTPLT[0])($14)				*/
+  0x25ce0000,	/* addiu $14, $14, %lo(&GOTPLT[0])			*/
+  0x030ec023,	/* subu $24, $24, $14					*/
+  0x03e07821,	/* move $15, $31	# 32-bit move (addu)		*/
+  0x0018c082,	/* srl $24, $24, 2					*/
+  0x0320f809,	/* jalr $25						*/
+  0x2718fffe	/* subu $24, $24, 2					*/
+};
+
+/* The format of the first PLT entry in an N64 executable.  Different
+   from N32 because of the increased size of GOT entries.  */
+static const bfd_vma mips_n64_exec_plt0_entry[] =
+{
+  0x3c0e0000,	/* lui $14, %hi(&GOTPLT[0])				*/
+  0xddd90000,	/* ld $25, %lo(&GOTPLT[0])($14)				*/
+  0x25ce0000,	/* addiu $14, $14, %lo(&GOTPLT[0])			*/
+  0x030ec023,	/* subu $24, $24, $14					*/
+  0x03e0782d,	/* move $15, $31	# 64-bit move (daddu)		*/
+  0x0018c0c2,	/* srl $24, $24, 3					*/
+  0x0320f809,	/* jalr $25						*/
+  0x2718fffe	/* subu $24, $24, 2					*/
+};
+
+/* The format of subsequent PLT entries.  */
+static const bfd_vma mips_exec_plt_entry[] =
+{
+  0x3c0f0000,	/* lui $15, %hi(.got.plt entry)			*/
+  0x01f90000,	/* l[wd] $25, %lo(.got.plt entry)($15)		*/
+  0x25f80000,	/* addiu $24, $15, %lo(.got.plt entry)		*/
+  0x03200008	/* jr $25					*/
+};
+
+/* The format of the first PLT entry in a VxWorks executable.  */
+static const bfd_vma mips_vxworks_exec_plt0_entry[] =
+{
+  0x3c190000,	/* lui t9, %hi(_GLOBAL_OFFSET_TABLE_)		*/
+  0x27390000,	/* addiu t9, t9, %lo(_GLOBAL_OFFSET_TABLE_)	*/
+  0x8f390008,	/* lw t9, 8(t9)					*/
+  0x00000000,	/* nop						*/
+  0x03200008,	/* jr t9					*/
+  0x00000000	/* nop						*/
+};
+
+/* The format of subsequent PLT entries.  */
+static const bfd_vma mips_vxworks_exec_plt_entry[] =
+{
+  0x10000000,	/* b .PLT_resolver			*/
+  0x24180000,	/* li t8, <pltindex>			*/
+  0x3c190000,	/* lui t9, %hi(<.got.plt slot>)		*/
+  0x27390000,	/* addiu t9, t9, %lo(<.got.plt slot>)	*/
+  0x8f390000,	/* lw t9, 0(t9)				*/
+  0x00000000,	/* nop					*/
+  0x03200008,	/* jr t9				*/
+  0x00000000	/* nop					*/
+};
+
+/* The format of the first PLT entry in a VxWorks shared object.  */
+static const bfd_vma mips_vxworks_shared_plt0_entry[] =
+{
+  0x8f990008,	/* lw t9, 8(gp)		*/
+  0x00000000,	/* nop			*/
+  0x03200008,	/* jr t9		*/
+  0x00000000,	/* nop			*/
+  0x00000000,	/* nop			*/
+  0x00000000	/* nop			*/
+};
+
+/* The format of subsequent PLT entries.  */
+static const bfd_vma mips_vxworks_shared_plt_entry[] =
+{
+  0x10000000,	/* b .PLT_resolver	*/
+  0x24180000	/* li t8, <pltindex>	*/
+};
+
+/* Look up an entry in a MIPS ELF linker hash table.  */
+
+#define mips_elf_link_hash_lookup(table, string, create, copy, follow)	\
+  ((struct mips_elf_link_hash_entry *)					\
+   elf_link_hash_lookup (&(table)->root, (string), (create),		\
+			 (copy), (follow)))
+
+/* Traverse a MIPS ELF linker hash table.  */
+
+#define mips_elf_link_hash_traverse(table, func, info)			\
+  (elf_link_hash_traverse						\
+   (&(table)->root,							\
+    (bfd_boolean (*) (struct elf_link_hash_entry *, void *)) (func),	\
+    (info)))
+
+/* Find the base offsets for thread-local storage in this object,
+   for GD/LD and IE/LE respectively.  */
+
+#define TP_OFFSET 0x7000
+#define DTP_OFFSET 0x8000
+
+static bfd_vma
+dtprel_base (struct bfd_link_info *info)
+{
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (elf_hash_table (info)->tls_sec == NULL)
+    return 0;
+  return elf_hash_table (info)->tls_sec->vma + DTP_OFFSET;
+}
+
+static bfd_vma
+tprel_base (struct bfd_link_info *info)
+{
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (elf_hash_table (info)->tls_sec == NULL)
+    return 0;
+  return elf_hash_table (info)->tls_sec->vma + TP_OFFSET;
+}
+
+/* Create an entry in a MIPS ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+mips_elf_link_hash_newfunc (struct bfd_hash_entry *entry,
+			    struct bfd_hash_table *table, const char *string)
+{
+  struct mips_elf_link_hash_entry *ret =
+    (struct mips_elf_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = bfd_hash_allocate (table, sizeof (struct mips_elf_link_hash_entry));
+  if (ret == NULL)
+    return (struct bfd_hash_entry *) ret;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct mips_elf_link_hash_entry *)
+	 _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
+				     table, string));
+  if (ret != NULL)
+    {
+      /* Set local fields.  */
+      memset (&ret->esym, 0, sizeof (EXTR));
+      /* We use -2 as a marker to indicate that the information has
+	 not been set.  -1 means there is no associated ifd.  */
+      ret->esym.ifd = -2;
+      ret->la25_stub = 0;
+      ret->possibly_dynamic_relocs = 0;
+      ret->fn_stub = NULL;
+      ret->call_stub = NULL;
+      ret->call_fp_stub = NULL;
+      ret->tls_type = GOT_NORMAL;
+      ret->global_got_area = GGA_NONE;
+      ret->got_only_for_calls = TRUE;
+      ret->readonly_reloc = FALSE;
+      ret->has_static_relocs = FALSE;
+      ret->no_fn_stub = FALSE;
+      ret->need_fn_stub = FALSE;
+      ret->has_nonpic_branches = FALSE;
+      ret->needs_lazy_stub = FALSE;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+bfd_boolean
+_bfd_mips_elf_new_section_hook (bfd *abfd, asection *sec)
+{
+  if (!sec->used_by_bfd)
+    {
+      struct _mips_elf_section_data *sdata;
+      bfd_size_type amt = sizeof (*sdata);
+
+      sdata = bfd_zalloc (abfd, amt);
+      if (sdata == NULL)
+	return FALSE;
+      sec->used_by_bfd = sdata;
+    }
+
+  return _bfd_elf_new_section_hook (abfd, sec);
+}
+
+/* Read ECOFF debugging information from a .mdebug section into a
+   ecoff_debug_info structure.  */
+
+bfd_boolean
+_bfd_mips_elf_read_ecoff_info (bfd *abfd, asection *section,
+			       struct ecoff_debug_info *debug)
+{
+  HDRR *symhdr;
+  const struct ecoff_debug_swap *swap;
+  char *ext_hdr;
+
+  swap = get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;
+  memset (debug, 0, sizeof (*debug));
+
+  ext_hdr = bfd_malloc (swap->external_hdr_size);
+  if (ext_hdr == NULL && swap->external_hdr_size != 0)
+    goto error_return;
+
+  if (! bfd_get_section_contents (abfd, section, ext_hdr, 0,
+				  swap->external_hdr_size))
+    goto error_return;
+
+  symhdr = &debug->symbolic_header;
+  (*swap->swap_hdr_in) (abfd, ext_hdr, symhdr);
+
+  /* The symbolic header contains absolute file offsets and sizes to
+     read.  */
+#define READ(ptr, offset, count, size, type)				\
+  if (symhdr->count == 0)						\
+    debug->ptr = NULL;							\
+  else									\
+    {									\
+      bfd_size_type amt = (bfd_size_type) size * symhdr->count;		\
+      debug->ptr = bfd_malloc (amt);					\
+      if (debug->ptr == NULL)						\
+	goto error_return;						\
+      if (bfd_seek (abfd, symhdr->offset, SEEK_SET) != 0		\
+	  || bfd_bread (debug->ptr, amt, abfd) != amt)			\
+	goto error_return;						\
+    }
+
+  READ (line, cbLineOffset, cbLine, sizeof (unsigned char), unsigned char *);
+  READ (external_dnr, cbDnOffset, idnMax, swap->external_dnr_size, void *);
+  READ (external_pdr, cbPdOffset, ipdMax, swap->external_pdr_size, void *);
+  READ (external_sym, cbSymOffset, isymMax, swap->external_sym_size, void *);
+  READ (external_opt, cbOptOffset, ioptMax, swap->external_opt_size, void *);
+  READ (external_aux, cbAuxOffset, iauxMax, sizeof (union aux_ext),
+	union aux_ext *);
+  READ (ss, cbSsOffset, issMax, sizeof (char), char *);
+  READ (ssext, cbSsExtOffset, issExtMax, sizeof (char), char *);
+  READ (external_fdr, cbFdOffset, ifdMax, swap->external_fdr_size, void *);
+  READ (external_rfd, cbRfdOffset, crfd, swap->external_rfd_size, void *);
+  READ (external_ext, cbExtOffset, iextMax, swap->external_ext_size, void *);
+#undef READ
+
+  debug->fdr = NULL;
+
+  return TRUE;
+
+ error_return:
+  if (ext_hdr != NULL)
+    free (ext_hdr);
+  if (debug->line != NULL)
+    free (debug->line);
+  if (debug->external_dnr != NULL)
+    free (debug->external_dnr);
+  if (debug->external_pdr != NULL)
+    free (debug->external_pdr);
+  if (debug->external_sym != NULL)
+    free (debug->external_sym);
+  if (debug->external_opt != NULL)
+    free (debug->external_opt);
+  if (debug->external_aux != NULL)
+    free (debug->external_aux);
+  if (debug->ss != NULL)
+    free (debug->ss);
+  if (debug->ssext != NULL)
+    free (debug->ssext);
+  if (debug->external_fdr != NULL)
+    free (debug->external_fdr);
+  if (debug->external_rfd != NULL)
+    free (debug->external_rfd);
+  if (debug->external_ext != NULL)
+    free (debug->external_ext);
+  return FALSE;
+}
+
+/* Swap RPDR (runtime procedure table entry) for output.  */
+
+static void
+ecoff_swap_rpdr_out (bfd *abfd, const RPDR *in, struct rpdr_ext *ex)
+{
+  H_PUT_S32 (abfd, in->adr, ex->p_adr);
+  H_PUT_32 (abfd, in->regmask, ex->p_regmask);
+  H_PUT_32 (abfd, in->regoffset, ex->p_regoffset);
+  H_PUT_32 (abfd, in->fregmask, ex->p_fregmask);
+  H_PUT_32 (abfd, in->fregoffset, ex->p_fregoffset);
+  H_PUT_32 (abfd, in->frameoffset, ex->p_frameoffset);
+
+  H_PUT_16 (abfd, in->framereg, ex->p_framereg);
+  H_PUT_16 (abfd, in->pcreg, ex->p_pcreg);
+
+  H_PUT_32 (abfd, in->irpss, ex->p_irpss);
+}
+
+/* Create a runtime procedure table from the .mdebug section.  */
+
+static bfd_boolean
+mips_elf_create_procedure_table (void *handle, bfd *abfd,
+				 struct bfd_link_info *info, asection *s,
+				 struct ecoff_debug_info *debug)
+{
+  const struct ecoff_debug_swap *swap;
+  HDRR *hdr = &debug->symbolic_header;
+  RPDR *rpdr, *rp;
+  struct rpdr_ext *erp;
+  void *rtproc;
+  struct pdr_ext *epdr;
+  struct sym_ext *esym;
+  char *ss, **sv;
+  char *str;
+  bfd_size_type size;
+  bfd_size_type count;
+  unsigned long sindex;
+  unsigned long i;
+  PDR pdr;
+  SYMR sym;
+  const char *no_name_func = _("static procedure (no name)");
+
+  epdr = NULL;
+  rpdr = NULL;
+  esym = NULL;
+  ss = NULL;
+  sv = NULL;
+
+  swap = get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;
+
+  sindex = strlen (no_name_func) + 1;
+  count = hdr->ipdMax;
+  if (count > 0)
+    {
+      size = swap->external_pdr_size;
+
+      epdr = bfd_malloc (size * count);
+      if (epdr == NULL)
+	goto error_return;
+
+      if (! _bfd_ecoff_get_accumulated_pdr (handle, (bfd_byte *) epdr))
+	goto error_return;
+
+      size = sizeof (RPDR);
+      rp = rpdr = bfd_malloc (size * count);
+      if (rpdr == NULL)
+	goto error_return;
+
+      size = sizeof (char *);
+      sv = bfd_malloc (size * count);
+      if (sv == NULL)
+	goto error_return;
+
+      count = hdr->isymMax;
+      size = swap->external_sym_size;
+      esym = bfd_malloc (size * count);
+      if (esym == NULL)
+	goto error_return;
+
+      if (! _bfd_ecoff_get_accumulated_sym (handle, (bfd_byte *) esym))
+	goto error_return;
+
+      count = hdr->issMax;
+      ss = bfd_malloc (count);
+      if (ss == NULL)
+	goto error_return;
+      if (! _bfd_ecoff_get_accumulated_ss (handle, (bfd_byte *) ss))
+	goto error_return;
+
+      count = hdr->ipdMax;
+      for (i = 0; i < (unsigned long) count; i++, rp++)
+	{
+	  (*swap->swap_pdr_in) (abfd, epdr + i, &pdr);
+	  (*swap->swap_sym_in) (abfd, &esym[pdr.isym], &sym);
+	  rp->adr = sym.value;
+	  rp->regmask = pdr.regmask;
+	  rp->regoffset = pdr.regoffset;
+	  rp->fregmask = pdr.fregmask;
+	  rp->fregoffset = pdr.fregoffset;
+	  rp->frameoffset = pdr.frameoffset;
+	  rp->framereg = pdr.framereg;
+	  rp->pcreg = pdr.pcreg;
+	  rp->irpss = sindex;
+	  sv[i] = ss + sym.iss;
+	  sindex += strlen (sv[i]) + 1;
+	}
+    }
+
+  size = sizeof (struct rpdr_ext) * (count + 2) + sindex;
+  size = BFD_ALIGN (size, 16);
+  rtproc = bfd_alloc (abfd, size);
+  if (rtproc == NULL)
+    {
+      mips_elf_hash_table (info)->procedure_count = 0;
+      goto error_return;
+    }
+
+  mips_elf_hash_table (info)->procedure_count = count + 2;
+
+  erp = rtproc;
+  memset (erp, 0, sizeof (struct rpdr_ext));
+  erp++;
+  str = (char *) rtproc + sizeof (struct rpdr_ext) * (count + 2);
+  strcpy (str, no_name_func);
+  str += strlen (no_name_func) + 1;
+  for (i = 0; i < count; i++)
+    {
+      ecoff_swap_rpdr_out (abfd, rpdr + i, erp + i);
+      strcpy (str, sv[i]);
+      str += strlen (sv[i]) + 1;
+    }
+  H_PUT_S32 (abfd, -1, (erp + count)->p_adr);
+
+  /* Set the size and contents of .rtproc section.  */
+  s->size = size;
+  s->contents = rtproc;
+
+  /* Skip this section later on (I don't think this currently
+     matters, but someday it might).  */
+  s->map_head.link_order = NULL;
+
+  if (epdr != NULL)
+    free (epdr);
+  if (rpdr != NULL)
+    free (rpdr);
+  if (esym != NULL)
+    free (esym);
+  if (ss != NULL)
+    free (ss);
+  if (sv != NULL)
+    free (sv);
+
+  return TRUE;
+
+ error_return:
+  if (epdr != NULL)
+    free (epdr);
+  if (rpdr != NULL)
+    free (rpdr);
+  if (esym != NULL)
+    free (esym);
+  if (ss != NULL)
+    free (ss);
+  if (sv != NULL)
+    free (sv);
+  return FALSE;
+}
+
+/* We're going to create a stub for H.  Create a symbol for the stub's
+   value and size, to help make the disassembly easier to read.  */
+
+static bfd_boolean
+mips_elf_create_stub_symbol (struct bfd_link_info *info,
+			     struct mips_elf_link_hash_entry *h,
+			     const char *prefix, asection *s, bfd_vma value,
+			     bfd_vma size)
+{
+  struct bfd_link_hash_entry *bh;
+  struct elf_link_hash_entry *elfh;
+  const char *name;
+
+  if (ELF_ST_IS_MICROMIPS (h->root.other))
+    value |= 1;
+
+  /* Create a new symbol.  */
+  name = ACONCAT ((prefix, h->root.root.root.string, NULL));
+  bh = NULL;
+  if (!_bfd_generic_link_add_one_symbol (info, s->owner, name,
+					 BSF_LOCAL, s, value, NULL,
+					 TRUE, FALSE, &bh))
+    return FALSE;
+
+  /* Make it a local function.  */
+  elfh = (struct elf_link_hash_entry *) bh;
+  elfh->type = ELF_ST_INFO (STB_LOCAL, STT_FUNC);
+  elfh->size = size;
+  elfh->forced_local = 1;
+  return TRUE;
+}
+
+/* We're about to redefine H.  Create a symbol to represent H's
+   current value and size, to help make the disassembly easier
+   to read.  */
+
+static bfd_boolean
+mips_elf_create_shadow_symbol (struct bfd_link_info *info,
+			       struct mips_elf_link_hash_entry *h,
+			       const char *prefix)
+{
+  struct bfd_link_hash_entry *bh;
+  struct elf_link_hash_entry *elfh;
+  const char *name;
+  asection *s;
+  bfd_vma value;
+
+  /* Read the symbol's value.  */
+  BFD_ASSERT (h->root.root.type == bfd_link_hash_defined
+	      || h->root.root.type == bfd_link_hash_defweak);
+  s = h->root.root.u.def.section;
+  value = h->root.root.u.def.value;
+
+  /* Create a new symbol.  */
+  name = ACONCAT ((prefix, h->root.root.root.string, NULL));
+  bh = NULL;
+  if (!_bfd_generic_link_add_one_symbol (info, s->owner, name,
+					 BSF_LOCAL, s, value, NULL,
+					 TRUE, FALSE, &bh))
+    return FALSE;
+
+  /* Make it local and copy the other attributes from H.  */
+  elfh = (struct elf_link_hash_entry *) bh;
+  elfh->type = ELF_ST_INFO (STB_LOCAL, ELF_ST_TYPE (h->root.type));
+  elfh->other = h->root.other;
+  elfh->size = h->root.size;
+  elfh->forced_local = 1;
+  return TRUE;
+}
+
+/* Return TRUE if relocations in SECTION can refer directly to a MIPS16
+   function rather than to a hard-float stub.  */
+
+static bfd_boolean
+section_allows_mips16_refs_p (asection *section)
+{
+  const char *name;
+
+  name = bfd_get_section_name (section->owner, section);
+  return (FN_STUB_P (name)
+	  || CALL_STUB_P (name)
+	  || CALL_FP_STUB_P (name)
+	  || strcmp (name, ".pdr") == 0);
+}
+
+/* [RELOCS, RELEND) are the relocations against SEC, which is a MIPS16
+   stub section of some kind.  Return the R_SYMNDX of the target
+   function, or 0 if we can't decide which function that is.  */
+
+static unsigned long
+mips16_stub_symndx (asection *sec ATTRIBUTE_UNUSED,
+		    const Elf_Internal_Rela *relocs,
+		    const Elf_Internal_Rela *relend)
+{
+  const Elf_Internal_Rela *rel;
+
+  /* Trust the first R_MIPS_NONE relocation, if any.  */
+  for (rel = relocs; rel < relend; rel++)
+    if (ELF_R_TYPE (sec->owner, rel->r_info) == R_MIPS_NONE)
+      return ELF_R_SYM (sec->owner, rel->r_info);
+
+  /* Otherwise trust the first relocation, whatever its kind.  This is
+     the traditional behavior.  */
+  if (relocs < relend)
+    return ELF_R_SYM (sec->owner, relocs->r_info);
+
+  return 0;
+}
+
+/* Check the mips16 stubs for a particular symbol, and see if we can
+   discard them.  */
+
+static void
+mips_elf_check_mips16_stubs (struct bfd_link_info *info,
+			     struct mips_elf_link_hash_entry *h)
+{
+  /* Dynamic symbols must use the standard call interface, in case other
+     objects try to call them.  */
+  if (h->fn_stub != NULL
+      && h->root.dynindx != -1)
+    {
+      mips_elf_create_shadow_symbol (info, h, ".mips16.");
+      h->need_fn_stub = TRUE;
+    }
+
+  if (h->fn_stub != NULL
+      && ! h->need_fn_stub)
+    {
+      /* We don't need the fn_stub; the only references to this symbol
+         are 16 bit calls.  Clobber the size to 0 to prevent it from
+         being included in the link.  */
+      h->fn_stub->size = 0;
+      h->fn_stub->flags &= ~SEC_RELOC;
+      h->fn_stub->reloc_count = 0;
+      h->fn_stub->flags |= SEC_EXCLUDE;
+    }
+
+  if (h->call_stub != NULL
+      && ELF_ST_IS_MIPS16 (h->root.other))
+    {
+      /* We don't need the call_stub; this is a 16 bit function, so
+         calls from other 16 bit functions are OK.  Clobber the size
+         to 0 to prevent it from being included in the link.  */
+      h->call_stub->size = 0;
+      h->call_stub->flags &= ~SEC_RELOC;
+      h->call_stub->reloc_count = 0;
+      h->call_stub->flags |= SEC_EXCLUDE;
+    }
+
+  if (h->call_fp_stub != NULL
+      && ELF_ST_IS_MIPS16 (h->root.other))
+    {
+      /* We don't need the call_stub; this is a 16 bit function, so
+         calls from other 16 bit functions are OK.  Clobber the size
+         to 0 to prevent it from being included in the link.  */
+      h->call_fp_stub->size = 0;
+      h->call_fp_stub->flags &= ~SEC_RELOC;
+      h->call_fp_stub->reloc_count = 0;
+      h->call_fp_stub->flags |= SEC_EXCLUDE;
+    }
+}
+
+/* Hashtable callbacks for mips_elf_la25_stubs.  */
+
+static hashval_t
+mips_elf_la25_stub_hash (const void *entry_)
+{
+  const struct mips_elf_la25_stub *entry;
+
+  entry = (struct mips_elf_la25_stub *) entry_;
+  return entry->h->root.root.u.def.section->id
+    + entry->h->root.root.u.def.value;
+}
+
+static int
+mips_elf_la25_stub_eq (const void *entry1_, const void *entry2_)
+{
+  const struct mips_elf_la25_stub *entry1, *entry2;
+
+  entry1 = (struct mips_elf_la25_stub *) entry1_;
+  entry2 = (struct mips_elf_la25_stub *) entry2_;
+  return ((entry1->h->root.root.u.def.section
+	   == entry2->h->root.root.u.def.section)
+	  && (entry1->h->root.root.u.def.value
+	      == entry2->h->root.root.u.def.value));
+}
+
+/* Called by the linker to set up the la25 stub-creation code.  FN is
+   the linker's implementation of add_stub_function.  Return true on
+   success.  */
+
+bfd_boolean
+_bfd_mips_elf_init_stubs (struct bfd_link_info *info,
+			  asection *(*fn) (const char *, asection *,
+					   asection *))
+{
+  struct mips_elf_link_hash_table *htab;
+
+  htab = mips_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  htab->add_stub_section = fn;
+  htab->la25_stubs = htab_try_create (1, mips_elf_la25_stub_hash,
+				      mips_elf_la25_stub_eq, NULL);
+  if (htab->la25_stubs == NULL)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Return true if H is a locally-defined PIC function, in the sense
+   that it might need $25 to be valid on entry.  Note that MIPS16
+   functions never need $25 to be valid on entry; they set up $gp
+   using PC-relative instructions instead.  */
+
+static bfd_boolean
+mips_elf_local_pic_function_p (struct mips_elf_link_hash_entry *h)
+{
+  return ((h->root.root.type == bfd_link_hash_defined
+	   || h->root.root.type == bfd_link_hash_defweak)
+	  && h->root.def_regular
+	  && !bfd_is_abs_section (h->root.root.u.def.section)
+	  && !ELF_ST_IS_MIPS16 (h->root.other)
+	  && (PIC_OBJECT_P (h->root.root.u.def.section->owner)
+	      || ELF_ST_IS_MIPS_PIC (h->root.other)));
+}
+
+/* STUB describes an la25 stub that we have decided to implement
+   by inserting an LUI/ADDIU pair before the target function.
+   Create the section and redirect the function symbol to it.  */
+
+static bfd_boolean
+mips_elf_add_la25_intro (struct mips_elf_la25_stub *stub,
+			 struct bfd_link_info *info)
+{
+  struct mips_elf_link_hash_table *htab;
+  char *name;
+  asection *s, *input_section;
+  unsigned int align;
+
+  htab = mips_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* Create a unique name for the new section.  */
+  name = bfd_malloc (11 + sizeof (".text.stub."));
+  if (name == NULL)
+    return FALSE;
+  sprintf (name, ".text.stub.%d", (int) htab_elements (htab->la25_stubs));
+
+  /* Create the section.  */
+  input_section = stub->h->root.root.u.def.section;
+  s = htab->add_stub_section (name, input_section,
+			      input_section->output_section);
+  if (s == NULL)
+    return FALSE;
+
+  /* Make sure that any padding goes before the stub.  */
+  align = input_section->alignment_power;
+  if (!bfd_set_section_alignment (s->owner, s, align))
+    return FALSE;
+  if (align > 3)
+    s->size = (1 << align) - 8;
+
+  /* Create a symbol for the stub.  */
+  mips_elf_create_stub_symbol (info, stub->h, ".pic.", s, s->size, 8);
+  stub->stub_section = s;
+  stub->offset = s->size;
+
+  /* Allocate room for it.  */
+  s->size += 8;
+  return TRUE;
+}
+
+/* STUB describes an la25 stub that we have decided to implement
+   with a separate trampoline.  Allocate room for it and redirect
+   the function symbol to it.  */
+
+static bfd_boolean
+mips_elf_add_la25_trampoline (struct mips_elf_la25_stub *stub,
+			      struct bfd_link_info *info)
+{
+  struct mips_elf_link_hash_table *htab;
+  asection *s;
+
+  htab = mips_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  /* Create a trampoline section, if we haven't already.  */
+  s = htab->strampoline;
+  if (s == NULL)
+    {
+      asection *input_section = stub->h->root.root.u.def.section;
+      s = htab->add_stub_section (".text", NULL,
+				  input_section->output_section);
+      if (s == NULL || !bfd_set_section_alignment (s->owner, s, 4))
+	return FALSE;
+      htab->strampoline = s;
+    }
+
+  /* Create a symbol for the stub.  */
+  mips_elf_create_stub_symbol (info, stub->h, ".pic.", s, s->size, 16);
+  stub->stub_section = s;
+  stub->offset = s->size;
+
+  /* Allocate room for it.  */
+  s->size += 16;
+  return TRUE;
+}
+
+/* H describes a symbol that needs an la25 stub.  Make sure that an
+   appropriate stub exists and point H at it.  */
+
+static bfd_boolean
+mips_elf_add_la25_stub (struct bfd_link_info *info,
+			struct mips_elf_link_hash_entry *h)
+{
+  struct mips_elf_link_hash_table *htab;
+  struct mips_elf_la25_stub search, *stub;
+  bfd_boolean use_trampoline_p;
+  asection *s;
+  bfd_vma value;
+  void **slot;
+
+  /* Prefer to use LUI/ADDIU stubs if the function is at the beginning
+     of the section and if we would need no more than 2 nops.  */
+  s = h->root.root.u.def.section;
+  value = h->root.root.u.def.value;
+  use_trampoline_p = (value != 0 || s->alignment_power > 4);
+
+  /* Describe the stub we want.  */
+  search.stub_section = NULL;
+  search.offset = 0;
+  search.h = h;
+
+  /* See if we've already created an equivalent stub.  */
+  htab = mips_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+
+  slot = htab_find_slot (htab->la25_stubs, &search, INSERT);
+  if (slot == NULL)
+    return FALSE;
+
+  stub = (struct mips_elf_la25_stub *) *slot;
+  if (stub != NULL)
+    {
+      /* We can reuse the existing stub.  */
+      h->la25_stub = stub;
+      return TRUE;
+    }
+
+  /* Create a permanent copy of ENTRY and add it to the hash table.  */
+  stub = bfd_malloc (sizeof (search));
+  if (stub == NULL)
+    return FALSE;
+  *stub = search;
+  *slot = stub;
+
+  h->la25_stub = stub;
+  return (use_trampoline_p
+	  ? mips_elf_add_la25_trampoline (stub, info)
+	  : mips_elf_add_la25_intro (stub, info));
+}
+
+/* A mips_elf_link_hash_traverse callback that is called before sizing
+   sections.  DATA points to a mips_htab_traverse_info structure.  */
+
+static bfd_boolean
+mips_elf_check_symbols (struct mips_elf_link_hash_entry *h, void *data)
+{
+  struct mips_htab_traverse_info *hti;
+
+  hti = (struct mips_htab_traverse_info *) data;
+  if (!hti->info->relocatable)
+    mips_elf_check_mips16_stubs (hti->info, h);
+
+  if (mips_elf_local_pic_function_p (h))
+    {
+      /* PR 12845: If H is in a section that has been garbage
+	 collected it will have its output section set to *ABS*.  */
+      if (bfd_is_abs_section (h->root.root.u.def.section->output_section))
+	return TRUE;
+
+      /* H is a function that might need $25 to be valid on entry.
+	 If we're creating a non-PIC relocatable object, mark H as
+	 being PIC.  If we're creating a non-relocatable object with
+	 non-PIC branches and jumps to H, make sure that H has an la25
+	 stub.  */
+      if (hti->info->relocatable)
+	{
+	  if (!PIC_OBJECT_P (hti->output_bfd))
+	    h->root.other = ELF_ST_SET_MIPS_PIC (h->root.other);
+	}
+      else if (h->has_nonpic_branches && !mips_elf_add_la25_stub (hti->info, h))
+	{
+	  hti->error = TRUE;
+	  return FALSE;
+	}
+    }
+  return TRUE;
+}
+
+/* R_MIPS16_26 is used for the mips16 jal and jalx instructions.
+   Most mips16 instructions are 16 bits, but these instructions
+   are 32 bits.
+
+   The format of these instructions is:
+
+   +--------------+--------------------------------+
+   |     JALX     | X|   Imm 20:16  |   Imm 25:21  |
+   +--------------+--------------------------------+
+   |                Immediate  15:0                |
+   +-----------------------------------------------+
+
+   JALX is the 5-bit value 00011.  X is 0 for jal, 1 for jalx.
+   Note that the immediate value in the first word is swapped.
+
+   When producing a relocatable object file, R_MIPS16_26 is
+   handled mostly like R_MIPS_26.  In particular, the addend is
+   stored as a straight 26-bit value in a 32-bit instruction.
+   (gas makes life simpler for itself by never adjusting a
+   R_MIPS16_26 reloc to be against a section, so the addend is
+   always zero).  However, the 32 bit instruction is stored as 2
+   16-bit values, rather than a single 32-bit value.  In a
+   big-endian file, the result is the same; in a little-endian
+   file, the two 16-bit halves of the 32 bit value are swapped.
+   This is so that a disassembler can recognize the jal
+   instruction.
+
+   When doing a final link, R_MIPS16_26 is treated as a 32 bit
+   instruction stored as two 16-bit values.  The addend A is the
+   contents of the targ26 field.  The calculation is the same as
+   R_MIPS_26.  When storing the calculated value, reorder the
+   immediate value as shown above, and don't forget to store the
+   value as two 16-bit values.
+
+   To put it in MIPS ABI terms, the relocation field is T-targ26-16,
+   defined as
+
+   big-endian:
+   +--------+----------------------+
+   |        |                      |
+   |        |    targ26-16         |
+   |31    26|25                   0|
+   +--------+----------------------+
+
+   little-endian:
+   +----------+------+-------------+
+   |          |      |             |
+   |  sub1    |      |     sub2    |
+   |0        9|10  15|16         31|
+   +----------+--------------------+
+   where targ26-16 is sub1 followed by sub2 (i.e., the addend field A is
+   ((sub1 << 16) | sub2)).
+
+   When producing a relocatable object file, the calculation is
+   (((A < 2) | ((P + 4) & 0xf0000000) + S) >> 2)
+   When producing a fully linked file, the calculation is
+   let R = (((A < 2) | ((P + 4) & 0xf0000000) + S) >> 2)
+   ((R & 0x1f0000) << 5) | ((R & 0x3e00000) >> 5) | (R & 0xffff)
+
+   The table below lists the other MIPS16 instruction relocations.
+   Each one is calculated in the same way as the non-MIPS16 relocation
+   given on the right, but using the extended MIPS16 layout of 16-bit
+   immediate fields:
+
+	R_MIPS16_GPREL		R_MIPS_GPREL16
+	R_MIPS16_GOT16		R_MIPS_GOT16
+	R_MIPS16_CALL16		R_MIPS_CALL16
+	R_MIPS16_HI16		R_MIPS_HI16
+	R_MIPS16_LO16		R_MIPS_LO16
+
+   A typical instruction will have a format like this:
+
+   +--------------+--------------------------------+
+   |    EXTEND    |     Imm 10:5    |   Imm 15:11  |
+   +--------------+--------------------------------+
+   |    Major     |   rx   |   ry   |   Imm  4:0   |
+   +--------------+--------------------------------+
+
+   EXTEND is the five bit value 11110.  Major is the instruction
+   opcode.
+
+   All we need to do here is shuffle the bits appropriately.
+   As above, the two 16-bit halves must be swapped on a
+   little-endian system.  */
+
+static inline bfd_boolean
+mips16_reloc_p (int r_type)
+{
+  switch (r_type)
+    {
+    case R_MIPS16_26:
+    case R_MIPS16_GPREL:
+    case R_MIPS16_GOT16:
+    case R_MIPS16_CALL16:
+    case R_MIPS16_HI16:
+    case R_MIPS16_LO16:
+      return TRUE;
+
+    default:
+      return FALSE;
+    }
+}
+
+/* Check if a microMIPS reloc.  */
+
+static inline bfd_boolean
+micromips_reloc_p (unsigned int r_type)
+{
+  return r_type >= R_MICROMIPS_min && r_type < R_MICROMIPS_max;
+}
+
+/* Similar to MIPS16, the two 16-bit halves in microMIPS must be swapped
+   on a little-endian system.  This does not apply to R_MICROMIPS_PC7_S1
+   and R_MICROMIPS_PC10_S1 relocs that apply to 16-bit instructions.  */
+
+static inline bfd_boolean
+micromips_reloc_shuffle_p (unsigned int r_type)
+{
+  return (micromips_reloc_p (r_type)
+	  && r_type != R_MICROMIPS_PC7_S1
+	  && r_type != R_MICROMIPS_PC10_S1);
+}
+
+static inline bfd_boolean
+got16_reloc_p (int r_type)
+{
+  return (r_type == R_MIPS_GOT16
+	  || r_type == R_MIPS16_GOT16
+	  || r_type == R_MICROMIPS_GOT16);
+}
+
+static inline bfd_boolean
+call16_reloc_p (int r_type)
+{
+  return (r_type == R_MIPS_CALL16
+	  || r_type == R_MIPS16_CALL16
+	  || r_type == R_MICROMIPS_CALL16);
+}
+
+static inline bfd_boolean
+got_disp_reloc_p (unsigned int r_type)
+{
+  return r_type == R_MIPS_GOT_DISP || r_type == R_MICROMIPS_GOT_DISP;
+}
+
+static inline bfd_boolean
+got_page_reloc_p (unsigned int r_type)
+{
+  return r_type == R_MIPS_GOT_PAGE || r_type == R_MICROMIPS_GOT_PAGE;
+}
+
+static inline bfd_boolean
+got_ofst_reloc_p (unsigned int r_type)
+{
+  return r_type == R_MIPS_GOT_OFST || r_type == R_MICROMIPS_GOT_OFST;
+}
+
+static inline bfd_boolean
+got_hi16_reloc_p (unsigned int r_type)
+{
+  return r_type == R_MIPS_GOT_HI16 || r_type == R_MICROMIPS_GOT_HI16;
+}
+
+static inline bfd_boolean
+got_lo16_reloc_p (unsigned int r_type)
+{
+  return r_type == R_MIPS_GOT_LO16 || r_type == R_MICROMIPS_GOT_LO16;
+}
+
+static inline bfd_boolean
+call_hi16_reloc_p (unsigned int r_type)
+{
+  return r_type == R_MIPS_CALL_HI16 || r_type == R_MICROMIPS_CALL_HI16;
+}
+
+static inline bfd_boolean
+call_lo16_reloc_p (unsigned int r_type)
+{
+  return r_type == R_MIPS_CALL_LO16 || r_type == R_MICROMIPS_CALL_LO16;
+}
+
+static inline bfd_boolean
+hi16_reloc_p (int r_type)
+{
+  return (r_type == R_MIPS_HI16
+	  || r_type == R_MIPS16_HI16
+	  || r_type == R_MICROMIPS_HI16);
+}
+
+static inline bfd_boolean
+lo16_reloc_p (int r_type)
+{
+  return (r_type == R_MIPS_LO16
+	  || r_type == R_MIPS16_LO16
+	  || r_type == R_MICROMIPS_LO16);
+}
+
+static inline bfd_boolean
+mips16_call_reloc_p (int r_type)
+{
+  return r_type == R_MIPS16_26 || r_type == R_MIPS16_CALL16;
+}
+
+static inline bfd_boolean
+jal_reloc_p (int r_type)
+{
+  return (r_type == R_MIPS_26
+	  || r_type == R_MIPS16_26
+	  || r_type == R_MICROMIPS_26_S1);
+}
+
+static inline bfd_boolean
+micromips_branch_reloc_p (int r_type)
+{
+  return (r_type == R_MICROMIPS_26_S1
+	  || r_type == R_MICROMIPS_PC16_S1
+	  || r_type == R_MICROMIPS_PC10_S1
+	  || r_type == R_MICROMIPS_PC7_S1);
+}
+
+static inline bfd_boolean
+tls_gd_reloc_p (unsigned int r_type)
+{
+  return r_type == R_MIPS_TLS_GD || r_type == R_MICROMIPS_TLS_GD;
+}
+
+static inline bfd_boolean
+tls_ldm_reloc_p (unsigned int r_type)
+{
+  return r_type == R_MIPS_TLS_LDM || r_type == R_MICROMIPS_TLS_LDM;
+}
+
+static inline bfd_boolean
+tls_gottprel_reloc_p (unsigned int r_type)
+{
+  return r_type == R_MIPS_TLS_GOTTPREL || r_type == R_MICROMIPS_TLS_GOTTPREL;
+}
+
+void
+_bfd_mips_elf_reloc_unshuffle (bfd *abfd, int r_type,
+			       bfd_boolean jal_shuffle, bfd_byte *data)
+{
+  bfd_vma first, second, val;
+
+  if (!mips16_reloc_p (r_type) && !micromips_reloc_shuffle_p (r_type))
+    return;
+
+  /* Pick up the first and second halfwords of the instruction.  */
+  first = bfd_get_16 (abfd, data);
+  second = bfd_get_16 (abfd, data + 2);
+  if (micromips_reloc_p (r_type) || (r_type == R_MIPS16_26 && !jal_shuffle))
+    val = first << 16 | second;
+  else if (r_type != R_MIPS16_26)
+    val = (((first & 0xf800) << 16) | ((second & 0xffe0) << 11)
+	   | ((first & 0x1f) << 11) | (first & 0x7e0) | (second & 0x1f));
+  else
+    val = (((first & 0xfc00) << 16) | ((first & 0x3e0) << 11)
+	   | ((first & 0x1f) << 21) | second);
+  bfd_put_32 (abfd, val, data);
+}
+
+void
+_bfd_mips_elf_reloc_shuffle (bfd *abfd, int r_type,
+			     bfd_boolean jal_shuffle, bfd_byte *data)
+{
+  bfd_vma first, second, val;
+
+  if (!mips16_reloc_p (r_type) && !micromips_reloc_shuffle_p (r_type))
+    return;
+
+  val = bfd_get_32 (abfd, data);
+  if (micromips_reloc_p (r_type) || (r_type == R_MIPS16_26 && !jal_shuffle))
+    {
+      second = val & 0xffff;
+      first = val >> 16;
+    }
+  else if (r_type != R_MIPS16_26)
+    {
+      second = ((val >> 11) & 0xffe0) | (val & 0x1f);
+      first = ((val >> 16) & 0xf800) | ((val >> 11) & 0x1f) | (val & 0x7e0);
+    }
+  else
+    {
+      second = val & 0xffff;
+      first = ((val >> 16) & 0xfc00) | ((val >> 11) & 0x3e0)
+	       | ((val >> 21) & 0x1f);
+    }
+  bfd_put_16 (abfd, second, data + 2);
+  bfd_put_16 (abfd, first, data);
+}
+
+bfd_reloc_status_type
+_bfd_mips_elf_gprel16_with_gp (bfd *abfd, asymbol *symbol,
+			       arelent *reloc_entry, asection *input_section,
+			       bfd_boolean relocatable, void *data, bfd_vma gp)
+{
+  bfd_vma relocation;
+  bfd_signed_vma val;
+  bfd_reloc_status_type status;
+
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  /* Set val to the offset into the section or symbol.  */
+  val = reloc_entry->addend;
+
+  _bfd_mips_elf_sign_extend (val, 16);
+
+  /* Adjust val for the final section location and GP value.  If we
+     are producing relocatable output, we don't want to do this for
+     an external symbol.  */
+  if (! relocatable
+      || (symbol->flags & BSF_SECTION_SYM) != 0)
+    val += relocation - gp;
+
+  if (reloc_entry->howto->partial_inplace)
+    {
+      status = _bfd_relocate_contents (reloc_entry->howto, abfd, val,
+				       (bfd_byte *) data
+				       + reloc_entry->address);
+      if (status != bfd_reloc_ok)
+	return status;
+    }
+  else
+    reloc_entry->addend = val;
+
+  if (relocatable)
+    reloc_entry->address += input_section->output_offset;
+
+  return bfd_reloc_ok;
+}
+
+/* Used to store a REL high-part relocation such as R_MIPS_HI16 or
+   R_MIPS_GOT16.  REL is the relocation, INPUT_SECTION is the section
+   that contains the relocation field and DATA points to the start of
+   INPUT_SECTION.  */
+
+struct mips_hi16
+{
+  struct mips_hi16 *next;
+  bfd_byte *data;
+  asection *input_section;
+  arelent rel;
+};
+
+/* FIXME: This should not be a static variable.  */
+
+static struct mips_hi16 *mips_hi16_list;
+
+/* A howto special_function for REL *HI16 relocations.  We can only
+   calculate the correct value once we've seen the partnering
+   *LO16 relocation, so just save the information for later.
+
+   The ABI requires that the *LO16 immediately follow the *HI16.
+   However, as a GNU extension, we permit an arbitrary number of
+   *HI16s to be associated with a single *LO16.  This significantly
+   simplies the relocation handling in gcc.  */
+
+bfd_reloc_status_type
+_bfd_mips_elf_hi16_reloc (bfd *abfd ATTRIBUTE_UNUSED, arelent *reloc_entry,
+			  asymbol *symbol ATTRIBUTE_UNUSED, void *data,
+			  asection *input_section, bfd *output_bfd,
+			  char **error_message ATTRIBUTE_UNUSED)
+{
+  struct mips_hi16 *n;
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  n = bfd_malloc (sizeof *n);
+  if (n == NULL)
+    return bfd_reloc_outofrange;
+
+  n->next = mips_hi16_list;
+  n->data = data;
+  n->input_section = input_section;
+  n->rel = *reloc_entry;
+  mips_hi16_list = n;
+
+  if (output_bfd != NULL)
+    reloc_entry->address += input_section->output_offset;
+
+  return bfd_reloc_ok;
+}
+
+/* A howto special_function for REL R_MIPS*_GOT16 relocations.  This is just
+   like any other 16-bit relocation when applied to global symbols, but is
+   treated in the same as R_MIPS_HI16 when applied to local symbols.  */
+
+bfd_reloc_status_type
+_bfd_mips_elf_got16_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+			   void *data, asection *input_section,
+			   bfd *output_bfd, char **error_message)
+{
+  if ((symbol->flags & (BSF_GLOBAL | BSF_WEAK)) != 0
+      || bfd_is_und_section (bfd_get_section (symbol))
+      || bfd_is_com_section (bfd_get_section (symbol)))
+    /* The relocation is against a global symbol.  */
+    return _bfd_mips_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+					input_section, output_bfd,
+					error_message);
+
+  return _bfd_mips_elf_hi16_reloc (abfd, reloc_entry, symbol, data,
+				   input_section, output_bfd, error_message);
+}
+
+/* A howto special_function for REL *LO16 relocations.  The *LO16 itself
+   is a straightforward 16 bit inplace relocation, but we must deal with
+   any partnering high-part relocations as well.  */
+
+bfd_reloc_status_type
+_bfd_mips_elf_lo16_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+			  void *data, asection *input_section,
+			  bfd *output_bfd, char **error_message)
+{
+  bfd_vma vallo;
+  bfd_byte *location = (bfd_byte *) data + reloc_entry->address;
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  _bfd_mips_elf_reloc_unshuffle (abfd, reloc_entry->howto->type, FALSE,
+				 location);
+  vallo = bfd_get_32 (abfd, location);
+  _bfd_mips_elf_reloc_shuffle (abfd, reloc_entry->howto->type, FALSE,
+			       location);
+
+  while (mips_hi16_list != NULL)
+    {
+      bfd_reloc_status_type ret;
+      struct mips_hi16 *hi;
+
+      hi = mips_hi16_list;
+
+      /* R_MIPS*_GOT16 relocations are something of a special case.  We
+	 want to install the addend in the same way as for a R_MIPS*_HI16
+	 relocation (with a rightshift of 16).  However, since GOT16
+	 relocations can also be used with global symbols, their howto
+	 has a rightshift of 0.  */
+      if (hi->rel.howto->type == R_MIPS_GOT16)
+	hi->rel.howto = MIPS_ELF_RTYPE_TO_HOWTO (abfd, R_MIPS_HI16, FALSE);
+      else if (hi->rel.howto->type == R_MIPS16_GOT16)
+	hi->rel.howto = MIPS_ELF_RTYPE_TO_HOWTO (abfd, R_MIPS16_HI16, FALSE);
+      else if (hi->rel.howto->type == R_MICROMIPS_GOT16)
+	hi->rel.howto = MIPS_ELF_RTYPE_TO_HOWTO (abfd, R_MICROMIPS_HI16, FALSE);
+
+      /* VALLO is a signed 16-bit number.  Bias it by 0x8000 so that any
+	 carry or borrow will induce a change of +1 or -1 in the high part.  */
+      hi->rel.addend += (vallo + 0x8000) & 0xffff;
+
+      ret = _bfd_mips_elf_generic_reloc (abfd, &hi->rel, symbol, hi->data,
+					 hi->input_section, output_bfd,
+					 error_message);
+      if (ret != bfd_reloc_ok)
+	return ret;
+
+      mips_hi16_list = hi->next;
+      free (hi);
+    }
+
+  return _bfd_mips_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+				      input_section, output_bfd,
+				      error_message);
+}
+
+/* A generic howto special_function.  This calculates and installs the
+   relocation itself, thus avoiding the oft-discussed problems in
+   bfd_perform_relocation and bfd_install_relocation.  */
+
+bfd_reloc_status_type
+_bfd_mips_elf_generic_reloc (bfd *abfd ATTRIBUTE_UNUSED, arelent *reloc_entry,
+			     asymbol *symbol, void *data ATTRIBUTE_UNUSED,
+			     asection *input_section, bfd *output_bfd,
+			     char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_signed_vma val;
+  bfd_reloc_status_type status;
+  bfd_boolean relocatable;
+
+  relocatable = (output_bfd != NULL);
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  /* Build up the field adjustment in VAL.  */
+  val = 0;
+  if (!relocatable || (symbol->flags & BSF_SECTION_SYM) != 0)
+    {
+      /* Either we're calculating the final field value or we have a
+	 relocation against a section symbol.  Add in the section's
+	 offset or address.  */
+      val += symbol->section->output_section->vma;
+      val += symbol->section->output_offset;
+    }
+
+  if (!relocatable)
+    {
+      /* We're calculating the final field value.  Add in the symbol's value
+	 and, if pc-relative, subtract the address of the field itself.  */
+      val += symbol->value;
+      if (reloc_entry->howto->pc_relative)
+	{
+	  val -= input_section->output_section->vma;
+	  val -= input_section->output_offset;
+	  val -= reloc_entry->address;
+	}
+    }
+
+  /* VAL is now the final adjustment.  If we're keeping this relocation
+     in the output file, and if the relocation uses a separate addend,
+     we just need to add VAL to that addend.  Otherwise we need to add
+     VAL to the relocation field itself.  */
+  if (relocatable && !reloc_entry->howto->partial_inplace)
+    reloc_entry->addend += val;
+  else
+    {
+      bfd_byte *location = (bfd_byte *) data + reloc_entry->address;
+
+      /* Add in the separate addend, if any.  */
+      val += reloc_entry->addend;
+
+      /* Add VAL to the relocation field.  */
+      _bfd_mips_elf_reloc_unshuffle (abfd, reloc_entry->howto->type, FALSE,
+				     location);
+      status = _bfd_relocate_contents (reloc_entry->howto, abfd, val,
+				       location);
+      _bfd_mips_elf_reloc_shuffle (abfd, reloc_entry->howto->type, FALSE,
+				   location);
+
+      if (status != bfd_reloc_ok)
+	return status;
+    }
+
+  if (relocatable)
+    reloc_entry->address += input_section->output_offset;
+
+  return bfd_reloc_ok;
+}
+
+/* Swap an entry in a .gptab section.  Note that these routines rely
+   on the equivalence of the two elements of the union.  */
+
+static void
+bfd_mips_elf32_swap_gptab_in (bfd *abfd, const Elf32_External_gptab *ex,
+			      Elf32_gptab *in)
+{
+  in->gt_entry.gt_g_value = H_GET_32 (abfd, ex->gt_entry.gt_g_value);
+  in->gt_entry.gt_bytes = H_GET_32 (abfd, ex->gt_entry.gt_bytes);
+}
+
+static void
+bfd_mips_elf32_swap_gptab_out (bfd *abfd, const Elf32_gptab *in,
+			       Elf32_External_gptab *ex)
+{
+  H_PUT_32 (abfd, in->gt_entry.gt_g_value, ex->gt_entry.gt_g_value);
+  H_PUT_32 (abfd, in->gt_entry.gt_bytes, ex->gt_entry.gt_bytes);
+}
+
+static void
+bfd_elf32_swap_compact_rel_out (bfd *abfd, const Elf32_compact_rel *in,
+				Elf32_External_compact_rel *ex)
+{
+  H_PUT_32 (abfd, in->id1, ex->id1);
+  H_PUT_32 (abfd, in->num, ex->num);
+  H_PUT_32 (abfd, in->id2, ex->id2);
+  H_PUT_32 (abfd, in->offset, ex->offset);
+  H_PUT_32 (abfd, in->reserved0, ex->reserved0);
+  H_PUT_32 (abfd, in->reserved1, ex->reserved1);
+}
+
+static void
+bfd_elf32_swap_crinfo_out (bfd *abfd, const Elf32_crinfo *in,
+			   Elf32_External_crinfo *ex)
+{
+  unsigned long l;
+
+  l = (((in->ctype & CRINFO_CTYPE) << CRINFO_CTYPE_SH)
+       | ((in->rtype & CRINFO_RTYPE) << CRINFO_RTYPE_SH)
+       | ((in->dist2to & CRINFO_DIST2TO) << CRINFO_DIST2TO_SH)
+       | ((in->relvaddr & CRINFO_RELVADDR) << CRINFO_RELVADDR_SH));
+  H_PUT_32 (abfd, l, ex->info);
+  H_PUT_32 (abfd, in->konst, ex->konst);
+  H_PUT_32 (abfd, in->vaddr, ex->vaddr);
+}
+
+/* A .reginfo section holds a single Elf32_RegInfo structure.  These
+   routines swap this structure in and out.  They are used outside of
+   BFD, so they are globally visible.  */
+
+void
+bfd_mips_elf32_swap_reginfo_in (bfd *abfd, const Elf32_External_RegInfo *ex,
+				Elf32_RegInfo *in)
+{
+  in->ri_gprmask = H_GET_32 (abfd, ex->ri_gprmask);
+  in->ri_cprmask[0] = H_GET_32 (abfd, ex->ri_cprmask[0]);
+  in->ri_cprmask[1] = H_GET_32 (abfd, ex->ri_cprmask[1]);
+  in->ri_cprmask[2] = H_GET_32 (abfd, ex->ri_cprmask[2]);
+  in->ri_cprmask[3] = H_GET_32 (abfd, ex->ri_cprmask[3]);
+  in->ri_gp_value = H_GET_32 (abfd, ex->ri_gp_value);
+}
+
+void
+bfd_mips_elf32_swap_reginfo_out (bfd *abfd, const Elf32_RegInfo *in,
+				 Elf32_External_RegInfo *ex)
+{
+  H_PUT_32 (abfd, in->ri_gprmask, ex->ri_gprmask);
+  H_PUT_32 (abfd, in->ri_cprmask[0], ex->ri_cprmask[0]);
+  H_PUT_32 (abfd, in->ri_cprmask[1], ex->ri_cprmask[1]);
+  H_PUT_32 (abfd, in->ri_cprmask[2], ex->ri_cprmask[2]);
+  H_PUT_32 (abfd, in->ri_cprmask[3], ex->ri_cprmask[3]);
+  H_PUT_32 (abfd, in->ri_gp_value, ex->ri_gp_value);
+}
+
+/* In the 64 bit ABI, the .MIPS.options section holds register
+   information in an Elf64_Reginfo structure.  These routines swap
+   them in and out.  They are globally visible because they are used
+   outside of BFD.  These routines are here so that gas can call them
+   without worrying about whether the 64 bit ABI has been included.  */
+
+void
+bfd_mips_elf64_swap_reginfo_in (bfd *abfd, const Elf64_External_RegInfo *ex,
+				Elf64_Internal_RegInfo *in)
+{
+  in->ri_gprmask = H_GET_32 (abfd, ex->ri_gprmask);
+  in->ri_pad = H_GET_32 (abfd, ex->ri_pad);
+  in->ri_cprmask[0] = H_GET_32 (abfd, ex->ri_cprmask[0]);
+  in->ri_cprmask[1] = H_GET_32 (abfd, ex->ri_cprmask[1]);
+  in->ri_cprmask[2] = H_GET_32 (abfd, ex->ri_cprmask[2]);
+  in->ri_cprmask[3] = H_GET_32 (abfd, ex->ri_cprmask[3]);
+  in->ri_gp_value = H_GET_64 (abfd, ex->ri_gp_value);
+}
+
+void
+bfd_mips_elf64_swap_reginfo_out (bfd *abfd, const Elf64_Internal_RegInfo *in,
+				 Elf64_External_RegInfo *ex)
+{
+  H_PUT_32 (abfd, in->ri_gprmask, ex->ri_gprmask);
+  H_PUT_32 (abfd, in->ri_pad, ex->ri_pad);
+  H_PUT_32 (abfd, in->ri_cprmask[0], ex->ri_cprmask[0]);
+  H_PUT_32 (abfd, in->ri_cprmask[1], ex->ri_cprmask[1]);
+  H_PUT_32 (abfd, in->ri_cprmask[2], ex->ri_cprmask[2]);
+  H_PUT_32 (abfd, in->ri_cprmask[3], ex->ri_cprmask[3]);
+  H_PUT_64 (abfd, in->ri_gp_value, ex->ri_gp_value);
+}
+
+/* Swap in an options header.  */
+
+void
+bfd_mips_elf_swap_options_in (bfd *abfd, const Elf_External_Options *ex,
+			      Elf_Internal_Options *in)
+{
+  in->kind = H_GET_8 (abfd, ex->kind);
+  in->size = H_GET_8 (abfd, ex->size);
+  in->section = H_GET_16 (abfd, ex->section);
+  in->info = H_GET_32 (abfd, ex->info);
+}
+
+/* Swap out an options header.  */
+
+void
+bfd_mips_elf_swap_options_out (bfd *abfd, const Elf_Internal_Options *in,
+			       Elf_External_Options *ex)
+{
+  H_PUT_8 (abfd, in->kind, ex->kind);
+  H_PUT_8 (abfd, in->size, ex->size);
+  H_PUT_16 (abfd, in->section, ex->section);
+  H_PUT_32 (abfd, in->info, ex->info);
+}
+
+/* This function is called via qsort() to sort the dynamic relocation
+   entries by increasing r_symndx value.  */
+
+static int
+sort_dynamic_relocs (const void *arg1, const void *arg2)
+{
+  Elf_Internal_Rela int_reloc1;
+  Elf_Internal_Rela int_reloc2;
+  int diff;
+
+  bfd_elf32_swap_reloc_in (reldyn_sorting_bfd, arg1, &int_reloc1);
+  bfd_elf32_swap_reloc_in (reldyn_sorting_bfd, arg2, &int_reloc2);
+
+  diff = ELF32_R_SYM (int_reloc1.r_info) - ELF32_R_SYM (int_reloc2.r_info);
+  if (diff != 0)
+    return diff;
+
+  if (int_reloc1.r_offset < int_reloc2.r_offset)
+    return -1;
+  if (int_reloc1.r_offset > int_reloc2.r_offset)
+    return 1;
+  return 0;
+}
+
+/* Like sort_dynamic_relocs, but used for elf64 relocations.  */
+
+static int
+sort_dynamic_relocs_64 (const void *arg1 ATTRIBUTE_UNUSED,
+			const void *arg2 ATTRIBUTE_UNUSED)
+{
+#ifdef BFD64
+  Elf_Internal_Rela int_reloc1[3];
+  Elf_Internal_Rela int_reloc2[3];
+
+  (*get_elf_backend_data (reldyn_sorting_bfd)->s->swap_reloc_in)
+    (reldyn_sorting_bfd, arg1, int_reloc1);
+  (*get_elf_backend_data (reldyn_sorting_bfd)->s->swap_reloc_in)
+    (reldyn_sorting_bfd, arg2, int_reloc2);
+
+  if (ELF64_R_SYM (int_reloc1[0].r_info) < ELF64_R_SYM (int_reloc2[0].r_info))
+    return -1;
+  if (ELF64_R_SYM (int_reloc1[0].r_info) > ELF64_R_SYM (int_reloc2[0].r_info))
+    return 1;
+
+  if (int_reloc1[0].r_offset < int_reloc2[0].r_offset)
+    return -1;
+  if (int_reloc1[0].r_offset > int_reloc2[0].r_offset)
+    return 1;
+  return 0;
+#else
+  abort ();
+#endif
+}
+
+
+/* This routine is used to write out ECOFF debugging external symbol
+   information.  It is called via mips_elf_link_hash_traverse.  The
+   ECOFF external symbol information must match the ELF external
+   symbol information.  Unfortunately, at this point we don't know
+   whether a symbol is required by reloc information, so the two
+   tables may wind up being different.  We must sort out the external
+   symbol information before we can set the final size of the .mdebug
+   section, and we must set the size of the .mdebug section before we
+   can relocate any sections, and we can't know which symbols are
+   required by relocation until we relocate the sections.
+   Fortunately, it is relatively unlikely that any symbol will be
+   stripped but required by a reloc.  In particular, it can not happen
+   when generating a final executable.  */
+
+static bfd_boolean
+mips_elf_output_extsym (struct mips_elf_link_hash_entry *h, void *data)
+{
+  struct extsym_info *einfo = data;
+  bfd_boolean strip;
+  asection *sec, *output_section;
+
+  if (h->root.indx == -2)
+    strip = FALSE;
+  else if ((h->root.def_dynamic
+	    || h->root.ref_dynamic
+	    || h->root.type == bfd_link_hash_new)
+	   && !h->root.def_regular
+	   && !h->root.ref_regular)
+    strip = TRUE;
+  else if (einfo->info->strip == strip_all
+	   || (einfo->info->strip == strip_some
+	       && bfd_hash_lookup (einfo->info->keep_hash,
+				   h->root.root.root.string,
+				   FALSE, FALSE) == NULL))
+    strip = TRUE;
+  else
+    strip = FALSE;
+
+  if (strip)
+    return TRUE;
+
+  if (h->esym.ifd == -2)
+    {
+      h->esym.jmptbl = 0;
+      h->esym.cobol_main = 0;
+      h->esym.weakext = 0;
+      h->esym.reserved = 0;
+      h->esym.ifd = ifdNil;
+      h->esym.asym.value = 0;
+      h->esym.asym.st = stGlobal;
+
+      if (h->root.root.type == bfd_link_hash_undefined
+	  || h->root.root.type == bfd_link_hash_undefweak)
+	{
+	  const char *name;
+
+	  /* Use undefined class.  Also, set class and type for some
+             special symbols.  */
+	  name = h->root.root.root.string;
+	  if (strcmp (name, mips_elf_dynsym_rtproc_names[0]) == 0
+	      || strcmp (name, mips_elf_dynsym_rtproc_names[1]) == 0)
+	    {
+	      h->esym.asym.sc = scData;
+	      h->esym.asym.st = stLabel;
+	      h->esym.asym.value = 0;
+	    }
+	  else if (strcmp (name, mips_elf_dynsym_rtproc_names[2]) == 0)
+	    {
+	      h->esym.asym.sc = scAbs;
+	      h->esym.asym.st = stLabel;
+	      h->esym.asym.value =
+		mips_elf_hash_table (einfo->info)->procedure_count;
+	    }
+	  else if (strcmp (name, "_gp_disp") == 0 && ! NEWABI_P (einfo->abfd))
+	    {
+	      h->esym.asym.sc = scAbs;
+	      h->esym.asym.st = stLabel;
+	      h->esym.asym.value = elf_gp (einfo->abfd);
+	    }
+	  else
+	    h->esym.asym.sc = scUndefined;
+	}
+      else if (h->root.root.type != bfd_link_hash_defined
+	  && h->root.root.type != bfd_link_hash_defweak)
+	h->esym.asym.sc = scAbs;
+      else
+	{
+	  const char *name;
+
+	  sec = h->root.root.u.def.section;
+	  output_section = sec->output_section;
+
+	  /* When making a shared library and symbol h is the one from
+	     the another shared library, OUTPUT_SECTION may be null.  */
+	  if (output_section == NULL)
+	    h->esym.asym.sc = scUndefined;
+	  else
+	    {
+	      name = bfd_section_name (output_section->owner, output_section);
+
+	      if (strcmp (name, ".text") == 0)
+		h->esym.asym.sc = scText;
+	      else if (strcmp (name, ".data") == 0)
+		h->esym.asym.sc = scData;
+	      else if (strcmp (name, ".sdata") == 0)
+		h->esym.asym.sc = scSData;
+	      else if (strcmp (name, ".rodata") == 0
+		       || strcmp (name, ".rdata") == 0)
+		h->esym.asym.sc = scRData;
+	      else if (strcmp (name, ".bss") == 0)
+		h->esym.asym.sc = scBss;
+	      else if (strcmp (name, ".sbss") == 0)
+		h->esym.asym.sc = scSBss;
+	      else if (strcmp (name, ".init") == 0)
+		h->esym.asym.sc = scInit;
+	      else if (strcmp (name, ".fini") == 0)
+		h->esym.asym.sc = scFini;
+	      else
+		h->esym.asym.sc = scAbs;
+	    }
+	}
+
+      h->esym.asym.reserved = 0;
+      h->esym.asym.index = indexNil;
+    }
+
+  if (h->root.root.type == bfd_link_hash_common)
+    h->esym.asym.value = h->root.root.u.c.size;
+  else if (h->root.root.type == bfd_link_hash_defined
+	   || h->root.root.type == bfd_link_hash_defweak)
+    {
+      if (h->esym.asym.sc == scCommon)
+	h->esym.asym.sc = scBss;
+      else if (h->esym.asym.sc == scSCommon)
+	h->esym.asym.sc = scSBss;
+
+      sec = h->root.root.u.def.section;
+      output_section = sec->output_section;
+      if (output_section != NULL)
+	h->esym.asym.value = (h->root.root.u.def.value
+			      + sec->output_offset
+			      + output_section->vma);
+      else
+	h->esym.asym.value = 0;
+    }
+  else
+    {
+      struct mips_elf_link_hash_entry *hd = h;
+
+      while (hd->root.root.type == bfd_link_hash_indirect)
+	hd = (struct mips_elf_link_hash_entry *)h->root.root.u.i.link;
+
+      if (hd->needs_lazy_stub)
+	{
+	  /* Set type and value for a symbol with a function stub.  */
+	  h->esym.asym.st = stProc;
+	  sec = hd->root.root.u.def.section;
+	  if (sec == NULL)
+	    h->esym.asym.value = 0;
+	  else
+	    {
+	      output_section = sec->output_section;
+	      if (output_section != NULL)
+		h->esym.asym.value = (hd->root.plt.offset
+				      + sec->output_offset
+				      + output_section->vma);
+	      else
+		h->esym.asym.value = 0;
+	    }
+	}
+    }
+
+  if (! bfd_ecoff_debug_one_external (einfo->abfd, einfo->debug, einfo->swap,
+				      h->root.root.root.string,
+				      &h->esym))
+    {
+      einfo->failed = TRUE;
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* A comparison routine used to sort .gptab entries.  */
+
+static int
+gptab_compare (const void *p1, const void *p2)
+{
+  const Elf32_gptab *a1 = p1;
+  const Elf32_gptab *a2 = p2;
+
+  return a1->gt_entry.gt_g_value - a2->gt_entry.gt_g_value;
+}
+
+/* Functions to manage the got entry hash table.  */
+
+/* Use all 64 bits of a bfd_vma for the computation of a 32-bit
+   hash number.  */
+
+static INLINE hashval_t
+mips_elf_hash_bfd_vma (bfd_vma addr)
+{
+#ifdef BFD64
+  return addr + (addr >> 32);
+#else
+  return addr;
+#endif
+}
+
+/* got_entries only match if they're identical, except for gotidx, so
+   use all fields to compute the hash, and compare the appropriate
+   union members.  */
+
+static hashval_t
+mips_elf_got_entry_hash (const void *entry_)
+{
+  const struct mips_got_entry *entry = (struct mips_got_entry *)entry_;
+
+  return entry->symndx
+    + ((entry->tls_type & GOT_TLS_LDM) << 17)
+    + (! entry->abfd ? mips_elf_hash_bfd_vma (entry->d.address)
+       : entry->abfd->id
+         + (entry->symndx >= 0 ? mips_elf_hash_bfd_vma (entry->d.addend)
+	    : entry->d.h->root.root.root.hash));
+}
+
+static int
+mips_elf_got_entry_eq (const void *entry1, const void *entry2)
+{
+  const struct mips_got_entry *e1 = (struct mips_got_entry *)entry1;
+  const struct mips_got_entry *e2 = (struct mips_got_entry *)entry2;
+
+  /* An LDM entry can only match another LDM entry.  */
+  if ((e1->tls_type ^ e2->tls_type) & GOT_TLS_LDM)
+    return 0;
+
+  return e1->abfd == e2->abfd && e1->symndx == e2->symndx
+    && (! e1->abfd ? e1->d.address == e2->d.address
+	: e1->symndx >= 0 ? e1->d.addend == e2->d.addend
+	: e1->d.h == e2->d.h);
+}
+
+/* multi_got_entries are still a match in the case of global objects,
+   even if the input bfd in which they're referenced differs, so the
+   hash computation and compare functions are adjusted
+   accordingly.  */
+
+static hashval_t
+mips_elf_multi_got_entry_hash (const void *entry_)
+{
+  const struct mips_got_entry *entry = (struct mips_got_entry *)entry_;
+
+  return entry->symndx
+    + (! entry->abfd
+       ? mips_elf_hash_bfd_vma (entry->d.address)
+       : entry->symndx >= 0
+       ? ((entry->tls_type & GOT_TLS_LDM)
+	  ? (GOT_TLS_LDM << 17)
+	  : (entry->abfd->id
+	     + mips_elf_hash_bfd_vma (entry->d.addend)))
+       : entry->d.h->root.root.root.hash);
+}
+
+static int
+mips_elf_multi_got_entry_eq (const void *entry1, const void *entry2)
+{
+  const struct mips_got_entry *e1 = (struct mips_got_entry *)entry1;
+  const struct mips_got_entry *e2 = (struct mips_got_entry *)entry2;
+
+  /* Any two LDM entries match.  */
+  if (e1->tls_type & e2->tls_type & GOT_TLS_LDM)
+    return 1;
+
+  /* Nothing else matches an LDM entry.  */
+  if ((e1->tls_type ^ e2->tls_type) & GOT_TLS_LDM)
+    return 0;
+
+  return e1->symndx == e2->symndx
+    && (e1->symndx >= 0 ? e1->abfd == e2->abfd && e1->d.addend == e2->d.addend
+	: e1->abfd == NULL || e2->abfd == NULL
+	? e1->abfd == e2->abfd && e1->d.address == e2->d.address
+	: e1->d.h == e2->d.h);
+}
+
+static hashval_t
+mips_got_page_entry_hash (const void *entry_)
+{
+  const struct mips_got_page_entry *entry;
+
+  entry = (const struct mips_got_page_entry *) entry_;
+  return entry->abfd->id + entry->symndx;
+}
+
+static int
+mips_got_page_entry_eq (const void *entry1_, const void *entry2_)
+{
+  const struct mips_got_page_entry *entry1, *entry2;
+
+  entry1 = (const struct mips_got_page_entry *) entry1_;
+  entry2 = (const struct mips_got_page_entry *) entry2_;
+  return entry1->abfd == entry2->abfd && entry1->symndx == entry2->symndx;
+}
+
+/* Return the dynamic relocation section.  If it doesn't exist, try to
+   create a new it if CREATE_P, otherwise return NULL.  Also return NULL
+   if creation fails.  */
+
+static asection *
+mips_elf_rel_dyn_section (struct bfd_link_info *info, bfd_boolean create_p)
+{
+  const char *dname;
+  asection *sreloc;
+  bfd *dynobj;
+
+  dname = MIPS_ELF_REL_DYN_NAME (info);
+  dynobj = elf_hash_table (info)->dynobj;
+  sreloc = bfd_get_section_by_name (dynobj, dname);
+  if (sreloc == NULL && create_p)
+    {
+      sreloc = bfd_make_section_with_flags (dynobj, dname,
+					    (SEC_ALLOC
+					     | SEC_LOAD
+					     | SEC_HAS_CONTENTS
+					     | SEC_IN_MEMORY
+					     | SEC_LINKER_CREATED
+					     | SEC_READONLY));
+      if (sreloc == NULL
+	  || ! bfd_set_section_alignment (dynobj, sreloc,
+					  MIPS_ELF_LOG_FILE_ALIGN (dynobj)))
+	return NULL;
+    }
+  return sreloc;
+}
+
+/* Count the number of relocations needed for a TLS GOT entry, with
+   access types from TLS_TYPE, and symbol H (or a local symbol if H
+   is NULL).  */
+
+static int
+mips_tls_got_relocs (struct bfd_link_info *info, unsigned char tls_type,
+		     struct elf_link_hash_entry *h)
+{
+  int indx = 0;
+  int ret = 0;
+  bfd_boolean need_relocs = FALSE;
+  bfd_boolean dyn = elf_hash_table (info)->dynamic_sections_created;
+
+  if (h && WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+      && (!info->shared || !SYMBOL_REFERENCES_LOCAL (info, h)))
+    indx = h->dynindx;
+
+  if ((info->shared || indx != 0)
+      && (h == NULL
+	  || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+	  || h->root.type != bfd_link_hash_undefweak))
+    need_relocs = TRUE;
+
+  if (!need_relocs)
+    return FALSE;
+
+  if (tls_type & GOT_TLS_GD)
+    {
+      ret++;
+      if (indx != 0)
+	ret++;
+    }
+
+  if (tls_type & GOT_TLS_IE)
+    ret++;
+
+  if ((tls_type & GOT_TLS_LDM) && info->shared)
+    ret++;
+
+  return ret;
+}
+
+/* Count the number of TLS relocations required for the GOT entry in
+   ARG1, if it describes a local symbol.  */
+
+static int
+mips_elf_count_local_tls_relocs (void **arg1, void *arg2)
+{
+  struct mips_got_entry *entry = * (struct mips_got_entry **) arg1;
+  struct mips_elf_count_tls_arg *arg = arg2;
+
+  if (entry->abfd != NULL && entry->symndx != -1)
+    arg->needed += mips_tls_got_relocs (arg->info, entry->tls_type, NULL);
+
+  return 1;
+}
+
+/* Count the number of TLS GOT entries required for the global (or
+   forced-local) symbol in ARG1.  */
+
+static int
+mips_elf_count_global_tls_entries (void *arg1, void *arg2)
+{
+  struct mips_elf_link_hash_entry *hm
+    = (struct mips_elf_link_hash_entry *) arg1;
+  struct mips_elf_count_tls_arg *arg = arg2;
+
+  if (hm->tls_type & GOT_TLS_GD)
+    arg->needed += 2;
+  if (hm->tls_type & GOT_TLS_IE)
+    arg->needed += 1;
+
+  return 1;
+}
+
+/* Count the number of TLS relocations required for the global (or
+   forced-local) symbol in ARG1.  */
+
+static int
+mips_elf_count_global_tls_relocs (void *arg1, void *arg2)
+{
+  struct mips_elf_link_hash_entry *hm
+    = (struct mips_elf_link_hash_entry *) arg1;
+  struct mips_elf_count_tls_arg *arg = arg2;
+
+  arg->needed += mips_tls_got_relocs (arg->info, hm->tls_type, &hm->root);
+
+  return 1;
+}
+
+/* Output a simple dynamic relocation into SRELOC.  */
+
+static void
+mips_elf_output_dynamic_relocation (bfd *output_bfd,
+				    asection *sreloc,
+				    unsigned long reloc_index,
+				    unsigned long indx,
+				    int r_type,
+				    bfd_vma offset)
+{
+  Elf_Internal_Rela rel[3];
+
+  memset (rel, 0, sizeof (rel));
+
+  rel[0].r_info = ELF_R_INFO (output_bfd, indx, r_type);
+  rel[0].r_offset = rel[1].r_offset = rel[2].r_offset = offset;
+
+  if (ABI_64_P (output_bfd))
+    {
+      (*get_elf_backend_data (output_bfd)->s->swap_reloc_out)
+	(output_bfd, &rel[0],
+	 (sreloc->contents
+	  + reloc_index * sizeof (Elf64_Mips_External_Rel)));
+    }
+  else
+    bfd_elf32_swap_reloc_out
+      (output_bfd, &rel[0],
+       (sreloc->contents
+	+ reloc_index * sizeof (Elf32_External_Rel)));
+}
+
+/* Initialize a set of TLS GOT entries for one symbol.  */
+
+static void
+mips_elf_initialize_tls_slots (bfd *abfd, bfd_vma got_offset,
+			       unsigned char *tls_type_p,
+			       struct bfd_link_info *info,
+			       struct mips_elf_link_hash_entry *h,
+			       bfd_vma value)
+{
+  struct mips_elf_link_hash_table *htab;
+  int indx;
+  asection *sreloc, *sgot;
+  bfd_vma offset, offset2;
+  bfd_boolean need_relocs = FALSE;
+
+  htab = mips_elf_hash_table (info);
+  if (htab == NULL)
+    return;
+
+  sgot = htab->sgot;
+
+  indx = 0;
+  if (h != NULL)
+    {
+      bfd_boolean dyn = elf_hash_table (info)->dynamic_sections_created;
+
+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, &h->root)
+	  && (!info->shared || !SYMBOL_REFERENCES_LOCAL (info, &h->root)))
+	indx = h->root.dynindx;
+    }
+
+  if (*tls_type_p & GOT_TLS_DONE)
+    return;
+
+  if ((info->shared || indx != 0)
+      && (h == NULL
+	  || ELF_ST_VISIBILITY (h->root.other) == STV_DEFAULT
+	  || h->root.type != bfd_link_hash_undefweak))
+    need_relocs = TRUE;
+
+  /* MINUS_ONE means the symbol is not defined in this object.  It may not
+     be defined at all; assume that the value doesn't matter in that
+     case.  Otherwise complain if we would use the value.  */
+  BFD_ASSERT (value != MINUS_ONE || (indx != 0 && need_relocs)
+	      || h->root.root.type == bfd_link_hash_undefweak);
+
+  /* Emit necessary relocations.  */
+  sreloc = mips_elf_rel_dyn_section (info, FALSE);
+
+  /* General Dynamic.  */
+  if (*tls_type_p & GOT_TLS_GD)
+    {
+      offset = got_offset;
+      offset2 = offset + MIPS_ELF_GOT_SIZE (abfd);
+
+      if (need_relocs)
+	{
+	  mips_elf_output_dynamic_relocation
+	    (abfd, sreloc, sreloc->reloc_count++, indx,
+	     ABI_64_P (abfd) ? R_MIPS_TLS_DTPMOD64 : R_MIPS_TLS_DTPMOD32,
+	     sgot->output_offset + sgot->output_section->vma + offset);
+
+	  if (indx)
+	    mips_elf_output_dynamic_relocation
+	      (abfd, sreloc, sreloc->reloc_count++, indx,
+	       ABI_64_P (abfd) ? R_MIPS_TLS_DTPREL64 : R_MIPS_TLS_DTPREL32,
+	       sgot->output_offset + sgot->output_section->vma + offset2);
+	  else
+	    MIPS_ELF_PUT_WORD (abfd, value - dtprel_base (info),
+			       sgot->contents + offset2);
+	}
+      else
+	{
+	  MIPS_ELF_PUT_WORD (abfd, 1,
+			     sgot->contents + offset);
+	  MIPS_ELF_PUT_WORD (abfd, value - dtprel_base (info),
+			     sgot->contents + offset2);
+	}
+
+      got_offset += 2 * MIPS_ELF_GOT_SIZE (abfd);
+    }
+
+  /* Initial Exec model.  */
+  if (*tls_type_p & GOT_TLS_IE)
+    {
+      offset = got_offset;
+
+      if (need_relocs)
+	{
+	  if (indx == 0)
+	    MIPS_ELF_PUT_WORD (abfd, value - elf_hash_table (info)->tls_sec->vma,
+			       sgot->contents + offset);
+	  else
+	    MIPS_ELF_PUT_WORD (abfd, 0,
+			       sgot->contents + offset);
+
+	  mips_elf_output_dynamic_relocation
+	    (abfd, sreloc, sreloc->reloc_count++, indx,
+	     ABI_64_P (abfd) ? R_MIPS_TLS_TPREL64 : R_MIPS_TLS_TPREL32,
+	     sgot->output_offset + sgot->output_section->vma + offset);
+	}
+      else
+	MIPS_ELF_PUT_WORD (abfd, value - tprel_base (info),
+			   sgot->contents + offset);
+    }
+
+  if (*tls_type_p & GOT_TLS_LDM)
+    {
+      /* The initial offset is zero, and the LD offsets will include the
+	 bias by DTP_OFFSET.  */
+      MIPS_ELF_PUT_WORD (abfd, 0,
+			 sgot->contents + got_offset
+			 + MIPS_ELF_GOT_SIZE (abfd));
+
+      if (!info->shared)
+	MIPS_ELF_PUT_WORD (abfd, 1,
+			   sgot->contents + got_offset);
+      else
+	mips_elf_output_dynamic_relocation
+	  (abfd, sreloc, sreloc->reloc_count++, indx,
+	   ABI_64_P (abfd) ? R_MIPS_TLS_DTPMOD64 : R_MIPS_TLS_DTPMOD32,
+	   sgot->output_offset + sgot->output_section->vma + got_offset);
+    }
+
+  *tls_type_p |= GOT_TLS_DONE;
+}
+
+/* Return the GOT index to use for a relocation of type R_TYPE against
+   a symbol accessed using TLS_TYPE models.  The GOT entries for this
+   symbol in this GOT start at GOT_INDEX.  This function initializes the
+   GOT entries and corresponding relocations.  */
+
+static bfd_vma
+mips_tls_got_index (bfd *abfd, bfd_vma got_index, unsigned char *tls_type,
+		    int r_type, struct bfd_link_info *info,
+		    struct mips_elf_link_hash_entry *h, bfd_vma symbol)
+{
+  BFD_ASSERT (tls_gottprel_reloc_p (r_type)
+	      || tls_gd_reloc_p (r_type)
+	      || tls_ldm_reloc_p (r_type));
+
+  mips_elf_initialize_tls_slots (abfd, got_index, tls_type, info, h, symbol);
+
+  if (tls_gottprel_reloc_p (r_type))
+    {
+      BFD_ASSERT (*tls_type & GOT_TLS_IE);
+      if (*tls_type & GOT_TLS_GD)
+	return got_index + 2 * MIPS_ELF_GOT_SIZE (abfd);
+      else
+	return got_index;
+    }
+
+  if (tls_gd_reloc_p (r_type))
+    {
+      BFD_ASSERT (*tls_type & GOT_TLS_GD);
+      return got_index;
+    }
+
+  if (tls_ldm_reloc_p (r_type))
+    {
+      BFD_ASSERT (*tls_type & GOT_TLS_LDM);
+      return got_index;
+    }
+
+  return got_index;
+}
+
+/* Return the offset from _GLOBAL_OFFSET_TABLE_ of the .got.plt entry
+   for global symbol H.  .got.plt comes before the GOT, so the offset
+   will be negative.  */
+
+static bfd_vma
+mips_elf_gotplt_index (struct bfd_link_info *info,
+		       struct elf_link_hash_entry *h)
+{
+  bfd_vma plt_index, got_address, got_value;
+  struct mips_elf_link_hash_table *htab;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  BFD_ASSERT (h->plt.offset != (bfd_vma) -1);
+
+  /* This function only works for VxWorks, because a non-VxWorks .got.plt
+     section starts with reserved entries.  */
+  BFD_ASSERT (htab->is_vxworks);
+
+  /* Calculate the index of the symbol's PLT entry.  */
+  plt_index = (h->plt.offset - htab->plt_header_size) / htab->plt_entry_size;
+
+  /* Calculate the address of the associated .got.plt entry.  */
+  got_address = (htab->sgotplt->output_section->vma
+		 + htab->sgotplt->output_offset
+		 + plt_index * 4);
+
+  /* Calculate the value of _GLOBAL_OFFSET_TABLE_.  */
+  got_value = (htab->root.hgot->root.u.def.section->output_section->vma
+	       + htab->root.hgot->root.u.def.section->output_offset
+	       + htab->root.hgot->root.u.def.value);
+
+  return got_address - got_value;
+}
+
+/* Return the GOT offset for address VALUE.   If there is not yet a GOT
+   entry for this value, create one.  If R_SYMNDX refers to a TLS symbol,
+   create a TLS GOT entry instead.  Return -1 if no satisfactory GOT
+   offset can be found.  */
+
+static bfd_vma
+mips_elf_local_got_index (bfd *abfd, bfd *ibfd, struct bfd_link_info *info,
+			  bfd_vma value, unsigned long r_symndx,
+			  struct mips_elf_link_hash_entry *h, int r_type)
+{
+  struct mips_elf_link_hash_table *htab;
+  struct mips_got_entry *entry;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  entry = mips_elf_create_local_got_entry (abfd, info, ibfd, value,
+					   r_symndx, h, r_type);
+  if (!entry)
+    return MINUS_ONE;
+
+  if (TLS_RELOC_P (r_type))
+    {
+      if (entry->symndx == -1 && htab->got_info->next == NULL)
+	/* A type (3) entry in the single-GOT case.  We use the symbol's
+	   hash table entry to track the index.  */
+	return mips_tls_got_index (abfd, h->tls_got_offset, &h->tls_type,
+				   r_type, info, h, value);
+      else
+	return mips_tls_got_index (abfd, entry->gotidx, &entry->tls_type,
+				   r_type, info, h, value);
+    }
+  else
+    return entry->gotidx;
+}
+
+/* Returns the GOT index for the global symbol indicated by H.  */
+
+static bfd_vma
+mips_elf_global_got_index (bfd *abfd, bfd *ibfd, struct elf_link_hash_entry *h,
+			   int r_type, struct bfd_link_info *info)
+{
+  struct mips_elf_link_hash_table *htab;
+  bfd_vma got_index;
+  struct mips_got_info *g, *gg;
+  long global_got_dynindx = 0;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  gg = g = htab->got_info;
+  if (g->bfd2got && ibfd)
+    {
+      struct mips_got_entry e, *p;
+
+      BFD_ASSERT (h->dynindx >= 0);
+
+      g = mips_elf_got_for_ibfd (g, ibfd);
+      if (g->next != gg || TLS_RELOC_P (r_type))
+	{
+	  e.abfd = ibfd;
+	  e.symndx = -1;
+	  e.d.h = (struct mips_elf_link_hash_entry *)h;
+	  e.tls_type = 0;
+
+	  p = htab_find (g->got_entries, &e);
+
+	  BFD_ASSERT (p->gotidx > 0);
+
+	  if (TLS_RELOC_P (r_type))
+	    {
+	      bfd_vma value = MINUS_ONE;
+	      if ((h->root.type == bfd_link_hash_defined
+		   || h->root.type == bfd_link_hash_defweak)
+		  && h->root.u.def.section->output_section)
+		value = (h->root.u.def.value
+			 + h->root.u.def.section->output_offset
+			 + h->root.u.def.section->output_section->vma);
+
+	      return mips_tls_got_index (abfd, p->gotidx, &p->tls_type, r_type,
+					 info, e.d.h, value);
+	    }
+	  else
+	    return p->gotidx;
+	}
+    }
+
+  if (gg->global_gotsym != NULL)
+    global_got_dynindx = gg->global_gotsym->dynindx;
+
+  if (TLS_RELOC_P (r_type))
+    {
+      struct mips_elf_link_hash_entry *hm
+	= (struct mips_elf_link_hash_entry *) h;
+      bfd_vma value = MINUS_ONE;
+
+      if ((h->root.type == bfd_link_hash_defined
+	   || h->root.type == bfd_link_hash_defweak)
+	  && h->root.u.def.section->output_section)
+	value = (h->root.u.def.value
+		 + h->root.u.def.section->output_offset
+		 + h->root.u.def.section->output_section->vma);
+
+      got_index = mips_tls_got_index (abfd, hm->tls_got_offset, &hm->tls_type,
+				      r_type, info, hm, value);
+    }
+  else
+    {
+      /* Once we determine the global GOT entry with the lowest dynamic
+	 symbol table index, we must put all dynamic symbols with greater
+	 indices into the GOT.  That makes it easy to calculate the GOT
+	 offset.  */
+      BFD_ASSERT (h->dynindx >= global_got_dynindx);
+      got_index = ((h->dynindx - global_got_dynindx + g->local_gotno)
+		   * MIPS_ELF_GOT_SIZE (abfd));
+    }
+  BFD_ASSERT (got_index < htab->sgot->size);
+
+  return got_index;
+}
+
+/* Find a GOT page entry that points to within 32KB of VALUE.  These
+   entries are supposed to be placed at small offsets in the GOT, i.e.,
+   within 32KB of GP.  Return the index of the GOT entry, or -1 if no
+   entry could be created.  If OFFSETP is nonnull, use it to return the
+   offset of the GOT entry from VALUE.  */
+
+static bfd_vma
+mips_elf_got_page (bfd *abfd, bfd *ibfd, struct bfd_link_info *info,
+		   bfd_vma value, bfd_vma *offsetp)
+{
+  bfd_vma page, got_index;
+  struct mips_got_entry *entry;
+
+  page = (value + 0x8000) & ~(bfd_vma) 0xffff;
+  entry = mips_elf_create_local_got_entry (abfd, info, ibfd, page, 0,
+					   NULL, R_MIPS_GOT_PAGE);
+
+  if (!entry)
+    return MINUS_ONE;
+
+  got_index = entry->gotidx;
+
+  if (offsetp)
+    *offsetp = value - entry->d.address;
+
+  return got_index;
+}
+
+/* Find a local GOT entry for an R_MIPS*_GOT16 relocation against VALUE.
+   EXTERNAL is true if the relocation was originally against a global
+   symbol that binds locally.  */
+
+static bfd_vma
+mips_elf_got16_entry (bfd *abfd, bfd *ibfd, struct bfd_link_info *info,
+		      bfd_vma value, bfd_boolean external)
+{
+  struct mips_got_entry *entry;
+
+  /* GOT16 relocations against local symbols are followed by a LO16
+     relocation; those against global symbols are not.  Thus if the
+     symbol was originally local, the GOT16 relocation should load the
+     equivalent of %hi(VALUE), otherwise it should load VALUE itself.  */
+  if (! external)
+    value = mips_elf_high (value) << 16;
+
+  /* It doesn't matter whether the original relocation was R_MIPS_GOT16,
+     R_MIPS16_GOT16, R_MIPS_CALL16, etc.  The format of the entry is the
+     same in all cases.  */
+  entry = mips_elf_create_local_got_entry (abfd, info, ibfd, value, 0,
+					   NULL, R_MIPS_GOT16);
+  if (entry)
+    return entry->gotidx;
+  else
+    return MINUS_ONE;
+}
+
+/* Returns the offset for the entry at the INDEXth position
+   in the GOT.  */
+
+static bfd_vma
+mips_elf_got_offset_from_index (struct bfd_link_info *info, bfd *output_bfd,
+				bfd *input_bfd, bfd_vma got_index)
+{
+  struct mips_elf_link_hash_table *htab;
+  asection *sgot;
+  bfd_vma gp;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  sgot = htab->sgot;
+  gp = _bfd_get_gp_value (output_bfd)
+    + mips_elf_adjust_gp (output_bfd, htab->got_info, input_bfd);
+
+  return sgot->output_section->vma + sgot->output_offset + got_index - gp;
+}
+
+/* Create and return a local GOT entry for VALUE, which was calculated
+   from a symbol belonging to INPUT_SECTON.  Return NULL if it could not
+   be created.  If R_SYMNDX refers to a TLS symbol, create a TLS entry
+   instead.  */
+
+static struct mips_got_entry *
+mips_elf_create_local_got_entry (bfd *abfd, struct bfd_link_info *info,
+				 bfd *ibfd, bfd_vma value,
+				 unsigned long r_symndx,
+				 struct mips_elf_link_hash_entry *h,
+				 int r_type)
+{
+  struct mips_got_entry entry, **loc;
+  struct mips_got_info *g;
+  struct mips_elf_link_hash_table *htab;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  entry.abfd = NULL;
+  entry.symndx = -1;
+  entry.d.address = value;
+  entry.tls_type = 0;
+
+  g = mips_elf_got_for_ibfd (htab->got_info, ibfd);
+  if (g == NULL)
+    {
+      g = mips_elf_got_for_ibfd (htab->got_info, abfd);
+      BFD_ASSERT (g != NULL);
+    }
+
+  /* This function shouldn't be called for symbols that live in the global
+     area of the GOT.  */
+  BFD_ASSERT (h == NULL || h->global_got_area == GGA_NONE);
+  if (TLS_RELOC_P (r_type))
+    {
+      struct mips_got_entry *p;
+
+      entry.abfd = ibfd;
+      if (tls_ldm_reloc_p (r_type))
+	{
+	  entry.tls_type = GOT_TLS_LDM;
+	  entry.symndx = 0;
+	  entry.d.addend = 0;
+	}
+      else if (h == NULL)
+	{
+	  entry.symndx = r_symndx;
+	  entry.d.addend = 0;
+	}
+      else
+	entry.d.h = h;
+
+      p = (struct mips_got_entry *)
+	htab_find (g->got_entries, &entry);
+
+      BFD_ASSERT (p);
+      return p;
+    }
+
+  loc = (struct mips_got_entry **) htab_find_slot (g->got_entries, &entry,
+						   INSERT);
+  if (*loc)
+    return *loc;
+
+  entry.gotidx = MIPS_ELF_GOT_SIZE (abfd) * g->assigned_gotno++;
+  entry.tls_type = 0;
+
+  *loc = (struct mips_got_entry *)bfd_alloc (abfd, sizeof entry);
+
+  if (! *loc)
+    return NULL;
+
+  memcpy (*loc, &entry, sizeof entry);
+
+  if (g->assigned_gotno > g->local_gotno)
+    {
+      (*loc)->gotidx = -1;
+      /* We didn't allocate enough space in the GOT.  */
+      (*_bfd_error_handler)
+	(_("not enough GOT space for local GOT entries"));
+      bfd_set_error (bfd_error_bad_value);
+      return NULL;
+    }
+
+  MIPS_ELF_PUT_WORD (abfd, value,
+		     (htab->sgot->contents + entry.gotidx));
+
+  /* These GOT entries need a dynamic relocation on VxWorks.  */
+  if (htab->is_vxworks)
+    {
+      Elf_Internal_Rela outrel;
+      asection *s;
+      bfd_byte *rloc;
+      bfd_vma got_address;
+
+      s = mips_elf_rel_dyn_section (info, FALSE);
+      got_address = (htab->sgot->output_section->vma
+		     + htab->sgot->output_offset
+		     + entry.gotidx);
+
+      rloc = s->contents + (s->reloc_count++ * sizeof (Elf32_External_Rela));
+      outrel.r_offset = got_address;
+      outrel.r_info = ELF32_R_INFO (STN_UNDEF, R_MIPS_32);
+      outrel.r_addend = value;
+      bfd_elf32_swap_reloca_out (abfd, &outrel, rloc);
+    }
+
+  return *loc;
+}
+
+/* Return the number of dynamic section symbols required by OUTPUT_BFD.
+   The number might be exact or a worst-case estimate, depending on how
+   much information is available to elf_backend_omit_section_dynsym at
+   the current linking stage.  */
+
+static bfd_size_type
+count_section_dynsyms (bfd *output_bfd, struct bfd_link_info *info)
+{
+  bfd_size_type count;
+
+  count = 0;
+  if (info->shared || elf_hash_table (info)->is_relocatable_executable)
+    {
+      asection *p;
+      const struct elf_backend_data *bed;
+
+      bed = get_elf_backend_data (output_bfd);
+      for (p = output_bfd->sections; p ; p = p->next)
+	if ((p->flags & SEC_EXCLUDE) == 0
+	    && (p->flags & SEC_ALLOC) != 0
+	    && !(*bed->elf_backend_omit_section_dynsym) (output_bfd, info, p))
+	  ++count;
+    }
+  return count;
+}
+
+/* Sort the dynamic symbol table so that symbols that need GOT entries
+   appear towards the end.  */
+
+static bfd_boolean
+mips_elf_sort_hash_table (bfd *abfd, struct bfd_link_info *info)
+{
+  struct mips_elf_link_hash_table *htab;
+  struct mips_elf_hash_sort_data hsd;
+  struct mips_got_info *g;
+
+  if (elf_hash_table (info)->dynsymcount == 0)
+    return TRUE;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  g = htab->got_info;
+  if (g == NULL)
+    return TRUE;
+
+  hsd.low = NULL;
+  hsd.max_unref_got_dynindx
+    = hsd.min_got_dynindx
+    = (elf_hash_table (info)->dynsymcount - g->reloc_only_gotno);
+  hsd.max_non_got_dynindx = count_section_dynsyms (abfd, info) + 1;
+  mips_elf_link_hash_traverse (((struct mips_elf_link_hash_table *)
+				elf_hash_table (info)),
+			       mips_elf_sort_hash_table_f,
+			       &hsd);
+
+  /* There should have been enough room in the symbol table to
+     accommodate both the GOT and non-GOT symbols.  */
+  BFD_ASSERT (hsd.max_non_got_dynindx <= hsd.min_got_dynindx);
+  BFD_ASSERT ((unsigned long) hsd.max_unref_got_dynindx
+	      == elf_hash_table (info)->dynsymcount);
+  BFD_ASSERT (elf_hash_table (info)->dynsymcount - hsd.min_got_dynindx
+	      == g->global_gotno);
+
+  /* Now we know which dynamic symbol has the lowest dynamic symbol
+     table index in the GOT.  */
+  g->global_gotsym = hsd.low;
+
+  return TRUE;
+}
+
+/* If H needs a GOT entry, assign it the highest available dynamic
+   index.  Otherwise, assign it the lowest available dynamic
+   index.  */
+
+static bfd_boolean
+mips_elf_sort_hash_table_f (struct mips_elf_link_hash_entry *h, void *data)
+{
+  struct mips_elf_hash_sort_data *hsd = data;
+
+  /* Symbols without dynamic symbol table entries aren't interesting
+     at all.  */
+  if (h->root.dynindx == -1)
+    return TRUE;
+
+  switch (h->global_got_area)
+    {
+    case GGA_NONE:
+      h->root.dynindx = hsd->max_non_got_dynindx++;
+      break;
+
+    case GGA_NORMAL:
+      BFD_ASSERT (h->tls_type == GOT_NORMAL);
+
+      h->root.dynindx = --hsd->min_got_dynindx;
+      hsd->low = (struct elf_link_hash_entry *) h;
+      break;
+
+    case GGA_RELOC_ONLY:
+      BFD_ASSERT (h->tls_type == GOT_NORMAL);
+
+      if (hsd->max_unref_got_dynindx == hsd->min_got_dynindx)
+	hsd->low = (struct elf_link_hash_entry *) h;
+      h->root.dynindx = hsd->max_unref_got_dynindx++;
+      break;
+    }
+
+  return TRUE;
+}
+
+/* If H is a symbol that needs a global GOT entry, but has a dynamic
+   symbol table index lower than any we've seen to date, record it for
+   posterity.  FOR_CALL is true if the caller is only interested in
+   using the GOT entry for calls.  */
+
+static bfd_boolean
+mips_elf_record_global_got_symbol (struct elf_link_hash_entry *h,
+				   bfd *abfd, struct bfd_link_info *info,
+				   bfd_boolean for_call,
+				   unsigned char tls_flag)
+{
+  struct mips_elf_link_hash_table *htab;
+  struct mips_elf_link_hash_entry *hmips;
+  struct mips_got_entry entry, **loc;
+  struct mips_got_info *g;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  hmips = (struct mips_elf_link_hash_entry *) h;
+  if (!for_call)
+    hmips->got_only_for_calls = FALSE;
+
+  /* A global symbol in the GOT must also be in the dynamic symbol
+     table.  */
+  if (h->dynindx == -1)
+    {
+      switch (ELF_ST_VISIBILITY (h->other))
+	{
+	case STV_INTERNAL:
+	case STV_HIDDEN:
+	  _bfd_elf_link_hash_hide_symbol (info, h, TRUE);
+	  break;
+	}
+      if (!bfd_elf_link_record_dynamic_symbol (info, h))
+	return FALSE;
+    }
+
+  /* Make sure we have a GOT to put this entry into.  */
+  g = htab->got_info;
+  BFD_ASSERT (g != NULL);
+
+  entry.abfd = abfd;
+  entry.symndx = -1;
+  entry.d.h = (struct mips_elf_link_hash_entry *) h;
+  entry.tls_type = 0;
+
+  loc = (struct mips_got_entry **) htab_find_slot (g->got_entries, &entry,
+						   INSERT);
+
+  /* If we've already marked this entry as needing GOT space, we don't
+     need to do it again.  */
+  if (*loc)
+    {
+      (*loc)->tls_type |= tls_flag;
+      return TRUE;
+    }
+
+  *loc = (struct mips_got_entry *)bfd_alloc (abfd, sizeof entry);
+
+  if (! *loc)
+    return FALSE;
+
+  entry.gotidx = -1;
+  entry.tls_type = tls_flag;
+
+  memcpy (*loc, &entry, sizeof entry);
+
+  if (tls_flag == 0)
+    hmips->global_got_area = GGA_NORMAL;
+
+  return TRUE;
+}
+
+/* Reserve space in G for a GOT entry containing the value of symbol
+   SYMNDX in input bfd ABDF, plus ADDEND.  */
+
+static bfd_boolean
+mips_elf_record_local_got_symbol (bfd *abfd, long symndx, bfd_vma addend,
+				  struct bfd_link_info *info,
+				  unsigned char tls_flag)
+{
+  struct mips_elf_link_hash_table *htab;
+  struct mips_got_info *g;
+  struct mips_got_entry entry, **loc;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  g = htab->got_info;
+  BFD_ASSERT (g != NULL);
+
+  entry.abfd = abfd;
+  entry.symndx = symndx;
+  entry.d.addend = addend;
+  entry.tls_type = tls_flag;
+  loc = (struct mips_got_entry **)
+    htab_find_slot (g->got_entries, &entry, INSERT);
+
+  if (*loc)
+    {
+      if (tls_flag == GOT_TLS_GD && !((*loc)->tls_type & GOT_TLS_GD))
+	{
+	  g->tls_gotno += 2;
+	  (*loc)->tls_type |= tls_flag;
+	}
+      else if (tls_flag == GOT_TLS_IE && !((*loc)->tls_type & GOT_TLS_IE))
+	{
+	  g->tls_gotno += 1;
+	  (*loc)->tls_type |= tls_flag;
+	}
+      return TRUE;
+    }
+
+  if (tls_flag != 0)
+    {
+      entry.gotidx = -1;
+      entry.tls_type = tls_flag;
+      if (tls_flag == GOT_TLS_IE)
+	g->tls_gotno += 1;
+      else if (tls_flag == GOT_TLS_GD)
+	g->tls_gotno += 2;
+      else if (g->tls_ldm_offset == MINUS_ONE)
+	{
+	  g->tls_ldm_offset = MINUS_TWO;
+	  g->tls_gotno += 2;
+	}
+    }
+  else
+    {
+      entry.gotidx = g->local_gotno++;
+      entry.tls_type = 0;
+    }
+
+  *loc = (struct mips_got_entry *)bfd_alloc (abfd, sizeof entry);
+
+  if (! *loc)
+    return FALSE;
+
+  memcpy (*loc, &entry, sizeof entry);
+
+  return TRUE;
+}
+
+/* Return the maximum number of GOT page entries required for RANGE.  */
+
+static bfd_vma
+mips_elf_pages_for_range (const struct mips_got_page_range *range)
+{
+  return (range->max_addend - range->min_addend + 0x1ffff) >> 16;
+}
+
+/* Record that ABFD has a page relocation against symbol SYMNDX and
+   that ADDEND is the addend for that relocation.
+
+   This function creates an upper bound on the number of GOT slots
+   required; no attempt is made to combine references to non-overridable
+   global symbols across multiple input files.  */
+
+static bfd_boolean
+mips_elf_record_got_page_entry (struct bfd_link_info *info, bfd *abfd,
+				long symndx, bfd_signed_vma addend)
+{
+  struct mips_elf_link_hash_table *htab;
+  struct mips_got_info *g;
+  struct mips_got_page_entry lookup, *entry;
+  struct mips_got_page_range **range_ptr, *range;
+  bfd_vma old_pages, new_pages;
+  void **loc;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  g = htab->got_info;
+  BFD_ASSERT (g != NULL);
+
+  /* Find the mips_got_page_entry hash table entry for this symbol.  */
+  lookup.abfd = abfd;
+  lookup.symndx = symndx;
+  loc = htab_find_slot (g->got_page_entries, &lookup, INSERT);
+  if (loc == NULL)
+    return FALSE;
+
+  /* Create a mips_got_page_entry if this is the first time we've
+     seen the symbol.  */
+  entry = (struct mips_got_page_entry *) *loc;
+  if (!entry)
+    {
+      entry = bfd_alloc (abfd, sizeof (*entry));
+      if (!entry)
+	return FALSE;
+
+      entry->abfd = abfd;
+      entry->symndx = symndx;
+      entry->ranges = NULL;
+      entry->num_pages = 0;
+      *loc = entry;
+    }
+
+  /* Skip over ranges whose maximum extent cannot share a page entry
+     with ADDEND.  */
+  range_ptr = &entry->ranges;
+  while (*range_ptr && addend > (*range_ptr)->max_addend + 0xffff)
+    range_ptr = &(*range_ptr)->next;
+
+  /* If we scanned to the end of the list, or found a range whose
+     minimum extent cannot share a page entry with ADDEND, create
+     a new singleton range.  */
+  range = *range_ptr;
+  if (!range || addend < range->min_addend - 0xffff)
+    {
+      range = bfd_alloc (abfd, sizeof (*range));
+      if (!range)
+	return FALSE;
+
+      range->next = *range_ptr;
+      range->min_addend = addend;
+      range->max_addend = addend;
+
+      *range_ptr = range;
+      entry->num_pages++;
+      g->page_gotno++;
+      return TRUE;
+    }
+
+  /* Remember how many pages the old range contributed.  */
+  old_pages = mips_elf_pages_for_range (range);
+
+  /* Update the ranges.  */
+  if (addend < range->min_addend)
+    range->min_addend = addend;
+  else if (addend > range->max_addend)
+    {
+      if (range->next && addend >= range->next->min_addend - 0xffff)
+	{
+	  old_pages += mips_elf_pages_for_range (range->next);
+	  range->max_addend = range->next->max_addend;
+	  range->next = range->next->next;
+	}
+      else
+	range->max_addend = addend;
+    }
+
+  /* Record any change in the total estimate.  */
+  new_pages = mips_elf_pages_for_range (range);
+  if (old_pages != new_pages)
+    {
+      entry->num_pages += new_pages - old_pages;
+      g->page_gotno += new_pages - old_pages;
+    }
+
+  return TRUE;
+}
+
+/* Add room for N relocations to the .rel(a).dyn section in ABFD.  */
+
+static void
+mips_elf_allocate_dynamic_relocations (bfd *abfd, struct bfd_link_info *info,
+				       unsigned int n)
+{
+  asection *s;
+  struct mips_elf_link_hash_table *htab;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  s = mips_elf_rel_dyn_section (info, FALSE);
+  BFD_ASSERT (s != NULL);
+
+  if (htab->is_vxworks)
+    s->size += n * MIPS_ELF_RELA_SIZE (abfd);
+  else
+    {
+      if (s->size == 0)
+	{
+	  /* Make room for a null element.  */
+	  s->size += MIPS_ELF_REL_SIZE (abfd);
+	  ++s->reloc_count;
+	}
+      s->size += n * MIPS_ELF_REL_SIZE (abfd);
+    }
+}
+
+/* A htab_traverse callback for GOT entries.  Set boolean *DATA to true
+   if the GOT entry is for an indirect or warning symbol.  */
+
+static int
+mips_elf_check_recreate_got (void **entryp, void *data)
+{
+  struct mips_got_entry *entry;
+  bfd_boolean *must_recreate;
+
+  entry = (struct mips_got_entry *) *entryp;
+  must_recreate = (bfd_boolean *) data;
+  if (entry->abfd != NULL && entry->symndx == -1)
+    {
+      struct mips_elf_link_hash_entry *h;
+
+      h = entry->d.h;
+      if (h->root.root.type == bfd_link_hash_indirect
+	  || h->root.root.type == bfd_link_hash_warning)
+	{
+	  *must_recreate = TRUE;
+	  return 0;
+	}
+    }
+  return 1;
+}
+
+/* A htab_traverse callback for GOT entries.  Add all entries to
+   hash table *DATA, converting entries for indirect and warning
+   symbols into entries for the target symbol.  Set *DATA to null
+   on error.  */
+
+static int
+mips_elf_recreate_got (void **entryp, void *data)
+{
+  htab_t *new_got;
+  struct mips_got_entry *entry;
+  void **slot;
+
+  new_got = (htab_t *) data;
+  entry = (struct mips_got_entry *) *entryp;
+  if (entry->abfd != NULL && entry->symndx == -1)
+    {
+      struct mips_elf_link_hash_entry *h;
+
+      h = entry->d.h;
+      while (h->root.root.type == bfd_link_hash_indirect
+	     || h->root.root.type == bfd_link_hash_warning)
+	{
+	  BFD_ASSERT (h->global_got_area == GGA_NONE);
+	  h = (struct mips_elf_link_hash_entry *) h->root.root.u.i.link;
+	}
+      entry->d.h = h;
+    }
+  slot = htab_find_slot (*new_got, entry, INSERT);
+  if (slot == NULL)
+    {
+      *new_got = NULL;
+      return 0;
+    }
+  if (*slot == NULL)
+    *slot = entry;
+  else
+    free (entry);
+  return 1;
+}
+
+/* If any entries in G->got_entries are for indirect or warning symbols,
+   replace them with entries for the target symbol.  */
+
+static bfd_boolean
+mips_elf_resolve_final_got_entries (struct mips_got_info *g)
+{
+  bfd_boolean must_recreate;
+  htab_t new_got;
+
+  must_recreate = FALSE;
+  htab_traverse (g->got_entries, mips_elf_check_recreate_got, &must_recreate);
+  if (must_recreate)
+    {
+      new_got = htab_create (htab_size (g->got_entries),
+			     mips_elf_got_entry_hash,
+			     mips_elf_got_entry_eq, NULL);
+      htab_traverse (g->got_entries, mips_elf_recreate_got, &new_got);
+      if (new_got == NULL)
+	return FALSE;
+
+      /* Each entry in g->got_entries has either been copied to new_got
+	 or freed.  Now delete the hash table itself.  */
+      htab_delete (g->got_entries);
+      g->got_entries = new_got;
+    }
+  return TRUE;
+}
+
+/* A mips_elf_link_hash_traverse callback for which DATA points
+   to the link_info structure.  Count the number of type (3) entries
+   in the master GOT.  */
+
+static int
+mips_elf_count_got_symbols (struct mips_elf_link_hash_entry *h, void *data)
+{
+  struct bfd_link_info *info;
+  struct mips_elf_link_hash_table *htab;
+  struct mips_got_info *g;
+
+  info = (struct bfd_link_info *) data;
+  htab = mips_elf_hash_table (info);
+  g = htab->got_info;
+  if (h->global_got_area != GGA_NONE)
+    {
+      /* Make a final decision about whether the symbol belongs in the
+	 local or global GOT.  Symbols that bind locally can (and in the
+	 case of forced-local symbols, must) live in the local GOT.
+	 Those that are aren't in the dynamic symbol table must also
+	 live in the local GOT.
+
+	 Note that the former condition does not always imply the
+	 latter: symbols do not bind locally if they are completely
+	 undefined.  We'll report undefined symbols later if appropriate.  */
+      if (h->root.dynindx == -1
+	  || (h->got_only_for_calls
+	      ? SYMBOL_CALLS_LOCAL (info, &h->root)
+	      : SYMBOL_REFERENCES_LOCAL (info, &h->root)))
+	{
+	  /* The symbol belongs in the local GOT.  We no longer need this
+	     entry if it was only used for relocations; those relocations
+	     will be against the null or section symbol instead of H.  */
+	  if (h->global_got_area != GGA_RELOC_ONLY)
+	    g->local_gotno++;
+	  h->global_got_area = GGA_NONE;
+	}
+      else if (htab->is_vxworks
+	       && h->got_only_for_calls
+	       && h->root.plt.offset != MINUS_ONE)
+	/* On VxWorks, calls can refer directly to the .got.plt entry;
+	   they don't need entries in the regular GOT.  .got.plt entries
+	   will be allocated by _bfd_mips_elf_adjust_dynamic_symbol.  */
+	h->global_got_area = GGA_NONE;
+      else
+	{
+	  g->global_gotno++;
+	  if (h->global_got_area == GGA_RELOC_ONLY)
+	    g->reloc_only_gotno++;
+	}
+    }
+  return 1;
+}
+
+/* Compute the hash value of the bfd in a bfd2got hash entry.  */
+
+static hashval_t
+mips_elf_bfd2got_entry_hash (const void *entry_)
+{
+  const struct mips_elf_bfd2got_hash *entry
+    = (struct mips_elf_bfd2got_hash *)entry_;
+
+  return entry->bfd->id;
+}
+
+/* Check whether two hash entries have the same bfd.  */
+
+static int
+mips_elf_bfd2got_entry_eq (const void *entry1, const void *entry2)
+{
+  const struct mips_elf_bfd2got_hash *e1
+    = (const struct mips_elf_bfd2got_hash *)entry1;
+  const struct mips_elf_bfd2got_hash *e2
+    = (const struct mips_elf_bfd2got_hash *)entry2;
+
+  return e1->bfd == e2->bfd;
+}
+
+/* In a multi-got link, determine the GOT to be used for IBFD.  G must
+   be the master GOT data.  */
+
+static struct mips_got_info *
+mips_elf_got_for_ibfd (struct mips_got_info *g, bfd *ibfd)
+{
+  struct mips_elf_bfd2got_hash e, *p;
+
+  if (! g->bfd2got)
+    return g;
+
+  e.bfd = ibfd;
+  p = htab_find (g->bfd2got, &e);
+  return p ? p->g : NULL;
+}
+
+/* Use BFD2GOT to find ABFD's got entry, creating one if none exists.
+   Return NULL if an error occured.  */
+
+static struct mips_got_info *
+mips_elf_get_got_for_bfd (struct htab *bfd2got, bfd *output_bfd,
+			  bfd *input_bfd)
+{
+  struct mips_elf_bfd2got_hash bfdgot_entry, *bfdgot;
+  struct mips_got_info *g;
+  void **bfdgotp;
+
+  bfdgot_entry.bfd = input_bfd;
+  bfdgotp = htab_find_slot (bfd2got, &bfdgot_entry, INSERT);
+  bfdgot = (struct mips_elf_bfd2got_hash *) *bfdgotp;
+
+  if (bfdgot == NULL)
+    {
+      bfdgot = ((struct mips_elf_bfd2got_hash *)
+		bfd_alloc (output_bfd, sizeof (struct mips_elf_bfd2got_hash)));
+      if (bfdgot == NULL)
+	return NULL;
+
+      *bfdgotp = bfdgot;
+
+      g = ((struct mips_got_info *)
+	   bfd_alloc (output_bfd, sizeof (struct mips_got_info)));
+      if (g == NULL)
+	return NULL;
+
+      bfdgot->bfd = input_bfd;
+      bfdgot->g = g;
+
+      g->global_gotsym = NULL;
+      g->global_gotno = 0;
+      g->reloc_only_gotno = 0;
+      g->local_gotno = 0;
+      g->page_gotno = 0;
+      g->assigned_gotno = -1;
+      g->tls_gotno = 0;
+      g->tls_assigned_gotno = 0;
+      g->tls_ldm_offset = MINUS_ONE;
+      g->got_entries = htab_try_create (1, mips_elf_multi_got_entry_hash,
+					mips_elf_multi_got_entry_eq, NULL);
+      if (g->got_entries == NULL)
+	return NULL;
+
+      g->got_page_entries = htab_try_create (1, mips_got_page_entry_hash,
+					     mips_got_page_entry_eq, NULL);
+      if (g->got_page_entries == NULL)
+	return NULL;
+
+      g->bfd2got = NULL;
+      g->next = NULL;
+    }
+
+  return bfdgot->g;
+}
+
+/* A htab_traverse callback for the entries in the master got.
+   Create one separate got for each bfd that has entries in the global
+   got, such that we can tell how many local and global entries each
+   bfd requires.  */
+
+static int
+mips_elf_make_got_per_bfd (void **entryp, void *p)
+{
+  struct mips_got_entry *entry = (struct mips_got_entry *)*entryp;
+  struct mips_elf_got_per_bfd_arg *arg = (struct mips_elf_got_per_bfd_arg *)p;
+  struct mips_got_info *g;
+
+  g = mips_elf_get_got_for_bfd (arg->bfd2got, arg->obfd, entry->abfd);
+  if (g == NULL)
+    {
+      arg->obfd = NULL;
+      return 0;
+    }
+
+  /* Insert the GOT entry in the bfd's got entry hash table.  */
+  entryp = htab_find_slot (g->got_entries, entry, INSERT);
+  if (*entryp != NULL)
+    return 1;
+
+  *entryp = entry;
+
+  if (entry->tls_type)
+    {
+      if (entry->tls_type & (GOT_TLS_GD | GOT_TLS_LDM))
+	g->tls_gotno += 2;
+      if (entry->tls_type & GOT_TLS_IE)
+	g->tls_gotno += 1;
+    }
+  else if (entry->symndx >= 0 || entry->d.h->global_got_area == GGA_NONE)
+    ++g->local_gotno;
+  else
+    ++g->global_gotno;
+
+  return 1;
+}
+
+/* A htab_traverse callback for the page entries in the master got.
+   Associate each page entry with the bfd's got.  */
+
+static int
+mips_elf_make_got_pages_per_bfd (void **entryp, void *p)
+{
+  struct mips_got_page_entry *entry = (struct mips_got_page_entry *) *entryp;
+  struct mips_elf_got_per_bfd_arg *arg = (struct mips_elf_got_per_bfd_arg *) p;
+  struct mips_got_info *g;
+
+  g = mips_elf_get_got_for_bfd (arg->bfd2got, arg->obfd, entry->abfd);
+  if (g == NULL)
+    {
+      arg->obfd = NULL;
+      return 0;
+    }
+
+  /* Insert the GOT entry in the bfd's got entry hash table.  */
+  entryp = htab_find_slot (g->got_page_entries, entry, INSERT);
+  if (*entryp != NULL)
+    return 1;
+
+  *entryp = entry;
+  g->page_gotno += entry->num_pages;
+  return 1;
+}
+
+/* Consider merging the got described by BFD2GOT with TO, using the
+   information given by ARG.  Return -1 if this would lead to overflow,
+   1 if they were merged successfully, and 0 if a merge failed due to
+   lack of memory.  (These values are chosen so that nonnegative return
+   values can be returned by a htab_traverse callback.)  */
+
+static int
+mips_elf_merge_got_with (struct mips_elf_bfd2got_hash *bfd2got,
+			 struct mips_got_info *to,
+			 struct mips_elf_got_per_bfd_arg *arg)
+{
+  struct mips_got_info *from = bfd2got->g;
+  unsigned int estimate;
+
+  /* Work out how many page entries we would need for the combined GOT.  */
+  estimate = arg->max_pages;
+  if (estimate >= from->page_gotno + to->page_gotno)
+    estimate = from->page_gotno + to->page_gotno;
+
+  /* And conservatively estimate how many local and TLS entries
+     would be needed.  */
+  estimate += from->local_gotno + to->local_gotno;
+  estimate += from->tls_gotno + to->tls_gotno;
+
+  /* If we're merging with the primary got, we will always have
+     the full set of global entries.  Otherwise estimate those
+     conservatively as well.  */
+  if (to == arg->primary)
+    estimate += arg->global_count;
+  else
+    estimate += from->global_gotno + to->global_gotno;
+
+  /* Bail out if the combined GOT might be too big.  */
+  if (estimate > arg->max_count)
+    return -1;
+
+  /* Commit to the merge.  Record that TO is now the bfd for this got.  */
+  bfd2got->g = to;
+
+  /* Transfer the bfd's got information from FROM to TO.  */
+  htab_traverse (from->got_entries, mips_elf_make_got_per_bfd, arg);
+  if (arg->obfd == NULL)
+    return 0;
+
+  htab_traverse (from->got_page_entries, mips_elf_make_got_pages_per_bfd, arg);
+  if (arg->obfd == NULL)
+    return 0;
+
+  /* We don't have to worry about releasing memory of the actual
+     got entries, since they're all in the master got_entries hash
+     table anyway.  */
+  htab_delete (from->got_entries);
+  htab_delete (from->got_page_entries);
+  return 1;
+}
+
+/* Attempt to merge gots of different input bfds.  Try to use as much
+   as possible of the primary got, since it doesn't require explicit
+   dynamic relocations, but don't use bfds that would reference global
+   symbols out of the addressable range.  Failing the primary got,
+   attempt to merge with the current got, or finish the current got
+   and then make make the new got current.  */
+
+static int
+mips_elf_merge_gots (void **bfd2got_, void *p)
+{
+  struct mips_elf_bfd2got_hash *bfd2got
+    = (struct mips_elf_bfd2got_hash *)*bfd2got_;
+  struct mips_elf_got_per_bfd_arg *arg = (struct mips_elf_got_per_bfd_arg *)p;
+  struct mips_got_info *g;
+  unsigned int estimate;
+  int result;
+
+  g = bfd2got->g;
+
+  /* Work out the number of page, local and TLS entries.  */
+  estimate = arg->max_pages;
+  if (estimate > g->page_gotno)
+    estimate = g->page_gotno;
+  estimate += g->local_gotno + g->tls_gotno;
+
+  /* We place TLS GOT entries after both locals and globals.  The globals
+     for the primary GOT may overflow the normal GOT size limit, so be
+     sure not to merge a GOT which requires TLS with the primary GOT in that
+     case.  This doesn't affect non-primary GOTs.  */
+  estimate += (g->tls_gotno > 0 ? arg->global_count : g->global_gotno);
+
+  if (estimate <= arg->max_count)
+    {
+      /* If we don't have a primary GOT, use it as
+	 a starting point for the primary GOT.  */
+      if (!arg->primary)
+	{
+	  arg->primary = bfd2got->g;
+	  return 1;
+	}
+
+      /* Try merging with the primary GOT.  */
+      result = mips_elf_merge_got_with (bfd2got, arg->primary, arg);
+      if (result >= 0)
+	return result;
+    }
+
+  /* If we can merge with the last-created got, do it.  */
+  if (arg->current)
+    {
+      result = mips_elf_merge_got_with (bfd2got, arg->current, arg);
+      if (result >= 0)
+	return result;
+    }
+
+  /* Well, we couldn't merge, so create a new GOT.  Don't check if it
+     fits; if it turns out that it doesn't, we'll get relocation
+     overflows anyway.  */
+  g->next = arg->current;
+  arg->current = g;
+
+  return 1;
+}
+
+/* Set the TLS GOT index for the GOT entry in ENTRYP.  ENTRYP's NEXT field
+   is null iff there is just a single GOT.  */
+
+static int
+mips_elf_initialize_tls_index (void **entryp, void *p)
+{
+  struct mips_got_entry *entry = (struct mips_got_entry *)*entryp;
+  struct mips_got_info *g = p;
+  bfd_vma next_index;
+  unsigned char tls_type;
+
+  /* We're only interested in TLS symbols.  */
+  if (entry->tls_type == 0)
+    return 1;
+
+  next_index = MIPS_ELF_GOT_SIZE (entry->abfd) * (long) g->tls_assigned_gotno;
+
+  if (entry->symndx == -1 && g->next == NULL)
+    {
+      /* A type (3) got entry in the single-GOT case.  We use the symbol's
+	 hash table entry to track its index.  */
+      if (entry->d.h->tls_type & GOT_TLS_OFFSET_DONE)
+	return 1;
+      entry->d.h->tls_type |= GOT_TLS_OFFSET_DONE;
+      entry->d.h->tls_got_offset = next_index;
+      tls_type = entry->d.h->tls_type;
+    }
+  else
+    {
+      if (entry->tls_type & GOT_TLS_LDM)
+	{
+	  /* There are separate mips_got_entry objects for each input bfd
+	     that requires an LDM entry.  Make sure that all LDM entries in
+	     a GOT resolve to the same index.  */
+	  if (g->tls_ldm_offset != MINUS_TWO && g->tls_ldm_offset != MINUS_ONE)
+	    {
+	      entry->gotidx = g->tls_ldm_offset;
+	      return 1;
+	    }
+	  g->tls_ldm_offset = next_index;
+	}
+      entry->gotidx = next_index;
+      tls_type = entry->tls_type;
+    }
+
+  /* Account for the entries we've just allocated.  */
+  if (tls_type & (GOT_TLS_GD | GOT_TLS_LDM))
+    g->tls_assigned_gotno += 2;
+  if (tls_type & GOT_TLS_IE)
+    g->tls_assigned_gotno += 1;
+
+  return 1;
+}
+
+/* If passed a NULL mips_got_info in the argument, set the marker used
+   to tell whether a global symbol needs a got entry (in the primary
+   got) to the given VALUE.
+
+   If passed a pointer G to a mips_got_info in the argument (it must
+   not be the primary GOT), compute the offset from the beginning of
+   the (primary) GOT section to the entry in G corresponding to the
+   global symbol.  G's assigned_gotno must contain the index of the
+   first available global GOT entry in G.  VALUE must contain the size
+   of a GOT entry in bytes.  For each global GOT entry that requires a
+   dynamic relocation, NEEDED_RELOCS is incremented, and the symbol is
+   marked as not eligible for lazy resolution through a function
+   stub.  */
+static int
+mips_elf_set_global_got_offset (void **entryp, void *p)
+{
+  struct mips_got_entry *entry = (struct mips_got_entry *)*entryp;
+  struct mips_elf_set_global_got_offset_arg *arg
+    = (struct mips_elf_set_global_got_offset_arg *)p;
+  struct mips_got_info *g = arg->g;
+
+  if (g && entry->tls_type != GOT_NORMAL)
+    arg->needed_relocs +=
+      mips_tls_got_relocs (arg->info, entry->tls_type,
+			   entry->symndx == -1 ? &entry->d.h->root : NULL);
+
+  if (entry->abfd != NULL
+      && entry->symndx == -1
+      && entry->d.h->global_got_area != GGA_NONE)
+    {
+      if (g)
+	{
+	  BFD_ASSERT (g->global_gotsym == NULL);
+
+	  entry->gotidx = arg->value * (long) g->assigned_gotno++;
+	  if (arg->info->shared
+	      || (elf_hash_table (arg->info)->dynamic_sections_created
+		  && entry->d.h->root.def_dynamic
+		  && !entry->d.h->root.def_regular))
+	    ++arg->needed_relocs;
+	}
+      else
+	entry->d.h->global_got_area = arg->value;
+    }
+
+  return 1;
+}
+
+/* A htab_traverse callback for GOT entries for which DATA is the
+   bfd_link_info.  Forbid any global symbols from having traditional
+   lazy-binding stubs.  */
+
+static int
+mips_elf_forbid_lazy_stubs (void **entryp, void *data)
+{
+  struct bfd_link_info *info;
+  struct mips_elf_link_hash_table *htab;
+  struct mips_got_entry *entry;
+
+  entry = (struct mips_got_entry *) *entryp;
+  info = (struct bfd_link_info *) data;
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  if (entry->abfd != NULL
+      && entry->symndx == -1
+      && entry->d.h->needs_lazy_stub)
+    {
+      entry->d.h->needs_lazy_stub = FALSE;
+      htab->lazy_stub_count--;
+    }
+
+  return 1;
+}
+
+/* Return the offset of an input bfd IBFD's GOT from the beginning of
+   the primary GOT.  */
+static bfd_vma
+mips_elf_adjust_gp (bfd *abfd, struct mips_got_info *g, bfd *ibfd)
+{
+  if (g->bfd2got == NULL)
+    return 0;
+
+  g = mips_elf_got_for_ibfd (g, ibfd);
+  if (! g)
+    return 0;
+
+  BFD_ASSERT (g->next);
+
+  g = g->next;
+
+  return (g->local_gotno + g->global_gotno + g->tls_gotno)
+    * MIPS_ELF_GOT_SIZE (abfd);
+}
+
+/* Turn a single GOT that is too big for 16-bit addressing into
+   a sequence of GOTs, each one 16-bit addressable.  */
+
+static bfd_boolean
+mips_elf_multi_got (bfd *abfd, struct bfd_link_info *info,
+		    asection *got, bfd_size_type pages)
+{
+  struct mips_elf_link_hash_table *htab;
+  struct mips_elf_got_per_bfd_arg got_per_bfd_arg;
+  struct mips_elf_set_global_got_offset_arg set_got_offset_arg;
+  struct mips_got_info *g, *gg;
+  unsigned int assign, needed_relocs;
+  bfd *dynobj;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  g = htab->got_info;
+  g->bfd2got = htab_try_create (1, mips_elf_bfd2got_entry_hash,
+				mips_elf_bfd2got_entry_eq, NULL);
+  if (g->bfd2got == NULL)
+    return FALSE;
+
+  got_per_bfd_arg.bfd2got = g->bfd2got;
+  got_per_bfd_arg.obfd = abfd;
+  got_per_bfd_arg.info = info;
+
+  /* Count how many GOT entries each input bfd requires, creating a
+     map from bfd to got info while at that.  */
+  htab_traverse (g->got_entries, mips_elf_make_got_per_bfd, &got_per_bfd_arg);
+  if (got_per_bfd_arg.obfd == NULL)
+    return FALSE;
+
+  /* Also count how many page entries each input bfd requires.  */
+  htab_traverse (g->got_page_entries, mips_elf_make_got_pages_per_bfd,
+		 &got_per_bfd_arg);
+  if (got_per_bfd_arg.obfd == NULL)
+    return FALSE;
+
+  got_per_bfd_arg.current = NULL;
+  got_per_bfd_arg.primary = NULL;
+  got_per_bfd_arg.max_count = ((MIPS_ELF_GOT_MAX_SIZE (info)
+				/ MIPS_ELF_GOT_SIZE (abfd))
+			       - htab->reserved_gotno);
+  got_per_bfd_arg.max_pages = pages;
+  /* The number of globals that will be included in the primary GOT.
+     See the calls to mips_elf_set_global_got_offset below for more
+     information.  */
+  got_per_bfd_arg.global_count = g->global_gotno;
+
+  /* Try to merge the GOTs of input bfds together, as long as they
+     don't seem to exceed the maximum GOT size, choosing one of them
+     to be the primary GOT.  */
+  htab_traverse (g->bfd2got, mips_elf_merge_gots, &got_per_bfd_arg);
+  if (got_per_bfd_arg.obfd == NULL)
+    return FALSE;
+
+  /* If we do not find any suitable primary GOT, create an empty one.  */
+  if (got_per_bfd_arg.primary == NULL)
+    {
+      g->next = (struct mips_got_info *)
+	bfd_alloc (abfd, sizeof (struct mips_got_info));
+      if (g->next == NULL)
+	return FALSE;
+
+      g->next->global_gotsym = NULL;
+      g->next->global_gotno = 0;
+      g->next->reloc_only_gotno = 0;
+      g->next->local_gotno = 0;
+      g->next->page_gotno = 0;
+      g->next->tls_gotno = 0;
+      g->next->assigned_gotno = 0;
+      g->next->tls_assigned_gotno = 0;
+      g->next->tls_ldm_offset = MINUS_ONE;
+      g->next->got_entries = htab_try_create (1, mips_elf_multi_got_entry_hash,
+					      mips_elf_multi_got_entry_eq,
+					      NULL);
+      if (g->next->got_entries == NULL)
+	return FALSE;
+      g->next->got_page_entries = htab_try_create (1, mips_got_page_entry_hash,
+						   mips_got_page_entry_eq,
+						   NULL);
+      if (g->next->got_page_entries == NULL)
+	return FALSE;
+      g->next->bfd2got = NULL;
+    }
+  else
+    g->next = got_per_bfd_arg.primary;
+  g->next->next = got_per_bfd_arg.current;
+
+  /* GG is now the master GOT, and G is the primary GOT.  */
+  gg = g;
+  g = g->next;
+
+  /* Map the output bfd to the primary got.  That's what we're going
+     to use for bfds that use GOT16 or GOT_PAGE relocations that we
+     didn't mark in check_relocs, and we want a quick way to find it.
+     We can't just use gg->next because we're going to reverse the
+     list.  */
+  {
+    struct mips_elf_bfd2got_hash *bfdgot;
+    void **bfdgotp;
+
+    bfdgot = (struct mips_elf_bfd2got_hash *)bfd_alloc
+      (abfd, sizeof (struct mips_elf_bfd2got_hash));
+
+    if (bfdgot == NULL)
+      return FALSE;
+
+    bfdgot->bfd = abfd;
+    bfdgot->g = g;
+    bfdgotp = htab_find_slot (gg->bfd2got, bfdgot, INSERT);
+
+    BFD_ASSERT (*bfdgotp == NULL);
+    *bfdgotp = bfdgot;
+  }
+
+  /* Every symbol that is referenced in a dynamic relocation must be
+     present in the primary GOT, so arrange for them to appear after
+     those that are actually referenced.  */
+  gg->reloc_only_gotno = gg->global_gotno - g->global_gotno;
+  g->global_gotno = gg->global_gotno;
+
+  set_got_offset_arg.g = NULL;
+  set_got_offset_arg.value = GGA_RELOC_ONLY;
+  htab_traverse (gg->got_entries, mips_elf_set_global_got_offset,
+		 &set_got_offset_arg);
+  set_got_offset_arg.value = GGA_NORMAL;
+  htab_traverse (g->got_entries, mips_elf_set_global_got_offset,
+		 &set_got_offset_arg);
+
+  /* Now go through the GOTs assigning them offset ranges.
+     [assigned_gotno, local_gotno[ will be set to the range of local
+     entries in each GOT.  We can then compute the end of a GOT by
+     adding local_gotno to global_gotno.  We reverse the list and make
+     it circular since then we'll be able to quickly compute the
+     beginning of a GOT, by computing the end of its predecessor.  To
+     avoid special cases for the primary GOT, while still preserving
+     assertions that are valid for both single- and multi-got links,
+     we arrange for the main got struct to have the right number of
+     global entries, but set its local_gotno such that the initial
+     offset of the primary GOT is zero.  Remember that the primary GOT
+     will become the last item in the circular linked list, so it
+     points back to the master GOT.  */
+  gg->local_gotno = -g->global_gotno;
+  gg->global_gotno = g->global_gotno;
+  gg->tls_gotno = 0;
+  assign = 0;
+  gg->next = gg;
+
+  do
+    {
+      struct mips_got_info *gn;
+
+      assign += htab->reserved_gotno;
+      g->assigned_gotno = assign;
+      g->local_gotno += assign;
+      g->local_gotno += (pages < g->page_gotno ? pages : g->page_gotno);
+      assign = g->local_gotno + g->global_gotno + g->tls_gotno;
+
+      /* Take g out of the direct list, and push it onto the reversed
+	 list that gg points to.  g->next is guaranteed to be nonnull after
+	 this operation, as required by mips_elf_initialize_tls_index. */
+      gn = g->next;
+      g->next = gg->next;
+      gg->next = g;
+
+      /* Set up any TLS entries.  We always place the TLS entries after
+	 all non-TLS entries.  */
+      g->tls_assigned_gotno = g->local_gotno + g->global_gotno;
+      htab_traverse (g->got_entries, mips_elf_initialize_tls_index, g);
+
+      /* Move onto the next GOT.  It will be a secondary GOT if nonull.  */
+      g = gn;
+
+      /* Forbid global symbols in every non-primary GOT from having
+	 lazy-binding stubs.  */
+      if (g)
+	htab_traverse (g->got_entries, mips_elf_forbid_lazy_stubs, info);
+    }
+  while (g);
+
+  got->size = (gg->next->local_gotno
+	       + gg->next->global_gotno
+	       + gg->next->tls_gotno) * MIPS_ELF_GOT_SIZE (abfd);
+
+  needed_relocs = 0;
+  set_got_offset_arg.value = MIPS_ELF_GOT_SIZE (abfd);
+  set_got_offset_arg.info = info;
+  for (g = gg->next; g && g->next != gg; g = g->next)
+    {
+      unsigned int save_assign;
+
+      /* Assign offsets to global GOT entries.  */
+      save_assign = g->assigned_gotno;
+      g->assigned_gotno = g->local_gotno;
+      set_got_offset_arg.g = g;
+      set_got_offset_arg.needed_relocs = 0;
+      htab_traverse (g->got_entries,
+		     mips_elf_set_global_got_offset,
+		     &set_got_offset_arg);
+      needed_relocs += set_got_offset_arg.needed_relocs;
+      BFD_ASSERT (g->assigned_gotno - g->local_gotno <= g->global_gotno);
+
+      g->assigned_gotno = save_assign;
+      if (info->shared)
+	{
+	  needed_relocs += g->local_gotno - g->assigned_gotno;
+	  BFD_ASSERT (g->assigned_gotno == g->next->local_gotno
+		      + g->next->global_gotno
+		      + g->next->tls_gotno
+		      + htab->reserved_gotno);
+	}
+    }
+
+  if (needed_relocs)
+    mips_elf_allocate_dynamic_relocations (dynobj, info,
+					   needed_relocs);
+
+  return TRUE;
+}
+
+
+/* Returns the first relocation of type r_type found, beginning with
+   RELOCATION.  RELEND is one-past-the-end of the relocation table.  */
+
+static const Elf_Internal_Rela *
+mips_elf_next_relocation (bfd *abfd ATTRIBUTE_UNUSED, unsigned int r_type,
+			  const Elf_Internal_Rela *relocation,
+			  const Elf_Internal_Rela *relend)
+{
+  unsigned long r_symndx = ELF_R_SYM (abfd, relocation->r_info);
+
+  while (relocation < relend)
+    {
+      if (ELF_R_TYPE (abfd, relocation->r_info) == r_type
+	  && ELF_R_SYM (abfd, relocation->r_info) == r_symndx)
+	return relocation;
+
+      ++relocation;
+    }
+
+  /* We didn't find it.  */
+  return NULL;
+}
+
+/* Return whether an input relocation is against a local symbol.  */
+
+static bfd_boolean
+mips_elf_local_relocation_p (bfd *input_bfd,
+			     const Elf_Internal_Rela *relocation,
+			     asection **local_sections)
+{
+  unsigned long r_symndx;
+  Elf_Internal_Shdr *symtab_hdr;
+  size_t extsymoff;
+
+  r_symndx = ELF_R_SYM (input_bfd, relocation->r_info);
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  extsymoff = (elf_bad_symtab (input_bfd)) ? 0 : symtab_hdr->sh_info;
+
+  if (r_symndx < extsymoff)
+    return TRUE;
+  if (elf_bad_symtab (input_bfd) && local_sections[r_symndx] != NULL)
+    return TRUE;
+
+  return FALSE;
+}
+
+/* Sign-extend VALUE, which has the indicated number of BITS.  */
+
+bfd_vma
+_bfd_mips_elf_sign_extend (bfd_vma value, int bits)
+{
+  if (value & ((bfd_vma) 1 << (bits - 1)))
+    /* VALUE is negative.  */
+    value |= ((bfd_vma) - 1) << bits;
+
+  return value;
+}
+
+/* Return non-zero if the indicated VALUE has overflowed the maximum
+   range expressible by a signed number with the indicated number of
+   BITS.  */
+
+static bfd_boolean
+mips_elf_overflow_p (bfd_vma value, int bits)
+{
+  bfd_signed_vma svalue = (bfd_signed_vma) value;
+
+  if (svalue > (1 << (bits - 1)) - 1)
+    /* The value is too big.  */
+    return TRUE;
+  else if (svalue < -(1 << (bits - 1)))
+    /* The value is too small.  */
+    return TRUE;
+
+  /* All is well.  */
+  return FALSE;
+}
+
+/* Calculate the %high function.  */
+
+static bfd_vma
+mips_elf_high (bfd_vma value)
+{
+  return ((value + (bfd_vma) 0x8000) >> 16) & 0xffff;
+}
+
+/* Calculate the %higher function.  */
+
+static bfd_vma
+mips_elf_higher (bfd_vma value ATTRIBUTE_UNUSED)
+{
+#ifdef BFD64
+  return ((value + (bfd_vma) 0x80008000) >> 32) & 0xffff;
+#else
+  abort ();
+  return MINUS_ONE;
+#endif
+}
+
+/* Calculate the %highest function.  */
+
+static bfd_vma
+mips_elf_highest (bfd_vma value ATTRIBUTE_UNUSED)
+{
+#ifdef BFD64
+  return ((value + (((bfd_vma) 0x8000 << 32) | 0x80008000)) >> 48) & 0xffff;
+#else
+  abort ();
+  return MINUS_ONE;
+#endif
+}
+
+/* Create the .compact_rel section.  */
+
+static bfd_boolean
+mips_elf_create_compact_rel_section
+  (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  flagword flags;
+  register asection *s;
+
+  if (bfd_get_section_by_name (abfd, ".compact_rel") == NULL)
+    {
+      flags = (SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED
+	       | SEC_READONLY);
+
+      s = bfd_make_section_with_flags (abfd, ".compact_rel", flags);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s,
+					  MIPS_ELF_LOG_FILE_ALIGN (abfd)))
+	return FALSE;
+
+      s->size = sizeof (Elf32_External_compact_rel);
+    }
+
+  return TRUE;
+}
+
+/* Create the .got section to hold the global offset table.  */
+
+static bfd_boolean
+mips_elf_create_got_section (bfd *abfd, struct bfd_link_info *info)
+{
+  flagword flags;
+  register asection *s;
+  struct elf_link_hash_entry *h;
+  struct bfd_link_hash_entry *bh;
+  struct mips_got_info *g;
+  bfd_size_type amt;
+  struct mips_elf_link_hash_table *htab;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  /* This function may be called more than once.  */
+  if (htab->sgot)
+    return TRUE;
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	   | SEC_LINKER_CREATED);
+
+  /* We have to use an alignment of 2**4 here because this is hardcoded
+     in the function stub generation and in the linker script.  */
+  s = bfd_make_section_with_flags (abfd, ".got", flags);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, 4))
+    return FALSE;
+  htab->sgot = s;
+
+  /* Define the symbol _GLOBAL_OFFSET_TABLE_.  We don't do this in the
+     linker script because we don't want to define the symbol if we
+     are not creating a global offset table.  */
+  bh = NULL;
+  if (! (_bfd_generic_link_add_one_symbol
+	 (info, abfd, "_GLOBAL_OFFSET_TABLE_", BSF_GLOBAL, s,
+	  0, NULL, FALSE, get_elf_backend_data (abfd)->collect, &bh)))
+    return FALSE;
+
+  h = (struct elf_link_hash_entry *) bh;
+  h->non_elf = 0;
+  h->def_regular = 1;
+  h->type = STT_OBJECT;
+  elf_hash_table (info)->hgot = h;
+
+  if (info->shared
+      && ! bfd_elf_link_record_dynamic_symbol (info, h))
+    return FALSE;
+
+  amt = sizeof (struct mips_got_info);
+  g = bfd_alloc (abfd, amt);
+  if (g == NULL)
+    return FALSE;
+  g->global_gotsym = NULL;
+  g->global_gotno = 0;
+  g->reloc_only_gotno = 0;
+  g->tls_gotno = 0;
+  g->local_gotno = 0;
+  g->page_gotno = 0;
+  g->assigned_gotno = 0;
+  g->bfd2got = NULL;
+  g->next = NULL;
+  g->tls_ldm_offset = MINUS_ONE;
+  g->got_entries = htab_try_create (1, mips_elf_got_entry_hash,
+				    mips_elf_got_entry_eq, NULL);
+  if (g->got_entries == NULL)
+    return FALSE;
+  g->got_page_entries = htab_try_create (1, mips_got_page_entry_hash,
+					 mips_got_page_entry_eq, NULL);
+  if (g->got_page_entries == NULL)
+    return FALSE;
+  htab->got_info = g;
+  mips_elf_section_data (s)->elf.this_hdr.sh_flags
+    |= SHF_ALLOC | SHF_WRITE | SHF_MIPS_GPREL;
+
+  /* We also need a .got.plt section when generating PLTs.  */
+  s = bfd_make_section_with_flags (abfd, ".got.plt",
+				   SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
+				   | SEC_IN_MEMORY | SEC_LINKER_CREATED);
+  if (s == NULL)
+    return FALSE;
+  htab->sgotplt = s;
+
+  return TRUE;
+}
+
+/* Return true if H refers to the special VxWorks __GOTT_BASE__ or
+   __GOTT_INDEX__ symbols.  These symbols are only special for
+   shared objects; they are not used in executables.  */
+
+static bfd_boolean
+is_gott_symbol (struct bfd_link_info *info, struct elf_link_hash_entry *h)
+{
+  return (mips_elf_hash_table (info)->is_vxworks
+	  && info->shared
+	  && (strcmp (h->root.root.string, "__GOTT_BASE__") == 0
+	      || strcmp (h->root.root.string, "__GOTT_INDEX__") == 0));
+}
+
+/* Return TRUE if a relocation of type R_TYPE from INPUT_BFD might
+   require an la25 stub.  See also mips_elf_local_pic_function_p,
+   which determines whether the destination function ever requires a
+   stub.  */
+
+static bfd_boolean
+mips_elf_relocation_needs_la25_stub (bfd *input_bfd, int r_type)
+{
+  /* We specifically ignore branches and jumps from EF_PIC objects,
+     where the onus is on the compiler or programmer to perform any
+     necessary initialization of $25.  Sometimes such initialization
+     is unnecessary; for example, -mno-shared functions do not use
+     the incoming value of $25, and may therefore be called directly.  */
+  if (PIC_OBJECT_P (input_bfd))
+    return FALSE;
+
+  switch (r_type)
+    {
+    case R_MIPS_26:
+    case R_MIPS_PC16:
+    case R_MIPS16_26:
+    case R_MICROMIPS_26_S1:
+    case R_MICROMIPS_PC7_S1:
+    case R_MICROMIPS_PC10_S1:
+    case R_MICROMIPS_PC16_S1:
+    case R_MICROMIPS_PC23_S2:
+      return TRUE;
+
+    default:
+      return FALSE;
+    }
+}
+
+/* Calculate the value produced by the RELOCATION (which comes from
+   the INPUT_BFD).  The ADDEND is the addend to use for this
+   RELOCATION; RELOCATION->R_ADDEND is ignored.
+
+   The result of the relocation calculation is stored in VALUEP.
+   On exit, set *CROSS_MODE_JUMP_P to true if the relocation field
+   is a MIPS16 or microMIPS jump to standard MIPS code, or vice versa.
+
+   This function returns bfd_reloc_continue if the caller need take no
+   further action regarding this relocation, bfd_reloc_notsupported if
+   something goes dramatically wrong, bfd_reloc_overflow if an
+   overflow occurs, and bfd_reloc_ok to indicate success.  */
+
+static bfd_reloc_status_type
+mips_elf_calculate_relocation (bfd *abfd, bfd *input_bfd,
+			       asection *input_section,
+			       struct bfd_link_info *info,
+			       const Elf_Internal_Rela *relocation,
+			       bfd_vma addend, reloc_howto_type *howto,
+			       Elf_Internal_Sym *local_syms,
+			       asection **local_sections, bfd_vma *valuep,
+			       const char **namep,
+			       bfd_boolean *cross_mode_jump_p,
+			       bfd_boolean save_addend)
+{
+  /* The eventual value we will return.  */
+  bfd_vma value;
+  /* The address of the symbol against which the relocation is
+     occurring.  */
+  bfd_vma symbol = 0;
+  /* The final GP value to be used for the relocatable, executable, or
+     shared object file being produced.  */
+  bfd_vma gp;
+  /* The place (section offset or address) of the storage unit being
+     relocated.  */
+  bfd_vma p;
+  /* The value of GP used to create the relocatable object.  */
+  bfd_vma gp0;
+  /* The offset into the global offset table at which the address of
+     the relocation entry symbol, adjusted by the addend, resides
+     during execution.  */
+  bfd_vma g = MINUS_ONE;
+  /* The section in which the symbol referenced by the relocation is
+     located.  */
+  asection *sec = NULL;
+  struct mips_elf_link_hash_entry *h = NULL;
+  /* TRUE if the symbol referred to by this relocation is a local
+     symbol.  */
+  bfd_boolean local_p, was_local_p;
+  /* TRUE if the symbol referred to by this relocation is "_gp_disp".  */
+  bfd_boolean gp_disp_p = FALSE;
+  /* TRUE if the symbol referred to by this relocation is
+     "__gnu_local_gp".  */
+  bfd_boolean gnu_local_gp_p = FALSE;
+  Elf_Internal_Shdr *symtab_hdr;
+  size_t extsymoff;
+  unsigned long r_symndx;
+  int r_type;
+  /* TRUE if overflow occurred during the calculation of the
+     relocation value.  */
+  bfd_boolean overflowed_p;
+  /* TRUE if this relocation refers to a MIPS16 function.  */
+  bfd_boolean target_is_16_bit_code_p = FALSE;
+  bfd_boolean target_is_micromips_code_p = FALSE;
+  struct mips_elf_link_hash_table *htab;
+  bfd *dynobj;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  /* Parse the relocation.  */
+  r_symndx = ELF_R_SYM (input_bfd, relocation->r_info);
+  r_type = ELF_R_TYPE (input_bfd, relocation->r_info);
+  p = (input_section->output_section->vma
+       + input_section->output_offset
+       + relocation->r_offset);
+
+  /* Assume that there will be no overflow.  */
+  overflowed_p = FALSE;
+
+  /* Figure out whether or not the symbol is local, and get the offset
+     used in the array of hash table entries.  */
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  local_p = mips_elf_local_relocation_p (input_bfd, relocation,
+					 local_sections);
+  was_local_p = local_p;
+  if (! elf_bad_symtab (input_bfd))
+    extsymoff = symtab_hdr->sh_info;
+  else
+    {
+      /* The symbol table does not follow the rule that local symbols
+	 must come before globals.  */
+      extsymoff = 0;
+    }
+
+  /* Figure out the value of the symbol.  */
+  if (local_p)
+    {
+      Elf_Internal_Sym *sym;
+
+      sym = local_syms + r_symndx;
+      sec = local_sections[r_symndx];
+
+      symbol = sec->output_section->vma + sec->output_offset;
+      if (ELF_ST_TYPE (sym->st_info) != STT_SECTION
+	  || (sec->flags & SEC_MERGE))
+	symbol += sym->st_value;
+      if ((sec->flags & SEC_MERGE)
+	  && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+	{
+	  addend = _bfd_elf_rel_local_sym (abfd, sym, &sec, addend);
+	  addend -= symbol;
+	  addend += sec->output_section->vma + sec->output_offset;
+	}
+
+      /* MIPS16/microMIPS text labels should be treated as odd.  */
+      if (ELF_ST_IS_COMPRESSED (sym->st_other))
+	++symbol;
+
+      /* Record the name of this symbol, for our caller.  */
+      *namep = bfd_elf_string_from_elf_section (input_bfd,
+						symtab_hdr->sh_link,
+						sym->st_name);
+      if (*namep == '\0')
+	*namep = bfd_section_name (input_bfd, sec);
+
+      target_is_16_bit_code_p = ELF_ST_IS_MIPS16 (sym->st_other);
+      target_is_micromips_code_p = ELF_ST_IS_MICROMIPS (sym->st_other);
+    }
+  else
+    {
+      /* ??? Could we use RELOC_FOR_GLOBAL_SYMBOL here ?  */
+
+      /* For global symbols we look up the symbol in the hash-table.  */
+      h = ((struct mips_elf_link_hash_entry *)
+	   elf_sym_hashes (input_bfd) [r_symndx - extsymoff]);
+      /* Find the real hash-table entry for this symbol.  */
+      while (h->root.root.type == bfd_link_hash_indirect
+	     || h->root.root.type == bfd_link_hash_warning)
+	h = (struct mips_elf_link_hash_entry *) h->root.root.u.i.link;
+
+      /* Record the name of this symbol, for our caller.  */
+      *namep = h->root.root.root.string;
+
+      /* See if this is the special _gp_disp symbol.  Note that such a
+	 symbol must always be a global symbol.  */
+      if (strcmp (*namep, "_gp_disp") == 0
+	  && ! NEWABI_P (input_bfd))
+	{
+	  /* Relocations against _gp_disp are permitted only with
+	     R_MIPS_HI16 and R_MIPS_LO16 relocations.  */
+	  if (!hi16_reloc_p (r_type) && !lo16_reloc_p (r_type))
+	    return bfd_reloc_notsupported;
+
+	  gp_disp_p = TRUE;
+	}
+      /* See if this is the special _gp symbol.  Note that such a
+	 symbol must always be a global symbol.  */
+      else if (strcmp (*namep, "__gnu_local_gp") == 0)
+	gnu_local_gp_p = TRUE;
+
+
+      /* If this symbol is defined, calculate its address.  Note that
+	 _gp_disp is a magic symbol, always implicitly defined by the
+	 linker, so it's inappropriate to check to see whether or not
+	 its defined.  */
+      else if ((h->root.root.type == bfd_link_hash_defined
+		|| h->root.root.type == bfd_link_hash_defweak)
+	       && h->root.root.u.def.section)
+	{
+	  sec = h->root.root.u.def.section;
+	  if (sec->output_section)
+	    symbol = (h->root.root.u.def.value
+		      + sec->output_section->vma
+		      + sec->output_offset);
+	  else
+	    symbol = h->root.root.u.def.value;
+	}
+      else if (h->root.root.type == bfd_link_hash_undefweak)
+	/* We allow relocations against undefined weak symbols, giving
+	   it the value zero, so that you can undefined weak functions
+	   and check to see if they exist by looking at their
+	   addresses.  */
+	symbol = 0;
+      else if (info->unresolved_syms_in_objects == RM_IGNORE
+	       && ELF_ST_VISIBILITY (h->root.other) == STV_DEFAULT)
+	symbol = 0;
+      else if (strcmp (*namep, SGI_COMPAT (input_bfd)
+		       ? "_DYNAMIC_LINK" : "_DYNAMIC_LINKING") == 0)
+	{
+	  /* If this is a dynamic link, we should have created a
+	     _DYNAMIC_LINK symbol or _DYNAMIC_LINKING(for normal mips) symbol
+	     in in _bfd_mips_elf_create_dynamic_sections.
+	     Otherwise, we should define the symbol with a value of 0.
+	     FIXME: It should probably get into the symbol table
+	     somehow as well.  */
+	  BFD_ASSERT (! info->shared);
+	  BFD_ASSERT (bfd_get_section_by_name (abfd, ".dynamic") == NULL);
+	  symbol = 0;
+	}
+      else if (ELF_MIPS_IS_OPTIONAL (h->root.other))
+	{
+	  /* This is an optional symbol - an Irix specific extension to the
+	     ELF spec.  Ignore it for now.
+	     XXX - FIXME - there is more to the spec for OPTIONAL symbols
+	     than simply ignoring them, but we do not handle this for now.
+	     For information see the "64-bit ELF Object File Specification"
+	     which is available from here:
+	     http://techpubs.sgi.com/library/manuals/4000/007-4658-001/pdf/007-4658-001.pdf  */
+	  symbol = 0;
+	}
+      else if ((*info->callbacks->undefined_symbol)
+	       (info, h->root.root.root.string, input_bfd,
+		input_section, relocation->r_offset,
+		(info->unresolved_syms_in_objects == RM_GENERATE_ERROR)
+		 || ELF_ST_VISIBILITY (h->root.other)))
+	{
+	  return bfd_reloc_undefined;
+	}
+      else
+	{
+	  return bfd_reloc_notsupported;
+	}
+
+      target_is_16_bit_code_p = ELF_ST_IS_MIPS16 (h->root.other);
+      /* If the output section is the PLT section,
+         then the target is not microMIPS.  */
+      target_is_micromips_code_p = (htab->splt != sec
+				    && ELF_ST_IS_MICROMIPS (h->root.other));
+    }
+
+  /* If this is a reference to a 16-bit function with a stub, we need
+     to redirect the relocation to the stub unless:
+
+     (a) the relocation is for a MIPS16 JAL;
+
+     (b) the relocation is for a MIPS16 PIC call, and there are no
+	 non-MIPS16 uses of the GOT slot; or
+
+     (c) the section allows direct references to MIPS16 functions.  */
+  if (r_type != R_MIPS16_26
+      && !info->relocatable
+      && ((h != NULL
+	   && h->fn_stub != NULL
+	   && (r_type != R_MIPS16_CALL16 || h->need_fn_stub))
+	  || (local_p
+	      && elf_tdata (input_bfd)->local_stubs != NULL
+	      && elf_tdata (input_bfd)->local_stubs[r_symndx] != NULL))
+      && !section_allows_mips16_refs_p (input_section))
+    {
+      /* This is a 32- or 64-bit call to a 16-bit function.  We should
+	 have already noticed that we were going to need the
+	 stub.  */
+      if (local_p)
+	sec = elf_tdata (input_bfd)->local_stubs[r_symndx];
+      else
+	{
+	  BFD_ASSERT (h->need_fn_stub);
+	  sec = h->fn_stub;
+	}
+
+      symbol = sec->output_section->vma + sec->output_offset;
+      /* The target is 16-bit, but the stub isn't.  */
+      target_is_16_bit_code_p = FALSE;
+    }
+  /* If this is a 16-bit call to a 32- or 64-bit function with a stub, we
+     need to redirect the call to the stub.  Note that we specifically
+     exclude R_MIPS16_CALL16 from this behavior; indirect calls should
+     use an indirect stub instead.  */
+  else if (r_type == R_MIPS16_26 && !info->relocatable
+	   && ((h != NULL && (h->call_stub != NULL || h->call_fp_stub != NULL))
+	       || (local_p
+		   && elf_tdata (input_bfd)->local_call_stubs != NULL
+		   && elf_tdata (input_bfd)->local_call_stubs[r_symndx] != NULL))
+	   && !target_is_16_bit_code_p)
+    {
+      if (local_p)
+	sec = elf_tdata (input_bfd)->local_call_stubs[r_symndx];
+      else
+	{
+	  /* If both call_stub and call_fp_stub are defined, we can figure
+	     out which one to use by checking which one appears in the input
+	     file.  */
+	  if (h->call_stub != NULL && h->call_fp_stub != NULL)
+	    {
+	      asection *o;
+	      
+	      sec = NULL;
+	      for (o = input_bfd->sections; o != NULL; o = o->next)
+		{
+		  if (CALL_FP_STUB_P (bfd_get_section_name (input_bfd, o)))
+		    {
+		      sec = h->call_fp_stub;
+		      break;
+		    }
+		}
+	      if (sec == NULL)
+		sec = h->call_stub;
+	    }
+	  else if (h->call_stub != NULL)
+	    sec = h->call_stub;
+	  else
+	    sec = h->call_fp_stub;
+  	}
+
+      BFD_ASSERT (sec->size > 0);
+      symbol = sec->output_section->vma + sec->output_offset;
+    }
+  /* If this is a direct call to a PIC function, redirect to the
+     non-PIC stub.  */
+  else if (h != NULL && h->la25_stub
+	   && mips_elf_relocation_needs_la25_stub (input_bfd, r_type))
+    symbol = (h->la25_stub->stub_section->output_section->vma
+	      + h->la25_stub->stub_section->output_offset
+	      + h->la25_stub->offset);
+
+  /* Make sure MIPS16 and microMIPS are not used together.  */
+  if ((r_type == R_MIPS16_26 && target_is_micromips_code_p)
+      || (micromips_branch_reloc_p (r_type) && target_is_16_bit_code_p))
+   {
+      (*_bfd_error_handler)
+	(_("MIPS16 and microMIPS functions cannot call each other"));
+      return bfd_reloc_notsupported;
+   }
+
+  /* Calls from 16-bit code to 32-bit code and vice versa require the
+     mode change.  However, we can ignore calls to undefined weak symbols,
+     which should never be executed at runtime.  This exception is important
+     because the assembly writer may have "known" that any definition of the
+     symbol would be 16-bit code, and that direct jumps were therefore
+     acceptable.  */
+  *cross_mode_jump_p = (!info->relocatable
+			&& !(h && h->root.root.type == bfd_link_hash_undefweak)
+			&& ((r_type == R_MIPS16_26 && !target_is_16_bit_code_p)
+			    || (r_type == R_MICROMIPS_26_S1
+				&& !target_is_micromips_code_p)
+			    || ((r_type == R_MIPS_26 || r_type == R_MIPS_JALR)
+				&& (target_is_16_bit_code_p
+				    || target_is_micromips_code_p))));
+
+  local_p = h == NULL || SYMBOL_REFERENCES_LOCAL (info, &h->root);
+
+  gp0 = _bfd_get_gp_value (input_bfd);
+  gp = _bfd_get_gp_value (abfd);
+  if (htab->got_info)
+    gp += mips_elf_adjust_gp (abfd, htab->got_info, input_bfd);
+
+  if (gnu_local_gp_p)
+    symbol = gp;
+
+  /* Global R_MIPS_GOT_PAGE/R_MICROMIPS_GOT_PAGE relocations are equivalent
+     to R_MIPS_GOT_DISP/R_MICROMIPS_GOT_DISP.  The addend is applied by the
+     corresponding R_MIPS_GOT_OFST/R_MICROMIPS_GOT_OFST.  */
+  if (got_page_reloc_p (r_type) && !local_p)
+    {
+      r_type = (micromips_reloc_p (r_type)
+		? R_MICROMIPS_GOT_DISP : R_MIPS_GOT_DISP);
+      addend = 0;
+    }
+
+  /* If we haven't already determined the GOT offset, and we're going
+     to need it, get it now.  */
+  switch (r_type)
+    {
+    case R_MIPS16_CALL16:
+    case R_MIPS16_GOT16:
+    case R_MIPS_CALL16:
+    case R_MIPS_GOT16:
+    case R_MIPS_GOT_DISP:
+    case R_MIPS_GOT_HI16:
+    case R_MIPS_CALL_HI16:
+    case R_MIPS_GOT_LO16:
+    case R_MIPS_CALL_LO16:
+    case R_MICROMIPS_CALL16:
+    case R_MICROMIPS_GOT16:
+    case R_MICROMIPS_GOT_DISP:
+    case R_MICROMIPS_GOT_HI16:
+    case R_MICROMIPS_CALL_HI16:
+    case R_MICROMIPS_GOT_LO16:
+    case R_MICROMIPS_CALL_LO16:
+    case R_MIPS_TLS_GD:
+    case R_MIPS_TLS_GOTTPREL:
+    case R_MIPS_TLS_LDM:
+    case R_MICROMIPS_TLS_GD:
+    case R_MICROMIPS_TLS_GOTTPREL:
+    case R_MICROMIPS_TLS_LDM:
+      /* Find the index into the GOT where this value is located.  */
+      if (tls_ldm_reloc_p (r_type))
+	{
+	  g = mips_elf_local_got_index (abfd, input_bfd, info,
+					0, 0, NULL, r_type);
+	  if (g == MINUS_ONE)
+	    return bfd_reloc_outofrange;
+	}
+      else if (!local_p)
+	{
+	  /* On VxWorks, CALL relocations should refer to the .got.plt
+	     entry, which is initialized to point at the PLT stub.  */
+	  if (htab->is_vxworks
+	      && (call_hi16_reloc_p (r_type)
+		  || call_lo16_reloc_p (r_type)
+		  || call16_reloc_p (r_type)))
+	    {
+	      BFD_ASSERT (addend == 0);
+	      BFD_ASSERT (h->root.needs_plt);
+	      g = mips_elf_gotplt_index (info, &h->root);
+	    }
+	  else
+	    {
+	      BFD_ASSERT (addend == 0);
+	      g = mips_elf_global_got_index (dynobj, input_bfd,
+					     &h->root, r_type, info);
+	      if (h->tls_type == GOT_NORMAL
+		  && !elf_hash_table (info)->dynamic_sections_created)
+		/* This is a static link.  We must initialize the GOT entry.  */
+		MIPS_ELF_PUT_WORD (dynobj, symbol, htab->sgot->contents + g);
+	    }
+	}
+      else if (!htab->is_vxworks
+	       && (call16_reloc_p (r_type) || got16_reloc_p (r_type)))
+	/* The calculation below does not involve "g".  */
+	break;
+      else
+	{
+	  g = mips_elf_local_got_index (abfd, input_bfd, info,
+					symbol + addend, r_symndx, h, r_type);
+	  if (g == MINUS_ONE)
+	    return bfd_reloc_outofrange;
+	}
+
+      /* Convert GOT indices to actual offsets.  */
+      g = mips_elf_got_offset_from_index (info, abfd, input_bfd, g);
+      break;
+    }
+
+  /* Relocations against the VxWorks __GOTT_BASE__ and __GOTT_INDEX__
+     symbols are resolved by the loader.  Add them to .rela.dyn.  */
+  if (h != NULL && is_gott_symbol (info, &h->root))
+    {
+      Elf_Internal_Rela outrel;
+      bfd_byte *loc;
+      asection *s;
+
+      s = mips_elf_rel_dyn_section (info, FALSE);
+      loc = s->contents + s->reloc_count++ * sizeof (Elf32_External_Rela);
+
+      outrel.r_offset = (input_section->output_section->vma
+			 + input_section->output_offset
+			 + relocation->r_offset);
+      outrel.r_info = ELF32_R_INFO (h->root.dynindx, r_type);
+      outrel.r_addend = addend;
+      bfd_elf32_swap_reloca_out (abfd, &outrel, loc);
+
+      /* If we've written this relocation for a readonly section,
+	 we need to set DF_TEXTREL again, so that we do not delete the
+	 DT_TEXTREL tag.  */
+      if (MIPS_ELF_READONLY_SECTION (input_section))
+	info->flags |= DF_TEXTREL;
+
+      *valuep = 0;
+      return bfd_reloc_ok;
+    }
+
+  /* Figure out what kind of relocation is being performed.  */
+  switch (r_type)
+    {
+    case R_MIPS_NONE:
+      return bfd_reloc_continue;
+
+    case R_MIPS_16:
+      value = symbol + _bfd_mips_elf_sign_extend (addend, 16);
+      overflowed_p = mips_elf_overflow_p (value, 16);
+      break;
+
+    case R_MIPS_32:
+    case R_MIPS_REL32:
+    case R_MIPS_64:
+      if ((info->shared
+	   || (htab->root.dynamic_sections_created
+	       && h != NULL
+	       && h->root.def_dynamic
+	       && !h->root.def_regular
+	       && !h->has_static_relocs))
+	  && r_symndx != STN_UNDEF
+	  && (h == NULL
+	      || h->root.root.type != bfd_link_hash_undefweak
+	      || ELF_ST_VISIBILITY (h->root.other) == STV_DEFAULT)
+	  && (input_section->flags & SEC_ALLOC) != 0)
+	{
+	  /* If we're creating a shared library, then we can't know
+	     where the symbol will end up.  So, we create a relocation
+	     record in the output, and leave the job up to the dynamic
+	     linker.  We must do the same for executable references to
+	     shared library symbols, unless we've decided to use copy
+	     relocs or PLTs instead.  */
+	  value = addend;
+	  if (!mips_elf_create_dynamic_relocation (abfd,
+						   info,
+						   relocation,
+						   h,
+						   sec,
+						   symbol,
+						   &value,
+						   input_section))
+	    return bfd_reloc_undefined;
+	}
+      else
+	{
+	  if (r_type != R_MIPS_REL32)
+	    value = symbol + addend;
+	  else
+	    value = addend;
+	}
+      value &= howto->dst_mask;
+      break;
+
+    case R_MIPS_PC32:
+      value = symbol + addend - p;
+      value &= howto->dst_mask;
+      break;
+
+    case R_MIPS16_26:
+      /* The calculation for R_MIPS16_26 is just the same as for an
+	 R_MIPS_26.  It's only the storage of the relocated field into
+	 the output file that's different.  That's handled in
+	 mips_elf_perform_relocation.  So, we just fall through to the
+	 R_MIPS_26 case here.  */
+    case R_MIPS_26:
+    case R_MICROMIPS_26_S1:
+      {
+	unsigned int shift;
+
+	/* Make sure the target of JALX is word-aligned.  Bit 0 must be
+	   the correct ISA mode selector and bit 1 must be 0.  */
+	if (*cross_mode_jump_p && (symbol & 3) != (r_type == R_MIPS_26))
+	  return bfd_reloc_outofrange;
+
+	/* Shift is 2, unusually, for microMIPS JALX.  */
+	shift = (!*cross_mode_jump_p && r_type == R_MICROMIPS_26_S1) ? 1 : 2;
+
+	if (was_local_p)
+	  value = addend | ((p + 4) & (0xfc000000 << shift));
+	else
+	  value = _bfd_mips_elf_sign_extend (addend, 26 + shift);
+	value = (value + symbol) >> shift;
+	if (!was_local_p && h->root.root.type != bfd_link_hash_undefweak)
+	  overflowed_p = (value >> 26) != ((p + 4) >> (26 + shift));
+	value &= howto->dst_mask;
+      }
+      break;
+
+    case R_MIPS_TLS_DTPREL_HI16:
+    case R_MICROMIPS_TLS_DTPREL_HI16:
+      value = (mips_elf_high (addend + symbol - dtprel_base (info))
+	       & howto->dst_mask);
+      break;
+
+    case R_MIPS_TLS_DTPREL_LO16:
+    case R_MIPS_TLS_DTPREL32:
+    case R_MIPS_TLS_DTPREL64:
+    case R_MICROMIPS_TLS_DTPREL_LO16:
+      value = (symbol + addend - dtprel_base (info)) & howto->dst_mask;
+      break;
+
+    case R_MIPS_TLS_TPREL_HI16:
+    case R_MICROMIPS_TLS_TPREL_HI16:
+      value = (mips_elf_high (addend + symbol - tprel_base (info))
+	       & howto->dst_mask);
+      break;
+
+    case R_MIPS_TLS_TPREL_LO16:
+    case R_MICROMIPS_TLS_TPREL_LO16:
+      value = (symbol + addend - tprel_base (info)) & howto->dst_mask;
+      break;
+
+    case R_MIPS_HI16:
+    case R_MIPS16_HI16:
+    case R_MICROMIPS_HI16:
+      if (!gp_disp_p)
+	{
+	  value = mips_elf_high (addend + symbol);
+	  value &= howto->dst_mask;
+	}
+      else
+	{
+	  /* For MIPS16 ABI code we generate this sequence
+	        0: li      $v0,%hi(_gp_disp)
+	        4: addiupc $v1,%lo(_gp_disp)
+	        8: sll     $v0,16
+	       12: addu    $v0,$v1
+	       14: move    $gp,$v0
+	     So the offsets of hi and lo relocs are the same, but the
+	     $pc is four higher than $t9 would be, so reduce
+	     both reloc addends by 4. */
+	  if (r_type == R_MIPS16_HI16)
+	    value = mips_elf_high (addend + gp - p - 4);
+	  /* The microMIPS .cpload sequence uses the same assembly
+	     instructions as the traditional psABI version, but the
+	     incoming $t9 has the low bit set.  */
+	  else if (r_type == R_MICROMIPS_HI16)
+	    value = mips_elf_high (addend + gp - p - 1);
+	  else
+	    value = mips_elf_high (addend + gp - p);
+	  overflowed_p = mips_elf_overflow_p (value, 16);
+	}
+      break;
+
+    case R_MIPS_LO16:
+    case R_MIPS16_LO16:
+    case R_MICROMIPS_LO16:
+    case R_MICROMIPS_HI0_LO16:
+      if (!gp_disp_p)
+	value = (symbol + addend) & howto->dst_mask;
+      else
+	{
+	  /* See the comment for R_MIPS16_HI16 above for the reason
+	     for this conditional.  */
+	  if (r_type == R_MIPS16_LO16)
+	    value = addend + gp - p;
+	  else if (r_type == R_MICROMIPS_LO16
+		   || r_type == R_MICROMIPS_HI0_LO16)
+	    value = addend + gp - p + 3;
+	  else
+	    value = addend + gp - p + 4;
+	  /* The MIPS ABI requires checking the R_MIPS_LO16 relocation
+	     for overflow.  But, on, say, IRIX5, relocations against
+	     _gp_disp are normally generated from the .cpload
+	     pseudo-op.  It generates code that normally looks like
+	     this:
+
+	       lui    $gp,%hi(_gp_disp)
+	       addiu  $gp,$gp,%lo(_gp_disp)
+	       addu   $gp,$gp,$t9
+
+	     Here $t9 holds the address of the function being called,
+	     as required by the MIPS ELF ABI.  The R_MIPS_LO16
+	     relocation can easily overflow in this situation, but the
+	     R_MIPS_HI16 relocation will handle the overflow.
+	     Therefore, we consider this a bug in the MIPS ABI, and do
+	     not check for overflow here.  */
+	}
+      break;
+
+    case R_MIPS_LITERAL:
+    case R_MICROMIPS_LITERAL:
+      /* Because we don't merge literal sections, we can handle this
+	 just like R_MIPS_GPREL16.  In the long run, we should merge
+	 shared literals, and then we will need to additional work
+	 here.  */
+
+      /* Fall through.  */
+
+    case R_MIPS16_GPREL:
+      /* The R_MIPS16_GPREL performs the same calculation as
+	 R_MIPS_GPREL16, but stores the relocated bits in a different
+	 order.  We don't need to do anything special here; the
+	 differences are handled in mips_elf_perform_relocation.  */
+    case R_MIPS_GPREL16:
+    case R_MICROMIPS_GPREL7_S2:
+    case R_MICROMIPS_GPREL16:
+      /* Only sign-extend the addend if it was extracted from the
+	 instruction.  If the addend was separate, leave it alone,
+	 otherwise we may lose significant bits.  */
+      if (howto->partial_inplace)
+	addend = _bfd_mips_elf_sign_extend (addend, 16);
+      value = symbol + addend - gp;
+      /* If the symbol was local, any earlier relocatable links will
+	 have adjusted its addend with the gp offset, so compensate
+	 for that now.  Don't do it for symbols forced local in this
+	 link, though, since they won't have had the gp offset applied
+	 to them before.  */
+      if (was_local_p)
+	value += gp0;
+      overflowed_p = mips_elf_overflow_p (value, 16);
+      break;
+
+    case R_MIPS16_GOT16:
+    case R_MIPS16_CALL16:
+    case R_MIPS_GOT16:
+    case R_MIPS_CALL16:
+    case R_MICROMIPS_GOT16:
+    case R_MICROMIPS_CALL16:
+      /* VxWorks does not have separate local and global semantics for
+	 R_MIPS*_GOT16; every relocation evaluates to "G".  */
+      if (!htab->is_vxworks && local_p)
+	{
+	  value = mips_elf_got16_entry (abfd, input_bfd, info,
+					symbol + addend, !was_local_p);
+	  if (value == MINUS_ONE)
+	    return bfd_reloc_outofrange;
+	  value
+	    = mips_elf_got_offset_from_index (info, abfd, input_bfd, value);
+	  overflowed_p = mips_elf_overflow_p (value, 16);
+	  break;
+	}
+
+      /* Fall through.  */
+
+    case R_MIPS_TLS_GD:
+    case R_MIPS_TLS_GOTTPREL:
+    case R_MIPS_TLS_LDM:
+    case R_MIPS_GOT_DISP:
+    case R_MICROMIPS_TLS_GD:
+    case R_MICROMIPS_TLS_GOTTPREL:
+    case R_MICROMIPS_TLS_LDM:
+    case R_MICROMIPS_GOT_DISP:
+      value = g;
+      overflowed_p = mips_elf_overflow_p (value, 16);
+      break;
+
+    case R_MIPS_GPREL32:
+      value = (addend + symbol + gp0 - gp);
+      if (!save_addend)
+	value &= howto->dst_mask;
+      break;
+
+    case R_MIPS_PC16:
+    case R_MIPS_GNU_REL16_S2:
+      value = symbol + _bfd_mips_elf_sign_extend (addend, 18) - p;
+      overflowed_p = mips_elf_overflow_p (value, 18);
+      value >>= howto->rightshift;
+      value &= howto->dst_mask;
+      break;
+
+    case R_MICROMIPS_PC7_S1:
+      value = symbol + _bfd_mips_elf_sign_extend (addend, 8) - p;
+      overflowed_p = mips_elf_overflow_p (value, 8);
+      value >>= howto->rightshift;
+      value &= howto->dst_mask;
+      break;
+
+    case R_MICROMIPS_PC10_S1:
+      value = symbol + _bfd_mips_elf_sign_extend (addend, 11) - p;
+      overflowed_p = mips_elf_overflow_p (value, 11);
+      value >>= howto->rightshift;
+      value &= howto->dst_mask;
+      break;
+
+    case R_MICROMIPS_PC16_S1:
+      value = symbol + _bfd_mips_elf_sign_extend (addend, 17) - p;
+      overflowed_p = mips_elf_overflow_p (value, 17);
+      value >>= howto->rightshift;
+      value &= howto->dst_mask;
+      break;
+
+    case R_MICROMIPS_PC23_S2:
+      value = symbol + _bfd_mips_elf_sign_extend (addend, 25) - ((p | 3) ^ 3);
+      overflowed_p = mips_elf_overflow_p (value, 25);
+      value >>= howto->rightshift;
+      value &= howto->dst_mask;
+      break;
+
+    case R_MIPS_GOT_HI16:
+    case R_MIPS_CALL_HI16:
+    case R_MICROMIPS_GOT_HI16:
+    case R_MICROMIPS_CALL_HI16:
+      /* We're allowed to handle these two relocations identically.
+	 The dynamic linker is allowed to handle the CALL relocations
+	 differently by creating a lazy evaluation stub.  */
+      value = g;
+      value = mips_elf_high (value);
+      value &= howto->dst_mask;
+      break;
+
+    case R_MIPS_GOT_LO16:
+    case R_MIPS_CALL_LO16:
+    case R_MICROMIPS_GOT_LO16:
+    case R_MICROMIPS_CALL_LO16:
+      value = g & howto->dst_mask;
+      break;
+
+    case R_MIPS_GOT_PAGE:
+    case R_MICROMIPS_GOT_PAGE:
+      value = mips_elf_got_page (abfd, input_bfd, info, symbol + addend, NULL);
+      if (value == MINUS_ONE)
+	return bfd_reloc_outofrange;
+      value = mips_elf_got_offset_from_index (info, abfd, input_bfd, value);
+      overflowed_p = mips_elf_overflow_p (value, 16);
+      break;
+
+    case R_MIPS_GOT_OFST:
+    case R_MICROMIPS_GOT_OFST:
+      if (local_p)
+	mips_elf_got_page (abfd, input_bfd, info, symbol + addend, &value);
+      else
+	value = addend;
+      overflowed_p = mips_elf_overflow_p (value, 16);
+      break;
+
+    case R_MIPS_SUB:
+    case R_MICROMIPS_SUB:
+      value = symbol - addend;
+      value &= howto->dst_mask;
+      break;
+
+    case R_MIPS_HIGHER:
+    case R_MICROMIPS_HIGHER:
+      value = mips_elf_higher (addend + symbol);
+      value &= howto->dst_mask;
+      break;
+
+    case R_MIPS_HIGHEST:
+    case R_MICROMIPS_HIGHEST:
+      value = mips_elf_highest (addend + symbol);
+      value &= howto->dst_mask;
+      break;
+
+    case R_MIPS_SCN_DISP:
+    case R_MICROMIPS_SCN_DISP:
+      value = symbol + addend - sec->output_offset;
+      value &= howto->dst_mask;
+      break;
+
+    case R_MIPS_JALR:
+    case R_MICROMIPS_JALR:
+      /* This relocation is only a hint.  In some cases, we optimize
+	 it into a bal instruction.  But we don't try to optimize
+	 when the symbol does not resolve locally.  */
+      if (h != NULL && !SYMBOL_CALLS_LOCAL (info, &h->root))
+	return bfd_reloc_continue;
+      value = symbol + addend;
+      break;
+
+    case R_MIPS_PJUMP:
+    case R_MIPS_GNU_VTINHERIT:
+    case R_MIPS_GNU_VTENTRY:
+      /* We don't do anything with these at present.  */
+      return bfd_reloc_continue;
+
+    default:
+      /* An unrecognized relocation type.  */
+      return bfd_reloc_notsupported;
+    }
+
+  /* Store the VALUE for our caller.  */
+  *valuep = value;
+  return overflowed_p ? bfd_reloc_overflow : bfd_reloc_ok;
+}
+
+/* Obtain the field relocated by RELOCATION.  */
+
+static bfd_vma
+mips_elf_obtain_contents (reloc_howto_type *howto,
+			  const Elf_Internal_Rela *relocation,
+			  bfd *input_bfd, bfd_byte *contents)
+{
+  bfd_vma x;
+  bfd_byte *location = contents + relocation->r_offset;
+
+  /* Obtain the bytes.  */
+  x = bfd_get ((8 * bfd_get_reloc_size (howto)), input_bfd, location);
+
+  return x;
+}
+
+/* It has been determined that the result of the RELOCATION is the
+   VALUE.  Use HOWTO to place VALUE into the output file at the
+   appropriate position.  The SECTION is the section to which the
+   relocation applies.  
+   CROSS_MODE_JUMP_P is true if the relocation field
+   is a MIPS16 or microMIPS jump to standard MIPS code, or vice versa.
+
+   Returns FALSE if anything goes wrong.  */
+
+static bfd_boolean
+mips_elf_perform_relocation (struct bfd_link_info *info,
+			     reloc_howto_type *howto,
+			     const Elf_Internal_Rela *relocation,
+			     bfd_vma value, bfd *input_bfd,
+			     asection *input_section, bfd_byte *contents,
+			     bfd_boolean cross_mode_jump_p)
+{
+  bfd_vma x;
+  bfd_byte *location;
+  int r_type = ELF_R_TYPE (input_bfd, relocation->r_info);
+
+  /* Figure out where the relocation is occurring.  */
+  location = contents + relocation->r_offset;
+
+  _bfd_mips_elf_reloc_unshuffle (input_bfd, r_type, FALSE, location);
+
+  /* Obtain the current value.  */
+  x = mips_elf_obtain_contents (howto, relocation, input_bfd, contents);
+
+  /* Clear the field we are setting.  */
+  x &= ~howto->dst_mask;
+
+  /* Set the field.  */
+  x |= (value & howto->dst_mask);
+
+  /* If required, turn JAL into JALX.  */
+  if (cross_mode_jump_p && jal_reloc_p (r_type))
+    {
+      bfd_boolean ok;
+      bfd_vma opcode = x >> 26;
+      bfd_vma jalx_opcode;
+
+      /* Check to see if the opcode is already JAL or JALX.  */
+      if (r_type == R_MIPS16_26)
+	{
+	  ok = ((opcode == 0x6) || (opcode == 0x7));
+	  jalx_opcode = 0x7;
+	}
+      else if (r_type == R_MICROMIPS_26_S1)
+	{
+	  ok = ((opcode == 0x3d) || (opcode == 0x3c));
+	  jalx_opcode = 0x3c;
+	}
+      else
+	{
+	  ok = ((opcode == 0x3) || (opcode == 0x1d));
+	  jalx_opcode = 0x1d;
+	}
+
+      /* If the opcode is not JAL or JALX, there's a problem.  */
+      if (!ok)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B: %A+0x%lx: Direct jumps between ISA modes are not allowed; consider recompiling with interlinking enabled."),
+	     input_bfd,
+	     input_section,
+	     (unsigned long) relocation->r_offset);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      /* Make this the JALX opcode.  */
+      x = (x & ~(0x3f << 26)) | (jalx_opcode << 26);
+    }
+
+  /* Try converting JAL to BAL and J(AL)R to B(AL), if the target is in
+     range.  */
+  if (!info->relocatable
+      && !cross_mode_jump_p
+      && ((JAL_TO_BAL_P (input_bfd)
+	   && r_type == R_MIPS_26
+	   && (x >> 26) == 0x3)		/* jal addr */
+	  || (JALR_TO_BAL_P (input_bfd)
+	      && r_type == R_MIPS_JALR
+	      && x == 0x0320f809)	/* jalr t9 */
+	  || (JR_TO_B_P (input_bfd)
+	      && r_type == R_MIPS_JALR
+	      && x == 0x03200008)))	/* jr t9 */
+    {
+      bfd_vma addr;
+      bfd_vma dest;
+      bfd_signed_vma off;
+
+      addr = (input_section->output_section->vma
+	      + input_section->output_offset
+	      + relocation->r_offset
+	      + 4);
+      if (r_type == R_MIPS_26)
+	dest = (value << 2) | ((addr >> 28) << 28);
+      else
+	dest = value;
+      off = dest - addr;
+      if (off <= 0x1ffff && off >= -0x20000)
+	{
+	  if (x == 0x03200008)	/* jr t9 */
+	    x = 0x10000000 | (((bfd_vma) off >> 2) & 0xffff);   /* b addr */
+	  else
+	    x = 0x04110000 | (((bfd_vma) off >> 2) & 0xffff);   /* bal addr */
+	}
+    }
+
+  /* Put the value into the output.  */
+  bfd_put (8 * bfd_get_reloc_size (howto), input_bfd, x, location);
+
+  _bfd_mips_elf_reloc_shuffle (input_bfd, r_type, !info->relocatable,
+			       location);
+
+  return TRUE;
+}
+
+/* Create a rel.dyn relocation for the dynamic linker to resolve.  REL
+   is the original relocation, which is now being transformed into a
+   dynamic relocation.  The ADDENDP is adjusted if necessary; the
+   caller should store the result in place of the original addend.  */
+
+static bfd_boolean
+mips_elf_create_dynamic_relocation (bfd *output_bfd,
+				    struct bfd_link_info *info,
+				    const Elf_Internal_Rela *rel,
+				    struct mips_elf_link_hash_entry *h,
+				    asection *sec, bfd_vma symbol,
+				    bfd_vma *addendp, asection *input_section)
+{
+  Elf_Internal_Rela outrel[3];
+  asection *sreloc;
+  bfd *dynobj;
+  int r_type;
+  long indx;
+  bfd_boolean defined_p;
+  struct mips_elf_link_hash_table *htab;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  r_type = ELF_R_TYPE (output_bfd, rel->r_info);
+  dynobj = elf_hash_table (info)->dynobj;
+  sreloc = mips_elf_rel_dyn_section (info, FALSE);
+  BFD_ASSERT (sreloc != NULL);
+  BFD_ASSERT (sreloc->contents != NULL);
+  BFD_ASSERT (sreloc->reloc_count * MIPS_ELF_REL_SIZE (output_bfd)
+	      < sreloc->size);
+
+  outrel[0].r_offset =
+    _bfd_elf_section_offset (output_bfd, info, input_section, rel[0].r_offset);
+  if (ABI_64_P (output_bfd))
+    {
+      outrel[1].r_offset =
+	_bfd_elf_section_offset (output_bfd, info, input_section, rel[1].r_offset);
+      outrel[2].r_offset =
+	_bfd_elf_section_offset (output_bfd, info, input_section, rel[2].r_offset);
+    }
+
+  if (outrel[0].r_offset == MINUS_ONE)
+    /* The relocation field has been deleted.  */
+    return TRUE;
+
+  if (outrel[0].r_offset == MINUS_TWO)
+    {
+      /* The relocation field has been converted into a relative value of
+	 some sort.  Functions like _bfd_elf_write_section_eh_frame expect
+	 the field to be fully relocated, so add in the symbol's value.  */
+      *addendp += symbol;
+      return TRUE;
+    }
+
+  /* We must now calculate the dynamic symbol table index to use
+     in the relocation.  */
+  if (h != NULL && ! SYMBOL_REFERENCES_LOCAL (info, &h->root))
+    {
+      BFD_ASSERT (htab->is_vxworks || h->global_got_area != GGA_NONE);
+      indx = h->root.dynindx;
+      if (SGI_COMPAT (output_bfd))
+	defined_p = h->root.def_regular;
+      else
+	/* ??? glibc's ld.so just adds the final GOT entry to the
+	   relocation field.  It therefore treats relocs against
+	   defined symbols in the same way as relocs against
+	   undefined symbols.  */
+	defined_p = FALSE;
+    }
+  else
+    {
+      if (sec != NULL && bfd_is_abs_section (sec))
+	indx = 0;
+      else if (sec == NULL || sec->owner == NULL)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+      else
+	{
+	  indx = elf_section_data (sec->output_section)->dynindx;
+	  if (indx == 0)
+	    {
+	      asection *osec = htab->root.text_index_section;
+	      indx = elf_section_data (osec)->dynindx;
+	    }
+	  if (indx == 0)
+	    abort ();
+	}
+
+      /* Instead of generating a relocation using the section
+	 symbol, we may as well make it a fully relative
+	 relocation.  We want to avoid generating relocations to
+	 local symbols because we used to generate them
+	 incorrectly, without adding the original symbol value,
+	 which is mandated by the ABI for section symbols.  In
+	 order to give dynamic loaders and applications time to
+	 phase out the incorrect use, we refrain from emitting
+	 section-relative relocations.  It's not like they're
+	 useful, after all.  This should be a bit more efficient
+	 as well.  */
+      /* ??? Although this behavior is compatible with glibc's ld.so,
+	 the ABI says that relocations against STN_UNDEF should have
+	 a symbol value of 0.  Irix rld honors this, so relocations
+	 against STN_UNDEF have no effect.  */
+      if (!SGI_COMPAT (output_bfd))
+	indx = 0;
+      defined_p = TRUE;
+    }
+
+  /* If the relocation was previously an absolute relocation and
+     this symbol will not be referred to by the relocation, we must
+     adjust it by the value we give it in the dynamic symbol table.
+     Otherwise leave the job up to the dynamic linker.  */
+  if (defined_p && r_type != R_MIPS_REL32)
+    *addendp += symbol;
+
+  if (htab->is_vxworks)
+    /* VxWorks uses non-relative relocations for this.  */
+    outrel[0].r_info = ELF32_R_INFO (indx, R_MIPS_32);
+  else
+    /* The relocation is always an REL32 relocation because we don't
+       know where the shared library will wind up at load-time.  */
+    outrel[0].r_info = ELF_R_INFO (output_bfd, (unsigned long) indx,
+				   R_MIPS_REL32);
+
+  /* For strict adherence to the ABI specification, we should
+     generate a R_MIPS_64 relocation record by itself before the
+     _REL32/_64 record as well, such that the addend is read in as
+     a 64-bit value (REL32 is a 32-bit relocation, after all).
+     However, since none of the existing ELF64 MIPS dynamic
+     loaders seems to care, we don't waste space with these
+     artificial relocations.  If this turns out to not be true,
+     mips_elf_allocate_dynamic_relocation() should be tweaked so
+     as to make room for a pair of dynamic relocations per
+     invocation if ABI_64_P, and here we should generate an
+     additional relocation record with R_MIPS_64 by itself for a
+     NULL symbol before this relocation record.  */
+  outrel[1].r_info = ELF_R_INFO (output_bfd, 0,
+				 ABI_64_P (output_bfd)
+				 ? R_MIPS_64
+				 : R_MIPS_NONE);
+  outrel[2].r_info = ELF_R_INFO (output_bfd, 0, R_MIPS_NONE);
+
+  /* Adjust the output offset of the relocation to reference the
+     correct location in the output file.  */
+  outrel[0].r_offset += (input_section->output_section->vma
+			 + input_section->output_offset);
+  outrel[1].r_offset += (input_section->output_section->vma
+			 + input_section->output_offset);
+  outrel[2].r_offset += (input_section->output_section->vma
+			 + input_section->output_offset);
+
+  /* Put the relocation back out.  We have to use the special
+     relocation outputter in the 64-bit case since the 64-bit
+     relocation format is non-standard.  */
+  if (ABI_64_P (output_bfd))
+    {
+      (*get_elf_backend_data (output_bfd)->s->swap_reloc_out)
+	(output_bfd, &outrel[0],
+	 (sreloc->contents
+	  + sreloc->reloc_count * sizeof (Elf64_Mips_External_Rel)));
+    }
+  else if (htab->is_vxworks)
+    {
+      /* VxWorks uses RELA rather than REL dynamic relocations.  */
+      outrel[0].r_addend = *addendp;
+      bfd_elf32_swap_reloca_out
+	(output_bfd, &outrel[0],
+	 (sreloc->contents
+	  + sreloc->reloc_count * sizeof (Elf32_External_Rela)));
+    }
+  else
+    bfd_elf32_swap_reloc_out
+      (output_bfd, &outrel[0],
+       (sreloc->contents + sreloc->reloc_count * sizeof (Elf32_External_Rel)));
+
+  /* We've now added another relocation.  */
+  ++sreloc->reloc_count;
+
+  /* Make sure the output section is writable.  The dynamic linker
+     will be writing to it.  */
+  elf_section_data (input_section->output_section)->this_hdr.sh_flags
+    |= SHF_WRITE;
+
+  /* On IRIX5, make an entry of compact relocation info.  */
+  if (IRIX_COMPAT (output_bfd) == ict_irix5)
+    {
+      asection *scpt = bfd_get_section_by_name (dynobj, ".compact_rel");
+      bfd_byte *cr;
+
+      if (scpt)
+	{
+	  Elf32_crinfo cptrel;
+
+	  mips_elf_set_cr_format (cptrel, CRF_MIPS_LONG);
+	  cptrel.vaddr = (rel->r_offset
+			  + input_section->output_section->vma
+			  + input_section->output_offset);
+	  if (r_type == R_MIPS_REL32)
+	    mips_elf_set_cr_type (cptrel, CRT_MIPS_REL32);
+	  else
+	    mips_elf_set_cr_type (cptrel, CRT_MIPS_WORD);
+	  mips_elf_set_cr_dist2to (cptrel, 0);
+	  cptrel.konst = *addendp;
+
+	  cr = (scpt->contents
+		+ sizeof (Elf32_External_compact_rel));
+	  mips_elf_set_cr_relvaddr (cptrel, 0);
+	  bfd_elf32_swap_crinfo_out (output_bfd, &cptrel,
+				     ((Elf32_External_crinfo *) cr
+				      + scpt->reloc_count));
+	  ++scpt->reloc_count;
+	}
+    }
+
+  /* If we've written this relocation for a readonly section,
+     we need to set DF_TEXTREL again, so that we do not delete the
+     DT_TEXTREL tag.  */
+  if (MIPS_ELF_READONLY_SECTION (input_section))
+    info->flags |= DF_TEXTREL;
+
+  return TRUE;
+}
+
+/* Return the MACH for a MIPS e_flags value.  */
+
+unsigned long
+_bfd_elf_mips_mach (flagword flags)
+{
+  switch (flags & EF_MIPS_MACH)
+    {
+    case E_MIPS_MACH_3900:
+      return bfd_mach_mips3900;
+
+    case E_MIPS_MACH_4010:
+      return bfd_mach_mips4010;
+
+    case E_MIPS_MACH_4100:
+      return bfd_mach_mips4100;
+
+    case E_MIPS_MACH_4111:
+      return bfd_mach_mips4111;
+
+    case E_MIPS_MACH_4120:
+      return bfd_mach_mips4120;
+
+    case E_MIPS_MACH_4650:
+      return bfd_mach_mips4650;
+
+    case E_MIPS_MACH_5400:
+      return bfd_mach_mips5400;
+
+    case E_MIPS_MACH_5500:
+      return bfd_mach_mips5500;
+
+    case E_MIPS_MACH_9000:
+      return bfd_mach_mips9000;
+
+    case E_MIPS_MACH_SB1:
+      return bfd_mach_mips_sb1;
+
+    case E_MIPS_MACH_LS2E:
+      return bfd_mach_mips_loongson_2e;
+
+    case E_MIPS_MACH_LS2F:
+      return bfd_mach_mips_loongson_2f;
+
+    case E_MIPS_MACH_LS3A:
+      return bfd_mach_mips_loongson_3a;
+
+    case E_MIPS_MACH_OCTEON:
+      return bfd_mach_mips_octeon;
+
+    case E_MIPS_MACH_XLR:
+      return bfd_mach_mips_xlr;
+
+    default:
+      switch (flags & EF_MIPS_ARCH)
+	{
+	default:
+	case E_MIPS_ARCH_1:
+	  return bfd_mach_mips3000;
+
+	case E_MIPS_ARCH_2:
+	  return bfd_mach_mips6000;
+
+	case E_MIPS_ARCH_3:
+	  return bfd_mach_mips4000;
+
+	case E_MIPS_ARCH_4:
+	  return bfd_mach_mips8000;
+
+	case E_MIPS_ARCH_5:
+	  return bfd_mach_mips5;
+
+	case E_MIPS_ARCH_32:
+	  return bfd_mach_mipsisa32;
+
+	case E_MIPS_ARCH_64:
+	  return bfd_mach_mipsisa64;
+
+	case E_MIPS_ARCH_32R2:
+	  return bfd_mach_mipsisa32r2;
+
+	case E_MIPS_ARCH_64R2:
+	  return bfd_mach_mipsisa64r2;
+	}
+    }
+
+  return 0;
+}
+
+/* Return printable name for ABI.  */
+
+static INLINE char *
+elf_mips_abi_name (bfd *abfd)
+{
+  flagword flags;
+
+  flags = elf_elfheader (abfd)->e_flags;
+  switch (flags & EF_MIPS_ABI)
+    {
+    case 0:
+      if (ABI_N32_P (abfd))
+	return "N32";
+      else if (ABI_64_P (abfd))
+	return "64";
+      else
+	return "none";
+    case E_MIPS_ABI_O32:
+      return "O32";
+    case E_MIPS_ABI_O64:
+      return "O64";
+    case E_MIPS_ABI_EABI32:
+      return "EABI32";
+    case E_MIPS_ABI_EABI64:
+      return "EABI64";
+    default:
+      return "unknown abi";
+    }
+}
+
+/* MIPS ELF uses two common sections.  One is the usual one, and the
+   other is for small objects.  All the small objects are kept
+   together, and then referenced via the gp pointer, which yields
+   faster assembler code.  This is what we use for the small common
+   section.  This approach is copied from ecoff.c.  */
+static asection mips_elf_scom_section;
+static asymbol mips_elf_scom_symbol;
+static asymbol *mips_elf_scom_symbol_ptr;
+
+/* MIPS ELF also uses an acommon section, which represents an
+   allocated common symbol which may be overridden by a
+   definition in a shared library.  */
+static asection mips_elf_acom_section;
+static asymbol mips_elf_acom_symbol;
+static asymbol *mips_elf_acom_symbol_ptr;
+
+/* This is used for both the 32-bit and the 64-bit ABI.  */
+
+void
+_bfd_mips_elf_symbol_processing (bfd *abfd, asymbol *asym)
+{
+  elf_symbol_type *elfsym;
+
+  /* Handle the special MIPS section numbers that a symbol may use.  */
+  elfsym = (elf_symbol_type *) asym;
+  switch (elfsym->internal_elf_sym.st_shndx)
+    {
+    case SHN_MIPS_ACOMMON:
+      /* This section is used in a dynamically linked executable file.
+	 It is an allocated common section.  The dynamic linker can
+	 either resolve these symbols to something in a shared
+	 library, or it can just leave them here.  For our purposes,
+	 we can consider these symbols to be in a new section.  */
+      if (mips_elf_acom_section.name == NULL)
+	{
+	  /* Initialize the acommon section.  */
+	  mips_elf_acom_section.name = ".acommon";
+	  mips_elf_acom_section.flags = SEC_ALLOC;
+	  mips_elf_acom_section.output_section = &mips_elf_acom_section;
+	  mips_elf_acom_section.symbol = &mips_elf_acom_symbol;
+	  mips_elf_acom_section.symbol_ptr_ptr = &mips_elf_acom_symbol_ptr;
+	  mips_elf_acom_symbol.name = ".acommon";
+	  mips_elf_acom_symbol.flags = BSF_SECTION_SYM;
+	  mips_elf_acom_symbol.section = &mips_elf_acom_section;
+	  mips_elf_acom_symbol_ptr = &mips_elf_acom_symbol;
+	}
+      asym->section = &mips_elf_acom_section;
+      break;
+
+    case SHN_COMMON:
+      /* Common symbols less than the GP size are automatically
+	 treated as SHN_MIPS_SCOMMON symbols on IRIX5.  */
+      if (asym->value > elf_gp_size (abfd)
+	  || ELF_ST_TYPE (elfsym->internal_elf_sym.st_info) == STT_TLS
+	  || IRIX_COMPAT (abfd) == ict_irix6)
+	break;
+      /* Fall through.  */
+    case SHN_MIPS_SCOMMON:
+      if (mips_elf_scom_section.name == NULL)
+	{
+	  /* Initialize the small common section.  */
+	  mips_elf_scom_section.name = ".scommon";
+	  mips_elf_scom_section.flags = SEC_IS_COMMON;
+	  mips_elf_scom_section.output_section = &mips_elf_scom_section;
+	  mips_elf_scom_section.symbol = &mips_elf_scom_symbol;
+	  mips_elf_scom_section.symbol_ptr_ptr = &mips_elf_scom_symbol_ptr;
+	  mips_elf_scom_symbol.name = ".scommon";
+	  mips_elf_scom_symbol.flags = BSF_SECTION_SYM;
+	  mips_elf_scom_symbol.section = &mips_elf_scom_section;
+	  mips_elf_scom_symbol_ptr = &mips_elf_scom_symbol;
+	}
+      asym->section = &mips_elf_scom_section;
+      asym->value = elfsym->internal_elf_sym.st_size;
+      break;
+
+    case SHN_MIPS_SUNDEFINED:
+      asym->section = bfd_und_section_ptr;
+      break;
+
+    case SHN_MIPS_TEXT:
+      {
+	asection *section = bfd_get_section_by_name (abfd, ".text");
+
+	BFD_ASSERT (SGI_COMPAT (abfd));
+	if (section != NULL)
+	  {
+	    asym->section = section;
+	    /* MIPS_TEXT is a bit special, the address is not an offset
+	       to the base of the .text section.  So substract the section
+	       base address to make it an offset.  */
+	    asym->value -= section->vma;
+	  }
+      }
+      break;
+
+    case SHN_MIPS_DATA:
+      {
+	asection *section = bfd_get_section_by_name (abfd, ".data");
+
+	BFD_ASSERT (SGI_COMPAT (abfd));
+	if (section != NULL)
+	  {
+	    asym->section = section;
+	    /* MIPS_DATA is a bit special, the address is not an offset
+	       to the base of the .data section.  So substract the section
+	       base address to make it an offset.  */
+	    asym->value -= section->vma;
+	  }
+      }
+      break;
+    }
+
+  /* If this is an odd-valued function symbol, assume it's a MIPS16
+     or microMIPS one.  */
+  if (ELF_ST_TYPE (elfsym->internal_elf_sym.st_info) == STT_FUNC
+      && (asym->value & 1) != 0)
+    {
+      asym->value--;
+      if (elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH_ASE_MICROMIPS)
+	elfsym->internal_elf_sym.st_other
+	  = ELF_ST_SET_MICROMIPS (elfsym->internal_elf_sym.st_other);
+      else
+	elfsym->internal_elf_sym.st_other
+	  = ELF_ST_SET_MIPS16 (elfsym->internal_elf_sym.st_other);
+    }
+}
+
+/* Implement elf_backend_eh_frame_address_size.  This differs from
+   the default in the way it handles EABI64.
+
+   EABI64 was originally specified as an LP64 ABI, and that is what
+   -mabi=eabi normally gives on a 64-bit target.  However, gcc has
+   historically accepted the combination of -mabi=eabi and -mlong32,
+   and this ILP32 variation has become semi-official over time.
+   Both forms use elf32 and have pointer-sized FDE addresses.
+
+   If an EABI object was generated by GCC 4.0 or above, it will have
+   an empty .gcc_compiled_longXX section, where XX is the size of longs
+   in bits.  Unfortunately, ILP32 objects generated by earlier compilers
+   have no special marking to distinguish them from LP64 objects.
+
+   We don't want users of the official LP64 ABI to be punished for the
+   existence of the ILP32 variant, but at the same time, we don't want
+   to mistakenly interpret pre-4.0 ILP32 objects as being LP64 objects.
+   We therefore take the following approach:
+
+      - If ABFD contains a .gcc_compiled_longXX section, use it to
+        determine the pointer size.
+
+      - Otherwise check the type of the first relocation.  Assume that
+        the LP64 ABI is being used if the relocation is of type R_MIPS_64.
+
+      - Otherwise punt.
+
+   The second check is enough to detect LP64 objects generated by pre-4.0
+   compilers because, in the kind of output generated by those compilers,
+   the first relocation will be associated with either a CIE personality
+   routine or an FDE start address.  Furthermore, the compilers never
+   used a special (non-pointer) encoding for this ABI.
+
+   Checking the relocation type should also be safe because there is no
+   reason to use R_MIPS_64 in an ILP32 object.  Pre-4.0 compilers never
+   did so.  */
+
+unsigned int
+_bfd_mips_elf_eh_frame_address_size (bfd *abfd, asection *sec)
+{
+  if (elf_elfheader (abfd)->e_ident[EI_CLASS] == ELFCLASS64)
+    return 8;
+  if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ABI) == E_MIPS_ABI_EABI64)
+    {
+      bfd_boolean long32_p, long64_p;
+
+      long32_p = bfd_get_section_by_name (abfd, ".gcc_compiled_long32") != 0;
+      long64_p = bfd_get_section_by_name (abfd, ".gcc_compiled_long64") != 0;
+      if (long32_p && long64_p)
+	return 0;
+      if (long32_p)
+	return 4;
+      if (long64_p)
+	return 8;
+
+      if (sec->reloc_count > 0
+	  && elf_section_data (sec)->relocs != NULL
+	  && (ELF32_R_TYPE (elf_section_data (sec)->relocs[0].r_info)
+	      == R_MIPS_64))
+	return 8;
+
+      return 0;
+    }
+  return 4;
+}
+
+/* There appears to be a bug in the MIPSpro linker that causes GOT_DISP
+   relocations against two unnamed section symbols to resolve to the
+   same address.  For example, if we have code like:
+
+	lw	$4,%got_disp(.data)($gp)
+	lw	$25,%got_disp(.text)($gp)
+	jalr	$25
+
+   then the linker will resolve both relocations to .data and the program
+   will jump there rather than to .text.
+
+   We can work around this problem by giving names to local section symbols.
+   This is also what the MIPSpro tools do.  */
+
+bfd_boolean
+_bfd_mips_elf_name_local_section_symbols (bfd *abfd)
+{
+  return SGI_COMPAT (abfd);
+}
+
+/* Work over a section just before writing it out.  This routine is
+   used by both the 32-bit and the 64-bit ABI.  FIXME: We recognize
+   sections that need the SHF_MIPS_GPREL flag by name; there has to be
+   a better way.  */
+
+bfd_boolean
+_bfd_mips_elf_section_processing (bfd *abfd, Elf_Internal_Shdr *hdr)
+{
+  if (hdr->sh_type == SHT_MIPS_REGINFO
+      && hdr->sh_size > 0)
+    {
+      bfd_byte buf[4];
+
+      BFD_ASSERT (hdr->sh_size == sizeof (Elf32_External_RegInfo));
+      BFD_ASSERT (hdr->contents == NULL);
+
+      if (bfd_seek (abfd,
+		    hdr->sh_offset + sizeof (Elf32_External_RegInfo) - 4,
+		    SEEK_SET) != 0)
+	return FALSE;
+      H_PUT_32 (abfd, elf_gp (abfd), buf);
+      if (bfd_bwrite (buf, 4, abfd) != 4)
+	return FALSE;
+    }
+
+  if (hdr->sh_type == SHT_MIPS_OPTIONS
+      && hdr->bfd_section != NULL
+      && mips_elf_section_data (hdr->bfd_section) != NULL
+      && mips_elf_section_data (hdr->bfd_section)->u.tdata != NULL)
+    {
+      bfd_byte *contents, *l, *lend;
+
+      /* We stored the section contents in the tdata field in the
+	 set_section_contents routine.  We save the section contents
+	 so that we don't have to read them again.
+	 At this point we know that elf_gp is set, so we can look
+	 through the section contents to see if there is an
+	 ODK_REGINFO structure.  */
+
+      contents = mips_elf_section_data (hdr->bfd_section)->u.tdata;
+      l = contents;
+      lend = contents + hdr->sh_size;
+      while (l + sizeof (Elf_External_Options) <= lend)
+	{
+	  Elf_Internal_Options intopt;
+
+	  bfd_mips_elf_swap_options_in (abfd, (Elf_External_Options *) l,
+					&intopt);
+	  if (intopt.size < sizeof (Elf_External_Options))
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: Warning: bad `%s' option size %u smaller than its header"),
+		abfd, MIPS_ELF_OPTIONS_SECTION_NAME (abfd), intopt.size);
+	      break;
+	    }
+	  if (ABI_64_P (abfd) && intopt.kind == ODK_REGINFO)
+	    {
+	      bfd_byte buf[8];
+
+	      if (bfd_seek (abfd,
+			    (hdr->sh_offset
+			     + (l - contents)
+			     + sizeof (Elf_External_Options)
+			     + (sizeof (Elf64_External_RegInfo) - 8)),
+			     SEEK_SET) != 0)
+		return FALSE;
+	      H_PUT_64 (abfd, elf_gp (abfd), buf);
+	      if (bfd_bwrite (buf, 8, abfd) != 8)
+		return FALSE;
+	    }
+	  else if (intopt.kind == ODK_REGINFO)
+	    {
+	      bfd_byte buf[4];
+
+	      if (bfd_seek (abfd,
+			    (hdr->sh_offset
+			     + (l - contents)
+			     + sizeof (Elf_External_Options)
+			     + (sizeof (Elf32_External_RegInfo) - 4)),
+			    SEEK_SET) != 0)
+		return FALSE;
+	      H_PUT_32 (abfd, elf_gp (abfd), buf);
+	      if (bfd_bwrite (buf, 4, abfd) != 4)
+		return FALSE;
+	    }
+	  l += intopt.size;
+	}
+    }
+
+  if (hdr->bfd_section != NULL)
+    {
+      const char *name = bfd_get_section_name (abfd, hdr->bfd_section);
+
+      /* .sbss is not handled specially here because the GNU/Linux
+	 prelinker can convert .sbss from NOBITS to PROGBITS and
+	 changing it back to NOBITS breaks the binary.  The entry in
+	 _bfd_mips_elf_special_sections will ensure the correct flags
+	 are set on .sbss if BFD creates it without reading it from an
+	 input file, and without special handling here the flags set
+	 on it in an input file will be followed.  */
+      if (strcmp (name, ".sdata") == 0
+	  || strcmp (name, ".lit8") == 0
+	  || strcmp (name, ".lit4") == 0)
+	{
+	  hdr->sh_flags |= SHF_ALLOC | SHF_WRITE | SHF_MIPS_GPREL;
+	  hdr->sh_type = SHT_PROGBITS;
+	}
+      else if (strcmp (name, ".srdata") == 0)
+	{
+	  hdr->sh_flags |= SHF_ALLOC | SHF_MIPS_GPREL;
+	  hdr->sh_type = SHT_PROGBITS;
+	}
+      else if (strcmp (name, ".compact_rel") == 0)
+	{
+	  hdr->sh_flags = 0;
+	  hdr->sh_type = SHT_PROGBITS;
+	}
+      else if (strcmp (name, ".rtproc") == 0)
+	{
+	  if (hdr->sh_addralign != 0 && hdr->sh_entsize == 0)
+	    {
+	      unsigned int adjust;
+
+	      adjust = hdr->sh_size % hdr->sh_addralign;
+	      if (adjust != 0)
+		hdr->sh_size += hdr->sh_addralign - adjust;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Handle a MIPS specific section when reading an object file.  This
+   is called when elfcode.h finds a section with an unknown type.
+   This routine supports both the 32-bit and 64-bit ELF ABI.
+
+   FIXME: We need to handle the SHF_MIPS_GPREL flag, but I'm not sure
+   how to.  */
+
+bfd_boolean
+_bfd_mips_elf_section_from_shdr (bfd *abfd,
+				 Elf_Internal_Shdr *hdr,
+				 const char *name,
+				 int shindex)
+{
+  flagword flags = 0;
+
+  /* There ought to be a place to keep ELF backend specific flags, but
+     at the moment there isn't one.  We just keep track of the
+     sections by their name, instead.  Fortunately, the ABI gives
+     suggested names for all the MIPS specific sections, so we will
+     probably get away with this.  */
+  switch (hdr->sh_type)
+    {
+    case SHT_MIPS_LIBLIST:
+      if (strcmp (name, ".liblist") != 0)
+	return FALSE;
+      break;
+    case SHT_MIPS_MSYM:
+      if (strcmp (name, ".msym") != 0)
+	return FALSE;
+      break;
+    case SHT_MIPS_CONFLICT:
+      if (strcmp (name, ".conflict") != 0)
+	return FALSE;
+      break;
+    case SHT_MIPS_GPTAB:
+      if (! CONST_STRNEQ (name, ".gptab."))
+	return FALSE;
+      break;
+    case SHT_MIPS_UCODE:
+      if (strcmp (name, ".ucode") != 0)
+	return FALSE;
+      break;
+    case SHT_MIPS_DEBUG:
+      if (strcmp (name, ".mdebug") != 0)
+	return FALSE;
+      flags = SEC_DEBUGGING;
+      break;
+    case SHT_MIPS_REGINFO:
+      if (strcmp (name, ".reginfo") != 0
+	  || hdr->sh_size != sizeof (Elf32_External_RegInfo))
+	return FALSE;
+      flags = (SEC_LINK_ONCE | SEC_LINK_DUPLICATES_SAME_SIZE);
+      break;
+    case SHT_MIPS_IFACE:
+      if (strcmp (name, ".MIPS.interfaces") != 0)
+	return FALSE;
+      break;
+    case SHT_MIPS_CONTENT:
+      if (! CONST_STRNEQ (name, ".MIPS.content"))
+	return FALSE;
+      break;
+    case SHT_MIPS_OPTIONS:
+      if (!MIPS_ELF_OPTIONS_SECTION_NAME_P (name))
+	return FALSE;
+      break;
+    case SHT_MIPS_DWARF:
+      if (! CONST_STRNEQ (name, ".debug_")
+          && ! CONST_STRNEQ (name, ".zdebug_"))
+	return FALSE;
+      break;
+    case SHT_MIPS_SYMBOL_LIB:
+      if (strcmp (name, ".MIPS.symlib") != 0)
+	return FALSE;
+      break;
+    case SHT_MIPS_EVENTS:
+      if (! CONST_STRNEQ (name, ".MIPS.events")
+	  && ! CONST_STRNEQ (name, ".MIPS.post_rel"))
+	return FALSE;
+      break;
+    default:
+      break;
+    }
+
+  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex))
+    return FALSE;
+
+  if (flags)
+    {
+      if (! bfd_set_section_flags (abfd, hdr->bfd_section,
+				   (bfd_get_section_flags (abfd,
+							   hdr->bfd_section)
+				    | flags)))
+	return FALSE;
+    }
+
+  /* FIXME: We should record sh_info for a .gptab section.  */
+
+  /* For a .reginfo section, set the gp value in the tdata information
+     from the contents of this section.  We need the gp value while
+     processing relocs, so we just get it now.  The .reginfo section
+     is not used in the 64-bit MIPS ELF ABI.  */
+  if (hdr->sh_type == SHT_MIPS_REGINFO)
+    {
+      Elf32_External_RegInfo ext;
+      Elf32_RegInfo s;
+
+      if (! bfd_get_section_contents (abfd, hdr->bfd_section,
+				      &ext, 0, sizeof ext))
+	return FALSE;
+      bfd_mips_elf32_swap_reginfo_in (abfd, &ext, &s);
+      elf_gp (abfd) = s.ri_gp_value;
+    }
+
+  /* For a SHT_MIPS_OPTIONS section, look for a ODK_REGINFO entry, and
+     set the gp value based on what we find.  We may see both
+     SHT_MIPS_REGINFO and SHT_MIPS_OPTIONS/ODK_REGINFO; in that case,
+     they should agree.  */
+  if (hdr->sh_type == SHT_MIPS_OPTIONS)
+    {
+      bfd_byte *contents, *l, *lend;
+
+      contents = bfd_malloc (hdr->sh_size);
+      if (contents == NULL)
+	return FALSE;
+      if (! bfd_get_section_contents (abfd, hdr->bfd_section, contents,
+				      0, hdr->sh_size))
+	{
+	  free (contents);
+	  return FALSE;
+	}
+      l = contents;
+      lend = contents + hdr->sh_size;
+      while (l + sizeof (Elf_External_Options) <= lend)
+	{
+	  Elf_Internal_Options intopt;
+
+	  bfd_mips_elf_swap_options_in (abfd, (Elf_External_Options *) l,
+					&intopt);
+	  if (intopt.size < sizeof (Elf_External_Options))
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: Warning: bad `%s' option size %u smaller than its header"),
+		abfd, MIPS_ELF_OPTIONS_SECTION_NAME (abfd), intopt.size);
+	      break;
+	    }
+	  if (ABI_64_P (abfd) && intopt.kind == ODK_REGINFO)
+	    {
+	      Elf64_Internal_RegInfo intreg;
+
+	      bfd_mips_elf64_swap_reginfo_in
+		(abfd,
+		 ((Elf64_External_RegInfo *)
+		  (l + sizeof (Elf_External_Options))),
+		 &intreg);
+	      elf_gp (abfd) = intreg.ri_gp_value;
+	    }
+	  else if (intopt.kind == ODK_REGINFO)
+	    {
+	      Elf32_RegInfo intreg;
+
+	      bfd_mips_elf32_swap_reginfo_in
+		(abfd,
+		 ((Elf32_External_RegInfo *)
+		  (l + sizeof (Elf_External_Options))),
+		 &intreg);
+	      elf_gp (abfd) = intreg.ri_gp_value;
+	    }
+	  l += intopt.size;
+	}
+      free (contents);
+    }
+
+  return TRUE;
+}
+
+/* Set the correct type for a MIPS ELF section.  We do this by the
+   section name, which is a hack, but ought to work.  This routine is
+   used by both the 32-bit and the 64-bit ABI.  */
+
+bfd_boolean
+_bfd_mips_elf_fake_sections (bfd *abfd, Elf_Internal_Shdr *hdr, asection *sec)
+{
+  const char *name = bfd_get_section_name (abfd, sec);
+
+  if (strcmp (name, ".liblist") == 0)
+    {
+      hdr->sh_type = SHT_MIPS_LIBLIST;
+      hdr->sh_info = sec->size / sizeof (Elf32_Lib);
+      /* The sh_link field is set in final_write_processing.  */
+    }
+  else if (strcmp (name, ".conflict") == 0)
+    hdr->sh_type = SHT_MIPS_CONFLICT;
+  else if (CONST_STRNEQ (name, ".gptab."))
+    {
+      hdr->sh_type = SHT_MIPS_GPTAB;
+      hdr->sh_entsize = sizeof (Elf32_External_gptab);
+      /* The sh_info field is set in final_write_processing.  */
+    }
+  else if (strcmp (name, ".ucode") == 0)
+    hdr->sh_type = SHT_MIPS_UCODE;
+  else if (strcmp (name, ".mdebug") == 0)
+    {
+      hdr->sh_type = SHT_MIPS_DEBUG;
+      /* In a shared object on IRIX 5.3, the .mdebug section has an
+         entsize of 0.  FIXME: Does this matter?  */
+      if (SGI_COMPAT (abfd) && (abfd->flags & DYNAMIC) != 0)
+	hdr->sh_entsize = 0;
+      else
+	hdr->sh_entsize = 1;
+    }
+  else if (strcmp (name, ".reginfo") == 0)
+    {
+      hdr->sh_type = SHT_MIPS_REGINFO;
+      /* In a shared object on IRIX 5.3, the .reginfo section has an
+         entsize of 0x18.  FIXME: Does this matter?  */
+      if (SGI_COMPAT (abfd))
+	{
+	  if ((abfd->flags & DYNAMIC) != 0)
+	    hdr->sh_entsize = sizeof (Elf32_External_RegInfo);
+	  else
+	    hdr->sh_entsize = 1;
+	}
+      else
+	hdr->sh_entsize = sizeof (Elf32_External_RegInfo);
+    }
+  else if (SGI_COMPAT (abfd)
+	   && (strcmp (name, ".hash") == 0
+	       || strcmp (name, ".dynamic") == 0
+	       || strcmp (name, ".dynstr") == 0))
+    {
+      if (SGI_COMPAT (abfd))
+	hdr->sh_entsize = 0;
+#if 0
+      /* This isn't how the IRIX6 linker behaves.  */
+      hdr->sh_info = SIZEOF_MIPS_DYNSYM_SECNAMES;
+#endif
+    }
+  else if (strcmp (name, ".got") == 0
+	   || strcmp (name, ".srdata") == 0
+	   || strcmp (name, ".sdata") == 0
+	   || strcmp (name, ".sbss") == 0
+	   || strcmp (name, ".lit4") == 0
+	   || strcmp (name, ".lit8") == 0)
+    hdr->sh_flags |= SHF_MIPS_GPREL;
+  else if (strcmp (name, ".MIPS.interfaces") == 0)
+    {
+      hdr->sh_type = SHT_MIPS_IFACE;
+      hdr->sh_flags |= SHF_MIPS_NOSTRIP;
+    }
+  else if (CONST_STRNEQ (name, ".MIPS.content"))
+    {
+      hdr->sh_type = SHT_MIPS_CONTENT;
+      hdr->sh_flags |= SHF_MIPS_NOSTRIP;
+      /* The sh_info field is set in final_write_processing.  */
+    }
+  else if (MIPS_ELF_OPTIONS_SECTION_NAME_P (name))
+    {
+      hdr->sh_type = SHT_MIPS_OPTIONS;
+      hdr->sh_entsize = 1;
+      hdr->sh_flags |= SHF_MIPS_NOSTRIP;
+    }
+  else if (CONST_STRNEQ (name, ".debug_")
+           || CONST_STRNEQ (name, ".zdebug_"))
+    {
+      hdr->sh_type = SHT_MIPS_DWARF;
+
+      /* Irix facilities such as libexc expect a single .debug_frame
+	 per executable, the system ones have NOSTRIP set and the linker
+	 doesn't merge sections with different flags so ...  */
+      if (SGI_COMPAT (abfd) && CONST_STRNEQ (name, ".debug_frame"))
+	hdr->sh_flags |= SHF_MIPS_NOSTRIP;
+    }
+  else if (strcmp (name, ".MIPS.symlib") == 0)
+    {
+      hdr->sh_type = SHT_MIPS_SYMBOL_LIB;
+      /* The sh_link and sh_info fields are set in
+         final_write_processing.  */
+    }
+  else if (CONST_STRNEQ (name, ".MIPS.events")
+	   || CONST_STRNEQ (name, ".MIPS.post_rel"))
+    {
+      hdr->sh_type = SHT_MIPS_EVENTS;
+      hdr->sh_flags |= SHF_MIPS_NOSTRIP;
+      /* The sh_link field is set in final_write_processing.  */
+    }
+  else if (strcmp (name, ".msym") == 0)
+    {
+      hdr->sh_type = SHT_MIPS_MSYM;
+      hdr->sh_flags |= SHF_ALLOC;
+      hdr->sh_entsize = 8;
+    }
+
+  /* The generic elf_fake_sections will set up REL_HDR using the default
+   kind of relocations.  We used to set up a second header for the
+   non-default kind of relocations here, but only NewABI would use
+   these, and the IRIX ld doesn't like resulting empty RELA sections.
+   Thus we create those header only on demand now.  */
+
+  return TRUE;
+}
+
+/* Given a BFD section, try to locate the corresponding ELF section
+   index.  This is used by both the 32-bit and the 64-bit ABI.
+   Actually, it's not clear to me that the 64-bit ABI supports these,
+   but for non-PIC objects we will certainly want support for at least
+   the .scommon section.  */
+
+bfd_boolean
+_bfd_mips_elf_section_from_bfd_section (bfd *abfd ATTRIBUTE_UNUSED,
+					asection *sec, int *retval)
+{
+  if (strcmp (bfd_get_section_name (abfd, sec), ".scommon") == 0)
+    {
+      *retval = SHN_MIPS_SCOMMON;
+      return TRUE;
+    }
+  if (strcmp (bfd_get_section_name (abfd, sec), ".acommon") == 0)
+    {
+      *retval = SHN_MIPS_ACOMMON;
+      return TRUE;
+    }
+  return FALSE;
+}
+
+/* Hook called by the linker routine which adds symbols from an object
+   file.  We must handle the special MIPS section numbers here.  */
+
+bfd_boolean
+_bfd_mips_elf_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
+			       Elf_Internal_Sym *sym, const char **namep,
+			       flagword *flagsp ATTRIBUTE_UNUSED,
+			       asection **secp, bfd_vma *valp)
+{
+  if (SGI_COMPAT (abfd)
+      && (abfd->flags & DYNAMIC) != 0
+      && strcmp (*namep, "_rld_new_interface") == 0)
+    {
+      /* Skip IRIX5 rld entry name.  */
+      *namep = NULL;
+      return TRUE;
+    }
+
+  /* Shared objects may have a dynamic symbol '_gp_disp' defined as
+     a SECTION *ABS*.  This causes ld to think it can resolve _gp_disp
+     by setting a DT_NEEDED for the shared object.  Since _gp_disp is
+     a magic symbol resolved by the linker, we ignore this bogus definition
+     of _gp_disp.  New ABI objects do not suffer from this problem so this
+     is not done for them. */
+  if (!NEWABI_P(abfd)
+      && (sym->st_shndx == SHN_ABS)
+      && (strcmp (*namep, "_gp_disp") == 0))
+    {
+      *namep = NULL;
+      return TRUE;
+    }
+
+  switch (sym->st_shndx)
+    {
+    case SHN_COMMON:
+      /* Common symbols less than the GP size are automatically
+	 treated as SHN_MIPS_SCOMMON symbols.  */
+      if (sym->st_size > elf_gp_size (abfd)
+	  || ELF_ST_TYPE (sym->st_info) == STT_TLS
+	  || IRIX_COMPAT (abfd) == ict_irix6)
+	break;
+      /* Fall through.  */
+    case SHN_MIPS_SCOMMON:
+      *secp = bfd_make_section_old_way (abfd, ".scommon");
+      (*secp)->flags |= SEC_IS_COMMON;
+      *valp = sym->st_size;
+      break;
+
+    case SHN_MIPS_TEXT:
+      /* This section is used in a shared object.  */
+      if (elf_tdata (abfd)->elf_text_section == NULL)
+	{
+	  asymbol *elf_text_symbol;
+	  asection *elf_text_section;
+	  bfd_size_type amt = sizeof (asection);
+
+	  elf_text_section = bfd_zalloc (abfd, amt);
+	  if (elf_text_section == NULL)
+	    return FALSE;
+
+	  amt = sizeof (asymbol);
+	  elf_text_symbol = bfd_zalloc (abfd, amt);
+	  if (elf_text_symbol == NULL)
+	    return FALSE;
+
+	  /* Initialize the section.  */
+
+	  elf_tdata (abfd)->elf_text_section = elf_text_section;
+	  elf_tdata (abfd)->elf_text_symbol = elf_text_symbol;
+
+	  elf_text_section->symbol = elf_text_symbol;
+	  elf_text_section->symbol_ptr_ptr = &elf_tdata (abfd)->elf_text_symbol;
+
+	  elf_text_section->name = ".text";
+	  elf_text_section->flags = SEC_NO_FLAGS;
+	  elf_text_section->output_section = NULL;
+	  elf_text_section->owner = abfd;
+	  elf_text_symbol->name = ".text";
+	  elf_text_symbol->flags = BSF_SECTION_SYM | BSF_DYNAMIC;
+	  elf_text_symbol->section = elf_text_section;
+	}
+      /* This code used to do *secp = bfd_und_section_ptr if
+         info->shared.  I don't know why, and that doesn't make sense,
+         so I took it out.  */
+      *secp = elf_tdata (abfd)->elf_text_section;
+      break;
+
+    case SHN_MIPS_ACOMMON:
+      /* Fall through. XXX Can we treat this as allocated data?  */
+    case SHN_MIPS_DATA:
+      /* This section is used in a shared object.  */
+      if (elf_tdata (abfd)->elf_data_section == NULL)
+	{
+	  asymbol *elf_data_symbol;
+	  asection *elf_data_section;
+	  bfd_size_type amt = sizeof (asection);
+
+	  elf_data_section = bfd_zalloc (abfd, amt);
+	  if (elf_data_section == NULL)
+	    return FALSE;
+
+	  amt = sizeof (asymbol);
+	  elf_data_symbol = bfd_zalloc (abfd, amt);
+	  if (elf_data_symbol == NULL)
+	    return FALSE;
+
+	  /* Initialize the section.  */
+
+	  elf_tdata (abfd)->elf_data_section = elf_data_section;
+	  elf_tdata (abfd)->elf_data_symbol = elf_data_symbol;
+
+	  elf_data_section->symbol = elf_data_symbol;
+	  elf_data_section->symbol_ptr_ptr = &elf_tdata (abfd)->elf_data_symbol;
+
+	  elf_data_section->name = ".data";
+	  elf_data_section->flags = SEC_NO_FLAGS;
+	  elf_data_section->output_section = NULL;
+	  elf_data_section->owner = abfd;
+	  elf_data_symbol->name = ".data";
+	  elf_data_symbol->flags = BSF_SECTION_SYM | BSF_DYNAMIC;
+	  elf_data_symbol->section = elf_data_section;
+	}
+      /* This code used to do *secp = bfd_und_section_ptr if
+         info->shared.  I don't know why, and that doesn't make sense,
+         so I took it out.  */
+      *secp = elf_tdata (abfd)->elf_data_section;
+      break;
+
+    case SHN_MIPS_SUNDEFINED:
+      *secp = bfd_und_section_ptr;
+      break;
+    }
+
+  if (SGI_COMPAT (abfd)
+      && ! info->shared
+      && info->output_bfd->xvec == abfd->xvec
+      && strcmp (*namep, "__rld_obj_head") == 0)
+    {
+      struct elf_link_hash_entry *h;
+      struct bfd_link_hash_entry *bh;
+
+      /* Mark __rld_obj_head as dynamic.  */
+      bh = NULL;
+      if (! (_bfd_generic_link_add_one_symbol
+	     (info, abfd, *namep, BSF_GLOBAL, *secp, *valp, NULL, FALSE,
+	      get_elf_backend_data (abfd)->collect, &bh)))
+	return FALSE;
+
+      h = (struct elf_link_hash_entry *) bh;
+      h->non_elf = 0;
+      h->def_regular = 1;
+      h->type = STT_OBJECT;
+
+      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	return FALSE;
+
+      mips_elf_hash_table (info)->use_rld_obj_head = TRUE;
+    }
+
+  /* If this is a mips16 text symbol, add 1 to the value to make it
+     odd.  This will cause something like .word SYM to come up with
+     the right value when it is loaded into the PC.  */
+  if (ELF_ST_IS_COMPRESSED (sym->st_other))
+    ++*valp;
+
+  return TRUE;
+}
+
+/* This hook function is called before the linker writes out a global
+   symbol.  We mark symbols as small common if appropriate.  This is
+   also where we undo the increment of the value for a mips16 symbol.  */
+
+int
+_bfd_mips_elf_link_output_symbol_hook
+  (struct bfd_link_info *info ATTRIBUTE_UNUSED,
+   const char *name ATTRIBUTE_UNUSED, Elf_Internal_Sym *sym,
+   asection *input_sec, struct elf_link_hash_entry *h ATTRIBUTE_UNUSED)
+{
+  /* If we see a common symbol, which implies a relocatable link, then
+     if a symbol was small common in an input file, mark it as small
+     common in the output file.  */
+  if (sym->st_shndx == SHN_COMMON
+      && strcmp (input_sec->name, ".scommon") == 0)
+    sym->st_shndx = SHN_MIPS_SCOMMON;
+
+  if (ELF_ST_IS_COMPRESSED (sym->st_other))
+    sym->st_value &= ~1;
+
+  return 1;
+}
+
+/* Functions for the dynamic linker.  */
+
+/* Create dynamic sections when linking against a dynamic object.  */
+
+bfd_boolean
+_bfd_mips_elf_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  struct elf_link_hash_entry *h;
+  struct bfd_link_hash_entry *bh;
+  flagword flags;
+  register asection *s;
+  const char * const *namep;
+  struct mips_elf_link_hash_table *htab;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	   | SEC_LINKER_CREATED | SEC_READONLY);
+
+  /* The psABI requires a read-only .dynamic section, but the VxWorks
+     EABI doesn't.  */
+  if (!htab->is_vxworks)
+    {
+      s = bfd_get_section_by_name (abfd, ".dynamic");
+      if (s != NULL)
+	{
+	  if (! bfd_set_section_flags (abfd, s, flags))
+	    return FALSE;
+	}
+    }
+
+  /* We need to create .got section.  */
+  if (!mips_elf_create_got_section (abfd, info))
+    return FALSE;
+
+  if (! mips_elf_rel_dyn_section (info, TRUE))
+    return FALSE;
+
+  /* Create .stub section.  */
+  s = bfd_make_section_with_flags (abfd,
+				   MIPS_ELF_STUB_SECTION_NAME (abfd),
+				   flags | SEC_CODE);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s,
+				      MIPS_ELF_LOG_FILE_ALIGN (abfd)))
+    return FALSE;
+  htab->sstubs = s;
+
+  if ((IRIX_COMPAT (abfd) == ict_irix5 || IRIX_COMPAT (abfd) == ict_none)
+      && !info->shared
+      && bfd_get_section_by_name (abfd, ".rld_map") == NULL)
+    {
+      s = bfd_make_section_with_flags (abfd, ".rld_map",
+				       flags &~ (flagword) SEC_READONLY);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s,
+					  MIPS_ELF_LOG_FILE_ALIGN (abfd)))
+	return FALSE;
+    }
+
+  /* On IRIX5, we adjust add some additional symbols and change the
+     alignments of several sections.  There is no ABI documentation
+     indicating that this is necessary on IRIX6, nor any evidence that
+     the linker takes such action.  */
+  if (IRIX_COMPAT (abfd) == ict_irix5)
+    {
+      for (namep = mips_elf_dynsym_rtproc_names; *namep != NULL; namep++)
+	{
+	  bh = NULL;
+	  if (! (_bfd_generic_link_add_one_symbol
+		 (info, abfd, *namep, BSF_GLOBAL, bfd_und_section_ptr, 0,
+		  NULL, FALSE, get_elf_backend_data (abfd)->collect, &bh)))
+	    return FALSE;
+
+	  h = (struct elf_link_hash_entry *) bh;
+	  h->non_elf = 0;
+	  h->def_regular = 1;
+	  h->type = STT_SECTION;
+
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      /* We need to create a .compact_rel section.  */
+      if (SGI_COMPAT (abfd))
+	{
+	  if (!mips_elf_create_compact_rel_section (abfd, info))
+	    return FALSE;
+	}
+
+      /* Change alignments of some sections.  */
+      s = bfd_get_section_by_name (abfd, ".hash");
+      if (s != NULL)
+	bfd_set_section_alignment (abfd, s, MIPS_ELF_LOG_FILE_ALIGN (abfd));
+      s = bfd_get_section_by_name (abfd, ".dynsym");
+      if (s != NULL)
+	bfd_set_section_alignment (abfd, s, MIPS_ELF_LOG_FILE_ALIGN (abfd));
+      s = bfd_get_section_by_name (abfd, ".dynstr");
+      if (s != NULL)
+	bfd_set_section_alignment (abfd, s, MIPS_ELF_LOG_FILE_ALIGN (abfd));
+      s = bfd_get_section_by_name (abfd, ".reginfo");
+      if (s != NULL)
+	bfd_set_section_alignment (abfd, s, MIPS_ELF_LOG_FILE_ALIGN (abfd));
+      s = bfd_get_section_by_name (abfd, ".dynamic");
+      if (s != NULL)
+	bfd_set_section_alignment (abfd, s, MIPS_ELF_LOG_FILE_ALIGN (abfd));
+    }
+
+  if (!info->shared)
+    {
+      const char *name;
+
+      name = SGI_COMPAT (abfd) ? "_DYNAMIC_LINK" : "_DYNAMIC_LINKING";
+      bh = NULL;
+      if (!(_bfd_generic_link_add_one_symbol
+	    (info, abfd, name, BSF_GLOBAL, bfd_abs_section_ptr, 0,
+	     NULL, FALSE, get_elf_backend_data (abfd)->collect, &bh)))
+	return FALSE;
+
+      h = (struct elf_link_hash_entry *) bh;
+      h->non_elf = 0;
+      h->def_regular = 1;
+      h->type = STT_SECTION;
+
+      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	return FALSE;
+
+      if (! mips_elf_hash_table (info)->use_rld_obj_head)
+	{
+	  /* __rld_map is a four byte word located in the .data section
+	     and is filled in by the rtld to contain a pointer to
+	     the _r_debug structure. Its symbol value will be set in
+	     _bfd_mips_elf_finish_dynamic_symbol.  */
+	  s = bfd_get_section_by_name (abfd, ".rld_map");
+	  BFD_ASSERT (s != NULL);
+
+	  name = SGI_COMPAT (abfd) ? "__rld_map" : "__RLD_MAP";
+	  bh = NULL;
+	  if (!(_bfd_generic_link_add_one_symbol
+		(info, abfd, name, BSF_GLOBAL, s, 0, NULL, FALSE,
+		 get_elf_backend_data (abfd)->collect, &bh)))
+	    return FALSE;
+
+	  h = (struct elf_link_hash_entry *) bh;
+	  h->non_elf = 0;
+	  h->def_regular = 1;
+	  h->type = STT_OBJECT;
+
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+    }
+
+  /* Create the .plt, .rel(a).plt, .dynbss and .rel(a).bss sections.
+     Also create the _PROCEDURE_LINKAGE_TABLE symbol.  */
+  if (!_bfd_elf_create_dynamic_sections (abfd, info))
+    return FALSE;
+
+  /* Cache the sections created above.  */
+  htab->splt = bfd_get_section_by_name (abfd, ".plt");
+  htab->sdynbss = bfd_get_section_by_name (abfd, ".dynbss");
+  if (htab->is_vxworks)
+    {
+      htab->srelbss = bfd_get_section_by_name (abfd, ".rela.bss");
+      htab->srelplt = bfd_get_section_by_name (abfd, ".rela.plt");
+    }
+  else
+    htab->srelplt = bfd_get_section_by_name (abfd, ".rel.plt");
+  if (!htab->sdynbss
+      || (htab->is_vxworks && !htab->srelbss && !info->shared)
+      || !htab->srelplt
+      || !htab->splt)
+    abort ();
+
+  if (htab->is_vxworks)
+    {
+      /* Do the usual VxWorks handling.  */
+      if (!elf_vxworks_create_dynamic_sections (abfd, info, &htab->srelplt2))
+	return FALSE;
+
+      /* Work out the PLT sizes.  */
+      if (info->shared)
+	{
+	  htab->plt_header_size
+	    = 4 * ARRAY_SIZE (mips_vxworks_shared_plt0_entry);
+	  htab->plt_entry_size
+	    = 4 * ARRAY_SIZE (mips_vxworks_shared_plt_entry);
+	}
+      else
+	{
+	  htab->plt_header_size
+	    = 4 * ARRAY_SIZE (mips_vxworks_exec_plt0_entry);
+	  htab->plt_entry_size
+	    = 4 * ARRAY_SIZE (mips_vxworks_exec_plt_entry);
+	}
+    }
+  else if (!info->shared)
+    {
+      /* All variants of the plt0 entry are the same size.  */
+      htab->plt_header_size = 4 * ARRAY_SIZE (mips_o32_exec_plt0_entry);
+      htab->plt_entry_size = 4 * ARRAY_SIZE (mips_exec_plt_entry);
+    }
+
+  return TRUE;
+}
+
+/* Return true if relocation REL against section SEC is a REL rather than
+   RELA relocation.  RELOCS is the first relocation in the section and
+   ABFD is the bfd that contains SEC.  */
+
+static bfd_boolean
+mips_elf_rel_relocation_p (bfd *abfd, asection *sec,
+			   const Elf_Internal_Rela *relocs,
+			   const Elf_Internal_Rela *rel)
+{
+  Elf_Internal_Shdr *rel_hdr;
+  const struct elf_backend_data *bed;
+
+  /* To determine which flavor of relocation this is, we depend on the
+     fact that the INPUT_SECTION's REL_HDR is read before RELA_HDR.  */
+  rel_hdr = elf_section_data (sec)->rel.hdr;
+  if (rel_hdr == NULL)
+    return FALSE;
+  bed = get_elf_backend_data (abfd);
+  return ((size_t) (rel - relocs)
+	  < NUM_SHDR_ENTRIES (rel_hdr) * bed->s->int_rels_per_ext_rel);
+}
+
+/* Read the addend for REL relocation REL, which belongs to bfd ABFD.
+   HOWTO is the relocation's howto and CONTENTS points to the contents
+   of the section that REL is against.  */
+
+static bfd_vma
+mips_elf_read_rel_addend (bfd *abfd, const Elf_Internal_Rela *rel,
+			  reloc_howto_type *howto, bfd_byte *contents)
+{
+  bfd_byte *location;
+  unsigned int r_type;
+  bfd_vma addend;
+
+  r_type = ELF_R_TYPE (abfd, rel->r_info);
+  location = contents + rel->r_offset;
+
+  /* Get the addend, which is stored in the input file.  */
+  _bfd_mips_elf_reloc_unshuffle (abfd, r_type, FALSE, location);
+  addend = mips_elf_obtain_contents (howto, rel, abfd, contents);
+  _bfd_mips_elf_reloc_shuffle (abfd, r_type, FALSE, location);
+
+  return addend & howto->src_mask;
+}
+
+/* REL is a relocation in ABFD that needs a partnering LO16 relocation
+   and *ADDEND is the addend for REL itself.  Look for the LO16 relocation
+   and update *ADDEND with the final addend.  Return true on success
+   or false if the LO16 could not be found.  RELEND is the exclusive
+   upper bound on the relocations for REL's section.  */
+
+static bfd_boolean
+mips_elf_add_lo16_rel_addend (bfd *abfd,
+			      const Elf_Internal_Rela *rel,
+			      const Elf_Internal_Rela *relend,
+			      bfd_byte *contents, bfd_vma *addend)
+{
+  unsigned int r_type, lo16_type;
+  const Elf_Internal_Rela *lo16_relocation;
+  reloc_howto_type *lo16_howto;
+  bfd_vma l;
+
+  r_type = ELF_R_TYPE (abfd, rel->r_info);
+  if (mips16_reloc_p (r_type))
+    lo16_type = R_MIPS16_LO16;
+  else if (micromips_reloc_p (r_type))
+    lo16_type = R_MICROMIPS_LO16;
+  else
+    lo16_type = R_MIPS_LO16;
+
+  /* The combined value is the sum of the HI16 addend, left-shifted by
+     sixteen bits, and the LO16 addend, sign extended.  (Usually, the
+     code does a `lui' of the HI16 value, and then an `addiu' of the
+     LO16 value.)
+
+     Scan ahead to find a matching LO16 relocation.
+
+     According to the MIPS ELF ABI, the R_MIPS_LO16 relocation must
+     be immediately following.  However, for the IRIX6 ABI, the next
+     relocation may be a composed relocation consisting of several
+     relocations for the same address.  In that case, the R_MIPS_LO16
+     relocation may occur as one of these.  We permit a similar
+     extension in general, as that is useful for GCC.
+
+     In some cases GCC dead code elimination removes the LO16 but keeps
+     the corresponding HI16.  This is strictly speaking a violation of
+     the ABI but not immediately harmful.  */
+  lo16_relocation = mips_elf_next_relocation (abfd, lo16_type, rel, relend);
+  if (lo16_relocation == NULL)
+    return FALSE;
+
+  /* Obtain the addend kept there.  */
+  lo16_howto = MIPS_ELF_RTYPE_TO_HOWTO (abfd, lo16_type, FALSE);
+  l = mips_elf_read_rel_addend (abfd, lo16_relocation, lo16_howto, contents);
+
+  l <<= lo16_howto->rightshift;
+  l = _bfd_mips_elf_sign_extend (l, 16);
+
+  *addend <<= 16;
+  *addend += l;
+  return TRUE;
+}
+
+/* Try to read the contents of section SEC in bfd ABFD.  Return true and
+   store the contents in *CONTENTS on success.  Assume that *CONTENTS
+   already holds the contents if it is nonull on entry.  */
+
+static bfd_boolean
+mips_elf_get_section_contents (bfd *abfd, asection *sec, bfd_byte **contents)
+{
+  if (*contents)
+    return TRUE;
+
+  /* Get cached copy if it exists.  */
+  if (elf_section_data (sec)->this_hdr.contents != NULL)
+    {
+      *contents = elf_section_data (sec)->this_hdr.contents;
+      return TRUE;
+    }
+
+  return bfd_malloc_and_get_section (abfd, sec, contents);
+}
+
+/* Look through the relocs for a section during the first phase, and
+   allocate space in the global offset table.  */
+
+bfd_boolean
+_bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
+			    asection *sec, const Elf_Internal_Rela *relocs)
+{
+  const char *name;
+  bfd *dynobj;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  size_t extsymoff;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  asection *sreloc;
+  const struct elf_backend_data *bed;
+  struct mips_elf_link_hash_table *htab;
+  bfd_byte *contents;
+  bfd_vma addend;
+  reloc_howto_type *howto;
+
+  if (info->relocatable)
+    return TRUE;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  dynobj = elf_hash_table (info)->dynobj;
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  extsymoff = (elf_bad_symtab (abfd)) ? 0 : symtab_hdr->sh_info;
+
+  bed = get_elf_backend_data (abfd);
+  rel_end = relocs + sec->reloc_count * bed->s->int_rels_per_ext_rel;
+
+  /* Check for the mips16 stub sections.  */
+
+  name = bfd_get_section_name (abfd, sec);
+  if (FN_STUB_P (name))
+    {
+      unsigned long r_symndx;
+
+      /* Look at the relocation information to figure out which symbol
+         this is for.  */
+
+      r_symndx = mips16_stub_symndx (sec, relocs, rel_end);
+      if (r_symndx == 0)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B: Warning: cannot determine the target function for"
+	       " stub section `%s'"),
+	     abfd, name);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      if (r_symndx < extsymoff
+	  || sym_hashes[r_symndx - extsymoff] == NULL)
+	{
+	  asection *o;
+
+	  /* This stub is for a local symbol.  This stub will only be
+             needed if there is some relocation in this BFD, other
+             than a 16 bit function call, which refers to this symbol.  */
+	  for (o = abfd->sections; o != NULL; o = o->next)
+	    {
+	      Elf_Internal_Rela *sec_relocs;
+	      const Elf_Internal_Rela *r, *rend;
+
+	      /* We can ignore stub sections when looking for relocs.  */
+	      if ((o->flags & SEC_RELOC) == 0
+		  || o->reloc_count == 0
+		  || section_allows_mips16_refs_p (o))
+		continue;
+
+	      sec_relocs
+		= _bfd_elf_link_read_relocs (abfd, o, NULL, NULL,
+					     info->keep_memory);
+	      if (sec_relocs == NULL)
+		return FALSE;
+
+	      rend = sec_relocs + o->reloc_count;
+	      for (r = sec_relocs; r < rend; r++)
+		if (ELF_R_SYM (abfd, r->r_info) == r_symndx
+		    && !mips16_call_reloc_p (ELF_R_TYPE (abfd, r->r_info)))
+		  break;
+
+	      if (elf_section_data (o)->relocs != sec_relocs)
+		free (sec_relocs);
+
+	      if (r < rend)
+		break;
+	    }
+
+	  if (o == NULL)
+	    {
+	      /* There is no non-call reloc for this stub, so we do
+                 not need it.  Since this function is called before
+                 the linker maps input sections to output sections, we
+                 can easily discard it by setting the SEC_EXCLUDE
+                 flag.  */
+	      sec->flags |= SEC_EXCLUDE;
+	      return TRUE;
+	    }
+
+	  /* Record this stub in an array of local symbol stubs for
+             this BFD.  */
+	  if (elf_tdata (abfd)->local_stubs == NULL)
+	    {
+	      unsigned long symcount;
+	      asection **n;
+	      bfd_size_type amt;
+
+	      if (elf_bad_symtab (abfd))
+		symcount = NUM_SHDR_ENTRIES (symtab_hdr);
+	      else
+		symcount = symtab_hdr->sh_info;
+	      amt = symcount * sizeof (asection *);
+	      n = bfd_zalloc (abfd, amt);
+	      if (n == NULL)
+		return FALSE;
+	      elf_tdata (abfd)->local_stubs = n;
+	    }
+
+	  sec->flags |= SEC_KEEP;
+	  elf_tdata (abfd)->local_stubs[r_symndx] = sec;
+
+	  /* We don't need to set mips16_stubs_seen in this case.
+             That flag is used to see whether we need to look through
+             the global symbol table for stubs.  We don't need to set
+             it here, because we just have a local stub.  */
+	}
+      else
+	{
+	  struct mips_elf_link_hash_entry *h;
+
+	  h = ((struct mips_elf_link_hash_entry *)
+	       sym_hashes[r_symndx - extsymoff]);
+
+	  while (h->root.root.type == bfd_link_hash_indirect
+		 || h->root.root.type == bfd_link_hash_warning)
+	    h = (struct mips_elf_link_hash_entry *) h->root.root.u.i.link;
+
+	  /* H is the symbol this stub is for.  */
+
+	  /* If we already have an appropriate stub for this function, we
+	     don't need another one, so we can discard this one.  Since
+	     this function is called before the linker maps input sections
+	     to output sections, we can easily discard it by setting the
+	     SEC_EXCLUDE flag.  */
+	  if (h->fn_stub != NULL)
+	    {
+	      sec->flags |= SEC_EXCLUDE;
+	      return TRUE;
+	    }
+
+	  sec->flags |= SEC_KEEP;
+	  h->fn_stub = sec;
+	  mips_elf_hash_table (info)->mips16_stubs_seen = TRUE;
+	}
+    }
+  else if (CALL_STUB_P (name) || CALL_FP_STUB_P (name))
+    {
+      unsigned long r_symndx;
+      struct mips_elf_link_hash_entry *h;
+      asection **loc;
+
+      /* Look at the relocation information to figure out which symbol
+         this is for.  */
+
+      r_symndx = mips16_stub_symndx (sec, relocs, rel_end);
+      if (r_symndx == 0)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B: Warning: cannot determine the target function for"
+	       " stub section `%s'"),
+	     abfd, name);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      if (r_symndx < extsymoff
+	  || sym_hashes[r_symndx - extsymoff] == NULL)
+	{
+	  asection *o;
+
+	  /* This stub is for a local symbol.  This stub will only be
+             needed if there is some relocation (R_MIPS16_26) in this BFD
+             that refers to this symbol.  */
+	  for (o = abfd->sections; o != NULL; o = o->next)
+	    {
+	      Elf_Internal_Rela *sec_relocs;
+	      const Elf_Internal_Rela *r, *rend;
+
+	      /* We can ignore stub sections when looking for relocs.  */
+	      if ((o->flags & SEC_RELOC) == 0
+		  || o->reloc_count == 0
+		  || section_allows_mips16_refs_p (o))
+		continue;
+
+	      sec_relocs
+		= _bfd_elf_link_read_relocs (abfd, o, NULL, NULL,
+					     info->keep_memory);
+	      if (sec_relocs == NULL)
+		return FALSE;
+
+	      rend = sec_relocs + o->reloc_count;
+	      for (r = sec_relocs; r < rend; r++)
+		if (ELF_R_SYM (abfd, r->r_info) == r_symndx
+		    && ELF_R_TYPE (abfd, r->r_info) == R_MIPS16_26)
+		    break;
+
+	      if (elf_section_data (o)->relocs != sec_relocs)
+		free (sec_relocs);
+
+	      if (r < rend)
+		break;
+	    }
+
+	  if (o == NULL)
+	    {
+	      /* There is no non-call reloc for this stub, so we do
+                 not need it.  Since this function is called before
+                 the linker maps input sections to output sections, we
+                 can easily discard it by setting the SEC_EXCLUDE
+                 flag.  */
+	      sec->flags |= SEC_EXCLUDE;
+	      return TRUE;
+	    }
+
+	  /* Record this stub in an array of local symbol call_stubs for
+             this BFD.  */
+	  if (elf_tdata (abfd)->local_call_stubs == NULL)
+	    {
+	      unsigned long symcount;
+	      asection **n;
+	      bfd_size_type amt;
+
+	      if (elf_bad_symtab (abfd))
+		symcount = NUM_SHDR_ENTRIES (symtab_hdr);
+	      else
+		symcount = symtab_hdr->sh_info;
+	      amt = symcount * sizeof (asection *);
+	      n = bfd_zalloc (abfd, amt);
+	      if (n == NULL)
+		return FALSE;
+	      elf_tdata (abfd)->local_call_stubs = n;
+	    }
+
+	  sec->flags |= SEC_KEEP;
+	  elf_tdata (abfd)->local_call_stubs[r_symndx] = sec;
+
+	  /* We don't need to set mips16_stubs_seen in this case.
+             That flag is used to see whether we need to look through
+             the global symbol table for stubs.  We don't need to set
+             it here, because we just have a local stub.  */
+	}
+      else
+	{
+	  h = ((struct mips_elf_link_hash_entry *)
+	       sym_hashes[r_symndx - extsymoff]);
+	  
+	  /* H is the symbol this stub is for.  */
+	  
+	  if (CALL_FP_STUB_P (name))
+	    loc = &h->call_fp_stub;
+	  else
+	    loc = &h->call_stub;
+	  
+	  /* If we already have an appropriate stub for this function, we
+	     don't need another one, so we can discard this one.  Since
+	     this function is called before the linker maps input sections
+	     to output sections, we can easily discard it by setting the
+	     SEC_EXCLUDE flag.  */
+	  if (*loc != NULL)
+	    {
+	      sec->flags |= SEC_EXCLUDE;
+	      return TRUE;
+	    }
+
+	  sec->flags |= SEC_KEEP;
+	  *loc = sec;
+	  mips_elf_hash_table (info)->mips16_stubs_seen = TRUE;
+	}
+    }
+
+  sreloc = NULL;
+  contents = NULL;
+  for (rel = relocs; rel < rel_end; ++rel)
+    {
+      unsigned long r_symndx;
+      unsigned int r_type;
+      struct elf_link_hash_entry *h;
+      bfd_boolean can_make_dynamic_p;
+
+      r_symndx = ELF_R_SYM (abfd, rel->r_info);
+      r_type = ELF_R_TYPE (abfd, rel->r_info);
+
+      if (r_symndx < extsymoff)
+	h = NULL;
+      else if (r_symndx >= extsymoff + NUM_SHDR_ENTRIES (symtab_hdr))
+	{
+	  (*_bfd_error_handler)
+	    (_("%B: Malformed reloc detected for section %s"),
+	     abfd, name);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+      else
+	{
+	  h = sym_hashes[r_symndx - extsymoff];
+	  while (h != NULL
+		 && (h->root.type == bfd_link_hash_indirect
+		     || h->root.type == bfd_link_hash_warning))
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      /* Set CAN_MAKE_DYNAMIC_P to true if we can convert this
+	 relocation into a dynamic one.  */
+      can_make_dynamic_p = FALSE;
+      switch (r_type)
+	{
+	case R_MIPS16_GOT16:
+	case R_MIPS16_CALL16:
+	case R_MIPS_GOT16:
+	case R_MIPS_CALL16:
+	case R_MIPS_CALL_HI16:
+	case R_MIPS_CALL_LO16:
+	case R_MIPS_GOT_HI16:
+	case R_MIPS_GOT_LO16:
+	case R_MIPS_GOT_PAGE:
+	case R_MIPS_GOT_OFST:
+	case R_MIPS_GOT_DISP:
+	case R_MIPS_TLS_GOTTPREL:
+	case R_MIPS_TLS_GD:
+	case R_MIPS_TLS_LDM:
+	case R_MICROMIPS_GOT16:
+	case R_MICROMIPS_CALL16:
+	case R_MICROMIPS_CALL_HI16:
+	case R_MICROMIPS_CALL_LO16:
+	case R_MICROMIPS_GOT_HI16:
+	case R_MICROMIPS_GOT_LO16:
+	case R_MICROMIPS_GOT_PAGE:
+	case R_MICROMIPS_GOT_OFST:
+	case R_MICROMIPS_GOT_DISP:
+	case R_MICROMIPS_TLS_GOTTPREL:
+	case R_MICROMIPS_TLS_GD:
+	case R_MICROMIPS_TLS_LDM:
+	  if (dynobj == NULL)
+	    elf_hash_table (info)->dynobj = dynobj = abfd;
+	  if (!mips_elf_create_got_section (dynobj, info))
+	    return FALSE;
+	  if (htab->is_vxworks && !info->shared)
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: GOT reloc at 0x%lx not expected in executables"),
+		 abfd, (unsigned long) rel->r_offset);
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	  break;
+
+	  /* This is just a hint; it can safely be ignored.  Don't set
+	     has_static_relocs for the corresponding symbol.  */
+	case R_MIPS_JALR:
+	case R_MICROMIPS_JALR:
+	  break;
+
+	case R_MIPS_32:
+	case R_MIPS_REL32:
+	case R_MIPS_64:
+	  /* In VxWorks executables, references to external symbols
+	     must be handled using copy relocs or PLT entries; it is not
+	     possible to convert this relocation into a dynamic one.
+
+	     For executables that use PLTs and copy-relocs, we have a
+	     choice between converting the relocation into a dynamic
+	     one or using copy relocations or PLT entries.  It is
+	     usually better to do the former, unless the relocation is
+	     against a read-only section.  */
+	  if ((info->shared
+	       || (h != NULL
+		   && !htab->is_vxworks
+		   && strcmp (h->root.root.string, "__gnu_local_gp") != 0
+		   && !(!info->nocopyreloc
+			&& !PIC_OBJECT_P (abfd)
+			&& MIPS_ELF_READONLY_SECTION (sec))))
+	      && (sec->flags & SEC_ALLOC) != 0)
+	    {
+	      can_make_dynamic_p = TRUE;
+	      if (dynobj == NULL)
+		elf_hash_table (info)->dynobj = dynobj = abfd;
+	      break;
+	    }
+	  /* For sections that are not SEC_ALLOC a copy reloc would be
+	     output if possible (implying questionable semantics for
+	     read-only data objects) or otherwise the final link would
+	     fail as ld.so will not process them and could not therefore
+	     handle any outstanding dynamic relocations.
+
+	     For such sections that are also SEC_DEBUGGING, we can avoid
+	     these problems by simply ignoring any relocs as these
+	     sections have a predefined use and we know it is safe to do
+	     so.
+
+	     This is needed in cases such as a global symbol definition
+	     in a shared library causing a common symbol from an object
+	     file to be converted to an undefined reference.  If that
+	     happens, then all the relocations against this symbol from
+	     SEC_DEBUGGING sections in the object file will resolve to
+	     nil.  */
+	  if ((sec->flags & SEC_DEBUGGING) != 0)
+	    break;
+	  /* Fall through.  */
+
+	default:
+	  /* Most static relocations require pointer equality, except
+	     for branches.  */
+	  if (h)
+	    h->pointer_equality_needed = TRUE;
+	  /* Fall through.  */
+
+	case R_MIPS_26:
+	case R_MIPS_PC16:
+	case R_MIPS16_26:
+	case R_MICROMIPS_26_S1:
+	case R_MICROMIPS_PC7_S1:
+	case R_MICROMIPS_PC10_S1:
+	case R_MICROMIPS_PC16_S1:
+	case R_MICROMIPS_PC23_S2:
+	  if (h)
+	    ((struct mips_elf_link_hash_entry *) h)->has_static_relocs = TRUE;
+	  break;
+	}
+
+      if (h)
+	{
+	  /* Relocations against the special VxWorks __GOTT_BASE__ and
+	     __GOTT_INDEX__ symbols must be left to the loader.  Allocate
+	     room for them in .rela.dyn.  */
+	  if (is_gott_symbol (info, h))
+	    {
+	      if (sreloc == NULL)
+		{
+		  sreloc = mips_elf_rel_dyn_section (info, TRUE);
+		  if (sreloc == NULL)
+		    return FALSE;
+		}
+	      mips_elf_allocate_dynamic_relocations (dynobj, info, 1);
+	      if (MIPS_ELF_READONLY_SECTION (sec))
+		/* We tell the dynamic linker that there are
+		   relocations against the text segment.  */
+		info->flags |= DF_TEXTREL;
+	    }
+	}
+      else if (call_lo16_reloc_p (r_type)
+	       || got_lo16_reloc_p (r_type)
+	       || got_disp_reloc_p (r_type)
+	       || (got16_reloc_p (r_type) && htab->is_vxworks))
+	{
+	  /* We may need a local GOT entry for this relocation.  We
+	     don't count R_MIPS_GOT_PAGE because we can estimate the
+	     maximum number of pages needed by looking at the size of
+	     the segment.  Similar comments apply to R_MIPS*_GOT16 and
+	     R_MIPS*_CALL16, except on VxWorks, where GOT relocations
+	     always evaluate to "G".  We don't count R_MIPS_GOT_HI16, or
+	     R_MIPS_CALL_HI16 because these are always followed by an
+	     R_MIPS_GOT_LO16 or R_MIPS_CALL_LO16.  */
+	  if (!mips_elf_record_local_got_symbol (abfd, r_symndx,
+						 rel->r_addend, info, 0))
+	    return FALSE;
+	}
+
+      if (h != NULL && mips_elf_relocation_needs_la25_stub (abfd, r_type))
+	((struct mips_elf_link_hash_entry *) h)->has_nonpic_branches = TRUE;
+
+      switch (r_type)
+	{
+	case R_MIPS_CALL16:
+	case R_MIPS16_CALL16:
+	case R_MICROMIPS_CALL16:
+	  if (h == NULL)
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: CALL16 reloc at 0x%lx not against global symbol"),
+		 abfd, (unsigned long) rel->r_offset);
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	  /* Fall through.  */
+
+	case R_MIPS_CALL_HI16:
+	case R_MIPS_CALL_LO16:
+	case R_MICROMIPS_CALL_HI16:
+	case R_MICROMIPS_CALL_LO16:
+	  if (h != NULL)
+	    {
+	      /* Make sure there is room in the regular GOT to hold the
+		 function's address.  We may eliminate it in favour of
+		 a .got.plt entry later; see mips_elf_count_got_symbols.  */
+	      if (!mips_elf_record_global_got_symbol (h, abfd, info, TRUE, 0))
+		return FALSE;
+
+	      /* We need a stub, not a plt entry for the undefined
+		 function.  But we record it as if it needs plt.  See
+		 _bfd_elf_adjust_dynamic_symbol.  */
+	      h->needs_plt = 1;
+	      h->type = STT_FUNC;
+	    }
+	  break;
+
+	case R_MIPS_GOT_PAGE:
+	case R_MICROMIPS_GOT_PAGE:
+	  /* If this is a global, overridable symbol, GOT_PAGE will
+	     decay to GOT_DISP, so we'll need a GOT entry for it.  */
+	  if (h)
+	    {
+	      struct mips_elf_link_hash_entry *hmips =
+		(struct mips_elf_link_hash_entry *) h;
+
+	      /* This symbol is definitely not overridable.  */
+	      if (hmips->root.def_regular
+		  && ! (info->shared && ! info->symbolic
+			&& ! hmips->root.forced_local))
+		h = NULL;
+	    }
+	  /* Fall through.  */
+
+	case R_MIPS16_GOT16:
+	case R_MIPS_GOT16:
+	case R_MIPS_GOT_HI16:
+	case R_MIPS_GOT_LO16:
+	case R_MICROMIPS_GOT16:
+	case R_MICROMIPS_GOT_HI16:
+	case R_MICROMIPS_GOT_LO16:
+	  if (!h || got_page_reloc_p (r_type))
+	    {
+	      /* This relocation needs (or may need, if h != NULL) a
+		 page entry in the GOT.  For R_MIPS_GOT_PAGE we do not
+		 know for sure until we know whether the symbol is
+		 preemptible.  */
+	      if (mips_elf_rel_relocation_p (abfd, sec, relocs, rel))
+		{
+		  if (!mips_elf_get_section_contents (abfd, sec, &contents))
+		    return FALSE;
+		  howto = MIPS_ELF_RTYPE_TO_HOWTO (abfd, r_type, FALSE);
+		  addend = mips_elf_read_rel_addend (abfd, rel,
+						     howto, contents);
+		  if (got16_reloc_p (r_type))
+		    mips_elf_add_lo16_rel_addend (abfd, rel, rel_end,
+						  contents, &addend);
+		  else
+		    addend <<= howto->rightshift;
+		}
+	      else
+		addend = rel->r_addend;
+	      if (!mips_elf_record_got_page_entry (info, abfd, r_symndx,
+						   addend))
+		return FALSE;
+	    }
+	  /* Fall through.  */
+
+	case R_MIPS_GOT_DISP:
+	case R_MICROMIPS_GOT_DISP:
+	  if (h && !mips_elf_record_global_got_symbol (h, abfd, info,
+						       FALSE, 0))
+	    return FALSE;
+	  break;
+
+	case R_MIPS_TLS_GOTTPREL:
+	case R_MICROMIPS_TLS_GOTTPREL:
+	  if (info->shared)
+	    info->flags |= DF_STATIC_TLS;
+	  /* Fall through */
+
+	case R_MIPS_TLS_LDM:
+	case R_MICROMIPS_TLS_LDM:
+	  if (tls_ldm_reloc_p (r_type))
+	    {
+	      r_symndx = STN_UNDEF;
+	      h = NULL;
+	    }
+	  /* Fall through */
+
+	case R_MIPS_TLS_GD:
+	case R_MICROMIPS_TLS_GD:
+	  /* This symbol requires a global offset table entry, or two
+	     for TLS GD relocations.  */
+	  {
+	    unsigned char flag;
+
+	    flag = (tls_gd_reloc_p (r_type)
+		    ? GOT_TLS_GD
+		    : tls_ldm_reloc_p (r_type) ? GOT_TLS_LDM : GOT_TLS_IE);
+	    if (h != NULL)
+	      {
+		struct mips_elf_link_hash_entry *hmips =
+		  (struct mips_elf_link_hash_entry *) h;
+		hmips->tls_type |= flag;
+
+		if (h && !mips_elf_record_global_got_symbol (h, abfd, info,
+							     FALSE, flag))
+		  return FALSE;
+	      }
+	    else
+	      {
+		BFD_ASSERT (flag == GOT_TLS_LDM || r_symndx != STN_UNDEF);
+
+		if (!mips_elf_record_local_got_symbol (abfd, r_symndx,
+						       rel->r_addend,
+						       info, flag))
+		  return FALSE;
+	      }
+	  }
+	  break;
+
+	case R_MIPS_32:
+	case R_MIPS_REL32:
+	case R_MIPS_64:
+	  /* In VxWorks executables, references to external symbols
+	     are handled using copy relocs or PLT stubs, so there's
+	     no need to add a .rela.dyn entry for this relocation.  */
+	  if (can_make_dynamic_p)
+	    {
+	      if (sreloc == NULL)
+		{
+		  sreloc = mips_elf_rel_dyn_section (info, TRUE);
+		  if (sreloc == NULL)
+		    return FALSE;
+		}
+	      if (info->shared && h == NULL)
+		{
+		  /* When creating a shared object, we must copy these
+		     reloc types into the output file as R_MIPS_REL32
+		     relocs.  Make room for this reloc in .rel(a).dyn.  */
+		  mips_elf_allocate_dynamic_relocations (dynobj, info, 1);
+		  if (MIPS_ELF_READONLY_SECTION (sec))
+		    /* We tell the dynamic linker that there are
+		       relocations against the text segment.  */
+		    info->flags |= DF_TEXTREL;
+		}
+	      else
+		{
+		  struct mips_elf_link_hash_entry *hmips;
+
+		  /* For a shared object, we must copy this relocation
+		     unless the symbol turns out to be undefined and
+		     weak with non-default visibility, in which case
+		     it will be left as zero.
+
+		     We could elide R_MIPS_REL32 for locally binding symbols
+		     in shared libraries, but do not yet do so.
+
+		     For an executable, we only need to copy this
+		     reloc if the symbol is defined in a dynamic
+		     object.  */
+		  hmips = (struct mips_elf_link_hash_entry *) h;
+		  ++hmips->possibly_dynamic_relocs;
+		  if (MIPS_ELF_READONLY_SECTION (sec))
+		    /* We need it to tell the dynamic linker if there
+		       are relocations against the text segment.  */
+		    hmips->readonly_reloc = TRUE;
+		}
+	    }
+
+	  if (SGI_COMPAT (abfd))
+	    mips_elf_hash_table (info)->compact_rel_size +=
+	      sizeof (Elf32_External_crinfo);
+	  break;
+
+	case R_MIPS_26:
+	case R_MIPS_GPREL16:
+	case R_MIPS_LITERAL:
+	case R_MIPS_GPREL32:
+	case R_MICROMIPS_26_S1:
+	case R_MICROMIPS_GPREL16:
+	case R_MICROMIPS_LITERAL:
+	case R_MICROMIPS_GPREL7_S2:
+	  if (SGI_COMPAT (abfd))
+	    mips_elf_hash_table (info)->compact_rel_size +=
+	      sizeof (Elf32_External_crinfo);
+	  break;
+
+	  /* This relocation describes the C++ object vtable hierarchy.
+	     Reconstruct it for later use during GC.  */
+	case R_MIPS_GNU_VTINHERIT:
+	  if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+	    return FALSE;
+	  break;
+
+	  /* This relocation describes which C++ vtable entries are actually
+	     used.  Record for later use during GC.  */
+	case R_MIPS_GNU_VTENTRY:
+	  BFD_ASSERT (h != NULL);
+	  if (h != NULL
+	      && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_offset))
+	    return FALSE;
+	  break;
+
+	default:
+	  break;
+	}
+
+      /* We must not create a stub for a symbol that has relocations
+	 related to taking the function's address.  This doesn't apply to
+	 VxWorks, where CALL relocs refer to a .got.plt entry instead of
+	 a normal .got entry.  */
+      if (!htab->is_vxworks && h != NULL)
+	switch (r_type)
+	  {
+	  default:
+	    ((struct mips_elf_link_hash_entry *) h)->no_fn_stub = TRUE;
+	    break;
+	  case R_MIPS16_CALL16:
+	  case R_MIPS_CALL16:
+	  case R_MIPS_CALL_HI16:
+	  case R_MIPS_CALL_LO16:
+	  case R_MIPS_JALR:
+	  case R_MICROMIPS_CALL16:
+	  case R_MICROMIPS_CALL_HI16:
+	  case R_MICROMIPS_CALL_LO16:
+	  case R_MICROMIPS_JALR:
+	    break;
+	  }
+
+      /* See if this reloc would need to refer to a MIPS16 hard-float stub,
+	 if there is one.  We only need to handle global symbols here;
+	 we decide whether to keep or delete stubs for local symbols
+	 when processing the stub's relocations.  */
+      if (h != NULL
+	  && !mips16_call_reloc_p (r_type)
+	  && !section_allows_mips16_refs_p (sec))
+	{
+	  struct mips_elf_link_hash_entry *mh;
+
+	  mh = (struct mips_elf_link_hash_entry *) h;
+	  mh->need_fn_stub = TRUE;
+	}
+
+      /* Refuse some position-dependent relocations when creating a
+	 shared library.  Do not refuse R_MIPS_32 / R_MIPS_64; they're
+	 not PIC, but we can create dynamic relocations and the result
+	 will be fine.  Also do not refuse R_MIPS_LO16, which can be
+	 combined with R_MIPS_GOT16.  */
+      if (info->shared)
+	{
+	  switch (r_type)
+	    {
+	    case R_MIPS16_HI16:
+	    case R_MIPS_HI16:
+	    case R_MIPS_HIGHER:
+	    case R_MIPS_HIGHEST:
+	    case R_MICROMIPS_HI16:
+	    case R_MICROMIPS_HIGHER:
+	    case R_MICROMIPS_HIGHEST:
+	      /* Don't refuse a high part relocation if it's against
+		 no symbol (e.g. part of a compound relocation).  */
+	      if (r_symndx == STN_UNDEF)
+		break;
+
+	      /* R_MIPS_HI16 against _gp_disp is used for $gp setup,
+		 and has a special meaning.  */
+	      if (!NEWABI_P (abfd) && h != NULL
+		  && strcmp (h->root.root.string, "_gp_disp") == 0)
+		break;
+
+	      /* Likewise __GOTT_BASE__ and __GOTT_INDEX__ on VxWorks.  */
+	      if (is_gott_symbol (info, h))
+		break;
+
+	      /* FALLTHROUGH */
+
+	    case R_MIPS16_26:
+	    case R_MIPS_26:
+	    case R_MICROMIPS_26_S1:
+	      howto = MIPS_ELF_RTYPE_TO_HOWTO (abfd, r_type, FALSE);
+	      (*_bfd_error_handler)
+		(_("%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"),
+		 abfd, howto->name,
+		 (h) ? h->root.root.string : "a local symbol");
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    default:
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+bfd_boolean
+_bfd_mips_relax_section (bfd *abfd, asection *sec,
+			 struct bfd_link_info *link_info,
+			 bfd_boolean *again)
+{
+  Elf_Internal_Rela *internal_relocs;
+  Elf_Internal_Rela *irel, *irelend;
+  Elf_Internal_Shdr *symtab_hdr;
+  bfd_byte *contents = NULL;
+  size_t extsymoff;
+  bfd_boolean changed_contents = FALSE;
+  bfd_vma sec_start = sec->output_section->vma + sec->output_offset;
+  Elf_Internal_Sym *isymbuf = NULL;
+
+  /* We are not currently changing any sizes, so only one pass.  */
+  *again = FALSE;
+
+  if (link_info->relocatable)
+    return TRUE;
+
+  internal_relocs = _bfd_elf_link_read_relocs (abfd, sec, NULL, NULL,
+					       link_info->keep_memory);
+  if (internal_relocs == NULL)
+    return TRUE;
+
+  irelend = internal_relocs + sec->reloc_count
+    * get_elf_backend_data (abfd)->s->int_rels_per_ext_rel;
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  extsymoff = (elf_bad_symtab (abfd)) ? 0 : symtab_hdr->sh_info;
+
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      bfd_vma symval;
+      bfd_signed_vma sym_offset;
+      unsigned int r_type;
+      unsigned long r_symndx;
+      asection *sym_sec;
+      unsigned long instruction;
+
+      /* Turn jalr into bgezal, and jr into beq, if they're marked
+	 with a JALR relocation, that indicate where they jump to.
+	 This saves some pipeline bubbles.  */
+      r_type = ELF_R_TYPE (abfd, irel->r_info);
+      if (r_type != R_MIPS_JALR)
+	continue;
+
+      r_symndx = ELF_R_SYM (abfd, irel->r_info);
+      /* Compute the address of the jump target.  */
+      if (r_symndx >= extsymoff)
+	{
+	  struct mips_elf_link_hash_entry *h
+	    = ((struct mips_elf_link_hash_entry *)
+	       elf_sym_hashes (abfd) [r_symndx - extsymoff]);
+
+	  while (h->root.root.type == bfd_link_hash_indirect
+		 || h->root.root.type == bfd_link_hash_warning)
+	    h = (struct mips_elf_link_hash_entry *) h->root.root.u.i.link;
+
+	  /* If a symbol is undefined, or if it may be overridden,
+	     skip it.  */
+	  if (! ((h->root.root.type == bfd_link_hash_defined
+		  || h->root.root.type == bfd_link_hash_defweak)
+		 && h->root.root.u.def.section)
+	      || (link_info->shared && ! link_info->symbolic
+		  && !h->root.forced_local))
+	    continue;
+
+	  sym_sec = h->root.root.u.def.section;
+	  if (sym_sec->output_section)
+	    symval = (h->root.root.u.def.value
+		      + sym_sec->output_section->vma
+		      + sym_sec->output_offset);
+	  else
+	    symval = h->root.root.u.def.value;
+	}
+      else
+	{
+	  Elf_Internal_Sym *isym;
+
+	  /* Read this BFD's symbols if we haven't done so already.  */
+	  if (isymbuf == NULL && symtab_hdr->sh_info != 0)
+	    {
+	      isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	      if (isymbuf == NULL)
+		isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+						symtab_hdr->sh_info, 0,
+						NULL, NULL, NULL);
+	      if (isymbuf == NULL)
+		goto relax_return;
+	    }
+
+	  isym = isymbuf + r_symndx;
+	  if (isym->st_shndx == SHN_UNDEF)
+	    continue;
+	  else if (isym->st_shndx == SHN_ABS)
+	    sym_sec = bfd_abs_section_ptr;
+	  else if (isym->st_shndx == SHN_COMMON)
+	    sym_sec = bfd_com_section_ptr;
+	  else
+	    sym_sec
+	      = bfd_section_from_elf_index (abfd, isym->st_shndx);
+	  symval = isym->st_value
+	    + sym_sec->output_section->vma
+	    + sym_sec->output_offset;
+	}
+
+      /* Compute branch offset, from delay slot of the jump to the
+	 branch target.  */
+      sym_offset = (symval + irel->r_addend)
+	- (sec_start + irel->r_offset + 4);
+
+      /* Branch offset must be properly aligned.  */
+      if ((sym_offset & 3) != 0)
+	continue;
+
+      sym_offset >>= 2;
+
+      /* Check that it's in range.  */
+      if (sym_offset < -0x8000 || sym_offset >= 0x8000)
+	continue;
+
+      /* Get the section contents if we haven't done so already.  */
+      if (!mips_elf_get_section_contents (abfd, sec, &contents))
+	goto relax_return;
+
+      instruction = bfd_get_32 (abfd, contents + irel->r_offset);
+
+      /* If it was jalr <reg>, turn it into bgezal $zero, <target>.  */
+      if ((instruction & 0xfc1fffff) == 0x0000f809)
+	instruction = 0x04110000;
+      /* If it was jr <reg>, turn it into b <target>.  */
+      else if ((instruction & 0xfc1fffff) == 0x00000008)
+	instruction = 0x10000000;
+      else
+	continue;
+
+      instruction |= (sym_offset & 0xffff);
+      bfd_put_32 (abfd, instruction, contents + irel->r_offset);
+      changed_contents = TRUE;
+    }
+
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    {
+      if (!changed_contents && !link_info->keep_memory)
+        free (contents);
+      else
+        {
+          /* Cache the section contents for elf_link_input_bfd.  */
+          elf_section_data (sec)->this_hdr.contents = contents;
+        }
+    }
+  return TRUE;
+
+ relax_return:
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    free (contents);
+  return FALSE;
+}
+
+/* Allocate space for global sym dynamic relocs.  */
+
+static bfd_boolean
+allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+{
+  struct bfd_link_info *info = inf;
+  bfd *dynobj;
+  struct mips_elf_link_hash_entry *hmips;
+  struct mips_elf_link_hash_table *htab;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  dynobj = elf_hash_table (info)->dynobj;
+  hmips = (struct mips_elf_link_hash_entry *) h;
+
+  /* VxWorks executables are handled elsewhere; we only need to
+     allocate relocations in shared objects.  */
+  if (htab->is_vxworks && !info->shared)
+    return TRUE;
+
+  /* Ignore indirect symbols.  All relocations against such symbols
+     will be redirected to the target symbol.  */
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  /* If this symbol is defined in a dynamic object, or we are creating
+     a shared library, we will need to copy any R_MIPS_32 or
+     R_MIPS_REL32 relocs against it into the output file.  */
+  if (! info->relocatable
+      && hmips->possibly_dynamic_relocs != 0
+      && (h->root.type == bfd_link_hash_defweak
+	  || !h->def_regular
+	  || info->shared))
+    {
+      bfd_boolean do_copy = TRUE;
+
+      if (h->root.type == bfd_link_hash_undefweak)
+	{
+	  /* Do not copy relocations for undefined weak symbols with
+	     non-default visibility.  */
+	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	    do_copy = FALSE;
+
+	  /* Make sure undefined weak symbols are output as a dynamic
+	     symbol in PIEs.  */
+	  else if (h->dynindx == -1 && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+	}
+
+      if (do_copy)
+	{
+	  /* Even though we don't directly need a GOT entry for this symbol,
+	     the SVR4 psABI requires it to have a dynamic symbol table
+	     index greater that DT_MIPS_GOTSYM if there are dynamic
+	     relocations against it.
+
+	     VxWorks does not enforce the same mapping between the GOT
+	     and the symbol table, so the same requirement does not
+	     apply there.  */
+	  if (!htab->is_vxworks)
+	    {
+	      if (hmips->global_got_area > GGA_RELOC_ONLY)
+		hmips->global_got_area = GGA_RELOC_ONLY;
+	      hmips->got_only_for_calls = FALSE;
+	    }
+
+	  mips_elf_allocate_dynamic_relocations
+	    (dynobj, info, hmips->possibly_dynamic_relocs);
+	  if (hmips->readonly_reloc)
+	    /* We tell the dynamic linker that there are relocations
+	       against the text segment.  */
+	    info->flags |= DF_TEXTREL;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+bfd_boolean
+_bfd_mips_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+				     struct elf_link_hash_entry *h)
+{
+  bfd *dynobj;
+  struct mips_elf_link_hash_entry *hmips;
+  struct mips_elf_link_hash_table *htab;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  dynobj = elf_hash_table (info)->dynobj;
+  hmips = (struct mips_elf_link_hash_entry *) h;
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (dynobj != NULL
+	      && (h->needs_plt
+		  || h->u.weakdef != NULL
+		  || (h->def_dynamic
+		      && h->ref_regular
+		      && !h->def_regular)));
+
+  hmips = (struct mips_elf_link_hash_entry *) h;
+
+  /* If there are call relocations against an externally-defined symbol,
+     see whether we can create a MIPS lazy-binding stub for it.  We can
+     only do this if all references to the function are through call
+     relocations, and in that case, the traditional lazy-binding stubs
+     are much more efficient than PLT entries.
+
+     Traditional stubs are only available on SVR4 psABI-based systems;
+     VxWorks always uses PLTs instead.  */
+  if (!htab->is_vxworks && h->needs_plt && !hmips->no_fn_stub)
+    {
+      if (! elf_hash_table (info)->dynamic_sections_created)
+	return TRUE;
+
+      /* If this symbol is not defined in a regular file, then set
+	 the symbol to the stub location.  This is required to make
+	 function pointers compare as equal between the normal
+	 executable and the shared library.  */
+      if (!h->def_regular)
+	{
+	  hmips->needs_lazy_stub = TRUE;
+	  htab->lazy_stub_count++;
+	  return TRUE;
+	}
+    }
+  /* As above, VxWorks requires PLT entries for externally-defined
+     functions that are only accessed through call relocations.
+
+     Both VxWorks and non-VxWorks targets also need PLT entries if there
+     are static-only relocations against an externally-defined function.
+     This can technically occur for shared libraries if there are
+     branches to the symbol, although it is unlikely that this will be
+     used in practice due to the short ranges involved.  It can occur
+     for any relative or absolute relocation in executables; in that
+     case, the PLT entry becomes the function's canonical address.  */
+  else if (((h->needs_plt && !hmips->no_fn_stub)
+	    || (h->type == STT_FUNC && hmips->has_static_relocs))
+	   && htab->use_plts_and_copy_relocs
+	   && !SYMBOL_CALLS_LOCAL (info, h)
+	   && !(ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+		&& h->root.type == bfd_link_hash_undefweak))
+    {
+      /* If this is the first symbol to need a PLT entry, allocate room
+	 for the header.  */
+      if (htab->splt->size == 0)
+	{
+	  BFD_ASSERT (htab->sgotplt->size == 0);
+
+	  /* If we're using the PLT additions to the psABI, each PLT
+	     entry is 16 bytes and the PLT0 entry is 32 bytes.
+	     Encourage better cache usage by aligning.  We do this
+	     lazily to avoid pessimizing traditional objects.  */
+	  if (!htab->is_vxworks
+	      && !bfd_set_section_alignment (dynobj, htab->splt, 5))
+	    return FALSE;
+
+	  /* Make sure that .got.plt is word-aligned.  We do this lazily
+	     for the same reason as above.  */
+	  if (!bfd_set_section_alignment (dynobj, htab->sgotplt,
+					  MIPS_ELF_LOG_FILE_ALIGN (dynobj)))
+	    return FALSE;
+
+	  htab->splt->size += htab->plt_header_size;
+
+	  /* On non-VxWorks targets, the first two entries in .got.plt
+	     are reserved.  */
+	  if (!htab->is_vxworks)
+	    htab->sgotplt->size += 2 * MIPS_ELF_GOT_SIZE (dynobj);
+
+	  /* On VxWorks, also allocate room for the header's
+	     .rela.plt.unloaded entries.  */
+	  if (htab->is_vxworks && !info->shared)
+	    htab->srelplt2->size += 2 * sizeof (Elf32_External_Rela);
+	}
+
+      /* Assign the next .plt entry to this symbol.  */
+      h->plt.offset = htab->splt->size;
+      htab->splt->size += htab->plt_entry_size;
+
+      /* If the output file has no definition of the symbol, set the
+	 symbol's value to the address of the stub.  */
+      if (!info->shared && !h->def_regular)
+	{
+	  h->root.u.def.section = htab->splt;
+	  h->root.u.def.value = h->plt.offset;
+	  /* For VxWorks, point at the PLT load stub rather than the
+	     lazy resolution stub; this stub will become the canonical
+	     function address.  */
+	  if (htab->is_vxworks)
+	    h->root.u.def.value += 8;
+	}
+
+      /* Make room for the .got.plt entry and the R_MIPS_JUMP_SLOT
+	 relocation.  */
+      htab->sgotplt->size += MIPS_ELF_GOT_SIZE (dynobj);
+      htab->srelplt->size += (htab->is_vxworks
+			      ? MIPS_ELF_RELA_SIZE (dynobj)
+			      : MIPS_ELF_REL_SIZE (dynobj));
+
+      /* Make room for the .rela.plt.unloaded relocations.  */
+      if (htab->is_vxworks && !info->shared)
+	htab->srelplt2->size += 3 * sizeof (Elf32_External_Rela);
+
+      /* All relocations against this symbol that could have been made
+	 dynamic will now refer to the PLT entry instead.  */
+      hmips->possibly_dynamic_relocs = 0;
+
+      return TRUE;
+    }
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* Otherwise, there is nothing further to do for symbols defined
+     in regular objects.  */
+  if (h->def_regular)
+    return TRUE;
+
+  /* There's also nothing more to do if we'll convert all relocations
+     against this symbol into dynamic relocations.  */
+  if (!hmips->has_static_relocs)
+    return TRUE;
+
+  /* We're now relying on copy relocations.  Complain if we have
+     some that we can't convert.  */
+  if (!htab->use_plts_and_copy_relocs || info->shared)
+    {
+      (*_bfd_error_handler) (_("non-dynamic relocations refer to "
+			       "dynamic symbol %s"),
+			     h->root.root.string);
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      if (htab->is_vxworks)
+	htab->srelbss->size += sizeof (Elf32_External_Rela);
+      else
+	mips_elf_allocate_dynamic_relocations (dynobj, info, 1);
+      h->needs_copy = 1;
+    }
+
+  /* All relocations against this symbol that could have been made
+     dynamic will now refer to the local copy instead.  */
+  hmips->possibly_dynamic_relocs = 0;
+
+  return _bfd_elf_adjust_dynamic_copy (h, htab->sdynbss);
+}
+
+/* This function is called after all the input files have been read,
+   and the input sections have been assigned to output sections.  We
+   check for any mips16 stub sections that we can discard.  */
+
+bfd_boolean
+_bfd_mips_elf_always_size_sections (bfd *output_bfd,
+				    struct bfd_link_info *info)
+{
+  asection *ri;
+  struct mips_elf_link_hash_table *htab;
+  struct mips_htab_traverse_info hti;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  /* The .reginfo section has a fixed size.  */
+  ri = bfd_get_section_by_name (output_bfd, ".reginfo");
+  if (ri != NULL)
+    bfd_set_section_size (output_bfd, ri, sizeof (Elf32_External_RegInfo));
+
+  hti.info = info;
+  hti.output_bfd = output_bfd;
+  hti.error = FALSE;
+  mips_elf_link_hash_traverse (mips_elf_hash_table (info),
+			       mips_elf_check_symbols, &hti);
+  if (hti.error)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* If the link uses a GOT, lay it out and work out its size.  */
+
+static bfd_boolean
+mips_elf_lay_out_got (bfd *output_bfd, struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *s;
+  struct mips_got_info *g;
+  bfd_size_type loadable_size = 0;
+  bfd_size_type page_gotno;
+  bfd *sub;
+  struct mips_elf_count_tls_arg count_tls_arg;
+  struct mips_elf_link_hash_table *htab;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  s = htab->sgot;
+  if (s == NULL)
+    return TRUE;
+
+  dynobj = elf_hash_table (info)->dynobj;
+  g = htab->got_info;
+
+  /* Allocate room for the reserved entries.  VxWorks always reserves
+     3 entries; other objects only reserve 2 entries.  */
+  BFD_ASSERT (g->assigned_gotno == 0);
+  if (htab->is_vxworks)
+    htab->reserved_gotno = 3;
+  else
+    htab->reserved_gotno = 2;
+  g->local_gotno += htab->reserved_gotno;
+  g->assigned_gotno = htab->reserved_gotno;
+
+  /* Replace entries for indirect and warning symbols with entries for
+     the target symbol.  */
+  if (!mips_elf_resolve_final_got_entries (g))
+    return FALSE;
+
+  /* Count the number of GOT symbols.  */
+  mips_elf_link_hash_traverse (htab, mips_elf_count_got_symbols, info);
+
+  /* Calculate the total loadable size of the output.  That
+     will give us the maximum number of GOT_PAGE entries
+     required.  */
+  for (sub = info->input_bfds; sub; sub = sub->link_next)
+    {
+      asection *subsection;
+
+      for (subsection = sub->sections;
+	   subsection;
+	   subsection = subsection->next)
+	{
+	  if ((subsection->flags & SEC_ALLOC) == 0)
+	    continue;
+	  loadable_size += ((subsection->size + 0xf)
+			    &~ (bfd_size_type) 0xf);
+	}
+    }
+
+  if (htab->is_vxworks)
+    /* There's no need to allocate page entries for VxWorks; R_MIPS*_GOT16
+       relocations against local symbols evaluate to "G", and the EABI does
+       not include R_MIPS_GOT_PAGE.  */
+    page_gotno = 0;
+  else
+    /* Assume there are two loadable segments consisting of contiguous
+       sections.  Is 5 enough?  */
+    page_gotno = (loadable_size >> 16) + 5;
+
+  /* Choose the smaller of the two estimates; both are intended to be
+     conservative.  */
+  if (page_gotno > g->page_gotno)
+    page_gotno = g->page_gotno;
+
+  g->local_gotno += page_gotno;
+  s->size += g->local_gotno * MIPS_ELF_GOT_SIZE (output_bfd);
+  s->size += g->global_gotno * MIPS_ELF_GOT_SIZE (output_bfd);
+
+  /* We need to calculate tls_gotno for global symbols at this point
+     instead of building it up earlier, to avoid doublecounting
+     entries for one global symbol from multiple input files.  */
+  count_tls_arg.info = info;
+  count_tls_arg.needed = 0;
+  elf_link_hash_traverse (elf_hash_table (info),
+			  mips_elf_count_global_tls_entries,
+			  &count_tls_arg);
+  g->tls_gotno += count_tls_arg.needed;
+  s->size += g->tls_gotno * MIPS_ELF_GOT_SIZE (output_bfd);
+
+  /* VxWorks does not support multiple GOTs.  It initializes $gp to
+     __GOTT_BASE__[__GOTT_INDEX__], the value of which is set by the
+     dynamic loader.  */
+  if (htab->is_vxworks)
+    {
+      /* VxWorks executables do not need a GOT.  */
+      if (info->shared)
+	{
+	  /* Each VxWorks GOT entry needs an explicit relocation.  */
+	  unsigned int count;
+
+	  count = g->global_gotno + g->local_gotno - htab->reserved_gotno;
+	  if (count)
+	    mips_elf_allocate_dynamic_relocations (dynobj, info, count);
+	}
+    }
+  else if (s->size > MIPS_ELF_GOT_MAX_SIZE (info))
+    {
+      if (!mips_elf_multi_got (output_bfd, info, s, page_gotno))
+	return FALSE;
+    }
+  else
+    {
+      struct mips_elf_count_tls_arg arg;
+
+      /* Set up TLS entries.  */
+      g->tls_assigned_gotno = g->global_gotno + g->local_gotno;
+      htab_traverse (g->got_entries, mips_elf_initialize_tls_index, g);
+
+      /* Allocate room for the TLS relocations.  */
+      arg.info = info;
+      arg.needed = 0;
+      htab_traverse (g->got_entries, mips_elf_count_local_tls_relocs, &arg);
+      elf_link_hash_traverse (elf_hash_table (info),
+			      mips_elf_count_global_tls_relocs,
+			      &arg);
+      if (arg.needed)
+	mips_elf_allocate_dynamic_relocations (dynobj, info, arg.needed);
+    }
+
+  return TRUE;
+}
+
+/* Estimate the size of the .MIPS.stubs section.  */
+
+static void
+mips_elf_estimate_stub_size (bfd *output_bfd, struct bfd_link_info *info)
+{
+  struct mips_elf_link_hash_table *htab;
+  bfd_size_type dynsymcount;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  if (htab->lazy_stub_count == 0)
+    return;
+
+  /* IRIX rld assumes that a function stub isn't at the end of the .text
+     section, so add a dummy entry to the end.  */
+  htab->lazy_stub_count++;
+
+  /* Get a worst-case estimate of the number of dynamic symbols needed.
+     At this point, dynsymcount does not account for section symbols
+     and count_section_dynsyms may overestimate the number that will
+     be needed.  */
+  dynsymcount = (elf_hash_table (info)->dynsymcount
+		 + count_section_dynsyms (output_bfd, info));
+
+  /* Determine the size of one stub entry.  */
+  htab->function_stub_size = (dynsymcount > 0x10000
+			      ? MIPS_FUNCTION_STUB_BIG_SIZE
+			      : MIPS_FUNCTION_STUB_NORMAL_SIZE);
+
+  htab->sstubs->size = htab->lazy_stub_count * htab->function_stub_size;
+}
+
+/* A mips_elf_link_hash_traverse callback for which DATA points to the
+   MIPS hash table.  If H needs a traditional MIPS lazy-binding stub,
+   allocate an entry in the stubs section.  */
+
+static bfd_boolean
+mips_elf_allocate_lazy_stub (struct mips_elf_link_hash_entry *h, void **data)
+{
+  struct mips_elf_link_hash_table *htab;
+
+  htab = (struct mips_elf_link_hash_table *) data;
+  if (h->needs_lazy_stub)
+    {
+      h->root.root.u.def.section = htab->sstubs;
+      h->root.root.u.def.value = htab->sstubs->size;
+      h->root.plt.offset = htab->sstubs->size;
+      htab->sstubs->size += htab->function_stub_size;
+    }
+  return TRUE;
+}
+
+/* Allocate offsets in the stubs section to each symbol that needs one.
+   Set the final size of the .MIPS.stub section.  */
+
+static void
+mips_elf_lay_out_lazy_stubs (struct bfd_link_info *info)
+{
+  struct mips_elf_link_hash_table *htab;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  if (htab->lazy_stub_count == 0)
+    return;
+
+  htab->sstubs->size = 0;
+  mips_elf_link_hash_traverse (htab, mips_elf_allocate_lazy_stub, htab);
+  htab->sstubs->size += htab->function_stub_size;
+  BFD_ASSERT (htab->sstubs->size
+	      == htab->lazy_stub_count * htab->function_stub_size);
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+bfd_boolean
+_bfd_mips_elf_size_dynamic_sections (bfd *output_bfd,
+				     struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *s, *sreldyn;
+  bfd_boolean reltext;
+  struct mips_elf_link_hash_table *htab;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+  dynobj = elf_hash_table (info)->dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (s != NULL);
+	  s->size
+	    = strlen (ELF_DYNAMIC_INTERPRETER (output_bfd)) + 1;
+	  s->contents
+	    = (bfd_byte *) ELF_DYNAMIC_INTERPRETER (output_bfd);
+	}
+
+      /* Create a symbol for the PLT, if we know that we are using it.  */
+      if (htab->splt && htab->splt->size > 0 && htab->root.hplt == NULL)
+	{
+	  struct elf_link_hash_entry *h;
+
+	  BFD_ASSERT (htab->use_plts_and_copy_relocs);
+
+	  h = _bfd_elf_define_linkage_sym (dynobj, info, htab->splt,
+					   "_PROCEDURE_LINKAGE_TABLE_");
+	  htab->root.hplt = h;
+	  if (h == NULL)
+	    return FALSE;
+	  h->type = STT_FUNC;
+	}
+    }
+
+  /* Allocate space for global sym dynamic relocs.  */
+  elf_link_hash_traverse (&htab->root, allocate_dynrelocs, (PTR) info);
+
+  mips_elf_estimate_stub_size (output_bfd, info);
+
+  if (!mips_elf_lay_out_got (output_bfd, info))
+    return FALSE;
+
+  mips_elf_lay_out_lazy_stubs (info);
+
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  reltext = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      const char *name;
+
+      /* It's OK to base decisions on the section name, because none
+	 of the dynobj section names depend upon the input files.  */
+      name = bfd_get_section_name (dynobj, s);
+
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      if (CONST_STRNEQ (name, ".rel"))
+	{
+	  if (s->size != 0)
+	    {
+	      const char *outname;
+	      asection *target;
+
+	      /* If this relocation section applies to a read only
+                 section, then we probably need a DT_TEXTREL entry.
+                 If the relocation section is .rel(a).dyn, we always
+                 assert a DT_TEXTREL entry rather than testing whether
+                 there exists a relocation to a read only section or
+                 not.  */
+	      outname = bfd_get_section_name (output_bfd,
+					      s->output_section);
+	      target = bfd_get_section_by_name (output_bfd, outname + 4);
+	      if ((target != NULL
+		   && (target->flags & SEC_READONLY) != 0
+		   && (target->flags & SEC_ALLOC) != 0)
+		  || strcmp (outname, MIPS_ELF_REL_DYN_NAME (info)) == 0)
+		reltext = TRUE;
+
+	      /* We use the reloc_count field as a counter if we need
+		 to copy relocs into the output file.  */
+	      if (strcmp (name, MIPS_ELF_REL_DYN_NAME (info)) != 0)
+		s->reloc_count = 0;
+
+	      /* If combreloc is enabled, elf_link_sort_relocs() will
+		 sort relocations, but in a different way than we do,
+		 and before we're done creating relocations.  Also, it
+		 will move them around between input sections'
+		 relocation's contents, so our sorting would be
+		 broken, so don't let it run.  */
+	      info->combreloc = 0;
+	    }
+	}
+      else if (! info->shared
+	       && ! mips_elf_hash_table (info)->use_rld_obj_head
+	       && CONST_STRNEQ (name, ".rld_map"))
+	{
+	  /* We add a room for __rld_map.  It will be filled in by the
+	     rtld to contain a pointer to the _r_debug structure.  */
+	  s->size += 4;
+	}
+      else if (SGI_COMPAT (output_bfd)
+	       && CONST_STRNEQ (name, ".compact_rel"))
+	s->size += mips_elf_hash_table (info)->compact_rel_size;
+      else if (s == htab->splt)
+	{
+	  /* If the last PLT entry has a branch delay slot, allocate
+	     room for an extra nop to fill the delay slot.  This is
+	     for CPUs without load interlocking.  */
+	  if (! LOAD_INTERLOCKS_P (output_bfd)
+	      && ! htab->is_vxworks && s->size > 0)
+	    s->size += 4;
+	}
+      else if (! CONST_STRNEQ (name, ".init")
+	       && s != htab->sgot
+	       && s != htab->sgotplt
+	       && s != htab->sstubs
+	       && s != htab->sdynbss)
+	{
+	  /* It's not one of our sections, so don't allocate space.  */
+	  continue;
+	}
+
+      if (s->size == 0)
+	{
+	  s->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents.  */
+      s->contents = bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL)
+	{
+	  bfd_set_error (bfd_error_no_memory);
+	  return FALSE;
+	}
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in _bfd_mips_elf_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  */
+
+      /* SGI object has the equivalence of DT_DEBUG in the
+	 DT_MIPS_RLD_MAP entry.  This must come first because glibc
+	 only fills in DT_MIPS_RLD_MAP (not DT_DEBUG) and GDB only
+	 looks at the first one it sees.  */
+      if (!info->shared
+	  && !MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_RLD_MAP, 0))
+	return FALSE;
+
+      /* The DT_DEBUG entry may be filled in by the dynamic linker and
+	 used by the debugger.  */
+      if (info->executable
+	  && !SGI_COMPAT (output_bfd)
+	  && !MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_DEBUG, 0))
+	return FALSE;
+
+      if (reltext && (SGI_COMPAT (output_bfd) || htab->is_vxworks))
+	info->flags |= DF_TEXTREL;
+
+      if ((info->flags & DF_TEXTREL) != 0)
+	{
+	  if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_TEXTREL, 0))
+	    return FALSE;
+
+	  /* Clear the DF_TEXTREL flag.  It will be set again if we
+	     write out an actual text relocation; we may not, because
+	     at this point we do not know whether e.g. any .eh_frame
+	     absolute relocations have been converted to PC-relative.  */
+	  info->flags &= ~DF_TEXTREL;
+	}
+
+      if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_PLTGOT, 0))
+	return FALSE;
+
+      sreldyn = mips_elf_rel_dyn_section (info, FALSE);
+      if (htab->is_vxworks)
+	{
+	  /* VxWorks uses .rela.dyn instead of .rel.dyn.  It does not
+	     use any of the DT_MIPS_* tags.  */
+	  if (sreldyn && sreldyn->size > 0)
+	    {
+	      if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_RELA, 0))
+		return FALSE;
+
+	      if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_RELASZ, 0))
+		return FALSE;
+
+	      if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_RELAENT, 0))
+		return FALSE;
+	    }
+	}
+      else
+	{
+	  if (sreldyn && sreldyn->size > 0)
+	    {
+	      if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_REL, 0))
+		return FALSE;
+
+	      if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_RELSZ, 0))
+		return FALSE;
+
+	      if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_RELENT, 0))
+		return FALSE;
+	    }
+
+	  if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_RLD_VERSION, 0))
+	    return FALSE;
+
+	  if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_FLAGS, 0))
+	    return FALSE;
+
+	  if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_BASE_ADDRESS, 0))
+	    return FALSE;
+
+	  if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_LOCAL_GOTNO, 0))
+	    return FALSE;
+
+	  if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_SYMTABNO, 0))
+	    return FALSE;
+
+	  if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_UNREFEXTNO, 0))
+	    return FALSE;
+
+	  if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_GOTSYM, 0))
+	    return FALSE;
+
+	  if (IRIX_COMPAT (dynobj) == ict_irix5
+	      && ! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_HIPAGENO, 0))
+	    return FALSE;
+
+	  if (IRIX_COMPAT (dynobj) == ict_irix6
+	      && (bfd_get_section_by_name
+		  (dynobj, MIPS_ELF_OPTIONS_SECTION_NAME (dynobj)))
+	      && !MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_OPTIONS, 0))
+	    return FALSE;
+	}
+      if (htab->splt->size > 0)
+	{
+	  if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_PLTREL, 0))
+	    return FALSE;
+
+	  if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_JMPREL, 0))
+	    return FALSE;
+
+	  if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_PLTRELSZ, 0))
+	    return FALSE;
+
+	  if (! MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_PLTGOT, 0))
+	    return FALSE;
+	}
+      if (htab->is_vxworks
+	  && !elf_vxworks_add_dynamic_entries (output_bfd, info))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* REL is a relocation in INPUT_BFD that is being copied to OUTPUT_BFD.
+   Adjust its R_ADDEND field so that it is correct for the output file.
+   LOCAL_SYMS and LOCAL_SECTIONS are arrays of INPUT_BFD's local symbols
+   and sections respectively; both use symbol indexes.  */
+
+static void
+mips_elf_adjust_addend (bfd *output_bfd, struct bfd_link_info *info,
+			bfd *input_bfd, Elf_Internal_Sym *local_syms,
+			asection **local_sections, Elf_Internal_Rela *rel)
+{
+  unsigned int r_type, r_symndx;
+  Elf_Internal_Sym *sym;
+  asection *sec;
+
+  if (mips_elf_local_relocation_p (input_bfd, rel, local_sections))
+    {
+      r_type = ELF_R_TYPE (output_bfd, rel->r_info);
+      if (gprel16_reloc_p (r_type)
+	  || r_type == R_MIPS_GPREL32
+	  || literal_reloc_p (r_type))
+	{
+	  rel->r_addend += _bfd_get_gp_value (input_bfd);
+	  rel->r_addend -= _bfd_get_gp_value (output_bfd);
+	}
+
+      r_symndx = ELF_R_SYM (output_bfd, rel->r_info);
+      sym = local_syms + r_symndx;
+
+      /* Adjust REL's addend to account for section merging.  */
+      if (!info->relocatable)
+	{
+	  sec = local_sections[r_symndx];
+	  _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+
+      /* This would normally be done by the rela_normal code in elflink.c.  */
+      if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+	rel->r_addend += local_sections[r_symndx]->output_offset;
+    }
+}
+
+/* Relocate a MIPS ELF section.  */
+
+bfd_boolean
+_bfd_mips_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
+				bfd *input_bfd, asection *input_section,
+				bfd_byte *contents, Elf_Internal_Rela *relocs,
+				Elf_Internal_Sym *local_syms,
+				asection **local_sections)
+{
+  Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *relend;
+  bfd_vma addend = 0;
+  bfd_boolean use_saved_addend_p = FALSE;
+  const struct elf_backend_data *bed;
+
+  bed = get_elf_backend_data (output_bfd);
+  relend = relocs + input_section->reloc_count * bed->s->int_rels_per_ext_rel;
+  for (rel = relocs; rel < relend; ++rel)
+    {
+      const char *name;
+      bfd_vma value = 0;
+      reloc_howto_type *howto;
+      bfd_boolean cross_mode_jump_p;
+      /* TRUE if the relocation is a RELA relocation, rather than a
+         REL relocation.  */
+      bfd_boolean rela_relocation_p = TRUE;
+      unsigned int r_type = ELF_R_TYPE (output_bfd, rel->r_info);
+      const char *msg;
+      unsigned long r_symndx;
+      asection *sec;
+      Elf_Internal_Shdr *symtab_hdr;
+      struct elf_link_hash_entry *h;
+      bfd_boolean rel_reloc;
+
+      rel_reloc = (NEWABI_P (input_bfd)
+		   && mips_elf_rel_relocation_p (input_bfd, input_section,
+						 relocs, rel));
+      /* Find the relocation howto for this relocation.  */
+      howto = MIPS_ELF_RTYPE_TO_HOWTO (input_bfd, r_type, !rel_reloc);
+
+      r_symndx = ELF_R_SYM (input_bfd, rel->r_info);
+      symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+      if (mips_elf_local_relocation_p (input_bfd, rel, local_sections))
+	{
+	  sec = local_sections[r_symndx];
+	  h = NULL;
+	}
+      else
+	{
+	  unsigned long extsymoff;
+
+	  extsymoff = 0;
+	  if (!elf_bad_symtab (input_bfd))
+	    extsymoff = symtab_hdr->sh_info;
+	  h = elf_sym_hashes (input_bfd) [r_symndx - extsymoff];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+	  sec = NULL;
+	  if (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	    sec = h->root.u.def.section;
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (r_type == R_MIPS_64 && ! NEWABI_P (input_bfd))
+	{
+	  /* Some 32-bit code uses R_MIPS_64.  In particular, people use
+	     64-bit code, but make sure all their addresses are in the
+	     lowermost or uppermost 32-bit section of the 64-bit address
+	     space.  Thus, when they use an R_MIPS_64 they mean what is
+	     usually meant by R_MIPS_32, with the exception that the
+	     stored value is sign-extended to 64 bits.  */
+	  howto = MIPS_ELF_RTYPE_TO_HOWTO (input_bfd, R_MIPS_32, FALSE);
+
+	  /* On big-endian systems, we need to lie about the position
+	     of the reloc.  */
+	  if (bfd_big_endian (input_bfd))
+	    rel->r_offset += 4;
+	}
+
+      if (!use_saved_addend_p)
+	{
+	  /* If these relocations were originally of the REL variety,
+	     we must pull the addend out of the field that will be
+	     relocated.  Otherwise, we simply use the contents of the
+	     RELA relocation.  */
+	  if (mips_elf_rel_relocation_p (input_bfd, input_section,
+					 relocs, rel))
+	    {
+	      rela_relocation_p = FALSE;
+	      addend = mips_elf_read_rel_addend (input_bfd, rel,
+						 howto, contents);
+	      if (hi16_reloc_p (r_type)
+		  || (got16_reloc_p (r_type)
+		      && mips_elf_local_relocation_p (input_bfd, rel,
+						      local_sections)))
+		{
+		  if (!mips_elf_add_lo16_rel_addend (input_bfd, rel, relend,
+						     contents, &addend))
+		    {
+		      if (h)
+			name = h->root.root.string;
+		      else
+			name = bfd_elf_sym_name (input_bfd, symtab_hdr,
+						 local_syms + r_symndx,
+						 sec);
+		      (*_bfd_error_handler)
+			(_("%B: Can't find matching LO16 reloc against `%s' for %s at 0x%lx in section `%A'"),
+			 input_bfd, input_section, name, howto->name,
+			 rel->r_offset);
+		    }
+		}
+	      else
+		addend <<= howto->rightshift;
+	    }
+	  else
+	    addend = rel->r_addend;
+	  mips_elf_adjust_addend (output_bfd, info, input_bfd,
+				  local_syms, local_sections, rel);
+	}
+
+      if (info->relocatable)
+	{
+	  if (r_type == R_MIPS_64 && ! NEWABI_P (output_bfd)
+	      && bfd_big_endian (input_bfd))
+	    rel->r_offset -= 4;
+
+	  if (!rela_relocation_p && rel->r_addend)
+	    {
+	      addend += rel->r_addend;
+	      if (hi16_reloc_p (r_type) || got16_reloc_p (r_type))
+		addend = mips_elf_high (addend);
+	      else if (r_type == R_MIPS_HIGHER)
+		addend = mips_elf_higher (addend);
+	      else if (r_type == R_MIPS_HIGHEST)
+		addend = mips_elf_highest (addend);
+	      else
+		addend >>= howto->rightshift;
+
+	      /* We use the source mask, rather than the destination
+		 mask because the place to which we are writing will be
+		 source of the addend in the final link.  */
+	      addend &= howto->src_mask;
+
+	      if (r_type == R_MIPS_64 && ! NEWABI_P (output_bfd))
+		/* See the comment above about using R_MIPS_64 in the 32-bit
+		   ABI.  Here, we need to update the addend.  It would be
+		   possible to get away with just using the R_MIPS_32 reloc
+		   but for endianness.  */
+		{
+		  bfd_vma sign_bits;
+		  bfd_vma low_bits;
+		  bfd_vma high_bits;
+
+		  if (addend & ((bfd_vma) 1 << 31))
+#ifdef BFD64
+		    sign_bits = ((bfd_vma) 1 << 32) - 1;
+#else
+		    sign_bits = -1;
+#endif
+		  else
+		    sign_bits = 0;
+
+		  /* If we don't know that we have a 64-bit type,
+		     do two separate stores.  */
+		  if (bfd_big_endian (input_bfd))
+		    {
+		      /* Store the sign-bits (which are most significant)
+			 first.  */
+		      low_bits = sign_bits;
+		      high_bits = addend;
+		    }
+		  else
+		    {
+		      low_bits = addend;
+		      high_bits = sign_bits;
+		    }
+		  bfd_put_32 (input_bfd, low_bits,
+			      contents + rel->r_offset);
+		  bfd_put_32 (input_bfd, high_bits,
+			      contents + rel->r_offset + 4);
+		  continue;
+		}
+
+	      if (! mips_elf_perform_relocation (info, howto, rel, addend,
+						 input_bfd, input_section,
+						 contents, FALSE))
+		return FALSE;
+	    }
+
+	  /* Go on to the next relocation.  */
+	  continue;
+	}
+
+      /* In the N32 and 64-bit ABIs there may be multiple consecutive
+	 relocations for the same offset.  In that case we are
+	 supposed to treat the output of each relocation as the addend
+	 for the next.  */
+      if (rel + 1 < relend
+	  && rel->r_offset == rel[1].r_offset
+	  && ELF_R_TYPE (input_bfd, rel[1].r_info) != R_MIPS_NONE)
+	use_saved_addend_p = TRUE;
+      else
+	use_saved_addend_p = FALSE;
+
+      /* Figure out what value we are supposed to relocate.  */
+      switch (mips_elf_calculate_relocation (output_bfd, input_bfd,
+					     input_section, info, rel,
+					     addend, howto, local_syms,
+					     local_sections, &value,
+					     &name, &cross_mode_jump_p,
+					     use_saved_addend_p))
+	{
+	case bfd_reloc_continue:
+	  /* There's nothing to do.  */
+	  continue;
+
+	case bfd_reloc_undefined:
+	  /* mips_elf_calculate_relocation already called the
+	     undefined_symbol callback.  There's no real point in
+	     trying to perform the relocation at this point, so we
+	     just skip ahead to the next relocation.  */
+	  continue;
+
+	case bfd_reloc_notsupported:
+	  msg = _("internal error: unsupported relocation error");
+	  info->callbacks->warning
+	    (info, msg, name, input_bfd, input_section, rel->r_offset);
+	  return FALSE;
+
+	case bfd_reloc_overflow:
+	  if (use_saved_addend_p)
+	    /* Ignore overflow until we reach the last relocation for
+	       a given location.  */
+	    ;
+	  else
+	    {
+	      struct mips_elf_link_hash_table *htab;
+
+	      htab = mips_elf_hash_table (info);
+	      BFD_ASSERT (htab != NULL);
+	      BFD_ASSERT (name != NULL);
+	      if (!htab->small_data_overflow_reported
+		  && (gprel16_reloc_p (howto->type)
+		      || literal_reloc_p (howto->type)))
+		{
+		  msg = _("small-data section exceeds 64KB;"
+			  " lower small-data size limit (see option -G)");
+
+		  htab->small_data_overflow_reported = TRUE;
+		  (*info->callbacks->einfo) ("%P: %s\n", msg);
+		}
+	      if (! ((*info->callbacks->reloc_overflow)
+		     (info, NULL, name, howto->name, (bfd_vma) 0,
+		      input_bfd, input_section, rel->r_offset)))
+		return FALSE;
+	    }
+	  break;
+
+	case bfd_reloc_ok:
+	  break;
+
+	case bfd_reloc_outofrange:
+	  if (jal_reloc_p (howto->type))
+	    {
+	      msg = _("JALX to a non-word-aligned address");
+	      info->callbacks->warning
+		(info, msg, name, input_bfd, input_section, rel->r_offset);
+	      return FALSE;
+	    }
+	  /* Fall through.  */
+
+	default:
+	  abort ();
+	  break;
+	}
+
+      /* If we've got another relocation for the address, keep going
+	 until we reach the last one.  */
+      if (use_saved_addend_p)
+	{
+	  addend = value;
+	  continue;
+	}
+
+      if (r_type == R_MIPS_64 && ! NEWABI_P (output_bfd))
+	/* See the comment above about using R_MIPS_64 in the 32-bit
+	   ABI.  Until now, we've been using the HOWTO for R_MIPS_32;
+	   that calculated the right value.  Now, however, we
+	   sign-extend the 32-bit result to 64-bits, and store it as a
+	   64-bit value.  We are especially generous here in that we
+	   go to extreme lengths to support this usage on systems with
+	   only a 32-bit VMA.  */
+	{
+	  bfd_vma sign_bits;
+	  bfd_vma low_bits;
+	  bfd_vma high_bits;
+
+	  if (value & ((bfd_vma) 1 << 31))
+#ifdef BFD64
+	    sign_bits = ((bfd_vma) 1 << 32) - 1;
+#else
+	    sign_bits = -1;
+#endif
+	  else
+	    sign_bits = 0;
+
+	  /* If we don't know that we have a 64-bit type,
+	     do two separate stores.  */
+	  if (bfd_big_endian (input_bfd))
+	    {
+	      /* Undo what we did above.  */
+	      rel->r_offset -= 4;
+	      /* Store the sign-bits (which are most significant)
+		 first.  */
+	      low_bits = sign_bits;
+	      high_bits = value;
+	    }
+	  else
+	    {
+	      low_bits = value;
+	      high_bits = sign_bits;
+	    }
+	  bfd_put_32 (input_bfd, low_bits,
+		      contents + rel->r_offset);
+	  bfd_put_32 (input_bfd, high_bits,
+		      contents + rel->r_offset + 4);
+	  continue;
+	}
+
+      /* Actually perform the relocation.  */
+      if (! mips_elf_perform_relocation (info, howto, rel, value,
+					 input_bfd, input_section,
+					 contents, cross_mode_jump_p))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* A function that iterates over each entry in la25_stubs and fills
+   in the code for each one.  DATA points to a mips_htab_traverse_info.  */
+
+static int
+mips_elf_create_la25_stub (void **slot, void *data)
+{
+  struct mips_htab_traverse_info *hti;
+  struct mips_elf_link_hash_table *htab;
+  struct mips_elf_la25_stub *stub;
+  asection *s;
+  bfd_byte *loc;
+  bfd_vma offset, target, target_high, target_low;
+
+  stub = (struct mips_elf_la25_stub *) *slot;
+  hti = (struct mips_htab_traverse_info *) data;
+  htab = mips_elf_hash_table (hti->info);
+  BFD_ASSERT (htab != NULL);
+
+  /* Create the section contents, if we haven't already.  */
+  s = stub->stub_section;
+  loc = s->contents;
+  if (loc == NULL)
+    {
+      loc = bfd_malloc (s->size);
+      if (loc == NULL)
+	{
+	  hti->error = TRUE;
+	  return FALSE;
+	}
+      s->contents = loc;
+    }
+
+  /* Work out where in the section this stub should go.  */
+  offset = stub->offset;
+
+  /* Work out the target address.  */
+  target = (stub->h->root.root.u.def.section->output_section->vma
+	    + stub->h->root.root.u.def.section->output_offset
+	    + stub->h->root.root.u.def.value);
+  target_high = ((target + 0x8000) >> 16) & 0xffff;
+  target_low = (target & 0xffff);
+
+  if (stub->stub_section != htab->strampoline)
+    {
+      /* This is a simple LUI/ADDIU stub.  Zero out the beginning
+	 of the section and write the two instructions at the end.  */
+      memset (loc, 0, offset);
+      loc += offset;
+      if (ELF_ST_IS_MICROMIPS (stub->h->root.other))
+	{
+	  bfd_put_16 (hti->output_bfd, LA25_LUI_MICROMIPS_1 (target_high),
+		      loc);
+	  bfd_put_16 (hti->output_bfd, LA25_LUI_MICROMIPS_2 (target_high),
+		      loc + 2);
+	  bfd_put_16 (hti->output_bfd, LA25_ADDIU_MICROMIPS_1 (target_low),
+		      loc + 4);
+	  bfd_put_16 (hti->output_bfd, LA25_ADDIU_MICROMIPS_2 (target_low),
+		      loc + 6);
+	}
+      else
+	{
+	  bfd_put_32 (hti->output_bfd, LA25_LUI (target_high), loc);
+	  bfd_put_32 (hti->output_bfd, LA25_ADDIU (target_low), loc + 4);
+	}
+    }
+  else
+    {
+      /* This is trampoline.  */
+      loc += offset;
+      if (ELF_ST_IS_MICROMIPS (stub->h->root.other))
+	{
+	  bfd_put_16 (hti->output_bfd, LA25_LUI_MICROMIPS_1 (target_high),
+		      loc);
+	  bfd_put_16 (hti->output_bfd, LA25_LUI_MICROMIPS_2 (target_high),
+		      loc + 2);
+	  bfd_put_16 (hti->output_bfd, LA25_J_MICROMIPS_1 (target), loc + 4);
+	  bfd_put_16 (hti->output_bfd, LA25_J_MICROMIPS_2 (target), loc + 6);
+	  bfd_put_16 (hti->output_bfd, LA25_ADDIU_MICROMIPS_1 (target_low),
+		      loc + 8);
+	  bfd_put_16 (hti->output_bfd, LA25_ADDIU_MICROMIPS_2 (target_low),
+		      loc + 10);
+	  bfd_put_32 (hti->output_bfd, 0, loc + 12);
+	}
+      else
+	{
+	  bfd_put_32 (hti->output_bfd, LA25_LUI (target_high), loc);
+	  bfd_put_32 (hti->output_bfd, LA25_J (target), loc + 4);
+	  bfd_put_32 (hti->output_bfd, LA25_ADDIU (target_low), loc + 8);
+	  bfd_put_32 (hti->output_bfd, 0, loc + 12);
+	}
+    }
+  return TRUE;
+}
+
+/* If NAME is one of the special IRIX6 symbols defined by the linker,
+   adjust it appropriately now.  */
+
+static void
+mips_elf_irix6_finish_dynamic_symbol (bfd *abfd ATTRIBUTE_UNUSED,
+				      const char *name, Elf_Internal_Sym *sym)
+{
+  /* The linker script takes care of providing names and values for
+     these, but we must place them into the right sections.  */
+  static const char* const text_section_symbols[] = {
+    "_ftext",
+    "_etext",
+    "__dso_displacement",
+    "__elf_header",
+    "__program_header_table",
+    NULL
+  };
+
+  static const char* const data_section_symbols[] = {
+    "_fdata",
+    "_edata",
+    "_end",
+    "_fbss",
+    NULL
+  };
+
+  const char* const *p;
+  int i;
+
+  for (i = 0; i < 2; ++i)
+    for (p = (i == 0) ? text_section_symbols : data_section_symbols;
+	 *p;
+	 ++p)
+      if (strcmp (*p, name) == 0)
+	{
+	  /* All of these symbols are given type STT_SECTION by the
+	     IRIX6 linker.  */
+	  sym->st_info = ELF_ST_INFO (STB_GLOBAL, STT_SECTION);
+	  sym->st_other = STO_PROTECTED;
+
+	  /* The IRIX linker puts these symbols in special sections.  */
+	  if (i == 0)
+	    sym->st_shndx = SHN_MIPS_TEXT;
+	  else
+	    sym->st_shndx = SHN_MIPS_DATA;
+
+	  break;
+	}
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+bfd_boolean
+_bfd_mips_elf_finish_dynamic_symbol (bfd *output_bfd,
+				     struct bfd_link_info *info,
+				     struct elf_link_hash_entry *h,
+				     Elf_Internal_Sym *sym)
+{
+  bfd *dynobj;
+  asection *sgot;
+  struct mips_got_info *g, *gg;
+  const char *name;
+  int idx;
+  struct mips_elf_link_hash_table *htab;
+  struct mips_elf_link_hash_entry *hmips;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+  dynobj = elf_hash_table (info)->dynobj;
+  hmips = (struct mips_elf_link_hash_entry *) h;
+
+  BFD_ASSERT (!htab->is_vxworks);
+
+  if (h->plt.offset != MINUS_ONE && hmips->no_fn_stub)
+    {
+      /* We've decided to create a PLT entry for this symbol.  */
+      bfd_byte *loc;
+      bfd_vma header_address, plt_index, got_address;
+      bfd_vma got_address_high, got_address_low, load;
+      const bfd_vma *plt_entry;
+
+      BFD_ASSERT (htab->use_plts_and_copy_relocs);
+      BFD_ASSERT (h->dynindx != -1);
+      BFD_ASSERT (htab->splt != NULL);
+      BFD_ASSERT (h->plt.offset <= htab->splt->size);
+      BFD_ASSERT (!h->def_regular);
+
+      /* Calculate the address of the PLT header.  */
+      header_address = (htab->splt->output_section->vma
+			+ htab->splt->output_offset);
+
+      /* Calculate the index of the entry.  */
+      plt_index = ((h->plt.offset - htab->plt_header_size)
+		   / htab->plt_entry_size);
+
+      /* Calculate the address of the .got.plt entry.  */
+      got_address = (htab->sgotplt->output_section->vma
+		     + htab->sgotplt->output_offset
+		     + (2 + plt_index) * MIPS_ELF_GOT_SIZE (dynobj));
+      got_address_high = ((got_address + 0x8000) >> 16) & 0xffff;
+      got_address_low = got_address & 0xffff;
+
+      /* Initially point the .got.plt entry at the PLT header.  */
+      loc = (htab->sgotplt->contents
+	     + (2 + plt_index) * MIPS_ELF_GOT_SIZE (dynobj));
+      if (ABI_64_P (output_bfd))
+	bfd_put_64 (output_bfd, header_address, loc);
+      else
+	bfd_put_32 (output_bfd, header_address, loc);
+
+      /* Find out where the .plt entry should go.  */
+      loc = htab->splt->contents + h->plt.offset;
+
+      /* Pick the load opcode.  */
+      load = MIPS_ELF_LOAD_WORD (output_bfd);
+
+      /* Fill in the PLT entry itself.  */
+      plt_entry = mips_exec_plt_entry;
+      bfd_put_32 (output_bfd, plt_entry[0] | got_address_high, loc);
+      bfd_put_32 (output_bfd, plt_entry[1] | got_address_low | load, loc + 4);
+
+      if (! LOAD_INTERLOCKS_P (output_bfd))
+	{
+	  bfd_put_32 (output_bfd, plt_entry[2] | got_address_low, loc + 8);
+	  bfd_put_32 (output_bfd, plt_entry[3], loc + 12);
+	}
+      else
+	{
+	  bfd_put_32 (output_bfd, plt_entry[3], loc + 8);
+	  bfd_put_32 (output_bfd, plt_entry[2] | got_address_low, loc + 12);
+	}
+
+      /* Emit an R_MIPS_JUMP_SLOT relocation against the .got.plt entry.  */
+      mips_elf_output_dynamic_relocation (output_bfd, htab->srelplt,
+					  plt_index, h->dynindx,
+					  R_MIPS_JUMP_SLOT, got_address);
+
+      /* We distinguish between PLT entries and lazy-binding stubs by
+	 giving the former an st_other value of STO_MIPS_PLT.  Set the
+	 flag and leave the value if there are any relocations in the
+	 binary where pointer equality matters.  */
+      sym->st_shndx = SHN_UNDEF;
+      if (h->pointer_equality_needed)
+	sym->st_other = STO_MIPS_PLT;
+      else
+	sym->st_value = 0;
+    }
+  else if (h->plt.offset != MINUS_ONE)
+    {
+      /* We've decided to create a lazy-binding stub.  */
+      bfd_byte stub[MIPS_FUNCTION_STUB_BIG_SIZE];
+
+      /* This symbol has a stub.  Set it up.  */
+
+      BFD_ASSERT (h->dynindx != -1);
+
+      BFD_ASSERT ((htab->function_stub_size == MIPS_FUNCTION_STUB_BIG_SIZE)
+                  || (h->dynindx <= 0xffff));
+
+      /* Values up to 2^31 - 1 are allowed.  Larger values would cause
+	 sign extension at runtime in the stub, resulting in a negative
+	 index value.  */
+      if (h->dynindx & ~0x7fffffff)
+	return FALSE;
+
+      /* Fill the stub.  */
+      idx = 0;
+      bfd_put_32 (output_bfd, STUB_LW (output_bfd), stub + idx);
+      idx += 4;
+      bfd_put_32 (output_bfd, STUB_MOVE (output_bfd), stub + idx);
+      idx += 4;
+      if (htab->function_stub_size == MIPS_FUNCTION_STUB_BIG_SIZE)
+        {
+          bfd_put_32 (output_bfd, STUB_LUI ((h->dynindx >> 16) & 0x7fff),
+                      stub + idx);
+          idx += 4;
+        }
+      bfd_put_32 (output_bfd, STUB_JALR, stub + idx);
+      idx += 4;
+
+      /* If a large stub is not required and sign extension is not a
+         problem, then use legacy code in the stub.  */
+      if (htab->function_stub_size == MIPS_FUNCTION_STUB_BIG_SIZE)
+	bfd_put_32 (output_bfd, STUB_ORI (h->dynindx & 0xffff), stub + idx);
+      else if (h->dynindx & ~0x7fff)
+        bfd_put_32 (output_bfd, STUB_LI16U (h->dynindx & 0xffff), stub + idx);
+      else
+        bfd_put_32 (output_bfd, STUB_LI16S (output_bfd, h->dynindx),
+		    stub + idx);
+
+      BFD_ASSERT (h->plt.offset <= htab->sstubs->size);
+      memcpy (htab->sstubs->contents + h->plt.offset,
+	      stub, htab->function_stub_size);
+
+      /* Mark the symbol as undefined.  plt.offset != -1 occurs
+	 only for the referenced symbol.  */
+      sym->st_shndx = SHN_UNDEF;
+
+      /* The run-time linker uses the st_value field of the symbol
+	 to reset the global offset table entry for this external
+	 to its stub address when unlinking a shared object.  */
+      sym->st_value = (htab->sstubs->output_section->vma
+		       + htab->sstubs->output_offset
+		       + h->plt.offset);
+    }
+
+  /* If we have a MIPS16 function with a stub, the dynamic symbol must
+     refer to the stub, since only the stub uses the standard calling
+     conventions.  */
+  if (h->dynindx != -1 && hmips->fn_stub != NULL)
+    {
+      BFD_ASSERT (hmips->need_fn_stub);
+      sym->st_value = (hmips->fn_stub->output_section->vma
+		       + hmips->fn_stub->output_offset);
+      sym->st_size = hmips->fn_stub->size;
+      sym->st_other = ELF_ST_VISIBILITY (sym->st_other);
+    }
+
+  BFD_ASSERT (h->dynindx != -1
+	      || h->forced_local);
+
+  sgot = htab->sgot;
+  g = htab->got_info;
+  BFD_ASSERT (g != NULL);
+
+  /* Run through the global symbol table, creating GOT entries for all
+     the symbols that need them.  */
+  if (hmips->global_got_area != GGA_NONE)
+    {
+      bfd_vma offset;
+      bfd_vma value;
+
+      value = sym->st_value;
+      offset = mips_elf_global_got_index (dynobj, output_bfd, h,
+					  R_MIPS_GOT16, info);
+      MIPS_ELF_PUT_WORD (output_bfd, value, sgot->contents + offset);
+    }
+
+  if (hmips->global_got_area != GGA_NONE && g->next && h->type != STT_TLS)
+    {
+      struct mips_got_entry e, *p;
+      bfd_vma entry;
+      bfd_vma offset;
+
+      gg = g;
+
+      e.abfd = output_bfd;
+      e.symndx = -1;
+      e.d.h = hmips;
+      e.tls_type = 0;
+
+      for (g = g->next; g->next != gg; g = g->next)
+	{
+	  if (g->got_entries
+	      && (p = (struct mips_got_entry *) htab_find (g->got_entries,
+							   &e)))
+	    {
+	      offset = p->gotidx;
+	      if (info->shared
+		  || (elf_hash_table (info)->dynamic_sections_created
+		      && p->d.h != NULL
+		      && p->d.h->root.def_dynamic
+		      && !p->d.h->root.def_regular))
+		{
+		  /* Create an R_MIPS_REL32 relocation for this entry.  Due to
+		     the various compatibility problems, it's easier to mock
+		     up an R_MIPS_32 or R_MIPS_64 relocation and leave
+		     mips_elf_create_dynamic_relocation to calculate the
+		     appropriate addend.  */
+		  Elf_Internal_Rela rel[3];
+
+		  memset (rel, 0, sizeof (rel));
+		  if (ABI_64_P (output_bfd))
+		    rel[0].r_info = ELF_R_INFO (output_bfd, 0, R_MIPS_64);
+		  else
+		    rel[0].r_info = ELF_R_INFO (output_bfd, 0, R_MIPS_32);
+		  rel[0].r_offset = rel[1].r_offset = rel[2].r_offset = offset;
+
+		  entry = 0;
+		  if (! (mips_elf_create_dynamic_relocation
+			 (output_bfd, info, rel,
+			  e.d.h, NULL, sym->st_value, &entry, sgot)))
+		    return FALSE;
+		}
+	      else
+		entry = sym->st_value;
+	      MIPS_ELF_PUT_WORD (output_bfd, entry, sgot->contents + offset);
+	    }
+	}
+    }
+
+  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
+  name = h->root.root.string;
+  if (strcmp (name, "_DYNAMIC") == 0
+      || h == elf_hash_table (info)->hgot)
+    sym->st_shndx = SHN_ABS;
+  else if (strcmp (name, "_DYNAMIC_LINK") == 0
+	   || strcmp (name, "_DYNAMIC_LINKING") == 0)
+    {
+      sym->st_shndx = SHN_ABS;
+      sym->st_info = ELF_ST_INFO (STB_GLOBAL, STT_SECTION);
+      sym->st_value = 1;
+    }
+  else if (strcmp (name, "_gp_disp") == 0 && ! NEWABI_P (output_bfd))
+    {
+      sym->st_shndx = SHN_ABS;
+      sym->st_info = ELF_ST_INFO (STB_GLOBAL, STT_SECTION);
+      sym->st_value = elf_gp (output_bfd);
+    }
+  else if (SGI_COMPAT (output_bfd))
+    {
+      if (strcmp (name, mips_elf_dynsym_rtproc_names[0]) == 0
+	  || strcmp (name, mips_elf_dynsym_rtproc_names[1]) == 0)
+	{
+	  sym->st_info = ELF_ST_INFO (STB_GLOBAL, STT_SECTION);
+	  sym->st_other = STO_PROTECTED;
+	  sym->st_value = 0;
+	  sym->st_shndx = SHN_MIPS_DATA;
+	}
+      else if (strcmp (name, mips_elf_dynsym_rtproc_names[2]) == 0)
+	{
+	  sym->st_info = ELF_ST_INFO (STB_GLOBAL, STT_SECTION);
+	  sym->st_other = STO_PROTECTED;
+	  sym->st_value = mips_elf_hash_table (info)->procedure_count;
+	  sym->st_shndx = SHN_ABS;
+	}
+      else if (sym->st_shndx != SHN_UNDEF && sym->st_shndx != SHN_ABS)
+	{
+	  if (h->type == STT_FUNC)
+	    sym->st_shndx = SHN_MIPS_TEXT;
+	  else if (h->type == STT_OBJECT)
+	    sym->st_shndx = SHN_MIPS_DATA;
+	}
+    }
+
+  /* Emit a copy reloc, if needed.  */
+  if (h->needs_copy)
+    {
+      asection *s;
+      bfd_vma symval;
+
+      BFD_ASSERT (h->dynindx != -1);
+      BFD_ASSERT (htab->use_plts_and_copy_relocs);
+
+      s = mips_elf_rel_dyn_section (info, FALSE);
+      symval = (h->root.u.def.section->output_section->vma
+		+ h->root.u.def.section->output_offset
+		+ h->root.u.def.value);
+      mips_elf_output_dynamic_relocation (output_bfd, s, s->reloc_count++,
+					  h->dynindx, R_MIPS_COPY, symval);
+    }
+
+  /* Handle the IRIX6-specific symbols.  */
+  if (IRIX_COMPAT (output_bfd) == ict_irix6)
+    mips_elf_irix6_finish_dynamic_symbol (output_bfd, name, sym);
+
+  if (! info->shared)
+    {
+      if (! mips_elf_hash_table (info)->use_rld_obj_head
+	  && (strcmp (name, "__rld_map") == 0
+	      || strcmp (name, "__RLD_MAP") == 0))
+	{
+	  asection *s = bfd_get_section_by_name (dynobj, ".rld_map");
+	  BFD_ASSERT (s != NULL);
+	  sym->st_value = s->output_section->vma + s->output_offset;
+	  bfd_put_32 (output_bfd, 0, s->contents);
+	  if (mips_elf_hash_table (info)->rld_value == 0)
+	    mips_elf_hash_table (info)->rld_value = sym->st_value;
+	}
+      else if (mips_elf_hash_table (info)->use_rld_obj_head
+	       && strcmp (name, "__rld_obj_head") == 0)
+	{
+	  /* IRIX6 does not use a .rld_map section.  */
+	  if (IRIX_COMPAT (output_bfd) == ict_irix5
+              || IRIX_COMPAT (output_bfd) == ict_none)
+	    BFD_ASSERT (bfd_get_section_by_name (dynobj, ".rld_map")
+			!= NULL);
+	  mips_elf_hash_table (info)->rld_value = sym->st_value;
+	}
+    }
+
+  /* Keep dynamic MIPS16 symbols odd.  This allows the dynamic linker to
+     treat MIPS16 symbols like any other.  */
+  if (ELF_ST_IS_MIPS16 (sym->st_other))
+    {
+      BFD_ASSERT (sym->st_value & 1);
+      sym->st_other -= STO_MIPS16;
+    }
+
+  return TRUE;
+}
+
+/* Likewise, for VxWorks.  */
+
+bfd_boolean
+_bfd_mips_vxworks_finish_dynamic_symbol (bfd *output_bfd,
+					 struct bfd_link_info *info,
+					 struct elf_link_hash_entry *h,
+					 Elf_Internal_Sym *sym)
+{
+  bfd *dynobj;
+  asection *sgot;
+  struct mips_got_info *g;
+  struct mips_elf_link_hash_table *htab;
+  struct mips_elf_link_hash_entry *hmips;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+  dynobj = elf_hash_table (info)->dynobj;
+  hmips = (struct mips_elf_link_hash_entry *) h;
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      bfd_byte *loc;
+      bfd_vma plt_address, plt_index, got_address, got_offset, branch_offset;
+      Elf_Internal_Rela rel;
+      static const bfd_vma *plt_entry;
+
+      BFD_ASSERT (h->dynindx != -1);
+      BFD_ASSERT (htab->splt != NULL);
+      BFD_ASSERT (h->plt.offset <= htab->splt->size);
+
+      /* Calculate the address of the .plt entry.  */
+      plt_address = (htab->splt->output_section->vma
+		     + htab->splt->output_offset
+		     + h->plt.offset);
+
+      /* Calculate the index of the entry.  */
+      plt_index = ((h->plt.offset - htab->plt_header_size)
+		   / htab->plt_entry_size);
+
+      /* Calculate the address of the .got.plt entry.  */
+      got_address = (htab->sgotplt->output_section->vma
+		     + htab->sgotplt->output_offset
+		     + plt_index * 4);
+
+      /* Calculate the offset of the .got.plt entry from
+	 _GLOBAL_OFFSET_TABLE_.  */
+      got_offset = mips_elf_gotplt_index (info, h);
+
+      /* Calculate the offset for the branch at the start of the PLT
+	 entry.  The branch jumps to the beginning of .plt.  */
+      branch_offset = -(h->plt.offset / 4 + 1) & 0xffff;
+
+      /* Fill in the initial value of the .got.plt entry.  */
+      bfd_put_32 (output_bfd, plt_address,
+		  htab->sgotplt->contents + plt_index * 4);
+
+      /* Find out where the .plt entry should go.  */
+      loc = htab->splt->contents + h->plt.offset;
+
+      if (info->shared)
+	{
+	  plt_entry = mips_vxworks_shared_plt_entry;
+	  bfd_put_32 (output_bfd, plt_entry[0] | branch_offset, loc);
+	  bfd_put_32 (output_bfd, plt_entry[1] | plt_index, loc + 4);
+	}
+      else
+	{
+	  bfd_vma got_address_high, got_address_low;
+
+	  plt_entry = mips_vxworks_exec_plt_entry;
+	  got_address_high = ((got_address + 0x8000) >> 16) & 0xffff;
+	  got_address_low = got_address & 0xffff;
+
+	  bfd_put_32 (output_bfd, plt_entry[0] | branch_offset, loc);
+	  bfd_put_32 (output_bfd, plt_entry[1] | plt_index, loc + 4);
+	  bfd_put_32 (output_bfd, plt_entry[2] | got_address_high, loc + 8);
+	  bfd_put_32 (output_bfd, plt_entry[3] | got_address_low, loc + 12);
+	  bfd_put_32 (output_bfd, plt_entry[4], loc + 16);
+	  bfd_put_32 (output_bfd, plt_entry[5], loc + 20);
+	  bfd_put_32 (output_bfd, plt_entry[6], loc + 24);
+	  bfd_put_32 (output_bfd, plt_entry[7], loc + 28);
+
+	  loc = (htab->srelplt2->contents
+		 + (plt_index * 3 + 2) * sizeof (Elf32_External_Rela));
+
+	  /* Emit a relocation for the .got.plt entry.  */
+	  rel.r_offset = got_address;
+	  rel.r_info = ELF32_R_INFO (htab->root.hplt->indx, R_MIPS_32);
+	  rel.r_addend = h->plt.offset;
+	  bfd_elf32_swap_reloca_out (output_bfd, &rel, loc);
+
+	  /* Emit a relocation for the lui of %hi(<.got.plt slot>).  */
+	  loc += sizeof (Elf32_External_Rela);
+	  rel.r_offset = plt_address + 8;
+	  rel.r_info = ELF32_R_INFO (htab->root.hgot->indx, R_MIPS_HI16);
+	  rel.r_addend = got_offset;
+	  bfd_elf32_swap_reloca_out (output_bfd, &rel, loc);
+
+	  /* Emit a relocation for the addiu of %lo(<.got.plt slot>).  */
+	  loc += sizeof (Elf32_External_Rela);
+	  rel.r_offset += 4;
+	  rel.r_info = ELF32_R_INFO (htab->root.hgot->indx, R_MIPS_LO16);
+	  bfd_elf32_swap_reloca_out (output_bfd, &rel, loc);
+	}
+
+      /* Emit an R_MIPS_JUMP_SLOT relocation against the .got.plt entry.  */
+      loc = htab->srelplt->contents + plt_index * sizeof (Elf32_External_Rela);
+      rel.r_offset = got_address;
+      rel.r_info = ELF32_R_INFO (h->dynindx, R_MIPS_JUMP_SLOT);
+      rel.r_addend = 0;
+      bfd_elf32_swap_reloca_out (output_bfd, &rel, loc);
+
+      if (!h->def_regular)
+	sym->st_shndx = SHN_UNDEF;
+    }
+
+  BFD_ASSERT (h->dynindx != -1 || h->forced_local);
+
+  sgot = htab->sgot;
+  g = htab->got_info;
+  BFD_ASSERT (g != NULL);
+
+  /* See if this symbol has an entry in the GOT.  */
+  if (hmips->global_got_area != GGA_NONE)
+    {
+      bfd_vma offset;
+      Elf_Internal_Rela outrel;
+      bfd_byte *loc;
+      asection *s;
+
+      /* Install the symbol value in the GOT.   */
+      offset = mips_elf_global_got_index (dynobj, output_bfd, h,
+					  R_MIPS_GOT16, info);
+      MIPS_ELF_PUT_WORD (output_bfd, sym->st_value, sgot->contents + offset);
+
+      /* Add a dynamic relocation for it.  */
+      s = mips_elf_rel_dyn_section (info, FALSE);
+      loc = s->contents + (s->reloc_count++ * sizeof (Elf32_External_Rela));
+      outrel.r_offset = (sgot->output_section->vma
+			 + sgot->output_offset
+			 + offset);
+      outrel.r_info = ELF32_R_INFO (h->dynindx, R_MIPS_32);
+      outrel.r_addend = 0;
+      bfd_elf32_swap_reloca_out (dynobj, &outrel, loc);
+    }
+
+  /* Emit a copy reloc, if needed.  */
+  if (h->needs_copy)
+    {
+      Elf_Internal_Rela rel;
+
+      BFD_ASSERT (h->dynindx != -1);
+
+      rel.r_offset = (h->root.u.def.section->output_section->vma
+		      + h->root.u.def.section->output_offset
+		      + h->root.u.def.value);
+      rel.r_info = ELF32_R_INFO (h->dynindx, R_MIPS_COPY);
+      rel.r_addend = 0;
+      bfd_elf32_swap_reloca_out (output_bfd, &rel,
+				 htab->srelbss->contents
+				 + (htab->srelbss->reloc_count
+				    * sizeof (Elf32_External_Rela)));
+      ++htab->srelbss->reloc_count;
+    }
+
+  /* If this is a mips16/microMIPS symbol, force the value to be even.  */
+  if (ELF_ST_IS_COMPRESSED (sym->st_other))
+    sym->st_value &= ~1;
+
+  return TRUE;
+}
+
+/* Write out a plt0 entry to the beginning of .plt.  */
+
+static void
+mips_finish_exec_plt (bfd *output_bfd, struct bfd_link_info *info)
+{
+  bfd_byte *loc;
+  bfd_vma gotplt_value, gotplt_value_high, gotplt_value_low;
+  static const bfd_vma *plt_entry;
+  struct mips_elf_link_hash_table *htab;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  if (ABI_64_P (output_bfd))
+    plt_entry = mips_n64_exec_plt0_entry;
+  else if (ABI_N32_P (output_bfd))
+    plt_entry = mips_n32_exec_plt0_entry;
+  else
+    plt_entry = mips_o32_exec_plt0_entry;
+
+  /* Calculate the value of .got.plt.  */
+  gotplt_value = (htab->sgotplt->output_section->vma
+		  + htab->sgotplt->output_offset);
+  gotplt_value_high = ((gotplt_value + 0x8000) >> 16) & 0xffff;
+  gotplt_value_low = gotplt_value & 0xffff;
+
+  /* The PLT sequence is not safe for N64 if .got.plt's address can
+     not be loaded in two instructions.  */
+  BFD_ASSERT ((gotplt_value & ~(bfd_vma) 0x7fffffff) == 0
+	      || ~(gotplt_value | 0x7fffffff) == 0);
+
+  /* Install the PLT header.  */
+  loc = htab->splt->contents;
+  bfd_put_32 (output_bfd, plt_entry[0] | gotplt_value_high, loc);
+  bfd_put_32 (output_bfd, plt_entry[1] | gotplt_value_low, loc + 4);
+  bfd_put_32 (output_bfd, plt_entry[2] | gotplt_value_low, loc + 8);
+  bfd_put_32 (output_bfd, plt_entry[3], loc + 12);
+  bfd_put_32 (output_bfd, plt_entry[4], loc + 16);
+  bfd_put_32 (output_bfd, plt_entry[5], loc + 20);
+  bfd_put_32 (output_bfd, plt_entry[6], loc + 24);
+  bfd_put_32 (output_bfd, plt_entry[7], loc + 28);
+}
+
+/* Install the PLT header for a VxWorks executable and finalize the
+   contents of .rela.plt.unloaded.  */
+
+static void
+mips_vxworks_finish_exec_plt (bfd *output_bfd, struct bfd_link_info *info)
+{
+  Elf_Internal_Rela rela;
+  bfd_byte *loc;
+  bfd_vma got_value, got_value_high, got_value_low, plt_address;
+  static const bfd_vma *plt_entry;
+  struct mips_elf_link_hash_table *htab;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  plt_entry = mips_vxworks_exec_plt0_entry;
+
+  /* Calculate the value of _GLOBAL_OFFSET_TABLE_.  */
+  got_value = (htab->root.hgot->root.u.def.section->output_section->vma
+	       + htab->root.hgot->root.u.def.section->output_offset
+	       + htab->root.hgot->root.u.def.value);
+
+  got_value_high = ((got_value + 0x8000) >> 16) & 0xffff;
+  got_value_low = got_value & 0xffff;
+
+  /* Calculate the address of the PLT header.  */
+  plt_address = htab->splt->output_section->vma + htab->splt->output_offset;
+
+  /* Install the PLT header.  */
+  loc = htab->splt->contents;
+  bfd_put_32 (output_bfd, plt_entry[0] | got_value_high, loc);
+  bfd_put_32 (output_bfd, plt_entry[1] | got_value_low, loc + 4);
+  bfd_put_32 (output_bfd, plt_entry[2], loc + 8);
+  bfd_put_32 (output_bfd, plt_entry[3], loc + 12);
+  bfd_put_32 (output_bfd, plt_entry[4], loc + 16);
+  bfd_put_32 (output_bfd, plt_entry[5], loc + 20);
+
+  /* Output the relocation for the lui of %hi(_GLOBAL_OFFSET_TABLE_).  */
+  loc = htab->srelplt2->contents;
+  rela.r_offset = plt_address;
+  rela.r_info = ELF32_R_INFO (htab->root.hgot->indx, R_MIPS_HI16);
+  rela.r_addend = 0;
+  bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+  loc += sizeof (Elf32_External_Rela);
+
+  /* Output the relocation for the following addiu of
+     %lo(_GLOBAL_OFFSET_TABLE_).  */
+  rela.r_offset += 4;
+  rela.r_info = ELF32_R_INFO (htab->root.hgot->indx, R_MIPS_LO16);
+  bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+  loc += sizeof (Elf32_External_Rela);
+
+  /* Fix up the remaining relocations.  They may have the wrong
+     symbol index for _G_O_T_ or _P_L_T_ depending on the order
+     in which symbols were output.  */
+  while (loc < htab->srelplt2->contents + htab->srelplt2->size)
+    {
+      Elf_Internal_Rela rel;
+
+      bfd_elf32_swap_reloca_in (output_bfd, loc, &rel);
+      rel.r_info = ELF32_R_INFO (htab->root.hplt->indx, R_MIPS_32);
+      bfd_elf32_swap_reloca_out (output_bfd, &rel, loc);
+      loc += sizeof (Elf32_External_Rela);
+
+      bfd_elf32_swap_reloca_in (output_bfd, loc, &rel);
+      rel.r_info = ELF32_R_INFO (htab->root.hgot->indx, R_MIPS_HI16);
+      bfd_elf32_swap_reloca_out (output_bfd, &rel, loc);
+      loc += sizeof (Elf32_External_Rela);
+
+      bfd_elf32_swap_reloca_in (output_bfd, loc, &rel);
+      rel.r_info = ELF32_R_INFO (htab->root.hgot->indx, R_MIPS_LO16);
+      bfd_elf32_swap_reloca_out (output_bfd, &rel, loc);
+      loc += sizeof (Elf32_External_Rela);
+    }
+}
+
+/* Install the PLT header for a VxWorks shared library.  */
+
+static void
+mips_vxworks_finish_shared_plt (bfd *output_bfd, struct bfd_link_info *info)
+{
+  unsigned int i;
+  struct mips_elf_link_hash_table *htab;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  /* We just need to copy the entry byte-by-byte.  */
+  for (i = 0; i < ARRAY_SIZE (mips_vxworks_shared_plt0_entry); i++)
+    bfd_put_32 (output_bfd, mips_vxworks_shared_plt0_entry[i],
+		htab->splt->contents + i * 4);
+}
+
+/* Finish up the dynamic sections.  */
+
+bfd_boolean
+_bfd_mips_elf_finish_dynamic_sections (bfd *output_bfd,
+				       struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *sdyn;
+  asection *sgot;
+  struct mips_got_info *gg, *g;
+  struct mips_elf_link_hash_table *htab;
+
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  dynobj = elf_hash_table (info)->dynobj;
+
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  sgot = htab->sgot;
+  gg = htab->got_info;
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      bfd_byte *b;
+      int dyn_to_skip = 0, dyn_skipped = 0;
+
+      BFD_ASSERT (sdyn != NULL);
+      BFD_ASSERT (gg != NULL);
+
+      g = mips_elf_got_for_ibfd (gg, output_bfd);
+      BFD_ASSERT (g != NULL);
+
+      for (b = sdyn->contents;
+	   b < sdyn->contents + sdyn->size;
+	   b += MIPS_ELF_DYN_SIZE (dynobj))
+	{
+	  Elf_Internal_Dyn dyn;
+	  const char *name;
+	  size_t elemsize;
+	  asection *s;
+	  bfd_boolean swap_out_p;
+
+	  /* Read in the current dynamic entry.  */
+	  (*get_elf_backend_data (dynobj)->s->swap_dyn_in) (dynobj, b, &dyn);
+
+	  /* Assume that we're going to modify it and write it out.  */
+	  swap_out_p = TRUE;
+
+	  switch (dyn.d_tag)
+	    {
+	    case DT_RELENT:
+	      dyn.d_un.d_val = MIPS_ELF_REL_SIZE (dynobj);
+	      break;
+
+	    case DT_RELAENT:
+	      BFD_ASSERT (htab->is_vxworks);
+	      dyn.d_un.d_val = MIPS_ELF_RELA_SIZE (dynobj);
+	      break;
+
+	    case DT_STRSZ:
+	      /* Rewrite DT_STRSZ.  */
+	      dyn.d_un.d_val =
+		_bfd_elf_strtab_size (elf_hash_table (info)->dynstr);
+	      break;
+
+	    case DT_PLTGOT:
+	      s = htab->sgot;
+	      dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+	      break;
+
+	    case DT_MIPS_PLTGOT:
+	      s = htab->sgotplt;
+	      dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+	      break;
+
+	    case DT_MIPS_RLD_VERSION:
+	      dyn.d_un.d_val = 1; /* XXX */
+	      break;
+
+	    case DT_MIPS_FLAGS:
+	      dyn.d_un.d_val = RHF_NOTPOT; /* XXX */
+	      break;
+
+	    case DT_MIPS_TIME_STAMP:
+	      {
+		time_t t;
+		time (&t);
+		dyn.d_un.d_val = t;
+	      }
+	      break;
+
+	    case DT_MIPS_ICHECKSUM:
+	      /* XXX FIXME: */
+	      swap_out_p = FALSE;
+	      break;
+
+	    case DT_MIPS_IVERSION:
+	      /* XXX FIXME: */
+	      swap_out_p = FALSE;
+	      break;
+
+	    case DT_MIPS_BASE_ADDRESS:
+	      s = output_bfd->sections;
+	      BFD_ASSERT (s != NULL);
+	      dyn.d_un.d_ptr = s->vma & ~(bfd_vma) 0xffff;
+	      break;
+
+	    case DT_MIPS_LOCAL_GOTNO:
+	      dyn.d_un.d_val = g->local_gotno;
+	      break;
+
+	    case DT_MIPS_UNREFEXTNO:
+	      /* The index into the dynamic symbol table which is the
+		 entry of the first external symbol that is not
+		 referenced within the same object.  */
+	      dyn.d_un.d_val = bfd_count_sections (output_bfd) + 1;
+	      break;
+
+	    case DT_MIPS_GOTSYM:
+	      if (gg->global_gotsym)
+		{
+		  dyn.d_un.d_val = gg->global_gotsym->dynindx;
+		  break;
+		}
+	      /* In case if we don't have global got symbols we default
+		 to setting DT_MIPS_GOTSYM to the same value as
+		 DT_MIPS_SYMTABNO, so we just fall through.  */
+
+	    case DT_MIPS_SYMTABNO:
+	      name = ".dynsym";
+	      elemsize = MIPS_ELF_SYM_SIZE (output_bfd);
+	      s = bfd_get_section_by_name (output_bfd, name);
+	      BFD_ASSERT (s != NULL);
+
+	      dyn.d_un.d_val = s->size / elemsize;
+	      break;
+
+	    case DT_MIPS_HIPAGENO:
+	      dyn.d_un.d_val = g->local_gotno - htab->reserved_gotno;
+	      break;
+
+	    case DT_MIPS_RLD_MAP:
+	      dyn.d_un.d_ptr = mips_elf_hash_table (info)->rld_value;
+	      break;
+
+	    case DT_MIPS_OPTIONS:
+	      s = (bfd_get_section_by_name
+		   (output_bfd, MIPS_ELF_OPTIONS_SECTION_NAME (output_bfd)));
+	      dyn.d_un.d_ptr = s->vma;
+	      break;
+
+	    case DT_RELASZ:
+	      BFD_ASSERT (htab->is_vxworks);
+	      /* The count does not include the JUMP_SLOT relocations.  */
+	      if (htab->srelplt)
+		dyn.d_un.d_val -= htab->srelplt->size;
+	      break;
+
+	    case DT_PLTREL:
+	      BFD_ASSERT (htab->use_plts_and_copy_relocs);
+	      if (htab->is_vxworks)
+		dyn.d_un.d_val = DT_RELA;
+	      else
+		dyn.d_un.d_val = DT_REL;
+	      break;
+
+	    case DT_PLTRELSZ:
+	      BFD_ASSERT (htab->use_plts_and_copy_relocs);
+	      dyn.d_un.d_val = htab->srelplt->size;
+	      break;
+
+	    case DT_JMPREL:
+	      BFD_ASSERT (htab->use_plts_and_copy_relocs);
+	      dyn.d_un.d_ptr = (htab->srelplt->output_section->vma
+				+ htab->srelplt->output_offset);
+	      break;
+
+	    case DT_TEXTREL:
+	      /* If we didn't need any text relocations after all, delete
+		 the dynamic tag.  */
+	      if (!(info->flags & DF_TEXTREL))
+		{
+		  dyn_to_skip = MIPS_ELF_DYN_SIZE (dynobj);
+		  swap_out_p = FALSE;
+		}
+	      break;
+
+	    case DT_FLAGS:
+	      /* If we didn't need any text relocations after all, clear
+		 DF_TEXTREL from DT_FLAGS.  */
+	      if (!(info->flags & DF_TEXTREL))
+		dyn.d_un.d_val &= ~DF_TEXTREL;
+	      else
+		swap_out_p = FALSE;
+	      break;
+
+	    default:
+	      swap_out_p = FALSE;
+	      if (htab->is_vxworks
+		  && elf_vxworks_finish_dynamic_entry (output_bfd, &dyn))
+		swap_out_p = TRUE;
+	      break;
+	    }
+
+	  if (swap_out_p || dyn_skipped)
+	    (*get_elf_backend_data (dynobj)->s->swap_dyn_out)
+	      (dynobj, &dyn, b - dyn_skipped);
+
+	  if (dyn_to_skip)
+	    {
+	      dyn_skipped += dyn_to_skip;
+	      dyn_to_skip = 0;
+	    }
+	}
+
+      /* Wipe out any trailing entries if we shifted down a dynamic tag.  */
+      if (dyn_skipped > 0)
+	memset (b - dyn_skipped, 0, dyn_skipped);
+    }
+
+  if (sgot != NULL && sgot->size > 0
+      && !bfd_is_abs_section (sgot->output_section))
+    {
+      if (htab->is_vxworks)
+	{
+	  /* The first entry of the global offset table points to the
+	     ".dynamic" section.  The second is initialized by the
+	     loader and contains the shared library identifier.
+	     The third is also initialized by the loader and points
+	     to the lazy resolution stub.  */
+	  MIPS_ELF_PUT_WORD (output_bfd,
+			     sdyn->output_offset + sdyn->output_section->vma,
+			     sgot->contents);
+	  MIPS_ELF_PUT_WORD (output_bfd, 0,
+			     sgot->contents + MIPS_ELF_GOT_SIZE (output_bfd));
+	  MIPS_ELF_PUT_WORD (output_bfd, 0,
+			     sgot->contents
+			     + 2 * MIPS_ELF_GOT_SIZE (output_bfd));
+	}
+      else
+	{
+	  /* The first entry of the global offset table will be filled at
+	     runtime. The second entry will be used by some runtime loaders.
+	     This isn't the case of IRIX rld.  */
+	  MIPS_ELF_PUT_WORD (output_bfd, (bfd_vma) 0, sgot->contents);
+	  MIPS_ELF_PUT_WORD (output_bfd, MIPS_ELF_GNU_GOT1_MASK (output_bfd),
+			     sgot->contents + MIPS_ELF_GOT_SIZE (output_bfd));
+	}
+
+      elf_section_data (sgot->output_section)->this_hdr.sh_entsize
+	 = MIPS_ELF_GOT_SIZE (output_bfd);
+    }
+
+  /* Generate dynamic relocations for the non-primary gots.  */
+  if (gg != NULL && gg->next)
+    {
+      Elf_Internal_Rela rel[3];
+      bfd_vma addend = 0;
+
+      memset (rel, 0, sizeof (rel));
+      rel[0].r_info = ELF_R_INFO (output_bfd, 0, R_MIPS_REL32);
+
+      for (g = gg->next; g->next != gg; g = g->next)
+	{
+	  bfd_vma got_index = g->next->local_gotno + g->next->global_gotno
+	    + g->next->tls_gotno;
+
+	  MIPS_ELF_PUT_WORD (output_bfd, 0, sgot->contents
+			     + got_index++ * MIPS_ELF_GOT_SIZE (output_bfd));
+	  MIPS_ELF_PUT_WORD (output_bfd, MIPS_ELF_GNU_GOT1_MASK (output_bfd),
+			     sgot->contents
+			     + got_index++ * MIPS_ELF_GOT_SIZE (output_bfd));
+
+	  if (! info->shared)
+	    continue;
+
+	  while (got_index < g->assigned_gotno)
+	    {
+	      rel[0].r_offset = rel[1].r_offset = rel[2].r_offset
+		= got_index++ * MIPS_ELF_GOT_SIZE (output_bfd);
+	      if (!(mips_elf_create_dynamic_relocation
+		    (output_bfd, info, rel, NULL,
+		     bfd_abs_section_ptr,
+		     0, &addend, sgot)))
+		return FALSE;
+	      BFD_ASSERT (addend == 0);
+	    }
+	}
+    }
+
+  /* The generation of dynamic relocations for the non-primary gots
+     adds more dynamic relocations.  We cannot count them until
+     here.  */
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      bfd_byte *b;
+      bfd_boolean swap_out_p;
+
+      BFD_ASSERT (sdyn != NULL);
+
+      for (b = sdyn->contents;
+	   b < sdyn->contents + sdyn->size;
+	   b += MIPS_ELF_DYN_SIZE (dynobj))
+	{
+	  Elf_Internal_Dyn dyn;
+	  asection *s;
+
+	  /* Read in the current dynamic entry.  */
+	  (*get_elf_backend_data (dynobj)->s->swap_dyn_in) (dynobj, b, &dyn);
+
+	  /* Assume that we're going to modify it and write it out.  */
+	  swap_out_p = TRUE;
+
+	  switch (dyn.d_tag)
+	    {
+	    case DT_RELSZ:
+	      /* Reduce DT_RELSZ to account for any relocations we
+		 decided not to make.  This is for the n64 irix rld,
+		 which doesn't seem to apply any relocations if there
+		 are trailing null entries.  */
+	      s = mips_elf_rel_dyn_section (info, FALSE);
+	      dyn.d_un.d_val = (s->reloc_count
+				* (ABI_64_P (output_bfd)
+				   ? sizeof (Elf64_Mips_External_Rel)
+				   : sizeof (Elf32_External_Rel)));
+	      /* Adjust the section size too.  Tools like the prelinker
+		 can reasonably expect the values to the same.  */
+	      elf_section_data (s->output_section)->this_hdr.sh_size
+		= dyn.d_un.d_val;
+	      break;
+
+	    default:
+	      swap_out_p = FALSE;
+	      break;
+	    }
+
+	  if (swap_out_p)
+	    (*get_elf_backend_data (dynobj)->s->swap_dyn_out)
+	      (dynobj, &dyn, b);
+	}
+    }
+
+  {
+    asection *s;
+    Elf32_compact_rel cpt;
+
+    if (SGI_COMPAT (output_bfd))
+      {
+	/* Write .compact_rel section out.  */
+	s = bfd_get_section_by_name (dynobj, ".compact_rel");
+	if (s != NULL)
+	  {
+	    cpt.id1 = 1;
+	    cpt.num = s->reloc_count;
+	    cpt.id2 = 2;
+	    cpt.offset = (s->output_section->filepos
+			  + sizeof (Elf32_External_compact_rel));
+	    cpt.reserved0 = 0;
+	    cpt.reserved1 = 0;
+	    bfd_elf32_swap_compact_rel_out (output_bfd, &cpt,
+					    ((Elf32_External_compact_rel *)
+					     s->contents));
+
+	    /* Clean up a dummy stub function entry in .text.  */
+	    if (htab->sstubs != NULL)
+	      {
+		file_ptr dummy_offset;
+
+		BFD_ASSERT (htab->sstubs->size >= htab->function_stub_size);
+		dummy_offset = htab->sstubs->size - htab->function_stub_size;
+		memset (htab->sstubs->contents + dummy_offset, 0,
+			htab->function_stub_size);
+	      }
+	  }
+      }
+
+    /* The psABI says that the dynamic relocations must be sorted in
+       increasing order of r_symndx.  The VxWorks EABI doesn't require
+       this, and because the code below handles REL rather than RELA
+       relocations, using it for VxWorks would be outright harmful.  */
+    if (!htab->is_vxworks)
+      {
+	s = mips_elf_rel_dyn_section (info, FALSE);
+	if (s != NULL
+	    && s->size > (bfd_vma)2 * MIPS_ELF_REL_SIZE (output_bfd))
+	  {
+	    reldyn_sorting_bfd = output_bfd;
+
+	    if (ABI_64_P (output_bfd))
+	      qsort ((Elf64_External_Rel *) s->contents + 1,
+		     s->reloc_count - 1, sizeof (Elf64_Mips_External_Rel),
+		     sort_dynamic_relocs_64);
+	    else
+	      qsort ((Elf32_External_Rel *) s->contents + 1,
+		     s->reloc_count - 1, sizeof (Elf32_External_Rel),
+		     sort_dynamic_relocs);
+	  }
+      }
+  }
+
+  if (htab->splt && htab->splt->size > 0)
+    {
+      if (htab->is_vxworks)
+	{
+	  if (info->shared)
+	    mips_vxworks_finish_shared_plt (output_bfd, info);
+	  else
+	    mips_vxworks_finish_exec_plt (output_bfd, info);
+	}
+      else
+	{
+	  BFD_ASSERT (!info->shared);
+	  mips_finish_exec_plt (output_bfd, info);
+	}
+    }
+  return TRUE;
+}
+
+
+/* Set ABFD's EF_MIPS_ARCH and EF_MIPS_MACH flags.  */
+
+static void
+mips_set_isa_flags (bfd *abfd)
+{
+  flagword val;
+
+  switch (bfd_get_mach (abfd))
+    {
+    default:
+    case bfd_mach_mips3000:
+      val = E_MIPS_ARCH_1;
+      break;
+
+    case bfd_mach_mips3900:
+      val = E_MIPS_ARCH_1 | E_MIPS_MACH_3900;
+      break;
+
+    case bfd_mach_mips6000:
+      val = E_MIPS_ARCH_2;
+      break;
+
+    case bfd_mach_mips4000:
+    case bfd_mach_mips4300:
+    case bfd_mach_mips4400:
+    case bfd_mach_mips4600:
+      val = E_MIPS_ARCH_3;
+      break;
+
+    case bfd_mach_mips4010:
+      val = E_MIPS_ARCH_3 | E_MIPS_MACH_4010;
+      break;
+
+    case bfd_mach_mips4100:
+      val = E_MIPS_ARCH_3 | E_MIPS_MACH_4100;
+      break;
+
+    case bfd_mach_mips4111:
+      val = E_MIPS_ARCH_3 | E_MIPS_MACH_4111;
+      break;
+
+    case bfd_mach_mips4120:
+      val = E_MIPS_ARCH_3 | E_MIPS_MACH_4120;
+      break;
+
+    case bfd_mach_mips4650:
+      val = E_MIPS_ARCH_3 | E_MIPS_MACH_4650;
+      break;
+
+    case bfd_mach_mips5400:
+      val = E_MIPS_ARCH_4 | E_MIPS_MACH_5400;
+      break;
+
+    case bfd_mach_mips5500:
+      val = E_MIPS_ARCH_4 | E_MIPS_MACH_5500;
+      break;
+
+    case bfd_mach_mips9000:
+      val = E_MIPS_ARCH_4 | E_MIPS_MACH_9000;
+      break;
+
+    case bfd_mach_mips5000:
+    case bfd_mach_mips7000:
+    case bfd_mach_mips8000:
+    case bfd_mach_mips10000:
+    case bfd_mach_mips12000:
+    case bfd_mach_mips14000:
+    case bfd_mach_mips16000:
+      val = E_MIPS_ARCH_4;
+      break;
+
+    case bfd_mach_mips5:
+      val = E_MIPS_ARCH_5;
+      break;
+
+    case bfd_mach_mips_loongson_2e:
+      val = E_MIPS_ARCH_3 | E_MIPS_MACH_LS2E;
+      break;
+
+    case bfd_mach_mips_loongson_2f:
+      val = E_MIPS_ARCH_3 | E_MIPS_MACH_LS2F;
+      break;
+
+    case bfd_mach_mips_sb1:
+      val = E_MIPS_ARCH_64 | E_MIPS_MACH_SB1;
+      break;
+
+    case bfd_mach_mips_loongson_3a:
+      val = E_MIPS_ARCH_64 | E_MIPS_MACH_LS3A;
+      break;
+
+    case bfd_mach_mips_octeon:
+      val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON;
+      break;
+
+    case bfd_mach_mips_xlr:
+      val = E_MIPS_ARCH_64 | E_MIPS_MACH_XLR;
+      break;
+
+    case bfd_mach_mipsisa32:
+      val = E_MIPS_ARCH_32;
+      break;
+
+    case bfd_mach_mipsisa64:
+      val = E_MIPS_ARCH_64;
+      break;
+
+    case bfd_mach_mipsisa32r2:
+      val = E_MIPS_ARCH_32R2;
+      break;
+
+    case bfd_mach_mipsisa64r2:
+      val = E_MIPS_ARCH_64R2;
+      break;
+    }
+  elf_elfheader (abfd)->e_flags &= ~(EF_MIPS_ARCH | EF_MIPS_MACH);
+  elf_elfheader (abfd)->e_flags |= val;
+
+}
+
+
+/* The final processing done just before writing out a MIPS ELF object
+   file.  This gets the MIPS architecture right based on the machine
+   number.  This is used by both the 32-bit and the 64-bit ABI.  */
+
+void
+_bfd_mips_elf_final_write_processing (bfd *abfd,
+				      bfd_boolean linker ATTRIBUTE_UNUSED)
+{
+  unsigned int i;
+  Elf_Internal_Shdr **hdrpp;
+  const char *name;
+  asection *sec;
+
+  /* Keep the existing EF_MIPS_MACH and EF_MIPS_ARCH flags if the former
+     is nonzero.  This is for compatibility with old objects, which used
+     a combination of a 32-bit EF_MIPS_ARCH and a 64-bit EF_MIPS_MACH.  */
+  if ((elf_elfheader (abfd)->e_flags & EF_MIPS_MACH) == 0)
+    mips_set_isa_flags (abfd);
+
+  /* Set the sh_info field for .gptab sections and other appropriate
+     info for each special section.  */
+  for (i = 1, hdrpp = elf_elfsections (abfd) + 1;
+       i < elf_numsections (abfd);
+       i++, hdrpp++)
+    {
+      switch ((*hdrpp)->sh_type)
+	{
+	case SHT_MIPS_MSYM:
+	case SHT_MIPS_LIBLIST:
+	  sec = bfd_get_section_by_name (abfd, ".dynstr");
+	  if (sec != NULL)
+	    (*hdrpp)->sh_link = elf_section_data (sec)->this_idx;
+	  break;
+
+	case SHT_MIPS_GPTAB:
+	  BFD_ASSERT ((*hdrpp)->bfd_section != NULL);
+	  name = bfd_get_section_name (abfd, (*hdrpp)->bfd_section);
+	  BFD_ASSERT (name != NULL
+		      && CONST_STRNEQ (name, ".gptab."));
+	  sec = bfd_get_section_by_name (abfd, name + sizeof ".gptab" - 1);
+	  BFD_ASSERT (sec != NULL);
+	  (*hdrpp)->sh_info = elf_section_data (sec)->this_idx;
+	  break;
+
+	case SHT_MIPS_CONTENT:
+	  BFD_ASSERT ((*hdrpp)->bfd_section != NULL);
+	  name = bfd_get_section_name (abfd, (*hdrpp)->bfd_section);
+	  BFD_ASSERT (name != NULL
+		      && CONST_STRNEQ (name, ".MIPS.content"));
+	  sec = bfd_get_section_by_name (abfd,
+					 name + sizeof ".MIPS.content" - 1);
+	  BFD_ASSERT (sec != NULL);
+	  (*hdrpp)->sh_link = elf_section_data (sec)->this_idx;
+	  break;
+
+	case SHT_MIPS_SYMBOL_LIB:
+	  sec = bfd_get_section_by_name (abfd, ".dynsym");
+	  if (sec != NULL)
+	    (*hdrpp)->sh_link = elf_section_data (sec)->this_idx;
+	  sec = bfd_get_section_by_name (abfd, ".liblist");
+	  if (sec != NULL)
+	    (*hdrpp)->sh_info = elf_section_data (sec)->this_idx;
+	  break;
+
+	case SHT_MIPS_EVENTS:
+	  BFD_ASSERT ((*hdrpp)->bfd_section != NULL);
+	  name = bfd_get_section_name (abfd, (*hdrpp)->bfd_section);
+	  BFD_ASSERT (name != NULL);
+	  if (CONST_STRNEQ (name, ".MIPS.events"))
+	    sec = bfd_get_section_by_name (abfd,
+					   name + sizeof ".MIPS.events" - 1);
+	  else
+	    {
+	      BFD_ASSERT (CONST_STRNEQ (name, ".MIPS.post_rel"));
+	      sec = bfd_get_section_by_name (abfd,
+					     (name
+					      + sizeof ".MIPS.post_rel" - 1));
+	    }
+	  BFD_ASSERT (sec != NULL);
+	  (*hdrpp)->sh_link = elf_section_data (sec)->this_idx;
+	  break;
+
+	}
+    }
+}
+
+/* When creating an IRIX5 executable, we need REGINFO and RTPROC
+   segments.  */
+
+int
+_bfd_mips_elf_additional_program_headers (bfd *abfd,
+					  struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  asection *s;
+  int ret = 0;
+
+  /* See if we need a PT_MIPS_REGINFO segment.  */
+  s = bfd_get_section_by_name (abfd, ".reginfo");
+  if (s && (s->flags & SEC_LOAD))
+    ++ret;
+
+  /* See if we need a PT_MIPS_OPTIONS segment.  */
+  if (IRIX_COMPAT (abfd) == ict_irix6
+      && bfd_get_section_by_name (abfd,
+				  MIPS_ELF_OPTIONS_SECTION_NAME (abfd)))
+    ++ret;
+
+  /* See if we need a PT_MIPS_RTPROC segment.  */
+  if (IRIX_COMPAT (abfd) == ict_irix5
+      && bfd_get_section_by_name (abfd, ".dynamic")
+      && bfd_get_section_by_name (abfd, ".mdebug"))
+    ++ret;
+
+  /* Allocate a PT_NULL header in dynamic objects.  See
+     _bfd_mips_elf_modify_segment_map for details.  */
+  if (!SGI_COMPAT (abfd)
+      && bfd_get_section_by_name (abfd, ".dynamic"))
+    ++ret;
+
+  return ret;
+}
+
+/* Modify the segment map for an IRIX5 executable.  */
+
+bfd_boolean
+_bfd_mips_elf_modify_segment_map (bfd *abfd,
+				  struct bfd_link_info *info)
+{
+  asection *s;
+  struct elf_segment_map *m, **pm;
+  bfd_size_type amt;
+
+  /* If there is a .reginfo section, we need a PT_MIPS_REGINFO
+     segment.  */
+  s = bfd_get_section_by_name (abfd, ".reginfo");
+  if (s != NULL && (s->flags & SEC_LOAD) != 0)
+    {
+      for (m = elf_tdata (abfd)->segment_map; m != NULL; m = m->next)
+	if (m->p_type == PT_MIPS_REGINFO)
+	  break;
+      if (m == NULL)
+	{
+	  amt = sizeof *m;
+	  m = bfd_zalloc (abfd, amt);
+	  if (m == NULL)
+	    return FALSE;
+
+	  m->p_type = PT_MIPS_REGINFO;
+	  m->count = 1;
+	  m->sections[0] = s;
+
+	  /* We want to put it after the PHDR and INTERP segments.  */
+	  pm = &elf_tdata (abfd)->segment_map;
+	  while (*pm != NULL
+		 && ((*pm)->p_type == PT_PHDR
+		     || (*pm)->p_type == PT_INTERP))
+	    pm = &(*pm)->next;
+
+	  m->next = *pm;
+	  *pm = m;
+	}
+    }
+
+  /* For IRIX 6, we don't have .mdebug sections, nor does anything but
+     .dynamic end up in PT_DYNAMIC.  However, we do have to insert a
+     PT_MIPS_OPTIONS segment immediately following the program header
+     table.  */
+  if (NEWABI_P (abfd)
+      /* On non-IRIX6 new abi, we'll have already created a segment
+	 for this section, so don't create another.  I'm not sure this
+	 is not also the case for IRIX 6, but I can't test it right
+	 now.  */
+      && IRIX_COMPAT (abfd) == ict_irix6)
+    {
+      for (s = abfd->sections; s; s = s->next)
+	if (elf_section_data (s)->this_hdr.sh_type == SHT_MIPS_OPTIONS)
+	  break;
+
+      if (s)
+	{
+	  struct elf_segment_map *options_segment;
+
+	  pm = &elf_tdata (abfd)->segment_map;
+	  while (*pm != NULL
+		 && ((*pm)->p_type == PT_PHDR
+		     || (*pm)->p_type == PT_INTERP))
+	    pm = &(*pm)->next;
+
+	  if (*pm == NULL || (*pm)->p_type != PT_MIPS_OPTIONS)
+	    {
+	      amt = sizeof (struct elf_segment_map);
+	      options_segment = bfd_zalloc (abfd, amt);
+	      options_segment->next = *pm;
+	      options_segment->p_type = PT_MIPS_OPTIONS;
+	      options_segment->p_flags = PF_R;
+	      options_segment->p_flags_valid = TRUE;
+	      options_segment->count = 1;
+	      options_segment->sections[0] = s;
+	      *pm = options_segment;
+	    }
+	}
+    }
+  else
+    {
+      if (IRIX_COMPAT (abfd) == ict_irix5)
+	{
+	  /* If there are .dynamic and .mdebug sections, we make a room
+	     for the RTPROC header.  FIXME: Rewrite without section names.  */
+	  if (bfd_get_section_by_name (abfd, ".interp") == NULL
+	      && bfd_get_section_by_name (abfd, ".dynamic") != NULL
+	      && bfd_get_section_by_name (abfd, ".mdebug") != NULL)
+	    {
+	      for (m = elf_tdata (abfd)->segment_map; m != NULL; m = m->next)
+		if (m->p_type == PT_MIPS_RTPROC)
+		  break;
+	      if (m == NULL)
+		{
+		  amt = sizeof *m;
+		  m = bfd_zalloc (abfd, amt);
+		  if (m == NULL)
+		    return FALSE;
+
+		  m->p_type = PT_MIPS_RTPROC;
+
+		  s = bfd_get_section_by_name (abfd, ".rtproc");
+		  if (s == NULL)
+		    {
+		      m->count = 0;
+		      m->p_flags = 0;
+		      m->p_flags_valid = 1;
+		    }
+		  else
+		    {
+		      m->count = 1;
+		      m->sections[0] = s;
+		    }
+
+		  /* We want to put it after the DYNAMIC segment.  */
+		  pm = &elf_tdata (abfd)->segment_map;
+		  while (*pm != NULL && (*pm)->p_type != PT_DYNAMIC)
+		    pm = &(*pm)->next;
+		  if (*pm != NULL)
+		    pm = &(*pm)->next;
+
+		  m->next = *pm;
+		  *pm = m;
+		}
+	    }
+	}
+      /* On IRIX5, the PT_DYNAMIC segment includes the .dynamic,
+	 .dynstr, .dynsym, and .hash sections, and everything in
+	 between.  */
+      for (pm = &elf_tdata (abfd)->segment_map; *pm != NULL;
+	   pm = &(*pm)->next)
+	if ((*pm)->p_type == PT_DYNAMIC)
+	  break;
+      m = *pm;
+      if (m != NULL && IRIX_COMPAT (abfd) == ict_none)
+	{
+	  /* For a normal mips executable the permissions for the PT_DYNAMIC
+	     segment are read, write and execute. We do that here since
+	     the code in elf.c sets only the read permission. This matters
+	     sometimes for the dynamic linker.  */
+	  if (bfd_get_section_by_name (abfd, ".dynamic") != NULL)
+	    {
+	      m->p_flags = PF_R | PF_W | PF_X;
+	      m->p_flags_valid = 1;
+	    }
+	}
+      /* GNU/Linux binaries do not need the extended PT_DYNAMIC section.
+	 glibc's dynamic linker has traditionally derived the number of
+	 tags from the p_filesz field, and sometimes allocates stack
+	 arrays of that size.  An overly-big PT_DYNAMIC segment can
+	 be actively harmful in such cases.  Making PT_DYNAMIC contain
+	 other sections can also make life hard for the prelinker,
+	 which might move one of the other sections to a different
+	 PT_LOAD segment.  */
+      if (SGI_COMPAT (abfd)
+	  && m != NULL
+	  && m->count == 1
+	  && strcmp (m->sections[0]->name, ".dynamic") == 0)
+	{
+	  static const char *sec_names[] =
+	  {
+	    ".dynamic", ".dynstr", ".dynsym", ".hash"
+	  };
+	  bfd_vma low, high;
+	  unsigned int i, c;
+	  struct elf_segment_map *n;
+
+	  low = ~(bfd_vma) 0;
+	  high = 0;
+	  for (i = 0; i < sizeof sec_names / sizeof sec_names[0]; i++)
+	    {
+	      s = bfd_get_section_by_name (abfd, sec_names[i]);
+	      if (s != NULL && (s->flags & SEC_LOAD) != 0)
+		{
+		  bfd_size_type sz;
+
+		  if (low > s->vma)
+		    low = s->vma;
+		  sz = s->size;
+		  if (high < s->vma + sz)
+		    high = s->vma + sz;
+		}
+	    }
+
+	  c = 0;
+	  for (s = abfd->sections; s != NULL; s = s->next)
+	    if ((s->flags & SEC_LOAD) != 0
+		&& s->vma >= low
+		&& s->vma + s->size <= high)
+	      ++c;
+
+	  amt = sizeof *n + (bfd_size_type) (c - 1) * sizeof (asection *);
+	  n = bfd_zalloc (abfd, amt);
+	  if (n == NULL)
+	    return FALSE;
+	  *n = *m;
+	  n->count = c;
+
+	  i = 0;
+	  for (s = abfd->sections; s != NULL; s = s->next)
+	    {
+	      if ((s->flags & SEC_LOAD) != 0
+		  && s->vma >= low
+		  && s->vma + s->size <= high)
+		{
+		  n->sections[i] = s;
+		  ++i;
+		}
+	    }
+
+	  *pm = n;
+	}
+    }
+
+  /* Allocate a spare program header in dynamic objects so that tools
+     like the prelinker can add an extra PT_LOAD entry.
+
+     If the prelinker needs to make room for a new PT_LOAD entry, its
+     standard procedure is to move the first (read-only) sections into
+     the new (writable) segment.  However, the MIPS ABI requires
+     .dynamic to be in a read-only segment, and the section will often
+     start within sizeof (ElfNN_Phdr) bytes of the last program header.
+
+     Although the prelinker could in principle move .dynamic to a
+     writable segment, it seems better to allocate a spare program
+     header instead, and avoid the need to move any sections.
+     There is a long tradition of allocating spare dynamic tags,
+     so allocating a spare program header seems like a natural
+     extension.
+
+     If INFO is NULL, we may be copying an already prelinked binary
+     with objcopy or strip, so do not add this header.  */
+  if (info != NULL
+      && !SGI_COMPAT (abfd)
+      && bfd_get_section_by_name (abfd, ".dynamic"))
+    {
+      for (pm = &elf_tdata (abfd)->segment_map; *pm != NULL; pm = &(*pm)->next)
+	if ((*pm)->p_type == PT_NULL)
+	  break;
+      if (*pm == NULL)
+	{
+	  m = bfd_zalloc (abfd, sizeof (*m));
+	  if (m == NULL)
+	    return FALSE;
+
+	  m->p_type = PT_NULL;
+	  *pm = m;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Return the section that should be marked against GC for a given
+   relocation.  */
+
+asection *
+_bfd_mips_elf_gc_mark_hook (asection *sec,
+			    struct bfd_link_info *info,
+			    Elf_Internal_Rela *rel,
+			    struct elf_link_hash_entry *h,
+			    Elf_Internal_Sym *sym)
+{
+  /* ??? Do mips16 stub sections need to be handled special?  */
+
+  if (h != NULL)
+    switch (ELF_R_TYPE (sec->owner, rel->r_info))
+      {
+      case R_MIPS_GNU_VTINHERIT:
+      case R_MIPS_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Update the got entry reference counts for the section being removed.  */
+
+bfd_boolean
+_bfd_mips_elf_gc_sweep_hook (bfd *abfd ATTRIBUTE_UNUSED,
+			     struct bfd_link_info *info ATTRIBUTE_UNUSED,
+			     asection *sec ATTRIBUTE_UNUSED,
+			     const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED)
+{
+#if 0
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  const Elf_Internal_Rela *rel, *relend;
+  unsigned long r_symndx;
+  struct elf_link_hash_entry *h;
+
+  if (info->relocatable)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    switch (ELF_R_TYPE (abfd, rel->r_info))
+      {
+      case R_MIPS16_GOT16:
+      case R_MIPS16_CALL16:
+      case R_MIPS_GOT16:
+      case R_MIPS_CALL16:
+      case R_MIPS_CALL_HI16:
+      case R_MIPS_CALL_LO16:
+      case R_MIPS_GOT_HI16:
+      case R_MIPS_GOT_LO16:
+      case R_MIPS_GOT_DISP:
+      case R_MIPS_GOT_PAGE:
+      case R_MIPS_GOT_OFST:
+      case R_MICROMIPS_GOT16:
+      case R_MICROMIPS_CALL16:
+      case R_MICROMIPS_CALL_HI16:
+      case R_MICROMIPS_CALL_LO16:
+      case R_MICROMIPS_GOT_HI16:
+      case R_MICROMIPS_GOT_LO16:
+      case R_MICROMIPS_GOT_DISP:
+      case R_MICROMIPS_GOT_PAGE:
+      case R_MICROMIPS_GOT_OFST:
+	/* ??? It would seem that the existing MIPS code does no sort
+	   of reference counting or whatnot on its GOT and PLT entries,
+	   so it is not possible to garbage collect them at this time.  */
+	break;
+
+      default:
+	break;
+      }
+#endif
+
+  return TRUE;
+}
+
+/* Copy data from a MIPS ELF indirect symbol to its direct symbol,
+   hiding the old indirect symbol.  Process additional relocation
+   information.  Also called for weakdefs, in which case we just let
+   _bfd_elf_link_hash_copy_indirect copy the flags for us.  */
+
+void
+_bfd_mips_elf_copy_indirect_symbol (struct bfd_link_info *info,
+				    struct elf_link_hash_entry *dir,
+				    struct elf_link_hash_entry *ind)
+{
+  struct mips_elf_link_hash_entry *dirmips, *indmips;
+
+  _bfd_elf_link_hash_copy_indirect (info, dir, ind);
+
+  dirmips = (struct mips_elf_link_hash_entry *) dir;
+  indmips = (struct mips_elf_link_hash_entry *) ind;
+  /* Any absolute non-dynamic relocations against an indirect or weak
+     definition will be against the target symbol.  */
+  if (indmips->has_static_relocs)
+    dirmips->has_static_relocs = TRUE;
+
+  if (ind->root.type != bfd_link_hash_indirect)
+    return;
+
+  dirmips->possibly_dynamic_relocs += indmips->possibly_dynamic_relocs;
+  if (indmips->readonly_reloc)
+    dirmips->readonly_reloc = TRUE;
+  if (indmips->no_fn_stub)
+    dirmips->no_fn_stub = TRUE;
+  if (indmips->fn_stub)
+    {
+      dirmips->fn_stub = indmips->fn_stub;
+      indmips->fn_stub = NULL;
+    }
+  if (indmips->need_fn_stub)
+    {
+      dirmips->need_fn_stub = TRUE;
+      indmips->need_fn_stub = FALSE;
+    }
+  if (indmips->call_stub)
+    {
+      dirmips->call_stub = indmips->call_stub;
+      indmips->call_stub = NULL;
+    }
+  if (indmips->call_fp_stub)
+    {
+      dirmips->call_fp_stub = indmips->call_fp_stub;
+      indmips->call_fp_stub = NULL;
+    }
+  if (indmips->global_got_area < dirmips->global_got_area)
+    dirmips->global_got_area = indmips->global_got_area;
+  if (indmips->global_got_area < GGA_NONE)
+    indmips->global_got_area = GGA_NONE;
+  if (indmips->has_nonpic_branches)
+    dirmips->has_nonpic_branches = TRUE;
+
+  if (dirmips->tls_type == 0)
+    dirmips->tls_type = indmips->tls_type;
+}
+
+#define PDR_SIZE 32
+
+bfd_boolean
+_bfd_mips_elf_discard_info (bfd *abfd, struct elf_reloc_cookie *cookie,
+			    struct bfd_link_info *info)
+{
+  asection *o;
+  bfd_boolean ret = FALSE;
+  unsigned char *tdata;
+  size_t i, skip;
+
+  o = bfd_get_section_by_name (abfd, ".pdr");
+  if (! o)
+    return FALSE;
+  if (o->size == 0)
+    return FALSE;
+  if (o->size % PDR_SIZE != 0)
+    return FALSE;
+  if (o->output_section != NULL
+      && bfd_is_abs_section (o->output_section))
+    return FALSE;
+
+  tdata = bfd_zmalloc (o->size / PDR_SIZE);
+  if (! tdata)
+    return FALSE;
+
+  cookie->rels = _bfd_elf_link_read_relocs (abfd, o, NULL, NULL,
+					    info->keep_memory);
+  if (!cookie->rels)
+    {
+      free (tdata);
+      return FALSE;
+    }
+
+  cookie->rel = cookie->rels;
+  cookie->relend = cookie->rels + o->reloc_count;
+
+  for (i = 0, skip = 0; i < o->size / PDR_SIZE; i ++)
+    {
+      if (bfd_elf_reloc_symbol_deleted_p (i * PDR_SIZE, cookie))
+	{
+	  tdata[i] = 1;
+	  skip ++;
+	}
+    }
+
+  if (skip != 0)
+    {
+      mips_elf_section_data (o)->u.tdata = tdata;
+      o->size -= skip * PDR_SIZE;
+      ret = TRUE;
+    }
+  else
+    free (tdata);
+
+  if (! info->keep_memory)
+    free (cookie->rels);
+
+  return ret;
+}
+
+bfd_boolean
+_bfd_mips_elf_ignore_discarded_relocs (asection *sec)
+{
+  if (strcmp (sec->name, ".pdr") == 0)
+    return TRUE;
+  return FALSE;
+}
+
+bfd_boolean
+_bfd_mips_elf_write_section (bfd *output_bfd,
+			     struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
+                             asection *sec, bfd_byte *contents)
+{
+  bfd_byte *to, *from, *end;
+  int i;
+
+  if (strcmp (sec->name, ".pdr") != 0)
+    return FALSE;
+
+  if (mips_elf_section_data (sec)->u.tdata == NULL)
+    return FALSE;
+
+  to = contents;
+  end = contents + sec->size;
+  for (from = contents, i = 0;
+       from < end;
+       from += PDR_SIZE, i++)
+    {
+      if ((mips_elf_section_data (sec)->u.tdata)[i] == 1)
+	continue;
+      if (to != from)
+	memcpy (to, from, PDR_SIZE);
+      to += PDR_SIZE;
+    }
+  bfd_set_section_contents (output_bfd, sec->output_section, contents,
+			    sec->output_offset, sec->size);
+  return TRUE;
+}
+
+/* microMIPS code retains local labels for linker relaxation.  Omit them
+   from output by default for clarity.  */
+
+bfd_boolean
+_bfd_mips_elf_is_target_special_symbol (bfd *abfd, asymbol *sym)
+{
+  return _bfd_elf_is_local_label_name (abfd, sym->name);
+}
+
+/* MIPS ELF uses a special find_nearest_line routine in order the
+   handle the ECOFF debugging information.  */
+
+struct mips_elf_find_line
+{
+  struct ecoff_debug_info d;
+  struct ecoff_find_line i;
+};
+
+bfd_boolean
+_bfd_mips_elf_find_nearest_line (bfd *abfd, asection *section,
+				 asymbol **symbols, bfd_vma offset,
+				 const char **filename_ptr,
+				 const char **functionname_ptr,
+				 unsigned int *line_ptr)
+{
+  asection *msec;
+
+  if (_bfd_dwarf1_find_nearest_line (abfd, section, symbols, offset,
+				     filename_ptr, functionname_ptr,
+				     line_ptr))
+    return TRUE;
+
+  if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
+				     filename_ptr, functionname_ptr,
+				     line_ptr, ABI_64_P (abfd) ? 8 : 0,
+				     &elf_tdata (abfd)->dwarf2_find_line_info))
+    return TRUE;
+
+  msec = bfd_get_section_by_name (abfd, ".mdebug");
+  if (msec != NULL)
+    {
+      flagword origflags;
+      struct mips_elf_find_line *fi;
+      const struct ecoff_debug_swap * const swap =
+	get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;
+
+      /* If we are called during a link, mips_elf_final_link may have
+	 cleared the SEC_HAS_CONTENTS field.  We force it back on here
+	 if appropriate (which it normally will be).  */
+      origflags = msec->flags;
+      if (elf_section_data (msec)->this_hdr.sh_type != SHT_NOBITS)
+	msec->flags |= SEC_HAS_CONTENTS;
+
+      fi = elf_tdata (abfd)->find_line_info;
+      if (fi == NULL)
+	{
+	  bfd_size_type external_fdr_size;
+	  char *fraw_src;
+	  char *fraw_end;
+	  struct fdr *fdr_ptr;
+	  bfd_size_type amt = sizeof (struct mips_elf_find_line);
+
+	  fi = bfd_zalloc (abfd, amt);
+	  if (fi == NULL)
+	    {
+	      msec->flags = origflags;
+	      return FALSE;
+	    }
+
+	  if (! _bfd_mips_elf_read_ecoff_info (abfd, msec, &fi->d))
+	    {
+	      msec->flags = origflags;
+	      return FALSE;
+	    }
+
+	  /* Swap in the FDR information.  */
+	  amt = fi->d.symbolic_header.ifdMax * sizeof (struct fdr);
+	  fi->d.fdr = bfd_alloc (abfd, amt);
+	  if (fi->d.fdr == NULL)
+	    {
+	      msec->flags = origflags;
+	      return FALSE;
+	    }
+	  external_fdr_size = swap->external_fdr_size;
+	  fdr_ptr = fi->d.fdr;
+	  fraw_src = (char *) fi->d.external_fdr;
+	  fraw_end = (fraw_src
+		      + fi->d.symbolic_header.ifdMax * external_fdr_size);
+	  for (; fraw_src < fraw_end; fraw_src += external_fdr_size, fdr_ptr++)
+	    (*swap->swap_fdr_in) (abfd, fraw_src, fdr_ptr);
+
+	  elf_tdata (abfd)->find_line_info = fi;
+
+	  /* Note that we don't bother to ever free this information.
+             find_nearest_line is either called all the time, as in
+             objdump -l, so the information should be saved, or it is
+             rarely called, as in ld error messages, so the memory
+             wasted is unimportant.  Still, it would probably be a
+             good idea for free_cached_info to throw it away.  */
+	}
+
+      if (_bfd_ecoff_locate_line (abfd, section, offset, &fi->d, swap,
+				  &fi->i, filename_ptr, functionname_ptr,
+				  line_ptr))
+	{
+	  msec->flags = origflags;
+	  return TRUE;
+	}
+
+      msec->flags = origflags;
+    }
+
+  /* Fall back on the generic ELF find_nearest_line routine.  */
+
+  return _bfd_elf_find_nearest_line (abfd, section, symbols, offset,
+				     filename_ptr, functionname_ptr,
+				     line_ptr);
+}
+
+bfd_boolean
+_bfd_mips_elf_find_inliner_info (bfd *abfd,
+				 const char **filename_ptr,
+				 const char **functionname_ptr,
+				 unsigned int *line_ptr)
+{
+  bfd_boolean found;
+  found = _bfd_dwarf2_find_inliner_info (abfd, filename_ptr,
+					 functionname_ptr, line_ptr,
+					 & elf_tdata (abfd)->dwarf2_find_line_info);
+  return found;
+}
+
+
+/* When are writing out the .options or .MIPS.options section,
+   remember the bytes we are writing out, so that we can install the
+   GP value in the section_processing routine.  */
+
+bfd_boolean
+_bfd_mips_elf_set_section_contents (bfd *abfd, sec_ptr section,
+				    const void *location,
+				    file_ptr offset, bfd_size_type count)
+{
+  if (MIPS_ELF_OPTIONS_SECTION_NAME_P (section->name))
+    {
+      bfd_byte *c;
+
+      if (elf_section_data (section) == NULL)
+	{
+	  bfd_size_type amt = sizeof (struct bfd_elf_section_data);
+	  section->used_by_bfd = bfd_zalloc (abfd, amt);
+	  if (elf_section_data (section) == NULL)
+	    return FALSE;
+	}
+      c = mips_elf_section_data (section)->u.tdata;
+      if (c == NULL)
+	{
+	  c = bfd_zalloc (abfd, section->size);
+	  if (c == NULL)
+	    return FALSE;
+	  mips_elf_section_data (section)->u.tdata = c;
+	}
+
+      memcpy (c + offset, location, count);
+    }
+
+  return _bfd_elf_set_section_contents (abfd, section, location, offset,
+					count);
+}
+
+/* This is almost identical to bfd_generic_get_... except that some
+   MIPS relocations need to be handled specially.  Sigh.  */
+
+bfd_byte *
+_bfd_elf_mips_get_relocated_section_contents
+  (bfd *abfd,
+   struct bfd_link_info *link_info,
+   struct bfd_link_order *link_order,
+   bfd_byte *data,
+   bfd_boolean relocatable,
+   asymbol **symbols)
+{
+  /* Get enough memory to hold the stuff */
+  bfd *input_bfd = link_order->u.indirect.section->owner;
+  asection *input_section = link_order->u.indirect.section;
+  bfd_size_type sz;
+
+  long reloc_size = bfd_get_reloc_upper_bound (input_bfd, input_section);
+  arelent **reloc_vector = NULL;
+  long reloc_count;
+
+  if (reloc_size < 0)
+    goto error_return;
+
+  reloc_vector = bfd_malloc (reloc_size);
+  if (reloc_vector == NULL && reloc_size != 0)
+    goto error_return;
+
+  /* read in the section */
+  sz = input_section->rawsize ? input_section->rawsize : input_section->size;
+  if (!bfd_get_section_contents (input_bfd, input_section, data, 0, sz))
+    goto error_return;
+
+  reloc_count = bfd_canonicalize_reloc (input_bfd,
+					input_section,
+					reloc_vector,
+					symbols);
+  if (reloc_count < 0)
+    goto error_return;
+
+  if (reloc_count > 0)
+    {
+      arelent **parent;
+      /* for mips */
+      int gp_found;
+      bfd_vma gp = 0x12345678;	/* initialize just to shut gcc up */
+
+      {
+	struct bfd_hash_entry *h;
+	struct bfd_link_hash_entry *lh;
+	/* Skip all this stuff if we aren't mixing formats.  */
+	if (abfd && input_bfd
+	    && abfd->xvec == input_bfd->xvec)
+	  lh = 0;
+	else
+	  {
+	    h = bfd_hash_lookup (&link_info->hash->table, "_gp", FALSE, FALSE);
+	    lh = (struct bfd_link_hash_entry *) h;
+	  }
+      lookup:
+	if (lh)
+	  {
+	    switch (lh->type)
+	      {
+	      case bfd_link_hash_undefined:
+	      case bfd_link_hash_undefweak:
+	      case bfd_link_hash_common:
+		gp_found = 0;
+		break;
+	      case bfd_link_hash_defined:
+	      case bfd_link_hash_defweak:
+		gp_found = 1;
+		gp = lh->u.def.value;
+		break;
+	      case bfd_link_hash_indirect:
+	      case bfd_link_hash_warning:
+		lh = lh->u.i.link;
+		/* @@FIXME  ignoring warning for now */
+		goto lookup;
+	      case bfd_link_hash_new:
+	      default:
+		abort ();
+	      }
+	  }
+	else
+	  gp_found = 0;
+      }
+      /* end mips */
+      for (parent = reloc_vector; *parent != NULL; parent++)
+	{
+	  char *error_message = NULL;
+	  bfd_reloc_status_type r;
+
+	  /* Specific to MIPS: Deal with relocation types that require
+	     knowing the gp of the output bfd.  */
+	  asymbol *sym = *(*parent)->sym_ptr_ptr;
+
+	  /* If we've managed to find the gp and have a special
+	     function for the relocation then go ahead, else default
+	     to the generic handling.  */
+	  if (gp_found
+	      && (*parent)->howto->special_function
+	      == _bfd_mips_elf32_gprel16_reloc)
+	    r = _bfd_mips_elf_gprel16_with_gp (input_bfd, sym, *parent,
+					       input_section, relocatable,
+					       data, gp);
+	  else
+	    r = bfd_perform_relocation (input_bfd, *parent, data,
+					input_section,
+					relocatable ? abfd : NULL,
+					&error_message);
+
+	  if (relocatable)
+	    {
+	      asection *os = input_section->output_section;
+
+	      /* A partial link, so keep the relocs */
+	      os->orelocation[os->reloc_count] = *parent;
+	      os->reloc_count++;
+	    }
+
+	  if (r != bfd_reloc_ok)
+	    {
+	      switch (r)
+		{
+		case bfd_reloc_undefined:
+		  if (!((*link_info->callbacks->undefined_symbol)
+			(link_info, bfd_asymbol_name (*(*parent)->sym_ptr_ptr),
+			 input_bfd, input_section, (*parent)->address, TRUE)))
+		    goto error_return;
+		  break;
+		case bfd_reloc_dangerous:
+		  BFD_ASSERT (error_message != NULL);
+		  if (!((*link_info->callbacks->reloc_dangerous)
+			(link_info, error_message, input_bfd, input_section,
+			 (*parent)->address)))
+		    goto error_return;
+		  break;
+		case bfd_reloc_overflow:
+		  if (!((*link_info->callbacks->reloc_overflow)
+			(link_info, NULL,
+			 bfd_asymbol_name (*(*parent)->sym_ptr_ptr),
+			 (*parent)->howto->name, (*parent)->addend,
+			 input_bfd, input_section, (*parent)->address)))
+		    goto error_return;
+		  break;
+		case bfd_reloc_outofrange:
+		default:
+		  abort ();
+		  break;
+		}
+
+	    }
+	}
+    }
+  if (reloc_vector != NULL)
+    free (reloc_vector);
+  return data;
+
+error_return:
+  if (reloc_vector != NULL)
+    free (reloc_vector);
+  return NULL;
+}
+
+static bfd_boolean
+mips_elf_relax_delete_bytes (bfd *abfd,
+			     asection *sec, bfd_vma addr, int count)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  unsigned int sec_shndx;
+  bfd_byte *contents;
+  Elf_Internal_Rela *irel, *irelend;
+  Elf_Internal_Sym *isym;
+  Elf_Internal_Sym *isymend;
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_link_hash_entry **end_hashes;
+  struct elf_link_hash_entry **start_hashes;
+  unsigned int symcount;
+
+  sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+  contents = elf_section_data (sec)->this_hdr.contents;
+
+  irel = elf_section_data (sec)->relocs;
+  irelend = irel + sec->reloc_count;
+
+  /* Actually delete the bytes.  */
+  memmove (contents + addr, contents + addr + count,
+	   (size_t) (sec->size - addr - count));
+  sec->size -= count;
+
+  /* Adjust all the relocs.  */
+  for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
+    {
+      /* Get the new reloc address.  */
+      if (irel->r_offset > addr)
+	irel->r_offset -= count;
+    }
+
+  BFD_ASSERT (addr % 2 == 0);
+  BFD_ASSERT (count % 2 == 0);
+
+  /* Adjust the local symbols defined in this section.  */
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  isym = (Elf_Internal_Sym *) symtab_hdr->contents;
+  for (isymend = isym + symtab_hdr->sh_info; isym < isymend; isym++)
+    if (isym->st_shndx == sec_shndx && isym->st_value > addr)
+      isym->st_value -= count;
+
+  /* Now adjust the global symbols defined in this section.  */
+  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+	      - symtab_hdr->sh_info);
+  sym_hashes = start_hashes = elf_sym_hashes (abfd);
+  end_hashes = sym_hashes + symcount;
+
+  for (; sym_hashes < end_hashes; sym_hashes++)
+    {
+      struct elf_link_hash_entry *sym_hash = *sym_hashes;
+
+      if ((sym_hash->root.type == bfd_link_hash_defined
+	   || sym_hash->root.type == bfd_link_hash_defweak)
+	  && sym_hash->root.u.def.section == sec)
+	{
+	  bfd_vma value = sym_hash->root.u.def.value;
+
+	  if (ELF_ST_IS_MICROMIPS (sym_hash->other))
+	    value &= MINUS_TWO;
+	  if (value > addr)
+	    sym_hash->root.u.def.value -= count;
+	}
+    }
+
+  return TRUE;
+}
+
+
+/* Opcodes needed for microMIPS relaxation as found in
+   opcodes/micromips-opc.c.  */
+
+struct opcode_descriptor {
+  unsigned long match;
+  unsigned long mask;
+};
+
+/* The $ra register aka $31.  */
+
+#define RA 31
+
+/* 32-bit instruction format register fields.  */
+
+#define OP32_SREG(opcode) (((opcode) >> 16) & 0x1f)
+#define OP32_TREG(opcode) (((opcode) >> 21) & 0x1f)
+
+/* Check if a 5-bit register index can be abbreviated to 3 bits.  */
+
+#define OP16_VALID_REG(r) \
+  ((2 <= (r) && (r) <= 7) || (16 <= (r) && (r) <= 17))
+
+
+/* 32-bit and 16-bit branches.  */
+
+static const struct opcode_descriptor b_insns_32[] = {
+  { /* "b",	"p",		*/ 0x40400000, 0xffff0000 }, /* bgez 0 */
+  { /* "b",	"p",		*/ 0x94000000, 0xffff0000 }, /* beq 0, 0 */
+  { 0, 0 }  /* End marker for find_match().  */
+};
+
+static const struct opcode_descriptor bc_insn_32 =
+  { /* "bc(1|2)(ft)", "N,p",	*/ 0x42800000, 0xfec30000 };
+
+static const struct opcode_descriptor bz_insn_32 =
+  { /* "b(g|l)(e|t)z", "s,p",	*/ 0x40000000, 0xff200000 };
+
+static const struct opcode_descriptor bzal_insn_32 =
+  { /* "b(ge|lt)zal", "s,p",	*/ 0x40200000, 0xffa00000 };
+
+static const struct opcode_descriptor beq_insn_32 =
+  { /* "b(eq|ne)", "s,t,p",	*/ 0x94000000, 0xdc000000 };
+
+static const struct opcode_descriptor b_insn_16 =
+  { /* "b",	"mD",		*/ 0xcc00,     0xfc00 };
+
+static const struct opcode_descriptor bz_insn_16 =
+  { /* "b(eq|ne)z", "md,mE",	*/ 0x8c00,     0xdc00 };
+
+
+/* 32-bit and 16-bit branch EQ and NE zero.  */
+
+/* NOTE: All opcode tables have BEQ/BNE in the same order: first the
+   eq and second the ne.  This convention is used when replacing a
+   32-bit BEQ/BNE with the 16-bit version.  */
+
+#define BZC32_REG_FIELD(r) (((r) & 0x1f) << 16)
+
+static const struct opcode_descriptor bz_rs_insns_32[] = {
+  { /* "beqz",	"s,p",		*/ 0x94000000, 0xffe00000 },
+  { /* "bnez",	"s,p",		*/ 0xb4000000, 0xffe00000 },
+  { 0, 0 }  /* End marker for find_match().  */
+};
+
+static const struct opcode_descriptor bz_rt_insns_32[] = {
+  { /* "beqz",	"t,p",		*/ 0x94000000, 0xfc01f000 },
+  { /* "bnez",	"t,p",		*/ 0xb4000000, 0xfc01f000 },
+  { 0, 0 }  /* End marker for find_match().  */
+};
+
+static const struct opcode_descriptor bzc_insns_32[] = {
+  { /* "beqzc",	"s,p",		*/ 0x40e00000, 0xffe00000 },
+  { /* "bnezc",	"s,p",		*/ 0x40a00000, 0xffe00000 },
+  { 0, 0 }  /* End marker for find_match().  */
+};
+
+static const struct opcode_descriptor bz_insns_16[] = {
+  { /* "beqz",	"md,mE",	*/ 0x8c00,     0xfc00 },
+  { /* "bnez",	"md,mE",	*/ 0xac00,     0xfc00 },
+  { 0, 0 }  /* End marker for find_match().  */
+};
+
+/* Switch between a 5-bit register index and its 3-bit shorthand.  */
+
+#define BZ16_REG(opcode) ((((((opcode) >> 7) & 7) + 0x1e) & 0x17) + 2)
+#define BZ16_REG_FIELD(r) \
+  (((2 <= (r) && (r) <= 7) ? (r) : ((r) - 16)) << 7)
+
+
+/* 32-bit instructions with a delay slot.  */
+
+static const struct opcode_descriptor jal_insn_32_bd16 =
+  { /* "jals",	"a",		*/ 0x74000000, 0xfc000000 };
+
+static const struct opcode_descriptor jal_insn_32_bd32 =
+  { /* "jal",	"a",		*/ 0xf4000000, 0xfc000000 };
+
+static const struct opcode_descriptor jal_x_insn_32_bd32 =
+  { /* "jal[x]", "a",		*/ 0xf0000000, 0xf8000000 };
+
+static const struct opcode_descriptor j_insn_32 =
+  { /* "j",	"a",		*/ 0xd4000000, 0xfc000000 };
+
+static const struct opcode_descriptor jalr_insn_32 =
+  { /* "jalr[.hb]", "t,s",	*/ 0x00000f3c, 0xfc00efff };
+
+/* This table can be compacted, because no opcode replacement is made.  */
+
+static const struct opcode_descriptor ds_insns_32_bd16[] = {
+  { /* "jals",	"a",		*/ 0x74000000, 0xfc000000 },
+
+  { /* "jalrs[.hb]", "t,s",	*/ 0x00004f3c, 0xfc00efff },
+  { /* "b(ge|lt)zals", "s,p",	*/ 0x42200000, 0xffa00000 },
+
+  { /* "b(g|l)(e|t)z", "s,p",	*/ 0x40000000, 0xff200000 },
+  { /* "b(eq|ne)", "s,t,p",	*/ 0x94000000, 0xdc000000 },
+  { /* "j",	"a",		*/ 0xd4000000, 0xfc000000 },
+  { 0, 0 }  /* End marker for find_match().  */
+};
+
+/* This table can be compacted, because no opcode replacement is made.  */
+
+static const struct opcode_descriptor ds_insns_32_bd32[] = {
+  { /* "jal[x]", "a",		*/ 0xf0000000, 0xf8000000 },
+
+  { /* "jalr[.hb]", "t,s",	*/ 0x00000f3c, 0xfc00efff },
+  { /* "b(ge|lt)zal", "s,p",	*/ 0x40200000, 0xffa00000 },
+  { 0, 0 }  /* End marker for find_match().  */
+};
+
+
+/* 16-bit instructions with a delay slot.  */
+
+static const struct opcode_descriptor jalr_insn_16_bd16 =
+  { /* "jalrs",	"my,mj",	*/ 0x45e0,     0xffe0 };
+
+static const struct opcode_descriptor jalr_insn_16_bd32 =
+  { /* "jalr",	"my,mj",	*/ 0x45c0,     0xffe0 };
+
+static const struct opcode_descriptor jr_insn_16 =
+  { /* "jr",	"mj",		*/ 0x4580,     0xffe0 };
+
+#define JR16_REG(opcode) ((opcode) & 0x1f)
+
+/* This table can be compacted, because no opcode replacement is made.  */
+
+static const struct opcode_descriptor ds_insns_16_bd16[] = {
+  { /* "jalrs",	"my,mj",	*/ 0x45e0,     0xffe0 },
+
+  { /* "b",	"mD",		*/ 0xcc00,     0xfc00 },
+  { /* "b(eq|ne)z", "md,mE",	*/ 0x8c00,     0xdc00 },
+  { /* "jr",	"mj",		*/ 0x4580,     0xffe0 },
+  { 0, 0 }  /* End marker for find_match().  */
+};
+
+
+/* LUI instruction.  */
+
+static const struct opcode_descriptor lui_insn =
+ { /* "lui",	"s,u",		*/ 0x41a00000, 0xffe00000 };
+
+
+/* ADDIU instruction.  */
+
+static const struct opcode_descriptor addiu_insn =
+  { /* "addiu",	"t,r,j",	*/ 0x30000000, 0xfc000000 };
+
+static const struct opcode_descriptor addiupc_insn =
+  { /* "addiu",	"mb,$pc,mQ",	*/ 0x78000000, 0xfc000000 };
+
+#define ADDIUPC_REG_FIELD(r) \
+  (((2 <= (r) && (r) <= 7) ? (r) : ((r) - 16)) << 23)
+
+
+/* Relaxable instructions in a JAL delay slot: MOVE.  */
+
+/* The 16-bit move has rd in 9:5 and rs in 4:0.  The 32-bit moves
+   (ADDU, OR) have rd in 15:11 and rs in 10:16.  */
+#define MOVE32_RD(opcode) (((opcode) >> 11) & 0x1f)
+#define MOVE32_RS(opcode) (((opcode) >> 16) & 0x1f)
+
+#define MOVE16_RD_FIELD(r) (((r) & 0x1f) << 5)
+#define MOVE16_RS_FIELD(r) (((r) & 0x1f)     )
+
+static const struct opcode_descriptor move_insns_32[] = {
+  { /* "move",	"d,s",		*/ 0x00000150, 0xffe007ff }, /* addu d,s,$0 */
+  { /* "move",	"d,s",		*/ 0x00000290, 0xffe007ff }, /* or   d,s,$0 */
+  { 0, 0 }  /* End marker for find_match().  */
+};
+
+static const struct opcode_descriptor move_insn_16 =
+  { /* "move",	"mp,mj",	*/ 0x0c00,     0xfc00 };
+
+
+/* NOP instructions.  */
+
+static const struct opcode_descriptor nop_insn_32 =
+  { /* "nop",	"",		*/ 0x00000000, 0xffffffff };
+
+static const struct opcode_descriptor nop_insn_16 =
+  { /* "nop",	"",		*/ 0x0c00,     0xffff };
+
+
+/* Instruction match support.  */
+
+#define MATCH(opcode, insn) ((opcode & insn.mask) == insn.match)
+
+static int
+find_match (unsigned long opcode, const struct opcode_descriptor insn[])
+{
+  unsigned long indx;
+
+  for (indx = 0; insn[indx].mask != 0; indx++)
+    if (MATCH (opcode, insn[indx]))
+      return indx;
+
+  return -1;
+}
+
+
+/* Branch and delay slot decoding support.  */
+
+/* If PTR points to what *might* be a 16-bit branch or jump, then
+   return the minimum length of its delay slot, otherwise return 0.
+   Non-zero results are not definitive as we might be checking against
+   the second half of another instruction.  */
+
+static int
+check_br16_dslot (bfd *abfd, bfd_byte *ptr)
+{
+  unsigned long opcode;
+  int bdsize;
+
+  opcode = bfd_get_16 (abfd, ptr);
+  if (MATCH (opcode, jalr_insn_16_bd32) != 0)
+    /* 16-bit branch/jump with a 32-bit delay slot.  */
+    bdsize = 4;
+  else if (MATCH (opcode, jalr_insn_16_bd16) != 0
+	   || find_match (opcode, ds_insns_16_bd16) >= 0)
+    /* 16-bit branch/jump with a 16-bit delay slot.  */
+    bdsize = 2;
+  else
+    /* No delay slot.  */
+    bdsize = 0;
+
+  return bdsize;
+}
+
+/* If PTR points to what *might* be a 32-bit branch or jump, then
+   return the minimum length of its delay slot, otherwise return 0.
+   Non-zero results are not definitive as we might be checking against
+   the second half of another instruction.  */
+
+static int
+check_br32_dslot (bfd *abfd, bfd_byte *ptr)
+{
+  unsigned long opcode;
+  int bdsize;
+
+  opcode = (bfd_get_16 (abfd, ptr) << 16) | bfd_get_16 (abfd, ptr + 2);
+  if (find_match (opcode, ds_insns_32_bd32) >= 0)
+    /* 32-bit branch/jump with a 32-bit delay slot.  */
+    bdsize = 4;
+  else if (find_match (opcode, ds_insns_32_bd16) >= 0)
+    /* 32-bit branch/jump with a 16-bit delay slot.  */
+    bdsize = 2;
+  else
+    /* No delay slot.  */
+    bdsize = 0;
+
+  return bdsize;
+}
+
+/* If PTR points to a 16-bit branch or jump with a 32-bit delay slot
+   that doesn't fiddle with REG, then return TRUE, otherwise FALSE.  */
+
+static bfd_boolean
+check_br16 (bfd *abfd, bfd_byte *ptr, unsigned long reg)
+{
+  unsigned long opcode;
+
+  opcode = bfd_get_16 (abfd, ptr);
+  if (MATCH (opcode, b_insn_16)
+						/* B16  */
+      || (MATCH (opcode, jr_insn_16) && reg != JR16_REG (opcode))
+						/* JR16  */
+      || (MATCH (opcode, bz_insn_16) && reg != BZ16_REG (opcode))
+						/* BEQZ16, BNEZ16  */
+      || (MATCH (opcode, jalr_insn_16_bd32)
+						/* JALR16  */
+	  && reg != JR16_REG (opcode) && reg != RA))
+    return TRUE;
+
+  return FALSE;
+}
+
+/* If PTR points to a 32-bit branch or jump that doesn't fiddle with REG,
+   then return TRUE, otherwise FALSE.  */
+
+static bfd_boolean
+check_br32 (bfd *abfd, bfd_byte *ptr, unsigned long reg)
+{
+  unsigned long opcode;
+
+  opcode = (bfd_get_16 (abfd, ptr) << 16) | bfd_get_16 (abfd, ptr + 2);
+  if (MATCH (opcode, j_insn_32)
+						/* J  */
+      || MATCH (opcode, bc_insn_32)
+						/* BC1F, BC1T, BC2F, BC2T  */
+      || (MATCH (opcode, jal_x_insn_32_bd32) && reg != RA)
+						/* JAL, JALX  */
+      || (MATCH (opcode, bz_insn_32) && reg != OP32_SREG (opcode))
+						/* BGEZ, BGTZ, BLEZ, BLTZ  */
+      || (MATCH (opcode, bzal_insn_32)
+						/* BGEZAL, BLTZAL  */
+	  && reg != OP32_SREG (opcode) && reg != RA)
+      || ((MATCH (opcode, jalr_insn_32) || MATCH (opcode, beq_insn_32))
+						/* JALR, JALR.HB, BEQ, BNE  */
+	  && reg != OP32_SREG (opcode) && reg != OP32_TREG (opcode)))
+    return TRUE;
+
+  return FALSE;
+}
+
+/* If the instruction encoding at PTR and relocations [INTERNAL_RELOCS,
+   IRELEND) at OFFSET indicate that there must be a compact branch there,
+   then return TRUE, otherwise FALSE.  */
+
+static bfd_boolean
+check_relocated_bzc (bfd *abfd, const bfd_byte *ptr, bfd_vma offset,
+		     const Elf_Internal_Rela *internal_relocs,
+		     const Elf_Internal_Rela *irelend)
+{
+  const Elf_Internal_Rela *irel;
+  unsigned long opcode;
+
+  opcode   = bfd_get_16 (abfd, ptr);
+  opcode <<= 16;
+  opcode  |= bfd_get_16 (abfd, ptr + 2);
+  if (find_match (opcode, bzc_insns_32) < 0)
+    return FALSE;
+
+  for (irel = internal_relocs; irel < irelend; irel++)
+    if (irel->r_offset == offset
+	&& ELF32_R_TYPE (irel->r_info) == R_MICROMIPS_PC16_S1)
+      return TRUE;
+
+  return FALSE;
+}
+
+/* Bitsize checking.  */
+#define IS_BITSIZE(val, N)						\
+  (((((val) & ((1ULL << (N)) - 1)) ^ (1ULL << ((N) - 1)))		\
+    - (1ULL << ((N) - 1))) == (val))
+
+
+bfd_boolean
+_bfd_mips_elf_relax_section (bfd *abfd, asection *sec,
+			     struct bfd_link_info *link_info,
+			     bfd_boolean *again)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *internal_relocs;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_byte *contents = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+
+  /* Assume nothing changes.  */
+  *again = FALSE;
+
+  /* We don't have to do anything for a relocatable link, if
+     this section does not have relocs, or if this is not a
+     code section.  */
+
+  if (link_info->relocatable
+      || (sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0
+      || (sec->flags & SEC_CODE) == 0)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+
+  /* Get a copy of the native relocations.  */
+  internal_relocs = (_bfd_elf_link_read_relocs
+		     (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
+		      link_info->keep_memory));
+  if (internal_relocs == NULL)
+    goto error_return;
+
+  /* Walk through them looking for relaxing opportunities.  */
+  irelend = internal_relocs + sec->reloc_count;
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      unsigned long r_symndx = ELF32_R_SYM (irel->r_info);
+      unsigned int r_type = ELF32_R_TYPE (irel->r_info);
+      bfd_boolean target_is_micromips_code_p;
+      unsigned long opcode;
+      bfd_vma symval;
+      bfd_vma pcrval;
+      bfd_byte *ptr;
+      int fndopc;
+
+      /* The number of bytes to delete for relaxation and from where
+         to delete these bytes starting at irel->r_offset.  */
+      int delcnt = 0;
+      int deloff = 0;
+
+      /* If this isn't something that can be relaxed, then ignore
+         this reloc.  */
+      if (r_type != R_MICROMIPS_HI16
+	  && r_type != R_MICROMIPS_PC16_S1
+	  && r_type != R_MICROMIPS_26_S1)
+	continue;
+
+      /* Get the section contents if we haven't done so already.  */
+      if (contents == NULL)
+	{
+	  /* Get cached copy if it exists.  */
+	  if (elf_section_data (sec)->this_hdr.contents != NULL)
+	    contents = elf_section_data (sec)->this_hdr.contents;
+	  /* Go get them off disk.  */
+	  else if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+	    goto error_return;
+	}
+      ptr = contents + irel->r_offset;
+
+      /* Read this BFD's local symbols if we haven't done so already.  */
+      if (isymbuf == NULL && symtab_hdr->sh_info != 0)
+	{
+	  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+	  if (isymbuf == NULL)
+	    isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+					    symtab_hdr->sh_info, 0,
+					    NULL, NULL, NULL);
+	  if (isymbuf == NULL)
+	    goto error_return;
+	}
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  /* A local symbol.  */
+	  Elf_Internal_Sym *isym;
+	  asection *sym_sec;
+
+	  isym = isymbuf + r_symndx;
+	  if (isym->st_shndx == SHN_UNDEF)
+	    sym_sec = bfd_und_section_ptr;
+	  else if (isym->st_shndx == SHN_ABS)
+	    sym_sec = bfd_abs_section_ptr;
+	  else if (isym->st_shndx == SHN_COMMON)
+	    sym_sec = bfd_com_section_ptr;
+	  else
+	    sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+	  symval = (isym->st_value
+		    + sym_sec->output_section->vma
+		    + sym_sec->output_offset);
+	  target_is_micromips_code_p = ELF_ST_IS_MICROMIPS (isym->st_other);
+	}
+      else
+	{
+	  unsigned long indx;
+	  struct elf_link_hash_entry *h;
+
+	  /* An external symbol.  */
+	  indx = r_symndx - symtab_hdr->sh_info;
+	  h = elf_sym_hashes (abfd)[indx];
+	  BFD_ASSERT (h != NULL);
+
+	  if (h->root.type != bfd_link_hash_defined
+	      && h->root.type != bfd_link_hash_defweak)
+	    /* This appears to be a reference to an undefined
+	       symbol.  Just ignore it -- it will be caught by the
+	       regular reloc processing.  */
+	    continue;
+
+	  symval = (h->root.u.def.value
+		    + h->root.u.def.section->output_section->vma
+		    + h->root.u.def.section->output_offset);
+	  target_is_micromips_code_p = (!h->needs_plt
+					&& ELF_ST_IS_MICROMIPS (h->other));
+	}
+
+
+      /* For simplicity of coding, we are going to modify the
+         section contents, the section relocs, and the BFD symbol
+         table.  We must tell the rest of the code not to free up this
+         information.  It would be possible to instead create a table
+         of changes which have to be made, as is done in coff-mips.c;
+         that would be more work, but would require less memory when
+         the linker is run.  */
+
+      /* Only 32-bit instructions relaxed.  */
+      if (irel->r_offset + 4 > sec->size)
+	continue;
+
+      opcode  = bfd_get_16 (abfd, ptr    ) << 16;
+      opcode |= bfd_get_16 (abfd, ptr + 2);
+
+      /* This is the pc-relative distance from the instruction the
+         relocation is applied to, to the symbol referred.  */
+      pcrval = (symval
+		- (sec->output_section->vma + sec->output_offset)
+		- irel->r_offset);
+
+      /* R_MICROMIPS_HI16 / LUI relaxation to nil, performing relaxation
+         of corresponding R_MICROMIPS_LO16 to R_MICROMIPS_HI0_LO16 or
+         R_MICROMIPS_PC23_S2.  The R_MICROMIPS_PC23_S2 condition is
+
+           (symval % 4 == 0 && IS_BITSIZE (pcrval, 25))
+
+         where pcrval has first to be adjusted to apply against the LO16
+         location (we make the adjustment later on, when we have figured
+         out the offset).  */
+      if (r_type == R_MICROMIPS_HI16 && MATCH (opcode, lui_insn))
+	{
+	  bfd_boolean bzc = FALSE;
+	  unsigned long nextopc;
+	  unsigned long reg;
+	  bfd_vma offset;
+
+	  /* Give up if the previous reloc was a HI16 against this symbol
+	     too.  */
+	  if (irel > internal_relocs
+	      && ELF32_R_TYPE (irel[-1].r_info) == R_MICROMIPS_HI16
+	      && ELF32_R_SYM (irel[-1].r_info) == r_symndx)
+	    continue;
+
+	  /* Or if the next reloc is not a LO16 against this symbol.  */
+	  if (irel + 1 >= irelend
+	      || ELF32_R_TYPE (irel[1].r_info) != R_MICROMIPS_LO16
+	      || ELF32_R_SYM (irel[1].r_info) != r_symndx)
+	    continue;
+
+	  /* Or if the second next reloc is a LO16 against this symbol too.  */
+	  if (irel + 2 >= irelend
+	      && ELF32_R_TYPE (irel[2].r_info) == R_MICROMIPS_LO16
+	      && ELF32_R_SYM (irel[2].r_info) == r_symndx)
+	    continue;
+
+	  /* See if the LUI instruction *might* be in a branch delay slot.
+	     We check whether what looks like a 16-bit branch or jump is
+	     actually an immediate argument to a compact branch, and let
+	     it through if so.  */
+	  if (irel->r_offset >= 2
+	      && check_br16_dslot (abfd, ptr - 2)
+	      && !(irel->r_offset >= 4
+		   && (bzc = check_relocated_bzc (abfd,
+						  ptr - 4, irel->r_offset - 4,
+						  internal_relocs, irelend))))
+	    continue;
+	  if (irel->r_offset >= 4
+	      && !bzc
+	      && check_br32_dslot (abfd, ptr - 4))
+	    continue;
+
+	  reg = OP32_SREG (opcode);
+
+	  /* We only relax adjacent instructions or ones separated with
+	     a branch or jump that has a delay slot.  The branch or jump
+	     must not fiddle with the register used to hold the address.
+	     Subtract 4 for the LUI itself.  */
+	  offset = irel[1].r_offset - irel[0].r_offset;
+	  switch (offset - 4)
+	    {
+	    case 0:
+	      break;
+	    case 2:
+	      if (check_br16 (abfd, ptr + 4, reg))
+		break;
+	      continue;
+	    case 4:
+	      if (check_br32 (abfd, ptr + 4, reg))
+		break;
+	      continue;
+	    default:
+	      continue;
+	    }
+
+	  nextopc  = bfd_get_16 (abfd, contents + irel[1].r_offset    ) << 16;
+	  nextopc |= bfd_get_16 (abfd, contents + irel[1].r_offset + 2);
+
+	  /* Give up unless the same register is used with both
+	     relocations.  */
+	  if (OP32_SREG (nextopc) != reg)
+	    continue;
+
+	  /* Now adjust pcrval, subtracting the offset to the LO16 reloc
+	     and rounding up to take masking of the two LSBs into account.  */
+	  pcrval = ((pcrval - offset + 3) | 3) ^ 3;
+
+	  /* R_MICROMIPS_LO16 relaxation to R_MICROMIPS_HI0_LO16.  */
+	  if (IS_BITSIZE (symval, 16))
+	    {
+	      /* Fix the relocation's type.  */
+	      irel[1].r_info = ELF32_R_INFO (r_symndx, R_MICROMIPS_HI0_LO16);
+
+	      /* Instructions using R_MICROMIPS_LO16 have the base or
+	         source register in bits 20:16.  This register becomes $0
+	         (zero) as the result of the R_MICROMIPS_HI16 being 0.  */
+	      nextopc &= ~0x001f0000;
+	      bfd_put_16 (abfd, (nextopc >> 16) & 0xffff,
+			  contents + irel[1].r_offset);
+	    }
+
+	  /* R_MICROMIPS_LO16 / ADDIU relaxation to R_MICROMIPS_PC23_S2.
+	     We add 4 to take LUI deletion into account while checking
+	     the PC-relative distance.  */
+	  else if (symval % 4 == 0
+		   && IS_BITSIZE (pcrval + 4, 25)
+		   && MATCH (nextopc, addiu_insn)
+		   && OP32_TREG (nextopc) == OP32_SREG (nextopc)
+		   && OP16_VALID_REG (OP32_TREG (nextopc)))
+	    {
+	      /* Fix the relocation's type.  */
+	      irel[1].r_info = ELF32_R_INFO (r_symndx, R_MICROMIPS_PC23_S2);
+
+	      /* Replace ADDIU with the ADDIUPC version.  */
+	      nextopc = (addiupc_insn.match
+			 | ADDIUPC_REG_FIELD (OP32_TREG (nextopc)));
+
+	      bfd_put_16 (abfd, (nextopc >> 16) & 0xffff,
+			  contents + irel[1].r_offset);
+	      bfd_put_16 (abfd,  nextopc        & 0xffff,
+			  contents + irel[1].r_offset + 2);
+	    }
+
+	  /* Can't do anything, give up, sigh...  */
+	  else
+	    continue;
+
+	  /* Fix the relocation's type.  */
+	  irel->r_info = ELF32_R_INFO (r_symndx, R_MIPS_NONE);
+
+	  /* Delete the LUI instruction: 4 bytes at irel->r_offset.  */
+	  delcnt = 4;
+	  deloff = 0;
+	}
+
+      /* Compact branch relaxation -- due to the multitude of macros
+         employed by the compiler/assembler, compact branches are not
+         always generated.  Obviously, this can/will be fixed elsewhere,
+         but there is no drawback in double checking it here.  */
+      else if (r_type == R_MICROMIPS_PC16_S1
+	       && irel->r_offset + 5 < sec->size
+	       && ((fndopc = find_match (opcode, bz_rs_insns_32)) >= 0
+		   || (fndopc = find_match (opcode, bz_rt_insns_32)) >= 0)
+	       && MATCH (bfd_get_16 (abfd, ptr + 4), nop_insn_16))
+	{
+	  unsigned long reg;
+
+	  reg = OP32_SREG (opcode) ? OP32_SREG (opcode) : OP32_TREG (opcode);
+
+	  /* Replace BEQZ/BNEZ with the compact version.  */
+	  opcode = (bzc_insns_32[fndopc].match
+		    | BZC32_REG_FIELD (reg)
+		    | (opcode & 0xffff));		/* Addend value.  */
+
+	  bfd_put_16 (abfd, (opcode >> 16) & 0xffff, ptr);
+	  bfd_put_16 (abfd,  opcode        & 0xffff, ptr + 2);
+
+	  /* Delete the 16-bit delay slot NOP: two bytes from
+	     irel->offset + 4.  */
+	  delcnt = 2;
+	  deloff = 4;
+	}
+
+      /* R_MICROMIPS_PC16_S1 relaxation to R_MICROMIPS_PC10_S1.  We need
+         to check the distance from the next instruction, so subtract 2.  */
+      else if (r_type == R_MICROMIPS_PC16_S1
+	       && IS_BITSIZE (pcrval - 2, 11)
+	       && find_match (opcode, b_insns_32) >= 0)
+	{
+	  /* Fix the relocation's type.  */
+	  irel->r_info = ELF32_R_INFO (r_symndx, R_MICROMIPS_PC10_S1);
+
+	  /* Replace the the 32-bit opcode with a 16-bit opcode.  */
+	  bfd_put_16 (abfd,
+		      (b_insn_16.match
+		       | (opcode & 0x3ff)),		/* Addend value.  */
+		      ptr);
+
+	  /* Delete 2 bytes from irel->r_offset + 2.  */
+	  delcnt = 2;
+	  deloff = 2;
+	}
+
+      /* R_MICROMIPS_PC16_S1 relaxation to R_MICROMIPS_PC7_S1.  We need
+         to check the distance from the next instruction, so subtract 2.  */
+      else if (r_type == R_MICROMIPS_PC16_S1
+	       && IS_BITSIZE (pcrval - 2, 8)
+	       && (((fndopc = find_match (opcode, bz_rs_insns_32)) >= 0
+		    && OP16_VALID_REG (OP32_SREG (opcode)))
+		   || ((fndopc = find_match (opcode, bz_rt_insns_32)) >= 0
+		       && OP16_VALID_REG (OP32_TREG (opcode)))))
+	{
+	  unsigned long reg;
+
+	  reg = OP32_SREG (opcode) ? OP32_SREG (opcode) : OP32_TREG (opcode);
+
+	  /* Fix the relocation's type.  */
+	  irel->r_info = ELF32_R_INFO (r_symndx, R_MICROMIPS_PC7_S1);
+
+	  /* Replace the the 32-bit opcode with a 16-bit opcode.  */
+	  bfd_put_16 (abfd,
+		      (bz_insns_16[fndopc].match
+		       | BZ16_REG_FIELD (reg)
+		       | (opcode & 0x7f)),		/* Addend value.  */
+		      ptr);
+
+	  /* Delete 2 bytes from irel->r_offset + 2.  */
+	  delcnt = 2;
+	  deloff = 2;
+	}
+
+      /* R_MICROMIPS_26_S1 -- JAL to JALS relaxation for microMIPS targets.  */
+      else if (r_type == R_MICROMIPS_26_S1
+	       && target_is_micromips_code_p
+	       && irel->r_offset + 7 < sec->size
+	       && MATCH (opcode, jal_insn_32_bd32))
+	{
+	  unsigned long n32opc;
+	  bfd_boolean relaxed = FALSE;
+
+	  n32opc  = bfd_get_16 (abfd, ptr + 4) << 16;
+	  n32opc |= bfd_get_16 (abfd, ptr + 6);
+
+	  if (MATCH (n32opc, nop_insn_32))
+	    {
+	      /* Replace delay slot 32-bit NOP with a 16-bit NOP.  */
+	      bfd_put_16 (abfd, nop_insn_16.match, ptr + 4);
+
+	      relaxed = TRUE;
+	    }
+	  else if (find_match (n32opc, move_insns_32) >= 0)
+	    {
+	      /* Replace delay slot 32-bit MOVE with 16-bit MOVE.  */
+	      bfd_put_16 (abfd,
+			  (move_insn_16.match
+			   | MOVE16_RD_FIELD (MOVE32_RD (n32opc))
+			   | MOVE16_RS_FIELD (MOVE32_RS (n32opc))),
+			  ptr + 4);
+
+	      relaxed = TRUE;
+	    }
+	  /* Other 32-bit instructions relaxable to 16-bit
+	     instructions will be handled here later.  */
+
+	  if (relaxed)
+	    {
+	      /* JAL with 32-bit delay slot that is changed to a JALS
+	         with 16-bit delay slot.  */
+	      bfd_put_16 (abfd, (jal_insn_32_bd16.match >> 16) & 0xffff,
+			  ptr);
+	      bfd_put_16 (abfd,  jal_insn_32_bd16.match        & 0xffff,
+			  ptr + 2);
+
+	      /* Delete 2 bytes from irel->r_offset + 6.  */
+	      delcnt = 2;
+	      deloff = 6;
+	    }
+	}
+
+      if (delcnt != 0)
+	{
+	  /* Note that we've changed the relocs, section contents, etc.  */
+	  elf_section_data (sec)->relocs = internal_relocs;
+	  elf_section_data (sec)->this_hdr.contents = contents;
+	  symtab_hdr->contents = (unsigned char *) isymbuf;
+
+	  /* Delete bytes depending on the delcnt and deloff.  */
+	  if (!mips_elf_relax_delete_bytes (abfd, sec,
+					    irel->r_offset + deloff, delcnt))
+	    goto error_return;
+
+	  /* That will change things, so we should relax again.
+	     Note that this is not required, and it may be slow.  */
+	  *again = TRUE;
+	}
+    }
+
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    {
+      if (! link_info->keep_memory)
+	free (isymbuf);
+      else
+	{
+	  /* Cache the symbols for elf_link_input_bfd.  */
+	  symtab_hdr->contents = (unsigned char *) isymbuf;
+	}
+    }
+
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    {
+      if (! link_info->keep_memory)
+	free (contents);
+      else
+	{
+	  /* Cache the section contents for elf_link_input_bfd.  */
+	  elf_section_data (sec)->this_hdr.contents = contents;
+	}
+    }
+
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return TRUE;
+
+ error_return:
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    free (contents);
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return FALSE;
+}
+
+/* Create a MIPS ELF linker hash table.  */
+
+struct bfd_link_hash_table *
+_bfd_mips_elf_link_hash_table_create (bfd *abfd)
+{
+  struct mips_elf_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct mips_elf_link_hash_table);
+
+  ret = bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (!_bfd_elf_link_hash_table_init (&ret->root, abfd,
+				      mips_elf_link_hash_newfunc,
+				      sizeof (struct mips_elf_link_hash_entry),
+				      MIPS_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+#if 0
+  /* We no longer use this.  */
+  for (i = 0; i < SIZEOF_MIPS_DYNSYM_SECNAMES; i++)
+    ret->dynsym_sec_strindex[i] = (bfd_size_type) -1;
+#endif
+  ret->procedure_count = 0;
+  ret->compact_rel_size = 0;
+  ret->use_rld_obj_head = FALSE;
+  ret->rld_value = 0;
+  ret->mips16_stubs_seen = FALSE;
+  ret->use_plts_and_copy_relocs = FALSE;
+  ret->is_vxworks = FALSE;
+  ret->small_data_overflow_reported = FALSE;
+  ret->srelbss = NULL;
+  ret->sdynbss = NULL;
+  ret->srelplt = NULL;
+  ret->srelplt2 = NULL;
+  ret->sgotplt = NULL;
+  ret->splt = NULL;
+  ret->sstubs = NULL;
+  ret->sgot = NULL;
+  ret->got_info = NULL;
+  ret->plt_header_size = 0;
+  ret->plt_entry_size = 0;
+  ret->lazy_stub_count = 0;
+  ret->function_stub_size = 0;
+  ret->strampoline = NULL;
+  ret->la25_stubs = NULL;
+  ret->add_stub_section = NULL;
+
+  return &ret->root.root;
+}
+
+/* Likewise, but indicate that the target is VxWorks.  */
+
+struct bfd_link_hash_table *
+_bfd_mips_vxworks_link_hash_table_create (bfd *abfd)
+{
+  struct bfd_link_hash_table *ret;
+
+  ret = _bfd_mips_elf_link_hash_table_create (abfd);
+  if (ret)
+    {
+      struct mips_elf_link_hash_table *htab;
+
+      htab = (struct mips_elf_link_hash_table *) ret;
+      htab->use_plts_and_copy_relocs = TRUE;
+      htab->is_vxworks = TRUE;
+    }
+  return ret;
+}
+
+/* A function that the linker calls if we are allowed to use PLTs
+   and copy relocs.  */
+
+void
+_bfd_mips_elf_use_plts_and_copy_relocs (struct bfd_link_info *info)
+{
+  mips_elf_hash_table (info)->use_plts_and_copy_relocs = TRUE;
+}
+
+/* We need to use a special link routine to handle the .reginfo and
+   the .mdebug sections.  We need to merge all instances of these
+   sections together, not write them all out sequentially.  */
+
+bfd_boolean
+_bfd_mips_elf_final_link (bfd *abfd, struct bfd_link_info *info)
+{
+  asection *o;
+  struct bfd_link_order *p;
+  asection *reginfo_sec, *mdebug_sec, *gptab_data_sec, *gptab_bss_sec;
+  asection *rtproc_sec;
+  Elf32_RegInfo reginfo;
+  struct ecoff_debug_info debug;
+  struct mips_htab_traverse_info hti;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  const struct ecoff_debug_swap *swap = bed->elf_backend_ecoff_debug_swap;
+  HDRR *symhdr = &debug.symbolic_header;
+  void *mdebug_handle = NULL;
+  asection *s;
+  EXTR esym;
+  unsigned int i;
+  bfd_size_type amt;
+  struct mips_elf_link_hash_table *htab;
+
+  static const char * const secname[] =
+  {
+    ".text", ".init", ".fini", ".data",
+    ".rodata", ".sdata", ".sbss", ".bss"
+  };
+  static const int sc[] =
+  {
+    scText, scInit, scFini, scData,
+    scRData, scSData, scSBss, scBss
+  };
+
+  /* Sort the dynamic symbols so that those with GOT entries come after
+     those without.  */
+  htab = mips_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  if (!mips_elf_sort_hash_table (abfd, info))
+    return FALSE;
+
+  /* Create any scheduled LA25 stubs.  */
+  hti.info = info;
+  hti.output_bfd = abfd;
+  hti.error = FALSE;
+  htab_traverse (htab->la25_stubs, mips_elf_create_la25_stub, &hti);
+  if (hti.error)
+    return FALSE;
+
+  /* Get a value for the GP register.  */
+  if (elf_gp (abfd) == 0)
+    {
+      struct bfd_link_hash_entry *h;
+
+      h = bfd_link_hash_lookup (info->hash, "_gp", FALSE, FALSE, TRUE);
+      if (h != NULL && h->type == bfd_link_hash_defined)
+	elf_gp (abfd) = (h->u.def.value
+			 + h->u.def.section->output_section->vma
+			 + h->u.def.section->output_offset);
+      else if (htab->is_vxworks
+	       && (h = bfd_link_hash_lookup (info->hash,
+					     "_GLOBAL_OFFSET_TABLE_",
+					     FALSE, FALSE, TRUE))
+	       && h->type == bfd_link_hash_defined)
+	elf_gp (abfd) = (h->u.def.section->output_section->vma
+			 + h->u.def.section->output_offset
+			 + h->u.def.value);
+      else if (info->relocatable)
+	{
+	  bfd_vma lo = MINUS_ONE;
+
+	  /* Find the GP-relative section with the lowest offset.  */
+	  for (o = abfd->sections; o != NULL; o = o->next)
+	    if (o->vma < lo
+		&& (elf_section_data (o)->this_hdr.sh_flags & SHF_MIPS_GPREL))
+	      lo = o->vma;
+
+	  /* And calculate GP relative to that.  */
+	  elf_gp (abfd) = lo + ELF_MIPS_GP_OFFSET (info);
+	}
+      else
+	{
+	  /* If the relocate_section function needs to do a reloc
+	     involving the GP value, it should make a reloc_dangerous
+	     callback to warn that GP is not defined.  */
+	}
+    }
+
+  /* Go through the sections and collect the .reginfo and .mdebug
+     information.  */
+  reginfo_sec = NULL;
+  mdebug_sec = NULL;
+  gptab_data_sec = NULL;
+  gptab_bss_sec = NULL;
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      if (strcmp (o->name, ".reginfo") == 0)
+	{
+	  memset (&reginfo, 0, sizeof reginfo);
+
+	  /* We have found the .reginfo section in the output file.
+	     Look through all the link_orders comprising it and merge
+	     the information together.  */
+	  for (p = o->map_head.link_order; p != NULL; p = p->next)
+	    {
+	      asection *input_section;
+	      bfd *input_bfd;
+	      Elf32_External_RegInfo ext;
+	      Elf32_RegInfo sub;
+
+	      if (p->type != bfd_indirect_link_order)
+		{
+		  if (p->type == bfd_data_link_order)
+		    continue;
+		  abort ();
+		}
+
+	      input_section = p->u.indirect.section;
+	      input_bfd = input_section->owner;
+
+	      if (! bfd_get_section_contents (input_bfd, input_section,
+					      &ext, 0, sizeof ext))
+		return FALSE;
+
+	      bfd_mips_elf32_swap_reginfo_in (input_bfd, &ext, &sub);
+
+	      reginfo.ri_gprmask |= sub.ri_gprmask;
+	      reginfo.ri_cprmask[0] |= sub.ri_cprmask[0];
+	      reginfo.ri_cprmask[1] |= sub.ri_cprmask[1];
+	      reginfo.ri_cprmask[2] |= sub.ri_cprmask[2];
+	      reginfo.ri_cprmask[3] |= sub.ri_cprmask[3];
+
+	      /* ri_gp_value is set by the function
+		 mips_elf32_section_processing when the section is
+		 finally written out.  */
+
+	      /* Hack: reset the SEC_HAS_CONTENTS flag so that
+		 elf_link_input_bfd ignores this section.  */
+	      input_section->flags &= ~SEC_HAS_CONTENTS;
+	    }
+
+	  /* Size has been set in _bfd_mips_elf_always_size_sections.  */
+	  BFD_ASSERT(o->size == sizeof (Elf32_External_RegInfo));
+
+	  /* Skip this section later on (I don't think this currently
+	     matters, but someday it might).  */
+	  o->map_head.link_order = NULL;
+
+	  reginfo_sec = o;
+	}
+
+      if (strcmp (o->name, ".mdebug") == 0)
+	{
+	  struct extsym_info einfo;
+	  bfd_vma last;
+
+	  /* We have found the .mdebug section in the output file.
+	     Look through all the link_orders comprising it and merge
+	     the information together.  */
+	  symhdr->magic = swap->sym_magic;
+	  /* FIXME: What should the version stamp be?  */
+	  symhdr->vstamp = 0;
+	  symhdr->ilineMax = 0;
+	  symhdr->cbLine = 0;
+	  symhdr->idnMax = 0;
+	  symhdr->ipdMax = 0;
+	  symhdr->isymMax = 0;
+	  symhdr->ioptMax = 0;
+	  symhdr->iauxMax = 0;
+	  symhdr->issMax = 0;
+	  symhdr->issExtMax = 0;
+	  symhdr->ifdMax = 0;
+	  symhdr->crfd = 0;
+	  symhdr->iextMax = 0;
+
+	  /* We accumulate the debugging information itself in the
+	     debug_info structure.  */
+	  debug.line = NULL;
+	  debug.external_dnr = NULL;
+	  debug.external_pdr = NULL;
+	  debug.external_sym = NULL;
+	  debug.external_opt = NULL;
+	  debug.external_aux = NULL;
+	  debug.ss = NULL;
+	  debug.ssext = debug.ssext_end = NULL;
+	  debug.external_fdr = NULL;
+	  debug.external_rfd = NULL;
+	  debug.external_ext = debug.external_ext_end = NULL;
+
+	  mdebug_handle = bfd_ecoff_debug_init (abfd, &debug, swap, info);
+	  if (mdebug_handle == NULL)
+	    return FALSE;
+
+	  esym.jmptbl = 0;
+	  esym.cobol_main = 0;
+	  esym.weakext = 0;
+	  esym.reserved = 0;
+	  esym.ifd = ifdNil;
+	  esym.asym.iss = issNil;
+	  esym.asym.st = stLocal;
+	  esym.asym.reserved = 0;
+	  esym.asym.index = indexNil;
+	  last = 0;
+	  for (i = 0; i < sizeof (secname) / sizeof (secname[0]); i++)
+	    {
+	      esym.asym.sc = sc[i];
+	      s = bfd_get_section_by_name (abfd, secname[i]);
+	      if (s != NULL)
+		{
+		  esym.asym.value = s->vma;
+		  last = s->vma + s->size;
+		}
+	      else
+		esym.asym.value = last;
+	      if (!bfd_ecoff_debug_one_external (abfd, &debug, swap,
+						 secname[i], &esym))
+		return FALSE;
+	    }
+
+	  for (p = o->map_head.link_order; p != NULL; p = p->next)
+	    {
+	      asection *input_section;
+	      bfd *input_bfd;
+	      const struct ecoff_debug_swap *input_swap;
+	      struct ecoff_debug_info input_debug;
+	      char *eraw_src;
+	      char *eraw_end;
+
+	      if (p->type != bfd_indirect_link_order)
+		{
+		  if (p->type == bfd_data_link_order)
+		    continue;
+		  abort ();
+		}
+
+	      input_section = p->u.indirect.section;
+	      input_bfd = input_section->owner;
+
+	      if (!is_mips_elf (input_bfd))
+		{
+		  /* I don't know what a non MIPS ELF bfd would be
+		     doing with a .mdebug section, but I don't really
+		     want to deal with it.  */
+		  continue;
+		}
+
+	      input_swap = (get_elf_backend_data (input_bfd)
+			    ->elf_backend_ecoff_debug_swap);
+
+	      BFD_ASSERT (p->size == input_section->size);
+
+	      /* The ECOFF linking code expects that we have already
+		 read in the debugging information and set up an
+		 ecoff_debug_info structure, so we do that now.  */
+	      if (! _bfd_mips_elf_read_ecoff_info (input_bfd, input_section,
+						   &input_debug))
+		return FALSE;
+
+	      if (! (bfd_ecoff_debug_accumulate
+		     (mdebug_handle, abfd, &debug, swap, input_bfd,
+		      &input_debug, input_swap, info)))
+		return FALSE;
+
+	      /* Loop through the external symbols.  For each one with
+		 interesting information, try to find the symbol in
+		 the linker global hash table and save the information
+		 for the output external symbols.  */
+	      eraw_src = input_debug.external_ext;
+	      eraw_end = (eraw_src
+			  + (input_debug.symbolic_header.iextMax
+			     * input_swap->external_ext_size));
+	      for (;
+		   eraw_src < eraw_end;
+		   eraw_src += input_swap->external_ext_size)
+		{
+		  EXTR ext;
+		  const char *name;
+		  struct mips_elf_link_hash_entry *h;
+
+		  (*input_swap->swap_ext_in) (input_bfd, eraw_src, &ext);
+		  if (ext.asym.sc == scNil
+		      || ext.asym.sc == scUndefined
+		      || ext.asym.sc == scSUndefined)
+		    continue;
+
+		  name = input_debug.ssext + ext.asym.iss;
+		  h = mips_elf_link_hash_lookup (mips_elf_hash_table (info),
+						 name, FALSE, FALSE, TRUE);
+		  if (h == NULL || h->esym.ifd != -2)
+		    continue;
+
+		  if (ext.ifd != -1)
+		    {
+		      BFD_ASSERT (ext.ifd
+				  < input_debug.symbolic_header.ifdMax);
+		      ext.ifd = input_debug.ifdmap[ext.ifd];
+		    }
+
+		  h->esym = ext;
+		}
+
+	      /* Free up the information we just read.  */
+	      free (input_debug.line);
+	      free (input_debug.external_dnr);
+	      free (input_debug.external_pdr);
+	      free (input_debug.external_sym);
+	      free (input_debug.external_opt);
+	      free (input_debug.external_aux);
+	      free (input_debug.ss);
+	      free (input_debug.ssext);
+	      free (input_debug.external_fdr);
+	      free (input_debug.external_rfd);
+	      free (input_debug.external_ext);
+
+	      /* Hack: reset the SEC_HAS_CONTENTS flag so that
+		 elf_link_input_bfd ignores this section.  */
+	      input_section->flags &= ~SEC_HAS_CONTENTS;
+	    }
+
+	  if (SGI_COMPAT (abfd) && info->shared)
+	    {
+	      /* Create .rtproc section.  */
+	      rtproc_sec = bfd_get_section_by_name (abfd, ".rtproc");
+	      if (rtproc_sec == NULL)
+		{
+		  flagword flags = (SEC_HAS_CONTENTS | SEC_IN_MEMORY
+				    | SEC_LINKER_CREATED | SEC_READONLY);
+
+		  rtproc_sec = bfd_make_section_with_flags (abfd,
+							    ".rtproc",
+							    flags);
+		  if (rtproc_sec == NULL
+		      || ! bfd_set_section_alignment (abfd, rtproc_sec, 4))
+		    return FALSE;
+		}
+
+	      if (! mips_elf_create_procedure_table (mdebug_handle, abfd,
+						     info, rtproc_sec,
+						     &debug))
+		return FALSE;
+	    }
+
+	  /* Build the external symbol information.  */
+	  einfo.abfd = abfd;
+	  einfo.info = info;
+	  einfo.debug = &debug;
+	  einfo.swap = swap;
+	  einfo.failed = FALSE;
+	  mips_elf_link_hash_traverse (mips_elf_hash_table (info),
+				       mips_elf_output_extsym, &einfo);
+	  if (einfo.failed)
+	    return FALSE;
+
+	  /* Set the size of the .mdebug section.  */
+	  o->size = bfd_ecoff_debug_size (abfd, &debug, swap);
+
+	  /* Skip this section later on (I don't think this currently
+	     matters, but someday it might).  */
+	  o->map_head.link_order = NULL;
+
+	  mdebug_sec = o;
+	}
+
+      if (CONST_STRNEQ (o->name, ".gptab."))
+	{
+	  const char *subname;
+	  unsigned int c;
+	  Elf32_gptab *tab;
+	  Elf32_External_gptab *ext_tab;
+	  unsigned int j;
+
+	  /* The .gptab.sdata and .gptab.sbss sections hold
+	     information describing how the small data area would
+	     change depending upon the -G switch.  These sections
+	     not used in executables files.  */
+	  if (! info->relocatable)
+	    {
+	      for (p = o->map_head.link_order; p != NULL; p = p->next)
+		{
+		  asection *input_section;
+
+		  if (p->type != bfd_indirect_link_order)
+		    {
+		      if (p->type == bfd_data_link_order)
+			continue;
+		      abort ();
+		    }
+
+		  input_section = p->u.indirect.section;
+
+		  /* Hack: reset the SEC_HAS_CONTENTS flag so that
+		     elf_link_input_bfd ignores this section.  */
+		  input_section->flags &= ~SEC_HAS_CONTENTS;
+		}
+
+	      /* Skip this section later on (I don't think this
+		 currently matters, but someday it might).  */
+	      o->map_head.link_order = NULL;
+
+	      /* Really remove the section.  */
+	      bfd_section_list_remove (abfd, o);
+	      --abfd->section_count;
+
+	      continue;
+	    }
+
+	  /* There is one gptab for initialized data, and one for
+	     uninitialized data.  */
+	  if (strcmp (o->name, ".gptab.sdata") == 0)
+	    gptab_data_sec = o;
+	  else if (strcmp (o->name, ".gptab.sbss") == 0)
+	    gptab_bss_sec = o;
+	  else
+	    {
+	      (*_bfd_error_handler)
+		(_("%s: illegal section name `%s'"),
+		 bfd_get_filename (abfd), o->name);
+	      bfd_set_error (bfd_error_nonrepresentable_section);
+	      return FALSE;
+	    }
+
+	  /* The linker script always combines .gptab.data and
+	     .gptab.sdata into .gptab.sdata, and likewise for
+	     .gptab.bss and .gptab.sbss.  It is possible that there is
+	     no .sdata or .sbss section in the output file, in which
+	     case we must change the name of the output section.  */
+	  subname = o->name + sizeof ".gptab" - 1;
+	  if (bfd_get_section_by_name (abfd, subname) == NULL)
+	    {
+	      if (o == gptab_data_sec)
+		o->name = ".gptab.data";
+	      else
+		o->name = ".gptab.bss";
+	      subname = o->name + sizeof ".gptab" - 1;
+	      BFD_ASSERT (bfd_get_section_by_name (abfd, subname) != NULL);
+	    }
+
+	  /* Set up the first entry.  */
+	  c = 1;
+	  amt = c * sizeof (Elf32_gptab);
+	  tab = bfd_malloc (amt);
+	  if (tab == NULL)
+	    return FALSE;
+	  tab[0].gt_header.gt_current_g_value = elf_gp_size (abfd);
+	  tab[0].gt_header.gt_unused = 0;
+
+	  /* Combine the input sections.  */
+	  for (p = o->map_head.link_order; p != NULL; p = p->next)
+	    {
+	      asection *input_section;
+	      bfd *input_bfd;
+	      bfd_size_type size;
+	      unsigned long last;
+	      bfd_size_type gpentry;
+
+	      if (p->type != bfd_indirect_link_order)
+		{
+		  if (p->type == bfd_data_link_order)
+		    continue;
+		  abort ();
+		}
+
+	      input_section = p->u.indirect.section;
+	      input_bfd = input_section->owner;
+
+	      /* Combine the gptab entries for this input section one
+		 by one.  We know that the input gptab entries are
+		 sorted by ascending -G value.  */
+	      size = input_section->size;
+	      last = 0;
+	      for (gpentry = sizeof (Elf32_External_gptab);
+		   gpentry < size;
+		   gpentry += sizeof (Elf32_External_gptab))
+		{
+		  Elf32_External_gptab ext_gptab;
+		  Elf32_gptab int_gptab;
+		  unsigned long val;
+		  unsigned long add;
+		  bfd_boolean exact;
+		  unsigned int look;
+
+		  if (! (bfd_get_section_contents
+			 (input_bfd, input_section, &ext_gptab, gpentry,
+			  sizeof (Elf32_External_gptab))))
+		    {
+		      free (tab);
+		      return FALSE;
+		    }
+
+		  bfd_mips_elf32_swap_gptab_in (input_bfd, &ext_gptab,
+						&int_gptab);
+		  val = int_gptab.gt_entry.gt_g_value;
+		  add = int_gptab.gt_entry.gt_bytes - last;
+
+		  exact = FALSE;
+		  for (look = 1; look < c; look++)
+		    {
+		      if (tab[look].gt_entry.gt_g_value >= val)
+			tab[look].gt_entry.gt_bytes += add;
+
+		      if (tab[look].gt_entry.gt_g_value == val)
+			exact = TRUE;
+		    }
+
+		  if (! exact)
+		    {
+		      Elf32_gptab *new_tab;
+		      unsigned int max;
+
+		      /* We need a new table entry.  */
+		      amt = (bfd_size_type) (c + 1) * sizeof (Elf32_gptab);
+		      new_tab = bfd_realloc (tab, amt);
+		      if (new_tab == NULL)
+			{
+			  free (tab);
+			  return FALSE;
+			}
+		      tab = new_tab;
+		      tab[c].gt_entry.gt_g_value = val;
+		      tab[c].gt_entry.gt_bytes = add;
+
+		      /* Merge in the size for the next smallest -G
+			 value, since that will be implied by this new
+			 value.  */
+		      max = 0;
+		      for (look = 1; look < c; look++)
+			{
+			  if (tab[look].gt_entry.gt_g_value < val
+			      && (max == 0
+				  || (tab[look].gt_entry.gt_g_value
+				      > tab[max].gt_entry.gt_g_value)))
+			    max = look;
+			}
+		      if (max != 0)
+			tab[c].gt_entry.gt_bytes +=
+			  tab[max].gt_entry.gt_bytes;
+
+		      ++c;
+		    }
+
+		  last = int_gptab.gt_entry.gt_bytes;
+		}
+
+	      /* Hack: reset the SEC_HAS_CONTENTS flag so that
+		 elf_link_input_bfd ignores this section.  */
+	      input_section->flags &= ~SEC_HAS_CONTENTS;
+	    }
+
+	  /* The table must be sorted by -G value.  */
+	  if (c > 2)
+	    qsort (tab + 1, c - 1, sizeof (tab[0]), gptab_compare);
+
+	  /* Swap out the table.  */
+	  amt = (bfd_size_type) c * sizeof (Elf32_External_gptab);
+	  ext_tab = bfd_alloc (abfd, amt);
+	  if (ext_tab == NULL)
+	    {
+	      free (tab);
+	      return FALSE;
+	    }
+
+	  for (j = 0; j < c; j++)
+	    bfd_mips_elf32_swap_gptab_out (abfd, tab + j, ext_tab + j);
+	  free (tab);
+
+	  o->size = c * sizeof (Elf32_External_gptab);
+	  o->contents = (bfd_byte *) ext_tab;
+
+	  /* Skip this section later on (I don't think this currently
+	     matters, but someday it might).  */
+	  o->map_head.link_order = NULL;
+	}
+    }
+
+  /* Invoke the regular ELF backend linker to do all the work.  */
+  if (!bfd_elf_final_link (abfd, info))
+    return FALSE;
+
+  /* Now write out the computed sections.  */
+
+  if (reginfo_sec != NULL)
+    {
+      Elf32_External_RegInfo ext;
+
+      bfd_mips_elf32_swap_reginfo_out (abfd, &reginfo, &ext);
+      if (! bfd_set_section_contents (abfd, reginfo_sec, &ext, 0, sizeof ext))
+	return FALSE;
+    }
+
+  if (mdebug_sec != NULL)
+    {
+      BFD_ASSERT (abfd->output_has_begun);
+      if (! bfd_ecoff_write_accumulated_debug (mdebug_handle, abfd, &debug,
+					       swap, info,
+					       mdebug_sec->filepos))
+	return FALSE;
+
+      bfd_ecoff_debug_free (mdebug_handle, abfd, &debug, swap, info);
+    }
+
+  if (gptab_data_sec != NULL)
+    {
+      if (! bfd_set_section_contents (abfd, gptab_data_sec,
+				      gptab_data_sec->contents,
+				      0, gptab_data_sec->size))
+	return FALSE;
+    }
+
+  if (gptab_bss_sec != NULL)
+    {
+      if (! bfd_set_section_contents (abfd, gptab_bss_sec,
+				      gptab_bss_sec->contents,
+				      0, gptab_bss_sec->size))
+	return FALSE;
+    }
+
+  if (SGI_COMPAT (abfd))
+    {
+      rtproc_sec = bfd_get_section_by_name (abfd, ".rtproc");
+      if (rtproc_sec != NULL)
+	{
+	  if (! bfd_set_section_contents (abfd, rtproc_sec,
+					  rtproc_sec->contents,
+					  0, rtproc_sec->size))
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Structure for saying that BFD machine EXTENSION extends BASE.  */
+
+struct mips_mach_extension {
+  unsigned long extension, base;
+};
+
+
+/* An array describing how BFD machines relate to one another.  The entries
+   are ordered topologically with MIPS I extensions listed last.  */
+
+static const struct mips_mach_extension mips_mach_extensions[] = {
+  /* MIPS64r2 extensions.  */
+  { bfd_mach_mips_octeon, bfd_mach_mipsisa64r2 },
+
+  /* MIPS64 extensions.  */
+  { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 },
+  { bfd_mach_mips_sb1, bfd_mach_mipsisa64 },
+  { bfd_mach_mips_xlr, bfd_mach_mipsisa64 },
+  { bfd_mach_mips_loongson_3a, bfd_mach_mipsisa64 },
+
+  /* MIPS V extensions.  */
+  { bfd_mach_mipsisa64, bfd_mach_mips5 },
+
+  /* R10000 extensions.  */
+  { bfd_mach_mips12000, bfd_mach_mips10000 },
+  { bfd_mach_mips14000, bfd_mach_mips10000 },
+  { bfd_mach_mips16000, bfd_mach_mips10000 },
+
+  /* R5000 extensions.  Note: the vr5500 ISA is an extension of the core
+     vr5400 ISA, but doesn't include the multimedia stuff.  It seems
+     better to allow vr5400 and vr5500 code to be merged anyway, since
+     many libraries will just use the core ISA.  Perhaps we could add
+     some sort of ASE flag if this ever proves a problem.  */
+  { bfd_mach_mips5500, bfd_mach_mips5400 },
+  { bfd_mach_mips5400, bfd_mach_mips5000 },
+
+  /* MIPS IV extensions.  */
+  { bfd_mach_mips5, bfd_mach_mips8000 },
+  { bfd_mach_mips10000, bfd_mach_mips8000 },
+  { bfd_mach_mips5000, bfd_mach_mips8000 },
+  { bfd_mach_mips7000, bfd_mach_mips8000 },
+  { bfd_mach_mips9000, bfd_mach_mips8000 },
+
+  /* VR4100 extensions.  */
+  { bfd_mach_mips4120, bfd_mach_mips4100 },
+  { bfd_mach_mips4111, bfd_mach_mips4100 },
+
+  /* MIPS III extensions.  */
+  { bfd_mach_mips_loongson_2e, bfd_mach_mips4000 },
+  { bfd_mach_mips_loongson_2f, bfd_mach_mips4000 },
+  { bfd_mach_mips8000, bfd_mach_mips4000 },
+  { bfd_mach_mips4650, bfd_mach_mips4000 },
+  { bfd_mach_mips4600, bfd_mach_mips4000 },
+  { bfd_mach_mips4400, bfd_mach_mips4000 },
+  { bfd_mach_mips4300, bfd_mach_mips4000 },
+  { bfd_mach_mips4100, bfd_mach_mips4000 },
+  { bfd_mach_mips4010, bfd_mach_mips4000 },
+
+  /* MIPS32 extensions.  */
+  { bfd_mach_mipsisa32r2, bfd_mach_mipsisa32 },
+
+  /* MIPS II extensions.  */
+  { bfd_mach_mips4000, bfd_mach_mips6000 },
+  { bfd_mach_mipsisa32, bfd_mach_mips6000 },
+
+  /* MIPS I extensions.  */
+  { bfd_mach_mips6000, bfd_mach_mips3000 },
+  { bfd_mach_mips3900, bfd_mach_mips3000 }
+};
+
+
+/* Return true if bfd machine EXTENSION is an extension of machine BASE.  */
+
+static bfd_boolean
+mips_mach_extends_p (unsigned long base, unsigned long extension)
+{
+  size_t i;
+
+  if (extension == base)
+    return TRUE;
+
+  if (base == bfd_mach_mipsisa32
+      && mips_mach_extends_p (bfd_mach_mipsisa64, extension))
+    return TRUE;
+
+  if (base == bfd_mach_mipsisa32r2
+      && mips_mach_extends_p (bfd_mach_mipsisa64r2, extension))
+    return TRUE;
+
+  for (i = 0; i < ARRAY_SIZE (mips_mach_extensions); i++)
+    if (extension == mips_mach_extensions[i].extension)
+      {
+	extension = mips_mach_extensions[i].base;
+	if (extension == base)
+	  return TRUE;
+      }
+
+  return FALSE;
+}
+
+
+/* Return true if the given ELF header flags describe a 32-bit binary.  */
+
+static bfd_boolean
+mips_32bit_flags_p (flagword flags)
+{
+  return ((flags & EF_MIPS_32BITMODE) != 0
+	  || (flags & EF_MIPS_ABI) == E_MIPS_ABI_O32
+	  || (flags & EF_MIPS_ABI) == E_MIPS_ABI_EABI32
+	  || (flags & EF_MIPS_ARCH) == E_MIPS_ARCH_1
+	  || (flags & EF_MIPS_ARCH) == E_MIPS_ARCH_2
+	  || (flags & EF_MIPS_ARCH) == E_MIPS_ARCH_32
+	  || (flags & EF_MIPS_ARCH) == E_MIPS_ARCH_32R2);
+}
+
+
+/* Merge object attributes from IBFD into OBFD.  Raise an error if
+   there are conflicting attributes.  */
+static bfd_boolean
+mips_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd)
+{
+  obj_attribute *in_attr;
+  obj_attribute *out_attr;
+
+  if (!elf_known_obj_attributes_proc (obfd)[0].i)
+    {
+      /* This is the first object.  Copy the attributes.  */
+      _bfd_elf_copy_obj_attributes (ibfd, obfd);
+
+      /* Use the Tag_null value to indicate the attributes have been
+	 initialized.  */
+      elf_known_obj_attributes_proc (obfd)[0].i = 1;
+
+      return TRUE;
+    }
+
+  /* Check for conflicting Tag_GNU_MIPS_ABI_FP attributes and merge
+     non-conflicting ones.  */
+  in_attr = elf_known_obj_attributes (ibfd)[OBJ_ATTR_GNU];
+  out_attr = elf_known_obj_attributes (obfd)[OBJ_ATTR_GNU];
+  if (in_attr[Tag_GNU_MIPS_ABI_FP].i != out_attr[Tag_GNU_MIPS_ABI_FP].i)
+    {
+      out_attr[Tag_GNU_MIPS_ABI_FP].type = 1;
+      if (out_attr[Tag_GNU_MIPS_ABI_FP].i == 0)
+	out_attr[Tag_GNU_MIPS_ABI_FP].i = in_attr[Tag_GNU_MIPS_ABI_FP].i;
+      else if (in_attr[Tag_GNU_MIPS_ABI_FP].i == 0)
+	;
+      else if (in_attr[Tag_GNU_MIPS_ABI_FP].i > 4)
+	_bfd_error_handler
+	  (_("Warning: %B uses unknown floating point ABI %d"), ibfd,
+	   in_attr[Tag_GNU_MIPS_ABI_FP].i);
+      else if (out_attr[Tag_GNU_MIPS_ABI_FP].i > 4)
+	_bfd_error_handler
+	  (_("Warning: %B uses unknown floating point ABI %d"), obfd,
+	   out_attr[Tag_GNU_MIPS_ABI_FP].i);
+      else
+	switch (out_attr[Tag_GNU_MIPS_ABI_FP].i)
+	  {
+	  case 1:
+	    switch (in_attr[Tag_GNU_MIPS_ABI_FP].i)
+	      {
+	      case 2:
+		_bfd_error_handler
+		  (_("Warning: %B uses -msingle-float, %B uses -mdouble-float"),
+		   obfd, ibfd);
+		break;
+
+	      case 3:
+		_bfd_error_handler
+		  (_("Warning: %B uses hard float, %B uses soft float"),
+		   obfd, ibfd);
+		break;
+
+	      case 4:
+		_bfd_error_handler
+		  (_("Warning: %B uses -msingle-float, %B uses -mips32r2 -mfp64"),
+		   obfd, ibfd);
+		break;
+
+	      default:
+		abort ();
+	      }
+	    break;
+
+	  case 2:
+	    switch (in_attr[Tag_GNU_MIPS_ABI_FP].i)
+	      {
+	      case 1:
+		_bfd_error_handler
+		  (_("Warning: %B uses -msingle-float, %B uses -mdouble-float"),
+		   ibfd, obfd);
+		break;
+
+	      case 3:
+		_bfd_error_handler
+		  (_("Warning: %B uses hard float, %B uses soft float"),
+		   obfd, ibfd);
+		break;
+
+	      case 4:
+		_bfd_error_handler
+		  (_("Warning: %B uses -mdouble-float, %B uses -mips32r2 -mfp64"),
+		   obfd, ibfd);
+		break;
+
+	      default:
+		abort ();
+	      }
+	    break;
+
+	  case 3:
+	    switch (in_attr[Tag_GNU_MIPS_ABI_FP].i)
+	      {
+	      case 1:
+	      case 2:
+	      case 4:
+		_bfd_error_handler
+		  (_("Warning: %B uses hard float, %B uses soft float"),
+		   ibfd, obfd);
+		break;
+
+	      default:
+		abort ();
+	      }
+	    break;
+
+	  case 4:
+	    switch (in_attr[Tag_GNU_MIPS_ABI_FP].i)
+	      {
+	      case 1:
+		_bfd_error_handler
+		  (_("Warning: %B uses -msingle-float, %B uses -mips32r2 -mfp64"),
+		   ibfd, obfd);
+		break;
+
+	      case 2:
+		_bfd_error_handler
+		  (_("Warning: %B uses -mdouble-float, %B uses -mips32r2 -mfp64"),
+		   ibfd, obfd);
+		break;
+
+	      case 3:
+		_bfd_error_handler
+		  (_("Warning: %B uses hard float, %B uses soft float"),
+		   obfd, ibfd);
+		break;
+
+	      default:
+		abort ();
+	      }
+	    break;
+
+	  default:
+	    abort ();
+	  }
+    }
+
+  /* Merge Tag_compatibility attributes and any common GNU ones.  */
+  _bfd_elf_merge_object_attributes (ibfd, obfd);
+
+  return TRUE;
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+
+bfd_boolean
+_bfd_mips_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  flagword old_flags;
+  flagword new_flags;
+  bfd_boolean ok;
+  bfd_boolean null_input_bfd = TRUE;
+  asection *sec;
+
+  /* Check if we have the same endianness.  */
+  if (! _bfd_generic_verify_endian_match (ibfd, obfd))
+    {
+      (*_bfd_error_handler)
+	(_("%B: endianness incompatible with that of the selected emulation"),
+	 ibfd);
+      return FALSE;
+    }
+
+  if (!is_mips_elf (ibfd) || !is_mips_elf (obfd))
+    return TRUE;
+
+  if (strcmp (bfd_get_target (ibfd), bfd_get_target (obfd)) != 0)
+    {
+      (*_bfd_error_handler)
+	(_("%B: ABI is incompatible with that of the selected emulation"),
+	 ibfd);
+      return FALSE;
+    }
+
+  if (!mips_elf_merge_obj_attributes (ibfd, obfd))
+    return FALSE;
+
+  new_flags = elf_elfheader (ibfd)->e_flags;
+  elf_elfheader (obfd)->e_flags |= new_flags & EF_MIPS_NOREORDER;
+  old_flags = elf_elfheader (obfd)->e_flags;
+
+  if (! elf_flags_init (obfd))
+    {
+      elf_flags_init (obfd) = TRUE;
+      elf_elfheader (obfd)->e_flags = new_flags;
+      elf_elfheader (obfd)->e_ident[EI_CLASS]
+	= elf_elfheader (ibfd)->e_ident[EI_CLASS];
+
+      if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
+	  && (bfd_get_arch_info (obfd)->the_default
+	      || mips_mach_extends_p (bfd_get_mach (obfd), 
+				      bfd_get_mach (ibfd))))
+	{
+	  if (! bfd_set_arch_mach (obfd, bfd_get_arch (ibfd),
+				   bfd_get_mach (ibfd)))
+	    return FALSE;
+	}
+
+      return TRUE;
+    }
+
+  /* Check flag compatibility.  */
+
+  new_flags &= ~EF_MIPS_NOREORDER;
+  old_flags &= ~EF_MIPS_NOREORDER;
+
+  /* Some IRIX 6 BSD-compatibility objects have this bit set.  It
+     doesn't seem to matter.  */
+  new_flags &= ~EF_MIPS_XGOT;
+  old_flags &= ~EF_MIPS_XGOT;
+
+  /* MIPSpro generates ucode info in n64 objects.  Again, we should
+     just be able to ignore this.  */
+  new_flags &= ~EF_MIPS_UCODE;
+  old_flags &= ~EF_MIPS_UCODE;
+
+  /* DSOs should only be linked with CPIC code.  */
+  if ((ibfd->flags & DYNAMIC) != 0)
+    new_flags |= EF_MIPS_PIC | EF_MIPS_CPIC;
+
+  if (new_flags == old_flags)
+    return TRUE;
+
+  /* Check to see if the input BFD actually contains any sections.
+     If not, its flags may not have been initialised either, but it cannot
+     actually cause any incompatibility.  */
+  for (sec = ibfd->sections; sec != NULL; sec = sec->next)
+    {
+      /* Ignore synthetic sections and empty .text, .data and .bss sections
+	 which are automatically generated by gas.  Also ignore fake
+	 (s)common sections, since merely defining a common symbol does
+	 not affect compatibility.  */
+      if ((sec->flags & SEC_IS_COMMON) == 0
+	  && strcmp (sec->name, ".reginfo")
+	  && strcmp (sec->name, ".mdebug")
+	  && (sec->size != 0
+	      || (strcmp (sec->name, ".text")
+		  && strcmp (sec->name, ".data")
+		  && strcmp (sec->name, ".bss"))))
+	{
+	  null_input_bfd = FALSE;
+	  break;
+	}
+    }
+  if (null_input_bfd)
+    return TRUE;
+
+  ok = TRUE;
+
+  if (((new_flags & (EF_MIPS_PIC | EF_MIPS_CPIC)) != 0)
+      != ((old_flags & (EF_MIPS_PIC | EF_MIPS_CPIC)) != 0))
+    {
+      (*_bfd_error_handler)
+	(_("%B: warning: linking abicalls files with non-abicalls files"),
+	 ibfd);
+      ok = TRUE;
+    }
+
+  if (new_flags & (EF_MIPS_PIC | EF_MIPS_CPIC))
+    elf_elfheader (obfd)->e_flags |= EF_MIPS_CPIC;
+  if (! (new_flags & EF_MIPS_PIC))
+    elf_elfheader (obfd)->e_flags &= ~EF_MIPS_PIC;
+
+  new_flags &= ~ (EF_MIPS_PIC | EF_MIPS_CPIC);
+  old_flags &= ~ (EF_MIPS_PIC | EF_MIPS_CPIC);
+
+  /* Compare the ISAs.  */
+  if (mips_32bit_flags_p (old_flags) != mips_32bit_flags_p (new_flags))
+    {
+      (*_bfd_error_handler)
+	(_("%B: linking 32-bit code with 64-bit code"),
+	 ibfd);
+      ok = FALSE;
+    }
+  else if (!mips_mach_extends_p (bfd_get_mach (ibfd), bfd_get_mach (obfd)))
+    {
+      /* OBFD's ISA isn't the same as, or an extension of, IBFD's.  */
+      if (mips_mach_extends_p (bfd_get_mach (obfd), bfd_get_mach (ibfd)))
+	{
+	  /* Copy the architecture info from IBFD to OBFD.  Also copy
+	     the 32-bit flag (if set) so that we continue to recognise
+	     OBFD as a 32-bit binary.  */
+	  bfd_set_arch_info (obfd, bfd_get_arch_info (ibfd));
+	  elf_elfheader (obfd)->e_flags &= ~(EF_MIPS_ARCH | EF_MIPS_MACH);
+	  elf_elfheader (obfd)->e_flags
+	    |= new_flags & (EF_MIPS_ARCH | EF_MIPS_MACH | EF_MIPS_32BITMODE);
+
+	  /* Copy across the ABI flags if OBFD doesn't use them
+	     and if that was what caused us to treat IBFD as 32-bit.  */
+	  if ((old_flags & EF_MIPS_ABI) == 0
+	      && mips_32bit_flags_p (new_flags)
+	      && !mips_32bit_flags_p (new_flags & ~EF_MIPS_ABI))
+	    elf_elfheader (obfd)->e_flags |= new_flags & EF_MIPS_ABI;
+	}
+      else
+	{
+	  /* The ISAs aren't compatible.  */
+	  (*_bfd_error_handler)
+	    (_("%B: linking %s module with previous %s modules"),
+	     ibfd,
+	     bfd_printable_name (ibfd),
+	     bfd_printable_name (obfd));
+	  ok = FALSE;
+	}
+    }
+
+  new_flags &= ~(EF_MIPS_ARCH | EF_MIPS_MACH | EF_MIPS_32BITMODE);
+  old_flags &= ~(EF_MIPS_ARCH | EF_MIPS_MACH | EF_MIPS_32BITMODE);
+
+  /* Compare ABIs.  The 64-bit ABI does not use EF_MIPS_ABI.  But, it
+     does set EI_CLASS differently from any 32-bit ABI.  */
+  if ((new_flags & EF_MIPS_ABI) != (old_flags & EF_MIPS_ABI)
+      || (elf_elfheader (ibfd)->e_ident[EI_CLASS]
+	  != elf_elfheader (obfd)->e_ident[EI_CLASS]))
+    {
+      /* Only error if both are set (to different values).  */
+      if (((new_flags & EF_MIPS_ABI) && (old_flags & EF_MIPS_ABI))
+	  || (elf_elfheader (ibfd)->e_ident[EI_CLASS]
+	      != elf_elfheader (obfd)->e_ident[EI_CLASS]))
+	{
+	  (*_bfd_error_handler)
+	    (_("%B: ABI mismatch: linking %s module with previous %s modules"),
+	     ibfd,
+	     elf_mips_abi_name (ibfd),
+	     elf_mips_abi_name (obfd));
+	  ok = FALSE;
+	}
+      new_flags &= ~EF_MIPS_ABI;
+      old_flags &= ~EF_MIPS_ABI;
+    }
+
+  /* Compare ASEs.  Forbid linking MIPS16 and microMIPS ASE modules together
+     and allow arbitrary mixing of the remaining ASEs (retain the union).  */
+  if ((new_flags & EF_MIPS_ARCH_ASE) != (old_flags & EF_MIPS_ARCH_ASE))
+    {
+      int old_micro = old_flags & EF_MIPS_ARCH_ASE_MICROMIPS;
+      int new_micro = new_flags & EF_MIPS_ARCH_ASE_MICROMIPS;
+      int old_m16 = old_flags & EF_MIPS_ARCH_ASE_M16;
+      int new_m16 = new_flags & EF_MIPS_ARCH_ASE_M16;
+      int micro_mis = old_m16 && new_micro;
+      int m16_mis = old_micro && new_m16;
+
+      if (m16_mis || micro_mis)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B: ASE mismatch: linking %s module with previous %s modules"),
+	     ibfd,
+	     m16_mis ? "MIPS16" : "microMIPS",
+	     m16_mis ? "microMIPS" : "MIPS16");
+	  ok = FALSE;
+	}
+
+      elf_elfheader (obfd)->e_flags |= new_flags & EF_MIPS_ARCH_ASE;
+
+      new_flags &= ~ EF_MIPS_ARCH_ASE;
+      old_flags &= ~ EF_MIPS_ARCH_ASE;
+    }
+
+  /* Warn about any other mismatches */
+  if (new_flags != old_flags)
+    {
+      (*_bfd_error_handler)
+	(_("%B: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"),
+	 ibfd, (unsigned long) new_flags,
+	 (unsigned long) old_flags);
+      ok = FALSE;
+    }
+
+  if (! ok)
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Function to keep MIPS specific file flags like as EF_MIPS_PIC.  */
+
+bfd_boolean
+_bfd_mips_elf_set_private_flags (bfd *abfd, flagword flags)
+{
+  BFD_ASSERT (!elf_flags_init (abfd)
+	      || elf_elfheader (abfd)->e_flags == flags);
+
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = TRUE;
+  return TRUE;
+}
+
+char *
+_bfd_mips_elf_get_target_dtag (bfd_vma dtag)
+{
+  switch (dtag)
+    {
+    default: return "";
+    case DT_MIPS_RLD_VERSION:
+      return "MIPS_RLD_VERSION";
+    case DT_MIPS_TIME_STAMP:
+      return "MIPS_TIME_STAMP";
+    case DT_MIPS_ICHECKSUM:
+      return "MIPS_ICHECKSUM";
+    case DT_MIPS_IVERSION:
+      return "MIPS_IVERSION";
+    case DT_MIPS_FLAGS:
+      return "MIPS_FLAGS";
+    case DT_MIPS_BASE_ADDRESS:
+      return "MIPS_BASE_ADDRESS";
+    case DT_MIPS_MSYM:
+      return "MIPS_MSYM";
+    case DT_MIPS_CONFLICT:
+      return "MIPS_CONFLICT";
+    case DT_MIPS_LIBLIST:
+      return "MIPS_LIBLIST";
+    case DT_MIPS_LOCAL_GOTNO:
+      return "MIPS_LOCAL_GOTNO";
+    case DT_MIPS_CONFLICTNO:
+      return "MIPS_CONFLICTNO";
+    case DT_MIPS_LIBLISTNO:
+      return "MIPS_LIBLISTNO";
+    case DT_MIPS_SYMTABNO:
+      return "MIPS_SYMTABNO";
+    case DT_MIPS_UNREFEXTNO:
+      return "MIPS_UNREFEXTNO";
+    case DT_MIPS_GOTSYM:
+      return "MIPS_GOTSYM";
+    case DT_MIPS_HIPAGENO:
+      return "MIPS_HIPAGENO";
+    case DT_MIPS_RLD_MAP:
+      return "MIPS_RLD_MAP";
+    case DT_MIPS_DELTA_CLASS:
+      return "MIPS_DELTA_CLASS";
+    case DT_MIPS_DELTA_CLASS_NO:
+      return "MIPS_DELTA_CLASS_NO";
+    case DT_MIPS_DELTA_INSTANCE:
+      return "MIPS_DELTA_INSTANCE";
+    case DT_MIPS_DELTA_INSTANCE_NO:
+      return "MIPS_DELTA_INSTANCE_NO";
+    case DT_MIPS_DELTA_RELOC:
+      return "MIPS_DELTA_RELOC";
+    case DT_MIPS_DELTA_RELOC_NO:
+      return "MIPS_DELTA_RELOC_NO";
+    case DT_MIPS_DELTA_SYM:
+      return "MIPS_DELTA_SYM";
+    case DT_MIPS_DELTA_SYM_NO:
+      return "MIPS_DELTA_SYM_NO";
+    case DT_MIPS_DELTA_CLASSSYM:
+      return "MIPS_DELTA_CLASSSYM";
+    case DT_MIPS_DELTA_CLASSSYM_NO:
+      return "MIPS_DELTA_CLASSSYM_NO";
+    case DT_MIPS_CXX_FLAGS:
+      return "MIPS_CXX_FLAGS";
+    case DT_MIPS_PIXIE_INIT:
+      return "MIPS_PIXIE_INIT";
+    case DT_MIPS_SYMBOL_LIB:
+      return "MIPS_SYMBOL_LIB";
+    case DT_MIPS_LOCALPAGE_GOTIDX:
+      return "MIPS_LOCALPAGE_GOTIDX";
+    case DT_MIPS_LOCAL_GOTIDX:
+      return "MIPS_LOCAL_GOTIDX";
+    case DT_MIPS_HIDDEN_GOTIDX:
+      return "MIPS_HIDDEN_GOTIDX";
+    case DT_MIPS_PROTECTED_GOTIDX:
+      return "MIPS_PROTECTED_GOT_IDX";
+    case DT_MIPS_OPTIONS:
+      return "MIPS_OPTIONS";
+    case DT_MIPS_INTERFACE:
+      return "MIPS_INTERFACE";
+    case DT_MIPS_DYNSTR_ALIGN:
+      return "DT_MIPS_DYNSTR_ALIGN";
+    case DT_MIPS_INTERFACE_SIZE:
+      return "DT_MIPS_INTERFACE_SIZE";
+    case DT_MIPS_RLD_TEXT_RESOLVE_ADDR:
+      return "DT_MIPS_RLD_TEXT_RESOLVE_ADDR";
+    case DT_MIPS_PERF_SUFFIX:
+      return "DT_MIPS_PERF_SUFFIX";
+    case DT_MIPS_COMPACT_SIZE:
+      return "DT_MIPS_COMPACT_SIZE";
+    case DT_MIPS_GP_VALUE:
+      return "DT_MIPS_GP_VALUE";
+    case DT_MIPS_AUX_DYNAMIC:
+      return "DT_MIPS_AUX_DYNAMIC";
+    case DT_MIPS_PLTGOT:
+      return "DT_MIPS_PLTGOT";
+    case DT_MIPS_RWPLT:
+      return "DT_MIPS_RWPLT";
+    }
+}
+
+bfd_boolean
+_bfd_mips_elf_print_private_bfd_data (bfd *abfd, void *ptr)
+{
+  FILE *file = ptr;
+
+  BFD_ASSERT (abfd != NULL && ptr != NULL);
+
+  /* Print normal ELF private data.  */
+  _bfd_elf_print_private_bfd_data (abfd, ptr);
+
+  /* xgettext:c-format */
+  fprintf (file, _("private flags = %lx:"), elf_elfheader (abfd)->e_flags);
+
+  if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ABI) == E_MIPS_ABI_O32)
+    fprintf (file, _(" [abi=O32]"));
+  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ABI) == E_MIPS_ABI_O64)
+    fprintf (file, _(" [abi=O64]"));
+  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ABI) == E_MIPS_ABI_EABI32)
+    fprintf (file, _(" [abi=EABI32]"));
+  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ABI) == E_MIPS_ABI_EABI64)
+    fprintf (file, _(" [abi=EABI64]"));
+  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ABI))
+    fprintf (file, _(" [abi unknown]"));
+  else if (ABI_N32_P (abfd))
+    fprintf (file, _(" [abi=N32]"));
+  else if (ABI_64_P (abfd))
+    fprintf (file, _(" [abi=64]"));
+  else
+    fprintf (file, _(" [no abi set]"));
+
+  if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_1)
+    fprintf (file, " [mips1]");
+  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_2)
+    fprintf (file, " [mips2]");
+  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_3)
+    fprintf (file, " [mips3]");
+  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_4)
+    fprintf (file, " [mips4]");
+  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_5)
+    fprintf (file, " [mips5]");
+  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_32)
+    fprintf (file, " [mips32]");
+  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_64)
+    fprintf (file, " [mips64]");
+  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_32R2)
+    fprintf (file, " [mips32r2]");
+  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_64R2)
+    fprintf (file, " [mips64r2]");
+  else
+    fprintf (file, _(" [unknown ISA]"));
+
+  if (elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH_ASE_MDMX)
+    fprintf (file, " [mdmx]");
+
+  if (elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH_ASE_M16)
+    fprintf (file, " [mips16]");
+
+  if (elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH_ASE_MICROMIPS)
+    fprintf (file, " [micromips]");
+
+  if (elf_elfheader (abfd)->e_flags & EF_MIPS_32BITMODE)
+    fprintf (file, " [32bitmode]");
+  else
+    fprintf (file, _(" [not 32bitmode]"));
+
+  if (elf_elfheader (abfd)->e_flags & EF_MIPS_NOREORDER)
+    fprintf (file, " [noreorder]");
+
+  if (elf_elfheader (abfd)->e_flags & EF_MIPS_PIC)
+    fprintf (file, " [PIC]");
+
+  if (elf_elfheader (abfd)->e_flags & EF_MIPS_CPIC)
+    fprintf (file, " [CPIC]");
+
+  if (elf_elfheader (abfd)->e_flags & EF_MIPS_XGOT)
+    fprintf (file, " [XGOT]");
+
+  if (elf_elfheader (abfd)->e_flags & EF_MIPS_UCODE)
+    fprintf (file, " [UCODE]");
+
+  fputc ('\n', file);
+
+  return TRUE;
+}
+
+const struct bfd_elf_special_section _bfd_mips_elf_special_sections[] =
+{
+  { STRING_COMMA_LEN (".lit4"),   0, SHT_PROGBITS,   SHF_ALLOC + SHF_WRITE + SHF_MIPS_GPREL },
+  { STRING_COMMA_LEN (".lit8"),   0, SHT_PROGBITS,   SHF_ALLOC + SHF_WRITE + SHF_MIPS_GPREL },
+  { STRING_COMMA_LEN (".mdebug"), 0, SHT_MIPS_DEBUG, 0 },
+  { STRING_COMMA_LEN (".sbss"),  -2, SHT_NOBITS,     SHF_ALLOC + SHF_WRITE + SHF_MIPS_GPREL },
+  { STRING_COMMA_LEN (".sdata"), -2, SHT_PROGBITS,   SHF_ALLOC + SHF_WRITE + SHF_MIPS_GPREL },
+  { STRING_COMMA_LEN (".ucode"),  0, SHT_MIPS_UCODE, 0 },
+  { NULL,                     0,  0, 0,              0 }
+};
+
+/* Merge non visibility st_other attributes.  Ensure that the
+   STO_OPTIONAL flag is copied into h->other, even if this is not a
+   definiton of the symbol.  */
+void
+_bfd_mips_elf_merge_symbol_attribute (struct elf_link_hash_entry *h,
+				      const Elf_Internal_Sym *isym,
+				      bfd_boolean definition,
+				      bfd_boolean dynamic ATTRIBUTE_UNUSED)
+{
+  if ((isym->st_other & ~ELF_ST_VISIBILITY (-1)) != 0)
+    {
+      unsigned char other;
+
+      other = (definition ? isym->st_other : h->other);
+      other &= ~ELF_ST_VISIBILITY (-1);
+      h->other = other | ELF_ST_VISIBILITY (h->other);
+    }
+
+  if (!definition
+      && ELF_MIPS_IS_OPTIONAL (isym->st_other))
+    h->other |= STO_OPTIONAL;
+}
+
+/* Decide whether an undefined symbol is special and can be ignored.
+   This is the case for OPTIONAL symbols on IRIX.  */
+bfd_boolean
+_bfd_mips_elf_ignore_undef_symbol (struct elf_link_hash_entry *h)
+{
+  return ELF_MIPS_IS_OPTIONAL (h->other) ? TRUE : FALSE;
+}
+
+bfd_boolean
+_bfd_mips_elf_common_definition (Elf_Internal_Sym *sym)
+{
+  return (sym->st_shndx == SHN_COMMON
+	  || sym->st_shndx == SHN_MIPS_ACOMMON
+	  || sym->st_shndx == SHN_MIPS_SCOMMON);
+}
+
+/* Return address for Ith PLT stub in section PLT, for relocation REL
+   or (bfd_vma) -1 if it should not be included.  */
+
+bfd_vma
+_bfd_mips_elf_plt_sym_val (bfd_vma i, const asection *plt,
+			   const arelent *rel ATTRIBUTE_UNUSED)
+{
+  return (plt->vma
+	  + 4 * ARRAY_SIZE (mips_o32_exec_plt0_entry)
+	  + i * 4 * ARRAY_SIZE (mips_exec_plt_entry));
+}
+
+void
+_bfd_mips_post_process_headers (bfd *abfd, struct bfd_link_info *link_info)
+{
+  struct mips_elf_link_hash_table *htab;
+  Elf_Internal_Ehdr *i_ehdrp;
+
+  i_ehdrp = elf_elfheader (abfd);
+  if (link_info)
+    {
+      htab = mips_elf_hash_table (link_info);
+      BFD_ASSERT (htab != NULL);
+
+      if (htab->use_plts_and_copy_relocs && !htab->is_vxworks)
+	i_ehdrp->e_ident[EI_ABIVERSION] = 1;
+    }
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfxx-mips.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfxx-mips.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfxx-mips.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfxx-mips.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,182 @@
+/* MIPS ELF specific backend routines.
+   Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "elf/common.h"
+#include "elf/internal.h"
+#include "elf/mips.h"
+
+extern bfd_boolean _bfd_mips_elf_new_section_hook
+  (bfd *, asection *);
+extern void _bfd_mips_elf_symbol_processing
+  (bfd *, asymbol *);
+extern unsigned int _bfd_mips_elf_eh_frame_address_size
+  (bfd *, asection *);
+extern bfd_boolean _bfd_mips_elf_name_local_section_symbols
+  (bfd *);
+extern bfd_boolean _bfd_mips_elf_section_processing
+  (bfd *, Elf_Internal_Shdr *);
+extern bfd_boolean _bfd_mips_elf_section_from_shdr
+  (bfd *, Elf_Internal_Shdr *, const char *, int);
+extern bfd_boolean _bfd_mips_elf_fake_sections
+  (bfd *, Elf_Internal_Shdr *, asection *);
+extern bfd_boolean _bfd_mips_elf_section_from_bfd_section
+  (bfd *, asection *, int *);
+extern bfd_boolean _bfd_mips_elf_add_symbol_hook
+  (bfd *, struct bfd_link_info *, Elf_Internal_Sym *,
+   const char **, flagword *, asection **, bfd_vma *);
+extern int _bfd_mips_elf_link_output_symbol_hook
+  (struct bfd_link_info *, const char *, Elf_Internal_Sym *,
+   asection *, struct elf_link_hash_entry *);
+extern bfd_boolean _bfd_mips_elf_create_dynamic_sections
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_mips_elf_check_relocs
+  (bfd *, struct bfd_link_info *, asection *, const Elf_Internal_Rela *);
+extern bfd_boolean _bfd_mips_elf_adjust_dynamic_symbol
+  (struct bfd_link_info *, struct elf_link_hash_entry *);
+extern bfd_boolean _bfd_mips_elf_always_size_sections
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_mips_elf_size_dynamic_sections
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_mips_elf_relocate_section
+  (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **);
+extern bfd_boolean _bfd_mips_elf_finish_dynamic_symbol
+  (bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
+   Elf_Internal_Sym *);
+extern bfd_boolean _bfd_mips_vxworks_finish_dynamic_symbol
+  (bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
+   Elf_Internal_Sym *);
+extern bfd_boolean _bfd_mips_elf_finish_dynamic_sections
+  (bfd *, struct bfd_link_info *);
+extern void _bfd_mips_elf_final_write_processing
+  (bfd *, bfd_boolean);
+extern int _bfd_mips_elf_additional_program_headers
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_mips_elf_modify_segment_map
+  (bfd *, struct bfd_link_info *);
+extern asection * _bfd_mips_elf_gc_mark_hook
+  (asection *, struct bfd_link_info *, Elf_Internal_Rela *,
+   struct elf_link_hash_entry *, Elf_Internal_Sym *);
+extern bfd_boolean _bfd_mips_elf_gc_sweep_hook
+  (bfd *, struct bfd_link_info *, asection *, const Elf_Internal_Rela *);
+extern void _bfd_mips_elf_copy_indirect_symbol
+  (struct bfd_link_info *, struct elf_link_hash_entry *,
+   struct elf_link_hash_entry *);
+extern bfd_boolean _bfd_mips_elf_ignore_discarded_relocs
+  (asection *);
+extern bfd_boolean _bfd_mips_elf_is_target_special_symbol
+  (bfd *abfd, asymbol *sym);
+extern bfd_boolean _bfd_mips_elf_find_nearest_line
+  (bfd *, asection *, asymbol **, bfd_vma, const char **,
+   const char **, unsigned int *);
+extern bfd_boolean _bfd_mips_elf_find_inliner_info
+  (bfd *, const char **, const char **, unsigned int *);
+extern bfd_boolean _bfd_mips_elf_set_section_contents
+  (bfd *, asection *, const void *, file_ptr, bfd_size_type);
+extern bfd_byte *_bfd_elf_mips_get_relocated_section_contents
+  (bfd *, struct bfd_link_info *, struct bfd_link_order *,
+   bfd_byte *, bfd_boolean, asymbol **);
+extern bfd_boolean _bfd_mips_elf_relax_section
+  (bfd *abfd, asection *sec, struct bfd_link_info *link_info,
+   bfd_boolean *again);
+extern struct bfd_link_hash_table *_bfd_mips_elf_link_hash_table_create
+  (bfd *);
+extern struct bfd_link_hash_table *_bfd_mips_vxworks_link_hash_table_create
+  (bfd *);
+extern bfd_boolean _bfd_mips_elf_final_link
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_mips_elf_merge_private_bfd_data
+  (bfd *, bfd *);
+extern bfd_boolean _bfd_mips_elf_set_private_flags
+  (bfd *, flagword);
+extern bfd_boolean _bfd_mips_elf_print_private_bfd_data
+  (bfd *, void *);
+extern bfd_boolean _bfd_mips_elf_discard_info
+  (bfd *, struct elf_reloc_cookie *, struct bfd_link_info *);
+extern bfd_boolean _bfd_mips_elf_write_section
+  (bfd *, struct bfd_link_info *, asection *, bfd_byte *);
+
+extern bfd_boolean _bfd_mips_elf_read_ecoff_info
+  (bfd *, asection *, struct ecoff_debug_info *);
+extern void _bfd_mips_elf_reloc_unshuffle
+  (bfd *, int, bfd_boolean, bfd_byte *);
+extern void _bfd_mips_elf_reloc_shuffle
+  (bfd *, int, bfd_boolean, bfd_byte *);
+extern bfd_reloc_status_type _bfd_mips_elf_gprel16_with_gp
+  (bfd *, asymbol *, arelent *, asection *, bfd_boolean, void *, bfd_vma);
+extern bfd_reloc_status_type _bfd_mips_elf32_gprel16_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+extern bfd_reloc_status_type _bfd_mips_elf_hi16_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+extern bfd_reloc_status_type _bfd_mips_elf_got16_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+extern bfd_reloc_status_type _bfd_mips_elf_lo16_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+extern bfd_reloc_status_type _bfd_mips_elf_generic_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+extern unsigned long _bfd_elf_mips_mach
+  (flagword);
+extern bfd_boolean _bfd_mips_relax_section
+  (bfd *, asection *, struct bfd_link_info *, bfd_boolean *);
+extern bfd_vma _bfd_mips_elf_sign_extend
+  (bfd_vma, int);
+extern void _bfd_mips_elf_merge_symbol_attribute
+  (struct elf_link_hash_entry *, const Elf_Internal_Sym *, bfd_boolean, bfd_boolean);
+extern char *_bfd_mips_elf_get_target_dtag (bfd_vma);
+extern bfd_boolean _bfd_mips_elf_ignore_undef_symbol
+  (struct elf_link_hash_entry *);
+extern void _bfd_mips_elf_use_plts_and_copy_relocs
+  (struct bfd_link_info *);
+extern bfd_boolean _bfd_mips_elf_init_stubs
+  (struct bfd_link_info *,
+   asection *(*) (const char *, asection *, asection *));
+extern bfd_vma _bfd_mips_elf_plt_sym_val
+  (bfd_vma, const asection *, const arelent *rel);
+extern void _bfd_mips_post_process_headers
+  (bfd *abfd, struct bfd_link_info *link_info);
+
+extern const struct bfd_elf_special_section _bfd_mips_elf_special_sections [];
+
+extern bfd_boolean _bfd_mips_elf_common_definition (Elf_Internal_Sym *);
+
+static inline bfd_boolean
+gprel16_reloc_p (unsigned int r_type)
+{
+  return (r_type == R_MIPS_GPREL16
+	  || r_type == R_MIPS16_GPREL
+	  || r_type == R_MICROMIPS_GPREL16
+	  || r_type == R_MICROMIPS_GPREL7_S2);
+}
+
+static inline bfd_boolean
+literal_reloc_p (int r_type)
+{
+  return r_type == R_MIPS_LITERAL || r_type == R_MICROMIPS_LITERAL;
+}
+
+#define elf_backend_common_definition   _bfd_mips_elf_common_definition
+#define elf_backend_name_local_section_symbols \
+  _bfd_mips_elf_name_local_section_symbols
+#define elf_backend_special_sections _bfd_mips_elf_special_sections
+#define elf_backend_eh_frame_address_size _bfd_mips_elf_eh_frame_address_size
+#define elf_backend_merge_symbol_attribute  _bfd_mips_elf_merge_symbol_attribute
+#define elf_backend_ignore_undef_symbol _bfd_mips_elf_ignore_undef_symbol
+#define elf_backend_post_process_headers _bfd_mips_post_process_headers
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfxx-sparc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfxx-sparc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfxx-sparc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfxx-sparc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4825 @@
+/* SPARC-specific support for ELF
+   Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* This file handles functionality common to the different SPARC ABI's.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "libiberty.h"
+#include "elf-bfd.h"
+#include "elf/sparc.h"
+#include "opcode/sparc.h"
+#include "elfxx-sparc.h"
+#include "elf-vxworks.h"
+#include "objalloc.h"
+#include "hashtab.h"
+
+/* In case we're on a 32-bit machine, construct a 64-bit "-1" value.  */
+#define MINUS_ONE (~ (bfd_vma) 0)
+
+#define ABI_64_P(abfd) \
+  (get_elf_backend_data (abfd)->s->elfclass == ELFCLASS64)
+
+/* The relocation "howto" table.  */
+
+/* Utility for performing the standard initial work of an instruction
+   relocation.
+   *PRELOCATION will contain the relocated item.
+   *PINSN will contain the instruction from the input stream.
+   If the result is `bfd_reloc_other' the caller can continue with
+   performing the relocation.  Otherwise it must stop and return the
+   value to its caller.  */
+
+static bfd_reloc_status_type
+init_insn_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+		 PTR data, asection *input_section, bfd *output_bfd,
+		 bfd_vma *prelocation, bfd_vma *pinsn)
+{
+  bfd_vma relocation;
+  reloc_howto_type *howto = reloc_entry->howto;
+
+  if (output_bfd != (bfd *) NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (! howto->partial_inplace
+	  || reloc_entry->addend == 0))
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  /* This works because partial_inplace is FALSE.  */
+  if (output_bfd != NULL)
+    return bfd_reloc_continue;
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  relocation = (symbol->value
+		+ symbol->section->output_section->vma
+		+ symbol->section->output_offset);
+  relocation += reloc_entry->addend;
+  if (howto->pc_relative)
+    {
+      relocation -= (input_section->output_section->vma
+		     + input_section->output_offset);
+      relocation -= reloc_entry->address;
+    }
+
+  *prelocation = relocation;
+  *pinsn = bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
+  return bfd_reloc_other;
+}
+
+/* For unsupported relocs.  */
+
+static bfd_reloc_status_type
+sparc_elf_notsup_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+			arelent *reloc_entry ATTRIBUTE_UNUSED,
+			asymbol *symbol ATTRIBUTE_UNUSED,
+			PTR data ATTRIBUTE_UNUSED,
+			asection *input_section ATTRIBUTE_UNUSED,
+			bfd *output_bfd ATTRIBUTE_UNUSED,
+			char **error_message ATTRIBUTE_UNUSED)
+{
+  return bfd_reloc_notsupported;
+}
+
+/* Handle the WDISP16 reloc.  */
+
+static bfd_reloc_status_type
+sparc_elf_wdisp16_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+			 PTR data, asection *input_section, bfd *output_bfd,
+			 char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma relocation;
+  bfd_vma insn;
+  bfd_reloc_status_type status;
+
+  status = init_insn_reloc (abfd, reloc_entry, symbol, data,
+			    input_section, output_bfd, &relocation, &insn);
+  if (status != bfd_reloc_other)
+    return status;
+
+  insn &= ~ (bfd_vma) 0x303fff;
+  insn |= (((relocation >> 2) & 0xc000) << 6) | ((relocation >> 2) & 0x3fff);
+  bfd_put_32 (abfd, insn, (bfd_byte *) data + reloc_entry->address);
+
+  if ((bfd_signed_vma) relocation < - 0x40000
+      || (bfd_signed_vma) relocation > 0x3ffff)
+    return bfd_reloc_overflow;
+  else
+    return bfd_reloc_ok;
+}
+
+/* Handle the HIX22 reloc.  */
+
+static bfd_reloc_status_type
+sparc_elf_hix22_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+		       PTR data, asection *input_section, bfd *output_bfd,
+		       char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma relocation;
+  bfd_vma insn;
+  bfd_reloc_status_type status;
+
+  status = init_insn_reloc (abfd, reloc_entry, symbol, data,
+			    input_section, output_bfd, &relocation, &insn);
+  if (status != bfd_reloc_other)
+    return status;
+
+  relocation ^= MINUS_ONE;
+  insn = (insn &~ (bfd_vma) 0x3fffff) | ((relocation >> 10) & 0x3fffff);
+  bfd_put_32 (abfd, insn, (bfd_byte *) data + reloc_entry->address);
+
+  if ((relocation & ~ (bfd_vma) 0xffffffff) != 0)
+    return bfd_reloc_overflow;
+  else
+    return bfd_reloc_ok;
+}
+
+/* Handle the LOX10 reloc.  */
+
+static bfd_reloc_status_type
+sparc_elf_lox10_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+		       PTR data, asection *input_section, bfd *output_bfd,
+		       char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma relocation;
+  bfd_vma insn;
+  bfd_reloc_status_type status;
+
+  status = init_insn_reloc (abfd, reloc_entry, symbol, data,
+			    input_section, output_bfd, &relocation, &insn);
+  if (status != bfd_reloc_other)
+    return status;
+
+  insn = (insn &~ (bfd_vma) 0x1fff) | 0x1c00 | (relocation & 0x3ff);
+  bfd_put_32 (abfd, insn, (bfd_byte *) data + reloc_entry->address);
+
+  return bfd_reloc_ok;
+}
+
+static reloc_howto_type _bfd_sparc_elf_howto_table[] =
+{
+  HOWTO(R_SPARC_NONE,      0,0, 0,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_8,         0,0, 8,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_8",       FALSE,0,0x000000ff,TRUE),
+  HOWTO(R_SPARC_16,        0,1,16,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_16",      FALSE,0,0x0000ffff,TRUE),
+  HOWTO(R_SPARC_32,        0,2,32,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_32",      FALSE,0,0xffffffff,TRUE),
+  HOWTO(R_SPARC_DISP8,     0,0, 8,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP8",   FALSE,0,0x000000ff,TRUE),
+  HOWTO(R_SPARC_DISP16,    0,1,16,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP16",  FALSE,0,0x0000ffff,TRUE),
+  HOWTO(R_SPARC_DISP32,    0,2,32,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP32",  FALSE,0,0xffffffff,TRUE),
+  HOWTO(R_SPARC_WDISP30,   2,2,30,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP30", FALSE,0,0x3fffffff,TRUE),
+  HOWTO(R_SPARC_WDISP22,   2,2,22,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP22", FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_HI22,     10,2,22,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_HI22",    FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_22,        0,2,22,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_22",      FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_13,        0,2,13,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_13",      FALSE,0,0x00001fff,TRUE),
+  HOWTO(R_SPARC_LO10,      0,2,10,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_LO10",    FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_GOT10,     0,2,10,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GOT10",   FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_GOT13,     0,2,13,FALSE,0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_GOT13",   FALSE,0,0x00001fff,TRUE),
+  HOWTO(R_SPARC_GOT22,    10,2,22,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GOT22",   FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_PC10,      0,2,10,TRUE, 0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_PC10",    FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_PC22,     10,2,22,TRUE, 0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_PC22",    FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_WPLT30,    2,2,30,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WPLT30",  FALSE,0,0x3fffffff,TRUE),
+  HOWTO(R_SPARC_COPY,      0,0,00,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_COPY",    FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_GLOB_DAT,  0,0,00,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GLOB_DAT",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_JMP_SLOT,  0,0,00,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_JMP_SLOT",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_RELATIVE,  0,0,00,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_RELATIVE",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_UA32,      0,2,32,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_UA32",    FALSE,0,0xffffffff,TRUE),
+  HOWTO(R_SPARC_PLT32,     0,2,32,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_PLT32",   FALSE,0,0xffffffff,TRUE),
+  HOWTO(R_SPARC_HIPLT22,   0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_HIPLT22",  FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_LOPLT10,   0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_LOPLT10",  FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_PCPLT32,   0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_PCPLT32",  FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_PCPLT22,   0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_PCPLT22",  FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_PCPLT10,   0,0,00,FALSE,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_PCPLT10",  FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_10,        0,2,10,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_10",      FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_11,        0,2,11,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_11",      FALSE,0,0x000007ff,TRUE),
+  HOWTO(R_SPARC_64,        0,4,64,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_64",      FALSE,0,MINUS_ONE, TRUE),
+  HOWTO(R_SPARC_OLO10,     0,2,13,FALSE,0,complain_overflow_signed,  sparc_elf_notsup_reloc, "R_SPARC_OLO10",   FALSE,0,0x00001fff,TRUE),
+  HOWTO(R_SPARC_HH22,     42,2,22,FALSE,0,complain_overflow_unsigned,bfd_elf_generic_reloc,  "R_SPARC_HH22",    FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_HM10,     32,2,10,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_HM10",    FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_LM22,     10,2,22,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_LM22",    FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_PC_HH22,  42,2,22,TRUE, 0,complain_overflow_unsigned,bfd_elf_generic_reloc,  "R_SPARC_PC_HH22",    FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_PC_HM10,  32,2,10,TRUE, 0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_PC_HM10",    FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_PC_LM22,  10,2,22,TRUE, 0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_PC_LM22",    FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_WDISP16,   2,2,16,TRUE, 0,complain_overflow_signed,  sparc_elf_wdisp16_reloc,"R_SPARC_WDISP16", FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_WDISP19,   2,2,19,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP19", FALSE,0,0x0007ffff,TRUE),
+  HOWTO(R_SPARC_UNUSED_42, 0,0, 0,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_UNUSED_42",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_7,         0,2, 7,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_7",       FALSE,0,0x0000007f,TRUE),
+  HOWTO(R_SPARC_5,         0,2, 5,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_5",       FALSE,0,0x0000001f,TRUE),
+  HOWTO(R_SPARC_6,         0,2, 6,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_6",       FALSE,0,0x0000003f,TRUE),
+  HOWTO(R_SPARC_DISP64,    0,4,64,TRUE, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP64",  FALSE,0,MINUS_ONE, TRUE),
+  HOWTO(R_SPARC_PLT64,     0,4,64,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_PLT64",   FALSE,0,MINUS_ONE, TRUE),
+  HOWTO(R_SPARC_HIX22,     0,4, 0,FALSE,0,complain_overflow_bitfield,sparc_elf_hix22_reloc,  "R_SPARC_HIX22",   FALSE,0,MINUS_ONE, FALSE),
+  HOWTO(R_SPARC_LOX10,     0,4, 0,FALSE,0,complain_overflow_dont,    sparc_elf_lox10_reloc,  "R_SPARC_LOX10",   FALSE,0,MINUS_ONE, FALSE),
+  HOWTO(R_SPARC_H44,      22,2,22,FALSE,0,complain_overflow_unsigned,bfd_elf_generic_reloc,  "R_SPARC_H44",     FALSE,0,0x003fffff,FALSE),
+  HOWTO(R_SPARC_M44,      12,2,10,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_M44",     FALSE,0,0x000003ff,FALSE),
+  HOWTO(R_SPARC_L44,       0,2,13,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_L44",     FALSE,0,0x00000fff,FALSE),
+  HOWTO(R_SPARC_REGISTER,  0,4, 0,FALSE,0,complain_overflow_bitfield,sparc_elf_notsup_reloc, "R_SPARC_REGISTER",FALSE,0,MINUS_ONE, FALSE),
+  HOWTO(R_SPARC_UA64,        0,4,64,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_UA64",      FALSE,0,MINUS_ONE, TRUE),
+  HOWTO(R_SPARC_UA16,        0,1,16,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_UA16",      FALSE,0,0x0000ffff,TRUE),
+  HOWTO(R_SPARC_TLS_GD_HI22,10,2,22,FALSE,0,complain_overflow_dont,  bfd_elf_generic_reloc,  "R_SPARC_TLS_GD_HI22",FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_TLS_GD_LO10,0,2,10,FALSE,0,complain_overflow_dont,   bfd_elf_generic_reloc,  "R_SPARC_TLS_GD_LO10",FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_TLS_GD_ADD,0,0, 0,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_TLS_GD_ADD",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_TLS_GD_CALL,2,2,30,TRUE,0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_TLS_GD_CALL",FALSE,0,0x3fffffff,TRUE),
+  HOWTO(R_SPARC_TLS_LDM_HI22,10,2,22,FALSE,0,complain_overflow_dont, bfd_elf_generic_reloc,  "R_SPARC_TLS_LDM_HI22",FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_TLS_LDM_LO10,0,2,10,FALSE,0,complain_overflow_dont,  bfd_elf_generic_reloc,  "R_SPARC_TLS_LDM_LO10",FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_TLS_LDM_ADD,0,0, 0,FALSE,0,complain_overflow_dont,   bfd_elf_generic_reloc,  "R_SPARC_TLS_LDM_ADD",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_TLS_LDM_CALL,2,2,30,TRUE,0,complain_overflow_signed, bfd_elf_generic_reloc,  "R_SPARC_TLS_LDM_CALL",FALSE,0,0x3fffffff,TRUE),
+  HOWTO(R_SPARC_TLS_LDO_HIX22,0,2,0,FALSE,0,complain_overflow_bitfield,sparc_elf_hix22_reloc,"R_SPARC_TLS_LDO_HIX22",FALSE,0,0x003fffff, FALSE),
+  HOWTO(R_SPARC_TLS_LDO_LOX10,0,2,0,FALSE,0,complain_overflow_dont,  sparc_elf_lox10_reloc,  "R_SPARC_TLS_LDO_LOX10",FALSE,0,0x000003ff, FALSE),
+  HOWTO(R_SPARC_TLS_LDO_ADD,0,0, 0,FALSE,0,complain_overflow_dont,   bfd_elf_generic_reloc,  "R_SPARC_TLS_LDO_ADD",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_TLS_IE_HI22,10,2,22,FALSE,0,complain_overflow_dont,  bfd_elf_generic_reloc,  "R_SPARC_TLS_IE_HI22",FALSE,0,0x003fffff,TRUE),
+  HOWTO(R_SPARC_TLS_IE_LO10,0,2,10,FALSE,0,complain_overflow_dont,   bfd_elf_generic_reloc,  "R_SPARC_TLS_IE_LO10",FALSE,0,0x000003ff,TRUE),
+  HOWTO(R_SPARC_TLS_IE_LD,0,0, 0,FALSE,0,complain_overflow_dont,     bfd_elf_generic_reloc,  "R_SPARC_TLS_IE_LD",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_TLS_IE_LDX,0,0, 0,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_TLS_IE_LDX",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_TLS_IE_ADD,0,0, 0,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_TLS_IE_ADD",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_TLS_LE_HIX22,0,2,0,FALSE,0,complain_overflow_bitfield,sparc_elf_hix22_reloc, "R_SPARC_TLS_LE_HIX22",FALSE,0,0x003fffff, FALSE),
+  HOWTO(R_SPARC_TLS_LE_LOX10,0,2,0,FALSE,0,complain_overflow_dont,   sparc_elf_lox10_reloc,  "R_SPARC_TLS_LE_LOX10",FALSE,0,0x000003ff, FALSE),
+  HOWTO(R_SPARC_TLS_DTPMOD32,0,0, 0,FALSE,0,complain_overflow_dont,  bfd_elf_generic_reloc,  "R_SPARC_TLS_DTPMOD32",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_TLS_DTPMOD64,0,0, 0,FALSE,0,complain_overflow_dont,  bfd_elf_generic_reloc,  "R_SPARC_TLS_DTPMOD64",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_TLS_DTPOFF32,0,2,32,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,"R_SPARC_TLS_DTPOFF32",FALSE,0,0xffffffff,TRUE),
+  HOWTO(R_SPARC_TLS_DTPOFF64,0,4,64,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,"R_SPARC_TLS_DTPOFF64",FALSE,0,MINUS_ONE,TRUE),
+  HOWTO(R_SPARC_TLS_TPOFF32,0,0, 0,FALSE,0,complain_overflow_dont,   bfd_elf_generic_reloc,  "R_SPARC_TLS_TPOFF32",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_TLS_TPOFF64,0,0, 0,FALSE,0,complain_overflow_dont,   bfd_elf_generic_reloc,  "R_SPARC_TLS_TPOFF64",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_GOTDATA_HIX22,0,2,0,FALSE,0,complain_overflow_bitfield,sparc_elf_hix22_reloc,"R_SPARC_GOTDATA_HIX22",FALSE,0,0x003fffff, FALSE),
+  HOWTO(R_SPARC_GOTDATA_LOX10,0,2,0,FALSE,0,complain_overflow_dont,  sparc_elf_lox10_reloc,  "R_SPARC_GOTDATA_LOX10",FALSE,0,0x000003ff, FALSE),
+  HOWTO(R_SPARC_GOTDATA_OP_HIX22,0,2,0,FALSE,0,complain_overflow_bitfield,sparc_elf_hix22_reloc,"R_SPARC_GOTDATA_OP_HIX22",FALSE,0,0x003fffff, FALSE),
+  HOWTO(R_SPARC_GOTDATA_OP_LOX10,0,2,0,FALSE,0,complain_overflow_dont,  sparc_elf_lox10_reloc,  "R_SPARC_GOTDATA_OP_LOX10",FALSE,0,0x000003ff, FALSE),
+  HOWTO(R_SPARC_GOTDATA_OP,0,0, 0,FALSE,0,complain_overflow_dont,   bfd_elf_generic_reloc,  "R_SPARC_GOTDATA_OP",FALSE,0,0x00000000,TRUE),
+};
+static reloc_howto_type sparc_jmp_irel_howto =
+  HOWTO(R_SPARC_JMP_IREL,  0,0,00,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_JMP_IREL",FALSE,0,0x00000000,TRUE);
+static reloc_howto_type sparc_irelative_howto =
+  HOWTO(R_SPARC_IRELATIVE,  0,0,00,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_IRELATIVE",FALSE,0,0x00000000,TRUE);
+static reloc_howto_type sparc_vtinherit_howto =
+  HOWTO (R_SPARC_GNU_VTINHERIT, 0,2,0,FALSE,0,complain_overflow_dont, NULL, "R_SPARC_GNU_VTINHERIT", FALSE,0, 0, FALSE);
+static reloc_howto_type sparc_vtentry_howto =
+  HOWTO (R_SPARC_GNU_VTENTRY, 0,2,0,FALSE,0,complain_overflow_dont, _bfd_elf_rel_vtable_reloc_fn,"R_SPARC_GNU_VTENTRY", FALSE,0,0, FALSE);
+static reloc_howto_type sparc_rev32_howto =
+  HOWTO(R_SPARC_REV32, 0,2,32,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc, "R_SPARC_REV32", FALSE,0,0xffffffff,TRUE);
+
+reloc_howto_type *
+_bfd_sparc_elf_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				  bfd_reloc_code_real_type code)
+{
+  /* We explicitly handle each relocation type in the switch
+     instead of using a lookup table for efficiency.  */
+  switch (code)
+    {
+    case BFD_RELOC_NONE:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_NONE];
+
+    case BFD_RELOC_8:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_8];
+
+    case BFD_RELOC_16:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_16];
+
+    case BFD_RELOC_32:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_32];
+
+    case BFD_RELOC_8_PCREL:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_DISP8];
+
+    case BFD_RELOC_16_PCREL:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_DISP16];
+
+    case BFD_RELOC_32_PCREL:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_DISP32];
+
+    case BFD_RELOC_32_PCREL_S2:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_WDISP30];
+
+    case BFD_RELOC_SPARC_WDISP22:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_WDISP22];
+
+    case BFD_RELOC_HI22:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_HI22];
+
+    case BFD_RELOC_SPARC22:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_22];
+
+    case BFD_RELOC_SPARC13:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_13];
+
+    case BFD_RELOC_LO10:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_LO10];
+
+    case BFD_RELOC_SPARC_GOT10:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_GOT10];
+
+    case BFD_RELOC_SPARC_GOT13:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_GOT13];
+
+    case BFD_RELOC_SPARC_GOT22:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_GOT22];
+
+    case BFD_RELOC_SPARC_PC10:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_PC10];
+
+    case BFD_RELOC_SPARC_PC22:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_PC22];
+
+    case BFD_RELOC_SPARC_WPLT30:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_WPLT30];
+
+    case BFD_RELOC_SPARC_COPY:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_COPY];
+
+    case BFD_RELOC_SPARC_GLOB_DAT:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_GLOB_DAT];
+
+    case BFD_RELOC_SPARC_JMP_SLOT:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_JMP_SLOT];
+
+    case BFD_RELOC_SPARC_RELATIVE:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_RELATIVE];
+
+    case BFD_RELOC_SPARC_UA32:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_UA32];
+
+    case BFD_RELOC_SPARC_PLT32:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_PLT32];
+
+    case BFD_RELOC_SPARC_10:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_10];
+
+    case BFD_RELOC_SPARC_11:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_11];
+
+    case BFD_RELOC_SPARC_64:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_64];
+
+    case BFD_RELOC_SPARC_OLO10:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_OLO10];
+
+    case BFD_RELOC_SPARC_HH22:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_HH22];
+
+    case BFD_RELOC_SPARC_HM10:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_HM10];
+
+    case BFD_RELOC_SPARC_LM22:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_LM22];
+
+    case BFD_RELOC_SPARC_PC_HH22:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_PC_HH22];
+
+    case BFD_RELOC_SPARC_PC_HM10:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_PC_HM10];
+
+    case BFD_RELOC_SPARC_PC_LM22:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_PC_LM22];
+
+    case BFD_RELOC_SPARC_WDISP16:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_WDISP16];
+
+    case BFD_RELOC_SPARC_WDISP19:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_WDISP19];
+
+    case BFD_RELOC_SPARC_7:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_7];
+
+    case BFD_RELOC_SPARC_5:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_5];
+
+    case BFD_RELOC_SPARC_6:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_6];
+
+    case BFD_RELOC_SPARC_DISP64:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_DISP64];
+
+    case BFD_RELOC_SPARC_PLT64:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_PLT64];
+
+    case BFD_RELOC_SPARC_HIX22:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_HIX22];
+
+    case BFD_RELOC_SPARC_LOX10:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_LOX10];
+
+    case BFD_RELOC_SPARC_H44:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_H44];
+
+    case BFD_RELOC_SPARC_M44:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_M44];
+
+    case BFD_RELOC_SPARC_L44:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_L44];
+
+    case BFD_RELOC_SPARC_REGISTER:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_REGISTER];
+
+    case BFD_RELOC_SPARC_UA64:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_UA64];
+
+    case BFD_RELOC_SPARC_UA16:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_UA16];
+
+    case BFD_RELOC_SPARC_TLS_GD_HI22:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_GD_HI22];
+
+    case BFD_RELOC_SPARC_TLS_GD_LO10:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_GD_LO10];
+
+    case BFD_RELOC_SPARC_TLS_GD_ADD:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_GD_ADD];
+
+    case BFD_RELOC_SPARC_TLS_GD_CALL:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_GD_CALL];
+
+    case BFD_RELOC_SPARC_TLS_LDM_HI22:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_LDM_HI22];
+
+    case BFD_RELOC_SPARC_TLS_LDM_LO10:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_LDM_LO10];
+
+    case BFD_RELOC_SPARC_TLS_LDM_ADD:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_LDM_ADD];
+
+    case BFD_RELOC_SPARC_TLS_LDM_CALL:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_LDM_CALL];
+
+    case BFD_RELOC_SPARC_TLS_LDO_HIX22:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_LDO_HIX22];
+
+    case BFD_RELOC_SPARC_TLS_LDO_LOX10:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_LDO_LOX10];
+
+    case BFD_RELOC_SPARC_TLS_LDO_ADD:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_LDO_ADD];
+
+    case BFD_RELOC_SPARC_TLS_IE_HI22:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_IE_HI22];
+
+    case BFD_RELOC_SPARC_TLS_IE_LO10:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_IE_LO10];
+
+    case BFD_RELOC_SPARC_TLS_IE_LD:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_IE_LD];
+
+    case BFD_RELOC_SPARC_TLS_IE_LDX:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_IE_LDX];
+
+    case BFD_RELOC_SPARC_TLS_IE_ADD:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_IE_ADD];
+
+    case BFD_RELOC_SPARC_TLS_LE_HIX22:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_LE_HIX22];
+
+    case BFD_RELOC_SPARC_TLS_LE_LOX10:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_LE_LOX10];
+
+    case BFD_RELOC_SPARC_TLS_DTPMOD32:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_DTPMOD32];
+
+    case BFD_RELOC_SPARC_TLS_DTPMOD64:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_DTPMOD64];
+
+    case BFD_RELOC_SPARC_TLS_DTPOFF32:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_DTPOFF32];
+
+    case BFD_RELOC_SPARC_TLS_DTPOFF64:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_DTPOFF64];
+
+    case BFD_RELOC_SPARC_TLS_TPOFF32:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_TPOFF32];
+
+    case BFD_RELOC_SPARC_TLS_TPOFF64:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_TLS_TPOFF64];
+
+    case BFD_RELOC_SPARC_GOTDATA_HIX22:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_GOTDATA_HIX22];
+
+    case BFD_RELOC_SPARC_GOTDATA_LOX10:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_GOTDATA_LOX10];
+
+    case BFD_RELOC_SPARC_GOTDATA_OP_HIX22:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_GOTDATA_OP_HIX22];
+
+    case BFD_RELOC_SPARC_GOTDATA_OP_LOX10:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_GOTDATA_OP_LOX10];
+
+    case BFD_RELOC_SPARC_GOTDATA_OP:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_GOTDATA_OP];
+
+    case BFD_RELOC_SPARC_JMP_IREL:
+      return &sparc_jmp_irel_howto;
+
+    case BFD_RELOC_SPARC_IRELATIVE:
+      return &sparc_irelative_howto;
+
+    case BFD_RELOC_VTABLE_INHERIT:
+      return &sparc_vtinherit_howto;
+
+    case BFD_RELOC_VTABLE_ENTRY:
+      return &sparc_vtentry_howto;
+
+    case BFD_RELOC_SPARC_REV32:
+      return &sparc_rev32_howto;
+
+    default:
+      break;
+    }
+    bfd_set_error (bfd_error_bad_value);
+    return NULL;
+}
+
+reloc_howto_type *
+_bfd_sparc_elf_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				  const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (_bfd_sparc_elf_howto_table)
+	    / sizeof (_bfd_sparc_elf_howto_table[0]));
+       i++)
+    if (_bfd_sparc_elf_howto_table[i].name != NULL
+	&& strcasecmp (_bfd_sparc_elf_howto_table[i].name, r_name) == 0)
+      return &_bfd_sparc_elf_howto_table[i];
+
+  if (strcasecmp (sparc_vtinherit_howto.name, r_name) == 0)
+    return &sparc_vtinherit_howto;
+  if (strcasecmp (sparc_vtentry_howto.name, r_name) == 0)
+    return &sparc_vtentry_howto;
+  if (strcasecmp (sparc_rev32_howto.name, r_name) == 0)
+    return &sparc_rev32_howto;
+
+  return NULL;
+}
+
+reloc_howto_type *
+_bfd_sparc_elf_info_to_howto_ptr (unsigned int r_type)
+{
+  switch (r_type)
+    {
+    case R_SPARC_JMP_IREL:
+      return &sparc_jmp_irel_howto;
+
+    case R_SPARC_IRELATIVE:
+      return &sparc_irelative_howto;
+
+    case R_SPARC_GNU_VTINHERIT:
+      return &sparc_vtinherit_howto;
+
+    case R_SPARC_GNU_VTENTRY:
+      return &sparc_vtentry_howto;
+
+    case R_SPARC_REV32:
+      return &sparc_rev32_howto;
+
+    default:
+      if (r_type >= (unsigned int) R_SPARC_max_std)
+	{
+	  (*_bfd_error_handler) (_("invalid relocation type %d"),
+				 (int) r_type);
+	  r_type = R_SPARC_NONE;
+	}
+      return &_bfd_sparc_elf_howto_table[r_type];
+    }
+}
+
+/* Both 32-bit and 64-bit sparc encode this in an identical manner,
+   so just take advantage of that.  */
+#define SPARC_ELF_R_TYPE(r_info)	\
+	((r_info) & 0xff)
+
+void
+_bfd_sparc_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr,
+			      Elf_Internal_Rela *dst)
+{
+  unsigned int r_type = SPARC_ELF_R_TYPE (dst->r_info);
+
+  cache_ptr->howto = _bfd_sparc_elf_info_to_howto_ptr (r_type);
+}
+
+
+/* The nop opcode we use.  */
+#define SPARC_NOP 0x01000000
+
+#define SPARC_INSN_BYTES	4
+
+/* The SPARC linker needs to keep track of the number of relocs that it
+   decides to copy as dynamic relocs in check_relocs for each symbol.
+   This is so that it can later discard them if they are found to be
+   unnecessary.  We store the information in a field extending the
+   regular ELF linker hash table.  */
+
+struct _bfd_sparc_elf_dyn_relocs
+{
+  struct _bfd_sparc_elf_dyn_relocs *next;
+
+  /* The input section of the reloc.  */
+  asection *sec;
+
+  /* Total number of relocs copied for the input section.  */
+  bfd_size_type count;
+
+  /* Number of pc-relative relocs copied for the input section.  */
+  bfd_size_type pc_count;
+};
+
+/* SPARC ELF linker hash entry.  */
+
+struct _bfd_sparc_elf_link_hash_entry
+{
+  struct elf_link_hash_entry elf;
+
+  /* Track dynamic relocs copied for this symbol.  */
+  struct _bfd_sparc_elf_dyn_relocs *dyn_relocs;
+
+#define GOT_UNKNOWN     0
+#define GOT_NORMAL      1
+#define GOT_TLS_GD      2
+#define GOT_TLS_IE      3
+  unsigned char tls_type;
+};
+
+#define _bfd_sparc_elf_hash_entry(ent) ((struct _bfd_sparc_elf_link_hash_entry *)(ent))
+
+struct _bfd_sparc_elf_obj_tdata
+{
+  struct elf_obj_tdata root;
+
+  /* tls_type for each local got entry.  */
+  char *local_got_tls_type;
+
+  /* TRUE if TLS GD relocs has been seen for this object.  */
+  bfd_boolean has_tlsgd;
+};
+
+#define _bfd_sparc_elf_tdata(abfd) \
+  ((struct _bfd_sparc_elf_obj_tdata *) (abfd)->tdata.any)
+
+#define _bfd_sparc_elf_local_got_tls_type(abfd) \
+  (_bfd_sparc_elf_tdata (abfd)->local_got_tls_type)
+
+#define is_sparc_elf(bfd)				\
+  (bfd_get_flavour (bfd) == bfd_target_elf_flavour	\
+   && elf_tdata (bfd) != NULL				\
+   && elf_object_id (bfd) == SPARC_ELF_DATA)
+
+bfd_boolean
+_bfd_sparc_elf_mkobject (bfd *abfd)
+{
+  return bfd_elf_allocate_object (abfd, sizeof (struct _bfd_sparc_elf_obj_tdata),
+				  SPARC_ELF_DATA);
+}
+
+static void
+sparc_put_word_32 (bfd *abfd, bfd_vma val, void *ptr)
+{
+  bfd_put_32 (abfd, val, ptr);
+}
+
+static void
+sparc_put_word_64 (bfd *abfd, bfd_vma val, void *ptr)
+{
+  bfd_put_64 (abfd, val, ptr);
+}
+
+static void
+sparc_elf_append_rela (bfd *abfd, asection *s, Elf_Internal_Rela *rel)
+{
+  const struct elf_backend_data *bed;
+  bfd_byte *loc;
+
+  bed = get_elf_backend_data (abfd);
+  loc = s->contents + (s->reloc_count++ * bed->s->sizeof_rela);
+  bed->s->swap_reloca_out (abfd, rel, loc);
+}
+
+static bfd_vma
+sparc_elf_r_info_64 (Elf_Internal_Rela *in_rel ATTRIBUTE_UNUSED,
+		     bfd_vma rel_index ATTRIBUTE_UNUSED,
+		     bfd_vma type ATTRIBUTE_UNUSED)
+{
+  return ELF64_R_INFO (rel_index,
+		       (in_rel ?
+			ELF64_R_TYPE_INFO (ELF64_R_TYPE_DATA (in_rel->r_info),
+					   type) : type));
+}
+
+static bfd_vma
+sparc_elf_r_info_32 (Elf_Internal_Rela *in_rel ATTRIBUTE_UNUSED,
+		     bfd_vma rel_index, bfd_vma type)
+{
+  return ELF32_R_INFO (rel_index, type);
+}
+
+static bfd_vma
+sparc_elf_r_symndx_64 (bfd_vma r_info)
+{
+  bfd_vma r_symndx = ELF32_R_SYM (r_info);
+  return (r_symndx >> 24);
+}
+
+static bfd_vma
+sparc_elf_r_symndx_32 (bfd_vma r_info)
+{
+  return ELF32_R_SYM (r_info);
+}
+
+/* PLT/GOT stuff */
+
+#define PLT32_ENTRY_SIZE 12
+#define PLT32_HEADER_SIZE	(4 * PLT32_ENTRY_SIZE)
+
+/* The first four entries in a 32-bit procedure linkage table are reserved,
+   and the initial contents are unimportant (we zero them out).
+   Subsequent entries look like this.  See the SVR4 ABI SPARC
+   supplement to see how this works.  */
+
+/* sethi %hi(.-.plt0),%g1.  We fill in the address later.  */
+#define PLT32_ENTRY_WORD0 0x03000000
+/* b,a .plt0.  We fill in the offset later.  */
+#define PLT32_ENTRY_WORD1 0x30800000
+/* nop.  */
+#define PLT32_ENTRY_WORD2 SPARC_NOP
+
+static int
+sparc32_plt_entry_build (bfd *output_bfd, asection *splt, bfd_vma offset,
+			 bfd_vma max ATTRIBUTE_UNUSED,
+			 bfd_vma *r_offset)
+{
+      bfd_put_32 (output_bfd,
+		  PLT32_ENTRY_WORD0 + offset,
+		  splt->contents + offset);
+      bfd_put_32 (output_bfd,
+		  (PLT32_ENTRY_WORD1
+		   + (((- (offset + 4)) >> 2) & 0x3fffff)),
+		  splt->contents + offset + 4);
+      bfd_put_32 (output_bfd, (bfd_vma) PLT32_ENTRY_WORD2,
+		  splt->contents + offset + 8);
+
+      *r_offset = offset;
+
+      return offset / PLT32_ENTRY_SIZE - 4;
+}
+
+/* Both the headers and the entries are icache aligned.  */
+#define PLT64_ENTRY_SIZE	32
+#define PLT64_HEADER_SIZE	(4 * PLT64_ENTRY_SIZE)
+#define PLT64_LARGE_THRESHOLD	32768
+
+static int
+sparc64_plt_entry_build (bfd *output_bfd, asection *splt, bfd_vma offset,
+			 bfd_vma max, bfd_vma *r_offset)
+{
+  unsigned char *entry = splt->contents + offset;
+  const unsigned int nop = SPARC_NOP;
+  int plt_index;
+
+  if (offset < (PLT64_LARGE_THRESHOLD * PLT64_ENTRY_SIZE))
+    {
+      unsigned int sethi, ba;
+
+      *r_offset = offset;
+
+      plt_index = (offset / PLT64_ENTRY_SIZE);
+
+      sethi = 0x03000000 | (plt_index * PLT64_ENTRY_SIZE);
+      ba = 0x30680000
+	| (((splt->contents + PLT64_ENTRY_SIZE) - (entry + 4)) / 4 & 0x7ffff);
+
+      bfd_put_32 (output_bfd, (bfd_vma) sethi, entry);
+      bfd_put_32 (output_bfd, (bfd_vma) ba,    entry + 4);
+      bfd_put_32 (output_bfd, (bfd_vma) nop,   entry + 8);
+      bfd_put_32 (output_bfd, (bfd_vma) nop,   entry + 12);
+      bfd_put_32 (output_bfd, (bfd_vma) nop,   entry + 16);
+      bfd_put_32 (output_bfd, (bfd_vma) nop,   entry + 20);
+      bfd_put_32 (output_bfd, (bfd_vma) nop,   entry + 24);
+      bfd_put_32 (output_bfd, (bfd_vma) nop,   entry + 28);
+    }
+  else
+    {
+      unsigned char *ptr;
+      unsigned int ldx;
+      int block, last_block, ofs, last_ofs, chunks_this_block;
+      const int insn_chunk_size = (6 * 4);
+      const int ptr_chunk_size = (1 * 8);
+      const int entries_per_block = 160;
+      const int block_size = entries_per_block * (insn_chunk_size
+						  + ptr_chunk_size);
+
+      /* Entries 32768 and higher are grouped into blocks of 160.
+	 The blocks are further subdivided into 160 sequences of
+	 6 instructions and 160 pointers.  If a block does not require
+	 the full 160 entries, let's say it requires N, then there
+	 will be N sequences of 6 instructions and N pointers.  */
+
+      offset -= (PLT64_LARGE_THRESHOLD * PLT64_ENTRY_SIZE);
+      max -= (PLT64_LARGE_THRESHOLD * PLT64_ENTRY_SIZE);
+
+      block = offset / block_size;
+      last_block = max / block_size;
+      if (block != last_block)
+	{
+	  chunks_this_block = 160;
+	}
+      else
+	{
+	  last_ofs = max % block_size;
+	  chunks_this_block = last_ofs / (insn_chunk_size + ptr_chunk_size);
+	}
+
+      ofs = offset % block_size;
+
+      plt_index = (PLT64_LARGE_THRESHOLD +
+	       (block * 160) +
+	       (ofs / insn_chunk_size));
+
+      ptr = splt->contents
+	+ (PLT64_LARGE_THRESHOLD * PLT64_ENTRY_SIZE)
+	+ (block * block_size)
+	+ (chunks_this_block * insn_chunk_size)
+	+ (ofs / insn_chunk_size) * ptr_chunk_size;
+
+      *r_offset = (bfd_vma) (ptr - splt->contents);
+
+      ldx = 0xc25be000 | ((ptr - (entry+4)) & 0x1fff);
+
+      /* mov %o7,%g5
+	 call .+8
+	 nop
+	 ldx [%o7+P],%g1
+	 jmpl %o7+%g1,%g1
+	 mov %g5,%o7  */
+      bfd_put_32 (output_bfd, (bfd_vma) 0x8a10000f, entry);
+      bfd_put_32 (output_bfd, (bfd_vma) 0x40000002, entry + 4);
+      bfd_put_32 (output_bfd, (bfd_vma) SPARC_NOP,  entry + 8);
+      bfd_put_32 (output_bfd, (bfd_vma) ldx,        entry + 12);
+      bfd_put_32 (output_bfd, (bfd_vma) 0x83c3c001, entry + 16);
+      bfd_put_32 (output_bfd, (bfd_vma) 0x9e100005, entry + 20);
+
+      bfd_put_64 (output_bfd, (bfd_vma) (splt->contents - (entry + 4)), ptr);
+    }
+
+  return plt_index - 4;
+}
+
+/* The format of the first PLT entry in a VxWorks executable.  */
+static const bfd_vma sparc_vxworks_exec_plt0_entry[] =
+  {
+    0x05000000,	/* sethi  %hi(_GLOBAL_OFFSET_TABLE_+8), %g2 */
+    0x8410a000,	/* or     %g2, %lo(_GLOBAL_OFFSET_TABLE_+8), %g2 */
+    0xc4008000,	/* ld     [ %g2 ], %g2 */
+    0x81c08000,	/* jmp    %g2 */
+    0x01000000	/* nop */
+  };
+
+/* The format of subsequent PLT entries.  */
+static const bfd_vma sparc_vxworks_exec_plt_entry[] =
+  {
+    0x03000000,	/* sethi  %hi(_GLOBAL_OFFSET_TABLE_+f@got), %g1 */
+    0x82106000,	/* or     %g1, %lo(_GLOBAL_OFFSET_TABLE_+f@got), %g1 */
+    0xc2004000,	/* ld     [ %g1 ], %g1 */
+    0x81c04000,	/* jmp    %g1 */
+    0x01000000,	/* nop */
+    0x03000000,	/* sethi  %hi(f@pltindex), %g1 */
+    0x10800000,	/* b      _PLT_resolve */
+    0x82106000	/* or     %g1, %lo(f@pltindex), %g1 */
+  };
+
+/* The format of the first PLT entry in a VxWorks shared object.  */
+static const bfd_vma sparc_vxworks_shared_plt0_entry[] =
+  {
+    0xc405e008,	/* ld     [ %l7 + 8 ], %g2 */
+    0x81c08000,	/* jmp    %g2 */
+    0x01000000	/* nop */
+  };
+
+/* The format of subsequent PLT entries.  */
+static const bfd_vma sparc_vxworks_shared_plt_entry[] =
+  {
+    0x03000000,	/* sethi  %hi(f@got), %g1 */
+    0x82106000,	/* or     %g1, %lo(f@got), %g1 */
+    0xc205c001,	/* ld     [ %l7 + %g1 ], %g1 */
+    0x81c04000,	/* jmp    %g1 */
+    0x01000000,	/* nop */
+    0x03000000,	/* sethi  %hi(f@pltindex), %g1 */
+    0x10800000,	/* b      _PLT_resolve */
+    0x82106000	/* or     %g1, %lo(f@pltindex), %g1 */
+  };
+
+#define SPARC_ELF_PUT_WORD(htab, bfd, val, ptr)	\
+	htab->put_word(bfd, val, ptr)
+
+#define SPARC_ELF_R_INFO(htab, in_rel, index, type)	\
+	htab->r_info(in_rel, index, type)
+
+#define SPARC_ELF_R_SYMNDX(htab, r_info)	\
+	htab->r_symndx(r_info)
+
+#define SPARC_ELF_WORD_BYTES(htab)	\
+	htab->bytes_per_word
+
+#define SPARC_ELF_RELA_BYTES(htab)	\
+	htab->bytes_per_rela
+
+#define SPARC_ELF_DTPOFF_RELOC(htab)	\
+	htab->dtpoff_reloc
+
+#define SPARC_ELF_DTPMOD_RELOC(htab)	\
+	htab->dtpmod_reloc
+
+#define SPARC_ELF_TPOFF_RELOC(htab)	\
+	htab->tpoff_reloc
+
+#define SPARC_ELF_BUILD_PLT_ENTRY(htab, obfd, splt, off, max, r_off) \
+	htab->build_plt_entry (obfd, splt, off, max, r_off)
+
+/* Create an entry in an SPARC ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+link_hash_newfunc (struct bfd_hash_entry *entry,
+		   struct bfd_hash_table *table, const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table,
+				 sizeof (struct _bfd_sparc_elf_link_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = _bfd_elf_link_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct _bfd_sparc_elf_link_hash_entry *eh;
+
+      eh = (struct _bfd_sparc_elf_link_hash_entry *) entry;
+      eh->dyn_relocs = NULL;
+      eh->tls_type = GOT_UNKNOWN;
+    }
+
+  return entry;
+}
+
+/* The name of the dynamic interpreter.  This is put in the .interp
+   section.  */
+
+#define ELF32_DYNAMIC_INTERPRETER "/usr/lib/ld.so.1"
+#define ELF64_DYNAMIC_INTERPRETER "/usr/lib/sparcv9/ld.so.1"
+
+/* Compute a hash of a local hash entry.  We use elf_link_hash_entry
+   for local symbol so that we can handle local STT_GNU_IFUNC symbols
+   as global symbol.  We reuse indx and dynstr_index for local symbol
+   hash since they aren't used by global symbols in this backend.  */
+
+static hashval_t
+elf_sparc_local_htab_hash (const void *ptr)
+{
+  struct elf_link_hash_entry *h
+    = (struct elf_link_hash_entry *) ptr;
+  return ELF_LOCAL_SYMBOL_HASH (h->indx, h->dynstr_index);
+}
+
+/* Compare local hash entries.  */
+
+static int
+elf_sparc_local_htab_eq (const void *ptr1, const void *ptr2)
+{
+  struct elf_link_hash_entry *h1
+     = (struct elf_link_hash_entry *) ptr1;
+  struct elf_link_hash_entry *h2
+    = (struct elf_link_hash_entry *) ptr2;
+
+  return h1->indx == h2->indx && h1->dynstr_index == h2->dynstr_index;
+}
+
+/* Find and/or create a hash entry for local symbol.  */
+
+static struct elf_link_hash_entry *
+elf_sparc_get_local_sym_hash (struct _bfd_sparc_elf_link_hash_table *htab,
+			      bfd *abfd, const Elf_Internal_Rela *rel,
+			      bfd_boolean create)
+{
+  struct _bfd_sparc_elf_link_hash_entry e, *ret;
+  asection *sec = abfd->sections;
+  unsigned long r_symndx;
+  hashval_t h;
+  void **slot;
+
+  r_symndx = SPARC_ELF_R_SYMNDX (htab, rel->r_info);
+  h = ELF_LOCAL_SYMBOL_HASH (sec->id, r_symndx);
+
+  e.elf.indx = sec->id;
+  e.elf.dynstr_index = r_symndx;
+  slot = htab_find_slot_with_hash (htab->loc_hash_table, &e, h,
+				   create ? INSERT : NO_INSERT);
+
+  if (!slot)
+    return NULL;
+
+  if (*slot)
+    {
+      ret = (struct _bfd_sparc_elf_link_hash_entry *) *slot;
+      return &ret->elf;
+    }
+
+  ret = (struct _bfd_sparc_elf_link_hash_entry *)
+	objalloc_alloc ((struct objalloc *) htab->loc_hash_memory,
+			sizeof (struct _bfd_sparc_elf_link_hash_entry));
+  if (ret)
+    {
+      memset (ret, 0, sizeof (*ret));
+      ret->elf.indx = sec->id;
+      ret->elf.dynstr_index = r_symndx;
+      ret->elf.dynindx = -1;
+      ret->elf.plt.offset = (bfd_vma) -1;
+      ret->elf.got.offset = (bfd_vma) -1;
+      *slot = ret;
+    }
+  return &ret->elf;
+}
+
+/* Create a SPARC ELF linker hash table.  */
+
+struct bfd_link_hash_table *
+_bfd_sparc_elf_link_hash_table_create (bfd *abfd)
+{
+  struct _bfd_sparc_elf_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct _bfd_sparc_elf_link_hash_table);
+
+  ret = (struct _bfd_sparc_elf_link_hash_table *) bfd_zmalloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+  if (ABI_64_P (abfd))
+    {
+      ret->put_word = sparc_put_word_64;
+      ret->r_info = sparc_elf_r_info_64;
+      ret->r_symndx = sparc_elf_r_symndx_64;
+      ret->dtpoff_reloc = R_SPARC_TLS_DTPOFF64;
+      ret->dtpmod_reloc = R_SPARC_TLS_DTPMOD64;
+      ret->tpoff_reloc = R_SPARC_TLS_TPOFF64;
+      ret->word_align_power = 3;
+      ret->align_power_max = 4;
+      ret->bytes_per_word = 8;
+      ret->bytes_per_rela = sizeof (Elf64_External_Rela);
+      ret->dynamic_interpreter = ELF64_DYNAMIC_INTERPRETER;
+      ret->dynamic_interpreter_size = sizeof ELF64_DYNAMIC_INTERPRETER;
+
+      ret->build_plt_entry = sparc64_plt_entry_build;
+      ret->plt_header_size = PLT64_HEADER_SIZE;
+      ret->plt_entry_size = PLT64_ENTRY_SIZE;
+    }
+  else
+    {
+      ret->put_word = sparc_put_word_32;
+      ret->r_info = sparc_elf_r_info_32;
+      ret->r_symndx = sparc_elf_r_symndx_32;
+      ret->dtpoff_reloc = R_SPARC_TLS_DTPOFF32;
+      ret->dtpmod_reloc = R_SPARC_TLS_DTPMOD32;
+      ret->tpoff_reloc = R_SPARC_TLS_TPOFF32;
+      ret->word_align_power = 2;
+      ret->align_power_max = 3;
+      ret->bytes_per_word = 4;
+      ret->bytes_per_rela = sizeof (Elf32_External_Rela);
+      ret->dynamic_interpreter = ELF32_DYNAMIC_INTERPRETER;
+      ret->dynamic_interpreter_size = sizeof ELF32_DYNAMIC_INTERPRETER;
+
+      ret->build_plt_entry = sparc32_plt_entry_build;
+      ret->plt_header_size = PLT32_HEADER_SIZE;
+      ret->plt_entry_size = PLT32_ENTRY_SIZE;
+    }
+
+  if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd, link_hash_newfunc,
+				      sizeof (struct _bfd_sparc_elf_link_hash_entry),
+				      SPARC_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  ret->loc_hash_table = htab_try_create (1024,
+					 elf_sparc_local_htab_hash,
+					 elf_sparc_local_htab_eq,
+					 NULL);
+  ret->loc_hash_memory = objalloc_create ();
+  if (!ret->loc_hash_table || !ret->loc_hash_memory)
+    {
+      free (ret);
+      return NULL;
+    }
+
+  return &ret->elf.root;
+}
+
+/* Destroy a SPARC ELF linker hash table.  */
+
+void
+_bfd_sparc_elf_link_hash_table_free (struct bfd_link_hash_table *hash)
+{
+  struct _bfd_sparc_elf_link_hash_table *htab
+    = (struct _bfd_sparc_elf_link_hash_table *) hash;
+
+  if (htab->loc_hash_table)
+    htab_delete (htab->loc_hash_table);
+  if (htab->loc_hash_memory)
+    objalloc_free ((struct objalloc *) htab->loc_hash_memory);
+  _bfd_generic_link_hash_table_free (hash);
+}
+
+/* Create .plt, .rela.plt, .got, .rela.got, .dynbss, and
+   .rela.bss sections in DYNOBJ, and set up shortcuts to them in our
+   hash table.  */
+
+bfd_boolean
+_bfd_sparc_elf_create_dynamic_sections (bfd *dynobj,
+					struct bfd_link_info *info)
+{
+  struct _bfd_sparc_elf_link_hash_table *htab;
+
+  htab = _bfd_sparc_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  if (!_bfd_elf_create_dynamic_sections (dynobj, info))
+    return FALSE;
+
+  htab->sdynbss = bfd_get_section_by_name (dynobj, ".dynbss");
+  if (!info->shared)
+    htab->srelbss = bfd_get_section_by_name (dynobj, ".rela.bss");
+
+  if (htab->is_vxworks)
+    {
+      if (!elf_vxworks_create_dynamic_sections (dynobj, info, &htab->srelplt2))
+	return FALSE;
+      if (info->shared)
+	{
+	  htab->plt_header_size
+	    = 4 * ARRAY_SIZE (sparc_vxworks_shared_plt0_entry);
+	  htab->plt_entry_size
+	    = 4 * ARRAY_SIZE (sparc_vxworks_shared_plt_entry);
+	}
+      else
+	{
+	  htab->plt_header_size
+	    = 4 * ARRAY_SIZE (sparc_vxworks_exec_plt0_entry);
+	  htab->plt_entry_size
+	    = 4 * ARRAY_SIZE (sparc_vxworks_exec_plt_entry);
+	}
+    }
+
+  if (!htab->elf.splt || !htab->elf.srelplt || !htab->sdynbss
+      || (!info->shared && !htab->srelbss))
+    abort ();
+
+  return TRUE;
+}
+
+static bfd_boolean
+create_ifunc_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  struct elf_link_hash_table *htab = elf_hash_table (info);
+  flagword flags, pltflags;
+  asection *s;
+
+  if (htab->irelifunc != NULL || htab->iplt != NULL)
+    return TRUE;
+
+  flags = bed->dynamic_sec_flags;
+  pltflags = flags | SEC_ALLOC | SEC_CODE | SEC_LOAD;
+
+  s = bfd_make_section_with_flags (abfd, ".iplt", pltflags);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, bed->plt_alignment))
+    return FALSE;
+  htab->iplt = s;
+
+  s = bfd_make_section_with_flags (abfd, ".rela.iplt",
+				   flags | SEC_READONLY);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s,
+				      bed->s->log_file_align))
+    return FALSE;
+  htab->irelplt = s;
+
+  return TRUE;
+}
+
+/* Copy the extra info we tack onto an elf_link_hash_entry.  */
+
+void
+_bfd_sparc_elf_copy_indirect_symbol (struct bfd_link_info *info,
+				     struct elf_link_hash_entry *dir,
+				     struct elf_link_hash_entry *ind)
+{
+  struct _bfd_sparc_elf_link_hash_entry *edir, *eind;
+
+  edir = (struct _bfd_sparc_elf_link_hash_entry *) dir;
+  eind = (struct _bfd_sparc_elf_link_hash_entry *) ind;
+
+  if (eind->dyn_relocs != NULL)
+    {
+      if (edir->dyn_relocs != NULL)
+	{
+	  struct _bfd_sparc_elf_dyn_relocs **pp;
+	  struct _bfd_sparc_elf_dyn_relocs *p;
+
+	  /* Add reloc counts against the indirect sym to the direct sym
+	     list.  Merge any entries against the same section.  */
+	  for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      struct _bfd_sparc_elf_dyn_relocs *q;
+
+	      for (q = edir->dyn_relocs; q != NULL; q = q->next)
+		if (q->sec == p->sec)
+		  {
+		    q->pc_count += p->pc_count;
+		    q->count += p->count;
+		    *pp = p->next;
+		    break;
+		  }
+	      if (q == NULL)
+		pp = &p->next;
+	    }
+	  *pp = edir->dyn_relocs;
+	}
+
+      edir->dyn_relocs = eind->dyn_relocs;
+      eind->dyn_relocs = NULL;
+    }
+
+  if (ind->root.type == bfd_link_hash_indirect
+      && dir->got.refcount <= 0)
+    {
+      edir->tls_type = eind->tls_type;
+      eind->tls_type = GOT_UNKNOWN;
+    }
+  _bfd_elf_link_hash_copy_indirect (info, dir, ind);
+}
+
+static int
+sparc_elf_tls_transition (struct bfd_link_info *info, bfd *abfd,
+			  int r_type, int is_local)
+{
+  if (! ABI_64_P (abfd)
+      && r_type == R_SPARC_TLS_GD_HI22
+      && ! _bfd_sparc_elf_tdata (abfd)->has_tlsgd)
+    r_type = R_SPARC_REV32;
+
+  if (info->shared)
+    return r_type;
+
+  switch (r_type)
+    {
+    case R_SPARC_TLS_GD_HI22:
+      if (is_local)
+	return R_SPARC_TLS_LE_HIX22;
+      return R_SPARC_TLS_IE_HI22;
+    case R_SPARC_TLS_GD_LO10:
+      if (is_local)
+	return R_SPARC_TLS_LE_LOX10;
+      return R_SPARC_TLS_IE_LO10;
+    case R_SPARC_TLS_IE_HI22:
+      if (is_local)
+	return R_SPARC_TLS_LE_HIX22;
+      return r_type;
+    case R_SPARC_TLS_IE_LO10:
+      if (is_local)
+	return R_SPARC_TLS_LE_LOX10;
+      return r_type;
+    case R_SPARC_TLS_LDM_HI22:
+      return R_SPARC_TLS_LE_HIX22;
+    case R_SPARC_TLS_LDM_LO10:
+      return R_SPARC_TLS_LE_LOX10;
+    }
+
+  return r_type;
+}
+
+/* Look through the relocs for a section during the first phase, and
+   allocate space in the global offset table or procedure linkage
+   table.  */
+
+bfd_boolean
+_bfd_sparc_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
+			     asection *sec, const Elf_Internal_Rela *relocs)
+{
+  struct _bfd_sparc_elf_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  asection *sreloc;
+  int num_relocs;
+  bfd_boolean checked_tlsgd = FALSE;
+
+  if (info->relocatable)
+    return TRUE;
+
+  htab = _bfd_sparc_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+
+  sreloc = NULL;
+
+  if (ABI_64_P (abfd))
+    num_relocs = NUM_SHDR_ENTRIES (_bfd_elf_single_rel_hdr (sec));
+  else
+    num_relocs = sec->reloc_count;
+
+  BFD_ASSERT (is_sparc_elf (abfd) || num_relocs == 0);
+
+  if (htab->elf.dynobj == NULL)
+    htab->elf.dynobj = abfd;
+  if (!create_ifunc_sections (htab->elf.dynobj, info))
+    return FALSE;
+
+  rel_end = relocs + num_relocs;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      unsigned int r_type;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+      Elf_Internal_Sym *isym;
+
+      r_symndx = SPARC_ELF_R_SYMNDX (htab, rel->r_info);
+      r_type = SPARC_ELF_R_TYPE (rel->r_info);
+
+      if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
+	{
+	  (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
+				 abfd, r_symndx);
+	  return FALSE;
+	}
+
+      isym = NULL;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  /* A local symbol.  */
+	  isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+					abfd, r_symndx);
+	  if (isym == NULL)
+	    return FALSE;
+
+	  /* Check relocation against local STT_GNU_IFUNC symbol.  */
+	  if (ELF_ST_TYPE (isym->st_info) == STT_GNU_IFUNC)
+	    {
+	      h = elf_sparc_get_local_sym_hash (htab, abfd, rel,
+						TRUE);
+	      if (h == NULL)
+		return FALSE;
+	      
+	      /* Fake a STT_GNU_IFUNC symbol.  */
+	      h->type = STT_GNU_IFUNC;
+	      h->def_regular = 1;
+	      h->ref_regular = 1;
+	      h->forced_local = 1;
+	      h->root.type = bfd_link_hash_defined;
+	    }
+	  else
+	    h = NULL;
+	}
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      if (h && h->type == STT_GNU_IFUNC)
+	{
+	  if (h->def_regular)
+	    {
+	      h->ref_regular = 1;
+	      h->plt.refcount += 1;
+	    }
+	}
+
+      /* Compatibility with old R_SPARC_REV32 reloc conflicting
+	 with R_SPARC_TLS_GD_HI22.  */
+      if (! ABI_64_P (abfd) && ! checked_tlsgd)
+	switch (r_type)
+	  {
+	  case R_SPARC_TLS_GD_HI22:
+	    {
+	      const Elf_Internal_Rela *relt;
+
+	      for (relt = rel + 1; relt < rel_end; relt++)
+		if (ELF32_R_TYPE (relt->r_info) == R_SPARC_TLS_GD_LO10
+		    || ELF32_R_TYPE (relt->r_info) == R_SPARC_TLS_GD_ADD
+		    || ELF32_R_TYPE (relt->r_info) == R_SPARC_TLS_GD_CALL)
+		  break;
+	      checked_tlsgd = TRUE;
+	      _bfd_sparc_elf_tdata (abfd)->has_tlsgd = relt < rel_end;
+	    }
+	    break;
+	  case R_SPARC_TLS_GD_LO10:
+	  case R_SPARC_TLS_GD_ADD:
+	  case R_SPARC_TLS_GD_CALL:
+	    checked_tlsgd = TRUE;
+	    _bfd_sparc_elf_tdata (abfd)->has_tlsgd = TRUE;
+	    break;
+	  }
+
+      r_type = sparc_elf_tls_transition (info, abfd, r_type, h == NULL);
+      switch (r_type)
+	{
+	case R_SPARC_TLS_LDM_HI22:
+	case R_SPARC_TLS_LDM_LO10:
+	  htab->tls_ldm_got.refcount += 1;
+	  break;
+
+	case R_SPARC_TLS_LE_HIX22:
+	case R_SPARC_TLS_LE_LOX10:
+	  if (info->shared)
+	    goto r_sparc_plt32;
+	  break;
+
+	case R_SPARC_TLS_IE_HI22:
+	case R_SPARC_TLS_IE_LO10:
+	  if (info->shared)
+	    info->flags |= DF_STATIC_TLS;
+	  /* Fall through */
+
+	case R_SPARC_GOT10:
+	case R_SPARC_GOT13:
+	case R_SPARC_GOT22:
+	case R_SPARC_GOTDATA_HIX22:
+	case R_SPARC_GOTDATA_LOX10:
+	case R_SPARC_GOTDATA_OP_HIX22:
+	case R_SPARC_GOTDATA_OP_LOX10:
+	case R_SPARC_TLS_GD_HI22:
+	case R_SPARC_TLS_GD_LO10:
+	  /* This symbol requires a global offset table entry.  */
+	  {
+	    int tls_type, old_tls_type;
+
+	    switch (r_type)
+	      {
+	      default:
+	      case R_SPARC_GOT10:
+	      case R_SPARC_GOT13:
+	      case R_SPARC_GOT22:
+	      case R_SPARC_GOTDATA_OP_HIX22:
+	      case R_SPARC_GOTDATA_OP_LOX10:
+		tls_type = GOT_NORMAL;
+		break;
+	      case R_SPARC_TLS_GD_HI22:
+	      case R_SPARC_TLS_GD_LO10:
+		tls_type = GOT_TLS_GD;
+		break;
+	      case R_SPARC_TLS_IE_HI22:
+	      case R_SPARC_TLS_IE_LO10:
+		tls_type = GOT_TLS_IE;
+		break;
+	      }
+
+	    if (h != NULL)
+	      {
+		h->got.refcount += 1;
+		old_tls_type = _bfd_sparc_elf_hash_entry(h)->tls_type;
+	      }
+	    else
+	      {
+		bfd_signed_vma *local_got_refcounts;
+
+		/* This is a global offset table entry for a local symbol.  */
+		local_got_refcounts = elf_local_got_refcounts (abfd);
+		if (local_got_refcounts == NULL)
+		  {
+		    bfd_size_type size;
+
+		    size = symtab_hdr->sh_info;
+		    size *= (sizeof (bfd_signed_vma) + sizeof(char));
+		    local_got_refcounts = ((bfd_signed_vma *)
+					   bfd_zalloc (abfd, size));
+		    if (local_got_refcounts == NULL)
+		      return FALSE;
+		    elf_local_got_refcounts (abfd) = local_got_refcounts;
+		    _bfd_sparc_elf_local_got_tls_type (abfd)
+		      = (char *) (local_got_refcounts + symtab_hdr->sh_info);
+		  }
+		switch (r_type)
+		  {
+		  case R_SPARC_GOTDATA_OP_HIX22:
+		  case R_SPARC_GOTDATA_OP_LOX10:
+		    break;
+
+		  default:
+		    local_got_refcounts[r_symndx] += 1;
+		    break;
+		  }
+		old_tls_type = _bfd_sparc_elf_local_got_tls_type (abfd) [r_symndx];
+	      }
+
+	    /* If a TLS symbol is accessed using IE at least once,
+	       there is no point to use dynamic model for it.  */
+	    if (old_tls_type != tls_type && old_tls_type != GOT_UNKNOWN
+		&& (old_tls_type != GOT_TLS_GD
+		    || tls_type != GOT_TLS_IE))
+	      {
+		if (old_tls_type == GOT_TLS_IE && tls_type == GOT_TLS_GD)
+		  tls_type = old_tls_type;
+		else
+		  {
+		    (*_bfd_error_handler)
+		      (_("%B: `%s' accessed both as normal and thread local symbol"),
+		       abfd, h ? h->root.root.string : "<local>");
+		    return FALSE;
+		  }
+	      }
+
+	    if (old_tls_type != tls_type)
+	      {
+		if (h != NULL)
+		  _bfd_sparc_elf_hash_entry (h)->tls_type = tls_type;
+		else
+		  _bfd_sparc_elf_local_got_tls_type (abfd) [r_symndx] = tls_type;
+	      }
+	  }
+
+	  if (htab->elf.sgot == NULL)
+	    {
+	      if (!_bfd_elf_create_got_section (htab->elf.dynobj, info))
+		return FALSE;
+	    }
+	  break;
+
+	case R_SPARC_TLS_GD_CALL:
+	case R_SPARC_TLS_LDM_CALL:
+	  if (info->shared)
+	    {
+	      /* These are basically R_SPARC_TLS_WPLT30 relocs against
+		 __tls_get_addr.  */
+	      struct bfd_link_hash_entry *bh = NULL;
+	      if (! _bfd_generic_link_add_one_symbol (info, abfd,
+						      "__tls_get_addr", 0,
+						      bfd_und_section_ptr, 0,
+						      NULL, FALSE, FALSE,
+						      &bh))
+		return FALSE;
+	      h = (struct elf_link_hash_entry *) bh;
+	    }
+	  else
+	    break;
+	  /* Fall through */
+
+	case R_SPARC_PLT32:
+	case R_SPARC_WPLT30:
+	case R_SPARC_HIPLT22:
+	case R_SPARC_LOPLT10:
+	case R_SPARC_PCPLT32:
+	case R_SPARC_PCPLT22:
+	case R_SPARC_PCPLT10:
+	case R_SPARC_PLT64:
+	  /* This symbol requires a procedure linkage table entry.  We
+	     actually build the entry in adjust_dynamic_symbol,
+	     because this might be a case of linking PIC code without
+	     linking in any dynamic objects, in which case we don't
+	     need to generate a procedure linkage table after all.  */
+
+	  if (h == NULL)
+	    {
+	      if (! ABI_64_P (abfd))
+		{
+		  /* The Solaris native assembler will generate a WPLT30
+		     reloc for a local symbol if you assemble a call from
+		     one section to another when using -K pic.  We treat
+		     it as WDISP30.  */
+		  if (ELF32_R_TYPE (rel->r_info) == R_SPARC_PLT32)
+		    goto r_sparc_plt32;
+		  break;
+		}
+	      /* PR 7027: We need similar behaviour for 64-bit binaries.  */
+	      else if (r_type == R_SPARC_WPLT30)
+		break;
+
+	      /* It does not make sense to have a procedure linkage
+                 table entry for a local symbol.  */
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+
+	  h->needs_plt = 1;
+
+	  {
+	    int this_r_type;
+
+	    this_r_type = SPARC_ELF_R_TYPE (rel->r_info);
+	    if (this_r_type == R_SPARC_PLT32
+		|| this_r_type == R_SPARC_PLT64)
+	      goto r_sparc_plt32;
+	  }
+	  h->plt.refcount += 1;
+	  break;
+
+	case R_SPARC_PC10:
+	case R_SPARC_PC22:
+	case R_SPARC_PC_HH22:
+	case R_SPARC_PC_HM10:
+	case R_SPARC_PC_LM22:
+	  if (h != NULL)
+	    h->non_got_ref = 1;
+
+	  if (h != NULL
+	      && strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
+	    break;
+	  /* Fall through.  */
+
+	case R_SPARC_DISP8:
+	case R_SPARC_DISP16:
+	case R_SPARC_DISP32:
+	case R_SPARC_DISP64:
+	case R_SPARC_WDISP30:
+	case R_SPARC_WDISP22:
+	case R_SPARC_WDISP19:
+	case R_SPARC_WDISP16:
+	case R_SPARC_8:
+	case R_SPARC_16:
+	case R_SPARC_32:
+	case R_SPARC_HI22:
+	case R_SPARC_22:
+	case R_SPARC_13:
+	case R_SPARC_LO10:
+	case R_SPARC_UA16:
+	case R_SPARC_UA32:
+	case R_SPARC_10:
+	case R_SPARC_11:
+	case R_SPARC_64:
+	case R_SPARC_OLO10:
+	case R_SPARC_HH22:
+	case R_SPARC_HM10:
+	case R_SPARC_LM22:
+	case R_SPARC_7:
+	case R_SPARC_5:
+	case R_SPARC_6:
+	case R_SPARC_HIX22:
+	case R_SPARC_LOX10:
+	case R_SPARC_H44:
+	case R_SPARC_M44:
+	case R_SPARC_L44:
+	case R_SPARC_UA64:
+	  if (h != NULL)
+	    h->non_got_ref = 1;
+
+	r_sparc_plt32:
+	  if (h != NULL && !info->shared)
+	    {
+	      /* We may need a .plt entry if the function this reloc
+		 refers to is in a shared lib.  */
+	      h->plt.refcount += 1;
+	    }
+
+	  /* If we are creating a shared library, and this is a reloc
+	     against a global symbol, or a non PC relative reloc
+	     against a local symbol, then we need to copy the reloc
+	     into the shared library.  However, if we are linking with
+	     -Bsymbolic, we do not need to copy a reloc against a
+	     global symbol which is defined in an object we are
+	     including in the link (i.e., DEF_REGULAR is set).  At
+	     this point we have not seen all the input files, so it is
+	     possible that DEF_REGULAR is not set now but will be set
+	     later (it is never cleared).  In case of a weak definition,
+	     DEF_REGULAR may be cleared later by a strong definition in
+	     a shared library.  We account for that possibility below by
+	     storing information in the relocs_copied field of the hash
+	     table entry.  A similar situation occurs when creating
+	     shared libraries and symbol visibility changes render the
+	     symbol local.
+
+	     If on the other hand, we are creating an executable, we
+	     may need to keep relocations for symbols satisfied by a
+	     dynamic library if we manage to avoid copy relocs for the
+	     symbol.  */
+	  if ((info->shared
+	       && (sec->flags & SEC_ALLOC) != 0
+	       && (! _bfd_sparc_elf_howto_table[r_type].pc_relative
+		   || (h != NULL
+		       && (! SYMBOLIC_BIND (info, h)
+			   || h->root.type == bfd_link_hash_defweak
+			   || !h->def_regular))))
+	      || (!info->shared
+		  && (sec->flags & SEC_ALLOC) != 0
+		  && h != NULL
+		  && (h->root.type == bfd_link_hash_defweak
+		      || !h->def_regular))
+	      || (!info->shared
+		  && h != NULL
+		  && h->type == STT_GNU_IFUNC))
+	    {
+	      struct _bfd_sparc_elf_dyn_relocs *p;
+	      struct _bfd_sparc_elf_dyn_relocs **head;
+
+	      /* When creating a shared object, we must copy these
+		 relocs into the output file.  We create a reloc
+		 section in dynobj and make room for the reloc.  */
+	      if (sreloc == NULL)
+		{
+		  sreloc = _bfd_elf_make_dynamic_reloc_section
+		    (sec, htab->elf.dynobj, htab->word_align_power,
+		     abfd, /*rela?*/ TRUE);
+
+		  if (sreloc == NULL)
+		    return FALSE;
+		}
+
+	      /* If this is a global symbol, we count the number of
+		 relocations we need for this symbol.  */
+	      if (h != NULL)
+		head = &((struct _bfd_sparc_elf_link_hash_entry *) h)->dyn_relocs;
+	      else
+		{
+		  /* Track dynamic relocs needed for local syms too.
+		     We really need local syms available to do this
+		     easily.  Oh well.  */
+		  asection *s;
+		  void *vpp;
+
+		  BFD_ASSERT (isym != NULL);
+		  s = bfd_section_from_elf_index (abfd, isym->st_shndx);
+		  if (s == NULL)
+		    s = sec;
+
+		  vpp = &elf_section_data (s)->local_dynrel;
+		  head = (struct _bfd_sparc_elf_dyn_relocs **) vpp;
+		}
+
+	      p = *head;
+	      if (p == NULL || p->sec != sec)
+		{
+		  bfd_size_type amt = sizeof *p;
+		  p = ((struct _bfd_sparc_elf_dyn_relocs *)
+		       bfd_alloc (htab->elf.dynobj, amt));
+		  if (p == NULL)
+		    return FALSE;
+		  p->next = *head;
+		  *head = p;
+		  p->sec = sec;
+		  p->count = 0;
+		  p->pc_count = 0;
+		}
+
+	      p->count += 1;
+	      if (_bfd_sparc_elf_howto_table[r_type].pc_relative)
+		p->pc_count += 1;
+	    }
+
+	  break;
+
+	case R_SPARC_GNU_VTINHERIT:
+	  if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+	    return FALSE;
+	  break;
+
+	case R_SPARC_GNU_VTENTRY:
+	  BFD_ASSERT (h != NULL);
+	  if (h != NULL
+	      && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+	    return FALSE;
+	  break;
+
+	case R_SPARC_REGISTER:
+	  /* Nothing to do.  */
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+asection *
+_bfd_sparc_elf_gc_mark_hook (asection *sec,
+			     struct bfd_link_info *info,
+			     Elf_Internal_Rela *rel,
+			     struct elf_link_hash_entry *h,
+			     Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    switch (SPARC_ELF_R_TYPE (rel->r_info))
+      {
+      case R_SPARC_GNU_VTINHERIT:
+      case R_SPARC_GNU_VTENTRY:
+	return NULL;
+      }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+static Elf_Internal_Rela *
+sparc_elf_find_reloc_at_ofs (Elf_Internal_Rela *rel,
+			     Elf_Internal_Rela *relend,
+			     bfd_vma offset)
+{
+  while (rel < relend)
+    {
+      if (rel->r_offset == offset)
+	return rel;
+      rel++;
+    }
+  return NULL;
+}
+
+/* Update the got entry reference counts for the section being removed.  */
+bfd_boolean
+_bfd_sparc_elf_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info,
+			      asection *sec, const Elf_Internal_Rela *relocs)
+{
+  struct _bfd_sparc_elf_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  const Elf_Internal_Rela *rel, *relend;
+
+  if (info->relocatable)
+    return TRUE;
+
+  BFD_ASSERT (is_sparc_elf (abfd) || sec->reloc_count == 0);
+
+  elf_section_data (sec)->local_dynrel = NULL;
+
+  htab = _bfd_sparc_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      unsigned int r_type;
+      struct elf_link_hash_entry *h = NULL;
+
+      r_symndx = SPARC_ELF_R_SYMNDX (htab, rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  struct _bfd_sparc_elf_link_hash_entry *eh;
+	  struct _bfd_sparc_elf_dyn_relocs **pp;
+	  struct _bfd_sparc_elf_dyn_relocs *p;
+
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	  eh = (struct _bfd_sparc_elf_link_hash_entry *) h;
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
+	    if (p->sec == sec)
+	      {
+		/* Everything must go for SEC.  */
+		*pp = p->next;
+		break;
+	      }
+	}
+
+      r_type = SPARC_ELF_R_TYPE (rel->r_info);
+      r_type = sparc_elf_tls_transition (info, abfd, r_type, h != NULL);
+      switch (r_type)
+	{
+	case R_SPARC_TLS_LDM_HI22:
+	case R_SPARC_TLS_LDM_LO10:
+	  if (_bfd_sparc_elf_hash_table (info)->tls_ldm_got.refcount > 0)
+	    _bfd_sparc_elf_hash_table (info)->tls_ldm_got.refcount -= 1;
+	  break;
+
+	case R_SPARC_TLS_GD_HI22:
+	case R_SPARC_TLS_GD_LO10:
+	case R_SPARC_TLS_IE_HI22:
+	case R_SPARC_TLS_IE_LO10:
+	case R_SPARC_GOT10:
+	case R_SPARC_GOT13:
+	case R_SPARC_GOT22:
+	case R_SPARC_GOTDATA_HIX22:
+	case R_SPARC_GOTDATA_LOX10:
+	case R_SPARC_GOTDATA_OP_HIX22:
+	case R_SPARC_GOTDATA_OP_LOX10:
+	  if (h != NULL)
+	    {
+	      if (h->got.refcount > 0)
+		h->got.refcount--;
+	    }
+	  else
+	    {
+	      switch (r_type)
+		{
+		case R_SPARC_GOTDATA_OP_HIX22:
+		case R_SPARC_GOTDATA_OP_LOX10:
+		  break;
+
+		default:
+		  if (local_got_refcounts[r_symndx] > 0)
+		    local_got_refcounts[r_symndx]--;
+		  break;
+		}
+	    }
+	  break;
+
+	case R_SPARC_PC10:
+	case R_SPARC_PC22:
+	case R_SPARC_PC_HH22:
+	case R_SPARC_PC_HM10:
+	case R_SPARC_PC_LM22:
+	  if (h != NULL
+	      && strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
+	    break;
+	  /* Fall through.  */
+
+	case R_SPARC_DISP8:
+	case R_SPARC_DISP16:
+	case R_SPARC_DISP32:
+	case R_SPARC_DISP64:
+	case R_SPARC_WDISP30:
+	case R_SPARC_WDISP22:
+	case R_SPARC_WDISP19:
+	case R_SPARC_WDISP16:
+	case R_SPARC_8:
+	case R_SPARC_16:
+	case R_SPARC_32:
+	case R_SPARC_HI22:
+	case R_SPARC_22:
+	case R_SPARC_13:
+	case R_SPARC_LO10:
+	case R_SPARC_UA16:
+	case R_SPARC_UA32:
+	case R_SPARC_PLT32:
+	case R_SPARC_10:
+	case R_SPARC_11:
+	case R_SPARC_64:
+	case R_SPARC_OLO10:
+	case R_SPARC_HH22:
+	case R_SPARC_HM10:
+	case R_SPARC_LM22:
+	case R_SPARC_7:
+	case R_SPARC_5:
+	case R_SPARC_6:
+	case R_SPARC_HIX22:
+	case R_SPARC_LOX10:
+	case R_SPARC_H44:
+	case R_SPARC_M44:
+	case R_SPARC_L44:
+	case R_SPARC_UA64:
+	  if (info->shared)
+	    break;
+	  /* Fall through.  */
+
+	case R_SPARC_WPLT30:
+	  if (h != NULL)
+	    {
+	      if (h->plt.refcount > 0)
+		h->plt.refcount--;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+bfd_boolean
+_bfd_sparc_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+				     struct elf_link_hash_entry *h)
+{
+  struct _bfd_sparc_elf_link_hash_table *htab;
+  struct _bfd_sparc_elf_link_hash_entry * eh;
+  struct _bfd_sparc_elf_dyn_relocs *p;
+  asection *s;
+
+  htab = _bfd_sparc_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (htab->elf.dynobj != NULL
+	      && (h->needs_plt
+		  || h->type == STT_GNU_IFUNC
+		  || h->u.weakdef != NULL
+		  || (h->def_dynamic
+		      && h->ref_regular
+		      && !h->def_regular)));
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later
+     (although we could actually do it here).  The STT_NOTYPE
+     condition is a hack specifically for the Oracle libraries
+     delivered for Solaris; for some inexplicable reason, they define
+     some of their functions as STT_NOTYPE when they really should be
+     STT_FUNC.  */
+  if (h->type == STT_FUNC
+      || h->type == STT_GNU_IFUNC
+      || h->needs_plt
+      || (h->type == STT_NOTYPE
+	  && (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	  && (h->root.u.def.section->flags & SEC_CODE) != 0))
+    {
+      if (h->plt.refcount <= 0
+	  || (h->type != STT_GNU_IFUNC
+	      && (SYMBOL_CALLS_LOCAL (info, h)
+		  || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+		      && h->root.type == bfd_link_hash_undefweak))))
+	{
+	  /* This case can occur if we saw a WPLT30 reloc in an input
+	     file, but the symbol was never referred to by a dynamic
+	     object, or if all references were garbage collected.  In
+	     such a case, we don't actually need to build a procedure
+	     linkage table, and we can just do a WDISP30 reloc instead.  */
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	}
+
+      return TRUE;
+    }
+  else
+    h->plt.offset = (bfd_vma) -1;
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if (!h->non_got_ref)
+    return TRUE;
+
+  /* If -z nocopyreloc was given, we won't generate them either.  */
+  if (info->nocopyreloc)
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  eh = (struct _bfd_sparc_elf_link_hash_entry *) h;
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      s = p->sec->output_section;
+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
+	break;
+    }
+
+  /* If we didn't find any dynamic relocs in read-only sections, then
+     we'll be keeping the dynamic relocs and avoiding the copy reloc.  */
+  if (p == NULL)
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  /* We must generate a R_SPARC_COPY reloc to tell the dynamic linker
+     to copy the initial value out of the dynamic object and into the
+     runtime process image.  We need to remember the offset into the
+     .rel.bss section we are going to use.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      htab->srelbss->size += SPARC_ELF_RELA_BYTES (htab);
+      h->needs_copy = 1;
+    }
+
+  s = htab->sdynbss;
+
+  return _bfd_elf_adjust_dynamic_copy (h, s);
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   dynamic relocs.  */
+
+static bfd_boolean
+allocate_dynrelocs (struct elf_link_hash_entry *h, PTR inf)
+{
+  struct bfd_link_info *info;
+  struct _bfd_sparc_elf_link_hash_table *htab;
+  struct _bfd_sparc_elf_link_hash_entry *eh;
+  struct _bfd_sparc_elf_dyn_relocs *p;
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  info = (struct bfd_link_info *) inf;
+  htab = _bfd_sparc_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  if ((htab->elf.dynamic_sections_created
+       && h->plt.refcount > 0)
+      || (h->type == STT_GNU_IFUNC
+	  && h->def_regular
+	  && h->ref_regular))
+    {
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info->shared, h)
+	  || (h->type == STT_GNU_IFUNC
+	      && h->def_regular))
+	{
+	  asection *s = htab->elf.splt;
+
+	  if (s == NULL)
+	    s = htab->elf.iplt;
+
+	  /* Allocate room for the header.  */
+	  if (s->size == 0)
+	    {
+	      s->size = htab->plt_header_size;
+
+	      /* Allocate space for the .rela.plt.unloaded relocations.  */
+	      if (htab->is_vxworks && !info->shared)
+		htab->srelplt2->size = sizeof (Elf32_External_Rela) * 2;
+	    }
+
+	  /* The procedure linkage table size is bounded by the magnitude
+	     of the offset we can describe in the entry.  */
+	  if (s->size >= (SPARC_ELF_WORD_BYTES(htab) == 8 ?
+			  (((bfd_vma)1 << 31) << 1) : 0x400000))
+	    {
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+
+	  if (SPARC_ELF_WORD_BYTES(htab) == 8
+	      && s->size >= PLT64_LARGE_THRESHOLD * PLT64_ENTRY_SIZE)
+	    {
+	      bfd_vma off = s->size - PLT64_LARGE_THRESHOLD * PLT64_ENTRY_SIZE;
+
+
+	      off = (off % (160 * PLT64_ENTRY_SIZE)) / PLT64_ENTRY_SIZE;
+
+	      h->plt.offset = (s->size - (off * 8));
+	    }
+	  else
+	    h->plt.offset = s->size;
+
+	  /* If this symbol is not defined in a regular file, and we are
+	     not generating a shared library, then set the symbol to this
+	     location in the .plt.  This is required to make function
+	     pointers compare as equal between the normal executable and
+	     the shared library.  */
+	  if (! info->shared
+	      && !h->def_regular)
+	    {
+	      h->root.u.def.section = s;
+	      h->root.u.def.value = h->plt.offset;
+	    }
+
+	  /* Make room for this entry.  */
+	  s->size += htab->plt_entry_size;
+
+	  /* We also need to make an entry in the .rela.plt section.  */
+	  if (s == htab->elf.splt)
+	    htab->elf.srelplt->size += SPARC_ELF_RELA_BYTES (htab);
+	  else
+	    htab->elf.irelplt->size += SPARC_ELF_RELA_BYTES (htab);
+
+	  if (htab->is_vxworks)
+	    {
+	      /* Allocate space for the .got.plt entry.  */
+	      htab->elf.sgotplt->size += 4;
+
+	      /* ...and for the .rela.plt.unloaded relocations.  */
+	      if (!info->shared)
+		htab->srelplt2->size += sizeof (Elf32_External_Rela) * 3;
+	    }
+	}
+      else
+	{
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	}
+    }
+  else
+    {
+      h->plt.offset = (bfd_vma) -1;
+      h->needs_plt = 0;
+    }
+
+  /* If R_SPARC_TLS_IE_{HI22,LO10} symbol is now local to the binary,
+     make it a R_SPARC_TLS_LE_{HI22,LO10} requiring no TLS entry.  */
+  if (h->got.refcount > 0
+      && !info->shared
+      && h->dynindx == -1
+      && _bfd_sparc_elf_hash_entry(h)->tls_type == GOT_TLS_IE)
+    h->got.offset = (bfd_vma) -1;
+  else if (h->got.refcount > 0)
+    {
+      asection *s;
+      bfd_boolean dyn;
+      int tls_type = _bfd_sparc_elf_hash_entry(h)->tls_type;
+
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      s = htab->elf.sgot;
+      h->got.offset = s->size;
+      s->size += SPARC_ELF_WORD_BYTES (htab);
+      /* R_SPARC_TLS_GD_HI{22,LO10} needs 2 consecutive GOT slots.  */
+      if (tls_type == GOT_TLS_GD)
+	s->size += SPARC_ELF_WORD_BYTES (htab);
+      dyn = htab->elf.dynamic_sections_created;
+      /* R_SPARC_TLS_IE_{HI22,LO10} needs one dynamic relocation,
+	 R_SPARC_TLS_GD_{HI22,LO10} needs one if local symbol and two if
+	 global.  */
+      if ((tls_type == GOT_TLS_GD && h->dynindx == -1)
+	  || tls_type == GOT_TLS_IE
+	  || h->type == STT_GNU_IFUNC)
+	htab->elf.srelgot->size += SPARC_ELF_RELA_BYTES (htab);
+      else if (tls_type == GOT_TLS_GD)
+	htab->elf.srelgot->size += 2 * SPARC_ELF_RELA_BYTES (htab);
+      else if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h))
+	htab->elf.srelgot->size += SPARC_ELF_RELA_BYTES (htab);
+    }
+  else
+    h->got.offset = (bfd_vma) -1;
+
+  eh = (struct _bfd_sparc_elf_link_hash_entry *) h;
+  if (eh->dyn_relocs == NULL)
+    return TRUE;
+
+  /* In the shared -Bsymbolic case, discard space allocated for
+     dynamic pc-relative relocs against symbols which turn out to be
+     defined in regular objects.  For the normal shared case, discard
+     space for pc-relative relocs that have become local due to symbol
+     visibility changes.  */
+
+  if (info->shared)
+    {
+      if (SYMBOL_CALLS_LOCAL (info, h))
+	{
+	  struct _bfd_sparc_elf_dyn_relocs **pp;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      p->count -= p->pc_count;
+	      p->pc_count = 0;
+	      if (p->count == 0)
+		*pp = p->next;
+	      else
+		pp = &p->next;
+	    }
+	}
+
+      if (htab->is_vxworks)
+	{
+	  struct _bfd_sparc_elf_dyn_relocs **pp;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      if (strcmp (p->sec->output_section->name, ".tls_vars") == 0)
+		*pp = p->next;
+	      else
+		pp = &p->next;
+	    }
+	}
+
+      /* Also discard relocs on undefined weak syms with non-default
+	 visibility.  */
+      if (eh->dyn_relocs != NULL
+	  && h->root.type == bfd_link_hash_undefweak)
+	{
+	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	    eh->dyn_relocs = NULL;
+
+	  /* Make sure undefined weak symbols are output as a dynamic
+	     symbol in PIEs.  */
+	  else if (h->dynindx == -1
+		   && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+	}
+    }
+  else
+    {
+      /* For the non-shared case, discard space for relocs against
+	 symbols which turn out to need copy relocs or are not
+	 dynamic.  */
+
+      if (!h->non_got_ref
+	  && ((h->def_dynamic
+	       && !h->def_regular)
+	      || (htab->elf.dynamic_sections_created
+		  && (h->root.type == bfd_link_hash_undefweak
+		      || h->root.type == bfd_link_hash_undefined))))
+	{
+	  /* Make sure this symbol is output as a dynamic symbol.
+	     Undefined weak syms won't yet be marked as dynamic.  */
+	  if (h->dynindx == -1
+	      && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+
+	  /* If that succeeded, we know we'll be keeping all the
+	     relocs.  */
+	  if (h->dynindx != -1)
+	    goto keep;
+	}
+
+      eh->dyn_relocs = NULL;
+
+    keep: ;
+    }
+
+  /* Finally, allocate space.  */
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *sreloc = elf_section_data (p->sec)->sreloc;
+      sreloc->size += p->count * SPARC_ELF_RELA_BYTES (htab);
+    }
+
+  return TRUE;
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   local dynamic relocs.  */
+
+static bfd_boolean
+allocate_local_dynrelocs (void **slot, void *inf)
+{
+  struct elf_link_hash_entry *h
+    = (struct elf_link_hash_entry *) *slot;
+
+  if (h->type != STT_GNU_IFUNC
+      || !h->def_regular
+      || !h->ref_regular
+      || !h->forced_local
+      || h->root.type != bfd_link_hash_defined)
+    abort ();
+
+  return allocate_dynrelocs (h, inf);
+}
+
+/* Find any dynamic relocs that apply to read-only sections.  */
+
+static bfd_boolean
+readonly_dynrelocs (struct elf_link_hash_entry *h, PTR inf)
+{
+  struct _bfd_sparc_elf_link_hash_entry *eh;
+  struct _bfd_sparc_elf_dyn_relocs *p;
+
+  eh = (struct _bfd_sparc_elf_link_hash_entry *) h;
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *s = p->sec->output_section;
+
+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
+	{
+	  struct bfd_link_info *info = (struct bfd_link_info *) inf;
+
+	  info->flags |= DF_TEXTREL;
+
+	  /* Not an error, just cut short the traversal.  */
+	  return FALSE;
+	}
+    }
+  return TRUE;
+}
+
+/* Return true if the dynamic symbol for a given section should be
+   omitted when creating a shared library.  */
+
+bfd_boolean
+_bfd_sparc_elf_omit_section_dynsym (bfd *output_bfd,
+				    struct bfd_link_info *info,
+				    asection *p)
+{
+  /* We keep the .got section symbol so that explicit relocations
+     against the _GLOBAL_OFFSET_TABLE_ symbol emitted in PIC mode
+     can be turned into relocations against the .got symbol.  */
+  if (strcmp (p->name, ".got") == 0)
+    return FALSE;
+
+  return _bfd_elf_link_omit_section_dynsym (output_bfd, info, p);
+}
+
+/* Set the sizes of the dynamic sections.  */
+
+bfd_boolean
+_bfd_sparc_elf_size_dynamic_sections (bfd *output_bfd,
+				      struct bfd_link_info *info)
+{
+  struct _bfd_sparc_elf_link_hash_table *htab;
+  bfd *dynobj;
+  asection *s;
+  bfd *ibfd;
+
+  htab = _bfd_sparc_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+  dynobj = htab->elf.dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (s != NULL);
+	  s->size = htab->dynamic_interpreter_size;
+	  s->contents = (unsigned char *) htab->dynamic_interpreter;
+	}
+    }
+
+  /* Set up .got offsets for local syms, and space for local dynamic
+     relocs.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      bfd_signed_vma *local_got;
+      bfd_signed_vma *end_local_got;
+      char *local_tls_type;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *srel;
+
+      if (! is_sparc_elf (ibfd))
+	continue;
+
+      for (s = ibfd->sections; s != NULL; s = s->next)
+	{
+	  struct _bfd_sparc_elf_dyn_relocs *p;
+
+	  for (p = elf_section_data (s)->local_dynrel; p != NULL; p = p->next)
+	    {
+	      if (!bfd_is_abs_section (p->sec)
+		  && bfd_is_abs_section (p->sec->output_section))
+		{
+		  /* Input section has been discarded, either because
+		     it is a copy of a linkonce section or due to
+		     linker script /DISCARD/, so we'll be discarding
+		     the relocs too.  */
+		}
+	      else if (htab->is_vxworks
+		       && strcmp (p->sec->output_section->name,
+				  ".tls_vars") == 0)
+		{
+		  /* Relocations in vxworks .tls_vars sections are
+		     handled specially by the loader.  */
+		}
+	      else if (p->count != 0)
+		{
+		  srel = elf_section_data (p->sec)->sreloc;
+		  if (!htab->elf.dynamic_sections_created)
+		    srel = htab->elf.irelplt;
+		  srel->size += p->count * SPARC_ELF_RELA_BYTES (htab);
+		  if ((p->sec->output_section->flags & SEC_READONLY) != 0)
+		    info->flags |= DF_TEXTREL;
+		}
+	    }
+	}
+
+      local_got = elf_local_got_refcounts (ibfd);
+      if (!local_got)
+	continue;
+
+      symtab_hdr = &elf_symtab_hdr (ibfd);
+      locsymcount = symtab_hdr->sh_info;
+      end_local_got = local_got + locsymcount;
+      local_tls_type = _bfd_sparc_elf_local_got_tls_type (ibfd);
+      s = htab->elf.sgot;
+      srel = htab->elf.srelgot;
+      for (; local_got < end_local_got; ++local_got, ++local_tls_type)
+	{
+	  if (*local_got > 0)
+	    {
+	      *local_got = s->size;
+	      s->size += SPARC_ELF_WORD_BYTES (htab);
+	      if (*local_tls_type == GOT_TLS_GD)
+		s->size += SPARC_ELF_WORD_BYTES (htab);
+	      if (info->shared
+		  || *local_tls_type == GOT_TLS_GD
+		  || *local_tls_type == GOT_TLS_IE)
+		srel->size += SPARC_ELF_RELA_BYTES (htab);
+	    }
+	  else
+	    *local_got = (bfd_vma) -1;
+	}
+    }
+
+  if (htab->tls_ldm_got.refcount > 0)
+    {
+      /* Allocate 2 got entries and 1 dynamic reloc for
+	 R_SPARC_TLS_LDM_{HI22,LO10} relocs.  */
+      htab->tls_ldm_got.offset = htab->elf.sgot->size;
+      htab->elf.sgot->size += (2 * SPARC_ELF_WORD_BYTES (htab));
+      htab->elf.srelgot->size += SPARC_ELF_RELA_BYTES (htab);
+    }
+  else
+    htab->tls_ldm_got.offset = -1;
+
+  /* Allocate global sym .plt and .got entries, and space for global
+     sym dynamic relocs.  */
+  elf_link_hash_traverse (&htab->elf, allocate_dynrelocs, (PTR) info);
+
+  /* Allocate .plt and .got entries, and space for local symbols.  */
+  htab_traverse (htab->loc_hash_table, allocate_local_dynrelocs, info);
+
+  if (! ABI_64_P (output_bfd)
+      && !htab->is_vxworks
+      && elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Make space for the trailing nop in .plt.  */
+      if (htab->elf.splt->size > 0)
+	htab->elf.splt->size += 1 * SPARC_INSN_BYTES;
+
+      /* If the .got section is more than 0x1000 bytes, we add
+	 0x1000 to the value of _GLOBAL_OFFSET_TABLE_, so that 13
+	 bit relocations have a greater chance of working.
+
+	 FIXME: Make this optimization work for 64-bit too.  */
+      if (htab->elf.sgot->size >= 0x1000
+	  && elf_hash_table (info)->hgot->root.u.def.value == 0)
+	elf_hash_table (info)->hgot->root.u.def.value = 0x1000;
+    }
+
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      if (s == htab->elf.splt
+	  || s == htab->elf.sgot
+	  || s == htab->sdynbss
+	  || s == htab->elf.iplt
+	  || s == htab->elf.sgotplt)
+	{
+	  /* Strip this section if we don't need it; see the
+	     comment below.  */
+	}
+      else if (CONST_STRNEQ (s->name, ".rela"))
+	{
+	  if (s->size != 0)
+	    {
+	      /* We use the reloc_count field as a counter if we need
+		 to copy relocs into the output file.  */
+	      s->reloc_count = 0;
+	    }
+	}
+      else
+	{
+	  /* It's not one of our sections.  */
+	  continue;
+	}
+
+      if (s->size == 0)
+	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is mostly to handle .rela.bss and
+	     .rela.plt.  We must create both sections in
+	     create_dynamic_sections, because they must be created
+	     before the linker maps input sections to output
+	     sections.  The linker does that before
+	     adjust_dynamic_symbol is called, and it is that
+	     function which decides whether anything needs to go
+	     into these sections.  */
+	  s->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents.  Zero the memory
+	 for the benefit of .rela.plt, which has 4 unused entries
+	 at the beginning, and we don't want garbage.  */
+      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in _bfd_sparc_elf_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (info->executable)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (htab->elf.srelplt->size != 0)
+	{
+	  if (!add_dynamic_entry (DT_PLTGOT, 0)
+	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+	      || !add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+	}
+
+      if (!add_dynamic_entry (DT_RELA, 0)
+	  || !add_dynamic_entry (DT_RELASZ, 0)
+	  || !add_dynamic_entry (DT_RELAENT,
+				 SPARC_ELF_RELA_BYTES (htab)))
+	return FALSE;
+
+      /* If any dynamic relocs apply to a read-only section,
+	 then we need a DT_TEXTREL entry.  */
+      if ((info->flags & DF_TEXTREL) == 0)
+	elf_link_hash_traverse (&htab->elf, readonly_dynrelocs,
+				(PTR) info);
+
+      if (info->flags & DF_TEXTREL)
+	{
+	  if (!add_dynamic_entry (DT_TEXTREL, 0))
+	    return FALSE;
+	}
+
+      if (ABI_64_P (output_bfd))
+	{
+	  int reg;
+	  struct _bfd_sparc_elf_app_reg * app_regs;
+	  struct elf_strtab_hash *dynstr;
+	  struct elf_link_hash_table *eht = elf_hash_table (info);
+
+	  /* Add dynamic STT_REGISTER symbols and corresponding DT_SPARC_REGISTER
+	     entries if needed.  */
+	  app_regs = _bfd_sparc_elf_hash_table (info)->app_regs;
+	  dynstr = eht->dynstr;
+
+	  for (reg = 0; reg < 4; reg++)
+	    if (app_regs [reg].name != NULL)
+	      {
+		struct elf_link_local_dynamic_entry *entry, *e;
+
+		if (!add_dynamic_entry (DT_SPARC_REGISTER, 0))
+		  return FALSE;
+
+		entry = (struct elf_link_local_dynamic_entry *)
+		  bfd_hash_allocate (&info->hash->table, sizeof (*entry));
+		if (entry == NULL)
+		  return FALSE;
+
+		/* We cheat here a little bit: the symbol will not be local, so we
+		   put it at the end of the dynlocal linked list.  We will fix it
+		   later on, as we have to fix other fields anyway.  */
+		entry->isym.st_value = reg < 2 ? reg + 2 : reg + 4;
+		entry->isym.st_size = 0;
+		if (*app_regs [reg].name != '\0')
+		  entry->isym.st_name
+		    = _bfd_elf_strtab_add (dynstr, app_regs[reg].name, FALSE);
+		else
+		  entry->isym.st_name = 0;
+		entry->isym.st_other = 0;
+		entry->isym.st_info = ELF_ST_INFO (app_regs [reg].bind,
+						   STT_REGISTER);
+		entry->isym.st_shndx = app_regs [reg].shndx;
+		entry->isym.st_target_internal = 0;
+		entry->next = NULL;
+		entry->input_bfd = output_bfd;
+		entry->input_indx = -1;
+
+		if (eht->dynlocal == NULL)
+		  eht->dynlocal = entry;
+		else
+		  {
+		    for (e = eht->dynlocal; e->next; e = e->next)
+		      ;
+		    e->next = entry;
+		  }
+		eht->dynsymcount++;
+	      }
+	}
+      if (htab->is_vxworks
+	  && !elf_vxworks_add_dynamic_entries (output_bfd, info))
+	return FALSE;
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+bfd_boolean
+_bfd_sparc_elf_new_section_hook (bfd *abfd, asection *sec)
+{
+  if (!sec->used_by_bfd)
+    {
+      struct _bfd_sparc_elf_section_data *sdata;
+      bfd_size_type amt = sizeof (*sdata);
+
+      sdata = bfd_zalloc (abfd, amt);
+      if (sdata == NULL)
+	return FALSE;
+      sec->used_by_bfd = sdata;
+    }
+
+  return _bfd_elf_new_section_hook (abfd, sec);
+}
+
+bfd_boolean
+_bfd_sparc_elf_relax_section (bfd *abfd ATTRIBUTE_UNUSED,
+			      struct bfd_section *section,
+			      struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
+			      bfd_boolean *again)
+{
+  if (link_info->relocatable)
+    (*link_info->callbacks->einfo)
+      (_("%P%F: --relax and -r may not be used together\n"));
+
+  *again = FALSE;
+  sec_do_relax (section) = 1;
+  return TRUE;
+}
+
+/* Return the base VMA address which should be subtracted from real addresses
+   when resolving @dtpoff relocation.
+   This is PT_TLS segment p_vaddr.  */
+
+static bfd_vma
+dtpoff_base (struct bfd_link_info *info)
+{
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (elf_hash_table (info)->tls_sec == NULL)
+    return 0;
+  return elf_hash_table (info)->tls_sec->vma;
+}
+
+/* Return the relocation value for @tpoff relocation
+   if STT_TLS virtual address is ADDRESS.  */
+
+static bfd_vma
+tpoff (struct bfd_link_info *info, bfd_vma address)
+{
+  struct elf_link_hash_table *htab = elf_hash_table (info);
+  const struct elf_backend_data *bed = get_elf_backend_data (info->output_bfd);
+  bfd_vma static_tls_size;
+
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (htab->tls_sec == NULL)
+    return 0;
+
+  /* Consider special static TLS alignment requirements.  */
+  static_tls_size = BFD_ALIGN (htab->tls_size, bed->static_tls_alignment);
+  return address - static_tls_size - htab->tls_sec->vma;
+}
+
+/* Return the relocation value for a %gdop relocation.  */
+
+static bfd_vma
+gdopoff (struct bfd_link_info *info, bfd_vma address)
+{
+  struct elf_link_hash_table *htab = elf_hash_table (info);
+  bfd_vma got_base;
+
+  got_base = (htab->hgot->root.u.def.value
+	      + htab->hgot->root.u.def.section->output_offset
+	      + htab->hgot->root.u.def.section->output_section->vma);
+
+  return address - got_base;
+}
+
+/* Relocate a SPARC ELF section.  */
+
+bfd_boolean
+_bfd_sparc_elf_relocate_section (bfd *output_bfd,
+				 struct bfd_link_info *info,
+				 bfd *input_bfd,
+				 asection *input_section,
+				 bfd_byte *contents,
+				 Elf_Internal_Rela *relocs,
+				 Elf_Internal_Sym *local_syms,
+				 asection **local_sections)
+{
+  struct _bfd_sparc_elf_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_vma *local_got_offsets;
+  bfd_vma got_base;
+  asection *sreloc;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  int num_relocs;
+  bfd_boolean is_vxworks_tls;
+
+  htab = _bfd_sparc_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+  symtab_hdr = &elf_symtab_hdr (input_bfd);
+  sym_hashes = elf_sym_hashes (input_bfd);
+  local_got_offsets = elf_local_got_offsets (input_bfd);
+
+  if (elf_hash_table (info)->hgot == NULL)
+    got_base = 0;
+  else
+    got_base = elf_hash_table (info)->hgot->root.u.def.value;
+
+  sreloc = elf_section_data (input_section)->sreloc;
+  /* We have to handle relocations in vxworks .tls_vars sections
+     specially, because the dynamic loader is 'weird'.  */
+  is_vxworks_tls = (htab->is_vxworks && info->shared
+		    && !strcmp (input_section->output_section->name,
+				".tls_vars"));
+
+  rel = relocs;
+  if (ABI_64_P (output_bfd))
+    num_relocs = NUM_SHDR_ENTRIES (_bfd_elf_single_rel_hdr (input_section));
+  else
+    num_relocs = input_section->reloc_count;
+  relend = relocs + num_relocs;
+  for (; rel < relend; rel++)
+    {
+      int r_type, tls_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      bfd_vma relocation, off;
+      bfd_reloc_status_type r;
+      bfd_boolean is_plt = FALSE;
+      bfd_boolean unresolved_reloc;
+
+      r_type = SPARC_ELF_R_TYPE (rel->r_info);
+      if (r_type == R_SPARC_GNU_VTINHERIT
+	  || r_type == R_SPARC_GNU_VTENTRY)
+	continue;
+
+      if (r_type < 0 || r_type >= (int) R_SPARC_max_std)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+      howto = _bfd_sparc_elf_howto_table + r_type;
+
+      r_symndx = SPARC_ELF_R_SYMNDX (htab, rel->r_info);
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      unresolved_reloc = FALSE;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+
+	  if (!info->relocatable
+	      && ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
+	    {
+	      /* Relocate against local STT_GNU_IFUNC symbol.  */
+	      h = elf_sparc_get_local_sym_hash (htab, input_bfd,
+						rel, FALSE);
+	      if (h == NULL)
+		abort ();
+
+	      /* Set STT_GNU_IFUNC symbol value.  */ 
+	      h->root.u.def.value = sym->st_value;
+	      h->root.u.def.section = sec;
+	    }
+	}
+      else
+	{
+	  bfd_boolean warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	  if (warned)
+	    {
+	      /* To avoid generating warning messages about truncated
+		 relocations, set the relocation's address to be the same as
+		 the start of this section.  */
+	      if (input_section->output_section != NULL)
+		relocation = input_section->output_section->vma;
+	      else
+		relocation = 0;
+	    }
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      if (h != NULL
+	  && h->type == STT_GNU_IFUNC
+	  && h->def_regular)
+	{
+	  asection *plt_sec;
+	  const char *name;
+
+	  if ((input_section->flags & SEC_ALLOC) == 0
+	      || h->plt.offset == (bfd_vma) -1)
+	    abort ();
+
+	  plt_sec = htab->elf.splt;
+	  if (! plt_sec)
+	    plt_sec =htab->elf.iplt;
+
+	  switch (r_type)
+	    {
+	    case R_SPARC_GOTDATA_OP:
+	      continue;
+
+	    case R_SPARC_GOTDATA_OP_HIX22:
+	    case R_SPARC_GOTDATA_OP_LOX10:
+	      r_type = (r_type == R_SPARC_GOTDATA_OP_HIX22
+			? R_SPARC_GOT22
+			: R_SPARC_GOT10);
+	      howto = _bfd_sparc_elf_howto_table + r_type;
+	      /* Fall through.  */
+
+	    case R_SPARC_GOT10:
+	    case R_SPARC_GOT13:
+	    case R_SPARC_GOT22:
+	      if (htab->elf.sgot == NULL)
+		abort ();
+	      off = h->got.offset;
+	      if (off == (bfd_vma) -1)
+		abort();
+	      relocation = htab->elf.sgot->output_offset + off - got_base;
+	      goto do_relocation;
+
+	    case R_SPARC_WPLT30:
+	    case R_SPARC_WDISP30:
+	      relocation = (plt_sec->output_section->vma
+			    + plt_sec->output_offset + h->plt.offset);
+	      goto do_relocation;
+
+	    case R_SPARC_32:
+	    case R_SPARC_64:
+	      if (info->shared && h->non_got_ref)
+		{
+		  Elf_Internal_Rela outrel;
+		  bfd_vma offset;
+
+		  offset = _bfd_elf_section_offset (output_bfd, info,
+						    input_section,
+						    rel->r_offset);
+		  if (offset == (bfd_vma) -1
+		      || offset == (bfd_vma) -2)
+		    abort();
+
+		  outrel.r_offset = (input_section->output_section->vma
+				     + input_section->output_offset
+				     + offset);
+
+		  if (h->dynindx == -1
+		      || h->forced_local
+		      || info->executable)
+		    {
+		      outrel.r_info = SPARC_ELF_R_INFO (htab, NULL,
+							0, R_SPARC_IRELATIVE);
+		      outrel.r_addend = relocation + rel->r_addend;
+		    }
+		  else
+		    {
+		      if (h->dynindx == -1)
+			abort();
+		      outrel.r_info = SPARC_ELF_R_INFO (htab, rel, h->dynindx, r_type);
+		      outrel.r_addend = rel->r_addend;
+		    }
+
+		  sparc_elf_append_rela (output_bfd, sreloc, &outrel);
+		  continue;
+		}
+
+	      relocation = (plt_sec->output_section->vma
+			    + plt_sec->output_offset + h->plt.offset);
+	      goto do_relocation;
+
+	    case R_SPARC_HI22:
+	    case R_SPARC_LO10:
+	      /* We should only see such relocs in static links.  */
+	      if (info->shared)
+		abort();
+	      relocation = (plt_sec->output_section->vma
+			    + plt_sec->output_offset + h->plt.offset);
+	      goto do_relocation;
+
+	    default:
+	      if (h->root.root.string)
+		name = h->root.root.string;
+	      else
+		name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym,
+					 NULL);
+	      (*_bfd_error_handler)
+		(_("%B: relocation %s against STT_GNU_IFUNC "
+		   "symbol `%s' isn't handled by %s"), input_bfd,
+		 _bfd_sparc_elf_howto_table[r_type].name,
+		 name, __FUNCTION__);
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	}
+
+      switch (r_type)
+	{
+	case R_SPARC_GOTDATA_OP_HIX22:
+	case R_SPARC_GOTDATA_OP_LOX10:
+	  if (SYMBOL_REFERENCES_LOCAL (info, h))
+	    r_type = (r_type == R_SPARC_GOTDATA_OP_HIX22
+		      ? R_SPARC_GOTDATA_HIX22
+		      : R_SPARC_GOTDATA_LOX10);
+	  else
+	    r_type = (r_type == R_SPARC_GOTDATA_OP_HIX22
+		      ? R_SPARC_GOT22
+		      : R_SPARC_GOT10);
+	  howto = _bfd_sparc_elf_howto_table + r_type;
+	  break;
+
+	case R_SPARC_GOTDATA_OP:
+	  if (SYMBOL_REFERENCES_LOCAL (info, h))
+	    {
+	      bfd_vma insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+
+	      /* {ld,ldx} [%rs1 + %rs2], %rd --> add %rs1, %rs2, %rd */
+	      relocation = 0x80000000 | (insn & 0x3e07c01f);
+	      bfd_put_32 (output_bfd, relocation, contents + rel->r_offset);
+	    }
+	  continue;
+	}
+
+      switch (r_type)
+	{
+	case R_SPARC_GOTDATA_HIX22:
+	case R_SPARC_GOTDATA_LOX10:
+	  relocation = gdopoff (info, relocation);
+	  break;
+
+	case R_SPARC_GOT10:
+	case R_SPARC_GOT13:
+	case R_SPARC_GOT22:
+	  /* Relocation is to the entry for this symbol in the global
+	     offset table.  */
+	  if (htab->elf.sgot == NULL)
+	    abort ();
+
+	  if (h != NULL)
+	    {
+	      bfd_boolean dyn;
+
+	      off = h->got.offset;
+	      BFD_ASSERT (off != (bfd_vma) -1);
+	      dyn = elf_hash_table (info)->dynamic_sections_created;
+
+	      if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+		  || (info->shared
+		      && SYMBOL_REFERENCES_LOCAL (info, h)))
+		{
+		  /* This is actually a static link, or it is a
+		     -Bsymbolic link and the symbol is defined
+		     locally, or the symbol was forced to be local
+		     because of a version file.  We must initialize
+		     this entry in the global offset table.  Since the
+		     offset must always be a multiple of 8 for 64-bit
+		     and 4 for 32-bit, we use the least significant bit
+		     to record whether we have initialized it already.
+
+		     When doing a dynamic link, we create a .rela.got
+		     relocation entry to initialize the value.  This
+		     is done in the finish_dynamic_symbol routine.  */
+		  if ((off & 1) != 0)
+		    off &= ~1;
+		  else
+		    {
+		      SPARC_ELF_PUT_WORD (htab, output_bfd, relocation,
+					  htab->elf.sgot->contents + off);
+		      h->got.offset |= 1;
+		    }
+		}
+	      else
+		unresolved_reloc = FALSE;
+	    }
+	  else
+	    {
+	      BFD_ASSERT (local_got_offsets != NULL
+			  && local_got_offsets[r_symndx] != (bfd_vma) -1);
+
+	      off = local_got_offsets[r_symndx];
+
+	      /* The offset must always be a multiple of 8 on 64-bit and
+		 4 on 32-bit.  We use the least significant bit to record
+		 whether we have already processed this entry.  */
+	      if ((off & 1) != 0)
+		off &= ~1;
+	      else
+		{
+
+		  if (info->shared)
+		    {
+		      asection *s;
+		      Elf_Internal_Rela outrel;
+
+		      /* We need to generate a R_SPARC_RELATIVE reloc
+			 for the dynamic linker.  */
+		      s = htab->elf.srelgot;
+		      BFD_ASSERT (s != NULL);
+
+		      outrel.r_offset = (htab->elf.sgot->output_section->vma
+					 + htab->elf.sgot->output_offset
+					 + off);
+		      outrel.r_info = SPARC_ELF_R_INFO (htab, NULL,
+							0, R_SPARC_RELATIVE);
+		      outrel.r_addend = relocation;
+		      relocation = 0;
+		      sparc_elf_append_rela (output_bfd, s, &outrel);
+		    }
+
+		  SPARC_ELF_PUT_WORD (htab, output_bfd, relocation,
+				      htab->elf.sgot->contents + off);
+		  local_got_offsets[r_symndx] |= 1;
+		}
+	    }
+	  relocation = htab->elf.sgot->output_offset + off - got_base;
+	  break;
+
+	case R_SPARC_PLT32:
+	case R_SPARC_PLT64:
+	  if (h == NULL || h->plt.offset == (bfd_vma) -1)
+	    {
+	      r_type = (r_type == R_SPARC_PLT32) ? R_SPARC_32 : R_SPARC_64;
+	      goto r_sparc_plt32;
+	    }
+	  /* Fall through.  */
+
+	case R_SPARC_WPLT30:
+	case R_SPARC_HIPLT22:
+	case R_SPARC_LOPLT10:
+	case R_SPARC_PCPLT32:
+	case R_SPARC_PCPLT22:
+	case R_SPARC_PCPLT10:
+	r_sparc_wplt30:
+	  /* Relocation is to the entry for this symbol in the
+	     procedure linkage table.  */
+
+	  if (! ABI_64_P (output_bfd))
+	    {
+	      /* The Solaris native assembler will generate a WPLT30 reloc
+		 for a local symbol if you assemble a call from one
+		 section to another when using -K pic.  We treat it as
+		 WDISP30.  */
+	      if (h == NULL)
+		break;
+	    }
+	  /* PR 7027: We need similar behaviour for 64-bit binaries.  */ 
+	  else if (r_type == R_SPARC_WPLT30 && h == NULL)
+	    break;
+	  else
+	    {
+	      BFD_ASSERT (h != NULL);
+	    }
+
+	  if (h->plt.offset == (bfd_vma) -1 || htab->elf.splt == NULL)
+	    {
+	      /* We didn't make a PLT entry for this symbol.  This
+		 happens when statically linking PIC code, or when
+		 using -Bsymbolic.  */
+	      break;
+	    }
+
+	  relocation = (htab->elf.splt->output_section->vma
+			+ htab->elf.splt->output_offset
+			+ h->plt.offset);
+	  unresolved_reloc = FALSE;
+	  if (r_type == R_SPARC_PLT32 || r_type == R_SPARC_PLT64)
+	    {
+	      r_type = r_type == R_SPARC_PLT32 ? R_SPARC_32 : R_SPARC_64;
+	      is_plt = TRUE;
+	      goto r_sparc_plt32;
+	    }
+	  break;
+
+	case R_SPARC_PC10:
+	case R_SPARC_PC22:
+	case R_SPARC_PC_HH22:
+	case R_SPARC_PC_HM10:
+	case R_SPARC_PC_LM22:
+	  if (h != NULL
+	      && strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
+	    break;
+	  /* Fall through.  */
+	case R_SPARC_DISP8:
+	case R_SPARC_DISP16:
+	case R_SPARC_DISP32:
+	case R_SPARC_DISP64:
+	case R_SPARC_WDISP30:
+	case R_SPARC_WDISP22:
+	case R_SPARC_WDISP19:
+	case R_SPARC_WDISP16:
+	case R_SPARC_8:
+	case R_SPARC_16:
+	case R_SPARC_32:
+	case R_SPARC_HI22:
+	case R_SPARC_22:
+	case R_SPARC_13:
+	case R_SPARC_LO10:
+	case R_SPARC_UA16:
+	case R_SPARC_UA32:
+	case R_SPARC_10:
+	case R_SPARC_11:
+	case R_SPARC_64:
+	case R_SPARC_OLO10:
+	case R_SPARC_HH22:
+	case R_SPARC_HM10:
+	case R_SPARC_LM22:
+	case R_SPARC_7:
+	case R_SPARC_5:
+	case R_SPARC_6:
+	case R_SPARC_HIX22:
+	case R_SPARC_LOX10:
+	case R_SPARC_H44:
+	case R_SPARC_M44:
+	case R_SPARC_L44:
+	case R_SPARC_UA64:
+	r_sparc_plt32:
+	  if ((input_section->flags & SEC_ALLOC) == 0
+	      || is_vxworks_tls)
+	    break;
+
+	  if ((info->shared
+	       && (h == NULL
+		   || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		   || h->root.type != bfd_link_hash_undefweak)
+	       && (! howto->pc_relative
+		   || !SYMBOL_CALLS_LOCAL (info, h)))
+	      || (!info->shared
+		  && h != NULL
+		  && h->dynindx != -1
+		  && !h->non_got_ref
+		  && ((h->def_dynamic
+		       && !h->def_regular)
+		      || h->root.type == bfd_link_hash_undefweak
+		      || h->root.type == bfd_link_hash_undefined)))
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_boolean skip, relocate = FALSE;
+
+	      /* When generating a shared object, these relocations
+		 are copied into the output file to be resolved at run
+		 time.  */
+
+	      BFD_ASSERT (sreloc != NULL);
+
+	      skip = FALSE;
+
+	      outrel.r_offset =
+		_bfd_elf_section_offset (output_bfd, info, input_section,
+					 rel->r_offset);
+	      if (outrel.r_offset == (bfd_vma) -1)
+		skip = TRUE;
+	      else if (outrel.r_offset == (bfd_vma) -2)
+		skip = TRUE, relocate = TRUE;
+	      outrel.r_offset += (input_section->output_section->vma
+				  + input_section->output_offset);
+
+	      /* Optimize unaligned reloc usage now that we know where
+		 it finally resides.  */
+	      switch (r_type)
+		{
+		case R_SPARC_16:
+		  if (outrel.r_offset & 1)
+		    r_type = R_SPARC_UA16;
+		  break;
+		case R_SPARC_UA16:
+		  if (!(outrel.r_offset & 1))
+		    r_type = R_SPARC_16;
+		  break;
+		case R_SPARC_32:
+		  if (outrel.r_offset & 3)
+		    r_type = R_SPARC_UA32;
+		  break;
+		case R_SPARC_UA32:
+		  if (!(outrel.r_offset & 3))
+		    r_type = R_SPARC_32;
+		  break;
+		case R_SPARC_64:
+		  if (outrel.r_offset & 7)
+		    r_type = R_SPARC_UA64;
+		  break;
+		case R_SPARC_UA64:
+		  if (!(outrel.r_offset & 7))
+		    r_type = R_SPARC_64;
+		  break;
+	  	case R_SPARC_DISP8:
+		case R_SPARC_DISP16:
+	  	case R_SPARC_DISP32:
+	  	case R_SPARC_DISP64:
+		  /* If the symbol is not dynamic, we should not keep
+		     a dynamic relocation.  But an .rela.* slot has been
+		     allocated for it, output R_SPARC_NONE.
+		     FIXME: Add code tracking needed dynamic relocs as
+		     e.g. i386 has.  */
+		  if (h->dynindx == -1)
+		    skip = TRUE, relocate = TRUE;
+		  break;
+		}
+
+	      if (skip)
+		memset (&outrel, 0, sizeof outrel);
+	      /* h->dynindx may be -1 if the symbol was marked to
+		 become local.  */
+	      else if (h != NULL &&
+		       h->dynindx != -1
+		       && (! is_plt
+			   || !info->shared
+			   || !SYMBOLIC_BIND (info, h)
+			   || !h->def_regular))
+		{
+		  BFD_ASSERT (h->dynindx != -1);
+		  outrel.r_info = SPARC_ELF_R_INFO (htab, rel, h->dynindx, r_type);
+		  outrel.r_addend = rel->r_addend;
+		}
+	      else
+		{
+		  if (r_type == R_SPARC_32 || r_type == R_SPARC_64)
+		    {
+		      outrel.r_info = SPARC_ELF_R_INFO (htab, NULL,
+							0, R_SPARC_RELATIVE);
+		      outrel.r_addend = relocation + rel->r_addend;
+		    }
+		  else
+		    {
+		      long indx;
+
+		      outrel.r_addend = relocation + rel->r_addend;
+
+		      if (is_plt)
+			sec = htab->elf.splt;
+
+		      if (bfd_is_abs_section (sec))
+			indx = 0;
+		      else if (sec == NULL || sec->owner == NULL)
+			{
+			  bfd_set_error (bfd_error_bad_value);
+			  return FALSE;
+			}
+		      else
+			{
+			  asection *osec;
+
+			  /* We are turning this relocation into one
+			     against a section symbol.  It would be
+			     proper to subtract the symbol's value,
+			     osec->vma, from the emitted reloc addend,
+			     but ld.so expects buggy relocs.  */
+			  osec = sec->output_section;
+			  indx = elf_section_data (osec)->dynindx;
+
+			  if (indx == 0)
+			    {
+			      osec = htab->elf.text_index_section;
+			      indx = elf_section_data (osec)->dynindx;
+			    }
+
+			  /* FIXME: we really should be able to link non-pic
+			     shared libraries.  */
+			  if (indx == 0)
+			    {
+			      BFD_FAIL ();
+			      (*_bfd_error_handler)
+				(_("%B: probably compiled without -fPIC?"),
+				 input_bfd);
+			      bfd_set_error (bfd_error_bad_value);
+			      return FALSE;
+			    }
+			}
+
+		      outrel.r_info = SPARC_ELF_R_INFO (htab, rel, indx,
+							r_type);
+		    }
+		}
+
+	      sparc_elf_append_rela (output_bfd, sreloc, &outrel);
+
+	      /* This reloc will be computed at runtime, so there's no
+		 need to do anything now.  */
+	      if (! relocate)
+		continue;
+	    }
+	  break;
+
+	case R_SPARC_TLS_GD_HI22:
+	  if (! ABI_64_P (input_bfd)
+	      && ! _bfd_sparc_elf_tdata (input_bfd)->has_tlsgd)
+	    {
+	      /* R_SPARC_REV32 used the same reloc number as
+		 R_SPARC_TLS_GD_HI22.  */
+	      r_type = R_SPARC_REV32;
+	      break;
+	    }
+	  /* Fall through */
+
+	case R_SPARC_TLS_GD_LO10:
+	case R_SPARC_TLS_IE_HI22:
+	case R_SPARC_TLS_IE_LO10:
+	  r_type = sparc_elf_tls_transition (info, input_bfd, r_type, h == NULL);
+	  tls_type = GOT_UNKNOWN;
+	  if (h == NULL && local_got_offsets)
+	    tls_type = _bfd_sparc_elf_local_got_tls_type (input_bfd) [r_symndx];
+	  else if (h != NULL)
+	    {
+	      tls_type = _bfd_sparc_elf_hash_entry(h)->tls_type;
+	      if (!info->shared && h->dynindx == -1 && tls_type == GOT_TLS_IE)
+		switch (SPARC_ELF_R_TYPE (rel->r_info))
+		  {
+		  case R_SPARC_TLS_GD_HI22:
+		  case R_SPARC_TLS_IE_HI22:
+		    r_type = R_SPARC_TLS_LE_HIX22;
+		    break;
+		  default:
+		    r_type = R_SPARC_TLS_LE_LOX10;
+		    break;
+		  }
+	    }
+	  if (tls_type == GOT_TLS_IE)
+	    switch (r_type)
+	      {
+	      case R_SPARC_TLS_GD_HI22:
+		r_type = R_SPARC_TLS_IE_HI22;
+		break;
+	      case R_SPARC_TLS_GD_LO10:
+		r_type = R_SPARC_TLS_IE_LO10;
+		break;
+	      }
+
+	  if (r_type == R_SPARC_TLS_LE_HIX22)
+	    {
+	      relocation = tpoff (info, relocation);
+	      break;
+	    }
+	  if (r_type == R_SPARC_TLS_LE_LOX10)
+	    {
+	      /* Change add into xor.  */
+	      relocation = tpoff (info, relocation);
+	      bfd_put_32 (output_bfd, (bfd_get_32 (input_bfd,
+						   contents + rel->r_offset)
+				       | 0x80182000), contents + rel->r_offset);
+	      break;
+	    }
+
+	  if (h != NULL)
+	    {
+	      off = h->got.offset;
+	      h->got.offset |= 1;
+	    }
+	  else
+	    {
+	      BFD_ASSERT (local_got_offsets != NULL);
+	      off = local_got_offsets[r_symndx];
+	      local_got_offsets[r_symndx] |= 1;
+	    }
+
+	r_sparc_tlsldm:
+	  if (htab->elf.sgot == NULL)
+	    abort ();
+
+	  if ((off & 1) != 0)
+	    off &= ~1;
+	  else
+	    {
+	      Elf_Internal_Rela outrel;
+	      int dr_type, indx;
+
+	      if (htab->elf.srelgot == NULL)
+		abort ();
+
+	      SPARC_ELF_PUT_WORD (htab, output_bfd, 0,
+				  htab->elf.sgot->contents + off);
+	      outrel.r_offset = (htab->elf.sgot->output_section->vma
+				 + htab->elf.sgot->output_offset + off);
+	      indx = h && h->dynindx != -1 ? h->dynindx : 0;
+	      if (r_type == R_SPARC_TLS_IE_HI22
+		  || r_type == R_SPARC_TLS_IE_LO10)
+		dr_type = SPARC_ELF_TPOFF_RELOC (htab);
+	      else
+		dr_type = SPARC_ELF_DTPMOD_RELOC (htab);
+	      if (dr_type == SPARC_ELF_TPOFF_RELOC (htab) && indx == 0)
+		outrel.r_addend = relocation - dtpoff_base (info);
+	      else
+		outrel.r_addend = 0;
+	      outrel.r_info = SPARC_ELF_R_INFO (htab, NULL, indx, dr_type);
+	      sparc_elf_append_rela (output_bfd, htab->elf.srelgot, &outrel);
+
+	      if (r_type == R_SPARC_TLS_GD_HI22
+		  || r_type == R_SPARC_TLS_GD_LO10)
+		{
+		  if (indx == 0)
+		    {
+	    	      BFD_ASSERT (! unresolved_reloc);
+		      SPARC_ELF_PUT_WORD (htab, output_bfd,
+					  relocation - dtpoff_base (info),
+					  (htab->elf.sgot->contents + off
+					   + SPARC_ELF_WORD_BYTES (htab)));
+		    }
+		  else
+		    {
+		      SPARC_ELF_PUT_WORD (htab, output_bfd, 0,
+					  (htab->elf.sgot->contents + off
+					   + SPARC_ELF_WORD_BYTES (htab)));
+		      outrel.r_info = SPARC_ELF_R_INFO (htab, NULL, indx,
+							SPARC_ELF_DTPOFF_RELOC (htab));
+		      outrel.r_offset += SPARC_ELF_WORD_BYTES (htab);
+		      sparc_elf_append_rela (output_bfd, htab->elf.srelgot,
+					     &outrel);
+		    }
+		}
+	      else if (dr_type == SPARC_ELF_DTPMOD_RELOC (htab))
+		{
+		  SPARC_ELF_PUT_WORD (htab, output_bfd, 0,
+				      (htab->elf.sgot->contents + off
+				       + SPARC_ELF_WORD_BYTES (htab)));
+		}
+	    }
+
+	  if (off >= (bfd_vma) -2)
+	    abort ();
+
+	  relocation = htab->elf.sgot->output_offset + off - got_base;
+	  unresolved_reloc = FALSE;
+	  howto = _bfd_sparc_elf_howto_table + r_type;
+	  break;
+
+	case R_SPARC_TLS_LDM_HI22:
+	case R_SPARC_TLS_LDM_LO10:
+	  if (! info->shared)
+	    {
+	      bfd_put_32 (output_bfd, SPARC_NOP, contents + rel->r_offset);
+	      continue;
+	    }
+	  off = htab->tls_ldm_got.offset;
+	  htab->tls_ldm_got.offset |= 1;
+	  goto r_sparc_tlsldm;
+
+	case R_SPARC_TLS_LDO_HIX22:
+	case R_SPARC_TLS_LDO_LOX10:
+	  if (info->shared)
+	    {
+	      relocation -= dtpoff_base (info);
+	      break;
+	    }
+
+	  r_type = (r_type == R_SPARC_TLS_LDO_HIX22
+		    ? R_SPARC_TLS_LE_HIX22 : R_SPARC_TLS_LE_LOX10);
+	  /* Fall through.  */
+
+	case R_SPARC_TLS_LE_HIX22:
+	case R_SPARC_TLS_LE_LOX10:
+	  if (info->shared)
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_boolean skip;
+
+	      BFD_ASSERT (sreloc != NULL);
+	      skip = FALSE;
+	      outrel.r_offset =
+		_bfd_elf_section_offset (output_bfd, info, input_section,
+					 rel->r_offset);
+	      if (outrel.r_offset == (bfd_vma) -1)
+		skip = TRUE;
+	      else if (outrel.r_offset == (bfd_vma) -2)
+		skip = TRUE;
+	      outrel.r_offset += (input_section->output_section->vma
+				  + input_section->output_offset);
+	      if (skip)
+		memset (&outrel, 0, sizeof outrel);
+	      else
+		{
+		  outrel.r_info = SPARC_ELF_R_INFO (htab, NULL, 0, r_type);
+		  outrel.r_addend = relocation - dtpoff_base (info)
+				    + rel->r_addend;
+		}
+
+	      sparc_elf_append_rela (output_bfd, sreloc, &outrel);
+	      continue;
+	    }
+	  relocation = tpoff (info, relocation);
+	  break;
+
+	case R_SPARC_TLS_LDM_CALL:
+	  if (! info->shared)
+	    {
+	      /* mov %g0, %o0 */
+	      bfd_put_32 (output_bfd, 0x90100000, contents + rel->r_offset);
+	      continue;
+	    }
+	  /* Fall through */
+
+	case R_SPARC_TLS_GD_CALL:
+	  tls_type = GOT_UNKNOWN;
+	  if (h == NULL && local_got_offsets)
+	    tls_type = _bfd_sparc_elf_local_got_tls_type (input_bfd) [r_symndx];
+	  else if (h != NULL)
+	    tls_type = _bfd_sparc_elf_hash_entry(h)->tls_type;
+	  if (! info->shared
+	      || (r_type == R_SPARC_TLS_GD_CALL && tls_type == GOT_TLS_IE))
+	    {
+	      Elf_Internal_Rela *rel2;
+	      bfd_vma insn;
+
+	      if (!info->shared && (h == NULL || h->dynindx == -1))
+		{
+		  /* GD -> LE */
+		  bfd_put_32 (output_bfd, SPARC_NOP, contents + rel->r_offset);
+		  continue;
+		}
+
+	      /* GD -> IE */
+	      if (rel + 1 < relend
+		  && SPARC_ELF_R_TYPE (rel[1].r_info) == R_SPARC_TLS_GD_ADD
+		  && rel[1].r_offset == rel->r_offset + 4
+		  && SPARC_ELF_R_SYMNDX (htab, rel[1].r_info) == r_symndx
+		  && (((insn = bfd_get_32 (input_bfd,
+					   contents + rel[1].r_offset))
+		       >> 25) & 0x1f) == 8)
+		{
+		  /* We have
+		     call __tls_get_addr, %tgd_call(foo)
+		      add %reg1, %reg2, %o0, %tgd_add(foo)
+		     and change it into IE:
+		     {ld,ldx} [%reg1 + %reg2], %o0, %tie_ldx(foo)
+		     add %g7, %o0, %o0, %tie_add(foo).
+		     add is 0x80000000 | (rd << 25) | (rs1 << 14) | rs2,
+		     ld is 0xc0000000 | (rd << 25) | (rs1 << 14) | rs2,
+		     ldx is 0xc0580000 | (rd << 25) | (rs1 << 14) | rs2.  */
+		  bfd_put_32 (output_bfd, insn | (ABI_64_P (output_bfd) ? 0xc0580000 : 0xc0000000),
+			      contents + rel->r_offset);
+		  bfd_put_32 (output_bfd, 0x9001c008,
+			      contents + rel->r_offset + 4);
+		  rel++;
+		  continue;
+		}
+
+	      /* We cannot just overwrite the delay slot instruction,
+		 as it might be what puts the %o0 argument to
+		 __tls_get_addr into place.  So we have to transpose
+		 the delay slot with the add we patch in.  */
+	      insn = bfd_get_32 (input_bfd, contents + rel->r_offset + 4);
+	      bfd_put_32 (output_bfd, insn,
+			  contents + rel->r_offset);
+	      bfd_put_32 (output_bfd, 0x9001c008,
+			  contents + rel->r_offset + 4);
+
+	      rel2 = rel;
+	      while ((rel2 = sparc_elf_find_reloc_at_ofs (rel2 + 1, relend,
+							  rel->r_offset + 4))
+		     != NULL)
+		{
+		  /* If the instruction we moved has a relocation attached to
+		     it, adjust the offset so that it will apply to the correct
+		     instruction.  */
+		  rel2->r_offset -= 4;
+		}
+	      continue;
+	    }
+
+	  h = (struct elf_link_hash_entry *)
+	      bfd_link_hash_lookup (info->hash, "__tls_get_addr", FALSE,
+				    FALSE, TRUE);
+	  BFD_ASSERT (h != NULL);
+	  r_type = R_SPARC_WPLT30;
+	  howto = _bfd_sparc_elf_howto_table + r_type;
+	  goto r_sparc_wplt30;
+
+	case R_SPARC_TLS_GD_ADD:
+	  tls_type = GOT_UNKNOWN;
+	  if (h == NULL && local_got_offsets)
+	    tls_type = _bfd_sparc_elf_local_got_tls_type (input_bfd) [r_symndx];
+	  else if (h != NULL)
+	    tls_type = _bfd_sparc_elf_hash_entry(h)->tls_type;
+	  if (! info->shared || tls_type == GOT_TLS_IE)
+	    {
+	      /* add %reg1, %reg2, %reg3, %tgd_add(foo)
+		 changed into IE:
+		 {ld,ldx} [%reg1 + %reg2], %reg3, %tie_ldx(foo)
+		 or LE:
+		 add %g7, %reg2, %reg3.  */
+	      bfd_vma insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+	      if ((h != NULL && h->dynindx != -1) || info->shared)
+		relocation = insn | (ABI_64_P (output_bfd) ? 0xc0580000 : 0xc0000000);
+	      else
+		relocation = (insn & ~0x7c000) | 0x1c000;
+	      bfd_put_32 (output_bfd, relocation, contents + rel->r_offset);
+	    }
+	  continue;
+
+	case R_SPARC_TLS_LDM_ADD:
+	  if (! info->shared)
+	    bfd_put_32 (output_bfd, SPARC_NOP, contents + rel->r_offset);
+	  continue;
+
+	case R_SPARC_TLS_LDO_ADD:
+	  if (! info->shared)
+	    {
+	      /* Change rs1 into %g7.  */
+	      bfd_vma insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+	      insn = (insn & ~0x7c000) | 0x1c000;
+	      bfd_put_32 (output_bfd, insn, contents + rel->r_offset);
+	    }
+	  continue;
+
+	case R_SPARC_TLS_IE_LD:
+	case R_SPARC_TLS_IE_LDX:
+	  if (! info->shared && (h == NULL || h->dynindx == -1))
+	    {
+	      bfd_vma insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
+	      int rs2 = insn & 0x1f;
+	      int rd = (insn >> 25) & 0x1f;
+
+	      if (rs2 == rd)
+		relocation = SPARC_NOP;
+	      else
+		relocation = 0x80100000 | (insn & 0x3e00001f);
+	      bfd_put_32 (output_bfd, relocation, contents + rel->r_offset);
+	    }
+	  continue;
+
+	case R_SPARC_TLS_IE_ADD:
+	  /* Totally useless relocation.  */
+	  continue;
+
+	case R_SPARC_TLS_DTPOFF32:
+	case R_SPARC_TLS_DTPOFF64:
+	  relocation -= dtpoff_base (info);
+	  break;
+
+	default:
+	  break;
+	}
+
+      /* Dynamic relocs are not propagated for SEC_DEBUGGING sections
+	 because such sections are not SEC_ALLOC and thus ld.so will
+	 not process them.  */
+      if (unresolved_reloc
+	  && !((input_section->flags & SEC_DEBUGGING) != 0
+	       && h->def_dynamic))
+	(*_bfd_error_handler)
+	  (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+	   input_bfd,
+	   input_section,
+	   (long) rel->r_offset,
+	   howto->name,
+	   h->root.root.string);
+
+      r = bfd_reloc_continue;
+      if (r_type == R_SPARC_OLO10)
+	{
+	    bfd_vma x;
+
+	    if (! ABI_64_P (output_bfd))
+	      abort ();
+
+	    relocation += rel->r_addend;
+	    relocation = (relocation & 0x3ff) + ELF64_R_TYPE_DATA (rel->r_info);
+
+	    x = bfd_get_32 (input_bfd, contents + rel->r_offset);
+	    x = (x & ~(bfd_vma) 0x1fff) | (relocation & 0x1fff);
+	    bfd_put_32 (input_bfd, x, contents + rel->r_offset);
+
+	    r = bfd_check_overflow (howto->complain_on_overflow,
+				    howto->bitsize, howto->rightshift,
+				    bfd_arch_bits_per_address (input_bfd),
+				    relocation);
+	}
+      else if (r_type == R_SPARC_WDISP16)
+	{
+	  bfd_vma x;
+
+	  relocation += rel->r_addend;
+	  relocation -= (input_section->output_section->vma
+			 + input_section->output_offset);
+	  relocation -= rel->r_offset;
+
+	  x = bfd_get_32 (input_bfd, contents + rel->r_offset);
+	  x |= ((((relocation >> 2) & 0xc000) << 6)
+		| ((relocation >> 2) & 0x3fff));
+	  bfd_put_32 (input_bfd, x, contents + rel->r_offset);
+
+	  r = bfd_check_overflow (howto->complain_on_overflow,
+				  howto->bitsize, howto->rightshift,
+				  bfd_arch_bits_per_address (input_bfd),
+				  relocation);
+	}
+      else if (r_type == R_SPARC_REV32)
+	{
+	  bfd_vma x;
+
+	  relocation = relocation + rel->r_addend;
+
+	  x = bfd_get_32 (input_bfd, contents + rel->r_offset);
+	  x = x + relocation;
+	  bfd_putl32 (/*input_bfd,*/ x, contents + rel->r_offset);
+	  r = bfd_reloc_ok;
+	}
+      else if (r_type == R_SPARC_TLS_LDO_HIX22
+	       || r_type == R_SPARC_TLS_LE_HIX22)
+	{
+	  bfd_vma x;
+
+	  relocation += rel->r_addend;
+	  if (r_type == R_SPARC_TLS_LE_HIX22)
+	    relocation ^= MINUS_ONE;
+
+	  x = bfd_get_32 (input_bfd, contents + rel->r_offset);
+	  x = (x & ~(bfd_vma) 0x3fffff) | ((relocation >> 10) & 0x3fffff);
+	  bfd_put_32 (input_bfd, x, contents + rel->r_offset);
+	  r = bfd_reloc_ok;
+	}
+      else if (r_type == R_SPARC_TLS_LDO_LOX10
+	       || r_type == R_SPARC_TLS_LE_LOX10)
+	{
+	  bfd_vma x;
+
+	  relocation += rel->r_addend;
+	  relocation &= 0x3ff;
+	  if (r_type == R_SPARC_TLS_LE_LOX10)
+	    relocation |= 0x1c00;
+
+	  x = bfd_get_32 (input_bfd, contents + rel->r_offset);
+	  x = (x & ~(bfd_vma) 0x1fff) | relocation;
+	  bfd_put_32 (input_bfd, x, contents + rel->r_offset);
+
+	  r = bfd_reloc_ok;
+	}
+      else if (r_type == R_SPARC_HIX22
+	       || r_type == R_SPARC_GOTDATA_HIX22)
+	{
+	  bfd_vma x;
+
+	  relocation += rel->r_addend;
+	  if (r_type == R_SPARC_HIX22
+	      || (bfd_signed_vma) relocation < 0)
+	    relocation = relocation ^ MINUS_ONE;
+
+	  x = bfd_get_32 (input_bfd, contents + rel->r_offset);
+	  x = (x & ~(bfd_vma) 0x3fffff) | ((relocation >> 10) & 0x3fffff);
+	  bfd_put_32 (input_bfd, x, contents + rel->r_offset);
+
+	  r = bfd_check_overflow (howto->complain_on_overflow,
+				  howto->bitsize, howto->rightshift,
+				  bfd_arch_bits_per_address (input_bfd),
+				  relocation);
+	}
+      else if (r_type == R_SPARC_LOX10
+	       || r_type == R_SPARC_GOTDATA_LOX10)
+	{
+	  bfd_vma x;
+
+	  relocation += rel->r_addend;
+	  if (r_type == R_SPARC_LOX10
+	      || (bfd_signed_vma) relocation < 0)
+	    relocation = (relocation & 0x3ff) | 0x1c00;
+	  else
+	    relocation = (relocation & 0x3ff);
+
+	  x = bfd_get_32 (input_bfd, contents + rel->r_offset);
+	  x = (x & ~(bfd_vma) 0x1fff) | relocation;
+	  bfd_put_32 (input_bfd, x, contents + rel->r_offset);
+
+	  r = bfd_reloc_ok;
+	}
+      else if ((r_type == R_SPARC_WDISP30 || r_type == R_SPARC_WPLT30)
+	       && sec_do_relax (input_section)
+	       && rel->r_offset + 4 < input_section->size)
+	{
+#define G0		0
+#define O7		15
+#define XCC		(2 << 20)
+#define COND(x)		(((x)&0xf)<<25)
+#define CONDA		COND(0x8)
+#define INSN_BPA	(F2(0,1) | CONDA | BPRED | XCC)
+#define INSN_BA		(F2(0,2) | CONDA)
+#define INSN_OR		F3(2, 0x2, 0)
+#define INSN_NOP	F2(0,4)
+
+	  bfd_vma x, y;
+
+	  /* If the instruction is a call with either:
+	     restore
+	     arithmetic instruction with rd == %o7
+	     where rs1 != %o7 and rs2 if it is register != %o7
+	     then we can optimize if the call destination is near
+	     by changing the call into a branch always.  */
+	  x = bfd_get_32 (input_bfd, contents + rel->r_offset);
+	  y = bfd_get_32 (input_bfd, contents + rel->r_offset + 4);
+	  if ((x & OP(~0)) == OP(1) && (y & OP(~0)) == OP(2))
+	    {
+	      if (((y & OP3(~0)) == OP3(0x3d) /* restore */
+		   || ((y & OP3(0x28)) == 0 /* arithmetic */
+		       && (y & RD(~0)) == RD(O7)))
+		  && (y & RS1(~0)) != RS1(O7)
+		  && ((y & F3I(~0))
+		      || (y & RS2(~0)) != RS2(O7)))
+		{
+		  bfd_vma reloc;
+
+		  reloc = relocation + rel->r_addend - rel->r_offset;
+		  reloc -= (input_section->output_section->vma
+			    + input_section->output_offset);
+
+		  /* Ensure the branch fits into simm22.  */
+		  if ((reloc & 3) == 0
+		      && ((reloc & ~(bfd_vma)0x7fffff) == 0
+			  || ((reloc | 0x7fffff) == ~(bfd_vma)0)))
+		    {
+		      reloc >>= 2;
+
+		      /* Check whether it fits into simm19.  */
+		      if (((reloc & 0x3c0000) == 0
+			   || (reloc & 0x3c0000) == 0x3c0000)
+			  && (ABI_64_P (output_bfd)
+			      || elf_elfheader (output_bfd)->e_flags & EF_SPARC_32PLUS))
+			x = INSN_BPA | (reloc & 0x7ffff); /* ba,pt %xcc */
+		      else
+			x = INSN_BA | (reloc & 0x3fffff); /* ba */
+		      bfd_put_32 (input_bfd, x, contents + rel->r_offset);
+		      r = bfd_reloc_ok;
+		      if (rel->r_offset >= 4
+			  && (y & (0xffffffff ^ RS1(~0)))
+			     == (INSN_OR | RD(O7) | RS2(G0)))
+			{
+			  bfd_vma z;
+			  unsigned int reg;
+
+			  z = bfd_get_32 (input_bfd,
+					  contents + rel->r_offset - 4);
+			  if ((z & (0xffffffff ^ RD(~0)))
+			      != (INSN_OR | RS1(O7) | RS2(G0)))
+			    break;
+
+			  /* The sequence was
+			     or %o7, %g0, %rN
+			     call foo
+			     or %rN, %g0, %o7
+
+			     If call foo was replaced with ba, replace
+			     or %rN, %g0, %o7 with nop.  */
+
+			  reg = (y & RS1(~0)) >> 14;
+			  if (reg != ((z & RD(~0)) >> 25)
+			      || reg == G0 || reg == O7)
+			    break;
+
+			  bfd_put_32 (input_bfd, (bfd_vma) INSN_NOP,
+				      contents + rel->r_offset + 4);
+			}
+
+		    }
+		}
+	    }
+	}
+
+      if (r == bfd_reloc_continue)
+	{
+do_relocation:
+	  r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+					contents, rel->r_offset,
+					relocation, rel->r_addend);
+	}
+      if (r != bfd_reloc_ok)
+	{
+	  switch (r)
+	    {
+	    default:
+	    case bfd_reloc_outofrange:
+	      abort ();
+	    case bfd_reloc_overflow:
+	      {
+		const char *name;
+
+		/* The Solaris native linker silently disregards overflows. 
+		   We don't, but this breaks stabs debugging info, whose
+		   relocations are only 32-bits wide.  Ignore overflows in
+		   this case and also for discarded entries.  */
+		if ((r_type == R_SPARC_32 || r_type == R_SPARC_DISP32)
+		    && (((input_section->flags & SEC_DEBUGGING) != 0
+			 && strcmp (bfd_section_name (input_bfd,
+						      input_section),
+				    ".stab") == 0)
+			|| _bfd_elf_section_offset (output_bfd, info,
+						    input_section,
+						    rel->r_offset)
+			     == (bfd_vma)-1))
+		  break;
+
+		if (h != NULL)
+		  {
+		    /* Assume this is a call protected by other code that
+		       detect the symbol is undefined.  If this is the case,
+		       we can safely ignore the overflow.  If not, the
+		       program is hosed anyway, and a little warning isn't
+		       going to help.  */
+		    if (h->root.type == bfd_link_hash_undefweak
+			&& howto->pc_relative)
+		      break;
+
+	            name = NULL;
+		  }
+		else
+		  {
+		    name = bfd_elf_string_from_elf_section (input_bfd,
+							    symtab_hdr->sh_link,
+							    sym->st_name);
+		    if (name == NULL)
+		      return FALSE;
+		    if (*name == '\0')
+		      name = bfd_section_name (input_bfd, sec);
+		  }
+		if (! ((*info->callbacks->reloc_overflow)
+		       (info, (h ? &h->root : NULL), name, howto->name,
+			(bfd_vma) 0, input_bfd, input_section,
+			rel->r_offset)))
+		  return FALSE;
+	      }
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Build a VxWorks PLT entry.  PLT_INDEX is the index of the PLT entry
+   and PLT_OFFSET is the byte offset from the start of .plt.  GOT_OFFSET
+   is the offset of the associated .got.plt entry from
+   _GLOBAL_OFFSET_TABLE_.  */
+
+static void
+sparc_vxworks_build_plt_entry (bfd *output_bfd, struct bfd_link_info *info,
+			       bfd_vma plt_offset, bfd_vma plt_index,
+			       bfd_vma got_offset)
+{
+  bfd_vma got_base;
+  const bfd_vma *plt_entry;
+  struct _bfd_sparc_elf_link_hash_table *htab;
+  bfd_byte *loc;
+  Elf_Internal_Rela rela;
+
+  htab = _bfd_sparc_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  if (info->shared)
+    {
+      plt_entry = sparc_vxworks_shared_plt_entry;
+      got_base = 0;
+    }
+  else
+    {
+      plt_entry = sparc_vxworks_exec_plt_entry;
+      got_base = (htab->elf.hgot->root.u.def.value
+		  + htab->elf.hgot->root.u.def.section->output_offset
+		  + htab->elf.hgot->root.u.def.section->output_section->vma);
+    }
+
+  /* Fill in the entry in the procedure linkage table.  */
+  bfd_put_32 (output_bfd, plt_entry[0] + ((got_base + got_offset) >> 10),
+	      htab->elf.splt->contents + plt_offset);
+  bfd_put_32 (output_bfd, plt_entry[1] + ((got_base + got_offset) & 0x3ff),
+	      htab->elf.splt->contents + plt_offset + 4);
+  bfd_put_32 (output_bfd, plt_entry[2],
+	      htab->elf.splt->contents + plt_offset + 8);
+  bfd_put_32 (output_bfd, plt_entry[3],
+	      htab->elf.splt->contents + plt_offset + 12);
+  bfd_put_32 (output_bfd, plt_entry[4],
+	      htab->elf.splt->contents + plt_offset + 16);
+  bfd_put_32 (output_bfd, plt_entry[5] + (plt_index >> 10),
+	      htab->elf.splt->contents + plt_offset + 20);
+  /* PC-relative displacement for a branch to the start of
+     the PLT section.  */
+  bfd_put_32 (output_bfd, plt_entry[6] + (((-plt_offset - 24) >> 2)
+					  & 0x003fffff),
+	      htab->elf.splt->contents + plt_offset + 24);
+  bfd_put_32 (output_bfd, plt_entry[7] + (plt_index & 0x3ff),
+	      htab->elf.splt->contents + plt_offset + 28);
+
+  /* Fill in the .got.plt entry, pointing initially at the
+     second half of the PLT entry.  */
+  BFD_ASSERT (htab->elf.sgotplt != NULL);
+  bfd_put_32 (output_bfd,
+	      htab->elf.splt->output_section->vma
+	      + htab->elf.splt->output_offset
+	      + plt_offset + 20,
+	      htab->elf.sgotplt->contents + got_offset);
+
+  /* Add relocations to .rela.plt.unloaded.  */
+  if (!info->shared)
+    {
+      loc = (htab->srelplt2->contents
+	     + (2 + 3 * plt_index) * sizeof (Elf32_External_Rela));
+
+      /* Relocate the initial sethi.  */
+      rela.r_offset = (htab->elf.splt->output_section->vma
+		       + htab->elf.splt->output_offset
+		       + plt_offset);
+      rela.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_SPARC_HI22);
+      rela.r_addend = got_offset;
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+      loc += sizeof (Elf32_External_Rela);
+
+      /* Likewise the following or.  */
+      rela.r_offset += 4;
+      rela.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_SPARC_LO10);
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+      loc += sizeof (Elf32_External_Rela);
+
+      /* Relocate the .got.plt entry.  */
+      rela.r_offset = (htab->elf.sgotplt->output_section->vma
+		       + htab->elf.sgotplt->output_offset
+		       + got_offset);
+      rela.r_info = ELF32_R_INFO (htab->elf.hplt->indx, R_SPARC_32);
+      rela.r_addend = plt_offset + 20;
+      bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+    }
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+bfd_boolean
+_bfd_sparc_elf_finish_dynamic_symbol (bfd *output_bfd,
+				      struct bfd_link_info *info,
+				      struct elf_link_hash_entry *h,
+				      Elf_Internal_Sym *sym)
+{
+  struct _bfd_sparc_elf_link_hash_table *htab;
+  const struct elf_backend_data *bed;
+
+  htab = _bfd_sparc_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+  bed = get_elf_backend_data (output_bfd);
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      asection *splt;
+      asection *srela;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+      bfd_vma r_offset, got_offset;
+      int rela_index;
+
+      /* When building a static executable, use .iplt and
+	 .rela.iplt sections for STT_GNU_IFUNC symbols.  */
+      if (htab->elf.splt != NULL)
+	{
+	  splt = htab->elf.splt;
+	  srela = htab->elf.srelplt;
+	}
+      else
+	{
+	  splt = htab->elf.iplt;
+	  srela = htab->elf.irelplt;
+	}
+
+      if (splt == NULL || srela == NULL)
+	abort ();
+
+      /* Fill in the entry in the .rela.plt section.  */
+      if (htab->is_vxworks)
+	{
+	  /* Work out the index of this PLT entry.  */
+	  rela_index = ((h->plt.offset - htab->plt_header_size)
+			/ htab->plt_entry_size);
+
+	  /* Calculate the offset of the associated .got.plt entry.
+	     The first three entries are reserved.  */
+	  got_offset = (rela_index + 3) * 4;
+
+	  sparc_vxworks_build_plt_entry (output_bfd, info, h->plt.offset,
+					 rela_index, got_offset);
+
+
+	  /* On VxWorks, the relocation points to the .got.plt entry,
+	     not the .plt entry.  */
+	  rela.r_offset = (htab->elf.sgotplt->output_section->vma
+			   + htab->elf.sgotplt->output_offset
+			   + got_offset);
+	  rela.r_addend = 0;
+	  rela.r_info = SPARC_ELF_R_INFO (htab, NULL, h->dynindx,
+					  R_SPARC_JMP_SLOT);
+	}
+      else
+	{
+	  bfd_boolean ifunc = FALSE;
+
+	  /* Fill in the entry in the procedure linkage table.  */
+	  rela_index = SPARC_ELF_BUILD_PLT_ENTRY (htab, output_bfd, splt,
+						  h->plt.offset, splt->size,
+						  &r_offset);
+
+	  if (h == NULL
+	      || h->dynindx == -1
+	      || ((info->executable
+		   || ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+		  && h->def_regular
+		  && h->type == STT_GNU_IFUNC))
+	    {
+	      ifunc = TRUE;
+	      BFD_ASSERT (h == NULL
+			  || (h->type == STT_GNU_IFUNC
+			      && h->def_regular
+			      && (h->root.type == bfd_link_hash_defined
+				  || h->root.type == bfd_link_hash_defweak)));
+	    }
+
+	  rela.r_offset = r_offset
+	    + (splt->output_section->vma + splt->output_offset);
+	  if (ABI_64_P (output_bfd)
+	      && h->plt.offset >= (PLT64_LARGE_THRESHOLD * PLT64_ENTRY_SIZE))
+	    {
+	      if (ifunc)
+		{
+		  rela.r_addend = (h->root.u.def.section->output_section->vma
+				   + h->root.u.def.section->output_offset
+				   + h->root.u.def.value);
+		  rela.r_info = SPARC_ELF_R_INFO (htab, NULL, 0,
+						  R_SPARC_IRELATIVE);
+		}
+	      else
+		{
+		  rela.r_addend = (-(h->plt.offset + 4)
+				   - splt->output_section->vma
+				   - splt->output_offset);
+		  rela.r_info = SPARC_ELF_R_INFO (htab, NULL, h->dynindx,
+						  R_SPARC_JMP_SLOT);
+		}
+	    }
+	  else
+	    {
+	      if (ifunc)
+		{
+		  rela.r_addend = (h->root.u.def.section->output_section->vma
+				   + h->root.u.def.section->output_offset
+				   + h->root.u.def.value);
+		  rela.r_info = SPARC_ELF_R_INFO (htab, NULL, 0,
+						  R_SPARC_JMP_IREL);
+		}
+	      else
+		{
+		  rela.r_addend = 0;
+		  rela.r_info = SPARC_ELF_R_INFO (htab, NULL, h->dynindx,
+						  R_SPARC_JMP_SLOT);
+		}
+	    }
+	}
+
+      /* Adjust for the first 4 reserved elements in the .plt section
+	 when setting the offset in the .rela.plt section.
+	 Sun forgot to read their own ABI and copied elf32-sparc behaviour,
+	 thus .plt[4] has corresponding .rela.plt[0] and so on.  */
+
+      loc = srela->contents;
+      loc += rela_index * bed->s->sizeof_rela;
+      bed->s->swap_reloca_out (output_bfd, &rela, loc);
+
+      if (!h->def_regular)
+	{
+	  /* Mark the symbol as undefined, rather than as defined in
+	     the .plt section.  Leave the value alone.  */
+	  sym->st_shndx = SHN_UNDEF;
+	  /* If the symbol is weak, we do need to clear the value.
+	     Otherwise, the PLT entry would provide a definition for
+	     the symbol even if the symbol wasn't defined anywhere,
+	     and so the symbol would never be NULL.  */
+	  if (!h->ref_regular_nonweak)
+	    sym->st_value = 0;
+	}
+    }
+
+  if (h->got.offset != (bfd_vma) -1
+      && _bfd_sparc_elf_hash_entry(h)->tls_type != GOT_TLS_GD
+      && _bfd_sparc_elf_hash_entry(h)->tls_type != GOT_TLS_IE)
+    {
+      asection *sgot;
+      asection *srela;
+      Elf_Internal_Rela rela;
+
+      /* This symbol has an entry in the GOT.  Set it up.  */
+
+      sgot = htab->elf.sgot;
+      srela = htab->elf.srelgot;
+      BFD_ASSERT (sgot != NULL && srela != NULL);
+
+      rela.r_offset = (sgot->output_section->vma
+		       + sgot->output_offset
+		       + (h->got.offset &~ (bfd_vma) 1));
+
+      /* If this is a -Bsymbolic link, and the symbol is defined
+	 locally, we just want to emit a RELATIVE reloc.  Likewise if
+	 the symbol was forced to be local because of a version file.
+	 The entry in the global offset table will already have been
+	 initialized in the relocate_section function.  */
+      if (! info->shared
+	  && h->type == STT_GNU_IFUNC
+	  && h->def_regular)
+	{
+	  asection *plt;
+
+	  /* We load the GOT entry with the PLT entry.  */
+	  plt = htab->elf.splt ? htab->elf.splt : htab->elf.iplt;
+	  SPARC_ELF_PUT_WORD (htab, output_bfd,
+			      (plt->output_section->vma
+			       + plt->output_offset + h->plt.offset),
+			      htab->elf.sgot->contents
+			      + (h->got.offset & ~(bfd_vma) 1));
+	  return TRUE;
+	}
+      else if (info->shared
+	       && SYMBOL_REFERENCES_LOCAL (info, h))
+	{
+	  asection *sec = h->root.u.def.section;
+	  if (h->type == STT_GNU_IFUNC)
+	    rela.r_info = SPARC_ELF_R_INFO (htab, NULL, 0, R_SPARC_IRELATIVE);
+	  else
+	    rela.r_info = SPARC_ELF_R_INFO (htab, NULL, 0, R_SPARC_RELATIVE);
+	  rela.r_addend = (h->root.u.def.value
+			   + sec->output_section->vma
+			   + sec->output_offset);
+	}
+      else
+	{
+	  rela.r_info = SPARC_ELF_R_INFO (htab, NULL, h->dynindx, R_SPARC_GLOB_DAT);
+	  rela.r_addend = 0;
+	}
+
+      SPARC_ELF_PUT_WORD (htab, output_bfd, 0,
+			  sgot->contents + (h->got.offset & ~(bfd_vma) 1));
+      sparc_elf_append_rela (output_bfd, srela, &rela);
+    }
+
+  if (h->needs_copy)
+    {
+      asection *s;
+      Elf_Internal_Rela rela;
+
+      /* This symbols needs a copy reloc.  Set it up.  */
+      BFD_ASSERT (h->dynindx != -1);
+
+      s = bfd_get_section_by_name (h->root.u.def.section->owner,
+				   ".rela.bss");
+      BFD_ASSERT (s != NULL);
+
+      rela.r_offset = (h->root.u.def.value
+		       + h->root.u.def.section->output_section->vma
+		       + h->root.u.def.section->output_offset);
+      rela.r_info = SPARC_ELF_R_INFO (htab, NULL, h->dynindx, R_SPARC_COPY);
+      rela.r_addend = 0;
+      sparc_elf_append_rela (output_bfd, s, &rela);
+    }
+
+  /* Mark some specially defined symbols as absolute.  On VxWorks,
+     _GLOBAL_OFFSET_TABLE_ is not absolute: it is relative to the
+     ".got" section.  Likewise _PROCEDURE_LINKAGE_TABLE_ and ".plt".  */
+  if (sym != NULL
+      && (strcmp (h->root.root.string, "_DYNAMIC") == 0
+	  || (!htab->is_vxworks
+	      && (h == htab->elf.hgot || h == htab->elf.hplt))))
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+sparc_finish_dyn (bfd *output_bfd, struct bfd_link_info *info,
+		  bfd *dynobj, asection *sdyn,
+		  asection *splt ATTRIBUTE_UNUSED)
+{
+  struct _bfd_sparc_elf_link_hash_table *htab;
+  const struct elf_backend_data *bed;
+  bfd_byte *dyncon, *dynconend;
+  size_t dynsize;
+  int stt_regidx = -1;
+  bfd_boolean abi_64_p;
+
+  htab = _bfd_sparc_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+  bed = get_elf_backend_data (output_bfd);
+  dynsize = bed->s->sizeof_dyn;
+  dynconend = sdyn->contents + sdyn->size;
+  abi_64_p = ABI_64_P (output_bfd);
+  for (dyncon = sdyn->contents; dyncon < dynconend; dyncon += dynsize)
+    {
+      Elf_Internal_Dyn dyn;
+      const char *name;
+      bfd_boolean size;
+
+      bed->s->swap_dyn_in (dynobj, dyncon, &dyn);
+
+      if (htab->is_vxworks && dyn.d_tag == DT_RELASZ)
+	{
+	  /* On VxWorks, DT_RELASZ should not include the relocations
+	     in .rela.plt.  */
+	  if (htab->elf.srelplt)
+	    {
+	      dyn.d_un.d_val -= htab->elf.srelplt->size;
+	      bed->s->swap_dyn_out (output_bfd, &dyn, dyncon);
+	    }
+	}
+      else if (htab->is_vxworks && dyn.d_tag == DT_PLTGOT)
+	{
+	  /* On VxWorks, DT_PLTGOT should point to the start of the GOT,
+	     not to the start of the PLT.  */
+	  if (htab->elf.sgotplt)
+	    {
+	      dyn.d_un.d_val = (htab->elf.sgotplt->output_section->vma
+				+ htab->elf.sgotplt->output_offset);
+	      bed->s->swap_dyn_out (output_bfd, &dyn, dyncon);
+	    }
+	}
+      else if (htab->is_vxworks
+	       && elf_vxworks_finish_dynamic_entry (output_bfd, &dyn))
+	bed->s->swap_dyn_out (output_bfd, &dyn, dyncon);
+      else if (abi_64_p && dyn.d_tag == DT_SPARC_REGISTER)
+	{
+	  if (stt_regidx == -1)
+	    {
+	      stt_regidx =
+		_bfd_elf_link_lookup_local_dynindx (info, output_bfd, -1);
+	      if (stt_regidx == -1)
+		return FALSE;
+	    }
+	  dyn.d_un.d_val = stt_regidx++;
+	  bed->s->swap_dyn_out (output_bfd, &dyn, dyncon);
+	}
+      else
+	{
+	  switch (dyn.d_tag)
+	    {
+	    case DT_PLTGOT:   name = ".plt"; size = FALSE; break;
+	    case DT_PLTRELSZ: name = ".rela.plt"; size = TRUE; break;
+	    case DT_JMPREL:   name = ".rela.plt"; size = FALSE; break;
+	    default:	      name = NULL; size = FALSE; break;
+	    }
+
+	  if (name != NULL)
+	    {
+	      asection *s;
+
+	      s = bfd_get_section_by_name (output_bfd, name);
+	      if (s == NULL)
+		dyn.d_un.d_val = 0;
+	      else
+		{
+		  if (! size)
+		    dyn.d_un.d_ptr = s->vma;
+		  else
+		    dyn.d_un.d_val = s->size;
+		}
+	      bed->s->swap_dyn_out (output_bfd, &dyn, dyncon);
+	    }
+	}
+    }
+  return TRUE;
+}
+
+/* Install the first PLT entry in a VxWorks executable and make sure that
+   .rela.plt.unloaded relocations have the correct symbol indexes.  */
+
+static void
+sparc_vxworks_finish_exec_plt (bfd *output_bfd, struct bfd_link_info *info)
+{
+  struct _bfd_sparc_elf_link_hash_table *htab;
+  Elf_Internal_Rela rela;
+  bfd_vma got_base;
+  bfd_byte *loc;
+
+  htab = _bfd_sparc_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  /* Calculate the absolute value of _GLOBAL_OFFSET_TABLE_.  */
+  got_base = (htab->elf.hgot->root.u.def.section->output_section->vma
+	      + htab->elf.hgot->root.u.def.section->output_offset
+	      + htab->elf.hgot->root.u.def.value);
+
+  /* Install the initial PLT entry.  */
+  bfd_put_32 (output_bfd,
+	      sparc_vxworks_exec_plt0_entry[0] + ((got_base + 8) >> 10),
+	      htab->elf.splt->contents);
+  bfd_put_32 (output_bfd,
+	      sparc_vxworks_exec_plt0_entry[1] + ((got_base + 8) & 0x3ff),
+	      htab->elf.splt->contents + 4);
+  bfd_put_32 (output_bfd,
+	      sparc_vxworks_exec_plt0_entry[2],
+	      htab->elf.splt->contents + 8);
+  bfd_put_32 (output_bfd,
+	      sparc_vxworks_exec_plt0_entry[3],
+	      htab->elf.splt->contents + 12);
+  bfd_put_32 (output_bfd,
+	      sparc_vxworks_exec_plt0_entry[4],
+	      htab->elf.splt->contents + 16);
+
+  loc = htab->srelplt2->contents;
+
+  /* Add an unloaded relocation for the initial entry's "sethi".  */
+  rela.r_offset = (htab->elf.splt->output_section->vma
+		   + htab->elf.splt->output_offset);
+  rela.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_SPARC_HI22);
+  rela.r_addend = 8;
+  bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+  loc += sizeof (Elf32_External_Rela);
+
+  /* Likewise the following "or".  */
+  rela.r_offset += 4;
+  rela.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_SPARC_LO10);
+  bfd_elf32_swap_reloca_out (output_bfd, &rela, loc);
+  loc += sizeof (Elf32_External_Rela);
+
+  /* Fix up the remaining .rela.plt.unloaded relocations.  They may have
+     the wrong symbol index for _G_O_T_ or _P_L_T_ depending on the order
+     in which symbols were output.  */
+  while (loc < htab->srelplt2->contents + htab->srelplt2->size)
+    {
+      Elf_Internal_Rela rel;
+
+      /* The entry's initial "sethi" (against _G_O_T_).  */
+      bfd_elf32_swap_reloc_in (output_bfd, loc, &rel);
+      rel.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_SPARC_HI22);
+      bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
+      loc += sizeof (Elf32_External_Rela);
+
+      /* The following "or" (also against _G_O_T_).  */
+      bfd_elf32_swap_reloc_in (output_bfd, loc, &rel);
+      rel.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_SPARC_LO10);
+      bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
+      loc += sizeof (Elf32_External_Rela);
+
+      /* The .got.plt entry (against _P_L_T_).  */
+      bfd_elf32_swap_reloc_in (output_bfd, loc, &rel);
+      rel.r_info = ELF32_R_INFO (htab->elf.hplt->indx, R_SPARC_32);
+      bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
+      loc += sizeof (Elf32_External_Rela);
+    }
+}
+
+/* Install the first PLT entry in a VxWorks shared object.  */
+
+static void
+sparc_vxworks_finish_shared_plt (bfd *output_bfd, struct bfd_link_info *info)
+{
+  struct _bfd_sparc_elf_link_hash_table *htab;
+  unsigned int i;
+
+  htab = _bfd_sparc_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  for (i = 0; i < ARRAY_SIZE (sparc_vxworks_shared_plt0_entry); i++)
+    bfd_put_32 (output_bfd, sparc_vxworks_shared_plt0_entry[i],
+		htab->elf.splt->contents + i * 4);
+}
+
+/* Finish up local dynamic symbol handling.  We set the contents of
+   various dynamic sections here.  */
+
+static bfd_boolean
+finish_local_dynamic_symbol (void **slot, void *inf)
+{
+  struct elf_link_hash_entry *h
+    = (struct elf_link_hash_entry *) *slot;
+  struct bfd_link_info *info
+    = (struct bfd_link_info *) inf; 
+
+  return _bfd_sparc_elf_finish_dynamic_symbol (info->output_bfd, info,
+					       h, NULL);
+}
+
+bfd_boolean
+_bfd_sparc_elf_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *sdyn;
+  struct _bfd_sparc_elf_link_hash_table *htab;
+
+  htab = _bfd_sparc_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+  dynobj = htab->elf.dynobj;
+
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      asection *splt;
+
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      BFD_ASSERT (splt != NULL && sdyn != NULL);
+
+      if (!sparc_finish_dyn (output_bfd, info, dynobj, sdyn, splt))
+	return FALSE;
+
+      /* Initialize the contents of the .plt section.  */
+      if (splt->size > 0)
+	{
+	  if (htab->is_vxworks)
+	    {
+	      if (info->shared)
+		sparc_vxworks_finish_shared_plt (output_bfd, info);
+	      else
+		sparc_vxworks_finish_exec_plt (output_bfd, info);
+	    }
+	  else
+	    {
+	      memset (splt->contents, 0, htab->plt_header_size);
+	      if (!ABI_64_P (output_bfd))
+		bfd_put_32 (output_bfd, (bfd_vma) SPARC_NOP,
+			    splt->contents + splt->size - 4);
+	    }
+	}
+
+      elf_section_data (splt->output_section)->this_hdr.sh_entsize
+	= (htab->is_vxworks || !ABI_64_P (output_bfd))
+	  ? 0 : htab->plt_entry_size;
+    }
+
+  /* Set the first entry in the global offset table to the address of
+     the dynamic section.  */
+  if (htab->elf.sgot && htab->elf.sgot->size > 0)
+    {
+      bfd_vma val = (sdyn ?
+		     sdyn->output_section->vma + sdyn->output_offset :
+		     0);
+
+      SPARC_ELF_PUT_WORD (htab, output_bfd, val, htab->elf.sgot->contents);
+    }
+
+  if (htab->elf.sgot)
+    elf_section_data (htab->elf.sgot->output_section)->this_hdr.sh_entsize =
+      SPARC_ELF_WORD_BYTES (htab);
+
+  /* Fill PLT and GOT entries for local STT_GNU_IFUNC symbols.  */
+  htab_traverse (htab->loc_hash_table, finish_local_dynamic_symbol, info);
+
+  return TRUE;
+}
+
+
+/* Set the right machine number for a SPARC ELF file.  */
+
+bfd_boolean
+_bfd_sparc_elf_object_p (bfd *abfd)
+{
+  if (ABI_64_P (abfd))
+    {
+      unsigned long mach = bfd_mach_sparc_v9;
+
+      if (elf_elfheader (abfd)->e_flags & EF_SPARC_SUN_US3)
+	mach = bfd_mach_sparc_v9b;
+      else if (elf_elfheader (abfd)->e_flags & EF_SPARC_SUN_US1)
+	mach = bfd_mach_sparc_v9a;
+      return bfd_default_set_arch_mach (abfd, bfd_arch_sparc, mach);
+    }
+  else
+    {
+      if (elf_elfheader (abfd)->e_machine == EM_SPARC32PLUS)
+	{
+	  if (elf_elfheader (abfd)->e_flags & EF_SPARC_SUN_US3)
+	    return bfd_default_set_arch_mach (abfd, bfd_arch_sparc,
+					      bfd_mach_sparc_v8plusb);
+	  else if (elf_elfheader (abfd)->e_flags & EF_SPARC_SUN_US1)
+	    return bfd_default_set_arch_mach (abfd, bfd_arch_sparc,
+					      bfd_mach_sparc_v8plusa);
+	  else if (elf_elfheader (abfd)->e_flags & EF_SPARC_32PLUS)
+	    return bfd_default_set_arch_mach (abfd, bfd_arch_sparc,
+					      bfd_mach_sparc_v8plus);
+	  else
+	    return FALSE;
+	}
+      else if (elf_elfheader (abfd)->e_flags & EF_SPARC_LEDATA)
+	return bfd_default_set_arch_mach (abfd, bfd_arch_sparc,
+					  bfd_mach_sparc_sparclite_le);
+      else
+	return bfd_default_set_arch_mach (abfd, bfd_arch_sparc, bfd_mach_sparc);
+    }
+}
+
+/* Return address for Ith PLT stub in section PLT, for relocation REL
+   or (bfd_vma) -1 if it should not be included.  */
+
+bfd_vma
+_bfd_sparc_elf_plt_sym_val (bfd_vma i, const asection *plt, const arelent *rel)
+{
+  if (ABI_64_P (plt->owner))
+    {
+      bfd_vma j;
+
+      i += PLT64_HEADER_SIZE / PLT64_ENTRY_SIZE;
+      if (i < PLT64_LARGE_THRESHOLD)
+	return plt->vma + i * PLT64_ENTRY_SIZE;
+
+      j = (i - PLT64_LARGE_THRESHOLD) % 160;
+      i -= j;
+      return plt->vma + i * PLT64_ENTRY_SIZE + j * 4 * 6;
+    }
+  else
+    return rel->address;
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+
+bfd_boolean
+_bfd_sparc_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  obj_attribute *in_attr, *in_attrs;
+  obj_attribute *out_attr, *out_attrs;
+
+  if (!elf_known_obj_attributes_proc (obfd)[0].i)
+    {
+      /* This is the first object.  Copy the attributes.  */
+      _bfd_elf_copy_obj_attributes (ibfd, obfd);
+
+      /* Use the Tag_null value to indicate the attributes have been
+	 initialized.  */
+      elf_known_obj_attributes_proc (obfd)[0].i = 1;
+
+      return TRUE;
+    }
+
+  in_attrs = elf_known_obj_attributes (ibfd)[OBJ_ATTR_GNU];
+  out_attrs = elf_known_obj_attributes (obfd)[OBJ_ATTR_GNU];
+
+  in_attr = &in_attrs[Tag_GNU_Sparc_HWCAPS];
+  out_attr = &out_attrs[Tag_GNU_Sparc_HWCAPS];
+
+  out_attr->i |= in_attr->i;
+
+  /* Merge Tag_compatibility attributes and any common GNU ones.  */
+  _bfd_elf_merge_object_attributes (ibfd, obfd);
+
+  return TRUE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfxx-sparc.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfxx-sparc.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfxx-sparc.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfxx-sparc.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,151 @@
+/* SPARC ELF specific backend routines.
+   Copyright 2005, 2006, 2007, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "elf/common.h"
+#include "elf/internal.h"
+
+struct _bfd_sparc_elf_section_data
+{
+  struct bfd_elf_section_data elf;
+  unsigned int do_relax, reloc_count;
+};
+
+#define sec_do_relax(sec) \
+  ((struct _bfd_sparc_elf_section_data *) elf_section_data (sec))->do_relax
+#define canon_reloc_count(sec) \
+  ((struct _bfd_sparc_elf_section_data *) elf_section_data (sec))->reloc_count
+
+struct _bfd_sparc_elf_app_reg
+{
+  unsigned char bind;
+  unsigned short shndx;
+  bfd *abfd;
+  char *name;
+};
+
+/* Sparc ELF linker hash table.  */
+
+struct _bfd_sparc_elf_link_hash_table
+{
+  struct elf_link_hash_table elf;
+
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *sdynbss;
+  asection *srelbss;
+
+  union
+  {
+    bfd_signed_vma refcount;
+    bfd_vma offset;
+  } tls_ldm_got;
+
+  /* Small local sym cache.  */
+  struct sym_cache sym_cache;
+
+  /* Used by local STT_GNU_IFUNC symbols.  */
+  htab_t loc_hash_table;
+  void *loc_hash_memory;
+
+  /* True if the target system is VxWorks.  */
+  int is_vxworks;
+
+  /* The (unloaded but important) .rela.plt.unloaded section, for VxWorks.  */
+  asection *srelplt2;
+
+  void (*put_word) (bfd *, bfd_vma, void *);
+  bfd_vma (*r_info) (Elf_Internal_Rela *, bfd_vma, bfd_vma);
+  bfd_vma (*r_symndx) (bfd_vma);
+  int (*build_plt_entry) (bfd *, asection *, bfd_vma, bfd_vma, bfd_vma *);
+  const char *dynamic_interpreter;
+  int dynamic_interpreter_size;
+  unsigned int word_align_power;
+  unsigned int align_power_max;
+  unsigned int plt_header_size;
+  unsigned int plt_entry_size;
+  int bytes_per_word;
+  int bytes_per_rela;
+  int dtpoff_reloc;
+  int dtpmod_reloc;
+  int tpoff_reloc;
+
+  struct _bfd_sparc_elf_app_reg app_regs [4];
+};
+
+/* Get the SPARC ELF linker hash table from a link_info structure.  */
+
+#define _bfd_sparc_elf_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == SPARC_ELF_DATA ? ((struct _bfd_sparc_elf_link_hash_table *) ((p)->hash)) : NULL)
+
+extern reloc_howto_type *_bfd_sparc_elf_reloc_type_lookup
+  (bfd *, bfd_reloc_code_real_type);
+extern reloc_howto_type *_bfd_sparc_elf_reloc_name_lookup
+  (bfd *, const char *);
+extern void _bfd_sparc_elf_info_to_howto
+  (bfd *, arelent *, Elf_Internal_Rela *);
+extern reloc_howto_type *_bfd_sparc_elf_info_to_howto_ptr
+  (unsigned int);
+extern bfd_boolean _bfd_sparc_elf_mkobject
+  (bfd *);
+extern struct bfd_link_hash_table *_bfd_sparc_elf_link_hash_table_create
+  (bfd *);
+extern void _bfd_sparc_elf_link_hash_table_free
+  (struct bfd_link_hash_table *);
+extern bfd_boolean _bfd_sparc_elf_create_dynamic_sections
+  (bfd *, struct bfd_link_info *);
+extern void _bfd_sparc_elf_copy_indirect_symbol
+  (struct bfd_link_info *,
+   struct elf_link_hash_entry *,
+   struct elf_link_hash_entry *);
+extern bfd_boolean _bfd_sparc_elf_check_relocs
+  (bfd *, struct bfd_link_info *,
+   asection *, const Elf_Internal_Rela *);
+extern asection *_bfd_sparc_elf_gc_mark_hook
+  (asection *, struct bfd_link_info *,
+   Elf_Internal_Rela *, struct elf_link_hash_entry *,
+   Elf_Internal_Sym *);
+extern bfd_boolean _bfd_sparc_elf_gc_sweep_hook
+  (bfd *, struct bfd_link_info *,
+   asection *, const Elf_Internal_Rela *);
+extern bfd_boolean _bfd_sparc_elf_adjust_dynamic_symbol
+  (struct bfd_link_info *, struct elf_link_hash_entry *);
+extern bfd_boolean _bfd_sparc_elf_omit_section_dynsym
+  (bfd *, struct bfd_link_info *, asection *);
+extern bfd_boolean _bfd_sparc_elf_size_dynamic_sections
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_sparc_elf_new_section_hook
+  (bfd *, asection *);
+extern bfd_boolean _bfd_sparc_elf_relax_section
+  (bfd *, struct bfd_section *, struct bfd_link_info *, bfd_boolean *);
+extern bfd_boolean _bfd_sparc_elf_relocate_section
+  (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **);
+extern bfd_boolean _bfd_sparc_elf_finish_dynamic_symbol
+  (bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
+   Elf_Internal_Sym *sym);
+extern bfd_boolean _bfd_sparc_elf_finish_dynamic_sections
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_sparc_elf_object_p
+  (bfd *);
+extern bfd_vma _bfd_sparc_elf_plt_sym_val
+  (bfd_vma, const asection *, const arelent *);
+extern bfd_boolean _bfd_sparc_elf_merge_private_bfd_data
+  (bfd *, bfd *);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfxx-target.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfxx-target.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfxx-target.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfxx-target.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,988 @@
+/* Target definitions for NN-bit ELF
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* This structure contains everything that BFD knows about a target.
+   It includes things like its byte order, name, what routines to call
+   to do various operations, etc.  Every BFD points to a target structure
+   with its "xvec" member.
+
+   There are two such structures here:  one for big-endian machines and
+   one for little-endian machines.   */
+
+#ifndef bfd_elfNN_close_and_cleanup
+#define	bfd_elfNN_close_and_cleanup _bfd_elf_close_and_cleanup
+#endif
+#ifndef bfd_elfNN_bfd_free_cached_info
+#define bfd_elfNN_bfd_free_cached_info _bfd_free_cached_info
+#endif
+#ifndef bfd_elfNN_get_section_contents
+#define bfd_elfNN_get_section_contents _bfd_generic_get_section_contents
+#endif
+
+#define bfd_elfNN_canonicalize_dynamic_symtab \
+  _bfd_elf_canonicalize_dynamic_symtab
+#ifndef bfd_elfNN_get_synthetic_symtab
+#define bfd_elfNN_get_synthetic_symtab \
+  _bfd_elf_get_synthetic_symtab
+#endif
+#ifndef bfd_elfNN_canonicalize_reloc
+#define bfd_elfNN_canonicalize_reloc	_bfd_elf_canonicalize_reloc
+#endif
+#ifndef bfd_elfNN_find_nearest_line
+#define bfd_elfNN_find_nearest_line	_bfd_elf_find_nearest_line
+#endif
+#ifndef bfd_elfNN_find_inliner_info
+#define bfd_elfNN_find_inliner_info	_bfd_elf_find_inliner_info
+#endif
+#define bfd_elfNN_read_minisymbols	_bfd_elf_read_minisymbols
+#define bfd_elfNN_minisymbol_to_symbol	_bfd_elf_minisymbol_to_symbol
+#define bfd_elfNN_get_dynamic_symtab_upper_bound \
+  _bfd_elf_get_dynamic_symtab_upper_bound
+#define bfd_elfNN_get_lineno		_bfd_elf_get_lineno
+#ifndef bfd_elfNN_get_reloc_upper_bound
+#define bfd_elfNN_get_reloc_upper_bound _bfd_elf_get_reloc_upper_bound
+#endif
+#ifndef bfd_elfNN_get_symbol_info
+#define bfd_elfNN_get_symbol_info	_bfd_elf_get_symbol_info
+#endif
+#define bfd_elfNN_canonicalize_symtab	_bfd_elf_canonicalize_symtab
+#define bfd_elfNN_get_symtab_upper_bound _bfd_elf_get_symtab_upper_bound
+#define bfd_elfNN_make_empty_symbol	_bfd_elf_make_empty_symbol
+#ifndef bfd_elfNN_new_section_hook
+#define bfd_elfNN_new_section_hook	_bfd_elf_new_section_hook
+#endif
+#define bfd_elfNN_set_arch_mach		_bfd_elf_set_arch_mach
+#ifndef bfd_elfNN_set_section_contents
+#define bfd_elfNN_set_section_contents	_bfd_elf_set_section_contents
+#endif
+#define bfd_elfNN_sizeof_headers	_bfd_elf_sizeof_headers
+#define bfd_elfNN_write_object_contents _bfd_elf_write_object_contents
+#define bfd_elfNN_write_corefile_contents _bfd_elf_write_corefile_contents
+
+#define bfd_elfNN_get_section_contents_in_window \
+  _bfd_generic_get_section_contents_in_window
+
+#ifndef elf_backend_can_refcount
+#define elf_backend_can_refcount 0
+#endif
+#ifndef elf_backend_want_got_plt
+#define elf_backend_want_got_plt 0
+#endif
+#ifndef elf_backend_plt_readonly
+#define elf_backend_plt_readonly 0
+#endif
+#ifndef elf_backend_want_plt_sym
+#define elf_backend_want_plt_sym 0
+#endif
+#ifndef elf_backend_plt_not_loaded
+#define elf_backend_plt_not_loaded 0
+#endif
+#ifndef elf_backend_plt_alignment
+#define elf_backend_plt_alignment 2
+#endif
+#ifndef elf_backend_want_dynbss
+#define elf_backend_want_dynbss 1
+#endif
+#ifndef elf_backend_want_p_paddr_set_to_zero
+#define elf_backend_want_p_paddr_set_to_zero 0
+#endif
+#ifndef elf_backend_default_execstack
+#define elf_backend_default_execstack 1
+#endif
+
+#define bfd_elfNN_bfd_debug_info_start	bfd_void
+#define bfd_elfNN_bfd_debug_info_end	bfd_void
+#define bfd_elfNN_bfd_debug_info_accumulate \
+  ((void (*) (bfd*, struct bfd_section *)) bfd_void)
+
+#ifndef bfd_elfNN_bfd_get_relocated_section_contents
+#define bfd_elfNN_bfd_get_relocated_section_contents \
+  bfd_generic_get_relocated_section_contents
+#endif
+
+#ifndef bfd_elfNN_bfd_relax_section
+#define bfd_elfNN_bfd_relax_section bfd_generic_relax_section
+#endif
+
+#ifndef elf_backend_can_gc_sections
+#define elf_backend_can_gc_sections 0
+#endif
+#ifndef elf_backend_can_refcount
+#define elf_backend_can_refcount 0
+#endif
+#ifndef elf_backend_want_got_sym
+#define elf_backend_want_got_sym 1
+#endif
+#ifndef elf_backend_gc_keep
+#define elf_backend_gc_keep		_bfd_elf_gc_keep
+#endif
+#ifndef elf_backend_gc_mark_dynamic_ref
+#define elf_backend_gc_mark_dynamic_ref	bfd_elf_gc_mark_dynamic_ref_symbol
+#endif
+#ifndef elf_backend_gc_mark_hook
+#define elf_backend_gc_mark_hook	_bfd_elf_gc_mark_hook
+#endif
+#ifndef elf_backend_gc_mark_extra_sections
+#define elf_backend_gc_mark_extra_sections _bfd_elf_gc_mark_extra_sections
+#endif
+#ifndef elf_backend_gc_sweep_hook
+#define elf_backend_gc_sweep_hook	NULL
+#endif
+#ifndef bfd_elfNN_bfd_gc_sections
+#define bfd_elfNN_bfd_gc_sections bfd_elf_gc_sections
+#endif
+
+#ifndef bfd_elfNN_bfd_merge_sections
+#define bfd_elfNN_bfd_merge_sections \
+  _bfd_elf_merge_sections
+#endif
+
+#ifndef bfd_elfNN_bfd_is_group_section
+#define bfd_elfNN_bfd_is_group_section bfd_elf_is_group_section
+#endif
+
+#ifndef bfd_elfNN_bfd_discard_group
+#define bfd_elfNN_bfd_discard_group bfd_generic_discard_group
+#endif
+
+#ifndef bfd_elfNN_section_already_linked
+#define bfd_elfNN_section_already_linked \
+  _bfd_elf_section_already_linked
+#endif
+
+#ifndef bfd_elfNN_bfd_define_common_symbol
+#define bfd_elfNN_bfd_define_common_symbol bfd_generic_define_common_symbol
+#endif
+
+#ifndef bfd_elfNN_bfd_lookup_section_flags
+#define bfd_elfNN_bfd_lookup_section_flags bfd_elf_lookup_section_flags
+#endif
+
+#ifndef bfd_elfNN_bfd_make_debug_symbol
+#define bfd_elfNN_bfd_make_debug_symbol \
+  ((asymbol * (*) (bfd *, void *, unsigned long)) bfd_nullvoidptr)
+#endif
+
+#ifndef bfd_elfNN_bfd_copy_private_symbol_data
+#define bfd_elfNN_bfd_copy_private_symbol_data \
+  _bfd_elf_copy_private_symbol_data
+#endif
+
+#ifndef bfd_elfNN_bfd_copy_private_section_data
+#define bfd_elfNN_bfd_copy_private_section_data \
+  _bfd_elf_copy_private_section_data
+#endif
+#ifndef bfd_elfNN_bfd_copy_private_header_data
+#define bfd_elfNN_bfd_copy_private_header_data \
+  _bfd_elf_copy_private_header_data
+#endif
+#ifndef bfd_elfNN_bfd_copy_private_bfd_data
+#define bfd_elfNN_bfd_copy_private_bfd_data \
+  _bfd_elf_copy_private_bfd_data
+#endif
+#ifndef bfd_elfNN_bfd_print_private_bfd_data
+#define bfd_elfNN_bfd_print_private_bfd_data \
+  _bfd_elf_print_private_bfd_data
+#endif
+#ifndef bfd_elfNN_bfd_merge_private_bfd_data
+#define bfd_elfNN_bfd_merge_private_bfd_data \
+  ((bfd_boolean (*) (bfd *, bfd *)) bfd_true)
+#endif
+#ifndef bfd_elfNN_bfd_set_private_flags
+#define bfd_elfNN_bfd_set_private_flags \
+  ((bfd_boolean (*) (bfd *, flagword)) bfd_true)
+#endif
+#ifndef bfd_elfNN_bfd_is_local_label_name
+#define bfd_elfNN_bfd_is_local_label_name _bfd_elf_is_local_label_name
+#endif
+#ifndef bfd_elfNN_bfd_is_target_special_symbol
+#define bfd_elfNN_bfd_is_target_special_symbol \
+  ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#endif
+
+#ifndef bfd_elfNN_get_dynamic_reloc_upper_bound
+#define bfd_elfNN_get_dynamic_reloc_upper_bound \
+  _bfd_elf_get_dynamic_reloc_upper_bound
+#endif
+#ifndef bfd_elfNN_canonicalize_dynamic_reloc
+#define bfd_elfNN_canonicalize_dynamic_reloc \
+  _bfd_elf_canonicalize_dynamic_reloc
+#endif
+
+#ifndef bfd_elfNN_bfd_link_hash_table_free
+#define bfd_elfNN_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
+#endif
+
+#ifdef elf_backend_relocate_section
+#ifndef bfd_elfNN_bfd_link_hash_table_create
+#define bfd_elfNN_bfd_link_hash_table_create _bfd_elf_link_hash_table_create
+#endif
+#ifndef bfd_elfNN_bfd_link_add_symbols
+#define bfd_elfNN_bfd_link_add_symbols	bfd_elf_link_add_symbols
+#endif
+#ifndef bfd_elfNN_bfd_final_link
+#define bfd_elfNN_bfd_final_link	bfd_elf_final_link
+#endif
+#else /* ! defined (elf_backend_relocate_section) */
+/* If no backend relocate_section routine, use the generic linker.
+   Note - this will prevent the port from being able to use some of
+   the other features of the ELF linker, because the generic hash structure
+   does not have the fields needed by the ELF linker.  In particular it
+   means that linking directly to S-records will not work.  */
+#ifndef bfd_elfNN_bfd_link_hash_table_create
+#define bfd_elfNN_bfd_link_hash_table_create \
+  _bfd_generic_link_hash_table_create
+#endif
+#ifndef bfd_elfNN_bfd_link_add_symbols
+#define bfd_elfNN_bfd_link_add_symbols	_bfd_generic_link_add_symbols
+#endif
+#ifndef bfd_elfNN_bfd_final_link
+#define bfd_elfNN_bfd_final_link	_bfd_generic_final_link
+#endif
+#endif /* ! defined (elf_backend_relocate_section) */
+
+#ifndef bfd_elfNN_bfd_link_just_syms
+#define bfd_elfNN_bfd_link_just_syms	_bfd_elf_link_just_syms
+#endif
+
+#ifndef bfd_elfNN_bfd_copy_link_hash_symbol_type
+#define bfd_elfNN_bfd_copy_link_hash_symbol_type \
+  _bfd_elf_copy_link_hash_symbol_type
+#endif
+
+#ifndef bfd_elfNN_bfd_link_split_section
+#define bfd_elfNN_bfd_link_split_section _bfd_generic_link_split_section
+#endif
+
+#ifndef bfd_elfNN_archive_p
+#define bfd_elfNN_archive_p bfd_generic_archive_p
+#endif
+
+#ifndef bfd_elfNN_write_archive_contents
+#define bfd_elfNN_write_archive_contents _bfd_write_archive_contents
+#endif
+
+#ifndef bfd_elfNN_mkobject
+#define bfd_elfNN_mkobject bfd_elf_make_object
+#endif
+
+#ifndef bfd_elfNN_mkcorefile
+#define bfd_elfNN_mkcorefile bfd_elf_mkcorefile
+#endif
+
+#ifndef bfd_elfNN_mkarchive
+#define bfd_elfNN_mkarchive _bfd_generic_mkarchive
+#endif
+
+#ifndef bfd_elfNN_print_symbol
+#define bfd_elfNN_print_symbol bfd_elf_print_symbol
+#endif
+
+#ifndef elf_symbol_leading_char
+#define elf_symbol_leading_char 0
+#endif
+
+#ifndef elf_info_to_howto
+#define elf_info_to_howto 0
+#endif
+
+#ifndef elf_info_to_howto_rel
+#define elf_info_to_howto_rel 0
+#endif
+
+#ifndef elf_backend_arch_data
+#define elf_backend_arch_data NULL
+#endif
+
+#ifndef ELF_TARGET_ID
+#define ELF_TARGET_ID	GENERIC_ELF_DATA
+#endif
+
+#ifndef ELF_OSABI
+#define ELF_OSABI ELFOSABI_NONE
+#endif
+
+#ifndef ELF_MAXPAGESIZE
+# error ELF_MAXPAGESIZE is not defined
+#define ELF_MAXPAGESIZE 1
+#endif
+
+#ifndef ELF_COMMONPAGESIZE
+#define ELF_COMMONPAGESIZE ELF_MAXPAGESIZE
+#endif
+
+#ifndef ELF_MINPAGESIZE
+#define ELF_MINPAGESIZE ELF_COMMONPAGESIZE
+#endif
+
+#if ELF_COMMONPAGESIZE > ELF_MAXPAGESIZE
+# error ELF_COMMONPAGESIZE > ELF_MAXPAGESIZE
+#endif
+#if ELF_MINPAGESIZE > ELF_COMMONPAGESIZE
+# error ELF_MINPAGESIZE > ELF_COMMONPAGESIZE
+#endif
+
+#ifndef ELF_DYNAMIC_SEC_FLAGS
+/* Note that we set the SEC_IN_MEMORY flag for these sections.  */
+#define ELF_DYNAMIC_SEC_FLAGS			\
+  (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS	\
+   | SEC_IN_MEMORY | SEC_LINKER_CREATED)
+#endif
+
+#ifndef elf_backend_collect
+#define elf_backend_collect FALSE
+#endif
+#ifndef elf_backend_type_change_ok
+#define elf_backend_type_change_ok FALSE
+#endif
+
+#ifndef elf_backend_sym_is_global
+#define elf_backend_sym_is_global	0
+#endif
+#ifndef elf_backend_object_p
+#define elf_backend_object_p		0
+#endif
+#ifndef elf_backend_symbol_processing
+#define elf_backend_symbol_processing	0
+#endif
+#ifndef elf_backend_symbol_table_processing
+#define elf_backend_symbol_table_processing	0
+#endif
+#ifndef elf_backend_get_symbol_type
+#define elf_backend_get_symbol_type 0
+#endif
+#ifndef elf_backend_archive_symbol_lookup
+#define elf_backend_archive_symbol_lookup _bfd_elf_archive_symbol_lookup
+#endif
+#ifndef elf_backend_name_local_section_symbols
+#define elf_backend_name_local_section_symbols	0
+#endif
+#ifndef elf_backend_section_processing
+#define elf_backend_section_processing	0
+#endif
+#ifndef elf_backend_section_from_shdr
+#define elf_backend_section_from_shdr	_bfd_elf_make_section_from_shdr
+#endif
+#ifndef elf_backend_section_flags
+#define elf_backend_section_flags	0
+#endif
+#ifndef elf_backend_get_sec_type_attr
+#define elf_backend_get_sec_type_attr	_bfd_elf_get_sec_type_attr
+#endif
+#ifndef elf_backend_section_from_phdr
+#define elf_backend_section_from_phdr	_bfd_elf_make_section_from_phdr
+#endif
+#ifndef elf_backend_fake_sections
+#define elf_backend_fake_sections	0
+#endif
+#ifndef elf_backend_section_from_bfd_section
+#define elf_backend_section_from_bfd_section	0
+#endif
+#ifndef elf_backend_add_symbol_hook
+#define elf_backend_add_symbol_hook	0
+#endif
+#ifndef elf_backend_link_output_symbol_hook
+#define elf_backend_link_output_symbol_hook 0
+#endif
+#ifndef elf_backend_create_dynamic_sections
+#define elf_backend_create_dynamic_sections 0
+#endif
+#ifndef elf_backend_omit_section_dynsym
+#define elf_backend_omit_section_dynsym _bfd_elf_link_omit_section_dynsym
+#endif
+#ifndef elf_backend_relocs_compatible
+#define elf_backend_relocs_compatible _bfd_elf_default_relocs_compatible
+#endif
+#ifndef elf_backend_check_relocs
+#define elf_backend_check_relocs	0
+#endif
+#ifndef elf_backend_check_directives
+#define elf_backend_check_directives	0
+#endif
+#ifndef elf_backend_as_needed_cleanup
+#define elf_backend_as_needed_cleanup	0
+#endif
+#ifndef elf_backend_adjust_dynamic_symbol
+#define elf_backend_adjust_dynamic_symbol 0
+#endif
+#ifndef elf_backend_always_size_sections
+#define elf_backend_always_size_sections 0
+#endif
+#ifndef elf_backend_size_dynamic_sections
+#define elf_backend_size_dynamic_sections 0
+#endif
+#ifndef elf_backend_init_index_section
+#define elf_backend_init_index_section \
+ ((void (*) (bfd *, struct bfd_link_info *)) bfd_void)
+#endif
+#ifndef elf_backend_relocate_section
+#define elf_backend_relocate_section	0
+#endif
+#ifndef elf_backend_finish_dynamic_symbol
+#define elf_backend_finish_dynamic_symbol	0
+#endif
+#ifndef elf_backend_finish_dynamic_sections
+#define elf_backend_finish_dynamic_sections	0
+#endif
+#ifndef elf_backend_begin_write_processing
+#define elf_backend_begin_write_processing	0
+#endif
+#ifndef elf_backend_final_write_processing
+#define elf_backend_final_write_processing	0
+#endif
+#ifndef elf_backend_additional_program_headers
+#define elf_backend_additional_program_headers	0
+#endif
+#ifndef elf_backend_modify_segment_map
+#define elf_backend_modify_segment_map	0
+#endif
+#ifndef elf_backend_modify_program_headers
+#define elf_backend_modify_program_headers	0
+#endif
+#ifndef elf_backend_ecoff_debug_swap
+#define elf_backend_ecoff_debug_swap	0
+#endif
+#ifndef elf_backend_bfd_from_remote_memory
+#define elf_backend_bfd_from_remote_memory _bfd_elfNN_bfd_from_remote_memory
+#endif
+#ifndef elf_backend_got_header_size
+#define elf_backend_got_header_size	0
+#endif
+#ifndef elf_backend_got_elt_size
+#define elf_backend_got_elt_size _bfd_elf_default_got_elt_size
+#endif
+#ifndef elf_backend_obj_attrs_vendor
+#define elf_backend_obj_attrs_vendor		NULL
+#endif
+#ifndef elf_backend_obj_attrs_section
+#define elf_backend_obj_attrs_section		NULL
+#endif
+#ifndef elf_backend_obj_attrs_arg_type
+#define elf_backend_obj_attrs_arg_type		NULL
+#endif
+#ifndef elf_backend_obj_attrs_section_type
+#define elf_backend_obj_attrs_section_type		SHT_GNU_ATTRIBUTES
+#endif
+#ifndef elf_backend_obj_attrs_order
+#define elf_backend_obj_attrs_order		NULL
+#endif
+#ifndef elf_backend_obj_attrs_handle_unknown
+#define elf_backend_obj_attrs_handle_unknown	NULL
+#endif
+#ifndef elf_backend_static_tls_alignment
+#define elf_backend_static_tls_alignment	1
+#endif
+#ifndef elf_backend_post_process_headers
+#define elf_backend_post_process_headers	NULL
+#endif
+#ifndef elf_backend_print_symbol_all
+#define elf_backend_print_symbol_all		NULL
+#endif
+#ifndef elf_backend_output_arch_local_syms
+#define elf_backend_output_arch_local_syms	NULL
+#endif
+#ifndef elf_backend_output_arch_syms
+#define elf_backend_output_arch_syms		NULL
+#endif
+#ifndef elf_backend_copy_indirect_symbol
+#define elf_backend_copy_indirect_symbol  _bfd_elf_link_hash_copy_indirect
+#endif
+#ifndef elf_backend_hide_symbol
+#define elf_backend_hide_symbol		_bfd_elf_link_hash_hide_symbol
+#endif
+#ifndef elf_backend_fixup_symbol
+#define elf_backend_fixup_symbol		NULL
+#endif
+#ifndef elf_backend_merge_symbol_attribute
+#define elf_backend_merge_symbol_attribute	NULL
+#endif
+#ifndef elf_backend_get_target_dtag
+#define elf_backend_get_target_dtag		NULL
+#endif
+#ifndef elf_backend_ignore_undef_symbol
+#define elf_backend_ignore_undef_symbol		NULL
+#endif
+#ifndef elf_backend_emit_relocs
+#define elf_backend_emit_relocs			_bfd_elf_link_output_relocs
+#endif
+#ifndef elf_backend_count_relocs
+#define elf_backend_count_relocs		NULL
+#endif
+#ifndef elf_backend_grok_prstatus
+#define elf_backend_grok_prstatus		NULL
+#endif
+#ifndef elf_backend_grok_psinfo
+#define elf_backend_grok_psinfo			NULL
+#endif
+#ifndef elf_backend_write_core_note
+#define elf_backend_write_core_note		NULL
+#endif
+#ifndef elf_backend_lookup_section_flags_hook
+#define elf_backend_lookup_section_flags_hook	NULL
+#endif
+#ifndef elf_backend_reloc_type_class
+#define elf_backend_reloc_type_class		_bfd_elf_reloc_type_class
+#endif
+#ifndef elf_backend_discard_info
+#define elf_backend_discard_info		NULL
+#endif
+#ifndef elf_backend_ignore_discarded_relocs
+#define elf_backend_ignore_discarded_relocs	NULL
+#endif
+#ifndef elf_backend_action_discarded
+#define elf_backend_action_discarded _bfd_elf_default_action_discarded
+#endif
+#ifndef elf_backend_eh_frame_address_size
+#define elf_backend_eh_frame_address_size _bfd_elf_eh_frame_address_size
+#endif
+#ifndef elf_backend_can_make_relative_eh_frame
+#define elf_backend_can_make_relative_eh_frame	_bfd_elf_can_make_relative
+#endif
+#ifndef elf_backend_can_make_lsda_relative_eh_frame
+#define elf_backend_can_make_lsda_relative_eh_frame	_bfd_elf_can_make_relative
+#endif
+#ifndef elf_backend_encode_eh_address
+#define elf_backend_encode_eh_address		_bfd_elf_encode_eh_address
+#endif
+#ifndef elf_backend_write_section
+#define elf_backend_write_section		NULL
+#endif
+#ifndef elf_backend_mips_irix_compat
+#define elf_backend_mips_irix_compat		NULL
+#endif
+#ifndef elf_backend_mips_rtype_to_howto
+#define elf_backend_mips_rtype_to_howto		NULL
+#endif
+
+/* Previously, backends could only use SHT_REL or SHT_RELA relocation
+   sections, but not both.  They defined USE_REL to indicate SHT_REL
+   sections, and left it undefined to indicated SHT_RELA sections.
+   For backwards compatibility, we still support this usage.  */
+#ifndef USE_REL
+#define USE_REL 0
+#endif
+
+/* Use these in new code.  */
+#ifndef elf_backend_may_use_rel_p
+#define elf_backend_may_use_rel_p USE_REL
+#endif
+#ifndef elf_backend_may_use_rela_p
+#define elf_backend_may_use_rela_p !USE_REL
+#endif
+#ifndef elf_backend_default_use_rela_p
+#define elf_backend_default_use_rela_p !USE_REL
+#endif
+#ifndef elf_backend_rela_plts_and_copies_p
+#define elf_backend_rela_plts_and_copies_p elf_backend_default_use_rela_p
+#endif
+
+#ifndef elf_backend_rela_normal
+#define elf_backend_rela_normal 0
+#endif
+
+#ifndef elf_backend_plt_sym_val
+#define elf_backend_plt_sym_val NULL
+#endif
+#ifndef elf_backend_relplt_name
+#define elf_backend_relplt_name NULL
+#endif
+
+#ifndef ELF_MACHINE_ALT1
+#define ELF_MACHINE_ALT1 0
+#endif
+
+#ifndef ELF_MACHINE_ALT2
+#define ELF_MACHINE_ALT2 0
+#endif
+
+#ifndef elf_backend_size_info
+#define elf_backend_size_info _bfd_elfNN_size_info
+#endif
+
+#ifndef elf_backend_special_sections
+#define elf_backend_special_sections NULL
+#endif
+
+#ifndef elf_backend_sign_extend_vma
+#define elf_backend_sign_extend_vma 0
+#endif
+
+#ifndef elf_backend_link_order_error_handler
+#define elf_backend_link_order_error_handler _bfd_default_error_handler
+#endif
+
+#ifndef elf_backend_common_definition
+#define elf_backend_common_definition _bfd_elf_common_definition
+#endif
+
+#ifndef elf_backend_common_section_index
+#define elf_backend_common_section_index _bfd_elf_common_section_index
+#endif
+
+#ifndef elf_backend_common_section
+#define elf_backend_common_section _bfd_elf_common_section
+#endif
+
+#ifndef elf_backend_merge_symbol
+#define elf_backend_merge_symbol NULL
+#endif
+
+#ifndef elf_backend_hash_symbol
+#define elf_backend_hash_symbol _bfd_elf_hash_symbol
+#endif
+
+#ifndef elf_backend_is_function_type
+#define elf_backend_is_function_type _bfd_elf_is_function_type
+#endif
+
+#ifndef elf_match_priority
+#define elf_match_priority \
+  (ELF_ARCH == bfd_arch_unknown ? 2 : ELF_OSABI == ELFOSABI_NONE ? 1 : 0)
+#endif
+
+extern const struct elf_size_info _bfd_elfNN_size_info;
+
+static struct elf_backend_data elfNN_bed =
+{
+  ELF_ARCH,			/* arch */
+  ELF_TARGET_ID,		/* target_id */
+  ELF_MACHINE_CODE,		/* elf_machine_code */
+  ELF_OSABI,			/* elf_osabi  */
+  ELF_MAXPAGESIZE,		/* maxpagesize */
+  ELF_MINPAGESIZE,		/* minpagesize */
+  ELF_COMMONPAGESIZE,		/* commonpagesize */
+  ELF_DYNAMIC_SEC_FLAGS,	/* dynamic_sec_flags */
+  elf_backend_arch_data,
+  elf_info_to_howto,
+  elf_info_to_howto_rel,
+  elf_backend_sym_is_global,
+  elf_backend_object_p,
+  elf_backend_symbol_processing,
+  elf_backend_symbol_table_processing,
+  elf_backend_get_symbol_type,
+  elf_backend_archive_symbol_lookup,
+  elf_backend_name_local_section_symbols,
+  elf_backend_section_processing,
+  elf_backend_section_from_shdr,
+  elf_backend_section_flags,
+  elf_backend_get_sec_type_attr,
+  elf_backend_section_from_phdr,
+  elf_backend_fake_sections,
+  elf_backend_section_from_bfd_section,
+  elf_backend_add_symbol_hook,
+  elf_backend_link_output_symbol_hook,
+  elf_backend_create_dynamic_sections,
+  elf_backend_omit_section_dynsym,
+  elf_backend_relocs_compatible,
+  elf_backend_check_relocs,
+  elf_backend_check_directives,
+  elf_backend_as_needed_cleanup,
+  elf_backend_adjust_dynamic_symbol,
+  elf_backend_always_size_sections,
+  elf_backend_size_dynamic_sections,
+  elf_backend_init_index_section,
+  elf_backend_relocate_section,
+  elf_backend_finish_dynamic_symbol,
+  elf_backend_finish_dynamic_sections,
+  elf_backend_begin_write_processing,
+  elf_backend_final_write_processing,
+  elf_backend_additional_program_headers,
+  elf_backend_modify_segment_map,
+  elf_backend_modify_program_headers,
+  elf_backend_gc_keep,
+  elf_backend_gc_mark_dynamic_ref,
+  elf_backend_gc_mark_hook,
+  elf_backend_gc_mark_extra_sections,
+  elf_backend_gc_sweep_hook,
+  elf_backend_post_process_headers,
+  elf_backend_print_symbol_all,
+  elf_backend_output_arch_local_syms,
+  elf_backend_output_arch_syms,
+  elf_backend_copy_indirect_symbol,
+  elf_backend_hide_symbol,
+  elf_backend_fixup_symbol,
+  elf_backend_merge_symbol_attribute,
+  elf_backend_get_target_dtag,
+  elf_backend_ignore_undef_symbol,
+  elf_backend_emit_relocs,
+  elf_backend_count_relocs,
+  elf_backend_grok_prstatus,
+  elf_backend_grok_psinfo,
+  elf_backend_write_core_note,
+  elf_backend_lookup_section_flags_hook,
+  elf_backend_reloc_type_class,
+  elf_backend_discard_info,
+  elf_backend_ignore_discarded_relocs,
+  elf_backend_action_discarded,
+  elf_backend_eh_frame_address_size,
+  elf_backend_can_make_relative_eh_frame,
+  elf_backend_can_make_lsda_relative_eh_frame,
+  elf_backend_encode_eh_address,
+  elf_backend_write_section,
+  elf_backend_mips_irix_compat,
+  elf_backend_mips_rtype_to_howto,
+  elf_backend_ecoff_debug_swap,
+  elf_backend_bfd_from_remote_memory,
+  elf_backend_plt_sym_val,
+  elf_backend_common_definition,
+  elf_backend_common_section_index,
+  elf_backend_common_section,
+  elf_backend_merge_symbol,
+  elf_backend_hash_symbol,
+  elf_backend_is_function_type,
+  elf_backend_link_order_error_handler,
+  elf_backend_relplt_name,
+  ELF_MACHINE_ALT1,
+  ELF_MACHINE_ALT2,
+  &elf_backend_size_info,
+  elf_backend_special_sections,
+  elf_backend_got_header_size,
+  elf_backend_got_elt_size,
+  elf_backend_obj_attrs_vendor,
+  elf_backend_obj_attrs_section,
+  elf_backend_obj_attrs_arg_type,
+  elf_backend_obj_attrs_section_type,
+  elf_backend_obj_attrs_order,
+  elf_backend_obj_attrs_handle_unknown,
+  elf_backend_static_tls_alignment,
+  elf_backend_collect,
+  elf_backend_type_change_ok,
+  elf_backend_may_use_rel_p,
+  elf_backend_may_use_rela_p,
+  elf_backend_default_use_rela_p,
+  elf_backend_rela_plts_and_copies_p,
+  elf_backend_rela_normal,
+  elf_backend_sign_extend_vma,
+  elf_backend_want_got_plt,
+  elf_backend_plt_readonly,
+  elf_backend_want_plt_sym,
+  elf_backend_plt_not_loaded,
+  elf_backend_plt_alignment,
+  elf_backend_can_gc_sections,
+  elf_backend_can_refcount,
+  elf_backend_want_got_sym,
+  elf_backend_want_dynbss,
+  elf_backend_want_p_paddr_set_to_zero,
+  elf_backend_default_execstack
+};
+
+/* Forward declaration for use when initialising alternative_target field.  */
+#ifdef TARGET_LITTLE_SYM
+extern const bfd_target TARGET_LITTLE_SYM;
+#endif
+
+#ifdef TARGET_BIG_SYM
+const bfd_target TARGET_BIG_SYM =
+{
+  /* name: identify kind of target */
+  TARGET_BIG_NAME,
+
+  /* flavour: general indication about file */
+  bfd_target_elf_flavour,
+
+  /* byteorder: data is big endian */
+  BFD_ENDIAN_BIG,
+
+  /* header_byteorder: header is also big endian */
+  BFD_ENDIAN_BIG,
+
+  /* object_flags: mask of all file flags */
+  (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS
+   | DYNAMIC | WP_TEXT | D_PAGED | BFD_COMPRESS | BFD_DECOMPRESS),
+
+  /* section_flags: mask of all section flags */
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_READONLY
+   | SEC_CODE | SEC_DATA | SEC_DEBUGGING | SEC_EXCLUDE | SEC_SORT_ENTRIES
+   | SEC_SMALL_DATA | SEC_MERGE | SEC_STRINGS | SEC_GROUP),
+
+   /* leading_symbol_char: is the first char of a user symbol
+      predictable, and if so what is it */
+  elf_symbol_leading_char,
+
+  /* ar_pad_char: pad character for filenames within an archive header
+     FIXME:  this really has nothing to do with ELF, this is a characteristic
+     of the archiver and/or os and should be independently tunable */
+  '/',
+
+  /* ar_max_namelen: maximum number of characters in an archive header
+     FIXME:  this really has nothing to do with ELF, this is a characteristic
+     of the archiver and should be independently tunable.  The System V ABI,
+     Chapter 7 (Formats & Protocols), Archive section sets this as 15.  */
+  15,
+
+  elf_match_priority,
+
+  /* Routines to byte-swap various sized integers from the data sections */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+    bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+    bfd_getb16, bfd_getb_signed_16, bfd_putb16,
+
+  /* Routines to byte-swap various sized integers from the file headers */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+    bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+    bfd_getb16, bfd_getb_signed_16, bfd_putb16,
+
+  /* bfd_check_format: check the format of a file being read */
+  { _bfd_dummy_target,		/* unknown format */
+    bfd_elfNN_object_p,		/* assembler/linker output (object file) */
+    bfd_elfNN_archive_p,	/* an archive */
+    bfd_elfNN_core_file_p	/* a core file */
+  },
+
+  /* bfd_set_format: set the format of a file being written */
+  { bfd_false,
+    bfd_elfNN_mkobject,
+    bfd_elfNN_mkarchive,
+    bfd_elfNN_mkcorefile
+  },
+
+  /* bfd_write_contents: write cached information into a file being written */
+  { bfd_false,
+    bfd_elfNN_write_object_contents,
+    bfd_elfNN_write_archive_contents,
+    bfd_elfNN_write_corefile_contents,
+  },
+
+  BFD_JUMP_TABLE_GENERIC (bfd_elfNN),
+  BFD_JUMP_TABLE_COPY (bfd_elfNN),
+  BFD_JUMP_TABLE_CORE (bfd_elfNN),
+#ifdef bfd_elfNN_archive_functions
+  BFD_JUMP_TABLE_ARCHIVE (bfd_elfNN_archive),
+#else
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+#endif
+  BFD_JUMP_TABLE_SYMBOLS (bfd_elfNN),
+  BFD_JUMP_TABLE_RELOCS (bfd_elfNN),
+  BFD_JUMP_TABLE_WRITE (bfd_elfNN),
+  BFD_JUMP_TABLE_LINK (bfd_elfNN),
+  BFD_JUMP_TABLE_DYNAMIC (bfd_elfNN),
+
+  /* Alternative endian target.  */
+#ifdef TARGET_LITTLE_SYM
+  & TARGET_LITTLE_SYM,
+#else
+  NULL,
+#endif
+
+  /* backend_data: */
+  &elfNN_bed
+};
+#endif
+
+#ifdef TARGET_LITTLE_SYM
+const bfd_target TARGET_LITTLE_SYM =
+{
+  /* name: identify kind of target */
+  TARGET_LITTLE_NAME,
+
+  /* flavour: general indication about file */
+  bfd_target_elf_flavour,
+
+  /* byteorder: data is little endian */
+  BFD_ENDIAN_LITTLE,
+
+  /* header_byteorder: header is also little endian */
+  BFD_ENDIAN_LITTLE,
+
+  /* object_flags: mask of all file flags */
+  (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS
+   | DYNAMIC | WP_TEXT | D_PAGED | BFD_COMPRESS | BFD_DECOMPRESS),
+
+  /* section_flags: mask of all section flags */
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_READONLY
+   | SEC_CODE | SEC_DATA | SEC_DEBUGGING | SEC_EXCLUDE | SEC_SORT_ENTRIES
+   | SEC_SMALL_DATA | SEC_MERGE | SEC_STRINGS | SEC_GROUP),
+
+   /* leading_symbol_char: is the first char of a user symbol
+      predictable, and if so what is it */
+  elf_symbol_leading_char,
+
+  /* ar_pad_char: pad character for filenames within an archive header
+     FIXME:  this really has nothing to do with ELF, this is a characteristic
+     of the archiver and/or os and should be independently tunable */
+  '/',
+
+  /* ar_max_namelen: maximum number of characters in an archive header
+     FIXME:  this really has nothing to do with ELF, this is a characteristic
+     of the archiver and should be independently tunable.  The System V ABI,
+     Chapter 7 (Formats & Protocols), Archive section sets this as 15.  */
+  15,
+
+  elf_match_priority,
+
+  /* Routines to byte-swap various sized integers from the data sections */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16,
+
+  /* Routines to byte-swap various sized integers from the file headers */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16,
+
+  /* bfd_check_format: check the format of a file being read */
+  { _bfd_dummy_target,		/* unknown format */
+    bfd_elfNN_object_p,		/* assembler/linker output (object file) */
+    bfd_elfNN_archive_p,	/* an archive */
+    bfd_elfNN_core_file_p	/* a core file */
+  },
+
+  /* bfd_set_format: set the format of a file being written */
+  { bfd_false,
+    bfd_elfNN_mkobject,
+    bfd_elfNN_mkarchive,
+    bfd_elfNN_mkcorefile
+  },
+
+  /* bfd_write_contents: write cached information into a file being written */
+  { bfd_false,
+    bfd_elfNN_write_object_contents,
+    bfd_elfNN_write_archive_contents,
+    bfd_elfNN_write_corefile_contents,
+  },
+
+  BFD_JUMP_TABLE_GENERIC (bfd_elfNN),
+  BFD_JUMP_TABLE_COPY (bfd_elfNN),
+  BFD_JUMP_TABLE_CORE (bfd_elfNN),
+#ifdef bfd_elfNN_archive_functions
+  BFD_JUMP_TABLE_ARCHIVE (bfd_elfNN_archive),
+#else
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+#endif
+  BFD_JUMP_TABLE_SYMBOLS (bfd_elfNN),
+  BFD_JUMP_TABLE_RELOCS (bfd_elfNN),
+  BFD_JUMP_TABLE_WRITE (bfd_elfNN),
+  BFD_JUMP_TABLE_LINK (bfd_elfNN),
+  BFD_JUMP_TABLE_DYNAMIC (bfd_elfNN),
+
+  /* Alternative endian target.  */
+#ifdef TARGET_BIG_SYM
+  & TARGET_BIG_SYM,
+#else
+  NULL,
+#endif
+
+  /* backend_data: */
+  &elfNN_bed
+};
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfxx-tilegx.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfxx-tilegx.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfxx-tilegx.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfxx-tilegx.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3957 @@
+/* TILE-Gx-specific support for ELF.
+   Copyright 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "bfd.h"
+#include "sysdep.h"
+#include "libbfd.h"
+#include "elf-bfd.h"
+#include "elf/tilegx.h"
+#include "opcode/tilegx.h"
+#include "libiberty.h"
+#include "elfxx-tilegx.h"
+
+#define ABI_64_P(abfd) \
+  (get_elf_backend_data (abfd)->s->elfclass == ELFCLASS64)
+
+#define TILEGX_ELF_WORD_BYTES(htab) \
+  ((htab)->bytes_per_word)
+
+/* The size of an external RELA relocation.  */
+#define TILEGX_ELF_RELA_BYTES(htab) \
+  ((htab)->bytes_per_rela)
+
+/* Both 32-bit and 64-bit tilegx encode this in an identical manner,
+   so just take advantage of that.  */
+#define TILEGX_ELF_R_TYPE(r_info) \
+  ((r_info) & 0xFF)
+
+#define TILEGX_ELF_R_INFO(htab, in_rel, index, type)	\
+  ((htab)->r_info (in_rel, index, type))
+
+#define TILEGX_ELF_R_SYMNDX(htab, r_info) \
+  ((htab)->r_symndx(r_info))
+
+#define TILEGX_ELF_DTPOFF_RELOC(htab) \
+  ((htab)->dtpoff_reloc)
+
+#define TILEGX_ELF_DTPMOD_RELOC(htab) \
+  ((htab)->dtpmod_reloc)
+
+#define TILEGX_ELF_TPOFF_RELOC(htab) \
+  ((htab)->tpoff_reloc)
+
+#define TILEGX_ELF_PUT_WORD(htab, bfd, val, ptr) \
+  ((htab)->put_word (bfd, val, ptr))
+
+/* The name of the dynamic interpreter.  This is put in the .interp
+   section.  */
+
+#define ELF64_DYNAMIC_INTERPRETER "/lib/ld.so.1"
+#define ELF32_DYNAMIC_INTERPRETER "/lib32/ld.so.1"
+
+
+static reloc_howto_type tilegx_elf_howto_table [] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_TILEGX_NONE,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEGX_NONE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+#ifdef BFD64
+  /* A 64 bit absolute relocation.  */
+  HOWTO (R_TILEGX_64,	/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEGX_64",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffffffffffffULL,	/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+#endif
+  /* A 32 bit absolute relocation.  */
+  HOWTO (R_TILEGX_32,	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEGX_32",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit absolute relocation.  */
+  HOWTO (R_TILEGX_16,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_bitfield, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEGX_16",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* An 8 bit absolute relocation.  */
+  HOWTO (R_TILEGX_8,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_unsigned, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEGX_8",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+#ifdef BFD64
+  /* A 64 bit pc-relative relocation.  */
+  HOWTO (R_TILEGX_64_PCREL,/* type */
+	 0,			/* rightshift */
+	 4,			/* size (0 = byte, 1 = short, 2 = long) */
+	 64,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEGX_32_PCREL", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffffffffffffULL,	/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+#endif
+  /* A 32 bit pc-relative relocation.  */
+  HOWTO (R_TILEGX_32_PCREL,/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 32,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEGX_32_PCREL", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffffffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 16 bit pc-relative relocation.  */
+  HOWTO (R_TILEGX_16_PCREL,/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEGX_16_PCREL",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* An 8 bit pc-relative relocation.  */
+  HOWTO (R_TILEGX_8_PCREL,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 8,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEGX_8_PCREL",/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xff,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  /* A 16 bit relocation without overflow.  */
+  HOWTO (R_TILEGX_HW0,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEGX_HW0",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit relocation without overflow.  */
+  HOWTO (R_TILEGX_HW1,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEGX_HW1",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit relocation without overflow.  */
+  HOWTO (R_TILEGX_HW2,	/* type */
+	 32,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEGX_HW2",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit relocation without overflow.  */
+  HOWTO (R_TILEGX_HW3,	/* type */
+	 48,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEGX_HW3",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit relocation with overflow.  */
+  HOWTO (R_TILEGX_HW0_LAST,	/* type */
+	 0,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEGX_HW0_LAST",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit relocation with overflow.  */
+  HOWTO (R_TILEGX_HW1_LAST,	/* type */
+	 16,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEGX_HW1_LAST",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  /* A 16 bit relocation with overflow.  */
+  HOWTO (R_TILEGX_HW2_LAST,	/* type */
+	 32,			/* rightshift */
+	 1,			/* size (0 = byte, 1 = short, 2 = long) */
+	 16,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEGX_HW2_LAST",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0xffff,		/* dst_mask */
+	 FALSE),		/* pcrel_offset */
+
+  HOWTO (R_TILEGX_COPY,		/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEGX_COPY",		/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_TILEGX_GLOB_DAT,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEGX_GLOB_DAT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_TILEGX_JMP_SLOT,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEGX_JMP_SLOT",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_TILEGX_RELATIVE,	/* type */
+	 0,			/* rightshift */
+	 0,			/* size (0 = byte, 1 = short, 2 = long) */
+	 0,			/* bitsize */
+	 FALSE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_dont, /* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 "R_TILEGX_RELATIVE",	/* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 0,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_TILEGX_BROFF_X1, /* type */
+	 TILEGX_LOG2_BUNDLE_ALIGNMENT_IN_BYTES, /* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 17,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed, /* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_TILEGX_BROFF_X1", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 -1,			/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
+  HOWTO (R_TILEGX_JUMPOFF_X1, /* type */
+	 TILEGX_LOG2_BUNDLE_ALIGNMENT_IN_BYTES, /* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 27,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_TILEGX_JUMPOFF_X1", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 -1,			/* dst_mask */
+	 TRUE), 		/* pcrel_offset */
+
+  HOWTO (R_TILEGX_JUMPOFF_X1_PLT, /* type */
+	 TILEGX_LOG2_BUNDLE_ALIGNMENT_IN_BYTES, /* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 27,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,/* complain_on_overflow */
+	 bfd_elf_generic_reloc, /* special_function */
+	 "R_TILEGX_JUMPOFF_X1_PLT", /* name */
+	 FALSE,			/* partial_inplace */
+	 0,			/* src_mask */
+	 -1,			/* dst_mask */
+	 TRUE), 		/* pcrel_offset */
+
+#define TILEGX_IMM_HOWTO(name, size, bitsize) \
+  HOWTO (name, 0, size, bitsize, FALSE, 0, \
+         complain_overflow_signed, bfd_elf_generic_reloc, \
+         #name, FALSE, 0, -1, FALSE)
+
+#define TILEGX_UIMM_HOWTO(name, size, bitsize) \
+  HOWTO (name, 0, size, bitsize, FALSE, 0, \
+         complain_overflow_unsigned, bfd_elf_generic_reloc, \
+         #name, FALSE, 0, -1, FALSE)
+
+  TILEGX_IMM_HOWTO(R_TILEGX_IMM8_X0, 0, 8),
+  TILEGX_IMM_HOWTO(R_TILEGX_IMM8_Y0, 0, 8),
+  TILEGX_IMM_HOWTO(R_TILEGX_IMM8_X1, 0, 8),
+  TILEGX_IMM_HOWTO(R_TILEGX_IMM8_Y1, 0, 8),
+  TILEGX_IMM_HOWTO(R_TILEGX_DEST_IMM8_X1, 0, 8),
+
+  TILEGX_UIMM_HOWTO(R_TILEGX_MT_IMM14_X1, 1, 14),
+  TILEGX_UIMM_HOWTO(R_TILEGX_MF_IMM14_X1, 1, 14),
+
+  TILEGX_UIMM_HOWTO(R_TILEGX_MMSTART_X0, 0, 6),
+  TILEGX_UIMM_HOWTO(R_TILEGX_MMEND_X0,   0, 6),
+
+  TILEGX_UIMM_HOWTO(R_TILEGX_SHAMT_X0, 0, 6),
+  TILEGX_UIMM_HOWTO(R_TILEGX_SHAMT_X1, 0, 6),
+  TILEGX_UIMM_HOWTO(R_TILEGX_SHAMT_Y0, 0, 6),
+  TILEGX_UIMM_HOWTO(R_TILEGX_SHAMT_Y1, 0, 6),
+
+#define TILEGX_IMM16_HOWTO(name, rshift) \
+  HOWTO (name, rshift, 1, 16, FALSE, 0, \
+         complain_overflow_dont, bfd_elf_generic_reloc, \
+         #name, FALSE, 0, 0xffff, FALSE)
+
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW0, 0),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW0, 0),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW1, 16),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW1, 16),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW2, 32),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW2, 32),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW3, 48),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW3, 48),
+
+#define TILEGX_IMM16_HOWTO_LAST(name, rshift) \
+  HOWTO (name, rshift, 1, 16, FALSE, 0, \
+         complain_overflow_signed, bfd_elf_generic_reloc, \
+         #name, FALSE, 0, 0xffff, FALSE)
+
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW0_LAST, 0),
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW0_LAST, 0),
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW1_LAST, 16),
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW1_LAST, 16),
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW2_LAST, 32),
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW2_LAST, 32),
+
+  /* PC-relative offsets. */
+
+#define TILEGX_IMM16_HOWTO_PCREL(name, rshift) \
+  HOWTO (name, rshift, 1, 16, TRUE, 0, \
+         complain_overflow_dont, bfd_elf_generic_reloc, \
+         #name, FALSE, 0, 0xffff, TRUE)
+
+  TILEGX_IMM16_HOWTO_PCREL (R_TILEGX_IMM16_X0_HW0_PCREL, 0),
+  TILEGX_IMM16_HOWTO_PCREL (R_TILEGX_IMM16_X1_HW0_PCREL, 0),
+  TILEGX_IMM16_HOWTO_PCREL (R_TILEGX_IMM16_X0_HW1_PCREL, 16),
+  TILEGX_IMM16_HOWTO_PCREL (R_TILEGX_IMM16_X1_HW1_PCREL, 16),
+  TILEGX_IMM16_HOWTO_PCREL (R_TILEGX_IMM16_X0_HW2_PCREL, 32),
+  TILEGX_IMM16_HOWTO_PCREL (R_TILEGX_IMM16_X1_HW2_PCREL, 32),
+  TILEGX_IMM16_HOWTO_PCREL (R_TILEGX_IMM16_X0_HW3_PCREL, 48),
+  TILEGX_IMM16_HOWTO_PCREL (R_TILEGX_IMM16_X1_HW3_PCREL, 48),
+
+#define TILEGX_IMM16_HOWTO_LAST_PCREL(name, rshift) \
+  HOWTO (name, rshift, 1, 16, TRUE, 0, \
+         complain_overflow_signed, bfd_elf_generic_reloc, \
+         #name, FALSE, 0, 0xffff, TRUE)
+
+  TILEGX_IMM16_HOWTO_LAST_PCREL (R_TILEGX_IMM16_X0_HW0_LAST_PCREL,  0),
+  TILEGX_IMM16_HOWTO_LAST_PCREL (R_TILEGX_IMM16_X1_HW0_LAST_PCREL,  0),
+  TILEGX_IMM16_HOWTO_LAST_PCREL (R_TILEGX_IMM16_X0_HW1_LAST_PCREL, 16),
+  TILEGX_IMM16_HOWTO_LAST_PCREL (R_TILEGX_IMM16_X1_HW1_LAST_PCREL, 16),
+  TILEGX_IMM16_HOWTO_LAST_PCREL (R_TILEGX_IMM16_X0_HW2_LAST_PCREL, 32),
+  TILEGX_IMM16_HOWTO_LAST_PCREL (R_TILEGX_IMM16_X1_HW2_LAST_PCREL, 32),
+
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW0_GOT, 0),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW0_GOT, 0),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW1_GOT, 16),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW1_GOT, 16),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW2_GOT, 32),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW2_GOT, 32),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW3_GOT, 48),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW3_GOT, 48),
+
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW0_LAST_GOT, 0),
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW0_LAST_GOT, 0),
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW1_LAST_GOT, 16),
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW1_LAST_GOT, 16),
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW2_LAST_GOT, 32),
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW2_LAST_GOT, 32),
+
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW0_TLS_GD, 0),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW0_TLS_GD, 0),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW1_TLS_GD, 16),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW1_TLS_GD, 16),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW2_TLS_GD, 32),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW2_TLS_GD, 32),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW3_TLS_GD, 48),
+  TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW3_TLS_GD, 48),
+
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD, 0),
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD, 0),
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD, 16),
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD, 16),
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD, 32),
+  TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD, 32),
+
+#define TILEGX_IMM16_HOWTO_TLS_IE(name, rshift) \
+  HOWTO (name, rshift, 1, 16, FALSE, 0, \
+         complain_overflow_dont, bfd_elf_generic_reloc, \
+         #name, FALSE, 0, 0xffff, TRUE)
+
+  TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X0_HW0_TLS_IE, 0),
+  TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X1_HW0_TLS_IE, 0),
+  TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X0_HW1_TLS_IE, 16),
+  TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X1_HW1_TLS_IE, 16),
+  TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X0_HW2_TLS_IE, 32),
+  TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X1_HW2_TLS_IE, 32),
+  TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X0_HW3_TLS_IE, 48),
+  TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X1_HW3_TLS_IE, 48),
+
+#define TILEGX_IMM16_HOWTO_LAST_TLS_IE(name, rshift) \
+  HOWTO (name, rshift, 1, 16, FALSE, 0, \
+         complain_overflow_signed, bfd_elf_generic_reloc, \
+         #name, FALSE, 0, 0xffff, TRUE)
+
+  TILEGX_IMM16_HOWTO_LAST_TLS_IE (R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE, 0),
+  TILEGX_IMM16_HOWTO_LAST_TLS_IE (R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE, 0),
+  TILEGX_IMM16_HOWTO_LAST_TLS_IE (R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE, 16),
+  TILEGX_IMM16_HOWTO_LAST_TLS_IE (R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE, 16),
+  TILEGX_IMM16_HOWTO_LAST_TLS_IE (R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE, 32),
+  TILEGX_IMM16_HOWTO_LAST_TLS_IE (R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE, 32),
+
+  HOWTO(R_TILEGX_TLS_DTPMOD64, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+        bfd_elf_generic_reloc, "R_TILEGX_TLS_DTPMOD64",
+        FALSE, 0, 0, TRUE),
+  HOWTO(R_TILEGX_TLS_DTPOFF64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+        bfd_elf_generic_reloc, "R_TILEGX_TLS_DTPOFF64",
+        FALSE, 0, -1, TRUE),
+  HOWTO(R_TILEGX_TLS_TPOFF64, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+        bfd_elf_generic_reloc, "R_TILEGX_TLS_TPOFF64",
+        FALSE, 0, 0, TRUE),
+
+  HOWTO(R_TILEGX_TLS_DTPMOD32, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+        bfd_elf_generic_reloc, "R_TILEGX_TLS_DTPMOD32",
+        FALSE, 0, 0, TRUE),
+  HOWTO(R_TILEGX_TLS_DTPOFF32, 0, 4, 32, FALSE, 0, complain_overflow_bitfield,
+        bfd_elf_generic_reloc, "R_TILEGX_TLS_DTPOFF32",
+        FALSE, 0, -1, TRUE),
+  HOWTO(R_TILEGX_TLS_TPOFF32, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+        bfd_elf_generic_reloc, "R_TILEGX_TLS_TPOFF32",
+        FALSE, 0, 0, TRUE)
+};
+
+static reloc_howto_type tilegx_elf_howto_table2 [] =
+{
+  /* GNU extension to record C++ vtable hierarchy */
+  HOWTO (R_TILEGX_GNU_VTINHERIT, /* type */
+         0,                     /* rightshift */
+         4,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         NULL,                  /* special_function */
+         "R_TILEGX_GNU_VTINHERIT", /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+  /* GNU extension to record C++ vtable member usage */
+  HOWTO (R_TILEGX_GNU_VTENTRY,     /* type */
+         0,                     /* rightshift */
+         4,                     /* size (0 = byte, 1 = short, 2 = long) */
+         0,                     /* bitsize */
+         FALSE,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_dont, /* complain_on_overflow */
+         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
+         "R_TILEGX_GNU_VTENTRY",   /* name */
+         FALSE,                 /* partial_inplace */
+         0,                     /* src_mask */
+         0,                     /* dst_mask */
+         FALSE),                /* pcrel_offset */
+
+};
+
+/* Map BFD reloc types to TILEGX ELF reloc types.  */
+
+typedef struct tilegx_reloc_map
+{
+  bfd_reloc_code_real_type  bfd_reloc_val;
+  unsigned int              tilegx_reloc_val;
+  reloc_howto_type *        table;
+} reloc_map;
+
+static const reloc_map tilegx_reloc_map [] =
+{
+#define TH_REMAP(bfd, tilegx) \
+  { bfd, tilegx, tilegx_elf_howto_table },
+
+  /* Standard relocations. */
+  TH_REMAP (BFD_RELOC_NONE,                    R_TILEGX_NONE)
+  TH_REMAP (BFD_RELOC_64,                      R_TILEGX_64)
+  TH_REMAP (BFD_RELOC_32,                      R_TILEGX_32)
+  TH_REMAP (BFD_RELOC_16,                      R_TILEGX_16)
+  TH_REMAP (BFD_RELOC_8,                       R_TILEGX_8)
+  TH_REMAP (BFD_RELOC_64_PCREL,                R_TILEGX_64_PCREL)
+  TH_REMAP (BFD_RELOC_32_PCREL,                R_TILEGX_32_PCREL)
+  TH_REMAP (BFD_RELOC_16_PCREL,                R_TILEGX_16_PCREL)
+  TH_REMAP (BFD_RELOC_8_PCREL,                 R_TILEGX_8_PCREL)
+
+#define SIMPLE_REMAP(t) TH_REMAP (BFD_RELOC_##t, R_##t)
+
+  /* Custom relocations. */
+  SIMPLE_REMAP (TILEGX_HW0)
+  SIMPLE_REMAP (TILEGX_HW1)
+  SIMPLE_REMAP (TILEGX_HW2)
+  SIMPLE_REMAP (TILEGX_HW3)
+  SIMPLE_REMAP (TILEGX_HW0_LAST)
+  SIMPLE_REMAP (TILEGX_HW1_LAST)
+  SIMPLE_REMAP (TILEGX_HW2_LAST)
+  SIMPLE_REMAP (TILEGX_COPY)
+  SIMPLE_REMAP (TILEGX_GLOB_DAT)
+  SIMPLE_REMAP (TILEGX_JMP_SLOT)
+  SIMPLE_REMAP (TILEGX_RELATIVE)
+  SIMPLE_REMAP (TILEGX_BROFF_X1)
+  SIMPLE_REMAP (TILEGX_JUMPOFF_X1)
+  SIMPLE_REMAP (TILEGX_JUMPOFF_X1_PLT)
+  SIMPLE_REMAP (TILEGX_IMM8_X0)
+  SIMPLE_REMAP (TILEGX_IMM8_Y0)
+  SIMPLE_REMAP (TILEGX_IMM8_X1)
+  SIMPLE_REMAP (TILEGX_IMM8_Y1)
+  SIMPLE_REMAP (TILEGX_DEST_IMM8_X1)
+  SIMPLE_REMAP (TILEGX_MT_IMM14_X1)
+  SIMPLE_REMAP (TILEGX_MF_IMM14_X1)
+  SIMPLE_REMAP (TILEGX_MMSTART_X0)
+  SIMPLE_REMAP (TILEGX_MMEND_X0)
+  SIMPLE_REMAP (TILEGX_SHAMT_X0)
+  SIMPLE_REMAP (TILEGX_SHAMT_X1)
+  SIMPLE_REMAP (TILEGX_SHAMT_Y0)
+  SIMPLE_REMAP (TILEGX_SHAMT_Y1)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW0)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW0)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW1)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW1)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW2)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW2)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW3)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW3)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_LAST)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_LAST)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_LAST)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_LAST)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_LAST)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_LAST)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_PCREL)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_PCREL)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_PCREL)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_PCREL)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_PCREL)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_PCREL)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW3_PCREL)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW3_PCREL)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_LAST_PCREL)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_LAST_PCREL)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_LAST_PCREL)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_LAST_PCREL)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_LAST_PCREL)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_LAST_PCREL)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW3_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW3_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_LAST_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_LAST_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_LAST_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_LAST_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_LAST_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_LAST_GOT)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW3_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW3_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_LAST_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_LAST_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_LAST_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_LAST_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_LAST_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_LAST_TLS_GD)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW3_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW3_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_LAST_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_LAST_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_LAST_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_LAST_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_LAST_TLS_IE)
+  SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_LAST_TLS_IE)
+
+  SIMPLE_REMAP (TILEGX_TLS_DTPMOD64)
+  SIMPLE_REMAP (TILEGX_TLS_DTPOFF64)
+  SIMPLE_REMAP (TILEGX_TLS_TPOFF64)
+
+  SIMPLE_REMAP (TILEGX_TLS_DTPMOD32)
+  SIMPLE_REMAP (TILEGX_TLS_DTPOFF32)
+  SIMPLE_REMAP (TILEGX_TLS_TPOFF32)
+
+#undef SIMPLE_REMAP
+#undef TH_REMAP
+
+  { BFD_RELOC_VTABLE_INHERIT,       R_TILEGX_GNU_VTINHERIT, tilegx_elf_howto_table2 },
+  { BFD_RELOC_VTABLE_ENTRY,         R_TILEGX_GNU_VTENTRY,   tilegx_elf_howto_table2 },
+};
+
+
+
+/* The TILE-Gx linker needs to keep track of the number of relocs that it
+   decides to copy as dynamic relocs in check_relocs for each symbol.
+   This is so that it can later discard them if they are found to be
+   unnecessary.  We store the information in a field extending the
+   regular ELF linker hash table.  */
+
+struct tilegx_elf_dyn_relocs
+{
+  struct tilegx_elf_dyn_relocs *next;
+
+  /* The input section of the reloc.  */
+  asection *sec;
+
+  /* Total number of relocs copied for the input section.  */
+  bfd_size_type count;
+
+  /* Number of pc-relative relocs copied for the input section.  */
+  bfd_size_type pc_count;
+};
+
+/* TILEGX ELF linker hash entry.  */
+
+struct tilegx_elf_link_hash_entry
+{
+  struct elf_link_hash_entry elf;
+
+  /* Track dynamic relocs copied for this symbol.  */
+  struct tilegx_elf_dyn_relocs *dyn_relocs;
+
+#define GOT_UNKNOWN     0
+#define GOT_NORMAL      1
+#define GOT_TLS_GD      2
+#define GOT_TLS_IE      4
+  unsigned char tls_type;
+};
+
+#define tilegx_elf_hash_entry(ent) \
+  ((struct tilegx_elf_link_hash_entry *)(ent))
+
+struct _bfd_tilegx_elf_obj_tdata
+{
+  struct elf_obj_tdata root;
+
+  /* tls_type for each local got entry.  */
+  char *local_got_tls_type;
+};
+
+#define _bfd_tilegx_elf_tdata(abfd) \
+  ((struct _bfd_tilegx_elf_obj_tdata *) (abfd)->tdata.any)
+
+#define _bfd_tilegx_elf_local_got_tls_type(abfd) \
+  (_bfd_tilegx_elf_tdata (abfd)->local_got_tls_type)
+
+#define is_tilegx_elf(bfd)				\
+  (bfd_get_flavour (bfd) == bfd_target_elf_flavour	\
+   && elf_tdata (bfd) != NULL				\
+   && elf_object_id (bfd) == TILEGX_ELF_DATA)
+
+#include "elf/common.h"
+#include "elf/internal.h"
+
+struct tilegx_elf_link_hash_table
+{
+  struct elf_link_hash_table elf;
+
+  int bytes_per_word;
+  int word_align_power;
+  int bytes_per_rela;
+  int dtpmod_reloc;
+  int dtpoff_reloc;
+  int tpoff_reloc;
+  bfd_vma (*r_info) (Elf_Internal_Rela *, bfd_vma, bfd_vma);
+  bfd_vma (*r_symndx) (bfd_vma);
+  void (*put_word) (bfd *, bfd_vma, void *);
+  const char *dynamic_interpreter;
+
+  /* Short-cuts to get to dynamic linker sections.  */
+  asection *sdynbss;
+  asection *srelbss;
+
+  /* Small local sym to section mapping cache.  */
+  struct sym_cache sym_cache;
+};
+
+
+/* Get the Tile ELF linker hash table from a link_info structure.  */
+#define tilegx_elf_hash_table(p) \
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == TILEGX_ELF_DATA ? ((struct tilegx_elf_link_hash_table *) ((p)->hash)) : NULL)
+
+#ifdef BFD64
+static bfd_vma
+tilegx_elf_r_info_64 (Elf_Internal_Rela *in_rel ATTRIBUTE_UNUSED,
+		      bfd_vma rel_index,
+		      bfd_vma type)
+{
+  return ELF64_R_INFO (rel_index, type);
+}
+
+static bfd_vma
+tilegx_elf_r_symndx_64 (bfd_vma r_info)
+{
+  return ELF64_R_SYM (r_info);
+}
+
+static void
+tilegx_put_word_64 (bfd *abfd, bfd_vma val, void *ptr)
+{
+  bfd_put_64 (abfd, val, ptr);
+}
+#endif /* BFD64 */
+
+static bfd_vma
+tilegx_elf_r_info_32 (Elf_Internal_Rela *in_rel ATTRIBUTE_UNUSED,
+		      bfd_vma rel_index,
+		      bfd_vma type)
+{
+  return ELF32_R_INFO (rel_index, type);
+}
+
+static bfd_vma
+tilegx_elf_r_symndx_32 (bfd_vma r_info)
+{
+  return ELF32_R_SYM (r_info);
+}
+
+static void
+tilegx_put_word_32 (bfd *abfd, bfd_vma val, void *ptr)
+{
+  bfd_put_32 (abfd, val, ptr);
+}
+
+reloc_howto_type *
+tilegx_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
+			  bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = ARRAY_SIZE (tilegx_reloc_map); --i;)
+    {
+      const reloc_map * entry;
+
+      entry = tilegx_reloc_map + i;
+
+      if (entry->bfd_reloc_val == code)
+	return entry->table + (entry->tilegx_reloc_val
+			       - entry->table[0].type);
+    }
+
+  return NULL;
+}
+
+reloc_howto_type *
+tilegx_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			  const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (tilegx_elf_howto_table)
+            / sizeof (tilegx_elf_howto_table[0]));
+       i++)
+    if (tilegx_elf_howto_table[i].name != NULL
+        && strcasecmp (tilegx_elf_howto_table[i].name, r_name) == 0)
+      return &tilegx_elf_howto_table[i];
+
+  return NULL;
+}
+
+void
+tilegx_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
+			   arelent *cache_ptr,
+			   Elf_Internal_Rela *dst)
+{
+  unsigned int r_type = TILEGX_ELF_R_TYPE (dst->r_info);
+
+  if (r_type <= (unsigned int) R_TILEGX_TLS_TPOFF32)
+    cache_ptr->howto = &tilegx_elf_howto_table [r_type];
+  else if (r_type - R_TILEGX_GNU_VTINHERIT
+	   <= (unsigned int) R_TILEGX_GNU_VTENTRY)
+    cache_ptr->howto
+      = &tilegx_elf_howto_table2 [r_type - R_TILEGX_GNU_VTINHERIT];
+  else
+    abort ();
+}
+
+typedef tilegx_bundle_bits (*tilegx_create_func)(int);
+
+static const tilegx_create_func reloc_to_create_func[] =
+{
+  /* The first twenty relocation types don't correspond to operands */
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+
+  /* The remaining relocations are used for immediate operands */
+  create_BrOff_X1,
+  create_JumpOff_X1,
+  create_JumpOff_X1,
+  create_Imm8_X0,
+  create_Imm8_Y0,
+  create_Imm8_X1,
+  create_Imm8_Y1,
+  create_Dest_Imm8_X1,
+  create_MT_Imm14_X1,
+  create_MF_Imm14_X1,
+  create_BFStart_X0,
+  create_BFEnd_X0,
+  create_ShAmt_X0,
+  create_ShAmt_X1,
+  create_ShAmt_Y0,
+  create_ShAmt_Y1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1,
+  create_Imm16_X0,
+  create_Imm16_X1
+};
+
+static void
+tilegx_elf_append_rela (bfd *abfd, asection *s, Elf_Internal_Rela *rel)
+{
+  const struct elf_backend_data *bed;
+  bfd_byte *loc;
+
+  bed = get_elf_backend_data (abfd);
+  loc = s->contents + (s->reloc_count++ * bed->s->sizeof_rela);
+  bed->s->swap_reloca_out (abfd, rel, loc);
+}
+
+/* PLT/GOT stuff */
+
+/* The procedure linkage table starts with the following header:
+
+     ld_add       r28, r27, 8
+     ld           r27, r27
+   {
+     jr           r27
+     info         10            ## SP not offset, return PC in LR
+   }
+
+   Subsequent entries are the following, jumping to the header at the end:
+
+   {
+     moveli       r28, <_GLOBAL_OFFSET_TABLE_ - 1f + MY_GOT_OFFSET>
+     lnk          r26
+   }
+1:
+   {
+     moveli       r27, <_GLOBAL_OFFSET_TABLE_ - 1b>
+     shl16insli   r28, r28, <_GLOBAL_OFFSET_TABLE_ - 1b + MY_GOT_OFFSET>
+   }
+   {
+     add          r28, r26, r28
+     shl16insli   r27, r27, <_GLOBAL_OFFSET_TABLE_ - 1b>
+   }
+   {
+     add          r27, r26, r27
+     ld           r28, r28
+     info         10       ## SP not offset, return PC in LR
+   }
+   {
+     shl16insli   r29, zero, MY_PLT_INDEX
+     jr           r28
+   }
+
+   This code sequence lets the code at at the start of the PLT determine
+   which PLT entry was executed by examining 'r29'.
+
+   Note that MY_PLT_INDEX skips over the header entries, so the first
+   actual jump table entry has index zero.
+
+   If the offset fits in 16 bits,
+
+     lnk          r26
+1:
+   {
+     addli        r28, r26, <_GLOBAL_OFFSET_TABLE_ - 1b + MY_GOT_OFFSET>
+     moveli       r27, <_GLOBAL_OFFSET_TABLE_ - 1b>
+   }
+   {
+     shl16insli   r29, zero, MY_PLT_INDEX
+     ld           r28, r28
+   }
+   {
+     add          r27, r26, r27
+     jr           r28
+   }
+     info         10       ## SP not offset, return PC in LR
+
+   For the purpose of backtracing, the procedure linkage table ends with the
+   following tail entry:
+
+     info         10       ## SP not offset, return PC in LR
+
+   The 32-bit versions are similar, with ld4s replacing ld, and offsets into
+   the GOT being multiples of 4 instead of 8.
+
+*/
+
+#define PLT_HEADER_SIZE_IN_BUNDLES 3
+#define PLT_ENTRY_SIZE_IN_BUNDLES 5
+#define PLT_TAIL_SIZE_IN_BUNDLES 1
+
+#define PLT_HEADER_SIZE \
+  (PLT_HEADER_SIZE_IN_BUNDLES * TILEGX_BUNDLE_SIZE_IN_BYTES)
+#define PLT_ENTRY_SIZE \
+  (PLT_ENTRY_SIZE_IN_BUNDLES * TILEGX_BUNDLE_SIZE_IN_BYTES)
+#define PLT_TAIL_SIZE \
+  (PLT_TAIL_SIZE_IN_BUNDLES * TILEGX_BUNDLE_SIZE_IN_BYTES)
+
+#define GOT_ENTRY_SIZE(htab) TILEGX_ELF_WORD_BYTES (htab)
+
+#define GOTPLT_HEADER_SIZE(htab) (2 * GOT_ENTRY_SIZE (htab))
+
+static const bfd_byte
+tilegx64_plt0_entry[PLT_HEADER_SIZE] =
+{
+  0x00, 0x30, 0x48, 0x51,
+  0x6e, 0x43, 0xa0, 0x18, /* { ld_add r28, r27, 8 } */
+  0x00, 0x30, 0xbc, 0x35,
+  0x00, 0x40, 0xde, 0x9e, /* { ld r27, r27 } */
+  0xff, 0xaf, 0x30, 0x40,
+  0x60, 0x73, 0x6a, 0x28, /* { info 10 ; jr r27 } */
+};
+
+static const bfd_byte
+tilegx64_long_plt_entry[PLT_ENTRY_SIZE] =
+{
+  0xdc, 0x0f, 0x00, 0x10,
+  0x0d, 0xf0, 0x6a, 0x28, /* { moveli r28, 0 ; lnk r26 } */
+  0xdb, 0x0f, 0x00, 0x10,
+  0x8e, 0x03, 0x00, 0x38, /* { moveli r27, 0 ; shl16insli r28, r28, 0 } */
+  0x9c, 0xc6, 0x0d, 0xd0,
+  0x6d, 0x03, 0x00, 0x38, /* { add r28, r26, r28 ; shl16insli r27, r27, 0 } */
+  0x9b, 0xb6, 0xc5, 0xad,
+  0xff, 0x57, 0xe0, 0x8e, /* { add r27, r26, r27 ; info 10 ; ld r28, r28 } */
+  0xdd, 0x0f, 0x00, 0x70,
+  0x80, 0x73, 0x6a, 0x28, /* { shl16insli r29, zero, 0 ; jr r28 } */
+};
+
+static const bfd_byte
+tilegx64_short_plt_entry[PLT_ENTRY_SIZE] =
+{
+  0x00, 0x30, 0x48, 0x51,
+  0x0d, 0xf0, 0x6a, 0x28, /* { lnk r26 } */
+  0x9c, 0x06, 0x00, 0x90,
+  0xed, 0x07, 0x00, 0x00, /* { addli r28, r26, 0 ; moveli r27, 0 } */
+  0xdd, 0x0f, 0x00, 0x70,
+  0x8e, 0xeb, 0x6a, 0x28, /* { shl16insli r29, zero, 0 ; ld r28, r28 } */
+  0x9b, 0xb6, 0x0d, 0x50,
+  0x80, 0x73, 0x6a, 0x28, /* { add r27, r26, r27 ; jr r28 } */
+  0x00, 0x30, 0x48, 0xd1,
+  0xff, 0x57, 0x18, 0x18, /* { info 10 } */
+};
+
+/* Reuse an existing info 10 bundle.  */
+static const bfd_byte const *tilegx64_plt_tail_entry =
+  &tilegx64_short_plt_entry[4 * TILEGX_BUNDLE_SIZE_IN_BYTES];
+
+static const bfd_byte
+tilegx32_plt0_entry[PLT_HEADER_SIZE] =
+{
+  0x00, 0x30, 0x48, 0x51,
+  0x6e, 0x23, 0x58, 0x18, /* { ld4s_add r28, r27, 4 } */
+  0x00, 0x30, 0xbc, 0x35,
+  0x00, 0x40, 0xde, 0x9c, /* { ld4s r27, r27 } */
+  0xff, 0xaf, 0x30, 0x40,
+  0x60, 0x73, 0x6a, 0x28, /* { info 10 ; jr r27 } */
+};
+
+static const bfd_byte
+tilegx32_long_plt_entry[PLT_ENTRY_SIZE] =
+{
+  0xdc, 0x0f, 0x00, 0x10,
+  0x0d, 0xf0, 0x6a, 0x28, /* { moveli r28, 0 ; lnk r26 } */
+  0xdb, 0x0f, 0x00, 0x10,
+  0x8e, 0x03, 0x00, 0x38, /* { moveli r27, 0 ; shl16insli r28, r28, 0 } */
+  0x9c, 0xc6, 0x0d, 0xd0,
+  0x6d, 0x03, 0x00, 0x38, /* { add r28, r26, r28 ; shl16insli r27, r27, 0 } */
+  0x9b, 0xb6, 0xc5, 0xad,
+  0xff, 0x57, 0xe0, 0x8c, /* { add r27, r26, r27 ; info 10 ; ld4s r28, r28 } */
+  0xdd, 0x0f, 0x00, 0x70,
+  0x80, 0x73, 0x6a, 0x28, /* { shl16insli r29, zero, 0 ; jr r28 } */
+};
+
+static const bfd_byte
+tilegx32_short_plt_entry[PLT_ENTRY_SIZE] =
+{
+  0x00, 0x30, 0x48, 0x51,
+  0x0d, 0xf0, 0x6a, 0x28, /* { lnk r26 } */
+  0x9c, 0x06, 0x00, 0x90,
+  0xed, 0x07, 0x00, 0x00, /* { addli r28, r26, 0 ; moveli r27, 0 } */
+  0xdd, 0x0f, 0x00, 0x70,
+  0x8e, 0x9b, 0x6a, 0x28, /* { shl16insli r29, zero, 0 ; ld4s r28, r28 } */
+  0x9b, 0xb6, 0x0d, 0x50,
+  0x80, 0x73, 0x6a, 0x28, /* { add r27, r26, r27 ; jr r28 } */
+  0x00, 0x30, 0x48, 0xd1,
+  0xff, 0x57, 0x18, 0x18, /* { info 10 } */
+};
+
+/* Reuse an existing info 10 bundle.  */
+static const bfd_byte const *tilegx32_plt_tail_entry =
+  &tilegx64_short_plt_entry[4 * TILEGX_BUNDLE_SIZE_IN_BYTES];
+
+static int
+tilegx_plt_entry_build (bfd *output_bfd,
+			struct tilegx_elf_link_hash_table *htab,
+			asection *splt, asection *sgotplt,
+			bfd_vma offset, bfd_vma *r_offset)
+{
+  int plt_index = (offset - PLT_HEADER_SIZE) / PLT_ENTRY_SIZE;
+  int got_offset = (plt_index * GOT_ENTRY_SIZE (htab)
+		    + GOTPLT_HEADER_SIZE (htab));
+  tilegx_bundle_bits *pc;
+
+  /* Compute the distance from the got entry to the lnk.  */
+  bfd_signed_vma dist_got_entry = sgotplt->output_section->vma
+    + sgotplt->output_offset
+    + got_offset
+    - splt->output_section->vma
+    - splt->output_offset
+    - offset
+    - TILEGX_BUNDLE_SIZE_IN_BYTES;
+
+  /* Compute the distance to GOTPLT[0].  */
+  bfd_signed_vma dist_got0 = dist_got_entry - got_offset;
+
+  /* Check whether we can use the short plt entry with 16-bit offset.  */
+  bfd_boolean short_plt_entry =
+    (dist_got_entry <= 0x7fff && dist_got0 >= -0x8000);
+
+  const tilegx_bundle_bits *plt_entry = (tilegx_bundle_bits *)
+    (ABI_64_P (output_bfd) ?
+     (short_plt_entry ? tilegx64_short_plt_entry : tilegx64_long_plt_entry) :
+     (short_plt_entry ? tilegx32_short_plt_entry : tilegx32_long_plt_entry));
+
+  /* Copy the plt entry template.  */
+  memcpy (splt->contents + offset, plt_entry, PLT_ENTRY_SIZE);
+
+  /* Write the immediate offsets.  */
+  pc = (tilegx_bundle_bits *)(splt->contents + offset);
+
+  if (short_plt_entry)
+    {
+      /* { lnk r28 }  */
+      pc++;
+
+      /* { addli r28, r28, &GOTPLT[MY_GOT_INDEX] ; moveli r27, &GOTPLT[0] }  */
+      *pc++ |= create_Imm16_X0 (dist_got_entry)
+	| create_Imm16_X1 (dist_got0);
+
+      /* { shl16insli r29, zero, MY_PLT_INDEX ; ld r28, r28 }  */
+      *pc++ |= create_Imm16_X0 (plt_index);
+    }
+  else
+    {
+      /* { moveli r28, &GOTPLT[MY_GOT_INDEX] ; lnk r26 }  */
+      *pc++ |= create_Imm16_X0 (dist_got_entry >> 16);
+
+      /* { moveli r27, &GOTPLT[0] ;
+	   shl16insli r28, r28, &GOTPLT[MY_GOT_INDEX] }  */
+      *pc++ |= create_Imm16_X0 (dist_got0 >> 16)
+	| create_Imm16_X1 (dist_got_entry);
+
+      /* { add r28, r26, r28 ; shl16insli r27, r27, &GOTPLT[0] }  */
+      *pc++ |= create_Imm16_X1 (dist_got0);
+
+      /* { add r27, r26, r27 ; info 10 ; ld r28, r28 } */
+      pc++;
+
+      /* { shl16insli r29, zero, MY_GOT_INDEX ; jr r28 } */
+      *pc++ |= create_Imm16_X0 (plt_index);
+   }
+
+  /* Set the relocation offset.  */
+  *r_offset = got_offset;
+
+  return plt_index;
+}
+
+/* Create an entry in an TILEGX ELF linker hash table.  */
+
+static struct bfd_hash_entry *
+link_hash_newfunc (struct bfd_hash_entry *entry,
+		   struct bfd_hash_table *table, const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry =
+        bfd_hash_allocate (table,
+                           sizeof (struct tilegx_elf_link_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = _bfd_elf_link_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    {
+      struct tilegx_elf_link_hash_entry *eh;
+
+      eh = (struct tilegx_elf_link_hash_entry *) entry;
+      eh->dyn_relocs = NULL;
+      eh->tls_type = GOT_UNKNOWN;
+    }
+
+  return entry;
+}
+
+/* Create a TILEGX ELF linker hash table.  */
+
+struct bfd_link_hash_table *
+tilegx_elf_link_hash_table_create (bfd *abfd)
+{
+  struct tilegx_elf_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct tilegx_elf_link_hash_table);
+
+  ret = (struct tilegx_elf_link_hash_table *) bfd_zmalloc (amt);
+  if (ret == NULL)
+    return NULL;
+
+#ifdef BFD64
+  if (ABI_64_P (abfd))
+    {
+      ret->bytes_per_word = 8;
+      ret->word_align_power = 3;
+      ret->bytes_per_rela = sizeof (Elf64_External_Rela);
+      ret->dtpoff_reloc = R_TILEGX_TLS_DTPOFF64;
+      ret->dtpmod_reloc = R_TILEGX_TLS_DTPMOD64;
+      ret->tpoff_reloc = R_TILEGX_TLS_TPOFF64;
+      ret->r_info = tilegx_elf_r_info_64;
+      ret->r_symndx = tilegx_elf_r_symndx_64;
+      ret->dynamic_interpreter = ELF64_DYNAMIC_INTERPRETER;
+      ret->put_word = tilegx_put_word_64;
+    }
+  else
+#endif
+    {
+      ret->bytes_per_word = 4;
+      ret->word_align_power = 2;
+      ret->bytes_per_rela = sizeof (Elf32_External_Rela);
+      ret->dtpoff_reloc = R_TILEGX_TLS_DTPOFF32;
+      ret->dtpmod_reloc = R_TILEGX_TLS_DTPMOD32;
+      ret->tpoff_reloc = R_TILEGX_TLS_TPOFF32;
+      ret->r_info = tilegx_elf_r_info_32;
+      ret->r_symndx = tilegx_elf_r_symndx_32;
+      ret->dynamic_interpreter = ELF32_DYNAMIC_INTERPRETER;
+      ret->put_word = tilegx_put_word_32;
+    }
+
+  if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd, link_hash_newfunc,
+				      sizeof (struct tilegx_elf_link_hash_entry),
+				      TILEGX_ELF_DATA))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  return &ret->elf.root;
+}
+
+/* Create the .got section.  */
+
+static bfd_boolean
+tilegx_elf_create_got_section (bfd *abfd, struct bfd_link_info *info)
+{
+  flagword flags;
+  asection *s, *s_got;
+  struct elf_link_hash_entry *h;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  struct elf_link_hash_table *htab = elf_hash_table (info);
+
+  /* This function may be called more than once.  */
+  s = bfd_get_section_by_name (abfd, ".got");
+  if (s != NULL && (s->flags & SEC_LINKER_CREATED) != 0)
+    return TRUE;
+
+  flags = bed->dynamic_sec_flags;
+
+  s = bfd_make_section_with_flags (abfd,
+				   (bed->rela_plts_and_copies_p
+				    ? ".rela.got" : ".rel.got"),
+				   (bed->dynamic_sec_flags
+				    | SEC_READONLY));
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+    return FALSE;
+  htab->srelgot = s;
+
+  s = s_got = bfd_make_section_with_flags (abfd, ".got", flags);
+  if (s == NULL
+      || !bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+    return FALSE;
+  htab->sgot = s;
+
+  /* The first bit of the global offset table is the header.  */
+  s->size += bed->got_header_size;
+
+  if (bed->want_got_plt)
+    {
+      s = bfd_make_section_with_flags (abfd, ".got.plt", flags);
+      if (s == NULL
+	  || !bfd_set_section_alignment (abfd, s,
+					 bed->s->log_file_align))
+	return FALSE;
+      htab->sgotplt = s;
+
+      /* Reserve room for the header.  */
+      s->size += GOTPLT_HEADER_SIZE (tilegx_elf_hash_table (info));
+    }
+
+  if (bed->want_got_sym)
+    {
+      /* Define the symbol _GLOBAL_OFFSET_TABLE_ at the start of the .got
+	 section.  We don't do this in the linker script because we don't want
+	 to define the symbol if we are not creating a global offset
+	 table.  */
+      h = _bfd_elf_define_linkage_sym (abfd, info, s_got,
+				       "_GLOBAL_OFFSET_TABLE_");
+      elf_hash_table (info)->hgot = h;
+      if (h == NULL)
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Create .plt, .rela.plt, .got, .got.plt, .rela.got, .dynbss, and
+   .rela.bss sections in DYNOBJ, and set up shortcuts to them in our
+   hash table.  */
+
+bfd_boolean
+tilegx_elf_create_dynamic_sections (bfd *dynobj,
+				    struct bfd_link_info *info)
+{
+  struct tilegx_elf_link_hash_table *htab;
+
+  htab = tilegx_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  if (!tilegx_elf_create_got_section (dynobj, info))
+    return FALSE;
+
+  if (!_bfd_elf_create_dynamic_sections (dynobj, info))
+    return FALSE;
+
+  htab->sdynbss = bfd_get_section_by_name (dynobj, ".dynbss");
+  if (!info->shared)
+    htab->srelbss = bfd_get_section_by_name (dynobj, ".rela.bss");
+
+  if (!htab->elf.splt || !htab->elf.srelplt || !htab->sdynbss
+      || (!info->shared && !htab->srelbss))
+    abort ();
+
+  return TRUE;
+}
+
+/* Copy the extra info we tack onto an elf_link_hash_entry.  */
+
+void
+tilegx_elf_copy_indirect_symbol (struct bfd_link_info *info,
+				 struct elf_link_hash_entry *dir,
+				 struct elf_link_hash_entry *ind)
+{
+  struct tilegx_elf_link_hash_entry *edir, *eind;
+
+  edir = (struct tilegx_elf_link_hash_entry *) dir;
+  eind = (struct tilegx_elf_link_hash_entry *) ind;
+
+  if (eind->dyn_relocs != NULL)
+    {
+      if (edir->dyn_relocs != NULL)
+	{
+	  struct tilegx_elf_dyn_relocs **pp;
+	  struct tilegx_elf_dyn_relocs *p;
+
+	  /* Add reloc counts against the indirect sym to the direct sym
+	     list.  Merge any entries against the same section.  */
+	  for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      struct tilegx_elf_dyn_relocs *q;
+
+	      for (q = edir->dyn_relocs; q != NULL; q = q->next)
+		if (q->sec == p->sec)
+		  {
+		    q->pc_count += p->pc_count;
+		    q->count += p->count;
+		    *pp = p->next;
+		    break;
+		  }
+	      if (q == NULL)
+		pp = &p->next;
+	    }
+	  *pp = edir->dyn_relocs;
+	}
+
+      edir->dyn_relocs = eind->dyn_relocs;
+      eind->dyn_relocs = NULL;
+    }
+
+  if (ind->root.type == bfd_link_hash_indirect
+      && dir->got.refcount <= 0)
+    {
+      edir->tls_type = eind->tls_type;
+      eind->tls_type = GOT_UNKNOWN;
+    }
+  _bfd_elf_link_hash_copy_indirect (info, dir, ind);
+}
+
+/* Look through the relocs for a section during the first phase, and
+   allocate space in the global offset table or procedure linkage
+   table.  */
+
+bfd_boolean
+tilegx_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
+			 asection *sec, const Elf_Internal_Rela *relocs)
+{
+  struct tilegx_elf_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  asection *sreloc;
+  int num_relocs;
+
+  if (info->relocatable)
+    return TRUE;
+
+  htab = tilegx_elf_hash_table (info);
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  sym_hashes = elf_sym_hashes (abfd);
+
+  sreloc = NULL;
+
+  num_relocs = sec->reloc_count;
+
+  BFD_ASSERT (is_tilegx_elf (abfd) || num_relocs == 0);
+
+  if (htab->elf.dynobj == NULL)
+    htab->elf.dynobj = abfd;
+
+  rel_end = relocs + num_relocs;
+  for (rel = relocs; rel < rel_end; rel++)
+    {
+      unsigned int r_type;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+      int tls_type;
+
+      r_symndx = TILEGX_ELF_R_SYMNDX (htab, rel->r_info);
+      r_type = TILEGX_ELF_R_TYPE (rel->r_info);
+
+      if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
+	{
+	  (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
+				 abfd, r_symndx);
+	  return FALSE;
+	}
+
+      if (r_symndx < symtab_hdr->sh_info)
+	h = NULL;
+      else
+	{
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	}
+
+      switch (r_type)
+	{
+	case R_TILEGX_IMM16_X0_HW0_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW0_TLS_GD:
+	case R_TILEGX_IMM16_X0_HW1_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW1_TLS_GD:
+	case R_TILEGX_IMM16_X0_HW2_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW2_TLS_GD:
+	case R_TILEGX_IMM16_X0_HW3_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW3_TLS_GD:
+	case R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
+	case R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
+	case R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD:
+          tls_type = GOT_TLS_GD;
+          goto have_got_reference;
+
+	case R_TILEGX_IMM16_X0_HW0_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW0_TLS_IE:
+	case R_TILEGX_IMM16_X0_HW1_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW1_TLS_IE:
+	case R_TILEGX_IMM16_X0_HW2_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW2_TLS_IE:
+	case R_TILEGX_IMM16_X0_HW3_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW3_TLS_IE:
+	case R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE:
+	case R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE:
+	case R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE:
+          tls_type = GOT_TLS_IE;
+          if (info->shared)
+            info->flags |= DF_STATIC_TLS;
+          goto have_got_reference;
+
+	case R_TILEGX_IMM16_X0_HW0_GOT:
+	case R_TILEGX_IMM16_X1_HW0_GOT:
+	case R_TILEGX_IMM16_X0_HW1_GOT:
+	case R_TILEGX_IMM16_X1_HW1_GOT:
+	case R_TILEGX_IMM16_X0_HW2_GOT:
+	case R_TILEGX_IMM16_X1_HW2_GOT:
+	case R_TILEGX_IMM16_X0_HW3_GOT:
+	case R_TILEGX_IMM16_X1_HW3_GOT:
+	case R_TILEGX_IMM16_X0_HW0_LAST_GOT:
+	case R_TILEGX_IMM16_X1_HW0_LAST_GOT:
+	case R_TILEGX_IMM16_X0_HW1_LAST_GOT:
+	case R_TILEGX_IMM16_X1_HW1_LAST_GOT:
+	case R_TILEGX_IMM16_X0_HW2_LAST_GOT:
+	case R_TILEGX_IMM16_X1_HW2_LAST_GOT:
+          tls_type = GOT_NORMAL;
+          /* Fall Through */
+
+        have_got_reference:
+	  /* This symbol requires a global offset table entry.  */
+	  {
+            int old_tls_type;
+
+	    if (h != NULL)
+	      {
+		h->got.refcount += 1;
+		old_tls_type = tilegx_elf_hash_entry(h)->tls_type;
+	      }
+	    else
+	      {
+		bfd_signed_vma *local_got_refcounts;
+
+		/* This is a global offset table entry for a local symbol.  */
+		local_got_refcounts = elf_local_got_refcounts (abfd);
+		if (local_got_refcounts == NULL)
+		  {
+		    bfd_size_type size;
+
+		    size = symtab_hdr->sh_info;
+		    size *= (sizeof (bfd_signed_vma) + sizeof(char));
+		    local_got_refcounts = ((bfd_signed_vma *)
+					   bfd_zalloc (abfd, size));
+		    if (local_got_refcounts == NULL)
+		      return FALSE;
+		    elf_local_got_refcounts (abfd) = local_got_refcounts;
+                    _bfd_tilegx_elf_local_got_tls_type (abfd)
+                      = (char *) (local_got_refcounts + symtab_hdr->sh_info);
+		  }
+		local_got_refcounts[r_symndx] += 1;
+                old_tls_type = _bfd_tilegx_elf_local_got_tls_type (abfd) [r_symndx];
+              }
+
+            /* If a TLS symbol is accessed using IE at least once,
+               there is no point to use dynamic model for it.  */
+            if (old_tls_type != tls_type && old_tls_type != GOT_UNKNOWN
+                && (old_tls_type != GOT_TLS_GD
+                    || tls_type != GOT_TLS_IE))
+              {
+                if (old_tls_type == GOT_TLS_IE && tls_type == GOT_TLS_GD)
+                  tls_type = old_tls_type;
+                else
+                  {
+                    (*_bfd_error_handler)
+                      (_("%B: `%s' accessed both as normal and thread local symbol"),
+                       abfd, h ? h->root.root.string : "<local>");
+                    return FALSE;
+                  }
+              }
+
+            if (old_tls_type != tls_type)
+              {
+                if (h != NULL)
+                  tilegx_elf_hash_entry (h)->tls_type = tls_type;
+                else
+                  _bfd_tilegx_elf_local_got_tls_type (abfd) [r_symndx] = tls_type;
+	      }
+	  }
+
+	  if (htab->elf.sgot == NULL)
+	    {
+	      if (!tilegx_elf_create_got_section (htab->elf.dynobj, info))
+		return FALSE;
+	    }
+	  break;
+
+        case R_TILEGX_JUMPOFF_X1_PLT:
+	  /* This symbol requires a procedure linkage table entry.  We
+	     actually build the entry in adjust_dynamic_symbol,
+	     because this might be a case of linking PIC code without
+	     linking in any dynamic objects, in which case we don't
+	     need to generate a procedure linkage table after all.  */
+
+	  if (h != NULL)
+            {
+              h->needs_plt = 1;
+              h->plt.refcount += 1;
+            }
+	  break;
+
+        case R_TILEGX_64_PCREL:
+        case R_TILEGX_32_PCREL:
+        case R_TILEGX_16_PCREL:
+        case R_TILEGX_8_PCREL:
+	case R_TILEGX_IMM16_X0_HW0_PCREL:
+	case R_TILEGX_IMM16_X1_HW0_PCREL:
+	case R_TILEGX_IMM16_X0_HW1_PCREL:
+	case R_TILEGX_IMM16_X1_HW1_PCREL:
+	case R_TILEGX_IMM16_X0_HW2_PCREL:
+	case R_TILEGX_IMM16_X1_HW2_PCREL:
+	case R_TILEGX_IMM16_X0_HW3_PCREL:
+	case R_TILEGX_IMM16_X1_HW3_PCREL:
+	case R_TILEGX_IMM16_X0_HW0_LAST_PCREL:
+	case R_TILEGX_IMM16_X1_HW0_LAST_PCREL:
+	case R_TILEGX_IMM16_X0_HW1_LAST_PCREL:
+	case R_TILEGX_IMM16_X1_HW1_LAST_PCREL:
+	case R_TILEGX_IMM16_X0_HW2_LAST_PCREL:
+	case R_TILEGX_IMM16_X1_HW2_LAST_PCREL:
+	  if (h != NULL)
+	    h->non_got_ref = 1;
+
+	  if (h != NULL
+	      && strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
+	    break;
+	  /* Fall through.  */
+
+        case R_TILEGX_64:
+        case R_TILEGX_32:
+        case R_TILEGX_16:
+        case R_TILEGX_8:
+	case R_TILEGX_HW0:
+	case R_TILEGX_HW1:
+	case R_TILEGX_HW2:
+	case R_TILEGX_HW3:
+	case R_TILEGX_HW0_LAST:
+	case R_TILEGX_HW1_LAST:
+	case R_TILEGX_HW2_LAST:
+        case R_TILEGX_COPY:
+        case R_TILEGX_GLOB_DAT:
+        case R_TILEGX_JMP_SLOT:
+        case R_TILEGX_RELATIVE:
+        case R_TILEGX_BROFF_X1:
+        case R_TILEGX_JUMPOFF_X1:
+        case R_TILEGX_IMM8_X0:
+        case R_TILEGX_IMM8_Y0:
+        case R_TILEGX_IMM8_X1:
+        case R_TILEGX_IMM8_Y1:
+        case R_TILEGX_DEST_IMM8_X1:
+        case R_TILEGX_MT_IMM14_X1:
+        case R_TILEGX_MF_IMM14_X1:
+        case R_TILEGX_MMSTART_X0:
+        case R_TILEGX_MMEND_X0:
+        case R_TILEGX_SHAMT_X0:
+        case R_TILEGX_SHAMT_X1:
+        case R_TILEGX_SHAMT_Y0:
+        case R_TILEGX_SHAMT_Y1:
+	case R_TILEGX_IMM16_X0_HW0:
+	case R_TILEGX_IMM16_X1_HW0:
+	case R_TILEGX_IMM16_X0_HW1:
+	case R_TILEGX_IMM16_X1_HW1:
+	case R_TILEGX_IMM16_X0_HW2:
+	case R_TILEGX_IMM16_X1_HW2:
+	case R_TILEGX_IMM16_X0_HW3:
+	case R_TILEGX_IMM16_X1_HW3:
+	case R_TILEGX_IMM16_X0_HW0_LAST:
+	case R_TILEGX_IMM16_X1_HW0_LAST:
+	case R_TILEGX_IMM16_X0_HW1_LAST:
+	case R_TILEGX_IMM16_X1_HW1_LAST:
+	case R_TILEGX_IMM16_X0_HW2_LAST:
+	case R_TILEGX_IMM16_X1_HW2_LAST:
+	  if (h != NULL)
+            {
+              h->non_got_ref = 1;
+
+              if (!info->shared)
+                {
+                  /* We may need a .plt entry if the function this reloc
+                     refers to is in a shared lib.  */
+                  h->plt.refcount += 1;
+                }
+            }
+
+	  /* If we are creating a shared library, and this is a reloc
+	     against a global symbol, or a non PC relative reloc
+	     against a local symbol, then we need to copy the reloc
+	     into the shared library.  However, if we are linking with
+	     -Bsymbolic, we do not need to copy a reloc against a
+	     global symbol which is defined in an object we are
+	     including in the link (i.e., DEF_REGULAR is set).  At
+	     this point we have not seen all the input files, so it is
+	     possible that DEF_REGULAR is not set now but will be set
+	     later (it is never cleared).  In case of a weak definition,
+	     DEF_REGULAR may be cleared later by a strong definition in
+	     a shared library.  We account for that possibility below by
+	     storing information in the relocs_copied field of the hash
+	     table entry.  A similar situation occurs when creating
+	     shared libraries and symbol visibility changes render the
+	     symbol local.
+
+	     If on the other hand, we are creating an executable, we
+	     may need to keep relocations for symbols satisfied by a
+	     dynamic library if we manage to avoid copy relocs for the
+	     symbol.  */
+	  if ((info->shared
+	       && (sec->flags & SEC_ALLOC) != 0
+	       && (! tilegx_elf_howto_table[r_type].pc_relative
+		   || (h != NULL
+		       && (! info->symbolic
+			   || h->root.type == bfd_link_hash_defweak
+			   || !h->def_regular))))
+	      || (!info->shared
+		  && (sec->flags & SEC_ALLOC) != 0
+		  && h != NULL
+		  && (h->root.type == bfd_link_hash_defweak
+		      || !h->def_regular)))
+	    {
+	      struct tilegx_elf_dyn_relocs *p;
+	      struct tilegx_elf_dyn_relocs **head;
+
+	      /* When creating a shared object, we must copy these
+		 relocs into the output file.  We create a reloc
+		 section in dynobj and make room for the reloc.  */
+	      if (sreloc == NULL)
+		{
+		  sreloc = _bfd_elf_make_dynamic_reloc_section
+		    (sec, htab->elf.dynobj, htab->word_align_power, abfd,
+		     /*rela?*/ TRUE);
+
+		  if (sreloc == NULL)
+		    return FALSE;
+		}
+
+	      /* If this is a global symbol, we count the number of
+		 relocations we need for this symbol.  */
+	      if (h != NULL)
+		head =
+                  &((struct tilegx_elf_link_hash_entry *) h)->dyn_relocs;
+	      else
+		{
+		  /* Track dynamic relocs needed for local syms too.
+		     We really need local syms available to do this
+		     easily.  Oh well.  */
+
+		  asection *s;
+		  void *vpp;
+		  Elf_Internal_Sym *isym;
+
+		  isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+						abfd, r_symndx);
+		  if (isym == NULL)
+		    return FALSE;
+
+		  s = bfd_section_from_elf_index (abfd, isym->st_shndx);
+		  if (s == NULL)
+		    s = sec;
+
+		  vpp = &elf_section_data (s)->local_dynrel;
+		  head = (struct tilegx_elf_dyn_relocs **) vpp;
+		}
+
+	      p = *head;
+	      if (p == NULL || p->sec != sec)
+		{
+		  bfd_size_type amt = sizeof *p;
+		  p = ((struct tilegx_elf_dyn_relocs *)
+		       bfd_alloc (htab->elf.dynobj, amt));
+		  if (p == NULL)
+		    return FALSE;
+		  p->next = *head;
+		  *head = p;
+		  p->sec = sec;
+		  p->count = 0;
+		  p->pc_count = 0;
+		}
+
+	      p->count += 1;
+	      if (tilegx_elf_howto_table[r_type].pc_relative)
+		p->pc_count += 1;
+	    }
+
+	  break;
+
+	case R_TILEGX_GNU_VTINHERIT:
+	  if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+	    return FALSE;
+	  break;
+
+	case R_TILEGX_GNU_VTENTRY:
+	  if (!bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+	    return FALSE;
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+
+asection *
+tilegx_elf_gc_mark_hook (asection *sec,
+			 struct bfd_link_info *info,
+			 Elf_Internal_Rela *rel,
+			 struct elf_link_hash_entry *h,
+			 Elf_Internal_Sym *sym)
+{
+  if (h != NULL)
+    {
+      switch (TILEGX_ELF_R_TYPE (rel->r_info))
+      {
+      case R_TILEGX_GNU_VTINHERIT:
+      case R_TILEGX_GNU_VTENTRY:
+	break;
+      }
+    }
+
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}
+
+/* Update the got entry reference counts for the section being removed.  */
+bfd_boolean
+tilegx_elf_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info,
+			  asection *sec, const Elf_Internal_Rela *relocs)
+{
+  struct tilegx_elf_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_signed_vma *local_got_refcounts;
+  const Elf_Internal_Rela *rel, *relend;
+
+  if (info->relocatable)
+    return TRUE;
+
+  BFD_ASSERT (is_tilegx_elf (abfd) || sec->reloc_count == 0);
+
+  elf_section_data (sec)->local_dynrel = NULL;
+
+  htab = tilegx_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = elf_sym_hashes (abfd);
+  local_got_refcounts = elf_local_got_refcounts (abfd);
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned long r_symndx;
+      unsigned int r_type;
+      struct elf_link_hash_entry *h = NULL;
+
+      r_symndx = TILEGX_ELF_R_SYMNDX (htab, rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+	{
+	  struct tilegx_elf_link_hash_entry *eh;
+	  struct tilegx_elf_dyn_relocs **pp;
+	  struct tilegx_elf_dyn_relocs *p;
+
+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+	  while (h->root.type == bfd_link_hash_indirect
+		 || h->root.type == bfd_link_hash_warning)
+	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+	  eh = (struct tilegx_elf_link_hash_entry *) h;
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
+	    if (p->sec == sec)
+	      {
+		/* Everything must go for SEC.  */
+		*pp = p->next;
+		break;
+	      }
+	}
+
+      r_type = TILEGX_ELF_R_TYPE (rel->r_info);
+
+      switch (r_type)
+	{
+	case R_TILEGX_IMM16_X0_HW0_GOT:
+	case R_TILEGX_IMM16_X1_HW0_GOT:
+	case R_TILEGX_IMM16_X0_HW1_GOT:
+	case R_TILEGX_IMM16_X1_HW1_GOT:
+	case R_TILEGX_IMM16_X0_HW2_GOT:
+	case R_TILEGX_IMM16_X1_HW2_GOT:
+	case R_TILEGX_IMM16_X0_HW3_GOT:
+	case R_TILEGX_IMM16_X1_HW3_GOT:
+	case R_TILEGX_IMM16_X0_HW0_LAST_GOT:
+	case R_TILEGX_IMM16_X1_HW0_LAST_GOT:
+	case R_TILEGX_IMM16_X0_HW1_LAST_GOT:
+	case R_TILEGX_IMM16_X1_HW1_LAST_GOT:
+	case R_TILEGX_IMM16_X0_HW2_LAST_GOT:
+	case R_TILEGX_IMM16_X1_HW2_LAST_GOT:
+	case R_TILEGX_IMM16_X0_HW0_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW0_TLS_GD:
+	case R_TILEGX_IMM16_X0_HW1_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW1_TLS_GD:
+	case R_TILEGX_IMM16_X0_HW2_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW2_TLS_GD:
+	case R_TILEGX_IMM16_X0_HW3_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW3_TLS_GD:
+	case R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
+	case R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
+	case R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD:
+	case R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD:
+	case R_TILEGX_IMM16_X0_HW0_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW0_TLS_IE:
+	case R_TILEGX_IMM16_X0_HW1_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW1_TLS_IE:
+	case R_TILEGX_IMM16_X0_HW2_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW2_TLS_IE:
+	case R_TILEGX_IMM16_X0_HW3_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW3_TLS_IE:
+	case R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE:
+	case R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE:
+	case R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE:
+	case R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE:
+	  if (h != NULL)
+	    {
+	      if (h->got.refcount > 0)
+		h->got.refcount--;
+	    }
+	  else
+	    {
+	      if (local_got_refcounts[r_symndx] > 0)
+		local_got_refcounts[r_symndx]--;
+	    }
+	  break;
+
+        case R_TILEGX_64_PCREL:
+        case R_TILEGX_32_PCREL:
+        case R_TILEGX_16_PCREL:
+        case R_TILEGX_8_PCREL:
+	case R_TILEGX_IMM16_X0_HW0_PCREL:
+	case R_TILEGX_IMM16_X1_HW0_PCREL:
+	case R_TILEGX_IMM16_X0_HW1_PCREL:
+	case R_TILEGX_IMM16_X1_HW1_PCREL:
+	case R_TILEGX_IMM16_X0_HW2_PCREL:
+	case R_TILEGX_IMM16_X1_HW2_PCREL:
+	case R_TILEGX_IMM16_X0_HW3_PCREL:
+	case R_TILEGX_IMM16_X1_HW3_PCREL:
+	case R_TILEGX_IMM16_X0_HW0_LAST_PCREL:
+	case R_TILEGX_IMM16_X1_HW0_LAST_PCREL:
+	case R_TILEGX_IMM16_X0_HW1_LAST_PCREL:
+	case R_TILEGX_IMM16_X1_HW1_LAST_PCREL:
+	case R_TILEGX_IMM16_X0_HW2_LAST_PCREL:
+	case R_TILEGX_IMM16_X1_HW2_LAST_PCREL:
+	  if (h != NULL
+	      && strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
+	    break;
+	  /* Fall through.  */
+
+        case R_TILEGX_64:
+        case R_TILEGX_32:
+        case R_TILEGX_16:
+        case R_TILEGX_8:
+	case R_TILEGX_HW0:
+	case R_TILEGX_HW1:
+	case R_TILEGX_HW2:
+	case R_TILEGX_HW3:
+	case R_TILEGX_HW0_LAST:
+	case R_TILEGX_HW1_LAST:
+	case R_TILEGX_HW2_LAST:
+        case R_TILEGX_COPY:
+        case R_TILEGX_GLOB_DAT:
+        case R_TILEGX_JMP_SLOT:
+        case R_TILEGX_RELATIVE:
+        case R_TILEGX_BROFF_X1:
+        case R_TILEGX_JUMPOFF_X1:
+        case R_TILEGX_IMM8_X0:
+        case R_TILEGX_IMM8_Y0:
+        case R_TILEGX_IMM8_X1:
+        case R_TILEGX_IMM8_Y1:
+        case R_TILEGX_DEST_IMM8_X1:
+        case R_TILEGX_MT_IMM14_X1:
+        case R_TILEGX_MF_IMM14_X1:
+        case R_TILEGX_MMSTART_X0:
+        case R_TILEGX_MMEND_X0:
+        case R_TILEGX_SHAMT_X0:
+        case R_TILEGX_SHAMT_X1:
+        case R_TILEGX_SHAMT_Y0:
+        case R_TILEGX_SHAMT_Y1:
+	case R_TILEGX_IMM16_X0_HW0:
+	case R_TILEGX_IMM16_X1_HW0:
+	case R_TILEGX_IMM16_X0_HW1:
+	case R_TILEGX_IMM16_X1_HW1:
+	case R_TILEGX_IMM16_X0_HW2:
+	case R_TILEGX_IMM16_X1_HW2:
+	case R_TILEGX_IMM16_X0_HW3:
+	case R_TILEGX_IMM16_X1_HW3:
+	case R_TILEGX_IMM16_X0_HW0_LAST:
+	case R_TILEGX_IMM16_X1_HW0_LAST:
+	case R_TILEGX_IMM16_X0_HW1_LAST:
+	case R_TILEGX_IMM16_X1_HW1_LAST:
+	case R_TILEGX_IMM16_X0_HW2_LAST:
+	case R_TILEGX_IMM16_X1_HW2_LAST:
+	  if (info->shared)
+	    break;
+	  /* Fall through.  */
+
+        case R_TILEGX_JUMPOFF_X1_PLT:
+	  if (h != NULL)
+	    {
+	      if (h->plt.refcount > 0)
+		h->plt.refcount--;
+	    }
+	  break;
+
+	default:
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */
+
+bfd_boolean
+tilegx_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+				  struct elf_link_hash_entry *h)
+{
+  struct tilegx_elf_link_hash_table *htab;
+  struct tilegx_elf_link_hash_entry * eh;
+  struct tilegx_elf_dyn_relocs *p;
+  bfd *dynobj;
+  asection *s;
+
+  htab = tilegx_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  dynobj = htab->elf.dynobj;
+
+  /* Make sure we know what is going on here.  */
+  BFD_ASSERT (dynobj != NULL
+	      && (h->needs_plt
+		  || h->u.weakdef != NULL
+		  || (h->def_dynamic
+		      && h->ref_regular
+		      && !h->def_regular)));
+
+  /* If this is a function, put it in the procedure linkage table.  We
+     will fill in the contents of the procedure linkage table later
+     (although we could actually do it here). */
+  if (h->type == STT_FUNC || h->needs_plt)
+    {
+      if (h->plt.refcount <= 0
+	  || SYMBOL_CALLS_LOCAL (info, h)
+	  || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+	      && h->root.type == bfd_link_hash_undefweak))
+	{
+	  /* This case can occur if we saw a R_TILEGX_JUMPOFF_X1_PLT
+             reloc in an input file, but the symbol was never referred
+             to by a dynamic object, or if all references were garbage
+             collected.  In such a case, we don't actually need to build
+             a procedure linkage table, and we can just do a
+             R_TILEGX_JUMPOFF_X1 relocation instead. */
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	}
+
+      return TRUE;
+    }
+  else
+    h->plt.offset = (bfd_vma) -1;
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)
+    {
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+		  || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;
+    }
+
+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  */
+
+  /* If we are creating a shared library, we must presume that the
+     only references to the symbol are via the global offset table.
+     For such cases we need not do anything here; the relocations will
+     be handled correctly by relocate_section.  */
+  if (info->shared)
+    return TRUE;
+
+  /* If there are no references to this symbol that do not use the
+     GOT, we don't need to generate a copy reloc.  */
+  if (!h->non_got_ref)
+    return TRUE;
+
+  /* If -z nocopyreloc was given, we won't generate them either.  */
+  if (info->nocopyreloc)
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  eh = (struct tilegx_elf_link_hash_entry *) h;
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      s = p->sec->output_section;
+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
+	break;
+    }
+
+  /* If we didn't find any dynamic relocs in read-only sections, then
+     we'll be keeping the dynamic relocs and avoiding the copy reloc.  */
+  if (p == NULL)
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  if (h->size == 0)
+    {
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+			     h->root.root.string);
+      return TRUE;
+    }
+
+  /* We must allocate the symbol in our .dynbss section, which will
+     become part of the .bss section of the executable.  There will be
+     an entry for this symbol in the .dynsym section.  The dynamic
+     object will contain position independent code, so all references
+     from the dynamic object to this symbol will go through the global
+     offset table.  The dynamic linker will use the .dynsym entry to
+     determine the address it must put in the global offset table, so
+     both the dynamic object and the regular object will refer to the
+     same memory location for the variable.  */
+
+  /* We must generate a R_TILEGX_COPY reloc to tell the dynamic linker
+     to copy the initial value out of the dynamic object and into the
+     runtime process image.  We need to remember the offset into the
+     .rel.bss section we are going to use.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+    {
+      htab->srelbss->size += TILEGX_ELF_RELA_BYTES (htab);
+      h->needs_copy = 1;
+    }
+
+  return _bfd_elf_adjust_dynamic_copy (h, htab->sdynbss);
+}
+
+/* Allocate space in .plt, .got and associated reloc sections for
+   dynamic relocs.  */
+
+static bfd_boolean
+allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+{
+  struct bfd_link_info *info;
+  struct tilegx_elf_link_hash_table *htab;
+  struct tilegx_elf_link_hash_entry *eh;
+  struct tilegx_elf_dyn_relocs *p;
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
+  info = (struct bfd_link_info *) inf;
+  htab = tilegx_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  if (htab->elf.dynamic_sections_created
+      && h->plt.refcount > 0)
+    {
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info->shared, h))
+	{
+	  asection *s = htab->elf.splt;
+
+	  /* Allocate room for the header and tail.  */
+	  if (s->size == 0)
+	    {
+	      s->size = PLT_HEADER_SIZE + PLT_TAIL_SIZE;
+	    }
+
+          h->plt.offset = s->size - PLT_TAIL_SIZE;
+
+	  /* If this symbol is not defined in a regular file, and we are
+	     not generating a shared library, then set the symbol to this
+	     location in the .plt.  This is required to make function
+	     pointers compare as equal between the normal executable and
+	     the shared library.  */
+	  if (! info->shared
+	      && !h->def_regular)
+	    {
+	      h->root.u.def.section = s;
+	      h->root.u.def.value = h->plt.offset;
+	    }
+
+	  /* Make room for this entry.  */
+	  s->size += PLT_ENTRY_SIZE;
+
+	  /* We also need to make an entry in the .got.plt section.  */
+	  htab->elf.sgotplt->size += GOT_ENTRY_SIZE (htab);
+
+	  /* We also need to make an entry in the .rela.plt section.  */
+	  htab->elf.srelplt->size += TILEGX_ELF_RELA_BYTES (htab);
+	}
+      else
+	{
+	  h->plt.offset = (bfd_vma) -1;
+	  h->needs_plt = 0;
+	}
+    }
+  else
+    {
+      h->plt.offset = (bfd_vma) -1;
+      h->needs_plt = 0;
+    }
+
+  if (h->got.refcount > 0)
+    {
+      asection *s;
+      bfd_boolean dyn;
+      int tls_type = tilegx_elf_hash_entry(h)->tls_type;
+
+      /* Make sure this symbol is output as a dynamic symbol.
+	 Undefined weak syms won't yet be marked as dynamic.  */
+      if (h->dynindx == -1
+	  && !h->forced_local)
+	{
+	  if (! bfd_elf_link_record_dynamic_symbol (info, h))
+	    return FALSE;
+	}
+
+      s = htab->elf.sgot;
+      h->got.offset = s->size;
+      s->size += TILEGX_ELF_WORD_BYTES (htab);
+      /* TLS_GD entries need 2 consecutive GOT slots. */
+      if (tls_type == GOT_TLS_GD)
+        s->size += TILEGX_ELF_WORD_BYTES (htab);
+      dyn = htab->elf.dynamic_sections_created;
+      /* TLS_IE needs one dynamic relocation,
+         TLS_GD needs two if local symbol and two if global.  */
+      if (tls_type == GOT_TLS_GD || tls_type == GOT_TLS_IE)
+	htab->elf.srelgot->size += 2 * TILEGX_ELF_RELA_BYTES (htab);
+      else if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h))
+	htab->elf.srelgot->size += TILEGX_ELF_RELA_BYTES (htab);
+    }
+  else
+    h->got.offset = (bfd_vma) -1;
+
+  eh = (struct tilegx_elf_link_hash_entry *) h;
+  if (eh->dyn_relocs == NULL)
+    return TRUE;
+
+  /* In the shared -Bsymbolic case, discard space allocated for
+     dynamic pc-relative relocs against symbols which turn out to be
+     defined in regular objects.  For the normal shared case, discard
+     space for pc-relative relocs that have become local due to symbol
+     visibility changes.  */
+
+  if (info->shared)
+    {
+      if (SYMBOL_CALLS_LOCAL (info, h))
+	{
+	  struct tilegx_elf_dyn_relocs **pp;
+
+	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+	    {
+	      p->count -= p->pc_count;
+	      p->pc_count = 0;
+	      if (p->count == 0)
+		*pp = p->next;
+	      else
+		pp = &p->next;
+	    }
+	}
+
+      /* Also discard relocs on undefined weak syms with non-default
+	 visibility.  */
+      if (eh->dyn_relocs != NULL
+	  && h->root.type == bfd_link_hash_undefweak)
+	{
+	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+	    eh->dyn_relocs = NULL;
+
+	  /* Make sure undefined weak symbols are output as a dynamic
+	     symbol in PIEs.  */
+	  else if (h->dynindx == -1
+		   && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+	}
+    }
+  else
+    {
+      /* For the non-shared case, discard space for relocs against
+	 symbols which turn out to need copy relocs or are not
+	 dynamic.  */
+
+      if (!h->non_got_ref
+	  && ((h->def_dynamic
+	       && !h->def_regular)
+	      || (htab->elf.dynamic_sections_created
+		  && (h->root.type == bfd_link_hash_undefweak
+		      || h->root.type == bfd_link_hash_undefined))))
+	{
+	  /* Make sure this symbol is output as a dynamic symbol.
+	     Undefined weak syms won't yet be marked as dynamic.  */
+	  if (h->dynindx == -1
+	      && !h->forced_local)
+	    {
+	      if (! bfd_elf_link_record_dynamic_symbol (info, h))
+		return FALSE;
+	    }
+
+	  /* If that succeeded, we know we'll be keeping all the
+	     relocs.  */
+	  if (h->dynindx != -1)
+	    goto keep;
+	}
+
+      eh->dyn_relocs = NULL;
+
+    keep: ;
+    }
+
+  /* Finally, allocate space.  */
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *sreloc = elf_section_data (p->sec)->sreloc;
+      sreloc->size += p->count * TILEGX_ELF_RELA_BYTES (htab);
+    }
+
+  return TRUE;
+}
+
+/* Find any dynamic relocs that apply to read-only sections.  */
+
+static bfd_boolean
+readonly_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+{
+  struct tilegx_elf_link_hash_entry *eh;
+  struct tilegx_elf_dyn_relocs *p;
+
+  eh = (struct tilegx_elf_link_hash_entry *) h;
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *s = p->sec->output_section;
+
+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
+	{
+	  struct bfd_link_info *info = (struct bfd_link_info *) inf;
+
+	  info->flags |= DF_TEXTREL;
+
+	  /* Not an error, just cut short the traversal.  */
+	  return FALSE;
+	}
+    }
+  return TRUE;
+}
+
+/* Return true if the dynamic symbol for a given section should be
+   omitted when creating a shared library.  */
+
+bfd_boolean
+tilegx_elf_omit_section_dynsym (bfd *output_bfd,
+				struct bfd_link_info *info,
+				asection *p)
+{
+  /* We keep the .got section symbol so that explicit relocations
+     against the _GLOBAL_OFFSET_TABLE_ symbol emitted in PIC mode
+     can be turned into relocations against the .got symbol.  */
+  if (strcmp (p->name, ".got") == 0)
+    return FALSE;
+
+  return _bfd_elf_link_omit_section_dynsym (output_bfd, info, p);
+}
+
+bfd_boolean
+tilegx_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+				  struct bfd_link_info *info)
+{
+  struct tilegx_elf_link_hash_table *htab;
+  bfd *dynobj;
+  asection *s;
+  bfd *ibfd;
+
+  htab = tilegx_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+  dynobj = htab->elf.dynobj;
+  BFD_ASSERT (dynobj != NULL);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (info->executable)
+	{
+	  s = bfd_get_section_by_name (dynobj, ".interp");
+	  BFD_ASSERT (s != NULL);
+	  s->size = strlen (htab->dynamic_interpreter) + 1;
+	  s->contents = (unsigned char *) htab->dynamic_interpreter;
+	}
+    }
+
+  /* Set up .got offsets for local syms, and space for local dynamic
+     relocs.  */
+  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+    {
+      bfd_signed_vma *local_got;
+      bfd_signed_vma *end_local_got;
+      char *local_tls_type;
+      bfd_size_type locsymcount;
+      Elf_Internal_Shdr *symtab_hdr;
+      asection *srel;
+
+      if (! is_tilegx_elf (ibfd))
+	continue;
+
+      for (s = ibfd->sections; s != NULL; s = s->next)
+	{
+	  struct tilegx_elf_dyn_relocs *p;
+
+	  for (p = elf_section_data (s)->local_dynrel; p != NULL; p = p->next)
+	    {
+	      if (!bfd_is_abs_section (p->sec)
+		  && bfd_is_abs_section (p->sec->output_section))
+		{
+		  /* Input section has been discarded, either because
+		     it is a copy of a linkonce section or due to
+		     linker script /DISCARD/, so we'll be discarding
+		     the relocs too.  */
+		}
+	      else if (p->count != 0)
+		{
+		  srel = elf_section_data (p->sec)->sreloc;
+		  srel->size += p->count * TILEGX_ELF_RELA_BYTES (htab);
+		  if ((p->sec->output_section->flags & SEC_READONLY) != 0)
+		    info->flags |= DF_TEXTREL;
+		}
+	    }
+	}
+
+      local_got = elf_local_got_refcounts (ibfd);
+      if (!local_got)
+	continue;
+
+      symtab_hdr = &elf_symtab_hdr (ibfd);
+      locsymcount = symtab_hdr->sh_info;
+      end_local_got = local_got + locsymcount;
+      local_tls_type = _bfd_tilegx_elf_local_got_tls_type (ibfd);
+      s = htab->elf.sgot;
+      srel = htab->elf.srelgot;
+      for (; local_got < end_local_got; ++local_got, ++local_tls_type)
+	{
+	  if (*local_got > 0)
+	    {
+	      *local_got = s->size;
+	      s->size += TILEGX_ELF_WORD_BYTES (htab);
+              if (*local_tls_type == GOT_TLS_GD)
+                s->size += TILEGX_ELF_WORD_BYTES (htab);
+              if (info->shared
+                  || *local_tls_type == GOT_TLS_GD
+                  || *local_tls_type == GOT_TLS_IE)
+		srel->size += TILEGX_ELF_RELA_BYTES (htab);
+	    }
+	  else
+	    *local_got = (bfd_vma) -1;
+	}
+    }
+
+  /* Allocate global sym .plt and .got entries, and space for global
+     sym dynamic relocs.  */
+  elf_link_hash_traverse (&htab->elf, allocate_dynrelocs, info);
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* If the .got section is more than 0x8000 bytes, we add
+	 0x8000 to the value of _GLOBAL_OFFSET_TABLE_, so that 16
+	 bit relocations have a greater chance of working. */
+      if (htab->elf.sgot->size >= 0x8000
+	  && elf_hash_table (info)->hgot->root.u.def.value == 0)
+	elf_hash_table (info)->hgot->root.u.def.value = 0x8000;
+    }
+
+  if (htab->elf.sgotplt)
+    {
+      struct elf_link_hash_entry *got;
+      got = elf_link_hash_lookup (elf_hash_table (info),
+				  "_GLOBAL_OFFSET_TABLE_",
+				  FALSE, FALSE, FALSE);
+
+      /* Don't allocate .got.plt section if there are no GOT nor PLT
+         entries and there is no refeence to _GLOBAL_OFFSET_TABLE_.  */
+      if ((got == NULL
+	   || !got->ref_regular_nonweak)
+	  && (htab->elf.sgotplt->size
+	      == (unsigned)GOTPLT_HEADER_SIZE (htab))
+	  && (htab->elf.splt == NULL
+	      || htab->elf.splt->size == 0)
+	  && (htab->elf.sgot == NULL
+	      || (htab->elf.sgot->size
+		  == get_elf_backend_data (output_bfd)->got_header_size)))
+	htab->elf.sgotplt->size = 0;
+    }
+
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      if ((s->flags & SEC_LINKER_CREATED) == 0)
+	continue;
+
+      if (s == htab->elf.splt
+	  || s == htab->elf.sgot
+	  || s == htab->elf.sgotplt
+	  || s == htab->sdynbss)
+	{
+	  /* Strip this section if we don't need it; see the
+	     comment below.  */
+	}
+      else if (strncmp (s->name, ".rela", 5) == 0)
+	{
+	  if (s->size != 0)
+	    {
+	      /* We use the reloc_count field as a counter if we need
+		 to copy relocs into the output file.  */
+	      s->reloc_count = 0;
+	    }
+	}
+      else
+	{
+	  /* It's not one of our sections.  */
+	  continue;
+	}
+
+      if (s->size == 0)
+	{
+	  /* If we don't need this section, strip it from the
+	     output file.  This is mostly to handle .rela.bss and
+	     .rela.plt.  We must create both sections in
+	     create_dynamic_sections, because they must be created
+	     before the linker maps input sections to output
+	     sections.  The linker does that before
+	     adjust_dynamic_symbol is called, and it is that
+	     function which decides whether anything needs to go
+	     into these sections.  */
+	  s->flags |= SEC_EXCLUDE;
+	  continue;
+	}
+
+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+	continue;
+
+      /* Allocate memory for the section contents.  Zero the memory
+	 for the benefit of .rela.plt, which has 4 unused entries
+	 at the beginning, and we don't want garbage.  */
+      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+	 values later, in tilegx_elf_finish_dynamic_sections, but we
+	 must add the entries now so that we get the correct size for
+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
+	 dynamic linker and used by the debugger.  */
+#define add_dynamic_entry(TAG, VAL) \
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (info->executable)
+	{
+	  if (!add_dynamic_entry (DT_DEBUG, 0))
+	    return FALSE;
+	}
+
+      if (htab->elf.srelplt->size != 0)
+	{
+	  if (!add_dynamic_entry (DT_PLTGOT, 0)
+	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
+	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+	      || !add_dynamic_entry (DT_JMPREL, 0))
+	    return FALSE;
+	}
+
+      if (!add_dynamic_entry (DT_RELA, 0)
+	  || !add_dynamic_entry (DT_RELASZ, 0)
+	  || !add_dynamic_entry (DT_RELAENT, TILEGX_ELF_RELA_BYTES (htab)))
+	return FALSE;
+
+      /* If any dynamic relocs apply to a read-only section,
+	 then we need a DT_TEXTREL entry.  */
+      if ((info->flags & DF_TEXTREL) == 0)
+	elf_link_hash_traverse (&htab->elf, readonly_dynrelocs, info);
+
+      if (info->flags & DF_TEXTREL)
+	{
+	  if (!add_dynamic_entry (DT_TEXTREL, 0))
+	    return FALSE;
+	}
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+/* Return the base VMA address which should be subtracted from real addresses
+   when resolving @dtpoff relocation.
+   This is PT_TLS segment p_vaddr.  */
+
+static bfd_vma
+dtpoff_base (struct bfd_link_info *info)
+{
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (elf_hash_table (info)->tls_sec == NULL)
+    return 0;
+  return elf_hash_table (info)->tls_sec->vma;
+}
+
+/* Return the relocation value for @tpoff relocation. */
+
+static bfd_vma
+tpoff (struct bfd_link_info *info, bfd_vma address)
+{
+  struct elf_link_hash_table *htab = elf_hash_table (info);
+
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (htab->tls_sec == NULL)
+    return 0;
+
+  return (address - htab->tls_sec->vma);
+}
+
+/* Relocate an TILEGX ELF section.
+
+   The RELOCATE_SECTION function is called by the new ELF backend linker
+   to handle the relocations for a section.
+
+   The relocs are always passed as Rela structures.
+
+   This function is responsible for adjusting the section contents as
+   necessary, and (if generating a relocatable output file) adjusting
+   the reloc addend as necessary.
+
+   This function does not have to worry about setting the reloc
+   address or the reloc symbol index.
+
+   LOCAL_SYMS is a pointer to the swapped in local symbols.
+
+   LOCAL_SECTIONS is an array giving the section in the input file
+   corresponding to the st_shndx field of each local symbol.
+
+   The global hash table entry for the global symbols can be found
+   via elf_sym_hashes (input_bfd).
+
+   When generating relocatable output, this function must handle
+   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
+   going to be the section symbol corresponding to the output
+   section, which means that the addend must be adjusted
+   accordingly.  */
+
+bfd_boolean
+tilegx_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
+			     bfd *input_bfd, asection *input_section,
+			     bfd_byte *contents, Elf_Internal_Rela *relocs,
+			     Elf_Internal_Sym *local_syms,
+			     asection **local_sections)
+{
+  struct tilegx_elf_link_hash_table *htab;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  bfd_vma *local_got_offsets;
+  bfd_vma got_base;
+  asection *sreloc;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  int num_relocs;
+
+  htab = tilegx_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+  symtab_hdr = &elf_symtab_hdr (input_bfd);
+  sym_hashes = elf_sym_hashes (input_bfd);
+  local_got_offsets = elf_local_got_offsets (input_bfd);
+
+  if (elf_hash_table (info)->hgot == NULL)
+    got_base = 0;
+  else
+    got_base = elf_hash_table (info)->hgot->root.u.def.value;
+
+  sreloc = elf_section_data (input_section)->sreloc;
+
+  rel = relocs;
+  num_relocs = input_section->reloc_count;
+  relend = relocs + num_relocs;
+  for (; rel < relend; rel++)
+    {
+      int r_type, tls_type;
+      reloc_howto_type *howto;
+      unsigned long r_symndx;
+      struct elf_link_hash_entry *h;
+      Elf_Internal_Sym *sym;
+      tilegx_create_func create_func;
+      asection *sec;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+      const char *name;
+      bfd_vma off;
+      bfd_boolean is_plt = FALSE;
+
+      bfd_boolean unresolved_reloc;
+
+      r_type = TILEGX_ELF_R_TYPE (rel->r_info);
+      if (r_type == R_TILEGX_GNU_VTINHERIT
+	  || r_type == R_TILEGX_GNU_VTENTRY)
+	continue;
+
+      if ((unsigned int)r_type >= ARRAY_SIZE (tilegx_elf_howto_table))
+	{
+          /* Not clear if we need to check here, but just be paranoid. */
+	  (*_bfd_error_handler)
+	    (_("%B: unrecognized relocation (0x%x) in section `%A'"),
+	     input_bfd, r_type, input_section);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      howto = tilegx_elf_howto_table + r_type;
+
+      /* This is a final link.  */
+      r_symndx = TILEGX_ELF_R_SYMNDX (htab, rel->r_info);
+      h = NULL;
+      sym = NULL;
+      sec = NULL;
+      unresolved_reloc = FALSE;
+      if (r_symndx < symtab_hdr->sh_info)
+	{
+	  sym = local_syms + r_symndx;
+	  sec = local_sections[r_symndx];
+	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
+	}
+      else
+	{
+	  bfd_boolean warned;
+
+	  RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+				   r_symndx, symtab_hdr, sym_hashes,
+				   h, sec, relocation,
+				   unresolved_reloc, warned);
+	  if (warned)
+	    {
+	      /* To avoid generating warning messages about truncated
+		 relocations, set the relocation's address to be the same as
+		 the start of this section.  */
+	      if (input_section->output_section != NULL)
+		relocation = input_section->output_section->vma;
+	      else
+		relocation = 0;
+	    }
+	}
+
+      if (sec != NULL && elf_discarded_section (sec))
+	RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+					 rel, relend, howto, contents);
+
+      if (info->relocatable)
+	continue;
+
+      if (h != NULL)
+	name = h->root.root.string;
+      else
+	{
+	  name = (bfd_elf_string_from_elf_section
+		  (input_bfd, symtab_hdr->sh_link, sym->st_name));
+	  if (name == NULL || *name == '\0')
+	    name = bfd_section_name (input_bfd, sec);
+	}
+
+      switch (r_type)
+	{
+	case R_TILEGX_IMM16_X0_HW0_GOT:
+	case R_TILEGX_IMM16_X1_HW0_GOT:
+	case R_TILEGX_IMM16_X0_HW1_GOT:
+	case R_TILEGX_IMM16_X1_HW1_GOT:
+	case R_TILEGX_IMM16_X0_HW2_GOT:
+	case R_TILEGX_IMM16_X1_HW2_GOT:
+	case R_TILEGX_IMM16_X0_HW3_GOT:
+	case R_TILEGX_IMM16_X1_HW3_GOT:
+	case R_TILEGX_IMM16_X0_HW0_LAST_GOT:
+	case R_TILEGX_IMM16_X1_HW0_LAST_GOT:
+	case R_TILEGX_IMM16_X0_HW1_LAST_GOT:
+	case R_TILEGX_IMM16_X1_HW1_LAST_GOT:
+	case R_TILEGX_IMM16_X0_HW2_LAST_GOT:
+	case R_TILEGX_IMM16_X1_HW2_LAST_GOT:
+	  /* Relocation is to the entry for this symbol in the global
+	     offset table.  */
+	  if (htab->elf.sgot == NULL)
+	    abort ();
+
+	  if (h != NULL)
+	    {
+	      bfd_boolean dyn;
+
+	      off = h->got.offset;
+	      BFD_ASSERT (off != (bfd_vma) -1);
+	      dyn = elf_hash_table (info)->dynamic_sections_created;
+
+	      if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+		  || (info->shared
+		      && SYMBOL_REFERENCES_LOCAL (info, h)))
+		{
+		  /* This is actually a static link, or it is a
+		     -Bsymbolic link and the symbol is defined
+		     locally, or the symbol was forced to be local
+		     because of a version file.  We must initialize
+		     this entry in the global offset table.  Since the
+		     offset must always be a multiple
+		     of 8 for 64-bit, we use the least significant bit
+		     to record whether we have initialized it already.
+
+		     When doing a dynamic link, we create a .rela.got
+		     relocation entry to initialize the value.  This
+		     is done in the finish_dynamic_symbol routine.  */
+		  if ((off & 1) != 0)
+		    off &= ~1;
+		  else
+		    {
+		      TILEGX_ELF_PUT_WORD (htab, output_bfd, relocation,
+					   htab->elf.sgot->contents + off);
+		      h->got.offset |= 1;
+		    }
+		}
+	      else
+		unresolved_reloc = FALSE;
+	    }
+	  else
+	    {
+	      BFD_ASSERT (local_got_offsets != NULL
+			  && local_got_offsets[r_symndx] != (bfd_vma) -1);
+
+	      off = local_got_offsets[r_symndx];
+
+	      /* The offset must always be a multiple of 8 on 64-bit.
+                 We use the least significant bit to record
+		 whether we have already processed this entry.  */
+	      if ((off & 1) != 0)
+		off &= ~1;
+	      else
+		{
+		  if (info->shared)
+		    {
+		      asection *s;
+		      Elf_Internal_Rela outrel;
+
+		      /* We need to generate a R_TILEGX_RELATIVE reloc
+			 for the dynamic linker.  */
+		      s = htab->elf.srelgot;
+		      BFD_ASSERT (s != NULL);
+
+		      outrel.r_offset = (htab->elf.sgot->output_section->vma
+					 + htab->elf.sgot->output_offset
+					 + off);
+		      outrel.r_info =
+			TILEGX_ELF_R_INFO (htab, NULL, 0, R_TILEGX_RELATIVE);
+		      outrel.r_addend = relocation;
+		      relocation = 0;
+		      tilegx_elf_append_rela (output_bfd, s, &outrel);
+		    }
+
+		  TILEGX_ELF_PUT_WORD (htab, output_bfd, relocation,
+				       htab->elf.sgot->contents + off);
+		  local_got_offsets[r_symndx] |= 1;
+		}
+	    }
+	  relocation = htab->elf.sgot->output_offset + off - got_base;
+	  break;
+
+        case R_TILEGX_JUMPOFF_X1_PLT:
+	  /* Relocation is to the entry for this symbol in the
+	     procedure linkage table.  */
+          BFD_ASSERT (h != NULL);
+
+	  if (h->plt.offset == (bfd_vma) -1 || htab->elf.splt == NULL)
+	    {
+	      /* We didn't make a PLT entry for this symbol.  This
+		 happens when statically linking PIC code, or when
+		 using -Bsymbolic.  */
+	      break;
+	    }
+
+	  relocation = (htab->elf.splt->output_section->vma
+			+ htab->elf.splt->output_offset
+			+ h->plt.offset);
+	  unresolved_reloc = FALSE;
+	  break;
+
+        case R_TILEGX_64_PCREL:
+        case R_TILEGX_32_PCREL:
+        case R_TILEGX_16_PCREL:
+        case R_TILEGX_8_PCREL:
+	case R_TILEGX_IMM16_X0_HW0_PCREL:
+	case R_TILEGX_IMM16_X1_HW0_PCREL:
+	case R_TILEGX_IMM16_X0_HW1_PCREL:
+	case R_TILEGX_IMM16_X1_HW1_PCREL:
+	case R_TILEGX_IMM16_X0_HW2_PCREL:
+	case R_TILEGX_IMM16_X1_HW2_PCREL:
+	case R_TILEGX_IMM16_X0_HW3_PCREL:
+	case R_TILEGX_IMM16_X1_HW3_PCREL:
+	case R_TILEGX_IMM16_X0_HW0_LAST_PCREL:
+	case R_TILEGX_IMM16_X1_HW0_LAST_PCREL:
+	case R_TILEGX_IMM16_X0_HW1_LAST_PCREL:
+	case R_TILEGX_IMM16_X1_HW1_LAST_PCREL:
+	case R_TILEGX_IMM16_X0_HW2_LAST_PCREL:
+	case R_TILEGX_IMM16_X1_HW2_LAST_PCREL:
+	  if (h != NULL
+	      && strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
+	    break;
+	  /* Fall through.  */
+        case R_TILEGX_64:
+        case R_TILEGX_32:
+        case R_TILEGX_16:
+        case R_TILEGX_8:
+	case R_TILEGX_HW0:
+	case R_TILEGX_HW1:
+	case R_TILEGX_HW2:
+	case R_TILEGX_HW3:
+	case R_TILEGX_HW0_LAST:
+	case R_TILEGX_HW1_LAST:
+	case R_TILEGX_HW2_LAST:
+        case R_TILEGX_COPY:
+        case R_TILEGX_GLOB_DAT:
+        case R_TILEGX_JMP_SLOT:
+        case R_TILEGX_RELATIVE:
+        case R_TILEGX_BROFF_X1:
+        case R_TILEGX_JUMPOFF_X1:
+        case R_TILEGX_IMM8_X0:
+        case R_TILEGX_IMM8_Y0:
+        case R_TILEGX_IMM8_X1:
+        case R_TILEGX_IMM8_Y1:
+        case R_TILEGX_DEST_IMM8_X1:
+        case R_TILEGX_MT_IMM14_X1:
+        case R_TILEGX_MF_IMM14_X1:
+        case R_TILEGX_MMSTART_X0:
+        case R_TILEGX_MMEND_X0:
+        case R_TILEGX_SHAMT_X0:
+        case R_TILEGX_SHAMT_X1:
+        case R_TILEGX_SHAMT_Y0:
+        case R_TILEGX_SHAMT_Y1:
+	case R_TILEGX_IMM16_X0_HW0:
+	case R_TILEGX_IMM16_X1_HW0:
+	case R_TILEGX_IMM16_X0_HW1:
+	case R_TILEGX_IMM16_X1_HW1:
+	case R_TILEGX_IMM16_X0_HW2:
+	case R_TILEGX_IMM16_X1_HW2:
+	case R_TILEGX_IMM16_X0_HW3:
+	case R_TILEGX_IMM16_X1_HW3:
+	case R_TILEGX_IMM16_X0_HW0_LAST:
+	case R_TILEGX_IMM16_X1_HW0_LAST:
+	case R_TILEGX_IMM16_X0_HW1_LAST:
+	case R_TILEGX_IMM16_X1_HW1_LAST:
+	case R_TILEGX_IMM16_X0_HW2_LAST:
+	case R_TILEGX_IMM16_X1_HW2_LAST:
+	  if ((input_section->flags & SEC_ALLOC) == 0)
+	    break;
+
+	  if ((info->shared
+	       && (h == NULL
+		   || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		   || h->root.type != bfd_link_hash_undefweak)
+	       && (! howto->pc_relative
+		   || !SYMBOL_CALLS_LOCAL (info, h)))
+	      || (!info->shared
+		  && h != NULL
+		  && h->dynindx != -1
+		  && !h->non_got_ref
+		  && ((h->def_dynamic
+		       && !h->def_regular)
+		      || h->root.type == bfd_link_hash_undefweak
+		      || h->root.type == bfd_link_hash_undefined)))
+	    {
+	      Elf_Internal_Rela outrel;
+	      bfd_boolean skip, relocate = FALSE;
+
+	      /* When generating a shared object, these relocations
+		 are copied into the output file to be resolved at run
+		 time.  */
+
+	      BFD_ASSERT (sreloc != NULL);
+
+	      skip = FALSE;
+
+	      outrel.r_offset =
+		_bfd_elf_section_offset (output_bfd, info, input_section,
+					 rel->r_offset);
+	      if (outrel.r_offset == (bfd_vma) -1)
+		skip = TRUE;
+	      else if (outrel.r_offset == (bfd_vma) -2)
+		skip = TRUE, relocate = TRUE;
+	      outrel.r_offset += (input_section->output_section->vma
+				  + input_section->output_offset);
+
+	      switch (r_type)
+		{
+                case R_TILEGX_64_PCREL:
+                case R_TILEGX_32_PCREL:
+                case R_TILEGX_16_PCREL:
+                case R_TILEGX_8_PCREL:
+		  /* If the symbol is not dynamic, we should not keep
+		     a dynamic relocation.  But an .rela.* slot has been
+		     allocated for it, output R_TILEGX_NONE.
+		     FIXME: Add code tracking needed dynamic relocs as
+		     e.g. i386 has.  */
+		  if (h->dynindx == -1)
+		    skip = TRUE, relocate = TRUE;
+		  break;
+		}
+
+	      if (skip)
+		memset (&outrel, 0, sizeof outrel);
+	      /* h->dynindx may be -1 if the symbol was marked to
+		 become local.  */
+	      else if (h != NULL &&
+		       h->dynindx != -1
+		       && (! is_plt
+			   || !info->shared
+			   || !SYMBOLIC_BIND (info, h)
+			   || !h->def_regular))
+		{
+		  BFD_ASSERT (h->dynindx != -1);
+		  outrel.r_info = TILEGX_ELF_R_INFO (htab, rel, h->dynindx, r_type);
+		  outrel.r_addend = rel->r_addend;
+		}
+	      else
+		{
+		  if (r_type == R_TILEGX_32 || r_type == R_TILEGX_64)
+		    {
+		      outrel.r_info = TILEGX_ELF_R_INFO (htab, NULL, 0,
+							 R_TILEGX_RELATIVE);
+		      outrel.r_addend = relocation + rel->r_addend;
+		    }
+		  else
+		    {
+		      long indx;
+
+		      outrel.r_addend = relocation + rel->r_addend;
+
+		      if (is_plt)
+			sec = htab->elf.splt;
+
+		      if (bfd_is_abs_section (sec))
+			indx = 0;
+		      else if (sec == NULL || sec->owner == NULL)
+			{
+			  bfd_set_error (bfd_error_bad_value);
+			  return FALSE;
+			}
+		      else
+			{
+			  asection *osec;
+
+			  /* We are turning this relocation into one
+			     against a section symbol.  It would be
+			     proper to subtract the symbol's value,
+			     osec->vma, from the emitted reloc addend,
+			     but ld.so expects buggy relocs.  */
+			  osec = sec->output_section;
+			  indx = elf_section_data (osec)->dynindx;
+
+			  if (indx == 0)
+			    {
+			      osec = htab->elf.text_index_section;
+			      indx = elf_section_data (osec)->dynindx;
+			    }
+
+			  /* FIXME: we really should be able to link non-pic
+			     shared libraries.  */
+			  if (indx == 0)
+			    {
+			      BFD_FAIL ();
+			      (*_bfd_error_handler)
+				(_("%B: probably compiled without -fPIC?"),
+				 input_bfd);
+			      bfd_set_error (bfd_error_bad_value);
+			      return FALSE;
+			    }
+			}
+
+		      outrel.r_info = TILEGX_ELF_R_INFO (htab, rel, indx,
+							 r_type);
+		    }
+		}
+
+	      tilegx_elf_append_rela (output_bfd, sreloc, &outrel);
+
+	      /* This reloc will be computed at runtime, so there's no
+		 need to do anything now.  */
+	      if (! relocate)
+		continue;
+	    }
+	  break;
+
+        case R_TILEGX_IMM16_X0_HW0_TLS_GD:
+        case R_TILEGX_IMM16_X1_HW0_TLS_GD:
+        case R_TILEGX_IMM16_X0_HW1_TLS_GD:
+        case R_TILEGX_IMM16_X1_HW1_TLS_GD:
+        case R_TILEGX_IMM16_X0_HW2_TLS_GD:
+        case R_TILEGX_IMM16_X1_HW2_TLS_GD:
+        case R_TILEGX_IMM16_X0_HW3_TLS_GD:
+        case R_TILEGX_IMM16_X1_HW3_TLS_GD:
+        case R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
+        case R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
+        case R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
+        case R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
+        case R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD:
+        case R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD:
+          tls_type = GOT_TLS_GD;
+          goto have_tls_reference;
+
+        case R_TILEGX_IMM16_X0_HW0_TLS_IE:
+        case R_TILEGX_IMM16_X1_HW0_TLS_IE:
+        case R_TILEGX_IMM16_X0_HW1_TLS_IE:
+        case R_TILEGX_IMM16_X1_HW1_TLS_IE:
+        case R_TILEGX_IMM16_X0_HW2_TLS_IE:
+        case R_TILEGX_IMM16_X1_HW2_TLS_IE:
+        case R_TILEGX_IMM16_X0_HW3_TLS_IE:
+        case R_TILEGX_IMM16_X1_HW3_TLS_IE:
+        case R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE:
+        case R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE:
+        case R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE:
+        case R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE:
+        case R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE:
+        case R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE:
+          tls_type = GOT_TLS_IE;
+          /* Fall through. */
+
+        have_tls_reference:
+	  if (h == NULL && local_got_offsets)
+	    tls_type = _bfd_tilegx_elf_local_got_tls_type (input_bfd) [r_symndx];
+	  else if (h != NULL)
+	    tls_type = tilegx_elf_hash_entry(h)->tls_type;
+
+	  if (tls_type == GOT_TLS_IE)
+	    switch (r_type)
+	      {
+              case R_TILEGX_IMM16_X0_HW0_TLS_GD:
+                r_type = R_TILEGX_IMM16_X0_HW0_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X1_HW0_TLS_GD:
+                r_type = R_TILEGX_IMM16_X1_HW0_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X0_HW1_TLS_GD:
+                r_type = R_TILEGX_IMM16_X0_HW1_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X1_HW1_TLS_GD:
+                r_type = R_TILEGX_IMM16_X1_HW1_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X0_HW2_TLS_GD:
+                r_type = R_TILEGX_IMM16_X0_HW2_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X1_HW2_TLS_GD:
+                r_type = R_TILEGX_IMM16_X1_HW2_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X0_HW3_TLS_GD:
+                r_type = R_TILEGX_IMM16_X0_HW3_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X1_HW3_TLS_GD:
+                r_type = R_TILEGX_IMM16_X1_HW3_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
+                r_type = R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
+                r_type = R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
+                r_type = R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
+                r_type = R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD:
+                r_type = R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE;
+                break;
+              case R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD:
+                r_type = R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE;
+                break;
+	      }
+
+	  if (h != NULL)
+	    {
+	      off = h->got.offset;
+	      h->got.offset |= 1;
+	    }
+	  else
+	    {
+	      BFD_ASSERT (local_got_offsets != NULL);
+	      off = local_got_offsets[r_symndx];
+	      local_got_offsets[r_symndx] |= 1;
+	    }
+
+	  if (htab->elf.sgot == NULL)
+	    abort ();
+
+	  if ((off & 1) != 0)
+	    off &= ~1;
+	  else
+	    {
+	      Elf_Internal_Rela outrel;
+	      int indx = 0;
+	      bfd_boolean need_relocs = FALSE;
+
+	      if (htab->elf.srelgot == NULL)
+		abort ();
+
+	      if (h != NULL)
+	      {
+	        bfd_boolean dyn;
+	        dyn = htab->elf.dynamic_sections_created;
+
+		if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+		    && (!info->shared
+			|| !SYMBOL_REFERENCES_LOCAL (info, h)))
+		  {
+		    indx = h->dynindx;
+		  }
+	      }
+
+	      /* The GOT entries have not been initialized yet.  Do it
+	         now, and emit any relocations. */
+	      if ((info->shared || indx != 0)
+		  && (h == NULL
+		      || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+		      || h->root.type != bfd_link_hash_undefweak))
+		    need_relocs = TRUE;
+
+              switch (r_type)
+                {
+		  case R_TILEGX_IMM16_X0_HW0_TLS_IE:
+		  case R_TILEGX_IMM16_X1_HW0_TLS_IE:
+		  case R_TILEGX_IMM16_X0_HW1_TLS_IE:
+		  case R_TILEGX_IMM16_X1_HW1_TLS_IE:
+		  case R_TILEGX_IMM16_X0_HW2_TLS_IE:
+		  case R_TILEGX_IMM16_X1_HW2_TLS_IE:
+		  case R_TILEGX_IMM16_X0_HW3_TLS_IE:
+		  case R_TILEGX_IMM16_X1_HW3_TLS_IE:
+		  case R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE:
+		  case R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE:
+		  case R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE:
+		  case R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE:
+		  case R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE:
+		  case R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE:
+		    if (need_relocs) {
+		      TILEGX_ELF_PUT_WORD (htab, output_bfd, 0,
+					   htab->elf.sgot->contents + off);
+	              outrel.r_offset = (htab->elf.sgot->output_section->vma
+				       + htab->elf.sgot->output_offset + off);
+	              outrel.r_addend = 0;
+		      if (indx == 0)
+		        outrel.r_addend = relocation - dtpoff_base (info);
+		      outrel.r_info = TILEGX_ELF_R_INFO (htab, NULL, indx,
+							 TILEGX_ELF_TPOFF_RELOC (htab));
+		      tilegx_elf_append_rela (output_bfd, htab->elf.srelgot, &outrel);
+                    } else {
+		      TILEGX_ELF_PUT_WORD (htab, output_bfd,
+					   tpoff (info, relocation),
+					   htab->elf.sgot->contents + off);
+                    }
+                    break;
+
+		  case R_TILEGX_IMM16_X0_HW0_TLS_GD:
+		  case R_TILEGX_IMM16_X1_HW0_TLS_GD:
+		  case R_TILEGX_IMM16_X0_HW1_TLS_GD:
+		  case R_TILEGX_IMM16_X1_HW1_TLS_GD:
+		  case R_TILEGX_IMM16_X0_HW2_TLS_GD:
+		  case R_TILEGX_IMM16_X1_HW2_TLS_GD:
+		  case R_TILEGX_IMM16_X0_HW3_TLS_GD:
+		  case R_TILEGX_IMM16_X1_HW3_TLS_GD:
+		  case R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
+		  case R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
+		  case R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
+		  case R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
+		  case R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD:
+		  case R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD:
+		    if (need_relocs) {
+ 	              outrel.r_offset = (htab->elf.sgot->output_section->vma
+				       + htab->elf.sgot->output_offset + off);
+	              outrel.r_addend = 0;
+	              outrel.r_info = TILEGX_ELF_R_INFO (htab, NULL, indx,
+							 TILEGX_ELF_DTPMOD_RELOC (htab));
+		      TILEGX_ELF_PUT_WORD (htab, output_bfd, 0,
+					   htab->elf.sgot->contents + off);
+	              tilegx_elf_append_rela (output_bfd, htab->elf.srelgot, &outrel);
+		      if (indx == 0)
+		        {
+		      	  BFD_ASSERT (! unresolved_reloc);
+			  TILEGX_ELF_PUT_WORD (htab, output_bfd,
+					       relocation - dtpoff_base (info),
+					       (htab->elf.sgot->contents + off +
+						TILEGX_ELF_WORD_BYTES (htab)));
+		        }
+		      else
+		        {
+			  TILEGX_ELF_PUT_WORD (htab, output_bfd, 0,
+					       (htab->elf.sgot->contents + off +
+						TILEGX_ELF_WORD_BYTES (htab)));
+		          outrel.r_info = TILEGX_ELF_R_INFO (htab, NULL, indx,
+							     TILEGX_ELF_DTPOFF_RELOC (htab));
+		          outrel.r_offset += TILEGX_ELF_WORD_BYTES (htab);
+		          tilegx_elf_append_rela (output_bfd, htab->elf.srelgot, &outrel);
+		        }
+                    }
+
+		    else {
+		      /* If we are not emitting relocations for a
+		         general dynamic reference, then we must be in a
+		         static link or an executable link with the
+		         symbol binding locally.  Mark it as belonging
+		         to module 1, the executable.  */
+		      TILEGX_ELF_PUT_WORD (htab, output_bfd, 1,
+					   htab->elf.sgot->contents + off );
+		      TILEGX_ELF_PUT_WORD (htab, output_bfd,
+					   relocation - dtpoff_base (info),
+					   htab->elf.sgot->contents + off +
+					   TILEGX_ELF_WORD_BYTES (htab));
+		   }
+                   break;
+                }
+	    }
+
+	  if (off >= (bfd_vma) -2)
+	    abort ();
+
+	  relocation = htab->elf.sgot->output_offset + off - got_base;
+	  unresolved_reloc = FALSE;
+	  howto = tilegx_elf_howto_table + r_type;
+	  break;
+
+	default:
+	  break;
+	}
+
+      /* Dynamic relocs are not propagated for SEC_DEBUGGING sections
+	 because such sections are not SEC_ALLOC and thus ld.so will
+	 not process them.  */
+      if (unresolved_reloc
+	  && !((input_section->flags & SEC_DEBUGGING) != 0
+	       && h->def_dynamic))
+	(*_bfd_error_handler)
+	  (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+	   input_bfd,
+	   input_section,
+	   (long) rel->r_offset,
+	   howto->name,
+	   h->root.root.string);
+
+      r = bfd_reloc_continue;
+
+      /* Get the operand creation function, if any. */
+      create_func = reloc_to_create_func[r_type];
+      if (create_func == NULL)
+      {
+        r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+                                      contents, rel->r_offset,
+                                      relocation, rel->r_addend);
+      }
+      else
+      {
+        if (howto->pc_relative)
+        {
+          relocation -=
+            input_section->output_section->vma + input_section->output_offset;
+          if (howto->pcrel_offset)
+            relocation -= rel->r_offset;
+        }
+
+        bfd_byte *data;
+
+        /* Add the relocation addend if any to the final target value */
+        relocation += rel->r_addend;
+
+        /* Do basic range checking */
+        r = bfd_check_overflow (howto->complain_on_overflow,
+                                howto->bitsize,
+                                howto->rightshift,
+                                TILEGX_ELF_WORD_BYTES (htab) * 8,
+                                relocation);
+
+        /*
+         * Write the relocated value out into the raw section data.
+         * Don't put a relocation out in the .rela section.
+         */
+        tilegx_bundle_bits mask = create_func(-1);
+        tilegx_bundle_bits value = create_func(relocation >> howto->rightshift);
+
+        /* Only touch bytes while the mask is not 0, so we
+           don't write to out of bounds memory if this is actually
+           a 16-bit switch instruction. */
+        for (data = contents + rel->r_offset; mask != 0; data++)
+          {
+            bfd_byte byte_mask = (bfd_byte)mask;
+            *data = (*data & ~byte_mask) | ((bfd_byte)value & byte_mask);
+            mask >>= 8;
+            value >>= 8;
+          }
+      }
+
+      if (r != bfd_reloc_ok)
+	{
+	  const char *msg = NULL;
+
+	  switch (r)
+	    {
+	    case bfd_reloc_overflow:
+	      r = info->callbacks->reloc_overflow
+		(info, (h ? &h->root : NULL), name, howto->name,
+		 (bfd_vma) 0, input_bfd, input_section, rel->r_offset);
+	      break;
+
+	    case bfd_reloc_undefined:
+	      r = info->callbacks->undefined_symbol
+		(info, name, input_bfd, input_section, rel->r_offset,
+		 TRUE);
+	      break;
+
+	    case bfd_reloc_outofrange:
+	      msg = _("internal error: out of range error");
+	      break;
+
+	    case bfd_reloc_notsupported:
+	      msg = _("internal error: unsupported relocation error");
+	      break;
+
+	    case bfd_reloc_dangerous:
+	      msg = _("internal error: dangerous relocation");
+	      break;
+
+	    default:
+	      msg = _("internal error: unknown error");
+	      break;
+	    }
+
+	  if (msg)
+	    r = info->callbacks->warning
+	      (info, msg, name, input_bfd, input_section, rel->r_offset);
+
+	  if (! r)
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Finish up dynamic symbol handling.  We set the contents of various
+   dynamic sections here.  */
+
+bfd_boolean
+tilegx_elf_finish_dynamic_symbol (bfd *output_bfd,
+				  struct bfd_link_info *info,
+				  struct elf_link_hash_entry *h,
+				  Elf_Internal_Sym *sym)
+{
+  struct tilegx_elf_link_hash_table *htab;
+
+  htab = tilegx_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+
+  if (h->plt.offset != (bfd_vma) -1)
+    {
+      asection *splt;
+      asection *srela;
+      asection *sgotplt;
+      Elf_Internal_Rela rela;
+      bfd_byte *loc;
+      bfd_vma r_offset;
+      const struct elf_backend_data *bed = get_elf_backend_data (output_bfd);
+
+
+      int rela_index;
+
+      /* This symbol has an entry in the PLT.  Set it up.  */
+
+      BFD_ASSERT (h->dynindx != -1);
+
+      splt = htab->elf.splt;
+      srela = htab->elf.srelplt;
+      sgotplt = htab->elf.sgotplt;
+
+      if (splt == NULL || srela == NULL)
+       abort ();
+
+      /* Fill in the entry in the procedure linkage table.  */
+      rela_index = tilegx_plt_entry_build (output_bfd, htab, splt, sgotplt,
+					   h->plt.offset, &r_offset);
+
+      /* Fill in the entry in the global offset table, which initially points
+	 to the beginning of the plt.  */
+      TILEGX_ELF_PUT_WORD (htab, output_bfd,
+			   splt->output_section->vma + splt->output_offset,
+			   sgotplt->contents + r_offset);
+
+      /* Fill in the entry in the .rela.plt section.  */
+      rela.r_offset = (sgotplt->output_section->vma
+		       + sgotplt->output_offset
+		       + r_offset);
+      rela.r_addend = 0;
+      rela.r_info = TILEGX_ELF_R_INFO (htab, NULL, h->dynindx, R_TILEGX_JMP_SLOT);
+
+      loc = srela->contents + rela_index * TILEGX_ELF_RELA_BYTES (htab);
+      bed->s->swap_reloca_out (output_bfd, &rela, loc);
+
+      if (!h->def_regular)
+	{
+	  /* Mark the symbol as undefined, rather than as defined in
+	     the .plt section.  Leave the value alone.  */
+	  sym->st_shndx = SHN_UNDEF;
+	  /* If the symbol is weak, we do need to clear the value.
+	     Otherwise, the PLT entry would provide a definition for
+	     the symbol even if the symbol wasn't defined anywhere,
+	     and so the symbol would never be NULL.  */
+	  if (!h->ref_regular_nonweak)
+	    sym->st_value = 0;
+	}
+    }
+
+  if (h->got.offset != (bfd_vma) -1
+      && tilegx_elf_hash_entry(h)->tls_type != GOT_TLS_GD
+      && tilegx_elf_hash_entry(h)->tls_type != GOT_TLS_IE)
+    {
+      asection *sgot;
+      asection *srela;
+      Elf_Internal_Rela rela;
+
+      /* This symbol has an entry in the GOT.  Set it up.  */
+
+      sgot = htab->elf.sgot;
+      srela = htab->elf.srelgot;
+      BFD_ASSERT (sgot != NULL && srela != NULL);
+
+      rela.r_offset = (sgot->output_section->vma
+		       + sgot->output_offset
+		       + (h->got.offset &~ (bfd_vma) 1));
+
+      /* If this is a -Bsymbolic link, and the symbol is defined
+	 locally, we just want to emit a RELATIVE reloc.  Likewise if
+	 the symbol was forced to be local because of a version file.
+	 The entry in the global offset table will already have been
+	 initialized in the relocate_section function.  */
+      if (info->shared
+	  && (info->symbolic || h->dynindx == -1)
+	  && h->def_regular)
+	{
+	  asection *sec = h->root.u.def.section;
+	  rela.r_info = TILEGX_ELF_R_INFO (htab, NULL, 0, R_TILEGX_RELATIVE);
+	  rela.r_addend = (h->root.u.def.value
+			   + sec->output_section->vma
+			   + sec->output_offset);
+	}
+      else
+	{
+	  rela.r_info = TILEGX_ELF_R_INFO (htab, NULL, h->dynindx, R_TILEGX_GLOB_DAT);
+	  rela.r_addend = 0;
+	}
+
+      TILEGX_ELF_PUT_WORD (htab, output_bfd, 0,
+			   sgot->contents + (h->got.offset & ~(bfd_vma) 1));
+      tilegx_elf_append_rela (output_bfd, srela, &rela);
+    }
+
+  if (h->needs_copy)
+    {
+      asection *s;
+      Elf_Internal_Rela rela;
+
+      /* This symbols needs a copy reloc.  Set it up.  */
+      BFD_ASSERT (h->dynindx != -1);
+
+      s = bfd_get_section_by_name (h->root.u.def.section->owner,
+				   ".rela.bss");
+      BFD_ASSERT (s != NULL);
+
+      rela.r_offset = (h->root.u.def.value
+		       + h->root.u.def.section->output_section->vma
+		       + h->root.u.def.section->output_offset);
+      rela.r_info = TILEGX_ELF_R_INFO (htab, NULL, h->dynindx, R_TILEGX_COPY);
+      rela.r_addend = 0;
+      tilegx_elf_append_rela (output_bfd, s, &rela);
+    }
+
+  /* Mark some specially defined symbols as absolute. */
+  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+      || (h == htab->elf.hgot || h == htab->elf.hplt))
+    sym->st_shndx = SHN_ABS;
+
+  return TRUE;
+}
+
+/* Finish up the dynamic sections.  */
+
+static bfd_boolean
+tilegx_finish_dyn (bfd *output_bfd, struct bfd_link_info *info,
+		   bfd *dynobj, asection *sdyn,
+		   asection *splt ATTRIBUTE_UNUSED)
+{
+  struct tilegx_elf_link_hash_table *htab;
+  const struct elf_backend_data *bed;
+  bfd_byte *dyncon, *dynconend;
+  size_t dynsize;
+
+  htab = tilegx_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+  bed = get_elf_backend_data (output_bfd);
+  dynsize = bed->s->sizeof_dyn;
+  dynconend = sdyn->contents + sdyn->size;
+
+  for (dyncon = sdyn->contents; dyncon < dynconend; dyncon += dynsize)
+    {
+      Elf_Internal_Dyn dyn;
+      asection *s;
+
+      bed->s->swap_dyn_in (dynobj, dyncon, &dyn);
+
+      switch (dyn.d_tag)
+	{
+	case DT_PLTGOT:
+	  s = htab->elf.sgotplt;
+	  dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+	  break;
+	case DT_JMPREL:
+	  s = htab->elf.srelplt;
+	  dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
+	  break;
+	case DT_PLTRELSZ:
+	  s = htab->elf.srelplt;
+	  dyn.d_un.d_val = s->size;
+	  break;
+	default:
+	  continue;
+	}
+
+      bed->s->swap_dyn_out (output_bfd, &dyn, dyncon);
+    }
+  return TRUE;
+}
+
+bfd_boolean
+tilegx_elf_finish_dynamic_sections (bfd *output_bfd,
+				    struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *sdyn;
+  struct tilegx_elf_link_hash_table *htab;
+
+  htab = tilegx_elf_hash_table (info);
+  BFD_ASSERT (htab != NULL);
+  dynobj = htab->elf.dynobj;
+
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      asection *splt;
+      bfd_boolean ret;
+
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      BFD_ASSERT (splt != NULL && sdyn != NULL);
+
+      ret = tilegx_finish_dyn (output_bfd, info, dynobj, sdyn, splt);
+
+      if (ret != TRUE)
+	return ret;
+
+      /* Fill in the head and tail entries in the procedure linkage table.  */
+      if (splt->size > 0)
+	{
+	  memcpy (splt->contents,
+		  ABI_64_P (output_bfd) ?
+		    tilegx64_plt0_entry : tilegx32_plt0_entry,
+		  PLT_HEADER_SIZE);
+
+	  memcpy (splt->contents + splt->size - PLT_TAIL_SIZE,
+		  ABI_64_P (output_bfd) ?
+		    tilegx64_plt_tail_entry : tilegx32_plt_tail_entry,
+		  PLT_TAIL_SIZE);
+	}
+
+      elf_section_data (splt->output_section)->this_hdr.sh_entsize
+	= PLT_ENTRY_SIZE;
+    }
+
+  if (htab->elf.sgotplt)
+    {
+      if (bfd_is_abs_section (htab->elf.sgotplt->output_section))
+	{
+	  (*_bfd_error_handler)
+	    (_("discarded output section: `%A'"), htab->elf.sgotplt);
+	  return FALSE;
+	}
+
+      if (htab->elf.sgotplt->size > 0)
+	{
+	  /* Write the first two entries in .got.plt, needed for the dynamic
+	     linker.  */
+	  TILEGX_ELF_PUT_WORD (htab, output_bfd, (bfd_vma) -1,
+			       htab->elf.sgotplt->contents);
+	  TILEGX_ELF_PUT_WORD (htab, output_bfd, (bfd_vma) 0,
+			       htab->elf.sgotplt->contents
+			       + GOT_ENTRY_SIZE (htab));
+	}
+
+      elf_section_data (htab->elf.sgotplt->output_section)->this_hdr.sh_entsize =
+	GOT_ENTRY_SIZE (htab);
+    }
+
+  if (htab->elf.sgot)
+    {
+      if (htab->elf.sgot->size > 0)
+	{
+	  /* Set the first entry in the global offset table to the address of
+	     the dynamic section.  */
+	  bfd_vma val = (sdyn ?
+			 sdyn->output_section->vma + sdyn->output_offset :
+			 0);
+	  TILEGX_ELF_PUT_WORD (htab, output_bfd, val,
+			       htab->elf.sgot->contents);
+	}
+
+      elf_section_data (htab->elf.sgot->output_section)->this_hdr.sh_entsize =
+	GOT_ENTRY_SIZE (htab);
+    }
+
+  return TRUE;
+}
+
+
+
+/* Return address for Ith PLT stub in section PLT, for relocation REL
+   or (bfd_vma) -1 if it should not be included.  */
+
+bfd_vma
+tilegx_elf_plt_sym_val (bfd_vma i, const asection *plt,
+			const arelent *rel ATTRIBUTE_UNUSED)
+{
+  return plt->vma + PLT_HEADER_SIZE + i * PLT_ENTRY_SIZE;
+}
+
+enum elf_reloc_type_class
+tilegx_reloc_type_class (const Elf_Internal_Rela *rela)
+{
+  switch ((int) TILEGX_ELF_R_TYPE (rela->r_info))
+    {
+    case R_TILEGX_RELATIVE:
+      return reloc_class_relative;
+    case R_TILEGX_JMP_SLOT:
+      return reloc_class_plt;
+    case R_TILEGX_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+int
+tilegx_additional_program_headers (bfd *abfd,
+				   struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  /* Each .intrpt section specified by the user adds another PT_LOAD
+     header since the sections are discontiguous. */
+  static const char intrpt_sections[4][9] =
+    {
+      ".intrpt0", ".intrpt1", ".intrpt2", ".intrpt3"
+    };
+  int count = 0;
+  int i;
+
+  for (i = 0; i < 4; i++)
+    {
+      asection *sec = bfd_get_section_by_name (abfd, intrpt_sections[i]);
+      if (sec != NULL && (sec->flags & SEC_LOAD) != 0)
+	++count;
+    }
+
+  /* Add four "padding" headers in to leave room in case a custom linker
+     script does something fancy. Otherwise ld complains that it ran
+     out of program headers and refuses to link. */
+  count += 4;
+
+  return count;
+}
+
+
+bfd_boolean
+_bfd_tilegx_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  const char *targ1 = bfd_get_target (ibfd);
+  const char *targ2 = bfd_get_target (obfd);
+
+  if (strcmp (targ1, targ2) != 0)
+    {
+      (*_bfd_error_handler)
+	(_("%B: Cannot link together %s and %s objects."),
+	 ibfd, targ1, targ2);
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  return TRUE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfxx-tilegx.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfxx-tilegx.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/elfxx-tilegx.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/elfxx-tilegx.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,97 @@
+/* TILE-Gx ELF specific backend routines.
+   Copyright 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "elf/common.h"
+#include "elf/internal.h"
+
+extern enum elf_reloc_type_class
+tilegx_reloc_type_class (const Elf_Internal_Rela *);
+
+extern reloc_howto_type *
+tilegx_reloc_name_lookup (bfd *, const char *);
+
+extern struct bfd_link_hash_table *
+tilegx_elf_link_hash_table_create (bfd *);
+
+extern reloc_howto_type *
+tilegx_reloc_type_lookup (bfd *, bfd_reloc_code_real_type);
+
+extern void
+tilegx_elf_copy_indirect_symbol (struct bfd_link_info *,
+				 struct elf_link_hash_entry *,
+				 struct elf_link_hash_entry *);
+
+extern bfd_boolean
+tilegx_elf_create_dynamic_sections (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean
+tilegx_elf_check_relocs (bfd *, struct bfd_link_info *,
+			 asection *, const Elf_Internal_Rela *);
+
+extern bfd_boolean
+tilegx_elf_adjust_dynamic_symbol (struct bfd_link_info *,
+				  struct elf_link_hash_entry *);
+
+extern bfd_boolean
+tilegx_elf_omit_section_dynsym (bfd *,
+				struct bfd_link_info *,
+				asection *);
+
+extern bfd_boolean
+tilegx_elf_size_dynamic_sections (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean
+tilegx_elf_relocate_section (bfd *, struct bfd_link_info *,
+			     bfd *, asection *,
+			     bfd_byte *, Elf_Internal_Rela *,
+			     Elf_Internal_Sym *,
+			     asection **);
+
+extern asection *
+tilegx_elf_gc_mark_hook (asection *,
+			 struct bfd_link_info *,
+			 Elf_Internal_Rela *,
+			 struct elf_link_hash_entry *,
+			 Elf_Internal_Sym *);
+
+extern bfd_boolean
+tilegx_elf_gc_sweep_hook (bfd *, struct bfd_link_info *,
+			  asection *, const Elf_Internal_Rela *);
+
+extern bfd_vma
+tilegx_elf_plt_sym_val (bfd_vma, const asection *, const arelent *);
+
+extern void
+tilegx_info_to_howto_rela (bfd *, arelent *, Elf_Internal_Rela *);
+
+extern int
+tilegx_additional_program_headers (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean
+tilegx_elf_finish_dynamic_symbol (bfd *,
+				  struct bfd_link_info *,
+				  struct elf_link_hash_entry *,
+				  Elf_Internal_Sym *);
+
+extern bfd_boolean
+tilegx_elf_finish_dynamic_sections (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean
+_bfd_tilegx_elf_merge_private_bfd_data (bfd *, bfd *);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/epoc-pe-arm.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/epoc-pe-arm.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/epoc-pe-arm.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/epoc-pe-arm.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,38 @@
+/* BFD back-end for ARM EPOC PE files.
+   Copyright 1999, 2000, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define TARGET_UNDERSCORE    0
+#define USER_LABEL_PREFIX    ""
+
+#define TARGET_LITTLE_SYM    arm_epoc_pe_little_vec
+#define TARGET_LITTLE_NAME   "epoc-pe-arm-little"
+#define TARGET_BIG_SYM       arm_epoc_pe_big_vec
+#define TARGET_BIG_NAME      "epoc-pe-arm-big"
+
+#define bfd_arm_allocate_interworking_sections \
+	bfd_arm_epoc_pe_allocate_interworking_sections
+#define bfd_arm_get_bfd_for_interworking \
+	bfd_arm_epoc_pe_get_bfd_for_interworking
+#define bfd_arm_process_before_allocation \
+	bfd_arm_epoc_pe_process_before_allocation
+
+#define EXTRA_S_FLAGS (SEC_LINK_ONCE | SEC_LINK_DUPLICATES | SEC_CODE | SEC_READONLY | SEC_DATA)
+
+#include "pe-arm.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/epoc-pei-arm.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/epoc-pei-arm.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/epoc-pei-arm.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/epoc-pei-arm.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,31 @@
+/* BFD back-end for ARM EPOC PE IMAGE COFF files.
+   Copyright 1999, 2000, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define TARGET_UNDERSCORE    0
+#define USER_LABEL_PREFIX    ""
+
+#define TARGET_LITTLE_SYM    arm_epoc_pei_little_vec
+#define TARGET_LITTLE_NAME   "epoc-pei-arm-little"
+#define TARGET_BIG_SYM       arm_epoc_pei_big_vec
+#define TARGET_BIG_NAME      "epoc-pei-arm-big"
+
+#define EXTRA_S_FLAGS (SEC_CODE | SEC_READONLY | SEC_DATA)
+
+#include "pei-arm.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/format.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/format.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/format.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/format.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,429 @@
+/* Generic BFD support for file formats.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2002,
+   2003, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/*
+SECTION
+	File formats
+
+	A format is a BFD concept of high level file contents type. The
+	formats supported by BFD are:
+
+	o <<bfd_object>>
+
+	The BFD may contain data, symbols, relocations and debug info.
+
+	o <<bfd_archive>>
+
+	The BFD contains other BFDs and an optional index.
+
+	o <<bfd_core>>
+
+	The BFD contains the result of an executable core dump.
+
+SUBSECTION
+	File format functions
+*/
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+/* IMPORT from targets.c.  */
+extern const size_t _bfd_target_vector_entries;
+
+/*
+FUNCTION
+	bfd_check_format
+
+SYNOPSIS
+	bfd_boolean bfd_check_format (bfd *abfd, bfd_format format);
+
+DESCRIPTION
+	Verify if the file attached to the BFD @var{abfd} is compatible
+	with the format @var{format} (i.e., one of <<bfd_object>>,
+	<<bfd_archive>> or <<bfd_core>>).
+
+	If the BFD has been set to a specific target before the
+	call, only the named target and format combination is
+	checked. If the target has not been set, or has been set to
+	<<default>>, then all the known target backends is
+	interrogated to determine a match.  If the default target
+	matches, it is used.  If not, exactly one target must recognize
+	the file, or an error results.
+
+	The function returns <<TRUE>> on success, otherwise <<FALSE>>
+	with one of the following error codes:
+
+	o <<bfd_error_invalid_operation>> -
+	if <<format>> is not one of <<bfd_object>>, <<bfd_archive>> or
+	<<bfd_core>>.
+
+	o <<bfd_error_system_call>> -
+	if an error occured during a read - even some file mismatches
+	can cause bfd_error_system_calls.
+
+	o <<file_not_recognised>> -
+	none of the backends recognised the file format.
+
+	o <<bfd_error_file_ambiguously_recognized>> -
+	more than one backend recognised the file format.
+*/
+
+bfd_boolean
+bfd_check_format (bfd *abfd, bfd_format format)
+{
+  return bfd_check_format_matches (abfd, format, NULL);
+}
+
+/*
+FUNCTION
+	bfd_check_format_matches
+
+SYNOPSIS
+	bfd_boolean bfd_check_format_matches
+	  (bfd *abfd, bfd_format format, char ***matching);
+
+DESCRIPTION
+	Like <<bfd_check_format>>, except when it returns FALSE with
+	<<bfd_errno>> set to <<bfd_error_file_ambiguously_recognized>>.  In that
+	case, if @var{matching} is not NULL, it will be filled in with
+	a NULL-terminated list of the names of the formats that matched,
+	allocated with <<malloc>>.
+	Then the user may choose a format and try again.
+
+	When done with the list that @var{matching} points to, the caller
+	should free it.
+*/
+
+bfd_boolean
+bfd_check_format_matches (bfd *abfd, bfd_format format, char ***matching)
+{
+  extern const bfd_target binary_vec;
+  const bfd_target * const *target;
+  const bfd_target **matching_vector = NULL;
+  const bfd_target *save_targ, *right_targ, *ar_right_targ, *match_targ;
+  int match_count, best_count, best_match;
+  int ar_match_index;
+
+  if (matching != NULL)
+    *matching = NULL;
+
+  if (!bfd_read_p (abfd)
+      || (unsigned int) abfd->format >= (unsigned int) bfd_type_end)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  if (abfd->format != bfd_unknown)
+    return abfd->format == format;
+
+  /* Since the target type was defaulted, check them
+     all in the hope that one will be uniquely recognized.  */
+  save_targ = abfd->xvec;
+  match_count = 0;
+  ar_match_index = _bfd_target_vector_entries;
+
+  if (matching != NULL || *bfd_associated_vector != NULL)
+    {
+      bfd_size_type amt;
+
+      amt = sizeof (*matching_vector) * 2 * _bfd_target_vector_entries;
+      matching_vector = (const bfd_target **) bfd_malloc (amt);
+      if (!matching_vector)
+	return FALSE;
+    }
+
+  right_targ = 0;
+  ar_right_targ = 0;
+  match_targ = 0;
+  best_match = 256;
+  best_count = 0;
+
+  /* Presume the answer is yes.  */
+  abfd->format = format;
+
+  /* If the target type was explicitly specified, just check that target.  */
+  if (!abfd->target_defaulted)
+    {
+      if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)	/* rewind! */
+	goto err_ret;
+
+      right_targ = BFD_SEND_FMT (abfd, _bfd_check_format, (abfd));
+
+      if (right_targ)
+	goto ok_ret;
+
+      /* For a long time the code has dropped through to check all
+	 targets if the specified target was wrong.  I don't know why,
+	 and I'm reluctant to change it.  However, in the case of an
+	 archive, it can cause problems.  If the specified target does
+	 not permit archives (e.g., the binary target), then we should
+	 not allow some other target to recognize it as an archive, but
+	 should instead allow the specified target to recognize it as an
+	 object.  When I first made this change, it broke the PE target,
+	 because the specified pei-i386 target did not recognize the
+	 actual pe-i386 archive.  Since there may be other problems of
+	 this sort, I changed this test to check only for the binary
+	 target.  */
+      if (format == bfd_archive && save_targ == &binary_vec)
+	goto err_unrecog;
+    }
+
+  for (target = bfd_target_vector; *target != NULL; target++)
+    {
+      const bfd_target *temp;
+      bfd_error_type err;
+
+      /* Don't check the default target twice.  */
+      if (*target == &binary_vec
+	  || (!abfd->target_defaulted && *target == save_targ)
+	  || (*target)->match_priority > best_match)
+	continue;
+
+      abfd->xvec = *target;	/* Change BFD's target temporarily.  */
+
+      if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+	goto err_ret;
+
+      /* If _bfd_check_format neglects to set bfd_error, assume
+	 bfd_error_wrong_format.  We didn't used to even pay any
+	 attention to bfd_error, so I suspect that some
+	 _bfd_check_format might have this problem.  */
+      bfd_set_error (bfd_error_wrong_format);
+
+      temp = BFD_SEND_FMT (abfd, _bfd_check_format, (abfd));
+      if (temp)
+	match_targ = temp;
+
+      if (temp && (abfd->format != bfd_archive || bfd_has_map (abfd)))
+	{
+	  /* This format checks out as ok!  */
+	  right_targ = temp;
+
+	  /* If this is the default target, accept it, even if other
+	     targets might match.  People who want those other targets
+	     have to set the GNUTARGET variable.  */
+	  if (temp == bfd_default_vector[0])
+	    goto ok_ret;
+
+	  if (matching_vector)
+	    matching_vector[match_count] = temp;
+	  match_count++;
+
+	  if (temp->match_priority < best_match)
+	    {
+	      best_match = temp->match_priority;
+	      best_count = 0;
+	    }
+	  best_count++;
+	}
+      else if (temp
+	       || (err = bfd_get_error ()) == bfd_error_wrong_object_format
+	       || err == bfd_error_file_ambiguously_recognized)
+	{
+	  /* An archive with no armap or objects of the wrong type,
+	     or an ambiguous match.  We want this target to match
+	     if we get no better matches.  */
+	  if (ar_right_targ != bfd_default_vector[0])
+	    ar_right_targ = *target;
+	  if (matching_vector)
+	    matching_vector[ar_match_index] = *target;
+	  ar_match_index++;
+	}
+      else if (err != bfd_error_wrong_format)
+	goto err_ret;
+    }
+
+  if (best_count == 1)
+    match_count = 1;
+
+  if (match_count == 0)
+    {
+      /* Try partial matches.  */
+      right_targ = ar_right_targ;
+
+      if (right_targ == bfd_default_vector[0])
+	{
+	  match_count = 1;
+	}
+      else
+	{
+	  match_count = ar_match_index - _bfd_target_vector_entries;
+
+	  if (matching_vector && match_count > 1)
+	    memcpy (matching_vector,
+		    matching_vector + _bfd_target_vector_entries,
+		    sizeof (*matching_vector) * match_count);
+	}
+    }
+
+  if (match_count > 1)
+    {
+      const bfd_target * const *assoc = bfd_associated_vector;
+
+      while ((right_targ = *assoc++) != NULL)
+	{
+	  int i = match_count;
+
+	  while (--i >= 0)
+	    if (matching_vector[i] == right_targ)
+	      break;
+
+	  if (i >= 0)
+	    {
+	      match_count = 1;
+	      break;
+	    }
+	}
+    }
+
+  if (match_count == 1)
+    {
+      abfd->xvec = right_targ;
+      /* If we come out of the loop knowing that the last target that
+	 matched is the one we want, then ABFD should still be in a usable
+	 state (except possibly for XVEC).  */
+      if (match_targ != right_targ)
+	{
+	  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+	    goto err_ret;
+	  match_targ = BFD_SEND_FMT (abfd, _bfd_check_format, (abfd));
+	}
+
+    ok_ret:
+      /* If the file was opened for update, then `output_has_begun'
+	 some time ago when the file was created.  Do not recompute
+	 sections sizes or alignments in _bfd_set_section_contents.
+	 We can not set this flag until after checking the format,
+	 because it will interfere with creation of BFD sections.  */
+      if (abfd->direction == both_direction)
+	abfd->output_has_begun = TRUE;
+
+      if (matching_vector)
+	free (matching_vector);
+      return TRUE;			/* File position has moved, BTW.  */
+    }
+
+  if (match_count == 0)
+    {
+    err_unrecog:
+      bfd_set_error (bfd_error_file_not_recognized);
+    err_ret:
+      abfd->xvec = save_targ;
+      abfd->format = bfd_unknown;
+      if (matching_vector)
+	free (matching_vector);
+      return FALSE;
+    }
+
+  abfd->xvec = save_targ;		/* Restore original target type.  */
+  abfd->format = bfd_unknown;		/* Restore original format.  */
+  bfd_set_error (bfd_error_file_ambiguously_recognized);
+
+  if (matching)
+    {
+      *matching = (char **) matching_vector;
+      matching_vector[match_count] = NULL;
+      /* Return target names.  This is a little nasty.  Maybe we
+	 should do another bfd_malloc?  */
+      while (--match_count >= 0)
+	{
+	  const char *name = matching_vector[match_count]->name;
+	  *(const char **) &matching_vector[match_count] = name;
+	}
+    }
+  return FALSE;
+}
+
+/*
+FUNCTION
+	bfd_set_format
+
+SYNOPSIS
+	bfd_boolean bfd_set_format (bfd *abfd, bfd_format format);
+
+DESCRIPTION
+	This function sets the file format of the BFD @var{abfd} to the
+	format @var{format}. If the target set in the BFD does not
+	support the format requested, the format is invalid, or the BFD
+	is not open for writing, then an error occurs.
+*/
+
+bfd_boolean
+bfd_set_format (bfd *abfd, bfd_format format)
+{
+  if (bfd_read_p (abfd)
+      || (unsigned int) abfd->format >= (unsigned int) bfd_type_end)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  if (abfd->format != bfd_unknown)
+    return abfd->format == format;
+
+  /* Presume the answer is yes.  */
+  abfd->format = format;
+
+  if (!BFD_SEND_FMT (abfd, _bfd_set_format, (abfd)))
+    {
+      abfd->format = bfd_unknown;
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/*
+FUNCTION
+	bfd_format_string
+
+SYNOPSIS
+	const char *bfd_format_string (bfd_format format);
+
+DESCRIPTION
+	Return a pointer to a const string
+	<<invalid>>, <<object>>, <<archive>>, <<core>>, or <<unknown>>,
+	depending upon the value of @var{format}.
+*/
+
+const char *
+bfd_format_string (bfd_format format)
+{
+  if (((int) format < (int) bfd_unknown)
+      || ((int) format >= (int) bfd_type_end))
+    return "invalid";
+
+  switch (format)
+    {
+    case bfd_object:
+      return "object";		/* Linker/assembler/compiler output.  */
+    case bfd_archive:
+      return "archive";		/* Object archive file.  */
+    case bfd_core:
+      return "core";		/* Core dump.  */
+    default:
+      return "unknown";
+    }
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/freebsd.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/freebsd.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/freebsd.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/freebsd.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,107 @@
+/* BFD back-end definitions used by all FreeBSD targets.
+   Copyright 1990, 1991, 1992, 1996, 1997, 2000, 2001, 2002, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* FreeBSD ZMAGIC files never have the header in the text. */
+#define	N_HEADER_IN_TEXT(x)	0
+
+/* ZMAGIC files start at offset 0.  Does not apply to QMAGIC files. */
+#define TEXT_START_ADDR		0
+
+#define N_GETMAGIC_NET(exec) \
+	((exec).a_info & 0xffff)
+#define N_GETMID_NET(exec) \
+	(((exec).a_info >> 16) & 0x3ff)
+#define N_GETFLAG_NET(ex) \
+	(((exec).a_info >> 26) & 0x3f)
+
+#define N_MACHTYPE(exec) \
+	((enum machine_type) \
+	 ((N_GETMAGIC_NET (exec) == ZMAGIC) ? N_GETMID_NET (exec) : \
+	  ((exec).a_info >> 16) & 0x3ff))
+#define N_FLAGS(exec) \
+	((N_GETMAGIC_NET (exec) == ZMAGIC) ? N_GETFLAG_NET (exec) : \
+	 ((exec).a_info >> 26) & 0x3f)
+
+#define N_SET_INFO(exec, magic, type, flags) \
+	((exec).a_info = ((magic) & 0xffff) \
+	 | (((int)(type) & 0x3ff) << 16) \
+	 | (((flags) & 0x3f) << 26))
+#define N_SET_MACHTYPE(exec, machtype) \
+	((exec).a_info = \
+         ((exec).a_info & 0xfb00ffff) | ((((int) (machtype)) & 0x3ff) << 16))
+#define N_SET_FLAGS(exec, flags) \
+	((exec).a_info = \
+	 ((exec).a_info & 0x03ffffff) | ((flags & 0x03f) << 26))
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libaout.h"
+
+/* On FreeBSD, the magic number is always in i386 (little-endian)
+   format.  I think.  */
+#define SWAP_MAGIC(ext) bfd_getl32 (ext)
+
+#define MY_write_object_contents MY (write_object_contents)
+static bfd_boolean MY (write_object_contents) (bfd *);
+
+#include "aout-target.h"
+
+/* Write an object file.
+   Section contents have already been written.  We write the
+   file header, symbols, and relocation.  */
+
+static bfd_boolean
+MY (write_object_contents) (bfd *abfd)
+{
+  struct external_exec exec_bytes;
+  struct internal_exec *execp = exec_hdr (abfd);
+
+  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+
+  /* Magic number, maestro, please!  */
+  switch (bfd_get_arch(abfd))
+    {
+    case bfd_arch_m68k:
+      if (strcmp (abfd->xvec->name, "a.out-m68k4k-netbsd") == 0)
+	N_SET_MACHTYPE (*execp, M_68K4K_NETBSD);
+      else
+	N_SET_MACHTYPE (*execp, M_68K_NETBSD);
+      break;
+    case bfd_arch_sparc:
+      N_SET_MACHTYPE (*execp, M_SPARC_NETBSD);
+      break;
+    case bfd_arch_i386:
+      N_SET_MACHTYPE (*execp, M_386_NETBSD);
+      break;
+    case bfd_arch_ns32k:
+      N_SET_MACHTYPE (*execp, M_532_NETBSD);
+      break;
+    default:
+      N_SET_MACHTYPE (*execp, M_UNKNOWN);
+      break;
+    }
+
+  WRITE_HEADERS(abfd, execp);
+
+  return TRUE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/gen-aout.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/gen-aout.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/gen-aout.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/gen-aout.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,110 @@
+/* Generate parameters for an a.out system.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 2001, 2002, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "/usr/include/a.out.h"
+#include <stdio.h>
+
+#ifndef _
+#define _(X) X
+#endif
+
+int
+main (argc, argv)
+     int argc; char** argv;
+{
+  struct exec my_exec;
+  int page_size;
+  char *target = "unknown", *arch = "unknown";
+  FILE *file = fopen("gen-aout", "r");
+
+  if (file == NULL) {
+      fprintf(stderr, "Cannot open gen-aout!\n");
+      return -1;
+  }
+  if (fread(&my_exec, sizeof(struct exec), 1, file) != 1) {
+      fprintf(stderr, "Cannot read gen-aout!\n");
+      return -1;
+  }
+
+  target = argv[1];
+  if (target == NULL) {
+      fprintf(stderr, "Usage: gen-aout target_name\n");
+      exit (1);
+  }
+
+#ifdef N_TXTOFF
+  page_size = N_TXTOFF(my_exec);
+  if (page_size == 0)
+    printf("#define N_HEADER_IN_TEXT(x) 1\n");
+  else
+    printf("#define N_HEADER_IN_TEXT(x) 0\n");
+#endif
+
+  printf("#define BYTES_IN_WORD %d\n", sizeof (int));
+  if (my_exec.a_entry == 0) {
+      printf("#define ENTRY_CAN_BE_ZERO\n");
+      printf("#define N_SHARED_LIB(x) 0 /* Avoids warning */\n");
+  }
+  else {
+      printf("/*#define ENTRY_CAN_BE_ZERO*/\n");
+      printf("/*#define N_SHARED_LIB(x) 0*/\n");
+  }
+
+  printf("#define TEXT_START_ADDR %d\n", my_exec.a_entry);
+
+#ifdef PAGSIZ
+  if (page_size == 0)
+    page_size = PAGSIZ;
+#endif
+  if (page_size != 0)
+    printf("#define TARGET_PAGE_SIZE %d\n", page_size);
+  else
+    printf("/* #define TARGET_PAGE_SIZE ??? */\n");
+  printf("#define SEGMENT_SIZE TARGET_PAGE_SIZE\n");
+
+#ifdef vax
+  arch = "vax";
+#endif
+#ifdef m68k
+  arch = "m68k";
+#endif
+  if (arch[0] == '1')
+    {
+      fprintf (stderr, _("warning: preprocessor substituted architecture name inside string;"));
+      fprintf (stderr, _("         fix DEFAULT_ARCH in the output file yourself\n"));
+      arch = "unknown";
+    }
+  printf("#define DEFAULT_ARCH bfd_arch_%s\n\n", arch);
+
+  printf("/* Do not \"beautify\" the CONCAT* macro args.  Traditional C will not");
+  printf("   remove whitespace added here, and thus will fail to concatenate");
+  printf("   the tokens.  */");
+  printf("\n#define MY(OP) CONCAT2 (%s_,OP)\n\n", target);
+  printf("#define TARGETNAME \"a.out-%s\"\n\n", target);
+
+  printf("#include \"sysdep.h\"\n");
+  printf("#include \"bfd.h\"\n");
+  printf("#include \"libbfd.h\"\n");
+  printf("#include \"libaout.h\"\n");
+  printf("\n#include \"aout-target.h\"\n");
+
+  return 0;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/genlink.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/genlink.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/genlink.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/genlink.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,110 @@
+/* genlink.h -- interface to the BFD generic linker
+   Copyright 1993, 1994, 1996, 2002, 2005, 2007 Free Software Foundation, Inc.
+   Written by Ian Lance Taylor, Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef GENLINK_H
+#define GENLINK_H
+
+/* This header file is internal to BFD.  It describes the internal
+   structures and functions used by the BFD generic linker, in case
+   any of the more specific linkers want to use or call them.  Note
+   that some functions, such as _bfd_generic_link_hash_table_create,
+   are declared in libbfd.h, because they are expected to be widely
+   used.  The functions and structures in this file will probably only
+   be used by a few files besides linker.c itself.  In fact, this file
+   is not particularly complete; I have only put in the interfaces I
+   actually needed.  */
+
+/* The generic linker uses a hash table which is a derived class of
+   the standard linker hash table, just as the other backend specific
+   linkers do.  Do not confuse the generic linker hash table with the
+   standard BFD linker hash table it is built upon.  */
+
+/* Generic linker hash table entries.  */
+
+struct generic_link_hash_entry
+{
+  struct bfd_link_hash_entry root;
+  /* Whether this symbol has been written out.  */
+  bfd_boolean written;
+  /* Symbol from input BFD.  */
+  asymbol *sym;
+};
+
+/* Generic linker hash table.  */
+
+struct generic_link_hash_table
+{
+  struct bfd_link_hash_table root;
+};
+
+/* Look up an entry in a generic link hash table.  */
+
+#define _bfd_generic_link_hash_lookup(table, string, create, copy, follow) \
+  ((struct generic_link_hash_entry *) \
+   bfd_link_hash_lookup (&(table)->root, (string), (create), (copy), (follow)))
+
+/* Traverse a generic link hash table.  */
+
+#define _bfd_generic_link_hash_traverse(table, func, info)		\
+  (bfd_link_hash_traverse						\
+   (&(table)->root,							\
+    (bfd_boolean (*) (struct bfd_link_hash_entry *, void *)) (func),	\
+    (info)))
+
+/* Get the generic link hash table from the info structure.  This is
+   just a cast.  */
+
+#define _bfd_generic_hash_table(p) \
+  ((struct generic_link_hash_table *) ((p)->hash))
+
+/* The generic linker reads in the asymbol structures for an input BFD
+   and keeps them in the outsymbol and symcount fields.  */
+
+#define _bfd_generic_link_get_symbols(abfd)  ((abfd)->outsymbols)
+#define _bfd_generic_link_get_symcount(abfd) ((abfd)->symcount)
+
+/* Add the symbols of input_bfd to the symbols being built for
+   output_bfd.  */
+extern bfd_boolean _bfd_generic_link_output_symbols
+  (bfd *, bfd *, struct bfd_link_info *, size_t *);
+
+/* This structure is used to pass information to
+   _bfd_generic_link_write_global_symbol, which may be called via
+   _bfd_generic_link_hash_traverse.  */
+
+struct generic_write_global_symbol_info
+{
+  struct bfd_link_info *info;
+  bfd *output_bfd;
+  size_t *psymalloc;
+};
+
+/* Write out a single global symbol.  This is expected to be called
+   via _bfd_generic_link_hash_traverse.  The second argument must
+   actually be a struct generic_write_global_symbol_info *.  */
+extern bfd_boolean _bfd_generic_link_write_global_symbol
+  (struct generic_link_hash_entry *, void *);
+
+/* Generic link hash table entry creation routine.  */
+struct bfd_hash_entry *_bfd_generic_link_hash_newfunc
+  (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/go32stub.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/go32stub.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/go32stub.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/go32stub.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,128 @@
+0x4d,0x5a,0x00,0x00,0x04,0x00,0x00,0x00,0x20,0x00,0x27,0x00,0xff,0xff,0x00,0x00,
+0x60,0x07,0x00,0x00,0x54,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0d,0x0a,0x73,0x74,
+0x75,0x62,0x2e,0x68,0x20,0x67,0x65,0x6e,0x65,0x72,0x61,0x74,0x65,0x64,0x20,0x66,
+0x72,0x6f,0x6d,0x20,0x73,0x74,0x75,0x62,0x2e,0x61,0x73,0x6d,0x20,0x62,0x79,0x20,
+0x64,0x6a,0x61,0x73,0x6d,0x2c,0x20,0x6f,0x6e,0x20,0x57,0x65,0x64,0x20,0x4a,0x75,
+0x6e,0x20,0x32,0x38,0x20,0x31,0x31,0x3a,0x31,0x35,0x3a,0x30,0x34,0x20,0x32,0x30,
+0x30,0x30,0x0d,0x0a,0x54,0x68,0x65,0x20,0x53,0x54,0x55,0x42,0x2e,0x45,0x58,0x45,
+0x20,0x73,0x74,0x75,0x62,0x20,0x6c,0x6f,0x61,0x64,0x65,0x72,0x20,0x69,0x73,0x20,
+0x43,0x6f,0x70,0x79,0x72,0x69,0x67,0x68,0x74,0x20,0x28,0x43,0x29,0x20,0x31,0x39,
+0x39,0x33,0x2d,0x31,0x39,0x39,0x35,0x20,0x44,0x4a,0x20,0x44,0x65,0x6c,0x6f,0x72,
+0x69,0x65,0x2e,0x20,0x0d,0x0a,0x50,0x65,0x72,0x6d,0x69,0x73,0x73,0x69,0x6f,0x6e,
+0x20,0x67,0x72,0x61,0x6e,0x74,0x65,0x64,0x20,0x74,0x6f,0x20,0x75,0x73,0x65,0x20,
+0x66,0x6f,0x72,0x20,0x61,0x6e,0x79,0x20,0x70,0x75,0x72,0x70,0x6f,0x73,0x65,0x20,
+0x70,0x72,0x6f,0x76,0x69,0x64,0x65,0x64,0x20,0x74,0x68,0x69,0x73,0x20,0x63,0x6f,
+0x70,0x79,0x72,0x69,0x67,0x68,0x74,0x20,0x0d,0x0a,0x72,0x65,0x6d,0x61,0x69,0x6e,
+0x73,0x20,0x70,0x72,0x65,0x73,0x65,0x6e,0x74,0x20,0x61,0x6e,0x64,0x20,0x75,0x6e,
+0x6d,0x6f,0x64,0x69,0x66,0x69,0x65,0x64,0x2e,0x20,0x0d,0x0a,0x54,0x68,0x69,0x73,
+0x20,0x6f,0x6e,0x6c,0x79,0x20,0x61,0x70,0x70,0x6c,0x69,0x65,0x73,0x20,0x74,0x6f,
+0x20,0x74,0x68,0x65,0x20,0x73,0x74,0x75,0x62,0x2c,0x20,0x61,0x6e,0x64,0x20,0x6e,
+0x6f,0x74,0x20,0x6e,0x65,0x63,0x65,0x73,0x73,0x61,0x72,0x69,0x6c,0x79,0x20,0x74,
+0x68,0x65,0x20,0x77,0x68,0x6f,0x6c,0x65,0x20,0x70,0x72,0x6f,0x67,0x72,0x61,0x6d,
+0x2e,0x0a,0x0d,0x0a,0x24,0x49,0x64,0x3a,0x20,0x73,0x74,0x75,0x62,0x2e,0x61,0x73,
+0x6d,0x20,0x62,0x75,0x69,0x6c,0x74,0x20,0x30,0x36,0x2f,0x32,0x38,0x2f,0x31,0x30,
+0x30,0x20,0x31,0x31,0x3a,0x31,0x35,0x3a,0x30,0x34,0x20,0x62,0x79,0x20,0x64,0x6a,
+0x61,0x73,0x6d,0x20,0x24,0x0a,0x0d,0x0a,0x40,0x28,0x23,0x29,0x20,0x73,0x74,0x75,
+0x62,0x2e,0x61,0x73,0x6d,0x20,0x62,0x75,0x69,0x6c,0x74,0x20,0x30,0x36,0x2f,0x32,
+0x38,0x2f,0x31,0x30,0x30,0x20,0x31,0x31,0x3a,0x31,0x35,0x3a,0x30,0x34,0x20,0x62,
+0x79,0x20,0x64,0x6a,0x61,0x73,0x6d,0x0a,0x0d,0x0a,0x1a,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x67,0x6f,0x33,0x32,0x73,0x74,0x75,0x62,0x2c,0x20,0x76,0x20,0x32,0x2e,0x30,0x32,
+0x54,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x43,0x57,0x53,0x44,0x50,0x4d,0x49,0x2e,0x45,0x58,0x45,0x00,
+0x00,0x00,0x00,0x00,0x0e,0x1f,0x8c,0x1e,0x24,0x00,0x8c,0x06,0x60,0x07,0xfc,0xb4,
+0x30,0xcd,0x21,0x3c,0x03,0x73,0x08,0xb0,0x6d,0xba,0xa7,0x05,0xe9,0xd4,0x03,0xa2,
+0x69,0x08,0xbe,0x20,0x00,0x8b,0x04,0x09,0xc0,0x75,0x02,0xb4,0xfe,0xbb,0x70,0x08,
+0x39,0xc3,0x73,0x02,0x89,0xc3,0x89,0x1c,0xfe,0xc7,0xb9,0x04,0xff,0xd3,0xeb,0xb4,
+0x4a,0xcd,0x21,0x73,0x08,0xd3,0xe3,0xfe,0xcf,0x89,0x1c,0xeb,0xd8,0x26,0x8e,0x06,
+0x2c,0x00,0x31,0xff,0x30,0xc0,0xa9,0xf2,0xae,0x26,0x81,0x3d,0x50,0x41,0x75,0x15,
+0xaf,0x26,0x81,0x3d,0x54,0x48,0x75,0x0d,0xaf,0x26,0x80,0x3d,0x3d,0x75,0x06,0x47,
+0x89,0x3e,0x8c,0x04,0x4f,0xae,0x75,0xdf,0xaf,0xb4,0x3e,0xbb,0x13,0x00,0xcd,0x21,
+0xb4,0x3e,0xbb,0x12,0x00,0xcd,0x21,0x06,0x57,0x31,0xc9,0x74,0x12,0xb0,0x6e,0xba,
+0x7e,0x05,0xe9,0x5e,0x03,0x09,0xc9,0x75,0xf4,0x41,0xe8,0xa1,0x03,0x72,0xee,0xb8,
+0x87,0x16,0xcd,0x2f,0x09,0xc0,0x75,0xed,0x80,0xe3,0x01,0x74,0xe8,0x89,0x3e,0x00,
+0x06,0x8c,0x06,0x02,0x06,0x89,0x36,0x04,0x06,0x5f,0x07,0xe8,0xd3,0x02,0x89,0x3e,
+0x2a,0x00,0x89,0x36,0x62,0x07,0x80,0x3e,0x2c,0x00,0x00,0x74,0x23,0xb9,0x08,0x00,
+0xbf,0x2c,0x00,0x8a,0x05,0x47,0x08,0xc0,0x74,0x05,0x88,0x07,0x43,0xe2,0xf4,0x66,
+0xc7,0x07,0x2e,0x45,0x58,0x45,0x83,0xc3,0x04,0xc6,0x07,0x00,0x89,0x1e,0x62,0x07,
+0xb8,0x00,0x3d,0xba,0x64,0x07,0xcd,0x21,0x0f,0x82,0xb3,0x02,0xa3,0x06,0x06,0x89,
+0xc3,0xb9,0x06,0x00,0xba,0xb5,0x07,0xb4,0x3f,0xcd,0x21,0x31,0xd2,0x31,0xc9,0xa1,
+0xb5,0x07,0x3d,0x4c,0x01,0x74,0x1b,0x3d,0x4d,0x5a,0x0f,0x85,0x98,0x02,0x8b,0x16,
+0xb9,0x07,0xc1,0xe2,0x09,0x8b,0x1e,0xb7,0x07,0x09,0xdb,0x74,0x05,0x80,0xee,0x02,
+0x01,0xda,0x89,0x16,0xbb,0x07,0x89,0x0e,0xbd,0x07,0xb8,0x00,0x42,0x8b,0x1e,0x06,
+0x06,0xcd,0x21,0xb9,0xa8,0x00,0xba,0xbf,0x07,0xb4,0x3f,0xcd,0x21,0x3d,0xa8,0x00,
+0x75,0x06,0x81,0x3e,0xbf,0x07,0x4c,0x01,0x0f,0x85,0x61,0x02,0x66,0xa1,0xe3,0x07,
+0x66,0xa3,0x10,0x06,0x66,0x8b,0x0e,0xbb,0x07,0x66,0xa1,0x03,0x08,0x66,0x01,0xc8,
+0x66,0xa3,0x08,0x06,0x66,0xa1,0x2b,0x08,0x66,0x01,0xc8,0x66,0xa3,0x0c,0x06,0x66,
+0x8b,0x1e,0x4b,0x08,0x66,0xa1,0x4f,0x08,0x66,0x01,0xc3,0x66,0xb8,0x01,0x00,0x01,
+0x00,0x66,0x39,0xc3,0x73,0x03,0x66,0x89,0xc3,0x66,0x81,0xc3,0xff,0xff,0x00,0x00,
+0x31,0xdb,0x66,0x89,0x1e,0x1c,0x00,0xe8,0xf5,0x02,0x8b,0x1e,0x04,0x06,0x09,0xdb,
+0x74,0x0a,0xb4,0x48,0xcd,0x21,0x0f,0x82,0x15,0x02,0x8e,0xc0,0xe8,0x08,0x03,0xb8,
+0x01,0x00,0xff,0x1e,0x00,0x06,0x0f,0x82,0x0f,0x02,0x8c,0x06,0x26,0x00,0x8c,0x0e,
+0x28,0x00,0x8c,0xd8,0xa3,0x22,0x00,0x8e,0xc0,0x31,0xc0,0xb9,0x01,0x00,0xcd,0x31,
+0x72,0x07,0xa3,0x14,0x06,0x31,0xc0,0xcd,0x31,0x0f,0x82,0xf3,0x01,0xa3,0x16,0x06,
+0x66,0x8b,0x0e,0x1c,0x00,0xb8,0x01,0x05,0x8b,0x1e,0x1e,0x00,0xcd,0x31,0x0f,0x82,
+0xe5,0x01,0x89,0x1e,0x1a,0x06,0x89,0x0e,0x18,0x06,0x89,0x36,0x1a,0x00,0x89,0x3e,
+0x18,0x00,0xb8,0x07,0x00,0x8b,0x1e,0x14,0x06,0x8b,0x0e,0x1a,0x06,0x8b,0x16,0x18,
+0x06,0xcd,0x31,0xb8,0x09,0x00,0x8c,0xc9,0x83,0xe1,0x03,0xc1,0xe1,0x05,0x51,0x81,
+0xc9,0x9b,0xc0,0xcd,0x31,0xb8,0x08,0x00,0x8b,0x0e,0x1e,0x00,0x49,0xba,0xff,0xff,
+0xcd,0x31,0xb8,0x07,0x00,0x8b,0x1e,0x16,0x06,0x8b,0x0e,0x1a,0x06,0x8b,0x16,0x18,
+0x06,0xcd,0x31,0xb8,0x09,0x00,0x59,0x81,0xc9,0x93,0xc0,0xcd,0x31,0xb8,0x08,0x00,
+0x8b,0x0e,0x1e,0x00,0x49,0xba,0xff,0xff,0xcd,0x31,0xb8,0x00,0x01,0xbb,0x00,0x0f,
+0xcd,0x31,0x73,0x10,0x3d,0x08,0x00,0x0f,0x85,0x73,0x01,0xb8,0x00,0x01,0xcd,0x31,
+0x0f,0x82,0x6a,0x01,0xa3,0x1c,0x06,0x89,0x16,0x1e,0x06,0xc1,0xe3,0x04,0x89,0x1e,
+0x20,0x06,0x66,0x8b,0x36,0x08,0x06,0x66,0x8b,0x3e,0xfb,0x07,0x66,0x8b,0x0e,0xff,
+0x07,0xe8,0x49,0x00,0x66,0x8b,0x36,0x0c,0x06,0x66,0x8b,0x3e,0x23,0x08,0x66,0x8b,
+0x0e,0x27,0x08,0xe8,0x37,0x00,0x8e,0x06,0x16,0x06,0x66,0x8b,0x3e,0x4b,0x08,0x66,
+0x8b,0x0e,0x4f,0x08,0x66,0x31,0xc0,0x66,0xc1,0xe9,0x02,0x67,0xf3,0x66,0xab,0xb4,
+0x3e,0x8b,0x1e,0x06,0x06,0xcd,0x21,0xb8,0x01,0x01,0x8b,0x16,0x1e,0x06,0xcd,0x31,
+0x1e,0x0f,0xa1,0x8e,0x1e,0x16,0x06,0x66,0x64,0xff,0x2e,0x10,0x06,0x66,0x89,0xf0,
+0x66,0x25,0xff,0x01,0x00,0x00,0x66,0x01,0xc1,0x29,0xc6,0x66,0x29,0xc7,0x66,0x89,
+0x0e,0x26,0x06,0x66,0x89,0x3e,0x22,0x06,0xe8,0x0f,0x01,0x89,0x36,0x3e,0x06,0x66,
+0xc1,0xee,0x10,0x89,0x36,0x42,0x06,0x8b,0x1e,0x06,0x06,0x89,0x1e,0x3a,0x06,0xc7,
+0x06,0x46,0x06,0x00,0x42,0xe8,0x03,0x01,0xa1,0x1c,0x06,0xa3,0x4e,0x06,0xc7,0x06,
+0x3e,0x06,0x00,0x00,0xc6,0x06,0x47,0x06,0x3f,0xa1,0x28,0x06,0x09,0xc0,0x75,0x09,
+0xa1,0x26,0x06,0x3b,0x06,0x20,0x06,0x76,0x03,0xa1,0x20,0x06,0xa3,0x42,0x06,0xe8,
+0xd9,0x00,0x66,0x31,0xc9,0x8b,0x0e,0x46,0x06,0x66,0x8b,0x3e,0x22,0x06,0x66,0x01,
+0x0e,0x22,0x06,0x66,0x29,0x0e,0x26,0x06,0x66,0x31,0xf6,0xc1,0xe9,0x02,0x1e,0x06,
+0x8e,0x06,0x16,0x06,0x8e,0x1e,0x1e,0x06,0x67,0xf3,0x66,0xa5,0x07,0x1f,0x66,0x03,
+0x0e,0x26,0x06,0x75,0xaf,0xc3,0x3c,0x3a,0x74,0x06,0x3c,0x2f,0x74,0x02,0x3c,0x5c,
+0xc3,0xbe,0x64,0x07,0x89,0xf3,0x26,0x8a,0x05,0x47,0x88,0x04,0x38,0xe0,0x74,0x0e,
+0x08,0xc0,0x74,0x0a,0x46,0xe8,0xde,0xff,0x75,0xec,0x89,0xf3,0x74,0xe8,0xc3,0xb0,
+0x66,0xba,0x48,0x05,0xeb,0x0c,0xb0,0x67,0xba,0x55,0x05,0xeb,0x05,0xb0,0x68,0xba,
+0x5f,0x05,0x52,0x8b,0x1e,0x62,0x07,0xc6,0x07,0x24,0xbb,0x64,0x07,0xeb,0x28,0xe8,
+0xf5,0x00,0xb0,0x69,0xba,0x99,0x05,0xeb,0x1a,0xb0,0x6a,0xba,0xb2,0x05,0xeb,0x13,
+0xb0,0x6b,0xba,0xc4,0x05,0xeb,0x0c,0xb0,0x6c,0xba,0xd6,0x05,0xeb,0x05,0xb0,0x69,
+0xba,0x99,0x05,0x52,0xbb,0x3b,0x05,0xe8,0x15,0x00,0x5b,0xe8,0x11,0x00,0xbb,0x67,
+0x04,0xe8,0x0b,0x00,0xb4,0x4c,0xcd,0x21,0x43,0x50,0xb4,0x02,0xcd,0x21,0x58,0x8a,
+0x17,0x80,0xfa,0x24,0x75,0xf2,0xc3,0x0d,0x0a,0x24,0x50,0x51,0x57,0x31,0xc0,0xbf,
+0x2a,0x06,0xb9,0x19,0x00,0xf3,0xab,0x5f,0x59,0x58,0xc3,0xb8,0x00,0x03,0xbb,0x21,
+0x00,0x31,0xc9,0x66,0xbf,0x2a,0x06,0x00,0x00,0xcd,0x31,0xc3,0x00,0x00,0x30,0xe4,
+0xe8,0x4e,0xff,0x89,0xde,0x8b,0x3e,0x8c,0x04,0xeb,0x17,0xb4,0x3b,0xe8,0x41,0xff,
+0x81,0xfe,0x64,0x07,0x74,0x12,0x8a,0x44,0xff,0xe8,0x2a,0xff,0x74,0x04,0xc6,0x04,
+0x5c,0x46,0xe8,0x03,0x00,0x72,0xe4,0xc3,0xe8,0x34,0x00,0xbb,0x44,0x00,0x8a,0x07,
+0x88,0x04,0x43,0x46,0x08,0xc0,0x75,0xf6,0x06,0x57,0x1e,0x07,0xe8,0x9b,0xff,0xbb,
+0x2a,0x06,0x8c,0x5f,0x04,0x89,0x5f,0x02,0xba,0x64,0x07,0xb8,0x00,0x4b,0xcd,0x21,
+0x5f,0x07,0x72,0x09,0xb4,0x4d,0xcd,0x21,0x2d,0x00,0x03,0xf7,0xd8,0xeb,0x28,0x80,
+0x3e,0x69,0x08,0x05,0x72,0x20,0xb8,0x00,0x58,0xcd,0x21,0xa2,0x67,0x08,0xb8,0x02,
+0x58,0xcd,0x21,0xa2,0x68,0x08,0xb8,0x01,0x58,0xbb,0x80,0x00,0xcd,0x21,0xb8,0x03,
+0x58,0xbb,0x01,0x00,0xcd,0x21,0xc3,0x9c,0x80,0x3e,0x69,0x08,0x05,0x72,0x1a,0x50,
+0x53,0xb8,0x03,0x58,0x8a,0x1e,0x68,0x08,0x30,0xff,0xcd,0x21,0xb8,0x01,0x58,0x8a,
+0x1e,0x67,0x08,0x30,0xff,0xcd,0x21,0x5b,0x58,0x9d,0xc3,0x4c,0x6f,0x61,0x64,0x20,
+0x65,0x72,0x72,0x6f,0x72,0x3a,0x20,0x24,0x3a,0x20,0x63,0x61,0x6e,0x27,0x74,0x20,
+0x6f,0x70,0x65,0x6e,0x24,0x3a,0x20,0x6e,0x6f,0x74,0x20,0x45,0x58,0x45,0x24,0x3a,
+0x20,0x6e,0x6f,0x74,0x20,0x43,0x4f,0x46,0x46,0x20,0x28,0x43,0x68,0x65,0x63,0x6b,
+0x20,0x66,0x6f,0x72,0x20,0x76,0x69,0x72,0x75,0x73,0x65,0x73,0x29,0x24,0x6e,0x6f,
+0x20,0x44,0x50,0x4d,0x49,0x20,0x2d,0x20,0x47,0x65,0x74,0x20,0x63,0x73,0x64,0x70,
+0x6d,0x69,0x2a,0x62,0x2e,0x7a,0x69,0x70,0x24,0x6e,0x6f,0x20,0x44,0x4f,0x53,0x20,
+0x6d,0x65,0x6d,0x6f,0x72,0x79,0x24,0x6e,0x65,0x65,0x64,0x20,0x44,0x4f,0x53,0x20,
+0x33,0x24,0x63,0x61,0x6e,0x27,0x74,0x20,0x73,0x77,0x69,0x74,0x63,0x68,0x20,0x6d,
+0x6f,0x64,0x65,0x24,0x6e,0x6f,0x20,0x44,0x50,0x4d,0x49,0x20,0x73,0x65,0x6c,0x65,
+0x63,0x74,0x6f,0x72,0x73,0x24,0x6e,0x6f,0x20,0x44,0x50,0x4d,0x49,0x20,0x6d,0x65,
+0x6d,0x6f,0x72,0x79,0x24,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,
+0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hash.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hash.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hash.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hash.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,909 @@
+/* hash.c -- hash table routines for BFD
+   Copyright 1993, 1994, 1995, 1997, 1999, 2001, 2002, 2003, 2004, 2005,
+   2006, 2007, 2009, 2010, 2011  Free Software Foundation, Inc.
+   Written by Steve Chamberlain <sac@cygnus.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "objalloc.h"
+#include "libiberty.h"
+
+/*
+SECTION
+	Hash Tables
+
+@cindex Hash tables
+	BFD provides a simple set of hash table functions.  Routines
+	are provided to initialize a hash table, to free a hash table,
+	to look up a string in a hash table and optionally create an
+	entry for it, and to traverse a hash table.  There is
+	currently no routine to delete an string from a hash table.
+
+	The basic hash table does not permit any data to be stored
+	with a string.  However, a hash table is designed to present a
+	base class from which other types of hash tables may be
+	derived.  These derived types may store additional information
+	with the string.  Hash tables were implemented in this way,
+	rather than simply providing a data pointer in a hash table
+	entry, because they were designed for use by the linker back
+	ends.  The linker may create thousands of hash table entries,
+	and the overhead of allocating private data and storing and
+	following pointers becomes noticeable.
+
+	The basic hash table code is in <<hash.c>>.
+
+@menu
+@* Creating and Freeing a Hash Table::
+@* Looking Up or Entering a String::
+@* Traversing a Hash Table::
+@* Deriving a New Hash Table Type::
+@end menu
+
+INODE
+Creating and Freeing a Hash Table, Looking Up or Entering a String, Hash Tables, Hash Tables
+SUBSECTION
+	Creating and freeing a hash table
+
+@findex bfd_hash_table_init
+@findex bfd_hash_table_init_n
+	To create a hash table, create an instance of a <<struct
+	bfd_hash_table>> (defined in <<bfd.h>>) and call
+	<<bfd_hash_table_init>> (if you know approximately how many
+	entries you will need, the function <<bfd_hash_table_init_n>>,
+	which takes a @var{size} argument, may be used).
+	<<bfd_hash_table_init>> returns <<FALSE>> if some sort of
+	error occurs.
+
+@findex bfd_hash_newfunc
+	The function <<bfd_hash_table_init>> take as an argument a
+	function to use to create new entries.  For a basic hash
+	table, use the function <<bfd_hash_newfunc>>.  @xref{Deriving
+	a New Hash Table Type}, for why you would want to use a
+	different value for this argument.
+
+@findex bfd_hash_allocate
+	<<bfd_hash_table_init>> will create an objalloc which will be
+	used to allocate new entries.  You may allocate memory on this
+	objalloc using <<bfd_hash_allocate>>.
+
+@findex bfd_hash_table_free
+	Use <<bfd_hash_table_free>> to free up all the memory that has
+	been allocated for a hash table.  This will not free up the
+	<<struct bfd_hash_table>> itself, which you must provide.
+
+@findex bfd_hash_set_default_size
+	Use <<bfd_hash_set_default_size>> to set the default size of
+	hash table to use.
+
+INODE
+Looking Up or Entering a String, Traversing a Hash Table, Creating and Freeing a Hash Table, Hash Tables
+SUBSECTION
+	Looking up or entering a string
+
+@findex bfd_hash_lookup
+	The function <<bfd_hash_lookup>> is used both to look up a
+	string in the hash table and to create a new entry.
+
+	If the @var{create} argument is <<FALSE>>, <<bfd_hash_lookup>>
+	will look up a string.  If the string is found, it will
+	returns a pointer to a <<struct bfd_hash_entry>>.  If the
+	string is not found in the table <<bfd_hash_lookup>> will
+	return <<NULL>>.  You should not modify any of the fields in
+	the returns <<struct bfd_hash_entry>>.
+
+	If the @var{create} argument is <<TRUE>>, the string will be
+	entered into the hash table if it is not already there.
+	Either way a pointer to a <<struct bfd_hash_entry>> will be
+	returned, either to the existing structure or to a newly
+	created one.  In this case, a <<NULL>> return means that an
+	error occurred.
+
+	If the @var{create} argument is <<TRUE>>, and a new entry is
+	created, the @var{copy} argument is used to decide whether to
+	copy the string onto the hash table objalloc or not.  If
+	@var{copy} is passed as <<FALSE>>, you must be careful not to
+	deallocate or modify the string as long as the hash table
+	exists.
+
+INODE
+Traversing a Hash Table, Deriving a New Hash Table Type, Looking Up or Entering a String, Hash Tables
+SUBSECTION
+	Traversing a hash table
+
+@findex bfd_hash_traverse
+	The function <<bfd_hash_traverse>> may be used to traverse a
+	hash table, calling a function on each element.  The traversal
+	is done in a random order.
+
+	<<bfd_hash_traverse>> takes as arguments a function and a
+	generic <<void *>> pointer.  The function is called with a
+	hash table entry (a <<struct bfd_hash_entry *>>) and the
+	generic pointer passed to <<bfd_hash_traverse>>.  The function
+	must return a <<boolean>> value, which indicates whether to
+	continue traversing the hash table.  If the function returns
+	<<FALSE>>, <<bfd_hash_traverse>> will stop the traversal and
+	return immediately.
+
+INODE
+Deriving a New Hash Table Type, , Traversing a Hash Table, Hash Tables
+SUBSECTION
+	Deriving a new hash table type
+
+	Many uses of hash tables want to store additional information
+	which each entry in the hash table.  Some also find it
+	convenient to store additional information with the hash table
+	itself.  This may be done using a derived hash table.
+
+	Since C is not an object oriented language, creating a derived
+	hash table requires sticking together some boilerplate
+	routines with a few differences specific to the type of hash
+	table you want to create.
+
+	An example of a derived hash table is the linker hash table.
+	The structures for this are defined in <<bfdlink.h>>.  The
+	functions are in <<linker.c>>.
+
+	You may also derive a hash table from an already derived hash
+	table.  For example, the a.out linker backend code uses a hash
+	table derived from the linker hash table.
+
+@menu
+@* Define the Derived Structures::
+@* Write the Derived Creation Routine::
+@* Write Other Derived Routines::
+@end menu
+
+INODE
+Define the Derived Structures, Write the Derived Creation Routine, Deriving a New Hash Table Type, Deriving a New Hash Table Type
+SUBSUBSECTION
+	Define the derived structures
+
+	You must define a structure for an entry in the hash table,
+	and a structure for the hash table itself.
+
+	The first field in the structure for an entry in the hash
+	table must be of the type used for an entry in the hash table
+	you are deriving from.  If you are deriving from a basic hash
+	table this is <<struct bfd_hash_entry>>, which is defined in
+	<<bfd.h>>.  The first field in the structure for the hash
+	table itself must be of the type of the hash table you are
+	deriving from itself.  If you are deriving from a basic hash
+	table, this is <<struct bfd_hash_table>>.
+
+	For example, the linker hash table defines <<struct
+	bfd_link_hash_entry>> (in <<bfdlink.h>>).  The first field,
+	<<root>>, is of type <<struct bfd_hash_entry>>.  Similarly,
+	the first field in <<struct bfd_link_hash_table>>, <<table>>,
+	is of type <<struct bfd_hash_table>>.
+
+INODE
+Write the Derived Creation Routine, Write Other Derived Routines, Define the Derived Structures, Deriving a New Hash Table Type
+SUBSUBSECTION
+	Write the derived creation routine
+
+	You must write a routine which will create and initialize an
+	entry in the hash table.  This routine is passed as the
+	function argument to <<bfd_hash_table_init>>.
+
+	In order to permit other hash tables to be derived from the
+	hash table you are creating, this routine must be written in a
+	standard way.
+
+	The first argument to the creation routine is a pointer to a
+	hash table entry.  This may be <<NULL>>, in which case the
+	routine should allocate the right amount of space.  Otherwise
+	the space has already been allocated by a hash table type
+	derived from this one.
+
+	After allocating space, the creation routine must call the
+	creation routine of the hash table type it is derived from,
+	passing in a pointer to the space it just allocated.  This
+	will initialize any fields used by the base hash table.
+
+	Finally the creation routine must initialize any local fields
+	for the new hash table type.
+
+	Here is a boilerplate example of a creation routine.
+	@var{function_name} is the name of the routine.
+	@var{entry_type} is the type of an entry in the hash table you
+	are creating.  @var{base_newfunc} is the name of the creation
+	routine of the hash table type your hash table is derived
+	from.
+
+EXAMPLE
+
+.struct bfd_hash_entry *
+.@var{function_name} (struct bfd_hash_entry *entry,
+.                     struct bfd_hash_table *table,
+.                     const char *string)
+.{
+.  struct @var{entry_type} *ret = (@var{entry_type} *) entry;
+.
+. {* Allocate the structure if it has not already been allocated by a
+.    derived class.  *}
+.  if (ret == NULL)
+.    {
+.      ret = bfd_hash_allocate (table, sizeof (* ret));
+.      if (ret == NULL)
+.        return NULL;
+.    }
+.
+. {* Call the allocation method of the base class.  *}
+.  ret = ((@var{entry_type} *)
+.	 @var{base_newfunc} ((struct bfd_hash_entry *) ret, table, string));
+.
+. {* Initialize the local fields here.  *}
+.
+.  return (struct bfd_hash_entry *) ret;
+.}
+
+DESCRIPTION
+	The creation routine for the linker hash table, which is in
+	<<linker.c>>, looks just like this example.
+	@var{function_name} is <<_bfd_link_hash_newfunc>>.
+	@var{entry_type} is <<struct bfd_link_hash_entry>>.
+	@var{base_newfunc} is <<bfd_hash_newfunc>>, the creation
+	routine for a basic hash table.
+
+	<<_bfd_link_hash_newfunc>> also initializes the local fields
+	in a linker hash table entry: <<type>>, <<written>> and
+	<<next>>.
+
+INODE
+Write Other Derived Routines, , Write the Derived Creation Routine, Deriving a New Hash Table Type
+SUBSUBSECTION
+	Write other derived routines
+
+	You will want to write other routines for your new hash table,
+	as well.
+
+	You will want an initialization routine which calls the
+	initialization routine of the hash table you are deriving from
+	and initializes any other local fields.  For the linker hash
+	table, this is <<_bfd_link_hash_table_init>> in <<linker.c>>.
+
+	You will want a lookup routine which calls the lookup routine
+	of the hash table you are deriving from and casts the result.
+	The linker hash table uses <<bfd_link_hash_lookup>> in
+	<<linker.c>> (this actually takes an additional argument which
+	it uses to decide how to return the looked up value).
+
+	You may want a traversal routine.  This should just call the
+	traversal routine of the hash table you are deriving from with
+	appropriate casts.  The linker hash table uses
+	<<bfd_link_hash_traverse>> in <<linker.c>>.
+
+	These routines may simply be defined as macros.  For example,
+	the a.out backend linker hash table, which is derived from the
+	linker hash table, uses macros for the lookup and traversal
+	routines.  These are <<aout_link_hash_lookup>> and
+	<<aout_link_hash_traverse>> in aoutx.h.
+*/
+
+/* The default number of entries to use when creating a hash table.  */
+#define DEFAULT_SIZE 4051
+
+/* The following function returns a nearest prime number which is
+   greater than N, and near a power of two.  Copied from libiberty.
+   Returns zero for ridiculously large N to signify an error.  */
+
+static unsigned long
+higher_prime_number (unsigned long n)
+{
+  /* These are primes that are near, but slightly smaller than, a
+     power of two.  */
+  static const unsigned long primes[] =
+    {
+      (unsigned long) 31,
+      (unsigned long) 61,
+      (unsigned long) 127,
+      (unsigned long) 251,
+      (unsigned long) 509,
+      (unsigned long) 1021,
+      (unsigned long) 2039,
+      (unsigned long) 4093,
+      (unsigned long) 8191,
+      (unsigned long) 16381,
+      (unsigned long) 32749,
+      (unsigned long) 65521,
+      (unsigned long) 131071,
+      (unsigned long) 262139,
+      (unsigned long) 524287,
+      (unsigned long) 1048573,
+      (unsigned long) 2097143,
+      (unsigned long) 4194301,
+      (unsigned long) 8388593,
+      (unsigned long) 16777213,
+      (unsigned long) 33554393,
+      (unsigned long) 67108859,
+      (unsigned long) 134217689,
+      (unsigned long) 268435399,
+      (unsigned long) 536870909,
+      (unsigned long) 1073741789,
+      (unsigned long) 2147483647,
+					/* 4294967291L */
+      ((unsigned long) 2147483647) + ((unsigned long) 2147483644),
+  };
+
+  const unsigned long *low = &primes[0];
+  const unsigned long *high = &primes[sizeof (primes) / sizeof (primes[0])];
+
+  while (low != high)
+    {
+      const unsigned long *mid = low + (high - low) / 2;
+      if (n >= *mid)
+	low = mid + 1;
+      else
+	high = mid;
+    }
+
+  if (n >= *low)
+    return 0;
+
+  return *low;
+}
+
+static unsigned long bfd_default_hash_table_size = DEFAULT_SIZE;
+
+/* Create a new hash table, given a number of entries.  */
+
+bfd_boolean
+bfd_hash_table_init_n (struct bfd_hash_table *table,
+		       struct bfd_hash_entry *(*newfunc) (struct bfd_hash_entry *,
+							  struct bfd_hash_table *,
+							  const char *),
+		       unsigned int entsize,
+		       unsigned int size)
+{
+  unsigned long alloc;
+
+  alloc = size;
+  alloc *= sizeof (struct bfd_hash_entry *);
+  if (alloc / sizeof (struct bfd_hash_entry *) != size)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return FALSE;
+    }
+
+  table->memory = (void *) objalloc_create ();
+  if (table->memory == NULL)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return FALSE;
+    }
+  table->table = (struct bfd_hash_entry **)
+      objalloc_alloc ((struct objalloc *) table->memory, alloc);
+  if (table->table == NULL)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return FALSE;
+    }
+  memset ((void *) table->table, 0, alloc);
+  table->size = size;
+  table->entsize = entsize;
+  table->count = 0;
+  table->frozen = 0;
+  table->newfunc = newfunc;
+  return TRUE;
+}
+
+/* Create a new hash table with the default number of entries.  */
+
+bfd_boolean
+bfd_hash_table_init (struct bfd_hash_table *table,
+		     struct bfd_hash_entry *(*newfunc) (struct bfd_hash_entry *,
+							struct bfd_hash_table *,
+							const char *),
+		     unsigned int entsize)
+{
+  return bfd_hash_table_init_n (table, newfunc, entsize,
+				bfd_default_hash_table_size);
+}
+
+/* Free a hash table.  */
+
+void
+bfd_hash_table_free (struct bfd_hash_table *table)
+{
+  objalloc_free ((struct objalloc *) table->memory);
+  table->memory = NULL;
+}
+
+static inline unsigned long
+bfd_hash_hash (const char *string, unsigned int *lenp)
+{
+  const unsigned char *s;
+  unsigned long hash;
+  unsigned int len;
+  unsigned int c;
+
+  hash = 0;
+  len = 0;
+  s = (const unsigned char *) string;
+  while ((c = *s++) != '\0')
+    {
+      hash += c + (c << 17);
+      hash ^= hash >> 2;
+    }
+  len = (s - (const unsigned char *) string) - 1;
+  hash += len + (len << 17);
+  hash ^= hash >> 2;
+  if (lenp != NULL)
+    *lenp = len;
+  return hash;
+}
+
+/* Look up a string in a hash table.  */
+
+struct bfd_hash_entry *
+bfd_hash_lookup (struct bfd_hash_table *table,
+		 const char *string,
+		 bfd_boolean create,
+		 bfd_boolean copy)
+{
+  unsigned long hash;
+  struct bfd_hash_entry *hashp;
+  unsigned int len;
+  unsigned int _index;
+
+  hash = bfd_hash_hash (string, &len);
+  _index = hash % table->size;
+  for (hashp = table->table[_index];
+       hashp != NULL;
+       hashp = hashp->next)
+    {
+      if (hashp->hash == hash
+	  && strcmp (hashp->string, string) == 0)
+	return hashp;
+    }
+
+  if (! create)
+    return NULL;
+
+  if (copy)
+    {
+      char *new_string;
+
+      new_string = (char *) objalloc_alloc ((struct objalloc *) table->memory,
+                                            len + 1);
+      if (!new_string)
+	{
+	  bfd_set_error (bfd_error_no_memory);
+	  return NULL;
+	}
+      memcpy (new_string, string, len + 1);
+      string = new_string;
+    }
+
+  return bfd_hash_insert (table, string, hash);
+}
+
+/* Insert an entry in a hash table.  */
+
+struct bfd_hash_entry *
+bfd_hash_insert (struct bfd_hash_table *table,
+		 const char *string,
+		 unsigned long hash)
+{
+  struct bfd_hash_entry *hashp;
+  unsigned int _index;
+
+  hashp = (*table->newfunc) (NULL, table, string);
+  if (hashp == NULL)
+    return NULL;
+  hashp->string = string;
+  hashp->hash = hash;
+  _index = hash % table->size;
+  hashp->next = table->table[_index];
+  table->table[_index] = hashp;
+  table->count++;
+
+  if (!table->frozen && table->count > table->size * 3 / 4)
+    {
+      unsigned long newsize = higher_prime_number (table->size);
+      struct bfd_hash_entry **newtable;
+      unsigned int hi;
+      unsigned long alloc = newsize * sizeof (struct bfd_hash_entry *);
+
+      /* If we can't find a higher prime, or we can't possibly alloc
+	 that much memory, don't try to grow the table.  */
+      if (newsize == 0 || alloc / sizeof (struct bfd_hash_entry *) != newsize)
+	{
+	  table->frozen = 1;
+	  return hashp;
+	}
+
+      newtable = ((struct bfd_hash_entry **)
+		  objalloc_alloc ((struct objalloc *) table->memory, alloc));
+      if (newtable == NULL)
+	{
+	  table->frozen = 1;
+	  return hashp;
+	}
+      memset ((PTR) newtable, 0, alloc);
+
+      for (hi = 0; hi < table->size; hi ++)
+	while (table->table[hi])
+	  {
+	    struct bfd_hash_entry *chain = table->table[hi];
+	    struct bfd_hash_entry *chain_end = chain;
+
+	    while (chain_end->next && chain_end->next->hash == chain->hash)
+	      chain_end = chain_end->next;
+
+	    table->table[hi] = chain_end->next;
+	    _index = chain->hash % newsize;
+	    chain_end->next = newtable[_index];
+	    newtable[_index] = chain;
+	  }
+      table->table = newtable;
+      table->size = newsize;
+    }
+
+  return hashp;
+}
+
+/* Rename an entry in a hash table.  */
+
+void
+bfd_hash_rename (struct bfd_hash_table *table,
+		 const char *string,
+		 struct bfd_hash_entry *ent)
+{
+  unsigned int _index;
+  struct bfd_hash_entry **pph;
+
+  _index = ent->hash % table->size;
+  for (pph = &table->table[_index]; *pph != NULL; pph = &(*pph)->next)
+    if (*pph == ent)
+      break;
+  if (*pph == NULL)
+    abort ();
+
+  *pph = ent->next;
+  ent->string = string;
+  ent->hash = bfd_hash_hash (string, NULL);
+  _index = ent->hash % table->size;
+  ent->next = table->table[_index];
+  table->table[_index] = ent;
+}
+
+/* Replace an entry in a hash table.  */
+
+void
+bfd_hash_replace (struct bfd_hash_table *table,
+		  struct bfd_hash_entry *old,
+		  struct bfd_hash_entry *nw)
+{
+  unsigned int _index;
+  struct bfd_hash_entry **pph;
+
+  _index = old->hash % table->size;
+  for (pph = &table->table[_index];
+       (*pph) != NULL;
+       pph = &(*pph)->next)
+    {
+      if (*pph == old)
+	{
+	  *pph = nw;
+	  return;
+	}
+    }
+
+  abort ();
+}
+
+/* Allocate space in a hash table.  */
+
+void *
+bfd_hash_allocate (struct bfd_hash_table *table,
+		   unsigned int size)
+{
+  void * ret;
+
+  ret = objalloc_alloc ((struct objalloc *) table->memory, size);
+  if (ret == NULL && size != 0)
+    bfd_set_error (bfd_error_no_memory);
+  return ret;
+}
+
+/* Base method for creating a new hash table entry.  */
+
+struct bfd_hash_entry *
+bfd_hash_newfunc (struct bfd_hash_entry *entry,
+		  struct bfd_hash_table *table,
+		  const char *string ATTRIBUTE_UNUSED)
+{
+  if (entry == NULL)
+    entry = (struct bfd_hash_entry *) bfd_hash_allocate (table,
+                                                         sizeof (* entry));
+  return entry;
+}
+
+/* Traverse a hash table.  */
+
+void
+bfd_hash_traverse (struct bfd_hash_table *table,
+		   bfd_boolean (*func) (struct bfd_hash_entry *, void *),
+		   void * info)
+{
+  unsigned int i;
+
+  table->frozen = 1;
+  for (i = 0; i < table->size; i++)
+    {
+      struct bfd_hash_entry *p;
+
+      for (p = table->table[i]; p != NULL; p = p->next)
+	if (! (*func) (p, info))
+	  goto out;
+    }
+ out:
+  table->frozen = 0;
+}
+
+unsigned long
+bfd_hash_set_default_size (unsigned long hash_size)
+{
+  /* Extend this prime list if you want more granularity of hash table size.  */
+  static const unsigned long hash_size_primes[] =
+    {
+      31, 61, 127, 251, 509, 1021, 2039, 4091, 8191, 16381, 32749, 65537
+    };
+  unsigned int _index;
+
+  /* Work out best prime number near the hash_size.  */
+  for (_index = 0; _index < ARRAY_SIZE (hash_size_primes) - 1; ++_index)
+    if (hash_size <= hash_size_primes[_index])
+      break;
+
+  bfd_default_hash_table_size = hash_size_primes[_index];
+  return bfd_default_hash_table_size;
+}
+
+/* A few different object file formats (a.out, COFF, ELF) use a string
+   table.  These functions support adding strings to a string table,
+   returning the byte offset, and writing out the table.
+
+   Possible improvements:
+   + look for strings matching trailing substrings of other strings
+   + better data structures?  balanced trees?
+   + look at reducing memory use elsewhere -- maybe if we didn't have
+     to construct the entire symbol table at once, we could get by
+     with smaller amounts of VM?  (What effect does that have on the
+     string table reductions?)  */
+
+/* An entry in the strtab hash table.  */
+
+struct strtab_hash_entry
+{
+  struct bfd_hash_entry root;
+  /* Index in string table.  */
+  bfd_size_type index;
+  /* Next string in strtab.  */
+  struct strtab_hash_entry *next;
+};
+
+/* The strtab hash table.  */
+
+struct bfd_strtab_hash
+{
+  struct bfd_hash_table table;
+  /* Size of strtab--also next available index.  */
+  bfd_size_type size;
+  /* First string in strtab.  */
+  struct strtab_hash_entry *first;
+  /* Last string in strtab.  */
+  struct strtab_hash_entry *last;
+  /* Whether to precede strings with a two byte length, as in the
+     XCOFF .debug section.  */
+  bfd_boolean xcoff;
+};
+
+/* Routine to create an entry in a strtab.  */
+
+static struct bfd_hash_entry *
+strtab_hash_newfunc (struct bfd_hash_entry *entry,
+		     struct bfd_hash_table *table,
+		     const char *string)
+{
+  struct strtab_hash_entry *ret = (struct strtab_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = (struct strtab_hash_entry *) bfd_hash_allocate (table,
+                                                          sizeof (* ret));
+  if (ret == NULL)
+    return NULL;
+
+  /* Call the allocation method of the superclass.  */
+  ret = (struct strtab_hash_entry *)
+	 bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string);
+
+  if (ret)
+    {
+      /* Initialize the local fields.  */
+      ret->index = (bfd_size_type) -1;
+      ret->next = NULL;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Look up an entry in an strtab.  */
+
+#define strtab_hash_lookup(t, string, create, copy) \
+  ((struct strtab_hash_entry *) \
+   bfd_hash_lookup (&(t)->table, (string), (create), (copy)))
+
+/* Create a new strtab.  */
+
+struct bfd_strtab_hash *
+_bfd_stringtab_init (void)
+{
+  struct bfd_strtab_hash *table;
+  bfd_size_type amt = sizeof (* table);
+
+  table = (struct bfd_strtab_hash *) bfd_malloc (amt);
+  if (table == NULL)
+    return NULL;
+
+  if (!bfd_hash_table_init (&table->table, strtab_hash_newfunc,
+			    sizeof (struct strtab_hash_entry)))
+    {
+      free (table);
+      return NULL;
+    }
+
+  table->size = 0;
+  table->first = NULL;
+  table->last = NULL;
+  table->xcoff = FALSE;
+
+  return table;
+}
+
+/* Create a new strtab in which the strings are output in the format
+   used in the XCOFF .debug section: a two byte length precedes each
+   string.  */
+
+struct bfd_strtab_hash *
+_bfd_xcoff_stringtab_init (void)
+{
+  struct bfd_strtab_hash *ret;
+
+  ret = _bfd_stringtab_init ();
+  if (ret != NULL)
+    ret->xcoff = TRUE;
+  return ret;
+}
+
+/* Free a strtab.  */
+
+void
+_bfd_stringtab_free (struct bfd_strtab_hash *table)
+{
+  bfd_hash_table_free (&table->table);
+  free (table);
+}
+
+/* Get the index of a string in a strtab, adding it if it is not
+   already present.  If HASH is FALSE, we don't really use the hash
+   table, and we don't eliminate duplicate strings.  */
+
+bfd_size_type
+_bfd_stringtab_add (struct bfd_strtab_hash *tab,
+		    const char *str,
+		    bfd_boolean hash,
+		    bfd_boolean copy)
+{
+  struct strtab_hash_entry *entry;
+
+  if (hash)
+    {
+      entry = strtab_hash_lookup (tab, str, TRUE, copy);
+      if (entry == NULL)
+	return (bfd_size_type) -1;
+    }
+  else
+    {
+      entry = (struct strtab_hash_entry *) bfd_hash_allocate (&tab->table,
+                                                              sizeof (* entry));
+      if (entry == NULL)
+	return (bfd_size_type) -1;
+      if (! copy)
+	entry->root.string = str;
+      else
+	{
+	  char *n;
+
+	  n = (char *) bfd_hash_allocate (&tab->table, strlen (str) + 1);
+	  if (n == NULL)
+	    return (bfd_size_type) -1;
+	  entry->root.string = n;
+	}
+      entry->index = (bfd_size_type) -1;
+      entry->next = NULL;
+    }
+
+  if (entry->index == (bfd_size_type) -1)
+    {
+      entry->index = tab->size;
+      tab->size += strlen (str) + 1;
+      if (tab->xcoff)
+	{
+	  entry->index += 2;
+	  tab->size += 2;
+	}
+      if (tab->first == NULL)
+	tab->first = entry;
+      else
+	tab->last->next = entry;
+      tab->last = entry;
+    }
+
+  return entry->index;
+}
+
+/* Get the number of bytes in a strtab.  */
+
+bfd_size_type
+_bfd_stringtab_size (struct bfd_strtab_hash *tab)
+{
+  return tab->size;
+}
+
+/* Write out a strtab.  ABFD must already be at the right location in
+   the file.  */
+
+bfd_boolean
+_bfd_stringtab_emit (bfd *abfd, struct bfd_strtab_hash *tab)
+{
+  bfd_boolean xcoff;
+  struct strtab_hash_entry *entry;
+
+  xcoff = tab->xcoff;
+
+  for (entry = tab->first; entry != NULL; entry = entry->next)
+    {
+      const char *str;
+      size_t len;
+
+      str = entry->root.string;
+      len = strlen (str) + 1;
+
+      if (xcoff)
+	{
+	  bfd_byte buf[2];
+
+	  /* The output length includes the null byte.  */
+	  bfd_put_16 (abfd, (bfd_vma) len, buf);
+	  if (bfd_bwrite ((void *) buf, (bfd_size_type) 2, abfd) != 2)
+	    return FALSE;
+	}
+
+      if (bfd_bwrite ((void *) str, (bfd_size_type) len, abfd) != len)
+	return FALSE;
+    }
+
+  return TRUE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/host-aout.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/host-aout.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/host-aout.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/host-aout.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,88 @@
+/* BFD backend for local host's a.out binaries
+   Copyright 1990, 1991, 1992, 1994, 1995, 2001, 2005, 2007
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.  Probably John Gilmore's fault.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#define	ARCH_SIZE	32
+
+/* When porting to a new system, you must supply:
+
+	HOST_PAGE_SIZE		(optional)
+	HOST_SEGMENT_SIZE	(optional -- defaults to page size)
+	HOST_MACHINE_ARCH	(optional)
+	HOST_MACHINE_MACHINE	(optional)
+	HOST_TEXT_START_ADDR	(optional)
+	HOST_STACK_END_ADDR	(not used, except by trad-core ???)
+	HOST_BIG_ENDIAN_P	(required -- define if big-endian)
+
+   in the ./hosts/h-systemname.h file.  */
+
+#ifdef TRAD_HEADER
+#include TRAD_HEADER
+#endif
+
+#ifdef			HOST_PAGE_SIZE
+#define	TARGET_PAGE_SIZE	HOST_PAGE_SIZE
+#endif
+
+#ifdef			HOST_SEGMENT_SIZE
+#define	SEGMENT_SIZE	HOST_SEGMENT_SIZE
+#else
+#define	SEGMENT_SIZE	TARGET_PAGE_SIZE
+#endif
+
+#ifdef			HOST_TEXT_START_ADDR
+#define	TEXT_START_ADDR	HOST_TEXT_START_ADDR
+#endif
+
+#ifdef			HOST_STACK_END_ADDR
+#define	STACK_END_ADDR	HOST_STACK_END_ADDR
+#endif
+
+#ifdef			HOST_BIG_ENDIAN_P
+#define	TARGET_IS_BIG_ENDIAN_P
+#else
+#undef  TARGET_IS_BIG_ENDIAN_P
+#endif
+
+#include "libaout.h"           /* BFD a.out internal data structures */
+#include "aout/aout64.h"
+
+#ifdef HOST_MACHINE_ARCH
+#ifdef HOST_MACHINE_MACHINE
+#define SET_ARCH_MACH(abfd, execp) \
+  bfd_default_set_arch_mach(abfd, HOST_MACHINE_ARCH, HOST_MACHINE_MACHINE)
+#else
+#define SET_ARCH_MACH(abfd, execp) \
+  bfd_default_set_arch_mach(abfd, HOST_MACHINE_ARCH, 0)
+#endif
+#endif /* HOST_MACHINE_ARCH */
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (host_aout_,OP)
+#define TARGETNAME "a.out"
+
+#include "aout-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/alphalinux.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/alphalinux.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/alphalinux.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/alphalinux.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,25 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* Linux dumps "struct task_struct" at the end of the core-file.  This
+   structure is currently 1080 bytes long, but we allow up to 4096
+   bytes to allow for some future growth.  */
+#define TRAD_CORE_EXTRA_SIZE_ALLOWED		4096
+#define TRAD_UNIX_CORE_FILE_FAILING_SIGNAL(abfd) \
+  ((abfd)->tdata.trad_core_data->u.signal)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/alphavms.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/alphavms.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/alphavms.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/alphavms.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,81 @@
+/* alphavms.h -- BFD definitions for an openVMS host
+   Copyright 1996, 2000, 2001, 2005, 2007, 2008, 2009
+   Free Software Foundation, Inc.
+   Written by Klaus K�mpf (kkaempf@progis.de)
+   of proGIS Softwareentwicklung, Aachen, Germany
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include <stddef.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <string.h>
+#include <sys/file.h>
+#include <stdlib.h>
+#include <unixlib.h>
+#include <unixio.h>
+#include <time.h>
+
+#include "bfd.h"
+#include "filenames.h"
+
+#ifndef BFD_HOST_64_BIT
+/* Make the basic types 64-bit quantities on the host.
+   Also provide the support macros BFD needs.  */
+# ifdef __GNUC__
+#  define	BFD_HOST_64_BIT	long long
+# else
+#  define	BFD_HOST_64_BIT	long
+# endif
+typedef unsigned BFD_HOST_64_BIT uint64_type;
+typedef BFD_HOST_64_BIT int64_type;
+
+# define sprintf_vma(s,x) sprintf (s, "%016lx", x) /* BFD_HOST_64_BIT */
+# define fprintf_vma(f,x) fprintf (f, "%016lx", x) /* BFD_HOST_64_BIT */
+
+# define BYTES_IN_PRINTF_INT 4
+
+/* These must have type unsigned long because they are used as
+   arguments in printf functions.  */
+# define uint64_typeLOW(x) ((unsigned long) (((x) & 0xffffffff))) /* BFD_HOST_64_BIT */
+# define uint64_typeHIGH(x) ((unsigned long) (((x) >> 32) & 0xffffffff)) /* BFD_HOST_64_BIT */
+
+#endif /* BFD_HOST_64_BIT */
+
+#include "fopen-vms.h"
+
+#define NO_FCNTL 1
+
+#ifndef O_ACCMODE
+#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
+#endif
+
+extern int getpagesize (void);
+extern char *stpcpy (char *, const char *);
+
+/* No intl.  */
+#define gettext(Msgid) (Msgid)
+#define dgettext(Domainname, Msgid) (Msgid)
+#define dcgettext(Domainname, Msgid, Category) (Msgid)
+#define textdomain(Domainname) while (0) /* nothing */
+#define bindtextdomain(Domainname, Dirname) while (0) /* nothing */
+#define _(String) (String)
+#define N_(String) (String)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/decstation.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/decstation.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/decstation.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/decstation.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,36 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* Hopefully this should include either machine/param.h (Ultrix) or
+   machine/machparam.h (Mach), whichever is its name on this system.  */
+#include <sys/param.h>
+
+#include <machine/vmparam.h>
+
+#define	HOST_PAGE_SIZE		NBPG
+/* #define	HOST_SEGMENT_SIZE	NBPG -- we use HOST_DATA_START_ADDR */
+#define	HOST_MACHINE_ARCH	bfd_arch_mips
+/* #define	HOST_MACHINE_MACHINE	 */
+
+#define	HOST_TEXT_START_ADDR		USRTEXT
+#define	HOST_DATA_START_ADDR		USRDATA
+#define	HOST_STACK_END_ADDR		USRSTACK
+
+#define TRAD_UNIX_CORE_FILE_FAILING_SIGNAL(core_bfd) \
+  ((core_bfd)->tdata.trad_core_data->u.u_arg[0])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/delta68.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/delta68.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/delta68.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/delta68.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,33 @@
+/* Copyright 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* Definitions for a Motorola Delta 3300 box running System V R3.0.
+   Contributed by manfred@lts.sel.alcatel.de.  */
+
+#include <sys/param.h>
+
+/* Definitions used by trad-core.c.  */
+#define	NBPG			NBPC
+#define	HOST_DATA_START_ADDR	u.u_exdata.ux_datorg
+#define	HOST_TEXT_START_ADDR	u.u_exdata.ux_txtorg
+/* User's stack, copied from sys/param.h  */
+#define HOST_STACK_END_ADDR	USRSTACK
+#define	UPAGES			USIZE
+#define	TRAD_UNIX_CORE_FILE_FAILING_SIGNAL(abfd) \
+  abfd->tdata.trad_core_data->u.u_abort
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/dpx2.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/dpx2.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/dpx2.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/dpx2.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,27 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* Definitions that are needed for core files.  Core section sizes for
+   the DPX2 are in bytes.  */
+
+#include <sys/param.h>
+#define NBPG 1
+#define UPAGES (USIZE * NBPP)
+#define HOST_DATA_START_ADDR (u.u_exdata.ux_datorg)
+#define HOST_STACK_END_ADDR (USERSTACK)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/hp300bsd.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/hp300bsd.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/hp300bsd.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/hp300bsd.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,32 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include <sys/param.h>
+#ifdef BSD4_4
+#define NO_CORE_COMMAND
+#endif
+
+#define	HOST_PAGE_SIZE		NBPG
+#define	HOST_SEGMENT_SIZE	NBPG	/* Data seg start addr rounds to NBPG */
+#define	HOST_MACHINE_ARCH	bfd_arch_m68k
+/* #define	HOST_MACHINE_MACHINE	 */
+
+#define	HOST_TEXT_START_ADDR		0
+#define	HOST_STACK_END_ADDR		0xfff00000
+#define	HOST_BIG_ENDIAN_P
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/i386bsd.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/i386bsd.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/i386bsd.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/i386bsd.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,51 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* Intel 386 running any BSD Unix.  */
+
+#include <machine/param.h>
+#include <machine/vmparam.h>
+
+/* Recent versions of FreeBSD don't define NBPG.  */
+#ifndef NBPG
+#ifdef PAGE_SIZE
+#define NBPG PAGE_SIZE
+#endif
+#endif
+
+#define	HOST_PAGE_SIZE		NBPG
+#define	HOST_MACHINE_ARCH	bfd_arch_i386
+#define	HOST_TEXT_START_ADDR		USRTEXT
+
+/* Jolitz suggested defining HOST_STACK_END_ADDR to
+   (u.u_kproc.kp_eproc.e_vm.vm_maxsaddr + MAXSSIZ), which should work on
+   both BSDI and 386BSD, but that is believed not to work for BSD 4.4.  */
+
+#ifdef __bsdi__
+/* This seems to be the right thing for BSDI.  */
+#define	HOST_STACK_END_ADDR		USRSTACK
+#define HOST_DATA_START_ADDR ((bfd_vma)u.u_kproc.kp_eproc.e_vm.vm_daddr)
+#else
+/* This seems to be the right thing for 386BSD release 0.1.  */
+#define	HOST_STACK_END_ADDR		(USRSTACK - MAXSSIZ)
+#endif
+
+#define TRAD_UNIX_CORE_FILE_FAILING_SIGNAL(core_bfd) \
+  ((core_bfd)->tdata.trad_core_data->u.u_sig)
+#define u_comm u_kproc.kp_proc.p_comm
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/i386linux.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/i386linux.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/i386linux.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/i386linux.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,27 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* Linux writes the task structure at the end of the core file.  Currently it
+   is 2912 bytes.  It is possible that this should be a pickier check, but
+   we should probably not be too picky (the size of the task structure might
+   vary, and if it's not the length we expect it to be, it doesn't affect
+   our ability to process the core file).  So allow 0-4096 extra bytes at
+   the end.  */
+
+#define TRAD_CORE_EXTRA_SIZE_ALLOWED 4096
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/i386mach3.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/i386mach3.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/i386mach3.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/i386mach3.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,44 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include <machine/vmparam.h>
+#include <sys/param.h>
+
+/* This is an ugly way to hack around the incorrect
+ * definition of UPAGES in i386/machparam.h.
+ *
+ * The definition should specify the size reserved
+ * for "struct user" in core files in PAGES,
+ * but instead it gives it in 512-byte core-clicks
+ * for i386 and i860. UPAGES is used only in trad-core.c.
+ */
+#if UPAGES == 16
+#undef  UPAGES
+#define UPAGES 2
+#endif
+
+#if UPAGES != 2
+FIXME!! UPAGES is neither 2 nor 16
+#endif
+
+#define	HOST_PAGE_SIZE		1
+#define	HOST_SEGMENT_SIZE	NBPG
+#define	HOST_MACHINE_ARCH	bfd_arch_i386
+#define	HOST_TEXT_START_ADDR	USRTEXT
+#define	HOST_STACK_END_ADDR	USRSTACK
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/i386sco.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/i386sco.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/i386sco.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/i386sco.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,38 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* Core file stuff.  At least some, perhaps all, of the following
+   defines work on many more systems than just SCO.  */
+
+#define NBPG NBPC
+#define UPAGES USIZE
+#define HOST_DATA_START_ADDR u.u_exdata.ux_datorg
+#define HOST_STACK_START_ADDR u.u_sub
+#define TRAD_UNIX_CORE_FILE_FAILING_SIGNAL(abfd) \
+  ((core_upage(abfd)->u_sysabort != 0) \
+   ? core_upage(abfd)->u_sysabort \
+   : -1)
+
+/* According to the manpage, a version 2 SCO corefile can contain
+   various additional sections (it is cleverly arranged so the u area,
+   data, and stack are first where we can find them).  So without
+   writing lots of code to parse all their headers and stuff, we can't
+   know whether a corefile is bigger than it should be.  */
+
+#define TRAD_CORE_ALLOW_ANY_EXTRA_SIZE 1
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/i860mach3.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/i860mach3.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/i860mach3.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/i860mach3.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,46 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file was hacked from i386mach3.h   [dolan@ssd.intel.com] */
+
+#include <machine/vmparam.h>
+#include <sys/param.h>
+
+/* This is an ugly way to hack around the incorrect
+ * definition of UPAGES in i386/machparam.h.
+ *
+ * The definition should specify the size reserved
+ * for "struct user" in core files in PAGES,
+ * but instead it gives it in 512-byte core-clicks
+ * for i386 and i860. UPAGES is used only in trad-core.c.
+ */
+#if UPAGES == 16
+#undef  UPAGES
+#define UPAGES 2
+#endif
+
+#if UPAGES != 2
+FIXME!! UPAGES is neither 2 nor 16
+#endif
+
+#define	HOST_PAGE_SIZE		1
+#define	HOST_SEGMENT_SIZE	NBPG
+#define	HOST_MACHINE_ARCH	bfd_arch_i860
+#define	HOST_TEXT_START_ADDR	USRTEXT
+#define	HOST_STACK_END_ADDR	USRSTACK
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/m68kaux.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/m68kaux.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/m68kaux.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/m68kaux.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,35 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* Definitions for an Apple Macintosh running A/UX 3.x. */
+
+#include <sys/param.h>
+#include <sys/page.h>
+
+/* Definitions used by trad-core.c.  */
+#define	NBPG			NBPP
+
+#define	HOST_DATA_START_ADDR	u.u_exdata.ux_datorg
+#define	HOST_TEXT_START_ADDR	u.u_exdata.ux_txtorg
+#define	HOST_STACK_END_ADDR	0x100000000
+
+#define	UPAGES			USIZE
+
+#define	TRAD_UNIX_CORE_FILE_FAILING_SIGNAL(abfd) \
+  (abfd->tdata.trad_core_data->u.u_arg[0])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/m68klinux.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/m68klinux.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/m68klinux.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/m68klinux.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,25 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* Linux dumps "struct task_struct" at the end of the core-file.  This
+   structure is currently 2512 bytes long, but we allow up to 4096
+   bytes to allow for some future growth.  */
+#define TRAD_CORE_EXTRA_SIZE_ALLOWED		4096
+#define TRAD_UNIX_CORE_FILE_FAILING_SIGNAL(abfd) \
+  ((abfd)->tdata.trad_core_data->u.signal)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/m88kmach3.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/m88kmach3.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/m88kmach3.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/m88kmach3.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,30 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include <machine/vmparam.h>
+#include <sys/param.h>
+
+#undef UPAGES
+#define UPAGES 3
+
+#define	HOST_PAGE_SIZE		NBPG
+#define	HOST_SEGMENT_SIZE	NBPG
+#define	HOST_MACHINE_ARCH	bfd_arch_m88k
+#define	HOST_TEXT_START_ADDR	USRTEXT
+#define	HOST_STACK_END_ADDR	USRSTACK
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/mipsbsd.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/mipsbsd.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/mipsbsd.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/mipsbsd.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,31 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include <machine/param.h>
+#include <machine/vmparam.h>
+#undef ALIGN
+
+#define	HOST_PAGE_SIZE		NBPG
+/* #define	HOST_SEGMENT_SIZE	NBPG -- we use HOST_DATA_START_ADDR */
+#define	HOST_MACHINE_ARCH	bfd_arch_mips
+/* #define	HOST_MACHINE_MACHINE	 */
+
+#define	HOST_TEXT_START_ADDR		USRTEXT
+#define	HOST_STACK_END_ADDR		USRSTACK
+#define NO_CORE_COMMAND
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/mipsmach3.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/mipsmach3.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/mipsmach3.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/mipsmach3.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,29 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include <machine/vmparam.h>
+#include <machine/machparam.h>
+#include <sys/param.h>
+
+#define	HOST_PAGE_SIZE		NBPG
+/* #define	HOST_SEGMENT_SIZE	NBPG  */
+#define	HOST_MACHINE_ARCH	bfd_arch_mips
+#define	HOST_TEXT_START_ADDR	USRTEXT
+#define	HOST_DATA_START_ADDR	USRDATA
+#define	HOST_STACK_END_ADDR	USRSTACK
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/news-mips.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/news-mips.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/news-mips.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/news-mips.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,31 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* Sony News running NewsOS 3.2.  */
+
+#include <sys/param.h>
+#include <machine/vmparam.h>
+
+#define HOST_PAGE_SIZE NBPG
+
+#define HOST_MACHINE_ARCH bfd_arch_mips
+
+#define HOST_TEXT_START_ADDR USRTEXT
+#define HOST_DATA_START_ADDR USRDATA
+#define HOST_STACK_END_ADDR USRSTACK
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/news.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/news.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/news.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/news.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,28 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* Sony News running NewsOS 3.2.  */
+
+#include <machine/vmparam.h>
+
+#define HOST_PAGE_SIZE NBPG
+#define HOST_SEGMENT_SIZE NBPG
+#define HOST_MACHINE_ARCH bfd_arch_m68k
+#define HOST_TEXT_START_ADDR 0
+#define HOST_STACK_END_ADDR (KERNBASE - (UPAGES * NBPG))
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/pc532mach.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/pc532mach.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/pc532mach.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/pc532mach.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,43 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include <machine/vmparam.h>
+#include <sys/param.h>
+
+/* This is an ugly way to hack around the incorrect
+ * definition of UPAGES in ns532/machparam.h.
+ *
+ * The definition should specify the size reserved
+ * for "struct user" in core files in PAGES,
+ * but instead it gives it in 512-byte core-clicks
+ * for ns532, i386 and i860. UPAGES is used only in trad-core.c.
+ */
+#if UPAGES == 16
+#undef  UPAGES
+#define UPAGES 2
+#endif
+
+#if UPAGES != 2
+#error UPAGES is neither 2 nor 16
+#endif
+
+#define	HOST_PAGE_SIZE		1
+#define	HOST_SEGMENT_SIZE	NBPG
+#define	HOST_TEXT_START_ADDR	USRTEXT
+#define	HOST_STACK_END_ADDR	USRSTACK
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/riscos.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/riscos.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/riscos.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/riscos.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,29 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* RISC/os 4.52C, and presumably other versions.  */
+
+#include <bsd43/machine/machparam.h>
+#include <bsd43/machine/vmparam.h>
+
+#define NBPG BSD43_NBPG
+#define UPAGES BSD43_UPAGES
+#define HOST_TEXT_START_ADDR BSD43_USRTEXT
+#define HOST_DATA_START_ADDR BSD43_USRDATA
+#define HOST_STACK_END_ADDR BSD43_USRSTACK
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/symmetry.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/symmetry.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/symmetry.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/symmetry.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,39 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* Symmetry running either dynix 3.1 (bsd) or ptx (sysv).  */
+
+#define NBPG 4096
+#define UPAGES 1
+
+#ifdef _SEQUENT_
+/* ptx */
+#define HOST_TEXT_START_ADDR 0
+#define HOST_STACK_END_ADDR 0x3fffe000
+#define TRAD_CORE_USER_OFFSET ((UPAGES * NBPG) - sizeof (struct user))
+#else
+/* dynix */
+#define HOST_TEXT_START_ADDR 0x1000
+#define HOST_DATA_START_ADDR (NBPG * u.u_tsize)
+#define HOST_STACK_END_ADDR 0x3ffff000
+#define TRAD_UNIX_CORE_FILE_FAILING_SIGNAL(core_bfd) \
+  ((core_bfd)->tdata.trad_core_data->u.u_arg[0])
+#endif
+
+#define TRAD_CORE_DSIZE_INCLUDES_TSIZE
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/tahoe.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/tahoe.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/tahoe.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/tahoe.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,31 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define	NO_CORE_COMMAND
+
+#undef	ALIGN			/* They use it, we use it too */
+#include <machine/param.h>
+#undef	ALIGN			/* They use it, we use it too */
+
+#define	HOST_PAGE_SIZE		NBPG
+#define	HOST_MACHINE_ARCH	bfd_arch_tahoe
+
+#define	HOST_TEXT_START_ADDR	0
+#define	HOST_STACK_END_ADDR	(KERNBASE - (UPAGES * NBPG))
+#define	HOST_BIG_ENDIAN_P
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/vaxbsd.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/vaxbsd.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/vaxbsd.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/vaxbsd.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,31 @@
+/* Copyright 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define	NO_CORE_COMMAND		/* No command name in core file */
+
+#undef	ALIGN			/* They use it, we use it too */
+
+/* Note that HOST_PAGE_SIZE -- the page size as far as executable files
+   are concerned -- is not the same as NBPG, because of page clustering.  */
+#define	HOST_PAGE_SIZE		1024
+#define	HOST_MACHINE_ARCH	bfd_arch_vax
+
+#define	HOST_TEXT_START_ADDR	0
+#define	HOST_STACK_END_ADDR	(0x80000000 - (UPAGES * NBPG))
+#undef	HOST_BIG_ENDIAN_P
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/vaxlinux.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/vaxlinux.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/vaxlinux.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/vaxlinux.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,21 @@
+/* Copyright 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define TRAD_CORE_EXTRA_SIZE_ALLOWED	4096
+#define HOST_MACHINE_ARCH		bfd_arch_vax
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/vaxult.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/vaxult.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/vaxult.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/vaxult.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,27 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include <machine/param.h>
+#include <machine/vmparam.h>
+#define	HOST_PAGE_SIZE		(NBPG*CLSIZE)
+#define	HOST_MACHINE_ARCH	bfd_arch_vax
+
+#define	HOST_TEXT_START_ADDR	USRTEXT
+#define	HOST_STACK_END_ADDR	USRSTACK
+#undef	HOST_BIG_ENDIAN_P
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/vaxult2.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/vaxult2.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/vaxult2.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/vaxult2.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,27 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include <machine/param.h>
+#include <machine/vmparam.h>
+#define	HOST_PAGE_SIZE		(NBPG*CLSIZE)
+#define	HOST_MACHINE_ARCH	bfd_arch_vax
+
+#define	HOST_TEXT_START_ADDR	USRTEXT
+#define	HOST_STACK_END_ADDR	USRSTACK
+#undef	HOST_BIG_ENDIAN_P
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/x86-64linux.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/x86-64linux.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hosts/x86-64linux.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hosts/x86-64linux.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,190 @@
+/* Copyright (C) 2006, 2011
+   Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+/* This is somewhat modelled after the file of the same name on SVR4
+   systems.  It provides a definition of the core file format for ELF
+   used on Linux.  It doesn't have anything to do with the /proc file
+   system, even though Linux has one.
+
+   Anyway, the whole purpose of this file is for GDB and GDB only.
+   Don't read too much into it.  Don't use it for anything other than
+   GDB unless you know what you are doing.  */
+
+#include <features.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
+/* We define here only the symbols differing from their 64-bit variant.  */
+#include <sys/procfs.h>
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#else
+typedef unsigned int uint32_t;
+typedef unsigned long long int uint64_t;
+#endif
+
+#undef HAVE_PRPSINFO32_T
+#define HAVE_PRPSINFO32_T
+#undef HAVE_PRPSINFO32_T_PR_PID
+#define HAVE_PRPSINFO32_T_PR_PID
+
+#undef HAVE_PRSTATUS32_T
+#define HAVE_PRSTATUS32_T
+
+/* These are the 32-bit x86 structures.  */
+
+struct user_regs32_struct
+{
+  int32_t ebx;
+  int32_t ecx;
+  int32_t edx;
+  int32_t esi;
+  int32_t edi;
+  int32_t ebp;
+  int32_t eax;
+  int32_t xds;
+  int32_t xes;
+  int32_t xfs;
+  int32_t xgs;
+  int32_t orig_eax;
+  int32_t eip;
+  int32_t xcs;
+  int32_t eflags;
+  int32_t esp;
+  int32_t xss;
+};
+
+struct user_regsx32_struct
+{
+  uint64_t r15;
+  uint64_t r14;
+  uint64_t r13;
+  uint64_t r12;
+  uint64_t rbp;
+  uint64_t rbx;
+  uint64_t r11;
+  uint64_t r10;
+  uint64_t r9;
+  uint64_t r8;
+  uint64_t rax;
+  uint64_t rcx;
+  uint64_t rdx;
+  uint64_t rsi;
+  uint64_t rdi;
+  uint64_t orig_rax;
+  uint64_t rip;
+  uint64_t cs;
+  uint64_t eflags;
+  uint64_t rsp;
+  uint64_t ss;
+  uint64_t fs_base;
+  uint64_t gs_base;
+  uint64_t ds;
+  uint64_t es;
+  uint64_t fs;
+  uint64_t gs;
+};
+
+/* Type for a general-purpose register.  */
+typedef uint32_t elf_greg32_t;
+typedef uint64_t elf_gregx32_t;
+
+/* And the whole bunch of them.  We could have used `struct
+   user_regs_struct' directly in the typedef, but tradition says that
+   the register set is an array, which does have some peculiar
+   semantics, so leave it that way.  */
+#define ELF_NGREG32 (sizeof (struct user_regs32_struct) / sizeof(elf_greg32_t))
+typedef elf_greg32_t elf_gregset32_t[ELF_NGREG32];
+#define ELF_NGREGX32 (sizeof (struct user_regsx32_struct) / sizeof(elf_gregx32_t))
+typedef elf_gregx32_t elf_gregsetx32_t[ELF_NGREGX32];
+
+/* Definitions to generate Intel SVR4-like core files.  These mostly
+   have the same names as the SVR4 types with "elf_" tacked on the
+   front to prevent clashes with Linux definitions, and the typedef
+   forms have been avoided.  This is mostly like the SVR4 structure,
+   but more Linuxy, with things that Linux does not support and which
+   GDB doesn't really use excluded.  */
+
+struct prstatus32_timeval
+  {
+    int tv_sec;
+    int tv_usec;
+  };
+
+struct elf_prstatus32
+  {
+    struct elf_siginfo pr_info;		/* Info associated with signal.  */
+    short int pr_cursig;		/* Current signal.  */
+    unsigned int pr_sigpend;		/* Set of pending signals.  */
+    unsigned int pr_sighold;		/* Set of held signals.  */
+    pid_t pr_pid;
+    pid_t pr_ppid;
+    pid_t pr_pgrp;
+    pid_t pr_sid;
+    struct prstatus32_timeval pr_utime;		/* User time.  */
+    struct prstatus32_timeval pr_stime;		/* System time.  */
+    struct prstatus32_timeval pr_cutime;	/* Cumulative user time.  */
+    struct prstatus32_timeval pr_cstime;	/* Cumulative system time.  */
+    elf_gregset32_t pr_reg;		/* GP registers.  */
+    int pr_fpvalid;			/* True if math copro being used.  */
+  };
+
+struct elf_prstatusx32
+  {
+    struct elf_siginfo pr_info;		/* Info associated with signal.  */
+    short int pr_cursig;		/* Current signal.  */
+    unsigned int pr_sigpend;		/* Set of pending signals.  */
+    unsigned int pr_sighold;		/* Set of held signals.  */
+    pid_t pr_pid;
+    pid_t pr_ppid;
+    pid_t pr_pgrp;
+    pid_t pr_sid;
+    struct prstatus32_timeval pr_utime;		/* User time.  */
+    struct prstatus32_timeval pr_stime;		/* System time.  */
+    struct prstatus32_timeval pr_cutime;	/* Cumulative user time.  */
+    struct prstatus32_timeval pr_cstime;	/* Cumulative system time.  */
+    elf_gregsetx32_t pr_reg;		/* GP registers.  */
+    int pr_fpvalid;			/* True if math copro being used.  */
+  };
+
+struct elf_prpsinfo32
+  {
+    char pr_state;			/* Numeric process state.  */
+    char pr_sname;			/* Char for pr_state.  */
+    char pr_zomb;			/* Zombie.  */
+    char pr_nice;			/* Nice val.  */
+    unsigned int pr_flag;		/* Flags.  */
+    unsigned short int pr_uid;
+    unsigned short int pr_gid;
+    int pr_pid, pr_ppid, pr_pgrp, pr_sid;
+    /* Lots missing */
+    char pr_fname[16];			/* Filename of executable.  */
+    char pr_psargs[ELF_PRARGSZ];	/* Initial part of arg list.  */
+  };
+
+
+/* The rest of this file provides the types for emulation of the
+   Solaris <proc_service.h> interfaces that should be implemented by
+   users of libthread_db.  */
+
+/* Process status and info.  In the end we do provide typedefs for them.  */
+typedef struct elf_prstatus32 prstatus32_t;
+typedef struct elf_prstatusx32 prstatusx32_t;
+typedef struct elf_prpsinfo32 prpsinfo32_t;
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hp300bsd.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hp300bsd.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hp300bsd.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hp300bsd.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,41 @@
+/* BFD back-end for HP 9000/300 (68000-based) machines running BSD Unix.
+   Copyright 1992, 1994, 1995, 2001, 2003, 2005, 2007, 2009
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define TARGET_IS_BIG_ENDIAN_P
+#define N_HEADER_IN_TEXT(x) 0
+#define ENTRY_CAN_BE_ZERO
+#define TEXT_START_ADDR 0
+#define TARGET_PAGE_SIZE 4096
+#define SEGMENT_SIZE TARGET_PAGE_SIZE
+#define DEFAULT_ARCH bfd_arch_m68k
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (hp300bsd_,OP)
+#define TARGETNAME "a.out-hp300bsd"
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libaout.h"
+
+#include "aout-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hp300hpux.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hp300hpux.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hp300hpux.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hp300hpux.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,882 @@
+/* BFD backend for hp-ux 9000/300
+   Copyright 1990, 1991, 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2007, 2010 Free Software Foundation, Inc.
+   Written by Glenn Engel.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/*  hpux native  ------------> |               |
+                               | hp300hpux bfd | ----------> hpux w/gnu ext
+    hpux w/gnu extension ----> |               |
+
+    Support for the 9000/[34]00 has several limitations.
+      1. Shared libraries are not supported.
+      2. The output format from this bfd is not usable by native tools.
+
+    The primary motivation for writing this bfd was to allow use of
+    gdb and gcc for host based debugging and not to mimic the hp-ux tools
+    in every detail.  This leads to a significant simplification of the
+    code and a leap in performance.  The decision to not output hp native
+    compatible objects was further strengthened by the fact that the richness
+    of the gcc compiled objects could not be represented without loss of
+    information.  For example, while the hp format supports the concept of
+    secondary symbols, it does not support indirect symbols.  Another
+    reason is to maintain backwards compatibility with older implementations
+    of gcc on hpux which used 'hpxt' to translate .a and .o files into a
+    format which could be readily understood by the gnu linker and gdb.
+    This allows reading hp secondary symbols and converting them into
+    indirect symbols but the reverse it not always possible.
+
+    Another example of differences is that the hp format stores symbol offsets
+    in the object code while the gnu utilities use a field in the
+    relocation record for this.  To support the hp native format, the object
+    code would need to be patched with the offsets when producing .o files.
+
+    The basic technique taken in this implementation is to #include the code
+    from aoutx.h and aout-target.h with appropriate #defines to override
+    code where a unique implementation is needed:
+
+    {
+        #define a bunch of stuff
+        #include <aoutx.h>
+
+        implement a bunch of functions
+
+        #include "aout-target.h"
+    }
+
+    The hp symbol table is a bit different than other a.out targets.  Instead
+    of having an array of nlist items and an array of strings, hp's format
+    has them mixed together in one structure.  In addition, the strings are
+    not null terminated.  It looks something like this:
+
+    nlist element 1
+    string1
+    nlist element 2
+    string2
+    ...
+
+    The whole symbol table is read as one chunk and then we march thru it
+    and convert it to canonical form.  As we march thru the table, we copy
+    the nlist data into the internal form and we compact the strings and null
+    terminate them, using storage from the already allocated symbol table:
+
+    string1
+    null
+    string2
+    null
+ */
+
+/* @@ Is this really so different from normal a.out that it needs to include
+   aoutx.h?  We should go through this file sometime and see what can be made
+   more dependent on aout32.o and what might need to be broken off and accessed
+   through the backend_data field.  Or, maybe we really do need such a
+   completely separate implementation.  I don't have time to investigate this
+   much further right now.  [raeburn:19930428.2124EST] */
+/* @@ Also, note that there wind up being two versions of some routines, with
+   different names, only one of which actually gets used.  For example:
+	slurp_symbol_table
+	swap_std_reloc_in
+	slurp_reloc_table
+	canonicalize_symtab
+	get_symtab_upper_bound
+	canonicalize_reloc
+	mkobject
+   This should also be fixed.  */
+
+#define TARGETNAME "a.out-hp300hpux"
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (hp300hpux_,OP)
+
+#define external_exec hp300hpux_exec_bytes
+#define external_nlist hp300hpux_nlist_bytes
+
+#include "aout/hp300hpux.h"
+
+/* define these so we can compile unused routines in aoutx.h */
+#define e_strx  e_shlib
+#define e_other e_length
+#define e_desc  e_almod
+
+#define AR_PAD_CHAR '/'
+#define TARGET_IS_BIG_ENDIAN_P
+#define DEFAULT_ARCH bfd_arch_m68k
+
+#define MY_get_section_contents aout_32_get_section_contents
+#define MY_slurp_armap bfd_slurp_bsd_armap_f2
+
+/***********************************************/
+/* provide overrides for routines in this file */
+/***********************************************/
+/* these don't use MY because that causes problems within JUMP_TABLE
+   (CONCAT2 winds up being expanded recursively, which ANSI C compilers
+   will not do).  */
+#define MY_canonicalize_symtab hp300hpux_canonicalize_symtab
+#define MY_get_symtab_upper_bound hp300hpux_get_symtab_upper_bound
+#define MY_canonicalize_reloc hp300hpux_canonicalize_reloc
+#define MY_write_object_contents hp300hpux_write_object_contents
+
+#define MY_read_minisymbols _bfd_generic_read_minisymbols
+#define MY_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
+
+#define MY_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
+#define MY_bfd_link_add_symbols _bfd_generic_link_add_symbols
+#define MY_final_link_callback unused
+#define MY_bfd_final_link _bfd_generic_final_link
+
+/* Until and unless we convert the slurp_reloc and slurp_symtab
+   routines in this file, we can not use the default aout
+   free_cached_info routine which assumes that the relocs and symtabs
+   were allocated using malloc.  */
+#define MY_bfd_free_cached_info bfd_true
+
+#define hp300hpux_write_syms aout_32_write_syms
+
+#define MY_callback MY(callback)
+
+#define MY_exec_hdr_flags 0x2
+
+#define NAME_swap_exec_header_in NAME(hp300hpux_32_,swap_exec_header_in)
+
+#define HP_SYMTYPE_UNDEFINED	0x00
+#define HP_SYMTYPE_ABSOLUTE	0x01
+#define HP_SYMTYPE_TEXT		0x02
+#define HP_SYMTYPE_DATA		0x03
+#define HP_SYMTYPE_BSS		0x04
+#define HP_SYMTYPE_COMMON	0x05
+
+#define HP_SYMTYPE_TYPE		0x0F
+#define HP_SYMTYPE_FILENAME	0x1F
+
+#define HP_SYMTYPE_ALIGN	0x10
+#define HP_SYMTYPE_EXTERNAL	0x20
+#define HP_SECONDARY_SYMBOL     0x40
+
+/* RELOCATION DEFINITIONS */
+#define HP_RSEGMENT_TEXT	0x00
+#define HP_RSEGMENT_DATA	0x01
+#define HP_RSEGMENT_BSS		0x02
+#define HP_RSEGMENT_EXTERNAL	0x03
+#define HP_RSEGMENT_PCREL       0x04
+#define HP_RSEGMENT_RDLT        0x05
+#define HP_RSEGMENT_RPLT        0x06
+#define HP_RSEGMENT_NOOP	0x3F
+
+#define HP_RLENGTH_BYTE		0x00
+#define HP_RLENGTH_WORD		0x01
+#define HP_RLENGTH_LONG		0x02
+#define HP_RLENGTH_ALIGN	0x03
+
+#define NAME(x,y) CONCAT3 (hp300hpux,_32_,y)
+#define ARCH_SIZE 32
+
+/* aoutx.h requires definitions for BMAGIC and QMAGIC.  */
+#define BMAGIC HPUX_DOT_O_MAGIC
+#define QMAGIC 0314
+
+#include "aoutx.h"
+
+static const bfd_target * MY (callback)
+  PARAMS ((bfd *));
+static bfd_boolean MY (write_object_contents)
+  PARAMS ((bfd *));
+static void convert_sym_type
+  PARAMS ((struct external_nlist *, aout_symbol_type *, bfd *));
+
+bfd_boolean MY (slurp_symbol_table)
+  PARAMS ((bfd *));
+void MY (swap_std_reloc_in)
+  PARAMS ((bfd *, struct hp300hpux_reloc *, arelent *, asymbol **,
+	   bfd_size_type));
+bfd_boolean MY (slurp_reloc_table)
+  PARAMS ((bfd *, sec_ptr, asymbol **));
+long MY (canonicalize_symtab)
+  PARAMS ((bfd *, asymbol **));
+long MY (get_symtab_upper_bound)
+  PARAMS ((bfd *));
+long MY (canonicalize_reloc)
+  PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
+
+/* Since the hpux symbol table has nlist elements interspersed with
+   strings and we need to insert som strings for secondary symbols, we
+   give ourselves a little extra padding up front to account for
+   this.  Note that for each non-secondary symbol we process, we gain
+   9 bytes of space for the discarded nlist element (one byte used for
+   null).  SYM_EXTRA_BYTES is the extra space.  */
+#define SYM_EXTRA_BYTES   1024
+
+/* Set parameters about this a.out file that are machine-dependent.
+   This routine is called from some_aout_object_p just before it returns.  */
+static const bfd_target *
+MY (callback) (abfd)
+     bfd *abfd;
+{
+  struct internal_exec *execp = exec_hdr (abfd);
+
+  /* Calculate the file positions of the parts of a newly read aout header */
+  obj_textsec (abfd)->size = N_TXTSIZE (*execp);
+
+  /* The virtual memory addresses of the sections */
+  obj_textsec (abfd)->vma = N_TXTADDR (*execp);
+  obj_datasec (abfd)->vma = N_DATADDR (*execp);
+  obj_bsssec (abfd)->vma = N_BSSADDR (*execp);
+
+  obj_textsec (abfd)->lma = obj_textsec (abfd)->vma;
+  obj_datasec (abfd)->lma = obj_datasec (abfd)->vma;
+  obj_bsssec (abfd)->lma = obj_bsssec (abfd)->vma;
+
+  /* The file offsets of the sections */
+  obj_textsec (abfd)->filepos = N_TXTOFF (*execp);
+  obj_datasec (abfd)->filepos = N_DATOFF (*execp);
+
+  /* The file offsets of the relocation info */
+  obj_textsec (abfd)->rel_filepos = N_TRELOFF (*execp);
+  obj_datasec (abfd)->rel_filepos = N_DRELOFF (*execp);
+
+  /* The file offsets of the string table and symbol table.  */
+  obj_sym_filepos (abfd) = N_SYMOFF (*execp);
+  obj_str_filepos (abfd) = N_STROFF (*execp);
+
+  /* Determine the architecture and machine type of the object file.  */
+#ifdef SET_ARCH_MACH
+  SET_ARCH_MACH (abfd, *execp);
+#else
+  bfd_default_set_arch_mach (abfd, DEFAULT_ARCH, 0);
+#endif
+
+  if (obj_aout_subformat (abfd) == gnu_encap_format)
+    {
+      /* The file offsets of the relocation info */
+      obj_textsec (abfd)->rel_filepos = N_GNU_TRELOFF (*execp);
+      obj_datasec (abfd)->rel_filepos = N_GNU_DRELOFF (*execp);
+
+      /* The file offsets of the string table and symbol table.  */
+      obj_sym_filepos (abfd) = N_GNU_SYMOFF (*execp);
+      obj_str_filepos (abfd) = (obj_sym_filepos (abfd) + execp->a_syms);
+
+      abfd->flags |= HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS;
+      bfd_get_symcount (abfd) = execp->a_syms / 12;
+      obj_symbol_entry_size (abfd) = 12;
+      obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+    }
+
+  return abfd->xvec;
+}
+
+extern bfd_boolean aout_32_write_syms
+  PARAMS ((bfd * abfd));
+
+static bfd_boolean
+MY (write_object_contents) (abfd)
+     bfd *abfd;
+{
+  struct external_exec exec_bytes;
+  struct internal_exec *execp = exec_hdr (abfd);
+  bfd_size_type text_size;	/* dummy vars */
+  file_ptr text_end;
+
+  memset (&exec_bytes, 0, sizeof (exec_bytes));
+
+  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+
+  if (adata (abfd).magic == undecided_magic)
+    NAME (aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end);
+  execp->a_syms = 0;
+
+  execp->a_entry = bfd_get_start_address (abfd);
+
+  execp->a_trsize = ((obj_textsec (abfd)->reloc_count) *
+		     obj_reloc_entry_size (abfd));
+  execp->a_drsize = ((obj_datasec (abfd)->reloc_count) *
+		     obj_reloc_entry_size (abfd));
+
+  N_SET_MACHTYPE (*execp, 0xc);
+  N_SET_FLAGS (*execp, aout_backend_info (abfd)->exec_hdr_flags);
+
+  NAME (aout,swap_exec_header_out) (abfd, execp, &exec_bytes);
+
+  /* update fields not covered by default swap_exec_header_out */
+
+  /* this is really the sym table size but we store it in drelocs */
+  H_PUT_32 (abfd, (bfd_get_symcount (abfd) * 12), exec_bytes.e_drelocs);
+
+  if (bfd_seek (abfd, (file_ptr) 0, FALSE) != 0
+      || (bfd_bwrite ((PTR) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE, abfd)
+	  != EXEC_BYTES_SIZE))
+    return FALSE;
+
+  /* Write out the symbols, and then the relocs.  We must write out
+       the symbols first so that we know the symbol indices.  */
+
+  if (bfd_get_symcount (abfd) != 0)
+    {
+      /* Skip the relocs to where we want to put the symbols.  */
+      if (bfd_seek (abfd, (file_ptr) (N_DRELOFF (*execp) + execp->a_drsize),
+		    SEEK_SET) != 0)
+	return FALSE;
+    }
+
+  if (!MY (write_syms) (abfd))
+    return FALSE;
+
+  if (bfd_get_symcount (abfd) != 0)
+    {
+      if (bfd_seek (abfd, (file_ptr) N_TRELOFF (*execp), SEEK_CUR) != 0)
+	return FALSE;
+      if (!NAME (aout,squirt_out_relocs) (abfd, obj_textsec (abfd)))
+	return FALSE;
+      if (bfd_seek (abfd, (file_ptr) N_DRELOFF (*execp), SEEK_CUR) != 0)
+	return FALSE;
+      if (!NAME (aout,squirt_out_relocs) (abfd, obj_datasec (abfd)))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* convert the hp symbol type to be the same as aout64.h usage so we */
+/* can piggyback routines in aoutx.h.                                */
+
+static void
+convert_sym_type (sym_pointer, cache_ptr, abfd)
+     struct external_nlist *sym_pointer ATTRIBUTE_UNUSED;
+     aout_symbol_type *cache_ptr;
+     bfd *abfd ATTRIBUTE_UNUSED;
+{
+  int name_type;
+  int new_type;
+
+  name_type = (cache_ptr->type);
+  new_type = 0;
+
+  if ((name_type & HP_SYMTYPE_ALIGN) != 0)
+    {
+      /* iou_error ("aligned symbol encountered: %s", name);*/
+      name_type = 0;
+    }
+
+  if (name_type == HP_SYMTYPE_FILENAME)
+    new_type = N_FN;
+  else
+    {
+      switch (name_type & HP_SYMTYPE_TYPE)
+	{
+	case HP_SYMTYPE_UNDEFINED:
+	  new_type = N_UNDF;
+	  break;
+
+	case HP_SYMTYPE_ABSOLUTE:
+	  new_type = N_ABS;
+	  break;
+
+	case HP_SYMTYPE_TEXT:
+	  new_type = N_TEXT;
+	  break;
+
+	case HP_SYMTYPE_DATA:
+	  new_type = N_DATA;
+	  break;
+
+	case HP_SYMTYPE_BSS:
+	  new_type = N_BSS;
+	  break;
+
+	case HP_SYMTYPE_COMMON:
+	  new_type = N_COMM;
+	  break;
+
+	default:
+	  abort ();
+	  break;
+	}
+      if (name_type & HP_SYMTYPE_EXTERNAL)
+	new_type |= N_EXT;
+
+      if (name_type & HP_SECONDARY_SYMBOL)
+	{
+	  switch (new_type)
+	    {
+	    default:
+	      abort ();
+	    case N_UNDF | N_EXT:
+	      /* If the value is nonzero, then just treat this as a
+                 common symbol.  I don't know if this is correct in
+                 all cases, but it is more correct than treating it as
+                 a weak undefined symbol.  */
+	      if (cache_ptr->symbol.value == 0)
+		new_type = N_WEAKU;
+	      break;
+	    case N_ABS | N_EXT:
+	      new_type = N_WEAKA;
+	      break;
+	    case N_TEXT | N_EXT:
+	      new_type = N_WEAKT;
+	      break;
+	    case N_DATA | N_EXT:
+	      new_type = N_WEAKD;
+	      break;
+	    case N_BSS | N_EXT:
+	      new_type = N_WEAKB;
+	      break;
+	    }
+	}
+    }
+  cache_ptr->type = new_type;
+
+}
+
+/*
+DESCRIPTION
+        Swaps the information in an executable header taken from a raw
+        byte stream memory image, into the internal exec_header
+        structure.
+*/
+
+void
+NAME (aout,swap_exec_header_in) (abfd, raw_bytes, execp)
+     bfd *abfd;
+     struct external_exec *raw_bytes;
+     struct internal_exec *execp;
+{
+  struct external_exec *bytes = (struct external_exec *) raw_bytes;
+
+  /* The internal_exec structure has some fields that are unused in this
+     configuration (IE for i960), so ensure that all such uninitialized
+     fields are zero'd out.  There are places where two of these structs
+     are memcmp'd, and thus the contents do matter. */
+  memset (execp, 0, sizeof (struct internal_exec));
+  /* Now fill in fields in the execp, from the bytes in the raw data.  */
+  execp->a_info = H_GET_32 (abfd, bytes->e_info);
+  execp->a_text = GET_WORD (abfd, bytes->e_text);
+  execp->a_data = GET_WORD (abfd, bytes->e_data);
+  execp->a_bss = GET_WORD (abfd, bytes->e_bss);
+  execp->a_syms = GET_WORD (abfd, bytes->e_syms);
+  execp->a_entry = GET_WORD (abfd, bytes->e_entry);
+  execp->a_trsize = GET_WORD (abfd, bytes->e_trsize);
+  execp->a_drsize = GET_WORD (abfd, bytes->e_drsize);
+
+  /***************************************************************/
+  /* check the header to see if it was generated by a bfd output */
+  /* this is detected rather bizarrely by requiring a bunch of   */
+  /* header fields to be zero and an old unused field (now used) */
+  /* to be set.                                                  */
+  /***************************************************************/
+  do
+    {
+      long syms;
+      struct aout_data_struct *rawptr;
+      bfd_size_type amt;
+
+      if (H_GET_32 (abfd, bytes->e_passize) != 0)
+	break;
+      if (H_GET_32 (abfd, bytes->e_syms) != 0)
+	break;
+      if (H_GET_32 (abfd, bytes->e_supsize) != 0)
+	break;
+
+      syms = H_GET_32 (abfd, bytes->e_drelocs);
+      if (syms == 0)
+	break;
+
+      /* OK, we've passed the test as best as we can determine */
+      execp->a_syms = syms;
+
+      /* allocate storage for where we will store this result */
+      amt = sizeof (*rawptr);
+      rawptr = (struct aout_data_struct *) bfd_zalloc (abfd, amt);
+
+      if (rawptr == NULL)
+	return;
+      abfd->tdata.aout_data = rawptr;
+      obj_aout_subformat (abfd) = gnu_encap_format;
+    }
+  while (0);
+}
+
+/* The hp symbol table is a bit different than other a.out targets.  Instead
+   of having an array of nlist items and an array of strings, hp's format
+   has them mixed together in one structure.  In addition, the strings are
+   not null terminated.  It looks something like this:
+
+   nlist element 1
+   string1
+   nlist element 2
+   string2
+   ...
+
+   The whole symbol table is read as one chunk and then we march thru it
+   and convert it to canonical form.  As we march thru the table, we copy
+   the nlist data into the internal form and we compact the strings and null
+   terminate them, using storage from the already allocated symbol table:
+
+   string1
+   null
+   string2
+   null
+   ...
+*/
+
+bfd_boolean
+MY (slurp_symbol_table) (abfd)
+     bfd *abfd;
+{
+  bfd_size_type symbol_bytes;
+  struct external_nlist *syms;
+  struct external_nlist *sym_pointer;
+  struct external_nlist *sym_end;
+  char *strings;
+  aout_symbol_type *cached;
+  unsigned num_syms = 0;
+  bfd_size_type amt;
+
+  /* If there's no work to be done, don't do any */
+  if (obj_aout_symbols (abfd) != (aout_symbol_type *) NULL)
+    return TRUE;
+  symbol_bytes = exec_hdr (abfd)->a_syms;
+
+  amt = symbol_bytes + SYM_EXTRA_BYTES;
+  strings = (char *) bfd_alloc (abfd, amt);
+  if (!strings)
+    return FALSE;
+  syms = (struct external_nlist *) (strings + SYM_EXTRA_BYTES);
+  if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0
+      || bfd_bread ((PTR) syms, symbol_bytes, abfd) != symbol_bytes)
+    {
+      bfd_release (abfd, syms);
+      return FALSE;
+    }
+
+  sym_end = (struct external_nlist *) (((char *) syms) + symbol_bytes);
+
+  /* first, march thru the table and figure out how many symbols there are */
+  for (sym_pointer = syms; sym_pointer < sym_end; sym_pointer++, num_syms++)
+    {
+      /* skip over the embedded symbol. */
+      sym_pointer = (struct external_nlist *) (((char *) sym_pointer) +
+					       sym_pointer->e_length[0]);
+    }
+
+  /* now that we know the symbol count, update the bfd header */
+  bfd_get_symcount (abfd) = num_syms;
+
+  amt = num_syms;
+  amt *= sizeof (aout_symbol_type);
+  cached = (aout_symbol_type *) bfd_zalloc (abfd, amt);
+  if (cached == NULL && num_syms != 0)
+    return FALSE;
+
+  /* as we march thru the hp symbol table, convert it into a list of
+     null terminated strings to hold the symbol names.  Make sure any
+     assignment to the strings pointer is done after we're thru using
+     the nlist so we don't overwrite anything important. */
+
+  /* OK, now walk the new symtable, caching symbol properties */
+  {
+    aout_symbol_type *cache_ptr = cached;
+    /* Run through table and copy values */
+    for (sym_pointer = syms, cache_ptr = cached;
+	 sym_pointer < sym_end; sym_pointer++, cache_ptr++)
+      {
+	unsigned int length;
+	cache_ptr->symbol.the_bfd = abfd;
+	cache_ptr->symbol.value = GET_SWORD (abfd, sym_pointer->e_value);
+	cache_ptr->desc = bfd_get_16 (abfd, sym_pointer->e_almod);
+	cache_ptr->type = bfd_get_8 (abfd, sym_pointer->e_type);
+	cache_ptr->symbol.udata.p = NULL;
+	length = bfd_get_8 (abfd, sym_pointer->e_length);
+	cache_ptr->other = length;	/* other not used, save length here */
+
+	convert_sym_type (sym_pointer, cache_ptr, abfd);
+	if (!translate_from_native_sym_flags (abfd, cache_ptr))
+	  return FALSE;
+
+	/********************************************************/
+	/* for hpux, the 'length' value indicates the length of */
+	/* the symbol name which follows the nlist entry.       */
+	/********************************************************/
+	if (length)
+	  {
+	    /**************************************************************/
+	    /* the hp string is not null terminated so we create a new one*/
+	    /* by copying the string to overlap the just vacated nlist    */
+	    /* structure before it in memory.                             */
+	    /**************************************************************/
+	    cache_ptr->symbol.name = strings;
+	    memcpy (strings, sym_pointer + 1, length);
+	    strings[length] = '\0';
+	    strings += length + 1;
+	  }
+	else
+	  cache_ptr->symbol.name = (char *) NULL;
+
+	/* skip over the embedded symbol. */
+	sym_pointer = (struct external_nlist *) (((char *) sym_pointer) +
+						 length);
+      }
+  }
+
+  obj_aout_symbols (abfd) = cached;
+
+  return TRUE;
+}
+
+void
+MY (swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
+     bfd *abfd;
+     struct hp300hpux_reloc *bytes;
+     arelent *cache_ptr;
+     asymbol **symbols;
+     bfd_size_type symcount ATTRIBUTE_UNUSED;
+{
+  int r_index;
+  int r_extern = 0;
+  unsigned int r_length;
+  int r_pcrel = 0;
+  struct aoutdata *su = &(abfd->tdata.aout_data->a);
+
+  cache_ptr->address = H_GET_32 (abfd, bytes->r_address);
+  r_index = H_GET_16 (abfd, bytes->r_index);
+
+  switch (bytes->r_type[0])
+    {
+    case HP_RSEGMENT_TEXT:
+      r_index = N_TEXT;
+      break;
+    case HP_RSEGMENT_DATA:
+      r_index = N_DATA;
+      break;
+    case HP_RSEGMENT_BSS:
+      r_index = N_BSS;
+      break;
+    case HP_RSEGMENT_EXTERNAL:
+      r_extern = 1;
+      break;
+    case HP_RSEGMENT_PCREL:
+      r_extern = 1;
+      r_pcrel = 1;
+      break;
+    case HP_RSEGMENT_RDLT:
+      break;
+    case HP_RSEGMENT_RPLT:
+      break;
+    case HP_RSEGMENT_NOOP:
+      break;
+    default:
+      abort ();
+      break;
+    }
+
+  switch (bytes->r_length[0])
+    {
+    case HP_RLENGTH_BYTE:
+      r_length = 0;
+      break;
+    case HP_RLENGTH_WORD:
+      r_length = 1;
+      break;
+    case HP_RLENGTH_LONG:
+      r_length = 2;
+      break;
+    default:
+      abort ();
+      break;
+    }
+
+  cache_ptr->howto = howto_table_std + r_length + 4 * r_pcrel;
+  /* FIXME-soon:  Roll baserel, jmptable, relative bits into howto setting */
+
+  /* This macro uses the r_index value computed above */
+  if (r_pcrel && r_extern)
+    {
+      /* The GNU linker assumes any offset from beginning of section */
+      /* is already incorporated into the image while the HP linker  */
+      /* adds this in later.  Add it in now...                       */
+      MOVE_ADDRESS (-cache_ptr->address);
+    }
+  else
+    {
+      MOVE_ADDRESS (0);
+    }
+}
+
+bfd_boolean
+MY (slurp_reloc_table) (abfd, asect, symbols)
+     bfd *abfd;
+     sec_ptr asect;
+     asymbol **symbols;
+{
+  bfd_size_type count;
+  bfd_size_type reloc_size;
+  PTR relocs;
+  arelent *reloc_cache;
+  size_t each_size;
+  struct hp300hpux_reloc *rptr;
+  unsigned int counter;
+  arelent *cache_ptr;
+
+  if (asect->relocation)
+    return TRUE;
+
+  if (asect->flags & SEC_CONSTRUCTOR)
+    return TRUE;
+
+  if (asect == obj_datasec (abfd))
+    {
+      reloc_size = exec_hdr (abfd)->a_drsize;
+      goto doit;
+    }
+
+  if (asect == obj_textsec (abfd))
+    {
+      reloc_size = exec_hdr (abfd)->a_trsize;
+      goto doit;
+    }
+
+  bfd_set_error (bfd_error_invalid_operation);
+  return FALSE;
+
+doit:
+  if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0)
+    return FALSE;
+  each_size = obj_reloc_entry_size (abfd);
+
+  count = reloc_size / each_size;
+
+  reloc_cache = (arelent *) bfd_zalloc (abfd, count * sizeof (arelent));
+  if (!reloc_cache && count != 0)
+    return FALSE;
+
+  relocs = (PTR) bfd_alloc (abfd, reloc_size);
+  if (!relocs && reloc_size != 0)
+    {
+      bfd_release (abfd, reloc_cache);
+      return FALSE;
+    }
+
+  if (bfd_bread (relocs, reloc_size, abfd) != reloc_size)
+    {
+      bfd_release (abfd, relocs);
+      bfd_release (abfd, reloc_cache);
+      return FALSE;
+    }
+
+  rptr = (struct hp300hpux_reloc *) relocs;
+  counter = 0;
+  cache_ptr = reloc_cache;
+
+  for (; counter < count; counter++, rptr++, cache_ptr++)
+    {
+      MY (swap_std_reloc_in) (abfd, rptr, cache_ptr, symbols,
+			      (bfd_size_type) bfd_get_symcount (abfd));
+    }
+
+  bfd_release (abfd, relocs);
+  asect->relocation = reloc_cache;
+  asect->reloc_count = count;
+  return TRUE;
+}
+
+/************************************************************************/
+/* The following functions are identical to functions in aoutx.h except */
+/* they refer to MY(func) rather than NAME(aout,func) and they also     */
+/* call aout_32 versions if the input file was generated by gcc         */
+/************************************************************************/
+
+long aout_32_canonicalize_symtab
+  PARAMS ((bfd * abfd, asymbol ** location));
+long aout_32_get_symtab_upper_bound
+  PARAMS ((bfd * abfd));
+long aout_32_canonicalize_reloc
+  PARAMS ((bfd * abfd, sec_ptr section, arelent ** relptr,
+	   asymbol ** symbols));
+
+long
+MY (canonicalize_symtab) (abfd, location)
+     bfd *abfd;
+     asymbol **location;
+{
+  unsigned int counter = 0;
+  aout_symbol_type *symbase;
+
+  if (obj_aout_subformat (abfd) == gnu_encap_format)
+    return aout_32_canonicalize_symtab (abfd, location);
+
+  if (!MY (slurp_symbol_table) (abfd))
+    return -1;
+
+  for (symbase = obj_aout_symbols (abfd); counter++ < bfd_get_symcount (abfd);)
+    *(location++) = (asymbol *) (symbase++);
+  *location++ = 0;
+  return bfd_get_symcount (abfd);
+}
+
+long
+MY (get_symtab_upper_bound) (abfd)
+     bfd *abfd;
+{
+  if (obj_aout_subformat (abfd) == gnu_encap_format)
+    return aout_32_get_symtab_upper_bound (abfd);
+  if (!MY (slurp_symbol_table) (abfd))
+    return -1;
+
+  return (bfd_get_symcount (abfd) + 1) * (sizeof (aout_symbol_type *));
+}
+
+long
+MY (canonicalize_reloc) (abfd, section, relptr, symbols)
+     bfd *abfd;
+     sec_ptr section;
+     arelent **relptr;
+     asymbol **symbols;
+{
+  arelent *tblptr = section->relocation;
+  unsigned int count;
+  if (obj_aout_subformat (abfd) == gnu_encap_format)
+    return aout_32_canonicalize_reloc (abfd, section, relptr, symbols);
+
+  if (!(tblptr || MY (slurp_reloc_table) (abfd, section, symbols)))
+    return -1;
+
+  if (section->flags & SEC_CONSTRUCTOR)
+    {
+      arelent_chain *chain = section->constructor_chain;
+      for (count = 0; count < section->reloc_count; count++)
+	{
+	  *relptr++ = &chain->relent;
+	  chain = chain->next;
+	}
+    }
+  else
+    {
+      tblptr = section->relocation;
+
+      for (count = 0; count++ < section->reloc_count;)
+	{
+	  *relptr++ = tblptr++;
+	}
+    }
+  *relptr = 0;
+
+  return section->reloc_count;
+}
+
+#include "aout-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hppabsd-core.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hppabsd-core.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hppabsd-core.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hppabsd-core.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,285 @@
+/* BFD back-end for HPPA BSD core files.
+   Copyright 1993, 1994, 1995, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
+   2006, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+   Written by the Center for Software Science at the University of Utah
+   and by Cygnus Support.
+
+   The core file structure for the Utah 4.3BSD and OSF1 ports on the
+   PA is a mix between traditional cores and hpux cores -- just
+   different enough that supporting this format would tend to add
+   gross hacks to trad-core.c or hpux-core.c.  So instead we keep any
+   gross hacks isolated to this file.  */
+
+/* This file can only be compiled on systems which use HPPA-BSD style
+   core files.
+
+   I would not expect this to be of use to any other host/target, but
+   you never know.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#if defined (HOST_HPPABSD)
+
+#include "machine/vmparam.h"
+
+#include <sys/param.h>
+#include <sys/dir.h>
+#include <signal.h>
+#include <machine/reg.h>
+#include <sys/user.h>		/* After a.out.h  */
+#include <sys/file.h>
+
+static asection *make_bfd_asection
+  PARAMS ((bfd *, const char *, flagword, bfd_size_type, file_ptr,
+	   unsigned int));
+static const bfd_target *hppabsd_core_core_file_p
+  PARAMS ((bfd *));
+static char *hppabsd_core_core_file_failing_command
+  PARAMS ((bfd *));
+static int hppabsd_core_core_file_failing_signal
+  PARAMS ((bfd *));
+#define hppabsd_core_core_file_matches_executable_p generic_core_file_matches_executable_p
+#define hppabsd_core_core_file_pid _bfd_nocore_core_file_pid
+static void swap_abort
+  PARAMS ((void));
+
+/* These are stored in the bfd's tdata.  */
+
+struct hppabsd_core_struct
+  {
+    int sig;
+    char cmd[MAXCOMLEN + 1];
+    asection *data_section;
+    asection *stack_section;
+    asection *reg_section;
+  };
+
+#define core_hdr(bfd) ((bfd)->tdata.hppabsd_core_data)
+#define core_signal(bfd) (core_hdr(bfd)->sig)
+#define core_command(bfd) (core_hdr(bfd)->cmd)
+#define core_datasec(bfd) (core_hdr(bfd)->data_section)
+#define core_stacksec(bfd) (core_hdr(bfd)->stack_section)
+#define core_regsec(bfd) (core_hdr(bfd)->reg_section)
+
+static asection *
+make_bfd_asection (abfd, name, flags, size, offset, alignment_power)
+     bfd *abfd;
+     const char *name;
+     flagword flags;
+     bfd_size_type size;
+     file_ptr offset;
+     unsigned int alignment_power;
+{
+  asection *asect;
+
+  asect = bfd_make_section_with_flags (abfd, name, flags);
+  if (!asect)
+    return NULL;
+
+  asect->size = size;
+  asect->filepos = offset;
+  asect->alignment_power = alignment_power;
+
+  return asect;
+}
+
+static const bfd_target *
+hppabsd_core_core_file_p (abfd)
+     bfd *abfd;
+{
+  int val;
+  struct user u;
+  struct hppabsd_core_struct *coredata;
+  int clicksz;
+
+  /* Try to read in the u-area.  We will need information from this
+     to know how to grok the rest of the core structures.  */
+  val = bfd_bread ((void *) &u, (bfd_size_type) sizeof u, abfd);
+  if (val != sizeof u)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  /* Get the page size out of the u structure.  This will be different
+     for PA 1.0 machines and PA 1.1 machines.   Yuk!  */
+  clicksz = u.u_pcb.pcb_pgsz;
+
+  /* clicksz must be a power of two >= 2k.  */
+  if (clicksz < 0x800
+      || clicksz != (clicksz & -clicksz))
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  /* Sanity checks.  Make sure the size of the core file matches the
+     the size computed from information within the core itself.  */
+  {
+    struct stat statbuf;
+
+    if (bfd_stat (abfd, &statbuf) < 0)
+      return NULL;
+
+    if (NBPG * (UPAGES + u.u_dsize + u.u_ssize) > statbuf.st_size)
+      {
+	bfd_set_error (bfd_error_file_truncated);
+	return NULL;
+      }
+    if (clicksz * (UPAGES + u.u_dsize + u.u_ssize) < statbuf.st_size)
+      {
+	/* The file is too big.  Maybe it's not a core file
+	   or we otherwise have bad values for u_dsize and u_ssize).  */
+	bfd_set_error (bfd_error_wrong_format);
+	return NULL;
+      }
+  }
+
+  /* OK, we believe you.  You're a core file (sure, sure).  */
+
+  coredata = (struct hppabsd_core_struct *)
+    bfd_zalloc (abfd, (bfd_size_type) sizeof (struct hppabsd_core_struct));
+  if (!coredata)
+    return NULL;
+
+  /* Make the core data and available via the tdata part of the BFD.  */
+  abfd->tdata.hppabsd_core_data = coredata;
+
+  /* Create the sections.  */
+  core_stacksec (abfd) = make_bfd_asection (abfd, ".stack",
+					   SEC_ALLOC + SEC_HAS_CONTENTS,
+					   clicksz * u.u_ssize,
+					   NBPG * (USIZE + KSTAKSIZE)
+					     + clicksz * u.u_dsize, 2);
+  if (core_stacksec (abfd) == NULL)
+    goto fail;
+  core_stacksec (abfd)->vma = USRSTACK;
+
+  core_datasec (abfd) = make_bfd_asection (abfd, ".data",
+					  SEC_ALLOC + SEC_LOAD
+					    + SEC_HAS_CONTENTS,
+					  clicksz * u.u_dsize,
+					  NBPG * (USIZE + KSTAKSIZE), 2);
+  if (core_datasec (abfd) == NULL)
+    goto fail;
+  core_datasec (abfd)->vma = UDATASEG;
+
+  core_regsec (abfd) = make_bfd_asection (abfd, ".reg",
+					 SEC_HAS_CONTENTS,
+					 KSTAKSIZE * NBPG,
+					 NBPG * USIZE, 2);
+  if (core_regsec (abfd) == NULL)
+    goto fail;
+  core_regsec (abfd)->vma = 0;
+
+  strncpy (core_command (abfd), u.u_comm, MAXCOMLEN + 1);
+  core_signal (abfd) = u.u_code;
+  return abfd->xvec;
+
+ fail:
+  bfd_release (abfd, abfd->tdata.any);
+  abfd->tdata.any = NULL;
+  bfd_section_list_clear (abfd);
+  return NULL;
+}
+
+static char *
+hppabsd_core_core_file_failing_command (abfd)
+     bfd *abfd;
+{
+  return core_command (abfd);
+}
+
+static int
+hppabsd_core_core_file_failing_signal (abfd)
+     bfd *abfd;
+{
+  return core_signal (abfd);
+}
+
+/* If somebody calls any byte-swapping routines, shoot them.  */
+static void
+swap_abort ()
+{
+  /* This way doesn't require any declaration for ANSI to fuck up.  */
+  abort ();
+}
+
+#define	NO_GET ((bfd_vma (*) (const void *)) swap_abort)
+#define	NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
+#define	NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
+#define	NO_GET64 ((bfd_uint64_t (*) (const void *)) swap_abort)
+#define	NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
+#define	NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
+
+const bfd_target hppabsd_core_vec =
+  {
+    "hppabsd-core",
+    bfd_target_unknown_flavour,
+    BFD_ENDIAN_BIG,		/* target byte order */
+    BFD_ENDIAN_BIG,		/* target headers byte order */
+    (HAS_RELOC | EXEC_P |	/* object flags */
+     HAS_LINENO | HAS_DEBUG |
+     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+    0,			                                   /* symbol prefix */
+    ' ',						   /* ar_pad_char */
+    16,							   /* ar_max_namelen */
+    NO_GET64, NO_GETS64, NO_PUT64,	/* 64 bit data */
+    NO_GET, NO_GETS, NO_PUT,		/* 32 bit data */
+    NO_GET, NO_GETS, NO_PUT,		/* 16 bit data */
+    NO_GET64, NO_GETS64, NO_PUT64,	/* 64 bit hdrs */
+    NO_GET, NO_GETS, NO_PUT,		/* 32 bit hdrs */
+    NO_GET, NO_GETS, NO_PUT,		/* 16 bit hdrs */
+
+    {				/* bfd_check_format */
+      _bfd_dummy_target,		/* unknown format */
+      _bfd_dummy_target,		/* object file */
+      _bfd_dummy_target,		/* archive */
+      hppabsd_core_core_file_p		/* a core file */
+    },
+    {				/* bfd_set_format */
+      bfd_false, bfd_false,
+      bfd_false, bfd_false
+    },
+    {				/* bfd_write_contents */
+      bfd_false, bfd_false,
+      bfd_false, bfd_false
+    },
+
+    BFD_JUMP_TABLE_GENERIC (_bfd_generic),
+    BFD_JUMP_TABLE_COPY (_bfd_generic),
+    BFD_JUMP_TABLE_CORE (hppabsd_core),
+    BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+    BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
+    BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+    BFD_JUMP_TABLE_WRITE (_bfd_generic),
+    BFD_JUMP_TABLE_LINK (_bfd_nolink),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    NULL,
+
+    (PTR) 0			/* backend_data */
+  };
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hpux-core.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hpux-core.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/hpux-core.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/hpux-core.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,429 @@
+/* BFD back-end for HP/UX core files.
+   Copyright 1993, 1994, 1996, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007, 2008, 2010, 2011 Free Software Foundation, Inc.
+   Written by Stu Grossman, Cygnus Support.
+   Converted to back-end form by Ian Lance Taylor, Cygnus SUpport
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* This file can only be compiled on systems which use HP/UX style
+   core files.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#if defined (HOST_HPPAHPUX) || defined (HOST_HP300HPUX) || defined (HOST_HPPAMPEIX)
+
+/* FIXME: sys/core.h doesn't exist for HPUX version 7.  HPUX version
+   5, 6, and 7 core files seem to be standard trad-core.c type core
+   files; can we just use trad-core.c in addition to this file?  */
+
+#include <sys/core.h>
+#include <sys/utsname.h>
+
+#endif /* HOST_HPPAHPUX */
+
+#ifdef HOST_HPPABSD
+
+/* Not a very swift place to put it, but that's where the BSD port
+   puts them.  */
+#include "/hpux/usr/include/sys/core.h"
+
+#endif /* HOST_HPPABSD */
+
+#include <sys/param.h>
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#else
+# ifdef HAVE_SYS_NDIR_H
+#  include <sys/ndir.h>
+# endif
+# ifdef HAVE_SYS_DIR_H
+#  include <sys/dir.h>
+# endif
+# ifdef HAVE_NDIR_H
+#  include <ndir.h>
+# endif
+#endif
+#include <signal.h>
+#ifdef HPUX_CORE
+#include <machine/reg.h>
+#endif
+#include <sys/file.h>
+
+/* Kludge: There's no explicit mechanism provided by sys/core.h to
+   conditionally know whether a proc_info has thread id fields.
+   However, CORE_ANON_SHMEM shows up first at 10.30, which is
+   happily also when meaningful thread id's show up in proc_info. */
+#if defined(CORE_ANON_SHMEM)
+#define PROC_INFO_HAS_THREAD_ID (1)
+#endif
+
+/* This type appears at HP-UX 10.30.  Defining it if not defined
+   by sys/core.h allows us to build for older HP-UX's, and (since
+   it won't be encountered in core-dumps from older HP-UX's) is
+   harmless. */
+#if !defined(CORE_ANON_SHMEM)
+#define CORE_ANON_SHMEM 0x00000200         /* anonymous shared memory */
+#endif
+
+/* These are stored in the bfd's tdata */
+
+/* .lwpid and .user_tid are only valid if PROC_INFO_HAS_THREAD_ID, else they
+   are set to 0.  Also, until HP-UX implements MxN threads, .user_tid and
+   .lwpid are synonymous. */
+struct hpux_core_struct
+{
+  int sig;
+  int lwpid;               /* Kernel thread ID. */
+  unsigned long user_tid;  /* User thread ID. */
+  char cmd[MAXCOMLEN + 1];
+};
+
+#define core_hdr(bfd) ((bfd)->tdata.hpux_core_data)
+#define core_signal(bfd) (core_hdr(bfd)->sig)
+#define core_command(bfd) (core_hdr(bfd)->cmd)
+#define core_kernel_thread_id(bfd) (core_hdr(bfd)->lwpid)
+#define core_user_thread_id(bfd) (core_hdr(bfd)->user_tid)
+#define hpux_core_core_file_matches_executable_p generic_core_file_matches_executable_p
+#define hpux_core_core_file_pid _bfd_nocore_core_file_pid
+
+static asection *make_bfd_asection (bfd *, const char *, flagword,
+                                    bfd_size_type, bfd_vma, unsigned int);
+static const bfd_target *hpux_core_core_file_p (bfd *);
+static char *hpux_core_core_file_failing_command (bfd *);
+static int hpux_core_core_file_failing_signal (bfd *);
+static void swap_abort (void);
+
+static asection *
+make_bfd_asection (bfd *abfd, const char *name, flagword flags,
+                   bfd_size_type size, bfd_vma vma,
+                   unsigned int alignment_power)
+{
+  asection *asect;
+  char *newname;
+
+  newname = bfd_alloc (abfd, (bfd_size_type) strlen (name) + 1);
+  if (!newname)
+    return NULL;
+
+  strcpy (newname, name);
+
+  asect = bfd_make_section_anyway_with_flags (abfd, newname, flags);
+  if (!asect)
+    return NULL;
+
+  asect->size = size;
+  asect->vma = vma;
+  asect->filepos = bfd_tell (abfd);
+  asect->alignment_power = alignment_power;
+
+  return asect;
+}
+
+/* Return true if the given core file section corresponds to a thread,
+   based on its name.  */
+
+static int
+thread_section_p (bfd *abfd ATTRIBUTE_UNUSED,
+                  asection *sect,
+                  void *obj ATTRIBUTE_UNUSED)
+{
+  return CONST_STRNEQ (sect->name, ".reg/");
+}
+
+/* this function builds a bfd target if the file is a corefile.
+   It returns null or 0 if it finds out thaat it is not a core file.
+   The way it checks this is by looking for allowed 'type' field values.
+   These are declared in sys/core.h
+   There are some values which are 'reserved for future use'. In particular
+   CORE_NONE is actually defined as 0. This may be a catch-all for cases
+   in which the core file is generated by some non-hpux application.
+   (I am just guessing here!)
+*/
+static const bfd_target *
+hpux_core_core_file_p (bfd *abfd)
+{
+  int  good_sections = 0;
+  int  unknown_sections = 0;
+
+  core_hdr (abfd) = (struct hpux_core_struct *)
+    bfd_zalloc (abfd, (bfd_size_type) sizeof (struct hpux_core_struct));
+  if (!core_hdr (abfd))
+    return NULL;
+
+  while (1)
+    {
+      int val;
+      struct corehead core_header;
+
+      val = bfd_bread ((void *) &core_header,
+		      (bfd_size_type) sizeof core_header, abfd);
+      if (val <= 0)
+	break;
+      switch (core_header.type)
+	{
+	case CORE_KERNEL:
+	case CORE_FORMAT:
+	  /* Just skip this.  */
+	  bfd_seek (abfd, (file_ptr) core_header.len, SEEK_CUR);
+          good_sections++;
+	  break;
+	case CORE_EXEC:
+	  {
+	    struct proc_exec proc_exec;
+	    if (bfd_bread ((void *) &proc_exec, (bfd_size_type) core_header.len,
+			  abfd) != core_header.len)
+	      break;
+	    strncpy (core_command (abfd), proc_exec.cmd, MAXCOMLEN + 1);
+            good_sections++;
+	  }
+	  break;
+	case CORE_PROC:
+	  {
+	    struct proc_info proc_info;
+	    char  secname[100];  /* Of arbitrary size, but plenty large. */
+
+            /* We need to read this section, 'cause we need to determine
+               whether the core-dumped app was threaded before we create
+               any .reg sections. */
+	    if (bfd_bread (&proc_info, (bfd_size_type) core_header.len, abfd)
+		!= core_header.len)
+	      break;
+
+              /* However, we also want to create those sections with the
+                 file positioned at the start of the record, it seems. */
+            if (bfd_seek (abfd, -((file_ptr) core_header.len), SEEK_CUR) != 0)
+              break;
+
+#if defined(PROC_INFO_HAS_THREAD_ID)
+            core_kernel_thread_id (abfd) = proc_info.lwpid;
+            core_user_thread_id (abfd) = proc_info.user_tid;
+#else
+            core_kernel_thread_id (abfd) = 0;
+            core_user_thread_id (abfd) = 0;
+#endif
+            /* If the program was unthreaded, then we'll just create a
+               .reg section.
+
+               If the program was threaded, then we'll create .reg/XXXXX
+               section for each thread, where XXXXX is a printable
+               representation of the kernel thread id.  We'll also
+               create a .reg section for the thread that was running
+               and signalled at the time of the core-dump (i.e., this
+               is effectively an alias, needed to keep GDB happy.)
+
+               Note that we use `.reg/XXXXX' as opposed to '.regXXXXX'
+               because GDB expects that .reg2 will be the floating-
+               point registers. */
+            if (core_kernel_thread_id (abfd) == 0)
+              {
+                if (!make_bfd_asection (abfd, ".reg",
+					SEC_HAS_CONTENTS,
+					core_header.len,
+					(bfd_vma) offsetof (struct proc_info,
+							    hw_regs),
+					2))
+		  goto fail;
+              }
+            else
+              {
+                /* There are threads.  Is this the one that caused the
+                   core-dump?  We'll claim it was the running thread. */
+                if (proc_info.sig != -1)
+                  {
+		    if (!make_bfd_asection (abfd, ".reg",
+					    SEC_HAS_CONTENTS,
+					    core_header.len,
+					    (bfd_vma)offsetof (struct proc_info,
+							       hw_regs),
+					    2))
+		      goto fail;
+                  }
+                /* We always make one of these sections, for every thread. */
+                sprintf (secname, ".reg/%d", core_kernel_thread_id (abfd));
+                if (!make_bfd_asection (abfd, secname,
+					SEC_HAS_CONTENTS,
+					core_header.len,
+					(bfd_vma) offsetof (struct proc_info,
+							    hw_regs),
+					2))
+		  goto fail;
+              }
+	    core_signal (abfd) = proc_info.sig;
+            if (bfd_seek (abfd, (file_ptr) core_header.len, SEEK_CUR) != 0)
+              break;
+            good_sections++;
+	  }
+	  break;
+
+	case CORE_DATA:
+	case CORE_STACK:
+	case CORE_TEXT:
+	case CORE_MMF:
+	case CORE_SHM:
+	case CORE_ANON_SHMEM:
+	  if (!make_bfd_asection (abfd, ".data",
+				  SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS,
+				  core_header.len,
+				  (bfd_vma) core_header.addr, 2))
+	    goto fail;
+
+	  bfd_seek (abfd, (file_ptr) core_header.len, SEEK_CUR);
+          good_sections++;
+	  break;
+
+	case CORE_NONE:
+          /* Let's not punt if we encounter a section of unknown
+             type.  Rather, let's make a note of it.  If we later
+             see that there were also "good" sections, then we'll
+             declare that this a core file, but we'll also warn that
+             it may be incompatible with this gdb.
+             */
+	  unknown_sections++;
+          break;
+
+         default:
+	   goto fail; /*unrecognized core file type */
+	}
+    }
+
+  /* OK, we believe you.  You're a core file (sure, sure).  */
+
+  /* On HP/UX, we sometimes encounter core files where none of the threads
+     was found to be the running thread (ie the signal was set to -1 for
+     all threads).  This happens when the program was aborted externally
+     via a TT_CORE ttrace system call.  In that case, we just pick one
+     thread at random to be the active thread.  */
+  if (core_kernel_thread_id (abfd) != 0
+      && bfd_get_section_by_name (abfd, ".reg") == NULL)
+    {
+      asection *asect = bfd_sections_find_if (abfd, thread_section_p, NULL);
+      asection *reg_sect;
+
+      if (asect != NULL)
+        {
+          reg_sect = make_bfd_asection (abfd, ".reg", asect->flags,
+                                        asect->size, asect->vma,
+                                        asect->alignment_power);
+          if (reg_sect == NULL)
+            goto fail;
+
+          reg_sect->filepos = asect->filepos;
+        }
+    }
+
+  /* Were there sections of unknown type?  If so, yet there were
+     at least some complete sections of known type, then, issue
+     a warning.  Possibly the core file was generated on a version
+     of HP-UX that is incompatible with that for which this gdb was
+     built.
+     */
+  if ((unknown_sections > 0) && (good_sections > 0))
+    (*_bfd_error_handler)
+      ("%s appears to be a core file,\nbut contains unknown sections.  It may have been created on an incompatible\nversion of HP-UX.  As a result, some information may be unavailable.\n",
+       abfd->filename);
+
+  return abfd->xvec;
+
+ fail:
+  bfd_release (abfd, core_hdr (abfd));
+  core_hdr (abfd) = NULL;
+  bfd_section_list_clear (abfd);
+  return NULL;
+}
+
+static char *
+hpux_core_core_file_failing_command (bfd *abfd)
+{
+  return core_command (abfd);
+}
+
+static int
+hpux_core_core_file_failing_signal (bfd *abfd)
+{
+  return core_signal (abfd);
+}
+
+
+/* If somebody calls any byte-swapping routines, shoot them.  */
+static void
+swap_abort (void)
+{
+  abort(); /* This way doesn't require any declaration for ANSI to fuck up */
+}
+
+#define	NO_GET ((bfd_vma (*) (const void *)) swap_abort)
+#define	NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
+#define	NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
+#define	NO_GET64 ((bfd_uint64_t (*) (const void *)) swap_abort)
+#define	NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
+#define	NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
+
+const bfd_target hpux_core_vec =
+  {
+    "hpux-core",
+    bfd_target_unknown_flavour,
+    BFD_ENDIAN_BIG,		/* target byte order */
+    BFD_ENDIAN_BIG,		/* target headers byte order */
+    (HAS_RELOC | EXEC_P |	/* object flags */
+     HAS_LINENO | HAS_DEBUG |
+     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+    0,				/* symbol prefix */
+    ' ',			/* ar_pad_char */
+    16,				/* ar_max_namelen */
+    0,				/* match priority.  */
+    NO_GET64, NO_GETS64, NO_PUT64,	/* 64 bit data */
+    NO_GET, NO_GETS, NO_PUT,		/* 32 bit data */
+    NO_GET, NO_GETS, NO_PUT,		/* 16 bit data */
+    NO_GET64, NO_GETS64, NO_PUT64,	/* 64 bit hdrs */
+    NO_GET, NO_GETS, NO_PUT,		/* 32 bit hdrs */
+    NO_GET, NO_GETS, NO_PUT,		/* 16 bit hdrs */
+
+    {				/* bfd_check_format */
+      _bfd_dummy_target,		/* unknown format */
+      _bfd_dummy_target,		/* object file */
+      _bfd_dummy_target,		/* archive */
+      hpux_core_core_file_p		/* a core file */
+    },
+    {				/* bfd_set_format */
+      bfd_false, bfd_false,
+      bfd_false, bfd_false
+    },
+    {				/* bfd_write_contents */
+      bfd_false, bfd_false,
+      bfd_false, bfd_false
+    },
+
+    BFD_JUMP_TABLE_GENERIC (_bfd_generic),
+    BFD_JUMP_TABLE_COPY (_bfd_generic),
+    BFD_JUMP_TABLE_CORE (hpux_core),
+    BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+    BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
+    BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+    BFD_JUMP_TABLE_WRITE (_bfd_generic),
+    BFD_JUMP_TABLE_LINK (_bfd_nolink),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    NULL,
+
+    (PTR) 0			/* backend_data */
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/i386aout.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/i386aout.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/i386aout.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/i386aout.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,89 @@
+/* BFD back-end for i386 a.out binaries.
+   Copyright 1990, 1991, 1992, 1994, 1996, 1997, 2001, 2002, 2003, 2005,
+   2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* The only 386 aout system we have here is GO32 from DJ.
+   These numbers make BFD work with that. If your aout 386 system
+   doesn't work with these, we'll have to split them into different
+   files.  Send me (sac@cygnus.com) the runes to make it work on your
+   system, and I'll stick it in for the next release.  */
+
+#define N_HEADER_IN_TEXT(x)	0
+#define N_TXTOFF(x)   		0x20
+#define N_TXTADDR(x) 		(N_MAGIC (x) == ZMAGIC ? 0x1020 : 0)
+#define N_TXTSIZE(x) 		((x).a_text)
+#define TARGET_PAGE_SIZE 	4096
+#define SEGMENT_SIZE 		0x400000
+#define DEFAULT_ARCH 		bfd_arch_i386
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (i386aout_,OP)
+#define TARGETNAME "a.out-i386"
+#define NO_WRITE_HEADER_KLUDGE 1
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "aout/aout64.h"
+#include "libaout.h"
+
+/* Set the machine type correctly.  */
+
+static bfd_boolean
+i386aout_write_object_contents (bfd *abfd)
+{
+  struct external_exec exec_bytes;
+  struct internal_exec *execp = exec_hdr (abfd);
+
+  N_SET_MACHTYPE (*execp, M_386);
+
+  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+
+  WRITE_HEADERS (abfd, execp);
+
+  return TRUE;
+}
+
+#define MY_write_object_contents  i386aout_write_object_contents
+#define MY_backend_data           & MY (backend_data)
+
+static const struct aout_backend_data MY (backend_data);
+
+#include "aout-target.h"
+
+static const struct aout_backend_data MY (backend_data) =
+{
+  0,				/* Zmagic contiguous.  */
+  1,				/* Text incl header.  */
+  0,				/* Entry is text address.  */
+  0,				/* Exec_hdr_flags.  */
+  0,				/* Text vma?  */
+  MY (set_sizes),
+  1,				/* Exec header not counted.  */
+  0,				/* Add_dynamic_symbols.  */
+  0,				/* Add_one_symbol.  */
+  0,				/* Link_dynamic_object.  */
+  0,				/* Write_dynamic_symbol.  */
+  0,				/* Check_dynamic_reloc.  */
+  0				/* Finish_dynamic_link.  */
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/i386bsd.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/i386bsd.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/i386bsd.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/i386bsd.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,51 @@
+/* BFD back-end for i386 a.out binaries under BSD.
+   Copyright 1990, 1991, 1992, 1993, 1994, 2001, 2005, 2007, 2009
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* This data should be correct for the format used under all the various
+   BSD ports for 386 machines.  */
+
+#define	BYTES_IN_WORD	4
+
+/* ZMAGIC files never have the header in the text.  */
+#define	N_HEADER_IN_TEXT(x)	0
+
+/* ZMAGIC files start at address 0.  This does not apply to QMAGIC.  */
+#define TEXT_START_ADDR 0
+
+#define	TARGET_PAGE_SIZE	4096
+#define	SEGMENT_SIZE	TARGET_PAGE_SIZE
+
+#define	DEFAULT_ARCH	bfd_arch_i386
+#define MACHTYPE_OK(mtype) ((mtype) == M_386 || (mtype) == M_UNKNOWN)
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (i386bsd_,OP)
+#define TARGETNAME "a.out-i386-bsd"
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libaout.h"
+
+#include "aout-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/i386dynix.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/i386dynix.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/i386dynix.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/i386dynix.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,83 @@
+/* BFD back-end for i386 a.out binaries under dynix.
+   Copyright 1994, 1995, 2001, 2003, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* This BFD is currently only tested with gdb, writing object files
+   may not work.  */
+
+#define TEXT_START_ADDR 4096
+#define TARGET_PAGE_SIZE	4096
+#define SEGMENT_SIZE	TARGET_PAGE_SIZE
+
+#include "aout/dynix3.h"
+
+#define DEFAULT_ARCH	bfd_arch_i386
+#define MACHTYPE_OK(mtype) ((mtype) == M_386 || (mtype) == M_UNKNOWN)
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (i386dynix_,OP)
+#define TARGETNAME "a.out-i386-dynix"
+#define NAME(x,y) CONCAT3 (i386dynix,_32_,y)
+#define ARCH_SIZE 32
+#define NAME_swap_exec_header_in NAME(i386dynix_32_,swap_exec_header_in)
+#define MY_get_section_contents aout_32_get_section_contents
+
+/* aoutx.h requires definitions for NMAGIC, BMAGIC and QMAGIC.  */
+#define NMAGIC 0
+#define BMAGIC OMAGIC
+#define QMAGIC XMAGIC
+
+#include "aoutx.h"
+
+/* (Ab)use some fields in the internal exec header to be able to read
+   executables that contain shared data.  */
+
+#define a_shdata a_tload
+#define a_shdrsize a_dload
+
+void
+i386dynix_32_swap_exec_header_in (abfd, raw_bytes, execp)
+     bfd *abfd;
+     struct external_exec *raw_bytes;
+     struct internal_exec *execp;
+{
+  struct external_exec *bytes = (struct external_exec *)raw_bytes;
+
+  /* The internal_exec structure has some fields that are unused in this
+     configuration (IE for i960), so ensure that all such uninitialized
+     fields are zero'd out.  There are places where two of these structs
+     are memcmp'd, and thus the contents do matter. */
+  memset ((PTR) execp, 0, sizeof (struct internal_exec));
+  /* Now fill in fields in the execp, from the bytes in the raw data.  */
+  execp->a_info   = H_GET_32 (abfd, bytes->e_info);
+  execp->a_text   = GET_WORD (abfd, bytes->e_text);
+  execp->a_data   = GET_WORD (abfd, bytes->e_data);
+  execp->a_bss    = GET_WORD (abfd, bytes->e_bss);
+  execp->a_syms   = GET_WORD (abfd, bytes->e_syms);
+  execp->a_entry  = GET_WORD (abfd, bytes->e_entry);
+  execp->a_trsize = GET_WORD (abfd, bytes->e_trsize);
+  execp->a_drsize = GET_WORD (abfd, bytes->e_drsize);
+  execp->a_shdata = GET_WORD (abfd, bytes->e_shdata);
+  execp->a_shdrsize = GET_WORD (abfd, bytes->e_shdrsize);
+}
+
+#include "aout-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/i386freebsd.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/i386freebsd.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/i386freebsd.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/i386freebsd.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,39 @@
+/* BFD back-end for FreeBSD/386 a.out-ish binaries.
+   Copyright 1990, 1991, 1992, 1996, 2001, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA. */
+
+#define	BYTES_IN_WORD	4
+#undef TARGET_IS_BIG_ENDIAN_P
+
+#define	TARGET_PAGE_SIZE	4096
+#define	SEGMENT_SIZE	TARGET_PAGE_SIZE
+
+#define	DEFAULT_ARCH	bfd_arch_i386
+#define MACHTYPE_OK(mtype) ((mtype) == M_386_NETBSD || (mtype) == M_UNKNOWN)
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (i386freebsd_,OP)
+
+/* This needs to start with a.out so GDB knows it is an a.out variant.  */
+#define TARGETNAME "a.out-i386-freebsd"
+
+#include "freebsd.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/i386linux.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/i386linux.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/i386linux.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/i386linux.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,770 @@
+/* BFD back-end for linux flavored i386 a.out binaries.
+   Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define	TARGET_PAGE_SIZE	4096
+#define ZMAGIC_DISK_BLOCK_SIZE 1024
+#define	SEGMENT_SIZE TARGET_PAGE_SIZE
+#define TEXT_START_ADDR	0x0
+
+#define MACHTYPE_OK(mtype) ((mtype) == M_386 || (mtype) == M_UNKNOWN)
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "aout/aout64.h"
+#include "aout/stab_gnu.h"
+#include "aout/ar.h"
+#include "libaout.h"           /* BFD a.out internal data structures */
+
+#define DEFAULT_ARCH bfd_arch_i386
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (i386linux_,OP)
+#define TARGETNAME "a.out-i386-linux"
+
+extern const bfd_target MY(vec);
+
+/* We always generate QMAGIC files in preference to ZMAGIC files.  It
+   would be possible to make this a linker option, if that ever
+   becomes important.  */
+
+static void MY_final_link_callback
+  PARAMS ((bfd *, file_ptr *, file_ptr *, file_ptr *));
+static bfd_boolean i386linux_bfd_final_link
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean i386linux_write_object_contents PARAMS ((bfd *));
+
+static bfd_boolean
+i386linux_bfd_final_link (abfd, info)
+     bfd *abfd;
+     struct bfd_link_info *info;
+{
+  obj_aout_subformat (abfd) = q_magic_format;
+  return NAME(aout,final_link) (abfd, info, MY_final_link_callback);
+}
+
+#define MY_bfd_final_link i386linux_bfd_final_link
+
+/* Set the machine type correctly.  */
+
+static bfd_boolean
+i386linux_write_object_contents (abfd)
+     bfd *abfd;
+{
+  struct external_exec exec_bytes;
+  struct internal_exec *execp = exec_hdr (abfd);
+
+  N_SET_MACHTYPE (*execp, M_386);
+
+  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+
+  WRITE_HEADERS(abfd, execp);
+
+  return TRUE;
+}
+
+#define MY_write_object_contents i386linux_write_object_contents
+
+/* Code to link against Linux a.out shared libraries.  */
+
+/* See if a symbol name is a reference to the global offset table.  */
+
+#ifndef GOT_REF_PREFIX
+#define	GOT_REF_PREFIX	"__GOT_"
+#endif
+
+#define IS_GOT_SYM(name)   (CONST_STRNEQ (name, GOT_REF_PREFIX))
+
+/* See if a symbol name is a reference to the procedure linkage table.  */
+
+#ifndef PLT_REF_PREFIX
+#define	PLT_REF_PREFIX	"__PLT_"
+#endif
+
+#define IS_PLT_SYM(name)  (CONST_STRNEQ (name, PLT_REF_PREFIX))
+
+/* This string is used to generate specialized error messages.  */
+
+#ifndef NEEDS_SHRLIB
+#define NEEDS_SHRLIB "__NEEDS_SHRLIB_"
+#endif
+
+/* This special symbol is a set vector that contains a list of
+   pointers to fixup tables.  It will be present in any dynamically
+   linked file.  The linker generated fixup table should also be added
+   to the list, and it should always appear in the second slot (the
+   first one is a dummy with a magic number that is defined in
+   crt0.o).  */
+
+#ifndef SHARABLE_CONFLICTS
+#define SHARABLE_CONFLICTS "__SHARABLE_CONFLICTS__"
+#endif
+
+/* We keep a list of fixups.  The terminology is a bit strange, but
+   each fixup contains two 32 bit numbers.  A regular fixup contains
+   an address and a pointer, and at runtime we should store the
+   address at the location pointed to by the pointer.  A builtin fixup
+   contains two pointers, and we should read the address using one
+   pointer and store it at the location pointed to by the other
+   pointer.  Builtin fixups come into play when we have duplicate
+   __GOT__ symbols for the same variable.  The builtin fixup will copy
+   the GOT pointer from one over into the other.  */
+
+struct fixup
+{
+  struct fixup *next;
+  struct linux_link_hash_entry *h;
+  bfd_vma value;
+
+  /* Nonzero if this is a jump instruction that needs to be fixed,
+     zero if this is just a pointer */
+  char jump;
+
+  char builtin;
+};
+
+/* We don't need a special hash table entry structure, but we do need
+   to keep some information between linker passes, so we use a special
+   hash table.  */
+
+struct linux_link_hash_entry
+{
+  struct aout_link_hash_entry root;
+};
+
+struct linux_link_hash_table
+{
+  struct aout_link_hash_table root;
+
+  /* First dynamic object found in link.  */
+  bfd *dynobj;
+
+  /* Number of fixups.  */
+  size_t fixup_count;
+
+  /* Number of builtin fixups.  */
+  size_t local_builtins;
+
+  /* List of fixups.  */
+  struct fixup *fixup_list;
+};
+
+static struct bfd_hash_entry *linux_link_hash_newfunc
+  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
+static struct bfd_link_hash_table *linux_link_hash_table_create
+  PARAMS ((bfd *));
+static struct fixup *new_fixup
+  PARAMS ((struct bfd_link_info *, struct linux_link_hash_entry *,
+	   bfd_vma, int));
+static bfd_boolean linux_link_create_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean linux_add_one_symbol
+  PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword, asection *,
+	   bfd_vma, const char *, bfd_boolean, bfd_boolean,
+	   struct bfd_link_hash_entry **));
+static bfd_boolean linux_tally_symbols
+  PARAMS ((struct linux_link_hash_entry *, PTR));
+static bfd_boolean linux_finish_dynamic_link
+  PARAMS ((bfd *, struct bfd_link_info *));
+
+/* Routine to create an entry in an Linux link hash table.  */
+
+static struct bfd_hash_entry *
+linux_link_hash_newfunc (entry, table, string)
+     struct bfd_hash_entry *entry;
+     struct bfd_hash_table *table;
+     const char *string;
+{
+  struct linux_link_hash_entry *ret = (struct linux_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == (struct linux_link_hash_entry *) NULL)
+    ret = ((struct linux_link_hash_entry *)
+	   bfd_hash_allocate (table, sizeof (struct linux_link_hash_entry)));
+  if (ret == NULL)
+    return (struct bfd_hash_entry *) ret;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct linux_link_hash_entry *)
+	 NAME(aout,link_hash_newfunc) ((struct bfd_hash_entry *) ret,
+				       table, string));
+  if (ret != NULL)
+    {
+      /* Set local fields; there aren't any.  */
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Create a Linux link hash table.  */
+
+static struct bfd_link_hash_table *
+linux_link_hash_table_create (abfd)
+     bfd *abfd;
+{
+  struct linux_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct linux_link_hash_table);
+
+  ret = (struct linux_link_hash_table *) bfd_alloc (abfd, amt);
+  if (ret == (struct linux_link_hash_table *) NULL)
+    return (struct bfd_link_hash_table *) NULL;
+  if (!NAME(aout,link_hash_table_init) (&ret->root, abfd,
+					linux_link_hash_newfunc,
+					sizeof (struct linux_link_hash_entry)))
+    {
+      free (ret);
+      return (struct bfd_link_hash_table *) NULL;
+    }
+
+  ret->dynobj = NULL;
+  ret->fixup_count = 0;
+  ret->local_builtins = 0;
+  ret->fixup_list = NULL;
+
+  return &ret->root.root;
+}
+
+/* Look up an entry in a Linux link hash table.  */
+
+#define linux_link_hash_lookup(table, string, create, copy, follow) \
+  ((struct linux_link_hash_entry *) \
+   aout_link_hash_lookup (&(table)->root, (string), (create), (copy),\
+			  (follow)))
+
+/* Traverse a Linux link hash table.  */
+
+#define linux_link_hash_traverse(table, func, info)			\
+  (aout_link_hash_traverse						\
+   (&(table)->root,							\
+    (bfd_boolean (*) PARAMS ((struct aout_link_hash_entry *, PTR))) (func), \
+    (info)))
+
+/* Get the Linux link hash table from the info structure.  This is
+   just a cast.  */
+
+#define linux_hash_table(p) ((struct linux_link_hash_table *) ((p)->hash))
+
+/* Store the information for a new fixup.  */
+
+static struct fixup *
+new_fixup (info, h, value, builtin)
+     struct bfd_link_info *info;
+     struct linux_link_hash_entry *h;
+     bfd_vma value;
+     int builtin;
+{
+  struct fixup *f;
+
+  f = (struct fixup *) bfd_hash_allocate (&info->hash->table,
+					  sizeof (struct fixup));
+  if (f == NULL)
+    return f;
+  f->next = linux_hash_table (info)->fixup_list;
+  linux_hash_table (info)->fixup_list = f;
+  f->h = h;
+  f->value = value;
+  f->builtin = builtin;
+  f->jump = 0;
+  ++linux_hash_table (info)->fixup_count;
+  return f;
+}
+
+/* We come here once we realize that we are going to link to a shared
+   library.  We need to create a special section that contains the
+   fixup table, and we ultimately need to add a pointer to this into
+   the set vector for SHARABLE_CONFLICTS.  At this point we do not
+   know the size of the section, but that's OK - we just need to
+   create it for now.  */
+
+static bfd_boolean
+linux_link_create_dynamic_sections (abfd, info)
+     bfd *abfd;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+{
+  flagword flags;
+  register asection *s;
+
+  /* Note that we set the SEC_IN_MEMORY flag.  */
+  flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY;
+
+  /* We choose to use the name ".linux-dynamic" for the fixup table.
+     Why not? */
+  s = bfd_make_section_with_flags (abfd, ".linux-dynamic", flags);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, 2))
+    return FALSE;
+  s->size = 0;
+  s->contents = 0;
+
+  return TRUE;
+}
+
+/* Function to add a single symbol to the linker hash table.  This is
+   a wrapper around _bfd_generic_link_add_one_symbol which handles the
+   tweaking needed for dynamic linking support.  */
+
+static bfd_boolean
+linux_add_one_symbol (info, abfd, name, flags, section, value, string,
+		      copy, collect, hashp)
+     struct bfd_link_info *info;
+     bfd *abfd;
+     const char *name;
+     flagword flags;
+     asection *section;
+     bfd_vma value;
+     const char *string;
+     bfd_boolean copy;
+     bfd_boolean collect;
+     struct bfd_link_hash_entry **hashp;
+{
+  struct linux_link_hash_entry *h;
+  bfd_boolean insert;
+
+  /* Look up and see if we already have this symbol in the hash table.
+     If we do, and the defining entry is from a shared library, we
+     need to create the dynamic sections.
+
+     FIXME: What if abfd->xvec != info->output_bfd->xvec?  We may
+     want to be able to link Linux a.out and ELF objects together,
+     but serious confusion is possible.  */
+
+  insert = FALSE;
+
+  if (! info->relocatable
+      && linux_hash_table (info)->dynobj == NULL
+      && strcmp (name, SHARABLE_CONFLICTS) == 0
+      && (flags & BSF_CONSTRUCTOR) != 0
+      && abfd->xvec == info->output_bfd->xvec)
+    {
+      if (! linux_link_create_dynamic_sections (abfd, info))
+	return FALSE;
+      linux_hash_table (info)->dynobj = abfd;
+      insert = TRUE;
+    }
+
+  if (bfd_is_abs_section (section)
+      && abfd->xvec == info->output_bfd->xvec)
+    {
+      h = linux_link_hash_lookup (linux_hash_table (info), name, FALSE,
+				  FALSE, FALSE);
+      if (h != NULL
+	  && (h->root.root.type == bfd_link_hash_defined
+	      || h->root.root.type == bfd_link_hash_defweak))
+	{
+	  struct fixup *f;
+
+	  if (hashp != NULL)
+	    *hashp = (struct bfd_link_hash_entry *) h;
+
+	  f = new_fixup (info, h, value, ! IS_PLT_SYM (name));
+	  if (f == NULL)
+	    return FALSE;
+	  f->jump = IS_PLT_SYM (name);
+
+	  return TRUE;
+	}
+    }
+
+  /* Do the usual procedure for adding a symbol.  */
+  if (! _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section,
+					  value, string, copy, collect,
+					  hashp))
+    return FALSE;
+
+  /* Insert a pointer to our table in the set vector.  The dynamic
+     linker requires this information */
+  if (insert)
+    {
+      asection *s;
+
+      /* Here we do our special thing to add the pointer to the
+	 dynamic section in the SHARABLE_CONFLICTS set vector.  */
+      s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
+				   ".linux-dynamic");
+      BFD_ASSERT (s != NULL);
+
+      if (! (_bfd_generic_link_add_one_symbol
+	     (info, linux_hash_table (info)->dynobj, SHARABLE_CONFLICTS,
+	      BSF_GLOBAL | BSF_CONSTRUCTOR, s, (bfd_vma) 0, NULL,
+	      FALSE, FALSE, NULL)))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* We will crawl the hash table and come here for every global symbol.
+   We will examine each entry and see if there are indications that we
+   need to add a fixup.  There are two possible cases - one is where
+   you have duplicate definitions of PLT or GOT symbols - these will
+   have already been caught and added as "builtin" fixups.  If we find
+   that the corresponding non PLT/GOT symbol is also present, we
+   convert it to a regular fixup instead.
+
+   This function is called via linux_link_hash_traverse.  */
+
+static bfd_boolean
+linux_tally_symbols (h, data)
+     struct linux_link_hash_entry *h;
+     PTR data;
+{
+  struct bfd_link_info *info = (struct bfd_link_info *) data;
+  struct fixup *f, *f1;
+  int is_plt;
+  struct linux_link_hash_entry *h1, *h2;
+  bfd_boolean exists;
+
+  if (h->root.root.type == bfd_link_hash_undefined
+      && CONST_STRNEQ (h->root.root.root.string, NEEDS_SHRLIB))
+    {
+      const char *name;
+      char *p;
+      char *alloc = NULL;
+
+      name = h->root.root.root.string + sizeof NEEDS_SHRLIB - 1;
+      p = strrchr (name, '_');
+      if (p != NULL)
+	alloc = (char *) bfd_malloc ((bfd_size_type) strlen (name) + 1);
+
+      if (p == NULL || alloc == NULL)
+	(*_bfd_error_handler) (_("Output file requires shared library `%s'\n"),
+			       name);
+      else
+	{
+	  strcpy (alloc, name);
+	  p = strrchr (alloc, '_');
+	  *p++ = '\0';
+	  (*_bfd_error_handler)
+	    (_("Output file requires shared library `%s.so.%s'\n"),
+	     alloc, p);
+	  free (alloc);
+	}
+
+      abort ();
+    }
+
+  /* If this symbol is not a PLT/GOT, we do not even need to look at it */
+  is_plt = IS_PLT_SYM (h->root.root.root.string);
+
+  if (is_plt || IS_GOT_SYM (h->root.root.root.string))
+    {
+      /* Look up this symbol twice.  Once just as a regular lookup,
+	 and then again following all of the indirect links until we
+	 reach a real symbol.  */
+      h1 = linux_link_hash_lookup (linux_hash_table (info),
+				   (h->root.root.root.string
+				    + sizeof PLT_REF_PREFIX - 1),
+				   FALSE, FALSE, TRUE);
+      /* h2 does not follow indirect symbols. */
+      h2 = linux_link_hash_lookup (linux_hash_table (info),
+				   (h->root.root.root.string
+				    + sizeof PLT_REF_PREFIX - 1),
+				   FALSE, FALSE, FALSE);
+
+      /* The real symbol must exist but if it is also an ABS symbol,
+	 there is no need to have a fixup.  This is because they both
+	 came from the same library.  If on the other hand, we had to
+	 use an indirect symbol to get to the real symbol, we add the
+	 fixup anyway, since there are cases where these symbols come
+	 from different shared libraries */
+      if (h1 != NULL
+	  && (((h1->root.root.type == bfd_link_hash_defined
+		|| h1->root.root.type == bfd_link_hash_defweak)
+	       && ! bfd_is_abs_section (h1->root.root.u.def.section))
+	      || h2->root.root.type == bfd_link_hash_indirect))
+	{
+	  /* See if there is a "builtin" fixup already present
+	     involving this symbol.  If so, convert it to a regular
+	     fixup.  In the end, this relaxes some of the requirements
+	     about the order of performing fixups.  */
+	  exists = FALSE;
+	  for (f1 = linux_hash_table (info)->fixup_list;
+	       f1 != NULL;
+	       f1 = f1->next)
+	    {
+	      if ((f1->h != h && f1->h != h1)
+		  || (! f1->builtin && ! f1->jump))
+		continue;
+	      if (f1->h == h1)
+		exists = TRUE;
+	      if (! exists
+		  && bfd_is_abs_section (h->root.root.u.def.section))
+		{
+		  f = new_fixup (info, h1, f1->h->root.root.u.def.value, 0);
+		  f->jump = is_plt;
+		}
+	      f1->h = h1;
+	      f1->jump = is_plt;
+	      f1->builtin = 0;
+	      exists = TRUE;
+	    }
+	  if (! exists
+	      && bfd_is_abs_section (h->root.root.u.def.section))
+	    {
+	      f = new_fixup (info, h1, h->root.root.u.def.value, 0);
+	      if (f == NULL)
+		{
+		  /* FIXME: No way to return error.  */
+		  abort ();
+		}
+	      f->jump = is_plt;
+	    }
+	}
+
+      /* Quick and dirty way of stripping these symbols from the
+	 symtab. */
+      if (bfd_is_abs_section (h->root.root.u.def.section))
+	h->root.written = TRUE;
+    }
+
+  return TRUE;
+}
+
+/* This is called to set the size of the .linux-dynamic section is.
+   It is called by the Linux linker emulation before_allocation
+   routine.  We have finished reading all of the input files, and now
+   we just scan the hash tables to find out how many additional fixups
+   are required.  */
+
+bfd_boolean
+bfd_i386linux_size_dynamic_sections (output_bfd, info)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+{
+  struct fixup *f;
+  asection *s;
+
+  if (output_bfd->xvec != &MY(vec))
+    return TRUE;
+
+  /* First find the fixups... */
+  linux_link_hash_traverse (linux_hash_table (info),
+			    linux_tally_symbols,
+			    (PTR) info);
+
+  /* If there are builtin fixups, leave room for a marker.  This is
+     used by the dynamic linker so that it knows that all that follow
+     are builtin fixups instead of regular fixups.  */
+  for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
+    {
+      if (f->builtin)
+	{
+	  ++linux_hash_table (info)->fixup_count;
+	  ++linux_hash_table (info)->local_builtins;
+	  break;
+	}
+    }
+
+  if (linux_hash_table (info)->dynobj == NULL)
+    {
+      if (linux_hash_table (info)->fixup_count > 0)
+	abort ();
+      return TRUE;
+    }
+
+  /* Allocate memory for our fixup table.  We will fill it in later.  */
+  s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
+			       ".linux-dynamic");
+  if (s != NULL)
+    {
+      s->size = linux_hash_table (info)->fixup_count + 1;
+      s->size *= 8;
+      s->contents = (bfd_byte *) bfd_zalloc (output_bfd, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* We come here once we are ready to actually write the fixup table to
+   the output file.  Scan the fixup tables and so forth and generate
+   the stuff we need.  */
+
+static bfd_boolean
+linux_finish_dynamic_link (output_bfd, info)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+{
+  asection *s, *os, *is;
+  bfd_byte *fixup_table;
+  struct linux_link_hash_entry *h;
+  struct fixup *f;
+  unsigned int new_addr;
+  int section_offset;
+  unsigned int fixups_written;
+
+  if (linux_hash_table (info)->dynobj == NULL)
+    return TRUE;
+
+  s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
+			       ".linux-dynamic");
+  BFD_ASSERT (s != NULL);
+  os = s->output_section;
+  fixups_written = 0;
+
+#ifdef LINUX_LINK_DEBUG
+  printf ("Fixup table file offset: %x  VMA: %x\n",
+	  os->filepos + s->output_offset,
+	  os->vma + s->output_offset);
+#endif
+
+  fixup_table = s->contents;
+  bfd_put_32 (output_bfd,
+	      (bfd_vma) linux_hash_table (info)->fixup_count, fixup_table);
+  fixup_table += 4;
+
+  /* Fill in fixup table.  */
+  for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
+    {
+      if (f->builtin)
+	continue;
+
+      if (f->h->root.root.type != bfd_link_hash_defined
+	  && f->h->root.root.type != bfd_link_hash_defweak)
+	{
+	  (*_bfd_error_handler)
+	    (_("Symbol %s not defined for fixups\n"),
+	     f->h->root.root.root.string);
+	  continue;
+	}
+
+      is = f->h->root.root.u.def.section;
+      section_offset = is->output_section->vma + is->output_offset;
+      new_addr = f->h->root.root.u.def.value + section_offset;
+
+#ifdef LINUX_LINK_DEBUG
+      printf ("Fixup(%d) %s: %x %x\n",f->jump, f->h->root.root.string,
+	      new_addr, f->value);
+#endif
+
+      if (f->jump)
+	{
+	  /* Relative address */
+	  new_addr = new_addr - (f->value + 5);
+	  bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
+	  fixup_table += 4;
+	  bfd_put_32 (output_bfd, f->value + 1, fixup_table);
+	  fixup_table += 4;
+	}
+      else
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
+	  fixup_table += 4;
+	  bfd_put_32 (output_bfd, f->value, fixup_table);
+	  fixup_table += 4;
+	}
+      ++fixups_written;
+    }
+
+  if (linux_hash_table (info)->local_builtins != 0)
+    {
+      /* Special marker so we know to switch to the other type of fixup */
+      bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
+      fixup_table += 4;
+      bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
+      fixup_table += 4;
+      ++fixups_written;
+      for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
+	{
+	  if (! f->builtin)
+	    continue;
+
+	  if (f->h->root.root.type != bfd_link_hash_defined
+	      && f->h->root.root.type != bfd_link_hash_defweak)
+	    {
+	      (*_bfd_error_handler)
+		(_("Symbol %s not defined for fixups\n"),
+		 f->h->root.root.root.string);
+	      continue;
+	    }
+
+	  is = f->h->root.root.u.def.section;
+	  section_offset = is->output_section->vma + is->output_offset;
+	  new_addr = f->h->root.root.u.def.value + section_offset;
+
+#ifdef LINUX_LINK_DEBUG
+	  printf ("Fixup(B) %s: %x %x\n", f->h->root.root.string,
+		  new_addr, f->value);
+#endif
+
+	  bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
+	  fixup_table += 4;
+	  bfd_put_32 (output_bfd, f->value, fixup_table);
+	  fixup_table += 4;
+	  ++fixups_written;
+	}
+  }
+
+  if (linux_hash_table (info)->fixup_count != fixups_written)
+    {
+      (*_bfd_error_handler) (_("Warning: fixup count mismatch\n"));
+      while (linux_hash_table (info)->fixup_count > fixups_written)
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
+	  fixup_table += 4;
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
+	  fixup_table += 4;
+	  ++fixups_written;
+	}
+    }
+
+  h = linux_link_hash_lookup (linux_hash_table (info),
+			      "__BUILTIN_FIXUPS__",
+			      FALSE, FALSE, FALSE);
+
+  if (h != NULL
+      && (h->root.root.type == bfd_link_hash_defined
+	  || h->root.root.type == bfd_link_hash_defweak))
+    {
+      is = h->root.root.u.def.section;
+      section_offset = is->output_section->vma + is->output_offset;
+      new_addr = h->root.root.u.def.value + section_offset;
+
+#ifdef LINUX_LINK_DEBUG
+      printf ("Builtin fixup table at %x\n", new_addr);
+#endif
+
+      bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
+    }
+  else
+    bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
+
+  if (bfd_seek (output_bfd, (file_ptr) (os->filepos + s->output_offset),
+		SEEK_SET) != 0)
+    return FALSE;
+
+  if (bfd_bwrite ((PTR) s->contents, s->size, output_bfd) != s->size)
+    return FALSE;
+
+  return TRUE;
+}
+
+#define MY_bfd_link_hash_table_create linux_link_hash_table_create
+#define MY_add_one_symbol linux_add_one_symbol
+#define MY_finish_dynamic_link linux_finish_dynamic_link
+
+#define MY_zmagic_contiguous 1
+
+#include "aout-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/i386lynx.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/i386lynx.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/i386lynx.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/i386lynx.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,574 @@
+/* BFD back-end for i386 a.out binaries under LynxOS.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1999, 2001, 2002,
+   2003, 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define TEXT_START_ADDR 0
+#define TARGET_PAGE_SIZE 4096
+#define SEGMENT_SIZE TARGET_PAGE_SIZE
+#define DEFAULT_ARCH bfd_arch_i386
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (i386lynx_aout_,OP)
+#define TARGETNAME "a.out-i386-lynx"
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#ifndef WRITE_HEADERS
+#define WRITE_HEADERS(abfd, execp)					      \
+      {									      \
+	bfd_size_type text_size; /* dummy vars */			      \
+	file_ptr text_end;						      \
+	if (adata(abfd).magic == undecided_magic)			      \
+	  NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end);     \
+    									      \
+	execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE;	      \
+	execp->a_entry = bfd_get_start_address (abfd);			      \
+    									      \
+	execp->a_trsize = ((obj_textsec (abfd)->reloc_count) *		      \
+			   obj_reloc_entry_size (abfd));		      \
+	execp->a_drsize = ((obj_datasec (abfd)->reloc_count) *		      \
+			   obj_reloc_entry_size (abfd));		      \
+	NAME(aout,swap_exec_header_out) (abfd, execp, &exec_bytes);	      \
+									      \
+	if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0		      \
+	    || bfd_bwrite ((PTR) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE, \
+			  abfd) != EXEC_BYTES_SIZE)			      \
+	  return FALSE;							      \
+	/* Now write out reloc info, followed by syms and strings */	      \
+  									      \
+	if (bfd_get_symcount (abfd) != 0) 				      \
+	    {								      \
+	      if (bfd_seek (abfd, (file_ptr) (N_SYMOFF(*execp)), SEEK_SET)    \
+		  != 0)							      \
+	        return FALSE;						      \
+									      \
+	      if (! NAME(aout,write_syms) (abfd)) return FALSE;		      \
+									      \
+	      if (bfd_seek (abfd, (file_ptr) (N_TRELOFF(*execp)), SEEK_SET)   \
+		  != 0)							      \
+	        return FALSE;						      \
+									      \
+	      if (!NAME(lynx,squirt_out_relocs) (abfd, obj_textsec (abfd)))   \
+		return FALSE;						      \
+	      if (bfd_seek (abfd, (file_ptr) (N_DRELOFF(*execp)), SEEK_SET)   \
+		  != 0)							      \
+	        return 0;						      \
+									      \
+	      if (!NAME(lynx,squirt_out_relocs) (abfd, obj_datasec (abfd)))   \
+		return FALSE;						      \
+	    }								      \
+      }
+#endif
+
+#include "libaout.h"
+#include "aout/aout64.h"
+
+void NAME (lynx,swap_std_reloc_out)
+  PARAMS ((bfd *, arelent *, struct reloc_std_external *));
+void NAME (lynx,swap_ext_reloc_out)
+  PARAMS ((bfd *, arelent *, struct reloc_ext_external *));
+void NAME (lynx,swap_ext_reloc_in)
+  PARAMS ((bfd *, struct reloc_ext_external *, arelent *, asymbol **,
+	   bfd_size_type));
+void NAME (lynx,swap_std_reloc_in)
+  PARAMS ((bfd *, struct reloc_std_external *, arelent *, asymbol **,
+	   bfd_size_type));
+bfd_boolean NAME (lynx,slurp_reloc_table)
+  PARAMS ((bfd *, sec_ptr, asymbol **));
+bfd_boolean NAME (lynx,squirt_out_relocs)
+  PARAMS ((bfd *, asection *));
+long NAME (lynx,canonicalize_reloc)
+  PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
+
+#ifdef LYNX_CORE
+
+char *lynx_core_file_failing_command ();
+int lynx_core_file_failing_signal ();
+bfd_boolean lynx_core_file_matches_executable_p ();
+const bfd_target *lynx_core_file_p ();
+
+#define	MY_core_file_failing_command lynx_core_file_failing_command
+#define	MY_core_file_failing_signal lynx_core_file_failing_signal
+#define	MY_core_file_matches_executable_p lynx_core_file_matches_executable_p
+#define	MY_core_file_p lynx_core_file_p
+
+#endif /* LYNX_CORE */
+
+
+#define KEEPIT udata.i
+
+extern reloc_howto_type aout_32_ext_howto_table[];
+extern reloc_howto_type aout_32_std_howto_table[];
+
+/* Standard reloc stuff */
+/* Output standard relocation information to a file in target byte order. */
+
+void
+NAME(lynx,swap_std_reloc_out) (abfd, g, natptr)
+     bfd *abfd;
+     arelent *g;
+     struct reloc_std_external *natptr;
+{
+  int r_index;
+  asymbol *sym = *(g->sym_ptr_ptr);
+  int r_extern;
+  unsigned int r_length;
+  int r_pcrel;
+  int r_baserel, r_jmptable, r_relative;
+  asection *output_section = sym->section->output_section;
+
+  PUT_WORD (abfd, g->address, natptr->r_address);
+
+  r_length = g->howto->size;	/* Size as a power of two */
+  r_pcrel = (int) g->howto->pc_relative;	/* Relative to PC? */
+  /* r_baserel, r_jmptable, r_relative???  FIXME-soon */
+  r_baserel = 0;
+  r_jmptable = 0;
+  r_relative = 0;
+
+  /* name was clobbered by aout_write_syms to be symbol index */
+
+  /* If this relocation is relative to a symbol then set the
+     r_index to the symbols index, and the r_extern bit.
+
+     Absolute symbols can come in in two ways, either as an offset
+     from the abs section, or as a symbol which has an abs value.
+     check for that here
+  */
+
+
+  if (bfd_is_com_section (output_section)
+      || bfd_is_abs_section (output_section)
+      || bfd_is_und_section (output_section))
+    {
+      if (bfd_abs_section_ptr->symbol == sym)
+	{
+	  /* Whoops, looked like an abs symbol, but is really an offset
+	     from the abs section */
+	  r_index = 0;
+	  r_extern = 0;
+	}
+      else
+	{
+	  /* Fill in symbol */
+	  r_extern = 1;
+	  r_index = (*g->sym_ptr_ptr)->KEEPIT;
+	}
+    }
+  else
+    {
+      /* Just an ordinary section */
+      r_extern = 0;
+      r_index = output_section->target_index;
+    }
+
+  /* now the fun stuff */
+  if (bfd_header_big_endian (abfd))
+    {
+      natptr->r_index[0] = r_index >> 16;
+      natptr->r_index[1] = r_index >> 8;
+      natptr->r_index[2] = r_index;
+      natptr->r_type[0] =
+	(r_extern ? RELOC_STD_BITS_EXTERN_BIG : 0)
+	| (r_pcrel ? RELOC_STD_BITS_PCREL_BIG : 0)
+	| (r_baserel ? RELOC_STD_BITS_BASEREL_BIG : 0)
+	| (r_jmptable ? RELOC_STD_BITS_JMPTABLE_BIG : 0)
+	| (r_relative ? RELOC_STD_BITS_RELATIVE_BIG : 0)
+	| (r_length << RELOC_STD_BITS_LENGTH_SH_BIG);
+    }
+  else
+    {
+      natptr->r_index[2] = r_index >> 16;
+      natptr->r_index[1] = r_index >> 8;
+      natptr->r_index[0] = r_index;
+      natptr->r_type[0] =
+	(r_extern ? RELOC_STD_BITS_EXTERN_LITTLE : 0)
+	| (r_pcrel ? RELOC_STD_BITS_PCREL_LITTLE : 0)
+	| (r_baserel ? RELOC_STD_BITS_BASEREL_LITTLE : 0)
+	| (r_jmptable ? RELOC_STD_BITS_JMPTABLE_LITTLE : 0)
+	| (r_relative ? RELOC_STD_BITS_RELATIVE_LITTLE : 0)
+	| (r_length << RELOC_STD_BITS_LENGTH_SH_LITTLE);
+    }
+}
+
+
+/* Extended stuff */
+/* Output extended relocation information to a file in target byte order. */
+
+void
+NAME(lynx,swap_ext_reloc_out) (abfd, g, natptr)
+     bfd *abfd;
+     arelent *g;
+     register struct reloc_ext_external *natptr;
+{
+  int r_index;
+  int r_extern;
+  unsigned int r_type;
+  unsigned int r_addend;
+  asymbol *sym = *(g->sym_ptr_ptr);
+  asection *output_section = sym->section->output_section;
+
+  PUT_WORD (abfd, g->address, natptr->r_address);
+
+  r_type = (unsigned int) g->howto->type;
+
+  r_addend = g->addend + (*(g->sym_ptr_ptr))->section->output_section->vma;
+
+
+  /* If this relocation is relative to a symbol then set the
+     r_index to the symbols index, and the r_extern bit.
+
+     Absolute symbols can come in in two ways, either as an offset
+     from the abs section, or as a symbol which has an abs value.
+     check for that here
+     */
+
+  if (bfd_is_com_section (output_section)
+      || bfd_is_abs_section (output_section)
+      || bfd_is_und_section (output_section))
+    {
+      if (bfd_abs_section_ptr->symbol == sym)
+	{
+	  /* Whoops, looked like an abs symbol, but is really an offset
+	 from the abs section */
+	  r_index = 0;
+	  r_extern = 0;
+	}
+      else
+	{
+	  r_extern = 1;
+	  r_index = (*g->sym_ptr_ptr)->KEEPIT;
+	}
+    }
+  else
+    {
+      /* Just an ordinary section */
+      r_extern = 0;
+      r_index = output_section->target_index;
+    }
+
+
+  /* now the fun stuff */
+  if (bfd_header_big_endian (abfd))
+    {
+      natptr->r_index[0] = r_index >> 16;
+      natptr->r_index[1] = r_index >> 8;
+      natptr->r_index[2] = r_index;
+      natptr->r_type[0] =
+	(r_extern ? RELOC_EXT_BITS_EXTERN_BIG : 0)
+	| (r_type << RELOC_EXT_BITS_TYPE_SH_BIG);
+    }
+  else
+    {
+      natptr->r_index[2] = r_index >> 16;
+      natptr->r_index[1] = r_index >> 8;
+      natptr->r_index[0] = r_index;
+      natptr->r_type[0] =
+	(r_extern ? RELOC_EXT_BITS_EXTERN_LITTLE : 0)
+	| (r_type << RELOC_EXT_BITS_TYPE_SH_LITTLE);
+    }
+
+  PUT_WORD (abfd, r_addend, natptr->r_addend);
+}
+
+/* BFD deals internally with all things based from the section they're
+   in. so, something in 10 bytes into a text section  with a base of
+   50 would have a symbol (.text+10) and know .text vma was 50.
+
+   Aout keeps all it's symbols based from zero, so the symbol would
+   contain 60. This macro subs the base of each section from the value
+   to give the true offset from the section */
+
+
+#define MOVE_ADDRESS(ad)       						\
+  if (r_extern) {							\
+   /* undefined symbol */						\
+     cache_ptr->sym_ptr_ptr = symbols + r_index;			\
+     cache_ptr->addend = ad;						\
+     } else {								\
+    /* defined, section relative. replace symbol with pointer to    	\
+       symbol which points to section  */				\
+    switch (r_index) {							\
+    case N_TEXT:							\
+    case N_TEXT | N_EXT:						\
+      cache_ptr->sym_ptr_ptr  = obj_textsec(abfd)->symbol_ptr_ptr;	\
+      cache_ptr->addend = ad  - su->textsec->vma;			\
+      break;								\
+    case N_DATA:							\
+    case N_DATA | N_EXT:						\
+      cache_ptr->sym_ptr_ptr  = obj_datasec(abfd)->symbol_ptr_ptr;	\
+      cache_ptr->addend = ad - su->datasec->vma;			\
+      break;								\
+    case N_BSS:								\
+    case N_BSS | N_EXT:							\
+      cache_ptr->sym_ptr_ptr  = obj_bsssec(abfd)->symbol_ptr_ptr;	\
+      cache_ptr->addend = ad - su->bsssec->vma;				\
+      break;								\
+    default:								\
+    case N_ABS:								\
+    case N_ABS | N_EXT:							\
+     cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;	\
+      cache_ptr->addend = ad;						\
+      break;								\
+    }									\
+  }     								\
+
+void
+NAME(lynx,swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
+     bfd *abfd;
+     struct reloc_ext_external *bytes;
+     arelent *cache_ptr;
+     asymbol **symbols;
+     bfd_size_type symcount ATTRIBUTE_UNUSED;
+{
+  int r_index;
+  int r_extern;
+  unsigned int r_type;
+  struct aoutdata *su = &(abfd->tdata.aout_data->a);
+
+  cache_ptr->address = (GET_SWORD (abfd, bytes->r_address));
+
+  r_index = bytes->r_index[1];
+  r_extern = (0 != (bytes->r_index[0] & RELOC_EXT_BITS_EXTERN_BIG));
+  r_type = (bytes->r_index[0] & RELOC_EXT_BITS_TYPE_BIG)
+    >> RELOC_EXT_BITS_TYPE_SH_BIG;
+
+  cache_ptr->howto = aout_32_ext_howto_table + r_type;
+  MOVE_ADDRESS (GET_SWORD (abfd, bytes->r_addend));
+}
+
+void
+NAME(lynx,swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
+     bfd *abfd;
+     struct reloc_std_external *bytes;
+     arelent *cache_ptr;
+     asymbol **symbols;
+     bfd_size_type symcount ATTRIBUTE_UNUSED;
+{
+  int r_index;
+  int r_extern;
+  unsigned int r_length;
+  int r_pcrel;
+  struct aoutdata *su = &(abfd->tdata.aout_data->a);
+
+  cache_ptr->address = H_GET_32 (abfd, bytes->r_address);
+
+  r_index = bytes->r_index[1];
+  r_extern = (0 != (bytes->r_index[0] & RELOC_STD_BITS_EXTERN_BIG));
+  r_pcrel = (0 != (bytes->r_index[0] & RELOC_STD_BITS_PCREL_BIG));
+  r_length = (bytes->r_index[0] & RELOC_STD_BITS_LENGTH_BIG)
+    >> RELOC_STD_BITS_LENGTH_SH_BIG;
+
+  cache_ptr->howto = aout_32_std_howto_table + r_length + 4 * r_pcrel;
+  /* FIXME-soon:  Roll baserel, jmptable, relative bits into howto setting */
+
+  MOVE_ADDRESS (0);
+}
+
+/* Reloc hackery */
+
+bfd_boolean
+NAME(lynx,slurp_reloc_table) (abfd, asect, symbols)
+     bfd *abfd;
+     sec_ptr asect;
+     asymbol **symbols;
+{
+  bfd_size_type count;
+  bfd_size_type reloc_size;
+  PTR relocs;
+  arelent *reloc_cache;
+  size_t each_size;
+
+  if (asect->relocation)
+    return TRUE;
+
+  if (asect->flags & SEC_CONSTRUCTOR)
+    return TRUE;
+
+  if (asect == obj_datasec (abfd))
+    {
+      reloc_size = exec_hdr (abfd)->a_drsize;
+      goto doit;
+    }
+
+  if (asect == obj_textsec (abfd))
+    {
+      reloc_size = exec_hdr (abfd)->a_trsize;
+      goto doit;
+    }
+
+  bfd_set_error (bfd_error_invalid_operation);
+  return FALSE;
+
+doit:
+  if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0)
+    return FALSE;
+  each_size = obj_reloc_entry_size (abfd);
+
+  count = reloc_size / each_size;
+
+
+  reloc_cache = (arelent *) bfd_zmalloc (count * sizeof (arelent));
+  if (!reloc_cache && count != 0)
+    return FALSE;
+
+  relocs = (PTR) bfd_alloc (abfd, reloc_size);
+  if (!relocs && reloc_size != 0)
+    {
+      free (reloc_cache);
+      return FALSE;
+    }
+
+  if (bfd_bread (relocs, reloc_size, abfd) != reloc_size)
+    {
+      bfd_release (abfd, relocs);
+      free (reloc_cache);
+      return FALSE;
+    }
+
+  if (each_size == RELOC_EXT_SIZE)
+    {
+      register struct reloc_ext_external *rptr = (struct reloc_ext_external *) relocs;
+      unsigned int counter = 0;
+      arelent *cache_ptr = reloc_cache;
+
+      for (; counter < count; counter++, rptr++, cache_ptr++)
+	{
+	  NAME(lynx,swap_ext_reloc_in) (abfd, rptr, cache_ptr, symbols,
+					(bfd_size_type) bfd_get_symcount (abfd));
+	}
+    }
+  else
+    {
+      register struct reloc_std_external *rptr = (struct reloc_std_external *) relocs;
+      unsigned int counter = 0;
+      arelent *cache_ptr = reloc_cache;
+
+      for (; counter < count; counter++, rptr++, cache_ptr++)
+	{
+	  NAME(lynx,swap_std_reloc_in) (abfd, rptr, cache_ptr, symbols,
+					(bfd_size_type) bfd_get_symcount (abfd));
+	}
+
+    }
+
+  bfd_release (abfd, relocs);
+  asect->relocation = reloc_cache;
+  asect->reloc_count = count;
+  return TRUE;
+}
+
+
+
+/* Write out a relocation section into an object file.  */
+
+bfd_boolean
+NAME(lynx,squirt_out_relocs) (abfd, section)
+     bfd *abfd;
+     asection *section;
+{
+  arelent **generic;
+  unsigned char *native, *natptr;
+  size_t each_size;
+
+  unsigned int count = section->reloc_count;
+  bfd_size_type natsize;
+
+  if (count == 0)
+    return TRUE;
+
+  each_size = obj_reloc_entry_size (abfd);
+  natsize = count;
+  natsize *= each_size;
+  native = (unsigned char *) bfd_zalloc (abfd, natsize);
+  if (!native)
+    return FALSE;
+
+  generic = section->orelocation;
+
+  if (each_size == RELOC_EXT_SIZE)
+    {
+      for (natptr = native;
+	   count != 0;
+	   --count, natptr += each_size, ++generic)
+	NAME(lynx,swap_ext_reloc_out) (abfd, *generic, (struct reloc_ext_external *) natptr);
+    }
+  else
+    {
+      for (natptr = native;
+	   count != 0;
+	   --count, natptr += each_size, ++generic)
+	NAME(lynx,swap_std_reloc_out) (abfd, *generic, (struct reloc_std_external *) natptr);
+    }
+
+  if (bfd_bwrite ((PTR) native, natsize, abfd) != natsize)
+    {
+      bfd_release (abfd, native);
+      return FALSE;
+    }
+  bfd_release (abfd, native);
+
+  return TRUE;
+}
+
+/* This is stupid.  This function should be a boolean predicate */
+long
+NAME(lynx,canonicalize_reloc) (abfd, section, relptr, symbols)
+     bfd *abfd;
+     sec_ptr section;
+     arelent **relptr;
+     asymbol **symbols;
+{
+  arelent *tblptr = section->relocation;
+  unsigned int count;
+
+  if (!(tblptr || NAME(lynx,slurp_reloc_table) (abfd, section, symbols)))
+    return -1;
+
+  if (section->flags & SEC_CONSTRUCTOR)
+    {
+      arelent_chain *chain = section->constructor_chain;
+      for (count = 0; count < section->reloc_count; count++)
+	{
+	  *relptr++ = &chain->relent;
+	  chain = chain->next;
+	}
+    }
+  else
+    {
+      tblptr = section->relocation;
+
+      for (count = 0; count++ < section->reloc_count;)
+	{
+	  *relptr++ = tblptr++;
+	}
+    }
+  *relptr = 0;
+
+  return section->reloc_count;
+}
+
+#define MY_canonicalize_reloc NAME(lynx,canonicalize_reloc)
+
+#include "aout-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/i386mach3.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/i386mach3.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/i386mach3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/i386mach3.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,72 @@
+/* BFD back-end for i386 a.out binaries.
+   Copyright 1990, 1991, 1993, 1994, 1995, 1997, 2001, 2002, 2003, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* This is for Mach 3, which uses a.out, not Mach-O.  */
+
+/* There is no magic number or anything which lets us distinguish this target
+   from i386aout or i386bsd.  So this target is only useful if it is the
+   default target.  */
+
+#define	TARGET_PAGE_SIZE	1
+#define	SEGMENT_SIZE	0x1000
+#define TEXT_START_ADDR	0x10000
+#define ARCH 32
+/* This macro is only relevant when N_MAGIC(x) == ZMAGIC.  */
+#define N_HEADER_IN_TEXT(x)	1
+
+#define N_TXTSIZE(x)	((x).a_text)
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "aout/aout64.h"
+#include "aout/stab_gnu.h"
+#include "aout/ar.h"
+#include "libaout.h"           /* BFD a.out internal data structures */
+
+#define DEFAULT_ARCH bfd_arch_i386
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (i386mach3_,OP)
+#define TARGETNAME "a.out-mach3"
+
+static bfd_boolean MY (set_sizes) PARAMS ((bfd *));
+#define MY_backend_data &MY(backend_data)
+static const struct aout_backend_data MY(backend_data) = {
+  0,				/* zmagic contiguous */
+  1,				/* text incl header */
+  0,				/* entry is text address */
+  0,				/* exec_hdr_flags */
+  0,				/* text vma? */
+  MY(set_sizes),
+  1,				/* exec header not counted */
+  0,				/* add_dynamic_symbols */
+  0,				/* add_one_symbol */
+  0,				/* link_dynamic_object */
+  0,				/* write_dynamic_symbol */
+  0,				/* check_dynamic_reloc */
+  0				/* finish_dynamic_link */
+};
+
+#include "aout-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/i386msdos.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/i386msdos.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/i386msdos.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/i386msdos.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,234 @@
+/* BFD back-end for MS-DOS executables.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2001, 2002,
+   2003, 2004, 2005, 2006, 2007, 2009, 2011 Free Software Foundation, Inc.
+   Written by Bryan Ford of the University of Utah.
+
+   Contributed by the Center for Software Science at the
+   University of Utah (pa-gdb-bugs@cs.utah.edu).
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libaout.h"
+
+#define EXE_MAGIC	0x5a4d
+#define EXE_LOAD_HIGH	0x0000
+#define EXE_LOAD_LOW	0xffff
+#define EXE_PAGE_SIZE	512
+
+static int
+msdos_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+		      struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static bfd_boolean
+msdos_write_object_contents (bfd *abfd)
+{
+  static char hdr[EXE_PAGE_SIZE];
+  file_ptr outfile_size = sizeof(hdr);
+  bfd_vma high_vma = 0;
+  asection *sec;
+
+  /* Find the total size of the program on disk and in memory.  */
+  for (sec = abfd->sections; sec != (asection *) NULL; sec = sec->next)
+    {
+      if (sec->size == 0)
+        continue;
+      if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)
+        {
+	  bfd_vma sec_vma = bfd_get_section_vma (abfd, sec) + sec->size;
+	  if (sec_vma > high_vma)
+	    high_vma = sec_vma;
+	}
+      if (bfd_get_section_flags (abfd, sec) & SEC_LOAD)
+        {
+	  file_ptr sec_end = (sizeof (hdr)
+			      + bfd_get_section_vma (abfd, sec)
+			      + sec->size);
+	  if (sec_end > outfile_size)
+	    outfile_size = sec_end;
+	}
+    }
+
+  /* Make sure the program isn't too big.  */
+  if (high_vma > (bfd_vma)0xffff)
+    {
+      bfd_set_error(bfd_error_file_too_big);
+      return FALSE;
+    }
+
+  /* Constants.  */
+  H_PUT_16 (abfd, EXE_MAGIC, &hdr[0]);
+  H_PUT_16 (abfd, EXE_PAGE_SIZE / 16, &hdr[8]);
+  H_PUT_16 (abfd, EXE_LOAD_LOW, &hdr[12]);
+  H_PUT_16 (abfd, 0x3e, &hdr[24]);
+  H_PUT_16 (abfd, 0x0001, &hdr[28]); /* XXX??? */
+  H_PUT_16 (abfd, 0x30fb, &hdr[30]); /* XXX??? */
+  H_PUT_16 (abfd, 0x726a, &hdr[32]); /* XXX??? */
+
+  /* Bytes in last page (0 = full page).  */
+  H_PUT_16 (abfd, outfile_size & (EXE_PAGE_SIZE - 1), &hdr[2]);
+
+  /* Number of pages.  */
+  H_PUT_16 (abfd, (outfile_size + EXE_PAGE_SIZE - 1) / EXE_PAGE_SIZE, &hdr[4]);
+
+  /* Set the initial stack pointer to the end of the bss.
+     The program's crt0 code must relocate it to a real stack.  */
+  H_PUT_16 (abfd, high_vma, &hdr[16]);
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
+      || bfd_bwrite (hdr, (bfd_size_type) sizeof(hdr), abfd) != sizeof(hdr))
+    return FALSE;
+
+  return TRUE;
+}
+
+static bfd_boolean
+msdos_set_section_contents (bfd *abfd,
+			    sec_ptr section,
+			    const void *location,
+			    file_ptr offset,
+			    bfd_size_type count)
+{
+
+  if (count == 0)
+    return TRUE;
+
+  section->filepos = EXE_PAGE_SIZE + bfd_get_section_vma (abfd, section);
+
+  if (bfd_get_section_flags (abfd, section) & SEC_LOAD)
+    {
+      if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0
+          || bfd_bwrite (location, count, abfd) != count)
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+
+
+#define msdos_mkobject aout_32_mkobject
+#define msdos_make_empty_symbol aout_32_make_empty_symbol
+#define msdos_bfd_reloc_type_lookup aout_32_reloc_type_lookup
+#define msdos_bfd_reloc_name_lookup aout_32_reloc_name_lookup
+
+#define	msdos_close_and_cleanup _bfd_generic_close_and_cleanup
+#define msdos_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
+#define msdos_new_section_hook _bfd_generic_new_section_hook
+#define msdos_get_section_contents _bfd_generic_get_section_contents
+#define msdos_get_section_contents_in_window \
+  _bfd_generic_get_section_contents_in_window
+#define msdos_bfd_get_relocated_section_contents \
+  bfd_generic_get_relocated_section_contents
+#define msdos_bfd_relax_section bfd_generic_relax_section
+#define msdos_bfd_gc_sections bfd_generic_gc_sections
+#define msdos_bfd_lookup_section_flags bfd_generic_lookup_section_flags
+#define msdos_bfd_merge_sections bfd_generic_merge_sections
+#define msdos_bfd_is_group_section bfd_generic_is_group_section
+#define msdos_bfd_discard_group bfd_generic_discard_group
+#define msdos_section_already_linked \
+  _bfd_generic_section_already_linked
+#define msdos_bfd_define_common_symbol bfd_generic_define_common_symbol
+#define msdos_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
+#define msdos_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
+#define msdos_bfd_link_add_symbols _bfd_generic_link_add_symbols
+#define msdos_bfd_link_just_syms _bfd_generic_link_just_syms
+#define msdos_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define msdos_bfd_final_link _bfd_generic_final_link
+#define msdos_bfd_link_split_section _bfd_generic_link_split_section
+#define msdos_set_arch_mach _bfd_generic_set_arch_mach
+
+#define msdos_get_symtab_upper_bound _bfd_nosymbols_get_symtab_upper_bound
+#define msdos_canonicalize_symtab _bfd_nosymbols_canonicalize_symtab
+#define msdos_print_symbol _bfd_nosymbols_print_symbol
+#define msdos_get_symbol_info _bfd_nosymbols_get_symbol_info
+#define msdos_find_nearest_line _bfd_nosymbols_find_nearest_line
+#define msdos_find_inliner_info _bfd_nosymbols_find_inliner_info
+#define msdos_get_lineno _bfd_nosymbols_get_lineno
+#define msdos_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define msdos_bfd_is_local_label_name _bfd_nosymbols_bfd_is_local_label_name
+#define msdos_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
+#define msdos_read_minisymbols _bfd_nosymbols_read_minisymbols
+#define msdos_minisymbol_to_symbol _bfd_nosymbols_minisymbol_to_symbol
+
+#define msdos_canonicalize_reloc _bfd_norelocs_canonicalize_reloc
+#define msdos_get_reloc_upper_bound _bfd_norelocs_get_reloc_upper_bound
+#define msdos_32_bfd_link_split_section  _bfd_generic_link_split_section
+
+const bfd_target i386msdos_vec =
+  {
+    "msdos",			/* name */
+    bfd_target_msdos_flavour,
+    BFD_ENDIAN_LITTLE,		/* target byte order */
+    BFD_ENDIAN_LITTLE,		/* target headers byte order */
+    (EXEC_P),			/* object flags */
+    (SEC_CODE | SEC_DATA | SEC_HAS_CONTENTS
+     | SEC_ALLOC | SEC_LOAD),	/* section flags */
+    0,				/* leading underscore */
+    ' ',				/* ar_pad_char */
+    16,				/* ar_max_namelen */
+    0,				/* match priority.  */
+    bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* data */
+    bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* hdrs */
+
+    {
+      _bfd_dummy_target,
+      _bfd_dummy_target,		/* bfd_check_format */
+      _bfd_dummy_target,
+      _bfd_dummy_target,
+    },
+    {
+      bfd_false,
+      msdos_mkobject,
+      _bfd_generic_mkarchive,
+      bfd_false,
+    },
+    {				/* bfd_write_contents */
+      bfd_false,
+      msdos_write_object_contents,
+      _bfd_write_archive_contents,
+      bfd_false,
+    },
+
+    BFD_JUMP_TABLE_GENERIC (msdos),
+    BFD_JUMP_TABLE_COPY (_bfd_generic),
+    BFD_JUMP_TABLE_CORE (_bfd_nocore),
+    BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+    BFD_JUMP_TABLE_SYMBOLS (msdos),
+    BFD_JUMP_TABLE_RELOCS (msdos),
+    BFD_JUMP_TABLE_WRITE (msdos),
+    BFD_JUMP_TABLE_LINK (msdos),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    NULL,
+
+    (PTR) 0
+  };
+
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/i386netbsd.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/i386netbsd.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/i386netbsd.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/i386netbsd.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,39 @@
+/* BFD back-end for NetBSD/386 a.out-ish binaries.
+   Copyright 1990, 1991, 1992, 1994, 1995, 1996, 1998, 2001, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA. */
+
+#define	BYTES_IN_WORD	4
+#undef TARGET_IS_BIG_ENDIAN_P
+
+#define	TARGET_PAGE_SIZE	4096
+#define	SEGMENT_SIZE	TARGET_PAGE_SIZE
+
+#define	DEFAULT_ARCH	bfd_arch_i386
+#define	DEFAULT_MID 	M_386_NETBSD
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (i386netbsd_,OP)
+
+/* This needs to start with a.out so GDB knows it is an a.out variant.  */
+#define TARGETNAME "a.out-i386-netbsd"
+
+#include "netbsd.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/i386os9k.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/i386os9k.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/i386os9k.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/i386os9k.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,225 @@
+/* BFD back-end for os9000 i386 binaries.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002,
+   2004, 2005, 2006, 2007, 2009, 2011 Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "bfdlink.h"
+#include "libaout.h"		/* BFD a.out internal data structures */
+#include "os9k.h"
+
+/* Swaps the information in an executable header taken from a raw byte
+   stream memory image, into the internal exec_header structure.  */
+static bfd_boolean
+os9k_swap_exec_header_in (bfd *abfd,
+			  mh_com *raw_bytes,
+			  struct internal_exec *execp)
+{
+  mh_com *bytes = (mh_com *) raw_bytes;
+  unsigned int dload, dmemsize, dmemstart;
+
+  /* Now fill in fields in the execp, from the bytes in the raw data.  */
+  execp->a_info = H_GET_16 (abfd, bytes->m_sync);
+  execp->a_syms = 0;
+  execp->a_entry = H_GET_32 (abfd, bytes->m_exec);
+  execp->a_talign = 2;
+  execp->a_dalign = 2;
+  execp->a_balign = 2;
+
+  dload = H_GET_32 (abfd, bytes->m_idata);
+  execp->a_data = dload + 8;
+
+  if (bfd_seek (abfd, (file_ptr) dload, SEEK_SET) != 0
+      || (bfd_bread (&dmemstart, (bfd_size_type) sizeof (dmemstart), abfd)
+	  != sizeof (dmemstart))
+      || (bfd_bread (&dmemsize, (bfd_size_type) sizeof (dmemsize), abfd)
+	  != sizeof (dmemsize)))
+    return FALSE;
+
+  execp->a_tload = 0;
+  execp->a_dload = H_GET_32 (abfd, (unsigned char *) &dmemstart);
+  execp->a_text = dload - execp->a_tload;
+  execp->a_data = H_GET_32 (abfd, (unsigned char *) &dmemsize);
+  execp->a_bss = H_GET_32 (abfd, bytes->m_data) - execp->a_data;
+
+  execp->a_trsize = 0;
+  execp->a_drsize = 0;
+
+  return TRUE;
+}
+
+
+/* Finish up the opening of a b.out file for reading.  Fill in all the
+   fields that are not handled by common code.  */
+
+static const bfd_target *
+os9k_callback (bfd *abfd)
+{
+  struct internal_exec *execp = exec_hdr (abfd);
+  unsigned long bss_start;
+
+  /* Architecture and machine type.  */
+  bfd_set_arch_mach (abfd, bfd_arch_i386, 0);
+
+  /* The positions of the string table and symbol table.  */
+  obj_str_filepos (abfd) = 0;
+  obj_sym_filepos (abfd) = 0;
+
+  /* The alignments of the sections.  */
+  obj_textsec (abfd)->alignment_power = execp->a_talign;
+  obj_datasec (abfd)->alignment_power = execp->a_dalign;
+  obj_bsssec (abfd)->alignment_power = execp->a_balign;
+
+  /* The starting addresses of the sections.  */
+  obj_textsec (abfd)->vma = execp->a_tload;
+  obj_datasec (abfd)->vma = execp->a_dload;
+
+  /* And reload the sizes, since the aout module zaps them.  */
+  obj_textsec (abfd)->size = execp->a_text;
+
+  bss_start = execp->a_dload + execp->a_data;	/* BSS = end of data section.  */
+  obj_bsssec (abfd)->vma = align_power (bss_start, execp->a_balign);
+
+  /* The file positions of the sections.  */
+  obj_textsec (abfd)->filepos = execp->a_entry;
+  obj_datasec (abfd)->filepos = execp->a_dload;
+
+  /* The file positions of the relocation info ***
+  obj_textsec (abfd)->rel_filepos = N_TROFF(*execp);
+  obj_datasec (abfd)->rel_filepos =  N_DROFF(*execp);  */
+
+  adata (abfd).page_size = 1;	/* Not applicable.  */
+  adata (abfd).segment_size = 1;/* Not applicable.  */
+  adata (abfd).exec_bytes_size = MHCOM_BYTES_SIZE;
+
+  return abfd->xvec;
+}
+
+static const bfd_target *
+os9k_object_p (bfd *abfd)
+{
+  struct internal_exec anexec;
+  mh_com exec_bytes;
+
+  if (bfd_bread ((PTR) &exec_bytes, (bfd_size_type) MHCOM_BYTES_SIZE, abfd)
+      != MHCOM_BYTES_SIZE)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return 0;
+    }
+
+  anexec.a_info = H_GET_16 (abfd, exec_bytes.m_sync);
+  if (N_BADMAG (anexec))
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return 0;
+    }
+
+  if (! os9k_swap_exec_header_in (abfd, &exec_bytes, &anexec))
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+  return aout_32_some_aout_object_p (abfd, &anexec, os9k_callback);
+}
+
+static int
+os9k_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+		     struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return sizeof (struct internal_exec);
+}
+
+
+
+#define aout_32_close_and_cleanup aout_32_bfd_free_cached_info
+
+#define aout_32_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
+
+#define aout_32_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
+#define aout_32_bfd_reloc_name_lookup _bfd_norelocs_bfd_reloc_name_lookup
+
+#define aout_32_get_section_contents_in_window \
+  _bfd_generic_get_section_contents_in_window
+
+#define os9k_bfd_get_relocated_section_contents \
+  bfd_generic_get_relocated_section_contents
+#define os9k_bfd_relax_section bfd_generic_relax_section
+#define os9k_bfd_gc_sections bfd_generic_gc_sections
+#define os9k_bfd_lookup_section_flags bfd_generic_lookup_section_flags
+#define os9k_bfd_merge_sections bfd_generic_merge_sections
+#define os9k_bfd_is_group_section bfd_generic_is_group_section
+#define os9k_bfd_discard_group bfd_generic_discard_group
+#define os9k_section_already_linked \
+  _bfd_generic_section_already_linked
+#define os9k_bfd_define_common_symbol bfd_generic_define_common_symbol
+#define os9k_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
+#define os9k_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
+#define os9k_bfd_link_add_symbols _bfd_generic_link_add_symbols
+#define os9k_bfd_link_just_syms _bfd_generic_link_just_syms
+#define os9k_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define os9k_bfd_final_link _bfd_generic_final_link
+#define os9k_bfd_link_split_section  _bfd_generic_link_split_section
+
+const bfd_target i386os9k_vec =
+  {
+    "i386os9k",			/* name */
+    bfd_target_os9k_flavour,
+    BFD_ENDIAN_LITTLE,		/* data byte order is little */
+    BFD_ENDIAN_LITTLE,		/* hdr byte order is little */
+    (HAS_RELOC | EXEC_P | WP_TEXT),	/* object flags */
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD),	/* section flags */
+    0,				/* symbol leading char */
+    ' ',				/* ar_pad_char */
+    16,				/* ar_max_namelen */
+    0,				/* match priority.  */
+
+    bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* data */
+    bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* hdrs */
+    {_bfd_dummy_target, os9k_object_p,	/* bfd_check_format */
+     bfd_generic_archive_p, _bfd_dummy_target},
+    {bfd_false, bfd_false,	/* bfd_set_format */
+     _bfd_generic_mkarchive, bfd_false},
+    {bfd_false, bfd_false,	/* bfd_write_contents */
+     _bfd_write_archive_contents, bfd_false},
+
+    BFD_JUMP_TABLE_GENERIC (aout_32),
+    BFD_JUMP_TABLE_COPY (_bfd_generic),
+    BFD_JUMP_TABLE_CORE (_bfd_nocore),
+    BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd),
+    BFD_JUMP_TABLE_SYMBOLS (aout_32),
+    BFD_JUMP_TABLE_RELOCS (aout_32),
+    BFD_JUMP_TABLE_WRITE (aout_32),
+    BFD_JUMP_TABLE_LINK (os9k),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    NULL,
+
+    (PTR) 0,
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ieee.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ieee.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ieee.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ieee.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3872 @@
+/* BFD back-end for ieee-695 objects.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   Written by Steve Chamberlain of Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+#define KEEPMINUSPCININST 0
+
+/* IEEE 695 format is a stream of records, which we parse using a simple one-
+   token (which is one byte in this lexicon) lookahead recursive decent
+   parser.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "ieee.h"
+#include "libieee.h"
+#include "safe-ctype.h"
+
+struct output_buffer_struct
+{
+  unsigned char *ptrp;
+  int buffer;
+};
+
+static unsigned char *output_ptr_start;
+static unsigned char *output_ptr;
+static unsigned char *output_ptr_end;
+static unsigned char *input_ptr_start;
+static unsigned char *input_ptr;
+static unsigned char *input_ptr_end;
+static bfd *input_bfd;
+static bfd *output_bfd;
+static int output_buffer;
+
+
+static void block (void);
+
+/* Functions for writing to ieee files in the strange way that the
+   standard requires.  */
+
+static bfd_boolean
+ieee_write_byte (bfd *abfd, int barg)
+{
+  bfd_byte byte;
+
+  byte = barg;
+  if (bfd_bwrite ((void *) &byte, (bfd_size_type) 1, abfd) != 1)
+    return FALSE;
+  return TRUE;
+}
+
+static bfd_boolean
+ieee_write_2bytes (bfd *abfd, int bytes)
+{
+  bfd_byte buffer[2];
+
+  buffer[0] = bytes >> 8;
+  buffer[1] = bytes & 0xff;
+  if (bfd_bwrite ((void *) buffer, (bfd_size_type) 2, abfd) != 2)
+    return FALSE;
+  return TRUE;
+}
+
+static bfd_boolean
+ieee_write_int (bfd *abfd, bfd_vma value)
+{
+  if (value <= 127)
+    {
+      if (! ieee_write_byte (abfd, (bfd_byte) value))
+	return FALSE;
+    }
+  else
+    {
+      unsigned int length;
+
+      /* How many significant bytes ?  */
+      /* FIXME FOR LONGER INTS.  */
+      if (value & 0xff000000)
+	length = 4;
+      else if (value & 0x00ff0000)
+	length = 3;
+      else if (value & 0x0000ff00)
+	length = 2;
+      else
+	length = 1;
+
+      if (! ieee_write_byte (abfd,
+			     (bfd_byte) ((int) ieee_number_repeat_start_enum
+					 + length)))
+	return FALSE;
+      switch (length)
+	{
+	case 4:
+	  if (! ieee_write_byte (abfd, (bfd_byte) (value >> 24)))
+	    return FALSE;
+	  /* Fall through.  */
+	case 3:
+	  if (! ieee_write_byte (abfd, (bfd_byte) (value >> 16)))
+	    return FALSE;
+	  /* Fall through.  */
+	case 2:
+	  if (! ieee_write_byte (abfd, (bfd_byte) (value >> 8)))
+	    return FALSE;
+	  /* Fall through.  */
+	case 1:
+	  if (! ieee_write_byte (abfd, (bfd_byte) (value)))
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+ieee_write_id (bfd *abfd, const char *id)
+{
+  size_t length = strlen (id);
+
+  if (length <= 127)
+    {
+      if (! ieee_write_byte (abfd, (bfd_byte) length))
+	return FALSE;
+    }
+  else if (length < 255)
+    {
+      if (! ieee_write_byte (abfd, ieee_extension_length_1_enum)
+	  || ! ieee_write_byte (abfd, (bfd_byte) length))
+	return FALSE;
+    }
+  else if (length < 65535)
+    {
+      if (! ieee_write_byte (abfd, ieee_extension_length_2_enum)
+	  || ! ieee_write_2bytes (abfd, (int) length))
+	return FALSE;
+    }
+  else
+    {
+      (*_bfd_error_handler)
+	(_("%s: string too long (%d chars, max 65535)"),
+	 bfd_get_filename (abfd), length);
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  if (bfd_bwrite ((void *) id, (bfd_size_type) length, abfd) != length)
+    return FALSE;
+  return TRUE;
+}
+
+/* Functions for reading from ieee files in the strange way that the
+   standard requires.  */
+
+#define this_byte(ieee)           *((ieee)->input_p)
+#define next_byte(ieee)            ((ieee)->input_p++)
+#define this_byte_and_next(ieee) (*((ieee)->input_p++))
+
+static unsigned short
+read_2bytes (common_header_type *ieee)
+{
+  unsigned char c1 = this_byte_and_next (ieee);
+  unsigned char c2 = this_byte_and_next (ieee);
+
+  return (c1 << 8) | c2;
+}
+
+static void
+bfd_get_string (common_header_type *ieee, char *string, size_t length)
+{
+  size_t i;
+
+  for (i = 0; i < length; i++)
+    string[i] = this_byte_and_next (ieee);
+}
+
+static char *
+read_id (common_header_type *ieee)
+{
+  size_t length;
+  char *string;
+
+  length = this_byte_and_next (ieee);
+  if (length <= 0x7f)
+    /* Simple string of length 0 to 127.  */
+    ;
+
+  else if (length == 0xde)
+    /* Length is next byte, allowing 0..255.  */
+    length = this_byte_and_next (ieee);
+
+  else if (length == 0xdf)
+    {
+      /* Length is next two bytes, allowing 0..65535.  */
+      length = this_byte_and_next (ieee);
+      length = (length * 256) + this_byte_and_next (ieee);
+    }
+
+  /* Buy memory and read string.  */
+  string = bfd_alloc (ieee->abfd, (bfd_size_type) length + 1);
+  if (!string)
+    return NULL;
+  bfd_get_string (ieee, string, length);
+  string[length] = 0;
+  return string;
+}
+
+static bfd_boolean
+ieee_write_expression (bfd *abfd,
+		       bfd_vma value,
+		       asymbol *symbol,
+		       bfd_boolean pcrel,
+		       unsigned int sindex)
+{
+  unsigned int term_count = 0;
+
+  if (value != 0)
+    {
+      if (! ieee_write_int (abfd, value))
+	return FALSE;
+      term_count++;
+    }
+
+  /* Badly formatted binaries can have a missing symbol,
+     so test here to prevent a seg fault.  */
+  if (symbol != NULL)
+    {
+      if (bfd_is_com_section (symbol->section)
+	  || bfd_is_und_section (symbol->section))
+	{
+	  /* Def of a common symbol.  */
+	  if (! ieee_write_byte (abfd, ieee_variable_X_enum)
+	      || ! ieee_write_int (abfd, symbol->value))
+	    return FALSE;
+	  term_count ++;
+	}
+      else if (! bfd_is_abs_section (symbol->section))
+	{
+	  /* Ref to defined symbol -  */
+	  if (symbol->flags & BSF_GLOBAL)
+	    {
+	      if (! ieee_write_byte (abfd, ieee_variable_I_enum)
+		  || ! ieee_write_int (abfd, symbol->value))
+		return FALSE;
+	      term_count++;
+	    }
+	  else if (symbol->flags & (BSF_LOCAL | BSF_SECTION_SYM))
+	    {
+	      /* This is a reference to a defined local symbol.  We can
+		 easily do a local as a section+offset.  */
+	      if (! ieee_write_byte (abfd, ieee_variable_R_enum)
+		  || ! ieee_write_byte (abfd,
+					(bfd_byte) (symbol->section->index
+						    + IEEE_SECTION_NUMBER_BASE)))
+		return FALSE;
+
+	      term_count++;
+	      if (symbol->value != 0)
+		{
+		  if (! ieee_write_int (abfd, symbol->value))
+		    return FALSE;
+		  term_count++;
+		}
+	    }
+	  else
+	    {
+	      (*_bfd_error_handler)
+		(_("%s: unrecognized symbol `%s' flags 0x%x"),
+		 bfd_get_filename (abfd), bfd_asymbol_name (symbol),
+		 symbol->flags);
+	      bfd_set_error (bfd_error_invalid_operation);
+	      return FALSE;
+	    }
+	}
+    }
+
+  if (pcrel)
+    {
+      /* Subtract the pc from here by asking for PC of this section.  */
+      if (! ieee_write_byte (abfd, ieee_variable_P_enum)
+	  || ! ieee_write_byte (abfd,
+				(bfd_byte) (sindex + IEEE_SECTION_NUMBER_BASE))
+	  || ! ieee_write_byte (abfd, ieee_function_minus_enum))
+	return FALSE;
+    }
+
+  /* Handle the degenerate case of a 0 address.  */
+  if (term_count == 0)
+    if (! ieee_write_int (abfd, (bfd_vma) 0))
+      return FALSE;
+
+  while (term_count > 1)
+    {
+      if (! ieee_write_byte (abfd, ieee_function_plus_enum))
+	return FALSE;
+      term_count--;
+    }
+
+  return TRUE;
+}
+
+/* Writes any integer into the buffer supplied and always takes 5 bytes.  */
+
+static void
+ieee_write_int5 (bfd_byte *buffer, bfd_vma value)
+{
+  buffer[0] = (bfd_byte) ieee_number_repeat_4_enum;
+  buffer[1] = (value >> 24) & 0xff;
+  buffer[2] = (value >> 16) & 0xff;
+  buffer[3] = (value >> 8) & 0xff;
+  buffer[4] = (value >> 0) & 0xff;
+}
+
+static bfd_boolean
+ieee_write_int5_out (bfd *abfd, bfd_vma value)
+{
+  bfd_byte b[5];
+
+  ieee_write_int5 (b, value);
+  if (bfd_bwrite ((void *) b, (bfd_size_type) 5, abfd) != 5)
+    return FALSE;
+  return TRUE;
+}
+
+static bfd_boolean
+parse_int (common_header_type *ieee, bfd_vma *value_ptr)
+{
+  int value = this_byte (ieee);
+  int result;
+
+  if (value >= 0 && value <= 127)
+    {
+      *value_ptr = value;
+      next_byte (ieee);
+      return TRUE;
+    }
+  else if (value >= 0x80 && value <= 0x88)
+    {
+      unsigned int count = value & 0xf;
+
+      result = 0;
+      next_byte (ieee);
+      while (count)
+	{
+	  result = (result << 8) | this_byte_and_next (ieee);
+	  count--;
+	}
+      *value_ptr = result;
+      return TRUE;
+    }
+  return FALSE;
+}
+
+static int
+parse_i (common_header_type *ieee, bfd_boolean *ok)
+{
+  bfd_vma x = 0;
+  *ok = parse_int (ieee, &x);
+  return x;
+}
+
+static bfd_vma
+must_parse_int (common_header_type *ieee)
+{
+  bfd_vma result = 0;
+  BFD_ASSERT (parse_int (ieee, &result));
+  return result;
+}
+
+typedef struct
+{
+  bfd_vma value;
+  asection *section;
+  ieee_symbol_index_type symbol;
+} ieee_value_type;
+
+
+#if KEEPMINUSPCININST
+
+#define SRC_MASK(arg) arg
+#define PCREL_OFFSET FALSE
+
+#else
+
+#define SRC_MASK(arg) 0
+#define PCREL_OFFSET TRUE
+
+#endif
+
+static reloc_howto_type abs32_howto =
+  HOWTO (1,
+	 0,
+	 2,
+	 32,
+	 FALSE,
+	 0,
+	 complain_overflow_bitfield,
+	 0,
+	 "abs32",
+	 TRUE,
+	 0xffffffff,
+	 0xffffffff,
+	 FALSE);
+
+static reloc_howto_type abs16_howto =
+  HOWTO (1,
+	 0,
+	 1,
+	 16,
+	 FALSE,
+	 0,
+	 complain_overflow_bitfield,
+	 0,
+	 "abs16",
+	 TRUE,
+	 0x0000ffff,
+	 0x0000ffff,
+	 FALSE);
+
+static reloc_howto_type abs8_howto =
+  HOWTO (1,
+	 0,
+	 0,
+	 8,
+	 FALSE,
+	 0,
+	 complain_overflow_bitfield,
+	 0,
+	 "abs8",
+	 TRUE,
+	 0x000000ff,
+	 0x000000ff,
+	 FALSE);
+
+static reloc_howto_type rel32_howto =
+  HOWTO (1,
+	 0,
+	 2,
+	 32,
+	 TRUE,
+	 0,
+	 complain_overflow_signed,
+	 0,
+	 "rel32",
+	 TRUE,
+	 SRC_MASK (0xffffffff),
+	 0xffffffff,
+	 PCREL_OFFSET);
+
+static reloc_howto_type rel16_howto =
+  HOWTO (1,
+	 0,
+	 1,
+	 16,
+	 TRUE,
+	 0,
+	 complain_overflow_signed,
+	 0,
+	 "rel16",
+	 TRUE,
+	 SRC_MASK (0x0000ffff),
+	 0x0000ffff,
+	 PCREL_OFFSET);
+
+static reloc_howto_type rel8_howto =
+  HOWTO (1,
+	 0,
+	 0,
+	 8,
+	 TRUE,
+	 0,
+	 complain_overflow_signed,
+	 0,
+	 "rel8",
+	 TRUE,
+	 SRC_MASK (0x000000ff),
+	 0x000000ff,
+	 PCREL_OFFSET);
+
+static ieee_symbol_index_type NOSYMBOL = {0, 0};
+
+static void
+parse_expression (ieee_data_type *ieee,
+		  bfd_vma *value,
+		  ieee_symbol_index_type *symbol,
+		  bfd_boolean *pcrel,
+		  unsigned int *extra,
+		  asection **section)
+
+{
+  bfd_boolean loop = TRUE;
+  ieee_value_type stack[10];
+  ieee_value_type *sp = stack;
+  asection *dummy;
+
+#define POS sp[1]
+#define TOS sp[0]
+#define NOS sp[-1]
+#define INC sp++;
+#define DEC sp--;
+
+  /* The stack pointer always points to the next unused location.  */
+#define PUSH(x,y,z) TOS.symbol = x; TOS.section = y; TOS.value = z; INC;
+#define POP(x,y,z)  DEC; x = TOS.symbol; y = TOS.section; z = TOS.value;
+
+  while (loop && ieee->h.input_p < ieee->h.last_byte)
+    {
+      switch (this_byte (&(ieee->h)))
+	{
+	case ieee_variable_P_enum:
+	  /* P variable, current program counter for section n.  */
+	  {
+	    int section_n;
+
+	    next_byte (&(ieee->h));
+	    *pcrel = TRUE;
+	    section_n = must_parse_int (&(ieee->h));
+	    (void) section_n;
+	    PUSH (NOSYMBOL, bfd_abs_section_ptr, 0);
+	    break;
+	  }
+	case ieee_variable_L_enum:
+	  /* L variable  address of section N.  */
+	  next_byte (&(ieee->h));
+	  PUSH (NOSYMBOL, ieee->section_table[must_parse_int (&(ieee->h))], 0);
+	  break;
+	case ieee_variable_R_enum:
+	  /* R variable, logical address of section module.  */
+	  /* FIXME, this should be different to L.  */
+	  next_byte (&(ieee->h));
+	  PUSH (NOSYMBOL, ieee->section_table[must_parse_int (&(ieee->h))], 0);
+	  break;
+	case ieee_variable_S_enum:
+	  /* S variable, size in MAUS of section module.  */
+	  next_byte (&(ieee->h));
+	  PUSH (NOSYMBOL,
+		0,
+		ieee->section_table[must_parse_int (&(ieee->h))]->size);
+	  break;
+	case ieee_variable_I_enum:
+	  /* Push the address of variable n.  */
+	  {
+	    ieee_symbol_index_type sy;
+
+	    next_byte (&(ieee->h));
+	    sy.index = (int) must_parse_int (&(ieee->h));
+	    sy.letter = 'I';
+
+	    PUSH (sy, bfd_abs_section_ptr, 0);
+	  }
+	  break;
+	case ieee_variable_X_enum:
+	  /* Push the address of external variable n.  */
+	  {
+	    ieee_symbol_index_type sy;
+
+	    next_byte (&(ieee->h));
+	    sy.index = (int) (must_parse_int (&(ieee->h)));
+	    sy.letter = 'X';
+
+	    PUSH (sy, bfd_und_section_ptr, 0);
+	  }
+	  break;
+	case ieee_function_minus_enum:
+	  {
+	    bfd_vma value1, value2;
+	    asection *section1, *section_dummy;
+	    ieee_symbol_index_type sy;
+
+	    next_byte (&(ieee->h));
+
+	    POP (sy, section1, value1);
+	    POP (sy, section_dummy, value2);
+	    PUSH (sy, section1 ? section1 : section_dummy, value2 - value1);
+	  }
+	  break;
+	case ieee_function_plus_enum:
+	  {
+	    bfd_vma value1, value2;
+	    asection *section1;
+	    asection *section2;
+	    ieee_symbol_index_type sy1;
+	    ieee_symbol_index_type sy2;
+
+	    next_byte (&(ieee->h));
+
+	    POP (sy1, section1, value1);
+	    POP (sy2, section2, value2);
+	    PUSH (sy1.letter ? sy1 : sy2,
+		  bfd_is_abs_section (section1) ? section2 : section1,
+		  value1 + value2);
+	  }
+	  break;
+	default:
+	  {
+	    bfd_vma va;
+
+	    BFD_ASSERT (this_byte (&(ieee->h)) < (int) ieee_variable_A_enum
+		    || this_byte (&(ieee->h)) > (int) ieee_variable_Z_enum);
+	    if (parse_int (&(ieee->h), &va))
+	      {
+		PUSH (NOSYMBOL, bfd_abs_section_ptr, va);
+	      }
+	    else
+	      /* Thats all that we can understand.  */
+	      loop = FALSE;
+	  }
+	}
+    }
+
+  /* As far as I can see there is a bug in the Microtec IEEE output
+     which I'm using to scan, whereby the comma operator is omitted
+     sometimes in an expression, giving expressions with too many
+     terms.  We can tell if that's the case by ensuring that
+     sp == stack here.  If not, then we've pushed something too far,
+     so we keep adding.  */
+  while (sp != stack + 1)
+    {
+      asection *section1;
+      ieee_symbol_index_type sy1;
+
+      POP (sy1, section1, *extra);
+      (void) section1;
+      (void) sy1;
+    }
+
+  POP (*symbol, dummy, *value);
+  if (section)
+    *section = dummy;
+}
+
+
+#define ieee_seek(ieee, offset) \
+  do								\
+    {								\
+      ieee->h.input_p = ieee->h.first_byte + offset;		\
+      ieee->h.last_byte = (ieee->h.first_byte			\
+			   + ieee_part_after (ieee, offset));	\
+    }								\
+  while (0)
+
+#define ieee_pos(ieee) \
+  (ieee->h.input_p - ieee->h.first_byte)
+
+/* Find the first part of the ieee file after HERE.  */
+
+static file_ptr
+ieee_part_after (ieee_data_type *ieee, file_ptr here)
+{
+  int part;
+  file_ptr after = ieee->w.r.me_record;
+
+  /* File parts can come in any order, except that module end is
+     guaranteed to be last (and the header first).  */
+  for (part = 0; part < N_W_VARIABLES; part++)
+    if (ieee->w.offset[part] > here && after > ieee->w.offset[part])
+      after = ieee->w.offset[part];
+
+  return after;
+}
+
+static unsigned int last_index;
+static char last_type;		/* Is the index for an X or a D.  */
+
+static ieee_symbol_type *
+get_symbol (bfd *abfd ATTRIBUTE_UNUSED,
+	    ieee_data_type *ieee,
+	    ieee_symbol_type *last_symbol,
+	    unsigned int *symbol_count,
+	    ieee_symbol_type ***pptr,
+	    unsigned int *max_index,
+	    int this_type)
+{
+  /* Need a new symbol.  */
+  unsigned int new_index = must_parse_int (&(ieee->h));
+
+  if (new_index != last_index || this_type != last_type)
+    {
+      ieee_symbol_type *new_symbol;
+      bfd_size_type amt = sizeof (ieee_symbol_type);
+
+      new_symbol = bfd_alloc (ieee->h.abfd, amt);
+      if (!new_symbol)
+	return NULL;
+
+      new_symbol->index = new_index;
+      last_index = new_index;
+      (*symbol_count)++;
+      **pptr = new_symbol;
+      *pptr = &new_symbol->next;
+      if (new_index > *max_index)
+	*max_index = new_index;
+
+      last_type = this_type;
+      new_symbol->symbol.section = bfd_abs_section_ptr;
+      return new_symbol;
+    }
+  return last_symbol;
+}
+
+static bfd_boolean
+ieee_slurp_external_symbols (bfd *abfd)
+{
+  ieee_data_type *ieee = IEEE_DATA (abfd);
+  file_ptr offset = ieee->w.r.external_part;
+
+  ieee_symbol_type **prev_symbols_ptr = &ieee->external_symbols;
+  ieee_symbol_type **prev_reference_ptr = &ieee->external_reference;
+  ieee_symbol_type *symbol = NULL;
+  unsigned int symbol_count = 0;
+  bfd_boolean loop = TRUE;
+
+  last_index = 0xffffff;
+  ieee->symbol_table_full = TRUE;
+
+  ieee_seek (ieee, offset);
+
+  while (loop)
+    {
+      switch (this_byte (&(ieee->h)))
+	{
+	case ieee_nn_record:
+	  next_byte (&(ieee->h));
+
+	  symbol = get_symbol (abfd, ieee, symbol, &symbol_count,
+			       & prev_symbols_ptr,
+			       & ieee->external_symbol_max_index, 'I');
+	  if (symbol == NULL)
+	    return FALSE;
+
+	  symbol->symbol.the_bfd = abfd;
+	  symbol->symbol.name = read_id (&(ieee->h));
+	  symbol->symbol.udata.p = NULL;
+	  symbol->symbol.flags = BSF_NO_FLAGS;
+	  break;
+	case ieee_external_symbol_enum:
+	  next_byte (&(ieee->h));
+
+	  symbol = get_symbol (abfd, ieee, symbol, &symbol_count,
+			       &prev_symbols_ptr,
+			       &ieee->external_symbol_max_index, 'D');
+	  if (symbol == NULL)
+	    return FALSE;
+
+	  BFD_ASSERT (symbol->index >= ieee->external_symbol_min_index);
+
+	  symbol->symbol.the_bfd = abfd;
+	  symbol->symbol.name = read_id (&(ieee->h));
+	  symbol->symbol.udata.p = NULL;
+	  symbol->symbol.flags = BSF_NO_FLAGS;
+	  break;
+	case ieee_attribute_record_enum >> 8:
+	  {
+	    unsigned int symbol_name_index;
+	    unsigned int symbol_type_index;
+	    unsigned int symbol_attribute_def;
+	    bfd_vma value = 0;
+
+	    switch (read_2bytes (&ieee->h))
+	      {
+	      case ieee_attribute_record_enum:
+		symbol_name_index = must_parse_int (&(ieee->h));
+		symbol_type_index = must_parse_int (&(ieee->h));
+		(void) symbol_type_index;
+		symbol_attribute_def = must_parse_int (&(ieee->h));
+		switch (symbol_attribute_def)
+		  {
+		  case 8:
+		  case 19:
+		    parse_int (&ieee->h, &value);
+		    break;
+		  default:
+		    (*_bfd_error_handler)
+		      (_("%B: unimplemented ATI record %u for symbol %u"),
+		       abfd, symbol_attribute_def, symbol_name_index);
+		    bfd_set_error (bfd_error_bad_value);
+		    return FALSE;
+		    break;
+		  }
+		break;
+	      case ieee_external_reference_info_record_enum:
+		/* Skip over ATX record.  */
+		parse_int (&(ieee->h), &value);
+		parse_int (&(ieee->h), &value);
+		parse_int (&(ieee->h), &value);
+		parse_int (&(ieee->h), &value);
+		break;
+	      case ieee_atn_record_enum:
+		/* We may get call optimization information here,
+		   which we just ignore.  The format is
+		   {$F1}${CE}{index}{$00}{$3F}{$3F}{#_of_ASNs}.  */
+		parse_int (&ieee->h, &value);
+		parse_int (&ieee->h, &value);
+		parse_int (&ieee->h, &value);
+		if (value != 0x3f)
+		  {
+		    (*_bfd_error_handler)
+		      (_("%B: unexpected ATN type %d in external part"),
+			 abfd, (int) value);
+		    bfd_set_error (bfd_error_bad_value);
+		    return FALSE;
+		  }
+		parse_int (&ieee->h, &value);
+		parse_int (&ieee->h, &value);
+		while (value > 0)
+		  {
+		    bfd_vma val1;
+
+		    --value;
+
+		    switch (read_2bytes (&ieee->h))
+		      {
+		      case ieee_asn_record_enum:
+			parse_int (&ieee->h, &val1);
+			parse_int (&ieee->h, &val1);
+			break;
+
+		      default:
+			(*_bfd_error_handler)
+			  (_("%B: unexpected type after ATN"), abfd);
+			bfd_set_error (bfd_error_bad_value);
+			return FALSE;
+		      }
+		  }
+	      }
+	  }
+	  break;
+	case ieee_value_record_enum >> 8:
+	  {
+	    unsigned int symbol_name_index;
+	    ieee_symbol_index_type symbol_ignore;
+	    bfd_boolean pcrel_ignore;
+	    unsigned int extra;
+
+	    next_byte (&(ieee->h));
+	    next_byte (&(ieee->h));
+
+	    symbol_name_index = must_parse_int (&(ieee->h));
+	    (void) symbol_name_index;
+	    parse_expression (ieee,
+			      &symbol->symbol.value,
+			      &symbol_ignore,
+			      &pcrel_ignore,
+			      &extra,
+			      &symbol->symbol.section);
+
+	    /* Fully linked IEEE-695 files tend to give every symbol
+               an absolute value.  Try to convert that back into a
+               section relative value.  FIXME: This won't always to
+               the right thing.  */
+	    if (bfd_is_abs_section (symbol->symbol.section)
+		&& (abfd->flags & HAS_RELOC) == 0)
+	      {
+		bfd_vma val;
+		asection *s;
+
+		val = symbol->symbol.value;
+		for (s = abfd->sections; s != NULL; s = s->next)
+		  {
+		    if (val >= s->vma && val < s->vma + s->size)
+		      {
+			symbol->symbol.section = s;
+			symbol->symbol.value -= s->vma;
+			break;
+		      }
+		  }
+	      }
+
+	    symbol->symbol.flags = BSF_GLOBAL | BSF_EXPORT;
+
+	  }
+	  break;
+	case ieee_weak_external_reference_enum:
+	  {
+	    bfd_vma size;
+	    bfd_vma value;
+
+	    next_byte (&(ieee->h));
+	    /* Throw away the external reference index.  */
+	    (void) must_parse_int (&(ieee->h));
+	    /* Fetch the default size if not resolved.  */
+	    size = must_parse_int (&(ieee->h));
+	    /* Fetch the default value if available.  */
+	    if (! parse_int (&(ieee->h), &value))
+	      value = 0;
+	    /* This turns into a common.  */
+	    symbol->symbol.section = bfd_com_section_ptr;
+	    symbol->symbol.value = size;
+	  }
+	  break;
+
+	case ieee_external_reference_enum:
+	  next_byte (&(ieee->h));
+
+	  symbol = get_symbol (abfd, ieee, symbol, &symbol_count,
+			       &prev_reference_ptr,
+			       &ieee->external_reference_max_index, 'X');
+	  if (symbol == NULL)
+	    return FALSE;
+
+	  symbol->symbol.the_bfd = abfd;
+	  symbol->symbol.name = read_id (&(ieee->h));
+	  symbol->symbol.udata.p = NULL;
+	  symbol->symbol.section = bfd_und_section_ptr;
+	  symbol->symbol.value = (bfd_vma) 0;
+	  symbol->symbol.flags = 0;
+
+	  BFD_ASSERT (symbol->index >= ieee->external_reference_min_index);
+	  break;
+
+	default:
+	  loop = FALSE;
+	}
+    }
+
+  if (ieee->external_symbol_max_index != 0)
+    {
+      ieee->external_symbol_count =
+	ieee->external_symbol_max_index -
+	ieee->external_symbol_min_index + 1;
+    }
+  else
+    ieee->external_symbol_count = 0;
+
+  if (ieee->external_reference_max_index != 0)
+    {
+      ieee->external_reference_count =
+	ieee->external_reference_max_index -
+	ieee->external_reference_min_index + 1;
+    }
+  else
+    ieee->external_reference_count = 0;
+
+  abfd->symcount =
+    ieee->external_reference_count + ieee->external_symbol_count;
+
+  if (symbol_count != abfd->symcount)
+    /* There are gaps in the table -- */
+    ieee->symbol_table_full = FALSE;
+
+  *prev_symbols_ptr   = NULL;
+  *prev_reference_ptr = NULL;
+
+  return TRUE;
+}
+
+static bfd_boolean
+ieee_slurp_symbol_table (bfd *abfd)
+{
+  if (! IEEE_DATA (abfd)->read_symbols)
+    {
+      if (! ieee_slurp_external_symbols (abfd))
+	return FALSE;
+      IEEE_DATA (abfd)->read_symbols = TRUE;
+    }
+  return TRUE;
+}
+
+static long
+ieee_get_symtab_upper_bound (bfd *abfd)
+{
+  if (! ieee_slurp_symbol_table (abfd))
+    return -1;
+
+  return (abfd->symcount != 0) ?
+    (abfd->symcount + 1) * (sizeof (ieee_symbol_type *)) : 0;
+}
+
+/* Move from our internal lists to the canon table, and insert in
+   symbol index order.  */
+
+extern const bfd_target ieee_vec;
+
+static long
+ieee_canonicalize_symtab (bfd *abfd, asymbol **location)
+{
+  ieee_symbol_type *symp;
+  static bfd dummy_bfd;
+  static asymbol empty_symbol =
+  {
+    &dummy_bfd,
+    " ieee empty",
+    (symvalue) 0,
+    BSF_DEBUGGING,
+    bfd_abs_section_ptr
+#ifdef __STDC__
+    /* K&R compilers can't initialise unions.  */
+    , { 0 }
+#endif
+  };
+
+  if (abfd->symcount)
+    {
+      ieee_data_type *ieee = IEEE_DATA (abfd);
+
+      dummy_bfd.xvec = &ieee_vec;
+      if (! ieee_slurp_symbol_table (abfd))
+	return -1;
+
+      if (! ieee->symbol_table_full)
+	{
+	  /* Arrgh - there are gaps in the table, run through and fill them
+	     up with pointers to a null place.  */
+	  unsigned int i;
+
+	  for (i = 0; i < abfd->symcount; i++)
+	    location[i] = &empty_symbol;
+	}
+
+      ieee->external_symbol_base_offset = -ieee->external_symbol_min_index;
+      for (symp = IEEE_DATA (abfd)->external_symbols;
+	   symp != (ieee_symbol_type *) NULL;
+	   symp = symp->next)
+	/* Place into table at correct index locations.  */
+	location[symp->index + ieee->external_symbol_base_offset] = &symp->symbol;
+
+      /* The external refs are indexed in a bit.  */
+      ieee->external_reference_base_offset =
+	-ieee->external_reference_min_index + ieee->external_symbol_count;
+
+      for (symp = IEEE_DATA (abfd)->external_reference;
+	   symp != (ieee_symbol_type *) NULL;
+	   symp = symp->next)
+	location[symp->index + ieee->external_reference_base_offset] =
+	  &symp->symbol;
+    }
+
+  if (abfd->symcount)
+    location[abfd->symcount] = (asymbol *) NULL;
+
+  return abfd->symcount;
+}
+
+static asection *
+get_section_entry (bfd *abfd, ieee_data_type *ieee, unsigned int sindex)
+{
+  if (sindex >= ieee->section_table_size)
+    {
+      unsigned int c, i;
+      asection **n;
+      bfd_size_type amt;
+
+      c = ieee->section_table_size;
+      if (c == 0)
+	c = 20;
+      while (c <= sindex)
+	c *= 2;
+
+      amt = c;
+      amt *= sizeof (asection *);
+      n = bfd_realloc (ieee->section_table, amt);
+      if (n == NULL)
+	return NULL;
+
+      for (i = ieee->section_table_size; i < c; i++)
+	n[i] = NULL;
+
+      ieee->section_table = n;
+      ieee->section_table_size = c;
+    }
+
+  if (ieee->section_table[sindex] == (asection *) NULL)
+    {
+      char *tmp = bfd_alloc (abfd, (bfd_size_type) 11);
+      asection *section;
+
+      if (!tmp)
+	return NULL;
+      sprintf (tmp, " fsec%4d", sindex);
+      section = bfd_make_section (abfd, tmp);
+      ieee->section_table[sindex] = section;
+      section->target_index = sindex;
+      ieee->section_table[sindex] = section;
+    }
+  return ieee->section_table[sindex];
+}
+
+static void
+ieee_slurp_sections (bfd *abfd)
+{
+  ieee_data_type *ieee = IEEE_DATA (abfd);
+  file_ptr offset = ieee->w.r.section_part;
+  char *name;
+
+  if (offset != 0)
+    {
+      bfd_byte section_type[3];
+
+      ieee_seek (ieee, offset);
+      while (TRUE)
+	{
+	  switch (this_byte (&(ieee->h)))
+	    {
+	    case ieee_section_type_enum:
+	      {
+		asection *section;
+		unsigned int section_index;
+
+		next_byte (&(ieee->h));
+		section_index = must_parse_int (&(ieee->h));
+
+		section = get_section_entry (abfd, ieee, section_index);
+
+		section_type[0] = this_byte_and_next (&(ieee->h));
+
+		/* Set minimal section attributes. Attributes are
+		   extended later, based on section contents.  */
+		switch (section_type[0])
+		  {
+		  case 0xC1:
+		    /* Normal attributes for absolute sections.  */
+		    section_type[1] = this_byte (&(ieee->h));
+		    section->flags = SEC_ALLOC;
+		    switch (section_type[1])
+		      {
+			/* AS Absolute section attributes.  */
+		      case 0xD3:
+			next_byte (&(ieee->h));
+			section_type[2] = this_byte (&(ieee->h));
+			switch (section_type[2])
+			  {
+			  case 0xD0:
+			    /* Normal code.  */
+			    next_byte (&(ieee->h));
+			    section->flags |= SEC_CODE;
+			    break;
+			  case 0xC4:
+			    /* Normal data.  */
+			    next_byte (&(ieee->h));
+			    section->flags |= SEC_DATA;
+			    break;
+			  case 0xD2:
+			    next_byte (&(ieee->h));
+			    /* Normal rom data.  */
+			    section->flags |= SEC_ROM | SEC_DATA;
+			    break;
+			  default:
+			    break;
+			  }
+		      }
+		    break;
+
+		    /* Named relocatable sections (type C).  */
+		  case 0xC3:
+		    section_type[1] = this_byte (&(ieee->h));
+		    section->flags = SEC_ALLOC;
+		    switch (section_type[1])
+		      {
+		      case 0xD0:	/* Normal code (CP).  */
+			next_byte (&(ieee->h));
+			section->flags |= SEC_CODE;
+			break;
+		      case 0xC4:	/* Normal data (CD).  */
+			next_byte (&(ieee->h));
+			section->flags |= SEC_DATA;
+			break;
+		      case 0xD2:	/* Normal rom data (CR).  */
+			next_byte (&(ieee->h));
+			section->flags |= SEC_ROM | SEC_DATA;
+			break;
+		      default:
+			break;
+		      }
+		  }
+
+		/* Read section name, use it if non empty.  */
+		name = read_id (&ieee->h);
+		if (name[0])
+		  section->name = name;
+
+		/* Skip these fields, which we don't care about.  */
+		{
+		  bfd_vma parent, brother, context;
+
+		  parse_int (&(ieee->h), &parent);
+		  parse_int (&(ieee->h), &brother);
+		  parse_int (&(ieee->h), &context);
+		}
+	      }
+	      break;
+	    case ieee_section_alignment_enum:
+	      {
+		unsigned int section_index;
+		bfd_vma value;
+		asection *section;
+
+		next_byte (&(ieee->h));
+		section_index = must_parse_int (&ieee->h);
+		section = get_section_entry (abfd, ieee, section_index);
+		if (section_index > ieee->section_count)
+		  ieee->section_count = section_index;
+
+		section->alignment_power =
+		  bfd_log2 (must_parse_int (&ieee->h));
+		(void) parse_int (&(ieee->h), &value);
+	      }
+	      break;
+	    case ieee_e2_first_byte_enum:
+	      {
+		asection *section;
+		ieee_record_enum_type t;
+
+		t = (ieee_record_enum_type) (read_2bytes (&(ieee->h)));
+		switch (t)
+		  {
+		  case ieee_section_size_enum:
+		    section = ieee->section_table[must_parse_int (&(ieee->h))];
+		    section->size = must_parse_int (&(ieee->h));
+		    break;
+		  case ieee_physical_region_size_enum:
+		    section = ieee->section_table[must_parse_int (&(ieee->h))];
+		    section->size = must_parse_int (&(ieee->h));
+		    break;
+		  case ieee_region_base_address_enum:
+		    section = ieee->section_table[must_parse_int (&(ieee->h))];
+		    section->vma = must_parse_int (&(ieee->h));
+		    section->lma = section->vma;
+		    break;
+		  case ieee_mau_size_enum:
+		    must_parse_int (&(ieee->h));
+		    must_parse_int (&(ieee->h));
+		    break;
+		  case ieee_m_value_enum:
+		    must_parse_int (&(ieee->h));
+		    must_parse_int (&(ieee->h));
+		    break;
+		  case ieee_section_base_address_enum:
+		    section = ieee->section_table[must_parse_int (&(ieee->h))];
+		    section->vma = must_parse_int (&(ieee->h));
+		    section->lma = section->vma;
+		    break;
+		  case ieee_section_offset_enum:
+		    (void) must_parse_int (&(ieee->h));
+		    (void) must_parse_int (&(ieee->h));
+		    break;
+		  default:
+		    return;
+		  }
+	      }
+	      break;
+	    default:
+	      return;
+	    }
+	}
+    }
+}
+
+/* Make a section for the debugging information, if any.  We don't try
+   to interpret the debugging information; we just point the section
+   at the area in the file so that program which understand can dig it
+   out.  */
+
+static bfd_boolean
+ieee_slurp_debug (bfd *abfd)
+{
+  ieee_data_type *ieee = IEEE_DATA (abfd);
+  asection *sec;
+  file_ptr debug_end;
+  flagword flags;
+
+  if (ieee->w.r.debug_information_part == 0)
+    return TRUE;
+
+  flags = SEC_DEBUGGING | SEC_HAS_CONTENTS;
+  sec = bfd_make_section_with_flags (abfd, ".debug", flags);
+  if (sec == NULL)
+    return FALSE;
+  sec->filepos = ieee->w.r.debug_information_part;
+
+  debug_end = ieee_part_after (ieee, ieee->w.r.debug_information_part);
+  sec->size = debug_end - ieee->w.r.debug_information_part;
+
+  return TRUE;
+}
+
+/* Archive stuff.  */
+
+static const bfd_target *
+ieee_archive_p (bfd *abfd)
+{
+  char *library;
+  unsigned int i;
+  unsigned char buffer[512];
+  file_ptr buffer_offset = 0;
+  ieee_ar_data_type *save = abfd->tdata.ieee_ar_data;
+  ieee_ar_data_type *ieee;
+  bfd_size_type alc_elts;
+  ieee_ar_obstack_type *elts = NULL;
+  bfd_size_type amt = sizeof (ieee_ar_data_type);
+
+  abfd->tdata.ieee_ar_data = bfd_alloc (abfd, amt);
+  if (!abfd->tdata.ieee_ar_data)
+    goto error_ret_restore;
+  ieee = IEEE_AR_DATA (abfd);
+
+  /* Ignore the return value here.  It doesn't matter if we don't read
+     the entire buffer.  We might have a very small ieee file.  */
+  bfd_bread ((void *) buffer, (bfd_size_type) sizeof (buffer), abfd);
+
+  ieee->h.first_byte = buffer;
+  ieee->h.input_p = buffer;
+
+  ieee->h.abfd = abfd;
+
+  if (this_byte (&(ieee->h)) != Module_Beginning)
+    goto got_wrong_format_error;
+
+  next_byte (&(ieee->h));
+  library = read_id (&(ieee->h));
+  if (strcmp (library, "LIBRARY") != 0)
+    goto got_wrong_format_error;
+
+  /* Throw away the filename.  */
+  read_id (&(ieee->h));
+
+  ieee->element_count = 0;
+  ieee->element_index = 0;
+
+  next_byte (&(ieee->h));	/* Drop the ad part.  */
+  must_parse_int (&(ieee->h));	/* And the two dummy numbers.  */
+  must_parse_int (&(ieee->h));
+
+  alc_elts = 10;
+  elts = bfd_malloc (alc_elts * sizeof *elts);
+  if (elts == NULL)
+    goto error_return;
+
+  /* Read the index of the BB table.  */
+  while (1)
+    {
+      int rec;
+      ieee_ar_obstack_type *t;
+
+      rec = read_2bytes (&(ieee->h));
+      if (rec != (int) ieee_assign_value_to_variable_enum)
+	break;
+
+      if (ieee->element_count >= alc_elts)
+	{
+	  ieee_ar_obstack_type *n;
+
+	  alc_elts *= 2;
+	  n = bfd_realloc (elts, alc_elts * sizeof (* elts));
+	  if (n == NULL)
+	    goto error_return;
+	  elts = n;
+	}
+
+      t = &elts[ieee->element_count];
+      ieee->element_count++;
+
+      must_parse_int (&(ieee->h));
+      t->file_offset = must_parse_int (&(ieee->h));
+      t->abfd = (bfd *) NULL;
+
+      /* Make sure that we don't go over the end of the buffer.  */
+      if ((size_t) ieee_pos (IEEE_DATA (abfd)) > sizeof (buffer) / 2)
+	{
+	  /* Past half way, reseek and reprime.  */
+	  buffer_offset += ieee_pos (IEEE_DATA (abfd));
+	  if (bfd_seek (abfd, buffer_offset, SEEK_SET) != 0)
+	    goto error_return;
+
+	  /* Again ignore return value of bfd_bread.  */
+	  bfd_bread ((void *) buffer, (bfd_size_type) sizeof (buffer), abfd);
+	  ieee->h.first_byte = buffer;
+	  ieee->h.input_p = buffer;
+	}
+    }
+
+  amt = ieee->element_count;
+  amt *= sizeof *ieee->elements;
+  ieee->elements = bfd_alloc (abfd, amt);
+  if (ieee->elements == NULL)
+    goto error_return;
+
+  memcpy (ieee->elements, elts, (size_t) amt);
+  free (elts);
+  elts = NULL;
+
+  /* Now scan the area again, and replace BB offsets with file offsets.  */
+  for (i = 2; i < ieee->element_count; i++)
+    {
+      if (bfd_seek (abfd, ieee->elements[i].file_offset, SEEK_SET) != 0)
+	goto error_return;
+
+      /* Again ignore return value of bfd_bread.  */
+      bfd_bread ((void *) buffer, (bfd_size_type) sizeof (buffer), abfd);
+      ieee->h.first_byte = buffer;
+      ieee->h.input_p = buffer;
+
+      next_byte (&(ieee->h));		/* Drop F8.  */
+      next_byte (&(ieee->h));		/* Drop 14.  */
+      must_parse_int (&(ieee->h));	/* Drop size of block.  */
+
+      if (must_parse_int (&(ieee->h)) != 0)
+	/* This object has been deleted.  */
+	ieee->elements[i].file_offset = 0;
+      else
+	ieee->elements[i].file_offset = must_parse_int (&(ieee->h));
+    }
+
+  /*  abfd->has_armap = ;*/
+
+  return abfd->xvec;
+
+ got_wrong_format_error:
+  bfd_set_error (bfd_error_wrong_format);
+ error_return:
+  if (elts != NULL)
+    free (elts);
+  bfd_release (abfd, ieee);
+ error_ret_restore:
+  abfd->tdata.ieee_ar_data = save;
+
+  return NULL;
+}
+
+static bfd_boolean
+ieee_mkobject (bfd *abfd)
+{
+  bfd_size_type amt;
+
+  output_ptr_start = NULL;
+  output_ptr = NULL;
+  output_ptr_end = NULL;
+  input_ptr_start = NULL;
+  input_ptr = NULL;
+  input_ptr_end = NULL;
+  input_bfd = NULL;
+  output_bfd = NULL;
+  output_buffer = 0;
+  amt = sizeof (ieee_data_type);
+  abfd->tdata.ieee_data = bfd_zalloc (abfd, amt);
+  return abfd->tdata.ieee_data != NULL;
+}
+
+static bfd_boolean
+do_one (ieee_data_type *ieee,
+	ieee_per_section_type *current_map,
+	unsigned char *location_ptr,
+	asection *s,
+	int iterations)
+{
+  switch (this_byte (&(ieee->h)))
+    {
+    case ieee_load_constant_bytes_enum:
+      {
+	unsigned int number_of_maus;
+	unsigned int i;
+
+	next_byte (&(ieee->h));
+	number_of_maus = must_parse_int (&(ieee->h));
+
+	for (i = 0; i < number_of_maus; i++)
+	  {
+	    location_ptr[current_map->pc++] = this_byte (&(ieee->h));
+	    next_byte (&(ieee->h));
+	  }
+      }
+      break;
+
+    case ieee_load_with_relocation_enum:
+      {
+	bfd_boolean loop = TRUE;
+
+	next_byte (&(ieee->h));
+	while (loop)
+	  {
+	    switch (this_byte (&(ieee->h)))
+	      {
+	      case ieee_variable_R_enum:
+
+	      case ieee_function_signed_open_b_enum:
+	      case ieee_function_unsigned_open_b_enum:
+	      case ieee_function_either_open_b_enum:
+		{
+		  unsigned int extra = 4;
+		  bfd_boolean pcrel = FALSE;
+		  asection *section;
+		  ieee_reloc_type *r;
+
+		  r = bfd_alloc (ieee->h.abfd, sizeof (* r));
+		  if (!r)
+		    return FALSE;
+
+		  *(current_map->reloc_tail_ptr) = r;
+		  current_map->reloc_tail_ptr = &r->next;
+		  r->next = (ieee_reloc_type *) NULL;
+		  next_byte (&(ieee->h));
+/*			    abort();*/
+		  r->relent.sym_ptr_ptr = 0;
+		  parse_expression (ieee,
+				    &r->relent.addend,
+				    &r->symbol,
+				    &pcrel, &extra, &section);
+		  r->relent.address = current_map->pc;
+		  s->flags |= SEC_RELOC;
+		  s->owner->flags |= HAS_RELOC;
+		  s->reloc_count++;
+		  if (r->relent.sym_ptr_ptr == NULL && section != NULL)
+		    r->relent.sym_ptr_ptr = section->symbol_ptr_ptr;
+
+		  if (this_byte (&(ieee->h)) == (int) ieee_comma)
+		    {
+		      next_byte (&(ieee->h));
+		      /* Fetch number of bytes to pad.  */
+		      extra = must_parse_int (&(ieee->h));
+		    };
+
+		  switch (this_byte (&(ieee->h)))
+		    {
+		    case ieee_function_signed_close_b_enum:
+		      next_byte (&(ieee->h));
+		      break;
+		    case ieee_function_unsigned_close_b_enum:
+		      next_byte (&(ieee->h));
+		      break;
+		    case ieee_function_either_close_b_enum:
+		      next_byte (&(ieee->h));
+		      break;
+		    default:
+		      break;
+		    }
+		  /* Build a relocation entry for this type.  */
+		  /* If pc rel then stick -ve pc into instruction
+		     and take out of reloc ..
+
+		     I've changed this. It's all too complicated. I
+		     keep 0 in the instruction now.  */
+
+		  switch (extra)
+		    {
+		    case 0:
+		    case 4:
+
+		      if (pcrel)
+			{
+#if KEEPMINUSPCININST
+			  bfd_put_32 (ieee->h.abfd, -current_map->pc,
+				      location_ptr + current_map->pc);
+			  r->relent.howto = &rel32_howto;
+			  r->relent.addend -= current_map->pc;
+#else
+			  bfd_put_32 (ieee->h.abfd, (bfd_vma) 0, location_ptr +
+				      current_map->pc);
+			  r->relent.howto = &rel32_howto;
+#endif
+			}
+		      else
+			{
+			  bfd_put_32 (ieee->h.abfd, (bfd_vma) 0,
+				      location_ptr + current_map->pc);
+			  r->relent.howto = &abs32_howto;
+			}
+		      current_map->pc += 4;
+		      break;
+		    case 2:
+		      if (pcrel)
+			{
+#if KEEPMINUSPCININST
+			  bfd_put_16 (ieee->h.abfd, (bfd_vma) -current_map->pc,
+				      location_ptr + current_map->pc);
+			  r->relent.addend -= current_map->pc;
+			  r->relent.howto = &rel16_howto;
+#else
+
+			  bfd_put_16 (ieee->h.abfd, (bfd_vma) 0,
+				      location_ptr + current_map->pc);
+			  r->relent.howto = &rel16_howto;
+#endif
+			}
+
+		      else
+			{
+			  bfd_put_16 (ieee->h.abfd, (bfd_vma) 0,
+				      location_ptr + current_map->pc);
+			  r->relent.howto = &abs16_howto;
+			}
+		      current_map->pc += 2;
+		      break;
+		    case 1:
+		      if (pcrel)
+			{
+#if KEEPMINUSPCININST
+			  bfd_put_8 (ieee->h.abfd, (int) (-current_map->pc), location_ptr + current_map->pc);
+			  r->relent.addend -= current_map->pc;
+			  r->relent.howto = &rel8_howto;
+#else
+			  bfd_put_8 (ieee->h.abfd, 0, location_ptr + current_map->pc);
+			  r->relent.howto = &rel8_howto;
+#endif
+			}
+		      else
+			{
+			  bfd_put_8 (ieee->h.abfd, 0, location_ptr + current_map->pc);
+			  r->relent.howto = &abs8_howto;
+			}
+		      current_map->pc += 1;
+		      break;
+
+		    default:
+		      BFD_FAIL ();
+		      return FALSE;
+		    }
+		}
+		break;
+	      default:
+		{
+		  bfd_vma this_size;
+
+		  if (parse_int (&(ieee->h), &this_size))
+		    {
+		      unsigned int i;
+
+		      for (i = 0; i < this_size; i++)
+			{
+			  location_ptr[current_map->pc++] = this_byte (&(ieee->h));
+			  next_byte (&(ieee->h));
+			}
+		    }
+		  else
+		    loop = FALSE;
+		}
+	      }
+
+	    /* Prevent more than the first load-item of an LR record
+	       from being repeated (MRI convention).  */
+	    if (iterations != 1)
+	      loop = FALSE;
+	  }
+      }
+    }
+  return TRUE;
+}
+
+/* Read in all the section data and relocation stuff too.  */
+
+static bfd_boolean
+ieee_slurp_section_data (bfd *abfd)
+{
+  bfd_byte *location_ptr = (bfd_byte *) NULL;
+  ieee_data_type *ieee = IEEE_DATA (abfd);
+  unsigned int section_number;
+  ieee_per_section_type *current_map = NULL;
+  asection *s;
+  
+  /* Seek to the start of the data area.  */
+  if (ieee->read_data)
+    return TRUE;
+  ieee->read_data = TRUE;
+  ieee_seek (ieee, ieee->w.r.data_part);
+
+  /* Allocate enough space for all the section contents.  */
+  for (s = abfd->sections; s != (asection *) NULL; s = s->next)
+    {
+      ieee_per_section_type *per = ieee_per_section (s);
+      arelent **relpp;
+
+      if ((s->flags & SEC_DEBUGGING) != 0)
+	continue;
+      per->data = bfd_alloc (ieee->h.abfd, s->size);
+      if (!per->data)
+	return FALSE;
+      relpp = &s->relocation;
+      per->reloc_tail_ptr = (ieee_reloc_type **) relpp;
+    }
+
+  while (TRUE)
+    {
+      switch (this_byte (&(ieee->h)))
+	{
+	  /* IF we see anything strange then quit.  */
+	default:
+	  return TRUE;
+
+	case ieee_set_current_section_enum:
+	  next_byte (&(ieee->h));
+	  section_number = must_parse_int (&(ieee->h));
+	  s = ieee->section_table[section_number];
+	  s->flags |= SEC_LOAD | SEC_HAS_CONTENTS;
+	  current_map = ieee_per_section (s);
+	  location_ptr = current_map->data - s->vma;
+	  /* The document I have says that Microtec's compilers reset
+	     this after a sec section, even though the standard says not
+	     to, SO...  */
+	  current_map->pc = s->vma;
+	  break;
+
+	case ieee_e2_first_byte_enum:
+	  next_byte (&(ieee->h));
+	  switch (this_byte (&(ieee->h)))
+	    {
+	    case ieee_set_current_pc_enum & 0xff:
+	      {
+		bfd_vma value;
+		ieee_symbol_index_type symbol;
+		unsigned int extra;
+		bfd_boolean pcrel;
+
+		next_byte (&(ieee->h));
+		must_parse_int (&(ieee->h));	/* Throw away section #.  */
+		parse_expression (ieee, &value,
+				  &symbol,
+				  &pcrel, &extra,
+				  0);
+		current_map->pc = value;
+		BFD_ASSERT ((unsigned) (value - s->vma) <= s->size);
+	      }
+	      break;
+
+	    case ieee_value_starting_address_enum & 0xff:
+	      next_byte (&(ieee->h));
+	      if (this_byte (&(ieee->h)) == ieee_function_either_open_b_enum)
+		next_byte (&(ieee->h));
+	      abfd->start_address = must_parse_int (&(ieee->h));
+	      /* We've got to the end of the data now -  */
+	      return TRUE;
+	    default:
+	      BFD_FAIL ();
+	      return FALSE;
+	    }
+	  break;
+	case ieee_repeat_data_enum:
+	  {
+	    /* Repeat the following LD or LR n times - we do this by
+	       remembering the stream pointer before running it and
+	       resetting it and running it n times. We special case
+	       the repetition of a repeat_data/load_constant.  */
+	    unsigned int iterations;
+	    unsigned char *start;
+
+	    next_byte (&(ieee->h));
+	    iterations = must_parse_int (&(ieee->h));
+	    start = ieee->h.input_p;
+	    if (start[0] == (int) ieee_load_constant_bytes_enum
+		&& start[1] == 1)
+	      {
+		while (iterations != 0)
+		  {
+		    location_ptr[current_map->pc++] = start[2];
+		    iterations--;
+		  }
+		next_byte (&(ieee->h));
+		next_byte (&(ieee->h));
+		next_byte (&(ieee->h));
+	      }
+	    else
+	      {
+		while (iterations != 0)
+		  {
+		    ieee->h.input_p = start;
+		    if (!do_one (ieee, current_map, location_ptr, s,
+				 (int) iterations))
+		      return FALSE;
+		    iterations--;
+		  }
+	      }
+	  }
+	  break;
+	case ieee_load_constant_bytes_enum:
+	case ieee_load_with_relocation_enum:
+	  if (!do_one (ieee, current_map, location_ptr, s, 1))
+	    return FALSE;
+	}
+    }
+}
+
+static const bfd_target *
+ieee_object_p (bfd *abfd)
+{
+  char *processor;
+  unsigned int part;
+  ieee_data_type *ieee;
+  unsigned char buffer[300];
+  ieee_data_type *save = IEEE_DATA (abfd);
+  bfd_size_type amt;
+
+  abfd->tdata.ieee_data = 0;
+  ieee_mkobject (abfd);
+
+  ieee = IEEE_DATA (abfd);
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    goto fail;
+  /* Read the first few bytes in to see if it makes sense.  Ignore
+     bfd_bread return value;  The file might be very small.  */
+  bfd_bread ((void *) buffer, (bfd_size_type) sizeof (buffer), abfd);
+
+  ieee->h.input_p = buffer;
+  if (this_byte_and_next (&(ieee->h)) != Module_Beginning)
+    goto got_wrong_format;
+
+  ieee->read_symbols = FALSE;
+  ieee->read_data = FALSE;
+  ieee->section_count = 0;
+  ieee->external_symbol_max_index = 0;
+  ieee->external_symbol_min_index = IEEE_PUBLIC_BASE;
+  ieee->external_reference_min_index = IEEE_REFERENCE_BASE;
+  ieee->external_reference_max_index = 0;
+  ieee->h.abfd = abfd;
+  ieee->section_table = NULL;
+  ieee->section_table_size = 0;
+
+  processor = ieee->mb.processor = read_id (&(ieee->h));
+  if (strcmp (processor, "LIBRARY") == 0)
+    goto got_wrong_format;
+  ieee->mb.module_name = read_id (&(ieee->h));
+  if (abfd->filename == (const char *) NULL)
+    abfd->filename = ieee->mb.module_name;
+
+  /* Determine the architecture and machine type of the object file.  */
+  {
+    const bfd_arch_info_type *arch;
+    char family[10];
+
+    /* IEEE does not specify the format of the processor identification
+       string, so the compiler is free to put in it whatever it wants.
+       We try here to recognize different processors belonging to the
+       m68k family.  Code for other processors can be added here.  */
+    if ((processor[0] == '6') && (processor[1] == '8'))
+      {
+	if (processor[2] == '3')	    /* 683xx integrated processors.  */
+	  {
+	    switch (processor[3])
+	      {
+	      case '0':			    /* 68302, 68306, 68307 */
+	      case '2':			    /* 68322, 68328 */
+	      case '5':			    /* 68356 */
+		strcpy (family, "68000");   /* MC68000-based controllers.  */
+		break;
+
+	      case '3':			    /* 68330, 68331, 68332, 68333,
+					       68334, 68335, 68336, 68338 */
+	      case '6':			    /* 68360 */
+	      case '7':			    /* 68376 */
+		strcpy (family, "68332");   /* CPU32 and CPU32+ */
+		break;
+
+	      case '4':
+		if (processor[4] == '9')    /* 68349 */
+		  strcpy (family, "68030"); /* CPU030 */
+		else		            /* 68340, 68341 */
+		  strcpy (family, "68332"); /* CPU32 and CPU32+ */
+		break;
+
+	      default:			    /* Does not exist yet.  */
+		strcpy (family, "68332");   /* Guess it will be CPU32 */
+	      }
+	  }
+	else if (TOUPPER (processor[3]) == 'F')  /* 68F333 */
+	  strcpy (family, "68332");	           /* CPU32 */
+	else if ((TOUPPER (processor[3]) == 'C') /* Embedded controllers.  */
+		 && ((TOUPPER (processor[2]) == 'E')
+		     || (TOUPPER (processor[2]) == 'H')
+		     || (TOUPPER (processor[2]) == 'L')))
+	  {
+	    strcpy (family, "68");
+	    strncat (family, processor + 4, 7);
+	    family[9] = '\0';
+	  }
+	else				 /* "Regular" processors.  */
+	  {
+	    strncpy (family, processor, 9);
+	    family[9] = '\0';
+	  }
+      }
+    else if ((CONST_STRNEQ (processor, "cpu32")) /* CPU32 and CPU32+  */
+	     || (CONST_STRNEQ (processor, "CPU32")))
+      strcpy (family, "68332");
+    else
+      {
+	strncpy (family, processor, 9);
+	family[9] = '\0';
+      }
+
+    arch = bfd_scan_arch (family);
+    if (arch == 0)
+      goto got_wrong_format;
+    abfd->arch_info = arch;
+  }
+
+  if (this_byte (&(ieee->h)) != (int) ieee_address_descriptor_enum)
+    goto fail;
+
+  next_byte (&(ieee->h));
+
+  if (! parse_int (&(ieee->h), &ieee->ad.number_of_bits_mau))
+    goto fail;
+
+  if (! parse_int (&(ieee->h), &ieee->ad.number_of_maus_in_address))
+    goto fail;
+
+  /* If there is a byte order info, take it.  */
+  if (this_byte (&(ieee->h)) == (int) ieee_variable_L_enum
+      || this_byte (&(ieee->h)) == (int) ieee_variable_M_enum)
+    next_byte (&(ieee->h));
+
+  for (part = 0; part < N_W_VARIABLES; part++)
+    {
+      bfd_boolean ok;
+
+      if (read_2bytes (&(ieee->h)) != (int) ieee_assign_value_to_variable_enum)
+	goto fail;
+
+      if (this_byte_and_next (&(ieee->h)) != part)
+	goto fail;
+
+      ieee->w.offset[part] = parse_i (&(ieee->h), &ok);
+      if (! ok)
+	goto fail;
+    }
+
+  if (ieee->w.r.external_part != 0)
+    abfd->flags = HAS_SYMS;
+
+  /* By now we know that this is a real IEEE file, we're going to read
+     the whole thing into memory so that we can run up and down it
+     quickly.  We can work out how big the file is from the trailer
+     record.  */
+
+  amt = ieee->w.r.me_record + 1;
+  IEEE_DATA (abfd)->h.first_byte = bfd_alloc (ieee->h.abfd, amt);
+  if (!IEEE_DATA (abfd)->h.first_byte)
+    goto fail;
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    goto fail;
+  /* FIXME: Check return value.  I'm not sure whether it needs to read
+     the entire buffer or not.  */
+  bfd_bread ((void *) (IEEE_DATA (abfd)->h.first_byte),
+	    (bfd_size_type) ieee->w.r.me_record + 1, abfd);
+
+  ieee_slurp_sections (abfd);
+
+  if (! ieee_slurp_debug (abfd))
+    goto fail;
+
+  /* Parse section data to activate file and section flags implied by
+     section contents.  */
+  if (! ieee_slurp_section_data (abfd))
+    goto fail;
+
+  return abfd->xvec;
+got_wrong_format:
+  bfd_set_error (bfd_error_wrong_format);
+fail:
+  bfd_release (abfd, ieee);
+  abfd->tdata.ieee_data = save;
+  return (const bfd_target *) NULL;
+}
+
+static void
+ieee_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+		      asymbol *symbol,
+		      symbol_info *ret)
+{
+  bfd_symbol_info (symbol, ret);
+  if (symbol->name[0] == ' ')
+    ret->name = "* empty table entry ";
+  if (!symbol->section)
+    ret->type = (symbol->flags & BSF_LOCAL) ? 'a' : 'A';
+}
+
+static void
+ieee_print_symbol (bfd *abfd,
+		   void * afile,
+		   asymbol *symbol,
+		   bfd_print_symbol_type how)
+{
+  FILE *file = (FILE *) afile;
+
+  switch (how)
+    {
+    case bfd_print_symbol_name:
+      fprintf (file, "%s", symbol->name);
+      break;
+    case bfd_print_symbol_more:
+      BFD_FAIL ();
+      break;
+    case bfd_print_symbol_all:
+      {
+	const char *section_name =
+	  (symbol->section == (asection *) NULL
+	   ? "*abs"
+	   : symbol->section->name);
+
+	if (symbol->name[0] == ' ')
+	  fprintf (file, "* empty table entry ");
+	else
+	  {
+	    bfd_print_symbol_vandf (abfd, (void *) file, symbol);
+
+	    fprintf (file, " %-5s %04x %02x %s",
+		     section_name,
+		     (unsigned) ieee_symbol (symbol)->index,
+		     (unsigned) 0,
+		     symbol->name);
+	  }
+      }
+      break;
+    }
+}
+
+static bfd_boolean
+ieee_new_section_hook (bfd *abfd, asection *newsect)
+{
+  if (!newsect->used_by_bfd)
+    {
+      newsect->used_by_bfd = bfd_alloc (abfd, sizeof (ieee_per_section_type));
+      if (!newsect->used_by_bfd)
+	return FALSE;
+    }
+  ieee_per_section (newsect)->data = NULL;
+  ieee_per_section (newsect)->section = newsect;
+  return _bfd_generic_new_section_hook (abfd, newsect);
+}
+
+static long
+ieee_get_reloc_upper_bound (bfd *abfd, sec_ptr asect)
+{
+  if ((asect->flags & SEC_DEBUGGING) != 0)
+    return 0;
+  if (! ieee_slurp_section_data (abfd))
+    return -1;
+  return (asect->reloc_count + 1) * sizeof (arelent *);
+}
+
+static bfd_boolean
+ieee_get_section_contents (bfd *abfd,
+			   sec_ptr section,
+			   void * location,
+			   file_ptr offset,
+			   bfd_size_type count)
+{
+  ieee_per_section_type *p = ieee_per_section (section);
+  if ((section->flags & SEC_DEBUGGING) != 0)
+    return _bfd_generic_get_section_contents (abfd, section, location,
+					      offset, count);
+  ieee_slurp_section_data (abfd);
+  (void) memcpy ((void *) location, (void *) (p->data + offset), (unsigned) count);
+  return TRUE;
+}
+
+static long
+ieee_canonicalize_reloc (bfd *abfd,
+			 sec_ptr section,
+			 arelent **relptr,
+			 asymbol **symbols)
+{
+  ieee_reloc_type *src = (ieee_reloc_type *) (section->relocation);
+  ieee_data_type *ieee = IEEE_DATA (abfd);
+
+  if ((section->flags & SEC_DEBUGGING) != 0)
+    return 0;
+
+  while (src != (ieee_reloc_type *) NULL)
+    {
+      /* Work out which symbol to attach it this reloc to.  */
+      switch (src->symbol.letter)
+	{
+	case 'I':
+	  src->relent.sym_ptr_ptr =
+	    symbols + src->symbol.index + ieee->external_symbol_base_offset;
+	  break;
+	case 'X':
+	  src->relent.sym_ptr_ptr =
+	    symbols + src->symbol.index + ieee->external_reference_base_offset;
+	  break;
+	case 0:
+	  if (src->relent.sym_ptr_ptr != NULL)
+	    src->relent.sym_ptr_ptr =
+	      src->relent.sym_ptr_ptr[0]->section->symbol_ptr_ptr;
+	  break;
+	default:
+
+	  BFD_FAIL ();
+	}
+      *relptr++ = &src->relent;
+      src = src->next;
+    }
+  *relptr = NULL;
+  return section->reloc_count;
+}
+
+static int
+comp (const void * ap, const void * bp)
+{
+  arelent *a = *((arelent **) ap);
+  arelent *b = *((arelent **) bp);
+  return a->address - b->address;
+}
+
+/* Write the section headers.  */
+
+static bfd_boolean
+ieee_write_section_part (bfd *abfd)
+{
+  ieee_data_type *ieee = IEEE_DATA (abfd);
+  asection *s;
+
+  ieee->w.r.section_part = bfd_tell (abfd);
+  for (s = abfd->sections; s != (asection *) NULL; s = s->next)
+    {
+      if (! bfd_is_abs_section (s)
+	  && (s->flags & SEC_DEBUGGING) == 0)
+	{
+	  if (! ieee_write_byte (abfd, ieee_section_type_enum)
+	      || ! ieee_write_byte (abfd,
+				    (bfd_byte) (s->index
+						+ IEEE_SECTION_NUMBER_BASE)))
+	    return FALSE;
+
+	  if (abfd->flags & EXEC_P)
+	    {
+	      /* This image is executable, so output absolute sections.  */
+	      if (! ieee_write_byte (abfd, ieee_variable_A_enum)
+		  || ! ieee_write_byte (abfd, ieee_variable_S_enum))
+		return FALSE;
+	    }
+	  else
+	    {
+	      if (! ieee_write_byte (abfd, ieee_variable_C_enum))
+		return FALSE;
+	    }
+
+	  switch (s->flags & (SEC_CODE | SEC_DATA | SEC_ROM))
+	    {
+	    case SEC_CODE | SEC_LOAD:
+	    case SEC_CODE:
+	      if (! ieee_write_byte (abfd, ieee_variable_P_enum))
+		return FALSE;
+	      break;
+	    case SEC_DATA:
+	    default:
+	      if (! ieee_write_byte (abfd, ieee_variable_D_enum))
+		return FALSE;
+	      break;
+	    case SEC_ROM:
+	    case SEC_ROM | SEC_DATA:
+	    case SEC_ROM | SEC_LOAD:
+	    case SEC_ROM | SEC_DATA | SEC_LOAD:
+	      if (! ieee_write_byte (abfd, ieee_variable_R_enum))
+		return FALSE;
+	    }
+
+
+	  if (! ieee_write_id (abfd, s->name))
+	    return FALSE;
+	  /* Alignment.  */
+	  if (! ieee_write_byte (abfd, ieee_section_alignment_enum)
+	      || ! ieee_write_byte (abfd,
+				    (bfd_byte) (s->index
+						+ IEEE_SECTION_NUMBER_BASE))
+	      || ! ieee_write_int (abfd, (bfd_vma) 1 << s->alignment_power))
+	    return FALSE;
+
+	  /* Size.  */
+	  if (! ieee_write_2bytes (abfd, ieee_section_size_enum)
+	      || ! ieee_write_byte (abfd,
+				    (bfd_byte) (s->index
+						+ IEEE_SECTION_NUMBER_BASE))
+	      || ! ieee_write_int (abfd, s->size))
+	    return FALSE;
+	  if (abfd->flags & EXEC_P)
+	    {
+	      /* Relocateable sections don't have asl records.  */
+	      /* Vma.  */
+	      if (! ieee_write_2bytes (abfd, ieee_section_base_address_enum)
+		  || ! ieee_write_byte (abfd,
+					((bfd_byte)
+					 (s->index
+					  + IEEE_SECTION_NUMBER_BASE)))
+		  || ! ieee_write_int (abfd, s->lma))
+		return FALSE;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+do_with_relocs (bfd *abfd, asection *s)
+{
+  unsigned int number_of_maus_in_address =
+    bfd_arch_bits_per_address (abfd) / bfd_arch_bits_per_byte (abfd);
+  unsigned int relocs_to_go = s->reloc_count;
+  bfd_byte *stream = ieee_per_section (s)->data;
+  arelent **p = s->orelocation;
+  bfd_size_type current_byte_index = 0;
+
+  qsort (s->orelocation,
+	 relocs_to_go,
+	 sizeof (arelent **),
+	 comp);
+
+  /* Output the section preheader.  */
+  if (! ieee_write_byte (abfd, ieee_set_current_section_enum)
+      || ! ieee_write_byte (abfd,
+			    (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE))
+      || ! ieee_write_2bytes (abfd, ieee_set_current_pc_enum)
+      || ! ieee_write_byte (abfd,
+			    (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE)))
+    return FALSE;
+
+  if ((abfd->flags & EXEC_P) != 0 && relocs_to_go == 0)
+    {
+      if (! ieee_write_int (abfd, s->lma))
+	return FALSE;
+    }
+  else
+    {
+      if (! ieee_write_expression (abfd, (bfd_vma) 0, s->symbol, 0, 0))
+	return FALSE;
+    }
+
+  if (relocs_to_go == 0)
+    {
+      /* If there aren't any relocations then output the load constant
+	 byte opcode rather than the load with relocation opcode.  */
+      while (current_byte_index < s->size)
+	{
+	  bfd_size_type run;
+	  unsigned int MAXRUN = 127;
+
+	  run = MAXRUN;
+	  if (run > s->size - current_byte_index)
+	    run = s->size - current_byte_index;
+
+	  if (run != 0)
+	    {
+	      if (! ieee_write_byte (abfd, ieee_load_constant_bytes_enum))
+		return FALSE;
+	      /* Output a stream of bytes.  */
+	      if (! ieee_write_int (abfd, run))
+		return FALSE;
+	      if (bfd_bwrite ((void *) (stream + current_byte_index), run, abfd)
+		  != run)
+		return FALSE;
+	      current_byte_index += run;
+	    }
+	}
+    }
+  else
+    {
+      if (! ieee_write_byte (abfd, ieee_load_with_relocation_enum))
+	return FALSE;
+
+      /* Output the data stream as the longest sequence of bytes
+	 possible, allowing for the a reasonable packet size and
+	 relocation stuffs.  */
+      if (stream == NULL)
+	{
+	  /* Outputting a section without data, fill it up.  */
+	  stream = bfd_zalloc (abfd, s->size);
+	  if (!stream)
+	    return FALSE;
+	}
+      while (current_byte_index < s->size)
+	{
+	  bfd_size_type run;
+	  unsigned int MAXRUN = 127;
+
+	  if (relocs_to_go)
+	    {
+	      run = (*p)->address - current_byte_index;
+	      if (run > MAXRUN)
+		run = MAXRUN;
+	    }
+	  else
+	    run = MAXRUN;
+
+	  if (run > s->size - current_byte_index)
+	    run = s->size - current_byte_index;
+
+	  if (run != 0)
+	    {
+	      /* Output a stream of bytes.  */
+	      if (! ieee_write_int (abfd, run))
+		return FALSE;
+	      if (bfd_bwrite ((void *) (stream + current_byte_index), run, abfd)
+		  != run)
+		return FALSE;
+	      current_byte_index += run;
+	    }
+
+	  /* Output any relocations here.  */
+	  if (relocs_to_go && (*p) && (*p)->address == current_byte_index)
+	    {
+	      while (relocs_to_go
+		     && (*p) && (*p)->address == current_byte_index)
+		{
+		  arelent *r = *p;
+		  bfd_signed_vma ov;
+		  switch (r->howto->size)
+		    {
+		    case 2:
+		      ov = bfd_get_signed_32 (abfd,
+					      stream + current_byte_index);
+		      current_byte_index += 4;
+		      break;
+		    case 1:
+		      ov = bfd_get_signed_16 (abfd,
+					      stream + current_byte_index);
+		      current_byte_index += 2;
+		      break;
+		    case 0:
+		      ov = bfd_get_signed_8 (abfd,
+					     stream + current_byte_index);
+		      current_byte_index++;
+		      break;
+		    default:
+		      ov = 0;
+		      BFD_FAIL ();
+		      return FALSE;
+		    }
+
+		  ov &= r->howto->src_mask;
+
+		  if (r->howto->pc_relative
+		      && ! r->howto->pcrel_offset)
+		    ov += r->address;
+
+		  if (! ieee_write_byte (abfd,
+					 ieee_function_either_open_b_enum))
+		    return FALSE;
+
+		  if (r->sym_ptr_ptr != (asymbol **) NULL)
+		    {
+		      if (! ieee_write_expression (abfd, r->addend + ov,
+						   *(r->sym_ptr_ptr),
+						   r->howto->pc_relative,
+						   (unsigned) s->index))
+			return FALSE;
+		    }
+		  else
+		    {
+		      if (! ieee_write_expression (abfd, r->addend + ov,
+						   (asymbol *) NULL,
+						   r->howto->pc_relative,
+						   (unsigned) s->index))
+			return FALSE;
+		    }
+
+		  if (number_of_maus_in_address
+		      != bfd_get_reloc_size (r->howto))
+		    {
+		      bfd_vma rsize = bfd_get_reloc_size (r->howto);
+		      if (! ieee_write_int (abfd, rsize))
+			return FALSE;
+		    }
+		  if (! ieee_write_byte (abfd,
+					 ieee_function_either_close_b_enum))
+		    return FALSE;
+
+		  relocs_to_go--;
+		  p++;
+		}
+
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* If there are no relocations in the output section then we can be
+   clever about how we write.  We block items up into a max of 127
+   bytes.  */
+
+static bfd_boolean
+do_as_repeat (bfd *abfd, asection *s)
+{
+  if (s->size)
+    {
+      if (! ieee_write_byte (abfd, ieee_set_current_section_enum)
+	  || ! ieee_write_byte (abfd,
+				(bfd_byte) (s->index
+					    + IEEE_SECTION_NUMBER_BASE))
+	  || ! ieee_write_byte (abfd, ieee_set_current_pc_enum >> 8)
+	  || ! ieee_write_byte (abfd, ieee_set_current_pc_enum & 0xff)
+	  || ! ieee_write_byte (abfd,
+				(bfd_byte) (s->index
+					    + IEEE_SECTION_NUMBER_BASE)))
+	return FALSE;
+
+      if ((abfd->flags & EXEC_P) != 0)
+	{
+	  if (! ieee_write_int (abfd, s->lma))
+	    return FALSE;
+	}
+      else
+	{
+	  if (! ieee_write_expression (abfd, (bfd_vma) 0, s->symbol, 0, 0))
+	    return FALSE;
+	}
+
+      if (! ieee_write_byte (abfd, ieee_repeat_data_enum)
+	  || ! ieee_write_int (abfd, s->size)
+	  || ! ieee_write_byte (abfd, ieee_load_constant_bytes_enum)
+	  || ! ieee_write_byte (abfd, 1)
+	  || ! ieee_write_byte (abfd, 0))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+do_without_relocs (bfd *abfd, asection *s)
+{
+  bfd_byte *stream = ieee_per_section (s)->data;
+
+  if (stream == 0 || ((s->flags & SEC_LOAD) == 0))
+    {
+      if (! do_as_repeat (abfd, s))
+	return FALSE;
+    }
+  else
+    {
+      unsigned int i;
+
+      for (i = 0; i < s->size; i++)
+	{
+	  if (stream[i] != 0)
+	    {
+	      if (! do_with_relocs (abfd, s))
+		return FALSE;
+	      return TRUE;
+	    }
+	}
+      if (! do_as_repeat (abfd, s))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+static void
+fill (void)
+{
+  bfd_size_type amt = input_ptr_end - input_ptr_start;
+  /* FIXME: Check return value.  I'm not sure whether it needs to read
+     the entire buffer or not.  */
+  bfd_bread ((void *) input_ptr_start, amt, input_bfd);
+  input_ptr = input_ptr_start;
+}
+
+static void
+flush (void)
+{
+  bfd_size_type amt = output_ptr - output_ptr_start;
+
+  if (bfd_bwrite ((void *) (output_ptr_start), amt, output_bfd) != amt)
+    abort ();
+  output_ptr = output_ptr_start;
+  output_buffer++;
+}
+
+#define THIS() ( *input_ptr )
+#define NEXT() { input_ptr++; if (input_ptr == input_ptr_end) fill (); }
+#define OUT(x) { *output_ptr++ = (x); if (output_ptr == output_ptr_end)  flush (); }
+
+static void
+write_int (int value)
+{
+  if (value >= 0 && value <= 127)
+    {
+      OUT (value);
+    }
+  else
+    {
+      unsigned int length;
+
+      /* How many significant bytes ?  */
+      /* FIXME FOR LONGER INTS.  */
+      if (value & 0xff000000)
+	length = 4;
+      else if (value & 0x00ff0000)
+	length = 3;
+      else if (value & 0x0000ff00)
+	length = 2;
+      else
+	length = 1;
+
+      OUT ((int) ieee_number_repeat_start_enum + length);
+      switch (length)
+	{
+	case 4:
+	  OUT (value >> 24);
+	case 3:
+	  OUT (value >> 16);
+	case 2:
+	  OUT (value >> 8);
+	case 1:
+	  OUT (value);
+	}
+    }
+}
+
+static void
+copy_id (void)
+{
+  int length = THIS ();
+  char ch;
+
+  OUT (length);
+  NEXT ();
+  while (length--)
+    {
+      ch = THIS ();
+      OUT (ch);
+      NEXT ();
+    }
+}
+
+#define VAR(x) ((x | 0x80))
+static void
+copy_expression (void)
+{
+  int stack[10];
+  int *tos = stack;
+  int value;
+
+  while (1)
+    {
+      switch (THIS ())
+	{
+	case 0x84:
+	  NEXT ();
+	  value = THIS ();
+	  NEXT ();
+	  value = (value << 8) | THIS ();
+	  NEXT ();
+	  value = (value << 8) | THIS ();
+	  NEXT ();
+	  value = (value << 8) | THIS ();
+	  NEXT ();
+	  *tos++ = value;
+	  break;
+	case 0x83:
+	  NEXT ();
+	  value = THIS ();
+	  NEXT ();
+	  value = (value << 8) | THIS ();
+	  NEXT ();
+	  value = (value << 8) | THIS ();
+	  NEXT ();
+	  *tos++ = value;
+	  break;
+	case 0x82:
+	  NEXT ();
+	  value = THIS ();
+	  NEXT ();
+	  value = (value << 8) | THIS ();
+	  NEXT ();
+	  *tos++ = value;
+	  break;
+	case 0x81:
+	  NEXT ();
+	  value = THIS ();
+	  NEXT ();
+	  *tos++ = value;
+	  break;
+	case 0x80:
+	  NEXT ();
+	  *tos++ = 0;
+	  break;
+	default:
+	  if (THIS () > 0x84)
+	    {
+	      /* Not a number, just bug out with the answer.  */
+	      write_int (*(--tos));
+	      return;
+	    }
+	  *tos++ = THIS ();
+	  NEXT ();
+	  break;
+	case 0xa5:
+	  /* PLUS anything.  */
+	  value = *(--tos);
+	  value += *(--tos);
+	  *tos++ = value;
+	  NEXT ();
+	  break;
+	case VAR ('R'):
+	  {
+	    int section_number;
+	    ieee_data_type *ieee;
+	    asection *s;
+
+	    NEXT ();
+	    section_number = THIS ();
+
+	    NEXT ();
+	    ieee = IEEE_DATA (input_bfd);
+	    s = ieee->section_table[section_number];
+	    value = 0;
+	    if (s->output_section)
+	      value = s->output_section->lma;
+	    value += s->output_offset;
+	    *tos++ = value;
+	  }
+	  break;
+	case 0x90:
+	  {
+	    NEXT ();
+	    write_int (*(--tos));
+	    OUT (0x90);
+	    return;
+	  }
+	}
+    }
+}
+
+/* Drop the int in the buffer, and copy a null into the gap, which we
+   will overwrite later.  */
+
+static void
+fill_int (struct output_buffer_struct *buf)
+{
+  if (buf->buffer == output_buffer)
+    {
+      /* Still a chance to output the size.  */
+      int value = output_ptr - buf->ptrp + 3;
+      buf->ptrp[0] = value >> 24;
+      buf->ptrp[1] = value >> 16;
+      buf->ptrp[2] = value >> 8;
+      buf->ptrp[3] = value >> 0;
+    }
+}
+
+static void
+drop_int (struct output_buffer_struct *buf)
+{
+  int type = THIS ();
+  int ch;
+
+  if (type <= 0x84)
+    {
+      NEXT ();
+      switch (type)
+	{
+	case 0x84:
+	  ch = THIS ();
+	  NEXT ();
+	case 0x83:
+	  ch = THIS ();
+	  NEXT ();
+	case 0x82:
+	  ch = THIS ();
+	  NEXT ();
+	case 0x81:
+	  ch = THIS ();
+	  NEXT ();
+	case 0x80:
+	  break;
+	}
+    }
+  (void) ch;
+  OUT (0x84);
+  buf->ptrp = output_ptr;
+  buf->buffer = output_buffer;
+  OUT (0);
+  OUT (0);
+  OUT (0);
+  OUT (0);
+}
+
+static void
+copy_int (void)
+{
+  int type = THIS ();
+  int ch;
+  if (type <= 0x84)
+    {
+      OUT (type);
+      NEXT ();
+      switch (type)
+	{
+	case 0x84:
+	  ch = THIS ();
+	  NEXT ();
+	  OUT (ch);
+	case 0x83:
+	  ch = THIS ();
+	  NEXT ();
+	  OUT (ch);
+	case 0x82:
+	  ch = THIS ();
+	  NEXT ();
+	  OUT (ch);
+	case 0x81:
+	  ch = THIS ();
+	  NEXT ();
+	  OUT (ch);
+	case 0x80:
+	  break;
+	}
+    }
+}
+
+#define ID      copy_id ()
+#define INT     copy_int ()
+#define EXP     copy_expression ()
+#define INTn(q) copy_int ()
+#define EXPn(q) copy_expression ()
+
+static void
+copy_till_end (void)
+{
+  int ch = THIS ();
+
+  while (1)
+    {
+      while (ch <= 0x80)
+	{
+	  OUT (ch);
+	  NEXT ();
+	  ch = THIS ();
+	}
+      switch (ch)
+	{
+	case 0x84:
+	  OUT (THIS ());
+	  NEXT ();
+	case 0x83:
+	  OUT (THIS ());
+	  NEXT ();
+	case 0x82:
+	  OUT (THIS ());
+	  NEXT ();
+	case 0x81:
+	  OUT (THIS ());
+	  NEXT ();
+	  OUT (THIS ());
+	  NEXT ();
+
+	  ch = THIS ();
+	  break;
+	default:
+	  return;
+	}
+    }
+
+}
+
+static void
+f1_record (void)
+{
+  int ch;
+
+  /* ATN record.  */
+  NEXT ();
+  ch = THIS ();
+  switch (ch)
+    {
+    default:
+      OUT (0xf1);
+      OUT (ch);
+      break;
+    case 0xc9:
+      NEXT ();
+      OUT (0xf1);
+      OUT (0xc9);
+      INT;
+      INT;
+      ch = THIS ();
+      switch (ch)
+	{
+	case 0x16:
+	  NEXT ();
+	  break;
+	case 0x01:
+	  NEXT ();
+	  break;
+	case 0x00:
+	  NEXT ();
+	  INT;
+	  break;
+	case 0x03:
+	  NEXT ();
+	  INT;
+	  break;
+	case 0x13:
+	  EXPn (instruction address);
+	  break;
+	default:
+	  break;
+	}
+      break;
+    case 0xd8:
+      /* EXternal ref.  */
+      NEXT ();
+      OUT (0xf1);
+      OUT (0xd8);
+      EXP;
+      EXP;
+      EXP;
+      EXP;
+      break;
+    case 0xce:
+      NEXT ();
+      OUT (0xf1);
+      OUT (0xce);
+      INT;
+      INT;
+      ch = THIS ();
+      INT;
+      switch (ch)
+	{
+	case 0x01:
+	  INT;
+	  INT;
+	  break;
+	case 0x02:
+	  INT;
+	  break;
+	case 0x04:
+	  EXPn (external function);
+	  break;
+	case 0x05:
+	  break;
+	case 0x07:
+	  INTn (line number);
+	  INT;
+	case 0x08:
+	  break;
+	case 0x0a:
+	  INTn (locked register);
+	  INT;
+	  break;
+	case 0x3f:
+	  copy_till_end ();
+	  break;
+	case 0x3e:
+	  copy_till_end ();
+	  break;
+	case 0x40:
+	  copy_till_end ();
+	  break;
+	case 0x41:
+	  ID;
+	  break;
+	}
+    }
+}
+
+static void
+f0_record (void)
+{
+  /* Attribute record.  */
+  NEXT ();
+  OUT (0xf0);
+  INTn (Symbol name);
+  ID;
+}
+
+static void
+f2_record (void)
+{
+  NEXT ();
+  OUT (0xf2);
+  INT;
+  NEXT ();
+  OUT (0xce);
+  INT;
+  copy_till_end ();
+}
+
+static void
+f8_record (void)
+{
+  int ch;
+  NEXT ();
+  ch = THIS ();
+  switch (ch)
+    {
+    case 0x01:
+    case 0x02:
+    case 0x03:
+      /* Unique typedefs for module.  */
+      /* GLobal typedefs.   */
+      /* High level module scope beginning.  */
+      {
+	struct output_buffer_struct ob;
+
+	NEXT ();
+	OUT (0xf8);
+	OUT (ch);
+	drop_int (&ob);
+	ID;
+
+	block ();
+
+	NEXT ();
+	fill_int (&ob);
+	OUT (0xf9);
+      }
+      break;
+    case 0x04:
+      /* Global function.  */
+      {
+	struct output_buffer_struct ob;
+
+	NEXT ();
+	OUT (0xf8);
+	OUT (0x04);
+	drop_int (&ob);
+	ID;
+	INTn (stack size);
+	INTn (ret val);
+	EXPn (offset);
+
+	block ();
+
+	NEXT ();
+	OUT (0xf9);
+	EXPn (size of block);
+	fill_int (&ob);
+      }
+      break;
+
+    case 0x05:
+      /* File name for source line numbers.  */
+      {
+	struct output_buffer_struct ob;
+
+	NEXT ();
+	OUT (0xf8);
+	OUT (0x05);
+	drop_int (&ob);
+	ID;
+	INTn (year);
+	INTn (month);
+	INTn (day);
+	INTn (hour);
+	INTn (monute);
+	INTn (second);
+	block ();
+	NEXT ();
+	OUT (0xf9);
+	fill_int (&ob);
+      }
+      break;
+
+    case 0x06:
+      /* Local function.  */
+      {
+	struct output_buffer_struct ob;
+
+	NEXT ();
+	OUT (0xf8);
+	OUT (0x06);
+	drop_int (&ob);
+	ID;
+	INTn (stack size);
+	INTn (type return);
+	EXPn (offset);
+	block ();
+	NEXT ();
+	OUT (0xf9);
+	EXPn (size);
+	fill_int (&ob);
+      }
+      break;
+
+    case 0x0a:
+      /* Assembler module scope beginning -  */
+      {
+	struct output_buffer_struct ob;
+
+	NEXT ();
+	OUT (0xf8);
+	OUT (0x0a);
+	drop_int (&ob);
+	ID;
+	ID;
+	INT;
+	ID;
+	INT;
+	INT;
+	INT;
+	INT;
+	INT;
+	INT;
+
+	block ();
+
+	NEXT ();
+	OUT (0xf9);
+	fill_int (&ob);
+      }
+      break;
+    case 0x0b:
+      {
+	struct output_buffer_struct ob;
+
+	NEXT ();
+	OUT (0xf8);
+	OUT (0x0b);
+	drop_int (&ob);
+	ID;
+	INT;
+	INTn (section index);
+	EXPn (offset);
+	INTn (stuff);
+
+	block ();
+
+	OUT (0xf9);
+	NEXT ();
+	EXPn (Size in Maus);
+	fill_int (&ob);
+      }
+      break;
+    }
+}
+
+static void
+e2_record (void)
+{
+  OUT (0xe2);
+  NEXT ();
+  OUT (0xce);
+  NEXT ();
+  INT;
+  EXP;
+}
+
+static void
+block (void)
+{
+  int ch;
+
+  while (1)
+    {
+      ch = THIS ();
+      switch (ch)
+	{
+	case 0xe1:
+	case 0xe5:
+	  return;
+	case 0xf9:
+	  return;
+	case 0xf0:
+	  f0_record ();
+	  break;
+	case 0xf1:
+	  f1_record ();
+	  break;
+	case 0xf2:
+	  f2_record ();
+	  break;
+	case 0xf8:
+	  f8_record ();
+	  break;
+	case 0xe2:
+	  e2_record ();
+	  break;
+
+	}
+    }
+}
+
+/* Moves all the debug information from the source bfd to the output
+   bfd, and relocates any expressions it finds.  */
+
+static void
+relocate_debug (bfd *output ATTRIBUTE_UNUSED,
+		bfd *input)
+{
+#define IBS 400
+#define OBS 400
+  unsigned char input_buffer[IBS];
+
+  input_ptr_start = input_ptr = input_buffer;
+  input_ptr_end = input_buffer + IBS;
+  input_bfd = input;
+  /* FIXME: Check return value.  I'm not sure whether it needs to read
+     the entire buffer or not.  */
+  bfd_bread ((void *) input_ptr_start, (bfd_size_type) IBS, input);
+  block ();
+}
+
+/* Gather together all the debug information from each input BFD into
+   one place, relocating it and emitting it as we go.  */
+
+static bfd_boolean
+ieee_write_debug_part (bfd *abfd)
+{
+  ieee_data_type *ieee = IEEE_DATA (abfd);
+  bfd_chain_type *chain = ieee->chain_root;
+  unsigned char obuff[OBS];
+  bfd_boolean some_debug = FALSE;
+  file_ptr here = bfd_tell (abfd);
+
+  output_ptr_start = output_ptr = obuff;
+  output_ptr_end = obuff + OBS;
+  output_ptr = obuff;
+  output_bfd = abfd;
+
+  if (chain == (bfd_chain_type *) NULL)
+    {
+      asection *s;
+
+      for (s = abfd->sections; s != NULL; s = s->next)
+	if ((s->flags & SEC_DEBUGGING) != 0)
+	  break;
+      if (s == NULL)
+	{
+	  ieee->w.r.debug_information_part = 0;
+	  return TRUE;
+	}
+
+      ieee->w.r.debug_information_part = here;
+      if (bfd_bwrite (s->contents, s->size, abfd) != s->size)
+	return FALSE;
+    }
+  else
+    {
+      while (chain != (bfd_chain_type *) NULL)
+	{
+	  bfd *entry = chain->this;
+	  ieee_data_type *entry_ieee = IEEE_DATA (entry);
+
+	  if (entry_ieee->w.r.debug_information_part)
+	    {
+	      if (bfd_seek (entry, entry_ieee->w.r.debug_information_part,
+			    SEEK_SET) != 0)
+		return FALSE;
+	      relocate_debug (abfd, entry);
+	    }
+
+	  chain = chain->next;
+	}
+
+      if (some_debug)
+	ieee->w.r.debug_information_part = here;
+      else
+	ieee->w.r.debug_information_part = 0;
+
+      flush ();
+    }
+
+  return TRUE;
+}
+
+/* Write the data in an ieee way.  */
+
+static bfd_boolean
+ieee_write_data_part (bfd *abfd)
+{
+  asection *s;
+
+  ieee_data_type *ieee = IEEE_DATA (abfd);
+  ieee->w.r.data_part = bfd_tell (abfd);
+
+  for (s = abfd->sections; s != (asection *) NULL; s = s->next)
+    {
+      /* Skip sections that have no loadable contents (.bss,
+         debugging, etc.)  */
+      if ((s->flags & SEC_LOAD) == 0)
+	continue;
+
+      /* Sort the reloc records so we can insert them in the correct
+	 places.  */
+      if (s->reloc_count != 0)
+	{
+	  if (! do_with_relocs (abfd, s))
+	    return FALSE;
+	}
+      else
+	{
+	  if (! do_without_relocs (abfd, s))
+	    return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+init_for_output (bfd *abfd)
+{
+  asection *s;
+
+  for (s = abfd->sections; s != (asection *) NULL; s = s->next)
+    {
+      if ((s->flags & SEC_DEBUGGING) != 0)
+	continue;
+      if (s->size != 0)
+	{
+	  bfd_size_type size = s->size;
+	  ieee_per_section (s)->data = bfd_alloc (abfd, size);
+	  if (!ieee_per_section (s)->data)
+	    return FALSE;
+	}
+    }
+  return TRUE;
+}
+
+/* Exec and core file sections.  */
+
+/* Set section contents is complicated with IEEE since the format is
+   not a byte image, but a record stream.  */
+
+static bfd_boolean
+ieee_set_section_contents (bfd *abfd,
+			   sec_ptr section,
+			   const void * location,
+			   file_ptr offset,
+			   bfd_size_type count)
+{
+  if ((section->flags & SEC_DEBUGGING) != 0)
+    {
+      if (section->contents == NULL)
+	{
+	  bfd_size_type size = section->size;
+	  section->contents = bfd_alloc (abfd, size);
+	  if (section->contents == NULL)
+	    return FALSE;
+	}
+      /* bfd_set_section_contents has already checked that everything
+         is within range.  */
+      memcpy (section->contents + offset, location, (size_t) count);
+      return TRUE;
+    }
+
+  if (ieee_per_section (section)->data == (bfd_byte *) NULL)
+    {
+      if (!init_for_output (abfd))
+	return FALSE;
+    }
+  memcpy ((void *) (ieee_per_section (section)->data + offset),
+	  (void *) location,
+	  (unsigned int) count);
+  return TRUE;
+}
+
+/* Write the external symbols of a file.  IEEE considers two sorts of
+   external symbols, public, and referenced.  It uses to internal
+   forms to index them as well.  When we write them out we turn their
+   symbol values into indexes from the right base.  */
+
+static bfd_boolean
+ieee_write_external_part (bfd *abfd)
+{
+  asymbol **q;
+  ieee_data_type *ieee = IEEE_DATA (abfd);
+  unsigned int reference_index = IEEE_REFERENCE_BASE;
+  unsigned int public_index = IEEE_PUBLIC_BASE + 2;
+  file_ptr here = bfd_tell (abfd);
+  bfd_boolean hadone = FALSE;
+
+  if (abfd->outsymbols != (asymbol **) NULL)
+    {
+
+      for (q = abfd->outsymbols; *q != (asymbol *) NULL; q++)
+	{
+	  asymbol *p = *q;
+
+	  if (bfd_is_und_section (p->section))
+	    {
+	      /* This must be a symbol reference.  */
+	      if (! ieee_write_byte (abfd, ieee_external_reference_enum)
+		  || ! ieee_write_int (abfd, (bfd_vma) reference_index)
+		  || ! ieee_write_id (abfd, p->name))
+		return FALSE;
+	      p->value = reference_index;
+	      reference_index++;
+	      hadone = TRUE;
+	    }
+	  else if (bfd_is_com_section (p->section))
+	    {
+	      /* This is a weak reference.  */
+	      if (! ieee_write_byte (abfd, ieee_external_reference_enum)
+		  || ! ieee_write_int (abfd, (bfd_vma) reference_index)
+		  || ! ieee_write_id (abfd, p->name)
+		  || ! ieee_write_byte (abfd,
+					ieee_weak_external_reference_enum)
+		  || ! ieee_write_int (abfd, (bfd_vma) reference_index)
+		  || ! ieee_write_int (abfd, p->value))
+		return FALSE;
+	      p->value = reference_index;
+	      reference_index++;
+	      hadone = TRUE;
+	    }
+	  else if (p->flags & BSF_GLOBAL)
+	    {
+	      /* This must be a symbol definition.  */
+	      if (! ieee_write_byte (abfd, ieee_external_symbol_enum)
+		  || ! ieee_write_int (abfd, (bfd_vma) public_index)
+		  || ! ieee_write_id (abfd, p->name)
+		  || ! ieee_write_2bytes (abfd, ieee_attribute_record_enum)
+		  || ! ieee_write_int (abfd, (bfd_vma) public_index)
+		  || ! ieee_write_byte (abfd, 15) /* Instruction address.  */
+		  || ! ieee_write_byte (abfd, 19) /* Static symbol.  */
+		  || ! ieee_write_byte (abfd, 1)) /* One of them.  */
+		return FALSE;
+
+	      /* Write out the value.  */
+	      if (! ieee_write_2bytes (abfd, ieee_value_record_enum)
+		  || ! ieee_write_int (abfd, (bfd_vma) public_index))
+		return FALSE;
+	      if (! bfd_is_abs_section (p->section))
+		{
+		  if (abfd->flags & EXEC_P)
+		    {
+		      /* If fully linked, then output all symbols
+			 relocated.  */
+		      if (! (ieee_write_int
+			     (abfd,
+			      (p->value
+			       + p->section->output_offset
+			       + p->section->output_section->vma))))
+			return FALSE;
+		    }
+		  else
+		    {
+		      if (! (ieee_write_expression
+			     (abfd,
+			      p->value + p->section->output_offset,
+			      p->section->output_section->symbol,
+			      FALSE, 0)))
+			return FALSE;
+		    }
+		}
+	      else
+		{
+		  if (! ieee_write_expression (abfd,
+					       p->value,
+					       bfd_abs_section_ptr->symbol,
+					       FALSE, 0))
+		    return FALSE;
+		}
+	      p->value = public_index;
+	      public_index++;
+	      hadone = TRUE;
+	    }
+	  else
+	    {
+	      /* This can happen - when there are gaps in the symbols read
+	         from an input ieee file.  */
+	    }
+	}
+    }
+  if (hadone)
+    ieee->w.r.external_part = here;
+
+  return TRUE;
+}
+
+
+static const unsigned char exten[] =
+{
+  0xf0, 0x20, 0x00,
+  0xf1, 0xce, 0x20, 0x00, 37, 3, 3,	/* Set version 3 rev 3.  */
+  0xf1, 0xce, 0x20, 0x00, 39, 2,	/* Keep symbol in  original case.  */
+  0xf1, 0xce, 0x20, 0x00, 38		/* Set object type relocatable to x.  */
+};
+
+static const unsigned char envi[] =
+{
+  0xf0, 0x21, 0x00,
+
+/*    0xf1, 0xce, 0x21, 00, 50, 0x82, 0x07, 0xc7, 0x09, 0x11, 0x11,
+    0x19, 0x2c,
+*/
+  0xf1, 0xce, 0x21, 00, 52, 0x00,	/* exec ok.  */
+
+  0xf1, 0xce, 0x21, 0, 53, 0x03,/* host unix.  */
+/*    0xf1, 0xce, 0x21, 0, 54, 2,1,1	tool & version # */
+};
+
+static bfd_boolean
+ieee_write_me_part (bfd *abfd)
+{
+  ieee_data_type *ieee = IEEE_DATA (abfd);
+  ieee->w.r.trailer_part = bfd_tell (abfd);
+  if (abfd->start_address)
+    {
+      if (! ieee_write_2bytes (abfd, ieee_value_starting_address_enum)
+	  || ! ieee_write_byte (abfd, ieee_function_either_open_b_enum)
+	  || ! ieee_write_int (abfd, abfd->start_address)
+	  || ! ieee_write_byte (abfd, ieee_function_either_close_b_enum))
+	return FALSE;
+    }
+  ieee->w.r.me_record = bfd_tell (abfd);
+  if (! ieee_write_byte (abfd, ieee_module_end_enum))
+    return FALSE;
+  return TRUE;
+}
+
+/* Write out the IEEE processor ID.  */
+
+static bfd_boolean
+ieee_write_processor (bfd *abfd)
+{
+  const bfd_arch_info_type *arch;
+
+  arch = bfd_get_arch_info (abfd);
+  switch (arch->arch)
+    {
+    default:
+      if (! ieee_write_id (abfd, bfd_printable_name (abfd)))
+	return FALSE;
+      break;
+
+    case bfd_arch_h8300:
+      if (! ieee_write_id (abfd, "H8/300"))
+	return FALSE;
+      break;
+
+    case bfd_arch_h8500:
+      if (! ieee_write_id (abfd, "H8/500"))
+	return FALSE;
+      break;
+
+    case bfd_arch_i960:
+      switch (arch->mach)
+	{
+	default:
+	case bfd_mach_i960_core:
+	case bfd_mach_i960_ka_sa:
+	  if (! ieee_write_id (abfd, "80960KA"))
+	    return FALSE;
+	  break;
+
+	case bfd_mach_i960_kb_sb:
+	  if (! ieee_write_id (abfd, "80960KB"))
+	    return FALSE;
+	  break;
+
+	case bfd_mach_i960_ca:
+	  if (! ieee_write_id (abfd, "80960CA"))
+	    return FALSE;
+	  break;
+
+	case bfd_mach_i960_mc:
+	case bfd_mach_i960_xa:
+	  if (! ieee_write_id (abfd, "80960MC"))
+	    return FALSE;
+	  break;
+	}
+      break;
+
+    case bfd_arch_m68k:
+      {
+	const char *id;
+
+	switch (arch->mach)
+	  {
+	  default:		id = "68020"; break;
+	  case bfd_mach_m68000: id = "68000"; break;
+	  case bfd_mach_m68008: id = "68008"; break;
+	  case bfd_mach_m68010: id = "68010"; break;
+	  case bfd_mach_m68020: id = "68020"; break;
+	  case bfd_mach_m68030: id = "68030"; break;
+	  case bfd_mach_m68040: id = "68040"; break;
+	  case bfd_mach_m68060: id = "68060"; break;
+	  case bfd_mach_cpu32:  id = "cpu32"; break;
+	  case bfd_mach_mcf_isa_a_nodiv: id = "isa-a:nodiv"; break;
+	  case bfd_mach_mcf_isa_a: id = "isa-a"; break;
+	  case bfd_mach_mcf_isa_a_mac: id = "isa-a:mac"; break;
+	  case bfd_mach_mcf_isa_a_emac: id = "isa-a:emac"; break;
+	  case bfd_mach_mcf_isa_aplus: id = "isa-aplus"; break;
+	  case bfd_mach_mcf_isa_aplus_mac: id = "isa-aplus:mac"; break;
+	  case bfd_mach_mcf_isa_aplus_emac: id = "isa-aplus:mac"; break;
+	  case bfd_mach_mcf_isa_b_nousp: id = "isa-b:nousp"; break;
+	  case bfd_mach_mcf_isa_b_nousp_mac: id = "isa-b:nousp:mac"; break;
+	  case bfd_mach_mcf_isa_b_nousp_emac: id = "isa-b:nousp:emac"; break;
+	  case bfd_mach_mcf_isa_b: id = "isa-b"; break;
+	  case bfd_mach_mcf_isa_b_mac: id = "isa-b:mac"; break;
+	  case bfd_mach_mcf_isa_b_emac: id = "isa-b:emac"; break;
+	  case bfd_mach_mcf_isa_b_float: id = "isa-b:float"; break;
+	  case bfd_mach_mcf_isa_b_float_mac: id = "isa-b:float:mac"; break;
+	  case bfd_mach_mcf_isa_b_float_emac: id = "isa-b:float:emac"; break;
+	  case bfd_mach_mcf_isa_c: id = "isa-c"; break;
+	  case bfd_mach_mcf_isa_c_mac: id = "isa-c:mac"; break;
+	  case bfd_mach_mcf_isa_c_emac: id = "isa-c:emac"; break;
+	  case bfd_mach_mcf_isa_c_nodiv: id = "isa-c:nodiv"; break;
+	  case bfd_mach_mcf_isa_c_nodiv_mac: id = "isa-c:nodiv:mac"; break;
+	  case bfd_mach_mcf_isa_c_nodiv_emac: id = "isa-c:nodiv:emac"; break;
+	  }
+
+	if (! ieee_write_id (abfd, id))
+	  return FALSE;
+      }
+      break;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+ieee_write_object_contents (bfd *abfd)
+{
+  ieee_data_type *ieee = IEEE_DATA (abfd);
+  unsigned int i;
+  file_ptr old;
+
+  /* Fast forward over the header area.  */
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    return FALSE;
+
+  if (! ieee_write_byte (abfd, ieee_module_beginning_enum)
+      || ! ieee_write_processor (abfd)
+      || ! ieee_write_id (abfd, abfd->filename))
+    return FALSE;
+
+  /* Fast forward over the variable bits.  */
+  if (! ieee_write_byte (abfd, ieee_address_descriptor_enum))
+    return FALSE;
+
+  /* Bits per MAU.  */
+  if (! ieee_write_byte (abfd, (bfd_byte) (bfd_arch_bits_per_byte (abfd))))
+    return FALSE;
+  /* MAU's per address.  */
+  if (! ieee_write_byte (abfd,
+			 (bfd_byte) (bfd_arch_bits_per_address (abfd)
+				     / bfd_arch_bits_per_byte (abfd))))
+    return FALSE;
+
+  old = bfd_tell (abfd);
+  if (bfd_seek (abfd, (file_ptr) (8 * N_W_VARIABLES), SEEK_CUR) != 0)
+    return FALSE;
+
+  ieee->w.r.extension_record = bfd_tell (abfd);
+  if (bfd_bwrite ((char *) exten, (bfd_size_type) sizeof (exten), abfd)
+      != sizeof (exten))
+    return FALSE;
+  if (abfd->flags & EXEC_P)
+    {
+      if (! ieee_write_byte (abfd, 0x1)) /* Absolute.  */
+	return FALSE;
+    }
+  else
+    {
+      if (! ieee_write_byte (abfd, 0x2)) /* Relocateable.  */
+	return FALSE;
+    }
+
+  ieee->w.r.environmental_record = bfd_tell (abfd);
+  if (bfd_bwrite ((char *) envi, (bfd_size_type) sizeof (envi), abfd)
+      != sizeof (envi))
+    return FALSE;
+
+  /* The HP emulator database requires a timestamp in the file.  */
+  {
+    time_t now;
+    const struct tm *t;
+
+    time (&now);
+    t = (struct tm *) localtime (&now);
+    if (! ieee_write_2bytes (abfd, (int) ieee_atn_record_enum)
+	|| ! ieee_write_byte (abfd, 0x21)
+	|| ! ieee_write_byte (abfd, 0)
+	|| ! ieee_write_byte (abfd, 50)
+	|| ! ieee_write_int (abfd, (bfd_vma) (t->tm_year + 1900))
+	|| ! ieee_write_int (abfd, (bfd_vma) (t->tm_mon + 1))
+	|| ! ieee_write_int (abfd, (bfd_vma) t->tm_mday)
+	|| ! ieee_write_int (abfd, (bfd_vma) t->tm_hour)
+	|| ! ieee_write_int (abfd, (bfd_vma) t->tm_min)
+	|| ! ieee_write_int (abfd, (bfd_vma) t->tm_sec))
+      return FALSE;
+  }
+
+  output_bfd = abfd;
+
+  flush ();
+
+  if (! ieee_write_section_part (abfd))
+    return FALSE;
+  /* First write the symbols.  This changes their values into table
+    indeces so we cant use it after this point.  */
+  if (! ieee_write_external_part (abfd))
+    return FALSE;
+
+  /* Write any debugs we have been told about.  */
+  if (! ieee_write_debug_part (abfd))
+    return FALSE;
+
+  /* Can only write the data once the symbols have been written, since
+     the data contains relocation information which points to the
+     symbols.  */
+  if (! ieee_write_data_part (abfd))
+    return FALSE;
+
+  /* At the end we put the end!  */
+  if (! ieee_write_me_part (abfd))
+    return FALSE;
+
+  /* Generate the header.  */
+  if (bfd_seek (abfd, old, SEEK_SET) != 0)
+    return FALSE;
+
+  for (i = 0; i < N_W_VARIABLES; i++)
+    {
+      if (! ieee_write_2bytes (abfd, ieee_assign_value_to_variable_enum)
+	  || ! ieee_write_byte (abfd, (bfd_byte) i)
+	  || ! ieee_write_int5_out (abfd, (bfd_vma) ieee->w.offset[i]))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Native-level interface to symbols.  */
+
+/* We read the symbols into a buffer, which is discarded when this
+   function exits.  We read the strings into a buffer large enough to
+   hold them all plus all the cached symbol entries.  */
+
+static asymbol *
+ieee_make_empty_symbol (bfd *abfd)
+{
+  bfd_size_type amt = sizeof (ieee_symbol_type);
+  ieee_symbol_type *new_symbol = (ieee_symbol_type *) bfd_zalloc (abfd, amt);
+
+  if (!new_symbol)
+    return NULL;
+  new_symbol->symbol.the_bfd = abfd;
+  return &new_symbol->symbol;
+}
+
+static bfd *
+ieee_openr_next_archived_file (bfd *arch, bfd *prev)
+{
+  ieee_ar_data_type *ar = IEEE_AR_DATA (arch);
+
+  /* Take the next one from the arch state, or reset.  */
+  if (prev == (bfd *) NULL)
+    /* Reset the index - the first two entries are bogus.  */
+    ar->element_index = 2;
+
+  while (TRUE)
+    {
+      ieee_ar_obstack_type *p = ar->elements + ar->element_index;
+
+      ar->element_index++;
+      if (ar->element_index <= ar->element_count)
+	{
+	  if (p->file_offset != (file_ptr) 0)
+	    {
+	      if (p->abfd == (bfd *) NULL)
+		{
+		  p->abfd = _bfd_create_empty_archive_element_shell (arch);
+		  p->abfd->origin = p->file_offset;
+		}
+	      return p->abfd;
+	    }
+	}
+      else
+	{
+	  bfd_set_error (bfd_error_no_more_archived_files);
+	  return NULL;
+	}
+    }
+}
+
+static bfd_boolean
+ieee_find_nearest_line (bfd *abfd ATTRIBUTE_UNUSED,
+			asection *section ATTRIBUTE_UNUSED,
+			asymbol **symbols ATTRIBUTE_UNUSED,
+			bfd_vma offset ATTRIBUTE_UNUSED,
+			const char **filename_ptr ATTRIBUTE_UNUSED,
+			const char **functionname_ptr ATTRIBUTE_UNUSED,
+			unsigned int *line_ptr ATTRIBUTE_UNUSED)
+{
+  return FALSE;
+}
+
+static bfd_boolean
+ieee_find_inliner_info (bfd *abfd ATTRIBUTE_UNUSED,
+			const char **filename_ptr ATTRIBUTE_UNUSED,
+			const char **functionname_ptr ATTRIBUTE_UNUSED,
+			unsigned int *line_ptr ATTRIBUTE_UNUSED)
+{
+  return FALSE;
+}
+
+static int
+ieee_generic_stat_arch_elt (bfd *abfd, struct stat *buf)
+{
+  ieee_ar_data_type *ar = (ieee_ar_data_type *) NULL;
+  ieee_data_type *ieee;
+
+  if (abfd->my_archive != NULL)
+    ar = abfd->my_archive->tdata.ieee_ar_data;
+  if (ar == (ieee_ar_data_type *) NULL)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return -1;
+    }
+
+  if (IEEE_DATA (abfd) == NULL)
+    {
+      if (ieee_object_p (abfd) == NULL)
+	{
+	  bfd_set_error (bfd_error_wrong_format);
+	  return -1;
+	}
+    }
+
+  ieee = IEEE_DATA (abfd);
+
+  buf->st_size = ieee->w.r.me_record + 1;
+  buf->st_mode = 0644;
+  return 0;
+}
+
+static int
+ieee_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+		     struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+#define	ieee_close_and_cleanup _bfd_generic_close_and_cleanup
+#define ieee_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
+
+#define ieee_slurp_armap bfd_true
+#define ieee_slurp_extended_name_table bfd_true
+#define ieee_construct_extended_name_table \
+  ((bfd_boolean (*) \
+    (bfd *, char **, bfd_size_type *, const char **)) \
+   bfd_true)
+#define ieee_truncate_arname bfd_dont_truncate_arname
+#define ieee_write_armap \
+  ((bfd_boolean (*) \
+    (bfd *, unsigned int, struct orl *, unsigned int, int)) \
+   bfd_true)
+#define ieee_read_ar_hdr bfd_nullvoidptr
+#define ieee_write_ar_hdr ((bfd_boolean (*) (bfd *, bfd *)) bfd_false)
+#define ieee_update_armap_timestamp bfd_true
+#define ieee_get_elt_at_index _bfd_generic_get_elt_at_index
+
+#define ieee_bfd_is_target_special_symbol  \
+  ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define ieee_bfd_is_local_label_name bfd_generic_is_local_label_name
+#define ieee_get_lineno _bfd_nosymbols_get_lineno
+#define ieee_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
+#define ieee_read_minisymbols _bfd_generic_read_minisymbols
+#define ieee_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
+
+#define ieee_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
+#define ieee_bfd_reloc_name_lookup _bfd_norelocs_bfd_reloc_name_lookup
+
+#define ieee_set_arch_mach _bfd_generic_set_arch_mach
+
+#define ieee_get_section_contents_in_window \
+  _bfd_generic_get_section_contents_in_window
+#define ieee_bfd_get_relocated_section_contents \
+  bfd_generic_get_relocated_section_contents
+#define ieee_bfd_relax_section bfd_generic_relax_section
+#define ieee_bfd_gc_sections bfd_generic_gc_sections
+#define ieee_bfd_lookup_section_flags bfd_generic_lookup_section_flags
+#define ieee_bfd_merge_sections bfd_generic_merge_sections
+#define ieee_bfd_is_group_section bfd_generic_is_group_section
+#define ieee_bfd_discard_group bfd_generic_discard_group
+#define ieee_section_already_linked \
+  _bfd_generic_section_already_linked
+#define ieee_bfd_define_common_symbol bfd_generic_define_common_symbol
+#define ieee_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
+#define ieee_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
+#define ieee_bfd_link_add_symbols _bfd_generic_link_add_symbols
+#define ieee_bfd_link_just_syms _bfd_generic_link_just_syms
+#define ieee_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define ieee_bfd_final_link _bfd_generic_final_link
+#define ieee_bfd_link_split_section  _bfd_generic_link_split_section
+
+const bfd_target ieee_vec =
+{
+  "ieee",			/* Name.  */
+  bfd_target_ieee_flavour,
+  BFD_ENDIAN_UNKNOWN,		/* Target byte order.  */
+  BFD_ENDIAN_UNKNOWN,		/* Target headers byte order.  */
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+  (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
+   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* Section flags.  */
+  '_',				/* Leading underscore.  */
+  ' ',				/* AR_pad_char.  */
+  16,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Data.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Headers.  */
+
+  {_bfd_dummy_target,
+   ieee_object_p,		/* bfd_check_format.  */
+   ieee_archive_p,
+   _bfd_dummy_target,
+  },
+  {
+    bfd_false,
+    ieee_mkobject,
+    _bfd_generic_mkarchive,
+    bfd_false
+  },
+  {
+    bfd_false,
+    ieee_write_object_contents,
+    _bfd_write_archive_contents,
+    bfd_false,
+  },
+
+  /* ieee_close_and_cleanup, ieee_bfd_free_cached_info, ieee_new_section_hook,
+     ieee_get_section_contents, ieee_get_section_contents_in_window.  */
+  BFD_JUMP_TABLE_GENERIC (ieee),
+
+  BFD_JUMP_TABLE_COPY (_bfd_generic),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+
+  /* ieee_slurp_armap, ieee_slurp_extended_name_table,
+     ieee_construct_extended_name_table, ieee_truncate_arname,
+     ieee_write_armap, ieee_read_ar_hdr, ieee_openr_next_archived_file,
+     ieee_get_elt_at_index, ieee_generic_stat_arch_elt,
+     ieee_update_armap_timestamp.  */
+  BFD_JUMP_TABLE_ARCHIVE (ieee),
+
+  /* ieee_get_symtab_upper_bound, ieee_canonicalize_symtab,
+     ieee_make_empty_symbol, ieee_print_symbol, ieee_get_symbol_info,
+     ieee_bfd_is_local_label_name, ieee_get_lineno,
+     ieee_find_nearest_line, ieee_bfd_make_debug_symbol,
+     ieee_read_minisymbols, ieee_minisymbol_to_symbol.  */
+  BFD_JUMP_TABLE_SYMBOLS (ieee),
+
+  /* ieee_get_reloc_upper_bound, ieee_canonicalize_reloc,
+     ieee_bfd_reloc_type_lookup.   */
+  BFD_JUMP_TABLE_RELOCS (ieee),
+
+  /* ieee_set_arch_mach, ieee_set_section_contents.  */
+  BFD_JUMP_TABLE_WRITE (ieee),
+
+  /* ieee_sizeof_headers, ieee_bfd_get_relocated_section_contents,
+     ieee_bfd_relax_section, ieee_bfd_link_hash_table_create,
+     _bfd_generic_link_hash_table_free,
+     ieee_bfd_link_add_symbols, ieee_bfd_final_link,
+     ieee_bfd_link_split_section, ieee_bfd_gc_sections,
+     ieee_bfd_merge_sections.  */
+  BFD_JUMP_TABLE_LINK (ieee),
+
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  NULL
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ihex.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ihex.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ihex.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ihex.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1001 @@
+/* BFD back-end for Intel Hex objects.
+   Copyright 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006, 2007, 2009, 2011 Free Software Foundation, Inc.
+   Written by Ian Lance Taylor of Cygnus Support <ian@cygnus.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* This is what Intel Hex files look like:
+
+1. INTEL FORMATS
+
+A. Intel 1
+
+   16-bit address-field format, for files 64k bytes in length or less.
+
+   DATA RECORD
+   Byte 1	Header = colon(:)
+   2..3		The number of data bytes in hex notation
+   4..5		High byte of the record load address
+   6..7		Low byte of the record load address
+   8..9		Record type, must be "00"
+   10..x	Data bytes in hex notation:
+	x = (number of bytes - 1) * 2 + 11
+   x+1..x+2	Checksum in hex notation
+   x+3..x+4	Carriage return, line feed
+
+   END RECORD
+   Byte 1	Header = colon (:)
+   2..3		The byte count, must be "00"
+   4..7		Transfer-address (usually "0000")
+		the jump-to address, execution start address
+   8..9		Record type, must be "01"
+   10..11	Checksum, in hex notation
+   12..13	Carriage return, line feed
+
+B. INTEL 2
+
+   MCS-86 format, using a 20-bit address for files larger than 64K bytes.
+
+   DATA RECORD
+   Byte 1	Header = colon (:)
+   2..3		The byte count of this record, hex notation
+   4..5		High byte of the record load address
+   6..7		Low byte of the record load address
+   8..9		Record type, must be "00"
+   10..x	The data bytes in hex notation:
+	x = (number of data bytes - 1) * 2 + 11
+   x+1..x+2	Checksum in hex notation
+   x+3..x+4	Carriage return, line feed
+
+   EXTENDED ADDRESS RECORD
+   Byte 1	Header = colon(:)
+   2..3		The byte count, must be "02"
+   4..7		Load address, must be "0000"
+   8..9		Record type, must be "02"
+   10..11	High byte of the offset address
+   12..13	Low byte of the offset address
+   14..15	Checksum in hex notation
+   16..17	Carriage return, line feed
+
+   The checksums are the two's complement of the 8-bit sum
+   without carry of the byte count, offset address, and the
+   record type.
+
+   START ADDRESS RECORD
+   Byte 1	Header = colon (:)
+   2..3		The byte count, must be "04"
+   4..7		Load address, must be "0000"
+   8..9		Record type, must be "03"
+   10..13	8086 CS value
+   14..17	8086 IP value
+   18..19	Checksum in hex notation
+   20..21	Carriage return, line feed
+
+Another document reports these additional types:
+
+   EXTENDED LINEAR ADDRESS RECORD
+   Byte 1	Header = colon (:)
+   2..3		The byte count, must be "02"
+   4..7		Load address, must be "0000"
+   8..9		Record type, must be "04"
+   10..13	Upper 16 bits of address of subsequent records
+   14..15	Checksum in hex notation
+   16..17	Carriage return, line feed
+
+   START LINEAR ADDRESS RECORD
+   Byte 1	Header = colon (:)
+   2..3		The byte count, must be "02"
+   4..7		Load address, must be "0000"
+   8..9		Record type, must be "05"
+   10..13	Upper 16 bits of start address
+   14..15	Checksum in hex notation
+   16..17	Carriage return, line feed
+
+The MRI compiler uses this, which is a repeat of type 5:
+
+  EXTENDED START RECORD
+   Byte 1	Header = colon (:)
+   2..3		The byte count, must be "04"
+   4..7		Load address, must be "0000"
+   8..9		Record type, must be "05"
+   10..13	Upper 16 bits of start address
+   14..17	Lower 16 bits of start address
+   18..19	Checksum in hex notation
+   20..21	Carriage return, line feed.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libiberty.h"
+#include "safe-ctype.h"
+
+/* The number of bytes we put on one line during output.  */
+
+#define CHUNK 16
+
+/* Macros for converting between hex and binary.  */
+
+#define NIBBLE(x)    (hex_value (x))
+#define HEX2(buffer) ((NIBBLE ((buffer)[0]) << 4) + NIBBLE ((buffer)[1]))
+#define HEX4(buffer) ((HEX2 (buffer) << 8) + HEX2 ((buffer) + 2))
+#define ISHEX(x)     (hex_p (x))
+
+/* When we write out an ihex value, the values can not be output as
+   they are seen.  Instead, we hold them in memory in this structure.  */
+
+struct ihex_data_list
+{
+  struct ihex_data_list *next;
+  bfd_byte *data;
+  bfd_vma where;
+  bfd_size_type size;
+};
+
+/* The ihex tdata information.  */
+
+struct ihex_data_struct
+{
+  struct ihex_data_list *head;
+  struct ihex_data_list *tail;
+};
+
+/* Initialize by filling in the hex conversion array.  */
+
+static void
+ihex_init (void)
+{
+  static bfd_boolean inited;
+
+  if (! inited)
+    {
+      inited = TRUE;
+      hex_init ();
+    }
+}
+
+/* Create an ihex object.  */
+
+static bfd_boolean
+ihex_mkobject (bfd *abfd)
+{
+  struct ihex_data_struct *tdata;
+
+  tdata = (struct ihex_data_struct *) bfd_alloc (abfd, sizeof (* tdata));
+  if (tdata == NULL)
+    return FALSE;
+
+  abfd->tdata.ihex_data = tdata;
+  tdata->head = NULL;
+  tdata->tail = NULL;
+  return TRUE;
+}
+
+/* Read a byte from a BFD.  Set *ERRORPTR if an error occurred.
+   Return EOF on error or end of file.  */
+
+static INLINE int
+ihex_get_byte (bfd *abfd, bfd_boolean *errorptr)
+{
+  bfd_byte c;
+
+  if (bfd_bread (&c, (bfd_size_type) 1, abfd) != 1)
+    {
+      if (bfd_get_error () != bfd_error_file_truncated)
+	*errorptr = TRUE;
+      return EOF;
+    }
+
+  return (int) (c & 0xff);
+}
+
+/* Report a problem in an Intel Hex file.  */
+
+static void
+ihex_bad_byte (bfd *abfd, unsigned int lineno, int c, bfd_boolean error)
+{
+  if (c == EOF)
+    {
+      if (! error)
+	bfd_set_error (bfd_error_file_truncated);
+    }
+  else
+    {
+      char buf[10];
+
+      if (! ISPRINT (c))
+	sprintf (buf, "\\%03o", (unsigned int) c);
+      else
+	{
+	  buf[0] = c;
+	  buf[1] = '\0';
+	}
+      (*_bfd_error_handler)
+	(_("%B:%d: unexpected character `%s' in Intel Hex file"),
+	 abfd, lineno, buf);
+      bfd_set_error (bfd_error_bad_value);
+    }
+}
+
+/* Read an Intel hex file and turn it into sections.  We create a new
+   section for each contiguous set of bytes.  */
+
+static bfd_boolean
+ihex_scan (bfd *abfd)
+{
+  bfd_vma segbase;
+  bfd_vma extbase;
+  asection *sec;
+  unsigned int lineno;
+  bfd_boolean error;
+  bfd_byte *buf = NULL;
+  size_t bufsize;
+  int c;
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    goto error_return;
+
+  abfd->start_address = 0;
+
+  segbase = 0;
+  extbase = 0;
+  sec = NULL;
+  lineno = 1;
+  error = FALSE;
+  bufsize = 0;
+
+  while ((c = ihex_get_byte (abfd, &error)) != EOF)
+    {
+      if (c == '\r')
+	continue;
+      else if (c == '\n')
+	{
+	  ++lineno;
+	  continue;
+	}
+      else if (c != ':')
+	{
+	  ihex_bad_byte (abfd, lineno, c, error);
+	  goto error_return;
+	}
+      else
+	{
+	  file_ptr pos;
+	  char hdr[8];
+	  unsigned int i;
+	  unsigned int len;
+	  bfd_vma addr;
+	  unsigned int type;
+	  unsigned int chars;
+	  unsigned int chksum;
+
+	  /* This is a data record.  */
+	  pos = bfd_tell (abfd) - 1;
+
+	  /* Read the header bytes.  */
+	  if (bfd_bread (hdr, (bfd_size_type) 8, abfd) != 8)
+	    goto error_return;
+
+	  for (i = 0; i < 8; i++)
+	    {
+	      if (! ISHEX (hdr[i]))
+		{
+		  ihex_bad_byte (abfd, lineno, hdr[i], error);
+		  goto error_return;
+		}
+	    }
+
+	  len = HEX2 (hdr);
+	  addr = HEX4 (hdr + 2);
+	  type = HEX2 (hdr + 6);
+
+	  /* Read the data bytes.  */
+	  chars = len * 2 + 2;
+	  if (chars >= bufsize)
+	    {
+	      buf = (bfd_byte *) bfd_realloc (buf, (bfd_size_type) chars);
+	      if (buf == NULL)
+		goto error_return;
+	      bufsize = chars;
+	    }
+
+	  if (bfd_bread (buf, (bfd_size_type) chars, abfd) != chars)
+	    goto error_return;
+
+	  for (i = 0; i < chars; i++)
+	    {
+	      if (! ISHEX (buf[i]))
+		{
+		  ihex_bad_byte (abfd, lineno, hdr[i], error);
+		  goto error_return;
+		}
+	    }
+
+	  /* Check the checksum.  */
+	  chksum = len + addr + (addr >> 8) + type;
+	  for (i = 0; i < len; i++)
+	    chksum += HEX2 (buf + 2 * i);
+	  if (((- chksum) & 0xff) != (unsigned int) HEX2 (buf + 2 * i))
+	    {
+	      (*_bfd_error_handler)
+		(_("%B:%u: bad checksum in Intel Hex file (expected %u, found %u)"),
+		 abfd, lineno,
+		 (- chksum) & 0xff, (unsigned int) HEX2 (buf + 2 * i));
+	      bfd_set_error (bfd_error_bad_value);
+	      goto error_return;
+	    }
+
+	  switch (type)
+	    {
+	    case 0:
+	      /* This is a data record.  */
+	      if (sec != NULL
+		  && sec->vma + sec->size == extbase + segbase + addr)
+		{
+		  /* This data goes at the end of the section we are
+                     currently building.  */
+		  sec->size += len;
+		}
+	      else if (len > 0)
+		{
+		  char secbuf[20];
+		  char *secname;
+		  bfd_size_type amt;
+		  flagword flags;
+
+		  sprintf (secbuf, ".sec%d", bfd_count_sections (abfd) + 1);
+		  amt = strlen (secbuf) + 1;
+		  secname = (char *) bfd_alloc (abfd, amt);
+		  if (secname == NULL)
+		    goto error_return;
+		  strcpy (secname, secbuf);
+		  flags = SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC;
+		  sec = bfd_make_section_with_flags (abfd, secname, flags);
+		  if (sec == NULL)
+		    goto error_return;
+		  sec->vma = extbase + segbase + addr;
+		  sec->lma = extbase + segbase + addr;
+		  sec->size = len;
+		  sec->filepos = pos;
+		}
+	      break;
+
+	    case 1:
+	      /* An end record.  */
+	      if (abfd->start_address == 0)
+		abfd->start_address = addr;
+	      if (buf != NULL)
+		free (buf);
+	      return TRUE;
+
+	    case 2:
+	      /* An extended address record.  */
+	      if (len != 2)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B:%u: bad extended address record length in Intel Hex file"),
+		     abfd, lineno);
+		  bfd_set_error (bfd_error_bad_value);
+		  goto error_return;
+		}
+
+	      segbase = HEX4 (buf) << 4;
+
+	      sec = NULL;
+
+	      break;
+
+	    case 3:
+	      /* An extended start address record.  */
+	      if (len != 4)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B:%u: bad extended start address length in Intel Hex file"),
+		     abfd, lineno);
+		  bfd_set_error (bfd_error_bad_value);
+		  goto error_return;
+		}
+
+	      abfd->start_address += (HEX4 (buf) << 4) + HEX4 (buf + 4);
+
+	      sec = NULL;
+
+	      break;
+
+	    case 4:
+	      /* An extended linear address record.  */
+	      if (len != 2)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B:%u: bad extended linear address record length in Intel Hex file"),
+		     abfd, lineno);
+		  bfd_set_error (bfd_error_bad_value);
+		  goto error_return;
+		}
+
+	      extbase = HEX4 (buf) << 16;
+
+	      sec = NULL;
+
+	      break;
+
+	    case 5:
+	      /* An extended linear start address record.  */
+	      if (len != 2 && len != 4)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B:%u: bad extended linear start address length in Intel Hex file"),
+		     abfd, lineno);
+		  bfd_set_error (bfd_error_bad_value);
+		  goto error_return;
+		}
+
+	      if (len == 2)
+		abfd->start_address += HEX4 (buf) << 16;
+	      else
+		abfd->start_address = (HEX4 (buf) << 16) + HEX4 (buf + 4);
+
+	      sec = NULL;
+
+	      break;
+
+	    default:
+	      (*_bfd_error_handler)
+		(_("%B:%u: unrecognized ihex type %u in Intel Hex file"),
+		 abfd, lineno, type);
+	      bfd_set_error (bfd_error_bad_value);
+	      goto error_return;
+	    }
+	}
+    }
+
+  if (error)
+    goto error_return;
+
+  if (buf != NULL)
+    free (buf);
+
+  return TRUE;
+
+ error_return:
+  if (buf != NULL)
+    free (buf);
+  return FALSE;
+}
+
+/* Try to recognize an Intel Hex file.  */
+
+static const bfd_target *
+ihex_object_p (bfd *abfd)
+{
+  void * tdata_save;
+  bfd_byte b[9];
+  unsigned int i;
+  unsigned int type;
+
+  ihex_init ();
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    return NULL;
+  if (bfd_bread (b, (bfd_size_type) 9, abfd) != 9)
+    {
+      if (bfd_get_error () == bfd_error_file_truncated)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  if (b[0] != ':')
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  for (i = 1; i < 9; i++)
+    {
+      if (! ISHEX (b[i]))
+	{
+	  bfd_set_error (bfd_error_wrong_format);
+	  return NULL;
+	}
+    }
+
+  type = HEX2 (b + 7);
+  if (type > 5)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  /* OK, it looks like it really is an Intel Hex file.  */
+  tdata_save = abfd->tdata.any;
+  if (! ihex_mkobject (abfd) || ! ihex_scan (abfd))
+    {
+      if (abfd->tdata.any != tdata_save && abfd->tdata.any != NULL)
+	bfd_release (abfd, abfd->tdata.any);
+      abfd->tdata.any = tdata_save;
+      return NULL;
+    }
+
+  return abfd->xvec;
+}
+
+/* Read the contents of a section in an Intel Hex file.  */
+
+static bfd_boolean
+ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents)
+{
+  int c;
+  bfd_byte *p;
+  bfd_byte *buf = NULL;
+  size_t bufsize;
+  bfd_boolean error;
+
+  if (bfd_seek (abfd, section->filepos, SEEK_SET) != 0)
+    goto error_return;
+
+  p = contents;
+  bufsize = 0;
+  error = FALSE;
+  while ((c = ihex_get_byte (abfd, &error)) != EOF)
+    {
+      char hdr[8];
+      unsigned int len;
+      unsigned int type;
+      unsigned int i;
+
+      if (c == '\r' || c == '\n')
+	continue;
+
+      /* This is called after ihex_scan has succeeded, so we ought to
+         know the exact format.  */
+      BFD_ASSERT (c == ':');
+
+      if (bfd_bread (hdr, (bfd_size_type) 8, abfd) != 8)
+	goto error_return;
+
+      len = HEX2 (hdr);
+      type = HEX2 (hdr + 6);
+
+      /* We should only see type 0 records here.  */
+      if (type != 0)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B: internal error in ihex_read_section"), abfd);
+	  bfd_set_error (bfd_error_bad_value);
+	  goto error_return;
+	}
+
+      if (len * 2 > bufsize)
+	{
+	  buf = (bfd_byte *) bfd_realloc (buf, (bfd_size_type) len * 2);
+	  if (buf == NULL)
+	    goto error_return;
+	  bufsize = len * 2;
+	}
+
+      if (bfd_bread (buf, (bfd_size_type) len * 2, abfd) != len * 2)
+	goto error_return;
+
+      for (i = 0; i < len; i++)
+	*p++ = HEX2 (buf + 2 * i);
+      if ((bfd_size_type) (p - contents) >= section->size)
+	{
+	  /* We've read everything in the section.  */
+	  if (buf != NULL)
+	    free (buf);
+	  return TRUE;
+	}
+
+      /* Skip the checksum.  */
+      if (bfd_bread (buf, (bfd_size_type) 2, abfd) != 2)
+	goto error_return;
+    }
+
+  if ((bfd_size_type) (p - contents) < section->size)
+    {
+      (*_bfd_error_handler)
+	(_("%B: bad section length in ihex_read_section"), abfd);
+      bfd_set_error (bfd_error_bad_value);
+      goto error_return;
+    }
+
+  if (buf != NULL)
+    free (buf);
+
+  return TRUE;
+
+ error_return:
+  if (buf != NULL)
+    free (buf);
+  return FALSE;
+}
+
+/* Get the contents of a section in an Intel Hex file.  */
+
+static bfd_boolean
+ihex_get_section_contents (bfd *abfd,
+			   asection *section,
+			   void * location,
+			   file_ptr offset,
+			   bfd_size_type count)
+{
+  if (section->used_by_bfd == NULL)
+    {
+      section->used_by_bfd = bfd_alloc (abfd, section->size);
+      if (section->used_by_bfd == NULL)
+	return FALSE;
+      if (! ihex_read_section (abfd, section,
+                               (bfd_byte *) section->used_by_bfd))
+	return FALSE;
+    }
+
+  memcpy (location, (bfd_byte *) section->used_by_bfd + offset,
+	  (size_t) count);
+
+  return TRUE;
+}
+
+/* Set the contents of a section in an Intel Hex file.  */
+
+static bfd_boolean
+ihex_set_section_contents (bfd *abfd,
+			   asection *section,
+			   const void * location,
+			   file_ptr offset,
+			   bfd_size_type count)
+{
+  struct ihex_data_list *n;
+  bfd_byte *data;
+  struct ihex_data_struct *tdata;
+
+  if (count == 0
+      || (section->flags & SEC_ALLOC) == 0
+      || (section->flags & SEC_LOAD) == 0)
+    return TRUE;
+
+  n = (struct ihex_data_list *) bfd_alloc (abfd, sizeof (* n));
+  if (n == NULL)
+    return FALSE;
+
+  data = (bfd_byte *) bfd_alloc (abfd, count);
+  if (data == NULL)
+    return FALSE;
+  memcpy (data, location, (size_t) count);
+
+  n->data = data;
+  n->where = section->lma + offset;
+  n->size = count;
+
+  /* Sort the records by address.  Optimize for the common case of
+     adding a record to the end of the list.  */
+  tdata = abfd->tdata.ihex_data;
+  if (tdata->tail != NULL
+      && n->where >= tdata->tail->where)
+    {
+      tdata->tail->next = n;
+      n->next = NULL;
+      tdata->tail = n;
+    }
+  else
+    {
+      struct ihex_data_list **pp;
+
+      for (pp = &tdata->head;
+	   *pp != NULL && (*pp)->where < n->where;
+	   pp = &(*pp)->next)
+	;
+      n->next = *pp;
+      *pp = n;
+      if (n->next == NULL)
+	tdata->tail = n;
+    }
+
+  return TRUE;
+}
+
+/* Write a record out to an Intel Hex file.  */
+
+static bfd_boolean
+ihex_write_record (bfd *abfd,
+		   size_t count,
+		   unsigned int addr,
+		   unsigned int type,
+		   bfd_byte *data)
+{
+  static const char digs[] = "0123456789ABCDEF";
+  char buf[9 + CHUNK * 2 + 4];
+  char *p;
+  unsigned int chksum;
+  unsigned int i;
+  size_t total;
+
+#define TOHEX(buf, v) \
+  ((buf)[0] = digs[((v) >> 4) & 0xf], (buf)[1] = digs[(v) & 0xf])
+
+  buf[0] = ':';
+  TOHEX (buf + 1, count);
+  TOHEX (buf + 3, (addr >> 8) & 0xff);
+  TOHEX (buf + 5, addr & 0xff);
+  TOHEX (buf + 7, type);
+
+  chksum = count + addr + (addr >> 8) + type;
+
+  for (i = 0, p = buf + 9; i < count; i++, p += 2, data++)
+    {
+      TOHEX (p, *data);
+      chksum += *data;
+    }
+
+  TOHEX (p, (- chksum) & 0xff);
+  p[2] = '\r';
+  p[3] = '\n';
+
+  total = 9 + count * 2 + 4;
+  if (bfd_bwrite (buf, (bfd_size_type) total, abfd) != total)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Write out an Intel Hex file.  */
+
+static bfd_boolean
+ihex_write_object_contents (bfd *abfd)
+{
+  bfd_vma segbase;
+  bfd_vma extbase;
+  struct ihex_data_list *l;
+
+  segbase = 0;
+  extbase = 0;
+  for (l = abfd->tdata.ihex_data->head; l != NULL; l = l->next)
+    {
+      bfd_vma where;
+      bfd_byte *p;
+      bfd_size_type count;
+
+      where = l->where;
+      p = l->data;
+      count = l->size;
+
+      while (count > 0)
+	{
+	  size_t now;
+	  unsigned int rec_addr;
+
+	  now = count;
+	  if (count > CHUNK)
+	    now = CHUNK;
+
+	  if (where > segbase + extbase + 0xffff)
+	    {
+	      bfd_byte addr[2];
+
+	      /* We need a new base address.  */
+	      if (where <= 0xfffff)
+		{
+		  /* The addresses should be sorted.  */
+		  BFD_ASSERT (extbase == 0);
+
+		  segbase = where & 0xf0000;
+		  addr[0] = (bfd_byte)(segbase >> 12) & 0xff;
+		  addr[1] = (bfd_byte)(segbase >> 4) & 0xff;
+		  if (! ihex_write_record (abfd, 2, 0, 2, addr))
+		    return FALSE;
+		}
+	      else
+		{
+		  /* The extended address record and the extended
+                     linear address record are combined, at least by
+                     some readers.  We need an extended linear address
+                     record here, so if we've already written out an
+                     extended address record, zero it out to avoid
+                     confusion.  */
+		  if (segbase != 0)
+		    {
+		      addr[0] = 0;
+		      addr[1] = 0;
+		      if (! ihex_write_record (abfd, 2, 0, 2, addr))
+			return FALSE;
+		      segbase = 0;
+		    }
+
+		  extbase = where & 0xffff0000;
+		  if (where > extbase + 0xffff)
+		    {
+		      char buf[20];
+
+		      sprintf_vma (buf, where);
+		      (*_bfd_error_handler)
+			(_("%s: address 0x%s out of range for Intel Hex file"),
+			 bfd_get_filename (abfd), buf);
+		      bfd_set_error (bfd_error_bad_value);
+		      return FALSE;
+		    }
+		  addr[0] = (bfd_byte)(extbase >> 24) & 0xff;
+		  addr[1] = (bfd_byte)(extbase >> 16) & 0xff;
+		  if (! ihex_write_record (abfd, 2, 0, 4, addr))
+		    return FALSE;
+		}
+	    }
+
+	  rec_addr = where - (extbase + segbase);
+
+          /* Output records shouldn't cross 64K boundaries.  */
+          if (rec_addr + now > 0xffff)
+            now = 0x10000 - rec_addr;
+
+	  if (! ihex_write_record (abfd, now, rec_addr, 0, p))
+	    return FALSE;
+
+	  where += now;
+	  p += now;
+	  count -= now;
+	}
+    }
+
+  if (abfd->start_address != 0)
+    {
+      bfd_vma start;
+      bfd_byte startbuf[4];
+
+      start = abfd->start_address;
+
+      if (start <= 0xfffff)
+	{
+	  startbuf[0] = (bfd_byte)((start & 0xf0000) >> 12) & 0xff;
+	  startbuf[1] = 0;
+	  startbuf[2] = (bfd_byte)(start >> 8) & 0xff;
+	  startbuf[3] = (bfd_byte)start & 0xff;
+	  if (! ihex_write_record (abfd, 4, 0, 3, startbuf))
+	    return FALSE;
+	}
+      else
+	{
+	  startbuf[0] = (bfd_byte)(start >> 24) & 0xff;
+	  startbuf[1] = (bfd_byte)(start >> 16) & 0xff;
+	  startbuf[2] = (bfd_byte)(start >> 8) & 0xff;
+	  startbuf[3] = (bfd_byte)start & 0xff;
+	  if (! ihex_write_record (abfd, 4, 0, 5, startbuf))
+	    return FALSE;
+	}
+    }
+
+  if (! ihex_write_record (abfd, 0, 0, 1, NULL))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Set the architecture for the output file.  The architecture is
+   irrelevant, so we ignore errors about unknown architectures.  */
+
+static bfd_boolean
+ihex_set_arch_mach (bfd *abfd,
+		    enum bfd_architecture arch,
+		    unsigned long mach)
+{
+  if (! bfd_default_set_arch_mach (abfd, arch, mach))
+    {
+      if (arch != bfd_arch_unknown)
+	return FALSE;
+    }
+  return TRUE;
+}
+
+/* Get the size of the headers, for the linker.  */
+
+static int
+ihex_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+		     struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+/* Some random definitions for the target vector.  */
+
+#define	ihex_close_and_cleanup                    _bfd_generic_close_and_cleanup
+#define ihex_bfd_free_cached_info                 _bfd_generic_bfd_free_cached_info
+#define ihex_new_section_hook                     _bfd_generic_new_section_hook
+#define ihex_get_section_contents_in_window       _bfd_generic_get_section_contents_in_window
+#define ihex_get_symtab_upper_bound               bfd_0l
+#define ihex_canonicalize_symtab                  ((long (*) (bfd *, asymbol **)) bfd_0l)
+#define ihex_make_empty_symbol                    _bfd_generic_make_empty_symbol
+#define ihex_print_symbol                         _bfd_nosymbols_print_symbol
+#define ihex_get_symbol_info                      _bfd_nosymbols_get_symbol_info
+#define ihex_bfd_is_target_special_symbol         ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define ihex_bfd_is_local_label_name              _bfd_nosymbols_bfd_is_local_label_name
+#define ihex_get_lineno                           _bfd_nosymbols_get_lineno
+#define ihex_find_nearest_line                    _bfd_nosymbols_find_nearest_line
+#define ihex_find_inliner_info                    _bfd_nosymbols_find_inliner_info
+#define ihex_bfd_make_debug_symbol                _bfd_nosymbols_bfd_make_debug_symbol
+#define ihex_read_minisymbols                     _bfd_nosymbols_read_minisymbols
+#define ihex_minisymbol_to_symbol                 _bfd_nosymbols_minisymbol_to_symbol
+#define ihex_bfd_get_relocated_section_contents   bfd_generic_get_relocated_section_contents
+#define ihex_bfd_relax_section                    bfd_generic_relax_section
+#define ihex_bfd_gc_sections                      bfd_generic_gc_sections
+#define ihex_bfd_lookup_section_flags             bfd_generic_lookup_section_flags
+#define ihex_bfd_merge_sections                   bfd_generic_merge_sections
+#define ihex_bfd_is_group_section                 bfd_generic_is_group_section
+#define ihex_bfd_discard_group                    bfd_generic_discard_group
+#define ihex_section_already_linked               _bfd_generic_section_already_linked
+#define ihex_bfd_define_common_symbol             bfd_generic_define_common_symbol
+#define ihex_bfd_link_hash_table_create           _bfd_generic_link_hash_table_create
+#define ihex_bfd_link_hash_table_free             _bfd_generic_link_hash_table_free
+#define ihex_bfd_link_add_symbols                 _bfd_generic_link_add_symbols
+#define ihex_bfd_link_just_syms                   _bfd_generic_link_just_syms
+#define ihex_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define ihex_bfd_final_link                       _bfd_generic_final_link
+#define ihex_bfd_link_split_section               _bfd_generic_link_split_section
+
+/* The Intel Hex target vector.  */
+
+const bfd_target ihex_vec =
+{
+  "ihex",			/* Name.  */
+  bfd_target_ihex_flavour,
+  BFD_ENDIAN_UNKNOWN,		/* Target byte order.  */
+  BFD_ENDIAN_UNKNOWN,		/* Target headers byte order.  */
+  0,				/* Object flags.  */
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD),	/* Section flags.  */
+  0,				/* Leading underscore.  */
+  ' ',				/* AR_pad_char.  */
+  16,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Data.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Headers. */
+
+  {
+    _bfd_dummy_target,
+    ihex_object_p,		/* bfd_check_format.  */
+    _bfd_dummy_target,
+    _bfd_dummy_target,
+  },
+  {
+    bfd_false,
+    ihex_mkobject,
+    _bfd_generic_mkarchive,
+    bfd_false,
+  },
+  {				/* bfd_write_contents.  */
+    bfd_false,
+    ihex_write_object_contents,
+    _bfd_write_archive_contents,
+    bfd_false,
+  },
+
+  BFD_JUMP_TABLE_GENERIC (ihex),
+  BFD_JUMP_TABLE_COPY (_bfd_generic),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+  BFD_JUMP_TABLE_SYMBOLS (ihex),
+  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+  BFD_JUMP_TABLE_WRITE (ihex),
+  BFD_JUMP_TABLE_LINK (ihex),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  NULL
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/init.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/init.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/init.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/init.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,55 @@
+/* bfd initialization stuff
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 2003, 2005, 2007
+   Free Software Foundation, Inc.
+   Written by Steve Chamberlain of Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+/*
+SECTION
+	Initialization
+
+SUBSECTION
+	Initialization functions
+
+	These are the functions that handle initializing a BFD.
+*/
+
+/*
+FUNCTION
+	bfd_init
+
+SYNOPSIS
+	void bfd_init (void);
+
+DESCRIPTION
+	This routine must be called before any other BFD function to
+	initialize magical internal data structures.
+*/
+
+/* Actually, there is currently nothing for this function to do.
+   However, someday it may be needed, so keep it around.  */
+
+void
+bfd_init (void)
+{
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/irix-core.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/irix-core.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/irix-core.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/irix-core.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,334 @@
+/* BFD back-end for Irix core files.
+   Copyright 1993, 1994, 1996, 1999, 2001, 2002, 2004, 2005, 2006, 2007,
+   2010, 2011 Free Software Foundation, Inc.
+   Written by Stu Grossman, Cygnus Support.
+   Converted to back-end form by Ian Lance Taylor, Cygnus Support
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* This file can only be compiled on systems which use Irix style core
+   files (namely, Irix 4 and Irix 5, so far).  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#ifdef IRIX_CORE
+
+#include <core.out.h>
+
+struct sgi_core_struct
+{
+  int sig;
+  char cmd[CORE_NAMESIZE];
+};
+
+#define core_hdr(bfd) ((bfd)->tdata.sgi_core_data)
+#define core_signal(bfd) (core_hdr(bfd)->sig)
+#define core_command(bfd) (core_hdr(bfd)->cmd)
+
+#define irix_core_core_file_matches_executable_p generic_core_file_matches_executable_p
+#define irix_core_core_file_pid _bfd_nocore_core_file_pid
+
+static asection *make_bfd_asection
+  (bfd *, const char *, flagword, bfd_size_type, bfd_vma, file_ptr);
+
+/* Helper function for irix_core_core_file_p:
+   32-bit and 64-bit versions.  */
+
+#ifdef CORE_MAGIC64
+static int
+do_sections64 (bfd *abfd, struct coreout *coreout)
+{
+  struct vmap64 vmap;
+  char *secname;
+  int i, val;
+
+  for (i = 0; i < coreout->c_nvmap; i++)
+    {
+      val = bfd_bread ((PTR) &vmap, (bfd_size_type) sizeof vmap, abfd);
+      if (val != sizeof vmap)
+	break;
+
+      switch (vmap.v_type)
+	{
+	case VDATA:
+	  secname = ".data";
+	  break;
+	case VSTACK:
+	  secname = ".stack";
+	  break;
+#ifdef VMAPFILE
+	case VMAPFILE:
+	  secname = ".mapfile";
+	  break;
+#endif
+	default:
+	  continue;
+	}
+
+      /* A file offset of zero means that the
+	 section is not contained in the corefile.  */
+      if (vmap.v_offset == 0)
+	continue;
+
+      if (!make_bfd_asection (abfd, secname,
+			      SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
+			      vmap.v_len, vmap.v_vaddr, vmap.v_offset))
+	/* Fail.  */
+	return 0;
+    }
+
+  return 1;
+}
+#endif
+
+/* 32-bit version.  */
+
+static int
+do_sections (bfd *abfd, struct coreout *coreout)
+{
+  struct vmap vmap;
+  char *secname;
+  int i, val;
+
+  for (i = 0; i < coreout->c_nvmap; i++)
+    {
+      val = bfd_bread ((PTR) &vmap, (bfd_size_type) sizeof vmap, abfd);
+      if (val != sizeof vmap)
+	break;
+
+      switch (vmap.v_type)
+	{
+	case VDATA:
+	  secname = ".data";
+	  break;
+	case VSTACK:
+	  secname = ".stack";
+	  break;
+#ifdef VMAPFILE
+	case VMAPFILE:
+	  secname = ".mapfile";
+	  break;
+#endif
+	default:
+	  continue;
+	}
+
+      /* A file offset of zero means that the
+	 section is not contained in the corefile.  */
+      if (vmap.v_offset == 0)
+	continue;
+
+      if (!make_bfd_asection (abfd, secname,
+			      SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
+			      vmap.v_len, vmap.v_vaddr, vmap.v_offset))
+	/* Fail.  */
+	return 0;
+    }
+  return 1;
+}
+
+static asection *
+make_bfd_asection (bfd *abfd,
+                   const char *name,
+                   flagword flags,
+                   bfd_size_type size,
+                   bfd_vma vma,
+                   file_ptr filepos)
+{
+  asection *asect;
+
+  asect = bfd_make_section_anyway_with_flags (abfd, name, flags);
+  if (!asect)
+    return NULL;
+
+  asect->size = size;
+  asect->vma = vma;
+  asect->filepos = filepos;
+  asect->alignment_power = 4;
+
+  return asect;
+}
+
+static const bfd_target *
+irix_core_core_file_p (bfd *abfd)
+{
+  int val;
+  struct coreout coreout;
+  struct idesc *idg, *idf, *ids;
+  bfd_size_type amt;
+
+  val = bfd_bread ((PTR) &coreout, (bfd_size_type) sizeof coreout, abfd);
+  if (val != sizeof coreout)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return 0;
+    }
+
+  if (coreout.c_version != CORE_VERSION1)
+    return 0;
+
+  /* Have we got a corefile?  */
+  switch (coreout.c_magic)
+    {
+    case CORE_MAGIC:	break;
+#ifdef CORE_MAGIC64
+    case CORE_MAGIC64:	break;
+#endif
+#ifdef CORE_MAGICN32
+    case CORE_MAGICN32:	break;
+#endif
+    default:		return 0;	/* Un-identifiable or not corefile.  */
+    }
+
+  amt = sizeof (struct sgi_core_struct);
+  core_hdr (abfd) = (struct sgi_core_struct *) bfd_zalloc (abfd, amt);
+  if (!core_hdr (abfd))
+    return NULL;
+
+  strncpy (core_command (abfd), coreout.c_name, CORE_NAMESIZE);
+  core_signal (abfd) = coreout.c_sigcause;
+
+  if (bfd_seek (abfd, coreout.c_vmapoffset, SEEK_SET) != 0)
+    goto fail;
+
+  /* Process corefile sections.  */
+#ifdef CORE_MAGIC64
+  if (coreout.c_magic == (int) CORE_MAGIC64)
+    {
+      if (! do_sections64 (abfd, & coreout))
+	goto fail;
+    }
+  else
+#endif
+    if (! do_sections (abfd, & coreout))
+      goto fail;
+
+  /* Make sure that the regs are contiguous within the core file.  */
+
+  idg = &coreout.c_idesc[I_GPREGS];
+  idf = &coreout.c_idesc[I_FPREGS];
+  ids = &coreout.c_idesc[I_SPECREGS];
+
+  if (idg->i_offset + idg->i_len != idf->i_offset
+      || idf->i_offset + idf->i_len != ids->i_offset)
+    goto fail;			/* Can't deal with non-contig regs */
+
+  if (bfd_seek (abfd, idg->i_offset, SEEK_SET) != 0)
+    goto fail;
+
+  if (!make_bfd_asection (abfd, ".reg",
+			  SEC_HAS_CONTENTS,
+			  idg->i_len + idf->i_len + ids->i_len,
+			  0,
+			  idg->i_offset))
+    goto fail;
+
+  /* OK, we believe you.  You're a core file (sure, sure).  */
+  bfd_default_set_arch_mach (abfd, bfd_arch_mips, 0);
+
+  return abfd->xvec;
+
+ fail:
+  bfd_release (abfd, core_hdr (abfd));
+  core_hdr (abfd) = NULL;
+  bfd_section_list_clear (abfd);
+  return NULL;
+}
+
+static char *
+irix_core_core_file_failing_command (bfd *abfd)
+{
+  return core_command (abfd);
+}
+
+static int
+irix_core_core_file_failing_signal (bfd *abfd)
+{
+  return core_signal (abfd);
+}
+
+/* If somebody calls any byte-swapping routines, shoot them.  */
+static void
+swap_abort(void)
+{
+  abort(); /* This way doesn't require any declaration for ANSI to fuck up */
+}
+
+#define	NO_GET ((bfd_vma (*) (const void *)) swap_abort)
+#define	NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
+#define	NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
+#define	NO_GET64 ((bfd_uint64_t (*) (const void *)) swap_abort)
+#define	NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
+#define	NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
+
+const bfd_target irix_core_vec =
+  {
+    "irix-core",
+    bfd_target_unknown_flavour,
+    BFD_ENDIAN_BIG,		/* target byte order */
+    BFD_ENDIAN_BIG,		/* target headers byte order */
+    (HAS_RELOC | EXEC_P |	/* object flags */
+     HAS_LINENO | HAS_DEBUG |
+     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+    0,			                                   /* symbol prefix */
+    ' ',						   /* ar_pad_char */
+    16,							   /* ar_max_namelen */
+    0,							   /* match_priority */
+    NO_GET64, NO_GETS64, NO_PUT64,	/* 64 bit data */
+    NO_GET, NO_GETS, NO_PUT,		/* 32 bit data */
+    NO_GET, NO_GETS, NO_PUT,		/* 16 bit data */
+    NO_GET64, NO_GETS64, NO_PUT64,	/* 64 bit hdrs */
+    NO_GET, NO_GETS, NO_PUT,		/* 32 bit hdrs */
+    NO_GET, NO_GETS, NO_PUT,		/* 16 bit hdrs */
+
+    {				/* bfd_check_format */
+      _bfd_dummy_target,		/* unknown format */
+      _bfd_dummy_target,		/* object file */
+      _bfd_dummy_target,		/* archive */
+      irix_core_core_file_p		/* a core file */
+    },
+    {				/* bfd_set_format */
+      bfd_false, bfd_false,
+      bfd_false, bfd_false
+    },
+    {				/* bfd_write_contents */
+      bfd_false, bfd_false,
+      bfd_false, bfd_false
+    },
+
+    BFD_JUMP_TABLE_GENERIC (_bfd_generic),
+    BFD_JUMP_TABLE_COPY (_bfd_generic),
+    BFD_JUMP_TABLE_CORE (irix_core),
+    BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+    BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
+    BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+    BFD_JUMP_TABLE_WRITE (_bfd_generic),
+    BFD_JUMP_TABLE_LINK (_bfd_nolink),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    NULL,
+
+    (PTR) 0			/* backend_data */
+  };
+
+#endif /* IRIX_CORE */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libaout.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libaout.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libaout.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libaout.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,691 @@
+/* BFD back-end data structures for a.out (and similar) files.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef LIBAOUT_H
+#define LIBAOUT_H
+
+/* We try to encapsulate the differences in the various a.out file
+   variants in a few routines, and otherwise share large masses of code.
+   This means we only have to fix bugs in one place, most of the time.  */
+
+#include "bfdlink.h"
+
+/* Macros for accessing components in an aout header.  */
+
+#define H_PUT_64  bfd_h_put_64
+#define H_PUT_32  bfd_h_put_32
+#define H_PUT_16  bfd_h_put_16
+#define H_PUT_8   bfd_h_put_8
+#define H_PUT_S64 bfd_h_put_signed_64
+#define H_PUT_S32 bfd_h_put_signed_32
+#define H_PUT_S16 bfd_h_put_signed_16
+#define H_PUT_S8  bfd_h_put_signed_8
+#define H_GET_64  bfd_h_get_64
+#define H_GET_32  bfd_h_get_32
+#define H_GET_16  bfd_h_get_16
+#define H_GET_8   bfd_h_get_8
+#define H_GET_S64 bfd_h_get_signed_64
+#define H_GET_S32 bfd_h_get_signed_32
+#define H_GET_S16 bfd_h_get_signed_16
+#define H_GET_S8  bfd_h_get_signed_8
+
+/* Parameterize the a.out code based on whether it is being built
+   for a 32-bit architecture or a 64-bit architecture.  */
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#if ARCH_SIZE==64
+#define GET_WORD  H_GET_64
+#define GET_SWORD H_GET_S64
+#define GET_MAGIC H_GET_32
+#define PUT_WORD  H_PUT_64
+#define PUT_MAGIC H_PUT_32
+#ifndef NAME
+#define NAME(x,y) CONCAT3 (x,_64_,y)
+#endif
+#define JNAME(x) CONCAT2 (x,_64)
+#define BYTES_IN_WORD 8
+#else
+#if ARCH_SIZE==16
+#define GET_WORD  H_GET_16
+#define GET_SWORD H_GET_S16
+#define GET_MAGIC H_GET_16
+#define PUT_WORD  H_PUT_16
+#define PUT_MAGIC H_PUT_16
+#ifndef NAME
+#define NAME(x,y) CONCAT3 (x,_16_,y)
+#endif
+#define JNAME(x) CONCAT2 (x,_16)
+#define BYTES_IN_WORD 2
+#else /* ARCH_SIZE == 32 */
+#define GET_WORD  H_GET_32
+#define GET_SWORD H_GET_S32
+#define GET_MAGIC H_GET_32
+#define PUT_WORD  H_PUT_32
+#define PUT_MAGIC H_PUT_32
+#ifndef NAME
+#define NAME(x,y) CONCAT3 (x,_32_,y)
+#endif
+#define JNAME(x) CONCAT2 (x,_32)
+#define BYTES_IN_WORD 4
+#endif /* ARCH_SIZE==32 */
+#endif /* ARCH_SIZE==64 */
+
+/* Declare at file level, since used in parameter lists, which have
+   weird scope.  */
+struct external_exec;
+struct external_nlist;
+struct reloc_ext_external;
+struct reloc_std_external;
+
+/* a.out backend linker hash table entries.  */
+
+struct aout_link_hash_entry
+{
+  struct bfd_link_hash_entry root;
+  /* Whether this symbol has been written out.  */
+  bfd_boolean written;
+  /* Symbol index in output file.  */
+  int indx;
+};
+
+/* a.out backend linker hash table.  */
+
+struct aout_link_hash_table
+{
+  struct bfd_link_hash_table root;
+};
+
+/* Look up an entry in an a.out link hash table.  */
+
+#define aout_link_hash_lookup(table, string, create, copy, follow) \
+  ((struct aout_link_hash_entry *) \
+   bfd_link_hash_lookup (&(table)->root, (string), (create), (copy), (follow)))
+
+/* Traverse an a.out link hash table.  */
+
+#define aout_link_hash_traverse(table, func, info)			\
+  (bfd_link_hash_traverse						\
+   (&(table)->root,							\
+    (bfd_boolean (*) (struct bfd_link_hash_entry *, void *)) (func),	\
+    (info)))
+
+/* Get the a.out link hash table from the info structure.  This is
+   just a cast.  */
+
+#define aout_hash_table(p) ((struct aout_link_hash_table *) ((p)->hash))
+
+/* Back-end information for various a.out targets.  */
+struct aout_backend_data
+{
+  /* Are ZMAGIC files mapped contiguously?  If so, the text section may
+     need more padding, if the segment size (granularity for memory access
+     control) is larger than the page size.  */
+  unsigned char zmagic_mapped_contiguous;
+  /* If this flag is set, ZMAGIC/NMAGIC file headers get mapped in with the
+     text section, which starts immediately after the file header.
+     If not, the text section starts on the next page.  */
+  unsigned char text_includes_header;
+
+  /* If this flag is set, then if the entry address is not in the
+     first SEGMENT_SIZE bytes of the text section, it is taken to be
+     the address of the start of the text section.  This can be useful
+     for kernels.  */
+  unsigned char entry_is_text_address;
+
+  /* The value to pass to N_SET_FLAGS.  */
+  unsigned char exec_hdr_flags;
+
+  /* If the text section VMA isn't specified, and we need an absolute
+     address, use this as the default.  If we're producing a relocatable
+     file, zero is always used.  */
+  /* ?? Perhaps a callback would be a better choice?  Will this do anything
+     reasonable for a format that handles multiple CPUs with different
+     load addresses for each?  */
+  bfd_vma default_text_vma;
+
+  /* Callback for setting the page and segment sizes, if they can't be
+     trivially determined from the architecture.  */
+  bfd_boolean (*set_sizes) (bfd *);
+
+  /* zmagic files only. For go32, the length of the exec header contributes
+     to the size of the text section in the file for alignment purposes but
+     does *not* get counted in the length of the text section. */
+  unsigned char exec_header_not_counted;
+
+  /* Callback from the add symbols phase of the linker code to handle
+     a dynamic object.  */
+  bfd_boolean (*add_dynamic_symbols)
+    (bfd *, struct bfd_link_info *, struct external_nlist **,
+     bfd_size_type *, char **);
+
+  /* Callback from the add symbols phase of the linker code to handle
+     adding a single symbol to the global linker hash table.  */
+  bfd_boolean (*add_one_symbol)
+    (struct bfd_link_info *, bfd *, const char *, flagword,
+     asection *, bfd_vma, const char *, bfd_boolean, bfd_boolean,
+     struct bfd_link_hash_entry **);
+
+  /* Called to handle linking a dynamic object.  */
+  bfd_boolean (*link_dynamic_object)
+    (struct bfd_link_info *, bfd *);
+
+  /* Called for each global symbol being written out by the linker.
+     This should write out the dynamic symbol information.  */
+  bfd_boolean (*write_dynamic_symbol)
+    (bfd *, struct bfd_link_info *, struct aout_link_hash_entry *);
+
+  /* If this callback is not NULL, the linker calls it for each reloc.
+     RELOC is a pointer to the unswapped reloc.  If *SKIP is set to
+     TRUE, the reloc will be skipped.  *RELOCATION may be changed to
+     change the effects of the relocation.  */
+  bfd_boolean (*check_dynamic_reloc)
+    (struct bfd_link_info *info, bfd *input_bfd,
+     asection *input_section, struct aout_link_hash_entry *h,
+     void * reloc, bfd_byte *contents, bfd_boolean *skip,
+     bfd_vma *relocation);
+
+  /* Called at the end of a link to finish up any dynamic linking
+     information.  */
+  bfd_boolean (*finish_dynamic_link) (bfd *, struct bfd_link_info *);
+};
+#define aout_backend_info(abfd) \
+	((const struct aout_backend_data *)((abfd)->xvec->backend_data))
+
+/* This is the layout in memory of a "struct exec" while we process it.
+   All 'lengths' are given as a number of bytes.
+   All 'alignments' are for relinkable files only;  an alignment of
+	'n' indicates the corresponding segment must begin at an
+	address that is a multiple of (2**n).  */
+
+struct internal_exec
+{
+  long a_info;			/* Magic number and flags, packed.  */
+  bfd_vma a_text;		/* Length of text, in bytes.  */
+  bfd_vma a_data;		/* Length of data, in bytes.  */
+  bfd_vma a_bss;		/* Length of uninitialized data area in mem.  */
+  bfd_vma a_syms;		/* Length of symbol table data in file.  */
+  bfd_vma a_entry;		/* Start address.  */
+  bfd_vma a_trsize;		/* Length of text's relocation info, in bytes.  */
+  bfd_vma a_drsize;		/* Length of data's relocation info, in bytes.  */
+  /* Added for i960 */
+  bfd_vma a_tload;		/* Text runtime load address.  */
+  bfd_vma a_dload;		/* Data runtime load address.  */
+  unsigned char a_talign;	/* Alignment of text segment.  */
+  unsigned char a_dalign;	/* Alignment of data segment.  */
+  unsigned char a_balign;	/* Alignment of bss segment.  */
+  char a_relaxable;           	/* Enough info for linker relax.  */
+};
+
+/* Magic number is written
+   < MSB          >
+   3130292827262524232221201918171615141312111009080706050403020100
+   < FLAGS        >< MACHINE TYPE ><  MAGIC NUMBER                >  */
+
+/* Magic number for NetBSD is
+   <MSB           >
+   3130292827262524232221201918171615141312111009080706050403020100
+   < FLAGS    >< MACHINE TYPE     ><  MAGIC NUMBER                >  */
+
+enum machine_type
+{
+  M_UNKNOWN = 0,
+  M_68010 = 1,
+  M_68020 = 2,
+  M_SPARC = 3,
+  /* Skip a bunch so we don't run into any of SUN's numbers.  */
+  /* Make these up for the ns32k.  */
+  M_NS32032 = (64),	  /* NS32032 running ?  */
+  M_NS32532 = (64 + 5),	  /* NS32532 running mach.  */
+  M_386 = 100,
+  M_29K = 101,            /* AMD 29000.  */
+  M_386_DYNIX = 102,	  /* Sequent running dynix.  */
+  M_ARM = 103,		  /* Advanced Risc Machines ARM.  */
+  M_SPARCLET = 131,	  /* SPARClet = M_SPARC + 128.  */
+  M_386_NETBSD = 134,	  /* NetBSD/i386 binary.  */
+  M_68K_NETBSD = 135,	  /* NetBSD/m68k binary.  */
+  M_68K4K_NETBSD = 136,	  /* NetBSD/m68k4k binary.  */
+  M_532_NETBSD = 137,	  /* NetBSD/ns32k binary.  */
+  M_SPARC_NETBSD = 138,	  /* NetBSD/sparc binary.  */
+  M_PMAX_NETBSD = 139,	  /* NetBSD/pmax (MIPS little-endian) binary.  */
+  M_VAX_NETBSD = 140,	  /* NetBSD/vax binary.  */
+  M_ALPHA_NETBSD = 141,	  /* NetBSD/alpha binary.  */
+  M_ARM6_NETBSD = 143,	  /* NetBSD/arm32 binary.  */
+  M_SPARCLET_1 = 147,	  /* 0x93, reserved.  */
+  M_POWERPC_NETBSD = 149, /* NetBSD/powerpc (big-endian) binary.  */
+  M_VAX4K_NETBSD = 150,	  /* NetBSD/vax 4K pages binary.  */
+  M_MIPS1 = 151,          /* MIPS R2000/R3000 binary.  */
+  M_MIPS2 = 152,          /* MIPS R4000/R6000 binary.  */
+  M_88K_OPENBSD = 153,	  /* OpenBSD/m88k binary.  */
+  M_HPPA_OPENBSD = 154,	  /* OpenBSD/hppa binary.  */
+  M_SPARC64_NETBSD = 156, /* NetBSD/sparc64 binary.  */
+  M_X86_64_NETBSD = 157,  /* NetBSD/amd64 binary.  */
+  M_SPARCLET_2 = 163,	  /* 0xa3, reserved.  */
+  M_SPARCLET_3 = 179,	  /* 0xb3, reserved.  */
+  M_SPARCLET_4 = 195,	  /* 0xc3, reserved.  */
+  M_HP200 = 200,	  /* HP 200 (68010) BSD binary.  */
+  M_HP300 = (300 % 256),  /* HP 300 (68020+68881) BSD binary.  */
+  M_HPUX = (0x20c % 256), /* HP 200/300 HPUX binary.  */
+  M_SPARCLET_5 = 211,	  /* 0xd3, reserved.  */
+  M_SPARCLET_6 = 227,	  /* 0xe3, reserved.  */
+/*M_SPARCLET_7 = 243	 / * 0xf3, reserved.  */
+  M_SPARCLITE_LE = 243,
+  M_CRIS = 255		  /* Axis CRIS binary.  */
+};
+
+#define N_DYNAMIC(exec) ((exec).a_info & 0x80000000)
+
+#ifndef N_MAGIC
+# define N_MAGIC(exec) ((exec).a_info & 0xffff)
+#endif
+
+#ifndef N_MACHTYPE
+# define N_MACHTYPE(exec) ((enum machine_type)(((exec).a_info >> 16) & 0xff))
+#endif
+
+#ifndef N_FLAGS
+# define N_FLAGS(exec) (((exec).a_info >> 24) & 0xff)
+#endif
+
+#ifndef N_SET_INFO
+# define N_SET_INFO(exec, magic, type, flags) \
+((exec).a_info = ((magic) & 0xffff) \
+ | (((int)(type) & 0xff) << 16) \
+ | (((flags) & 0xff) << 24))
+#endif
+
+#ifndef N_SET_DYNAMIC
+# define N_SET_DYNAMIC(exec, dynamic) \
+((exec).a_info = (dynamic) ? (long) ((exec).a_info | 0x80000000) : \
+((exec).a_info & 0x7fffffff))
+#endif
+
+#ifndef N_SET_MAGIC
+# define N_SET_MAGIC(exec, magic) \
+((exec).a_info = (((exec).a_info & 0xffff0000) | ((magic) & 0xffff)))
+#endif
+
+#ifndef N_SET_MACHTYPE
+# define N_SET_MACHTYPE(exec, machtype) \
+((exec).a_info = \
+ ((exec).a_info&0xff00ffff) | ((((int)(machtype))&0xff) << 16))
+#endif
+
+#ifndef N_SET_FLAGS
+# define N_SET_FLAGS(exec, flags) \
+((exec).a_info = \
+ ((exec).a_info&0x00ffffff) | (((flags) & 0xff) << 24))
+#endif
+
+typedef struct aout_symbol
+{
+  asymbol symbol;
+  short desc;
+  char other;
+  unsigned char type;
+} aout_symbol_type;
+
+/* The `tdata' struct for all a.out-like object file formats.
+   Various things depend on this struct being around any time an a.out
+   file is being handled.  An example is dbxread.c in GDB.  */
+
+enum aout_subformat {
+  default_format = 0,
+  /* Used on HP 9000/300 running HP/UX.  See hp300hpux.c.  */
+  gnu_encap_format,
+  /* Used on Linux, 386BSD, etc.  See include/aout/aout64.h.  */
+  q_magic_format
+};
+
+enum aout_magic {
+  undecided_magic = 0,
+  z_magic,
+  o_magic,
+  n_magic
+};
+
+struct aoutdata
+{
+  struct internal_exec *hdr;		/* Exec file header.  */
+  aout_symbol_type *symbols;		/* Symtab for input bfd.  */
+
+  /* For ease, we do this.  */
+  asection *textsec;
+  asection *datasec;
+  asection *bsssec;
+
+  /* We remember these offsets so that after check_file_format, we have
+     no dependencies on the particular format of the exec_hdr.  */
+  file_ptr sym_filepos;
+  file_ptr str_filepos;
+
+  /* Size of a relocation entry in external form.  */
+  unsigned reloc_entry_size;
+
+  /* Size of a symbol table entry in external form.  */
+  unsigned symbol_entry_size;
+
+  /* Page size - needed for alignment of demand paged files.  */
+  unsigned long page_size;
+
+  /* Segment size - needed for alignment of demand paged files.  */
+  unsigned long segment_size;
+
+  /* Zmagic disk block size - need to align the start of the text
+     section in ZMAGIC binaries.  Normally the same as page_size.  */
+  unsigned long zmagic_disk_block_size;
+
+  unsigned exec_bytes_size;
+  unsigned vma_adjusted : 1;
+
+  /* Used when a bfd supports several highly similar formats.  */
+  enum aout_subformat subformat;
+
+  enum aout_magic magic;
+
+  /* A buffer for find_nearest_line.  */
+  char *line_buf;
+
+  /* The external symbol information.  */
+  struct external_nlist *external_syms;
+  bfd_size_type external_sym_count;
+  bfd_window sym_window;
+  char *external_strings;
+  bfd_size_type external_string_size;
+  bfd_window string_window;
+  struct aout_link_hash_entry **sym_hashes;
+
+  /* A pointer for shared library information.  */
+  void * dynamic_info;
+
+  /* A mapping from local symbols to offsets into the global offset
+     table, used when linking on SunOS.  This is indexed by the symbol
+     index.  */
+  bfd_vma *local_got_offsets;
+};
+
+struct  aout_data_struct
+{
+  struct aoutdata a;
+  struct internal_exec e;
+};
+
+#define	adata(bfd)		           ((bfd)->tdata.aout_data->a)
+#define	exec_hdr(bfd)		           (adata (bfd).hdr)
+#define	obj_aout_symbols(bfd)	           (adata (bfd).symbols)
+#define	obj_textsec(bfd)	           (adata (bfd).textsec)
+#define	obj_datasec(bfd)	           (adata (bfd).datasec)
+#define	obj_bsssec(bfd)		           (adata (bfd).bsssec)
+#define	obj_sym_filepos(bfd)	           (adata (bfd).sym_filepos)
+#define	obj_str_filepos(bfd)	           (adata (bfd).str_filepos)
+#define	obj_reloc_entry_size(bfd)          (adata (bfd).reloc_entry_size)
+#define	obj_symbol_entry_size(bfd)         (adata (bfd).symbol_entry_size)
+#define obj_aout_subformat(bfd)	           (adata (bfd).subformat)
+#define obj_aout_external_syms(bfd)        (adata (bfd).external_syms)
+#define obj_aout_external_sym_count(bfd)   (adata (bfd).external_sym_count)
+#define obj_aout_sym_window(bfd)           (adata (bfd).sym_window)
+#define obj_aout_external_strings(bfd)     (adata (bfd).external_strings)
+#define obj_aout_external_string_size(bfd) (adata (bfd).external_string_size)
+#define obj_aout_string_window(bfd)        (adata (bfd).string_window)
+#define obj_aout_sym_hashes(bfd)           (adata (bfd).sym_hashes)
+#define obj_aout_dynamic_info(bfd)         (adata (bfd).dynamic_info)
+
+/* We take the address of the first element of an asymbol to ensure that the
+   macro is only ever applied to an asymbol.  */
+#define aout_symbol(asymbol) ((aout_symbol_type *)(&(asymbol)->the_bfd))
+
+/* Information we keep for each a.out section.  This is currently only
+   used by the a.out backend linker.  */
+
+struct aout_section_data_struct
+{
+  /* The unswapped relocation entries for this section.  */
+  void * relocs;
+};
+
+#define aout_section_data(s) \
+  ((struct aout_section_data_struct *) (s)->used_by_bfd)
+
+#define set_aout_section_data(s,v) \
+  ((s)->used_by_bfd = (void *)&(v)->relocs)
+
+/* Prototype declarations for functions defined in aoutx.h.  */
+
+extern bfd_boolean NAME (aout, squirt_out_relocs)
+  (bfd *, asection *);
+
+extern bfd_boolean NAME (aout, make_sections)
+  (bfd *);
+
+extern const bfd_target * NAME (aout, some_aout_object_p)
+  (bfd *, struct internal_exec *, const bfd_target *(*) (bfd *));
+
+extern bfd_boolean NAME (aout, mkobject)
+  (bfd *);
+
+extern enum machine_type NAME (aout, machine_type)
+  (enum bfd_architecture, unsigned long, bfd_boolean *);
+
+extern bfd_boolean NAME (aout, set_arch_mach)
+  (bfd *, enum bfd_architecture, unsigned long);
+
+extern bfd_boolean NAME (aout, new_section_hook)
+  (bfd *, asection *);
+
+extern bfd_boolean NAME (aout, set_section_contents)
+  (bfd *, sec_ptr, const void *, file_ptr, bfd_size_type);
+
+extern asymbol * NAME (aout, make_empty_symbol)
+  (bfd *);
+
+extern bfd_boolean NAME (aout, translate_symbol_table)
+  (bfd *, aout_symbol_type *, struct external_nlist *, bfd_size_type,
+	   char *, bfd_size_type, bfd_boolean);
+
+extern bfd_boolean NAME (aout, slurp_symbol_table)
+  (bfd *);
+
+extern bfd_boolean NAME (aout, write_syms)
+  (bfd *);
+
+extern void NAME (aout, reclaim_symbol_table)
+  (bfd *);
+
+extern long NAME (aout, get_symtab_upper_bound)
+  (bfd *);
+
+extern long NAME (aout, canonicalize_symtab)
+  (bfd *, asymbol **);
+
+extern void NAME (aout, swap_ext_reloc_in)
+  (bfd *, struct reloc_ext_external *, arelent *, asymbol **,
+   bfd_size_type);
+
+extern void NAME (aout, swap_std_reloc_in)
+  (bfd *, struct reloc_std_external *, arelent *, asymbol **,
+   bfd_size_type);
+
+extern reloc_howto_type * NAME (aout, reloc_type_lookup)
+  (bfd *, bfd_reloc_code_real_type);
+
+extern reloc_howto_type * NAME (aout, reloc_name_lookup)
+  (bfd *, const char *);
+
+extern bfd_boolean NAME (aout, slurp_reloc_table)
+  (bfd *, sec_ptr, asymbol **);
+
+extern long NAME (aout, canonicalize_reloc)
+  (bfd *, sec_ptr, arelent **, asymbol **);
+
+extern long NAME (aout, get_reloc_upper_bound)
+  (bfd *, sec_ptr);
+
+extern void NAME (aout, reclaim_reloc)
+  (bfd *, sec_ptr);
+
+extern alent * NAME (aout, get_lineno)
+  (bfd *, asymbol *);
+
+extern void NAME (aout, print_symbol)
+  (bfd *, void *, asymbol *, bfd_print_symbol_type);
+
+extern void NAME (aout, get_symbol_info)
+  (bfd *, asymbol *, symbol_info *);
+
+extern bfd_boolean NAME (aout, find_nearest_line)
+  (bfd *, asection *, asymbol **, bfd_vma, const char **,
+   const char **, unsigned int *);
+
+extern long NAME (aout, read_minisymbols)
+  (bfd *, bfd_boolean, void * *, unsigned int *);
+
+extern asymbol * NAME (aout, minisymbol_to_symbol)
+  (bfd *, bfd_boolean, const void *, asymbol *);
+
+extern int NAME (aout, sizeof_headers)
+  (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean NAME (aout, adjust_sizes_and_vmas)
+  (bfd *, bfd_size_type *, file_ptr *);
+
+extern void NAME (aout, swap_exec_header_in)
+  (bfd *, struct external_exec *, struct internal_exec *);
+
+extern void NAME (aout, swap_exec_header_out)
+  (bfd *, struct internal_exec *, struct external_exec *);
+
+extern struct bfd_hash_entry * NAME (aout, link_hash_newfunc)
+  (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
+
+extern bfd_boolean NAME (aout, link_hash_table_init)
+  (struct aout_link_hash_table *, bfd *,
+   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
+			       struct bfd_hash_table *,
+			       const char *),
+   unsigned int);
+
+extern struct bfd_link_hash_table * NAME (aout, link_hash_table_create)
+  (bfd *);
+
+extern bfd_boolean NAME (aout, link_add_symbols)
+  (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean NAME (aout, final_link)
+  (bfd *, struct bfd_link_info *,
+   void (*) (bfd *, file_ptr *, file_ptr *, file_ptr *));
+
+extern bfd_boolean NAME (aout, bfd_free_cached_info)
+  (bfd *);
+
+#define aout_32_find_inliner_info	_bfd_nosymbols_find_inliner_info
+#if 0	/* Are these needed? */
+#define aout_16_find_inliner_info	_bfd_nosymbols_find_inliner_info
+#define aout_64_find_inliner_info	_bfd_nosymbols_find_inliner_info
+#endif
+
+/* A.out uses the generic versions of these routines...  */
+
+#define	aout_16_get_section_contents	_bfd_generic_get_section_contents
+
+#define	aout_32_get_section_contents	_bfd_generic_get_section_contents
+
+#define	aout_64_get_section_contents	_bfd_generic_get_section_contents
+#ifndef NO_WRITE_HEADER_KLUDGE
+#define NO_WRITE_HEADER_KLUDGE 0
+#endif
+
+#ifndef aout_32_bfd_is_local_label_name
+#define aout_32_bfd_is_local_label_name bfd_generic_is_local_label_name
+#endif
+
+#ifndef aout_32_bfd_is_target_special_symbol
+#define aout_32_bfd_is_target_special_symbol \
+  ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#endif
+
+#ifndef WRITE_HEADERS
+#define WRITE_HEADERS(abfd, execp)					      \
+      {									      \
+	bfd_size_type text_size; /* Dummy vars.  */			      \
+	file_ptr text_end;						      \
+       									      \
+	if (adata(abfd).magic == undecided_magic)			      \
+	  NAME (aout, adjust_sizes_and_vmas) (abfd, & text_size, & text_end); \
+    									      \
+	execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE;	      \
+	execp->a_entry = bfd_get_start_address (abfd);			      \
+    									      \
+	execp->a_trsize = ((obj_textsec (abfd)->reloc_count) *		      \
+			   obj_reloc_entry_size (abfd));		      \
+	execp->a_drsize = ((obj_datasec (abfd)->reloc_count) *		      \
+			   obj_reloc_entry_size (abfd));		      \
+	NAME (aout, swap_exec_header_out) (abfd, execp, & exec_bytes);	      \
+									      \
+	if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0		      \
+	    || bfd_bwrite (& exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE,     \
+			  abfd) != EXEC_BYTES_SIZE)			      \
+	  return FALSE;							      \
+	/* Now write out reloc info, followed by syms and strings.  */	      \
+  									      \
+	if (bfd_get_outsymbols (abfd) != NULL				      \
+	    && bfd_get_symcount (abfd) != 0) 				      \
+	  {								      \
+	    if (bfd_seek (abfd, (file_ptr) (N_SYMOFF(*execp)), SEEK_SET) != 0)\
+	      return FALSE;						      \
+									      \
+	    if (! NAME (aout, write_syms) (abfd))			      \
+	      return FALSE;						      \
+	  }								      \
+									      \
+	if (bfd_seek (abfd, (file_ptr) (N_TRELOFF (*execp)), SEEK_SET) != 0)  \
+	  return FALSE;						      	      \
+	if (!NAME (aout, squirt_out_relocs) (abfd, obj_textsec (abfd)))       \
+	  return FALSE;						      	      \
+									      \
+	if (bfd_seek (abfd, (file_ptr) (N_DRELOFF (*execp)), SEEK_SET) != 0)  \
+	  return FALSE;						      	      \
+	if (!NAME (aout, squirt_out_relocs) (abfd, obj_datasec (abfd)))       \
+	  return FALSE;						      	      \
+      }
+#endif
+
+/* Test if a read-only section can be merged with .text.  This is
+   possible if:
+
+   1. Section has file contents and is read-only.
+   2. The VMA of the section is after the end of .text and before
+      the start of .data.
+   3. The image is demand-pageable (otherwise, a_text in the header
+      will not reflect the gap between .text and .data).  */
+
+#define aout_section_merge_with_text_p(abfd, sec)			\
+  (((sec)->flags & (SEC_HAS_CONTENTS | SEC_READONLY)) ==		\
+      (SEC_HAS_CONTENTS | SEC_READONLY)					\
+   && obj_textsec (abfd) != NULL					\
+   && obj_datasec (abfd) != NULL					\
+   && (sec)->vma >= (obj_textsec (abfd)->vma +				\
+		     obj_textsec (abfd)->size)				\
+   && ((sec)->vma + (sec)->size) <= obj_datasec (abfd)->vma		\
+   && ((abfd)->flags & D_PAGED) != 0)
+
+#endif /* ! defined (LIBAOUT_H) */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libbfd-in.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libbfd-in.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libbfd-in.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libbfd-in.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,824 @@
+/* libbfd.h -- Declarations used by bfd library *implementation*.
+   (This include file is not for users of the library.)
+
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+   2010, 2011
+   Free Software Foundation, Inc.
+
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "hashtab.h"
+
+/* Align an address upward to a boundary, expressed as a number of bytes.
+   E.g. align to an 8-byte boundary with argument of 8.  Take care never
+   to wrap around if the address is within boundary-1 of the end of the
+   address space.  */
+#define BFD_ALIGN(this, boundary)					  \
+  ((((bfd_vma) (this) + (boundary) - 1) >= (bfd_vma) (this))		  \
+   ? (((bfd_vma) (this) + ((boundary) - 1)) & ~ (bfd_vma) ((boundary)-1)) \
+   : ~ (bfd_vma) 0)
+
+/* If you want to read and write large blocks, you might want to do it
+   in quanta of this amount */
+#define DEFAULT_BUFFERSIZE 8192
+
+/* Set a tdata field.  Can't use the other macros for this, since they
+   do casts, and casting to the left of assignment isn't portable.  */
+#define set_tdata(bfd, v) ((bfd)->tdata.any = (v))
+
+/* If BFD_IN_MEMORY is set for a BFD, then the iostream fields points
+   to an instance of this structure.  */
+
+struct bfd_in_memory
+{
+  /* Size of buffer.  */
+  bfd_size_type size;
+  /* Buffer holding contents of BFD.  */
+  bfd_byte *buffer;
+};
+
+struct section_hash_entry
+{
+  struct bfd_hash_entry root;
+  asection section;
+};
+
+/* tdata for an archive.  For an input archive, cache
+   needs to be free()'d.  For an output archive, symdefs do.  */
+
+struct artdata {
+  file_ptr first_file_filepos;
+  /* Speed up searching the armap */
+  htab_t cache;
+  bfd *archive_head;		/* Only interesting in output routines */
+  carsym *symdefs;		/* the symdef entries */
+  symindex symdef_count;	/* how many there are */
+  char *extended_names;		/* clever intel extension */
+  bfd_size_type extended_names_size; /* Size of extended names */
+  /* when more compilers are standard C, this can be a time_t */
+  long  armap_timestamp;	/* Timestamp value written into armap.
+				   This is used for BSD archives to check
+				   that the timestamp is recent enough
+				   for the BSD linker to not complain,
+				   just before we finish writing an
+				   archive.  */
+  file_ptr armap_datepos;	/* Position within archive to seek to
+				   rewrite the date field.  */
+  void *tdata;			/* Backend specific information.  */
+};
+
+#define bfd_ardata(bfd) ((bfd)->tdata.aout_ar_data)
+
+/* Goes in bfd's arelt_data slot */
+struct areltdata {
+  char * arch_header;		/* it's actually a string */
+  unsigned int parsed_size;	/* octets of filesize not including ar_hdr */
+  unsigned int extra_size;	/* BSD4.4: extra bytes after the header.  */
+  char *filename;		/* null-terminated */
+  file_ptr origin;		/* for element of a thin archive */
+};
+
+#define arelt_size(bfd) (((struct areltdata *)((bfd)->arelt_data))->parsed_size)
+
+extern void *bfd_malloc
+  (bfd_size_type);
+extern void *bfd_realloc
+  (void *, bfd_size_type);
+extern void *bfd_realloc_or_free
+  (void *, bfd_size_type);
+extern void *bfd_zmalloc
+  (bfd_size_type);
+extern void *bfd_malloc2
+  (bfd_size_type, bfd_size_type);
+extern void *bfd_realloc2
+  (void *, bfd_size_type, bfd_size_type);
+extern void *bfd_zmalloc2
+  (bfd_size_type, bfd_size_type);
+
+extern void _bfd_default_error_handler (const char *s, ...);
+extern bfd_error_handler_type _bfd_error_handler;
+
+/* These routines allocate and free things on the BFD's objalloc.  */
+
+extern void *bfd_alloc2
+  (bfd *, bfd_size_type, bfd_size_type);
+extern void *bfd_zalloc2
+  (bfd *, bfd_size_type, bfd_size_type);
+extern void bfd_release
+  (bfd *, void *);
+
+bfd * _bfd_create_empty_archive_element_shell
+  (bfd *obfd);
+bfd * _bfd_look_for_bfd_in_cache
+  (bfd *, file_ptr);
+bfd_boolean _bfd_add_bfd_to_archive_cache
+  (bfd *, file_ptr, bfd *);
+bfd_boolean _bfd_generic_mkarchive
+  (bfd *abfd);
+char *_bfd_append_relative_path
+  (bfd *arch, char *elt_name);
+const bfd_target *bfd_generic_archive_p
+  (bfd *abfd);
+bfd_boolean bfd_slurp_armap
+  (bfd *abfd);
+bfd_boolean bfd_slurp_bsd_armap_f2
+  (bfd *abfd);
+#define bfd_slurp_bsd_armap bfd_slurp_armap
+#define bfd_slurp_coff_armap bfd_slurp_armap
+bfd_boolean _bfd_slurp_extended_name_table
+  (bfd *abfd);
+extern bfd_boolean _bfd_construct_extended_name_table
+  (bfd *, bfd_boolean, char **, bfd_size_type *);
+bfd_boolean _bfd_write_archive_contents
+  (bfd *abfd);
+bfd_boolean _bfd_compute_and_write_armap
+  (bfd *, unsigned int elength);
+bfd *_bfd_get_elt_at_filepos
+  (bfd *archive, file_ptr filepos);
+extern bfd *_bfd_generic_get_elt_at_index
+  (bfd *, symindex);
+bfd * _bfd_new_bfd
+  (void);
+void _bfd_delete_bfd
+  (bfd *);
+bfd_boolean _bfd_free_cached_info
+  (bfd *);
+
+bfd_boolean bfd_false
+  (bfd *ignore);
+bfd_boolean bfd_true
+  (bfd *ignore);
+void *bfd_nullvoidptr
+  (bfd *ignore);
+int bfd_0
+  (bfd *ignore);
+unsigned int bfd_0u
+  (bfd *ignore);
+long bfd_0l
+  (bfd *ignore);
+long _bfd_n1
+  (bfd *ignore);
+void bfd_void
+  (bfd *ignore);
+
+bfd *_bfd_new_bfd_contained_in
+  (bfd *);
+const bfd_target *_bfd_dummy_target
+  (bfd *abfd);
+
+void bfd_dont_truncate_arname
+  (bfd *abfd, const char *filename, char *hdr);
+void bfd_bsd_truncate_arname
+  (bfd *abfd, const char *filename, char *hdr);
+void bfd_gnu_truncate_arname
+  (bfd *abfd, const char *filename, char *hdr);
+
+bfd_boolean bsd_write_armap
+  (bfd *arch, unsigned int elength, struct orl *map, unsigned int orl_count,
+   int stridx);
+
+bfd_boolean coff_write_armap
+  (bfd *arch, unsigned int elength, struct orl *map, unsigned int orl_count,
+   int stridx);
+
+extern void *_bfd_generic_read_ar_hdr
+  (bfd *);
+extern void _bfd_ar_spacepad
+  (char *, size_t, const char *, long);
+
+extern void *_bfd_generic_read_ar_hdr_mag
+  (bfd *, const char *);
+
+extern bfd_boolean _bfd_generic_write_ar_hdr
+  (bfd *, bfd *);
+
+extern bfd_boolean _bfd_bsd44_write_ar_hdr
+  (bfd *, bfd *);
+
+bfd * bfd_generic_openr_next_archived_file
+  (bfd *archive, bfd *last_file);
+
+int bfd_generic_stat_arch_elt
+  (bfd *, struct stat *);
+
+#define _bfd_read_ar_hdr(abfd) \
+  BFD_SEND (abfd, _bfd_read_ar_hdr_fn, (abfd))
+#define _bfd_write_ar_hdr(archive, abfd)         \
+  BFD_SEND (abfd, _bfd_write_ar_hdr_fn, (archive, abfd))
+
+/* Generic routines to use for BFD_JUMP_TABLE_GENERIC.  Use
+   BFD_JUMP_TABLE_GENERIC (_bfd_generic).  */
+
+#define _bfd_generic_close_and_cleanup bfd_true
+#define _bfd_generic_bfd_free_cached_info bfd_true
+extern bfd_boolean _bfd_generic_new_section_hook
+  (bfd *, asection *);
+extern bfd_boolean _bfd_generic_get_section_contents
+  (bfd *, asection *, void *, file_ptr, bfd_size_type);
+extern bfd_boolean _bfd_generic_get_section_contents_in_window
+  (bfd *, asection *, bfd_window *, file_ptr, bfd_size_type);
+
+/* Generic routines to use for BFD_JUMP_TABLE_COPY.  Use
+   BFD_JUMP_TABLE_COPY (_bfd_generic).  */
+
+#define _bfd_generic_bfd_copy_private_bfd_data \
+  ((bfd_boolean (*) (bfd *, bfd *)) bfd_true)
+#define _bfd_generic_bfd_merge_private_bfd_data \
+  ((bfd_boolean (*) (bfd *, bfd *)) bfd_true)
+#define _bfd_generic_bfd_set_private_flags \
+  ((bfd_boolean (*) (bfd *, flagword)) bfd_true)
+#define _bfd_generic_bfd_copy_private_section_data \
+  ((bfd_boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true)
+#define _bfd_generic_bfd_copy_private_symbol_data \
+  ((bfd_boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true)
+#define _bfd_generic_bfd_copy_private_header_data \
+  ((bfd_boolean (*) (bfd *, bfd *)) bfd_true)
+#define _bfd_generic_bfd_print_private_bfd_data \
+  ((bfd_boolean (*) (bfd *, void *)) bfd_true)
+
+extern bfd_boolean _bfd_generic_init_private_section_data
+  (bfd *, asection *, bfd *, asection *, struct bfd_link_info *);
+
+/* Routines to use for BFD_JUMP_TABLE_CORE when there is no core file
+   support.  Use BFD_JUMP_TABLE_CORE (_bfd_nocore).  */
+
+extern char *_bfd_nocore_core_file_failing_command
+  (bfd *);
+extern int _bfd_nocore_core_file_failing_signal
+  (bfd *);
+extern bfd_boolean _bfd_nocore_core_file_matches_executable_p
+  (bfd *, bfd *);
+extern int _bfd_nocore_core_file_pid
+  (bfd *);
+
+/* Routines to use for BFD_JUMP_TABLE_ARCHIVE when there is no archive
+   file support.  Use BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive).  */
+
+#define _bfd_noarchive_slurp_armap bfd_false
+#define _bfd_noarchive_slurp_extended_name_table bfd_false
+#define _bfd_noarchive_construct_extended_name_table \
+  ((bfd_boolean (*) (bfd *, char **, bfd_size_type *, const char **)) \
+   bfd_false)
+#define _bfd_noarchive_truncate_arname \
+  ((void (*) (bfd *, const char *, char *)) bfd_void)
+#define _bfd_noarchive_write_armap \
+  ((bfd_boolean (*) (bfd *, unsigned int, struct orl *, unsigned int, int)) \
+   bfd_false)
+#define _bfd_noarchive_read_ar_hdr bfd_nullvoidptr
+#define _bfd_noarchive_write_ar_hdr \
+  ((bfd_boolean (*) (bfd *, bfd *)) bfd_false)
+#define _bfd_noarchive_openr_next_archived_file \
+  ((bfd *(*) (bfd *, bfd *)) bfd_nullvoidptr)
+#define _bfd_noarchive_get_elt_at_index \
+  ((bfd *(*) (bfd *, symindex)) bfd_nullvoidptr)
+#define _bfd_noarchive_generic_stat_arch_elt bfd_generic_stat_arch_elt
+#define _bfd_noarchive_update_armap_timestamp bfd_false
+
+/* Routines to use for BFD_JUMP_TABLE_ARCHIVE to get BSD style
+   archives.  Use BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd).  */
+
+#define _bfd_archive_bsd_slurp_armap bfd_slurp_bsd_armap
+#define _bfd_archive_bsd_slurp_extended_name_table \
+  _bfd_slurp_extended_name_table
+extern bfd_boolean _bfd_archive_bsd_construct_extended_name_table
+  (bfd *, char **, bfd_size_type *, const char **);
+#define _bfd_archive_bsd_truncate_arname bfd_bsd_truncate_arname
+#define _bfd_archive_bsd_write_armap bsd_write_armap
+#define _bfd_archive_bsd_read_ar_hdr _bfd_generic_read_ar_hdr
+#define _bfd_archive_bsd_write_ar_hdr _bfd_generic_write_ar_hdr
+#define _bfd_archive_bsd_openr_next_archived_file \
+  bfd_generic_openr_next_archived_file
+#define _bfd_archive_bsd_get_elt_at_index _bfd_generic_get_elt_at_index
+#define _bfd_archive_bsd_generic_stat_arch_elt \
+  bfd_generic_stat_arch_elt
+extern bfd_boolean _bfd_archive_bsd_update_armap_timestamp
+  (bfd *);
+
+/* Routines to use for BFD_JUMP_TABLE_ARCHIVE to get COFF style
+   archives.  Use BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff).  */
+
+#define _bfd_archive_coff_slurp_armap bfd_slurp_coff_armap
+#define _bfd_archive_coff_slurp_extended_name_table \
+  _bfd_slurp_extended_name_table
+extern bfd_boolean _bfd_archive_coff_construct_extended_name_table
+  (bfd *, char **, bfd_size_type *, const char **);
+#define _bfd_archive_coff_truncate_arname bfd_dont_truncate_arname
+#define _bfd_archive_coff_write_armap coff_write_armap
+#define _bfd_archive_coff_read_ar_hdr _bfd_generic_read_ar_hdr
+#define _bfd_archive_coff_write_ar_hdr _bfd_generic_write_ar_hdr
+#define _bfd_archive_coff_openr_next_archived_file \
+  bfd_generic_openr_next_archived_file
+#define _bfd_archive_coff_get_elt_at_index _bfd_generic_get_elt_at_index
+#define _bfd_archive_coff_generic_stat_arch_elt \
+  bfd_generic_stat_arch_elt
+#define _bfd_archive_coff_update_armap_timestamp bfd_true
+
+/* Routines to use for BFD_JUMP_TABLE_ARCHIVE to get BSD4.4 style
+   archives.  Use BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd44).  */
+
+#define _bfd_archive_bsd44_slurp_armap bfd_slurp_bsd_armap
+#define _bfd_archive_bsd44_slurp_extended_name_table \
+  _bfd_slurp_extended_name_table
+extern bfd_boolean _bfd_archive_bsd44_construct_extended_name_table
+  (bfd *, char **, bfd_size_type *, const char **);
+#define _bfd_archive_bsd44_truncate_arname bfd_bsd_truncate_arname
+#define _bfd_archive_bsd44_write_armap bsd_write_armap
+#define _bfd_archive_bsd44_read_ar_hdr _bfd_generic_read_ar_hdr
+#define _bfd_archive_bsd44_write_ar_hdr _bfd_bsd44_write_ar_hdr
+#define _bfd_archive_bsd44_openr_next_archived_file \
+  bfd_generic_openr_next_archived_file
+#define _bfd_archive_bsd44_get_elt_at_index _bfd_generic_get_elt_at_index
+#define _bfd_archive_bsd44_generic_stat_arch_elt \
+  bfd_generic_stat_arch_elt
+#define _bfd_archive_bsd44_update_armap_timestamp \
+  _bfd_archive_bsd_update_armap_timestamp
+
+/* Routines to use for BFD_JUMP_TABLE_ARCHIVE to get VMS style
+   archives.  Use BFD_JUMP_TABLE_ARCHIVE (_bfd_vms_lib).  Some of them
+   are irrelevant and never called, so defined as NULL.  */
+
+extern bfd_boolean _bfd_vms_lib_write_archive_contents (bfd *arch);
+#define _bfd_vms_lib_slurp_armap NULL
+#define _bfd_vms_lib_slurp_extended_name_table NULL
+#define _bfd_vms_lib_construct_extended_name_table NULL
+#define _bfd_vms_lib_truncate_arname NULL
+#define _bfd_vms_lib_write_armap NULL
+#define _bfd_vms_lib_read_ar_hdr NULL
+#define _bfd_vms_lib_write_ar_hdr NULL
+extern bfd *_bfd_vms_lib_openr_next_archived_file (bfd *, bfd *);
+extern bfd *_bfd_vms_lib_get_elt_at_index (bfd *, symindex);
+extern int _bfd_vms_lib_generic_stat_arch_elt (bfd *, struct stat *);
+#define _bfd_vms_lib_update_armap_timestamp bfd_true
+
+/* Extra routines for VMS style archives.  */
+
+extern symindex _bfd_vms_lib_find_symbol (bfd *, const char *);
+extern bfd *_bfd_vms_lib_get_imagelib_file (bfd *);
+extern const bfd_target *_bfd_vms_lib_alpha_archive_p (bfd *abfd);
+extern const bfd_target *_bfd_vms_lib_ia64_archive_p (bfd *abfd);
+extern bfd_boolean _bfd_vms_lib_alpha_mkarchive (bfd *abfd);
+extern bfd_boolean _bfd_vms_lib_ia64_mkarchive (bfd *abfd);
+
+/* Routines to use for BFD_JUMP_TABLE_SYMBOLS where there is no symbol
+   support.  Use BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols).  */
+
+#define _bfd_nosymbols_get_symtab_upper_bound _bfd_n1
+#define _bfd_nosymbols_canonicalize_symtab \
+  ((long (*) (bfd *, asymbol **)) _bfd_n1)
+#define _bfd_nosymbols_make_empty_symbol _bfd_generic_make_empty_symbol
+#define _bfd_nosymbols_print_symbol \
+  ((void (*) (bfd *, void *, asymbol *, bfd_print_symbol_type)) bfd_void)
+#define _bfd_nosymbols_get_symbol_info \
+  ((void (*) (bfd *, asymbol *, symbol_info *)) bfd_void)
+#define _bfd_nosymbols_bfd_is_local_label_name \
+  ((bfd_boolean (*) (bfd *, const char *)) bfd_false)
+#define _bfd_nosymbols_bfd_is_target_special_symbol \
+  ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define _bfd_nosymbols_get_lineno \
+  ((alent *(*) (bfd *, asymbol *)) bfd_nullvoidptr)
+#define _bfd_nosymbols_find_nearest_line \
+  ((bfd_boolean (*) (bfd *, asection *, asymbol **, bfd_vma, const char **, \
+		     const char **, unsigned int *)) \
+   bfd_false)
+#define _bfd_nosymbols_find_inliner_info \
+  ((bfd_boolean (*) (bfd *, const char **, const char **, unsigned int *)) \
+   bfd_false)
+#define _bfd_nosymbols_bfd_make_debug_symbol \
+  ((asymbol *(*) (bfd *, void *, unsigned long)) bfd_nullvoidptr)
+#define _bfd_nosymbols_read_minisymbols \
+  ((long (*) (bfd *, bfd_boolean, void **, unsigned int *)) _bfd_n1)
+#define _bfd_nosymbols_minisymbol_to_symbol \
+  ((asymbol *(*) (bfd *, bfd_boolean, const void *, asymbol *)) \
+   bfd_nullvoidptr)
+
+/* Routines to use for BFD_JUMP_TABLE_RELOCS when there is no reloc
+   support.  Use BFD_JUMP_TABLE_RELOCS (_bfd_norelocs).  */
+
+extern long _bfd_norelocs_get_reloc_upper_bound (bfd *, asection *);
+extern long _bfd_norelocs_canonicalize_reloc (bfd *, asection *,
+					      arelent **, asymbol **);
+#define _bfd_norelocs_bfd_reloc_type_lookup \
+  ((reloc_howto_type *(*) (bfd *, bfd_reloc_code_real_type)) bfd_nullvoidptr)
+#define _bfd_norelocs_bfd_reloc_name_lookup \
+  ((reloc_howto_type *(*) (bfd *, const char *)) bfd_nullvoidptr)
+
+/* Routines to use for BFD_JUMP_TABLE_WRITE for targets which may not
+   be written.  Use BFD_JUMP_TABLE_WRITE (_bfd_nowrite).  */
+
+#define _bfd_nowrite_set_arch_mach \
+  ((bfd_boolean (*) (bfd *, enum bfd_architecture, unsigned long)) \
+   bfd_false)
+#define _bfd_nowrite_set_section_contents \
+  ((bfd_boolean (*) (bfd *, asection *, const void *, file_ptr, bfd_size_type)) \
+   bfd_false)
+
+/* Generic routines to use for BFD_JUMP_TABLE_WRITE.  Use
+   BFD_JUMP_TABLE_WRITE (_bfd_generic).  */
+
+#define _bfd_generic_set_arch_mach bfd_default_set_arch_mach
+extern bfd_boolean _bfd_generic_set_section_contents
+  (bfd *, asection *, const void *, file_ptr, bfd_size_type);
+
+/* Routines to use for BFD_JUMP_TABLE_LINK for targets which do not
+   support linking.  Use BFD_JUMP_TABLE_LINK (_bfd_nolink).  */
+
+#define _bfd_nolink_sizeof_headers \
+  ((int (*) (bfd *, struct bfd_link_info *)) bfd_0)
+#define _bfd_nolink_bfd_get_relocated_section_contents \
+  ((bfd_byte *(*) (bfd *, struct bfd_link_info *, struct bfd_link_order *, \
+		   bfd_byte *, bfd_boolean, asymbol **)) \
+   bfd_nullvoidptr)
+#define _bfd_nolink_bfd_relax_section \
+  ((bfd_boolean (*) \
+    (bfd *, asection *, struct bfd_link_info *, bfd_boolean *)) \
+   bfd_false)
+#define _bfd_nolink_bfd_gc_sections \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) \
+   bfd_false)
+#define _bfd_nolink_bfd_lookup_section_flags \
+  ((void (*) (struct bfd_link_info *, struct flag_info *)) \
+   bfd_0)
+#define _bfd_nolink_bfd_merge_sections \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) \
+   bfd_false)
+#define _bfd_nolink_bfd_is_group_section \
+  ((bfd_boolean (*) (bfd *, const struct bfd_section *)) \
+   bfd_false)
+#define _bfd_nolink_bfd_discard_group \
+  ((bfd_boolean (*) (bfd *, struct bfd_section *)) \
+   bfd_false)
+#define _bfd_nolink_bfd_link_hash_table_create \
+  ((struct bfd_link_hash_table *(*) (bfd *)) bfd_nullvoidptr)
+#define _bfd_nolink_bfd_link_hash_table_free \
+  ((void (*) (struct bfd_link_hash_table *)) bfd_void)
+#define _bfd_nolink_bfd_link_add_symbols \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) bfd_false)
+#define _bfd_nolink_bfd_link_just_syms \
+  ((void (*) (asection *, struct bfd_link_info *)) bfd_void)
+#define _bfd_nolink_bfd_copy_link_hash_symbol_type \
+  ((void (*) (bfd *, struct bfd_link_hash_entry *, \
+	      struct bfd_link_hash_entry *)) bfd_void)
+#define _bfd_nolink_bfd_final_link \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) bfd_false)
+#define _bfd_nolink_bfd_link_split_section \
+  ((bfd_boolean (*) (bfd *, struct bfd_section *)) bfd_false)
+#define _bfd_nolink_section_already_linked \
+  ((bfd_boolean (*) (bfd *, asection *, \
+		     struct bfd_link_info *)) bfd_false)
+#define _bfd_nolink_bfd_define_common_symbol \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *, \
+		     struct bfd_link_hash_entry *)) bfd_false)
+
+/* Routines to use for BFD_JUMP_TABLE_DYNAMIC for targets which do not
+   have dynamic symbols or relocs.  Use BFD_JUMP_TABLE_DYNAMIC
+   (_bfd_nodynamic).  */
+
+#define _bfd_nodynamic_get_dynamic_symtab_upper_bound _bfd_n1
+#define _bfd_nodynamic_canonicalize_dynamic_symtab \
+  ((long (*) (bfd *, asymbol **)) _bfd_n1)
+#define _bfd_nodynamic_get_synthetic_symtab \
+  ((long (*) (bfd *, long, asymbol **, long, asymbol **, asymbol **)) _bfd_n1)
+#define _bfd_nodynamic_get_dynamic_reloc_upper_bound _bfd_n1
+#define _bfd_nodynamic_canonicalize_dynamic_reloc \
+  ((long (*) (bfd *, arelent **, asymbol **)) _bfd_n1)
+
+/* Generic routine to determine of the given symbol is a local
+   label.  */
+extern bfd_boolean bfd_generic_is_local_label_name
+  (bfd *, const char *);
+
+/* Generic minisymbol routines.  */
+extern long _bfd_generic_read_minisymbols
+  (bfd *, bfd_boolean, void **, unsigned int *);
+extern asymbol *_bfd_generic_minisymbol_to_symbol
+  (bfd *, bfd_boolean, const void *, asymbol *);
+
+/* Find the nearest line using .stab/.stabstr sections.  */
+extern bfd_boolean _bfd_stab_section_find_nearest_line
+  (bfd *, asymbol **, asection *, bfd_vma, bfd_boolean *,
+   const char **, const char **, unsigned int *, void **);
+
+/* Find the nearest line using DWARF 1 debugging information.  */
+extern bfd_boolean _bfd_dwarf1_find_nearest_line
+  (bfd *, asection *, asymbol **, bfd_vma, const char **,
+   const char **, unsigned int *);
+
+/* Find the nearest line using DWARF 2 debugging information.  */
+extern bfd_boolean _bfd_dwarf2_find_nearest_line
+  (bfd *, asection *, asymbol **, bfd_vma, const char **, const char **,
+   unsigned int *, unsigned int, void **);
+
+/* Find the line using DWARF 2 debugging information.  */
+extern bfd_boolean _bfd_dwarf2_find_line
+  (bfd *, asymbol **, asymbol *, const char **,
+   unsigned int *, unsigned int, void **);
+
+bfd_boolean _bfd_generic_find_line
+  (bfd *, asymbol **, asymbol *, const char **, unsigned int *);
+
+/* Find inliner info after calling bfd_find_nearest_line. */
+extern bfd_boolean _bfd_dwarf2_find_inliner_info
+  (bfd *, const char **, const char **, unsigned int *, void **);
+  
+/* Create a new section entry.  */
+extern struct bfd_hash_entry *bfd_section_hash_newfunc
+  (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
+
+/* A routine to create entries for a bfd_link_hash_table.  */
+extern struct bfd_hash_entry *_bfd_link_hash_newfunc
+  (struct bfd_hash_entry *entry, struct bfd_hash_table *table,
+   const char *string);
+
+/* Initialize a bfd_link_hash_table.  */
+extern bfd_boolean _bfd_link_hash_table_init
+  (struct bfd_link_hash_table *, bfd *,
+   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
+			       struct bfd_hash_table *,
+			       const char *),
+   unsigned int);
+
+/* Generic link hash table creation routine.  */
+extern struct bfd_link_hash_table *_bfd_generic_link_hash_table_create
+  (bfd *);
+
+/* Generic link hash table destruction routine.  */
+extern void _bfd_generic_link_hash_table_free
+  (struct bfd_link_hash_table *);
+
+/* Generic add symbol routine.  */
+extern bfd_boolean _bfd_generic_link_add_symbols
+  (bfd *, struct bfd_link_info *);
+
+/* Generic add symbol routine.  This version is used by targets for
+   which the linker must collect constructors and destructors by name,
+   as the collect2 program does.  */
+extern bfd_boolean _bfd_generic_link_add_symbols_collect
+  (bfd *, struct bfd_link_info *);
+
+/* Generic archive add symbol routine.  */
+extern bfd_boolean _bfd_generic_link_add_archive_symbols
+  (bfd *, struct bfd_link_info *,
+   bfd_boolean (*) (bfd *, struct bfd_link_info *, bfd_boolean *));
+
+/* Forward declaration to avoid prototype errors.  */
+typedef struct bfd_link_hash_entry _bfd_link_hash_entry;
+
+/* Generic routine to add a single symbol.  */
+extern bfd_boolean _bfd_generic_link_add_one_symbol
+  (struct bfd_link_info *, bfd *, const char *name, flagword,
+   asection *, bfd_vma, const char *, bfd_boolean copy,
+   bfd_boolean constructor, struct bfd_link_hash_entry **);
+
+/* Generic routine to mark section as supplying symbols only.  */
+extern void _bfd_generic_link_just_syms
+  (asection *, struct bfd_link_info *);
+
+/* Generic routine that does nothing.  */
+extern void _bfd_generic_copy_link_hash_symbol_type
+  (bfd *, struct bfd_link_hash_entry *, struct bfd_link_hash_entry *);
+
+/* Generic link routine.  */
+extern bfd_boolean _bfd_generic_final_link
+  (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean _bfd_generic_link_split_section
+  (bfd *, struct bfd_section *);
+
+extern bfd_boolean _bfd_generic_section_already_linked
+  (bfd *, asection *, struct bfd_link_info *);
+
+/* Generic reloc_link_order processing routine.  */
+extern bfd_boolean _bfd_generic_reloc_link_order
+  (bfd *, struct bfd_link_info *, asection *, struct bfd_link_order *);
+
+/* Default link order processing routine.  */
+extern bfd_boolean _bfd_default_link_order
+  (bfd *, struct bfd_link_info *, asection *, struct bfd_link_order *);
+
+/* Count the number of reloc entries in a link order list.  */
+extern unsigned int _bfd_count_link_order_relocs
+  (struct bfd_link_order *);
+
+/* Final link relocation routine.  */
+extern bfd_reloc_status_type _bfd_final_link_relocate
+  (reloc_howto_type *, bfd *, asection *, bfd_byte *,
+   bfd_vma, bfd_vma, bfd_vma);
+
+/* Relocate a particular location by a howto and a value.  */
+extern bfd_reloc_status_type _bfd_relocate_contents
+  (reloc_howto_type *, bfd *, bfd_vma, bfd_byte *);
+
+/* Clear a given location using a given howto.  */
+extern void _bfd_clear_contents (reloc_howto_type *howto, bfd *input_bfd,
+				 asection *input_section, bfd_byte *location);
+
+/* Link stabs in sections in the first pass.  */
+
+extern bfd_boolean _bfd_link_section_stabs
+  (bfd *, struct stab_info *, asection *, asection *, void **,
+   bfd_size_type *);
+
+/* Eliminate stabs for discarded functions and symbols.  */
+extern bfd_boolean _bfd_discard_section_stabs
+  (bfd *, asection *, void *, bfd_boolean (*) (bfd_vma, void *), void *);
+
+/* Write out the .stab section when linking stabs in sections.  */
+
+extern bfd_boolean _bfd_write_section_stabs
+  (bfd *, struct stab_info *, asection *, void **, bfd_byte *);
+
+/* Write out the .stabstr string table when linking stabs in sections.  */
+
+extern bfd_boolean _bfd_write_stab_strings
+  (bfd *, struct stab_info *);
+
+/* Find an offset within a .stab section when linking stabs in
+   sections.  */
+
+extern bfd_vma _bfd_stab_section_offset
+  (asection *, void *, bfd_vma);
+
+/* Register a SEC_MERGE section as a candidate for merging.  */
+
+extern bfd_boolean _bfd_add_merge_section
+  (bfd *, void **, asection *, void **);
+
+/* Attempt to merge SEC_MERGE sections.  */
+
+extern bfd_boolean _bfd_merge_sections
+  (bfd *, struct bfd_link_info *, void *, void (*) (bfd *, asection *));
+
+/* Write out a merged section.  */
+
+extern bfd_boolean _bfd_write_merged_section
+  (bfd *, asection *, void *);
+
+/* Find an offset within a modified SEC_MERGE section.  */
+
+extern bfd_vma _bfd_merged_section_offset
+  (bfd *, asection **, void *, bfd_vma);
+
+/* Create a string table.  */
+extern struct bfd_strtab_hash *_bfd_stringtab_init
+  (void);
+
+/* Create an XCOFF .debug section style string table.  */
+extern struct bfd_strtab_hash *_bfd_xcoff_stringtab_init
+  (void);
+
+/* Free a string table.  */
+extern void _bfd_stringtab_free
+  (struct bfd_strtab_hash *);
+
+/* Get the size of a string table.  */
+extern bfd_size_type _bfd_stringtab_size
+  (struct bfd_strtab_hash *);
+
+/* Add a string to a string table.  */
+extern bfd_size_type _bfd_stringtab_add
+  (struct bfd_strtab_hash *, const char *, bfd_boolean hash, bfd_boolean copy);
+
+/* Write out a string table.  */
+extern bfd_boolean _bfd_stringtab_emit
+  (bfd *, struct bfd_strtab_hash *);
+
+/* Check that endianness of input and output file match.  */
+extern bfd_boolean _bfd_generic_verify_endian_match
+  (bfd *, bfd *);
+
+/* Macros to tell if bfds are read or write enabled.
+
+   Note that bfds open for read may be scribbled into if the fd passed
+   to bfd_fdopenr is actually open both for read and write
+   simultaneously.  However an output bfd will never be open for
+   read.  Therefore sometimes you want to check bfd_read_p or
+   !bfd_read_p, and only sometimes bfd_write_p.
+*/
+
+#define	bfd_read_p(abfd) \
+  ((abfd)->direction == read_direction || (abfd)->direction == both_direction)
+#define	bfd_write_p(abfd) \
+  ((abfd)->direction == write_direction || (abfd)->direction == both_direction)
+
+void bfd_assert
+  (const char*,int);
+
+#define BFD_ASSERT(x) \
+  do { if (!(x)) bfd_assert(__FILE__,__LINE__); } while (0)
+
+#define BFD_FAIL() \
+  do { bfd_assert(__FILE__,__LINE__); } while (0)
+
+extern void _bfd_abort
+  (const char *, int, const char *) ATTRIBUTE_NORETURN;
+
+/* if gcc >= 2.6, we can give a function name, too */
+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 6)
+#define __PRETTY_FUNCTION__  ((char *) NULL)
+#endif
+
+#undef abort
+#define abort() _bfd_abort (__FILE__, __LINE__, __PRETTY_FUNCTION__)
+
+/* Manipulate a system FILE but using BFD's "file_ptr", rather than
+   the system "off_t" or "off64_t", as the offset.  */
+extern file_ptr real_ftell (FILE *file);
+extern int real_fseek (FILE *file, file_ptr offset, int whence);
+extern FILE *real_fopen (const char *filename, const char *modes);
+
+/* List of supported target vectors, and the default vector (if
+   bfd_default_vector[0] is NULL, there is no default).  */
+extern const bfd_target * const *bfd_target_vector;
+extern const bfd_target *bfd_default_vector[];
+
+/* List of associated target vectors.  */
+extern const bfd_target * const *bfd_associated_vector;
+
+/* Functions shared by the ECOFF and MIPS ELF backends, which have no
+   other common header files.  */
+
+#if defined(__STDC__) || defined(ALMOST_STDC)
+struct ecoff_find_line;
+#endif
+
+extern bfd_boolean _bfd_ecoff_locate_line
+  (bfd *, asection *, bfd_vma, struct ecoff_debug_info * const,
+   const struct ecoff_debug_swap * const, struct ecoff_find_line *,
+   const char **, const char **, unsigned int *);
+extern bfd_boolean _bfd_ecoff_get_accumulated_pdr
+  (void *, bfd_byte *);
+extern bfd_boolean _bfd_ecoff_get_accumulated_sym
+  (void *, bfd_byte *);
+extern bfd_boolean _bfd_ecoff_get_accumulated_ss
+  (void *, bfd_byte *);
+
+extern bfd_vma _bfd_get_gp_value
+  (bfd *);
+extern void _bfd_set_gp_value
+  (bfd *, bfd_vma);
+
+/* Function shared by the COFF and ELF SH backends, which have no
+   other common header files.  */
+
+#ifndef _bfd_sh_align_load_span
+extern bfd_boolean _bfd_sh_align_load_span
+  (bfd *, asection *, bfd_byte *,
+   bfd_boolean (*) (bfd *, asection *, void *, bfd_byte *, bfd_vma),
+   void *, bfd_vma **, bfd_vma *, bfd_vma, bfd_vma, bfd_boolean *);
+#endif
+
+/* This is the shape of the elements inside the already_linked hash
+   table. It maps a name onto a list of already_linked elements with
+   the same name.  */
+
+struct bfd_section_already_linked_hash_entry
+{
+  struct bfd_hash_entry root;
+  struct bfd_section_already_linked *entry;
+};
+
+struct bfd_section_already_linked
+{
+  struct bfd_section_already_linked *next;
+  asection *sec;
+};
+
+extern struct bfd_section_already_linked_hash_entry *
+  bfd_section_already_linked_table_lookup (const char *);
+extern bfd_boolean bfd_section_already_linked_table_insert
+  (struct bfd_section_already_linked_hash_entry *, asection *);
+extern void bfd_section_already_linked_table_traverse
+  (bfd_boolean (*) (struct bfd_section_already_linked_hash_entry *,
+		    void *), void *);
+
+extern bfd_vma read_unsigned_leb128 (bfd *, bfd_byte *, unsigned int *);
+extern bfd_signed_vma read_signed_leb128 (bfd *, bfd_byte *, unsigned int *);
+
+struct dwarf_debug_section
+{
+  const char *uncompressed_name;
+  const char *compressed_name;
+};
+
+/* Map of uncompressed DWARF debug section name to compressed one.  It
+   is terminated by NULL uncompressed_name.  */
+
+extern const struct dwarf_debug_section dwarf_debug_sections[];
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libbfd.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libbfd.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libbfd.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libbfd.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1128 @@
+/* Assorted BFD support routines, only used internally.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#ifndef HAVE_GETPAGESIZE
+#define getpagesize() 2048
+#endif
+
+/*
+SECTION
+	Implementation details
+
+SUBSECTION
+	Internal functions
+
+DESCRIPTION
+	These routines are used within BFD.
+	They are not intended for export, but are documented here for
+	completeness.
+*/
+
+/* A routine which is used in target vectors for unsupported
+   operations.  */
+
+bfd_boolean
+bfd_false (bfd *ignore ATTRIBUTE_UNUSED)
+{
+  bfd_set_error (bfd_error_invalid_operation);
+  return FALSE;
+}
+
+/* A routine which is used in target vectors for supported operations
+   which do not actually do anything.  */
+
+bfd_boolean
+bfd_true (bfd *ignore ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+/* A routine which is used in target vectors for unsupported
+   operations which return a pointer value.  */
+
+void *
+bfd_nullvoidptr (bfd *ignore ATTRIBUTE_UNUSED)
+{
+  bfd_set_error (bfd_error_invalid_operation);
+  return NULL;
+}
+
+int
+bfd_0 (bfd *ignore ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+unsigned int
+bfd_0u (bfd *ignore ATTRIBUTE_UNUSED)
+{
+   return 0;
+}
+
+long
+bfd_0l (bfd *ignore ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+/* A routine which is used in target vectors for unsupported
+   operations which return -1 on error.  */
+
+long
+_bfd_n1 (bfd *ignore_abfd ATTRIBUTE_UNUSED)
+{
+  bfd_set_error (bfd_error_invalid_operation);
+  return -1;
+}
+
+void
+bfd_void (bfd *ignore ATTRIBUTE_UNUSED)
+{
+}
+
+long
+_bfd_norelocs_get_reloc_upper_bound (bfd *abfd ATTRIBUTE_UNUSED,
+				     asection *sec ATTRIBUTE_UNUSED)
+{
+  return sizeof (arelent *);
+}
+
+long
+_bfd_norelocs_canonicalize_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+				  asection *sec ATTRIBUTE_UNUSED,
+				  arelent **relptr,
+				  asymbol **symbols ATTRIBUTE_UNUSED)
+{
+  *relptr = NULL;
+  return 0;
+}
+
+bfd_boolean
+_bfd_nocore_core_file_matches_executable_p
+  (bfd *ignore_core_bfd ATTRIBUTE_UNUSED,
+   bfd *ignore_exec_bfd ATTRIBUTE_UNUSED)
+{
+  bfd_set_error (bfd_error_invalid_operation);
+  return FALSE;
+}
+
+/* Routine to handle core_file_failing_command entry point for targets
+   without core file support.  */
+
+char *
+_bfd_nocore_core_file_failing_command (bfd *ignore_abfd ATTRIBUTE_UNUSED)
+{
+  bfd_set_error (bfd_error_invalid_operation);
+  return NULL;
+}
+
+/* Routine to handle core_file_failing_signal entry point for targets
+   without core file support.  */
+
+int
+_bfd_nocore_core_file_failing_signal (bfd *ignore_abfd ATTRIBUTE_UNUSED)
+{
+  bfd_set_error (bfd_error_invalid_operation);
+  return 0;
+}
+
+/* Routine to handle the core_file_pid entry point for targets without
+   core file support.  */
+
+int
+_bfd_nocore_core_file_pid (bfd *ignore_abfd ATTRIBUTE_UNUSED)
+{
+  bfd_set_error (bfd_error_invalid_operation);
+  return 0;
+}
+
+const bfd_target *
+_bfd_dummy_target (bfd *ignore_abfd ATTRIBUTE_UNUSED)
+{
+  bfd_set_error (bfd_error_wrong_format);
+  return 0;
+}
+
+/* Allocate memory using malloc.  */
+
+void *
+bfd_malloc (bfd_size_type size)
+{
+  void *ptr;
+
+  if (size != (size_t) size)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+
+  ptr = malloc ((size_t) size);
+  if (ptr == NULL && (size_t) size != 0)
+    bfd_set_error (bfd_error_no_memory);
+
+  return ptr;
+}
+
+/* Allocate memory using malloc, nmemb * size with overflow checking.  */
+
+void *
+bfd_malloc2 (bfd_size_type nmemb, bfd_size_type size)
+{
+  void *ptr;
+
+  if ((nmemb | size) >= HALF_BFD_SIZE_TYPE
+      && size != 0
+      && nmemb > ~(bfd_size_type) 0 / size)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+
+  size *= nmemb;
+
+  if (size != (size_t) size)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+
+  ptr = malloc ((size_t) size);
+  if (ptr == NULL && (size_t) size != 0)
+    bfd_set_error (bfd_error_no_memory);
+
+  return ptr;
+}
+
+/* Reallocate memory using realloc.  */
+
+void *
+bfd_realloc (void *ptr, bfd_size_type size)
+{
+  void *ret;
+
+  if (size != (size_t) size)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+
+  if (ptr == NULL)
+    ret = malloc ((size_t) size);
+  else
+    ret = realloc (ptr, (size_t) size);
+
+  if (ret == NULL && (size_t) size != 0)
+    bfd_set_error (bfd_error_no_memory);
+
+  return ret;
+}
+
+/* Reallocate memory using realloc, nmemb * size with overflow checking.  */
+
+void *
+bfd_realloc2 (void *ptr, bfd_size_type nmemb, bfd_size_type size)
+{
+  void *ret;
+
+  if ((nmemb | size) >= HALF_BFD_SIZE_TYPE
+      && size != 0
+      && nmemb > ~(bfd_size_type) 0 / size)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+
+  size *= nmemb;
+
+  if (size != (size_t) size)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+
+  if (ptr == NULL)
+    ret = malloc ((size_t) size);
+  else
+    ret = realloc (ptr, (size_t) size);
+
+  if (ret == NULL && (size_t) size != 0)
+    bfd_set_error (bfd_error_no_memory);
+
+  return ret;
+}
+
+/* Reallocate memory using realloc.
+   If this fails the pointer is freed before returning.  */
+
+void *
+bfd_realloc_or_free (void *ptr, bfd_size_type size)
+{
+  size_t amount = (size_t) size;
+  void *ret;
+
+  if (size != amount)
+    ret = NULL;
+  else if (ptr == NULL)
+    ret = malloc (amount);
+  else
+    ret = realloc (ptr, amount);
+
+  if (ret == NULL)
+    {
+      if (amount > 0)
+	bfd_set_error (bfd_error_no_memory);
+
+      if (ptr != NULL)
+	free (ptr);
+    }
+
+  return ret;
+}
+
+/* Allocate memory using malloc and clear it.  */
+
+void *
+bfd_zmalloc (bfd_size_type size)
+{
+  void *ptr;
+
+  if (size != (size_t) size)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+
+  ptr = malloc ((size_t) size);
+
+  if ((size_t) size != 0)
+    {
+      if (ptr == NULL)
+	bfd_set_error (bfd_error_no_memory);
+      else
+	memset (ptr, 0, (size_t) size);
+    }
+
+  return ptr;
+}
+
+/* Allocate memory using malloc (nmemb * size) with overflow checking
+   and clear it.  */
+
+void *
+bfd_zmalloc2 (bfd_size_type nmemb, bfd_size_type size)
+{
+  void *ptr;
+
+  if ((nmemb | size) >= HALF_BFD_SIZE_TYPE
+      && size != 0
+      && nmemb > ~(bfd_size_type) 0 / size)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+
+  size *= nmemb;
+
+  if (size != (size_t) size)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+
+  ptr = malloc ((size_t) size);
+
+  if ((size_t) size != 0)
+    {
+      if (ptr == NULL)
+	bfd_set_error (bfd_error_no_memory);
+      else
+	memset (ptr, 0, (size_t) size);
+    }
+
+  return ptr;
+}
+
+/*
+INTERNAL_FUNCTION
+	bfd_write_bigendian_4byte_int
+
+SYNOPSIS
+	bfd_boolean bfd_write_bigendian_4byte_int (bfd *, unsigned int);
+
+DESCRIPTION
+	Write a 4 byte integer @var{i} to the output BFD @var{abfd}, in big
+	endian order regardless of what else is going on.  This is useful in
+	archives.
+
+*/
+bfd_boolean
+bfd_write_bigendian_4byte_int (bfd *abfd, unsigned int i)
+{
+  bfd_byte buffer[4];
+  bfd_putb32 ((bfd_vma) i, buffer);
+  return bfd_bwrite (buffer, (bfd_size_type) 4, abfd) == 4;
+}
+
+
+/** The do-it-yourself (byte) sex-change kit */
+
+/* The middle letter e.g. get<b>short indicates Big or Little endian
+   target machine.  It doesn't matter what the byte order of the host
+   machine is; these routines work for either.  */
+
+/* FIXME: Should these take a count argument?
+   Answer (gnu@cygnus.com):  No, but perhaps they should be inline
+                             functions in swap.h #ifdef __GNUC__.
+                             Gprof them later and find out.  */
+
+/*
+FUNCTION
+	bfd_put_size
+FUNCTION
+	bfd_get_size
+
+DESCRIPTION
+	These macros as used for reading and writing raw data in
+	sections; each access (except for bytes) is vectored through
+	the target format of the BFD and mangled accordingly. The
+	mangling performs any necessary endian translations and
+	removes alignment restrictions.  Note that types accepted and
+	returned by these macros are identical so they can be swapped
+	around in macros---for example, @file{libaout.h} defines <<GET_WORD>>
+	to either <<bfd_get_32>> or <<bfd_get_64>>.
+
+	In the put routines, @var{val} must be a <<bfd_vma>>.  If we are on a
+	system without prototypes, the caller is responsible for making
+	sure that is true, with a cast if necessary.  We don't cast
+	them in the macro definitions because that would prevent <<lint>>
+	or <<gcc -Wall>> from detecting sins such as passing a pointer.
+	To detect calling these with less than a <<bfd_vma>>, use
+	<<gcc -Wconversion>> on a host with 64 bit <<bfd_vma>>'s.
+
+.
+.{* Byte swapping macros for user section data.  *}
+.
+.#define bfd_put_8(abfd, val, ptr) \
+.  ((void) (*((unsigned char *) (ptr)) = (val) & 0xff))
+.#define bfd_put_signed_8 \
+.  bfd_put_8
+.#define bfd_get_8(abfd, ptr) \
+.  (*(const unsigned char *) (ptr) & 0xff)
+.#define bfd_get_signed_8(abfd, ptr) \
+.  (((*(const unsigned char *) (ptr) & 0xff) ^ 0x80) - 0x80)
+.
+.#define bfd_put_16(abfd, val, ptr) \
+.  BFD_SEND (abfd, bfd_putx16, ((val),(ptr)))
+.#define bfd_put_signed_16 \
+.  bfd_put_16
+.#define bfd_get_16(abfd, ptr) \
+.  BFD_SEND (abfd, bfd_getx16, (ptr))
+.#define bfd_get_signed_16(abfd, ptr) \
+.  BFD_SEND (abfd, bfd_getx_signed_16, (ptr))
+.
+.#define bfd_put_32(abfd, val, ptr) \
+.  BFD_SEND (abfd, bfd_putx32, ((val),(ptr)))
+.#define bfd_put_signed_32 \
+.  bfd_put_32
+.#define bfd_get_32(abfd, ptr) \
+.  BFD_SEND (abfd, bfd_getx32, (ptr))
+.#define bfd_get_signed_32(abfd, ptr) \
+.  BFD_SEND (abfd, bfd_getx_signed_32, (ptr))
+.
+.#define bfd_put_64(abfd, val, ptr) \
+.  BFD_SEND (abfd, bfd_putx64, ((val), (ptr)))
+.#define bfd_put_signed_64 \
+.  bfd_put_64
+.#define bfd_get_64(abfd, ptr) \
+.  BFD_SEND (abfd, bfd_getx64, (ptr))
+.#define bfd_get_signed_64(abfd, ptr) \
+.  BFD_SEND (abfd, bfd_getx_signed_64, (ptr))
+.
+.#define bfd_get(bits, abfd, ptr)			\
+.  ((bits) == 8 ? (bfd_vma) bfd_get_8 (abfd, ptr)	\
+.   : (bits) == 16 ? bfd_get_16 (abfd, ptr)		\
+.   : (bits) == 32 ? bfd_get_32 (abfd, ptr)		\
+.   : (bits) == 64 ? bfd_get_64 (abfd, ptr)		\
+.   : (abort (), (bfd_vma) - 1))
+.
+.#define bfd_put(bits, abfd, val, ptr)			\
+.  ((bits) == 8 ? bfd_put_8  (abfd, val, ptr)		\
+.   : (bits) == 16 ? bfd_put_16 (abfd, val, ptr)		\
+.   : (bits) == 32 ? bfd_put_32 (abfd, val, ptr)		\
+.   : (bits) == 64 ? bfd_put_64 (abfd, val, ptr)		\
+.   : (abort (), (void) 0))
+.
+*/
+
+/*
+FUNCTION
+	bfd_h_put_size
+	bfd_h_get_size
+
+DESCRIPTION
+	These macros have the same function as their <<bfd_get_x>>
+	brethren, except that they are used for removing information
+	for the header records of object files. Believe it or not,
+	some object files keep their header records in big endian
+	order and their data in little endian order.
+.
+.{* Byte swapping macros for file header data.  *}
+.
+.#define bfd_h_put_8(abfd, val, ptr) \
+.  bfd_put_8 (abfd, val, ptr)
+.#define bfd_h_put_signed_8(abfd, val, ptr) \
+.  bfd_put_8 (abfd, val, ptr)
+.#define bfd_h_get_8(abfd, ptr) \
+.  bfd_get_8 (abfd, ptr)
+.#define bfd_h_get_signed_8(abfd, ptr) \
+.  bfd_get_signed_8 (abfd, ptr)
+.
+.#define bfd_h_put_16(abfd, val, ptr) \
+.  BFD_SEND (abfd, bfd_h_putx16, (val, ptr))
+.#define bfd_h_put_signed_16 \
+.  bfd_h_put_16
+.#define bfd_h_get_16(abfd, ptr) \
+.  BFD_SEND (abfd, bfd_h_getx16, (ptr))
+.#define bfd_h_get_signed_16(abfd, ptr) \
+.  BFD_SEND (abfd, bfd_h_getx_signed_16, (ptr))
+.
+.#define bfd_h_put_32(abfd, val, ptr) \
+.  BFD_SEND (abfd, bfd_h_putx32, (val, ptr))
+.#define bfd_h_put_signed_32 \
+.  bfd_h_put_32
+.#define bfd_h_get_32(abfd, ptr) \
+.  BFD_SEND (abfd, bfd_h_getx32, (ptr))
+.#define bfd_h_get_signed_32(abfd, ptr) \
+.  BFD_SEND (abfd, bfd_h_getx_signed_32, (ptr))
+.
+.#define bfd_h_put_64(abfd, val, ptr) \
+.  BFD_SEND (abfd, bfd_h_putx64, (val, ptr))
+.#define bfd_h_put_signed_64 \
+.  bfd_h_put_64
+.#define bfd_h_get_64(abfd, ptr) \
+.  BFD_SEND (abfd, bfd_h_getx64, (ptr))
+.#define bfd_h_get_signed_64(abfd, ptr) \
+.  BFD_SEND (abfd, bfd_h_getx_signed_64, (ptr))
+.
+.{* Aliases for the above, which should eventually go away.  *}
+.
+.#define H_PUT_64  bfd_h_put_64
+.#define H_PUT_32  bfd_h_put_32
+.#define H_PUT_16  bfd_h_put_16
+.#define H_PUT_8   bfd_h_put_8
+.#define H_PUT_S64 bfd_h_put_signed_64
+.#define H_PUT_S32 bfd_h_put_signed_32
+.#define H_PUT_S16 bfd_h_put_signed_16
+.#define H_PUT_S8  bfd_h_put_signed_8
+.#define H_GET_64  bfd_h_get_64
+.#define H_GET_32  bfd_h_get_32
+.#define H_GET_16  bfd_h_get_16
+.#define H_GET_8   bfd_h_get_8
+.#define H_GET_S64 bfd_h_get_signed_64
+.#define H_GET_S32 bfd_h_get_signed_32
+.#define H_GET_S16 bfd_h_get_signed_16
+.#define H_GET_S8  bfd_h_get_signed_8
+.
+.*/
+
+/* Sign extension to bfd_signed_vma.  */
+#define COERCE16(x) (((bfd_signed_vma) (x) ^ 0x8000) - 0x8000)
+#define COERCE32(x) (((bfd_signed_vma) (x) ^ 0x80000000) - 0x80000000)
+#define EIGHT_GAZILLION ((bfd_int64_t) 1 << 63)
+#define COERCE64(x) \
+  (((bfd_int64_t) (x) ^ EIGHT_GAZILLION) - EIGHT_GAZILLION)
+
+bfd_vma
+bfd_getb16 (const void *p)
+{
+  const bfd_byte *addr = (const bfd_byte *) p;
+  return (addr[0] << 8) | addr[1];
+}
+
+bfd_vma
+bfd_getl16 (const void *p)
+{
+  const bfd_byte *addr = (const bfd_byte *) p;
+  return (addr[1] << 8) | addr[0];
+}
+
+bfd_signed_vma
+bfd_getb_signed_16 (const void *p)
+{
+  const bfd_byte *addr = (const bfd_byte *) p;
+  return COERCE16 ((addr[0] << 8) | addr[1]);
+}
+
+bfd_signed_vma
+bfd_getl_signed_16 (const void *p)
+{
+  const bfd_byte *addr = (const bfd_byte *) p;
+  return COERCE16 ((addr[1] << 8) | addr[0]);
+}
+
+void
+bfd_putb16 (bfd_vma data, void *p)
+{
+  bfd_byte *addr = (bfd_byte *) p;
+  addr[0] = (data >> 8) & 0xff;
+  addr[1] = data & 0xff;
+}
+
+void
+bfd_putl16 (bfd_vma data, void *p)
+{
+  bfd_byte *addr = (bfd_byte *) p;
+  addr[0] = data & 0xff;
+  addr[1] = (data >> 8) & 0xff;
+}
+
+bfd_vma
+bfd_getb32 (const void *p)
+{
+  const bfd_byte *addr = (const bfd_byte *) p;
+  unsigned long v;
+
+  v = (unsigned long) addr[0] << 24;
+  v |= (unsigned long) addr[1] << 16;
+  v |= (unsigned long) addr[2] << 8;
+  v |= (unsigned long) addr[3];
+  return v;
+}
+
+bfd_vma
+bfd_getl32 (const void *p)
+{
+  const bfd_byte *addr = (const bfd_byte *) p;
+  unsigned long v;
+
+  v = (unsigned long) addr[0];
+  v |= (unsigned long) addr[1] << 8;
+  v |= (unsigned long) addr[2] << 16;
+  v |= (unsigned long) addr[3] << 24;
+  return v;
+}
+
+bfd_signed_vma
+bfd_getb_signed_32 (const void *p)
+{
+  const bfd_byte *addr = (const bfd_byte *) p;
+  unsigned long v;
+
+  v = (unsigned long) addr[0] << 24;
+  v |= (unsigned long) addr[1] << 16;
+  v |= (unsigned long) addr[2] << 8;
+  v |= (unsigned long) addr[3];
+  return COERCE32 (v);
+}
+
+bfd_signed_vma
+bfd_getl_signed_32 (const void *p)
+{
+  const bfd_byte *addr = (const bfd_byte *) p;
+  unsigned long v;
+
+  v = (unsigned long) addr[0];
+  v |= (unsigned long) addr[1] << 8;
+  v |= (unsigned long) addr[2] << 16;
+  v |= (unsigned long) addr[3] << 24;
+  return COERCE32 (v);
+}
+
+bfd_uint64_t
+bfd_getb64 (const void *p ATTRIBUTE_UNUSED)
+{
+#ifdef BFD_HOST_64_BIT
+  const bfd_byte *addr = (const bfd_byte *) p;
+  bfd_uint64_t v;
+
+  v  = addr[0]; v <<= 8;
+  v |= addr[1]; v <<= 8;
+  v |= addr[2]; v <<= 8;
+  v |= addr[3]; v <<= 8;
+  v |= addr[4]; v <<= 8;
+  v |= addr[5]; v <<= 8;
+  v |= addr[6]; v <<= 8;
+  v |= addr[7];
+
+  return v;
+#else
+  BFD_FAIL();
+  return 0;
+#endif
+}
+
+bfd_uint64_t
+bfd_getl64 (const void *p ATTRIBUTE_UNUSED)
+{
+#ifdef BFD_HOST_64_BIT
+  const bfd_byte *addr = (const bfd_byte *) p;
+  bfd_uint64_t v;
+
+  v  = addr[7]; v <<= 8;
+  v |= addr[6]; v <<= 8;
+  v |= addr[5]; v <<= 8;
+  v |= addr[4]; v <<= 8;
+  v |= addr[3]; v <<= 8;
+  v |= addr[2]; v <<= 8;
+  v |= addr[1]; v <<= 8;
+  v |= addr[0];
+
+  return v;
+#else
+  BFD_FAIL();
+  return 0;
+#endif
+
+}
+
+bfd_int64_t
+bfd_getb_signed_64 (const void *p ATTRIBUTE_UNUSED)
+{
+#ifdef BFD_HOST_64_BIT
+  const bfd_byte *addr = (const bfd_byte *) p;
+  bfd_uint64_t v;
+
+  v  = addr[0]; v <<= 8;
+  v |= addr[1]; v <<= 8;
+  v |= addr[2]; v <<= 8;
+  v |= addr[3]; v <<= 8;
+  v |= addr[4]; v <<= 8;
+  v |= addr[5]; v <<= 8;
+  v |= addr[6]; v <<= 8;
+  v |= addr[7];
+
+  return COERCE64 (v);
+#else
+  BFD_FAIL();
+  return 0;
+#endif
+}
+
+bfd_int64_t
+bfd_getl_signed_64 (const void *p ATTRIBUTE_UNUSED)
+{
+#ifdef BFD_HOST_64_BIT
+  const bfd_byte *addr = (const bfd_byte *) p;
+  bfd_uint64_t v;
+
+  v  = addr[7]; v <<= 8;
+  v |= addr[6]; v <<= 8;
+  v |= addr[5]; v <<= 8;
+  v |= addr[4]; v <<= 8;
+  v |= addr[3]; v <<= 8;
+  v |= addr[2]; v <<= 8;
+  v |= addr[1]; v <<= 8;
+  v |= addr[0];
+
+  return COERCE64 (v);
+#else
+  BFD_FAIL();
+  return 0;
+#endif
+}
+
+void
+bfd_putb32 (bfd_vma data, void *p)
+{
+  bfd_byte *addr = (bfd_byte *) p;
+  addr[0] = (data >> 24) & 0xff;
+  addr[1] = (data >> 16) & 0xff;
+  addr[2] = (data >>  8) & 0xff;
+  addr[3] = data & 0xff;
+}
+
+void
+bfd_putl32 (bfd_vma data, void *p)
+{
+  bfd_byte *addr = (bfd_byte *) p;
+  addr[0] = data & 0xff;
+  addr[1] = (data >>  8) & 0xff;
+  addr[2] = (data >> 16) & 0xff;
+  addr[3] = (data >> 24) & 0xff;
+}
+
+void
+bfd_putb64 (bfd_uint64_t data ATTRIBUTE_UNUSED, void *p ATTRIBUTE_UNUSED)
+{
+#ifdef BFD_HOST_64_BIT
+  bfd_byte *addr = (bfd_byte *) p;
+  addr[0] = (data >> (7*8)) & 0xff;
+  addr[1] = (data >> (6*8)) & 0xff;
+  addr[2] = (data >> (5*8)) & 0xff;
+  addr[3] = (data >> (4*8)) & 0xff;
+  addr[4] = (data >> (3*8)) & 0xff;
+  addr[5] = (data >> (2*8)) & 0xff;
+  addr[6] = (data >> (1*8)) & 0xff;
+  addr[7] = (data >> (0*8)) & 0xff;
+#else
+  BFD_FAIL();
+#endif
+}
+
+void
+bfd_putl64 (bfd_uint64_t data ATTRIBUTE_UNUSED, void *p ATTRIBUTE_UNUSED)
+{
+#ifdef BFD_HOST_64_BIT
+  bfd_byte *addr = (bfd_byte *) p;
+  addr[7] = (data >> (7*8)) & 0xff;
+  addr[6] = (data >> (6*8)) & 0xff;
+  addr[5] = (data >> (5*8)) & 0xff;
+  addr[4] = (data >> (4*8)) & 0xff;
+  addr[3] = (data >> (3*8)) & 0xff;
+  addr[2] = (data >> (2*8)) & 0xff;
+  addr[1] = (data >> (1*8)) & 0xff;
+  addr[0] = (data >> (0*8)) & 0xff;
+#else
+  BFD_FAIL();
+#endif
+}
+
+void
+bfd_put_bits (bfd_uint64_t data, void *p, int bits, bfd_boolean big_p)
+{
+  bfd_byte *addr = (bfd_byte *) p;
+  int i;
+  int bytes;
+
+  if (bits % 8 != 0)
+    abort ();
+
+  bytes = bits / 8;
+  for (i = 0; i < bytes; i++)
+    {
+      int addr_index = big_p ? bytes - i - 1 : i;
+
+      addr[addr_index] = data & 0xff;
+      data >>= 8;
+    }
+}
+
+bfd_uint64_t
+bfd_get_bits (const void *p, int bits, bfd_boolean big_p)
+{
+  const bfd_byte *addr = (const bfd_byte *) p;
+  bfd_uint64_t data;
+  int i;
+  int bytes;
+
+  if (bits % 8 != 0)
+    abort ();
+
+  data = 0;
+  bytes = bits / 8;
+  for (i = 0; i < bytes; i++)
+    {
+      int addr_index = big_p ? i : bytes - i - 1;
+
+      data = (data << 8) | addr[addr_index];
+    }
+
+  return data;
+}
+
+/* Default implementation */
+
+bfd_boolean
+_bfd_generic_get_section_contents (bfd *abfd,
+				   sec_ptr section,
+				   void *location,
+				   file_ptr offset,
+				   bfd_size_type count)
+{
+  bfd_size_type sz;
+  if (count == 0)
+    return TRUE;
+
+  if (section->compress_status != COMPRESS_SECTION_NONE)
+    {
+      (*_bfd_error_handler)
+	(_("%B: unable to get decompressed section %A"),
+	 abfd, section);
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  /* We do allow reading of a section after bfd_final_link has
+     written the contents out to disk.  In that situation, rawsize is
+     just a stale version of size, so ignore it.  Otherwise we must be
+     reading an input section, where rawsize, if different to size,
+     is the on-disk size.  */
+  if (abfd->direction != write_direction && section->rawsize != 0)
+    sz = section->rawsize;
+  else
+    sz = section->size;
+  if (offset + count < count
+      || offset + count > sz)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0
+      || bfd_bread (location, count, abfd) != count)
+    return FALSE;
+
+  return TRUE;
+}
+
+bfd_boolean
+_bfd_generic_get_section_contents_in_window
+  (bfd *abfd ATTRIBUTE_UNUSED,
+   sec_ptr section ATTRIBUTE_UNUSED,
+   bfd_window *w ATTRIBUTE_UNUSED,
+   file_ptr offset ATTRIBUTE_UNUSED,
+   bfd_size_type count ATTRIBUTE_UNUSED)
+{
+#ifdef USE_MMAP
+  bfd_size_type sz;
+
+  if (count == 0)
+    return TRUE;
+  if (abfd->xvec->_bfd_get_section_contents
+      != _bfd_generic_get_section_contents)
+    {
+      /* We don't know what changes the bfd's get_section_contents
+	 method may have to make.  So punt trying to map the file
+	 window, and let get_section_contents do its thing.  */
+      /* @@ FIXME : If the internal window has a refcount of 1 and was
+	 allocated with malloc instead of mmap, just reuse it.  */
+      bfd_free_window (w);
+      w->i = bfd_zmalloc (sizeof (bfd_window_internal));
+      if (w->i == NULL)
+	return FALSE;
+      w->i->data = bfd_malloc (count);
+      if (w->i->data == NULL)
+	{
+	  free (w->i);
+	  w->i = NULL;
+	  return FALSE;
+	}
+      w->i->mapped = 0;
+      w->i->refcount = 1;
+      w->size = w->i->size = count;
+      w->data = w->i->data;
+      return bfd_get_section_contents (abfd, section, w->data, offset, count);
+    }
+  if (abfd->direction != write_direction && section->rawsize != 0)
+    sz = section->rawsize;
+  else
+    sz = section->size;
+  if (offset + count > sz
+      || ! bfd_get_file_window (abfd, section->filepos + offset, count, w,
+				TRUE))
+    return FALSE;
+  return TRUE;
+#else
+  abort ();
+#endif
+}
+
+/* This generic function can only be used in implementations where creating
+   NEW sections is disallowed.  It is useful in patching existing sections
+   in read-write files, though.  See other set_section_contents functions
+   to see why it doesn't work for new sections.  */
+bfd_boolean
+_bfd_generic_set_section_contents (bfd *abfd,
+				   sec_ptr section,
+				   const void *location,
+				   file_ptr offset,
+				   bfd_size_type count)
+{
+  if (count == 0)
+    return TRUE;
+
+  if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0
+      || bfd_bwrite (location, count, abfd) != count)
+    return FALSE;
+
+  return TRUE;
+}
+
+/*
+INTERNAL_FUNCTION
+	bfd_log2
+
+SYNOPSIS
+	unsigned int bfd_log2 (bfd_vma x);
+
+DESCRIPTION
+	Return the log base 2 of the value supplied, rounded up.  E.g., an
+	@var{x} of 1025 returns 11.  A @var{x} of 0 returns 0.
+*/
+
+unsigned int
+bfd_log2 (bfd_vma x)
+{
+  unsigned int result = 0;
+
+  if (x <= 1)
+    return result;
+  --x;
+  do
+    ++result;
+  while ((x >>= 1) != 0);
+  return result;
+}
+
+bfd_boolean
+bfd_generic_is_local_label_name (bfd *abfd, const char *name)
+{
+  char locals_prefix = (bfd_get_symbol_leading_char (abfd) == '_') ? 'L' : '.';
+
+  return name[0] == locals_prefix;
+}
+
+/*  Can be used from / for bfd_merge_private_bfd_data to check that
+    endianness matches between input and output file.  Returns
+    TRUE for a match, otherwise returns FALSE and emits an error.  */
+bfd_boolean
+_bfd_generic_verify_endian_match (bfd *ibfd, bfd *obfd)
+{
+  if (ibfd->xvec->byteorder != obfd->xvec->byteorder
+      && ibfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN
+      && obfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN)
+    {
+      const char *msg;
+
+      if (bfd_big_endian (ibfd))
+	msg = _("%B: compiled for a big endian system and target is little endian");
+      else
+	msg = _("%B: compiled for a little endian system and target is big endian");
+
+      (*_bfd_error_handler) (msg, ibfd);
+
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Give a warning at runtime if someone compiles code which calls
+   old routines.  */
+
+void
+warn_deprecated (const char *what,
+		 const char *file,
+		 int line,
+		 const char *func)
+{
+  /* Poor man's tracking of functions we've already warned about.  */
+  static size_t mask = 0;
+
+  if (~(size_t) func & ~mask)
+    {
+      fflush (stdout);
+      /* Note: separate sentences in order to allow
+	 for translation into other languages.  */
+      if (func)
+	fprintf (stderr, _("Deprecated %s called at %s line %d in %s\n"),
+		 what, file, line, func);
+      else
+	fprintf (stderr, _("Deprecated %s called\n"), what);
+      fflush (stderr);
+      mask |= ~(size_t) func;
+    }
+}
+
+/* Helper function for reading uleb128 encoded data.  */
+
+bfd_vma
+read_unsigned_leb128 (bfd *abfd ATTRIBUTE_UNUSED,
+		      bfd_byte *buf,
+		      unsigned int *bytes_read_ptr)
+{
+  bfd_vma result;
+  unsigned int num_read;
+  unsigned int shift;
+  unsigned char byte;
+
+  result = 0;
+  shift = 0;
+  num_read = 0;
+  do
+    {
+      byte = bfd_get_8 (abfd, buf);
+      buf++;
+      num_read++;
+      result |= (((bfd_vma) byte & 0x7f) << shift);
+      shift += 7;
+    }
+  while (byte & 0x80);
+  *bytes_read_ptr = num_read;
+  return result;
+}
+
+/* Helper function for reading sleb128 encoded data.  */
+
+bfd_signed_vma
+read_signed_leb128 (bfd *abfd ATTRIBUTE_UNUSED,
+		    bfd_byte *buf,
+		    unsigned int *bytes_read_ptr)
+{
+  bfd_vma result;
+  unsigned int shift;
+  unsigned int num_read;
+  unsigned char byte;
+
+  result = 0;
+  shift = 0;
+  num_read = 0;
+  do
+    {
+      byte = bfd_get_8 (abfd, buf);
+      buf ++;
+      num_read ++;
+      result |= (((bfd_vma) byte & 0x7f) << shift);
+      shift += 7;
+    }
+  while (byte & 0x80);
+  if (shift < 8 * sizeof (result) && (byte & 0x40))
+    result |= (((bfd_vma) -1) << shift);
+  *bytes_read_ptr = num_read;
+  return result;
+}
+
+bfd_boolean
+_bfd_generic_find_line (bfd *abfd ATTRIBUTE_UNUSED,
+		       asymbol **symbols ATTRIBUTE_UNUSED,
+		       asymbol *symbol ATTRIBUTE_UNUSED,
+		       const char **filename_ptr ATTRIBUTE_UNUSED,
+		       unsigned int *linenumber_ptr ATTRIBUTE_UNUSED)
+{
+  return FALSE;
+}
+
+bfd_boolean
+_bfd_generic_init_private_section_data (bfd *ibfd ATTRIBUTE_UNUSED,
+					asection *isec ATTRIBUTE_UNUSED,
+					bfd *obfd ATTRIBUTE_UNUSED,
+					asection *osec ATTRIBUTE_UNUSED,
+					struct bfd_link_info *link_info ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libbfd.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libbfd.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libbfd.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libbfd.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2520 @@
+/* DO NOT EDIT!  -*- buffer-read-only: t -*-  This file is automatically 
+   generated from "libbfd-in.h", "init.c", "libbfd.c", "bfdio.c", 
+   "bfdwin.c", "cache.c", "reloc.c", "archures.c" and "elf.c".
+   Run "make headers" in your build bfd/ to regenerate.  */
+
+/* libbfd.h -- Declarations used by bfd library *implementation*.
+   (This include file is not for users of the library.)
+
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+   2010, 2011
+   Free Software Foundation, Inc.
+
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "hashtab.h"
+
+/* Align an address upward to a boundary, expressed as a number of bytes.
+   E.g. align to an 8-byte boundary with argument of 8.  Take care never
+   to wrap around if the address is within boundary-1 of the end of the
+   address space.  */
+#define BFD_ALIGN(this, boundary)					  \
+  ((((bfd_vma) (this) + (boundary) - 1) >= (bfd_vma) (this))		  \
+   ? (((bfd_vma) (this) + ((boundary) - 1)) & ~ (bfd_vma) ((boundary)-1)) \
+   : ~ (bfd_vma) 0)
+
+/* If you want to read and write large blocks, you might want to do it
+   in quanta of this amount */
+#define DEFAULT_BUFFERSIZE 8192
+
+/* Set a tdata field.  Can't use the other macros for this, since they
+   do casts, and casting to the left of assignment isn't portable.  */
+#define set_tdata(bfd, v) ((bfd)->tdata.any = (v))
+
+/* If BFD_IN_MEMORY is set for a BFD, then the iostream fields points
+   to an instance of this structure.  */
+
+struct bfd_in_memory
+{
+  /* Size of buffer.  */
+  bfd_size_type size;
+  /* Buffer holding contents of BFD.  */
+  bfd_byte *buffer;
+};
+
+struct section_hash_entry
+{
+  struct bfd_hash_entry root;
+  asection section;
+};
+
+/* tdata for an archive.  For an input archive, cache
+   needs to be free()'d.  For an output archive, symdefs do.  */
+
+struct artdata {
+  file_ptr first_file_filepos;
+  /* Speed up searching the armap */
+  htab_t cache;
+  bfd *archive_head;		/* Only interesting in output routines */
+  carsym *symdefs;		/* the symdef entries */
+  symindex symdef_count;	/* how many there are */
+  char *extended_names;		/* clever intel extension */
+  bfd_size_type extended_names_size; /* Size of extended names */
+  /* when more compilers are standard C, this can be a time_t */
+  long  armap_timestamp;	/* Timestamp value written into armap.
+				   This is used for BSD archives to check
+				   that the timestamp is recent enough
+				   for the BSD linker to not complain,
+				   just before we finish writing an
+				   archive.  */
+  file_ptr armap_datepos;	/* Position within archive to seek to
+				   rewrite the date field.  */
+  void *tdata;			/* Backend specific information.  */
+};
+
+#define bfd_ardata(bfd) ((bfd)->tdata.aout_ar_data)
+
+/* Goes in bfd's arelt_data slot */
+struct areltdata {
+  char * arch_header;		/* it's actually a string */
+  unsigned int parsed_size;	/* octets of filesize not including ar_hdr */
+  unsigned int extra_size;	/* BSD4.4: extra bytes after the header.  */
+  char *filename;		/* null-terminated */
+  file_ptr origin;		/* for element of a thin archive */
+};
+
+#define arelt_size(bfd) (((struct areltdata *)((bfd)->arelt_data))->parsed_size)
+
+extern void *bfd_malloc
+  (bfd_size_type);
+extern void *bfd_realloc
+  (void *, bfd_size_type);
+extern void *bfd_realloc_or_free
+  (void *, bfd_size_type);
+extern void *bfd_zmalloc
+  (bfd_size_type);
+extern void *bfd_malloc2
+  (bfd_size_type, bfd_size_type);
+extern void *bfd_realloc2
+  (void *, bfd_size_type, bfd_size_type);
+extern void *bfd_zmalloc2
+  (bfd_size_type, bfd_size_type);
+
+extern void _bfd_default_error_handler (const char *s, ...);
+extern bfd_error_handler_type _bfd_error_handler;
+
+/* These routines allocate and free things on the BFD's objalloc.  */
+
+extern void *bfd_alloc2
+  (bfd *, bfd_size_type, bfd_size_type);
+extern void *bfd_zalloc2
+  (bfd *, bfd_size_type, bfd_size_type);
+extern void bfd_release
+  (bfd *, void *);
+
+bfd * _bfd_create_empty_archive_element_shell
+  (bfd *obfd);
+bfd * _bfd_look_for_bfd_in_cache
+  (bfd *, file_ptr);
+bfd_boolean _bfd_add_bfd_to_archive_cache
+  (bfd *, file_ptr, bfd *);
+bfd_boolean _bfd_generic_mkarchive
+  (bfd *abfd);
+char *_bfd_append_relative_path
+  (bfd *arch, char *elt_name);
+const bfd_target *bfd_generic_archive_p
+  (bfd *abfd);
+bfd_boolean bfd_slurp_armap
+  (bfd *abfd);
+bfd_boolean bfd_slurp_bsd_armap_f2
+  (bfd *abfd);
+#define bfd_slurp_bsd_armap bfd_slurp_armap
+#define bfd_slurp_coff_armap bfd_slurp_armap
+bfd_boolean _bfd_slurp_extended_name_table
+  (bfd *abfd);
+extern bfd_boolean _bfd_construct_extended_name_table
+  (bfd *, bfd_boolean, char **, bfd_size_type *);
+bfd_boolean _bfd_write_archive_contents
+  (bfd *abfd);
+bfd_boolean _bfd_compute_and_write_armap
+  (bfd *, unsigned int elength);
+bfd *_bfd_get_elt_at_filepos
+  (bfd *archive, file_ptr filepos);
+extern bfd *_bfd_generic_get_elt_at_index
+  (bfd *, symindex);
+bfd * _bfd_new_bfd
+  (void);
+void _bfd_delete_bfd
+  (bfd *);
+bfd_boolean _bfd_free_cached_info
+  (bfd *);
+
+bfd_boolean bfd_false
+  (bfd *ignore);
+bfd_boolean bfd_true
+  (bfd *ignore);
+void *bfd_nullvoidptr
+  (bfd *ignore);
+int bfd_0
+  (bfd *ignore);
+unsigned int bfd_0u
+  (bfd *ignore);
+long bfd_0l
+  (bfd *ignore);
+long _bfd_n1
+  (bfd *ignore);
+void bfd_void
+  (bfd *ignore);
+
+bfd *_bfd_new_bfd_contained_in
+  (bfd *);
+const bfd_target *_bfd_dummy_target
+  (bfd *abfd);
+
+void bfd_dont_truncate_arname
+  (bfd *abfd, const char *filename, char *hdr);
+void bfd_bsd_truncate_arname
+  (bfd *abfd, const char *filename, char *hdr);
+void bfd_gnu_truncate_arname
+  (bfd *abfd, const char *filename, char *hdr);
+
+bfd_boolean bsd_write_armap
+  (bfd *arch, unsigned int elength, struct orl *map, unsigned int orl_count,
+   int stridx);
+
+bfd_boolean coff_write_armap
+  (bfd *arch, unsigned int elength, struct orl *map, unsigned int orl_count,
+   int stridx);
+
+extern void *_bfd_generic_read_ar_hdr
+  (bfd *);
+extern void _bfd_ar_spacepad
+  (char *, size_t, const char *, long);
+
+extern void *_bfd_generic_read_ar_hdr_mag
+  (bfd *, const char *);
+
+extern bfd_boolean _bfd_generic_write_ar_hdr
+  (bfd *, bfd *);
+
+extern bfd_boolean _bfd_bsd44_write_ar_hdr
+  (bfd *, bfd *);
+
+bfd * bfd_generic_openr_next_archived_file
+  (bfd *archive, bfd *last_file);
+
+int bfd_generic_stat_arch_elt
+  (bfd *, struct stat *);
+
+#define _bfd_read_ar_hdr(abfd) \
+  BFD_SEND (abfd, _bfd_read_ar_hdr_fn, (abfd))
+#define _bfd_write_ar_hdr(archive, abfd)         \
+  BFD_SEND (abfd, _bfd_write_ar_hdr_fn, (archive, abfd))
+
+/* Generic routines to use for BFD_JUMP_TABLE_GENERIC.  Use
+   BFD_JUMP_TABLE_GENERIC (_bfd_generic).  */
+
+#define _bfd_generic_close_and_cleanup bfd_true
+#define _bfd_generic_bfd_free_cached_info bfd_true
+extern bfd_boolean _bfd_generic_new_section_hook
+  (bfd *, asection *);
+extern bfd_boolean _bfd_generic_get_section_contents
+  (bfd *, asection *, void *, file_ptr, bfd_size_type);
+extern bfd_boolean _bfd_generic_get_section_contents_in_window
+  (bfd *, asection *, bfd_window *, file_ptr, bfd_size_type);
+
+/* Generic routines to use for BFD_JUMP_TABLE_COPY.  Use
+   BFD_JUMP_TABLE_COPY (_bfd_generic).  */
+
+#define _bfd_generic_bfd_copy_private_bfd_data \
+  ((bfd_boolean (*) (bfd *, bfd *)) bfd_true)
+#define _bfd_generic_bfd_merge_private_bfd_data \
+  ((bfd_boolean (*) (bfd *, bfd *)) bfd_true)
+#define _bfd_generic_bfd_set_private_flags \
+  ((bfd_boolean (*) (bfd *, flagword)) bfd_true)
+#define _bfd_generic_bfd_copy_private_section_data \
+  ((bfd_boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true)
+#define _bfd_generic_bfd_copy_private_symbol_data \
+  ((bfd_boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true)
+#define _bfd_generic_bfd_copy_private_header_data \
+  ((bfd_boolean (*) (bfd *, bfd *)) bfd_true)
+#define _bfd_generic_bfd_print_private_bfd_data \
+  ((bfd_boolean (*) (bfd *, void *)) bfd_true)
+
+extern bfd_boolean _bfd_generic_init_private_section_data
+  (bfd *, asection *, bfd *, asection *, struct bfd_link_info *);
+
+/* Routines to use for BFD_JUMP_TABLE_CORE when there is no core file
+   support.  Use BFD_JUMP_TABLE_CORE (_bfd_nocore).  */
+
+extern char *_bfd_nocore_core_file_failing_command
+  (bfd *);
+extern int _bfd_nocore_core_file_failing_signal
+  (bfd *);
+extern bfd_boolean _bfd_nocore_core_file_matches_executable_p
+  (bfd *, bfd *);
+extern int _bfd_nocore_core_file_pid
+  (bfd *);
+
+/* Routines to use for BFD_JUMP_TABLE_ARCHIVE when there is no archive
+   file support.  Use BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive).  */
+
+#define _bfd_noarchive_slurp_armap bfd_false
+#define _bfd_noarchive_slurp_extended_name_table bfd_false
+#define _bfd_noarchive_construct_extended_name_table \
+  ((bfd_boolean (*) (bfd *, char **, bfd_size_type *, const char **)) \
+   bfd_false)
+#define _bfd_noarchive_truncate_arname \
+  ((void (*) (bfd *, const char *, char *)) bfd_void)
+#define _bfd_noarchive_write_armap \
+  ((bfd_boolean (*) (bfd *, unsigned int, struct orl *, unsigned int, int)) \
+   bfd_false)
+#define _bfd_noarchive_read_ar_hdr bfd_nullvoidptr
+#define _bfd_noarchive_write_ar_hdr \
+  ((bfd_boolean (*) (bfd *, bfd *)) bfd_false)
+#define _bfd_noarchive_openr_next_archived_file \
+  ((bfd *(*) (bfd *, bfd *)) bfd_nullvoidptr)
+#define _bfd_noarchive_get_elt_at_index \
+  ((bfd *(*) (bfd *, symindex)) bfd_nullvoidptr)
+#define _bfd_noarchive_generic_stat_arch_elt bfd_generic_stat_arch_elt
+#define _bfd_noarchive_update_armap_timestamp bfd_false
+
+/* Routines to use for BFD_JUMP_TABLE_ARCHIVE to get BSD style
+   archives.  Use BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd).  */
+
+#define _bfd_archive_bsd_slurp_armap bfd_slurp_bsd_armap
+#define _bfd_archive_bsd_slurp_extended_name_table \
+  _bfd_slurp_extended_name_table
+extern bfd_boolean _bfd_archive_bsd_construct_extended_name_table
+  (bfd *, char **, bfd_size_type *, const char **);
+#define _bfd_archive_bsd_truncate_arname bfd_bsd_truncate_arname
+#define _bfd_archive_bsd_write_armap bsd_write_armap
+#define _bfd_archive_bsd_read_ar_hdr _bfd_generic_read_ar_hdr
+#define _bfd_archive_bsd_write_ar_hdr _bfd_generic_write_ar_hdr
+#define _bfd_archive_bsd_openr_next_archived_file \
+  bfd_generic_openr_next_archived_file
+#define _bfd_archive_bsd_get_elt_at_index _bfd_generic_get_elt_at_index
+#define _bfd_archive_bsd_generic_stat_arch_elt \
+  bfd_generic_stat_arch_elt
+extern bfd_boolean _bfd_archive_bsd_update_armap_timestamp
+  (bfd *);
+
+/* Routines to use for BFD_JUMP_TABLE_ARCHIVE to get COFF style
+   archives.  Use BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff).  */
+
+#define _bfd_archive_coff_slurp_armap bfd_slurp_coff_armap
+#define _bfd_archive_coff_slurp_extended_name_table \
+  _bfd_slurp_extended_name_table
+extern bfd_boolean _bfd_archive_coff_construct_extended_name_table
+  (bfd *, char **, bfd_size_type *, const char **);
+#define _bfd_archive_coff_truncate_arname bfd_dont_truncate_arname
+#define _bfd_archive_coff_write_armap coff_write_armap
+#define _bfd_archive_coff_read_ar_hdr _bfd_generic_read_ar_hdr
+#define _bfd_archive_coff_write_ar_hdr _bfd_generic_write_ar_hdr
+#define _bfd_archive_coff_openr_next_archived_file \
+  bfd_generic_openr_next_archived_file
+#define _bfd_archive_coff_get_elt_at_index _bfd_generic_get_elt_at_index
+#define _bfd_archive_coff_generic_stat_arch_elt \
+  bfd_generic_stat_arch_elt
+#define _bfd_archive_coff_update_armap_timestamp bfd_true
+
+/* Routines to use for BFD_JUMP_TABLE_ARCHIVE to get BSD4.4 style
+   archives.  Use BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd44).  */
+
+#define _bfd_archive_bsd44_slurp_armap bfd_slurp_bsd_armap
+#define _bfd_archive_bsd44_slurp_extended_name_table \
+  _bfd_slurp_extended_name_table
+extern bfd_boolean _bfd_archive_bsd44_construct_extended_name_table
+  (bfd *, char **, bfd_size_type *, const char **);
+#define _bfd_archive_bsd44_truncate_arname bfd_bsd_truncate_arname
+#define _bfd_archive_bsd44_write_armap bsd_write_armap
+#define _bfd_archive_bsd44_read_ar_hdr _bfd_generic_read_ar_hdr
+#define _bfd_archive_bsd44_write_ar_hdr _bfd_bsd44_write_ar_hdr
+#define _bfd_archive_bsd44_openr_next_archived_file \
+  bfd_generic_openr_next_archived_file
+#define _bfd_archive_bsd44_get_elt_at_index _bfd_generic_get_elt_at_index
+#define _bfd_archive_bsd44_generic_stat_arch_elt \
+  bfd_generic_stat_arch_elt
+#define _bfd_archive_bsd44_update_armap_timestamp \
+  _bfd_archive_bsd_update_armap_timestamp
+
+/* Routines to use for BFD_JUMP_TABLE_ARCHIVE to get VMS style
+   archives.  Use BFD_JUMP_TABLE_ARCHIVE (_bfd_vms_lib).  Some of them
+   are irrelevant and never called, so defined as NULL.  */
+
+extern bfd_boolean _bfd_vms_lib_write_archive_contents (bfd *arch);
+#define _bfd_vms_lib_slurp_armap NULL
+#define _bfd_vms_lib_slurp_extended_name_table NULL
+#define _bfd_vms_lib_construct_extended_name_table NULL
+#define _bfd_vms_lib_truncate_arname NULL
+#define _bfd_vms_lib_write_armap NULL
+#define _bfd_vms_lib_read_ar_hdr NULL
+#define _bfd_vms_lib_write_ar_hdr NULL
+extern bfd *_bfd_vms_lib_openr_next_archived_file (bfd *, bfd *);
+extern bfd *_bfd_vms_lib_get_elt_at_index (bfd *, symindex);
+extern int _bfd_vms_lib_generic_stat_arch_elt (bfd *, struct stat *);
+#define _bfd_vms_lib_update_armap_timestamp bfd_true
+
+/* Extra routines for VMS style archives.  */
+
+extern symindex _bfd_vms_lib_find_symbol (bfd *, const char *);
+extern bfd *_bfd_vms_lib_get_imagelib_file (bfd *);
+extern const bfd_target *_bfd_vms_lib_alpha_archive_p (bfd *abfd);
+extern const bfd_target *_bfd_vms_lib_ia64_archive_p (bfd *abfd);
+extern bfd_boolean _bfd_vms_lib_alpha_mkarchive (bfd *abfd);
+extern bfd_boolean _bfd_vms_lib_ia64_mkarchive (bfd *abfd);
+
+/* Routines to use for BFD_JUMP_TABLE_SYMBOLS where there is no symbol
+   support.  Use BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols).  */
+
+#define _bfd_nosymbols_get_symtab_upper_bound _bfd_n1
+#define _bfd_nosymbols_canonicalize_symtab \
+  ((long (*) (bfd *, asymbol **)) _bfd_n1)
+#define _bfd_nosymbols_make_empty_symbol _bfd_generic_make_empty_symbol
+#define _bfd_nosymbols_print_symbol \
+  ((void (*) (bfd *, void *, asymbol *, bfd_print_symbol_type)) bfd_void)
+#define _bfd_nosymbols_get_symbol_info \
+  ((void (*) (bfd *, asymbol *, symbol_info *)) bfd_void)
+#define _bfd_nosymbols_bfd_is_local_label_name \
+  ((bfd_boolean (*) (bfd *, const char *)) bfd_false)
+#define _bfd_nosymbols_bfd_is_target_special_symbol \
+  ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define _bfd_nosymbols_get_lineno \
+  ((alent *(*) (bfd *, asymbol *)) bfd_nullvoidptr)
+#define _bfd_nosymbols_find_nearest_line \
+  ((bfd_boolean (*) (bfd *, asection *, asymbol **, bfd_vma, const char **, \
+		     const char **, unsigned int *)) \
+   bfd_false)
+#define _bfd_nosymbols_find_inliner_info \
+  ((bfd_boolean (*) (bfd *, const char **, const char **, unsigned int *)) \
+   bfd_false)
+#define _bfd_nosymbols_bfd_make_debug_symbol \
+  ((asymbol *(*) (bfd *, void *, unsigned long)) bfd_nullvoidptr)
+#define _bfd_nosymbols_read_minisymbols \
+  ((long (*) (bfd *, bfd_boolean, void **, unsigned int *)) _bfd_n1)
+#define _bfd_nosymbols_minisymbol_to_symbol \
+  ((asymbol *(*) (bfd *, bfd_boolean, const void *, asymbol *)) \
+   bfd_nullvoidptr)
+
+/* Routines to use for BFD_JUMP_TABLE_RELOCS when there is no reloc
+   support.  Use BFD_JUMP_TABLE_RELOCS (_bfd_norelocs).  */
+
+extern long _bfd_norelocs_get_reloc_upper_bound (bfd *, asection *);
+extern long _bfd_norelocs_canonicalize_reloc (bfd *, asection *,
+					      arelent **, asymbol **);
+#define _bfd_norelocs_bfd_reloc_type_lookup \
+  ((reloc_howto_type *(*) (bfd *, bfd_reloc_code_real_type)) bfd_nullvoidptr)
+#define _bfd_norelocs_bfd_reloc_name_lookup \
+  ((reloc_howto_type *(*) (bfd *, const char *)) bfd_nullvoidptr)
+
+/* Routines to use for BFD_JUMP_TABLE_WRITE for targets which may not
+   be written.  Use BFD_JUMP_TABLE_WRITE (_bfd_nowrite).  */
+
+#define _bfd_nowrite_set_arch_mach \
+  ((bfd_boolean (*) (bfd *, enum bfd_architecture, unsigned long)) \
+   bfd_false)
+#define _bfd_nowrite_set_section_contents \
+  ((bfd_boolean (*) (bfd *, asection *, const void *, file_ptr, bfd_size_type)) \
+   bfd_false)
+
+/* Generic routines to use for BFD_JUMP_TABLE_WRITE.  Use
+   BFD_JUMP_TABLE_WRITE (_bfd_generic).  */
+
+#define _bfd_generic_set_arch_mach bfd_default_set_arch_mach
+extern bfd_boolean _bfd_generic_set_section_contents
+  (bfd *, asection *, const void *, file_ptr, bfd_size_type);
+
+/* Routines to use for BFD_JUMP_TABLE_LINK for targets which do not
+   support linking.  Use BFD_JUMP_TABLE_LINK (_bfd_nolink).  */
+
+#define _bfd_nolink_sizeof_headers \
+  ((int (*) (bfd *, struct bfd_link_info *)) bfd_0)
+#define _bfd_nolink_bfd_get_relocated_section_contents \
+  ((bfd_byte *(*) (bfd *, struct bfd_link_info *, struct bfd_link_order *, \
+		   bfd_byte *, bfd_boolean, asymbol **)) \
+   bfd_nullvoidptr)
+#define _bfd_nolink_bfd_relax_section \
+  ((bfd_boolean (*) \
+    (bfd *, asection *, struct bfd_link_info *, bfd_boolean *)) \
+   bfd_false)
+#define _bfd_nolink_bfd_gc_sections \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) \
+   bfd_false)
+#define _bfd_nolink_bfd_lookup_section_flags \
+  ((void (*) (struct bfd_link_info *, struct flag_info *)) \
+   bfd_0)
+#define _bfd_nolink_bfd_merge_sections \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) \
+   bfd_false)
+#define _bfd_nolink_bfd_is_group_section \
+  ((bfd_boolean (*) (bfd *, const struct bfd_section *)) \
+   bfd_false)
+#define _bfd_nolink_bfd_discard_group \
+  ((bfd_boolean (*) (bfd *, struct bfd_section *)) \
+   bfd_false)
+#define _bfd_nolink_bfd_link_hash_table_create \
+  ((struct bfd_link_hash_table *(*) (bfd *)) bfd_nullvoidptr)
+#define _bfd_nolink_bfd_link_hash_table_free \
+  ((void (*) (struct bfd_link_hash_table *)) bfd_void)
+#define _bfd_nolink_bfd_link_add_symbols \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) bfd_false)
+#define _bfd_nolink_bfd_link_just_syms \
+  ((void (*) (asection *, struct bfd_link_info *)) bfd_void)
+#define _bfd_nolink_bfd_copy_link_hash_symbol_type \
+  ((void (*) (bfd *, struct bfd_link_hash_entry *, \
+	      struct bfd_link_hash_entry *)) bfd_void)
+#define _bfd_nolink_bfd_final_link \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *)) bfd_false)
+#define _bfd_nolink_bfd_link_split_section \
+  ((bfd_boolean (*) (bfd *, struct bfd_section *)) bfd_false)
+#define _bfd_nolink_section_already_linked \
+  ((bfd_boolean (*) (bfd *, asection *, \
+		     struct bfd_link_info *)) bfd_false)
+#define _bfd_nolink_bfd_define_common_symbol \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *, \
+		     struct bfd_link_hash_entry *)) bfd_false)
+
+/* Routines to use for BFD_JUMP_TABLE_DYNAMIC for targets which do not
+   have dynamic symbols or relocs.  Use BFD_JUMP_TABLE_DYNAMIC
+   (_bfd_nodynamic).  */
+
+#define _bfd_nodynamic_get_dynamic_symtab_upper_bound _bfd_n1
+#define _bfd_nodynamic_canonicalize_dynamic_symtab \
+  ((long (*) (bfd *, asymbol **)) _bfd_n1)
+#define _bfd_nodynamic_get_synthetic_symtab \
+  ((long (*) (bfd *, long, asymbol **, long, asymbol **, asymbol **)) _bfd_n1)
+#define _bfd_nodynamic_get_dynamic_reloc_upper_bound _bfd_n1
+#define _bfd_nodynamic_canonicalize_dynamic_reloc \
+  ((long (*) (bfd *, arelent **, asymbol **)) _bfd_n1)
+
+/* Generic routine to determine of the given symbol is a local
+   label.  */
+extern bfd_boolean bfd_generic_is_local_label_name
+  (bfd *, const char *);
+
+/* Generic minisymbol routines.  */
+extern long _bfd_generic_read_minisymbols
+  (bfd *, bfd_boolean, void **, unsigned int *);
+extern asymbol *_bfd_generic_minisymbol_to_symbol
+  (bfd *, bfd_boolean, const void *, asymbol *);
+
+/* Find the nearest line using .stab/.stabstr sections.  */
+extern bfd_boolean _bfd_stab_section_find_nearest_line
+  (bfd *, asymbol **, asection *, bfd_vma, bfd_boolean *,
+   const char **, const char **, unsigned int *, void **);
+
+/* Find the nearest line using DWARF 1 debugging information.  */
+extern bfd_boolean _bfd_dwarf1_find_nearest_line
+  (bfd *, asection *, asymbol **, bfd_vma, const char **,
+   const char **, unsigned int *);
+
+/* Find the nearest line using DWARF 2 debugging information.  */
+extern bfd_boolean _bfd_dwarf2_find_nearest_line
+  (bfd *, asection *, asymbol **, bfd_vma, const char **, const char **,
+   unsigned int *, unsigned int, void **);
+
+/* Find the line using DWARF 2 debugging information.  */
+extern bfd_boolean _bfd_dwarf2_find_line
+  (bfd *, asymbol **, asymbol *, const char **,
+   unsigned int *, unsigned int, void **);
+
+bfd_boolean _bfd_generic_find_line
+  (bfd *, asymbol **, asymbol *, const char **, unsigned int *);
+
+/* Find inliner info after calling bfd_find_nearest_line. */
+extern bfd_boolean _bfd_dwarf2_find_inliner_info
+  (bfd *, const char **, const char **, unsigned int *, void **);
+  
+/* Create a new section entry.  */
+extern struct bfd_hash_entry *bfd_section_hash_newfunc
+  (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
+
+/* A routine to create entries for a bfd_link_hash_table.  */
+extern struct bfd_hash_entry *_bfd_link_hash_newfunc
+  (struct bfd_hash_entry *entry, struct bfd_hash_table *table,
+   const char *string);
+
+/* Initialize a bfd_link_hash_table.  */
+extern bfd_boolean _bfd_link_hash_table_init
+  (struct bfd_link_hash_table *, bfd *,
+   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
+			       struct bfd_hash_table *,
+			       const char *),
+   unsigned int);
+
+/* Generic link hash table creation routine.  */
+extern struct bfd_link_hash_table *_bfd_generic_link_hash_table_create
+  (bfd *);
+
+/* Generic link hash table destruction routine.  */
+extern void _bfd_generic_link_hash_table_free
+  (struct bfd_link_hash_table *);
+
+/* Generic add symbol routine.  */
+extern bfd_boolean _bfd_generic_link_add_symbols
+  (bfd *, struct bfd_link_info *);
+
+/* Generic add symbol routine.  This version is used by targets for
+   which the linker must collect constructors and destructors by name,
+   as the collect2 program does.  */
+extern bfd_boolean _bfd_generic_link_add_symbols_collect
+  (bfd *, struct bfd_link_info *);
+
+/* Generic archive add symbol routine.  */
+extern bfd_boolean _bfd_generic_link_add_archive_symbols
+  (bfd *, struct bfd_link_info *,
+   bfd_boolean (*) (bfd *, struct bfd_link_info *, bfd_boolean *));
+
+/* Forward declaration to avoid prototype errors.  */
+typedef struct bfd_link_hash_entry _bfd_link_hash_entry;
+
+/* Generic routine to add a single symbol.  */
+extern bfd_boolean _bfd_generic_link_add_one_symbol
+  (struct bfd_link_info *, bfd *, const char *name, flagword,
+   asection *, bfd_vma, const char *, bfd_boolean copy,
+   bfd_boolean constructor, struct bfd_link_hash_entry **);
+
+/* Generic routine to mark section as supplying symbols only.  */
+extern void _bfd_generic_link_just_syms
+  (asection *, struct bfd_link_info *);
+
+/* Generic routine that does nothing.  */
+extern void _bfd_generic_copy_link_hash_symbol_type
+  (bfd *, struct bfd_link_hash_entry *, struct bfd_link_hash_entry *);
+
+/* Generic link routine.  */
+extern bfd_boolean _bfd_generic_final_link
+  (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean _bfd_generic_link_split_section
+  (bfd *, struct bfd_section *);
+
+extern bfd_boolean _bfd_generic_section_already_linked
+  (bfd *, asection *, struct bfd_link_info *);
+
+/* Generic reloc_link_order processing routine.  */
+extern bfd_boolean _bfd_generic_reloc_link_order
+  (bfd *, struct bfd_link_info *, asection *, struct bfd_link_order *);
+
+/* Default link order processing routine.  */
+extern bfd_boolean _bfd_default_link_order
+  (bfd *, struct bfd_link_info *, asection *, struct bfd_link_order *);
+
+/* Count the number of reloc entries in a link order list.  */
+extern unsigned int _bfd_count_link_order_relocs
+  (struct bfd_link_order *);
+
+/* Final link relocation routine.  */
+extern bfd_reloc_status_type _bfd_final_link_relocate
+  (reloc_howto_type *, bfd *, asection *, bfd_byte *,
+   bfd_vma, bfd_vma, bfd_vma);
+
+/* Relocate a particular location by a howto and a value.  */
+extern bfd_reloc_status_type _bfd_relocate_contents
+  (reloc_howto_type *, bfd *, bfd_vma, bfd_byte *);
+
+/* Clear a given location using a given howto.  */
+extern void _bfd_clear_contents (reloc_howto_type *howto, bfd *input_bfd,
+				 asection *input_section, bfd_byte *location);
+
+/* Link stabs in sections in the first pass.  */
+
+extern bfd_boolean _bfd_link_section_stabs
+  (bfd *, struct stab_info *, asection *, asection *, void **,
+   bfd_size_type *);
+
+/* Eliminate stabs for discarded functions and symbols.  */
+extern bfd_boolean _bfd_discard_section_stabs
+  (bfd *, asection *, void *, bfd_boolean (*) (bfd_vma, void *), void *);
+
+/* Write out the .stab section when linking stabs in sections.  */
+
+extern bfd_boolean _bfd_write_section_stabs
+  (bfd *, struct stab_info *, asection *, void **, bfd_byte *);
+
+/* Write out the .stabstr string table when linking stabs in sections.  */
+
+extern bfd_boolean _bfd_write_stab_strings
+  (bfd *, struct stab_info *);
+
+/* Find an offset within a .stab section when linking stabs in
+   sections.  */
+
+extern bfd_vma _bfd_stab_section_offset
+  (asection *, void *, bfd_vma);
+
+/* Register a SEC_MERGE section as a candidate for merging.  */
+
+extern bfd_boolean _bfd_add_merge_section
+  (bfd *, void **, asection *, void **);
+
+/* Attempt to merge SEC_MERGE sections.  */
+
+extern bfd_boolean _bfd_merge_sections
+  (bfd *, struct bfd_link_info *, void *, void (*) (bfd *, asection *));
+
+/* Write out a merged section.  */
+
+extern bfd_boolean _bfd_write_merged_section
+  (bfd *, asection *, void *);
+
+/* Find an offset within a modified SEC_MERGE section.  */
+
+extern bfd_vma _bfd_merged_section_offset
+  (bfd *, asection **, void *, bfd_vma);
+
+/* Create a string table.  */
+extern struct bfd_strtab_hash *_bfd_stringtab_init
+  (void);
+
+/* Create an XCOFF .debug section style string table.  */
+extern struct bfd_strtab_hash *_bfd_xcoff_stringtab_init
+  (void);
+
+/* Free a string table.  */
+extern void _bfd_stringtab_free
+  (struct bfd_strtab_hash *);
+
+/* Get the size of a string table.  */
+extern bfd_size_type _bfd_stringtab_size
+  (struct bfd_strtab_hash *);
+
+/* Add a string to a string table.  */
+extern bfd_size_type _bfd_stringtab_add
+  (struct bfd_strtab_hash *, const char *, bfd_boolean hash, bfd_boolean copy);
+
+/* Write out a string table.  */
+extern bfd_boolean _bfd_stringtab_emit
+  (bfd *, struct bfd_strtab_hash *);
+
+/* Check that endianness of input and output file match.  */
+extern bfd_boolean _bfd_generic_verify_endian_match
+  (bfd *, bfd *);
+
+/* Macros to tell if bfds are read or write enabled.
+
+   Note that bfds open for read may be scribbled into if the fd passed
+   to bfd_fdopenr is actually open both for read and write
+   simultaneously.  However an output bfd will never be open for
+   read.  Therefore sometimes you want to check bfd_read_p or
+   !bfd_read_p, and only sometimes bfd_write_p.
+*/
+
+#define	bfd_read_p(abfd) \
+  ((abfd)->direction == read_direction || (abfd)->direction == both_direction)
+#define	bfd_write_p(abfd) \
+  ((abfd)->direction == write_direction || (abfd)->direction == both_direction)
+
+void bfd_assert
+  (const char*,int);
+
+#define BFD_ASSERT(x) \
+  do { if (!(x)) bfd_assert(__FILE__,__LINE__); } while (0)
+
+#define BFD_FAIL() \
+  do { bfd_assert(__FILE__,__LINE__); } while (0)
+
+extern void _bfd_abort
+  (const char *, int, const char *) ATTRIBUTE_NORETURN;
+
+/* if gcc >= 2.6, we can give a function name, too */
+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 6)
+#define __PRETTY_FUNCTION__  ((char *) NULL)
+#endif
+
+#undef abort
+#define abort() _bfd_abort (__FILE__, __LINE__, __PRETTY_FUNCTION__)
+
+/* Manipulate a system FILE but using BFD's "file_ptr", rather than
+   the system "off_t" or "off64_t", as the offset.  */
+extern file_ptr real_ftell (FILE *file);
+extern int real_fseek (FILE *file, file_ptr offset, int whence);
+extern FILE *real_fopen (const char *filename, const char *modes);
+
+/* List of supported target vectors, and the default vector (if
+   bfd_default_vector[0] is NULL, there is no default).  */
+extern const bfd_target * const *bfd_target_vector;
+extern const bfd_target *bfd_default_vector[];
+
+/* List of associated target vectors.  */
+extern const bfd_target * const *bfd_associated_vector;
+
+/* Functions shared by the ECOFF and MIPS ELF backends, which have no
+   other common header files.  */
+
+#if defined(__STDC__) || defined(ALMOST_STDC)
+struct ecoff_find_line;
+#endif
+
+extern bfd_boolean _bfd_ecoff_locate_line
+  (bfd *, asection *, bfd_vma, struct ecoff_debug_info * const,
+   const struct ecoff_debug_swap * const, struct ecoff_find_line *,
+   const char **, const char **, unsigned int *);
+extern bfd_boolean _bfd_ecoff_get_accumulated_pdr
+  (void *, bfd_byte *);
+extern bfd_boolean _bfd_ecoff_get_accumulated_sym
+  (void *, bfd_byte *);
+extern bfd_boolean _bfd_ecoff_get_accumulated_ss
+  (void *, bfd_byte *);
+
+extern bfd_vma _bfd_get_gp_value
+  (bfd *);
+extern void _bfd_set_gp_value
+  (bfd *, bfd_vma);
+
+/* Function shared by the COFF and ELF SH backends, which have no
+   other common header files.  */
+
+#ifndef _bfd_sh_align_load_span
+extern bfd_boolean _bfd_sh_align_load_span
+  (bfd *, asection *, bfd_byte *,
+   bfd_boolean (*) (bfd *, asection *, void *, bfd_byte *, bfd_vma),
+   void *, bfd_vma **, bfd_vma *, bfd_vma, bfd_vma, bfd_boolean *);
+#endif
+
+/* This is the shape of the elements inside the already_linked hash
+   table. It maps a name onto a list of already_linked elements with
+   the same name.  */
+
+struct bfd_section_already_linked_hash_entry
+{
+  struct bfd_hash_entry root;
+  struct bfd_section_already_linked *entry;
+};
+
+struct bfd_section_already_linked
+{
+  struct bfd_section_already_linked *next;
+  asection *sec;
+};
+
+extern struct bfd_section_already_linked_hash_entry *
+  bfd_section_already_linked_table_lookup (const char *);
+extern bfd_boolean bfd_section_already_linked_table_insert
+  (struct bfd_section_already_linked_hash_entry *, asection *);
+extern void bfd_section_already_linked_table_traverse
+  (bfd_boolean (*) (struct bfd_section_already_linked_hash_entry *,
+		    void *), void *);
+
+extern bfd_vma read_unsigned_leb128 (bfd *, bfd_byte *, unsigned int *);
+extern bfd_signed_vma read_signed_leb128 (bfd *, bfd_byte *, unsigned int *);
+
+struct dwarf_debug_section
+{
+  const char *uncompressed_name;
+  const char *compressed_name;
+};
+
+/* Map of uncompressed DWARF debug section name to compressed one.  It
+   is terminated by NULL uncompressed_name.  */
+
+extern const struct dwarf_debug_section dwarf_debug_sections[];
+/* Extracted from init.c.  */
+/* Extracted from libbfd.c.  */
+bfd_boolean bfd_write_bigendian_4byte_int (bfd *, unsigned int);
+
+unsigned int bfd_log2 (bfd_vma x);
+
+/* Extracted from bfdio.c.  */
+struct bfd_iovec
+{
+  /* To avoid problems with macros, a "b" rather than "f"
+     prefix is prepended to each method name.  */
+  /* Attempt to read/write NBYTES on ABFD's IOSTREAM storing/fetching
+     bytes starting at PTR.  Return the number of bytes actually
+     transfered (a read past end-of-file returns less than NBYTES),
+     or -1 (setting <<bfd_error>>) if an error occurs.  */
+  file_ptr (*bread) (struct bfd *abfd, void *ptr, file_ptr nbytes);
+  file_ptr (*bwrite) (struct bfd *abfd, const void *ptr,
+                      file_ptr nbytes);
+  /* Return the current IOSTREAM file offset, or -1 (setting <<bfd_error>>
+     if an error occurs.  */
+  file_ptr (*btell) (struct bfd *abfd);
+  /* For the following, on successful completion a value of 0 is returned.
+     Otherwise, a value of -1 is returned (and  <<bfd_error>> is set).  */
+  int (*bseek) (struct bfd *abfd, file_ptr offset, int whence);
+  int (*bclose) (struct bfd *abfd);
+  int (*bflush) (struct bfd *abfd);
+  int (*bstat) (struct bfd *abfd, struct stat *sb);
+  /* Mmap a part of the files. ADDR, LEN, PROT, FLAGS and OFFSET are the usual
+     mmap parameter, except that LEN and OFFSET do not need to be page
+     aligned.  Returns (void *)-1 on failure, mmapped address on success.
+     Also write in MAP_ADDR the address of the page aligned buffer and in
+     MAP_LEN the size mapped (a page multiple).  Use unmap with MAP_ADDR and
+     MAP_LEN to unmap.  */
+  void *(*bmmap) (struct bfd *abfd, void *addr, bfd_size_type len,
+                  int prot, int flags, file_ptr offset,
+                  void **map_addr, bfd_size_type *map_len);
+};
+extern const struct bfd_iovec _bfd_memory_iovec;
+/* Extracted from bfdwin.c.  */
+struct _bfd_window_internal {
+  struct _bfd_window_internal *next;
+  void *data;
+  bfd_size_type size;
+  int refcount : 31;           /* should be enough...  */
+  unsigned mapped : 1;         /* 1 = mmap, 0 = malloc */
+};
+/* Extracted from cache.c.  */
+bfd_boolean bfd_cache_init (bfd *abfd);
+
+bfd_boolean bfd_cache_close (bfd *abfd);
+
+FILE* bfd_open_file (bfd *abfd);
+
+/* Extracted from reloc.c.  */
+#ifdef _BFD_MAKE_TABLE_bfd_reloc_code_real
+
+static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
+
+  "BFD_RELOC_64",
+  "BFD_RELOC_32",
+  "BFD_RELOC_26",
+  "BFD_RELOC_24",
+  "BFD_RELOC_16",
+  "BFD_RELOC_14",
+  "BFD_RELOC_8",
+  "BFD_RELOC_64_PCREL",
+  "BFD_RELOC_32_PCREL",
+  "BFD_RELOC_24_PCREL",
+  "BFD_RELOC_16_PCREL",
+  "BFD_RELOC_12_PCREL",
+  "BFD_RELOC_8_PCREL",
+  "BFD_RELOC_32_SECREL",
+  "BFD_RELOC_32_GOT_PCREL",
+  "BFD_RELOC_16_GOT_PCREL",
+  "BFD_RELOC_8_GOT_PCREL",
+  "BFD_RELOC_32_GOTOFF",
+  "BFD_RELOC_16_GOTOFF",
+  "BFD_RELOC_LO16_GOTOFF",
+  "BFD_RELOC_HI16_GOTOFF",
+  "BFD_RELOC_HI16_S_GOTOFF",
+  "BFD_RELOC_8_GOTOFF",
+  "BFD_RELOC_64_PLT_PCREL",
+  "BFD_RELOC_32_PLT_PCREL",
+  "BFD_RELOC_24_PLT_PCREL",
+  "BFD_RELOC_16_PLT_PCREL",
+  "BFD_RELOC_8_PLT_PCREL",
+  "BFD_RELOC_64_PLTOFF",
+  "BFD_RELOC_32_PLTOFF",
+  "BFD_RELOC_16_PLTOFF",
+  "BFD_RELOC_LO16_PLTOFF",
+  "BFD_RELOC_HI16_PLTOFF",
+  "BFD_RELOC_HI16_S_PLTOFF",
+  "BFD_RELOC_8_PLTOFF",
+  "BFD_RELOC_68K_GLOB_DAT",
+  "BFD_RELOC_68K_JMP_SLOT",
+  "BFD_RELOC_68K_RELATIVE",
+  "BFD_RELOC_68K_TLS_GD32",
+  "BFD_RELOC_68K_TLS_GD16",
+  "BFD_RELOC_68K_TLS_GD8",
+  "BFD_RELOC_68K_TLS_LDM32",
+  "BFD_RELOC_68K_TLS_LDM16",
+  "BFD_RELOC_68K_TLS_LDM8",
+  "BFD_RELOC_68K_TLS_LDO32",
+  "BFD_RELOC_68K_TLS_LDO16",
+  "BFD_RELOC_68K_TLS_LDO8",
+  "BFD_RELOC_68K_TLS_IE32",
+  "BFD_RELOC_68K_TLS_IE16",
+  "BFD_RELOC_68K_TLS_IE8",
+  "BFD_RELOC_68K_TLS_LE32",
+  "BFD_RELOC_68K_TLS_LE16",
+  "BFD_RELOC_68K_TLS_LE8",
+  "BFD_RELOC_32_BASEREL",
+  "BFD_RELOC_16_BASEREL",
+  "BFD_RELOC_LO16_BASEREL",
+  "BFD_RELOC_HI16_BASEREL",
+  "BFD_RELOC_HI16_S_BASEREL",
+  "BFD_RELOC_8_BASEREL",
+  "BFD_RELOC_RVA",
+  "BFD_RELOC_8_FFnn",
+  "BFD_RELOC_32_PCREL_S2",
+  "BFD_RELOC_16_PCREL_S2",
+  "BFD_RELOC_23_PCREL_S2",
+  "BFD_RELOC_HI22",
+  "BFD_RELOC_LO10",
+  "BFD_RELOC_GPREL16",
+  "BFD_RELOC_GPREL32",
+  "BFD_RELOC_I960_CALLJ",
+  "BFD_RELOC_NONE",
+  "BFD_RELOC_SPARC_WDISP22",
+  "BFD_RELOC_SPARC22",
+  "BFD_RELOC_SPARC13",
+  "BFD_RELOC_SPARC_GOT10",
+  "BFD_RELOC_SPARC_GOT13",
+  "BFD_RELOC_SPARC_GOT22",
+  "BFD_RELOC_SPARC_PC10",
+  "BFD_RELOC_SPARC_PC22",
+  "BFD_RELOC_SPARC_WPLT30",
+  "BFD_RELOC_SPARC_COPY",
+  "BFD_RELOC_SPARC_GLOB_DAT",
+  "BFD_RELOC_SPARC_JMP_SLOT",
+  "BFD_RELOC_SPARC_RELATIVE",
+  "BFD_RELOC_SPARC_UA16",
+  "BFD_RELOC_SPARC_UA32",
+  "BFD_RELOC_SPARC_UA64",
+  "BFD_RELOC_SPARC_GOTDATA_HIX22",
+  "BFD_RELOC_SPARC_GOTDATA_LOX10",
+  "BFD_RELOC_SPARC_GOTDATA_OP_HIX22",
+  "BFD_RELOC_SPARC_GOTDATA_OP_LOX10",
+  "BFD_RELOC_SPARC_GOTDATA_OP",
+  "BFD_RELOC_SPARC_JMP_IREL",
+  "BFD_RELOC_SPARC_IRELATIVE",
+  "BFD_RELOC_SPARC_BASE13",
+  "BFD_RELOC_SPARC_BASE22",
+  "BFD_RELOC_SPARC_10",
+  "BFD_RELOC_SPARC_11",
+  "BFD_RELOC_SPARC_OLO10",
+  "BFD_RELOC_SPARC_HH22",
+  "BFD_RELOC_SPARC_HM10",
+  "BFD_RELOC_SPARC_LM22",
+  "BFD_RELOC_SPARC_PC_HH22",
+  "BFD_RELOC_SPARC_PC_HM10",
+  "BFD_RELOC_SPARC_PC_LM22",
+  "BFD_RELOC_SPARC_WDISP16",
+  "BFD_RELOC_SPARC_WDISP19",
+  "BFD_RELOC_SPARC_7",
+  "BFD_RELOC_SPARC_6",
+  "BFD_RELOC_SPARC_5",
+  "BFD_RELOC_SPARC_PLT32",
+  "BFD_RELOC_SPARC_PLT64",
+  "BFD_RELOC_SPARC_HIX22",
+  "BFD_RELOC_SPARC_LOX10",
+  "BFD_RELOC_SPARC_H44",
+  "BFD_RELOC_SPARC_M44",
+  "BFD_RELOC_SPARC_L44",
+  "BFD_RELOC_SPARC_REGISTER",
+  "BFD_RELOC_SPARC_REV32",
+  "BFD_RELOC_SPARC_TLS_GD_HI22",
+  "BFD_RELOC_SPARC_TLS_GD_LO10",
+  "BFD_RELOC_SPARC_TLS_GD_ADD",
+  "BFD_RELOC_SPARC_TLS_GD_CALL",
+  "BFD_RELOC_SPARC_TLS_LDM_HI22",
+  "BFD_RELOC_SPARC_TLS_LDM_LO10",
+  "BFD_RELOC_SPARC_TLS_LDM_ADD",
+  "BFD_RELOC_SPARC_TLS_LDM_CALL",
+  "BFD_RELOC_SPARC_TLS_LDO_HIX22",
+  "BFD_RELOC_SPARC_TLS_LDO_LOX10",
+  "BFD_RELOC_SPARC_TLS_LDO_ADD",
+  "BFD_RELOC_SPARC_TLS_IE_HI22",
+  "BFD_RELOC_SPARC_TLS_IE_LO10",
+  "BFD_RELOC_SPARC_TLS_IE_LD",
+  "BFD_RELOC_SPARC_TLS_IE_LDX",
+  "BFD_RELOC_SPARC_TLS_IE_ADD",
+  "BFD_RELOC_SPARC_TLS_LE_HIX22",
+  "BFD_RELOC_SPARC_TLS_LE_LOX10",
+  "BFD_RELOC_SPARC_TLS_DTPMOD32",
+  "BFD_RELOC_SPARC_TLS_DTPMOD64",
+  "BFD_RELOC_SPARC_TLS_DTPOFF32",
+  "BFD_RELOC_SPARC_TLS_DTPOFF64",
+  "BFD_RELOC_SPARC_TLS_TPOFF32",
+  "BFD_RELOC_SPARC_TLS_TPOFF64",
+  "BFD_RELOC_SPU_IMM7",
+  "BFD_RELOC_SPU_IMM8",
+  "BFD_RELOC_SPU_IMM10",
+  "BFD_RELOC_SPU_IMM10W",
+  "BFD_RELOC_SPU_IMM16",
+  "BFD_RELOC_SPU_IMM16W",
+  "BFD_RELOC_SPU_IMM18",
+  "BFD_RELOC_SPU_PCREL9a",
+  "BFD_RELOC_SPU_PCREL9b",
+  "BFD_RELOC_SPU_PCREL16",
+  "BFD_RELOC_SPU_LO16",
+  "BFD_RELOC_SPU_HI16",
+  "BFD_RELOC_SPU_PPU32",
+  "BFD_RELOC_SPU_PPU64",
+  "BFD_RELOC_SPU_ADD_PIC",
+  "BFD_RELOC_ALPHA_GPDISP_HI16",
+  "BFD_RELOC_ALPHA_GPDISP_LO16",
+  "BFD_RELOC_ALPHA_GPDISP",
+  "BFD_RELOC_ALPHA_LITERAL",
+  "BFD_RELOC_ALPHA_ELF_LITERAL",
+  "BFD_RELOC_ALPHA_LITUSE",
+  "BFD_RELOC_ALPHA_HINT",
+  "BFD_RELOC_ALPHA_LINKAGE",
+  "BFD_RELOC_ALPHA_CODEADDR",
+  "BFD_RELOC_ALPHA_GPREL_HI16",
+  "BFD_RELOC_ALPHA_GPREL_LO16",
+  "BFD_RELOC_ALPHA_BRSGP",
+  "BFD_RELOC_ALPHA_NOP",
+  "BFD_RELOC_ALPHA_BSR",
+  "BFD_RELOC_ALPHA_LDA",
+  "BFD_RELOC_ALPHA_BOH",
+  "BFD_RELOC_ALPHA_TLSGD",
+  "BFD_RELOC_ALPHA_TLSLDM",
+  "BFD_RELOC_ALPHA_DTPMOD64",
+  "BFD_RELOC_ALPHA_GOTDTPREL16",
+  "BFD_RELOC_ALPHA_DTPREL64",
+  "BFD_RELOC_ALPHA_DTPREL_HI16",
+  "BFD_RELOC_ALPHA_DTPREL_LO16",
+  "BFD_RELOC_ALPHA_DTPREL16",
+  "BFD_RELOC_ALPHA_GOTTPREL16",
+  "BFD_RELOC_ALPHA_TPREL64",
+  "BFD_RELOC_ALPHA_TPREL_HI16",
+  "BFD_RELOC_ALPHA_TPREL_LO16",
+  "BFD_RELOC_ALPHA_TPREL16",
+  "BFD_RELOC_MIPS_JMP",
+  "BFD_RELOC_MICROMIPS_JMP",
+  "BFD_RELOC_MIPS16_JMP",
+  "BFD_RELOC_MIPS16_GPREL",
+  "BFD_RELOC_HI16",
+  "BFD_RELOC_HI16_S",
+  "BFD_RELOC_LO16",
+  "BFD_RELOC_HI16_PCREL",
+  "BFD_RELOC_HI16_S_PCREL",
+  "BFD_RELOC_LO16_PCREL",
+  "BFD_RELOC_MIPS16_GOT16",
+  "BFD_RELOC_MIPS16_CALL16",
+  "BFD_RELOC_MIPS16_HI16",
+  "BFD_RELOC_MIPS16_HI16_S",
+  "BFD_RELOC_MIPS16_LO16",
+  "BFD_RELOC_MIPS_LITERAL",
+  "BFD_RELOC_MICROMIPS_LITERAL",
+  "BFD_RELOC_MICROMIPS_7_PCREL_S1",
+  "BFD_RELOC_MICROMIPS_10_PCREL_S1",
+  "BFD_RELOC_MICROMIPS_16_PCREL_S1",
+  "BFD_RELOC_MICROMIPS_GPREL16",
+  "BFD_RELOC_MICROMIPS_HI16",
+  "BFD_RELOC_MICROMIPS_HI16_S",
+  "BFD_RELOC_MICROMIPS_LO16",
+  "BFD_RELOC_MIPS_GOT16",
+  "BFD_RELOC_MICROMIPS_GOT16",
+  "BFD_RELOC_MIPS_CALL16",
+  "BFD_RELOC_MICROMIPS_CALL16",
+  "BFD_RELOC_MIPS_GOT_HI16",
+  "BFD_RELOC_MICROMIPS_GOT_HI16",
+  "BFD_RELOC_MIPS_GOT_LO16",
+  "BFD_RELOC_MICROMIPS_GOT_LO16",
+  "BFD_RELOC_MIPS_CALL_HI16",
+  "BFD_RELOC_MICROMIPS_CALL_HI16",
+  "BFD_RELOC_MIPS_CALL_LO16",
+  "BFD_RELOC_MICROMIPS_CALL_LO16",
+  "BFD_RELOC_MIPS_SUB",
+  "BFD_RELOC_MICROMIPS_SUB",
+  "BFD_RELOC_MIPS_GOT_PAGE",
+  "BFD_RELOC_MICROMIPS_GOT_PAGE",
+  "BFD_RELOC_MIPS_GOT_OFST",
+  "BFD_RELOC_MICROMIPS_GOT_OFST",
+  "BFD_RELOC_MIPS_GOT_DISP",
+  "BFD_RELOC_MICROMIPS_GOT_DISP",
+  "BFD_RELOC_MIPS_SHIFT5",
+  "BFD_RELOC_MIPS_SHIFT6",
+  "BFD_RELOC_MIPS_INSERT_A",
+  "BFD_RELOC_MIPS_INSERT_B",
+  "BFD_RELOC_MIPS_DELETE",
+  "BFD_RELOC_MIPS_HIGHEST",
+  "BFD_RELOC_MICROMIPS_HIGHEST",
+  "BFD_RELOC_MIPS_HIGHER",
+  "BFD_RELOC_MICROMIPS_HIGHER",
+  "BFD_RELOC_MIPS_SCN_DISP",
+  "BFD_RELOC_MICROMIPS_SCN_DISP",
+  "BFD_RELOC_MIPS_REL16",
+  "BFD_RELOC_MIPS_RELGOT",
+  "BFD_RELOC_MIPS_JALR",
+  "BFD_RELOC_MICROMIPS_JALR",
+  "BFD_RELOC_MIPS_TLS_DTPMOD32",
+  "BFD_RELOC_MIPS_TLS_DTPREL32",
+  "BFD_RELOC_MIPS_TLS_DTPMOD64",
+  "BFD_RELOC_MIPS_TLS_DTPREL64",
+  "BFD_RELOC_MIPS_TLS_GD",
+  "BFD_RELOC_MICROMIPS_TLS_GD",
+  "BFD_RELOC_MIPS_TLS_LDM",
+  "BFD_RELOC_MICROMIPS_TLS_LDM",
+  "BFD_RELOC_MIPS_TLS_DTPREL_HI16",
+  "BFD_RELOC_MICROMIPS_TLS_DTPREL_HI16",
+  "BFD_RELOC_MIPS_TLS_DTPREL_LO16",
+  "BFD_RELOC_MICROMIPS_TLS_DTPREL_LO16",
+  "BFD_RELOC_MIPS_TLS_GOTTPREL",
+  "BFD_RELOC_MICROMIPS_TLS_GOTTPREL",
+  "BFD_RELOC_MIPS_TLS_TPREL32",
+  "BFD_RELOC_MIPS_TLS_TPREL64",
+  "BFD_RELOC_MIPS_TLS_TPREL_HI16",
+  "BFD_RELOC_MICROMIPS_TLS_TPREL_HI16",
+  "BFD_RELOC_MIPS_TLS_TPREL_LO16",
+  "BFD_RELOC_MICROMIPS_TLS_TPREL_LO16",
+
+  "BFD_RELOC_MIPS_COPY",
+  "BFD_RELOC_MIPS_JUMP_SLOT",
+
+  "BFD_RELOC_MOXIE_10_PCREL",
+
+  "BFD_RELOC_FRV_LABEL16",
+  "BFD_RELOC_FRV_LABEL24",
+  "BFD_RELOC_FRV_LO16",
+  "BFD_RELOC_FRV_HI16",
+  "BFD_RELOC_FRV_GPREL12",
+  "BFD_RELOC_FRV_GPRELU12",
+  "BFD_RELOC_FRV_GPREL32",
+  "BFD_RELOC_FRV_GPRELHI",
+  "BFD_RELOC_FRV_GPRELLO",
+  "BFD_RELOC_FRV_GOT12",
+  "BFD_RELOC_FRV_GOTHI",
+  "BFD_RELOC_FRV_GOTLO",
+  "BFD_RELOC_FRV_FUNCDESC",
+  "BFD_RELOC_FRV_FUNCDESC_GOT12",
+  "BFD_RELOC_FRV_FUNCDESC_GOTHI",
+  "BFD_RELOC_FRV_FUNCDESC_GOTLO",
+  "BFD_RELOC_FRV_FUNCDESC_VALUE",
+  "BFD_RELOC_FRV_FUNCDESC_GOTOFF12",
+  "BFD_RELOC_FRV_FUNCDESC_GOTOFFHI",
+  "BFD_RELOC_FRV_FUNCDESC_GOTOFFLO",
+  "BFD_RELOC_FRV_GOTOFF12",
+  "BFD_RELOC_FRV_GOTOFFHI",
+  "BFD_RELOC_FRV_GOTOFFLO",
+  "BFD_RELOC_FRV_GETTLSOFF",
+  "BFD_RELOC_FRV_TLSDESC_VALUE",
+  "BFD_RELOC_FRV_GOTTLSDESC12",
+  "BFD_RELOC_FRV_GOTTLSDESCHI",
+  "BFD_RELOC_FRV_GOTTLSDESCLO",
+  "BFD_RELOC_FRV_TLSMOFF12",
+  "BFD_RELOC_FRV_TLSMOFFHI",
+  "BFD_RELOC_FRV_TLSMOFFLO",
+  "BFD_RELOC_FRV_GOTTLSOFF12",
+  "BFD_RELOC_FRV_GOTTLSOFFHI",
+  "BFD_RELOC_FRV_GOTTLSOFFLO",
+  "BFD_RELOC_FRV_TLSOFF",
+  "BFD_RELOC_FRV_TLSDESC_RELAX",
+  "BFD_RELOC_FRV_GETTLSOFF_RELAX",
+  "BFD_RELOC_FRV_TLSOFF_RELAX",
+  "BFD_RELOC_FRV_TLSMOFF",
+
+  "BFD_RELOC_MN10300_GOTOFF24",
+  "BFD_RELOC_MN10300_GOT32",
+  "BFD_RELOC_MN10300_GOT24",
+  "BFD_RELOC_MN10300_GOT16",
+  "BFD_RELOC_MN10300_COPY",
+  "BFD_RELOC_MN10300_GLOB_DAT",
+  "BFD_RELOC_MN10300_JMP_SLOT",
+  "BFD_RELOC_MN10300_RELATIVE",
+  "BFD_RELOC_MN10300_SYM_DIFF",
+  "BFD_RELOC_MN10300_ALIGN",
+
+  "BFD_RELOC_386_GOT32",
+  "BFD_RELOC_386_PLT32",
+  "BFD_RELOC_386_COPY",
+  "BFD_RELOC_386_GLOB_DAT",
+  "BFD_RELOC_386_JUMP_SLOT",
+  "BFD_RELOC_386_RELATIVE",
+  "BFD_RELOC_386_GOTOFF",
+  "BFD_RELOC_386_GOTPC",
+  "BFD_RELOC_386_TLS_TPOFF",
+  "BFD_RELOC_386_TLS_IE",
+  "BFD_RELOC_386_TLS_GOTIE",
+  "BFD_RELOC_386_TLS_LE",
+  "BFD_RELOC_386_TLS_GD",
+  "BFD_RELOC_386_TLS_LDM",
+  "BFD_RELOC_386_TLS_LDO_32",
+  "BFD_RELOC_386_TLS_IE_32",
+  "BFD_RELOC_386_TLS_LE_32",
+  "BFD_RELOC_386_TLS_DTPMOD32",
+  "BFD_RELOC_386_TLS_DTPOFF32",
+  "BFD_RELOC_386_TLS_TPOFF32",
+  "BFD_RELOC_386_TLS_GOTDESC",
+  "BFD_RELOC_386_TLS_DESC_CALL",
+  "BFD_RELOC_386_TLS_DESC",
+  "BFD_RELOC_386_IRELATIVE",
+  "BFD_RELOC_X86_64_GOT32",
+  "BFD_RELOC_X86_64_PLT32",
+  "BFD_RELOC_X86_64_COPY",
+  "BFD_RELOC_X86_64_GLOB_DAT",
+  "BFD_RELOC_X86_64_JUMP_SLOT",
+  "BFD_RELOC_X86_64_RELATIVE",
+  "BFD_RELOC_X86_64_GOTPCREL",
+  "BFD_RELOC_X86_64_32S",
+  "BFD_RELOC_X86_64_DTPMOD64",
+  "BFD_RELOC_X86_64_DTPOFF64",
+  "BFD_RELOC_X86_64_TPOFF64",
+  "BFD_RELOC_X86_64_TLSGD",
+  "BFD_RELOC_X86_64_TLSLD",
+  "BFD_RELOC_X86_64_DTPOFF32",
+  "BFD_RELOC_X86_64_GOTTPOFF",
+  "BFD_RELOC_X86_64_TPOFF32",
+  "BFD_RELOC_X86_64_GOTOFF64",
+  "BFD_RELOC_X86_64_GOTPC32",
+  "BFD_RELOC_X86_64_GOT64",
+  "BFD_RELOC_X86_64_GOTPCREL64",
+  "BFD_RELOC_X86_64_GOTPC64",
+  "BFD_RELOC_X86_64_GOTPLT64",
+  "BFD_RELOC_X86_64_PLTOFF64",
+  "BFD_RELOC_X86_64_GOTPC32_TLSDESC",
+  "BFD_RELOC_X86_64_TLSDESC_CALL",
+  "BFD_RELOC_X86_64_TLSDESC",
+  "BFD_RELOC_X86_64_IRELATIVE",
+  "BFD_RELOC_NS32K_IMM_8",
+  "BFD_RELOC_NS32K_IMM_16",
+  "BFD_RELOC_NS32K_IMM_32",
+  "BFD_RELOC_NS32K_IMM_8_PCREL",
+  "BFD_RELOC_NS32K_IMM_16_PCREL",
+  "BFD_RELOC_NS32K_IMM_32_PCREL",
+  "BFD_RELOC_NS32K_DISP_8",
+  "BFD_RELOC_NS32K_DISP_16",
+  "BFD_RELOC_NS32K_DISP_32",
+  "BFD_RELOC_NS32K_DISP_8_PCREL",
+  "BFD_RELOC_NS32K_DISP_16_PCREL",
+  "BFD_RELOC_NS32K_DISP_32_PCREL",
+  "BFD_RELOC_PDP11_DISP_8_PCREL",
+  "BFD_RELOC_PDP11_DISP_6_PCREL",
+  "BFD_RELOC_PJ_CODE_HI16",
+  "BFD_RELOC_PJ_CODE_LO16",
+  "BFD_RELOC_PJ_CODE_DIR16",
+  "BFD_RELOC_PJ_CODE_DIR32",
+  "BFD_RELOC_PJ_CODE_REL16",
+  "BFD_RELOC_PJ_CODE_REL32",
+  "BFD_RELOC_PPC_B26",
+  "BFD_RELOC_PPC_BA26",
+  "BFD_RELOC_PPC_TOC16",
+  "BFD_RELOC_PPC_B16",
+  "BFD_RELOC_PPC_B16_BRTAKEN",
+  "BFD_RELOC_PPC_B16_BRNTAKEN",
+  "BFD_RELOC_PPC_BA16",
+  "BFD_RELOC_PPC_BA16_BRTAKEN",
+  "BFD_RELOC_PPC_BA16_BRNTAKEN",
+  "BFD_RELOC_PPC_COPY",
+  "BFD_RELOC_PPC_GLOB_DAT",
+  "BFD_RELOC_PPC_JMP_SLOT",
+  "BFD_RELOC_PPC_RELATIVE",
+  "BFD_RELOC_PPC_LOCAL24PC",
+  "BFD_RELOC_PPC_EMB_NADDR32",
+  "BFD_RELOC_PPC_EMB_NADDR16",
+  "BFD_RELOC_PPC_EMB_NADDR16_LO",
+  "BFD_RELOC_PPC_EMB_NADDR16_HI",
+  "BFD_RELOC_PPC_EMB_NADDR16_HA",
+  "BFD_RELOC_PPC_EMB_SDAI16",
+  "BFD_RELOC_PPC_EMB_SDA2I16",
+  "BFD_RELOC_PPC_EMB_SDA2REL",
+  "BFD_RELOC_PPC_EMB_SDA21",
+  "BFD_RELOC_PPC_EMB_MRKREF",
+  "BFD_RELOC_PPC_EMB_RELSEC16",
+  "BFD_RELOC_PPC_EMB_RELST_LO",
+  "BFD_RELOC_PPC_EMB_RELST_HI",
+  "BFD_RELOC_PPC_EMB_RELST_HA",
+  "BFD_RELOC_PPC_EMB_BIT_FLD",
+  "BFD_RELOC_PPC_EMB_RELSDA",
+  "BFD_RELOC_PPC64_HIGHER",
+  "BFD_RELOC_PPC64_HIGHER_S",
+  "BFD_RELOC_PPC64_HIGHEST",
+  "BFD_RELOC_PPC64_HIGHEST_S",
+  "BFD_RELOC_PPC64_TOC16_LO",
+  "BFD_RELOC_PPC64_TOC16_HI",
+  "BFD_RELOC_PPC64_TOC16_HA",
+  "BFD_RELOC_PPC64_TOC",
+  "BFD_RELOC_PPC64_PLTGOT16",
+  "BFD_RELOC_PPC64_PLTGOT16_LO",
+  "BFD_RELOC_PPC64_PLTGOT16_HI",
+  "BFD_RELOC_PPC64_PLTGOT16_HA",
+  "BFD_RELOC_PPC64_ADDR16_DS",
+  "BFD_RELOC_PPC64_ADDR16_LO_DS",
+  "BFD_RELOC_PPC64_GOT16_DS",
+  "BFD_RELOC_PPC64_GOT16_LO_DS",
+  "BFD_RELOC_PPC64_PLT16_LO_DS",
+  "BFD_RELOC_PPC64_SECTOFF_DS",
+  "BFD_RELOC_PPC64_SECTOFF_LO_DS",
+  "BFD_RELOC_PPC64_TOC16_DS",
+  "BFD_RELOC_PPC64_TOC16_LO_DS",
+  "BFD_RELOC_PPC64_PLTGOT16_DS",
+  "BFD_RELOC_PPC64_PLTGOT16_LO_DS",
+  "BFD_RELOC_PPC_TLS",
+  "BFD_RELOC_PPC_TLSGD",
+  "BFD_RELOC_PPC_TLSLD",
+  "BFD_RELOC_PPC_DTPMOD",
+  "BFD_RELOC_PPC_TPREL16",
+  "BFD_RELOC_PPC_TPREL16_LO",
+  "BFD_RELOC_PPC_TPREL16_HI",
+  "BFD_RELOC_PPC_TPREL16_HA",
+  "BFD_RELOC_PPC_TPREL",
+  "BFD_RELOC_PPC_DTPREL16",
+  "BFD_RELOC_PPC_DTPREL16_LO",
+  "BFD_RELOC_PPC_DTPREL16_HI",
+  "BFD_RELOC_PPC_DTPREL16_HA",
+  "BFD_RELOC_PPC_DTPREL",
+  "BFD_RELOC_PPC_GOT_TLSGD16",
+  "BFD_RELOC_PPC_GOT_TLSGD16_LO",
+  "BFD_RELOC_PPC_GOT_TLSGD16_HI",
+  "BFD_RELOC_PPC_GOT_TLSGD16_HA",
+  "BFD_RELOC_PPC_GOT_TLSLD16",
+  "BFD_RELOC_PPC_GOT_TLSLD16_LO",
+  "BFD_RELOC_PPC_GOT_TLSLD16_HI",
+  "BFD_RELOC_PPC_GOT_TLSLD16_HA",
+  "BFD_RELOC_PPC_GOT_TPREL16",
+  "BFD_RELOC_PPC_GOT_TPREL16_LO",
+  "BFD_RELOC_PPC_GOT_TPREL16_HI",
+  "BFD_RELOC_PPC_GOT_TPREL16_HA",
+  "BFD_RELOC_PPC_GOT_DTPREL16",
+  "BFD_RELOC_PPC_GOT_DTPREL16_LO",
+  "BFD_RELOC_PPC_GOT_DTPREL16_HI",
+  "BFD_RELOC_PPC_GOT_DTPREL16_HA",
+  "BFD_RELOC_PPC64_TPREL16_DS",
+  "BFD_RELOC_PPC64_TPREL16_LO_DS",
+  "BFD_RELOC_PPC64_TPREL16_HIGHER",
+  "BFD_RELOC_PPC64_TPREL16_HIGHERA",
+  "BFD_RELOC_PPC64_TPREL16_HIGHEST",
+  "BFD_RELOC_PPC64_TPREL16_HIGHESTA",
+  "BFD_RELOC_PPC64_DTPREL16_DS",
+  "BFD_RELOC_PPC64_DTPREL16_LO_DS",
+  "BFD_RELOC_PPC64_DTPREL16_HIGHER",
+  "BFD_RELOC_PPC64_DTPREL16_HIGHERA",
+  "BFD_RELOC_PPC64_DTPREL16_HIGHEST",
+  "BFD_RELOC_PPC64_DTPREL16_HIGHESTA",
+  "BFD_RELOC_I370_D12",
+  "BFD_RELOC_CTOR",
+  "BFD_RELOC_ARM_PCREL_BRANCH",
+  "BFD_RELOC_ARM_PCREL_BLX",
+  "BFD_RELOC_THUMB_PCREL_BLX",
+  "BFD_RELOC_ARM_PCREL_CALL",
+  "BFD_RELOC_ARM_PCREL_JUMP",
+  "BFD_RELOC_THUMB_PCREL_BRANCH7",
+  "BFD_RELOC_THUMB_PCREL_BRANCH9",
+  "BFD_RELOC_THUMB_PCREL_BRANCH12",
+  "BFD_RELOC_THUMB_PCREL_BRANCH20",
+  "BFD_RELOC_THUMB_PCREL_BRANCH23",
+  "BFD_RELOC_THUMB_PCREL_BRANCH25",
+  "BFD_RELOC_ARM_OFFSET_IMM",
+  "BFD_RELOC_ARM_THUMB_OFFSET",
+  "BFD_RELOC_ARM_TARGET1",
+  "BFD_RELOC_ARM_ROSEGREL32",
+  "BFD_RELOC_ARM_SBREL32",
+  "BFD_RELOC_ARM_TARGET2",
+  "BFD_RELOC_ARM_PREL31",
+  "BFD_RELOC_ARM_MOVW",
+  "BFD_RELOC_ARM_MOVT",
+  "BFD_RELOC_ARM_MOVW_PCREL",
+  "BFD_RELOC_ARM_MOVT_PCREL",
+  "BFD_RELOC_ARM_THUMB_MOVW",
+  "BFD_RELOC_ARM_THUMB_MOVT",
+  "BFD_RELOC_ARM_THUMB_MOVW_PCREL",
+  "BFD_RELOC_ARM_THUMB_MOVT_PCREL",
+  "BFD_RELOC_ARM_JUMP_SLOT",
+  "BFD_RELOC_ARM_GLOB_DAT",
+  "BFD_RELOC_ARM_GOT32",
+  "BFD_RELOC_ARM_PLT32",
+  "BFD_RELOC_ARM_RELATIVE",
+  "BFD_RELOC_ARM_GOTOFF",
+  "BFD_RELOC_ARM_GOTPC",
+  "BFD_RELOC_ARM_GOT_PREL",
+  "BFD_RELOC_ARM_TLS_GD32",
+  "BFD_RELOC_ARM_TLS_LDO32",
+  "BFD_RELOC_ARM_TLS_LDM32",
+  "BFD_RELOC_ARM_TLS_DTPOFF32",
+  "BFD_RELOC_ARM_TLS_DTPMOD32",
+  "BFD_RELOC_ARM_TLS_TPOFF32",
+  "BFD_RELOC_ARM_TLS_IE32",
+  "BFD_RELOC_ARM_TLS_LE32",
+  "BFD_RELOC_ARM_TLS_GOTDESC",
+  "BFD_RELOC_ARM_TLS_CALL",
+  "BFD_RELOC_ARM_THM_TLS_CALL",
+  "BFD_RELOC_ARM_TLS_DESCSEQ",
+  "BFD_RELOC_ARM_THM_TLS_DESCSEQ",
+  "BFD_RELOC_ARM_TLS_DESC",
+  "BFD_RELOC_ARM_ALU_PC_G0_NC",
+  "BFD_RELOC_ARM_ALU_PC_G0",
+  "BFD_RELOC_ARM_ALU_PC_G1_NC",
+  "BFD_RELOC_ARM_ALU_PC_G1",
+  "BFD_RELOC_ARM_ALU_PC_G2",
+  "BFD_RELOC_ARM_LDR_PC_G0",
+  "BFD_RELOC_ARM_LDR_PC_G1",
+  "BFD_RELOC_ARM_LDR_PC_G2",
+  "BFD_RELOC_ARM_LDRS_PC_G0",
+  "BFD_RELOC_ARM_LDRS_PC_G1",
+  "BFD_RELOC_ARM_LDRS_PC_G2",
+  "BFD_RELOC_ARM_LDC_PC_G0",
+  "BFD_RELOC_ARM_LDC_PC_G1",
+  "BFD_RELOC_ARM_LDC_PC_G2",
+  "BFD_RELOC_ARM_ALU_SB_G0_NC",
+  "BFD_RELOC_ARM_ALU_SB_G0",
+  "BFD_RELOC_ARM_ALU_SB_G1_NC",
+  "BFD_RELOC_ARM_ALU_SB_G1",
+  "BFD_RELOC_ARM_ALU_SB_G2",
+  "BFD_RELOC_ARM_LDR_SB_G0",
+  "BFD_RELOC_ARM_LDR_SB_G1",
+  "BFD_RELOC_ARM_LDR_SB_G2",
+  "BFD_RELOC_ARM_LDRS_SB_G0",
+  "BFD_RELOC_ARM_LDRS_SB_G1",
+  "BFD_RELOC_ARM_LDRS_SB_G2",
+  "BFD_RELOC_ARM_LDC_SB_G0",
+  "BFD_RELOC_ARM_LDC_SB_G1",
+  "BFD_RELOC_ARM_LDC_SB_G2",
+  "BFD_RELOC_ARM_V4BX",
+  "BFD_RELOC_ARM_IRELATIVE",
+  "BFD_RELOC_ARM_IMMEDIATE",
+  "BFD_RELOC_ARM_ADRL_IMMEDIATE",
+  "BFD_RELOC_ARM_T32_IMMEDIATE",
+  "BFD_RELOC_ARM_T32_ADD_IMM",
+  "BFD_RELOC_ARM_T32_IMM12",
+  "BFD_RELOC_ARM_T32_ADD_PC12",
+  "BFD_RELOC_ARM_SHIFT_IMM",
+  "BFD_RELOC_ARM_SMC",
+  "BFD_RELOC_ARM_HVC",
+  "BFD_RELOC_ARM_SWI",
+  "BFD_RELOC_ARM_MULTI",
+  "BFD_RELOC_ARM_CP_OFF_IMM",
+  "BFD_RELOC_ARM_CP_OFF_IMM_S2",
+  "BFD_RELOC_ARM_T32_CP_OFF_IMM",
+  "BFD_RELOC_ARM_T32_CP_OFF_IMM_S2",
+  "BFD_RELOC_ARM_ADR_IMM",
+  "BFD_RELOC_ARM_LDR_IMM",
+  "BFD_RELOC_ARM_LITERAL",
+  "BFD_RELOC_ARM_IN_POOL",
+  "BFD_RELOC_ARM_OFFSET_IMM8",
+  "BFD_RELOC_ARM_T32_OFFSET_U8",
+  "BFD_RELOC_ARM_T32_OFFSET_IMM",
+  "BFD_RELOC_ARM_HWLITERAL",
+  "BFD_RELOC_ARM_THUMB_ADD",
+  "BFD_RELOC_ARM_THUMB_IMM",
+  "BFD_RELOC_ARM_THUMB_SHIFT",
+  "BFD_RELOC_SH_PCDISP8BY2",
+  "BFD_RELOC_SH_PCDISP12BY2",
+  "BFD_RELOC_SH_IMM3",
+  "BFD_RELOC_SH_IMM3U",
+  "BFD_RELOC_SH_DISP12",
+  "BFD_RELOC_SH_DISP12BY2",
+  "BFD_RELOC_SH_DISP12BY4",
+  "BFD_RELOC_SH_DISP12BY8",
+  "BFD_RELOC_SH_DISP20",
+  "BFD_RELOC_SH_DISP20BY8",
+  "BFD_RELOC_SH_IMM4",
+  "BFD_RELOC_SH_IMM4BY2",
+  "BFD_RELOC_SH_IMM4BY4",
+  "BFD_RELOC_SH_IMM8",
+  "BFD_RELOC_SH_IMM8BY2",
+  "BFD_RELOC_SH_IMM8BY4",
+  "BFD_RELOC_SH_PCRELIMM8BY2",
+  "BFD_RELOC_SH_PCRELIMM8BY4",
+  "BFD_RELOC_SH_SWITCH16",
+  "BFD_RELOC_SH_SWITCH32",
+  "BFD_RELOC_SH_USES",
+  "BFD_RELOC_SH_COUNT",
+  "BFD_RELOC_SH_ALIGN",
+  "BFD_RELOC_SH_CODE",
+  "BFD_RELOC_SH_DATA",
+  "BFD_RELOC_SH_LABEL",
+  "BFD_RELOC_SH_LOOP_START",
+  "BFD_RELOC_SH_LOOP_END",
+  "BFD_RELOC_SH_COPY",
+  "BFD_RELOC_SH_GLOB_DAT",
+  "BFD_RELOC_SH_JMP_SLOT",
+  "BFD_RELOC_SH_RELATIVE",
+  "BFD_RELOC_SH_GOTPC",
+  "BFD_RELOC_SH_GOT_LOW16",
+  "BFD_RELOC_SH_GOT_MEDLOW16",
+  "BFD_RELOC_SH_GOT_MEDHI16",
+  "BFD_RELOC_SH_GOT_HI16",
+  "BFD_RELOC_SH_GOTPLT_LOW16",
+  "BFD_RELOC_SH_GOTPLT_MEDLOW16",
+  "BFD_RELOC_SH_GOTPLT_MEDHI16",
+  "BFD_RELOC_SH_GOTPLT_HI16",
+  "BFD_RELOC_SH_PLT_LOW16",
+  "BFD_RELOC_SH_PLT_MEDLOW16",
+  "BFD_RELOC_SH_PLT_MEDHI16",
+  "BFD_RELOC_SH_PLT_HI16",
+  "BFD_RELOC_SH_GOTOFF_LOW16",
+  "BFD_RELOC_SH_GOTOFF_MEDLOW16",
+  "BFD_RELOC_SH_GOTOFF_MEDHI16",
+  "BFD_RELOC_SH_GOTOFF_HI16",
+  "BFD_RELOC_SH_GOTPC_LOW16",
+  "BFD_RELOC_SH_GOTPC_MEDLOW16",
+  "BFD_RELOC_SH_GOTPC_MEDHI16",
+  "BFD_RELOC_SH_GOTPC_HI16",
+  "BFD_RELOC_SH_COPY64",
+  "BFD_RELOC_SH_GLOB_DAT64",
+  "BFD_RELOC_SH_JMP_SLOT64",
+  "BFD_RELOC_SH_RELATIVE64",
+  "BFD_RELOC_SH_GOT10BY4",
+  "BFD_RELOC_SH_GOT10BY8",
+  "BFD_RELOC_SH_GOTPLT10BY4",
+  "BFD_RELOC_SH_GOTPLT10BY8",
+  "BFD_RELOC_SH_GOTPLT32",
+  "BFD_RELOC_SH_SHMEDIA_CODE",
+  "BFD_RELOC_SH_IMMU5",
+  "BFD_RELOC_SH_IMMS6",
+  "BFD_RELOC_SH_IMMS6BY32",
+  "BFD_RELOC_SH_IMMU6",
+  "BFD_RELOC_SH_IMMS10",
+  "BFD_RELOC_SH_IMMS10BY2",
+  "BFD_RELOC_SH_IMMS10BY4",
+  "BFD_RELOC_SH_IMMS10BY8",
+  "BFD_RELOC_SH_IMMS16",
+  "BFD_RELOC_SH_IMMU16",
+  "BFD_RELOC_SH_IMM_LOW16",
+  "BFD_RELOC_SH_IMM_LOW16_PCREL",
+  "BFD_RELOC_SH_IMM_MEDLOW16",
+  "BFD_RELOC_SH_IMM_MEDLOW16_PCREL",
+  "BFD_RELOC_SH_IMM_MEDHI16",
+  "BFD_RELOC_SH_IMM_MEDHI16_PCREL",
+  "BFD_RELOC_SH_IMM_HI16",
+  "BFD_RELOC_SH_IMM_HI16_PCREL",
+  "BFD_RELOC_SH_PT_16",
+  "BFD_RELOC_SH_TLS_GD_32",
+  "BFD_RELOC_SH_TLS_LD_32",
+  "BFD_RELOC_SH_TLS_LDO_32",
+  "BFD_RELOC_SH_TLS_IE_32",
+  "BFD_RELOC_SH_TLS_LE_32",
+  "BFD_RELOC_SH_TLS_DTPMOD32",
+  "BFD_RELOC_SH_TLS_DTPOFF32",
+  "BFD_RELOC_SH_TLS_TPOFF32",
+  "BFD_RELOC_SH_GOT20",
+  "BFD_RELOC_SH_GOTOFF20",
+  "BFD_RELOC_SH_GOTFUNCDESC",
+  "BFD_RELOC_SH_GOTFUNCDESC20",
+  "BFD_RELOC_SH_GOTOFFFUNCDESC",
+  "BFD_RELOC_SH_GOTOFFFUNCDESC20",
+  "BFD_RELOC_SH_FUNCDESC",
+  "BFD_RELOC_ARC_B22_PCREL",
+  "BFD_RELOC_ARC_B26",
+  "BFD_RELOC_BFIN_16_IMM",
+  "BFD_RELOC_BFIN_16_HIGH",
+  "BFD_RELOC_BFIN_4_PCREL",
+  "BFD_RELOC_BFIN_5_PCREL",
+  "BFD_RELOC_BFIN_16_LOW",
+  "BFD_RELOC_BFIN_10_PCREL",
+  "BFD_RELOC_BFIN_11_PCREL",
+  "BFD_RELOC_BFIN_12_PCREL_JUMP",
+  "BFD_RELOC_BFIN_12_PCREL_JUMP_S",
+  "BFD_RELOC_BFIN_24_PCREL_CALL_X",
+  "BFD_RELOC_BFIN_24_PCREL_JUMP_L",
+  "BFD_RELOC_BFIN_GOT17M4",
+  "BFD_RELOC_BFIN_GOTHI",
+  "BFD_RELOC_BFIN_GOTLO",
+  "BFD_RELOC_BFIN_FUNCDESC",
+  "BFD_RELOC_BFIN_FUNCDESC_GOT17M4",
+  "BFD_RELOC_BFIN_FUNCDESC_GOTHI",
+  "BFD_RELOC_BFIN_FUNCDESC_GOTLO",
+  "BFD_RELOC_BFIN_FUNCDESC_VALUE",
+  "BFD_RELOC_BFIN_FUNCDESC_GOTOFF17M4",
+  "BFD_RELOC_BFIN_FUNCDESC_GOTOFFHI",
+  "BFD_RELOC_BFIN_FUNCDESC_GOTOFFLO",
+  "BFD_RELOC_BFIN_GOTOFF17M4",
+  "BFD_RELOC_BFIN_GOTOFFHI",
+  "BFD_RELOC_BFIN_GOTOFFLO",
+  "BFD_RELOC_BFIN_GOT",
+  "BFD_RELOC_BFIN_PLTPC",
+  "BFD_ARELOC_BFIN_PUSH",
+  "BFD_ARELOC_BFIN_CONST",
+  "BFD_ARELOC_BFIN_ADD",
+  "BFD_ARELOC_BFIN_SUB",
+  "BFD_ARELOC_BFIN_MULT",
+  "BFD_ARELOC_BFIN_DIV",
+  "BFD_ARELOC_BFIN_MOD",
+  "BFD_ARELOC_BFIN_LSHIFT",
+  "BFD_ARELOC_BFIN_RSHIFT",
+  "BFD_ARELOC_BFIN_AND",
+  "BFD_ARELOC_BFIN_OR",
+  "BFD_ARELOC_BFIN_XOR",
+  "BFD_ARELOC_BFIN_LAND",
+  "BFD_ARELOC_BFIN_LOR",
+  "BFD_ARELOC_BFIN_LEN",
+  "BFD_ARELOC_BFIN_NEG",
+  "BFD_ARELOC_BFIN_COMP",
+  "BFD_ARELOC_BFIN_PAGE",
+  "BFD_ARELOC_BFIN_HWPAGE",
+  "BFD_ARELOC_BFIN_ADDR",
+  "BFD_RELOC_D10V_10_PCREL_R",
+  "BFD_RELOC_D10V_10_PCREL_L",
+  "BFD_RELOC_D10V_18",
+  "BFD_RELOC_D10V_18_PCREL",
+  "BFD_RELOC_D30V_6",
+  "BFD_RELOC_D30V_9_PCREL",
+  "BFD_RELOC_D30V_9_PCREL_R",
+  "BFD_RELOC_D30V_15",
+  "BFD_RELOC_D30V_15_PCREL",
+  "BFD_RELOC_D30V_15_PCREL_R",
+  "BFD_RELOC_D30V_21",
+  "BFD_RELOC_D30V_21_PCREL",
+  "BFD_RELOC_D30V_21_PCREL_R",
+  "BFD_RELOC_D30V_32",
+  "BFD_RELOC_D30V_32_PCREL",
+  "BFD_RELOC_DLX_HI16_S",
+  "BFD_RELOC_DLX_LO16",
+  "BFD_RELOC_DLX_JMP26",
+  "BFD_RELOC_M32C_HI8",
+  "BFD_RELOC_M32C_RL_JUMP",
+  "BFD_RELOC_M32C_RL_1ADDR",
+  "BFD_RELOC_M32C_RL_2ADDR",
+  "BFD_RELOC_M32R_24",
+  "BFD_RELOC_M32R_10_PCREL",
+  "BFD_RELOC_M32R_18_PCREL",
+  "BFD_RELOC_M32R_26_PCREL",
+  "BFD_RELOC_M32R_HI16_ULO",
+  "BFD_RELOC_M32R_HI16_SLO",
+  "BFD_RELOC_M32R_LO16",
+  "BFD_RELOC_M32R_SDA16",
+  "BFD_RELOC_M32R_GOT24",
+  "BFD_RELOC_M32R_26_PLTREL",
+  "BFD_RELOC_M32R_COPY",
+  "BFD_RELOC_M32R_GLOB_DAT",
+  "BFD_RELOC_M32R_JMP_SLOT",
+  "BFD_RELOC_M32R_RELATIVE",
+  "BFD_RELOC_M32R_GOTOFF",
+  "BFD_RELOC_M32R_GOTOFF_HI_ULO",
+  "BFD_RELOC_M32R_GOTOFF_HI_SLO",
+  "BFD_RELOC_M32R_GOTOFF_LO",
+  "BFD_RELOC_M32R_GOTPC24",
+  "BFD_RELOC_M32R_GOT16_HI_ULO",
+  "BFD_RELOC_M32R_GOT16_HI_SLO",
+  "BFD_RELOC_M32R_GOT16_LO",
+  "BFD_RELOC_M32R_GOTPC_HI_ULO",
+  "BFD_RELOC_M32R_GOTPC_HI_SLO",
+  "BFD_RELOC_M32R_GOTPC_LO",
+  "BFD_RELOC_V850_9_PCREL",
+  "BFD_RELOC_V850_22_PCREL",
+  "BFD_RELOC_V850_SDA_16_16_OFFSET",
+  "BFD_RELOC_V850_SDA_15_16_OFFSET",
+  "BFD_RELOC_V850_ZDA_16_16_OFFSET",
+  "BFD_RELOC_V850_ZDA_15_16_OFFSET",
+  "BFD_RELOC_V850_TDA_6_8_OFFSET",
+  "BFD_RELOC_V850_TDA_7_8_OFFSET",
+  "BFD_RELOC_V850_TDA_7_7_OFFSET",
+  "BFD_RELOC_V850_TDA_16_16_OFFSET",
+  "BFD_RELOC_V850_TDA_4_5_OFFSET",
+  "BFD_RELOC_V850_TDA_4_4_OFFSET",
+  "BFD_RELOC_V850_SDA_16_16_SPLIT_OFFSET",
+  "BFD_RELOC_V850_ZDA_16_16_SPLIT_OFFSET",
+  "BFD_RELOC_V850_CALLT_6_7_OFFSET",
+  "BFD_RELOC_V850_CALLT_16_16_OFFSET",
+  "BFD_RELOC_V850_LONGCALL",
+  "BFD_RELOC_V850_LONGJUMP",
+  "BFD_RELOC_V850_ALIGN",
+  "BFD_RELOC_V850_LO16_SPLIT_OFFSET",
+  "BFD_RELOC_V850_16_PCREL",
+  "BFD_RELOC_V850_17_PCREL",
+  "BFD_RELOC_V850_23",
+  "BFD_RELOC_V850_32_PCREL",
+  "BFD_RELOC_V850_32_ABS",
+  "BFD_RELOC_V850_16_SPLIT_OFFSET",
+  "BFD_RELOC_V850_16_S1",
+  "BFD_RELOC_V850_LO16_S1",
+  "BFD_RELOC_V850_CALLT_15_16_OFFSET",
+  "BFD_RELOC_V850_32_GOTPCREL",
+  "BFD_RELOC_V850_16_GOT",
+  "BFD_RELOC_V850_32_GOT",
+  "BFD_RELOC_V850_22_PLT_PCREL",
+  "BFD_RELOC_V850_32_PLT_PCREL",
+  "BFD_RELOC_V850_COPY",
+  "BFD_RELOC_V850_GLOB_DAT",
+  "BFD_RELOC_V850_JMP_SLOT",
+  "BFD_RELOC_V850_RELATIVE",
+  "BFD_RELOC_V850_16_GOTOFF",
+  "BFD_RELOC_V850_32_GOTOFF",
+  "BFD_RELOC_V850_CODE",
+  "BFD_RELOC_V850_DATA",
+  "BFD_RELOC_MN10300_32_PCREL",
+  "BFD_RELOC_MN10300_16_PCREL",
+  "BFD_RELOC_TIC30_LDP",
+  "BFD_RELOC_TIC54X_PARTLS7",
+  "BFD_RELOC_TIC54X_PARTMS9",
+  "BFD_RELOC_TIC54X_23",
+  "BFD_RELOC_TIC54X_16_OF_23",
+  "BFD_RELOC_TIC54X_MS7_OF_23",
+  "BFD_RELOC_C6000_PCR_S21",
+  "BFD_RELOC_C6000_PCR_S12",
+  "BFD_RELOC_C6000_PCR_S10",
+  "BFD_RELOC_C6000_PCR_S7",
+  "BFD_RELOC_C6000_ABS_S16",
+  "BFD_RELOC_C6000_ABS_L16",
+  "BFD_RELOC_C6000_ABS_H16",
+  "BFD_RELOC_C6000_SBR_U15_B",
+  "BFD_RELOC_C6000_SBR_U15_H",
+  "BFD_RELOC_C6000_SBR_U15_W",
+  "BFD_RELOC_C6000_SBR_S16",
+  "BFD_RELOC_C6000_SBR_L16_B",
+  "BFD_RELOC_C6000_SBR_L16_H",
+  "BFD_RELOC_C6000_SBR_L16_W",
+  "BFD_RELOC_C6000_SBR_H16_B",
+  "BFD_RELOC_C6000_SBR_H16_H",
+  "BFD_RELOC_C6000_SBR_H16_W",
+  "BFD_RELOC_C6000_SBR_GOT_U15_W",
+  "BFD_RELOC_C6000_SBR_GOT_L16_W",
+  "BFD_RELOC_C6000_SBR_GOT_H16_W",
+  "BFD_RELOC_C6000_DSBT_INDEX",
+  "BFD_RELOC_C6000_PREL31",
+  "BFD_RELOC_C6000_COPY",
+  "BFD_RELOC_C6000_JUMP_SLOT",
+  "BFD_RELOC_C6000_EHTYPE",
+  "BFD_RELOC_C6000_PCR_H16",
+  "BFD_RELOC_C6000_PCR_L16",
+  "BFD_RELOC_C6000_ALIGN",
+  "BFD_RELOC_C6000_FPHEAD",
+  "BFD_RELOC_C6000_NOCMP",
+  "BFD_RELOC_FR30_48",
+  "BFD_RELOC_FR30_20",
+  "BFD_RELOC_FR30_6_IN_4",
+  "BFD_RELOC_FR30_8_IN_8",
+  "BFD_RELOC_FR30_9_IN_8",
+  "BFD_RELOC_FR30_10_IN_8",
+  "BFD_RELOC_FR30_9_PCREL",
+  "BFD_RELOC_FR30_12_PCREL",
+  "BFD_RELOC_MCORE_PCREL_IMM8BY4",
+  "BFD_RELOC_MCORE_PCREL_IMM11BY2",
+  "BFD_RELOC_MCORE_PCREL_IMM4BY2",
+  "BFD_RELOC_MCORE_PCREL_32",
+  "BFD_RELOC_MCORE_PCREL_JSR_IMM11BY2",
+  "BFD_RELOC_MCORE_RVA",
+  "BFD_RELOC_MEP_8",
+  "BFD_RELOC_MEP_16",
+  "BFD_RELOC_MEP_32",
+  "BFD_RELOC_MEP_PCREL8A2",
+  "BFD_RELOC_MEP_PCREL12A2",
+  "BFD_RELOC_MEP_PCREL17A2",
+  "BFD_RELOC_MEP_PCREL24A2",
+  "BFD_RELOC_MEP_PCABS24A2",
+  "BFD_RELOC_MEP_LOW16",
+  "BFD_RELOC_MEP_HI16U",
+  "BFD_RELOC_MEP_HI16S",
+  "BFD_RELOC_MEP_GPREL",
+  "BFD_RELOC_MEP_TPREL",
+  "BFD_RELOC_MEP_TPREL7",
+  "BFD_RELOC_MEP_TPREL7A2",
+  "BFD_RELOC_MEP_TPREL7A4",
+  "BFD_RELOC_MEP_UIMM24",
+  "BFD_RELOC_MEP_ADDR24A4",
+  "BFD_RELOC_MEP_GNU_VTINHERIT",
+  "BFD_RELOC_MEP_GNU_VTENTRY",
+
+  "BFD_RELOC_MMIX_GETA",
+  "BFD_RELOC_MMIX_GETA_1",
+  "BFD_RELOC_MMIX_GETA_2",
+  "BFD_RELOC_MMIX_GETA_3",
+  "BFD_RELOC_MMIX_CBRANCH",
+  "BFD_RELOC_MMIX_CBRANCH_J",
+  "BFD_RELOC_MMIX_CBRANCH_1",
+  "BFD_RELOC_MMIX_CBRANCH_2",
+  "BFD_RELOC_MMIX_CBRANCH_3",
+  "BFD_RELOC_MMIX_PUSHJ",
+  "BFD_RELOC_MMIX_PUSHJ_1",
+  "BFD_RELOC_MMIX_PUSHJ_2",
+  "BFD_RELOC_MMIX_PUSHJ_3",
+  "BFD_RELOC_MMIX_PUSHJ_STUBBABLE",
+  "BFD_RELOC_MMIX_JMP",
+  "BFD_RELOC_MMIX_JMP_1",
+  "BFD_RELOC_MMIX_JMP_2",
+  "BFD_RELOC_MMIX_JMP_3",
+  "BFD_RELOC_MMIX_ADDR19",
+  "BFD_RELOC_MMIX_ADDR27",
+  "BFD_RELOC_MMIX_REG_OR_BYTE",
+  "BFD_RELOC_MMIX_REG",
+  "BFD_RELOC_MMIX_BASE_PLUS_OFFSET",
+  "BFD_RELOC_MMIX_LOCAL",
+  "BFD_RELOC_AVR_7_PCREL",
+  "BFD_RELOC_AVR_13_PCREL",
+  "BFD_RELOC_AVR_16_PM",
+  "BFD_RELOC_AVR_LO8_LDI",
+  "BFD_RELOC_AVR_HI8_LDI",
+  "BFD_RELOC_AVR_HH8_LDI",
+  "BFD_RELOC_AVR_MS8_LDI",
+  "BFD_RELOC_AVR_LO8_LDI_NEG",
+  "BFD_RELOC_AVR_HI8_LDI_NEG",
+  "BFD_RELOC_AVR_HH8_LDI_NEG",
+  "BFD_RELOC_AVR_MS8_LDI_NEG",
+  "BFD_RELOC_AVR_LO8_LDI_PM",
+  "BFD_RELOC_AVR_LO8_LDI_GS",
+  "BFD_RELOC_AVR_HI8_LDI_PM",
+  "BFD_RELOC_AVR_HI8_LDI_GS",
+  "BFD_RELOC_AVR_HH8_LDI_PM",
+  "BFD_RELOC_AVR_LO8_LDI_PM_NEG",
+  "BFD_RELOC_AVR_HI8_LDI_PM_NEG",
+  "BFD_RELOC_AVR_HH8_LDI_PM_NEG",
+  "BFD_RELOC_AVR_CALL",
+  "BFD_RELOC_AVR_LDI",
+  "BFD_RELOC_AVR_6",
+  "BFD_RELOC_AVR_6_ADIW",
+  "BFD_RELOC_RX_NEG8",
+  "BFD_RELOC_RX_NEG16",
+  "BFD_RELOC_RX_NEG24",
+  "BFD_RELOC_RX_NEG32",
+  "BFD_RELOC_RX_16_OP",
+  "BFD_RELOC_RX_24_OP",
+  "BFD_RELOC_RX_32_OP",
+  "BFD_RELOC_RX_8U",
+  "BFD_RELOC_RX_16U",
+  "BFD_RELOC_RX_24U",
+  "BFD_RELOC_RX_DIR3U_PCREL",
+  "BFD_RELOC_RX_DIFF",
+  "BFD_RELOC_RX_GPRELB",
+  "BFD_RELOC_RX_GPRELW",
+  "BFD_RELOC_RX_GPRELL",
+  "BFD_RELOC_RX_SYM",
+  "BFD_RELOC_RX_OP_SUBTRACT",
+  "BFD_RELOC_RX_OP_NEG",
+  "BFD_RELOC_RX_ABS8",
+  "BFD_RELOC_RX_ABS16",
+  "BFD_RELOC_RX_ABS16_REV",
+  "BFD_RELOC_RX_ABS32",
+  "BFD_RELOC_RX_ABS32_REV",
+  "BFD_RELOC_RX_ABS16U",
+  "BFD_RELOC_RX_ABS16UW",
+  "BFD_RELOC_RX_ABS16UL",
+  "BFD_RELOC_RX_RELAX",
+  "BFD_RELOC_390_12",
+  "BFD_RELOC_390_GOT12",
+  "BFD_RELOC_390_PLT32",
+  "BFD_RELOC_390_COPY",
+  "BFD_RELOC_390_GLOB_DAT",
+  "BFD_RELOC_390_JMP_SLOT",
+  "BFD_RELOC_390_RELATIVE",
+  "BFD_RELOC_390_GOTPC",
+  "BFD_RELOC_390_GOT16",
+  "BFD_RELOC_390_PC16DBL",
+  "BFD_RELOC_390_PLT16DBL",
+  "BFD_RELOC_390_PC32DBL",
+  "BFD_RELOC_390_PLT32DBL",
+  "BFD_RELOC_390_GOTPCDBL",
+  "BFD_RELOC_390_GOT64",
+  "BFD_RELOC_390_PLT64",
+  "BFD_RELOC_390_GOTENT",
+  "BFD_RELOC_390_GOTOFF64",
+  "BFD_RELOC_390_GOTPLT12",
+  "BFD_RELOC_390_GOTPLT16",
+  "BFD_RELOC_390_GOTPLT32",
+  "BFD_RELOC_390_GOTPLT64",
+  "BFD_RELOC_390_GOTPLTENT",
+  "BFD_RELOC_390_PLTOFF16",
+  "BFD_RELOC_390_PLTOFF32",
+  "BFD_RELOC_390_PLTOFF64",
+  "BFD_RELOC_390_TLS_LOAD",
+  "BFD_RELOC_390_TLS_GDCALL",
+  "BFD_RELOC_390_TLS_LDCALL",
+  "BFD_RELOC_390_TLS_GD32",
+  "BFD_RELOC_390_TLS_GD64",
+  "BFD_RELOC_390_TLS_GOTIE12",
+  "BFD_RELOC_390_TLS_GOTIE32",
+  "BFD_RELOC_390_TLS_GOTIE64",
+  "BFD_RELOC_390_TLS_LDM32",
+  "BFD_RELOC_390_TLS_LDM64",
+  "BFD_RELOC_390_TLS_IE32",
+  "BFD_RELOC_390_TLS_IE64",
+  "BFD_RELOC_390_TLS_IEENT",
+  "BFD_RELOC_390_TLS_LE32",
+  "BFD_RELOC_390_TLS_LE64",
+  "BFD_RELOC_390_TLS_LDO32",
+  "BFD_RELOC_390_TLS_LDO64",
+  "BFD_RELOC_390_TLS_DTPMOD",
+  "BFD_RELOC_390_TLS_DTPOFF",
+  "BFD_RELOC_390_TLS_TPOFF",
+  "BFD_RELOC_390_20",
+  "BFD_RELOC_390_GOT20",
+  "BFD_RELOC_390_GOTPLT20",
+  "BFD_RELOC_390_TLS_GOTIE20",
+  "BFD_RELOC_SCORE_GPREL15",
+  "BFD_RELOC_SCORE_DUMMY2",
+  "BFD_RELOC_SCORE_JMP",
+  "BFD_RELOC_SCORE_BRANCH",
+  "BFD_RELOC_SCORE_IMM30",
+  "BFD_RELOC_SCORE_IMM32",
+  "BFD_RELOC_SCORE16_JMP",
+  "BFD_RELOC_SCORE16_BRANCH",
+  "BFD_RELOC_SCORE_BCMP",
+  "BFD_RELOC_SCORE_GOT15",
+  "BFD_RELOC_SCORE_GOT_LO16",
+  "BFD_RELOC_SCORE_CALL15",
+  "BFD_RELOC_SCORE_DUMMY_HI16",
+  "BFD_RELOC_IP2K_FR9",
+  "BFD_RELOC_IP2K_BANK",
+  "BFD_RELOC_IP2K_ADDR16CJP",
+  "BFD_RELOC_IP2K_PAGE3",
+  "BFD_RELOC_IP2K_LO8DATA",
+  "BFD_RELOC_IP2K_HI8DATA",
+  "BFD_RELOC_IP2K_EX8DATA",
+  "BFD_RELOC_IP2K_LO8INSN",
+  "BFD_RELOC_IP2K_HI8INSN",
+  "BFD_RELOC_IP2K_PC_SKIP",
+  "BFD_RELOC_IP2K_TEXT",
+  "BFD_RELOC_IP2K_FR_OFFSET",
+  "BFD_RELOC_VPE4KMATH_DATA",
+  "BFD_RELOC_VPE4KMATH_INSN",
+  "BFD_RELOC_VTABLE_INHERIT",
+  "BFD_RELOC_VTABLE_ENTRY",
+  "BFD_RELOC_IA64_IMM14",
+  "BFD_RELOC_IA64_IMM22",
+  "BFD_RELOC_IA64_IMM64",
+  "BFD_RELOC_IA64_DIR32MSB",
+  "BFD_RELOC_IA64_DIR32LSB",
+  "BFD_RELOC_IA64_DIR64MSB",
+  "BFD_RELOC_IA64_DIR64LSB",
+  "BFD_RELOC_IA64_GPREL22",
+  "BFD_RELOC_IA64_GPREL64I",
+  "BFD_RELOC_IA64_GPREL32MSB",
+  "BFD_RELOC_IA64_GPREL32LSB",
+  "BFD_RELOC_IA64_GPREL64MSB",
+  "BFD_RELOC_IA64_GPREL64LSB",
+  "BFD_RELOC_IA64_LTOFF22",
+  "BFD_RELOC_IA64_LTOFF64I",
+  "BFD_RELOC_IA64_PLTOFF22",
+  "BFD_RELOC_IA64_PLTOFF64I",
+  "BFD_RELOC_IA64_PLTOFF64MSB",
+  "BFD_RELOC_IA64_PLTOFF64LSB",
+  "BFD_RELOC_IA64_FPTR64I",
+  "BFD_RELOC_IA64_FPTR32MSB",
+  "BFD_RELOC_IA64_FPTR32LSB",
+  "BFD_RELOC_IA64_FPTR64MSB",
+  "BFD_RELOC_IA64_FPTR64LSB",
+  "BFD_RELOC_IA64_PCREL21B",
+  "BFD_RELOC_IA64_PCREL21BI",
+  "BFD_RELOC_IA64_PCREL21M",
+  "BFD_RELOC_IA64_PCREL21F",
+  "BFD_RELOC_IA64_PCREL22",
+  "BFD_RELOC_IA64_PCREL60B",
+  "BFD_RELOC_IA64_PCREL64I",
+  "BFD_RELOC_IA64_PCREL32MSB",
+  "BFD_RELOC_IA64_PCREL32LSB",
+  "BFD_RELOC_IA64_PCREL64MSB",
+  "BFD_RELOC_IA64_PCREL64LSB",
+  "BFD_RELOC_IA64_LTOFF_FPTR22",
+  "BFD_RELOC_IA64_LTOFF_FPTR64I",
+  "BFD_RELOC_IA64_LTOFF_FPTR32MSB",
+  "BFD_RELOC_IA64_LTOFF_FPTR32LSB",
+  "BFD_RELOC_IA64_LTOFF_FPTR64MSB",
+  "BFD_RELOC_IA64_LTOFF_FPTR64LSB",
+  "BFD_RELOC_IA64_SEGREL32MSB",
+  "BFD_RELOC_IA64_SEGREL32LSB",
+  "BFD_RELOC_IA64_SEGREL64MSB",
+  "BFD_RELOC_IA64_SEGREL64LSB",
+  "BFD_RELOC_IA64_SECREL32MSB",
+  "BFD_RELOC_IA64_SECREL32LSB",
+  "BFD_RELOC_IA64_SECREL64MSB",
+  "BFD_RELOC_IA64_SECREL64LSB",
+  "BFD_RELOC_IA64_REL32MSB",
+  "BFD_RELOC_IA64_REL32LSB",
+  "BFD_RELOC_IA64_REL64MSB",
+  "BFD_RELOC_IA64_REL64LSB",
+  "BFD_RELOC_IA64_LTV32MSB",
+  "BFD_RELOC_IA64_LTV32LSB",
+  "BFD_RELOC_IA64_LTV64MSB",
+  "BFD_RELOC_IA64_LTV64LSB",
+  "BFD_RELOC_IA64_IPLTMSB",
+  "BFD_RELOC_IA64_IPLTLSB",
+  "BFD_RELOC_IA64_COPY",
+  "BFD_RELOC_IA64_LTOFF22X",
+  "BFD_RELOC_IA64_LDXMOV",
+  "BFD_RELOC_IA64_TPREL14",
+  "BFD_RELOC_IA64_TPREL22",
+  "BFD_RELOC_IA64_TPREL64I",
+  "BFD_RELOC_IA64_TPREL64MSB",
+  "BFD_RELOC_IA64_TPREL64LSB",
+  "BFD_RELOC_IA64_LTOFF_TPREL22",
+  "BFD_RELOC_IA64_DTPMOD64MSB",
+  "BFD_RELOC_IA64_DTPMOD64LSB",
+  "BFD_RELOC_IA64_LTOFF_DTPMOD22",
+  "BFD_RELOC_IA64_DTPREL14",
+  "BFD_RELOC_IA64_DTPREL22",
+  "BFD_RELOC_IA64_DTPREL64I",
+  "BFD_RELOC_IA64_DTPREL32MSB",
+  "BFD_RELOC_IA64_DTPREL32LSB",
+  "BFD_RELOC_IA64_DTPREL64MSB",
+  "BFD_RELOC_IA64_DTPREL64LSB",
+  "BFD_RELOC_IA64_LTOFF_DTPREL22",
+  "BFD_RELOC_M68HC11_HI8",
+  "BFD_RELOC_M68HC11_LO8",
+  "BFD_RELOC_M68HC11_3B",
+  "BFD_RELOC_M68HC11_RL_JUMP",
+  "BFD_RELOC_M68HC11_RL_GROUP",
+  "BFD_RELOC_M68HC11_LO16",
+  "BFD_RELOC_M68HC11_PAGE",
+  "BFD_RELOC_M68HC11_24",
+  "BFD_RELOC_M68HC12_5B",
+  "BFD_RELOC_16C_NUM08",
+  "BFD_RELOC_16C_NUM08_C",
+  "BFD_RELOC_16C_NUM16",
+  "BFD_RELOC_16C_NUM16_C",
+  "BFD_RELOC_16C_NUM32",
+  "BFD_RELOC_16C_NUM32_C",
+  "BFD_RELOC_16C_DISP04",
+  "BFD_RELOC_16C_DISP04_C",
+  "BFD_RELOC_16C_DISP08",
+  "BFD_RELOC_16C_DISP08_C",
+  "BFD_RELOC_16C_DISP16",
+  "BFD_RELOC_16C_DISP16_C",
+  "BFD_RELOC_16C_DISP24",
+  "BFD_RELOC_16C_DISP24_C",
+  "BFD_RELOC_16C_DISP24a",
+  "BFD_RELOC_16C_DISP24a_C",
+  "BFD_RELOC_16C_REG04",
+  "BFD_RELOC_16C_REG04_C",
+  "BFD_RELOC_16C_REG04a",
+  "BFD_RELOC_16C_REG04a_C",
+  "BFD_RELOC_16C_REG14",
+  "BFD_RELOC_16C_REG14_C",
+  "BFD_RELOC_16C_REG16",
+  "BFD_RELOC_16C_REG16_C",
+  "BFD_RELOC_16C_REG20",
+  "BFD_RELOC_16C_REG20_C",
+  "BFD_RELOC_16C_ABS20",
+  "BFD_RELOC_16C_ABS20_C",
+  "BFD_RELOC_16C_ABS24",
+  "BFD_RELOC_16C_ABS24_C",
+  "BFD_RELOC_16C_IMM04",
+  "BFD_RELOC_16C_IMM04_C",
+  "BFD_RELOC_16C_IMM16",
+  "BFD_RELOC_16C_IMM16_C",
+  "BFD_RELOC_16C_IMM20",
+  "BFD_RELOC_16C_IMM20_C",
+  "BFD_RELOC_16C_IMM24",
+  "BFD_RELOC_16C_IMM24_C",
+  "BFD_RELOC_16C_IMM32",
+  "BFD_RELOC_16C_IMM32_C",
+  "BFD_RELOC_CR16_NUM8",
+  "BFD_RELOC_CR16_NUM16",
+  "BFD_RELOC_CR16_NUM32",
+  "BFD_RELOC_CR16_NUM32a",
+  "BFD_RELOC_CR16_REGREL0",
+  "BFD_RELOC_CR16_REGREL4",
+  "BFD_RELOC_CR16_REGREL4a",
+  "BFD_RELOC_CR16_REGREL14",
+  "BFD_RELOC_CR16_REGREL14a",
+  "BFD_RELOC_CR16_REGREL16",
+  "BFD_RELOC_CR16_REGREL20",
+  "BFD_RELOC_CR16_REGREL20a",
+  "BFD_RELOC_CR16_ABS20",
+  "BFD_RELOC_CR16_ABS24",
+  "BFD_RELOC_CR16_IMM4",
+  "BFD_RELOC_CR16_IMM8",
+  "BFD_RELOC_CR16_IMM16",
+  "BFD_RELOC_CR16_IMM20",
+  "BFD_RELOC_CR16_IMM24",
+  "BFD_RELOC_CR16_IMM32",
+  "BFD_RELOC_CR16_IMM32a",
+  "BFD_RELOC_CR16_DISP4",
+  "BFD_RELOC_CR16_DISP8",
+  "BFD_RELOC_CR16_DISP16",
+  "BFD_RELOC_CR16_DISP20",
+  "BFD_RELOC_CR16_DISP24",
+  "BFD_RELOC_CR16_DISP24a",
+  "BFD_RELOC_CR16_SWITCH8",
+  "BFD_RELOC_CR16_SWITCH16",
+  "BFD_RELOC_CR16_SWITCH32",
+  "BFD_RELOC_CR16_GOT_REGREL20",
+  "BFD_RELOC_CR16_GOTC_REGREL20",
+  "BFD_RELOC_CR16_GLOB_DAT",
+  "BFD_RELOC_CRX_REL4",
+  "BFD_RELOC_CRX_REL8",
+  "BFD_RELOC_CRX_REL8_CMP",
+  "BFD_RELOC_CRX_REL16",
+  "BFD_RELOC_CRX_REL24",
+  "BFD_RELOC_CRX_REL32",
+  "BFD_RELOC_CRX_REGREL12",
+  "BFD_RELOC_CRX_REGREL22",
+  "BFD_RELOC_CRX_REGREL28",
+  "BFD_RELOC_CRX_REGREL32",
+  "BFD_RELOC_CRX_ABS16",
+  "BFD_RELOC_CRX_ABS32",
+  "BFD_RELOC_CRX_NUM8",
+  "BFD_RELOC_CRX_NUM16",
+  "BFD_RELOC_CRX_NUM32",
+  "BFD_RELOC_CRX_IMM16",
+  "BFD_RELOC_CRX_IMM32",
+  "BFD_RELOC_CRX_SWITCH8",
+  "BFD_RELOC_CRX_SWITCH16",
+  "BFD_RELOC_CRX_SWITCH32",
+  "BFD_RELOC_CRIS_BDISP8",
+  "BFD_RELOC_CRIS_UNSIGNED_5",
+  "BFD_RELOC_CRIS_SIGNED_6",
+  "BFD_RELOC_CRIS_UNSIGNED_6",
+  "BFD_RELOC_CRIS_SIGNED_8",
+  "BFD_RELOC_CRIS_UNSIGNED_8",
+  "BFD_RELOC_CRIS_SIGNED_16",
+  "BFD_RELOC_CRIS_UNSIGNED_16",
+  "BFD_RELOC_CRIS_LAPCQ_OFFSET",
+  "BFD_RELOC_CRIS_UNSIGNED_4",
+  "BFD_RELOC_CRIS_COPY",
+  "BFD_RELOC_CRIS_GLOB_DAT",
+  "BFD_RELOC_CRIS_JUMP_SLOT",
+  "BFD_RELOC_CRIS_RELATIVE",
+  "BFD_RELOC_CRIS_32_GOT",
+  "BFD_RELOC_CRIS_16_GOT",
+  "BFD_RELOC_CRIS_32_GOTPLT",
+  "BFD_RELOC_CRIS_16_GOTPLT",
+  "BFD_RELOC_CRIS_32_GOTREL",
+  "BFD_RELOC_CRIS_32_PLT_GOTREL",
+  "BFD_RELOC_CRIS_32_PLT_PCREL",
+  "BFD_RELOC_CRIS_32_GOT_GD",
+  "BFD_RELOC_CRIS_16_GOT_GD",
+  "BFD_RELOC_CRIS_32_GD",
+  "BFD_RELOC_CRIS_DTP",
+  "BFD_RELOC_CRIS_32_DTPREL",
+  "BFD_RELOC_CRIS_16_DTPREL",
+  "BFD_RELOC_CRIS_32_GOT_TPREL",
+  "BFD_RELOC_CRIS_16_GOT_TPREL",
+  "BFD_RELOC_CRIS_32_TPREL",
+  "BFD_RELOC_CRIS_16_TPREL",
+  "BFD_RELOC_CRIS_DTPMOD",
+  "BFD_RELOC_CRIS_32_IE",
+  "BFD_RELOC_860_COPY",
+  "BFD_RELOC_860_GLOB_DAT",
+  "BFD_RELOC_860_JUMP_SLOT",
+  "BFD_RELOC_860_RELATIVE",
+  "BFD_RELOC_860_PC26",
+  "BFD_RELOC_860_PLT26",
+  "BFD_RELOC_860_PC16",
+  "BFD_RELOC_860_LOW0",
+  "BFD_RELOC_860_SPLIT0",
+  "BFD_RELOC_860_LOW1",
+  "BFD_RELOC_860_SPLIT1",
+  "BFD_RELOC_860_LOW2",
+  "BFD_RELOC_860_SPLIT2",
+  "BFD_RELOC_860_LOW3",
+  "BFD_RELOC_860_LOGOT0",
+  "BFD_RELOC_860_SPGOT0",
+  "BFD_RELOC_860_LOGOT1",
+  "BFD_RELOC_860_SPGOT1",
+  "BFD_RELOC_860_LOGOTOFF0",
+  "BFD_RELOC_860_SPGOTOFF0",
+  "BFD_RELOC_860_LOGOTOFF1",
+  "BFD_RELOC_860_SPGOTOFF1",
+  "BFD_RELOC_860_LOGOTOFF2",
+  "BFD_RELOC_860_LOGOTOFF3",
+  "BFD_RELOC_860_LOPC",
+  "BFD_RELOC_860_HIGHADJ",
+  "BFD_RELOC_860_HAGOT",
+  "BFD_RELOC_860_HAGOTOFF",
+  "BFD_RELOC_860_HAPC",
+  "BFD_RELOC_860_HIGH",
+  "BFD_RELOC_860_HIGOT",
+  "BFD_RELOC_860_HIGOTOFF",
+  "BFD_RELOC_OPENRISC_ABS_26",
+  "BFD_RELOC_OPENRISC_REL_26",
+  "BFD_RELOC_H8_DIR16A8",
+  "BFD_RELOC_H8_DIR16R8",
+  "BFD_RELOC_H8_DIR24A8",
+  "BFD_RELOC_H8_DIR24R8",
+  "BFD_RELOC_H8_DIR32A16",
+  "BFD_RELOC_XSTORMY16_REL_12",
+  "BFD_RELOC_XSTORMY16_12",
+  "BFD_RELOC_XSTORMY16_24",
+  "BFD_RELOC_XSTORMY16_FPTR16",
+  "BFD_RELOC_RELC",
+
+  "BFD_RELOC_XC16X_PAG",
+  "BFD_RELOC_XC16X_POF",
+  "BFD_RELOC_XC16X_SEG",
+  "BFD_RELOC_XC16X_SOF",
+  "BFD_RELOC_VAX_GLOB_DAT",
+  "BFD_RELOC_VAX_JMP_SLOT",
+  "BFD_RELOC_VAX_RELATIVE",
+  "BFD_RELOC_MT_PC16",
+  "BFD_RELOC_MT_HI16",
+  "BFD_RELOC_MT_LO16",
+  "BFD_RELOC_MT_GNU_VTINHERIT",
+  "BFD_RELOC_MT_GNU_VTENTRY",
+  "BFD_RELOC_MT_PCINSN8",
+  "BFD_RELOC_MSP430_10_PCREL",
+  "BFD_RELOC_MSP430_16_PCREL",
+  "BFD_RELOC_MSP430_16",
+  "BFD_RELOC_MSP430_16_PCREL_BYTE",
+  "BFD_RELOC_MSP430_16_BYTE",
+  "BFD_RELOC_MSP430_2X_PCREL",
+  "BFD_RELOC_MSP430_RL_PCREL",
+  "BFD_RELOC_IQ2000_OFFSET_16",
+  "BFD_RELOC_IQ2000_OFFSET_21",
+  "BFD_RELOC_IQ2000_UHI16",
+  "BFD_RELOC_XTENSA_RTLD",
+  "BFD_RELOC_XTENSA_GLOB_DAT",
+  "BFD_RELOC_XTENSA_JMP_SLOT",
+  "BFD_RELOC_XTENSA_RELATIVE",
+  "BFD_RELOC_XTENSA_PLT",
+  "BFD_RELOC_XTENSA_DIFF8",
+  "BFD_RELOC_XTENSA_DIFF16",
+  "BFD_RELOC_XTENSA_DIFF32",
+  "BFD_RELOC_XTENSA_SLOT0_OP",
+  "BFD_RELOC_XTENSA_SLOT1_OP",
+  "BFD_RELOC_XTENSA_SLOT2_OP",
+  "BFD_RELOC_XTENSA_SLOT3_OP",
+  "BFD_RELOC_XTENSA_SLOT4_OP",
+  "BFD_RELOC_XTENSA_SLOT5_OP",
+  "BFD_RELOC_XTENSA_SLOT6_OP",
+  "BFD_RELOC_XTENSA_SLOT7_OP",
+  "BFD_RELOC_XTENSA_SLOT8_OP",
+  "BFD_RELOC_XTENSA_SLOT9_OP",
+  "BFD_RELOC_XTENSA_SLOT10_OP",
+  "BFD_RELOC_XTENSA_SLOT11_OP",
+  "BFD_RELOC_XTENSA_SLOT12_OP",
+  "BFD_RELOC_XTENSA_SLOT13_OP",
+  "BFD_RELOC_XTENSA_SLOT14_OP",
+  "BFD_RELOC_XTENSA_SLOT0_ALT",
+  "BFD_RELOC_XTENSA_SLOT1_ALT",
+  "BFD_RELOC_XTENSA_SLOT2_ALT",
+  "BFD_RELOC_XTENSA_SLOT3_ALT",
+  "BFD_RELOC_XTENSA_SLOT4_ALT",
+  "BFD_RELOC_XTENSA_SLOT5_ALT",
+  "BFD_RELOC_XTENSA_SLOT6_ALT",
+  "BFD_RELOC_XTENSA_SLOT7_ALT",
+  "BFD_RELOC_XTENSA_SLOT8_ALT",
+  "BFD_RELOC_XTENSA_SLOT9_ALT",
+  "BFD_RELOC_XTENSA_SLOT10_ALT",
+  "BFD_RELOC_XTENSA_SLOT11_ALT",
+  "BFD_RELOC_XTENSA_SLOT12_ALT",
+  "BFD_RELOC_XTENSA_SLOT13_ALT",
+  "BFD_RELOC_XTENSA_SLOT14_ALT",
+  "BFD_RELOC_XTENSA_OP0",
+  "BFD_RELOC_XTENSA_OP1",
+  "BFD_RELOC_XTENSA_OP2",
+  "BFD_RELOC_XTENSA_ASM_EXPAND",
+  "BFD_RELOC_XTENSA_ASM_SIMPLIFY",
+  "BFD_RELOC_XTENSA_TLSDESC_FN",
+  "BFD_RELOC_XTENSA_TLSDESC_ARG",
+  "BFD_RELOC_XTENSA_TLS_DTPOFF",
+  "BFD_RELOC_XTENSA_TLS_TPOFF",
+  "BFD_RELOC_XTENSA_TLS_FUNC",
+  "BFD_RELOC_XTENSA_TLS_ARG",
+  "BFD_RELOC_XTENSA_TLS_CALL",
+  "BFD_RELOC_Z80_DISP8",
+  "BFD_RELOC_Z8K_DISP7",
+  "BFD_RELOC_Z8K_CALLR",
+  "BFD_RELOC_Z8K_IMM4L",
+  "BFD_RELOC_LM32_CALL",
+  "BFD_RELOC_LM32_BRANCH",
+  "BFD_RELOC_LM32_16_GOT",
+  "BFD_RELOC_LM32_GOTOFF_HI16",
+  "BFD_RELOC_LM32_GOTOFF_LO16",
+  "BFD_RELOC_LM32_COPY",
+  "BFD_RELOC_LM32_GLOB_DAT",
+  "BFD_RELOC_LM32_JMP_SLOT",
+  "BFD_RELOC_LM32_RELATIVE",
+  "BFD_RELOC_MACH_O_SECTDIFF",
+  "BFD_RELOC_MACH_O_PAIR",
+  "BFD_RELOC_MACH_O_X86_64_BRANCH32",
+  "BFD_RELOC_MACH_O_X86_64_BRANCH8",
+  "BFD_RELOC_MACH_O_X86_64_GOT",
+  "BFD_RELOC_MACH_O_X86_64_GOT_LOAD",
+  "BFD_RELOC_MACH_O_X86_64_SUBTRACTOR32",
+  "BFD_RELOC_MACH_O_X86_64_SUBTRACTOR64",
+  "BFD_RELOC_MACH_O_X86_64_PCREL32_1",
+  "BFD_RELOC_MACH_O_X86_64_PCREL32_2",
+  "BFD_RELOC_MACH_O_X86_64_PCREL32_4",
+  "BFD_RELOC_MICROBLAZE_32_LO",
+  "BFD_RELOC_MICROBLAZE_32_LO_PCREL",
+  "BFD_RELOC_MICROBLAZE_32_ROSDA",
+  "BFD_RELOC_MICROBLAZE_32_RWSDA",
+  "BFD_RELOC_MICROBLAZE_32_SYM_OP_SYM",
+  "BFD_RELOC_MICROBLAZE_64_NONE",
+  "BFD_RELOC_MICROBLAZE_64_GOTPC",
+  "BFD_RELOC_MICROBLAZE_64_GOT",
+  "BFD_RELOC_MICROBLAZE_64_PLT",
+  "BFD_RELOC_MICROBLAZE_64_GOTOFF",
+  "BFD_RELOC_MICROBLAZE_32_GOTOFF",
+  "BFD_RELOC_MICROBLAZE_COPY",
+  "BFD_RELOC_TILEPRO_COPY",
+  "BFD_RELOC_TILEPRO_GLOB_DAT",
+  "BFD_RELOC_TILEPRO_JMP_SLOT",
+  "BFD_RELOC_TILEPRO_RELATIVE",
+  "BFD_RELOC_TILEPRO_BROFF_X1",
+  "BFD_RELOC_TILEPRO_JOFFLONG_X1",
+  "BFD_RELOC_TILEPRO_JOFFLONG_X1_PLT",
+  "BFD_RELOC_TILEPRO_IMM8_X0",
+  "BFD_RELOC_TILEPRO_IMM8_Y0",
+  "BFD_RELOC_TILEPRO_IMM8_X1",
+  "BFD_RELOC_TILEPRO_IMM8_Y1",
+  "BFD_RELOC_TILEPRO_DEST_IMM8_X1",
+  "BFD_RELOC_TILEPRO_MT_IMM15_X1",
+  "BFD_RELOC_TILEPRO_MF_IMM15_X1",
+  "BFD_RELOC_TILEPRO_IMM16_X0",
+  "BFD_RELOC_TILEPRO_IMM16_X1",
+  "BFD_RELOC_TILEPRO_IMM16_X0_LO",
+  "BFD_RELOC_TILEPRO_IMM16_X1_LO",
+  "BFD_RELOC_TILEPRO_IMM16_X0_HI",
+  "BFD_RELOC_TILEPRO_IMM16_X1_HI",
+  "BFD_RELOC_TILEPRO_IMM16_X0_HA",
+  "BFD_RELOC_TILEPRO_IMM16_X1_HA",
+  "BFD_RELOC_TILEPRO_IMM16_X0_PCREL",
+  "BFD_RELOC_TILEPRO_IMM16_X1_PCREL",
+  "BFD_RELOC_TILEPRO_IMM16_X0_LO_PCREL",
+  "BFD_RELOC_TILEPRO_IMM16_X1_LO_PCREL",
+  "BFD_RELOC_TILEPRO_IMM16_X0_HI_PCREL",
+  "BFD_RELOC_TILEPRO_IMM16_X1_HI_PCREL",
+  "BFD_RELOC_TILEPRO_IMM16_X0_HA_PCREL",
+  "BFD_RELOC_TILEPRO_IMM16_X1_HA_PCREL",
+  "BFD_RELOC_TILEPRO_IMM16_X0_GOT",
+  "BFD_RELOC_TILEPRO_IMM16_X1_GOT",
+  "BFD_RELOC_TILEPRO_IMM16_X0_GOT_LO",
+  "BFD_RELOC_TILEPRO_IMM16_X1_GOT_LO",
+  "BFD_RELOC_TILEPRO_IMM16_X0_GOT_HI",
+  "BFD_RELOC_TILEPRO_IMM16_X1_GOT_HI",
+  "BFD_RELOC_TILEPRO_IMM16_X0_GOT_HA",
+  "BFD_RELOC_TILEPRO_IMM16_X1_GOT_HA",
+  "BFD_RELOC_TILEPRO_MMSTART_X0",
+  "BFD_RELOC_TILEPRO_MMEND_X0",
+  "BFD_RELOC_TILEPRO_MMSTART_X1",
+  "BFD_RELOC_TILEPRO_MMEND_X1",
+  "BFD_RELOC_TILEPRO_SHAMT_X0",
+  "BFD_RELOC_TILEPRO_SHAMT_X1",
+  "BFD_RELOC_TILEPRO_SHAMT_Y0",
+  "BFD_RELOC_TILEPRO_SHAMT_Y1",
+  "BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD",
+  "BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD",
+  "BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_LO",
+  "BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_LO",
+  "BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_HI",
+  "BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_HI",
+  "BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_HA",
+  "BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_HA",
+  "BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE",
+  "BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE",
+  "BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE_LO",
+  "BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE_LO",
+  "BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE_HI",
+  "BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE_HI",
+  "BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE_HA",
+  "BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE_HA",
+  "BFD_RELOC_TILEPRO_TLS_DTPMOD32",
+  "BFD_RELOC_TILEPRO_TLS_DTPOFF32",
+  "BFD_RELOC_TILEPRO_TLS_TPOFF32",
+  "BFD_RELOC_TILEGX_HW0",
+  "BFD_RELOC_TILEGX_HW1",
+  "BFD_RELOC_TILEGX_HW2",
+  "BFD_RELOC_TILEGX_HW3",
+  "BFD_RELOC_TILEGX_HW0_LAST",
+  "BFD_RELOC_TILEGX_HW1_LAST",
+  "BFD_RELOC_TILEGX_HW2_LAST",
+  "BFD_RELOC_TILEGX_COPY",
+  "BFD_RELOC_TILEGX_GLOB_DAT",
+  "BFD_RELOC_TILEGX_JMP_SLOT",
+  "BFD_RELOC_TILEGX_RELATIVE",
+  "BFD_RELOC_TILEGX_BROFF_X1",
+  "BFD_RELOC_TILEGX_JUMPOFF_X1",
+  "BFD_RELOC_TILEGX_JUMPOFF_X1_PLT",
+  "BFD_RELOC_TILEGX_IMM8_X0",
+  "BFD_RELOC_TILEGX_IMM8_Y0",
+  "BFD_RELOC_TILEGX_IMM8_X1",
+  "BFD_RELOC_TILEGX_IMM8_Y1",
+  "BFD_RELOC_TILEGX_DEST_IMM8_X1",
+  "BFD_RELOC_TILEGX_MT_IMM14_X1",
+  "BFD_RELOC_TILEGX_MF_IMM14_X1",
+  "BFD_RELOC_TILEGX_MMSTART_X0",
+  "BFD_RELOC_TILEGX_MMEND_X0",
+  "BFD_RELOC_TILEGX_SHAMT_X0",
+  "BFD_RELOC_TILEGX_SHAMT_X1",
+  "BFD_RELOC_TILEGX_SHAMT_Y0",
+  "BFD_RELOC_TILEGX_SHAMT_Y1",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW0",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW0",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW1",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW1",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW2",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW2",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW3",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW3",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW0_PCREL",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW0_PCREL",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW1_PCREL",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW1_PCREL",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW2_PCREL",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW2_PCREL",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW3_PCREL",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW3_PCREL",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_PCREL",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_PCREL",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_PCREL",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_PCREL",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_PCREL",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_PCREL",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW0_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW0_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW1_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW1_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW2_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW2_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW3_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW3_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_GOT",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW1_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW1_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW2_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW2_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW3_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW3_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_TLS_GD",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW1_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW1_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW2_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW2_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW3_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW3_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_TLS_IE",
+  "BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_TLS_IE",
+  "BFD_RELOC_TILEGX_TLS_DTPMOD64",
+  "BFD_RELOC_TILEGX_TLS_DTPOFF64",
+  "BFD_RELOC_TILEGX_TLS_TPOFF64",
+  "BFD_RELOC_TILEGX_TLS_DTPMOD32",
+  "BFD_RELOC_TILEGX_TLS_DTPOFF32",
+  "BFD_RELOC_TILEGX_TLS_TPOFF32",
+ "@@overflow: BFD_RELOC_UNUSED@@",
+};
+#endif
+
+reloc_howto_type *bfd_default_reloc_type_lookup
+   (bfd *abfd, bfd_reloc_code_real_type  code);
+
+bfd_boolean bfd_generic_relax_section
+   (bfd *abfd,
+    asection *section,
+    struct bfd_link_info *,
+    bfd_boolean *);
+
+bfd_boolean bfd_generic_gc_sections
+   (bfd *, struct bfd_link_info *);
+
+void bfd_generic_lookup_section_flags
+   (struct bfd_link_info *, struct flag_info *);
+
+bfd_boolean bfd_generic_merge_sections
+   (bfd *, struct bfd_link_info *);
+
+bfd_byte *bfd_generic_get_relocated_section_contents
+   (bfd *abfd,
+    struct bfd_link_info *link_info,
+    struct bfd_link_order *link_order,
+    bfd_byte *data,
+    bfd_boolean relocatable,
+    asymbol **symbols);
+
+/* Extracted from archures.c.  */
+extern const bfd_arch_info_type bfd_default_arch_struct;
+bfd_boolean bfd_default_set_arch_mach
+   (bfd *abfd, enum bfd_architecture arch, unsigned long mach);
+
+const bfd_arch_info_type *bfd_default_compatible
+   (const bfd_arch_info_type *a, const bfd_arch_info_type *b);
+
+bfd_boolean bfd_default_scan
+   (const struct bfd_arch_info *info, const char *string);
+
+/* Extracted from elf.c.  */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libcoff-in.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libcoff-in.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libcoff-in.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libcoff-in.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,607 @@
+/* BFD COFF object file private structure.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "bfdlink.h"
+
+/* Object file tdata; access macros.  */
+
+#define coff_data(bfd)		      ((bfd)->tdata.coff_obj_data)
+#define obj_pe(bfd)                   (coff_data (bfd)->pe)
+#define obj_symbols(bfd)	      (coff_data (bfd)->symbols)
+#define	obj_sym_filepos(bfd)	      (coff_data (bfd)->sym_filepos)
+#define obj_relocbase(bfd)	      (coff_data (bfd)->relocbase)
+#define obj_raw_syments(bfd)	      (coff_data (bfd)->raw_syments)
+#define obj_raw_syment_count(bfd)     (coff_data (bfd)->raw_syment_count)
+#define obj_convert(bfd)	      (coff_data (bfd)->conversion_table)
+#define obj_conv_table_size(bfd)      (coff_data (bfd)->conv_table_size)
+#define obj_coff_external_syms(bfd)   (coff_data (bfd)->external_syms)
+#define obj_coff_keep_syms(bfd)	      (coff_data (bfd)->keep_syms)
+#define obj_coff_strings(bfd)	      (coff_data (bfd)->strings)
+#define obj_coff_keep_strings(bfd)    (coff_data (bfd)->keep_strings)
+#define obj_coff_sym_hashes(bfd)      (coff_data (bfd)->sym_hashes)
+#define obj_coff_strings_written(bfd) (coff_data (bfd)->strings_written)
+#define obj_coff_local_toc_table(bfd) (coff_data (bfd)->local_toc_sym_map)
+
+/* `Tdata' information kept for COFF files.  */
+
+typedef struct coff_tdata
+{
+  struct coff_symbol_struct *symbols;	/* Symtab for input bfd.  */
+  unsigned int *conversion_table;
+  int conv_table_size;
+  file_ptr sym_filepos;
+
+  struct coff_ptr_struct *raw_syments;
+  unsigned long raw_syment_count;
+
+  /* These are only valid once writing has begun.  */
+  long int relocbase;
+
+  /* These members communicate important constants about the symbol table
+     to GDB's symbol-reading code.  These `constants' unfortunately vary
+     from coff implementation to implementation...  */
+  unsigned local_n_btmask;
+  unsigned local_n_btshft;
+  unsigned local_n_tmask;
+  unsigned local_n_tshift;
+  unsigned local_symesz;
+  unsigned local_auxesz;
+  unsigned local_linesz;
+
+  /* The unswapped external symbols.  May be NULL.  Read by
+     _bfd_coff_get_external_symbols.  */
+  void * external_syms;
+  /* If this is TRUE, the external_syms may not be freed.  */
+  bfd_boolean keep_syms;
+
+  /* The string table.  May be NULL.  Read by
+     _bfd_coff_read_string_table.  */
+  char *strings;
+  /* If this is TRUE, the strings may not be freed.  */
+  bfd_boolean keep_strings;
+  /* If this is TRUE, the strings have been written out already.  */
+  bfd_boolean strings_written;
+
+  /* Is this a PE format coff file?  */
+  int pe;
+  /* Used by the COFF backend linker.  */
+  struct coff_link_hash_entry **sym_hashes;
+
+  /* Used by the pe linker for PowerPC.  */
+  int *local_toc_sym_map;
+
+  struct bfd_link_info *link_info;
+
+  /* Used by coff_find_nearest_line.  */
+  void * line_info;
+
+  /* A place to stash dwarf2 info for this bfd.  */
+  void * dwarf2_find_line_info;
+
+  /* The timestamp from the COFF file header.  */
+  long timestamp;
+
+  /* Copy of some of the f_flags bits in the COFF filehdr structure,
+     used by ARM code.  */
+  flagword flags;
+
+  /* coff-stgo32 EXE stub header after BFD tdata has been allocated.  Its data
+     is kept in internal_filehdr.go32stub beforehand.  */
+  char *go32stub;
+} coff_data_type;
+
+/* Tdata for pe image files.  */
+typedef struct pe_tdata
+{
+  coff_data_type coff;
+  struct internal_extra_pe_aouthdr pe_opthdr;
+  int dll;
+  int has_reloc_section;
+  int dont_strip_reloc;
+  bfd_boolean (*in_reloc_p) (bfd *, reloc_howto_type *);
+  flagword real_flags;
+} pe_data_type;
+
+#define pe_data(bfd)		((bfd)->tdata.pe_obj_data)
+
+/* Tdata for XCOFF files.  */
+
+struct xcoff_tdata
+{
+  /* Basic COFF information.  */
+  coff_data_type coff;
+
+  /* TRUE if this is an XCOFF64 file. */
+  bfd_boolean xcoff64;
+
+  /* TRUE if a large a.out header should be generated.  */
+  bfd_boolean full_aouthdr;
+
+  /* TOC value.  */
+  bfd_vma toc;
+
+  /* Index of section holding TOC.  */
+  int sntoc;
+
+  /* Index of section holding entry point.  */
+  int snentry;
+
+  /* .text alignment from optional header.  */
+  int text_align_power;
+
+  /* .data alignment from optional header.  */
+  int data_align_power;
+
+  /* modtype from optional header.  */
+  short modtype;
+
+  /* cputype from optional header.  */
+  short cputype;
+
+  /* maxdata from optional header.  */
+  bfd_vma maxdata;
+
+  /* maxstack from optional header.  */
+  bfd_vma maxstack;
+
+  /* Used by the XCOFF backend linker.  */
+  asection **csects;
+  long *debug_indices;
+  unsigned int *lineno_counts;
+  unsigned int import_file_id;
+};
+
+#define xcoff_data(abfd) ((abfd)->tdata.xcoff_obj_data)
+
+/* We take the address of the first element of an asymbol to ensure that the
+   macro is only ever applied to an asymbol.  */
+#define coffsymbol(asymbol) ((coff_symbol_type *)(&((asymbol)->the_bfd)))
+
+/* The used_by_bfd field of a section may be set to a pointer to this
+   structure.  */
+
+struct coff_section_tdata
+{
+  /* The relocs, swapped into COFF internal form.  This may be NULL.  */
+  struct internal_reloc *relocs;
+  /* If this is TRUE, the relocs entry may not be freed.  */
+  bfd_boolean keep_relocs;
+  /* The section contents.  This may be NULL.  */
+  bfd_byte *contents;
+  /* If this is TRUE, the contents entry may not be freed.  */
+  bfd_boolean keep_contents;
+  /* Information cached by coff_find_nearest_line.  */
+  bfd_vma offset;
+  unsigned int i;
+  const char *function;
+  /* Optional information about a COMDAT entry; NULL if not COMDAT. */
+  struct coff_comdat_info *comdat;
+  int line_base;
+  /* A pointer used for .stab linking optimizations.  */
+  void * stab_info;
+  /* Available for individual backends.  */
+  void * tdata;
+};
+
+/* An accessor macro for the coff_section_tdata structure.  */
+#define coff_section_data(abfd, sec) \
+  ((struct coff_section_tdata *) (sec)->used_by_bfd)
+
+/* Tdata for sections in XCOFF files.  This is used by the linker.  */
+
+struct xcoff_section_tdata
+{
+  /* Used for XCOFF csects created by the linker; points to the real
+     XCOFF section which contains this csect.  */
+  asection *enclosing;
+  /* The lineno_count field for the enclosing section, because we are
+     going to clobber it there.  */
+  unsigned int lineno_count;
+  /* The first and last symbol indices for symbols used by this csect.  */
+  unsigned long first_symndx;
+  unsigned long last_symndx;
+};
+
+/* An accessor macro the xcoff_section_tdata structure.  */
+#define xcoff_section_data(abfd, sec) \
+  ((struct xcoff_section_tdata *) coff_section_data ((abfd), (sec))->tdata)
+
+/* Tdata for sections in PE files.  */
+
+struct pei_section_tdata
+{
+  /* The virtual size of the section.  */
+  bfd_size_type virt_size;
+  /* The PE section flags.  */
+  long pe_flags;
+};
+
+/* An accessor macro for the pei_section_tdata structure.  */
+#define pei_section_data(abfd, sec) \
+  ((struct pei_section_tdata *) coff_section_data ((abfd), (sec))->tdata)
+
+/* COFF linker hash table entries.  */
+
+struct coff_link_hash_entry
+{
+  struct bfd_link_hash_entry root;
+
+  /* Symbol index in output file.  Set to -1 initially.  Set to -2 if
+     there is a reloc against this symbol.  */
+  long indx;
+
+  /* Symbol type.  */
+  unsigned short type;
+
+  /* Symbol class.  */
+  unsigned char symbol_class;
+
+  /* Number of auxiliary entries.  */
+  char numaux;
+
+  /* BFD to take auxiliary entries from.  */
+  bfd *auxbfd;
+
+  /* Pointer to array of auxiliary entries, if any.  */
+  union internal_auxent *aux;
+
+  /* Flag word; legal values follow.  */
+  unsigned short coff_link_hash_flags;
+  /* Symbol is a PE section symbol.  */
+#define COFF_LINK_HASH_PE_SECTION_SYMBOL (01)
+};
+
+/* COFF linker hash table.  */
+
+struct coff_link_hash_table
+{
+  struct bfd_link_hash_table root;
+  /* A pointer to information used to link stabs in sections.  */
+  struct stab_info stab_info;
+};
+
+/* Look up an entry in a COFF linker hash table.  */
+
+#define coff_link_hash_lookup(table, string, create, copy, follow)	\
+  ((struct coff_link_hash_entry *)					\
+   bfd_link_hash_lookup (&(table)->root, (string), (create),		\
+			 (copy), (follow)))
+
+/* Traverse a COFF linker hash table.  */
+
+#define coff_link_hash_traverse(table, func, info)			\
+  (bfd_link_hash_traverse						\
+   (&(table)->root,							\
+    (bfd_boolean (*) (struct bfd_link_hash_entry *, void *)) (func), \
+    (info)))
+
+/* Get the COFF linker hash table from a link_info structure.  */
+
+#define coff_hash_table(p) ((struct coff_link_hash_table *) ((p)->hash))
+
+/* Functions in coffgen.c.  */
+extern const bfd_target *coff_object_p
+  (bfd *);
+extern struct bfd_section *coff_section_from_bfd_index
+  (bfd *, int);
+extern long coff_get_symtab_upper_bound
+  (bfd *);
+extern long coff_canonicalize_symtab
+  (bfd *, asymbol **);
+extern int coff_count_linenumbers
+  (bfd *);
+extern struct coff_symbol_struct *coff_symbol_from
+  (bfd *, asymbol *);
+extern bfd_boolean coff_renumber_symbols
+  (bfd *, int *);
+extern void coff_mangle_symbols
+  (bfd *);
+extern bfd_boolean coff_write_symbols
+  (bfd *);
+extern bfd_boolean coff_write_linenumbers
+  (bfd *);
+extern alent *coff_get_lineno
+  (bfd *, asymbol *);
+extern asymbol *coff_section_symbol
+  (bfd *, char *);
+extern bfd_boolean _bfd_coff_get_external_symbols
+  (bfd *);
+extern const char *_bfd_coff_read_string_table
+  (bfd *);
+extern bfd_boolean _bfd_coff_free_symbols
+  (bfd *);
+extern struct coff_ptr_struct *coff_get_normalized_symtab
+  (bfd *);
+extern long coff_get_reloc_upper_bound
+  (bfd *, sec_ptr);
+extern asymbol *coff_make_empty_symbol
+  (bfd *);
+extern void coff_print_symbol
+  (bfd *, void * filep, asymbol *, bfd_print_symbol_type);
+extern void coff_get_symbol_info
+  (bfd *, asymbol *, symbol_info *ret);
+extern bfd_boolean _bfd_coff_is_local_label_name
+  (bfd *, const char *);
+extern asymbol *coff_bfd_make_debug_symbol
+  (bfd *, void *, unsigned long);
+extern bfd_boolean coff_find_nearest_line
+  (bfd *, asection *, asymbol **, bfd_vma, const char **,
+   const char **, unsigned int *);
+extern bfd_boolean coff_find_inliner_info
+  (bfd *, const char **, const char **, unsigned int *);
+extern int coff_sizeof_headers
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean bfd_coff_reloc16_relax_section
+  (bfd *, asection *, struct bfd_link_info *, bfd_boolean *);
+extern bfd_byte *bfd_coff_reloc16_get_relocated_section_contents
+  (bfd *, struct bfd_link_info *, struct bfd_link_order *,
+   bfd_byte *, bfd_boolean, asymbol **);
+extern bfd_vma bfd_coff_reloc16_get_value
+  (arelent *, struct bfd_link_info *, asection *);
+extern void bfd_perform_slip
+  (bfd *, unsigned int, asection *, bfd_vma);
+
+/* Functions and types in cofflink.c.  */
+
+#define STRING_SIZE_SIZE 4
+
+/* We use a hash table to merge identical enum, struct, and union
+   definitions in the linker.  */
+
+/* Information we keep for a single element (an enum value, a
+   structure or union field) in the debug merge hash table.  */
+
+struct coff_debug_merge_element
+{
+  /* Next element.  */
+  struct coff_debug_merge_element *next;
+
+  /* Name.  */
+  const char *name;
+
+  /* Type.  */
+  unsigned int type;
+
+  /* Symbol index for complex type.  */
+  long tagndx;
+};
+
+/* A linked list of debug merge entries for a given name.  */
+
+struct coff_debug_merge_type
+{
+  /* Next type with the same name.  */
+  struct coff_debug_merge_type *next;
+
+  /* Class of type.  */
+  int type_class;
+
+  /* Symbol index where this type is defined.  */
+  long indx;
+
+  /* List of elements.  */
+  struct coff_debug_merge_element *elements;
+};
+
+/* Information we store in the debug merge hash table.  */
+
+struct coff_debug_merge_hash_entry
+{
+  struct bfd_hash_entry root;
+
+  /* A list of types with this name.  */
+  struct coff_debug_merge_type *types;
+};
+
+/* The debug merge hash table.  */
+
+struct coff_debug_merge_hash_table
+{
+  struct bfd_hash_table root;
+};
+
+/* Initialize a COFF debug merge hash table.  */
+
+#define coff_debug_merge_hash_table_init(table) \
+  (bfd_hash_table_init (&(table)->root, _bfd_coff_debug_merge_hash_newfunc, \
+			sizeof (struct coff_debug_merge_hash_entry)))
+
+/* Free a COFF debug merge hash table.  */
+
+#define coff_debug_merge_hash_table_free(table) \
+  (bfd_hash_table_free (&(table)->root))
+
+/* Look up an entry in a COFF debug merge hash table.  */
+
+#define coff_debug_merge_hash_lookup(table, string, create, copy) \
+  ((struct coff_debug_merge_hash_entry *) \
+   bfd_hash_lookup (&(table)->root, (string), (create), (copy)))
+
+/* Information we keep for each section in the output file when doing
+   a relocatable link.  */
+
+struct coff_link_section_info
+{
+  /* The relocs to be output.  */
+  struct internal_reloc *relocs;
+  /* For each reloc against a global symbol whose index was not known
+     when the reloc was handled, the global hash table entry.  */
+  struct coff_link_hash_entry **rel_hashes;
+};
+
+/* Information that we pass around while doing the final link step.  */
+
+struct coff_final_link_info
+{
+  /* General link information.  */
+  struct bfd_link_info *info;
+  /* Output BFD.  */
+  bfd *output_bfd;
+  /* Used to indicate failure in traversal routine.  */
+  bfd_boolean failed;
+  /* If doing "task linking" set only during the time when we want the
+     global symbol writer to convert the storage class of defined global
+     symbols from global to static. */
+  bfd_boolean global_to_static;
+  /* Hash table for long symbol names.  */
+  struct bfd_strtab_hash *strtab;
+  /* When doing a relocatable link, an array of information kept for
+     each output section, indexed by the target_index field.  */
+  struct coff_link_section_info *section_info;
+  /* Symbol index of last C_FILE symbol (-1 if none).  */
+  long last_file_index;
+  /* Contents of last C_FILE symbol.  */
+  struct internal_syment last_file;
+  /* Symbol index of first aux entry of last .bf symbol with an empty
+     endndx field (-1 if none).  */
+  long last_bf_index;
+  /* Contents of last_bf_index aux entry.  */
+  union internal_auxent last_bf;
+  /* Hash table used to merge debug information.  */
+  struct coff_debug_merge_hash_table debug_merge;
+  /* Buffer large enough to hold swapped symbols of any input file.  */
+  struct internal_syment *internal_syms;
+  /* Buffer large enough to hold sections of symbols of any input file.  */
+  asection **sec_ptrs;
+  /* Buffer large enough to hold output indices of symbols of any
+     input file.  */
+  long *sym_indices;
+  /* Buffer large enough to hold output symbols for any input file.  */
+  bfd_byte *outsyms;
+  /* Buffer large enough to hold external line numbers for any input
+     section.  */
+  bfd_byte *linenos;
+  /* Buffer large enough to hold any input section.  */
+  bfd_byte *contents;
+  /* Buffer large enough to hold external relocs of any input section.  */
+  bfd_byte *external_relocs;
+  /* Buffer large enough to hold swapped relocs of any input section.  */
+  struct internal_reloc *internal_relocs;
+};
+
+/* Most COFF variants have no way to record the alignment of a
+   section.  This struct is used to set a specific alignment based on
+   the name of the section.  */
+
+struct coff_section_alignment_entry
+{
+  /* The section name.  */
+  const char *name;
+
+  /* This is either (unsigned int) -1, indicating that the section
+     name must match exactly, or it is the number of letters which
+     must match at the start of the name.  */
+  unsigned int comparison_length;
+
+  /* These macros may be used to fill in the first two fields in a
+     structure initialization.  */
+#define COFF_SECTION_NAME_EXACT_MATCH(name) (name), ((unsigned int) -1)
+#define COFF_SECTION_NAME_PARTIAL_MATCH(name) (name), (sizeof (name) - 1)
+
+  /* Only use this entry if the default section alignment for this
+     target is at least that much (as a power of two).  If this field
+     is COFF_ALIGNMENT_FIELD_EMPTY, it should be ignored.  */
+  unsigned int default_alignment_min;
+
+  /* Only use this entry if the default section alignment for this
+     target is no greater than this (as a power of two).  If this
+     field is COFF_ALIGNMENT_FIELD_EMPTY, it should be ignored.  */
+  unsigned int default_alignment_max;
+
+#define COFF_ALIGNMENT_FIELD_EMPTY ((unsigned int) -1)
+
+  /* The desired alignment for this section (as a power of two).  */
+  unsigned int alignment_power;
+};
+
+extern struct bfd_hash_entry *_bfd_coff_link_hash_newfunc
+  (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
+extern bfd_boolean _bfd_coff_link_hash_table_init
+  (struct coff_link_hash_table *, bfd *,
+   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
+			       struct bfd_hash_table *,
+			       const char *),
+   unsigned int);
+extern struct bfd_link_hash_table *_bfd_coff_link_hash_table_create
+  (bfd *);
+extern const char *_bfd_coff_internal_syment_name
+  (bfd *, const struct internal_syment *, char *);
+extern bfd_boolean _bfd_coff_section_already_linked
+  (bfd *, asection *, struct bfd_link_info *);
+extern bfd_boolean _bfd_coff_link_add_symbols
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_coff_final_link
+  (bfd *, struct bfd_link_info *);
+extern struct internal_reloc *_bfd_coff_read_internal_relocs
+  (bfd *, asection *, bfd_boolean, bfd_byte *, bfd_boolean,
+   struct internal_reloc *);
+extern bfd_boolean _bfd_coff_generic_relocate_section
+  (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+   struct internal_reloc *, struct internal_syment *, asection **);
+extern struct bfd_hash_entry *_bfd_coff_debug_merge_hash_newfunc
+  (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
+extern bfd_boolean _bfd_coff_write_global_sym
+  (struct bfd_hash_entry *, void *);
+extern bfd_boolean _bfd_coff_write_task_globals
+  (struct coff_link_hash_entry *, void *);
+extern bfd_boolean _bfd_coff_link_input_bfd
+  (struct coff_final_link_info *, bfd *);
+extern bfd_boolean _bfd_coff_reloc_link_order
+  (bfd *, struct coff_final_link_info *, asection *,
+   struct bfd_link_order *);
+
+
+#define coff_get_section_contents_in_window \
+  _bfd_generic_get_section_contents_in_window
+
+/* Functions in xcofflink.c.  */
+
+extern long _bfd_xcoff_get_dynamic_symtab_upper_bound
+  (bfd *);
+extern long _bfd_xcoff_canonicalize_dynamic_symtab
+  (bfd *, asymbol **);
+extern long _bfd_xcoff_get_dynamic_reloc_upper_bound
+  (bfd *);
+extern long _bfd_xcoff_canonicalize_dynamic_reloc
+  (bfd *, arelent **, asymbol **);
+extern struct bfd_link_hash_table *_bfd_xcoff_bfd_link_hash_table_create
+  (bfd *);
+extern void _bfd_xcoff_bfd_link_hash_table_free
+  (struct bfd_link_hash_table *);
+extern bfd_boolean _bfd_xcoff_bfd_link_add_symbols
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_xcoff_bfd_final_link
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_xcoff_define_common_symbol
+  (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *);
+extern bfd_boolean _bfd_ppc_xcoff_relocate_section
+  (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+   struct internal_reloc *, struct internal_syment *, asection **);
+
+/* Functions in coff-ppc.c.  FIXME: These are called by pe.em in the
+   linker, and so should start with bfd and be declared in bfd.h.  */
+
+extern bfd_boolean ppc_allocate_toc_section
+  (struct bfd_link_info *);
+extern bfd_boolean ppc_process_before_allocation
+  (bfd *, struct bfd_link_info *);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libcoff.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libcoff.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libcoff.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libcoff.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,958 @@
+/* DO NOT EDIT!  -*- buffer-read-only: t -*-  This file is automatically 
+   generated from "libcoff-in.h" and "coffcode.h".
+   Run "make headers" in your build bfd/ to regenerate.  */
+
+/* BFD COFF object file private structure.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "bfdlink.h"
+
+/* Object file tdata; access macros.  */
+
+#define coff_data(bfd)		      ((bfd)->tdata.coff_obj_data)
+#define obj_pe(bfd)                   (coff_data (bfd)->pe)
+#define obj_symbols(bfd)	      (coff_data (bfd)->symbols)
+#define	obj_sym_filepos(bfd)	      (coff_data (bfd)->sym_filepos)
+#define obj_relocbase(bfd)	      (coff_data (bfd)->relocbase)
+#define obj_raw_syments(bfd)	      (coff_data (bfd)->raw_syments)
+#define obj_raw_syment_count(bfd)     (coff_data (bfd)->raw_syment_count)
+#define obj_convert(bfd)	      (coff_data (bfd)->conversion_table)
+#define obj_conv_table_size(bfd)      (coff_data (bfd)->conv_table_size)
+#define obj_coff_external_syms(bfd)   (coff_data (bfd)->external_syms)
+#define obj_coff_keep_syms(bfd)	      (coff_data (bfd)->keep_syms)
+#define obj_coff_strings(bfd)	      (coff_data (bfd)->strings)
+#define obj_coff_keep_strings(bfd)    (coff_data (bfd)->keep_strings)
+#define obj_coff_sym_hashes(bfd)      (coff_data (bfd)->sym_hashes)
+#define obj_coff_strings_written(bfd) (coff_data (bfd)->strings_written)
+#define obj_coff_local_toc_table(bfd) (coff_data (bfd)->local_toc_sym_map)
+
+/* `Tdata' information kept for COFF files.  */
+
+typedef struct coff_tdata
+{
+  struct coff_symbol_struct *symbols;	/* Symtab for input bfd.  */
+  unsigned int *conversion_table;
+  int conv_table_size;
+  file_ptr sym_filepos;
+
+  struct coff_ptr_struct *raw_syments;
+  unsigned long raw_syment_count;
+
+  /* These are only valid once writing has begun.  */
+  long int relocbase;
+
+  /* These members communicate important constants about the symbol table
+     to GDB's symbol-reading code.  These `constants' unfortunately vary
+     from coff implementation to implementation...  */
+  unsigned local_n_btmask;
+  unsigned local_n_btshft;
+  unsigned local_n_tmask;
+  unsigned local_n_tshift;
+  unsigned local_symesz;
+  unsigned local_auxesz;
+  unsigned local_linesz;
+
+  /* The unswapped external symbols.  May be NULL.  Read by
+     _bfd_coff_get_external_symbols.  */
+  void * external_syms;
+  /* If this is TRUE, the external_syms may not be freed.  */
+  bfd_boolean keep_syms;
+
+  /* The string table.  May be NULL.  Read by
+     _bfd_coff_read_string_table.  */
+  char *strings;
+  /* If this is TRUE, the strings may not be freed.  */
+  bfd_boolean keep_strings;
+  /* If this is TRUE, the strings have been written out already.  */
+  bfd_boolean strings_written;
+
+  /* Is this a PE format coff file?  */
+  int pe;
+  /* Used by the COFF backend linker.  */
+  struct coff_link_hash_entry **sym_hashes;
+
+  /* Used by the pe linker for PowerPC.  */
+  int *local_toc_sym_map;
+
+  struct bfd_link_info *link_info;
+
+  /* Used by coff_find_nearest_line.  */
+  void * line_info;
+
+  /* A place to stash dwarf2 info for this bfd.  */
+  void * dwarf2_find_line_info;
+
+  /* The timestamp from the COFF file header.  */
+  long timestamp;
+
+  /* Copy of some of the f_flags bits in the COFF filehdr structure,
+     used by ARM code.  */
+  flagword flags;
+
+  /* coff-stgo32 EXE stub header after BFD tdata has been allocated.  Its data
+     is kept in internal_filehdr.go32stub beforehand.  */
+  char *go32stub;
+} coff_data_type;
+
+/* Tdata for pe image files.  */
+typedef struct pe_tdata
+{
+  coff_data_type coff;
+  struct internal_extra_pe_aouthdr pe_opthdr;
+  int dll;
+  int has_reloc_section;
+  int dont_strip_reloc;
+  bfd_boolean (*in_reloc_p) (bfd *, reloc_howto_type *);
+  flagword real_flags;
+} pe_data_type;
+
+#define pe_data(bfd)		((bfd)->tdata.pe_obj_data)
+
+/* Tdata for XCOFF files.  */
+
+struct xcoff_tdata
+{
+  /* Basic COFF information.  */
+  coff_data_type coff;
+
+  /* TRUE if this is an XCOFF64 file. */
+  bfd_boolean xcoff64;
+
+  /* TRUE if a large a.out header should be generated.  */
+  bfd_boolean full_aouthdr;
+
+  /* TOC value.  */
+  bfd_vma toc;
+
+  /* Index of section holding TOC.  */
+  int sntoc;
+
+  /* Index of section holding entry point.  */
+  int snentry;
+
+  /* .text alignment from optional header.  */
+  int text_align_power;
+
+  /* .data alignment from optional header.  */
+  int data_align_power;
+
+  /* modtype from optional header.  */
+  short modtype;
+
+  /* cputype from optional header.  */
+  short cputype;
+
+  /* maxdata from optional header.  */
+  bfd_vma maxdata;
+
+  /* maxstack from optional header.  */
+  bfd_vma maxstack;
+
+  /* Used by the XCOFF backend linker.  */
+  asection **csects;
+  long *debug_indices;
+  unsigned int *lineno_counts;
+  unsigned int import_file_id;
+};
+
+#define xcoff_data(abfd) ((abfd)->tdata.xcoff_obj_data)
+
+/* We take the address of the first element of an asymbol to ensure that the
+   macro is only ever applied to an asymbol.  */
+#define coffsymbol(asymbol) ((coff_symbol_type *)(&((asymbol)->the_bfd)))
+
+/* The used_by_bfd field of a section may be set to a pointer to this
+   structure.  */
+
+struct coff_section_tdata
+{
+  /* The relocs, swapped into COFF internal form.  This may be NULL.  */
+  struct internal_reloc *relocs;
+  /* If this is TRUE, the relocs entry may not be freed.  */
+  bfd_boolean keep_relocs;
+  /* The section contents.  This may be NULL.  */
+  bfd_byte *contents;
+  /* If this is TRUE, the contents entry may not be freed.  */
+  bfd_boolean keep_contents;
+  /* Information cached by coff_find_nearest_line.  */
+  bfd_vma offset;
+  unsigned int i;
+  const char *function;
+  /* Optional information about a COMDAT entry; NULL if not COMDAT. */
+  struct coff_comdat_info *comdat;
+  int line_base;
+  /* A pointer used for .stab linking optimizations.  */
+  void * stab_info;
+  /* Available for individual backends.  */
+  void * tdata;
+};
+
+/* An accessor macro for the coff_section_tdata structure.  */
+#define coff_section_data(abfd, sec) \
+  ((struct coff_section_tdata *) (sec)->used_by_bfd)
+
+/* Tdata for sections in XCOFF files.  This is used by the linker.  */
+
+struct xcoff_section_tdata
+{
+  /* Used for XCOFF csects created by the linker; points to the real
+     XCOFF section which contains this csect.  */
+  asection *enclosing;
+  /* The lineno_count field for the enclosing section, because we are
+     going to clobber it there.  */
+  unsigned int lineno_count;
+  /* The first and last symbol indices for symbols used by this csect.  */
+  unsigned long first_symndx;
+  unsigned long last_symndx;
+};
+
+/* An accessor macro the xcoff_section_tdata structure.  */
+#define xcoff_section_data(abfd, sec) \
+  ((struct xcoff_section_tdata *) coff_section_data ((abfd), (sec))->tdata)
+
+/* Tdata for sections in PE files.  */
+
+struct pei_section_tdata
+{
+  /* The virtual size of the section.  */
+  bfd_size_type virt_size;
+  /* The PE section flags.  */
+  long pe_flags;
+};
+
+/* An accessor macro for the pei_section_tdata structure.  */
+#define pei_section_data(abfd, sec) \
+  ((struct pei_section_tdata *) coff_section_data ((abfd), (sec))->tdata)
+
+/* COFF linker hash table entries.  */
+
+struct coff_link_hash_entry
+{
+  struct bfd_link_hash_entry root;
+
+  /* Symbol index in output file.  Set to -1 initially.  Set to -2 if
+     there is a reloc against this symbol.  */
+  long indx;
+
+  /* Symbol type.  */
+  unsigned short type;
+
+  /* Symbol class.  */
+  unsigned char symbol_class;
+
+  /* Number of auxiliary entries.  */
+  char numaux;
+
+  /* BFD to take auxiliary entries from.  */
+  bfd *auxbfd;
+
+  /* Pointer to array of auxiliary entries, if any.  */
+  union internal_auxent *aux;
+
+  /* Flag word; legal values follow.  */
+  unsigned short coff_link_hash_flags;
+  /* Symbol is a PE section symbol.  */
+#define COFF_LINK_HASH_PE_SECTION_SYMBOL (01)
+};
+
+/* COFF linker hash table.  */
+
+struct coff_link_hash_table
+{
+  struct bfd_link_hash_table root;
+  /* A pointer to information used to link stabs in sections.  */
+  struct stab_info stab_info;
+};
+
+/* Look up an entry in a COFF linker hash table.  */
+
+#define coff_link_hash_lookup(table, string, create, copy, follow)	\
+  ((struct coff_link_hash_entry *)					\
+   bfd_link_hash_lookup (&(table)->root, (string), (create),		\
+			 (copy), (follow)))
+
+/* Traverse a COFF linker hash table.  */
+
+#define coff_link_hash_traverse(table, func, info)			\
+  (bfd_link_hash_traverse						\
+   (&(table)->root,							\
+    (bfd_boolean (*) (struct bfd_link_hash_entry *, void *)) (func), \
+    (info)))
+
+/* Get the COFF linker hash table from a link_info structure.  */
+
+#define coff_hash_table(p) ((struct coff_link_hash_table *) ((p)->hash))
+
+/* Functions in coffgen.c.  */
+extern const bfd_target *coff_object_p
+  (bfd *);
+extern struct bfd_section *coff_section_from_bfd_index
+  (bfd *, int);
+extern long coff_get_symtab_upper_bound
+  (bfd *);
+extern long coff_canonicalize_symtab
+  (bfd *, asymbol **);
+extern int coff_count_linenumbers
+  (bfd *);
+extern struct coff_symbol_struct *coff_symbol_from
+  (bfd *, asymbol *);
+extern bfd_boolean coff_renumber_symbols
+  (bfd *, int *);
+extern void coff_mangle_symbols
+  (bfd *);
+extern bfd_boolean coff_write_symbols
+  (bfd *);
+extern bfd_boolean coff_write_linenumbers
+  (bfd *);
+extern alent *coff_get_lineno
+  (bfd *, asymbol *);
+extern asymbol *coff_section_symbol
+  (bfd *, char *);
+extern bfd_boolean _bfd_coff_get_external_symbols
+  (bfd *);
+extern const char *_bfd_coff_read_string_table
+  (bfd *);
+extern bfd_boolean _bfd_coff_free_symbols
+  (bfd *);
+extern struct coff_ptr_struct *coff_get_normalized_symtab
+  (bfd *);
+extern long coff_get_reloc_upper_bound
+  (bfd *, sec_ptr);
+extern asymbol *coff_make_empty_symbol
+  (bfd *);
+extern void coff_print_symbol
+  (bfd *, void * filep, asymbol *, bfd_print_symbol_type);
+extern void coff_get_symbol_info
+  (bfd *, asymbol *, symbol_info *ret);
+extern bfd_boolean _bfd_coff_is_local_label_name
+  (bfd *, const char *);
+extern asymbol *coff_bfd_make_debug_symbol
+  (bfd *, void *, unsigned long);
+extern bfd_boolean coff_find_nearest_line
+  (bfd *, asection *, asymbol **, bfd_vma, const char **,
+   const char **, unsigned int *);
+extern bfd_boolean coff_find_inliner_info
+  (bfd *, const char **, const char **, unsigned int *);
+extern int coff_sizeof_headers
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean bfd_coff_reloc16_relax_section
+  (bfd *, asection *, struct bfd_link_info *, bfd_boolean *);
+extern bfd_byte *bfd_coff_reloc16_get_relocated_section_contents
+  (bfd *, struct bfd_link_info *, struct bfd_link_order *,
+   bfd_byte *, bfd_boolean, asymbol **);
+extern bfd_vma bfd_coff_reloc16_get_value
+  (arelent *, struct bfd_link_info *, asection *);
+extern void bfd_perform_slip
+  (bfd *, unsigned int, asection *, bfd_vma);
+
+/* Functions and types in cofflink.c.  */
+
+#define STRING_SIZE_SIZE 4
+
+/* We use a hash table to merge identical enum, struct, and union
+   definitions in the linker.  */
+
+/* Information we keep for a single element (an enum value, a
+   structure or union field) in the debug merge hash table.  */
+
+struct coff_debug_merge_element
+{
+  /* Next element.  */
+  struct coff_debug_merge_element *next;
+
+  /* Name.  */
+  const char *name;
+
+  /* Type.  */
+  unsigned int type;
+
+  /* Symbol index for complex type.  */
+  long tagndx;
+};
+
+/* A linked list of debug merge entries for a given name.  */
+
+struct coff_debug_merge_type
+{
+  /* Next type with the same name.  */
+  struct coff_debug_merge_type *next;
+
+  /* Class of type.  */
+  int type_class;
+
+  /* Symbol index where this type is defined.  */
+  long indx;
+
+  /* List of elements.  */
+  struct coff_debug_merge_element *elements;
+};
+
+/* Information we store in the debug merge hash table.  */
+
+struct coff_debug_merge_hash_entry
+{
+  struct bfd_hash_entry root;
+
+  /* A list of types with this name.  */
+  struct coff_debug_merge_type *types;
+};
+
+/* The debug merge hash table.  */
+
+struct coff_debug_merge_hash_table
+{
+  struct bfd_hash_table root;
+};
+
+/* Initialize a COFF debug merge hash table.  */
+
+#define coff_debug_merge_hash_table_init(table) \
+  (bfd_hash_table_init (&(table)->root, _bfd_coff_debug_merge_hash_newfunc, \
+			sizeof (struct coff_debug_merge_hash_entry)))
+
+/* Free a COFF debug merge hash table.  */
+
+#define coff_debug_merge_hash_table_free(table) \
+  (bfd_hash_table_free (&(table)->root))
+
+/* Look up an entry in a COFF debug merge hash table.  */
+
+#define coff_debug_merge_hash_lookup(table, string, create, copy) \
+  ((struct coff_debug_merge_hash_entry *) \
+   bfd_hash_lookup (&(table)->root, (string), (create), (copy)))
+
+/* Information we keep for each section in the output file when doing
+   a relocatable link.  */
+
+struct coff_link_section_info
+{
+  /* The relocs to be output.  */
+  struct internal_reloc *relocs;
+  /* For each reloc against a global symbol whose index was not known
+     when the reloc was handled, the global hash table entry.  */
+  struct coff_link_hash_entry **rel_hashes;
+};
+
+/* Information that we pass around while doing the final link step.  */
+
+struct coff_final_link_info
+{
+  /* General link information.  */
+  struct bfd_link_info *info;
+  /* Output BFD.  */
+  bfd *output_bfd;
+  /* Used to indicate failure in traversal routine.  */
+  bfd_boolean failed;
+  /* If doing "task linking" set only during the time when we want the
+     global symbol writer to convert the storage class of defined global
+     symbols from global to static. */
+  bfd_boolean global_to_static;
+  /* Hash table for long symbol names.  */
+  struct bfd_strtab_hash *strtab;
+  /* When doing a relocatable link, an array of information kept for
+     each output section, indexed by the target_index field.  */
+  struct coff_link_section_info *section_info;
+  /* Symbol index of last C_FILE symbol (-1 if none).  */
+  long last_file_index;
+  /* Contents of last C_FILE symbol.  */
+  struct internal_syment last_file;
+  /* Symbol index of first aux entry of last .bf symbol with an empty
+     endndx field (-1 if none).  */
+  long last_bf_index;
+  /* Contents of last_bf_index aux entry.  */
+  union internal_auxent last_bf;
+  /* Hash table used to merge debug information.  */
+  struct coff_debug_merge_hash_table debug_merge;
+  /* Buffer large enough to hold swapped symbols of any input file.  */
+  struct internal_syment *internal_syms;
+  /* Buffer large enough to hold sections of symbols of any input file.  */
+  asection **sec_ptrs;
+  /* Buffer large enough to hold output indices of symbols of any
+     input file.  */
+  long *sym_indices;
+  /* Buffer large enough to hold output symbols for any input file.  */
+  bfd_byte *outsyms;
+  /* Buffer large enough to hold external line numbers for any input
+     section.  */
+  bfd_byte *linenos;
+  /* Buffer large enough to hold any input section.  */
+  bfd_byte *contents;
+  /* Buffer large enough to hold external relocs of any input section.  */
+  bfd_byte *external_relocs;
+  /* Buffer large enough to hold swapped relocs of any input section.  */
+  struct internal_reloc *internal_relocs;
+};
+
+/* Most COFF variants have no way to record the alignment of a
+   section.  This struct is used to set a specific alignment based on
+   the name of the section.  */
+
+struct coff_section_alignment_entry
+{
+  /* The section name.  */
+  const char *name;
+
+  /* This is either (unsigned int) -1, indicating that the section
+     name must match exactly, or it is the number of letters which
+     must match at the start of the name.  */
+  unsigned int comparison_length;
+
+  /* These macros may be used to fill in the first two fields in a
+     structure initialization.  */
+#define COFF_SECTION_NAME_EXACT_MATCH(name) (name), ((unsigned int) -1)
+#define COFF_SECTION_NAME_PARTIAL_MATCH(name) (name), (sizeof (name) - 1)
+
+  /* Only use this entry if the default section alignment for this
+     target is at least that much (as a power of two).  If this field
+     is COFF_ALIGNMENT_FIELD_EMPTY, it should be ignored.  */
+  unsigned int default_alignment_min;
+
+  /* Only use this entry if the default section alignment for this
+     target is no greater than this (as a power of two).  If this
+     field is COFF_ALIGNMENT_FIELD_EMPTY, it should be ignored.  */
+  unsigned int default_alignment_max;
+
+#define COFF_ALIGNMENT_FIELD_EMPTY ((unsigned int) -1)
+
+  /* The desired alignment for this section (as a power of two).  */
+  unsigned int alignment_power;
+};
+
+extern struct bfd_hash_entry *_bfd_coff_link_hash_newfunc
+  (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
+extern bfd_boolean _bfd_coff_link_hash_table_init
+  (struct coff_link_hash_table *, bfd *,
+   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
+			       struct bfd_hash_table *,
+			       const char *),
+   unsigned int);
+extern struct bfd_link_hash_table *_bfd_coff_link_hash_table_create
+  (bfd *);
+extern const char *_bfd_coff_internal_syment_name
+  (bfd *, const struct internal_syment *, char *);
+extern bfd_boolean _bfd_coff_section_already_linked
+  (bfd *, asection *, struct bfd_link_info *);
+extern bfd_boolean _bfd_coff_link_add_symbols
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_coff_final_link
+  (bfd *, struct bfd_link_info *);
+extern struct internal_reloc *_bfd_coff_read_internal_relocs
+  (bfd *, asection *, bfd_boolean, bfd_byte *, bfd_boolean,
+   struct internal_reloc *);
+extern bfd_boolean _bfd_coff_generic_relocate_section
+  (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+   struct internal_reloc *, struct internal_syment *, asection **);
+extern struct bfd_hash_entry *_bfd_coff_debug_merge_hash_newfunc
+  (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
+extern bfd_boolean _bfd_coff_write_global_sym
+  (struct bfd_hash_entry *, void *);
+extern bfd_boolean _bfd_coff_write_task_globals
+  (struct coff_link_hash_entry *, void *);
+extern bfd_boolean _bfd_coff_link_input_bfd
+  (struct coff_final_link_info *, bfd *);
+extern bfd_boolean _bfd_coff_reloc_link_order
+  (bfd *, struct coff_final_link_info *, asection *,
+   struct bfd_link_order *);
+
+
+#define coff_get_section_contents_in_window \
+  _bfd_generic_get_section_contents_in_window
+
+/* Functions in xcofflink.c.  */
+
+extern long _bfd_xcoff_get_dynamic_symtab_upper_bound
+  (bfd *);
+extern long _bfd_xcoff_canonicalize_dynamic_symtab
+  (bfd *, asymbol **);
+extern long _bfd_xcoff_get_dynamic_reloc_upper_bound
+  (bfd *);
+extern long _bfd_xcoff_canonicalize_dynamic_reloc
+  (bfd *, arelent **, asymbol **);
+extern struct bfd_link_hash_table *_bfd_xcoff_bfd_link_hash_table_create
+  (bfd *);
+extern void _bfd_xcoff_bfd_link_hash_table_free
+  (struct bfd_link_hash_table *);
+extern bfd_boolean _bfd_xcoff_bfd_link_add_symbols
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_xcoff_bfd_final_link
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_xcoff_define_common_symbol
+  (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *);
+extern bfd_boolean _bfd_ppc_xcoff_relocate_section
+  (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+   struct internal_reloc *, struct internal_syment *, asection **);
+
+/* Functions in coff-ppc.c.  FIXME: These are called by pe.em in the
+   linker, and so should start with bfd and be declared in bfd.h.  */
+
+extern bfd_boolean ppc_allocate_toc_section
+  (struct bfd_link_info *);
+extern bfd_boolean ppc_process_before_allocation
+  (bfd *, struct bfd_link_info *);
+/* Extracted from coffcode.h.  */
+typedef struct coff_ptr_struct
+{
+  /* Remembers the offset from the first symbol in the file for
+     this symbol. Generated by coff_renumber_symbols. */
+  unsigned int offset;
+
+  /* Should the value of this symbol be renumbered.  Used for
+     XCOFF C_BSTAT symbols.  Set by coff_slurp_symbol_table.  */
+  unsigned int fix_value : 1;
+
+  /* Should the tag field of this symbol be renumbered.
+     Created by coff_pointerize_aux. */
+  unsigned int fix_tag : 1;
+
+  /* Should the endidx field of this symbol be renumbered.
+     Created by coff_pointerize_aux. */
+  unsigned int fix_end : 1;
+
+  /* Should the x_csect.x_scnlen field be renumbered.
+     Created by coff_pointerize_aux. */
+  unsigned int fix_scnlen : 1;
+
+  /* Fix up an XCOFF C_BINCL/C_EINCL symbol.  The value is the
+     index into the line number entries.  Set by coff_slurp_symbol_table.  */
+  unsigned int fix_line : 1;
+
+  /* The container for the symbol structure as read and translated
+     from the file. */
+  union
+  {
+    union internal_auxent auxent;
+    struct internal_syment syment;
+  } u;
+} combined_entry_type;
+
+
+/* Each canonical asymbol really looks like this: */
+
+typedef struct coff_symbol_struct
+{
+  /* The actual symbol which the rest of BFD works with */
+  asymbol symbol;
+
+  /* A pointer to the hidden information for this symbol */
+  combined_entry_type *native;
+
+  /* A pointer to the linenumber information for this symbol */
+  struct lineno_cache_entry *lineno;
+
+  /* Have the line numbers been relocated yet ? */
+  bfd_boolean done_lineno;
+} coff_symbol_type;
+/* COFF symbol classifications.  */
+
+enum coff_symbol_classification
+{
+  /* Global symbol.  */
+  COFF_SYMBOL_GLOBAL,
+  /* Common symbol.  */
+  COFF_SYMBOL_COMMON,
+  /* Undefined symbol.  */
+  COFF_SYMBOL_UNDEFINED,
+  /* Local symbol.  */
+  COFF_SYMBOL_LOCAL,
+  /* PE section symbol.  */
+  COFF_SYMBOL_PE_SECTION
+};
+
+typedef struct
+{
+  void (*_bfd_coff_swap_aux_in)
+    (bfd *, void *, int, int, int, int, void *);
+
+  void (*_bfd_coff_swap_sym_in)
+    (bfd *, void *, void *);
+
+  void (*_bfd_coff_swap_lineno_in)
+    (bfd *, void *, void *);
+
+  unsigned int (*_bfd_coff_swap_aux_out)
+    (bfd *, void *, int, int, int, int, void *);
+
+  unsigned int (*_bfd_coff_swap_sym_out)
+    (bfd *, void *, void *);
+
+  unsigned int (*_bfd_coff_swap_lineno_out)
+    (bfd *, void *, void *);
+
+  unsigned int (*_bfd_coff_swap_reloc_out)
+    (bfd *, void *, void *);
+
+  unsigned int (*_bfd_coff_swap_filehdr_out)
+    (bfd *, void *, void *);
+
+  unsigned int (*_bfd_coff_swap_aouthdr_out)
+    (bfd *, void *, void *);
+
+  unsigned int (*_bfd_coff_swap_scnhdr_out)
+    (bfd *, void *, void *);
+
+  unsigned int _bfd_filhsz;
+  unsigned int _bfd_aoutsz;
+  unsigned int _bfd_scnhsz;
+  unsigned int _bfd_symesz;
+  unsigned int _bfd_auxesz;
+  unsigned int _bfd_relsz;
+  unsigned int _bfd_linesz;
+  unsigned int _bfd_filnmlen;
+  bfd_boolean _bfd_coff_long_filenames;
+
+  bfd_boolean _bfd_coff_long_section_names;
+  bfd_boolean (*_bfd_coff_set_long_section_names)
+    (bfd *, int);
+  
+  unsigned int _bfd_coff_default_section_alignment_power;
+  bfd_boolean _bfd_coff_force_symnames_in_strings;
+  unsigned int _bfd_coff_debug_string_prefix_length;
+
+  void (*_bfd_coff_swap_filehdr_in)
+    (bfd *, void *, void *);
+
+  void (*_bfd_coff_swap_aouthdr_in)
+    (bfd *, void *, void *);
+
+  void (*_bfd_coff_swap_scnhdr_in)
+    (bfd *, void *, void *);
+
+  void (*_bfd_coff_swap_reloc_in)
+    (bfd *abfd, void *, void *);
+
+  bfd_boolean (*_bfd_coff_bad_format_hook)
+    (bfd *, void *);
+
+  bfd_boolean (*_bfd_coff_set_arch_mach_hook)
+    (bfd *, void *);
+
+  void * (*_bfd_coff_mkobject_hook)
+    (bfd *, void *, void *);
+
+  bfd_boolean (*_bfd_styp_to_sec_flags_hook)
+    (bfd *, void *, const char *, asection *, flagword *);
+
+  void (*_bfd_set_alignment_hook)
+    (bfd *, asection *, void *);
+
+  bfd_boolean (*_bfd_coff_slurp_symbol_table)
+    (bfd *);
+
+  bfd_boolean (*_bfd_coff_symname_in_debug)
+    (bfd *, struct internal_syment *);
+
+  bfd_boolean (*_bfd_coff_pointerize_aux_hook)
+    (bfd *, combined_entry_type *, combined_entry_type *,
+            unsigned int, combined_entry_type *);
+
+  bfd_boolean (*_bfd_coff_print_aux)
+    (bfd *, FILE *, combined_entry_type *, combined_entry_type *,
+            combined_entry_type *, unsigned int);
+
+  void (*_bfd_coff_reloc16_extra_cases)
+    (bfd *, struct bfd_link_info *, struct bfd_link_order *, arelent *,
+           bfd_byte *, unsigned int *, unsigned int *);
+
+  int (*_bfd_coff_reloc16_estimate)
+    (bfd *, asection *, arelent *, unsigned int,
+            struct bfd_link_info *);
+
+  enum coff_symbol_classification (*_bfd_coff_classify_symbol)
+    (bfd *, struct internal_syment *);
+
+  bfd_boolean (*_bfd_coff_compute_section_file_positions)
+    (bfd *);
+
+  bfd_boolean (*_bfd_coff_start_final_link)
+    (bfd *, struct bfd_link_info *);
+
+  bfd_boolean (*_bfd_coff_relocate_section)
+    (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+            struct internal_reloc *, struct internal_syment *, asection **);
+
+  reloc_howto_type *(*_bfd_coff_rtype_to_howto)
+    (bfd *, asection *, struct internal_reloc *,
+            struct coff_link_hash_entry *, struct internal_syment *,
+            bfd_vma *);
+
+  bfd_boolean (*_bfd_coff_adjust_symndx)
+    (bfd *, struct bfd_link_info *, bfd *, asection *,
+            struct internal_reloc *, bfd_boolean *);
+
+  bfd_boolean (*_bfd_coff_link_add_one_symbol)
+    (struct bfd_link_info *, bfd *, const char *, flagword,
+            asection *, bfd_vma, const char *, bfd_boolean, bfd_boolean,
+            struct bfd_link_hash_entry **);
+
+  bfd_boolean (*_bfd_coff_link_output_has_begun)
+    (bfd *, struct coff_final_link_info *);
+
+  bfd_boolean (*_bfd_coff_final_link_postscript)
+    (bfd *, struct coff_final_link_info *);
+
+  bfd_boolean (*_bfd_coff_print_pdata)
+    (bfd *, void *);
+
+} bfd_coff_backend_data;
+
+#define coff_backend_info(abfd) \
+  ((bfd_coff_backend_data *) (abfd)->xvec->backend_data)
+
+#define bfd_coff_swap_aux_in(a,e,t,c,ind,num,i) \
+  ((coff_backend_info (a)->_bfd_coff_swap_aux_in) (a,e,t,c,ind,num,i))
+
+#define bfd_coff_swap_sym_in(a,e,i) \
+  ((coff_backend_info (a)->_bfd_coff_swap_sym_in) (a,e,i))
+
+#define bfd_coff_swap_lineno_in(a,e,i) \
+  ((coff_backend_info ( a)->_bfd_coff_swap_lineno_in) (a,e,i))
+
+#define bfd_coff_swap_reloc_out(abfd, i, o) \
+  ((coff_backend_info (abfd)->_bfd_coff_swap_reloc_out) (abfd, i, o))
+
+#define bfd_coff_swap_lineno_out(abfd, i, o) \
+  ((coff_backend_info (abfd)->_bfd_coff_swap_lineno_out) (abfd, i, o))
+
+#define bfd_coff_swap_aux_out(a,i,t,c,ind,num,o) \
+  ((coff_backend_info (a)->_bfd_coff_swap_aux_out) (a,i,t,c,ind,num,o))
+
+#define bfd_coff_swap_sym_out(abfd, i,o) \
+  ((coff_backend_info (abfd)->_bfd_coff_swap_sym_out) (abfd, i, o))
+
+#define bfd_coff_swap_scnhdr_out(abfd, i,o) \
+  ((coff_backend_info (abfd)->_bfd_coff_swap_scnhdr_out) (abfd, i, o))
+
+#define bfd_coff_swap_filehdr_out(abfd, i,o) \
+  ((coff_backend_info (abfd)->_bfd_coff_swap_filehdr_out) (abfd, i, o))
+
+#define bfd_coff_swap_aouthdr_out(abfd, i,o) \
+  ((coff_backend_info (abfd)->_bfd_coff_swap_aouthdr_out) (abfd, i, o))
+
+#define bfd_coff_filhsz(abfd) (coff_backend_info (abfd)->_bfd_filhsz)
+#define bfd_coff_aoutsz(abfd) (coff_backend_info (abfd)->_bfd_aoutsz)
+#define bfd_coff_scnhsz(abfd) (coff_backend_info (abfd)->_bfd_scnhsz)
+#define bfd_coff_symesz(abfd) (coff_backend_info (abfd)->_bfd_symesz)
+#define bfd_coff_auxesz(abfd) (coff_backend_info (abfd)->_bfd_auxesz)
+#define bfd_coff_relsz(abfd)  (coff_backend_info (abfd)->_bfd_relsz)
+#define bfd_coff_linesz(abfd) (coff_backend_info (abfd)->_bfd_linesz)
+#define bfd_coff_filnmlen(abfd) (coff_backend_info (abfd)->_bfd_filnmlen)
+#define bfd_coff_long_filenames(abfd) \
+  (coff_backend_info (abfd)->_bfd_coff_long_filenames)
+#define bfd_coff_long_section_names(abfd) \
+  (coff_backend_info (abfd)->_bfd_coff_long_section_names)
+#define bfd_coff_set_long_section_names(abfd, enable) \
+  ((coff_backend_info (abfd)->_bfd_coff_set_long_section_names) (abfd, enable))
+#define bfd_coff_default_section_alignment_power(abfd) \
+  (coff_backend_info (abfd)->_bfd_coff_default_section_alignment_power)
+#define bfd_coff_swap_filehdr_in(abfd, i,o) \
+  ((coff_backend_info (abfd)->_bfd_coff_swap_filehdr_in) (abfd, i, o))
+
+#define bfd_coff_swap_aouthdr_in(abfd, i,o) \
+  ((coff_backend_info (abfd)->_bfd_coff_swap_aouthdr_in) (abfd, i, o))
+
+#define bfd_coff_swap_scnhdr_in(abfd, i,o) \
+  ((coff_backend_info (abfd)->_bfd_coff_swap_scnhdr_in) (abfd, i, o))
+
+#define bfd_coff_swap_reloc_in(abfd, i, o) \
+  ((coff_backend_info (abfd)->_bfd_coff_swap_reloc_in) (abfd, i, o))
+
+#define bfd_coff_bad_format_hook(abfd, filehdr) \
+  ((coff_backend_info (abfd)->_bfd_coff_bad_format_hook) (abfd, filehdr))
+
+#define bfd_coff_set_arch_mach_hook(abfd, filehdr)\
+  ((coff_backend_info (abfd)->_bfd_coff_set_arch_mach_hook) (abfd, filehdr))
+#define bfd_coff_mkobject_hook(abfd, filehdr, aouthdr)\
+  ((coff_backend_info (abfd)->_bfd_coff_mkobject_hook)\
+   (abfd, filehdr, aouthdr))
+
+#define bfd_coff_styp_to_sec_flags_hook(abfd, scnhdr, name, section, flags_ptr)\
+  ((coff_backend_info (abfd)->_bfd_styp_to_sec_flags_hook)\
+   (abfd, scnhdr, name, section, flags_ptr))
+
+#define bfd_coff_set_alignment_hook(abfd, sec, scnhdr)\
+  ((coff_backend_info (abfd)->_bfd_set_alignment_hook) (abfd, sec, scnhdr))
+
+#define bfd_coff_slurp_symbol_table(abfd)\
+  ((coff_backend_info (abfd)->_bfd_coff_slurp_symbol_table) (abfd))
+
+#define bfd_coff_symname_in_debug(abfd, sym)\
+  ((coff_backend_info (abfd)->_bfd_coff_symname_in_debug) (abfd, sym))
+
+#define bfd_coff_force_symnames_in_strings(abfd)\
+  (coff_backend_info (abfd)->_bfd_coff_force_symnames_in_strings)
+
+#define bfd_coff_debug_string_prefix_length(abfd)\
+  (coff_backend_info (abfd)->_bfd_coff_debug_string_prefix_length)
+
+#define bfd_coff_print_aux(abfd, file, base, symbol, aux, indaux)\
+  ((coff_backend_info (abfd)->_bfd_coff_print_aux)\
+   (abfd, file, base, symbol, aux, indaux))
+
+#define bfd_coff_reloc16_extra_cases(abfd, link_info, link_order,\
+                                     reloc, data, src_ptr, dst_ptr)\
+  ((coff_backend_info (abfd)->_bfd_coff_reloc16_extra_cases)\
+   (abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr))
+
+#define bfd_coff_reloc16_estimate(abfd, section, reloc, shrink, link_info)\
+  ((coff_backend_info (abfd)->_bfd_coff_reloc16_estimate)\
+   (abfd, section, reloc, shrink, link_info))
+
+#define bfd_coff_classify_symbol(abfd, sym)\
+  ((coff_backend_info (abfd)->_bfd_coff_classify_symbol)\
+   (abfd, sym))
+
+#define bfd_coff_compute_section_file_positions(abfd)\
+  ((coff_backend_info (abfd)->_bfd_coff_compute_section_file_positions)\
+   (abfd))
+
+#define bfd_coff_start_final_link(obfd, info)\
+  ((coff_backend_info (obfd)->_bfd_coff_start_final_link)\
+   (obfd, info))
+#define bfd_coff_relocate_section(obfd,info,ibfd,o,con,rel,isyms,secs)\
+  ((coff_backend_info (ibfd)->_bfd_coff_relocate_section)\
+   (obfd, info, ibfd, o, con, rel, isyms, secs))
+#define bfd_coff_rtype_to_howto(abfd, sec, rel, h, sym, addendp)\
+  ((coff_backend_info (abfd)->_bfd_coff_rtype_to_howto)\
+   (abfd, sec, rel, h, sym, addendp))
+#define bfd_coff_adjust_symndx(obfd, info, ibfd, sec, rel, adjustedp)\
+  ((coff_backend_info (abfd)->_bfd_coff_adjust_symndx)\
+   (obfd, info, ibfd, sec, rel, adjustedp))
+#define bfd_coff_link_add_one_symbol(info, abfd, name, flags, section,\
+                                     value, string, cp, coll, hashp)\
+  ((coff_backend_info (abfd)->_bfd_coff_link_add_one_symbol)\
+   (info, abfd, name, flags, section, value, string, cp, coll, hashp))
+
+#define bfd_coff_link_output_has_begun(a,p) \
+  ((coff_backend_info (a)->_bfd_coff_link_output_has_begun) (a, p))
+#define bfd_coff_final_link_postscript(a,p) \
+  ((coff_backend_info (a)->_bfd_coff_final_link_postscript) (a, p))
+
+#define bfd_coff_have_print_pdata(a) \
+  (coff_backend_info (a)->_bfd_coff_print_pdata)
+#define bfd_coff_print_pdata(a,p) \
+  ((coff_backend_info (a)->_bfd_coff_print_pdata) (a, p))
+
+/* Macro: Returns true if the bfd is a PE executable as opposed to a
+   PE object file.  */
+#define bfd_pei_p(abfd) \
+  (CONST_STRNEQ ((abfd)->xvec->name, "pei-"))
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libecoff.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libecoff.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libecoff.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libecoff.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,348 @@
+/* BFD ECOFF object file private structure.
+   Copyright 1993, 1994, 1995, 1996, 1999, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007, 2008, 2009, 2010
+   Free Software Foundation, Inc.
+   Written by Ian Lance Taylor, Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "bfdlink.h"
+
+#ifndef ECOFF_H
+#include "coff/ecoff.h"
+#endif
+
+/* This is the backend information kept for ECOFF files.  This
+   structure is constant for a particular backend.  The first element
+   is the COFF backend data structure, so that ECOFF targets can use
+   the generic COFF code.  */
+
+#define ecoff_backend(abfd) \
+  ((struct ecoff_backend_data *) (abfd)->xvec->backend_data)
+
+struct ecoff_backend_data
+{
+  /* COFF backend information.  This must be the first field.  */
+  bfd_coff_backend_data coff;
+  /* Supported architecture.  */
+  enum bfd_architecture arch;
+  /* Initial portion of armap string.  */
+  const char *armap_start;
+  /* The page boundary used to align sections in a demand-paged
+     executable file.  E.g., 0x1000.  */
+  bfd_vma round;
+  /* TRUE if the .rdata section is part of the text segment, as on the
+     Alpha.  FALSE if .rdata is part of the data segment, as on the
+     MIPS.  */
+  bfd_boolean rdata_in_text;
+  /* Bitsize of constructor entries.  */
+  unsigned int constructor_bitsize;
+  /* Reloc to use for constructor entries.  */
+  reloc_howto_type *constructor_reloc;
+  /* How to swap debugging information.  */
+  struct ecoff_debug_swap debug_swap;
+  /* External reloc size.  */
+  bfd_size_type external_reloc_size;
+  /* Reloc swapping functions.  */
+  void (*swap_reloc_in) (bfd *, void *, struct internal_reloc *);
+  void (*swap_reloc_out) (bfd *, const struct internal_reloc *, void *);
+  /* Backend reloc tweaking.  */
+  void (*adjust_reloc_in)
+    (bfd *, const struct internal_reloc *, arelent *);
+  void (*adjust_reloc_out)
+    (bfd *, const arelent *, struct internal_reloc *);
+  /* Relocate section contents while linking.  */
+  bfd_boolean (*relocate_section)
+    (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, void *);
+  /* Do final adjustments to filehdr and aouthdr.  */
+  bfd_boolean (*adjust_headers)
+    (bfd *, struct internal_filehdr *, struct internal_aouthdr *);
+  /* Read an element from an archive at a given file position.  This
+     is needed because OSF/1 3.2 uses a weird archive format.  */
+  bfd *(*get_elt_at_filepos) (bfd *, file_ptr);
+};
+
+/* ECOFF targets don't support COFF long section names, so this
+  macro is provided to use as an initialiser for the related
+  members of the embedded bfd_coff_backend_data struct.  */
+#define ECOFF_NO_LONG_SECTION_NAMES (FALSE), _bfd_ecoff_no_long_sections
+
+/* This is the target specific information kept for ECOFF files.  */
+
+#define ecoff_data(abfd) ((abfd)->tdata.ecoff_obj_data)
+
+typedef struct ecoff_tdata
+{
+  /* The reloc file position, set by
+     ecoff_compute_section_file_positions.  */
+  file_ptr reloc_filepos;
+
+  /* The symbol table file position, set by _bfd_ecoff_mkobject_hook.  */
+  file_ptr sym_filepos;
+
+  /* The start and end of the text segment.  Only valid for an
+     existing file, not for one we are creating.  */
+  unsigned long text_start;
+  unsigned long text_end;
+
+  /* The cached gp value.  This is used when relocating.  */
+  bfd_vma gp;
+
+  /* The maximum size of objects to optimize using gp.  This is
+     typically set by the -G option to the compiler, assembler or
+     linker.  */
+  unsigned int gp_size;
+
+  /* The register masks.  When linking, all the masks found in the
+     input files are combined into the masks of the output file.
+     These are not all used for all targets, but that's OK, because
+     the relevant ones are the only ones swapped in and out.  */
+  unsigned long gprmask;
+  unsigned long fprmask;
+  unsigned long cprmask[4];
+
+  /* The ECOFF symbolic debugging information.  */
+  struct ecoff_debug_info debug_info;
+
+  /* The unswapped ECOFF symbolic information.  */
+  void * raw_syments;
+
+  /* The canonical BFD symbols.  */
+  struct ecoff_symbol_struct *canonical_symbols;
+
+  /* A mapping from external symbol numbers to entries in the linker
+     hash table, used when linking.  */
+  struct ecoff_link_hash_entry **sym_hashes;
+
+  /* A mapping from reloc symbol indices to sections, used when
+     linking.  */
+  asection **symndx_to_section;
+
+  /* TRUE if this BFD was written by the backend linker.  */
+  bfd_boolean linker;
+
+  /* TRUE if a warning that multiple global pointer values are
+     needed in the output binary was issued already.  */
+  bfd_boolean issued_multiple_gp_warning;
+
+  /* Used by find_nearest_line entry point.  The structure could be
+     included directly in this one, but there's no point to wasting
+     the memory just for the infrequently called find_nearest_line.  */
+  struct ecoff_find_line *find_line_info;
+
+  /* Whether the .rdata section is in the text segment for this
+     particular ECOFF file.  This is not valid until
+     ecoff_compute_section_file_positions is called.  */
+  bfd_boolean rdata_in_text;
+
+} ecoff_data_type;
+
+/* Each canonical asymbol really looks like this.  */
+
+typedef struct ecoff_symbol_struct
+{
+  /* The actual symbol which the rest of BFD works with */
+  asymbol symbol;
+
+  /* The fdr for this symbol.  */
+  FDR *fdr;
+
+  /* TRUE if this is a local symbol rather than an external one.  */
+  bfd_boolean local;
+
+  /* A pointer to the unswapped hidden information for this symbol.
+     This is either a struct sym_ext or a struct ext_ext, depending on
+     the value of the local field above.  */
+  void * native;
+} ecoff_symbol_type;
+
+/* We take the address of the first element of an asymbol to ensure that the
+   macro is only ever applied to an asymbol.  */
+#define ecoffsymbol(asymbol) ((ecoff_symbol_type *) (&((asymbol)->the_bfd)))
+
+/* We need to save the index of an external symbol when we write it
+   out so that can set the symbol index correctly when we write out
+   the relocs.  */
+#define ecoff_get_sym_index(symbol) ((symbol)->udata.i)
+#define ecoff_set_sym_index(symbol, idx) ((symbol)->udata.i = (idx))
+
+/* A pointer to this structure is put in the used_by_bfd pointer of
+   a section to keep track of any per-section data.
+   The user_by_bfd pointer will be NULL if the information was not
+   needed.  */
+
+struct ecoff_section_tdata
+{
+  /* When producing an executable (i.e., final, non-relocatable link)
+     on the Alpha, we may need to use multiple global pointer values
+     to span the entire .lita section.  In essence, we allow each
+     input .lita section to have its own gp value.  To support this,
+     we need to keep track of the gp values that we picked for each
+     input .lita section . */
+  bfd_vma gp;
+};
+
+/* An accessor macro for the ecoff_section_tdata structure.  */
+#define ecoff_section_data(abfd, sec) \
+  ((struct ecoff_section_tdata *) (sec)->used_by_bfd)
+
+/* ECOFF linker hash table entries.  */
+
+struct ecoff_link_hash_entry
+{
+  struct bfd_link_hash_entry root;
+  /* Symbol index in output file.  */
+  long indx;
+  /* BFD that ext field value came from.  */
+  bfd *abfd;
+  /* ECOFF external symbol information.  */
+  EXTR esym;
+  /* Nonzero if this symbol has been written out.  */
+  char written;
+  /* Nonzero if this symbol was referred to as small undefined.  */
+  char small;
+};
+
+/* ECOFF linker hash table.  */
+
+struct ecoff_link_hash_table
+{
+  struct bfd_link_hash_table root;
+};
+
+/* Make an ECOFF object.  */
+extern bfd_boolean _bfd_ecoff_mkobject (bfd *);
+
+/* Read in the ECOFF symbolic debugging information.  */
+extern bfd_boolean _bfd_ecoff_slurp_symbolic_info
+  (bfd *, asection *, struct ecoff_debug_info *);
+
+/* Generic ECOFF BFD backend vectors.  */
+
+extern bfd_boolean _bfd_ecoff_write_object_contents (bfd *);
+
+#define	_bfd_ecoff_close_and_cleanup _bfd_generic_close_and_cleanup
+#define _bfd_ecoff_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
+extern bfd_boolean _bfd_ecoff_new_section_hook
+  (bfd *, asection *);
+extern bfd_boolean _bfd_ecoff_get_section_contents
+  (bfd *, asection *, void * location, file_ptr, bfd_size_type);
+
+#define _bfd_ecoff_bfd_link_split_section _bfd_generic_link_split_section
+
+extern bfd_boolean _bfd_ecoff_bfd_copy_private_bfd_data
+  (bfd *, bfd *);
+#define _bfd_ecoff_bfd_copy_private_section_data \
+  _bfd_generic_bfd_copy_private_section_data
+
+#define _bfd_ecoff_bfd_copy_private_symbol_data \
+  _bfd_generic_bfd_copy_private_symbol_data
+
+#define _bfd_ecoff_bfd_copy_private_header_data \
+  _bfd_generic_bfd_copy_private_header_data
+
+#define _bfd_ecoff_bfd_print_private_bfd_data \
+  _bfd_generic_bfd_print_private_bfd_data
+
+#define _bfd_ecoff_bfd_merge_private_bfd_data \
+  _bfd_generic_bfd_merge_private_bfd_data
+
+#define _bfd_ecoff_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
+extern bfd_boolean _bfd_ecoff_slurp_armap (bfd *);
+#define _bfd_ecoff_slurp_extended_name_table _bfd_slurp_extended_name_table
+#define _bfd_ecoff_construct_extended_name_table \
+  _bfd_archive_bsd_construct_extended_name_table
+#define _bfd_ecoff_truncate_arname bfd_dont_truncate_arname
+extern bfd_boolean _bfd_ecoff_write_armap
+  (bfd *, unsigned int, struct orl *, unsigned int, int);
+#define _bfd_ecoff_read_ar_hdr _bfd_generic_read_ar_hdr
+#define _bfd_ecoff_write_ar_hdr _bfd_generic_write_ar_hdr
+#define _bfd_ecoff_openr_next_archived_file \
+  bfd_generic_openr_next_archived_file
+#define _bfd_ecoff_get_elt_at_index _bfd_generic_get_elt_at_index
+#define _bfd_ecoff_generic_stat_arch_elt bfd_generic_stat_arch_elt
+#define _bfd_ecoff_update_armap_timestamp bfd_true
+#define _bfd_ecoff_bfd_is_target_special_symbol  \
+  ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+
+extern long _bfd_ecoff_get_symtab_upper_bound (bfd *);
+extern long _bfd_ecoff_canonicalize_symtab (bfd *, asymbol **);
+extern asymbol *_bfd_ecoff_make_empty_symbol (bfd *);
+extern void _bfd_ecoff_print_symbol
+  (bfd *, void *, asymbol *, bfd_print_symbol_type);
+extern void _bfd_ecoff_get_symbol_info
+  (bfd *, asymbol *, symbol_info *);
+extern bfd_boolean _bfd_ecoff_bfd_is_local_label_name
+  (bfd *, const char *);
+#define _bfd_ecoff_get_lineno _bfd_nosymbols_get_lineno
+extern bfd_boolean _bfd_ecoff_find_nearest_line
+  (bfd *, asection *, asymbol **, bfd_vma, const char **, const char **,
+   unsigned int *);
+#define _bfd_ecoff_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
+#define _bfd_ecoff_read_minisymbols _bfd_generic_read_minisymbols
+#define _bfd_ecoff_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
+#define _bfd_ecoff_find_inliner_info _bfd_nosymbols_find_inliner_info
+
+#define _bfd_ecoff_get_reloc_upper_bound coff_get_reloc_upper_bound
+extern long _bfd_ecoff_canonicalize_reloc
+  (bfd *, asection *, arelent **, asymbol **symbols);
+/* ecoff_bfd_reloc_type_lookup defined by backend. */
+
+extern bfd_boolean _bfd_ecoff_set_arch_mach
+  (bfd *, enum bfd_architecture, unsigned long);
+extern bfd_boolean _bfd_ecoff_set_section_contents
+  (bfd *, asection *, const void * location, file_ptr, bfd_size_type);
+
+extern int _bfd_ecoff_sizeof_headers (bfd *, struct bfd_link_info *);
+/* ecoff_bfd_get_relocated_section_contents defined by backend.  */
+/* ecoff_bfd_relax_section defined by backend.  */
+extern struct bfd_link_hash_table *_bfd_ecoff_bfd_link_hash_table_create
+  (bfd *);
+#define _bfd_ecoff_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
+extern bfd_boolean _bfd_ecoff_bfd_link_add_symbols
+  (bfd *, struct bfd_link_info *);
+#define _bfd_ecoff_bfd_link_just_syms _bfd_generic_link_just_syms
+#define _bfd_ecoff_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+extern bfd_boolean _bfd_ecoff_bfd_final_link
+  (bfd *, struct bfd_link_info *);
+
+/* Hook functions for the generic COFF section reading code.  */
+
+extern void * _bfd_ecoff_mkobject_hook (bfd *, void *, void *);
+#define _bfd_ecoff_set_alignment_hook \
+  ((void (*) (bfd *, asection *, void *)) bfd_void)
+extern bfd_boolean _bfd_ecoff_set_arch_mach_hook
+  (bfd *, void *);
+extern bfd_boolean _bfd_ecoff_no_long_sections
+  (bfd *abfd, int enable);
+extern bfd_boolean _bfd_ecoff_styp_to_sec_flags
+  (bfd *, void *, const char *, asection *, flagword *);
+extern bfd_boolean _bfd_ecoff_slurp_symbol_table (bfd *);
+
+/* ECOFF auxiliary information swapping routines.  These are the same
+   for all ECOFF targets, so they are defined in ecofflink.c.  */
+
+extern void _bfd_ecoff_swap_tir_in
+  (int, const struct tir_ext *, TIR *);
+extern void _bfd_ecoff_swap_tir_out
+  (int, const TIR *, struct tir_ext *);
+extern void _bfd_ecoff_swap_rndx_in
+  (int, const struct rndx_ext *, RNDXR *);
+extern void _bfd_ecoff_swap_rndx_out
+  (int, const RNDXR *, struct rndx_ext *);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libhppa.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libhppa.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libhppa.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libhppa.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,595 @@
+/* HP PA-RISC SOM object file format:  definitions internal to BFD.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
+   2003, 2005, 2007  Free Software Foundation, Inc.
+
+   Contributed by the Center for Software Science at the
+   University of Utah (pa-gdb-bugs@cs.utah.edu).
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _LIBHPPA_H
+#define _LIBHPPA_H
+
+#define BYTES_IN_WORD 4
+#define PA_PAGESIZE 0x1000
+
+/* The PA instruction set variants.  */
+enum pa_arch {pa10 = 10, pa11 = 11, pa20 = 20, pa20w = 25};
+
+/* HP PA-RISC relocation types */
+
+enum hppa_reloc_field_selector_type
+  {
+    R_HPPA_FSEL = 0x0,
+    R_HPPA_LSSEL = 0x1,
+    R_HPPA_RSSEL = 0x2,
+    R_HPPA_LSEL = 0x3,
+    R_HPPA_RSEL = 0x4,
+    R_HPPA_LDSEL = 0x5,
+    R_HPPA_RDSEL = 0x6,
+    R_HPPA_LRSEL = 0x7,
+    R_HPPA_RRSEL = 0x8,
+    R_HPPA_NSEL  = 0x9,
+    R_HPPA_NLSEL  = 0xa,
+    R_HPPA_NLRSEL  = 0xb,
+    R_HPPA_PSEL = 0xc,
+    R_HPPA_LPSEL = 0xd,
+    R_HPPA_RPSEL = 0xe,
+    R_HPPA_TSEL = 0xf,
+    R_HPPA_LTSEL = 0x10,
+    R_HPPA_RTSEL = 0x11,
+    R_HPPA_LTPSEL = 0x12,
+    R_HPPA_RTPSEL = 0x13
+  };
+
+/* /usr/include/reloc.h defines these to constants.  We want to use
+   them in enums, so #undef them before we start using them.  We might
+   be able to fix this another way by simply managing not to include
+   /usr/include/reloc.h, but currently GDB picks up these defines
+   somewhere.  */
+#undef e_fsel
+#undef e_lssel
+#undef e_rssel
+#undef e_lsel
+#undef e_rsel
+#undef e_ldsel
+#undef e_rdsel
+#undef e_lrsel
+#undef e_rrsel
+#undef e_nsel
+#undef e_nlsel
+#undef e_nlrsel
+#undef e_psel
+#undef e_lpsel
+#undef e_rpsel
+#undef e_tsel
+#undef e_ltsel
+#undef e_rtsel
+#undef e_one
+#undef e_two
+#undef e_pcrel
+#undef e_con
+#undef e_plabel
+#undef e_abs
+
+/* for compatibility */
+enum hppa_reloc_field_selector_type_alt
+  {
+    e_fsel = R_HPPA_FSEL,
+    e_lssel = R_HPPA_LSSEL,
+    e_rssel = R_HPPA_RSSEL,
+    e_lsel = R_HPPA_LSEL,
+    e_rsel = R_HPPA_RSEL,
+    e_ldsel = R_HPPA_LDSEL,
+    e_rdsel = R_HPPA_RDSEL,
+    e_lrsel = R_HPPA_LRSEL,
+    e_rrsel = R_HPPA_RRSEL,
+    e_nsel = R_HPPA_NSEL,
+    e_nlsel = R_HPPA_NLSEL,
+    e_nlrsel = R_HPPA_NLRSEL,
+    e_psel = R_HPPA_PSEL,
+    e_lpsel = R_HPPA_LPSEL,
+    e_rpsel = R_HPPA_RPSEL,
+    e_tsel = R_HPPA_TSEL,
+    e_ltsel = R_HPPA_LTSEL,
+    e_rtsel = R_HPPA_RTSEL,
+    e_ltpsel = R_HPPA_LTPSEL,
+    e_rtpsel = R_HPPA_RTPSEL
+  };
+
+enum hppa_reloc_expr_type
+  {
+    R_HPPA_E_ONE = 0,
+    R_HPPA_E_TWO = 1,
+    R_HPPA_E_PCREL = 2,
+    R_HPPA_E_CON = 3,
+    R_HPPA_E_PLABEL = 7,
+    R_HPPA_E_ABS = 18
+  };
+
+/* for compatibility */
+enum hppa_reloc_expr_type_alt
+  {
+    e_one = R_HPPA_E_ONE,
+    e_two = R_HPPA_E_TWO,
+    e_pcrel = R_HPPA_E_PCREL,
+    e_con = R_HPPA_E_CON,
+    e_plabel = R_HPPA_E_PLABEL,
+    e_abs = R_HPPA_E_ABS
+  };
+
+
+/* Relocations for function calls must be accompanied by parameter
+   relocation bits.  These bits describe exactly where the caller has
+   placed the function's arguments and where it expects to find a return
+   value.
+
+   Both ELF and SOM encode this information within the addend field
+   of the call relocation.  (Note this could break very badly if one
+   was to make a call like bl foo + 0x12345678).
+
+   The high order 10 bits contain parameter relocation information,
+   the low order 22 bits contain the constant offset.  */
+
+#define HPPA_R_ARG_RELOC(a)	\
+  (((a) >> 22) & 0x3ff)
+#define HPPA_R_CONSTANT(a)	\
+  ((((bfd_signed_vma)(a)) << (BFD_ARCH_SIZE-22)) >> (BFD_ARCH_SIZE-22))
+#define HPPA_R_ADDEND(r, c)	\
+  (((r) << 22) + ((c) & 0x3fffff))
+
+
+/* Some functions to manipulate PA instructions.  */
+
+/* Declare the functions with the unused attribute to avoid warnings.  */
+static inline int sign_extend (int, int) ATTRIBUTE_UNUSED;
+static inline int low_sign_extend (int, int) ATTRIBUTE_UNUSED;
+static inline int sign_unext (int, int) ATTRIBUTE_UNUSED;
+static inline int low_sign_unext (int, int) ATTRIBUTE_UNUSED;
+static inline int re_assemble_3 (int) ATTRIBUTE_UNUSED;
+static inline int re_assemble_12 (int) ATTRIBUTE_UNUSED;
+static inline int re_assemble_14 (int) ATTRIBUTE_UNUSED;
+static inline int re_assemble_16 (int) ATTRIBUTE_UNUSED;
+static inline int re_assemble_17 (int) ATTRIBUTE_UNUSED;
+static inline int re_assemble_21 (int) ATTRIBUTE_UNUSED;
+static inline int re_assemble_22 (int) ATTRIBUTE_UNUSED;
+static inline bfd_signed_vma hppa_field_adjust
+  (bfd_vma, bfd_signed_vma, enum hppa_reloc_field_selector_type_alt)
+  ATTRIBUTE_UNUSED;
+static inline int bfd_hppa_insn2fmt (bfd *, int) ATTRIBUTE_UNUSED;
+static inline int hppa_rebuild_insn (int, int, int) ATTRIBUTE_UNUSED;
+
+
+/* The *sign_extend functions are used to assemble various bitfields
+   taken from an instruction and return the resulting immediate
+   value.  */
+
+static inline int
+sign_extend (int x, int len)
+{
+  int signbit = (1 << (len - 1));
+  int mask = (signbit << 1) - 1;
+  return ((x & mask) ^ signbit) - signbit;
+}
+
+static inline int
+low_sign_extend (int x, int len)
+{
+  return (x >> 1) - ((x & 1) << (len - 1));
+}
+
+
+/* The re_assemble_* functions prepare an immediate value for
+   insertion into an opcode. pa-risc uses all sorts of weird bitfields
+   in the instruction to hold the value.  */
+
+static inline int
+sign_unext (int x, int len)
+{
+  int len_ones;
+
+  len_ones = (1 << len) - 1;
+
+  return x & len_ones;
+}
+
+static inline int
+low_sign_unext (int x, int len)
+{
+  int temp;
+  int sign;
+
+  sign = (x >> (len-1)) & 1;
+
+  temp = sign_unext (x, len-1);
+
+  return (temp << 1) | sign;
+}
+
+static inline int
+re_assemble_3 (int as3)
+{
+  return ((  (as3 & 4) << (13-2))
+	  | ((as3 & 3) << (13+1)));
+}
+
+static inline int
+re_assemble_12 (int as12)
+{
+  return ((  (as12 & 0x800) >> 11)
+	  | ((as12 & 0x400) >> (10 - 2))
+	  | ((as12 & 0x3ff) << (1 + 2)));
+}
+
+static inline int
+re_assemble_14 (int as14)
+{
+  return ((  (as14 & 0x1fff) << 1)
+	  | ((as14 & 0x2000) >> 13));
+}
+
+static inline int
+re_assemble_16 (int as16)
+{
+  int s, t;
+
+  /* Unusual 16-bit encoding, for wide mode only.  */
+  t = (as16 << 1) & 0xffff;
+  s = (as16 & 0x8000);
+  return (t ^ s ^ (s >> 1)) | (s >> 15);
+}
+
+static inline int
+re_assemble_17 (int as17)
+{
+  return ((  (as17 & 0x10000) >> 16)
+	  | ((as17 & 0x0f800) << (16 - 11))
+	  | ((as17 & 0x00400) >> (10 - 2))
+	  | ((as17 & 0x003ff) << (1 + 2)));
+}
+
+static inline int
+re_assemble_21 (int as21)
+{
+  return ((  (as21 & 0x100000) >> 20)
+	  | ((as21 & 0x0ffe00) >> 8)
+	  | ((as21 & 0x000180) << 7)
+	  | ((as21 & 0x00007c) << 14)
+	  | ((as21 & 0x000003) << 12));
+}
+
+static inline int
+re_assemble_22 (int as22)
+{
+  return ((  (as22 & 0x200000) >> 21)
+	  | ((as22 & 0x1f0000) << (21 - 16))
+	  | ((as22 & 0x00f800) << (16 - 11))
+	  | ((as22 & 0x000400) >> (10 - 2))
+	  | ((as22 & 0x0003ff) << (1 + 2)));
+}
+
+
+/* Handle field selectors for PA instructions.
+   The L and R (and LS, RS etc.) selectors are used in pairs to form a
+   full 32 bit address.  eg.
+
+   LDIL	L'start,%r1		; put left part into r1
+   LDW	R'start(%r1),%r2	; add r1 and right part to form address
+
+   This function returns sign extended values in all cases.
+*/
+
+static inline bfd_signed_vma
+hppa_field_adjust (bfd_vma sym_val,
+		   bfd_signed_vma addend,
+		   enum hppa_reloc_field_selector_type_alt r_field)
+{
+  bfd_signed_vma value;
+
+  value = sym_val + addend;
+  switch (r_field)
+    {
+    case e_fsel:
+      /* F: No change.  */
+      break;
+
+    case e_nsel:
+      /* N: null selector.  I don't really understand what this is all
+	 about, but HP's documentation says "this indicates that zero
+	 bits are to be used for the displacement on the instruction.
+	 This fixup is used to identify three-instruction sequences to
+	 access data (for importing shared library data)."  */
+      value = 0;
+      break;
+
+    case e_lsel:
+    case e_nlsel:
+      /* L:  Select top 21 bits.  */
+      value = value >> 11;
+      break;
+
+    case e_rsel:
+      /* R:  Select bottom 11 bits.  */
+      value = value & 0x7ff;
+      break;
+
+    case e_lssel:
+      /* LS:  Round to nearest multiple of 2048 then select top 21 bits.  */
+      value = value + 0x400;
+      value = value >> 11;
+      break;
+
+    case e_rssel:
+      /* RS:  Select bottom 11 bits for LS.
+	 We need to return a value such that 2048 * LS'x + RS'x == x.
+	 ie. RS'x = x - ((x + 0x400) & -0x800)
+	 this is just a sign extension from bit 21.  */
+      value = ((value & 0x7ff) ^ 0x400) - 0x400;
+      break;
+
+    case e_ldsel:
+      /* LD:  Round to next multiple of 2048 then select top 21 bits.
+	 Yes, if we are already on a multiple of 2048, we go up to the
+	 next one.  RD in this case will be -2048.  */
+      value = value + 0x800;
+      value = value >> 11;
+      break;
+
+    case e_rdsel:
+      /* RD:  Set bits 0-20 to one.  */
+      value = value | -0x800;
+      break;
+
+    case e_lrsel:
+    case e_nlrsel:
+      /* LR:  L with rounding of the addend to nearest 8k.  */
+      value = sym_val + ((addend + 0x1000) & -0x2000);
+      value = value >> 11;
+      break;
+
+    case e_rrsel:
+      /* RR:  R with rounding of the addend to nearest 8k.
+	 We need to return a value such that 2048 * LR'x + RR'x == x
+	 ie. RR'x = s+a - (s + (((a + 0x1000) & -0x2000) & -0x800))
+	 .	  = s+a - ((s & -0x800) + ((a + 0x1000) & -0x2000))
+	 .	  = (s & 0x7ff) + a - ((a + 0x1000) & -0x2000)  */
+      value = (sym_val & 0x7ff) + (((addend & 0x1fff) ^ 0x1000) - 0x1000);
+      break;
+
+    default:
+      abort ();
+    }
+  return value;
+}
+
+/* PA-RISC OPCODES */
+#define get_opcode(insn)	(((insn) >> 26) & 0x3f)
+
+enum hppa_opcode_type
+{
+  /* None of the opcodes in the first group generate relocs, so we
+     aren't too concerned about them.  */
+  OP_SYSOP   = 0x00,
+  OP_MEMMNG  = 0x01,
+  OP_ALU     = 0x02,
+  OP_NDXMEM  = 0x03,
+  OP_SPOP    = 0x04,
+  OP_DIAG    = 0x05,
+  OP_FMPYADD = 0x06,
+  OP_UNDEF07 = 0x07,
+  OP_COPRW   = 0x09,
+  OP_COPRDW  = 0x0b,
+  OP_COPR    = 0x0c,
+  OP_FLOAT   = 0x0e,
+  OP_PRDSPEC = 0x0f,
+  OP_UNDEF15 = 0x15,
+  OP_UNDEF1d = 0x1d,
+  OP_FMPYSUB = 0x26,
+  OP_FPFUSED = 0x2e,
+  OP_SHEXDP0 = 0x34,
+  OP_SHEXDP1 = 0x35,
+  OP_SHEXDP2 = 0x36,
+  OP_UNDEF37 = 0x37,
+  OP_SHEXDP3 = 0x3c,
+  OP_SHEXDP4 = 0x3d,
+  OP_MULTMED = 0x3e,
+  OP_UNDEF3f = 0x3f,
+
+  OP_LDIL    = 0x08,
+  OP_ADDIL   = 0x0a,
+
+  OP_LDO     = 0x0d,
+  OP_LDB     = 0x10,
+  OP_LDH     = 0x11,
+  OP_LDW     = 0x12,
+  OP_LDWM    = 0x13,
+  OP_STB     = 0x18,
+  OP_STH     = 0x19,
+  OP_STW     = 0x1a,
+  OP_STWM    = 0x1b,
+
+  OP_LDD     = 0x14,
+  OP_STD     = 0x1c,
+
+  OP_FLDW    = 0x16,
+  OP_LDWL    = 0x17,
+  OP_FSTW    = 0x1e,
+  OP_STWL    = 0x1f,
+
+  OP_COMBT   = 0x20,
+  OP_COMIBT  = 0x21,
+  OP_COMBF   = 0x22,
+  OP_COMIBF  = 0x23,
+  OP_CMPBDT  = 0x27,
+  OP_ADDBT   = 0x28,
+  OP_ADDIBT  = 0x29,
+  OP_ADDBF   = 0x2a,
+  OP_ADDIBF  = 0x2b,
+  OP_CMPBDF  = 0x2f,
+  OP_BVB     = 0x30,
+  OP_BB      = 0x31,
+  OP_MOVB    = 0x32,
+  OP_MOVIB   = 0x33,
+  OP_CMPIBD  = 0x3b,
+
+  OP_COMICLR = 0x24,
+  OP_SUBI    = 0x25,
+  OP_ADDIT   = 0x2c,
+  OP_ADDI    = 0x2d,
+
+  OP_BE      = 0x38,
+  OP_BLE     = 0x39,
+  OP_BL      = 0x3a
+};
+
+
+/* Given a machine instruction, return its format.  */
+
+static inline int
+bfd_hppa_insn2fmt (bfd *abfd, int insn)
+{
+  enum hppa_opcode_type op = get_opcode (insn);
+
+  switch (op)
+    {
+    case OP_COMICLR:
+    case OP_SUBI:
+    case OP_ADDIT:
+    case OP_ADDI:
+      return 11;
+
+    case OP_COMBT:
+    case OP_COMIBT:
+    case OP_COMBF:
+    case OP_COMIBF:
+    case OP_CMPBDT:
+    case OP_ADDBT:
+    case OP_ADDIBT:
+    case OP_ADDBF:
+    case OP_ADDIBF:
+    case OP_CMPBDF:
+    case OP_BVB:
+    case OP_BB:
+    case OP_MOVB:
+    case OP_MOVIB:
+    case OP_CMPIBD:
+      return 12;
+
+    case OP_LDO:
+    case OP_LDB:
+    case OP_LDH:
+    case OP_LDW:
+    case OP_LDWM:
+    case OP_STB:
+    case OP_STH:
+    case OP_STW:
+    case OP_STWM:
+      if (abfd->arch_info->mach >= 25)
+	return 16;	/* Wide mode, format 16.  */
+      return 14;
+
+    case OP_FLDW:
+    case OP_LDWL:
+    case OP_FSTW:
+    case OP_STWL:
+      /* This is a hack.  Unfortunately, format 11 is already taken
+	 and we're using integers rather than an enum, so it's hard
+	 to describe the 11a format.  */
+      if (abfd->arch_info->mach >= 25)
+	return -16;	/* Wide mode, format 16a.  */
+      return -11;
+
+    case OP_LDD:
+    case OP_STD:
+      if (abfd->arch_info->mach >= 25)
+	return -10;	/* Wide mode, format 10a.  */
+      return 10;
+
+    case OP_BL:
+      if ((insn & 0x8000) != 0)
+	return 22;
+      /* fall thru */
+    case OP_BE:
+    case OP_BLE:
+      return 17;
+
+    case OP_LDIL:
+    case OP_ADDIL:
+      return 21;
+
+    default:
+      break;
+    }
+  return 32;
+}
+
+
+/* Insert VALUE into INSN using R_FORMAT to determine exactly what
+   bits to change.  */
+
+static inline int
+hppa_rebuild_insn (int insn, int value, int r_format)
+{
+  switch (r_format)
+    {
+    case 11:
+      return (insn & ~ 0x7ff) | low_sign_unext (value, 11);
+
+    case 12:
+      return (insn & ~ 0x1ffd) | re_assemble_12 (value);
+
+
+    case 10:
+      return (insn & ~ 0x3ff1) | re_assemble_14 (value & -8);
+
+    case -11:
+      return (insn & ~ 0x3ff9) | re_assemble_14 (value & -4);
+
+    case 14:
+      return (insn & ~ 0x3fff) | re_assemble_14 (value);
+
+
+    case -10:
+      return (insn & ~ 0xfff1) | re_assemble_16 (value & -8);
+
+    case -16:
+      return (insn & ~ 0xfff9) | re_assemble_16 (value & -4);
+
+    case 16:
+      return (insn & ~ 0xffff) | re_assemble_16 (value);
+
+
+    case 17:
+      return (insn & ~ 0x1f1ffd) | re_assemble_17 (value);
+
+    case 21:
+      return (insn & ~ 0x1fffff) | re_assemble_21 (value);
+
+    case 22:
+      return (insn & ~ 0x3ff1ffd) | re_assemble_22 (value);
+
+    case 32:
+      return value;
+
+    default:
+      abort ();
+    }
+  return insn;
+}
+
+#endif /* _LIBHPPA_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libieee.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libieee.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libieee.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libieee.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,136 @@
+/* IEEE-695 object file formats:  definitions internal to BFD.
+   Copyright 1990, 1991, 1992, 1994, 1996, 2001, 2002, 2005, 2007
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.  Mostly Steve Chamberlain's fault.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+typedef struct {
+  unsigned int index:24;
+  char letter;
+} ieee_symbol_index_type;
+
+typedef struct ct {
+  bfd *this;
+  struct ct *next;
+} bfd_chain_type;
+
+typedef struct ieee_symbol
+{
+  asymbol symbol;
+  struct ieee_symbol *next;
+
+  unsigned int index;
+} ieee_symbol_type;
+
+
+typedef struct ieee_reloc {
+  arelent relent;
+  struct ieee_reloc *next;
+  ieee_symbol_index_type symbol;
+
+} ieee_reloc_type;
+
+#define ieee_symbol(x) ((ieee_symbol_type *)(x))
+
+typedef struct ieee_per_section
+{
+  asection *section;
+  bfd_byte *data;
+  bfd_vma offset;
+  bfd_vma pc;
+  /* For output */
+  file_ptr current_pos;
+  unsigned int current_byte;
+  bfd_boolean initialized;
+  ieee_reloc_type **reloc_tail_ptr;
+} ieee_per_section_type;
+
+#define ieee_per_section(x) ((ieee_per_section_type *)((x)->used_by_bfd))
+
+typedef struct {
+  unsigned char *input_p;
+  unsigned char *first_byte;
+  unsigned char *last_byte;
+  bfd *abfd;
+} common_header_type ;
+
+typedef struct ieee_data_struct
+{
+  common_header_type h;
+  bfd_boolean read_symbols;
+  bfd_boolean read_data;
+  file_ptr output_cursor;
+  /* Map of section indexes to section ptrs */
+  asection **section_table;
+  unsigned int section_table_size;
+  ieee_address_descriptor_type ad;
+  ieee_module_begin_type mb;
+  ieee_w_variable_type w;
+
+  unsigned int section_count;
+
+  unsigned int map_idx;
+  /* List of GLOBAL EXPORT symbols */
+  ieee_symbol_type *external_symbols;
+  /* List of UNDEFINED symbols */
+  ieee_symbol_type *external_reference;
+
+  /* When the symbols have been canonicalized, they are in a
+    * special order, we remember various bases here.. */
+  unsigned int external_symbol_max_index;
+  unsigned int external_symbol_min_index;
+  unsigned int external_symbol_count;
+  int external_symbol_base_offset;
+
+  unsigned int external_reference_max_index;
+  unsigned int external_reference_min_index;
+  unsigned int external_reference_count;
+  int external_reference_base_offset;
+
+
+  bfd_boolean symbol_table_full;
+
+
+bfd_boolean done_debug;
+
+
+bfd_chain_type *chain_head;
+bfd_chain_type *chain_root;
+
+} ieee_data_type;
+
+typedef struct {
+  file_ptr file_offset;
+  bfd *abfd;
+} ieee_ar_obstack_type;
+
+typedef struct ieee_ar_data_struct
+{
+  common_header_type h;
+  ieee_ar_obstack_type *elements;
+
+  unsigned  int element_index ;
+  unsigned int element_count;
+
+} ieee_ar_data_type;
+
+#define IEEE_DATA(abfd) ((abfd)->tdata.ieee_data)
+#define IEEE_AR_DATA(abfd) ((abfd)->tdata.ieee_ar_data)
+
+#define ptr(abfd) (ieee_data(abfd)->input_p)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libnlm.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libnlm.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libnlm.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libnlm.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,223 @@
+/* BFD back-end data structures for NLM (NetWare Loadable Modules) files.
+   Copyright 1993, 1994, 2001, 2002, 2003, 2005, 2007
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _LIBNLM_H_
+#define _LIBNLM_H_ 1
+
+#ifdef ARCH_SIZE
+#  define NLM_ARCH_SIZE ARCH_SIZE
+#endif
+#include "nlm/common.h"
+#include "nlm/internal.h"
+#include "nlm/external.h"
+
+/* A reloc for an imported NLM symbol.  Normal relocs are associated
+   with sections, and include a symbol.  These relocs are associated
+   with (undefined) symbols, and include a section.  */
+
+struct nlm_relent
+{
+  /* Section of reloc.  */
+  asection *section;
+  /* Reloc info (sym_ptr_ptr field set only when canonicalized).  */
+  arelent reloc;
+};
+
+/* Information we keep for an NLM symbol.  */
+
+typedef struct
+{
+  /* BFD symbol.  */
+  asymbol symbol;
+  /* Number of reloc entries for imported symbol.  */
+  bfd_size_type rcnt;
+  /* Array of reloc information for imported symbol.  */
+  struct nlm_relent *relocs;
+} nlmNAME(symbol_type);
+
+extern bfd_boolean        nlm_mkobject                    (bfd *);
+extern bfd_boolean        nlm_set_arch_mach               (bfd *, enum bfd_architecture, unsigned long);
+extern void               nlmNAME (get_symbol_info)       (bfd *, asymbol *, symbol_info *);
+extern long               nlmNAME (get_symtab_upper_bound)(bfd *);
+extern long               nlmNAME (canonicalize_symtab)   (bfd *, asymbol **);
+extern asymbol *          nlmNAME (make_empty_symbol)     (bfd *);
+extern void               nlmNAME (print_symbol)          (bfd *, void *, asymbol *, bfd_print_symbol_type);
+extern long               nlmNAME (get_reloc_upper_bound) (bfd *, asection *);
+extern long               nlmNAME (canonicalize_reloc)    (bfd *, asection *, arelent **, asymbol **);
+extern const bfd_target * nlmNAME (object_p)              (bfd *);
+extern bfd_boolean        nlmNAME (set_arch_mach)         (bfd *, enum bfd_architecture, unsigned long);
+extern bfd_boolean        nlmNAME (set_section_contents)  (bfd *, asection *, const void *, file_ptr, bfd_size_type);
+extern bfd_boolean        nlmNAME (write_object_contents) (bfd *);
+
+/* Some private data is stashed away for future use using the tdata pointer
+   in the bfd structure.  */
+
+struct nlm_obj_tdata
+{
+  /* Actual data, but ref like ptr */
+  Nlm_Internal_Fixed_Header	nlm_fixed_hdr[1];
+  Nlm_Internal_Variable_Header	nlm_variable_hdr[1];
+  Nlm_Internal_Version_Header	nlm_version_hdr[1];
+  Nlm_Internal_Copyright_Header	nlm_copyright_hdr[1];
+  Nlm_Internal_Extended_Header	nlm_extended_hdr[1];
+  Nlm_Internal_Custom_Header	nlm_custom_hdr[1];
+  Nlm_Internal_Cygnus_Ext_Header nlm_cygnus_ext_hdr[1];
+  /* BFD NLM symbols.  */
+  nlmNAME (symbol_type)	*	nlm_symbols;
+  /* Lowest text and data VMA values.  */
+  bfd_vma			nlm_text_low;
+  bfd_vma			nlm_data_low;
+  /* Caches for data read from object file.  */
+  arelent *			nlm_reloc_fixups;
+  asection **			nlm_reloc_fixup_secs;
+  /* Backend specific information.  This should probably be a pointer,
+     but that would require yet another entry point to initialize the
+     structure.  */
+  union
+    {
+      struct	/* Alpha backend information.  */
+	{
+	  bfd_vma gp;			/* GP value.  */
+	  bfd_vma lita_address;		/* .lita section address.  */
+	  bfd_size_type lita_size;	/* .lita section size.  */
+	}
+      alpha_backend_data;
+    }
+  backend_data;
+};
+
+#define nlm_tdata(bfd)			((bfd) -> tdata.nlm_obj_data)
+#define nlm_fixed_header(bfd)		(nlm_tdata (bfd) -> nlm_fixed_hdr)
+#define nlm_variable_header(bfd)	(nlm_tdata (bfd) -> nlm_variable_hdr)
+#define nlm_version_header(bfd)		(nlm_tdata (bfd) -> nlm_version_hdr)
+#define nlm_copyright_header(bfd)	(nlm_tdata (bfd) -> nlm_copyright_hdr)
+#define nlm_extended_header(bfd)	(nlm_tdata (bfd) -> nlm_extended_hdr)
+#define nlm_custom_header(bfd)		(nlm_tdata (bfd) -> nlm_custom_hdr)
+#define nlm_cygnus_ext_header(bfd)	(nlm_tdata (bfd) -> nlm_cygnus_ext_hdr)
+#define nlm_get_symbols(bfd)		(nlm_tdata (bfd) -> nlm_symbols)
+#define nlm_set_symbols(bfd, p)		(nlm_tdata (bfd) -> nlm_symbols = (p))
+#define nlm_set_text_low(bfd, i)	(nlm_tdata (bfd) -> nlm_text_low = (i))
+#define nlm_get_text_low(bfd)		(nlm_tdata (bfd) -> nlm_text_low)
+#define nlm_set_data_low(bfd, i)	(nlm_tdata (bfd) -> nlm_data_low = (i))
+#define nlm_get_data_low(bfd)		(nlm_tdata (bfd) -> nlm_data_low)
+#define nlm_relocation_fixups(bfd)	(nlm_tdata (bfd) -> nlm_reloc_fixups)
+#define nlm_relocation_fixup_secs(bfd)	(nlm_tdata (bfd) -> nlm_reloc_fixup_secs)
+#define nlm_alpha_backend_data(bfd)    (&nlm_tdata (bfd) -> backend_data.alpha_backend_data)
+
+/* This is used when writing out the external relocs. */
+
+struct reloc_and_sec
+{
+  arelent *rel;
+  asection *sec;
+};
+
+/* We store some function pointer in the backend structure.  This lets
+   different NLM targets share most of the same code, while providing
+   slightly different code where necessary.  */
+
+struct nlm_backend_data
+{
+  /* Signature for this backend.  */
+  char signature[NLM_SIGNATURE_SIZE];
+  /* Size of the fixed header.  */
+  bfd_size_type fixed_header_size;
+  /* Size of optional prefix for this backend.  Some backend may
+     require this to be a function, but so far a constant is OK.  This
+     is for a prefix which precedes the standard NLM fixed header.  */
+  bfd_size_type optional_prefix_size;
+  /* Architecture.  */
+  enum bfd_architecture arch;
+  /* Machine.  */
+  unsigned int mach;
+  /* Some NLM formats do not use the uninitialized data section, so
+     all uninitialized data must be put into the regular data section
+     instead.  */
+  bfd_boolean no_uninitialized_data;
+  /* Some NLM formats have a prefix on the file.  If this function is
+     not NULL, it will be called by nlm_object_p.  It should return
+     TRUE if this file could match this format, and it should leave
+     the BFD such that a bfd_bread will pick up the fixed header.  */
+  bfd_boolean (*nlm_backend_object_p) (bfd *);
+  /* Write out the prefix.  This function may be NULL.  This must
+     write out the same number of bytes as is in the field
+     optional_prefix_size.  */
+  bfd_boolean (*nlm_write_prefix) (bfd *);
+  /* Read a relocation fixup from abfd.  The reloc information is
+     machine specific.  The second argument is the symbol if this is
+     an import, or NULL if this is a reloc fixup.  This function
+     should set the third argument to the section which the reloc
+     belongs in, and the fourth argument to the reloc itself; it does
+     not need to fill in the sym_ptr_ptr field for a reloc against an
+     import symbol.  */
+  bfd_boolean (*nlm_read_reloc) (bfd *, nlmNAME (symbol_type) *, asection **, arelent *);
+  /* To make objcopy to an i386 NLM work, the i386 backend needs a
+     chance to work over the relocs.  This is a bit icky.  */
+  bfd_boolean (*nlm_mangle_relocs) (bfd *, asection *, const void *, bfd_vma,  bfd_size_type);
+  /* Read an import record from abfd.  It would be nice if this
+     were in a machine-dependent format, but it doesn't seem to be. */
+  bfd_boolean (*nlm_read_import) (bfd *, nlmNAME (symbol_type) *);
+  /* Write an import record to abfd. */
+  bfd_boolean (*nlm_write_import) (bfd *, asection *, arelent *);
+  /* Set the section for a public symbol.  This may be NULL, in which
+     case a default method will be used.  */
+  bfd_boolean (*nlm_set_public_section) (bfd *, nlmNAME (symbol_type) *);
+  /* Get the offset to write out for a public symbol.  This may be
+     NULL, in which case a default method will be used.  */
+  bfd_vma (*nlm_get_public_offset) (bfd *, asymbol *);
+  /* Swap the fixed header in and out */
+  void (*nlm_swap_fhdr_in)  (bfd *, void *, Nlm_Internal_Fixed_Header *);
+  void (*nlm_swap_fhdr_out) (bfd *, struct nlm_internal_fixed_header *, void *);
+  /* Write out an external reference.  */
+  bfd_boolean (*nlm_write_external) (bfd *, bfd_size_type, asymbol *, struct reloc_and_sec *);
+  bfd_boolean (*nlm_write_export) (bfd *, asymbol *, bfd_vma);
+};
+
+#define nlm_backend(bfd)   ((struct nlm_backend_data *)((bfd) -> xvec -> backend_data))
+#define nlm_signature(bfd)                 (nlm_backend (bfd) -> signature)
+#define nlm_fixed_header_size(bfd)         (nlm_backend (bfd) -> fixed_header_size)
+#define nlm_optional_prefix_size(bfd)      (nlm_backend (bfd) -> optional_prefix_size)
+#define nlm_architecture(bfd)              (nlm_backend (bfd) -> arch)
+#define nlm_machine(bfd)                   (nlm_backend (bfd) -> mach)
+#define nlm_no_uninitialized_data(bfd)     (nlm_backend (bfd) -> no_uninitialized_data)
+#define nlm_backend_object_p_func(bfd)     (nlm_backend (bfd) -> nlm_backend_object_p)
+#define nlm_write_prefix_func(bfd)         (nlm_backend (bfd) -> nlm_write_prefix)
+#define nlm_read_reloc_func(bfd)           (nlm_backend (bfd) -> nlm_read_reloc)
+#define nlm_mangle_relocs_func(bfd)        (nlm_backend (bfd) -> nlm_mangle_relocs)
+#define nlm_read_import_func(bfd)          (nlm_backend (bfd) -> nlm_read_import)
+#define nlm_write_import_func(bfd)         (nlm_backend (bfd) -> nlm_write_import)
+#define nlm_set_public_section_func(bfd)   (nlm_backend (bfd) -> nlm_set_public_section)
+#define nlm_get_public_offset_func(bfd)    (nlm_backend (bfd) -> nlm_get_public_offset)
+#define nlm_swap_fixed_header_in_func(bfd) (nlm_backend (bfd) -> nlm_swap_fhdr_in)
+#define nlm_swap_fixed_header_out_func(bfd)(nlm_backend (bfd) -> nlm_swap_fhdr_out)
+#define nlm_write_external_func(bfd)       (nlm_backend (bfd) -> nlm_write_external)
+#define nlm_write_export_func(bfd)         (nlm_backend (bfd) -> nlm_write_export)
+
+/* The NLM code, data, and uninitialized sections have no names defined
+   in the NLM, but bfd wants to give them names, so use the traditional
+   UNIX names.  */
+
+#define NLM_CODE_NAME			".text"
+#define NLM_INITIALIZED_DATA_NAME	".data"
+#define NLM_UNINITIALIZED_DATA_NAME	".bss"
+
+#endif /* _LIBNLM_H_ */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/liboasys.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/liboasys.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/liboasys.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/liboasys.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,84 @@
+/* BFD internal declarations for Oasys file format handling.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1997, 2002, 2005, 2007
+   Free Software Foundation, Inc.
+   Scrawled by Steve Chamberlain of Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+typedef struct _oasys_symbol
+{
+  asymbol symbol;
+} oasys_symbol_type;
+
+typedef struct _oasys_reloc {
+  arelent relent;
+  struct _oasys_reloc *next;
+  unsigned int symbol;
+} oasys_reloc_type;
+
+
+#define oasys_symbol(x) ((oasys_symbol_type *)(x))
+#define oasys_per_section(x) ((oasys_per_section_type *)(x->used_by_bfd))
+
+typedef struct _oasys_per_section
+{
+  asection *section;
+  bfd_byte *data;
+  bfd_vma offset;
+  bfd_boolean had_vma;
+  oasys_reloc_type **reloc_tail_ptr;
+  bfd_vma pc;
+
+
+  file_ptr current_pos;
+  unsigned int current_byte;
+  bfd_boolean initialized;
+} oasys_per_section_type;
+
+#define NSECTIONS 10
+
+typedef struct _oasys_ar_obstack {
+  file_ptr file_offset;
+  bfd *abfd;
+} oasys_ar_obstack_type;
+
+
+typedef struct _oasys_module_info {
+  file_ptr pos;
+  unsigned int size;
+  bfd *abfd;
+  char *name;
+} oasys_module_info_type;
+
+typedef struct _oasys_ar_data {
+  oasys_module_info_type *module;
+  unsigned int module_count;
+  unsigned int module_index;
+} oasys_ar_data_type;
+
+typedef struct _oasys_data {
+  char *strings;
+  asymbol *symbols;
+  unsigned int symbol_string_length;
+  asection *sections[OASYS_MAX_SEC_COUNT];
+  file_ptr first_data_record;
+} oasys_data_type;
+
+#define OASYS_DATA(abfd)	((abfd)->tdata.oasys_obj_data)
+#define OASYS_AR_DATA(abfd)	((abfd)->tdata.oasys_ar_data)
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libpei.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libpei.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libpei.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libpei.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,356 @@
+/* Support for the generic parts of PE/PEI; common header information.
+   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005,
+   2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+   Written by Cygnus Solutions.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* Most of this hacked by  Steve Chamberlain,
+			sac@cygnus.com
+
+   PE/PEI rearrangement (and code added): Donn Terry
+				       Softway Systems, Inc.  */
+
+/* Hey look, some documentation [and in a place you expect to find it]!
+
+   The main reference for the pei format is "Microsoft Portable Executable
+   and Common Object File Format Specification 4.1".  Get it if you need to
+   do some serious hacking on this code.
+
+   Another reference:
+   "Peering Inside the PE: A Tour of the Win32 Portable Executable
+   File Format", MSJ 1994, Volume 9.
+
+   The *sole* difference between the pe format and the pei format is that the
+   latter has an MSDOS 2.0 .exe header on the front that prints the message
+   "This app must be run under Windows." (or some such).
+   (FIXME: Whether that statement is *really* true or not is unknown.
+   Are there more subtle differences between pe and pei formats?
+   For now assume there aren't.  If you find one, then for God sakes
+   document it here!)
+
+   The Microsoft docs use the word "image" instead of "executable" because
+   the former can also refer to a DLL (shared library).  Confusion can arise
+   because the `i' in `pei' also refers to "image".  The `pe' format can
+   also create images (i.e. executables), it's just that to run on a win32
+   system you need to use the pei format.
+
+   FIXME: Please add more docs here so the next poor fool that has to hack
+   on this code has a chance of getting something accomplished without
+   wasting too much time.  */
+
+#ifndef GET_FCN_LNNOPTR
+#define GET_FCN_LNNOPTR(abfd, ext) \
+  H_GET_32 (abfd, ext->x_sym.x_fcnary.x_fcn.x_lnnoptr)
+#endif
+
+#ifndef GET_FCN_ENDNDX
+#define GET_FCN_ENDNDX(abfd, ext) \
+  H_GET_32 (abfd, ext->x_sym.x_fcnary.x_fcn.x_endndx)
+#endif
+
+#ifndef PUT_FCN_LNNOPTR
+#define PUT_FCN_LNNOPTR(abfd, in, ext) \
+  H_PUT_32(abfd, in, ext->x_sym.x_fcnary.x_fcn.x_lnnoptr)
+#endif
+#ifndef PUT_FCN_ENDNDX
+#define PUT_FCN_ENDNDX(abfd, in, ext) \
+  H_PUT_32(abfd, in, ext->x_sym.x_fcnary.x_fcn.x_endndx)
+#endif
+#ifndef GET_LNSZ_LNNO
+#define GET_LNSZ_LNNO(abfd, ext) \
+  H_GET_16 (abfd, ext->x_sym.x_misc.x_lnsz.x_lnno)
+#endif
+#ifndef GET_LNSZ_SIZE
+#define GET_LNSZ_SIZE(abfd, ext) \
+  H_GET_16 (abfd, ext->x_sym.x_misc.x_lnsz.x_size)
+#endif
+#ifndef PUT_LNSZ_LNNO
+#define PUT_LNSZ_LNNO(abfd, in, ext) \
+  H_PUT_16(abfd, in, ext->x_sym.x_misc.x_lnsz.x_lnno)
+#endif
+#ifndef PUT_LNSZ_SIZE
+#define PUT_LNSZ_SIZE(abfd, in, ext) \
+  H_PUT_16(abfd, in, ext->x_sym.x_misc.x_lnsz.x_size)
+#endif
+#ifndef GET_SCN_SCNLEN
+#define GET_SCN_SCNLEN(abfd, ext) \
+  H_GET_32 (abfd, ext->x_scn.x_scnlen)
+#endif
+#ifndef GET_SCN_NRELOC
+#define GET_SCN_NRELOC(abfd, ext) \
+  H_GET_16 (abfd, ext->x_scn.x_nreloc)
+#endif
+#ifndef GET_SCN_NLINNO
+#define GET_SCN_NLINNO(abfd, ext) \
+  H_GET_16 (abfd, ext->x_scn.x_nlinno)
+#endif
+#ifndef PUT_SCN_SCNLEN
+#define PUT_SCN_SCNLEN(abfd, in, ext) \
+  H_PUT_32(abfd, in, ext->x_scn.x_scnlen)
+#endif
+#ifndef PUT_SCN_NRELOC
+#define PUT_SCN_NRELOC(abfd, in, ext) \
+  H_PUT_16(abfd, in, ext->x_scn.x_nreloc)
+#endif
+#ifndef PUT_SCN_NLINNO
+#define PUT_SCN_NLINNO(abfd, in, ext) \
+  H_PUT_16(abfd,in, ext->x_scn.x_nlinno)
+#endif
+#ifndef GET_LINENO_LNNO
+#define GET_LINENO_LNNO(abfd, ext) \
+  H_GET_16 (abfd, ext->l_lnno);
+#endif
+#ifndef PUT_LINENO_LNNO
+#define PUT_LINENO_LNNO(abfd, val, ext) \
+  H_PUT_16(abfd,val, ext->l_lnno);
+#endif
+
+/* The f_symptr field in the filehdr is sometimes 64 bits.  */
+#ifndef GET_FILEHDR_SYMPTR
+#define GET_FILEHDR_SYMPTR H_GET_32
+#endif
+#ifndef PUT_FILEHDR_SYMPTR
+#define PUT_FILEHDR_SYMPTR H_PUT_32
+#endif
+
+/* Some fields in the aouthdr are sometimes 64 bits.  */
+#ifndef GET_AOUTHDR_TSIZE
+#define GET_AOUTHDR_TSIZE H_GET_32
+#endif
+#ifndef PUT_AOUTHDR_TSIZE
+#define PUT_AOUTHDR_TSIZE H_PUT_32
+#endif
+#ifndef GET_AOUTHDR_DSIZE
+#define GET_AOUTHDR_DSIZE H_GET_32
+#endif
+#ifndef PUT_AOUTHDR_DSIZE
+#define PUT_AOUTHDR_DSIZE H_PUT_32
+#endif
+#ifndef GET_AOUTHDR_BSIZE
+#define GET_AOUTHDR_BSIZE H_GET_32
+#endif
+#ifndef PUT_AOUTHDR_BSIZE
+#define PUT_AOUTHDR_BSIZE H_PUT_32
+#endif
+#ifndef GET_AOUTHDR_ENTRY
+#define GET_AOUTHDR_ENTRY H_GET_32
+#endif
+#ifndef PUT_AOUTHDR_ENTRY
+#define PUT_AOUTHDR_ENTRY H_PUT_32
+#endif
+#ifndef GET_AOUTHDR_TEXT_START
+#define GET_AOUTHDR_TEXT_START H_GET_32
+#endif
+#ifndef PUT_AOUTHDR_TEXT_START
+#define PUT_AOUTHDR_TEXT_START H_PUT_32
+#endif
+#ifndef GET_AOUTHDR_DATA_START
+#define GET_AOUTHDR_DATA_START H_GET_32
+#endif
+#ifndef PUT_AOUTHDR_DATA_START
+#define PUT_AOUTHDR_DATA_START H_PUT_32
+#endif
+
+/* Some fields in the scnhdr are sometimes 64 bits.  */
+#ifndef GET_SCNHDR_PADDR
+#define GET_SCNHDR_PADDR H_GET_32
+#endif
+#ifndef PUT_SCNHDR_PADDR
+#define PUT_SCNHDR_PADDR H_PUT_32
+#endif
+#ifndef GET_SCNHDR_VADDR
+#define GET_SCNHDR_VADDR H_GET_32
+#endif
+#ifndef PUT_SCNHDR_VADDR
+#define PUT_SCNHDR_VADDR H_PUT_32
+#endif
+#ifndef GET_SCNHDR_SIZE
+#define GET_SCNHDR_SIZE H_GET_32
+#endif
+#ifndef PUT_SCNHDR_SIZE
+#define PUT_SCNHDR_SIZE H_PUT_32
+#endif
+#ifndef GET_SCNHDR_SCNPTR
+#define GET_SCNHDR_SCNPTR H_GET_32
+#endif
+#ifndef PUT_SCNHDR_SCNPTR
+#define PUT_SCNHDR_SCNPTR H_PUT_32
+#endif
+#ifndef GET_SCNHDR_RELPTR
+#define GET_SCNHDR_RELPTR H_GET_32
+#endif
+#ifndef PUT_SCNHDR_RELPTR
+#define PUT_SCNHDR_RELPTR H_PUT_32
+#endif
+#ifndef GET_SCNHDR_LNNOPTR
+#define GET_SCNHDR_LNNOPTR H_GET_32
+#endif
+#ifndef PUT_SCNHDR_LNNOPTR
+#define PUT_SCNHDR_LNNOPTR H_PUT_32
+#endif
+
+#ifdef COFF_WITH_pex64
+
+#define GET_OPTHDR_IMAGE_BASE            H_GET_64
+#define PUT_OPTHDR_IMAGE_BASE            H_PUT_64
+#define GET_OPTHDR_SIZE_OF_STACK_RESERVE H_GET_64
+#define PUT_OPTHDR_SIZE_OF_STACK_RESERVE H_PUT_64
+#define GET_OPTHDR_SIZE_OF_STACK_COMMIT  H_GET_64
+#define PUT_OPTHDR_SIZE_OF_STACK_COMMIT  H_PUT_64
+#define GET_OPTHDR_SIZE_OF_HEAP_RESERVE  H_GET_64
+#define PUT_OPTHDR_SIZE_OF_HEAP_RESERVE  H_PUT_64
+#define GET_OPTHDR_SIZE_OF_HEAP_COMMIT   H_GET_64
+#define PUT_OPTHDR_SIZE_OF_HEAP_COMMIT   H_PUT_64
+#define GET_PDATA_ENTRY                  bfd_get_32
+
+#define _bfd_XX_bfd_copy_private_bfd_data_common	_bfd_pex64_bfd_copy_private_bfd_data_common
+#define _bfd_XX_bfd_copy_private_section_data		_bfd_pex64_bfd_copy_private_section_data
+#define _bfd_XX_get_symbol_info				_bfd_pex64_get_symbol_info
+#define _bfd_XX_only_swap_filehdr_out			_bfd_pex64_only_swap_filehdr_out
+#define _bfd_XX_print_private_bfd_data_common		_bfd_pex64_print_private_bfd_data_common
+#define _bfd_XXi_final_link_postscript			_bfd_pex64i_final_link_postscript
+#define _bfd_XXi_only_swap_filehdr_out			_bfd_pex64i_only_swap_filehdr_out
+#define _bfd_XXi_swap_aouthdr_in			_bfd_pex64i_swap_aouthdr_in
+#define _bfd_XXi_swap_aouthdr_out			_bfd_pex64i_swap_aouthdr_out
+#define _bfd_XXi_swap_aux_in				_bfd_pex64i_swap_aux_in
+#define _bfd_XXi_swap_aux_out				_bfd_pex64i_swap_aux_out
+#define _bfd_XXi_swap_lineno_in				_bfd_pex64i_swap_lineno_in
+#define _bfd_XXi_swap_lineno_out			_bfd_pex64i_swap_lineno_out
+#define _bfd_XXi_swap_scnhdr_out			_bfd_pex64i_swap_scnhdr_out
+#define _bfd_XXi_swap_sym_in				_bfd_pex64i_swap_sym_in
+#define _bfd_XXi_swap_sym_out				_bfd_pex64i_swap_sym_out
+
+#elif defined COFF_WITH_pep
+
+#define GET_OPTHDR_IMAGE_BASE H_GET_64
+#define PUT_OPTHDR_IMAGE_BASE H_PUT_64
+#define GET_OPTHDR_SIZE_OF_STACK_RESERVE H_GET_64
+#define PUT_OPTHDR_SIZE_OF_STACK_RESERVE H_PUT_64
+#define GET_OPTHDR_SIZE_OF_STACK_COMMIT H_GET_64
+#define PUT_OPTHDR_SIZE_OF_STACK_COMMIT H_PUT_64
+#define GET_OPTHDR_SIZE_OF_HEAP_RESERVE H_GET_64
+#define PUT_OPTHDR_SIZE_OF_HEAP_RESERVE H_PUT_64
+#define GET_OPTHDR_SIZE_OF_HEAP_COMMIT H_GET_64
+#define PUT_OPTHDR_SIZE_OF_HEAP_COMMIT H_PUT_64
+#define GET_PDATA_ENTRY bfd_get_64
+
+#define _bfd_XX_bfd_copy_private_bfd_data_common	_bfd_pep_bfd_copy_private_bfd_data_common
+#define _bfd_XX_bfd_copy_private_section_data		_bfd_pep_bfd_copy_private_section_data
+#define _bfd_XX_get_symbol_info				_bfd_pep_get_symbol_info
+#define _bfd_XX_only_swap_filehdr_out			_bfd_pep_only_swap_filehdr_out
+#define _bfd_XX_print_private_bfd_data_common		_bfd_pep_print_private_bfd_data_common
+#define _bfd_XXi_final_link_postscript			_bfd_pepi_final_link_postscript
+#define _bfd_XXi_only_swap_filehdr_out			_bfd_pepi_only_swap_filehdr_out
+#define _bfd_XXi_swap_aouthdr_in			_bfd_pepi_swap_aouthdr_in
+#define _bfd_XXi_swap_aouthdr_out			_bfd_pepi_swap_aouthdr_out
+#define _bfd_XXi_swap_aux_in				_bfd_pepi_swap_aux_in
+#define _bfd_XXi_swap_aux_out				_bfd_pepi_swap_aux_out
+#define _bfd_XXi_swap_lineno_in				_bfd_pepi_swap_lineno_in
+#define _bfd_XXi_swap_lineno_out			_bfd_pepi_swap_lineno_out
+#define _bfd_XXi_swap_scnhdr_out			_bfd_pepi_swap_scnhdr_out
+#define _bfd_XXi_swap_sym_in				_bfd_pepi_swap_sym_in
+#define _bfd_XXi_swap_sym_out				_bfd_pepi_swap_sym_out
+
+#else /* !COFF_WITH_pep */
+
+#define GET_OPTHDR_IMAGE_BASE H_GET_32
+#define PUT_OPTHDR_IMAGE_BASE H_PUT_32
+#define GET_OPTHDR_SIZE_OF_STACK_RESERVE H_GET_32
+#define PUT_OPTHDR_SIZE_OF_STACK_RESERVE H_PUT_32
+#define GET_OPTHDR_SIZE_OF_STACK_COMMIT H_GET_32
+#define PUT_OPTHDR_SIZE_OF_STACK_COMMIT H_PUT_32
+#define GET_OPTHDR_SIZE_OF_HEAP_RESERVE H_GET_32
+#define PUT_OPTHDR_SIZE_OF_HEAP_RESERVE H_PUT_32
+#define GET_OPTHDR_SIZE_OF_HEAP_COMMIT H_GET_32
+#define PUT_OPTHDR_SIZE_OF_HEAP_COMMIT H_PUT_32
+#define GET_PDATA_ENTRY bfd_get_32
+
+#define _bfd_XX_bfd_copy_private_bfd_data_common	_bfd_pe_bfd_copy_private_bfd_data_common
+#define _bfd_XX_bfd_copy_private_section_data		_bfd_pe_bfd_copy_private_section_data
+#define _bfd_XX_get_symbol_info				_bfd_pe_get_symbol_info
+#define _bfd_XX_only_swap_filehdr_out			_bfd_pe_only_swap_filehdr_out
+#define _bfd_XX_print_private_bfd_data_common		_bfd_pe_print_private_bfd_data_common
+#define _bfd_XXi_final_link_postscript			_bfd_pei_final_link_postscript
+#define _bfd_XXi_only_swap_filehdr_out			_bfd_pei_only_swap_filehdr_out
+#define _bfd_XXi_swap_aouthdr_in			_bfd_pei_swap_aouthdr_in
+#define _bfd_XXi_swap_aouthdr_out			_bfd_pei_swap_aouthdr_out
+#define _bfd_XXi_swap_aux_in				_bfd_pei_swap_aux_in
+#define _bfd_XXi_swap_aux_out				_bfd_pei_swap_aux_out
+#define _bfd_XXi_swap_lineno_in				_bfd_pei_swap_lineno_in
+#define _bfd_XXi_swap_lineno_out			_bfd_pei_swap_lineno_out
+#define _bfd_XXi_swap_scnhdr_out			_bfd_pei_swap_scnhdr_out
+#define _bfd_XXi_swap_sym_in				_bfd_pei_swap_sym_in
+#define _bfd_XXi_swap_sym_out				_bfd_pei_swap_sym_out
+
+#endif /* !COFF_WITH_pep */
+
+/* These functions are architecture dependent, and are in peicode.h:
+   coff_swap_reloc_in
+   int coff_swap_reloc_out
+   coff_swap_filehdr_in
+   coff_swap_scnhdr_in
+   pe_mkobject
+   pe_mkobject_hook  */
+
+/* The functions described below are common across all PE/PEI
+   implementations architecture types, and actually appear in
+   peigen.c.  */
+
+#define coff_swap_sym_in      _bfd_XXi_swap_sym_in
+#define coff_swap_sym_out     _bfd_XXi_swap_sym_out
+#define coff_swap_aux_in      _bfd_XXi_swap_aux_in
+#define coff_swap_aux_out     _bfd_XXi_swap_aux_out
+#define coff_swap_lineno_in   _bfd_XXi_swap_lineno_in
+#define coff_swap_lineno_out  _bfd_XXi_swap_lineno_out
+#define coff_swap_aouthdr_in  _bfd_XXi_swap_aouthdr_in
+#define coff_swap_aouthdr_out _bfd_XXi_swap_aouthdr_out
+#define coff_swap_scnhdr_out  _bfd_XXi_swap_scnhdr_out
+
+#ifndef coff_final_link_postscript
+#define coff_final_link_postscript _bfd_XXi_final_link_postscript
+#endif
+
+void        _bfd_XXi_swap_sym_in (bfd *, void *, void *);
+unsigned    _bfd_XXi_swap_sym_out (bfd *, void *, void *);
+void        _bfd_XXi_swap_aux_in (bfd *, void *, int, int, int, int, void *);
+unsigned    _bfd_XXi_swap_aux_out (bfd *, void *, int, int, int, int, void *);
+void        _bfd_XXi_swap_lineno_in (bfd *, void *, void *);
+unsigned    _bfd_XXi_swap_lineno_out (bfd *, void *, void *);
+void        _bfd_XXi_swap_aouthdr_in (bfd *, void *, void *);
+unsigned    _bfd_XXi_swap_aouthdr_out (bfd *, void *, void *);
+unsigned    _bfd_XXi_swap_scnhdr_out (bfd *, void *, void *);
+bfd_boolean _bfd_XX_print_private_bfd_data_common (bfd *, void *);
+bfd_boolean _bfd_XX_bfd_copy_private_bfd_data_common (bfd *, bfd *);
+void        _bfd_XX_get_symbol_info (bfd *, asymbol *, symbol_info *);
+bfd_boolean _bfd_XXi_final_link_postscript (bfd *, struct coff_final_link_info *);
+
+/* The following are needed only for ONE of pe or pei, but don't
+   otherwise vary; peicode.h fixes up ifdefs but we provide the
+   prototype.  */
+
+unsigned    _bfd_XX_only_swap_filehdr_out  (bfd *, void *, void *);
+unsigned    _bfd_XXi_only_swap_filehdr_out (bfd *, void *, void *);
+bfd_boolean _bfd_XX_bfd_copy_private_section_data (bfd *, asection *, bfd *, asection *);
+
+bfd_boolean _bfd_pe_print_ce_compressed_pdata (bfd *, void *);
+bfd_boolean _bfd_pe64_print_ce_compressed_pdata (bfd *, void *);
+bfd_boolean _bfd_pex64_print_ce_compressed_pdata (bfd *, void *);
+bfd_boolean _bfd_pep_print_ce_compressed_pdata (bfd *, void *);
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libxcoff.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libxcoff.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/libxcoff.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/libxcoff.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,260 @@
+/* BFD XCOFF object file private structure.
+   Copyright 2001, 2002, 2005, 2007, 2009 Free Software Foundation, Inc.
+   Written by Tom Rix, Redhat.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef LIBXCOFF_H
+#define LIBXCOFF_H
+
+/* This is the backend information kept for XCOFF files.  This
+   structure is constant for a particular backend.  The first element
+   is the COFF backend data structure, so that XCOFF targets can use
+   the generic COFF code.  */
+
+struct xcoff_backend_data_rec
+{
+  /* COFF backend information.  */
+  bfd_coff_backend_data coff;
+
+  /* Magic number.  */
+  unsigned short _xcoff_magic_number;
+
+  /* Architecture and machine for coff_set_arch_mach_hook.  */
+  enum bfd_architecture _xcoff_architecture;
+  long _xcoff_machine;
+
+  /* Function pointers to xcoff specific swap routines.  */
+  void (* _xcoff_swap_ldhdr_in) (bfd *, const void *, struct internal_ldhdr *);
+  void (* _xcoff_swap_ldhdr_out)(bfd *, const struct internal_ldhdr *, void *);
+  void (* _xcoff_swap_ldsym_in) (bfd *, const void *, struct internal_ldsym *);
+  void (* _xcoff_swap_ldsym_out)(bfd *, const struct internal_ldsym *, void *);
+  void (* _xcoff_swap_ldrel_in) (bfd *, const void *, struct internal_ldrel *);
+  void (* _xcoff_swap_ldrel_out)(bfd *, const struct internal_ldrel *, void *);
+
+  /* Size of the external struct.  */
+  unsigned int _xcoff_ldhdrsz;
+  unsigned int _xcoff_ldsymsz;
+  unsigned int _xcoff_ldrelsz;
+
+  /* Size an entry in a descriptor section.  */
+  unsigned int _xcoff_function_descriptor_size;
+
+  /* Size of the small aout file header.  */
+  unsigned int _xcoff_small_aout_header_size;
+
+  /* Loader version
+     1 : XCOFF32
+     2 : XCOFF64.  */
+  unsigned long _xcoff_ldhdr_version;
+
+  bfd_boolean (* _xcoff_put_symbol_name)
+    (bfd *, struct bfd_strtab_hash *, struct internal_syment *,
+     const char *);
+
+  bfd_boolean (* _xcoff_put_ldsymbol_name)
+    (bfd *, struct xcoff_loader_info *, struct internal_ldsym *,
+     const char *);
+
+  reloc_howto_type *_xcoff_dynamic_reloc;
+
+  asection * (* _xcoff_create_csect_from_smclas)
+    (bfd *, union internal_auxent *, const char *);
+
+  /* Line number and relocation overflow.
+     XCOFF32 overflows to another section when the line number or the 
+     relocation count exceeds 0xffff.  XCOFF64 does not overflow.  */
+  bfd_boolean (*_xcoff_is_lineno_count_overflow) (bfd *, bfd_vma);
+  bfd_boolean (*_xcoff_is_reloc_count_overflow)  (bfd *, bfd_vma);
+
+  /* Loader section symbol and relocation table offset
+     XCOFF32 is after the .loader header
+     XCOFF64 is offset in .loader header.  */
+  bfd_vma (*_xcoff_loader_symbol_offset) (bfd *, struct internal_ldhdr *);
+  bfd_vma (*_xcoff_loader_reloc_offset)  (bfd *, struct internal_ldhdr *);
+  
+  /* Global linkage.  The first word of global linkage code must be be 
+     modified by filling in the correct TOC offset.  */
+  unsigned long *_xcoff_glink_code;
+  
+  /* Size of the global link code in bytes of the xcoff_glink_code table.  */
+  unsigned long _xcoff_glink_size;
+
+  /* rtinit.  */
+  unsigned int _xcoff_rtinit_size;
+  bfd_boolean (*_xcoff_generate_rtinit)
+    (bfd *, const char *, const char *, bfd_boolean);
+};
+
+/* Look up an entry in an XCOFF link hash table.  */
+#define xcoff_link_hash_lookup(table, string, create, copy, follow) \
+  ((struct xcoff_link_hash_entry *) \
+   bfd_link_hash_lookup (&(table)->root, (string), (create), (copy),\
+			 (follow)))
+
+/* Traverse an XCOFF link hash table.  */
+#define xcoff_link_hash_traverse(table, func, info)			\
+  (bfd_link_hash_traverse						\
+   (&(table)->root,							\
+    (bfd_boolean (*) (struct bfd_link_hash_entry *, void *)) (func),	\
+    (info)))
+
+/* Get the XCOFF link hash table from the info structure.  This is
+   just a cast.  */
+#define xcoff_hash_table(p) ((struct xcoff_link_hash_table *) ((p)->hash))
+
+
+#define xcoff_backend(abfd) \
+  ((struct xcoff_backend_data_rec *) (abfd)->xvec->backend_data)
+
+#define bfd_xcoff_magic_number(a) ((xcoff_backend (a)->_xcoff_magic_number))
+#define bfd_xcoff_architecture(a) ((xcoff_backend (a)->_xcoff_architecture))
+#define bfd_xcoff_machine(a)      ((xcoff_backend (a)->_xcoff_machine))
+
+#define bfd_xcoff_swap_ldhdr_in(a, b, c) \
+  ((xcoff_backend (a)->_xcoff_swap_ldhdr_in) ((a), (b), (c)))
+
+#define bfd_xcoff_swap_ldhdr_out(a, b, c) \
+  ((xcoff_backend (a)->_xcoff_swap_ldhdr_out) ((a), (b), (c)))
+
+#define bfd_xcoff_swap_ldsym_in(a, b, c) \
+  ((xcoff_backend (a)->_xcoff_swap_ldsym_in) ((a), (b), (c)))
+
+#define bfd_xcoff_swap_ldsym_out(a, b, c) \
+  ((xcoff_backend (a)->_xcoff_swap_ldsym_out) ((a), (b), (c)))
+
+#define bfd_xcoff_swap_ldrel_in(a, b, c) \
+  ((xcoff_backend (a)->_xcoff_swap_ldrel_in) ((a), (b), (c)))
+
+#define bfd_xcoff_swap_ldrel_out(a, b, c) \
+  ((xcoff_backend (a)->_xcoff_swap_ldrel_out) ((a), (b), (c)))
+
+#define bfd_xcoff_ldhdrsz(a) ((xcoff_backend (a)->_xcoff_ldhdrsz))
+#define bfd_xcoff_ldsymsz(a) ((xcoff_backend (a)->_xcoff_ldsymsz))
+#define bfd_xcoff_ldrelsz(a) ((xcoff_backend (a)->_xcoff_ldrelsz))
+#define bfd_xcoff_function_descriptor_size(a) \
+  ((xcoff_backend (a)->_xcoff_function_descriptor_size))
+#define bfd_xcoff_small_aout_header_size(a) \
+  ((xcoff_backend (a)->_xcoff_small_aout_header_size))
+
+#define bfd_xcoff_ldhdr_version(a) ((xcoff_backend (a)->_xcoff_ldhdr_version))
+
+#define bfd_xcoff_put_symbol_name(a, b, c, d) \
+  ((xcoff_backend (a)->_xcoff_put_symbol_name) ((a), (b), (c), (d)))
+
+#define bfd_xcoff_put_ldsymbol_name(a, b, c, d) \
+  ((xcoff_backend (a)->_xcoff_put_ldsymbol_name) ((a), (b), (c), (d)))
+
+/* Get the XCOFF hash table entries for a BFD.  */
+#define obj_xcoff_sym_hashes(bfd) \
+  ((struct xcoff_link_hash_entry **) obj_coff_sym_hashes (bfd))
+
+#define bfd_xcoff_dynamic_reloc_howto(a) \
+   ((xcoff_backend (a)->_xcoff_dynamic_reloc))
+
+#define bfd_xcoff_create_csect_from_smclas(a, b, c) \
+   ((xcoff_backend (a)->_xcoff_create_csect_from_smclas((a), (b), (c))))
+
+#define bfd_xcoff_is_lineno_count_overflow(a, b) \
+   ((xcoff_backend (a)->_xcoff_is_lineno_count_overflow((a), (b))))
+
+#define bfd_xcoff_is_reloc_count_overflow(a, b) \
+   ((xcoff_backend (a)->_xcoff_is_reloc_count_overflow((a), (b))))
+
+#define bfd_xcoff_loader_symbol_offset(a, b) \
+ ((xcoff_backend (a)->_xcoff_loader_symbol_offset((a), (b))))
+
+#define bfd_xcoff_loader_reloc_offset(a, b) \
+ ((xcoff_backend (a)->_xcoff_loader_reloc_offset((a), (b))))
+
+#define bfd_xcoff_glink_code(a, b)   ((xcoff_backend (a)->_xcoff_glink_code[(b)]))
+#define bfd_xcoff_glink_code_size(a) ((xcoff_backend (a)->_xcoff_glink_size))
+
+/* Check for the magic number U803XTOCMAGIC or U64_TOCMAGIC for 64 bit 
+   targets.  */
+#define bfd_xcoff_is_xcoff64(a) \
+  (   (0x01EF == (bfd_xcoff_magic_number (a))) \
+   || (0x01F7 == (bfd_xcoff_magic_number (a))))
+
+/* Check for the magic number U802TOMAGIC for 32 bit targets.  */
+#define bfd_xcoff_is_xcoff32(a) (0x01DF == (bfd_xcoff_magic_number (a)))
+
+#define bfd_xcoff_rtinit_size(a)              ((xcoff_backend (a)->_xcoff_rtinit_size))
+#define bfd_xcoff_generate_rtinit(a, b, c, d) ((xcoff_backend (a)->_xcoff_generate_rtinit ((a), (b), (c), (d))))
+
+/* Accessor macros for tdata.  */
+#define bfd_xcoff_text_align_power(a) ((xcoff_data (a)->text_align_power))
+#define bfd_xcoff_data_align_power(a) ((xcoff_data (a)->data_align_power))
+
+/* xcoff*_ppc_relocate_section macros  */
+#define XCOFF_MAX_CALCULATE_RELOCATION (0x1c)
+#define XCOFF_MAX_COMPLAIN_OVERFLOW (4)
+/* N_ONES produces N one bits, without overflowing machine arithmetic.  */
+#ifdef N_ONES
+#undef N_ONES
+#endif
+#define N_ONES(n) (((((bfd_vma) 1 << ((n) - 1)) - 1) << 1) | 1)
+
+#define XCOFF_RELOC_FUNCTION_ARGS \
+  bfd *, asection *, bfd *, struct internal_reloc *, \
+  struct internal_syment *, struct reloc_howto_struct *, bfd_vma, bfd_vma, \
+  bfd_vma *relocation, bfd_byte *contents
+
+#define XCOFF_COMPLAIN_FUNCTION_ARGS \
+  bfd *, bfd_vma, bfd_vma, struct reloc_howto_struct *howto
+
+extern bfd_boolean (*xcoff_calculate_relocation[XCOFF_MAX_CALCULATE_RELOCATION])
+  (XCOFF_RELOC_FUNCTION_ARGS);
+extern bfd_boolean (*xcoff_complain_overflow[XCOFF_MAX_COMPLAIN_OVERFLOW])
+  (XCOFF_COMPLAIN_FUNCTION_ARGS);
+
+#define XCOFF_NO_LONG_SECTION_NAMES  (FALSE), bfd_coff_set_long_section_names_disallowed
+
+/* Relocation functions */
+bfd_boolean xcoff_reloc_type_noop (XCOFF_RELOC_FUNCTION_ARGS);
+bfd_boolean xcoff_reloc_type_fail (XCOFF_RELOC_FUNCTION_ARGS);
+bfd_boolean xcoff_reloc_type_pos  (XCOFF_RELOC_FUNCTION_ARGS);
+bfd_boolean xcoff_reloc_type_neg  (XCOFF_RELOC_FUNCTION_ARGS);
+bfd_boolean xcoff_reloc_type_rel  (XCOFF_RELOC_FUNCTION_ARGS);
+bfd_boolean xcoff_reloc_type_toc  (XCOFF_RELOC_FUNCTION_ARGS);
+bfd_boolean xcoff_reloc_type_ba   (XCOFF_RELOC_FUNCTION_ARGS);
+bfd_boolean xcoff_reloc_type_crel (XCOFF_RELOC_FUNCTION_ARGS);
+
+/* Structure to describe dwarf sections.
+   Useful to convert from XCOFF section name to flag and vice-versa.
+   Also mark if section has a length field at the beginning.  */
+struct xcoff_dwsect_name {
+  /* A XCOFF dwarf section is identified by its name.  */
+  unsigned int flag;
+
+  /* Corresponding XCOFF section name.  */
+  const char *name;
+
+  /* True if size must be prepended.  */
+  bfd_boolean def_size;
+};
+
+/* Number of entries in the array.  The number is known and public so that user
+   can 'extend' this array by index.  */
+#define XCOFF_DWSECT_NBR_NAMES	8
+
+/* The dwarf sections array.  */
+extern const struct xcoff_dwsect_name
+  xcoff_dwsect_names[XCOFF_DWSECT_NBR_NAMES];
+
+#endif /* LIBXCOFF_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/linker.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/linker.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/linker.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/linker.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3405 @@
+/* linker.c -- BFD linker routines
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Steve Chamberlain and Ian Lance Taylor, Cygnus Support
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "bfdlink.h"
+#include "genlink.h"
+
+/*
+SECTION
+	Linker Functions
+
+@cindex Linker
+	The linker uses three special entry points in the BFD target
+	vector.  It is not necessary to write special routines for
+	these entry points when creating a new BFD back end, since
+	generic versions are provided.  However, writing them can
+	speed up linking and make it use significantly less runtime
+	memory.
+
+	The first routine creates a hash table used by the other
+	routines.  The second routine adds the symbols from an object
+	file to the hash table.  The third routine takes all the
+	object files and links them together to create the output
+	file.  These routines are designed so that the linker proper
+	does not need to know anything about the symbols in the object
+	files that it is linking.  The linker merely arranges the
+	sections as directed by the linker script and lets BFD handle
+	the details of symbols and relocs.
+
+	The second routine and third routines are passed a pointer to
+	a <<struct bfd_link_info>> structure (defined in
+	<<bfdlink.h>>) which holds information relevant to the link,
+	including the linker hash table (which was created by the
+	first routine) and a set of callback functions to the linker
+	proper.
+
+	The generic linker routines are in <<linker.c>>, and use the
+	header file <<genlink.h>>.  As of this writing, the only back
+	ends which have implemented versions of these routines are
+	a.out (in <<aoutx.h>>) and ECOFF (in <<ecoff.c>>).  The a.out
+	routines are used as examples throughout this section.
+
+@menu
+@* Creating a Linker Hash Table::
+@* Adding Symbols to the Hash Table::
+@* Performing the Final Link::
+@end menu
+
+INODE
+Creating a Linker Hash Table, Adding Symbols to the Hash Table, Linker Functions, Linker Functions
+SUBSECTION
+	Creating a linker hash table
+
+@cindex _bfd_link_hash_table_create in target vector
+@cindex target vector (_bfd_link_hash_table_create)
+	The linker routines must create a hash table, which must be
+	derived from <<struct bfd_link_hash_table>> described in
+	<<bfdlink.c>>.  @xref{Hash Tables}, for information on how to
+	create a derived hash table.  This entry point is called using
+	the target vector of the linker output file.
+
+	The <<_bfd_link_hash_table_create>> entry point must allocate
+	and initialize an instance of the desired hash table.  If the
+	back end does not require any additional information to be
+	stored with the entries in the hash table, the entry point may
+	simply create a <<struct bfd_link_hash_table>>.  Most likely,
+	however, some additional information will be needed.
+
+	For example, with each entry in the hash table the a.out
+	linker keeps the index the symbol has in the final output file
+	(this index number is used so that when doing a relocatable
+	link the symbol index used in the output file can be quickly
+	filled in when copying over a reloc).  The a.out linker code
+	defines the required structures and functions for a hash table
+	derived from <<struct bfd_link_hash_table>>.  The a.out linker
+	hash table is created by the function
+	<<NAME(aout,link_hash_table_create)>>; it simply allocates
+	space for the hash table, initializes it, and returns a
+	pointer to it.
+
+	When writing the linker routines for a new back end, you will
+	generally not know exactly which fields will be required until
+	you have finished.  You should simply create a new hash table
+	which defines no additional fields, and then simply add fields
+	as they become necessary.
+
+INODE
+Adding Symbols to the Hash Table, Performing the Final Link, Creating a Linker Hash Table, Linker Functions
+SUBSECTION
+	Adding symbols to the hash table
+
+@cindex _bfd_link_add_symbols in target vector
+@cindex target vector (_bfd_link_add_symbols)
+	The linker proper will call the <<_bfd_link_add_symbols>>
+	entry point for each object file or archive which is to be
+	linked (typically these are the files named on the command
+	line, but some may also come from the linker script).  The
+	entry point is responsible for examining the file.  For an
+	object file, BFD must add any relevant symbol information to
+	the hash table.  For an archive, BFD must determine which
+	elements of the archive should be used and adding them to the
+	link.
+
+	The a.out version of this entry point is
+	<<NAME(aout,link_add_symbols)>>.
+
+@menu
+@* Differing file formats::
+@* Adding symbols from an object file::
+@* Adding symbols from an archive::
+@end menu
+
+INODE
+Differing file formats, Adding symbols from an object file, Adding Symbols to the Hash Table, Adding Symbols to the Hash Table
+SUBSUBSECTION
+	Differing file formats
+
+	Normally all the files involved in a link will be of the same
+	format, but it is also possible to link together different
+	format object files, and the back end must support that.  The
+	<<_bfd_link_add_symbols>> entry point is called via the target
+	vector of the file to be added.  This has an important
+	consequence: the function may not assume that the hash table
+	is the type created by the corresponding
+	<<_bfd_link_hash_table_create>> vector.  All the
+	<<_bfd_link_add_symbols>> function can assume about the hash
+	table is that it is derived from <<struct
+	bfd_link_hash_table>>.
+
+	Sometimes the <<_bfd_link_add_symbols>> function must store
+	some information in the hash table entry to be used by the
+	<<_bfd_final_link>> function.  In such a case the output bfd
+	xvec must be checked to make sure that the hash table was
+	created by an object file of the same format.
+
+	The <<_bfd_final_link>> routine must be prepared to handle a
+	hash entry without any extra information added by the
+	<<_bfd_link_add_symbols>> function.  A hash entry without
+	extra information will also occur when the linker script
+	directs the linker to create a symbol.  Note that, regardless
+	of how a hash table entry is added, all the fields will be
+	initialized to some sort of null value by the hash table entry
+	initialization function.
+
+	See <<ecoff_link_add_externals>> for an example of how to
+	check the output bfd before saving information (in this
+	case, the ECOFF external symbol debugging information) in a
+	hash table entry.
+
+INODE
+Adding symbols from an object file, Adding symbols from an archive, Differing file formats, Adding Symbols to the Hash Table
+SUBSUBSECTION
+	Adding symbols from an object file
+
+	When the <<_bfd_link_add_symbols>> routine is passed an object
+	file, it must add all externally visible symbols in that
+	object file to the hash table.  The actual work of adding the
+	symbol to the hash table is normally handled by the function
+	<<_bfd_generic_link_add_one_symbol>>.  The
+	<<_bfd_link_add_symbols>> routine is responsible for reading
+	all the symbols from the object file and passing the correct
+	information to <<_bfd_generic_link_add_one_symbol>>.
+
+	The <<_bfd_link_add_symbols>> routine should not use
+	<<bfd_canonicalize_symtab>> to read the symbols.  The point of
+	providing this routine is to avoid the overhead of converting
+	the symbols into generic <<asymbol>> structures.
+
+@findex _bfd_generic_link_add_one_symbol
+	<<_bfd_generic_link_add_one_symbol>> handles the details of
+	combining common symbols, warning about multiple definitions,
+	and so forth.  It takes arguments which describe the symbol to
+	add, notably symbol flags, a section, and an offset.  The
+	symbol flags include such things as <<BSF_WEAK>> or
+	<<BSF_INDIRECT>>.  The section is a section in the object
+	file, or something like <<bfd_und_section_ptr>> for an undefined
+	symbol or <<bfd_com_section_ptr>> for a common symbol.
+
+	If the <<_bfd_final_link>> routine is also going to need to
+	read the symbol information, the <<_bfd_link_add_symbols>>
+	routine should save it somewhere attached to the object file
+	BFD.  However, the information should only be saved if the
+	<<keep_memory>> field of the <<info>> argument is TRUE, so
+	that the <<-no-keep-memory>> linker switch is effective.
+
+	The a.out function which adds symbols from an object file is
+	<<aout_link_add_object_symbols>>, and most of the interesting
+	work is in <<aout_link_add_symbols>>.  The latter saves
+	pointers to the hash tables entries created by
+	<<_bfd_generic_link_add_one_symbol>> indexed by symbol number,
+	so that the <<_bfd_final_link>> routine does not have to call
+	the hash table lookup routine to locate the entry.
+
+INODE
+Adding symbols from an archive, , Adding symbols from an object file, Adding Symbols to the Hash Table
+SUBSUBSECTION
+	Adding symbols from an archive
+
+	When the <<_bfd_link_add_symbols>> routine is passed an
+	archive, it must look through the symbols defined by the
+	archive and decide which elements of the archive should be
+	included in the link.  For each such element it must call the
+	<<add_archive_element>> linker callback, and it must add the
+	symbols from the object file to the linker hash table.  (The
+	callback may in fact indicate that a replacement BFD should be
+	used, in which case the symbols from that BFD should be added
+	to the linker hash table instead.)
+
+@findex _bfd_generic_link_add_archive_symbols
+	In most cases the work of looking through the symbols in the
+	archive should be done by the
+	<<_bfd_generic_link_add_archive_symbols>> function.  This
+	function builds a hash table from the archive symbol table and
+	looks through the list of undefined symbols to see which
+	elements should be included.
+	<<_bfd_generic_link_add_archive_symbols>> is passed a function
+	to call to make the final decision about adding an archive
+	element to the link and to do the actual work of adding the
+	symbols to the linker hash table.
+
+	The function passed to
+	<<_bfd_generic_link_add_archive_symbols>> must read the
+	symbols of the archive element and decide whether the archive
+	element should be included in the link.  If the element is to
+	be included, the <<add_archive_element>> linker callback
+	routine must be called with the element as an argument, and
+	the element's symbols must be added to the linker hash table
+	just as though the element had itself been passed to the
+	<<_bfd_link_add_symbols>> function.  The <<add_archive_element>>
+	callback has the option to indicate that it would like to
+	replace the element archive with a substitute BFD, in which
+	case it is the symbols of that substitute BFD that must be
+	added to the linker hash table instead.
+
+	When the a.out <<_bfd_link_add_symbols>> function receives an
+	archive, it calls <<_bfd_generic_link_add_archive_symbols>>
+	passing <<aout_link_check_archive_element>> as the function
+	argument. <<aout_link_check_archive_element>> calls
+	<<aout_link_check_ar_symbols>>.  If the latter decides to add
+	the element (an element is only added if it provides a real,
+	non-common, definition for a previously undefined or common
+	symbol) it calls the <<add_archive_element>> callback and then
+	<<aout_link_check_archive_element>> calls
+	<<aout_link_add_symbols>> to actually add the symbols to the
+	linker hash table - possibly those of a substitute BFD, if the
+	<<add_archive_element>> callback avails itself of that option.
+
+	The ECOFF back end is unusual in that it does not normally
+	call <<_bfd_generic_link_add_archive_symbols>>, because ECOFF
+	archives already contain a hash table of symbols.  The ECOFF
+	back end searches the archive itself to avoid the overhead of
+	creating a new hash table.
+
+INODE
+Performing the Final Link, , Adding Symbols to the Hash Table, Linker Functions
+SUBSECTION
+	Performing the final link
+
+@cindex _bfd_link_final_link in target vector
+@cindex target vector (_bfd_final_link)
+	When all the input files have been processed, the linker calls
+	the <<_bfd_final_link>> entry point of the output BFD.  This
+	routine is responsible for producing the final output file,
+	which has several aspects.  It must relocate the contents of
+	the input sections and copy the data into the output sections.
+	It must build an output symbol table including any local
+	symbols from the input files and the global symbols from the
+	hash table.  When producing relocatable output, it must
+	modify the input relocs and write them into the output file.
+	There may also be object format dependent work to be done.
+
+	The linker will also call the <<write_object_contents>> entry
+	point when the BFD is closed.  The two entry points must work
+	together in order to produce the correct output file.
+
+	The details of how this works are inevitably dependent upon
+	the specific object file format.  The a.out
+	<<_bfd_final_link>> routine is <<NAME(aout,final_link)>>.
+
+@menu
+@* Information provided by the linker::
+@* Relocating the section contents::
+@* Writing the symbol table::
+@end menu
+
+INODE
+Information provided by the linker, Relocating the section contents, Performing the Final Link, Performing the Final Link
+SUBSUBSECTION
+	Information provided by the linker
+
+	Before the linker calls the <<_bfd_final_link>> entry point,
+	it sets up some data structures for the function to use.
+
+	The <<input_bfds>> field of the <<bfd_link_info>> structure
+	will point to a list of all the input files included in the
+	link.  These files are linked through the <<link_next>> field
+	of the <<bfd>> structure.
+
+	Each section in the output file will have a list of
+	<<link_order>> structures attached to the <<map_head.link_order>>
+	field (the <<link_order>> structure is defined in
+	<<bfdlink.h>>).  These structures describe how to create the
+	contents of the output section in terms of the contents of
+	various input sections, fill constants, and, eventually, other
+	types of information.  They also describe relocs that must be
+	created by the BFD backend, but do not correspond to any input
+	file; this is used to support -Ur, which builds constructors
+	while generating a relocatable object file.
+
+INODE
+Relocating the section contents, Writing the symbol table, Information provided by the linker, Performing the Final Link
+SUBSUBSECTION
+	Relocating the section contents
+
+	The <<_bfd_final_link>> function should look through the
+	<<link_order>> structures attached to each section of the
+	output file.  Each <<link_order>> structure should either be
+	handled specially, or it should be passed to the function
+	<<_bfd_default_link_order>> which will do the right thing
+	(<<_bfd_default_link_order>> is defined in <<linker.c>>).
+
+	For efficiency, a <<link_order>> of type
+	<<bfd_indirect_link_order>> whose associated section belongs
+	to a BFD of the same format as the output BFD must be handled
+	specially.  This type of <<link_order>> describes part of an
+	output section in terms of a section belonging to one of the
+	input files.  The <<_bfd_final_link>> function should read the
+	contents of the section and any associated relocs, apply the
+	relocs to the section contents, and write out the modified
+	section contents.  If performing a relocatable link, the
+	relocs themselves must also be modified and written out.
+
+@findex _bfd_relocate_contents
+@findex _bfd_final_link_relocate
+	The functions <<_bfd_relocate_contents>> and
+	<<_bfd_final_link_relocate>> provide some general support for
+	performing the actual relocations, notably overflow checking.
+	Their arguments include information about the symbol the
+	relocation is against and a <<reloc_howto_type>> argument
+	which describes the relocation to perform.  These functions
+	are defined in <<reloc.c>>.
+
+	The a.out function which handles reading, relocating, and
+	writing section contents is <<aout_link_input_section>>.  The
+	actual relocation is done in <<aout_link_input_section_std>>
+	and <<aout_link_input_section_ext>>.
+
+INODE
+Writing the symbol table, , Relocating the section contents, Performing the Final Link
+SUBSUBSECTION
+	Writing the symbol table
+
+	The <<_bfd_final_link>> function must gather all the symbols
+	in the input files and write them out.  It must also write out
+	all the symbols in the global hash table.  This must be
+	controlled by the <<strip>> and <<discard>> fields of the
+	<<bfd_link_info>> structure.
+
+	The local symbols of the input files will not have been
+	entered into the linker hash table.  The <<_bfd_final_link>>
+	routine must consider each input file and include the symbols
+	in the output file.  It may be convenient to do this when
+	looking through the <<link_order>> structures, or it may be
+	done by stepping through the <<input_bfds>> list.
+
+	The <<_bfd_final_link>> routine must also traverse the global
+	hash table to gather all the externally visible symbols.  It
+	is possible that most of the externally visible symbols may be
+	written out when considering the symbols of each input file,
+	but it is still necessary to traverse the hash table since the
+	linker script may have defined some symbols that are not in
+	any of the input files.
+
+	The <<strip>> field of the <<bfd_link_info>> structure
+	controls which symbols are written out.  The possible values
+	are listed in <<bfdlink.h>>.  If the value is <<strip_some>>,
+	then the <<keep_hash>> field of the <<bfd_link_info>>
+	structure is a hash table of symbols to keep; each symbol
+	should be looked up in this hash table, and only symbols which
+	are present should be included in the output file.
+
+	If the <<strip>> field of the <<bfd_link_info>> structure
+	permits local symbols to be written out, the <<discard>> field
+	is used to further controls which local symbols are included
+	in the output file.  If the value is <<discard_l>>, then all
+	local symbols which begin with a certain prefix are discarded;
+	this is controlled by the <<bfd_is_local_label_name>> entry point.
+
+	The a.out backend handles symbols by calling
+	<<aout_link_write_symbols>> on each input BFD and then
+	traversing the global hash table with the function
+	<<aout_link_write_other_symbol>>.  It builds a string table
+	while writing out the symbols, which is written to the output
+	file at the end of <<NAME(aout,final_link)>>.
+*/
+
+static bfd_boolean generic_link_add_object_symbols
+  (bfd *, struct bfd_link_info *, bfd_boolean collect);
+static bfd_boolean generic_link_add_symbols
+  (bfd *, struct bfd_link_info *, bfd_boolean);
+static bfd_boolean generic_link_check_archive_element_no_collect
+  (bfd *, struct bfd_link_info *, bfd_boolean *);
+static bfd_boolean generic_link_check_archive_element_collect
+  (bfd *, struct bfd_link_info *, bfd_boolean *);
+static bfd_boolean generic_link_check_archive_element
+  (bfd *, struct bfd_link_info *, bfd_boolean *, bfd_boolean);
+static bfd_boolean generic_link_add_symbol_list
+  (bfd *, struct bfd_link_info *, bfd_size_type count, asymbol **,
+   bfd_boolean);
+static bfd_boolean generic_add_output_symbol
+  (bfd *, size_t *psymalloc, asymbol *);
+static bfd_boolean default_data_link_order
+  (bfd *, struct bfd_link_info *, asection *, struct bfd_link_order *);
+static bfd_boolean default_indirect_link_order
+  (bfd *, struct bfd_link_info *, asection *, struct bfd_link_order *,
+   bfd_boolean);
+
+/* The link hash table structure is defined in bfdlink.h.  It provides
+   a base hash table which the backend specific hash tables are built
+   upon.  */
+
+/* Routine to create an entry in the link hash table.  */
+
+struct bfd_hash_entry *
+_bfd_link_hash_newfunc (struct bfd_hash_entry *entry,
+			struct bfd_hash_table *table,
+			const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = (struct bfd_hash_entry *)
+          bfd_hash_allocate (table, sizeof (struct bfd_link_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = bfd_hash_newfunc (entry, table, string);
+  if (entry)
+    {
+      struct bfd_link_hash_entry *h = (struct bfd_link_hash_entry *) entry;
+
+      /* Initialize the local fields.  */
+      memset ((char *) &h->root + sizeof (h->root), 0,
+	      sizeof (*h) - sizeof (h->root));
+    }
+
+  return entry;
+}
+
+/* Initialize a link hash table.  The BFD argument is the one
+   responsible for creating this table.  */
+
+bfd_boolean
+_bfd_link_hash_table_init
+  (struct bfd_link_hash_table *table,
+   bfd *abfd ATTRIBUTE_UNUSED,
+   struct bfd_hash_entry *(*newfunc) (struct bfd_hash_entry *,
+				      struct bfd_hash_table *,
+				      const char *),
+   unsigned int entsize)
+{
+  table->undefs = NULL;
+  table->undefs_tail = NULL;
+  table->type = bfd_link_generic_hash_table;
+
+  return bfd_hash_table_init (&table->table, newfunc, entsize);
+}
+
+/* Look up a symbol in a link hash table.  If follow is TRUE, we
+   follow bfd_link_hash_indirect and bfd_link_hash_warning links to
+   the real symbol.  */
+
+struct bfd_link_hash_entry *
+bfd_link_hash_lookup (struct bfd_link_hash_table *table,
+		      const char *string,
+		      bfd_boolean create,
+		      bfd_boolean copy,
+		      bfd_boolean follow)
+{
+  struct bfd_link_hash_entry *ret;
+
+  ret = ((struct bfd_link_hash_entry *)
+	 bfd_hash_lookup (&table->table, string, create, copy));
+
+  if (follow && ret != NULL)
+    {
+      while (ret->type == bfd_link_hash_indirect
+	     || ret->type == bfd_link_hash_warning)
+	ret = ret->u.i.link;
+    }
+
+  return ret;
+}
+
+/* Look up a symbol in the main linker hash table if the symbol might
+   be wrapped.  This should only be used for references to an
+   undefined symbol, not for definitions of a symbol.  */
+
+struct bfd_link_hash_entry *
+bfd_wrapped_link_hash_lookup (bfd *abfd,
+			      struct bfd_link_info *info,
+			      const char *string,
+			      bfd_boolean create,
+			      bfd_boolean copy,
+			      bfd_boolean follow)
+{
+  bfd_size_type amt;
+
+  if (info->wrap_hash != NULL)
+    {
+      const char *l;
+      char prefix = '\0';
+
+      l = string;
+      if (*l == bfd_get_symbol_leading_char (abfd) || *l == info->wrap_char)
+	{
+	  prefix = *l;
+	  ++l;
+	}
+
+#undef WRAP
+#define WRAP "__wrap_"
+
+      if (bfd_hash_lookup (info->wrap_hash, l, FALSE, FALSE) != NULL)
+	{
+	  char *n;
+	  struct bfd_link_hash_entry *h;
+
+	  /* This symbol is being wrapped.  We want to replace all
+             references to SYM with references to __wrap_SYM.  */
+
+	  amt = strlen (l) + sizeof WRAP + 1;
+	  n = (char *) bfd_malloc (amt);
+	  if (n == NULL)
+	    return NULL;
+
+	  n[0] = prefix;
+	  n[1] = '\0';
+	  strcat (n, WRAP);
+	  strcat (n, l);
+	  h = bfd_link_hash_lookup (info->hash, n, create, TRUE, follow);
+	  free (n);
+	  return h;
+	}
+
+#undef WRAP
+
+#undef  REAL
+#define REAL "__real_"
+
+      if (*l == '_'
+	  && CONST_STRNEQ (l, REAL)
+	  && bfd_hash_lookup (info->wrap_hash, l + sizeof REAL - 1,
+			      FALSE, FALSE) != NULL)
+	{
+	  char *n;
+	  struct bfd_link_hash_entry *h;
+
+	  /* This is a reference to __real_SYM, where SYM is being
+             wrapped.  We want to replace all references to __real_SYM
+             with references to SYM.  */
+
+	  amt = strlen (l + sizeof REAL - 1) + 2;
+	  n = (char *) bfd_malloc (amt);
+	  if (n == NULL)
+	    return NULL;
+
+	  n[0] = prefix;
+	  n[1] = '\0';
+	  strcat (n, l + sizeof REAL - 1);
+	  h = bfd_link_hash_lookup (info->hash, n, create, TRUE, follow);
+	  free (n);
+	  return h;
+	}
+
+#undef REAL
+    }
+
+  return bfd_link_hash_lookup (info->hash, string, create, copy, follow);
+}
+
+/* Traverse a generic link hash table.  Differs from bfd_hash_traverse
+   in the treatment of warning symbols.  When warning symbols are
+   created they replace the real symbol, so you don't get to see the
+   real symbol in a bfd_hash_travere.  This traversal calls func with
+   the real symbol.  */
+
+void
+bfd_link_hash_traverse
+  (struct bfd_link_hash_table *htab,
+   bfd_boolean (*func) (struct bfd_link_hash_entry *, void *),
+   void *info)
+{
+  unsigned int i;
+
+  htab->table.frozen = 1;
+  for (i = 0; i < htab->table.size; i++)
+    {
+      struct bfd_link_hash_entry *p;
+
+      p = (struct bfd_link_hash_entry *) htab->table.table[i];
+      for (; p != NULL; p = (struct bfd_link_hash_entry *) p->root.next)
+	if (!(*func) (p->type == bfd_link_hash_warning ? p->u.i.link : p, info))
+	  goto out;
+    }
+ out:
+  htab->table.frozen = 0;
+}
+
+/* Add a symbol to the linker hash table undefs list.  */
+
+void
+bfd_link_add_undef (struct bfd_link_hash_table *table,
+		    struct bfd_link_hash_entry *h)
+{
+  BFD_ASSERT (h->u.undef.next == NULL);
+  if (table->undefs_tail != NULL)
+    table->undefs_tail->u.undef.next = h;
+  if (table->undefs == NULL)
+    table->undefs = h;
+  table->undefs_tail = h;
+}
+
+/* The undefs list was designed so that in normal use we don't need to
+   remove entries.  However, if symbols on the list are changed from
+   bfd_link_hash_undefined to either bfd_link_hash_undefweak or
+   bfd_link_hash_new for some reason, then they must be removed from the
+   list.  Failure to do so might result in the linker attempting to add
+   the symbol to the list again at a later stage.  */
+
+void
+bfd_link_repair_undef_list (struct bfd_link_hash_table *table)
+{
+  struct bfd_link_hash_entry **pun;
+
+  pun = &table->undefs;
+  while (*pun != NULL)
+    {
+      struct bfd_link_hash_entry *h = *pun;
+
+      if (h->type == bfd_link_hash_new
+	  || h->type == bfd_link_hash_undefweak)
+	{
+	  *pun = h->u.undef.next;
+	  h->u.undef.next = NULL;
+	  if (h == table->undefs_tail)
+	    {
+	      if (pun == &table->undefs)
+		table->undefs_tail = NULL;
+	      else
+		/* pun points at an u.undef.next field.  Go back to
+		   the start of the link_hash_entry.  */
+		table->undefs_tail = (struct bfd_link_hash_entry *)
+		  ((char *) pun - ((char *) &h->u.undef.next - (char *) h));
+	      break;
+	    }
+	}
+      else
+	pun = &h->u.undef.next;
+    }
+}
+
+/* Routine to create an entry in a generic link hash table.  */
+
+struct bfd_hash_entry *
+_bfd_generic_link_hash_newfunc (struct bfd_hash_entry *entry,
+				struct bfd_hash_table *table,
+				const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = (struct bfd_hash_entry *)
+	bfd_hash_allocate (table, sizeof (struct generic_link_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = _bfd_link_hash_newfunc (entry, table, string);
+  if (entry)
+    {
+      struct generic_link_hash_entry *ret;
+
+      /* Set local fields.  */
+      ret = (struct generic_link_hash_entry *) entry;
+      ret->written = FALSE;
+      ret->sym = NULL;
+    }
+
+  return entry;
+}
+
+/* Create a generic link hash table.  */
+
+struct bfd_link_hash_table *
+_bfd_generic_link_hash_table_create (bfd *abfd)
+{
+  struct generic_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct generic_link_hash_table);
+
+  ret = (struct generic_link_hash_table *) bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+  if (! _bfd_link_hash_table_init (&ret->root, abfd,
+				   _bfd_generic_link_hash_newfunc,
+				   sizeof (struct generic_link_hash_entry)))
+    {
+      free (ret);
+      return NULL;
+    }
+  return &ret->root;
+}
+
+void
+_bfd_generic_link_hash_table_free (struct bfd_link_hash_table *hash)
+{
+  struct generic_link_hash_table *ret
+    = (struct generic_link_hash_table *) hash;
+
+  bfd_hash_table_free (&ret->root.table);
+  free (ret);
+}
+
+/* Grab the symbols for an object file when doing a generic link.  We
+   store the symbols in the outsymbols field.  We need to keep them
+   around for the entire link to ensure that we only read them once.
+   If we read them multiple times, we might wind up with relocs and
+   the hash table pointing to different instances of the symbol
+   structure.  */
+
+bfd_boolean
+bfd_generic_link_read_symbols (bfd *abfd)
+{
+  if (bfd_get_outsymbols (abfd) == NULL)
+    {
+      long symsize;
+      long symcount;
+
+      symsize = bfd_get_symtab_upper_bound (abfd);
+      if (symsize < 0)
+	return FALSE;
+      bfd_get_outsymbols (abfd) = (struct bfd_symbol **) bfd_alloc (abfd,
+                                                                    symsize);
+      if (bfd_get_outsymbols (abfd) == NULL && symsize != 0)
+	return FALSE;
+      symcount = bfd_canonicalize_symtab (abfd, bfd_get_outsymbols (abfd));
+      if (symcount < 0)
+	return FALSE;
+      bfd_get_symcount (abfd) = symcount;
+    }
+
+  return TRUE;
+}
+
+/* Generic function to add symbols to from an object file to the
+   global hash table.  This version does not automatically collect
+   constructors by name.  */
+
+bfd_boolean
+_bfd_generic_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  return generic_link_add_symbols (abfd, info, FALSE);
+}
+
+/* Generic function to add symbols from an object file to the global
+   hash table.  This version automatically collects constructors by
+   name, as the collect2 program does.  It should be used for any
+   target which does not provide some other mechanism for setting up
+   constructors and destructors; these are approximately those targets
+   for which gcc uses collect2 and do not support stabs.  */
+
+bfd_boolean
+_bfd_generic_link_add_symbols_collect (bfd *abfd, struct bfd_link_info *info)
+{
+  return generic_link_add_symbols (abfd, info, TRUE);
+}
+
+/* Indicate that we are only retrieving symbol values from this
+   section.  We want the symbols to act as though the values in the
+   file are absolute.  */
+
+void
+_bfd_generic_link_just_syms (asection *sec,
+			     struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  sec->output_section = bfd_abs_section_ptr;
+  sec->output_offset = sec->vma;
+}
+
+/* Copy the type of a symbol assiciated with a linker hast table entry.
+   Override this so that symbols created in linker scripts get their
+   type from the RHS of the assignment.
+   The default implementation does nothing.  */
+void
+_bfd_generic_copy_link_hash_symbol_type (bfd *abfd ATTRIBUTE_UNUSED,
+    struct bfd_link_hash_entry * hdest ATTRIBUTE_UNUSED,
+    struct bfd_link_hash_entry * hsrc ATTRIBUTE_UNUSED)
+{
+}
+
+/* Add symbols from an object file to the global hash table.  */
+
+static bfd_boolean
+generic_link_add_symbols (bfd *abfd,
+			  struct bfd_link_info *info,
+			  bfd_boolean collect)
+{
+  bfd_boolean ret;
+
+  switch (bfd_get_format (abfd))
+    {
+    case bfd_object:
+      ret = generic_link_add_object_symbols (abfd, info, collect);
+      break;
+    case bfd_archive:
+      ret = (_bfd_generic_link_add_archive_symbols
+	     (abfd, info,
+	      (collect
+	       ? generic_link_check_archive_element_collect
+	       : generic_link_check_archive_element_no_collect)));
+      break;
+    default:
+      bfd_set_error (bfd_error_wrong_format);
+      ret = FALSE;
+    }
+
+  return ret;
+}
+
+/* Add symbols from an object file to the global hash table.  */
+
+static bfd_boolean
+generic_link_add_object_symbols (bfd *abfd,
+				 struct bfd_link_info *info,
+				 bfd_boolean collect)
+{
+  bfd_size_type symcount;
+  struct bfd_symbol **outsyms;
+
+  if (!bfd_generic_link_read_symbols (abfd))
+    return FALSE;
+  symcount = _bfd_generic_link_get_symcount (abfd);
+  outsyms = _bfd_generic_link_get_symbols (abfd);
+  return generic_link_add_symbol_list (abfd, info, symcount, outsyms, collect);
+}
+
+/* We build a hash table of all symbols defined in an archive.  */
+
+/* An archive symbol may be defined by multiple archive elements.
+   This linked list is used to hold the elements.  */
+
+struct archive_list
+{
+  struct archive_list *next;
+  unsigned int indx;
+};
+
+/* An entry in an archive hash table.  */
+
+struct archive_hash_entry
+{
+  struct bfd_hash_entry root;
+  /* Where the symbol is defined.  */
+  struct archive_list *defs;
+};
+
+/* An archive hash table itself.  */
+
+struct archive_hash_table
+{
+  struct bfd_hash_table table;
+};
+
+/* Create a new entry for an archive hash table.  */
+
+static struct bfd_hash_entry *
+archive_hash_newfunc (struct bfd_hash_entry *entry,
+		      struct bfd_hash_table *table,
+		      const char *string)
+{
+  struct archive_hash_entry *ret = (struct archive_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = (struct archive_hash_entry *)
+        bfd_hash_allocate (table, sizeof (struct archive_hash_entry));
+  if (ret == NULL)
+    return NULL;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct archive_hash_entry *)
+	 bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
+
+  if (ret)
+    {
+      /* Initialize the local fields.  */
+      ret->defs = NULL;
+    }
+
+  return &ret->root;
+}
+
+/* Initialize an archive hash table.  */
+
+static bfd_boolean
+archive_hash_table_init
+  (struct archive_hash_table *table,
+   struct bfd_hash_entry *(*newfunc) (struct bfd_hash_entry *,
+				      struct bfd_hash_table *,
+				      const char *),
+   unsigned int entsize)
+{
+  return bfd_hash_table_init (&table->table, newfunc, entsize);
+}
+
+/* Look up an entry in an archive hash table.  */
+
+#define archive_hash_lookup(t, string, create, copy) \
+  ((struct archive_hash_entry *) \
+   bfd_hash_lookup (&(t)->table, (string), (create), (copy)))
+
+/* Allocate space in an archive hash table.  */
+
+#define archive_hash_allocate(t, size) bfd_hash_allocate (&(t)->table, (size))
+
+/* Free an archive hash table.  */
+
+#define archive_hash_table_free(t) bfd_hash_table_free (&(t)->table)
+
+/* Generic function to add symbols from an archive file to the global
+   hash file.  This function presumes that the archive symbol table
+   has already been read in (this is normally done by the
+   bfd_check_format entry point).  It looks through the undefined and
+   common symbols and searches the archive symbol table for them.  If
+   it finds an entry, it includes the associated object file in the
+   link.
+
+   The old linker looked through the archive symbol table for
+   undefined symbols.  We do it the other way around, looking through
+   undefined symbols for symbols defined in the archive.  The
+   advantage of the newer scheme is that we only have to look through
+   the list of undefined symbols once, whereas the old method had to
+   re-search the symbol table each time a new object file was added.
+
+   The CHECKFN argument is used to see if an object file should be
+   included.  CHECKFN should set *PNEEDED to TRUE if the object file
+   should be included, and must also call the bfd_link_info
+   add_archive_element callback function and handle adding the symbols
+   to the global hash table.  CHECKFN must notice if the callback
+   indicates a substitute BFD, and arrange to add those symbols instead
+   if it does so.  CHECKFN should only return FALSE if some sort of
+   error occurs.
+
+   For some formats, such as a.out, it is possible to look through an
+   object file but not actually include it in the link.  The
+   archive_pass field in a BFD is used to avoid checking the symbols
+   of an object files too many times.  When an object is included in
+   the link, archive_pass is set to -1.  If an object is scanned but
+   not included, archive_pass is set to the pass number.  The pass
+   number is incremented each time a new object file is included.  The
+   pass number is used because when a new object file is included it
+   may create new undefined symbols which cause a previously examined
+   object file to be included.  */
+
+bfd_boolean
+_bfd_generic_link_add_archive_symbols
+  (bfd *abfd,
+   struct bfd_link_info *info,
+   bfd_boolean (*checkfn) (bfd *, struct bfd_link_info *, bfd_boolean *))
+{
+  carsym *arsyms;
+  carsym *arsym_end;
+  register carsym *arsym;
+  int pass;
+  struct archive_hash_table arsym_hash;
+  unsigned int indx;
+  struct bfd_link_hash_entry **pundef;
+
+  if (! bfd_has_map (abfd))
+    {
+      /* An empty archive is a special case.  */
+      if (bfd_openr_next_archived_file (abfd, NULL) == NULL)
+	return TRUE;
+      bfd_set_error (bfd_error_no_armap);
+      return FALSE;
+    }
+
+  arsyms = bfd_ardata (abfd)->symdefs;
+  arsym_end = arsyms + bfd_ardata (abfd)->symdef_count;
+
+  /* In order to quickly determine whether an symbol is defined in
+     this archive, we build a hash table of the symbols.  */
+  if (! archive_hash_table_init (&arsym_hash, archive_hash_newfunc,
+				 sizeof (struct archive_hash_entry)))
+    return FALSE;
+  for (arsym = arsyms, indx = 0; arsym < arsym_end; arsym++, indx++)
+    {
+      struct archive_hash_entry *arh;
+      struct archive_list *l, **pp;
+
+      arh = archive_hash_lookup (&arsym_hash, arsym->name, TRUE, FALSE);
+      if (arh == NULL)
+	goto error_return;
+      l = ((struct archive_list *)
+	   archive_hash_allocate (&arsym_hash, sizeof (struct archive_list)));
+      if (l == NULL)
+	goto error_return;
+      l->indx = indx;
+      for (pp = &arh->defs; *pp != NULL; pp = &(*pp)->next)
+	;
+      *pp = l;
+      l->next = NULL;
+    }
+
+  /* The archive_pass field in the archive itself is used to
+     initialize PASS, sine we may search the same archive multiple
+     times.  */
+  pass = abfd->archive_pass + 1;
+
+  /* New undefined symbols are added to the end of the list, so we
+     only need to look through it once.  */
+  pundef = &info->hash->undefs;
+  while (*pundef != NULL)
+    {
+      struct bfd_link_hash_entry *h;
+      struct archive_hash_entry *arh;
+      struct archive_list *l;
+
+      h = *pundef;
+
+      /* When a symbol is defined, it is not necessarily removed from
+	 the list.  */
+      if (h->type != bfd_link_hash_undefined
+	  && h->type != bfd_link_hash_common)
+	{
+	  /* Remove this entry from the list, for general cleanliness
+	     and because we are going to look through the list again
+	     if we search any more libraries.  We can't remove the
+	     entry if it is the tail, because that would lose any
+	     entries we add to the list later on (it would also cause
+	     us to lose track of whether the symbol has been
+	     referenced).  */
+	  if (*pundef != info->hash->undefs_tail)
+	    *pundef = (*pundef)->u.undef.next;
+	  else
+	    pundef = &(*pundef)->u.undef.next;
+	  continue;
+	}
+
+      /* Look for this symbol in the archive symbol map.  */
+      arh = archive_hash_lookup (&arsym_hash, h->root.string, FALSE, FALSE);
+      if (arh == NULL)
+	{
+	  /* If we haven't found the exact symbol we're looking for,
+	     let's look for its import thunk */
+	  if (info->pei386_auto_import)
+	    {
+	      bfd_size_type amt = strlen (h->root.string) + 10;
+	      char *buf = (char *) bfd_malloc (amt);
+	      if (buf == NULL)
+		return FALSE;
+
+	      sprintf (buf, "__imp_%s", h->root.string);
+	      arh = archive_hash_lookup (&arsym_hash, buf, FALSE, FALSE);
+	      free(buf);
+	    }
+	  if (arh == NULL)
+	    {
+	      pundef = &(*pundef)->u.undef.next;
+	      continue;
+	    }
+	}
+      /* Look at all the objects which define this symbol.  */
+      for (l = arh->defs; l != NULL; l = l->next)
+	{
+	  bfd *element;
+	  bfd_boolean needed;
+
+	  /* If the symbol has gotten defined along the way, quit.  */
+	  if (h->type != bfd_link_hash_undefined
+	      && h->type != bfd_link_hash_common)
+	    break;
+
+	  element = bfd_get_elt_at_index (abfd, l->indx);
+	  if (element == NULL)
+	    goto error_return;
+
+	  /* If we've already included this element, or if we've
+	     already checked it on this pass, continue.  */
+	  if (element->archive_pass == -1
+	      || element->archive_pass == pass)
+	    continue;
+
+	  /* If we can't figure this element out, just ignore it.  */
+	  if (! bfd_check_format (element, bfd_object))
+	    {
+	      element->archive_pass = -1;
+	      continue;
+	    }
+
+	  /* CHECKFN will see if this element should be included, and
+	     go ahead and include it if appropriate.  */
+	  if (! (*checkfn) (element, info, &needed))
+	    goto error_return;
+
+	  if (! needed)
+	    element->archive_pass = pass;
+	  else
+	    {
+	      element->archive_pass = -1;
+
+	      /* Increment the pass count to show that we may need to
+		 recheck object files which were already checked.  */
+	      ++pass;
+	    }
+	}
+
+      pundef = &(*pundef)->u.undef.next;
+    }
+
+  archive_hash_table_free (&arsym_hash);
+
+  /* Save PASS in case we are called again.  */
+  abfd->archive_pass = pass;
+
+  return TRUE;
+
+ error_return:
+  archive_hash_table_free (&arsym_hash);
+  return FALSE;
+}
+
+/* See if we should include an archive element.  This version is used
+   when we do not want to automatically collect constructors based on
+   the symbol name, presumably because we have some other mechanism
+   for finding them.  */
+
+static bfd_boolean
+generic_link_check_archive_element_no_collect (
+					       bfd *abfd,
+					       struct bfd_link_info *info,
+					       bfd_boolean *pneeded)
+{
+  return generic_link_check_archive_element (abfd, info, pneeded, FALSE);
+}
+
+/* See if we should include an archive element.  This version is used
+   when we want to automatically collect constructors based on the
+   symbol name, as collect2 does.  */
+
+static bfd_boolean
+generic_link_check_archive_element_collect (bfd *abfd,
+					    struct bfd_link_info *info,
+					    bfd_boolean *pneeded)
+{
+  return generic_link_check_archive_element (abfd, info, pneeded, TRUE);
+}
+
+/* See if we should include an archive element.  Optionally collect
+   constructors.  */
+
+static bfd_boolean
+generic_link_check_archive_element (bfd *abfd,
+				    struct bfd_link_info *info,
+				    bfd_boolean *pneeded,
+				    bfd_boolean collect)
+{
+  asymbol **pp, **ppend;
+
+  *pneeded = FALSE;
+
+  if (!bfd_generic_link_read_symbols (abfd))
+    return FALSE;
+
+  pp = _bfd_generic_link_get_symbols (abfd);
+  ppend = pp + _bfd_generic_link_get_symcount (abfd);
+  for (; pp < ppend; pp++)
+    {
+      asymbol *p;
+      struct bfd_link_hash_entry *h;
+
+      p = *pp;
+
+      /* We are only interested in globally visible symbols.  */
+      if (! bfd_is_com_section (p->section)
+	  && (p->flags & (BSF_GLOBAL | BSF_INDIRECT | BSF_WEAK)) == 0)
+	continue;
+
+      /* We are only interested if we know something about this
+	 symbol, and it is undefined or common.  An undefined weak
+	 symbol (type bfd_link_hash_undefweak) is not considered to be
+	 a reference when pulling files out of an archive.  See the
+	 SVR4 ABI, p. 4-27.  */
+      h = bfd_link_hash_lookup (info->hash, bfd_asymbol_name (p), FALSE,
+				FALSE, TRUE);
+      if (h == NULL
+	  || (h->type != bfd_link_hash_undefined
+	      && h->type != bfd_link_hash_common))
+	continue;
+
+      /* P is a symbol we are looking for.  */
+
+      if (! bfd_is_com_section (p->section))
+	{
+	  bfd_size_type symcount;
+	  asymbol **symbols;
+	  bfd *oldbfd = abfd;
+
+	  /* This object file defines this symbol, so pull it in.  */
+	  if (!(*info->callbacks
+		->add_archive_element) (info, abfd, bfd_asymbol_name (p),
+					&abfd))
+	    return FALSE;
+	  /* Potentially, the add_archive_element hook may have set a
+	     substitute BFD for us.  */
+	  if (abfd != oldbfd
+	      && !bfd_generic_link_read_symbols (abfd))
+	    return FALSE;
+	  symcount = _bfd_generic_link_get_symcount (abfd);
+	  symbols = _bfd_generic_link_get_symbols (abfd);
+	  if (! generic_link_add_symbol_list (abfd, info, symcount,
+					      symbols, collect))
+	    return FALSE;
+	  *pneeded = TRUE;
+	  return TRUE;
+	}
+
+      /* P is a common symbol.  */
+
+      if (h->type == bfd_link_hash_undefined)
+	{
+	  bfd *symbfd;
+	  bfd_vma size;
+	  unsigned int power;
+
+	  symbfd = h->u.undef.abfd;
+	  if (symbfd == NULL)
+	    {
+	      /* This symbol was created as undefined from outside
+		 BFD.  We assume that we should link in the object
+		 file.  This is for the -u option in the linker.  */
+	      if (!(*info->callbacks
+		    ->add_archive_element) (info, abfd, bfd_asymbol_name (p),
+					    &abfd))
+		return FALSE;
+	      /* Potentially, the add_archive_element hook may have set a
+		 substitute BFD for us.  But no symbols are going to get
+		 registered by anything we're returning to from here.  */
+	      *pneeded = TRUE;
+	      return TRUE;
+	    }
+
+	  /* Turn the symbol into a common symbol but do not link in
+	     the object file.  This is how a.out works.  Object
+	     formats that require different semantics must implement
+	     this function differently.  This symbol is already on the
+	     undefs list.  We add the section to a common section
+	     attached to symbfd to ensure that it is in a BFD which
+	     will be linked in.  */
+	  h->type = bfd_link_hash_common;
+	  h->u.c.p = (struct bfd_link_hash_common_entry *)
+	    bfd_hash_allocate (&info->hash->table,
+			       sizeof (struct bfd_link_hash_common_entry));
+	  if (h->u.c.p == NULL)
+	    return FALSE;
+
+	  size = bfd_asymbol_value (p);
+	  h->u.c.size = size;
+
+	  power = bfd_log2 (size);
+	  if (power > 4)
+	    power = 4;
+	  h->u.c.p->alignment_power = power;
+
+	  if (p->section == bfd_com_section_ptr)
+	    h->u.c.p->section = bfd_make_section_old_way (symbfd, "COMMON");
+	  else
+	    h->u.c.p->section = bfd_make_section_old_way (symbfd,
+							  p->section->name);
+	  h->u.c.p->section->flags |= SEC_ALLOC;
+	}
+      else
+	{
+	  /* Adjust the size of the common symbol if necessary.  This
+	     is how a.out works.  Object formats that require
+	     different semantics must implement this function
+	     differently.  */
+	  if (bfd_asymbol_value (p) > h->u.c.size)
+	    h->u.c.size = bfd_asymbol_value (p);
+	}
+    }
+
+  /* This archive element is not needed.  */
+  return TRUE;
+}
+
+/* Add the symbols from an object file to the global hash table.  ABFD
+   is the object file.  INFO is the linker information.  SYMBOL_COUNT
+   is the number of symbols.  SYMBOLS is the list of symbols.  COLLECT
+   is TRUE if constructors should be automatically collected by name
+   as is done by collect2.  */
+
+static bfd_boolean
+generic_link_add_symbol_list (bfd *abfd,
+			      struct bfd_link_info *info,
+			      bfd_size_type symbol_count,
+			      asymbol **symbols,
+			      bfd_boolean collect)
+{
+  asymbol **pp, **ppend;
+
+  pp = symbols;
+  ppend = symbols + symbol_count;
+  for (; pp < ppend; pp++)
+    {
+      asymbol *p;
+
+      p = *pp;
+
+      if ((p->flags & (BSF_INDIRECT
+		       | BSF_WARNING
+		       | BSF_GLOBAL
+		       | BSF_CONSTRUCTOR
+		       | BSF_WEAK)) != 0
+	  || bfd_is_und_section (bfd_get_section (p))
+	  || bfd_is_com_section (bfd_get_section (p))
+	  || bfd_is_ind_section (bfd_get_section (p)))
+	{
+	  const char *name;
+	  const char *string;
+	  struct generic_link_hash_entry *h;
+	  struct bfd_link_hash_entry *bh;
+
+	  string = name = bfd_asymbol_name (p);
+	  if (((p->flags & BSF_INDIRECT) != 0
+	       || bfd_is_ind_section (p->section))
+	      && pp + 1 < ppend)
+	    {
+	      pp++;
+	      string = bfd_asymbol_name (*pp);
+	    }
+	  else if ((p->flags & BSF_WARNING) != 0
+		   && pp + 1 < ppend)
+	    {
+	      /* The name of P is actually the warning string, and the
+		 next symbol is the one to warn about.  */
+	      pp++;
+	      name = bfd_asymbol_name (*pp);
+	    }
+
+	  bh = NULL;
+	  if (! (_bfd_generic_link_add_one_symbol
+		 (info, abfd, name, p->flags, bfd_get_section (p),
+		  p->value, string, FALSE, collect, &bh)))
+	    return FALSE;
+	  h = (struct generic_link_hash_entry *) bh;
+
+	  /* If this is a constructor symbol, and the linker didn't do
+             anything with it, then we want to just pass the symbol
+             through to the output file.  This will happen when
+             linking with -r.  */
+	  if ((p->flags & BSF_CONSTRUCTOR) != 0
+	      && (h == NULL || h->root.type == bfd_link_hash_new))
+	    {
+	      p->udata.p = NULL;
+	      continue;
+	    }
+
+	  /* Save the BFD symbol so that we don't lose any backend
+	     specific information that may be attached to it.  We only
+	     want this one if it gives more information than the
+	     existing one; we don't want to replace a defined symbol
+	     with an undefined one.  This routine may be called with a
+	     hash table other than the generic hash table, so we only
+	     do this if we are certain that the hash table is a
+	     generic one.  */
+	  if (info->output_bfd->xvec == abfd->xvec)
+	    {
+	      if (h->sym == NULL
+		  || (! bfd_is_und_section (bfd_get_section (p))
+		      && (! bfd_is_com_section (bfd_get_section (p))
+			  || bfd_is_und_section (bfd_get_section (h->sym)))))
+		{
+		  h->sym = p;
+		  /* BSF_OLD_COMMON is a hack to support COFF reloc
+		     reading, and it should go away when the COFF
+		     linker is switched to the new version.  */
+		  if (bfd_is_com_section (bfd_get_section (p)))
+		    p->flags |= BSF_OLD_COMMON;
+		}
+	    }
+
+	  /* Store a back pointer from the symbol to the hash
+	     table entry for the benefit of relaxation code until
+	     it gets rewritten to not use asymbol structures.
+	     Setting this is also used to check whether these
+	     symbols were set up by the generic linker.  */
+	  p->udata.p = h;
+	}
+    }
+
+  return TRUE;
+}
+
+/* We use a state table to deal with adding symbols from an object
+   file.  The first index into the state table describes the symbol
+   from the object file.  The second index into the state table is the
+   type of the symbol in the hash table.  */
+
+/* The symbol from the object file is turned into one of these row
+   values.  */
+
+enum link_row
+{
+  UNDEF_ROW,		/* Undefined.  */
+  UNDEFW_ROW,		/* Weak undefined.  */
+  DEF_ROW,		/* Defined.  */
+  DEFW_ROW,		/* Weak defined.  */
+  COMMON_ROW,		/* Common.  */
+  INDR_ROW,		/* Indirect.  */
+  WARN_ROW,		/* Warning.  */
+  SET_ROW		/* Member of set.  */
+};
+
+/* apparently needed for Hitachi 3050R(HI-UX/WE2)? */
+#undef FAIL
+
+/* The actions to take in the state table.  */
+
+enum link_action
+{
+  FAIL,		/* Abort.  */
+  UND,		/* Mark symbol undefined.  */
+  WEAK,		/* Mark symbol weak undefined.  */
+  DEF,		/* Mark symbol defined.  */
+  DEFW,		/* Mark symbol weak defined.  */
+  COM,		/* Mark symbol common.  */
+  REF,		/* Mark defined symbol referenced.  */
+  CREF,		/* Possibly warn about common reference to defined symbol.  */
+  CDEF,		/* Define existing common symbol.  */
+  NOACT,	/* No action.  */
+  BIG,		/* Mark symbol common using largest size.  */
+  MDEF,		/* Multiple definition error.  */
+  MIND,		/* Multiple indirect symbols.  */
+  IND,		/* Make indirect symbol.  */
+  CIND,		/* Make indirect symbol from existing common symbol.  */
+  SET,		/* Add value to set.  */
+  MWARN,	/* Make warning symbol.  */
+  WARN,		/* Issue warning.  */
+  CWARN,	/* Warn if referenced, else MWARN.  */
+  CYCLE,	/* Repeat with symbol pointed to.  */
+  REFC,		/* Mark indirect symbol referenced and then CYCLE.  */
+  WARNC		/* Issue warning and then CYCLE.  */
+};
+
+/* The state table itself.  The first index is a link_row and the
+   second index is a bfd_link_hash_type.  */
+
+static const enum link_action link_action[8][8] =
+{
+  /* current\prev    new    undef  undefw def    defw   com    indr   warn  */
+  /* UNDEF_ROW 	*/  {UND,   NOACT, UND,   REF,   REF,   NOACT, REFC,  WARNC },
+  /* UNDEFW_ROW	*/  {WEAK,  NOACT, NOACT, REF,   REF,   NOACT, REFC,  WARNC },
+  /* DEF_ROW 	*/  {DEF,   DEF,   DEF,   MDEF,  DEF,   CDEF,  MDEF,  CYCLE },
+  /* DEFW_ROW 	*/  {DEFW,  DEFW,  DEFW,  NOACT, NOACT, NOACT, NOACT, CYCLE },
+  /* COMMON_ROW	*/  {COM,   COM,   COM,   CREF,  COM,   BIG,   REFC,  WARNC },
+  /* INDR_ROW	*/  {IND,   IND,   IND,   MDEF,  IND,   CIND,  MIND,  CYCLE },
+  /* WARN_ROW   */  {MWARN, WARN,  WARN,  CWARN, CWARN, WARN,  CWARN, NOACT },
+  /* SET_ROW	*/  {SET,   SET,   SET,   SET,   SET,   SET,   CYCLE, CYCLE }
+};
+
+/* Most of the entries in the LINK_ACTION table are straightforward,
+   but a few are somewhat subtle.
+
+   A reference to an indirect symbol (UNDEF_ROW/indr or
+   UNDEFW_ROW/indr) is counted as a reference both to the indirect
+   symbol and to the symbol the indirect symbol points to.
+
+   A reference to a warning symbol (UNDEF_ROW/warn or UNDEFW_ROW/warn)
+   causes the warning to be issued.
+
+   A common definition of an indirect symbol (COMMON_ROW/indr) is
+   treated as a multiple definition error.  Likewise for an indirect
+   definition of a common symbol (INDR_ROW/com).
+
+   An indirect definition of a warning (INDR_ROW/warn) does not cause
+   the warning to be issued.
+
+   If a warning is created for an indirect symbol (WARN_ROW/indr) no
+   warning is created for the symbol the indirect symbol points to.
+
+   Adding an entry to a set does not count as a reference to a set,
+   and no warning is issued (SET_ROW/warn).  */
+
+/* Return the BFD in which a hash entry has been defined, if known.  */
+
+static bfd *
+hash_entry_bfd (struct bfd_link_hash_entry *h)
+{
+  while (h->type == bfd_link_hash_warning)
+    h = h->u.i.link;
+  switch (h->type)
+    {
+    default:
+      return NULL;
+    case bfd_link_hash_undefined:
+    case bfd_link_hash_undefweak:
+      return h->u.undef.abfd;
+    case bfd_link_hash_defined:
+    case bfd_link_hash_defweak:
+      return h->u.def.section->owner;
+    case bfd_link_hash_common:
+      return h->u.c.p->section->owner;
+    }
+  /*NOTREACHED*/
+}
+
+/* Add a symbol to the global hash table.
+   ABFD is the BFD the symbol comes from.
+   NAME is the name of the symbol.
+   FLAGS is the BSF_* bits associated with the symbol.
+   SECTION is the section in which the symbol is defined; this may be
+     bfd_und_section_ptr or bfd_com_section_ptr.
+   VALUE is the value of the symbol, relative to the section.
+   STRING is used for either an indirect symbol, in which case it is
+     the name of the symbol to indirect to, or a warning symbol, in
+     which case it is the warning string.
+   COPY is TRUE if NAME or STRING must be copied into locally
+     allocated memory if they need to be saved.
+   COLLECT is TRUE if we should automatically collect gcc constructor
+     or destructor names as collect2 does.
+   HASHP, if not NULL, is a place to store the created hash table
+     entry; if *HASHP is not NULL, the caller has already looked up
+     the hash table entry, and stored it in *HASHP.  */
+
+bfd_boolean
+_bfd_generic_link_add_one_symbol (struct bfd_link_info *info,
+				  bfd *abfd,
+				  const char *name,
+				  flagword flags,
+				  asection *section,
+				  bfd_vma value,
+				  const char *string,
+				  bfd_boolean copy,
+				  bfd_boolean collect,
+				  struct bfd_link_hash_entry **hashp)
+{
+  enum link_row row;
+  struct bfd_link_hash_entry *h;
+  bfd_boolean cycle;
+
+  BFD_ASSERT (section != NULL);
+
+  if (bfd_is_ind_section (section)
+      || (flags & BSF_INDIRECT) != 0)
+    row = INDR_ROW;
+  else if ((flags & BSF_WARNING) != 0)
+    row = WARN_ROW;
+  else if ((flags & BSF_CONSTRUCTOR) != 0)
+    row = SET_ROW;
+  else if (bfd_is_und_section (section))
+    {
+      if ((flags & BSF_WEAK) != 0)
+	row = UNDEFW_ROW;
+      else
+	row = UNDEF_ROW;
+    }
+  else if ((flags & BSF_WEAK) != 0)
+    row = DEFW_ROW;
+  else if (bfd_is_com_section (section))
+    row = COMMON_ROW;
+  else
+    row = DEF_ROW;
+
+  if (hashp != NULL && *hashp != NULL)
+    h = *hashp;
+  else
+    {
+      if (row == UNDEF_ROW || row == UNDEFW_ROW)
+	h = bfd_wrapped_link_hash_lookup (abfd, info, name, TRUE, copy, FALSE);
+      else
+	h = bfd_link_hash_lookup (info->hash, name, TRUE, copy, FALSE);
+      if (h == NULL)
+	{
+	  if (hashp != NULL)
+	    *hashp = NULL;
+	  return FALSE;
+	}
+    }
+
+  if (info->notice_all
+      || (info->notice_hash != NULL
+	  && bfd_hash_lookup (info->notice_hash, name, FALSE, FALSE) != NULL))
+    {
+      if (! (*info->callbacks->notice) (info, h,
+					abfd, section, value, flags, string))
+	return FALSE;
+    }
+
+  if (hashp != NULL)
+    *hashp = h;
+
+  do
+    {
+      enum link_action action;
+
+      cycle = FALSE;
+      action = link_action[(int) row][(int) h->type];
+      switch (action)
+	{
+	case FAIL:
+	  abort ();
+
+	case NOACT:
+	  /* Do nothing.  */
+	  break;
+
+	case UND:
+	  /* Make a new undefined symbol.  */
+	  h->type = bfd_link_hash_undefined;
+	  h->u.undef.abfd = abfd;
+	  bfd_link_add_undef (info->hash, h);
+	  break;
+
+	case WEAK:
+	  /* Make a new weak undefined symbol.  */
+	  h->type = bfd_link_hash_undefweak;
+	  h->u.undef.abfd = abfd;
+	  break;
+
+	case CDEF:
+	  /* We have found a definition for a symbol which was
+	     previously common.  */
+	  BFD_ASSERT (h->type == bfd_link_hash_common);
+	  if (! ((*info->callbacks->multiple_common)
+		 (info, h, abfd, bfd_link_hash_defined, 0)))
+	    return FALSE;
+	  /* Fall through.  */
+	case DEF:
+	case DEFW:
+	  {
+	    enum bfd_link_hash_type oldtype;
+
+	    /* Define a symbol.  */
+	    oldtype = h->type;
+	    if (action == DEFW)
+	      h->type = bfd_link_hash_defweak;
+	    else
+	      h->type = bfd_link_hash_defined;
+	    h->u.def.section = section;
+	    h->u.def.value = value;
+
+	    /* If we have been asked to, we act like collect2 and
+	       identify all functions that might be global
+	       constructors and destructors and pass them up in a
+	       callback.  We only do this for certain object file
+	       types, since many object file types can handle this
+	       automatically.  */
+	    if (collect && name[0] == '_')
+	      {
+		const char *s;
+
+		/* A constructor or destructor name starts like this:
+		   _+GLOBAL_[_.$][ID][_.$] where the first [_.$] and
+		   the second are the same character (we accept any
+		   character there, in case a new object file format
+		   comes along with even worse naming restrictions).  */
+
+#define CONS_PREFIX "GLOBAL_"
+#define CONS_PREFIX_LEN (sizeof CONS_PREFIX - 1)
+
+		s = name + 1;
+		while (*s == '_')
+		  ++s;
+		if (s[0] == 'G' && CONST_STRNEQ (s, CONS_PREFIX))
+		  {
+		    char c;
+
+		    c = s[CONS_PREFIX_LEN + 1];
+		    if ((c == 'I' || c == 'D')
+			&& s[CONS_PREFIX_LEN] == s[CONS_PREFIX_LEN + 2])
+		      {
+			/* If this is a definition of a symbol which
+                           was previously weakly defined, we are in
+                           trouble.  We have already added a
+                           constructor entry for the weak defined
+                           symbol, and now we are trying to add one
+                           for the new symbol.  Fortunately, this case
+                           should never arise in practice.  */
+			if (oldtype == bfd_link_hash_defweak)
+			  abort ();
+
+			if (! ((*info->callbacks->constructor)
+			       (info, c == 'I',
+				h->root.string, abfd, section, value)))
+			  return FALSE;
+		      }
+		  }
+	      }
+	  }
+
+	  break;
+
+	case COM:
+	  /* We have found a common definition for a symbol.  */
+	  if (h->type == bfd_link_hash_new)
+	    bfd_link_add_undef (info->hash, h);
+	  h->type = bfd_link_hash_common;
+	  h->u.c.p = (struct bfd_link_hash_common_entry *)
+	    bfd_hash_allocate (&info->hash->table,
+			       sizeof (struct bfd_link_hash_common_entry));
+	  if (h->u.c.p == NULL)
+	    return FALSE;
+
+	  h->u.c.size = value;
+
+	  /* Select a default alignment based on the size.  This may
+             be overridden by the caller.  */
+	  {
+	    unsigned int power;
+
+	    power = bfd_log2 (value);
+	    if (power > 4)
+	      power = 4;
+	    h->u.c.p->alignment_power = power;
+	  }
+
+	  /* The section of a common symbol is only used if the common
+             symbol is actually allocated.  It basically provides a
+             hook for the linker script to decide which output section
+             the common symbols should be put in.  In most cases, the
+             section of a common symbol will be bfd_com_section_ptr,
+             the code here will choose a common symbol section named
+             "COMMON", and the linker script will contain *(COMMON) in
+             the appropriate place.  A few targets use separate common
+             sections for small symbols, and they require special
+             handling.  */
+	  if (section == bfd_com_section_ptr)
+	    {
+	      h->u.c.p->section = bfd_make_section_old_way (abfd, "COMMON");
+	      h->u.c.p->section->flags |= SEC_ALLOC;
+	    }
+	  else if (section->owner != abfd)
+	    {
+	      h->u.c.p->section = bfd_make_section_old_way (abfd,
+							    section->name);
+	      h->u.c.p->section->flags |= SEC_ALLOC;
+	    }
+	  else
+	    h->u.c.p->section = section;
+	  break;
+
+	case REF:
+	  /* A reference to a defined symbol.  */
+	  if (h->u.undef.next == NULL && info->hash->undefs_tail != h)
+	    h->u.undef.next = h;
+	  break;
+
+	case BIG:
+	  /* We have found a common definition for a symbol which
+	     already had a common definition.  Use the maximum of the
+	     two sizes, and use the section required by the larger symbol.  */
+	  BFD_ASSERT (h->type == bfd_link_hash_common);
+	  if (! ((*info->callbacks->multiple_common)
+		 (info, h, abfd, bfd_link_hash_common, value)))
+	    return FALSE;
+	  if (value > h->u.c.size)
+	    {
+	      unsigned int power;
+
+	      h->u.c.size = value;
+
+	      /* Select a default alignment based on the size.  This may
+		 be overridden by the caller.  */
+	      power = bfd_log2 (value);
+	      if (power > 4)
+		power = 4;
+	      h->u.c.p->alignment_power = power;
+
+	      /* Some systems have special treatment for small commons,
+		 hence we want to select the section used by the larger
+		 symbol.  This makes sure the symbol does not go in a
+		 small common section if it is now too large.  */
+	      if (section == bfd_com_section_ptr)
+		{
+		  h->u.c.p->section
+		    = bfd_make_section_old_way (abfd, "COMMON");
+		  h->u.c.p->section->flags |= SEC_ALLOC;
+		}
+	      else if (section->owner != abfd)
+		{
+		  h->u.c.p->section
+		    = bfd_make_section_old_way (abfd, section->name);
+		  h->u.c.p->section->flags |= SEC_ALLOC;
+		}
+	      else
+		h->u.c.p->section = section;
+	    }
+	  break;
+
+	case CREF:
+	  /* We have found a common definition for a symbol which
+	     was already defined.  */
+	  if (! ((*info->callbacks->multiple_common)
+		 (info, h, abfd, bfd_link_hash_common, value)))
+	    return FALSE;
+	  break;
+
+	case MIND:
+	  /* Multiple indirect symbols.  This is OK if they both point
+	     to the same symbol.  */
+	  if (strcmp (h->u.i.link->root.string, string) == 0)
+	    break;
+	  /* Fall through.  */
+	case MDEF:
+	  /* Handle a multiple definition.  */
+	  if (! ((*info->callbacks->multiple_definition)
+		 (info, h, abfd, section, value)))
+	    return FALSE;
+	  break;
+
+	case CIND:
+	  /* Create an indirect symbol from an existing common symbol.  */
+	  BFD_ASSERT (h->type == bfd_link_hash_common);
+	  if (! ((*info->callbacks->multiple_common)
+		 (info, h, abfd, bfd_link_hash_indirect, 0)))
+	    return FALSE;
+	  /* Fall through.  */
+	case IND:
+	  /* Create an indirect symbol.  */
+	  {
+	    struct bfd_link_hash_entry *inh;
+
+	    /* STRING is the name of the symbol we want to indirect
+	       to.  */
+	    inh = bfd_wrapped_link_hash_lookup (abfd, info, string, TRUE,
+						copy, FALSE);
+	    if (inh == NULL)
+	      return FALSE;
+	    if (inh->type == bfd_link_hash_indirect
+		&& inh->u.i.link == h)
+	      {
+		(*_bfd_error_handler)
+		  (_("%B: indirect symbol `%s' to `%s' is a loop"),
+		   abfd, name, string);
+		bfd_set_error (bfd_error_invalid_operation);
+		return FALSE;
+	      }
+	    if (inh->type == bfd_link_hash_new)
+	      {
+		inh->type = bfd_link_hash_undefined;
+		inh->u.undef.abfd = abfd;
+		bfd_link_add_undef (info->hash, inh);
+	      }
+
+	    /* If the indirect symbol has been referenced, we need to
+	       push the reference down to the symbol we are
+	       referencing.  */
+	    if (h->type != bfd_link_hash_new)
+	      {
+		row = UNDEF_ROW;
+		cycle = TRUE;
+	      }
+
+	    h->type = bfd_link_hash_indirect;
+	    h->u.i.link = inh;
+	  }
+	  break;
+
+	case SET:
+	  /* Add an entry to a set.  */
+	  if (! (*info->callbacks->add_to_set) (info, h, BFD_RELOC_CTOR,
+						abfd, section, value))
+	    return FALSE;
+	  break;
+
+	case WARNC:
+	  /* Issue a warning and cycle.  */
+	  if (h->u.i.warning != NULL)
+	    {
+	      if (! (*info->callbacks->warning) (info, h->u.i.warning,
+						 h->root.string, abfd,
+						 NULL, 0))
+		return FALSE;
+	      /* Only issue a warning once.  */
+	      h->u.i.warning = NULL;
+	    }
+	  /* Fall through.  */
+	case CYCLE:
+	  /* Try again with the referenced symbol.  */
+	  h = h->u.i.link;
+	  cycle = TRUE;
+	  break;
+
+	case REFC:
+	  /* A reference to an indirect symbol.  */
+	  if (h->u.undef.next == NULL && info->hash->undefs_tail != h)
+	    h->u.undef.next = h;
+	  h = h->u.i.link;
+	  cycle = TRUE;
+	  break;
+
+	case WARN:
+	  /* Issue a warning.  */
+	  if (! (*info->callbacks->warning) (info, string, h->root.string,
+					     hash_entry_bfd (h), NULL, 0))
+	    return FALSE;
+	  break;
+
+	case CWARN:
+	  /* Warn if this symbol has been referenced already,
+	     otherwise add a warning.  A symbol has been referenced if
+	     the u.undef.next field is not NULL, or it is the tail of the
+	     undefined symbol list.  The REF case above helps to
+	     ensure this.  */
+	  if (h->u.undef.next != NULL || info->hash->undefs_tail == h)
+	    {
+	      if (! (*info->callbacks->warning) (info, string, h->root.string,
+						 hash_entry_bfd (h), NULL, 0))
+		return FALSE;
+	      break;
+	    }
+	  /* Fall through.  */
+	case MWARN:
+	  /* Make a warning symbol.  */
+	  {
+	    struct bfd_link_hash_entry *sub;
+
+	    /* STRING is the warning to give.  */
+	    sub = ((struct bfd_link_hash_entry *)
+		   ((*info->hash->table.newfunc)
+		    (NULL, &info->hash->table, h->root.string)));
+	    if (sub == NULL)
+	      return FALSE;
+	    *sub = *h;
+	    sub->type = bfd_link_hash_warning;
+	    sub->u.i.link = h;
+	    if (! copy)
+	      sub->u.i.warning = string;
+	    else
+	      {
+		char *w;
+		size_t len = strlen (string) + 1;
+
+		w = (char *) bfd_hash_allocate (&info->hash->table, len);
+		if (w == NULL)
+		  return FALSE;
+		memcpy (w, string, len);
+		sub->u.i.warning = w;
+	      }
+
+	    bfd_hash_replace (&info->hash->table,
+			      (struct bfd_hash_entry *) h,
+			      (struct bfd_hash_entry *) sub);
+	    if (hashp != NULL)
+	      *hashp = sub;
+	  }
+	  break;
+	}
+    }
+  while (cycle);
+
+  return TRUE;
+}
+
+/* Generic final link routine.  */
+
+bfd_boolean
+_bfd_generic_final_link (bfd *abfd, struct bfd_link_info *info)
+{
+  bfd *sub;
+  asection *o;
+  struct bfd_link_order *p;
+  size_t outsymalloc;
+  struct generic_write_global_symbol_info wginfo;
+
+  bfd_get_outsymbols (abfd) = NULL;
+  bfd_get_symcount (abfd) = 0;
+  outsymalloc = 0;
+
+  /* Mark all sections which will be included in the output file.  */
+  for (o = abfd->sections; o != NULL; o = o->next)
+    for (p = o->map_head.link_order; p != NULL; p = p->next)
+      if (p->type == bfd_indirect_link_order)
+	p->u.indirect.section->linker_mark = TRUE;
+
+  /* Build the output symbol table.  */
+  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+    if (! _bfd_generic_link_output_symbols (abfd, sub, info, &outsymalloc))
+      return FALSE;
+
+  /* Accumulate the global symbols.  */
+  wginfo.info = info;
+  wginfo.output_bfd = abfd;
+  wginfo.psymalloc = &outsymalloc;
+  _bfd_generic_link_hash_traverse (_bfd_generic_hash_table (info),
+				   _bfd_generic_link_write_global_symbol,
+				   &wginfo);
+
+  /* Make sure we have a trailing NULL pointer on OUTSYMBOLS.  We
+     shouldn't really need one, since we have SYMCOUNT, but some old
+     code still expects one.  */
+  if (! generic_add_output_symbol (abfd, &outsymalloc, NULL))
+    return FALSE;
+
+  if (info->relocatable)
+    {
+      /* Allocate space for the output relocs for each section.  */
+      for (o = abfd->sections; o != NULL; o = o->next)
+	{
+	  o->reloc_count = 0;
+	  for (p = o->map_head.link_order; p != NULL; p = p->next)
+	    {
+	      if (p->type == bfd_section_reloc_link_order
+		  || p->type == bfd_symbol_reloc_link_order)
+		++o->reloc_count;
+	      else if (p->type == bfd_indirect_link_order)
+		{
+		  asection *input_section;
+		  bfd *input_bfd;
+		  long relsize;
+		  arelent **relocs;
+		  asymbol **symbols;
+		  long reloc_count;
+
+		  input_section = p->u.indirect.section;
+		  input_bfd = input_section->owner;
+		  relsize = bfd_get_reloc_upper_bound (input_bfd,
+						       input_section);
+		  if (relsize < 0)
+		    return FALSE;
+		  relocs = (arelent **) bfd_malloc (relsize);
+		  if (!relocs && relsize != 0)
+		    return FALSE;
+		  symbols = _bfd_generic_link_get_symbols (input_bfd);
+		  reloc_count = bfd_canonicalize_reloc (input_bfd,
+							input_section,
+							relocs,
+							symbols);
+		  free (relocs);
+		  if (reloc_count < 0)
+		    return FALSE;
+		  BFD_ASSERT ((unsigned long) reloc_count
+			      == input_section->reloc_count);
+		  o->reloc_count += reloc_count;
+		}
+	    }
+	  if (o->reloc_count > 0)
+	    {
+	      bfd_size_type amt;
+
+	      amt = o->reloc_count;
+	      amt *= sizeof (arelent *);
+	      o->orelocation = (struct reloc_cache_entry **) bfd_alloc (abfd, amt);
+	      if (!o->orelocation)
+		return FALSE;
+	      o->flags |= SEC_RELOC;
+	      /* Reset the count so that it can be used as an index
+		 when putting in the output relocs.  */
+	      o->reloc_count = 0;
+	    }
+	}
+    }
+
+  /* Handle all the link order information for the sections.  */
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      for (p = o->map_head.link_order; p != NULL; p = p->next)
+	{
+	  switch (p->type)
+	    {
+	    case bfd_section_reloc_link_order:
+	    case bfd_symbol_reloc_link_order:
+	      if (! _bfd_generic_reloc_link_order (abfd, info, o, p))
+		return FALSE;
+	      break;
+	    case bfd_indirect_link_order:
+	      if (! default_indirect_link_order (abfd, info, o, p, TRUE))
+		return FALSE;
+	      break;
+	    default:
+	      if (! _bfd_default_link_order (abfd, info, o, p))
+		return FALSE;
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Add an output symbol to the output BFD.  */
+
+static bfd_boolean
+generic_add_output_symbol (bfd *output_bfd, size_t *psymalloc, asymbol *sym)
+{
+  if (bfd_get_symcount (output_bfd) >= *psymalloc)
+    {
+      asymbol **newsyms;
+      bfd_size_type amt;
+
+      if (*psymalloc == 0)
+	*psymalloc = 124;
+      else
+	*psymalloc *= 2;
+      amt = *psymalloc;
+      amt *= sizeof (asymbol *);
+      newsyms = (asymbol **) bfd_realloc (bfd_get_outsymbols (output_bfd), amt);
+      if (newsyms == NULL)
+	return FALSE;
+      bfd_get_outsymbols (output_bfd) = newsyms;
+    }
+
+  bfd_get_outsymbols (output_bfd) [bfd_get_symcount (output_bfd)] = sym;
+  if (sym != NULL)
+    ++ bfd_get_symcount (output_bfd);
+
+  return TRUE;
+}
+
+/* Handle the symbols for an input BFD.  */
+
+bfd_boolean
+_bfd_generic_link_output_symbols (bfd *output_bfd,
+				  bfd *input_bfd,
+				  struct bfd_link_info *info,
+				  size_t *psymalloc)
+{
+  asymbol **sym_ptr;
+  asymbol **sym_end;
+
+  if (!bfd_generic_link_read_symbols (input_bfd))
+    return FALSE;
+
+  /* Create a filename symbol if we are supposed to.  */
+  if (info->create_object_symbols_section != NULL)
+    {
+      asection *sec;
+
+      for (sec = input_bfd->sections; sec != NULL; sec = sec->next)
+	{
+	  if (sec->output_section == info->create_object_symbols_section)
+	    {
+	      asymbol *newsym;
+
+	      newsym = bfd_make_empty_symbol (input_bfd);
+	      if (!newsym)
+		return FALSE;
+	      newsym->name = input_bfd->filename;
+	      newsym->value = 0;
+	      newsym->flags = BSF_LOCAL | BSF_FILE;
+	      newsym->section = sec;
+
+	      if (! generic_add_output_symbol (output_bfd, psymalloc,
+					       newsym))
+		return FALSE;
+
+	      break;
+	    }
+	}
+    }
+
+  /* Adjust the values of the globally visible symbols, and write out
+     local symbols.  */
+  sym_ptr = _bfd_generic_link_get_symbols (input_bfd);
+  sym_end = sym_ptr + _bfd_generic_link_get_symcount (input_bfd);
+  for (; sym_ptr < sym_end; sym_ptr++)
+    {
+      asymbol *sym;
+      struct generic_link_hash_entry *h;
+      bfd_boolean output;
+
+      h = NULL;
+      sym = *sym_ptr;
+      if ((sym->flags & (BSF_INDIRECT
+			 | BSF_WARNING
+			 | BSF_GLOBAL
+			 | BSF_CONSTRUCTOR
+			 | BSF_WEAK)) != 0
+	  || bfd_is_und_section (bfd_get_section (sym))
+	  || bfd_is_com_section (bfd_get_section (sym))
+	  || bfd_is_ind_section (bfd_get_section (sym)))
+	{
+	  if (sym->udata.p != NULL)
+	    h = (struct generic_link_hash_entry *) sym->udata.p;
+	  else if ((sym->flags & BSF_CONSTRUCTOR) != 0)
+	    {
+	      /* This case normally means that the main linker code
+                 deliberately ignored this constructor symbol.  We
+                 should just pass it through.  This will screw up if
+                 the constructor symbol is from a different,
+                 non-generic, object file format, but the case will
+                 only arise when linking with -r, which will probably
+                 fail anyhow, since there will be no way to represent
+                 the relocs in the output format being used.  */
+	      h = NULL;
+	    }
+	  else if (bfd_is_und_section (bfd_get_section (sym)))
+	    h = ((struct generic_link_hash_entry *)
+		 bfd_wrapped_link_hash_lookup (output_bfd, info,
+					       bfd_asymbol_name (sym),
+					       FALSE, FALSE, TRUE));
+	  else
+	    h = _bfd_generic_link_hash_lookup (_bfd_generic_hash_table (info),
+					       bfd_asymbol_name (sym),
+					       FALSE, FALSE, TRUE);
+
+	  if (h != NULL)
+	    {
+	      /* Force all references to this symbol to point to
+		 the same area in memory.  It is possible that
+		 this routine will be called with a hash table
+		 other than a generic hash table, so we double
+		 check that.  */
+	      if (info->output_bfd->xvec == input_bfd->xvec)
+		{
+		  if (h->sym != NULL)
+		    *sym_ptr = sym = h->sym;
+		}
+
+	      switch (h->root.type)
+		{
+		default:
+		case bfd_link_hash_new:
+		  abort ();
+		case bfd_link_hash_undefined:
+		  break;
+		case bfd_link_hash_undefweak:
+		  sym->flags |= BSF_WEAK;
+		  break;
+		case bfd_link_hash_indirect:
+		  h = (struct generic_link_hash_entry *) h->root.u.i.link;
+		  /* fall through */
+		case bfd_link_hash_defined:
+		  sym->flags |= BSF_GLOBAL;
+		  sym->flags &=~ BSF_CONSTRUCTOR;
+		  sym->value = h->root.u.def.value;
+		  sym->section = h->root.u.def.section;
+		  break;
+		case bfd_link_hash_defweak:
+		  sym->flags |= BSF_WEAK;
+		  sym->flags &=~ BSF_CONSTRUCTOR;
+		  sym->value = h->root.u.def.value;
+		  sym->section = h->root.u.def.section;
+		  break;
+		case bfd_link_hash_common:
+		  sym->value = h->root.u.c.size;
+		  sym->flags |= BSF_GLOBAL;
+		  if (! bfd_is_com_section (sym->section))
+		    {
+		      BFD_ASSERT (bfd_is_und_section (sym->section));
+		      sym->section = bfd_com_section_ptr;
+		    }
+		  /* We do not set the section of the symbol to
+		     h->root.u.c.p->section.  That value was saved so
+		     that we would know where to allocate the symbol
+		     if it was defined.  In this case the type is
+		     still bfd_link_hash_common, so we did not define
+		     it, so we do not want to use that section.  */
+		  break;
+		}
+	    }
+	}
+
+      /* This switch is straight from the old code in
+	 write_file_locals in ldsym.c.  */
+      if (info->strip == strip_all
+	  || (info->strip == strip_some
+	      && bfd_hash_lookup (info->keep_hash, bfd_asymbol_name (sym),
+				  FALSE, FALSE) == NULL))
+	output = FALSE;
+      else if ((sym->flags & (BSF_GLOBAL | BSF_WEAK)) != 0)
+	{
+	  /* If this symbol is marked as occurring now, rather
+	     than at the end, output it now.  This is used for
+	     COFF C_EXT FCN symbols.  FIXME: There must be a
+	     better way.  */
+	  if (bfd_asymbol_bfd (sym) == input_bfd
+	      && (sym->flags & BSF_NOT_AT_END) != 0)
+	    output = TRUE;
+	  else
+	    output = FALSE;
+	}
+      else if (bfd_is_ind_section (sym->section))
+	output = FALSE;
+      else if ((sym->flags & BSF_DEBUGGING) != 0)
+	{
+	  if (info->strip == strip_none)
+	    output = TRUE;
+	  else
+	    output = FALSE;
+	}
+      else if (bfd_is_und_section (sym->section)
+	       || bfd_is_com_section (sym->section))
+	output = FALSE;
+      else if ((sym->flags & BSF_LOCAL) != 0)
+	{
+	  if ((sym->flags & BSF_WARNING) != 0)
+	    output = FALSE;
+	  else
+	    {
+	      switch (info->discard)
+		{
+		default:
+		case discard_all:
+		  output = FALSE;
+		  break;
+		case discard_sec_merge:
+		  output = TRUE;
+		  if (info->relocatable
+		      || ! (sym->section->flags & SEC_MERGE))
+		    break;
+		  /* FALLTHROUGH */
+		case discard_l:
+		  if (bfd_is_local_label (input_bfd, sym))
+		    output = FALSE;
+		  else
+		    output = TRUE;
+		  break;
+		case discard_none:
+		  output = TRUE;
+		  break;
+		}
+	    }
+	}
+      else if ((sym->flags & BSF_CONSTRUCTOR))
+	{
+	  if (info->strip != strip_all)
+	    output = TRUE;
+	  else
+	    output = FALSE;
+	}
+      else
+	abort ();
+
+      /* If this symbol is in a section which is not being included
+	 in the output file, then we don't want to output the
+	 symbol.  */
+      if (!bfd_is_abs_section (sym->section)
+	  && bfd_section_removed_from_list (output_bfd,
+					    sym->section->output_section))
+	output = FALSE;
+
+      if (output)
+	{
+	  if (! generic_add_output_symbol (output_bfd, psymalloc, sym))
+	    return FALSE;
+	  if (h != NULL)
+	    h->written = TRUE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Set the section and value of a generic BFD symbol based on a linker
+   hash table entry.  */
+
+static void
+set_symbol_from_hash (asymbol *sym, struct bfd_link_hash_entry *h)
+{
+  switch (h->type)
+    {
+    default:
+      abort ();
+      break;
+    case bfd_link_hash_new:
+      /* This can happen when a constructor symbol is seen but we are
+         not building constructors.  */
+      if (sym->section != NULL)
+	{
+	  BFD_ASSERT ((sym->flags & BSF_CONSTRUCTOR) != 0);
+	}
+      else
+	{
+	  sym->flags |= BSF_CONSTRUCTOR;
+	  sym->section = bfd_abs_section_ptr;
+	  sym->value = 0;
+	}
+      break;
+    case bfd_link_hash_undefined:
+      sym->section = bfd_und_section_ptr;
+      sym->value = 0;
+      break;
+    case bfd_link_hash_undefweak:
+      sym->section = bfd_und_section_ptr;
+      sym->value = 0;
+      sym->flags |= BSF_WEAK;
+      break;
+    case bfd_link_hash_defined:
+      sym->section = h->u.def.section;
+      sym->value = h->u.def.value;
+      break;
+    case bfd_link_hash_defweak:
+      sym->flags |= BSF_WEAK;
+      sym->section = h->u.def.section;
+      sym->value = h->u.def.value;
+      break;
+    case bfd_link_hash_common:
+      sym->value = h->u.c.size;
+      if (sym->section == NULL)
+	sym->section = bfd_com_section_ptr;
+      else if (! bfd_is_com_section (sym->section))
+	{
+	  BFD_ASSERT (bfd_is_und_section (sym->section));
+	  sym->section = bfd_com_section_ptr;
+	}
+      /* Do not set the section; see _bfd_generic_link_output_symbols.  */
+      break;
+    case bfd_link_hash_indirect:
+    case bfd_link_hash_warning:
+      /* FIXME: What should we do here?  */
+      break;
+    }
+}
+
+/* Write out a global symbol, if it hasn't already been written out.
+   This is called for each symbol in the hash table.  */
+
+bfd_boolean
+_bfd_generic_link_write_global_symbol (struct generic_link_hash_entry *h,
+				       void *data)
+{
+  struct generic_write_global_symbol_info *wginfo =
+      (struct generic_write_global_symbol_info *) data;
+  asymbol *sym;
+
+  if (h->written)
+    return TRUE;
+
+  h->written = TRUE;
+
+  if (wginfo->info->strip == strip_all
+      || (wginfo->info->strip == strip_some
+	  && bfd_hash_lookup (wginfo->info->keep_hash, h->root.root.string,
+			      FALSE, FALSE) == NULL))
+    return TRUE;
+
+  if (h->sym != NULL)
+    sym = h->sym;
+  else
+    {
+      sym = bfd_make_empty_symbol (wginfo->output_bfd);
+      if (!sym)
+	return FALSE;
+      sym->name = h->root.root.string;
+      sym->flags = 0;
+    }
+
+  set_symbol_from_hash (sym, &h->root);
+
+  sym->flags |= BSF_GLOBAL;
+
+  if (! generic_add_output_symbol (wginfo->output_bfd, wginfo->psymalloc,
+				   sym))
+    {
+      /* FIXME: No way to return failure.  */
+      abort ();
+    }
+
+  return TRUE;
+}
+
+/* Create a relocation.  */
+
+bfd_boolean
+_bfd_generic_reloc_link_order (bfd *abfd,
+			       struct bfd_link_info *info,
+			       asection *sec,
+			       struct bfd_link_order *link_order)
+{
+  arelent *r;
+
+  if (! info->relocatable)
+    abort ();
+  if (sec->orelocation == NULL)
+    abort ();
+
+  r = (arelent *) bfd_alloc (abfd, sizeof (arelent));
+  if (r == NULL)
+    return FALSE;
+
+  r->address = link_order->offset;
+  r->howto = bfd_reloc_type_lookup (abfd, link_order->u.reloc.p->reloc);
+  if (r->howto == 0)
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  /* Get the symbol to use for the relocation.  */
+  if (link_order->type == bfd_section_reloc_link_order)
+    r->sym_ptr_ptr = link_order->u.reloc.p->u.section->symbol_ptr_ptr;
+  else
+    {
+      struct generic_link_hash_entry *h;
+
+      h = ((struct generic_link_hash_entry *)
+	   bfd_wrapped_link_hash_lookup (abfd, info,
+					 link_order->u.reloc.p->u.name,
+					 FALSE, FALSE, TRUE));
+      if (h == NULL
+	  || ! h->written)
+	{
+	  if (! ((*info->callbacks->unattached_reloc)
+		 (info, link_order->u.reloc.p->u.name, NULL, NULL, 0)))
+	    return FALSE;
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+      r->sym_ptr_ptr = &h->sym;
+    }
+
+  /* If this is an inplace reloc, write the addend to the object file.
+     Otherwise, store it in the reloc addend.  */
+  if (! r->howto->partial_inplace)
+    r->addend = link_order->u.reloc.p->addend;
+  else
+    {
+      bfd_size_type size;
+      bfd_reloc_status_type rstat;
+      bfd_byte *buf;
+      bfd_boolean ok;
+      file_ptr loc;
+
+      size = bfd_get_reloc_size (r->howto);
+      buf = (bfd_byte *) bfd_zmalloc (size);
+      if (buf == NULL)
+	return FALSE;
+      rstat = _bfd_relocate_contents (r->howto, abfd,
+				      (bfd_vma) link_order->u.reloc.p->addend,
+				      buf);
+      switch (rstat)
+	{
+	case bfd_reloc_ok:
+	  break;
+	default:
+	case bfd_reloc_outofrange:
+	  abort ();
+	case bfd_reloc_overflow:
+	  if (! ((*info->callbacks->reloc_overflow)
+		 (info, NULL,
+		  (link_order->type == bfd_section_reloc_link_order
+		   ? bfd_section_name (abfd, link_order->u.reloc.p->u.section)
+		   : link_order->u.reloc.p->u.name),
+		  r->howto->name, link_order->u.reloc.p->addend,
+		  NULL, NULL, 0)))
+	    {
+	      free (buf);
+	      return FALSE;
+	    }
+	  break;
+	}
+      loc = link_order->offset * bfd_octets_per_byte (abfd);
+      ok = bfd_set_section_contents (abfd, sec, buf, loc, size);
+      free (buf);
+      if (! ok)
+	return FALSE;
+
+      r->addend = 0;
+    }
+
+  sec->orelocation[sec->reloc_count] = r;
+  ++sec->reloc_count;
+
+  return TRUE;
+}
+
+/* Allocate a new link_order for a section.  */
+
+struct bfd_link_order *
+bfd_new_link_order (bfd *abfd, asection *section)
+{
+  bfd_size_type amt = sizeof (struct bfd_link_order);
+  struct bfd_link_order *new_lo;
+
+  new_lo = (struct bfd_link_order *) bfd_zalloc (abfd, amt);
+  if (!new_lo)
+    return NULL;
+
+  new_lo->type = bfd_undefined_link_order;
+
+  if (section->map_tail.link_order != NULL)
+    section->map_tail.link_order->next = new_lo;
+  else
+    section->map_head.link_order = new_lo;
+  section->map_tail.link_order = new_lo;
+
+  return new_lo;
+}
+
+/* Default link order processing routine.  Note that we can not handle
+   the reloc_link_order types here, since they depend upon the details
+   of how the particular backends generates relocs.  */
+
+bfd_boolean
+_bfd_default_link_order (bfd *abfd,
+			 struct bfd_link_info *info,
+			 asection *sec,
+			 struct bfd_link_order *link_order)
+{
+  switch (link_order->type)
+    {
+    case bfd_undefined_link_order:
+    case bfd_section_reloc_link_order:
+    case bfd_symbol_reloc_link_order:
+    default:
+      abort ();
+    case bfd_indirect_link_order:
+      return default_indirect_link_order (abfd, info, sec, link_order,
+					  FALSE);
+    case bfd_data_link_order:
+      return default_data_link_order (abfd, info, sec, link_order);
+    }
+}
+
+/* Default routine to handle a bfd_data_link_order.  */
+
+static bfd_boolean
+default_data_link_order (bfd *abfd,
+			 struct bfd_link_info *info ATTRIBUTE_UNUSED,
+			 asection *sec,
+			 struct bfd_link_order *link_order)
+{
+  bfd_size_type size;
+  size_t fill_size;
+  bfd_byte *fill;
+  file_ptr loc;
+  bfd_boolean result;
+
+  BFD_ASSERT ((sec->flags & SEC_HAS_CONTENTS) != 0);
+
+  size = link_order->size;
+  if (size == 0)
+    return TRUE;
+
+  fill = link_order->u.data.contents;
+  fill_size = link_order->u.data.size;
+  if (fill_size != 0 && fill_size < size)
+    {
+      bfd_byte *p;
+      fill = (bfd_byte *) bfd_malloc (size);
+      if (fill == NULL)
+	return FALSE;
+      p = fill;
+      if (fill_size == 1)
+	memset (p, (int) link_order->u.data.contents[0], (size_t) size);
+      else
+	{
+	  do
+	    {
+	      memcpy (p, link_order->u.data.contents, fill_size);
+	      p += fill_size;
+	      size -= fill_size;
+	    }
+	  while (size >= fill_size);
+	  if (size != 0)
+	    memcpy (p, link_order->u.data.contents, (size_t) size);
+	  size = link_order->size;
+	}
+    }
+
+  loc = link_order->offset * bfd_octets_per_byte (abfd);
+  result = bfd_set_section_contents (abfd, sec, fill, loc, size);
+
+  if (fill != link_order->u.data.contents)
+    free (fill);
+  return result;
+}
+
+/* Default routine to handle a bfd_indirect_link_order.  */
+
+static bfd_boolean
+default_indirect_link_order (bfd *output_bfd,
+			     struct bfd_link_info *info,
+			     asection *output_section,
+			     struct bfd_link_order *link_order,
+			     bfd_boolean generic_linker)
+{
+  asection *input_section;
+  bfd *input_bfd;
+  bfd_byte *contents = NULL;
+  bfd_byte *new_contents;
+  bfd_size_type sec_size;
+  file_ptr loc;
+
+  BFD_ASSERT ((output_section->flags & SEC_HAS_CONTENTS) != 0);
+
+  input_section = link_order->u.indirect.section;
+  input_bfd = input_section->owner;
+  if (input_section->size == 0)
+    return TRUE;
+
+  BFD_ASSERT (input_section->output_section == output_section);
+  BFD_ASSERT (input_section->output_offset == link_order->offset);
+  BFD_ASSERT (input_section->size == link_order->size);
+
+  if (info->relocatable
+      && input_section->reloc_count > 0
+      && output_section->orelocation == NULL)
+    {
+      /* Space has not been allocated for the output relocations.
+	 This can happen when we are called by a specific backend
+	 because somebody is attempting to link together different
+	 types of object files.  Handling this case correctly is
+	 difficult, and sometimes impossible.  */
+      (*_bfd_error_handler)
+	(_("Attempt to do relocatable link with %s input and %s output"),
+	 bfd_get_target (input_bfd), bfd_get_target (output_bfd));
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+
+  if (! generic_linker)
+    {
+      asymbol **sympp;
+      asymbol **symppend;
+
+      /* Get the canonical symbols.  The generic linker will always
+	 have retrieved them by this point, but we are being called by
+	 a specific linker, presumably because we are linking
+	 different types of object files together.  */
+      if (!bfd_generic_link_read_symbols (input_bfd))
+	return FALSE;
+
+      /* Since we have been called by a specific linker, rather than
+	 the generic linker, the values of the symbols will not be
+	 right.  They will be the values as seen in the input file,
+	 not the values of the final link.  We need to fix them up
+	 before we can relocate the section.  */
+      sympp = _bfd_generic_link_get_symbols (input_bfd);
+      symppend = sympp + _bfd_generic_link_get_symcount (input_bfd);
+      for (; sympp < symppend; sympp++)
+	{
+	  asymbol *sym;
+	  struct bfd_link_hash_entry *h;
+
+	  sym = *sympp;
+
+	  if ((sym->flags & (BSF_INDIRECT
+			     | BSF_WARNING
+			     | BSF_GLOBAL
+			     | BSF_CONSTRUCTOR
+			     | BSF_WEAK)) != 0
+	      || bfd_is_und_section (bfd_get_section (sym))
+	      || bfd_is_com_section (bfd_get_section (sym))
+	      || bfd_is_ind_section (bfd_get_section (sym)))
+	    {
+	      /* sym->udata may have been set by
+		 generic_link_add_symbol_list.  */
+	      if (sym->udata.p != NULL)
+		h = (struct bfd_link_hash_entry *) sym->udata.p;
+	      else if (bfd_is_und_section (bfd_get_section (sym)))
+		h = bfd_wrapped_link_hash_lookup (output_bfd, info,
+						  bfd_asymbol_name (sym),
+						  FALSE, FALSE, TRUE);
+	      else
+		h = bfd_link_hash_lookup (info->hash,
+					  bfd_asymbol_name (sym),
+					  FALSE, FALSE, TRUE);
+	      if (h != NULL)
+		set_symbol_from_hash (sym, h);
+	    }
+	}
+    }
+
+  if ((output_section->flags & (SEC_GROUP | SEC_LINKER_CREATED)) == SEC_GROUP
+      && input_section->size != 0)
+    {
+      /* Group section contents are set by bfd_elf_set_group_contents.  */
+      if (!output_bfd->output_has_begun)
+	{
+	  /* FIXME: This hack ensures bfd_elf_set_group_contents is called.  */
+	  if (!bfd_set_section_contents (output_bfd, output_section, "", 0, 1))
+	    goto error_return;
+	}
+      new_contents = output_section->contents;
+      BFD_ASSERT (new_contents != NULL);
+      BFD_ASSERT (input_section->output_offset == 0);
+    }
+  else
+    {
+      /* Get and relocate the section contents.  */
+      sec_size = (input_section->rawsize > input_section->size
+		  ? input_section->rawsize
+		  : input_section->size);
+      contents = (bfd_byte *) bfd_malloc (sec_size);
+      if (contents == NULL && sec_size != 0)
+	goto error_return;
+      new_contents = (bfd_get_relocated_section_contents
+		      (output_bfd, info, link_order, contents,
+		       info->relocatable,
+		       _bfd_generic_link_get_symbols (input_bfd)));
+      if (!new_contents)
+	goto error_return;
+    }
+
+  /* Output the section contents.  */
+  loc = input_section->output_offset * bfd_octets_per_byte (output_bfd);
+  if (! bfd_set_section_contents (output_bfd, output_section,
+				  new_contents, loc, input_section->size))
+    goto error_return;
+
+  if (contents != NULL)
+    free (contents);
+  return TRUE;
+
+ error_return:
+  if (contents != NULL)
+    free (contents);
+  return FALSE;
+}
+
+/* A little routine to count the number of relocs in a link_order
+   list.  */
+
+unsigned int
+_bfd_count_link_order_relocs (struct bfd_link_order *link_order)
+{
+  register unsigned int c;
+  register struct bfd_link_order *l;
+
+  c = 0;
+  for (l = link_order; l != NULL; l = l->next)
+    {
+      if (l->type == bfd_section_reloc_link_order
+	  || l->type == bfd_symbol_reloc_link_order)
+	++c;
+    }
+
+  return c;
+}
+
+/*
+FUNCTION
+	bfd_link_split_section
+
+SYNOPSIS
+        bfd_boolean bfd_link_split_section (bfd *abfd, asection *sec);
+
+DESCRIPTION
+	Return nonzero if @var{sec} should be split during a
+	reloceatable or final link.
+
+.#define bfd_link_split_section(abfd, sec) \
+.       BFD_SEND (abfd, _bfd_link_split_section, (abfd, sec))
+.
+
+*/
+
+bfd_boolean
+_bfd_generic_link_split_section (bfd *abfd ATTRIBUTE_UNUSED,
+				 asection *sec ATTRIBUTE_UNUSED)
+{
+  return FALSE;
+}
+
+/*
+FUNCTION
+	bfd_section_already_linked
+
+SYNOPSIS
+        bfd_boolean bfd_section_already_linked (bfd *abfd,
+						asection *sec,
+						struct bfd_link_info *info);
+
+DESCRIPTION
+	Check if @var{data} has been already linked during a reloceatable
+	or final link.  Return TRUE if it has.
+
+.#define bfd_section_already_linked(abfd, sec, info) \
+.       BFD_SEND (abfd, _section_already_linked, (abfd, sec, info))
+.
+
+*/
+
+/* Sections marked with the SEC_LINK_ONCE flag should only be linked
+   once into the output.  This routine checks each section, and
+   arrange to discard it if a section of the same name has already
+   been linked.  This code assumes that all relevant sections have the 
+   SEC_LINK_ONCE flag set; that is, it does not depend solely upon the
+   section name.  bfd_section_already_linked is called via
+   bfd_map_over_sections.  */
+
+/* The hash table.  */
+
+static struct bfd_hash_table _bfd_section_already_linked_table;
+
+/* Support routines for the hash table used by section_already_linked,
+   initialize the table, traverse, lookup, fill in an entry and remove
+   the table.  */
+
+void
+bfd_section_already_linked_table_traverse
+  (bfd_boolean (*func) (struct bfd_section_already_linked_hash_entry *,
+			void *), void *info)
+{
+  bfd_hash_traverse (&_bfd_section_already_linked_table,
+		     (bfd_boolean (*) (struct bfd_hash_entry *,
+				       void *)) func,
+		     info);
+}
+
+struct bfd_section_already_linked_hash_entry *
+bfd_section_already_linked_table_lookup (const char *name)
+{
+  return ((struct bfd_section_already_linked_hash_entry *)
+	  bfd_hash_lookup (&_bfd_section_already_linked_table, name,
+			   TRUE, FALSE));
+}
+
+bfd_boolean
+bfd_section_already_linked_table_insert
+  (struct bfd_section_already_linked_hash_entry *already_linked_list,
+   asection *sec)
+{
+  struct bfd_section_already_linked *l;
+
+  /* Allocate the memory from the same obstack as the hash table is
+     kept in.  */
+  l = (struct bfd_section_already_linked *)
+      bfd_hash_allocate (&_bfd_section_already_linked_table, sizeof *l);
+  if (l == NULL)
+    return FALSE;
+  l->sec = sec;
+  l->next = already_linked_list->entry;
+  already_linked_list->entry = l;
+  return TRUE;
+}
+
+static struct bfd_hash_entry *
+already_linked_newfunc (struct bfd_hash_entry *entry ATTRIBUTE_UNUSED,
+			struct bfd_hash_table *table,
+			const char *string ATTRIBUTE_UNUSED)
+{
+  struct bfd_section_already_linked_hash_entry *ret =
+    (struct bfd_section_already_linked_hash_entry *)
+      bfd_hash_allocate (table, sizeof *ret);
+
+  if (ret == NULL)
+    return NULL;
+
+  ret->entry = NULL;
+
+  return &ret->root;
+}
+
+bfd_boolean
+bfd_section_already_linked_table_init (void)
+{
+  return bfd_hash_table_init_n (&_bfd_section_already_linked_table,
+				already_linked_newfunc,
+				sizeof (struct bfd_section_already_linked_hash_entry),
+				42);
+}
+
+void
+bfd_section_already_linked_table_free (void)
+{
+  bfd_hash_table_free (&_bfd_section_already_linked_table);
+}
+
+/* Report warnings as appropriate for duplicate section SEC.
+   Return FALSE if we decide to keep SEC after all.  */
+
+bfd_boolean
+_bfd_handle_already_linked (asection *sec,
+			    struct bfd_section_already_linked *l,
+			    struct bfd_link_info *info)
+{
+  switch (sec->flags & SEC_LINK_DUPLICATES)
+    {
+    default:
+      abort ();
+
+    case SEC_LINK_DUPLICATES_DISCARD:
+      /* If we found an LTO IR match for this comdat group on
+	 the first pass, replace it with the LTO output on the
+	 second pass.  We can't simply choose real object
+	 files over IR because the first pass may contain a
+	 mix of LTO and normal objects and we must keep the
+	 first match, be it IR or real.  */
+      if (info->loading_lto_outputs
+	  && (l->sec->owner->flags & BFD_PLUGIN) != 0)
+	{
+	  l->sec = sec;
+	  return FALSE;
+	}
+      break;
+
+    case SEC_LINK_DUPLICATES_ONE_ONLY:
+      info->callbacks->einfo
+	(_("%B: ignoring duplicate section `%A'\n"),
+	 sec->owner, sec);
+      break;
+
+    case SEC_LINK_DUPLICATES_SAME_SIZE:
+      if ((l->sec->owner->flags & BFD_PLUGIN) != 0)
+	;
+      else if (sec->size != l->sec->size)
+	info->callbacks->einfo
+	  (_("%B: duplicate section `%A' has different size\n"),
+	   sec->owner, sec);
+      break;
+
+    case SEC_LINK_DUPLICATES_SAME_CONTENTS:
+      if ((l->sec->owner->flags & BFD_PLUGIN) != 0)
+	;
+      else if (sec->size != l->sec->size)
+	info->callbacks->einfo
+	  (_("%B: duplicate section `%A' has different size\n"),
+	   sec->owner, sec);
+      else if (sec->size != 0)
+	{
+	  bfd_byte *sec_contents, *l_sec_contents = NULL;
+
+	  if (!bfd_malloc_and_get_section (sec->owner, sec, &sec_contents))
+	    info->callbacks->einfo
+	      (_("%B: could not read contents of section `%A'\n"),
+	       sec->owner, sec);
+	  else if (!bfd_malloc_and_get_section (l->sec->owner, l->sec,
+						&l_sec_contents))
+	    info->callbacks->einfo
+	      (_("%B: could not read contents of section `%A'\n"),
+	       l->sec->owner, l->sec);
+	  else if (memcmp (sec_contents, l_sec_contents, sec->size) != 0)
+	    info->callbacks->einfo
+	      (_("%B: duplicate section `%A' has different contents\n"),
+	       sec->owner, sec);
+
+	  if (sec_contents)
+	    free (sec_contents);
+	  if (l_sec_contents)
+	    free (l_sec_contents);
+	}
+      break;
+    }
+
+  /* Set the output_section field so that lang_add_section
+     does not create a lang_input_section structure for this
+     section.  Since there might be a symbol in the section
+     being discarded, we must retain a pointer to the section
+     which we are really going to use.  */
+  sec->output_section = bfd_abs_section_ptr;
+  sec->kept_section = l->sec;
+  return TRUE;
+}
+
+/* This is used on non-ELF inputs.  */
+
+bfd_boolean
+_bfd_generic_section_already_linked (bfd *abfd ATTRIBUTE_UNUSED,
+				     asection *sec,
+				     struct bfd_link_info *info)
+{
+  const char *name;
+  struct bfd_section_already_linked *l;
+  struct bfd_section_already_linked_hash_entry *already_linked_list;
+
+  if ((sec->flags & SEC_LINK_ONCE) == 0)
+    return FALSE;
+
+  /* The generic linker doesn't handle section groups.  */
+  if ((sec->flags & SEC_GROUP) != 0)
+    return FALSE;
+
+  /* FIXME: When doing a relocatable link, we may have trouble
+     copying relocations in other sections that refer to local symbols
+     in the section being discarded.  Those relocations will have to
+     be converted somehow; as of this writing I'm not sure that any of
+     the backends handle that correctly.
+
+     It is tempting to instead not discard link once sections when
+     doing a relocatable link (technically, they should be discarded
+     whenever we are building constructors).  However, that fails,
+     because the linker winds up combining all the link once sections
+     into a single large link once section, which defeats the purpose
+     of having link once sections in the first place.  */
+
+  name = bfd_get_section_name (abfd, sec);
+
+  already_linked_list = bfd_section_already_linked_table_lookup (name);
+
+  l = already_linked_list->entry;
+  if (l != NULL)
+    {
+      /* The section has already been linked.  See if we should
+	 issue a warning.  */
+      return _bfd_handle_already_linked (sec, l, info);
+    }
+
+  /* This is the first section with this name.  Record it.  */
+  if (!bfd_section_already_linked_table_insert (already_linked_list, sec))
+    info->callbacks->einfo (_("%F%P: already_linked_table: %E\n"));
+  return FALSE;
+}
+
+/* Convert symbols in excluded output sections to use a kept section.  */
+
+static bfd_boolean
+fix_syms (struct bfd_link_hash_entry *h, void *data)
+{
+  bfd *obfd = (bfd *) data;
+
+  if (h->type == bfd_link_hash_defined
+      || h->type == bfd_link_hash_defweak)
+    {
+      asection *s = h->u.def.section;
+      if (s != NULL
+	  && s->output_section != NULL
+	  && (s->output_section->flags & SEC_EXCLUDE) != 0
+	  && bfd_section_removed_from_list (obfd, s->output_section))
+	{
+	  asection *op, *op1;
+
+	  h->u.def.value += s->output_offset + s->output_section->vma;
+
+	  /* Find preceding kept section.  */
+	  for (op1 = s->output_section->prev; op1 != NULL; op1 = op1->prev)
+	    if ((op1->flags & SEC_EXCLUDE) == 0
+		&& !bfd_section_removed_from_list (obfd, op1))
+	      break;
+
+	  /* Find following kept section.  Start at prev->next because
+	     other sections may have been added after S was removed.  */
+	  if (s->output_section->prev != NULL)
+	    op = s->output_section->prev->next;
+	  else
+	    op = s->output_section->owner->sections;
+	  for (; op != NULL; op = op->next)
+	    if ((op->flags & SEC_EXCLUDE) == 0
+		&& !bfd_section_removed_from_list (obfd, op))
+	      break;
+
+	  /* Choose better of two sections, based on flags.  The idea
+	     is to choose a section that will be in the same segment
+	     as S would have been if it was kept.  */
+	  if (op1 == NULL)
+	    {
+	      if (op == NULL)
+		op = bfd_abs_section_ptr;
+	    }
+	  else if (op == NULL)
+	    op = op1;
+	  else if (((op1->flags ^ op->flags)
+		    & (SEC_ALLOC | SEC_THREAD_LOCAL | SEC_LOAD)) != 0)
+	    {
+	      if (((op->flags ^ s->flags)
+		   & (SEC_ALLOC | SEC_THREAD_LOCAL)) != 0
+		  /* We prefer to choose a loaded section.  Section S
+		     doesn't have SEC_LOAD set (it being excluded, that
+		     part of the flag processing didn't happen) so we
+		     can't compare that flag to those of OP and OP1.  */
+		  || ((op1->flags & SEC_LOAD) != 0
+		      && (op->flags & SEC_LOAD) == 0))
+		op = op1;
+	    }
+	  else if (((op1->flags ^ op->flags) & SEC_READONLY) != 0)
+	    {
+	      if (((op->flags ^ s->flags) & SEC_READONLY) != 0)
+		op = op1;
+	    }
+	  else if (((op1->flags ^ op->flags) & SEC_CODE) != 0)
+	    {
+	      if (((op->flags ^ s->flags) & SEC_CODE) != 0)
+		op = op1;
+	    }
+	  else
+	    {
+	      /* Flags we care about are the same.  Prefer the following
+		 section if that will result in a positive valued sym.  */
+	      if (h->u.def.value < op->vma)
+		op = op1;
+	    }
+
+	  h->u.def.value -= op->vma;
+	  h->u.def.section = op;
+	}
+    }
+
+  return TRUE;
+}
+
+void
+_bfd_fix_excluded_sec_syms (bfd *obfd, struct bfd_link_info *info)
+{
+  bfd_link_hash_traverse (info->hash, fix_syms, obfd);
+}
+
+/*
+FUNCTION
+	bfd_generic_define_common_symbol
+
+SYNOPSIS
+	bfd_boolean bfd_generic_define_common_symbol
+	  (bfd *output_bfd, struct bfd_link_info *info,
+	   struct bfd_link_hash_entry *h);
+
+DESCRIPTION
+	Convert common symbol @var{h} into a defined symbol.
+	Return TRUE on success and FALSE on failure.
+
+.#define bfd_define_common_symbol(output_bfd, info, h) \
+.       BFD_SEND (output_bfd, _bfd_define_common_symbol, (output_bfd, info, h))
+.
+*/
+
+bfd_boolean
+bfd_generic_define_common_symbol (bfd *output_bfd,
+				  struct bfd_link_info *info ATTRIBUTE_UNUSED,
+				  struct bfd_link_hash_entry *h)
+{
+  unsigned int power_of_two;
+  bfd_vma alignment, size;
+  asection *section;
+
+  BFD_ASSERT (h != NULL && h->type == bfd_link_hash_common);
+
+  size = h->u.c.size;
+  power_of_two = h->u.c.p->alignment_power;
+  section = h->u.c.p->section;
+
+  /* Increase the size of the section to align the common symbol.
+     The alignment must be a power of two.  */
+  alignment = bfd_octets_per_byte (output_bfd) << power_of_two;
+  BFD_ASSERT (alignment != 0 && (alignment & -alignment) == alignment);
+  section->size += alignment - 1;
+  section->size &= -alignment;
+
+  /* Adjust the section's overall alignment if necessary.  */
+  if (power_of_two > section->alignment_power)
+    section->alignment_power = power_of_two;
+
+  /* Change the symbol from common to defined.  */
+  h->type = bfd_link_hash_defined;
+  h->u.def.section = section;
+  h->u.def.value = section->size;
+
+  /* Increase the size of the section.  */
+  section->size += size;
+
+  /* Make sure the section is allocated in memory, and make sure that
+     it is no longer a common section.  */
+  section->flags |= SEC_ALLOC;
+  section->flags &= ~SEC_IS_COMMON;
+  return TRUE;
+}
+
+/*
+FUNCTION
+	bfd_find_version_for_sym 
+
+SYNOPSIS
+	struct bfd_elf_version_tree * bfd_find_version_for_sym
+	  (struct bfd_elf_version_tree *verdefs,
+	   const char *sym_name, bfd_boolean *hide);
+
+DESCRIPTION
+	Search an elf version script tree for symbol versioning
+	info and export / don't-export status for a given symbol.
+	Return non-NULL on success and NULL on failure; also sets
+	the output @samp{hide} boolean parameter.
+
+*/
+
+struct bfd_elf_version_tree *
+bfd_find_version_for_sym (struct bfd_elf_version_tree *verdefs,
+			  const char *sym_name,
+			  bfd_boolean *hide)
+{
+  struct bfd_elf_version_tree *t;
+  struct bfd_elf_version_tree *local_ver, *global_ver, *exist_ver;
+  struct bfd_elf_version_tree *star_local_ver, *star_global_ver;
+
+  local_ver = NULL;
+  global_ver = NULL;
+  star_local_ver = NULL;
+  star_global_ver = NULL;
+  exist_ver = NULL;
+  for (t = verdefs; t != NULL; t = t->next)
+    {
+      if (t->globals.list != NULL)
+	{
+	  struct bfd_elf_version_expr *d = NULL;
+
+	  while ((d = (*t->match) (&t->globals, d, sym_name)) != NULL)
+	    {
+	      if (d->literal || strcmp (d->pattern, "*") != 0)
+		global_ver = t;
+	      else
+		star_global_ver = t;
+	      if (d->symver)
+		exist_ver = t;
+	      d->script = 1;
+	      /* If the match is a wildcard pattern, keep looking for
+		 a more explicit, perhaps even local, match.  */
+	      if (d->literal)
+		break;
+	    }
+
+	  if (d != NULL)
+	    break;
+	}
+
+      if (t->locals.list != NULL)
+	{
+	  struct bfd_elf_version_expr *d = NULL;
+
+	  while ((d = (*t->match) (&t->locals, d, sym_name)) != NULL)
+	    {
+	      if (d->literal || strcmp (d->pattern, "*") != 0)
+		local_ver = t;
+	      else
+		star_local_ver = t;
+	      /* If the match is a wildcard pattern, keep looking for
+		 a more explicit, perhaps even global, match.  */
+	      if (d->literal)
+		{
+		  /* An exact match overrides a global wildcard.  */
+		  global_ver = NULL;
+		  star_global_ver = NULL;
+		  break;
+		}
+	    }
+
+	  if (d != NULL)
+	    break;
+	}
+    }
+
+  if (global_ver == NULL && local_ver == NULL)
+    global_ver = star_global_ver;
+
+  if (global_ver != NULL)
+    {
+      /* If we already have a versioned symbol that matches the
+	 node for this symbol, then we don't want to create a
+	 duplicate from the unversioned symbol.  Instead hide the
+	 unversioned symbol.  */
+      *hide = exist_ver == global_ver;
+      return global_ver;
+    }
+
+  if (local_ver == NULL)
+    local_ver = star_local_ver;
+
+  if (local_ver != NULL)
+    {
+      *hide = TRUE;
+      return local_ver;
+    }
+
+  return NULL;
+}
+
+/*
+FUNCTION
+	bfd_hide_sym_by_version
+
+SYNOPSIS
+	bfd_boolean bfd_hide_sym_by_version
+	  (struct bfd_elf_version_tree *verdefs, const char *sym_name);
+
+DESCRIPTION
+	Search an elf version script tree for symbol versioning
+	info for a given symbol.  Return TRUE if the symbol is hidden.
+
+*/
+
+bfd_boolean
+bfd_hide_sym_by_version (struct bfd_elf_version_tree *verdefs,
+			 const char *sym_name)
+{
+  bfd_boolean hidden = FALSE;
+  bfd_find_version_for_sym (verdefs, sym_name, &hidden);
+  return hidden;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/lynx-core.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/lynx-core.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/lynx-core.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/lynx-core.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,231 @@
+/* BFD back end for Lynx core files
+   Copyright 1993, 1994, 1995, 2001, 2002, 2004, 2005, 2006, 2007
+   Free Software Foundation, Inc.
+   Written by Stu Grossman of Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#ifdef LYNX_CORE
+
+#include <sys/conf.h>
+#include <sys/kernel.h>
+/* sys/kernel.h should define this, but doesn't always, sigh.  */
+#ifndef __LYNXOS
+#define __LYNXOS
+#endif
+#include <sys/mem.h>
+#include <sys/signal.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <sys/itimer.h>
+#include <sys/file.h>
+#include <sys/proc.h>
+
+/* These are stored in the bfd's tdata */
+
+struct lynx_core_struct
+{
+  int sig;
+  char cmd[PNMLEN + 1];
+};
+
+#define core_hdr(bfd) ((bfd)->tdata.lynx_core_data)
+#define core_signal(bfd) (core_hdr(bfd)->sig)
+#define core_command(bfd) (core_hdr(bfd)->cmd)
+
+#define lynx_core_file_matches_executable_p generic_core_file_matches_executable_p
+#define lynx_core_file_pid _bfd_nocore_core_file_pid
+
+/* Handle Lynx core dump file.  */
+
+static asection *
+make_bfd_asection (abfd, name, flags, size, vma, filepos)
+     bfd *abfd;
+     const char *name;
+     flagword flags;
+     bfd_size_type size;
+     bfd_vma vma;
+     file_ptr filepos;
+{
+  asection *asect;
+  char *newname;
+
+  newname = bfd_alloc (abfd, (bfd_size_type) strlen (name) + 1);
+  if (!newname)
+    return NULL;
+
+  strcpy (newname, name);
+
+  asect = bfd_make_section_with_flags (abfd, newname, flags);
+  if (!asect)
+    return NULL;
+
+  asect->size = size;
+  asect->vma = vma;
+  asect->filepos = filepos;
+  asect->alignment_power = 2;
+
+  return asect;
+}
+
+const bfd_target *
+lynx_core_file_p (abfd)
+     bfd *abfd;
+{
+  int secnum;
+  struct pssentry pss;
+  bfd_size_type tcontext_size;
+  core_st_t *threadp;
+  int pagesize;
+  asection *newsect;
+  bfd_size_type amt;
+
+  pagesize = getpagesize ();	/* Serious cross-target issue here...  This
+				   really needs to come from a system-specific
+				   header file.  */
+
+  /* Get the pss entry from the core file */
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    return NULL;
+
+  amt = sizeof pss;
+  if (bfd_bread ((void *) &pss, amt, abfd) != amt)
+    {
+      /* Too small to be a core file */
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  amt = sizeof (struct lynx_core_struct);
+  core_hdr (abfd) = (struct lynx_core_struct *) bfd_zalloc (abfd, amt);
+
+  if (!core_hdr (abfd))
+    return NULL;
+
+  strncpy (core_command (abfd), pss.pname, PNMLEN + 1);
+
+  /* Compute the size of the thread contexts */
+
+  tcontext_size = pss.threadcnt * sizeof (core_st_t);
+
+  /* Allocate space for the thread contexts */
+
+  threadp = (core_st_t *) bfd_alloc (abfd, tcontext_size);
+  if (!threadp)
+    goto fail;
+
+  /* Save thread contexts */
+
+  if (bfd_seek (abfd, (file_ptr) pagesize, SEEK_SET) != 0)
+    goto fail;
+
+  if (bfd_bread ((void *) threadp, tcontext_size, abfd) != tcontext_size)
+    {
+      /* Probably too small to be a core file */
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      goto fail;
+    }
+
+  core_signal (abfd) = threadp->currsig;
+
+  newsect = make_bfd_asection (abfd, ".stack",
+			       SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS,
+			       pss.ssize,
+			       pss.slimit,
+			       pagesize + tcontext_size);
+  if (!newsect)
+    goto fail;
+
+  newsect = make_bfd_asection (abfd, ".data",
+			       SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS,
+			       pss.data_len + pss.bss_len,
+			       pss.data_start,
+			       pagesize + tcontext_size + pss.ssize
+#if defined (SPARC) || defined (__SPARC__)
+			       /* SPARC Lynx seems to start dumping
+                                  the .data section at a page
+                                  boundary.  It's OK to check a
+                                  #define like SPARC here because this
+                                  file can only be compiled on a Lynx
+                                  host.  */
+			       + pss.data_start % pagesize
+#endif
+			       );
+  if (!newsect)
+    goto fail;
+
+/* And, now for the .reg/XXX pseudo sections.  Each thread has it's own
+   .reg/XXX section, where XXX is the thread id (without leading zeros).  The
+   currently running thread (at the time of the core dump) also has an alias
+   called `.reg' (just to keep GDB happy).  Note that we use `.reg/XXX' as
+   opposed to `.regXXX' because GDB expects that .reg2 will be the floating-
+   point registers.  */
+
+  newsect = make_bfd_asection (abfd, ".reg",
+			       SEC_HAS_CONTENTS,
+			       sizeof (core_st_t),
+			       0,
+			       pagesize);
+  if (!newsect)
+    goto fail;
+
+  for (secnum = 0; secnum < pss.threadcnt; secnum++)
+    {
+      char secname[100];
+
+      sprintf (secname, ".reg/%d", BUILDPID (0, threadp[secnum].tid));
+      newsect = make_bfd_asection (abfd, secname,
+				   SEC_HAS_CONTENTS,
+				   sizeof (core_st_t),
+				   0,
+				   pagesize + secnum * sizeof (core_st_t));
+      if (!newsect)
+	goto fail;
+    }
+
+  return abfd->xvec;
+
+ fail:
+  bfd_release (abfd, core_hdr (abfd));
+  core_hdr (abfd) = NULL;
+  bfd_section_list_clear (abfd);
+  return NULL;
+}
+
+char *
+lynx_core_file_failing_command (abfd)
+     bfd *abfd;
+{
+  return core_command (abfd);
+}
+
+int
+lynx_core_file_failing_signal (abfd)
+     bfd *abfd;
+{
+  return core_signal (abfd);
+}
+
+#endif /* LYNX_CORE */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/m68k4knetbsd.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/m68k4knetbsd.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/m68k4knetbsd.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/m68k4knetbsd.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,37 @@
+/* BFD back-end for NetBSD/m68k a.out-ish binaries.
+   Copyright 1990, 1991, 1992, 1995, 1998, 2001, 2003, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define TARGET_IS_BIG_ENDIAN_P
+
+#define TARGET_PAGE_SIZE	0x1000
+
+#define DEFAULT_ARCH	bfd_arch_m68k
+#define DEFAULT_MID 	M_68K4K_NETBSD
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (m68k4knetbsd_,OP)
+
+/* This needs to start with a.out so GDB knows it is an a.out variant.  */
+#define TARGETNAME "a.out-m68k4k-netbsd"
+
+#include "netbsd.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/m68klinux.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/m68klinux.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/m68klinux.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/m68klinux.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,776 @@
+/* BFD back-end for linux flavored m68k a.out binaries.
+   Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define	TARGET_PAGE_SIZE 4096
+#define ZMAGIC_DISK_BLOCK_SIZE 1024
+#define	SEGMENT_SIZE TARGET_PAGE_SIZE
+#define TEXT_START_ADDR	0x0
+
+#define MACHTYPE_OK(mtype) ((mtype) == M_68020 || (mtype) == M_UNKNOWN)
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "aout/aout64.h"
+#include "aout/stab_gnu.h"
+#include "aout/ar.h"
+#include "libaout.h"           /* BFD a.out internal data structures */
+
+#define TARGET_IS_BIG_ENDIAN_P
+#define DEFAULT_ARCH bfd_arch_m68k
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (m68klinux_,OP)
+#define TARGETNAME "a.out-m68k-linux"
+
+extern const bfd_target MY(vec);
+
+/* We always generate QMAGIC files in preference to ZMAGIC files.  It
+   would be possible to make this a linker option, if that ever
+   becomes important.  */
+
+static void MY_final_link_callback
+  PARAMS ((bfd *, file_ptr *, file_ptr *, file_ptr *));
+static bfd_boolean m68klinux_bfd_final_link
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean m68klinux_write_object_contents PARAMS ((bfd *));
+
+static bfd_boolean
+m68klinux_bfd_final_link (abfd, info)
+     bfd *abfd;
+     struct bfd_link_info *info;
+{
+  obj_aout_subformat (abfd) = q_magic_format;
+  return NAME(aout,final_link) (abfd, info, MY_final_link_callback);
+}
+
+#define MY_bfd_final_link m68klinux_bfd_final_link
+
+/* Set the machine type correctly.  */
+
+static bfd_boolean
+m68klinux_write_object_contents (abfd)
+     bfd *abfd;
+{
+  struct external_exec exec_bytes;
+  struct internal_exec *execp = exec_hdr (abfd);
+
+  N_SET_MACHTYPE (*execp, M_68020);
+
+  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+
+  WRITE_HEADERS(abfd, execp);
+
+  return TRUE;
+}
+
+#define MY_write_object_contents m68klinux_write_object_contents
+
+/* Code to link against Linux a.out shared libraries.  */
+
+/* See if a symbol name is a reference to the global offset table.  */
+
+#ifndef GOT_REF_PREFIX
+#define	GOT_REF_PREFIX	"__GOT_"
+#endif
+
+#define IS_GOT_SYM(name)  (CONST_STRNEQ (name, GOT_REF_PREFIX))
+
+/* See if a symbol name is a reference to the procedure linkage table.  */
+
+#ifndef PLT_REF_PREFIX
+#define	PLT_REF_PREFIX	"__PLT_"
+#endif
+
+#define IS_PLT_SYM(name)  (CONST_STRNEQ (name, PLT_REF_PREFIX))
+
+/* This string is used to generate specialized error messages.  */
+
+#ifndef NEEDS_SHRLIB
+#define NEEDS_SHRLIB "__NEEDS_SHRLIB_"
+#endif
+
+/* This special symbol is a set vector that contains a list of
+   pointers to fixup tables.  It will be present in any dynamically
+   linked file.  The linker generated fixup table should also be added
+   to the list, and it should always appear in the second slot (the
+   first one is a dummy with a magic number that is defined in
+   crt0.o).  */
+
+#ifndef SHARABLE_CONFLICTS
+#define SHARABLE_CONFLICTS "__SHARABLE_CONFLICTS__"
+#endif
+
+/* We keep a list of fixups.  The terminology is a bit strange, but
+   each fixup contains two 32 bit numbers.  A regular fixup contains
+   an address and a pointer, and at runtime we should store the
+   address at the location pointed to by the pointer.  A builtin fixup
+   contains two pointers, and we should read the address using one
+   pointer and store it at the location pointed to by the other
+   pointer.  Builtin fixups come into play when we have duplicate
+   __GOT__ symbols for the same variable.  The builtin fixup will copy
+   the GOT pointer from one over into the other.  */
+
+struct fixup
+{
+  struct fixup *next;
+  struct linux_link_hash_entry *h;
+  bfd_vma value;
+
+  /* Nonzero if this is a jump instruction that needs to be fixed,
+     zero if this is just a pointer */
+  char jump;
+
+  char builtin;
+};
+
+/* We don't need a special hash table entry structure, but we do need
+   to keep some information between linker passes, so we use a special
+   hash table.  */
+
+struct linux_link_hash_entry
+{
+  struct aout_link_hash_entry root;
+};
+
+struct linux_link_hash_table
+{
+  struct aout_link_hash_table root;
+
+  /* First dynamic object found in link.  */
+  bfd *dynobj;
+
+  /* Number of fixups.  */
+  size_t fixup_count;
+
+  /* Number of builtin fixups.  */
+  size_t local_builtins;
+
+  /* List of fixups.  */
+  struct fixup *fixup_list;
+};
+
+static struct bfd_hash_entry *linux_link_hash_newfunc
+  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
+static struct bfd_link_hash_table *linux_link_hash_table_create
+  PARAMS ((bfd *));
+static struct fixup *new_fixup
+  PARAMS ((struct bfd_link_info *, struct linux_link_hash_entry *,
+	   bfd_vma, int));
+static bfd_boolean linux_link_create_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean linux_add_one_symbol
+  PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword, asection *,
+	   bfd_vma, const char *, bfd_boolean, bfd_boolean,
+	   struct bfd_link_hash_entry **));
+static bfd_boolean linux_tally_symbols
+  PARAMS ((struct linux_link_hash_entry *, PTR));
+static bfd_boolean linux_finish_dynamic_link
+  PARAMS ((bfd *, struct bfd_link_info *));
+
+/* Routine to create an entry in an Linux link hash table.  */
+
+static struct bfd_hash_entry *
+linux_link_hash_newfunc (entry, table, string)
+     struct bfd_hash_entry *entry;
+     struct bfd_hash_table *table;
+     const char *string;
+{
+  struct linux_link_hash_entry *ret = (struct linux_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == (struct linux_link_hash_entry *) NULL)
+    ret = ((struct linux_link_hash_entry *)
+	   bfd_hash_allocate (table, sizeof (struct linux_link_hash_entry)));
+  if (ret == NULL)
+    return (struct bfd_hash_entry *) ret;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct linux_link_hash_entry *)
+	 NAME(aout,link_hash_newfunc) ((struct bfd_hash_entry *) ret,
+				       table, string));
+  if (ret != NULL)
+    {
+      /* Set local fields; there aren't any.  */
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Create a Linux link hash table.  */
+
+static struct bfd_link_hash_table *
+linux_link_hash_table_create (abfd)
+     bfd *abfd;
+{
+  struct linux_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct linux_link_hash_table);
+
+  ret = (struct linux_link_hash_table *) bfd_malloc (amt);
+  if (ret == (struct linux_link_hash_table *) NULL)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return (struct bfd_link_hash_table *) NULL;
+    }
+  if (!NAME(aout,link_hash_table_init) (&ret->root, abfd,
+					linux_link_hash_newfunc,
+					sizeof (struct linux_link_hash_entry)))
+    {
+      free (ret);
+      return (struct bfd_link_hash_table *) NULL;
+    }
+
+  ret->dynobj = NULL;
+  ret->fixup_count = 0;
+  ret->local_builtins = 0;
+  ret->fixup_list = NULL;
+
+  return &ret->root.root;
+}
+
+/* Look up an entry in a Linux link hash table.  */
+
+#define linux_link_hash_lookup(table, string, create, copy, follow) \
+  ((struct linux_link_hash_entry *) \
+   aout_link_hash_lookup (&(table)->root, (string), (create), (copy),\
+			  (follow)))
+
+/* Traverse a Linux link hash table.  */
+
+#define linux_link_hash_traverse(table, func, info)			\
+  (aout_link_hash_traverse						\
+   (&(table)->root,							\
+    (bfd_boolean (*) PARAMS ((struct aout_link_hash_entry *, PTR))) (func),	\
+    (info)))
+
+/* Get the Linux link hash table from the info structure.  This is
+   just a cast.  */
+
+#define linux_hash_table(p) ((struct linux_link_hash_table *) ((p)->hash))
+
+/* Store the information for a new fixup.  */
+
+static struct fixup *
+new_fixup (info, h, value, builtin)
+     struct bfd_link_info *info;
+     struct linux_link_hash_entry *h;
+     bfd_vma value;
+     int builtin;
+{
+  struct fixup *f;
+
+  f = (struct fixup *) bfd_hash_allocate (&info->hash->table,
+					  sizeof (struct fixup));
+  if (f == NULL)
+    return f;
+  f->next = linux_hash_table (info)->fixup_list;
+  linux_hash_table (info)->fixup_list = f;
+  f->h = h;
+  f->value = value;
+  f->builtin = builtin;
+  f->jump = 0;
+  ++linux_hash_table (info)->fixup_count;
+  return f;
+}
+
+/* We come here once we realize that we are going to link to a shared
+   library.  We need to create a special section that contains the
+   fixup table, and we ultimately need to add a pointer to this into
+   the set vector for SHARABLE_CONFLICTS.  At this point we do not
+   know the size of the section, but that's OK - we just need to
+   create it for now.  */
+
+static bfd_boolean
+linux_link_create_dynamic_sections (abfd, info)
+     bfd *abfd;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+{
+  flagword flags;
+  register asection *s;
+
+  /* Note that we set the SEC_IN_MEMORY flag.  */
+  flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY;
+
+  /* We choose to use the name ".linux-dynamic" for the fixup table.
+     Why not? */
+  s = bfd_make_section_with_flags (abfd, ".linux-dynamic", flags);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, 2))
+    return FALSE;
+  s->size = 0;
+  s->contents = 0;
+
+  return TRUE;
+}
+
+/* Function to add a single symbol to the linker hash table.  This is
+   a wrapper around _bfd_generic_link_add_one_symbol which handles the
+   tweaking needed for dynamic linking support.  */
+
+static bfd_boolean
+linux_add_one_symbol (info, abfd, name, flags, section, value, string,
+		      copy, collect, hashp)
+     struct bfd_link_info *info;
+     bfd *abfd;
+     const char *name;
+     flagword flags;
+     asection *section;
+     bfd_vma value;
+     const char *string;
+     bfd_boolean copy;
+     bfd_boolean collect;
+     struct bfd_link_hash_entry **hashp;
+{
+  struct linux_link_hash_entry *h;
+  bfd_boolean insert;
+
+  /* Look up and see if we already have this symbol in the hash table.
+     If we do, and the defining entry is from a shared library, we
+     need to create the dynamic sections.
+
+     FIXME: What if abfd->xvec != info->output_bfd->xvec?  We may
+     want to be able to link Linux a.out and ELF objects together,
+     but serious confusion is possible.  */
+
+  insert = FALSE;
+
+  if (! info->relocatable
+      && linux_hash_table (info)->dynobj == NULL
+      && strcmp (name, SHARABLE_CONFLICTS) == 0
+      && (flags & BSF_CONSTRUCTOR) != 0
+      && abfd->xvec == info->output_bfd->xvec)
+    {
+      if (! linux_link_create_dynamic_sections (abfd, info))
+	return FALSE;
+      linux_hash_table (info)->dynobj = abfd;
+      insert = TRUE;
+    }
+
+  if (bfd_is_abs_section (section)
+      && abfd->xvec == info->output_bfd->xvec)
+    {
+      h = linux_link_hash_lookup (linux_hash_table (info), name, FALSE,
+				  FALSE, FALSE);
+      if (h != NULL
+	  && (h->root.root.type == bfd_link_hash_defined
+	      || h->root.root.type == bfd_link_hash_defweak))
+	{
+	  struct fixup *f;
+
+	  if (hashp != NULL)
+	    *hashp = (struct bfd_link_hash_entry *) h;
+
+	  f = new_fixup (info, h, value, ! IS_PLT_SYM (name));
+	  if (f == NULL)
+	    return FALSE;
+	  f->jump = IS_PLT_SYM (name);
+
+	  return TRUE;
+	}
+    }
+
+  /* Do the usual procedure for adding a symbol.  */
+  if (! _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section,
+					  value, string, copy, collect,
+					  hashp))
+    return FALSE;
+
+  /* Insert a pointer to our table in the set vector.  The dynamic
+     linker requires this information */
+  if (insert)
+    {
+      asection *s;
+
+      /* Here we do our special thing to add the pointer to the
+	 dynamic section in the SHARABLE_CONFLICTS set vector.  */
+      s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
+				   ".linux-dynamic");
+      BFD_ASSERT (s != NULL);
+
+      if (! (_bfd_generic_link_add_one_symbol
+	     (info, linux_hash_table (info)->dynobj, SHARABLE_CONFLICTS,
+	      BSF_GLOBAL | BSF_CONSTRUCTOR, s, (bfd_vma) 0, NULL,
+	      FALSE, FALSE, NULL)))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* We will crawl the hash table and come here for every global symbol.
+   We will examine each entry and see if there are indications that we
+   need to add a fixup.  There are two possible cases - one is where
+   you have duplicate definitions of PLT or GOT symbols - these will
+   have already been caught and added as "builtin" fixups.  If we find
+   that the corresponding non PLT/GOT symbol is also present, we
+   convert it to a regular fixup instead.
+
+   This function is called via linux_link_hash_traverse.  */
+
+static bfd_boolean
+linux_tally_symbols (h, data)
+     struct linux_link_hash_entry *h;
+     PTR data;
+{
+  struct bfd_link_info *info = (struct bfd_link_info *) data;
+  struct fixup *f, *f1;
+  int is_plt;
+  struct linux_link_hash_entry *h1, *h2;
+  bfd_boolean exists;
+
+  if (h->root.root.type == bfd_link_hash_undefined
+      && CONST_STRNEQ (h->root.root.root.string, NEEDS_SHRLIB))
+    {
+      const char *name;
+      char *p;
+      char *alloc = NULL;
+
+      name = h->root.root.root.string + sizeof NEEDS_SHRLIB - 1;
+      p = strrchr (name, '_');
+      if (p != NULL)
+	alloc = (char *) bfd_malloc ((bfd_size_type) strlen (name) + 1);
+
+      if (p == NULL || alloc == NULL)
+	(*_bfd_error_handler) (_("Output file requires shared library `%s'\n"),
+			       name);
+      else
+	{
+	  strcpy (alloc, name);
+	  p = strrchr (alloc, '_');
+	  *p++ = '\0';
+	  (*_bfd_error_handler)
+	    (_("Output file requires shared library `%s.so.%s'\n"),
+	     alloc, p);
+	  free (alloc);
+	}
+
+      abort ();
+    }
+
+  /* If this symbol is not a PLT/GOT, we do not even need to look at it */
+  is_plt = IS_PLT_SYM (h->root.root.root.string);
+
+  if (is_plt || IS_GOT_SYM (h->root.root.root.string))
+    {
+      /* Look up this symbol twice.  Once just as a regular lookup,
+	 and then again following all of the indirect links until we
+	 reach a real symbol.  */
+      h1 = linux_link_hash_lookup (linux_hash_table (info),
+				   (h->root.root.root.string
+				    + sizeof PLT_REF_PREFIX - 1),
+				   FALSE, FALSE, TRUE);
+      /* h2 does not follow indirect symbols.  */
+      h2 = linux_link_hash_lookup (linux_hash_table (info),
+				   (h->root.root.root.string
+				    + sizeof PLT_REF_PREFIX - 1),
+				   FALSE, FALSE, FALSE);
+
+      /* The real symbol must exist but if it is also an ABS symbol,
+	 there is no need to have a fixup.  This is because they both
+	 came from the same library.  If on the other hand, we had to
+	 use an indirect symbol to get to the real symbol, we add the
+	 fixup anyway, since there are cases where these symbols come
+	 from different shared libraries */
+      if (h1 != NULL
+	  && (((h1->root.root.type == bfd_link_hash_defined
+		|| h1->root.root.type == bfd_link_hash_defweak)
+	       && ! bfd_is_abs_section (h1->root.root.u.def.section))
+	      || h2->root.root.type == bfd_link_hash_indirect))
+	{
+	  /* See if there is a "builtin" fixup already present
+	     involving this symbol.  If so, convert it to a regular
+	     fixup.  In the end, this relaxes some of the requirements
+	     about the order of performing fixups.  */
+	  exists = FALSE;
+	  for (f1 = linux_hash_table (info)->fixup_list;
+	       f1 != NULL;
+	       f1 = f1->next)
+	    {
+	      if ((f1->h != h && f1->h != h1)
+		  || (! f1->builtin && ! f1->jump))
+		continue;
+	      if (f1->h == h1)
+		exists = TRUE;
+	      if (! exists
+		  && bfd_is_abs_section (h->root.root.u.def.section))
+		{
+		  f = new_fixup (info, h1, f1->h->root.root.u.def.value, 0);
+		  f->jump = is_plt;
+		}
+	      f1->h = h1;
+	      f1->jump = is_plt;
+	      f1->builtin = 0;
+	      exists = TRUE;
+	    }
+	  if (! exists
+	      && bfd_is_abs_section (h->root.root.u.def.section))
+	    {
+	      f = new_fixup (info, h1, h->root.root.u.def.value, 0);
+	      if (f == NULL)
+		{
+		  /* FIXME: No way to return error.  */
+		  abort ();
+		}
+	      f->jump = is_plt;
+	    }
+	}
+
+      /* Quick and dirty way of stripping these symbols from the
+	 symtab.  */
+      if (bfd_is_abs_section (h->root.root.u.def.section))
+	h->root.written = TRUE;
+    }
+
+  return TRUE;
+}
+
+/* This is called to set the size of the .linux-dynamic section is.
+   It is called by the Linux linker emulation before_allocation
+   routine.  We have finished reading all of the input files, and now
+   we just scan the hash tables to find out how many additional fixups
+   are required.  */
+
+bfd_boolean
+bfd_m68klinux_size_dynamic_sections (output_bfd, info)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+{
+  struct fixup *f;
+  asection *s;
+
+  if (output_bfd->xvec != &MY(vec))
+    return TRUE;
+
+  /* First find the fixups...  */
+  linux_link_hash_traverse (linux_hash_table (info),
+			    linux_tally_symbols,
+			    (PTR) info);
+
+  /* If there are builtin fixups, leave room for a marker.  This is
+     used by the dynamic linker so that it knows that all that follow
+     are builtin fixups instead of regular fixups.  */
+  for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
+    {
+      if (f->builtin)
+	{
+	  ++linux_hash_table (info)->fixup_count;
+	  ++linux_hash_table (info)->local_builtins;
+	  break;
+	}
+    }
+
+  if (linux_hash_table (info)->dynobj == NULL)
+    {
+      if (linux_hash_table (info)->fixup_count > 0)
+	abort ();
+      return TRUE;
+    }
+
+  /* Allocate memory for our fixup table.  We will fill it in later.  */
+  s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
+			       ".linux-dynamic");
+  if (s != NULL)
+    {
+      s->size = linux_hash_table (info)->fixup_count + 1;
+      s->size *= 8;
+      s->contents = (bfd_byte *) bfd_zalloc (output_bfd, s->size);
+      if (s->contents == NULL)
+	{
+	  bfd_set_error (bfd_error_no_memory);
+	  return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* We come here once we are ready to actually write the fixup table to
+   the output file.  Scan the fixup tables and so forth and generate
+   the stuff we need.  */
+
+static bfd_boolean
+linux_finish_dynamic_link (output_bfd, info)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+{
+  asection *s, *os, *is;
+  bfd_byte *fixup_table;
+  struct linux_link_hash_entry *h;
+  struct fixup *f;
+  unsigned int new_addr;
+  int section_offset;
+  unsigned int fixups_written;
+
+  if (linux_hash_table (info)->dynobj == NULL)
+    return TRUE;
+
+  s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
+			       ".linux-dynamic");
+  BFD_ASSERT (s != NULL);
+  os = s->output_section;
+  fixups_written = 0;
+
+#ifdef LINUX_LINK_DEBUG
+  printf ("Fixup table file offset: %x  VMA: %x\n",
+	  os->filepos + s->output_offset,
+	  os->vma + s->output_offset);
+#endif
+
+  fixup_table = s->contents;
+  bfd_put_32 (output_bfd, (bfd_vma) linux_hash_table (info)->fixup_count,
+	      fixup_table);
+  fixup_table += 4;
+
+  /* Fill in fixup table.  */
+  for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
+    {
+      if (f->builtin)
+	continue;
+
+      if (f->h->root.root.type != bfd_link_hash_defined
+	  && f->h->root.root.type != bfd_link_hash_defweak)
+	{
+	  (*_bfd_error_handler)
+	    (_("Symbol %s not defined for fixups\n"),
+	     f->h->root.root.root.string);
+	  continue;
+	}
+
+      is = f->h->root.root.u.def.section;
+      section_offset = is->output_section->vma + is->output_offset;
+      new_addr = f->h->root.root.u.def.value + section_offset;
+
+#ifdef LINUX_LINK_DEBUG
+      printf ("Fixup(%d) %s: %x %x\n",f->jump, f->h->root.root.string,
+	      new_addr, f->value);
+#endif
+
+      if (f->jump)
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
+	  fixup_table += 4;
+	  bfd_put_32 (output_bfd, f->value + 2, fixup_table);
+	  fixup_table += 4;
+	}
+      else
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
+	  fixup_table += 4;
+	  bfd_put_32 (output_bfd, f->value, fixup_table);
+	  fixup_table += 4;
+	}
+      ++fixups_written;
+    }
+
+  if (linux_hash_table (info)->local_builtins != 0)
+    {
+      /* Special marker so we know to switch to the other type of fixup */
+      bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
+      fixup_table += 4;
+      bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
+      fixup_table += 4;
+      ++fixups_written;
+      for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
+	{
+	  if (! f->builtin)
+	    continue;
+
+	  if (f->h->root.root.type != bfd_link_hash_defined
+	      && f->h->root.root.type != bfd_link_hash_defweak)
+	    {
+	      (*_bfd_error_handler)
+		(_("Symbol %s not defined for fixups\n"),
+		 f->h->root.root.root.string);
+	      continue;
+	    }
+
+	  is = f->h->root.root.u.def.section;
+	  section_offset = is->output_section->vma + is->output_offset;
+	  new_addr = f->h->root.root.u.def.value + section_offset;
+
+#ifdef LINUX_LINK_DEBUG
+	  printf ("Fixup(B) %s: %x %x\n", f->h->root.root.string,
+		  new_addr, f->value);
+#endif
+
+	  bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
+	  fixup_table += 4;
+	  bfd_put_32 (output_bfd, f->value, fixup_table);
+	  fixup_table += 4;
+	  ++fixups_written;
+	}
+  }
+
+  if (linux_hash_table (info)->fixup_count != fixups_written)
+    {
+      (*_bfd_error_handler) (_("Warning: fixup count mismatch\n"));
+      while (linux_hash_table (info)->fixup_count > fixups_written)
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
+	  fixup_table += 4;
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
+	  fixup_table += 4;
+	  ++fixups_written;
+	}
+    }
+
+  h = linux_link_hash_lookup (linux_hash_table (info),
+			      "__BUILTIN_FIXUPS__",
+			      FALSE, FALSE, FALSE);
+
+  if (h != NULL
+      && (h->root.root.type == bfd_link_hash_defined
+	  || h->root.root.type == bfd_link_hash_defweak))
+    {
+      is = h->root.root.u.def.section;
+      section_offset = is->output_section->vma + is->output_offset;
+      new_addr = h->root.root.u.def.value + section_offset;
+
+#ifdef LINUX_LINK_DEBUG
+      printf ("Builtin fixup table at %x\n", new_addr);
+#endif
+
+      bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
+    }
+  else
+    bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
+
+  if (bfd_seek (output_bfd, (file_ptr) (os->filepos + s->output_offset),
+		SEEK_SET) != 0)
+    return FALSE;
+
+  if (bfd_bwrite ((PTR) s->contents, s->size, output_bfd) != s->size)
+    return FALSE;
+
+  return TRUE;
+}
+
+#define MY_bfd_link_hash_table_create linux_link_hash_table_create
+#define MY_add_one_symbol linux_add_one_symbol
+#define MY_finish_dynamic_link linux_finish_dynamic_link
+
+#define MY_zmagic_contiguous 1
+
+#include "aout-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/m68knetbsd.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/m68knetbsd.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/m68knetbsd.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/m68knetbsd.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,39 @@
+/* BFD back-end for NetBSD/m68k a.out-ish binaries.
+   Copyright 1990, 1991, 1992, 1994, 1995, 1997, 1998, 2000, 2001, 2003,
+   2005, 2007  Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define TARGET_IS_BIG_ENDIAN_P
+
+/* Our m68k ports use either 4K or 8K pages, but object files always
+   assume 8K page alignment so they will work on all m68k machines.  */
+#define TARGET_PAGE_SIZE	0x2000
+
+#define DEFAULT_ARCH	bfd_arch_m68k
+#define DEFAULT_MID 	M_68K_NETBSD
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (m68knetbsd_,OP)
+
+/* This needs to start with a.out so GDB knows it is an a.out variant.  */
+#define TARGETNAME "a.out-m68k-netbsd"
+
+#include "netbsd.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/m88kmach3.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/m88kmach3.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/m88kmach3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/m88kmach3.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,42 @@
+/* BFD back-end for Motorola m88k a.out (Mach 3) binaries.
+   Copyright 1990, 1991, 1993, 1994, 1995, 2001, 2003, 2005, 2007, 2009
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define	TARGET_PAGE_SIZE	(4096*2)
+#define SEGMENT_SIZE	0x20000
+#define TEXT_START_ADDR	0
+#define N_HEADER_IN_TEXT(x)	1 		/* (N_MAGIG(x) == ZMAGIC) */
+
+#define N_TXTSIZE(x)	((x).a_text)
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libaout.h"
+
+#define DEFAULT_ARCH bfd_arch_m88k
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (m88kmach3_,OP)
+#define TARGETNAME "a.out-m88k-mach3"
+
+#include "aout-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/m88kopenbsd.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/m88kopenbsd.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/m88kopenbsd.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/m88kopenbsd.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,34 @@
+/* BFD back-end for OpenBSD/m88k a.out binaries.
+   Copyright 2004, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define	TARGET_IS_BIG_ENDIAN_P
+
+#define	TARGET_PAGE_SIZE	4096
+
+#define	DEFAULT_ARCH		bfd_arch_m88k
+#define	DEFAULT_MID		M_88K_OPENBSD
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (m88kopenbsd_,OP)
+#define TARGETNAME "a.out-m88k-openbsd"
+
+#include "netbsd.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/mach-o-i386.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/mach-o-i386.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/mach-o-i386.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/mach-o-i386.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,295 @@
+/* Intel i386 Mach-O support for BFD.
+   Copyright 2009
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "mach-o.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libiberty.h"
+#include "mach-o/reloc.h"
+
+#define bfd_mach_o_object_p bfd_mach_o_i386_object_p
+#define bfd_mach_o_core_p bfd_mach_o_i386_core_p
+#define bfd_mach_o_mkobject bfd_mach_o_i386_mkobject
+
+static const bfd_target *
+bfd_mach_o_i386_object_p (bfd *abfd)
+{
+  return bfd_mach_o_header_p (abfd, 0, BFD_MACH_O_CPU_TYPE_I386);
+}
+
+static const bfd_target *
+bfd_mach_o_i386_core_p (bfd *abfd)
+{
+  return bfd_mach_o_header_p (abfd,
+                              BFD_MACH_O_MH_CORE, BFD_MACH_O_CPU_TYPE_I386);
+}
+
+static bfd_boolean
+bfd_mach_o_i386_mkobject (bfd *abfd)
+{
+  bfd_mach_o_data_struct *mdata;
+
+  if (!bfd_mach_o_mkobject_init (abfd))
+    return FALSE;
+
+  mdata = bfd_mach_o_get_data (abfd);
+  mdata->header.magic = BFD_MACH_O_MH_MAGIC;
+  mdata->header.cputype = BFD_MACH_O_CPU_TYPE_I386;
+  mdata->header.cpusubtype = BFD_MACH_O_CPU_SUBTYPE_X86_ALL;
+  mdata->header.byteorder = BFD_ENDIAN_LITTLE;
+  mdata->header.version = 1;
+
+  return TRUE;
+}
+
+static reloc_howto_type i386_howto_table[]=
+{
+  HOWTO(BFD_RELOC_32, 0, 2, 32, FALSE, 0,
+	complain_overflow_bitfield,
+	NULL, "32",
+	FALSE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(BFD_RELOC_16, 0, 1, 16, FALSE, 0,
+	complain_overflow_bitfield,
+	NULL, "16",
+	FALSE, 0xffff, 0xffff, FALSE),
+  HOWTO(BFD_RELOC_8, 0, 0, 8, FALSE, 0,
+	complain_overflow_bitfield,
+	NULL, "8",
+	FALSE, 0xff, 0xff, FALSE),
+  HOWTO(BFD_RELOC_32_PCREL, 0, 2, 32, TRUE, 0,
+	complain_overflow_bitfield,
+	NULL, "DISP32",
+	FALSE, 0xffffffff, 0xffffffff, TRUE),
+  HOWTO(BFD_RELOC_16_PCREL, 0, 1, 16, TRUE, 0,
+	complain_overflow_bitfield,
+	NULL, "DISP16",
+	FALSE, 0xffff, 0xffff, TRUE),
+  HOWTO(BFD_RELOC_MACH_O_SECTDIFF, 0, 2, 32, FALSE, 0,
+	complain_overflow_bitfield,
+	NULL, "SECTDIFF_32",
+	FALSE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(BFD_RELOC_MACH_O_PAIR, 0, 2, 32, FALSE, 0,
+	complain_overflow_bitfield,
+	NULL, "PAIR_32",
+	FALSE, 0xffffffff, 0xffffffff, FALSE),
+};
+
+static bfd_boolean
+bfd_mach_o_i386_swap_reloc_in (arelent *res, bfd_mach_o_reloc_info *reloc)
+{
+  if (reloc->r_scattered)
+    {
+      switch (reloc->r_type)
+        {
+        case BFD_MACH_O_GENERIC_RELOC_PAIR:
+          if (reloc->r_length != 2)
+            return FALSE;
+          res->howto = &i386_howto_table[6];
+          res->address = res[-1].address;
+          return TRUE;
+        case BFD_MACH_O_GENERIC_RELOC_SECTDIFF:
+        case BFD_MACH_O_GENERIC_RELOC_LOCAL_SECTDIFF:
+          if (reloc->r_length != 2)
+            return FALSE;
+          res->howto = &i386_howto_table[5];
+          return TRUE;
+        default:
+          return FALSE;
+        }
+    }
+  else
+    {
+      switch (reloc->r_type)
+        {
+        case BFD_MACH_O_GENERIC_RELOC_VANILLA:
+          switch ((reloc->r_length << 1) | reloc->r_pcrel)
+            {
+            case 0: /* len = 0, pcrel = 0  */
+              res->howto = &i386_howto_table[2];
+              return TRUE;
+            case 2: /* len = 1, pcrel = 0  */
+              res->howto = &i386_howto_table[1];
+              return TRUE;
+            case 3: /* len = 1, pcrel = 1  */
+              res->howto = &i386_howto_table[4];
+              return TRUE;
+            case 4: /* len = 2, pcrel = 0  */
+              res->howto = &i386_howto_table[0];
+              return TRUE;
+            case 5: /* len = 2, pcrel = 1  */
+              res->howto = &i386_howto_table[3];
+              return TRUE;
+            default:
+              return FALSE;
+            }
+          break;
+        default:
+          return FALSE;
+        }
+    }
+}
+
+static bfd_boolean
+bfd_mach_o_i386_swap_reloc_out (arelent *rel, bfd_mach_o_reloc_info *rinfo)
+{
+  rinfo->r_address = rel->address;
+  switch (rel->howto->type)
+    {
+    case BFD_RELOC_32:
+    case BFD_RELOC_32_PCREL:
+    case BFD_RELOC_16:
+    case BFD_RELOC_16_PCREL:
+    case BFD_RELOC_8:
+      rinfo->r_scattered = 0;
+      rinfo->r_type = BFD_MACH_O_GENERIC_RELOC_VANILLA;
+      rinfo->r_pcrel = rel->howto->pc_relative;
+      rinfo->r_length = rel->howto->size; /* Correct in practice.  */
+      if ((*rel->sym_ptr_ptr)->flags & BSF_SECTION_SYM)
+        {
+          rinfo->r_extern = 0;
+          rinfo->r_value = (*rel->sym_ptr_ptr)->section->target_index;
+        }
+      else
+        {
+          rinfo->r_extern = 1;
+          rinfo->r_value = (*rel->sym_ptr_ptr)->udata.i;
+        }
+      break;
+    case BFD_RELOC_MACH_O_SECTDIFF:
+      rinfo->r_scattered = 1;
+      rinfo->r_type = BFD_MACH_O_GENERIC_RELOC_SECTDIFF;
+      rinfo->r_pcrel = 0;
+      rinfo->r_length = 2;
+      rinfo->r_extern = 0;
+      rinfo->r_value = (*rel->sym_ptr_ptr)->value 
+        + (*rel->sym_ptr_ptr)->section->vma;
+      break;
+    case BFD_RELOC_MACH_O_PAIR:
+      rinfo->r_address = 0;
+      rinfo->r_scattered = 1;
+      rinfo->r_type = BFD_MACH_O_GENERIC_RELOC_PAIR;
+      rinfo->r_pcrel = 0;
+      rinfo->r_length = 2;
+      rinfo->r_extern = 0;
+      rinfo->r_value = (*rel->sym_ptr_ptr)->value 
+        + (*rel->sym_ptr_ptr)->section->vma;
+      break;
+    default:
+      return FALSE;
+    }
+  return TRUE;
+}
+
+static reloc_howto_type *
+bfd_mach_o_i386_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                                       bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0; i < sizeof (i386_howto_table) / sizeof (*i386_howto_table); i++)
+    if (code == i386_howto_table[i].type)
+      return &i386_howto_table[i];
+  return NULL;
+}
+
+static reloc_howto_type *
+bfd_mach_o_i386_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                                       const char *name ATTRIBUTE_UNUSED)
+{
+  return NULL;
+}
+
+static bfd_boolean
+bfd_mach_o_i386_print_thread (bfd *abfd, bfd_mach_o_thread_flavour *thread,
+                              void *vfile, char *buf)
+{
+  FILE *file = (FILE *)vfile;
+
+  switch (thread->flavour)
+    {
+    case BFD_MACH_O_x86_THREAD_STATE:
+      if (thread->size < (8 + 16 * 4))
+        return FALSE;
+      fprintf (file, "   x86_THREAD_STATE:\n");
+      fprintf (file, "    flavor: 0x%08lx  count: 0x%08lx\n",
+               (unsigned long)bfd_get_32 (abfd, buf + 0),
+               (unsigned long)bfd_get_32 (abfd, buf + 4));
+      fprintf (file, "     eax: %08lx  ebx: %08lx  ecx: %08lx  edx: %08lx\n",
+               (unsigned long)bfd_get_32 (abfd, buf + 8),
+               (unsigned long)bfd_get_32 (abfd, buf + 12),
+               (unsigned long)bfd_get_32 (abfd, buf + 16),
+               (unsigned long)bfd_get_32 (abfd, buf + 20));
+      fprintf (file, "     edi: %08lx  esi: %08lx  ebp: %08lx  esp: %08lx\n",
+               (unsigned long)bfd_get_32 (abfd, buf + 24),
+               (unsigned long)bfd_get_32 (abfd, buf + 28),
+               (unsigned long)bfd_get_32 (abfd, buf + 32),
+               (unsigned long)bfd_get_32 (abfd, buf + 36));
+      fprintf (file, "      ss: %08lx  flg: %08lx  eip: %08lx   cs: %08lx\n",
+               (unsigned long)bfd_get_32 (abfd, buf + 40),
+               (unsigned long)bfd_get_32 (abfd, buf + 44),
+               (unsigned long)bfd_get_32 (abfd, buf + 48),
+               (unsigned long)bfd_get_32 (abfd, buf + 52));
+      fprintf (file, "      ds: %08lx   es: %08lx   fs: %08lx   gs: %08lx\n",
+               (unsigned long)bfd_get_32 (abfd, buf + 56),
+               (unsigned long)bfd_get_32 (abfd, buf + 60),
+               (unsigned long)bfd_get_32 (abfd, buf + 64),
+               (unsigned long)bfd_get_32 (abfd, buf + 68));
+      return TRUE;
+    case BFD_MACH_O_x86_FLOAT_STATE:
+      if (thread->size < 8)
+        return FALSE;
+      fprintf (file, "   x86_FLOAT_STATE:\n");
+      fprintf (file, "    flavor: 0x%08lx  count: 0x%08lx\n",
+               (unsigned long)bfd_get_32 (abfd, buf + 0),
+               (unsigned long)bfd_get_32 (abfd, buf + 4));
+      return TRUE;
+    case BFD_MACH_O_x86_EXCEPTION_STATE:
+      if (thread->size < 8 + 3 * 4)
+        return FALSE;
+      fprintf (file, "   x86_EXCEPTION_STATE:\n");
+      fprintf (file, "    flavor: 0x%08lx  count: 0x%08lx\n",
+               (unsigned long)bfd_get_32 (abfd, buf + 0),
+               (unsigned long)bfd_get_32 (abfd, buf + 4));
+      fprintf (file, "    trapno: %08lx  err: %08lx  faultaddr: %08lx\n",
+               (unsigned long)bfd_get_32 (abfd, buf + 8),
+               (unsigned long)bfd_get_32 (abfd, buf + 12),
+               (unsigned long)bfd_get_32 (abfd, buf + 16));
+      return TRUE;
+    default:
+      break;
+    }
+  return FALSE;
+}
+
+#define bfd_mach_o_swap_reloc_in bfd_mach_o_i386_swap_reloc_in
+#define bfd_mach_o_swap_reloc_out bfd_mach_o_i386_swap_reloc_out
+#define bfd_mach_o_print_thread bfd_mach_o_i386_print_thread
+
+#define bfd_mach_o_bfd_reloc_type_lookup bfd_mach_o_i386_bfd_reloc_type_lookup 
+#define bfd_mach_o_bfd_reloc_name_lookup bfd_mach_o_i386_bfd_reloc_name_lookup
+
+#define TARGET_NAME 		mach_o_i386_vec
+#define TARGET_STRING 		"mach-o-i386"
+#define TARGET_ARCHITECTURE	bfd_arch_i386
+#define TARGET_BIG_ENDIAN 	0
+#define TARGET_ARCHIVE 		0
+#include "mach-o-target.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/mach-o-target.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/mach-o-target.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/mach-o-target.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/mach-o-target.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,185 @@
+/* Mach-O support for BFD.
+   Copyright 1999, 2000, 2001, 2002, 2005, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software 
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* Define generic entry points here so that we don't need to duplicate the
+   defines in every target.  But define once as this file may be included
+   several times.  */
+#ifndef MACH_O_TARGET_COMMON_DEFINED
+#define MACH_O_TARGET_COMMON_DEFINED
+
+#define bfd_mach_o_close_and_cleanup                  _bfd_generic_close_and_cleanup
+#define bfd_mach_o_bfd_free_cached_info               _bfd_generic_bfd_free_cached_info
+#define bfd_mach_o_get_section_contents_in_window     _bfd_generic_get_section_contents_in_window
+#define bfd_mach_o_bfd_is_target_special_symbol       ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define bfd_mach_o_bfd_is_local_label_name            bfd_generic_is_local_label_name
+#define bfd_mach_o_get_lineno                         _bfd_nosymbols_get_lineno
+#define bfd_mach_o_find_nearest_line                  _bfd_nosymbols_find_nearest_line
+#define bfd_mach_o_find_inliner_info                  _bfd_nosymbols_find_inliner_info
+#define bfd_mach_o_bfd_make_debug_symbol              _bfd_nosymbols_bfd_make_debug_symbol
+#define bfd_mach_o_read_minisymbols                   _bfd_generic_read_minisymbols
+#define bfd_mach_o_minisymbol_to_symbol               _bfd_generic_minisymbol_to_symbol
+#define bfd_mach_o_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents
+#define bfd_mach_o_bfd_relax_section                  bfd_generic_relax_section
+#define bfd_mach_o_bfd_link_hash_table_create         _bfd_generic_link_hash_table_create
+#define bfd_mach_o_bfd_link_hash_table_free           _bfd_generic_link_hash_table_free
+#define bfd_mach_o_bfd_link_add_symbols               _bfd_generic_link_add_symbols
+#define bfd_mach_o_bfd_link_just_syms                 _bfd_generic_link_just_syms
+#define bfd_mach_o_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define bfd_mach_o_bfd_final_link                     _bfd_generic_final_link
+#define bfd_mach_o_bfd_link_split_section             _bfd_generic_link_split_section
+#define bfd_mach_o_bfd_merge_private_bfd_data         _bfd_generic_bfd_merge_private_bfd_data
+#define bfd_mach_o_bfd_set_private_flags              _bfd_generic_bfd_set_private_flags
+#define bfd_mach_o_get_section_contents               _bfd_generic_get_section_contents
+#define bfd_mach_o_bfd_gc_sections                    bfd_generic_gc_sections
+#define bfd_mach_o_bfd_lookup_section_flags           bfd_generic_lookup_section_flags
+#define bfd_mach_o_bfd_merge_sections                 bfd_generic_merge_sections
+#define bfd_mach_o_bfd_is_group_section               bfd_generic_is_group_section
+#define bfd_mach_o_bfd_discard_group                  bfd_generic_discard_group
+#define bfd_mach_o_section_already_linked             _bfd_generic_section_already_linked
+#define bfd_mach_o_bfd_define_common_symbol           bfd_generic_define_common_symbol
+#define bfd_mach_o_bfd_copy_private_header_data       _bfd_generic_bfd_copy_private_header_data
+#define bfd_mach_o_core_file_matches_executable_p     generic_core_file_matches_executable_p
+#define bfd_mach_o_core_file_pid                      _bfd_nocore_core_file_pid
+
+#define bfd_mach_o_get_dynamic_symtab_upper_bound     bfd_mach_o_get_symtab_upper_bound
+#define bfd_mach_o_canonicalize_dynamic_symtab	      bfd_mach_o_canonicalize_symtab
+
+#define TARGET_NAME_BACKEND XCONCAT2(TARGET_NAME,_backend)
+
+#endif /* MACH_O_TARGET_COMMON_DEFINED */
+
+#ifndef TARGET_NAME
+#error TARGET_NAME must be defined
+#endif /* TARGET_NAME */
+
+#ifndef TARGET_STRING
+#error TARGET_STRING must be defined
+#endif /* TARGET_STRING */
+
+#ifndef TARGET_ARCHITECTURE
+#error TARGET_ARCHITECTURE must be defined
+#endif /* TARGET_ARCHITECTURE */
+
+#ifndef TARGET_BIG_ENDIAN
+#error TARGET_BIG_ENDIAN must be defined
+#endif /* TARGET_BIG_ENDIAN */
+
+#ifndef TARGET_ARCHIVE
+#error TARGET_ARCHIVE must be defined
+#endif /* TARGET_ARCHIVE */
+
+#if ((TARGET_ARCHIVE) && (! TARGET_BIG_ENDIAN))
+#error Mach-O fat files must always be big-endian.
+#endif /* ((TARGET_ARCHIVE) && (! TARGET_BIG_ENDIAN)) */
+
+static const bfd_mach_o_backend_data TARGET_NAME_BACKEND =
+{
+  TARGET_ARCHITECTURE,
+  bfd_mach_o_swap_reloc_in,
+  bfd_mach_o_swap_reloc_out,
+  bfd_mach_o_print_thread
+};
+
+const bfd_target TARGET_NAME =
+{
+  TARGET_STRING,		/* Name.  */
+  bfd_target_mach_o_flavour,
+#if TARGET_BIG_ENDIAN
+  BFD_ENDIAN_BIG,		/* Target byte order.  */
+  BFD_ENDIAN_BIG,		/* Target headers byte order.  */
+#else
+  BFD_ENDIAN_LITTLE,		/* Target byte order.  */
+  BFD_ENDIAN_LITTLE,		/* Target headers byte order.  */
+#endif
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED),
+  (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
+   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* Section flags.  */
+  '_',				/* symbol_leading_char.  */
+  ' ',				/* ar_pad_char.  */
+  16,				/* ar_max_namelen.  */
+  0,				/* match priority.  */
+
+#if TARGET_BIG_ENDIAN
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Data.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Hdrs.  */
+#else
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* data */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* hdrs */
+#endif /* TARGET_BIG_ENDIAN */
+
+  {				/* bfd_check_format.  */
+#if TARGET_ARCHIVE
+    _bfd_dummy_target,
+    _bfd_dummy_target,
+    bfd_mach_o_archive_p,
+    _bfd_dummy_target,
+#else
+    _bfd_dummy_target,
+    bfd_mach_o_object_p,
+    bfd_generic_archive_p,
+    bfd_mach_o_core_p
+#endif
+  },
+  {				/* bfd_set_format.  */
+    bfd_false,
+    bfd_mach_o_mkobject,
+    _bfd_generic_mkarchive,
+    bfd_mach_o_mkobject,
+  },
+  {				/* bfd_write_contents.  */
+    bfd_false,
+    bfd_mach_o_write_contents,
+    _bfd_write_archive_contents,
+    bfd_mach_o_write_contents,
+  },
+
+  BFD_JUMP_TABLE_GENERIC (bfd_mach_o),
+  BFD_JUMP_TABLE_COPY (bfd_mach_o),
+  BFD_JUMP_TABLE_CORE (bfd_mach_o),
+#if TARGET_ARCHIVE
+  BFD_JUMP_TABLE_ARCHIVE (bfd_mach_o),
+#else
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd44),
+#endif
+  BFD_JUMP_TABLE_SYMBOLS (bfd_mach_o),
+  BFD_JUMP_TABLE_RELOCS (bfd_mach_o),
+  BFD_JUMP_TABLE_WRITE (bfd_mach_o),
+  BFD_JUMP_TABLE_LINK (bfd_mach_o),
+  BFD_JUMP_TABLE_DYNAMIC (bfd_mach_o),
+
+  /* Alternative endian target.  */
+  NULL,
+
+  /* Back-end data.  */
+  &TARGET_NAME_BACKEND
+};
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/mach-o-x86-64.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/mach-o-x86-64.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/mach-o-x86-64.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/mach-o-x86-64.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,296 @@
+/* Intel x86-64 Mach-O support for BFD.
+   Copyright 2010
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "mach-o.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libiberty.h"
+#include "mach-o/x86-64.h"
+
+#define bfd_mach_o_object_p bfd_mach_o_x86_64_object_p
+#define bfd_mach_o_core_p bfd_mach_o_x86_64_core_p
+#define bfd_mach_o_mkobject bfd_mach_o_x86_64_mkobject
+
+static const bfd_target *
+bfd_mach_o_x86_64_object_p (bfd *abfd)
+{
+  return bfd_mach_o_header_p (abfd, 0, BFD_MACH_O_CPU_TYPE_X86_64);
+}
+
+static const bfd_target *
+bfd_mach_o_x86_64_core_p (bfd *abfd)
+{
+  return bfd_mach_o_header_p (abfd,
+                              BFD_MACH_O_MH_CORE, BFD_MACH_O_CPU_TYPE_X86_64);
+}
+
+static bfd_boolean
+bfd_mach_o_x86_64_mkobject (bfd *abfd)
+{
+  bfd_mach_o_data_struct *mdata;
+
+  if (!bfd_mach_o_mkobject_init (abfd))
+    return FALSE;
+
+  mdata = bfd_mach_o_get_data (abfd);
+  mdata->header.magic = BFD_MACH_O_MH_MAGIC_64;
+  mdata->header.cputype = BFD_MACH_O_CPU_TYPE_X86_64;
+  mdata->header.cpusubtype = BFD_MACH_O_CPU_SUBTYPE_X86_ALL;
+  mdata->header.byteorder = BFD_ENDIAN_LITTLE;
+  mdata->header.version = 2;
+
+  return TRUE;
+}
+
+/* In case we're on a 32-bit machine, construct a 64-bit "-1" value.  */
+#define MINUS_ONE (~ (bfd_vma) 0)
+
+static reloc_howto_type x86_64_howto_table[]=
+{
+  /* 0 */
+  HOWTO(BFD_RELOC_64, 0, 4, 64, FALSE, 0,
+	complain_overflow_bitfield,
+	NULL, "64",
+	FALSE, MINUS_ONE, MINUS_ONE, FALSE),
+  HOWTO(BFD_RELOC_32, 0, 2, 32, FALSE, 0,
+	complain_overflow_bitfield,
+	NULL, "32",
+	FALSE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(BFD_RELOC_32_PCREL, 0, 2, 32, TRUE, 0,
+	complain_overflow_bitfield,
+	NULL, "DISP32",
+	FALSE, 0xffffffff, 0xffffffff, TRUE),
+  HOWTO(BFD_RELOC_MACH_O_X86_64_PCREL32_1, 0, 2, 32, TRUE, 0,
+	complain_overflow_bitfield,
+	NULL, "DISP32_1",
+	FALSE, 0xffffffff, 0xffffffff, TRUE),
+  /* 4 */
+  HOWTO(BFD_RELOC_MACH_O_X86_64_PCREL32_2, 0, 2, 32, TRUE, 0,
+	complain_overflow_bitfield,
+	NULL, "DISP32_2",
+	FALSE, 0xffffffff, 0xffffffff, TRUE),
+  HOWTO(BFD_RELOC_MACH_O_X86_64_PCREL32_4, 0, 2, 32, TRUE, 0,
+	complain_overflow_bitfield,
+	NULL, "DISP32_4",
+	FALSE, 0xffffffff, 0xffffffff, TRUE),
+  HOWTO(BFD_RELOC_MACH_O_X86_64_BRANCH32, 0, 2, 32, TRUE, 0,
+	complain_overflow_bitfield,
+	NULL, "BRANCH32",
+	FALSE, 0xffffffff, 0xffffffff, TRUE),
+  HOWTO(BFD_RELOC_MACH_O_X86_64_GOT_LOAD, 0, 2, 32, TRUE, 0,
+	complain_overflow_bitfield,
+	NULL, "GOT_LOAD",
+	FALSE, 0xffffffff, 0xffffffff, TRUE),
+  /* 8 */
+  HOWTO(BFD_RELOC_MACH_O_X86_64_SUBTRACTOR32, 0, 2, 32, FALSE, 0,
+	complain_overflow_bitfield,
+	NULL, "SUBTRACTOR32",
+	FALSE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO(BFD_RELOC_MACH_O_X86_64_SUBTRACTOR64, 0, 4, 64, FALSE, 0,
+	complain_overflow_bitfield,
+	NULL, "SUBTRACTOR64",
+	FALSE, MINUS_ONE, MINUS_ONE, FALSE),
+  HOWTO(BFD_RELOC_MACH_O_X86_64_GOT, 0, 2, 32, TRUE, 0,
+	complain_overflow_bitfield,
+	NULL, "GOT",
+	FALSE, 0xffffffff, 0xffffffff, TRUE),
+  HOWTO(BFD_RELOC_MACH_O_X86_64_BRANCH8, 0, 0, 8, TRUE, 0,
+	complain_overflow_bitfield,
+	NULL, "BRANCH8",
+	FALSE, 0xff, 0xff, TRUE),
+};
+
+static bfd_boolean
+bfd_mach_o_x86_64_swap_reloc_in (arelent *res, bfd_mach_o_reloc_info *reloc)
+{
+  /* On x86-64, scattered relocs are not used.  */
+  if (reloc->r_scattered)
+    return FALSE;
+
+  switch (reloc->r_type)
+    {
+    case BFD_MACH_O_X86_64_RELOC_UNSIGNED:
+      if (reloc->r_pcrel)
+        return FALSE;
+      switch (reloc->r_length)
+        {
+        case 2:
+          res->howto = &x86_64_howto_table[1];
+          return TRUE;
+        case 3:
+          res->howto = &x86_64_howto_table[0];
+          return TRUE;
+        default:
+          return FALSE;
+        }
+    case BFD_MACH_O_X86_64_RELOC_SIGNED:
+      if (reloc->r_length == 2 && reloc->r_pcrel)
+        {
+          res->howto = &x86_64_howto_table[2];
+          return TRUE;
+        }
+      break;
+    case BFD_MACH_O_X86_64_RELOC_BRANCH:
+      if (!reloc->r_pcrel)
+        return FALSE;
+      switch (reloc->r_length)
+        {
+        case 2:
+          res->howto = &x86_64_howto_table[6];
+          return TRUE;
+        default:
+          return FALSE;
+        }
+      break;
+    case BFD_MACH_O_X86_64_RELOC_GOT_LOAD:
+      if (reloc->r_length == 2 && reloc->r_pcrel && reloc->r_extern)
+        {
+          res->howto = &x86_64_howto_table[7];
+          return TRUE;
+        }
+      break;
+    case BFD_MACH_O_X86_64_RELOC_GOT:
+      if (reloc->r_length == 2 && reloc->r_pcrel && reloc->r_extern)
+        {
+          res->howto = &x86_64_howto_table[10];
+          return TRUE;
+        }
+      break;
+    case BFD_MACH_O_X86_64_RELOC_SUBTRACTOR:
+      if (reloc->r_pcrel)
+        return FALSE;
+      switch (reloc->r_length)
+        {
+        case 2:
+          res->howto = &x86_64_howto_table[8];
+          return TRUE;
+        case 3:
+          res->howto = &x86_64_howto_table[9];
+          return TRUE;
+        default:
+          return FALSE;
+        }
+      break;
+    case BFD_MACH_O_X86_64_RELOC_SIGNED_1:
+      if (reloc->r_length == 2 && reloc->r_pcrel)
+        {
+          res->howto = &x86_64_howto_table[3];
+          return TRUE;
+        }
+      break;
+    case BFD_MACH_O_X86_64_RELOC_SIGNED_2:
+      if (reloc->r_length == 2 && reloc->r_pcrel)
+        {
+          res->howto = &x86_64_howto_table[4];
+          return TRUE;
+        }
+      break;
+    case BFD_MACH_O_X86_64_RELOC_SIGNED_4:
+      if (reloc->r_length == 2 && reloc->r_pcrel)
+        {
+          res->howto = &x86_64_howto_table[5];
+          return TRUE;
+        }
+      break;
+    default:
+      return FALSE;
+    }
+  return FALSE;
+}
+
+static bfd_boolean
+bfd_mach_o_x86_64_swap_reloc_out (arelent *rel, bfd_mach_o_reloc_info *rinfo)
+{
+  rinfo->r_address = rel->address;
+  rinfo->r_scattered = 0;
+  switch (rel->howto->type)
+    {
+    case BFD_RELOC_64:
+      rinfo->r_type = BFD_MACH_O_X86_64_RELOC_UNSIGNED;
+      rinfo->r_pcrel = 0;
+      rinfo->r_length = 3;
+      break;
+    case BFD_RELOC_32_PCREL:
+      rinfo->r_type = BFD_MACH_O_X86_64_RELOC_BRANCH;
+      rinfo->r_pcrel = 1;
+      rinfo->r_length = 2;
+      break;
+    case BFD_RELOC_MACH_O_X86_64_SUBTRACTOR64:
+      rinfo->r_type = BFD_MACH_O_X86_64_RELOC_SUBTRACTOR;
+      rinfo->r_pcrel = 0;
+      rinfo->r_length = 3;
+      break;
+    case BFD_RELOC_MACH_O_X86_64_GOT_LOAD:
+      rinfo->r_type = BFD_MACH_O_X86_64_RELOC_GOT_LOAD;
+      rinfo->r_pcrel = 1;
+      rinfo->r_length = 2;
+      break;
+    default:
+      return FALSE;
+    }
+  if ((*rel->sym_ptr_ptr)->flags & BSF_SECTION_SYM)
+    {
+      rinfo->r_extern = 0;
+      rinfo->r_value = (*rel->sym_ptr_ptr)->section->target_index;
+    }
+  else
+    {
+      rinfo->r_extern = 1;
+      rinfo->r_value = (*rel->sym_ptr_ptr)->udata.i;
+    }
+  return TRUE;
+}
+
+static reloc_howto_type *
+bfd_mach_o_x86_64_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                                         bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (x86_64_howto_table) / sizeof (*x86_64_howto_table);
+       i++)
+    if (code == x86_64_howto_table[i].type)
+      return &x86_64_howto_table[i];
+  return NULL;
+}
+
+static reloc_howto_type *
+bfd_mach_o_x86_64_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                                         const char *name ATTRIBUTE_UNUSED)
+{
+  return NULL;
+}
+
+#define bfd_mach_o_swap_reloc_in bfd_mach_o_x86_64_swap_reloc_in
+#define bfd_mach_o_swap_reloc_out bfd_mach_o_x86_64_swap_reloc_out
+
+#define bfd_mach_o_bfd_reloc_type_lookup bfd_mach_o_x86_64_bfd_reloc_type_lookup
+#define bfd_mach_o_bfd_reloc_name_lookup bfd_mach_o_x86_64_bfd_reloc_name_lookup
+#define bfd_mach_o_print_thread NULL
+
+#define TARGET_NAME 		mach_o_x86_64_vec
+#define TARGET_STRING 		"mach-o-x86-64"
+#define TARGET_ARCHITECTURE	bfd_arch_i386
+#define TARGET_BIG_ENDIAN 	0
+#define TARGET_ARCHIVE 		0
+#include "mach-o-target.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/mach-o.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/mach-o.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/mach-o.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/mach-o.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4252 @@
+/* Mach-O support for BFD.
+   Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+   2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "mach-o.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libiberty.h"
+#include "aout/stab_gnu.h"
+#include "mach-o/reloc.h"
+#include "mach-o/external.h"
+#include <ctype.h>
+
+#define bfd_mach_o_object_p bfd_mach_o_gen_object_p
+#define bfd_mach_o_core_p bfd_mach_o_gen_core_p
+#define bfd_mach_o_mkobject bfd_mach_o_gen_mkobject
+
+#define FILE_ALIGN(off, algn) \
+  (((off) + ((file_ptr) 1 << (algn)) - 1) & ((file_ptr) -1 << (algn)))
+
+static int bfd_mach_o_read_symtab_symbols (bfd *);
+
+unsigned int
+bfd_mach_o_version (bfd *abfd)
+{
+  bfd_mach_o_data_struct *mdata = NULL;
+
+  BFD_ASSERT (bfd_mach_o_valid (abfd));
+  mdata = bfd_mach_o_get_data (abfd);
+
+  return mdata->header.version;
+}
+
+bfd_boolean
+bfd_mach_o_valid (bfd *abfd)
+{
+  if (abfd == NULL || abfd->xvec == NULL)
+    return FALSE;
+
+  if (abfd->xvec->flavour != bfd_target_mach_o_flavour)
+    return FALSE;
+
+  if (bfd_mach_o_get_data (abfd) == NULL)
+    return FALSE;
+  return TRUE;
+}
+
+static INLINE bfd_boolean
+mach_o_wide_p (bfd_mach_o_header *header)
+{
+  switch (header->version)
+    {
+    case 1:
+      return FALSE;
+    case 2:
+      return TRUE;
+    default:
+      BFD_FAIL ();
+      return FALSE;
+    }
+}
+
+static INLINE bfd_boolean
+bfd_mach_o_wide_p (bfd *abfd)
+{
+  return mach_o_wide_p (&bfd_mach_o_get_data (abfd)->header);
+}
+      
+/* Tables to translate well known Mach-O segment/section names to bfd
+   names.  Use of canonical names (such as .text or .debug_frame) is required
+   by gdb.  */
+
+struct mach_o_section_name_xlat
+{
+  const char *bfd_name;
+  const char *mach_o_name;
+  flagword flags;
+};
+
+static const struct mach_o_section_name_xlat dwarf_section_names_xlat[] =
+  {
+    { ".debug_frame",    "__debug_frame",    SEC_DEBUGGING },
+    { ".debug_info",     "__debug_info",     SEC_DEBUGGING },
+    { ".debug_abbrev",   "__debug_abbrev",   SEC_DEBUGGING },
+    { ".debug_aranges",  "__debug_aranges",  SEC_DEBUGGING },
+    { ".debug_macinfo",  "__debug_macinfo",  SEC_DEBUGGING },
+    { ".debug_line",     "__debug_line",     SEC_DEBUGGING },
+    { ".debug_loc",      "__debug_loc",      SEC_DEBUGGING },
+    { ".debug_pubnames", "__debug_pubnames", SEC_DEBUGGING },
+    { ".debug_pubtypes", "__debug_pubtypes", SEC_DEBUGGING },
+    { ".debug_str",      "__debug_str",      SEC_DEBUGGING },
+    { ".debug_ranges",   "__debug_ranges",   SEC_DEBUGGING },
+    { NULL, NULL, 0}
+  };
+
+static const struct mach_o_section_name_xlat text_section_names_xlat[] =
+  {
+    { ".text",     "__text",      SEC_CODE | SEC_LOAD },
+    { ".const",    "__const",     SEC_READONLY | SEC_DATA | SEC_LOAD },
+    { ".cstring",  "__cstring",   SEC_READONLY | SEC_DATA | SEC_LOAD },
+    { ".eh_frame", "__eh_frame",  SEC_READONLY | SEC_LOAD },
+    { NULL, NULL, 0}
+  };
+
+static const struct mach_o_section_name_xlat data_section_names_xlat[] =
+  {
+    { ".data",                "__data",          SEC_DATA | SEC_LOAD },
+    { ".const_data",          "__const",         SEC_DATA | SEC_LOAD },
+    { ".dyld",                "__dyld",          SEC_DATA | SEC_LOAD },
+    { ".lazy_symbol_ptr",     "__la_symbol_ptr", SEC_DATA | SEC_LOAD },
+    { ".non_lazy_symbol_ptr", "__nl_symbol_ptr", SEC_DATA | SEC_LOAD },
+    { ".bss",                 "__bss",           SEC_NO_FLAGS },
+    { NULL, NULL, 0}
+  };
+
+struct mach_o_segment_name_xlat
+{
+  /* Segment name.  */
+  const char *segname;
+
+  /* List of known sections for the segment.  */
+  const struct mach_o_section_name_xlat *sections;
+};
+
+/* List of known segment names.  */
+
+static const struct mach_o_segment_name_xlat segsec_names_xlat[] =
+  {
+    { "__TEXT", text_section_names_xlat },
+    { "__DATA", data_section_names_xlat },
+    { "__DWARF", dwarf_section_names_xlat },
+    { NULL, NULL }
+  };
+
+/* Mach-O to bfd names.  */
+
+void
+bfd_mach_o_normalize_section_name (const char *segname, const char *sectname,
+                                   const char **name, flagword *flags)
+{
+  const struct mach_o_segment_name_xlat *seg;
+
+  *name = NULL;
+  *flags = SEC_NO_FLAGS;
+
+  for (seg = segsec_names_xlat; seg->segname; seg++)
+    {
+      if (strncmp (seg->segname, segname, BFD_MACH_O_SEGNAME_SIZE) == 0)
+        {
+          const struct mach_o_section_name_xlat *sec;
+
+          for (sec = seg->sections; sec->mach_o_name; sec++)
+            {
+              if (strncmp (sec->mach_o_name, sectname,
+                           BFD_MACH_O_SECTNAME_SIZE) == 0)
+                {
+                  *name = sec->bfd_name;
+                  *flags = sec->flags;
+                  return;
+                }
+            }
+          return;
+        }
+    }
+}
+
+/* Convert Mach-O section name to BFD.  Try to use standard names, otherwise
+   forge a new name.  SEGNAME and SECTNAME are 16 bytes strings.  */
+
+static void
+bfd_mach_o_convert_section_name_to_bfd
+  (bfd *abfd, const char *segname, const char *sectname,
+   const char **name, flagword *flags)
+{
+  char *res;
+  unsigned int len;
+  const char *pfx = "";
+
+  /* First search for a canonical name.  */
+  bfd_mach_o_normalize_section_name (segname, sectname, name, flags);
+
+  /* Return now if found.  */
+  if (*name)
+    return;
+
+  len = 16 + 1 + 16 + 1;
+
+  /* Put "LC_SEGMENT." prefix if the segment name is weird (ie doesn't start
+     with an underscore.  */
+  if (segname[0] != '_')
+    {
+      static const char seg_pfx[] = "LC_SEGMENT.";
+
+      pfx = seg_pfx;
+      len += sizeof (seg_pfx) - 1;
+    }
+
+  res = bfd_alloc (abfd, len);
+  if (res == NULL)
+    return;
+  snprintf (res, len, "%s%.16s.%.16s", pfx, segname, sectname);
+  *name = res;
+  *flags = SEC_NO_FLAGS;
+}
+
+/* Convert a bfd section name to a Mach-O segment + section name.  */
+
+static void
+bfd_mach_o_convert_section_name_to_mach_o (bfd *abfd ATTRIBUTE_UNUSED,
+                                           asection *sect,
+                                           bfd_mach_o_section *section)
+{
+  const struct mach_o_segment_name_xlat *seg;
+  const char *name = bfd_get_section_name (abfd, sect);
+  const char *dot;
+  unsigned int len;
+  unsigned int seglen;
+  unsigned int seclen;
+
+  /* List of well known names.  They all start with a dot.  */
+  if (name[0] == '.')
+    for (seg = segsec_names_xlat; seg->segname; seg++)
+      {
+        const struct mach_o_section_name_xlat *sec;
+
+        for (sec = seg->sections; sec->mach_o_name; sec++)
+          {
+            if (strcmp (sec->bfd_name, name) == 0)
+              {
+                strcpy (section->segname, seg->segname);
+                strcpy (section->sectname, sec->mach_o_name);
+                return;
+              }
+          }
+      }
+
+  /* Strip LC_SEGMENT. prefix.  */
+  if (strncmp (name, "LC_SEGMENT.", 11) == 0)
+    name += 11;
+
+  /* Find a dot.  */
+  dot = strchr (name, '.');
+  len = strlen (name);
+
+  /* Try to split name into segment and section names.  */
+  if (dot && dot != name)
+    {
+      seglen = dot - name;
+      seclen = len - (dot + 1 - name);
+
+      if (seglen < 16 && seclen < 16)
+        {
+          memcpy (section->segname, name, seglen);
+          section->segname[seglen] = 0;
+          memcpy (section->sectname, dot + 1, seclen);
+          section->sectname[seclen] = 0;
+          return;
+        }
+    }
+
+  if (len > 16)
+    len = 16;
+  memcpy (section->segname, name, len);
+  section->segname[len] = 0;
+  memcpy (section->sectname, name, len);
+  section->sectname[len] = 0;
+}
+
+/* Return the size of an entry for section SEC.
+   Must be called only for symbol pointer section and symbol stubs
+   sections.  */
+
+static unsigned int
+bfd_mach_o_section_get_entry_size (bfd *abfd, bfd_mach_o_section *sec)
+{
+  switch (sec->flags & BFD_MACH_O_SECTION_TYPE_MASK)
+    {
+    case BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS:
+    case BFD_MACH_O_S_LAZY_SYMBOL_POINTERS:
+      return bfd_mach_o_wide_p (abfd) ? 8 : 4;
+    case BFD_MACH_O_S_SYMBOL_STUBS:
+      return sec->reserved2;
+    default:
+      BFD_FAIL ();
+      return 0;
+    }
+}
+
+/* Return the number of indirect symbols for a section.
+   Must be called only for symbol pointer section and symbol stubs
+   sections.  */
+
+static unsigned int
+bfd_mach_o_section_get_nbr_indirect (bfd *abfd, bfd_mach_o_section *sec)
+{
+  unsigned int elsz;
+
+  elsz = bfd_mach_o_section_get_entry_size (abfd, sec);
+  if (elsz == 0)
+    return 0;
+  else
+    return sec->size / elsz;
+}
+
+
+/* Copy any private info we understand from the input symbol
+   to the output symbol.  */
+
+bfd_boolean
+bfd_mach_o_bfd_copy_private_symbol_data (bfd *ibfd ATTRIBUTE_UNUSED,
+					 asymbol *isymbol ATTRIBUTE_UNUSED,
+					 bfd *obfd ATTRIBUTE_UNUSED,
+					 asymbol *osymbol ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+/* Copy any private info we understand from the input section
+   to the output section.  */
+
+bfd_boolean
+bfd_mach_o_bfd_copy_private_section_data (bfd *ibfd ATTRIBUTE_UNUSED,
+					  asection *isection ATTRIBUTE_UNUSED,
+					  bfd *obfd ATTRIBUTE_UNUSED,
+					  asection *osection ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+/* Copy any private info we understand from the input bfd
+   to the output bfd.  */
+
+bfd_boolean
+bfd_mach_o_bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  if (bfd_get_flavour (ibfd) != bfd_target_mach_o_flavour
+      || bfd_get_flavour (obfd) != bfd_target_mach_o_flavour)
+    return TRUE;
+
+  BFD_ASSERT (bfd_mach_o_valid (ibfd));
+  BFD_ASSERT (bfd_mach_o_valid (obfd));
+
+  /* FIXME: copy commands.  */
+
+  return TRUE;
+}
+
+/* Count the total number of symbols.  */
+
+static long
+bfd_mach_o_count_symbols (bfd *abfd)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+
+  if (mdata->symtab == NULL)
+    return 0;
+  return mdata->symtab->nsyms;
+}
+
+long
+bfd_mach_o_get_symtab_upper_bound (bfd *abfd)
+{
+  long nsyms = bfd_mach_o_count_symbols (abfd);
+
+  return ((nsyms + 1) * sizeof (asymbol *));
+}
+
+long
+bfd_mach_o_canonicalize_symtab (bfd *abfd, asymbol **alocation)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  long nsyms = bfd_mach_o_count_symbols (abfd);
+  bfd_mach_o_symtab_command *sym = mdata->symtab;
+  unsigned long j;
+
+  if (nsyms < 0)
+    return nsyms;
+
+  if (nsyms == 0)
+    {
+      /* Do not try to read symbols if there are none.  */
+      alocation[0] = NULL;
+      return 0;
+    }
+
+  if (bfd_mach_o_read_symtab_symbols (abfd) != 0)
+    {
+      (*_bfd_error_handler) (_("bfd_mach_o_canonicalize_symtab: unable to load symbols"));
+      return 0;
+    }
+
+  BFD_ASSERT (sym->symbols != NULL);
+
+  for (j = 0; j < sym->nsyms; j++)
+    alocation[j] = &sym->symbols[j].symbol;
+
+  alocation[j] = NULL;
+
+  return nsyms;
+}
+
+long
+bfd_mach_o_get_synthetic_symtab (bfd *abfd,
+                                 long symcount ATTRIBUTE_UNUSED,
+                                 asymbol **syms ATTRIBUTE_UNUSED,
+                                 long dynsymcount ATTRIBUTE_UNUSED,
+                                 asymbol **dynsyms ATTRIBUTE_UNUSED,
+                                 asymbol **ret)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  bfd_mach_o_dysymtab_command *dysymtab = mdata->dysymtab;
+  bfd_mach_o_symtab_command *symtab = mdata->symtab;
+  asymbol *s;
+  unsigned long count, i, j, n;
+  size_t size;
+  char *names;
+  char *nul_name;
+
+  *ret = NULL;
+
+  if (dysymtab == NULL || symtab == NULL || symtab->symbols == NULL)
+    return 0;
+
+  if (dysymtab->nindirectsyms == 0)
+    return 0;
+
+  count = dysymtab->nindirectsyms;
+  size = count * sizeof (asymbol) + 1;
+
+  for (j = 0; j < count; j++)
+    {
+      unsigned int isym = dysymtab->indirect_syms[j];
+              
+      if (isym < symtab->nsyms && symtab->symbols[isym].symbol.name)
+        size += strlen (symtab->symbols[isym].symbol.name) + sizeof ("$stub");
+    }
+
+  s = *ret = (asymbol *) bfd_malloc (size);
+  if (s == NULL)
+    return -1;
+  names = (char *) (s + count);
+  nul_name = names;
+  *names++ = 0;
+  
+  n = 0;
+  for (i = 0; i < mdata->nsects; i++)
+    {
+      bfd_mach_o_section *sec = mdata->sections[i];
+      unsigned int first, last;
+      bfd_vma addr;
+      bfd_vma entry_size;
+      
+      switch (sec->flags & BFD_MACH_O_SECTION_TYPE_MASK)
+        {
+        case BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS:
+        case BFD_MACH_O_S_LAZY_SYMBOL_POINTERS:
+        case BFD_MACH_O_S_SYMBOL_STUBS:
+          first = sec->reserved1;
+          last = first + bfd_mach_o_section_get_nbr_indirect (abfd, sec);
+          addr = sec->addr;
+          entry_size = bfd_mach_o_section_get_entry_size (abfd, sec);
+          for (j = first; j < last; j++)
+            {
+              unsigned int isym = dysymtab->indirect_syms[j];
+
+              s->flags = BSF_GLOBAL | BSF_SYNTHETIC;
+              s->section = sec->bfdsection;
+              s->value = addr - sec->addr;
+              s->udata.p = NULL;
+              
+              if (isym < symtab->nsyms
+                  && symtab->symbols[isym].symbol.name)
+                {
+                  const char *sym = symtab->symbols[isym].symbol.name;
+                  size_t len;
+
+                  s->name = names;
+                  len = strlen (sym);
+                  memcpy (names, sym, len);
+                  names += len;
+                  memcpy (names, "$stub", sizeof ("$stub"));
+                  names += sizeof ("$stub");
+                }
+              else
+                s->name = nul_name;
+
+              addr += entry_size;
+              s++;
+              n++;
+            }
+          break;
+        default:
+          break;
+        }
+    }
+
+  return n;
+}
+
+void
+bfd_mach_o_get_symbol_info (bfd *abfd ATTRIBUTE_UNUSED,
+			    asymbol *symbol,
+			    symbol_info *ret)
+{
+  bfd_symbol_info (symbol, ret);
+}
+
+void
+bfd_mach_o_print_symbol (bfd *abfd,
+			 void * afile,
+			 asymbol *symbol,
+			 bfd_print_symbol_type how)
+{
+  FILE *file = (FILE *) afile;
+  const char *name;
+  bfd_mach_o_asymbol *asym = (bfd_mach_o_asymbol *)symbol;
+
+  switch (how)
+    {
+    case bfd_print_symbol_name:
+      fprintf (file, "%s", symbol->name);
+      break;
+    default:
+      bfd_print_symbol_vandf (abfd, (void *) file, symbol);
+      if (asym->n_type & BFD_MACH_O_N_STAB)
+	name = bfd_get_stab_name (asym->n_type);
+      else
+	switch (asym->n_type & BFD_MACH_O_N_TYPE)
+	  {
+	  case BFD_MACH_O_N_UNDF:
+	    name = "UND";
+	    break;
+	  case BFD_MACH_O_N_ABS:
+	    name = "ABS";
+	    break;
+	  case BFD_MACH_O_N_INDR:
+	    name = "INDR";
+	    break;
+	  case BFD_MACH_O_N_PBUD:
+	    name = "PBUD";
+	    break;
+	  case BFD_MACH_O_N_SECT:
+	    name = "SECT";
+	    break;
+	  default:
+	    name = "???";
+	    break;
+	  }
+      if (name == NULL)
+	name = "";
+      fprintf (file, " %02x %-6s %02x %04x",
+               asym->n_type, name, asym->n_sect, asym->n_desc);
+      if ((asym->n_type & BFD_MACH_O_N_STAB) == 0
+	  && (asym->n_type & BFD_MACH_O_N_TYPE) == BFD_MACH_O_N_SECT)
+	fprintf (file, " %-5s", symbol->section->name);
+      fprintf (file, " %s", symbol->name);
+    }
+}
+
+static void
+bfd_mach_o_convert_architecture (bfd_mach_o_cpu_type mtype,
+				 bfd_mach_o_cpu_subtype msubtype ATTRIBUTE_UNUSED,
+				 enum bfd_architecture *type,
+				 unsigned long *subtype)
+{
+  *subtype = bfd_arch_unknown;
+
+  switch (mtype)
+    {
+    case BFD_MACH_O_CPU_TYPE_VAX: *type = bfd_arch_vax; break;
+    case BFD_MACH_O_CPU_TYPE_MC680x0: *type = bfd_arch_m68k; break;
+    case BFD_MACH_O_CPU_TYPE_I386:
+      *type = bfd_arch_i386;
+      *subtype = bfd_mach_i386_i386;
+      break;
+    case BFD_MACH_O_CPU_TYPE_X86_64:
+      *type = bfd_arch_i386;
+      *subtype = bfd_mach_x86_64;
+      break;
+    case BFD_MACH_O_CPU_TYPE_MIPS: *type = bfd_arch_mips; break;
+    case BFD_MACH_O_CPU_TYPE_MC98000: *type = bfd_arch_m98k; break;
+    case BFD_MACH_O_CPU_TYPE_HPPA: *type = bfd_arch_hppa; break;
+    case BFD_MACH_O_CPU_TYPE_ARM: *type = bfd_arch_arm; break;
+    case BFD_MACH_O_CPU_TYPE_MC88000: *type = bfd_arch_m88k; break;
+    case BFD_MACH_O_CPU_TYPE_SPARC:
+      *type = bfd_arch_sparc;
+      *subtype = bfd_mach_sparc;
+      break;
+    case BFD_MACH_O_CPU_TYPE_I860: *type = bfd_arch_i860; break;
+    case BFD_MACH_O_CPU_TYPE_ALPHA: *type = bfd_arch_alpha; break;
+    case BFD_MACH_O_CPU_TYPE_POWERPC:
+      *type = bfd_arch_powerpc;
+      *subtype = bfd_mach_ppc;
+      break;
+    case BFD_MACH_O_CPU_TYPE_POWERPC_64:
+      *type = bfd_arch_powerpc;
+      *subtype = bfd_mach_ppc64;
+      break;
+    default:
+      *type = bfd_arch_unknown;
+      break;
+    }
+}
+
+static bfd_boolean
+bfd_mach_o_write_header (bfd *abfd, bfd_mach_o_header *header)
+{
+  struct mach_o_header_external raw;
+  unsigned int size;
+
+  size = mach_o_wide_p (header) ?
+    BFD_MACH_O_HEADER_64_SIZE : BFD_MACH_O_HEADER_SIZE;
+
+  bfd_h_put_32 (abfd, header->magic, raw.magic);
+  bfd_h_put_32 (abfd, header->cputype, raw.cputype);
+  bfd_h_put_32 (abfd, header->cpusubtype, raw.cpusubtype);
+  bfd_h_put_32 (abfd, header->filetype, raw.filetype);
+  bfd_h_put_32 (abfd, header->ncmds, raw.ncmds);
+  bfd_h_put_32 (abfd, header->sizeofcmds, raw.sizeofcmds);
+  bfd_h_put_32 (abfd, header->flags, raw.flags);
+
+  if (mach_o_wide_p (header))
+    bfd_h_put_32 (abfd, header->reserved, raw.reserved);
+
+  if (bfd_seek (abfd, 0, SEEK_SET) != 0
+      || bfd_bwrite (&raw, size, abfd) != size)
+    return FALSE;
+
+  return TRUE;
+}
+
+static int
+bfd_mach_o_write_thread (bfd *abfd, bfd_mach_o_load_command *command)
+{
+  bfd_mach_o_thread_command *cmd = &command->command.thread;
+  unsigned int i;
+  struct mach_o_thread_command_external raw;
+  unsigned int offset;
+
+  BFD_ASSERT ((command->type == BFD_MACH_O_LC_THREAD)
+	      || (command->type == BFD_MACH_O_LC_UNIXTHREAD));
+
+  offset = 8;
+  for (i = 0; i < cmd->nflavours; i++)
+    {
+      BFD_ASSERT ((cmd->flavours[i].size % 4) == 0);
+      BFD_ASSERT (cmd->flavours[i].offset ==
+                  (command->offset + offset + BFD_MACH_O_LC_SIZE));
+
+      bfd_h_put_32 (abfd, cmd->flavours[i].flavour, raw.flavour);
+      bfd_h_put_32 (abfd, (cmd->flavours[i].size / 4), raw.count);
+
+      if (bfd_seek (abfd, command->offset + offset, SEEK_SET) != 0
+          || bfd_bwrite (&raw, sizeof (raw), abfd) != sizeof (raw))
+	return -1;
+
+      offset += cmd->flavours[i].size + sizeof (raw);
+    }
+
+  return 0;
+}
+
+long
+bfd_mach_o_get_reloc_upper_bound (bfd *abfd ATTRIBUTE_UNUSED,
+                                  asection *asect)
+{
+  return (asect->reloc_count + 1) * sizeof (arelent *);
+}
+
+static int
+bfd_mach_o_canonicalize_one_reloc (bfd *abfd,
+                                   struct mach_o_reloc_info_external *raw,
+                                   arelent *res, asymbol **syms)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  bfd_mach_o_backend_data *bed = bfd_mach_o_get_backend_data (abfd);
+  bfd_mach_o_reloc_info reloc;
+  bfd_vma addr;
+  bfd_vma symnum;
+  asymbol **sym;
+
+  addr = bfd_get_32 (abfd, raw->r_address);
+  symnum = bfd_get_32 (abfd, raw->r_symbolnum);
+  
+  if (addr & BFD_MACH_O_SR_SCATTERED)
+    {
+      unsigned int j;
+
+      /* Scattered relocation.
+         Extract section and offset from r_value.  */
+      res->sym_ptr_ptr = NULL;
+      res->addend = 0;
+      for (j = 0; j < mdata->nsects; j++)
+        {
+          bfd_mach_o_section *sect = mdata->sections[j];
+          if (symnum >= sect->addr && symnum < sect->addr + sect->size)
+            {
+              res->sym_ptr_ptr = sect->bfdsection->symbol_ptr_ptr;
+              res->addend = symnum - sect->addr;
+              break;
+            }
+        }
+      res->address = BFD_MACH_O_GET_SR_ADDRESS (addr);
+      reloc.r_type = BFD_MACH_O_GET_SR_TYPE (addr);
+      reloc.r_length = BFD_MACH_O_GET_SR_LENGTH (addr);
+      reloc.r_pcrel = addr & BFD_MACH_O_SR_PCREL;
+      reloc.r_scattered = 1;
+    }
+  else
+    {
+      unsigned int num = BFD_MACH_O_GET_R_SYMBOLNUM (symnum);
+      res->addend = 0;
+      res->address = addr;
+      if (symnum & BFD_MACH_O_R_EXTERN)
+        {
+          sym = syms + num;
+          reloc.r_extern = 1;
+        }
+      else
+        {
+          BFD_ASSERT (num != 0);
+          BFD_ASSERT (num <= mdata->nsects);
+          sym = mdata->sections[num - 1]->bfdsection->symbol_ptr_ptr;
+          /* For a symbol defined in section S, the addend (stored in the
+             binary) contains the address of the section.  To comply with
+             bfd conventio, substract the section address.
+             Use the address from the header, so that the user can modify
+             the vma of the section.  */
+          res->addend = -mdata->sections[num - 1]->addr;
+          reloc.r_extern = 0;
+        }
+      res->sym_ptr_ptr = sym;
+      reloc.r_type = BFD_MACH_O_GET_R_TYPE (symnum);
+      reloc.r_length = BFD_MACH_O_GET_R_LENGTH (symnum);
+      reloc.r_pcrel = (symnum & BFD_MACH_O_R_PCREL) ? 1 : 0;
+      reloc.r_scattered = 0;
+    }
+  
+  if (!(*bed->_bfd_mach_o_swap_reloc_in)(res, &reloc))
+    return -1;
+  return 0;
+}
+
+static int
+bfd_mach_o_canonicalize_relocs (bfd *abfd, unsigned long filepos,
+                                unsigned long count,
+                                arelent *res, asymbol **syms)
+{
+  unsigned long i;
+  struct mach_o_reloc_info_external *native_relocs;
+  bfd_size_type native_size;
+
+  /* Allocate and read relocs.  */
+  native_size = count * BFD_MACH_O_RELENT_SIZE;
+  native_relocs =
+    (struct mach_o_reloc_info_external *) bfd_malloc (native_size);
+  if (native_relocs == NULL)
+    return -1;
+
+  if (bfd_seek (abfd, filepos, SEEK_SET) != 0
+      || bfd_bread (native_relocs, native_size, abfd) != native_size)
+    goto err;
+
+  for (i = 0; i < count; i++)
+    {
+      if (bfd_mach_o_canonicalize_one_reloc (abfd, &native_relocs[i],
+                                             &res[i], syms) < 0)
+        goto err;
+    }
+  free (native_relocs);
+  return i;
+ err:
+  free (native_relocs);
+  return -1;
+}
+
+long
+bfd_mach_o_canonicalize_reloc (bfd *abfd, asection *asect,
+                               arelent **rels, asymbol **syms)
+{
+  bfd_mach_o_backend_data *bed = bfd_mach_o_get_backend_data (abfd);
+  unsigned long i;
+  arelent *res;
+
+  if (asect->reloc_count == 0)
+    return 0;
+
+  /* No need to go further if we don't know how to read relocs.  */
+  if (bed->_bfd_mach_o_swap_reloc_in == NULL)
+    return 0;
+
+  res = bfd_malloc (asect->reloc_count * sizeof (arelent));
+  if (res == NULL)
+    return -1;
+
+  if (bfd_mach_o_canonicalize_relocs (abfd, asect->rel_filepos,
+                                      asect->reloc_count, res, syms) < 0)
+    {
+      free (res);
+      return -1;
+    }
+
+  for (i = 0; i < asect->reloc_count; i++)
+    rels[i] = &res[i];
+  rels[i] = NULL;
+  asect->relocation = res;
+
+  return i;
+}
+
+long
+bfd_mach_o_get_dynamic_reloc_upper_bound (bfd *abfd)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+
+  if (mdata->dysymtab == NULL)
+    return 1;
+  return (mdata->dysymtab->nextrel + mdata->dysymtab->nlocrel)
+    * sizeof (arelent *);
+}
+
+long
+bfd_mach_o_canonicalize_dynamic_reloc (bfd *abfd, arelent **rels,
+                                       struct bfd_symbol **syms)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  bfd_mach_o_dysymtab_command *dysymtab = mdata->dysymtab;
+  bfd_mach_o_backend_data *bed = bfd_mach_o_get_backend_data (abfd);
+  unsigned long i;
+  arelent *res;
+
+  if (dysymtab == NULL)
+    return 0;
+  if (dysymtab->nextrel == 0 && dysymtab->nlocrel == 0)
+    return 0;
+
+  /* No need to go further if we don't know how to read relocs.  */
+  if (bed->_bfd_mach_o_swap_reloc_in == NULL)
+    return 0;
+
+  res = bfd_malloc ((dysymtab->nextrel + dysymtab->nlocrel) * sizeof (arelent));
+  if (res == NULL)
+    return -1;
+
+  if (bfd_mach_o_canonicalize_relocs (abfd, dysymtab->extreloff,
+                                      dysymtab->nextrel, res, syms) < 0)
+    {
+      free (res);
+      return -1;
+    }
+
+  if (bfd_mach_o_canonicalize_relocs (abfd, dysymtab->locreloff,
+                                      dysymtab->nlocrel,
+                                      res + dysymtab->nextrel, syms) < 0)
+    {
+      free (res);
+      return -1;
+    }
+
+  for (i = 0; i < dysymtab->nextrel + dysymtab->nlocrel; i++)
+    rels[i] = &res[i];
+  rels[i] = NULL;
+  return i;
+}
+
+static bfd_boolean
+bfd_mach_o_write_relocs (bfd *abfd, bfd_mach_o_section *section)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  unsigned int i;
+  arelent **entries;
+  asection *sec;
+  bfd_mach_o_backend_data *bed = bfd_mach_o_get_backend_data (abfd);
+
+  sec = section->bfdsection;
+  if (sec->reloc_count == 0)
+    return TRUE;
+
+  if (bed->_bfd_mach_o_swap_reloc_out == NULL)
+    return TRUE;
+
+  /* Allocate relocation room.  */
+  mdata->filelen = FILE_ALIGN(mdata->filelen, 2);
+  section->nreloc = sec->reloc_count;
+  sec->rel_filepos = mdata->filelen;
+  section->reloff = sec->rel_filepos;
+  mdata->filelen += sec->reloc_count * BFD_MACH_O_RELENT_SIZE;
+
+  if (bfd_seek (abfd, section->reloff, SEEK_SET) != 0)
+    return FALSE;
+
+  /* Convert and write.  */
+  entries = section->bfdsection->orelocation;
+  for (i = 0; i < section->nreloc; i++)
+    {
+      arelent *rel = entries[i];
+      struct mach_o_reloc_info_external raw;
+      bfd_mach_o_reloc_info info, *pinfo = &info;
+
+      /* Convert relocation to an intermediate representation.  */
+      if (!(*bed->_bfd_mach_o_swap_reloc_out) (rel, pinfo))
+        return FALSE;
+
+      /* Lower the relocation info.  */
+      if (pinfo->r_scattered)
+        {
+          unsigned long v;
+
+          v = BFD_MACH_O_SR_SCATTERED
+            | (pinfo->r_pcrel ? BFD_MACH_O_SR_PCREL : 0)
+            | BFD_MACH_O_SET_SR_LENGTH(pinfo->r_length)
+            | BFD_MACH_O_SET_SR_TYPE(pinfo->r_type)
+            | BFD_MACH_O_SET_SR_ADDRESS(pinfo->r_address);
+          /* Note: scattered relocs have field in reverse order...  */
+          bfd_put_32 (abfd, v, raw.r_address);
+          bfd_put_32 (abfd, pinfo->r_value, raw.r_symbolnum);
+        }
+      else
+        {
+          unsigned long v;
+
+          bfd_put_32 (abfd, pinfo->r_address, raw.r_address);
+          v = BFD_MACH_O_SET_R_SYMBOLNUM (pinfo->r_value)
+            | (pinfo->r_pcrel ? BFD_MACH_O_R_PCREL : 0)
+            | BFD_MACH_O_SET_R_LENGTH (pinfo->r_length)
+            | (pinfo->r_extern ? BFD_MACH_O_R_EXTERN : 0)
+            | BFD_MACH_O_SET_R_TYPE (pinfo->r_type);
+          bfd_put_32 (abfd, v, raw.r_symbolnum);
+        }
+
+      if (bfd_bwrite (&raw, BFD_MACH_O_RELENT_SIZE, abfd)
+          != BFD_MACH_O_RELENT_SIZE)
+        return FALSE;
+    }
+  return TRUE;
+}
+
+static int
+bfd_mach_o_write_section_32 (bfd *abfd, bfd_mach_o_section *section)
+{
+  struct mach_o_section_32_external raw;
+
+  memcpy (raw.sectname, section->sectname, 16);
+  memcpy (raw.segname, section->segname, 16);
+  bfd_h_put_32 (abfd, section->addr, raw.addr);
+  bfd_h_put_32 (abfd, section->size, raw.size);
+  bfd_h_put_32 (abfd, section->offset, raw.offset);
+  bfd_h_put_32 (abfd, section->align, raw.align);
+  bfd_h_put_32 (abfd, section->reloff, raw.reloff);
+  bfd_h_put_32 (abfd, section->nreloc, raw.nreloc);
+  bfd_h_put_32 (abfd, section->flags, raw.flags);
+  bfd_h_put_32 (abfd, section->reserved1, raw.reserved1);
+  bfd_h_put_32 (abfd, section->reserved2, raw.reserved2);
+
+  if (bfd_bwrite (&raw, BFD_MACH_O_SECTION_SIZE, abfd)
+      != BFD_MACH_O_SECTION_SIZE)
+    return -1;
+
+  return 0;
+}
+
+static int
+bfd_mach_o_write_section_64 (bfd *abfd, bfd_mach_o_section *section)
+{
+  struct mach_o_section_64_external raw;
+
+  memcpy (raw.sectname, section->sectname, 16);
+  memcpy (raw.segname, section->segname, 16);
+  bfd_h_put_64 (abfd, section->addr, raw.addr);
+  bfd_h_put_64 (abfd, section->size, raw.size);
+  bfd_h_put_32 (abfd, section->offset, raw.offset);
+  bfd_h_put_32 (abfd, section->align, raw.align);
+  bfd_h_put_32 (abfd, section->reloff, raw.reloff);
+  bfd_h_put_32 (abfd, section->nreloc, raw.nreloc);
+  bfd_h_put_32 (abfd, section->flags, raw.flags);
+  bfd_h_put_32 (abfd, section->reserved1, raw.reserved1);
+  bfd_h_put_32 (abfd, section->reserved2, raw.reserved2);
+  bfd_h_put_32 (abfd, section->reserved3, raw.reserved3);
+
+  if (bfd_bwrite (&raw, BFD_MACH_O_SECTION_64_SIZE, abfd)
+      != BFD_MACH_O_SECTION_64_SIZE)
+    return -1;
+
+  return 0;
+}
+
+static int
+bfd_mach_o_write_segment_32 (bfd *abfd, bfd_mach_o_load_command *command)
+{
+  struct mach_o_segment_command_32_external raw;
+  bfd_mach_o_segment_command *seg = &command->command.segment;
+  bfd_mach_o_section *sec;
+
+  BFD_ASSERT (command->type == BFD_MACH_O_LC_SEGMENT);
+
+  for (sec = seg->sect_head; sec != NULL; sec = sec->next)
+    if (!bfd_mach_o_write_relocs (abfd, sec))
+      return -1;
+
+  memcpy (raw.segname, seg->segname, 16);
+  bfd_h_put_32 (abfd, seg->vmaddr, raw.vmaddr);
+  bfd_h_put_32 (abfd, seg->vmsize, raw.vmsize);
+  bfd_h_put_32 (abfd, seg->fileoff, raw.fileoff);
+  bfd_h_put_32 (abfd, seg->filesize, raw.filesize);
+  bfd_h_put_32 (abfd, seg->maxprot, raw.maxprot);
+  bfd_h_put_32 (abfd, seg->initprot, raw.initprot);
+  bfd_h_put_32 (abfd, seg->nsects, raw.nsects);
+  bfd_h_put_32 (abfd, seg->flags, raw.flags);
+  
+  if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0
+      || bfd_bwrite (&raw, sizeof (raw), abfd) != sizeof (raw))
+    return -1;
+
+  for (sec = seg->sect_head; sec != NULL; sec = sec->next)
+    if (bfd_mach_o_write_section_32 (abfd, sec))
+      return -1;
+
+  return 0;
+}
+
+static int
+bfd_mach_o_write_segment_64 (bfd *abfd, bfd_mach_o_load_command *command)
+{
+  struct mach_o_segment_command_64_external raw;
+  bfd_mach_o_segment_command *seg = &command->command.segment;
+  bfd_mach_o_section *sec;
+
+  BFD_ASSERT (command->type == BFD_MACH_O_LC_SEGMENT_64);
+
+  for (sec = seg->sect_head; sec != NULL; sec = sec->next)
+    if (!bfd_mach_o_write_relocs (abfd, sec))
+      return -1;
+
+  memcpy (raw.segname, seg->segname, 16);
+  bfd_h_put_64 (abfd, seg->vmaddr, raw.vmaddr);
+  bfd_h_put_64 (abfd, seg->vmsize, raw.vmsize);
+  bfd_h_put_64 (abfd, seg->fileoff, raw.fileoff);
+  bfd_h_put_64 (abfd, seg->filesize, raw.filesize);
+  bfd_h_put_32 (abfd, seg->maxprot, raw.maxprot);
+  bfd_h_put_32 (abfd, seg->initprot, raw.initprot);
+  bfd_h_put_32 (abfd, seg->nsects, raw.nsects);
+  bfd_h_put_32 (abfd, seg->flags, raw.flags);
+
+  if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0
+      || bfd_bwrite (&raw, sizeof (raw), abfd) != sizeof (raw))
+    return -1;
+
+  for (sec = seg->sect_head; sec != NULL; sec = sec->next)
+    if (bfd_mach_o_write_section_64 (abfd, sec))
+      return -1;
+
+  return 0;
+}
+
+static bfd_boolean
+bfd_mach_o_write_symtab (bfd *abfd, bfd_mach_o_load_command *command)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  bfd_mach_o_symtab_command *sym = &command->command.symtab;
+  unsigned long i;
+  unsigned int wide = bfd_mach_o_wide_p (abfd);
+  unsigned int symlen = wide ? BFD_MACH_O_NLIST_64_SIZE : BFD_MACH_O_NLIST_SIZE;
+  struct bfd_strtab_hash *strtab;
+  asymbol **symbols = bfd_get_outsymbols (abfd);
+
+  BFD_ASSERT (command->type == BFD_MACH_O_LC_SYMTAB);
+
+  /* Write the symbols first.  */
+  mdata->filelen = FILE_ALIGN(mdata->filelen, wide ? 3 : 2);
+  sym->symoff = mdata->filelen;
+  if (bfd_seek (abfd, sym->symoff, SEEK_SET) != 0)
+    return FALSE;
+
+  sym->nsyms = bfd_get_symcount (abfd);
+  mdata->filelen += sym->nsyms * symlen;
+
+  strtab = _bfd_stringtab_init ();
+  if (strtab == NULL)
+    return FALSE;
+
+  for (i = 0; i < sym->nsyms; i++)
+    {
+      bfd_size_type str_index;
+      bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i];
+
+      /* Compute name index.  */
+      /* An index of 0 always means the empty string.  */
+      if (s->symbol.name == 0 || s->symbol.name[0] == '\0')
+        str_index = 0;
+      else
+        {
+          str_index = _bfd_stringtab_add (strtab, s->symbol.name, TRUE, FALSE);
+          if (str_index == (bfd_size_type) -1)
+            goto err;
+        }
+
+      if (wide)
+        {
+          struct mach_o_nlist_64_external raw;
+
+          bfd_h_put_32 (abfd, str_index, raw.n_strx);
+          bfd_h_put_8 (abfd, s->n_type, raw.n_type);
+          bfd_h_put_8 (abfd, s->n_sect, raw.n_sect);
+          bfd_h_put_16 (abfd, s->n_desc, raw.n_desc);
+          bfd_h_put_64 (abfd, s->symbol.section->vma + s->symbol.value,
+                        raw.n_value);
+
+          if (bfd_bwrite (&raw, sizeof (raw), abfd) != sizeof (raw))
+            goto err;
+        }
+      else
+        {
+          struct mach_o_nlist_external raw;
+
+          bfd_h_put_32 (abfd, str_index, raw.n_strx);
+          bfd_h_put_8 (abfd, s->n_type, raw.n_type);
+          bfd_h_put_8 (abfd, s->n_sect, raw.n_sect);
+          bfd_h_put_16 (abfd, s->n_desc, raw.n_desc);
+          bfd_h_put_32 (abfd, s->symbol.section->vma + s->symbol.value,
+                        raw.n_value);
+
+          if (bfd_bwrite (&raw, sizeof (raw), abfd) != sizeof (raw))
+            goto err;
+        }
+    }
+  sym->strsize = _bfd_stringtab_size (strtab);
+  sym->stroff = mdata->filelen;
+  mdata->filelen += sym->strsize;
+
+  if (_bfd_stringtab_emit (abfd, strtab) != TRUE)
+    goto err;
+  _bfd_stringtab_free (strtab);
+
+  /* The command.  */
+  {
+    struct mach_o_symtab_command_external raw;
+
+    bfd_h_put_32 (abfd, sym->symoff, raw.symoff);
+    bfd_h_put_32 (abfd, sym->nsyms, raw.nsyms);
+    bfd_h_put_32 (abfd, sym->stroff, raw.stroff);
+    bfd_h_put_32 (abfd, sym->strsize, raw.strsize);
+
+    if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0
+        || bfd_bwrite (&raw, sizeof (raw), abfd) != sizeof (raw))
+      return FALSE;
+  }
+
+  return TRUE;
+
+ err:
+  _bfd_stringtab_free (strtab);
+  return FALSE;
+}
+
+/* Process the symbols and generate Mach-O specific fields.
+   Number them.  */
+
+static bfd_boolean
+bfd_mach_o_mangle_symbols (bfd *abfd)
+{
+  unsigned long i;
+  asymbol **symbols = bfd_get_outsymbols (abfd);
+
+  for (i = 0; i < bfd_get_symcount (abfd); i++)
+    {
+      bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i];
+
+      if (s->n_type == BFD_MACH_O_N_UNDF && !(s->symbol.flags & BSF_DEBUGGING))
+        {
+          /* As genuine Mach-O symbols type shouldn't be N_UNDF (undefined
+             symbols should be N_UNDEF | N_EXT), we suppose the back-end
+             values haven't been set.  */
+          if (s->symbol.section == bfd_abs_section_ptr)
+            s->n_type = BFD_MACH_O_N_ABS;
+          else if (s->symbol.section == bfd_und_section_ptr)
+            {
+              s->n_type = BFD_MACH_O_N_UNDF;
+              if (s->symbol.flags & BSF_WEAK)
+                s->n_desc |= BFD_MACH_O_N_WEAK_REF;
+            }
+          else if (s->symbol.section == bfd_com_section_ptr)
+            s->n_type = BFD_MACH_O_N_UNDF | BFD_MACH_O_N_EXT;
+          else
+            s->n_type = BFD_MACH_O_N_SECT;
+          
+          if (s->symbol.flags & BSF_GLOBAL)
+            s->n_type |= BFD_MACH_O_N_EXT;
+        }
+
+      /* Compute section index.  */
+      if (s->symbol.section != bfd_abs_section_ptr
+          && s->symbol.section != bfd_und_section_ptr
+          && s->symbol.section != bfd_com_section_ptr)
+        s->n_sect = s->symbol.section->target_index;
+
+      /* Number symbols.  */
+      s->symbol.udata.i = i;
+    }
+  return TRUE;
+}
+
+bfd_boolean
+bfd_mach_o_write_contents (bfd *abfd)
+{
+  unsigned int i;
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+
+  if (mdata->header.ncmds == 0)
+    if (!bfd_mach_o_build_commands (abfd))
+      return FALSE;
+
+  /* Now write header information.  */
+  if (mdata->header.filetype == 0)
+    {
+      if (abfd->flags & EXEC_P)
+        mdata->header.filetype = BFD_MACH_O_MH_EXECUTE;
+      else if (abfd->flags & DYNAMIC)
+        mdata->header.filetype = BFD_MACH_O_MH_DYLIB;
+      else
+        mdata->header.filetype = BFD_MACH_O_MH_OBJECT;
+    }
+  if (!bfd_mach_o_write_header (abfd, &mdata->header))
+    return FALSE;
+
+  /* Assign a number to each symbols.  */
+  if (!bfd_mach_o_mangle_symbols (abfd))
+    return FALSE;
+
+  for (i = 0; i < mdata->header.ncmds; i++)
+    {
+      struct mach_o_load_command_external raw;
+      bfd_mach_o_load_command *cur = &mdata->commands[i];
+      unsigned long typeflag;
+
+      typeflag = cur->type | (cur->type_required ? BFD_MACH_O_LC_REQ_DYLD : 0);
+
+      bfd_h_put_32 (abfd, typeflag, raw.cmd);
+      bfd_h_put_32 (abfd, cur->len, raw.cmdsize);
+
+      if (bfd_seek (abfd, cur->offset, SEEK_SET) != 0
+          || bfd_bwrite (&raw, BFD_MACH_O_LC_SIZE, abfd) != 8)
+	return FALSE;
+
+      switch (cur->type)
+	{
+	case BFD_MACH_O_LC_SEGMENT:
+	  if (bfd_mach_o_write_segment_32 (abfd, cur) != 0)
+	    return FALSE;
+	  break;
+	case BFD_MACH_O_LC_SEGMENT_64:
+	  if (bfd_mach_o_write_segment_64 (abfd, cur) != 0)
+	    return FALSE;
+	  break;
+	case BFD_MACH_O_LC_SYMTAB:
+	  if (!bfd_mach_o_write_symtab (abfd, cur))
+	    return FALSE;
+	  break;
+	case BFD_MACH_O_LC_SYMSEG:
+	  break;
+	case BFD_MACH_O_LC_THREAD:
+	case BFD_MACH_O_LC_UNIXTHREAD:
+	  if (bfd_mach_o_write_thread (abfd, cur) != 0)
+	    return FALSE;
+	  break;
+	case BFD_MACH_O_LC_LOADFVMLIB:
+	case BFD_MACH_O_LC_IDFVMLIB:
+	case BFD_MACH_O_LC_IDENT:
+	case BFD_MACH_O_LC_FVMFILE:
+	case BFD_MACH_O_LC_PREPAGE:
+	case BFD_MACH_O_LC_DYSYMTAB:
+	case BFD_MACH_O_LC_LOAD_DYLIB:
+	case BFD_MACH_O_LC_LOAD_WEAK_DYLIB:
+	case BFD_MACH_O_LC_ID_DYLIB:
+	case BFD_MACH_O_LC_REEXPORT_DYLIB:
+	case BFD_MACH_O_LC_LOAD_DYLINKER:
+	case BFD_MACH_O_LC_ID_DYLINKER:
+	case BFD_MACH_O_LC_PREBOUND_DYLIB:
+	case BFD_MACH_O_LC_ROUTINES:
+	case BFD_MACH_O_LC_SUB_FRAMEWORK:
+	  break;
+	default:
+	  (*_bfd_error_handler) (_("unable to write unknown load command 0x%lx"),
+				 (unsigned long) cur->type);
+	  return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+static void
+bfd_mach_o_append_section_to_segment (bfd_mach_o_segment_command *seg,
+                                      asection *sec)
+{
+  bfd_mach_o_section *s = (bfd_mach_o_section *)sec->used_by_bfd;
+  if (seg->sect_head == NULL)
+    seg->sect_head = s;
+  else
+    seg->sect_tail->next = s;
+  seg->sect_tail = s;
+}
+
+/* Create section Mach-O flags from BFD flags.  */
+
+static void
+bfd_mach_o_set_section_flags_from_bfd (bfd *abfd ATTRIBUTE_UNUSED, asection *sec)
+{
+  flagword bfd_flags;
+  bfd_mach_o_section *s = bfd_mach_o_get_mach_o_section (sec);
+
+  /* Create default flags.  */
+  bfd_flags = bfd_get_section_flags (abfd, sec);
+  if ((bfd_flags & SEC_CODE) == SEC_CODE)
+    s->flags = BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS
+      | BFD_MACH_O_S_ATTR_SOME_INSTRUCTIONS
+      | BFD_MACH_O_S_REGULAR;
+  else if ((bfd_flags & (SEC_ALLOC | SEC_LOAD)) == SEC_ALLOC)
+    s->flags = BFD_MACH_O_S_ZEROFILL;
+  else if (bfd_flags & SEC_DEBUGGING)
+    s->flags = BFD_MACH_O_S_REGULAR |  BFD_MACH_O_S_ATTR_DEBUG;
+  else
+    s->flags = BFD_MACH_O_S_REGULAR;
+}
+
+/* Build Mach-O load commands from the sections.  */
+
+bfd_boolean
+bfd_mach_o_build_commands (bfd *abfd)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  unsigned int wide = mach_o_wide_p (&mdata->header);
+  bfd_mach_o_segment_command *seg;
+  asection *sec;
+  bfd_mach_o_load_command *cmd;
+  bfd_mach_o_load_command *symtab_cmd;
+  int target_index;
+
+  /* Return now if commands are already built.  */
+  if (mdata->header.ncmds)
+    return FALSE;
+
+  /* Very simple version: a command (segment) to contain all the sections and
+     a command for the symbol table.  */
+  mdata->header.ncmds = 2;
+  mdata->commands = bfd_alloc (abfd, mdata->header.ncmds
+                               * sizeof (bfd_mach_o_load_command));
+  if (mdata->commands == NULL)
+    return FALSE;
+  cmd = &mdata->commands[0];
+  seg = &cmd->command.segment;
+
+  seg->nsects = bfd_count_sections (abfd);
+
+  /* Set segment command.  */
+  if (wide)
+    {
+      cmd->type = BFD_MACH_O_LC_SEGMENT_64;
+      cmd->offset = BFD_MACH_O_HEADER_64_SIZE;
+      cmd->len = BFD_MACH_O_LC_SEGMENT_64_SIZE
+        + BFD_MACH_O_SECTION_64_SIZE * seg->nsects;
+    }
+  else
+    {
+      cmd->type = BFD_MACH_O_LC_SEGMENT;
+      cmd->offset = BFD_MACH_O_HEADER_SIZE;
+      cmd->len = BFD_MACH_O_LC_SEGMENT_SIZE
+        + BFD_MACH_O_SECTION_SIZE * seg->nsects;
+    }
+  cmd->type_required = FALSE;
+  mdata->header.sizeofcmds = cmd->len;
+  mdata->filelen = cmd->offset + cmd->len;
+
+  /* Set symtab command.  */
+  symtab_cmd = &mdata->commands[1];
+  
+  symtab_cmd->type = BFD_MACH_O_LC_SYMTAB;
+  symtab_cmd->offset = cmd->offset + cmd->len;
+  symtab_cmd->len = 6 * 4;
+  symtab_cmd->type_required = FALSE;
+  
+  mdata->header.sizeofcmds += symtab_cmd->len;
+  mdata->filelen += symtab_cmd->len;
+
+  /* Fill segment command.  */
+  memset (seg->segname, 0, sizeof (seg->segname));
+  seg->vmaddr = 0;
+  seg->fileoff = mdata->filelen;
+  seg->filesize = 0;
+  seg->maxprot = BFD_MACH_O_PROT_READ | BFD_MACH_O_PROT_WRITE
+    | BFD_MACH_O_PROT_EXECUTE;
+  seg->initprot = seg->maxprot;
+  seg->flags = 0;
+  seg->sect_head = NULL;
+  seg->sect_tail = NULL;
+
+  /* Create Mach-O sections.  */
+  target_index = 0;
+  for (sec = abfd->sections; sec; sec = sec->next)
+    {
+      bfd_mach_o_section *msect = bfd_mach_o_get_mach_o_section (sec);
+
+      bfd_mach_o_append_section_to_segment (seg, sec);
+
+      if (msect->flags == 0)
+        {
+          /* We suppose it hasn't been set.  Convert from BFD flags.  */
+          bfd_mach_o_set_section_flags_from_bfd (abfd, sec);
+        }
+      msect->addr = bfd_get_section_vma (abfd, sec);
+      msect->size = bfd_get_section_size (sec);
+      msect->align = bfd_get_section_alignment (abfd, sec);
+
+      if (msect->size != 0)
+        {
+          mdata->filelen = FILE_ALIGN (mdata->filelen, msect->align);
+          msect->offset = mdata->filelen;
+        }
+      else
+        msect->offset = 0;
+
+      sec->filepos = msect->offset;
+      sec->target_index = ++target_index;
+
+      mdata->filelen += msect->size;
+    }
+  seg->filesize = mdata->filelen - seg->fileoff;
+  seg->vmsize = seg->filesize;
+
+  return TRUE;
+}
+
+/* Set the contents of a section.  */
+
+bfd_boolean
+bfd_mach_o_set_section_contents (bfd *abfd,
+				 asection *section,
+				 const void * location,
+				 file_ptr offset,
+				 bfd_size_type count)
+{
+  file_ptr pos;
+
+  /* This must be done first, because bfd_set_section_contents is
+     going to set output_has_begun to TRUE.  */
+  if (! abfd->output_has_begun && ! bfd_mach_o_build_commands (abfd))
+    return FALSE;
+
+  if (count == 0)
+    return TRUE;
+
+  pos = section->filepos + offset;
+  if (bfd_seek (abfd, pos, SEEK_SET) != 0
+      || bfd_bwrite (location, count, abfd) != count)
+    return FALSE;
+
+  return TRUE;
+}
+
+int
+bfd_mach_o_sizeof_headers (bfd *a ATTRIBUTE_UNUSED,
+			   struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+/* Make an empty symbol.  This is required only because
+   bfd_make_section_anyway wants to create a symbol for the section.  */
+
+asymbol *
+bfd_mach_o_make_empty_symbol (bfd *abfd)
+{
+  asymbol *new_symbol;
+
+  new_symbol = bfd_zalloc (abfd, sizeof (bfd_mach_o_asymbol));
+  if (new_symbol == NULL)
+    return new_symbol;
+  new_symbol->the_bfd = abfd;
+  new_symbol->udata.i = 0;
+  return new_symbol;
+}
+
+static bfd_boolean
+bfd_mach_o_read_header (bfd *abfd, bfd_mach_o_header *header)
+{
+  struct mach_o_header_external raw;
+  unsigned int size;
+  bfd_vma (*get32) (const void *) = NULL;
+
+  /* Just read the magic number.  */
+  if (bfd_seek (abfd, 0, SEEK_SET) != 0
+      || bfd_bread (raw.magic, sizeof (raw.magic), abfd) != 4)
+    return FALSE;
+
+  if (bfd_getb32 (raw.magic) == BFD_MACH_O_MH_MAGIC)
+    {
+      header->byteorder = BFD_ENDIAN_BIG;
+      header->magic = BFD_MACH_O_MH_MAGIC;
+      header->version = 1;
+      get32 = bfd_getb32;
+    }
+  else if (bfd_getl32 (raw.magic) == BFD_MACH_O_MH_MAGIC)
+    {
+      header->byteorder = BFD_ENDIAN_LITTLE;
+      header->magic = BFD_MACH_O_MH_MAGIC;
+      header->version = 1;
+      get32 = bfd_getl32;
+    }
+  else if (bfd_getb32 (raw.magic) == BFD_MACH_O_MH_MAGIC_64)
+    {
+      header->byteorder = BFD_ENDIAN_BIG;
+      header->magic = BFD_MACH_O_MH_MAGIC_64;
+      header->version = 2;
+      get32 = bfd_getb32;
+    }
+  else if (bfd_getl32 (raw.magic) == BFD_MACH_O_MH_MAGIC_64)
+    {
+      header->byteorder = BFD_ENDIAN_LITTLE;
+      header->magic = BFD_MACH_O_MH_MAGIC_64;
+      header->version = 2;
+      get32 = bfd_getl32;
+    }
+  else
+    {
+      header->byteorder = BFD_ENDIAN_UNKNOWN;
+      return FALSE;
+    }
+
+  /* Once the size of the header is known, read the full header.  */
+  size = mach_o_wide_p (header) ?
+    BFD_MACH_O_HEADER_64_SIZE : BFD_MACH_O_HEADER_SIZE;
+
+  if (bfd_seek (abfd, 0, SEEK_SET) != 0
+      || bfd_bread (&raw, size, abfd) != size)
+    return FALSE;
+
+  header->cputype = (*get32) (raw.cputype);
+  header->cpusubtype = (*get32) (raw.cpusubtype);
+  header->filetype = (*get32) (raw.filetype);
+  header->ncmds = (*get32) (raw.ncmds);
+  header->sizeofcmds = (*get32) (raw.sizeofcmds);
+  header->flags = (*get32) (raw.flags);
+
+  if (mach_o_wide_p (header))
+    header->reserved = (*get32) (raw.reserved);
+
+  return TRUE;
+}
+
+bfd_boolean
+bfd_mach_o_new_section_hook (bfd *abfd, asection *sec)
+{
+  bfd_mach_o_section *s;
+
+  s = bfd_mach_o_get_mach_o_section (sec);
+  if (s == NULL)
+    {
+      flagword bfd_flags;
+
+      s = (bfd_mach_o_section *) bfd_zalloc (abfd, sizeof (*s));
+      if (s == NULL)
+	return FALSE;
+      sec->used_by_bfd = s;
+      s->bfdsection = sec;
+
+      /* Create default name.  */
+      bfd_mach_o_convert_section_name_to_mach_o (abfd, sec, s);
+
+      /* Create default flags.  */
+      bfd_flags = bfd_get_section_flags (abfd, sec);
+      if ((bfd_flags & SEC_CODE) == SEC_CODE)
+        s->flags = BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS
+          | BFD_MACH_O_S_ATTR_SOME_INSTRUCTIONS
+          | BFD_MACH_O_S_REGULAR;
+      else if ((bfd_flags & (SEC_ALLOC | SEC_LOAD)) == SEC_ALLOC)
+        s->flags = BFD_MACH_O_S_ZEROFILL;
+      else if (bfd_flags & SEC_DEBUGGING)
+        s->flags = BFD_MACH_O_S_REGULAR |  BFD_MACH_O_S_ATTR_DEBUG;
+      else
+        s->flags = BFD_MACH_O_S_REGULAR;
+    }
+
+  return _bfd_generic_new_section_hook (abfd, sec);
+}
+
+static void
+bfd_mach_o_init_section_from_mach_o (bfd *abfd, asection *sec,
+                                     unsigned long prot)
+{
+  flagword flags;
+  bfd_mach_o_section *section;
+
+  flags = bfd_get_section_flags (abfd, sec);
+  section = bfd_mach_o_get_mach_o_section (sec);
+
+  if (flags == SEC_NO_FLAGS)
+    {
+      /* Try to guess flags.  */
+      if (section->flags & BFD_MACH_O_S_ATTR_DEBUG)
+        flags = SEC_DEBUGGING;
+      else
+        {
+          flags = SEC_ALLOC;
+          if ((section->flags & BFD_MACH_O_SECTION_TYPE_MASK)
+              != BFD_MACH_O_S_ZEROFILL)
+            {
+              flags |= SEC_LOAD;
+              if (prot & BFD_MACH_O_PROT_EXECUTE)
+                flags |= SEC_CODE;
+              if (prot & BFD_MACH_O_PROT_WRITE)
+                flags |= SEC_DATA;
+              else if (prot & BFD_MACH_O_PROT_READ)
+                flags |= SEC_READONLY;
+            }
+        }
+    }
+  else
+    {
+      if ((flags & SEC_DEBUGGING) == 0)
+        flags |= SEC_ALLOC;
+    }
+
+  if (section->offset != 0)
+    flags |= SEC_HAS_CONTENTS;
+  if (section->nreloc != 0)
+    flags |= SEC_RELOC;
+
+  bfd_set_section_flags (abfd, sec, flags);
+
+  sec->vma = section->addr;
+  sec->lma = section->addr;
+  sec->size = section->size;
+  sec->filepos = section->offset;
+  sec->alignment_power = section->align;
+  sec->segment_mark = 0;
+  sec->reloc_count = section->nreloc;
+  sec->rel_filepos = section->reloff;
+}
+
+static asection *
+bfd_mach_o_make_bfd_section (bfd *abfd,
+                             const unsigned char *segname,
+                             const unsigned char *sectname)
+{
+  const char *sname;
+  flagword flags;
+
+  bfd_mach_o_convert_section_name_to_bfd
+    (abfd, (const char *)segname, (const char *)sectname, &sname, &flags);
+  if (sname == NULL)
+    return NULL;
+
+  return bfd_make_section_anyway_with_flags (abfd, sname, flags);
+}
+
+static asection *
+bfd_mach_o_read_section_32 (bfd *abfd,
+                            unsigned int offset,
+                            unsigned long prot)
+{
+  struct mach_o_section_32_external raw;
+  asection *sec;
+  bfd_mach_o_section *section;
+
+  if (bfd_seek (abfd, offset, SEEK_SET) != 0
+      || (bfd_bread (&raw, BFD_MACH_O_SECTION_SIZE, abfd)
+          != BFD_MACH_O_SECTION_SIZE))
+    return NULL;
+
+  sec = bfd_mach_o_make_bfd_section (abfd, raw.segname, raw.sectname);
+  if (sec == NULL)
+    return NULL;
+
+  section = bfd_mach_o_get_mach_o_section (sec);
+  memcpy (section->segname, raw.segname, sizeof (raw.segname));
+  section->segname[BFD_MACH_O_SEGNAME_SIZE] = 0;
+  memcpy (section->sectname, raw.sectname, sizeof (raw.sectname));
+  section->segname[BFD_MACH_O_SECTNAME_SIZE] = 0;
+  section->addr = bfd_h_get_32 (abfd, raw.addr);
+  section->size = bfd_h_get_32 (abfd, raw.size);
+  section->offset = bfd_h_get_32 (abfd, raw.offset);
+  section->align = bfd_h_get_32 (abfd, raw.align);
+  section->reloff = bfd_h_get_32 (abfd, raw.reloff);
+  section->nreloc = bfd_h_get_32 (abfd, raw.nreloc);
+  section->flags = bfd_h_get_32 (abfd, raw.flags);
+  section->reserved1 = bfd_h_get_32 (abfd, raw.reserved1);
+  section->reserved2 = bfd_h_get_32 (abfd, raw.reserved2);
+  section->reserved3 = 0;
+
+  bfd_mach_o_init_section_from_mach_o (abfd, sec, prot);
+
+  return sec;
+}
+
+static asection *
+bfd_mach_o_read_section_64 (bfd *abfd,
+                            unsigned int offset,
+                            unsigned long prot)
+{
+  struct mach_o_section_64_external raw;
+  asection *sec;
+  bfd_mach_o_section *section;
+
+  if (bfd_seek (abfd, offset, SEEK_SET) != 0
+      || (bfd_bread (&raw, BFD_MACH_O_SECTION_64_SIZE, abfd)
+          != BFD_MACH_O_SECTION_64_SIZE))
+    return NULL;
+
+  sec = bfd_mach_o_make_bfd_section (abfd, raw.segname, raw.sectname);
+  if (sec == NULL)
+    return NULL;
+
+  section = bfd_mach_o_get_mach_o_section (sec);
+  memcpy (section->segname, raw.segname, sizeof (raw.segname));
+  section->segname[BFD_MACH_O_SEGNAME_SIZE] = 0;
+  memcpy (section->sectname, raw.sectname, sizeof (raw.sectname));
+  section->segname[BFD_MACH_O_SECTNAME_SIZE] = 0;
+  section->addr = bfd_h_get_64 (abfd, raw.addr);
+  section->size = bfd_h_get_64 (abfd, raw.size);
+  section->offset = bfd_h_get_32 (abfd, raw.offset);
+  section->align = bfd_h_get_32 (abfd, raw.align);
+  section->reloff = bfd_h_get_32 (abfd, raw.reloff);
+  section->nreloc = bfd_h_get_32 (abfd, raw.nreloc);
+  section->flags = bfd_h_get_32 (abfd, raw.flags);
+  section->reserved1 = bfd_h_get_32 (abfd, raw.reserved1);
+  section->reserved2 = bfd_h_get_32 (abfd, raw.reserved2);
+  section->reserved3 = bfd_h_get_32 (abfd, raw.reserved3);
+
+  bfd_mach_o_init_section_from_mach_o (abfd, sec, prot);
+
+  return sec;
+}
+
+static asection *
+bfd_mach_o_read_section (bfd *abfd,
+                         unsigned int offset,
+                         unsigned long prot,
+                         unsigned int wide)
+{
+  if (wide)
+    return bfd_mach_o_read_section_64 (abfd, offset, prot);
+  else
+    return bfd_mach_o_read_section_32 (abfd, offset, prot);
+}
+
+static int
+bfd_mach_o_read_symtab_symbol (bfd *abfd,
+                               bfd_mach_o_symtab_command *sym,
+                               bfd_mach_o_asymbol *s,
+                               unsigned long i)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  unsigned int wide = mach_o_wide_p (&mdata->header);
+  unsigned int symwidth =
+    wide ? BFD_MACH_O_NLIST_64_SIZE : BFD_MACH_O_NLIST_SIZE;
+  unsigned int symoff = sym->symoff + (i * symwidth);
+  struct mach_o_nlist_64_external raw;
+  unsigned char type = -1;
+  unsigned char section = -1;
+  short desc = -1;
+  symvalue value = -1;
+  unsigned long stroff = -1;
+  unsigned int symtype = -1;
+
+  BFD_ASSERT (sym->strtab != NULL);
+
+  if (bfd_seek (abfd, symoff, SEEK_SET) != 0
+      || bfd_bread (&raw, symwidth, abfd) != symwidth)
+    {
+      (*_bfd_error_handler)
+        (_("bfd_mach_o_read_symtab_symbol: unable to read %d bytes at %lu"),
+         symwidth, (unsigned long) symoff);
+      return -1;
+    }
+
+  stroff = bfd_h_get_32 (abfd, raw.n_strx);
+  type = bfd_h_get_8 (abfd, raw.n_type);
+  symtype = type & BFD_MACH_O_N_TYPE;
+  section = bfd_h_get_8 (abfd, raw.n_sect);
+  desc = bfd_h_get_16 (abfd, raw.n_desc);
+  if (wide)
+    value = bfd_h_get_64 (abfd, raw.n_value);
+  else
+    value = bfd_h_get_32 (abfd, raw.n_value);
+
+  if (stroff >= sym->strsize)
+    {
+      (*_bfd_error_handler)
+        (_("bfd_mach_o_read_symtab_symbol: name out of range (%lu >= %lu)"),
+         (unsigned long) stroff,
+         (unsigned long) sym->strsize);
+      return -1;
+    }
+
+  s->symbol.the_bfd = abfd;
+  s->symbol.name = sym->strtab + stroff;
+  s->symbol.value = value;
+  s->symbol.flags = 0x0;
+  s->symbol.udata.i = 0;
+  s->n_type = type;
+  s->n_sect = section;
+  s->n_desc = desc;
+
+  if (type & BFD_MACH_O_N_STAB)
+    {
+      s->symbol.flags |= BSF_DEBUGGING;
+      s->symbol.section = bfd_und_section_ptr;
+      switch (type)
+	{
+	case N_FUN:
+	case N_STSYM:
+	case N_LCSYM:
+	case N_BNSYM:
+	case N_SLINE:
+	case N_ENSYM:
+	case N_ECOMM:
+	case N_ECOML:
+	case N_GSYM:
+	  if ((section > 0) && (section <= mdata->nsects))
+	    {
+	      s->symbol.section = mdata->sections[section - 1]->bfdsection;
+	      s->symbol.value =
+                s->symbol.value - mdata->sections[section - 1]->addr;
+	    }
+	  break;
+	}
+    }
+  else
+    {
+      if (type & BFD_MACH_O_N_PEXT)
+	s->symbol.flags |= BSF_GLOBAL;
+
+      if (type & BFD_MACH_O_N_EXT)
+	s->symbol.flags |= BSF_GLOBAL;
+
+      if (!(type & (BFD_MACH_O_N_PEXT | BFD_MACH_O_N_EXT)))
+	s->symbol.flags |= BSF_LOCAL;
+
+      switch (symtype)
+	{
+	case BFD_MACH_O_N_UNDF:
+          if (type == (BFD_MACH_O_N_UNDF | BFD_MACH_O_N_EXT)
+              && s->symbol.value != 0)
+            {
+              /* A common symbol.  */
+              s->symbol.section = bfd_com_section_ptr;
+              s->symbol.flags = BSF_NO_FLAGS;
+            }
+          else
+            {
+              s->symbol.section = bfd_und_section_ptr;
+              if (s->n_desc & BFD_MACH_O_N_WEAK_REF)
+                s->symbol.flags |= BSF_WEAK;
+            }
+	  break;
+	case BFD_MACH_O_N_PBUD:
+	  s->symbol.section = bfd_und_section_ptr;
+	  break;
+	case BFD_MACH_O_N_ABS:
+	  s->symbol.section = bfd_abs_section_ptr;
+	  break;
+	case BFD_MACH_O_N_SECT:
+	  if ((section > 0) && (section <= mdata->nsects))
+	    {
+	      s->symbol.section = mdata->sections[section - 1]->bfdsection;
+	      s->symbol.value =
+                s->symbol.value - mdata->sections[section - 1]->addr;
+	    }
+	  else
+	    {
+	      /* Mach-O uses 0 to mean "no section"; not an error.  */
+	      if (section != 0)
+		{
+		  (*_bfd_error_handler) (_("bfd_mach_o_read_symtab_symbol: "
+					   "symbol \"%s\" specified invalid section %d (max %lu): setting to undefined"),
+					 s->symbol.name, section, mdata->nsects);
+		}
+	      s->symbol.section = bfd_und_section_ptr;
+	    }
+	  break;
+	case BFD_MACH_O_N_INDR:
+	  (*_bfd_error_handler) (_("bfd_mach_o_read_symtab_symbol: "
+				   "symbol \"%s\" is unsupported 'indirect' reference: setting to undefined"),
+				 s->symbol.name);
+	  s->symbol.section = bfd_und_section_ptr;
+	  break;
+	default:
+	  (*_bfd_error_handler) (_("bfd_mach_o_read_symtab_symbol: "
+				   "symbol \"%s\" specified invalid type field 0x%x: setting to undefined"),
+				 s->symbol.name, symtype);
+	  s->symbol.section = bfd_und_section_ptr;
+	  break;
+	}
+    }
+
+  return 0;
+}
+
+static int
+bfd_mach_o_read_symtab_strtab (bfd *abfd)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  bfd_mach_o_symtab_command *sym = mdata->symtab;
+
+  /* Fail if there is no symtab.  */
+  if (sym == NULL)
+    return -1;
+
+  /* Success if already loaded.  */
+  if (sym->strtab)
+    return 0;
+
+  if (abfd->flags & BFD_IN_MEMORY)
+    {
+      struct bfd_in_memory *b;
+
+      b = (struct bfd_in_memory *) abfd->iostream;
+
+      if ((sym->stroff + sym->strsize) > b->size)
+	{
+	  bfd_set_error (bfd_error_file_truncated);
+	  return -1;
+	}
+      sym->strtab = (char *) b->buffer + sym->stroff;
+    }
+  else
+    {
+      sym->strtab = bfd_alloc (abfd, sym->strsize);
+      if (sym->strtab == NULL)
+        return -1;
+
+      if (bfd_seek (abfd, sym->stroff, SEEK_SET) != 0
+          || bfd_bread ((void *) sym->strtab, sym->strsize, abfd) != sym->strsize)
+        {
+          bfd_set_error (bfd_error_file_truncated);
+          return -1;
+        }
+    }
+
+  return 0;
+}
+
+static int
+bfd_mach_o_read_symtab_symbols (bfd *abfd)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  bfd_mach_o_symtab_command *sym = mdata->symtab;
+  unsigned long i;
+  int ret;
+
+  if (sym == NULL || sym->symbols)
+    {
+      /* Return now if there are no symbols or if already loaded.  */
+      return 0;
+    }
+
+  sym->symbols = bfd_alloc (abfd, sym->nsyms * sizeof (bfd_mach_o_asymbol));
+
+  if (sym->symbols == NULL)
+    {
+      (*_bfd_error_handler) (_("bfd_mach_o_read_symtab_symbols: unable to allocate memory for symbols"));
+      return -1;
+    }
+
+  ret = bfd_mach_o_read_symtab_strtab (abfd);
+  if (ret != 0)
+    return ret;
+
+  for (i = 0; i < sym->nsyms; i++)
+    {
+      ret = bfd_mach_o_read_symtab_symbol (abfd, sym, &sym->symbols[i], i);
+      if (ret != 0)
+	return ret;
+    }
+
+  return 0;
+}
+
+int
+bfd_mach_o_read_dysymtab_symbol (bfd *abfd,
+                                 bfd_mach_o_dysymtab_command *dysym,
+                                 bfd_mach_o_symtab_command *sym,
+                                 bfd_mach_o_asymbol *s,
+                                 unsigned long i)
+{
+  unsigned long isymoff = dysym->indirectsymoff + (i * 4);
+  unsigned long sym_index;
+  unsigned char raw[4];
+
+  BFD_ASSERT (i < dysym->nindirectsyms);
+
+  if (bfd_seek (abfd, isymoff, SEEK_SET) != 0
+      || bfd_bread (raw, sizeof (raw), abfd) != sizeof (raw))
+    {
+      (*_bfd_error_handler)
+        (_("bfd_mach_o_read_dysymtab_symbol: unable to read %lu bytes at %lu"),
+         (unsigned long) sizeof (raw), isymoff);
+      return -1;
+    }
+  sym_index = bfd_h_get_32 (abfd, raw);
+
+  return bfd_mach_o_read_symtab_symbol (abfd, sym, s, sym_index);
+}
+
+static const char *
+bfd_mach_o_i386_flavour_string (unsigned int flavour)
+{
+  switch ((int) flavour)
+    {
+    case BFD_MACH_O_x86_THREAD_STATE32:    return "x86_THREAD_STATE32";
+    case BFD_MACH_O_x86_FLOAT_STATE32:     return "x86_FLOAT_STATE32";
+    case BFD_MACH_O_x86_EXCEPTION_STATE32: return "x86_EXCEPTION_STATE32";
+    case BFD_MACH_O_x86_THREAD_STATE64:    return "x86_THREAD_STATE64";
+    case BFD_MACH_O_x86_FLOAT_STATE64:     return "x86_FLOAT_STATE64";
+    case BFD_MACH_O_x86_EXCEPTION_STATE64: return "x86_EXCEPTION_STATE64";
+    case BFD_MACH_O_x86_THREAD_STATE:      return "x86_THREAD_STATE";
+    case BFD_MACH_O_x86_FLOAT_STATE:       return "x86_FLOAT_STATE";
+    case BFD_MACH_O_x86_EXCEPTION_STATE:   return "x86_EXCEPTION_STATE";
+    case BFD_MACH_O_x86_DEBUG_STATE32:     return "x86_DEBUG_STATE32";
+    case BFD_MACH_O_x86_DEBUG_STATE64:     return "x86_DEBUG_STATE64";
+    case BFD_MACH_O_x86_DEBUG_STATE:       return "x86_DEBUG_STATE";
+    case BFD_MACH_O_x86_THREAD_STATE_NONE: return "x86_THREAD_STATE_NONE";
+    default: return "UNKNOWN";
+    }
+}
+
+static const char *
+bfd_mach_o_ppc_flavour_string (unsigned int flavour)
+{
+  switch ((int) flavour)
+    {
+    case BFD_MACH_O_PPC_THREAD_STATE:      return "PPC_THREAD_STATE";
+    case BFD_MACH_O_PPC_FLOAT_STATE:       return "PPC_FLOAT_STATE";
+    case BFD_MACH_O_PPC_EXCEPTION_STATE:   return "PPC_EXCEPTION_STATE";
+    case BFD_MACH_O_PPC_VECTOR_STATE:      return "PPC_VECTOR_STATE";
+    case BFD_MACH_O_PPC_THREAD_STATE64:    return "PPC_THREAD_STATE64";
+    case BFD_MACH_O_PPC_EXCEPTION_STATE64: return "PPC_EXCEPTION_STATE64";
+    default: return "UNKNOWN";
+    }
+}
+
+static int
+bfd_mach_o_read_dylinker (bfd *abfd, bfd_mach_o_load_command *command)
+{
+  bfd_mach_o_dylinker_command *cmd = &command->command.dylinker;
+  struct mach_o_str_command_external raw;
+  unsigned int nameoff;
+
+  BFD_ASSERT ((command->type == BFD_MACH_O_LC_ID_DYLINKER)
+	      || (command->type == BFD_MACH_O_LC_LOAD_DYLINKER));
+
+  if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0
+      || bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw))
+    return -1;
+
+  nameoff = bfd_h_get_32 (abfd, raw.str);
+
+  cmd->name_offset = command->offset + nameoff;
+  cmd->name_len = command->len - nameoff;
+  cmd->name_str = bfd_alloc (abfd, cmd->name_len);
+  if (cmd->name_str == NULL)
+    return -1;
+  if (bfd_seek (abfd, cmd->name_offset, SEEK_SET) != 0
+      || bfd_bread (cmd->name_str, cmd->name_len, abfd) != cmd->name_len)
+    return -1;
+  return 0;
+}
+
+static int
+bfd_mach_o_read_dylib (bfd *abfd, bfd_mach_o_load_command *command)
+{
+  bfd_mach_o_dylib_command *cmd = &command->command.dylib;
+  struct mach_o_dylib_command_external raw;
+  unsigned int nameoff;
+
+  switch (command->type)
+    {
+    case BFD_MACH_O_LC_LOAD_DYLIB:
+    case BFD_MACH_O_LC_LOAD_WEAK_DYLIB:
+    case BFD_MACH_O_LC_ID_DYLIB:
+    case BFD_MACH_O_LC_REEXPORT_DYLIB:
+      break;
+    default:
+      BFD_FAIL ();
+      return -1;
+    }
+
+  if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0
+      || bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw))
+    return -1;
+
+  nameoff = bfd_h_get_32 (abfd, raw.name);
+  cmd->timestamp = bfd_h_get_32 (abfd, raw.timestamp);
+  cmd->current_version = bfd_h_get_32 (abfd, raw.current_version);
+  cmd->compatibility_version = bfd_h_get_32 (abfd, raw.compatibility_version);
+
+  cmd->name_offset = command->offset + nameoff;
+  cmd->name_len = command->len - nameoff;
+  cmd->name_str = bfd_alloc (abfd, cmd->name_len);
+  if (cmd->name_str == NULL)
+    return -1;
+  if (bfd_seek (abfd, cmd->name_offset, SEEK_SET) != 0
+      || bfd_bread (cmd->name_str, cmd->name_len, abfd) != cmd->name_len)
+    return -1;
+  return 0;
+}
+
+static int
+bfd_mach_o_read_prebound_dylib (bfd *abfd ATTRIBUTE_UNUSED,
+                                bfd_mach_o_load_command *command ATTRIBUTE_UNUSED)
+{
+  /* bfd_mach_o_prebound_dylib_command *cmd = &command->command.prebound_dylib; */
+
+  BFD_ASSERT (command->type == BFD_MACH_O_LC_PREBOUND_DYLIB);
+  return 0;
+}
+
+static int
+bfd_mach_o_read_thread (bfd *abfd, bfd_mach_o_load_command *command)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  bfd_mach_o_thread_command *cmd = &command->command.thread;
+  unsigned int offset;
+  unsigned int nflavours;
+  unsigned int i;
+
+  BFD_ASSERT ((command->type == BFD_MACH_O_LC_THREAD)
+	      || (command->type == BFD_MACH_O_LC_UNIXTHREAD));
+
+  /* Count the number of threads.  */
+  offset = 8;
+  nflavours = 0;
+  while (offset != command->len)
+    {
+      struct mach_o_thread_command_external raw;
+
+      if (offset >= command->len)
+	return -1;
+
+      if (bfd_seek (abfd, command->offset + offset, SEEK_SET) != 0
+          || bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw))
+	return -1;
+
+      offset += sizeof (raw) + bfd_h_get_32 (abfd, raw.count) * 4;
+      nflavours++;
+    }
+
+  /* Allocate threads.  */
+  cmd->flavours = bfd_alloc
+    (abfd, nflavours * sizeof (bfd_mach_o_thread_flavour));
+  if (cmd->flavours == NULL)
+    return -1;
+  cmd->nflavours = nflavours;
+
+  offset = 8;
+  nflavours = 0;
+  while (offset != command->len)
+    {
+      struct mach_o_thread_command_external raw;
+
+      if (offset >= command->len)
+	return -1;
+
+      if (nflavours >= cmd->nflavours)
+	return -1;
+
+      if (bfd_seek (abfd, command->offset + offset, SEEK_SET) != 0
+          || bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw))
+	return -1;
+
+      cmd->flavours[nflavours].flavour = bfd_h_get_32 (abfd, raw.flavour);
+      cmd->flavours[nflavours].offset = command->offset + offset + sizeof (raw);
+      cmd->flavours[nflavours].size = bfd_h_get_32 (abfd, raw.count) * 4;
+      offset += cmd->flavours[nflavours].size + sizeof (raw);
+      nflavours++;
+    }
+
+  for (i = 0; i < nflavours; i++)
+    {
+      asection *bfdsec;
+      unsigned int snamelen;
+      char *sname;
+      const char *flavourstr;
+      const char *prefix = "LC_THREAD";
+      unsigned int j = 0;
+
+      switch (mdata->header.cputype)
+	{
+	case BFD_MACH_O_CPU_TYPE_POWERPC:
+	case BFD_MACH_O_CPU_TYPE_POWERPC_64:
+	  flavourstr = bfd_mach_o_ppc_flavour_string (cmd->flavours[i].flavour);
+	  break;
+	case BFD_MACH_O_CPU_TYPE_I386:
+	case BFD_MACH_O_CPU_TYPE_X86_64:
+	  flavourstr = bfd_mach_o_i386_flavour_string (cmd->flavours[i].flavour);
+	  break;
+	default:
+	  flavourstr = "UNKNOWN_ARCHITECTURE";
+	  break;
+	}
+
+      snamelen = strlen (prefix) + 1 + 20 + 1 + strlen (flavourstr) + 1;
+      sname = bfd_alloc (abfd, snamelen);
+      if (sname == NULL)
+	return -1;
+
+      for (;;)
+	{
+	  sprintf (sname, "%s.%s.%u", prefix, flavourstr, j);
+	  if (bfd_get_section_by_name (abfd, sname) == NULL)
+	    break;
+	  j++;
+	}
+
+      bfdsec = bfd_make_section_with_flags (abfd, sname, SEC_HAS_CONTENTS);
+
+      bfdsec->vma = 0;
+      bfdsec->lma = 0;
+      bfdsec->size = cmd->flavours[i].size;
+      bfdsec->filepos = cmd->flavours[i].offset;
+      bfdsec->alignment_power = 0x0;
+
+      cmd->section = bfdsec;
+    }
+
+  return 0;
+}
+
+static int
+bfd_mach_o_read_dysymtab (bfd *abfd, bfd_mach_o_load_command *command)
+{
+  bfd_mach_o_dysymtab_command *cmd = &command->command.dysymtab;
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+
+  BFD_ASSERT (command->type == BFD_MACH_O_LC_DYSYMTAB);
+
+  {
+    struct mach_o_dysymtab_command_external raw;
+
+    if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0
+        || bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw))
+      return -1;
+
+    cmd->ilocalsym = bfd_h_get_32 (abfd, raw.ilocalsym);
+    cmd->nlocalsym = bfd_h_get_32 (abfd, raw.nlocalsym);
+    cmd->iextdefsym = bfd_h_get_32 (abfd, raw.iextdefsym);
+    cmd->nextdefsym = bfd_h_get_32 (abfd, raw.nextdefsym);
+    cmd->iundefsym = bfd_h_get_32 (abfd, raw.iundefsym);
+    cmd->nundefsym = bfd_h_get_32 (abfd, raw.nundefsym);
+    cmd->tocoff = bfd_h_get_32 (abfd, raw.tocoff);
+    cmd->ntoc = bfd_h_get_32 (abfd, raw.ntoc);
+    cmd->modtaboff = bfd_h_get_32 (abfd, raw.modtaboff);
+    cmd->nmodtab = bfd_h_get_32 (abfd, raw.nmodtab);
+    cmd->extrefsymoff = bfd_h_get_32 (abfd, raw.extrefsymoff);
+    cmd->nextrefsyms = bfd_h_get_32 (abfd, raw.nextrefsyms);
+    cmd->indirectsymoff = bfd_h_get_32 (abfd, raw.indirectsymoff);
+    cmd->nindirectsyms = bfd_h_get_32 (abfd, raw.nindirectsyms);
+    cmd->extreloff = bfd_h_get_32 (abfd, raw.extreloff);
+    cmd->nextrel = bfd_h_get_32 (abfd, raw.nextrel);
+    cmd->locreloff = bfd_h_get_32 (abfd, raw.locreloff);
+    cmd->nlocrel = bfd_h_get_32 (abfd, raw.nlocrel);
+  }
+
+  if (cmd->nmodtab != 0)
+    {
+      unsigned int i;
+      int wide = bfd_mach_o_wide_p (abfd);
+      unsigned int module_len = wide ? 56 : 52;
+
+      cmd->dylib_module =
+        bfd_alloc (abfd, cmd->nmodtab * sizeof (bfd_mach_o_dylib_module));
+      if (cmd->dylib_module == NULL)
+        return -1;
+
+      if (bfd_seek (abfd, cmd->modtaboff, SEEK_SET) != 0)
+        return -1;
+
+      for (i = 0; i < cmd->nmodtab; i++)
+        {
+          bfd_mach_o_dylib_module *module = &cmd->dylib_module[i];
+          unsigned long v;
+          unsigned char buf[56];
+
+          if (bfd_bread ((void *) buf, module_len, abfd) != module_len)
+            return -1;
+
+          module->module_name_idx = bfd_h_get_32 (abfd, buf + 0);
+          module->iextdefsym = bfd_h_get_32 (abfd, buf + 4);
+          module->nextdefsym = bfd_h_get_32 (abfd, buf + 8);
+          module->irefsym = bfd_h_get_32 (abfd, buf + 12);
+          module->nrefsym = bfd_h_get_32 (abfd, buf + 16);
+          module->ilocalsym = bfd_h_get_32 (abfd, buf + 20);
+          module->nlocalsym = bfd_h_get_32 (abfd, buf + 24);
+          module->iextrel = bfd_h_get_32 (abfd, buf + 28);
+          module->nextrel = bfd_h_get_32 (abfd, buf + 32);
+          v = bfd_h_get_32 (abfd, buf +36);
+          module->iinit = v & 0xffff;
+          module->iterm = (v >> 16) & 0xffff;
+          v = bfd_h_get_32 (abfd, buf + 40);
+          module->ninit = v & 0xffff;
+          module->nterm = (v >> 16) & 0xffff;
+          if (wide)
+            {
+              module->objc_module_info_size = bfd_h_get_32 (abfd, buf + 44);
+              module->objc_module_info_addr = bfd_h_get_64 (abfd, buf + 48);
+            }
+          else
+            {
+              module->objc_module_info_addr = bfd_h_get_32 (abfd, buf + 44);
+              module->objc_module_info_size = bfd_h_get_32 (abfd, buf + 48);
+            }
+        }
+    }
+  
+  if (cmd->ntoc != 0)
+    {
+      unsigned int i;
+
+      cmd->dylib_toc = bfd_alloc
+        (abfd, cmd->ntoc * sizeof (bfd_mach_o_dylib_table_of_content));
+      if (cmd->dylib_toc == NULL)
+        return -1;
+
+      if (bfd_seek (abfd, cmd->tocoff, SEEK_SET) != 0)
+        return -1;
+
+      for (i = 0; i < cmd->ntoc; i++)
+        {
+          struct mach_o_dylib_table_of_contents_external raw;
+          bfd_mach_o_dylib_table_of_content *toc = &cmd->dylib_toc[i];
+
+          if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw))
+            return -1;
+
+          toc->symbol_index = bfd_h_get_32 (abfd, raw.symbol_index);
+          toc->module_index = bfd_h_get_32 (abfd, raw.module_index);
+        }
+    }
+
+  if (cmd->nindirectsyms != 0)
+    {
+      unsigned int i;
+
+      cmd->indirect_syms = bfd_alloc
+        (abfd, cmd->nindirectsyms * sizeof (unsigned int));
+      if (cmd->indirect_syms == NULL)
+        return -1;
+
+      if (bfd_seek (abfd, cmd->indirectsymoff, SEEK_SET) != 0)
+        return -1;
+
+      for (i = 0; i < cmd->nindirectsyms; i++)
+        {
+          unsigned char raw[4];
+          unsigned int *is = &cmd->indirect_syms[i];
+
+          if (bfd_bread (raw, sizeof (raw), abfd) != sizeof (raw))
+            return -1;
+
+          *is = bfd_h_get_32 (abfd, raw);
+        }
+    }
+
+  if (cmd->nextrefsyms != 0)
+    {
+      unsigned long v;
+      unsigned int i;
+
+      cmd->ext_refs = bfd_alloc
+        (abfd, cmd->nextrefsyms * sizeof (bfd_mach_o_dylib_reference));
+      if (cmd->ext_refs == NULL)
+        return -1;
+
+      if (bfd_seek (abfd, cmd->extrefsymoff, SEEK_SET) != 0)
+        return -1;
+
+      for (i = 0; i < cmd->nextrefsyms; i++)
+        {
+          unsigned char raw[4];
+          bfd_mach_o_dylib_reference *ref = &cmd->ext_refs[i];
+
+          if (bfd_bread (raw, sizeof (raw), abfd) != sizeof (raw))
+            return -1;
+
+          /* Fields isym and flags are written as bit-fields, thus we need
+             a specific processing for endianness.  */
+          v = bfd_h_get_32 (abfd, raw);
+          if (bfd_big_endian (abfd))
+            {
+              ref->isym = (v >> 8) & 0xffffff;
+              ref->flags = v & 0xff;
+            }
+          else
+            {
+              ref->isym = v & 0xffffff;
+              ref->flags = (v >> 24) & 0xff;
+            }
+        }
+    }
+
+  if (mdata->dysymtab)
+    return -1;
+  mdata->dysymtab = cmd;
+
+  return 0;
+}
+
+static int
+bfd_mach_o_read_symtab (bfd *abfd, bfd_mach_o_load_command *command)
+{
+  bfd_mach_o_symtab_command *symtab = &command->command.symtab;
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  struct mach_o_symtab_command_external raw;
+
+  BFD_ASSERT (command->type == BFD_MACH_O_LC_SYMTAB);
+
+  if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0
+      || bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw))
+    return -1;
+
+  symtab->symoff = bfd_h_get_32 (abfd, raw.symoff);
+  symtab->nsyms = bfd_h_get_32 (abfd, raw.nsyms);
+  symtab->stroff = bfd_h_get_32 (abfd, raw.stroff);
+  symtab->strsize = bfd_h_get_32 (abfd, raw.strsize);
+  symtab->symbols = NULL;
+  symtab->strtab = NULL;
+
+  if (symtab->nsyms != 0)
+    abfd->flags |= HAS_SYMS;
+
+  if (mdata->symtab)
+    return -1;
+  mdata->symtab = symtab;
+  return 0;
+}
+
+static int
+bfd_mach_o_read_uuid (bfd *abfd, bfd_mach_o_load_command *command)
+{
+  bfd_mach_o_uuid_command *cmd = &command->command.uuid;
+
+  BFD_ASSERT (command->type == BFD_MACH_O_LC_UUID);
+
+  if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0
+      || bfd_bread (cmd->uuid, 16, abfd) != 16)
+    return -1;
+
+  return 0;
+}
+
+static int
+bfd_mach_o_read_linkedit (bfd *abfd, bfd_mach_o_load_command *command)
+{
+  bfd_mach_o_linkedit_command *cmd = &command->command.linkedit;
+  struct mach_o_linkedit_data_command_external raw;
+
+  if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0
+      || bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw))
+    return -1;
+
+  cmd->dataoff = bfd_get_32 (abfd, raw.dataoff);
+  cmd->datasize = bfd_get_32 (abfd, raw.datasize);
+  return 0;
+}
+
+static int
+bfd_mach_o_read_str (bfd *abfd, bfd_mach_o_load_command *command)
+{
+  bfd_mach_o_str_command *cmd = &command->command.str;
+  struct mach_o_str_command_external raw;
+  unsigned long off;
+
+  if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0
+      || bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw))
+    return -1;
+
+  off = bfd_get_32 (abfd, raw.str);
+  cmd->stroff = command->offset + off;
+  cmd->str_len = command->len - off;
+  cmd->str = bfd_alloc (abfd, cmd->str_len);
+  if (cmd->str == NULL)
+    return -1;
+  if (bfd_seek (abfd, cmd->stroff, SEEK_SET) != 0
+      || bfd_bread ((void *) cmd->str, cmd->str_len, abfd) != cmd->str_len)
+    return -1;
+  return 0;
+}
+
+static int
+bfd_mach_o_read_dyld_info (bfd *abfd, bfd_mach_o_load_command *command)
+{
+  bfd_mach_o_dyld_info_command *cmd = &command->command.dyld_info;
+  struct mach_o_dyld_info_command_external raw;
+
+  if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0
+      || bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw))
+    return -1;
+
+  cmd->rebase_off = bfd_get_32 (abfd, raw.rebase_off);
+  cmd->rebase_size = bfd_get_32 (abfd, raw.rebase_size);
+  cmd->bind_off = bfd_get_32 (abfd, raw.bind_off);
+  cmd->bind_size = bfd_get_32 (abfd, raw.bind_size);
+  cmd->weak_bind_off = bfd_get_32 (abfd, raw.weak_bind_off);
+  cmd->weak_bind_size = bfd_get_32 (abfd, raw.weak_bind_size);
+  cmd->lazy_bind_off = bfd_get_32 (abfd, raw.lazy_bind_off);
+  cmd->lazy_bind_size = bfd_get_32 (abfd, raw.lazy_bind_size);
+  cmd->export_off = bfd_get_32 (abfd, raw.export_off);
+  cmd->export_size = bfd_get_32 (abfd, raw.export_size);
+  return 0;
+}
+
+static bfd_boolean
+bfd_mach_o_read_version_min (bfd *abfd, bfd_mach_o_load_command *command)
+{
+  bfd_mach_o_version_min_command *cmd = &command->command.version_min;
+  struct mach_o_version_min_command_external raw;
+  unsigned int ver;
+
+  if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0
+      || bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw))
+    return FALSE;
+
+  ver = bfd_get_32 (abfd, raw.version);
+  cmd->rel = ver >> 16;
+  cmd->maj = ver >> 8;
+  cmd->min = ver;
+  cmd->reserved = bfd_get_32 (abfd, raw.reserved);
+  return TRUE;
+}
+
+static int
+bfd_mach_o_read_segment (bfd *abfd,
+                         bfd_mach_o_load_command *command,
+                         unsigned int wide)
+{
+  bfd_mach_o_segment_command *seg = &command->command.segment;
+  unsigned long i;
+
+  if (wide)
+    {
+      struct mach_o_segment_command_64_external raw;
+
+      BFD_ASSERT (command->type == BFD_MACH_O_LC_SEGMENT_64);
+
+      if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0
+          || bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw))
+        return -1;
+
+      memcpy (seg->segname, raw.segname, 16);
+      seg->segname[16] = '\0';
+
+      seg->vmaddr = bfd_h_get_64 (abfd, raw.vmaddr);
+      seg->vmsize = bfd_h_get_64 (abfd, raw.vmsize);
+      seg->fileoff = bfd_h_get_64 (abfd, raw.fileoff);
+      seg->filesize = bfd_h_get_64 (abfd, raw.filesize);
+      seg->maxprot = bfd_h_get_32 (abfd, raw.maxprot);
+      seg->initprot = bfd_h_get_32 (abfd, raw.initprot);
+      seg->nsects = bfd_h_get_32 (abfd, raw.nsects);
+      seg->flags = bfd_h_get_32 (abfd, raw.flags);
+    }
+  else
+    {
+      struct mach_o_segment_command_32_external raw;
+
+      BFD_ASSERT (command->type == BFD_MACH_O_LC_SEGMENT);
+
+      if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0
+          || bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw))
+        return -1;
+
+      memcpy (seg->segname, raw.segname, 16);
+      seg->segname[16] = '\0';
+
+      seg->vmaddr = bfd_h_get_32 (abfd, raw.vmaddr);
+      seg->vmsize = bfd_h_get_32 (abfd, raw.vmsize);
+      seg->fileoff = bfd_h_get_32 (abfd, raw.fileoff);
+      seg->filesize = bfd_h_get_32 (abfd, raw.filesize);
+      seg->maxprot = bfd_h_get_32 (abfd, raw.maxprot);
+      seg->initprot = bfd_h_get_32 (abfd, raw.initprot);
+      seg->nsects = bfd_h_get_32 (abfd, raw.nsects);
+      seg->flags = bfd_h_get_32 (abfd, raw.flags);
+    }
+  seg->sect_head = NULL;
+  seg->sect_tail = NULL;
+
+  for (i = 0; i < seg->nsects; i++)
+    {
+      bfd_vma segoff;
+      asection *sec;
+
+      if (wide)
+        segoff = command->offset + BFD_MACH_O_LC_SEGMENT_64_SIZE
+          + (i * BFD_MACH_O_SECTION_64_SIZE);
+      else
+        segoff = command->offset + BFD_MACH_O_LC_SEGMENT_SIZE
+          + (i * BFD_MACH_O_SECTION_SIZE);
+
+      sec = bfd_mach_o_read_section (abfd, segoff, seg->initprot, wide);
+      if (sec == NULL)
+        return -1;
+
+      bfd_mach_o_append_section_to_segment (seg, sec);
+    }
+
+  return 0;
+}
+
+static int
+bfd_mach_o_read_segment_32 (bfd *abfd, bfd_mach_o_load_command *command)
+{
+  return bfd_mach_o_read_segment (abfd, command, 0);
+}
+
+static int
+bfd_mach_o_read_segment_64 (bfd *abfd, bfd_mach_o_load_command *command)
+{
+  return bfd_mach_o_read_segment (abfd, command, 1);
+}
+
+static int
+bfd_mach_o_read_command (bfd *abfd, bfd_mach_o_load_command *command)
+{
+  struct mach_o_load_command_external raw;
+  unsigned int cmd;
+
+  /* Read command type and length.  */
+  if (bfd_seek (abfd, command->offset, SEEK_SET) != 0
+      || bfd_bread (&raw, BFD_MACH_O_LC_SIZE, abfd) != BFD_MACH_O_LC_SIZE)
+    return -1;
+
+  cmd = bfd_h_get_32 (abfd, raw.cmd);
+  command->type =  cmd & ~BFD_MACH_O_LC_REQ_DYLD;
+  command->type_required = cmd & BFD_MACH_O_LC_REQ_DYLD ? TRUE : FALSE;
+  command->len = bfd_h_get_32 (abfd, raw.cmdsize);
+
+  switch (command->type)
+    {
+    case BFD_MACH_O_LC_SEGMENT:
+      if (bfd_mach_o_read_segment_32 (abfd, command) != 0)
+	return -1;
+      break;
+    case BFD_MACH_O_LC_SEGMENT_64:
+      if (bfd_mach_o_read_segment_64 (abfd, command) != 0)
+	return -1;
+      break;
+    case BFD_MACH_O_LC_SYMTAB:
+      if (bfd_mach_o_read_symtab (abfd, command) != 0)
+	return -1;
+      break;
+    case BFD_MACH_O_LC_SYMSEG:
+      break;
+    case BFD_MACH_O_LC_THREAD:
+    case BFD_MACH_O_LC_UNIXTHREAD:
+      if (bfd_mach_o_read_thread (abfd, command) != 0)
+	return -1;
+      break;
+    case BFD_MACH_O_LC_LOAD_DYLINKER:
+    case BFD_MACH_O_LC_ID_DYLINKER:
+      if (bfd_mach_o_read_dylinker (abfd, command) != 0)
+	return -1;
+      break;
+    case BFD_MACH_O_LC_LOAD_DYLIB:
+    case BFD_MACH_O_LC_ID_DYLIB:
+    case BFD_MACH_O_LC_LOAD_WEAK_DYLIB:
+    case BFD_MACH_O_LC_REEXPORT_DYLIB:
+      if (bfd_mach_o_read_dylib (abfd, command) != 0)
+	return -1;
+      break;
+    case BFD_MACH_O_LC_PREBOUND_DYLIB:
+      if (bfd_mach_o_read_prebound_dylib (abfd, command) != 0)
+	return -1;
+      break;
+    case BFD_MACH_O_LC_LOADFVMLIB:
+    case BFD_MACH_O_LC_IDFVMLIB:
+    case BFD_MACH_O_LC_IDENT:
+    case BFD_MACH_O_LC_FVMFILE:
+    case BFD_MACH_O_LC_PREPAGE:
+    case BFD_MACH_O_LC_ROUTINES:
+    case BFD_MACH_O_LC_ROUTINES_64:
+      break;
+    case BFD_MACH_O_LC_SUB_FRAMEWORK:
+    case BFD_MACH_O_LC_SUB_UMBRELLA:
+    case BFD_MACH_O_LC_SUB_LIBRARY:
+    case BFD_MACH_O_LC_SUB_CLIENT:
+    case BFD_MACH_O_LC_RPATH:
+      if (bfd_mach_o_read_str (abfd, command) != 0)
+        return -1;
+      break;
+    case BFD_MACH_O_LC_DYSYMTAB:
+      if (bfd_mach_o_read_dysymtab (abfd, command) != 0)
+	return -1;
+      break;
+    case BFD_MACH_O_LC_TWOLEVEL_HINTS:
+    case BFD_MACH_O_LC_PREBIND_CKSUM:
+      break;
+    case BFD_MACH_O_LC_UUID:
+      if (bfd_mach_o_read_uuid (abfd, command) != 0)
+	return -1;
+      break;
+    case BFD_MACH_O_LC_CODE_SIGNATURE:
+    case BFD_MACH_O_LC_SEGMENT_SPLIT_INFO:
+    case BFD_MACH_O_LC_FUNCTION_STARTS:
+      if (bfd_mach_o_read_linkedit (abfd, command) != 0)
+	return -1;
+      break;
+    case BFD_MACH_O_LC_DYLD_INFO:
+      if (bfd_mach_o_read_dyld_info (abfd, command) != 0)
+	return -1;
+      break;
+    case BFD_MACH_O_LC_VERSION_MIN_MACOSX:
+    case BFD_MACH_O_LC_VERSION_MIN_IPHONEOS:
+      if (!bfd_mach_o_read_version_min (abfd, command))
+	return -1;
+      break;
+    default:
+      (*_bfd_error_handler) (_("unable to read unknown load command 0x%lx"),
+			     (unsigned long) command->type);
+      break;
+    }
+
+  return 0;
+}
+
+static void
+bfd_mach_o_flatten_sections (bfd *abfd)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  long csect = 0;
+  unsigned long i;
+
+  /* Count total number of sections.  */
+  mdata->nsects = 0;
+
+  for (i = 0; i < mdata->header.ncmds; i++)
+    {
+      if (mdata->commands[i].type == BFD_MACH_O_LC_SEGMENT
+	  || mdata->commands[i].type == BFD_MACH_O_LC_SEGMENT_64)
+	{
+	  bfd_mach_o_segment_command *seg;
+
+	  seg = &mdata->commands[i].command.segment;
+	  mdata->nsects += seg->nsects;
+	}
+    }
+
+  /* Allocate sections array.  */
+  mdata->sections = bfd_alloc (abfd,
+			       mdata->nsects * sizeof (bfd_mach_o_section *));
+
+  /* Fill the array.  */
+  csect = 0;
+
+  for (i = 0; i < mdata->header.ncmds; i++)
+    {
+      if (mdata->commands[i].type == BFD_MACH_O_LC_SEGMENT
+	  || mdata->commands[i].type == BFD_MACH_O_LC_SEGMENT_64)
+	{
+	  bfd_mach_o_segment_command *seg;
+          bfd_mach_o_section *sec;
+
+	  seg = &mdata->commands[i].command.segment;
+	  BFD_ASSERT (csect + seg->nsects <= mdata->nsects);
+
+          for (sec = seg->sect_head; sec != NULL; sec = sec->next)
+	    mdata->sections[csect++] = sec;
+	}
+    }
+}
+
+int
+bfd_mach_o_scan_start_address (bfd *abfd)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  bfd_mach_o_thread_command *cmd = NULL;
+  unsigned long i;
+
+  for (i = 0; i < mdata->header.ncmds; i++)
+    {
+      if ((mdata->commands[i].type == BFD_MACH_O_LC_THREAD) ||
+	  (mdata->commands[i].type == BFD_MACH_O_LC_UNIXTHREAD))
+	{
+	  if (cmd == NULL)
+	    cmd = &mdata->commands[i].command.thread;
+	  else
+	    return 0;
+	}
+    }
+
+  if (cmd == NULL)
+    return 0;
+
+  for (i = 0; i < cmd->nflavours; i++)
+    {
+      if ((mdata->header.cputype == BFD_MACH_O_CPU_TYPE_I386)
+	  && (cmd->flavours[i].flavour
+	      == (unsigned long) BFD_MACH_O_x86_THREAD_STATE32))
+	{
+	  unsigned char buf[4];
+
+	  if (bfd_seek (abfd, cmd->flavours[i].offset + 40, SEEK_SET) != 0
+              || bfd_bread (buf, 4, abfd) != 4)
+	    return -1;
+
+	  abfd->start_address = bfd_h_get_32 (abfd, buf);
+	}
+      else if ((mdata->header.cputype == BFD_MACH_O_CPU_TYPE_POWERPC)
+	       && (cmd->flavours[i].flavour == BFD_MACH_O_PPC_THREAD_STATE))
+	{
+	  unsigned char buf[4];
+
+	  if (bfd_seek (abfd, cmd->flavours[i].offset + 0, SEEK_SET) != 0
+              || bfd_bread (buf, 4, abfd) != 4)
+	    return -1;
+
+	  abfd->start_address = bfd_h_get_32 (abfd, buf);
+	}
+      else if ((mdata->header.cputype == BFD_MACH_O_CPU_TYPE_POWERPC_64)
+               && (cmd->flavours[i].flavour == BFD_MACH_O_PPC_THREAD_STATE64))
+        {
+          unsigned char buf[8];
+
+          if (bfd_seek (abfd, cmd->flavours[i].offset + 0, SEEK_SET) != 0
+              || bfd_bread (buf, 8, abfd) != 8)
+            return -1;
+
+          abfd->start_address = bfd_h_get_64 (abfd, buf);
+        }
+      else if ((mdata->header.cputype == BFD_MACH_O_CPU_TYPE_X86_64)
+               && (cmd->flavours[i].flavour == BFD_MACH_O_x86_THREAD_STATE64))
+        {
+          unsigned char buf[8];
+
+          if (bfd_seek (abfd, cmd->flavours[i].offset + (16 * 8), SEEK_SET) != 0
+              || bfd_bread (buf, 8, abfd) != 8)
+            return -1;
+
+          abfd->start_address = bfd_h_get_64 (abfd, buf);
+        }
+    }
+
+  return 0;
+}
+
+bfd_boolean
+bfd_mach_o_set_arch_mach (bfd *abfd,
+                          enum bfd_architecture arch,
+                          unsigned long machine)
+{
+  bfd_mach_o_backend_data *bed = bfd_mach_o_get_backend_data (abfd);
+
+  /* If this isn't the right architecture for this backend, and this
+     isn't the generic backend, fail.  */
+  if (arch != bed->arch
+      && arch != bfd_arch_unknown
+      && bed->arch != bfd_arch_unknown)
+    return FALSE;
+
+  return bfd_default_set_arch_mach (abfd, arch, machine);
+}
+
+int
+bfd_mach_o_scan (bfd *abfd,
+		 bfd_mach_o_header *header,
+		 bfd_mach_o_data_struct *mdata)
+{
+  unsigned int i;
+  enum bfd_architecture cputype;
+  unsigned long cpusubtype;
+  unsigned int hdrsize;
+
+  hdrsize = mach_o_wide_p (header) ?
+    BFD_MACH_O_HEADER_64_SIZE : BFD_MACH_O_HEADER_SIZE;
+
+  mdata->header = *header;
+
+  abfd->flags = abfd->flags & BFD_IN_MEMORY;
+  switch (header->filetype)
+    {
+    case BFD_MACH_O_MH_OBJECT:
+      abfd->flags |= HAS_RELOC;
+      break;
+    case BFD_MACH_O_MH_EXECUTE:
+      abfd->flags |= EXEC_P;
+      break;
+    case BFD_MACH_O_MH_DYLIB:
+    case BFD_MACH_O_MH_BUNDLE:
+      abfd->flags |= DYNAMIC;
+      break;
+    }
+
+  abfd->tdata.mach_o_data = mdata;
+
+  bfd_mach_o_convert_architecture (header->cputype, header->cpusubtype,
+				   &cputype, &cpusubtype);
+  if (cputype == bfd_arch_unknown)
+    {
+      (*_bfd_error_handler) (_("bfd_mach_o_scan: unknown architecture 0x%lx/0x%lx"),
+			     header->cputype, header->cpusubtype);
+      return -1;
+    }
+
+  bfd_set_arch_mach (abfd, cputype, cpusubtype);
+
+  if (header->ncmds != 0)
+    {
+      mdata->commands = bfd_alloc
+        (abfd, header->ncmds * sizeof (bfd_mach_o_load_command));
+      if (mdata->commands == NULL)
+	return -1;
+
+      for (i = 0; i < header->ncmds; i++)
+	{
+	  bfd_mach_o_load_command *cur = &mdata->commands[i];
+
+	  if (i == 0)
+	    cur->offset = hdrsize;
+	  else
+	    {
+	      bfd_mach_o_load_command *prev = &mdata->commands[i - 1];
+	      cur->offset = prev->offset + prev->len;
+	    }
+
+	  if (bfd_mach_o_read_command (abfd, cur) < 0)
+	    return -1;
+	}
+    }
+
+  if (bfd_mach_o_scan_start_address (abfd) < 0)
+    return -1;
+
+  bfd_mach_o_flatten_sections (abfd);
+  return 0;
+}
+
+bfd_boolean
+bfd_mach_o_mkobject_init (bfd *abfd)
+{
+  bfd_mach_o_data_struct *mdata = NULL;
+
+  mdata = bfd_alloc (abfd, sizeof (bfd_mach_o_data_struct));
+  if (mdata == NULL)
+    return FALSE;
+  abfd->tdata.mach_o_data = mdata;
+
+  mdata->header.magic = 0;
+  mdata->header.cputype = 0;
+  mdata->header.cpusubtype = 0;
+  mdata->header.filetype = 0;
+  mdata->header.ncmds = 0;
+  mdata->header.sizeofcmds = 0;
+  mdata->header.flags = 0;
+  mdata->header.byteorder = BFD_ENDIAN_UNKNOWN;
+  mdata->commands = NULL;
+  mdata->nsects = 0;
+  mdata->sections = NULL;
+
+  return TRUE;
+}
+
+static bfd_boolean
+bfd_mach_o_gen_mkobject (bfd *abfd)
+{
+  bfd_mach_o_data_struct *mdata;
+
+  if (!bfd_mach_o_mkobject_init (abfd))
+    return FALSE;
+
+  mdata = bfd_mach_o_get_data (abfd);
+  mdata->header.magic = BFD_MACH_O_MH_MAGIC;
+  mdata->header.cputype = 0;
+  mdata->header.cpusubtype = 0;
+  mdata->header.byteorder = abfd->xvec->byteorder;
+  mdata->header.version = 1;
+
+  return TRUE;
+}
+
+const bfd_target *
+bfd_mach_o_header_p (bfd *abfd,
+                     bfd_mach_o_filetype filetype,
+                     bfd_mach_o_cpu_type cputype)
+{
+  struct bfd_preserve preserve;
+  bfd_mach_o_header header;
+
+  preserve.marker = NULL;
+  if (!bfd_mach_o_read_header (abfd, &header))
+    goto wrong;
+
+  if (! (header.byteorder == BFD_ENDIAN_BIG
+	 || header.byteorder == BFD_ENDIAN_LITTLE))
+    {
+      (*_bfd_error_handler) (_("unknown header byte-order value 0x%lx"),
+			     (unsigned long) header.byteorder);
+      goto wrong;
+    }
+
+  if (! ((header.byteorder == BFD_ENDIAN_BIG
+	  && abfd->xvec->byteorder == BFD_ENDIAN_BIG
+	  && abfd->xvec->header_byteorder == BFD_ENDIAN_BIG)
+	 || (header.byteorder == BFD_ENDIAN_LITTLE
+	     && abfd->xvec->byteorder == BFD_ENDIAN_LITTLE
+	     && abfd->xvec->header_byteorder == BFD_ENDIAN_LITTLE)))
+    goto wrong;
+
+  /* Check cputype and filetype.
+     In case of wildcard, do not accept magics that are handled by existing
+     targets.  */
+  if (cputype)
+    {
+      if (header.cputype != cputype)
+        goto wrong;
+    }
+  else
+    {
+      switch (header.cputype)
+        {
+        case BFD_MACH_O_CPU_TYPE_I386:
+          /* Handled by mach-o-i386 */
+          goto wrong;
+        default:
+          break;
+        }
+    }
+  if (filetype)
+    {
+      if (header.filetype != filetype)
+        goto wrong;
+    }
+  else
+    {
+      switch (header.filetype)
+        {
+        case BFD_MACH_O_MH_CORE:
+          /* Handled by core_p */
+          goto wrong;
+        default:
+          break;
+        }
+    }
+
+  preserve.marker = bfd_zalloc (abfd, sizeof (bfd_mach_o_data_struct));
+  if (preserve.marker == NULL
+      || !bfd_preserve_save (abfd, &preserve))
+    goto fail;
+
+  if (bfd_mach_o_scan (abfd, &header,
+		       (bfd_mach_o_data_struct *) preserve.marker) != 0)
+    goto wrong;
+
+  bfd_preserve_finish (abfd, &preserve);
+  return abfd->xvec;
+
+ wrong:
+  bfd_set_error (bfd_error_wrong_format);
+
+ fail:
+  if (preserve.marker != NULL)
+    bfd_preserve_restore (abfd, &preserve);
+  return NULL;
+}
+
+static const bfd_target *
+bfd_mach_o_gen_object_p (bfd *abfd)
+{
+  return bfd_mach_o_header_p (abfd, 0, 0);
+}
+
+static const bfd_target *
+bfd_mach_o_gen_core_p (bfd *abfd)
+{
+  return bfd_mach_o_header_p (abfd, BFD_MACH_O_MH_CORE, 0);
+}
+
+typedef struct mach_o_fat_archentry
+{
+  unsigned long cputype;
+  unsigned long cpusubtype;
+  unsigned long offset;
+  unsigned long size;
+  unsigned long align;
+} mach_o_fat_archentry;
+
+typedef struct mach_o_fat_data_struct
+{
+  unsigned long magic;
+  unsigned long nfat_arch;
+  mach_o_fat_archentry *archentries;
+} mach_o_fat_data_struct;
+
+const bfd_target *
+bfd_mach_o_archive_p (bfd *abfd)
+{
+  mach_o_fat_data_struct *adata = NULL;
+  struct mach_o_fat_header_external hdr;
+  unsigned long i;
+
+  if (bfd_seek (abfd, 0, SEEK_SET) != 0
+      || bfd_bread (&hdr, sizeof (hdr), abfd) != sizeof (hdr))
+    goto error;
+
+  adata = bfd_alloc (abfd, sizeof (mach_o_fat_data_struct));
+  if (adata == NULL)
+    goto error;
+
+  adata->magic = bfd_getb32 (hdr.magic);
+  adata->nfat_arch = bfd_getb32 (hdr.nfat_arch);
+  if (adata->magic != 0xcafebabe)
+    goto error;
+  /* Avoid matching Java bytecode files, which have the same magic number.
+     In the Java bytecode file format this field contains the JVM version,
+     which starts at 43.0.  */
+  if (adata->nfat_arch > 30)
+    goto error;
+
+  adata->archentries =
+    bfd_alloc (abfd, adata->nfat_arch * sizeof (mach_o_fat_archentry));
+  if (adata->archentries == NULL)
+    goto error;
+
+  for (i = 0; i < adata->nfat_arch; i++)
+    {
+      struct mach_o_fat_arch_external arch;
+      if (bfd_bread (&arch, sizeof (arch), abfd) != sizeof (arch))
+	goto error;
+      adata->archentries[i].cputype = bfd_getb32 (arch.cputype);
+      adata->archentries[i].cpusubtype = bfd_getb32 (arch.cpusubtype);
+      adata->archentries[i].offset = bfd_getb32 (arch.offset);
+      adata->archentries[i].size = bfd_getb32 (arch.size);
+      adata->archentries[i].align = bfd_getb32 (arch.align);
+    }
+
+  abfd->tdata.mach_o_fat_data = adata;
+  return abfd->xvec;
+
+ error:
+  if (adata != NULL)
+    bfd_release (abfd, adata);
+  bfd_set_error (bfd_error_wrong_format);
+  return NULL;
+}
+
+bfd *
+bfd_mach_o_openr_next_archived_file (bfd *archive, bfd *prev)
+{
+  mach_o_fat_data_struct *adata;
+  mach_o_fat_archentry *entry = NULL;
+  unsigned long i;
+  bfd *nbfd;
+  enum bfd_architecture arch_type;
+  unsigned long arch_subtype;
+
+  adata = (mach_o_fat_data_struct *) archive->tdata.mach_o_fat_data;
+  BFD_ASSERT (adata != NULL);
+
+  /* Find index of previous entry.  */
+  if (prev == NULL)
+    i = 0;	/* Start at first one.  */
+  else
+    {
+      for (i = 0; i < adata->nfat_arch; i++)
+	{
+	  if (adata->archentries[i].offset == prev->origin)
+	    break;
+	}
+
+      if (i == adata->nfat_arch)
+	{
+	  /* Not found.  */
+	  bfd_set_error (bfd_error_bad_value);
+	  return NULL;
+	}
+    i++;	/* Get next entry.  */
+  }
+
+  if (i >= adata->nfat_arch)
+    {
+      bfd_set_error (bfd_error_no_more_archived_files);
+      return NULL;
+    }
+
+  entry = &adata->archentries[i];
+  nbfd = _bfd_new_bfd_contained_in (archive);
+  if (nbfd == NULL)
+    return NULL;
+
+  nbfd->origin = entry->offset;
+
+  bfd_mach_o_convert_architecture (entry->cputype, entry->cpusubtype,
+				   &arch_type, &arch_subtype);
+  /* Create the member filename.
+     Use FILENAME:ARCH_NAME.  */
+  {
+    char *s = NULL;
+    const char *arch_name;
+    size_t arch_file_len = strlen (bfd_get_filename (archive));
+
+    arch_name = bfd_printable_arch_mach (arch_type, arch_subtype);
+    s = bfd_malloc (arch_file_len + 1 + strlen (arch_name) + 1);
+    if (s == NULL)
+      return NULL;
+    memcpy (s, bfd_get_filename (archive), arch_file_len);
+    s[arch_file_len] = ':';
+    strcpy (s + arch_file_len + 1, arch_name);
+    nbfd->filename = s;
+  }
+  nbfd->iostream = NULL;
+  bfd_set_arch_mach (nbfd, arch_type, arch_subtype);
+
+  return nbfd;
+}
+
+/* If ABFD format is FORMAT and architecture is ARCH, return it.
+   If ABFD is a fat image containing a member that corresponds to FORMAT
+   and ARCH, returns it.
+   In other case, returns NULL.
+   This function allows transparent uses of fat images.  */
+bfd *
+bfd_mach_o_fat_extract (bfd *abfd,
+			bfd_format format,
+			const bfd_arch_info_type *arch)
+{
+  bfd *res;
+  mach_o_fat_data_struct *adata;
+  unsigned int i;
+
+  if (bfd_check_format (abfd, format))
+    {
+      if (bfd_get_arch_info (abfd) == arch)
+	return abfd;
+      return NULL;
+    }
+  if (!bfd_check_format (abfd, bfd_archive)
+      || abfd->xvec != &mach_o_fat_vec)
+    return NULL;
+
+  /* This is a Mach-O fat image.  */
+  adata = (mach_o_fat_data_struct *) abfd->tdata.mach_o_fat_data;
+  BFD_ASSERT (adata != NULL);
+
+  for (i = 0; i < adata->nfat_arch; i++)
+    {
+      struct mach_o_fat_archentry *e = &adata->archentries[i];
+      enum bfd_architecture cpu_type;
+      unsigned long cpu_subtype;
+
+      bfd_mach_o_convert_architecture (e->cputype, e->cpusubtype,
+				       &cpu_type, &cpu_subtype);
+      if (cpu_type != arch->arch || cpu_subtype != arch->mach)
+	continue;
+
+      /* The architecture is found.  */
+      res = _bfd_new_bfd_contained_in (abfd);
+      if (res == NULL)
+	return NULL;
+
+      res->origin = e->offset;
+
+      res->filename = strdup (abfd->filename);
+      res->iostream = NULL;
+
+      if (bfd_check_format (res, format))
+	{
+	  BFD_ASSERT (bfd_get_arch_info (res) == arch);
+	  return res;
+	}
+      bfd_close (res);
+      return NULL;
+    }
+
+  return NULL;
+}
+
+int
+bfd_mach_o_lookup_command (bfd *abfd,
+			   bfd_mach_o_load_command_type type,
+			   bfd_mach_o_load_command **mcommand)
+{
+  struct mach_o_data_struct *md = bfd_mach_o_get_data (abfd);
+  bfd_mach_o_load_command *ncmd = NULL;
+  unsigned int i, num;
+
+  BFD_ASSERT (md != NULL);
+  BFD_ASSERT (mcommand != NULL);
+
+  num = 0;
+  for (i = 0; i < md->header.ncmds; i++)
+    {
+      struct bfd_mach_o_load_command *cmd = &md->commands[i];
+
+      if (cmd->type != type)
+	continue;
+
+      if (num == 0)
+	ncmd = cmd;
+      num++;
+    }
+
+  *mcommand = ncmd;
+  return num;
+}
+
+unsigned long
+bfd_mach_o_stack_addr (enum bfd_mach_o_cpu_type type)
+{
+  switch (type)
+    {
+    case BFD_MACH_O_CPU_TYPE_MC680x0:
+      return 0x04000000;
+    case BFD_MACH_O_CPU_TYPE_MC88000:
+      return 0xffffe000;
+    case BFD_MACH_O_CPU_TYPE_POWERPC:
+      return 0xc0000000;
+    case BFD_MACH_O_CPU_TYPE_I386:
+      return 0xc0000000;
+    case BFD_MACH_O_CPU_TYPE_SPARC:
+      return 0xf0000000;
+    case BFD_MACH_O_CPU_TYPE_I860:
+      return 0;
+    case BFD_MACH_O_CPU_TYPE_HPPA:
+      return 0xc0000000 - 0x04000000;
+    default:
+      return 0;
+    }
+}
+
+typedef struct bfd_mach_o_xlat_name
+{
+  const char *name;
+  unsigned long val;
+}
+bfd_mach_o_xlat_name;
+
+static void
+bfd_mach_o_print_flags (const bfd_mach_o_xlat_name *table,
+                        unsigned long val,
+                        FILE *file)
+{
+  int first = 1;
+
+  for (; table->name; table++)
+    {
+      if (table->val & val)
+        {
+          if (!first)
+            fprintf (file, "+");
+          fprintf (file, "%s", table->name);
+          val &= ~table->val;
+          first = 0;
+        }
+    }
+  if (val)
+    {
+      if (!first)
+        fprintf (file, "+");
+      fprintf (file, "0x%lx", val);
+      return;
+    }
+  if (first)
+    fprintf (file, "-");
+}
+
+static const char *
+bfd_mach_o_get_name_or_null (const bfd_mach_o_xlat_name *table,
+                             unsigned long val)
+{
+  for (; table->name; table++)
+    if (table->val == val)
+      return table->name;
+  return NULL;
+}
+
+static const char *
+bfd_mach_o_get_name (const bfd_mach_o_xlat_name *table, unsigned long val)
+{
+  const char *res = bfd_mach_o_get_name_or_null (table, val);
+
+  if (res == NULL)
+    return "*UNKNOWN*";
+  else
+    return res;
+}
+
+static bfd_mach_o_xlat_name bfd_mach_o_cpu_name[] =
+{
+  { "vax", BFD_MACH_O_CPU_TYPE_VAX },
+  { "mc680x0", BFD_MACH_O_CPU_TYPE_MC680x0 },
+  { "i386", BFD_MACH_O_CPU_TYPE_I386 },
+  { "mips", BFD_MACH_O_CPU_TYPE_MIPS },
+  { "mc98000", BFD_MACH_O_CPU_TYPE_MC98000 },
+  { "hppa", BFD_MACH_O_CPU_TYPE_HPPA },
+  { "arm", BFD_MACH_O_CPU_TYPE_ARM },
+  { "mc88000", BFD_MACH_O_CPU_TYPE_MC88000 },
+  { "sparc", BFD_MACH_O_CPU_TYPE_SPARC },
+  { "i860", BFD_MACH_O_CPU_TYPE_I860 },
+  { "alpha", BFD_MACH_O_CPU_TYPE_ALPHA },
+  { "powerpc", BFD_MACH_O_CPU_TYPE_POWERPC },
+  { "powerpc_64", BFD_MACH_O_CPU_TYPE_POWERPC_64 },
+  { "x86_64", BFD_MACH_O_CPU_TYPE_X86_64 },
+  { NULL, 0}
+};
+
+static bfd_mach_o_xlat_name bfd_mach_o_filetype_name[] = 
+{
+  { "object", BFD_MACH_O_MH_OBJECT },
+  { "execute", BFD_MACH_O_MH_EXECUTE },
+  { "fvmlib", BFD_MACH_O_MH_FVMLIB },
+  { "core", BFD_MACH_O_MH_CORE },
+  { "preload", BFD_MACH_O_MH_PRELOAD },
+  { "dylib", BFD_MACH_O_MH_DYLIB },
+  { "dylinker", BFD_MACH_O_MH_DYLINKER },
+  { "bundle", BFD_MACH_O_MH_BUNDLE },
+  { "dylib_stub", BFD_MACH_O_MH_DYLIB_STUB },
+  { "dym", BFD_MACH_O_MH_DSYM },
+  { "kext_bundle", BFD_MACH_O_MH_KEXT_BUNDLE },
+  { NULL, 0}
+};
+
+static bfd_mach_o_xlat_name bfd_mach_o_header_flags_name[] = 
+{
+  { "noundefs", BFD_MACH_O_MH_NOUNDEFS },
+  { "incrlink", BFD_MACH_O_MH_INCRLINK },
+  { "dyldlink", BFD_MACH_O_MH_DYLDLINK },
+  { "bindatload", BFD_MACH_O_MH_BINDATLOAD },
+  { "prebound", BFD_MACH_O_MH_PREBOUND },
+  { "split_segs", BFD_MACH_O_MH_SPLIT_SEGS },
+  { "lazy_init", BFD_MACH_O_MH_LAZY_INIT },
+  { "twolevel", BFD_MACH_O_MH_TWOLEVEL },
+  { "force_flat", BFD_MACH_O_MH_FORCE_FLAT },
+  { "nomultidefs", BFD_MACH_O_MH_NOMULTIDEFS },
+  { "nofixprebinding", BFD_MACH_O_MH_NOFIXPREBINDING },
+  { "prebindable", BFD_MACH_O_MH_PREBINDABLE },
+  { "allmodsbound", BFD_MACH_O_MH_ALLMODSBOUND },
+  { "subsections_via_symbols", BFD_MACH_O_MH_SUBSECTIONS_VIA_SYMBOLS },
+  { "canonical", BFD_MACH_O_MH_CANONICAL },
+  { "weak_defines", BFD_MACH_O_MH_WEAK_DEFINES },
+  { "binds_to_weak", BFD_MACH_O_MH_BINDS_TO_WEAK },
+  { "allow_stack_execution", BFD_MACH_O_MH_ALLOW_STACK_EXECUTION },
+  { "root_safe", BFD_MACH_O_MH_ROOT_SAFE },
+  { "setuid_safe", BFD_MACH_O_MH_SETUID_SAFE },
+  { "no_reexported_dylibs", BFD_MACH_O_MH_NO_REEXPORTED_DYLIBS },
+  { "pie", BFD_MACH_O_MH_PIE },
+  { NULL, 0}
+};
+
+static bfd_mach_o_xlat_name bfd_mach_o_section_type_name[] = 
+{
+  { "regular", BFD_MACH_O_S_REGULAR},
+  { "zerofill", BFD_MACH_O_S_ZEROFILL},
+  { "cstring_literals", BFD_MACH_O_S_CSTRING_LITERALS},
+  { "4byte_literals", BFD_MACH_O_S_4BYTE_LITERALS},
+  { "8byte_literals", BFD_MACH_O_S_8BYTE_LITERALS},
+  { "literal_pointers", BFD_MACH_O_S_LITERAL_POINTERS},
+  { "non_lazy_symbol_pointers", BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS},
+  { "lazy_symbol_pointers", BFD_MACH_O_S_LAZY_SYMBOL_POINTERS},
+  { "symbol_stubs", BFD_MACH_O_S_SYMBOL_STUBS},
+  { "mod_init_func_pointers", BFD_MACH_O_S_MOD_INIT_FUNC_POINTERS},
+  { "mod_fini_func_pointers", BFD_MACH_O_S_MOD_FINI_FUNC_POINTERS},
+  { "coalesced", BFD_MACH_O_S_COALESCED},
+  { "gb_zerofill", BFD_MACH_O_S_GB_ZEROFILL},
+  { "interposing", BFD_MACH_O_S_INTERPOSING},
+  { "16byte_literals", BFD_MACH_O_S_16BYTE_LITERALS},
+  { "dtrace_dof", BFD_MACH_O_S_DTRACE_DOF},
+  { "lazy_dylib_symbol_pointers", BFD_MACH_O_S_LAZY_DYLIB_SYMBOL_POINTERS},
+  { NULL, 0}
+};
+
+static bfd_mach_o_xlat_name bfd_mach_o_section_attribute_name[] = 
+{
+  { "loc_reloc", BFD_MACH_O_S_ATTR_LOC_RELOC },
+  { "ext_reloc", BFD_MACH_O_S_ATTR_EXT_RELOC },
+  { "some_instructions", BFD_MACH_O_S_ATTR_SOME_INSTRUCTIONS },
+  { "debug", BFD_MACH_O_S_ATTR_DEBUG },
+  { "modifying_code", BFD_MACH_O_S_SELF_MODIFYING_CODE },
+  { "live_support", BFD_MACH_O_S_ATTR_LIVE_SUPPORT },
+  { "no_dead_strip", BFD_MACH_O_S_ATTR_NO_DEAD_STRIP },
+  { "strip_static_syms", BFD_MACH_O_S_ATTR_STRIP_STATIC_SYMS },
+  { "no_toc", BFD_MACH_O_S_ATTR_NO_TOC },
+  { "pure_instructions", BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS },
+  { NULL, 0}
+};
+
+static bfd_mach_o_xlat_name bfd_mach_o_load_command_name[] = 
+{
+  { "segment", BFD_MACH_O_LC_SEGMENT},
+  { "symtab", BFD_MACH_O_LC_SYMTAB},
+  { "symseg", BFD_MACH_O_LC_SYMSEG},
+  { "thread", BFD_MACH_O_LC_THREAD},
+  { "unixthread", BFD_MACH_O_LC_UNIXTHREAD},
+  { "loadfvmlib", BFD_MACH_O_LC_LOADFVMLIB},
+  { "idfvmlib", BFD_MACH_O_LC_IDFVMLIB},
+  { "ident", BFD_MACH_O_LC_IDENT},
+  { "fvmfile", BFD_MACH_O_LC_FVMFILE},
+  { "prepage", BFD_MACH_O_LC_PREPAGE},
+  { "dysymtab", BFD_MACH_O_LC_DYSYMTAB},
+  { "load_dylib", BFD_MACH_O_LC_LOAD_DYLIB},
+  { "id_dylib", BFD_MACH_O_LC_ID_DYLIB},
+  { "load_dylinker", BFD_MACH_O_LC_LOAD_DYLINKER},
+  { "id_dylinker", BFD_MACH_O_LC_ID_DYLINKER},
+  { "prebound_dylib", BFD_MACH_O_LC_PREBOUND_DYLIB},
+  { "routines", BFD_MACH_O_LC_ROUTINES},
+  { "sub_framework", BFD_MACH_O_LC_SUB_FRAMEWORK},
+  { "sub_umbrella", BFD_MACH_O_LC_SUB_UMBRELLA},
+  { "sub_client", BFD_MACH_O_LC_SUB_CLIENT},
+  { "sub_library", BFD_MACH_O_LC_SUB_LIBRARY},
+  { "twolevel_hints", BFD_MACH_O_LC_TWOLEVEL_HINTS},
+  { "prebind_cksum", BFD_MACH_O_LC_PREBIND_CKSUM},
+  { "load_weak_dylib", BFD_MACH_O_LC_LOAD_WEAK_DYLIB},
+  { "segment_64", BFD_MACH_O_LC_SEGMENT_64},
+  { "routines_64", BFD_MACH_O_LC_ROUTINES_64},
+  { "uuid", BFD_MACH_O_LC_UUID},
+  { "rpath", BFD_MACH_O_LC_RPATH},
+  { "code_signature", BFD_MACH_O_LC_CODE_SIGNATURE},
+  { "segment_split_info", BFD_MACH_O_LC_SEGMENT_SPLIT_INFO},
+  { "reexport_dylib", BFD_MACH_O_LC_REEXPORT_DYLIB},
+  { "lazy_load_dylib", BFD_MACH_O_LC_LAZY_LOAD_DYLIB},
+  { "encryption_info", BFD_MACH_O_LC_ENCRYPTION_INFO},
+  { "dyld_info", BFD_MACH_O_LC_DYLD_INFO},
+  { "load_upward_lib", BFD_MACH_O_LC_LOAD_UPWARD_DYLIB},
+  { "version_min_macosx", BFD_MACH_O_LC_VERSION_MIN_MACOSX},
+  { "version_min_iphoneos", BFD_MACH_O_LC_VERSION_MIN_IPHONEOS},
+  { "function_starts", BFD_MACH_O_LC_FUNCTION_STARTS},
+  { "dyld_environment", BFD_MACH_O_LC_DYLD_ENVIRONMENT},
+  { NULL, 0}
+};
+
+/* Get the section type from NAME.  Return -1 if NAME is unknown.  */
+
+unsigned int
+bfd_mach_o_get_section_type_from_name (const char *name)
+{
+  bfd_mach_o_xlat_name *x;
+
+  for (x = bfd_mach_o_section_type_name; x->name; x++)
+    if (strcmp (x->name, name) == 0)
+      return x->val;
+  return (unsigned int)-1;
+}
+
+/* Get the section attribute from NAME.  Return -1 if NAME is unknown.  */
+
+unsigned int
+bfd_mach_o_get_section_attribute_from_name (const char *name)
+{
+  bfd_mach_o_xlat_name *x;
+
+  for (x = bfd_mach_o_section_attribute_name; x->name; x++)
+    if (strcmp (x->name, name) == 0)
+      return x->val;
+  return (unsigned int)-1;
+}
+
+static void
+bfd_mach_o_print_private_header (bfd *abfd, FILE *file)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  bfd_mach_o_header *h = &mdata->header;
+
+  fputs (_("Mach-O header:\n"), file);
+  fprintf (file, _(" magic     : %08lx\n"), h->magic);
+  fprintf (file, _(" cputype   : %08lx (%s)\n"), h->cputype,
+           bfd_mach_o_get_name (bfd_mach_o_cpu_name, h->cputype));
+  fprintf (file, _(" cpusubtype: %08lx\n"), h->cpusubtype);
+  fprintf (file, _(" filetype  : %08lx (%s)\n"),
+           h->filetype,
+           bfd_mach_o_get_name (bfd_mach_o_filetype_name, h->filetype));
+  fprintf (file, _(" ncmds     : %08lx (%lu)\n"), h->ncmds, h->ncmds);
+  fprintf (file, _(" sizeofcmds: %08lx\n"), h->sizeofcmds);
+  fprintf (file, _(" flags     : %08lx ("), h->flags);
+  bfd_mach_o_print_flags (bfd_mach_o_header_flags_name, h->flags, file);
+  fputs (_(")\n"), file);
+  fprintf (file, _(" reserved  : %08x\n"), h->reserved);
+}
+
+static void
+bfd_mach_o_print_section_map (bfd *abfd, FILE *file)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  unsigned int i;
+  unsigned int sec_nbr = 0;
+
+  fputs (_("Segments and Sections:\n"), file);
+  fputs (_(" #: Segment name     Section name     Address\n"), file);
+
+  for (i = 0; i < mdata->header.ncmds; i++)
+    {
+      bfd_mach_o_segment_command *seg;
+      bfd_mach_o_section *sec;
+
+      if (mdata->commands[i].type != BFD_MACH_O_LC_SEGMENT
+	  && mdata->commands[i].type != BFD_MACH_O_LC_SEGMENT_64)
+	continue;
+
+      seg = &mdata->commands[i].command.segment;
+
+      fprintf (file, "[Segment %-16s ", seg->segname);
+      fprintf_vma (file, seg->vmaddr);
+      fprintf (file, "-");
+      fprintf_vma  (file, seg->vmaddr + seg->vmsize - 1);
+      fputc (' ', file);
+      fputc (seg->initprot & BFD_MACH_O_PROT_READ ? 'r' : '-', file);
+      fputc (seg->initprot & BFD_MACH_O_PROT_WRITE ? 'w' : '-', file);
+      fputc (seg->initprot & BFD_MACH_O_PROT_EXECUTE ? 'x' : '-', file);
+      fprintf (file, "]\n");
+
+      for (sec = seg->sect_head; sec != NULL; sec = sec->next)
+	{
+	  fprintf (file, "%02u: %-16s %-16s ", ++sec_nbr,
+		   sec->segname, sec->sectname);
+	  fprintf_vma (file, sec->addr);
+	  fprintf (file, " ");
+	  fprintf_vma  (file, sec->size);
+	  fprintf (file, " %08lx\n", sec->flags);
+	}
+    }
+}
+
+static void
+bfd_mach_o_print_section (bfd *abfd ATTRIBUTE_UNUSED,
+                          bfd_mach_o_section *sec, FILE *file)
+{
+  fprintf (file, " Section: %-16s %-16s (bfdname: %s)\n",
+           sec->sectname, sec->segname, sec->bfdsection->name);
+  fprintf (file, "  addr: ");
+  fprintf_vma (file, sec->addr);
+  fprintf (file, " size: ");
+  fprintf_vma  (file, sec->size);
+  fprintf (file, " offset: ");
+  fprintf_vma (file, sec->offset);
+  fprintf (file, "\n");
+  fprintf (file, "  align: %ld", sec->align);
+  fprintf (file, "  nreloc: %lu  reloff: ", sec->nreloc);
+  fprintf_vma (file, sec->reloff);
+  fprintf (file, "\n");
+  fprintf (file, "  flags: %08lx (type: %s", sec->flags,
+           bfd_mach_o_get_name (bfd_mach_o_section_type_name,
+                                sec->flags & BFD_MACH_O_SECTION_TYPE_MASK));
+  fprintf (file, " attr: ");
+  bfd_mach_o_print_flags (bfd_mach_o_section_attribute_name,
+                          sec->flags & BFD_MACH_O_SECTION_ATTRIBUTES_MASK,
+                          file);
+  fprintf (file, ")\n");
+  switch (sec->flags & BFD_MACH_O_SECTION_TYPE_MASK)
+    {
+    case BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS:
+    case BFD_MACH_O_S_LAZY_SYMBOL_POINTERS:
+    case BFD_MACH_O_S_SYMBOL_STUBS:
+      fprintf (file, "  first indirect sym: %lu", sec->reserved1);
+      fprintf (file, " (%u entries)",
+               bfd_mach_o_section_get_nbr_indirect (abfd, sec));
+      break;
+    default:
+      fprintf (file, "  reserved1: 0x%lx", sec->reserved1);
+      break;
+    }
+  switch (sec->flags & BFD_MACH_O_SECTION_TYPE_MASK)
+    {
+    case BFD_MACH_O_S_SYMBOL_STUBS:
+      fprintf (file, "  stub size: %lu", sec->reserved2);
+      break;
+    default:
+      fprintf (file, "  reserved2: 0x%lx", sec->reserved2);
+      break;
+    }
+  fprintf (file, "  reserved3: 0x%lx\n", sec->reserved3);
+}
+
+static void
+bfd_mach_o_print_segment (bfd *abfd ATTRIBUTE_UNUSED,
+                          bfd_mach_o_load_command *cmd, FILE *file)
+{
+  bfd_mach_o_segment_command *seg = &cmd->command.segment;
+  bfd_mach_o_section *sec;
+
+  fprintf (file, " name: %s\n", *seg->segname ? seg->segname : "*none*");
+  fprintf (file, "    vmaddr: ");
+  fprintf_vma (file, seg->vmaddr);
+  fprintf (file, "   vmsize: ");
+  fprintf_vma  (file, seg->vmsize);
+  fprintf (file, "\n");
+  fprintf (file, "   fileoff: ");
+  fprintf_vma (file, seg->fileoff);
+  fprintf (file, " filesize: ");
+  fprintf_vma (file, (bfd_vma)seg->filesize);
+  fprintf (file, " endoff: ");
+  fprintf_vma (file, (bfd_vma)(seg->fileoff + seg->filesize));
+  fprintf (file, "\n");
+  fprintf (file, "   nsects: %lu  ", seg->nsects);
+  fprintf (file, " flags: %lx\n", seg->flags);
+  for (sec = seg->sect_head; sec != NULL; sec = sec->next)
+    bfd_mach_o_print_section (abfd, sec, file);
+}
+
+static void
+bfd_mach_o_print_dysymtab (bfd *abfd ATTRIBUTE_UNUSED,
+                           bfd_mach_o_load_command *cmd, FILE *file)
+{
+  bfd_mach_o_dysymtab_command *dysymtab = &cmd->command.dysymtab;
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  unsigned int i;
+
+  fprintf (file, "              local symbols: idx: %10lu  num: %-8lu",
+           dysymtab->ilocalsym, dysymtab->nlocalsym);
+  fprintf (file, " (nxtidx: %lu)\n",
+           dysymtab->ilocalsym + dysymtab->nlocalsym);
+  fprintf (file, "           external symbols: idx: %10lu  num: %-8lu",
+           dysymtab->iextdefsym, dysymtab->nextdefsym);
+  fprintf (file, " (nxtidx: %lu)\n",
+           dysymtab->iextdefsym + dysymtab->nextdefsym);
+  fprintf (file, "          undefined symbols: idx: %10lu  num: %-8lu",
+           dysymtab->iundefsym, dysymtab->nundefsym);
+  fprintf (file, " (nxtidx: %lu)\n",
+           dysymtab->iundefsym + dysymtab->nundefsym);
+  fprintf (file, "           table of content: off: 0x%08lx  num: %-8lu",
+           dysymtab->tocoff, dysymtab->ntoc);
+  fprintf (file, " (endoff: 0x%08lx)\n",
+           dysymtab->tocoff 
+           + dysymtab->ntoc * BFD_MACH_O_TABLE_OF_CONTENT_SIZE); 
+  fprintf (file, "               module table: off: 0x%08lx  num: %-8lu",
+           dysymtab->modtaboff, dysymtab->nmodtab);
+  fprintf (file, " (endoff: 0x%08lx)\n",
+           dysymtab->modtaboff + dysymtab->nmodtab 
+           * (mach_o_wide_p (&mdata->header) ? 
+              BFD_MACH_O_DYLIB_MODULE_64_SIZE : BFD_MACH_O_DYLIB_MODULE_SIZE));
+  fprintf (file, "   external reference table: off: 0x%08lx  num: %-8lu",
+           dysymtab->extrefsymoff, dysymtab->nextrefsyms);
+  fprintf (file, " (endoff: 0x%08lx)\n",
+           dysymtab->extrefsymoff 
+           + dysymtab->nextrefsyms * BFD_MACH_O_REFERENCE_SIZE);
+  fprintf (file, "      indirect symbol table: off: 0x%08lx  num: %-8lu",
+           dysymtab->indirectsymoff, dysymtab->nindirectsyms);
+  fprintf (file, " (endoff: 0x%08lx)\n",
+           dysymtab->indirectsymoff 
+           + dysymtab->nindirectsyms * BFD_MACH_O_INDIRECT_SYMBOL_SIZE);
+  fprintf (file, "  external relocation table: off: 0x%08lx  num: %-8lu",
+           dysymtab->extreloff, dysymtab->nextrel);
+  fprintf (file, " (endoff: 0x%08lx)\n",
+           dysymtab->extreloff + dysymtab->nextrel * BFD_MACH_O_RELENT_SIZE);
+  fprintf (file, "     local relocation table: off: 0x%08lx  num: %-8lu",
+           dysymtab->locreloff, dysymtab->nlocrel);
+  fprintf (file, " (endoff: 0x%08lx)\n",
+           dysymtab->locreloff + dysymtab->nlocrel * BFD_MACH_O_RELENT_SIZE);
+  
+  if (dysymtab->ntoc > 0
+      || dysymtab->nindirectsyms > 0
+      || dysymtab->nextrefsyms > 0)
+    {
+      /* Try to read the symbols to display the toc or indirect symbols.  */
+      bfd_mach_o_read_symtab_symbols (abfd);
+    }
+  else if (dysymtab->nmodtab > 0)
+    {
+      /* Try to read the strtab to display modules name.  */
+      bfd_mach_o_read_symtab_strtab (abfd);
+    }
+  
+  for (i = 0; i < dysymtab->nmodtab; i++)
+    {
+      bfd_mach_o_dylib_module *module = &dysymtab->dylib_module[i];
+      fprintf (file, "  module %u:\n", i);
+      fprintf (file, "   name: %lu", module->module_name_idx);
+      if (mdata->symtab && mdata->symtab->strtab)
+        fprintf (file, ": %s",
+                 mdata->symtab->strtab + module->module_name_idx);
+      fprintf (file, "\n");
+      fprintf (file, "   extdefsym: idx: %8lu  num: %lu\n",
+               module->iextdefsym, module->nextdefsym);
+      fprintf (file, "      refsym: idx: %8lu  num: %lu\n",
+               module->irefsym, module->nrefsym);
+      fprintf (file, "    localsym: idx: %8lu  num: %lu\n",
+               module->ilocalsym, module->nlocalsym);
+      fprintf (file, "      extrel: idx: %8lu  num: %lu\n",
+               module->iextrel, module->nextrel);
+      fprintf (file, "        init: idx: %8u  num: %u\n",
+               module->iinit, module->ninit);
+      fprintf (file, "        term: idx: %8u  num: %u\n",
+               module->iterm, module->nterm);
+      fprintf (file, "   objc_module_info: addr: ");
+      fprintf_vma (file, module->objc_module_info_addr);
+      fprintf (file, "  size: %lu\n", module->objc_module_info_size);
+    }
+
+  if (dysymtab->ntoc > 0)
+    {
+      bfd_mach_o_symtab_command *symtab = mdata->symtab;
+      
+      fprintf (file, "  table of content: (symbol/module)\n");
+      for (i = 0; i < dysymtab->ntoc; i++)
+        {
+          bfd_mach_o_dylib_table_of_content *toc = &dysymtab->dylib_toc[i];
+          
+          fprintf (file, "   %4u: ", i);
+          if (symtab && symtab->symbols && toc->symbol_index < symtab->nsyms)
+            {
+              const char *name = symtab->symbols[toc->symbol_index].symbol.name;
+              fprintf (file, "%s (%lu)", name ? name : "*invalid*",
+                       toc->symbol_index);
+            }
+          else
+            fprintf (file, "%lu", toc->symbol_index);
+          
+          fprintf (file, " / ");
+          if (symtab && symtab->strtab
+              && toc->module_index < dysymtab->nmodtab)
+            {
+              bfd_mach_o_dylib_module *mod;
+              mod = &dysymtab->dylib_module[toc->module_index];
+              fprintf (file, "%s (%lu)",
+                       symtab->strtab + mod->module_name_idx,
+                       toc->module_index);
+            }
+          else
+            fprintf (file, "%lu", toc->module_index);
+          
+          fprintf (file, "\n");
+        }
+    }
+
+  if (dysymtab->nindirectsyms != 0)
+    {
+      fprintf (file, "  indirect symbols:\n");
+
+      for (i = 0; i < mdata->nsects; i++)
+        {
+          bfd_mach_o_section *sec = mdata->sections[i];
+          unsigned int j, first, last;
+          bfd_mach_o_symtab_command *symtab = mdata->symtab;
+          bfd_vma addr;
+          bfd_vma entry_size;
+      
+          switch (sec->flags & BFD_MACH_O_SECTION_TYPE_MASK)
+            {
+            case BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS:
+            case BFD_MACH_O_S_LAZY_SYMBOL_POINTERS:
+            case BFD_MACH_O_S_SYMBOL_STUBS:
+              first = sec->reserved1;
+              last = first + bfd_mach_o_section_get_nbr_indirect (abfd, sec);
+              addr = sec->addr;
+              entry_size = bfd_mach_o_section_get_entry_size (abfd, sec);
+              fprintf (file, "  for section %s.%s:\n",
+                       sec->segname, sec->sectname);
+              for (j = first; j < last; j++)
+                {
+                  unsigned int isym = dysymtab->indirect_syms[j];
+                  
+                  fprintf (file, "   ");
+                  fprintf_vma (file, addr);
+                  fprintf (file, " %5u: 0x%08x", j, isym);
+                  if (isym & BFD_MACH_O_INDIRECT_SYMBOL_LOCAL)
+                    fprintf (file, " LOCAL");
+                  if (isym & BFD_MACH_O_INDIRECT_SYMBOL_ABS)
+                    fprintf (file, " ABSOLUTE");
+                  if (symtab && symtab->symbols
+                      && isym < symtab->nsyms
+                      && symtab->symbols[isym].symbol.name)
+                    fprintf (file, " %s", symtab->symbols[isym].symbol.name);
+                  fprintf (file, "\n");
+                  addr += entry_size;
+                }
+              break;
+            default:
+              break;
+            }
+        }
+    }
+  if (dysymtab->nextrefsyms > 0)
+    {
+      bfd_mach_o_symtab_command *symtab = mdata->symtab;
+      
+      fprintf (file, "  external reference table: (symbol flags)\n");
+      for (i = 0; i < dysymtab->nextrefsyms; i++)
+        {
+          bfd_mach_o_dylib_reference *ref = &dysymtab->ext_refs[i];
+          
+          fprintf (file, "   %4u: %5lu 0x%02lx", i, ref->isym, ref->flags);
+          if (symtab && symtab->symbols
+              && ref->isym < symtab->nsyms
+              && symtab->symbols[ref->isym].symbol.name)
+            fprintf (file, " %s", symtab->symbols[ref->isym].symbol.name);
+          fprintf (file, "\n");
+        }
+    }
+
+}
+
+static void
+bfd_mach_o_print_dyld_info (bfd *abfd ATTRIBUTE_UNUSED,
+                            bfd_mach_o_load_command *cmd, FILE *file)
+{
+  bfd_mach_o_dyld_info_command *info = &cmd->command.dyld_info;
+
+  fprintf (file, "       rebase: off: 0x%08x  size: %-8u\n",
+           info->rebase_off, info->rebase_size);
+  fprintf (file, "         bind: off: 0x%08x  size: %-8u\n",
+           info->bind_off, info->bind_size);
+  fprintf (file, "    weak bind: off: 0x%08x  size: %-8u\n",
+           info->weak_bind_off, info->weak_bind_size);
+  fprintf (file, "    lazy bind: off: 0x%08x  size: %-8u\n",
+           info->lazy_bind_off, info->lazy_bind_size);
+  fprintf (file, "       export: off: 0x%08x  size: %-8u\n",
+           info->export_off, info->export_size);
+}
+
+bfd_boolean
+bfd_mach_o_bfd_print_private_bfd_data (bfd *abfd, void * ptr)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  FILE *file = (FILE *) ptr;
+  unsigned int i;
+
+  bfd_mach_o_print_private_header (abfd, file);
+  fputc ('\n', file);
+
+  for (i = 0; i < mdata->header.ncmds; i++)
+    {
+      bfd_mach_o_load_command *cmd = &mdata->commands[i];
+      const char *cmd_name;
+      
+      cmd_name = bfd_mach_o_get_name_or_null
+        (bfd_mach_o_load_command_name, cmd->type);
+      fprintf (file, "Load command ");
+      if (cmd_name == NULL)
+        fprintf (file, "0x%02x:", cmd->type);
+      else
+        fprintf (file, "%s:", cmd_name);
+
+      switch (cmd->type)
+	{
+	case BFD_MACH_O_LC_SEGMENT:
+	case BFD_MACH_O_LC_SEGMENT_64:
+          bfd_mach_o_print_segment (abfd, cmd, file);
+	  break;
+	case BFD_MACH_O_LC_UUID:
+	  {
+	    bfd_mach_o_uuid_command *uuid = &cmd->command.uuid;
+	    unsigned int j;
+
+	    for (j = 0; j < sizeof (uuid->uuid); j ++)
+	      fprintf (file, " %02x", uuid->uuid[j]);
+	    fputc ('\n', file);
+	  }
+	  break;
+	case BFD_MACH_O_LC_LOAD_DYLIB:
+	case BFD_MACH_O_LC_LOAD_WEAK_DYLIB:
+	case BFD_MACH_O_LC_REEXPORT_DYLIB:
+	case BFD_MACH_O_LC_ID_DYLIB:
+	  {
+	    bfd_mach_o_dylib_command *dylib = &cmd->command.dylib;
+	    fprintf (file, " %s\n", dylib->name_str);
+	    fprintf (file, "            time stamp: 0x%08lx\n",
+		     dylib->timestamp);
+	    fprintf (file, "       current version: 0x%08lx\n",
+		     dylib->current_version);
+	    fprintf (file, "  comptibility version: 0x%08lx\n",
+		     dylib->compatibility_version);
+	    break;
+	  }
+	case BFD_MACH_O_LC_LOAD_DYLINKER:
+	case BFD_MACH_O_LC_ID_DYLINKER:
+          fprintf (file, " %s\n", cmd->command.dylinker.name_str);
+          break;
+	case BFD_MACH_O_LC_SYMTAB:
+	  {
+	    bfd_mach_o_symtab_command *symtab = &cmd->command.symtab;
+	    fprintf (file,
+                     "\n"
+		     "   symoff: 0x%08x    nsyms: %8u  (endoff: 0x%08x)\n",
+                     symtab->symoff, symtab->nsyms,
+                     symtab->symoff + symtab->nsyms 
+                     * (mach_o_wide_p (&mdata->header) 
+                        ? BFD_MACH_O_NLIST_64_SIZE : BFD_MACH_O_NLIST_SIZE));
+	    fprintf (file,
+		     "   stroff: 0x%08x  strsize: %8u  (endoff: 0x%08x)\n",
+		     symtab->stroff, symtab->strsize,
+                     symtab->stroff + symtab->strsize);
+	    break;
+	  }
+	case BFD_MACH_O_LC_DYSYMTAB:
+          fprintf (file, "\n");
+          bfd_mach_o_print_dysymtab (abfd, cmd, file);
+          break;
+        case BFD_MACH_O_LC_CODE_SIGNATURE:
+        case BFD_MACH_O_LC_SEGMENT_SPLIT_INFO:
+        case BFD_MACH_O_LC_FUNCTION_STARTS:
+	  {
+	    bfd_mach_o_linkedit_command *linkedit = &cmd->command.linkedit;
+	    fprintf
+              (file, "\n"
+               "  dataoff: 0x%08lx  datasize: 0x%08lx  (endoff: 0x%08lx)\n",
+               linkedit->dataoff, linkedit->datasize,
+               linkedit->dataoff + linkedit->datasize);
+            break;
+          }
+        case BFD_MACH_O_LC_SUB_FRAMEWORK:
+        case BFD_MACH_O_LC_SUB_UMBRELLA:
+        case BFD_MACH_O_LC_SUB_LIBRARY:
+        case BFD_MACH_O_LC_SUB_CLIENT:
+        case BFD_MACH_O_LC_RPATH:
+	  {
+	    bfd_mach_o_str_command *str = &cmd->command.str;
+	    fprintf (file, " %s\n", str->str);
+            break;
+          }
+        case BFD_MACH_O_LC_THREAD:
+        case BFD_MACH_O_LC_UNIXTHREAD:
+          {
+            bfd_mach_o_thread_command *thread = &cmd->command.thread;
+            unsigned int j;
+            bfd_mach_o_backend_data *bed = bfd_mach_o_get_backend_data (abfd);
+
+            fprintf (file, " nflavours: %lu\n", thread->nflavours);
+            for (j = 0; j < thread->nflavours; j++)
+              {
+                bfd_mach_o_thread_flavour *flavour = &thread->flavours[j];
+
+                fprintf (file, "  %2u: flavour: 0x%08lx  offset: 0x%08lx"
+                         "  size: 0x%08lx\n",
+                         j, flavour->flavour, flavour->offset,
+                         flavour->size);
+                if (bed->_bfd_mach_o_print_thread)
+                  {
+                    char *buf = bfd_malloc (flavour->size);
+
+                    if (buf
+                        && bfd_seek (abfd, flavour->offset, SEEK_SET) == 0
+                        && (bfd_bread (buf, flavour->size, abfd) 
+                            == flavour->size))
+                      (*bed->_bfd_mach_o_print_thread)(abfd, flavour,
+                                                       file, buf);
+                    free (buf);
+                  }
+              }
+            break;
+          }
+	case BFD_MACH_O_LC_DYLD_INFO:
+          fprintf (file, "\n");
+          bfd_mach_o_print_dyld_info (abfd, cmd, file);
+          break;
+	case BFD_MACH_O_LC_VERSION_MIN_MACOSX:
+	case BFD_MACH_O_LC_VERSION_MIN_IPHONEOS:
+          {
+            bfd_mach_o_version_min_command *ver = &cmd->command.version_min;
+
+            fprintf (file, " %u.%u.%u\n", ver->rel, ver->maj, ver->min);
+          }
+          break;
+	default:
+	  fprintf (file, "\n");
+          fprintf (file, "  offset: 0x%08lx\n", (unsigned long)cmd->offset);
+          fprintf (file, "    size: 0x%08lx\n", (unsigned long)cmd->len);
+	  break;
+	}
+      fputc ('\n', file);
+    }
+
+  bfd_mach_o_print_section_map (abfd, file);
+
+  return TRUE;
+}
+
+int
+bfd_mach_o_core_fetch_environment (bfd *abfd,
+				   unsigned char **rbuf,
+				   unsigned int *rlen)
+{
+  bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
+  unsigned long stackaddr = bfd_mach_o_stack_addr (mdata->header.cputype);
+  unsigned int i = 0;
+
+  for (i = 0; i < mdata->header.ncmds; i++)
+    {
+      bfd_mach_o_load_command *cur = &mdata->commands[i];
+      bfd_mach_o_segment_command *seg = NULL;
+
+      if (cur->type != BFD_MACH_O_LC_SEGMENT)
+	continue;
+
+      seg = &cur->command.segment;
+
+      if ((seg->vmaddr + seg->vmsize) == stackaddr)
+	{
+	  unsigned long start = seg->fileoff;
+	  unsigned long end = seg->fileoff + seg->filesize;
+	  unsigned char *buf = bfd_malloc (1024);
+	  unsigned long size = 1024;
+
+	  for (;;)
+	    {
+	      bfd_size_type nread = 0;
+	      unsigned long offset;
+	      int found_nonnull = 0;
+
+	      if (size > (end - start))
+		size = (end - start);
+
+	      buf = bfd_realloc_or_free (buf, size);
+	      if (buf == NULL)
+		return -1;
+
+	      if (bfd_seek (abfd, end - size, SEEK_SET) != 0)
+                {
+                  free (buf);
+                  return -1;
+                }
+
+	      nread = bfd_bread (buf, size, abfd);
+
+	      if (nread != size)
+		{
+		  free (buf);
+		  return -1;
+		}
+
+	      for (offset = 4; offset <= size; offset += 4)
+		{
+		  unsigned long val;
+
+		  val = *((unsigned long *) (buf + size - offset));
+		  if (! found_nonnull)
+		    {
+		      if (val != 0)
+			found_nonnull = 1;
+		    }
+		  else if (val == 0x0)
+		    {
+		      unsigned long bottom;
+		      unsigned long top;
+
+		      bottom = seg->fileoff + seg->filesize - offset;
+		      top = seg->fileoff + seg->filesize - 4;
+		      *rbuf = bfd_malloc (top - bottom);
+		      *rlen = top - bottom;
+
+		      memcpy (*rbuf, buf + size - *rlen, *rlen);
+		      free (buf);
+		      return 0;
+		    }
+		}
+
+	      if (size == (end - start))
+		break;
+
+	      size *= 2;
+	    }
+
+	  free (buf);
+	}
+    }
+
+  return -1;
+}
+
+char *
+bfd_mach_o_core_file_failing_command (bfd *abfd)
+{
+  unsigned char *buf = NULL;
+  unsigned int len = 0;
+  int ret = -1;
+
+  ret = bfd_mach_o_core_fetch_environment (abfd, &buf, &len);
+  if (ret < 0)
+    return NULL;
+
+  return (char *) buf;
+}
+
+int
+bfd_mach_o_core_file_failing_signal (bfd *abfd ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+#define bfd_mach_o_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup 
+#define bfd_mach_o_bfd_reloc_name_lookup _bfd_norelocs_bfd_reloc_name_lookup
+
+#define bfd_mach_o_swap_reloc_in NULL
+#define bfd_mach_o_swap_reloc_out NULL
+#define bfd_mach_o_print_thread NULL
+
+#define TARGET_NAME 		mach_o_be_vec
+#define TARGET_STRING     	"mach-o-be"
+#define TARGET_ARCHITECTURE	bfd_arch_unknown
+#define TARGET_BIG_ENDIAN 	1
+#define TARGET_ARCHIVE 		0
+#include "mach-o-target.c"
+
+#undef TARGET_NAME
+#undef TARGET_STRING
+#undef TARGET_ARCHITECTURE
+#undef TARGET_BIG_ENDIAN
+#undef TARGET_ARCHIVE
+
+#define TARGET_NAME 		mach_o_le_vec
+#define TARGET_STRING 		"mach-o-le"
+#define TARGET_ARCHITECTURE	bfd_arch_unknown
+#define TARGET_BIG_ENDIAN 	0
+#define TARGET_ARCHIVE 		0
+
+#include "mach-o-target.c"
+
+#undef TARGET_NAME
+#undef TARGET_STRING
+#undef TARGET_ARCHITECTURE
+#undef TARGET_BIG_ENDIAN
+#undef TARGET_ARCHIVE
+
+/* Not yet handled: creating an archive.  */
+#define bfd_mach_o_mkarchive                      _bfd_noarchive_mkarchive
+
+/* Not used.  */
+#define bfd_mach_o_read_ar_hdr                    _bfd_noarchive_read_ar_hdr
+#define bfd_mach_o_write_ar_hdr                   _bfd_noarchive_write_ar_hdr
+#define bfd_mach_o_slurp_armap                    _bfd_noarchive_slurp_armap
+#define bfd_mach_o_slurp_extended_name_table      _bfd_noarchive_slurp_extended_name_table
+#define bfd_mach_o_construct_extended_name_table  _bfd_noarchive_construct_extended_name_table
+#define bfd_mach_o_truncate_arname                _bfd_noarchive_truncate_arname
+#define bfd_mach_o_write_armap                    _bfd_noarchive_write_armap
+#define bfd_mach_o_get_elt_at_index               _bfd_noarchive_get_elt_at_index
+#define bfd_mach_o_generic_stat_arch_elt          _bfd_noarchive_generic_stat_arch_elt
+#define bfd_mach_o_update_armap_timestamp         _bfd_noarchive_update_armap_timestamp
+
+#define TARGET_NAME 		mach_o_fat_vec
+#define TARGET_STRING 		"mach-o-fat"
+#define TARGET_ARCHITECTURE	bfd_arch_unknown
+#define TARGET_BIG_ENDIAN 	1
+#define TARGET_ARCHIVE 		1
+
+#include "mach-o-target.c"
+
+#undef TARGET_NAME
+#undef TARGET_STRING
+#undef TARGET_ARCHITECTURE
+#undef TARGET_BIG_ENDIAN
+#undef TARGET_ARCHIVE
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/mach-o.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/mach-o.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/mach-o.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/mach-o.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,593 @@
+/* Mach-O support for BFD.
+   Copyright 1999, 2000, 2001, 2002, 2003, 2005, 2007, 2008, 2009
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _BFD_MACH_O_H_
+#define _BFD_MACH_O_H_
+
+#include "bfd.h"
+#include "mach-o/loader.h"
+
+typedef struct bfd_mach_o_header
+{
+  unsigned long magic;
+  unsigned long cputype;
+  unsigned long cpusubtype;
+  unsigned long filetype;
+  unsigned long ncmds;
+  unsigned long sizeofcmds;
+  unsigned long flags;
+  unsigned int reserved;
+  /* Version 1: 32 bits, version 2: 64 bits.  */
+  unsigned int version;
+  enum bfd_endian byteorder;
+}
+bfd_mach_o_header;
+
+#define BFD_MACH_O_SEGNAME_SIZE 16
+#define BFD_MACH_O_SECTNAME_SIZE 16
+
+typedef struct bfd_mach_o_section
+{
+  /* Fields present in the file.  */
+  char sectname[BFD_MACH_O_SECTNAME_SIZE + 1];	/* Always NUL padded.  */
+  char segname[BFD_MACH_O_SEGNAME_SIZE + 1];
+  bfd_vma addr;
+  bfd_vma size;
+  bfd_vma offset;
+  unsigned long align;
+  bfd_vma reloff;
+  unsigned long nreloc;
+  unsigned long flags;
+  unsigned long reserved1;
+  unsigned long reserved2;
+  unsigned long reserved3;
+
+  /* Corresponding bfd section.  */
+  asection *bfdsection;
+
+  /* Simply linked list.  */
+  struct bfd_mach_o_section *next;
+}
+bfd_mach_o_section;
+
+typedef struct bfd_mach_o_segment_command
+{
+  char segname[16 + 1];
+  bfd_vma vmaddr;
+  bfd_vma vmsize;
+  bfd_vma fileoff;
+  unsigned long filesize;
+  unsigned long maxprot;	/* Maximum permitted protection.  */
+  unsigned long initprot;	/* Initial protection.  */
+  unsigned long nsects;
+  unsigned long flags;
+
+  /* Linked list of sections.  */
+  bfd_mach_o_section *sect_head;
+  bfd_mach_o_section *sect_tail;
+}
+bfd_mach_o_segment_command;
+
+/* Protection flags.  */
+#define BFD_MACH_O_PROT_READ    0x01
+#define BFD_MACH_O_PROT_WRITE   0x02
+#define BFD_MACH_O_PROT_EXECUTE 0x04
+
+/* Expanded internal representation of a relocation entry.  */
+typedef struct bfd_mach_o_reloc_info
+{
+  bfd_vma r_address;
+  bfd_vma r_value;
+  unsigned int r_scattered : 1;
+  unsigned int r_type : 4;
+  unsigned int r_pcrel : 1;
+  unsigned int r_length : 2;
+  unsigned int r_extern : 1;
+}
+bfd_mach_o_reloc_info;
+
+typedef struct bfd_mach_o_asymbol
+{
+  /* The actual symbol which the rest of BFD works with.  */
+  asymbol symbol;
+
+  /* Fields from Mach-O symbol.  */
+  unsigned char n_type;
+  unsigned char n_sect;
+  unsigned short n_desc;
+}
+bfd_mach_o_asymbol;
+
+typedef struct bfd_mach_o_symtab_command
+{
+  unsigned int symoff;
+  unsigned int nsyms;
+  unsigned int stroff;
+  unsigned int strsize;
+  bfd_mach_o_asymbol *symbols;
+  char *strtab;
+}
+bfd_mach_o_symtab_command;
+
+/* This is the second set of the symbolic information which is used to support
+   the data structures for the dynamically link editor.
+
+   The original set of symbolic information in the symtab_command which contains
+   the symbol and string tables must also be present when this load command is
+   present.  When this load command is present the symbol table is organized
+   into three groups of symbols:
+       local symbols (static and debugging symbols) - grouped by module
+       defined external symbols - grouped by module (sorted by name if not lib)
+       undefined external symbols (sorted by name)
+   In this load command there are offsets and counts to each of the three groups
+   of symbols.
+
+   This load command contains a the offsets and sizes of the following new
+   symbolic information tables:
+       table of contents
+       module table
+       reference symbol table
+       indirect symbol table
+   The first three tables above (the table of contents, module table and
+   reference symbol table) are only present if the file is a dynamically linked
+   shared library.  For executable and object modules, which are files
+   containing only one module, the information that would be in these three
+   tables is determined as follows:
+       table of contents - the defined external symbols are sorted by name
+       module table - the file contains only one module so everything in the
+                      file is part of the module.
+       reference symbol table - is the defined and undefined external symbols
+
+   For dynamically linked shared library files this load command also contains
+   offsets and sizes to the pool of relocation entries for all sections
+   separated into two groups:
+       external relocation entries
+       local relocation entries
+   For executable and object modules the relocation entries continue to hang
+   off the section structures.  */
+
+typedef struct bfd_mach_o_dylib_module
+{
+  /* Index into the string table indicating the name of the module.  */
+  unsigned long module_name_idx;
+  char *module_name;
+
+  /* Index into the symbol table of the first defined external symbol provided
+     by the module.  */
+  unsigned long iextdefsym;
+
+  /* Number of external symbols provided by this module.  */
+  unsigned long nextdefsym;
+
+  /* Index into the external reference table of the first entry
+     provided by this module.  */
+  unsigned long irefsym;
+
+  /* Number of external reference entries provided by this module.  */
+  unsigned long nrefsym;
+
+  /* Index into the symbol table of the first local symbol provided by this
+     module.  */
+  unsigned long ilocalsym;
+
+  /* Number of local symbols provided by this module.  */
+  unsigned long nlocalsym;
+
+  /* Index into the external relocation table of the first entry provided
+     by this module.  */
+  unsigned long iextrel;
+
+  /* Number of external relocation entries provided by this module.  */
+  unsigned long nextrel;
+
+  /* Index in the module initialization section to the pointers for this
+     module.  */
+  unsigned short iinit;
+
+  /* Index in the module termination section to the pointers for this
+     module.  */
+  unsigned short iterm;
+
+  /* Number of pointers in the module initialization for this module.  */
+  unsigned short ninit;
+
+  /* Number of pointers in the module termination for this module.  */
+  unsigned short nterm;
+
+  /* Number of data byte for this module that are used in the __module_info
+     section of the __OBJC segment.  */
+  unsigned long objc_module_info_size;
+
+  /* Statically linked address of the start of the data for this module
+     in the __module_info section of the __OBJC_segment.  */
+  bfd_vma objc_module_info_addr;
+}
+bfd_mach_o_dylib_module;
+
+typedef struct bfd_mach_o_dylib_table_of_content
+{
+  /* Index into the symbol table to the defined external symbol.  */
+  unsigned long symbol_index;
+
+  /* Index into the module table to the module for this entry.  */
+  unsigned long module_index;
+}
+bfd_mach_o_dylib_table_of_content;
+
+typedef struct bfd_mach_o_dylib_reference
+{
+  /* Index into the symbol table for the symbol being referenced.  */
+  unsigned long isym;
+
+  /* Type of the reference being made (use REFERENCE_FLAGS constants).  */
+  unsigned long flags;
+}
+bfd_mach_o_dylib_reference;
+#define BFD_MACH_O_REFERENCE_SIZE 4
+
+typedef struct bfd_mach_o_dysymtab_command
+{
+  /* The symbols indicated by symoff and nsyms of the LC_SYMTAB load command
+     are grouped into the following three groups:
+       local symbols (further grouped by the module they are from)
+       defined external symbols (further grouped by the module they are from)
+       undefined symbols
+
+     The local symbols are used only for debugging.  The dynamic binding
+     process may have to use them to indicate to the debugger the local
+     symbols for a module that is being bound.
+
+     The last two groups are used by the dynamic binding process to do the
+     binding (indirectly through the module table and the reference symbol
+     table when this is a dynamically linked shared library file).  */
+
+  unsigned long ilocalsym;    /* Index to local symbols.  */
+  unsigned long nlocalsym;    /* Number of local symbols.  */
+  unsigned long iextdefsym;   /* Index to externally defined symbols.  */
+  unsigned long nextdefsym;   /* Number of externally defined symbols.  */
+  unsigned long iundefsym;    /* Index to undefined symbols.  */
+  unsigned long nundefsym;    /* Number of undefined symbols.  */
+
+  /* For the for the dynamic binding process to find which module a symbol
+     is defined in the table of contents is used (analogous to the ranlib
+     structure in an archive) which maps defined external symbols to modules
+     they are defined in.  This exists only in a dynamically linked shared
+     library file.  For executable and object modules the defined external
+     symbols are sorted by name and is use as the table of contents.  */
+
+  unsigned long tocoff;       /* File offset to table of contents.  */
+  unsigned long ntoc;         /* Number of entries in table of contents.  */
+
+  /* To support dynamic binding of "modules" (whole object files) the symbol
+     table must reflect the modules that the file was created from.  This is
+     done by having a module table that has indexes and counts into the merged
+     tables for each module.  The module structure that these two entries
+     refer to is described below.  This exists only in a dynamically linked
+     shared library file.  For executable and object modules the file only
+     contains one module so everything in the file belongs to the module.  */
+
+  unsigned long modtaboff;    /* File offset to module table.  */
+  unsigned long nmodtab;      /* Number of module table entries.  */
+
+  /* To support dynamic module binding the module structure for each module
+     indicates the external references (defined and undefined) each module
+     makes.  For each module there is an offset and a count into the
+     reference symbol table for the symbols that the module references.
+     This exists only in a dynamically linked shared library file.  For
+     executable and object modules the defined external symbols and the
+     undefined external symbols indicates the external references.  */
+
+  unsigned long extrefsymoff;  /* Offset to referenced symbol table.  */
+  unsigned long nextrefsyms;   /* Number of referenced symbol table entries.  */
+
+  /* The sections that contain "symbol pointers" and "routine stubs" have
+     indexes and (implied counts based on the size of the section and fixed
+     size of the entry) into the "indirect symbol" table for each pointer
+     and stub.  For every section of these two types the index into the
+     indirect symbol table is stored in the section header in the field
+     reserved1.  An indirect symbol table entry is simply a 32bit index into
+     the symbol table to the symbol that the pointer or stub is referring to.
+     The indirect symbol table is ordered to match the entries in the section.  */
+
+  unsigned long indirectsymoff; /* File offset to the indirect symbol table.  */
+  unsigned long nindirectsyms;  /* Number of indirect symbol table entries.  */
+
+  /* To support relocating an individual module in a library file quickly the
+     external relocation entries for each module in the library need to be
+     accessed efficiently.  Since the relocation entries can't be accessed
+     through the section headers for a library file they are separated into
+     groups of local and external entries further grouped by module.  In this
+     case the presents of this load command who's extreloff, nextrel,
+     locreloff and nlocrel fields are non-zero indicates that the relocation
+     entries of non-merged sections are not referenced through the section
+     structures (and the reloff and nreloc fields in the section headers are
+     set to zero).
+
+     Since the relocation entries are not accessed through the section headers
+     this requires the r_address field to be something other than a section
+     offset to identify the item to be relocated.  In this case r_address is
+     set to the offset from the vmaddr of the first LC_SEGMENT command.
+
+     The relocation entries are grouped by module and the module table
+     entries have indexes and counts into them for the group of external
+     relocation entries for that the module.
+
+     For sections that are merged across modules there must not be any
+     remaining external relocation entries for them (for merged sections
+     remaining relocation entries must be local).  */
+
+  unsigned long extreloff;    /* Offset to external relocation entries.  */
+  unsigned long nextrel;      /* Number of external relocation entries.  */
+
+  /* All the local relocation entries are grouped together (they are not
+     grouped by their module since they are only used if the object is moved
+     from it statically link edited address).  */
+
+  unsigned long locreloff;    /* Offset to local relocation entries.  */
+  unsigned long nlocrel;      /* Number of local relocation entries.  */
+
+  bfd_mach_o_dylib_module *dylib_module;
+  bfd_mach_o_dylib_table_of_content *dylib_toc;
+  unsigned int *indirect_syms;
+  bfd_mach_o_dylib_reference *ext_refs;
+}
+bfd_mach_o_dysymtab_command;
+
+/* An indirect symbol table entry is simply a 32bit index into the symbol table
+   to the symbol that the pointer or stub is refering to.  Unless it is for a
+   non-lazy symbol pointer section for a defined symbol which strip(1) has
+   removed.  In which case it has the value INDIRECT_SYMBOL_LOCAL.  If the
+   symbol was also absolute INDIRECT_SYMBOL_ABS is or'ed with that.  */
+
+#define BFD_MACH_O_INDIRECT_SYMBOL_LOCAL 0x80000000
+#define BFD_MACH_O_INDIRECT_SYMBOL_ABS   0x40000000
+#define BFD_MACH_O_INDIRECT_SYMBOL_SIZE  4
+
+/* For LC_THREAD or LC_UNIXTHREAD.  */
+
+typedef struct bfd_mach_o_thread_flavour
+{
+  unsigned long flavour;
+  unsigned long offset;
+  unsigned long size;
+}
+bfd_mach_o_thread_flavour;
+
+typedef struct bfd_mach_o_thread_command
+{
+  unsigned long nflavours;
+  bfd_mach_o_thread_flavour *flavours;
+  asection *section;
+}
+bfd_mach_o_thread_command;
+
+/* For LC_LOAD_DYLINKER and LC_ID_DYLINKER.  */
+
+typedef struct bfd_mach_o_dylinker_command
+{
+  unsigned long name_offset;         /* Offset to library's path name.  */
+  unsigned long name_len;            /* Offset to library's path name.  */
+  char *name_str;
+}
+bfd_mach_o_dylinker_command;
+
+/* For LC_LOAD_DYLIB, LC_LOAD_WEAK_DYLIB, LC_ID_DYLIB
+   or LC_REEXPORT_DYLIB.  */
+
+typedef struct bfd_mach_o_dylib_command
+{
+  unsigned long name_offset;           /* Offset to library's path name.  */
+  unsigned long name_len;              /* Offset to library's path name.  */
+  unsigned long timestamp;	       /* Library's build time stamp.  */
+  unsigned long current_version;       /* Library's current version number.  */
+  unsigned long compatibility_version; /* Library's compatibility vers number.  */
+  char *name_str;
+}
+bfd_mach_o_dylib_command;
+
+/* For LC_PREBOUND_DYLIB.  */
+
+typedef struct bfd_mach_o_prebound_dylib_command
+{
+  unsigned long name;                /* Library's path name.  */
+  unsigned long nmodules;            /* Number of modules in library.  */
+  unsigned long linked_modules;      /* Bit vector of linked modules.  */
+}
+bfd_mach_o_prebound_dylib_command;
+
+/* For LC_UUID.  */
+
+typedef struct bfd_mach_o_uuid_command
+{
+  unsigned char uuid[16];
+}
+bfd_mach_o_uuid_command;
+
+/* For LC_CODE_SIGNATURE or LC_SEGMENT_SPLIT_INFO.  */
+
+typedef struct bfd_mach_o_linkedit_command
+{
+  unsigned long dataoff;
+  unsigned long datasize;
+}
+bfd_mach_o_linkedit_command;
+
+typedef struct bfd_mach_o_str_command
+{
+  unsigned long stroff;
+  unsigned long str_len;
+  char *str;
+}
+bfd_mach_o_str_command;
+
+typedef struct bfd_mach_o_dyld_info_command
+{
+  /* File offset and size to rebase info.  */
+  unsigned int rebase_off; 
+  unsigned int rebase_size;
+
+  /* File offset and size of binding info.  */
+  unsigned int bind_off;
+  unsigned int bind_size;
+
+  /* File offset and size of weak binding info.  */
+  unsigned int weak_bind_off;
+  unsigned int weak_bind_size;
+
+  /* File offset and size of lazy binding info.  */
+  unsigned int lazy_bind_off;
+  unsigned int lazy_bind_size;
+
+  /* File offset and size of export info.  */
+  unsigned int export_off;
+  unsigned int export_size;
+}
+bfd_mach_o_dyld_info_command;
+
+typedef struct bfd_mach_o_version_min_command
+{
+  unsigned char rel;
+  unsigned char maj;
+  unsigned char min;
+  unsigned int reserved;
+}
+bfd_mach_o_version_min_command;
+
+typedef struct bfd_mach_o_load_command
+{
+  bfd_mach_o_load_command_type type;
+  bfd_boolean type_required;
+  unsigned int offset;
+  unsigned int len;
+  union
+  {
+    bfd_mach_o_segment_command segment;
+    bfd_mach_o_symtab_command symtab;
+    bfd_mach_o_dysymtab_command dysymtab;
+    bfd_mach_o_thread_command thread;
+    bfd_mach_o_dylib_command dylib;
+    bfd_mach_o_dylinker_command dylinker;
+    bfd_mach_o_prebound_dylib_command prebound_dylib;
+    bfd_mach_o_uuid_command uuid;
+    bfd_mach_o_linkedit_command linkedit;
+    bfd_mach_o_str_command str;
+    bfd_mach_o_dyld_info_command dyld_info;
+    bfd_mach_o_version_min_command version_min;
+  }
+  command;
+}
+bfd_mach_o_load_command;
+
+typedef struct mach_o_data_struct
+{
+  /* Mach-O header.  */
+  bfd_mach_o_header header;
+  /* Array of load commands (length is given by header.ncmds).  */
+  bfd_mach_o_load_command *commands;
+
+  /* Flatten array of sections.  The array is 0-based.  */
+  unsigned long nsects;
+  bfd_mach_o_section **sections;
+
+  /* Used while writting: current length of the output file.  This is used
+     to allocate space in the file.  */
+  ufile_ptr filelen;
+
+  /* As symtab is referenced by other load command, it is handy to have
+     a direct access to it.  Although it is not clearly stated, only one symtab
+     is expected.  */
+  bfd_mach_o_symtab_command *symtab;
+  bfd_mach_o_dysymtab_command *dysymtab;
+}
+bfd_mach_o_data_struct;
+
+/* Target specific routines.  */
+typedef struct bfd_mach_o_backend_data
+{
+  enum bfd_architecture arch;
+  bfd_boolean (*_bfd_mach_o_swap_reloc_in)(arelent *, bfd_mach_o_reloc_info *);
+  bfd_boolean (*_bfd_mach_o_swap_reloc_out)(arelent *, bfd_mach_o_reloc_info *);
+  bfd_boolean (*_bfd_mach_o_print_thread)(bfd *, bfd_mach_o_thread_flavour *,
+                                          void *, char *);
+}
+bfd_mach_o_backend_data;
+
+#define bfd_mach_o_get_data(abfd) ((abfd)->tdata.mach_o_data)
+#define bfd_mach_o_get_backend_data(abfd) \
+  ((bfd_mach_o_backend_data*)(abfd)->xvec->backend_data)
+
+/* Get the Mach-O header for section SEC.  */
+#define bfd_mach_o_get_mach_o_section(sec) \
+  ((bfd_mach_o_section *)(sec)->used_by_bfd)
+
+bfd_boolean bfd_mach_o_valid (bfd *);
+int bfd_mach_o_read_dysymtab_symbol (bfd *, bfd_mach_o_dysymtab_command *, bfd_mach_o_symtab_command *, bfd_mach_o_asymbol *, unsigned long);
+int bfd_mach_o_scan_start_address (bfd *);
+int bfd_mach_o_scan (bfd *, bfd_mach_o_header *, bfd_mach_o_data_struct *);
+bfd_boolean bfd_mach_o_mkobject_init (bfd *);
+const bfd_target *bfd_mach_o_object_p (bfd *);
+const bfd_target *bfd_mach_o_core_p (bfd *);
+const bfd_target *bfd_mach_o_archive_p (bfd *);
+bfd *bfd_mach_o_openr_next_archived_file (bfd *, bfd *);
+bfd_boolean bfd_mach_o_set_arch_mach (bfd *, enum bfd_architecture,
+                                      unsigned long);
+int bfd_mach_o_lookup_command (bfd *, bfd_mach_o_load_command_type, bfd_mach_o_load_command **);
+bfd_boolean bfd_mach_o_new_section_hook (bfd *, asection *);
+bfd_boolean bfd_mach_o_write_contents (bfd *);
+bfd_boolean bfd_mach_o_bfd_copy_private_symbol_data (bfd *, asymbol *,
+                                                     bfd *, asymbol *);
+bfd_boolean bfd_mach_o_bfd_copy_private_section_data (bfd *, asection *,
+                                                      bfd *, asection *);
+bfd_boolean bfd_mach_o_bfd_copy_private_bfd_data (bfd *, bfd *);
+long bfd_mach_o_get_symtab_upper_bound (bfd *);
+long bfd_mach_o_canonicalize_symtab (bfd *, asymbol **);
+long bfd_mach_o_get_synthetic_symtab (bfd *, long, asymbol **, long, 
+                                      asymbol **, asymbol **ret);
+long bfd_mach_o_get_reloc_upper_bound (bfd *, asection *);
+long bfd_mach_o_canonicalize_reloc (bfd *, asection *, arelent **, asymbol **);
+long bfd_mach_o_get_dynamic_reloc_upper_bound (bfd *);
+long bfd_mach_o_canonicalize_dynamic_reloc (bfd *, arelent **, asymbol **);
+asymbol *bfd_mach_o_make_empty_symbol (bfd *);
+void bfd_mach_o_get_symbol_info (bfd *, asymbol *, symbol_info *);
+void bfd_mach_o_print_symbol (bfd *, PTR, asymbol *, bfd_print_symbol_type);
+bfd_boolean bfd_mach_o_bfd_print_private_bfd_data (bfd *, PTR);
+int bfd_mach_o_sizeof_headers (bfd *, struct bfd_link_info *);
+unsigned long bfd_mach_o_stack_addr (enum bfd_mach_o_cpu_type);
+int bfd_mach_o_core_fetch_environment (bfd *, unsigned char **, unsigned int *);
+char *bfd_mach_o_core_file_failing_command (bfd *);
+int bfd_mach_o_core_file_failing_signal (bfd *);
+bfd_boolean bfd_mach_o_core_file_matches_executable_p (bfd *, bfd *);
+bfd *bfd_mach_o_fat_extract (bfd *, bfd_format , const bfd_arch_info_type *);
+const bfd_target *bfd_mach_o_header_p (bfd *, bfd_mach_o_filetype,
+                                       bfd_mach_o_cpu_type);
+bfd_boolean bfd_mach_o_build_commands (bfd *);
+bfd_boolean bfd_mach_o_set_section_contents (bfd *, asection *, const void *,
+                                             file_ptr, bfd_size_type);
+unsigned int bfd_mach_o_version (bfd *);
+
+unsigned int bfd_mach_o_get_section_type_from_name (const char *);
+unsigned int bfd_mach_o_get_section_attribute_from_name (const char *);
+void bfd_mach_o_normalize_section_name (const char *, const char *,
+                                        const char **, flagword *);
+
+extern const bfd_target mach_o_fat_vec;
+
+#endif /* _BFD_MACH_O_H_ */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/makefile.vms sdcc-3.2.0+dfsg/support/sdbinutils/bfd/makefile.vms
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/makefile.vms	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/makefile.vms	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,51 @@
+#
+# Makefile for bfd library under openVMS 
+#
+# For use with gnu-make for vms
+#
+# Created by Klaus K"ampf, kkaempf@rmi.de
+#
+#
+
+ifeq ($(ARCH),IA64)
+HOSTFILE=alphavms.h
+OBJS:=cpu-ia64.obj,elf64-ia64.obj,elfxx-ia64.obj,elf64-ia64.obj,\
+  vms-misc.obj,vms-lib.obj,elf-strtab.obj,corefile.obj,stabs.obj,\
+  merge.obj,elf-eh-frame.obj,elflink.obj,elf-attrs.obj,dwarf1.obj,elf64.obj
+DEFS=SELECT_VECS="&bfd_elf64_ia64_vms_vec",\
+ SELECT_ARCHITECTURES="&bfd_ia64_arch","HAVE_bfd_elf64_ia64_vms_vec"=1
+endif
+ifeq ($(ARCH),ALPHA)
+HOSTFILE=alphavms.h
+OBJS:=vms-alpha.obj,vms-lib.obj,vms-misc.obj,cpu-alpha.obj
+DEFS=SELECT_VECS="&vms_alpha_vec",SELECT_ARCHITECTURES="&bfd_alpha_arch"
+endif
+
+OBJS:=$(OBJS),archive.obj,archive64.obj,archures.obj,bfd.obj,bfdio.obj,\
+  binary.obj,cache.obj,coffgen.obj,compress.obj,corefile.obj,dwarf2.obj,\
+  elf.obj,format.obj,hash.obj,ihex.obj,init.obj,libbfd.obj,linker.obj,\
+  opncls.obj,reloc.obj,section.obj,simple.obj,srec.obj,stab-syms.obj,\
+  syms.obj,targets.obj,tekhex.obj,verilog.obj
+
+ifeq ($(CC),gcc)
+CFLAGS=/include=([],[-.include])$(DEFS)
+else
+OPT=/noopt/debug
+CFLAGS=/name=(as_is,shortened)/include=([],"../include")\
+ /define=("unlink=remove",DEBUGDIR="""GNU$$DEBUGDIR:""",$(DEFS))\
+ /warns=(infor=(missingreturn,badansialias))$(OPT)
+endif
+
+libbfd.olb: $(OBJS)
+	purge
+	lib/create libbfd $(OBJS)
+
+targmatch.h: bfd.h
+config.h: bfd.h
+vms-misc.c: vms.h
+targets.c: targmatch.h
+
+clean:
+	$$ purge
+	$(RM) libbfd.olb;
+	$(RM) *.obj;
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/mep-relocs.pl sdcc-3.2.0+dfsg/support/sdbinutils/bfd/mep-relocs.pl
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/mep-relocs.pl	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/mep-relocs.pl	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,275 @@
+#!/usr/bin/perl
+# -*- perl -*-
+#
+# Toshiba MeP Media Engine Relocation Generator
+# Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+# This file is part of BFD.
+# Originally written by DJ Delorie <dj@redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+
+# Usage: Run this anywhere inside your source tree.  It will read
+# include/elf/mep.h and scan the comments therein.  It will renumber
+# the relocs to be sequential (this is needed so that bfd/elf32-mep.h
+# works) if needed.  It will then update the reloc list in bfd/reloc.c
+# and the howto, mapping, and apply routines in bfd/elf32-mep.c.  You
+# can then regenerate bfd-in2.h and check everything in.
+
+# FIXME: After the relocation list is finalized, change this to
+# *verify* the reloc list, rather than resequence it.
+
+while (! -f "include/elf/mep.h" && ! -f "bfd/reloc.c") {
+    chdir "..";
+    $pwd = `pwd`;
+    if ($pwd !~ m@/.*/@) {
+	print STDERR "Cannot find include/elf/mep.h or bfd/reloc.h\n";
+	exit 1;
+    }
+}
+$pwd = `pwd`;
+print "srctop is $pwd";
+
+printf "Reading include/elf/mep.h ...\n";
+open(MEPH, "include/elf/mep.h");
+open(MEPHO, "> include/elf/mep.h.new") || die("mep.h.new create: $!");
+$val = 0;
+while (<MEPH>) {
+    if (($pre,$rel,$rest) = /(.*RELOC_NUMBER \()([^,]+), *\d+(.*)/) {
+	$rest =~ s/[\r\n]+$//;
+	print (MEPHO "$pre$rel, $val$rest\n") || die("mep.h.new write: $!");
+	$val ++;
+	$rel =~ s/R_MEP_//;
+	push(@relocs, $rel);
+
+	$rest =~ s@.*/\* @@;
+	($pattern, $sign, $attrs) = $rest =~ m@(.*) ([US]) (.*)\*/@;
+	$pattern =~ s/ //g;
+	push(@pattern, $pattern);
+	push(@sign, $sign);
+	push(@attrs, $attrs);
+
+	printf "%4d $rel p=`$pattern' s=`$sign' a=`$attrs'\n", $#pattern;
+
+    } else {
+	print(MEPHO) || die("mep.h.new write: $!");
+    }
+}
+close(MEPH);
+close(MEPHO) || die("mep.h.new close: $!");
+
+&swapfile("include/elf/mep.h");
+
+redo_file ("bfd/reloc.c",
+	   "",
+	   "ENUMDOC\n  Toshiba Media Processor Relocations.\n\nCOMMENT\n",
+	   "ENUM\n  BFD_RELOC_MEP_%s\n",
+	   "");
+
+$autogen = "    /* This section generated from bfd/mep-relocs.pl from include/elf/mep.h.  */\n";
+
+redo_file ("bfd/elf32-mep.c",
+	   "MEPRELOC:HOWTO",
+	   $autogen,
+	   "MEPRELOC:END",
+	   "",
+	   "&emit_howto();",
+	   "MEPRELOC:MAP",
+	   $autogen,
+	   "MEPRELOC:END",
+	   "",
+	   "    MAP(%s);\n",
+	   "MEPRELOC:APPLY",
+	   $autogen,
+	   "MEPRELOC:END",
+	   "",
+	   "&emit_apply();",
+	   );
+
+sub mask2shifts {
+    my ($mask) = @_;
+    my ($bits, $left, $right, $ci, $c, $cv);
+    $bits = 0;
+    $left = 0;
+    $right = 32;
+    for ($ci=0; $ci<length($mask); $ci++) {
+	$c = substr($mask, $ci, 1);
+	$left++;
+	next if $c eq '-';
+	$left = 0;
+	$cv = ord($c) - ord('0');
+	$cv -= ord('a') - ord('9') - 1 if $cv > 9;
+	$right = $cv unless $right < $cv;
+	$bits = $cv+1 unless $bits > $cv+1;
+    }
+    $mask =~ tr/-/1/c;
+    $mask =~ tr/-/0/;
+    ($rmask = $mask) =~ tr/01/10/;
+    $mask = unpack("H*", pack("B*", $mask));
+    $rmask = unpack("H*", pack("B*", $rmask));
+    return ($bits, $left, $right, $mask, $rmask);
+}
+
+sub emit_howto {
+    for ($i=2; $i<=$#relocs; $i++) {
+	$mask = $pattern[$i];
+
+	if (length($mask) == 8)     { $bytesize = 0; }
+	elsif (length($mask) == 16) { $bytesize = 1; }
+	elsif (length($mask) == 32) { $bytesize = 2; }
+
+	($bits, $left, $right, $mask) = mask2shifts ($mask);
+	$bits[$i] = $bits;
+	$pcrel = 0;
+	$pcrel = 1 if $attrs[$i] =~ /pc-rel/i;
+	$overflow = $sign[$i];
+	$overflow = 'N' if $attrs[$i] =~ /no-overflow/;
+
+	$c = "$relocs[$i],";
+	printf(NEW "  MEPREL (R_MEP_%-10s%d,%3d,%2d,%2d,%2d,%2s, 0x%s),\n",
+	       $c, $bytesize, $bits, $left, $right, $pcrel, $overflow, $mask);
+    }
+}
+
+sub emit_apply {
+    for ($i=2; $i<=$#relocs; $i++) {
+	$v = "u";
+	$v = "s" if $sign[$i] =~ /S/;
+	if (length($pattern[$i]) == 8) {
+	    $e = ''; # no endian swap for bytes
+	} elsif ($pattern[$i] =~ /-/ || length($pattern[$i]) == 16) {
+	    $e = '^e2'; # endian swap - 2byte words only
+	} else {
+	    $e = '^e4' # endian swap for data
+	}
+	print NEW "    case R_MEP_$relocs[$i]: /* $pattern[$i] */\n";
+	if ($attrs[$i] =~ /tp-rel/i) {
+	    print NEW "      $v -= mep_tpoff_base(rel->r_offset);\n";
+	}
+	if ($attrs[$i] =~ /gp-rel/i) {
+	    print NEW "      $v -= mep_sdaoff_base(rel->r_offset);\n";
+	}
+	if ($attrs[$i] !~ /no-overflow/ && $bits[$i] < 32) {
+	    if ($v eq "u") {
+		$max = (1 << $bits[$i]) - 1;
+		print NEW "      if (u > $max) r = bfd_reloc_overflow;\n";
+	    } else {
+		$min = -(1 << ($bits[$i]-1));
+		$max = (1 << ($bits[$i]-1)) - 1;
+		print NEW "      if ($min > s || s > $max) r = bfd_reloc_overflow;\n";
+	    }
+	}
+	for ($b=0; $b<length($pattern[$i]); $b += 8) {
+	    $mask = substr($pattern[$i], $b, 8);
+	    ($bits, $left, $right, $mask, $rmask) = mask2shifts ($mask);
+	    if ($left > $right) { $left -= $right; $right = 0; }
+	    else { $right -= $left; $left = 0; }
+
+	    if ($mask ne "00") {
+		$bb = $b / 8;
+		print NEW "      byte[$bb$e] = ";
+		print NEW "(byte[$bb$e] & 0x$rmask) | " if $rmask ne "00";
+		if ($left) {
+		    print NEW "(($v << $left) & 0x$mask)";
+		} elsif ($right) {
+		    print NEW "(($v >> $right) & 0x$mask)";
+		} else {
+		    print NEW "($v & 0x$mask)";
+		}
+		print NEW ";\n";
+	    }
+	}
+	print NEW "      break;\n";
+    }
+}
+
+
+#-----------------------------------------------------------------------------
+
+sub redo_file {
+    my ($file, @control) = @_;
+    open(OLD, $file);
+    open(NEW, "> $file.new") || die("$file.new create: $!");
+
+    print "Scanning file $file ...\n";
+
+    while (1) {
+	$start = shift @control;
+	$prefix = shift @control;
+	$end = shift @control;
+	$suffix = shift @control;
+	$pattern = shift @control;
+
+	if (!$start) {
+	    print NEW while <OLD>;
+	    last;
+	}
+
+	print "  looking for $start\n";
+	while (<OLD>) {
+	    print NEW;
+	    last if /\Q$start\E/;
+	}
+	print "can't find $start\n" unless $_;
+	last unless $_;
+
+	print NEW $prefix;
+	if ($pattern =~ /^\&/) {
+	    eval $pattern;
+	    die("$pattern: $@") if $@;
+	} else {
+	    for $i (2..$#relocs) {
+		printf (NEW "$pattern", $relocs[$i]) || die("$file.new write: $!");
+		$pattern =~ s/^ENUM\n/ENUMX\n/;
+	    }
+	}
+	print NEW $suffix;
+	while (<OLD>) {
+	    last if /\Q$end\E/;
+	}
+	print NEW;
+    }
+
+    close(OLD);
+    close(NEW) || die("$file.new close: $!");
+    &swapfile($file);
+}
+
+#-----------------------------------------------------------------------------
+
+sub swapfile {
+    my ($f) = @_;
+    if ( ! -f "$f.save") {
+	system "cp $f $f.save";
+    }
+    open(ORIG, $f);
+    open(NEW, "$f.new");
+    while (<ORIG>) {
+	$n = <NEW>;
+	if ($n ne $_) {
+	    close(ORIG);
+	    close(NEW);
+	    print "  Updating $f\n";
+	    rename "$f", "$f.old";
+	    rename "$f.new", "$f";
+	    return;
+	}
+    }
+    close(ORIG);
+    close(NEW);
+    print "  No change to $f\n";
+    unlink "$f.new";
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/merge.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/merge.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/merge.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/merge.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,887 @@
+/* SEC_MERGE support.
+   Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+   Free Software Foundation, Inc.
+   Written by Jakub Jelinek <jakub@redhat.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* This file contains support for merging duplicate entities within sections,
+   as used in ELF SHF_MERGE.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "hashtab.h"
+#include "libiberty.h"
+
+struct sec_merge_sec_info;
+
+/* An entry in the section merge hash table.  */
+
+struct sec_merge_hash_entry
+{
+  struct bfd_hash_entry root;
+  /* Length of this entry.  This includes the zero terminator.  */
+  unsigned int len;
+  /* Start of this string needs to be aligned to
+     alignment octets (not 1 << align).  */
+  unsigned int alignment;
+  union
+  {
+    /* Index within the merged section.  */
+    bfd_size_type index;
+    /* Entry this is a suffix of (if alignment is 0).  */
+    struct sec_merge_hash_entry *suffix;
+  } u;
+  /* Which section is it in.  */
+  struct sec_merge_sec_info *secinfo;
+  /* Next entity in the hash table.  */
+  struct sec_merge_hash_entry *next;
+};
+
+/* The section merge hash table.  */
+
+struct sec_merge_hash
+{
+  struct bfd_hash_table table;
+  /* Next available index.  */
+  bfd_size_type size;
+  /* First entity in the SEC_MERGE sections of this type.  */
+  struct sec_merge_hash_entry *first;
+  /* Last entity in the SEC_MERGE sections of this type.  */
+  struct sec_merge_hash_entry *last;
+  /* Entity size.  */
+  unsigned int entsize;
+  /* Are entries fixed size or zero terminated strings?  */
+  bfd_boolean strings;
+};
+
+struct sec_merge_info
+{
+  /* Chain of sec_merge_infos.  */
+  struct sec_merge_info *next;
+  /* Chain of sec_merge_sec_infos.  */
+  struct sec_merge_sec_info *chain;
+  /* A hash table used to hold section content.  */
+  struct sec_merge_hash *htab;
+};
+
+struct sec_merge_sec_info
+{
+  /* Chain of sec_merge_sec_infos.  */
+  struct sec_merge_sec_info *next;
+  /* The corresponding section.  */
+  asection *sec;
+  /* Pointer to merge_info pointing to us.  */
+  void **psecinfo;
+  /* A hash table used to hold section content.  */
+  struct sec_merge_hash *htab;
+  /* First string in this section.  */
+  struct sec_merge_hash_entry *first_str;
+  /* Original section content.  */
+  unsigned char contents[1];
+};
+
+
+/* Routine to create an entry in a section merge hashtab.  */
+
+static struct bfd_hash_entry *
+sec_merge_hash_newfunc (struct bfd_hash_entry *entry,
+			struct bfd_hash_table *table, const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    entry = (struct bfd_hash_entry *)
+        bfd_hash_allocate (table, sizeof (struct sec_merge_hash_entry));
+  if (entry == NULL)
+    return NULL;
+
+  /* Call the allocation method of the superclass.  */
+  entry = bfd_hash_newfunc (entry, table, string);
+
+  if (entry != NULL)
+    {
+      /* Initialize the local fields.  */
+      struct sec_merge_hash_entry *ret = (struct sec_merge_hash_entry *) entry;
+
+      ret->u.suffix = NULL;
+      ret->alignment = 0;
+      ret->secinfo = NULL;
+      ret->next = NULL;
+    }
+
+  return entry;
+}
+
+/* Look up an entry in a section merge hash table.  */
+
+static struct sec_merge_hash_entry *
+sec_merge_hash_lookup (struct sec_merge_hash *table, const char *string,
+		       unsigned int alignment, bfd_boolean create)
+{
+  const unsigned char *s;
+  unsigned long hash;
+  unsigned int c;
+  struct sec_merge_hash_entry *hashp;
+  unsigned int len, i;
+  unsigned int _index;
+
+  hash = 0;
+  len = 0;
+  s = (const unsigned char *) string;
+  if (table->strings)
+    {
+      if (table->entsize == 1)
+	{
+	  while ((c = *s++) != '\0')
+	    {
+	      hash += c + (c << 17);
+	      hash ^= hash >> 2;
+	      ++len;
+	    }
+	  hash += len + (len << 17);
+	}
+      else
+	{
+	  for (;;)
+	    {
+	      for (i = 0; i < table->entsize; ++i)
+		if (s[i] != '\0')
+		  break;
+	      if (i == table->entsize)
+		break;
+	      for (i = 0; i < table->entsize; ++i)
+		{
+		  c = *s++;
+		  hash += c + (c << 17);
+		  hash ^= hash >> 2;
+		}
+	      ++len;
+	    }
+	  hash += len + (len << 17);
+	  len *= table->entsize;
+	}
+      hash ^= hash >> 2;
+      len += table->entsize;
+    }
+  else
+    {
+      for (i = 0; i < table->entsize; ++i)
+	{
+	  c = *s++;
+	  hash += c + (c << 17);
+	  hash ^= hash >> 2;
+	}
+      len = table->entsize;
+    }
+
+  _index = hash % table->table.size;
+  for (hashp = (struct sec_merge_hash_entry *) table->table.table[_index];
+       hashp != NULL;
+       hashp = (struct sec_merge_hash_entry *) hashp->root.next)
+    {
+      if (hashp->root.hash == hash
+	  && len == hashp->len
+	  && memcmp (hashp->root.string, string, len) == 0)
+	{
+	  /* If the string we found does not have at least the required
+	     alignment, we need to insert another copy.  */
+	  if (hashp->alignment < alignment)
+	    {
+	      if (create)
+		{
+		  /*  Mark the less aligned copy as deleted.  */
+		  hashp->len = 0;
+		  hashp->alignment = 0;
+		}
+	      break;
+	    }
+	  return hashp;
+	}
+    }
+
+  if (! create)
+    return NULL;
+
+  hashp = ((struct sec_merge_hash_entry *)
+	   bfd_hash_insert (&table->table, string, hash));
+  if (hashp == NULL)
+    return NULL;
+  hashp->len = len;
+  hashp->alignment = alignment;
+  return hashp;
+}
+
+/* Create a new hash table.  */
+
+static struct sec_merge_hash *
+sec_merge_init (unsigned int entsize, bfd_boolean strings)
+{
+  struct sec_merge_hash *table;
+
+  table = (struct sec_merge_hash *) bfd_malloc (sizeof (struct sec_merge_hash));
+  if (table == NULL)
+    return NULL;
+
+  if (! bfd_hash_table_init_n (&table->table, sec_merge_hash_newfunc,
+			       sizeof (struct sec_merge_hash_entry), 16699))
+    {
+      free (table);
+      return NULL;
+    }
+
+  table->size = 0;
+  table->first = NULL;
+  table->last = NULL;
+  table->entsize = entsize;
+  table->strings = strings;
+
+  return table;
+}
+
+/* Get the index of an entity in a hash table, adding it if it is not
+   already present.  */
+
+static struct sec_merge_hash_entry *
+sec_merge_add (struct sec_merge_hash *tab, const char *str,
+	       unsigned int alignment, struct sec_merge_sec_info *secinfo)
+{
+  struct sec_merge_hash_entry *entry;
+
+  entry = sec_merge_hash_lookup (tab, str, alignment, TRUE);
+  if (entry == NULL)
+    return NULL;
+
+  if (entry->secinfo == NULL)
+    {
+      tab->size++;
+      entry->secinfo = secinfo;
+      if (tab->first == NULL)
+	tab->first = entry;
+      else
+	tab->last->next = entry;
+      tab->last = entry;
+    }
+
+  return entry;
+}
+
+static bfd_boolean
+sec_merge_emit (bfd *abfd, struct sec_merge_hash_entry *entry)
+{
+  struct sec_merge_sec_info *secinfo = entry->secinfo;
+  asection *sec = secinfo->sec;
+  char *pad = NULL;
+  bfd_size_type off = 0;
+  int alignment_power = sec->output_section->alignment_power;
+
+  if (alignment_power)
+    {
+      pad = (char *) bfd_zmalloc ((bfd_size_type) 1 << alignment_power);
+      if (pad == NULL)
+	return FALSE;
+    }
+
+  for (; entry != NULL && entry->secinfo == secinfo; entry = entry->next)
+    {
+      const char *str;
+      bfd_size_type len;
+
+      len = -off & (entry->alignment - 1);
+      if (len != 0)
+	{
+	  if (bfd_bwrite (pad, len, abfd) != len)
+	    goto err;
+	  off += len;
+	}
+
+      str = entry->root.string;
+      len = entry->len;
+
+      if (bfd_bwrite (str, len, abfd) != len)
+	goto err;
+
+      off += len;
+    }
+
+  /* Trailing alignment needed?  */
+  off = sec->size - off;
+  if (off != 0
+      && bfd_bwrite (pad, off, abfd) != off)
+    goto err;
+
+  if (pad != NULL)
+    free (pad);
+  return TRUE;
+
+ err:
+  if (pad != NULL)
+    free (pad);
+  return FALSE;
+}
+
+/* Register a SEC_MERGE section as a candidate for merging.
+   This function is called for all non-dynamic SEC_MERGE input sections.  */
+
+bfd_boolean
+_bfd_add_merge_section (bfd *abfd, void **psinfo, asection *sec,
+			void **psecinfo)
+{
+  struct sec_merge_info *sinfo;
+  struct sec_merge_sec_info *secinfo;
+  unsigned int align;
+  bfd_size_type amt;
+  bfd_byte *contents;
+
+  if ((abfd->flags & DYNAMIC) != 0
+      || (sec->flags & SEC_MERGE) == 0)
+    abort ();
+
+  if (sec->size == 0
+      || (sec->flags & SEC_EXCLUDE) != 0
+      || sec->entsize == 0)
+    return TRUE;
+
+  if ((sec->flags & SEC_RELOC) != 0)
+    {
+      /* We aren't prepared to handle relocations in merged sections.  */
+      return TRUE;
+    }
+
+  align = sec->alignment_power;
+  if ((sec->entsize < (unsigned) 1 << align
+       && ((sec->entsize & (sec->entsize - 1))
+	   || !(sec->flags & SEC_STRINGS)))
+      || (sec->entsize > (unsigned) 1 << align
+	  && (sec->entsize & (((unsigned) 1 << align) - 1))))
+    {
+      /* Sanity check.  If string character size is smaller than
+	 alignment, then we require character size to be a power
+	 of 2, otherwise character size must be integer multiple
+	 of alignment.  For non-string constants, alignment must
+	 be smaller than or equal to entity size and entity size
+	 must be integer multiple of alignment.  */
+      return TRUE;
+    }
+
+  for (sinfo = (struct sec_merge_info *) *psinfo; sinfo; sinfo = sinfo->next)
+    if ((secinfo = sinfo->chain)
+	&& ! ((secinfo->sec->flags ^ sec->flags) & (SEC_MERGE | SEC_STRINGS))
+	&& secinfo->sec->entsize == sec->entsize
+	&& secinfo->sec->alignment_power == sec->alignment_power
+	&& secinfo->sec->output_section == sec->output_section)
+      break;
+
+  if (sinfo == NULL)
+    {
+      /* Initialize the information we need to keep track of.  */
+      sinfo = (struct sec_merge_info *)
+          bfd_alloc (abfd, sizeof (struct sec_merge_info));
+      if (sinfo == NULL)
+	goto error_return;
+      sinfo->next = (struct sec_merge_info *) *psinfo;
+      sinfo->chain = NULL;
+      *psinfo = sinfo;
+      sinfo->htab = sec_merge_init (sec->entsize, (sec->flags & SEC_STRINGS));
+      if (sinfo->htab == NULL)
+	goto error_return;
+    }
+
+  /* Read the section from abfd.  */
+
+  amt = sizeof (struct sec_merge_sec_info) - 1 + sec->size;
+  if (sec->flags & SEC_STRINGS)
+    /* Some versions of gcc may emit a string without a zero terminator.
+       See http://gcc.gnu.org/ml/gcc-patches/2006-06/msg01004.html
+       Allocate space for an extra zero.  */
+    amt += sec->entsize;
+  *psecinfo = bfd_alloc (abfd, amt);
+  if (*psecinfo == NULL)
+    goto error_return;
+
+  secinfo = (struct sec_merge_sec_info *) *psecinfo;
+  if (sinfo->chain)
+    {
+      secinfo->next = sinfo->chain->next;
+      sinfo->chain->next = secinfo;
+    }
+  else
+    secinfo->next = secinfo;
+  sinfo->chain = secinfo;
+  secinfo->sec = sec;
+  secinfo->psecinfo = psecinfo;
+  secinfo->htab = sinfo->htab;
+  secinfo->first_str = NULL;
+
+  sec->rawsize = sec->size;
+  if (sec->flags & SEC_STRINGS)
+    memset (secinfo->contents + sec->size, 0, sec->entsize);
+  contents = secinfo->contents;
+  if (! bfd_get_full_section_contents (sec->owner, sec, &contents))
+    goto error_return;
+
+  return TRUE;
+
+ error_return:
+  *psecinfo = NULL;
+  return FALSE;
+}
+
+/* Record one section into the hash table.  */
+static bfd_boolean
+record_section (struct sec_merge_info *sinfo,
+		struct sec_merge_sec_info *secinfo)
+{
+  asection *sec = secinfo->sec;
+  struct sec_merge_hash_entry *entry;
+  bfd_boolean nul;
+  unsigned char *p, *end;
+  bfd_vma mask, eltalign;
+  unsigned int align, i;
+
+  align = sec->alignment_power;
+  end = secinfo->contents + sec->size;
+  nul = FALSE;
+  mask = ((bfd_vma) 1 << align) - 1;
+  if (sec->flags & SEC_STRINGS)
+    {
+      for (p = secinfo->contents; p < end; )
+	{
+	  eltalign = p - secinfo->contents;
+	  eltalign = ((eltalign ^ (eltalign - 1)) + 1) >> 1;
+	  if (!eltalign || eltalign > mask)
+	    eltalign = mask + 1;
+	  entry = sec_merge_add (sinfo->htab, (char *) p, (unsigned) eltalign,
+				 secinfo);
+	  if (! entry)
+	    goto error_return;
+	  p += entry->len;
+	  if (sec->entsize == 1)
+	    {
+	      while (p < end && *p == 0)
+		{
+		  if (!nul && !((p - secinfo->contents) & mask))
+		    {
+		      nul = TRUE;
+		      entry = sec_merge_add (sinfo->htab, "",
+					     (unsigned) mask + 1, secinfo);
+		      if (! entry)
+			goto error_return;
+		    }
+		  p++;
+		}
+	    }
+	  else
+	    {
+	      while (p < end)
+		{
+		  for (i = 0; i < sec->entsize; i++)
+		    if (p[i] != '\0')
+		      break;
+		  if (i != sec->entsize)
+		    break;
+		  if (!nul && !((p - secinfo->contents) & mask))
+		    {
+		      nul = TRUE;
+		      entry = sec_merge_add (sinfo->htab, (char *) p,
+					     (unsigned) mask + 1, secinfo);
+		      if (! entry)
+			goto error_return;
+		    }
+		  p += sec->entsize;
+		}
+	    }
+	}
+    }
+  else
+    {
+      for (p = secinfo->contents; p < end; p += sec->entsize)
+	{
+	  entry = sec_merge_add (sinfo->htab, (char *) p, 1, secinfo);
+	  if (! entry)
+	    goto error_return;
+	}
+    }
+
+  return TRUE;
+
+error_return:
+  for (secinfo = sinfo->chain; secinfo; secinfo = secinfo->next)
+    *secinfo->psecinfo = NULL;
+  return FALSE;
+}
+
+static int
+strrevcmp (const void *a, const void *b)
+{
+  struct sec_merge_hash_entry *A = *(struct sec_merge_hash_entry **) a;
+  struct sec_merge_hash_entry *B = *(struct sec_merge_hash_entry **) b;
+  unsigned int lenA = A->len;
+  unsigned int lenB = B->len;
+  const unsigned char *s = (const unsigned char *) A->root.string + lenA - 1;
+  const unsigned char *t = (const unsigned char *) B->root.string + lenB - 1;
+  int l = lenA < lenB ? lenA : lenB;
+
+  while (l)
+    {
+      if (*s != *t)
+	return (int) *s - (int) *t;
+      s--;
+      t--;
+      l--;
+    }
+  return lenA - lenB;
+}
+
+/* Like strrevcmp, but for the case where all strings have the same
+   alignment > entsize.  */
+
+static int
+strrevcmp_align (const void *a, const void *b)
+{
+  struct sec_merge_hash_entry *A = *(struct sec_merge_hash_entry **) a;
+  struct sec_merge_hash_entry *B = *(struct sec_merge_hash_entry **) b;
+  unsigned int lenA = A->len;
+  unsigned int lenB = B->len;
+  const unsigned char *s = (const unsigned char *) A->root.string + lenA - 1;
+  const unsigned char *t = (const unsigned char *) B->root.string + lenB - 1;
+  int l = lenA < lenB ? lenA : lenB;
+  int tail_align = (lenA & (A->alignment - 1)) - (lenB & (A->alignment - 1));
+
+  if (tail_align != 0)
+    return tail_align;
+
+  while (l)
+    {
+      if (*s != *t)
+	return (int) *s - (int) *t;
+      s--;
+      t--;
+      l--;
+    }
+  return lenA - lenB;
+}
+
+static inline int
+is_suffix (const struct sec_merge_hash_entry *A,
+	   const struct sec_merge_hash_entry *B)
+{
+  if (A->len <= B->len)
+    /* B cannot be a suffix of A unless A is equal to B, which is guaranteed
+       not to be equal by the hash table.  */
+    return 0;
+
+  return memcmp (A->root.string + (A->len - B->len),
+		 B->root.string, B->len) == 0;
+}
+
+/* This is a helper function for _bfd_merge_sections.  It attempts to
+   merge strings matching suffixes of longer strings.  */
+static void
+merge_strings (struct sec_merge_info *sinfo)
+{
+  struct sec_merge_hash_entry **array, **a, *e;
+  struct sec_merge_sec_info *secinfo;
+  bfd_size_type size, amt;
+  unsigned int alignment = 0;
+
+  /* Now sort the strings */
+  amt = sinfo->htab->size * sizeof (struct sec_merge_hash_entry *);
+  array = (struct sec_merge_hash_entry **) bfd_malloc (amt);
+  if (array == NULL)
+    goto alloc_failure;
+
+  for (e = sinfo->htab->first, a = array; e; e = e->next)
+    if (e->alignment)
+      {
+	*a++ = e;
+	/* Adjust the length to not include the zero terminator.  */
+	e->len -= sinfo->htab->entsize;
+	if (alignment != e->alignment)
+	  {
+	    if (alignment == 0)
+	      alignment = e->alignment;
+	    else
+	      alignment = (unsigned) -1;
+	  }
+      }
+
+  sinfo->htab->size = a - array;
+  if (sinfo->htab->size != 0)
+    {
+      qsort (array, (size_t) sinfo->htab->size,
+	     sizeof (struct sec_merge_hash_entry *),
+	     (alignment != (unsigned) -1 && alignment > sinfo->htab->entsize
+	      ? strrevcmp_align : strrevcmp));
+
+      /* Loop over the sorted array and merge suffixes */
+      e = *--a;
+      e->len += sinfo->htab->entsize;
+      while (--a >= array)
+	{
+	  struct sec_merge_hash_entry *cmp = *a;
+
+	  cmp->len += sinfo->htab->entsize;
+	  if (e->alignment >= cmp->alignment
+	      && !((e->len - cmp->len) & (cmp->alignment - 1))
+	      && is_suffix (e, cmp))
+	    {
+	      cmp->u.suffix = e;
+	      cmp->alignment = 0;
+	    }
+	  else
+	    e = cmp;
+	}
+    }
+
+alloc_failure:
+  if (array)
+    free (array);
+
+  /* Now assign positions to the strings we want to keep.  */
+  size = 0;
+  secinfo = sinfo->htab->first->secinfo;
+  for (e = sinfo->htab->first; e; e = e->next)
+    {
+      if (e->secinfo != secinfo)
+	{
+	  secinfo->sec->size = size;
+	  secinfo = e->secinfo;
+	}
+      if (e->alignment)
+	{
+	  if (e->secinfo->first_str == NULL)
+	    {
+	      e->secinfo->first_str = e;
+	      size = 0;
+	    }
+	  size = (size + e->alignment - 1) & ~((bfd_vma) e->alignment - 1);
+	  e->u.index = size;
+	  size += e->len;
+	}
+    }
+  secinfo->sec->size = size;
+  if (secinfo->sec->alignment_power != 0)
+    {
+      bfd_size_type align = (bfd_size_type) 1 << secinfo->sec->alignment_power;
+      secinfo->sec->size = (secinfo->sec->size + align - 1) & -align;
+    }
+
+  /* And now adjust the rest, removing them from the chain (but not hashtable)
+     at the same time.  */
+  for (a = &sinfo->htab->first, e = *a; e; e = e->next)
+    if (e->alignment)
+      a = &e->next;
+    else
+      {
+	*a = e->next;
+	if (e->len)
+	  {
+	    e->secinfo = e->u.suffix->secinfo;
+	    e->alignment = e->u.suffix->alignment;
+	    e->u.index = e->u.suffix->u.index + (e->u.suffix->len - e->len);
+	  }
+      }
+}
+
+/* This function is called once after all SEC_MERGE sections are registered
+   with _bfd_merge_section.  */
+
+bfd_boolean
+_bfd_merge_sections (bfd *abfd,
+		     struct bfd_link_info *info ATTRIBUTE_UNUSED,
+		     void *xsinfo,
+		     void (*remove_hook) (bfd *, asection *))
+{
+  struct sec_merge_info *sinfo;
+
+  for (sinfo = (struct sec_merge_info *) xsinfo; sinfo; sinfo = sinfo->next)
+    {
+      struct sec_merge_sec_info * secinfo;
+
+      if (! sinfo->chain)
+	continue;
+
+      /* Move sinfo->chain to head of the chain, terminate it.  */
+      secinfo = sinfo->chain;
+      sinfo->chain = secinfo->next;
+      secinfo->next = NULL;
+
+      /* Record the sections into the hash table.  */
+      for (secinfo = sinfo->chain; secinfo; secinfo = secinfo->next)
+	if (secinfo->sec->flags & SEC_EXCLUDE)
+	  {
+	    *secinfo->psecinfo = NULL;
+	    if (remove_hook)
+	      (*remove_hook) (abfd, secinfo->sec);
+	  }
+	else if (! record_section (sinfo, secinfo))
+	  break;
+
+      if (secinfo)
+	continue;
+
+      if (sinfo->htab->first == NULL)
+	continue;
+
+      if (sinfo->htab->strings)
+	merge_strings (sinfo);
+      else
+	{
+	  struct sec_merge_hash_entry *e;
+	  bfd_size_type size = 0;
+
+	  /* Things are much simpler for non-strings.
+	     Just assign them slots in the section.  */
+	  secinfo = NULL;
+	  for (e = sinfo->htab->first; e; e = e->next)
+	    {
+	      if (e->secinfo->first_str == NULL)
+		{
+		  if (secinfo)
+		    secinfo->sec->size = size;
+		  e->secinfo->first_str = e;
+		  size = 0;
+		}
+	      size = (size + e->alignment - 1)
+		     & ~((bfd_vma) e->alignment - 1);
+	      e->u.index = size;
+	      size += e->len;
+	      secinfo = e->secinfo;
+	    }
+	  secinfo->sec->size = size;
+	}
+
+	/* Finally remove all input sections which have not made it into
+	   the hash table at all.  */
+	for (secinfo = sinfo->chain; secinfo; secinfo = secinfo->next)
+	  if (secinfo->first_str == NULL)
+	    secinfo->sec->flags |= SEC_EXCLUDE | SEC_KEEP;
+    }
+
+  return TRUE;
+}
+
+/* Write out the merged section.  */
+
+bfd_boolean
+_bfd_write_merged_section (bfd *output_bfd, asection *sec, void *psecinfo)
+{
+  struct sec_merge_sec_info *secinfo;
+  file_ptr pos;
+
+  secinfo = (struct sec_merge_sec_info *) psecinfo;
+
+  if (!secinfo)
+    return FALSE;
+
+  if (secinfo->first_str == NULL)
+    return TRUE;
+
+  /* FIXME: octets_per_byte.  */
+  pos = sec->output_section->filepos + sec->output_offset;
+  if (bfd_seek (output_bfd, pos, SEEK_SET) != 0)
+    return FALSE;
+
+  if (! sec_merge_emit (output_bfd, secinfo->first_str))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Adjust an address in the SEC_MERGE section.  Given OFFSET within
+   *PSEC, this returns the new offset in the adjusted SEC_MERGE
+   section and writes the new section back into *PSEC.  */
+
+bfd_vma
+_bfd_merged_section_offset (bfd *output_bfd ATTRIBUTE_UNUSED, asection **psec,
+			    void *psecinfo, bfd_vma offset)
+{
+  struct sec_merge_sec_info *secinfo;
+  struct sec_merge_hash_entry *entry;
+  unsigned char *p;
+  asection *sec = *psec;
+
+  secinfo = (struct sec_merge_sec_info *) psecinfo;
+
+  if (!secinfo)
+    return offset;
+
+  if (offset >= sec->rawsize)
+    {
+      if (offset > sec->rawsize)
+	{
+	  (*_bfd_error_handler)
+	    (_("%s: access beyond end of merged section (%ld)"),
+	     bfd_get_filename (sec->owner), (long) offset);
+	}
+      return secinfo->first_str ? sec->size : 0;
+    }
+
+  if (secinfo->htab->strings)
+    {
+      if (sec->entsize == 1)
+	{
+	  p = secinfo->contents + offset - 1;
+	  while (p >= secinfo->contents && *p)
+	    --p;
+	  ++p;
+	}
+      else
+	{
+	  p = secinfo->contents + (offset / sec->entsize) * sec->entsize;
+	  p -= sec->entsize;
+	  while (p >= secinfo->contents)
+	    {
+	      unsigned int i;
+
+	      for (i = 0; i < sec->entsize; ++i)
+		if (p[i] != '\0')
+		  break;
+	      if (i == sec->entsize)
+		break;
+	      p -= sec->entsize;
+	    }
+	  p += sec->entsize;
+	}
+    }
+  else
+    {
+      p = secinfo->contents + (offset / sec->entsize) * sec->entsize;
+    }
+  entry = sec_merge_hash_lookup (secinfo->htab, (char *) p, 0, FALSE);
+  if (!entry)
+    {
+      if (! secinfo->htab->strings)
+	abort ();
+      /* This should only happen if somebody points into the padding
+	 after a NUL character but before next entity.  */
+      if (*p)
+	abort ();
+      if (! secinfo->htab->first)
+	abort ();
+      entry = secinfo->htab->first;
+      p = (secinfo->contents + (offset / sec->entsize + 1) * sec->entsize
+	   - entry->len);
+    }
+
+  *psec = entry->secinfo->sec;
+  return entry->u.index + (secinfo->contents + offset - p);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/mipsbsd.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/mipsbsd.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/mipsbsd.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/mipsbsd.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,498 @@
+/* BFD backend for MIPS BSD (a.out) binaries.
+   Copyright 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2005, 2007, 2009, 2011 Free Software Foundation, Inc.
+   Written by Ralph Campbell.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* #define ENTRY_CAN_BE_ZERO */
+#define N_HEADER_IN_TEXT(x) 1
+#define N_TXTADDR(x) \
+    (N_MAGIC(x) != ZMAGIC ? (x).a_entry :	/* object file or NMAGIC */\
+	    TEXT_START_ADDR + EXEC_BYTES_SIZE	/* no padding */\
+    )
+#define N_DATADDR(x) (N_TXTADDR(x)+N_TXTSIZE(x))
+#define TEXT_START_ADDR 4096
+#define TARGET_PAGE_SIZE 4096
+#define SEGMENT_SIZE TARGET_PAGE_SIZE
+#define DEFAULT_ARCH bfd_arch_mips
+#define MACHTYPE_OK(mtype) ((mtype) == M_UNKNOWN \
+			    || (mtype) == M_MIPS1 || (mtype) == M_MIPS2)
+#define MY_symbol_leading_char '\0'
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (mipsbsd_,OP)
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libaout.h"
+
+#define SET_ARCH_MACH(ABFD, EXEC) \
+  MY(set_arch_mach) (ABFD, N_MACHTYPE (EXEC)); \
+  MY(choose_reloc_size) (ABFD);
+static void MY(set_arch_mach) PARAMS ((bfd *abfd, unsigned long machtype));
+static void MY(choose_reloc_size) PARAMS ((bfd *abfd));
+
+#define MY_write_object_contents MY(write_object_contents)
+static bfd_boolean MY(write_object_contents) PARAMS ((bfd *abfd));
+
+/* We can't use MY(x) here because it leads to a recursive call to CONCAT2
+   when expanded inside JUMP_TABLE.  */
+#define MY_bfd_reloc_type_lookup mipsbsd_reloc_type_lookup
+#define MY_bfd_reloc_name_lookup mipsbsd_reloc_name_lookup
+#define MY_canonicalize_reloc mipsbsd_canonicalize_reloc
+
+#define MY_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
+#define MY_bfd_link_add_symbols _bfd_generic_link_add_symbols
+#define MY_final_link_callback unused
+#define MY_bfd_final_link _bfd_generic_final_link
+
+#define MY_backend_data &MY(backend_data)
+#define MY_BFD_TARGET
+
+#include "aout-target.h"
+
+static bfd_reloc_status_type mips_fix_jmp_addr
+  PARAMS ((bfd *, arelent *, struct bfd_symbol *, PTR, asection *,
+	   bfd *, char **));
+
+long MY(canonicalize_reloc) PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
+
+static void
+MY(set_arch_mach) (abfd, machtype)
+     bfd *abfd;
+     unsigned long machtype;
+{
+  enum bfd_architecture arch;
+  unsigned int machine;
+
+  /* Determine the architecture and machine type of the object file.  */
+  switch (machtype)
+    {
+    case M_MIPS1:
+      arch = bfd_arch_mips;
+      machine = bfd_mach_mips3000;
+      break;
+
+    case M_MIPS2:
+      arch = bfd_arch_mips;
+      machine = bfd_mach_mips4000;
+      break;
+
+    default:
+      arch = bfd_arch_obscure;
+      machine = 0;
+      break;
+    }
+
+  bfd_set_arch_mach (abfd, arch, machine);
+}
+
+/* Determine the size of a relocation entry, based on the architecture */
+static void
+MY (choose_reloc_size) (abfd)
+     bfd *abfd;
+{
+  switch (bfd_get_arch (abfd))
+    {
+    case bfd_arch_sparc:
+    case bfd_arch_mips:
+      obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;
+      break;
+    default:
+      obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+      break;
+    }
+}
+
+/* Write an object file in BSD a.out format.
+  Section contents have already been written.  We write the
+  file header, symbols, and relocation.  */
+
+static bfd_boolean
+MY (write_object_contents) (abfd)
+     bfd *abfd;
+{
+  struct external_exec exec_bytes;
+  struct internal_exec *execp = exec_hdr (abfd);
+
+  /* Magic number, maestro, please!  */
+  switch (bfd_get_arch (abfd))
+    {
+    case bfd_arch_m68k:
+      switch (bfd_get_mach (abfd))
+	{
+	case bfd_mach_m68010:
+	  N_SET_MACHTYPE (*execp, M_68010);
+	  break;
+	default:
+	case bfd_mach_m68020:
+	  N_SET_MACHTYPE (*execp, M_68020);
+	  break;
+	}
+      break;
+    case bfd_arch_sparc:
+      N_SET_MACHTYPE (*execp, M_SPARC);
+      break;
+    case bfd_arch_i386:
+      N_SET_MACHTYPE (*execp, M_386);
+      break;
+    case bfd_arch_mips:
+      switch (bfd_get_mach (abfd))
+	{
+	case bfd_mach_mips4000:
+	case bfd_mach_mips6000:
+	  N_SET_MACHTYPE (*execp, M_MIPS2);
+	  break;
+	default:
+	  N_SET_MACHTYPE (*execp, M_MIPS1);
+	  break;
+	}
+      break;
+    default:
+      N_SET_MACHTYPE (*execp, M_UNKNOWN);
+    }
+
+  MY (choose_reloc_size) (abfd);
+
+  WRITE_HEADERS (abfd, execp);
+
+  return TRUE;
+}
+
+/* MIPS relocation types.  */
+#define MIPS_RELOC_32		0
+#define MIPS_RELOC_JMP		1
+#define MIPS_RELOC_WDISP16	2
+#define MIPS_RELOC_HI16		3
+#define MIPS_RELOC_HI16_S	4
+#define MIPS_RELOC_LO16		5
+
+/* This is only called when performing a BFD_RELOC_MIPS_JMP relocation.
+   The jump destination address is formed from the upper 4 bits of the
+   "current" program counter concatenated with the jump instruction's
+   26 bit field and two trailing zeros.
+   If the destination address is not in the same segment as the "current"
+   program counter, then we need to signal an error.  */
+
+static bfd_reloc_status_type
+mips_fix_jmp_addr (abfd, reloc_entry, symbol, data, input_section, output_bfd,
+		   error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry;
+     struct bfd_symbol *symbol;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  bfd_vma relocation, pc;
+
+  /* If this is a partial relocation, just continue.  */
+  if (output_bfd != (bfd *)NULL)
+    return bfd_reloc_continue;
+
+  /* If this is an undefined symbol, return error */
+  if (bfd_is_und_section (symbol->section)
+      && (symbol->flags & BSF_WEAK) == 0)
+    return bfd_reloc_undefined;
+
+  /* Work out which section the relocation is targeted at and the
+     initial relocation command value.  */
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  relocation += reloc_entry->addend;
+
+  pc = input_section->output_section->vma + input_section->output_offset +
+    reloc_entry->address + 4;
+
+  if ((relocation & 0xF0000000) != (pc & 0xF0000000))
+    return bfd_reloc_overflow;
+
+  return bfd_reloc_continue;
+}
+
+/* This is only called when performing a BFD_RELOC_HI16_S relocation.
+   We need to see if bit 15 is set in the result. If it is, we add
+   0x10000 and continue normally. This will compensate for the sign extension
+   when the low bits are added at run time.  */
+
+static bfd_reloc_status_type
+mips_fix_hi16_s PARAMS ((bfd *, arelent *, asymbol *, PTR,
+			 asection *, bfd *, char **));
+
+static bfd_reloc_status_type
+mips_fix_hi16_s (abfd, reloc_entry, symbol, data, input_section,
+		 output_bfd, error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry;
+     asymbol *symbol;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section ATTRIBUTE_UNUSED;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  bfd_vma relocation;
+
+  /* If this is a partial relocation, just continue.  */
+  if (output_bfd != (bfd *)NULL)
+    return bfd_reloc_continue;
+
+  /* If this is an undefined symbol, return error.  */
+  if (bfd_is_und_section (symbol->section)
+      && (symbol->flags & BSF_WEAK) == 0)
+    return bfd_reloc_undefined;
+
+  /* Work out which section the relocation is targeted at and the
+     initial relocation command value.  */
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  relocation += reloc_entry->addend;
+
+  if (relocation & 0x8000)
+    reloc_entry->addend += 0x10000;
+
+  return bfd_reloc_continue;
+}
+
+static reloc_howto_type mips_howto_table_ext[] = {
+  {MIPS_RELOC_32,      0, 2, 32, FALSE, 0,  complain_overflow_bitfield, 0,
+	"32",       FALSE, 0, 0xffffffff, FALSE},
+  {MIPS_RELOC_JMP,     2, 2, 26, FALSE, 0, complain_overflow_dont,
+	mips_fix_jmp_addr,
+	"MIPS_JMP", FALSE, 0, 0x03ffffff, FALSE},
+  {MIPS_RELOC_WDISP16, 2, 2, 16, TRUE,  0, complain_overflow_signed, 0,
+	"WDISP16",  FALSE, 0, 0x0000ffff, FALSE},
+  {MIPS_RELOC_HI16,   16, 2, 16, FALSE, 0, complain_overflow_bitfield, 0,
+	"HI16",     FALSE, 0, 0x0000ffff, FALSE},
+  {MIPS_RELOC_HI16_S, 16, 2, 16, FALSE, 0, complain_overflow_bitfield,
+        mips_fix_hi16_s,
+        "HI16_S",   FALSE, 0, 0x0000ffff, FALSE},
+  {MIPS_RELOC_LO16,    0, 2, 16, FALSE, 0, complain_overflow_dont, 0,
+	"LO16",     FALSE, 0, 0x0000ffff, FALSE},
+};
+
+static reloc_howto_type *
+MY(reloc_type_lookup) (bfd *abfd, bfd_reloc_code_real_type code)
+{
+
+  if (bfd_get_arch (abfd) != bfd_arch_mips)
+    return 0;
+
+  switch (code)
+    {
+    case BFD_RELOC_CTOR:
+    case BFD_RELOC_32:
+      return (&mips_howto_table_ext[MIPS_RELOC_32]);
+    case BFD_RELOC_MIPS_JMP:
+      return (&mips_howto_table_ext[MIPS_RELOC_JMP]);
+    case BFD_RELOC_16_PCREL_S2:
+      return (&mips_howto_table_ext[MIPS_RELOC_WDISP16]);
+    case BFD_RELOC_HI16:
+      return (&mips_howto_table_ext[MIPS_RELOC_HI16]);
+    case BFD_RELOC_HI16_S:
+      return (&mips_howto_table_ext[MIPS_RELOC_HI16_S]);
+    case BFD_RELOC_LO16:
+      return (&mips_howto_table_ext[MIPS_RELOC_LO16]);
+    default:
+      return 0;
+    }
+}
+
+static reloc_howto_type *
+MY(reloc_name_lookup) (bfd *abfd ATTRIBUTE_UNUSED,
+			     const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (mips_howto_table_ext) / sizeof (mips_howto_table_ext[0]);
+       i++)
+    if (mips_howto_table_ext[i].name != NULL
+	&& strcasecmp (mips_howto_table_ext[i].name, r_name) == 0)
+      return &mips_howto_table_ext[i];
+
+  return NULL;
+}
+
+/* This is just like the standard aoutx.h version but we need to do our
+   own mapping of external reloc type values to howto entries.  */
+long
+MY(canonicalize_reloc) (abfd, section, relptr, symbols)
+      bfd *abfd;
+      sec_ptr section;
+      arelent **relptr;
+      asymbol **symbols;
+{
+  arelent *tblptr = section->relocation;
+  unsigned int count, c;
+  extern reloc_howto_type NAME(aout,ext_howto_table)[];
+
+  /* If we have already read in the relocation table, return the values.  */
+  if (section->flags & SEC_CONSTRUCTOR)
+    {
+      arelent_chain *chain = section->constructor_chain;
+
+      for (count = 0; count < section->reloc_count; count++)
+	{
+	  *relptr++ = &chain->relent;
+	  chain = chain->next;
+	}
+      *relptr = 0;
+      return section->reloc_count;
+    }
+
+  if (tblptr && section->reloc_count)
+    {
+      for (count = 0; count++ < section->reloc_count;)
+	*relptr++ = tblptr++;
+      *relptr = 0;
+      return section->reloc_count;
+    }
+
+  if (!NAME(aout,slurp_reloc_table) (abfd, section, symbols))
+    return -1;
+  tblptr = section->relocation;
+
+  /* fix up howto entries.  */
+  for (count = 0; count++ < section->reloc_count;)
+    {
+      c = tblptr->howto - NAME(aout,ext_howto_table);
+      tblptr->howto = &mips_howto_table_ext[c];
+
+      *relptr++ = tblptr++;
+    }
+  *relptr = 0;
+  return section->reloc_count;
+}
+
+static const struct aout_backend_data MY(backend_data) = {
+  0,				/* zmagic contiguous */
+  1,				/* text incl header */
+  0,				/* entry is text address */
+  0,				/* exec_hdr_flags */
+  TARGET_PAGE_SIZE,			/* text vma */
+  MY_set_sizes,
+  0,				/* text size includes exec header */
+  0,				/* add_dynamic_symbols */
+  0,				/* add_one_symbol */
+  0,				/* link_dynamic_object */
+  0,				/* write_dynamic_symbol */
+  0,				/* check_dynamic_reloc */
+  0				/* finish_dynamic_link */
+};
+
+extern const bfd_target aout_mips_big_vec;
+
+const bfd_target aout_mips_little_vec =
+  {
+    "a.out-mips-little",		/* name */
+    bfd_target_aout_flavour,
+    BFD_ENDIAN_LITTLE,		/* target byte order (little) */
+    BFD_ENDIAN_LITTLE,		/* target headers byte order (little) */
+    (HAS_RELOC | EXEC_P |		/* object flags */
+     HAS_LINENO | HAS_DEBUG |
+     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
+    MY_symbol_leading_char,
+    ' ',				/* ar_pad_char */
+    15,				/* ar_max_namelen */
+    0,				/* match priority.  */
+    bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
+    bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+    bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
+    {_bfd_dummy_target, MY_object_p, /* bfd_check_format */
+     bfd_generic_archive_p, MY_core_file_p},
+    {bfd_false, MY_mkobject,	/* bfd_set_format */
+     _bfd_generic_mkarchive, bfd_false},
+    {bfd_false, MY_write_object_contents, /* bfd_write_contents */
+     _bfd_write_archive_contents, bfd_false},
+
+    BFD_JUMP_TABLE_GENERIC (MY),
+    BFD_JUMP_TABLE_COPY (MY),
+    BFD_JUMP_TABLE_CORE (MY),
+    BFD_JUMP_TABLE_ARCHIVE (MY),
+    BFD_JUMP_TABLE_SYMBOLS (MY),
+    BFD_JUMP_TABLE_RELOCS (MY),
+    BFD_JUMP_TABLE_WRITE (MY),
+    BFD_JUMP_TABLE_LINK (MY),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    & aout_mips_big_vec,
+
+    (PTR) MY_backend_data
+  };
+
+const bfd_target aout_mips_big_vec =
+  {
+    "a.out-mips-big",		/* name */
+    bfd_target_aout_flavour,
+    BFD_ENDIAN_BIG,		/* target byte order (big) */
+    BFD_ENDIAN_BIG,		/* target headers byte order (big) */
+    (HAS_RELOC | EXEC_P |		/* object flags */
+     HAS_LINENO | HAS_DEBUG |
+     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
+    MY_symbol_leading_char,
+    ' ',				/* ar_pad_char */
+    15,				/* ar_max_namelen */
+    0,				/* match priority.  */
+    bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+    bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+    bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
+    bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+    bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+    bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
+    {_bfd_dummy_target, MY_object_p, /* bfd_check_format */
+     bfd_generic_archive_p, MY_core_file_p},
+    {bfd_false, MY_mkobject,	/* bfd_set_format */
+     _bfd_generic_mkarchive, bfd_false},
+    {bfd_false, MY_write_object_contents, /* bfd_write_contents */
+     _bfd_write_archive_contents, bfd_false},
+
+    BFD_JUMP_TABLE_GENERIC (MY),
+    BFD_JUMP_TABLE_COPY (MY),
+    BFD_JUMP_TABLE_CORE (MY),
+    BFD_JUMP_TABLE_ARCHIVE (MY),
+    BFD_JUMP_TABLE_SYMBOLS (MY),
+    BFD_JUMP_TABLE_RELOCS (MY),
+    BFD_JUMP_TABLE_WRITE (MY),
+    BFD_JUMP_TABLE_LINK (MY),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    & aout_mips_little_vec,
+
+    (PTR) MY_backend_data
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/mmo.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/mmo.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/mmo.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/mmo.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3282 @@
+/* BFD back-end for mmo objects (MMIX-specific object-format).
+   Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Hans-Peter Nilsson (hp@bitrange.com).
+   Infrastructure and other bits originally copied from srec.c and
+   binary.c.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/*
+SECTION
+	mmo backend
+
+	The mmo object format is used exclusively together with Professor
+	Donald E.@: Knuth's educational 64-bit processor MMIX.  The simulator
+	@command{mmix} which is available at
+	@url{http://www-cs-faculty.stanford.edu/~knuth/programs/mmix.tar.gz}
+	understands this format.  That package also includes a combined
+	assembler and linker called @command{mmixal}.  The mmo format has
+	no advantages feature-wise compared to e.g. ELF.  It is a simple
+	non-relocatable object format with no support for archives or
+	debugging information, except for symbol value information and
+	line numbers (which is not yet implemented in BFD).  See
+	@url{http://www-cs-faculty.stanford.edu/~knuth/mmix.html} for more
+	information about MMIX.  The ELF format is used for intermediate
+	object files in the BFD implementation.
+
+@c We want to xref the symbol table node.  A feature in "chew"
+@c requires that "commands" do not contain spaces in the
+@c arguments.  Hence the hyphen in "Symbol-table".
+@menu
+@* File layout::
+@* Symbol-table::
+@* mmo section mapping::
+@end menu
+
+INODE
+File layout, Symbol-table, mmo, mmo
+SUBSECTION
+	File layout
+
+	The mmo file contents is not partitioned into named sections as
+	with e.g.@: ELF.  Memory areas is formed by specifying the
+	location of the data that follows.  Only the memory area
+	@samp{0x0000@dots{}00} to @samp{0x01ff@dots{}ff} is executable, so
+	it is used for code (and constants) and the area
+	@samp{0x2000@dots{}00} to @samp{0x20ff@dots{}ff} is used for
+	writable data.  @xref{mmo section mapping}.
+
+	There is provision for specifying ``special data'' of 65536
+	different types.  We use type 80 (decimal), arbitrarily chosen the
+	same as the ELF <<e_machine>> number for MMIX, filling it with
+	section information normally found in ELF objects. @xref{mmo
+	section mapping}.
+
+	Contents is entered as 32-bit words, xor:ed over previous
+	contents, always zero-initialized.  A word that starts with the
+	byte @samp{0x98} forms a command called a @samp{lopcode}, where
+	the next byte distinguished between the thirteen lopcodes.  The
+	two remaining bytes, called the @samp{Y} and @samp{Z} fields, or
+	the @samp{YZ} field (a 16-bit big-endian number), are used for
+	various purposes different for each lopcode.  As documented in
+	@url{http://www-cs-faculty.stanford.edu/~knuth/mmixal-intro.ps.gz},
+	the lopcodes are:
+
+	@table @code
+	@item lop_quote
+	0x98000001.  The next word is contents, regardless of whether it
+	starts with 0x98 or not.
+
+	@item lop_loc
+	0x9801YYZZ, where @samp{Z} is 1 or 2.  This is a location
+	directive, setting the location for the next data to the next
+	32-bit word (for @math{Z = 1}) or 64-bit word (for @math{Z = 2}),
+	plus @math{Y * 2^56}.  Normally @samp{Y} is 0 for the text segment
+	and 2 for the data segment.
+
+	@item lop_skip
+	0x9802YYZZ.  Increase the current location by @samp{YZ} bytes.
+
+	@item lop_fixo
+	0x9803YYZZ, where @samp{Z} is 1 or 2.  Store the current location
+	as 64 bits into the location pointed to by the next 32-bit
+	(@math{Z = 1}) or 64-bit (@math{Z = 2}) word, plus @math{Y *
+	2^56}.
+
+	@item lop_fixr
+	0x9804YYZZ.  @samp{YZ} is stored into the current location plus
+	@math{2 - 4 * YZ}.
+
+	@item lop_fixrx
+	0x980500ZZ.  @samp{Z} is 16 or 24.  A value @samp{L} derived from
+	the following 32-bit word are used in a manner similar to
+	@samp{YZ} in lop_fixr: it is xor:ed into the current location
+	minus @math{4 * L}.  The first byte of the word is 0 or 1.  If it
+	is 1, then @math{L = (@var{lowest 24 bits of word}) - 2^Z}, if 0,
+ 	then @math{L = (@var{lowest 24 bits of word})}.
+
+	@item lop_file
+	0x9806YYZZ.  @samp{Y} is the file number, @samp{Z} is count of
+	32-bit words.  Set the file number to @samp{Y} and the line
+	counter to 0.  The next @math{Z * 4} bytes contain the file name,
+	padded with zeros if the count is not a multiple of four.  The
+	same @samp{Y} may occur multiple times, but @samp{Z} must be 0 for
+	all but the first occurrence.
+
+	@item lop_line
+	0x9807YYZZ.  @samp{YZ} is the line number.  Together with
+	lop_file, it forms the source location for the next 32-bit word.
+	Note that for each non-lopcode 32-bit word, line numbers are
+	assumed incremented by one.
+
+	@item lop_spec
+	0x9808YYZZ.  @samp{YZ} is the type number.  Data until the next
+	lopcode other than lop_quote forms special data of type @samp{YZ}.
+	@xref{mmo section mapping}.
+
+	Other types than 80, (or type 80 with a content that does not
+	parse) is stored in sections named <<.MMIX.spec_data.@var{n}>>
+	where @var{n} is the @samp{YZ}-type.  The flags for such a
+	sections say not to allocate or load the data.  The vma is 0.
+	Contents of multiple occurrences of special data @var{n} is
+	concatenated to the data of the previous lop_spec @var{n}s.  The
+	location in data or code at which the lop_spec occurred is lost.
+
+	@item lop_pre
+	0x980901ZZ.  The first lopcode in a file.  The @samp{Z} field forms the
+	length of header information in 32-bit words, where the first word
+	tells the time in seconds since @samp{00:00:00 GMT Jan 1 1970}.
+
+	@item lop_post
+	0x980a00ZZ.  @math{Z > 32}.  This lopcode follows after all
+	content-generating lopcodes in a program.  The @samp{Z} field
+	denotes the value of @samp{rG} at the beginning of the program.
+	The following @math{256 - Z} big-endian 64-bit words are loaded
+	into global registers @samp{$G} @dots{} @samp{$255}.
+
+	@item lop_stab
+	0x980b0000.  The next-to-last lopcode in a program.  Must follow
+	immediately after the lop_post lopcode and its data.  After this
+	lopcode follows all symbols in a compressed format
+	(@pxref{Symbol-table}).
+
+	@item lop_end
+	0x980cYYZZ.  The last lopcode in a program.  It must follow the
+	lop_stab lopcode and its data.  The @samp{YZ} field contains the
+	number of 32-bit words of symbol table information after the
+	preceding lop_stab lopcode.
+	@end table
+
+	Note that the lopcode "fixups"; <<lop_fixr>>, <<lop_fixrx>> and
+	<<lop_fixo>> are not generated by BFD, but are handled.  They are
+	generated by <<mmixal>>.
+
+EXAMPLE
+	This trivial one-label, one-instruction file:
+
+| :Main TRAP 1,2,3
+
+	can be represented this way in mmo:
+
+| 0x98090101 - lop_pre, one 32-bit word with timestamp.
+| <timestamp>
+| 0x98010002 - lop_loc, text segment, using a 64-bit address.
+|              Note that mmixal does not emit this for the file above.
+| 0x00000000 - Address, high 32 bits.
+| 0x00000000 - Address, low 32 bits.
+| 0x98060002 - lop_file, 2 32-bit words for file-name.
+| 0x74657374 - "test"
+| 0x2e730000 - ".s\0\0"
+| 0x98070001 - lop_line, line 1.
+| 0x00010203 - TRAP 1,2,3
+| 0x980a00ff - lop_post, setting $255 to 0.
+| 0x00000000
+| 0x00000000
+| 0x980b0000 - lop_stab for ":Main" = 0, serial 1.
+| 0x203a4040   @xref{Symbol-table}.
+| 0x10404020
+| 0x4d206120
+| 0x69016e00
+| 0x81000000
+| 0x980c0005 - lop_end; symbol table contained five 32-bit words.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libiberty.h"
+#include "elf/mmix.h"
+#include "opcode/mmix.h"
+
+#define LOP 0x98
+#define LOP_QUOTE 0
+#define LOP_LOC 1
+#define LOP_SKIP 2
+#define LOP_FIXO 3
+#define LOP_FIXR 4
+#define LOP_FIXRX 5
+#define LOP_FILE 6
+#define LOP_LINE 7
+#define LOP_SPEC 8
+#define LOP_PRE 9
+#define LOP_POST 10
+#define LOP_STAB 11
+#define LOP_END 12
+
+#define LOP_QUOTE_NEXT ((LOP << 24) | (LOP_QUOTE << 16) | 1)
+#define SPEC_DATA_SECTION 80
+#define LOP_SPEC_SECTION \
+ ((LOP << 24) | (LOP_SPEC << 16) | SPEC_DATA_SECTION)
+
+/* Must be a power of two.  If you change this to be >= 64k, you need a
+   new test-case; the ld test b-loc64k.d touches chunk-size problem areas.  */
+#define MMO_SEC_CONTENTS_CHUNK_SIZE (1 << 15)
+
+/* An arbitrary number for the maximum length section name size.  */
+#define MAX_SECTION_NAME_SIZE (1024 * 1024)
+
+/* A quite arbitrary number for the maximum length section size.  */
+#define MAX_ARTIFICIAL_SECTION_SIZE (1024 * 1024 * 1024)
+
+#define MMO3_WCHAR 0x80
+#define MMO3_LEFT 0x40
+#define MMO3_MIDDLE 0x20
+#define MMO3_RIGHT 0x10
+#define MMO3_TYPEBITS 0xf
+#define MMO3_REGQUAL_BITS 0xf
+#define MMO3_UNDEF 2
+#define MMO3_DATA 8
+#define MMO3_SYMBITS 0x2f
+
+/* Put these everywhere in new code.  */
+#define FATAL_DEBUG						\
+ _bfd_abort (__FILE__, __LINE__,				\
+	     "Internal: Non-debugged code (test-case missing)")
+
+#define BAD_CASE(x)				\
+ _bfd_abort (__FILE__, __LINE__,		\
+	     "bad case for " #x)
+
+enum mmo_sym_type { mmo_reg_sym, mmo_undef_sym, mmo_data_sym, mmo_abs_sym};
+
+/* When scanning the mmo file, a linked list of mmo_symbol
+   structures is built to represent the symbol table (if there is
+   one).  */
+
+struct mmo_symbol
+  {
+    struct mmo_symbol *next;
+    char *name;
+    bfd_vma value;
+    enum mmo_sym_type sym_type;
+    unsigned int serno;
+  };
+
+struct mmo_data_list_struct
+  {
+    struct mmo_data_list_struct *next;
+    bfd_vma where;
+    bfd_size_type size;
+    bfd_size_type allocated_size;
+    bfd_byte data[1];
+  };
+
+typedef struct mmo_data_list_struct mmo_data_list_type;
+
+struct mmo_symbol_trie
+  {
+    struct mmo_symbol_trie *left;
+    struct mmo_symbol_trie *right;
+    struct mmo_symbol_trie *middle;
+
+    bfd_byte symchar;
+
+    /* A zero name means there's nothing here.  */
+    struct mmo_symbol sym;
+  };
+
+/* The mmo tdata information.  */
+
+struct mmo_data_struct
+  {
+    struct mmo_symbol *symbols;
+    struct mmo_symbol *symtail;
+    asymbol *csymbols;
+
+    /* File representation of time (NULL) when this file was created.  */
+    bfd_byte created[4];
+
+    /* When we're reading bytes recursively, check this occasionally.
+       Also holds write errors.  */
+    bfd_boolean have_error;
+
+    /* Max symbol length that may appear in the lop_stab table.  Note that
+       this table might just hold a subset of symbols for not-really large
+       programs, as it can only be 65536 * 4 bytes large.  */
+    int max_symbol_length;
+
+    /* Here's the symbol we build in lop_stab.  */
+    char *lop_stab_symbol;
+
+    /* Index into lop_stab_symbol for the next character when parsing the
+       symbol information.  */
+    int symbol_position;
+
+    /* When creating arbitrary sections, we need to count section numbers.  */
+    int sec_no;
+
+    /* When writing or reading byte-wise, we need to count the bytes
+       within a 32-bit word.  */
+    int byte_no;
+
+    /* We also need a buffer to hold the bytes we count reading or writing.  */
+    bfd_byte buf[4];
+  };
+
+typedef struct mmo_data_struct tdata_type;
+
+struct mmo_section_data_struct
+  {
+    mmo_data_list_type *head;
+    mmo_data_list_type *tail;
+  };
+
+#define mmo_section_data(sec) \
+  ((struct mmo_section_data_struct *) (sec)->used_by_bfd)
+
+/* These structures are used in bfd_map_over_sections constructs.  */
+
+/* Used when writing out sections; all but the register contents section
+   which is stored in reg_section.  */
+struct mmo_write_sec_info
+  {
+    asection *reg_section;
+    bfd_boolean retval;
+  };
+
+/* Used when trying to find a section corresponding to addr.  */
+struct mmo_find_sec_info
+  {
+    asection *sec;
+    bfd_vma addr;
+  };
+
+static bfd_boolean mmo_bfd_copy_private_bfd_data (bfd *, bfd *);
+static void mmo_write_section_unless_reg_contents (bfd *, asection *, void *);
+static void mmo_find_sec_w_addr (bfd *, asection *, void *);
+static void mmo_find_sec_w_addr_grow (bfd *, asection *, void *);
+static asection *mmo_make_section (bfd *, const char *);
+static void mmo_get_symbol_info (bfd *, asymbol *, symbol_info *);
+static void mmo_print_symbol (bfd *, void *, asymbol *, 
+			      bfd_print_symbol_type);
+static void mmo_init (void);
+static bfd_boolean mmo_mkobject (bfd *);
+static bfd_boolean mmo_scan (bfd *);
+static asection *mmo_decide_section (bfd *, bfd_vma);
+static asection *mmo_get_generic_spec_data_section (bfd *, int);
+static asection *mmo_get_spec_section (bfd *, int);
+static INLINE bfd_byte *mmo_get_loc (asection *, bfd_vma, int);
+static void mmo_xore_64 (asection *, bfd_vma vma, bfd_vma value);
+static void mmo_xore_32 (asection *, bfd_vma vma, unsigned int);
+static void mmo_xore_16 (asection *, bfd_vma vma, unsigned int);
+static const bfd_target *mmo_object_p (bfd *);
+static void mmo_map_set_sizes (bfd *, asection *, void *);
+static bfd_boolean mmo_get_symbols (bfd *);
+static bfd_boolean mmo_create_symbol (bfd *, const char *, bfd_vma,
+				      enum mmo_sym_type, unsigned int);
+static bfd_boolean mmo_get_section_contents (bfd *, asection *, void *,
+					     file_ptr, bfd_size_type);
+static long mmo_get_symtab_upper_bound (bfd *);
+static long mmo_canonicalize_symtab (bfd *, asymbol **);
+static void mmo_get_symbol_info (bfd *, asymbol *, symbol_info *);
+static void mmo_print_symbol (bfd *, void *, asymbol *,
+			      bfd_print_symbol_type);
+static bfd_boolean mmo_set_section_contents (bfd *, sec_ptr, const void *,
+					     file_ptr, bfd_size_type);
+static int mmo_sizeof_headers (bfd *, struct bfd_link_info *);
+static bfd_boolean mmo_internal_write_header (bfd *);
+static bfd_boolean mmo_internal_write_post (bfd *, int, asection *);
+static bfd_boolean mmo_internal_add_3_sym (bfd *, struct mmo_symbol_trie *,
+					   const struct mmo_symbol *);
+static unsigned int mmo_internal_3_length (bfd *, struct mmo_symbol_trie *);
+static void mmo_internal_3_dump (bfd *, struct mmo_symbol_trie *);
+static void mmo_beb128_out (bfd *, int, int);
+static bfd_boolean mmo_internal_write_section (bfd *, asection *);
+static void mmo_write_tetra (bfd *, unsigned int);
+static void mmo_write_tetra_raw (bfd *, unsigned int);
+static void mmo_write_octa (bfd *, bfd_vma);
+static void mmo_write_octa_raw (bfd *, bfd_vma);
+static bfd_boolean mmo_write_chunk (bfd *, const bfd_byte *, unsigned int);
+static bfd_boolean mmo_flush_chunk (bfd *);
+static bfd_boolean mmo_write_loc_chunk (bfd *, bfd_vma, const bfd_byte *,
+					unsigned int, bfd_vma *);
+static bfd_boolean mmo_write_chunk_list (bfd *, mmo_data_list_type *);
+static bfd_boolean mmo_write_loc_chunk_list (bfd *, mmo_data_list_type *);
+static bfd_boolean mmo_write_symbols_and_terminator (bfd *);
+static flagword mmo_sec_flags_from_bfd_flags (flagword);
+static flagword bfd_sec_flags_from_mmo_flags (flagword);
+static bfd_byte mmo_get_byte (bfd *);
+static void mmo_write_byte (bfd *, bfd_byte);
+static bfd_boolean mmo_new_section_hook (bfd *, asection *);
+static int mmo_sort_mmo_symbols (const void *, const void *);
+static bfd_boolean mmo_write_object_contents (bfd *);
+static bfd_boolean mmo_write_section_description (bfd *, asection *);
+static bfd_boolean mmo_has_leading_or_trailing_zero_tetra_p (bfd *,
+							     asection *);
+
+/* Global "const" variables initialized once.  Must not depend on
+   particular input or caller; put such things into the bfd or elsewhere.
+   Look ma, no static per-invocation data!  */
+
+static
+char valid_mmo_symbol_character_set[/* A-Z a-z (we assume consecutive
+				       codes; sorry EBCDIC:ers!).  */
+				    + 'Z' - 'A' + 1 + 'z' - 'a' + 1
+				    /* Digits.  */
+				    + 10
+				    /* ':' and '_'.  */
+				    + 1 + 1
+				    /* Codes higher than 126.  */
+				    + 256 - 126
+				    /* Ending zero.  */
+				    + 1];
+
+
+/* Get section SECNAME or create one if it doesn't exist.  When creating
+   one, new memory for the name is allocated.  */
+
+static asection *
+mmo_make_section (bfd *abfd, const char *secname)
+{
+  asection *sec = bfd_get_section_by_name (abfd, secname);
+
+  if (sec == NULL)
+    {
+      char *newsecname = strdup (secname);
+
+      if (newsecname == NULL)
+	{
+	  (*_bfd_error_handler)
+	    (_("%s: No core to allocate section name %s\n"),
+	     bfd_get_filename (abfd), secname);
+	  bfd_set_error (bfd_error_system_call);
+	  return NULL;
+	}
+      sec = bfd_make_section (abfd, newsecname);
+    }
+
+  return sec;
+}
+
+/* Nothing to do, but keep as a placeholder if we need it.
+   Note that state that might differ between bfd:s must not be initialized
+   here, nor must it be static.  Add it to tdata information instead.  */
+
+static void
+mmo_init (void)
+{
+  static bfd_boolean inited = FALSE;
+  int i = 0;
+  int j = 0;
+  static const char letters[]
+    = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789:_";
+
+  if (inited)
+    return;
+  inited = TRUE;
+
+  /* Fill in the set of valid symbol characters.  */
+  strcpy (valid_mmo_symbol_character_set, letters);
+  i = strlen (letters);
+
+  for (j = 126; j < 256; j++)
+    valid_mmo_symbol_character_set[i++] = j;
+}
+
+/* Check whether an existing file is an mmo file.  */
+
+static const bfd_target *
+mmo_object_p (bfd *abfd)
+{
+  struct stat statbuf;
+  bfd_byte b[4];
+
+  mmo_init ();
+
+  if (bfd_stat (abfd, &statbuf) < 0
+      || bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
+      || bfd_bread (b, 4, abfd) != 4)
+    goto bad_final;
+
+  /* All mmo files are a multiple of four bytes long.
+     Only recognize version one.  */
+  if ((statbuf.st_size % 4) != 0
+      || b[0] != LOP || b[1] != LOP_PRE || b[2] != 1)
+    goto bad_format;
+
+  /* Get the last 32-bit word.  */
+  if (bfd_seek (abfd, (file_ptr) statbuf.st_size - 4, SEEK_SET) != 0
+      || bfd_bread (b, 4, abfd) != 4)
+    goto bad_final;
+
+  /* Check if the file ends in a lop_end lopcode. */
+  if (b[0] != LOP || b[1] != LOP_END || ! mmo_mkobject (abfd))
+    goto bad_format;
+
+  /* Compute an upper bound on the max symbol length.  Not really
+     important as all of the symbol information can only be 256k.  */
+  abfd->tdata.mmo_data->max_symbol_length = (b[2] * 256 + b[3]) * 4;
+  abfd->tdata.mmo_data->lop_stab_symbol
+    = bfd_malloc (abfd->tdata.mmo_data->max_symbol_length + 1);
+
+  if (abfd->tdata.mmo_data->lop_stab_symbol == NULL)
+    {
+      (*_bfd_error_handler)
+	(_("%s: No core to allocate a symbol %d bytes long\n"),
+	 bfd_get_filename (abfd), abfd->tdata.mmo_data->max_symbol_length);
+      goto bad_final;
+    }
+
+  /* Read in everything.  */
+  if (! mmo_scan (abfd))
+    goto bad_format_free;
+
+  if (abfd->symcount > 0)
+    abfd->flags |= HAS_SYMS;
+
+  /* You'll have to tweak this if you want to use this format for other
+     arches (not recommended due to its small-size limitations).  Look at
+     the ELF format for how to make it target-generic.  */
+  if (! bfd_default_set_arch_mach (abfd, bfd_arch_mmix, 0))
+    goto bad_format_free;
+
+  return abfd->xvec;
+
+ bad_format_free:
+  free (abfd->tdata.mmo_data->lop_stab_symbol);
+ bad_format:
+  bfd_set_error (bfd_error_wrong_format);
+ bad_final:
+  return NULL;
+}
+
+/* Set up the mmo tdata information.  */
+
+static bfd_boolean
+mmo_mkobject (bfd *abfd)
+{
+  mmo_init ();
+
+  if (abfd->tdata.mmo_data == NULL)
+    {
+      time_t created;
+
+      /* All fields are zero-initialized, so we don't have to explicitly
+	 initialize most.  */
+      tdata_type *tdata = (tdata_type *) bfd_zmalloc (sizeof (tdata_type));
+      if (tdata == NULL)
+	return FALSE;
+
+      created = time (NULL);
+      bfd_put_32 (abfd, created, tdata->created);
+
+      abfd->tdata.mmo_data = tdata;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+mmo_bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  if (bfd_get_flavour (ibfd) != bfd_target_mmo_flavour
+      || bfd_get_flavour (obfd) != bfd_target_mmo_flavour)
+    return TRUE;
+
+  /* Copy the time the copied-from file was created.  If people want the
+     time the file was last *modified*, they have that in the normal file
+     information.  */
+  memcpy (obfd->tdata.mmo_data->created, ibfd->tdata.mmo_data->created,
+	  sizeof (obfd->tdata.mmo_data->created));
+  return TRUE;
+}
+
+/* Helper functions for mmo_decide_section, used through
+   bfd_map_over_sections.  */
+
+static void
+mmo_find_sec_w_addr (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *p)
+{
+  struct mmo_find_sec_info *infop = (struct mmo_find_sec_info *) p;
+  bfd_vma vma = bfd_get_section_vma (abfd, sec);
+
+  /* Ignore sections that aren't loaded.  */
+  if ((bfd_get_section_flags (abfd, sec) & (SEC_LOAD | SEC_ALLOC))
+      !=  (SEC_LOAD | SEC_ALLOC))
+    return;
+
+  if (infop->addr >= vma && infop->addr < vma + sec->size)
+    infop->sec = sec;
+}
+
+static void
+mmo_find_sec_w_addr_grow (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *p)
+{
+  struct mmo_find_sec_info *infop = (struct mmo_find_sec_info *) p;
+  bfd_vma vma = bfd_get_section_vma (abfd, sec);
+
+  /* Ignore sections that aren't loaded.  */
+  if ((bfd_get_section_flags (abfd, sec) & (SEC_LOAD | SEC_ALLOC))
+      !=  (SEC_LOAD | SEC_ALLOC))
+    return;
+
+  if (infop->addr >= vma && infop->addr < vma + MAX_ARTIFICIAL_SECTION_SIZE)
+    infop->sec = sec;
+}
+
+/* Find a section that corresponds to a VMA.  Automatically create .text
+   or .data and set current section to it, depending on what vma.  If we
+   can't deduce a section, make one up as ".MMIX.sec.N", where N is an
+   increasing number.  */
+
+static asection *
+mmo_decide_section (bfd *abfd, bfd_vma vma)
+{
+  asection *sec = NULL;
+  char sec_name[sizeof (".MMIX.sec.") + 20];
+  struct mmo_find_sec_info info;
+
+  info.addr = vma;
+  info.sec = NULL;
+
+  /* First see if there's a section that would match exactly.  */
+  bfd_map_over_sections (abfd, mmo_find_sec_w_addr, &info);
+
+  if (info.sec != NULL)
+    return info.sec;
+
+  /* If there's no such section, try and expand one of the existing ones,
+     up to a limit.  Make sure we have .text and .data before we try that;
+     create them corresponding to expected addresses and set flags to make
+     them match the "loaded and with contents" expectation.  */
+  if ((vma >> 56) == 0)
+    {
+      sec = bfd_make_section_old_way (abfd, MMO_TEXT_SECTION_NAME);
+
+      if (sec == NULL)
+	return NULL;
+
+      if (! sec->user_set_vma)
+	bfd_set_section_vma (abfd, sec, vma);
+      if (! bfd_set_section_flags (abfd, sec,
+				   bfd_get_section_flags (abfd, sec)
+				   | SEC_CODE | SEC_LOAD | SEC_ALLOC))
+	return NULL;
+    }
+  else if ((vma >> 56) == 0x20)
+    {
+      sec = bfd_make_section_old_way (abfd, MMO_DATA_SECTION_NAME);
+
+      if (sec == NULL)
+	return NULL;
+
+      if (! sec->user_set_vma)
+	bfd_set_section_vma (abfd, sec, vma);
+      if (! bfd_set_section_flags (abfd, sec,
+				   bfd_get_section_flags (abfd, sec)
+				   | SEC_LOAD | SEC_ALLOC))
+	return NULL;
+    }
+
+  bfd_map_over_sections (abfd, mmo_find_sec_w_addr_grow, &info);
+
+  if (info.sec != NULL)
+    return info.sec;
+
+  /* If there's still no suitable section, make a new one.  */
+  sprintf (sec_name, ".MMIX.sec.%d", abfd->tdata.mmo_data->sec_no++);
+  sec = mmo_make_section (abfd, sec_name);
+  if (! sec->user_set_vma)
+    bfd_set_section_vma (abfd, sec, vma);
+
+  if (! bfd_set_section_flags (abfd, sec,
+			       bfd_get_section_flags (abfd, sec)
+			       | SEC_LOAD | SEC_ALLOC))
+    return NULL;
+  return sec;
+}
+
+/* Xor in a 64-bit value VALUE at VMA.  */
+
+static INLINE void
+mmo_xore_64 (asection *sec, bfd_vma vma, bfd_vma value)
+{
+  bfd_byte *loc = mmo_get_loc (sec, vma, 8);
+  bfd_vma prev = bfd_get_64 (sec->owner, loc);
+
+  value ^= prev;
+  bfd_put_64 (sec->owner, value, loc);
+}
+
+/* Xor in a 32-bit value VALUE at VMA.  */
+
+static INLINE void
+mmo_xore_32 (asection *sec, bfd_vma vma, unsigned int value)
+{
+  bfd_byte *loc = mmo_get_loc (sec, vma, 4);
+  unsigned int prev = bfd_get_32 (sec->owner, loc);
+
+  value ^= prev;
+  bfd_put_32 (sec->owner, value, loc);
+}
+
+/* Xor in a 16-bit value VALUE at VMA.  */
+
+static INLINE void
+mmo_xore_16 (asection *sec, bfd_vma vma, unsigned int value)
+{
+  bfd_byte *loc = mmo_get_loc (sec, vma, 2);
+  unsigned int prev = bfd_get_16 (sec->owner, loc);
+
+  value ^= prev;
+  bfd_put_16 (sec->owner, value, loc);
+}
+
+/* Write a 32-bit word to output file, no lop_quote generated.  */
+
+static INLINE void
+mmo_write_tetra_raw (bfd *abfd, unsigned int value)
+{
+  bfd_byte buf[4];
+
+  bfd_put_32 (abfd, value, buf);
+
+  if (bfd_bwrite (buf, 4, abfd) != 4)
+    abfd->tdata.mmo_data->have_error = TRUE;
+}
+
+/* Write a 32-bit word to output file; lop_quote if necessary.  */
+
+static INLINE void
+mmo_write_tetra (bfd *abfd, unsigned int value)
+{
+  if (((value >> 24) & 0xff) == LOP)
+    mmo_write_tetra_raw (abfd, LOP_QUOTE_NEXT);
+
+  mmo_write_tetra_raw (abfd, value);
+}
+
+/* Write a 64-bit word to output file, perhaps with lop_quoting.  */
+
+static INLINE void
+mmo_write_octa (bfd *abfd, bfd_vma value)
+{
+  mmo_write_tetra (abfd, (unsigned int) (value >> 32));
+  mmo_write_tetra (abfd, (unsigned int) value);
+}
+
+/* Write a 64-bit word to output file, without lop_quoting.  */
+
+static INLINE void
+mmo_write_octa_raw (bfd *abfd, bfd_vma value)
+{
+  mmo_write_tetra_raw (abfd, (unsigned int) (value >> 32));
+  mmo_write_tetra_raw (abfd, (unsigned int) value);
+}
+
+/* Write quoted contents.  Intended to be called multiple times in
+   sequence, followed by a call to mmo_flush_chunk.  */
+
+static INLINE bfd_boolean
+mmo_write_chunk (bfd *abfd, const bfd_byte *loc, unsigned int len)
+{
+  bfd_boolean retval = TRUE;
+
+  /* Fill up a tetra from bytes remaining from a previous chunk.  */
+  if (abfd->tdata.mmo_data->byte_no != 0)
+    {
+      while (abfd->tdata.mmo_data->byte_no < 4 && len != 0)
+	{
+	  abfd->tdata.mmo_data->buf[abfd->tdata.mmo_data->byte_no++] = *loc++;
+	  len--;
+	}
+
+      if (abfd->tdata.mmo_data->byte_no == 4)
+	{
+	  mmo_write_tetra (abfd,
+			   bfd_get_32 (abfd, abfd->tdata.mmo_data->buf));
+	  abfd->tdata.mmo_data->byte_no = 0;
+	}
+    }
+
+  while (len >= 4)
+    {
+      if (loc[0] == LOP)
+	mmo_write_tetra_raw (abfd, LOP_QUOTE_NEXT);
+
+      retval = (retval
+		&& ! abfd->tdata.mmo_data->have_error
+		&& 4 == bfd_bwrite (loc, 4, abfd));
+
+      loc += 4;
+      len -= 4;
+    }
+
+  if (len)
+    {
+      memcpy (abfd->tdata.mmo_data->buf, loc, len);
+      abfd->tdata.mmo_data->byte_no = len;
+    }
+
+  if (! retval)
+    abfd->tdata.mmo_data->have_error = TRUE;
+  return retval;
+}
+
+/* Flush remaining bytes, from a previous mmo_write_chunk, zero-padded to
+   4 bytes.  */
+
+static INLINE bfd_boolean
+mmo_flush_chunk (bfd *abfd)
+{
+  if (abfd->tdata.mmo_data->byte_no != 0)
+    {
+      memset (abfd->tdata.mmo_data->buf + abfd->tdata.mmo_data->byte_no,
+	      0, 4 - abfd->tdata.mmo_data->byte_no);
+      mmo_write_tetra (abfd,
+		       bfd_get_32 (abfd, abfd->tdata.mmo_data->buf));
+      abfd->tdata.mmo_data->byte_no = 0;
+    }
+
+  return ! abfd->tdata.mmo_data->have_error;
+}
+
+/* Same, but from a list.  */
+
+static INLINE bfd_boolean
+mmo_write_chunk_list (bfd *abfd, mmo_data_list_type *datap)
+{
+  for (; datap != NULL; datap = datap->next)
+    if (! mmo_write_chunk (abfd, datap->data, datap->size))
+      return FALSE;
+
+  return mmo_flush_chunk (abfd);
+}
+
+/* Write a lop_loc and some contents.  A caller needs to call
+   mmo_flush_chunk after calling this function.  The location is only
+   output if different than *LAST_VMAP, which is updated after this call.  */
+
+static bfd_boolean
+mmo_write_loc_chunk (bfd *abfd, bfd_vma vma, const bfd_byte *loc,
+		     unsigned int len, bfd_vma *last_vmap)
+{
+  /* Find an initial and trailing section of zero tetras; we don't need to
+     write out zeros.  FIXME: When we do this, we should emit section size
+     and address specifiers, else objcopy can't always perform an identity
+     translation.  Only do this if we *don't* have left-over data from a
+     previous write or the vma of this chunk is *not* the next address,
+     because then data isn't tetrabyte-aligned and we're concatenating to
+     that left-over data.  */
+
+  if (abfd->tdata.mmo_data->byte_no == 0 || vma != *last_vmap)
+    {
+      while (len >= 4 && bfd_get_32 (abfd, loc) == 0)
+	{
+	  vma += 4;
+	  len -= 4;
+	  loc += 4;
+	}
+
+      while (len >= 4 && bfd_get_32 (abfd, loc + len - 4) == 0)
+	len -= 4;
+    }
+
+  /* Only write out the location if it's different than the one the caller
+     (supposedly) previously handled, accounting for omitted leading zeros.  */
+  if (vma != *last_vmap)
+    {
+      /* We might be in the middle of a sequence.  */
+      mmo_flush_chunk (abfd);
+
+      /* We always write the location as 64 bits; no use saving bytes
+         here.  */
+      mmo_write_tetra_raw (abfd, (LOP << 24) | (LOP_LOC << 16) | 2);
+      mmo_write_octa_raw (abfd, vma);
+    }
+
+  /* Update to reflect end of this chunk, with trailing zeros omitted.  */
+  *last_vmap = vma + len;
+
+  return (! abfd->tdata.mmo_data->have_error
+	  && mmo_write_chunk (abfd, loc, len));
+}
+
+/* Same, but from a list.  */
+
+static INLINE bfd_boolean
+mmo_write_loc_chunk_list (bfd *abfd, mmo_data_list_type *datap)
+{
+  /* Get an address different than the address of the first chunk.  */
+  bfd_vma last_vma = datap ? datap->where - 1 : 0;
+
+  for (; datap != NULL; datap = datap->next)
+    if (! mmo_write_loc_chunk (abfd, datap->where, datap->data, datap->size,
+			       &last_vma))
+      return FALSE;
+
+  return mmo_flush_chunk (abfd);
+}
+
+/* Make a .MMIX.spec_data.N section.  */
+
+static asection *
+mmo_get_generic_spec_data_section (bfd *abfd, int spec_data_number)
+{
+  asection *sec;
+  char secname[sizeof (MMIX_OTHER_SPEC_SECTION_PREFIX) + 20]
+    = MMIX_OTHER_SPEC_SECTION_PREFIX;
+
+  sprintf (secname + strlen (MMIX_OTHER_SPEC_SECTION_PREFIX),
+	   "%d", spec_data_number);
+
+  sec = mmo_make_section (abfd, secname);
+
+  return sec;
+}
+
+/* Make a special section for SPEC_DATA_NUMBER.  If it is the one we use
+   ourselves, parse some of its data to get at the section name.  */
+
+static asection *
+mmo_get_spec_section (bfd *abfd, int spec_data_number)
+{
+  char *secname;
+  asection *sec;
+  bfd_byte buf[4];
+  unsigned int secname_length;
+  unsigned int i;
+  bfd_vma section_length;
+  bfd_vma section_vma;
+  mmo_data_list_type *loc;
+  flagword flags;
+  long orig_pos;
+
+  /* If this isn't the "special" special data, then make a placeholder
+     section.  */
+  if (spec_data_number != SPEC_DATA_SECTION)
+    return mmo_get_generic_spec_data_section (abfd, spec_data_number);
+
+  /* Seek back to this position if there was a format error.  */
+  orig_pos = bfd_tell (abfd);
+
+  /* Read the length (in 32-bit words).  */
+  if (bfd_bread (buf, 4, abfd) != 4)
+    goto format_error;
+
+  if (buf[0] == LOP)
+    {
+      if (buf[1] != LOP_QUOTE)
+	goto format_error;
+
+      if (bfd_bread (buf, 4, abfd) != 4)
+	goto format_error;
+    }
+
+  /* We don't care to keep the name length accurate.  It's
+     zero-terminated.  */
+  secname_length = bfd_get_32 (abfd, buf) * 4;
+
+  /* Check section name length for sanity.  */
+  if (secname_length > MAX_SECTION_NAME_SIZE)
+    goto format_error;
+
+  /* This should be free'd regardless if a section is created.  */
+  secname = bfd_malloc (secname_length + 1);
+  secname[secname_length] = 0;
+
+  for (i = 0; i < secname_length / 4; i++)
+    {
+      if (bfd_bread (secname + i * 4, 4, abfd) != 4)
+	goto format_error_free;
+
+      if (secname[i * 4] == (char) LOP)
+	{
+	  /* A bit of overkill, but we handle char 0x98 in a section name,
+	     and recognize misparsing.  */
+	  if (secname[i * 4 + 1] != LOP_QUOTE
+	      || bfd_bread (secname + i * 4, 4, abfd) != 4)
+	    /* Whoops.  We thought this was a name, and now we found a
+	       non-lop_quote lopcode before we parsed the whole length of
+	       the name.  Signal end-of-file in the same manner.  */
+	      goto format_error_free;
+	}
+    }
+
+  /* Get the section flags.  */
+  if (bfd_bread (buf, 4, abfd) != 4
+      || (buf[0] == LOP
+	  && (buf[1] != LOP_QUOTE || bfd_bread (buf, 4, abfd) != 4)))
+    goto format_error_free;
+
+  flags = bfd_get_32 (abfd, buf);
+
+  /* Get the section length.  */
+  if (bfd_bread (buf, 4, abfd) != 4
+      || (buf[0] == LOP
+	  && (buf[1] != LOP_QUOTE || bfd_bread (buf, 4, abfd) != 4)))
+    goto format_error_free;
+
+  section_length = (bfd_vma) bfd_get_32 (abfd, buf) << 32;
+
+  /* That's the first, high-part.  Now get the low part.  */
+
+  if (bfd_bread (buf, 4, abfd) != 4
+      || (buf[0] == LOP
+	  && (buf[1] != LOP_QUOTE || bfd_bread (buf, 4, abfd) != 4)))
+    goto format_error_free;
+
+  section_length |= (bfd_vma) bfd_get_32 (abfd, buf);
+
+  /* Check the section length for sanity.  */
+  if (section_length > MAX_ARTIFICIAL_SECTION_SIZE)
+    goto format_error_free;
+
+  /* Get the section VMA.  */
+  if (bfd_bread (buf, 4, abfd) != 4
+      || (buf[0] == LOP
+	  && (buf[1] != LOP_QUOTE || bfd_bread (buf, 4, abfd) != 4)))
+    goto format_error_free;
+
+  section_vma = (bfd_vma) bfd_get_32 (abfd, buf) << 32;
+
+  /* That's the first, high-part.  Now get the low part.  */
+  if (bfd_bread (buf, 4, abfd) != 4
+      || (buf[0] == LOP
+	  && (buf[1] != LOP_QUOTE || bfd_bread (buf, 4, abfd) != 4)))
+    goto format_error_free;
+
+  section_vma |= (bfd_vma) bfd_get_32 (abfd, buf);
+
+  sec = mmo_make_section (abfd, secname);
+  free (secname);
+  if (sec == NULL)
+    goto format_error;
+
+  /* We allocate a buffer here for the advertised size, with head room for
+     tetrabyte alignment.  */
+  loc = bfd_zmalloc (section_length + 3
+		     + sizeof (struct mmo_data_list_struct));
+  if (loc == NULL)
+    goto format_error;
+
+  /* Use a TETRA-rounded size for the allocated buffer; we set the
+     "visible" section size below.  */
+  loc->size = (section_length + 3) & ~3;
+
+  /* Add in the section flags we found to those bfd entered during this
+     process and set the contents.  */
+  if (! bfd_set_section_flags (abfd, sec,
+			       bfd_sec_flags_from_mmo_flags (flags)
+			       | bfd_get_section_flags (abfd, sec)
+			       | (section_length != 0 ? SEC_HAS_CONTENTS : 0))
+      || ! bfd_set_section_size (abfd, sec, sec->size + section_length)
+      /* Set VMA only for the first occurrence.  */
+      || (! sec->user_set_vma
+	  && ! bfd_set_section_vma  (abfd, sec, section_vma)))
+    {
+      /* If we get an error for any of the calls above, signal more than
+	 just a format error for the spec section.  */
+      return NULL;
+    }
+
+  loc->next = NULL;
+  if (mmo_section_data (sec)->tail != NULL)
+    mmo_section_data (sec)->tail->next = loc;
+  else
+    mmo_section_data (sec)->head = loc;
+  mmo_section_data (sec)->tail = loc;
+  loc->where = section_vma;
+
+  return sec;
+
+ format_error_free:
+  free (secname);
+ format_error:
+  if (bfd_seek (abfd, orig_pos, SEEK_SET) != 0)
+    return NULL;
+
+  return mmo_get_generic_spec_data_section (abfd, spec_data_number);
+}
+
+/* Read a byte, but read from file in multiples of 32-bit words.  */
+
+static bfd_byte
+mmo_get_byte (bfd *abfd)
+{
+  bfd_byte retval;
+
+  if (abfd->tdata.mmo_data->byte_no == 0)
+    {
+      if (! abfd->tdata.mmo_data->have_error
+	  && bfd_bread (abfd->tdata.mmo_data->buf, 4, abfd) != 4)
+	{
+	  abfd->tdata.mmo_data->have_error = TRUE;
+
+	  /* A value somewhat safe against tripping on some inconsistency
+	     when mopping up after this error.  */
+	  return 128;
+	}
+    }
+
+  retval = abfd->tdata.mmo_data->buf[abfd->tdata.mmo_data->byte_no];
+  abfd->tdata.mmo_data->byte_no = (abfd->tdata.mmo_data->byte_no + 1) % 4;
+
+  return retval;
+}
+
+/* Write a byte, in multiples of 32-bit words.  */
+
+static void
+mmo_write_byte (bfd *abfd, bfd_byte value)
+{
+  abfd->tdata.mmo_data->buf[(abfd->tdata.mmo_data->byte_no++ % 4)] = value;
+  if ((abfd->tdata.mmo_data->byte_no % 4) == 0)
+    {
+      if (! abfd->tdata.mmo_data->have_error
+	  && bfd_bwrite (abfd->tdata.mmo_data->buf, 4, abfd) != 4)
+	abfd->tdata.mmo_data->have_error = TRUE;
+    }
+}
+
+/* Create a symbol.  */
+
+static bfd_boolean
+mmo_create_symbol (bfd *abfd, const char *symname, bfd_vma addr, enum
+		   mmo_sym_type sym_type, unsigned int serno)
+{
+  struct mmo_symbol *n;
+
+  n = (struct mmo_symbol *) bfd_alloc (abfd, sizeof (struct mmo_symbol));
+  if (n == NULL)
+    return FALSE;
+
+  n->name = bfd_alloc (abfd, strlen (symname) + 1);
+  if (n->name == NULL)
+    return FALSE;
+
+  strcpy (n->name, symname);
+
+  n->value = addr;
+  n->sym_type = sym_type;
+  n->serno = serno;
+
+  if (abfd->tdata.mmo_data->symbols == NULL)
+    abfd->tdata.mmo_data->symbols = n;
+  else
+    abfd->tdata.mmo_data->symtail->next = n;
+  abfd->tdata.mmo_data->symtail = n;
+  n->next = NULL;
+
+  ++abfd->symcount;
+
+  /* Check that :Main equals the last octa of the .MMIX.reg_contents
+     section, as it's the one place we're sure to pass when reading a mmo
+     object.  For written objects, we do it while setting the symbol
+     table.  */
+  if (strcmp (symname, MMIX_START_SYMBOL_NAME) == 0
+      && bfd_get_start_address (abfd) != addr)
+    {
+      (*_bfd_error_handler)
+	(_("%s: invalid mmo file: initialization value for $255 is not `Main'\n"),
+	 bfd_get_filename (abfd));
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Read in symbols.  */
+
+static bfd_boolean
+mmo_get_symbols (bfd *abfd)
+{
+/*
+INODE
+Symbol-table, mmo section mapping, File layout, mmo
+SUBSECTION
+	Symbol table format
+
+	From mmixal.w (or really, the generated mmixal.tex) in
+	@url{http://www-cs-faculty.stanford.edu/~knuth/programs/mmix.tar.gz}):
+	``Symbols are stored and retrieved by means of a @samp{ternary
+	search trie}, following ideas of Bentley and Sedgewick. (See
+	ACM--SIAM Symp.@: on Discrete Algorithms @samp{8} (1997), 360--369;
+	R.@:Sedgewick, @samp{Algorithms in C} (Reading, Mass.@:
+	Addison--Wesley, 1998), @samp{15.4}.)  Each trie node stores a
+	character, and there are branches to subtries for the cases where
+	a given character is less than, equal to, or greater than the
+	character in the trie.  There also is a pointer to a symbol table
+	entry if a symbol ends at the current node.''
+
+	So it's a tree encoded as a stream of bytes.  The stream of bytes
+	acts on a single virtual global symbol, adding and removing
+	characters and signalling complete symbol points.  Here, we read
+	the stream and create symbols at the completion points.
+
+	First, there's a control byte <<m>>.  If any of the listed bits
+	in <<m>> is nonzero, we execute what stands at the right, in
+	the listed order:
+
+| (MMO3_LEFT)
+| 0x40 - Traverse left trie.
+|        (Read a new command byte and recurse.)
+|
+| (MMO3_SYMBITS)
+| 0x2f - Read the next byte as a character and store it in the
+|        current character position; increment character position.
+|        Test the bits of <<m>>:
+|
+|        (MMO3_WCHAR)
+|        0x80 - The character is 16-bit (so read another byte,
+|               merge into current character.
+|
+|        (MMO3_TYPEBITS)
+|        0xf  - We have a complete symbol; parse the type, value
+|               and serial number and do what should be done
+|               with a symbol.  The type and length information
+|               is in j = (m & 0xf).
+|
+|               (MMO3_REGQUAL_BITS)
+|	        j == 0xf: A register variable.  The following
+|                         byte tells which register.
+|               j <= 8:   An absolute symbol.  Read j bytes as the
+|                         big-endian number the symbol equals.
+|                         A j = 2 with two zero bytes denotes an
+|                         unknown symbol.
+|               j > 8:    As with j <= 8, but add (0x20 << 56)
+|                         to the value in the following j - 8
+|                         bytes.
+|
+|               Then comes the serial number, as a variant of
+|               uleb128, but better named ubeb128:
+|               Read bytes and shift the previous value left 7
+|               (multiply by 128).  Add in the new byte, repeat
+|               until a byte has bit 7 set.  The serial number
+|               is the computed value minus 128.
+|
+|        (MMO3_MIDDLE)
+|        0x20 - Traverse middle trie.  (Read a new command byte
+|               and recurse.)  Decrement character position.
+|
+| (MMO3_RIGHT)
+| 0x10 - Traverse right trie.  (Read a new command byte and
+|        recurse.)
+
+	Let's look again at the <<lop_stab>> for the trivial file
+	(@pxref{File layout}).
+
+| 0x980b0000 - lop_stab for ":Main" = 0, serial 1.
+| 0x203a4040
+| 0x10404020
+| 0x4d206120
+| 0x69016e00
+| 0x81000000
+
+	This forms the trivial trie (note that the path between ``:'' and
+	``M'' is redundant):
+
+| 203a	   ":"
+| 40       /
+| 40      /
+| 10      \
+| 40      /
+| 40     /
+| 204d  "M"
+| 2061  "a"
+| 2069  "i"
+| 016e  "n" is the last character in a full symbol, and
+|       with a value represented in one byte.
+| 00    The value is 0.
+| 81    The serial number is 1.  */
+
+  bfd_byte m = mmo_get_byte (abfd);
+
+  /* Check first if we have a bad hair day.  */
+  if (abfd->tdata.mmo_data->have_error)
+    return FALSE;
+
+  if (m & MMO3_LEFT)
+    /* Traverse left trie. */
+    mmo_get_symbols (abfd);
+
+  if (m & MMO3_SYMBITS)
+    {
+      bfd_byte c = mmo_get_byte (abfd);
+      bfd_byte j = m & MMO3_TYPEBITS;
+      bfd_vma addr = 0;
+      enum mmo_sym_type sym_type;
+      unsigned int serno = 0;
+      bfd_byte k;
+
+      if (m & MMO3_WCHAR)
+	{
+	  bfd_byte c2 = mmo_get_byte (abfd);
+
+	  /* A two-byte character.  We can't grok this, but neither can
+	     mmotype, for other cases than the second byte being zero.  */
+
+	  if (c != 0)
+	    {
+	      abfd->tdata.mmo_data->lop_stab_symbol
+		[abfd->tdata.mmo_data->symbol_position] = 0;
+
+	      (*_bfd_error_handler)
+		(_("%s: unsupported wide character sequence"
+		   " 0x%02X 0x%02X after symbol name starting with `%s'\n"),
+		 bfd_get_filename (abfd), c, c2,
+		 abfd->tdata.mmo_data->lop_stab_symbol);
+	      bfd_set_error (bfd_error_bad_value);
+	      abfd->tdata.mmo_data->have_error = TRUE;
+	      return FALSE;
+	    }
+	  else
+	    c = c2;
+	}
+
+      abfd->tdata.mmo_data->lop_stab_symbol[abfd->tdata.mmo_data->symbol_position++] = c;
+      abfd->tdata.mmo_data->lop_stab_symbol[abfd->tdata.mmo_data->symbol_position] = 0;
+
+      if (j & MMO3_REGQUAL_BITS)
+	{
+	  if (j == MMO3_REGQUAL_BITS)
+	    {
+	      sym_type = mmo_reg_sym;
+	      addr = mmo_get_byte (abfd);
+	    }
+	  else if (j <= 8)
+	    {
+	      unsigned int i;
+
+	      for (i = 0; i < j; i++)
+		addr = (addr << 8) + mmo_get_byte (abfd);
+
+	      if (addr == 0 && j == MMO3_UNDEF)
+		sym_type = mmo_undef_sym;
+	      else
+		sym_type = mmo_abs_sym;
+	    }
+	  else
+	    {
+	      unsigned int i;
+
+	      for (i = MMO3_DATA; i < j; i++)
+		addr = (addr << 8) + mmo_get_byte (abfd);
+
+	      addr += (bfd_vma) 0x20 << 56;
+	      sym_type = mmo_data_sym;
+	    }
+
+	  /* Get the serial number.  */
+	  do
+	    {
+	      k = mmo_get_byte (abfd);
+	      serno = (serno << 7) + k;
+	    }
+	  while (k < 128);
+	  serno -= 128;
+
+	  /* Got it.  Now enter it.  Skip a leading ":".  */
+	  if (! abfd->tdata.mmo_data->have_error
+	      && ! mmo_create_symbol (abfd,
+				      abfd->tdata.mmo_data->lop_stab_symbol
+				      + 1,
+				      addr, sym_type, serno))
+	    abfd->tdata.mmo_data->have_error = TRUE;
+	}
+
+      if (m & MMO3_MIDDLE)
+	/* Traverse middle trie. */
+	mmo_get_symbols (abfd);
+
+      abfd->tdata.mmo_data->symbol_position--;
+    }
+
+  if (m & MMO3_RIGHT)
+    /* Traverse right trie.  */
+    mmo_get_symbols (abfd);
+
+  return ! abfd->tdata.mmo_data->have_error;
+}
+
+/* Get the location of memory area [VMA..VMA + SIZE - 1], which we think
+   is in section SEC.  Adjust and reallocate zero-initialized contents.
+   If there's new contents, allocate to the next multiple of
+   MMO_SEC_CONTENTS_CHUNK_SIZE.  */
+
+static INLINE bfd_byte *
+mmo_get_loc (asection *sec, bfd_vma vma, int size)
+{
+  bfd_size_type allocated_size;
+  struct mmo_section_data_struct *sdatap = mmo_section_data (sec);
+  struct mmo_data_list_struct *datap = sdatap->head;
+  struct mmo_data_list_struct *entry;
+
+  /* First search the list to see if we have the requested chunk in one
+     piece, or perhaps if we have a suitable chunk with room to fit.  */
+  for (; datap != NULL; datap = datap->next)
+    {
+      if (datap->where <= vma
+	  && datap->where + datap->size >= vma + size)
+	return datap->data + vma - datap->where;
+      else if (datap->where <= vma
+	       && datap->where + datap->allocated_size >= vma + size
+	       /* Only munch on the "allocated size" if it does not
+		  overlap the next chunk.  */
+	       && (datap->next == NULL || datap->next->where >= vma + size))
+	{
+	  /* There was room allocated, but the size wasn't set to include
+	     it.  Do that now.  */
+	  datap->size += (vma + size) - (datap->where + datap->size);
+
+	  /* Update the section size.  This happens only if we update the
+	     32-bit-aligned chunk size.  Callers that have
+	     non-32-bit-aligned sections should do all allocation and
+	     size-setting by themselves or at least set the section size
+	     after the last allocating call to this function.  */
+	  if (vma + size > sec->vma + sec->size)
+	    sec->size += (vma + size) - (sec->vma + sec->size);
+
+	  return datap->data + vma - datap->where;
+	}
+    }
+
+  /* Not found; allocate a new block.  First check in case we get a
+     request for a size split up over several blocks; we'll have to return
+     NULL for those cases, requesting the caller to split up the request.
+     Requests with an address aligned on MMO_SEC_CONTENTS_CHUNK_SIZE bytes and
+     for no more than MMO_SEC_CONTENTS_CHUNK_SIZE will always get resolved.  */
+
+  for (datap = sdatap->head; datap != NULL; datap = datap->next)
+    if ((datap->where <= vma && datap->where + datap->size > vma)
+	|| (datap->where < vma + size
+	    && datap->where + datap->size >= vma + size))
+      return NULL;
+
+  allocated_size
+    = (size + MMO_SEC_CONTENTS_CHUNK_SIZE - 1) & ~(MMO_SEC_CONTENTS_CHUNK_SIZE - 1);
+  entry = (mmo_data_list_type *)
+    bfd_zalloc (sec->owner, sizeof (mmo_data_list_type) + allocated_size);
+  if (entry == NULL)
+    return NULL;
+  entry->where = vma;
+  entry->size = size;
+  entry->allocated_size = allocated_size;
+
+  datap = sdatap->head;
+
+  /* Sort the records by address.  Optimize for the common case of adding
+     a record to the end of the list.  */
+  if (sdatap->tail != NULL && entry->where >= sdatap->tail->where)
+    {
+      sdatap->tail->next = entry;
+      entry->next = NULL;
+      sdatap->tail = entry;
+    }
+  else
+    {
+      mmo_data_list_type **look;
+      for (look = &sdatap->head;
+	   *look != NULL && (*look)->where < entry->where;
+	   look = &(*look)->next)
+	;
+      entry->next = *look;
+      *look = entry;
+      if (entry->next == NULL)
+	{
+	  sdatap->tail = entry;
+
+	  /* We get here for the first time (at other times too) for this
+	     section.  Say we have contents.  */
+	  if (! bfd_set_section_flags (sec->owner, sec,
+				       bfd_get_section_flags (sec->owner, sec)
+				       | SEC_HAS_CONTENTS))
+	    return NULL;
+	}
+    }
+
+  /* Update the section size.  This happens only when we add contents and
+     re-size as we go.  The section size will then be aligned to 32 bits.  */
+  if (vma + size > sec->vma + sec->size)
+    sec->size += (vma + size) - (sec->vma + sec->size);
+  return entry->data;
+}
+
+/* Set sizes once we've read in all sections.  */
+
+static void
+mmo_map_set_sizes (bfd *abfd ATTRIBUTE_UNUSED, asection *sec,
+		   void *ignored ATTRIBUTE_UNUSED)
+{
+  sec->lma = sec->vma;
+}
+
+/* Read the mmo file and turn it into sections.  */
+
+static bfd_boolean
+mmo_scan (bfd *abfd)
+{
+  unsigned int i;
+  unsigned int lineno = 1;
+  bfd_boolean error = FALSE;
+  bfd_vma vma = 0;
+  asection *sec = bfd_make_section_old_way (abfd, MMO_TEXT_SECTION_NAME);
+  asection *non_spec_sec = NULL;
+  bfd_vma non_spec_vma = 0;
+  bfd_size_type nbytes_read = 0;
+  /* Buffer with room to read a 64-bit value.  */
+  bfd_byte buf[8];
+  long stab_loc = -1;
+  char *file_names[256];
+
+  memset (file_names, 0, sizeof (file_names));
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    goto error_return;
+
+  while ((nbytes_read = bfd_bread (buf, 4, abfd)) == 4)
+    {
+      if (buf[0] == LOP)
+	{
+	  unsigned int y = bfd_get_8 (abfd, buf + 2);
+	  unsigned int z = bfd_get_8 (abfd, buf + 3);
+
+	  /* Change back to the original section for lopcodes other
+	     than LOP_QUOTE that comes after a LOP_SPEC.  */
+	  if ((buf[1] != LOP_QUOTE || y != 0 || z != 1)
+	      && non_spec_sec != NULL)
+	    {
+	      sec = non_spec_sec;
+	      vma = non_spec_vma;
+	      non_spec_sec = NULL;
+	    }
+
+	  switch (buf[1])
+	    {
+	    default:
+	      (*_bfd_error_handler)
+		(_("%s: invalid mmo file: unsupported lopcode `%d'\n"),
+		 bfd_get_filename (abfd), buf[1]);
+	      bfd_set_error (bfd_error_bad_value);
+	      goto error_return;
+
+	    case LOP_QUOTE:
+	      /* Quote the next 32-bit word.  */
+	      if (y != 0 || z != 1)
+		{
+		  (*_bfd_error_handler)
+		    (_("%s: invalid mmo file: expected YZ = 1 got YZ = %d for lop_quote\n"),
+		     bfd_get_filename (abfd), y*256+z);
+		  bfd_set_error (bfd_error_bad_value);
+		  goto error_return;
+		}
+	      if (bfd_bread (buf, 4, abfd) != 4)
+		goto error_return;
+
+	      mmo_xore_32 (sec, vma, bfd_get_32 (abfd, buf));
+	      vma += 4;
+	      vma &= ~3;
+	      lineno++;
+	      break;
+
+	    case LOP_LOC:
+	      /* Set vma (and section).  */
+	      vma = (bfd_vma) y << 56;
+	      if (z == 1)
+		{
+		  /* Get a 32-bit value.  */
+		  if (bfd_bread (buf, 4, abfd) != 4)
+		    goto error_return;
+
+		  vma += bfd_get_32 (abfd, buf);
+		}
+	      else if (z == 2)
+		{
+		  /* Get a 64-bit value.  */
+		  if (bfd_bread (buf, 8, abfd) != 8)
+		    goto error_return;
+
+		  vma += bfd_get_64 (abfd, buf);
+		}
+	      else
+		{
+		  (*_bfd_error_handler)
+		    (_("%s: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_loc\n"),
+		     bfd_get_filename (abfd), z);
+		  bfd_set_error (bfd_error_bad_value);
+		  goto error_return;
+		}
+
+	      sec = mmo_decide_section (abfd, vma);
+	      if (sec == NULL)
+		goto error_return;
+	      break;
+
+	    case LOP_SKIP:
+	      /* Move forward within the same section.  */
+	      vma += y * 256 + z;
+
+	      sec = mmo_decide_section (abfd, vma);
+	      if (sec == NULL)
+		goto error_return;
+	      break;
+
+	    case LOP_FIXO:
+	      /* A fixup: Store the current vma somewhere.  Position using
+		 same format as LOP_LOC.  */
+	      {
+		bfd_vma p = (bfd_vma) y << 56;
+		asection *fixosec;
+
+		if (z == 1)
+		  {
+		    /* Get a 32-bit value.  */
+		    if (bfd_bread (buf, 4, abfd) != 4)
+		      goto error_return;
+
+		    p += bfd_get_32 (abfd, buf);
+		  }
+		else if (z == 2)
+		  {
+		    /* Get a 64-bit value.  */
+		    if (bfd_bread (buf, 8, abfd) != 8)
+		      goto error_return;
+
+		    p += bfd_get_64 (abfd, buf);
+		  }
+		else
+		  {
+		    (*_bfd_error_handler)
+		      (_("%s: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_fixo\n"),
+		       bfd_get_filename (abfd), z);
+		    bfd_set_error (bfd_error_bad_value);
+		    goto error_return;
+		  }
+
+		/* The section where we store this address might be a
+		   different one than the current section.  */
+		fixosec = mmo_decide_section (abfd, p);
+		if (fixosec == NULL)
+		  goto error_return;
+		mmo_xore_64 (fixosec, p, vma);
+	      }
+	    break;
+
+	    case LOP_FIXR:
+	      /* A fixup: Store YZ of this lopcode into YZ at vma - 4 * yz.  */
+	      {
+		unsigned int yz = (y * 256 + z);
+		bfd_vma p = vma + 2 - 4 * yz;
+		asection *fixrsec = mmo_decide_section (abfd, p);
+		if (fixrsec == NULL)
+		  goto error_return;
+		mmo_xore_16 (fixrsec, p, yz);
+	      }
+	    break;
+
+	    case LOP_FIXRX:
+	      /* A fixup, similar to lop_fixr, but taking larger numbers
+		 and can change branches into the opposite direction
+		 (gasp!).  */
+	      {
+		bfd_vma delta;
+		bfd_vma p;
+		asection *fixrsec;
+
+		if (y != 0)
+		  {
+		    (*_bfd_error_handler)
+		      (_("%s: invalid mmo file: expected y = 0, got y = %d for lop_fixrx\n"),
+		       bfd_get_filename (abfd), y);
+		    bfd_set_error (bfd_error_bad_value);
+		    goto error_return;
+		  }
+
+		if (z != 16 && z != 24)
+		  {
+		    (*_bfd_error_handler)
+		      (_("%s: invalid mmo file: expected z = 16 or z = 24, got z = %d for lop_fixrx\n"),
+		       bfd_get_filename (abfd), z);
+		    bfd_set_error (bfd_error_bad_value);
+		    goto error_return;
+		  }
+
+		/* Get the next 32-bit value.  */
+		if (bfd_bread (buf, 4, abfd) != 4)
+		  goto error_return;
+
+		delta = bfd_get_32 (abfd, buf);
+
+		/* Do an, ehm, involved calculation for the location of
+		   the fixup.  See mmixal documentation for a verbose
+		   explanation.  We follow it verbosely here for the
+		   readers delight.  */
+		if (buf[0] == 0)
+		  p = vma - 4 * delta;
+		else if (buf[0] == 1)
+		  p = vma - 4 * ((delta & 0xffffff) - (1 << z));
+		else
+		  {
+		    (*_bfd_error_handler)
+		      (_("%s: invalid mmo file: leading byte of operand word must be 0 or 1, got %d for lop_fixrx\n"),
+		       bfd_get_filename (abfd), buf[0]);
+		    bfd_set_error (bfd_error_bad_value);
+		    goto error_return;
+		  }
+
+		fixrsec = mmo_decide_section (abfd, vma);
+		if (fixrsec == NULL)
+		  goto error_return;
+		mmo_xore_32 (fixrsec, p, delta);
+	      }
+	    break;
+
+	    case LOP_FILE:
+	      /* Set current file and perhaps the file name.  Reset line
+		 number.  */
+	      if (z != 0)
+		{
+		  char *fname = bfd_malloc (z * 4 + 1);
+
+		  if (fname == NULL)
+		    {
+		      (*_bfd_error_handler)
+			(_("%s: cannot allocate file name for file number %d, %d bytes\n"),
+			 bfd_get_filename (abfd), y, z * 4 + 1);
+		      bfd_set_error (bfd_error_system_call);
+		      goto error_return;
+		    }
+
+		  fname[z * 4] = 0;
+
+		  for (i = 0; i < z; i++)
+		    {
+		      if (bfd_bread (fname + i * 4, 4, abfd) != 4)
+			{
+			  free (fname);
+			  goto error_return;
+			}
+		    }
+
+		  if (file_names[y] != NULL)
+		    {
+		      (*_bfd_error_handler)
+			(_("%s: invalid mmo file: file number %d `%s',"
+			   " was already entered as `%s'\n"),
+			 bfd_get_filename (abfd), y, fname, file_names[y]);
+		      bfd_set_error (bfd_error_bad_value);
+		      goto error_return;
+		    }
+
+		  file_names[y] = fname;
+		}
+
+	      if (file_names[y] == NULL)
+		{
+		  (*_bfd_error_handler)
+		    (_("%s: invalid mmo file: file name for number %d"
+		       " was not specified before use\n"),
+		     bfd_get_filename (abfd), y);
+		  bfd_set_error (bfd_error_bad_value);
+		  goto error_return;
+		}
+
+	      lineno = 0;
+	      break;
+
+	    case LOP_LINE:
+	      /* Set line number.  */
+	      lineno = y * 256 + z;
+	      /* FIXME: Create a sequence of mmo-specific line number
+		 entries for each section, then translate into canonical
+		 format.  */
+	      break;
+
+	    case LOP_SPEC:
+	      /* Special data follows until the next non-lop_quote
+		 lopcode.  */
+	      non_spec_sec = sec;
+	      non_spec_vma = vma;
+	      sec = mmo_get_spec_section (abfd, y * 256 + z);
+	      if (sec == NULL)
+		goto error_return;
+
+	      vma = sec->vma;
+	      break;
+
+	    case LOP_PRE:
+	      {
+		/* We ignore header information, except we read in the
+		   creation time from the first 32-bit word with the time
+		   in seconds since era.  */
+		if (z >= 1
+		    && bfd_bread (abfd->tdata.mmo_data->created, 4,
+				 abfd) != 4)
+		  goto error_return;
+
+		for (i = 1; i < z; i++)
+		  if (bfd_bread (buf, 4, abfd) != 4)
+		    goto error_return;
+	      }
+	      break;
+
+	    case LOP_POST:
+	      /* This tells of the contents of registers $Z..$255 at
+		 startup.  We make a section out of it, with VMA = Z * 8,
+		 but only if Z != 255 or the contents is non-zero.  */
+	      {
+		asection *rsec;
+		bfd_byte *loc;
+		bfd_vma first_octa;
+		bfd_vma startaddr_octa;
+
+		/* Read first octaword outside loop to simplify logic when
+		   excluding the Z == 255, octa == 0 case.  */
+		if (bfd_bread (buf, 8, abfd) != 8)
+		  goto error_return;
+
+		first_octa = bfd_get_64 (abfd, buf);
+
+		/* Don't emit contents for the trivial case which is
+		   always present; $255 pointing to Main.  */
+		if (z != 255)
+		  {
+		    rsec
+		      = bfd_make_section_old_way (abfd,
+						  MMIX_REG_CONTENTS_SECTION_NAME);
+		    rsec->flags |= SEC_LINKER_CREATED;
+		    rsec->vma = z * 8;
+		    loc = mmo_get_loc (rsec, z * 8, (255 - z) * 8);
+		    bfd_put_64 (abfd, first_octa, loc);
+
+		    for (i = z + 1; i < 255; i++)
+		      {
+			if (bfd_bread (loc + (i - z) * 8, 8, abfd) != 8)
+			  goto error_return;
+		      }
+
+		    /* Read out the last octabyte, and use it to set the
+		       start address.  */
+		    if (bfd_bread (buf, 8, abfd) != 8)
+		      goto error_return;
+
+		    startaddr_octa = bfd_get_64 (abfd, buf);
+		  }
+		else
+		  startaddr_octa = first_octa;
+
+		if (! bfd_set_start_address (abfd, startaddr_octa))
+		  {
+		    /* Currently this can't fail, but this should handle
+		       future failures.  */
+		    bfd_set_error (bfd_error_bad_value);
+		    goto error_return;
+		  }
+	      }
+	      break;
+
+	    case LOP_STAB:
+	      /* We read in the symbols now, not later.  */
+	      if (y != 0 || z != 0)
+		{
+		  (*_bfd_error_handler)
+		    (_("%s: invalid mmo file: fields y and z of lop_stab"
+		       " non-zero, y: %d, z: %d\n"),
+		     bfd_get_filename (abfd), y, z);
+		  bfd_set_error (bfd_error_bad_value);
+		  goto error_return;
+		}
+
+	      /* Save the location, so we can check that YZ in the LOP_END
+		 is correct.  */
+	      stab_loc = bfd_tell (abfd);
+
+	      /* It's not said that an MMO can be without symbols (though
+		 mmixal will refuse to assemble files without Main), but
+		 it seems it would still be a valid mmo-file, so allow it.
+		 We detect the absence of a symbol area in that the upper
+		 limit is computed (from the lop_end YZ field) as 0.
+		 Don't call mmo_get_symbols; it can only detect the end of
+		 a valid symbol trie, not the absence of one.  */
+	      if (abfd->tdata.mmo_data->max_symbol_length != 0
+		  && ! mmo_get_symbols (abfd))
+		goto error_return;
+	      break;
+
+	    case LOP_END:
+	      {
+		/* This must be the last 32-bit word in an mmo file.
+		   Let's find out.  */
+		struct stat statbuf;
+		file_ptr curpos = bfd_tell (abfd);
+
+		if (bfd_stat (abfd, &statbuf) < 0)
+		  goto error_return;
+
+		if (statbuf.st_size != curpos)
+		  {
+		    (*_bfd_error_handler)
+		      (_("%s: invalid mmo file: lop_end not last item in"
+			 " file\n"),
+		       bfd_get_filename (abfd));
+		    bfd_set_error (bfd_error_bad_value);
+		    goto error_return;
+		  }
+
+		/* Check that the YZ field is right.  Subtract the size of
+		   this LOP_END in the calculation; YZ does not include
+		   it.  */
+		if ((long) (y * 256 + z) * 4 != (curpos - stab_loc) - 4)
+		  {
+		    (*_bfd_error_handler)
+		      (_("%s: invalid mmo file: YZ of lop_end (%ld)"
+			 " not equal to the number of tetras to the preceding"
+			 " lop_stab (%ld)\n"),
+		       bfd_get_filename (abfd), (long) (y * 256 + z),
+		       (curpos - stab_loc - 4)/4);
+		    bfd_set_error (bfd_error_bad_value);
+		    goto error_return;
+		  }
+
+		bfd_map_over_sections (abfd, mmo_map_set_sizes, NULL);
+		goto done;
+	      }
+	    }
+	}
+      else
+	{
+	  /* This wasn't a lopcode, so store it in the current section.  */
+	  mmo_xore_32 (sec, vma & ~3, bfd_get_32 (abfd, buf));
+	  vma += 4;
+	  vma &= ~3;
+	  lineno++;
+	}
+    }
+
+  /* We know this file is a multiple of four bytes (checked in
+     mmo_object_p), so if we got something other than 0, this was a bad
+     file (although it's more likely we'll get 0 in that case too).
+     If we got end-of-file, then there was no lop_stab, so the file has
+     invalid format.  */
+
+  if (nbytes_read != 0)
+    bfd_set_error (bfd_error_system_call);
+  else
+    bfd_set_error (bfd_error_bad_value);
+
+ error_return:
+  error = TRUE;
+ done:
+  /* Mark the .text and .data section with their normal attribute if they
+     contain anything.  This is not redundant wrt. mmo_decide_section,
+     since that code might never execute, and conversely the alloc+code
+     section flags must be set then.  */
+  sec = bfd_get_section_by_name (abfd, MMO_TEXT_SECTION_NAME);
+  if (sec != NULL
+      && (bfd_get_section_flags (abfd, sec) & SEC_HAS_CONTENTS)
+      && ! bfd_set_section_flags (abfd, sec,
+				  bfd_get_section_flags (abfd, sec)
+				  | SEC_ALLOC | SEC_LOAD | SEC_CODE))
+    error = TRUE;
+
+  sec = bfd_get_section_by_name (abfd, MMO_DATA_SECTION_NAME);
+  if (sec != NULL
+      && (bfd_get_section_flags (abfd, sec) & SEC_HAS_CONTENTS)
+      && ! bfd_set_section_flags (abfd, sec,
+				  bfd_get_section_flags (abfd, sec)
+				  | SEC_ALLOC | SEC_LOAD))
+    error = TRUE;
+
+  /* Free whatever resources we took.  */
+  for (i = 0; i < sizeof (file_names) / sizeof (file_names[0]); i++)
+    if (file_names[i])
+      free (file_names[i]);
+  return ! error;
+}
+
+/* A hook to set up object file dependent section information.  For mmo,
+   we point out the shape of allocated section contents.  */
+
+static bfd_boolean
+mmo_new_section_hook (bfd *abfd, asection *newsect)
+{
+  if (!newsect->used_by_bfd)
+    {
+      /* We zero-fill all fields and assume NULL is represented by an all
+	 zero-bit pattern.  */
+      newsect->used_by_bfd
+	= bfd_zalloc (abfd, sizeof (struct mmo_section_data_struct));
+      if (!newsect->used_by_bfd)
+	return FALSE;
+    }
+
+  /* Always align to at least 32-bit words.  */
+  newsect->alignment_power = 2;
+  return _bfd_generic_new_section_hook (abfd, newsect);
+}
+
+/* We already have section contents loaded for sections that have
+   contents.  */
+
+static bfd_boolean
+mmo_get_section_contents (bfd *abfd ATTRIBUTE_UNUSED,
+			  asection *sec,
+			  void * location,
+			  file_ptr offset,
+			  bfd_size_type bytes_to_do)
+{
+  /* Iterate over diminishing chunk sizes, copying contents, like
+     mmo_set_section_contents.  */
+  while (bytes_to_do)
+    {
+      /* A minor song-and-dance to make sure we're not bitten by the
+	 distant possibility of the cast from bfd_vma to int making the
+	 chunk zero-sized.  */
+      int chunk_size
+	= (int) bytes_to_do != 0 ? bytes_to_do : MMO_SEC_CONTENTS_CHUNK_SIZE;
+      bfd_byte *loc;
+
+      do
+	loc = mmo_get_loc (sec, sec->vma + offset, chunk_size);
+      while (loc == NULL && (chunk_size /= 2) != 0);
+
+      if (chunk_size == 0)
+	return FALSE;
+
+      memcpy (location, loc, chunk_size);
+
+      location += chunk_size;
+      bytes_to_do -= chunk_size;
+      offset += chunk_size;
+    }
+  return TRUE;
+}
+
+/* Return the amount of memory needed to read the symbol table.  */
+
+static long
+mmo_get_symtab_upper_bound (bfd *abfd)
+{
+  return (abfd->symcount + 1) * sizeof (asymbol *);
+}
+
+/* Sort mmo symbols by serial number.  */
+
+static int
+mmo_sort_mmo_symbols (const void *arg1, const void *arg2)
+{
+  const struct mmo_symbol *sym1 = *(const struct mmo_symbol **) arg1;
+  const struct mmo_symbol *sym2 = *(const struct mmo_symbol **) arg2;
+
+  /* Sort by serial number first.  */
+  if (sym1->serno < sym2->serno)
+    return -1;
+  else if (sym1->serno > sym2->serno)
+    return 1;
+
+  /* Then sort by address of the table entries.  */
+  return ((const char *) arg1 - (const char *) arg2);
+}
+
+/* Translate the symbol table.  */
+
+static long
+mmo_canonicalize_symtab (bfd *abfd, asymbol **alocation)
+{
+  unsigned int symcount = bfd_get_symcount (abfd);
+  asymbol *csymbols;
+  unsigned int i;
+
+  csymbols = abfd->tdata.mmo_data->csymbols;
+  if (csymbols == NULL && symcount != 0)
+    {
+      asymbol *c;
+      struct mmo_symbol *s;
+      struct mmo_symbol **msp;
+
+      /* First we store the symbols into the table we'll return, then we
+	 qsort it on the serial number, with secondary on the address of
+	 the symbol, to preserve order if there would be non-unique serial
+	 numbers.  */
+      for (s = abfd->tdata.mmo_data->symbols,
+	     msp = (struct mmo_symbol **) alocation;
+	   s != NULL;
+	   s = s->next, ++msp)
+	*msp = s;
+
+      *msp = NULL;
+
+      qsort (alocation, symcount, sizeof (struct mmo_symbol *),
+	     mmo_sort_mmo_symbols);
+
+      csymbols = (asymbol *) bfd_alloc (abfd, symcount * sizeof (asymbol));
+      if (csymbols == NULL)
+	return -1;
+      abfd->tdata.mmo_data->csymbols = csymbols;
+
+      for (msp = (struct mmo_symbol **) alocation, c = csymbols;
+	   *msp != NULL;
+	   msp++, ++c)
+	{
+	  s = *msp;
+	  c->the_bfd = abfd;
+	  c->name = s->name;
+	  c->value = s->value;
+	  c->flags = BSF_GLOBAL;
+
+	  if (s->sym_type == mmo_data_sym)
+	    {
+	      c->section
+		= bfd_get_section_by_name (abfd, MMO_DATA_SECTION_NAME);
+
+	      if (c->section == NULL)
+		c->section = bfd_abs_section_ptr;
+	      else
+		c->value -= c->section->vma;
+	    }
+	  else if (s->sym_type == mmo_undef_sym)
+	    c->section = bfd_und_section_ptr;
+	  else if (s->sym_type == mmo_reg_sym)
+	    {
+	      c->section
+		= bfd_make_section_old_way (abfd, MMIX_REG_SECTION_NAME);
+	      c->section->flags |= SEC_LINKER_CREATED;
+	    }
+	  else
+	    {
+	      asection *textsec
+		= bfd_get_section_by_name (abfd, MMO_TEXT_SECTION_NAME);
+	      asection *datasec;
+
+	      if (textsec != NULL
+		  && c->value >= textsec->vma
+		  && c->value <= textsec->vma + textsec->size)
+		{
+		  c->section = textsec;
+		  c->value -= c->section->vma;
+		}
+	      /* In mmo, symbol types depend on the VMA.  Therefore, if
+		 the data section isn't within the usual bounds, its
+		 symbols are marked as absolute.  Correct that.  This
+		 means we can't have absolute symbols with values matching
+		 data section addresses, but we also can't have with
+		 absolute symbols with values matching text section
+		 addresses.  For such needs, use the ELF format.  */
+	      else if ((datasec
+			= bfd_get_section_by_name (abfd,
+						   MMO_DATA_SECTION_NAME))
+		       != NULL
+		       && c->value >= datasec->vma
+		       && c->value <= datasec->vma + datasec->size)
+		{
+		  c->section = datasec;
+		  c->value -= c->section->vma;
+		}
+	      else
+		c->section = bfd_abs_section_ptr;
+	    }
+
+	  c->udata.p = NULL;
+	}
+    }
+
+  /* Last, overwrite the incoming table with the right-type entries.  */
+  for (i = 0; i < symcount; i++)
+    *alocation++ = csymbols++;
+  *alocation = NULL;
+
+  return symcount;
+}
+
+/* Get information about a symbol.  */
+
+static void
+mmo_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+		     asymbol *symbol, symbol_info *ret)
+{
+  bfd_symbol_info (symbol, ret);
+}
+
+static void
+mmo_print_symbol (bfd *abfd, void *afile, asymbol *symbol,
+		  bfd_print_symbol_type how)
+{
+  FILE *file = (FILE *) afile;
+
+  switch (how)
+    {
+    case bfd_print_symbol_name:
+      fprintf (file, "%s", symbol->name);
+      break;
+    default:
+      bfd_print_symbol_vandf (abfd, file, symbol);
+
+      fprintf (file, " %-5s %s",
+	       symbol->section->name,
+	       symbol->name);
+    }
+}
+
+/* We can't map a file directly into executable code, so the
+   size of header information is irrelevant.  */
+
+static int
+mmo_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+		    struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+/* Write the (section-neutral) file preamble.  */
+
+static bfd_boolean
+mmo_internal_write_header (bfd *abfd)
+{
+  const char lop_pre_bfd[] = { LOP, LOP_PRE, 1, 1};
+
+  if (bfd_bwrite (lop_pre_bfd, 4, abfd) != 4)
+    return FALSE;
+
+  /* Copy creation time of original file.  */
+  if (bfd_bwrite (abfd->tdata.mmo_data->created, 4, abfd) != 4)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Write the LOP_POST record, with global register initializations.
+   Z is the Z field of the LOP_POST, corresponding to 255 - number of
+   registers at DATA.  The Z = 255 field is filled in with the
+   start-address.  */
+
+static bfd_boolean
+mmo_internal_write_post (bfd *abfd, int z, asection *sec)
+{
+  int i;
+  bfd_byte buf[8];
+  mmo_write_tetra_raw (abfd, (LOP << 24) | (LOP_POST << 16) | z);
+
+  for (i = z; i < 255; i++)
+    {
+      bfd_byte *data = mmo_get_loc (sec, i * 8, 8);
+
+      if (bfd_bwrite (data, 8, abfd) != 8)
+	return FALSE;
+    }
+
+  /* For Z == $255, we always emit the start location; supposedly Main,
+     but we have it handy at bfd_get_start_address.  If we're called with
+     Z == 255, don't assume DATA is valid.  */
+  bfd_put_64 (abfd, bfd_get_start_address (abfd), buf);
+
+  return ! abfd->tdata.mmo_data->have_error && bfd_bwrite (buf, 8, abfd) == 8;
+}
+
+/* Translate to and from BFD flags.  This is to make sure that we don't
+   get bitten by BFD flag number changes.  */
+
+static flagword
+mmo_sec_flags_from_bfd_flags (flagword flags)
+{
+  flagword oflags = 0;
+
+  if (flags & SEC_ALLOC)
+    oflags |= MMO_SEC_ALLOC;
+  if (flags & SEC_LOAD)
+    oflags |= MMO_SEC_LOAD;
+  if (flags & SEC_RELOC)
+    oflags |= MMO_SEC_RELOC;
+  if (flags & SEC_READONLY)
+    oflags |= MMO_SEC_READONLY;
+  if (flags & SEC_CODE)
+    oflags |= MMO_SEC_CODE;
+  if (flags & SEC_DATA)
+    oflags |= MMO_SEC_DATA;
+  if (flags & SEC_NEVER_LOAD)
+    oflags |= MMO_SEC_NEVER_LOAD;
+  if (flags & SEC_IS_COMMON)
+    oflags |= MMO_SEC_IS_COMMON;
+  if (flags & SEC_DEBUGGING)
+    oflags |= MMO_SEC_DEBUGGING;
+
+  return oflags;
+}
+
+static flagword
+bfd_sec_flags_from_mmo_flags (flagword flags)
+{
+  flagword oflags = 0;
+
+  if (flags & MMO_SEC_ALLOC)
+    oflags |= SEC_ALLOC;
+  if (flags & MMO_SEC_LOAD)
+    oflags |= SEC_LOAD;
+  if (flags & MMO_SEC_RELOC)
+    oflags |= SEC_RELOC;
+  if (flags & MMO_SEC_READONLY)
+    oflags |= SEC_READONLY;
+  if (flags & MMO_SEC_CODE)
+    oflags |= SEC_CODE;
+  if (flags & MMO_SEC_DATA)
+    oflags |= SEC_DATA;
+  if (flags & MMO_SEC_NEVER_LOAD)
+    oflags |= SEC_NEVER_LOAD;
+  if (flags & MMO_SEC_IS_COMMON)
+    oflags |= SEC_IS_COMMON;
+  if (flags & MMO_SEC_DEBUGGING)
+    oflags |= SEC_DEBUGGING;
+
+  return oflags;
+}
+
+/* Return TRUE iff the leading or trailing tetrabyte in SEC is defined and
+   is 0.  */
+
+static bfd_boolean
+mmo_has_leading_or_trailing_zero_tetra_p (bfd *abfd, asection *sec)
+{
+  bfd_vma secaddr = bfd_get_section_vma (abfd, sec);
+
+  if (sec->size < 4)
+    return FALSE;
+
+  if (bfd_get_32 (abfd, mmo_get_loc (sec, secaddr, 4)) == 0
+      && bfd_get_32 (abfd,
+		     mmo_get_loc (sec, secaddr + sec->size - 4, 4)) == 0)
+    return TRUE;
+
+  return FALSE;
+}
+
+/* Write a section.  */
+
+static bfd_boolean
+mmo_internal_write_section (bfd *abfd, asection *sec)
+{
+  /* We do it differently depending on what section this is:
+
+   ".text": Output, prepended by information about the first source file
+   (not yet implemented.)
+
+   ".data": Output.
+
+   (".MMIX.reg_contents": Not handled here.)
+
+   Anything else: Output inside a lop_spec 80, in the format described
+   above.  */
+
+  if (strcmp (sec->name, MMO_TEXT_SECTION_NAME) == 0)
+    {
+      bfd_vma secaddr = bfd_get_section_vma (abfd, sec);
+
+      /* Because leading and trailing zeros are omitted in output, we need to
+	 specify the section boundaries so they're correct when the file
+	 is read in again.  That's also the case if this section is
+	 specified as not within its usual boundaries or alignments.  */
+      if (sec->size != 0
+	  && (secaddr + sec->size >= (bfd_vma) 1 << 56
+	      || (secaddr & 3) != 0
+	      || (sec->size & 3) != 0
+	      || mmo_has_leading_or_trailing_zero_tetra_p (abfd, sec)))
+	{
+	  if (!mmo_write_section_description (abfd, sec))
+	    return FALSE;
+	}
+
+      /* FIXME: Output source file name and line number.  */
+      return mmo_write_loc_chunk_list (abfd, mmo_section_data (sec)->head);
+    }
+  else if (strcmp (sec->name, MMO_DATA_SECTION_NAME) == 0)
+    {
+      bfd_vma secaddr = bfd_get_section_vma (abfd, sec);
+
+      /* Same goes as for MMO_TEXT_SECTION_NAME above.  */
+      if (sec->size != 0
+	  && (secaddr < (bfd_vma) 0x20 << 56
+	      || secaddr + sec->size >= (bfd_vma) 0x21 << 56
+	      || (secaddr & 3) != 0
+	      || (sec->size & 3) != 0
+	      || mmo_has_leading_or_trailing_zero_tetra_p (abfd, sec)))
+	{
+	  if (!mmo_write_section_description (abfd, sec))
+	    return FALSE;
+	}
+
+      return mmo_write_loc_chunk_list (abfd, mmo_section_data (sec)->head);
+    }
+  else if (strcmp (sec->name, MMIX_REG_CONTENTS_SECTION_NAME) == 0)
+    /* Not handled here.  */
+    {
+      /* This would normally be an abort call since this can't happen, but
+         we don't do that.  */
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+  else if (CONST_STRNEQ (sec->name, MMIX_OTHER_SPEC_SECTION_PREFIX))
+    {
+      int n = atoi (sec->name + strlen (MMIX_OTHER_SPEC_SECTION_PREFIX));
+
+      mmo_write_tetra_raw (abfd, (LOP << 24) | (LOP_SPEC << 16) | n);
+      return (! abfd->tdata.mmo_data->have_error
+	      && mmo_write_chunk_list (abfd, mmo_section_data (sec)->head));
+    }
+  /* Ignore sections that are just allocated or empty; we write out
+     _contents_ here.  */
+  else if ((bfd_get_section_flags (abfd, sec) & SEC_HAS_CONTENTS) != 0
+	   && sec->size != 0)
+    {
+      if (!mmo_write_section_description (abfd, sec))
+	return FALSE;
+
+      /* Writing a LOP_LOC ends the LOP_SPEC data, and makes data actually
+	 loaded.  */
+      if (bfd_get_section_flags (abfd, sec) & SEC_LOAD)
+	return (! abfd->tdata.mmo_data->have_error
+		&& mmo_write_loc_chunk_list (abfd,
+					 mmo_section_data (sec)->head));
+      return (! abfd->tdata.mmo_data->have_error
+	      && mmo_write_chunk_list (abfd, mmo_section_data (sec)->head));
+    }
+
+  /* Some section without contents.  */
+  return TRUE;
+}
+
+/* Write the description of a section, extended-mmo-style.  */
+
+static bfd_boolean
+mmo_write_section_description (bfd *abfd, asection *sec)
+{
+  /* Keep the following document-comment formatted the way it is.  */
+/*
+INODE
+mmo section mapping, , Symbol-table, mmo
+SUBSECTION
+	mmo section mapping
+
+	The implementation in BFD uses special data type 80 (decimal) to
+	encapsulate and describe named sections, containing e.g.@: debug
+	information.  If needed, any datum in the encapsulation will be
+	quoted using lop_quote.  First comes a 32-bit word holding the
+	number of 32-bit words containing the zero-terminated zero-padded
+	segment name.  After the name there's a 32-bit word holding flags
+	describing the section type.  Then comes a 64-bit big-endian word
+	with the section length (in bytes), then another with the section
+	start address.  Depending on the type of section, the contents
+	might follow, zero-padded to 32-bit boundary.  For a loadable
+	section (such as data or code), the contents might follow at some
+	later point, not necessarily immediately, as a lop_loc with the
+	same start address as in the section description, followed by the
+	contents.  This in effect forms a descriptor that must be emitted
+	before the actual contents.  Sections described this way must not
+	overlap.
+
+	For areas that don't have such descriptors, synthetic sections are
+	formed by BFD.  Consecutive contents in the two memory areas
+	@samp{0x0000@dots{}00} to @samp{0x01ff@dots{}ff} and
+	@samp{0x2000@dots{}00} to @samp{0x20ff@dots{}ff} are entered in
+	sections named <<.text>> and <<.data>> respectively.  If an area
+	is not otherwise described, but would together with a neighboring
+	lower area be less than @samp{0x40000000} bytes long, it is joined
+	with the lower area and the gap is zero-filled.  For other cases,
+	a new section is formed, named <<.MMIX.sec.@var{n}>>.  Here,
+	@var{n} is a number, a running count through the mmo file,
+	starting at 0.
+
+EXAMPLE
+	A loadable section specified as:
+
+| .section secname,"ax"
+| TETRA 1,2,3,4,-1,-2009
+| BYTE 80
+
+	and linked to address @samp{0x4}, is represented by the sequence:
+
+| 0x98080050 - lop_spec 80
+| 0x00000002 - two 32-bit words for the section name
+| 0x7365636e - "secn"
+| 0x616d6500 - "ame\0"
+| 0x00000033 - flags CODE, READONLY, LOAD, ALLOC
+| 0x00000000 - high 32 bits of section length
+| 0x0000001c - section length is 28 bytes; 6 * 4 + 1 + alignment to 32 bits
+| 0x00000000 - high 32 bits of section address
+| 0x00000004 - section address is 4
+| 0x98010002 - 64 bits with address of following data
+| 0x00000000 - high 32 bits of address
+| 0x00000004 - low 32 bits: data starts at address 4
+| 0x00000001 - 1
+| 0x00000002 - 2
+| 0x00000003 - 3
+| 0x00000004 - 4
+| 0xffffffff - -1
+| 0xfffff827 - -2009
+| 0x50000000 - 80 as a byte, padded with zeros.
+
+	Note that the lop_spec wrapping does not include the section
+	contents.  Compare this to a non-loaded section specified as:
+
+| .section thirdsec
+| TETRA 200001,100002
+| BYTE 38,40
+
+	This, when linked to address @samp{0x200000000000001c}, is
+	represented by:
+
+| 0x98080050 - lop_spec 80
+| 0x00000002 - two 32-bit words for the section name
+| 0x7365636e - "thir"
+| 0x616d6500 - "dsec"
+| 0x00000010 - flag READONLY
+| 0x00000000 - high 32 bits of section length
+| 0x0000000c - section length is 12 bytes; 2 * 4 + 2 + alignment to 32 bits
+| 0x20000000 - high 32 bits of address
+| 0x0000001c - low 32 bits of address 0x200000000000001c
+| 0x00030d41 - 200001
+| 0x000186a2 - 100002
+| 0x26280000 - 38, 40 as bytes, padded with zeros
+
+	For the latter example, the section contents must not be
+	loaded in memory, and is therefore specified as part of the
+	special data.  The address is usually unimportant but might
+	provide information for e.g.@: the DWARF 2 debugging format.  */
+
+  mmo_write_tetra_raw (abfd, LOP_SPEC_SECTION);
+  mmo_write_tetra (abfd, (strlen (sec->name) + 3) / 4);
+  mmo_write_chunk (abfd, (bfd_byte *) sec->name, strlen (sec->name));
+  mmo_flush_chunk (abfd);
+  /* FIXME: We can get debug sections (.debug_line & Co.) with a section
+     flag still having SEC_RELOC set.  Investigate.  This might be true
+     for all alien sections; perhaps mmo.em should clear that flag.  Might
+     be related to weak references.  */
+  mmo_write_tetra (abfd,
+		   mmo_sec_flags_from_bfd_flags
+		   (bfd_get_section_flags (abfd, sec)));
+  mmo_write_octa (abfd, sec->size);
+  mmo_write_octa (abfd, bfd_get_section_vma (abfd, sec));
+  return TRUE;
+}
+
+/* We save up all data before output.  */
+
+static bfd_boolean
+mmo_set_section_contents (bfd *abfd ATTRIBUTE_UNUSED, sec_ptr sec,
+			  const void *location, file_ptr offset,
+			  bfd_size_type bytes_to_do)
+{
+  /* Iterate over diminishing chunk sizes, copying contents.  */
+  while (bytes_to_do)
+    {
+      /* A minor song-and-dance to make sure we're not bitten by the
+	 distant possibility of the cast from bfd_vma to int making the
+	 chunk zero-sized.  */
+      int chunk_size
+	= (int) bytes_to_do != 0 ? bytes_to_do : MMO_SEC_CONTENTS_CHUNK_SIZE;
+      bfd_byte *loc;
+
+      do
+	loc = mmo_get_loc (sec, sec->vma + offset, chunk_size);
+      while (loc == NULL && (chunk_size /= 2) != 0);
+
+      if (chunk_size == 0)
+	return FALSE;
+
+      memcpy (loc, location, chunk_size);
+
+      location += chunk_size;
+      bytes_to_do -= chunk_size;
+      offset += chunk_size;
+    }
+  return TRUE;
+}
+
+/* Add a symbol to a trie-tree.  */
+
+static bfd_boolean
+mmo_internal_add_3_sym (bfd *abfd, struct mmo_symbol_trie *rootp,
+			const struct mmo_symbol *symp)
+{
+  const char *name = symp->name;
+  struct mmo_symbol_trie *trie = rootp;
+  struct mmo_symbol_trie **triep = NULL;
+
+  while (*name && trie != NULL)
+    {
+      if (*name < trie->symchar)
+	{
+	  triep = &trie->left;
+	  trie = trie->left;
+	}
+      else if (*name > trie->symchar)
+	{
+	  triep = &trie->right;
+	  trie = trie->right;
+	}
+      else if (*name == trie->symchar)
+	{
+	  triep = &trie->middle;
+	  name++;
+
+	  /* Make sure "trie" points to where we should fill in the
+	     current symbol whenever we've iterated through "name".  We
+	     would lose the right position if we encounter "foobar" then
+	     "foo".  */
+	  if (*name)
+	    trie = trie->middle;
+	}
+    }
+
+  while (*name != 0)
+    {
+      /* Create middle branches for the rest of the characters.  */
+      trie = bfd_zalloc (abfd, sizeof (struct mmo_symbol_trie));
+      *triep = trie;
+      trie->symchar = *name++;
+      triep = &trie->middle;
+    }
+
+  /* We discover a duplicate symbol rather late in the process, but still;
+     we discover it and bail out.  */
+  if (trie->sym.name != NULL)
+    {
+      (*_bfd_error_handler)
+	(_("%s: invalid symbol table: duplicate symbol `%s'\n"),
+	 bfd_get_filename (abfd), trie->sym.name);
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  memcpy (&trie->sym, symp, sizeof *symp);
+  return TRUE;
+}
+
+/* Find out the length of the serialized version of a trie in bytes.  */
+
+static unsigned int
+mmo_internal_3_length (bfd *abfd, struct mmo_symbol_trie *trie)
+{
+  /* First, one for the control byte.  */
+  unsigned int length = 1;
+
+  if (trie == NULL)
+    return 0;
+
+  /* Add in the recursion to the left.  */
+  length += mmo_internal_3_length (abfd, trie->left);
+
+  /* Add in the middle trie and the character.  */
+  length += 1 + mmo_internal_3_length (abfd, trie->middle);
+
+  /* Add in the recursion to the right.  */
+  length += mmo_internal_3_length (abfd, trie->right);
+
+  /* Add in bytes for the symbol (if this is an endnode). */
+  if (trie->sym.name != NULL)
+    {
+      unsigned int serno = trie->sym.serno;
+
+      /* First what it takes to encode the value. */
+      if (trie->sym.sym_type == mmo_reg_sym)
+	length++;
+      else if (trie->sym.sym_type == mmo_undef_sym)
+	length += 2;
+      else
+	{
+	  bfd_vma value = trie->sym.value;
+
+	  /* Coded in one to eight following bytes.  */
+	  if (trie->sym.sym_type == mmo_data_sym)
+	    value -= (bfd_vma) 0x20 << 56;
+
+	  do
+	    {
+	      value >>= 8;
+	      length++;
+	    }
+	  while (value != 0);
+	}
+
+      /* Find out what it takes to encode the serial number.  */
+      do
+	{
+	  serno >>= 7;
+	  length++;
+	}
+      while (serno != 0);
+    }
+
+  return length;
+}
+
+/* Helper function for outputting the serial number of a symbol, output as
+   a variant of leb128 (see dwarf2 documentation) which could be called
+   beb128.  Using a helper function and recursion simplifies debugging.  */
+
+static void
+mmo_beb128_out (bfd *abfd, int serno, int marker)
+{
+  if (serno & ~0x7f)
+    mmo_beb128_out (abfd, serno >> 7, 0);
+  mmo_write_byte (abfd, marker | (serno & 0x7f));
+}
+
+/* Serialize a trie.  */
+
+static void
+mmo_internal_3_dump (bfd *abfd, struct mmo_symbol_trie *trie)
+{
+  bfd_byte control = 0;
+
+  if (trie == NULL)
+    return;
+
+  if (trie->left)
+    control |= MMO3_LEFT;
+
+  if (trie->middle)
+    control |= MMO3_MIDDLE;
+
+  if (trie->right)
+    control |= MMO3_RIGHT;
+
+  if (trie->sym.name != NULL)
+    {
+      /* Encode the symbol type and length of value bytes.  */
+      if (trie->sym.sym_type == mmo_reg_sym)
+	control |= MMO3_REGQUAL_BITS;
+      else if (trie->sym.sym_type == mmo_undef_sym)
+	control |= MMO3_UNDEF;
+      else
+	{
+	  bfd_vma value = trie->sym.value;
+
+	  /* Coded in 1..8 following bytes.  */
+	  if (trie->sym.sym_type == mmo_data_sym)
+	    {
+	      control |= MMO3_DATA;
+	      value -= (bfd_vma) 0x20 << 56;
+	    }
+
+	  do
+	    {
+	      value >>= 8;
+	      control++;
+	    }
+	  while (value != 0);
+	}
+    }
+
+  /* The control byte is output before recursing.  */
+  mmo_write_byte (abfd, control);
+
+  mmo_internal_3_dump (abfd, trie->left);
+
+  if (control & MMO3_SYMBITS)
+    {
+      mmo_write_byte (abfd, trie->symchar);
+
+      if (trie->sym.name != NULL)
+	{
+	  if (trie->sym.sym_type == mmo_reg_sym)
+	    mmo_write_byte (abfd, trie->sym.value);
+	  else if (trie->sym.sym_type == mmo_undef_sym)
+	    {
+	      mmo_write_byte (abfd, 0);
+	      mmo_write_byte (abfd, 0);
+	    }
+	  else
+	    {
+	      bfd_vma value = trie->sym.value;
+
+	      bfd_byte byte_n = control & 15;
+
+	      /* Coded in 1..8 following bytes.  Note that the value is
+		 shifted out big-endian.  */
+	      if (trie->sym.sym_type == mmo_data_sym)
+		{
+		  value -= (bfd_vma) 0x20 << 56;
+		  byte_n -= 8;
+		}
+
+	      do
+		{
+		  mmo_write_byte (abfd, (value >> ((byte_n - 1) * 8)) & 0xff);
+		  byte_n--;
+		}
+	      while (byte_n != 0);
+	    }
+
+	  mmo_beb128_out (abfd, trie->sym.serno, 128);
+	}
+      mmo_internal_3_dump (abfd, trie->middle);
+    }
+  mmo_internal_3_dump (abfd, trie->right);
+}
+
+/* Write symbols in mmo format.  Also write the lop_end terminator.  */
+
+static bfd_boolean
+mmo_write_symbols_and_terminator (bfd *abfd)
+{
+  int count = bfd_get_symcount (abfd);
+  asymbol **table;
+  asymbol **orig_table = bfd_get_outsymbols (abfd);
+  int serno;
+  struct mmo_symbol_trie root;
+  int trie_len;
+  int i;
+  bfd_byte buf[4];
+
+  /* Create a symbol for "Main".  */
+  asymbol *fakemain = bfd_make_empty_symbol (abfd);
+
+  fakemain->flags = BSF_GLOBAL;
+  fakemain->value = bfd_get_start_address (abfd);
+  fakemain->name = MMIX_START_SYMBOL_NAME;
+  fakemain->section = bfd_abs_section_ptr;
+
+  memset (&root, 0, sizeof (root));
+
+  /* Make all symbols take a left turn.  */
+  root.symchar = 0xff;
+
+  /* There must always be a ":Main", so we'll add one if there are no
+     symbols.  Make sure we have room for it.  */
+  table = bfd_alloc (abfd, (count + 1) * sizeof (asymbol *));
+  if (table == NULL)
+    return FALSE;
+
+  memcpy (table, orig_table, count * sizeof (asymbol *));
+
+  /* Move :Main (if there is one) to the first position.  This is
+     necessary to get the same layout of the trie-tree when linking as
+     when objcopying the result as in the objcopy.exp test "simple objcopy
+     of executable".  It also automatically takes care of assigning serial
+     number 1 to :Main (as is mandatory).  */
+  for (i = 0; i < count; i++)
+    if (table[i] != NULL
+	&& strcmp (table[i]->name, MMIX_START_SYMBOL_NAME) == 0
+	&& (table[i]->flags & (BSF_DEBUGGING|BSF_GLOBAL)) == BSF_GLOBAL)
+      {
+	asymbol *mainsym = table[i];
+	memcpy (table + 1, orig_table, i * sizeof (asymbol *));
+	table[0] = mainsym;
+
+	/* Check that the value assigned to :Main is the same as the entry
+	   address.  The default linker script asserts this.  This is as
+	   good a place as any to check this consistency. */
+	if ((mainsym->value
+	     + mainsym->section->output_section->vma
+	     + mainsym->section->output_offset)
+	    != bfd_get_start_address (abfd))
+	  {
+	    /* Arbitrary buffer to hold the printable representation of a
+	       vma.  */
+	    char vmas_main[40];
+	    char vmas_start[40];
+	    bfd_vma vma_start = bfd_get_start_address (abfd);
+
+	    sprintf_vma (vmas_main, mainsym->value);
+	    sprintf_vma (vmas_start, vma_start);
+
+	    (*_bfd_error_handler)
+	      (_("%s: Bad symbol definition: `Main' set to %s rather"
+		 " than the start address %s\n"),
+	       bfd_get_filename (abfd), vmas_main, vmas_start);
+	    bfd_set_error (bfd_error_bad_value);
+	    return FALSE;
+	  }
+	break;
+      }
+  if (i == count && count != 0)
+    {
+      /* When there are symbols, there must be a :Main.  There was no
+	 :Main, so we need to add it manually.  */
+      memcpy (table + 1, orig_table, count * sizeof (asymbol *));
+      table[0] = fakemain;
+      count++;
+    }
+
+  for (i = 0, serno = 1; i < count && table[i] != NULL; i++)
+    {
+      asymbol *s = table[i];
+
+      /* It's not enough to consult bfd_is_local_label, since it does not
+	 mean "local" in the sense of linkable-and-observable-after-link.
+	 Let's just check the BSF_GLOBAL flag.
+
+	 Also, don't export symbols with characters not in the allowed set.  */
+      if ((s->flags & (BSF_DEBUGGING|BSF_GLOBAL)) == BSF_GLOBAL
+	  && strspn (s->name,
+		     valid_mmo_symbol_character_set) == strlen (s->name))
+	{
+	  struct mmo_symbol sym;
+	  memset (&sym, 0, sizeof (sym));
+
+	  /* Need to strip const here; strdup:ing would leak and the
+	     existing string must be safe to reuse.  */
+	  sym.name = (char *) s->name;
+	  sym.value =
+	    s->value
+	    + s->section->output_section->vma
+	    + s->section->output_offset;
+
+	  if (bfd_is_und_section (s->section))
+	    sym.sym_type = mmo_undef_sym;
+	  else if (strcmp (s->section->name, MMO_DATA_SECTION_NAME) == 0
+		   /* The encoding of data symbols require that the "rest"
+		      of the value fits in 6 bytes, so the upper two bytes
+		      must be 0x2000.  All other symbols get to be the
+		      absolute type.  */
+		   && (sym.value >> 48) == 0x2000)
+	    sym.sym_type = mmo_data_sym;
+	  else if (strcmp (s->section->name, MMIX_REG_SECTION_NAME) == 0)
+	    sym.sym_type = mmo_reg_sym;
+	  else if (strcmp (s->section->name,
+			   MMIX_REG_CONTENTS_SECTION_NAME) == 0)
+	    {
+	      sym.sym_type = mmo_reg_sym;
+	      sym.value /= 8;
+	    }
+	  else
+	    sym.sym_type = mmo_abs_sym;
+
+	  /* FIXME: We assume the order of the received symbols is an
+	     ordered mapping of the serial numbers.  This is not
+	     necessarily true if we e.g. objcopy a mmo file to another and
+	     there are gaps in the numbering.  Not sure if this can
+	     happen.  Not sure what to do.  */
+	  sym.serno = serno++;
+
+	  if (! mmo_internal_add_3_sym (abfd, &root, &sym))
+	    return FALSE;
+	}
+    }
+
+  /* Change the root node to be a ":"-prefix.  */
+  root.symchar = ':';
+  root.middle = root.left;
+  root.right = NULL;
+  root.left = NULL;
+
+  /* We have to find out if we can fit the whole symbol table in the mmo
+     symtab.  It would be bad to assume we can always fit it in 262144
+     bytes.  If we can't, just leave the Main symbol.  */
+  trie_len = (mmo_internal_3_length (abfd, &root) + 3)/4;
+
+  if (trie_len > 0xffff)
+    {
+      /* Test this code by using a lower limit in the test above and check
+	 that the single "Main" symbol is emitted and handled properly.
+	 There's no specific test-case.  */
+      struct mmo_symbol sym;
+
+      (*_bfd_error_handler)
+	(_("%s: warning: symbol table too large for mmo, larger than 65535"
+	   " 32-bit words: %d.  Only `Main' will be emitted.\n"),
+	 bfd_get_filename (abfd), trie_len);
+
+      memset (&sym, 0, sizeof (sym));
+      sym.sym_type = mmo_abs_sym;
+      sym.name = MMIX_START_SYMBOL_NAME;
+      sym.serno = 1;
+      sym.value = bfd_get_start_address (abfd);
+
+      /* Then patch up a symbol table to be just the ":Main" symbol.  */
+      memset (&root, 0, sizeof (root));
+      root.left = root.middle;
+      root.symchar = 0xff;
+      root.middle = NULL;
+      root.right = NULL;
+
+      if (! mmo_internal_add_3_sym (abfd, &root, &sym))
+	return FALSE;
+
+      root.symchar = ':';
+      root.middle = root.left;
+      root.right = NULL;
+      root.left = NULL;
+
+      trie_len = (mmo_internal_3_length (abfd, &root) + 3)/4;
+    }
+
+  /* Reset the written-bytes counter.  */
+  abfd->tdata.mmo_data->byte_no = 0;
+
+  /* Put out the lop_stab mark.  */
+  bfd_put_32 (abfd, (LOP << 24) | (LOP_STAB << 16), buf);
+  if (bfd_bwrite (buf, 4, abfd) != 4)
+    return FALSE;
+
+  /* Dump out symbols.  */
+  mmo_internal_3_dump (abfd, &root);
+
+  if (trie_len != (abfd->tdata.mmo_data->byte_no + 3)/4)
+    {
+      /* I haven't seen this trig.  It seems no use claiming this case
+	 isn't debugged and abort if we get here.  Instead emit a
+	 diagnostic and fail "normally".  */
+      (*_bfd_error_handler)
+	(_("%s: internal error, symbol table changed size from %d to %d"
+	   " words\n"),
+	 bfd_get_filename (abfd), trie_len,
+	 (abfd->tdata.mmo_data->byte_no + 3)/4);
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  /* Dump out remaining bytes in the buffer and handle I/O errors by
+     propagating errors.  */
+  if ((abfd->tdata.mmo_data->byte_no % 4) != 0
+      || abfd->tdata.mmo_data->have_error)
+    {
+      memset (abfd->tdata.mmo_data->buf + (abfd->tdata.mmo_data->byte_no % 4),
+	      0, 4 - (abfd->tdata.mmo_data->byte_no % 4));
+
+      if (abfd->tdata.mmo_data->have_error
+	  || bfd_bwrite (abfd->tdata.mmo_data->buf, 4, abfd) != 4)
+	return FALSE;
+    }
+
+  bfd_put_32 (abfd, (LOP << 24) | (LOP_END << 16) | trie_len, buf);
+  return bfd_bwrite (buf, 4, abfd) == 4;
+}
+
+/* Write section unless it is the register contents section.  For that, we
+   instead store the section in the supplied pointer.  This function is
+   used through bfd_map_over_sections.  */
+
+static void
+mmo_write_section_unless_reg_contents (bfd *abfd, asection *sec, void *p)
+{
+  struct mmo_write_sec_info *infop = (struct mmo_write_sec_info *) p;
+
+  if (! infop->retval)
+    return;
+
+  if (strcmp (sec->name, MMIX_REG_CONTENTS_SECTION_NAME) == 0)
+    {
+      infop->reg_section = sec;
+      return;
+    }
+
+  /* Exclude the convenience register section.  */
+  if (strcmp (sec->name, MMIX_REG_SECTION_NAME) == 0)
+    {
+      if (bfd_get_section_flags (abfd, sec) & SEC_HAS_CONTENTS)
+	{
+	  /* Make sure it hasn't got contents.  It seems impossible to
+	     make it carry contents, so we don't have a test-case for
+	     this.  */
+	  (*_bfd_error_handler)
+	    (_("%s: internal error, internal register section %s had"
+	       " contents\n"),
+	     bfd_get_filename (abfd), sec->name);
+	  bfd_set_error (bfd_error_bad_value);
+	  infop->retval = FALSE;
+	  return;
+	}
+
+      return;
+    }
+
+  infop->retval = mmo_internal_write_section (abfd, sec);
+}
+
+/* Do the actual output of a file.  Assumes mmo_set_section_contents is
+   already called. */
+
+static bfd_boolean
+mmo_write_object_contents (bfd *abfd)
+{
+  struct mmo_write_sec_info wsecinfo;
+
+  /* First, there are a few words of preamble.  */
+  if (! mmo_internal_write_header (abfd))
+    return FALSE;
+
+  wsecinfo.reg_section = NULL;
+  wsecinfo.retval = TRUE;
+
+  bfd_map_over_sections (abfd, mmo_write_section_unless_reg_contents,
+			 &wsecinfo);
+
+  if (! wsecinfo.retval)
+    return FALSE;
+
+  if (wsecinfo.reg_section != NULL)
+    {
+      asection *sec = wsecinfo.reg_section;
+      unsigned int z = (unsigned int) (sec->vma / 8);
+
+      /* Registers 0..31 must not be global.  Do sanity check on the "vma"
+	 of the register contents section and check that it corresponds to
+	 the length of the section.  */
+      if (z < 32 || z >= 255 || (sec->vma & 7) != 0
+	  || sec->vma != 256 * 8 - sec->size - 8)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+
+	  if (sec->size == 0)
+	    /* There must always be at least one such register.  */
+	    (*_bfd_error_handler)
+	      (_("%s: no initialized registers; section length 0\n"),
+	       bfd_get_filename (abfd));
+	  else if (sec->vma > (256 - 32) * 8)
+	    /* Provide better error message for the case of too many
+	       global registers.  */
+	    (*_bfd_error_handler)
+	      (_("%s: too many initialized registers; section length %ld\n"),
+	       bfd_get_filename (abfd),
+	       (long) sec->size);
+	  else
+	    (*_bfd_error_handler)
+	      (_("%s: invalid start address for initialized registers of"
+		 " length %ld: 0x%lx%08lx\n"),
+	       bfd_get_filename (abfd),
+	       (long) sec->size,
+	       (unsigned long) (sec->vma >> 32), (unsigned long) (sec->vma));
+
+	  return FALSE;
+	}
+
+      if (! mmo_internal_write_post (abfd, z, sec))
+	return FALSE;
+    }
+  else
+    if (! mmo_internal_write_post (abfd, 255, NULL))
+      return FALSE;
+
+  return mmo_write_symbols_and_terminator (abfd);
+}
+
+/* If there's anything in particular in a mmo bfd that we want to free,
+   make this a real function.  Only do this if you see major memory
+   thrashing; zealous free:ing will cause unwanted behavior, especially if
+   you "free" memory allocated with "bfd_alloc", or even "bfd_release" a
+   block allocated with "bfd_alloc"; they're really allocated from an
+   obstack, and we don't know what was allocated there since this
+   particular allocation.  */
+
+#define	mmo_close_and_cleanup _bfd_generic_close_and_cleanup
+#define mmo_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
+
+/* Perhaps we need to adjust this one; mmo labels (originally) without a
+   leading ':' might more appropriately be called local.  */
+#define mmo_bfd_is_local_label_name bfd_generic_is_local_label_name
+#define mmo_bfd_is_target_special_symbol  \
+  ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+
+/* Is this one really used or defined by anyone?  */
+#define mmo_get_lineno _bfd_nosymbols_get_lineno
+
+/* FIXME: We can do better on this one, if we have a dwarf2 .debug_line
+   section or if MMO line numbers are implemented.  */
+#define mmo_find_nearest_line _bfd_nosymbols_find_nearest_line
+#define mmo_find_inliner_info _bfd_nosymbols_find_inliner_info
+#define mmo_make_empty_symbol _bfd_generic_make_empty_symbol
+#define mmo_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
+#define mmo_read_minisymbols _bfd_generic_read_minisymbols
+#define mmo_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
+
+#define mmo_get_section_contents_in_window \
+  _bfd_generic_get_section_contents_in_window
+#define mmo_bfd_get_relocated_section_contents \
+  bfd_generic_get_relocated_section_contents
+#define mmo_bfd_gc_sections bfd_generic_gc_sections
+#define mmo_bfd_lookup_section_flags bfd_generic_lookup_section_flags
+#define mmo_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
+#define mmo_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
+#define mmo_bfd_link_add_symbols _bfd_generic_link_add_symbols
+#define mmo_bfd_link_just_syms _bfd_generic_link_just_syms
+#define mmo_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define mmo_bfd_final_link _bfd_generic_final_link
+#define mmo_bfd_link_split_section _bfd_generic_link_split_section
+
+/* Strictly speaking, only MMIX uses this restricted format, but let's not
+   stop anybody from shooting themselves in the foot.  */
+#define mmo_set_arch_mach bfd_default_set_arch_mach
+#define mmo_bfd_relax_section bfd_generic_relax_section
+#define mmo_bfd_merge_sections bfd_generic_merge_sections
+#define mmo_bfd_is_group_section bfd_generic_is_group_section
+#define mmo_bfd_discard_group bfd_generic_discard_group
+#define mmo_section_already_linked \
+  _bfd_generic_section_already_linked
+#define mmo_bfd_define_common_symbol bfd_generic_define_common_symbol
+
+/* We want to copy time of creation, otherwise we'd use
+   BFD_JUMP_TABLE_COPY (_bfd_generic).  */
+#define mmo_bfd_merge_private_bfd_data _bfd_generic_bfd_merge_private_bfd_data
+#define mmo_bfd_copy_private_section_data _bfd_generic_bfd_copy_private_section_data
+#define mmo_bfd_copy_private_symbol_data _bfd_generic_bfd_copy_private_symbol_data
+#define mmo_bfd_copy_private_header_data _bfd_generic_bfd_copy_private_header_data
+#define mmo_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
+#define mmo_bfd_print_private_bfd_data _bfd_generic_bfd_print_private_bfd_data
+
+const bfd_target bfd_mmo_vec =
+{
+  "mmo",			/* name */
+  bfd_target_mmo_flavour,
+  BFD_ENDIAN_BIG,		/* target byte order */
+  BFD_ENDIAN_BIG,		/* target headers byte order */
+
+  /* FIXME: Might need adjustments.  */
+  (HAS_RELOC | EXEC_P |		/* object flags */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT),
+
+  /* FIXME: Might need adjustments.  */
+  (SEC_CODE | SEC_DATA | SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD
+   | SEC_READONLY | SEC_EXCLUDE | SEC_DEBUGGING | SEC_IN_MEMORY),
+				/* section flags */
+  0,				/* leading underscore */
+  ' ',				/* ar_pad_char */
+  16,				/* ar_max_namelen */
+  0,				/* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* hdrs */
+
+  {
+    _bfd_dummy_target,
+    mmo_object_p,		/* bfd_check_format */
+    _bfd_dummy_target,
+    _bfd_dummy_target,
+  },
+  {
+    bfd_false,
+    mmo_mkobject,
+    bfd_false,
+    bfd_false,
+  },
+  {				/* bfd_write_contents */
+    bfd_false,
+    mmo_write_object_contents,
+    bfd_false,
+    bfd_false,
+  },
+
+  BFD_JUMP_TABLE_GENERIC (mmo),
+  BFD_JUMP_TABLE_COPY (mmo),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+  BFD_JUMP_TABLE_SYMBOLS (mmo),
+  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+  BFD_JUMP_TABLE_WRITE (mmo),
+  BFD_JUMP_TABLE_LINK (mmo),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  NULL
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/netbsd-core.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/netbsd-core.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/netbsd-core.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/netbsd-core.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,320 @@
+/* BFD back end for NetBSD style core files
+   Copyright 1988, 1989, 1991, 1992, 1993, 1996, 1998, 1999, 2000, 2001,
+   2002, 2003, 2004, 2005, 2006, 2007
+   Free Software Foundation, Inc.
+   Written by Paul Kranenburg, EUR
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libaout.h"           /* BFD a.out internal data structures.  */
+
+#include <sys/param.h>
+#include <sys/dir.h>
+#include <signal.h>
+#include <sys/core.h>
+
+/* The machine ID for OpenBSD/sparc64 and older versions of
+   NetBSD/sparc64 overlaps with M_MIPS1.  */
+#define M_SPARC64_OPENBSD	M_MIPS1
+
+/* Offset of StackGhost cookie within `struct md_coredump' on
+   OpenBSD/sparc.  */
+#define SPARC_WCOOKIE_OFFSET	344
+
+/* Offset of StackGhost cookie within `struct md_coredump' on
+   OpenBSD/sparc64.  */
+#define SPARC64_WCOOKIE_OFFSET	832
+
+#define netbsd_core_file_matches_executable_p generic_core_file_matches_executable_p
+#define netbsd_core_file_pid _bfd_nocore_core_file_pid
+
+struct netbsd_core_struct
+{
+  struct core core;
+} *rawptr;
+
+/* Handle NetBSD-style core dump file.  */
+
+static const bfd_target *
+netbsd_core_file_p (bfd *abfd)
+{
+  int val;
+  unsigned i;
+  file_ptr offset;
+  asection *asect;
+  struct core core;
+  struct coreseg coreseg;
+  bfd_size_type amt = sizeof core;
+
+  val = bfd_bread (&core, amt, abfd);
+  if (val != sizeof core)
+    {
+      /* Too small to be a core file.  */
+      bfd_set_error (bfd_error_wrong_format);
+      return 0;
+    }
+
+  if (CORE_GETMAGIC (core) != COREMAGIC)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return 0;
+    }
+
+  amt = sizeof (struct netbsd_core_struct);
+  rawptr = (struct netbsd_core_struct *) bfd_zalloc (abfd, amt);
+  if (rawptr == NULL)
+    return 0;
+
+  rawptr->core = core;
+  abfd->tdata.netbsd_core_data = rawptr;
+
+  offset = core.c_hdrsize;
+  for (i = 0; i < core.c_nseg; i++)
+    {
+      const char *sname;
+      flagword flags;
+
+      if (bfd_seek (abfd, offset, SEEK_SET) != 0)
+	goto punt;
+
+      val = bfd_bread (&coreseg, sizeof coreseg, abfd);
+      if (val != sizeof coreseg)
+	{
+	  bfd_set_error (bfd_error_file_truncated);
+	  goto punt;
+	}
+      if (CORE_GETMAGIC (coreseg) != CORESEGMAGIC)
+	{
+	  bfd_set_error (bfd_error_wrong_format);
+	  goto punt;
+	}
+
+      offset += core.c_seghdrsize;
+
+      switch (CORE_GETFLAG (coreseg))
+	{
+	case CORE_CPU:
+	  sname = ".reg";
+	  flags = SEC_ALLOC + SEC_HAS_CONTENTS;
+	  break;
+	case CORE_DATA:
+	  sname = ".data";
+	  flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
+	  break;
+	case CORE_STACK:
+	  sname = ".stack";
+	  flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
+	  break;
+	default:
+	  sname = ".unknown";
+	  flags = SEC_ALLOC + SEC_HAS_CONTENTS;
+	  break;
+	}
+      asect = bfd_make_section_anyway_with_flags (abfd, sname, flags);
+      if (asect == NULL)
+	goto punt;
+
+      asect->size = coreseg.c_size;
+      asect->vma = coreseg.c_addr;
+      asect->filepos = offset;
+      asect->alignment_power = 2;
+
+      if (CORE_GETFLAG (coreseg) == CORE_CPU)
+	{
+	  bfd_size_type wcookie_offset;
+
+	  switch (CORE_GETMID (core))
+	    {
+	    case M_SPARC_NETBSD:
+	      wcookie_offset = SPARC_WCOOKIE_OFFSET;
+	      break;
+	    case M_SPARC64_OPENBSD:
+	      wcookie_offset = SPARC64_WCOOKIE_OFFSET;
+	      break;
+	    default:
+	      wcookie_offset = 0;
+	      break;
+	    }
+
+	  if (wcookie_offset > 0 && coreseg.c_size > wcookie_offset)
+	    {
+	      /* Truncate the .reg section.  */
+	      asect->size = wcookie_offset;
+
+	      /* And create the .wcookie section.  */
+	      flags = SEC_ALLOC + SEC_HAS_CONTENTS;
+	      asect = bfd_make_section_anyway_with_flags (abfd, ".wcookie",
+							  flags);
+	      if (asect == NULL)
+		goto punt;
+
+	      asect->size = coreseg.c_size - wcookie_offset;
+	      asect->vma = 0;
+	      asect->filepos = offset + wcookie_offset;
+	      asect->alignment_power = 2;
+	    }
+	}
+
+      offset += coreseg.c_size;
+    }
+
+  /* Set architecture from machine ID.  */
+  switch (CORE_GETMID (core))
+    {
+    case M_ALPHA_NETBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_alpha, 0);
+      break;
+
+    case M_ARM6_NETBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_arm, bfd_mach_arm_3);
+      break;
+
+    case M_X86_64_NETBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_i386, bfd_mach_x86_64);
+      break;
+
+    case M_386_NETBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_i386, bfd_mach_i386_i386);
+      break;
+
+    case M_68K_NETBSD:
+    case M_68K4K_NETBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_m68k, 0);
+      break;
+
+    case M_88K_OPENBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_m88k, 0);
+      break;
+
+    case M_HPPA_OPENBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_hppa, bfd_mach_hppa11);
+      break;
+
+    case M_POWERPC_NETBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_powerpc, bfd_mach_ppc);
+      break;
+
+    case M_SPARC_NETBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_sparc, bfd_mach_sparc);
+      break;
+
+    case M_SPARC64_NETBSD:
+    case M_SPARC64_OPENBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_sparc, bfd_mach_sparc_v9);
+      break;
+
+    case M_VAX_NETBSD:
+    case M_VAX4K_NETBSD:
+      bfd_default_set_arch_mach (abfd, bfd_arch_vax, 0);
+      break;
+    }
+
+  /* OK, we believe you.  You're a core file (sure, sure).  */
+  return abfd->xvec;
+
+ punt:
+  bfd_release (abfd, abfd->tdata.any);
+  abfd->tdata.any = NULL;
+  bfd_section_list_clear (abfd);
+  return 0;
+}
+
+static char*
+netbsd_core_file_failing_command (bfd *abfd)
+{
+  /*return core_command (abfd);*/
+  return abfd->tdata.netbsd_core_data->core.c_name;
+}
+
+static int
+netbsd_core_file_failing_signal (bfd *abfd)
+{
+  /*return core_signal (abfd);*/
+  return abfd->tdata.netbsd_core_data->core.c_signo;
+}
+
+/* If somebody calls any byte-swapping routines, shoot them.  */
+
+static void
+swap_abort (void)
+{
+ /* This way doesn't require any declaration for ANSI to fuck up.  */
+  abort ();
+}
+
+#define	NO_GET ((bfd_vma (*) (const void *)) swap_abort)
+#define	NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
+#define	NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
+#define	NO_GET64 ((bfd_uint64_t (*) (const void *)) swap_abort)
+#define	NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
+#define	NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
+
+const bfd_target netbsd_core_vec =
+  {
+    "netbsd-core",
+    bfd_target_unknown_flavour,
+    BFD_ENDIAN_UNKNOWN,		/* Target byte order.  */
+    BFD_ENDIAN_UNKNOWN,		/* Target headers byte order.  */
+    (HAS_RELOC | EXEC_P |	/* Object flags.  */
+     HAS_LINENO | HAS_DEBUG |
+     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+    (SEC_HAS_CONTENTS |		/* Section flags.  */
+     SEC_ALLOC | SEC_LOAD | SEC_RELOC),
+    0,				/* Symbol prefix.  */
+    ' ',			/* ar_pad_char.  */
+    16,				/* ar_max_namelen.  */
+    0,				/* Match priority.  */
+    NO_GET64, NO_GETS64, NO_PUT64,	/* 64 bit data.  */
+    NO_GET, NO_GETS, NO_PUT,		/* 32 bit data.  */
+    NO_GET, NO_GETS, NO_PUT,		/* 16 bit data.  */
+    NO_GET64, NO_GETS64, NO_PUT64,	/* 64 bit hdrs.  */
+    NO_GET, NO_GETS, NO_PUT,		/* 32 bit hdrs.  */
+    NO_GET, NO_GETS, NO_PUT,		/* 16 bit hdrs.  */
+
+    {					/* bfd_check_format.  */
+      _bfd_dummy_target,		/* Unknown format.  */
+      _bfd_dummy_target,		/* Object file.  */
+      _bfd_dummy_target,		/* Archive.  */
+      netbsd_core_file_p		/* A core file.  */
+    },
+    {					/* bfd_set_format.  */
+      bfd_false, bfd_false,
+      bfd_false, bfd_false
+    },
+    {					/* bfd_write_contents.  */
+      bfd_false, bfd_false,
+      bfd_false, bfd_false
+    },
+
+    BFD_JUMP_TABLE_GENERIC (_bfd_generic),
+    BFD_JUMP_TABLE_COPY (_bfd_generic),
+    BFD_JUMP_TABLE_CORE (netbsd),
+    BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+    BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
+    BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+    BFD_JUMP_TABLE_WRITE (_bfd_generic),
+    BFD_JUMP_TABLE_LINK (_bfd_nolink),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    NULL,
+
+    (PTR) 0			        /* Backend_data.  */
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/netbsd.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/netbsd.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/netbsd.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/netbsd.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,120 @@
+/* BFD back-end definitions used by all NetBSD targets.
+   Copyright 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 2000, 2002,
+   2005, 2007, 2011  Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* Check for our machine type (part of magic number).  */
+#ifndef MACHTYPE_OK
+#define MACHTYPE_OK(m) ((m) == DEFAULT_MID || (m) == M_UNKNOWN)
+#endif
+
+/* This is the normal load address for executables.  */
+#define TEXT_START_ADDR		TARGET_PAGE_SIZE
+
+/* NetBSD ZMAGIC has its header in the text segment.  */
+#define N_HEADER_IN_TEXT(x)	1
+
+/* Determine if this is a shared library using the flags.  */
+#define N_SHARED_LIB(x) 	(N_DYNAMIC (x))
+
+/* We have 6 bits of flags and 10 bits of machine ID.  */
+#define N_MACHTYPE(exec) \
+	((enum machine_type) (((exec).a_info >> 16) & 0x03ff))
+#define N_FLAGS(exec) \
+	(((exec).a_info >> 26) & 0x3f)
+
+#define N_SET_INFO(exec, magic, type, flags) \
+	((exec).a_info = ((magic) & 0xffff) \
+	 | (((int) (type) & 0x3ff) << 16) \
+	 | (((flags) & 0x3f) << 24))
+#define N_SET_MACHTYPE(exec, machtype) \
+	((exec).a_info = \
+         ((exec).a_info & 0xfb00ffff) | ((((int) (machtype)) & 0x3ff) << 16))
+#define N_SET_FLAGS(exec, flags) \
+	((exec).a_info = \
+	 ((exec).a_info & 0x03ffffff) | ((flags & 0x03f) << 26))
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libaout.h"
+
+/* On NetBSD, the magic number is always in ntohl's "network" (big-endian)
+   format.  */
+#define SWAP_MAGIC(ext) bfd_getb32 (ext)
+
+/* On NetBSD, the entry point may be taken to be the start of the text
+   section.  */
+#define MY_entry_is_text_address 1
+
+#define MY_write_object_contents MY (write_object_contents)
+static bfd_boolean MY (write_object_contents) (bfd *);
+
+#define MY_text_includes_header 1
+
+#include "aout-target.h"
+
+/* Write an object file.
+   Section contents have already been written.  We write the
+   file header, symbols, and relocation.  */
+
+static bfd_boolean
+MY (write_object_contents) (bfd *abfd)
+{
+  struct external_exec exec_bytes;
+  struct internal_exec *execp = exec_hdr (abfd);
+
+  /* We must make certain that the magic number has been set.  This
+     will normally have been done by set_section_contents, but only if
+     there actually are some section contents.  */
+  if (! abfd->output_has_begun)
+    {
+      bfd_size_type text_size;
+      file_ptr text_end;
+
+      NAME (aout, adjust_sizes_and_vmas) (abfd, & text_size, & text_end);
+    }
+
+  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+
+  /* Magic number, maestro, please!  */
+  switch (bfd_get_arch(abfd))
+    {
+    case DEFAULT_ARCH:
+      N_SET_MACHTYPE(*execp, DEFAULT_MID);
+      break;
+    default:
+      N_SET_MACHTYPE(*execp, M_UNKNOWN);
+      break;
+    }
+
+  /* The NetBSD magic number is always big-endian.  */
+#ifndef TARGET_IS_BIG_ENDIAN_P
+  /* XXX aren't there any macro to change byteorder of a word independent of
+     the host's or target's endiannesses?  */
+  execp->a_info
+    = (execp->a_info & 0xff) << 24 | (execp->a_info & 0xff00) << 8
+      | (execp->a_info & 0xff0000) >> 8 | (execp->a_info & 0xff000000) >> 24;
+#endif
+
+  WRITE_HEADERS (abfd, execp);
+
+  return TRUE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/newsos3.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/newsos3.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/newsos3.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/newsos3.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,44 @@
+/* BFD back-end for NewsOS3 (Sony, 68k) binaries.
+   Copyright 1990, 1991, 1994, 1995, 2000, 2001, 2003, 2005, 2007, 2009
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define	TARGET_PAGE_SIZE	4096
+#define	SEGMENT_SIZE	TARGET_PAGE_SIZE
+#define TEXT_START_ADDR 0
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (newsos3_,OP)
+#define TARGETNAME "a.out-newsos3"
+#define ENTRY_CAN_BE_ZERO
+#define DEFAULT_ARCH bfd_arch_m68k
+#define TARGET_IS_BIG_ENDIAN_P
+#define N_HEADER_IN_TEXT(x) 0
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "aout/aout64.h"
+#include "aout/stab_gnu.h"
+#include "aout/ar.h"
+#include "libaout.h"           /* BFD a.out internal data structures */
+
+#include "aout-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/nlm-target.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/nlm-target.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/nlm-target.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/nlm-target.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,262 @@
+/* Target definitions for 32/64-bit NLM (NetWare Loadable Module)
+   Copyright 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2007, 2009, 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define nlm_core_file_p _bfd_dummy_target
+
+#define nlm_get_symtab_upper_bound              nlmNAME (get_symtab_upper_bound)
+#define nlm_canonicalize_symtab                 nlmNAME (canonicalize_symtab)
+#define nlm_make_empty_symbol                   nlmNAME (make_empty_symbol)
+#define nlm_print_symbol                        nlmNAME (print_symbol)
+#define nlm_get_symbol_info                     nlmNAME (get_symbol_info)
+#define nlm_bfd_is_local_label_name             bfd_generic_is_local_label_name
+#define nlm_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define nlm_get_lineno                          _bfd_nosymbols_get_lineno
+#define nlm_find_nearest_line                   _bfd_nosymbols_find_nearest_line
+#define nlm_find_inliner_info                   _bfd_nosymbols_find_inliner_info
+#define nlm_bfd_make_debug_symbol               _bfd_nosymbols_bfd_make_debug_symbol
+#define nlm_read_minisymbols                    _bfd_generic_read_minisymbols
+#define nlm_minisymbol_to_symbol                _bfd_generic_minisymbol_to_symbol
+
+#define nlm_get_reloc_upper_bound               nlmNAME (get_reloc_upper_bound)
+#define nlm_canonicalize_reloc                  nlmNAME (canonicalize_reloc)
+#define nlm_bfd_reloc_type_lookup               bfd_default_reloc_type_lookup
+#define nlm_bfd_reloc_name_lookup         _bfd_norelocs_bfd_reloc_name_lookup
+#define nlm_set_section_contents                nlmNAME (set_section_contents)
+
+#define nlm_sizeof_headers                      _bfd_nolink_sizeof_headers
+#define nlm_bfd_get_relocated_section_contents  bfd_generic_get_relocated_section_contents
+#define nlm_bfd_relax_section                   bfd_generic_relax_section
+#define nlm_bfd_gc_sections                     bfd_generic_gc_sections
+#define nlm_bfd_lookup_section_flags		bfd_generic_lookup_section_flags
+#define nlm_bfd_merge_sections                  bfd_generic_merge_sections
+#define nlm_bfd_is_group_section                bfd_generic_is_group_section
+#define nlm_bfd_discard_group                   bfd_generic_discard_group
+#define nlm_section_already_linked              _bfd_generic_section_already_linked
+#define nlm_bfd_define_common_symbol            bfd_generic_define_common_symbol
+#define nlm_bfd_link_hash_table_create          _bfd_generic_link_hash_table_create
+#define nlm_bfd_link_hash_table_free            _bfd_generic_link_hash_table_free
+#define nlm_bfd_link_add_symbols                _bfd_generic_link_add_symbols
+#define nlm_bfd_link_just_syms                  _bfd_generic_link_just_syms
+#define nlm_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define nlm_bfd_final_link                      _bfd_generic_final_link
+#define nlm_bfd_link_split_section              _bfd_generic_link_split_section
+
+/* This structure contains everything that BFD knows about a target.
+   It includes things like its byte order, name, what routines to call
+   to do various operations, etc.  Every BFD points to a target structure
+   with its "xvec" member.
+
+   There are two such structures here:  one for big-endian machines and
+   one for little-endian machines.   */
+
+/* Forward declaration for use when initialising alternative_target field.  */
+#ifdef TARGET_LITTLE_SYM
+extern const bfd_target TARGET_LITTLE_SYM;
+#endif
+
+#ifdef TARGET_BIG_SYM
+const bfd_target TARGET_BIG_SYM =
+{
+  /* Name: identify kind of target.  */
+  TARGET_BIG_NAME,
+
+  /* Flavour: general indication about file.  */
+  bfd_target_nlm_flavour,
+
+  /* Byteorder: data is big endian.  */
+  BFD_ENDIAN_BIG,
+
+  /* Header_byteorder: header is also big endian.  */
+  BFD_ENDIAN_BIG,
+
+  /* Object_flags: mask of all file flags.  */
+  (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS
+   | WP_TEXT),
+
+  /* Section_flags: mask of all section flags.  */
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_READONLY
+   | SEC_CODE | SEC_DATA),
+
+   /* Leading_symbol_char: is the first char of a user symbol
+      predictable, and if so what is it.  */
+   0,
+
+  /* AR_pad_char: pad character for filenames within an archive header
+     FIXME:  this really has nothing to do with NLM, this is a characteristic
+     of the archiver and/or os and should be independently tunable.  */
+  '/',
+
+  /* AR_max_namelen: maximum number of characters in an archive header
+     FIXME:  this really has nothing to do with NLM, this is a characteristic
+     of the archiver and should be independently tunable.  This value is
+     a WAG (wild a** guess).  */
+  15,
+  0,				/* match priority.  */
+
+  /* Routines to byte-swap various sized integers from the data sections.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,
+
+  /* Routines to byte-swap various sized integers from the file headers.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,
+
+  /* bfd_check_format: check the format of a file being read.  */
+  { _bfd_dummy_target,		/* Unknown format.  */
+    nlmNAME (object_p),		/* Assembler/linker output (object file).  */
+    bfd_generic_archive_p,	/* An archive.  */
+    nlm_core_file_p		/* A core file.  */
+  },
+
+  /* bfd_set_format: set the format of a file being written.  */
+  { bfd_false,
+    nlm_mkobject,
+    _bfd_generic_mkarchive,
+    bfd_false
+  },
+
+  /* bfd_write_contents: write cached information into a file being written.  */
+  { bfd_false,
+    nlmNAME (write_object_contents),
+    _bfd_write_archive_contents,
+    bfd_false
+  },
+
+  /* Initialize a jump table with the standard macro.
+     All names start with "nlm".  */
+  BFD_JUMP_TABLE_GENERIC (_bfd_generic),
+  BFD_JUMP_TABLE_COPY (_bfd_generic),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+  BFD_JUMP_TABLE_SYMBOLS (nlm),
+  BFD_JUMP_TABLE_RELOCS (nlm),
+  BFD_JUMP_TABLE_WRITE (nlm),
+  BFD_JUMP_TABLE_LINK (nlm),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  /* Alternative endian target.  */
+#ifdef TARGET_LITTLE_SYM
+  & TARGET_LITTLE_SYM,
+#else
+  NULL,
+#endif
+
+  /* Backend_data.  */
+  (void *) TARGET_BACKEND_DATA
+};
+#endif
+
+#ifdef TARGET_LITTLE_SYM
+const bfd_target TARGET_LITTLE_SYM =
+{
+  /* Name: identify kind of target.  */
+  TARGET_LITTLE_NAME,
+
+  /* Flavour: general indication about file.  */
+  bfd_target_nlm_flavour,
+
+  /* Byteorder: data is little endian.  */
+  BFD_ENDIAN_LITTLE,
+
+  /* Header_byteorder: header is also little endian.  */
+  BFD_ENDIAN_LITTLE,
+
+  /* Object_flags: mask of all file flags.  */
+  (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS
+   | WP_TEXT),
+
+  /* Section_flags: mask of all section flags.  */
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_READONLY
+   | SEC_DATA),
+
+   /* Leading_symbol_char: is the first char of a user symbol
+      predictable, and if so what is it.  */
+   0,
+
+  /* AR_pad_char: pad character for filenames within an archive header
+     FIXME:  this really has nothing to do with NLM, this is a characteristic
+     of the archiver and/or os and should be independently tunable.  */
+  '/',
+
+  /* AR_max_namelen: maximum number of characters in an archive header
+     FIXME:  this really has nothing to do with NLM, this is a characteristic
+     of the archiver and should be independently tunable.  This value is
+     a WAG (wild a** guess).  */
+  15,
+  0,				/* match priority.  */
+
+  /* Routines to byte-swap various sized integers from the data sections.  */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16,
+
+  /* Routines to byte-swap various sized integers from the file headers.  */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16,
+
+  /* bfd_check_format: check the format of a file being read.  */
+  { _bfd_dummy_target,		/* Unknown format.  */
+    nlmNAME(object_p),		/* Assembler/linker output (object file).  */
+    bfd_generic_archive_p,	/* An archive.  */
+    nlm_core_file_p		/* A core file.  */
+  },
+
+  /* bfd_set_format: set the format of a file being written.  */
+  { bfd_false,
+    nlm_mkobject,
+    _bfd_generic_mkarchive,
+    bfd_false
+  },
+
+  /* bfd_write_contents: write cached information into a file being written.  */
+  { bfd_false,
+    nlmNAME(write_object_contents),
+    _bfd_write_archive_contents,
+    bfd_false
+  },
+
+  /* Initialize a jump table with the standard macro.
+     All names start with "nlm".  */
+  BFD_JUMP_TABLE_GENERIC (_bfd_generic),
+  BFD_JUMP_TABLE_COPY (_bfd_generic),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+  BFD_JUMP_TABLE_SYMBOLS (nlm),
+  BFD_JUMP_TABLE_RELOCS (nlm),
+  BFD_JUMP_TABLE_WRITE (nlm),
+  BFD_JUMP_TABLE_LINK (nlm),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  /* Alternative endian target.  */
+#ifdef TARGET_BIG_SYM
+  & TARGET_BIG_SYM,
+#else
+  NULL,
+#endif
+
+  /* Backend_data.  */
+  (void *) TARGET_BACKEND_DATA
+};
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/nlm.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/nlm.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/nlm.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/nlm.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,56 @@
+/* NLM (NetWare Loadable Module) executable support for BFD.
+   Copyright 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libnlm.h"
+
+/* Make an NLM object.  We just need to allocate the backend
+   information.  */
+
+bfd_boolean
+nlm_mkobject (bfd * abfd)
+{
+  bfd_size_type amt = sizeof (struct nlm_obj_tdata);
+
+  nlm_tdata (abfd) = bfd_zalloc (abfd, amt);
+  if (nlm_tdata (abfd) == NULL)
+    return FALSE;
+
+  if (nlm_architecture (abfd) != bfd_arch_unknown)
+    bfd_default_set_arch_mach (abfd, nlm_architecture (abfd),
+			       nlm_machine (abfd));
+
+  /* Since everything is done at close time, do we need any initialization ?  */
+  return TRUE;
+}
+
+/* Set the architecture and machine for an NLM object.  */
+
+bfd_boolean
+nlm_set_arch_mach (bfd * abfd,
+		   enum bfd_architecture arch,
+		   unsigned long machine)
+{
+  bfd_default_set_arch_mach (abfd, arch, machine);
+  return arch == nlm_architecture (abfd);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/nlm32-alpha.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/nlm32-alpha.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/nlm32-alpha.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/nlm32-alpha.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,860 @@
+/* Support for 32-bit Alpha NLM (NetWare Loadable Module)
+   Copyright 1993, 1994, 2000, 2001, 2002, 2003, 2004, 2005, 2007
+   Free Software Foundation, Inc.
+   Written by Ian Lance Taylor, Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* This file describes the 32 bit Alpha NLM format.  You might think
+   that an Alpha chip would use a 64 bit format, but, for some reason,
+   it doesn't.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#define ARCH_SIZE 32
+
+#include "nlm/alpha-ext.h"
+#define Nlm_External_Fixed_Header	Nlm32_alpha_External_Fixed_Header
+
+#include "libnlm.h"
+
+/* Alpha NLM's have a prefix header before the standard NLM.  This
+   function reads it in, verifies the version, and seeks the bfd to
+   the location before the regular NLM header.  */
+
+static bfd_boolean
+nlm_alpha_backend_object_p (bfd *abfd)
+{
+  struct nlm32_alpha_external_prefix_header s;
+  file_ptr size;
+
+  if (bfd_bread (&s, (bfd_size_type) sizeof s, abfd) != sizeof s)
+    return FALSE;
+
+  if (H_GET_32 (abfd, s.magic) != NLM32_ALPHA_MAGIC)
+    return FALSE;
+
+  /* FIXME: Should we check the format number?  */
+
+  /* Skip to the end of the header.  */
+  size = H_GET_32 (abfd, s.size);
+  if (bfd_seek (abfd, size, SEEK_SET) != 0)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Write out the prefix.  */
+
+static bfd_boolean
+nlm_alpha_write_prefix (bfd *abfd)
+{
+  struct nlm32_alpha_external_prefix_header s;
+
+  memset (&s, 0, sizeof s);
+  H_PUT_32 (abfd, NLM32_ALPHA_MAGIC, s.magic);
+  H_PUT_32 (abfd, 2, s.format);
+  H_PUT_32 (abfd, sizeof s, s.size);
+  if (bfd_bwrite (&s, (bfd_size_type) sizeof s, abfd) != sizeof s)
+    return FALSE;
+  return TRUE;
+}
+
+#define ONES(n) (((bfd_vma) 1 << ((n) - 1) << 1) - 1)
+
+/* How to process the various reloc types.  */
+
+static reloc_howto_type nlm32_alpha_howto_table[] =
+{
+  /* Reloc type 0 is ignored by itself.  However, it appears after a
+     GPDISP reloc to identify the location where the low order 16 bits
+     of the gp register are loaded.  */
+  HOWTO (ALPHA_R_IGNORE,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 0,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 8,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont, /* Complain_on_overflow.  */
+	 0,			/* Special_function.  */
+	 "IGNORE",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0,			/* Source mask.  */
+	 0,			/* Dest mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* A 32 bit reference to a symbol.  */
+  HOWTO (ALPHA_R_REFLONG,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,			/* Special_function.  */
+	 "REFLONG",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Source mask.  */
+	 0xffffffff,		/* Dest mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* A 64 bit reference to a symbol.  */
+  HOWTO (ALPHA_R_REFQUAD,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 4,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 64,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,			/* Special_function.  */
+	 "REFQUAD",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 ONES (64),		/* Source mask.  */
+	 ONES (64),		/* Dest mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* A 32 bit GP relative offset.  This is just like REFLONG except
+     that when the value is used the value of the gp register will be
+     added in.  */
+  HOWTO (ALPHA_R_GPREL32,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,			/* Special_function.  */
+	 "GPREL32",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Source mask.  */
+	 0xffffffff,		/* Dest mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* Used for an instruction that refers to memory off the GP
+     register.  The offset is 16 bits of the 32 bit instruction.  This
+     reloc always seems to be against the .lita section.  */
+  HOWTO (ALPHA_R_LITERAL,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 0,			/* Special_function.  */
+	 "LITERAL",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 0xffff,		/* Source mask.  */
+	 0xffff,		/* Dest mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* This reloc only appears immediately following a LITERAL reloc.
+     It identifies a use of the literal.  It seems that the linker can
+     use this to eliminate a portion of the .lita section.  The symbol
+     index is special: 1 means the literal address is in the base
+     register of a memory format instruction; 2 means the literal
+     address is in the byte offset register of a byte-manipulation
+     instruction; 3 means the literal address is in the target
+     register of a jsr instruction.  This does not actually do any
+     relocation.  */
+  HOWTO (ALPHA_R_LITUSE,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont, /* Complain_on_overflow.  */
+	 0,			/* Special_function.  */
+	 "LITUSE",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0,			/* Source mask.  */
+	 0,			/* Dest mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* Load the gp register.  This is always used for a ldah instruction
+     which loads the upper 16 bits of the gp register.  The next reloc
+     will be an IGNORE reloc which identifies the location of the lda
+     instruction which loads the lower 16 bits.  The symbol index of
+     the GPDISP instruction appears to actually be the number of bytes
+     between the ldah and lda instructions.  This gives two different
+     ways to determine where the lda instruction is; I don't know why
+     both are used.  The value to use for the relocation is the
+     difference between the GP value and the current location; the
+     load will always be done against a register holding the current
+     address.  */
+  HOWTO (ALPHA_R_GPDISP,	/* Type.  */
+	 16,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont, /* Complain_on_overflow.  */
+	 0,			/* Special_function.  */
+	 "GPDISP",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 0xffff,		/* Source mask.  */
+	 0xffff,		/* Dest mask.  */
+	 TRUE),			/* PCrel_offset.  */
+
+  /* A 21 bit branch.  The native assembler generates these for
+     branches within the text segment, and also fills in the PC
+     relative offset in the instruction.  It seems to me that this
+     reloc, unlike the others, is not partial_inplace.  */
+  HOWTO (ALPHA_R_BRADDR,	/* Type.  */
+	 2,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 21,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 0,			/* Special_function.  */
+	 "BRADDR",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0,			/* Source mask.  */
+	 0x1fffff,		/* Dest mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* A hint for a jump to a register.  */
+  HOWTO (ALPHA_R_HINT,		/* Type.  */
+	 2,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 14,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont, /* Complain_on_overflow.  */
+	 0,			/* Special_function.  */
+	 "HINT",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 0x3fff,		/* Source mask.  */
+	 0x3fff,		/* Dest mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* 16 bit PC relative offset.  */
+  HOWTO (ALPHA_R_SREL16,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 1,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 0,			/* Special_function.  */
+	 "SREL16",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 0xffff,		/* Source mask.  */
+	 0xffff,		/* Dest mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* 32 bit PC relative offset.  */
+  HOWTO (ALPHA_R_SREL32,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 0,			/* Special_function.  */
+	 "SREL32",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Source mask.  */
+	 0xffffffff,		/* Dest mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* A 64 bit PC relative offset.  */
+  HOWTO (ALPHA_R_SREL64,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 4,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 64,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 0,			/* Special_function.  */
+	 "SREL64",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 ONES (64),		/* Source mask.  */
+	 ONES (64),		/* Dest mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* Push a value on the reloc evaluation stack.  */
+  HOWTO (ALPHA_R_OP_PUSH,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 0,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 0,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont, /* Complain_on_overflow.  */
+	 0,			/* Special_function.  */
+	 "OP_PUSH",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0,			/* Source mask.  */
+	 0,			/* Dest mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* Store the value from the stack at the given address.  Store it in
+     a bitfield of size r_size starting at bit position r_offset.  */
+  HOWTO (ALPHA_R_OP_STORE,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 4,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 64,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont, /* Complain_on_overflow.  */
+	 0,			/* Special_function.  */
+	 "OP_STORE",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0,			/* Source mask.  */
+	 ONES (64),		/* Dest mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* Subtract the reloc address from the value on the top of the
+     relocation stack.  */
+  HOWTO (ALPHA_R_OP_PSUB,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 0,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 0,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont, /* Complain_on_overflow.  */
+	 0,			/* Special_function.  */
+	 "OP_PSUB",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0,			/* Source mask.  */
+	 0,			/* Dest mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* Shift the value on the top of the relocation stack right by the
+     given value.  */
+  HOWTO (ALPHA_R_OP_PRSHIFT,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 0,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 0,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont, /* Complain_on_overflow.  */
+	 0,			 /* Special_function.  */
+	 "OP_PRSHIFT",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0,			/* Source mask.  */
+	 0,			/* Dest mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* Adjust the GP value for a new range in the object file.  */
+  HOWTO (ALPHA_R_GPVALUE,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 0,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 0,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont, /* Complain_on_overflow.  */
+	 0,			/* Special_function.  */
+	 "GPVALUE",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0,			/* Source mask.  */
+	 0,			/* Dest mask.  */
+	 FALSE)			/* PCrel_offset.  */
+};
+
+static reloc_howto_type nlm32_alpha_nw_howto =
+  HOWTO (ALPHA_R_NW_RELOC,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 0,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 0,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont, /* Complain_on_overflow.  */
+	 0,			/* Special_function.  */
+	 "NW_RELOC",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0,			/* Source mask.  */
+	 0,			/* Dest mask.  */
+	 FALSE);		/* PCrel_offset.  */
+
+/* Read an Alpha NLM reloc.  This routine keeps some static data which
+   it uses when handling local relocs.  This only works correctly
+   because all the local relocs are read at once.  */
+
+static bfd_boolean
+nlm_alpha_read_reloc (bfd *abfd,
+		      nlmNAME (symbol_type) *sym,
+		      asection **secp,
+		      arelent *rel)
+{
+  static bfd_vma gp_value;
+  static bfd_vma lita_address;
+  struct nlm32_alpha_external_reloc ext;
+  bfd_vma r_vaddr;
+  long r_symndx;
+  int r_type, r_extern, r_offset, r_size;
+  asection *code_sec, *data_sec;
+
+  /* Read the reloc from the file.  */
+  if (bfd_bread (&ext, (bfd_size_type) sizeof ext, abfd) != sizeof ext)
+    return FALSE;
+
+  /* Swap in the reloc information.  */
+  r_vaddr = H_GET_64 (abfd, ext.r_vaddr);
+  r_symndx = H_GET_32 (abfd, ext.r_symndx);
+
+  BFD_ASSERT (bfd_little_endian (abfd));
+
+  r_type = ((ext.r_bits[0] & RELOC_BITS0_TYPE_LITTLE)
+	    >> RELOC_BITS0_TYPE_SH_LITTLE);
+  r_extern = (ext.r_bits[1] & RELOC_BITS1_EXTERN_LITTLE) != 0;
+  r_offset = ((ext.r_bits[1] & RELOC_BITS1_OFFSET_LITTLE)
+	      >> RELOC_BITS1_OFFSET_SH_LITTLE);
+  /* Ignore the reserved bits.  */
+  r_size = ((ext.r_bits[3] & RELOC_BITS3_SIZE_LITTLE)
+	    >> RELOC_BITS3_SIZE_SH_LITTLE);
+
+  /* Fill in the BFD arelent structure.  */
+  code_sec = bfd_get_section_by_name (abfd, NLM_CODE_NAME);
+  data_sec = bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME);
+  if (r_extern)
+    {
+      /* External relocations are only used for imports.  */
+      BFD_ASSERT (sym != NULL);
+      /* We don't need to set sym_ptr_ptr for this case.  It is set in
+	 nlm_canonicalize_reloc.  */
+      rel->sym_ptr_ptr = NULL;
+      rel->addend = 0;
+    }
+  else
+    {
+      /* Internal relocations are only used for local relocation
+	 fixups.  If they are not NW_RELOC or GPDISP or IGNORE, they
+	 must be against .text or .data.  */
+      BFD_ASSERT (r_type == ALPHA_R_NW_RELOC || sym == NULL);
+      if (r_type == ALPHA_R_NW_RELOC
+	  || r_type == ALPHA_R_GPDISP
+	  || r_type == ALPHA_R_IGNORE)
+	{
+	  rel->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+	  rel->addend = 0;
+	}
+      else if (r_symndx == ALPHA_RELOC_SECTION_TEXT)
+	{
+	  rel->sym_ptr_ptr = code_sec->symbol_ptr_ptr;
+	  BFD_ASSERT (bfd_get_section_vma (abfd, code_sec) == 0);
+	  rel->addend = 0;
+	}
+      else if (r_symndx == ALPHA_RELOC_SECTION_DATA)
+	{
+	  rel->sym_ptr_ptr = data_sec->symbol_ptr_ptr;
+	  rel->addend = - bfd_get_section_vma (abfd, data_sec);
+	}
+      else
+	{
+	  BFD_ASSERT (0);
+	  rel->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+	  rel->addend = 0;
+	}
+    }
+
+  /* We use the address to determine whether the reloc is in the .text
+     or .data section.  R_NW_RELOC relocs don't really have a section,
+     so we put them in .text.  */
+  if (r_type == ALPHA_R_NW_RELOC
+      || r_vaddr < code_sec->size)
+    {
+      *secp = code_sec;
+      rel->address = r_vaddr;
+    }
+  else
+    {
+      *secp = data_sec;
+      rel->address = r_vaddr - code_sec->size;
+    }
+
+  /* We must adjust the addend based on the type.  */
+  BFD_ASSERT ((r_type >= 0 && r_type <= ALPHA_R_GPVALUE)
+	      || r_type == ALPHA_R_NW_RELOC);
+
+  switch (r_type)
+    {
+    case ALPHA_R_BRADDR:
+    case ALPHA_R_SREL16:
+    case ALPHA_R_SREL32:
+    case ALPHA_R_SREL64:
+      /* The PC relative relocs do not seem to use the section VMA as
+	 a negative addend.  */
+      rel->addend = 0;
+      break;
+
+    case ALPHA_R_GPREL32:
+      /* Copy the gp value for this object file into the addend, to
+	 ensure that we are not confused by the linker.  */
+      if (! r_extern)
+	rel->addend += gp_value;
+      break;
+
+    case ALPHA_R_LITERAL:
+      BFD_ASSERT (! r_extern);
+      rel->addend += lita_address;
+      break;
+
+    case ALPHA_R_LITUSE:
+    case ALPHA_R_GPDISP:
+      /* The LITUSE and GPDISP relocs do not use a symbol, or an
+	 addend, but they do use a special code.  Put this code in the
+	 addend field.  */
+      rel->addend = r_symndx;
+      rel->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+      break;
+
+    case ALPHA_R_OP_STORE:
+      /* The STORE reloc needs the size and offset fields.  We store
+	 them in the addend.  */
+      BFD_ASSERT (r_offset < 256 && r_size < 256);
+      rel->addend = (r_offset << 8) + r_size;
+      break;
+
+    case ALPHA_R_OP_PUSH:
+    case ALPHA_R_OP_PSUB:
+    case ALPHA_R_OP_PRSHIFT:
+      /* The PUSH, PSUB and PRSHIFT relocs do not actually use an
+	 address.  I believe that the address supplied is really an
+	 addend.  */
+      rel->addend = r_vaddr;
+      break;
+
+    case ALPHA_R_GPVALUE:
+      /* Record the new gp value.  */
+      gp_value += r_symndx;
+      rel->addend = gp_value;
+      break;
+
+    case ALPHA_R_IGNORE:
+      /* If the type is ALPHA_R_IGNORE, make sure this is a reference
+	 to the absolute section so that the reloc is ignored.  For
+	 some reason the address of this reloc type is not adjusted by
+	 the section vma.  We record the gp value for this object file
+	 here, for convenience when doing the GPDISP relocation.  */
+      rel->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+      rel->address = r_vaddr;
+      rel->addend = gp_value;
+      break;
+
+    case ALPHA_R_NW_RELOC:
+      /* If this is SETGP, we set the addend to 0.  Otherwise we set
+	 the addend to the size of the .lita section (this is
+	 r_symndx) plus 1.  We have already set the address of the
+	 reloc to r_vaddr.  */
+      if (r_size == ALPHA_R_NW_RELOC_SETGP)
+	{
+	  gp_value = r_vaddr;
+	  rel->addend = 0;
+	}
+      else if (r_size == ALPHA_R_NW_RELOC_LITA)
+	{
+	  lita_address = r_vaddr;
+	  rel->addend = r_symndx + 1;
+	}
+      else
+	BFD_ASSERT (0);
+      rel->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+      break;
+
+    default:
+      break;
+    }
+
+  if (r_type == ALPHA_R_NW_RELOC)
+    rel->howto = &nlm32_alpha_nw_howto;
+  else
+    rel->howto = &nlm32_alpha_howto_table[r_type];
+
+  return TRUE;
+}
+
+/* Mangle Alpha NLM relocs for output.  */
+
+static bfd_boolean
+nlm_alpha_mangle_relocs (bfd *abfd ATTRIBUTE_UNUSED,
+			 asection *sec ATTRIBUTE_UNUSED,
+			 const void * data ATTRIBUTE_UNUSED,
+			 bfd_vma offset ATTRIBUTE_UNUSED,
+			 bfd_size_type count ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+/* Read an ALPHA NLM import record.  */
+
+static bfd_boolean
+nlm_alpha_read_import (bfd *abfd, nlmNAME (symbol_type) * sym)
+{
+  struct nlm_relent *nlm_relocs;	/* Relocation records for symbol.  */
+  bfd_size_type rcount;			/* Number of relocs.  */
+  bfd_byte temp[NLM_TARGET_LONG_SIZE];	/* Temporary 32-bit value.  */
+  unsigned char symlength;		/* Length of symbol name.  */
+  char *name;
+  bfd_size_type amt;
+
+  if (bfd_bread (& symlength, (bfd_size_type) sizeof (symlength), abfd)
+      != sizeof (symlength))
+    return FALSE;
+  sym -> symbol.the_bfd = abfd;
+  name = bfd_alloc (abfd, (bfd_size_type) symlength + 1);
+  if (name == NULL)
+    return FALSE;
+  if (bfd_bread (name, (bfd_size_type) symlength, abfd) != symlength)
+    return FALSE;
+  name[symlength] = '\0';
+  sym -> symbol.name = name;
+  sym -> symbol.flags = 0;
+  sym -> symbol.value = 0;
+  sym -> symbol.section = bfd_und_section_ptr;
+  if (bfd_bread (temp, (bfd_size_type) sizeof (temp), abfd)
+      != sizeof (temp))
+    return FALSE;
+  rcount = H_GET_32 (abfd, temp);
+  amt = rcount * sizeof (struct nlm_relent);
+  nlm_relocs = bfd_alloc (abfd, amt);
+  if (!nlm_relocs)
+    return FALSE;
+  sym -> relocs = nlm_relocs;
+  sym -> rcnt = 0;
+  while (sym -> rcnt < rcount)
+    {
+      asection *section;
+
+      if (! nlm_alpha_read_reloc (abfd, sym, &section, &nlm_relocs -> reloc))
+	return FALSE;
+      nlm_relocs -> section = section;
+      nlm_relocs++;
+      sym -> rcnt++;
+    }
+
+  return TRUE;
+}
+
+/* Write an Alpha NLM reloc.  */
+
+static bfd_boolean
+nlm_alpha_write_import (bfd * abfd, asection * sec, arelent * rel)
+{
+  asymbol *sym;
+  bfd_vma r_vaddr;
+  long r_symndx;
+  int r_type, r_extern, r_offset, r_size;
+  struct nlm32_alpha_external_reloc ext;
+
+  sym = *rel->sym_ptr_ptr;
+
+  /* Get values for the relocation fields.  */
+  r_type = rel->howto->type;
+  if (r_type != ALPHA_R_NW_RELOC)
+    {
+      r_vaddr = bfd_get_section_vma (abfd, sec) + rel->address;
+      if ((sec->flags & SEC_CODE) == 0)
+	r_vaddr += bfd_get_section_by_name (abfd, NLM_CODE_NAME) -> size;
+      if (bfd_is_und_section (bfd_get_section (sym)))
+	{
+	  r_extern = 1;
+	  r_symndx = 0;
+	}
+      else
+	{
+	  r_extern = 0;
+	  if (bfd_get_section_flags (abfd, bfd_get_section (sym)) & SEC_CODE)
+	    r_symndx = ALPHA_RELOC_SECTION_TEXT;
+	  else
+	    r_symndx = ALPHA_RELOC_SECTION_DATA;
+	}
+      r_offset = 0;
+      r_size = 0;
+
+      switch (r_type)
+	{
+	case ALPHA_R_LITUSE:
+	case ALPHA_R_GPDISP:
+	  r_symndx = rel->addend;
+	  break;
+
+	case ALPHA_R_OP_STORE:
+	  r_size = rel->addend & 0xff;
+	  r_offset = (rel->addend >> 8) & 0xff;
+	  break;
+
+	case ALPHA_R_OP_PUSH:
+	case ALPHA_R_OP_PSUB:
+	case ALPHA_R_OP_PRSHIFT:
+	  r_vaddr = rel->addend;
+	  break;
+
+	case ALPHA_R_IGNORE:
+	  r_vaddr = rel->address;
+	  break;
+
+	default:
+	  break;
+	}
+    }
+  else
+    {
+      /* r_type == ALPHA_R_NW_RELOC.  */
+      r_vaddr = rel->address;
+      if (rel->addend == 0)
+	{
+	  r_symndx = 0;
+	  r_size = ALPHA_R_NW_RELOC_SETGP;
+	}
+      else
+	{
+	  r_symndx = rel->addend - 1;
+	  r_size = ALPHA_R_NW_RELOC_LITA;
+	}
+      r_extern = 0;
+      r_offset = 0;
+    }
+
+  /* Swap out the relocation fields.  */
+  H_PUT_64 (abfd, r_vaddr, ext.r_vaddr);
+  H_PUT_32 (abfd, r_symndx, ext.r_symndx);
+
+  BFD_ASSERT (bfd_little_endian (abfd));
+
+  ext.r_bits[0] = ((r_type << RELOC_BITS0_TYPE_SH_LITTLE)
+		   & RELOC_BITS0_TYPE_LITTLE);
+  ext.r_bits[1] = ((r_extern ? RELOC_BITS1_EXTERN_LITTLE : 0)
+		   | ((r_offset << RELOC_BITS1_OFFSET_SH_LITTLE)
+		      & RELOC_BITS1_OFFSET_LITTLE));
+  ext.r_bits[2] = 0;
+  ext.r_bits[3] = ((r_size << RELOC_BITS3_SIZE_SH_LITTLE)
+		   & RELOC_BITS3_SIZE_LITTLE);
+
+  /* Write out the relocation.  */
+  if (bfd_bwrite (&ext, (bfd_size_type) sizeof ext, abfd) != sizeof ext)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Alpha NetWare does not use the high bit to determine whether a
+   public symbol is in the code segment or the data segment.  Instead,
+   it just uses the address.  The set_public_section and
+   get_public_offset routines override the default code which uses the
+   high bit.  */
+
+/* Set the section for a public symbol.  */
+
+static bfd_boolean
+nlm_alpha_set_public_section (bfd * abfd, nlmNAME (symbol_type) * sym)
+{
+  asection *code_sec, *data_sec;
+
+  code_sec = bfd_get_section_by_name (abfd, NLM_CODE_NAME);
+  data_sec = bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME);
+  if (sym->symbol.value < code_sec->size)
+    {
+      sym->symbol.section = code_sec;
+      sym->symbol.flags |= BSF_FUNCTION;
+    }
+  else
+    {
+      sym->symbol.section = data_sec;
+      sym->symbol.value -= code_sec->size;
+      /* The data segment had better be aligned.  */
+      BFD_ASSERT ((code_sec->size & 0xf) == 0);
+    }
+  return TRUE;
+}
+
+/* Get the offset to write out for a public symbol.  */
+
+static bfd_vma
+nlm_alpha_get_public_offset (bfd * abfd ATTRIBUTE_UNUSED, asymbol * sym)
+{
+  return bfd_asymbol_value (sym);
+}
+
+/* Write an Alpha NLM external symbol.  */
+
+static bfd_boolean
+nlm_alpha_write_external (bfd *abfd,
+			  bfd_size_type count,
+			  asymbol *sym,
+			  struct reloc_and_sec *relocs)
+{
+  bfd_size_type i;
+  bfd_byte len;
+  unsigned char temp[NLM_TARGET_LONG_SIZE];
+  arelent r;
+
+  len = strlen (sym->name);
+  if ((bfd_bwrite (&len, (bfd_size_type) sizeof (bfd_byte), abfd)
+       != sizeof (bfd_byte))
+      || bfd_bwrite (sym->name, (bfd_size_type) len, abfd) != len)
+    return FALSE;
+
+  bfd_put_32 (abfd, count + 2, temp);
+  if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
+    return FALSE;
+
+  /* The first two relocs for each external symbol are the .lita
+     address and the GP value.  */
+  r.sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+  r.howto = &nlm32_alpha_nw_howto;
+
+  r.address = nlm_alpha_backend_data (abfd)->lita_address;
+  r.addend = nlm_alpha_backend_data (abfd)->lita_size + 1;
+  if (! nlm_alpha_write_import (abfd, NULL, &r))
+    return FALSE;
+
+  r.address = nlm_alpha_backend_data (abfd)->gp;
+  r.addend = 0;
+  if (! nlm_alpha_write_import (abfd, NULL, &r))
+    return FALSE;
+
+  for (i = 0; i < count; i++)
+    if (! nlm_alpha_write_import (abfd, relocs[i].sec, relocs[i].rel))
+      return FALSE;
+
+  return TRUE;
+}
+
+#include "nlmswap.h"
+
+static const struct nlm_backend_data nlm32_alpha_backend =
+{
+  "NetWare Alpha Module   \032",
+  sizeof (Nlm32_alpha_External_Fixed_Header),
+  sizeof (struct nlm32_alpha_external_prefix_header),
+  bfd_arch_alpha,
+  0,
+  TRUE, /* No uninitialized data permitted by Alpha NetWare.  */
+  nlm_alpha_backend_object_p,
+  nlm_alpha_write_prefix,
+  nlm_alpha_read_reloc,
+  nlm_alpha_mangle_relocs,
+  nlm_alpha_read_import,
+  nlm_alpha_write_import,
+  nlm_alpha_set_public_section,
+  nlm_alpha_get_public_offset,
+  nlm_swap_fixed_header_in,
+  nlm_swap_fixed_header_out,
+  nlm_alpha_write_external,
+  0,	/* Write_export.  */
+};
+
+#define TARGET_LITTLE_NAME		"nlm32-alpha"
+#define TARGET_LITTLE_SYM		nlmNAME (alpha_vec)
+#define TARGET_BACKEND_DATA		& nlm32_alpha_backend
+
+#include "nlm-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/nlm32-i386.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/nlm32-i386.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/nlm32-i386.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/nlm32-i386.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,430 @@
+/* Support for 32-bit i386 NLM (NetWare Loadable Module)
+   Copyright 1993, 1994, 2000, 2001, 2002, 2003, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#define ARCH_SIZE 32
+
+#include "nlm/i386-ext.h"
+#define Nlm_External_Fixed_Header	Nlm32_i386_External_Fixed_Header
+
+#include "libnlm.h"
+
+/* Adjust the reloc location by an absolute value.  */
+
+static reloc_howto_type nlm_i386_abs_howto =
+  HOWTO (0,			/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* Bitsize.  */
+	 FALSE,			/* PC relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,			/* Special_function.  */
+	 "32",			/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Source mask.  */
+	 0xffffffff,		/* Dest mask.  */
+	 FALSE);		/* PR rel_offset.  */
+
+/* Adjust the reloc location by a PC relative displacement.  */
+
+static reloc_howto_type nlm_i386_pcrel_howto =
+  HOWTO (1,			/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* Bitsize.  */
+	 TRUE,			/* PC relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 0,			/* Special_function.  */
+	 "DISP32",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Source mask.  */
+	 0xffffffff,		/* Dest mask.  */
+	 TRUE);			/* PR rel_offset.  */
+
+/* Read a NetWare i386 reloc.  */
+
+static bfd_boolean
+nlm_i386_read_reloc (bfd *abfd,
+		     nlmNAME (symbol_type) *sym,
+		     asection **secp,
+		     arelent *rel)
+{
+  bfd_byte temp[4];
+  bfd_vma val;
+  const char *name;
+
+  if (bfd_bread (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
+    return FALSE;
+
+  val = bfd_get_32 (abfd, temp);
+
+  /* The value is an offset into either the code or data segment.
+     This is the location which needs to be adjusted.
+
+     If this is a relocation fixup rather than an imported symbol (the
+     sym argument is NULL) then the high bit is 0 if the location
+     needs to be adjusted by the address of the data segment, or 1 if
+     the location needs to be adjusted by the address of the code
+     segment.  If this is an imported symbol, then the high bit is 0
+     if the location is 0 if the location should be adjusted by the
+     offset to the symbol, or 1 if the location should adjusted by the
+     absolute value of the symbol.
+
+     The second most significant bit is 0 if the value is an offset
+     into the data segment, or 1 if the value is an offset into the
+     code segment.
+
+     All this translates fairly easily into a BFD reloc.  */
+
+  if (sym == NULL)
+    {
+      if ((val & NLM_HIBIT) == 0)
+	name = NLM_INITIALIZED_DATA_NAME;
+      else
+	{
+	  name = NLM_CODE_NAME;
+	  val &=~ NLM_HIBIT;
+	}
+      rel->sym_ptr_ptr = bfd_get_section_by_name (abfd, name)->symbol_ptr_ptr;
+      rel->howto = &nlm_i386_abs_howto;
+    }
+  else
+    {
+      /* In this case we do not need to set the sym_ptr_ptr field.  */
+      rel->sym_ptr_ptr = NULL;
+      if ((val & NLM_HIBIT) == 0)
+	rel->howto = &nlm_i386_pcrel_howto;
+      else
+	{
+	  rel->howto = &nlm_i386_abs_howto;
+	  val &=~ NLM_HIBIT;
+	}
+    }
+
+  if ((val & (NLM_HIBIT >> 1)) == 0)
+    *secp = bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME);
+  else
+    {
+      *secp = bfd_get_section_by_name (abfd, NLM_CODE_NAME);
+      val &=~ (NLM_HIBIT >> 1);
+    }
+
+  rel->address = val;
+  rel->addend = 0;
+
+  return TRUE;
+}
+
+/* Write a NetWare i386 reloc.  */
+
+static bfd_boolean
+nlm_i386_write_import (bfd * abfd, asection * sec, arelent * rel)
+{
+  asymbol *sym;
+  bfd_vma val;
+  bfd_byte temp[4];
+
+  /* NetWare only supports two kinds of relocs.  We should check
+     special_function here, as well, but at the moment coff-i386
+     relocs uses a special_function which does not affect what we do
+     here.  */
+  if (rel->addend != 0
+      || rel->howto == NULL
+      || rel->howto->rightshift != 0
+      || rel->howto->size != 2
+      || rel->howto->bitsize != 32
+      || rel->howto->bitpos != 0
+      || rel->howto->src_mask != 0xffffffff
+      || rel->howto->dst_mask != 0xffffffff)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  sym = *rel->sym_ptr_ptr;
+
+  /* The value we write out is the offset into the appropriate
+     segment.  This offset is the section vma, adjusted by the vma of
+     the lowest section in that segment, plus the address of the
+     relocation.  */
+  val = bfd_get_section_vma (abfd, sec) + rel->address;
+
+  /* The second most significant bit is 0 if the value is an offset
+     into the data segment, or 1 if the value is an offset into the
+     code segment.  */
+  if (bfd_get_section_flags (abfd, sec) & SEC_CODE)
+    {
+      val -= nlm_get_text_low (abfd);
+      val |= NLM_HIBIT >> 1;
+    }
+  else
+    val -= nlm_get_data_low (abfd);
+
+  if (! bfd_is_und_section (bfd_get_section (sym)))
+    {
+      /* NetWare only supports absolute internal relocs.  */
+      if (rel->howto->pc_relative)
+	{
+	  bfd_set_error (bfd_error_invalid_operation);
+	  return FALSE;
+	}
+
+      /* The high bit is 1 if the reloc is against the code section, 0
+	 if against the data section.  */
+      if (bfd_get_section_flags (abfd, bfd_get_section (sym)) & SEC_CODE)
+	val |= NLM_HIBIT;
+    }
+  else
+    {
+      /* The high bit is 1 if this is an absolute reloc, 0 if it is PC
+	 relative.  */
+      if (! rel->howto->pc_relative)
+	val |= NLM_HIBIT;
+      else
+	{
+	  /* PC relative relocs on NetWare must be pcrel_offset.  */
+	  if (! rel->howto->pcrel_offset)
+	    {
+	      bfd_set_error (bfd_error_invalid_operation);
+	      return FALSE;
+	    }
+	}
+    }
+
+  bfd_put_32 (abfd, val, temp);
+  if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* I want to be able to use objcopy to turn an i386 a.out or COFF file
+   into a NetWare i386 module.  That means that the relocs from the
+   source file have to be mapped into relocs that apply to the target
+   file.  This function is called by nlm_set_section_contents to give
+   it a chance to rework the relocs.
+
+   This is actually a fairly general concept.  However, this is not a
+   general implementation.  */
+
+static bfd_boolean
+nlm_i386_mangle_relocs (bfd *abfd,
+			asection *sec,
+			const PTR data,
+			bfd_vma offset,
+			bfd_size_type count)
+{
+  arelent **rel_ptr_ptr, **rel_end;
+
+  rel_ptr_ptr = sec->orelocation;
+  rel_end = rel_ptr_ptr + sec->reloc_count;
+  for (; rel_ptr_ptr < rel_end; rel_ptr_ptr++)
+    {
+      arelent *rel;
+      asymbol *sym;
+      bfd_vma addend;
+
+      rel = *rel_ptr_ptr;
+      sym = *rel->sym_ptr_ptr;
+
+      /* Note that no serious harm will ensue if we fail to change a
+	 reloc.  We will wind up failing in nlm_i386_write_import.  */
+
+      /* Make sure this reloc is within the data we have.  We only 4
+	 byte relocs here, so we insist on having 4 bytes.  */
+      if (rel->address < offset
+	  || rel->address + 4 > offset + count)
+	continue;
+
+      /* NetWare doesn't support reloc addends, so we get rid of them
+	 here by simply adding them into the object data.  We handle
+	 the symbol value, if any, the same way.  */
+      addend = rel->addend + sym->value;
+
+      /* The value of a symbol is the offset into the section.  If the
+	 symbol is in the .bss segment, we need to include the size of
+	 the data segment in the offset as well.  Fortunately, we know
+	 that at this point the size of the data section is in the NLM
+	 header.  */
+      if (((bfd_get_section_flags (abfd, bfd_get_section (sym))
+	    & SEC_LOAD) == 0)
+	  && ((bfd_get_section_flags (abfd, bfd_get_section (sym))
+	       & SEC_ALLOC) != 0))
+	addend += nlm_fixed_header (abfd)->dataImageSize;
+
+      if (addend != 0
+	  && rel->howto != NULL
+	  && rel->howto->rightshift == 0
+	  && rel->howto->size == 2
+	  && rel->howto->bitsize == 32
+	  && rel->howto->bitpos == 0
+	  && rel->howto->src_mask == 0xffffffff
+	  && rel->howto->dst_mask == 0xffffffff)
+	{
+	  bfd_vma val;
+
+	  val = bfd_get_32 (abfd, (bfd_byte *) data + rel->address - offset);
+	  val += addend;
+	  bfd_put_32 (abfd, val, (bfd_byte *) data + rel->address - offset);
+	  rel->addend = 0;
+	}
+
+      /* NetWare uses a reloc with pcrel_offset set.  We adjust
+	 pc_relative relocs accordingly.  We are going to change the
+	 howto field, so we can only do this if the current one is
+	 compatible.  We should check special_function here, but at
+	 the moment coff-i386 uses a special_function which does not
+	 affect what we are doing here.  */
+      if (rel->howto != NULL
+	  && rel->howto->pc_relative
+	  && ! rel->howto->pcrel_offset
+	  && rel->howto->rightshift == 0
+	  && rel->howto->size == 2
+	  && rel->howto->bitsize == 32
+	  && rel->howto->bitpos == 0
+	  && rel->howto->src_mask == 0xffffffff
+	  && rel->howto->dst_mask == 0xffffffff)
+	{
+	  bfd_vma val;
+
+	  /* When pcrel_offset is not set, it means that the negative
+	     of the address of the memory location is stored in the
+	     memory location.  We must add it back in.  */
+	  val = bfd_get_32 (abfd, (bfd_byte *) data + rel->address - offset);
+	  val += rel->address;
+	  bfd_put_32 (abfd, val, (bfd_byte *) data + rel->address - offset);
+
+	  rel->howto = &nlm_i386_pcrel_howto;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Read a NetWare i386 import record.  */
+
+static bfd_boolean
+nlm_i386_read_import (bfd * abfd, nlmNAME (symbol_type) * sym)
+{
+  struct nlm_relent *nlm_relocs;	/* Relocation records for symbol.  */
+  bfd_size_type rcount;			/* Number of relocs.  */
+  bfd_byte temp[NLM_TARGET_LONG_SIZE];	/* Temporary 32-bit value.  */
+  unsigned char symlength;		/* Length of symbol name.  */
+  char *name;
+
+  if (bfd_bread (& symlength, (bfd_size_type) sizeof (symlength), abfd)
+      != sizeof (symlength))
+    return FALSE;
+  sym -> symbol.the_bfd = abfd;
+  name = bfd_alloc (abfd, (bfd_size_type) symlength + 1);
+  if (name == NULL)
+    return FALSE;
+  if (bfd_bread (name, (bfd_size_type) symlength, abfd) != symlength)
+    return FALSE;
+  name[symlength] = '\0';
+  sym -> symbol.name = name;
+  sym -> symbol.flags = 0;
+  sym -> symbol.value = 0;
+  sym -> symbol.section = bfd_und_section_ptr;
+  if (bfd_bread (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
+    return FALSE;
+  rcount = H_GET_32 (abfd, temp);
+  nlm_relocs = bfd_alloc (abfd, rcount * sizeof (struct nlm_relent));
+  if (!nlm_relocs)
+    return FALSE;
+  sym -> relocs = nlm_relocs;
+  sym -> rcnt = 0;
+  while (sym -> rcnt < rcount)
+    {
+      asection *section;
+
+      if (! nlm_i386_read_reloc (abfd, sym, &section, &nlm_relocs -> reloc))
+	return FALSE;
+      nlm_relocs -> section = section;
+      nlm_relocs++;
+      sym -> rcnt++;
+    }
+  return TRUE;
+}
+
+/* Write out an external reference.  */
+
+static bfd_boolean
+nlm_i386_write_external (bfd *abfd,
+			 bfd_size_type count,
+			 asymbol *sym,
+			 struct reloc_and_sec *relocs)
+{
+  unsigned int i;
+  bfd_byte len;
+  unsigned char temp[NLM_TARGET_LONG_SIZE];
+
+  len = strlen (sym->name);
+  if ((bfd_bwrite (&len, (bfd_size_type) sizeof (bfd_byte), abfd)
+       != sizeof (bfd_byte))
+      || bfd_bwrite (sym->name, (bfd_size_type) len, abfd) != len)
+    return FALSE;
+
+  bfd_put_32 (abfd, count, temp);
+  if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
+    return FALSE;
+
+  for (i = 0; i < count; i++)
+    if (! nlm_i386_write_import (abfd, relocs[i].sec, relocs[i].rel))
+      return FALSE;
+
+  return TRUE;
+}
+
+#include "nlmswap.h"
+
+static const struct nlm_backend_data nlm32_i386_backend =
+{
+  "NetWare Loadable Module\032",
+  sizeof (Nlm32_i386_External_Fixed_Header),
+  0,	/* Optional_prefix_size.  */
+  bfd_arch_i386,
+  0,
+  FALSE,
+  0,	/* Backend_object_p.  */
+  0,	/* Write_prefix_func.  */
+  nlm_i386_read_reloc,
+  nlm_i386_mangle_relocs,
+  nlm_i386_read_import,
+  nlm_i386_write_import,
+  0,	/* Set_public_section.  */
+  0,	/* Set_public_offset.  */
+  nlm_swap_fixed_header_in,
+  nlm_swap_fixed_header_out,
+  nlm_i386_write_external,
+  0,	/* Write_export.  */
+};
+
+#define TARGET_LITTLE_NAME		"nlm32-i386"
+#define TARGET_LITTLE_SYM		nlmNAME (i386_vec)
+#define TARGET_BACKEND_DATA		& nlm32_i386_backend
+
+#include "nlm-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/nlm32-ppc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/nlm32-ppc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/nlm32-ppc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/nlm32-ppc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,987 @@
+/* Support for 32-bit PowerPC NLM (NetWare Loadable Module)
+   Copyright 1994, 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "bfd.h"
+#include "sysdep.h"
+#include "libbfd.h"
+
+/* The format of a PowerPC NLM changed.  Define OLDFORMAT to get the
+   old format.  */
+
+#define ARCH_SIZE 32
+
+#include "nlm/ppc-ext.h"
+#define Nlm_External_Fixed_Header	Nlm32_powerpc_External_Fixed_Header
+
+#include "libnlm.h"
+
+#ifdef OLDFORMAT
+
+/* The prefix header is only used in the old format.  */
+
+/* PowerPC NLM's have a prefix header before the standard NLM.  This
+   function reads it in, verifies the version, and seeks the bfd to
+   the location before the regular NLM header.  */
+
+static bfd_boolean
+nlm_powerpc_backend_object_p (bfd *abfd)
+{
+  struct nlm32_powerpc_external_prefix_header s;
+
+  if (bfd_bread (& s, (bfd_size_type) sizeof s, abfd) != sizeof s)
+    return FALSE;
+
+  if (memcmp (s.signature, NLM32_POWERPC_SIGNATURE, sizeof s.signature) != 0
+      || H_GET_32 (abfd, s.headerVersion) != NLM32_POWERPC_HEADER_VERSION)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Write out the prefix.  */
+
+static bfd_boolean
+nlm_powerpc_write_prefix (bfd *abfd)
+{
+  struct nlm32_powerpc_external_prefix_header s;
+
+  memset (&s, 0, sizeof s);
+  memcpy (s.signature, NLM32_POWERPC_SIGNATURE, sizeof s.signature);
+  H_PUT_32 (abfd, NLM32_POWERPC_HEADER_VERSION, s.headerVersion);
+  H_PUT_32 (abfd, 0, s.origins);
+
+  /* FIXME: What should we do about the date?  */
+
+  if (bfd_bwrite (& s, (bfd_size_type) sizeof s, abfd) != sizeof s)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* This reloc handling is only applicable to the old format.  */
+
+/* How to process the various reloc types.  PowerPC NLMs use XCOFF
+   reloc types, and I have just copied the XCOFF reloc table here.  */
+
+static reloc_howto_type nlm_powerpc_howto_table[] =
+{
+  /* Standard 32 bit relocation.  */
+  HOWTO (0,	                /* Type.  */
+	 0,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,	                /* Bitsize.  */
+	 FALSE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_POS",               /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0xffffffff,            /* Source mask.  */
+	 0xffffffff,            /* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  /* 32 bit relocation, but store negative value.  */
+  HOWTO (1,	                /* Type.  */
+	 0,	                /* Rightshift.  */
+	 -2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,	                /* Bitsize.  */
+	 FALSE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_NEG",               /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0xffffffff,            /* Source mask.  */
+	 0xffffffff,            /* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  /* 32 bit PC relative relocation.  */
+  HOWTO (2,	                /* Type.  */
+	 0,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,	                /* Bitsize.  */
+	 TRUE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_REL",               /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0xffffffff,            /* Source mask.  */
+	 0xffffffff,            /* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  /* 16 bit TOC relative relocation.  */
+  HOWTO (3,	                /* Type.  */
+	 0,	                /* Rightshift.  */
+	 1,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,	                /* Bitsize.  */
+	 FALSE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_TOC",               /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0xffff,	        /* Source mask.  */
+	 0xffff,        	/* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  /* I don't really know what this is.  */
+  HOWTO (4,	                /* Type.  */
+	 1,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,	                /* Bitsize.  */
+	 FALSE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_RTB",               /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0xffffffff,	        /* Source mask.  */
+	 0xffffffff,        	/* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  /* External TOC relative symbol.  */
+  HOWTO (5,	                /* Type.  */
+	 0,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,	                /* Bitsize.  */
+	 FALSE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_GL",                /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0xffff,	        /* Source mask.  */
+	 0xffff,        	/* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  /* Local TOC relative symbol.  */
+  HOWTO (6,	                /* Type.  */
+	 0,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,	                /* Bitsize.  */
+	 FALSE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_TCL",               /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0xffff,	        /* Source mask.  */
+	 0xffff,        	/* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  { 7 },
+
+  /* Non modifiable absolute branch.  */
+  HOWTO (8,	                /* Type.  */
+	 0,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 26,	                /* Bitsize.  */
+	 FALSE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_BA",                /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0x3fffffc,	        /* Source mask.  */
+	 0x3fffffc,        	/* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  { 9 },
+
+  /* Non modifiable relative branch.  */
+  HOWTO (0xa,	                /* Type.  */
+	 0,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 26,	                /* Bitsize.  */
+	 TRUE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_BR",                /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0x3fffffc,	        /* Source mask.  */
+	 0x3fffffc,        	/* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  { 0xb },
+
+  /* Indirect load.  */
+  HOWTO (0xc,	                /* Type.  */
+	 0,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,	                /* Bitsize.  */
+	 FALSE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_RL",                /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0xffff,	        /* Source mask.  */
+	 0xffff,        	/* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  /* Load address.  */
+  HOWTO (0xd,	                /* Type.  */
+	 0,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,	                /* Bitsize.  */
+	 FALSE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_RLA",               /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0xffff,	        /* Source mask.  */
+	 0xffff,        	/* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  { 0xe },
+
+  /* Non-relocating reference.  */
+  HOWTO (0xf,	                /* Type.  */
+	 0,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,	                /* Bitsize.  */
+	 FALSE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_REF",               /* Name.  */
+	 FALSE,	                /* Partial_inplace.  */
+	 0,		        /* Source mask.  */
+	 0,     	   	/* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  { 0x10 },
+  { 0x11 },
+
+  /* TOC relative indirect load.  */
+  HOWTO (0x12,	                /* Type.  */
+	 0,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,	                /* Bitsize.  */
+	 FALSE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_TRL",               /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0xffff,	        /* Source mask.  */
+	 0xffff,        	/* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  /* TOC relative load address.  */
+  HOWTO (0x13,	                /* Type.  */
+	 0,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,	                /* Bitsize.  */
+	 FALSE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_TRLA",              /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0xffff,	        /* Source mask.  */
+	 0xffff,        	/* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  /* Modifiable relative branch.  */
+  HOWTO (0x14,	                /* Type.  */
+	 1,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,	                /* Bitsize.  */
+	 FALSE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_RRTBI",             /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0xffffffff,	        /* Source mask.  */
+	 0xffffffff,        	/* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  /* Modifiable absolute branch.  */
+  HOWTO (0x15,	                /* Type.  */
+	 1,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,	                /* Bitsize.  */
+	 FALSE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_RRTBA",             /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0xffffffff,	        /* Source mask.  */
+	 0xffffffff,        	/* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  /* Modifiable call absolute indirect.  */
+  HOWTO (0x16,	                /* Type.  */
+	 0,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,	                /* Bitsize.  */
+	 FALSE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_CAI",               /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0xffff,	        /* Source mask.  */
+	 0xffff,        	/* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  /* Modifiable call relative.  */
+  HOWTO (0x17,	                /* Type.  */
+	 0,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,	                /* Bitsize.  */
+	 FALSE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_REL",               /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0xffff,	        /* Source mask.  */
+	 0xffff,        	/* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  /* Modifiable branch absolute.  */
+  HOWTO (0x18,	                /* Type.  */
+	 0,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,	                /* Bitsize.  */
+	 FALSE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_RBA",               /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0xffff,	        /* Source mask.  */
+	 0xffff,        	/* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  /* Modifiable branch absolute.  */
+  HOWTO (0x19,	                /* Type.  */
+	 0,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,	                /* Bitsize.  */
+	 FALSE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_RBAC",              /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0xffff,	        /* Source mask.  */
+	 0xffff,        	/* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  /* Modifiable branch relative.  */
+  HOWTO (0x1a,	                /* Type.  */
+	 0,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 26,	                /* Bitsize.  */
+	 FALSE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_REL",               /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0xffff,	        /* Source mask.  */
+	 0xffff,        	/* Dest mask.  */
+	 FALSE),                /* PC rel offset.  */
+
+  /* Modifiable branch absolute.  */
+  HOWTO (0x1b,	                /* Type.  */
+	 0,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,	                /* Bitsize.  */
+	 FALSE,	                /* PC relative.  */
+	 0,	                /* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,		        /* Special_function.  */
+	 "R_REL",               /* Name.  */
+	 TRUE,	                /* Partial_inplace.  */
+	 0xffff,	        /* Source mask.  */
+	 0xffff,        	/* Dest mask.  */
+	 FALSE)                 /* PC rel offset.  */
+};
+
+#define HOWTO_COUNT (sizeof nlm_powerpc_howto_table		\
+		     / sizeof nlm_powerpc_howto_table[0])
+
+/* Read a PowerPC NLM reloc.  */
+
+static bfd_boolean
+nlm_powerpc_read_reloc (bfd *abfd,
+			nlmNAME (symbol_type) *sym,
+			asection **secp,
+			arelent *rel)
+{
+  struct nlm32_powerpc_external_reloc ext;
+  bfd_vma l_vaddr;
+  unsigned long l_symndx;
+  int l_rtype;
+  int l_rsecnm;
+  asection *code_sec, *data_sec, *bss_sec;
+
+  /* Read the reloc from the file.  */
+  if (bfd_bread (&ext, (bfd_size_type) sizeof ext, abfd) != sizeof ext)
+    return FALSE;
+
+  /* Swap in the fields.  */
+  l_vaddr = H_GET_32 (abfd, ext.l_vaddr);
+  l_symndx = H_GET_32 (abfd, ext.l_symndx);
+  l_rtype = H_GET_16 (abfd, ext.l_rtype);
+  l_rsecnm = H_GET_16 (abfd, ext.l_rsecnm);
+
+  /* Get the sections now, for convenience.  */
+  code_sec = bfd_get_section_by_name (abfd, NLM_CODE_NAME);
+  data_sec = bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME);
+  bss_sec = bfd_get_section_by_name (abfd, NLM_UNINITIALIZED_DATA_NAME);
+
+  /* Work out the arelent fields.  */
+  if (sym != NULL)
+    /* This is an import.  sym_ptr_ptr is filled in by
+       nlm_canonicalize_reloc.  */
+    rel->sym_ptr_ptr = NULL;
+  else
+    {
+      asection *sec;
+
+      if (l_symndx == 0)
+	sec = code_sec;
+      else if (l_symndx == 1)
+	sec = data_sec;
+      else if (l_symndx == 2)
+	sec = bss_sec;
+      else
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      rel->sym_ptr_ptr = sec->symbol_ptr_ptr;
+    }
+
+  rel->addend = 0;
+
+  BFD_ASSERT ((l_rtype & 0xff) < HOWTO_COUNT);
+
+  rel->howto = nlm_powerpc_howto_table + (l_rtype & 0xff);
+
+  BFD_ASSERT (rel->howto->name != NULL
+	      && ((l_rtype & 0x8000) != 0
+		  ? (rel->howto->complain_on_overflow
+		     == complain_overflow_signed)
+		  : (rel->howto->complain_on_overflow
+		     == complain_overflow_bitfield))
+	      && ((l_rtype >> 8) & 0x1f) == rel->howto->bitsize - 1);
+
+  if (l_rsecnm == 0)
+    *secp = code_sec;
+  else if (l_rsecnm == 1)
+    {
+      *secp = data_sec;
+      l_vaddr -= code_sec->size;
+    }
+  else
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  rel->address = l_vaddr;
+
+  return TRUE;
+}
+
+#else /* not OLDFORMAT */
+
+/* There is only one type of reloc in a PowerPC NLM.  */
+
+static reloc_howto_type nlm_powerpc_howto =
+  HOWTO (0,			/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* Bitsize.  */
+	 FALSE,			/* PC relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 0,			/* Special_function.  */
+	 "32",			/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Source mask.  */
+	 0xffffffff,		/* Dest mask.  */
+	 FALSE);		/* PC rel_offset.  */
+
+/* Read a PowerPC NLM reloc.  */
+
+static bfd_boolean
+nlm_powerpc_read_reloc (bfd *abfd,
+			nlmNAME (symbol_type) *sym,
+			asection **secp,
+			arelent *rel)
+{
+  bfd_byte temp[4];
+  bfd_vma val;
+  const char *name;
+
+  if (bfd_bread (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
+    return FALSE;
+
+  val = bfd_get_32 (abfd, temp);
+
+  /* The value is a word offset into either the code or data segment.
+     This is the location which needs to be adjusted.
+
+     The high bit is 0 if the value is an offset into the data
+     segment, or 1 if the value is an offset into the text segment.
+
+     If this is a relocation fixup rather than an imported symbol (the
+     sym argument is NULL), then the second most significant bit is 0
+     if the address of the data segment should be added to the
+     location addressed by the value, or 1 if the address of the text
+     segment should be added.
+
+     If this is an imported symbol, the second most significant bit is
+     not used and must be 0.  */
+
+  if ((val & NLM_HIBIT) == 0)
+    name = NLM_INITIALIZED_DATA_NAME;
+  else
+    {
+      name = NLM_CODE_NAME;
+      val &=~ NLM_HIBIT;
+    }
+  *secp = bfd_get_section_by_name (abfd, name);
+
+  if (sym == NULL)
+    {
+      if ((val & (NLM_HIBIT >> 1)) == 0)
+	name = NLM_INITIALIZED_DATA_NAME;
+      else
+	{
+	  name = NLM_CODE_NAME;
+	  val &=~ (NLM_HIBIT >> 1);
+	}
+      rel->sym_ptr_ptr = bfd_get_section_by_name (abfd, name)->symbol_ptr_ptr;
+    }
+
+  rel->howto   = & nlm_powerpc_howto;
+  rel->address = val << 2;
+  rel->addend  = 0;
+
+  return TRUE;
+}
+
+#endif /* not OLDFORMAT */
+
+/* Mangle PowerPC NLM relocs for output.  */
+
+static bfd_boolean
+nlm_powerpc_mangle_relocs (bfd *abfd ATTRIBUTE_UNUSED,
+			   asection *sec ATTRIBUTE_UNUSED,
+			   const void * data ATTRIBUTE_UNUSED,
+			   bfd_vma offset ATTRIBUTE_UNUSED,
+			   bfd_size_type count ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+/* Read a PowerPC NLM import record */
+
+static bfd_boolean
+nlm_powerpc_read_import (bfd * abfd, nlmNAME (symbol_type) * sym)
+{
+  struct nlm_relent *nlm_relocs;	/* Relocation records for symbol.  */
+  bfd_size_type rcount;			/* Number of relocs.  */
+  bfd_byte temp[NLM_TARGET_LONG_SIZE];	/* Temporary 32-bit value.  */
+  unsigned char symlength;		/* Length of symbol name.  */
+  char *name;
+
+  if (bfd_bread (& symlength, (bfd_size_type) sizeof (symlength), abfd)
+      != sizeof (symlength))
+    return FALSE;
+  sym -> symbol.the_bfd = abfd;
+  name = bfd_alloc (abfd, (bfd_size_type) symlength + 1);
+  if (name == NULL)
+    return FALSE;
+  if (bfd_bread (name, (bfd_size_type) symlength, abfd) != symlength)
+    return FALSE;
+  name[symlength] = '\0';
+  sym -> symbol.name = name;
+  sym -> symbol.flags = 0;
+  sym -> symbol.value = 0;
+  sym -> symbol.section = bfd_und_section_ptr;
+  if (bfd_bread (temp, (bfd_size_type) sizeof (temp), abfd)
+      != sizeof (temp))
+    return FALSE;
+  rcount = H_GET_32 (abfd, temp);
+  nlm_relocs = bfd_alloc (abfd, rcount * sizeof (struct nlm_relent));
+  if (nlm_relocs == NULL)
+    return FALSE;
+  sym -> relocs = nlm_relocs;
+  sym -> rcnt = 0;
+  while (sym -> rcnt < rcount)
+    {
+      asection *section;
+
+      if (! nlm_powerpc_read_reloc (abfd, sym, &section, &nlm_relocs -> reloc))
+	return FALSE;
+      nlm_relocs -> section = section;
+      nlm_relocs++;
+      sym -> rcnt++;
+    }
+  return TRUE;
+}
+
+#ifndef OLDFORMAT
+
+/* Write a PowerPC NLM reloc.  */
+
+static bfd_boolean
+nlm_powerpc_write_import (bfd * abfd, asection * sec, arelent * rel)
+{
+  asymbol *sym;
+  bfd_vma val;
+  bfd_byte temp[4];
+
+  /* PowerPC NetWare only supports one kind of reloc.  */
+  if (rel->addend != 0
+      || rel->howto == NULL
+      || rel->howto->rightshift != 0
+      || rel->howto->size != 2
+      || rel->howto->bitsize != 32
+      || rel->howto->bitpos != 0
+      || rel->howto->pc_relative
+      || (rel->howto->src_mask != 0xffffffff && rel->addend != 0)
+      || rel->howto->dst_mask != 0xffffffff)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  sym = *rel->sym_ptr_ptr;
+
+  /* The value we write out is the offset into the appropriate
+     segment, rightshifted by two.  This offset is the section vma,
+     adjusted by the vma of the lowest section in that segment, plus
+     the address of the relocation.  */
+  val = bfd_get_section_vma (abfd, sec) + rel->address;
+  if ((val & 3) != 0)
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+  val >>= 2;
+
+  /* The high bit is 0 if the reloc is in the data section, or 1 if
+     the reloc is in the code section.  */
+  if (bfd_get_section_flags (abfd, sec) & SEC_DATA)
+    val -= nlm_get_data_low (abfd);
+  else
+    {
+      val -= nlm_get_text_low (abfd);
+      val |= NLM_HIBIT;
+    }
+
+  if (! bfd_is_und_section (bfd_get_section (sym)))
+    {
+      /* This is an internal relocation fixup.  The second most
+	 significant bit is 0 if this is a reloc against the data
+	 segment, or 1 if it is a reloc against the text segment.  */
+      if (bfd_get_section_flags (abfd, bfd_get_section (sym)) & SEC_CODE)
+	val |= NLM_HIBIT >> 1;
+    }
+
+  bfd_put_32 (abfd, val, temp);
+  if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
+    return FALSE;
+
+  return TRUE;
+}
+
+#else /* OLDFORMAT */
+
+/* This is used for the reloc handling in the old format.  */
+
+/* Write a PowerPC NLM reloc.  */
+
+static bfd_boolean
+nlm_powerpc_write_reloc (bfd *abfd,
+			 asection *sec,
+			 arelent *rel,
+			 int indx)
+{
+  struct nlm32_powerpc_external_reloc ext;
+  asection *code_sec, *data_sec, *bss_sec;
+  asymbol *sym;
+  asection *symsec;
+  unsigned long l_symndx;
+  int l_rtype;
+  int l_rsecnm;
+  reloc_howto_type *howto;
+  bfd_size_type address;
+
+  /* Get the sections now, for convenience.  */
+  code_sec = bfd_get_section_by_name (abfd, NLM_CODE_NAME);
+  data_sec = bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME);
+  bss_sec = bfd_get_section_by_name (abfd, NLM_UNINITIALIZED_DATA_NAME);
+
+  sym = *rel->sym_ptr_ptr;
+  symsec = bfd_get_section (sym);
+  if (indx != -1)
+    {
+      BFD_ASSERT (bfd_is_und_section (symsec));
+      l_symndx = indx + 3;
+    }
+  else
+    {
+      if (symsec == code_sec)
+	l_symndx = 0;
+      else if (symsec == data_sec)
+	l_symndx = 1;
+      else if (symsec == bss_sec)
+	l_symndx = 2;
+      else
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+    }
+
+  H_PUT_32 (abfd, l_symndx, ext.l_symndx);
+
+  for (howto = nlm_powerpc_howto_table;
+       howto < nlm_powerpc_howto_table + HOWTO_COUNT;
+       howto++)
+    {
+      if (howto->rightshift == rel->howto->rightshift
+	  && howto->size == rel->howto->size
+	  && howto->bitsize == rel->howto->bitsize
+	  && howto->pc_relative == rel->howto->pc_relative
+	  && howto->bitpos == rel->howto->bitpos
+	  && (howto->partial_inplace == rel->howto->partial_inplace
+	      || (! rel->howto->partial_inplace
+		  && rel->addend == 0))
+	  && (howto->src_mask == rel->howto->src_mask
+	      || (rel->howto->src_mask == 0
+		  && rel->addend == 0))
+	  && howto->dst_mask == rel->howto->dst_mask
+	  && howto->pcrel_offset == rel->howto->pcrel_offset)
+	break;
+    }
+  if (howto >= nlm_powerpc_howto_table + HOWTO_COUNT)
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  l_rtype = howto->type;
+  if (howto->complain_on_overflow == complain_overflow_signed)
+    l_rtype |= 0x8000;
+  l_rtype |= (howto->bitsize - 1) << 8;
+  H_PUT_16 (abfd, l_rtype, ext.l_rtype);
+
+  address = rel->address;
+
+  if (sec == code_sec)
+    l_rsecnm = 0;
+  else if (sec == data_sec)
+    {
+      l_rsecnm = 1;
+      address += code_sec->size;
+    }
+  else
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  H_PUT_16 (abfd, l_rsecnm, ext.l_rsecnm);
+  H_PUT_32 (abfd, address, ext.l_vaddr);
+
+  if (bfd_bwrite (&ext, (bfd_size_type) sizeof ext, abfd) != sizeof ext)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Write a PowerPC NLM import.  */
+
+static bfd_boolean
+nlm_powerpc_write_import (bfd * abfd, asection * sec, arelent * rel)
+{
+  return nlm_powerpc_write_reloc (abfd, sec, rel, -1);
+}
+
+#endif /* OLDFORMAT */
+
+/* Write a PowerPC NLM external symbol.  This routine keeps a static
+   count of the symbol index.  FIXME: I don't know if this is
+   necessary, and the index never gets reset.  */
+
+static bfd_boolean
+nlm_powerpc_write_external (bfd *abfd,
+			    bfd_size_type count,
+			    asymbol *sym,
+			    struct reloc_and_sec *relocs)
+{
+  unsigned int i;
+  bfd_byte len;
+  unsigned char temp[NLM_TARGET_LONG_SIZE];
+#ifdef OLDFORMAT
+  static int indx;
+#endif
+
+  len = strlen (sym->name);
+  if ((bfd_bwrite (&len, (bfd_size_type) sizeof (bfd_byte), abfd)
+       != sizeof (bfd_byte))
+      || bfd_bwrite (sym->name, (bfd_size_type) len, abfd) != len)
+    return FALSE;
+
+  bfd_put_32 (abfd, count, temp);
+  if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
+    return FALSE;
+
+  for (i = 0; i < count; i++)
+    {
+#ifndef OLDFORMAT
+      if (! nlm_powerpc_write_import (abfd, relocs[i].sec, relocs[i].rel))
+	return FALSE;
+#else
+      if (! nlm_powerpc_write_reloc (abfd, relocs[i].sec,
+				     relocs[i].rel, indx))
+	return FALSE;
+#endif
+    }
+
+#ifdef OLDFORMAT
+  ++indx;
+#endif
+
+  return TRUE;
+}
+
+#ifndef OLDFORMAT
+
+/* PowerPC Netware uses a word offset, not a byte offset, for public
+   symbols.  */
+
+/* Set the section for a public symbol.  */
+
+static bfd_boolean
+nlm_powerpc_set_public_section (bfd *abfd, nlmNAME (symbol_type) *sym)
+{
+  if (sym->symbol.value & NLM_HIBIT)
+    {
+      sym->symbol.value &= ~NLM_HIBIT;
+      sym->symbol.flags |= BSF_FUNCTION;
+      sym->symbol.section =
+	bfd_get_section_by_name (abfd, NLM_CODE_NAME);
+    }
+  else
+    sym->symbol.section =
+      bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME);
+
+  sym->symbol.value <<= 2;
+
+  return TRUE;
+}
+
+/* Get the offset to write out for a public symbol.  */
+
+static bfd_vma
+nlm_powerpc_get_public_offset (bfd *abfd, asymbol *sym)
+{
+  bfd_vma offset;
+  asection *sec;
+
+  offset = bfd_asymbol_value (sym);
+  sec = bfd_get_section (sym);
+  if (sec->flags & SEC_CODE)
+    {
+      offset -= nlm_get_text_low (abfd);
+      offset |= NLM_HIBIT;
+    }
+  else if (sec->flags & (SEC_DATA | SEC_ALLOC))
+    {
+      /* SEC_ALLOC is for the .bss section.  */
+      offset -= nlm_get_data_low (abfd);
+    }
+  else
+    {
+      /* We can't handle an exported symbol that is not in the code or
+	 data segment.  */
+      bfd_set_error (bfd_error_invalid_operation);
+      /* FIXME: No way to return error.  */
+      abort ();
+    }
+
+  return offset;
+}
+
+#endif /* ! defined (OLDFORMAT) */
+
+#include "nlmswap.h"
+
+static const struct nlm_backend_data nlm32_powerpc_backend =
+{
+  "NetWare PowerPC Module \032",
+  sizeof (Nlm32_powerpc_External_Fixed_Header),
+#ifndef OLDFORMAT
+  0,	/* Optional_prefix_size.  */
+#else
+  sizeof (struct nlm32_powerpc_external_prefix_header),
+#endif
+  bfd_arch_powerpc,
+  0,
+  FALSE,
+#ifndef OLDFORMAT
+  0,	/* Backend_object_p.  */
+  0,	/* Write_prefix.  */
+#else
+  nlm_powerpc_backend_object_p,
+  nlm_powerpc_write_prefix,
+#endif
+  nlm_powerpc_read_reloc,
+  nlm_powerpc_mangle_relocs,
+  nlm_powerpc_read_import,
+  nlm_powerpc_write_import,
+#ifndef OLDFORMAT
+  nlm_powerpc_set_public_section,
+  nlm_powerpc_get_public_offset,
+#else
+  0,	/* Set_public_section.  */
+  0,	/* Get_public_offset.  */
+#endif
+  nlm_swap_fixed_header_in,
+  nlm_swap_fixed_header_out,
+  nlm_powerpc_write_external,
+  0,	/* Write_export.  */
+};
+
+#define TARGET_BIG_NAME			"nlm32-powerpc"
+#define TARGET_BIG_SYM			nlmNAME (powerpc_vec)
+#define TARGET_BACKEND_DATA		& nlm32_powerpc_backend
+
+#include "nlm-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/nlm32-sparc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/nlm32-sparc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/nlm32-sparc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/nlm32-sparc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,379 @@
+/* Support for 32-bit SPARC NLM (NetWare Loadable Module)
+   Copyright 1993, 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007, 2009, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#define ARCH_SIZE 32
+
+#include "nlm/sparc32-ext.h"
+#define Nlm_External_Fixed_Header	Nlm32_sparc_External_Fixed_Header
+
+#include "libnlm.h"
+
+enum reloc_type
+{
+  R_SPARC_NONE = 0,
+  R_SPARC_8,		R_SPARC_16,		R_SPARC_32,
+  R_SPARC_DISP8,	R_SPARC_DISP16,		R_SPARC_DISP32,
+  R_SPARC_WDISP30,	R_SPARC_WDISP22,
+  R_SPARC_HI22,		R_SPARC_22,
+  R_SPARC_13,		R_SPARC_LO10,
+  R_SPARC_GOT10,	R_SPARC_GOT13,		R_SPARC_GOT22,
+  R_SPARC_PC10,		R_SPARC_PC22,
+  R_SPARC_WPLT30,
+  R_SPARC_COPY,
+  R_SPARC_GLOB_DAT,	R_SPARC_JMP_SLOT,
+  R_SPARC_RELATIVE,
+  R_SPARC_UA32,
+  R_SPARC_max
+};
+
+static reloc_howto_type nlm32_sparc_howto_table[] =
+{
+  HOWTO (R_SPARC_NONE,    0,0, 0,FALSE,0,complain_overflow_dont,    0,"R_SPARC_NONE",    FALSE,0,0x00000000,TRUE),
+  HOWTO (R_SPARC_8,       0,0, 8,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_8",       FALSE,0,0x000000ff,TRUE),
+  HOWTO (R_SPARC_16,      0,1,16,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_16",      FALSE,0,0x0000ffff,TRUE),
+  HOWTO (R_SPARC_32,      0,2,32,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_32",      FALSE,0,0xffffffff,TRUE),
+  HOWTO (R_SPARC_DISP8,   0,0, 8,TRUE, 0,complain_overflow_signed,  0,"R_SPARC_DISP8",   FALSE,0,0x000000ff,TRUE),
+  HOWTO (R_SPARC_DISP16,  0,1,16,TRUE, 0,complain_overflow_signed,  0,"R_SPARC_DISP16",  FALSE,0,0x0000ffff,TRUE),
+  HOWTO (R_SPARC_DISP32,  0,2,32,TRUE, 0,complain_overflow_signed,  0,"R_SPARC_DISP32",  FALSE,0,0x00ffffff,TRUE),
+  HOWTO (R_SPARC_WDISP30, 2,2,30,TRUE, 0,complain_overflow_signed,  0,"R_SPARC_WDISP30", FALSE,0,0x3fffffff,TRUE),
+  HOWTO (R_SPARC_WDISP22, 2,2,22,TRUE, 0,complain_overflow_signed,  0,"R_SPARC_WDISP22", FALSE,0,0x003fffff,TRUE),
+  HOWTO (R_SPARC_HI22,   10,2,22,FALSE,0,complain_overflow_dont,    0,"R_SPARC_HI22",    FALSE,0,0x003fffff,TRUE),
+  HOWTO (R_SPARC_22,      0,2,22,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_22",      FALSE,0,0x003fffff,TRUE),
+  HOWTO (R_SPARC_13,      0,2,13,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_13",      FALSE,0,0x00001fff,TRUE),
+  HOWTO (R_SPARC_LO10,    0,2,10,FALSE,0,complain_overflow_dont,    0,"R_SPARC_LO10",    FALSE,0,0x000003ff,TRUE),
+  HOWTO (R_SPARC_GOT10,   0,2,10,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_GOT10",   FALSE,0,0x000003ff,TRUE),
+  HOWTO (R_SPARC_GOT13,   0,2,13,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_GOT13",   FALSE,0,0x00001fff,TRUE),
+  HOWTO (R_SPARC_GOT22,  10,2,22,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_GOT22",   FALSE,0,0x003fffff,TRUE),
+  HOWTO (R_SPARC_PC10,    0,2,10,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_PC10",    FALSE,0,0x000003ff,TRUE),
+  HOWTO (R_SPARC_PC22,    0,2,22,FALSE,0,complain_overflow_bitfield,0,"R_SPARC_PC22",    FALSE,0,0x003fffff,TRUE),
+  HOWTO (R_SPARC_WPLT30,  0,0,00,FALSE,0,complain_overflow_dont,    0,"R_SPARC_WPLT30",  FALSE,0,0x00000000,TRUE),
+  HOWTO (R_SPARC_COPY,    0,0,00,FALSE,0,complain_overflow_dont,    0,"R_SPARC_COPY",    FALSE,0,0x00000000,TRUE),
+  HOWTO (R_SPARC_GLOB_DAT,0,0,00,FALSE,0,complain_overflow_dont,    0,"R_SPARC_GLOB_DAT",FALSE,0,0x00000000,TRUE),
+  HOWTO (R_SPARC_JMP_SLOT,0,0,00,FALSE,0,complain_overflow_dont,    0,"R_SPARC_JMP_SLOT",FALSE,0,0x00000000,TRUE),
+  HOWTO (R_SPARC_RELATIVE,0,0,00,FALSE,0,complain_overflow_dont,    0,"R_SPARC_RELATIVE",FALSE,0,0x00000000,TRUE),
+  HOWTO (R_SPARC_UA32,    0,0,00,FALSE,0,complain_overflow_dont,    0,"R_SPARC_UA32",    FALSE,0,0x00000000,TRUE),
+};
+
+/* Read a NetWare sparc reloc.  */
+
+struct nlm32_sparc_reloc_ext
+{
+  unsigned char offset[4];
+  unsigned char addend[4];
+  unsigned char type[1];
+  unsigned char pad1[3];
+};
+
+static bfd_boolean
+nlm_sparc_read_reloc (bfd *abfd,
+		      nlmNAME (symbol_type) *sym ATTRIBUTE_UNUSED,
+		      asection **secp,
+		      arelent *rel)
+{
+  bfd_vma val, addend;
+  unsigned int howto_index;
+  unsigned int type;
+  struct nlm32_sparc_reloc_ext tmp_reloc;
+  asection *code_sec;
+
+  if (bfd_bread (&tmp_reloc, (bfd_size_type) 12, abfd) != 12)
+    return FALSE;
+
+  code_sec = bfd_get_section_by_name (abfd, NLM_CODE_NAME);
+  *secp = code_sec;
+
+  val = bfd_get_32 (abfd, tmp_reloc.offset);
+  addend = bfd_get_32 (abfd, tmp_reloc.addend);
+  type = bfd_get_8 (abfd, tmp_reloc.type);
+
+  rel->address = val;
+  rel->addend = addend;
+  rel->howto = NULL;
+
+  for (howto_index = 0;
+       howto_index < sizeof (nlm32_sparc_howto_table) / sizeof (reloc_howto_type);
+       howto_index++)
+    if (nlm32_sparc_howto_table[howto_index].type == type)
+      {
+	rel->howto = &nlm32_sparc_howto_table[howto_index];
+	break;
+      }
+
+#ifdef DEBUG
+  fprintf (stderr, "%s:  address = %08lx, addend = %08lx, type = %u, howto = %p\n",
+	   __FUNCTION__, (unsigned long) rel->address,
+	   (unsigned long) rel->addend, type, rel->howto);
+#endif
+  return TRUE;
+
+}
+
+/* Write a NetWare sparc reloc.  */
+
+static bfd_boolean
+nlm_sparc_write_reloc (bfd * abfd, asection * sec, arelent * rel)
+{
+  bfd_vma val;
+  struct nlm32_sparc_reloc_ext tmp_reloc;
+  unsigned int howto_index;
+  int type = -1;
+  reloc_howto_type *tmp;
+
+  for (howto_index = 0;
+       howto_index < sizeof (nlm32_sparc_howto_table) / sizeof (reloc_howto_type);
+       howto_index++)
+    {
+      tmp = &nlm32_sparc_howto_table[howto_index];
+
+      if (tmp->rightshift == rel->howto->rightshift
+	  && tmp->size == rel->howto->size
+	  && tmp->bitsize == rel->howto->bitsize
+	  && tmp->pc_relative == rel->howto->pc_relative
+	  && tmp->bitpos == rel->howto->bitpos
+	  && tmp->src_mask == rel->howto->src_mask
+	  && tmp->dst_mask == rel->howto->dst_mask)
+	{
+	  type = tmp->type;
+	  break;
+	}
+    }
+  if (type == -1)
+    abort ();
+
+  /* Netware wants a list of relocs for each address.
+     Format is:
+    	long	offset
+    	long	addend
+    	char	type
+     That should be it.  */
+
+  /* The value we write out is the offset into the appropriate
+     segment.  This offset is the section vma, adjusted by the vma of
+     the lowest section in that segment, plus the address of the
+     relocation.  */
+  val = bfd_get_section_vma (abfd, sec) + rel->address;
+
+#ifdef DEBUG
+  fprintf (stderr, "%s:  val = %08lx, addend = %08lx, type = %u\n",
+	   __FUNCTION__, (unsigned long) val, (unsigned long) rel->addend,
+	   rel->howto->type);
+#endif
+  bfd_put_32 (abfd, val, tmp_reloc.offset);
+  bfd_put_32 (abfd, rel->addend, tmp_reloc.addend);
+  bfd_put_8 (abfd, (short) (rel->howto->type), tmp_reloc.type);
+
+  if (bfd_bwrite (&tmp_reloc, (bfd_size_type) 12, abfd) != 12)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Mangle relocs for SPARC NetWare.  We can just use the standard
+   SPARC relocs.  */
+
+static bfd_boolean
+nlm_sparc_mangle_relocs (bfd *abfd ATTRIBUTE_UNUSED,
+			 asection *sec ATTRIBUTE_UNUSED,
+			 const void * data ATTRIBUTE_UNUSED,
+			 bfd_vma offset ATTRIBUTE_UNUSED,
+			 bfd_size_type count ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+/* Read a NetWare sparc import record.  */
+
+static bfd_boolean
+nlm_sparc_read_import (bfd *abfd, nlmNAME (symbol_type) *sym)
+{
+  struct nlm_relent *nlm_relocs;	/* Relocation records for symbol.  */
+  bfd_size_type rcount;			/* Number of relocs.  */
+  bfd_byte temp[NLM_TARGET_LONG_SIZE];	/* Temporary 32-bit value.  */
+  unsigned char symlength;		/* Length of symbol name.  */
+  char *name;
+
+  /* First, read in the number of relocation
+     entries for this symbol.  */
+  if (bfd_bread (temp, (bfd_size_type) 4, abfd) != 4)
+    return FALSE;
+
+  rcount = bfd_get_32 (abfd, temp);
+
+  /* Next, read in the length of the symbol.  */
+  if (bfd_bread (& symlength, (bfd_size_type) sizeof (symlength), abfd)
+      != sizeof (symlength))
+    return FALSE;
+  sym -> symbol.the_bfd = abfd;
+  name = bfd_alloc (abfd, (bfd_size_type) symlength + 1);
+  if (name == NULL)
+    return FALSE;
+
+  /* Then read in the symbol.  */
+  if (bfd_bread (name, (bfd_size_type) symlength, abfd) != symlength)
+    return FALSE;
+  name[symlength] = '\0';
+  sym -> symbol.name = name;
+  sym -> symbol.flags = 0;
+  sym -> symbol.value = 0;
+  sym -> symbol.section = bfd_und_section_ptr;
+
+  /* Next, start reading in the relocs.  */
+  nlm_relocs = bfd_alloc (abfd, rcount * sizeof (struct nlm_relent));
+  if (!nlm_relocs)
+    return FALSE;
+  sym -> relocs = nlm_relocs;
+  sym -> rcnt = 0;
+  while (sym -> rcnt < rcount)
+    {
+      asection *section;
+
+      if (! nlm_sparc_read_reloc (abfd, sym, &section, &nlm_relocs -> reloc))
+	return FALSE;
+      nlm_relocs -> section = section;
+      nlm_relocs++;
+      sym -> rcnt++;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+nlm_sparc_write_import (bfd * abfd, asection * sec, arelent * rel)
+{
+  char temp[4];
+  asection *code, *data, *bss, *symsec;
+  bfd_vma base;
+
+  code = bfd_get_section_by_name (abfd, NLM_CODE_NAME);
+  data = bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME);
+  bss = bfd_get_section_by_name (abfd, NLM_UNINITIALIZED_DATA_NAME);
+  symsec = (*rel->sym_ptr_ptr)->section;
+
+  if (symsec == code)
+    base = 0;
+  else if (symsec == data)
+    base = code->size;
+  else if (symsec == bss)
+    base = code->size + data->size;
+  else
+    base = 0;
+
+#ifdef DEBUG
+  fprintf (stderr, "%s:  <%lx, 1>\n\t",
+	   __FUNCTION__, (unsigned long) (base + (*rel->sym_ptr_ptr)->value));
+#endif
+  bfd_put_32 (abfd, base + (*rel->sym_ptr_ptr)->value, temp);
+  if (bfd_bwrite (temp, (bfd_size_type) 4, abfd) != 4)
+    return FALSE;
+  bfd_put_32 (abfd, (bfd_vma) 1, temp);
+  if (bfd_bwrite (temp, (bfd_size_type) 4, abfd) != 4)
+    return FALSE;
+  if (! nlm_sparc_write_reloc (abfd, sec, rel))
+    return FALSE;
+  return TRUE;
+}
+
+/* Write out an external reference.  */
+
+static bfd_boolean
+nlm_sparc_write_external (bfd *abfd,
+			  bfd_size_type count,
+			  asymbol *sym,
+			  struct reloc_and_sec *relocs)
+{
+  unsigned int i;
+  bfd_byte len;
+  unsigned char temp[NLM_TARGET_LONG_SIZE];
+
+  bfd_put_32 (abfd, count, temp);
+  if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
+    return FALSE;
+
+  len = strlen (sym->name);
+  if ((bfd_bwrite (&len, (bfd_size_type) sizeof (bfd_byte), abfd)
+       != sizeof (bfd_byte))
+      || bfd_bwrite (sym->name, (bfd_size_type) len, abfd) != len)
+    return FALSE;
+
+  for (i = 0; i < count; i++)
+    if (! nlm_sparc_write_reloc (abfd, relocs[i].sec, relocs[i].rel))
+      return FALSE;
+
+  return TRUE;
+}
+
+static bfd_boolean
+nlm_sparc_write_export (bfd * abfd, asymbol * sym, bfd_vma value)
+{
+  bfd_byte len;
+  bfd_byte temp[4];
+
+#ifdef DEBUG
+  fprintf (stderr, "%s: <%lx, %u, %s>\n",
+	   __FUNCTION__, (unsigned long) value, strlen (sym->name), sym->name);
+#endif
+  bfd_put_32 (abfd, value, temp);
+  len = strlen (sym->name);
+
+  if (bfd_bwrite (temp, (bfd_size_type) 4, abfd) != 4
+      || bfd_bwrite (&len, (bfd_size_type) 1, abfd) != 1
+      || bfd_bwrite (sym->name, (bfd_size_type) len, abfd) != len)
+    return FALSE;
+
+  return TRUE;
+}
+
+#undef nlm_swap_fixed_header_in
+#undef nlm_swap_fixed_header_out
+
+#include "nlmswap.h"
+
+static const struct nlm_backend_data nlm32_sparc_backend =
+{
+  "NetWare SPARC Module   \032",
+  sizeof (Nlm32_sparc_External_Fixed_Header),
+  0,	/* Optional_prefix_size.  */
+  bfd_arch_sparc,
+  0,
+  FALSE,
+  0,	/* Backend_object_p.  */
+  0,	/* Write_prefix_func.  */
+  nlm_sparc_read_reloc,
+  nlm_sparc_mangle_relocs,
+  nlm_sparc_read_import,
+  nlm_sparc_write_import,
+  0,	/* Set_public_section.  */
+  0,	/* Get_public_offset.  */
+  nlm_swap_fixed_header_in,
+  nlm_swap_fixed_header_out,
+  nlm_sparc_write_external,
+  nlm_sparc_write_export
+};
+
+#define TARGET_BIG_NAME		"nlm32-sparc"
+#define TARGET_BIG_SYM		nlmNAME (sparc_vec)
+#define TARGET_BACKEND_DATA	& nlm32_sparc_backend
+
+#include "nlm-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/nlm32.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/nlm32.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/nlm32.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/nlm32.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,22 @@
+/* NLM (NetWare Loadable Module) 32-bit executable support for BFD.
+   Copyright 1993, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define ARCH_SIZE 32
+#include "nlmcode.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/nlm64.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/nlm64.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/nlm64.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/nlm64.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,22 @@
+/* NLM (NetWare Loadable Module) 64-bit executable support for BFD.
+   Copyright 1993, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define ARCH_SIZE 64
+#include "nlmcode.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/nlmcode.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/nlmcode.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/nlmcode.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/nlmcode.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1981 @@
+/* NLM (NetWare Loadable Module) executable support for BFD.
+   Copyright 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007, 2011  Free Software Foundation, Inc.
+
+   Written by Fred Fish @ Cygnus Support, using ELF support as the
+   template.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libnlm.h"
+
+/* The functions in this file do not use the names they appear to use.
+   This file is actually compiled multiple times, once for each size
+   of NLM target we are using.  At each size we use a different name,
+   constructed by the macro nlmNAME.  For example, the function which
+   is named nlm_symbol_type below is actually named nlm32_symbol_type
+   in the final executable.  */
+
+#define Nlm_External_Fixed_Header	NlmNAME (External_Fixed_Header)
+#define Nlm_External_Version_Header	NlmNAME (External_Version_Header)
+#define Nlm_External_Copyright_Header	NlmNAME (External_Copyright_Header)
+#define Nlm_External_Extended_Header	NlmNAME (External_Extended_Header)
+#define Nlm_External_Custom_Header	NlmNAME (External_Custom_Header)
+#define Nlm_External_Cygnus_Ext_Header	NlmNAME (External_Cygnus_Ext_Header)
+
+#define nlm_symbol_type			nlmNAME (symbol_type)
+#define nlm_get_symtab_upper_bound	nlmNAME (get_symtab_upper_bound)
+#define nlm_canonicalize_symtab		nlmNAME (canonicalize_symtab)
+#define nlm_make_empty_symbol		nlmNAME (make_empty_symbol)
+#define nlm_print_symbol		nlmNAME (print_symbol)
+#define nlm_get_symbol_info		nlmNAME (get_symbol_info)
+#define nlm_get_reloc_upper_bound	nlmNAME (get_reloc_upper_bound)
+#define nlm_canonicalize_reloc		nlmNAME (canonicalize_reloc)
+#define nlm_object_p			nlmNAME (object_p)
+#define nlm_set_section_contents	nlmNAME (set_section_contents)
+#define nlm_write_object_contents	nlmNAME (write_object_contents)
+
+#define nlm_swap_fixed_header_in(abfd,src,dst) \
+  (nlm_swap_fixed_header_in_func (abfd)) (abfd, src, dst)
+#define nlm_swap_fixed_header_out(abfd,src,dst) \
+  (nlm_swap_fixed_header_out_func (abfd)) (abfd, src, dst)
+
+/* Should perhaps use put_offset, put_word, etc.  For now, the two versions
+   can be handled by explicitly specifying 32 bits or "the long type".  */
+#if ARCH_SIZE == 64
+#define put_word	H_PUT_64
+#define get_word	H_GET_64
+#endif
+#if ARCH_SIZE == 32
+#define put_word	H_PUT_32
+#define get_word	H_GET_32
+#endif
+
+/* Read and swap in the variable length header.  All the fields must
+   exist in the NLM, and must exist in the order they are read here.  */
+
+static bfd_boolean
+nlm_swap_variable_header_in (bfd *abfd)
+{
+  unsigned char temp[NLM_TARGET_LONG_SIZE];
+  bfd_size_type amt;
+
+  /* Read the description length and text members.  */
+  amt = sizeof (nlm_variable_header (abfd)->descriptionLength);
+  if (bfd_bread ((void *) &nlm_variable_header (abfd)->descriptionLength,
+		amt, abfd) != amt)
+    return FALSE;
+  amt = nlm_variable_header (abfd)->descriptionLength + 1;
+  if (bfd_bread ((void *) nlm_variable_header (abfd)->descriptionText,
+		amt, abfd) != amt)
+    return FALSE;
+
+  /* Read and convert the stackSize field.  */
+  amt = sizeof (temp);
+  if (bfd_bread ((void *) temp, amt, abfd) != amt)
+    return FALSE;
+  nlm_variable_header (abfd)->stackSize = get_word (abfd, (bfd_byte *) temp);
+
+  /* Read and convert the reserved field.  */
+  amt = sizeof (temp);
+  if (bfd_bread ((void *) temp, amt, abfd) != amt)
+    return FALSE;
+  nlm_variable_header (abfd)->reserved = get_word (abfd, (bfd_byte *) temp);
+
+  /* Read the oldThreadName field.  This field is a fixed length string.  */
+  amt = sizeof (nlm_variable_header (abfd)->oldThreadName);
+  if (bfd_bread ((void *) nlm_variable_header (abfd)->oldThreadName,
+		amt, abfd) != amt)
+    return FALSE;
+
+  /* Read the screen name length and text members.  */
+  amt = sizeof (nlm_variable_header (abfd)->screenNameLength);
+  if (bfd_bread ((void *) & nlm_variable_header (abfd)->screenNameLength,
+		amt, abfd) != amt)
+    return FALSE;
+  amt = nlm_variable_header (abfd)->screenNameLength + 1;
+  if (bfd_bread ((void *) nlm_variable_header (abfd)->screenName,
+		amt, abfd) != amt)
+    return FALSE;
+
+  /* Read the thread name length and text members.  */
+  amt = sizeof (nlm_variable_header (abfd)->threadNameLength);
+  if (bfd_bread ((void *) & nlm_variable_header (abfd)->threadNameLength,
+		amt, abfd) != amt)
+    return FALSE;
+  amt = nlm_variable_header (abfd)->threadNameLength + 1;
+  if (bfd_bread ((void *) nlm_variable_header (abfd)->threadName,
+		amt, abfd) != amt)
+    return FALSE;
+  return TRUE;
+}
+
+/* Add a section to the bfd.  */
+
+static bfd_boolean
+add_bfd_section (bfd *abfd,
+		 char *name,
+		 file_ptr offset,
+		 bfd_size_type size,
+		 flagword flags)
+{
+  asection *newsect;
+
+  newsect = bfd_make_section_with_flags (abfd, name, flags);
+  if (newsect == NULL)
+    return FALSE;
+
+  newsect->vma = 0;		/* NLM's are relocatable.  */
+  newsect->size = size;
+  newsect->filepos = offset;
+  newsect->alignment_power = bfd_log2 ((bfd_vma) 0);	/* FIXME */
+
+  return TRUE;
+}
+
+/* Read and swap in the contents of all the auxiliary headers.  Because of
+   the braindead design, we have to do strcmps on strings of indeterminate
+   length to figure out what each auxiliary header is.  Even worse, we have
+   no way of knowing how many auxiliary headers there are or where the end
+   of the auxiliary headers are, except by finding something that doesn't
+   look like a known auxiliary header.  This means that the first new type
+   of auxiliary header added will break all existing tools that don't
+   recognize it.  */
+
+static bfd_boolean
+nlm_swap_auxiliary_headers_in (bfd *abfd)
+{
+  char tempstr[16];
+  file_ptr position;
+  bfd_size_type amt;
+
+  for (;;)
+    {
+      position = bfd_tell (abfd);
+      amt = sizeof (tempstr);
+      if (bfd_bread ((void *) tempstr, amt, abfd) != amt)
+	return FALSE;
+      if (bfd_seek (abfd, position, SEEK_SET) != 0)
+	return FALSE;
+      if (CONST_STRNEQ (tempstr, "VeRsIoN#"))
+	{
+	  Nlm_External_Version_Header thdr;
+
+	  amt = sizeof (thdr);
+	  if (bfd_bread ((void *) &thdr, amt, abfd) != amt)
+	    return FALSE;
+	  memcpy (nlm_version_header (abfd)->stamp, thdr.stamp,
+		  sizeof (thdr.stamp));
+	  nlm_version_header (abfd)->majorVersion =
+	    get_word (abfd, (bfd_byte *) thdr.majorVersion);
+	  nlm_version_header (abfd)->minorVersion =
+	    get_word (abfd, (bfd_byte *) thdr.minorVersion);
+	  nlm_version_header (abfd)->revision =
+	    get_word (abfd, (bfd_byte *) thdr.revision);
+	  nlm_version_header (abfd)->year =
+	    get_word (abfd, (bfd_byte *) thdr.year);
+	  nlm_version_header (abfd)->month =
+	    get_word (abfd, (bfd_byte *) thdr.month);
+	  nlm_version_header (abfd)->day =
+	    get_word (abfd, (bfd_byte *) thdr.day);
+	}
+      else if (CONST_STRNEQ (tempstr, "MeSsAgEs"))
+	{
+	  Nlm_External_Extended_Header thdr;
+
+	  amt = sizeof (thdr);
+	  if (bfd_bread ((void *) &thdr, amt, abfd) != amt)
+	    return FALSE;
+	  memcpy (nlm_extended_header (abfd)->stamp, thdr.stamp,
+		  sizeof (thdr.stamp));
+	  nlm_extended_header (abfd)->languageID =
+	    get_word (abfd, (bfd_byte *) thdr.languageID);
+	  nlm_extended_header (abfd)->messageFileOffset =
+	    get_word (abfd, (bfd_byte *) thdr.messageFileOffset);
+	  nlm_extended_header (abfd)->messageFileLength =
+	    get_word (abfd, (bfd_byte *) thdr.messageFileLength);
+	  nlm_extended_header (abfd)->messageCount =
+	    get_word (abfd, (bfd_byte *) thdr.messageCount);
+	  nlm_extended_header (abfd)->helpFileOffset =
+	    get_word (abfd, (bfd_byte *) thdr.helpFileOffset);
+	  nlm_extended_header (abfd)->helpFileLength =
+	    get_word (abfd, (bfd_byte *) thdr.helpFileLength);
+	  nlm_extended_header (abfd)->RPCDataOffset =
+	    get_word (abfd, (bfd_byte *) thdr.RPCDataOffset);
+	  nlm_extended_header (abfd)->RPCDataLength =
+	    get_word (abfd, (bfd_byte *) thdr.RPCDataLength);
+	  nlm_extended_header (abfd)->sharedCodeOffset =
+	    get_word (abfd, (bfd_byte *) thdr.sharedCodeOffset);
+	  nlm_extended_header (abfd)->sharedCodeLength =
+	    get_word (abfd, (bfd_byte *) thdr.sharedCodeLength);
+	  nlm_extended_header (abfd)->sharedDataOffset =
+	    get_word (abfd, (bfd_byte *) thdr.sharedDataOffset);
+	  nlm_extended_header (abfd)->sharedDataLength =
+	    get_word (abfd, (bfd_byte *) thdr.sharedDataLength);
+	  nlm_extended_header (abfd)->sharedRelocationFixupOffset =
+	    get_word (abfd, (bfd_byte *) thdr.sharedRelocationFixupOffset);
+	  nlm_extended_header (abfd)->sharedRelocationFixupCount =
+	    get_word (abfd, (bfd_byte *) thdr.sharedRelocationFixupCount);
+	  nlm_extended_header (abfd)->sharedExternalReferenceOffset =
+	    get_word (abfd, (bfd_byte *) thdr.sharedExternalReferenceOffset);
+	  nlm_extended_header (abfd)->sharedExternalReferenceCount =
+	    get_word (abfd, (bfd_byte *) thdr.sharedExternalReferenceCount);
+	  nlm_extended_header (abfd)->sharedPublicsOffset =
+	    get_word (abfd, (bfd_byte *) thdr.sharedPublicsOffset);
+	  nlm_extended_header (abfd)->sharedPublicsCount =
+	    get_word (abfd, (bfd_byte *) thdr.sharedPublicsCount);
+	  nlm_extended_header (abfd)->sharedDebugRecordOffset =
+	    get_word (abfd, (bfd_byte *) thdr.sharedDebugRecordOffset);
+	  nlm_extended_header (abfd)->sharedDebugRecordCount =
+	    get_word (abfd, (bfd_byte *) thdr.sharedDebugRecordCount);
+	  nlm_extended_header (abfd)->SharedInitializationOffset =
+	    get_word (abfd, (bfd_byte *) thdr.sharedInitializationOffset);
+	  nlm_extended_header (abfd)->SharedExitProcedureOffset =
+	    get_word (abfd, (bfd_byte *) thdr.SharedExitProcedureOffset);
+	  nlm_extended_header (abfd)->productID =
+	    get_word (abfd, (bfd_byte *) thdr.productID);
+	  nlm_extended_header (abfd)->reserved0 =
+	    get_word (abfd, (bfd_byte *) thdr.reserved0);
+	  nlm_extended_header (abfd)->reserved1 =
+	    get_word (abfd, (bfd_byte *) thdr.reserved1);
+	  nlm_extended_header (abfd)->reserved2 =
+	    get_word (abfd, (bfd_byte *) thdr.reserved2);
+	  nlm_extended_header (abfd)->reserved3 =
+	    get_word (abfd, (bfd_byte *) thdr.reserved3);
+	  nlm_extended_header (abfd)->reserved4 =
+	    get_word (abfd, (bfd_byte *) thdr.reserved4);
+	  nlm_extended_header (abfd)->reserved5 =
+	    get_word (abfd, (bfd_byte *) thdr.reserved5);
+	}
+      else if (CONST_STRNEQ (tempstr, "CoPyRiGhT="))
+	{
+	  amt = sizeof (nlm_copyright_header (abfd)->stamp);
+	  if (bfd_bread ((void *) nlm_copyright_header (abfd)->stamp,
+			amt, abfd) != amt)
+	    return FALSE;
+	  if (bfd_bread ((void *) &(nlm_copyright_header (abfd)
+				->copyrightMessageLength),
+			(bfd_size_type) 1, abfd) != 1)
+	    return FALSE;
+	  /* The copyright message is a variable length string.  */
+	  amt = nlm_copyright_header (abfd)->copyrightMessageLength + 1;
+	  if (bfd_bread ((void *) nlm_copyright_header (abfd)->copyrightMessage,
+			amt, abfd) != amt)
+	    return FALSE;
+	}
+      else if (CONST_STRNEQ (tempstr, "CuStHeAd"))
+	{
+	  Nlm_External_Custom_Header thdr;
+	  bfd_size_type hdrLength;
+	  file_ptr dataOffset;
+	  bfd_size_type dataLength;
+	  char dataStamp[8];
+	  void * hdr;
+
+	  /* Read the stamp ("CuStHeAd").  */
+	  amt = sizeof (thdr.stamp);
+	  if (bfd_bread ((void *) thdr.stamp, amt, abfd) != amt)
+	    return FALSE;
+	  /* Read the length of this custom header.  */
+	  amt = sizeof (thdr.length);
+	  if (bfd_bread ((void *) thdr.length, amt, abfd) != amt)
+	    return FALSE;
+	  hdrLength = get_word (abfd, (bfd_byte *) thdr.length);
+	  /* Read further fields if we have them.  */
+	  if (hdrLength < NLM_TARGET_LONG_SIZE)
+	    dataOffset = 0;
+	  else
+	    {
+	      amt = sizeof (thdr.dataOffset);
+	      if (bfd_bread ((void *) thdr.dataOffset, amt, abfd) != amt)
+		return FALSE;
+	      dataOffset = get_word (abfd, (bfd_byte *) thdr.dataOffset);
+	    }
+	  if (hdrLength < 2 * NLM_TARGET_LONG_SIZE)
+	    dataLength = 0;
+	  else
+	    {
+	      amt = sizeof (thdr.dataLength);
+	      if (bfd_bread ((void *) thdr.dataLength, amt, abfd) != amt)
+		return FALSE;
+	      dataLength = get_word (abfd, (bfd_byte *) thdr.dataLength);
+	    }
+	  if (hdrLength < 2 * NLM_TARGET_LONG_SIZE + 8)
+	    memset (dataStamp, 0, sizeof (dataStamp));
+	  else
+	    {
+	      amt = sizeof (dataStamp);
+	      if (bfd_bread ((void *) dataStamp, amt, abfd) != amt)
+		return FALSE;
+	    }
+
+	  /* Read the rest of the header, if any.  */
+	  if (hdrLength <= 2 * NLM_TARGET_LONG_SIZE + 8)
+	    {
+	      hdr = NULL;
+	      hdrLength = 0;
+	    }
+	  else
+	    {
+	      hdrLength -= 2 * NLM_TARGET_LONG_SIZE + 8;
+	      hdr = bfd_alloc (abfd, hdrLength);
+	      if (hdr == NULL)
+		return FALSE;
+	      if (bfd_bread (hdr, hdrLength, abfd) != hdrLength)
+		return FALSE;
+	    }
+
+	  /* If we have found a Cygnus header, process it.  Otherwise,
+	     just save the associated data without trying to interpret
+	     it.  */
+	  if (CONST_STRNEQ (dataStamp, "CyGnUsEx"))
+	    {
+	      file_ptr pos;
+	      bfd_byte *contents;
+	      bfd_byte *p, *pend;
+
+	      BFD_ASSERT (hdrLength == 0 && hdr == NULL);
+
+	      pos = bfd_tell (abfd);
+	      if (bfd_seek (abfd, dataOffset, SEEK_SET) != 0)
+		return FALSE;
+	      contents = bfd_alloc (abfd, dataLength);
+	      if (contents == NULL)
+		return FALSE;
+	      if (bfd_bread (contents, dataLength, abfd) != dataLength)
+		return FALSE;
+	      if (bfd_seek (abfd, pos, SEEK_SET) != 0)
+		return FALSE;
+
+	      LITMEMCPY (nlm_cygnus_ext_header (abfd), "CyGnUsEx");
+	      nlm_cygnus_ext_header (abfd)->offset = dataOffset;
+	      nlm_cygnus_ext_header (abfd)->length = dataLength;
+
+	      /* This data this header points to provides a list of
+		 the sections which were in the original object file
+		 which was converted to become an NLM.  We locate
+		 those sections and add them to the BFD.  Note that
+		 this is likely to create a second .text, .data and
+		 .bss section; retrieving the sections by name will
+		 get the actual NLM sections, which is what we want to
+		 happen.  The sections from the original file, which
+		 may be subsets of the NLM section, can only be found
+		 using bfd_map_over_sections.  */
+	      p = contents;
+	      pend = p + dataLength;
+	      while (p < pend)
+		{
+		  char *name;
+		  size_t l;
+		  file_ptr filepos;
+		  bfd_size_type size;
+		  asection *newsec;
+
+		  /* The format of this information is
+		     null terminated section name
+		     zeroes to adjust to 4 byte boundary
+		     4 byte section data file pointer
+		     4 byte section size.  */
+
+		  name = (char *) p;
+		  l = strlen (name) + 1;
+		  l = (l + 3) &~ (size_t) 3;
+		  p += l;
+		  filepos = H_GET_32 (abfd, p);
+		  p += 4;
+		  size = H_GET_32 (abfd, p);
+		  p += 4;
+
+		  newsec = bfd_make_section_anyway (abfd, name);
+		  if (newsec == NULL)
+		    return FALSE;
+		  newsec->size = size;
+		  if (filepos != 0)
+		    {
+		      newsec->filepos = filepos;
+		      newsec->flags |= SEC_HAS_CONTENTS;
+		    }
+		}
+	    }
+	  else
+	    {
+	      memcpy (nlm_custom_header (abfd)->stamp, thdr.stamp,
+		      sizeof (thdr.stamp));
+	      nlm_custom_header (abfd)->hdrLength = hdrLength;
+	      nlm_custom_header (abfd)->dataOffset = dataOffset;
+	      nlm_custom_header (abfd)->dataLength = dataLength;
+	      memcpy (nlm_custom_header (abfd)->dataStamp, dataStamp,
+		      sizeof (dataStamp));
+	      nlm_custom_header (abfd)->hdr = hdr;
+	    }
+	}
+      else
+	break;
+    }
+  return TRUE;
+}
+
+const bfd_target *
+nlm_object_p (bfd *abfd)
+{
+  struct nlm_obj_tdata *preserved_tdata = nlm_tdata (abfd);
+  bfd_boolean (*backend_object_p) (bfd *);
+  void * x_fxdhdr = NULL;
+  Nlm_Internal_Fixed_Header *i_fxdhdrp;
+  struct nlm_obj_tdata *new_tdata = NULL;
+  const char *signature;
+  enum bfd_architecture arch;
+  bfd_size_type amt;
+
+  /* Some NLM formats have a prefix before the standard NLM fixed
+     header.  */
+  backend_object_p = nlm_backend_object_p_func (abfd);
+  if (backend_object_p)
+    {
+      if (!(*backend_object_p) (abfd))
+	goto got_wrong_format_error;
+    }
+
+  /* Read in the fixed length portion of the NLM header in external format.  */
+  amt = nlm_fixed_header_size (abfd);
+  x_fxdhdr = bfd_malloc (amt);
+  if (x_fxdhdr == NULL)
+    goto got_no_match;
+
+  if (bfd_bread ((void *) x_fxdhdr, amt, abfd) != amt)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	goto got_wrong_format_error;
+      else
+	goto got_no_match;
+    }
+
+  /* Allocate an instance of the nlm_obj_tdata structure and hook it up to
+     the tdata pointer in the bfd.  */
+  amt = sizeof (struct nlm_obj_tdata);
+  new_tdata = bfd_zalloc (abfd, amt);
+  if (new_tdata == NULL)
+    goto got_no_match;
+
+  nlm_tdata (abfd) = new_tdata;
+
+  i_fxdhdrp = nlm_fixed_header (abfd);
+  nlm_swap_fixed_header_in (abfd, x_fxdhdr, i_fxdhdrp);
+  free (x_fxdhdr);
+  x_fxdhdr = NULL;
+
+  /* Check to see if we have an NLM file for this backend by matching
+     the NLM signature.  */
+  signature = nlm_signature (abfd);
+  if (signature != NULL
+      && *signature != '\0'
+      && strncmp ((char *) i_fxdhdrp->signature, signature,
+		  NLM_SIGNATURE_SIZE) != 0)
+    goto got_wrong_format_error;
+
+  /* There's no supported way to discover the endianness of an NLM, so test for
+     a sane version number after doing byte swapping appropriate for this
+     XVEC.  (Hack alert!)  */
+  if (i_fxdhdrp->version > 0xFFFF)
+    goto got_wrong_format_error;
+
+  /* There's no supported way to check for 32 bit versus 64 bit addresses,
+     so ignore this distinction for now.  (FIXME) */
+  /* Swap in the rest of the required header.  */
+  if (!nlm_swap_variable_header_in (abfd))
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	goto got_wrong_format_error;
+      else
+	goto got_no_match;
+    }
+
+  /* Add the sections supplied by all NLM's, and then read in the
+     auxiliary headers.  Reading the auxiliary headers may create
+     additional sections described in the cygnus_ext header.
+     From this point on we assume that we have an NLM, and do not
+     treat errors as indicating the wrong format.  */
+  if (!add_bfd_section (abfd, NLM_CODE_NAME,
+			i_fxdhdrp->codeImageOffset,
+			i_fxdhdrp->codeImageSize,
+			(SEC_CODE | SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
+			 | SEC_RELOC))
+      || !add_bfd_section (abfd, NLM_INITIALIZED_DATA_NAME,
+			   i_fxdhdrp->dataImageOffset,
+			   i_fxdhdrp->dataImageSize,
+			   (SEC_DATA | SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
+			    | SEC_RELOC))
+      || !add_bfd_section (abfd, NLM_UNINITIALIZED_DATA_NAME,
+			   (file_ptr) 0,
+			   i_fxdhdrp->uninitializedDataSize,
+			   SEC_ALLOC))
+    goto got_no_match;
+
+  if (!nlm_swap_auxiliary_headers_in (abfd))
+    goto got_no_match;
+
+  if (nlm_fixed_header (abfd)->numberOfRelocationFixups != 0
+      || nlm_fixed_header (abfd)->numberOfExternalReferences != 0)
+    abfd->flags |= HAS_RELOC;
+  if (nlm_fixed_header (abfd)->numberOfPublics != 0
+      || nlm_fixed_header (abfd)->numberOfDebugRecords != 0
+      || nlm_fixed_header (abfd)->numberOfExternalReferences != 0)
+    abfd->flags |= HAS_SYMS;
+
+  arch = nlm_architecture (abfd);
+  if (arch != bfd_arch_unknown)
+    bfd_default_set_arch_mach (abfd, arch, (unsigned long) 0);
+
+  abfd->flags |= EXEC_P;
+  bfd_get_start_address (abfd) = nlm_fixed_header (abfd)->codeStartOffset;
+
+  return abfd->xvec;
+
+got_wrong_format_error:
+  bfd_set_error (bfd_error_wrong_format);
+got_no_match:
+  nlm_tdata (abfd) = preserved_tdata;
+  if (new_tdata != NULL)
+    bfd_release (abfd, new_tdata);
+  if (x_fxdhdr != NULL)
+    free (x_fxdhdr);
+
+  return NULL;
+}
+
+/* Swap and write out the variable length header.  All the fields must
+   exist in the NLM, and must exist in this order.  */
+
+static bfd_boolean
+nlm_swap_variable_header_out (bfd *abfd)
+{
+  bfd_byte temp[NLM_TARGET_LONG_SIZE];
+  bfd_size_type amt;
+
+  /* Write the description length and text members.  */
+  amt = sizeof (nlm_variable_header (abfd)->descriptionLength);
+  if (bfd_bwrite (& nlm_variable_header (abfd)->descriptionLength, amt,
+		  abfd) != amt)
+    return FALSE;
+  amt = nlm_variable_header (abfd)->descriptionLength + 1;
+  if (bfd_bwrite ((void *) nlm_variable_header (abfd)->descriptionText, amt,
+		  abfd) != amt)
+    return FALSE;
+
+  /* Convert and write the stackSize field.  */
+  put_word (abfd, (bfd_vma) nlm_variable_header (abfd)->stackSize, temp);
+  amt = sizeof (temp);
+  if (bfd_bwrite (temp, amt, abfd) != amt)
+    return FALSE;
+
+  /* Convert and write the reserved field.  */
+  put_word (abfd, (bfd_vma) nlm_variable_header (abfd)->reserved, temp);
+  amt = sizeof (temp);
+  if (bfd_bwrite (temp, amt, abfd) != amt)
+    return FALSE;
+
+  /* Write the oldThreadName field.  This field is a fixed length string.  */
+  amt = sizeof (nlm_variable_header (abfd)->oldThreadName);
+  if (bfd_bwrite (nlm_variable_header (abfd)->oldThreadName, amt,
+		  abfd) != amt)
+    return FALSE;
+
+  /* Write the screen name length and text members.  */
+  amt = sizeof (nlm_variable_header (abfd)->screenNameLength);
+  if (bfd_bwrite (& nlm_variable_header (abfd)->screenNameLength, amt,
+		 abfd) != amt)
+    return FALSE;
+  amt = nlm_variable_header (abfd)->screenNameLength + 1;
+  if (bfd_bwrite (nlm_variable_header (abfd)->screenName, amt, abfd) != amt)
+    return FALSE;
+
+  /* Write the thread name length and text members.  */
+  amt = sizeof (nlm_variable_header (abfd)->threadNameLength);
+  if (bfd_bwrite (& nlm_variable_header (abfd)->threadNameLength, amt,
+		 abfd) != amt)
+    return FALSE;
+  amt = nlm_variable_header (abfd)->threadNameLength + 1;
+  if (bfd_bwrite (nlm_variable_header (abfd)->threadName, amt, abfd) != amt)
+    return FALSE;
+  return TRUE;
+}
+
+/* Return whether there is a non-zero byte in a memory block.  */
+
+static bfd_boolean
+find_nonzero (void * buf, size_t size)
+{
+  char *p = (char *) buf;
+
+  while (size-- != 0)
+    if (*p++ != 0)
+      return TRUE;
+  return FALSE;
+}
+
+/* Swap out the contents of the auxiliary headers.  We create those
+   auxiliary headers which have been set non-zero.  We do not require
+   the caller to set up the stamp fields.  */
+
+static bfd_boolean
+nlm_swap_auxiliary_headers_out (bfd *abfd)
+{
+  bfd_size_type amt;
+
+  /* Write out the version header if there is one.  */
+  if (find_nonzero (nlm_version_header (abfd),
+		    sizeof (Nlm_Internal_Version_Header)))
+    {
+      Nlm_External_Version_Header thdr;
+
+      LITMEMCPY (thdr.stamp, "VeRsIoN#");
+      put_word (abfd, (bfd_vma) nlm_version_header (abfd)->majorVersion,
+		(bfd_byte *) thdr.majorVersion);
+      put_word (abfd, (bfd_vma) nlm_version_header (abfd)->minorVersion,
+		(bfd_byte *) thdr.minorVersion);
+      put_word (abfd, (bfd_vma) nlm_version_header (abfd)->revision,
+		(bfd_byte *) thdr.revision);
+      put_word (abfd, (bfd_vma) nlm_version_header (abfd)->year,
+		(bfd_byte *) thdr.year);
+      put_word (abfd, (bfd_vma) nlm_version_header (abfd)->month,
+		(bfd_byte *) thdr.month);
+      put_word (abfd, (bfd_vma) nlm_version_header (abfd)->day,
+		(bfd_byte *) thdr.day);
+      if (bfd_bwrite ((void *) &thdr, (bfd_size_type) sizeof (thdr), abfd)
+	  != sizeof (thdr))
+	return FALSE;
+    }
+
+  /* Note - the CoPyRiGhT tag is emitted before the MeSsAgEs
+     tag in order to make the NW4.x and NW5.x loaders happy.  */
+
+  /* Write out the copyright header if there is one.  */
+  if (find_nonzero (nlm_copyright_header (abfd),
+		    sizeof (Nlm_Internal_Copyright_Header)))
+    {
+      Nlm_External_Copyright_Header thdr;
+
+      LITMEMCPY (thdr.stamp, "CoPyRiGhT=");
+      amt = sizeof (thdr.stamp);
+      if (bfd_bwrite ((void *) thdr.stamp, amt, abfd) != amt)
+	return FALSE;
+      thdr.copyrightMessageLength[0] =
+	nlm_copyright_header (abfd)->copyrightMessageLength;
+      amt = 1;
+      if (bfd_bwrite ((void *) thdr.copyrightMessageLength, amt, abfd) != amt)
+	return FALSE;
+      /* The copyright message is a variable length string.  */
+      amt = nlm_copyright_header (abfd)->copyrightMessageLength + 1;
+      if (bfd_bwrite ((void *) nlm_copyright_header (abfd)->copyrightMessage,
+		     amt, abfd) != amt)
+	return FALSE;
+    }
+
+  /* Write out the extended header if there is one.  */
+  if (find_nonzero (nlm_extended_header (abfd),
+		    sizeof (Nlm_Internal_Extended_Header)))
+    {
+      Nlm_External_Extended_Header thdr;
+
+      LITMEMCPY (thdr.stamp, "MeSsAgEs");
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->languageID,
+		(bfd_byte *) thdr.languageID);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->messageFileOffset,
+		(bfd_byte *) thdr.messageFileOffset);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->messageFileLength,
+		(bfd_byte *) thdr.messageFileLength);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->messageCount,
+		(bfd_byte *) thdr.messageCount);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->helpFileOffset,
+		(bfd_byte *) thdr.helpFileOffset);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->helpFileLength,
+		(bfd_byte *) thdr.helpFileLength);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->RPCDataOffset,
+		(bfd_byte *) thdr.RPCDataOffset);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->RPCDataLength,
+		(bfd_byte *) thdr.RPCDataLength);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->sharedCodeOffset,
+		(bfd_byte *) thdr.sharedCodeOffset);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->sharedCodeLength,
+		(bfd_byte *) thdr.sharedCodeLength);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->sharedDataOffset,
+		(bfd_byte *) thdr.sharedDataOffset);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->sharedDataLength,
+		(bfd_byte *) thdr.sharedDataLength);
+      put_word (abfd,
+	  (bfd_vma) nlm_extended_header (abfd)->sharedRelocationFixupOffset,
+		(bfd_byte *) thdr.sharedRelocationFixupOffset);
+      put_word (abfd,
+	   (bfd_vma) nlm_extended_header (abfd)->sharedRelocationFixupCount,
+		(bfd_byte *) thdr.sharedRelocationFixupCount);
+      put_word (abfd,
+	(bfd_vma) nlm_extended_header (abfd)->sharedExternalReferenceOffset,
+		(bfd_byte *) thdr.sharedExternalReferenceOffset);
+      put_word (abfd,
+	 (bfd_vma) nlm_extended_header (abfd)->sharedExternalReferenceCount,
+		(bfd_byte *) thdr.sharedExternalReferenceCount);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->sharedPublicsOffset,
+		(bfd_byte *) thdr.sharedPublicsOffset);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->sharedPublicsCount,
+		(bfd_byte *) thdr.sharedPublicsCount);
+      put_word (abfd,
+	      (bfd_vma) nlm_extended_header (abfd)->sharedDebugRecordOffset,
+		(bfd_byte *) thdr.sharedDebugRecordOffset);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->sharedDebugRecordCount,
+		(bfd_byte *) thdr.sharedDebugRecordCount);
+      put_word (abfd,
+	   (bfd_vma) nlm_extended_header (abfd)->SharedInitializationOffset,
+		(bfd_byte *) thdr.sharedInitializationOffset);
+      put_word (abfd,
+	    (bfd_vma) nlm_extended_header (abfd)->SharedExitProcedureOffset,
+		(bfd_byte *) thdr.SharedExitProcedureOffset);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->productID,
+		(bfd_byte *) thdr.productID);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->reserved0,
+		(bfd_byte *) thdr.reserved0);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->reserved1,
+		(bfd_byte *) thdr.reserved1);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->reserved2,
+		(bfd_byte *) thdr.reserved2);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->reserved3,
+		(bfd_byte *) thdr.reserved3);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->reserved4,
+		(bfd_byte *) thdr.reserved4);
+      put_word (abfd,
+		(bfd_vma) nlm_extended_header (abfd)->reserved5,
+		(bfd_byte *) thdr.reserved5);
+      if (bfd_bwrite ((void *) &thdr, (bfd_size_type) sizeof (thdr), abfd)
+	  != sizeof (thdr))
+	return FALSE;
+    }
+
+  /* Write out the custom header if there is one.   */
+  if (find_nonzero (nlm_custom_header (abfd),
+		    sizeof (Nlm_Internal_Custom_Header)))
+    {
+      Nlm_External_Custom_Header thdr;
+      bfd_boolean ds;
+      bfd_size_type hdrLength;
+
+      ds = find_nonzero (nlm_custom_header (abfd)->dataStamp,
+			 sizeof (nlm_custom_header (abfd)->dataStamp));
+      LITMEMCPY (thdr.stamp, "CuStHeAd");
+      hdrLength = (2 * NLM_TARGET_LONG_SIZE + (ds ? 8 : 0)
+		   + nlm_custom_header (abfd)->hdrLength);
+      put_word (abfd, hdrLength, thdr.length);
+      put_word (abfd, (bfd_vma) nlm_custom_header (abfd)->dataOffset,
+		thdr.dataOffset);
+      put_word (abfd, (bfd_vma) nlm_custom_header (abfd)->dataLength,
+		thdr.dataLength);
+      if (! ds)
+	{
+	  BFD_ASSERT (nlm_custom_header (abfd)->hdrLength == 0);
+	  amt = sizeof (thdr) - sizeof (thdr.dataStamp);
+	  if (bfd_bwrite ((void *) &thdr, amt, abfd) != amt)
+	    return FALSE;
+	}
+      else
+	{
+	  memcpy (thdr.dataStamp, nlm_custom_header (abfd)->dataStamp,
+		  sizeof (thdr.dataStamp));
+	  amt = sizeof (thdr);
+	  if (bfd_bwrite ((void *) &thdr, amt, abfd) != amt)
+	    return FALSE;
+	  amt = nlm_custom_header (abfd)->hdrLength;
+	  if (bfd_bwrite (nlm_custom_header (abfd)->hdr, amt, abfd) != amt)
+	    return FALSE;
+	}
+    }
+
+  /* Write out the Cygnus debugging header if there is one.  */
+  if (find_nonzero (nlm_cygnus_ext_header (abfd),
+		    sizeof (Nlm_Internal_Cygnus_Ext_Header)))
+    {
+      Nlm_External_Custom_Header thdr;
+
+      LITMEMCPY (thdr.stamp, "CuStHeAd");
+      put_word (abfd, (bfd_vma) 2 * NLM_TARGET_LONG_SIZE + 8,
+		(bfd_byte *) thdr.length);
+      put_word (abfd, (bfd_vma) nlm_cygnus_ext_header (abfd)->offset,
+		(bfd_byte *) thdr.dataOffset);
+      put_word (abfd, (bfd_vma) nlm_cygnus_ext_header (abfd)->length,
+		(bfd_byte *) thdr.dataLength);
+      LITMEMCPY (thdr.dataStamp, "CyGnUsEx");
+      amt = sizeof (thdr);
+      if (bfd_bwrite ((void *) &thdr, amt, abfd) != amt)
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* We read the NLM's public symbols and use it to generate a bfd symbol
+   table (hey, it's better than nothing) on a one-for-one basis.  Thus
+   use the number of public symbols as the number of bfd symbols we will
+   have once we actually get around to reading them in.
+
+   Return the number of bytes required to hold the symtab vector, based on
+   the count plus 1, since we will NULL terminate the vector allocated based
+   on this size.  */
+
+long
+nlm_get_symtab_upper_bound (bfd *abfd)
+{
+  Nlm_Internal_Fixed_Header *i_fxdhdrp;	/* Nlm file header, internal form.  */
+  long symcount;
+  long symtab_size = 0;
+
+  i_fxdhdrp = nlm_fixed_header (abfd);
+  symcount = (i_fxdhdrp->numberOfPublics
+	      + i_fxdhdrp->numberOfDebugRecords
+	      + i_fxdhdrp->numberOfExternalReferences);
+  symtab_size = (symcount + 1) * (sizeof (asymbol));
+  return symtab_size;
+}
+
+/* Slurp in nlm symbol table.
+
+   In the external (in-file) form, NLM export records are variable length,
+   with the following form:
+
+	1 byte		length of the symbol name (N)
+	N bytes		the symbol name
+	4 bytes		the symbol offset from start of it's section
+
+   We also read in the debugging symbols and import records.  Import
+   records are treated as undefined symbols.  As we read the import
+   records we also read in the associated reloc information, which is
+   attached to the symbol.
+
+   The bfd symbols are copied to SYMvoid *S.
+
+   When we return, the bfd symcount is either zero or contains the correct
+   number of symbols.  */
+
+static bfd_boolean
+nlm_slurp_symbol_table (bfd *abfd)
+{
+  Nlm_Internal_Fixed_Header *i_fxdhdrp;	/* Nlm file header, internal form.  */
+  bfd_size_type totsymcount;	/* Number of NLM symbols.  */
+  bfd_size_type symcount;	/* Counter of NLM symbols.  */
+  nlm_symbol_type *sym;		/* Pointer to current bfd symbol.  */
+  unsigned char symlength;	/* Symbol length read into here.  */
+  unsigned char symtype;	/* Type of debugging symbol.  */
+  bfd_byte temp[NLM_TARGET_LONG_SIZE];	/* Symbol offsets read into here.  */
+  bfd_boolean (*read_import_func) (bfd *, nlm_symbol_type *);
+  bfd_boolean (*set_public_section_func) (bfd *, nlm_symbol_type *);
+  bfd_size_type amt;
+
+  if (nlm_get_symbols (abfd) != NULL)
+    return TRUE;
+
+  /* Read each raw NLM symbol, using the information to create a canonical bfd
+     symbol table entry.
+
+     Note that we allocate the initial bfd canonical symbol buffer based on a
+     one-to-one mapping of the NLM symbols to canonical symbols.  We actually
+     use all the NLM symbols, so there will be no space left over at the end.
+     When we have all the symbols, we build the caller's pointer vector.  */
+
+  abfd->symcount = 0;
+  i_fxdhdrp = nlm_fixed_header (abfd);
+  totsymcount = (i_fxdhdrp->numberOfPublics
+		 + i_fxdhdrp->numberOfDebugRecords
+		 + i_fxdhdrp->numberOfExternalReferences);
+  if (totsymcount == 0)
+    return TRUE;
+
+  if (bfd_seek (abfd, i_fxdhdrp->publicsOffset, SEEK_SET) != 0)
+    return FALSE;
+
+  amt = totsymcount * sizeof (nlm_symbol_type);
+  sym = bfd_zalloc (abfd, amt);
+  if (!sym)
+    return FALSE;
+  nlm_set_symbols (abfd, sym);
+
+  /* We use the bfd's symcount directly as the control count, so that early
+     termination of the loop leaves the symcount correct for the symbols that
+     were read.  */
+
+  set_public_section_func = nlm_set_public_section_func (abfd);
+  symcount = i_fxdhdrp->numberOfPublics;
+  while (abfd->symcount < symcount)
+    {
+      amt = sizeof (symlength);
+      if (bfd_bread ((void *) &symlength, amt, abfd) != amt)
+	return FALSE;
+      amt = symlength;
+      sym->symbol.the_bfd = abfd;
+      sym->symbol.name = bfd_alloc (abfd, amt + 1);
+      if (!sym->symbol.name)
+	return FALSE;
+      if (bfd_bread ((void *) sym->symbol.name, amt, abfd) != amt)
+	return FALSE;
+      /* Cast away const.  */
+      ((char *) (sym->symbol.name))[symlength] = '\0';
+      amt = sizeof (temp);
+      if (bfd_bread ((void *) temp, amt, abfd) != amt)
+	return FALSE;
+      sym->symbol.flags = BSF_GLOBAL | BSF_EXPORT;
+      sym->symbol.value = get_word (abfd, temp);
+      if (set_public_section_func)
+	{
+	  /* Most backends can use the code below, but unfortunately
+	     some use a different scheme.  */
+	  if (! (*set_public_section_func) (abfd, sym))
+	    return FALSE;
+	}
+      else
+	{
+	  if (sym->symbol.value & NLM_HIBIT)
+	    {
+	      sym->symbol.value &= ~NLM_HIBIT;
+	      sym->symbol.flags |= BSF_FUNCTION;
+	      sym->symbol.section =
+		bfd_get_section_by_name (abfd, NLM_CODE_NAME);
+	    }
+	  else
+	    sym->symbol.section =
+	      bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME);
+	}
+      sym->rcnt = 0;
+      abfd->symcount++;
+      sym++;
+    }
+
+  /* Read the debugging records.  */
+
+  if (i_fxdhdrp->numberOfDebugRecords > 0)
+    {
+      if (bfd_seek (abfd, i_fxdhdrp->debugInfoOffset, SEEK_SET) != 0)
+	return FALSE;
+
+      symcount += i_fxdhdrp->numberOfDebugRecords;
+      while (abfd->symcount < symcount)
+	{
+	  amt = sizeof (symtype);
+	  if (bfd_bread ((void *) &symtype, amt, abfd) != amt)
+	    return FALSE;
+	  amt = sizeof (temp);
+	  if (bfd_bread ((void *) temp, amt, abfd) != amt)
+	    return FALSE;
+	  amt = sizeof (symlength);
+	  if (bfd_bread ((void *) &symlength, amt, abfd) != amt)
+	    return FALSE;
+	  amt = symlength;
+	  sym->symbol.the_bfd = abfd;
+	  sym->symbol.name = bfd_alloc (abfd, amt + 1);
+	  if (!sym->symbol.name)
+	    return FALSE;
+	  if (bfd_bread ((void *) sym->symbol.name, amt, abfd) != amt)
+	    return FALSE;
+	  /* Cast away const.  */
+	  ((char *) (sym->symbol.name))[symlength] = '\0';
+	  sym->symbol.flags = BSF_LOCAL;
+	  sym->symbol.value = get_word (abfd, temp);
+
+	  if (symtype == 0)
+	    sym->symbol.section =
+	      bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME);
+	  else if (symtype == 1)
+	    {
+	      sym->symbol.flags |= BSF_FUNCTION;
+	      sym->symbol.section =
+		bfd_get_section_by_name (abfd, NLM_CODE_NAME);
+	    }
+	  else
+	    sym->symbol.section = bfd_abs_section_ptr;
+
+	  sym->rcnt = 0;
+	  abfd->symcount++;
+	  sym++;
+	}
+    }
+
+  /* Read in the import records.  We can only do this if we know how
+     to read relocs for this target.  */
+  read_import_func = nlm_read_import_func (abfd);
+  if (read_import_func != NULL)
+    {
+      if (bfd_seek (abfd, i_fxdhdrp->externalReferencesOffset, SEEK_SET) != 0)
+	return FALSE;
+
+      symcount += i_fxdhdrp->numberOfExternalReferences;
+      while (abfd->symcount < symcount)
+	{
+	  if (! (*read_import_func) (abfd, sym))
+	    return FALSE;
+	  sym++;
+	  abfd->symcount++;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Note that bfd_get_symcount is guaranteed to be zero if slurping the
+   symbol table fails.  */
+
+long
+nlm_canonicalize_symtab (bfd *abfd, asymbol **alocation)
+{
+  nlm_symbol_type *symbase;
+  bfd_size_type counter = 0;
+
+  if (! nlm_slurp_symbol_table (abfd))
+    return -1;
+  symbase = nlm_get_symbols (abfd);
+  while (counter < bfd_get_symcount (abfd))
+    {
+      *alocation++ = &symbase->symbol;
+      symbase++;
+      counter++;
+    }
+  *alocation = NULL;
+  return bfd_get_symcount (abfd);
+}
+
+/* Make an NLM symbol.  There is nothing special to do here.  */
+
+asymbol *
+nlm_make_empty_symbol (bfd *abfd)
+{
+  bfd_size_type amt = sizeof (nlm_symbol_type);
+  nlm_symbol_type *new = bfd_zalloc (abfd, amt);
+
+  if (new == NULL)
+    return NULL;
+  new->symbol.the_bfd = abfd;
+  return & new->symbol;
+}
+
+/* Get symbol information.  */
+
+void
+nlm_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+		     asymbol *symbol,
+		     symbol_info *ret)
+{
+  bfd_symbol_info (symbol, ret);
+}
+
+/* Print symbol information.  */
+
+void
+nlm_print_symbol (bfd *abfd,
+		  void * afile,
+		  asymbol *symbol,
+		  bfd_print_symbol_type how)
+{
+  FILE *file = (FILE *) afile;
+
+  switch (how)
+    {
+    case bfd_print_symbol_name:
+    case bfd_print_symbol_more:
+      if (symbol->name)
+	fprintf (file, "%s", symbol->name);
+      break;
+    case bfd_print_symbol_all:
+      bfd_print_symbol_vandf (abfd, (void *) file, symbol);
+      fprintf (file, " %-5s", symbol->section->name);
+      if (symbol->name)
+	fprintf (file, " %s", symbol->name);
+      break;
+    }
+}
+
+/* Get the relocs for an NLM file.  There are two types of relocs.
+   Imports are relocs against symbols defined in other NLM files.  We
+   treat these as relocs against global symbols.  Relocation fixups
+   are internal relocs.
+
+   The actual format used to store the relocs is machine specific.  */
+
+/* Read in the relocation fixup information.  This is stored in
+   nlm_relocation_fixups, an array of arelent structures, and
+   nlm_relocation_fixup_secs, an array of section pointers.  The
+   section pointers are needed because the relocs are not sorted by
+   section.  */
+
+static bfd_boolean
+nlm_slurp_reloc_fixups (bfd *abfd)
+{
+  bfd_boolean (*read_func) (bfd *, nlm_symbol_type *, asection **, arelent *);
+  bfd_size_type count, amt;
+  arelent *rels;
+  asection **secs;
+
+  if (nlm_relocation_fixups (abfd) != NULL)
+    return TRUE;
+  read_func = nlm_read_reloc_func (abfd);
+  if (read_func == NULL)
+    return TRUE;
+
+  if (bfd_seek (abfd, nlm_fixed_header (abfd)->relocationFixupOffset,
+		SEEK_SET) != 0)
+    return FALSE;
+
+  count = nlm_fixed_header (abfd)->numberOfRelocationFixups;
+  amt = count * sizeof (arelent);
+  rels = bfd_alloc (abfd, amt);
+  amt = count * sizeof (asection *);
+  secs = bfd_alloc (abfd, amt);
+  if ((rels == NULL || secs == NULL) && count != 0)
+    return FALSE;
+  nlm_relocation_fixups (abfd) = rels;
+  nlm_relocation_fixup_secs (abfd) = secs;
+
+  /* We have to read piece by piece, because we don't know how large
+     the machine specific reloc information is.  */
+  while (count-- != 0)
+    {
+      if (! (*read_func) (abfd, NULL, secs, rels))
+	{
+	  nlm_relocation_fixups (abfd) = NULL;
+	  nlm_relocation_fixup_secs (abfd) = NULL;
+	  return FALSE;
+	}
+      ++secs;
+      ++rels;
+    }
+
+  return TRUE;
+}
+
+/* Get the number of relocs.  This really just returns an upper bound,
+   since it does not attempt to distinguish them based on the section.
+   That will be handled when they are actually read.  */
+
+long
+nlm_get_reloc_upper_bound (bfd *abfd, asection *sec)
+{
+  nlm_symbol_type *syms;
+  bfd_size_type count;
+  unsigned int ret;
+
+  /* If we don't know how to read relocs, just return 0.  */
+  if (nlm_read_reloc_func (abfd) == NULL)
+    return -1;
+  /* Make sure we have either the code or the data section.  */
+  if ((bfd_get_section_flags (abfd, sec) & (SEC_CODE | SEC_DATA)) == 0)
+    return 0;
+
+  syms = nlm_get_symbols (abfd);
+  if (syms == NULL)
+    {
+      if (! nlm_slurp_symbol_table (abfd))
+	return -1;
+      syms = nlm_get_symbols (abfd);
+    }
+
+  ret = nlm_fixed_header (abfd)->numberOfRelocationFixups;
+
+  count = bfd_get_symcount (abfd);
+  while (count-- != 0)
+    {
+      ret += syms->rcnt;
+      ++syms;
+    }
+
+  return (ret + 1) * sizeof (arelent *);
+}
+
+/* Get the relocs themselves.  */
+
+long
+nlm_canonicalize_reloc (bfd *abfd,
+			asection *sec,
+			arelent **relptr,
+			asymbol **symbols)
+{
+  arelent *rels;
+  asection **secs;
+  bfd_size_type count, i;
+  long ret;
+
+  /* Get the relocation fixups.  */
+  rels = nlm_relocation_fixups (abfd);
+  if (rels == NULL)
+    {
+      if (! nlm_slurp_reloc_fixups (abfd))
+	return -1;
+      rels = nlm_relocation_fixups (abfd);
+    }
+  secs = nlm_relocation_fixup_secs (abfd);
+
+  ret = 0;
+  count = nlm_fixed_header (abfd)->numberOfRelocationFixups;
+  for (i = 0; i < count; i++, rels++, secs++)
+    {
+      if (*secs == sec)
+	{
+	  *relptr++ = rels;
+	  ++ret;
+	}
+    }
+
+  /* Get the import symbols.  */
+  count = bfd_get_symcount (abfd);
+  for (i = 0; i < count; i++, symbols++)
+    {
+      asymbol *sym;
+
+      sym = *symbols;
+      if (bfd_asymbol_flavour (sym) == bfd_target_nlm_flavour)
+	{
+	  nlm_symbol_type *nlm_sym;
+	  bfd_size_type j;
+
+	  nlm_sym = (nlm_symbol_type *) sym;
+	  for (j = 0; j < nlm_sym->rcnt; j++)
+	    {
+	      if (nlm_sym->relocs[j].section == sec)
+		{
+		  *relptr = &nlm_sym->relocs[j].reloc;
+		  (*relptr)->sym_ptr_ptr = symbols;
+		  ++relptr;
+		  ++ret;
+		}
+	    }
+	}
+    }
+
+  *relptr = NULL;
+
+  return ret;
+}
+
+/* Compute the section file positions for an NLM file.  All variable
+   length data in the file headers must be set before this function is
+   called.  If the variable length data is changed later, the
+   resulting object file will be incorrect.  Unfortunately, there is
+   no way to check this.
+
+   This routine also sets the Size and Offset fields in the fixed
+   header.
+
+   It also looks over the symbols and moves any common symbols into
+   the .bss section; NLM has no way to represent a common symbol.
+   This approach means that either the symbols must already have been
+   set at this point, or there must be no common symbols.  We need to
+   move the symbols at this point so that mangle_relocs can see the
+   final values.  */
+
+static bfd_boolean
+nlm_compute_section_file_positions (bfd *abfd)
+{
+  file_ptr sofar;
+  asection *sec;
+  bfd_vma text, data, bss;
+  bfd_vma text_low, data_low;
+  unsigned int text_align, data_align, other_align;
+  file_ptr text_ptr, data_ptr, other_ptr;
+  asection *bss_sec;
+  asymbol **sym_ptr_ptr;
+
+  if (abfd->output_has_begun)
+    return TRUE;
+
+  /* Make sure we have a section to hold uninitialized data.  */
+  bss_sec = bfd_get_section_by_name (abfd, NLM_UNINITIALIZED_DATA_NAME);
+  if (bss_sec == NULL)
+    {
+      if (!add_bfd_section (abfd, NLM_UNINITIALIZED_DATA_NAME,
+			    (file_ptr) 0, (bfd_size_type) 0,
+			    SEC_ALLOC))
+	return FALSE;
+      bss_sec = bfd_get_section_by_name (abfd, NLM_UNINITIALIZED_DATA_NAME);
+    }
+
+  abfd->output_has_begun = TRUE;
+
+  /* The fixed header.  */
+  sofar = nlm_optional_prefix_size (abfd) + nlm_fixed_header_size (abfd);
+
+  /* The variable header.  */
+  sofar += (sizeof (nlm_variable_header (abfd)->descriptionLength)
+	    + nlm_variable_header (abfd)->descriptionLength + 1
+	    + NLM_TARGET_LONG_SIZE	/* stackSize */
+	    + NLM_TARGET_LONG_SIZE	/* reserved */
+	    + sizeof (nlm_variable_header (abfd)->oldThreadName)
+	    + sizeof (nlm_variable_header (abfd)->screenNameLength)
+	    + nlm_variable_header (abfd)->screenNameLength + 1
+	    + sizeof (nlm_variable_header (abfd)->threadNameLength)
+	    + nlm_variable_header (abfd)->threadNameLength + 1);
+
+  /* The auxiliary headers.  */
+  if (find_nonzero (nlm_version_header (abfd),
+		    sizeof (Nlm_Internal_Version_Header)))
+    sofar += sizeof (Nlm_External_Version_Header);
+  if (find_nonzero (nlm_extended_header (abfd),
+		    sizeof (Nlm_Internal_Extended_Header)))
+    sofar += sizeof (Nlm_External_Extended_Header);
+  if (find_nonzero (nlm_copyright_header (abfd),
+		    sizeof (Nlm_Internal_Copyright_Header)))
+    sofar += (sizeof (Nlm_External_Copyright_Header)
+	      + nlm_copyright_header (abfd)->copyrightMessageLength + 1);
+  if (find_nonzero (nlm_custom_header (abfd),
+		    sizeof (Nlm_Internal_Custom_Header)))
+    sofar += (sizeof (Nlm_External_Custom_Header)
+	      + nlm_custom_header (abfd)->hdrLength);
+  if (find_nonzero (nlm_cygnus_ext_header (abfd),
+		    sizeof (Nlm_Internal_Cygnus_Ext_Header)))
+    sofar += sizeof (Nlm_External_Custom_Header);
+
+  /* Compute the section file positions in two passes.  First get the
+     sizes of the text and data sections, and then set the file
+     positions.  This code aligns the sections in the file using the
+     same alignment restrictions that apply to the sections in memory;
+     this may not be necessary.  */
+  text = 0;
+  text_low = (bfd_vma) - 1;
+  text_align = 0;
+  data = 0;
+  data_low = (bfd_vma) - 1;
+  data_align = 0;
+  bss = 0;
+  other_align = 0;
+  for (sec = abfd->sections; sec != NULL; sec = sec->next)
+    {
+      flagword f;
+
+      sec->size = BFD_ALIGN (sec->size, 1 << sec->alignment_power);
+
+      f = bfd_get_section_flags (abfd, sec);
+      if (f & SEC_CODE)
+	{
+	  text += sec->size;
+	  if (bfd_get_section_vma (abfd, sec) < text_low)
+	    text_low = bfd_get_section_vma (abfd, sec);
+	  if (sec->alignment_power > text_align)
+	    text_align = sec->alignment_power;
+	}
+      else if (f & SEC_DATA)
+	{
+	  data += sec->size;
+	  if (bfd_get_section_vma (abfd, sec) < data_low)
+	    data_low = bfd_get_section_vma (abfd, sec);
+	  if (sec->alignment_power > data_align)
+	    data_align = sec->alignment_power;
+	}
+      else if (f & SEC_HAS_CONTENTS)
+	{
+	  if (sec->alignment_power > other_align)
+	    other_align = sec->alignment_power;
+	}
+      else if (f & SEC_ALLOC)
+	bss += sec->size;
+    }
+
+  nlm_set_text_low (abfd, text_low);
+  nlm_set_data_low (abfd, data_low);
+
+  if (nlm_no_uninitialized_data (abfd))
+    {
+      /* This NetWare format does not use uninitialized data.  We must
+	 increase the size of the data section.  We will never wind up
+	 writing those file locations, so they will remain zero.  */
+      data += bss;
+      bss = 0;
+    }
+
+  text_ptr = BFD_ALIGN (sofar, 1 << text_align);
+  data_ptr = BFD_ALIGN (text_ptr + text, 1 << data_align);
+  other_ptr = BFD_ALIGN (data_ptr + data, 1 << other_align);
+
+  /* Fill in some fields in the header for which we now have the
+     information.  */
+  nlm_fixed_header (abfd)->codeImageOffset = text_ptr;
+  nlm_fixed_header (abfd)->codeImageSize = text;
+  nlm_fixed_header (abfd)->dataImageOffset = data_ptr;
+  nlm_fixed_header (abfd)->dataImageSize = data;
+  nlm_fixed_header (abfd)->uninitializedDataSize = bss;
+
+  for (sec = abfd->sections; sec != NULL; sec = sec->next)
+    {
+      flagword f;
+
+      f = bfd_get_section_flags (abfd, sec);
+
+      if (f & SEC_CODE)
+	{
+	  sec->filepos = text_ptr;
+	  text_ptr += sec->size;
+	}
+      else if (f & SEC_DATA)
+	{
+	  sec->filepos = data_ptr;
+	  data_ptr += sec->size;
+	}
+      else if (f & SEC_HAS_CONTENTS)
+	{
+	  sec->filepos = other_ptr;
+	  other_ptr += sec->size;
+	}
+    }
+
+  nlm_fixed_header (abfd)->relocationFixupOffset = other_ptr;
+
+  /* Move all common symbols into the .bss section.  */
+
+  sym_ptr_ptr = bfd_get_outsymbols (abfd);
+  if (sym_ptr_ptr != NULL)
+    {
+      asymbol **sym_end;
+      bfd_vma add;
+
+      sym_end = sym_ptr_ptr + bfd_get_symcount (abfd);
+      add = 0;
+      for (; sym_ptr_ptr < sym_end; sym_ptr_ptr++)
+	{
+	  asymbol *sym;
+	  bfd_vma size;
+
+	  sym = *sym_ptr_ptr;
+
+	  if (!bfd_is_com_section (bfd_get_section (sym)))
+	    continue;
+
+	  /* Put the common symbol in the .bss section, and increase
+	     the size of the .bss section by the size of the common
+	     symbol (which is the old value of the symbol).  */
+	  sym->section = bss_sec;
+	  size = sym->value;
+	  sym->value = bss_sec->size + add;
+	  add += size;
+	  add = BFD_ALIGN (add, 1 << bss_sec->alignment_power);
+	}
+      if (add != 0)
+	{
+	  if (nlm_no_uninitialized_data (abfd))
+	    {
+	      /* We could handle this case, but so far it hasn't been
+		 necessary.  */
+	      abort ();
+	    }
+	  nlm_fixed_header (abfd)->uninitializedDataSize += add;
+	  bss_sec->size += add;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Set the contents of a section.  To do this we need to know where
+   the section is going to be located in the output file.  That means
+   that the sizes of all the sections must be set, and all the
+   variable size header information must be known.  */
+
+bfd_boolean
+nlm_set_section_contents (bfd *abfd,
+			  asection *section,
+			  const void * location,
+			  file_ptr offset,
+			  bfd_size_type count)
+{
+  if (! abfd->output_has_begun
+      && ! nlm_compute_section_file_positions (abfd))
+    return FALSE;
+
+  if (count == 0)
+    return TRUE;
+
+  /* i386 NetWare has a very restricted set of relocs.  In order for
+     objcopy to work, the NLM i386 backend needs a chance to rework
+     the section contents so that its set of relocs will work.  If all
+     the relocs are already acceptable, this will not do anything.  */
+  if (section->reloc_count != 0)
+    {
+      bfd_boolean (*mangle_relocs_func)
+	(bfd *, asection *, const void *, bfd_vma, bfd_size_type);
+
+      mangle_relocs_func = nlm_mangle_relocs_func (abfd);
+      if (mangle_relocs_func != NULL)
+	{
+	  if (!(*mangle_relocs_func) (abfd, section, location,
+				      (bfd_vma) offset, count))
+	    return FALSE;
+	}
+    }
+
+  if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0
+      || bfd_bwrite (location, count, abfd) != count)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* We need to sort a list of relocs associated with sections when we
+   write out the external relocs.  */
+
+static int
+nlm_external_reloc_compare (const void *p1, const void *p2)
+{
+  const struct reloc_and_sec *r1 = (const struct reloc_and_sec *) p1;
+  const struct reloc_and_sec *r2 = (const struct reloc_and_sec *) p2;
+  int cmp;
+
+  cmp = strcmp ((*r1->rel->sym_ptr_ptr)->name,
+		(*r2->rel->sym_ptr_ptr)->name);
+  if (cmp != 0)
+    return cmp;
+
+  /* We sort by address within symbol to make the sort more stable and
+     increase the chances that different hosts will generate bit for
+     bit equivalent results.  */
+  return (int) (r1->rel->address - r2->rel->address);
+}
+
+/* Write out an NLM file.  We write out the information in this order:
+     fixed header
+     variable header
+     auxiliary headers
+     code sections
+     data sections
+     other sections (custom data, messages, help, shared NLM, RPC,
+     		     module dependencies)
+     relocation fixups
+     external references (imports)
+     public symbols (exports)
+     debugging records
+   This is similar to the order used by the NetWare tools; the
+   difference is that NetWare puts the sections other than code, data
+   and custom data at the end of the NLM.  It is convenient for us to
+   know where the sections are going to be before worrying about the
+   size of the other information.
+
+   By the time this function is called, all the section data should
+   have been output using set_section_contents.  Note that custom
+   data, the message file, the help file, the shared NLM file, the RPC
+   data, and the module dependencies are all considered to be
+   sections; the caller is responsible for filling in the offset and
+   length fields in the NLM headers.  The relocation fixups and
+   imports are both obtained from the list of relocs attached to each
+   section.  The exports and debugging records are obtained from the
+   list of outsymbols.  */
+
+bfd_boolean
+nlm_write_object_contents (bfd *abfd)
+{
+  asection *sec;
+  bfd_boolean (*write_import_func) (bfd *, asection *, arelent *);
+  bfd_size_type external_reloc_count, internal_reloc_count, i, c;
+  struct reloc_and_sec *external_relocs;
+  asymbol **sym_ptr_ptr;
+  file_ptr last;
+  bfd_boolean (*write_prefix_func) (bfd *);
+  unsigned char *fixed_header = NULL;
+  file_ptr pos;
+  bfd_size_type amt;
+
+  fixed_header = bfd_malloc (nlm_fixed_header_size (abfd));
+  if (fixed_header == NULL)
+    goto error_return;
+
+  if (! abfd->output_has_begun
+      && ! nlm_compute_section_file_positions (abfd))
+    goto error_return;
+
+  /* Write out the variable length headers.  */
+  pos = nlm_optional_prefix_size (abfd) + nlm_fixed_header_size (abfd);
+  if (bfd_seek (abfd, pos, SEEK_SET) != 0)
+    goto error_return;
+  if (! nlm_swap_variable_header_out (abfd)
+      || ! nlm_swap_auxiliary_headers_out (abfd))
+    {
+      bfd_set_error (bfd_error_system_call);
+      goto error_return;
+    }
+
+  /* A weak check on whether the section file positions were
+     reasonable.  */
+  if (bfd_tell (abfd) > nlm_fixed_header (abfd)->codeImageOffset)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      goto error_return;
+    }
+
+  /* Advance to the relocs.  */
+  if (bfd_seek (abfd, nlm_fixed_header (abfd)->relocationFixupOffset,
+		SEEK_SET) != 0)
+    goto error_return;
+
+  /* The format of the relocation entries is dependent upon the
+     particular target.  We use an external routine to write the reloc
+     out.  */
+  write_import_func = nlm_write_import_func (abfd);
+
+  /* Write out the internal relocation fixups.  While we're looping
+     over the relocs, we also count the external relocs, which is
+     needed when they are written out below.  */
+  internal_reloc_count = 0;
+  external_reloc_count = 0;
+  for (sec = abfd->sections; sec != NULL; sec = sec->next)
+    {
+      arelent **rel_ptr_ptr, **rel_end;
+
+      if (sec->reloc_count == 0)
+	continue;
+
+      /* We can only represent relocs within a code or data
+	 section.  We ignore them for a debugging section.  */
+      if ((bfd_get_section_flags (abfd, sec) & (SEC_CODE | SEC_DATA)) == 0)
+	continue;
+
+      /* We need to know how to write out imports */
+      if (write_import_func == NULL)
+	{
+	  bfd_set_error (bfd_error_invalid_operation);
+	  goto error_return;
+	}
+
+      rel_ptr_ptr = sec->orelocation;
+      rel_end = rel_ptr_ptr + sec->reloc_count;
+      for (; rel_ptr_ptr < rel_end; rel_ptr_ptr++)
+	{
+	  arelent *rel;
+	  asymbol *sym;
+
+	  rel = *rel_ptr_ptr;
+	  sym = *rel->sym_ptr_ptr;
+
+	  if (! bfd_is_und_section (bfd_get_section (sym)))
+	    {
+	      ++internal_reloc_count;
+	      if (! (*write_import_func) (abfd, sec, rel))
+		goto error_return;
+	    }
+	  else
+	    ++external_reloc_count;
+	}
+    }
+  nlm_fixed_header (abfd)->numberOfRelocationFixups = internal_reloc_count;
+
+  /* Write out the imports (relocs against external symbols).  These
+     are output as a symbol name followed by all the relocs for that
+     symbol, so we must first gather together all the relocs against
+     external symbols and sort them.  */
+  amt = external_reloc_count * sizeof (struct reloc_and_sec);
+  external_relocs = bfd_alloc (abfd, amt);
+  if (external_relocs == NULL)
+    goto error_return;
+  i = 0;
+  for (sec = abfd->sections; sec != NULL; sec = sec->next)
+    {
+      arelent **rel_ptr_ptr, **rel_end;
+
+      if (sec->reloc_count == 0)
+	continue;
+
+      rel_ptr_ptr = sec->orelocation;
+      rel_end = rel_ptr_ptr + sec->reloc_count;
+      for (; rel_ptr_ptr < rel_end; rel_ptr_ptr++)
+	{
+	  arelent *rel;
+	  asymbol *sym;
+
+	  rel = *rel_ptr_ptr;
+	  sym = *rel->sym_ptr_ptr;
+
+	  if (! bfd_is_und_section (bfd_get_section (sym)))
+	    continue;
+
+	  external_relocs[i].rel = rel;
+	  external_relocs[i].sec = sec;
+	  ++i;
+	}
+    }
+
+  BFD_ASSERT (i == external_reloc_count);
+
+  /* Sort the external relocs by name.  */
+  qsort (external_relocs, (size_t) external_reloc_count,
+	 sizeof (struct reloc_and_sec), nlm_external_reloc_compare);
+
+  /* Write out the external relocs.  */
+  nlm_fixed_header (abfd)->externalReferencesOffset = bfd_tell (abfd);
+  c = 0;
+  i = 0;
+  while (i < external_reloc_count)
+    {
+      arelent *rel;
+      asymbol *sym;
+      bfd_size_type j, cnt;
+
+      ++c;
+
+      rel = external_relocs[i].rel;
+      sym = *rel->sym_ptr_ptr;
+
+      cnt = 0;
+      for (j = i;
+	   (j < external_reloc_count
+	    && *external_relocs[j].rel->sym_ptr_ptr == sym);
+	   j++)
+	++cnt;
+
+      if (! (*nlm_write_external_func (abfd)) (abfd, cnt, sym,
+					       &external_relocs[i]))
+	goto error_return;
+
+      i += cnt;
+    }
+
+  nlm_fixed_header (abfd)->numberOfExternalReferences = c;
+
+  /* Write out the public symbols (exports).  */
+  sym_ptr_ptr = bfd_get_outsymbols (abfd);
+  if (sym_ptr_ptr != NULL)
+    {
+      bfd_vma (*get_public_offset_func) (bfd *, asymbol *);
+      bfd_boolean (*write_export_func) (bfd *, asymbol *, bfd_vma);
+
+      asymbol **sym_end;
+
+      nlm_fixed_header (abfd)->publicsOffset = bfd_tell (abfd);
+      get_public_offset_func = nlm_get_public_offset_func (abfd);
+      write_export_func = nlm_write_export_func (abfd);
+      c = 0;
+      sym_end = sym_ptr_ptr + bfd_get_symcount (abfd);
+      for (; sym_ptr_ptr < sym_end; sym_ptr_ptr++)
+	{
+	  asymbol *sym;
+	  bfd_byte len;
+	  bfd_vma offset;
+	  bfd_byte temp[NLM_TARGET_LONG_SIZE];
+
+	  sym = *sym_ptr_ptr;
+
+	  if ((sym->flags & (BSF_EXPORT | BSF_GLOBAL)) == 0
+	      || bfd_is_und_section (bfd_get_section (sym)))
+	    continue;
+
+	  ++c;
+
+	  if (get_public_offset_func)
+	    {
+	      /* Most backends can use the code below, but
+		 unfortunately some use a different scheme.  */
+	      offset = (*get_public_offset_func) (abfd, sym);
+	    }
+	  else
+	    {
+	      offset = bfd_asymbol_value (sym);
+	      sec = sym->section;
+	      if (sec->flags & SEC_CODE)
+		{
+		  offset -= nlm_get_text_low (abfd);
+		  offset |= NLM_HIBIT;
+		}
+	      else if (sec->flags & (SEC_DATA | SEC_ALLOC))
+		{
+		  /* SEC_ALLOC is for the .bss section.  */
+		  offset -= nlm_get_data_low (abfd);
+		}
+	      else
+		{
+		  /* We can't handle an exported symbol that is not in
+		     the code or data segment.  */
+		  bfd_set_error (bfd_error_invalid_operation);
+		  goto error_return;
+		}
+	    }
+
+	  if (write_export_func)
+	    {
+	      if (! (*write_export_func) (abfd, sym, offset))
+		goto error_return;
+	    }
+	  else
+	    {
+	      len = strlen (sym->name);
+	      if ((bfd_bwrite (&len, (bfd_size_type) sizeof (bfd_byte), abfd)
+		   != sizeof (bfd_byte))
+		  || bfd_bwrite (sym->name, (bfd_size_type) len, abfd) != len)
+		goto error_return;
+
+	      put_word (abfd, offset, temp);
+	      if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd)
+		  != sizeof (temp))
+		goto error_return;
+	    }
+	}
+      nlm_fixed_header (abfd)->numberOfPublics = c;
+
+      /* Write out the debugging records.  The NLM conversion program
+	 wants to be able to inhibit this, so as a special hack if
+	 debugInfoOffset is set to -1 we don't write any debugging
+	 information.  This can not be handled by fiddling with the
+	 symbol table, because exported symbols appear in both the
+	 exported symbol list and the debugging information.  */
+      if (nlm_fixed_header (abfd)->debugInfoOffset == (file_ptr) - 1)
+	{
+	  nlm_fixed_header (abfd)->debugInfoOffset = 0;
+	  nlm_fixed_header (abfd)->numberOfDebugRecords = 0;
+	}
+      else
+	{
+	  nlm_fixed_header (abfd)->debugInfoOffset = bfd_tell (abfd);
+	  c = 0;
+	  sym_ptr_ptr = bfd_get_outsymbols (abfd);
+	  sym_end = sym_ptr_ptr + bfd_get_symcount (abfd);
+	  for (; sym_ptr_ptr < sym_end; sym_ptr_ptr++)
+	    {
+	      asymbol *sym;
+	      bfd_byte type, len;
+	      bfd_vma offset;
+	      bfd_byte temp[NLM_TARGET_LONG_SIZE];
+
+	      sym = *sym_ptr_ptr;
+
+	      /* The NLM notion of a debugging symbol is actually what
+		 BFD calls a local or global symbol.  What BFD calls a
+		 debugging symbol NLM does not understand at all.  */
+	      if ((sym->flags & (BSF_LOCAL | BSF_GLOBAL | BSF_EXPORT)) == 0
+		  || (sym->flags & BSF_DEBUGGING) != 0
+		  || bfd_is_und_section (bfd_get_section (sym)))
+		continue;
+
+	      ++c;
+
+	      offset = bfd_asymbol_value (sym);
+	      sec = sym->section;
+	      if (sec->flags & SEC_CODE)
+		{
+		  offset -= nlm_get_text_low (abfd);
+		  type = 1;
+		}
+	      else if (sec->flags & (SEC_DATA | SEC_ALLOC))
+		{
+		  /* SEC_ALLOC is for the .bss section.  */
+		  offset -= nlm_get_data_low (abfd);
+		  type = 0;
+		}
+	      else
+		type = 2;
+
+	      /* The type is 0 for data, 1 for code, 2 for absolute.  */
+	      if (bfd_bwrite (&type, (bfd_size_type) sizeof (bfd_byte), abfd)
+		  != sizeof (bfd_byte))
+		goto error_return;
+
+	      put_word (abfd, offset, temp);
+	      if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd)
+		  != sizeof (temp))
+		goto error_return;
+
+	      len = strlen (sym->name);
+	      if ((bfd_bwrite (&len, (bfd_size_type) sizeof (bfd_byte), abfd)
+		   != sizeof (bfd_byte))
+		  || bfd_bwrite (sym->name, (bfd_size_type) len, abfd) != len)
+		goto error_return;
+	    }
+	  nlm_fixed_header (abfd)->numberOfDebugRecords = c;
+	}
+    }
+
+  /* NLMLINK fills in offset values even if there is no data, so we do
+     the same.  */
+  last = bfd_tell (abfd);
+  if (nlm_fixed_header (abfd)->codeImageOffset == 0)
+    nlm_fixed_header (abfd)->codeImageOffset = last;
+  if (nlm_fixed_header (abfd)->dataImageOffset == 0)
+    nlm_fixed_header (abfd)->dataImageOffset = last;
+  if (nlm_fixed_header (abfd)->customDataOffset == 0)
+    nlm_fixed_header (abfd)->customDataOffset = last;
+  if (nlm_fixed_header (abfd)->moduleDependencyOffset == 0)
+    nlm_fixed_header (abfd)->moduleDependencyOffset = last;
+  if (nlm_fixed_header (abfd)->relocationFixupOffset == 0)
+    nlm_fixed_header (abfd)->relocationFixupOffset = last;
+  if (nlm_fixed_header (abfd)->externalReferencesOffset == 0)
+    nlm_fixed_header (abfd)->externalReferencesOffset = last;
+  if (nlm_fixed_header (abfd)->publicsOffset == 0)
+    nlm_fixed_header (abfd)->publicsOffset = last;
+  if (nlm_fixed_header (abfd)->debugInfoOffset == 0)
+    nlm_fixed_header (abfd)->debugInfoOffset = last;
+
+  /* At this point everything has been written out except the fixed
+     header.  */
+  memcpy (nlm_fixed_header (abfd)->signature, nlm_signature (abfd),
+	  NLM_SIGNATURE_SIZE);
+  nlm_fixed_header (abfd)->version = NLM_HEADER_VERSION;
+  nlm_fixed_header (abfd)->codeStartOffset =
+    (bfd_get_start_address (abfd)
+     - nlm_get_text_low (abfd));
+
+  /* We have no convenient way for the caller to pass in the exit
+     procedure or the check unload procedure, so the caller must set
+     the values in the header to the values of the symbols.  */
+  nlm_fixed_header (abfd)->exitProcedureOffset -= nlm_get_text_low (abfd);
+  if (nlm_fixed_header (abfd)->checkUnloadProcedureOffset != 0)
+    nlm_fixed_header (abfd)->checkUnloadProcedureOffset -=
+      nlm_get_text_low (abfd);
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    goto error_return;
+
+  write_prefix_func = nlm_write_prefix_func (abfd);
+  if (write_prefix_func)
+    {
+      if (! (*write_prefix_func) (abfd))
+	goto error_return;
+    }
+
+  BFD_ASSERT ((bfd_size_type) bfd_tell (abfd)
+	      == nlm_optional_prefix_size (abfd));
+
+  nlm_swap_fixed_header_out (abfd, nlm_fixed_header (abfd), fixed_header);
+  if (bfd_bwrite (fixed_header, nlm_fixed_header_size (abfd), abfd)
+      != nlm_fixed_header_size (abfd))
+    goto error_return;
+
+  if (fixed_header != NULL)
+    free (fixed_header);
+  return TRUE;
+
+error_return:
+  if (fixed_header != NULL)
+    free (fixed_header);
+  return FALSE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/nlmswap.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/nlmswap.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/nlmswap.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/nlmswap.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,153 @@
+/* NLM (NetWare Loadable Module) swapping routines for BFD.
+   Copyright 1993, 2000, 2001, 2005, 2007 Free Software Foundation, Inc.
+
+   Written by Fred Fish @ Cygnus Support, using ELF support as the
+   template.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* Although this is a header file, it defines functions.  It is
+   included by NLM backends to define swapping functions that vary
+   from one NLM to another.  The backend code must arrange for
+   Nlm_External_xxxx to be defined appropriately, and can then include
+   this file to get the swapping routines.
+
+   At the moment this is only needed for one structure, the fixed NLM
+   file header.  */
+
+/* Translate an NLM fixed length file header in external format into an NLM
+   file header in internal format.  */
+
+static void
+nlm_swap_fixed_header_in (bfd *abfd,
+			  void * realsrc,
+			  Nlm_Internal_Fixed_Header *dst)
+{
+  Nlm_External_Fixed_Header *src = (Nlm_External_Fixed_Header *) realsrc;
+
+  memcpy (dst->signature, src->signature, NLM_SIGNATURE_SIZE);
+  memcpy (dst->moduleName, src->moduleName, NLM_MODULE_NAME_SIZE);
+  dst->version =
+    H_GET_32 (abfd, src->version);
+  dst->codeImageOffset =
+    H_GET_32 (abfd, src->codeImageOffset);
+  dst->codeImageSize =
+    H_GET_32 (abfd, src->codeImageSize);
+  dst->dataImageOffset =
+    H_GET_32 (abfd, src->dataImageOffset);
+  dst->dataImageSize =
+    H_GET_32 (abfd, src->dataImageSize);
+  dst->uninitializedDataSize =
+    H_GET_32 (abfd, src->uninitializedDataSize);
+  dst->customDataOffset =
+    H_GET_32 (abfd, src->customDataOffset);
+  dst->customDataSize =
+    H_GET_32 (abfd, src->customDataSize);
+  dst->moduleDependencyOffset =
+    H_GET_32 (abfd, src->moduleDependencyOffset);
+  dst->numberOfModuleDependencies =
+    H_GET_32 (abfd, src->numberOfModuleDependencies);
+  dst->relocationFixupOffset =
+    H_GET_32 (abfd, src->relocationFixupOffset);
+  dst->numberOfRelocationFixups =
+    H_GET_32 (abfd, src->numberOfRelocationFixups);
+  dst->externalReferencesOffset =
+    H_GET_32 (abfd, src->externalReferencesOffset);
+  dst->numberOfExternalReferences =
+    H_GET_32 (abfd, src->numberOfExternalReferences);
+  dst->publicsOffset =
+    H_GET_32 (abfd, src->publicsOffset);
+  dst->numberOfPublics =
+    H_GET_32 (abfd, src->numberOfPublics);
+  dst->debugInfoOffset =
+    H_GET_32 (abfd, src->debugInfoOffset);
+  dst->numberOfDebugRecords =
+    H_GET_32 (abfd, src->numberOfDebugRecords);
+  dst->codeStartOffset =
+    H_GET_32 (abfd, src->codeStartOffset);
+  dst->exitProcedureOffset =
+    H_GET_32 (abfd, src->exitProcedureOffset);
+  dst->checkUnloadProcedureOffset =
+    H_GET_32 (abfd, src->checkUnloadProcedureOffset);
+  dst->moduleType =
+    H_GET_32 (abfd, src->moduleType);
+  dst->flags =
+    H_GET_32 (abfd, src->flags);
+}
+
+/* Translate an NLM fixed length file header in internal format into
+   an NLM file header in external format.  */
+
+static void
+nlm_swap_fixed_header_out (bfd *abfd,
+			   Nlm_Internal_Fixed_Header *src,
+			   void * realdst)
+{
+  Nlm_External_Fixed_Header *dst = (Nlm_External_Fixed_Header *) realdst;
+
+  memset (dst, 0, sizeof *dst);
+  memcpy (dst->signature, src->signature, NLM_SIGNATURE_SIZE);
+  memcpy (dst->moduleName, src->moduleName, NLM_MODULE_NAME_SIZE);
+  H_PUT_32 (abfd, src->version,
+	    dst->version);
+  H_PUT_32 (abfd, src->codeImageOffset,
+	    dst->codeImageOffset);
+  H_PUT_32 (abfd, src->codeImageSize,
+	    dst->codeImageSize);
+  H_PUT_32 (abfd, src->dataImageOffset,
+	    dst->dataImageOffset);
+  H_PUT_32 (abfd, src->dataImageSize,
+	    dst->dataImageSize);
+  H_PUT_32 (abfd, src->uninitializedDataSize,
+	    dst->uninitializedDataSize);
+  H_PUT_32 (abfd, src->customDataOffset,
+	    dst->customDataOffset);
+  H_PUT_32 (abfd, src->customDataSize,
+	    dst->customDataSize);
+  H_PUT_32 (abfd, src->moduleDependencyOffset,
+	    dst->moduleDependencyOffset);
+  H_PUT_32 (abfd, src->numberOfModuleDependencies,
+	    dst->numberOfModuleDependencies);
+  H_PUT_32 (abfd, src->relocationFixupOffset,
+	    dst->relocationFixupOffset);
+  H_PUT_32 (abfd, src->numberOfRelocationFixups,
+	    dst->numberOfRelocationFixups);
+  H_PUT_32 (abfd, src->externalReferencesOffset,
+	    dst->externalReferencesOffset);
+  H_PUT_32 (abfd, src->numberOfExternalReferences,
+	    dst->numberOfExternalReferences);
+  H_PUT_32 (abfd, src->publicsOffset,
+	    dst->publicsOffset);
+  H_PUT_32 (abfd, src->numberOfPublics,
+	    dst->numberOfPublics);
+  H_PUT_32 (abfd, src->debugInfoOffset,
+	    dst->debugInfoOffset);
+  H_PUT_32 (abfd, src->numberOfDebugRecords,
+	    dst->numberOfDebugRecords);
+  H_PUT_32 (abfd, src->codeStartOffset,
+	    dst->codeStartOffset);
+  H_PUT_32 (abfd, src->exitProcedureOffset,
+	    dst->exitProcedureOffset);
+  H_PUT_32 (abfd, src->checkUnloadProcedureOffset,
+	    dst->checkUnloadProcedureOffset);
+  H_PUT_32 (abfd, src->moduleType,
+	    dst->moduleType);
+  H_PUT_32 (abfd, src->flags,
+	    dst->flags);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ns32k.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ns32k.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ns32k.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ns32k.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,30 @@
+/* Header file for ns32k routines.
+   Copyright 1996, 2001, 2002, 2005, 2007 Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+extern bfd_reloc_status_type _bfd_ns32k_relocate_contents   (reloc_howto_type *, bfd *, bfd_vma, bfd_byte *);
+extern bfd_reloc_status_type _bfd_do_ns32k_reloc_contents   (reloc_howto_type *, bfd *, bfd_vma, bfd_byte *, bfd_vma (*) (bfd_byte *, int), void (*) (bfd_vma, bfd_byte *, int));
+extern bfd_reloc_status_type _bfd_ns32k_final_link_relocate (reloc_howto_type *, bfd *, asection *, bfd_byte *, bfd_vma, bfd_vma, bfd_vma);
+extern bfd_vma               _bfd_ns32k_get_displacement    (bfd_byte *, int);
+extern bfd_vma               _bfd_ns32k_get_immediate       (bfd_byte *, int);
+extern void                  _bfd_ns32k_put_displacement    (bfd_vma, bfd_byte *, int);
+extern void                  _bfd_ns32k_put_immediate       (bfd_vma, bfd_byte *, int);
+extern bfd_reloc_status_type _bfd_ns32k_reloc_disp          (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+extern bfd_reloc_status_type _bfd_ns32k_reloc_imm           (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ns32knetbsd.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ns32knetbsd.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ns32knetbsd.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ns32knetbsd.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,53 @@
+/* BFD back-end for NetBSD/ns32k a.out-ish binaries.
+   Copyright 1990, 1991, 1992, 1994, 1995, 1998, 2000, 2001, 2002, 2005,
+   2007  Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define	BYTES_IN_WORD		4
+#undef TARGET_IS_BIG_ENDIAN_P
+
+#define	TARGET_PAGE_SIZE	4096
+#define	SEGMENT_SIZE		4096
+
+#define	DEFAULT_ARCH		bfd_arch_ns32k
+#define	DEFAULT_MID 		M_532_NETBSD
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (pc532netbsd_,OP)
+
+#define NAME(x,y) CONCAT3 (ns32kaout,_32_,y)
+
+/* This needs to start with a.out so GDB knows it is an a.out variant.  */
+#define TARGETNAME "a.out-ns32k-netbsd"
+
+#define ns32kaout_32_get_section_contents aout_32_get_section_contents
+
+#define MY_text_includes_header 1
+
+/* We can`t use the MYNS macro here for cpp reasons too subtle
+   for me -- IWD.  */
+#define MY_bfd_reloc_type_lookup ns32kaout_bfd_reloc_type_lookup
+
+#include "bfd.h"		/* To ensure following declaration is OK.  */
+
+const struct reloc_howto_struct * MY_bfd_reloc_type_lookup (bfd *, bfd_reloc_code_real_type);
+
+#include "netbsd.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/oasys.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/oasys.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/oasys.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/oasys.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1267 @@
+/* BFD back-end for oasys objects.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2001,
+   2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Steve Chamberlain of Cygnus Support, <sac@cygnus.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define UNDERSCORE_HACK 1
+#include "sysdep.h"
+#include "bfd.h"
+#include "safe-ctype.h"
+#include "libbfd.h"
+#include "oasys.h"
+#include "liboasys.h"
+
+/* Read in all the section data and relocation stuff too.  */
+
+static bfd_boolean
+oasys_read_record (bfd *abfd, oasys_record_union_type *record)
+{
+  bfd_size_type amt = sizeof (record->header);
+
+  if (bfd_bread ((void *) record, amt, abfd) != amt)
+    return FALSE;
+
+  amt = record->header.length - sizeof (record->header);
+  if ((long) amt <= 0)
+    return TRUE;
+  if (bfd_bread ((void *) ((char *) record + sizeof (record->header)), amt, abfd)
+      != amt)
+    return FALSE;
+  return TRUE;
+}
+
+static size_t
+oasys_string_length (oasys_record_union_type *record)
+{
+  return record->header.length
+    - ((char *) record->symbol.name - (char *) record);
+}
+
+/* Slurp the symbol table by reading in all the records at the start file
+   till we get to the first section record.
+
+   We'll sort the symbolss into  two lists, defined and undefined. The
+   undefined symbols will be placed into the table according to their
+   refno.
+
+   We do this by placing all undefined symbols at the front of the table
+   moving in, and the defined symbols at the end of the table moving back.  */
+
+static bfd_boolean
+oasys_slurp_symbol_table (bfd *const abfd)
+{
+  oasys_record_union_type record;
+  oasys_data_type *data = OASYS_DATA (abfd);
+  bfd_boolean loop = TRUE;
+  asymbol *dest_defined;
+  asymbol *dest;
+  char *string_ptr;
+  bfd_size_type amt;
+
+  if (data->symbols != NULL)
+    return TRUE;
+
+  /* Buy enough memory for all the symbols and all the names.  */
+  amt = abfd->symcount;
+  amt *= sizeof (asymbol);
+  data->symbols = bfd_alloc (abfd, amt);
+
+  amt = data->symbol_string_length;
+#ifdef UNDERSCORE_HACK
+  /* Buy 1 more char for each symbol to keep the underscore in.  */
+  amt += abfd->symcount;
+#endif
+  data->strings = bfd_alloc (abfd, amt);
+
+  if (!data->symbols || !data->strings)
+    return FALSE;
+
+  dest_defined = data->symbols + abfd->symcount - 1;
+
+  string_ptr = data->strings;
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    return FALSE;
+  while (loop)
+    {
+      if (! oasys_read_record (abfd, &record))
+	return FALSE;
+
+      switch (record.header.type)
+	{
+	case oasys_record_is_header_enum:
+	  break;
+	case oasys_record_is_local_enum:
+	case oasys_record_is_symbol_enum:
+	  {
+	    int flag = record.header.type == (int) oasys_record_is_local_enum ?
+	    (BSF_LOCAL) : (BSF_GLOBAL | BSF_EXPORT);
+
+	    size_t length = oasys_string_length (&record);
+	    switch (record.symbol.relb & RELOCATION_TYPE_BITS)
+	      {
+	      case RELOCATION_TYPE_ABS:
+		dest = dest_defined--;
+		dest->section = bfd_abs_section_ptr;
+		dest->flags = 0;
+
+		break;
+	      case RELOCATION_TYPE_REL:
+		dest = dest_defined--;
+		dest->section =
+		  OASYS_DATA (abfd)->sections[record.symbol.relb &
+					      RELOCATION_SECT_BITS];
+		if (record.header.type == (int) oasys_record_is_local_enum)
+		  {
+		    dest->flags = BSF_LOCAL;
+		    if (dest->section == (asection *) (~0))
+		      {
+			/* It seems that sometimes internal symbols are tied up, but
+		       still get output, even though there is no
+		       section */
+			dest->section = 0;
+		      }
+		  }
+		else
+		  dest->flags = flag;
+		break;
+	      case RELOCATION_TYPE_UND:
+		dest = data->symbols + H_GET_16 (abfd, record.symbol.refno);
+		dest->section = bfd_und_section_ptr;
+		break;
+	      case RELOCATION_TYPE_COM:
+		dest = dest_defined--;
+		dest->name = string_ptr;
+		dest->the_bfd = abfd;
+		dest->section = bfd_com_section_ptr;
+		break;
+	      default:
+		dest = dest_defined--;
+		BFD_ASSERT (FALSE);
+		break;
+	      }
+	    dest->name = string_ptr;
+	    dest->the_bfd = abfd;
+	    dest->udata.p = NULL;
+	    dest->value = H_GET_32 (abfd, record.symbol.value);
+
+#ifdef UNDERSCORE_HACK
+	    if (record.symbol.name[0] != '_')
+	      {
+		string_ptr[0] = '_';
+		string_ptr++;
+	      }
+#endif
+	    memcpy (string_ptr, record.symbol.name, length);
+
+	    string_ptr[length] = 0;
+	    string_ptr += length + 1;
+	  }
+	  break;
+	default:
+	  loop = FALSE;
+	}
+    }
+  return TRUE;
+}
+
+static long
+oasys_get_symtab_upper_bound (bfd *const abfd)
+{
+  if (! oasys_slurp_symbol_table (abfd))
+    return -1;
+
+  return (abfd->symcount + 1) * (sizeof (oasys_symbol_type *));
+}
+
+extern const bfd_target oasys_vec;
+
+static long
+oasys_canonicalize_symtab (bfd *abfd, asymbol **location)
+{
+  asymbol *symbase;
+  unsigned int counter;
+
+  if (! oasys_slurp_symbol_table (abfd))
+    return -1;
+
+  symbase = OASYS_DATA (abfd)->symbols;
+  for (counter = 0; counter < abfd->symcount; counter++)
+    *(location++) = symbase++;
+
+  *location = 0;
+  return abfd->symcount;
+}
+
+/* Archive stuff.  */
+
+static const bfd_target *
+oasys_archive_p (bfd *abfd)
+{
+  oasys_archive_header_type header;
+  oasys_extarchive_header_type header_ext;
+  unsigned int i;
+  file_ptr filepos;
+  bfd_size_type amt;
+
+  amt = sizeof (header_ext);
+  if (bfd_seek (abfd, (file_ptr) 0, 0) != 0
+      || bfd_bread ((void *) &header_ext, amt, abfd) != amt)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  header.version = H_GET_32 (abfd, header_ext.version);
+  header.mod_count = H_GET_32 (abfd, header_ext.mod_count);
+  header.mod_tbl_offset = H_GET_32 (abfd, header_ext.mod_tbl_offset);
+  header.sym_tbl_size = H_GET_32 (abfd, header_ext.sym_tbl_size);
+  header.sym_count = H_GET_32 (abfd, header_ext.sym_count);
+  header.sym_tbl_offset = H_GET_32 (abfd, header_ext.sym_tbl_offset);
+  header.xref_count = H_GET_32 (abfd, header_ext.xref_count);
+  header.xref_lst_offset = H_GET_32 (abfd, header_ext.xref_lst_offset);
+
+  /* There isn't a magic number in an Oasys archive, so the best we
+     can do to verify reasonableness is to make sure that the values in
+     the header are too weird.  */
+
+  if (header.version > 10000
+      || header.mod_count > 10000
+      || header.sym_count > 100000
+      || header.xref_count > 100000)
+    return NULL;
+
+  /* That all worked, let's buy the space for the header and read in
+     the headers.  */
+  {
+    oasys_ar_data_type *ar;
+    oasys_module_info_type *module;
+    oasys_module_table_type record;
+
+    amt = sizeof (oasys_ar_data_type);
+    ar = bfd_alloc (abfd, amt);
+
+    amt = header.mod_count;
+    amt *= sizeof (oasys_module_info_type);
+    module = bfd_alloc (abfd, amt);
+
+    if (!ar || !module)
+      return NULL;
+
+    abfd->tdata.oasys_ar_data = ar;
+    ar->module = module;
+    ar->module_count = header.mod_count;
+
+    filepos = header.mod_tbl_offset;
+    for (i = 0; i < header.mod_count; i++)
+      {
+	if (bfd_seek (abfd, filepos, SEEK_SET) != 0)
+	  return NULL;
+
+	/* There are two ways of specifying the archive header.  */
+	  {
+	    oasys_extmodule_table_type_b_type record_ext;
+
+	    amt = sizeof (record_ext);
+	    if (bfd_bread ((void *) &record_ext, amt, abfd) != amt)
+	      return NULL;
+
+	    record.mod_size = H_GET_32 (abfd, record_ext.mod_size);
+	    record.file_offset = H_GET_32 (abfd, record_ext.file_offset);
+
+	    record.dep_count = H_GET_32 (abfd, record_ext.dep_count);
+	    record.depee_count = H_GET_32 (abfd, record_ext.depee_count);
+	    record.sect_count = H_GET_32 (abfd, record_ext.sect_count);
+	    record.module_name_size = H_GET_32 (abfd,
+						record_ext.mod_name_length);
+
+	    amt = record.module_name_size;
+	    module[i].name = bfd_alloc (abfd, amt + 1);
+	    if (!module[i].name)
+	      return NULL;
+	    if (bfd_bread ((void *) module[i].name, amt, abfd) != amt)
+	      return NULL;
+	    module[i].name[record.module_name_size] = 0;
+	    filepos += (sizeof (record_ext)
+			+ record.dep_count * 4
+			+ record.module_name_size + 1);
+	  }
+
+	module[i].size = record.mod_size;
+	module[i].pos = record.file_offset;
+	module[i].abfd = 0;
+      }
+  }
+  return abfd->xvec;
+}
+
+static bfd_boolean
+oasys_mkobject (bfd *abfd)
+{
+  bfd_size_type amt = sizeof (oasys_data_type);
+
+  abfd->tdata.oasys_obj_data = bfd_alloc (abfd, amt);
+
+  return abfd->tdata.oasys_obj_data != NULL;
+}
+
+/* The howto table is build using the top two bits of a reloc byte to
+   index into it. The bits are PCREL,WORD/LONG.  */
+
+static reloc_howto_type howto_table[] =
+{
+
+  HOWTO (0, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, 0, "abs16",   TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (0, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, 0, "abs32",   TRUE, 0xffffffff, 0xffffffff, FALSE),
+  HOWTO (0, 0, 1, 16, TRUE,  0, complain_overflow_signed,   0, "pcrel16", TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (0, 0, 2, 32, TRUE,  0, complain_overflow_signed,   0, "pcrel32", TRUE, 0xffffffff, 0xffffffff, FALSE)
+};
+
+/* Read in all the section data and relocation stuff too.  */
+
+static bfd_boolean
+oasys_slurp_section_data (bfd *const abfd)
+{
+  oasys_record_union_type record;
+  oasys_data_type *data = OASYS_DATA (abfd);
+  bfd_boolean loop = TRUE;
+  oasys_per_section_type *per;
+  asection *s;
+  bfd_size_type amt;
+
+  /* See if the data has been slurped already.  */
+  for (s = abfd->sections; s != NULL; s = s->next)
+    {
+      per = oasys_per_section (s);
+      if (per->initialized)
+	return TRUE;
+    }
+
+  if (data->first_data_record == 0)
+    return TRUE;
+
+  if (bfd_seek (abfd, data->first_data_record, SEEK_SET) != 0)
+    return FALSE;
+
+  while (loop)
+    {
+      if (! oasys_read_record (abfd, &record))
+	return FALSE;
+
+      switch (record.header.type)
+	{
+	case oasys_record_is_header_enum:
+	  break;
+	case oasys_record_is_data_enum:
+	  {
+	    bfd_byte *src = record.data.data;
+	    bfd_byte *end_src = ((bfd_byte *) & record) + record.header.length;
+	    bfd_byte *dst_ptr;
+	    bfd_byte *dst_base_ptr;
+	    unsigned int relbit;
+	    unsigned int count;
+	    asection *section =
+	    data->sections[record.data.relb & RELOCATION_SECT_BITS];
+	    bfd_vma dst_offset;
+
+	    per = oasys_per_section (section);
+
+	    if (! per->initialized)
+	      {
+		arelent **relpp;
+
+		per->data = bfd_zalloc (abfd, section->size);
+		if (!per->data)
+		  return FALSE;
+		relpp = &section->relocation;
+		per->reloc_tail_ptr = (oasys_reloc_type **) relpp;
+		per->had_vma = FALSE;
+		per->initialized = TRUE;
+		section->reloc_count = 0;
+		section->flags = SEC_ALLOC;
+	      }
+
+	    dst_offset = H_GET_32 (abfd, record.data.addr);
+	    if (! per->had_vma)
+	      {
+		/* Take the first vma we see as the base.  */
+		section->vma = dst_offset;
+		per->had_vma = TRUE;
+	      }
+
+	    dst_offset -= section->vma;
+
+	    dst_base_ptr = oasys_per_section (section)->data;
+	    dst_ptr = oasys_per_section (section)->data +
+	      dst_offset;
+
+	    if (src < end_src)
+	      section->flags |= SEC_LOAD | SEC_HAS_CONTENTS;
+
+	    while (src < end_src)
+	      {
+		unsigned char mod_byte = *src++;
+		size_t gap = end_src - src;
+
+		count = 8;
+		if (mod_byte == 0 && gap >= 8)
+		  {
+		    dst_ptr[0] = src[0];
+		    dst_ptr[1] = src[1];
+		    dst_ptr[2] = src[2];
+		    dst_ptr[3] = src[3];
+		    dst_ptr[4] = src[4];
+		    dst_ptr[5] = src[5];
+		    dst_ptr[6] = src[6];
+		    dst_ptr[7] = src[7];
+		    dst_ptr += 8;
+		    src += 8;
+		  }
+		else
+		  {
+		    for (relbit = 1; count-- != 0 && src < end_src; relbit <<= 1)
+		      {
+			if (relbit & mod_byte)
+			  {
+			    unsigned char reloc = *src;
+			    /* This item needs to be relocated.  */
+			    switch (reloc & RELOCATION_TYPE_BITS)
+			      {
+			      case RELOCATION_TYPE_ABS:
+				break;
+
+			      case RELOCATION_TYPE_REL:
+				{
+				  /* Relocate the item relative to the section.  */
+				  oasys_reloc_type *r;
+
+				  amt = sizeof (oasys_reloc_type);
+				  r = bfd_alloc (abfd, amt);
+				  if (!r)
+				    return FALSE;
+				  *(per->reloc_tail_ptr) = r;
+				  per->reloc_tail_ptr = &r->next;
+				  r->next = NULL;
+				  /* Reference to undefined symbol.  */
+				  src++;
+				  /* There is no symbol.  */
+				  r->symbol = 0;
+				  /* Work out the howto.  */
+				  abort ();
+				  r->relent.address = dst_ptr - dst_base_ptr;
+				  r->relent.howto = &howto_table[reloc >> 6];
+				  r->relent.sym_ptr_ptr = NULL;
+				  section->reloc_count++;
+
+				  /* Fake up the data to look like
+				     it's got the -ve pc in it, this
+				     makes it much easier to convert
+				     into other formats.  This is done
+				     by hitting the addend.  */
+				  if (r->relent.howto->pc_relative)
+				    r->relent.addend -= dst_ptr - dst_base_ptr;
+				}
+				break;
+
+			      case RELOCATION_TYPE_UND:
+				{
+				  oasys_reloc_type *r;
+
+				  amt = sizeof (oasys_reloc_type);
+				  r = bfd_alloc (abfd, amt);
+				  if (!r)
+				    return FALSE;
+				  *(per->reloc_tail_ptr) = r;
+				  per->reloc_tail_ptr = &r->next;
+				  r->next = NULL;
+				  /* Reference to undefined symbol.  */
+				  src++;
+				  /* Get symbol number.  */
+				  r->symbol = (src[0] << 8) | src[1];
+				  /* Work out the howto.  */
+				  abort ();
+
+				  r->relent.addend = 0;
+				  r->relent.address = dst_ptr - dst_base_ptr;
+				  r->relent.howto = &howto_table[reloc >> 6];
+				  r->relent.sym_ptr_ptr = NULL;
+				  section->reloc_count++;
+
+				  src += 2;
+				  /* Fake up the data to look like
+				     it's got the -ve pc in it, this
+				     makes it much easier to convert
+				     into other formats.  This is done
+				     by hitting the addend.  */
+				  if (r->relent.howto->pc_relative)
+				    r->relent.addend -= dst_ptr - dst_base_ptr;
+				}
+				break;
+			      case RELOCATION_TYPE_COM:
+				BFD_FAIL ();
+			      }
+			  }
+			*dst_ptr++ = *src++;
+		      }
+		  }
+	      }
+	  }
+	  break;
+	case oasys_record_is_local_enum:
+	case oasys_record_is_symbol_enum:
+	case oasys_record_is_section_enum:
+	  break;
+	default:
+	  loop = FALSE;
+	}
+    }
+
+  return TRUE;
+
+}
+
+#define MAX_SECS 16
+
+static const bfd_target *
+oasys_object_p (bfd *abfd)
+{
+  oasys_data_type *oasys;
+  oasys_data_type *save = OASYS_DATA (abfd);
+  bfd_boolean loop = TRUE;
+  bfd_boolean had_usefull = FALSE;
+
+  abfd->tdata.oasys_obj_data = 0;
+  oasys_mkobject (abfd);
+  oasys = OASYS_DATA (abfd);
+  memset ((void *) oasys->sections, 0xff, sizeof (oasys->sections));
+
+  /* Point to the start of the file.  */
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    goto fail;
+  oasys->symbol_string_length = 0;
+
+  /* Inspect the records, but only keep the section info -
+     remember the size of the symbols.  */
+  oasys->first_data_record = 0;
+  while (loop)
+    {
+      oasys_record_union_type record;
+      if (! oasys_read_record (abfd, &record))
+	goto fail;
+      if ((size_t) record.header.length < (size_t) sizeof (record.header))
+	goto fail;
+
+      switch ((oasys_record_enum_type) (record.header.type))
+	{
+	case oasys_record_is_header_enum:
+	  had_usefull = TRUE;
+	  break;
+	case oasys_record_is_symbol_enum:
+	case oasys_record_is_local_enum:
+	  /* Count symbols and remember their size for a future malloc.  */
+	  abfd->symcount++;
+	  oasys->symbol_string_length += 1 + oasys_string_length (&record);
+	  had_usefull = TRUE;
+	  break;
+	case oasys_record_is_section_enum:
+	  {
+	    asection *s;
+	    char *buffer;
+	    unsigned int section_number;
+
+	    if (record.section.header.length != sizeof (record.section))
+	      goto fail;
+
+	    buffer = bfd_alloc (abfd, (bfd_size_type) 3);
+	    if (!buffer)
+	      goto fail;
+	    section_number = record.section.relb & RELOCATION_SECT_BITS;
+	    sprintf (buffer, "%u", section_number);
+	    s = bfd_make_section (abfd, buffer);
+	    oasys->sections[section_number] = s;
+	    switch (record.section.relb & RELOCATION_TYPE_BITS)
+	      {
+	      case RELOCATION_TYPE_ABS:
+	      case RELOCATION_TYPE_REL:
+		break;
+	      case RELOCATION_TYPE_UND:
+	      case RELOCATION_TYPE_COM:
+		BFD_FAIL ();
+	      }
+
+	    s->size = H_GET_32 (abfd, record.section.value);
+	    s->vma = H_GET_32 (abfd, record.section.vma);
+	    s->flags = 0;
+	    had_usefull = TRUE;
+	  }
+	  break;
+	case oasys_record_is_data_enum:
+	  oasys->first_data_record = bfd_tell (abfd) - record.header.length;
+	case oasys_record_is_debug_enum:
+	case oasys_record_is_module_enum:
+	case oasys_record_is_named_section_enum:
+	case oasys_record_is_end_enum:
+	  if (! had_usefull)
+	    goto fail;
+	  loop = FALSE;
+	  break;
+	default:
+	  goto fail;
+	}
+    }
+  oasys->symbols = NULL;
+
+  /* Oasys support several architectures, but I can't see a simple way
+     to discover which one is in a particular file - we'll guess.  */
+  bfd_default_set_arch_mach (abfd, bfd_arch_m68k, 0);
+  if (abfd->symcount != 0)
+    abfd->flags |= HAS_SYMS;
+
+  /* We don't know if a section has data until we've read it.  */
+  oasys_slurp_section_data (abfd);
+
+  return abfd->xvec;
+
+fail:
+  (void) bfd_release (abfd, oasys);
+  abfd->tdata.oasys_obj_data = save;
+  return NULL;
+}
+
+
+static void
+oasys_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+		       asymbol *symbol,
+		       symbol_info *ret)
+{
+  bfd_symbol_info (symbol, ret);
+
+  if (!symbol->section)
+    ret->type = (symbol->flags & BSF_LOCAL) ? 'a' : 'A';
+}
+
+static void
+oasys_print_symbol (bfd *abfd, void * afile, asymbol *symbol, bfd_print_symbol_type how)
+{
+  FILE *file = (FILE *) afile;
+
+  switch (how)
+    {
+    case bfd_print_symbol_name:
+    case bfd_print_symbol_more:
+      fprintf (file, "%s", symbol->name);
+      break;
+    case bfd_print_symbol_all:
+      {
+	const char *section_name = symbol->section == NULL ?
+	(const char *) "*abs" : symbol->section->name;
+
+	bfd_print_symbol_vandf (abfd, (void *) file, symbol);
+
+	fprintf (file, " %-5s %s",
+		 section_name,
+		 symbol->name);
+      }
+      break;
+    }
+}
+
+static bfd_boolean
+oasys_new_section_hook (bfd *abfd, asection *newsect)
+{
+  if (!newsect->used_by_bfd)
+    {
+      newsect->used_by_bfd
+	= bfd_alloc (abfd, (bfd_size_type) sizeof (oasys_per_section_type));
+      if (!newsect->used_by_bfd)
+	return FALSE;
+    }
+  oasys_per_section (newsect)->data = NULL;
+  oasys_per_section (newsect)->section = newsect;
+  oasys_per_section (newsect)->offset = 0;
+  oasys_per_section (newsect)->initialized = FALSE;
+  newsect->alignment_power = 1;
+
+  /* Turn the section string into an index.  */
+  sscanf (newsect->name, "%u", &newsect->target_index);
+
+  return _bfd_generic_new_section_hook (abfd, newsect);
+}
+
+
+static long
+oasys_get_reloc_upper_bound (bfd *abfd, sec_ptr asect)
+{
+  if (! oasys_slurp_section_data (abfd))
+    return -1;
+  return (asect->reloc_count + 1) * sizeof (arelent *);
+}
+
+static bfd_boolean
+oasys_get_section_contents (bfd *abfd,
+			    sec_ptr section,
+			    void * location,
+			    file_ptr offset,
+			    bfd_size_type count)
+{
+  oasys_per_section_type *p = oasys_per_section (section);
+
+  oasys_slurp_section_data (abfd);
+
+  if (! p->initialized)
+    (void) memset (location, 0, (size_t) count);
+  else
+    (void) memcpy (location, (void *) (p->data + offset), (size_t) count);
+
+  return TRUE;
+}
+
+static long
+oasys_canonicalize_reloc (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+			  sec_ptr section,
+			  arelent **relptr,
+			  asymbol **symbols ATTRIBUTE_UNUSED)
+{
+  unsigned int reloc_count = 0;
+  oasys_reloc_type *src = (oasys_reloc_type *) (section->relocation);
+
+  if (src != NULL)
+    abort ();
+
+  *relptr = NULL;
+  return section->reloc_count = reloc_count;
+}
+
+
+/* Writing.  */
+
+/* Calculate the checksum and write one record.  */
+
+static bfd_boolean
+oasys_write_record (bfd *abfd,
+		    oasys_record_enum_type type,
+		    oasys_record_union_type *record,
+		    size_t size)
+{
+  int checksum;
+  size_t i;
+  unsigned char *ptr;
+
+  record->header.length = size;
+  record->header.type = (int) type;
+  record->header.check_sum = 0;
+  record->header.fill = 0;
+  ptr = (unsigned char *) &record->pad[0];
+  checksum = 0;
+  for (i = 0; i < size; i++)
+    checksum += *ptr++;
+  record->header.check_sum = 0xff & (-checksum);
+  if (bfd_bwrite ((void *) record, (bfd_size_type) size, abfd) != size)
+    return FALSE;
+  return TRUE;
+}
+
+
+/* Write out all the symbols.  */
+
+static bfd_boolean
+oasys_write_syms (bfd *abfd)
+{
+  unsigned int count;
+  asymbol **generic = bfd_get_outsymbols (abfd);
+  unsigned int sym_index = 0;
+
+  for (count = 0; count < bfd_get_symcount (abfd); count++)
+    {
+      oasys_symbol_record_type symbol;
+      asymbol *const g = generic[count];
+      const char *src = g->name;
+      char *dst = symbol.name;
+      unsigned int l = 0;
+
+      if (bfd_is_com_section (g->section))
+	{
+	  symbol.relb = RELOCATION_TYPE_COM;
+	  H_PUT_16 (abfd, sym_index, symbol.refno);
+	  sym_index++;
+	}
+      else if (bfd_is_abs_section (g->section))
+	{
+	  symbol.relb = RELOCATION_TYPE_ABS;
+	  H_PUT_16 (abfd, 0, symbol.refno);
+	}
+      else if (bfd_is_und_section (g->section))
+	{
+	  symbol.relb = RELOCATION_TYPE_UND;
+	  H_PUT_16 (abfd, sym_index, symbol.refno);
+	  /* Overload the value field with the output sym_index number */
+	  sym_index++;
+	}
+      else if (g->flags & BSF_DEBUGGING)
+	/* Throw it away.  */
+	continue;
+      else
+	{
+	  if (g->section == NULL)
+	    /* Sometime, the oasys tools give out a symbol with illegal
+	       bits in it, we'll output it in the same broken way.  */
+	    symbol.relb = RELOCATION_TYPE_REL | 0;
+	  else
+	    symbol.relb = RELOCATION_TYPE_REL | g->section->output_section->target_index;
+
+	  H_PUT_16 (abfd, 0, symbol.refno);
+	}
+
+#ifdef UNDERSCORE_HACK
+      if (src[l] == '_')
+	dst[l++] = '.';
+#endif
+      while (src[l])
+	{
+	  dst[l] = src[l];
+	  l++;
+	}
+
+      H_PUT_32 (abfd, g->value, symbol.value);
+
+      if (g->flags & BSF_LOCAL)
+	{
+	  if (! oasys_write_record (abfd,
+				    oasys_record_is_local_enum,
+				    (oasys_record_union_type *) & symbol,
+				    offsetof (oasys_symbol_record_type,
+					      name[0]) + l))
+	    return FALSE;
+	}
+      else
+	{
+	  if (! oasys_write_record (abfd,
+				    oasys_record_is_symbol_enum,
+				    (oasys_record_union_type *) & symbol,
+				    offsetof (oasys_symbol_record_type,
+					      name[0]) + l))
+	    return FALSE;
+	}
+      g->value = sym_index - 1;
+    }
+
+  return TRUE;
+}
+
+/* Write a section header for each section.  */
+
+static bfd_boolean
+oasys_write_sections (bfd *abfd)
+{
+  asection *s;
+  static oasys_section_record_type out;
+
+  for (s = abfd->sections; s != NULL; s = s->next)
+    {
+      if (!ISDIGIT (s->name[0]))
+	{
+	  (*_bfd_error_handler)
+	    (_("%s: can not represent section `%s' in oasys"),
+	     bfd_get_filename (abfd), s->name);
+	  bfd_set_error (bfd_error_nonrepresentable_section);
+	  return FALSE;
+	}
+      out.relb = RELOCATION_TYPE_REL | s->target_index;
+      H_PUT_32 (abfd, s->size, out.value);
+      H_PUT_32 (abfd, s->vma, out.vma);
+
+      if (! oasys_write_record (abfd,
+				oasys_record_is_section_enum,
+				(oasys_record_union_type *) & out,
+				sizeof (out)))
+	return FALSE;
+    }
+  return TRUE;
+}
+
+static bfd_boolean
+oasys_write_header (bfd *abfd)
+{
+  /* Create and write the header.  */
+  oasys_header_record_type r;
+  size_t length = strlen (abfd->filename);
+
+  if (length > (size_t) sizeof (r.module_name))
+    length = sizeof (r.module_name);
+
+  (void) memcpy (r.module_name, abfd->filename, length);
+  (void) memset (r.module_name + length, ' ', sizeof (r.module_name) - length);
+
+  r.version_number = OASYS_VERSION_NUMBER;
+  r.rev_number = OASYS_REV_NUMBER;
+
+  return oasys_write_record (abfd, oasys_record_is_header_enum,
+			     (oasys_record_union_type *) & r,
+			     offsetof (oasys_header_record_type,
+				       description[0]));
+}
+
+static bfd_boolean
+oasys_write_end (bfd *abfd)
+{
+  oasys_end_record_type end;
+  unsigned char null = 0;
+
+  end.relb = RELOCATION_TYPE_ABS;
+  H_PUT_32 (abfd, abfd->start_address, end.entry);
+  H_PUT_16 (abfd, 0, end.fill);
+  end.zero = 0;
+  if (! oasys_write_record (abfd,
+			    oasys_record_is_end_enum,
+			    (oasys_record_union_type *) & end,
+			    sizeof (end)))
+    return FALSE;
+
+  return bfd_bwrite ((void *) &null, (bfd_size_type) 1, abfd) == 1;
+}
+
+static int
+comp (const void * ap, const void * bp)
+{
+  arelent *a = *((arelent **) ap);
+  arelent *b = *((arelent **) bp);
+
+  return a->address - b->address;
+}
+
+static bfd_boolean
+oasys_write_data (bfd *abfd)
+{
+  asection *s;
+
+  for (s = abfd->sections; s != NULL; s = s->next)
+    {
+      if (s->flags & SEC_LOAD)
+	{
+	  bfd_byte *raw_data = oasys_per_section (s)->data;
+	  oasys_data_record_type processed_data;
+	  bfd_size_type current_byte_index = 0;
+	  unsigned int relocs_to_go = s->reloc_count;
+	  arelent **p = s->orelocation;
+
+	  if (s->reloc_count != 0)
+	    /* Sort the reloc records so it's easy to insert the relocs into the
+	       data.  */
+	    qsort (s->orelocation, s->reloc_count, sizeof (arelent **), comp);
+
+	  current_byte_index = 0;
+	  processed_data.relb = s->target_index | RELOCATION_TYPE_REL;
+
+	  while (current_byte_index < s->size)
+	    {
+	      /* Scan forwards by eight bytes or however much is left and see if
+	       there are any relocations going on.  */
+	      bfd_byte *mod = &processed_data.data[0];
+	      bfd_byte *dst = &processed_data.data[1];
+
+	      unsigned int i = 0;
+	      *mod = 0;
+
+	      H_PUT_32 (abfd, s->vma + current_byte_index,
+			processed_data.addr);
+
+	      /* Don't start a relocation unless you're sure you can finish it
+		 within the same data record.  The worst case relocation is a
+		 4-byte relocatable value which is split across two modification
+		 bytes (1 relocation byte + 2 symbol reference bytes + 2 data +
+		 1 modification byte + 2 data = 8 bytes total).  That's where
+		 the magic number 8 comes from.  */
+	      while (current_byte_index < s->size && dst <=
+		     & processed_data.data[sizeof (processed_data.data) - 8])
+		{
+		  if (relocs_to_go != 0)
+		    {
+		      arelent *r = *p;
+
+		      /* There is a relocation, is it for this byte ?  */
+		      if (r->address == current_byte_index)
+			abort ();
+		    }
+
+		  /* If this is coming from an unloadable section then copy
+		     zeros.  */
+		  if (raw_data == NULL)
+		    *dst++ = 0;
+		  else
+		    *dst++ = *raw_data++;
+
+		  if (++i >= 8)
+		    {
+		      i = 0;
+		      mod = dst++;
+		      *mod = 0;
+		    }
+		  current_byte_index++;
+		}
+
+	      /* Don't write a useless null modification byte.  */
+	      if (dst == mod + 1)
+		--dst;
+
+	      if (! (oasys_write_record
+		     (abfd, oasys_record_is_data_enum,
+		      ((oasys_record_union_type *) &processed_data),
+		      (size_t) (dst - (bfd_byte *) &processed_data))))
+		return FALSE;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+oasys_write_object_contents (bfd *abfd)
+{
+  if (! oasys_write_header (abfd))
+    return FALSE;
+  if (! oasys_write_syms (abfd))
+    return FALSE;
+  if (! oasys_write_sections (abfd))
+    return FALSE;
+  if (! oasys_write_data (abfd))
+    return FALSE;
+  if (! oasys_write_end (abfd))
+    return FALSE;
+  return TRUE;
+}
+
+/* Set section contents is complicated with OASYS since the format is
+   not a byte image, but a record stream.  */
+
+static bfd_boolean
+oasys_set_section_contents (bfd *abfd,
+			    sec_ptr section,
+			    const void * location,
+			    file_ptr offset,
+			    bfd_size_type count)
+{
+  if (count != 0)
+    {
+      if (oasys_per_section (section)->data == NULL)
+	{
+	  oasys_per_section (section)->data = bfd_alloc (abfd, section->size);
+	  if (!oasys_per_section (section)->data)
+	    return FALSE;
+	}
+      (void) memcpy ((void *) (oasys_per_section (section)->data + offset),
+		     location, (size_t) count);
+    }
+  return TRUE;
+}
+
+
+
+/* Native-level interface to symbols.  */
+
+/* We read the symbols into a buffer, which is discarded when this
+   function exits.  We read the strings into a buffer large enough to
+   hold them all plus all the cached symbol entries.  */
+
+static asymbol *
+oasys_make_empty_symbol (bfd *abfd)
+{
+  bfd_size_type amt = sizeof (oasys_symbol_type);
+  oasys_symbol_type *new_symbol_type = bfd_zalloc (abfd, amt);
+
+  if (!new_symbol_type)
+    return NULL;
+  new_symbol_type->symbol.the_bfd = abfd;
+  return &new_symbol_type->symbol;
+}
+
+/* User should have checked the file flags; perhaps we should return
+   BFD_NO_MORE_SYMBOLS if there are none?  */
+
+static bfd *
+oasys_openr_next_archived_file (bfd *arch, bfd *prev)
+{
+  oasys_ar_data_type *ar = OASYS_AR_DATA (arch);
+  oasys_module_info_type *p;
+
+  /* Take the next one from the arch state, or reset.  */
+  if (prev == NULL)
+    /* Reset the index - the first two entries are bogus.  */
+    ar->module_index = 0;
+
+  p = ar->module + ar->module_index;
+  ar->module_index++;
+
+  if (ar->module_index <= ar->module_count)
+    {
+      if (p->abfd == NULL)
+	{
+	  p->abfd = _bfd_create_empty_archive_element_shell (arch);
+	  p->abfd->origin = p->pos;
+	  p->abfd->filename = p->name;
+
+	  /* Fixup a pointer to this element for the member.  */
+	  p->abfd->arelt_data = (void *) p;
+	}
+      return p->abfd;
+    }
+
+  bfd_set_error (bfd_error_no_more_archived_files);
+  return NULL;
+}
+
+static bfd_boolean
+oasys_find_nearest_line (bfd *abfd ATTRIBUTE_UNUSED,
+			 asection *section ATTRIBUTE_UNUSED,
+			 asymbol **symbols ATTRIBUTE_UNUSED,
+			 bfd_vma offset ATTRIBUTE_UNUSED,
+			 const char **filename_ptr ATTRIBUTE_UNUSED,
+			 const char **functionname_ptr ATTRIBUTE_UNUSED,
+			 unsigned int *line_ptr ATTRIBUTE_UNUSED)
+{
+  return FALSE;
+}
+
+static bfd_boolean
+oasys_find_inliner_info (bfd *abfd ATTRIBUTE_UNUSED,
+			 const char **filename_ptr ATTRIBUTE_UNUSED,
+			 const char **functionname_ptr ATTRIBUTE_UNUSED,
+			 unsigned int *line_ptr ATTRIBUTE_UNUSED)
+{
+  return FALSE;
+}
+
+static int
+oasys_generic_stat_arch_elt (bfd *abfd, struct stat *buf)
+{
+  oasys_module_info_type *mod = (oasys_module_info_type *) abfd->arelt_data;
+
+  if (mod == NULL)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return -1;
+    }
+
+  buf->st_size = mod->size;
+  buf->st_mode = 0666;
+  return 0;
+}
+
+static int
+oasys_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+		      struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+#define	oasys_close_and_cleanup                    _bfd_generic_close_and_cleanup
+#define oasys_bfd_free_cached_info                 _bfd_generic_bfd_free_cached_info
+#define oasys_slurp_armap                          bfd_true
+#define oasys_slurp_extended_name_table            bfd_true
+#define oasys_construct_extended_name_table        ((bfd_boolean (*) (bfd *, char **, bfd_size_type *, const char **)) bfd_true)
+#define oasys_truncate_arname                      bfd_dont_truncate_arname
+#define oasys_write_armap                          ((bfd_boolean (*) (bfd *, unsigned int, struct orl *, unsigned int, int)) bfd_true)
+#define oasys_read_ar_hdr                          bfd_nullvoidptr
+#define oasys_write_ar_hdr ((bfd_boolean (*) (bfd *, bfd *)) bfd_false)
+#define oasys_get_elt_at_index                     _bfd_generic_get_elt_at_index
+#define oasys_update_armap_timestamp               bfd_true
+#define oasys_bfd_is_local_label_name              bfd_generic_is_local_label_name
+#define oasys_bfd_is_target_special_symbol         ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define oasys_get_lineno                           _bfd_nosymbols_get_lineno
+#define oasys_bfd_make_debug_symbol                _bfd_nosymbols_bfd_make_debug_symbol
+#define oasys_read_minisymbols                     _bfd_generic_read_minisymbols
+#define oasys_minisymbol_to_symbol                 _bfd_generic_minisymbol_to_symbol
+#define oasys_bfd_reloc_type_lookup                _bfd_norelocs_bfd_reloc_type_lookup
+#define oasys_bfd_reloc_name_lookup          _bfd_norelocs_bfd_reloc_name_lookup
+#define oasys_set_arch_mach                        bfd_default_set_arch_mach
+#define oasys_get_section_contents_in_window       _bfd_generic_get_section_contents_in_window
+#define oasys_bfd_get_relocated_section_contents   bfd_generic_get_relocated_section_contents
+#define oasys_bfd_relax_section                    bfd_generic_relax_section
+#define oasys_bfd_gc_sections                      bfd_generic_gc_sections
+#define oasys_bfd_lookup_section_flags             bfd_generic_lookup_section_flags
+#define oasys_bfd_merge_sections                   bfd_generic_merge_sections
+#define oasys_bfd_is_group_section                 bfd_generic_is_group_section
+#define oasys_bfd_discard_group                    bfd_generic_discard_group
+#define oasys_section_already_linked               _bfd_generic_section_already_linked
+#define oasys_bfd_define_common_symbol             bfd_generic_define_common_symbol
+#define oasys_bfd_link_hash_table_create           _bfd_generic_link_hash_table_create
+#define oasys_bfd_link_hash_table_free             _bfd_generic_link_hash_table_free
+#define oasys_bfd_link_add_symbols                 _bfd_generic_link_add_symbols
+#define oasys_bfd_link_just_syms                   _bfd_generic_link_just_syms
+#define oasys_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define oasys_bfd_final_link                       _bfd_generic_final_link
+#define oasys_bfd_link_split_section               _bfd_generic_link_split_section
+
+const bfd_target oasys_vec =
+{
+  "oasys",			/* Name.  */
+  bfd_target_oasys_flavour,
+  BFD_ENDIAN_BIG,		/* Target byte order.  */
+  BFD_ENDIAN_BIG,		/* Target headers byte order.  */
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+  (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
+   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* Section flags.  */
+  0,				/* Leading underscore.  */
+  ' ',				/* AR_pad_char.  */
+  16,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Data.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Headers.  */
+
+  {_bfd_dummy_target,
+   oasys_object_p,		/* bfd_check_format.  */
+   oasys_archive_p,
+   _bfd_dummy_target,
+  },
+  {				/* bfd_set_format.  */
+    bfd_false,
+    oasys_mkobject,
+    _bfd_generic_mkarchive,
+    bfd_false
+  },
+  {				/* bfd_write_contents.  */
+    bfd_false,
+    oasys_write_object_contents,
+    _bfd_write_archive_contents,
+    bfd_false,
+  },
+
+  BFD_JUMP_TABLE_GENERIC (oasys),
+  BFD_JUMP_TABLE_COPY (_bfd_generic),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (oasys),
+  BFD_JUMP_TABLE_SYMBOLS (oasys),
+  BFD_JUMP_TABLE_RELOCS (oasys),
+  BFD_JUMP_TABLE_WRITE (oasys),
+  BFD_JUMP_TABLE_LINK (oasys),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  NULL
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/opncls.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/opncls.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/opncls.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/opncls.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1531 @@
+/* opncls.c -- open and close a BFD.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+   Free Software Foundation, Inc.
+
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "objalloc.h"
+#include "libbfd.h"
+#include "libiberty.h"
+
+#ifndef S_IXUSR
+#define S_IXUSR 0100	/* Execute by owner.  */
+#endif
+#ifndef S_IXGRP
+#define S_IXGRP 0010	/* Execute by group.  */
+#endif
+#ifndef S_IXOTH
+#define S_IXOTH 0001	/* Execute by others.  */
+#endif
+
+/* Counters used to initialize the bfd identifier.  */
+
+static unsigned int bfd_id_counter = 0;
+static unsigned int bfd_reserved_id_counter = 0;
+
+/*
+CODE_FRAGMENT
+.{* Set to N to open the next N BFDs using an alternate id space.  *}
+.extern unsigned int bfd_use_reserved_id;
+*/
+unsigned int bfd_use_reserved_id = 0;
+
+/* fdopen is a loser -- we should use stdio exclusively.  Unfortunately
+   if we do that we can't use fcntl.  */
+
+/* Return a new BFD.  All BFD's are allocated through this routine.  */
+
+bfd *
+_bfd_new_bfd (void)
+{
+  bfd *nbfd;
+
+  nbfd = (bfd *) bfd_zmalloc (sizeof (bfd));
+  if (nbfd == NULL)
+    return NULL;
+
+  if (bfd_use_reserved_id)
+    {
+      nbfd->id = --bfd_reserved_id_counter;
+      --bfd_use_reserved_id;
+    }
+  else
+    nbfd->id = bfd_id_counter++;
+
+  nbfd->memory = objalloc_create ();
+  if (nbfd->memory == NULL)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      free (nbfd);
+      return NULL;
+    }
+
+  nbfd->arch_info = &bfd_default_arch_struct;
+
+  nbfd->direction = no_direction;
+  nbfd->iostream = NULL;
+  nbfd->where = 0;
+  if (!bfd_hash_table_init_n (& nbfd->section_htab, bfd_section_hash_newfunc,
+			      sizeof (struct section_hash_entry), 251))
+    {
+      free (nbfd);
+      return NULL;
+    }
+  nbfd->sections = NULL;
+  nbfd->section_last = NULL;
+  nbfd->format = bfd_unknown;
+  nbfd->my_archive = NULL;
+  nbfd->origin = 0;
+  nbfd->opened_once = FALSE;
+  nbfd->output_has_begun = FALSE;
+  nbfd->section_count = 0;
+  nbfd->usrdata = NULL;
+  nbfd->cacheable = FALSE;
+  nbfd->flags = BFD_NO_FLAGS;
+  nbfd->mtime_set = FALSE;
+
+  return nbfd;
+}
+
+/* Allocate a new BFD as a member of archive OBFD.  */
+
+bfd *
+_bfd_new_bfd_contained_in (bfd *obfd)
+{
+  bfd *nbfd;
+
+  nbfd = _bfd_new_bfd ();
+  if (nbfd == NULL)
+    return NULL;
+  nbfd->xvec = obfd->xvec;
+  nbfd->iovec = obfd->iovec;
+  nbfd->my_archive = obfd;
+  nbfd->direction = read_direction;
+  nbfd->target_defaulted = obfd->target_defaulted;
+  return nbfd;
+}
+
+/* Delete a BFD.  */
+
+void
+_bfd_delete_bfd (bfd *abfd)
+{
+  if (abfd->memory)
+    {
+      bfd_hash_table_free (&abfd->section_htab);
+      objalloc_free ((struct objalloc *) abfd->memory);
+    }
+  free (abfd);
+}
+
+/* Free objalloc memory.  */
+
+bfd_boolean
+_bfd_free_cached_info (bfd *abfd)
+{
+  if (abfd->memory)
+    {
+      bfd_hash_table_free (&abfd->section_htab);
+      objalloc_free ((struct objalloc *) abfd->memory);
+
+      abfd->sections = NULL;
+      abfd->section_last = NULL;
+      abfd->outsymbols = NULL;
+      abfd->tdata.any = NULL;
+      abfd->usrdata = NULL;
+      abfd->memory = NULL;
+    }
+
+  return TRUE;
+}
+
+/*
+SECTION
+	Opening and closing BFDs
+
+SUBSECTION
+	Functions for opening and closing
+*/
+
+/*
+FUNCTION
+	bfd_fopen
+
+SYNOPSIS
+	bfd *bfd_fopen (const char *filename, const char *target,
+                        const char *mode, int fd);
+
+DESCRIPTION
+	Open the file @var{filename} with the target @var{target}.
+	Return a pointer to the created BFD.  If @var{fd} is not -1,
+	then <<fdopen>> is used to open the file; otherwise, <<fopen>>
+	is used.  @var{mode} is passed directly to <<fopen>> or
+	<<fdopen>>. 
+
+	Calls <<bfd_find_target>>, so @var{target} is interpreted as by
+	that function.
+
+	The new BFD is marked as cacheable iff @var{fd} is -1.
+
+	If <<NULL>> is returned then an error has occured.   Possible errors
+	are <<bfd_error_no_memory>>, <<bfd_error_invalid_target>> or
+	<<system_call>> error.
+*/
+
+bfd *
+bfd_fopen (const char *filename, const char *target, const char *mode, int fd)
+{
+  bfd *nbfd;
+  const bfd_target *target_vec;
+
+  nbfd = _bfd_new_bfd ();
+  if (nbfd == NULL)
+    return NULL;
+
+  target_vec = bfd_find_target (target, nbfd);
+  if (target_vec == NULL)
+    {
+      _bfd_delete_bfd (nbfd);
+      return NULL;
+    }
+  
+#ifdef HAVE_FDOPEN
+  if (fd != -1)
+    nbfd->iostream = fdopen (fd, mode);
+  else
+#endif
+    nbfd->iostream = real_fopen (filename, mode);
+  if (nbfd->iostream == NULL)
+    {
+      bfd_set_error (bfd_error_system_call);
+      _bfd_delete_bfd (nbfd);
+      return NULL;
+    }
+
+  /* OK, put everything where it belongs.  */
+  nbfd->filename = filename;
+
+  /* Figure out whether the user is opening the file for reading,
+     writing, or both, by looking at the MODE argument.  */
+  if ((mode[0] == 'r' || mode[0] == 'w' || mode[0] == 'a') 
+      && mode[1] == '+')
+    nbfd->direction = both_direction;
+  else if (mode[0] == 'r')
+    nbfd->direction = read_direction;
+  else
+    nbfd->direction = write_direction;
+
+  if (! bfd_cache_init (nbfd))
+    {
+      _bfd_delete_bfd (nbfd);
+      return NULL;
+    }
+  nbfd->opened_once = TRUE;
+  /* If we opened the file by name, mark it cacheable; we can close it
+     and reopen it later.  However, if a file descriptor was provided,
+     then it may have been opened with special flags that make it
+     unsafe to close and reopen the file.  */
+  if (fd == -1)
+    bfd_set_cacheable (nbfd, TRUE);
+
+  return nbfd;
+}
+
+/*
+FUNCTION
+	bfd_openr
+
+SYNOPSIS
+	bfd *bfd_openr (const char *filename, const char *target);
+
+DESCRIPTION
+	Open the file @var{filename} (using <<fopen>>) with the target
+	@var{target}.  Return a pointer to the created BFD.
+
+	Calls <<bfd_find_target>>, so @var{target} is interpreted as by
+	that function.
+
+	If <<NULL>> is returned then an error has occured.   Possible errors
+	are <<bfd_error_no_memory>>, <<bfd_error_invalid_target>> or
+	<<system_call>> error.
+*/
+
+bfd *
+bfd_openr (const char *filename, const char *target)
+{
+  return bfd_fopen (filename, target, FOPEN_RB, -1);
+}
+
+/* Don't try to `optimize' this function:
+
+   o - We lock using stack space so that interrupting the locking
+       won't cause a storage leak.
+   o - We open the file stream last, since we don't want to have to
+       close it if anything goes wrong.  Closing the stream means closing
+       the file descriptor too, even though we didn't open it.  */
+/*
+FUNCTION
+	bfd_fdopenr
+
+SYNOPSIS
+	bfd *bfd_fdopenr (const char *filename, const char *target, int fd);
+
+DESCRIPTION
+	<<bfd_fdopenr>> is to <<bfd_fopenr>> much like <<fdopen>> is to
+	<<fopen>>.  It opens a BFD on a file already described by the
+	@var{fd} supplied.
+
+	When the file is later <<bfd_close>>d, the file descriptor will
+	be closed.  If the caller desires that this file descriptor be
+	cached by BFD (opened as needed, closed as needed to free
+	descriptors for other opens), with the supplied @var{fd} used as
+	an initial file descriptor (but subject to closure at any time),
+	call bfd_set_cacheable(bfd, 1) on the returned BFD.  The default
+	is to assume no caching; the file descriptor will remain open
+	until <<bfd_close>>, and will not be affected by BFD operations
+	on other files.
+
+	Possible errors are <<bfd_error_no_memory>>,
+	<<bfd_error_invalid_target>> and <<bfd_error_system_call>>.
+*/
+
+bfd *
+bfd_fdopenr (const char *filename, const char *target, int fd)
+{
+  const char *mode;
+#if defined(HAVE_FCNTL) && defined(F_GETFL)
+  int fdflags;
+#endif
+
+#if ! defined(HAVE_FCNTL) || ! defined(F_GETFL)
+  mode = FOPEN_RUB; /* Assume full access.  */
+#else
+  fdflags = fcntl (fd, F_GETFL, NULL);
+  if (fdflags == -1)
+    {
+      bfd_set_error (bfd_error_system_call);
+      return NULL;
+    }
+
+  /* (O_ACCMODE) parens are to avoid Ultrix header file bug.  */
+  switch (fdflags & (O_ACCMODE))
+    {
+    case O_RDONLY: mode = FOPEN_RB; break;
+    case O_WRONLY: mode = FOPEN_RUB; break;
+    case O_RDWR:   mode = FOPEN_RUB; break;
+    default: abort ();
+    }
+#endif
+
+  return bfd_fopen (filename, target, mode, fd);
+}
+
+/*
+FUNCTION
+	bfd_openstreamr
+
+SYNOPSIS
+	bfd *bfd_openstreamr (const char *, const char *, void *);
+
+DESCRIPTION
+
+	Open a BFD for read access on an existing stdio stream.  When
+	the BFD is passed to <<bfd_close>>, the stream will be closed.
+*/
+
+bfd *
+bfd_openstreamr (const char *filename, const char *target, void *streamarg)
+{
+  FILE *stream = (FILE *) streamarg;
+  bfd *nbfd;
+  const bfd_target *target_vec;
+
+  nbfd = _bfd_new_bfd ();
+  if (nbfd == NULL)
+    return NULL;
+
+  target_vec = bfd_find_target (target, nbfd);
+  if (target_vec == NULL)
+    {
+      _bfd_delete_bfd (nbfd);
+      return NULL;
+    }
+
+  nbfd->iostream = stream;
+  nbfd->filename = filename;
+  nbfd->direction = read_direction;
+
+  if (! bfd_cache_init (nbfd))
+    {
+      _bfd_delete_bfd (nbfd);
+      return NULL;
+    }
+
+  return nbfd;
+}
+
+/*
+FUNCTION
+	bfd_openr_iovec
+
+SYNOPSIS
+        bfd *bfd_openr_iovec (const char *filename, const char *target,
+                              void *(*open_func) (struct bfd *nbfd,
+                                                  void *open_closure),
+                              void *open_closure,
+                              file_ptr (*pread_func) (struct bfd *nbfd,
+                                                      void *stream,
+                                                      void *buf,
+                                                      file_ptr nbytes,
+                                                      file_ptr offset),
+                              int (*close_func) (struct bfd *nbfd,
+                                                 void *stream),
+			      int (*stat_func) (struct bfd *abfd,
+					        void *stream,
+					        struct stat *sb));
+
+DESCRIPTION
+
+        Create and return a BFD backed by a read-only @var{stream}.
+        The @var{stream} is created using @var{open_func}, accessed using
+        @var{pread_func} and destroyed using @var{close_func}.
+
+	Calls <<bfd_find_target>>, so @var{target} is interpreted as by
+	that function.
+
+	Calls @var{open_func} (which can call <<bfd_zalloc>> and
+	<<bfd_get_filename>>) to obtain the read-only stream backing
+	the BFD.  @var{open_func} either succeeds returning the
+	non-<<NULL>> @var{stream}, or fails returning <<NULL>>
+	(setting <<bfd_error>>).
+
+	Calls @var{pread_func} to request @var{nbytes} of data from
+	@var{stream} starting at @var{offset} (e.g., via a call to
+	<<bfd_read>>).  @var{pread_func} either succeeds returning the
+	number of bytes read (which can be less than @var{nbytes} when
+	end-of-file), or fails returning -1 (setting <<bfd_error>>).
+
+	Calls @var{close_func} when the BFD is later closed using
+	<<bfd_close>>.  @var{close_func} either succeeds returning 0, or
+	fails returning -1 (setting <<bfd_error>>).
+
+	Calls @var{stat_func} to fill in a stat structure for bfd_stat,
+	bfd_get_size, and bfd_get_mtime calls.  @var{stat_func} returns 0
+	on success, or returns -1 on failure (setting <<bfd_error>>).
+
+	If <<bfd_openr_iovec>> returns <<NULL>> then an error has
+	occurred.  Possible errors are <<bfd_error_no_memory>>,
+	<<bfd_error_invalid_target>> and <<bfd_error_system_call>>.
+
+*/
+
+struct opncls
+{
+  void *stream;
+  file_ptr (*pread) (struct bfd *abfd, void *stream, void *buf,
+		     file_ptr nbytes, file_ptr offset);
+  int (*close) (struct bfd *abfd, void *stream);
+  int (*stat) (struct bfd *abfd, void *stream, struct stat *sb);
+  file_ptr where;
+};
+
+static file_ptr
+opncls_btell (struct bfd *abfd)
+{
+  struct opncls *vec = (struct opncls *) abfd->iostream;
+  return vec->where;
+}
+
+static int
+opncls_bseek (struct bfd *abfd, file_ptr offset, int whence)
+{
+  struct opncls *vec = (struct opncls *) abfd->iostream;
+  switch (whence)
+    {
+    case SEEK_SET: vec->where = offset; break;
+    case SEEK_CUR: vec->where += offset; break;
+    case SEEK_END: return -1;
+    }
+  return 0;
+}
+
+static file_ptr
+opncls_bread (struct bfd *abfd, void *buf, file_ptr nbytes)
+{
+  struct opncls *vec = (struct opncls *) abfd->iostream;
+  file_ptr nread = (vec->pread) (abfd, vec->stream, buf, nbytes, vec->where);
+  if (nread < 0)
+    return nread;
+  vec->where += nread;
+  return nread;
+}
+
+static file_ptr
+opncls_bwrite (struct bfd *abfd ATTRIBUTE_UNUSED,
+	      const void *where ATTRIBUTE_UNUSED,
+	      file_ptr nbytes ATTRIBUTE_UNUSED)
+{
+  return -1;
+}
+
+static int
+opncls_bclose (struct bfd *abfd)
+{
+  struct opncls *vec = (struct opncls *) abfd->iostream;
+  /* Since the VEC's memory is bound to the bfd deleting the bfd will
+     free it.  */
+  int status = 0;
+  if (vec->close != NULL)
+    status = (vec->close) (abfd, vec->stream);
+  abfd->iostream = NULL;
+  return status;
+}
+
+static int
+opncls_bflush (struct bfd *abfd ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+opncls_bstat (struct bfd *abfd, struct stat *sb)
+{
+  struct opncls *vec = (struct opncls *) abfd->iostream;
+
+  memset (sb, 0, sizeof (*sb));
+  if (vec->stat == NULL)
+    return 0;
+
+  return (vec->stat) (abfd, vec->stream, sb);
+}
+
+static void *
+opncls_bmmap (struct bfd *abfd ATTRIBUTE_UNUSED,
+	      void *addr ATTRIBUTE_UNUSED,
+	      bfd_size_type len ATTRIBUTE_UNUSED,
+	      int prot ATTRIBUTE_UNUSED,
+	      int flags ATTRIBUTE_UNUSED,
+	      file_ptr offset ATTRIBUTE_UNUSED,
+              void **map_addr ATTRIBUTE_UNUSED,
+              bfd_size_type *map_len ATTRIBUTE_UNUSED)
+{
+  return (void *) -1;
+}
+
+static const struct bfd_iovec opncls_iovec = {
+  &opncls_bread, &opncls_bwrite, &opncls_btell, &opncls_bseek,
+  &opncls_bclose, &opncls_bflush, &opncls_bstat, &opncls_bmmap
+};
+
+bfd *
+bfd_openr_iovec (const char *filename, const char *target,
+		 void *(*open_p) (struct bfd *, void *),
+		 void *open_closure,
+		 file_ptr (*pread_p) (struct bfd *, void *, void *,
+				      file_ptr, file_ptr),
+		 int (*close_p) (struct bfd *, void *),
+		 int (*stat_p) (struct bfd *, void *, struct stat *))
+{
+  bfd *nbfd;
+  const bfd_target *target_vec;
+  struct opncls *vec;
+  void *stream;
+
+  nbfd = _bfd_new_bfd ();
+  if (nbfd == NULL)
+    return NULL;
+
+  target_vec = bfd_find_target (target, nbfd);
+  if (target_vec == NULL)
+    {
+      _bfd_delete_bfd (nbfd);
+      return NULL;
+    }
+
+  nbfd->filename = filename;
+  nbfd->direction = read_direction;
+
+  /* `open_p (...)' would get expanded by an the open(2) syscall macro.  */
+  stream = (*open_p) (nbfd, open_closure);
+  if (stream == NULL)
+    {
+      _bfd_delete_bfd (nbfd);
+      return NULL;
+    }
+
+  vec = (struct opncls *) bfd_zalloc (nbfd, sizeof (struct opncls));
+  vec->stream = stream;
+  vec->pread = pread_p;
+  vec->close = close_p;
+  vec->stat = stat_p;
+
+  nbfd->iovec = &opncls_iovec;
+  nbfd->iostream = vec;
+
+  return nbfd;
+}
+
+/* bfd_openw -- open for writing.
+   Returns a pointer to a freshly-allocated BFD on success, or NULL.
+
+   See comment by bfd_fdopenr before you try to modify this function.  */
+
+/*
+FUNCTION
+	bfd_openw
+
+SYNOPSIS
+	bfd *bfd_openw (const char *filename, const char *target);
+
+DESCRIPTION
+	Create a BFD, associated with file @var{filename}, using the
+	file format @var{target}, and return a pointer to it.
+
+	Possible errors are <<bfd_error_system_call>>, <<bfd_error_no_memory>>,
+	<<bfd_error_invalid_target>>.
+*/
+
+bfd *
+bfd_openw (const char *filename, const char *target)
+{
+  bfd *nbfd;
+  const bfd_target *target_vec;
+
+  /* nbfd has to point to head of malloc'ed block so that bfd_close may
+     reclaim it correctly.  */
+  nbfd = _bfd_new_bfd ();
+  if (nbfd == NULL)
+    return NULL;
+
+  target_vec = bfd_find_target (target, nbfd);
+  if (target_vec == NULL)
+    {
+      _bfd_delete_bfd (nbfd);
+      return NULL;
+    }
+
+  nbfd->filename = filename;
+  nbfd->direction = write_direction;
+
+  if (bfd_open_file (nbfd) == NULL)
+    {
+      /* File not writeable, etc.  */
+      bfd_set_error (bfd_error_system_call);
+      _bfd_delete_bfd (nbfd);
+      return NULL;
+  }
+
+  return nbfd;
+}
+
+static inline void
+_maybe_make_executable (bfd * abfd)
+{
+  /* If the file was open for writing and is now executable,
+     make it so.  */
+  if (abfd->direction == write_direction
+      && (abfd->flags & (EXEC_P | DYNAMIC)) != 0)
+    {
+      struct stat buf;
+
+      if (stat (abfd->filename, &buf) == 0
+	  /* Do not attempt to change non-regular files.  This is
+	     here especially for configure scripts and kernel builds
+	     which run tests with "ld [...] -o /dev/null".  */
+	  && S_ISREG(buf.st_mode))
+	{
+	  unsigned int mask = umask (0);
+
+	  umask (mask);
+	  chmod (abfd->filename,
+		 (0777
+		  & (buf.st_mode | ((S_IXUSR | S_IXGRP | S_IXOTH) &~ mask))));
+	}
+    }
+}
+
+/*
+
+FUNCTION
+	bfd_close
+
+SYNOPSIS
+	bfd_boolean bfd_close (bfd *abfd);
+
+DESCRIPTION
+
+	Close a BFD. If the BFD was open for writing, then pending
+	operations are completed and the file written out and closed.
+	If the created file is executable, then <<chmod>> is called
+	to mark it as such.
+
+	All memory attached to the BFD is released.
+
+	The file descriptor associated with the BFD is closed (even
+	if it was passed in to BFD by <<bfd_fdopenr>>).
+
+RETURNS
+	<<TRUE>> is returned if all is ok, otherwise <<FALSE>>.
+*/
+
+
+bfd_boolean
+bfd_close (bfd *abfd)
+{
+  bfd_boolean ret;
+  bfd *nbfd;
+  bfd *next;
+
+  if (bfd_write_p (abfd))
+    {
+      if (! BFD_SEND_FMT (abfd, _bfd_write_contents, (abfd)))
+	return FALSE;
+    }
+
+  /* Close nested archives (if this bfd is a thin archive).  */
+  for (nbfd = abfd->nested_archives; nbfd; nbfd = next)
+    {
+      next = nbfd->archive_next;
+      bfd_close (nbfd);
+    }
+
+  if (! BFD_SEND (abfd, _close_and_cleanup, (abfd)))
+    return FALSE;
+
+  ret = abfd->iovec->bclose (abfd);
+
+  if (ret)
+    _maybe_make_executable (abfd);
+
+  _bfd_delete_bfd (abfd);
+
+  return ret;
+}
+
+/*
+FUNCTION
+	bfd_close_all_done
+
+SYNOPSIS
+	bfd_boolean bfd_close_all_done (bfd *);
+
+DESCRIPTION
+	Close a BFD.  Differs from <<bfd_close>> since it does not
+	complete any pending operations.  This routine would be used
+	if the application had just used BFD for swapping and didn't
+	want to use any of the writing code.
+
+	If the created file is executable, then <<chmod>> is called
+	to mark it as such.
+
+	All memory attached to the BFD is released.
+
+RETURNS
+	<<TRUE>> is returned if all is ok, otherwise <<FALSE>>.
+*/
+
+bfd_boolean
+bfd_close_all_done (bfd *abfd)
+{
+  bfd_boolean ret;
+
+  ret = bfd_cache_close (abfd);
+
+  if (ret)
+    _maybe_make_executable (abfd);
+
+  _bfd_delete_bfd (abfd);
+
+  return ret;
+}
+
+/*
+FUNCTION
+	bfd_create
+
+SYNOPSIS
+	bfd *bfd_create (const char *filename, bfd *templ);
+
+DESCRIPTION
+	Create a new BFD in the manner of <<bfd_openw>>, but without
+	opening a file. The new BFD takes the target from the target
+	used by @var{templ}. The format is always set to <<bfd_object>>.
+*/
+
+bfd *
+bfd_create (const char *filename, bfd *templ)
+{
+  bfd *nbfd;
+
+  nbfd = _bfd_new_bfd ();
+  if (nbfd == NULL)
+    return NULL;
+  nbfd->filename = filename;
+  if (templ)
+    nbfd->xvec = templ->xvec;
+  nbfd->direction = no_direction;
+  bfd_set_format (nbfd, bfd_object);
+
+  return nbfd;
+}
+
+/*
+FUNCTION
+	bfd_make_writable
+
+SYNOPSIS
+	bfd_boolean bfd_make_writable (bfd *abfd);
+
+DESCRIPTION
+	Takes a BFD as created by <<bfd_create>> and converts it
+	into one like as returned by <<bfd_openw>>.  It does this
+	by converting the BFD to BFD_IN_MEMORY.  It's assumed that
+	you will call <<bfd_make_readable>> on this bfd later.
+
+RETURNS
+	<<TRUE>> is returned if all is ok, otherwise <<FALSE>>.
+*/
+
+bfd_boolean
+bfd_make_writable (bfd *abfd)
+{
+  struct bfd_in_memory *bim;
+
+  if (abfd->direction != no_direction)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  bim = (struct bfd_in_memory *) bfd_malloc (sizeof (struct bfd_in_memory));
+  if (bim == NULL)
+    return FALSE;	/* bfd_error already set.  */
+  abfd->iostream = bim;
+  /* bfd_bwrite will grow these as needed.  */
+  bim->size = 0;
+  bim->buffer = 0;
+
+  abfd->flags |= BFD_IN_MEMORY;
+  abfd->iovec = &_bfd_memory_iovec;
+  abfd->origin = 0;
+  abfd->direction = write_direction;
+  abfd->where = 0;
+
+  return TRUE;
+}
+
+/*
+FUNCTION
+	bfd_make_readable
+
+SYNOPSIS
+	bfd_boolean bfd_make_readable (bfd *abfd);
+
+DESCRIPTION
+	Takes a BFD as created by <<bfd_create>> and
+	<<bfd_make_writable>> and converts it into one like as
+	returned by <<bfd_openr>>.  It does this by writing the
+	contents out to the memory buffer, then reversing the
+	direction.
+
+RETURNS
+	<<TRUE>> is returned if all is ok, otherwise <<FALSE>>.  */
+
+bfd_boolean
+bfd_make_readable (bfd *abfd)
+{
+  if (abfd->direction != write_direction || !(abfd->flags & BFD_IN_MEMORY))
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  if (! BFD_SEND_FMT (abfd, _bfd_write_contents, (abfd)))
+    return FALSE;
+
+  if (! BFD_SEND (abfd, _close_and_cleanup, (abfd)))
+    return FALSE;
+
+  abfd->arch_info = &bfd_default_arch_struct;
+
+  abfd->where = 0;
+  abfd->format = bfd_unknown;
+  abfd->my_archive = NULL;
+  abfd->origin = 0;
+  abfd->opened_once = FALSE;
+  abfd->output_has_begun = FALSE;
+  abfd->section_count = 0;
+  abfd->usrdata = NULL;
+  abfd->cacheable = FALSE;
+  abfd->flags |= BFD_IN_MEMORY;
+  abfd->mtime_set = FALSE;
+
+  abfd->target_defaulted = TRUE;
+  abfd->direction = read_direction;
+  abfd->sections = 0;
+  abfd->symcount = 0;
+  abfd->outsymbols = 0;
+  abfd->tdata.any = 0;
+
+  bfd_section_list_clear (abfd);
+  bfd_check_format (abfd, bfd_object);
+
+  return TRUE;
+}
+
+/*
+FUNCTION
+	bfd_alloc
+
+SYNOPSIS
+	void *bfd_alloc (bfd *abfd, bfd_size_type wanted);
+
+DESCRIPTION
+	Allocate a block of @var{wanted} bytes of memory attached to
+	<<abfd>> and return a pointer to it.
+*/
+
+void *
+bfd_alloc (bfd *abfd, bfd_size_type size)
+{
+  void *ret;
+
+  if (size != (unsigned long) size)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+
+  ret = objalloc_alloc ((struct objalloc *) abfd->memory, (unsigned long) size);
+  if (ret == NULL)
+    bfd_set_error (bfd_error_no_memory);
+  return ret;
+}
+
+/*
+INTERNAL_FUNCTION
+	bfd_alloc2
+
+SYNOPSIS
+	void *bfd_alloc2 (bfd *abfd, bfd_size_type nmemb, bfd_size_type size);
+
+DESCRIPTION
+	Allocate a block of @var{nmemb} elements of @var{size} bytes each
+	of memory attached to <<abfd>> and return a pointer to it.
+*/
+
+void *
+bfd_alloc2 (bfd *abfd, bfd_size_type nmemb, bfd_size_type size)
+{
+  void *ret;
+
+  if ((nmemb | size) >= HALF_BFD_SIZE_TYPE
+      && size != 0
+      && nmemb > ~(bfd_size_type) 0 / size)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+
+  size *= nmemb;
+
+  if (size != (unsigned long) size)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+
+  ret = objalloc_alloc ((struct objalloc *) abfd->memory, (unsigned long) size);
+  if (ret == NULL)
+    bfd_set_error (bfd_error_no_memory);
+  return ret;
+}
+
+/*
+FUNCTION
+	bfd_zalloc
+
+SYNOPSIS
+	void *bfd_zalloc (bfd *abfd, bfd_size_type wanted);
+
+DESCRIPTION
+	Allocate a block of @var{wanted} bytes of zeroed memory
+	attached to <<abfd>> and return a pointer to it.
+*/
+
+void *
+bfd_zalloc (bfd *abfd, bfd_size_type size)
+{
+  void *res;
+
+  res = bfd_alloc (abfd, size);
+  if (res)
+    memset (res, 0, (size_t) size);
+  return res;
+}
+
+/*
+INTERNAL_FUNCTION
+	bfd_zalloc2
+
+SYNOPSIS
+	void *bfd_zalloc2 (bfd *abfd, bfd_size_type nmemb, bfd_size_type size);
+
+DESCRIPTION
+	Allocate a block of @var{nmemb} elements of @var{size} bytes each
+	of zeroed memory attached to <<abfd>> and return a pointer to it.
+*/
+
+void *
+bfd_zalloc2 (bfd *abfd, bfd_size_type nmemb, bfd_size_type size)
+{
+  void *res;
+
+  if ((nmemb | size) >= HALF_BFD_SIZE_TYPE
+      && size != 0
+      && nmemb > ~(bfd_size_type) 0 / size)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return NULL;
+    }
+
+  size *= nmemb;
+
+  res = bfd_alloc (abfd, size);
+  if (res)
+    memset (res, 0, (size_t) size);
+  return res;
+}
+
+/* Free a block allocated for a BFD.
+   Note:  Also frees all more recently allocated blocks!  */
+
+void
+bfd_release (bfd *abfd, void *block)
+{
+  objalloc_free_block ((struct objalloc *) abfd->memory, block);
+}
+
+
+/*
+   GNU Extension: separate debug-info files
+
+   The idea here is that a special section called .gnu_debuglink might be
+   embedded in a binary file, which indicates that some *other* file
+   contains the real debugging information. This special section contains a
+   filename and CRC32 checksum, which we read and resolve to another file,
+   if it exists.
+
+   This facilitates "optional" provision of debugging information, without
+   having to provide two complete copies of every binary object (with and
+   without debug symbols).
+*/
+
+#define GNU_DEBUGLINK	".gnu_debuglink"
+/*
+FUNCTION
+	bfd_calc_gnu_debuglink_crc32
+
+SYNOPSIS
+	unsigned long bfd_calc_gnu_debuglink_crc32
+	  (unsigned long crc, const unsigned char *buf, bfd_size_type len);
+
+DESCRIPTION
+	Computes a CRC value as used in the .gnu_debuglink section.
+	Advances the previously computed @var{crc} value by computing
+	and adding in the crc32 for @var{len} bytes of @var{buf}.
+
+RETURNS
+	Return the updated CRC32 value.
+*/
+
+unsigned long
+bfd_calc_gnu_debuglink_crc32 (unsigned long crc,
+			      const unsigned char *buf,
+			      bfd_size_type len)
+{
+  static const unsigned long crc32_table[256] =
+    {
+      0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
+      0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
+      0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
+      0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+      0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
+      0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+      0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
+      0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+      0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
+      0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
+      0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
+      0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+      0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
+      0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
+      0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
+      0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+      0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
+      0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+      0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
+      0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+      0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
+      0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
+      0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
+      0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+      0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
+      0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
+      0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
+      0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+      0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
+      0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+      0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
+      0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+      0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
+      0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
+      0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
+      0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+      0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
+      0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
+      0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
+      0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+      0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
+      0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+      0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
+      0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+      0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
+      0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
+      0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
+      0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+      0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
+      0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
+      0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
+      0x2d02ef8d
+    };
+  const unsigned char *end;
+
+  crc = ~crc & 0xffffffff;
+  for (end = buf + len; buf < end; ++ buf)
+    crc = crc32_table[(crc ^ *buf) & 0xff] ^ (crc >> 8);
+  return ~crc & 0xffffffff;;
+}
+
+
+/*
+INTERNAL_FUNCTION
+	get_debug_link_info
+
+SYNOPSIS
+	char *get_debug_link_info (bfd *abfd, unsigned long *crc32_out);
+
+DESCRIPTION
+	fetch the filename and CRC32 value for any separate debuginfo
+	associated with @var{abfd}. Return NULL if no such info found,
+	otherwise return filename and update @var{crc32_out}.
+*/
+
+static char *
+get_debug_link_info (bfd *abfd, unsigned long *crc32_out)
+{
+  asection *sect;
+  unsigned long crc32;
+  bfd_byte *contents;
+  int crc_offset;
+  char *name;
+
+  BFD_ASSERT (abfd);
+  BFD_ASSERT (crc32_out);
+
+  sect = bfd_get_section_by_name (abfd, GNU_DEBUGLINK);
+
+  if (sect == NULL)
+    return NULL;
+
+  if (!bfd_malloc_and_get_section (abfd, sect, &contents))
+    {
+      if (contents != NULL)
+	free (contents);
+      return NULL;
+    }
+
+  /* Crc value is stored after the filename, aligned up to 4 bytes.  */
+  name = (char *) contents;
+  crc_offset = strlen (name) + 1;
+  crc_offset = (crc_offset + 3) & ~3;
+
+  crc32 = bfd_get_32 (abfd, contents + crc_offset);
+
+  *crc32_out = crc32;
+  return name;
+}
+
+/*
+INTERNAL_FUNCTION
+	separate_debug_file_exists
+
+SYNOPSIS
+	bfd_boolean separate_debug_file_exists
+	  (char *name, unsigned long crc32);
+
+DESCRIPTION
+	Checks to see if @var{name} is a file and if its contents
+	match @var{crc32}.
+*/
+
+static bfd_boolean
+separate_debug_file_exists (const char *name, const unsigned long crc)
+{
+  static unsigned char buffer [8 * 1024];
+  unsigned long file_crc = 0;
+  FILE *f;
+  bfd_size_type count;
+
+  BFD_ASSERT (name);
+
+  f = real_fopen (name, FOPEN_RB);
+  if (f == NULL)
+    return FALSE;
+
+  while ((count = fread (buffer, 1, sizeof (buffer), f)) > 0)
+    file_crc = bfd_calc_gnu_debuglink_crc32 (file_crc, buffer, count);
+
+  fclose (f);
+
+  return crc == file_crc;
+}
+
+
+/*
+INTERNAL_FUNCTION
+	find_separate_debug_file
+
+SYNOPSIS
+	char *find_separate_debug_file (bfd *abfd);
+
+DESCRIPTION
+	Searches @var{abfd} for a reference to separate debugging
+	information, scans various locations in the filesystem, including
+	the file tree rooted at @var{debug_file_directory}, and returns a
+	filename of such debugging information if the file is found and has
+	matching CRC32.  Returns NULL if no reference to debugging file
+	exists, or file cannot be found.
+*/
+
+static char *
+find_separate_debug_file (bfd *abfd, const char *debug_file_directory)
+{
+  char *base;
+  char *dir;
+  char *debugfile;
+  char *canon_dir;
+  unsigned long crc32;
+  size_t dirlen;
+  size_t canon_dirlen;
+
+  BFD_ASSERT (abfd);
+  if (debug_file_directory == NULL)
+    debug_file_directory = ".";
+
+  /* BFD may have been opened from a stream.  */
+  if (abfd->filename == NULL)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return NULL;
+    }
+
+  base = get_debug_link_info (abfd, & crc32);
+  if (base == NULL)
+    return NULL;
+
+  if (base[0] == '\0')
+    {
+      free (base);
+      bfd_set_error (bfd_error_no_debug_section);
+      return NULL;
+    }
+
+  for (dirlen = strlen (abfd->filename); dirlen > 0; dirlen--)
+    if (IS_DIR_SEPARATOR (abfd->filename[dirlen - 1]))
+      break;
+
+  dir = (char *) bfd_malloc (dirlen + 1);
+  if (dir == NULL)
+    {
+      free (base);
+      return NULL;
+    }
+  memcpy (dir, abfd->filename, dirlen);
+  dir[dirlen] = '\0';
+
+  /* Compute the canonical name of the bfd object with all symbolic links
+     resolved, for use in the global debugfile directory.  */
+  canon_dir = lrealpath (abfd->filename);
+  for (canon_dirlen = strlen (canon_dir); canon_dirlen > 0; canon_dirlen--)
+    if (IS_DIR_SEPARATOR (canon_dir[canon_dirlen - 1]))
+      break;
+  canon_dir[canon_dirlen] = '\0';
+
+  debugfile = (char *)
+      bfd_malloc (strlen (debug_file_directory) + 1
+                  + (canon_dirlen > dirlen ? canon_dirlen : dirlen)
+                  + strlen (".debug/")
+                  + strlen (base)
+                  + 1);
+  if (debugfile == NULL)
+    {
+      free (base);
+      free (dir);
+      free (canon_dir);
+      return NULL;
+    }
+
+  /* First try in the same directory as the original file:  */
+  strcpy (debugfile, dir);
+  strcat (debugfile, base);
+
+  if (separate_debug_file_exists (debugfile, crc32))
+    {
+      free (base);
+      free (dir);
+      free (canon_dir);
+      return debugfile;
+    }
+
+  /* Then try in a subdirectory called .debug.  */
+  strcpy (debugfile, dir);
+  strcat (debugfile, ".debug/");
+  strcat (debugfile, base);
+
+  if (separate_debug_file_exists (debugfile, crc32))
+    {
+      free (base);
+      free (dir);
+      free (canon_dir);
+      return debugfile;
+    }
+
+  /* Then try in the global debugfile directory.  */
+  strcpy (debugfile, debug_file_directory);
+  dirlen = strlen (debug_file_directory) - 1;
+  if (dirlen > 0
+      && debug_file_directory[dirlen] != '/'
+      && canon_dir[0] != '/')
+    strcat (debugfile, "/");
+  strcat (debugfile, canon_dir);
+  strcat (debugfile, base);
+
+  if (separate_debug_file_exists (debugfile, crc32))
+    {
+      free (base);
+      free (dir);
+      free (canon_dir);
+      return debugfile;
+    }
+
+  free (debugfile);
+  free (base);
+  free (dir);
+  free (canon_dir);
+  return NULL;
+}
+
+
+/*
+FUNCTION
+	bfd_follow_gnu_debuglink
+
+SYNOPSIS
+	char *bfd_follow_gnu_debuglink (bfd *abfd, const char *dir);
+
+DESCRIPTION
+
+	Takes a BFD and searches it for a .gnu_debuglink section.  If this
+	section is found, it examines the section for the name and checksum
+	of a '.debug' file containing auxiliary debugging information.  It
+	then searches the filesystem for this .debug file in some standard
+	locations, including the directory tree rooted at @var{dir}, and if
+	found returns the full filename.
+
+	If @var{dir} is NULL, it will search a default path configured into
+	libbfd at build time.  [XXX this feature is not currently
+	implemented].
+
+RETURNS
+	<<NULL>> on any errors or failure to locate the .debug file,
+	otherwise a pointer to a heap-allocated string containing the
+	filename.  The caller is responsible for freeing this string.
+*/
+
+char *
+bfd_follow_gnu_debuglink (bfd *abfd, const char *dir)
+{
+  return find_separate_debug_file (abfd, dir);
+}
+
+/*
+FUNCTION
+	bfd_create_gnu_debuglink_section
+
+SYNOPSIS
+	struct bfd_section *bfd_create_gnu_debuglink_section
+	  (bfd *abfd, const char *filename);
+
+DESCRIPTION
+
+	Takes a @var{BFD} and adds a .gnu_debuglink section to it.  The section is sized
+	to be big enough to contain a link to the specified @var{filename}.
+
+RETURNS
+	A pointer to the new section is returned if all is ok.  Otherwise <<NULL>> is
+	returned and bfd_error is set.
+*/
+
+asection *
+bfd_create_gnu_debuglink_section (bfd *abfd, const char *filename)
+{
+  asection *sect;
+  bfd_size_type debuglink_size;
+  flagword flags;
+
+  if (abfd == NULL || filename == NULL)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return NULL;
+    }
+
+  /* Strip off any path components in filename.  */
+  filename = lbasename (filename);
+
+  sect = bfd_get_section_by_name (abfd, GNU_DEBUGLINK);
+  if (sect)
+    {
+      /* Section already exists.  */
+      bfd_set_error (bfd_error_invalid_operation);
+      return NULL;
+    }
+
+  flags = SEC_HAS_CONTENTS | SEC_READONLY | SEC_DEBUGGING;
+  sect = bfd_make_section_with_flags (abfd, GNU_DEBUGLINK, flags);
+  if (sect == NULL)
+    return NULL;
+
+  debuglink_size = strlen (filename) + 1;
+  debuglink_size += 3;
+  debuglink_size &= ~3;
+  debuglink_size += 4;
+
+  if (! bfd_set_section_size (abfd, sect, debuglink_size))
+    /* XXX Should we delete the section from the bfd ?  */
+    return NULL;
+
+  return sect;
+}
+
+
+/*
+FUNCTION
+	bfd_fill_in_gnu_debuglink_section
+
+SYNOPSIS
+	bfd_boolean bfd_fill_in_gnu_debuglink_section
+	  (bfd *abfd, struct bfd_section *sect, const char *filename);
+
+DESCRIPTION
+
+	Takes a @var{BFD} and containing a .gnu_debuglink section @var{SECT}
+	and fills in the contents of the section to contain a link to the
+	specified @var{filename}.  The filename should be relative to the
+	current directory.
+
+RETURNS
+	<<TRUE>> is returned if all is ok.  Otherwise <<FALSE>> is returned
+	and bfd_error is set.
+*/
+
+bfd_boolean
+bfd_fill_in_gnu_debuglink_section (bfd *abfd,
+				   struct bfd_section *sect,
+				   const char *filename)
+{
+  bfd_size_type debuglink_size;
+  unsigned long crc32;
+  char * contents;
+  bfd_size_type crc_offset;
+  FILE * handle;
+  static unsigned char buffer[8 * 1024];
+  size_t count;
+  size_t filelen;
+
+  if (abfd == NULL || sect == NULL || filename == NULL)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  /* Make sure that we can read the file.
+     XXX - Should we attempt to locate the debug info file using the same
+     algorithm as gdb ?  At the moment, since we are creating the
+     .gnu_debuglink section, we insist upon the user providing us with a
+     correct-for-section-creation-time path, but this need not conform to
+     the gdb location algorithm.  */
+  handle = real_fopen (filename, FOPEN_RB);
+  if (handle == NULL)
+    {
+      bfd_set_error (bfd_error_system_call);
+      return FALSE;
+    }
+
+  crc32 = 0;
+  while ((count = fread (buffer, 1, sizeof buffer, handle)) > 0)
+    crc32 = bfd_calc_gnu_debuglink_crc32 (crc32, buffer, count);
+  fclose (handle);
+
+  /* Strip off any path components in filename,
+     now that we no longer need them.  */
+  filename = lbasename (filename);
+
+  filelen = strlen (filename);
+  debuglink_size = filelen + 1;
+  debuglink_size += 3;
+  debuglink_size &= ~3;
+  debuglink_size += 4;
+
+  contents = (char *) bfd_malloc (debuglink_size);
+  if (contents == NULL)
+    {
+      /* XXX Should we delete the section from the bfd ?  */
+      return FALSE;
+    }
+
+  crc_offset = debuglink_size - 4;
+  memcpy (contents, filename, filelen);
+  memset (contents + filelen, 0, crc_offset - filelen);
+
+  bfd_put_32 (abfd, crc32, contents + crc_offset);
+
+  if (! bfd_set_section_contents (abfd, sect, contents, 0, debuglink_size))
+    {
+      /* XXX Should we delete the section from the bfd ?  */
+      free (contents);
+      return FALSE;
+    }
+
+  return TRUE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/osf-core.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/osf-core.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/osf-core.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/osf-core.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,240 @@
+/* BFD back-end for OSF/1 core files.
+   Copyright 1993, 1994, 1995, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007, 2010, 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* This file can only be compiled on systems which use OSF/1 style
+   core files.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#include <sys/user.h>
+#ifdef OSF_CORE
+#include <sys/core.h>
+#endif
+
+/* forward declarations */
+
+static asection *make_bfd_asection
+  PARAMS ((bfd *, const char *, flagword, bfd_size_type, bfd_vma, file_ptr));
+static const bfd_target *osf_core_core_file_p
+  PARAMS ((bfd *));
+static char *osf_core_core_file_failing_command
+  PARAMS ((bfd *));
+static int osf_core_core_file_failing_signal
+  PARAMS ((bfd *));
+#define osf_core_core_file_matches_executable_p generic_core_file_matches_executable_p
+#define osf_core_core_file_pid _bfd_nocore_core_file_pid
+static void swap_abort
+  PARAMS ((void));
+
+/* These are stored in the bfd's tdata */
+
+struct osf_core_struct
+{
+  int sig;
+  char cmd[MAXCOMLEN + 1];
+};
+
+#define core_hdr(bfd) ((bfd)->tdata.osf_core_data)
+#define core_signal(bfd) (core_hdr(bfd)->sig)
+#define core_command(bfd) (core_hdr(bfd)->cmd)
+
+static asection *
+make_bfd_asection (abfd, name, flags, size, vma, filepos)
+     bfd *abfd;
+     const char *name;
+     flagword flags;
+     bfd_size_type size;
+     bfd_vma vma;
+     file_ptr filepos;
+{
+  asection *asect;
+
+  asect = bfd_make_section_anyway_with_flags (abfd, name, flags);
+  if (!asect)
+    return NULL;
+
+  asect->size = size;
+  asect->vma = vma;
+  asect->filepos = filepos;
+  asect->alignment_power = 8;
+
+  return asect;
+}
+
+static const bfd_target *
+osf_core_core_file_p (abfd)
+     bfd *abfd;
+{
+  int val;
+  int i;
+  char *secname;
+  struct core_filehdr core_header;
+  bfd_size_type amt;
+
+  amt = sizeof core_header;
+  val = bfd_bread ((PTR) &core_header, amt, abfd);
+  if (val != sizeof core_header)
+    return NULL;
+
+  if (! CONST_STRNEQ (core_header.magic, "Core"))
+    return NULL;
+
+  core_hdr (abfd) = (struct osf_core_struct *)
+    bfd_zalloc (abfd, (bfd_size_type) sizeof (struct osf_core_struct));
+  if (!core_hdr (abfd))
+    return NULL;
+
+  strncpy (core_command (abfd), core_header.name, MAXCOMLEN + 1);
+  core_signal (abfd) = core_header.signo;
+
+  for (i = 0; i < core_header.nscns; i++)
+    {
+      struct core_scnhdr core_scnhdr;
+      flagword flags;
+
+      amt = sizeof core_scnhdr;
+      val = bfd_bread ((PTR) &core_scnhdr, amt, abfd);
+      if (val != sizeof core_scnhdr)
+	break;
+
+      /* Skip empty sections.  */
+      if (core_scnhdr.size == 0 || core_scnhdr.scnptr == 0)
+	continue;
+
+      switch (core_scnhdr.scntype)
+	{
+	case SCNRGN:
+	  secname = ".data";
+	  flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
+	  break;
+	case SCNSTACK:
+	  secname = ".stack";
+	  flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
+	  break;
+	case SCNREGS:
+	  secname = ".reg";
+	  flags = SEC_HAS_CONTENTS;
+	  break;
+	default:
+	  (*_bfd_error_handler) (_("Unhandled OSF/1 core file section type %d\n"),
+				 core_scnhdr.scntype);
+	  continue;
+	}
+
+      if (!make_bfd_asection (abfd, secname, flags,
+			      (bfd_size_type) core_scnhdr.size,
+			      (bfd_vma) core_scnhdr.vaddr,
+			      (file_ptr) core_scnhdr.scnptr))
+	goto fail;
+    }
+
+  /* OK, we believe you.  You're a core file (sure, sure).  */
+
+  return abfd->xvec;
+
+ fail:
+  bfd_release (abfd, core_hdr (abfd));
+  core_hdr (abfd) = NULL;
+  bfd_section_list_clear (abfd);
+  return NULL;
+}
+
+static char *
+osf_core_core_file_failing_command (abfd)
+     bfd *abfd;
+{
+  return core_command (abfd);
+}
+
+static int
+osf_core_core_file_failing_signal (abfd)
+     bfd *abfd;
+{
+  return core_signal (abfd);
+}
+
+/* If somebody calls any byte-swapping routines, shoot them.  */
+static void
+swap_abort()
+{
+  abort(); /* This way doesn't require any declaration for ANSI to fuck up */
+}
+
+#define	NO_GET ((bfd_vma (*) (const void *)) swap_abort)
+#define	NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
+#define	NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
+#define	NO_GET64 ((bfd_uint64_t (*) (const void *)) swap_abort)
+#define	NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
+#define	NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
+
+const bfd_target osf_core_vec =
+  {
+    "osf-core",
+    bfd_target_unknown_flavour,
+    BFD_ENDIAN_LITTLE,		/* target byte order */
+    BFD_ENDIAN_LITTLE,		/* target headers byte order */
+    (HAS_RELOC | EXEC_P |	/* object flags */
+     HAS_LINENO | HAS_DEBUG |
+     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+    0,				/* symbol prefix */
+    ' ',			/* ar_pad_char */
+    16,				/* ar_max_namelen */
+    0,				/* match priority.  */
+    NO_GET64, NO_GETS64, NO_PUT64,	/* 64 bit data */
+    NO_GET, NO_GETS, NO_PUT,		/* 32 bit data */
+    NO_GET, NO_GETS, NO_PUT,		/* 16 bit data */
+    NO_GET64, NO_GETS64, NO_PUT64,	/* 64 bit hdrs */
+    NO_GET, NO_GETS, NO_PUT,		/* 32 bit hdrs */
+    NO_GET, NO_GETS, NO_PUT,		/* 16 bit hdrs */
+
+    {				/* bfd_check_format */
+      _bfd_dummy_target,		/* unknown format */
+      _bfd_dummy_target,		/* object file */
+      _bfd_dummy_target,		/* archive */
+      osf_core_core_file_p		/* a core file */
+    },
+    {				/* bfd_set_format */
+      bfd_false, bfd_false,
+      bfd_false, bfd_false
+    },
+    {				/* bfd_write_contents */
+      bfd_false, bfd_false,
+      bfd_false, bfd_false
+    },
+
+    BFD_JUMP_TABLE_GENERIC (_bfd_generic),
+    BFD_JUMP_TABLE_COPY (_bfd_generic),
+    BFD_JUMP_TABLE_CORE (osf_core),
+    BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+    BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
+    BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+    BFD_JUMP_TABLE_WRITE (_bfd_generic),
+    BFD_JUMP_TABLE_LINK (_bfd_nolink),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    NULL,
+
+    (PTR) 0			/* backend_data */
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pc532-mach.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pc532-mach.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pc532-mach.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pc532-mach.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,113 @@
+/* BFD back-end for Mach3/532 a.out-ish binaries.
+   Copyright 1990, 1991, 1992, 1994, 1995, 2000, 2001, 2002, 2005, 2007, 2009
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* Written by Ian Dall
+              19-Apr-94
+
+   Formerly part of aout-pc532-mach.c. Split out to allow more
+   flexibility with multiple formats.  */
+
+/* This architecture has N_TXTOFF and N_TXTADDR defined as if
+   N_HEADER_IN_TEXT, but the a_text entry (text size) does not include the
+   space for the header. So we have N_HEADER_IN_TEXT defined to
+   1 and specially define our own N_TXTSIZE.  */
+
+#define N_HEADER_IN_TEXT(x) 1
+#define N_TXTSIZE(x) ((x).a_text)
+
+#define TEXT_START_ADDR 0x10000       /* from old ld */
+#define TARGET_PAGE_SIZE 0x1000       /* from old ld,  032 & 532 are really 512/4k */
+
+/* Use a_entry of 0 to distinguish object files from OMAGIC executables */
+#define N_TXTADDR(x) \
+  (N_MAGIC(x) == OMAGIC ? \
+   ((x).a_entry < TEXT_START_ADDR? 0: TEXT_START_ADDR): \
+   (N_MAGIC(x) == NMAGIC? TEXT_START_ADDR: \
+    TEXT_START_ADDR + EXEC_BYTES_SIZE))
+
+#define	SEGMENT_SIZE	TARGET_PAGE_SIZE
+
+#define SEGMENT_SIZE TARGET_PAGE_SIZE
+#define DEFAULT_ARCH bfd_arch_ns32k
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (pc532machaout_,OP)
+
+/* Must be the same as aout-ns32k.c */
+#define NAME(x,y) CONCAT3 (ns32kaout,_32_,y)
+
+#define TARGETNAME "a.out-pc532-mach"
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libaout.h"
+#include "libbfd.h"
+#include "aout/aout64.h"
+
+#define MY_bfd_reloc_type_lookup ns32kaout_bfd_reloc_type_lookup
+
+/* libaout doesn't use NAME for these ...  */
+
+#define MY_get_section_contents aout_32_get_section_contents
+
+#define MY_text_includes_header 1
+
+#define MY_exec_header_not_counted 1
+
+reloc_howto_type *ns32kaout_bfd_reloc_type_lookup
+  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
+
+static bfd_boolean MY(write_object_contents)
+  PARAMS ((bfd *abfd));
+
+static bfd_boolean
+MY(write_object_contents) (abfd)
+     bfd *abfd;
+{
+  struct external_exec exec_bytes;
+  struct internal_exec *execp = exec_hdr (abfd);
+
+  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+
+  BFD_ASSERT (bfd_get_arch (abfd) == bfd_arch_ns32k);
+  switch (bfd_get_mach (abfd))
+    {
+    case 32032:
+      N_SET_MACHTYPE (*execp, M_NS32032);
+      break;
+    case 32532:
+    default:
+      N_SET_MACHTYPE (*execp, M_NS32532);
+      break;
+    }
+  N_SET_FLAGS (*execp, aout_backend_info (abfd)->exec_hdr_flags);
+
+  WRITE_HEADERS(abfd, execp);
+
+  return TRUE;
+}
+
+#define MY_write_object_contents MY(write_object_contents)
+
+#include "aout-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pdp11.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pdp11.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pdp11.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pdp11.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4543 @@
+/* BFD back-end for PDP-11 a.out binaries.
+   Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA. */
+
+
+/* BFD backend for PDP-11, running 2.11BSD in particular.
+
+   This file was hacked up by looking hard at the existing vaxnetbsd
+   back end and the header files in 2.11BSD.
+
+   TODO
+   * support for V7 file formats
+   * support for overlay object files (see 2.11 a.out(5))
+   * support for old and very old archives
+   (see 2.11 ar(5), historical section)
+
+   Search for TODO to find other areas needing more work.  */
+
+#define	BYTES_IN_WORD	2
+#define	BYTES_IN_LONG	4
+#define ARCH_SIZE	16
+#undef TARGET_IS_BIG_ENDIAN_P
+
+#define	TARGET_PAGE_SIZE	1024
+#define	SEGMENT__SIZE	TARGET_PAGE_SIZE
+
+#define	DEFAULT_ARCH	bfd_arch_pdp11
+#define	DEFAULT_MID 	M_PDP11
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (pdp11_aout_,OP)
+
+/* This needs to start with a.out so GDB knows it is an a.out variant.  */
+#define TARGETNAME "a.out-pdp11"
+
+/* This is the normal load address for executables.  */
+#define TEXT_START_ADDR		0
+
+/* The header is not included in the text segment.  */
+#define N_HEADER_IN_TEXT(x)	0
+
+/* There is no flags field.  */
+#define N_FLAGS(exec)		0
+
+#define N_SET_FLAGS(exec, flags) do { } while (0)
+#define N_BADMAG(x) (N_MAGIC(x) != OMAGIC	\
+		     && N_MAGIC(x) != NMAGIC	\
+		     && N_MAGIC(x) != ZMAGIC)
+
+#include "sysdep.h"
+#include "bfd.h"
+
+#define external_exec pdp11_external_exec
+struct pdp11_external_exec
+{
+  bfd_byte e_info[2];		/* Magic number.  */
+  bfd_byte e_text[2];		/* Length of text section in bytes.  */
+  bfd_byte e_data[2];		/* Length of data section in bytes.  */
+  bfd_byte e_bss[2];		/* Length of bss area in bytes.  */
+  bfd_byte e_syms[2];		/* Length of symbol table in bytes.  */
+  bfd_byte e_entry[2];		/* Start address.  */
+  bfd_byte e_unused[2];		/* Not used.  */
+  bfd_byte e_flag[2];		/* Relocation info stripped.  */
+  bfd_byte e_relocatable; 	/* Ugly hack.  */
+};
+
+#define	EXEC_BYTES_SIZE	(8 * 2)
+
+#define	A_MAGIC1	OMAGIC
+#define OMAGIC		0407	/* ...object file or impure executable.  */
+#define	A_MAGIC2	NMAGIC
+#define NMAGIC		0410	/* Pure executable.  */
+#define ZMAGIC		0413	/* Demand-paged executable.  */
+#define	A_MAGIC3	0411	/* Separated I&D.  */
+#define	A_MAGIC4	0405	/* Overlay.  */
+#define	A_MAGIC5	0430	/* Auto-overlay (nonseparate).  */
+#define	A_MAGIC6	0431	/* Auto-overlay (separate).  */
+#define QMAGIC		0
+#define BMAGIC		0
+
+#define A_FLAG_RELOC_STRIPPED	0x0001
+
+#define external_nlist pdp11_external_nlist
+struct pdp11_external_nlist
+{
+  bfd_byte e_unused[2];		/* Unused.  */
+  bfd_byte e_strx[2];		/* Index into string table of name.  */
+  bfd_byte e_type[1];		/* Type of symbol.  */
+  bfd_byte e_ovly[1];		/* Overlay number.  */
+  bfd_byte e_value[2];		/* Value of symbol.  */
+};
+
+#define	EXTERNAL_NLIST_SIZE	8
+
+#define N_TXTOFF(x)	(EXEC_BYTES_SIZE)
+#define N_DATOFF(x)	(N_TXTOFF(x) + (x).a_text)
+#define N_TRELOFF(x)	(N_DATOFF(x) + (x).a_data)
+#define N_DRELOFF(x)	(N_TRELOFF(x) + (x).a_trsize)
+#define N_SYMOFF(x)	(N_DRELOFF(x) + (x).a_drsize)
+#define N_STROFF(x)	(N_SYMOFF(x) + (x).a_syms)
+
+#define WRITE_HEADERS(abfd, execp) pdp11_aout_write_headers (abfd, execp)
+
+#include "libbfd.h"
+#include "libaout.h"
+
+#define SWAP_MAGIC(ext) bfd_getl16 (ext)
+
+#define MY_entry_is_text_address 1
+
+#define MY_write_object_contents MY(write_object_contents)
+static bfd_boolean MY(write_object_contents) (bfd *);
+#define MY_text_includes_header 1
+
+#define MY_BFD_TARGET
+
+#include "aout-target.h"
+
+/* Start of modified aoutx.h.  */
+#define KEEPIT udata.i
+
+#include <string.h>		/* For strchr and friends.  */
+#include "bfd.h"
+#include "sysdep.h"
+#include "safe-ctype.h"
+#include "bfdlink.h"
+
+#include "libaout.h"
+#include "aout/aout64.h"
+#include "aout/stab_gnu.h"
+#include "aout/ar.h"
+
+#undef N_TYPE
+#undef N_UNDF
+#undef N_ABS
+#undef N_TEXT
+#undef N_DATA
+#undef N_BSS
+#undef N_REG
+#undef N_FN
+#undef N_EXT
+#define N_TYPE		0x1f	/* Type mask.  */
+#define N_UNDF		0x00	/* Undefined.  */
+#define N_ABS		0x01	/* Absolute.  */
+#define N_TEXT		0x02	/* Text segment.  */
+#define N_DATA		0x03	/* Data segment.  */
+#define N_BSS		0x04	/* Bss segment.  */
+#define N_REG		0x14	/* Register symbol.  */
+#define N_FN		0x1f	/* File name.  */
+#define N_EXT		0x20	/* External flag.  */
+
+#define RELOC_SIZE 2
+
+#define RELFLG		0x0001	/* PC-relative flag.  */
+#define RTYPE		0x000e	/* Type mask.  */
+#define RIDXMASK	0xfff0	/* Index mask.  */
+
+#define RABS		0x00	/* Absolute.  */
+#define RTEXT		0x02	/* Text.  */
+#define RDATA		0x04	/* Data.  */
+#define RBSS		0x06	/* Bss.  */
+#define REXT		0x08	/* External.  */
+
+#define RINDEX(x)	(((x) & 0xfff0) >> 4)
+
+#ifndef MY_final_link_relocate
+#define MY_final_link_relocate _bfd_final_link_relocate
+#endif
+
+#ifndef MY_relocate_contents
+#define MY_relocate_contents _bfd_relocate_contents
+#endif
+
+/* A hash table used for header files with N_BINCL entries.  */
+
+struct aout_link_includes_table
+{
+  struct bfd_hash_table root;
+};
+
+/* A linked list of totals that we have found for a particular header
+   file.  */
+
+struct aout_link_includes_totals
+{
+  struct aout_link_includes_totals *next;
+  bfd_vma total;
+};
+
+/* An entry in the header file hash table.  */
+
+struct aout_link_includes_entry
+{
+  struct bfd_hash_entry root;
+  /* List of totals we have found for this file.  */
+  struct aout_link_includes_totals *totals;
+};
+
+/* During the final link step we need to pass around a bunch of
+   information, so we do it in an instance of this structure.  */
+
+struct aout_final_link_info
+{
+  /* General link information.  */
+  struct bfd_link_info *info;
+  /* Output bfd.  */
+  bfd *output_bfd;
+  /* Reloc file positions.  */
+  file_ptr treloff, dreloff;
+  /* File position of symbols.  */
+  file_ptr symoff;
+  /* String table.  */
+  struct bfd_strtab_hash *strtab;
+  /* Header file hash table.  */
+  struct aout_link_includes_table includes;
+  /* A buffer large enough to hold the contents of any section.  */
+  bfd_byte *contents;
+  /* A buffer large enough to hold the relocs of any section.  */
+  void * relocs;
+  /* A buffer large enough to hold the symbol map of any input BFD.  */
+  int *symbol_map;
+  /* A buffer large enough to hold output symbols of any input BFD.  */
+  struct external_nlist *output_syms;
+};
+
+reloc_howto_type howto_table_pdp11[] =
+{
+  /* type              rs size bsz  pcrel bitpos ovrf                     sf name     part_inpl readmask  setmask    pcdone */
+HOWTO( 0,	       0,  1,  16,  FALSE, 0, complain_overflow_signed,0,"16",	TRUE, 0x0000ffff,0x0000ffff, FALSE),
+HOWTO( 1,	       0,  1,  16,  TRUE,  0, complain_overflow_signed,0,"DISP16",	TRUE, 0x0000ffff,0x0000ffff, FALSE),
+};
+
+#define TABLE_SIZE(TABLE)	(sizeof(TABLE)/sizeof(TABLE[0]))
+
+
+static bfd_boolean aout_link_check_archive_element (bfd *, struct bfd_link_info *, bfd_boolean *);
+static bfd_boolean aout_link_add_object_symbols    (bfd *, struct bfd_link_info *);
+static bfd_boolean aout_link_add_symbols           (bfd *, struct bfd_link_info *);
+static bfd_boolean aout_link_write_symbols         (struct aout_final_link_info *, bfd *);
+
+
+reloc_howto_type *
+NAME (aout, reloc_type_lookup) (bfd * abfd ATTRIBUTE_UNUSED,
+				bfd_reloc_code_real_type code)
+{
+  switch (code)
+    {
+    case BFD_RELOC_16:
+      return &howto_table_pdp11[0];
+    case BFD_RELOC_16_PCREL:
+      return &howto_table_pdp11[1];
+    default:
+      return NULL;
+    }
+}
+
+reloc_howto_type *
+NAME (aout, reloc_name_lookup) (bfd *abfd ATTRIBUTE_UNUSED,
+				      const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (howto_table_pdp11) / sizeof (howto_table_pdp11[0]);
+       i++)
+    if (howto_table_pdp11[i].name != NULL
+	&& strcasecmp (howto_table_pdp11[i].name, r_name) == 0)
+      return &howto_table_pdp11[i];
+
+  return NULL;
+}
+
+static int
+pdp11_aout_write_headers (bfd *abfd, struct internal_exec *execp)
+{
+  struct external_exec exec_bytes;
+  bfd_size_type text_size;
+  file_ptr text_end;
+
+  if (adata(abfd).magic == undecided_magic)
+    NAME (aout, adjust_sizes_and_vmas) (abfd, &text_size, &text_end);
+
+  execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE;
+  execp->a_entry = bfd_get_start_address (abfd);
+
+  if (obj_textsec (abfd)->reloc_count > 0
+      || obj_datasec (abfd)->reloc_count > 0)
+    {
+      execp->a_trsize = execp->a_text;
+      execp->a_drsize = execp->a_data;
+    }
+  else
+    {
+      execp->a_trsize = 0;
+      execp->a_drsize = 0;
+    }
+
+  NAME (aout, swap_exec_header_out) (abfd, execp, & exec_bytes);
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    return FALSE;
+
+  if (bfd_bwrite ((void *) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE, abfd)
+      != EXEC_BYTES_SIZE)
+    return FALSE;
+
+  /* Now write out reloc info, followed by syms and strings.  */
+  if (bfd_get_outsymbols (abfd) != NULL
+      && bfd_get_symcount (abfd) != 0)
+    {
+      if (bfd_seek (abfd, (file_ptr) (N_SYMOFF(*execp)), SEEK_SET) != 0)
+	return FALSE;
+
+      if (! NAME (aout, write_syms) (abfd))
+	return FALSE;
+    }
+
+  if (obj_textsec (abfd)->reloc_count > 0
+      || obj_datasec (abfd)->reloc_count > 0)
+    {
+      if (bfd_seek (abfd, (file_ptr) (N_TRELOFF(*execp)), SEEK_SET) != 0
+	  || !NAME (aout, squirt_out_relocs) (abfd, obj_textsec (abfd))
+	  || bfd_seek (abfd, (file_ptr) (N_DRELOFF(*execp)), SEEK_SET) != 0
+	  || !NAME (aout, squirt_out_relocs) (abfd, obj_datasec (abfd)))  
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Write an object file.
+   Section contents have already been written.  We write the
+   file header, symbols, and relocation.  */
+
+static bfd_boolean
+MY(write_object_contents) (bfd *abfd)
+{
+  struct internal_exec *execp = exec_hdr (abfd);
+
+  /* We must make certain that the magic number has been set.  This
+     will normally have been done by set_section_contents, but only if
+     there actually are some section contents.  */
+  if (! abfd->output_has_begun)
+    {
+      bfd_size_type text_size;
+      file_ptr text_end;
+
+      NAME (aout, adjust_sizes_and_vmas) (abfd, &text_size, &text_end);
+    }
+
+  obj_reloc_entry_size (abfd) = RELOC_SIZE;
+
+  return WRITE_HEADERS (abfd, execp);
+}
+
+/* Swap the information in an executable header @var{raw_bytes} taken
+   from a raw byte stream memory image into the internal exec header
+   structure "execp".  */
+
+#ifndef NAME_swap_exec_header_in
+void
+NAME (aout, swap_exec_header_in) (bfd *abfd,
+				  struct external_exec *bytes,
+				  struct internal_exec *execp)
+{
+  /* The internal_exec structure has some fields that are unused in this
+     configuration (IE for i960), so ensure that all such uninitialized
+     fields are zero'd out.  There are places where two of these structs
+     are memcmp'd, and thus the contents do matter.  */
+  memset ((void *) execp, 0, sizeof (struct internal_exec));
+  /* Now fill in fields in the execp, from the bytes in the raw data.  */
+  execp->a_info   = GET_MAGIC (abfd, bytes->e_info);
+  execp->a_text   = GET_WORD (abfd, bytes->e_text);
+  execp->a_data   = GET_WORD (abfd, bytes->e_data);
+  execp->a_bss    = GET_WORD (abfd, bytes->e_bss);
+  execp->a_syms   = GET_WORD (abfd, bytes->e_syms);
+  execp->a_entry  = GET_WORD (abfd, bytes->e_entry);
+
+  if (GET_WORD (abfd, bytes->e_flag) & A_FLAG_RELOC_STRIPPED)
+    {
+      execp->a_trsize = 0;
+      execp->a_drsize = 0;
+    }
+  else
+    {
+      execp->a_trsize = execp->a_text;
+      execp->a_drsize = execp->a_data;
+    }
+}
+#define NAME_swap_exec_header_in NAME (aout, swap_exec_header_in)
+#endif
+
+/*  Swap the information in an internal exec header structure
+    "execp" into the buffer "bytes" ready for writing to disk.  */
+void
+NAME (aout, swap_exec_header_out) (bfd *abfd,
+				   struct internal_exec *execp,
+				   struct external_exec *bytes)
+{
+  /* Now fill in fields in the raw data, from the fields in the exec struct.  */
+  PUT_MAGIC (abfd, execp->a_info,		bytes->e_info);
+  PUT_WORD (abfd, execp->a_text,		bytes->e_text);
+  PUT_WORD (abfd, execp->a_data,		bytes->e_data);
+  PUT_WORD (abfd, execp->a_bss,			bytes->e_bss);
+  PUT_WORD (abfd, execp->a_syms,		bytes->e_syms);
+  PUT_WORD (abfd, execp->a_entry,		bytes->e_entry);
+  PUT_WORD (abfd, 0,				bytes->e_unused);
+
+  if ((execp->a_trsize == 0 || execp->a_text == 0)
+      && (execp->a_drsize == 0 || execp->a_data == 0))
+    PUT_WORD (abfd, A_FLAG_RELOC_STRIPPED, bytes->e_flag);
+  else if (execp->a_trsize == execp->a_text
+	   && execp->a_drsize == execp->a_data)
+    PUT_WORD (abfd, 0, bytes->e_flag);
+  else
+    {
+      /* TODO: print a proper warning message.  */
+      fprintf (stderr, "BFD:%s:%d: internal error\n", __FILE__, __LINE__);
+      PUT_WORD (abfd, 0,			bytes->e_flag);
+    }
+}
+
+/* Make all the section for an a.out file.  */
+
+bfd_boolean
+NAME (aout, make_sections) (bfd *abfd)
+{
+  if (obj_textsec (abfd) == NULL && bfd_make_section (abfd, ".text") == NULL)
+    return FALSE;
+  if (obj_datasec (abfd) == NULL && bfd_make_section (abfd, ".data") == NULL)
+    return FALSE;
+  if (obj_bsssec (abfd) == NULL  && bfd_make_section (abfd, ".bss") == NULL)
+    return FALSE;
+  return TRUE;
+}
+
+/* Some a.out variant thinks that the file open in ABFD
+   checking is an a.out file.  Do some more checking, and set up
+   for access if it really is.  Call back to the calling
+   environment's "finish up" function just before returning, to
+   handle any last-minute setup.  */
+
+const bfd_target *
+NAME (aout, some_aout_object_p) (bfd *abfd,
+				 struct internal_exec *execp,
+				 const bfd_target *(*callback_to_real_object_p) (bfd *))
+{
+  struct aout_data_struct *rawptr, *oldrawptr;
+  const bfd_target *result;
+  bfd_size_type amt = sizeof (struct aout_data_struct);
+
+  rawptr = bfd_zalloc (abfd, amt);
+  if (rawptr == NULL)
+    return 0;
+
+  oldrawptr = abfd->tdata.aout_data;
+  abfd->tdata.aout_data = rawptr;
+
+  /* Copy the contents of the old tdata struct.
+     In particular, we want the subformat, since for hpux it was set in
+     hp300hpux.c:swap_exec_header_in and will be used in
+     hp300hpux.c:callback.  */
+  if (oldrawptr != NULL)
+    *abfd->tdata.aout_data = *oldrawptr;
+
+  abfd->tdata.aout_data->a.hdr = &rawptr->e;
+  *(abfd->tdata.aout_data->a.hdr) = *execp;	/* Copy in the internal_exec struct.  */
+  execp = abfd->tdata.aout_data->a.hdr;
+
+  /* Set the file flags.  */
+  abfd->flags = BFD_NO_FLAGS;
+  if (execp->a_drsize || execp->a_trsize)
+    abfd->flags |= HAS_RELOC;
+  /* Setting of EXEC_P has been deferred to the bottom of this function.  */
+  if (execp->a_syms)
+    abfd->flags |= HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS;
+  if (N_DYNAMIC(*execp))
+    abfd->flags |= DYNAMIC;
+
+  if (N_MAGIC (*execp) == ZMAGIC)
+    {
+      abfd->flags |= D_PAGED | WP_TEXT;
+      adata (abfd).magic = z_magic;
+    }
+  else if (N_MAGIC (*execp) == NMAGIC)
+    {
+      abfd->flags |= WP_TEXT;
+      adata (abfd).magic = n_magic;
+    }
+  else if (N_MAGIC (*execp) == OMAGIC)
+    adata (abfd).magic = o_magic;
+  else
+    {
+      /* Should have been checked with N_BADMAG before this routine
+	 was called.  */
+      abort ();
+    }
+
+  bfd_get_start_address (abfd) = execp->a_entry;
+
+  obj_aout_symbols (abfd) = NULL;
+  bfd_get_symcount (abfd) = execp->a_syms / sizeof (struct external_nlist);
+
+  /* The default relocation entry size is that of traditional V7 Unix.  */
+  obj_reloc_entry_size (abfd) = RELOC_SIZE;
+
+  /* The default symbol entry size is that of traditional Unix.  */
+  obj_symbol_entry_size (abfd) = EXTERNAL_NLIST_SIZE;
+
+#ifdef USE_MMAP
+  bfd_init_window (&obj_aout_sym_window (abfd));
+  bfd_init_window (&obj_aout_string_window (abfd));
+#endif
+
+  obj_aout_external_syms (abfd) = NULL;
+  obj_aout_external_strings (abfd) = NULL;
+  obj_aout_sym_hashes (abfd) = NULL;
+
+  if (! NAME (aout, make_sections) (abfd))
+    return NULL;
+
+  obj_datasec (abfd)->size = execp->a_data;
+  obj_bsssec (abfd)->size = execp->a_bss;
+
+  obj_textsec (abfd)->flags =
+    (execp->a_trsize != 0
+     ? (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS | SEC_RELOC)
+     : (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS));
+  obj_datasec (abfd)->flags =
+    (execp->a_drsize != 0
+     ? (SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_HAS_CONTENTS | SEC_RELOC)
+     : (SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_HAS_CONTENTS));
+  obj_bsssec (abfd)->flags = SEC_ALLOC;
+
+#ifdef THIS_IS_ONLY_DOCUMENTATION
+  /* The common code can't fill in these things because they depend
+     on either the start address of the text segment, the rounding
+     up of virtual addresses between segments, or the starting file
+     position of the text segment -- all of which varies among different
+     versions of a.out.  */
+
+  /* Call back to the format-dependent code to fill in the rest of the
+     fields and do any further cleanup.  Things that should be filled
+     in by the callback:  */
+  struct exec *execp = exec_hdr (abfd);
+
+  obj_textsec (abfd)->size = N_TXTSIZE(*execp);
+  /* Data and bss are already filled in since they're so standard.  */
+
+  /* The virtual memory addresses of the sections.  */
+  obj_textsec (abfd)->vma = N_TXTADDR(*execp);
+  obj_datasec (abfd)->vma = N_DATADDR(*execp);
+  obj_bsssec  (abfd)->vma = N_BSSADDR(*execp);
+
+  /* The file offsets of the sections.  */
+  obj_textsec (abfd)->filepos = N_TXTOFF(*execp);
+  obj_datasec (abfd)->filepos = N_DATOFF(*execp);
+
+  /* The file offsets of the relocation info.  */
+  obj_textsec (abfd)->rel_filepos = N_TRELOFF(*execp);
+  obj_datasec (abfd)->rel_filepos = N_DRELOFF(*execp);
+
+  /* The file offsets of the string table and symbol table.  */
+  obj_str_filepos (abfd) = N_STROFF (*execp);
+  obj_sym_filepos (abfd) = N_SYMOFF (*execp);
+
+  /* Determine the architecture and machine type of the object file.  */
+  abfd->obj_arch = bfd_arch_obscure;
+
+  adata(abfd)->page_size = TARGET_PAGE_SIZE;
+  adata(abfd)->segment_size = SEGMENT_SIZE;
+  adata(abfd)->exec_bytes_size = EXEC_BYTES_SIZE;
+
+  return abfd->xvec;
+
+  /* The architecture is encoded in various ways in various a.out variants,
+     or is not encoded at all in some of them.  The relocation size depends
+     on the architecture and the a.out variant.  Finally, the return value
+     is the bfd_target vector in use.  If an error occurs, return zero and
+     set bfd_error to the appropriate error code.
+
+     Formats such as b.out, which have additional fields in the a.out
+     header, should cope with them in this callback as well.  */
+#endif	/* DOCUMENTATION */
+
+  result = (*callback_to_real_object_p)(abfd);
+
+  /* Now that the segment addresses have been worked out, take a better
+     guess at whether the file is executable.  If the entry point
+     is within the text segment, assume it is.  (This makes files
+     executable even if their entry point address is 0, as long as
+     their text starts at zero.).
+
+     This test had to be changed to deal with systems where the text segment
+     runs at a different location than the default.  The problem is that the
+     entry address can appear to be outside the text segment, thus causing an
+     erroneous conclusion that the file isn't executable.
+
+     To fix this, we now accept any non-zero entry point as an indication of
+     executability.  This will work most of the time, since only the linker
+     sets the entry point, and that is likely to be non-zero for most systems. */
+
+  if (execp->a_entry != 0
+      || (execp->a_entry >= obj_textsec(abfd)->vma
+	  && execp->a_entry < obj_textsec(abfd)->vma + obj_textsec(abfd)->size))
+    abfd->flags |= EXEC_P;
+#ifdef STAT_FOR_EXEC
+  else
+    {
+      struct stat stat_buf;
+
+      /* The original heuristic doesn't work in some important cases.
+        The a.out file has no information about the text start
+        address.  For files (like kernels) linked to non-standard
+        addresses (ld -Ttext nnn) the entry point may not be between
+        the default text start (obj_textsec(abfd)->vma) and
+        (obj_textsec(abfd)->vma) + text size.  This is not just a mach
+        issue.  Many kernels are loaded at non standard addresses.  */
+      if (abfd->iostream != NULL
+	  && (abfd->flags & BFD_IN_MEMORY) == 0
+	  && (fstat(fileno((FILE *) (abfd->iostream)), &stat_buf) == 0)
+	  && ((stat_buf.st_mode & 0111) != 0))
+	abfd->flags |= EXEC_P;
+    }
+#endif /* STAT_FOR_EXEC */
+
+  if (!result)
+    {
+      free (rawptr);
+      abfd->tdata.aout_data = oldrawptr;
+    }
+  return result;
+}
+
+/* Initialize ABFD for use with a.out files.  */
+
+bfd_boolean
+NAME (aout, mkobject) (bfd *abfd)
+{
+  struct aout_data_struct  *rawptr;
+  bfd_size_type amt = sizeof (struct aout_data_struct);
+
+  bfd_set_error (bfd_error_system_call);
+
+  /* Use an intermediate variable for clarity.  */
+  rawptr = bfd_zalloc (abfd, amt);
+
+  if (rawptr == NULL)
+    return FALSE;
+
+  abfd->tdata.aout_data = rawptr;
+  exec_hdr (abfd) = &(rawptr->e);
+
+  obj_textsec (abfd) = NULL;
+  obj_datasec (abfd) = NULL;
+  obj_bsssec (abfd)  = NULL;
+
+  return TRUE;
+}
+
+/* Keep track of machine architecture and machine type for
+   a.out's. Return the <<machine_type>> for a particular
+   architecture and machine, or <<M_UNKNOWN>> if that exact architecture
+   and machine can't be represented in a.out format.
+
+   If the architecture is understood, machine type 0 (default)
+   is always understood.  */
+
+enum machine_type
+NAME (aout, machine_type) (enum bfd_architecture arch,
+			   unsigned long machine,
+			   bfd_boolean *unknown)
+{
+  enum machine_type arch_flags;
+
+  arch_flags = M_UNKNOWN;
+  *unknown = TRUE;
+
+  switch (arch)
+    {
+    case bfd_arch_sparc:
+      if (machine == 0
+	  || machine == bfd_mach_sparc
+	  || machine == bfd_mach_sparc_sparclite
+	  || machine == bfd_mach_sparc_v9)
+	arch_flags = M_SPARC;
+      else if (machine == bfd_mach_sparc_sparclet)
+	arch_flags = M_SPARCLET;
+      break;
+
+    case bfd_arch_m68k:
+      switch (machine)
+	{
+	case 0:		      arch_flags = M_68010; break;
+	case bfd_mach_m68000: arch_flags = M_UNKNOWN; *unknown = FALSE; break;
+	case bfd_mach_m68010: arch_flags = M_68010; break;
+	case bfd_mach_m68020: arch_flags = M_68020; break;
+	default:	      arch_flags = M_UNKNOWN; break;
+	}
+      break;
+
+    case bfd_arch_i386:
+      if (machine == 0
+	  || machine == bfd_mach_i386_i386
+	  || machine == bfd_mach_i386_i386_intel_syntax)
+	arch_flags = M_386;
+      break;
+
+    case bfd_arch_arm:
+      if (machine == 0)	arch_flags = M_ARM;
+      break;
+
+    case bfd_arch_mips:
+      switch (machine)
+	{
+	case 0:
+	case 2000:
+	case bfd_mach_mips3000:
+          arch_flags = M_MIPS1;
+	  break;
+	case bfd_mach_mips4000: /* MIPS3 */
+	case bfd_mach_mips4400:
+	case bfd_mach_mips8000: /* MIPS4 */
+	case bfd_mach_mips6000: /* Real MIPS2: */
+          arch_flags = M_MIPS2;
+	  break;
+	default:
+	  arch_flags = M_UNKNOWN;
+	  break;
+	}
+      break;
+
+    case bfd_arch_ns32k:
+      switch (machine)
+	{
+	case 0:    		arch_flags = M_NS32532; break;
+	case 32032:		arch_flags = M_NS32032; break;
+	case 32532:		arch_flags = M_NS32532; break;
+	default:		arch_flags = M_UNKNOWN; break;
+	}
+      break;
+
+    case bfd_arch_pdp11:
+      /* TODO: arch_flags = M_PDP11; */
+      *unknown = FALSE;
+      break;
+
+    case bfd_arch_vax:
+      *unknown = FALSE;
+      break;
+
+    default:
+      arch_flags = M_UNKNOWN;
+    }
+
+  if (arch_flags != M_UNKNOWN)
+    *unknown = FALSE;
+
+  return arch_flags;
+}
+
+/* Set the architecture and the machine of the ABFD to the
+   values ARCH and MACHINE.  Verify that @ABFD's format
+   can support the architecture required.  */
+
+bfd_boolean
+NAME (aout, set_arch_mach) (bfd *abfd,
+			    enum bfd_architecture arch,
+			    unsigned long machine)
+{
+  if (! bfd_default_set_arch_mach (abfd, arch, machine))
+    return FALSE;
+
+  if (arch != bfd_arch_unknown)
+    {
+      bfd_boolean unknown;
+
+      NAME (aout, machine_type) (arch, machine, &unknown);
+      if (unknown)
+	return FALSE;
+    }
+
+  obj_reloc_entry_size (abfd) = RELOC_SIZE;
+
+  return (*aout_backend_info(abfd)->set_sizes) (abfd);
+}
+
+static void
+adjust_o_magic (bfd *abfd, struct internal_exec *execp)
+{
+  file_ptr pos = adata (abfd).exec_bytes_size;
+  bfd_vma vma = 0;
+  int pad = 0;
+
+  /* Text.  */
+  obj_textsec (abfd)->filepos = pos;
+  if (! obj_textsec (abfd)->user_set_vma)
+    obj_textsec (abfd)->vma = vma;
+  else
+    vma = obj_textsec (abfd)->vma;
+
+  pos += obj_textsec (abfd)->size;
+  vma += obj_textsec (abfd)->size;
+
+  /* Data.  */
+  if (!obj_datasec (abfd)->user_set_vma)
+    {
+      obj_textsec (abfd)->size += pad;
+      pos += pad;
+      vma += pad;
+      obj_datasec (abfd)->vma = vma;
+    }
+  else
+    vma = obj_datasec (abfd)->vma;
+  obj_datasec (abfd)->filepos = pos;
+  pos += obj_datasec (abfd)->size;
+  vma += obj_datasec (abfd)->size;
+
+  /* BSS.  */
+  if (! obj_bsssec (abfd)->user_set_vma)
+    {
+      obj_datasec (abfd)->size += pad;
+      pos += pad;
+      vma += pad;
+      obj_bsssec (abfd)->vma = vma;
+    }
+  else
+    {
+      /* The VMA of the .bss section is set by the VMA of the
+         .data section plus the size of the .data section.  We may
+         need to add padding bytes to make this true.  */
+      pad = obj_bsssec (abfd)->vma - vma;
+      if (pad > 0)
+	{
+	  obj_datasec (abfd)->size += pad;
+	  pos += pad;
+	}
+    }
+  obj_bsssec (abfd)->filepos = pos;
+
+  /* Fix up the exec header.  */
+  execp->a_text = obj_textsec (abfd)->size;
+  execp->a_data = obj_datasec (abfd)->size;
+  execp->a_bss  = obj_bsssec (abfd)->size;
+  N_SET_MAGIC (*execp, OMAGIC);
+}
+
+static void
+adjust_z_magic (bfd *abfd, struct internal_exec *execp)
+{
+  bfd_size_type data_pad, text_pad;
+  file_ptr text_end;
+  const struct aout_backend_data *abdp;
+  int ztih;			/* Nonzero if text includes exec header.  */
+
+  abdp = aout_backend_info (abfd);
+
+  /* Text.  */
+  ztih = (abdp != NULL
+	  && (abdp->text_includes_header
+	      || obj_aout_subformat (abfd) == q_magic_format));
+  obj_textsec(abfd)->filepos = (ztih
+				? adata(abfd).exec_bytes_size
+				: adata(abfd).zmagic_disk_block_size);
+  if (! obj_textsec(abfd)->user_set_vma)
+    {
+      /* ?? Do we really need to check for relocs here?  */
+      obj_textsec(abfd)->vma = ((abfd->flags & HAS_RELOC)
+				? 0
+				: (ztih
+				   ? (abdp->default_text_vma
+				      + adata (abfd).exec_bytes_size)
+				   : abdp->default_text_vma));
+      text_pad = 0;
+    }
+  else
+    {
+      /* The .text section is being loaded at an unusual address.  We
+         may need to pad it such that the .data section starts at a page
+         boundary.  */
+      if (ztih)
+	text_pad = ((obj_textsec (abfd)->filepos - obj_textsec (abfd)->vma)
+		    & (adata (abfd).page_size - 1));
+      else
+	text_pad = ((- obj_textsec (abfd)->vma)
+		    & (adata (abfd).page_size - 1));
+    }
+
+  /* Find start of data.  */
+  if (ztih)
+    {
+      text_end = obj_textsec (abfd)->filepos + obj_textsec (abfd)->size;
+      text_pad += BFD_ALIGN (text_end, adata (abfd).page_size) - text_end;
+    }
+  else
+    {
+      /* Note that if page_size == zmagic_disk_block_size, then
+	 filepos == page_size, and this case is the same as the ztih
+	 case.  */
+      text_end = obj_textsec (abfd)->size;
+      text_pad += BFD_ALIGN (text_end, adata (abfd).page_size) - text_end;
+      text_end += obj_textsec (abfd)->filepos;
+    }
+
+  obj_textsec (abfd)->size += text_pad;
+  text_end += text_pad;
+
+  /* Data.  */
+  if (!obj_datasec(abfd)->user_set_vma)
+    {
+      bfd_vma vma;
+      vma = obj_textsec(abfd)->vma + obj_textsec(abfd)->size;
+      obj_datasec(abfd)->vma = BFD_ALIGN (vma, adata(abfd).segment_size);
+    }
+  if (abdp && abdp->zmagic_mapped_contiguous)
+    {
+      text_pad = (obj_datasec(abfd)->vma
+		  - obj_textsec(abfd)->vma
+		  - obj_textsec(abfd)->size);
+      obj_textsec(abfd)->size += text_pad;
+    }
+  obj_datasec (abfd)->filepos = (obj_textsec (abfd)->filepos
+				+ obj_textsec (abfd)->size);
+
+  /* Fix up exec header while we're at it.  */
+  execp->a_text = obj_textsec(abfd)->size;
+  if (ztih && (!abdp || (abdp && !abdp->exec_header_not_counted)))
+    execp->a_text += adata(abfd).exec_bytes_size;
+  N_SET_MAGIC (*execp, ZMAGIC);
+
+  /* Spec says data section should be rounded up to page boundary.  */
+  obj_datasec(abfd)->size
+    = align_power (obj_datasec(abfd)->size,
+		   obj_bsssec(abfd)->alignment_power);
+  execp->a_data = BFD_ALIGN (obj_datasec(abfd)->size,
+			     adata(abfd).page_size);
+  data_pad = execp->a_data - obj_datasec(abfd)->size;
+
+  /* BSS.  */
+  if (!obj_bsssec(abfd)->user_set_vma)
+    obj_bsssec(abfd)->vma = (obj_datasec(abfd)->vma
+			     + obj_datasec(abfd)->size);
+  /* If the BSS immediately follows the data section and extra space
+     in the page is left after the data section, fudge data
+     in the header so that the bss section looks smaller by that
+     amount.  We'll start the bss section there, and lie to the OS.
+     (Note that a linker script, as well as the above assignment,
+     could have explicitly set the BSS vma to immediately follow
+     the data section.)  */
+  if (align_power (obj_bsssec(abfd)->vma, obj_bsssec(abfd)->alignment_power)
+      == obj_datasec(abfd)->vma + obj_datasec(abfd)->size)
+    execp->a_bss = (data_pad > obj_bsssec(abfd)->size) ? 0 :
+      obj_bsssec(abfd)->size - data_pad;
+  else
+    execp->a_bss = obj_bsssec(abfd)->size;
+}
+
+static void
+adjust_n_magic (bfd *abfd, struct internal_exec *execp)
+{
+  file_ptr pos = adata(abfd).exec_bytes_size;
+  bfd_vma vma = 0;
+  int pad;
+
+  /* Text.  */
+  obj_textsec(abfd)->filepos = pos;
+  if (!obj_textsec(abfd)->user_set_vma)
+    obj_textsec(abfd)->vma = vma;
+  else
+    vma = obj_textsec(abfd)->vma;
+  pos += obj_textsec(abfd)->size;
+  vma += obj_textsec(abfd)->size;
+
+  /* Data.  */
+  obj_datasec(abfd)->filepos = pos;
+  if (!obj_datasec(abfd)->user_set_vma)
+    obj_datasec(abfd)->vma = BFD_ALIGN (vma, adata(abfd).segment_size);
+  vma = obj_datasec(abfd)->vma;
+
+  /* Since BSS follows data immediately, see if it needs alignment.  */
+  vma += obj_datasec(abfd)->size;
+  pad = align_power (vma, obj_bsssec(abfd)->alignment_power) - vma;
+  obj_datasec(abfd)->size += pad;
+  pos += obj_datasec(abfd)->size;
+
+  /* BSS.  */
+  if (!obj_bsssec(abfd)->user_set_vma)
+    obj_bsssec(abfd)->vma = vma;
+  else
+    vma = obj_bsssec(abfd)->vma;
+
+  /* Fix up exec header.  */
+  execp->a_text = obj_textsec(abfd)->size;
+  execp->a_data = obj_datasec(abfd)->size;
+  execp->a_bss = obj_bsssec(abfd)->size;
+  N_SET_MAGIC (*execp, NMAGIC);
+}
+
+bfd_boolean
+NAME (aout, adjust_sizes_and_vmas) (bfd *abfd,
+				    bfd_size_type *text_size,
+				    file_ptr * text_end ATTRIBUTE_UNUSED)
+{
+  struct internal_exec *execp = exec_hdr (abfd);
+
+  if (! NAME (aout, make_sections) (abfd))
+    return FALSE;
+
+  if (adata(abfd).magic != undecided_magic)
+    return TRUE;
+
+  obj_textsec(abfd)->size =
+    align_power(obj_textsec(abfd)->size,
+		obj_textsec(abfd)->alignment_power);
+
+  *text_size = obj_textsec (abfd)->size;
+  /* Rule (heuristic) for when to pad to a new page.  Note that there
+     are (at least) two ways demand-paged (ZMAGIC) files have been
+     handled.  Most Berkeley-based systems start the text segment at
+     (TARGET_PAGE_SIZE).  However, newer versions of SUNOS start the text
+     segment right after the exec header; the latter is counted in the
+     text segment size, and is paged in by the kernel with the rest of
+     the text. */
+
+  /* This perhaps isn't the right way to do this, but made it simpler for me
+     to understand enough to implement it.  Better would probably be to go
+     right from BFD flags to alignment/positioning characteristics.  But the
+     old code was sloppy enough about handling the flags, and had enough
+     other magic, that it was a little hard for me to understand.  I think
+     I understand it better now, but I haven't time to do the cleanup this
+     minute.  */
+
+  if (abfd->flags & WP_TEXT)
+    adata(abfd).magic = n_magic;
+  else
+    adata(abfd).magic = o_magic;
+
+#ifdef BFD_AOUT_DEBUG /* requires gcc2 */
+#if __GNUC__ >= 2
+  fprintf (stderr, "%s text=<%x,%x,%x> data=<%x,%x,%x> bss=<%x,%x,%x>\n",
+	   ({ char *str;
+	      switch (adata(abfd).magic) {
+	      case n_magic: str = "NMAGIC"; break;
+	      case o_magic: str = "OMAGIC"; break;
+	      case z_magic: str = "ZMAGIC"; break;
+	      default: abort ();
+	      }
+	      str;
+	    }),
+	   obj_textsec(abfd)->vma, obj_textsec(abfd)->size,
+	   	obj_textsec(abfd)->alignment_power,
+	   obj_datasec(abfd)->vma, obj_datasec(abfd)->size,
+	   	obj_datasec(abfd)->alignment_power,
+	   obj_bsssec(abfd)->vma, obj_bsssec(abfd)->size,
+	   	obj_bsssec(abfd)->alignment_power);
+#endif
+#endif
+
+  switch (adata(abfd).magic)
+    {
+    case o_magic:
+      adjust_o_magic (abfd, execp);
+      break;
+    case z_magic:
+      adjust_z_magic (abfd, execp);
+      break;
+    case n_magic:
+      adjust_n_magic (abfd, execp);
+      break;
+    default:
+      abort ();
+    }
+
+#ifdef BFD_AOUT_DEBUG
+  fprintf (stderr, "       text=<%x,%x,%x> data=<%x,%x,%x> bss=<%x,%x>\n",
+	   obj_textsec(abfd)->vma, obj_textsec(abfd)->size,
+	   	obj_textsec(abfd)->filepos,
+	   obj_datasec(abfd)->vma, obj_datasec(abfd)->size,
+	   	obj_datasec(abfd)->filepos,
+	   obj_bsssec(abfd)->vma, obj_bsssec(abfd)->size);
+#endif
+
+  return TRUE;
+}
+
+/* Called by the BFD in response to a bfd_make_section request.  */
+
+bfd_boolean
+NAME (aout, new_section_hook) (bfd *abfd, asection *newsect)
+{
+  /* Align to double at least.  */
+  newsect->alignment_power = bfd_get_arch_info(abfd)->section_align_power;
+
+  if (bfd_get_format (abfd) == bfd_object)
+    {
+      if (obj_textsec (abfd) == NULL
+	  && !strcmp (newsect->name, ".text"))
+	{
+	  obj_textsec(abfd)= newsect;
+	  newsect->target_index = N_TEXT;
+	}
+      else if (obj_datasec (abfd) == NULL
+	       && !strcmp (newsect->name, ".data"))
+	{
+	  obj_datasec (abfd) = newsect;
+	  newsect->target_index = N_DATA;
+	}
+      else if (obj_bsssec (abfd) == NULL
+	       && !strcmp (newsect->name, ".bss"))
+	{
+	  obj_bsssec (abfd) = newsect;
+	  newsect->target_index = N_BSS;
+	}
+    }
+
+  /* We allow more than three sections internally.  */
+  return _bfd_generic_new_section_hook (abfd, newsect);
+}
+
+bfd_boolean
+NAME (aout, set_section_contents) (bfd *abfd,
+				   sec_ptr section,
+				   const void * location,
+				   file_ptr offset,
+				   bfd_size_type count)
+{
+  file_ptr text_end;
+  bfd_size_type text_size;
+
+  if (! abfd->output_has_begun)
+    {
+      if (! NAME (aout, adjust_sizes_and_vmas) (abfd, & text_size, & text_end))
+	return FALSE;
+    }
+
+  if (section == obj_bsssec (abfd))
+    {
+      bfd_set_error (bfd_error_no_contents);
+      return FALSE;
+    }
+
+  if (section != obj_textsec (abfd)
+      && section != obj_datasec (abfd))
+    {
+      (*_bfd_error_handler)
+	("%s: can not represent section `%s' in a.out object file format",
+	 bfd_get_filename (abfd), bfd_get_section_name (abfd, section));
+      bfd_set_error (bfd_error_nonrepresentable_section);
+      return FALSE;
+    }
+
+  if (count != 0)
+    {
+      if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0
+	  || bfd_bwrite (location, count, abfd) != count)
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Read the external symbols from an a.out file.  */
+
+static bfd_boolean
+aout_get_external_symbols (bfd *abfd)
+{
+  if (obj_aout_external_syms (abfd) == NULL)
+    {
+      bfd_size_type count;
+      struct external_nlist *syms;
+
+      count = exec_hdr (abfd)->a_syms / EXTERNAL_NLIST_SIZE;
+
+#ifdef USE_MMAP
+      if (! bfd_get_file_window (abfd, obj_sym_filepos (abfd),
+				 exec_hdr (abfd)->a_syms,
+				 &obj_aout_sym_window (abfd), TRUE))
+	return FALSE;
+      syms = (struct external_nlist *) obj_aout_sym_window (abfd).data;
+#else
+      /* We allocate using malloc to make the values easy to free
+	 later on.  If we put them on the objalloc it might not be
+	 possible to free them.  */
+      syms = bfd_malloc (count * EXTERNAL_NLIST_SIZE);
+      if (syms == NULL && count != 0)
+	return FALSE;
+
+      if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0
+	  || (bfd_bread (syms, exec_hdr (abfd)->a_syms, abfd)
+	      != exec_hdr (abfd)->a_syms))
+	{
+	  free (syms);
+	  return FALSE;
+	}
+#endif
+
+      obj_aout_external_syms (abfd) = syms;
+      obj_aout_external_sym_count (abfd) = count;
+    }
+
+  if (obj_aout_external_strings (abfd) == NULL
+      && exec_hdr (abfd)->a_syms != 0)
+    {
+      unsigned char string_chars[BYTES_IN_LONG];
+      bfd_size_type stringsize;
+      char *strings;
+
+      /* Get the size of the strings.  */
+      if (bfd_seek (abfd, obj_str_filepos (abfd), SEEK_SET) != 0
+	  || (bfd_bread ((void *) string_chars, (bfd_size_type) BYTES_IN_LONG,
+			abfd) != BYTES_IN_LONG))
+	return FALSE;
+      stringsize = H_GET_32 (abfd, string_chars);
+
+#ifdef USE_MMAP
+      if (! bfd_get_file_window (abfd, obj_str_filepos (abfd), stringsize,
+				 &obj_aout_string_window (abfd), TRUE))
+	return FALSE;
+      strings = (char *) obj_aout_string_window (abfd).data;
+#else
+      strings = bfd_malloc (stringsize + 1);
+      if (strings == NULL)
+	return FALSE;
+
+      /* Skip space for the string count in the buffer for convenience
+	 when using indexes.  */
+      if (bfd_bread (strings + 4, stringsize - 4, abfd) != stringsize - 4)
+	{
+	  free (strings);
+	  return FALSE;
+	}
+#endif
+      /* Ensure that a zero index yields an empty string.  */
+      strings[0] = '\0';
+
+      strings[stringsize - 1] = 0;
+
+      obj_aout_external_strings (abfd) = strings;
+      obj_aout_external_string_size (abfd) = stringsize;
+    }
+
+  return TRUE;
+}
+
+/* Translate an a.out symbol into a BFD symbol.  The desc, other, type
+   and symbol->value fields of CACHE_PTR will be set from the a.out
+   nlist structure.  This function is responsible for setting
+   symbol->flags and symbol->section, and adjusting symbol->value.  */
+
+static bfd_boolean
+translate_from_native_sym_flags (bfd *abfd,
+				 aout_symbol_type *cache_ptr)
+{
+  flagword visible;
+
+  if (cache_ptr->type == N_FN)
+    {
+      asection *sec;
+
+      /* This is a debugging symbol.  */
+      cache_ptr->symbol.flags = BSF_DEBUGGING;
+
+      /* Work out the symbol section.  */
+      switch (cache_ptr->type & N_TYPE)
+	{
+	case N_TEXT:
+	case N_FN:
+	  sec = obj_textsec (abfd);
+	  break;
+	case N_DATA:
+	  sec = obj_datasec (abfd);
+	  break;
+	case N_BSS:
+	  sec = obj_bsssec (abfd);
+	  break;
+	default:
+	case N_ABS:
+	  sec = bfd_abs_section_ptr;
+	  break;
+	}
+
+      cache_ptr->symbol.section = sec;
+      cache_ptr->symbol.value -= sec->vma;
+
+      return TRUE;
+    }
+
+  /* Get the default visibility.  This does not apply to all types, so
+     we just hold it in a local variable to use if wanted.  */
+  if ((cache_ptr->type & N_EXT) == 0)
+    visible = BSF_LOCAL;
+  else
+    visible = BSF_GLOBAL;
+
+  switch (cache_ptr->type)
+    {
+    default:
+    case N_ABS: case N_ABS | N_EXT:
+      cache_ptr->symbol.section = bfd_abs_section_ptr;
+      cache_ptr->symbol.flags = visible;
+      break;
+
+    case N_UNDF | N_EXT:
+      if (cache_ptr->symbol.value != 0)
+	{
+	  /* This is a common symbol.  */
+	  cache_ptr->symbol.flags = BSF_GLOBAL;
+	  cache_ptr->symbol.section = bfd_com_section_ptr;
+	}
+      else
+	{
+	  cache_ptr->symbol.flags = 0;
+	  cache_ptr->symbol.section = bfd_und_section_ptr;
+	}
+      break;
+
+    case N_TEXT: case N_TEXT | N_EXT:
+      cache_ptr->symbol.section = obj_textsec (abfd);
+      cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
+      cache_ptr->symbol.flags = visible;
+      break;
+
+    case N_DATA: case N_DATA | N_EXT:
+      cache_ptr->symbol.section = obj_datasec (abfd);
+      cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
+      cache_ptr->symbol.flags = visible;
+      break;
+
+    case N_BSS: case N_BSS | N_EXT:
+      cache_ptr->symbol.section = obj_bsssec (abfd);
+      cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
+      cache_ptr->symbol.flags = visible;
+      break;
+    }
+
+  return TRUE;
+}
+
+/* Set the fields of SYM_POINTER according to CACHE_PTR.  */
+
+static bfd_boolean
+translate_to_native_sym_flags (bfd *abfd,
+			       asymbol *cache_ptr,
+			       struct external_nlist *sym_pointer)
+{
+  bfd_vma value = cache_ptr->value;
+  asection *sec;
+  bfd_vma off;
+
+  /* Mask out any existing type bits in case copying from one section
+     to another.  */
+  sym_pointer->e_type[0] &= ~N_TYPE;
+
+  sec = bfd_get_section (cache_ptr);
+  off = 0;
+
+  if (sec == NULL)
+    {
+      /* This case occurs, e.g., for the *DEBUG* section of a COFF
+	 file.  */
+      (*_bfd_error_handler)
+	("%B: can not represent section for symbol `%s' in a.out object file format",
+	 abfd, cache_ptr->name != NULL ? cache_ptr->name : "*unknown*");
+      bfd_set_error (bfd_error_nonrepresentable_section);
+      return FALSE;
+    }
+
+  if (sec->output_section != NULL)
+    {
+      off = sec->output_offset;
+      sec = sec->output_section;
+    }
+
+  if (bfd_is_abs_section (sec))
+    sym_pointer->e_type[0] |= N_ABS;
+  else if (sec == obj_textsec (abfd))
+    sym_pointer->e_type[0] |= N_TEXT;
+  else if (sec == obj_datasec (abfd))
+    sym_pointer->e_type[0] |= N_DATA;
+  else if (sec == obj_bsssec (abfd))
+    sym_pointer->e_type[0] |= N_BSS;
+  else if (bfd_is_und_section (sec))
+    sym_pointer->e_type[0] = N_UNDF | N_EXT;
+  else if (bfd_is_com_section (sec))
+    sym_pointer->e_type[0] = N_UNDF | N_EXT;
+  else
+    {
+      (*_bfd_error_handler)
+	("%B: can not represent section `%A' in a.out object file format",
+	 abfd, sec);
+      bfd_set_error (bfd_error_nonrepresentable_section);
+      return FALSE;
+    }
+
+  /* Turn the symbol from section relative to absolute again */
+  value += sec->vma + off;
+
+  if ((cache_ptr->flags & BSF_DEBUGGING) != 0)
+    sym_pointer->e_type[0] = ((aout_symbol_type *) cache_ptr)->type;
+  else if ((cache_ptr->flags & BSF_GLOBAL) != 0)
+    sym_pointer->e_type[0] |= N_EXT;
+
+  PUT_WORD(abfd, value, sym_pointer->e_value);
+
+  return TRUE;
+}
+
+/* Native-level interface to symbols. */
+
+asymbol *
+NAME (aout, make_empty_symbol) (bfd *abfd)
+{
+  bfd_size_type amt = sizeof (aout_symbol_type);
+  aout_symbol_type *new_symbol_type = bfd_zalloc (abfd, amt);
+
+  if (!new_symbol_type)
+    return NULL;
+  new_symbol_type->symbol.the_bfd = abfd;
+
+  return &new_symbol_type->symbol;
+}
+
+/* Translate a set of internal symbols into external symbols.  */
+
+bfd_boolean
+NAME (aout, translate_symbol_table) (bfd *abfd,
+				     aout_symbol_type *in,
+				     struct external_nlist *ext,
+				     bfd_size_type count,
+				     char *str,
+				     bfd_size_type strsize,
+				     bfd_boolean dynamic)
+{
+  struct external_nlist *ext_end;
+
+  ext_end = ext + count;
+  for (; ext < ext_end; ext++, in++)
+    {
+      bfd_vma x;
+
+      x = GET_WORD (abfd, ext->e_strx);
+      in->symbol.the_bfd = abfd;
+
+      /* For the normal symbols, the zero index points at the number
+	 of bytes in the string table but is to be interpreted as the
+	 null string.  For the dynamic symbols, the number of bytes in
+	 the string table is stored in the __DYNAMIC structure and the
+	 zero index points at an actual string.  */
+      if (x == 0 && ! dynamic)
+	in->symbol.name = "";
+      else if (x < strsize)
+	in->symbol.name = str + x;
+      else
+	return FALSE;
+
+      in->symbol.value = GET_SWORD (abfd,  ext->e_value);
+      /* TODO: is 0 a safe value here?  */
+      in->desc = 0;
+      in->other = 0;
+      in->type = H_GET_8 (abfd,  ext->e_type);
+      in->symbol.udata.p = NULL;
+
+      if (! translate_from_native_sym_flags (abfd, in))
+	return FALSE;
+
+      if (dynamic)
+	in->symbol.flags |= BSF_DYNAMIC;
+    }
+
+  return TRUE;
+}
+
+/* We read the symbols into a buffer, which is discarded when this
+   function exits.  We read the strings into a buffer large enough to
+   hold them all plus all the cached symbol entries.  */
+
+bfd_boolean
+NAME (aout, slurp_symbol_table) (bfd *abfd)
+{
+  struct external_nlist *old_external_syms;
+  aout_symbol_type *cached;
+  bfd_size_type cached_size;
+
+  /* If there's no work to be done, don't do any.  */
+  if (obj_aout_symbols (abfd) != NULL)
+    return TRUE;
+
+  old_external_syms = obj_aout_external_syms (abfd);
+
+  if (! aout_get_external_symbols (abfd))
+    return FALSE;
+
+  cached_size = obj_aout_external_sym_count (abfd);
+  cached_size *= sizeof (aout_symbol_type);
+  cached = bfd_zmalloc (cached_size);
+  if (cached == NULL && cached_size != 0)
+    return FALSE;
+
+  /* Convert from external symbol information to internal.  */
+  if (! (NAME (aout, translate_symbol_table)
+	 (abfd, cached,
+	  obj_aout_external_syms (abfd),
+	  obj_aout_external_sym_count (abfd),
+	  obj_aout_external_strings (abfd),
+	  obj_aout_external_string_size (abfd),
+	  FALSE)))
+    {
+      free (cached);
+      return FALSE;
+    }
+
+  bfd_get_symcount (abfd) = obj_aout_external_sym_count (abfd);
+
+  obj_aout_symbols (abfd) = cached;
+
+  /* It is very likely that anybody who calls this function will not
+     want the external symbol information, so if it was allocated
+     because of our call to aout_get_external_symbols, we free it up
+     right away to save space.  */
+  if (old_external_syms == NULL
+      && obj_aout_external_syms (abfd) != NULL)
+    {
+#ifdef USE_MMAP
+      bfd_free_window (&obj_aout_sym_window (abfd));
+#else
+      free (obj_aout_external_syms (abfd));
+#endif
+      obj_aout_external_syms (abfd) = NULL;
+    }
+
+  return TRUE;
+}
+
+/* We use a hash table when writing out symbols so that we only write
+   out a particular string once.  This helps particularly when the
+   linker writes out stabs debugging entries, because each different
+   contributing object file tends to have many duplicate stabs
+   strings.
+
+   This hash table code breaks dbx on SunOS 4.1.3, so we don't do it
+   if BFD_TRADITIONAL_FORMAT is set.  */
+
+/* Get the index of a string in a strtab, adding it if it is not
+   already present.  */
+
+static INLINE bfd_size_type
+add_to_stringtab (bfd *abfd,
+		  struct bfd_strtab_hash *tab,
+		  const char *str,
+		  bfd_boolean copy)
+{
+  bfd_boolean hash;
+  bfd_size_type str_index;
+
+  /* An index of 0 always means the empty string.  */
+  if (str == 0 || *str == '\0')
+    return 0;
+
+  /* Don't hash if BFD_TRADITIONAL_FORMAT is set, because SunOS dbx
+     doesn't understand a hashed string table.  */
+  hash = TRUE;
+  if ((abfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
+    hash = FALSE;
+
+  str_index = _bfd_stringtab_add (tab, str, hash, copy);
+
+  if (str_index != (bfd_size_type) -1)
+    /* Add BYTES_IN_LONG to the return value to account for the
+       space taken up by the string table size.  */
+    str_index += BYTES_IN_LONG;
+
+  return str_index;
+}
+
+/* Write out a strtab.  ABFD is already at the right location in the
+   file.  */
+
+static bfd_boolean
+emit_stringtab (bfd *abfd, struct bfd_strtab_hash *tab)
+{
+  bfd_byte buffer[BYTES_IN_LONG];
+
+  /* The string table starts with the size.  */
+  H_PUT_32 (abfd, _bfd_stringtab_size (tab) + BYTES_IN_LONG, buffer);
+  if (bfd_bwrite ((void *) buffer, (bfd_size_type) BYTES_IN_LONG, abfd)
+      != BYTES_IN_LONG)
+    return FALSE;
+
+  return _bfd_stringtab_emit (abfd, tab);
+}
+
+bfd_boolean
+NAME (aout, write_syms) (bfd *abfd)
+{
+  unsigned int count ;
+  asymbol **generic = bfd_get_outsymbols (abfd);
+  struct bfd_strtab_hash *strtab;
+
+  strtab = _bfd_stringtab_init ();
+  if (strtab == NULL)
+    return FALSE;
+
+  for (count = 0; count < bfd_get_symcount (abfd); count++)
+    {
+      asymbol *g = generic[count];
+      bfd_size_type indx;
+      struct external_nlist nsp;
+
+      PUT_WORD (abfd, 0, nsp.e_unused);
+
+      indx = add_to_stringtab (abfd, strtab, g->name, FALSE);
+      if (indx == (bfd_size_type) -1)
+	goto error_return;
+      PUT_WORD (abfd, indx, nsp.e_strx);
+
+      if (bfd_asymbol_flavour(g) == abfd->xvec->flavour)
+	H_PUT_8 (abfd, aout_symbol(g)->type,  nsp.e_type);
+      else
+	H_PUT_8 (abfd, 0, nsp.e_type);
+
+      if (! translate_to_native_sym_flags (abfd, g, &nsp))
+	goto error_return;
+
+      H_PUT_8 (abfd, 0, nsp.e_ovly);
+
+      if (bfd_bwrite ((void *)&nsp, (bfd_size_type) EXTERNAL_NLIST_SIZE, abfd)
+	  != EXTERNAL_NLIST_SIZE)
+	goto error_return;
+
+      /* NB: `KEEPIT' currently overlays `udata.p', so set this only
+	 here, at the end.  */
+      g->KEEPIT = count;
+    }
+
+  if (! emit_stringtab (abfd, strtab))
+    goto error_return;
+
+  _bfd_stringtab_free (strtab);
+
+  return TRUE;
+
+error_return:
+  _bfd_stringtab_free (strtab);
+  return FALSE;
+}
+
+
+long
+NAME (aout, canonicalize_symtab) (bfd *abfd, asymbol **location)
+{
+  unsigned int counter = 0;
+  aout_symbol_type *symbase;
+
+  if (!NAME (aout, slurp_symbol_table) (abfd))
+    return -1;
+
+  for (symbase = obj_aout_symbols (abfd); counter++ < bfd_get_symcount (abfd);)
+    *(location++) = (asymbol *)(symbase++);
+  *location++ =0;
+  return bfd_get_symcount (abfd);
+}
+
+
+/* Output extended relocation information to a file in target byte order.  */
+
+static void
+pdp11_aout_swap_reloc_out (bfd *abfd, arelent *g, bfd_byte *natptr)
+{
+  int r_index;
+  int r_pcrel;
+  int reloc_entry;
+  int r_type;
+  asymbol *sym = *(g->sym_ptr_ptr);
+  asection *output_section = sym->section->output_section;
+
+  if (g->addend != 0)
+    fprintf (stderr, "BFD: can't do this reloc addend stuff\n");
+
+  r_pcrel = g->howto->pc_relative;
+
+  if (bfd_is_abs_section (output_section))
+    r_type = RABS;
+  else if (output_section == obj_textsec (abfd))
+    r_type = RTEXT;
+  else if (output_section == obj_datasec (abfd))
+    r_type = RDATA;
+  else if (output_section == obj_bsssec (abfd))
+    r_type = RBSS;
+  else if (bfd_is_und_section (output_section))
+    r_type = REXT;
+  else if (bfd_is_com_section (output_section))
+    r_type = REXT;
+  else
+    r_type = -1;
+
+  BFD_ASSERT (r_type != -1);
+
+  if (r_type == RABS)
+    r_index = 0;
+  else
+    r_index = (*(g->sym_ptr_ptr))->KEEPIT;
+
+  reloc_entry = r_index << 4 | r_type | r_pcrel;
+
+  PUT_WORD (abfd, reloc_entry, natptr);
+}
+
+/* BFD deals internally with all things based from the section they're
+   in. so, something in 10 bytes into a text section  with a base of
+   50 would have a symbol (.text+10) and know .text vma was 50.
+
+   Aout keeps all it's symbols based from zero, so the symbol would
+   contain 60. This macro subs the base of each section from the value
+   to give the true offset from the section */
+
+
+#define MOVE_ADDRESS(ad)       						\
+  if (r_extern) 							\
+    {									\
+      /* Undefined symbol.  */						\
+      cache_ptr->sym_ptr_ptr = symbols + r_index;			\
+      cache_ptr->addend = ad;						\
+    }									\
+  else									\
+    {									\
+      /* Defined, section relative. replace symbol with pointer to    	\
+	 symbol which points to section.  */				\
+      switch (r_index)							\
+	{								\
+	case N_TEXT:							\
+	case N_TEXT | N_EXT:						\
+	  cache_ptr->sym_ptr_ptr  = obj_textsec (abfd)->symbol_ptr_ptr;	\
+	  cache_ptr->addend = ad  - su->textsec->vma;			\
+	  break;							\
+	case N_DATA:							\
+	case N_DATA | N_EXT:						\
+	  cache_ptr->sym_ptr_ptr  = obj_datasec (abfd)->symbol_ptr_ptr;	\
+	  cache_ptr->addend = ad - su->datasec->vma;			\
+	  break;							\
+	case N_BSS:							\
+	case N_BSS | N_EXT:						\
+	  cache_ptr->sym_ptr_ptr  = obj_bsssec (abfd)->symbol_ptr_ptr;	\
+	  cache_ptr->addend = ad - su->bsssec->vma;			\
+	  break;							\
+	default:							\
+	case N_ABS:							\
+	case N_ABS | N_EXT:						\
+	  cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;	\
+	  cache_ptr->addend = ad;					\
+	  break;							\
+	}								\
+    }
+
+static void
+pdp11_aout_swap_reloc_in (bfd *          abfd,
+			  bfd_byte *     bytes,
+			  arelent *      cache_ptr,
+			  bfd_size_type  offset,
+			  asymbol **     symbols,
+			  bfd_size_type  symcount)
+{
+  struct aoutdata *su = &(abfd->tdata.aout_data->a);
+  unsigned int r_index;
+  int reloc_entry;
+  int r_extern;
+  int r_pcrel;
+
+  reloc_entry = GET_WORD (abfd, (void *) bytes);
+
+  r_pcrel = reloc_entry & RELFLG;
+
+  cache_ptr->address = offset;
+  cache_ptr->howto = howto_table_pdp11 + (r_pcrel ? 1 : 0);
+
+  if ((reloc_entry & RTYPE) == RABS)
+    r_index = N_ABS;
+  else
+    r_index = RINDEX (reloc_entry);
+
+  /* r_extern reflects whether the symbol the reloc is against is
+     local or global.  */
+  r_extern = (reloc_entry & RTYPE) == REXT;
+
+  if (r_extern && r_index > symcount)
+    {
+      /* We could arrange to return an error, but it might be useful
+         to see the file even if it is bad.  */
+      r_extern = 0;
+      r_index = N_ABS;
+    }
+
+  MOVE_ADDRESS(0);
+}
+
+/* Read and swap the relocs for a section.  */
+
+bfd_boolean
+NAME (aout, slurp_reloc_table) (bfd *abfd, sec_ptr asect, asymbol **symbols)
+{
+  bfd_byte *rptr;
+  bfd_size_type count;
+  bfd_size_type reloc_size;
+  void * relocs;
+  arelent *reloc_cache;
+  size_t each_size;
+  unsigned int counter = 0;
+  arelent *cache_ptr;
+
+  if (asect->relocation)
+    return TRUE;
+
+  if (asect->flags & SEC_CONSTRUCTOR)
+    return TRUE;
+
+  if (asect == obj_datasec (abfd))
+    reloc_size = exec_hdr(abfd)->a_drsize;
+  else if (asect == obj_textsec (abfd))
+    reloc_size = exec_hdr(abfd)->a_trsize;
+  else if (asect == obj_bsssec (abfd))
+    reloc_size = 0;
+  else
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0)
+    return FALSE;
+
+  each_size = obj_reloc_entry_size (abfd);
+
+  relocs = bfd_malloc (reloc_size);
+  if (relocs == NULL && reloc_size != 0)
+    return FALSE;
+
+  if (bfd_bread (relocs, reloc_size, abfd) != reloc_size)
+    {
+      free (relocs);
+      return FALSE;
+    }
+
+  count = reloc_size / each_size;
+
+  /* Count the number of NON-ZERO relocs, this is the count we want.  */
+  {
+    unsigned int real_count = 0;
+
+    for (counter = 0; counter < count; counter++)
+      {
+	int x;
+
+	x = GET_WORD (abfd, (char *) relocs + each_size * counter);
+	if (x != 0)
+	  real_count++;
+      }
+
+    count = real_count;
+  }
+
+  reloc_cache = bfd_zmalloc (count * sizeof (arelent));
+  if (reloc_cache == NULL && count != 0)
+    return FALSE;
+
+  cache_ptr = reloc_cache;
+
+  rptr = relocs;
+  for (counter = 0;
+       counter < count;
+       counter++, rptr += RELOC_SIZE, cache_ptr++)
+    {
+      while (GET_WORD (abfd, (void *) rptr) == 0)
+	{
+	  rptr += RELOC_SIZE;
+	  if ((char *) rptr >= (char *) relocs + reloc_size)
+	    goto done;
+	}
+
+      pdp11_aout_swap_reloc_in (abfd, rptr, cache_ptr,
+				(bfd_size_type) ((char *) rptr - (char *) relocs),
+				symbols,
+				(bfd_size_type) bfd_get_symcount (abfd));
+    }
+ done:
+  /* Just in case, if rptr >= relocs + reloc_size should happen
+     too early.  */
+  BFD_ASSERT (counter == count);
+
+  free (relocs);
+
+  asect->relocation = reloc_cache;
+  asect->reloc_count = cache_ptr - reloc_cache;
+
+  return TRUE;
+}
+
+/* Write out a relocation section into an object file.  */
+
+bfd_boolean
+NAME (aout, squirt_out_relocs) (bfd *abfd, asection *section)
+{
+  arelent **generic;
+  unsigned char *native;
+  unsigned int count = section->reloc_count;
+  bfd_size_type natsize;
+
+  natsize = section->size;
+  native = bfd_zalloc (abfd, natsize);
+  if (!native)
+    return FALSE;
+
+  generic = section->orelocation;
+  if (generic != NULL)
+    {
+      while (count > 0)
+	{
+	  bfd_byte *r;
+
+	  r = native + (*generic)->address;
+	  pdp11_aout_swap_reloc_out (abfd, *generic, r);
+	  count--;
+	  generic++;
+	}
+    }
+
+  if (bfd_bwrite ((void *) native, natsize, abfd) != natsize)
+    {
+      bfd_release (abfd, native);
+      return FALSE;
+    }
+
+  bfd_release (abfd, native);
+  return TRUE;
+}
+
+/* This is stupid.  This function should be a boolean predicate.  */
+
+long
+NAME (aout, canonicalize_reloc) (bfd *abfd,
+				 sec_ptr section,
+				 arelent **relptr,
+				 asymbol **symbols)
+{
+  arelent *tblptr = section->relocation;
+  unsigned int count;
+
+  if (section == obj_bsssec (abfd))
+    {
+      *relptr = NULL;
+      return 0;
+    }
+
+  if (!(tblptr || NAME (aout, slurp_reloc_table)(abfd, section, symbols)))
+    return -1;
+
+  if (section->flags & SEC_CONSTRUCTOR)
+    {
+      arelent_chain *chain = section->constructor_chain;
+
+      for (count = 0; count < section->reloc_count; count ++)
+	{
+	  *relptr ++ = &chain->relent;
+	  chain = chain->next;
+	}
+    }
+  else
+    {
+      tblptr = section->relocation;
+
+      for (count = 0; count++ < section->reloc_count;)
+	*relptr++ = tblptr++;
+    }
+
+  *relptr = 0;
+
+  return section->reloc_count;
+}
+
+long
+NAME (aout, get_reloc_upper_bound) (bfd *abfd, sec_ptr asect)
+{
+  if (bfd_get_format (abfd) != bfd_object)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return -1;
+    }
+
+  if (asect->flags & SEC_CONSTRUCTOR)
+    return (sizeof (arelent *) * (asect->reloc_count + 1));
+
+  if (asect == obj_datasec (abfd))
+    return (sizeof (arelent *)
+	    * ((exec_hdr (abfd)->a_drsize / obj_reloc_entry_size (abfd))
+	       + 1));
+
+  if (asect == obj_textsec (abfd))
+    return (sizeof (arelent *)
+	    * ((exec_hdr (abfd)->a_trsize / obj_reloc_entry_size (abfd))
+	       + 1));
+
+  /* TODO: why are there two if statements for obj_bsssec()? */
+
+  if (asect == obj_bsssec (abfd))
+    return sizeof (arelent *);
+
+  if (asect == obj_bsssec (abfd))
+    return 0;
+
+  bfd_set_error (bfd_error_invalid_operation);
+  return -1;
+}
+
+
+long
+NAME (aout, get_symtab_upper_bound) (bfd *abfd)
+{
+  if (!NAME (aout, slurp_symbol_table) (abfd))
+    return -1;
+
+  return (bfd_get_symcount (abfd) + 1) * (sizeof (aout_symbol_type *));
+}
+
+alent *
+NAME (aout, get_lineno) (bfd * abfd ATTRIBUTE_UNUSED,
+			 asymbol * symbol ATTRIBUTE_UNUSED)
+{
+  return NULL;
+}
+
+void
+NAME (aout, get_symbol_info) (bfd * abfd ATTRIBUTE_UNUSED,
+			      asymbol *symbol,
+			      symbol_info *ret)
+{
+  bfd_symbol_info (symbol, ret);
+
+  if (ret->type == '?')
+    {
+      int type_code = aout_symbol(symbol)->type & 0xff;
+      const char *stab_name = bfd_get_stab_name (type_code);
+      static char buf[10];
+
+      if (stab_name == NULL)
+	{
+	  sprintf(buf, "(%d)", type_code);
+	  stab_name = buf;
+	}
+      ret->type = '-';
+      ret->stab_type  = type_code;
+      ret->stab_other = (unsigned) (aout_symbol(symbol)->other & 0xff);
+      ret->stab_desc  = (unsigned) (aout_symbol(symbol)->desc & 0xffff);
+      ret->stab_name  = stab_name;
+    }
+}
+
+void
+NAME (aout, print_symbol) (bfd * abfd,
+			   void * afile,
+			   asymbol *symbol,
+			   bfd_print_symbol_type how)
+{
+  FILE *file = (FILE *) afile;
+
+  switch (how)
+    {
+    case bfd_print_symbol_name:
+      if (symbol->name)
+	fprintf(file,"%s", symbol->name);
+      break;
+    case bfd_print_symbol_more:
+      fprintf(file,"%4x %2x %2x",
+	      (unsigned) (aout_symbol (symbol)->desc & 0xffff),
+	      (unsigned) (aout_symbol (symbol)->other & 0xff),
+	      (unsigned) (aout_symbol (symbol)->type));
+      break;
+    case bfd_print_symbol_all:
+      {
+	const char *section_name = symbol->section->name;
+
+	bfd_print_symbol_vandf (abfd, (void *) file, symbol);
+
+	fprintf (file," %-5s %04x %02x %02x",
+		 section_name,
+		 (unsigned) (aout_symbol (symbol)->desc & 0xffff),
+		 (unsigned) (aout_symbol (symbol)->other & 0xff),
+		 (unsigned) (aout_symbol (symbol)->type  & 0xff));
+	if (symbol->name)
+	  fprintf(file," %s", symbol->name);
+      }
+      break;
+    }
+}
+
+/* If we don't have to allocate more than 1MB to hold the generic
+   symbols, we use the generic minisymbol method: it's faster, since
+   it only translates the symbols once, not multiple times.  */
+#define MINISYM_THRESHOLD (1000000 / sizeof (asymbol))
+
+/* Read minisymbols.  For minisymbols, we use the unmodified a.out
+   symbols.  The minisymbol_to_symbol function translates these into
+   BFD asymbol structures.  */
+
+long
+NAME (aout, read_minisymbols) (bfd *abfd,
+			       bfd_boolean dynamic,
+			       void * *minisymsp,
+			       unsigned int *sizep)
+{
+  if (dynamic)
+    /* We could handle the dynamic symbols here as well, but it's
+       easier to hand them off.  */
+    return _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep);
+
+  if (! aout_get_external_symbols (abfd))
+    return -1;
+
+  if (obj_aout_external_sym_count (abfd) < MINISYM_THRESHOLD)
+    return _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep);
+
+  *minisymsp = (void *) obj_aout_external_syms (abfd);
+
+  /* By passing the external symbols back from this routine, we are
+     giving up control over the memory block.  Clear
+     obj_aout_external_syms, so that we do not try to free it
+     ourselves.  */
+  obj_aout_external_syms (abfd) = NULL;
+
+  *sizep = EXTERNAL_NLIST_SIZE;
+  return obj_aout_external_sym_count (abfd);
+}
+
+/* Convert a minisymbol to a BFD asymbol.  A minisymbol is just an
+   unmodified a.out symbol.  The SYM argument is a structure returned
+   by bfd_make_empty_symbol, which we fill in here.  */
+
+asymbol *
+NAME (aout, minisymbol_to_symbol) (bfd *abfd,
+				   bfd_boolean dynamic,
+				   const void * minisym,
+				   asymbol *sym)
+{
+  if (dynamic
+      || obj_aout_external_sym_count (abfd) < MINISYM_THRESHOLD)
+    return _bfd_generic_minisymbol_to_symbol (abfd, dynamic, minisym, sym);
+
+  memset (sym, 0, sizeof (aout_symbol_type));
+
+  /* We call translate_symbol_table to translate a single symbol.  */
+  if (! (NAME (aout, translate_symbol_table)
+	 (abfd,
+	  (aout_symbol_type *) sym,
+	  (struct external_nlist *) minisym,
+	  (bfd_size_type) 1,
+	  obj_aout_external_strings (abfd),
+	  obj_aout_external_string_size (abfd),
+	  FALSE)))
+    return NULL;
+
+  return sym;
+}
+
+/* Provided a BFD, a section and an offset into the section, calculate
+   and return the name of the source file and the line nearest to the
+   wanted location.  */
+
+bfd_boolean
+NAME (aout, find_nearest_line) (bfd *abfd,
+				asection *section,
+				asymbol **symbols,
+				bfd_vma offset,
+				const char **filename_ptr,
+				const char **functionname_ptr,
+				unsigned int *line_ptr)
+{
+  /* Run down the file looking for the filename, function and linenumber.  */
+  asymbol **p;
+  const char *directory_name = NULL;
+  const char *main_file_name = NULL;
+  const char *current_file_name = NULL;
+  const char *line_file_name = NULL; /* Value of current_file_name at line number.  */
+  bfd_vma low_line_vma = 0;
+  bfd_vma low_func_vma = 0;
+  asymbol *func = 0;
+  size_t filelen, funclen;
+  char *buf;
+
+  *filename_ptr = abfd->filename;
+  *functionname_ptr = 0;
+  *line_ptr = 0;
+
+  if (symbols != NULL)
+    {
+      for (p = symbols; *p; p++)
+	{
+	  aout_symbol_type  *q = (aout_symbol_type *)(*p);
+	next:
+	  switch (q->type)
+	    {
+	    case N_TEXT:
+	      /* If this looks like a file name symbol, and it comes after
+		 the line number we have found so far, but before the
+		 offset, then we have probably not found the right line
+		 number.  */
+	      if (q->symbol.value <= offset
+		  && ((q->symbol.value > low_line_vma
+		       && (line_file_name != NULL
+			   || *line_ptr != 0))
+		      || (q->symbol.value > low_func_vma
+			  && func != NULL)))
+		{
+		  const char * symname;
+
+		  symname = q->symbol.name;
+		  if (strcmp (symname + strlen (symname) - 2, ".o") == 0)
+		    {
+		      if (q->symbol.value > low_line_vma)
+			{
+			  *line_ptr = 0;
+			  line_file_name = NULL;
+			}
+		      if (q->symbol.value > low_func_vma)
+			func = NULL;
+		    }
+		}
+	      break;
+
+	    case N_SO:
+	      /* If this symbol is less than the offset, but greater than
+		 the line number we have found so far, then we have not
+		 found the right line number.  */
+	      if (q->symbol.value <= offset)
+		{
+		  if (q->symbol.value > low_line_vma)
+		    {
+		      *line_ptr = 0;
+		      line_file_name = NULL;
+		    }
+		  if (q->symbol.value > low_func_vma)
+		    func = NULL;
+		}
+
+	      main_file_name = current_file_name = q->symbol.name;
+	      /* Look ahead to next symbol to check if that too is an N_SO.  */
+	      p++;
+	      if (*p == NULL)
+		break;
+	      q = (aout_symbol_type *)(*p);
+	      if (q->type != (int) N_SO)
+		goto next;
+
+	      /* Found a second N_SO  First is directory; second is filename.  */
+	      directory_name = current_file_name;
+	      main_file_name = current_file_name = q->symbol.name;
+	      if (obj_textsec(abfd) != section)
+		goto done;
+	      break;
+	    case N_SOL:
+	      current_file_name = q->symbol.name;
+	      break;
+
+	    case N_SLINE:
+	    case N_DSLINE:
+	    case N_BSLINE:
+	      /* We'll keep this if it resolves nearer than the one we have
+		 already.  */
+	      if (q->symbol.value >= low_line_vma
+		  && q->symbol.value <= offset)
+		{
+		  *line_ptr = q->desc;
+		  low_line_vma = q->symbol.value;
+		  line_file_name = current_file_name;
+		}
+	      break;
+
+	    case N_FUN:
+	      {
+		/* We'll keep this if it is nearer than the one we have already.  */
+		if (q->symbol.value >= low_func_vma &&
+		    q->symbol.value <= offset)
+		  {
+		    low_func_vma = q->symbol.value;
+		    func = (asymbol *) q;
+		  }
+		else if (q->symbol.value > offset)
+		  goto done;
+	      }
+	      break;
+	    }
+	}
+    }
+
+ done:
+  if (*line_ptr != 0)
+    main_file_name = line_file_name;
+
+  if (main_file_name == NULL
+      || main_file_name[0] == '/'
+      || directory_name == NULL)
+    filelen = 0;
+  else
+    filelen = strlen (directory_name) + strlen (main_file_name);
+  if (func == NULL)
+    funclen = 0;
+  else
+    funclen = strlen (bfd_asymbol_name (func));
+
+  if (adata (abfd).line_buf != NULL)
+    free (adata (abfd).line_buf);
+  if (filelen + funclen == 0)
+    adata (abfd).line_buf = buf = NULL;
+  else
+    {
+      buf = bfd_malloc ((bfd_size_type) filelen + funclen + 3);
+      adata (abfd).line_buf = buf;
+      if (buf == NULL)
+	return FALSE;
+    }
+
+  if (main_file_name != NULL)
+    {
+      if (main_file_name[0] == '/' || directory_name == NULL)
+	*filename_ptr = main_file_name;
+      else
+	{
+	  sprintf (buf, "%s%s", directory_name, main_file_name);
+	  *filename_ptr = buf;
+	  buf += filelen + 1;
+	}
+    }
+
+  if (func)
+    {
+      const char *function = func->name;
+      char *colon;
+
+      /* The caller expects a symbol name.  We actually have a
+	 function name, without the leading underscore.  Put the
+	 underscore back in, so that the caller gets a symbol name.  */
+      if (bfd_get_symbol_leading_char (abfd) == '\0')
+	strcpy (buf, function);
+      else
+	{
+	  buf[0] = bfd_get_symbol_leading_char (abfd);
+	  strcpy (buf + 1, function);
+	}
+
+      /* Have to remove : stuff.  */
+      colon = strchr (buf, ':');
+      if (colon != NULL)
+	*colon = '\0';
+      *functionname_ptr = buf;
+    }
+
+  return TRUE;
+}
+
+int
+NAME (aout, sizeof_headers) (bfd *abfd,
+			     struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return adata (abfd).exec_bytes_size;
+}
+
+/* Free all information we have cached for this BFD.  We can always
+   read it again later if we need it.  */
+
+bfd_boolean
+NAME (aout, bfd_free_cached_info) (bfd *abfd)
+{
+  asection *o;
+
+  if (bfd_get_format (abfd) != bfd_object)
+    return TRUE;
+
+#define BFCI_FREE(x) if (x != NULL) { free (x); x = NULL; }
+  BFCI_FREE (obj_aout_symbols (abfd));
+
+#ifdef USE_MMAP
+  obj_aout_external_syms (abfd) = 0;
+  bfd_free_window (&obj_aout_sym_window (abfd));
+  bfd_free_window (&obj_aout_string_window (abfd));
+  obj_aout_external_strings (abfd) = 0;
+#else
+  BFCI_FREE (obj_aout_external_syms (abfd));
+  BFCI_FREE (obj_aout_external_strings (abfd));
+#endif
+  for (o = abfd->sections; o != NULL; o = o->next)
+    BFCI_FREE (o->relocation);
+#undef BFCI_FREE
+
+  return TRUE;
+}
+
+/* Routine to create an entry in an a.out link hash table.  */
+
+struct bfd_hash_entry *
+NAME (aout, link_hash_newfunc) (struct bfd_hash_entry *entry,
+				struct bfd_hash_table *table,
+				const char *string)
+{
+  struct aout_link_hash_entry *ret = (struct aout_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = bfd_hash_allocate (table, sizeof (* ret));
+  if (ret == NULL)
+    return NULL;
+
+  /* Call the allocation method of the superclass.  */
+  ret = (struct aout_link_hash_entry *)
+	 _bfd_link_hash_newfunc ((struct bfd_hash_entry *) ret, table, string);
+  if (ret)
+    {
+      /* Set local fields.  */
+      ret->written = FALSE;
+      ret->indx = -1;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Initialize an a.out link hash table.  */
+
+bfd_boolean
+NAME (aout, link_hash_table_init) (struct aout_link_hash_table *table,
+				   bfd *abfd,
+				   struct bfd_hash_entry *(*newfunc) (struct bfd_hash_entry *,
+								     struct bfd_hash_table *,
+								     const char *),
+				   unsigned int entsize)
+{
+  return _bfd_link_hash_table_init (&table->root, abfd, newfunc, entsize);
+}
+
+/* Create an a.out link hash table.  */
+
+struct bfd_link_hash_table *
+NAME (aout, link_hash_table_create) (bfd *abfd)
+{
+  struct aout_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct aout_link_hash_table);
+
+  ret = bfd_alloc (abfd, amt);
+  if (ret == NULL)
+    return NULL;
+  if (! NAME (aout, link_hash_table_init) (ret, abfd,
+					   NAME (aout, link_hash_newfunc),
+					   sizeof (struct aout_link_hash_entry)))
+    {
+      free (ret);
+      return NULL;
+    }
+  return &ret->root;
+}
+
+/* Free up the internal symbols read from an a.out file.  */
+
+static bfd_boolean
+aout_link_free_symbols (bfd *abfd)
+{
+  if (obj_aout_external_syms (abfd) != NULL)
+    {
+#ifdef USE_MMAP
+      bfd_free_window (&obj_aout_sym_window (abfd));
+#else
+      free ((void *) obj_aout_external_syms (abfd));
+#endif
+      obj_aout_external_syms (abfd) = NULL;
+    }
+
+  if (obj_aout_external_strings (abfd) != NULL)
+    {
+#ifdef USE_MMAP
+      bfd_free_window (&obj_aout_string_window (abfd));
+#else
+      free ((void *) obj_aout_external_strings (abfd));
+#endif
+      obj_aout_external_strings (abfd) = NULL;
+    }
+  return TRUE;
+}
+
+/* Given an a.out BFD, add symbols to the global hash table as
+   appropriate.  */
+
+bfd_boolean
+NAME (aout, link_add_symbols) (bfd *abfd, struct bfd_link_info *info)
+{
+  switch (bfd_get_format (abfd))
+    {
+    case bfd_object:
+      return aout_link_add_object_symbols (abfd, info);
+    case bfd_archive:
+      return _bfd_generic_link_add_archive_symbols
+	(abfd, info, aout_link_check_archive_element);
+    default:
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+}
+
+/* Add symbols from an a.out object file.  */
+
+static bfd_boolean
+aout_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  if (! aout_get_external_symbols (abfd))
+    return FALSE;
+  if (! aout_link_add_symbols (abfd, info))
+    return FALSE;
+  if (! info->keep_memory)
+    {
+      if (! aout_link_free_symbols (abfd))
+	return FALSE;
+    }
+  return TRUE;
+}
+
+/* Look through the internal symbols to see if this object file should
+   be included in the link.  We should include this object file if it
+   defines any symbols which are currently undefined.  If this object
+   file defines a common symbol, then we may adjust the size of the
+   known symbol but we do not include the object file in the link
+   (unless there is some other reason to include it).  */
+
+static bfd_boolean
+aout_link_check_ar_symbols (bfd *abfd,
+			    struct bfd_link_info *info,
+			    bfd_boolean *pneeded,
+			    bfd **subsbfd)
+{
+  struct external_nlist *p;
+  struct external_nlist *pend;
+  char *strings;
+
+  *pneeded = FALSE;
+
+  /* Look through all the symbols.  */
+  p = obj_aout_external_syms (abfd);
+  pend = p + obj_aout_external_sym_count (abfd);
+  strings = obj_aout_external_strings (abfd);
+  for (; p < pend; p++)
+    {
+      int type = H_GET_8 (abfd, p->e_type);
+      const char *name;
+      struct bfd_link_hash_entry *h;
+
+      /* Ignore symbols that are not externally visible.  This is an
+	 optimization only, as we check the type more thoroughly
+	 below.  */
+      if ((type & N_EXT) == 0
+	  || type == N_FN)
+	continue;
+
+      name = strings + GET_WORD (abfd, p->e_strx);
+      h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE);
+
+      /* We are only interested in symbols that are currently
+	 undefined or common.  */
+      if (h == NULL
+	  || (h->type != bfd_link_hash_undefined
+	      && h->type != bfd_link_hash_common))
+	continue;
+
+      if (type == (N_TEXT | N_EXT)
+	  || type == (N_DATA | N_EXT)
+	  || type == (N_BSS | N_EXT)
+	  || type == (N_ABS | N_EXT))
+	{
+	  /* This object file defines this symbol.  We must link it
+	     in.  This is true regardless of whether the current
+	     definition of the symbol is undefined or common.  If the
+	     current definition is common, we have a case in which we
+	     have already seen an object file including
+	         int a;
+	     and this object file from the archive includes
+	         int a = 5;
+	     In such a case we must include this object file.
+
+	     FIXME: The SunOS 4.1.3 linker will pull in the archive
+	     element if the symbol is defined in the .data section,
+	     but not if it is defined in the .text section.  That
+	     seems a bit crazy to me, and I haven't implemented it.
+	     However, it might be correct.  */
+	  if (!(*info->callbacks
+		->add_archive_element) (info, abfd, name, subsbfd))
+	    return FALSE;
+	  *pneeded = TRUE;
+	  return TRUE;
+	}
+
+      if (type == (N_UNDF | N_EXT))
+	{
+	  bfd_vma value;
+
+	  value = GET_WORD (abfd, p->e_value);
+	  if (value != 0)
+	    {
+	      /* This symbol is common in the object from the archive
+		 file.  */
+	      if (h->type == bfd_link_hash_undefined)
+		{
+		  bfd *symbfd;
+		  unsigned int power;
+
+		  symbfd = h->u.undef.abfd;
+		  if (symbfd == NULL)
+		    {
+		      /* This symbol was created as undefined from
+			 outside BFD.  We assume that we should link
+			 in the object file.  This is done for the -u
+			 option in the linker.  */
+		      if (!(*info->callbacks
+			    ->add_archive_element) (info, abfd, name, subsbfd))
+			return FALSE;
+		      *pneeded = TRUE;
+		      return TRUE;
+		    }
+		  /* Turn the current link symbol into a common
+		     symbol.  It is already on the undefs list.  */
+		  h->type = bfd_link_hash_common;
+		  h->u.c.p = bfd_hash_allocate (&info->hash->table,
+						sizeof (struct bfd_link_hash_common_entry));
+		  if (h->u.c.p == NULL)
+		    return FALSE;
+
+		  h->u.c.size = value;
+
+		  /* FIXME: This isn't quite right.  The maximum
+		     alignment of a common symbol should be set by the
+		     architecture of the output file, not of the input
+		     file.  */
+		  power = bfd_log2 (value);
+		  if (power > bfd_get_arch_info (abfd)->section_align_power)
+		    power = bfd_get_arch_info (abfd)->section_align_power;
+		  h->u.c.p->alignment_power = power;
+
+		  h->u.c.p->section = bfd_make_section_old_way (symbfd,
+								"COMMON");
+		}
+	      else
+		{
+		  /* Adjust the size of the common symbol if
+		     necessary.  */
+		  if (value > h->u.c.size)
+		    h->u.c.size = value;
+		}
+	    }
+	}
+    }
+
+  /* We do not need this object file.  */
+  return TRUE;
+}
+
+/* Check a single archive element to see if we need to include it in
+   the link.  *PNEEDED is set according to whether this element is
+   needed in the link or not.  This is called from
+   _bfd_generic_link_add_archive_symbols.  */
+
+static bfd_boolean
+aout_link_check_archive_element (bfd *abfd,
+				 struct bfd_link_info *info,
+				 bfd_boolean *pneeded)
+{
+  bfd *oldbfd;
+  bfd_boolean needed;
+
+  if (!aout_get_external_symbols (abfd))
+    return FALSE;
+
+  oldbfd = abfd;
+  if (!aout_link_check_ar_symbols (abfd, info, pneeded, &abfd))
+    return FALSE;
+
+  needed = *pneeded;
+  if (needed)
+    {
+      /* Potentially, the add_archive_element hook may have set a
+	 substitute BFD for us.  */
+      if (abfd != oldbfd)
+	{
+	  if (!info->keep_memory
+	      && !aout_link_free_symbols (oldbfd))
+	    return FALSE;
+	  if (!aout_get_external_symbols (abfd))
+	    return FALSE;
+	}
+      if (!aout_link_add_symbols (abfd, info))
+	return FALSE;
+    }
+
+  if (!info->keep_memory || !needed)
+    {
+      if (!aout_link_free_symbols (abfd))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Add all symbols from an object file to the hash table.  */
+
+static bfd_boolean
+aout_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  bfd_boolean (*add_one_symbol)
+    (struct bfd_link_info *, bfd *, const char *, flagword, asection *,
+     bfd_vma, const char *, bfd_boolean, bfd_boolean,
+     struct bfd_link_hash_entry **);
+  struct external_nlist *syms;
+  bfd_size_type sym_count;
+  char *strings;
+  bfd_boolean copy;
+  struct aout_link_hash_entry **sym_hash;
+  struct external_nlist *p;
+  struct external_nlist *pend;
+
+  syms = obj_aout_external_syms (abfd);
+  sym_count = obj_aout_external_sym_count (abfd);
+  strings = obj_aout_external_strings (abfd);
+  if (info->keep_memory)
+    copy = FALSE;
+  else
+    copy = TRUE;
+
+  if (aout_backend_info (abfd)->add_dynamic_symbols != NULL)
+    {
+      if (! ((*aout_backend_info (abfd)->add_dynamic_symbols)
+	     (abfd, info, &syms, &sym_count, &strings)))
+	return FALSE;
+    }
+
+  /* We keep a list of the linker hash table entries that correspond
+     to particular symbols.  We could just look them up in the hash
+     table, but keeping the list is more efficient.  Perhaps this
+     should be conditional on info->keep_memory.  */
+  sym_hash = bfd_alloc (abfd,
+			sym_count * sizeof (struct aout_link_hash_entry *));
+  if (sym_hash == NULL && sym_count != 0)
+    return FALSE;
+  obj_aout_sym_hashes (abfd) = sym_hash;
+
+  add_one_symbol = aout_backend_info (abfd)->add_one_symbol;
+  if (add_one_symbol == NULL)
+    add_one_symbol = _bfd_generic_link_add_one_symbol;
+
+  p = syms;
+  pend = p + sym_count;
+  for (; p < pend; p++, sym_hash++)
+    {
+      int type;
+      const char *name;
+      bfd_vma value;
+      asection *section;
+      flagword flags;
+      const char *string;
+
+      *sym_hash = NULL;
+
+      type = H_GET_8 (abfd, p->e_type);
+
+      name = strings + GET_WORD (abfd, p->e_strx);
+      value = GET_WORD (abfd, p->e_value);
+      flags = BSF_GLOBAL;
+      string = NULL;
+      switch (type)
+	{
+	default:
+	  /* Anything else should be a debugging symbol.  */
+	  BFD_ASSERT ((type & N_STAB) != 0);
+	  continue;
+
+	case N_UNDF:
+	case N_ABS:
+	case N_TEXT:
+	case N_DATA:
+	case N_BSS:
+	case N_REG:
+	case N_FN:
+	  /* Ignore symbols that are not externally visible.  */
+	  continue;
+
+	case N_UNDF | N_EXT:
+	  if (value == 0)
+	    {
+	      section = bfd_und_section_ptr;
+	      flags = 0;
+	    }
+	  else
+	    section = bfd_com_section_ptr;
+	  break;
+	case N_ABS | N_EXT:
+	  section = bfd_abs_section_ptr;
+	  break;
+	case N_TEXT | N_EXT:
+	  section = obj_textsec (abfd);
+	  value -= bfd_get_section_vma (abfd, section);
+	  break;
+	case N_DATA | N_EXT:
+	  /* Treat N_SETV symbols as N_DATA symbol; see comment in
+	     translate_from_native_sym_flags.  */
+	  section = obj_datasec (abfd);
+	  value -= bfd_get_section_vma (abfd, section);
+	  break;
+	case N_BSS | N_EXT:
+	  section = obj_bsssec (abfd);
+	  value -= bfd_get_section_vma (abfd, section);
+	  break;
+	}
+
+      if (! ((*add_one_symbol)
+	     (info, abfd, name, flags, section, value, string, copy, FALSE,
+	      (struct bfd_link_hash_entry **) sym_hash)))
+	return FALSE;
+
+      /* Restrict the maximum alignment of a common symbol based on
+	 the architecture, since a.out has no way to represent
+	 alignment requirements of a section in a .o file.  FIXME:
+	 This isn't quite right: it should use the architecture of the
+	 output file, not the input files.  */
+      if ((*sym_hash)->root.type == bfd_link_hash_common
+	  && ((*sym_hash)->root.u.c.p->alignment_power >
+	      bfd_get_arch_info (abfd)->section_align_power))
+	(*sym_hash)->root.u.c.p->alignment_power =
+	  bfd_get_arch_info (abfd)->section_align_power;
+
+      /* If this is a set symbol, and we are not building sets, then
+	 it is possible for the hash entry to not have been set.  In
+	 such a case, treat the symbol as not globally defined.  */
+      if ((*sym_hash)->root.type == bfd_link_hash_new)
+	{
+	  BFD_ASSERT ((flags & BSF_CONSTRUCTOR) != 0);
+	  *sym_hash = NULL;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Look up an entry in an the header file hash table.  */
+
+#define aout_link_includes_lookup(table, string, create, copy) \
+  ((struct aout_link_includes_entry *) \
+   bfd_hash_lookup (&(table)->root, (string), (create), (copy)))
+
+/* The function to create a new entry in the header file hash table.  */
+
+static struct bfd_hash_entry *
+aout_link_includes_newfunc (struct bfd_hash_entry *entry,
+			    struct bfd_hash_table *table,
+			    const char *string)
+{
+  struct aout_link_includes_entry * ret =
+    (struct aout_link_includes_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = bfd_hash_allocate (table,
+			     sizeof (struct aout_link_includes_entry));
+  if (ret == NULL)
+    return NULL;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct aout_link_includes_entry *)
+	 bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
+  if (ret)
+    /* Set local fields.  */
+    ret->totals = NULL;
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+static bfd_boolean
+aout_link_write_other_symbol (struct bfd_hash_entry *bh, void *data)
+{
+  struct aout_link_hash_entry *h = (struct aout_link_hash_entry *) bh;
+  struct aout_final_link_info *finfo = (struct aout_final_link_info *) data;
+  bfd *output_bfd;
+  int type;
+  bfd_vma val;
+  struct external_nlist outsym;
+  bfd_size_type indx;
+  bfd_size_type amt;
+
+  if (h->root.type == bfd_link_hash_warning)
+    {
+      h = (struct aout_link_hash_entry *) h->root.u.i.link;
+      if (h->root.type == bfd_link_hash_new)
+	return TRUE;
+    }
+
+  output_bfd = finfo->output_bfd;
+
+  if (aout_backend_info (output_bfd)->write_dynamic_symbol != NULL)
+    {
+      if (! ((*aout_backend_info (output_bfd)->write_dynamic_symbol)
+	     (output_bfd, finfo->info, h)))
+	{
+	  /* FIXME: No way to handle errors.  */
+	  abort ();
+	}
+    }
+
+  if (h->written)
+    return TRUE;
+
+  h->written = TRUE;
+
+  /* An indx of -2 means the symbol must be written.  */
+  if (h->indx != -2
+      && (finfo->info->strip == strip_all
+	  || (finfo->info->strip == strip_some
+	      && bfd_hash_lookup (finfo->info->keep_hash, h->root.root.string,
+				  FALSE, FALSE) == NULL)))
+    return TRUE;
+
+  switch (h->root.type)
+    {
+    default:
+      abort ();
+      /* Avoid variable not initialized warnings.  */
+      return TRUE;
+    case bfd_link_hash_new:
+      /* This can happen for set symbols when sets are not being
+         built.  */
+      return TRUE;
+    case bfd_link_hash_undefined:
+      type = N_UNDF | N_EXT;
+      val = 0;
+      break;
+    case bfd_link_hash_defined:
+    case bfd_link_hash_defweak:
+      {
+	asection *sec;
+
+	sec = h->root.u.def.section->output_section;
+	BFD_ASSERT (bfd_is_abs_section (sec)
+		    || sec->owner == output_bfd);
+	if (sec == obj_textsec (output_bfd))
+	  type = h->root.type == bfd_link_hash_defined ? N_TEXT : N_WEAKT;
+	else if (sec == obj_datasec (output_bfd))
+	  type = h->root.type == bfd_link_hash_defined ? N_DATA : N_WEAKD;
+	else if (sec == obj_bsssec (output_bfd))
+	  type = h->root.type == bfd_link_hash_defined ? N_BSS : N_WEAKB;
+	else
+	  type = h->root.type == bfd_link_hash_defined ? N_ABS : N_WEAKA;
+	type |= N_EXT;
+	val = (h->root.u.def.value
+	       + sec->vma
+	       + h->root.u.def.section->output_offset);
+      }
+      break;
+    case bfd_link_hash_common:
+      type = N_UNDF | N_EXT;
+      val = h->root.u.c.size;
+      break;
+    case bfd_link_hash_undefweak:
+      type = N_WEAKU;
+      val = 0;
+    case bfd_link_hash_indirect:
+    case bfd_link_hash_warning:
+      /* FIXME: Ignore these for now.  The circumstances under which
+	 they should be written out are not clear to me.  */
+      return TRUE;
+    }
+
+  H_PUT_8 (output_bfd, type, outsym.e_type);
+  indx = add_to_stringtab (output_bfd, finfo->strtab, h->root.root.string,
+			   FALSE);
+  if (indx == (bfd_size_type) -1)
+    /* FIXME: No way to handle errors.  */
+    abort ();
+
+  PUT_WORD (output_bfd, indx, outsym.e_strx);
+  PUT_WORD (output_bfd, val, outsym.e_value);
+
+  amt = EXTERNAL_NLIST_SIZE;
+  if (bfd_seek (output_bfd, finfo->symoff, SEEK_SET) != 0
+      || bfd_bwrite ((void *) &outsym, amt, output_bfd) != amt)
+    /* FIXME: No way to handle errors.  */
+    abort ();
+
+  finfo->symoff += amt;
+  h->indx = obj_aout_external_sym_count (output_bfd);
+  ++obj_aout_external_sym_count (output_bfd);
+
+  return TRUE;
+}
+
+/* Handle a link order which is supposed to generate a reloc.  */
+
+static bfd_boolean
+aout_link_reloc_link_order (struct aout_final_link_info *finfo,
+			    asection *o,
+			    struct bfd_link_order *p)
+{
+  struct bfd_link_order_reloc *pr;
+  int r_index;
+  int r_extern;
+  reloc_howto_type *howto;
+  file_ptr *reloff_ptr;
+  struct reloc_std_external srel;
+  void * rel_ptr;
+  bfd_size_type rel_size;
+
+  pr = p->u.reloc.p;
+
+  if (p->type == bfd_section_reloc_link_order)
+    {
+      r_extern = 0;
+      if (bfd_is_abs_section (pr->u.section))
+	r_index = N_ABS | N_EXT;
+      else
+	{
+	  BFD_ASSERT (pr->u.section->owner == finfo->output_bfd);
+	  r_index = pr->u.section->target_index;
+	}
+    }
+  else
+    {
+      struct aout_link_hash_entry *h;
+
+      BFD_ASSERT (p->type == bfd_symbol_reloc_link_order);
+      r_extern = 1;
+      h = ((struct aout_link_hash_entry *)
+	   bfd_wrapped_link_hash_lookup (finfo->output_bfd, finfo->info,
+					 pr->u.name, FALSE, FALSE, TRUE));
+      if (h != NULL
+	  && h->indx >= 0)
+	r_index = h->indx;
+      else if (h != NULL)
+	{
+	  /* We decided to strip this symbol, but it turns out that we
+	     can't.  Note that we lose the other and desc information
+	     here.  I don't think that will ever matter for a global
+	     symbol.  */
+	  h->indx = -2;
+	  h->written = FALSE;
+	  if (!aout_link_write_other_symbol (&h->root.root, finfo))
+	    return FALSE;
+	  r_index = h->indx;
+	}
+      else
+	{
+	  if (! ((*finfo->info->callbacks->unattached_reloc)
+		 (finfo->info, pr->u.name, NULL, NULL, (bfd_vma) 0)))
+	    return FALSE;
+	  r_index = 0;
+	}
+    }
+
+  howto = bfd_reloc_type_lookup (finfo->output_bfd, pr->reloc);
+  if (howto == 0)
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  if (o == obj_textsec (finfo->output_bfd))
+    reloff_ptr = &finfo->treloff;
+  else if (o == obj_datasec (finfo->output_bfd))
+    reloff_ptr = &finfo->dreloff;
+  else
+    abort ();
+
+#ifdef MY_put_reloc
+  MY_put_reloc(finfo->output_bfd, r_extern, r_index, p->offset, howto,
+	       &srel);
+#else
+  {
+    int r_pcrel;
+    int r_baserel;
+    int r_jmptable;
+    int r_relative;
+    int r_length;
+
+    fprintf (stderr, "TODO: line %d in bfd/pdp11.c\n", __LINE__);
+
+    r_pcrel = howto->pc_relative;
+    r_baserel = (howto->type & 8) != 0;
+    r_jmptable = (howto->type & 16) != 0;
+    r_relative = (howto->type & 32) != 0;
+    r_length = howto->size;
+
+    PUT_WORD (finfo->output_bfd, p->offset, srel.r_address);
+    if (bfd_header_big_endian (finfo->output_bfd))
+      {
+	srel.r_index[0] = r_index >> 16;
+	srel.r_index[1] = r_index >> 8;
+	srel.r_index[2] = r_index;
+	srel.r_type[0] =
+	  ((r_extern ?     RELOC_STD_BITS_EXTERN_BIG : 0)
+	   | (r_pcrel ?    RELOC_STD_BITS_PCREL_BIG : 0)
+	   | (r_baserel ?  RELOC_STD_BITS_BASEREL_BIG : 0)
+	   | (r_jmptable ? RELOC_STD_BITS_JMPTABLE_BIG : 0)
+	   | (r_relative ? RELOC_STD_BITS_RELATIVE_BIG : 0)
+	   | (r_length <<  RELOC_STD_BITS_LENGTH_SH_BIG));
+      }
+    else
+      {
+	srel.r_index[2] = r_index >> 16;
+	srel.r_index[1] = r_index >> 8;
+	srel.r_index[0] = r_index;
+	srel.r_type[0] =
+	  ((r_extern ?     RELOC_STD_BITS_EXTERN_LITTLE : 0)
+	   | (r_pcrel ?    RELOC_STD_BITS_PCREL_LITTLE : 0)
+	   | (r_baserel ?  RELOC_STD_BITS_BASEREL_LITTLE : 0)
+	   | (r_jmptable ? RELOC_STD_BITS_JMPTABLE_LITTLE : 0)
+	   | (r_relative ? RELOC_STD_BITS_RELATIVE_LITTLE : 0)
+	   | (r_length <<  RELOC_STD_BITS_LENGTH_SH_LITTLE));
+      }
+  }
+#endif
+  rel_ptr = (void *) &srel;
+
+  /* We have to write the addend into the object file, since
+     standard a.out relocs are in place.  It would be more
+     reliable if we had the current contents of the file here,
+     rather than assuming zeroes, but we can't read the file since
+     it was opened using bfd_openw.  */
+  if (pr->addend != 0)
+    {
+      bfd_size_type size;
+      bfd_reloc_status_type r;
+      bfd_byte *buf;
+      bfd_boolean ok;
+
+      size = bfd_get_reloc_size (howto);
+      buf = bfd_zmalloc (size);
+      if (buf == NULL)
+	return FALSE;
+      r = MY_relocate_contents (howto, finfo->output_bfd,
+				pr->addend, buf);
+      switch (r)
+	{
+	case bfd_reloc_ok:
+	  break;
+	default:
+	case bfd_reloc_outofrange:
+	  abort ();
+	case bfd_reloc_overflow:
+	  if (! ((*finfo->info->callbacks->reloc_overflow)
+		 (finfo->info, NULL,
+		  (p->type == bfd_section_reloc_link_order
+		   ? bfd_section_name (finfo->output_bfd,
+				       pr->u.section)
+		   : pr->u.name),
+		  howto->name, pr->addend, NULL,
+		  (asection *) NULL, (bfd_vma) 0)))
+	    {
+	      free (buf);
+	      return FALSE;
+	    }
+	  break;
+	}
+      ok = bfd_set_section_contents (finfo->output_bfd, o,
+				     (void *) buf,
+				     (file_ptr) p->offset,
+				     size);
+      free (buf);
+      if (! ok)
+	return FALSE;
+    }
+
+  rel_size = obj_reloc_entry_size (finfo->output_bfd);
+  if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0
+      || bfd_bwrite (rel_ptr, rel_size, finfo->output_bfd) != rel_size)
+    return FALSE;
+
+  *reloff_ptr += rel_size;
+
+  /* Assert that the relocs have not run into the symbols, and that n
+     the text relocs have not run into the data relocs.  */
+  BFD_ASSERT (*reloff_ptr <= obj_sym_filepos (finfo->output_bfd)
+	      && (reloff_ptr != &finfo->treloff
+		  || (*reloff_ptr
+		      <= obj_datasec (finfo->output_bfd)->rel_filepos)));
+
+  return TRUE;
+}
+
+/* Get the section corresponding to a reloc index.  */
+
+static inline asection *
+aout_reloc_type_to_section (bfd *abfd, int type)
+{
+  switch (type)
+    {
+    case RTEXT:	return obj_textsec (abfd);
+    case RDATA: return obj_datasec (abfd);
+    case RBSS:  return obj_bsssec (abfd);
+    case RABS:  return bfd_abs_section_ptr;
+    case REXT:  return bfd_und_section_ptr;
+    default:    abort ();
+    }
+}
+
+static bfd_boolean
+pdp11_aout_link_input_section (struct aout_final_link_info *finfo,
+			       bfd *input_bfd,
+			       asection *input_section,
+			       bfd_byte *relocs,
+			       bfd_size_type rel_size,
+			       bfd_byte *contents)
+{
+  bfd_boolean (*check_dynamic_reloc)
+    (struct bfd_link_info *, bfd *, asection *,
+     struct aout_link_hash_entry *, void *, bfd_byte *, bfd_boolean *,
+     bfd_vma *);
+  bfd *output_bfd;
+  bfd_boolean relocatable;
+  struct external_nlist *syms;
+  char *strings;
+  struct aout_link_hash_entry **sym_hashes;
+  int *symbol_map;
+  bfd_byte *rel;
+  bfd_byte *rel_end;
+
+  output_bfd = finfo->output_bfd;
+  check_dynamic_reloc = aout_backend_info (output_bfd)->check_dynamic_reloc;
+
+  BFD_ASSERT (obj_reloc_entry_size (input_bfd) == RELOC_SIZE);
+  BFD_ASSERT (input_bfd->xvec->header_byteorder
+	      == output_bfd->xvec->header_byteorder);
+
+  relocatable = finfo->info->relocatable;
+  syms = obj_aout_external_syms (input_bfd);
+  strings = obj_aout_external_strings (input_bfd);
+  sym_hashes = obj_aout_sym_hashes (input_bfd);
+  symbol_map = finfo->symbol_map;
+
+  rel = relocs;
+  rel_end = rel + rel_size;
+  for (; rel < rel_end; rel += RELOC_SIZE)
+    {
+      bfd_vma r_addr;
+      int r_index;
+      int r_type;
+      int r_pcrel;
+      int r_extern;
+      reloc_howto_type *howto;
+      struct aout_link_hash_entry *h = NULL;
+      bfd_vma relocation;
+      bfd_reloc_status_type r;
+      int reloc_entry;
+
+      reloc_entry = GET_WORD (input_bfd, (void *) rel);
+      if (reloc_entry == 0)
+	continue;
+
+      {
+	unsigned int howto_idx;
+
+	r_index = (reloc_entry & RIDXMASK) >> 4;
+	r_type = reloc_entry & RTYPE;
+	r_pcrel = reloc_entry & RELFLG;
+	r_addr = (char *) rel - (char *) relocs;
+
+	r_extern = (r_type == REXT);
+
+	howto_idx = r_pcrel;
+	BFD_ASSERT (howto_idx < TABLE_SIZE (howto_table_pdp11));
+	howto = howto_table_pdp11 + howto_idx;
+      }
+
+      if (relocatable)
+	{
+	  /* We are generating a relocatable output file, and must
+	     modify the reloc accordingly.  */
+	  if (r_extern)
+	    {
+	      /* If we know the symbol this relocation is against,
+		 convert it into a relocation against a section.  This
+		 is what the native linker does.  */
+	      h = sym_hashes[r_index];
+	      if (h != NULL
+		  && (h->root.type == bfd_link_hash_defined
+		      || h->root.type == bfd_link_hash_defweak))
+		{
+		  asection *output_section;
+
+		  /* Compute a new r_index.  */
+		  output_section = h->root.u.def.section->output_section;
+		  if (output_section == obj_textsec (output_bfd))
+		    r_type = N_TEXT;
+		  else if (output_section == obj_datasec (output_bfd))
+		    r_type = N_DATA;
+		  else if (output_section == obj_bsssec (output_bfd))
+		    r_type = N_BSS;
+		  else
+		    r_type = N_ABS;
+
+		  /* Add the symbol value and the section VMA to the
+		     addend stored in the contents.  */
+		  relocation = (h->root.u.def.value
+				+ output_section->vma
+				+ h->root.u.def.section->output_offset);
+		}
+	      else
+		{
+		  /* We must change r_index according to the symbol
+		     map.  */
+		  r_index = symbol_map[r_index];
+
+		  if (r_index == -1)
+		    {
+		      if (h != NULL)
+			{
+			  /* We decided to strip this symbol, but it
+                             turns out that we can't.  Note that we
+                             lose the other and desc information here.
+                             I don't think that will ever matter for a
+                             global symbol.  */
+			  if (h->indx < 0)
+			    {
+			      h->indx = -2;
+			      h->written = FALSE;
+			      if (!aout_link_write_other_symbol (&h->root.root,
+								 finfo))
+				return FALSE;
+			    }
+			  r_index = h->indx;
+			}
+		      else
+			{
+			  const char *name;
+
+			  name = strings + GET_WORD (input_bfd,
+						     syms[r_index].e_strx);
+			  if (! ((*finfo->info->callbacks->unattached_reloc)
+				 (finfo->info, name, input_bfd, input_section,
+				  r_addr)))
+			    return FALSE;
+			  r_index = 0;
+			}
+		    }
+
+		  relocation = 0;
+		}
+
+	      /* Write out the new r_index value.  */
+	      reloc_entry = GET_WORD (input_bfd, rel);
+	      reloc_entry &= RIDXMASK;
+	      reloc_entry |= r_index << 4;
+	      PUT_WORD (input_bfd, reloc_entry, rel);
+	    }
+	  else
+	    {
+	      asection *section;
+
+	      /* This is a relocation against a section.  We must
+		 adjust by the amount that the section moved.  */
+	      section = aout_reloc_type_to_section (input_bfd, r_type);
+	      relocation = (section->output_section->vma
+			    + section->output_offset
+			    - section->vma);
+	    }
+
+	  /* Change the address of the relocation.  */
+	  fprintf (stderr, "TODO: change the address of the relocation\n");
+
+	  /* Adjust a PC relative relocation by removing the reference
+	     to the original address in the section and including the
+	     reference to the new address.  */
+	  if (r_pcrel)
+	    relocation -= (input_section->output_section->vma
+			   + input_section->output_offset
+			   - input_section->vma);
+
+#ifdef MY_relocatable_reloc
+	  MY_relocatable_reloc (howto, output_bfd, rel, relocation, r_addr);
+#endif
+
+	  if (relocation == 0)
+	    r = bfd_reloc_ok;
+	  else
+	    r = MY_relocate_contents (howto,
+				      input_bfd, relocation,
+				      contents + r_addr);
+	}
+      else
+	{
+	  bfd_boolean hundef;
+
+	  /* We are generating an executable, and must do a full
+	     relocation.  */
+	  hundef = FALSE;
+	  if (r_extern)
+	    {
+	      h = sym_hashes[r_index];
+
+	      if (h != NULL
+		  && (h->root.type == bfd_link_hash_defined
+		      || h->root.type == bfd_link_hash_defweak))
+		{
+		  relocation = (h->root.u.def.value
+				+ h->root.u.def.section->output_section->vma
+				+ h->root.u.def.section->output_offset);
+		}
+	      else if (h != NULL
+		       && h->root.type == bfd_link_hash_undefweak)
+		relocation = 0;
+	      else
+		{
+		  hundef = TRUE;
+		  relocation = 0;
+		}
+	    }
+	  else
+	    {
+	      asection *section;
+
+	      section = aout_reloc_type_to_section (input_bfd, r_type);
+	      relocation = (section->output_section->vma
+			    + section->output_offset
+			    - section->vma);
+	      if (r_pcrel)
+		relocation += input_section->vma;
+	    }
+
+	  if (check_dynamic_reloc != NULL)
+	    {
+	      bfd_boolean skip;
+
+	      if (! ((*check_dynamic_reloc)
+		     (finfo->info, input_bfd, input_section, h,
+		      (void *) rel, contents, &skip, &relocation)))
+		return FALSE;
+	      if (skip)
+		continue;
+	    }
+
+	  /* Now warn if a global symbol is undefined.  We could not
+             do this earlier, because check_dynamic_reloc might want
+             to skip this reloc.  */
+	  if (hundef && ! finfo->info->shared)
+	    {
+	      const char *name;
+
+	      if (h != NULL)
+		name = h->root.root.string;
+	      else
+		name = strings + GET_WORD (input_bfd, syms[r_index].e_strx);
+	      if (! ((*finfo->info->callbacks->undefined_symbol)
+		     (finfo->info, name, input_bfd, input_section,
+		      r_addr, TRUE)))
+		return FALSE;
+	    }
+
+	  r = MY_final_link_relocate (howto,
+				      input_bfd, input_section,
+				      contents, r_addr, relocation,
+				      (bfd_vma) 0);
+	}
+
+      if (r != bfd_reloc_ok)
+	{
+	  switch (r)
+	    {
+	    default:
+	    case bfd_reloc_outofrange:
+	      abort ();
+	    case bfd_reloc_overflow:
+	      {
+		const char *name;
+
+		if (h != NULL)
+		  name = NULL;
+		else if (r_extern)
+		  name = strings + GET_WORD (input_bfd,
+					     syms[r_index].e_strx);
+		else
+		  {
+		    asection *s;
+
+		    s = aout_reloc_type_to_section (input_bfd, r_type);
+		    name = bfd_section_name (input_bfd, s);
+		  }
+		if (! ((*finfo->info->callbacks->reloc_overflow)
+		       (finfo->info, (h ? &h->root : NULL), name,
+			howto->name, (bfd_vma) 0, input_bfd,
+			input_section, r_addr)))
+		  return FALSE;
+	      }
+	      break;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Link an a.out section into the output file.  */
+
+static bfd_boolean
+aout_link_input_section (struct aout_final_link_info *finfo,
+			 bfd *input_bfd,
+			 asection *input_section,
+			 file_ptr *reloff_ptr,
+			 bfd_size_type rel_size)
+{
+  bfd_size_type input_size;
+  void * relocs;
+
+  /* Get the section contents.  */
+  input_size = input_section->size;
+  if (! bfd_get_section_contents (input_bfd, input_section,
+				  (void *) finfo->contents,
+				  (file_ptr) 0, input_size))
+    return FALSE;
+
+  /* Read in the relocs if we haven't already done it.  */
+  if (aout_section_data (input_section) != NULL
+      && aout_section_data (input_section)->relocs != NULL)
+    relocs = aout_section_data (input_section)->relocs;
+  else
+    {
+      relocs = finfo->relocs;
+      if (rel_size > 0)
+	{
+	  if (bfd_seek (input_bfd, input_section->rel_filepos, SEEK_SET) != 0
+	      || bfd_bread (relocs, rel_size, input_bfd) != rel_size)
+	    return FALSE;
+	}
+    }
+
+  /* Relocate the section contents.  */
+  if (! pdp11_aout_link_input_section (finfo, input_bfd, input_section,
+				       (bfd_byte *) relocs,
+				       rel_size, finfo->contents))
+    return FALSE;
+
+  /* Write out the section contents.  */
+  if (! bfd_set_section_contents (finfo->output_bfd,
+				  input_section->output_section,
+				  (void *) finfo->contents,
+				  (file_ptr) input_section->output_offset,
+				  input_size))
+    return FALSE;
+
+  /* If we are producing relocatable output, the relocs were
+     modified, and we now write them out.  */
+  if (finfo->info->relocatable && rel_size > 0)
+    {
+      if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0)
+	return FALSE;
+      if (bfd_bwrite (relocs, rel_size, finfo->output_bfd) != rel_size)
+	return FALSE;
+      *reloff_ptr += rel_size;
+
+      /* Assert that the relocs have not run into the symbols, and
+	 that if these are the text relocs they have not run into the
+	 data relocs.  */
+      BFD_ASSERT (*reloff_ptr <= obj_sym_filepos (finfo->output_bfd)
+		  && (reloff_ptr != &finfo->treloff
+		      || (*reloff_ptr
+			  <= obj_datasec (finfo->output_bfd)->rel_filepos)));
+    }
+
+  return TRUE;
+}
+
+/* Link an a.out input BFD into the output file.  */
+
+static bfd_boolean
+aout_link_input_bfd (struct aout_final_link_info *finfo, bfd *input_bfd)
+{
+  BFD_ASSERT (bfd_get_format (input_bfd) == bfd_object);
+
+  /* If this is a dynamic object, it may need special handling.  */
+  if ((input_bfd->flags & DYNAMIC) != 0
+      && aout_backend_info (input_bfd)->link_dynamic_object != NULL)
+    return ((*aout_backend_info (input_bfd)->link_dynamic_object)
+	    (finfo->info, input_bfd));
+
+  /* Get the symbols.  We probably have them already, unless
+     finfo->info->keep_memory is FALSE.  */
+  if (! aout_get_external_symbols (input_bfd))
+    return FALSE;
+
+  /* Write out the symbols and get a map of the new indices.  The map
+     is placed into finfo->symbol_map.  */
+  if (! aout_link_write_symbols (finfo, input_bfd))
+    return FALSE;
+
+  /* Relocate and write out the sections.  These functions use the
+     symbol map created by aout_link_write_symbols.  The linker_mark
+     field will be set if these sections are to be included in the
+     link, which will normally be the case.  */
+  if (obj_textsec (input_bfd)->linker_mark)
+    {
+      if (! aout_link_input_section (finfo, input_bfd,
+				     obj_textsec (input_bfd),
+				     &finfo->treloff,
+				     exec_hdr (input_bfd)->a_trsize))
+	return FALSE;
+    }
+  if (obj_datasec (input_bfd)->linker_mark)
+    {
+      if (! aout_link_input_section (finfo, input_bfd,
+				     obj_datasec (input_bfd),
+				     &finfo->dreloff,
+				     exec_hdr (input_bfd)->a_drsize))
+	return FALSE;
+    }
+
+  /* If we are not keeping memory, we don't need the symbols any
+     longer.  We still need them if we are keeping memory, because the
+     strings in the hash table point into them.  */
+  if (! finfo->info->keep_memory)
+    {
+      if (! aout_link_free_symbols (input_bfd))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Do the final link step.  This is called on the output BFD.  The
+   INFO structure should point to a list of BFDs linked through the
+   link_next field which can be used to find each BFD which takes part
+   in the output.  Also, each section in ABFD should point to a list
+   of bfd_link_order structures which list all the input sections for
+   the output section.  */
+
+bfd_boolean
+NAME (aout, final_link) (bfd *abfd,
+			 struct bfd_link_info *info,
+			 void (*callback) (bfd *, file_ptr *, file_ptr *, file_ptr *))
+{
+  struct aout_final_link_info aout_info;
+  bfd_boolean includes_hash_initialized = FALSE;
+  bfd *sub;
+  bfd_size_type trsize, drsize;
+  bfd_size_type max_contents_size;
+  bfd_size_type max_relocs_size;
+  bfd_size_type max_sym_count;
+  bfd_size_type text_size;
+  file_ptr text_end;
+  struct bfd_link_order *p;
+  asection *o;
+  bfd_boolean have_link_order_relocs;
+
+  if (info->shared)
+    abfd->flags |= DYNAMIC;
+
+  aout_info.info = info;
+  aout_info.output_bfd = abfd;
+  aout_info.contents = NULL;
+  aout_info.relocs = NULL;
+  aout_info.symbol_map = NULL;
+  aout_info.output_syms = NULL;
+
+  if (!bfd_hash_table_init_n (&aout_info.includes.root,
+			      aout_link_includes_newfunc,
+			      sizeof (struct aout_link_includes_entry),
+			      251))
+    goto error_return;
+  includes_hash_initialized = TRUE;
+
+  /* Figure out the largest section size.  Also, if generating
+     relocatable output, count the relocs.  */
+  trsize = 0;
+  drsize = 0;
+  max_contents_size = 0;
+  max_relocs_size = 0;
+  max_sym_count = 0;
+  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+    {
+      size_t sz;
+
+      if (info->relocatable)
+	{
+	  if (bfd_get_flavour (sub) == bfd_target_aout_flavour)
+	    {
+	      trsize += exec_hdr (sub)->a_trsize;
+	      drsize += exec_hdr (sub)->a_drsize;
+	    }
+	  else
+	    {
+	      /* FIXME: We need to identify the .text and .data sections
+		 and call get_reloc_upper_bound and canonicalize_reloc to
+		 work out the number of relocs needed, and then multiply
+		 by the reloc size.  */
+	      (*_bfd_error_handler)
+		("%s: relocatable link from %s to %s not supported",
+		 bfd_get_filename (abfd),
+		 sub->xvec->name, abfd->xvec->name);
+	      bfd_set_error (bfd_error_invalid_operation);
+	      goto error_return;
+	    }
+	}
+
+      if (bfd_get_flavour (sub) == bfd_target_aout_flavour)
+	{
+	  sz = obj_textsec (sub)->size;
+	  if (sz > max_contents_size)
+	    max_contents_size = sz;
+	  sz = obj_datasec (sub)->size;
+	  if (sz > max_contents_size)
+	    max_contents_size = sz;
+
+	  sz = exec_hdr (sub)->a_trsize;
+	  if (sz > max_relocs_size)
+	    max_relocs_size = sz;
+	  sz = exec_hdr (sub)->a_drsize;
+	  if (sz > max_relocs_size)
+	    max_relocs_size = sz;
+
+	  sz = obj_aout_external_sym_count (sub);
+	  if (sz > max_sym_count)
+	    max_sym_count = sz;
+	}
+    }
+
+  if (info->relocatable)
+    {
+      if (obj_textsec (abfd) != NULL)
+	trsize += (_bfd_count_link_order_relocs (obj_textsec (abfd)
+						 ->map_head.link_order)
+		   * obj_reloc_entry_size (abfd));
+      if (obj_datasec (abfd) != NULL)
+	drsize += (_bfd_count_link_order_relocs (obj_datasec (abfd)
+						 ->map_head.link_order)
+		   * obj_reloc_entry_size (abfd));
+    }
+
+  exec_hdr (abfd)->a_trsize = trsize;
+  exec_hdr (abfd)->a_drsize = drsize;
+  exec_hdr (abfd)->a_entry = bfd_get_start_address (abfd);
+
+  /* Adjust the section sizes and vmas according to the magic number.
+     This sets a_text, a_data and a_bss in the exec_hdr and sets the
+     filepos for each section.  */
+  if (! NAME (aout, adjust_sizes_and_vmas) (abfd, &text_size, &text_end))
+    goto error_return;
+
+  /* The relocation and symbol file positions differ among a.out
+     targets.  We are passed a callback routine from the backend
+     specific code to handle this.
+     FIXME: At this point we do not know how much space the symbol
+     table will require.  This will not work for any (nonstandard)
+     a.out target that needs to know the symbol table size before it
+     can compute the relocation file positions.  This may or may not
+     be the case for the hp300hpux target, for example.  */
+  (*callback) (abfd, &aout_info.treloff, &aout_info.dreloff,
+	       &aout_info.symoff);
+  obj_textsec (abfd)->rel_filepos = aout_info.treloff;
+  obj_datasec (abfd)->rel_filepos = aout_info.dreloff;
+  obj_sym_filepos (abfd) = aout_info.symoff;
+
+  /* We keep a count of the symbols as we output them.  */
+  obj_aout_external_sym_count (abfd) = 0;
+
+  /* We accumulate the string table as we write out the symbols.  */
+  aout_info.strtab = _bfd_stringtab_init ();
+  if (aout_info.strtab == NULL)
+    goto error_return;
+
+  /* Allocate buffers to hold section contents and relocs.  */
+  aout_info.contents = bfd_malloc (max_contents_size);
+  aout_info.relocs = bfd_malloc (max_relocs_size);
+  aout_info.symbol_map = bfd_malloc (max_sym_count * sizeof (int *));
+  aout_info.output_syms = bfd_malloc ((max_sym_count + 1)
+				      * sizeof (struct external_nlist));
+  if ((aout_info.contents == NULL && max_contents_size != 0)
+      || (aout_info.relocs == NULL && max_relocs_size != 0)
+      || (aout_info.symbol_map == NULL && max_sym_count != 0)
+      || aout_info.output_syms == NULL)
+    goto error_return;
+
+  /* If we have a symbol named __DYNAMIC, force it out now.  This is
+     required by SunOS.  Doing this here rather than in sunos.c is a
+     hack, but it's easier than exporting everything which would be
+     needed.  */
+  {
+    struct aout_link_hash_entry *h;
+
+    h = aout_link_hash_lookup (aout_hash_table (info), "__DYNAMIC",
+			       FALSE, FALSE, FALSE);
+    if (h != NULL)
+      aout_link_write_other_symbol (&h->root.root, &aout_info);
+  }
+
+  /* The most time efficient way to do the link would be to read all
+     the input object files into memory and then sort out the
+     information into the output file.  Unfortunately, that will
+     probably use too much memory.  Another method would be to step
+     through everything that composes the text section and write it
+     out, and then everything that composes the data section and write
+     it out, and then write out the relocs, and then write out the
+     symbols.  Unfortunately, that requires reading stuff from each
+     input file several times, and we will not be able to keep all the
+     input files open simultaneously, and reopening them will be slow.
+
+     What we do is basically process one input file at a time.  We do
+     everything we need to do with an input file once--copy over the
+     section contents, handle the relocation information, and write
+     out the symbols--and then we throw away the information we read
+     from it.  This approach requires a lot of lseeks of the output
+     file, which is unfortunate but still faster than reopening a lot
+     of files.
+
+     We use the output_has_begun field of the input BFDs to see
+     whether we have already handled it.  */
+  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+    sub->output_has_begun = FALSE;
+
+  /* Mark all sections which are to be included in the link.  This
+     will normally be every section.  We need to do this so that we
+     can identify any sections which the linker has decided to not
+     include.  */
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      for (p = o->map_head.link_order; p != NULL; p = p->next)
+	if (p->type == bfd_indirect_link_order)
+	  p->u.indirect.section->linker_mark = TRUE;
+    }
+
+  have_link_order_relocs = FALSE;
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      for (p = o->map_head.link_order;
+	   p != NULL;
+	   p = p->next)
+	{
+	  if (p->type == bfd_indirect_link_order
+	      && (bfd_get_flavour (p->u.indirect.section->owner)
+		  == bfd_target_aout_flavour))
+	    {
+	      bfd *input_bfd;
+
+	      input_bfd = p->u.indirect.section->owner;
+	      if (! input_bfd->output_has_begun)
+		{
+		  if (! aout_link_input_bfd (&aout_info, input_bfd))
+		    goto error_return;
+		  input_bfd->output_has_begun = TRUE;
+		}
+	    }
+	  else if (p->type == bfd_section_reloc_link_order
+		   || p->type == bfd_symbol_reloc_link_order)
+	    /* These are handled below.  */
+	    have_link_order_relocs = TRUE;
+	  else
+	    {
+	      if (! _bfd_default_link_order (abfd, info, o, p))
+		goto error_return;
+	    }
+	}
+    }
+
+  /* Write out any symbols that we have not already written out.  */
+  bfd_hash_traverse (&info->hash->table,
+		     aout_link_write_other_symbol,
+		     &aout_info);
+
+  /* Now handle any relocs we were asked to create by the linker.
+     These did not come from any input file.  We must do these after
+     we have written out all the symbols, so that we know the symbol
+     indices to use.  */
+  if (have_link_order_relocs)
+    {
+      for (o = abfd->sections; o != NULL; o = o->next)
+	{
+	  for (p = o->map_head.link_order;
+	       p != NULL;
+	       p = p->next)
+	    {
+	      if (p->type == bfd_section_reloc_link_order
+		  || p->type == bfd_symbol_reloc_link_order)
+		{
+		  if (! aout_link_reloc_link_order (&aout_info, o, p))
+		    goto error_return;
+		}
+	    }
+	}
+    }
+
+  if (aout_info.contents != NULL)
+    {
+      free (aout_info.contents);
+      aout_info.contents = NULL;
+    }
+  if (aout_info.relocs != NULL)
+    {
+      free (aout_info.relocs);
+      aout_info.relocs = NULL;
+    }
+  if (aout_info.symbol_map != NULL)
+    {
+      free (aout_info.symbol_map);
+      aout_info.symbol_map = NULL;
+    }
+  if (aout_info.output_syms != NULL)
+    {
+      free (aout_info.output_syms);
+      aout_info.output_syms = NULL;
+    }
+  if (includes_hash_initialized)
+    {
+      bfd_hash_table_free (&aout_info.includes.root);
+      includes_hash_initialized = FALSE;
+    }
+
+  /* Finish up any dynamic linking we may be doing.  */
+  if (aout_backend_info (abfd)->finish_dynamic_link != NULL)
+    {
+      if (! (*aout_backend_info (abfd)->finish_dynamic_link) (abfd, info))
+	goto error_return;
+    }
+
+  /* Update the header information.  */
+  abfd->symcount = obj_aout_external_sym_count (abfd);
+  exec_hdr (abfd)->a_syms = abfd->symcount * EXTERNAL_NLIST_SIZE;
+  obj_str_filepos (abfd) = obj_sym_filepos (abfd) + exec_hdr (abfd)->a_syms;
+  obj_textsec (abfd)->reloc_count =
+    exec_hdr (abfd)->a_trsize / obj_reloc_entry_size (abfd);
+  obj_datasec (abfd)->reloc_count =
+    exec_hdr (abfd)->a_drsize / obj_reloc_entry_size (abfd);
+
+  /* Write out the string table, unless there are no symbols.  */
+  if (abfd->symcount > 0)
+    {
+      if (bfd_seek (abfd, obj_str_filepos (abfd), SEEK_SET) != 0
+	  || ! emit_stringtab (abfd, aout_info.strtab))
+	goto error_return;
+    }
+  else if (obj_textsec (abfd)->reloc_count == 0
+	   && obj_datasec (abfd)->reloc_count == 0)
+    {
+      bfd_byte b;
+
+      b = 0;
+      if (bfd_seek (abfd,
+		    (file_ptr) (obj_datasec (abfd)->filepos
+				+ exec_hdr (abfd)->a_data
+				- 1),
+		    SEEK_SET) != 0
+	  || bfd_bwrite (&b, (bfd_size_type) 1, abfd) != 1)
+	goto error_return;
+    }
+
+  return TRUE;
+
+ error_return:
+  if (aout_info.contents != NULL)
+    free (aout_info.contents);
+  if (aout_info.relocs != NULL)
+    free (aout_info.relocs);
+  if (aout_info.symbol_map != NULL)
+    free (aout_info.symbol_map);
+  if (aout_info.output_syms != NULL)
+    free (aout_info.output_syms);
+  if (includes_hash_initialized)
+    bfd_hash_table_free (&aout_info.includes.root);
+  return FALSE;
+}
+
+/* Adjust and write out the symbols for an a.out file.  Set the new
+   symbol indices into a symbol_map.  */
+
+static bfd_boolean
+aout_link_write_symbols (struct aout_final_link_info *finfo, bfd *input_bfd)
+{
+  bfd *output_bfd;
+  bfd_size_type sym_count;
+  char *strings;
+  enum bfd_link_strip strip;
+  enum bfd_link_discard discard;
+  struct external_nlist *outsym;
+  bfd_size_type strtab_index;
+  struct external_nlist *sym;
+  struct external_nlist *sym_end;
+  struct aout_link_hash_entry **sym_hash;
+  int *symbol_map;
+  bfd_boolean pass;
+  bfd_boolean skip_next;
+
+  output_bfd = finfo->output_bfd;
+  sym_count = obj_aout_external_sym_count (input_bfd);
+  strings = obj_aout_external_strings (input_bfd);
+  strip = finfo->info->strip;
+  discard = finfo->info->discard;
+  outsym = finfo->output_syms;
+
+  /* First write out a symbol for this object file, unless we are
+     discarding such symbols.  */
+  if (strip != strip_all
+      && (strip != strip_some
+	  || bfd_hash_lookup (finfo->info->keep_hash, input_bfd->filename,
+			      FALSE, FALSE) != NULL)
+      && discard != discard_all)
+    {
+      H_PUT_8 (output_bfd, N_TEXT, outsym->e_type);
+      strtab_index = add_to_stringtab (output_bfd, finfo->strtab,
+				       input_bfd->filename, FALSE);
+      if (strtab_index == (bfd_size_type) -1)
+	return FALSE;
+      PUT_WORD (output_bfd, strtab_index, outsym->e_strx);
+      PUT_WORD (output_bfd,
+		(bfd_get_section_vma (output_bfd,
+				      obj_textsec (input_bfd)->output_section)
+		 + obj_textsec (input_bfd)->output_offset),
+		outsym->e_value);
+      ++obj_aout_external_sym_count (output_bfd);
+      ++outsym;
+    }
+
+  pass = FALSE;
+  skip_next = FALSE;
+  sym = obj_aout_external_syms (input_bfd);
+  sym_end = sym + sym_count;
+  sym_hash = obj_aout_sym_hashes (input_bfd);
+  symbol_map = finfo->symbol_map;
+  memset (symbol_map, 0, (size_t) sym_count * sizeof *symbol_map);
+  for (; sym < sym_end; sym++, sym_hash++, symbol_map++)
+    {
+      const char *name;
+      int type;
+      struct aout_link_hash_entry *h;
+      bfd_boolean skip;
+      asection *symsec;
+      bfd_vma val = 0;
+      bfd_boolean copy;
+
+      /* We set *symbol_map to 0 above for all symbols.  If it has
+         already been set to -1 for this symbol, it means that we are
+         discarding it because it appears in a duplicate header file.
+         See the N_BINCL code below.  */
+      if (*symbol_map == -1)
+	continue;
+
+      /* Initialize *symbol_map to -1, which means that the symbol was
+         not copied into the output file.  We will change it later if
+         we do copy the symbol over.  */
+      *symbol_map = -1;
+
+      type = H_GET_8 (input_bfd, sym->e_type);
+      name = strings + GET_WORD (input_bfd, sym->e_strx);
+
+      h = NULL;
+
+      if (pass)
+	{
+	  /* Pass this symbol through.  It is the target of an
+	     indirect or warning symbol.  */
+	  val = GET_WORD (input_bfd, sym->e_value);
+	  pass = FALSE;
+	}
+      else if (skip_next)
+	{
+	  /* Skip this symbol, which is the target of an indirect
+	     symbol that we have changed to no longer be an indirect
+	     symbol.  */
+	  skip_next = FALSE;
+	  continue;
+	}
+      else
+	{
+	  struct aout_link_hash_entry *hresolve;
+
+	  /* We have saved the hash table entry for this symbol, if
+	     there is one.  Note that we could just look it up again
+	     in the hash table, provided we first check that it is an
+	     external symbol. */
+	  h = *sym_hash;
+
+	  /* Use the name from the hash table, in case the symbol was
+             wrapped.  */
+	  if (h != NULL)
+	    name = h->root.root.string;
+
+	  /* If this is an indirect or warning symbol, then change
+	     hresolve to the base symbol.  We also change *sym_hash so
+	     that the relocation routines relocate against the real
+	     symbol.  */
+	  hresolve = h;
+	  if (h != NULL
+	      && (h->root.type == bfd_link_hash_indirect
+		  || h->root.type == bfd_link_hash_warning))
+	    {
+	      hresolve = (struct aout_link_hash_entry *) h->root.u.i.link;
+	      while (hresolve->root.type == bfd_link_hash_indirect
+		     || hresolve->root.type == bfd_link_hash_warning)
+		hresolve = ((struct aout_link_hash_entry *)
+			    hresolve->root.u.i.link);
+	      *sym_hash = hresolve;
+	    }
+
+	  /* If the symbol has already been written out, skip it.  */
+	  if (h != NULL
+	      && h->root.type != bfd_link_hash_warning
+	      && h->written)
+	    {
+	      if ((type & N_TYPE) == N_INDR
+		  || type == N_WARNING)
+		skip_next = TRUE;
+	      *symbol_map = h->indx;
+	      continue;
+	    }
+
+	  /* See if we are stripping this symbol.  */
+	  skip = FALSE;
+	  switch (strip)
+	    {
+	    case strip_none:
+	      break;
+	    case strip_debugger:
+	      if ((type & N_STAB) != 0)
+		skip = TRUE;
+	      break;
+	    case strip_some:
+	      if (bfd_hash_lookup (finfo->info->keep_hash, name, FALSE, FALSE)
+		  == NULL)
+		skip = TRUE;
+	      break;
+	    case strip_all:
+	      skip = TRUE;
+	      break;
+	    }
+	  if (skip)
+	    {
+	      if (h != NULL)
+		h->written = TRUE;
+	      continue;
+	    }
+
+	  /* Get the value of the symbol.  */
+	  if ((type & N_TYPE) == N_TEXT
+	      || type == N_WEAKT)
+	    symsec = obj_textsec (input_bfd);
+	  else if ((type & N_TYPE) == N_DATA
+		   || type == N_WEAKD)
+	    symsec = obj_datasec (input_bfd);
+	  else if ((type & N_TYPE) == N_BSS
+		   || type == N_WEAKB)
+	    symsec = obj_bsssec (input_bfd);
+	  else if ((type & N_TYPE) == N_ABS
+		   || type == N_WEAKA)
+	    symsec = bfd_abs_section_ptr;
+	  else if (((type & N_TYPE) == N_INDR
+		    && (hresolve == NULL
+			|| (hresolve->root.type != bfd_link_hash_defined
+			    && hresolve->root.type != bfd_link_hash_defweak
+			    && hresolve->root.type != bfd_link_hash_common)))
+		   || type == N_WARNING)
+	    {
+	      /* Pass the next symbol through unchanged.  The
+		 condition above for indirect symbols is so that if
+		 the indirect symbol was defined, we output it with
+		 the correct definition so the debugger will
+		 understand it.  */
+	      pass = TRUE;
+	      val = GET_WORD (input_bfd, sym->e_value);
+	      symsec = NULL;
+	    }
+	  else if ((type & N_STAB) != 0)
+	    {
+	      val = GET_WORD (input_bfd, sym->e_value);
+	      symsec = NULL;
+	    }
+	  else
+	    {
+	      /* If we get here with an indirect symbol, it means that
+		 we are outputting it with a real definition.  In such
+		 a case we do not want to output the next symbol,
+		 which is the target of the indirection.  */
+	      if ((type & N_TYPE) == N_INDR)
+		skip_next = TRUE;
+
+	      symsec = NULL;
+
+	      /* We need to get the value from the hash table.  We use
+		 hresolve so that if we have defined an indirect
+		 symbol we output the final definition.  */
+	      if (h == NULL)
+		{
+		  switch (type & N_TYPE)
+		    {
+		    case N_SETT:
+		      symsec = obj_textsec (input_bfd);
+		      break;
+		    case N_SETD:
+		      symsec = obj_datasec (input_bfd);
+		      break;
+		    case N_SETB:
+		      symsec = obj_bsssec (input_bfd);
+		      break;
+		    case N_SETA:
+		      symsec = bfd_abs_section_ptr;
+		      break;
+		    default:
+		      val = 0;
+		      break;
+		    }
+		}
+	      else if (hresolve->root.type == bfd_link_hash_defined
+		       || hresolve->root.type == bfd_link_hash_defweak)
+		{
+		  asection *input_section;
+		  asection *output_section;
+
+		  /* This case usually means a common symbol which was
+		     turned into a defined symbol.  */
+		  input_section = hresolve->root.u.def.section;
+		  output_section = input_section->output_section;
+		  BFD_ASSERT (bfd_is_abs_section (output_section)
+			      || output_section->owner == output_bfd);
+		  val = (hresolve->root.u.def.value
+			 + bfd_get_section_vma (output_bfd, output_section)
+			 + input_section->output_offset);
+
+		  /* Get the correct type based on the section.  If
+		     this is a constructed set, force it to be
+		     globally visible.  */
+		  if (type == N_SETT
+		      || type == N_SETD
+		      || type == N_SETB
+		      || type == N_SETA)
+		    type |= N_EXT;
+
+		  type &=~ N_TYPE;
+
+		  if (output_section == obj_textsec (output_bfd))
+		    type |= (hresolve->root.type == bfd_link_hash_defined
+			     ? N_TEXT
+			     : N_WEAKT);
+		  else if (output_section == obj_datasec (output_bfd))
+		    type |= (hresolve->root.type == bfd_link_hash_defined
+			     ? N_DATA
+			     : N_WEAKD);
+		  else if (output_section == obj_bsssec (output_bfd))
+		    type |= (hresolve->root.type == bfd_link_hash_defined
+			     ? N_BSS
+			     : N_WEAKB);
+		  else
+		    type |= (hresolve->root.type == bfd_link_hash_defined
+			     ? N_ABS
+			     : N_WEAKA);
+		}
+	      else if (hresolve->root.type == bfd_link_hash_common)
+		val = hresolve->root.u.c.size;
+	      else if (hresolve->root.type == bfd_link_hash_undefweak)
+		{
+		  val = 0;
+		  type = N_WEAKU;
+		}
+	      else
+		val = 0;
+	    }
+	  if (symsec != NULL)
+	    val = (symsec->output_section->vma
+		   + symsec->output_offset
+		   + (GET_WORD (input_bfd, sym->e_value)
+		      - symsec->vma));
+
+	  /* If this is a global symbol set the written flag, and if
+	     it is a local symbol see if we should discard it.  */
+	  if (h != NULL)
+	    {
+	      h->written = TRUE;
+	      h->indx = obj_aout_external_sym_count (output_bfd);
+	    }
+	  else if ((type & N_TYPE) != N_SETT
+		   && (type & N_TYPE) != N_SETD
+		   && (type & N_TYPE) != N_SETB
+		   && (type & N_TYPE) != N_SETA)
+	    {
+	      switch (discard)
+		{
+		case discard_none:
+		case discard_sec_merge:
+		  break;
+		case discard_l:
+		  if ((type & N_STAB) == 0
+		      && bfd_is_local_label_name (input_bfd, name))
+		    skip = TRUE;
+		  break;
+		case discard_all:
+		  skip = TRUE;
+		  break;
+		}
+	      if (skip)
+		{
+		  pass = FALSE;
+		  continue;
+		}
+	    }
+
+	  /* An N_BINCL symbol indicates the start of the stabs
+	     entries for a header file.  We need to scan ahead to the
+	     next N_EINCL symbol, ignoring nesting, adding up all the
+	     characters in the symbol names, not including the file
+	     numbers in types (the first number after an open
+	     parenthesis).  */
+	  if (type == N_BINCL)
+	    {
+	      struct external_nlist *incl_sym;
+	      int nest;
+	      struct aout_link_includes_entry *incl_entry;
+	      struct aout_link_includes_totals *t;
+
+	      val = 0;
+	      nest = 0;
+	      for (incl_sym = sym + 1; incl_sym < sym_end; incl_sym++)
+		{
+		  int incl_type;
+
+		  incl_type = H_GET_8 (input_bfd, incl_sym->e_type);
+		  if (incl_type == N_EINCL)
+		    {
+		      if (nest == 0)
+			break;
+		      --nest;
+		    }
+		  else if (incl_type == N_BINCL)
+		    ++nest;
+		  else if (nest == 0)
+		    {
+		      const char *s;
+
+		      s = strings + GET_WORD (input_bfd, incl_sym->e_strx);
+		      for (; *s != '\0'; s++)
+			{
+			  val += *s;
+			  if (*s == '(')
+			    {
+			      /* Skip the file number.  */
+			      ++s;
+			      while (ISDIGIT (*s))
+				++s;
+			      --s;
+			    }
+			}
+		    }
+		}
+
+	      /* If we have already included a header file with the
+                 same value, then replace this one with an N_EXCL
+                 symbol.  */
+	      copy = ! finfo->info->keep_memory;
+	      incl_entry = aout_link_includes_lookup (&finfo->includes,
+						      name, TRUE, copy);
+	      if (incl_entry == NULL)
+		return FALSE;
+	      for (t = incl_entry->totals; t != NULL; t = t->next)
+		if (t->total == val)
+		  break;
+	      if (t == NULL)
+		{
+		  /* This is the first time we have seen this header
+                     file with this set of stabs strings.  */
+		  t = bfd_hash_allocate (&finfo->includes.root,
+					 sizeof *t);
+		  if (t == NULL)
+		    return FALSE;
+		  t->total = val;
+		  t->next = incl_entry->totals;
+		  incl_entry->totals = t;
+		}
+	      else
+		{
+		  int *incl_map;
+
+		  /* This is a duplicate header file.  We must change
+                     it to be an N_EXCL entry, and mark all the
+                     included symbols to prevent outputting them.  */
+		  type = N_EXCL;
+
+		  nest = 0;
+		  for (incl_sym = sym + 1, incl_map = symbol_map + 1;
+		       incl_sym < sym_end;
+		       incl_sym++, incl_map++)
+		    {
+		      int incl_type;
+
+		      incl_type = H_GET_8 (input_bfd, incl_sym->e_type);
+		      if (incl_type == N_EINCL)
+			{
+			  if (nest == 0)
+			    {
+			      *incl_map = -1;
+			      break;
+			    }
+			  --nest;
+			}
+		      else if (incl_type == N_BINCL)
+			++nest;
+		      else if (nest == 0)
+			*incl_map = -1;
+		    }
+		}
+	    }
+	}
+
+      /* Copy this symbol into the list of symbols we are going to
+	 write out.  */
+      H_PUT_8 (output_bfd, type, outsym->e_type);
+      copy = FALSE;
+      if (! finfo->info->keep_memory)
+	{
+	  /* name points into a string table which we are going to
+	     free.  If there is a hash table entry, use that string.
+	     Otherwise, copy name into memory.  */
+	  if (h != NULL)
+	    name = h->root.root.string;
+	  else
+	    copy = TRUE;
+	}
+      strtab_index = add_to_stringtab (output_bfd, finfo->strtab,
+				       name, copy);
+      if (strtab_index == (bfd_size_type) -1)
+	return FALSE;
+      PUT_WORD (output_bfd, strtab_index, outsym->e_strx);
+      PUT_WORD (output_bfd, val, outsym->e_value);
+      *symbol_map = obj_aout_external_sym_count (output_bfd);
+      ++obj_aout_external_sym_count (output_bfd);
+      ++outsym;
+    }
+
+  /* Write out the output symbols we have just constructed.  */
+  if (outsym > finfo->output_syms)
+    {
+      bfd_size_type size;
+
+      if (bfd_seek (output_bfd, finfo->symoff, SEEK_SET) != 0)
+	return FALSE;
+      size = outsym - finfo->output_syms;
+      size *= EXTERNAL_NLIST_SIZE;
+      if (bfd_bwrite ((void *) finfo->output_syms, size, output_bfd) != size)
+	return FALSE;
+      finfo->symoff += size;
+    }
+
+  return TRUE;
+}
+
+/* Write out a symbol that was not associated with an a.out input
+   object.  */
+
+static bfd_vma
+bfd_getp32 (const void *p)
+{
+  const bfd_byte *addr = p;
+  unsigned long v;
+
+  v = (unsigned long) addr[1] << 24;
+  v |= (unsigned long) addr[0] << 16;
+  v |= (unsigned long) addr[3] << 8;
+  v |= (unsigned long) addr[2];
+  return v;
+}
+
+#define COERCE32(x) (((bfd_signed_vma) (x) ^ 0x80000000) - 0x80000000)
+
+static bfd_signed_vma
+bfd_getp_signed_32 (const void *p)
+{
+  const bfd_byte *addr = p;
+  unsigned long v;
+
+  v = (unsigned long) addr[1] << 24;
+  v |= (unsigned long) addr[0] << 16;
+  v |= (unsigned long) addr[3] << 8;
+  v |= (unsigned long) addr[2];
+  return COERCE32 (v);
+}
+
+static void
+bfd_putp32 (bfd_vma data, void *p)
+{
+  bfd_byte *addr = p;
+
+  addr[0] = (data >> 16) & 0xff;
+  addr[1] = (data >> 24) & 0xff;
+  addr[2] = (data >> 0) & 0xff;
+  addr[3] = (data >> 8) & 0xff;
+}
+
+const bfd_target MY (vec) =
+{
+  TARGETNAME,			/* Name.  */
+  bfd_target_aout_flavour,
+  BFD_ENDIAN_LITTLE,		/* Target byte order (little).  */
+  BFD_ENDIAN_LITTLE,		/* Target headers byte order (little).  */
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT),
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
+  MY_symbol_leading_char,
+  AR_PAD_CHAR,			/* AR_pad_char.  */
+  15,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getp32, bfd_getp_signed_32, bfd_putp32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Data.  */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getp32, bfd_getp_signed_32, bfd_putp32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Headers.  */
+    {_bfd_dummy_target, MY_object_p, 		/* bfd_check_format.  */
+       bfd_generic_archive_p, MY_core_file_p},
+    {bfd_false, MY_mkobject,			/* bfd_set_format.  */
+       _bfd_generic_mkarchive, bfd_false},
+    {bfd_false, MY_write_object_contents, 	/* bfd_write_contents.  */
+       _bfd_write_archive_contents, bfd_false},
+
+     BFD_JUMP_TABLE_GENERIC (MY),
+     BFD_JUMP_TABLE_COPY (MY),
+     BFD_JUMP_TABLE_CORE (MY),
+     BFD_JUMP_TABLE_ARCHIVE (MY),
+     BFD_JUMP_TABLE_SYMBOLS (MY),
+     BFD_JUMP_TABLE_RELOCS (MY),
+     BFD_JUMP_TABLE_WRITE (MY),
+     BFD_JUMP_TABLE_LINK (MY),
+     BFD_JUMP_TABLE_DYNAMIC (MY),
+
+  /* Alternative_target.  */
+  NULL,
+
+  (void *) MY_backend_data
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pe-arm-wince.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pe-arm-wince.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pe-arm-wince.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pe-arm-wince.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,45 @@
+/* BFD back-end for ARM WINCE PE files.
+   Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define TARGET_UNDERSCORE    0
+#define USER_LABEL_PREFIX    ""
+
+#define TARGET_LITTLE_SYM    arm_wince_pe_little_vec
+#define TARGET_LITTLE_NAME   "pe-arm-wince-little"
+#define TARGET_BIG_SYM       arm_wince_pe_big_vec
+#define TARGET_BIG_NAME      "pe-arm-wince-big"
+
+#define bfd_arm_allocate_interworking_sections \
+  bfd_arm_wince_pe_allocate_interworking_sections
+#define bfd_arm_get_bfd_for_interworking \
+  bfd_arm_wince_pe_get_bfd_for_interworking
+#define bfd_arm_process_before_allocation \
+  bfd_arm_wince_pe_process_before_allocation
+
+#define LOCAL_LABEL_PREFIX "."
+
+#include "sysdep.h"
+#include "bfd.h"
+
+#undef  bfd_pe_print_pdata
+#define	bfd_pe_print_pdata   _bfd_pe_print_ce_compressed_pdata
+
+#include "pe-arm.c"
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pe-arm.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pe-arm.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pe-arm.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pe-arm.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,66 @@
+/* BFD back-end for ARM PECOFF files.
+   Copyright 1995, 1996, 1999, 2000, 2001, 2002, 2005, 2006, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* Do this before including bfd.h, so we prototype the right functions.  */
+
+#ifndef bfd_arm_allocate_interworking_sections
+#define bfd_arm_allocate_interworking_sections \
+  bfd_armpe_allocate_interworking_sections
+#define bfd_arm_get_bfd_for_interworking \
+  bfd_armpe_get_bfd_for_interworking
+#define bfd_arm_process_before_allocation \
+  bfd_armpe_process_before_allocation
+#endif
+
+#include "sysdep.h"
+#include "bfd.h"
+
+#ifndef TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM    armpe_little_vec
+#define TARGET_LITTLE_NAME   "pe-arm-little"
+#define TARGET_BIG_SYM       armpe_big_vec
+#define TARGET_BIG_NAME      "pe-arm-big"
+#endif
+
+#define COFF_WITH_PE
+#define PCRELOFFSET          TRUE
+#define COFF_LONG_SECTION_NAMES
+
+#define COFF_SECTION_ALIGNMENT_ENTRIES \
+{ COFF_SECTION_NAME_EXACT_MATCH (".bss"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".data"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".rdata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".text"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".idata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".pdata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".debug"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi."), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
+
+#include "coff-arm.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pe-i386.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pe-i386.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pe-i386.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pe-i386.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,44 @@
+/* BFD back-end for Intel 386 PECOFF files.
+   Copyright 1995, 1996, 1999, 2001, 2002, 2004, 2005, 2006, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+
+#define TARGET_SYM 		i386pe_vec
+#define TARGET_NAME 		"pe-i386"
+#define COFF_WITH_PE
+#define PCRELOFFSET 		TRUE
+#define TARGET_UNDERSCORE 	'_'
+#define COFF_LONG_SECTION_NAMES
+#define COFF_SUPPORT_GNU_LINKONCE
+#define COFF_LONG_FILENAMES
+
+#define COFF_SECTION_ALIGNMENT_ENTRIES \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".idata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".pdata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".debug"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi."), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
+
+#include "coff-i386.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pe-mcore.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pe-mcore.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pe-mcore.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pe-mcore.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,41 @@
+/* BFD back-end for MCore PECOFF files.
+   Copyright 1999, 2002, 2005, 2007, 2008  Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+
+#ifndef TARGET_BIG_SYM
+#define TARGET_BIG_SYM       mcore_pe_big_vec
+#define TARGET_BIG_NAME      "pe-mcore-big"
+#define TARGET_LITTLE_SYM    mcore_pe_little_vec
+#define TARGET_LITTLE_NAME   "pe-mcore-little"
+#endif
+
+#define COFF_WITH_PE
+#define PCRELOFFSET          TRUE
+#define COFF_LONG_SECTION_NAMES
+
+#define MCORE_PE
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coff-mcore.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pe-mips.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pe-mips.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pe-mips.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pe-mips.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,923 @@
+/* BFD back-end for MIPS PE COFF files.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Modified from coff-i386.c by DJ Delorie, dj@cygnus.com
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define COFF_WITH_PE
+/* pei-mips.c may have defined this to default off (0) before
+  including this file, so don't redefine if that's the case.
+  Otherwise we're generating objects, not executable images,
+  so we want to define it to default on.  */
+#ifndef COFF_LONG_SECTION_NAMES
+#define COFF_LONG_SECTION_NAMES
+#endif /* COFF_LONG_SECTION_NAMES */
+#define PCRELOFFSET TRUE
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "coff/mipspe.h"
+#include "coff/internal.h"
+#include "coff/pe.h"
+#include "libcoff.h"
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER 2
+/* The page size is a guess based on ELF.  */
+
+#define COFF_PAGE_SIZE 0x1000
+
+/* For some reason when using mips COFF the value stored in the .text
+   section for a reference to a common symbol is the value itself plus
+   any desired offset.  Ian Taylor, Cygnus Support.  */
+
+/* If we are producing relocatable output, we need to do some
+   adjustments to the object file that are not done by the
+   bfd_perform_relocation function.  This function is called by every
+   reloc type to make any required adjustments.  */
+
+static bfd_reloc_status_type
+coff_mips_reloc (bfd *abfd,
+		 arelent *reloc_entry,
+		 asymbol *symbol,
+		 void * data,
+		 asection *input_section ATTRIBUTE_UNUSED,
+		 bfd *output_bfd,
+		 char **error_message ATTRIBUTE_UNUSED)
+{
+  symvalue diff;
+
+  if (output_bfd == NULL)
+    return bfd_reloc_continue;
+
+  if (bfd_is_com_section (symbol->section))
+    {
+#ifndef COFF_WITH_PE
+      /* We are relocating a common symbol.  The current value in the
+	 object file is ORIG + OFFSET, where ORIG is the value of the
+	 common symbol as seen by the object file when it was compiled
+	 (this may be zero if the symbol was undefined) and OFFSET is
+	 the offset into the common symbol (normally zero, but may be
+	 non-zero when referring to a field in a common structure).
+	 ORIG is the negative of reloc_entry->addend, which is set by
+	 the CALC_ADDEND macro below.  We want to replace the value in
+	 the object file with NEW + OFFSET, where NEW is the value of
+	 the common symbol which we are going to put in the final
+	 object file.  NEW is symbol->value.  */
+      diff = symbol->value + reloc_entry->addend;
+#else
+      /* In PE mode, we do not offset the common symbol.  */
+      diff = reloc_entry->addend;
+#endif
+    }
+  else
+    /* For some reason bfd_perform_relocation always effectively
+       ignores the addend for a COFF target when producing
+       relocatable output.  This seems to be always wrong for 386
+       COFF, so we handle the addend here instead.  */
+    diff = reloc_entry->addend;
+
+#define DOIT(x) \
+  x = ((x & ~howto->dst_mask) | (((x & howto->src_mask) + (diff >> howto->rightshift)) & howto->dst_mask))
+
+    if (diff != 0)
+      {
+	reloc_howto_type *howto = reloc_entry->howto;
+	unsigned char *addr = (unsigned char *) data + reloc_entry->address;
+
+	switch (howto->size)
+	  {
+	  case 0:
+	    {
+	      char x = bfd_get_8 (abfd, addr);
+
+	      DOIT (x);
+	      bfd_put_8 (abfd, x, addr);
+	    }
+	    break;
+
+	  case 1:
+	    {
+	      short x = bfd_get_16 (abfd, addr);
+
+	      DOIT (x);
+	      bfd_put_16 (abfd, (bfd_vma) x, addr);
+	    }
+	    break;
+
+	  case 2:
+	    {
+	      long x = bfd_get_32 (abfd, addr);
+
+	      DOIT (x);
+	      bfd_put_32 (abfd, (bfd_vma) x, addr);
+	    }
+	    break;
+
+	  default:
+	    abort ();
+	  }
+      }
+
+  /* Now let bfd_perform_relocation finish everything up.  */
+  return bfd_reloc_continue;
+}
+
+#ifdef COFF_WITH_PE
+/* Return TRUE if this relocation should
+   appear in the output .reloc section.  */
+
+static bfd_boolean
+in_reloc_p (bfd * abfd ATTRIBUTE_UNUSED, reloc_howto_type *howto)
+{
+  return ! howto->pc_relative && howto->type != MIPS_R_RVA;
+}
+#endif
+
+#ifndef PCRELOFFSET
+#define PCRELOFFSET FALSE
+#endif
+
+static reloc_howto_type howto_table[] =
+{
+  /* Reloc type 0 is ignored.  The reloc reading code ensures that
+     this is a reference to the .abs section, which will cause
+     bfd_perform_relocation to do nothing.  */
+  HOWTO (MIPS_R_ABSOLUTE,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 0,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 8,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos. */
+	 complain_overflow_dont, /* Complain_on_overflow. */
+	 0,			/* Special_function. */
+	 "IGNORE",		/* Name. */
+	 FALSE,			/* Partial_inplace. */
+	 0,			/* Src_mask. */
+	 0,			/* Dst_mask. */
+	 FALSE),		/* Pcrel_offset. */
+
+  /* A 16 bit reference to a symbol, normally from a data section.  */
+  HOWTO (MIPS_R_REFHALF,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 1,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos. */
+	 complain_overflow_bitfield, /* Complain_on_overflow. */
+	 coff_mips_reloc,	/* Special_function. */
+	 "REFHALF",		/* Name. */
+	 TRUE,			/* Partial_inplace. */
+	 0xffff,		/* Src_mask. */
+	 0xffff,		/* Dst_mask. */
+	 FALSE),		/* Pcrel_offset. */
+
+  /* A 32 bit reference to a symbol, normally from a data section.  */
+  HOWTO (MIPS_R_REFWORD,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos. */
+	 complain_overflow_bitfield, /* Complain_on_overflow. */
+	 coff_mips_reloc,	/* Special_function. */
+	 "REFWORD",		/* Name. */
+	 TRUE,			/* Partial_inplace. */
+	 0xffffffff,		/* Src_mask. */
+	 0xffffffff,		/* Dst_mask. */
+	 FALSE),		/* Pcrel_offset. */
+
+  /* A 26 bit absolute jump address.  */
+  HOWTO (MIPS_R_JMPADDR,	/* Type.  */
+	 2,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 26,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos. */
+	 complain_overflow_dont, /* Complain_on_overflow. */
+	 			/* This needs complex overflow
+				   detection, because the upper four
+				   bits must match the PC.  */
+	 coff_mips_reloc,	/* Special_function. */
+	 "JMPADDR",		/* Name. */
+	 TRUE,			/* Partial_inplace. */
+	 0x3ffffff,		/* Src_mask. */
+	 0x3ffffff,		/* Dst_mask. */
+	 FALSE),		/* Pcrel_offset. */
+
+  /* The high 16 bits of a symbol value.  Handled by the function
+     mips_refhi_reloc.  */
+  HOWTO (MIPS_R_REFHI,		/* Type.  */
+	 16,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos. */
+	 complain_overflow_bitfield, /* Complain_on_overflow. */
+	 coff_mips_reloc,	/* Special_function. */
+	 "REFHI",		/* Name. */
+	 TRUE,			/* Partial_inplace. */
+	 0xffff,		/* Src_mask. */
+	 0xffff,		/* Dst_mask. */
+	 FALSE),		/* Pcrel_offset. */
+
+  /* The low 16 bits of a symbol value.  */
+  HOWTO (MIPS_R_REFLO,		/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos. */
+	 complain_overflow_dont, /* Complain_on_overflow. */
+	 coff_mips_reloc,	/* Special_function. */
+	 "REFLO",		/* Name. */
+	 TRUE,			/* Partial_inplace. */
+	 0xffff,		/* Src_mask. */
+	 0xffff,		/* Dst_mask. */
+	 FALSE),		/* Pcrel_offset. */
+
+  /* A reference to an offset from the gp register.  Handled by the
+     function mips_gprel_reloc.  */
+  HOWTO (MIPS_R_GPREL,		/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos. */
+	 complain_overflow_signed, /* Complain_on_overflow. */
+	 coff_mips_reloc,	/* Special_function. */
+	 "GPREL",		/* Name. */
+	 TRUE,			/* Partial_inplace. */
+	 0xffff,		/* Src_mask. */
+	 0xffff,		/* Dst_mask. */
+	 FALSE),		/* Pcrel_offset. */
+
+  /* A reference to a literal using an offset from the gp register.
+     Handled by the function mips_gprel_reloc.  */
+  HOWTO (MIPS_R_LITERAL,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos. */
+	 complain_overflow_signed, /* Complain_on_overflow. */
+	 coff_mips_reloc,	/* Special_function. */
+	 "LITERAL",		/* Name. */
+	 TRUE,			/* Partial_inplace. */
+	 0xffff,		/* Src_mask. */
+	 0xffff,		/* Dst_mask. */
+	 FALSE),		/* Pcrel_offset. */
+
+  EMPTY_HOWTO (8),
+  EMPTY_HOWTO (9),
+  EMPTY_HOWTO (10),
+  EMPTY_HOWTO (11),
+  EMPTY_HOWTO (12),
+  EMPTY_HOWTO (13),
+  EMPTY_HOWTO (14),
+  EMPTY_HOWTO (15),
+  EMPTY_HOWTO (16),
+  EMPTY_HOWTO (17),
+  EMPTY_HOWTO (18),
+  EMPTY_HOWTO (19),
+  EMPTY_HOWTO (20),
+  EMPTY_HOWTO (21),
+  EMPTY_HOWTO (22),
+  EMPTY_HOWTO (23),
+  EMPTY_HOWTO (24),
+  EMPTY_HOWTO (25),
+  EMPTY_HOWTO (26),
+  EMPTY_HOWTO (27),
+  EMPTY_HOWTO (28),
+  EMPTY_HOWTO (29),
+  EMPTY_HOWTO (30),
+  EMPTY_HOWTO (31),
+  EMPTY_HOWTO (32),
+  EMPTY_HOWTO (33),
+  HOWTO (MIPS_R_RVA,            /* Type.  */
+	 0,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,	                /* Bitsize.  */
+	 FALSE,	                /* PC_relative.  */
+	 0,	                /* Bitpos. */
+	 complain_overflow_bitfield, /* Complain_on_overflow. */
+	 coff_mips_reloc,       /* Special_function. */
+	 "rva32",	        /* Name. */
+	 TRUE,	                /* Partial_inplace. */
+	 0xffffffff,            /* Src_mask. */
+	 0xffffffff,            /* Dst_mask. */
+	 FALSE),                /* Pcrel_offset. */
+  EMPTY_HOWTO (35),
+  EMPTY_HOWTO (36),
+  HOWTO (MIPS_R_PAIR,           /* Type.  */
+	 0,	                /* Rightshift.  */
+	 2,	                /* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,	                /* Bitsize.  */
+	 FALSE,	                /* PC_relative.  */
+	 0,	                /* Bitpos. */
+	 complain_overflow_bitfield, /* Complain_on_overflow. */
+	 coff_mips_reloc,       /* Special_function. */
+	 "PAIR",	        /* Name. */
+	 TRUE,	                /* Partial_inplace. */
+	 0xffffffff,            /* Src_mask. */
+	 0xffffffff,            /* Dst_mask. */
+	 FALSE),                /* Pcrel_offset. */
+};
+
+/* Turn a howto into a reloc nunmber.  */
+
+#define SELECT_RELOC(x, howto) { x.r_type = howto->type; }
+#define BADMAG(x)              MIPSBADMAG (x)
+
+/* Customize coffcode.h.  */
+#define MIPS 1
+
+#define RTYPE2HOWTO(cache_ptr, dst) \
+	    (cache_ptr)->howto = howto_table + (dst)->r_type;
+
+/* Compute the addend of a reloc.  If the reloc is to a common symbol,
+   the object file contains the value of the common symbol.  By the
+   time this is called, the linker may be using a different symbol
+   from a different object file with a different value.  Therefore, we
+   hack wildly to locate the original symbol from this file so that we
+   can make the correct adjustment.  This macro sets coffsym to the
+   symbol from the original file, and uses it to set the addend value
+   correctly.  If this is not a common symbol, the usual addend
+   calculation is done, except that an additional tweak is needed for
+   PC relative relocs.
+   FIXME: This macro refers to symbols and asect; these are from the
+   calling function, not the macro arguments.  */
+
+#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr)		\
+  {								\
+    coff_symbol_type *coffsym = NULL;				\
+    if (ptr && bfd_asymbol_bfd (ptr) != abfd)			\
+      coffsym = (obj_symbols (abfd)				\
+	         + (cache_ptr->sym_ptr_ptr - symbols));		\
+    else if (ptr)						\
+      coffsym = coff_symbol_from (abfd, ptr);			\
+    if (coffsym != NULL						\
+	&& coffsym->native->u.syment.n_scnum == 0)		\
+      cache_ptr->addend = - coffsym->native->u.syment.n_value;	\
+    else if (ptr && bfd_asymbol_bfd (ptr) == abfd		\
+	     && ptr->section != NULL)				\
+      cache_ptr->addend = - (ptr->section->vma + ptr->value);	\
+    else							\
+      cache_ptr->addend = 0;					\
+    if (ptr && howto_table[reloc.r_type].pc_relative)		\
+      cache_ptr->addend += asect->vma;				\
+  }
+
+/* Convert an rtype to howto for the COFF backend linker.  */
+
+static reloc_howto_type *
+coff_mips_rtype_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+			  asection *sec,
+			  struct internal_reloc *rel,
+			  struct coff_link_hash_entry *h,
+			  struct internal_syment *sym,
+			  bfd_vma *addendp)
+{
+
+  reloc_howto_type *howto;
+
+  howto = howto_table + rel->r_type;
+
+#ifdef COFF_WITH_PE
+  *addendp = 0;
+#endif
+
+  if (howto->pc_relative)
+    *addendp += sec->vma;
+
+  if (sym != NULL && sym->n_scnum == 0 && sym->n_value != 0)
+    {
+      /* This is a common symbol.  The section contents include the
+	 size (sym->n_value) as an addend.  The relocate_section
+	 function will be adding in the final value of the symbol.  We
+	 need to subtract out the current size in order to get the
+	 correct result.  */
+
+      BFD_ASSERT (h != NULL);
+
+#ifndef COFF_WITH_PE
+      /* I think we *do* want to bypass this.  If we don't, I have
+	 seen some data parameters get the wrong relocation address.
+	 If I link two versions with and without this section bypassed
+	 and then do a binary comparison, the addresses which are
+	 different can be looked up in the map.  The case in which
+	 this section has been bypassed has addresses which correspond
+	 to values I can find in the map.  */
+      *addendp -= sym->n_value;
+#endif
+    }
+
+#ifndef COFF_WITH_PE
+  /* If the output symbol is common (in which case this must be a
+     relocatable link), we need to add in the final size of the
+     common symbol.  */
+  if (h != NULL && h->root.type == bfd_link_hash_common)
+    *addendp += h->root.u.c.size;
+#endif
+
+#ifdef COFF_WITH_PE
+  if (howto->pc_relative)
+    {
+      *addendp -= 4;
+
+      /* If the symbol is defined, then the generic code is going to
+         add back the symbol value in order to cancel out an
+         adjustment it made to the addend.  However, we set the addend
+         to 0 at the start of this function.  We need to adjust here,
+         to avoid the adjustment the generic code will make.  FIXME:
+         This is getting a bit hackish.  */
+      if (sym != NULL && sym->n_scnum != 0)
+	*addendp -= sym->n_value;
+    }
+
+  if (rel->r_type == MIPS_R_RVA)
+    *addendp -= pe_data (sec->output_section->owner)->pe_opthdr.ImageBase;
+#endif
+
+  return howto;
+}
+
+#define coff_rtype_to_howto         coff_mips_rtype_to_howto
+#define coff_bfd_reloc_type_lookup  coff_mips_reloc_type_lookup
+#define coff_bfd_reloc_name_lookup coff_mips_reloc_name_lookup
+
+/* Get the howto structure for a generic reloc type.  */
+
+static reloc_howto_type *
+coff_mips_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			     bfd_reloc_code_real_type code)
+{
+  int mips_type;
+
+  switch (code)
+    {
+    case BFD_RELOC_16:
+      mips_type = MIPS_R_REFHALF;
+      break;
+    case BFD_RELOC_32:
+    case BFD_RELOC_CTOR:
+      mips_type = MIPS_R_REFWORD;
+      break;
+    case BFD_RELOC_MIPS_JMP:
+      mips_type = MIPS_R_JMPADDR;
+      break;
+    case BFD_RELOC_HI16_S:
+      mips_type = MIPS_R_REFHI;
+      break;
+    case BFD_RELOC_LO16:
+      mips_type = MIPS_R_REFLO;
+      break;
+    case BFD_RELOC_GPREL16:
+      mips_type = MIPS_R_GPREL;
+      break;
+    case BFD_RELOC_MIPS_LITERAL:
+      mips_type = MIPS_R_LITERAL;
+      break;
+    case BFD_RELOC_RVA:
+      mips_type = MIPS_R_RVA;
+      break;
+    default:
+      return NULL;
+    }
+
+  return & howto_table [mips_type];
+}
+
+static reloc_howto_type *
+coff_mips_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			     const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (howto_table) / sizeof (howto_table[0]);
+       i++)
+    if (howto_table[i].name != NULL
+	&& strcasecmp (howto_table[i].name, r_name) == 0)
+      return &howto_table[i];
+
+  return NULL;
+}
+
+static void
+mips_swap_reloc_in (bfd * abfd, void * src, void * dst)
+{
+  static struct internal_reloc pair_prev;
+  RELOC *reloc_src = (RELOC *) src;
+  struct internal_reloc *reloc_dst = (struct internal_reloc *) dst;
+
+  reloc_dst->r_vaddr = H_GET_32 (abfd, reloc_src->r_vaddr);
+  reloc_dst->r_symndx = H_GET_S32 (abfd, reloc_src->r_symndx);
+  reloc_dst->r_type = H_GET_16 (abfd, reloc_src->r_type);
+  reloc_dst->r_size = 0;
+  reloc_dst->r_extern = 0;
+  reloc_dst->r_offset = 0;
+
+  switch (reloc_dst->r_type)
+  {
+  case MIPS_R_REFHI:
+    pair_prev = *reloc_dst;
+    break;
+  case MIPS_R_PAIR:
+    reloc_dst->r_offset = reloc_dst->r_symndx;
+    if (reloc_dst->r_offset & 0x8000)
+      reloc_dst->r_offset -= 0x10000;
+    reloc_dst->r_symndx = pair_prev.r_symndx;
+    break;
+  }
+}
+
+static unsigned int
+mips_swap_reloc_out (bfd * abfd, void * src, void * dst)
+{
+  static bfd_vma prev_addr = 0;
+  struct internal_reloc *reloc_src = (struct internal_reloc *)src;
+  struct external_reloc *reloc_dst = (struct external_reloc *)dst;
+
+  switch (reloc_src->r_type)
+    {
+    case MIPS_R_REFHI:
+      prev_addr = reloc_src->r_vaddr;
+      break;
+    case MIPS_R_REFLO:
+      if (reloc_src->r_vaddr == prev_addr)
+	{
+	  /* FIXME: only slightly hackish.  If we see a REFLO pointing to
+	     the same address as a REFHI, we assume this is the matching
+	     PAIR reloc and output it accordingly.  The symndx is really
+	     the low 16 bits of the addend */
+	  H_PUT_32 (abfd, reloc_src->r_vaddr, reloc_dst->r_vaddr);
+	  H_PUT_32 (abfd, reloc_src->r_symndx, reloc_dst->r_symndx);
+	  H_PUT_16 (abfd, MIPS_R_PAIR, reloc_dst->r_type);
+	  return RELSZ;
+	}
+      break;
+    }
+
+  H_PUT_32 (abfd, reloc_src->r_vaddr, reloc_dst->r_vaddr);
+  H_PUT_32 (abfd, reloc_src->r_symndx, reloc_dst->r_symndx);
+
+  H_PUT_16 (abfd, reloc_src->r_type, reloc_dst->r_type);
+  return RELSZ;
+}
+
+#define coff_swap_reloc_in   mips_swap_reloc_in
+#define coff_swap_reloc_out  mips_swap_reloc_out
+#define NO_COFF_RELOCS
+
+static bfd_boolean
+coff_pe_mips_relocate_section (bfd *output_bfd,
+			       struct bfd_link_info *info,
+			       bfd *input_bfd,
+			       asection *input_section,
+			       bfd_byte *contents,
+			       struct internal_reloc *relocs,
+			       struct internal_syment *syms,
+			       asection **sections)
+{
+  struct internal_reloc *rel;
+  struct internal_reloc *rel_end;
+  unsigned int i;
+
+  if (info->relocatable)
+    {
+      (*_bfd_error_handler)
+	(_("%B: `ld -r' not supported with PE MIPS objects\n"), input_bfd);
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  BFD_ASSERT (input_bfd->xvec->byteorder
+	      == output_bfd->xvec->byteorder);
+
+  rel = relocs;
+  rel_end = rel + input_section->reloc_count;
+
+  for (i = 0; rel < rel_end; rel++, i++)
+    {
+      long symndx;
+      struct coff_link_hash_entry *h;
+      struct internal_syment *sym;
+      bfd_vma addend = 0;
+      bfd_vma val, tmp, targ, src, low;
+      reloc_howto_type *howto;
+      unsigned char *mem = contents + rel->r_vaddr;
+
+      symndx = rel->r_symndx;
+
+      if (symndx == -1)
+	{
+	  h = NULL;
+	  sym = NULL;
+	}
+      else
+	{
+	  h = obj_coff_sym_hashes (input_bfd)[symndx];
+	  sym = syms + symndx;
+	}
+
+      /* COFF treats common symbols in one of two ways.  Either the
+         size of the symbol is included in the section contents, or it
+         is not.  We assume that the size is not included, and force
+         the rtype_to_howto function to adjust the addend as needed.  */
+
+      if (sym != NULL && sym->n_scnum != 0)
+	addend = - sym->n_value;
+      else
+	addend = 0;
+
+      howto = bfd_coff_rtype_to_howto (input_bfd, input_section, rel, h,
+				       sym, &addend);
+      if (howto == NULL)
+	return FALSE;
+
+      /* If we are doing a relocatable link, then we can just ignore
+         a PC relative reloc that is pcrel_offset.  It will already
+         have the correct value.  If this is not a relocatable link,
+         then we should ignore the symbol value.  */
+      if (howto->pc_relative && howto->pcrel_offset)
+	{
+	  if (info->relocatable)
+	    continue;
+	  if (sym != NULL && sym->n_scnum != 0)
+	    addend += sym->n_value;
+	}
+
+      val = 0;
+
+      if (h == NULL)
+	{
+	  asection *sec;
+
+	  if (symndx == -1)
+	    {
+	      sec = bfd_abs_section_ptr;
+	      val = 0;
+	    }
+	  else
+	    {
+	      sec = sections[symndx];
+              val = (sec->output_section->vma
+		     + sec->output_offset
+		     + sym->n_value);
+	      if (! obj_pe (input_bfd))
+		val -= sec->vma;
+	    }
+	}
+      else
+	{
+	  if (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	    {
+	      asection *sec;
+
+	      sec = h->root.u.def.section;
+	      val = (h->root.u.def.value
+		     + sec->output_section->vma
+		     + sec->output_offset);
+	      }
+
+	  else if (! info->relocatable)
+	    {
+	      if (! ((*info->callbacks->undefined_symbol)
+		     (info, h->root.root.string, input_bfd, input_section,
+		      rel->r_vaddr - input_section->vma, TRUE)))
+		return FALSE;
+	    }
+	}
+
+      src = rel->r_vaddr + input_section->output_section->vma
+	+ input_section->output_offset;
+
+      /* OK, at this point the following variables are set up:
+	   src = VMA of the memory we're fixing up
+	   mem = pointer to memory we're fixing up
+	   val = VMA of what we need to refer to.  */
+
+#define UI(x) (*_bfd_error_handler) (_("%B: unimplemented %s\n"), \
+				     input_bfd, x); \
+	      bfd_set_error (bfd_error_bad_value);
+
+      switch (rel->r_type)
+	{
+	case MIPS_R_ABSOLUTE:
+	  /* Ignore these.  */
+	  break;
+
+	case MIPS_R_REFHALF:
+	  UI ("refhalf");
+	  break;
+
+	case MIPS_R_REFWORD:
+	  tmp = bfd_get_32 (input_bfd, mem);
+	  /* printf ("refword: src=%08x targ=%08x+%08x\n", src, tmp, val); */
+	  tmp += val;
+	  bfd_put_32 (input_bfd, tmp, mem);
+	  break;
+
+	case MIPS_R_JMPADDR:
+	  tmp = bfd_get_32 (input_bfd, mem);
+	  targ = val + (tmp & 0x03ffffff) * 4;
+	  if ((src & 0xf0000000) != (targ & 0xf0000000))
+	    {
+	      (*_bfd_error_handler) (_("%B: jump too far away\n"), input_bfd);
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	  tmp &= 0xfc000000;
+	  tmp |= (targ / 4) & 0x3ffffff;
+	  bfd_put_32 (input_bfd, tmp, mem);
+	  break;
+
+	case MIPS_R_REFHI:
+	  tmp = bfd_get_32 (input_bfd, mem);
+	  switch (rel[1].r_type)
+	    {
+	    case MIPS_R_PAIR:
+	      /* MS PE object */
+	      targ = val + rel[1].r_offset + ((tmp & 0xffff) << 16);
+	      break;
+	    case MIPS_R_REFLO:
+	      /* GNU COFF object */
+	      low = bfd_get_32 (input_bfd, contents + rel[1].r_vaddr);
+	      low &= 0xffff;
+	      if (low & 0x8000)
+		low -= 0x10000;
+	      targ = val + low + ((tmp & 0xffff) << 16);
+	      break;
+	    default:
+	      (*_bfd_error_handler) (_("%B: bad pair/reflo after refhi\n"),
+				     input_bfd);
+	      bfd_set_error (bfd_error_bad_value);
+	      return FALSE;
+	    }
+	  tmp &= 0xffff0000;
+	  tmp |= (targ >> 16) & 0xffff;
+	  bfd_put_32 (input_bfd, tmp, mem);
+	  break;
+
+	case MIPS_R_REFLO:
+	  tmp = bfd_get_32 (input_bfd, mem);
+	  targ = val + (tmp & 0xffff);
+	  /* printf ("refword: src=%08x targ=%08x\n", src, targ); */
+	  tmp &= 0xffff0000;
+	  tmp |= targ & 0xffff;
+	  bfd_put_32 (input_bfd, tmp, mem);
+	  break;
+
+	case MIPS_R_GPREL:
+	case MIPS_R_LITERAL:
+	  UI ("gprel");
+	  break;
+
+	case MIPS_R_SECTION:
+	  UI ("section");
+	  break;
+
+	case MIPS_R_SECREL:
+	  UI ("secrel");
+	  break;
+
+	case MIPS_R_SECRELLO:
+	  UI ("secrello");
+	  break;
+
+	case MIPS_R_SECRELHI:
+	  UI ("secrelhi");
+	  break;
+
+	case MIPS_R_RVA:
+	  tmp = bfd_get_32 (input_bfd, mem);
+	  /* printf ("rva: src=%08x targ=%08x+%08x\n", src, tmp, val); */
+	  tmp += val
+	    - pe_data (input_section->output_section->owner)->pe_opthdr.ImageBase;
+	  bfd_put_32 (input_bfd, tmp, mem);
+	  break;
+
+	case MIPS_R_PAIR:
+	  /* ignore these */
+	  break;
+	}
+    }
+
+  return TRUE;
+}
+
+#define coff_relocate_section coff_pe_mips_relocate_section
+
+#ifdef TARGET_UNDERSCORE
+
+/* If mips gcc uses underscores for symbol names, then it does not use
+   a leading dot for local labels, so if TARGET_UNDERSCORE is defined
+   we treat all symbols starting with L as local.  */
+
+static bfd_boolean
+coff_mips_is_local_label_name (bfd *abfd, const char *name)
+{
+  if (name[0] == 'L')
+    return TRUE;
+
+  return _bfd_coff_is_local_label_name (abfd, name);
+}
+
+#define coff_bfd_is_local_label_name coff_mips_is_local_label_name
+
+#endif /* TARGET_UNDERSCORE */
+
+#define COFF_NO_HACK_SCNHDR_SIZE
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coffcode.h"
+
+const bfd_target
+#ifdef TARGET_SYM
+  TARGET_SYM =
+#else
+  mipslpe_vec =
+#endif
+{
+#ifdef TARGET_NAME
+  TARGET_NAME,
+#else
+  "pe-mips",			/* Name.  */
+#endif
+  bfd_target_coff_flavour,
+  BFD_ENDIAN_LITTLE,		/* Data byte order is little.  */
+  BFD_ENDIAN_LITTLE,		/* Header byte order is little.  */
+
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+
+#ifndef COFF_WITH_PE
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC /* Section flags.  */
+   | SEC_CODE | SEC_DATA),
+#else
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC /* Section flags.  */
+   | SEC_CODE | SEC_DATA
+   | SEC_LINK_ONCE | SEC_LINK_DUPLICATES),
+#endif
+
+#ifdef TARGET_UNDERSCORE
+  TARGET_UNDERSCORE,		/* Leading underscore.  */
+#else
+  0,				/* leading underscore */
+#endif
+  '/',				/* AR_pad_char.  */
+  15,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
+
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Data.  */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Headers.  */
+
+  /* Note that we allow an object file to be treated as a core file as well.  */
+  {_bfd_dummy_target, coff_object_p, /* bfd_check_format.  */
+   bfd_generic_archive_p, coff_object_p},
+  {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format.  */
+   bfd_false},
+  {bfd_false, coff_write_object_contents, /* bfd_write_contents.  */
+   _bfd_write_archive_contents, bfd_false},
+
+  BFD_JUMP_TABLE_GENERIC (coff),
+  BFD_JUMP_TABLE_COPY (coff),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+  BFD_JUMP_TABLE_SYMBOLS (coff),
+  BFD_JUMP_TABLE_RELOCS (coff),
+  BFD_JUMP_TABLE_WRITE (coff),
+  BFD_JUMP_TABLE_LINK (coff),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  COFF_SWAP_TABLE
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pe-ppc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pe-ppc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pe-ppc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pe-ppc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,48 @@
+/* BFD back-end for PowerPC PECOFF files.
+   Copyright 1995, 1996, 1999, 2001, 2005, 2007, 2008
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+
+#define E_FILENMLEN     18
+
+#define PPC_PE
+
+#define TARGET_LITTLE_SYM   bfd_powerpcle_pe_vec
+#define TARGET_LITTLE_NAME "pe-powerpcle"
+
+#define TARGET_BIG_SYM      bfd_powerpc_pe_vec
+#define TARGET_BIG_NAME    "pe-powerpc"
+
+#define COFF_WITH_PE
+
+#define COFF_LONG_SECTION_NAMES
+
+/* FIXME: verify PCRELOFFSET is always false */
+
+/* FIXME: This target no longer works.  Search for POWERPC_LE_PE in
+   coff-ppc.c and peigen.c.  */
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coff-ppc.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pe-sh.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pe-sh.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pe-sh.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pe-sh.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,31 @@
+/* BFD back-end for SH PECOFF files.
+   Copyright 1995, 2000, 2001, 2002, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+
+#define TARGET_SHL_SYM shlpe_vec
+#define TARGET_SHL_NAME "pe-shl"
+#define COFF_WITH_PE
+#define PCRELOFFSET TRUE
+#define TARGET_UNDERSCORE '_'
+#define COFF_LONG_SECTION_NAMES
+
+#include "coff-sh.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pe-x86_64.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pe-x86_64.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pe-x86_64.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pe-x86_64.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,58 @@
+/* BFD back-end for Intel/AMD x86_64 PECOFF files.
+   Copyright 2006, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.
+   
+   Written by Kai Tietz, OneVision Software GmbH&CoKg.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+
+#define TARGET_SYM 		x86_64pe_vec
+#define TARGET_NAME 		"pe-x86-64"
+#define COFF_WITH_PE
+#define COFF_WITH_pex64
+#define PCRELOFFSET 		TRUE
+#if defined (USE_MINGW64_LEADING_UNDERSCORES)
+#define TARGET_UNDERSCORE 	'_'
+#else
+#define TARGET_UNDERSCORE 	0
+#endif
+#define COFF_LONG_SECTION_NAMES
+#define COFF_SUPPORT_GNU_LINKONCE
+#define COFF_LONG_FILENAMES
+
+#define COFF_SECTION_ALIGNMENT_ENTRIES \
+{ COFF_SECTION_NAME_EXACT_MATCH (".bss"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 4 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".data"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 4 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".rdata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 4 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".text"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 4 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".idata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".pdata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".debug"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi."), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
+
+#include "coff-x86_64.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/peXXigen.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/peXXigen.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/peXXigen.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/peXXigen.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2487 @@
+/* Support for the generic parts of PE/PEI; the common executable parts.
+   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+   Written by Cygnus Solutions.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* Most of this hacked by Steve Chamberlain <sac@cygnus.com>.
+
+   PE/PEI rearrangement (and code added): Donn Terry
+					  Softway Systems, Inc.  */
+
+/* Hey look, some documentation [and in a place you expect to find it]!
+
+   The main reference for the pei format is "Microsoft Portable Executable
+   and Common Object File Format Specification 4.1".  Get it if you need to
+   do some serious hacking on this code.
+
+   Another reference:
+   "Peering Inside the PE: A Tour of the Win32 Portable Executable
+   File Format", MSJ 1994, Volume 9.
+
+   The *sole* difference between the pe format and the pei format is that the
+   latter has an MSDOS 2.0 .exe header on the front that prints the message
+   "This app must be run under Windows." (or some such).
+   (FIXME: Whether that statement is *really* true or not is unknown.
+   Are there more subtle differences between pe and pei formats?
+   For now assume there aren't.  If you find one, then for God sakes
+   document it here!)
+
+   The Microsoft docs use the word "image" instead of "executable" because
+   the former can also refer to a DLL (shared library).  Confusion can arise
+   because the `i' in `pei' also refers to "image".  The `pe' format can
+   also create images (i.e. executables), it's just that to run on a win32
+   system you need to use the pei format.
+
+   FIXME: Please add more docs here so the next poor fool that has to hack
+   on this code has a chance of getting something accomplished without
+   wasting too much time.  */
+
+/* This expands into COFF_WITH_pe, COFF_WITH_pep, or COFF_WITH_pex64
+   depending on whether we're compiling for straight PE or PE+.  */
+#define COFF_WITH_XX
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "coff/internal.h"
+#include "bfdver.h"
+
+/* NOTE: it's strange to be including an architecture specific header
+   in what's supposed to be general (to PE/PEI) code.  However, that's
+   where the definitions are, and they don't vary per architecture
+   within PE/PEI, so we get them from there.  FIXME: The lack of
+   variance is an assumption which may prove to be incorrect if new
+   PE/PEI targets are created.  */
+#if defined COFF_WITH_pex64
+# include "coff/x86_64.h"
+#elif defined COFF_WITH_pep
+# include "coff/ia64.h"
+#else
+# include "coff/i386.h"
+#endif
+
+#include "coff/pe.h"
+#include "libcoff.h"
+#include "libpei.h"
+
+#if defined COFF_WITH_pep || defined COFF_WITH_pex64
+# undef AOUTSZ
+# define AOUTSZ		PEPAOUTSZ
+# define PEAOUTHDR	PEPAOUTHDR
+#endif
+
+/* FIXME: This file has various tests of POWERPC_LE_PE.  Those tests
+   worked when the code was in peicode.h, but no longer work now that
+   the code is in peigen.c.  PowerPC NT is said to be dead.  If
+   anybody wants to revive the code, you will have to figure out how
+   to handle those issues.  */
+
+void
+_bfd_XXi_swap_sym_in (bfd * abfd, void * ext1, void * in1)
+{
+  SYMENT *ext = (SYMENT *) ext1;
+  struct internal_syment *in = (struct internal_syment *) in1;
+
+  if (ext->e.e_name[0] == 0)
+    {
+      in->_n._n_n._n_zeroes = 0;
+      in->_n._n_n._n_offset = H_GET_32 (abfd, ext->e.e.e_offset);
+    }
+  else
+    memcpy (in->_n._n_name, ext->e.e_name, SYMNMLEN);
+
+  in->n_value = H_GET_32 (abfd, ext->e_value);
+  in->n_scnum = H_GET_16 (abfd, ext->e_scnum);
+
+  if (sizeof (ext->e_type) == 2)
+    in->n_type = H_GET_16 (abfd, ext->e_type);
+  else
+    in->n_type = H_GET_32 (abfd, ext->e_type);
+
+  in->n_sclass = H_GET_8 (abfd, ext->e_sclass);
+  in->n_numaux = H_GET_8 (abfd, ext->e_numaux);
+
+#ifndef STRICT_PE_FORMAT
+  /* This is for Gnu-created DLLs.  */
+
+  /* The section symbols for the .idata$ sections have class 0x68
+     (C_SECTION), which MS documentation indicates is a section
+     symbol.  Unfortunately, the value field in the symbol is simply a
+     copy of the .idata section's flags rather than something useful.
+     When these symbols are encountered, change the value to 0 so that
+     they will be handled somewhat correctly in the bfd code.  */
+  if (in->n_sclass == C_SECTION)
+    {
+      char namebuf[SYMNMLEN + 1];
+      const char *name = NULL;
+
+      in->n_value = 0x0;
+
+      /* Create synthetic empty sections as needed.  DJ */
+      if (in->n_scnum == 0)
+	{
+	  asection *sec;
+
+	  name = _bfd_coff_internal_syment_name (abfd, in, namebuf);
+	  if (name == NULL)
+	    /* FIXME: Return error.  */
+	    abort ();
+	  sec = bfd_get_section_by_name (abfd, name);
+	  if (sec != NULL)
+	    in->n_scnum = sec->target_index;
+	}
+
+      if (in->n_scnum == 0)
+	{
+	  int unused_section_number = 0;
+	  asection *sec;
+	  flagword flags;
+
+	  for (sec = abfd->sections; sec; sec = sec->next)
+	    if (unused_section_number <= sec->target_index)
+	      unused_section_number = sec->target_index + 1;
+
+	  if (name == namebuf)
+	    {
+	      name = (const char *) bfd_alloc (abfd, strlen (namebuf) + 1);
+	      if (name == NULL)
+		/* FIXME: Return error.  */
+		abort ();
+	      strcpy ((char *) name, namebuf);
+	    }
+	  flags = SEC_HAS_CONTENTS | SEC_ALLOC | SEC_DATA | SEC_LOAD;
+	  sec = bfd_make_section_anyway_with_flags (abfd, name, flags);
+	  if (sec == NULL)
+	    /* FIXME: Return error.  */
+	    abort ();
+
+	  sec->vma = 0;
+	  sec->lma = 0;
+	  sec->size = 0;
+	  sec->filepos = 0;
+	  sec->rel_filepos = 0;
+	  sec->reloc_count = 0;
+	  sec->line_filepos = 0;
+	  sec->lineno_count = 0;
+	  sec->userdata = NULL;
+	  sec->next = NULL;
+	  sec->alignment_power = 2;
+
+	  sec->target_index = unused_section_number;
+
+	  in->n_scnum = unused_section_number;
+	}
+      in->n_sclass = C_STAT;
+    }
+#endif
+
+#ifdef coff_swap_sym_in_hook
+  /* This won't work in peigen.c, but since it's for PPC PE, it's not
+     worth fixing.  */
+  coff_swap_sym_in_hook (abfd, ext1, in1);
+#endif
+}
+
+unsigned int
+_bfd_XXi_swap_sym_out (bfd * abfd, void * inp, void * extp)
+{
+  struct internal_syment *in = (struct internal_syment *) inp;
+  SYMENT *ext = (SYMENT *) extp;
+
+  if (in->_n._n_name[0] == 0)
+    {
+      H_PUT_32 (abfd, 0, ext->e.e.e_zeroes);
+      H_PUT_32 (abfd, in->_n._n_n._n_offset, ext->e.e.e_offset);
+    }
+  else
+    memcpy (ext->e.e_name, in->_n._n_name, SYMNMLEN);
+
+  H_PUT_32 (abfd, in->n_value, ext->e_value);
+  H_PUT_16 (abfd, in->n_scnum, ext->e_scnum);
+
+  if (sizeof (ext->e_type) == 2)
+    H_PUT_16 (abfd, in->n_type, ext->e_type);
+  else
+    H_PUT_32 (abfd, in->n_type, ext->e_type);
+
+  H_PUT_8 (abfd, in->n_sclass, ext->e_sclass);
+  H_PUT_8 (abfd, in->n_numaux, ext->e_numaux);
+
+  return SYMESZ;
+}
+
+void
+_bfd_XXi_swap_aux_in (bfd *	abfd,
+		      void *	ext1,
+		      int       type,
+		      int       in_class,
+		      int	indx ATTRIBUTE_UNUSED,
+		      int	numaux ATTRIBUTE_UNUSED,
+		      void * 	in1)
+{
+  AUXENT *ext = (AUXENT *) ext1;
+  union internal_auxent *in = (union internal_auxent *) in1;
+
+  switch (in_class)
+    {
+    case C_FILE:
+      if (ext->x_file.x_fname[0] == 0)
+	{
+	  in->x_file.x_n.x_zeroes = 0;
+	  in->x_file.x_n.x_offset = H_GET_32 (abfd, ext->x_file.x_n.x_offset);
+	}
+      else
+	memcpy (in->x_file.x_fname, ext->x_file.x_fname, FILNMLEN);
+      return;
+
+    case C_STAT:
+    case C_LEAFSTAT:
+    case C_HIDDEN:
+      if (type == T_NULL)
+	{
+	  in->x_scn.x_scnlen = GET_SCN_SCNLEN (abfd, ext);
+	  in->x_scn.x_nreloc = GET_SCN_NRELOC (abfd, ext);
+	  in->x_scn.x_nlinno = GET_SCN_NLINNO (abfd, ext);
+	  in->x_scn.x_checksum = H_GET_32 (abfd, ext->x_scn.x_checksum);
+	  in->x_scn.x_associated = H_GET_16 (abfd, ext->x_scn.x_associated);
+	  in->x_scn.x_comdat = H_GET_8 (abfd, ext->x_scn.x_comdat);
+	  return;
+	}
+      break;
+    }
+
+  in->x_sym.x_tagndx.l = H_GET_32 (abfd, ext->x_sym.x_tagndx);
+  in->x_sym.x_tvndx = H_GET_16 (abfd, ext->x_sym.x_tvndx);
+
+  if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
+      || ISTAG (in_class))
+    {
+      in->x_sym.x_fcnary.x_fcn.x_lnnoptr = GET_FCN_LNNOPTR (abfd, ext);
+      in->x_sym.x_fcnary.x_fcn.x_endndx.l = GET_FCN_ENDNDX (abfd, ext);
+    }
+  else
+    {
+      in->x_sym.x_fcnary.x_ary.x_dimen[0] =
+	H_GET_16 (abfd, ext->x_sym.x_fcnary.x_ary.x_dimen[0]);
+      in->x_sym.x_fcnary.x_ary.x_dimen[1] =
+	H_GET_16 (abfd, ext->x_sym.x_fcnary.x_ary.x_dimen[1]);
+      in->x_sym.x_fcnary.x_ary.x_dimen[2] =
+	H_GET_16 (abfd, ext->x_sym.x_fcnary.x_ary.x_dimen[2]);
+      in->x_sym.x_fcnary.x_ary.x_dimen[3] =
+	H_GET_16 (abfd, ext->x_sym.x_fcnary.x_ary.x_dimen[3]);
+    }
+
+  if (ISFCN (type))
+    {
+      in->x_sym.x_misc.x_fsize = H_GET_32 (abfd, ext->x_sym.x_misc.x_fsize);
+    }
+  else
+    {
+      in->x_sym.x_misc.x_lnsz.x_lnno = GET_LNSZ_LNNO (abfd, ext);
+      in->x_sym.x_misc.x_lnsz.x_size = GET_LNSZ_SIZE (abfd, ext);
+    }
+}
+
+unsigned int
+_bfd_XXi_swap_aux_out (bfd *  abfd,
+		       void * inp,
+		       int    type,
+		       int    in_class,
+		       int    indx ATTRIBUTE_UNUSED,
+		       int    numaux ATTRIBUTE_UNUSED,
+		       void * extp)
+{
+  union internal_auxent *in = (union internal_auxent *) inp;
+  AUXENT *ext = (AUXENT *) extp;
+
+  memset (ext, 0, AUXESZ);
+
+  switch (in_class)
+    {
+    case C_FILE:
+      if (in->x_file.x_fname[0] == 0)
+	{
+	  H_PUT_32 (abfd, 0, ext->x_file.x_n.x_zeroes);
+	  H_PUT_32 (abfd, in->x_file.x_n.x_offset, ext->x_file.x_n.x_offset);
+	}
+      else
+	memcpy (ext->x_file.x_fname, in->x_file.x_fname, FILNMLEN);
+
+      return AUXESZ;
+
+    case C_STAT:
+    case C_LEAFSTAT:
+    case C_HIDDEN:
+      if (type == T_NULL)
+	{
+	  PUT_SCN_SCNLEN (abfd, in->x_scn.x_scnlen, ext);
+	  PUT_SCN_NRELOC (abfd, in->x_scn.x_nreloc, ext);
+	  PUT_SCN_NLINNO (abfd, in->x_scn.x_nlinno, ext);
+	  H_PUT_32 (abfd, in->x_scn.x_checksum, ext->x_scn.x_checksum);
+	  H_PUT_16 (abfd, in->x_scn.x_associated, ext->x_scn.x_associated);
+	  H_PUT_8 (abfd, in->x_scn.x_comdat, ext->x_scn.x_comdat);
+	  return AUXESZ;
+	}
+      break;
+    }
+
+  H_PUT_32 (abfd, in->x_sym.x_tagndx.l, ext->x_sym.x_tagndx);
+  H_PUT_16 (abfd, in->x_sym.x_tvndx, ext->x_sym.x_tvndx);
+
+  if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
+      || ISTAG (in_class))
+    {
+      PUT_FCN_LNNOPTR (abfd, in->x_sym.x_fcnary.x_fcn.x_lnnoptr,  ext);
+      PUT_FCN_ENDNDX  (abfd, in->x_sym.x_fcnary.x_fcn.x_endndx.l, ext);
+    }
+  else
+    {
+      H_PUT_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[0],
+		ext->x_sym.x_fcnary.x_ary.x_dimen[0]);
+      H_PUT_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[1],
+		ext->x_sym.x_fcnary.x_ary.x_dimen[1]);
+      H_PUT_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[2],
+		ext->x_sym.x_fcnary.x_ary.x_dimen[2]);
+      H_PUT_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[3],
+		ext->x_sym.x_fcnary.x_ary.x_dimen[3]);
+    }
+
+  if (ISFCN (type))
+    H_PUT_32 (abfd, in->x_sym.x_misc.x_fsize, ext->x_sym.x_misc.x_fsize);
+  else
+    {
+      PUT_LNSZ_LNNO (abfd, in->x_sym.x_misc.x_lnsz.x_lnno, ext);
+      PUT_LNSZ_SIZE (abfd, in->x_sym.x_misc.x_lnsz.x_size, ext);
+    }
+
+  return AUXESZ;
+}
+
+void
+_bfd_XXi_swap_lineno_in (bfd * abfd, void * ext1, void * in1)
+{
+  LINENO *ext = (LINENO *) ext1;
+  struct internal_lineno *in = (struct internal_lineno *) in1;
+
+  in->l_addr.l_symndx = H_GET_32 (abfd, ext->l_addr.l_symndx);
+  in->l_lnno = GET_LINENO_LNNO (abfd, ext);
+}
+
+unsigned int
+_bfd_XXi_swap_lineno_out (bfd * abfd, void * inp, void * outp)
+{
+  struct internal_lineno *in = (struct internal_lineno *) inp;
+  struct external_lineno *ext = (struct external_lineno *) outp;
+  H_PUT_32 (abfd, in->l_addr.l_symndx, ext->l_addr.l_symndx);
+
+  PUT_LINENO_LNNO (abfd, in->l_lnno, ext);
+  return LINESZ;
+}
+
+void
+_bfd_XXi_swap_aouthdr_in (bfd * abfd,
+			  void * aouthdr_ext1,
+			  void * aouthdr_int1)
+{
+  PEAOUTHDR * src = (PEAOUTHDR *) aouthdr_ext1;
+  AOUTHDR * aouthdr_ext = (AOUTHDR *) aouthdr_ext1;
+  struct internal_aouthdr *aouthdr_int
+    = (struct internal_aouthdr *) aouthdr_int1;
+  struct internal_extra_pe_aouthdr *a = &aouthdr_int->pe;
+
+  aouthdr_int->magic = H_GET_16 (abfd, aouthdr_ext->magic);
+  aouthdr_int->vstamp = H_GET_16 (abfd, aouthdr_ext->vstamp);
+  aouthdr_int->tsize = GET_AOUTHDR_TSIZE (abfd, aouthdr_ext->tsize);
+  aouthdr_int->dsize = GET_AOUTHDR_DSIZE (abfd, aouthdr_ext->dsize);
+  aouthdr_int->bsize = GET_AOUTHDR_BSIZE (abfd, aouthdr_ext->bsize);
+  aouthdr_int->entry = GET_AOUTHDR_ENTRY (abfd, aouthdr_ext->entry);
+  aouthdr_int->text_start =
+    GET_AOUTHDR_TEXT_START (abfd, aouthdr_ext->text_start);
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+  /* PE32+ does not have data_start member!  */
+  aouthdr_int->data_start =
+    GET_AOUTHDR_DATA_START (abfd, aouthdr_ext->data_start);
+  a->BaseOfData = aouthdr_int->data_start;
+#endif
+
+  a->Magic = aouthdr_int->magic;
+  a->MajorLinkerVersion = H_GET_8 (abfd, aouthdr_ext->vstamp);
+  a->MinorLinkerVersion = H_GET_8 (abfd, aouthdr_ext->vstamp + 1);
+  a->SizeOfCode = aouthdr_int->tsize ;
+  a->SizeOfInitializedData = aouthdr_int->dsize ;
+  a->SizeOfUninitializedData = aouthdr_int->bsize ;
+  a->AddressOfEntryPoint = aouthdr_int->entry;
+  a->BaseOfCode = aouthdr_int->text_start;
+  a->ImageBase = GET_OPTHDR_IMAGE_BASE (abfd, src->ImageBase);
+  a->SectionAlignment = H_GET_32 (abfd, src->SectionAlignment);
+  a->FileAlignment = H_GET_32 (abfd, src->FileAlignment);
+  a->MajorOperatingSystemVersion =
+    H_GET_16 (abfd, src->MajorOperatingSystemVersion);
+  a->MinorOperatingSystemVersion =
+    H_GET_16 (abfd, src->MinorOperatingSystemVersion);
+  a->MajorImageVersion = H_GET_16 (abfd, src->MajorImageVersion);
+  a->MinorImageVersion = H_GET_16 (abfd, src->MinorImageVersion);
+  a->MajorSubsystemVersion = H_GET_16 (abfd, src->MajorSubsystemVersion);
+  a->MinorSubsystemVersion = H_GET_16 (abfd, src->MinorSubsystemVersion);
+  a->Reserved1 = H_GET_32 (abfd, src->Reserved1);
+  a->SizeOfImage = H_GET_32 (abfd, src->SizeOfImage);
+  a->SizeOfHeaders = H_GET_32 (abfd, src->SizeOfHeaders);
+  a->CheckSum = H_GET_32 (abfd, src->CheckSum);
+  a->Subsystem = H_GET_16 (abfd, src->Subsystem);
+  a->DllCharacteristics = H_GET_16 (abfd, src->DllCharacteristics);
+  a->SizeOfStackReserve =
+    GET_OPTHDR_SIZE_OF_STACK_RESERVE (abfd, src->SizeOfStackReserve);
+  a->SizeOfStackCommit =
+    GET_OPTHDR_SIZE_OF_STACK_COMMIT (abfd, src->SizeOfStackCommit);
+  a->SizeOfHeapReserve =
+    GET_OPTHDR_SIZE_OF_HEAP_RESERVE (abfd, src->SizeOfHeapReserve);
+  a->SizeOfHeapCommit =
+    GET_OPTHDR_SIZE_OF_HEAP_COMMIT (abfd, src->SizeOfHeapCommit);
+  a->LoaderFlags = H_GET_32 (abfd, src->LoaderFlags);
+  a->NumberOfRvaAndSizes = H_GET_32 (abfd, src->NumberOfRvaAndSizes);
+
+  {
+    int idx;
+
+    for (idx = 0; idx < 16; idx++)
+      {
+        /* If data directory is empty, rva also should be 0.  */
+	int size =
+	  H_GET_32 (abfd, src->DataDirectory[idx][1]);
+
+	a->DataDirectory[idx].Size = size;
+
+	if (size)
+	  a->DataDirectory[idx].VirtualAddress =
+	    H_GET_32 (abfd, src->DataDirectory[idx][0]);
+	else
+	  a->DataDirectory[idx].VirtualAddress = 0;
+      }
+  }
+
+  if (aouthdr_int->entry)
+    {
+      aouthdr_int->entry += a->ImageBase;
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+      aouthdr_int->entry &= 0xffffffff;
+#endif
+    }
+
+  if (aouthdr_int->tsize)
+    {
+      aouthdr_int->text_start += a->ImageBase;
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+      aouthdr_int->text_start &= 0xffffffff;
+#endif
+    }
+
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+  /* PE32+ does not have data_start member!  */
+  if (aouthdr_int->dsize)
+    {
+      aouthdr_int->data_start += a->ImageBase;
+      aouthdr_int->data_start &= 0xffffffff;
+    }
+#endif
+
+#ifdef POWERPC_LE_PE
+  /* These three fields are normally set up by ppc_relocate_section.
+     In the case of reading a file in, we can pick them up from the
+     DataDirectory.  */
+  first_thunk_address = a->DataDirectory[PE_IMPORT_ADDRESS_TABLE].VirtualAddress;
+  thunk_size = a->DataDirectory[PE_IMPORT_ADDRESS_TABLE].Size;
+  import_table_size = a->DataDirectory[PE_IMPORT_TABLE].Size;
+#endif
+}
+
+/* A support function for below.  */
+
+static void
+add_data_entry (bfd * abfd,
+		struct internal_extra_pe_aouthdr *aout,
+		int idx,
+		char *name,
+		bfd_vma base)
+{
+  asection *sec = bfd_get_section_by_name (abfd, name);
+
+  /* Add import directory information if it exists.  */
+  if ((sec != NULL)
+      && (coff_section_data (abfd, sec) != NULL)
+      && (pei_section_data (abfd, sec) != NULL))
+    {
+      /* If data directory is empty, rva also should be 0.  */
+      int size = pei_section_data (abfd, sec)->virt_size;
+      aout->DataDirectory[idx].Size = size;
+
+      if (size)
+	{
+	  aout->DataDirectory[idx].VirtualAddress =
+	    (sec->vma - base) & 0xffffffff;
+	  sec->flags |= SEC_DATA;
+	}
+    }
+}
+
+unsigned int
+_bfd_XXi_swap_aouthdr_out (bfd * abfd, void * in, void * out)
+{
+  struct internal_aouthdr *aouthdr_in = (struct internal_aouthdr *) in;
+  pe_data_type *pe = pe_data (abfd);
+  struct internal_extra_pe_aouthdr *extra = &pe->pe_opthdr;
+  PEAOUTHDR *aouthdr_out = (PEAOUTHDR *) out;
+  bfd_vma sa, fa, ib;
+  IMAGE_DATA_DIRECTORY idata2, idata5, tls;
+
+  sa = extra->SectionAlignment;
+  fa = extra->FileAlignment;
+  ib = extra->ImageBase;
+
+  idata2 = pe->pe_opthdr.DataDirectory[PE_IMPORT_TABLE];
+  idata5 = pe->pe_opthdr.DataDirectory[PE_IMPORT_ADDRESS_TABLE];
+  tls = pe->pe_opthdr.DataDirectory[PE_TLS_TABLE];
+
+  if (aouthdr_in->tsize)
+    {
+      aouthdr_in->text_start -= ib;
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+      aouthdr_in->text_start &= 0xffffffff;
+#endif
+    }
+
+  if (aouthdr_in->dsize)
+    {
+      aouthdr_in->data_start -= ib;
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+      aouthdr_in->data_start &= 0xffffffff;
+#endif
+    }
+
+  if (aouthdr_in->entry)
+    {
+      aouthdr_in->entry -= ib;
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+      aouthdr_in->entry &= 0xffffffff;
+#endif
+    }
+
+#define FA(x) (((x) + fa -1 ) & (- fa))
+#define SA(x) (((x) + sa -1 ) & (- sa))
+
+  /* We like to have the sizes aligned.  */
+  aouthdr_in->bsize = FA (aouthdr_in->bsize);
+
+  extra->NumberOfRvaAndSizes = IMAGE_NUMBEROF_DIRECTORY_ENTRIES;
+
+  /* First null out all data directory entries.  */
+  memset (extra->DataDirectory, 0, sizeof (extra->DataDirectory));
+
+  add_data_entry (abfd, extra, 0, ".edata", ib);
+  add_data_entry (abfd, extra, 2, ".rsrc", ib);
+  add_data_entry (abfd, extra, 3, ".pdata", ib);
+
+  /* In theory we do not need to call add_data_entry for .idata$2 or
+     .idata$5.  It will be done in bfd_coff_final_link where all the
+     required information is available.  If however, we are not going
+     to perform a final link, eg because we have been invoked by objcopy
+     or strip, then we need to make sure that these Data Directory
+     entries are initialised properly.
+
+     So - we copy the input values into the output values, and then, if
+     a final link is going to be performed, it can overwrite them.  */
+  extra->DataDirectory[PE_IMPORT_TABLE]  = idata2;
+  extra->DataDirectory[PE_IMPORT_ADDRESS_TABLE] = idata5;
+  extra->DataDirectory[PE_TLS_TABLE] = tls;
+
+  if (extra->DataDirectory[PE_IMPORT_TABLE].VirtualAddress == 0)
+    /* Until other .idata fixes are made (pending patch), the entry for
+       .idata is needed for backwards compatibility.  FIXME.  */
+    add_data_entry (abfd, extra, 1, ".idata", ib);
+
+  /* For some reason, the virtual size (which is what's set by
+     add_data_entry) for .reloc is not the same as the size recorded
+     in this slot by MSVC; it doesn't seem to cause problems (so far),
+     but since it's the best we've got, use it.  It does do the right
+     thing for .pdata.  */
+  if (pe->has_reloc_section)
+    add_data_entry (abfd, extra, 5, ".reloc", ib);
+
+  {
+    asection *sec;
+    bfd_vma hsize = 0;
+    bfd_vma dsize = 0;
+    bfd_vma isize = 0;
+    bfd_vma tsize = 0;
+
+    for (sec = abfd->sections; sec; sec = sec->next)
+      {
+	int rounded = FA (sec->size);
+
+	/* The first non-zero section filepos is the header size.
+	   Sections without contents will have a filepos of 0.  */
+	if (hsize == 0)
+	  hsize = sec->filepos;
+	if (sec->flags & SEC_DATA)
+	  dsize += rounded;
+	if (sec->flags & SEC_CODE)
+	  tsize += rounded;
+	/* The image size is the total VIRTUAL size (which is what is
+	   in the virt_size field).  Files have been seen (from MSVC
+	   5.0 link.exe) where the file size of the .data segment is
+	   quite small compared to the virtual size.  Without this
+	   fix, strip munges the file.
+
+	   FIXME: We need to handle holes between sections, which may
+	   happpen when we covert from another format.  We just use
+	   the virtual address and virtual size of the last section
+	   for the image size.  */
+	if (coff_section_data (abfd, sec) != NULL
+	    && pei_section_data (abfd, sec) != NULL)
+	  isize = (sec->vma - extra->ImageBase
+		   + SA (FA (pei_section_data (abfd, sec)->virt_size)));
+      }
+
+    aouthdr_in->dsize = dsize;
+    aouthdr_in->tsize = tsize;
+    extra->SizeOfHeaders = hsize;
+    extra->SizeOfImage = isize;
+  }
+
+  H_PUT_16 (abfd, aouthdr_in->magic, aouthdr_out->standard.magic);
+
+/* e.g. 219510000 is linker version 2.19  */
+#define LINKER_VERSION ((short) (BFD_VERSION / 1000000))
+
+  /* This piece of magic sets the "linker version" field to
+     LINKER_VERSION.  */
+  H_PUT_16 (abfd, (LINKER_VERSION / 100 + (LINKER_VERSION % 100) * 256),
+	    aouthdr_out->standard.vstamp);
+
+  PUT_AOUTHDR_TSIZE (abfd, aouthdr_in->tsize, aouthdr_out->standard.tsize);
+  PUT_AOUTHDR_DSIZE (abfd, aouthdr_in->dsize, aouthdr_out->standard.dsize);
+  PUT_AOUTHDR_BSIZE (abfd, aouthdr_in->bsize, aouthdr_out->standard.bsize);
+  PUT_AOUTHDR_ENTRY (abfd, aouthdr_in->entry, aouthdr_out->standard.entry);
+  PUT_AOUTHDR_TEXT_START (abfd, aouthdr_in->text_start,
+			  aouthdr_out->standard.text_start);
+
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+  /* PE32+ does not have data_start member!  */
+  PUT_AOUTHDR_DATA_START (abfd, aouthdr_in->data_start,
+			  aouthdr_out->standard.data_start);
+#endif
+
+  PUT_OPTHDR_IMAGE_BASE (abfd, extra->ImageBase, aouthdr_out->ImageBase);
+  H_PUT_32 (abfd, extra->SectionAlignment, aouthdr_out->SectionAlignment);
+  H_PUT_32 (abfd, extra->FileAlignment, aouthdr_out->FileAlignment);
+  H_PUT_16 (abfd, extra->MajorOperatingSystemVersion,
+	    aouthdr_out->MajorOperatingSystemVersion);
+  H_PUT_16 (abfd, extra->MinorOperatingSystemVersion,
+	    aouthdr_out->MinorOperatingSystemVersion);
+  H_PUT_16 (abfd, extra->MajorImageVersion, aouthdr_out->MajorImageVersion);
+  H_PUT_16 (abfd, extra->MinorImageVersion, aouthdr_out->MinorImageVersion);
+  H_PUT_16 (abfd, extra->MajorSubsystemVersion,
+	    aouthdr_out->MajorSubsystemVersion);
+  H_PUT_16 (abfd, extra->MinorSubsystemVersion,
+	    aouthdr_out->MinorSubsystemVersion);
+  H_PUT_32 (abfd, extra->Reserved1, aouthdr_out->Reserved1);
+  H_PUT_32 (abfd, extra->SizeOfImage, aouthdr_out->SizeOfImage);
+  H_PUT_32 (abfd, extra->SizeOfHeaders, aouthdr_out->SizeOfHeaders);
+  H_PUT_32 (abfd, extra->CheckSum, aouthdr_out->CheckSum);
+  H_PUT_16 (abfd, extra->Subsystem, aouthdr_out->Subsystem);
+  H_PUT_16 (abfd, extra->DllCharacteristics, aouthdr_out->DllCharacteristics);
+  PUT_OPTHDR_SIZE_OF_STACK_RESERVE (abfd, extra->SizeOfStackReserve,
+				    aouthdr_out->SizeOfStackReserve);
+  PUT_OPTHDR_SIZE_OF_STACK_COMMIT (abfd, extra->SizeOfStackCommit,
+				   aouthdr_out->SizeOfStackCommit);
+  PUT_OPTHDR_SIZE_OF_HEAP_RESERVE (abfd, extra->SizeOfHeapReserve,
+				   aouthdr_out->SizeOfHeapReserve);
+  PUT_OPTHDR_SIZE_OF_HEAP_COMMIT (abfd, extra->SizeOfHeapCommit,
+				  aouthdr_out->SizeOfHeapCommit);
+  H_PUT_32 (abfd, extra->LoaderFlags, aouthdr_out->LoaderFlags);
+  H_PUT_32 (abfd, extra->NumberOfRvaAndSizes,
+	    aouthdr_out->NumberOfRvaAndSizes);
+  {
+    int idx;
+
+    for (idx = 0; idx < 16; idx++)
+      {
+	H_PUT_32 (abfd, extra->DataDirectory[idx].VirtualAddress,
+		  aouthdr_out->DataDirectory[idx][0]);
+	H_PUT_32 (abfd, extra->DataDirectory[idx].Size,
+		  aouthdr_out->DataDirectory[idx][1]);
+      }
+  }
+
+  return AOUTSZ;
+}
+
+unsigned int
+_bfd_XXi_only_swap_filehdr_out (bfd * abfd, void * in, void * out)
+{
+  int idx;
+  struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
+  struct external_PEI_filehdr *filehdr_out = (struct external_PEI_filehdr *) out;
+
+  if (pe_data (abfd)->has_reloc_section
+      || pe_data (abfd)->dont_strip_reloc)
+    filehdr_in->f_flags &= ~F_RELFLG;
+
+  if (pe_data (abfd)->dll)
+    filehdr_in->f_flags |= F_DLL;
+
+  filehdr_in->pe.e_magic    = DOSMAGIC;
+  filehdr_in->pe.e_cblp     = 0x90;
+  filehdr_in->pe.e_cp       = 0x3;
+  filehdr_in->pe.e_crlc     = 0x0;
+  filehdr_in->pe.e_cparhdr  = 0x4;
+  filehdr_in->pe.e_minalloc = 0x0;
+  filehdr_in->pe.e_maxalloc = 0xffff;
+  filehdr_in->pe.e_ss       = 0x0;
+  filehdr_in->pe.e_sp       = 0xb8;
+  filehdr_in->pe.e_csum     = 0x0;
+  filehdr_in->pe.e_ip       = 0x0;
+  filehdr_in->pe.e_cs       = 0x0;
+  filehdr_in->pe.e_lfarlc   = 0x40;
+  filehdr_in->pe.e_ovno     = 0x0;
+
+  for (idx = 0; idx < 4; idx++)
+    filehdr_in->pe.e_res[idx] = 0x0;
+
+  filehdr_in->pe.e_oemid   = 0x0;
+  filehdr_in->pe.e_oeminfo = 0x0;
+
+  for (idx = 0; idx < 10; idx++)
+    filehdr_in->pe.e_res2[idx] = 0x0;
+
+  filehdr_in->pe.e_lfanew = 0x80;
+
+  /* This next collection of data are mostly just characters.  It
+     appears to be constant within the headers put on NT exes.  */
+  filehdr_in->pe.dos_message[0]  = 0x0eba1f0e;
+  filehdr_in->pe.dos_message[1]  = 0xcd09b400;
+  filehdr_in->pe.dos_message[2]  = 0x4c01b821;
+  filehdr_in->pe.dos_message[3]  = 0x685421cd;
+  filehdr_in->pe.dos_message[4]  = 0x70207369;
+  filehdr_in->pe.dos_message[5]  = 0x72676f72;
+  filehdr_in->pe.dos_message[6]  = 0x63206d61;
+  filehdr_in->pe.dos_message[7]  = 0x6f6e6e61;
+  filehdr_in->pe.dos_message[8]  = 0x65622074;
+  filehdr_in->pe.dos_message[9]  = 0x6e757220;
+  filehdr_in->pe.dos_message[10] = 0x206e6920;
+  filehdr_in->pe.dos_message[11] = 0x20534f44;
+  filehdr_in->pe.dos_message[12] = 0x65646f6d;
+  filehdr_in->pe.dos_message[13] = 0x0a0d0d2e;
+  filehdr_in->pe.dos_message[14] = 0x24;
+  filehdr_in->pe.dos_message[15] = 0x0;
+  filehdr_in->pe.nt_signature = NT_SIGNATURE;
+
+  H_PUT_16 (abfd, filehdr_in->f_magic, filehdr_out->f_magic);
+  H_PUT_16 (abfd, filehdr_in->f_nscns, filehdr_out->f_nscns);
+
+  H_PUT_32 (abfd, time (0), filehdr_out->f_timdat);
+  PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr,
+		      filehdr_out->f_symptr);
+  H_PUT_32 (abfd, filehdr_in->f_nsyms, filehdr_out->f_nsyms);
+  H_PUT_16 (abfd, filehdr_in->f_opthdr, filehdr_out->f_opthdr);
+  H_PUT_16 (abfd, filehdr_in->f_flags, filehdr_out->f_flags);
+
+  /* Put in extra dos header stuff.  This data remains essentially
+     constant, it just has to be tacked on to the beginning of all exes
+     for NT.  */
+  H_PUT_16 (abfd, filehdr_in->pe.e_magic, filehdr_out->e_magic);
+  H_PUT_16 (abfd, filehdr_in->pe.e_cblp, filehdr_out->e_cblp);
+  H_PUT_16 (abfd, filehdr_in->pe.e_cp, filehdr_out->e_cp);
+  H_PUT_16 (abfd, filehdr_in->pe.e_crlc, filehdr_out->e_crlc);
+  H_PUT_16 (abfd, filehdr_in->pe.e_cparhdr, filehdr_out->e_cparhdr);
+  H_PUT_16 (abfd, filehdr_in->pe.e_minalloc, filehdr_out->e_minalloc);
+  H_PUT_16 (abfd, filehdr_in->pe.e_maxalloc, filehdr_out->e_maxalloc);
+  H_PUT_16 (abfd, filehdr_in->pe.e_ss, filehdr_out->e_ss);
+  H_PUT_16 (abfd, filehdr_in->pe.e_sp, filehdr_out->e_sp);
+  H_PUT_16 (abfd, filehdr_in->pe.e_csum, filehdr_out->e_csum);
+  H_PUT_16 (abfd, filehdr_in->pe.e_ip, filehdr_out->e_ip);
+  H_PUT_16 (abfd, filehdr_in->pe.e_cs, filehdr_out->e_cs);
+  H_PUT_16 (abfd, filehdr_in->pe.e_lfarlc, filehdr_out->e_lfarlc);
+  H_PUT_16 (abfd, filehdr_in->pe.e_ovno, filehdr_out->e_ovno);
+
+  for (idx = 0; idx < 4; idx++)
+    H_PUT_16 (abfd, filehdr_in->pe.e_res[idx], filehdr_out->e_res[idx]);
+
+  H_PUT_16 (abfd, filehdr_in->pe.e_oemid, filehdr_out->e_oemid);
+  H_PUT_16 (abfd, filehdr_in->pe.e_oeminfo, filehdr_out->e_oeminfo);
+
+  for (idx = 0; idx < 10; idx++)
+    H_PUT_16 (abfd, filehdr_in->pe.e_res2[idx], filehdr_out->e_res2[idx]);
+
+  H_PUT_32 (abfd, filehdr_in->pe.e_lfanew, filehdr_out->e_lfanew);
+
+  for (idx = 0; idx < 16; idx++)
+    H_PUT_32 (abfd, filehdr_in->pe.dos_message[idx],
+	      filehdr_out->dos_message[idx]);
+
+  /* Also put in the NT signature.  */
+  H_PUT_32 (abfd, filehdr_in->pe.nt_signature, filehdr_out->nt_signature);
+
+  return FILHSZ;
+}
+
+unsigned int
+_bfd_XX_only_swap_filehdr_out (bfd * abfd, void * in, void * out)
+{
+  struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
+  FILHDR *filehdr_out = (FILHDR *) out;
+
+  H_PUT_16 (abfd, filehdr_in->f_magic, filehdr_out->f_magic);
+  H_PUT_16 (abfd, filehdr_in->f_nscns, filehdr_out->f_nscns);
+  H_PUT_32 (abfd, filehdr_in->f_timdat, filehdr_out->f_timdat);
+  PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, filehdr_out->f_symptr);
+  H_PUT_32 (abfd, filehdr_in->f_nsyms, filehdr_out->f_nsyms);
+  H_PUT_16 (abfd, filehdr_in->f_opthdr, filehdr_out->f_opthdr);
+  H_PUT_16 (abfd, filehdr_in->f_flags, filehdr_out->f_flags);
+
+  return FILHSZ;
+}
+
+unsigned int
+_bfd_XXi_swap_scnhdr_out (bfd * abfd, void * in, void * out)
+{
+  struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
+  SCNHDR *scnhdr_ext = (SCNHDR *) out;
+  unsigned int ret = SCNHSZ;
+  bfd_vma ps;
+  bfd_vma ss;
+
+  memcpy (scnhdr_ext->s_name, scnhdr_int->s_name, sizeof (scnhdr_int->s_name));
+
+  PUT_SCNHDR_VADDR (abfd,
+		    ((scnhdr_int->s_vaddr
+		      - pe_data (abfd)->pe_opthdr.ImageBase)
+		     & 0xffffffff),
+		    scnhdr_ext->s_vaddr);
+
+  /* NT wants the size data to be rounded up to the next
+     NT_FILE_ALIGNMENT, but zero if it has no content (as in .bss,
+     sometimes).  */
+  if ((scnhdr_int->s_flags & IMAGE_SCN_CNT_UNINITIALIZED_DATA) != 0)
+    {
+      if (bfd_pei_p (abfd))
+	{
+	  ps = scnhdr_int->s_size;
+	  ss = 0;
+	}
+      else
+       {
+         ps = 0;
+         ss = scnhdr_int->s_size;
+       }
+    }
+  else
+    {
+      if (bfd_pei_p (abfd))
+	ps = scnhdr_int->s_paddr;
+      else
+	ps = 0;
+
+      ss = scnhdr_int->s_size;
+    }
+
+  PUT_SCNHDR_SIZE (abfd, ss,
+		   scnhdr_ext->s_size);
+
+  /* s_paddr in PE is really the virtual size.  */
+  PUT_SCNHDR_PADDR (abfd, ps, scnhdr_ext->s_paddr);
+
+  PUT_SCNHDR_SCNPTR (abfd, scnhdr_int->s_scnptr,
+		     scnhdr_ext->s_scnptr);
+  PUT_SCNHDR_RELPTR (abfd, scnhdr_int->s_relptr,
+		     scnhdr_ext->s_relptr);
+  PUT_SCNHDR_LNNOPTR (abfd, scnhdr_int->s_lnnoptr,
+		      scnhdr_ext->s_lnnoptr);
+
+  {
+    /* Extra flags must be set when dealing with PE.  All sections should also
+       have the IMAGE_SCN_MEM_READ (0x40000000) flag set.  In addition, the
+       .text section must have IMAGE_SCN_MEM_EXECUTE (0x20000000) and the data
+       sections (.idata, .data, .bss, .CRT) must have IMAGE_SCN_MEM_WRITE set
+       (this is especially important when dealing with the .idata section since
+       the addresses for routines from .dlls must be overwritten).  If .reloc
+       section data is ever generated, we must add IMAGE_SCN_MEM_DISCARDABLE
+       (0x02000000).  Also, the resource data should also be read and
+       writable.  */
+
+    /* FIXME: Alignment is also encoded in this field, at least on PPC and
+       ARM-WINCE.  Although - how do we get the original alignment field
+       back ?  */
+
+    typedef struct
+    {
+      const char * 	section_name;
+      unsigned long	must_have;
+    }
+    pe_required_section_flags;
+
+    pe_required_section_flags known_sections [] =
+      {
+	{ ".arch",  IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_DISCARDABLE | IMAGE_SCN_ALIGN_8BYTES },
+	{ ".bss",   IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_MEM_WRITE },
+	{ ".data",  IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE },
+	{ ".edata", IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_INITIALIZED_DATA },
+	{ ".idata", IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE },
+	{ ".pdata", IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_INITIALIZED_DATA },
+	{ ".rdata", IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_INITIALIZED_DATA },
+	{ ".reloc", IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_DISCARDABLE },
+	{ ".rsrc",  IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE },
+	{ ".text" , IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE },
+	{ ".tls",   IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE },
+	{ ".xdata", IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_INITIALIZED_DATA },
+	{ NULL, 0}
+      };
+
+    pe_required_section_flags * p;
+
+    /* We have defaulted to adding the IMAGE_SCN_MEM_WRITE flag, but now
+       we know exactly what this specific section wants so we remove it
+       and then allow the must_have field to add it back in if necessary.
+       However, we don't remove IMAGE_SCN_MEM_WRITE flag from .text if the
+       default WP_TEXT file flag has been cleared.  WP_TEXT may be cleared
+       by ld --enable-auto-import (if auto-import is actually needed),
+       by ld --omagic, or by obcopy --writable-text.  */
+
+    for (p = known_sections; p->section_name; p++)
+      if (strcmp (scnhdr_int->s_name, p->section_name) == 0)
+	{
+	  if (strcmp (scnhdr_int->s_name, ".text")
+	      || (bfd_get_file_flags (abfd) & WP_TEXT))
+	    scnhdr_int->s_flags &= ~IMAGE_SCN_MEM_WRITE;
+	  scnhdr_int->s_flags |= p->must_have;
+	  break;
+	}
+
+    H_PUT_32 (abfd, scnhdr_int->s_flags, scnhdr_ext->s_flags);
+  }
+
+  if (coff_data (abfd)->link_info
+      && ! coff_data (abfd)->link_info->relocatable
+      && ! coff_data (abfd)->link_info->shared
+      && strcmp (scnhdr_int->s_name, ".text") == 0)
+    {
+      /* By inference from looking at MS output, the 32 bit field
+	 which is the combination of the number_of_relocs and
+	 number_of_linenos is used for the line number count in
+	 executables.  A 16-bit field won't do for cc1.  The MS
+	 document says that the number of relocs is zero for
+	 executables, but the 17-th bit has been observed to be there.
+	 Overflow is not an issue: a 4G-line program will overflow a
+	 bunch of other fields long before this!  */
+      H_PUT_16 (abfd, (scnhdr_int->s_nlnno & 0xffff), scnhdr_ext->s_nlnno);
+      H_PUT_16 (abfd, (scnhdr_int->s_nlnno >> 16), scnhdr_ext->s_nreloc);
+    }
+  else
+    {
+      if (scnhdr_int->s_nlnno <= 0xffff)
+	H_PUT_16 (abfd, scnhdr_int->s_nlnno, scnhdr_ext->s_nlnno);
+      else
+	{
+	  (*_bfd_error_handler) (_("%s: line number overflow: 0x%lx > 0xffff"),
+				 bfd_get_filename (abfd),
+				 scnhdr_int->s_nlnno);
+	  bfd_set_error (bfd_error_file_truncated);
+	  H_PUT_16 (abfd, 0xffff, scnhdr_ext->s_nlnno);
+	  ret = 0;
+	}
+
+      /* Although we could encode 0xffff relocs here, we do not, to be
+         consistent with other parts of bfd. Also it lets us warn, as
+         we should never see 0xffff here w/o having the overflow flag
+         set.  */
+      if (scnhdr_int->s_nreloc < 0xffff)
+	H_PUT_16 (abfd, scnhdr_int->s_nreloc, scnhdr_ext->s_nreloc);
+      else
+	{
+	  /* PE can deal with large #s of relocs, but not here.  */
+	  H_PUT_16 (abfd, 0xffff, scnhdr_ext->s_nreloc);
+	  scnhdr_int->s_flags |= IMAGE_SCN_LNK_NRELOC_OVFL;
+	  H_PUT_32 (abfd, scnhdr_int->s_flags, scnhdr_ext->s_flags);
+	}
+    }
+  return ret;
+}
+
+static char * dir_names[IMAGE_NUMBEROF_DIRECTORY_ENTRIES] =
+{
+  N_("Export Directory [.edata (or where ever we found it)]"),
+  N_("Import Directory [parts of .idata]"),
+  N_("Resource Directory [.rsrc]"),
+  N_("Exception Directory [.pdata]"),
+  N_("Security Directory"),
+  N_("Base Relocation Directory [.reloc]"),
+  N_("Debug Directory"),
+  N_("Description Directory"),
+  N_("Special Directory"),
+  N_("Thread Storage Directory [.tls]"),
+  N_("Load Configuration Directory"),
+  N_("Bound Import Directory"),
+  N_("Import Address Table Directory"),
+  N_("Delay Import Directory"),
+  N_("CLR Runtime Header"),
+  N_("Reserved")
+};
+
+#ifdef POWERPC_LE_PE
+/* The code for the PPC really falls in the "architecture dependent"
+   category.  However, it's not clear that anyone will ever care, so
+   we're ignoring the issue for now; if/when PPC matters, some of this
+   may need to go into peicode.h, or arguments passed to enable the
+   PPC- specific code.  */
+#endif
+
+static bfd_boolean
+pe_print_idata (bfd * abfd, void * vfile)
+{
+  FILE *file = (FILE *) vfile;
+  bfd_byte *data;
+  asection *section;
+  bfd_signed_vma adj;
+
+#ifdef POWERPC_LE_PE
+  asection *rel_section = bfd_get_section_by_name (abfd, ".reldata");
+#endif
+
+  bfd_size_type datasize = 0;
+  bfd_size_type dataoff;
+  bfd_size_type i;
+  int onaline = 20;
+
+  pe_data_type *pe = pe_data (abfd);
+  struct internal_extra_pe_aouthdr *extra = &pe->pe_opthdr;
+
+  bfd_vma addr;
+
+  addr = extra->DataDirectory[PE_IMPORT_TABLE].VirtualAddress;
+
+  if (addr == 0 && extra->DataDirectory[PE_IMPORT_TABLE].Size == 0)
+    {
+      /* Maybe the extra header isn't there.  Look for the section.  */
+      section = bfd_get_section_by_name (abfd, ".idata");
+      if (section == NULL)
+	return TRUE;
+
+      addr = section->vma;
+      datasize = section->size;
+      if (datasize == 0)
+	return TRUE;
+    }
+  else
+    {
+      addr += extra->ImageBase;
+      for (section = abfd->sections; section != NULL; section = section->next)
+	{
+	  datasize = section->size;
+	  if (addr >= section->vma && addr < section->vma + datasize)
+	    break;
+	}
+
+      if (section == NULL)
+	{
+	  fprintf (file,
+		   _("\nThere is an import table, but the section containing it could not be found\n"));
+	  return TRUE;
+	}
+    }
+
+  fprintf (file, _("\nThere is an import table in %s at 0x%lx\n"),
+	   section->name, (unsigned long) addr);
+
+  dataoff = addr - section->vma;
+
+#ifdef POWERPC_LE_PE
+  if (rel_section != 0 && rel_section->size != 0)
+    {
+      /* The toc address can be found by taking the starting address,
+	 which on the PPC locates a function descriptor. The
+	 descriptor consists of the function code starting address
+	 followed by the address of the toc. The starting address we
+	 get from the bfd, and the descriptor is supposed to be in the
+	 .reldata section.  */
+
+      bfd_vma loadable_toc_address;
+      bfd_vma toc_address;
+      bfd_vma start_address;
+      bfd_byte *data;
+      bfd_vma offset;
+
+      if (!bfd_malloc_and_get_section (abfd, rel_section, &data))
+	{
+	  if (data != NULL)
+	    free (data);
+	  return FALSE;
+	}
+
+      offset = abfd->start_address - rel_section->vma;
+
+      if (offset >= rel_section->size || offset + 8 > rel_section->size)
+        {
+          if (data != NULL)
+            free (data);
+          return FALSE;
+        }
+
+      start_address = bfd_get_32 (abfd, data + offset);
+      loadable_toc_address = bfd_get_32 (abfd, data + offset + 4);
+      toc_address = loadable_toc_address - 32768;
+
+      fprintf (file,
+	       _("\nFunction descriptor located at the start address: %04lx\n"),
+	       (unsigned long int) (abfd->start_address));
+      fprintf (file,
+	       _("\tcode-base %08lx toc (loadable/actual) %08lx/%08lx\n"),
+	       start_address, loadable_toc_address, toc_address);
+      if (data != NULL)
+	free (data);
+    }
+  else
+    {
+      fprintf (file,
+	       _("\nNo reldata section! Function descriptor not decoded.\n"));
+    }
+#endif
+
+  fprintf (file,
+	   _("\nThe Import Tables (interpreted %s section contents)\n"),
+	   section->name);
+  fprintf (file,
+	   _("\
+ vma:            Hint    Time      Forward  DLL       First\n\
+                 Table   Stamp     Chain    Name      Thunk\n"));
+
+  /* Read the whole section.  Some of the fields might be before dataoff.  */
+  if (!bfd_malloc_and_get_section (abfd, section, &data))
+    {
+      if (data != NULL)
+	free (data);
+      return FALSE;
+    }
+
+  adj = section->vma - extra->ImageBase;
+
+  /* Print all image import descriptors.  */
+  for (i = dataoff; i + onaline <= datasize; i += onaline)
+    {
+      bfd_vma hint_addr;
+      bfd_vma time_stamp;
+      bfd_vma forward_chain;
+      bfd_vma dll_name;
+      bfd_vma first_thunk;
+      int idx = 0;
+      bfd_size_type j;
+      char *dll;
+
+      /* Print (i + extra->DataDirectory[PE_IMPORT_TABLE].VirtualAddress).  */
+      fprintf (file, " %08lx\t", (unsigned long) (i + adj));
+      hint_addr = bfd_get_32 (abfd, data + i);
+      time_stamp = bfd_get_32 (abfd, data + i + 4);
+      forward_chain = bfd_get_32 (abfd, data + i + 8);
+      dll_name = bfd_get_32 (abfd, data + i + 12);
+      first_thunk = bfd_get_32 (abfd, data + i + 16);
+
+      fprintf (file, "%08lx %08lx %08lx %08lx %08lx\n",
+	       (unsigned long) hint_addr,
+	       (unsigned long) time_stamp,
+	       (unsigned long) forward_chain,
+	       (unsigned long) dll_name,
+	       (unsigned long) first_thunk);
+
+      if (hint_addr == 0 && first_thunk == 0)
+	break;
+
+      if (dll_name - adj >= section->size)
+        break;
+
+      dll = (char *) data + dll_name - adj;
+      fprintf (file, _("\n\tDLL Name: %s\n"), dll);
+
+      if (hint_addr != 0)
+	{
+	  bfd_byte *ft_data;
+	  asection *ft_section;
+	  bfd_vma ft_addr;
+	  bfd_size_type ft_datasize;
+	  int ft_idx;
+	  int ft_allocated;
+
+	  fprintf (file, _("\tvma:  Hint/Ord Member-Name Bound-To\n"));
+
+	  idx = hint_addr - adj;
+
+	  ft_addr = first_thunk + extra->ImageBase;
+	  ft_idx = first_thunk - adj;
+	  ft_data = data + ft_idx;
+	  ft_datasize = datasize - ft_idx;
+	  ft_allocated = 0;
+
+	  if (first_thunk != hint_addr)
+	    {
+	      /* Find the section which contains the first thunk.  */
+	      for (ft_section = abfd->sections;
+		   ft_section != NULL;
+		   ft_section = ft_section->next)
+		{
+		  if (ft_addr >= ft_section->vma
+		      && ft_addr < ft_section->vma + ft_section->size)
+		    break;
+		}
+
+	      if (ft_section == NULL)
+		{
+		  fprintf (file,
+		       _("\nThere is a first thunk, but the section containing it could not be found\n"));
+		  continue;
+		}
+
+	      /* Now check to see if this section is the same as our current
+		 section.  If it is not then we will have to load its data in.  */
+	      if (ft_section != section)
+		{
+		  ft_idx = first_thunk - (ft_section->vma - extra->ImageBase);
+		  ft_datasize = ft_section->size - ft_idx;
+		  ft_data = (bfd_byte *) bfd_malloc (ft_datasize);
+		  if (ft_data == NULL)
+		    continue;
+
+		  /* Read ft_datasize bytes starting at offset ft_idx.  */
+		  if (!bfd_get_section_contents (abfd, ft_section, ft_data,
+						 (bfd_vma) ft_idx, ft_datasize))
+		    {
+		      free (ft_data);
+		      continue;
+		    }
+		  ft_allocated = 1;
+		}
+	    }
+
+	  /* Print HintName vector entries.  */
+#ifdef COFF_WITH_pex64
+	  for (j = 0; idx + j + 8 <= datasize; j += 8)
+	    {
+	      unsigned long member = bfd_get_32 (abfd, data + idx + j);
+	      unsigned long member_high = bfd_get_32 (abfd, data + idx + j + 4);
+
+	      if (!member && !member_high)
+		break;
+
+	      if (member_high & 0x80000000)
+		fprintf (file, "\t%lx%08lx\t %4lx%08lx  <none>",
+			 member_high,member, member_high & 0x7fffffff, member);
+	      else
+		{
+		  int ordinal;
+		  char *member_name;
+
+		  ordinal = bfd_get_16 (abfd, data + member - adj);
+		  member_name = (char *) data + member - adj + 2;
+		  fprintf (file, "\t%04lx\t %4d  %s",member, ordinal, member_name);
+		}
+
+	      /* If the time stamp is not zero, the import address
+		 table holds actual addresses.  */
+	      if (time_stamp != 0
+		  && first_thunk != 0
+		  && first_thunk != hint_addr
+		  && j + 4 <= ft_datasize)
+		fprintf (file, "\t%04lx",
+			 (unsigned long) bfd_get_32 (abfd, ft_data + j));
+	      fprintf (file, "\n");
+	    }
+#else
+	  for (j = 0; idx + j + 4 <= datasize; j += 4)
+	    {
+	      unsigned long member = bfd_get_32 (abfd, data + idx + j);
+
+	      /* Print single IMAGE_IMPORT_BY_NAME vector.  */
+	      if (member == 0)
+		break;
+
+	      if (member & 0x80000000)
+		fprintf (file, "\t%04lx\t %4lu  <none>",
+			 member, member & 0x7fffffff);
+	      else
+		{
+		  int ordinal;
+		  char *member_name;
+
+		  ordinal = bfd_get_16 (abfd, data + member - adj);
+		  member_name = (char *) data + member - adj + 2;
+		  fprintf (file, "\t%04lx\t %4d  %s",
+			   member, ordinal, member_name);
+		}
+
+	      /* If the time stamp is not zero, the import address
+		 table holds actual addresses.  */
+	      if (time_stamp != 0
+		  && first_thunk != 0
+		  && first_thunk != hint_addr
+		  && j + 4 <= ft_datasize)
+		fprintf (file, "\t%04lx",
+			 (unsigned long) bfd_get_32 (abfd, ft_data + j));
+
+	      fprintf (file, "\n");
+	    }
+#endif
+	  if (ft_allocated)
+	    free (ft_data);
+	}
+
+      fprintf (file, "\n");
+    }
+
+  free (data);
+
+  return TRUE;
+}
+
+static bfd_boolean
+pe_print_edata (bfd * abfd, void * vfile)
+{
+  FILE *file = (FILE *) vfile;
+  bfd_byte *data;
+  asection *section;
+  bfd_size_type datasize = 0;
+  bfd_size_type dataoff;
+  bfd_size_type i;
+  bfd_signed_vma adj;
+  struct EDT_type
+  {
+    long export_flags;          /* Reserved - should be zero.  */
+    long time_stamp;
+    short major_ver;
+    short minor_ver;
+    bfd_vma name;               /* RVA - relative to image base.  */
+    long base;                  /* Ordinal base.  */
+    unsigned long num_functions;/* Number in the export address table.  */
+    unsigned long num_names;    /* Number in the name pointer table.  */
+    bfd_vma eat_addr;		/* RVA to the export address table.  */
+    bfd_vma npt_addr;		/* RVA to the Export Name Pointer Table.  */
+    bfd_vma ot_addr;		/* RVA to the Ordinal Table.  */
+  } edt;
+
+  pe_data_type *pe = pe_data (abfd);
+  struct internal_extra_pe_aouthdr *extra = &pe->pe_opthdr;
+
+  bfd_vma addr;
+
+  addr = extra->DataDirectory[PE_EXPORT_TABLE].VirtualAddress;
+
+  if (addr == 0 && extra->DataDirectory[PE_EXPORT_TABLE].Size == 0)
+    {
+      /* Maybe the extra header isn't there.  Look for the section.  */
+      section = bfd_get_section_by_name (abfd, ".edata");
+      if (section == NULL)
+	return TRUE;
+
+      addr = section->vma;
+      dataoff = 0;
+      datasize = section->size;
+      if (datasize == 0)
+	return TRUE;
+    }
+  else
+    {
+      addr += extra->ImageBase;
+
+      for (section = abfd->sections; section != NULL; section = section->next)
+	if (addr >= section->vma && addr < section->vma + section->size)
+	  break;
+
+      if (section == NULL)
+	{
+	  fprintf (file,
+		   _("\nThere is an export table, but the section containing it could not be found\n"));
+	  return TRUE;
+	}
+
+      dataoff = addr - section->vma;
+      datasize = extra->DataDirectory[PE_EXPORT_TABLE].Size;
+      if (datasize > section->size - dataoff)
+	{
+	  fprintf (file,
+		   _("\nThere is an export table in %s, but it does not fit into that section\n"),
+		   section->name);
+	  return TRUE;
+	}
+    }
+
+  fprintf (file, _("\nThere is an export table in %s at 0x%lx\n"),
+	   section->name, (unsigned long) addr);
+
+  data = (bfd_byte *) bfd_malloc (datasize);
+  if (data == NULL)
+    return FALSE;
+
+  if (! bfd_get_section_contents (abfd, section, data,
+				  (file_ptr) dataoff, datasize))
+    return FALSE;
+
+  /* Go get Export Directory Table.  */
+  edt.export_flags   = bfd_get_32 (abfd, data +  0);
+  edt.time_stamp     = bfd_get_32 (abfd, data +  4);
+  edt.major_ver      = bfd_get_16 (abfd, data +  8);
+  edt.minor_ver      = bfd_get_16 (abfd, data + 10);
+  edt.name           = bfd_get_32 (abfd, data + 12);
+  edt.base           = bfd_get_32 (abfd, data + 16);
+  edt.num_functions  = bfd_get_32 (abfd, data + 20);
+  edt.num_names      = bfd_get_32 (abfd, data + 24);
+  edt.eat_addr       = bfd_get_32 (abfd, data + 28);
+  edt.npt_addr       = bfd_get_32 (abfd, data + 32);
+  edt.ot_addr        = bfd_get_32 (abfd, data + 36);
+
+  adj = section->vma - extra->ImageBase + dataoff;
+
+  /* Dump the EDT first.  */
+  fprintf (file,
+	   _("\nThe Export Tables (interpreted %s section contents)\n\n"),
+	   section->name);
+
+  fprintf (file,
+	   _("Export Flags \t\t\t%lx\n"), (unsigned long) edt.export_flags);
+
+  fprintf (file,
+	   _("Time/Date stamp \t\t%lx\n"), (unsigned long) edt.time_stamp);
+
+  fprintf (file,
+	   _("Major/Minor \t\t\t%d/%d\n"), edt.major_ver, edt.minor_ver);
+
+  fprintf (file,
+	   _("Name \t\t\t\t"));
+  bfd_fprintf_vma (abfd, file, edt.name);
+  fprintf (file,
+	   " %s\n", data + edt.name - adj);
+
+  fprintf (file,
+	   _("Ordinal Base \t\t\t%ld\n"), edt.base);
+
+  fprintf (file,
+	   _("Number in:\n"));
+
+  fprintf (file,
+	   _("\tExport Address Table \t\t%08lx\n"),
+	   edt.num_functions);
+
+  fprintf (file,
+	   _("\t[Name Pointer/Ordinal] Table\t%08lx\n"), edt.num_names);
+
+  fprintf (file,
+	   _("Table Addresses\n"));
+
+  fprintf (file,
+	   _("\tExport Address Table \t\t"));
+  bfd_fprintf_vma (abfd, file, edt.eat_addr);
+  fprintf (file, "\n");
+
+  fprintf (file,
+	   _("\tName Pointer Table \t\t"));
+  bfd_fprintf_vma (abfd, file, edt.npt_addr);
+  fprintf (file, "\n");
+
+  fprintf (file,
+	   _("\tOrdinal Table \t\t\t"));
+  bfd_fprintf_vma (abfd, file, edt.ot_addr);
+  fprintf (file, "\n");
+
+  /* The next table to find is the Export Address Table. It's basically
+     a list of pointers that either locate a function in this dll, or
+     forward the call to another dll. Something like:
+      typedef union
+      {
+        long export_rva;
+        long forwarder_rva;
+      } export_address_table_entry;  */
+
+  fprintf (file,
+	  _("\nExport Address Table -- Ordinal Base %ld\n"),
+	  edt.base);
+
+  for (i = 0; i < edt.num_functions; ++i)
+    {
+      bfd_vma eat_member = bfd_get_32 (abfd,
+				       data + edt.eat_addr + (i * 4) - adj);
+      if (eat_member == 0)
+	continue;
+
+      if (eat_member - adj <= datasize)
+	{
+	  /* This rva is to a name (forwarding function) in our section.  */
+	  /* Should locate a function descriptor.  */
+	  fprintf (file,
+		   "\t[%4ld] +base[%4ld] %04lx %s -- %s\n",
+		   (long) i,
+		   (long) (i + edt.base),
+		   (unsigned long) eat_member,
+		   _("Forwarder RVA"),
+		   data + eat_member - adj);
+	}
+      else
+	{
+	  /* Should locate a function descriptor in the reldata section.  */
+	  fprintf (file,
+		   "\t[%4ld] +base[%4ld] %04lx %s\n",
+		   (long) i,
+		   (long) (i + edt.base),
+		   (unsigned long) eat_member,
+		   _("Export RVA"));
+	}
+    }
+
+  /* The Export Name Pointer Table is paired with the Export Ordinal Table.  */
+  /* Dump them in parallel for clarity.  */
+  fprintf (file,
+	   _("\n[Ordinal/Name Pointer] Table\n"));
+
+  for (i = 0; i < edt.num_names; ++i)
+    {
+      bfd_vma name_ptr = bfd_get_32 (abfd,
+				    data +
+				    edt.npt_addr
+				    + (i*4) - adj);
+
+      char *name = (char *) data + name_ptr - adj;
+
+      bfd_vma ord = bfd_get_16 (abfd,
+				    data +
+				    edt.ot_addr
+				    + (i*2) - adj);
+      fprintf (file,
+	      "\t[%4ld] %s\n", (long) ord, name);
+    }
+
+  free (data);
+
+  return TRUE;
+}
+
+/* This really is architecture dependent.  On IA-64, a .pdata entry
+   consists of three dwords containing relative virtual addresses that
+   specify the start and end address of the code range the entry
+   covers and the address of the corresponding unwind info data.
+
+   On ARM and SH-4, a compressed PDATA structure is used :
+   _IMAGE_CE_RUNTIME_FUNCTION_ENTRY, whereas MIPS is documented to use
+   _IMAGE_ALPHA_RUNTIME_FUNCTION_ENTRY.
+   See http://msdn2.microsoft.com/en-us/library/ms253988(VS.80).aspx .
+
+   This is the version for uncompressed data.  */
+
+static bfd_boolean
+pe_print_pdata (bfd * abfd, void * vfile)
+{
+#if defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+# define PDATA_ROW_SIZE	(3 * 8)
+#else
+# define PDATA_ROW_SIZE	(5 * 4)
+#endif
+  FILE *file = (FILE *) vfile;
+  bfd_byte *data = 0;
+  asection *section = bfd_get_section_by_name (abfd, ".pdata");
+  bfd_size_type datasize = 0;
+  bfd_size_type i;
+  bfd_size_type start, stop;
+  int onaline = PDATA_ROW_SIZE;
+
+  if (section == NULL
+      || coff_section_data (abfd, section) == NULL
+      || pei_section_data (abfd, section) == NULL)
+    return TRUE;
+
+  stop = pei_section_data (abfd, section)->virt_size;
+  if ((stop % onaline) != 0)
+    fprintf (file,
+	     _("Warning, .pdata section size (%ld) is not a multiple of %d\n"),
+	     (long) stop, onaline);
+
+  fprintf (file,
+	   _("\nThe Function Table (interpreted .pdata section contents)\n"));
+#if defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+  fprintf (file,
+	   _(" vma:\t\t\tBegin Address    End Address      Unwind Info\n"));
+#else
+  fprintf (file, _("\
+ vma:\t\tBegin    End      EH       EH       PrologEnd  Exception\n\
+     \t\tAddress  Address  Handler  Data     Address    Mask\n"));
+#endif
+
+  datasize = section->size;
+  if (datasize == 0)
+    return TRUE;
+
+  if (! bfd_malloc_and_get_section (abfd, section, &data))
+    {
+      if (data != NULL)
+	free (data);
+      return FALSE;
+    }
+
+  start = 0;
+
+  for (i = start; i < stop; i += onaline)
+    {
+      bfd_vma begin_addr;
+      bfd_vma end_addr;
+      bfd_vma eh_handler;
+      bfd_vma eh_data;
+      bfd_vma prolog_end_addr;
+#if !defined(COFF_WITH_pep) || defined(COFF_WITH_pex64)
+      int em_data;
+#endif
+
+      if (i + PDATA_ROW_SIZE > stop)
+	break;
+
+      begin_addr      = GET_PDATA_ENTRY (abfd, data + i     );
+      end_addr        = GET_PDATA_ENTRY (abfd, data + i +  4);
+      eh_handler      = GET_PDATA_ENTRY (abfd, data + i +  8);
+      eh_data         = GET_PDATA_ENTRY (abfd, data + i + 12);
+      prolog_end_addr = GET_PDATA_ENTRY (abfd, data + i + 16);
+
+      if (begin_addr == 0 && end_addr == 0 && eh_handler == 0
+	  && eh_data == 0 && prolog_end_addr == 0)
+	/* We are probably into the padding of the section now.  */
+	break;
+
+#if !defined(COFF_WITH_pep) || defined(COFF_WITH_pex64)
+      em_data = ((eh_handler & 0x1) << 2) | (prolog_end_addr & 0x3);
+#endif
+      eh_handler &= ~(bfd_vma) 0x3;
+      prolog_end_addr &= ~(bfd_vma) 0x3;
+
+      fputc (' ', file);
+      bfd_fprintf_vma (abfd, file, i + section->vma); fputc ('\t', file);
+      bfd_fprintf_vma (abfd, file, begin_addr); fputc (' ', file);
+      bfd_fprintf_vma (abfd, file, end_addr); fputc (' ', file);
+      bfd_fprintf_vma (abfd, file, eh_handler);
+#if !defined(COFF_WITH_pep) || defined(COFF_WITH_pex64)
+      fputc (' ', file);
+      bfd_fprintf_vma (abfd, file, eh_data); fputc (' ', file);
+      bfd_fprintf_vma (abfd, file, prolog_end_addr);
+      fprintf (file, "   %x", em_data);
+#endif
+
+#ifdef POWERPC_LE_PE
+      if (eh_handler == 0 && eh_data != 0)
+	{
+	  /* Special bits here, although the meaning may be a little
+	     mysterious. The only one I know for sure is 0x03
+	     Code Significance
+	     0x00 None
+	     0x01 Register Save Millicode
+	     0x02 Register Restore Millicode
+	     0x03 Glue Code Sequence.  */
+	  switch (eh_data)
+	    {
+	    case 0x01:
+	      fprintf (file, _(" Register save millicode"));
+	      break;
+	    case 0x02:
+	      fprintf (file, _(" Register restore millicode"));
+	      break;
+	    case 0x03:
+	      fprintf (file, _(" Glue code sequence"));
+	      break;
+	    default:
+	      break;
+	    }
+	}
+#endif
+      fprintf (file, "\n");
+    }
+
+  free (data);
+
+  return TRUE;
+#undef PDATA_ROW_SIZE
+}
+
+typedef struct sym_cache
+{
+  int        symcount;
+  asymbol ** syms;
+} sym_cache;
+
+static asymbol **
+slurp_symtab (bfd *abfd, sym_cache *psc)
+{
+  asymbol ** sy = NULL;
+  long storage;
+
+  if (!(bfd_get_file_flags (abfd) & HAS_SYMS))
+    {
+      psc->symcount = 0;
+      return NULL;
+    }
+
+  storage = bfd_get_symtab_upper_bound (abfd);
+  if (storage < 0)
+    return NULL;
+  if (storage)
+    sy = (asymbol **) bfd_malloc (storage);
+
+  psc->symcount = bfd_canonicalize_symtab (abfd, sy);
+  if (psc->symcount < 0)
+    return NULL;
+  return sy;
+}
+
+static const char *
+my_symbol_for_address (bfd *abfd, bfd_vma func, sym_cache *psc)
+{
+  int i;
+
+  if (psc->syms == 0)
+    psc->syms = slurp_symtab (abfd, psc);
+
+  for (i = 0; i < psc->symcount; i++)
+    {
+      if (psc->syms[i]->section->vma + psc->syms[i]->value == func)
+	return psc->syms[i]->name;
+    }
+
+  return NULL;
+}
+
+static void
+cleanup_syms (sym_cache *psc)
+{
+  psc->symcount = 0;
+  free (psc->syms);
+  psc->syms = NULL;
+}
+
+/* This is the version for "compressed" pdata.  */
+
+bfd_boolean
+_bfd_XX_print_ce_compressed_pdata (bfd * abfd, void * vfile)
+{
+# define PDATA_ROW_SIZE	(2 * 4)
+  FILE *file = (FILE *) vfile;
+  bfd_byte *data = NULL;
+  asection *section = bfd_get_section_by_name (abfd, ".pdata");
+  bfd_size_type datasize = 0;
+  bfd_size_type i;
+  bfd_size_type start, stop;
+  int onaline = PDATA_ROW_SIZE;
+  struct sym_cache cache = {0, 0} ;
+
+  if (section == NULL
+      || coff_section_data (abfd, section) == NULL
+      || pei_section_data (abfd, section) == NULL)
+    return TRUE;
+
+  stop = pei_section_data (abfd, section)->virt_size;
+  if ((stop % onaline) != 0)
+    fprintf (file,
+	     _("Warning, .pdata section size (%ld) is not a multiple of %d\n"),
+	     (long) stop, onaline);
+
+  fprintf (file,
+	   _("\nThe Function Table (interpreted .pdata section contents)\n"));
+
+  fprintf (file, _("\
+ vma:\t\tBegin    Prolog   Function Flags    Exception EH\n\
+     \t\tAddress  Length   Length   32b exc  Handler   Data\n"));
+
+  datasize = section->size;
+  if (datasize == 0)
+    return TRUE;
+
+  if (! bfd_malloc_and_get_section (abfd, section, &data))
+    {
+      if (data != NULL)
+	free (data);
+      return FALSE;
+    }
+
+  start = 0;
+
+  for (i = start; i < stop; i += onaline)
+    {
+      bfd_vma begin_addr;
+      bfd_vma other_data;
+      bfd_vma prolog_length, function_length;
+      int flag32bit, exception_flag;
+      asection *tsection;
+
+      if (i + PDATA_ROW_SIZE > stop)
+	break;
+
+      begin_addr = GET_PDATA_ENTRY (abfd, data + i     );
+      other_data = GET_PDATA_ENTRY (abfd, data + i +  4);
+
+      if (begin_addr == 0 && other_data == 0)
+	/* We are probably into the padding of the section now.  */
+	break;
+
+      prolog_length = (other_data & 0x000000FF);
+      function_length = (other_data & 0x3FFFFF00) >> 8;
+      flag32bit = (int)((other_data & 0x40000000) >> 30);
+      exception_flag = (int)((other_data & 0x80000000) >> 31);
+
+      fputc (' ', file);
+      bfd_fprintf_vma (abfd, file, i + section->vma); fputc ('\t', file);
+      bfd_fprintf_vma (abfd, file, begin_addr); fputc (' ', file);
+      bfd_fprintf_vma (abfd, file, prolog_length); fputc (' ', file);
+      bfd_fprintf_vma (abfd, file, function_length); fputc (' ', file);
+      fprintf (file, "%2d  %2d   ", flag32bit, exception_flag);
+
+      /* Get the exception handler's address and the data passed from the
+         .text section. This is really the data that belongs with the .pdata
+         but got "compressed" out for the ARM and SH4 architectures.  */
+      tsection = bfd_get_section_by_name (abfd, ".text");
+      if (tsection && coff_section_data (abfd, tsection)
+	  && pei_section_data (abfd, tsection))
+	{
+	  bfd_vma eh_off = (begin_addr - 8) - tsection->vma;
+	  bfd_byte *tdata;
+
+	  tdata = (bfd_byte *) bfd_malloc (8);
+	  if (tdata)
+	    {
+	      if (bfd_get_section_contents (abfd, tsection, tdata, eh_off, 8))
+		{
+		  bfd_vma eh, eh_data;
+
+		  eh = bfd_get_32 (abfd, tdata);
+		  eh_data = bfd_get_32 (abfd, tdata + 4);
+		  fprintf (file, "%08x  ", (unsigned int) eh);
+		  fprintf (file, "%08x", (unsigned int) eh_data);
+		  if (eh != 0)
+		    {
+		      const char *s = my_symbol_for_address (abfd, eh, &cache);
+
+		      if (s)
+			fprintf (file, " (%s) ", s);
+		    }
+		}
+	      free (tdata);
+	    }
+	}
+
+      fprintf (file, "\n");
+    }
+
+  free (data);
+
+  cleanup_syms (& cache);
+
+  return TRUE;
+#undef PDATA_ROW_SIZE
+}
+
+
+#define IMAGE_REL_BASED_HIGHADJ 4
+static const char * const tbl[] =
+{
+  "ABSOLUTE",
+  "HIGH",
+  "LOW",
+  "HIGHLOW",
+  "HIGHADJ",
+  "MIPS_JMPADDR",
+  "SECTION",
+  "REL32",
+  "RESERVED1",
+  "MIPS_JMPADDR16",
+  "DIR64",
+  "HIGH3ADJ",
+  "UNKNOWN",   /* MUST be last.  */
+};
+
+static bfd_boolean
+pe_print_reloc (bfd * abfd, void * vfile)
+{
+  FILE *file = (FILE *) vfile;
+  bfd_byte *data = 0;
+  asection *section = bfd_get_section_by_name (abfd, ".reloc");
+  bfd_size_type i;
+  bfd_size_type start, stop;
+
+  if (section == NULL)
+    return TRUE;
+
+  if (section->size == 0)
+    return TRUE;
+
+  fprintf (file,
+	   _("\n\nPE File Base Relocations (interpreted .reloc section contents)\n"));
+
+  if (! bfd_malloc_and_get_section (abfd, section, &data))
+    {
+      if (data != NULL)
+	free (data);
+      return FALSE;
+    }
+
+  start = 0;
+
+  stop = section->size;
+
+  for (i = start; i < stop;)
+    {
+      int j;
+      bfd_vma virtual_address;
+      long number, size;
+
+      /* The .reloc section is a sequence of blocks, with a header consisting
+	 of two 32 bit quantities, followed by a number of 16 bit entries.  */
+      virtual_address = bfd_get_32 (abfd, data+i);
+      size = bfd_get_32 (abfd, data+i+4);
+      number = (size - 8) / 2;
+
+      if (size == 0)
+	break;
+
+      fprintf (file,
+	       _("\nVirtual Address: %08lx Chunk size %ld (0x%lx) Number of fixups %ld\n"),
+	       (unsigned long) virtual_address, size, (unsigned long) size, number);
+
+      for (j = 0; j < number; ++j)
+	{
+	  unsigned short e = bfd_get_16 (abfd, data + i + 8 + j * 2);
+	  unsigned int t = (e & 0xF000) >> 12;
+	  int off = e & 0x0FFF;
+
+	  if (t >= sizeof (tbl) / sizeof (tbl[0]))
+	    t = (sizeof (tbl) / sizeof (tbl[0])) - 1;
+
+	  fprintf (file,
+		   _("\treloc %4d offset %4x [%4lx] %s"),
+		   j, off, (unsigned long) (off + virtual_address), tbl[t]);
+
+	  /* HIGHADJ takes an argument, - the next record *is* the
+	     low 16 bits of addend.  */
+	  if (t == IMAGE_REL_BASED_HIGHADJ)
+	    {
+	      fprintf (file, " (%4x)",
+		       ((unsigned int)
+			bfd_get_16 (abfd, data + i + 8 + j * 2 + 2)));
+	      j++;
+	    }
+
+	  fprintf (file, "\n");
+	}
+
+      i += size;
+    }
+
+  free (data);
+
+  return TRUE;
+}
+
+/* Print out the program headers.  */
+
+bfd_boolean
+_bfd_XX_print_private_bfd_data_common (bfd * abfd, void * vfile)
+{
+  FILE *file = (FILE *) vfile;
+  int j;
+  pe_data_type *pe = pe_data (abfd);
+  struct internal_extra_pe_aouthdr *i = &pe->pe_opthdr;
+  const char *subsystem_name = NULL;
+  const char *name;
+
+  /* The MS dumpbin program reportedly ands with 0xff0f before
+     printing the characteristics field.  Not sure why.  No reason to
+     emulate it here.  */
+  fprintf (file, _("\nCharacteristics 0x%x\n"), pe->real_flags);
+#undef PF
+#define PF(x, y) if (pe->real_flags & x) { fprintf (file, "\t%s\n", y); }
+  PF (IMAGE_FILE_RELOCS_STRIPPED, "relocations stripped");
+  PF (IMAGE_FILE_EXECUTABLE_IMAGE, "executable");
+  PF (IMAGE_FILE_LINE_NUMS_STRIPPED, "line numbers stripped");
+  PF (IMAGE_FILE_LOCAL_SYMS_STRIPPED, "symbols stripped");
+  PF (IMAGE_FILE_LARGE_ADDRESS_AWARE, "large address aware");
+  PF (IMAGE_FILE_BYTES_REVERSED_LO, "little endian");
+  PF (IMAGE_FILE_32BIT_MACHINE, "32 bit words");
+  PF (IMAGE_FILE_DEBUG_STRIPPED, "debugging information removed");
+  PF (IMAGE_FILE_SYSTEM, "system file");
+  PF (IMAGE_FILE_DLL, "DLL");
+  PF (IMAGE_FILE_BYTES_REVERSED_HI, "big endian");
+#undef PF
+
+  /* ctime implies '\n'.  */
+  {
+    time_t t = pe->coff.timestamp;
+    fprintf (file, "\nTime/Date\t\t%s", ctime (&t));
+  }
+
+#ifndef IMAGE_NT_OPTIONAL_HDR_MAGIC
+# define IMAGE_NT_OPTIONAL_HDR_MAGIC 0x10b
+#endif
+#ifndef IMAGE_NT_OPTIONAL_HDR64_MAGIC
+# define IMAGE_NT_OPTIONAL_HDR64_MAGIC 0x20b
+#endif
+#ifndef IMAGE_NT_OPTIONAL_HDRROM_MAGIC
+# define IMAGE_NT_OPTIONAL_HDRROM_MAGIC 0x107
+#endif
+
+  switch (i->Magic)
+    {
+    case IMAGE_NT_OPTIONAL_HDR_MAGIC:
+      name = "PE32";
+      break;
+    case IMAGE_NT_OPTIONAL_HDR64_MAGIC:
+      name = "PE32+";
+      break;
+    case IMAGE_NT_OPTIONAL_HDRROM_MAGIC:
+      name = "ROM";
+      break;
+    default:
+      name = NULL;
+      break;
+    }
+  fprintf (file, "Magic\t\t\t%04x", i->Magic);
+  if (name)
+    fprintf (file, "\t(%s)",name);
+  fprintf (file, "\nMajorLinkerVersion\t%d\n", i->MajorLinkerVersion);
+  fprintf (file, "MinorLinkerVersion\t%d\n", i->MinorLinkerVersion);
+  fprintf (file, "SizeOfCode\t\t%08lx\n", (unsigned long) i->SizeOfCode);
+  fprintf (file, "SizeOfInitializedData\t%08lx\n",
+	   (unsigned long) i->SizeOfInitializedData);
+  fprintf (file, "SizeOfUninitializedData\t%08lx\n",
+	   (unsigned long) i->SizeOfUninitializedData);
+  fprintf (file, "AddressOfEntryPoint\t");
+  bfd_fprintf_vma (abfd, file, i->AddressOfEntryPoint);
+  fprintf (file, "\nBaseOfCode\t\t");
+  bfd_fprintf_vma (abfd, file, i->BaseOfCode);
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+  /* PE32+ does not have BaseOfData member!  */
+  fprintf (file, "\nBaseOfData\t\t");
+  bfd_fprintf_vma (abfd, file, i->BaseOfData);
+#endif
+
+  fprintf (file, "\nImageBase\t\t");
+  bfd_fprintf_vma (abfd, file, i->ImageBase);
+  fprintf (file, "\nSectionAlignment\t");
+  bfd_fprintf_vma (abfd, file, i->SectionAlignment);
+  fprintf (file, "\nFileAlignment\t\t");
+  bfd_fprintf_vma (abfd, file, i->FileAlignment);
+  fprintf (file, "\nMajorOSystemVersion\t%d\n", i->MajorOperatingSystemVersion);
+  fprintf (file, "MinorOSystemVersion\t%d\n", i->MinorOperatingSystemVersion);
+  fprintf (file, "MajorImageVersion\t%d\n", i->MajorImageVersion);
+  fprintf (file, "MinorImageVersion\t%d\n", i->MinorImageVersion);
+  fprintf (file, "MajorSubsystemVersion\t%d\n", i->MajorSubsystemVersion);
+  fprintf (file, "MinorSubsystemVersion\t%d\n", i->MinorSubsystemVersion);
+  fprintf (file, "Win32Version\t\t%08lx\n", (unsigned long) i->Reserved1);
+  fprintf (file, "SizeOfImage\t\t%08lx\n", (unsigned long) i->SizeOfImage);
+  fprintf (file, "SizeOfHeaders\t\t%08lx\n", (unsigned long) i->SizeOfHeaders);
+  fprintf (file, "CheckSum\t\t%08lx\n", (unsigned long) i->CheckSum);
+
+  switch (i->Subsystem)
+    {
+    case IMAGE_SUBSYSTEM_UNKNOWN:
+      subsystem_name = "unspecified";
+      break;
+    case IMAGE_SUBSYSTEM_NATIVE:
+      subsystem_name = "NT native";
+      break;
+    case IMAGE_SUBSYSTEM_WINDOWS_GUI:
+      subsystem_name = "Windows GUI";
+      break;
+    case IMAGE_SUBSYSTEM_WINDOWS_CUI:
+      subsystem_name = "Windows CUI";
+      break;
+    case IMAGE_SUBSYSTEM_POSIX_CUI:
+      subsystem_name = "POSIX CUI";
+      break;
+    case IMAGE_SUBSYSTEM_WINDOWS_CE_GUI:
+      subsystem_name = "Wince CUI";
+      break;
+    // These are from UEFI Platform Initialization Specification 1.1.
+    case IMAGE_SUBSYSTEM_EFI_APPLICATION:
+      subsystem_name = "EFI application";
+      break;
+    case IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER:
+      subsystem_name = "EFI boot service driver";
+      break;
+    case IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER:
+      subsystem_name = "EFI runtime driver";
+      break;
+    case IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER:
+      subsystem_name = "SAL runtime driver";
+      break;
+    // This is from revision 8.0 of the MS PE/COFF spec
+    case IMAGE_SUBSYSTEM_XBOX:
+      subsystem_name = "XBOX";
+      break;
+    // Added default case for clarity - subsystem_name is NULL anyway.
+    default:
+      subsystem_name = NULL;
+    }
+
+  fprintf (file, "Subsystem\t\t%08x", i->Subsystem);
+  if (subsystem_name)
+    fprintf (file, "\t(%s)", subsystem_name);
+  fprintf (file, "\nDllCharacteristics\t%08x\n", i->DllCharacteristics);
+  fprintf (file, "SizeOfStackReserve\t");
+  bfd_fprintf_vma (abfd, file, i->SizeOfStackReserve);
+  fprintf (file, "\nSizeOfStackCommit\t");
+  bfd_fprintf_vma (abfd, file, i->SizeOfStackCommit);
+  fprintf (file, "\nSizeOfHeapReserve\t");
+  bfd_fprintf_vma (abfd, file, i->SizeOfHeapReserve);
+  fprintf (file, "\nSizeOfHeapCommit\t");
+  bfd_fprintf_vma (abfd, file, i->SizeOfHeapCommit);
+  fprintf (file, "\nLoaderFlags\t\t%08lx\n", (unsigned long) i->LoaderFlags);
+  fprintf (file, "NumberOfRvaAndSizes\t%08lx\n",
+	   (unsigned long) i->NumberOfRvaAndSizes);
+
+  fprintf (file, "\nThe Data Directory\n");
+  for (j = 0; j < IMAGE_NUMBEROF_DIRECTORY_ENTRIES; j++)
+    {
+      fprintf (file, "Entry %1x ", j);
+      bfd_fprintf_vma (abfd, file, i->DataDirectory[j].VirtualAddress);
+      fprintf (file, " %08lx ", (unsigned long) i->DataDirectory[j].Size);
+      fprintf (file, "%s\n", dir_names[j]);
+    }
+
+  pe_print_idata (abfd, vfile);
+  pe_print_edata (abfd, vfile);
+  if (bfd_coff_have_print_pdata (abfd))
+    bfd_coff_print_pdata (abfd, vfile);
+  else
+    pe_print_pdata (abfd, vfile);
+  pe_print_reloc (abfd, vfile);
+
+  return TRUE;
+}
+
+/* Copy any private info we understand from the input bfd
+   to the output bfd.  */
+
+bfd_boolean
+_bfd_XX_bfd_copy_private_bfd_data_common (bfd * ibfd, bfd * obfd)
+{
+  pe_data_type *ipe, *ope;
+
+  /* One day we may try to grok other private data.  */
+  if (ibfd->xvec->flavour != bfd_target_coff_flavour
+      || obfd->xvec->flavour != bfd_target_coff_flavour)
+    return TRUE;
+
+  ipe = pe_data (ibfd);
+  ope = pe_data (obfd);
+
+  /* pe_opthdr is copied in copy_object.  */
+  ope->dll = ipe->dll;
+
+  /* Don't copy input subsystem if output is different from input.  */
+  if (obfd->xvec != ibfd->xvec)
+    ope->pe_opthdr.Subsystem = IMAGE_SUBSYSTEM_UNKNOWN;
+
+  /* For strip: if we removed .reloc, we'll make a real mess of things
+     if we don't remove this entry as well.  */
+  if (! pe_data (obfd)->has_reloc_section)
+    {
+      pe_data (obfd)->pe_opthdr.DataDirectory[PE_BASE_RELOCATION_TABLE].VirtualAddress = 0;
+      pe_data (obfd)->pe_opthdr.DataDirectory[PE_BASE_RELOCATION_TABLE].Size = 0;
+    }
+
+  /* For PIE, if there is .reloc, we won't add IMAGE_FILE_RELOCS_STRIPPED.
+     But there is no .reloc, we make sure that IMAGE_FILE_RELOCS_STRIPPED
+     won't be added.  */
+  if (! pe_data (ibfd)->has_reloc_section
+      && ! (pe_data (ibfd)->real_flags & IMAGE_FILE_RELOCS_STRIPPED))
+    pe_data (obfd)->dont_strip_reloc = 1;
+
+  return TRUE;
+}
+
+/* Copy private section data.  */
+
+bfd_boolean
+_bfd_XX_bfd_copy_private_section_data (bfd *ibfd,
+				       asection *isec,
+				       bfd *obfd,
+				       asection *osec)
+{
+  if (bfd_get_flavour (ibfd) != bfd_target_coff_flavour
+      || bfd_get_flavour (obfd) != bfd_target_coff_flavour)
+    return TRUE;
+
+  if (coff_section_data (ibfd, isec) != NULL
+      && pei_section_data (ibfd, isec) != NULL)
+    {
+      if (coff_section_data (obfd, osec) == NULL)
+	{
+	  bfd_size_type amt = sizeof (struct coff_section_tdata);
+	  osec->used_by_bfd = bfd_zalloc (obfd, amt);
+	  if (osec->used_by_bfd == NULL)
+	    return FALSE;
+	}
+
+      if (pei_section_data (obfd, osec) == NULL)
+	{
+	  bfd_size_type amt = sizeof (struct pei_section_tdata);
+	  coff_section_data (obfd, osec)->tdata = bfd_zalloc (obfd, amt);
+	  if (coff_section_data (obfd, osec)->tdata == NULL)
+	    return FALSE;
+	}
+
+      pei_section_data (obfd, osec)->virt_size =
+	pei_section_data (ibfd, isec)->virt_size;
+      pei_section_data (obfd, osec)->pe_flags =
+	pei_section_data (ibfd, isec)->pe_flags;
+    }
+
+  return TRUE;
+}
+
+void
+_bfd_XX_get_symbol_info (bfd * abfd, asymbol *symbol, symbol_info *ret)
+{
+  coff_get_symbol_info (abfd, symbol, ret);
+}
+
+#if !defined(COFF_WITH_pep) && defined(COFF_WITH_pex64)
+static int
+sort_x64_pdata (const void *l, const void *r)
+{
+  const char *lp = (const char *) l;
+  const char *rp = (const char *) r;
+  bfd_vma vl, vr;
+  vl = bfd_getl32 (lp); vr = bfd_getl32 (rp);
+  if (vl != vr)
+    return (vl < vr ? -1 : 1);
+  /* We compare just begin address.  */
+  return 0;
+}
+#endif
+
+/* Handle the .idata section and other things that need symbol table
+   access.  */
+
+bfd_boolean
+_bfd_XXi_final_link_postscript (bfd * abfd, struct coff_final_link_info *pfinfo)
+{
+  struct coff_link_hash_entry *h1;
+  struct bfd_link_info *info = pfinfo->info;
+  bfd_boolean result = TRUE;
+
+  /* There are a few fields that need to be filled in now while we
+     have symbol table access.
+
+     The .idata subsections aren't directly available as sections, but
+     they are in the symbol table, so get them from there.  */
+
+  /* The import directory.  This is the address of .idata$2, with size
+     of .idata$2 + .idata$3.  */
+  h1 = coff_link_hash_lookup (coff_hash_table (info),
+			      ".idata$2", FALSE, FALSE, TRUE);
+  if (h1 != NULL)
+    {
+      /* PR ld/2729: We cannot rely upon all the output sections having been
+	 created properly, so check before referencing them.  Issue a warning
+	 message for any sections tht could not be found.  */
+      if ((h1->root.type == bfd_link_hash_defined
+	   || h1->root.type == bfd_link_hash_defweak)
+	  && h1->root.u.def.section != NULL
+	  && h1->root.u.def.section->output_section != NULL)
+	pe_data (abfd)->pe_opthdr.DataDirectory[PE_IMPORT_TABLE].VirtualAddress =
+	  (h1->root.u.def.value
+	   + h1->root.u.def.section->output_section->vma
+	   + h1->root.u.def.section->output_offset);
+      else
+	{
+	  _bfd_error_handler
+	    (_("%B: unable to fill in DataDictionary[1] because .idata$2 is missing"),
+	     abfd);
+	  result = FALSE;
+	}
+
+      h1 = coff_link_hash_lookup (coff_hash_table (info),
+				  ".idata$4", FALSE, FALSE, TRUE);
+      if (h1 != NULL
+	  && (h1->root.type == bfd_link_hash_defined
+	   || h1->root.type == bfd_link_hash_defweak)
+	  && h1->root.u.def.section != NULL
+	  && h1->root.u.def.section->output_section != NULL)
+	pe_data (abfd)->pe_opthdr.DataDirectory[PE_IMPORT_TABLE].Size =
+	  ((h1->root.u.def.value
+	    + h1->root.u.def.section->output_section->vma
+	    + h1->root.u.def.section->output_offset)
+	   - pe_data (abfd)->pe_opthdr.DataDirectory[PE_IMPORT_TABLE].VirtualAddress);
+      else
+	{
+	  _bfd_error_handler
+	    (_("%B: unable to fill in DataDictionary[1] because .idata$4 is missing"),
+	     abfd);
+	  result = FALSE;
+	}
+
+      /* The import address table.  This is the size/address of
+         .idata$5.  */
+      h1 = coff_link_hash_lookup (coff_hash_table (info),
+				  ".idata$5", FALSE, FALSE, TRUE);
+      if (h1 != NULL
+	  && (h1->root.type == bfd_link_hash_defined
+	   || h1->root.type == bfd_link_hash_defweak)
+	  && h1->root.u.def.section != NULL
+	  && h1->root.u.def.section->output_section != NULL)
+	pe_data (abfd)->pe_opthdr.DataDirectory[PE_IMPORT_ADDRESS_TABLE].VirtualAddress =
+	  (h1->root.u.def.value
+	   + h1->root.u.def.section->output_section->vma
+	   + h1->root.u.def.section->output_offset);
+      else
+	{
+	  _bfd_error_handler
+	    (_("%B: unable to fill in DataDictionary[12] because .idata$5 is missing"),
+	     abfd);
+	  result = FALSE;
+	}
+
+      h1 = coff_link_hash_lookup (coff_hash_table (info),
+				  ".idata$6", FALSE, FALSE, TRUE);
+      if (h1 != NULL
+	  && (h1->root.type == bfd_link_hash_defined
+	   || h1->root.type == bfd_link_hash_defweak)
+	  && h1->root.u.def.section != NULL
+	  && h1->root.u.def.section->output_section != NULL)
+	pe_data (abfd)->pe_opthdr.DataDirectory[PE_IMPORT_ADDRESS_TABLE].Size =
+	  ((h1->root.u.def.value
+	    + h1->root.u.def.section->output_section->vma
+	    + h1->root.u.def.section->output_offset)
+	   - pe_data (abfd)->pe_opthdr.DataDirectory[PE_IMPORT_ADDRESS_TABLE].VirtualAddress);
+      else
+	{
+	  _bfd_error_handler
+	    (_("%B: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE (12)] because .idata$6 is missing"),
+	     abfd);
+	  result = FALSE;
+	}
+    }
+  else
+    {
+      h1 = coff_link_hash_lookup (coff_hash_table (info),
+				  "__IAT_start__", FALSE, FALSE, TRUE);
+      if (h1 != NULL
+	  && (h1->root.type == bfd_link_hash_defined
+	   || h1->root.type == bfd_link_hash_defweak)
+	  && h1->root.u.def.section != NULL
+	  && h1->root.u.def.section->output_section != NULL)
+	{
+	  bfd_vma iat_va;
+
+	  iat_va =
+	    (h1->root.u.def.value
+	     + h1->root.u.def.section->output_section->vma
+	     + h1->root.u.def.section->output_offset);
+
+	  h1 = coff_link_hash_lookup (coff_hash_table (info),
+				      "__IAT_end__", FALSE, FALSE, TRUE);
+	  if (h1 != NULL
+	      && (h1->root.type == bfd_link_hash_defined
+	       || h1->root.type == bfd_link_hash_defweak)
+	      && h1->root.u.def.section != NULL
+	      && h1->root.u.def.section->output_section != NULL)
+	    {
+	      pe_data (abfd)->pe_opthdr.DataDirectory[PE_IMPORT_ADDRESS_TABLE].Size =
+		((h1->root.u.def.value
+		  + h1->root.u.def.section->output_section->vma
+		  + h1->root.u.def.section->output_offset)
+		 - iat_va);
+	      if (pe_data (abfd)->pe_opthdr.DataDirectory[PE_IMPORT_ADDRESS_TABLE].Size != 0)
+		pe_data (abfd)->pe_opthdr.DataDirectory[PE_IMPORT_ADDRESS_TABLE].VirtualAddress =
+		  iat_va - pe_data (abfd)->pe_opthdr.ImageBase;
+	    }
+	  else
+	    {
+	      _bfd_error_handler
+		(_("%B: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE(12)]"
+		   " because .idata$6 is missing"), abfd);
+	      result = FALSE;
+	    }
+        }
+    }
+
+  h1 = coff_link_hash_lookup (coff_hash_table (info),
+			      (bfd_get_symbol_leading_char(abfd) != 0
+			       ? "__tls_used" : "_tls_used"),
+			      FALSE, FALSE, TRUE);
+  if (h1 != NULL)
+    {
+      if ((h1->root.type == bfd_link_hash_defined
+	   || h1->root.type == bfd_link_hash_defweak)
+	  && h1->root.u.def.section != NULL
+	  && h1->root.u.def.section->output_section != NULL)
+	pe_data (abfd)->pe_opthdr.DataDirectory[PE_TLS_TABLE].VirtualAddress =
+	  (h1->root.u.def.value
+	   + h1->root.u.def.section->output_section->vma
+	   + h1->root.u.def.section->output_offset
+	   - pe_data (abfd)->pe_opthdr.ImageBase);
+      else
+	{
+	  _bfd_error_handler
+	    (_("%B: unable to fill in DataDictionary[9] because __tls_used is missing"),
+	     abfd);
+	  result = FALSE;
+	}
+     /* According to PECOFF sepcifications by Microsoft version 8.2
+	the TLS data directory consists of 4 pointers, followed
+	by two 4-byte integer. This implies that the total size
+	is different for 32-bit and 64-bit executables.  */ 
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+      pe_data (abfd)->pe_opthdr.DataDirectory[PE_TLS_TABLE].Size = 0x18;
+#else
+      pe_data (abfd)->pe_opthdr.DataDirectory[PE_TLS_TABLE].Size = 0x28;
+#endif
+    }
+
+/* If there is a .pdata section and we have linked pdata finally, we
+     need to sort the entries ascending.  */
+#if !defined(COFF_WITH_pep) && defined(COFF_WITH_pex64)
+  {
+    asection *sec = bfd_get_section_by_name (abfd, ".pdata");
+
+    if (sec)
+      {
+	bfd_size_type x = sec->rawsize;
+	bfd_byte *tmp_data = NULL;
+
+	if (x)
+	  tmp_data = bfd_malloc (x);
+
+	if (tmp_data != NULL)
+	  {
+	    if (bfd_get_section_contents (abfd, sec, tmp_data, 0, x))
+	      {
+		qsort (tmp_data,
+		       (size_t) (x / 12),
+		       12, sort_x64_pdata);
+		bfd_set_section_contents (pfinfo->output_bfd, sec,
+					  tmp_data, 0, x);
+	      }
+	    free (tmp_data);
+	  }
+      }
+  }
+#endif
+
+  /* If we couldn't find idata$2, we either have an excessively
+     trivial program or are in DEEP trouble; we have to assume trivial
+     program....  */
+  return result;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pef-traceback.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pef-traceback.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pef-traceback.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pef-traceback.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,217 @@
+/* PowerPC traceback table support for BFD.
+   Copyright 1993, 1998, 1999, 2000, 2001, 2002, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software 
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* Originally written by Ira Ruben, 06/28/93.  */
+
+/*  This is a compiler independent representation of the AIX Version 3 traceback table (in
+    sys/debug.h), which occurs, usually, one per procedure (routine). The table is marked by
+    a multiple of 4 32-bit word of zeroes in the instruction space. The traceback table is
+    also referred to as "procedure-end table".
+ 
+    The AIX traceback table representation on which this header is based is defined as a
+    series of bit field struct specifications. Bit fields are compiler dependent! Thus,
+    the definitions presented here follow the original header and the existing documentation
+    (such as it is), but define the fields as BIT MASKS and other macros. The mask names,
+    however, where chosen as the original field names to give some compatibility with the 
+    original header and to agree with the documentation.  */
+
+#ifndef __TRACEBACK__
+#define __TRACEBACK__
+
+#define TB_C 0U			/* C */
+#define TB_FORTRAN 1U		/* FORTRAN */
+#define TB_PASCAL 2U		/* Pascal */
+#define TB_ADA 3U		/* ADA */
+#define TB_PL1 4U		/* PL1 */
+#define TB_BASIC 5U		/* Basic */
+#define TB_LISP 6U		/* Lisp */
+#define TB_COBOL 7U		/* eCobol */
+#define TB_MODULA2 8U		/* Modula2 */
+#define TB_CPLUSPLUS 9U		/* C++ */
+#define TB_RPG 10U		/* RPG */
+#define TB_PL8 11U		/* PL8 */
+#define TB_ASM 12U		/* Asm */
+ 
+/* Flags 1.  */
+
+#define TB_GLOBALLINK 0x80U	/* Routine is Global Linkage.  */
+#define TB_is_eprol 0x40U	/* Out-of-line prolog or epilog routine.  */
+#define TB_HAS_TBOFF 0x20U	/* tb_offset set (extension field).  */
+#define TB_INT_PROC 0x10U	/* Internal leaf routine.  */
+#define TB_HAS_CTL 0x08U	/* Has controlled automatic storage.  */
+#define TB_TOCLESS 0X04U	/* Routine has no TOC.  */
+#define TB_FP_PRESENT 0x02U	/* Routine has floating point ops.  */ 
+#define TB_LOG_ABORT 0x01U	/* fp_present && log/abort compiler opt.  */
+ 
+/* Flags 2.  */
+
+#define TB_INT_HNDL 0x80U	/* Routine is an interrupt handler.  */
+#define TB_NAME_PRESENT 0x40U	/* Name_len/name set (extension field).  */
+#define TB_USES_ALLOCA 0x20U	/* Uses alloca() to allocate storage.  */
+#define TB_CL_DIS_inv 0x1CU	/* On-condition directives (see below).  */
+#define TB_SAVES_CR 0x02U	/* Routine saves the CR.  */
+#define TB_SAVES_LR 0x01U	/* Routine saves the LR.  */
+  
+/* cl_dis_inv "on condition" settings:  */
+ 
+#define TB_CL_DIS_INV(x) (((x) & cl_dis_inv) >> 2U)
+
+#define TB_WALK_ONCOND 0U	/* Walk stack without restoring state.  */
+#define TB_DISCARD_ONCOND 1U	/* Walk stack and discard.  */
+#define TB_INVOKE_ONCOND 2U	/* Invoke a specific system routine.  */
+ 
+/* Flags 3.  */
+
+#define TB_STORES_BC 0x80U	/* Routine saves frame ptr of caller.  */
+#define TB_SPARE2 0X40U		/* Spare bit.  */
+#define TB_FPR_SAVED 0x3fU	/* Number of FPRs saved (max of 32).  */
+				/* (Last reg saved is ALWAYS fpr31).  */
+
+#define TB_NUM_FPR_SAVED(x) ((x) & fpr_saved)
+ 
+/* Flags 4.  */
+
+#define TB_HAS_VEC_INFO 0x80U	/* Routine uses vectors.  */
+#define TB_SPARE3 0X40U		/* Spare bit.  */
+#define TB_GPR_SAVED 0x3fU	/* Number of GPRs saved (max of 32).  */
+				/* (Last reg saved is ALWAYS gpr31).  */
+
+#define TB_NUM_GPR_SAVED(x) ((x) & gpr_saved)
+ 
+/* Flags 5.  */
+
+#define TB_FLOATPARAMS 0xfeU	/* Number of floating point parameters.  */
+#define TB_PARAMSONSTK 0X01U	/* All parameters are on the stack.  */
+ 
+#define TB_NUM_FLOATPARAMS(X) (((x) & floatparams) >> 1U)
+
+/* Traceback_table (fixed portion).  */
+
+struct traceback_table
+{
+  /* Traceback table layout (fixed portion):  */
+
+  unsigned char version;	/* Traceback format version.  */
+  unsigned char lang;		/* Language indicators:  */
+  unsigned char flags1;		/* Flag bits #1:  */
+  unsigned char flags2;		/* Flag bits #2:  */
+  unsigned char flags3;		/* Flag bits #3:  */
+  unsigned char flags4;		/* Flag bits #4:  */
+  unsigned char fixedparams;	/* Number of fixed point parameters.  */
+  unsigned char flags5;		/* Flag bits #5:  */
+};
+
+/* traceback_table (optional) extensions.  */
+
+/* Optional portions exist independently in the order presented below,
+   not as a structure or a union. Whether or not portions exist is
+   determinable from bit-fields within the fixed portion above.  */
+
+/* The following is present only if fixedparams or floatparams are non
+   zero and it immediately follows the fixed portion of the traceback
+   table...  */
+
+/* Order and type encoding of parameters:  */
+struct traceback_table_fixedparams
+{
+  unsigned long paraminfo;		
+};
+
+/* Left-justified bit-encoding as follows:  */
+#define FIXED_PARAM 0		/* '0'  ==> fixed param (1 gpr or word).  */
+#define SPFP_PARAM 2		/* '10' ==> single-precision float param.  */
+#define DPFP_PARAM 3		/* '11' ==> double-precision float param.  */
+
+#define PARAM_ENCODING(x, bit) /* Yields xxx_PARAM as a function of "bit".  */		\
+ ((((x)&(1UL<<(31UL-(bit++))))==0UL) /* Values 0:31 (left-to-right). "bit" is */	\
+ ? FIXED_PARAM /* an L-value that's left incremented to */				\
+ : ((((x)&(1UL<<(31UL-(bit++))))==0)/* the next bit position for the next */		\
+ ? SPFP_PARAM /* parameter.  This will be 1 or 2 bit */					\
+ : DPFP_PARAM)) /* positions later.  */
+
+/* The following is present only if has_tboff (in flags1) in fixed part is present...  */
+
+/* Offset from start of code to TracebackTbl.  */
+struct traceback_table_tboff
+{
+  unsigned long tb_offset;
+};
+
+/* The following is present only if int_hndl (in flags2) in fixed part is present ...  */
+
+/* What interrupts are handled by the routine.  */
+struct traceback_table_interrupts
+{
+  long hand_mask;
+};
+
+/* The following are present only if has_ctl (in flags1) in fixed part is present...  */
+
+/* Controlled automatic storage info:  */
+struct traceback_table_anchors
+{
+  unsigned long ctl_info;	/* Number of controlled automatic anchors.  */ 
+  long ctl_info_disp[1];	/* Array of stack displacements where each.  */
+};				/* Anchor is located (array STARTS here).  */
+
+/* The following are present only if name_present (in flags2) in fixed
+   part is present...  */
+
+/* Routine name:  */
+struct traceback_table_routine
+{
+  unsigned short name_len;	/* Length of name that follows.  */
+  char name[1];			/* Name starts here (NOT null terminated).  */
+};
+
+/* The following are present only if uses_alloca (in flags2) in fixed
+   part is present...  */
+
+/* Register auto storage when alloca() is used.  */
+struct traceback_table_alloca
+{
+  char alloca_reg;
+};
+
+/* The following are present only if has_vec_info (in flags4) in fixed
+   part is present...  */
+
+/* Vector info:  */
+struct traceback_table_vector
+{
+  unsigned char vec_flags1;	/* Vec info bits #1:  */
+
+#define TB_VR_SAVED 0xFCU	/* Number of saved vector registers.  */
+#define TB_SAVES_VRSAVE 0x02U	/* Saves VRsave.  */
+#define TB_HAS_VARARGS 0x01U	/* Routine has a variable argument list.  */
+
+#define TB_NUM_VR_SAVED(x) (((x) & TB_VR_SAVED) >> 2U)
+ 
+  unsigned char vec_flags2;	/* Vec info bits #2:  */
+
+#define TB_VECTORPARAMS 0xfeU	/* Number of vector parameters.  */
+#define TB_VEC_PRESENT 0x01U	/* Routine uses at least one vec instr.  */
+ 
+#define VECPARAMS(x) (((x) & TB_VECTORPARAMS) >> 1U)
+};
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pef.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pef.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pef.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pef.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1211 @@
+/* PEF support for BFD.
+   Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+   2009, 2011  Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "safe-ctype.h"
+#include "pef.h"
+#include "pef-traceback.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libiberty.h"
+
+#ifndef BFD_IO_FUNCS
+#define BFD_IO_FUNCS 0
+#endif
+
+#define bfd_pef_close_and_cleanup                   _bfd_generic_close_and_cleanup
+#define bfd_pef_bfd_free_cached_info                _bfd_generic_bfd_free_cached_info
+#define bfd_pef_new_section_hook                    _bfd_generic_new_section_hook
+#define bfd_pef_bfd_is_local_label_name             bfd_generic_is_local_label_name
+#define bfd_pef_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define bfd_pef_get_lineno                          _bfd_nosymbols_get_lineno
+#define bfd_pef_find_nearest_line                   _bfd_nosymbols_find_nearest_line
+#define bfd_pef_find_inliner_info                   _bfd_nosymbols_find_inliner_info
+#define bfd_pef_bfd_make_debug_symbol               _bfd_nosymbols_bfd_make_debug_symbol
+#define bfd_pef_read_minisymbols                    _bfd_generic_read_minisymbols
+#define bfd_pef_minisymbol_to_symbol                _bfd_generic_minisymbol_to_symbol
+#define bfd_pef_set_arch_mach                       _bfd_generic_set_arch_mach
+#define bfd_pef_get_section_contents                _bfd_generic_get_section_contents
+#define bfd_pef_set_section_contents                _bfd_generic_set_section_contents
+#define bfd_pef_bfd_get_relocated_section_contents  bfd_generic_get_relocated_section_contents
+#define bfd_pef_bfd_relax_section                   bfd_generic_relax_section
+#define bfd_pef_bfd_gc_sections                     bfd_generic_gc_sections
+#define bfd_pef_bfd_lookup_section_flags            bfd_generic_lookup_section_flags
+#define bfd_pef_bfd_merge_sections                  bfd_generic_merge_sections
+#define bfd_pef_bfd_is_group_section		    bfd_generic_is_group_section
+#define bfd_pef_bfd_discard_group                   bfd_generic_discard_group
+#define bfd_pef_section_already_linked	            _bfd_generic_section_already_linked
+#define bfd_pef_bfd_define_common_symbol            bfd_generic_define_common_symbol
+#define bfd_pef_bfd_link_hash_table_create          _bfd_generic_link_hash_table_create
+#define bfd_pef_bfd_link_hash_table_free            _bfd_generic_link_hash_table_free
+#define bfd_pef_bfd_link_add_symbols                _bfd_generic_link_add_symbols
+#define bfd_pef_bfd_link_just_syms                  _bfd_generic_link_just_syms
+#define bfd_pef_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define bfd_pef_bfd_final_link                      _bfd_generic_final_link
+#define bfd_pef_bfd_link_split_section              _bfd_generic_link_split_section
+#define bfd_pef_get_section_contents_in_window      _bfd_generic_get_section_contents_in_window
+
+static int
+bfd_pef_parse_traceback_table (bfd *abfd,
+			       asection *section,
+			       unsigned char *buf,
+			       size_t len,
+			       size_t pos,
+			       asymbol *sym,
+			       FILE *file)
+{
+  struct traceback_table table;
+  size_t offset;
+  const char *s;
+  asymbol tmpsymbol;
+
+  if (sym == NULL)
+    sym = & tmpsymbol;
+
+  sym->name = NULL;
+  sym->value = 0;
+  sym->the_bfd = abfd;
+  sym->section = section;
+  sym->flags = 0;
+  sym->udata.i = 0;
+
+  /* memcpy is fine since all fields are unsigned char.  */
+  if ((pos + 8) > len)
+    return -1;
+  memcpy (&table, buf + pos, 8);
+
+  /* Calling code relies on returned symbols having a name and
+     correct offset.  */
+  if ((table.lang != TB_C) && (table.lang != TB_CPLUSPLUS))
+    return -1;
+
+  if (! (table.flags2 & TB_NAME_PRESENT))
+    return -1;
+
+  if (! (table.flags1 & TB_HAS_TBOFF))
+    return -1;
+
+  offset = 8;
+
+  if ((table.flags5 & TB_FLOATPARAMS) || (table.fixedparams))
+    offset += 4;
+
+  if (table.flags1 & TB_HAS_TBOFF)
+    {
+      struct traceback_table_tboff off;
+
+      if ((pos + offset + 4) > len)
+	return -1;
+      off.tb_offset = bfd_getb32 (buf + pos + offset);
+      offset += 4;
+
+      /* Need to subtract 4 because the offset includes the 0x0L
+	 preceding the table.  */
+      if (file != NULL)
+	fprintf (file, " [offset = 0x%lx]", off.tb_offset);
+
+      if ((file == NULL) && ((off.tb_offset + 4) > (pos + offset)))
+	return -1;
+
+      sym->value = pos - off.tb_offset - 4;
+    }
+
+  if (table.flags2 & TB_INT_HNDL)
+    offset += 4;
+
+  if (table.flags1 & TB_HAS_CTL)
+    {
+      struct traceback_table_anchors anchors;
+
+      if ((pos + offset + 4) > len)
+	return -1;
+      anchors.ctl_info = bfd_getb32 (buf + pos + offset);
+      offset += 4;
+
+      if (anchors.ctl_info > 1024)
+	return -1;
+
+      offset += anchors.ctl_info * 4;
+    }
+
+  if (table.flags2 & TB_NAME_PRESENT)
+    {
+      struct traceback_table_routine name;
+      char *namebuf;
+
+      if ((pos + offset + 2) > len)
+	return -1;
+      name.name_len = bfd_getb16 (buf + pos + offset);
+      offset += 2;
+
+      if (name.name_len > 4096)
+	return -1;
+
+      if ((pos + offset + name.name_len) > len)
+	return -1;
+
+      namebuf = bfd_alloc (abfd, name.name_len + 1);
+      if (namebuf == NULL)
+	return -1;
+
+      memcpy (namebuf, buf + pos + offset, name.name_len);
+      namebuf[name.name_len] = '\0';
+
+      /* Strip leading period inserted by compiler.  */
+      if (namebuf[0] == '.')
+	memmove (namebuf, namebuf + 1, name.name_len + 1);
+
+      sym->name = namebuf;
+
+      for (s = sym->name; (*s != '\0'); s++)
+	if (! ISPRINT (*s))
+	  return -1;
+
+      offset += name.name_len;
+    }
+
+  if (table.flags2 & TB_USES_ALLOCA)
+    offset += 4;
+
+  if (table.flags4 & TB_HAS_VEC_INFO)
+    offset += 4;
+
+  if (file != NULL)
+    fprintf (file, " [length = 0x%lx]", (unsigned long) offset);
+
+  return offset;
+}
+
+static void
+bfd_pef_print_symbol (bfd *abfd,
+		      void * afile,
+		      asymbol *symbol,
+		      bfd_print_symbol_type how)
+{
+  FILE *file = (FILE *) afile;
+
+  switch (how)
+    {
+    case bfd_print_symbol_name:
+      fprintf (file, "%s", symbol->name);
+      break;
+    default:
+      bfd_print_symbol_vandf (abfd, (void *) file, symbol);
+      fprintf (file, " %-5s %s", symbol->section->name, symbol->name);
+      if (CONST_STRNEQ (symbol->name, "__traceback_"))
+	{
+	  unsigned char *buf = alloca (symbol->udata.i);
+	  size_t offset = symbol->value + 4;
+	  size_t len = symbol->udata.i;
+	  int ret;
+
+	  bfd_get_section_contents (abfd, symbol->section, buf, offset, len);
+	  ret = bfd_pef_parse_traceback_table (abfd, symbol->section, buf,
+					       len, 0, NULL, file);
+	  if (ret < 0)
+	    fprintf (file, " [ERROR]");
+	}
+    }
+}
+
+static void
+bfd_pef_convert_architecture (unsigned long architecture,
+			      enum bfd_architecture *type,
+			      unsigned long *subtype)
+{
+  const unsigned long ARCH_POWERPC = 0x70777063; /* 'pwpc'.  */
+  const unsigned long ARCH_M68K = 0x6d36386b; /* 'm68k'.  */
+
+  *subtype = bfd_arch_unknown;
+  *type = bfd_arch_unknown;
+
+  if (architecture == ARCH_POWERPC)
+    *type = bfd_arch_powerpc;
+  else if (architecture == ARCH_M68K)
+    *type = bfd_arch_m68k;
+}
+
+static bfd_boolean
+bfd_pef_mkobject (bfd *abfd ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+static const char *bfd_pef_section_name (bfd_pef_section *section)
+{
+  switch (section->section_kind)
+    {
+    case BFD_PEF_SECTION_CODE: return "code";
+    case BFD_PEF_SECTION_UNPACKED_DATA: return "unpacked-data";
+    case BFD_PEF_SECTION_PACKED_DATA: return "packed-data";
+    case BFD_PEF_SECTION_CONSTANT: return "constant";
+    case BFD_PEF_SECTION_LOADER: return "loader";
+    case BFD_PEF_SECTION_DEBUG: return "debug";
+    case BFD_PEF_SECTION_EXEC_DATA: return "exec-data";
+    case BFD_PEF_SECTION_EXCEPTION: return "exception";
+    case BFD_PEF_SECTION_TRACEBACK: return "traceback";
+    default: return "unknown";
+    }
+}
+
+static unsigned long bfd_pef_section_flags (bfd_pef_section *section)
+{
+  switch (section->section_kind)
+    {
+    case BFD_PEF_SECTION_CODE:
+      return SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC | SEC_CODE;
+    case BFD_PEF_SECTION_UNPACKED_DATA:
+    case BFD_PEF_SECTION_PACKED_DATA:
+    case BFD_PEF_SECTION_CONSTANT:
+    case BFD_PEF_SECTION_LOADER:
+    case BFD_PEF_SECTION_DEBUG:
+    case BFD_PEF_SECTION_EXEC_DATA:
+    case BFD_PEF_SECTION_EXCEPTION:
+    case BFD_PEF_SECTION_TRACEBACK:
+    default:
+      return SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC;
+    }
+}
+
+static asection *
+bfd_pef_make_bfd_section (bfd *abfd, bfd_pef_section *section)
+{
+  asection *bfdsec;
+  const char *name = bfd_pef_section_name (section);
+
+  bfdsec = bfd_make_section_anyway (abfd, name);
+  if (bfdsec == NULL)
+    return NULL;
+
+  bfdsec->vma = section->default_address + section->container_offset;
+  bfdsec->lma = section->default_address + section->container_offset;
+  bfdsec->size = section->container_length;
+  bfdsec->filepos = section->container_offset;
+  bfdsec->alignment_power = section->alignment;
+
+  bfdsec->flags = bfd_pef_section_flags (section);
+
+  return bfdsec;
+}
+
+int
+bfd_pef_parse_loader_header (bfd *abfd ATTRIBUTE_UNUSED,
+			     unsigned char *buf,
+			     size_t len,
+			     bfd_pef_loader_header *header)
+{
+  BFD_ASSERT (len == 56);
+
+  header->main_section = bfd_getb32 (buf);
+  header->main_offset = bfd_getb32 (buf + 4);
+  header->init_section = bfd_getb32 (buf + 8);
+  header->init_offset = bfd_getb32 (buf + 12);
+  header->term_section = bfd_getb32 (buf + 16);
+  header->term_offset = bfd_getb32 (buf + 20);
+  header->imported_library_count = bfd_getb32 (buf + 24);
+  header->total_imported_symbol_count = bfd_getb32 (buf + 28);
+  header->reloc_section_count = bfd_getb32 (buf + 32);
+  header->reloc_instr_offset = bfd_getb32 (buf + 36);
+  header->loader_strings_offset = bfd_getb32 (buf + 40);
+  header->export_hash_offset = bfd_getb32 (buf + 44);
+  header->export_hash_table_power = bfd_getb32 (buf + 48);
+  header->exported_symbol_count = bfd_getb32 (buf + 52);
+
+  return 0;
+}
+
+int
+bfd_pef_parse_imported_library (bfd *abfd ATTRIBUTE_UNUSED,
+				unsigned char *buf,
+				size_t len,
+				bfd_pef_imported_library *header)
+{
+  BFD_ASSERT (len == 24);
+
+  header->name_offset = bfd_getb32 (buf);
+  header->old_implementation_version = bfd_getb32 (buf + 4);
+  header->current_version = bfd_getb32 (buf + 8);
+  header->imported_symbol_count = bfd_getb32 (buf + 12);
+  header->first_imported_symbol = bfd_getb32 (buf + 16);
+  header->options = buf[20];
+  header->reserved_a = buf[21];
+  header->reserved_b = bfd_getb16 (buf + 22);
+
+  return 0;
+}
+
+int
+bfd_pef_parse_imported_symbol (bfd *abfd ATTRIBUTE_UNUSED,
+			       unsigned char *buf,
+			       size_t len,
+			       bfd_pef_imported_symbol *symbol)
+{
+  unsigned long value;
+
+  BFD_ASSERT (len == 4);
+
+  value = bfd_getb32 (buf);
+  symbol->symbol_class = value >> 24;
+  symbol->name = value & 0x00ffffff;
+
+  return 0;
+}
+
+int
+bfd_pef_scan_section (bfd *abfd, bfd_pef_section *section)
+{
+  unsigned char buf[28];
+
+  bfd_seek (abfd, section->header_offset, SEEK_SET);
+  if (bfd_bread ((void *) buf, 28, abfd) != 28)
+    return -1;
+
+  section->name_offset = bfd_h_get_32 (abfd, buf);
+  section->default_address = bfd_h_get_32 (abfd, buf + 4);
+  section->total_length = bfd_h_get_32 (abfd, buf + 8);
+  section->unpacked_length = bfd_h_get_32 (abfd, buf + 12);
+  section->container_length = bfd_h_get_32 (abfd, buf + 16);
+  section->container_offset = bfd_h_get_32 (abfd, buf + 20);
+  section->section_kind = buf[24];
+  section->share_kind = buf[25];
+  section->alignment = buf[26];
+  section->reserved = buf[27];
+
+  section->bfd_section = bfd_pef_make_bfd_section (abfd, section);
+  if (section->bfd_section == NULL)
+    return -1;
+
+  return 0;
+}
+
+void
+bfd_pef_print_loader_header (bfd *abfd ATTRIBUTE_UNUSED,
+			     bfd_pef_loader_header *header,
+			     FILE *file)
+{
+  fprintf (file, "main_section: %ld\n", header->main_section);
+  fprintf (file, "main_offset: %lu\n", header->main_offset);
+  fprintf (file, "init_section: %ld\n", header->init_section);
+  fprintf (file, "init_offset: %lu\n", header->init_offset);
+  fprintf (file, "term_section: %ld\n", header->term_section);
+  fprintf (file, "term_offset: %lu\n", header->term_offset);
+  fprintf (file, "imported_library_count: %lu\n",
+	   header->imported_library_count);
+  fprintf (file, "total_imported_symbol_count: %lu\n",
+	   header->total_imported_symbol_count);
+  fprintf (file, "reloc_section_count: %lu\n", header->reloc_section_count);
+  fprintf (file, "reloc_instr_offset: %lu\n", header->reloc_instr_offset);
+  fprintf (file, "loader_strings_offset: %lu\n",
+	   header->loader_strings_offset);
+  fprintf (file, "export_hash_offset: %lu\n", header->export_hash_offset);
+  fprintf (file, "export_hash_table_power: %lu\n",
+	   header->export_hash_table_power);
+  fprintf (file, "exported_symbol_count: %lu\n",
+	   header->exported_symbol_count);
+}
+
+int
+bfd_pef_print_loader_section (bfd *abfd, FILE *file)
+{
+  bfd_pef_loader_header header;
+  asection *loadersec = NULL;
+  unsigned char *loaderbuf = NULL;
+  size_t loaderlen = 0;
+
+  loadersec = bfd_get_section_by_name (abfd, "loader");
+  if (loadersec == NULL)
+    return -1;
+
+  loaderlen = loadersec->size;
+  loaderbuf = bfd_malloc (loaderlen);
+
+  if (bfd_seek (abfd, loadersec->filepos, SEEK_SET) < 0
+      || bfd_bread ((void *) loaderbuf, loaderlen, abfd) != loaderlen
+      || loaderlen < 56
+      || bfd_pef_parse_loader_header (abfd, loaderbuf, 56, &header) < 0)
+    {
+      free (loaderbuf);
+      return -1;
+    }
+
+  bfd_pef_print_loader_header (abfd, &header, file);
+  return 0;
+}
+
+int
+bfd_pef_scan_start_address (bfd *abfd)
+{
+  bfd_pef_loader_header header;
+  asection *section;
+
+  asection *loadersec = NULL;
+  unsigned char *loaderbuf = NULL;
+  size_t loaderlen = 0;
+  int ret;
+
+  loadersec = bfd_get_section_by_name (abfd, "loader");
+  if (loadersec == NULL)
+    goto end;
+
+  loaderlen = loadersec->size;
+  loaderbuf = bfd_malloc (loaderlen);
+  if (bfd_seek (abfd, loadersec->filepos, SEEK_SET) < 0)
+    goto error;
+  if (bfd_bread ((void *) loaderbuf, loaderlen, abfd) != loaderlen)
+    goto error;
+
+  if (loaderlen < 56)
+    goto error;
+  ret = bfd_pef_parse_loader_header (abfd, loaderbuf, 56, &header);
+  if (ret < 0)
+    goto error;
+
+  if (header.main_section < 0)
+    goto end;
+
+  for (section = abfd->sections; section != NULL; section = section->next)
+    if ((section->index + 1) == header.main_section)
+      break;
+
+  if (section == NULL)
+    goto error;
+
+  abfd->start_address = section->vma + header.main_offset;
+
+ end:
+  if (loaderbuf != NULL)
+    free (loaderbuf);
+  return 0;
+
+ error:
+  if (loaderbuf != NULL)
+    free (loaderbuf);
+  return -1;
+}
+
+int
+bfd_pef_scan (abfd, header, mdata)
+     bfd *abfd;
+     bfd_pef_header *header;
+     bfd_pef_data_struct *mdata;
+{
+  unsigned int i;
+  enum bfd_architecture cputype;
+  unsigned long cpusubtype;
+
+  mdata->header = *header;
+
+  bfd_pef_convert_architecture (header->architecture, &cputype, &cpusubtype);
+  if (cputype == bfd_arch_unknown)
+    {
+      (*_bfd_error_handler) (_("bfd_pef_scan: unknown architecture 0x%lx"),
+			       header->architecture);
+      return -1;
+    }
+  bfd_set_arch_mach (abfd, cputype, cpusubtype);
+
+  mdata->header = *header;
+
+  abfd->flags = (abfd->xvec->object_flags
+		 | (abfd->flags & (BFD_IN_MEMORY | BFD_IO_FUNCS)));
+
+  if (header->section_count != 0)
+    {
+      mdata->sections = bfd_alloc (abfd, header->section_count * sizeof (bfd_pef_section));
+
+      if (mdata->sections == NULL)
+	return -1;
+
+      for (i = 0; i < header->section_count; i++)
+	{
+	  bfd_pef_section *cur = &mdata->sections[i];
+	  cur->header_offset = 40 + (i * 28);
+	  if (bfd_pef_scan_section (abfd, cur) < 0)
+	    return -1;
+	}
+    }
+
+  if (bfd_pef_scan_start_address (abfd) < 0)
+    return -1;
+
+  abfd->tdata.pef_data = mdata;
+
+  return 0;
+}
+
+static int
+bfd_pef_read_header (bfd *abfd, bfd_pef_header *header)
+{
+  unsigned char buf[40];
+
+  bfd_seek (abfd, 0, SEEK_SET);
+
+  if (bfd_bread ((void *) buf, 40, abfd) != 40)
+    return -1;
+
+  header->tag1 = bfd_getb32 (buf);
+  header->tag2 = bfd_getb32 (buf + 4);
+  header->architecture = bfd_getb32 (buf + 8);
+  header->format_version = bfd_getb32 (buf + 12);
+  header->timestamp = bfd_getb32 (buf + 16);
+  header->old_definition_version = bfd_getb32 (buf + 20);
+  header->old_implementation_version = bfd_getb32 (buf + 24);
+  header->current_version = bfd_getb32 (buf + 28);
+  header->section_count = bfd_getb32 (buf + 32) + 1;
+  header->instantiated_section_count = bfd_getb32 (buf + 34);
+  header->reserved = bfd_getb32 (buf + 36);
+
+  return 0;
+}
+
+static const bfd_target *
+bfd_pef_object_p (bfd *abfd)
+{
+  struct bfd_preserve preserve;
+  bfd_pef_header header;
+
+  preserve.marker = NULL;
+  if (bfd_pef_read_header (abfd, &header) != 0)
+    goto wrong;
+
+  if (header.tag1 != BFD_PEF_TAG1 || header.tag2 != BFD_PEF_TAG2)
+    goto wrong;
+
+  preserve.marker = bfd_zalloc (abfd, sizeof (bfd_pef_data_struct));
+  if (preserve.marker == NULL
+      || !bfd_preserve_save (abfd, &preserve))
+    goto fail;
+
+  if (bfd_pef_scan (abfd, &header,
+		    (bfd_pef_data_struct *) preserve.marker) != 0)
+    goto wrong;
+
+  bfd_preserve_finish (abfd, &preserve);
+  return abfd->xvec;
+
+ wrong:
+  bfd_set_error (bfd_error_wrong_format);
+
+ fail:
+  if (preserve.marker != NULL)
+    bfd_preserve_restore (abfd, &preserve);
+  return NULL;
+}
+
+static int
+bfd_pef_parse_traceback_tables (bfd *abfd,
+				asection *sec,
+				unsigned char *buf,
+				size_t len,
+				long *nsym,
+				asymbol **csym)
+{
+  char *name;
+
+  asymbol function;
+  asymbol traceback;
+
+  const char *const tbprefix = "__traceback_";
+  size_t tbnamelen;
+
+  size_t pos = 0;
+  unsigned long count = 0;
+  int ret;
+
+  for (;;)
+    {
+      /* We're reading symbols two at a time.  */
+      if (csym && ((csym[count] == NULL) || (csym[count + 1] == NULL)))
+	break;
+
+      pos += 3;
+      pos -= (pos % 4);
+
+      while ((pos + 4) <= len)
+	{
+	  if (bfd_getb32 (buf + pos) == 0)
+	    break;
+	  pos += 4;
+	}
+
+      if ((pos + 4) > len)
+	break;
+
+      ret = bfd_pef_parse_traceback_table (abfd, sec, buf, len, pos + 4,
+					   &function, 0);
+      if (ret < 0)
+	{
+	  /* Skip over 0x0L to advance to next possible traceback table.  */
+	  pos += 4;
+	  continue;
+	}
+
+      BFD_ASSERT (function.name != NULL);
+
+      /* Don't bother to compute the name if we are just
+	 counting symbols.  */
+      if (csym)
+	{
+	  tbnamelen = strlen (tbprefix) + strlen (function.name);
+	  name = bfd_alloc (abfd, tbnamelen + 1);
+	  if (name == NULL)
+	    {
+	      bfd_release (abfd, (void *) function.name);
+	      function.name = NULL;
+	      break;
+	    }
+	  snprintf (name, tbnamelen + 1, "%s%s", tbprefix, function.name);
+	  traceback.name = name;
+	  traceback.value = pos;
+	  traceback.the_bfd = abfd;
+	  traceback.section = sec;
+	  traceback.flags = 0;
+	  traceback.udata.i = ret;
+
+	  *(csym[count]) = function;
+	  *(csym[count + 1]) = traceback;
+	}
+
+      pos += ret;
+      count += 2;
+    }
+
+  *nsym = count;
+  return 0;
+}
+
+static int
+bfd_pef_parse_function_stub (bfd *abfd ATTRIBUTE_UNUSED,
+			     unsigned char *buf,
+			     size_t len,
+			     unsigned long *offset)
+{
+  BFD_ASSERT (len == 24);
+
+  if ((bfd_getb32 (buf) & 0xffff0000) != 0x81820000)
+    return -1;
+  if (bfd_getb32 (buf + 4) != 0x90410014)
+    return -1;
+  if (bfd_getb32 (buf + 8) != 0x800c0000)
+    return -1;
+  if (bfd_getb32 (buf + 12) != 0x804c0004)
+    return -1;
+  if (bfd_getb32 (buf + 16) != 0x7c0903a6)
+    return -1;
+  if (bfd_getb32 (buf + 20) != 0x4e800420)
+    return -1;
+
+  if (offset != NULL)
+    *offset = (bfd_getb32 (buf) & 0x0000ffff) / 4;
+
+  return 0;
+}
+
+static int
+bfd_pef_parse_function_stubs (bfd *abfd,
+			      asection *codesec,
+			      unsigned char *codebuf,
+			      size_t codelen,
+			      unsigned char *loaderbuf,
+			      size_t loaderlen,
+			      unsigned long *nsym,
+			      asymbol **csym)
+{
+  const char *const sprefix = "__stub_";
+  size_t codepos = 0;
+  unsigned long count = 0;
+  bfd_pef_loader_header header;
+  bfd_pef_imported_library *libraries = NULL;
+  bfd_pef_imported_symbol *imports = NULL;
+  unsigned long i;
+  int ret;
+
+  if (loaderlen < 56)
+    goto error;
+
+  ret = bfd_pef_parse_loader_header (abfd, loaderbuf, 56, &header);
+  if (ret < 0)
+    goto error;
+
+  libraries = bfd_malloc
+    (header.imported_library_count * sizeof (bfd_pef_imported_library));
+  imports = bfd_malloc
+    (header.total_imported_symbol_count * sizeof (bfd_pef_imported_symbol));
+
+  if (loaderlen < (56 + (header.imported_library_count * 24)))
+    goto error;
+  for (i = 0; i < header.imported_library_count; i++)
+    {
+      ret = bfd_pef_parse_imported_library
+	(abfd, loaderbuf + 56 + (i * 24), 24, &libraries[i]);
+      if (ret < 0)
+	goto error;
+    }
+
+  if (loaderlen < (56 + (header.imported_library_count * 24)
+		   + (header.total_imported_symbol_count * 4)))
+    goto error;
+  for (i = 0; i < header.total_imported_symbol_count; i++)
+    {
+      ret = (bfd_pef_parse_imported_symbol
+	     (abfd,
+	      loaderbuf + 56 + (header.imported_library_count * 24) + (i * 4),
+	      4, &imports[i]));
+      if (ret < 0)
+	goto error;
+    }
+
+  codepos = 0;
+
+  for (;;)
+    {
+      asymbol sym;
+      const char *symname;
+      char *name;
+      unsigned long sym_index;
+
+      if (csym && (csym[count] == NULL))
+	break;
+
+      codepos += 3;
+      codepos -= (codepos % 4);
+
+      while ((codepos + 4) <= codelen)
+	{
+	  if ((bfd_getb32 (codebuf + codepos) & 0xffff0000) == 0x81820000)
+	    break;
+	  codepos += 4;
+	}
+
+      if ((codepos + 4) > codelen)
+	break;
+
+      ret = bfd_pef_parse_function_stub (abfd, codebuf + codepos, 24, &sym_index);
+      if (ret < 0)
+	{
+	  codepos += 24;
+	  continue;
+	}
+
+      if (sym_index >= header.total_imported_symbol_count)
+	{
+	  codepos += 24;
+	  continue;
+	}
+
+      {
+	size_t max, namelen;
+	const char *s;
+
+	if (loaderlen < (header.loader_strings_offset + imports[sym_index].name))
+	  goto error;
+
+	max = loaderlen - (header.loader_strings_offset + imports[sym_index].name);
+	symname = (char *) loaderbuf;
+	symname += header.loader_strings_offset + imports[sym_index].name;
+	namelen = 0;
+	for (s = symname; s < (symname + max); s++)
+	  {
+	    if (*s == '\0')
+	      break;
+	    if (! ISPRINT (*s))
+	      goto error;
+	    namelen++;
+	  }
+	if (*s != '\0')
+	  goto error;
+
+	name = bfd_alloc (abfd, strlen (sprefix) + namelen + 1);
+	if (name == NULL)
+	  break;
+
+	snprintf (name, strlen (sprefix) + namelen + 1, "%s%s",
+		  sprefix, symname);
+	sym.name = name;
+      }
+
+      sym.value = codepos;
+      sym.the_bfd = abfd;
+      sym.section = codesec;
+      sym.flags = 0;
+      sym.udata.i = 0;
+
+      codepos += 24;
+
+      if (csym != NULL)
+	*(csym[count]) = sym;
+
+      count++;
+    }
+
+  goto end;
+
+ end:
+  if (libraries != NULL)
+    free (libraries);
+  if (imports != NULL)
+    free (imports);
+  *nsym = count;
+  return 0;
+
+ error:
+  if (libraries != NULL)
+    free (libraries);
+  if (imports != NULL)
+    free (imports);
+  *nsym = count;
+  return -1;
+}
+
+static long
+bfd_pef_parse_symbols (bfd *abfd, asymbol **csym)
+{
+  unsigned long count = 0;
+
+  asection *codesec = NULL;
+  unsigned char *codebuf = NULL;
+  size_t codelen = 0;
+
+  asection *loadersec = NULL;
+  unsigned char *loaderbuf = NULL;
+  size_t loaderlen = 0;
+
+  codesec = bfd_get_section_by_name (abfd, "code");
+  if (codesec != NULL)
+    {
+      codelen = codesec->size;
+      codebuf = bfd_malloc (codelen);
+      if (bfd_seek (abfd, codesec->filepos, SEEK_SET) < 0)
+	goto end;
+      if (bfd_bread ((void *) codebuf, codelen, abfd) != codelen)
+	goto end;
+    }
+
+  loadersec = bfd_get_section_by_name (abfd, "loader");
+  if (loadersec != NULL)
+    {
+      loaderlen = loadersec->size;
+      loaderbuf = bfd_malloc (loaderlen);
+      if (bfd_seek (abfd, loadersec->filepos, SEEK_SET) < 0)
+	goto end;
+      if (bfd_bread ((void *) loaderbuf, loaderlen, abfd) != loaderlen)
+	goto end;
+    }
+
+  count = 0;
+  if (codesec != NULL)
+    {
+      long ncount = 0;
+      bfd_pef_parse_traceback_tables (abfd, codesec, codebuf, codelen,
+				      &ncount, csym);
+      count += ncount;
+    }
+
+  if ((codesec != NULL) && (loadersec != NULL))
+    {
+      unsigned long ncount = 0;
+      bfd_pef_parse_function_stubs
+	(abfd, codesec, codebuf, codelen, loaderbuf, loaderlen, &ncount,
+	 (csym != NULL) ? (csym + count) : NULL);
+      count += ncount;
+    }
+
+  if (csym != NULL)
+    csym[count] = NULL;
+
+ end:
+  if (codebuf != NULL)
+    free (codebuf);
+
+  if (loaderbuf != NULL)
+    free (loaderbuf);
+
+  return count;
+}
+
+static long
+bfd_pef_count_symbols (bfd *abfd)
+{
+  return bfd_pef_parse_symbols (abfd, NULL);
+}
+
+static long
+bfd_pef_get_symtab_upper_bound (bfd *abfd)
+{
+  long nsyms = bfd_pef_count_symbols (abfd);
+
+  if (nsyms < 0)
+    return nsyms;
+  return ((nsyms + 1) * sizeof (asymbol *));
+}
+
+static long
+bfd_pef_canonicalize_symtab (bfd *abfd, asymbol **alocation)
+{
+  long i;
+  asymbol *syms;
+  long ret;
+  long nsyms = bfd_pef_count_symbols (abfd);
+
+  if (nsyms < 0)
+    return nsyms;
+
+  syms = bfd_alloc (abfd, nsyms * sizeof (asymbol));
+  if (syms == NULL)
+    return -1;
+
+  for (i = 0; i < nsyms; i++)
+    alocation[i] = &syms[i];
+
+  alocation[nsyms] = NULL;
+
+  ret = bfd_pef_parse_symbols (abfd, alocation);
+  if (ret != nsyms)
+    return 0;
+
+  return ret;
+}
+
+#define bfd_pef_make_empty_symbol _bfd_generic_make_empty_symbol
+
+static void
+bfd_pef_get_symbol_info (bfd *abfd ATTRIBUTE_UNUSED,
+			 asymbol *symbol,
+			 symbol_info *ret)
+{
+  bfd_symbol_info (symbol, ret);
+}
+
+static int
+bfd_pef_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+			struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+const bfd_target pef_vec =
+{
+  "pef",			/* Name.  */
+  bfd_target_pef_flavour,	/* Flavour.  */
+  BFD_ENDIAN_BIG,		/* Byteorder.  */
+  BFD_ENDIAN_BIG,		/* Header_byteorder.  */
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED),
+  (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE | SEC_DATA
+   | SEC_ROM | SEC_HAS_CONTENTS), /* Section_flags.  */
+  0,				/* Symbol_leading_char.  */
+  ' ',				/* AR_pad_char.  */
+  16,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Data.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Headers.  */
+  {				/* bfd_check_format.  */
+    _bfd_dummy_target,
+    bfd_pef_object_p,		/* bfd_check_format.  */
+    _bfd_dummy_target,
+    _bfd_dummy_target,
+  },
+  {				/* bfd_set_format.  */
+    bfd_false,
+    bfd_pef_mkobject,
+    bfd_false,
+    bfd_false,
+  },
+  {				/* bfd_write_contents.  */
+    bfd_false,
+    bfd_true,
+    bfd_false,
+    bfd_false,
+  },
+
+  BFD_JUMP_TABLE_GENERIC (bfd_pef),
+  BFD_JUMP_TABLE_COPY (_bfd_generic),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+  BFD_JUMP_TABLE_SYMBOLS (bfd_pef),
+  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+  BFD_JUMP_TABLE_WRITE (bfd_pef),
+  BFD_JUMP_TABLE_LINK (bfd_pef),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  NULL
+};
+
+#define bfd_pef_xlib_close_and_cleanup              _bfd_generic_close_and_cleanup
+#define bfd_pef_xlib_bfd_free_cached_info           _bfd_generic_bfd_free_cached_info
+#define bfd_pef_xlib_new_section_hook               _bfd_generic_new_section_hook
+#define bfd_pef_xlib_get_section_contents           _bfd_generic_get_section_contents
+#define bfd_pef_xlib_set_section_contents           _bfd_generic_set_section_contents
+#define bfd_pef_xlib_get_section_contents_in_window _bfd_generic_get_section_contents_in_window
+#define bfd_pef_xlib_set_section_contents_in_window _bfd_generic_set_section_contents_in_window
+
+static int
+bfd_pef_xlib_read_header (bfd *abfd, bfd_pef_xlib_header *header)
+{
+  unsigned char buf[76];
+
+  bfd_seek (abfd, 0, SEEK_SET);
+
+  if (bfd_bread ((void *) buf, 76, abfd) != 76)
+    return -1;
+
+  header->tag1 = bfd_getb32 (buf);
+  header->tag2 = bfd_getb32 (buf + 4);
+  header->current_format = bfd_getb32 (buf + 8);
+  header->container_strings_offset = bfd_getb32 (buf + 12);
+  header->export_hash_offset = bfd_getb32 (buf + 16);
+  header->export_key_offset = bfd_getb32 (buf + 20);
+  header->export_symbol_offset = bfd_getb32 (buf + 24);
+  header->export_names_offset = bfd_getb32 (buf + 28);
+  header->export_hash_table_power = bfd_getb32 (buf + 32);
+  header->exported_symbol_count = bfd_getb32 (buf + 36);
+  header->frag_name_offset = bfd_getb32 (buf + 40);
+  header->frag_name_length = bfd_getb32 (buf + 44);
+  header->dylib_path_offset = bfd_getb32 (buf + 48);
+  header->dylib_path_length = bfd_getb32 (buf + 52);
+  header->cpu_family = bfd_getb32 (buf + 56);
+  header->cpu_model = bfd_getb32 (buf + 60);
+  header->date_time_stamp = bfd_getb32 (buf + 64);
+  header->current_version = bfd_getb32 (buf + 68);
+  header->old_definition_version = bfd_getb32 (buf + 72);
+  header->old_implementation_version = bfd_getb32 (buf + 76);
+
+  return 0;
+}
+
+static int
+bfd_pef_xlib_scan (bfd *abfd, bfd_pef_xlib_header *header)
+{
+  bfd_pef_xlib_data_struct *mdata = NULL;
+
+  mdata = bfd_alloc (abfd, sizeof (* mdata));
+  if (mdata == NULL)
+    return -1;
+
+  mdata->header = *header;
+
+  abfd->flags = (abfd->xvec->object_flags
+		 | (abfd->flags & (BFD_IN_MEMORY | BFD_IO_FUNCS)));
+
+  abfd->tdata.pef_xlib_data = mdata;
+
+  return 0;
+}
+
+static const bfd_target *
+bfd_pef_xlib_object_p (bfd *abfd)
+{
+  struct bfd_preserve preserve;
+  bfd_pef_xlib_header header;
+
+  if (bfd_pef_xlib_read_header (abfd, &header) != 0)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  if ((header.tag1 != BFD_PEF_XLIB_TAG1)
+      || ((header.tag2 != BFD_PEF_VLIB_TAG2)
+	  && (header.tag2 != BFD_PEF_BLIB_TAG2)))
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  if (! bfd_preserve_save (abfd, &preserve))
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  if (bfd_pef_xlib_scan (abfd, &header) != 0)
+    {
+      bfd_preserve_restore (abfd, &preserve);
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  bfd_preserve_finish (abfd, &preserve);
+  return abfd->xvec;
+}
+
+const bfd_target pef_xlib_vec =
+{
+  "pef-xlib",			/* Name.  */
+  bfd_target_pef_xlib_flavour,	/* Flavour.  */
+  BFD_ENDIAN_BIG,		/* Byteorder */
+  BFD_ENDIAN_BIG,		/* Header_byteorder.  */
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED),
+  (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE | SEC_DATA
+   | SEC_ROM | SEC_HAS_CONTENTS),/* Section_flags.  */
+  0,				/* Symbol_leading_char.  */
+  ' ',				/* AR_pad_char.  */
+  16,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Data.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Headers.  */
+  {				/* bfd_check_format.  */
+    _bfd_dummy_target,
+    bfd_pef_xlib_object_p,	/* bfd_check_format.  */
+    _bfd_dummy_target,
+    _bfd_dummy_target,
+  },
+  {				/* bfd_set_format.  */
+    bfd_false,
+    bfd_pef_mkobject,
+    bfd_false,
+    bfd_false,
+  },
+  {				/* bfd_write_contents.  */
+    bfd_false,
+    bfd_true,
+    bfd_false,
+    bfd_false,
+  },
+
+  BFD_JUMP_TABLE_GENERIC (bfd_pef_xlib),
+  BFD_JUMP_TABLE_COPY (_bfd_generic),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+  BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
+  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+  BFD_JUMP_TABLE_WRITE (_bfd_nowrite),
+  BFD_JUMP_TABLE_LINK (_bfd_nolink),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  NULL
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pef.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pef.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pef.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pef.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,187 @@
+/* PEF support for BFD.
+   Copyright 1999, 2000, 2001, 2002, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "bfd.h"
+
+#include <stdio.h>
+
+struct bfd_pef_header
+{
+  unsigned long tag1;
+  unsigned long tag2;
+  unsigned long architecture;
+  unsigned long format_version;
+  unsigned long timestamp;
+  unsigned long old_definition_version;
+  unsigned long old_implementation_version;
+  unsigned long current_version;
+  unsigned short section_count;
+  unsigned short instantiated_section_count;
+  unsigned long reserved;
+};
+typedef struct bfd_pef_header bfd_pef_header;
+
+struct bfd_pef_loader_header
+{
+  long main_section;
+  unsigned long main_offset;
+  long init_section;
+  unsigned long init_offset;
+  long term_section;
+  unsigned long term_offset;
+  unsigned long imported_library_count;
+  unsigned long total_imported_symbol_count;
+  unsigned long reloc_section_count;
+  unsigned long reloc_instr_offset;
+  unsigned long loader_strings_offset;
+  unsigned long export_hash_offset;
+  unsigned long export_hash_table_power;
+  unsigned long exported_symbol_count;
+};
+typedef struct bfd_pef_loader_header bfd_pef_loader_header;
+
+struct bfd_pef_imported_library
+{
+  unsigned long name_offset;
+  unsigned long old_implementation_version;
+  unsigned long current_version;
+  unsigned long imported_symbol_count;
+  unsigned long first_imported_symbol;
+  unsigned char options;
+  unsigned char reserved_a;
+  unsigned short reserved_b;
+};
+typedef struct bfd_pef_imported_library bfd_pef_imported_library;
+
+enum bfd_pef_imported_library_options
+  {
+    BFD_PEF_WEAK_IMPORT_LIB = 0x40,
+    BFD_PEF_INIT_LIB_BEFORE = 0x80
+  };
+
+struct bfd_pef_imported_symbol
+{
+  unsigned char symbol_class;
+  unsigned long name;
+};
+typedef struct bfd_pef_imported_symbol bfd_pef_imported_symbol;
+
+enum bfd_pef_imported_symbol_class
+  {
+    BFD_PEF_CODE_SYMBOL = 0x00,
+    BFD_PEF_DATA_SYMBOL = 0x01,
+    BFD_PEF_TVECTOR_SYMBOL = 0x02,
+    BFD_PEF_TOC_SYMBOL = 0x03,
+    BFD_PEF_GLUE_SYMBOL = 0x04,
+    BFD_PEF_UNDEFINED_SYMBOL = 0x0F,
+    BFD_PEF_WEAK_IMPORT_SYMBOL_MASK = 0x80
+  };
+
+#define BFD_PEF_TAG1 0x4A6F7921 /* 'Joy!' */
+#define BFD_PEF_TAG2 0x70656666 /* 'peff' */
+
+#define BFD_PEF_VERSION 0x00000001
+
+struct bfd_pef_section
+{
+  long name_offset;
+  unsigned long header_offset;
+  unsigned long default_address;
+  unsigned long total_length;
+  unsigned long unpacked_length;
+  unsigned long container_length;
+  unsigned long container_offset;
+  unsigned char section_kind;
+  unsigned char share_kind;
+  unsigned char alignment;
+  unsigned char reserved;
+  asection *bfd_section;
+};
+typedef struct bfd_pef_section bfd_pef_section;
+
+#define BFD_PEF_SECTION_CODE 0
+#define BFD_PEF_SECTION_UNPACKED_DATA 1
+#define BFD_PEF_SECTION_PACKED_DATA 2
+#define BFD_PEF_SECTION_CONSTANT 3
+#define BFD_PEF_SECTION_LOADER 4
+#define BFD_PEF_SECTION_DEBUG 5
+#define BFD_PEF_SECTION_EXEC_DATA 6
+#define BFD_PEF_SECTION_EXCEPTION 7
+#define BFD_PEF_SECTION_TRACEBACK 8
+
+#define BFD_PEF_SHARE_PROCESS 1
+#define BFD_PEF_SHARE_GLOBAL 4
+#define BFD_PEF_SHARE_PROTECTED 5
+
+struct bfd_pef_data_struct
+{
+  bfd_pef_header header;
+  bfd_pef_section *sections;
+  bfd *ibfd;
+};
+typedef struct bfd_pef_data_struct bfd_pef_data_struct;
+
+#define BFD_PEF_XLIB_TAG1 0xF04D6163 /* '?Mac' */
+#define BFD_PEF_VLIB_TAG2 0x564C6962 /* 'VLib' */
+#define BFD_PEF_BLIB_TAG2 0x424C6962 /* 'BLib' */
+
+#define BFD_PEF_XLIB_VERSION 0x00000001
+
+struct bfd_pef_xlib_header
+{
+  unsigned long tag1;
+  unsigned long tag2;
+  unsigned long current_format;
+  unsigned long container_strings_offset;
+  unsigned long export_hash_offset;
+  unsigned long export_key_offset;
+  unsigned long export_symbol_offset;
+  unsigned long export_names_offset;
+  unsigned long export_hash_table_power;
+  unsigned long exported_symbol_count;
+
+  unsigned long frag_name_offset;
+  unsigned long frag_name_length;
+  unsigned long dylib_path_offset;
+  unsigned long dylib_path_length;
+  unsigned long cpu_family;
+  unsigned long cpu_model;
+  unsigned long date_time_stamp;
+  unsigned long current_version;
+  unsigned long old_definition_version;
+  unsigned long old_implementation_version;
+};
+typedef struct bfd_pef_xlib_header bfd_pef_xlib_header;
+
+struct bfd_pef_xlib_data_struct
+{
+  bfd_pef_xlib_header header;
+};
+typedef struct bfd_pef_xlib_data_struct bfd_pef_xlib_data_struct;
+
+int  bfd_pef_parse_loader_header    (bfd *, unsigned char *, size_t, bfd_pef_loader_header *);
+int  bfd_pef_print_loader_section   (bfd *, FILE *);
+void bfd_pef_print_loader_header    (bfd *, bfd_pef_loader_header *, FILE *);
+int  bfd_pef_parse_imported_library (bfd *, unsigned char *, size_t, bfd_pef_imported_library *);
+int  bfd_pef_parse_imported_symbol  (bfd *, unsigned char *, size_t, bfd_pef_imported_symbol *);
+int  bfd_pef_scan_section           (bfd *, bfd_pef_section *);
+int  bfd_pef_scan_start_address     (bfd *);
+int  bfd_pef_scan                   (bfd *, bfd_pef_header *, bfd_pef_data_struct *);
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pei-arm-wince.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pei-arm-wince.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pei-arm-wince.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pei-arm-wince.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,31 @@
+/* BFD back-end for ARM WINCE PE IMAGE COFF files.
+   Copyright 2006, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define TARGET_UNDERSCORE    0
+#define USER_LABEL_PREFIX    ""
+
+#define TARGET_LITTLE_SYM    arm_wince_pei_little_vec
+#define TARGET_LITTLE_NAME   "pei-arm-wince-little"
+#define TARGET_BIG_SYM       arm_wince_pei_big_vec
+#define TARGET_BIG_NAME      "pei-arm-wince-big"
+
+#define LOCAL_LABEL_PREFIX "."
+
+#include "pei-arm.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pei-arm.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pei-arm.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pei-arm.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pei-arm.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,56 @@
+/* BFD back-end for arm PE IMAGE COFF files.
+   Copyright 1995, 1996, 1999, 2002, 2005, 2006, 2007, 2009
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+
+#ifndef TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM  armpei_little_vec
+#define TARGET_LITTLE_NAME "pei-arm-little"
+#define TARGET_BIG_SYM     armpei_big_vec
+#define TARGET_BIG_NAME    "pei-arm-big"
+#endif
+
+#define COFF_IMAGE_WITH_PE
+#define COFF_WITH_PE
+#define PCRELOFFSET        TRUE
+/* Long section names not allowed in executable images, only object files.  */
+#define COFF_LONG_SECTION_NAMES 0
+
+#define COFF_SECTION_ALIGNMENT_ENTRIES \
+{ COFF_SECTION_NAME_EXACT_MATCH (".bss"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".data"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".rdata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".text"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".idata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".pdata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".debug"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi."), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
+
+#include "coff-arm.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pei-i386.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pei-i386.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pei-i386.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pei-i386.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,46 @@
+/* BFD back-end for Intel 386 PE IMAGE COFF files.
+   Copyright 1995, 1996, 1999, 2002, 2004, 2005, 2006, 2007, 2009
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+
+#define TARGET_SYM 		i386pei_vec
+#define TARGET_NAME 		"pei-i386"
+#define COFF_IMAGE_WITH_PE
+#define COFF_WITH_PE
+#define PCRELOFFSET 		TRUE
+#define TARGET_UNDERSCORE 	'_'
+/* Long section names not allowed in executable images, only object files.  */
+#define COFF_LONG_SECTION_NAMES 0
+#define COFF_SUPPORT_GNU_LINKONCE
+#define COFF_LONG_FILENAMES
+
+#define COFF_SECTION_ALIGNMENT_ENTRIES \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".idata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".pdata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".debug"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi."), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
+
+#include "coff-i386.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pei-ia64.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pei-ia64.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pei-ia64.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pei-ia64.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,39 @@
+/* BFD back-end for HP/Intel IA-64 PE IMAGE COFF files.
+   Copyright 1999, 2000, 2001, 2002, 2007, 2009
+   Free Software Foundation, Inc.
+   Contributed by David Mosberger <davidm@hpl.hp.com>
+
+   This implementation only supports objcopy to ouput IA-64 PE IMAGE COFF
+   files.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+
+#define TARGET_SYM bfd_pei_ia64_vec
+#define TARGET_NAME "pei-ia64"
+#define COFF_IMAGE_WITH_PE
+#define COFF_WITH_PE
+#define COFF_WITH_pep
+#define PCRELOFFSET TRUE
+#define TARGET_UNDERSCORE '_'
+/* Long section names not allowed in executable images, only object files.  */
+#define COFF_LONG_SECTION_NAMES 0
+
+#include "coff-ia64.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pei-mcore.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pei-mcore.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pei-mcore.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pei-mcore.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,44 @@
+/* BFD back-end for MCore PECOFF files.
+   Copyright 1999, 2002, 2005, 2007, 2008, 2009
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+
+#ifndef TARGET_BIG_SYM
+#define TARGET_BIG_SYM       mcore_pei_big_vec
+#define TARGET_BIG_NAME      "pei-mcore-big"
+#define TARGET_LITTLE_SYM    mcore_pei_little_vec
+#define TARGET_LITTLE_NAME   "pei-mcore-little"
+#endif
+
+#define COFF_IMAGE_WITH_PE
+#define COFF_WITH_PE
+#define PCRELOFFSET        TRUE
+/* Long section names not allowed in executable images, only object files.  */
+#define COFF_LONG_SECTION_NAMES 0
+
+#define MCORE_PE
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coff-mcore.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pei-mips.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pei-mips.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pei-mips.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pei-mips.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,33 @@
+/* BFD back-end for MIPS PE IMAGE COFF files.
+   Copyright 1995, 2000, 2001, 2002, 2005, 2007, 2009
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+
+#define TARGET_SYM mipslpei_vec
+#define TARGET_NAME "pei-mips"
+#define COFF_IMAGE_WITH_PE
+#define PCRELOFFSET TRUE
+/* Long section names not allowed in executable images, only object files.  */
+#define COFF_LONG_SECTION_NAMES 0
+
+#include "pe-mips.c"
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pei-ppc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pei-ppc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pei-ppc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pei-ppc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,51 @@
+/* BFD back-end for PowerPC PE IMAGE COFF files.
+   Copyright 1995, 1996, 1999, 2005, 2007, 2008, 2009
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+
+/* setting up for a PE environment stolen directly from the i386 structure */
+#define E_FILNMLEN	18	/* # characters in a file name		*/
+
+#define PPC_PE
+
+#define TARGET_LITTLE_SYM   bfd_powerpcle_pei_vec
+#define TARGET_LITTLE_NAME "pei-powerpcle"
+
+#define TARGET_BIG_SYM      bfd_powerpc_pei_vec
+#define TARGET_BIG_NAME    "pei-powerpc"
+
+#define COFF_IMAGE_WITH_PE
+#define COFF_WITH_PE
+
+/* Long section names not allowed in executable images, only object files.  */
+#define COFF_LONG_SECTION_NAMES 0
+
+/* FIXME: Verify PCRELOFFSET is always false */
+
+/* FIXME: This target no longer works.  Search for POWERPC_LE_PE in
+   coff-ppc.c and peigen.c.  */
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata	NULL
+#endif
+
+#include "coff-ppc.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pei-sh.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pei-sh.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pei-sh.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pei-sh.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,36 @@
+/* BFD back-end for SH PE IMAGE COFF files.
+   Copyright 1995, 2000, 2001, 2002, 2005, 2007, 2009
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+
+#define TARGET_SHL_SYM shlpei_vec
+#define TARGET_SHL_NAME "pei-shl"
+#define IMAGE_BASE NT_IMAGE_BASE
+#define COFF_IMAGE_WITH_PE
+#define COFF_WITH_PE
+#define PCRELOFFSET TRUE
+#define TARGET_UNDERSCORE '_'
+/* Long section names not allowed in executable images, only object files.  */
+#define COFF_LONG_SECTION_NAMES 0
+
+#include "coff-sh.c"
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pei-x86_64.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pei-x86_64.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/pei-x86_64.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/pei-x86_64.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,593 @@
+/* BFD back-end for Intel 386 PE IMAGE COFF files.
+   Copyright 2006, 2007, 2009 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.
+   
+   Written by Kai Tietz, OneVision Software GmbH&CoKg.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+
+#define TARGET_SYM 		x86_64pei_vec
+#define TARGET_NAME 		"pei-x86-64"
+#define COFF_IMAGE_WITH_PE
+#define COFF_WITH_PE
+#define COFF_WITH_pex64
+#define PCRELOFFSET 		TRUE
+#if defined (USE_MINGW64_LEADING_UNDERSCORES)
+#define TARGET_UNDERSCORE 	'_'
+#else
+#define TARGET_UNDERSCORE 	0
+#endif
+/* Long section names not allowed in executable images, only object files.  */
+#define COFF_LONG_SECTION_NAMES 0
+#define COFF_SUPPORT_GNU_LINKONCE
+#define COFF_LONG_FILENAMES
+#define PDATA_ROW_SIZE	(3 * 4)
+
+#define COFF_SECTION_ALIGNMENT_ENTRIES \
+{ COFF_SECTION_NAME_EXACT_MATCH (".bss"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 4 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".data"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 4 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".rdata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 4 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".text"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 4 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".idata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".pdata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".debug"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi."), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
+
+/* Note we have to make sure not to include headers twice.
+   Not all headers are wrapped in #ifdef guards, so we define
+   PEI_HEADERS to prevent double including in coff-x86_64.c  */
+#define PEI_HEADERS
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "coff/x86_64.h"
+#include "coff/internal.h"
+#include "coff/pe.h"
+#include "libcoff.h"
+#include "libpei.h"
+#include "libiberty.h"
+
+#undef AOUTSZ
+#define AOUTSZ		PEPAOUTSZ
+#define PEAOUTHDR	PEPAOUTHDR
+
+static const char *pex_regs[16] = {
+  "rax", "rcx", "rdx", "rbx", "rsp", "rbp", "rsi", "rdi",
+  "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15"
+};
+
+static void
+pex64_get_runtime_function (bfd *abfd, struct pex64_runtime_function *rf,
+			    const void *data)
+{
+  const struct external_pex64_runtime_function *ex_rf =
+    (const struct external_pex64_runtime_function *) data;
+  rf->rva_BeginAddress = bfd_get_32 (abfd, ex_rf->rva_BeginAddress);
+  rf->rva_EndAddress = bfd_get_32 (abfd, ex_rf->rva_EndAddress);
+  rf->rva_UnwindData =	bfd_get_32 (abfd, ex_rf->rva_UnwindData);
+  rf->isChained = PEX64_IS_RUNTIME_FUNCTION_CHAINED (rf);
+  rf->rva_UnwindData = PEX64_GET_UNWINDDATA_UNIFIED_RVA (rf);
+}
+
+static void
+pex64_get_unwind_info (bfd *abfd, struct pex64_unwind_info *ui, void *data)
+{
+  struct external_pex64_unwind_info *ex_ui =
+    (struct external_pex64_unwind_info *) data;
+  bfd_byte *ex_dta = (bfd_byte *) data;
+
+  memset (ui, 0, sizeof (struct pex64_unwind_info));
+  ui->Version = PEX64_UWI_VERSION (ex_ui->Version_Flags);
+  ui->Flags = PEX64_UWI_FLAGS (ex_ui->Version_Flags);
+  ui->SizeOfPrologue = (bfd_vma) ex_ui->SizeOfPrologue;
+  ui->CountOfCodes = (bfd_vma) ex_ui->CountOfCodes;
+  ui->FrameRegister = PEX64_UWI_FRAMEREG (ex_ui->FrameRegisterOffset);
+  ui->FrameOffset = PEX64_UWI_FRAMEOFF (ex_ui->FrameRegisterOffset);
+  ui->sizeofUnwindCodes = PEX64_UWI_SIZEOF_UWCODE_ARRAY (ui->CountOfCodes);
+  ui->SizeOfBlock = ui->sizeofUnwindCodes + 4;
+  ui->rawUnwindCodes = &ex_dta[4];
+  ex_dta += ui->SizeOfBlock;
+  switch (ui->Flags)
+    {
+    case UNW_FLAG_CHAININFO:
+      ui->rva_FunctionEntry = bfd_get_32 (abfd, ex_dta);
+      ui->SizeOfBlock += 4;
+      return;
+    default:
+      return;
+    }
+}
+
+static void
+pex64_xdata_print_uwd_codes (FILE *file, struct pex64_unwind_info *ui,
+			     bfd_vma pc_addr)
+{
+  bfd_vma i;
+  bfd_vma tmp = 0;
+  const bfd_byte *insns[256];
+  bfd_vma insns_count = 0;
+  const bfd_byte *dta = ui->rawUnwindCodes;
+
+  if (ui->CountOfCodes == 0 || !dta)
+    return;
+
+  /* Sort array ascending. Note: it is stored in reversed order.  */
+  for (i = 0; i < ui->CountOfCodes; i++)
+    {
+      const bfd_byte *t;
+
+      t = insns[insns_count++] = &dta[i * 2];
+      switch (PEX64_UNWCODE_CODE (t[1]))
+	{
+	case UWOP_PUSH_NONVOL:
+	case UWOP_ALLOC_SMALL:
+	case UWOP_SET_FPREG:
+	case UWOP_PUSH_MACHFRAME:
+	  break;
+	case UWOP_ALLOC_LARGE:
+	  if (PEX64_UNWCODE_INFO (t[1]) == 0)
+	    {
+	      i += 1;
+	      break;
+	    }
+	  else if (PEX64_UNWCODE_INFO (t[1]) == 1)
+	    {
+	      i += 2;
+	      break;
+	    }
+	  /* fall through.  */
+	default:
+	  fprintf (file, "\t contains unknown code (%u).\n",
+		   (unsigned int) PEX64_UNWCODE_CODE (t[1]));
+	  return;
+	case UWOP_SAVE_NONVOL:
+	case UWOP_SAVE_XMM:
+	case UWOP_SAVE_XMM128:
+	  i++;
+	  break;
+	case UWOP_SAVE_NONVOL_FAR:
+	case UWOP_SAVE_XMM_FAR:
+	case UWOP_SAVE_XMM128_FAR:
+	  i += 2;
+	  break;
+	}
+    }
+  fprintf (file, "\t At pc 0x");
+  fprintf_vma (file, pc_addr);
+  fprintf (file, " there are the following saves (in logical order).\n");
+  for (i = insns_count; i > 0;)
+    {
+      --i;
+      dta = insns[i];
+      fprintf (file, "\t  insn ends at pc+0x%02x: ", (unsigned int) dta[0]);
+      switch (PEX64_UNWCODE_CODE (dta[1]))
+	{
+	case UWOP_PUSH_NONVOL:
+	  fprintf (file, "push %s.\n", pex_regs[PEX64_UNWCODE_INFO (dta[1])]);
+	  break;
+	case UWOP_ALLOC_LARGE:
+	  if (PEX64_UNWCODE_INFO (dta[1]) == 0)
+	    {
+	      tmp = (bfd_vma) (*((unsigned short *) &dta[2]));
+	      tmp *= 8;
+	    }
+	  else
+	    tmp = (bfd_vma) (*((unsigned int *)&dta[2]));
+	  fprintf (file, "save stack region of size 0x");
+	  fprintf_vma (file, tmp);
+	  fprintf (file,".\n");
+	  break;
+	case UWOP_ALLOC_SMALL:
+	  tmp = (bfd_vma) PEX64_UNWCODE_INFO (dta[1]);
+	  tmp += 1;
+	  tmp *= 8;
+	  fprintf (file, "save stack region of size 0x");
+	  fprintf_vma (file, tmp);
+	  fprintf (file,".\n");
+	  break;
+	case UWOP_SET_FPREG:
+	  tmp = (bfd_vma) PEX64_UNWCODE_INFO (dta[1]);
+	  tmp *= 16;
+	  fprintf (file, "FPReg = (FrameReg) + 0x");
+	  fprintf_vma (file, tmp);
+	  fprintf (file, ".\n");
+	  break;
+	case UWOP_SAVE_NONVOL:
+	  fprintf (file, "mov %s at 0x",
+		   pex_regs[PEX64_UNWCODE_INFO (dta[1])]);
+	  tmp = (bfd_vma) (*((unsigned short *) &dta[2]));
+	  tmp *= 8;
+	  fprintf_vma (file, tmp);
+	  fprintf (file, ".\n");
+	  break;
+	case UWOP_SAVE_NONVOL_FAR:
+	  fprintf (file, "mov %s at 0x",
+		   pex_regs[PEX64_UNWCODE_INFO (dta[1])]);
+	  tmp = (bfd_vma) (*((unsigned int *) &dta[2]));
+	  fprintf_vma (file, tmp);
+	  fprintf (file, ".\n");
+	  break;
+	case UWOP_SAVE_XMM:
+	  tmp = (bfd_vma) (*((unsigned short *) &dta[2]));
+	  tmp *= 8;
+	  fprintf (file, "mov mm%u at 0x",
+		   (unsigned int) PEX64_UNWCODE_INFO (dta[1]));
+	  fprintf_vma (file, tmp);
+	  fprintf (file, ".\n");
+	  break;
+	case UWOP_SAVE_XMM_FAR:
+	  tmp = (bfd_vma) (*((unsigned int *) &dta[2]));
+	  fprintf (file, "mov mm%u at 0x",
+		   (unsigned int) PEX64_UNWCODE_INFO (dta[1]));
+	  fprintf_vma (file, tmp);
+	  fprintf (file, ".\n");
+	  break;
+	case UWOP_SAVE_XMM128:
+	  tmp = (bfd_vma) (*((unsigned short *) &dta[2]));
+	  tmp *= 16;
+	  fprintf (file, "mov xmm%u at 0x",
+		   (unsigned int) PEX64_UNWCODE_INFO ( dta[1]));
+	  fprintf_vma (file, tmp);
+	  fprintf (file, ".\n");
+	  break;
+	case UWOP_SAVE_XMM128_FAR:
+	  tmp = (bfd_vma) (*((unsigned int *) &dta[2]));
+	  fprintf (file, "mov xmm%u at 0x",
+		   (unsigned int) PEX64_UNWCODE_INFO (dta[1]));
+	  fprintf_vma (file, tmp);
+	  fprintf (file, ".\n");
+	  break;
+	case UWOP_PUSH_MACHFRAME:
+	  fprintf (file, "interrupt entry (SS, old RSP, EFLAGS, CS, RIP");
+	  if (PEX64_UNWCODE_INFO (dta[1]) == 0)
+	    {
+	      fprintf (file, ")");
+	    }
+	  else if (PEX64_UNWCODE_INFO (dta[1]) == 1)
+	    {
+	      fprintf (file, ",ErrorCode)");
+	    }
+	  else
+	    fprintf (file, ", unknown(%u))",
+		     (unsigned int) PEX64_UNWCODE_INFO (dta[1]));
+	  fprintf (file,".\n");
+	  break;
+	default:
+	  fprintf (file, "unknown code %u.\n",
+		   (unsigned int) PEX64_UNWCODE_INFO (dta[1]));
+	  break;
+      }
+    }
+}
+
+static asection *
+pex64_get_section_by_rva (bfd *abfd, bfd_vma addr, const char *sec_name)
+{
+  asection *section = bfd_get_section_by_name (abfd, sec_name);
+  bfd_vma vsize;
+  bfd_size_type datasize = 0;
+
+  if (section == NULL
+      || coff_section_data (abfd, section) == NULL
+      || pei_section_data (abfd, section) == NULL)
+    return NULL;
+  vsize = section->vma - pe_data (abfd)->pe_opthdr.ImageBase;
+  datasize = section->size;
+  if (!datasize || vsize > addr || (vsize + datasize) < addr)
+    return NULL;
+  return section;
+}
+
+static void
+pex64_dump_xdata (FILE *file, bfd *abfd, bfd_vma addr, bfd_vma pc_addr,
+		  bfd_vma *endx)
+{
+  asection *section = pex64_get_section_by_rva (abfd, addr, ".rdata");
+  bfd_vma vsize;
+  bfd_byte *data = NULL;
+  bfd_vma end_addr;
+
+  if (!section)
+    section = pex64_get_section_by_rva (abfd, addr, ".data");
+  if (!section)
+    section = pex64_get_section_by_rva (abfd, addr, ".xdata");
+  if (!section)
+    {
+      section = pex64_get_section_by_rva (abfd, addr, ".pdata");
+      if (section)
+	{
+	  fprintf (file, "\t Shares information with pdata element at 0x");
+	  fprintf_vma (file, addr + pe_data (abfd)->pe_opthdr.ImageBase);
+	  fprintf (file, ".\n");
+	}
+    }
+  if (!section)
+    return;
+
+  vsize = section->vma - pe_data (abfd)->pe_opthdr.ImageBase;
+  addr -= vsize;
+
+  if (endx)
+    end_addr = endx[0] - vsize;
+  else
+    end_addr = (section->rawsize != 0 ? section->rawsize : section->size);
+
+  if (bfd_malloc_and_get_section (abfd, section, &data))
+    {
+      struct pex64_unwind_info ui;
+
+      if (!data)
+	return;
+
+      pex64_get_unwind_info (abfd, &ui, &data[addr]);
+
+      if (ui.Version != 1)
+	{
+	  fprintf (file, "\tVersion %u (unknown).\n", (unsigned int) ui.Version);
+	  return;
+	}
+
+      fprintf (file, "\tFlags: ");
+      switch (ui.Flags)
+	{
+	case UNW_FLAG_NHANDLER:
+	  fprintf (file, "UNW_FLAG_NHANDLER");
+	  break;
+	case UNW_FLAG_EHANDLER:
+	  fprintf (file, "UNW_FLAG_EHANDLER");
+	  break;
+	case UNW_FLAG_UHANDLER:
+	  fprintf (file, "UNW_FLAG_UHANDLER");
+	  break;
+	case UNW_FLAG_FHANDLER:
+	  fprintf (file, "UNW_FLAG_FHANDLER = (UNW_FLAG_EHANDLER | UNW_FLAG_UHANDLER)");
+	  break;
+	case UNW_FLAG_CHAININFO:
+	  fprintf (file, "UNW_FLAG_CHAININFO");
+	  break;
+	default:
+	  fprintf (file, "unknown flags value 0x%x", (unsigned int) ui.Flags);
+	  break;
+	}
+      fprintf (file, ".\n");
+      if (ui.CountOfCodes != 0)
+	fprintf (file, "\tEntry has %u codes.", (unsigned int) ui.CountOfCodes);
+      fprintf (file, "\tPrologue size: %u, Frame offset = 0x%x.\n",
+	       (unsigned int) ui.SizeOfPrologue, (unsigned int) ui.FrameOffset);
+      fprintf (file, "\tFrame register is %s.\n",
+	ui.FrameRegister == 0 ? "none"
+			      : pex_regs[(unsigned int) ui.FrameRegister]);
+
+      pex64_xdata_print_uwd_codes (file, &ui, pc_addr);
+      
+      /* Now we need end of this xdata block.  */
+      addr += ui.SizeOfBlock;
+      if (addr < end_addr)
+        {
+	  unsigned int i;
+	  fprintf (file,"\tUser data:\n");
+	  for (i = 0; addr < end_addr; addr += 1, i++)
+	    {
+	      if ((i & 15) == 0)
+	        fprintf (file, "\t  %03x:", i);
+	      fprintf (file, " %02x", data[addr]);
+	      if ((i & 15) == 15)
+	        fprintf (file, "\n");
+	    }
+	  if ((i & 15) != 0)
+	    fprintf (file, "\n");
+        }
+    }
+  if (data != NULL)
+    free (data);
+}
+
+static int
+sort_xdata_arr (const void *l, const void *r)
+{
+  const bfd_vma *lp = (const bfd_vma *) l;
+  const bfd_vma *rp = (const bfd_vma *) r;
+
+  if (*lp == *rp)
+    return 0;
+  return (*lp < *rp ? -1 : 1);
+}
+
+static bfd_boolean
+pex64_bfd_print_pdata (bfd *abfd, void *vfile)
+{
+  FILE *file = (FILE *) vfile;
+  bfd_byte *data = NULL;
+  asection *section = bfd_get_section_by_name (abfd, ".pdata");
+  bfd_size_type datasize = 0;
+  bfd_size_type i;
+  bfd_size_type stop;
+  bfd_vma prev_beginaddress = 0;
+  int onaline = PDATA_ROW_SIZE;
+  int seen_error = 0;
+  bfd_vma *xdata_arr;
+  int xdata_arr_cnt;
+
+  if (section == NULL
+      || coff_section_data (abfd, section) == NULL
+      || pei_section_data (abfd, section) == NULL)
+    return TRUE;
+
+  stop = pei_section_data (abfd, section)->virt_size;
+  if ((stop % onaline) != 0)
+    fprintf (file,
+	     _("warning: .pdata section size (%ld) is not a multiple of %d\n"),
+	     (long) stop, onaline);
+
+  fprintf (file,
+	   _("\nThe Function Table (interpreted .pdata section contents)\n"));
+
+  fprintf (file, _("vma:\t\t\tBeginAddress\t EndAddress\t  UnwindData\n"));
+
+  datasize = section->size;
+  if (datasize == 0)
+    return TRUE;
+
+  if (!bfd_malloc_and_get_section (abfd, section, &data))
+    {
+      if (data != NULL)
+	free (data);
+      return FALSE;
+    }
+
+  xdata_arr = (bfd_vma *) xmalloc (sizeof (bfd_vma) * ((stop / onaline) + 1));
+  xdata_arr_cnt = 0;
+  /* Do sanity check of pdata.  */
+  for (i = 0; i < stop; i += onaline)
+    {
+      struct pex64_runtime_function rf;
+
+      if (i + PDATA_ROW_SIZE > stop)
+	break;
+      pex64_get_runtime_function (abfd, &rf, &data[i]);
+
+      if (rf.rva_BeginAddress == 0 && rf.rva_EndAddress == 0
+	  && rf.rva_UnwindData == 0)
+	/* We are probably into the padding of the section now.  */
+	break;
+      fputc (' ', file);
+      fprintf_vma (file, i + section->vma);
+      fprintf (file, ":\t");
+      fprintf_vma (file, rf.rva_BeginAddress);
+      fputc (' ', file);
+      fprintf_vma (file, rf.rva_EndAddress);
+      fputc (' ', file);
+      fprintf_vma (file, rf.rva_UnwindData);
+      fprintf (file, "\n");
+      if (i != 0 && rf.rva_BeginAddress <= prev_beginaddress)
+	{
+	  seen_error = 1;
+	  fprintf (file, "  has %s begin address as predecessor\n",
+	    (rf.rva_BeginAddress < prev_beginaddress ? "smaller" : "same"));
+        }
+      prev_beginaddress = rf.rva_BeginAddress;
+      /* Now we check for negative addresses.  */
+      if ((prev_beginaddress & 0x80000000) != 0)
+	{
+	  seen_error = 1;
+	  fprintf (file, "  has negative begin address\n");
+	}
+      if ((rf.rva_EndAddress & 0x80000000) != 0)
+	{
+	  seen_error = 1;
+	  fprintf (file, "  has negative end address\n");
+	}
+      if ((rf.rva_UnwindData & 0x80000000) != 0)
+	{
+	  seen_error = 1;
+	  fprintf (file, "  has negative unwind address\n");
+	}
+      if (rf.rva_UnwindData && !rf.isChained)
+        xdata_arr[xdata_arr_cnt++] = rf.rva_UnwindData;
+    }
+
+  if (seen_error)
+    {
+      free (data);
+      free (xdata_arr);
+
+      return TRUE;
+    }
+
+  /* Add end of list marker.  */
+  xdata_arr[xdata_arr_cnt++] = ~((bfd_vma) 0);
+
+  /* Sort start RVAs of xdata.  */
+  if (xdata_arr_cnt > 1)
+    qsort (xdata_arr, (size_t) xdata_arr_cnt, sizeof (bfd_vma),
+	   sort_xdata_arr);
+
+  /* Do dump of pdata related xdata.  */
+
+  for (i = 0; i < stop; i += onaline)
+    {
+      struct pex64_runtime_function rf;
+
+      if (i + PDATA_ROW_SIZE > stop)
+	break;
+      pex64_get_runtime_function (abfd, &rf, &data[i]);
+
+      if (rf.rva_BeginAddress == 0 && rf.rva_EndAddress == 0
+	  && rf.rva_UnwindData == 0)
+	/* We are probably into the padding of the section now.  */
+	break;
+      if (i == 0)
+        fprintf (file, "\nDump of .xdata\n");
+      fputc (' ', file);
+      fprintf_vma (file, rf.rva_UnwindData);
+      fprintf (file, ":\n");
+
+      rf.rva_BeginAddress += pe_data (abfd)->pe_opthdr.ImageBase;
+      rf.rva_EndAddress += pe_data (abfd)->pe_opthdr.ImageBase;
+
+      if (rf.rva_UnwindData != 0)
+	{
+	  if (rf.isChained)
+	    {
+	      fprintf (file, "\t shares information with pdata element at 0x");
+	      fprintf_vma (file, rf.rva_UnwindData);
+	      fprintf (file, ".\n");
+	    }
+	  else
+	    {
+	      bfd_vma *p;
+
+	      /* Search for the current entry in the sorted array.  */
+	      p = (bfd_vma *)
+	          bsearch (&rf.rva_UnwindData, xdata_arr,
+			   (size_t) xdata_arr_cnt, sizeof (bfd_vma),
+			   sort_xdata_arr);
+
+	      /* Advance to the next pointer into the xdata section.  We may
+		 have shared xdata entries, which will result in a string of
+		 identical pointers in the array; advance past all of them.  */
+	      while (p[0] <= rf.rva_UnwindData)
+		++p;
+	      if (p[0] == ~((bfd_vma) 0))
+		p = NULL;
+
+	      pex64_dump_xdata (file, abfd, rf.rva_UnwindData,
+				rf.rva_BeginAddress, p);
+	    }
+	}
+    }
+
+  free (data);
+  free (xdata_arr);
+
+  return TRUE;
+}
+
+#define bfd_pe_print_pdata   pex64_bfd_print_pdata
+
+#include "coff-x86_64.c"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/peicode.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/peicode.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/peicode.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/peicode.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1319 @@
+/* Support for the generic parts of PE/PEI, for BFD.
+   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+   Written by Cygnus Solutions.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* Most of this hacked by  Steve Chamberlain,
+			sac@cygnus.com
+
+   PE/PEI rearrangement (and code added): Donn Terry
+                                       Softway Systems, Inc.  */
+
+/* Hey look, some documentation [and in a place you expect to find it]!
+
+   The main reference for the pei format is "Microsoft Portable Executable
+   and Common Object File Format Specification 4.1".  Get it if you need to
+   do some serious hacking on this code.
+
+   Another reference:
+   "Peering Inside the PE: A Tour of the Win32 Portable Executable
+   File Format", MSJ 1994, Volume 9.
+
+   The *sole* difference between the pe format and the pei format is that the
+   latter has an MSDOS 2.0 .exe header on the front that prints the message
+   "This app must be run under Windows." (or some such).
+   (FIXME: Whether that statement is *really* true or not is unknown.
+   Are there more subtle differences between pe and pei formats?
+   For now assume there aren't.  If you find one, then for God sakes
+   document it here!)
+
+   The Microsoft docs use the word "image" instead of "executable" because
+   the former can also refer to a DLL (shared library).  Confusion can arise
+   because the `i' in `pei' also refers to "image".  The `pe' format can
+   also create images (i.e. executables), it's just that to run on a win32
+   system you need to use the pei format.
+
+   FIXME: Please add more docs here so the next poor fool that has to hack
+   on this code has a chance of getting something accomplished without
+   wasting too much time.  */
+
+#include "libpei.h"
+
+static bfd_boolean (*pe_saved_coff_bfd_print_private_bfd_data) (bfd *, void *) =
+#ifndef coff_bfd_print_private_bfd_data
+     NULL;
+#else
+     coff_bfd_print_private_bfd_data;
+#undef coff_bfd_print_private_bfd_data
+#endif
+
+static bfd_boolean                      pe_print_private_bfd_data (bfd *, void *);
+#define coff_bfd_print_private_bfd_data pe_print_private_bfd_data
+
+static bfd_boolean (*pe_saved_coff_bfd_copy_private_bfd_data) (bfd *, bfd *) =
+#ifndef coff_bfd_copy_private_bfd_data
+     NULL;
+#else
+     coff_bfd_copy_private_bfd_data;
+#undef coff_bfd_copy_private_bfd_data
+#endif
+
+static bfd_boolean                     pe_bfd_copy_private_bfd_data (bfd *, bfd *);
+#define coff_bfd_copy_private_bfd_data pe_bfd_copy_private_bfd_data
+
+#define coff_mkobject      pe_mkobject
+#define coff_mkobject_hook pe_mkobject_hook
+
+#ifdef COFF_IMAGE_WITH_PE
+/* This structure contains static variables used by the ILF code.  */
+typedef asection * asection_ptr;
+
+typedef struct
+{
+  bfd *			abfd;
+  bfd_byte *		data;
+  struct bfd_in_memory * bim;
+  unsigned short        magic;
+
+  arelent *		reltab;
+  unsigned int 		relcount;
+
+  coff_symbol_type * 	sym_cache;
+  coff_symbol_type * 	sym_ptr;
+  unsigned int       	sym_index;
+
+  unsigned int * 	sym_table;
+  unsigned int * 	table_ptr;
+
+  combined_entry_type * native_syms;
+  combined_entry_type * native_ptr;
+
+  coff_symbol_type **	sym_ptr_table;
+  coff_symbol_type **	sym_ptr_ptr;
+
+  unsigned int		sec_index;
+
+  char *                string_table;
+  char *                string_ptr;
+  char *		end_string_ptr;
+
+  SYMENT *              esym_table;
+  SYMENT *              esym_ptr;
+
+  struct internal_reloc * int_reltab;
+}
+pe_ILF_vars;
+#endif /* COFF_IMAGE_WITH_PE */
+
+#ifndef NO_COFF_RELOCS
+static void
+coff_swap_reloc_in (bfd * abfd, void * src, void * dst)
+{
+  RELOC *reloc_src = (RELOC *) src;
+  struct internal_reloc *reloc_dst = (struct internal_reloc *) dst;
+
+  reloc_dst->r_vaddr  = H_GET_32 (abfd, reloc_src->r_vaddr);
+  reloc_dst->r_symndx = H_GET_S32 (abfd, reloc_src->r_symndx);
+  reloc_dst->r_type   = H_GET_16 (abfd, reloc_src->r_type);
+#ifdef SWAP_IN_RELOC_OFFSET
+  reloc_dst->r_offset = SWAP_IN_RELOC_OFFSET (abfd, reloc_src->r_offset);
+#endif
+}
+
+static unsigned int
+coff_swap_reloc_out (bfd * abfd, void * src, void * dst)
+{
+  struct internal_reloc *reloc_src = (struct internal_reloc *) src;
+  struct external_reloc *reloc_dst = (struct external_reloc *) dst;
+
+  H_PUT_32 (abfd, reloc_src->r_vaddr, reloc_dst->r_vaddr);
+  H_PUT_32 (abfd, reloc_src->r_symndx, reloc_dst->r_symndx);
+  H_PUT_16 (abfd, reloc_src->r_type, reloc_dst->r_type);
+
+#ifdef SWAP_OUT_RELOC_OFFSET 
+  SWAP_OUT_RELOC_OFFSET (abfd, reloc_src->r_offset, reloc_dst->r_offset);
+#endif
+#ifdef SWAP_OUT_RELOC_EXTRA
+  SWAP_OUT_RELOC_EXTRA (abfd, reloc_src, reloc_dst);
+#endif
+  return RELSZ;
+}
+#endif /* not NO_COFF_RELOCS */
+
+static void
+coff_swap_filehdr_in (bfd * abfd, void * src, void * dst)
+{
+  FILHDR *filehdr_src = (FILHDR *) src;
+  struct internal_filehdr *filehdr_dst = (struct internal_filehdr *) dst;
+
+  filehdr_dst->f_magic  = H_GET_16 (abfd, filehdr_src->f_magic);
+  filehdr_dst->f_nscns  = H_GET_16 (abfd, filehdr_src->f_nscns);
+  filehdr_dst->f_timdat = H_GET_32 (abfd, filehdr_src->f_timdat);
+  filehdr_dst->f_nsyms  = H_GET_32 (abfd, filehdr_src->f_nsyms);
+  filehdr_dst->f_flags  = H_GET_16 (abfd, filehdr_src->f_flags);
+  filehdr_dst->f_symptr = H_GET_32 (abfd, filehdr_src->f_symptr);
+
+  /* Other people's tools sometimes generate headers with an nsyms but
+     a zero symptr.  */
+  if (filehdr_dst->f_nsyms != 0 && filehdr_dst->f_symptr == 0)
+    {
+      filehdr_dst->f_nsyms = 0;
+      filehdr_dst->f_flags |= F_LSYMS;
+    }
+
+  filehdr_dst->f_opthdr = H_GET_16 (abfd, filehdr_src-> f_opthdr);
+}
+
+#ifdef COFF_IMAGE_WITH_PE
+# define coff_swap_filehdr_out _bfd_XXi_only_swap_filehdr_out
+#elif defined COFF_WITH_pex64
+# define coff_swap_filehdr_out _bfd_pex64_only_swap_filehdr_out
+#elif defined COFF_WITH_pep
+# define coff_swap_filehdr_out _bfd_pep_only_swap_filehdr_out
+#else
+# define coff_swap_filehdr_out _bfd_pe_only_swap_filehdr_out
+#endif
+
+static void
+coff_swap_scnhdr_in (bfd * abfd, void * ext, void * in)
+{
+  SCNHDR *scnhdr_ext = (SCNHDR *) ext;
+  struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
+
+  memcpy (scnhdr_int->s_name, scnhdr_ext->s_name, sizeof (scnhdr_int->s_name));
+
+  scnhdr_int->s_vaddr   = GET_SCNHDR_VADDR (abfd, scnhdr_ext->s_vaddr);
+  scnhdr_int->s_paddr   = GET_SCNHDR_PADDR (abfd, scnhdr_ext->s_paddr);
+  scnhdr_int->s_size    = GET_SCNHDR_SIZE (abfd, scnhdr_ext->s_size);
+  scnhdr_int->s_scnptr  = GET_SCNHDR_SCNPTR (abfd, scnhdr_ext->s_scnptr);
+  scnhdr_int->s_relptr  = GET_SCNHDR_RELPTR (abfd, scnhdr_ext->s_relptr);
+  scnhdr_int->s_lnnoptr = GET_SCNHDR_LNNOPTR (abfd, scnhdr_ext->s_lnnoptr);
+  scnhdr_int->s_flags   = H_GET_32 (abfd, scnhdr_ext->s_flags);
+
+  /* MS handles overflow of line numbers by carrying into the reloc
+     field (it appears).  Since it's supposed to be zero for PE
+     *IMAGE* format, that's safe.  This is still a bit iffy.  */
+#ifdef COFF_IMAGE_WITH_PE
+  scnhdr_int->s_nlnno = (H_GET_16 (abfd, scnhdr_ext->s_nlnno)
+			 + (H_GET_16 (abfd, scnhdr_ext->s_nreloc) << 16));
+  scnhdr_int->s_nreloc = 0;
+#else
+  scnhdr_int->s_nreloc = H_GET_16 (abfd, scnhdr_ext->s_nreloc);
+  scnhdr_int->s_nlnno = H_GET_16 (abfd, scnhdr_ext->s_nlnno);
+#endif
+
+  if (scnhdr_int->s_vaddr != 0)
+    {
+      scnhdr_int->s_vaddr += pe_data (abfd)->pe_opthdr.ImageBase;
+      /* Do not cut upper 32-bits for 64-bit vma.  */
+#ifndef COFF_WITH_pex64
+      scnhdr_int->s_vaddr &= 0xffffffff;
+#endif
+    }
+
+#ifndef COFF_NO_HACK_SCNHDR_SIZE
+  /* If this section holds uninitialized data and is from an object file
+     or from an executable image that has not initialized the field,
+     or if the image is an executable file and the physical size is padded,
+     use the virtual size (stored in s_paddr) instead.  */
+  if (scnhdr_int->s_paddr > 0
+      && (((scnhdr_int->s_flags & IMAGE_SCN_CNT_UNINITIALIZED_DATA) != 0
+	   && (! bfd_pei_p (abfd) || scnhdr_int->s_size == 0))
+          || (bfd_pei_p (abfd) && (scnhdr_int->s_size > scnhdr_int->s_paddr))))
+  /* This code used to set scnhdr_int->s_paddr to 0.  However,
+     coff_set_alignment_hook stores s_paddr in virt_size, which
+     only works if it correctly holds the virtual size of the
+     section.  */
+    scnhdr_int->s_size = scnhdr_int->s_paddr;
+#endif
+}
+
+static bfd_boolean
+pe_mkobject (bfd * abfd)
+{
+  pe_data_type *pe;
+  bfd_size_type amt = sizeof (pe_data_type);
+
+  abfd->tdata.pe_obj_data = (struct pe_tdata *) bfd_zalloc (abfd, amt);
+
+  if (abfd->tdata.pe_obj_data == 0)
+    return FALSE;
+
+  pe = pe_data (abfd);
+
+  pe->coff.pe = 1;
+
+  /* in_reloc_p is architecture dependent.  */
+  pe->in_reloc_p = in_reloc_p;
+
+  return TRUE;
+}
+
+/* Create the COFF backend specific information.  */
+
+static void *
+pe_mkobject_hook (bfd * abfd,
+		  void * filehdr,
+		  void * aouthdr ATTRIBUTE_UNUSED)
+{
+  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
+  pe_data_type *pe;
+
+  if (! pe_mkobject (abfd))
+    return NULL;
+
+  pe = pe_data (abfd);
+  pe->coff.sym_filepos = internal_f->f_symptr;
+  /* These members communicate important constants about the symbol
+     table to GDB's symbol-reading code.  These `constants'
+     unfortunately vary among coff implementations...  */
+  pe->coff.local_n_btmask = N_BTMASK;
+  pe->coff.local_n_btshft = N_BTSHFT;
+  pe->coff.local_n_tmask = N_TMASK;
+  pe->coff.local_n_tshift = N_TSHIFT;
+  pe->coff.local_symesz = SYMESZ;
+  pe->coff.local_auxesz = AUXESZ;
+  pe->coff.local_linesz = LINESZ;
+
+  pe->coff.timestamp = internal_f->f_timdat;
+
+  obj_raw_syment_count (abfd) =
+    obj_conv_table_size (abfd) =
+      internal_f->f_nsyms;
+
+  pe->real_flags = internal_f->f_flags;
+
+  if ((internal_f->f_flags & F_DLL) != 0)
+    pe->dll = 1;
+
+  if ((internal_f->f_flags & IMAGE_FILE_DEBUG_STRIPPED) == 0)
+    abfd->flags |= HAS_DEBUG;
+
+#ifdef COFF_IMAGE_WITH_PE
+  if (aouthdr)
+    pe->pe_opthdr = ((struct internal_aouthdr *) aouthdr)->pe;
+#endif
+
+#ifdef ARM
+  if (! _bfd_coff_arm_set_private_flags (abfd, internal_f->f_flags))
+    coff_data (abfd) ->flags = 0;
+#endif
+
+  return (void *) pe;
+}
+
+static bfd_boolean
+pe_print_private_bfd_data (bfd *abfd, void * vfile)
+{
+  FILE *file = (FILE *) vfile;
+
+  if (!_bfd_XX_print_private_bfd_data_common (abfd, vfile))
+    return FALSE;
+
+  if (pe_saved_coff_bfd_print_private_bfd_data == NULL)
+    return TRUE;
+
+  fputc ('\n', file);
+
+  return pe_saved_coff_bfd_print_private_bfd_data (abfd, vfile);
+}
+
+/* Copy any private info we understand from the input bfd
+   to the output bfd.  */
+
+static bfd_boolean
+pe_bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  /* PR binutils/716: Copy the large address aware flag.
+     XXX: Should we be copying other flags or other fields in the pe_data()
+     structure ?  */
+  if (pe_data (obfd) != NULL
+      && pe_data (ibfd) != NULL
+      && pe_data (ibfd)->real_flags & IMAGE_FILE_LARGE_ADDRESS_AWARE)
+    pe_data (obfd)->real_flags |= IMAGE_FILE_LARGE_ADDRESS_AWARE;
+      
+  if (!_bfd_XX_bfd_copy_private_bfd_data_common (ibfd, obfd))
+    return FALSE;
+
+  if (pe_saved_coff_bfd_copy_private_bfd_data)
+    return pe_saved_coff_bfd_copy_private_bfd_data (ibfd, obfd);
+
+  return TRUE;
+}
+
+#define coff_bfd_copy_private_section_data \
+  _bfd_XX_bfd_copy_private_section_data
+
+#define coff_get_symbol_info _bfd_XX_get_symbol_info
+
+#ifdef COFF_IMAGE_WITH_PE
+
+/* Code to handle Microsoft's Image Library Format.
+   Also known as LINK6 format.
+   Documentation about this format can be found at:
+
+   http://msdn.microsoft.com/library/specs/pecoff_section8.htm  */
+
+/* The following constants specify the sizes of the various data
+   structures that we have to create in order to build a bfd describing
+   an ILF object file.  The final "+ 1" in the definitions of SIZEOF_IDATA6
+   and SIZEOF_IDATA7 below is to allow for the possibility that we might
+   need a padding byte in order to ensure 16 bit alignment for the section's
+   contents.
+
+   The value for SIZEOF_ILF_STRINGS is computed as follows:
+
+      There will be NUM_ILF_SECTIONS section symbols.  Allow 9 characters
+      per symbol for their names (longest section name is .idata$x).
+
+      There will be two symbols for the imported value, one the symbol name
+      and one with _imp__ prefixed.  Allowing for the terminating nul's this
+      is strlen (symbol_name) * 2 + 8 + 21 + strlen (source_dll).
+
+      The strings in the string table must start STRING__SIZE_SIZE bytes into
+      the table in order to for the string lookup code in coffgen/coffcode to
+      work.  */
+#define NUM_ILF_RELOCS		8
+#define NUM_ILF_SECTIONS        6
+#define NUM_ILF_SYMS 		(2 + NUM_ILF_SECTIONS)
+
+#define SIZEOF_ILF_SYMS		 (NUM_ILF_SYMS * sizeof (* vars.sym_cache))
+#define SIZEOF_ILF_SYM_TABLE	 (NUM_ILF_SYMS * sizeof (* vars.sym_table))
+#define SIZEOF_ILF_NATIVE_SYMS	 (NUM_ILF_SYMS * sizeof (* vars.native_syms))
+#define SIZEOF_ILF_SYM_PTR_TABLE (NUM_ILF_SYMS * sizeof (* vars.sym_ptr_table))
+#define SIZEOF_ILF_EXT_SYMS	 (NUM_ILF_SYMS * sizeof (* vars.esym_table))
+#define SIZEOF_ILF_RELOCS	 (NUM_ILF_RELOCS * sizeof (* vars.reltab))
+#define SIZEOF_ILF_INT_RELOCS	 (NUM_ILF_RELOCS * sizeof (* vars.int_reltab))
+#define SIZEOF_ILF_STRINGS	 (strlen (symbol_name) * 2 + 8 \
+					+ 21 + strlen (source_dll) \
+					+ NUM_ILF_SECTIONS * 9 \
+					+ STRING_SIZE_SIZE)
+#define SIZEOF_IDATA2		(5 * 4)
+
+/* For PEx64 idata4 & 5 have thumb size of 8 bytes.  */
+#ifdef COFF_WITH_pex64
+#define SIZEOF_IDATA4		(2 * 4)
+#define SIZEOF_IDATA5		(2 * 4)
+#else
+#define SIZEOF_IDATA4		(1 * 4)
+#define SIZEOF_IDATA5		(1 * 4)
+#endif
+
+#define SIZEOF_IDATA6		(2 + strlen (symbol_name) + 1 + 1)
+#define SIZEOF_IDATA7		(strlen (source_dll) + 1 + 1)
+#define SIZEOF_ILF_SECTIONS     (NUM_ILF_SECTIONS * sizeof (struct coff_section_tdata))
+
+#define ILF_DATA_SIZE				\
+    + SIZEOF_ILF_SYMS				\
+    + SIZEOF_ILF_SYM_TABLE			\
+    + SIZEOF_ILF_NATIVE_SYMS			\
+    + SIZEOF_ILF_SYM_PTR_TABLE			\
+    + SIZEOF_ILF_EXT_SYMS			\
+    + SIZEOF_ILF_RELOCS				\
+    + SIZEOF_ILF_INT_RELOCS			\
+    + SIZEOF_ILF_STRINGS			\
+    + SIZEOF_IDATA2				\
+    + SIZEOF_IDATA4				\
+    + SIZEOF_IDATA5				\
+    + SIZEOF_IDATA6				\
+    + SIZEOF_IDATA7				\
+    + SIZEOF_ILF_SECTIONS			\
+    + MAX_TEXT_SECTION_SIZE
+
+/* Create an empty relocation against the given symbol.  */
+
+static void
+pe_ILF_make_a_symbol_reloc (pe_ILF_vars *               vars,
+			    bfd_vma                     address,
+			    bfd_reloc_code_real_type    reloc,
+			    struct bfd_symbol **  	sym,
+			    unsigned int                sym_index)
+{
+  arelent * entry;
+  struct internal_reloc * internal;
+
+  entry = vars->reltab + vars->relcount;
+  internal = vars->int_reltab + vars->relcount;
+
+  entry->address     = address;
+  entry->addend      = 0;
+  entry->howto       = bfd_reloc_type_lookup (vars->abfd, reloc);
+  entry->sym_ptr_ptr = sym;
+
+  internal->r_vaddr  = address;
+  internal->r_symndx = sym_index;
+  internal->r_type   = entry->howto->type;
+
+  vars->relcount ++;
+
+  BFD_ASSERT (vars->relcount <= NUM_ILF_RELOCS);
+}
+
+/* Create an empty relocation against the given section.  */
+
+static void
+pe_ILF_make_a_reloc (pe_ILF_vars *             vars,
+		     bfd_vma                   address,
+		     bfd_reloc_code_real_type  reloc,
+		     asection_ptr              sec)
+{
+  pe_ILF_make_a_symbol_reloc (vars, address, reloc, sec->symbol_ptr_ptr,
+			      coff_section_data (vars->abfd, sec)->i);
+}
+
+/* Move the queued relocs into the given section.  */
+
+static void
+pe_ILF_save_relocs (pe_ILF_vars * vars,
+		    asection_ptr  sec)
+{
+  /* Make sure that there is somewhere to store the internal relocs.  */
+  if (coff_section_data (vars->abfd, sec) == NULL)
+    /* We should probably return an error indication here.  */
+    abort ();
+
+  coff_section_data (vars->abfd, sec)->relocs = vars->int_reltab;
+  coff_section_data (vars->abfd, sec)->keep_relocs = TRUE;
+
+  sec->relocation  = vars->reltab;
+  sec->reloc_count = vars->relcount;
+  sec->flags      |= SEC_RELOC;
+
+  vars->reltab     += vars->relcount;
+  vars->int_reltab += vars->relcount;
+  vars->relcount   = 0;
+
+  BFD_ASSERT ((bfd_byte *) vars->int_reltab < (bfd_byte *) vars->string_table);
+}
+
+/* Create a global symbol and add it to the relevant tables.  */
+
+static void
+pe_ILF_make_a_symbol (pe_ILF_vars *  vars,
+		      const char *   prefix,
+		      const char *   symbol_name,
+		      asection_ptr   section,
+		      flagword       extra_flags)
+{
+  coff_symbol_type * sym;
+  combined_entry_type * ent;
+  SYMENT * esym;
+  unsigned short sclass;
+
+  if (extra_flags & BSF_LOCAL)
+    sclass = C_STAT;
+  else
+    sclass = C_EXT;
+
+#ifdef THUMBPEMAGIC
+  if (vars->magic == THUMBPEMAGIC)
+    {
+      if (extra_flags & BSF_FUNCTION)
+	sclass = C_THUMBEXTFUNC;
+      else if (extra_flags & BSF_LOCAL)
+	sclass = C_THUMBSTAT;
+      else
+	sclass = C_THUMBEXT;
+    }
+#endif
+
+  BFD_ASSERT (vars->sym_index < NUM_ILF_SYMS);
+
+  sym = vars->sym_ptr;
+  ent = vars->native_ptr;
+  esym = vars->esym_ptr;
+
+  /* Copy the symbol's name into the string table.  */
+  sprintf (vars->string_ptr, "%s%s", prefix, symbol_name);
+
+  if (section == NULL)
+    section = (asection_ptr) & bfd_und_section;
+
+  /* Initialise the external symbol.  */
+  H_PUT_32 (vars->abfd, vars->string_ptr - vars->string_table,
+	    esym->e.e.e_offset);
+  H_PUT_16 (vars->abfd, section->target_index, esym->e_scnum);
+  esym->e_sclass[0] = sclass;
+
+  /* The following initialisations are unnecessary - the memory is
+     zero initialised.  They are just kept here as reminders.  */
+
+  /* Initialise the internal symbol structure.  */
+  ent->u.syment.n_sclass          = sclass;
+  ent->u.syment.n_scnum           = section->target_index;
+  ent->u.syment._n._n_n._n_offset = (bfd_hostptr_t) sym;
+
+  sym->symbol.the_bfd = vars->abfd;
+  sym->symbol.name    = vars->string_ptr;
+  sym->symbol.flags   = BSF_EXPORT | BSF_GLOBAL | extra_flags;
+  sym->symbol.section = section;
+  sym->native         = ent;
+
+  * vars->table_ptr = vars->sym_index;
+  * vars->sym_ptr_ptr = sym;
+
+  /* Adjust pointers for the next symbol.  */
+  vars->sym_index ++;
+  vars->sym_ptr ++;
+  vars->sym_ptr_ptr ++;
+  vars->table_ptr ++;
+  vars->native_ptr ++;
+  vars->esym_ptr ++;
+  vars->string_ptr += strlen (symbol_name) + strlen (prefix) + 1;
+
+  BFD_ASSERT (vars->string_ptr < vars->end_string_ptr);
+}
+
+/* Create a section.  */
+
+static asection_ptr
+pe_ILF_make_a_section (pe_ILF_vars * vars,
+		       const char *  name,
+		       unsigned int  size,
+		       flagword      extra_flags)
+{
+  asection_ptr sec;
+  flagword     flags;
+
+  sec = bfd_make_section_old_way (vars->abfd, name);
+  if (sec == NULL)
+    return NULL;
+
+  flags = SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_KEEP | SEC_IN_MEMORY;
+
+  bfd_set_section_flags (vars->abfd, sec, flags | extra_flags);
+
+  bfd_set_section_alignment (vars->abfd, sec, 2);
+
+  /* Check that we will not run out of space.  */
+  BFD_ASSERT (vars->data + size < vars->bim->buffer + vars->bim->size);
+
+  /* Set the section size and contents.  The actual
+     contents are filled in by our parent.  */
+  bfd_set_section_size (vars->abfd, sec, (bfd_size_type) size);
+  sec->contents = vars->data;
+  sec->target_index = vars->sec_index ++;
+
+  /* Advance data pointer in the vars structure.  */
+  vars->data += size;
+
+  /* Skip the padding byte if it was not needed.
+     The logic here is that if the string length is odd,
+     then the entire string length, including the null byte,
+     is even and so the extra, padding byte, is not needed.  */
+  if (size & 1)
+    vars->data --;
+
+  /* Create a coff_section_tdata structure for our use.  */
+  sec->used_by_bfd = (struct coff_section_tdata *) vars->data;
+  vars->data += sizeof (struct coff_section_tdata);
+
+  BFD_ASSERT (vars->data <= vars->bim->buffer + vars->bim->size);
+
+  /* Create a symbol to refer to this section.  */
+  pe_ILF_make_a_symbol (vars, "", name, sec, BSF_LOCAL);
+
+  /* Cache the index to the symbol in the coff_section_data structure.  */
+  coff_section_data (vars->abfd, sec)->i = vars->sym_index - 1;
+
+  return sec;
+}
+
+/* This structure contains the code that goes into the .text section
+   in order to perform a jump into the DLL lookup table.  The entries
+   in the table are index by the magic number used to represent the
+   machine type in the PE file.  The contents of the data[] arrays in
+   these entries are stolen from the jtab[] arrays in ld/pe-dll.c.
+   The SIZE field says how many bytes in the DATA array are actually
+   used.  The OFFSET field says where in the data array the address
+   of the .idata$5 section should be placed.  */
+#define MAX_TEXT_SECTION_SIZE 32
+
+typedef struct
+{
+  unsigned short magic;
+  unsigned char  data[MAX_TEXT_SECTION_SIZE];
+  unsigned int   size;
+  unsigned int   offset;
+}
+jump_table;
+
+static jump_table jtab[] =
+{
+#ifdef I386MAGIC
+  { I386MAGIC,
+    { 0xff, 0x25, 0x00, 0x00, 0x00, 0x00, 0x90, 0x90 },
+    8, 2
+  },
+#endif
+
+#ifdef AMD64MAGIC
+  { AMD64MAGIC,
+    { 0xff, 0x25, 0x00, 0x00, 0x00, 0x00, 0x90, 0x90 },
+    8, 2
+  },
+#endif
+
+#ifdef  MC68MAGIC
+  { MC68MAGIC,
+    { /* XXX fill me in */ },
+    0, 0
+  },
+#endif
+
+#ifdef  MIPS_ARCH_MAGIC_WINCE
+  { MIPS_ARCH_MAGIC_WINCE,
+    { 0x00, 0x00, 0x08, 0x3c, 0x00, 0x00, 0x08, 0x8d,
+      0x08, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00 },
+    16, 0
+  },
+#endif
+
+#ifdef  SH_ARCH_MAGIC_WINCE
+  { SH_ARCH_MAGIC_WINCE,
+    { 0x01, 0xd0, 0x02, 0x60, 0x2b, 0x40,
+      0x09, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    12, 8
+  },
+#endif
+
+#ifdef  ARMPEMAGIC
+  { ARMPEMAGIC,
+    { 0x00, 0xc0, 0x9f, 0xe5, 0x00, 0xf0,
+      0x9c, 0xe5, 0x00, 0x00, 0x00, 0x00},
+    12, 8
+  },
+#endif
+
+#ifdef  THUMBPEMAGIC
+  { THUMBPEMAGIC,
+    { 0x40, 0xb4, 0x02, 0x4e, 0x36, 0x68, 0xb4, 0x46,
+      0x40, 0xbc, 0x60, 0x47, 0x00, 0x00, 0x00, 0x00 },
+    16, 12
+  },
+#endif
+  { 0, { 0 }, 0, 0 }
+};
+
+#ifndef NUM_ENTRIES
+#define NUM_ENTRIES(a) (sizeof (a) / sizeof (a)[0])
+#endif
+
+/* Build a full BFD from the information supplied in a ILF object.  */
+
+static bfd_boolean
+pe_ILF_build_a_bfd (bfd *           abfd,
+		    unsigned int    magic,
+		    char *          symbol_name,
+		    char *          source_dll,
+		    unsigned int    ordinal,
+		    unsigned int    types)
+{
+  bfd_byte *               ptr;
+  pe_ILF_vars              vars;
+  struct internal_filehdr  internal_f;
+  unsigned int             import_type;
+  unsigned int             import_name_type;
+  asection_ptr             id4, id5, id6 = NULL, text = NULL;
+  coff_symbol_type **      imp_sym;
+  unsigned int             imp_index;
+
+  /* Decode and verify the types field of the ILF structure.  */
+  import_type = types & 0x3;
+  import_name_type = (types & 0x1c) >> 2;
+
+  switch (import_type)
+    {
+    case IMPORT_CODE:
+    case IMPORT_DATA:
+      break;
+
+    case IMPORT_CONST:
+      /* XXX code yet to be written.  */
+      _bfd_error_handler (_("%B: Unhandled import type; %x"),
+			  abfd, import_type);
+      return FALSE;
+
+    default:
+      _bfd_error_handler (_("%B: Unrecognised import type; %x"),
+			  abfd, import_type);
+      return FALSE;
+    }
+
+  switch (import_name_type)
+    {
+    case IMPORT_ORDINAL:
+    case IMPORT_NAME:
+    case IMPORT_NAME_NOPREFIX:
+    case IMPORT_NAME_UNDECORATE:
+      break;
+
+    default:
+      _bfd_error_handler (_("%B: Unrecognised import name type; %x"),
+			  abfd, import_name_type);
+      return FALSE;
+    }
+
+  /* Initialise local variables.
+
+     Note these are kept in a structure rather than being
+     declared as statics since bfd frowns on global variables.
+
+     We are going to construct the contents of the BFD in memory,
+     so allocate all the space that we will need right now.  */
+  vars.bim
+    = (struct bfd_in_memory *) bfd_malloc ((bfd_size_type) sizeof (*vars.bim));
+  if (vars.bim == NULL)
+    return FALSE;
+
+  ptr = (bfd_byte *) bfd_zmalloc ((bfd_size_type) ILF_DATA_SIZE);
+  vars.bim->buffer = ptr;
+  vars.bim->size   = ILF_DATA_SIZE;
+  if (ptr == NULL)
+    goto error_return;
+
+  /* Initialise the pointers to regions of the memory and the
+     other contents of the pe_ILF_vars structure as well.  */
+  vars.sym_cache = (coff_symbol_type *) ptr;
+  vars.sym_ptr   = (coff_symbol_type *) ptr;
+  vars.sym_index = 0;
+  ptr += SIZEOF_ILF_SYMS;
+
+  vars.sym_table = (unsigned int *) ptr;
+  vars.table_ptr = (unsigned int *) ptr;
+  ptr += SIZEOF_ILF_SYM_TABLE;
+
+  vars.native_syms = (combined_entry_type *) ptr;
+  vars.native_ptr  = (combined_entry_type *) ptr;
+  ptr += SIZEOF_ILF_NATIVE_SYMS;
+
+  vars.sym_ptr_table = (coff_symbol_type **) ptr;
+  vars.sym_ptr_ptr   = (coff_symbol_type **) ptr;
+  ptr += SIZEOF_ILF_SYM_PTR_TABLE;
+
+  vars.esym_table = (SYMENT *) ptr;
+  vars.esym_ptr   = (SYMENT *) ptr;
+  ptr += SIZEOF_ILF_EXT_SYMS;
+
+  vars.reltab   = (arelent *) ptr;
+  vars.relcount = 0;
+  ptr += SIZEOF_ILF_RELOCS;
+
+  vars.int_reltab  = (struct internal_reloc *) ptr;
+  ptr += SIZEOF_ILF_INT_RELOCS;
+
+  vars.string_table = (char *) ptr;
+  vars.string_ptr   = (char *) ptr + STRING_SIZE_SIZE;
+  ptr += SIZEOF_ILF_STRINGS;
+  vars.end_string_ptr = (char *) ptr;
+
+  /* The remaining space in bim->buffer is used
+     by the pe_ILF_make_a_section() function.  */
+  vars.data = ptr;
+  vars.abfd = abfd;
+  vars.sec_index = 0;
+  vars.magic = magic;
+
+  /* Create the initial .idata$<n> sections:
+     [.idata$2:  Import Directory Table -- not needed]
+     .idata$4:  Import Lookup Table
+     .idata$5:  Import Address Table
+
+     Note we do not create a .idata$3 section as this is
+     created for us by the linker script.  */
+  id4 = pe_ILF_make_a_section (& vars, ".idata$4", SIZEOF_IDATA4, 0);
+  id5 = pe_ILF_make_a_section (& vars, ".idata$5", SIZEOF_IDATA5, 0);
+  if (id4 == NULL || id5 == NULL)
+    goto error_return;
+
+  /* Fill in the contents of these sections.  */
+  if (import_name_type == IMPORT_ORDINAL)
+    {
+      if (ordinal == 0)
+	/* XXX - treat as IMPORT_NAME ??? */
+	abort ();
+
+#ifdef COFF_WITH_pex64
+      ((unsigned int *) id4->contents)[0] = ordinal;
+      ((unsigned int *) id4->contents)[1] = 0x80000000;
+      ((unsigned int *) id5->contents)[0] = ordinal;
+      ((unsigned int *) id5->contents)[1] = 0x80000000;
+#else
+      * (unsigned int *) id4->contents = ordinal | 0x80000000;
+      * (unsigned int *) id5->contents = ordinal | 0x80000000;
+#endif
+    }
+  else
+    {
+      char * symbol;
+      unsigned int len;
+
+      /* Create .idata$6 - the Hint Name Table.  */
+      id6 = pe_ILF_make_a_section (& vars, ".idata$6", SIZEOF_IDATA6, 0);
+      if (id6 == NULL)
+	goto error_return;
+
+      /* If necessary, trim the import symbol name.  */
+      symbol = symbol_name;
+
+      /* As used by MS compiler, '_', '@', and '?' are alternative
+	 forms of USER_LABEL_PREFIX, with '?' for c++ mangled names,
+	 '@' used for fastcall (in C),  '_' everywhere else.  Only one
+	 of these is used for a symbol.  We strip this leading char for
+	 IMPORT_NAME_NOPREFIX and IMPORT_NAME_UNDECORATE as per the
+	 PE COFF 6.0 spec (section 8.3, Import Name Type).  */
+
+      if (import_name_type != IMPORT_NAME)
+	{
+	  char c = symbol[0];
+	  
+	  /* Check that we don't remove for targets with empty
+	     USER_LABEL_PREFIX the leading underscore.  */
+	  if ((c == '_' && abfd->xvec->symbol_leading_char != 0)
+	      || c == '@' || c == '?')
+	    symbol++;
+	}
+      
+      len = strlen (symbol);
+      if (import_name_type == IMPORT_NAME_UNDECORATE)
+	{
+	  /* Truncate at the first '@'.  */
+	  char *at = strchr (symbol, '@');
+
+	  if (at != NULL)
+	    len = at - symbol;
+	}
+
+      id6->contents[0] = ordinal & 0xff;
+      id6->contents[1] = ordinal >> 8;
+
+      memcpy ((char *) id6->contents + 2, symbol, len);
+      id6->contents[len + 2] = '\0';
+    }
+
+  if (import_name_type != IMPORT_ORDINAL)
+    {
+      pe_ILF_make_a_reloc (&vars, (bfd_vma) 0, BFD_RELOC_RVA, id6);
+      pe_ILF_save_relocs (&vars, id4);
+
+      pe_ILF_make_a_reloc (&vars, (bfd_vma) 0, BFD_RELOC_RVA, id6);
+      pe_ILF_save_relocs (&vars, id5);
+    }
+
+  /* Create extra sections depending upon the type of import we are dealing with.  */
+  switch (import_type)
+    {
+      int i;
+
+    case IMPORT_CODE:
+      /* Create a .text section.
+	 First we need to look up its contents in the jump table.  */
+      for (i = NUM_ENTRIES (jtab); i--;)
+	{
+	  if (jtab[i].size == 0)
+	    continue;
+	  if (jtab[i].magic == magic)
+	    break;
+	}
+      /* If we did not find a matching entry something is wrong.  */
+      if (i < 0)
+	abort ();
+
+      /* Create the .text section.  */
+      text = pe_ILF_make_a_section (& vars, ".text", jtab[i].size, SEC_CODE);
+      if (text == NULL)
+	goto error_return;
+
+      /* Copy in the jump code.  */
+      memcpy (text->contents, jtab[i].data, jtab[i].size);
+
+      /* Create an import symbol.  */
+      pe_ILF_make_a_symbol (& vars, "__imp_", symbol_name, id5, 0);
+      imp_sym   = vars.sym_ptr_ptr - 1;
+      imp_index = vars.sym_index - 1;
+
+      /* Create a reloc for the data in the text section.  */
+#ifdef MIPS_ARCH_MAGIC_WINCE
+      if (magic == MIPS_ARCH_MAGIC_WINCE)
+	{
+	  pe_ILF_make_a_symbol_reloc (&vars, (bfd_vma) 0, BFD_RELOC_HI16_S,
+				      (struct bfd_symbol **) imp_sym,
+				      imp_index);
+	  pe_ILF_make_a_reloc (&vars, (bfd_vma) 0, BFD_RELOC_LO16, text);
+	  pe_ILF_make_a_symbol_reloc (&vars, (bfd_vma) 4, BFD_RELOC_LO16,
+				      (struct bfd_symbol **) imp_sym,
+				      imp_index);
+	}
+      else
+#endif
+	pe_ILF_make_a_symbol_reloc (&vars, (bfd_vma) jtab[i].offset,
+				    BFD_RELOC_32, (asymbol **) imp_sym,
+				    imp_index);
+
+      pe_ILF_save_relocs (& vars, text);
+      break;
+
+    case IMPORT_DATA:
+      break;
+
+    default:
+      /* XXX code not yet written.  */
+      abort ();
+    }
+
+  /* Initialise the bfd.  */
+  memset (& internal_f, 0, sizeof (internal_f));
+
+  internal_f.f_magic  = magic;
+  internal_f.f_symptr = 0;
+  internal_f.f_nsyms  = 0;
+  internal_f.f_flags  = F_AR32WR | F_LNNO; /* XXX is this correct ?  */
+
+  if (   ! bfd_set_start_address (abfd, (bfd_vma) 0)
+      || ! bfd_coff_set_arch_mach_hook (abfd, & internal_f))
+    goto error_return;
+
+  if (bfd_coff_mkobject_hook (abfd, (void *) & internal_f, NULL) == NULL)
+    goto error_return;
+
+  coff_data (abfd)->pe = 1;
+#ifdef THUMBPEMAGIC
+  if (vars.magic == THUMBPEMAGIC)
+    /* Stop some linker warnings about thumb code not supporting interworking.  */
+    coff_data (abfd)->flags |= F_INTERWORK | F_INTERWORK_SET;
+#endif
+
+  /* Switch from file contents to memory contents.  */
+  bfd_cache_close (abfd);
+
+  abfd->iostream = (void *) vars.bim;
+  abfd->flags |= BFD_IN_MEMORY /* | HAS_LOCALS */;
+  abfd->iovec = &_bfd_memory_iovec;
+  abfd->where = 0;
+  abfd->origin = 0;
+  obj_sym_filepos (abfd) = 0;
+
+  /* Now create a symbol describing the imported value.  */
+  switch (import_type)
+    {
+    case IMPORT_CODE:
+      pe_ILF_make_a_symbol (& vars, "", symbol_name, text,
+			    BSF_NOT_AT_END | BSF_FUNCTION);
+
+      /* Create an import symbol for the DLL, without the
+       .dll suffix.  */
+      ptr = (bfd_byte *) strrchr (source_dll, '.');
+      if (ptr)
+	* ptr = 0;
+      pe_ILF_make_a_symbol (& vars, "__IMPORT_DESCRIPTOR_", source_dll, NULL, 0);
+      if (ptr)
+	* ptr = '.';
+      break;
+
+    case IMPORT_DATA:
+      /* Nothing to do here.  */
+      break;
+
+    default:
+      /* XXX code not yet written.  */
+      abort ();
+    }
+
+  /* Point the bfd at the symbol table.  */
+  obj_symbols (abfd) = vars.sym_cache;
+  bfd_get_symcount (abfd) = vars.sym_index;
+
+  obj_raw_syments (abfd) = vars.native_syms;
+  obj_raw_syment_count (abfd) = vars.sym_index;
+
+  obj_coff_external_syms (abfd) = (void *) vars.esym_table;
+  obj_coff_keep_syms (abfd) = TRUE;
+
+  obj_convert (abfd) = vars.sym_table;
+  obj_conv_table_size (abfd) = vars.sym_index;
+
+  obj_coff_strings (abfd) = vars.string_table;
+  obj_coff_keep_strings (abfd) = TRUE;
+
+  abfd->flags |= HAS_SYMS;
+
+  return TRUE;
+
+ error_return:
+  if (vars.bim->buffer != NULL)
+    free (vars.bim->buffer);
+  free (vars.bim);
+  return FALSE;
+}
+
+/* We have detected a Image Library Format archive element.
+   Decode the element and return the appropriate target.  */
+
+static const bfd_target *
+pe_ILF_object_p (bfd * abfd)
+{
+  bfd_byte        buffer[16];
+  bfd_byte *      ptr;
+  char *          symbol_name;
+  char *          source_dll;
+  unsigned int    machine;
+  bfd_size_type   size;
+  unsigned int    ordinal;
+  unsigned int    types;
+  unsigned int    magic;
+
+  /* Upon entry the first four buyes of the ILF header have
+      already been read.  Now read the rest of the header.  */
+  if (bfd_bread (buffer, (bfd_size_type) 16, abfd) != 16)
+    return NULL;
+
+  ptr = buffer;
+
+  /*  We do not bother to check the version number.
+      version = H_GET_16 (abfd, ptr);  */
+  ptr += 2;
+
+  machine = H_GET_16 (abfd, ptr);
+  ptr += 2;
+
+  /* Check that the machine type is recognised.  */
+  magic = 0;
+
+  switch (machine)
+    {
+    case IMAGE_FILE_MACHINE_UNKNOWN:
+    case IMAGE_FILE_MACHINE_ALPHA:
+    case IMAGE_FILE_MACHINE_ALPHA64:
+    case IMAGE_FILE_MACHINE_IA64:
+      break;
+
+    case IMAGE_FILE_MACHINE_I386:
+#ifdef I386MAGIC
+      magic = I386MAGIC;
+#endif
+      break;
+
+    case IMAGE_FILE_MACHINE_AMD64:
+#ifdef AMD64MAGIC
+      magic = AMD64MAGIC;
+#endif
+      break;
+
+    case IMAGE_FILE_MACHINE_M68K:
+#ifdef MC68AGIC
+      magic = MC68MAGIC;
+#endif
+      break;
+
+    case IMAGE_FILE_MACHINE_R3000:
+    case IMAGE_FILE_MACHINE_R4000:
+    case IMAGE_FILE_MACHINE_R10000:
+
+    case IMAGE_FILE_MACHINE_MIPS16:
+    case IMAGE_FILE_MACHINE_MIPSFPU:
+    case IMAGE_FILE_MACHINE_MIPSFPU16:
+#ifdef MIPS_ARCH_MAGIC_WINCE
+      magic = MIPS_ARCH_MAGIC_WINCE;
+#endif
+      break;
+
+    case IMAGE_FILE_MACHINE_SH3:
+    case IMAGE_FILE_MACHINE_SH4:
+#ifdef SH_ARCH_MAGIC_WINCE
+      magic = SH_ARCH_MAGIC_WINCE;
+#endif
+      break;
+
+    case IMAGE_FILE_MACHINE_ARM:
+#ifdef ARMPEMAGIC
+      magic = ARMPEMAGIC;
+#endif
+      break;
+
+    case IMAGE_FILE_MACHINE_THUMB:
+#ifdef THUMBPEMAGIC
+      {
+	extern const bfd_target TARGET_LITTLE_SYM;
+
+	if (abfd->xvec == & TARGET_LITTLE_SYM)
+	  magic = THUMBPEMAGIC;
+      }
+#endif
+      break;
+
+    case IMAGE_FILE_MACHINE_POWERPC:
+      /* We no longer support PowerPC.  */
+    default:
+      _bfd_error_handler
+	(_("%B: Unrecognised machine type (0x%x)"
+	   " in Import Library Format archive"),
+	 abfd, machine);
+      bfd_set_error (bfd_error_malformed_archive);
+
+      return NULL;
+      break;
+    }
+
+  if (magic == 0)
+    {
+      _bfd_error_handler
+	(_("%B: Recognised but unhandled machine type (0x%x)"
+	   " in Import Library Format archive"),
+	 abfd, machine);
+      bfd_set_error (bfd_error_wrong_format);
+
+      return NULL;
+    }
+
+  /* We do not bother to check the date.
+     date = H_GET_32 (abfd, ptr);  */
+  ptr += 4;
+
+  size = H_GET_32 (abfd, ptr);
+  ptr += 4;
+
+  if (size == 0)
+    {
+      _bfd_error_handler
+	(_("%B: size field is zero in Import Library Format header"), abfd);
+      bfd_set_error (bfd_error_malformed_archive);
+
+      return NULL;
+    }
+
+  ordinal = H_GET_16 (abfd, ptr);
+  ptr += 2;
+
+  types = H_GET_16 (abfd, ptr);
+  /* ptr += 2; */
+
+  /* Now read in the two strings that follow.  */
+  ptr = (bfd_byte *) bfd_alloc (abfd, size);
+  if (ptr == NULL)
+    return NULL;
+
+  if (bfd_bread (ptr, size, abfd) != size)
+    {
+      bfd_release (abfd, ptr);
+      return NULL;
+    }
+
+  symbol_name = (char *) ptr;
+  source_dll  = symbol_name + strlen (symbol_name) + 1;
+
+  /* Verify that the strings are null terminated.  */
+  if (ptr[size - 1] != 0
+      || (bfd_size_type) ((bfd_byte *) source_dll - ptr) >= size)
+    {
+      _bfd_error_handler
+	(_("%B: string not null terminated in ILF object file."), abfd);
+      bfd_set_error (bfd_error_malformed_archive);
+      bfd_release (abfd, ptr);
+      return NULL;
+    }
+
+  /* Now construct the bfd.  */
+  if (! pe_ILF_build_a_bfd (abfd, magic, symbol_name,
+			    source_dll, ordinal, types))
+    {
+      bfd_release (abfd, ptr);
+      return NULL;
+    }
+
+  return abfd->xvec;
+}
+
+static const bfd_target *
+pe_bfd_object_p (bfd * abfd)
+{
+  bfd_byte buffer[4];
+  struct external_PEI_DOS_hdr dos_hdr;
+  struct external_PEI_IMAGE_hdr image_hdr;
+  file_ptr offset;
+
+  /* Detect if this a Microsoft Import Library Format element.  */
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
+      || bfd_bread (buffer, (bfd_size_type) 4, abfd) != 4)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  if (H_GET_32 (abfd, buffer) == 0xffff0000)
+    return pe_ILF_object_p (abfd);
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
+      || bfd_bread (&dos_hdr, (bfd_size_type) sizeof (dos_hdr), abfd)
+	 != sizeof (dos_hdr))
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  /* There are really two magic numbers involved; the magic number
+     that says this is a NT executable (PEI) and the magic number that
+     determines the architecture.  The former is DOSMAGIC, stored in
+     the e_magic field.  The latter is stored in the f_magic field.
+     If the NT magic number isn't valid, the architecture magic number
+     could be mimicked by some other field (specifically, the number
+     of relocs in section 3).  Since this routine can only be called
+     correctly for a PEI file, check the e_magic number here, and, if
+     it doesn't match, clobber the f_magic number so that we don't get
+     a false match.  */
+  if (H_GET_16 (abfd, dos_hdr.e_magic) != DOSMAGIC)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  offset = H_GET_32 (abfd, dos_hdr.e_lfanew);
+  if (bfd_seek (abfd, offset, SEEK_SET) != 0
+      || (bfd_bread (&image_hdr, (bfd_size_type) sizeof (image_hdr), abfd)
+	  != sizeof (image_hdr)))
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  if (H_GET_32 (abfd, image_hdr.nt_signature) != 0x4550)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  /* Here is the hack.  coff_object_p wants to read filhsz bytes to
+     pick up the COFF header for PE, see "struct external_PEI_filehdr"
+     in include/coff/pe.h.  We adjust so that that will work. */
+  if (bfd_seek (abfd, (file_ptr) (offset - sizeof (dos_hdr)), SEEK_SET) != 0)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  return coff_object_p (abfd);
+}
+
+#define coff_object_p pe_bfd_object_p
+#endif /* COFF_IMAGE_WITH_PE */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/plugin.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/plugin.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/plugin.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/plugin.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,524 @@
+/* Plugin support for BFD.
+   Copyright 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "config.h"
+#include "bfd.h"
+
+#if BFD_SUPPORTS_PLUGINS
+
+#include <assert.h>
+#include <dlfcn.h>
+#include <stdarg.h>
+#include "plugin-api.h"
+#include "sysdep.h"
+#include "plugin.h"
+#include "libbfd.h"
+#include "libiberty.h"
+#include <dirent.h>
+
+#define bfd_plugin_close_and_cleanup                  _bfd_generic_close_and_cleanup
+#define bfd_plugin_bfd_free_cached_info               _bfd_generic_bfd_free_cached_info
+#define bfd_plugin_new_section_hook                   _bfd_generic_new_section_hook
+#define bfd_plugin_get_section_contents               _bfd_generic_get_section_contents
+#define bfd_plugin_get_section_contents_in_window     _bfd_generic_get_section_contents_in_window
+#define bfd_plugin_bfd_copy_private_header_data       _bfd_generic_bfd_copy_private_header_data
+#define bfd_plugin_bfd_merge_private_bfd_data         _bfd_generic_bfd_merge_private_bfd_data
+#define bfd_plugin_bfd_copy_private_header_data       _bfd_generic_bfd_copy_private_header_data
+#define bfd_plugin_bfd_set_private_flags              _bfd_generic_bfd_set_private_flags
+#define bfd_plugin_core_file_matches_executable_p     generic_core_file_matches_executable_p
+#define bfd_plugin_bfd_is_local_label_name            _bfd_nosymbols_bfd_is_local_label_name
+#define bfd_plugin_bfd_is_target_special_symbol       ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define bfd_plugin_get_lineno                         _bfd_nosymbols_get_lineno
+#define bfd_plugin_find_nearest_line                  _bfd_nosymbols_find_nearest_line
+#define bfd_plugin_find_inliner_info                  _bfd_nosymbols_find_inliner_info
+#define bfd_plugin_bfd_make_debug_symbol              _bfd_nosymbols_bfd_make_debug_symbol
+#define bfd_plugin_read_minisymbols                   _bfd_generic_read_minisymbols
+#define bfd_plugin_minisymbol_to_symbol               _bfd_generic_minisymbol_to_symbol
+#define bfd_plugin_set_arch_mach                      bfd_default_set_arch_mach
+#define bfd_plugin_set_section_contents               _bfd_generic_set_section_contents
+#define bfd_plugin_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents
+#define bfd_plugin_bfd_relax_section                  bfd_generic_relax_section
+#define bfd_plugin_bfd_link_hash_table_create         _bfd_generic_link_hash_table_create
+#define bfd_plugin_bfd_link_hash_table_free           _bfd_generic_link_hash_table_free
+#define bfd_plugin_bfd_link_add_symbols               _bfd_generic_link_add_symbols
+#define bfd_plugin_bfd_link_just_syms                 _bfd_generic_link_just_syms
+#define bfd_plugin_bfd_final_link                     _bfd_generic_final_link
+#define bfd_plugin_bfd_link_split_section             _bfd_generic_link_split_section
+#define bfd_plugin_bfd_gc_sections                    bfd_generic_gc_sections
+#define bfd_plugin_bfd_lookup_section_flags           bfd_generic_lookup_section_flags
+#define bfd_plugin_bfd_merge_sections                 bfd_generic_merge_sections
+#define bfd_plugin_bfd_is_group_section               bfd_generic_is_group_section
+#define bfd_plugin_bfd_discard_group                  bfd_generic_discard_group
+#define bfd_plugin_section_already_linked             _bfd_generic_section_already_linked
+#define bfd_plugin_bfd_define_common_symbol           bfd_generic_define_common_symbol
+#define bfd_plugin_bfd_copy_link_hash_symbol_type     _bfd_generic_copy_link_hash_symbol_type
+
+static enum ld_plugin_status
+message (int level ATTRIBUTE_UNUSED,
+	 const char * format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  printf ("bfd plugin: ");
+  vprintf (format, args);
+  putchar ('\n');
+  va_end (args);
+  return LDPS_OK;
+}
+
+/* Register a claim-file handler. */
+static ld_plugin_claim_file_handler claim_file;
+
+static enum ld_plugin_status
+register_claim_file (ld_plugin_claim_file_handler handler)
+{
+  claim_file = handler;
+  return LDPS_OK;
+}
+
+static enum ld_plugin_status
+add_symbols (void * handle,
+	     int nsyms,
+	     const struct ld_plugin_symbol * syms)
+{
+  bfd *abfd = handle;
+  struct plugin_data_struct *plugin_data =
+    bfd_alloc (abfd, sizeof (plugin_data_struct));;
+
+  plugin_data->nsyms = nsyms;
+  plugin_data->syms = syms;
+
+  if (nsyms != 0)
+    abfd->flags |= HAS_SYMS;
+
+  abfd->tdata.plugin_data = plugin_data;
+  return LDPS_OK;
+}
+
+static const char *plugin_program_name;
+
+void
+bfd_plugin_set_program_name (const char *program_name)
+{
+  plugin_program_name = program_name;
+}
+
+static int
+try_load_plugin (const char *pname)
+{
+  static void *plugin_handle;
+  int tv_size = 4;
+  struct ld_plugin_tv tv[tv_size];
+  int i;
+  ld_plugin_onload onload;
+  enum ld_plugin_status status;
+
+  plugin_handle = dlopen (pname, RTLD_NOW);
+  if (!plugin_handle)
+    {
+      (*_bfd_error_handler)("%s\n", dlerror ());
+      return 0;
+    }
+
+  onload = dlsym (plugin_handle, "onload");
+  if (!onload)
+    goto err;
+
+  i = 0;
+  tv[i].tv_tag = LDPT_MESSAGE;
+  tv[i].tv_u.tv_message = message;
+
+  ++i;
+  tv[i].tv_tag = LDPT_REGISTER_CLAIM_FILE_HOOK;
+  tv[i].tv_u.tv_register_claim_file = register_claim_file;
+
+  ++i;
+  tv[i].tv_tag = LDPT_ADD_SYMBOLS;
+  tv[i].tv_u.tv_add_symbols = add_symbols;
+
+  ++i;
+  tv[i].tv_tag = LDPT_NULL;
+  tv[i].tv_u.tv_val = 0;
+
+  status = (*onload)(tv);
+
+  if (status != LDPS_OK)
+    goto err;
+
+  if (!claim_file)
+    goto err;
+
+  return 1;
+
+ err:
+  plugin_handle = NULL;
+  return 0;
+}
+
+static const char *plugin_name;
+
+void
+bfd_plugin_set_plugin (const char *p)
+{
+  plugin_name = p;
+}
+
+static int
+load_plugin (void)
+{
+  char *plugin_dir;
+  char *p;
+  DIR *d;
+  struct dirent *ent;
+  int found = 0;
+
+  if (plugin_name)
+    return try_load_plugin (plugin_name);
+
+  if (plugin_program_name == NULL)
+    return 0;
+
+  plugin_dir = concat (BINDIR, "/../lib/bfd-plugins", NULL);
+  p = make_relative_prefix (plugin_program_name,
+			    BINDIR,
+			    plugin_dir);
+  free (plugin_dir);
+  plugin_dir = NULL;
+
+  d = opendir (p);
+  if (!d)
+    goto out;
+
+  while ((ent = readdir (d)))
+    {
+      char *full_name;
+      struct stat s;
+
+      full_name = concat (p, "/", ent->d_name, NULL);
+      if (stat(full_name, &s) == 0 && S_ISREG (s.st_mode))
+	found = try_load_plugin (full_name);
+      free (full_name);
+      if (found)
+	break;
+    }
+
+ out:
+  free (p);
+  if (d)
+    closedir (d);
+
+  return found;
+}
+
+
+static const bfd_target *
+bfd_plugin_object_p (bfd *abfd)
+{
+  int claimed = 0;
+  struct ld_plugin_input_file file;
+  bfd *iobfd;
+  static int have_loaded = 0;
+  static int have_plugin = 0;
+
+  if (!have_loaded)
+    {
+      have_loaded = 1;
+      have_plugin = load_plugin ();
+    }
+  if (!have_plugin)
+    return NULL;
+
+  file.name = abfd->filename;
+
+  if (abfd->my_archive)
+    {
+      iobfd = abfd->my_archive;
+      file.offset = abfd->origin;
+      file.filesize = arelt_size (abfd);
+    }
+  else
+    {
+      iobfd = abfd;
+      file.offset = 0;
+      file.filesize = 0;
+    }
+
+  if (!iobfd->iostream && !bfd_open_file (iobfd))
+    return NULL;
+
+  file.fd = fileno ((FILE *) iobfd->iostream);
+
+  if (!abfd->my_archive)
+    {
+      struct stat stat_buf;
+      if (fstat (file.fd, &stat_buf))
+        return NULL;
+      file.filesize = stat_buf.st_size;
+    }
+
+  file.handle = abfd;
+  off_t cur_offset = lseek(file.fd, 0, SEEK_CUR);
+  claim_file (&file, &claimed);
+  lseek(file.fd, cur_offset, SEEK_SET);
+  if (!claimed)
+    return NULL;
+
+  return abfd->xvec;
+}
+
+/* Copy any private info we understand from the input bfd
+   to the output bfd.  */
+
+static bfd_boolean
+bfd_plugin_bfd_copy_private_bfd_data (bfd *ibfd ATTRIBUTE_UNUSED,
+				      bfd *obfd ATTRIBUTE_UNUSED)
+{
+  BFD_ASSERT (0);
+  return TRUE;
+}
+
+/* Copy any private info we understand from the input section
+   to the output section.  */
+
+static bfd_boolean
+bfd_plugin_bfd_copy_private_section_data (bfd *ibfd ATTRIBUTE_UNUSED,
+					  asection *isection ATTRIBUTE_UNUSED,
+					  bfd *obfd ATTRIBUTE_UNUSED,
+					  asection *osection ATTRIBUTE_UNUSED)
+{
+  BFD_ASSERT (0);
+  return TRUE;
+}
+
+/* Copy any private info we understand from the input symbol
+   to the output symbol.  */
+
+static bfd_boolean
+bfd_plugin_bfd_copy_private_symbol_data (bfd *ibfd ATTRIBUTE_UNUSED,
+					 asymbol *isymbol ATTRIBUTE_UNUSED,
+					 bfd *obfd ATTRIBUTE_UNUSED,
+					 asymbol *osymbol ATTRIBUTE_UNUSED)
+{
+  BFD_ASSERT (0);
+  return TRUE;
+}
+
+static bfd_boolean
+bfd_plugin_bfd_print_private_bfd_data (bfd *abfd ATTRIBUTE_UNUSED, PTR ptr ATTRIBUTE_UNUSED)
+{
+  BFD_ASSERT (0);
+  return TRUE;
+}
+
+static char *
+bfd_plugin_core_file_failing_command (bfd *abfd ATTRIBUTE_UNUSED)
+{
+  BFD_ASSERT (0);
+  return NULL;
+}
+
+static int
+bfd_plugin_core_file_failing_signal (bfd *abfd ATTRIBUTE_UNUSED)
+{
+  BFD_ASSERT (0);
+  return 0;
+}
+
+static int
+bfd_plugin_core_file_pid (bfd *abfd ATTRIBUTE_UNUSED)
+{
+  BFD_ASSERT (0);
+  return 0;
+}
+
+static long
+bfd_plugin_get_symtab_upper_bound (bfd *abfd)
+{
+  struct plugin_data_struct *plugin_data = abfd->tdata.plugin_data;
+  long nsyms = plugin_data->nsyms;
+
+  BFD_ASSERT (nsyms >= 0);
+
+  return ((nsyms + 1) * sizeof (asymbol *));
+}
+
+static flagword
+convert_flags (const struct ld_plugin_symbol *sym)
+{
+ switch (sym->def)
+   { 
+   case LDPK_DEF:
+   case LDPK_COMMON:
+   case LDPK_UNDEF:
+     return BSF_GLOBAL;
+
+   case LDPK_WEAKUNDEF:
+   case LDPK_WEAKDEF:
+     return BSF_GLOBAL | BSF_WEAK;
+
+   default:
+     BFD_ASSERT (0);
+     return 0;
+   }
+}
+
+static long
+bfd_plugin_canonicalize_symtab (bfd *abfd,
+				asymbol **alocation)
+{
+  struct plugin_data_struct *plugin_data = abfd->tdata.plugin_data;
+  long nsyms = plugin_data->nsyms;
+  const struct ld_plugin_symbol *syms = plugin_data->syms;
+  static asection fake_section;
+  static asection fake_common_section;
+  int i;
+
+  fake_section.name = ".text";
+  fake_common_section.flags = SEC_IS_COMMON;
+
+  for (i = 0; i < nsyms; i++)
+    {
+      asymbol *s = bfd_alloc (abfd, sizeof (asymbol)); 
+
+      BFD_ASSERT (s);
+      alocation[i] = s;
+
+      s->the_bfd = abfd;
+      s->name = syms[i].name;
+      s->value = 0;
+      s->flags = convert_flags (&syms[i]);
+      switch (syms[i].def)
+	{
+	case LDPK_COMMON:
+	  s->section = &fake_common_section;
+	  break;
+	case LDPK_UNDEF:
+	case LDPK_WEAKUNDEF:
+	  s->section = bfd_und_section_ptr;
+	  break;
+	case LDPK_DEF:
+	case LDPK_WEAKDEF:
+	  s->section = &fake_section;
+	  break;
+	default:
+	  BFD_ASSERT (0);
+	}
+
+      s->udata.p = (void *) &syms[i];
+    }
+
+  return nsyms;
+}
+
+static void
+bfd_plugin_print_symbol (bfd *abfd ATTRIBUTE_UNUSED,
+			 PTR afile ATTRIBUTE_UNUSED,
+			 asymbol *symbol ATTRIBUTE_UNUSED,
+			 bfd_print_symbol_type how ATTRIBUTE_UNUSED)
+{
+  BFD_ASSERT (0);
+}
+
+static void
+bfd_plugin_get_symbol_info (bfd *abfd ATTRIBUTE_UNUSED,
+			    asymbol *symbol,
+			    symbol_info *ret)
+{
+  bfd_symbol_info (symbol, ret);
+}
+
+/* Make an empty symbol. */
+
+static asymbol *
+bfd_plugin_make_empty_symbol (bfd *abfd)
+{
+  asymbol *new_symbol = bfd_zalloc (abfd, sizeof (asymbol));
+  if (new_symbol == NULL)
+    return new_symbol;
+  new_symbol->the_bfd = abfd;
+  return new_symbol;
+}
+
+static int
+bfd_plugin_sizeof_headers (bfd *a ATTRIBUTE_UNUSED,
+			   struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  BFD_ASSERT (0);
+  return 0;
+}
+
+const bfd_target plugin_vec =
+{
+  "plugin",			/* Name.  */
+  bfd_target_unknown_flavour,
+  BFD_ENDIAN_LITTLE,		/* Target byte order.  */
+  BFD_ENDIAN_LITTLE,		/* Target headers byte order.  */
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED),
+  (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
+   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* Section flags.  */
+  0,				/* symbol_leading_char.  */
+  '/',				/* ar_pad_char.  */
+  15,				/* ar_max_namelen.  */
+  0,				/* match priority.  */
+
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* data */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* hdrs */
+
+  {				/* bfd_check_format.  */
+    _bfd_dummy_target,
+    bfd_plugin_object_p,
+    bfd_generic_archive_p,
+    _bfd_dummy_target
+  },
+  {				/* bfd_set_format.  */
+    bfd_false,
+    bfd_false,
+    _bfd_generic_mkarchive,
+    bfd_false,
+  },
+  {				/* bfd_write_contents.  */
+    bfd_false,
+    bfd_false,
+    _bfd_write_archive_contents,
+    bfd_false,
+  },
+
+  BFD_JUMP_TABLE_GENERIC (bfd_plugin),
+  BFD_JUMP_TABLE_COPY (bfd_plugin),
+  BFD_JUMP_TABLE_CORE (bfd_plugin),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+  BFD_JUMP_TABLE_SYMBOLS (bfd_plugin),
+  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+  BFD_JUMP_TABLE_WRITE (bfd_plugin),
+  BFD_JUMP_TABLE_LINK (bfd_plugin),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  NULL  			/* backend_data.  */
+};
+#endif /* BFD_SUPPORTS_PLUGIN */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/plugin.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/plugin.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/plugin.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/plugin.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,36 @@
+/* Plugin support for BFD.
+   Copyright 2009  Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _PLUGIN_H_
+#define _PLUGIN_H_
+
+#include "bfd.h"
+
+void bfd_plugin_set_program_name (const char *);
+void bfd_plugin_set_plugin (const char *);
+
+typedef struct plugin_data_struct
+{
+  int nsyms;
+  const struct ld_plugin_symbol *syms;
+}
+plugin_data_struct;
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ppcboot.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ppcboot.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ppcboot.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ppcboot.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,550 @@
+/* BFD back-end for PPCbug boot records.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007, 2008, 2009, 2011 Free Software Foundation, Inc.
+   Written by Michael Meissner, Cygnus Support, <meissner@cygnus.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* This is a BFD backend which may be used to write PowerPCBug boot objects.
+   It may only be used for output, not input.  The intention is that this may
+   be used as an output format for objcopy in order to generate raw binary
+   data.
+
+   This is very simple.  The only complication is that the real data
+   will start at some address X, and in some cases we will not want to
+   include X zeroes just to get to that point.  Since the start
+   address is not meaningful for this object file format, we use it
+   instead to indicate the number of zeroes to skip at the start of
+   the file.  objcopy cooperates by specially setting the start
+   address to zero by default.  */
+
+#include "sysdep.h"
+#include "safe-ctype.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+/* PPCbug location structure */
+typedef struct ppcboot_location {
+  bfd_byte	ind;
+  bfd_byte	head;
+  bfd_byte	sector;
+  bfd_byte	cylinder;
+} ppcboot_location_t;
+
+/* PPCbug partition table layout */
+typedef struct ppcboot_partition {
+  ppcboot_location_t	partition_begin;	/* partition begin */
+  ppcboot_location_t	partition_end;		/* partition end */
+  bfd_byte		sector_begin[4];	/* 32-bit start RBA (zero-based), little endian */
+  bfd_byte		sector_length[4];	/* 32-bit RBA count (one-based), little endian */
+} ppcboot_partition_t;
+
+/* PPCbug boot layout.  */
+typedef struct ppcboot_hdr {
+  bfd_byte		pc_compatibility[446];	/* x86 instruction field */
+  ppcboot_partition_t	partition[4];		/* partition information */
+  bfd_byte		signature[2];		/* 0x55 and 0xaa */
+  bfd_byte		entry_offset[4];	/* entry point offset, little endian */
+  bfd_byte		length[4];		/* load image length, little endian */
+  bfd_byte		flags;			/* flag field */
+  bfd_byte		os_id;			/* OS_ID */
+  char			partition_name[32];	/* partition name */
+  bfd_byte		reserved1[470];		/* reserved */
+}
+#ifdef __GNUC__
+  __attribute__ ((packed))
+#endif
+ppcboot_hdr_t;
+
+/* Signature bytes for last 2 bytes of the 512 byte record */
+#define SIGNATURE0 0x55
+#define SIGNATURE1 0xaa
+
+/* PowerPC boot type */
+#define PPC_IND 0x41
+
+/* Information needed for ppcboot header */
+typedef struct ppcboot_data {
+  ppcboot_hdr_t	header;				/* raw header */
+  asection *sec;				/* single section */
+} ppcboot_data_t;
+
+/* Any bfd we create by reading a ppcboot file has three symbols:
+   a start symbol, an end symbol, and an absolute length symbol.  */
+#define PPCBOOT_SYMS 3
+
+static bfd_boolean ppcboot_mkobject PARAMS ((bfd *));
+static const bfd_target *ppcboot_object_p PARAMS ((bfd *));
+static bfd_boolean ppcboot_set_arch_mach
+  PARAMS ((bfd *, enum bfd_architecture, unsigned long));
+static bfd_boolean ppcboot_get_section_contents
+  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
+static long ppcboot_get_symtab_upper_bound PARAMS ((bfd *));
+static char *mangle_name PARAMS ((bfd *, char *));
+static long ppcboot_canonicalize_symtab PARAMS ((bfd *, asymbol **));
+static void ppcboot_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
+static bfd_boolean ppcboot_set_section_contents
+  PARAMS ((bfd *, asection *, const PTR, file_ptr, bfd_size_type));
+static bfd_boolean ppcboot_bfd_print_private_bfd_data PARAMS ((bfd *, PTR));
+
+#define ppcboot_set_tdata(abfd, ptr) ((abfd)->tdata.any = (PTR) (ptr))
+#define ppcboot_get_tdata(abfd) ((ppcboot_data_t *) ((abfd)->tdata.any))
+
+/* Create a ppcboot object.  Invoked via bfd_set_format.  */
+
+static bfd_boolean
+ppcboot_mkobject (abfd)
+     bfd *abfd;
+{
+  if (!ppcboot_get_tdata (abfd))
+    {
+      bfd_size_type amt = sizeof (ppcboot_data_t);
+      ppcboot_set_tdata (abfd, bfd_zalloc (abfd, amt));
+    }
+
+  return TRUE;
+}
+
+
+/* Set the architecture to PowerPC */
+static bfd_boolean
+ppcboot_set_arch_mach (abfd, arch, machine)
+     bfd *abfd;
+     enum bfd_architecture arch;
+     unsigned long machine;
+{
+  if (arch == bfd_arch_unknown)
+    arch = bfd_arch_powerpc;
+
+  else if (arch != bfd_arch_powerpc)
+    return FALSE;
+
+  return bfd_default_set_arch_mach (abfd, arch, machine);
+}
+
+
+/* Any file may be considered to be a ppcboot file, provided the target
+   was not defaulted.  That is, it must be explicitly specified as
+   being ppcboot.  */
+
+static const bfd_target *
+ppcboot_object_p (abfd)
+     bfd *abfd;
+{
+  struct stat statbuf;
+  asection *sec;
+  ppcboot_hdr_t hdr;
+  size_t i;
+  ppcboot_data_t *tdata;
+  flagword flags;
+
+  BFD_ASSERT (sizeof (ppcboot_hdr_t) == 1024);
+
+  if (abfd->target_defaulted)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  /* Find the file size.  */
+  if (bfd_stat (abfd, &statbuf) < 0)
+    {
+      bfd_set_error (bfd_error_system_call);
+      return NULL;
+    }
+
+  if ((size_t) statbuf.st_size < sizeof (ppcboot_hdr_t))
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  if (bfd_bread ((PTR) &hdr, (bfd_size_type) sizeof (hdr), abfd)
+      != sizeof (hdr))
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+
+      return NULL;
+    }
+
+  /* Now do some basic checks.  */
+  for (i = 0; i < sizeof (hdr.pc_compatibility); i++)
+    if (hdr.pc_compatibility[i])
+      {
+	bfd_set_error (bfd_error_wrong_format);
+	return NULL;
+      }
+
+  if (hdr.signature[0] != SIGNATURE0 || hdr.signature[1] != SIGNATURE1)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  if (hdr.partition[0].partition_end.ind != PPC_IND)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  abfd->symcount = PPCBOOT_SYMS;
+
+  /* One data section.  */
+  flags = SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_CODE | SEC_HAS_CONTENTS;
+  sec = bfd_make_section_with_flags (abfd, ".data", flags);
+  if (sec == NULL)
+    return NULL;
+  sec->vma = 0;
+  sec->size = statbuf.st_size - sizeof (ppcboot_hdr_t);
+  sec->filepos = sizeof (ppcboot_hdr_t);
+
+  ppcboot_mkobject (abfd);
+  tdata = ppcboot_get_tdata (abfd);
+  tdata->sec = sec;
+  memcpy ((PTR) &tdata->header, (PTR) &hdr, sizeof (ppcboot_hdr_t));
+
+  ppcboot_set_arch_mach (abfd, bfd_arch_powerpc, 0L);
+  return abfd->xvec;
+}
+
+#define ppcboot_close_and_cleanup _bfd_generic_close_and_cleanup
+#define ppcboot_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
+#define ppcboot_new_section_hook _bfd_generic_new_section_hook
+
+
+/* Get contents of the only section.  */
+
+static bfd_boolean
+ppcboot_get_section_contents (abfd, section, location, offset, count)
+     bfd *abfd;
+     asection *section ATTRIBUTE_UNUSED;
+     PTR location;
+     file_ptr offset;
+     bfd_size_type count;
+{
+  if (bfd_seek (abfd, offset + (file_ptr) sizeof (ppcboot_hdr_t), SEEK_SET) != 0
+      || bfd_bread (location, count, abfd) != count)
+    return FALSE;
+  return TRUE;
+}
+
+
+/* Return the amount of memory needed to read the symbol table.  */
+
+static long
+ppcboot_get_symtab_upper_bound (abfd)
+     bfd *abfd ATTRIBUTE_UNUSED;
+{
+  return (PPCBOOT_SYMS + 1) * sizeof (asymbol *);
+}
+
+
+/* Create a symbol name based on the bfd's filename.  */
+
+static char *
+mangle_name (abfd, suffix)
+     bfd *abfd;
+     char *suffix;
+{
+  bfd_size_type size;
+  char *buf;
+  char *p;
+
+  size = (strlen (bfd_get_filename (abfd))
+	  + strlen (suffix)
+	  + sizeof "_ppcboot__");
+
+  buf = (char *) bfd_alloc (abfd, size);
+  if (buf == NULL)
+    return "";
+
+  sprintf (buf, "_ppcboot_%s_%s", bfd_get_filename (abfd), suffix);
+
+  /* Change any non-alphanumeric characters to underscores.  */
+  for (p = buf; *p; p++)
+    if (! ISALNUM (*p))
+      *p = '_';
+
+  return buf;
+}
+
+
+/* Return the symbol table.  */
+
+static long
+ppcboot_canonicalize_symtab (abfd, alocation)
+     bfd *abfd;
+     asymbol **alocation;
+{
+  asection *sec = ppcboot_get_tdata (abfd)->sec;
+  asymbol *syms;
+  unsigned int i;
+  bfd_size_type amt = PPCBOOT_SYMS * sizeof (asymbol);
+
+  syms = (asymbol *) bfd_alloc (abfd, amt);
+  if (syms == NULL)
+    return FALSE;
+
+  /* Start symbol.  */
+  syms[0].the_bfd = abfd;
+  syms[0].name = mangle_name (abfd, "start");
+  syms[0].value = 0;
+  syms[0].flags = BSF_GLOBAL;
+  syms[0].section = sec;
+  syms[0].udata.p = NULL;
+
+  /* End symbol.  */
+  syms[1].the_bfd = abfd;
+  syms[1].name = mangle_name (abfd, "end");
+  syms[1].value = sec->size;
+  syms[1].flags = BSF_GLOBAL;
+  syms[1].section = sec;
+  syms[1].udata.p = NULL;
+
+  /* Size symbol.  */
+  syms[2].the_bfd = abfd;
+  syms[2].name = mangle_name (abfd, "size");
+  syms[2].value = sec->size;
+  syms[2].flags = BSF_GLOBAL;
+  syms[2].section = bfd_abs_section_ptr;
+  syms[2].udata.p = NULL;
+
+  for (i = 0; i < PPCBOOT_SYMS; i++)
+    *alocation++ = syms++;
+  *alocation = NULL;
+
+  return PPCBOOT_SYMS;
+}
+
+#define ppcboot_make_empty_symbol _bfd_generic_make_empty_symbol
+#define ppcboot_print_symbol _bfd_nosymbols_print_symbol
+
+/* Get information about a symbol.  */
+
+static void
+ppcboot_get_symbol_info (ignore_abfd, symbol, ret)
+     bfd *ignore_abfd ATTRIBUTE_UNUSED;
+     asymbol *symbol;
+     symbol_info *ret;
+{
+  bfd_symbol_info (symbol, ret);
+}
+
+#define ppcboot_bfd_is_target_special_symbol \
+  ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define ppcboot_bfd_is_local_label_name bfd_generic_is_local_label_name
+#define ppcboot_get_lineno _bfd_nosymbols_get_lineno
+#define ppcboot_find_nearest_line _bfd_nosymbols_find_nearest_line
+#define ppcboot_find_inliner_info _bfd_nosymbols_find_inliner_info
+#define ppcboot_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
+#define ppcboot_read_minisymbols _bfd_generic_read_minisymbols
+#define ppcboot_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
+
+/* Write section contents of a ppcboot file.  */
+
+static bfd_boolean
+ppcboot_set_section_contents (abfd, sec, data, offset, size)
+     bfd *abfd;
+     asection *sec;
+     const PTR data;
+     file_ptr offset;
+     bfd_size_type size;
+{
+  if (! abfd->output_has_begun)
+    {
+      bfd_vma low;
+      asection *s;
+
+      /* The lowest section VMA sets the virtual address of the start
+         of the file.  We use the set the file position of all the
+         sections.  */
+      low = abfd->sections->vma;
+      for (s = abfd->sections->next; s != NULL; s = s->next)
+	if (s->vma < low)
+	  low = s->vma;
+
+      for (s = abfd->sections; s != NULL; s = s->next)
+	s->filepos = s->vma - low;
+
+      abfd->output_has_begun = TRUE;
+    }
+
+  return _bfd_generic_set_section_contents (abfd, sec, data, offset, size);
+}
+
+
+static int
+ppcboot_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+			struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return sizeof (ppcboot_hdr_t);
+}
+
+
+/* Print out the program headers.  */
+
+static bfd_boolean
+ppcboot_bfd_print_private_bfd_data (abfd, farg)
+     bfd *abfd;
+     PTR farg;
+{
+  FILE *f = (FILE *)farg;
+  ppcboot_data_t *tdata = ppcboot_get_tdata (abfd);
+  long entry_offset = bfd_getl_signed_32 ((PTR) tdata->header.entry_offset);
+  long length = bfd_getl_signed_32 ((PTR) tdata->header.length);
+  int i;
+
+  fprintf (f, _("\nppcboot header:\n"));
+  fprintf (f, _("Entry offset        = 0x%.8lx (%ld)\n"),
+	   (unsigned long) entry_offset, entry_offset);
+  fprintf (f, _("Length              = 0x%.8lx (%ld)\n"),
+	   (unsigned long) length, length);
+
+  if (tdata->header.flags)
+    fprintf (f, _("Flag field          = 0x%.2x\n"), tdata->header.flags);
+
+  if (tdata->header.os_id)
+    fprintf (f, "OS_ID               = 0x%.2x\n", tdata->header.os_id);
+
+  if (tdata->header.partition_name)
+    fprintf (f, _("Partition name      = \"%s\"\n"), tdata->header.partition_name);
+
+  for (i = 0; i < 4; i++)
+    {
+      long sector_begin  = bfd_getl_signed_32 ((PTR) tdata->header.partition[i].sector_begin);
+      long sector_length = bfd_getl_signed_32 ((PTR) tdata->header.partition[i].sector_length);
+
+      /* Skip all 0 entries */
+      if (!tdata->header.partition[i].partition_begin.ind
+	  && !tdata->header.partition[i].partition_begin.head
+	  && !tdata->header.partition[i].partition_begin.sector
+	  && !tdata->header.partition[i].partition_begin.cylinder
+	  && !tdata->header.partition[i].partition_end.ind
+	  && !tdata->header.partition[i].partition_end.head
+	  && !tdata->header.partition[i].partition_end.sector
+	  && !tdata->header.partition[i].partition_end.cylinder
+	  && !sector_begin && !sector_length)
+	continue;
+
+      fprintf (f, _("\nPartition[%d] start  = { 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x }\n"), i,
+	       tdata->header.partition[i].partition_begin.ind,
+	       tdata->header.partition[i].partition_begin.head,
+	       tdata->header.partition[i].partition_begin.sector,
+	       tdata->header.partition[i].partition_begin.cylinder);
+
+      fprintf (f, _("Partition[%d] end    = { 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x }\n"), i,
+	       tdata->header.partition[i].partition_end.ind,
+	       tdata->header.partition[i].partition_end.head,
+	       tdata->header.partition[i].partition_end.sector,
+	       tdata->header.partition[i].partition_end.cylinder);
+
+      fprintf (f, _("Partition[%d] sector = 0x%.8lx (%ld)\n"),
+	       i, (unsigned long) sector_begin, sector_begin);
+      fprintf (f, _("Partition[%d] length = 0x%.8lx (%ld)\n"),
+	       i, (unsigned long) sector_length, sector_length);
+    }
+
+  fprintf (f, "\n");
+  return TRUE;
+}
+
+
+#define ppcboot_bfd_get_relocated_section_contents \
+  bfd_generic_get_relocated_section_contents
+#define ppcboot_bfd_relax_section bfd_generic_relax_section
+#define ppcboot_bfd_gc_sections bfd_generic_gc_sections
+#define ppcboot_bfd_lookup_section_flags bfd_generic_lookup_section_flags
+#define ppcboot_bfd_merge_sections bfd_generic_merge_sections
+#define ppcboot_bfd_is_group_section bfd_generic_is_group_section
+#define ppcboot_bfd_discard_group bfd_generic_discard_group
+#define ppcboot_section_already_linked \
+  _bfd_generic_section_already_linked
+#define ppcboot_bfd_define_common_symbol bfd_generic_define_common_symbol
+#define ppcboot_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
+#define ppcboot_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
+#define ppcboot_bfd_link_add_symbols _bfd_generic_link_add_symbols
+#define ppcboot_bfd_link_just_syms _bfd_generic_link_just_syms
+#define ppcboot_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define ppcboot_bfd_final_link _bfd_generic_final_link
+#define ppcboot_bfd_link_split_section _bfd_generic_link_split_section
+#define ppcboot_get_section_contents_in_window \
+  _bfd_generic_get_section_contents_in_window
+
+#define ppcboot_bfd_copy_private_bfd_data _bfd_generic_bfd_copy_private_bfd_data
+#define ppcboot_bfd_merge_private_bfd_data _bfd_generic_bfd_merge_private_bfd_data
+#define ppcboot_bfd_copy_private_section_data _bfd_generic_bfd_copy_private_section_data
+#define ppcboot_bfd_copy_private_symbol_data _bfd_generic_bfd_copy_private_symbol_data
+#define ppcboot_bfd_copy_private_header_data _bfd_generic_bfd_copy_private_header_data
+#define ppcboot_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
+#define ppcboot_bfd_print_private_bfd_dat ppcboot_bfd_print_private_bfd_data
+
+const bfd_target ppcboot_vec =
+{
+  "ppcboot",			/* name */
+  bfd_target_unknown_flavour,	/* flavour */
+  BFD_ENDIAN_BIG,		/* byteorder is big endian for code */
+  BFD_ENDIAN_LITTLE,		/* header_byteorder */
+  EXEC_P,			/* object_flags */
+  (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE | SEC_DATA
+   | SEC_ROM | SEC_HAS_CONTENTS), /* section_flags */
+  0,				/* symbol_leading_char */
+  ' ',				/* ar_pad_char */
+  16,				/* ar_max_namelen */
+  0,				/* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* hdrs */
+  {				/* bfd_check_format */
+    _bfd_dummy_target,
+    ppcboot_object_p,		/* bfd_check_format */
+    _bfd_dummy_target,
+    _bfd_dummy_target,
+  },
+  {				/* bfd_set_format */
+    bfd_false,
+    ppcboot_mkobject,
+    bfd_false,
+    bfd_false,
+  },
+  {				/* bfd_write_contents */
+    bfd_false,
+    bfd_true,
+    bfd_false,
+    bfd_false,
+  },
+
+  BFD_JUMP_TABLE_GENERIC (ppcboot),
+  BFD_JUMP_TABLE_COPY (ppcboot),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+  BFD_JUMP_TABLE_SYMBOLS (ppcboot),
+  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+  BFD_JUMP_TABLE_WRITE (ppcboot),
+  BFD_JUMP_TABLE_LINK (ppcboot),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  NULL
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ptrace-core.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ptrace-core.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ptrace-core.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ptrace-core.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,221 @@
+/* BFD backend for core files which use the ptrace_user structure
+   Copyright 1993, 1994, 1995, 1996, 1998, 1999, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007  Free Software Foundation, Inc.
+   The structure of this file is based on trad-core.c written by John Gilmore
+   of Cygnus Support.
+   Modified to work with the ptrace_user structure by Kevin A. Buettner.
+   (Longterm it may be better to merge this file with trad-core.c)
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifdef PTRACE_CORE
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#include <sys/param.h>
+#include <sys/dir.h>
+#include <signal.h>
+#include <sys/ptrace.h>
+
+struct trad_core_struct
+  {
+    asection *data_section;
+    asection *stack_section;
+    asection *reg_section;
+    struct ptrace_user u;
+  };
+
+#define core_upage(bfd) (&((bfd)->tdata.trad_core_data->u))
+#define core_datasec(bfd) ((bfd)->tdata.trad_core_data->data_section)
+#define core_stacksec(bfd) ((bfd)->tdata.trad_core_data->stack_section)
+#define core_regsec(bfd) ((bfd)->tdata.trad_core_data->reg_section)
+
+/* forward declarations */
+
+const bfd_target *ptrace_unix_core_file_p PARAMS ((bfd *abfd));
+char * ptrace_unix_core_file_failing_command PARAMS ((bfd *abfd));
+int ptrace_unix_core_file_failing_signal PARAMS ((bfd *abfd));
+#define ptrace_unix_core_file_matches_executable_p generic_core_file_matches_executable_p
+#define ptrace_unix_core_file_pid _bfd_nocore_core_file_pid
+static void swap_abort PARAMS ((void));
+
+const bfd_target *
+ptrace_unix_core_file_p (abfd)
+     bfd *abfd;
+
+{
+  int val;
+  struct ptrace_user u;
+  struct trad_core_struct *rawptr;
+  bfd_size_type amt;
+  flagword flags;
+
+  val = bfd_bread ((void *)&u, (bfd_size_type) sizeof u, abfd);
+  if (val != sizeof u || u.pt_magic != _BCS_PTRACE_MAGIC
+      || u.pt_rev != _BCS_PTRACE_REV)
+    {
+      /* Too small to be a core file */
+      bfd_set_error (bfd_error_wrong_format);
+      return 0;
+    }
+
+  /* OK, we believe you.  You're a core file (sure, sure).  */
+
+  /* Allocate both the upage and the struct core_data at once, so
+     a single free() will free them both.  */
+  amt = sizeof (struct trad_core_struct);
+  rawptr = (struct trad_core_struct *) bfd_zalloc (abfd, amt);
+
+  if (rawptr == NULL)
+    return 0;
+
+  abfd->tdata.trad_core_data = rawptr;
+
+  rawptr->u = u; /*Copy the uarea into the tdata part of the bfd */
+
+  /* Create the sections.  */
+
+  flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
+  core_stacksec (abfd) = bfd_make_section_anyway_with_flags (abfd, ".stack",
+							     flags);
+  if (core_stacksec (abfd) == NULL)
+    goto fail;
+  core_datasec (abfd) = bfd_make_section_anyway_with_flags (abfd, ".data",
+							    flags);
+  if (core_datasec (abfd) == NULL)
+    goto fail;
+  core_regsec (abfd) = bfd_make_section_anyway_with_flags (abfd, ".reg",
+							   SEC_HAS_CONTENTS);
+  if (core_regsec (abfd) == NULL)
+    goto fail;
+
+  /* FIXME:  Need to worry about shared memory, library data, and library
+     text.  I don't think that any of these things are supported on the
+     system on which I am developing this for though.  */
+
+  core_datasec (abfd)->size =  u.pt_dsize;
+  core_stacksec (abfd)->size = u.pt_ssize;
+  core_regsec (abfd)->size = sizeof (u);
+
+  core_datasec (abfd)->vma = u.pt_o_data_start;
+  core_stacksec (abfd)->vma = USRSTACK - u.pt_ssize;
+  core_regsec (abfd)->vma = 0 - sizeof (u);	/* see trad-core.c */
+
+  core_datasec (abfd)->filepos = (int) u.pt_dataptr;
+  core_stacksec (abfd)->filepos = (int) (u.pt_dataptr + u.pt_dsize);
+  core_regsec (abfd)->filepos = 0; /* Register segment is ptrace_user */
+
+  /* Align to word at least */
+  core_stacksec (abfd)->alignment_power = 2;
+  core_datasec (abfd)->alignment_power = 2;
+  core_regsec (abfd)->alignment_power = 2;
+
+  return abfd->xvec;
+
+ fail:
+  bfd_release (abfd, abfd->tdata.any);
+  abfd->tdata.any = NULL;
+  bfd_section_list_clear (abfd);
+  return NULL;
+}
+
+char *
+ptrace_unix_core_file_failing_command (abfd)
+     bfd *abfd;
+{
+  char *com = abfd->tdata.trad_core_data->u.pt_comm;
+  if (*com)
+    return com;
+  else
+    return 0;
+}
+
+int
+ptrace_unix_core_file_failing_signal (abfd)
+     bfd *abfd;
+{
+  return abfd->tdata.trad_core_data->u.pt_sigframe.sig_num;
+}
+
+/* If somebody calls any byte-swapping routines, shoot them.  */
+static void
+swap_abort ()
+{
+  abort (); /* This way doesn't require any declaration for ANSI to fuck up */
+}
+
+#define	NO_GET ((bfd_vma (*) (const void *)) swap_abort)
+#define	NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
+#define	NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
+#define	NO_GET64 ((bfd_uint64_t (*) (const void *)) swap_abort)
+#define	NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
+#define	NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
+
+const bfd_target ptrace_core_vec =
+  {
+    "trad-core",
+    bfd_target_unknown_flavour,
+    BFD_ENDIAN_UNKNOWN,		/* target byte order */
+    BFD_ENDIAN_UNKNOWN,		/* target headers byte order */
+    (HAS_RELOC | EXEC_P |	/* object flags */
+     HAS_LINENO | HAS_DEBUG |
+     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+    0,			                                   /* symbol prefix */
+    ' ',						   /* ar_pad_char */
+    16,							   /* ar_max_namelen */
+    NO_GET64, NO_GETS64, NO_PUT64,	/* 64 bit data */
+    NO_GET, NO_GETS, NO_PUT,		/* 32 bit data */
+    NO_GET, NO_GETS, NO_PUT,		/* 16 bit data */
+    NO_GET64, NO_GETS64, NO_PUT64,	/* 64 bit hdrs */
+    NO_GET, NO_GETS, NO_PUT,		/* 32 bit hdrs */
+    NO_GET, NO_GETS, NO_PUT,		/* 16 bit hdrs */
+
+    {				/* bfd_check_format */
+      _bfd_dummy_target,		/* unknown format */
+      _bfd_dummy_target,		/* object file */
+      _bfd_dummy_target,		/* archive */
+      ptrace_unix_core_file_p		/* a core file */
+    },
+    {				/* bfd_set_format */
+      bfd_false, bfd_false,
+      bfd_false, bfd_false
+    },
+    {				/* bfd_write_contents */
+      bfd_false, bfd_false,
+      bfd_false, bfd_false
+    },
+
+    BFD_JUMP_TABLE_GENERIC (_bfd_generic),
+    BFD_JUMP_TABLE_COPY (_bfd_generic),
+    BFD_JUMP_TABLE_CORE (ptrace_unix),
+    BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+    BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
+    BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+    BFD_JUMP_TABLE_WRITE (_bfd_generic),
+    BFD_JUMP_TABLE_LINK (_bfd_nolink),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    NULL,
+
+    (PTR) 0			/* backend_data */
+  };
+
+#endif /* PTRACE_CORE */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/reloc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/reloc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/reloc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/reloc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,6295 @@
+/* BFD support for handling relocation entries.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/*
+SECTION
+	Relocations
+
+	BFD maintains relocations in much the same way it maintains
+	symbols: they are left alone until required, then read in
+	en-masse and translated into an internal form.  A common
+	routine <<bfd_perform_relocation>> acts upon the
+	canonical form to do the fixup.
+
+	Relocations are maintained on a per section basis,
+	while symbols are maintained on a per BFD basis.
+
+	All that a back end has to do to fit the BFD interface is to create
+	a <<struct reloc_cache_entry>> for each relocation
+	in a particular section, and fill in the right bits of the structures.
+
+@menu
+@* typedef arelent::
+@* howto manager::
+@end menu
+
+*/
+
+/* DO compile in the reloc_code name table from libbfd.h.  */
+#define _BFD_MAKE_TABLE_bfd_reloc_code_real
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+/*
+DOCDD
+INODE
+	typedef arelent, howto manager, Relocations, Relocations
+
+SUBSECTION
+	typedef arelent
+
+	This is the structure of a relocation entry:
+
+CODE_FRAGMENT
+.
+.typedef enum bfd_reloc_status
+.{
+.  {* No errors detected.  *}
+.  bfd_reloc_ok,
+.
+.  {* The relocation was performed, but there was an overflow.  *}
+.  bfd_reloc_overflow,
+.
+.  {* The address to relocate was not within the section supplied.  *}
+.  bfd_reloc_outofrange,
+.
+.  {* Used by special functions.  *}
+.  bfd_reloc_continue,
+.
+.  {* Unsupported relocation size requested.  *}
+.  bfd_reloc_notsupported,
+.
+.  {* Unused.  *}
+.  bfd_reloc_other,
+.
+.  {* The symbol to relocate against was undefined.  *}
+.  bfd_reloc_undefined,
+.
+.  {* The relocation was performed, but may not be ok - presently
+.     generated only when linking i960 coff files with i960 b.out
+.     symbols.  If this type is returned, the error_message argument
+.     to bfd_perform_relocation will be set.  *}
+.  bfd_reloc_dangerous
+. }
+. bfd_reloc_status_type;
+.
+.
+.typedef struct reloc_cache_entry
+.{
+.  {* A pointer into the canonical table of pointers.  *}
+.  struct bfd_symbol **sym_ptr_ptr;
+.
+.  {* offset in section.  *}
+.  bfd_size_type address;
+.
+.  {* addend for relocation value.  *}
+.  bfd_vma addend;
+.
+.  {* Pointer to how to perform the required relocation.  *}
+.  reloc_howto_type *howto;
+.
+.}
+.arelent;
+.
+*/
+
+/*
+DESCRIPTION
+
+        Here is a description of each of the fields within an <<arelent>>:
+
+        o <<sym_ptr_ptr>>
+
+        The symbol table pointer points to a pointer to the symbol
+        associated with the relocation request.  It is the pointer
+        into the table returned by the back end's
+        <<canonicalize_symtab>> action. @xref{Symbols}. The symbol is
+        referenced through a pointer to a pointer so that tools like
+        the linker can fix up all the symbols of the same name by
+        modifying only one pointer. The relocation routine looks in
+        the symbol and uses the base of the section the symbol is
+        attached to and the value of the symbol as the initial
+        relocation offset. If the symbol pointer is zero, then the
+        section provided is looked up.
+
+        o <<address>>
+
+        The <<address>> field gives the offset in bytes from the base of
+        the section data which owns the relocation record to the first
+        byte of relocatable information. The actual data relocated
+        will be relative to this point; for example, a relocation
+        type which modifies the bottom two bytes of a four byte word
+        would not touch the first byte pointed to in a big endian
+        world.
+
+	o <<addend>>
+
+	The <<addend>> is a value provided by the back end to be added (!)
+	to the relocation offset. Its interpretation is dependent upon
+	the howto. For example, on the 68k the code:
+
+|        char foo[];
+|        main()
+|                {
+|                return foo[0x12345678];
+|                }
+
+        Could be compiled into:
+
+|        linkw fp,#-4
+|        moveb @@#12345678,d0
+|        extbl d0
+|        unlk fp
+|        rts
+
+        This could create a reloc pointing to <<foo>>, but leave the
+        offset in the data, something like:
+
+|RELOCATION RECORDS FOR [.text]:
+|offset   type      value
+|00000006 32        _foo
+|
+|00000000 4e56 fffc          ; linkw fp,#-4
+|00000004 1039 1234 5678     ; moveb @@#12345678,d0
+|0000000a 49c0               ; extbl d0
+|0000000c 4e5e               ; unlk fp
+|0000000e 4e75               ; rts
+
+        Using coff and an 88k, some instructions don't have enough
+        space in them to represent the full address range, and
+        pointers have to be loaded in two parts. So you'd get something like:
+
+|        or.u     r13,r0,hi16(_foo+0x12345678)
+|        ld.b     r2,r13,lo16(_foo+0x12345678)
+|        jmp      r1
+
+        This should create two relocs, both pointing to <<_foo>>, and with
+        0x12340000 in their addend field. The data would consist of:
+
+|RELOCATION RECORDS FOR [.text]:
+|offset   type      value
+|00000002 HVRT16    _foo+0x12340000
+|00000006 LVRT16    _foo+0x12340000
+|
+|00000000 5da05678           ; or.u r13,r0,0x5678
+|00000004 1c4d5678           ; ld.b r2,r13,0x5678
+|00000008 f400c001           ; jmp r1
+
+        The relocation routine digs out the value from the data, adds
+        it to the addend to get the original offset, and then adds the
+        value of <<_foo>>. Note that all 32 bits have to be kept around
+        somewhere, to cope with carry from bit 15 to bit 16.
+
+        One further example is the sparc and the a.out format. The
+        sparc has a similar problem to the 88k, in that some
+        instructions don't have room for an entire offset, but on the
+        sparc the parts are created in odd sized lumps. The designers of
+        the a.out format chose to not use the data within the section
+        for storing part of the offset; all the offset is kept within
+        the reloc. Anything in the data should be ignored.
+
+|        save %sp,-112,%sp
+|        sethi %hi(_foo+0x12345678),%g2
+|        ldsb [%g2+%lo(_foo+0x12345678)],%i0
+|        ret
+|        restore
+
+        Both relocs contain a pointer to <<foo>>, and the offsets
+        contain junk.
+
+|RELOCATION RECORDS FOR [.text]:
+|offset   type      value
+|00000004 HI22      _foo+0x12345678
+|00000008 LO10      _foo+0x12345678
+|
+|00000000 9de3bf90     ; save %sp,-112,%sp
+|00000004 05000000     ; sethi %hi(_foo+0),%g2
+|00000008 f048a000     ; ldsb [%g2+%lo(_foo+0)],%i0
+|0000000c 81c7e008     ; ret
+|00000010 81e80000     ; restore
+
+        o <<howto>>
+
+        The <<howto>> field can be imagined as a
+        relocation instruction. It is a pointer to a structure which
+        contains information on what to do with all of the other
+        information in the reloc record and data section. A back end
+        would normally have a relocation instruction set and turn
+        relocations into pointers to the correct structure on input -
+        but it would be possible to create each howto field on demand.
+
+*/
+
+/*
+SUBSUBSECTION
+	<<enum complain_overflow>>
+
+	Indicates what sort of overflow checking should be done when
+	performing a relocation.
+
+CODE_FRAGMENT
+.
+.enum complain_overflow
+.{
+.  {* Do not complain on overflow.  *}
+.  complain_overflow_dont,
+.
+.  {* Complain if the value overflows when considered as a signed
+.     number one bit larger than the field.  ie. A bitfield of N bits
+.     is allowed to represent -2**n to 2**n-1.  *}
+.  complain_overflow_bitfield,
+.
+.  {* Complain if the value overflows when considered as a signed
+.     number.  *}
+.  complain_overflow_signed,
+.
+.  {* Complain if the value overflows when considered as an
+.     unsigned number.  *}
+.  complain_overflow_unsigned
+.};
+
+*/
+
+/*
+SUBSUBSECTION
+        <<reloc_howto_type>>
+
+        The <<reloc_howto_type>> is a structure which contains all the
+        information that libbfd needs to know to tie up a back end's data.
+
+CODE_FRAGMENT
+.struct bfd_symbol;		{* Forward declaration.  *}
+.
+.struct reloc_howto_struct
+.{
+.  {*  The type field has mainly a documentary use - the back end can
+.      do what it wants with it, though normally the back end's
+.      external idea of what a reloc number is stored
+.      in this field.  For example, a PC relative word relocation
+.      in a coff environment has the type 023 - because that's
+.      what the outside world calls a R_PCRWORD reloc.  *}
+.  unsigned int type;
+.
+.  {*  The value the final relocation is shifted right by.  This drops
+.      unwanted data from the relocation.  *}
+.  unsigned int rightshift;
+.
+.  {*  The size of the item to be relocated.  This is *not* a
+.      power-of-two measure.  To get the number of bytes operated
+.      on by a type of relocation, use bfd_get_reloc_size.  *}
+.  int size;
+.
+.  {*  The number of bits in the item to be relocated.  This is used
+.      when doing overflow checking.  *}
+.  unsigned int bitsize;
+.
+.  {*  The relocation is relative to the field being relocated.  *}
+.  bfd_boolean pc_relative;
+.
+.  {*  The bit position of the reloc value in the destination.
+.      The relocated value is left shifted by this amount.  *}
+.  unsigned int bitpos;
+.
+.  {* What type of overflow error should be checked for when
+.     relocating.  *}
+.  enum complain_overflow complain_on_overflow;
+.
+.  {* If this field is non null, then the supplied function is
+.     called rather than the normal function.  This allows really
+.     strange relocation methods to be accommodated (e.g., i960 callj
+.     instructions).  *}
+.  bfd_reloc_status_type (*special_function)
+.    (bfd *, arelent *, struct bfd_symbol *, void *, asection *,
+.     bfd *, char **);
+.
+.  {* The textual name of the relocation type.  *}
+.  char *name;
+.
+.  {* Some formats record a relocation addend in the section contents
+.     rather than with the relocation.  For ELF formats this is the
+.     distinction between USE_REL and USE_RELA (though the code checks
+.     for USE_REL == 1/0).  The value of this field is TRUE if the
+.     addend is recorded with the section contents; when performing a
+.     partial link (ld -r) the section contents (the data) will be
+.     modified.  The value of this field is FALSE if addends are
+.     recorded with the relocation (in arelent.addend); when performing
+.     a partial link the relocation will be modified.
+.     All relocations for all ELF USE_RELA targets should set this field
+.     to FALSE (values of TRUE should be looked on with suspicion).
+.     However, the converse is not true: not all relocations of all ELF
+.     USE_REL targets set this field to TRUE.  Why this is so is peculiar
+.     to each particular target.  For relocs that aren't used in partial
+.     links (e.g. GOT stuff) it doesn't matter what this is set to.  *}
+.  bfd_boolean partial_inplace;
+.
+.  {* src_mask selects the part of the instruction (or data) to be used
+.     in the relocation sum.  If the target relocations don't have an
+.     addend in the reloc, eg. ELF USE_REL, src_mask will normally equal
+.     dst_mask to extract the addend from the section contents.  If
+.     relocations do have an addend in the reloc, eg. ELF USE_RELA, this
+.     field should be zero.  Non-zero values for ELF USE_RELA targets are
+.     bogus as in those cases the value in the dst_mask part of the
+.     section contents should be treated as garbage.  *}
+.  bfd_vma src_mask;
+.
+.  {* dst_mask selects which parts of the instruction (or data) are
+.     replaced with a relocated value.  *}
+.  bfd_vma dst_mask;
+.
+.  {* When some formats create PC relative instructions, they leave
+.     the value of the pc of the place being relocated in the offset
+.     slot of the instruction, so that a PC relative relocation can
+.     be made just by adding in an ordinary offset (e.g., sun3 a.out).
+.     Some formats leave the displacement part of an instruction
+.     empty (e.g., m88k bcs); this flag signals the fact.  *}
+.  bfd_boolean pcrel_offset;
+.};
+.
+*/
+
+/*
+FUNCTION
+	The HOWTO Macro
+
+DESCRIPTION
+	The HOWTO define is horrible and will go away.
+
+.#define HOWTO(C, R, S, B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC) \
+.  { (unsigned) C, R, S, B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC }
+
+DESCRIPTION
+	And will be replaced with the totally magic way. But for the
+	moment, we are compatible, so do it this way.
+
+.#define NEWHOWTO(FUNCTION, NAME, SIZE, REL, IN) \
+.  HOWTO (0, 0, SIZE, 0, REL, 0, complain_overflow_dont, FUNCTION, \
+.         NAME, FALSE, 0, 0, IN)
+.
+
+DESCRIPTION
+	This is used to fill in an empty howto entry in an array.
+
+.#define EMPTY_HOWTO(C) \
+.  HOWTO ((C), 0, 0, 0, FALSE, 0, complain_overflow_dont, NULL, \
+.         NULL, FALSE, 0, 0, FALSE)
+.
+
+DESCRIPTION
+	Helper routine to turn a symbol into a relocation value.
+
+.#define HOWTO_PREPARE(relocation, symbol)               \
+.  {                                                     \
+.    if (symbol != NULL)                                 \
+.      {                                                 \
+.        if (bfd_is_com_section (symbol->section))       \
+.          {                                             \
+.            relocation = 0;                             \
+.          }                                             \
+.        else                                            \
+.          {                                             \
+.            relocation = symbol->value;                 \
+.          }                                             \
+.      }                                                 \
+.  }
+.
+*/
+
+/*
+FUNCTION
+	bfd_get_reloc_size
+
+SYNOPSIS
+	unsigned int bfd_get_reloc_size (reloc_howto_type *);
+
+DESCRIPTION
+	For a reloc_howto_type that operates on a fixed number of bytes,
+	this returns the number of bytes operated on.
+ */
+
+unsigned int
+bfd_get_reloc_size (reloc_howto_type *howto)
+{
+  switch (howto->size)
+    {
+    case 0: return 1;
+    case 1: return 2;
+    case 2: return 4;
+    case 3: return 0;
+    case 4: return 8;
+    case 8: return 16;
+    case -2: return 4;
+    default: abort ();
+    }
+}
+
+/*
+TYPEDEF
+	arelent_chain
+
+DESCRIPTION
+
+	How relocs are tied together in an <<asection>>:
+
+.typedef struct relent_chain
+.{
+.  arelent relent;
+.  struct relent_chain *next;
+.}
+.arelent_chain;
+.
+*/
+
+/* N_ONES produces N one bits, without overflowing machine arithmetic.  */
+#define N_ONES(n) (((((bfd_vma) 1 << ((n) - 1)) - 1) << 1) | 1)
+
+/*
+FUNCTION
+	bfd_check_overflow
+
+SYNOPSIS
+	bfd_reloc_status_type bfd_check_overflow
+	  (enum complain_overflow how,
+	   unsigned int bitsize,
+	   unsigned int rightshift,
+	   unsigned int addrsize,
+	   bfd_vma relocation);
+
+DESCRIPTION
+	Perform overflow checking on @var{relocation} which has
+	@var{bitsize} significant bits and will be shifted right by
+	@var{rightshift} bits, on a machine with addresses containing
+	@var{addrsize} significant bits.  The result is either of
+	@code{bfd_reloc_ok} or @code{bfd_reloc_overflow}.
+
+*/
+
+bfd_reloc_status_type
+bfd_check_overflow (enum complain_overflow how,
+		    unsigned int bitsize,
+		    unsigned int rightshift,
+		    unsigned int addrsize,
+		    bfd_vma relocation)
+{
+  bfd_vma fieldmask, addrmask, signmask, ss, a;
+  bfd_reloc_status_type flag = bfd_reloc_ok;
+
+  /* Note: BITSIZE should always be <= ADDRSIZE, but in case it's not,
+     we'll be permissive: extra bits in the field mask will
+     automatically extend the address mask for purposes of the
+     overflow check.  */
+  fieldmask = N_ONES (bitsize);
+  signmask = ~fieldmask;
+  addrmask = N_ONES (addrsize) | (fieldmask << rightshift);
+  a = (relocation & addrmask) >> rightshift;;
+
+  switch (how)
+    {
+    case complain_overflow_dont:
+      break;
+
+    case complain_overflow_signed:
+      /* If any sign bits are set, all sign bits must be set.  That
+         is, A must be a valid negative address after shifting.  */
+      signmask = ~ (fieldmask >> 1);
+      /* Fall thru */
+
+    case complain_overflow_bitfield:
+      /* Bitfields are sometimes signed, sometimes unsigned.  We
+	 explicitly allow an address wrap too, which means a bitfield
+	 of n bits is allowed to store -2**n to 2**n-1.  Thus overflow
+	 if the value has some, but not all, bits set outside the
+	 field.  */
+      ss = a & signmask;
+      if (ss != 0 && ss != ((addrmask >> rightshift) & signmask))
+	flag = bfd_reloc_overflow;
+      break;
+
+    case complain_overflow_unsigned:
+      /* We have an overflow if the address does not fit in the field.  */
+      if ((a & signmask) != 0)
+	flag = bfd_reloc_overflow;
+      break;
+
+    default:
+      abort ();
+    }
+
+  return flag;
+}
+
+/*
+FUNCTION
+	bfd_perform_relocation
+
+SYNOPSIS
+	bfd_reloc_status_type bfd_perform_relocation
+          (bfd *abfd,
+           arelent *reloc_entry,
+           void *data,
+           asection *input_section,
+           bfd *output_bfd,
+	   char **error_message);
+
+DESCRIPTION
+	If @var{output_bfd} is supplied to this function, the
+	generated image will be relocatable; the relocations are
+	copied to the output file after they have been changed to
+	reflect the new state of the world. There are two ways of
+	reflecting the results of partial linkage in an output file:
+	by modifying the output data in place, and by modifying the
+	relocation record.  Some native formats (e.g., basic a.out and
+	basic coff) have no way of specifying an addend in the
+	relocation type, so the addend has to go in the output data.
+	This is no big deal since in these formats the output data
+	slot will always be big enough for the addend. Complex reloc
+	types with addends were invented to solve just this problem.
+	The @var{error_message} argument is set to an error message if
+	this return @code{bfd_reloc_dangerous}.
+
+*/
+
+bfd_reloc_status_type
+bfd_perform_relocation (bfd *abfd,
+			arelent *reloc_entry,
+			void *data,
+			asection *input_section,
+			bfd *output_bfd,
+			char **error_message)
+{
+  bfd_vma relocation;
+  bfd_reloc_status_type flag = bfd_reloc_ok;
+  bfd_size_type octets = reloc_entry->address * bfd_octets_per_byte (abfd);
+  bfd_vma output_base = 0;
+  reloc_howto_type *howto = reloc_entry->howto;
+  asection *reloc_target_output_section;
+  asymbol *symbol;
+
+  symbol = *(reloc_entry->sym_ptr_ptr);
+  if (bfd_is_abs_section (symbol->section)
+      && output_bfd != NULL)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  /* If we are not producing relocatable output, return an error if
+     the symbol is not defined.  An undefined weak symbol is
+     considered to have a value of zero (SVR4 ABI, p. 4-27).  */
+  if (bfd_is_und_section (symbol->section)
+      && (symbol->flags & BSF_WEAK) == 0
+      && output_bfd == NULL)
+    flag = bfd_reloc_undefined;
+
+  /* If there is a function supplied to handle this relocation type,
+     call it.  It'll return `bfd_reloc_continue' if further processing
+     can be done.  */
+  if (howto->special_function)
+    {
+      bfd_reloc_status_type cont;
+      cont = howto->special_function (abfd, reloc_entry, symbol, data,
+				      input_section, output_bfd,
+				      error_message);
+      if (cont != bfd_reloc_continue)
+	return cont;
+    }
+
+  /* Is the address of the relocation really within the section?  */
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  /* Work out which section the relocation is targeted at and the
+     initial relocation command value.  */
+
+  /* Get symbol value.  (Common symbols are special.)  */
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  reloc_target_output_section = symbol->section->output_section;
+
+  /* Convert input-section-relative symbol value to absolute.  */
+  if ((output_bfd && ! howto->partial_inplace)
+      || reloc_target_output_section == NULL)
+    output_base = 0;
+  else
+    output_base = reloc_target_output_section->vma;
+
+  relocation += output_base + symbol->section->output_offset;
+
+  /* Add in supplied addend.  */
+  relocation += reloc_entry->addend;
+
+  /* Here the variable relocation holds the final address of the
+     symbol we are relocating against, plus any addend.  */
+
+  if (howto->pc_relative)
+    {
+      /* This is a PC relative relocation.  We want to set RELOCATION
+	 to the distance between the address of the symbol and the
+	 location.  RELOCATION is already the address of the symbol.
+
+	 We start by subtracting the address of the section containing
+	 the location.
+
+	 If pcrel_offset is set, we must further subtract the position
+	 of the location within the section.  Some targets arrange for
+	 the addend to be the negative of the position of the location
+	 within the section; for example, i386-aout does this.  For
+	 i386-aout, pcrel_offset is FALSE.  Some other targets do not
+	 include the position of the location; for example, m88kbcs,
+	 or ELF.  For those targets, pcrel_offset is TRUE.
+
+	 If we are producing relocatable output, then we must ensure
+	 that this reloc will be correctly computed when the final
+	 relocation is done.  If pcrel_offset is FALSE we want to wind
+	 up with the negative of the location within the section,
+	 which means we must adjust the existing addend by the change
+	 in the location within the section.  If pcrel_offset is TRUE
+	 we do not want to adjust the existing addend at all.
+
+	 FIXME: This seems logical to me, but for the case of
+	 producing relocatable output it is not what the code
+	 actually does.  I don't want to change it, because it seems
+	 far too likely that something will break.  */
+
+      relocation -=
+	input_section->output_section->vma + input_section->output_offset;
+
+      if (howto->pcrel_offset)
+	relocation -= reloc_entry->address;
+    }
+
+  if (output_bfd != NULL)
+    {
+      if (! howto->partial_inplace)
+	{
+	  /* This is a partial relocation, and we want to apply the relocation
+	     to the reloc entry rather than the raw data. Modify the reloc
+	     inplace to reflect what we now know.  */
+	  reloc_entry->addend = relocation;
+	  reloc_entry->address += input_section->output_offset;
+	  return flag;
+	}
+      else
+	{
+	  /* This is a partial relocation, but inplace, so modify the
+	     reloc record a bit.
+
+	     If we've relocated with a symbol with a section, change
+	     into a ref to the section belonging to the symbol.  */
+
+	  reloc_entry->address += input_section->output_offset;
+
+	  /* WTF?? */
+	  if (abfd->xvec->flavour == bfd_target_coff_flavour
+	      && strcmp (abfd->xvec->name, "coff-Intel-little") != 0
+	      && strcmp (abfd->xvec->name, "coff-Intel-big") != 0)
+	    {
+	      /* For m68k-coff, the addend was being subtracted twice during
+		 relocation with -r.  Removing the line below this comment
+		 fixes that problem; see PR 2953.
+
+However, Ian wrote the following, regarding removing the line below,
+which explains why it is still enabled:  --djm
+
+If you put a patch like that into BFD you need to check all the COFF
+linkers.  I am fairly certain that patch will break coff-i386 (e.g.,
+SCO); see coff_i386_reloc in coff-i386.c where I worked around the
+problem in a different way.  There may very well be a reason that the
+code works as it does.
+
+Hmmm.  The first obvious point is that bfd_perform_relocation should
+not have any tests that depend upon the flavour.  It's seem like
+entirely the wrong place for such a thing.  The second obvious point
+is that the current code ignores the reloc addend when producing
+relocatable output for COFF.  That's peculiar.  In fact, I really
+have no idea what the point of the line you want to remove is.
+
+A typical COFF reloc subtracts the old value of the symbol and adds in
+the new value to the location in the object file (if it's a pc
+relative reloc it adds the difference between the symbol value and the
+location).  When relocating we need to preserve that property.
+
+BFD handles this by setting the addend to the negative of the old
+value of the symbol.  Unfortunately it handles common symbols in a
+non-standard way (it doesn't subtract the old value) but that's a
+different story (we can't change it without losing backward
+compatibility with old object files) (coff-i386 does subtract the old
+value, to be compatible with existing coff-i386 targets, like SCO).
+
+So everything works fine when not producing relocatable output.  When
+we are producing relocatable output, logically we should do exactly
+what we do when not producing relocatable output.  Therefore, your
+patch is correct.  In fact, it should probably always just set
+reloc_entry->addend to 0 for all cases, since it is, in fact, going to
+add the value into the object file.  This won't hurt the COFF code,
+which doesn't use the addend; I'm not sure what it will do to other
+formats (the thing to check for would be whether any formats both use
+the addend and set partial_inplace).
+
+When I wanted to make coff-i386 produce relocatable output, I ran
+into the problem that you are running into: I wanted to remove that
+line.  Rather than risk it, I made the coff-i386 relocs use a special
+function; it's coff_i386_reloc in coff-i386.c.  The function
+specifically adds the addend field into the object file, knowing that
+bfd_perform_relocation is not going to.  If you remove that line, then
+coff-i386.c will wind up adding the addend field in twice.  It's
+trivial to fix; it just needs to be done.
+
+The problem with removing the line is just that it may break some
+working code.  With BFD it's hard to be sure of anything.  The right
+way to deal with this is simply to build and test at least all the
+supported COFF targets.  It should be straightforward if time and disk
+space consuming.  For each target:
+    1) build the linker
+    2) generate some executable, and link it using -r (I would
+       probably use paranoia.o and link against newlib/libc.a, which
+       for all the supported targets would be available in
+       /usr/cygnus/progressive/H-host/target/lib/libc.a).
+    3) make the change to reloc.c
+    4) rebuild the linker
+    5) repeat step 2
+    6) if the resulting object files are the same, you have at least
+       made it no worse
+    7) if they are different you have to figure out which version is
+       right
+*/
+	      relocation -= reloc_entry->addend;
+	      reloc_entry->addend = 0;
+	    }
+	  else
+	    {
+	      reloc_entry->addend = relocation;
+	    }
+	}
+    }
+  else
+    {
+      reloc_entry->addend = 0;
+    }
+
+  /* FIXME: This overflow checking is incomplete, because the value
+     might have overflowed before we get here.  For a correct check we
+     need to compute the value in a size larger than bitsize, but we
+     can't reasonably do that for a reloc the same size as a host
+     machine word.
+     FIXME: We should also do overflow checking on the result after
+     adding in the value contained in the object file.  */
+  if (howto->complain_on_overflow != complain_overflow_dont
+      && flag == bfd_reloc_ok)
+    flag = bfd_check_overflow (howto->complain_on_overflow,
+			       howto->bitsize,
+			       howto->rightshift,
+			       bfd_arch_bits_per_address (abfd),
+			       relocation);
+
+  /* Either we are relocating all the way, or we don't want to apply
+     the relocation to the reloc entry (probably because there isn't
+     any room in the output format to describe addends to relocs).  */
+
+  /* The cast to bfd_vma avoids a bug in the Alpha OSF/1 C compiler
+     (OSF version 1.3, compiler version 3.11).  It miscompiles the
+     following program:
+
+     struct str
+     {
+       unsigned int i0;
+     } s = { 0 };
+
+     int
+     main ()
+     {
+       unsigned long x;
+
+       x = 0x100000000;
+       x <<= (unsigned long) s.i0;
+       if (x == 0)
+	 printf ("failed\n");
+       else
+	 printf ("succeeded (%lx)\n", x);
+     }
+     */
+
+  relocation >>= (bfd_vma) howto->rightshift;
+
+  /* Shift everything up to where it's going to be used.  */
+  relocation <<= (bfd_vma) howto->bitpos;
+
+  /* Wait for the day when all have the mask in them.  */
+
+  /* What we do:
+     i instruction to be left alone
+     o offset within instruction
+     r relocation offset to apply
+     S src mask
+     D dst mask
+     N ~dst mask
+     A part 1
+     B part 2
+     R result
+
+     Do this:
+     ((  i i i i i o o o o o  from bfd_get<size>
+     and           S S S S S) to get the size offset we want
+     +   r r r r r r r r r r) to get the final value to place
+     and           D D D D D  to chop to right size
+     -----------------------
+     =             A A A A A
+     And this:
+     (   i i i i i o o o o o  from bfd_get<size>
+     and N N N N N          ) get instruction
+     -----------------------
+     =   B B B B B
+
+     And then:
+     (   B B B B B
+     or            A A A A A)
+     -----------------------
+     =   R R R R R R R R R R  put into bfd_put<size>
+     */
+
+#define DOIT(x) \
+  x = ( (x & ~howto->dst_mask) | (((x & howto->src_mask) +  relocation) & howto->dst_mask))
+
+  switch (howto->size)
+    {
+    case 0:
+      {
+	char x = bfd_get_8 (abfd, (char *) data + octets);
+	DOIT (x);
+	bfd_put_8 (abfd, x, (unsigned char *) data + octets);
+      }
+      break;
+
+    case 1:
+      {
+	short x = bfd_get_16 (abfd, (bfd_byte *) data + octets);
+	DOIT (x);
+	bfd_put_16 (abfd, (bfd_vma) x, (unsigned char *) data + octets);
+      }
+      break;
+    case 2:
+      {
+	long x = bfd_get_32 (abfd, (bfd_byte *) data + octets);
+	DOIT (x);
+	bfd_put_32 (abfd, (bfd_vma) x, (bfd_byte *) data + octets);
+      }
+      break;
+    case -2:
+      {
+	long x = bfd_get_32 (abfd, (bfd_byte *) data + octets);
+	relocation = -relocation;
+	DOIT (x);
+	bfd_put_32 (abfd, (bfd_vma) x, (bfd_byte *) data + octets);
+      }
+      break;
+
+    case -1:
+      {
+	long x = bfd_get_16 (abfd, (bfd_byte *) data + octets);
+	relocation = -relocation;
+	DOIT (x);
+	bfd_put_16 (abfd, (bfd_vma) x, (bfd_byte *) data + octets);
+      }
+      break;
+
+    case 3:
+      /* Do nothing */
+      break;
+
+    case 4:
+#ifdef BFD64
+      {
+	bfd_vma x = bfd_get_64 (abfd, (bfd_byte *) data + octets);
+	DOIT (x);
+	bfd_put_64 (abfd, x, (bfd_byte *) data + octets);
+      }
+#else
+      abort ();
+#endif
+      break;
+    default:
+      return bfd_reloc_other;
+    }
+
+  return flag;
+}
+
+/*
+FUNCTION
+	bfd_install_relocation
+
+SYNOPSIS
+	bfd_reloc_status_type bfd_install_relocation
+          (bfd *abfd,
+           arelent *reloc_entry,
+           void *data, bfd_vma data_start,
+           asection *input_section,
+	   char **error_message);
+
+DESCRIPTION
+	This looks remarkably like <<bfd_perform_relocation>>, except it
+	does not expect that the section contents have been filled in.
+	I.e., it's suitable for use when creating, rather than applying
+	a relocation.
+
+	For now, this function should be considered reserved for the
+	assembler.
+*/
+
+bfd_reloc_status_type
+bfd_install_relocation (bfd *abfd,
+			arelent *reloc_entry,
+			void *data_start,
+			bfd_vma data_start_offset,
+			asection *input_section,
+			char **error_message)
+{
+  bfd_vma relocation;
+  bfd_reloc_status_type flag = bfd_reloc_ok;
+  bfd_size_type octets = reloc_entry->address * bfd_octets_per_byte (abfd);
+  bfd_vma output_base = 0;
+  reloc_howto_type *howto = reloc_entry->howto;
+  asection *reloc_target_output_section;
+  asymbol *symbol;
+  bfd_byte *data;
+
+  symbol = *(reloc_entry->sym_ptr_ptr);
+  if (bfd_is_abs_section (symbol->section))
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  /* If there is a function supplied to handle this relocation type,
+     call it.  It'll return `bfd_reloc_continue' if further processing
+     can be done.  */
+  if (howto->special_function)
+    {
+      bfd_reloc_status_type cont;
+
+      /* XXX - The special_function calls haven't been fixed up to deal
+	 with creating new relocations and section contents.  */
+      cont = howto->special_function (abfd, reloc_entry, symbol,
+				      /* XXX - Non-portable! */
+				      ((bfd_byte *) data_start
+				       - data_start_offset),
+				      input_section, abfd, error_message);
+      if (cont != bfd_reloc_continue)
+	return cont;
+    }
+
+  /* Is the address of the relocation really within the section?  */
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  /* Work out which section the relocation is targeted at and the
+     initial relocation command value.  */
+
+  /* Get symbol value.  (Common symbols are special.)  */
+  if (bfd_is_com_section (symbol->section))
+    relocation = 0;
+  else
+    relocation = symbol->value;
+
+  reloc_target_output_section = symbol->section->output_section;
+
+  /* Convert input-section-relative symbol value to absolute.  */
+  if (! howto->partial_inplace)
+    output_base = 0;
+  else
+    output_base = reloc_target_output_section->vma;
+
+  relocation += output_base + symbol->section->output_offset;
+
+  /* Add in supplied addend.  */
+  relocation += reloc_entry->addend;
+
+  /* Here the variable relocation holds the final address of the
+     symbol we are relocating against, plus any addend.  */
+
+  if (howto->pc_relative)
+    {
+      /* This is a PC relative relocation.  We want to set RELOCATION
+	 to the distance between the address of the symbol and the
+	 location.  RELOCATION is already the address of the symbol.
+
+	 We start by subtracting the address of the section containing
+	 the location.
+
+	 If pcrel_offset is set, we must further subtract the position
+	 of the location within the section.  Some targets arrange for
+	 the addend to be the negative of the position of the location
+	 within the section; for example, i386-aout does this.  For
+	 i386-aout, pcrel_offset is FALSE.  Some other targets do not
+	 include the position of the location; for example, m88kbcs,
+	 or ELF.  For those targets, pcrel_offset is TRUE.
+
+	 If we are producing relocatable output, then we must ensure
+	 that this reloc will be correctly computed when the final
+	 relocation is done.  If pcrel_offset is FALSE we want to wind
+	 up with the negative of the location within the section,
+	 which means we must adjust the existing addend by the change
+	 in the location within the section.  If pcrel_offset is TRUE
+	 we do not want to adjust the existing addend at all.
+
+	 FIXME: This seems logical to me, but for the case of
+	 producing relocatable output it is not what the code
+	 actually does.  I don't want to change it, because it seems
+	 far too likely that something will break.  */
+
+      relocation -=
+	input_section->output_section->vma + input_section->output_offset;
+
+      if (howto->pcrel_offset && howto->partial_inplace)
+	relocation -= reloc_entry->address;
+    }
+
+  if (! howto->partial_inplace)
+    {
+      /* This is a partial relocation, and we want to apply the relocation
+	 to the reloc entry rather than the raw data. Modify the reloc
+	 inplace to reflect what we now know.  */
+      reloc_entry->addend = relocation;
+      reloc_entry->address += input_section->output_offset;
+      return flag;
+    }
+  else
+    {
+      /* This is a partial relocation, but inplace, so modify the
+	 reloc record a bit.
+
+	 If we've relocated with a symbol with a section, change
+	 into a ref to the section belonging to the symbol.  */
+      reloc_entry->address += input_section->output_offset;
+
+      /* WTF?? */
+      if (abfd->xvec->flavour == bfd_target_coff_flavour
+	  && strcmp (abfd->xvec->name, "coff-Intel-little") != 0
+	  && strcmp (abfd->xvec->name, "coff-Intel-big") != 0)
+	{
+
+	  /* For m68k-coff, the addend was being subtracted twice during
+	     relocation with -r.  Removing the line below this comment
+	     fixes that problem; see PR 2953.
+
+However, Ian wrote the following, regarding removing the line below,
+which explains why it is still enabled:  --djm
+
+If you put a patch like that into BFD you need to check all the COFF
+linkers.  I am fairly certain that patch will break coff-i386 (e.g.,
+SCO); see coff_i386_reloc in coff-i386.c where I worked around the
+problem in a different way.  There may very well be a reason that the
+code works as it does.
+
+Hmmm.  The first obvious point is that bfd_install_relocation should
+not have any tests that depend upon the flavour.  It's seem like
+entirely the wrong place for such a thing.  The second obvious point
+is that the current code ignores the reloc addend when producing
+relocatable output for COFF.  That's peculiar.  In fact, I really
+have no idea what the point of the line you want to remove is.
+
+A typical COFF reloc subtracts the old value of the symbol and adds in
+the new value to the location in the object file (if it's a pc
+relative reloc it adds the difference between the symbol value and the
+location).  When relocating we need to preserve that property.
+
+BFD handles this by setting the addend to the negative of the old
+value of the symbol.  Unfortunately it handles common symbols in a
+non-standard way (it doesn't subtract the old value) but that's a
+different story (we can't change it without losing backward
+compatibility with old object files) (coff-i386 does subtract the old
+value, to be compatible with existing coff-i386 targets, like SCO).
+
+So everything works fine when not producing relocatable output.  When
+we are producing relocatable output, logically we should do exactly
+what we do when not producing relocatable output.  Therefore, your
+patch is correct.  In fact, it should probably always just set
+reloc_entry->addend to 0 for all cases, since it is, in fact, going to
+add the value into the object file.  This won't hurt the COFF code,
+which doesn't use the addend; I'm not sure what it will do to other
+formats (the thing to check for would be whether any formats both use
+the addend and set partial_inplace).
+
+When I wanted to make coff-i386 produce relocatable output, I ran
+into the problem that you are running into: I wanted to remove that
+line.  Rather than risk it, I made the coff-i386 relocs use a special
+function; it's coff_i386_reloc in coff-i386.c.  The function
+specifically adds the addend field into the object file, knowing that
+bfd_install_relocation is not going to.  If you remove that line, then
+coff-i386.c will wind up adding the addend field in twice.  It's
+trivial to fix; it just needs to be done.
+
+The problem with removing the line is just that it may break some
+working code.  With BFD it's hard to be sure of anything.  The right
+way to deal with this is simply to build and test at least all the
+supported COFF targets.  It should be straightforward if time and disk
+space consuming.  For each target:
+    1) build the linker
+    2) generate some executable, and link it using -r (I would
+       probably use paranoia.o and link against newlib/libc.a, which
+       for all the supported targets would be available in
+       /usr/cygnus/progressive/H-host/target/lib/libc.a).
+    3) make the change to reloc.c
+    4) rebuild the linker
+    5) repeat step 2
+    6) if the resulting object files are the same, you have at least
+       made it no worse
+    7) if they are different you have to figure out which version is
+       right.  */
+	  relocation -= reloc_entry->addend;
+	  /* FIXME: There should be no target specific code here...  */
+	  if (strcmp (abfd->xvec->name, "coff-z8k") != 0)
+	    reloc_entry->addend = 0;
+	}
+      else
+	{
+	  reloc_entry->addend = relocation;
+	}
+    }
+
+  /* FIXME: This overflow checking is incomplete, because the value
+     might have overflowed before we get here.  For a correct check we
+     need to compute the value in a size larger than bitsize, but we
+     can't reasonably do that for a reloc the same size as a host
+     machine word.
+     FIXME: We should also do overflow checking on the result after
+     adding in the value contained in the object file.  */
+  if (howto->complain_on_overflow != complain_overflow_dont)
+    flag = bfd_check_overflow (howto->complain_on_overflow,
+			       howto->bitsize,
+			       howto->rightshift,
+			       bfd_arch_bits_per_address (abfd),
+			       relocation);
+
+  /* Either we are relocating all the way, or we don't want to apply
+     the relocation to the reloc entry (probably because there isn't
+     any room in the output format to describe addends to relocs).  */
+
+  /* The cast to bfd_vma avoids a bug in the Alpha OSF/1 C compiler
+     (OSF version 1.3, compiler version 3.11).  It miscompiles the
+     following program:
+
+     struct str
+     {
+       unsigned int i0;
+     } s = { 0 };
+
+     int
+     main ()
+     {
+       unsigned long x;
+
+       x = 0x100000000;
+       x <<= (unsigned long) s.i0;
+       if (x == 0)
+	 printf ("failed\n");
+       else
+	 printf ("succeeded (%lx)\n", x);
+     }
+     */
+
+  relocation >>= (bfd_vma) howto->rightshift;
+
+  /* Shift everything up to where it's going to be used.  */
+  relocation <<= (bfd_vma) howto->bitpos;
+
+  /* Wait for the day when all have the mask in them.  */
+
+  /* What we do:
+     i instruction to be left alone
+     o offset within instruction
+     r relocation offset to apply
+     S src mask
+     D dst mask
+     N ~dst mask
+     A part 1
+     B part 2
+     R result
+
+     Do this:
+     ((  i i i i i o o o o o  from bfd_get<size>
+     and           S S S S S) to get the size offset we want
+     +   r r r r r r r r r r) to get the final value to place
+     and           D D D D D  to chop to right size
+     -----------------------
+     =             A A A A A
+     And this:
+     (   i i i i i o o o o o  from bfd_get<size>
+     and N N N N N          ) get instruction
+     -----------------------
+     =   B B B B B
+
+     And then:
+     (   B B B B B
+     or            A A A A A)
+     -----------------------
+     =   R R R R R R R R R R  put into bfd_put<size>
+     */
+
+#define DOIT(x) \
+  x = ( (x & ~howto->dst_mask) | (((x & howto->src_mask) +  relocation) & howto->dst_mask))
+
+  data = (bfd_byte *) data_start + (octets - data_start_offset);
+
+  switch (howto->size)
+    {
+    case 0:
+      {
+	char x = bfd_get_8 (abfd, data);
+	DOIT (x);
+	bfd_put_8 (abfd, x, data);
+      }
+      break;
+
+    case 1:
+      {
+	short x = bfd_get_16 (abfd, data);
+	DOIT (x);
+	bfd_put_16 (abfd, (bfd_vma) x, data);
+      }
+      break;
+    case 2:
+      {
+	long x = bfd_get_32 (abfd, data);
+	DOIT (x);
+	bfd_put_32 (abfd, (bfd_vma) x, data);
+      }
+      break;
+    case -2:
+      {
+	long x = bfd_get_32 (abfd, data);
+	relocation = -relocation;
+	DOIT (x);
+	bfd_put_32 (abfd, (bfd_vma) x, data);
+      }
+      break;
+
+    case 3:
+      /* Do nothing */
+      break;
+
+    case 4:
+      {
+	bfd_vma x = bfd_get_64 (abfd, data);
+	DOIT (x);
+	bfd_put_64 (abfd, x, data);
+      }
+      break;
+    default:
+      return bfd_reloc_other;
+    }
+
+  return flag;
+}
+
+/* This relocation routine is used by some of the backend linkers.
+   They do not construct asymbol or arelent structures, so there is no
+   reason for them to use bfd_perform_relocation.  Also,
+   bfd_perform_relocation is so hacked up it is easier to write a new
+   function than to try to deal with it.
+
+   This routine does a final relocation.  Whether it is useful for a
+   relocatable link depends upon how the object format defines
+   relocations.
+
+   FIXME: This routine ignores any special_function in the HOWTO,
+   since the existing special_function values have been written for
+   bfd_perform_relocation.
+
+   HOWTO is the reloc howto information.
+   INPUT_BFD is the BFD which the reloc applies to.
+   INPUT_SECTION is the section which the reloc applies to.
+   CONTENTS is the contents of the section.
+   ADDRESS is the address of the reloc within INPUT_SECTION.
+   VALUE is the value of the symbol the reloc refers to.
+   ADDEND is the addend of the reloc.  */
+
+bfd_reloc_status_type
+_bfd_final_link_relocate (reloc_howto_type *howto,
+			  bfd *input_bfd,
+			  asection *input_section,
+			  bfd_byte *contents,
+			  bfd_vma address,
+			  bfd_vma value,
+			  bfd_vma addend)
+{
+  bfd_vma relocation;
+
+  /* Sanity check the address.  */
+  if (address > bfd_get_section_limit (input_bfd, input_section))
+    return bfd_reloc_outofrange;
+
+  /* This function assumes that we are dealing with a basic relocation
+     against a symbol.  We want to compute the value of the symbol to
+     relocate to.  This is just VALUE, the value of the symbol, plus
+     ADDEND, any addend associated with the reloc.  */
+  relocation = value + addend;
+
+  /* If the relocation is PC relative, we want to set RELOCATION to
+     the distance between the symbol (currently in RELOCATION) and the
+     location we are relocating.  Some targets (e.g., i386-aout)
+     arrange for the contents of the section to be the negative of the
+     offset of the location within the section; for such targets
+     pcrel_offset is FALSE.  Other targets (e.g., m88kbcs or ELF)
+     simply leave the contents of the section as zero; for such
+     targets pcrel_offset is TRUE.  If pcrel_offset is FALSE we do not
+     need to subtract out the offset of the location within the
+     section (which is just ADDRESS).  */
+  if (howto->pc_relative)
+    {
+      relocation -= (input_section->output_section->vma
+		     + input_section->output_offset);
+      if (howto->pcrel_offset)
+	relocation -= address;
+    }
+
+  return _bfd_relocate_contents (howto, input_bfd, relocation,
+				 contents + address);
+}
+
+/* Relocate a given location using a given value and howto.  */
+
+bfd_reloc_status_type
+_bfd_relocate_contents (reloc_howto_type *howto,
+			bfd *input_bfd,
+			bfd_vma relocation,
+			bfd_byte *location)
+{
+  int size;
+  bfd_vma x = 0;
+  bfd_reloc_status_type flag;
+  unsigned int rightshift = howto->rightshift;
+  unsigned int bitpos = howto->bitpos;
+
+  /* If the size is negative, negate RELOCATION.  This isn't very
+     general.  */
+  if (howto->size < 0)
+    relocation = -relocation;
+
+  /* Get the value we are going to relocate.  */
+  size = bfd_get_reloc_size (howto);
+  switch (size)
+    {
+    default:
+    case 0:
+      abort ();
+    case 1:
+      x = bfd_get_8 (input_bfd, location);
+      break;
+    case 2:
+      x = bfd_get_16 (input_bfd, location);
+      break;
+    case 4:
+      x = bfd_get_32 (input_bfd, location);
+      break;
+    case 8:
+#ifdef BFD64
+      x = bfd_get_64 (input_bfd, location);
+#else
+      abort ();
+#endif
+      break;
+    }
+
+  /* Check for overflow.  FIXME: We may drop bits during the addition
+     which we don't check for.  We must either check at every single
+     operation, which would be tedious, or we must do the computations
+     in a type larger than bfd_vma, which would be inefficient.  */
+  flag = bfd_reloc_ok;
+  if (howto->complain_on_overflow != complain_overflow_dont)
+    {
+      bfd_vma addrmask, fieldmask, signmask, ss;
+      bfd_vma a, b, sum;
+
+      /* Get the values to be added together.  For signed and unsigned
+         relocations, we assume that all values should be truncated to
+         the size of an address.  For bitfields, all the bits matter.
+         See also bfd_check_overflow.  */
+      fieldmask = N_ONES (howto->bitsize);
+      signmask = ~fieldmask;
+      addrmask = (N_ONES (bfd_arch_bits_per_address (input_bfd))
+		  | (fieldmask << rightshift));
+      a = (relocation & addrmask) >> rightshift;
+      b = (x & howto->src_mask & addrmask) >> bitpos;
+      addrmask >>= rightshift;
+
+      switch (howto->complain_on_overflow)
+	{
+	case complain_overflow_signed:
+	  /* If any sign bits are set, all sign bits must be set.
+	     That is, A must be a valid negative address after
+	     shifting.  */
+	  signmask = ~(fieldmask >> 1);
+	  /* Fall thru */
+
+	case complain_overflow_bitfield:
+	  /* Much like the signed check, but for a field one bit
+	     wider.  We allow a bitfield to represent numbers in the
+	     range -2**n to 2**n-1, where n is the number of bits in the
+	     field.  Note that when bfd_vma is 32 bits, a 32-bit reloc
+	     can't overflow, which is exactly what we want.  */
+	  ss = a & signmask;
+	  if (ss != 0 && ss != (addrmask & signmask))
+	    flag = bfd_reloc_overflow;
+
+	  /* We only need this next bit of code if the sign bit of B
+             is below the sign bit of A.  This would only happen if
+             SRC_MASK had fewer bits than BITSIZE.  Note that if
+             SRC_MASK has more bits than BITSIZE, we can get into
+             trouble; we would need to verify that B is in range, as
+             we do for A above.  */
+	  ss = ((~howto->src_mask) >> 1) & howto->src_mask;
+	  ss >>= bitpos;
+
+	  /* Set all the bits above the sign bit.  */
+	  b = (b ^ ss) - ss;
+
+	  /* Now we can do the addition.  */
+	  sum = a + b;
+
+	  /* See if the result has the correct sign.  Bits above the
+             sign bit are junk now; ignore them.  If the sum is
+             positive, make sure we did not have all negative inputs;
+             if the sum is negative, make sure we did not have all
+             positive inputs.  The test below looks only at the sign
+             bits, and it really just
+	         SIGN (A) == SIGN (B) && SIGN (A) != SIGN (SUM)
+
+	     We mask with addrmask here to explicitly allow an address
+	     wrap-around.  The Linux kernel relies on it, and it is
+	     the only way to write assembler code which can run when
+	     loaded at a location 0x80000000 away from the location at
+	     which it is linked.  */
+	  if (((~(a ^ b)) & (a ^ sum)) & signmask & addrmask)
+	    flag = bfd_reloc_overflow;
+	  break;
+
+	case complain_overflow_unsigned:
+	  /* Checking for an unsigned overflow is relatively easy:
+             trim the addresses and add, and trim the result as well.
+             Overflow is normally indicated when the result does not
+             fit in the field.  However, we also need to consider the
+             case when, e.g., fieldmask is 0x7fffffff or smaller, an
+             input is 0x80000000, and bfd_vma is only 32 bits; then we
+             will get sum == 0, but there is an overflow, since the
+             inputs did not fit in the field.  Instead of doing a
+             separate test, we can check for this by or-ing in the
+             operands when testing for the sum overflowing its final
+             field.  */
+	  sum = (a + b) & addrmask;
+	  if ((a | b | sum) & signmask)
+	    flag = bfd_reloc_overflow;
+	  break;
+
+	default:
+	  abort ();
+	}
+    }
+
+  /* Put RELOCATION in the right bits.  */
+  relocation >>= (bfd_vma) rightshift;
+  relocation <<= (bfd_vma) bitpos;
+
+  /* Add RELOCATION to the right bits of X.  */
+  x = ((x & ~howto->dst_mask)
+       | (((x & howto->src_mask) + relocation) & howto->dst_mask));
+
+  /* Put the relocated value back in the object file.  */
+  switch (size)
+    {
+    default:
+      abort ();
+    case 1:
+      bfd_put_8 (input_bfd, x, location);
+      break;
+    case 2:
+      bfd_put_16 (input_bfd, x, location);
+      break;
+    case 4:
+      bfd_put_32 (input_bfd, x, location);
+      break;
+    case 8:
+#ifdef BFD64
+      bfd_put_64 (input_bfd, x, location);
+#else
+      abort ();
+#endif
+      break;
+    }
+
+  return flag;
+}
+
+/* Clear a given location using a given howto, by applying a fixed relocation
+   value and discarding any in-place addend.  This is used for fixed-up
+   relocations against discarded symbols, to make ignorable debug or unwind
+   information more obvious.  */
+
+void
+_bfd_clear_contents (reloc_howto_type *howto,
+		     bfd *input_bfd,
+		     asection *input_section,
+		     bfd_byte *location)
+{
+  int size;
+  bfd_vma x = 0;
+
+  /* Get the value we are going to relocate.  */
+  size = bfd_get_reloc_size (howto);
+  switch (size)
+    {
+    default:
+    case 0:
+      abort ();
+    case 1:
+      x = bfd_get_8 (input_bfd, location);
+      break;
+    case 2:
+      x = bfd_get_16 (input_bfd, location);
+      break;
+    case 4:
+      x = bfd_get_32 (input_bfd, location);
+      break;
+    case 8:
+#ifdef BFD64
+      x = bfd_get_64 (input_bfd, location);
+#else
+      abort ();
+#endif
+      break;
+    }
+
+  /* Zero out the unwanted bits of X.  */
+  x &= ~howto->dst_mask;
+
+  /* For a range list, use 1 instead of 0 as placeholder.  0
+     would terminate the list, hiding any later entries.  */
+  if (strcmp (bfd_get_section_name (input_bfd, input_section),
+	      ".debug_ranges") == 0
+      && (howto->dst_mask & 1) != 0)
+    x |= 1;
+
+  /* Put the relocated value back in the object file.  */
+  switch (size)
+    {
+    default:
+    case 0:
+      abort ();
+    case 1:
+      bfd_put_8 (input_bfd, x, location);
+      break;
+    case 2:
+      bfd_put_16 (input_bfd, x, location);
+      break;
+    case 4:
+      bfd_put_32 (input_bfd, x, location);
+      break;
+    case 8:
+#ifdef BFD64
+      bfd_put_64 (input_bfd, x, location);
+#else
+      abort ();
+#endif
+      break;
+    }
+}
+
+/*
+DOCDD
+INODE
+	howto manager,  , typedef arelent, Relocations
+
+SUBSECTION
+	The howto manager
+
+	When an application wants to create a relocation, but doesn't
+	know what the target machine might call it, it can find out by
+	using this bit of code.
+
+*/
+
+/*
+TYPEDEF
+	bfd_reloc_code_type
+
+DESCRIPTION
+	The insides of a reloc code.  The idea is that, eventually, there
+	will be one enumerator for every type of relocation we ever do.
+	Pass one of these values to <<bfd_reloc_type_lookup>>, and it'll
+	return a howto pointer.
+
+	This does mean that the application must determine the correct
+	enumerator value; you can't get a howto pointer from a random set
+	of attributes.
+
+SENUM
+   bfd_reloc_code_real
+
+ENUM
+  BFD_RELOC_64
+ENUMX
+  BFD_RELOC_32
+ENUMX
+  BFD_RELOC_26
+ENUMX
+  BFD_RELOC_24
+ENUMX
+  BFD_RELOC_16
+ENUMX
+  BFD_RELOC_14
+ENUMX
+  BFD_RELOC_8
+ENUMDOC
+  Basic absolute relocations of N bits.
+
+ENUM
+  BFD_RELOC_64_PCREL
+ENUMX
+  BFD_RELOC_32_PCREL
+ENUMX
+  BFD_RELOC_24_PCREL
+ENUMX
+  BFD_RELOC_16_PCREL
+ENUMX
+  BFD_RELOC_12_PCREL
+ENUMX
+  BFD_RELOC_8_PCREL
+ENUMDOC
+  PC-relative relocations.  Sometimes these are relative to the address
+of the relocation itself; sometimes they are relative to the start of
+the section containing the relocation.  It depends on the specific target.
+
+The 24-bit relocation is used in some Intel 960 configurations.
+
+ENUM
+  BFD_RELOC_32_SECREL
+ENUMDOC
+  Section relative relocations.  Some targets need this for DWARF2.
+
+ENUM
+  BFD_RELOC_32_GOT_PCREL
+ENUMX
+  BFD_RELOC_16_GOT_PCREL
+ENUMX
+  BFD_RELOC_8_GOT_PCREL
+ENUMX
+  BFD_RELOC_32_GOTOFF
+ENUMX
+  BFD_RELOC_16_GOTOFF
+ENUMX
+  BFD_RELOC_LO16_GOTOFF
+ENUMX
+  BFD_RELOC_HI16_GOTOFF
+ENUMX
+  BFD_RELOC_HI16_S_GOTOFF
+ENUMX
+  BFD_RELOC_8_GOTOFF
+ENUMX
+  BFD_RELOC_64_PLT_PCREL
+ENUMX
+  BFD_RELOC_32_PLT_PCREL
+ENUMX
+  BFD_RELOC_24_PLT_PCREL
+ENUMX
+  BFD_RELOC_16_PLT_PCREL
+ENUMX
+  BFD_RELOC_8_PLT_PCREL
+ENUMX
+  BFD_RELOC_64_PLTOFF
+ENUMX
+  BFD_RELOC_32_PLTOFF
+ENUMX
+  BFD_RELOC_16_PLTOFF
+ENUMX
+  BFD_RELOC_LO16_PLTOFF
+ENUMX
+  BFD_RELOC_HI16_PLTOFF
+ENUMX
+  BFD_RELOC_HI16_S_PLTOFF
+ENUMX
+  BFD_RELOC_8_PLTOFF
+ENUMDOC
+  For ELF.
+
+ENUM
+  BFD_RELOC_68K_GLOB_DAT
+ENUMX
+  BFD_RELOC_68K_JMP_SLOT
+ENUMX
+  BFD_RELOC_68K_RELATIVE
+ENUMX
+  BFD_RELOC_68K_TLS_GD32
+ENUMX
+  BFD_RELOC_68K_TLS_GD16
+ENUMX
+  BFD_RELOC_68K_TLS_GD8
+ENUMX
+  BFD_RELOC_68K_TLS_LDM32
+ENUMX
+  BFD_RELOC_68K_TLS_LDM16
+ENUMX
+  BFD_RELOC_68K_TLS_LDM8
+ENUMX
+  BFD_RELOC_68K_TLS_LDO32
+ENUMX
+  BFD_RELOC_68K_TLS_LDO16
+ENUMX
+  BFD_RELOC_68K_TLS_LDO8
+ENUMX
+  BFD_RELOC_68K_TLS_IE32
+ENUMX
+  BFD_RELOC_68K_TLS_IE16
+ENUMX
+  BFD_RELOC_68K_TLS_IE8
+ENUMX
+  BFD_RELOC_68K_TLS_LE32
+ENUMX
+  BFD_RELOC_68K_TLS_LE16
+ENUMX
+  BFD_RELOC_68K_TLS_LE8
+ENUMDOC
+  Relocations used by 68K ELF.
+
+ENUM
+  BFD_RELOC_32_BASEREL
+ENUMX
+  BFD_RELOC_16_BASEREL
+ENUMX
+  BFD_RELOC_LO16_BASEREL
+ENUMX
+  BFD_RELOC_HI16_BASEREL
+ENUMX
+  BFD_RELOC_HI16_S_BASEREL
+ENUMX
+  BFD_RELOC_8_BASEREL
+ENUMX
+  BFD_RELOC_RVA
+ENUMDOC
+  Linkage-table relative.
+
+ENUM
+  BFD_RELOC_8_FFnn
+ENUMDOC
+  Absolute 8-bit relocation, but used to form an address like 0xFFnn.
+
+ENUM
+  BFD_RELOC_32_PCREL_S2
+ENUMX
+  BFD_RELOC_16_PCREL_S2
+ENUMX
+  BFD_RELOC_23_PCREL_S2
+ENUMDOC
+  These PC-relative relocations are stored as word displacements --
+i.e., byte displacements shifted right two bits.  The 30-bit word
+displacement (<<32_PCREL_S2>> -- 32 bits, shifted 2) is used on the
+SPARC.  (SPARC tools generally refer to this as <<WDISP30>>.)  The
+signed 16-bit displacement is used on the MIPS, and the 23-bit
+displacement is used on the Alpha.
+
+ENUM
+  BFD_RELOC_HI22
+ENUMX
+  BFD_RELOC_LO10
+ENUMDOC
+  High 22 bits and low 10 bits of 32-bit value, placed into lower bits of
+the target word.  These are used on the SPARC.
+
+ENUM
+  BFD_RELOC_GPREL16
+ENUMX
+  BFD_RELOC_GPREL32
+ENUMDOC
+  For systems that allocate a Global Pointer register, these are
+displacements off that register.  These relocation types are
+handled specially, because the value the register will have is
+decided relatively late.
+
+ENUM
+  BFD_RELOC_I960_CALLJ
+ENUMDOC
+  Reloc types used for i960/b.out.
+
+ENUM
+  BFD_RELOC_NONE
+ENUMX
+  BFD_RELOC_SPARC_WDISP22
+ENUMX
+  BFD_RELOC_SPARC22
+ENUMX
+  BFD_RELOC_SPARC13
+ENUMX
+  BFD_RELOC_SPARC_GOT10
+ENUMX
+  BFD_RELOC_SPARC_GOT13
+ENUMX
+  BFD_RELOC_SPARC_GOT22
+ENUMX
+  BFD_RELOC_SPARC_PC10
+ENUMX
+  BFD_RELOC_SPARC_PC22
+ENUMX
+  BFD_RELOC_SPARC_WPLT30
+ENUMX
+  BFD_RELOC_SPARC_COPY
+ENUMX
+  BFD_RELOC_SPARC_GLOB_DAT
+ENUMX
+  BFD_RELOC_SPARC_JMP_SLOT
+ENUMX
+  BFD_RELOC_SPARC_RELATIVE
+ENUMX
+  BFD_RELOC_SPARC_UA16
+ENUMX
+  BFD_RELOC_SPARC_UA32
+ENUMX
+  BFD_RELOC_SPARC_UA64
+ENUMX
+  BFD_RELOC_SPARC_GOTDATA_HIX22
+ENUMX
+  BFD_RELOC_SPARC_GOTDATA_LOX10
+ENUMX
+  BFD_RELOC_SPARC_GOTDATA_OP_HIX22
+ENUMX
+  BFD_RELOC_SPARC_GOTDATA_OP_LOX10
+ENUMX
+  BFD_RELOC_SPARC_GOTDATA_OP
+ENUMX
+  BFD_RELOC_SPARC_JMP_IREL
+ENUMX
+  BFD_RELOC_SPARC_IRELATIVE
+ENUMDOC
+  SPARC ELF relocations.  There is probably some overlap with other
+  relocation types already defined.
+
+ENUM
+  BFD_RELOC_SPARC_BASE13
+ENUMX
+  BFD_RELOC_SPARC_BASE22
+ENUMDOC
+  I think these are specific to SPARC a.out (e.g., Sun 4).
+
+ENUMEQ
+  BFD_RELOC_SPARC_64
+  BFD_RELOC_64
+ENUMX
+  BFD_RELOC_SPARC_10
+ENUMX
+  BFD_RELOC_SPARC_11
+ENUMX
+  BFD_RELOC_SPARC_OLO10
+ENUMX
+  BFD_RELOC_SPARC_HH22
+ENUMX
+  BFD_RELOC_SPARC_HM10
+ENUMX
+  BFD_RELOC_SPARC_LM22
+ENUMX
+  BFD_RELOC_SPARC_PC_HH22
+ENUMX
+  BFD_RELOC_SPARC_PC_HM10
+ENUMX
+  BFD_RELOC_SPARC_PC_LM22
+ENUMX
+  BFD_RELOC_SPARC_WDISP16
+ENUMX
+  BFD_RELOC_SPARC_WDISP19
+ENUMX
+  BFD_RELOC_SPARC_7
+ENUMX
+  BFD_RELOC_SPARC_6
+ENUMX
+  BFD_RELOC_SPARC_5
+ENUMEQX
+  BFD_RELOC_SPARC_DISP64
+  BFD_RELOC_64_PCREL
+ENUMX
+  BFD_RELOC_SPARC_PLT32
+ENUMX
+  BFD_RELOC_SPARC_PLT64
+ENUMX
+  BFD_RELOC_SPARC_HIX22
+ENUMX
+  BFD_RELOC_SPARC_LOX10
+ENUMX
+  BFD_RELOC_SPARC_H44
+ENUMX
+  BFD_RELOC_SPARC_M44
+ENUMX
+  BFD_RELOC_SPARC_L44
+ENUMX
+  BFD_RELOC_SPARC_REGISTER
+ENUMDOC
+  SPARC64 relocations
+
+ENUM
+  BFD_RELOC_SPARC_REV32
+ENUMDOC
+  SPARC little endian relocation
+ENUM
+  BFD_RELOC_SPARC_TLS_GD_HI22
+ENUMX
+  BFD_RELOC_SPARC_TLS_GD_LO10
+ENUMX
+  BFD_RELOC_SPARC_TLS_GD_ADD
+ENUMX
+  BFD_RELOC_SPARC_TLS_GD_CALL
+ENUMX
+  BFD_RELOC_SPARC_TLS_LDM_HI22
+ENUMX
+  BFD_RELOC_SPARC_TLS_LDM_LO10
+ENUMX
+  BFD_RELOC_SPARC_TLS_LDM_ADD
+ENUMX
+  BFD_RELOC_SPARC_TLS_LDM_CALL
+ENUMX
+  BFD_RELOC_SPARC_TLS_LDO_HIX22
+ENUMX
+  BFD_RELOC_SPARC_TLS_LDO_LOX10
+ENUMX
+  BFD_RELOC_SPARC_TLS_LDO_ADD
+ENUMX
+  BFD_RELOC_SPARC_TLS_IE_HI22
+ENUMX
+  BFD_RELOC_SPARC_TLS_IE_LO10
+ENUMX
+  BFD_RELOC_SPARC_TLS_IE_LD
+ENUMX
+  BFD_RELOC_SPARC_TLS_IE_LDX
+ENUMX
+  BFD_RELOC_SPARC_TLS_IE_ADD
+ENUMX
+  BFD_RELOC_SPARC_TLS_LE_HIX22
+ENUMX
+  BFD_RELOC_SPARC_TLS_LE_LOX10
+ENUMX
+  BFD_RELOC_SPARC_TLS_DTPMOD32
+ENUMX
+  BFD_RELOC_SPARC_TLS_DTPMOD64
+ENUMX
+  BFD_RELOC_SPARC_TLS_DTPOFF32
+ENUMX
+  BFD_RELOC_SPARC_TLS_DTPOFF64
+ENUMX
+  BFD_RELOC_SPARC_TLS_TPOFF32
+ENUMX
+  BFD_RELOC_SPARC_TLS_TPOFF64
+ENUMDOC
+  SPARC TLS relocations
+
+ENUM
+  BFD_RELOC_SPU_IMM7
+ENUMX
+  BFD_RELOC_SPU_IMM8
+ENUMX
+  BFD_RELOC_SPU_IMM10
+ENUMX
+  BFD_RELOC_SPU_IMM10W
+ENUMX
+  BFD_RELOC_SPU_IMM16
+ENUMX
+  BFD_RELOC_SPU_IMM16W
+ENUMX
+  BFD_RELOC_SPU_IMM18
+ENUMX
+  BFD_RELOC_SPU_PCREL9a
+ENUMX
+  BFD_RELOC_SPU_PCREL9b
+ENUMX
+  BFD_RELOC_SPU_PCREL16
+ENUMX
+  BFD_RELOC_SPU_LO16
+ENUMX
+  BFD_RELOC_SPU_HI16
+ENUMX
+  BFD_RELOC_SPU_PPU32
+ENUMX
+  BFD_RELOC_SPU_PPU64
+ENUMX
+  BFD_RELOC_SPU_ADD_PIC
+ENUMDOC
+  SPU Relocations.
+
+ENUM
+  BFD_RELOC_ALPHA_GPDISP_HI16
+ENUMDOC
+  Alpha ECOFF and ELF relocations.  Some of these treat the symbol or
+     "addend" in some special way.
+  For GPDISP_HI16 ("gpdisp") relocations, the symbol is ignored when
+     writing; when reading, it will be the absolute section symbol.  The
+     addend is the displacement in bytes of the "lda" instruction from
+     the "ldah" instruction (which is at the address of this reloc).
+ENUM
+  BFD_RELOC_ALPHA_GPDISP_LO16
+ENUMDOC
+  For GPDISP_LO16 ("ignore") relocations, the symbol is handled as
+     with GPDISP_HI16 relocs.  The addend is ignored when writing the
+     relocations out, and is filled in with the file's GP value on
+     reading, for convenience.
+
+ENUM
+  BFD_RELOC_ALPHA_GPDISP
+ENUMDOC
+  The ELF GPDISP relocation is exactly the same as the GPDISP_HI16
+     relocation except that there is no accompanying GPDISP_LO16
+     relocation.
+
+ENUM
+  BFD_RELOC_ALPHA_LITERAL
+ENUMX
+  BFD_RELOC_ALPHA_ELF_LITERAL
+ENUMX
+  BFD_RELOC_ALPHA_LITUSE
+ENUMDOC
+  The Alpha LITERAL/LITUSE relocs are produced by a symbol reference;
+     the assembler turns it into a LDQ instruction to load the address of
+     the symbol, and then fills in a register in the real instruction.
+
+     The LITERAL reloc, at the LDQ instruction, refers to the .lita
+     section symbol.  The addend is ignored when writing, but is filled
+     in with the file's GP value on reading, for convenience, as with the
+     GPDISP_LO16 reloc.
+
+     The ELF_LITERAL reloc is somewhere between 16_GOTOFF and GPDISP_LO16.
+     It should refer to the symbol to be referenced, as with 16_GOTOFF,
+     but it generates output not based on the position within the .got
+     section, but relative to the GP value chosen for the file during the
+     final link stage.
+
+     The LITUSE reloc, on the instruction using the loaded address, gives
+     information to the linker that it might be able to use to optimize
+     away some literal section references.  The symbol is ignored (read
+     as the absolute section symbol), and the "addend" indicates the type
+     of instruction using the register:
+              1 - "memory" fmt insn
+              2 - byte-manipulation (byte offset reg)
+              3 - jsr (target of branch)
+
+ENUM
+  BFD_RELOC_ALPHA_HINT
+ENUMDOC
+  The HINT relocation indicates a value that should be filled into the
+     "hint" field of a jmp/jsr/ret instruction, for possible branch-
+     prediction logic which may be provided on some processors.
+
+ENUM
+  BFD_RELOC_ALPHA_LINKAGE
+ENUMDOC
+  The LINKAGE relocation outputs a linkage pair in the object file,
+     which is filled by the linker.
+
+ENUM
+  BFD_RELOC_ALPHA_CODEADDR
+ENUMDOC
+  The CODEADDR relocation outputs a STO_CA in the object file,
+     which is filled by the linker.
+
+ENUM
+  BFD_RELOC_ALPHA_GPREL_HI16
+ENUMX
+  BFD_RELOC_ALPHA_GPREL_LO16
+ENUMDOC
+  The GPREL_HI/LO relocations together form a 32-bit offset from the
+     GP register.
+
+ENUM
+  BFD_RELOC_ALPHA_BRSGP
+ENUMDOC
+  Like BFD_RELOC_23_PCREL_S2, except that the source and target must
+  share a common GP, and the target address is adjusted for
+  STO_ALPHA_STD_GPLOAD.
+
+ENUM
+  BFD_RELOC_ALPHA_NOP
+ENUMDOC
+  The NOP relocation outputs a NOP if the longword displacement
+     between two procedure entry points is < 2^21.
+
+ENUM
+  BFD_RELOC_ALPHA_BSR
+ENUMDOC
+  The BSR relocation outputs a BSR if the longword displacement
+     between two procedure entry points is < 2^21.
+
+ENUM
+  BFD_RELOC_ALPHA_LDA
+ENUMDOC
+  The LDA relocation outputs a LDA if the longword displacement
+     between two procedure entry points is < 2^16.
+
+ENUM
+  BFD_RELOC_ALPHA_BOH
+ENUMDOC
+  The BOH relocation outputs a BSR if the longword displacement
+     between two procedure entry points is < 2^21, or else a hint.
+
+ENUM
+  BFD_RELOC_ALPHA_TLSGD
+ENUMX
+  BFD_RELOC_ALPHA_TLSLDM
+ENUMX
+  BFD_RELOC_ALPHA_DTPMOD64
+ENUMX
+  BFD_RELOC_ALPHA_GOTDTPREL16
+ENUMX
+  BFD_RELOC_ALPHA_DTPREL64
+ENUMX
+  BFD_RELOC_ALPHA_DTPREL_HI16
+ENUMX
+  BFD_RELOC_ALPHA_DTPREL_LO16
+ENUMX
+  BFD_RELOC_ALPHA_DTPREL16
+ENUMX
+  BFD_RELOC_ALPHA_GOTTPREL16
+ENUMX
+  BFD_RELOC_ALPHA_TPREL64
+ENUMX
+  BFD_RELOC_ALPHA_TPREL_HI16
+ENUMX
+  BFD_RELOC_ALPHA_TPREL_LO16
+ENUMX
+  BFD_RELOC_ALPHA_TPREL16
+ENUMDOC
+  Alpha thread-local storage relocations.
+
+ENUM
+  BFD_RELOC_MIPS_JMP
+ENUMX
+  BFD_RELOC_MICROMIPS_JMP
+ENUMDOC
+  The MIPS jump instruction.
+
+ENUM
+  BFD_RELOC_MIPS16_JMP
+ENUMDOC
+  The MIPS16 jump instruction.
+
+ENUM
+  BFD_RELOC_MIPS16_GPREL
+ENUMDOC
+  MIPS16 GP relative reloc.
+
+ENUM
+  BFD_RELOC_HI16
+ENUMDOC
+  High 16 bits of 32-bit value; simple reloc.
+
+ENUM
+  BFD_RELOC_HI16_S
+ENUMDOC
+  High 16 bits of 32-bit value but the low 16 bits will be sign
+     extended and added to form the final result.  If the low 16
+     bits form a negative number, we need to add one to the high value
+     to compensate for the borrow when the low bits are added.
+
+ENUM
+  BFD_RELOC_LO16
+ENUMDOC
+  Low 16 bits.
+
+ENUM
+  BFD_RELOC_HI16_PCREL
+ENUMDOC
+  High 16 bits of 32-bit pc-relative value
+ENUM
+  BFD_RELOC_HI16_S_PCREL
+ENUMDOC
+  High 16 bits of 32-bit pc-relative value, adjusted
+ENUM
+  BFD_RELOC_LO16_PCREL
+ENUMDOC
+  Low 16 bits of pc-relative value
+
+ENUM
+  BFD_RELOC_MIPS16_GOT16
+ENUMX
+  BFD_RELOC_MIPS16_CALL16
+ENUMDOC
+  Equivalent of BFD_RELOC_MIPS_*, but with the MIPS16 layout of
+     16-bit immediate fields
+ENUM
+  BFD_RELOC_MIPS16_HI16
+ENUMDOC
+  MIPS16 high 16 bits of 32-bit value.
+ENUM
+  BFD_RELOC_MIPS16_HI16_S
+ENUMDOC
+  MIPS16 high 16 bits of 32-bit value but the low 16 bits will be sign
+     extended and added to form the final result.  If the low 16
+     bits form a negative number, we need to add one to the high value
+     to compensate for the borrow when the low bits are added.
+ENUM
+  BFD_RELOC_MIPS16_LO16
+ENUMDOC
+  MIPS16 low 16 bits.
+
+ENUM
+  BFD_RELOC_MIPS_LITERAL
+ENUMX
+  BFD_RELOC_MICROMIPS_LITERAL
+ENUMDOC
+  Relocation against a MIPS literal section.
+
+ENUM
+  BFD_RELOC_MICROMIPS_7_PCREL_S1
+ENUMX
+  BFD_RELOC_MICROMIPS_10_PCREL_S1
+ENUMX
+  BFD_RELOC_MICROMIPS_16_PCREL_S1
+ENUMDOC
+  microMIPS PC-relative relocations.
+
+ENUM
+  BFD_RELOC_MICROMIPS_GPREL16
+ENUMX
+  BFD_RELOC_MICROMIPS_HI16
+ENUMX
+  BFD_RELOC_MICROMIPS_HI16_S
+ENUMX
+  BFD_RELOC_MICROMIPS_LO16
+ENUMDOC
+  microMIPS versions of generic BFD relocs.
+
+ENUM
+  BFD_RELOC_MIPS_GOT16
+ENUMX
+  BFD_RELOC_MICROMIPS_GOT16
+ENUMX
+  BFD_RELOC_MIPS_CALL16
+ENUMX
+  BFD_RELOC_MICROMIPS_CALL16
+ENUMX
+  BFD_RELOC_MIPS_GOT_HI16
+ENUMX
+  BFD_RELOC_MICROMIPS_GOT_HI16
+ENUMX
+  BFD_RELOC_MIPS_GOT_LO16
+ENUMX
+  BFD_RELOC_MICROMIPS_GOT_LO16
+ENUMX
+  BFD_RELOC_MIPS_CALL_HI16
+ENUMX
+  BFD_RELOC_MICROMIPS_CALL_HI16
+ENUMX
+  BFD_RELOC_MIPS_CALL_LO16
+ENUMX
+  BFD_RELOC_MICROMIPS_CALL_LO16
+ENUMX
+  BFD_RELOC_MIPS_SUB
+ENUMX
+  BFD_RELOC_MICROMIPS_SUB
+ENUMX
+  BFD_RELOC_MIPS_GOT_PAGE
+ENUMX
+  BFD_RELOC_MICROMIPS_GOT_PAGE
+ENUMX
+  BFD_RELOC_MIPS_GOT_OFST
+ENUMX
+  BFD_RELOC_MICROMIPS_GOT_OFST
+ENUMX
+  BFD_RELOC_MIPS_GOT_DISP
+ENUMX
+  BFD_RELOC_MICROMIPS_GOT_DISP
+ENUMX
+  BFD_RELOC_MIPS_SHIFT5
+ENUMX
+  BFD_RELOC_MIPS_SHIFT6
+ENUMX
+  BFD_RELOC_MIPS_INSERT_A
+ENUMX
+  BFD_RELOC_MIPS_INSERT_B
+ENUMX
+  BFD_RELOC_MIPS_DELETE
+ENUMX
+  BFD_RELOC_MIPS_HIGHEST
+ENUMX
+  BFD_RELOC_MICROMIPS_HIGHEST
+ENUMX
+  BFD_RELOC_MIPS_HIGHER
+ENUMX
+  BFD_RELOC_MICROMIPS_HIGHER
+ENUMX
+  BFD_RELOC_MIPS_SCN_DISP
+ENUMX
+  BFD_RELOC_MICROMIPS_SCN_DISP
+ENUMX
+  BFD_RELOC_MIPS_REL16
+ENUMX
+  BFD_RELOC_MIPS_RELGOT
+ENUMX
+  BFD_RELOC_MIPS_JALR
+ENUMX
+  BFD_RELOC_MICROMIPS_JALR
+ENUMX
+  BFD_RELOC_MIPS_TLS_DTPMOD32
+ENUMX
+  BFD_RELOC_MIPS_TLS_DTPREL32
+ENUMX
+  BFD_RELOC_MIPS_TLS_DTPMOD64
+ENUMX
+  BFD_RELOC_MIPS_TLS_DTPREL64
+ENUMX
+  BFD_RELOC_MIPS_TLS_GD
+ENUMX
+  BFD_RELOC_MICROMIPS_TLS_GD
+ENUMX
+  BFD_RELOC_MIPS_TLS_LDM
+ENUMX
+  BFD_RELOC_MICROMIPS_TLS_LDM
+ENUMX
+  BFD_RELOC_MIPS_TLS_DTPREL_HI16
+ENUMX
+  BFD_RELOC_MICROMIPS_TLS_DTPREL_HI16
+ENUMX
+  BFD_RELOC_MIPS_TLS_DTPREL_LO16
+ENUMX
+  BFD_RELOC_MICROMIPS_TLS_DTPREL_LO16
+ENUMX
+  BFD_RELOC_MIPS_TLS_GOTTPREL
+ENUMX
+  BFD_RELOC_MICROMIPS_TLS_GOTTPREL
+ENUMX
+  BFD_RELOC_MIPS_TLS_TPREL32
+ENUMX
+  BFD_RELOC_MIPS_TLS_TPREL64
+ENUMX
+  BFD_RELOC_MIPS_TLS_TPREL_HI16
+ENUMX
+  BFD_RELOC_MICROMIPS_TLS_TPREL_HI16
+ENUMX
+  BFD_RELOC_MIPS_TLS_TPREL_LO16
+ENUMX
+  BFD_RELOC_MICROMIPS_TLS_TPREL_LO16
+ENUMDOC
+  MIPS ELF relocations.
+COMMENT
+
+ENUM
+  BFD_RELOC_MIPS_COPY
+ENUMX
+  BFD_RELOC_MIPS_JUMP_SLOT
+ENUMDOC
+  MIPS ELF relocations (VxWorks and PLT extensions).
+COMMENT
+
+ENUM
+  BFD_RELOC_MOXIE_10_PCREL
+ENUMDOC
+  Moxie ELF relocations.
+COMMENT
+
+ENUM
+  BFD_RELOC_FRV_LABEL16
+ENUMX
+  BFD_RELOC_FRV_LABEL24
+ENUMX
+  BFD_RELOC_FRV_LO16
+ENUMX
+  BFD_RELOC_FRV_HI16
+ENUMX
+  BFD_RELOC_FRV_GPREL12
+ENUMX
+  BFD_RELOC_FRV_GPRELU12
+ENUMX
+  BFD_RELOC_FRV_GPREL32
+ENUMX
+  BFD_RELOC_FRV_GPRELHI
+ENUMX
+  BFD_RELOC_FRV_GPRELLO
+ENUMX
+  BFD_RELOC_FRV_GOT12
+ENUMX
+  BFD_RELOC_FRV_GOTHI
+ENUMX
+  BFD_RELOC_FRV_GOTLO
+ENUMX
+  BFD_RELOC_FRV_FUNCDESC
+ENUMX
+  BFD_RELOC_FRV_FUNCDESC_GOT12
+ENUMX
+  BFD_RELOC_FRV_FUNCDESC_GOTHI
+ENUMX
+  BFD_RELOC_FRV_FUNCDESC_GOTLO
+ENUMX
+  BFD_RELOC_FRV_FUNCDESC_VALUE
+ENUMX
+  BFD_RELOC_FRV_FUNCDESC_GOTOFF12
+ENUMX
+  BFD_RELOC_FRV_FUNCDESC_GOTOFFHI
+ENUMX
+  BFD_RELOC_FRV_FUNCDESC_GOTOFFLO
+ENUMX
+  BFD_RELOC_FRV_GOTOFF12
+ENUMX
+  BFD_RELOC_FRV_GOTOFFHI
+ENUMX
+  BFD_RELOC_FRV_GOTOFFLO
+ENUMX
+  BFD_RELOC_FRV_GETTLSOFF
+ENUMX
+  BFD_RELOC_FRV_TLSDESC_VALUE
+ENUMX
+  BFD_RELOC_FRV_GOTTLSDESC12
+ENUMX
+  BFD_RELOC_FRV_GOTTLSDESCHI
+ENUMX
+  BFD_RELOC_FRV_GOTTLSDESCLO
+ENUMX
+  BFD_RELOC_FRV_TLSMOFF12
+ENUMX
+  BFD_RELOC_FRV_TLSMOFFHI
+ENUMX
+  BFD_RELOC_FRV_TLSMOFFLO
+ENUMX
+  BFD_RELOC_FRV_GOTTLSOFF12
+ENUMX
+  BFD_RELOC_FRV_GOTTLSOFFHI
+ENUMX
+  BFD_RELOC_FRV_GOTTLSOFFLO
+ENUMX
+  BFD_RELOC_FRV_TLSOFF
+ENUMX
+  BFD_RELOC_FRV_TLSDESC_RELAX
+ENUMX
+  BFD_RELOC_FRV_GETTLSOFF_RELAX
+ENUMX
+  BFD_RELOC_FRV_TLSOFF_RELAX
+ENUMX
+  BFD_RELOC_FRV_TLSMOFF
+ENUMDOC
+  Fujitsu Frv Relocations.
+COMMENT
+
+ENUM
+  BFD_RELOC_MN10300_GOTOFF24
+ENUMDOC
+  This is a 24bit GOT-relative reloc for the mn10300.
+ENUM
+  BFD_RELOC_MN10300_GOT32
+ENUMDOC
+  This is a 32bit GOT-relative reloc for the mn10300, offset by two bytes
+  in the instruction.
+ENUM
+  BFD_RELOC_MN10300_GOT24
+ENUMDOC
+  This is a 24bit GOT-relative reloc for the mn10300, offset by two bytes
+  in the instruction.
+ENUM
+  BFD_RELOC_MN10300_GOT16
+ENUMDOC
+  This is a 16bit GOT-relative reloc for the mn10300, offset by two bytes
+  in the instruction.
+ENUM
+  BFD_RELOC_MN10300_COPY
+ENUMDOC
+  Copy symbol at runtime.
+ENUM
+  BFD_RELOC_MN10300_GLOB_DAT
+ENUMDOC
+  Create GOT entry.
+ENUM
+  BFD_RELOC_MN10300_JMP_SLOT
+ENUMDOC
+  Create PLT entry.
+ENUM
+  BFD_RELOC_MN10300_RELATIVE
+ENUMDOC
+  Adjust by program base.
+ENUM
+  BFD_RELOC_MN10300_SYM_DIFF
+ENUMDOC
+  Together with another reloc targeted at the same location,
+  allows for a value that is the difference of two symbols
+  in the same section.
+ENUM
+  BFD_RELOC_MN10300_ALIGN
+ENUMDOC
+  The addend of this reloc is an alignment power that must
+  be honoured at the offset's location, regardless of linker
+  relaxation.
+COMMENT
+
+ENUM
+  BFD_RELOC_386_GOT32
+ENUMX
+  BFD_RELOC_386_PLT32
+ENUMX
+  BFD_RELOC_386_COPY
+ENUMX
+  BFD_RELOC_386_GLOB_DAT
+ENUMX
+  BFD_RELOC_386_JUMP_SLOT
+ENUMX
+  BFD_RELOC_386_RELATIVE
+ENUMX
+  BFD_RELOC_386_GOTOFF
+ENUMX
+  BFD_RELOC_386_GOTPC
+ENUMX
+  BFD_RELOC_386_TLS_TPOFF
+ENUMX
+  BFD_RELOC_386_TLS_IE
+ENUMX
+  BFD_RELOC_386_TLS_GOTIE
+ENUMX
+  BFD_RELOC_386_TLS_LE
+ENUMX
+  BFD_RELOC_386_TLS_GD
+ENUMX
+  BFD_RELOC_386_TLS_LDM
+ENUMX
+  BFD_RELOC_386_TLS_LDO_32
+ENUMX
+  BFD_RELOC_386_TLS_IE_32
+ENUMX
+  BFD_RELOC_386_TLS_LE_32
+ENUMX
+  BFD_RELOC_386_TLS_DTPMOD32
+ENUMX
+  BFD_RELOC_386_TLS_DTPOFF32
+ENUMX
+  BFD_RELOC_386_TLS_TPOFF32
+ENUMX
+  BFD_RELOC_386_TLS_GOTDESC
+ENUMX
+  BFD_RELOC_386_TLS_DESC_CALL
+ENUMX
+  BFD_RELOC_386_TLS_DESC
+ENUMX
+  BFD_RELOC_386_IRELATIVE
+ENUMDOC
+  i386/elf relocations
+
+ENUM
+  BFD_RELOC_X86_64_GOT32
+ENUMX
+  BFD_RELOC_X86_64_PLT32
+ENUMX
+  BFD_RELOC_X86_64_COPY
+ENUMX
+  BFD_RELOC_X86_64_GLOB_DAT
+ENUMX
+  BFD_RELOC_X86_64_JUMP_SLOT
+ENUMX
+  BFD_RELOC_X86_64_RELATIVE
+ENUMX
+  BFD_RELOC_X86_64_GOTPCREL
+ENUMX
+  BFD_RELOC_X86_64_32S
+ENUMX
+  BFD_RELOC_X86_64_DTPMOD64
+ENUMX
+  BFD_RELOC_X86_64_DTPOFF64
+ENUMX
+  BFD_RELOC_X86_64_TPOFF64
+ENUMX
+  BFD_RELOC_X86_64_TLSGD
+ENUMX
+  BFD_RELOC_X86_64_TLSLD
+ENUMX
+  BFD_RELOC_X86_64_DTPOFF32
+ENUMX
+  BFD_RELOC_X86_64_GOTTPOFF
+ENUMX
+  BFD_RELOC_X86_64_TPOFF32
+ENUMX
+  BFD_RELOC_X86_64_GOTOFF64
+ENUMX
+  BFD_RELOC_X86_64_GOTPC32
+ENUMX
+  BFD_RELOC_X86_64_GOT64
+ENUMX
+  BFD_RELOC_X86_64_GOTPCREL64
+ENUMX
+  BFD_RELOC_X86_64_GOTPC64
+ENUMX
+  BFD_RELOC_X86_64_GOTPLT64
+ENUMX
+  BFD_RELOC_X86_64_PLTOFF64
+ENUMX
+  BFD_RELOC_X86_64_GOTPC32_TLSDESC
+ENUMX
+  BFD_RELOC_X86_64_TLSDESC_CALL
+ENUMX
+  BFD_RELOC_X86_64_TLSDESC
+ENUMX
+  BFD_RELOC_X86_64_IRELATIVE
+ENUMDOC
+  x86-64/elf relocations
+
+ENUM
+  BFD_RELOC_NS32K_IMM_8
+ENUMX
+  BFD_RELOC_NS32K_IMM_16
+ENUMX
+  BFD_RELOC_NS32K_IMM_32
+ENUMX
+  BFD_RELOC_NS32K_IMM_8_PCREL
+ENUMX
+  BFD_RELOC_NS32K_IMM_16_PCREL
+ENUMX
+  BFD_RELOC_NS32K_IMM_32_PCREL
+ENUMX
+  BFD_RELOC_NS32K_DISP_8
+ENUMX
+  BFD_RELOC_NS32K_DISP_16
+ENUMX
+  BFD_RELOC_NS32K_DISP_32
+ENUMX
+  BFD_RELOC_NS32K_DISP_8_PCREL
+ENUMX
+  BFD_RELOC_NS32K_DISP_16_PCREL
+ENUMX
+  BFD_RELOC_NS32K_DISP_32_PCREL
+ENUMDOC
+  ns32k relocations
+
+ENUM
+  BFD_RELOC_PDP11_DISP_8_PCREL
+ENUMX
+  BFD_RELOC_PDP11_DISP_6_PCREL
+ENUMDOC
+  PDP11 relocations
+
+ENUM
+  BFD_RELOC_PJ_CODE_HI16
+ENUMX
+  BFD_RELOC_PJ_CODE_LO16
+ENUMX
+  BFD_RELOC_PJ_CODE_DIR16
+ENUMX
+  BFD_RELOC_PJ_CODE_DIR32
+ENUMX
+  BFD_RELOC_PJ_CODE_REL16
+ENUMX
+  BFD_RELOC_PJ_CODE_REL32
+ENUMDOC
+  Picojava relocs.  Not all of these appear in object files.
+
+ENUM
+  BFD_RELOC_PPC_B26
+ENUMX
+  BFD_RELOC_PPC_BA26
+ENUMX
+  BFD_RELOC_PPC_TOC16
+ENUMX
+  BFD_RELOC_PPC_B16
+ENUMX
+  BFD_RELOC_PPC_B16_BRTAKEN
+ENUMX
+  BFD_RELOC_PPC_B16_BRNTAKEN
+ENUMX
+  BFD_RELOC_PPC_BA16
+ENUMX
+  BFD_RELOC_PPC_BA16_BRTAKEN
+ENUMX
+  BFD_RELOC_PPC_BA16_BRNTAKEN
+ENUMX
+  BFD_RELOC_PPC_COPY
+ENUMX
+  BFD_RELOC_PPC_GLOB_DAT
+ENUMX
+  BFD_RELOC_PPC_JMP_SLOT
+ENUMX
+  BFD_RELOC_PPC_RELATIVE
+ENUMX
+  BFD_RELOC_PPC_LOCAL24PC
+ENUMX
+  BFD_RELOC_PPC_EMB_NADDR32
+ENUMX
+  BFD_RELOC_PPC_EMB_NADDR16
+ENUMX
+  BFD_RELOC_PPC_EMB_NADDR16_LO
+ENUMX
+  BFD_RELOC_PPC_EMB_NADDR16_HI
+ENUMX
+  BFD_RELOC_PPC_EMB_NADDR16_HA
+ENUMX
+  BFD_RELOC_PPC_EMB_SDAI16
+ENUMX
+  BFD_RELOC_PPC_EMB_SDA2I16
+ENUMX
+  BFD_RELOC_PPC_EMB_SDA2REL
+ENUMX
+  BFD_RELOC_PPC_EMB_SDA21
+ENUMX
+  BFD_RELOC_PPC_EMB_MRKREF
+ENUMX
+  BFD_RELOC_PPC_EMB_RELSEC16
+ENUMX
+  BFD_RELOC_PPC_EMB_RELST_LO
+ENUMX
+  BFD_RELOC_PPC_EMB_RELST_HI
+ENUMX
+  BFD_RELOC_PPC_EMB_RELST_HA
+ENUMX
+  BFD_RELOC_PPC_EMB_BIT_FLD
+ENUMX
+  BFD_RELOC_PPC_EMB_RELSDA
+ENUMX
+  BFD_RELOC_PPC64_HIGHER
+ENUMX
+  BFD_RELOC_PPC64_HIGHER_S
+ENUMX
+  BFD_RELOC_PPC64_HIGHEST
+ENUMX
+  BFD_RELOC_PPC64_HIGHEST_S
+ENUMX
+  BFD_RELOC_PPC64_TOC16_LO
+ENUMX
+  BFD_RELOC_PPC64_TOC16_HI
+ENUMX
+  BFD_RELOC_PPC64_TOC16_HA
+ENUMX
+  BFD_RELOC_PPC64_TOC
+ENUMX
+  BFD_RELOC_PPC64_PLTGOT16
+ENUMX
+  BFD_RELOC_PPC64_PLTGOT16_LO
+ENUMX
+  BFD_RELOC_PPC64_PLTGOT16_HI
+ENUMX
+  BFD_RELOC_PPC64_PLTGOT16_HA
+ENUMX
+  BFD_RELOC_PPC64_ADDR16_DS
+ENUMX
+  BFD_RELOC_PPC64_ADDR16_LO_DS
+ENUMX
+  BFD_RELOC_PPC64_GOT16_DS
+ENUMX
+  BFD_RELOC_PPC64_GOT16_LO_DS
+ENUMX
+  BFD_RELOC_PPC64_PLT16_LO_DS
+ENUMX
+  BFD_RELOC_PPC64_SECTOFF_DS
+ENUMX
+  BFD_RELOC_PPC64_SECTOFF_LO_DS
+ENUMX
+  BFD_RELOC_PPC64_TOC16_DS
+ENUMX
+  BFD_RELOC_PPC64_TOC16_LO_DS
+ENUMX
+  BFD_RELOC_PPC64_PLTGOT16_DS
+ENUMX
+  BFD_RELOC_PPC64_PLTGOT16_LO_DS
+ENUMDOC
+  Power(rs6000) and PowerPC relocations.
+
+ENUM
+  BFD_RELOC_PPC_TLS
+ENUMX
+  BFD_RELOC_PPC_TLSGD
+ENUMX
+  BFD_RELOC_PPC_TLSLD
+ENUMX
+  BFD_RELOC_PPC_DTPMOD
+ENUMX
+  BFD_RELOC_PPC_TPREL16
+ENUMX
+  BFD_RELOC_PPC_TPREL16_LO
+ENUMX
+  BFD_RELOC_PPC_TPREL16_HI
+ENUMX
+  BFD_RELOC_PPC_TPREL16_HA
+ENUMX
+  BFD_RELOC_PPC_TPREL
+ENUMX
+  BFD_RELOC_PPC_DTPREL16
+ENUMX
+  BFD_RELOC_PPC_DTPREL16_LO
+ENUMX
+  BFD_RELOC_PPC_DTPREL16_HI
+ENUMX
+  BFD_RELOC_PPC_DTPREL16_HA
+ENUMX
+  BFD_RELOC_PPC_DTPREL
+ENUMX
+  BFD_RELOC_PPC_GOT_TLSGD16
+ENUMX
+  BFD_RELOC_PPC_GOT_TLSGD16_LO
+ENUMX
+  BFD_RELOC_PPC_GOT_TLSGD16_HI
+ENUMX
+  BFD_RELOC_PPC_GOT_TLSGD16_HA
+ENUMX
+  BFD_RELOC_PPC_GOT_TLSLD16
+ENUMX
+  BFD_RELOC_PPC_GOT_TLSLD16_LO
+ENUMX
+  BFD_RELOC_PPC_GOT_TLSLD16_HI
+ENUMX
+  BFD_RELOC_PPC_GOT_TLSLD16_HA
+ENUMX
+  BFD_RELOC_PPC_GOT_TPREL16
+ENUMX
+  BFD_RELOC_PPC_GOT_TPREL16_LO
+ENUMX
+  BFD_RELOC_PPC_GOT_TPREL16_HI
+ENUMX
+  BFD_RELOC_PPC_GOT_TPREL16_HA
+ENUMX
+  BFD_RELOC_PPC_GOT_DTPREL16
+ENUMX
+  BFD_RELOC_PPC_GOT_DTPREL16_LO
+ENUMX
+  BFD_RELOC_PPC_GOT_DTPREL16_HI
+ENUMX
+  BFD_RELOC_PPC_GOT_DTPREL16_HA
+ENUMX
+  BFD_RELOC_PPC64_TPREL16_DS
+ENUMX
+  BFD_RELOC_PPC64_TPREL16_LO_DS
+ENUMX
+  BFD_RELOC_PPC64_TPREL16_HIGHER
+ENUMX
+  BFD_RELOC_PPC64_TPREL16_HIGHERA
+ENUMX
+  BFD_RELOC_PPC64_TPREL16_HIGHEST
+ENUMX
+  BFD_RELOC_PPC64_TPREL16_HIGHESTA
+ENUMX
+  BFD_RELOC_PPC64_DTPREL16_DS
+ENUMX
+  BFD_RELOC_PPC64_DTPREL16_LO_DS
+ENUMX
+  BFD_RELOC_PPC64_DTPREL16_HIGHER
+ENUMX
+  BFD_RELOC_PPC64_DTPREL16_HIGHERA
+ENUMX
+  BFD_RELOC_PPC64_DTPREL16_HIGHEST
+ENUMX
+  BFD_RELOC_PPC64_DTPREL16_HIGHESTA
+ENUMDOC
+  PowerPC and PowerPC64 thread-local storage relocations.
+
+ENUM
+  BFD_RELOC_I370_D12
+ENUMDOC
+  IBM 370/390 relocations
+
+ENUM
+  BFD_RELOC_CTOR
+ENUMDOC
+  The type of reloc used to build a constructor table - at the moment
+  probably a 32 bit wide absolute relocation, but the target can choose.
+  It generally does map to one of the other relocation types.
+
+ENUM
+  BFD_RELOC_ARM_PCREL_BRANCH
+ENUMDOC
+  ARM 26 bit pc-relative branch.  The lowest two bits must be zero and are
+  not stored in the instruction.
+ENUM
+  BFD_RELOC_ARM_PCREL_BLX
+ENUMDOC
+  ARM 26 bit pc-relative branch.  The lowest bit must be zero and is
+  not stored in the instruction.  The 2nd lowest bit comes from a 1 bit
+  field in the instruction.
+ENUM
+  BFD_RELOC_THUMB_PCREL_BLX
+ENUMDOC
+  Thumb 22 bit pc-relative branch.  The lowest bit must be zero and is
+  not stored in the instruction.  The 2nd lowest bit comes from a 1 bit
+  field in the instruction.
+ENUM
+  BFD_RELOC_ARM_PCREL_CALL
+ENUMDOC
+  ARM 26-bit pc-relative branch for an unconditional BL or BLX instruction.
+ENUM
+  BFD_RELOC_ARM_PCREL_JUMP
+ENUMDOC
+  ARM 26-bit pc-relative branch for B or conditional BL instruction.
+
+ENUM
+  BFD_RELOC_THUMB_PCREL_BRANCH7
+ENUMX
+  BFD_RELOC_THUMB_PCREL_BRANCH9
+ENUMX
+  BFD_RELOC_THUMB_PCREL_BRANCH12
+ENUMX
+  BFD_RELOC_THUMB_PCREL_BRANCH20
+ENUMX
+  BFD_RELOC_THUMB_PCREL_BRANCH23
+ENUMX
+  BFD_RELOC_THUMB_PCREL_BRANCH25
+ENUMDOC
+  Thumb 7-, 9-, 12-, 20-, 23-, and 25-bit pc-relative branches.
+  The lowest bit must be zero and is not stored in the instruction.
+  Note that the corresponding ELF R_ARM_THM_JUMPnn constant has an
+  "nn" one smaller in all cases.  Note further that BRANCH23
+  corresponds to R_ARM_THM_CALL.
+
+ENUM
+  BFD_RELOC_ARM_OFFSET_IMM
+ENUMDOC
+  12-bit immediate offset, used in ARM-format ldr and str instructions.
+
+ENUM
+  BFD_RELOC_ARM_THUMB_OFFSET
+ENUMDOC
+  5-bit immediate offset, used in Thumb-format ldr and str instructions.
+
+ENUM
+  BFD_RELOC_ARM_TARGET1
+ENUMDOC
+  Pc-relative or absolute relocation depending on target.  Used for
+  entries in .init_array sections.
+ENUM
+  BFD_RELOC_ARM_ROSEGREL32
+ENUMDOC
+  Read-only segment base relative address.
+ENUM
+  BFD_RELOC_ARM_SBREL32
+ENUMDOC
+  Data segment base relative address.
+ENUM
+  BFD_RELOC_ARM_TARGET2
+ENUMDOC
+  This reloc is used for references to RTTI data from exception handling
+  tables.  The actual definition depends on the target.  It may be a
+  pc-relative or some form of GOT-indirect relocation.
+ENUM
+  BFD_RELOC_ARM_PREL31
+ENUMDOC
+  31-bit PC relative address.
+ENUM
+  BFD_RELOC_ARM_MOVW
+ENUMX
+  BFD_RELOC_ARM_MOVT
+ENUMX
+  BFD_RELOC_ARM_MOVW_PCREL
+ENUMX
+  BFD_RELOC_ARM_MOVT_PCREL
+ENUMX
+  BFD_RELOC_ARM_THUMB_MOVW
+ENUMX
+  BFD_RELOC_ARM_THUMB_MOVT
+ENUMX
+  BFD_RELOC_ARM_THUMB_MOVW_PCREL
+ENUMX
+  BFD_RELOC_ARM_THUMB_MOVT_PCREL
+ENUMDOC
+  Low and High halfword relocations for MOVW and MOVT instructions.
+
+ENUM
+  BFD_RELOC_ARM_JUMP_SLOT
+ENUMX
+  BFD_RELOC_ARM_GLOB_DAT
+ENUMX
+  BFD_RELOC_ARM_GOT32
+ENUMX
+  BFD_RELOC_ARM_PLT32
+ENUMX
+  BFD_RELOC_ARM_RELATIVE
+ENUMX
+  BFD_RELOC_ARM_GOTOFF
+ENUMX
+  BFD_RELOC_ARM_GOTPC
+ENUMX
+  BFD_RELOC_ARM_GOT_PREL
+ENUMDOC
+  Relocations for setting up GOTs and PLTs for shared libraries.
+
+ENUM
+  BFD_RELOC_ARM_TLS_GD32
+ENUMX
+  BFD_RELOC_ARM_TLS_LDO32
+ENUMX
+  BFD_RELOC_ARM_TLS_LDM32
+ENUMX
+  BFD_RELOC_ARM_TLS_DTPOFF32
+ENUMX
+  BFD_RELOC_ARM_TLS_DTPMOD32
+ENUMX
+  BFD_RELOC_ARM_TLS_TPOFF32
+ENUMX
+  BFD_RELOC_ARM_TLS_IE32
+ENUMX
+  BFD_RELOC_ARM_TLS_LE32
+ENUMX
+  BFD_RELOC_ARM_TLS_GOTDESC
+ENUMX
+  BFD_RELOC_ARM_TLS_CALL
+ENUMX
+  BFD_RELOC_ARM_THM_TLS_CALL
+ENUMX
+  BFD_RELOC_ARM_TLS_DESCSEQ
+ENUMX
+  BFD_RELOC_ARM_THM_TLS_DESCSEQ
+ENUMX
+  BFD_RELOC_ARM_TLS_DESC
+ENUMDOC
+  ARM thread-local storage relocations.
+
+ENUM
+  BFD_RELOC_ARM_ALU_PC_G0_NC
+ENUMX
+  BFD_RELOC_ARM_ALU_PC_G0
+ENUMX
+  BFD_RELOC_ARM_ALU_PC_G1_NC
+ENUMX
+  BFD_RELOC_ARM_ALU_PC_G1
+ENUMX
+  BFD_RELOC_ARM_ALU_PC_G2
+ENUMX
+  BFD_RELOC_ARM_LDR_PC_G0
+ENUMX
+  BFD_RELOC_ARM_LDR_PC_G1
+ENUMX
+  BFD_RELOC_ARM_LDR_PC_G2
+ENUMX
+  BFD_RELOC_ARM_LDRS_PC_G0
+ENUMX
+  BFD_RELOC_ARM_LDRS_PC_G1
+ENUMX
+  BFD_RELOC_ARM_LDRS_PC_G2
+ENUMX
+  BFD_RELOC_ARM_LDC_PC_G0
+ENUMX
+  BFD_RELOC_ARM_LDC_PC_G1
+ENUMX
+  BFD_RELOC_ARM_LDC_PC_G2
+ENUMX
+  BFD_RELOC_ARM_ALU_SB_G0_NC
+ENUMX
+  BFD_RELOC_ARM_ALU_SB_G0
+ENUMX
+  BFD_RELOC_ARM_ALU_SB_G1_NC
+ENUMX
+  BFD_RELOC_ARM_ALU_SB_G1
+ENUMX
+  BFD_RELOC_ARM_ALU_SB_G2
+ENUMX
+  BFD_RELOC_ARM_LDR_SB_G0
+ENUMX
+  BFD_RELOC_ARM_LDR_SB_G1
+ENUMX
+  BFD_RELOC_ARM_LDR_SB_G2
+ENUMX
+  BFD_RELOC_ARM_LDRS_SB_G0
+ENUMX
+  BFD_RELOC_ARM_LDRS_SB_G1
+ENUMX
+  BFD_RELOC_ARM_LDRS_SB_G2
+ENUMX
+  BFD_RELOC_ARM_LDC_SB_G0
+ENUMX
+  BFD_RELOC_ARM_LDC_SB_G1
+ENUMX
+  BFD_RELOC_ARM_LDC_SB_G2
+ENUMDOC
+  ARM group relocations.
+
+ENUM
+  BFD_RELOC_ARM_V4BX
+ENUMDOC
+  Annotation of BX instructions.
+
+ENUM
+  BFD_RELOC_ARM_IRELATIVE
+ENUMDOC
+  ARM support for STT_GNU_IFUNC.
+
+ENUM
+  BFD_RELOC_ARM_IMMEDIATE
+ENUMX
+  BFD_RELOC_ARM_ADRL_IMMEDIATE
+ENUMX
+  BFD_RELOC_ARM_T32_IMMEDIATE
+ENUMX
+  BFD_RELOC_ARM_T32_ADD_IMM
+ENUMX
+  BFD_RELOC_ARM_T32_IMM12
+ENUMX
+  BFD_RELOC_ARM_T32_ADD_PC12
+ENUMX
+  BFD_RELOC_ARM_SHIFT_IMM
+ENUMX
+  BFD_RELOC_ARM_SMC
+ENUMX
+  BFD_RELOC_ARM_HVC
+ENUMX
+  BFD_RELOC_ARM_SWI
+ENUMX
+  BFD_RELOC_ARM_MULTI
+ENUMX
+  BFD_RELOC_ARM_CP_OFF_IMM
+ENUMX
+  BFD_RELOC_ARM_CP_OFF_IMM_S2
+ENUMX
+  BFD_RELOC_ARM_T32_CP_OFF_IMM
+ENUMX
+  BFD_RELOC_ARM_T32_CP_OFF_IMM_S2
+ENUMX
+  BFD_RELOC_ARM_ADR_IMM
+ENUMX
+  BFD_RELOC_ARM_LDR_IMM
+ENUMX
+  BFD_RELOC_ARM_LITERAL
+ENUMX
+  BFD_RELOC_ARM_IN_POOL
+ENUMX
+  BFD_RELOC_ARM_OFFSET_IMM8
+ENUMX
+  BFD_RELOC_ARM_T32_OFFSET_U8
+ENUMX
+  BFD_RELOC_ARM_T32_OFFSET_IMM
+ENUMX
+  BFD_RELOC_ARM_HWLITERAL
+ENUMX
+  BFD_RELOC_ARM_THUMB_ADD
+ENUMX
+  BFD_RELOC_ARM_THUMB_IMM
+ENUMX
+  BFD_RELOC_ARM_THUMB_SHIFT
+ENUMDOC
+  These relocs are only used within the ARM assembler.  They are not
+  (at present) written to any object files.
+
+ENUM
+  BFD_RELOC_SH_PCDISP8BY2
+ENUMX
+  BFD_RELOC_SH_PCDISP12BY2
+ENUMX
+  BFD_RELOC_SH_IMM3
+ENUMX
+  BFD_RELOC_SH_IMM3U
+ENUMX
+  BFD_RELOC_SH_DISP12
+ENUMX
+  BFD_RELOC_SH_DISP12BY2
+ENUMX
+  BFD_RELOC_SH_DISP12BY4
+ENUMX
+  BFD_RELOC_SH_DISP12BY8
+ENUMX
+  BFD_RELOC_SH_DISP20
+ENUMX
+  BFD_RELOC_SH_DISP20BY8
+ENUMX
+  BFD_RELOC_SH_IMM4
+ENUMX
+  BFD_RELOC_SH_IMM4BY2
+ENUMX
+  BFD_RELOC_SH_IMM4BY4
+ENUMX
+  BFD_RELOC_SH_IMM8
+ENUMX
+  BFD_RELOC_SH_IMM8BY2
+ENUMX
+  BFD_RELOC_SH_IMM8BY4
+ENUMX
+  BFD_RELOC_SH_PCRELIMM8BY2
+ENUMX
+  BFD_RELOC_SH_PCRELIMM8BY4
+ENUMX
+  BFD_RELOC_SH_SWITCH16
+ENUMX
+  BFD_RELOC_SH_SWITCH32
+ENUMX
+  BFD_RELOC_SH_USES
+ENUMX
+  BFD_RELOC_SH_COUNT
+ENUMX
+  BFD_RELOC_SH_ALIGN
+ENUMX
+  BFD_RELOC_SH_CODE
+ENUMX
+  BFD_RELOC_SH_DATA
+ENUMX
+  BFD_RELOC_SH_LABEL
+ENUMX
+  BFD_RELOC_SH_LOOP_START
+ENUMX
+  BFD_RELOC_SH_LOOP_END
+ENUMX
+  BFD_RELOC_SH_COPY
+ENUMX
+  BFD_RELOC_SH_GLOB_DAT
+ENUMX
+  BFD_RELOC_SH_JMP_SLOT
+ENUMX
+  BFD_RELOC_SH_RELATIVE
+ENUMX
+  BFD_RELOC_SH_GOTPC
+ENUMX
+  BFD_RELOC_SH_GOT_LOW16
+ENUMX
+  BFD_RELOC_SH_GOT_MEDLOW16
+ENUMX
+  BFD_RELOC_SH_GOT_MEDHI16
+ENUMX
+  BFD_RELOC_SH_GOT_HI16
+ENUMX
+  BFD_RELOC_SH_GOTPLT_LOW16
+ENUMX
+  BFD_RELOC_SH_GOTPLT_MEDLOW16
+ENUMX
+  BFD_RELOC_SH_GOTPLT_MEDHI16
+ENUMX
+  BFD_RELOC_SH_GOTPLT_HI16
+ENUMX
+  BFD_RELOC_SH_PLT_LOW16
+ENUMX
+  BFD_RELOC_SH_PLT_MEDLOW16
+ENUMX
+  BFD_RELOC_SH_PLT_MEDHI16
+ENUMX
+  BFD_RELOC_SH_PLT_HI16
+ENUMX
+  BFD_RELOC_SH_GOTOFF_LOW16
+ENUMX
+  BFD_RELOC_SH_GOTOFF_MEDLOW16
+ENUMX
+  BFD_RELOC_SH_GOTOFF_MEDHI16
+ENUMX
+  BFD_RELOC_SH_GOTOFF_HI16
+ENUMX
+  BFD_RELOC_SH_GOTPC_LOW16
+ENUMX
+  BFD_RELOC_SH_GOTPC_MEDLOW16
+ENUMX
+  BFD_RELOC_SH_GOTPC_MEDHI16
+ENUMX
+  BFD_RELOC_SH_GOTPC_HI16
+ENUMX
+  BFD_RELOC_SH_COPY64
+ENUMX
+  BFD_RELOC_SH_GLOB_DAT64
+ENUMX
+  BFD_RELOC_SH_JMP_SLOT64
+ENUMX
+  BFD_RELOC_SH_RELATIVE64
+ENUMX
+  BFD_RELOC_SH_GOT10BY4
+ENUMX
+  BFD_RELOC_SH_GOT10BY8
+ENUMX
+  BFD_RELOC_SH_GOTPLT10BY4
+ENUMX
+  BFD_RELOC_SH_GOTPLT10BY8
+ENUMX
+  BFD_RELOC_SH_GOTPLT32
+ENUMX
+  BFD_RELOC_SH_SHMEDIA_CODE
+ENUMX
+  BFD_RELOC_SH_IMMU5
+ENUMX
+  BFD_RELOC_SH_IMMS6
+ENUMX
+  BFD_RELOC_SH_IMMS6BY32
+ENUMX
+  BFD_RELOC_SH_IMMU6
+ENUMX
+  BFD_RELOC_SH_IMMS10
+ENUMX
+  BFD_RELOC_SH_IMMS10BY2
+ENUMX
+  BFD_RELOC_SH_IMMS10BY4
+ENUMX
+  BFD_RELOC_SH_IMMS10BY8
+ENUMX
+  BFD_RELOC_SH_IMMS16
+ENUMX
+  BFD_RELOC_SH_IMMU16
+ENUMX
+  BFD_RELOC_SH_IMM_LOW16
+ENUMX
+  BFD_RELOC_SH_IMM_LOW16_PCREL
+ENUMX
+  BFD_RELOC_SH_IMM_MEDLOW16
+ENUMX
+  BFD_RELOC_SH_IMM_MEDLOW16_PCREL
+ENUMX
+  BFD_RELOC_SH_IMM_MEDHI16
+ENUMX
+  BFD_RELOC_SH_IMM_MEDHI16_PCREL
+ENUMX
+  BFD_RELOC_SH_IMM_HI16
+ENUMX
+  BFD_RELOC_SH_IMM_HI16_PCREL
+ENUMX
+  BFD_RELOC_SH_PT_16
+ENUMX
+  BFD_RELOC_SH_TLS_GD_32
+ENUMX
+  BFD_RELOC_SH_TLS_LD_32
+ENUMX
+  BFD_RELOC_SH_TLS_LDO_32
+ENUMX
+  BFD_RELOC_SH_TLS_IE_32
+ENUMX
+  BFD_RELOC_SH_TLS_LE_32
+ENUMX
+  BFD_RELOC_SH_TLS_DTPMOD32
+ENUMX
+  BFD_RELOC_SH_TLS_DTPOFF32
+ENUMX
+  BFD_RELOC_SH_TLS_TPOFF32
+ENUMX
+  BFD_RELOC_SH_GOT20
+ENUMX
+  BFD_RELOC_SH_GOTOFF20
+ENUMX
+  BFD_RELOC_SH_GOTFUNCDESC
+ENUMX
+  BFD_RELOC_SH_GOTFUNCDESC20
+ENUMX
+  BFD_RELOC_SH_GOTOFFFUNCDESC
+ENUMX
+  BFD_RELOC_SH_GOTOFFFUNCDESC20
+ENUMX
+  BFD_RELOC_SH_FUNCDESC
+ENUMDOC
+  Renesas / SuperH SH relocs.  Not all of these appear in object files.
+
+ENUM
+  BFD_RELOC_ARC_B22_PCREL
+ENUMDOC
+  ARC Cores relocs.
+  ARC 22 bit pc-relative branch.  The lowest two bits must be zero and are
+  not stored in the instruction.  The high 20 bits are installed in bits 26
+  through 7 of the instruction.
+ENUM
+  BFD_RELOC_ARC_B26
+ENUMDOC
+  ARC 26 bit absolute branch.  The lowest two bits must be zero and are not
+  stored in the instruction.  The high 24 bits are installed in bits 23
+  through 0.
+
+ENUM
+  BFD_RELOC_BFIN_16_IMM
+ENUMDOC
+  ADI Blackfin 16 bit immediate absolute reloc.
+ENUM
+  BFD_RELOC_BFIN_16_HIGH
+ENUMDOC
+  ADI Blackfin 16 bit immediate absolute reloc higher 16 bits.
+ENUM
+  BFD_RELOC_BFIN_4_PCREL
+ENUMDOC
+  ADI Blackfin 'a' part of LSETUP.
+ENUM
+  BFD_RELOC_BFIN_5_PCREL
+ENUMDOC
+  ADI Blackfin.
+ENUM
+  BFD_RELOC_BFIN_16_LOW
+ENUMDOC
+  ADI Blackfin 16 bit immediate absolute reloc lower 16 bits.
+ENUM
+  BFD_RELOC_BFIN_10_PCREL
+ENUMDOC
+  ADI Blackfin.
+ENUM
+  BFD_RELOC_BFIN_11_PCREL
+ENUMDOC
+  ADI Blackfin 'b' part of LSETUP.
+ENUM
+  BFD_RELOC_BFIN_12_PCREL_JUMP
+ENUMDOC
+  ADI Blackfin.
+ENUM
+  BFD_RELOC_BFIN_12_PCREL_JUMP_S
+ENUMDOC
+  ADI Blackfin Short jump, pcrel.
+ENUM
+  BFD_RELOC_BFIN_24_PCREL_CALL_X
+ENUMDOC
+  ADI Blackfin Call.x not implemented.
+ENUM
+  BFD_RELOC_BFIN_24_PCREL_JUMP_L
+ENUMDOC
+  ADI Blackfin Long Jump pcrel.
+ENUM
+  BFD_RELOC_BFIN_GOT17M4
+ENUMX
+  BFD_RELOC_BFIN_GOTHI
+ENUMX
+  BFD_RELOC_BFIN_GOTLO
+ENUMX
+  BFD_RELOC_BFIN_FUNCDESC
+ENUMX
+  BFD_RELOC_BFIN_FUNCDESC_GOT17M4
+ENUMX
+  BFD_RELOC_BFIN_FUNCDESC_GOTHI
+ENUMX
+  BFD_RELOC_BFIN_FUNCDESC_GOTLO
+ENUMX
+  BFD_RELOC_BFIN_FUNCDESC_VALUE
+ENUMX
+  BFD_RELOC_BFIN_FUNCDESC_GOTOFF17M4
+ENUMX
+  BFD_RELOC_BFIN_FUNCDESC_GOTOFFHI
+ENUMX
+  BFD_RELOC_BFIN_FUNCDESC_GOTOFFLO
+ENUMX
+  BFD_RELOC_BFIN_GOTOFF17M4
+ENUMX
+  BFD_RELOC_BFIN_GOTOFFHI
+ENUMX
+  BFD_RELOC_BFIN_GOTOFFLO
+ENUMDOC
+  ADI Blackfin FD-PIC relocations.
+ENUM
+  BFD_RELOC_BFIN_GOT
+ENUMDOC
+  ADI Blackfin GOT relocation.
+ENUM
+  BFD_RELOC_BFIN_PLTPC
+ENUMDOC
+  ADI Blackfin PLTPC relocation.
+ENUM
+  BFD_ARELOC_BFIN_PUSH
+ENUMDOC
+  ADI Blackfin arithmetic relocation.
+ENUM
+  BFD_ARELOC_BFIN_CONST
+ENUMDOC
+  ADI Blackfin arithmetic relocation.
+ENUM
+  BFD_ARELOC_BFIN_ADD
+ENUMDOC
+  ADI Blackfin arithmetic relocation.
+ENUM
+  BFD_ARELOC_BFIN_SUB
+ENUMDOC
+  ADI Blackfin arithmetic relocation.
+ENUM
+  BFD_ARELOC_BFIN_MULT
+ENUMDOC
+  ADI Blackfin arithmetic relocation.
+ENUM
+  BFD_ARELOC_BFIN_DIV
+ENUMDOC
+  ADI Blackfin arithmetic relocation.
+ENUM
+  BFD_ARELOC_BFIN_MOD
+ENUMDOC
+  ADI Blackfin arithmetic relocation.
+ENUM
+  BFD_ARELOC_BFIN_LSHIFT
+ENUMDOC
+  ADI Blackfin arithmetic relocation.
+ENUM
+  BFD_ARELOC_BFIN_RSHIFT
+ENUMDOC
+  ADI Blackfin arithmetic relocation.
+ENUM
+  BFD_ARELOC_BFIN_AND
+ENUMDOC
+  ADI Blackfin arithmetic relocation.
+ENUM
+  BFD_ARELOC_BFIN_OR
+ENUMDOC
+  ADI Blackfin arithmetic relocation.
+ENUM
+  BFD_ARELOC_BFIN_XOR
+ENUMDOC
+  ADI Blackfin arithmetic relocation.
+ENUM
+  BFD_ARELOC_BFIN_LAND
+ENUMDOC
+  ADI Blackfin arithmetic relocation.
+ENUM
+  BFD_ARELOC_BFIN_LOR
+ENUMDOC
+  ADI Blackfin arithmetic relocation.
+ENUM
+  BFD_ARELOC_BFIN_LEN
+ENUMDOC
+  ADI Blackfin arithmetic relocation.
+ENUM
+  BFD_ARELOC_BFIN_NEG
+ENUMDOC
+  ADI Blackfin arithmetic relocation.
+ENUM
+  BFD_ARELOC_BFIN_COMP
+ENUMDOC
+  ADI Blackfin arithmetic relocation.
+ENUM
+  BFD_ARELOC_BFIN_PAGE
+ENUMDOC
+  ADI Blackfin arithmetic relocation.
+ENUM
+  BFD_ARELOC_BFIN_HWPAGE
+ENUMDOC
+  ADI Blackfin arithmetic relocation.
+ENUM
+  BFD_ARELOC_BFIN_ADDR
+ENUMDOC
+  ADI Blackfin arithmetic relocation.
+
+ENUM
+  BFD_RELOC_D10V_10_PCREL_R
+ENUMDOC
+  Mitsubishi D10V relocs.
+  This is a 10-bit reloc with the right 2 bits
+  assumed to be 0.
+ENUM
+  BFD_RELOC_D10V_10_PCREL_L
+ENUMDOC
+  Mitsubishi D10V relocs.
+  This is a 10-bit reloc with the right 2 bits
+  assumed to be 0.  This is the same as the previous reloc
+  except it is in the left container, i.e.,
+  shifted left 15 bits.
+ENUM
+  BFD_RELOC_D10V_18
+ENUMDOC
+  This is an 18-bit reloc with the right 2 bits
+  assumed to be 0.
+ENUM
+  BFD_RELOC_D10V_18_PCREL
+ENUMDOC
+  This is an 18-bit reloc with the right 2 bits
+  assumed to be 0.
+
+ENUM
+  BFD_RELOC_D30V_6
+ENUMDOC
+  Mitsubishi D30V relocs.
+  This is a 6-bit absolute reloc.
+ENUM
+  BFD_RELOC_D30V_9_PCREL
+ENUMDOC
+  This is a 6-bit pc-relative reloc with
+  the right 3 bits assumed to be 0.
+ENUM
+  BFD_RELOC_D30V_9_PCREL_R
+ENUMDOC
+  This is a 6-bit pc-relative reloc with
+  the right 3 bits assumed to be 0. Same
+  as the previous reloc but on the right side
+  of the container.
+ENUM
+  BFD_RELOC_D30V_15
+ENUMDOC
+  This is a 12-bit absolute reloc with the
+  right 3 bitsassumed to be 0.
+ENUM
+  BFD_RELOC_D30V_15_PCREL
+ENUMDOC
+  This is a 12-bit pc-relative reloc with
+  the right 3 bits assumed to be 0.
+ENUM
+  BFD_RELOC_D30V_15_PCREL_R
+ENUMDOC
+  This is a 12-bit pc-relative reloc with
+  the right 3 bits assumed to be 0. Same
+  as the previous reloc but on the right side
+  of the container.
+ENUM
+  BFD_RELOC_D30V_21
+ENUMDOC
+  This is an 18-bit absolute reloc with
+  the right 3 bits assumed to be 0.
+ENUM
+  BFD_RELOC_D30V_21_PCREL
+ENUMDOC
+  This is an 18-bit pc-relative reloc with
+  the right 3 bits assumed to be 0.
+ENUM
+  BFD_RELOC_D30V_21_PCREL_R
+ENUMDOC
+  This is an 18-bit pc-relative reloc with
+  the right 3 bits assumed to be 0. Same
+  as the previous reloc but on the right side
+  of the container.
+ENUM
+  BFD_RELOC_D30V_32
+ENUMDOC
+  This is a 32-bit absolute reloc.
+ENUM
+  BFD_RELOC_D30V_32_PCREL
+ENUMDOC
+  This is a 32-bit pc-relative reloc.
+
+ENUM
+  BFD_RELOC_DLX_HI16_S
+ENUMDOC
+  DLX relocs
+ENUM
+  BFD_RELOC_DLX_LO16
+ENUMDOC
+  DLX relocs
+ENUM
+  BFD_RELOC_DLX_JMP26
+ENUMDOC
+  DLX relocs
+
+ENUM
+  BFD_RELOC_M32C_HI8
+ENUMX
+  BFD_RELOC_M32C_RL_JUMP
+ENUMX
+  BFD_RELOC_M32C_RL_1ADDR
+ENUMX
+  BFD_RELOC_M32C_RL_2ADDR
+ENUMDOC
+  Renesas M16C/M32C Relocations.
+
+ENUM
+  BFD_RELOC_M32R_24
+ENUMDOC
+  Renesas M32R (formerly Mitsubishi M32R) relocs.
+  This is a 24 bit absolute address.
+ENUM
+  BFD_RELOC_M32R_10_PCREL
+ENUMDOC
+  This is a 10-bit pc-relative reloc with the right 2 bits assumed to be 0.
+ENUM
+  BFD_RELOC_M32R_18_PCREL
+ENUMDOC
+  This is an 18-bit reloc with the right 2 bits assumed to be 0.
+ENUM
+  BFD_RELOC_M32R_26_PCREL
+ENUMDOC
+  This is a 26-bit reloc with the right 2 bits assumed to be 0.
+ENUM
+  BFD_RELOC_M32R_HI16_ULO
+ENUMDOC
+  This is a 16-bit reloc containing the high 16 bits of an address
+  used when the lower 16 bits are treated as unsigned.
+ENUM
+  BFD_RELOC_M32R_HI16_SLO
+ENUMDOC
+  This is a 16-bit reloc containing the high 16 bits of an address
+  used when the lower 16 bits are treated as signed.
+ENUM
+  BFD_RELOC_M32R_LO16
+ENUMDOC
+  This is a 16-bit reloc containing the lower 16 bits of an address.
+ENUM
+  BFD_RELOC_M32R_SDA16
+ENUMDOC
+  This is a 16-bit reloc containing the small data area offset for use in
+  add3, load, and store instructions.
+ENUM
+  BFD_RELOC_M32R_GOT24
+ENUMX
+  BFD_RELOC_M32R_26_PLTREL
+ENUMX
+  BFD_RELOC_M32R_COPY
+ENUMX
+  BFD_RELOC_M32R_GLOB_DAT
+ENUMX
+  BFD_RELOC_M32R_JMP_SLOT
+ENUMX
+  BFD_RELOC_M32R_RELATIVE
+ENUMX
+  BFD_RELOC_M32R_GOTOFF
+ENUMX
+  BFD_RELOC_M32R_GOTOFF_HI_ULO
+ENUMX
+  BFD_RELOC_M32R_GOTOFF_HI_SLO
+ENUMX
+  BFD_RELOC_M32R_GOTOFF_LO
+ENUMX
+  BFD_RELOC_M32R_GOTPC24
+ENUMX
+  BFD_RELOC_M32R_GOT16_HI_ULO
+ENUMX
+  BFD_RELOC_M32R_GOT16_HI_SLO
+ENUMX
+  BFD_RELOC_M32R_GOT16_LO
+ENUMX
+  BFD_RELOC_M32R_GOTPC_HI_ULO
+ENUMX
+  BFD_RELOC_M32R_GOTPC_HI_SLO
+ENUMX
+  BFD_RELOC_M32R_GOTPC_LO
+ENUMDOC
+  For PIC.
+
+
+ENUM
+  BFD_RELOC_V850_9_PCREL
+ENUMDOC
+  This is a 9-bit reloc
+ENUM
+  BFD_RELOC_V850_22_PCREL
+ENUMDOC
+  This is a 22-bit reloc
+
+ENUM
+  BFD_RELOC_V850_SDA_16_16_OFFSET
+ENUMDOC
+  This is a 16 bit offset from the short data area pointer.
+ENUM
+  BFD_RELOC_V850_SDA_15_16_OFFSET
+ENUMDOC
+  This is a 16 bit offset (of which only 15 bits are used) from the
+  short data area pointer.
+ENUM
+  BFD_RELOC_V850_ZDA_16_16_OFFSET
+ENUMDOC
+  This is a 16 bit offset from the zero data area pointer.
+ENUM
+  BFD_RELOC_V850_ZDA_15_16_OFFSET
+ENUMDOC
+  This is a 16 bit offset (of which only 15 bits are used) from the
+  zero data area pointer.
+ENUM
+  BFD_RELOC_V850_TDA_6_8_OFFSET
+ENUMDOC
+  This is an 8 bit offset (of which only 6 bits are used) from the
+  tiny data area pointer.
+ENUM
+  BFD_RELOC_V850_TDA_7_8_OFFSET
+ENUMDOC
+  This is an 8bit offset (of which only 7 bits are used) from the tiny
+  data area pointer.
+ENUM
+  BFD_RELOC_V850_TDA_7_7_OFFSET
+ENUMDOC
+  This is a 7 bit offset from the tiny data area pointer.
+ENUM
+  BFD_RELOC_V850_TDA_16_16_OFFSET
+ENUMDOC
+  This is a 16 bit offset from the tiny data area pointer.
+COMMENT
+ENUM
+  BFD_RELOC_V850_TDA_4_5_OFFSET
+ENUMDOC
+  This is a 5 bit offset (of which only 4 bits are used) from the tiny
+  data area pointer.
+ENUM
+  BFD_RELOC_V850_TDA_4_4_OFFSET
+ENUMDOC
+  This is a 4 bit offset from the tiny data area pointer.
+ENUM
+  BFD_RELOC_V850_SDA_16_16_SPLIT_OFFSET
+ENUMDOC
+  This is a 16 bit offset from the short data area pointer, with the
+  bits placed non-contiguously in the instruction.
+ENUM
+  BFD_RELOC_V850_ZDA_16_16_SPLIT_OFFSET
+ENUMDOC
+  This is a 16 bit offset from the zero data area pointer, with the
+  bits placed non-contiguously in the instruction.
+ENUM
+  BFD_RELOC_V850_CALLT_6_7_OFFSET
+ENUMDOC
+  This is a 6 bit offset from the call table base pointer.
+ENUM
+  BFD_RELOC_V850_CALLT_16_16_OFFSET
+ENUMDOC
+  This is a 16 bit offset from the call table base pointer.
+ENUM
+  BFD_RELOC_V850_LONGCALL
+ENUMDOC
+  Used for relaxing indirect function calls.
+ENUM
+  BFD_RELOC_V850_LONGJUMP
+ENUMDOC
+  Used for relaxing indirect jumps.
+ENUM
+  BFD_RELOC_V850_ALIGN
+ENUMDOC
+  Used to maintain alignment whilst relaxing.
+ENUM
+  BFD_RELOC_V850_LO16_SPLIT_OFFSET
+ENUMDOC
+  This is a variation of BFD_RELOC_LO16 that can be used in v850e ld.bu
+  instructions.
+ENUM
+  BFD_RELOC_V850_16_PCREL
+ENUMDOC
+  This is a 16-bit reloc.
+ENUM     
+  BFD_RELOC_V850_17_PCREL
+ENUMDOC
+  This is a 17-bit reloc.
+ENUM     
+  BFD_RELOC_V850_23
+ENUMDOC
+  This is a 23-bit reloc.
+ENUM     
+  BFD_RELOC_V850_32_PCREL
+ENUMDOC
+  This is a 32-bit reloc.
+ENUM     
+  BFD_RELOC_V850_32_ABS
+ENUMDOC
+  This is a 32-bit reloc.
+ENUM     
+  BFD_RELOC_V850_16_SPLIT_OFFSET
+ENUMDOC
+  This is a 16-bit reloc.
+ENUM     
+  BFD_RELOC_V850_16_S1
+ENUMDOC
+  This is a 16-bit reloc.
+ENUM     
+  BFD_RELOC_V850_LO16_S1
+ENUMDOC
+  Low 16 bits. 16 bit shifted by 1.
+ENUM     
+  BFD_RELOC_V850_CALLT_15_16_OFFSET
+ENUMDOC
+  This is a 16 bit offset from the call table base pointer.
+ENUM     
+  BFD_RELOC_V850_32_GOTPCREL
+ENUMDOC
+  DSO relocations.
+ENUM     
+  BFD_RELOC_V850_16_GOT
+ENUMDOC
+  DSO relocations.
+ENUM     
+  BFD_RELOC_V850_32_GOT
+ENUMDOC
+  DSO relocations.
+ENUM     
+  BFD_RELOC_V850_22_PLT_PCREL
+ENUMDOC
+  DSO relocations.
+ENUM     
+  BFD_RELOC_V850_32_PLT_PCREL
+ENUMDOC
+  DSO relocations.
+ENUM     
+  BFD_RELOC_V850_COPY
+ENUMDOC
+  DSO relocations.
+ENUM     
+  BFD_RELOC_V850_GLOB_DAT
+ENUMDOC
+  DSO relocations.
+ENUM     
+  BFD_RELOC_V850_JMP_SLOT
+ENUMDOC
+  DSO relocations.
+ENUM     
+  BFD_RELOC_V850_RELATIVE
+ENUMDOC
+  DSO relocations.
+ENUM     
+  BFD_RELOC_V850_16_GOTOFF
+ENUMDOC
+  DSO relocations.
+ENUM     
+  BFD_RELOC_V850_32_GOTOFF
+ENUMDOC
+  DSO relocations.
+ENUM     
+  BFD_RELOC_V850_CODE
+ENUMDOC
+  start code.
+ENUM     
+  BFD_RELOC_V850_DATA
+ENUMDOC
+  start data in text.
+ENUM
+  BFD_RELOC_MN10300_32_PCREL
+ENUMDOC
+  This is a 32bit pcrel reloc for the mn10300, offset by two bytes in the
+  instruction.
+ENUM
+  BFD_RELOC_MN10300_16_PCREL
+ENUMDOC
+  This is a 16bit pcrel reloc for the mn10300, offset by two bytes in the
+  instruction.
+
+ENUM
+  BFD_RELOC_TIC30_LDP
+ENUMDOC
+  This is a 8bit DP reloc for the tms320c30, where the most
+  significant 8 bits of a 24 bit word are placed into the least
+  significant 8 bits of the opcode.
+
+ENUM
+  BFD_RELOC_TIC54X_PARTLS7
+ENUMDOC
+  This is a 7bit reloc for the tms320c54x, where the least
+  significant 7 bits of a 16 bit word are placed into the least
+  significant 7 bits of the opcode.
+
+ENUM
+  BFD_RELOC_TIC54X_PARTMS9
+ENUMDOC
+  This is a 9bit DP reloc for the tms320c54x, where the most
+  significant 9 bits of a 16 bit word are placed into the least
+  significant 9 bits of the opcode.
+
+ENUM
+  BFD_RELOC_TIC54X_23
+ENUMDOC
+  This is an extended address 23-bit reloc for the tms320c54x.
+
+ENUM
+  BFD_RELOC_TIC54X_16_OF_23
+ENUMDOC
+  This is a 16-bit reloc for the tms320c54x, where the least
+  significant 16 bits of a 23-bit extended address are placed into
+  the opcode.
+
+ENUM
+  BFD_RELOC_TIC54X_MS7_OF_23
+ENUMDOC
+  This is a reloc for the tms320c54x, where the most
+  significant 7 bits of a 23-bit extended address are placed into
+  the opcode.
+
+ENUM
+  BFD_RELOC_C6000_PCR_S21
+ENUMX
+  BFD_RELOC_C6000_PCR_S12
+ENUMX
+  BFD_RELOC_C6000_PCR_S10
+ENUMX
+  BFD_RELOC_C6000_PCR_S7
+ENUMX
+  BFD_RELOC_C6000_ABS_S16
+ENUMX
+  BFD_RELOC_C6000_ABS_L16
+ENUMX
+  BFD_RELOC_C6000_ABS_H16
+ENUMX
+  BFD_RELOC_C6000_SBR_U15_B
+ENUMX
+  BFD_RELOC_C6000_SBR_U15_H
+ENUMX
+  BFD_RELOC_C6000_SBR_U15_W
+ENUMX
+  BFD_RELOC_C6000_SBR_S16
+ENUMX
+  BFD_RELOC_C6000_SBR_L16_B
+ENUMX
+  BFD_RELOC_C6000_SBR_L16_H
+ENUMX
+  BFD_RELOC_C6000_SBR_L16_W
+ENUMX
+  BFD_RELOC_C6000_SBR_H16_B
+ENUMX
+  BFD_RELOC_C6000_SBR_H16_H
+ENUMX
+  BFD_RELOC_C6000_SBR_H16_W
+ENUMX
+  BFD_RELOC_C6000_SBR_GOT_U15_W
+ENUMX
+  BFD_RELOC_C6000_SBR_GOT_L16_W
+ENUMX
+  BFD_RELOC_C6000_SBR_GOT_H16_W
+ENUMX
+  BFD_RELOC_C6000_DSBT_INDEX
+ENUMX
+  BFD_RELOC_C6000_PREL31
+ENUMX
+  BFD_RELOC_C6000_COPY
+ENUMX
+  BFD_RELOC_C6000_JUMP_SLOT
+ENUMX
+  BFD_RELOC_C6000_EHTYPE
+ENUMX
+  BFD_RELOC_C6000_PCR_H16
+ENUMX
+  BFD_RELOC_C6000_PCR_L16
+ENUMX
+  BFD_RELOC_C6000_ALIGN
+ENUMX
+  BFD_RELOC_C6000_FPHEAD
+ENUMX
+  BFD_RELOC_C6000_NOCMP
+ENUMDOC
+  TMS320C6000 relocations.
+
+ENUM
+  BFD_RELOC_FR30_48
+ENUMDOC
+  This is a 48 bit reloc for the FR30 that stores 32 bits.
+ENUM
+  BFD_RELOC_FR30_20
+ENUMDOC
+  This is a 32 bit reloc for the FR30 that stores 20 bits split up into
+  two sections.
+ENUM
+  BFD_RELOC_FR30_6_IN_4
+ENUMDOC
+  This is a 16 bit reloc for the FR30 that stores a 6 bit word offset in
+  4 bits.
+ENUM
+  BFD_RELOC_FR30_8_IN_8
+ENUMDOC
+  This is a 16 bit reloc for the FR30 that stores an 8 bit byte offset
+  into 8 bits.
+ENUM
+  BFD_RELOC_FR30_9_IN_8
+ENUMDOC
+  This is a 16 bit reloc for the FR30 that stores a 9 bit short offset
+  into 8 bits.
+ENUM
+  BFD_RELOC_FR30_10_IN_8
+ENUMDOC
+  This is a 16 bit reloc for the FR30 that stores a 10 bit word offset
+  into 8 bits.
+ENUM
+  BFD_RELOC_FR30_9_PCREL
+ENUMDOC
+  This is a 16 bit reloc for the FR30 that stores a 9 bit pc relative
+  short offset into 8 bits.
+ENUM
+  BFD_RELOC_FR30_12_PCREL
+ENUMDOC
+  This is a 16 bit reloc for the FR30 that stores a 12 bit pc relative
+  short offset into 11 bits.
+
+ENUM
+  BFD_RELOC_MCORE_PCREL_IMM8BY4
+ENUMX
+  BFD_RELOC_MCORE_PCREL_IMM11BY2
+ENUMX
+  BFD_RELOC_MCORE_PCREL_IMM4BY2
+ENUMX
+  BFD_RELOC_MCORE_PCREL_32
+ENUMX
+  BFD_RELOC_MCORE_PCREL_JSR_IMM11BY2
+ENUMX
+  BFD_RELOC_MCORE_RVA
+ENUMDOC
+  Motorola Mcore relocations.
+
+ENUM
+  BFD_RELOC_MEP_8
+ENUMX
+  BFD_RELOC_MEP_16
+ENUMX
+  BFD_RELOC_MEP_32
+ENUMX
+  BFD_RELOC_MEP_PCREL8A2
+ENUMX
+  BFD_RELOC_MEP_PCREL12A2
+ENUMX
+  BFD_RELOC_MEP_PCREL17A2
+ENUMX
+  BFD_RELOC_MEP_PCREL24A2
+ENUMX
+  BFD_RELOC_MEP_PCABS24A2
+ENUMX
+  BFD_RELOC_MEP_LOW16
+ENUMX
+  BFD_RELOC_MEP_HI16U
+ENUMX
+  BFD_RELOC_MEP_HI16S
+ENUMX
+  BFD_RELOC_MEP_GPREL
+ENUMX
+  BFD_RELOC_MEP_TPREL
+ENUMX
+  BFD_RELOC_MEP_TPREL7
+ENUMX
+  BFD_RELOC_MEP_TPREL7A2
+ENUMX
+  BFD_RELOC_MEP_TPREL7A4
+ENUMX
+  BFD_RELOC_MEP_UIMM24
+ENUMX
+  BFD_RELOC_MEP_ADDR24A4
+ENUMX
+  BFD_RELOC_MEP_GNU_VTINHERIT
+ENUMX
+  BFD_RELOC_MEP_GNU_VTENTRY
+ENUMDOC
+  Toshiba Media Processor Relocations.
+COMMENT
+
+ENUM
+  BFD_RELOC_MMIX_GETA
+ENUMX
+  BFD_RELOC_MMIX_GETA_1
+ENUMX
+  BFD_RELOC_MMIX_GETA_2
+ENUMX
+  BFD_RELOC_MMIX_GETA_3
+ENUMDOC
+  These are relocations for the GETA instruction.
+ENUM
+  BFD_RELOC_MMIX_CBRANCH
+ENUMX
+  BFD_RELOC_MMIX_CBRANCH_J
+ENUMX
+  BFD_RELOC_MMIX_CBRANCH_1
+ENUMX
+  BFD_RELOC_MMIX_CBRANCH_2
+ENUMX
+  BFD_RELOC_MMIX_CBRANCH_3
+ENUMDOC
+  These are relocations for a conditional branch instruction.
+ENUM
+  BFD_RELOC_MMIX_PUSHJ
+ENUMX
+  BFD_RELOC_MMIX_PUSHJ_1
+ENUMX
+  BFD_RELOC_MMIX_PUSHJ_2
+ENUMX
+  BFD_RELOC_MMIX_PUSHJ_3
+ENUMX
+  BFD_RELOC_MMIX_PUSHJ_STUBBABLE
+ENUMDOC
+  These are relocations for the PUSHJ instruction.
+ENUM
+  BFD_RELOC_MMIX_JMP
+ENUMX
+  BFD_RELOC_MMIX_JMP_1
+ENUMX
+  BFD_RELOC_MMIX_JMP_2
+ENUMX
+  BFD_RELOC_MMIX_JMP_3
+ENUMDOC
+  These are relocations for the JMP instruction.
+ENUM
+  BFD_RELOC_MMIX_ADDR19
+ENUMDOC
+  This is a relocation for a relative address as in a GETA instruction or
+  a branch.
+ENUM
+  BFD_RELOC_MMIX_ADDR27
+ENUMDOC
+  This is a relocation for a relative address as in a JMP instruction.
+ENUM
+  BFD_RELOC_MMIX_REG_OR_BYTE
+ENUMDOC
+  This is a relocation for an instruction field that may be a general
+  register or a value 0..255.
+ENUM
+  BFD_RELOC_MMIX_REG
+ENUMDOC
+  This is a relocation for an instruction field that may be a general
+  register.
+ENUM
+  BFD_RELOC_MMIX_BASE_PLUS_OFFSET
+ENUMDOC
+  This is a relocation for two instruction fields holding a register and
+  an offset, the equivalent of the relocation.
+ENUM
+  BFD_RELOC_MMIX_LOCAL
+ENUMDOC
+  This relocation is an assertion that the expression is not allocated as
+  a global register.  It does not modify contents.
+
+ENUM
+  BFD_RELOC_AVR_7_PCREL
+ENUMDOC
+  This is a 16 bit reloc for the AVR that stores 8 bit pc relative
+  short offset into 7 bits.
+ENUM
+  BFD_RELOC_AVR_13_PCREL
+ENUMDOC
+  This is a 16 bit reloc for the AVR that stores 13 bit pc relative
+  short offset into 12 bits.
+ENUM
+  BFD_RELOC_AVR_16_PM
+ENUMDOC
+  This is a 16 bit reloc for the AVR that stores 17 bit value (usually
+  program memory address) into 16 bits.
+ENUM
+  BFD_RELOC_AVR_LO8_LDI
+ENUMDOC
+  This is a 16 bit reloc for the AVR that stores 8 bit value (usually
+  data memory address) into 8 bit immediate value of LDI insn.
+ENUM
+  BFD_RELOC_AVR_HI8_LDI
+ENUMDOC
+  This is a 16 bit reloc for the AVR that stores 8 bit value (high 8 bit
+  of data memory address) into 8 bit immediate value of LDI insn.
+ENUM
+  BFD_RELOC_AVR_HH8_LDI
+ENUMDOC
+  This is a 16 bit reloc for the AVR that stores 8 bit value (most high 8 bit
+  of program memory address) into 8 bit immediate value of LDI insn.
+ENUM
+  BFD_RELOC_AVR_MS8_LDI
+ENUMDOC
+  This is a 16 bit reloc for the AVR that stores 8 bit value (most high 8 bit
+  of 32 bit value) into 8 bit immediate value of LDI insn.
+ENUM
+  BFD_RELOC_AVR_LO8_LDI_NEG
+ENUMDOC
+  This is a 16 bit reloc for the AVR that stores negated 8 bit value
+  (usually data memory address) into 8 bit immediate value of SUBI insn.
+ENUM
+  BFD_RELOC_AVR_HI8_LDI_NEG
+ENUMDOC
+  This is a 16 bit reloc for the AVR that stores negated 8 bit value
+  (high 8 bit of data memory address) into 8 bit immediate value of
+  SUBI insn.
+ENUM
+  BFD_RELOC_AVR_HH8_LDI_NEG
+ENUMDOC
+  This is a 16 bit reloc for the AVR that stores negated 8 bit value
+  (most high 8 bit of program memory address) into 8 bit immediate value
+  of LDI or SUBI insn.
+ENUM
+  BFD_RELOC_AVR_MS8_LDI_NEG
+ENUMDOC
+  This is a 16 bit reloc for the AVR that stores negated 8 bit value (msb
+  of 32 bit value) into 8 bit immediate value of LDI insn.
+ENUM
+  BFD_RELOC_AVR_LO8_LDI_PM
+ENUMDOC
+  This is a 16 bit reloc for the AVR that stores 8 bit value (usually
+  command address) into 8 bit immediate value of LDI insn.
+ENUM
+  BFD_RELOC_AVR_LO8_LDI_GS
+ENUMDOC
+  This is a 16 bit reloc for the AVR that stores 8 bit value 
+  (command address) into 8 bit immediate value of LDI insn. If the address
+  is beyond the 128k boundary, the linker inserts a jump stub for this reloc
+  in the lower 128k.
+ENUM
+  BFD_RELOC_AVR_HI8_LDI_PM
+ENUMDOC
+  This is a 16 bit reloc for the AVR that stores 8 bit value (high 8 bit
+  of command address) into 8 bit immediate value of LDI insn.
+ENUM
+  BFD_RELOC_AVR_HI8_LDI_GS
+ENUMDOC
+  This is a 16 bit reloc for the AVR that stores 8 bit value (high 8 bit
+  of command address) into 8 bit immediate value of LDI insn.  If the address
+  is beyond the 128k boundary, the linker inserts a jump stub for this reloc
+  below 128k.
+ENUM
+  BFD_RELOC_AVR_HH8_LDI_PM
+ENUMDOC
+  This is a 16 bit reloc for the AVR that stores 8 bit value (most high 8 bit
+  of command address) into 8 bit immediate value of LDI insn.
+ENUM
+  BFD_RELOC_AVR_LO8_LDI_PM_NEG
+ENUMDOC
+  This is a 16 bit reloc for the AVR that stores negated 8 bit value
+  (usually command address) into 8 bit immediate value of SUBI insn.
+ENUM
+  BFD_RELOC_AVR_HI8_LDI_PM_NEG
+ENUMDOC
+  This is a 16 bit reloc for the AVR that stores negated 8 bit value
+  (high 8 bit of 16 bit command address) into 8 bit immediate value
+  of SUBI insn.
+ENUM
+  BFD_RELOC_AVR_HH8_LDI_PM_NEG
+ENUMDOC
+  This is a 16 bit reloc for the AVR that stores negated 8 bit value
+  (high 6 bit of 22 bit command address) into 8 bit immediate
+  value of SUBI insn.
+ENUM
+  BFD_RELOC_AVR_CALL
+ENUMDOC
+  This is a 32 bit reloc for the AVR that stores 23 bit value
+  into 22 bits.
+ENUM
+  BFD_RELOC_AVR_LDI
+ENUMDOC
+  This is a 16 bit reloc for the AVR that stores all needed bits
+  for absolute addressing with ldi with overflow check to linktime
+ENUM
+  BFD_RELOC_AVR_6
+ENUMDOC
+  This is a 6 bit reloc for the AVR that stores offset for ldd/std
+  instructions
+ENUM
+  BFD_RELOC_AVR_6_ADIW
+ENUMDOC
+  This is a 6 bit reloc for the AVR that stores offset for adiw/sbiw
+  instructions
+
+ENUM
+  BFD_RELOC_RX_NEG8
+ENUMX
+  BFD_RELOC_RX_NEG16
+ENUMX
+  BFD_RELOC_RX_NEG24
+ENUMX
+  BFD_RELOC_RX_NEG32
+ENUMX
+  BFD_RELOC_RX_16_OP
+ENUMX
+  BFD_RELOC_RX_24_OP
+ENUMX
+  BFD_RELOC_RX_32_OP
+ENUMX
+  BFD_RELOC_RX_8U
+ENUMX
+  BFD_RELOC_RX_16U
+ENUMX
+  BFD_RELOC_RX_24U
+ENUMX
+  BFD_RELOC_RX_DIR3U_PCREL
+ENUMX
+  BFD_RELOC_RX_DIFF
+ENUMX
+  BFD_RELOC_RX_GPRELB
+ENUMX
+  BFD_RELOC_RX_GPRELW
+ENUMX
+  BFD_RELOC_RX_GPRELL
+ENUMX
+  BFD_RELOC_RX_SYM
+ENUMX
+  BFD_RELOC_RX_OP_SUBTRACT
+ENUMX
+  BFD_RELOC_RX_OP_NEG
+ENUMX
+  BFD_RELOC_RX_ABS8
+ENUMX
+  BFD_RELOC_RX_ABS16
+ENUMX
+  BFD_RELOC_RX_ABS16_REV
+ENUMX
+  BFD_RELOC_RX_ABS32
+ENUMX
+  BFD_RELOC_RX_ABS32_REV
+ENUMX
+  BFD_RELOC_RX_ABS16U
+ENUMX
+  BFD_RELOC_RX_ABS16UW
+ENUMX
+  BFD_RELOC_RX_ABS16UL
+ENUMX
+  BFD_RELOC_RX_RELAX
+ENUMDOC
+  Renesas RX Relocations.
+
+ENUM
+  BFD_RELOC_390_12
+ENUMDOC
+   Direct 12 bit.
+ENUM
+  BFD_RELOC_390_GOT12
+ENUMDOC
+  12 bit GOT offset.
+ENUM
+  BFD_RELOC_390_PLT32
+ENUMDOC
+  32 bit PC relative PLT address.
+ENUM
+  BFD_RELOC_390_COPY
+ENUMDOC
+  Copy symbol at runtime.
+ENUM
+  BFD_RELOC_390_GLOB_DAT
+ENUMDOC
+  Create GOT entry.
+ENUM
+  BFD_RELOC_390_JMP_SLOT
+ENUMDOC
+  Create PLT entry.
+ENUM
+  BFD_RELOC_390_RELATIVE
+ENUMDOC
+  Adjust by program base.
+ENUM
+  BFD_RELOC_390_GOTPC
+ENUMDOC
+  32 bit PC relative offset to GOT.
+ENUM
+  BFD_RELOC_390_GOT16
+ENUMDOC
+  16 bit GOT offset.
+ENUM
+  BFD_RELOC_390_PC16DBL
+ENUMDOC
+  PC relative 16 bit shifted by 1.
+ENUM
+  BFD_RELOC_390_PLT16DBL
+ENUMDOC
+  16 bit PC rel. PLT shifted by 1.
+ENUM
+  BFD_RELOC_390_PC32DBL
+ENUMDOC
+  PC relative 32 bit shifted by 1.
+ENUM
+  BFD_RELOC_390_PLT32DBL
+ENUMDOC
+  32 bit PC rel. PLT shifted by 1.
+ENUM
+  BFD_RELOC_390_GOTPCDBL
+ENUMDOC
+  32 bit PC rel. GOT shifted by 1.
+ENUM
+  BFD_RELOC_390_GOT64
+ENUMDOC
+  64 bit GOT offset.
+ENUM
+  BFD_RELOC_390_PLT64
+ENUMDOC
+  64 bit PC relative PLT address.
+ENUM
+  BFD_RELOC_390_GOTENT
+ENUMDOC
+  32 bit rel. offset to GOT entry.
+ENUM
+  BFD_RELOC_390_GOTOFF64
+ENUMDOC
+  64 bit offset to GOT.
+ENUM
+  BFD_RELOC_390_GOTPLT12
+ENUMDOC
+  12-bit offset to symbol-entry within GOT, with PLT handling.
+ENUM
+  BFD_RELOC_390_GOTPLT16
+ENUMDOC
+  16-bit offset to symbol-entry within GOT, with PLT handling.
+ENUM
+  BFD_RELOC_390_GOTPLT32
+ENUMDOC
+  32-bit offset to symbol-entry within GOT, with PLT handling.
+ENUM
+  BFD_RELOC_390_GOTPLT64
+ENUMDOC
+  64-bit offset to symbol-entry within GOT, with PLT handling.
+ENUM
+  BFD_RELOC_390_GOTPLTENT
+ENUMDOC
+  32-bit rel. offset to symbol-entry within GOT, with PLT handling.
+ENUM
+  BFD_RELOC_390_PLTOFF16
+ENUMDOC
+  16-bit rel. offset from the GOT to a PLT entry.
+ENUM
+  BFD_RELOC_390_PLTOFF32
+ENUMDOC
+  32-bit rel. offset from the GOT to a PLT entry.
+ENUM
+  BFD_RELOC_390_PLTOFF64
+ENUMDOC
+  64-bit rel. offset from the GOT to a PLT entry.
+
+ENUM
+  BFD_RELOC_390_TLS_LOAD
+ENUMX
+  BFD_RELOC_390_TLS_GDCALL
+ENUMX
+  BFD_RELOC_390_TLS_LDCALL
+ENUMX
+  BFD_RELOC_390_TLS_GD32
+ENUMX
+  BFD_RELOC_390_TLS_GD64
+ENUMX
+  BFD_RELOC_390_TLS_GOTIE12
+ENUMX
+  BFD_RELOC_390_TLS_GOTIE32
+ENUMX
+  BFD_RELOC_390_TLS_GOTIE64
+ENUMX
+  BFD_RELOC_390_TLS_LDM32
+ENUMX
+  BFD_RELOC_390_TLS_LDM64
+ENUMX
+  BFD_RELOC_390_TLS_IE32
+ENUMX
+  BFD_RELOC_390_TLS_IE64
+ENUMX
+  BFD_RELOC_390_TLS_IEENT
+ENUMX
+  BFD_RELOC_390_TLS_LE32
+ENUMX
+  BFD_RELOC_390_TLS_LE64
+ENUMX
+  BFD_RELOC_390_TLS_LDO32
+ENUMX
+  BFD_RELOC_390_TLS_LDO64
+ENUMX
+  BFD_RELOC_390_TLS_DTPMOD
+ENUMX
+  BFD_RELOC_390_TLS_DTPOFF
+ENUMX
+  BFD_RELOC_390_TLS_TPOFF
+ENUMDOC
+  s390 tls relocations.
+
+ENUM
+  BFD_RELOC_390_20
+ENUMX
+  BFD_RELOC_390_GOT20
+ENUMX
+  BFD_RELOC_390_GOTPLT20
+ENUMX
+  BFD_RELOC_390_TLS_GOTIE20
+ENUMDOC
+  Long displacement extension.
+
+ENUM
+  BFD_RELOC_SCORE_GPREL15
+ENUMDOC
+  Score relocations
+  Low 16 bit for load/store  
+ENUM
+  BFD_RELOC_SCORE_DUMMY2
+ENUMX
+  BFD_RELOC_SCORE_JMP
+ENUMDOC
+  This is a 24-bit reloc with the right 1 bit assumed to be 0
+ENUM
+  BFD_RELOC_SCORE_BRANCH
+ENUMDOC
+  This is a 19-bit reloc with the right 1 bit assumed to be 0
+ENUM
+  BFD_RELOC_SCORE_IMM30
+ENUMDOC
+  This is a 32-bit reloc for 48-bit instructions.
+ENUM
+  BFD_RELOC_SCORE_IMM32
+ENUMDOC
+  This is a 32-bit reloc for 48-bit instructions.
+ENUM
+  BFD_RELOC_SCORE16_JMP
+ENUMDOC
+  This is a 11-bit reloc with the right 1 bit assumed to be 0
+ENUM
+  BFD_RELOC_SCORE16_BRANCH
+ENUMDOC
+  This is a 8-bit reloc with the right 1 bit assumed to be 0
+ENUM
+  BFD_RELOC_SCORE_BCMP
+ENUMDOC
+   This is a 9-bit reloc with the right 1 bit assumed to be 0
+ENUM
+  BFD_RELOC_SCORE_GOT15
+ENUMX
+  BFD_RELOC_SCORE_GOT_LO16
+ENUMX
+  BFD_RELOC_SCORE_CALL15
+ENUMX
+  BFD_RELOC_SCORE_DUMMY_HI16
+ENUMDOC
+  Undocumented Score relocs
+  
+ENUM
+  BFD_RELOC_IP2K_FR9
+ENUMDOC
+  Scenix IP2K - 9-bit register number / data address
+ENUM
+  BFD_RELOC_IP2K_BANK
+ENUMDOC
+  Scenix IP2K - 4-bit register/data bank number
+ENUM
+  BFD_RELOC_IP2K_ADDR16CJP
+ENUMDOC
+  Scenix IP2K - low 13 bits of instruction word address
+ENUM
+  BFD_RELOC_IP2K_PAGE3
+ENUMDOC
+  Scenix IP2K - high 3 bits of instruction word address
+ENUM
+  BFD_RELOC_IP2K_LO8DATA
+ENUMX
+  BFD_RELOC_IP2K_HI8DATA
+ENUMX
+  BFD_RELOC_IP2K_EX8DATA
+ENUMDOC
+  Scenix IP2K - ext/low/high 8 bits of data address
+ENUM
+  BFD_RELOC_IP2K_LO8INSN
+ENUMX
+  BFD_RELOC_IP2K_HI8INSN
+ENUMDOC
+  Scenix IP2K - low/high 8 bits of instruction word address
+ENUM
+  BFD_RELOC_IP2K_PC_SKIP
+ENUMDOC
+  Scenix IP2K - even/odd PC modifier to modify snb pcl.0
+ENUM
+  BFD_RELOC_IP2K_TEXT
+ENUMDOC
+  Scenix IP2K - 16 bit word address in text section.
+ENUM
+  BFD_RELOC_IP2K_FR_OFFSET
+ENUMDOC
+  Scenix IP2K - 7-bit sp or dp offset
+ENUM
+  BFD_RELOC_VPE4KMATH_DATA
+ENUMX
+  BFD_RELOC_VPE4KMATH_INSN
+ENUMDOC
+  Scenix VPE4K coprocessor - data/insn-space addressing
+
+ENUM
+  BFD_RELOC_VTABLE_INHERIT
+ENUMX
+  BFD_RELOC_VTABLE_ENTRY
+ENUMDOC
+  These two relocations are used by the linker to determine which of
+  the entries in a C++ virtual function table are actually used.  When
+  the --gc-sections option is given, the linker will zero out the entries
+  that are not used, so that the code for those functions need not be
+  included in the output.
+
+  VTABLE_INHERIT is a zero-space relocation used to describe to the
+  linker the inheritance tree of a C++ virtual function table.  The
+  relocation's symbol should be the parent class' vtable, and the
+  relocation should be located at the child vtable.
+
+  VTABLE_ENTRY is a zero-space relocation that describes the use of a
+  virtual function table entry.  The reloc's symbol should refer to the
+  table of the class mentioned in the code.  Off of that base, an offset
+  describes the entry that is being used.  For Rela hosts, this offset
+  is stored in the reloc's addend.  For Rel hosts, we are forced to put
+  this offset in the reloc's section offset.
+
+ENUM
+  BFD_RELOC_IA64_IMM14
+ENUMX
+  BFD_RELOC_IA64_IMM22
+ENUMX
+  BFD_RELOC_IA64_IMM64
+ENUMX
+  BFD_RELOC_IA64_DIR32MSB
+ENUMX
+  BFD_RELOC_IA64_DIR32LSB
+ENUMX
+  BFD_RELOC_IA64_DIR64MSB
+ENUMX
+  BFD_RELOC_IA64_DIR64LSB
+ENUMX
+  BFD_RELOC_IA64_GPREL22
+ENUMX
+  BFD_RELOC_IA64_GPREL64I
+ENUMX
+  BFD_RELOC_IA64_GPREL32MSB
+ENUMX
+  BFD_RELOC_IA64_GPREL32LSB
+ENUMX
+  BFD_RELOC_IA64_GPREL64MSB
+ENUMX
+  BFD_RELOC_IA64_GPREL64LSB
+ENUMX
+  BFD_RELOC_IA64_LTOFF22
+ENUMX
+  BFD_RELOC_IA64_LTOFF64I
+ENUMX
+  BFD_RELOC_IA64_PLTOFF22
+ENUMX
+  BFD_RELOC_IA64_PLTOFF64I
+ENUMX
+  BFD_RELOC_IA64_PLTOFF64MSB
+ENUMX
+  BFD_RELOC_IA64_PLTOFF64LSB
+ENUMX
+  BFD_RELOC_IA64_FPTR64I
+ENUMX
+  BFD_RELOC_IA64_FPTR32MSB
+ENUMX
+  BFD_RELOC_IA64_FPTR32LSB
+ENUMX
+  BFD_RELOC_IA64_FPTR64MSB
+ENUMX
+  BFD_RELOC_IA64_FPTR64LSB
+ENUMX
+  BFD_RELOC_IA64_PCREL21B
+ENUMX
+  BFD_RELOC_IA64_PCREL21BI
+ENUMX
+  BFD_RELOC_IA64_PCREL21M
+ENUMX
+  BFD_RELOC_IA64_PCREL21F
+ENUMX
+  BFD_RELOC_IA64_PCREL22
+ENUMX
+  BFD_RELOC_IA64_PCREL60B
+ENUMX
+  BFD_RELOC_IA64_PCREL64I
+ENUMX
+  BFD_RELOC_IA64_PCREL32MSB
+ENUMX
+  BFD_RELOC_IA64_PCREL32LSB
+ENUMX
+  BFD_RELOC_IA64_PCREL64MSB
+ENUMX
+  BFD_RELOC_IA64_PCREL64LSB
+ENUMX
+  BFD_RELOC_IA64_LTOFF_FPTR22
+ENUMX
+  BFD_RELOC_IA64_LTOFF_FPTR64I
+ENUMX
+  BFD_RELOC_IA64_LTOFF_FPTR32MSB
+ENUMX
+  BFD_RELOC_IA64_LTOFF_FPTR32LSB
+ENUMX
+  BFD_RELOC_IA64_LTOFF_FPTR64MSB
+ENUMX
+  BFD_RELOC_IA64_LTOFF_FPTR64LSB
+ENUMX
+  BFD_RELOC_IA64_SEGREL32MSB
+ENUMX
+  BFD_RELOC_IA64_SEGREL32LSB
+ENUMX
+  BFD_RELOC_IA64_SEGREL64MSB
+ENUMX
+  BFD_RELOC_IA64_SEGREL64LSB
+ENUMX
+  BFD_RELOC_IA64_SECREL32MSB
+ENUMX
+  BFD_RELOC_IA64_SECREL32LSB
+ENUMX
+  BFD_RELOC_IA64_SECREL64MSB
+ENUMX
+  BFD_RELOC_IA64_SECREL64LSB
+ENUMX
+  BFD_RELOC_IA64_REL32MSB
+ENUMX
+  BFD_RELOC_IA64_REL32LSB
+ENUMX
+  BFD_RELOC_IA64_REL64MSB
+ENUMX
+  BFD_RELOC_IA64_REL64LSB
+ENUMX
+  BFD_RELOC_IA64_LTV32MSB
+ENUMX
+  BFD_RELOC_IA64_LTV32LSB
+ENUMX
+  BFD_RELOC_IA64_LTV64MSB
+ENUMX
+  BFD_RELOC_IA64_LTV64LSB
+ENUMX
+  BFD_RELOC_IA64_IPLTMSB
+ENUMX
+  BFD_RELOC_IA64_IPLTLSB
+ENUMX
+  BFD_RELOC_IA64_COPY
+ENUMX
+  BFD_RELOC_IA64_LTOFF22X
+ENUMX
+  BFD_RELOC_IA64_LDXMOV
+ENUMX
+  BFD_RELOC_IA64_TPREL14
+ENUMX
+  BFD_RELOC_IA64_TPREL22
+ENUMX
+  BFD_RELOC_IA64_TPREL64I
+ENUMX
+  BFD_RELOC_IA64_TPREL64MSB
+ENUMX
+  BFD_RELOC_IA64_TPREL64LSB
+ENUMX
+  BFD_RELOC_IA64_LTOFF_TPREL22
+ENUMX
+  BFD_RELOC_IA64_DTPMOD64MSB
+ENUMX
+  BFD_RELOC_IA64_DTPMOD64LSB
+ENUMX
+  BFD_RELOC_IA64_LTOFF_DTPMOD22
+ENUMX
+  BFD_RELOC_IA64_DTPREL14
+ENUMX
+  BFD_RELOC_IA64_DTPREL22
+ENUMX
+  BFD_RELOC_IA64_DTPREL64I
+ENUMX
+  BFD_RELOC_IA64_DTPREL32MSB
+ENUMX
+  BFD_RELOC_IA64_DTPREL32LSB
+ENUMX
+  BFD_RELOC_IA64_DTPREL64MSB
+ENUMX
+  BFD_RELOC_IA64_DTPREL64LSB
+ENUMX
+  BFD_RELOC_IA64_LTOFF_DTPREL22
+ENUMDOC
+  Intel IA64 Relocations.
+
+ENUM
+  BFD_RELOC_M68HC11_HI8
+ENUMDOC
+  Motorola 68HC11 reloc.
+  This is the 8 bit high part of an absolute address.
+ENUM
+  BFD_RELOC_M68HC11_LO8
+ENUMDOC
+  Motorola 68HC11 reloc.
+  This is the 8 bit low part of an absolute address.
+ENUM
+  BFD_RELOC_M68HC11_3B
+ENUMDOC
+  Motorola 68HC11 reloc.
+  This is the 3 bit of a value.
+ENUM
+  BFD_RELOC_M68HC11_RL_JUMP
+ENUMDOC
+  Motorola 68HC11 reloc.
+  This reloc marks the beginning of a jump/call instruction.
+  It is used for linker relaxation to correctly identify beginning
+  of instruction and change some branches to use PC-relative
+  addressing mode.
+ENUM
+  BFD_RELOC_M68HC11_RL_GROUP
+ENUMDOC
+  Motorola 68HC11 reloc.
+  This reloc marks a group of several instructions that gcc generates
+  and for which the linker relaxation pass can modify and/or remove
+  some of them.
+ENUM
+  BFD_RELOC_M68HC11_LO16
+ENUMDOC
+  Motorola 68HC11 reloc.
+  This is the 16-bit lower part of an address.  It is used for 'call'
+  instruction to specify the symbol address without any special
+  transformation (due to memory bank window).
+ENUM
+  BFD_RELOC_M68HC11_PAGE
+ENUMDOC
+  Motorola 68HC11 reloc.
+  This is a 8-bit reloc that specifies the page number of an address.
+  It is used by 'call' instruction to specify the page number of
+  the symbol.
+ENUM
+  BFD_RELOC_M68HC11_24
+ENUMDOC
+  Motorola 68HC11 reloc.
+  This is a 24-bit reloc that represents the address with a 16-bit
+  value and a 8-bit page number.  The symbol address is transformed
+  to follow the 16K memory bank of 68HC12 (seen as mapped in the window).
+ENUM
+  BFD_RELOC_M68HC12_5B
+ENUMDOC
+  Motorola 68HC12 reloc.
+  This is the 5 bits of a value.
+
+ENUM
+  BFD_RELOC_16C_NUM08
+ENUMX
+  BFD_RELOC_16C_NUM08_C
+ENUMX
+  BFD_RELOC_16C_NUM16
+ENUMX
+  BFD_RELOC_16C_NUM16_C
+ENUMX
+  BFD_RELOC_16C_NUM32
+ENUMX
+  BFD_RELOC_16C_NUM32_C
+ENUMX
+  BFD_RELOC_16C_DISP04
+ENUMX
+  BFD_RELOC_16C_DISP04_C
+ENUMX
+  BFD_RELOC_16C_DISP08
+ENUMX
+  BFD_RELOC_16C_DISP08_C
+ENUMX
+  BFD_RELOC_16C_DISP16
+ENUMX
+  BFD_RELOC_16C_DISP16_C
+ENUMX
+  BFD_RELOC_16C_DISP24
+ENUMX
+  BFD_RELOC_16C_DISP24_C
+ENUMX
+  BFD_RELOC_16C_DISP24a
+ENUMX
+  BFD_RELOC_16C_DISP24a_C
+ENUMX
+  BFD_RELOC_16C_REG04
+ENUMX
+  BFD_RELOC_16C_REG04_C
+ENUMX
+  BFD_RELOC_16C_REG04a
+ENUMX
+  BFD_RELOC_16C_REG04a_C
+ENUMX
+  BFD_RELOC_16C_REG14
+ENUMX
+  BFD_RELOC_16C_REG14_C
+ENUMX
+  BFD_RELOC_16C_REG16
+ENUMX
+  BFD_RELOC_16C_REG16_C
+ENUMX
+  BFD_RELOC_16C_REG20
+ENUMX
+  BFD_RELOC_16C_REG20_C
+ENUMX
+  BFD_RELOC_16C_ABS20
+ENUMX
+  BFD_RELOC_16C_ABS20_C
+ENUMX
+  BFD_RELOC_16C_ABS24
+ENUMX
+  BFD_RELOC_16C_ABS24_C
+ENUMX
+  BFD_RELOC_16C_IMM04
+ENUMX
+  BFD_RELOC_16C_IMM04_C
+ENUMX
+  BFD_RELOC_16C_IMM16
+ENUMX
+  BFD_RELOC_16C_IMM16_C
+ENUMX
+  BFD_RELOC_16C_IMM20
+ENUMX
+  BFD_RELOC_16C_IMM20_C
+ENUMX
+  BFD_RELOC_16C_IMM24
+ENUMX
+  BFD_RELOC_16C_IMM24_C
+ENUMX
+  BFD_RELOC_16C_IMM32
+ENUMX
+  BFD_RELOC_16C_IMM32_C
+ENUMDOC
+  NS CR16C Relocations.
+
+ENUM
+  BFD_RELOC_CR16_NUM8
+ENUMX
+  BFD_RELOC_CR16_NUM16
+ENUMX
+  BFD_RELOC_CR16_NUM32
+ENUMX
+  BFD_RELOC_CR16_NUM32a
+ENUMX
+  BFD_RELOC_CR16_REGREL0
+ENUMX
+  BFD_RELOC_CR16_REGREL4
+ENUMX
+  BFD_RELOC_CR16_REGREL4a
+ENUMX
+  BFD_RELOC_CR16_REGREL14
+ENUMX
+  BFD_RELOC_CR16_REGREL14a
+ENUMX
+  BFD_RELOC_CR16_REGREL16
+ENUMX
+  BFD_RELOC_CR16_REGREL20
+ENUMX
+  BFD_RELOC_CR16_REGREL20a
+ENUMX
+  BFD_RELOC_CR16_ABS20
+ENUMX
+  BFD_RELOC_CR16_ABS24
+ENUMX
+  BFD_RELOC_CR16_IMM4
+ENUMX
+  BFD_RELOC_CR16_IMM8
+ENUMX
+  BFD_RELOC_CR16_IMM16
+ENUMX
+  BFD_RELOC_CR16_IMM20
+ENUMX
+  BFD_RELOC_CR16_IMM24
+ENUMX
+  BFD_RELOC_CR16_IMM32
+ENUMX
+  BFD_RELOC_CR16_IMM32a
+ENUMX
+  BFD_RELOC_CR16_DISP4
+ENUMX
+  BFD_RELOC_CR16_DISP8
+ENUMX
+  BFD_RELOC_CR16_DISP16
+ENUMX
+  BFD_RELOC_CR16_DISP20
+ENUMX
+  BFD_RELOC_CR16_DISP24
+ENUMX
+  BFD_RELOC_CR16_DISP24a
+ENUMX
+  BFD_RELOC_CR16_SWITCH8
+ENUMX
+  BFD_RELOC_CR16_SWITCH16
+ENUMX
+  BFD_RELOC_CR16_SWITCH32
+ENUMX
+  BFD_RELOC_CR16_GOT_REGREL20
+ENUMX
+  BFD_RELOC_CR16_GOTC_REGREL20
+ENUMX
+  BFD_RELOC_CR16_GLOB_DAT
+ENUMDOC
+  NS CR16 Relocations.
+
+ENUM
+  BFD_RELOC_CRX_REL4
+ENUMX
+  BFD_RELOC_CRX_REL8
+ENUMX
+  BFD_RELOC_CRX_REL8_CMP
+ENUMX
+  BFD_RELOC_CRX_REL16
+ENUMX
+  BFD_RELOC_CRX_REL24
+ENUMX
+  BFD_RELOC_CRX_REL32
+ENUMX
+  BFD_RELOC_CRX_REGREL12
+ENUMX
+  BFD_RELOC_CRX_REGREL22
+ENUMX
+  BFD_RELOC_CRX_REGREL28
+ENUMX
+  BFD_RELOC_CRX_REGREL32
+ENUMX
+  BFD_RELOC_CRX_ABS16
+ENUMX
+  BFD_RELOC_CRX_ABS32
+ENUMX
+  BFD_RELOC_CRX_NUM8
+ENUMX
+  BFD_RELOC_CRX_NUM16
+ENUMX
+  BFD_RELOC_CRX_NUM32
+ENUMX
+  BFD_RELOC_CRX_IMM16
+ENUMX
+  BFD_RELOC_CRX_IMM32
+ENUMX
+  BFD_RELOC_CRX_SWITCH8
+ENUMX
+  BFD_RELOC_CRX_SWITCH16
+ENUMX
+  BFD_RELOC_CRX_SWITCH32
+ENUMDOC
+  NS CRX Relocations.
+
+ENUM
+  BFD_RELOC_CRIS_BDISP8
+ENUMX
+  BFD_RELOC_CRIS_UNSIGNED_5
+ENUMX
+  BFD_RELOC_CRIS_SIGNED_6
+ENUMX
+  BFD_RELOC_CRIS_UNSIGNED_6
+ENUMX
+  BFD_RELOC_CRIS_SIGNED_8
+ENUMX
+  BFD_RELOC_CRIS_UNSIGNED_8
+ENUMX
+  BFD_RELOC_CRIS_SIGNED_16
+ENUMX
+  BFD_RELOC_CRIS_UNSIGNED_16
+ENUMX
+  BFD_RELOC_CRIS_LAPCQ_OFFSET
+ENUMX
+  BFD_RELOC_CRIS_UNSIGNED_4
+ENUMDOC
+  These relocs are only used within the CRIS assembler.  They are not
+  (at present) written to any object files.
+ENUM
+  BFD_RELOC_CRIS_COPY
+ENUMX
+  BFD_RELOC_CRIS_GLOB_DAT
+ENUMX
+  BFD_RELOC_CRIS_JUMP_SLOT
+ENUMX
+  BFD_RELOC_CRIS_RELATIVE
+ENUMDOC
+  Relocs used in ELF shared libraries for CRIS.
+ENUM
+  BFD_RELOC_CRIS_32_GOT
+ENUMDOC
+  32-bit offset to symbol-entry within GOT.
+ENUM
+  BFD_RELOC_CRIS_16_GOT
+ENUMDOC
+  16-bit offset to symbol-entry within GOT.
+ENUM
+  BFD_RELOC_CRIS_32_GOTPLT
+ENUMDOC
+  32-bit offset to symbol-entry within GOT, with PLT handling.
+ENUM
+  BFD_RELOC_CRIS_16_GOTPLT
+ENUMDOC
+  16-bit offset to symbol-entry within GOT, with PLT handling.
+ENUM
+  BFD_RELOC_CRIS_32_GOTREL
+ENUMDOC
+  32-bit offset to symbol, relative to GOT.
+ENUM
+  BFD_RELOC_CRIS_32_PLT_GOTREL
+ENUMDOC
+  32-bit offset to symbol with PLT entry, relative to GOT.
+ENUM
+  BFD_RELOC_CRIS_32_PLT_PCREL
+ENUMDOC
+  32-bit offset to symbol with PLT entry, relative to this relocation.
+
+ENUM
+  BFD_RELOC_CRIS_32_GOT_GD
+ENUMX
+  BFD_RELOC_CRIS_16_GOT_GD
+ENUMX
+  BFD_RELOC_CRIS_32_GD
+ENUMX
+  BFD_RELOC_CRIS_DTP
+ENUMX
+  BFD_RELOC_CRIS_32_DTPREL
+ENUMX
+  BFD_RELOC_CRIS_16_DTPREL
+ENUMX
+  BFD_RELOC_CRIS_32_GOT_TPREL
+ENUMX
+  BFD_RELOC_CRIS_16_GOT_TPREL
+ENUMX
+  BFD_RELOC_CRIS_32_TPREL
+ENUMX
+  BFD_RELOC_CRIS_16_TPREL
+ENUMX
+  BFD_RELOC_CRIS_DTPMOD
+ENUMX
+  BFD_RELOC_CRIS_32_IE
+ENUMDOC
+  Relocs used in TLS code for CRIS.
+
+ENUM
+  BFD_RELOC_860_COPY
+ENUMX
+  BFD_RELOC_860_GLOB_DAT
+ENUMX
+  BFD_RELOC_860_JUMP_SLOT
+ENUMX
+  BFD_RELOC_860_RELATIVE
+ENUMX
+  BFD_RELOC_860_PC26
+ENUMX
+  BFD_RELOC_860_PLT26
+ENUMX
+  BFD_RELOC_860_PC16
+ENUMX
+  BFD_RELOC_860_LOW0
+ENUMX
+  BFD_RELOC_860_SPLIT0
+ENUMX
+  BFD_RELOC_860_LOW1
+ENUMX
+  BFD_RELOC_860_SPLIT1
+ENUMX
+  BFD_RELOC_860_LOW2
+ENUMX
+  BFD_RELOC_860_SPLIT2
+ENUMX
+  BFD_RELOC_860_LOW3
+ENUMX
+  BFD_RELOC_860_LOGOT0
+ENUMX
+  BFD_RELOC_860_SPGOT0
+ENUMX
+  BFD_RELOC_860_LOGOT1
+ENUMX
+  BFD_RELOC_860_SPGOT1
+ENUMX
+  BFD_RELOC_860_LOGOTOFF0
+ENUMX
+  BFD_RELOC_860_SPGOTOFF0
+ENUMX
+  BFD_RELOC_860_LOGOTOFF1
+ENUMX
+  BFD_RELOC_860_SPGOTOFF1
+ENUMX
+  BFD_RELOC_860_LOGOTOFF2
+ENUMX
+  BFD_RELOC_860_LOGOTOFF3
+ENUMX
+  BFD_RELOC_860_LOPC
+ENUMX
+  BFD_RELOC_860_HIGHADJ
+ENUMX
+  BFD_RELOC_860_HAGOT
+ENUMX
+  BFD_RELOC_860_HAGOTOFF
+ENUMX
+  BFD_RELOC_860_HAPC
+ENUMX
+  BFD_RELOC_860_HIGH
+ENUMX
+  BFD_RELOC_860_HIGOT
+ENUMX
+  BFD_RELOC_860_HIGOTOFF
+ENUMDOC
+  Intel i860 Relocations.
+
+ENUM
+  BFD_RELOC_OPENRISC_ABS_26
+ENUMX
+  BFD_RELOC_OPENRISC_REL_26
+ENUMDOC
+  OpenRISC Relocations.
+
+ENUM
+  BFD_RELOC_H8_DIR16A8
+ENUMX
+  BFD_RELOC_H8_DIR16R8
+ENUMX
+  BFD_RELOC_H8_DIR24A8
+ENUMX
+  BFD_RELOC_H8_DIR24R8
+ENUMX
+  BFD_RELOC_H8_DIR32A16
+ENUMDOC
+  H8 elf Relocations.
+
+ENUM
+  BFD_RELOC_XSTORMY16_REL_12
+ENUMX
+  BFD_RELOC_XSTORMY16_12
+ENUMX
+  BFD_RELOC_XSTORMY16_24
+ENUMX
+  BFD_RELOC_XSTORMY16_FPTR16
+ENUMDOC
+  Sony Xstormy16 Relocations.
+
+ENUM
+  BFD_RELOC_RELC
+ENUMDOC
+  Self-describing complex relocations.
+COMMENT
+
+ENUM
+  BFD_RELOC_XC16X_PAG
+ENUMX
+  BFD_RELOC_XC16X_POF
+ENUMX
+  BFD_RELOC_XC16X_SEG
+ENUMX
+  BFD_RELOC_XC16X_SOF
+ENUMDOC
+  Infineon Relocations.
+
+ENUM
+  BFD_RELOC_VAX_GLOB_DAT
+ENUMX
+  BFD_RELOC_VAX_JMP_SLOT
+ENUMX
+  BFD_RELOC_VAX_RELATIVE
+ENUMDOC
+  Relocations used by VAX ELF.
+
+ENUM
+  BFD_RELOC_MT_PC16
+ENUMDOC
+  Morpho MT - 16 bit immediate relocation.
+ENUM
+  BFD_RELOC_MT_HI16
+ENUMDOC
+  Morpho MT - Hi 16 bits of an address.
+ENUM
+  BFD_RELOC_MT_LO16
+ENUMDOC
+  Morpho MT - Low 16 bits of an address.
+ENUM
+  BFD_RELOC_MT_GNU_VTINHERIT
+ENUMDOC
+  Morpho MT - Used to tell the linker which vtable entries are used.
+ENUM
+  BFD_RELOC_MT_GNU_VTENTRY
+ENUMDOC
+  Morpho MT - Used to tell the linker which vtable entries are used.
+ENUM
+  BFD_RELOC_MT_PCINSN8
+ENUMDOC
+  Morpho MT - 8 bit immediate relocation.
+
+ENUM
+  BFD_RELOC_MSP430_10_PCREL
+ENUMX
+  BFD_RELOC_MSP430_16_PCREL
+ENUMX
+  BFD_RELOC_MSP430_16
+ENUMX
+  BFD_RELOC_MSP430_16_PCREL_BYTE
+ENUMX
+  BFD_RELOC_MSP430_16_BYTE
+ENUMX
+  BFD_RELOC_MSP430_2X_PCREL
+ENUMX
+  BFD_RELOC_MSP430_RL_PCREL
+ENUMDOC
+  msp430 specific relocation codes
+
+ENUM
+  BFD_RELOC_IQ2000_OFFSET_16
+ENUMX
+  BFD_RELOC_IQ2000_OFFSET_21
+ENUMX
+  BFD_RELOC_IQ2000_UHI16
+ENUMDOC
+  IQ2000 Relocations.
+
+ENUM
+  BFD_RELOC_XTENSA_RTLD
+ENUMDOC
+  Special Xtensa relocation used only by PLT entries in ELF shared
+  objects to indicate that the runtime linker should set the value
+  to one of its own internal functions or data structures.
+ENUM
+  BFD_RELOC_XTENSA_GLOB_DAT
+ENUMX
+  BFD_RELOC_XTENSA_JMP_SLOT
+ENUMX
+  BFD_RELOC_XTENSA_RELATIVE
+ENUMDOC
+  Xtensa relocations for ELF shared objects.
+ENUM
+  BFD_RELOC_XTENSA_PLT
+ENUMDOC
+  Xtensa relocation used in ELF object files for symbols that may require
+  PLT entries.  Otherwise, this is just a generic 32-bit relocation.
+ENUM
+  BFD_RELOC_XTENSA_DIFF8
+ENUMX
+  BFD_RELOC_XTENSA_DIFF16
+ENUMX
+  BFD_RELOC_XTENSA_DIFF32
+ENUMDOC
+  Xtensa relocations to mark the difference of two local symbols.
+  These are only needed to support linker relaxation and can be ignored
+  when not relaxing.  The field is set to the value of the difference
+  assuming no relaxation.  The relocation encodes the position of the
+  first symbol so the linker can determine whether to adjust the field
+  value.
+ENUM
+  BFD_RELOC_XTENSA_SLOT0_OP
+ENUMX
+  BFD_RELOC_XTENSA_SLOT1_OP
+ENUMX
+  BFD_RELOC_XTENSA_SLOT2_OP
+ENUMX
+  BFD_RELOC_XTENSA_SLOT3_OP
+ENUMX
+  BFD_RELOC_XTENSA_SLOT4_OP
+ENUMX
+  BFD_RELOC_XTENSA_SLOT5_OP
+ENUMX
+  BFD_RELOC_XTENSA_SLOT6_OP
+ENUMX
+  BFD_RELOC_XTENSA_SLOT7_OP
+ENUMX
+  BFD_RELOC_XTENSA_SLOT8_OP
+ENUMX
+  BFD_RELOC_XTENSA_SLOT9_OP
+ENUMX
+  BFD_RELOC_XTENSA_SLOT10_OP
+ENUMX
+  BFD_RELOC_XTENSA_SLOT11_OP
+ENUMX
+  BFD_RELOC_XTENSA_SLOT12_OP
+ENUMX
+  BFD_RELOC_XTENSA_SLOT13_OP
+ENUMX
+  BFD_RELOC_XTENSA_SLOT14_OP
+ENUMDOC
+  Generic Xtensa relocations for instruction operands.  Only the slot
+  number is encoded in the relocation.  The relocation applies to the
+  last PC-relative immediate operand, or if there are no PC-relative
+  immediates, to the last immediate operand.
+ENUM
+  BFD_RELOC_XTENSA_SLOT0_ALT
+ENUMX
+  BFD_RELOC_XTENSA_SLOT1_ALT
+ENUMX
+  BFD_RELOC_XTENSA_SLOT2_ALT
+ENUMX
+  BFD_RELOC_XTENSA_SLOT3_ALT
+ENUMX
+  BFD_RELOC_XTENSA_SLOT4_ALT
+ENUMX
+  BFD_RELOC_XTENSA_SLOT5_ALT
+ENUMX
+  BFD_RELOC_XTENSA_SLOT6_ALT
+ENUMX
+  BFD_RELOC_XTENSA_SLOT7_ALT
+ENUMX
+  BFD_RELOC_XTENSA_SLOT8_ALT
+ENUMX
+  BFD_RELOC_XTENSA_SLOT9_ALT
+ENUMX
+  BFD_RELOC_XTENSA_SLOT10_ALT
+ENUMX
+  BFD_RELOC_XTENSA_SLOT11_ALT
+ENUMX
+  BFD_RELOC_XTENSA_SLOT12_ALT
+ENUMX
+  BFD_RELOC_XTENSA_SLOT13_ALT
+ENUMX
+  BFD_RELOC_XTENSA_SLOT14_ALT
+ENUMDOC
+  Alternate Xtensa relocations.  Only the slot is encoded in the
+  relocation.  The meaning of these relocations is opcode-specific.
+ENUM
+  BFD_RELOC_XTENSA_OP0
+ENUMX
+  BFD_RELOC_XTENSA_OP1
+ENUMX
+  BFD_RELOC_XTENSA_OP2
+ENUMDOC
+  Xtensa relocations for backward compatibility.  These have all been
+  replaced by BFD_RELOC_XTENSA_SLOT0_OP.
+ENUM
+  BFD_RELOC_XTENSA_ASM_EXPAND
+ENUMDOC
+  Xtensa relocation to mark that the assembler expanded the
+  instructions from an original target.  The expansion size is
+  encoded in the reloc size.
+ENUM
+  BFD_RELOC_XTENSA_ASM_SIMPLIFY
+ENUMDOC
+  Xtensa relocation to mark that the linker should simplify
+  assembler-expanded instructions.  This is commonly used
+  internally by the linker after analysis of a
+  BFD_RELOC_XTENSA_ASM_EXPAND.
+ENUM
+  BFD_RELOC_XTENSA_TLSDESC_FN
+ENUMX
+  BFD_RELOC_XTENSA_TLSDESC_ARG
+ENUMX
+  BFD_RELOC_XTENSA_TLS_DTPOFF
+ENUMX
+  BFD_RELOC_XTENSA_TLS_TPOFF
+ENUMX
+  BFD_RELOC_XTENSA_TLS_FUNC
+ENUMX
+  BFD_RELOC_XTENSA_TLS_ARG
+ENUMX
+  BFD_RELOC_XTENSA_TLS_CALL
+ENUMDOC
+  Xtensa TLS relocations.
+
+ENUM
+  BFD_RELOC_Z80_DISP8
+ENUMDOC
+  8 bit signed offset in (ix+d) or (iy+d).
+
+ENUM
+  BFD_RELOC_Z8K_DISP7
+ENUMDOC
+  DJNZ offset.
+ENUM
+  BFD_RELOC_Z8K_CALLR
+ENUMDOC
+  CALR offset.
+ENUM
+  BFD_RELOC_Z8K_IMM4L
+ENUMDOC
+  4 bit value.
+
+ENUM
+   BFD_RELOC_LM32_CALL
+ENUMX
+   BFD_RELOC_LM32_BRANCH
+ENUMX
+   BFD_RELOC_LM32_16_GOT
+ENUMX
+   BFD_RELOC_LM32_GOTOFF_HI16
+ENUMX
+   BFD_RELOC_LM32_GOTOFF_LO16
+ENUMX
+   BFD_RELOC_LM32_COPY
+ENUMX
+   BFD_RELOC_LM32_GLOB_DAT
+ENUMX
+   BFD_RELOC_LM32_JMP_SLOT
+ENUMX
+   BFD_RELOC_LM32_RELATIVE
+ENUMDOC
+ Lattice Mico32 relocations.
+
+ENUM
+  BFD_RELOC_MACH_O_SECTDIFF
+ENUMDOC
+  Difference between two section addreses.  Must be followed by a
+  BFD_RELOC_MACH_O_PAIR.
+ENUM
+  BFD_RELOC_MACH_O_PAIR
+ENUMDOC
+  Pair of relocation.  Contains the first symbol.
+
+ENUM
+  BFD_RELOC_MACH_O_X86_64_BRANCH32
+ENUMX
+  BFD_RELOC_MACH_O_X86_64_BRANCH8
+ENUMDOC
+  PCREL relocations.  They are marked as branch to create PLT entry if
+  required.
+ENUM
+  BFD_RELOC_MACH_O_X86_64_GOT
+ENUMDOC
+  Used when referencing a GOT entry.
+ENUM
+  BFD_RELOC_MACH_O_X86_64_GOT_LOAD
+ENUMDOC
+  Used when loading a GOT entry with movq.  It is specially marked so that
+  the linker could optimize the movq to a leaq if possible.
+ENUM
+  BFD_RELOC_MACH_O_X86_64_SUBTRACTOR32
+ENUMDOC
+  Symbol will be substracted.  Must be followed by a BFD_RELOC_64.
+ENUM
+  BFD_RELOC_MACH_O_X86_64_SUBTRACTOR64
+ENUMDOC
+  Symbol will be substracted.  Must be followed by a BFD_RELOC_64.
+ENUM
+  BFD_RELOC_MACH_O_X86_64_PCREL32_1
+ENUMDOC
+  Same as BFD_RELOC_32_PCREL but with an implicit -1 addend.
+ENUM
+  BFD_RELOC_MACH_O_X86_64_PCREL32_2
+ENUMDOC
+  Same as BFD_RELOC_32_PCREL but with an implicit -2 addend.
+ENUM
+  BFD_RELOC_MACH_O_X86_64_PCREL32_4
+ENUMDOC
+  Same as BFD_RELOC_32_PCREL but with an implicit -4 addend.
+
+ENUM
+  BFD_RELOC_MICROBLAZE_32_LO
+ENUMDOC
+  This is a 32 bit reloc for the microblaze that stores the 
+  low 16 bits of a value
+ENUM
+  BFD_RELOC_MICROBLAZE_32_LO_PCREL
+ENUMDOC
+  This is a 32 bit pc-relative reloc for the microblaze that 
+  stores the low 16 bits of a value
+ENUM
+  BFD_RELOC_MICROBLAZE_32_ROSDA
+ENUMDOC
+  This is a 32 bit reloc for the microblaze that stores a 
+  value relative to the read-only small data area anchor
+ENUM
+  BFD_RELOC_MICROBLAZE_32_RWSDA
+ENUMDOC
+  This is a 32 bit reloc for the microblaze that stores a 
+  value relative to the read-write small data area anchor
+ENUM
+  BFD_RELOC_MICROBLAZE_32_SYM_OP_SYM
+ENUMDOC
+  This is a 32 bit reloc for the microblaze to handle 
+  expressions of the form "Symbol Op Symbol"
+ENUM
+  BFD_RELOC_MICROBLAZE_64_NONE
+ENUMDOC
+  This is a 64 bit reloc that stores the 32 bit pc relative 
+  value in two words (with an imm instruction).  No relocation is 
+  done here - only used for relaxing
+ENUM
+  BFD_RELOC_MICROBLAZE_64_GOTPC
+ENUMDOC
+  This is a 64 bit reloc that stores the 32 bit pc relative 
+  value in two words (with an imm instruction).  The relocation is
+  PC-relative GOT offset
+ENUM
+  BFD_RELOC_MICROBLAZE_64_GOT
+ENUMDOC
+  This is a 64 bit reloc that stores the 32 bit pc relative 
+  value in two words (with an imm instruction).  The relocation is
+  GOT offset
+ENUM
+  BFD_RELOC_MICROBLAZE_64_PLT
+ENUMDOC
+  This is a 64 bit reloc that stores the 32 bit pc relative 
+  value in two words (with an imm instruction).  The relocation is
+  PC-relative offset into PLT
+ENUM
+  BFD_RELOC_MICROBLAZE_64_GOTOFF
+ENUMDOC
+  This is a 64 bit reloc that stores the 32 bit GOT relative 
+  value in two words (with an imm instruction).  The relocation is
+  relative offset from _GLOBAL_OFFSET_TABLE_
+ENUM
+  BFD_RELOC_MICROBLAZE_32_GOTOFF
+ENUMDOC
+  This is a 32 bit reloc that stores the 32 bit GOT relative 
+  value in a word.  The relocation is relative offset from 
+  _GLOBAL_OFFSET_TABLE_
+ENUM
+  BFD_RELOC_MICROBLAZE_COPY
+ENUMDOC
+  This is used to tell the dynamic linker to copy the value out of
+  the dynamic object into the runtime process image.
+
+ENUM
+  BFD_RELOC_TILEPRO_COPY
+ENUMX
+  BFD_RELOC_TILEPRO_GLOB_DAT
+ENUMX
+  BFD_RELOC_TILEPRO_JMP_SLOT
+ENUMX
+  BFD_RELOC_TILEPRO_RELATIVE
+ENUMX
+  BFD_RELOC_TILEPRO_BROFF_X1
+ENUMX
+  BFD_RELOC_TILEPRO_JOFFLONG_X1
+ENUMX
+  BFD_RELOC_TILEPRO_JOFFLONG_X1_PLT
+ENUMX
+  BFD_RELOC_TILEPRO_IMM8_X0
+ENUMX
+  BFD_RELOC_TILEPRO_IMM8_Y0
+ENUMX
+  BFD_RELOC_TILEPRO_IMM8_X1
+ENUMX
+  BFD_RELOC_TILEPRO_IMM8_Y1
+ENUMX
+  BFD_RELOC_TILEPRO_DEST_IMM8_X1
+ENUMX
+  BFD_RELOC_TILEPRO_MT_IMM15_X1
+ENUMX
+  BFD_RELOC_TILEPRO_MF_IMM15_X1
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X0
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X1
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X0_LO
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X1_LO
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X0_HI
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X1_HI
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X0_HA
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X1_HA
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X0_PCREL
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X1_PCREL
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X0_LO_PCREL
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X1_LO_PCREL
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X0_HI_PCREL
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X1_HI_PCREL
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X0_HA_PCREL
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X1_HA_PCREL
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X0_GOT
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X1_GOT
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X0_GOT_LO
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X1_GOT_LO
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X0_GOT_HI
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X1_GOT_HI
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X0_GOT_HA
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X1_GOT_HA
+ENUMX
+  BFD_RELOC_TILEPRO_MMSTART_X0
+ENUMX
+  BFD_RELOC_TILEPRO_MMEND_X0
+ENUMX
+  BFD_RELOC_TILEPRO_MMSTART_X1
+ENUMX
+  BFD_RELOC_TILEPRO_MMEND_X1
+ENUMX
+  BFD_RELOC_TILEPRO_SHAMT_X0
+ENUMX
+  BFD_RELOC_TILEPRO_SHAMT_X1
+ENUMX
+  BFD_RELOC_TILEPRO_SHAMT_Y0
+ENUMX
+  BFD_RELOC_TILEPRO_SHAMT_Y1
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_LO
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_LO
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_HI
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_HI
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X0_TLS_GD_HA
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X1_TLS_GD_HA
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE_LO
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE_LO
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE_HI
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE_HI
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X0_TLS_IE_HA
+ENUMX
+  BFD_RELOC_TILEPRO_IMM16_X1_TLS_IE_HA
+ENUMX
+  BFD_RELOC_TILEPRO_TLS_DTPMOD32
+ENUMX
+  BFD_RELOC_TILEPRO_TLS_DTPOFF32
+ENUMX
+  BFD_RELOC_TILEPRO_TLS_TPOFF32
+ENUMDOC
+  Tilera TILEPro Relocations.
+
+ENUM
+  BFD_RELOC_TILEGX_HW0
+ENUMX
+  BFD_RELOC_TILEGX_HW1
+ENUMX
+  BFD_RELOC_TILEGX_HW2
+ENUMX
+  BFD_RELOC_TILEGX_HW3
+ENUMX
+  BFD_RELOC_TILEGX_HW0_LAST
+ENUMX
+  BFD_RELOC_TILEGX_HW1_LAST
+ENUMX
+  BFD_RELOC_TILEGX_HW2_LAST
+ENUMX
+  BFD_RELOC_TILEGX_COPY
+ENUMX
+  BFD_RELOC_TILEGX_GLOB_DAT
+ENUMX
+  BFD_RELOC_TILEGX_JMP_SLOT
+ENUMX
+  BFD_RELOC_TILEGX_RELATIVE
+ENUMX
+  BFD_RELOC_TILEGX_BROFF_X1
+ENUMX
+  BFD_RELOC_TILEGX_JUMPOFF_X1
+ENUMX
+  BFD_RELOC_TILEGX_JUMPOFF_X1_PLT
+ENUMX
+  BFD_RELOC_TILEGX_IMM8_X0
+ENUMX
+  BFD_RELOC_TILEGX_IMM8_Y0
+ENUMX
+  BFD_RELOC_TILEGX_IMM8_X1
+ENUMX
+  BFD_RELOC_TILEGX_IMM8_Y1
+ENUMX
+  BFD_RELOC_TILEGX_DEST_IMM8_X1
+ENUMX
+  BFD_RELOC_TILEGX_MT_IMM14_X1
+ENUMX
+  BFD_RELOC_TILEGX_MF_IMM14_X1
+ENUMX
+  BFD_RELOC_TILEGX_MMSTART_X0
+ENUMX
+  BFD_RELOC_TILEGX_MMEND_X0
+ENUMX
+  BFD_RELOC_TILEGX_SHAMT_X0
+ENUMX
+  BFD_RELOC_TILEGX_SHAMT_X1
+ENUMX
+  BFD_RELOC_TILEGX_SHAMT_Y0
+ENUMX
+  BFD_RELOC_TILEGX_SHAMT_Y1
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW0
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW0
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW1
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW1
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW2
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW2
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW3
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW3
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW0_PCREL
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW0_PCREL
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_PCREL
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_PCREL
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_PCREL
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_PCREL
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW3_PCREL
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW3_PCREL
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_PCREL
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_PCREL
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_PCREL
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_PCREL
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_PCREL
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_PCREL
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW0_GOT
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW0_GOT
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_GOT
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_GOT
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_GOT
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_GOT
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW3_GOT
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW3_GOT
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_GOT
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_GOT
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_GOT
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_GOT
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_GOT
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_GOT
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_GD
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_GD
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_TLS_GD
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_TLS_GD
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_TLS_GD
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_TLS_GD
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW3_TLS_GD
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW3_TLS_GD
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_GD
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_GD
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_TLS_GD
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_GD
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_TLS_GD
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_TLS_GD
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW0_TLS_IE
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW0_TLS_IE
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_TLS_IE
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_TLS_IE
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_TLS_IE
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_TLS_IE
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW3_TLS_IE
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW3_TLS_IE
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW0_LAST_TLS_IE
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW0_LAST_TLS_IE
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW1_LAST_TLS_IE
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW1_LAST_TLS_IE
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X0_HW2_LAST_TLS_IE
+ENUMX
+  BFD_RELOC_TILEGX_IMM16_X1_HW2_LAST_TLS_IE
+ENUMX
+  BFD_RELOC_TILEGX_TLS_DTPMOD64
+ENUMX
+  BFD_RELOC_TILEGX_TLS_DTPOFF64
+ENUMX
+  BFD_RELOC_TILEGX_TLS_TPOFF64
+ENUMX
+  BFD_RELOC_TILEGX_TLS_DTPMOD32
+ENUMX
+  BFD_RELOC_TILEGX_TLS_DTPOFF32
+ENUMX
+  BFD_RELOC_TILEGX_TLS_TPOFF32
+ENUMDOC
+  Tilera TILE-Gx Relocations.
+
+
+ENDSENUM
+  BFD_RELOC_UNUSED
+CODE_FRAGMENT
+.
+.typedef enum bfd_reloc_code_real bfd_reloc_code_real_type;
+*/
+
+/*
+FUNCTION
+	bfd_reloc_type_lookup
+	bfd_reloc_name_lookup
+
+SYNOPSIS
+	reloc_howto_type *bfd_reloc_type_lookup
+	  (bfd *abfd, bfd_reloc_code_real_type code);
+	reloc_howto_type *bfd_reloc_name_lookup
+	  (bfd *abfd, const char *reloc_name);
+
+DESCRIPTION
+	Return a pointer to a howto structure which, when
+	invoked, will perform the relocation @var{code} on data from the
+	architecture noted.
+
+*/
+
+reloc_howto_type *
+bfd_reloc_type_lookup (bfd *abfd, bfd_reloc_code_real_type code)
+{
+  return BFD_SEND (abfd, reloc_type_lookup, (abfd, code));
+}
+
+reloc_howto_type *
+bfd_reloc_name_lookup (bfd *abfd, const char *reloc_name)
+{
+  return BFD_SEND (abfd, reloc_name_lookup, (abfd, reloc_name));
+}
+
+static reloc_howto_type bfd_howto_32 =
+HOWTO (0, 00, 2, 32, FALSE, 0, complain_overflow_dont, 0, "VRT32", FALSE, 0xffffffff, 0xffffffff, TRUE);
+
+/*
+INTERNAL_FUNCTION
+	bfd_default_reloc_type_lookup
+
+SYNOPSIS
+	reloc_howto_type *bfd_default_reloc_type_lookup
+	  (bfd *abfd, bfd_reloc_code_real_type  code);
+
+DESCRIPTION
+	Provides a default relocation lookup routine for any architecture.
+
+*/
+
+reloc_howto_type *
+bfd_default_reloc_type_lookup (bfd *abfd, bfd_reloc_code_real_type code)
+{
+  switch (code)
+    {
+    case BFD_RELOC_CTOR:
+      /* The type of reloc used in a ctor, which will be as wide as the
+	 address - so either a 64, 32, or 16 bitter.  */
+      switch (bfd_arch_bits_per_address (abfd))
+	{
+	case 64:
+	  BFD_FAIL ();
+	case 32:
+	  return &bfd_howto_32;
+	case 16:
+	  BFD_FAIL ();
+	default:
+	  BFD_FAIL ();
+	}
+    default:
+      BFD_FAIL ();
+    }
+  return NULL;
+}
+
+/*
+FUNCTION
+	bfd_get_reloc_code_name
+
+SYNOPSIS
+	const char *bfd_get_reloc_code_name (bfd_reloc_code_real_type code);
+
+DESCRIPTION
+	Provides a printable name for the supplied relocation code.
+	Useful mainly for printing error messages.
+*/
+
+const char *
+bfd_get_reloc_code_name (bfd_reloc_code_real_type code)
+{
+  if (code > BFD_RELOC_UNUSED)
+    return 0;
+  return bfd_reloc_code_real_names[code];
+}
+
+/*
+INTERNAL_FUNCTION
+	bfd_generic_relax_section
+
+SYNOPSIS
+	bfd_boolean bfd_generic_relax_section
+	  (bfd *abfd,
+	   asection *section,
+	   struct bfd_link_info *,
+	   bfd_boolean *);
+
+DESCRIPTION
+	Provides default handling for relaxing for back ends which
+	don't do relaxing.
+*/
+
+bfd_boolean
+bfd_generic_relax_section (bfd *abfd ATTRIBUTE_UNUSED,
+			   asection *section ATTRIBUTE_UNUSED,
+			   struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
+			   bfd_boolean *again)
+{
+  if (link_info->relocatable)
+    (*link_info->callbacks->einfo)
+      (_("%P%F: --relax and -r may not be used together\n"));
+
+  *again = FALSE;
+  return TRUE;
+}
+
+/*
+INTERNAL_FUNCTION
+	bfd_generic_gc_sections
+
+SYNOPSIS
+	bfd_boolean bfd_generic_gc_sections
+	  (bfd *, struct bfd_link_info *);
+
+DESCRIPTION
+	Provides default handling for relaxing for back ends which
+	don't do section gc -- i.e., does nothing.
+*/
+
+bfd_boolean
+bfd_generic_gc_sections (bfd *abfd ATTRIBUTE_UNUSED,
+			 struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+/*
+INTERNAL_FUNCTION
+	bfd_generic_lookup_section_flags
+
+SYNOPSIS
+	void bfd_generic_lookup_section_flags
+	  (struct bfd_link_info *, struct flag_info *);
+
+DESCRIPTION
+	Provides default handling for section flags lookup
+	-- i.e., does nothing.
+*/
+
+void
+bfd_generic_lookup_section_flags (struct bfd_link_info *info ATTRIBUTE_UNUSED,
+				  struct flag_info *finfo) 
+{
+  if (finfo != NULL)
+    {
+      (*_bfd_error_handler) (_("INPUT_SECTION_FLAGS are not supported.\n"));
+      return;
+    }
+}
+
+/*
+INTERNAL_FUNCTION
+	bfd_generic_merge_sections
+
+SYNOPSIS
+	bfd_boolean bfd_generic_merge_sections
+	  (bfd *, struct bfd_link_info *);
+
+DESCRIPTION
+	Provides default handling for SEC_MERGE section merging for back ends
+	which don't have SEC_MERGE support -- i.e., does nothing.
+*/
+
+bfd_boolean
+bfd_generic_merge_sections (bfd *abfd ATTRIBUTE_UNUSED,
+			    struct bfd_link_info *link_info ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+/*
+INTERNAL_FUNCTION
+	bfd_generic_get_relocated_section_contents
+
+SYNOPSIS
+	bfd_byte *bfd_generic_get_relocated_section_contents
+	  (bfd *abfd,
+	   struct bfd_link_info *link_info,
+	   struct bfd_link_order *link_order,
+	   bfd_byte *data,
+	   bfd_boolean relocatable,
+	   asymbol **symbols);
+
+DESCRIPTION
+	Provides default handling of relocation effort for back ends
+	which can't be bothered to do it efficiently.
+
+*/
+
+bfd_byte *
+bfd_generic_get_relocated_section_contents (bfd *abfd,
+					    struct bfd_link_info *link_info,
+					    struct bfd_link_order *link_order,
+					    bfd_byte *data,
+					    bfd_boolean relocatable,
+					    asymbol **symbols)
+{
+  bfd *input_bfd = link_order->u.indirect.section->owner;
+  asection *input_section = link_order->u.indirect.section;
+  long reloc_size;
+  arelent **reloc_vector;
+  long reloc_count;
+
+  reloc_size = bfd_get_reloc_upper_bound (input_bfd, input_section);
+  if (reloc_size < 0)
+    return NULL;
+
+  /* Read in the section.  */
+  if (!bfd_get_full_section_contents (input_bfd, input_section, &data))
+    return NULL;
+
+  if (reloc_size == 0)
+    return data;
+
+  reloc_vector = (arelent **) bfd_malloc (reloc_size);
+  if (reloc_vector == NULL)
+    return NULL;
+
+  reloc_count = bfd_canonicalize_reloc (input_bfd,
+					input_section,
+					reloc_vector,
+					symbols);
+  if (reloc_count < 0)
+    goto error_return;
+
+  if (reloc_count > 0)
+    {
+      arelent **parent;
+      for (parent = reloc_vector; *parent != NULL; parent++)
+	{
+	  char *error_message = NULL;
+	  asymbol *symbol;
+	  bfd_reloc_status_type r;
+
+	  symbol = *(*parent)->sym_ptr_ptr;
+	  if (symbol->section && elf_discarded_section (symbol->section))
+	    {
+	      bfd_byte *p;
+	      static reloc_howto_type none_howto
+		= HOWTO (0, 0, 0, 0, FALSE, 0, complain_overflow_dont, NULL,
+			 "unused", FALSE, 0, 0, FALSE);
+
+	      p = data + (*parent)->address * bfd_octets_per_byte (input_bfd);
+	      _bfd_clear_contents ((*parent)->howto, input_bfd, input_section,
+				   p);
+	      (*parent)->sym_ptr_ptr = bfd_abs_section.symbol_ptr_ptr;
+	      (*parent)->addend = 0;
+	      (*parent)->howto = &none_howto;
+	      r = bfd_reloc_ok;
+	    }
+	  else
+	    r = bfd_perform_relocation (input_bfd,
+					*parent,
+					data,
+					input_section,
+					relocatable ? abfd : NULL,
+					&error_message);
+
+	  if (relocatable)
+	    {
+	      asection *os = input_section->output_section;
+
+	      /* A partial link, so keep the relocs.  */
+	      os->orelocation[os->reloc_count] = *parent;
+	      os->reloc_count++;
+	    }
+
+	  if (r != bfd_reloc_ok)
+	    {
+	      switch (r)
+		{
+		case bfd_reloc_undefined:
+		  if (!((*link_info->callbacks->undefined_symbol)
+			(link_info, bfd_asymbol_name (*(*parent)->sym_ptr_ptr),
+			 input_bfd, input_section, (*parent)->address,
+			 TRUE)))
+		    goto error_return;
+		  break;
+		case bfd_reloc_dangerous:
+		  BFD_ASSERT (error_message != NULL);
+		  if (!((*link_info->callbacks->reloc_dangerous)
+			(link_info, error_message, input_bfd, input_section,
+			 (*parent)->address)))
+		    goto error_return;
+		  break;
+		case bfd_reloc_overflow:
+		  if (!((*link_info->callbacks->reloc_overflow)
+			(link_info, NULL,
+			 bfd_asymbol_name (*(*parent)->sym_ptr_ptr),
+			 (*parent)->howto->name, (*parent)->addend,
+			 input_bfd, input_section, (*parent)->address)))
+		    goto error_return;
+		  break;
+		case bfd_reloc_outofrange:
+		default:
+		  abort ();
+		  break;
+		}
+
+	    }
+	}
+    }
+
+  free (reloc_vector);
+  return data;
+
+error_return:
+  free (reloc_vector);
+  return NULL;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/reloc16.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/reloc16.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/reloc16.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/reloc16.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,341 @@
+/* 8 and 16 bit COFF relocation functions, for BFD.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001,
+   2002, 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* Most of this hacked by Steve Chamberlain <sac@cygnus.com>.  */
+
+/* These routines are used by coff-h8300 and coff-z8k to do
+   relocation.
+
+   FIXME: This code should be rewritten to support the new COFF
+   linker.  Basically, they need to deal with COFF relocs rather than
+   BFD generic relocs.  They should store the relocs in some location
+   where coff_link_input_bfd can find them (and coff_link_input_bfd
+   should be changed to use this location rather than rereading the
+   file) (unless info->keep_memory is FALSE, in which case they should
+   free up the relocs after dealing with them).  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "bfdlink.h"
+#include "genlink.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+
+bfd_vma
+bfd_coff_reloc16_get_value (reloc, link_info, input_section)
+     arelent *reloc;
+     struct bfd_link_info *link_info;
+     asection *input_section;
+{
+  bfd_vma value;
+  asymbol *symbol = *(reloc->sym_ptr_ptr);
+  /* A symbol holds a pointer to a section, and an offset from the
+     base of the section.  To relocate, we find where the section will
+     live in the output and add that in.  */
+
+  if (bfd_is_und_section (symbol->section)
+      || bfd_is_com_section (symbol->section))
+    {
+      struct bfd_link_hash_entry *h;
+
+      /* The symbol is undefined in this BFD.  Look it up in the
+	 global linker hash table.  FIXME: This should be changed when
+	 we convert this stuff to use a specific final_link function
+	 and change the interface to bfd_relax_section to not require
+	 the generic symbols.  */
+      h = bfd_wrapped_link_hash_lookup (input_section->owner, link_info,
+					bfd_asymbol_name (symbol),
+					FALSE, FALSE, TRUE);
+      if (h != (struct bfd_link_hash_entry *) NULL
+	  && (h->type == bfd_link_hash_defined
+	      || h->type == bfd_link_hash_defweak))
+	value = (h->u.def.value
+		 + h->u.def.section->output_section->vma
+		 + h->u.def.section->output_offset);
+      else if (h != (struct bfd_link_hash_entry *) NULL
+	       && h->type == bfd_link_hash_common)
+	value = h->u.c.size;
+      else if (h != (struct bfd_link_hash_entry *) NULL
+	       && h->type == bfd_link_hash_undefweak)
+	/* This is a GNU extension.  */
+	value = 0;
+      else
+	{
+	  if (!((*link_info->callbacks->undefined_symbol)
+		(link_info, bfd_asymbol_name (symbol),
+		 input_section->owner, input_section, reloc->address,
+		 TRUE)))
+	    abort ();
+	  value = 0;
+	}
+    }
+  else
+    {
+      value = symbol->value
+	+ symbol->section->output_offset
+	+ symbol->section->output_section->vma;
+    }
+
+  /* Add the value contained in the relocation.  */
+  value += reloc->addend;
+
+  return value;
+}
+
+void
+bfd_perform_slip (abfd, slip, input_section, value)
+     bfd *abfd;
+     unsigned int slip;
+     asection *input_section;
+     bfd_vma value;
+{
+  asymbol **s;
+
+  s = _bfd_generic_link_get_symbols (abfd);
+  BFD_ASSERT (s != (asymbol **) NULL);
+
+  /* Find all symbols past this point, and make them know
+     what's happened.  */
+  while (*s)
+    {
+      asymbol *p = *s;
+      if (p->section == input_section)
+	{
+	  /* This was pointing into this section, so mangle it.  */
+	  if (p->value > value)
+	    {
+	      p->value -= slip;
+	      if (p->udata.p != NULL)
+		{
+		  struct generic_link_hash_entry *h;
+
+		  h = (struct generic_link_hash_entry *) p->udata.p;
+		  BFD_ASSERT (h->root.type == bfd_link_hash_defined
+			      || h->root.type == bfd_link_hash_defweak);
+		  h->root.u.def.value -= slip;
+		  BFD_ASSERT (h->root.u.def.value == p->value);
+		}
+	    }
+	}
+      s++;
+    }
+}
+
+bfd_boolean
+bfd_coff_reloc16_relax_section (abfd, input_section, link_info, again)
+     bfd *abfd;
+     asection *input_section;
+     struct bfd_link_info *link_info;
+     bfd_boolean *again;
+{
+  /* Get enough memory to hold the stuff.  */
+  bfd *input_bfd = input_section->owner;
+  unsigned *shrinks;
+  unsigned shrink = 0;
+  long reloc_size = bfd_get_reloc_upper_bound (input_bfd, input_section);
+  arelent **reloc_vector = NULL;
+  long reloc_count;
+
+  if (link_info->relocatable)
+    (*link_info->callbacks->einfo)
+      (_("%P%F: --relax and -r may not be used together\n"));
+
+  /* We only do global relaxation once.  It is not safe to do it multiple
+     times (see discussion of the "shrinks" array below).  */
+  *again = FALSE;
+
+  if (reloc_size < 0)
+    return FALSE;
+
+  reloc_vector = (arelent **) bfd_malloc ((bfd_size_type) reloc_size);
+  if (!reloc_vector && reloc_size > 0)
+    return FALSE;
+
+  /* Get the relocs and think about them.  */
+  reloc_count =
+    bfd_canonicalize_reloc (input_bfd, input_section, reloc_vector,
+			    _bfd_generic_link_get_symbols (input_bfd));
+  if (reloc_count < 0)
+    {
+      free (reloc_vector);
+      return FALSE;
+    }
+
+  /* The reloc16.c and related relaxing code is very simple, the price
+     for that simplicity is we can only call this function once for
+     each section.
+
+     So, to get the best results within that limitation, we do multiple
+     relaxing passes over each section here.  That involves keeping track
+     of the "shrink" at each reloc in the section.  This allows us to
+     accurately determine the relative location of two relocs within
+     this section.
+
+     In theory, if we kept the "shrinks" array for each section for the
+     entire link, we could use the generic relaxing code in the linker
+     and get better results, particularly for jsr->bsr and 24->16 bit
+     memory reference relaxations.  */
+
+  if (reloc_count > 0)
+    {
+      int another_pass = 0;
+      bfd_size_type amt;
+
+      /* Allocate and initialize the shrinks array for this section.
+	 The last element is used as an accumulator of shrinks.  */
+      amt = reloc_count + 1;
+      amt *= sizeof (unsigned);
+      shrinks = (unsigned *) bfd_zmalloc (amt);
+
+      /* Loop until nothing changes in this section.  */
+      do
+	{
+	  arelent **parent;
+	  unsigned int i;
+	  long j;
+
+	  another_pass = 0;
+
+	  for (i = 0, parent = reloc_vector; *parent; parent++, i++)
+	    {
+	      /* Let the target/machine dependent code examine each reloc
+		 in this section and attempt to shrink it.  */
+	      shrink = bfd_coff_reloc16_estimate (abfd, input_section, *parent,
+						  shrinks[i], link_info);
+
+	      /* If it shrunk, note it in the shrinks array and set up for
+		 another pass.  */
+	      if (shrink != shrinks[i])
+		{
+		  another_pass = 1;
+		  for (j = i + 1; j <= reloc_count; j++)
+		    shrinks[j] += shrink - shrinks[i];
+		}
+	    }
+	}
+      while (another_pass);
+
+      shrink = shrinks[reloc_count];
+      free ((char *) shrinks);
+    }
+
+  input_section->rawsize = input_section->size;
+  input_section->size -= shrink;
+  free ((char *) reloc_vector);
+  return TRUE;
+}
+
+bfd_byte *
+bfd_coff_reloc16_get_relocated_section_contents (in_abfd,
+						 link_info,
+						 link_order,
+						 data,
+						 relocatable,
+						 symbols)
+     bfd *in_abfd;
+     struct bfd_link_info *link_info;
+     struct bfd_link_order *link_order;
+     bfd_byte *data;
+     bfd_boolean relocatable;
+     asymbol **symbols;
+{
+  /* Get enough memory to hold the stuff.  */
+  bfd *input_bfd = link_order->u.indirect.section->owner;
+  asection *input_section = link_order->u.indirect.section;
+  long reloc_size = bfd_get_reloc_upper_bound (input_bfd, input_section);
+  arelent **reloc_vector;
+  long reloc_count;
+  bfd_size_type sz;
+
+  if (reloc_size < 0)
+    return NULL;
+
+  /* If producing relocatable output, don't bother to relax.  */
+  if (relocatable)
+    return bfd_generic_get_relocated_section_contents (in_abfd, link_info,
+						       link_order,
+						       data, relocatable,
+						       symbols);
+
+  /* Read in the section.  */
+  sz = input_section->rawsize ? input_section->rawsize : input_section->size;
+  if (!bfd_get_section_contents (input_bfd, input_section, data, 0, sz))
+    return NULL;
+
+  reloc_vector = (arelent **) bfd_malloc ((bfd_size_type) reloc_size);
+  if (!reloc_vector && reloc_size != 0)
+    return NULL;
+
+  reloc_count = bfd_canonicalize_reloc (input_bfd,
+					input_section,
+					reloc_vector,
+					symbols);
+  if (reloc_count < 0)
+    {
+      free (reloc_vector);
+      return NULL;
+    }
+
+  if (reloc_count > 0)
+    {
+      arelent **parent = reloc_vector;
+      arelent *reloc;
+      unsigned int dst_address = 0;
+      unsigned int src_address = 0;
+      unsigned int run;
+      unsigned int idx;
+
+      /* Find how long a run we can do.  */
+      while (dst_address < link_order->size)
+	{
+	  reloc = *parent;
+	  if (reloc)
+	    {
+	      /* Note that the relaxing didn't tie up the addresses in the
+		 relocation, so we use the original address to work out the
+		 run of non-relocated data.  */
+	      run = reloc->address - src_address;
+	      parent++;
+	    }
+	  else
+	    {
+	      run = link_order->size - dst_address;
+	    }
+
+	  /* Copy the bytes.  */
+	  for (idx = 0; idx < run; idx++)
+	    data[dst_address++] = data[src_address++];
+
+	  /* Now do the relocation.  */
+	  if (reloc)
+	    {
+	      bfd_coff_reloc16_extra_cases (input_bfd, link_info, link_order,
+					    reloc, data, &src_address,
+					    &dst_address);
+	    }
+	}
+    }
+  free ((char *) reloc_vector);
+  return data;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/riscix.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/riscix.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/riscix.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/riscix.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,656 @@
+/* BFD back-end for RISC iX (Acorn, arm) binaries.
+   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004,
+   2005, 2007, 2010 Free Software Foundation, Inc.
+   Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* RISC iX overloads the MAGIC field to indicate more than just the usual
+   [ZNO]MAGIC values.  Also included are squeezing information and
+   shared library usage.  */
+
+/* The following come from the man page.  */
+#define SHLIBLEN 60
+
+#define MF_IMPURE       00200
+#define MF_SQUEEZED     01000
+#define MF_USES_SL      02000
+#define MF_IS_SL        04000
+
+/* Common combinations.  */
+
+/* Demand load (impure text).  */
+#define IMAGIC          (MF_IMPURE | ZMAGIC)
+
+/* OMAGIC with large header.
+   May contain a ref to a shared lib required by the object.  */
+#define SPOMAGIC        (MF_USES_SL | OMAGIC)
+
+/* A reference to a shared library.
+   The text portion of the object contains "overflow text" from
+   the shared library to be linked in with an object.  */
+#define SLOMAGIC        (MF_IS_SL | OMAGIC) 
+
+/* Sqeezed demand paged.
+   NOTE: This interpretation of QMAGIC seems to be at variance
+   with that used on other architectures.  */
+#define QMAGIC          (MF_SQUEEZED | ZMAGIC)
+
+/* Program which uses sl.  */
+#define SPZMAGIC        (MF_USES_SL | ZMAGIC)
+
+/* Sqeezed ditto.  */
+#define SPQMAGIC        (MF_USES_SL | QMAGIC)
+
+/* Shared lib part of prog.  */
+#define SLZMAGIC        (MF_IS_SL | ZMAGIC)
+
+/* Sl which uses another.  */
+#define SLPZMAGIC       (MF_USES_SL | SLZMAGIC)
+
+#define N_SHARED_LIB(x) ((x).a_info & MF_USES_SL)
+
+/* Only a pure OMAGIC file has the minimal header.  */
+#define N_TXTOFF(x)		\
+ ((x).a_info == OMAGIC		\
+  ? 32				\
+  : (N_MAGIC(x) == ZMAGIC	\
+     ? TARGET_PAGE_SIZE		\
+     : 999))
+
+#define N_TXTADDR(x)							     \
+  (N_MAGIC(x) != ZMAGIC							     \
+   ? (bfd_vma) 0 /* object file or NMAGIC */				     \
+   /* Programs with shared libs are loaded at the first page after all the   \
+      text segments of the shared library programs.  Without looking this    \
+      up we can't know exactly what the address will be.  A reasonable guess \
+      is that a_entry will be in the first page of the executable.  */	     \
+   : (N_SHARED_LIB(x)							     \
+      ? ((x).a_entry & ~(bfd_vma) (TARGET_PAGE_SIZE - 1))		     \
+      : (bfd_vma) TEXT_START_ADDR))
+
+#define N_SYMOFF(x) \
+  (N_TXTOFF (x) + (x).a_text + (x).a_data + (x).a_trsize + (x).a_drsize)
+
+#define N_STROFF(x) (N_SYMOFF (x) + (x).a_syms)
+
+#define TEXT_START_ADDR   32768
+#define TARGET_PAGE_SIZE  32768
+#define SEGMENT_SIZE      TARGET_PAGE_SIZE
+#define DEFAULT_ARCH      bfd_arch_arm
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (riscix_,OP)
+#define TARGETNAME "a.out-riscix"
+#define N_BADMAG(x) ((((x).a_info & ~007200) != ZMAGIC) \
+                  && (((x).a_info & ~006000) != OMAGIC) \
+                  && ((x).a_info != NMAGIC))
+#define N_MAGIC(x) ((x).a_info & ~07200)
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#define WRITE_HEADERS(abfd, execp)					    \
+  {									    \
+    bfd_size_type text_size; /* Dummy vars.  */				    \
+    file_ptr text_end;							    \
+    									    \
+    if (adata (abfd).magic == undecided_magic)				    \
+      NAME (aout, adjust_sizes_and_vmas) (abfd, & text_size, & text_end);   \
+    									    \
+    execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE;	    \
+    execp->a_entry = bfd_get_start_address (abfd);			    \
+    									    \
+    execp->a_trsize = ((obj_textsec (abfd)->reloc_count) *		    \
+		       obj_reloc_entry_size (abfd));			    \
+    execp->a_drsize = ((obj_datasec (abfd)->reloc_count) *		    \
+		       obj_reloc_entry_size (abfd));			    \
+    NAME (aout, swap_exec_header_out) (abfd, execp, & exec_bytes);	    \
+    									    \
+    if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0			    \
+	|| bfd_bwrite ((void *) & exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE,  \
+		      abfd) != EXEC_BYTES_SIZE)				    \
+      return FALSE;							    \
+    /* Now write out reloc info, followed by syms and strings.  */	    \
+									    \
+    if (bfd_get_outsymbols (abfd) != NULL			    	    \
+	&& bfd_get_symcount (abfd) != 0)				    \
+      {									    \
+	if (bfd_seek (abfd, (file_ptr) (N_SYMOFF (* execp)), SEEK_SET) != 0)\
+	  return FALSE;							    \
+									    \
+	if (! NAME (aout, write_syms) (abfd))				    \
+          return FALSE;							    \
+									    \
+	if (bfd_seek (abfd, (file_ptr) (N_TRELOFF (* execp)), SEEK_SET) != 0)\
+	  return FALSE;							    \
+									    \
+	if (! riscix_squirt_out_relocs (abfd, obj_textsec (abfd)))	    \
+	  return FALSE;							    \
+	if (bfd_seek (abfd, (file_ptr) (N_DRELOFF (* execp)), SEEK_SET) != 0)\
+	  return FALSE;							    \
+									    \
+	if (!NAME (aout, squirt_out_relocs) (abfd, obj_datasec (abfd)))	    \
+	  return FALSE;							    \
+      }									    \
+  }
+
+#include "libaout.h"
+#include "aout/aout64.h"
+
+static bfd_reloc_status_type
+riscix_fix_pcrel_26_done (bfd *abfd ATTRIBUTE_UNUSED,
+			  arelent *reloc_entry ATTRIBUTE_UNUSED,
+			  asymbol *symbol ATTRIBUTE_UNUSED,
+			  void * data ATTRIBUTE_UNUSED,
+			  asection *input_section ATTRIBUTE_UNUSED,
+			  bfd *output_bfd ATTRIBUTE_UNUSED,
+			  char **error_message ATTRIBUTE_UNUSED)
+{
+  /* This is dead simple at present.  */
+  return bfd_reloc_ok;
+}
+
+static bfd_reloc_status_type riscix_fix_pcrel_26 (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static const bfd_target *riscix_callback (bfd *);
+
+static reloc_howto_type riscix_std_reloc_howto[] =
+{
+  /* Type              rs size bsz  pcrel bitpos ovrf                     sf name     part_inpl readmask  setmask    pcdone */
+  HOWTO( 0,              0,  0,   8,  FALSE, 0, complain_overflow_bitfield,0,"8",         TRUE, 0x000000ff,0x000000ff, FALSE),
+  HOWTO( 1,              0,  1,   16, FALSE, 0, complain_overflow_bitfield,0,"16",        TRUE, 0x0000ffff,0x0000ffff, FALSE),
+  HOWTO( 2,              0,  2,   32, FALSE, 0, complain_overflow_bitfield,0,"32",        TRUE, 0xffffffff,0xffffffff, FALSE),
+  HOWTO( 3,              2,  3,   26, TRUE,  0, complain_overflow_signed,  riscix_fix_pcrel_26 , "ARM26",      TRUE, 0x00ffffff,0x00ffffff, FALSE),
+  HOWTO( 4,              0,  0,   8,  TRUE,  0, complain_overflow_signed,  0,"DISP8",     TRUE, 0x000000ff,0x000000ff, TRUE),
+  HOWTO( 5,              0,  1,   16, TRUE,  0, complain_overflow_signed,  0,"DISP16",    TRUE, 0x0000ffff,0x0000ffff, TRUE),
+  HOWTO( 6,              0,  2,   32, TRUE,  0, complain_overflow_signed,  0,"DISP32",    TRUE, 0xffffffff,0xffffffff, TRUE),
+  HOWTO( 7,              2,  3,   26, FALSE, 0, complain_overflow_signed,  riscix_fix_pcrel_26_done, "ARM26D",TRUE,0x00ffffff,0x00ffffff, FALSE),
+  EMPTY_HOWTO (-1),
+  HOWTO( 9,              0, -1,   16, FALSE, 0, complain_overflow_bitfield,0,"NEG16",     TRUE, 0x0000ffff,0x0000ffff, FALSE),
+  HOWTO( 10,              0, -2,  32, FALSE, 0, complain_overflow_bitfield,0,"NEG32",     TRUE, 0xffffffff,0xffffffff, FALSE)
+};
+
+#define RISCIX_TABLE_SIZE \
+  (sizeof (riscix_std_reloc_howto) / sizeof (reloc_howto_type))
+
+static bfd_reloc_status_type
+riscix_fix_pcrel_26 (bfd *abfd,
+		     arelent *reloc_entry,
+		     asymbol *symbol,
+		     void * data,
+		     asection *input_section,
+		     bfd *output_bfd,
+		     char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma relocation;
+  bfd_size_type addr = reloc_entry->address;
+  long target = bfd_get_32 (abfd, (bfd_byte *) data + addr);
+  bfd_reloc_status_type flag = bfd_reloc_ok;
+
+  /* If this is an undefined symbol, return error.  */
+  if (symbol->section == &bfd_und_section
+      && (symbol->flags & BSF_WEAK) == 0)
+    return output_bfd ? bfd_reloc_continue : bfd_reloc_undefined;
+
+  /* If the sections are different, and we are doing a partial relocation,
+     just ignore it for now.  */
+  if (symbol->section->name != input_section->name
+      && output_bfd != NULL)
+    return bfd_reloc_continue;
+
+  relocation = (target & 0x00ffffff) << 2;
+  relocation = (relocation ^ 0x02000000) - 0x02000000; /* Sign extend.  */
+  relocation += symbol->value;
+  relocation += symbol->section->output_section->vma;
+  relocation += symbol->section->output_offset;
+  relocation += reloc_entry->addend;
+  relocation -= input_section->output_section->vma;
+  relocation -= input_section->output_offset;
+  relocation -= addr;
+  if (relocation & 3)
+    return bfd_reloc_overflow;
+
+  /* Check for overflow.  */
+  if (relocation & 0x02000000)
+    {
+      if ((relocation & ~ (bfd_vma) 0x03ffffff) != ~ (bfd_vma) 0x03ffffff)
+	flag = bfd_reloc_overflow;
+    }
+  else if (relocation & ~ (bfd_vma) 0x03ffffff)
+    flag = bfd_reloc_overflow;
+
+  target &= ~0x00ffffff;
+  target |= (relocation >> 2) & 0x00ffffff;
+  bfd_put_32 (abfd, (bfd_vma) target, (bfd_byte *) data + addr);
+
+  /* Now the ARM magic... Change the reloc type so that it is marked as done.
+     Strictly this is only necessary if we are doing a partial relocation.  */
+  reloc_entry->howto = &riscix_std_reloc_howto[7];
+
+  return flag;
+}
+
+static reloc_howto_type *
+riscix_reloc_type_lookup (bfd *abfd, bfd_reloc_code_real_type code)
+{
+#define ASTD(i,j)       case i: return &riscix_std_reloc_howto[j]
+  if (code == BFD_RELOC_CTOR)
+    switch (bfd_arch_bits_per_address (abfd))
+      {
+      case 32:
+        code = BFD_RELOC_32;
+        break;
+      default:
+	return NULL;
+      }
+
+  switch (code)
+    {
+      ASTD (BFD_RELOC_16, 1);
+      ASTD (BFD_RELOC_32, 2);
+      ASTD (BFD_RELOC_ARM_PCREL_BRANCH, 3);
+      ASTD (BFD_RELOC_8_PCREL, 4);
+      ASTD (BFD_RELOC_16_PCREL, 5);
+      ASTD (BFD_RELOC_32_PCREL, 6);
+    default:
+      return NULL;
+    }
+}
+
+static reloc_howto_type *
+riscix_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			  const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (riscix_std_reloc_howto) / sizeof (riscix_std_reloc_howto[0]);
+       i++)
+    if (riscix_std_reloc_howto[i].name != NULL
+	&& strcasecmp (riscix_std_reloc_howto[i].name, r_name) == 0)
+      return &riscix_std_reloc_howto[i];
+
+  return NULL;
+}
+
+#define MY_bfd_link_hash_table_create  _bfd_generic_link_hash_table_create
+#define MY_bfd_link_add_symbols        _bfd_generic_link_add_symbols
+#define MY_final_link_callback         should_not_be_used
+#define MY_bfd_final_link              _bfd_generic_final_link
+
+#define MY_bfd_reloc_type_lookup       riscix_reloc_type_lookup
+#define MY_bfd_reloc_name_lookup riscix_reloc_name_lookup
+#define MY_canonicalize_reloc          riscix_canonicalize_reloc
+#define MY_object_p                    riscix_object_p
+
+static void
+riscix_swap_std_reloc_out (bfd *abfd,
+			   arelent *g,
+			   struct reloc_std_external *natptr)
+{
+  int r_index;
+  asymbol *sym = *(g->sym_ptr_ptr);
+  int r_extern;
+  int r_length;
+  int r_pcrel;
+  int r_neg = 0;	/* Negative relocs use the BASEREL bit.  */
+  asection *output_section = sym->section->output_section;
+
+  PUT_WORD(abfd, g->address, natptr->r_address);
+
+  r_length = g->howto->size ;   /* Size as a power of two.  */
+  if (r_length < 0)
+    {
+      r_length = -r_length;
+      r_neg = 1;
+    }
+
+  r_pcrel  = (int) g->howto->pc_relative; /* Relative to PC?  */
+
+  /* For RISC iX, in pc-relative relocs the r_pcrel bit means that the
+     relocation has been done already (Only for the 26-bit one I think)?  */
+  if (r_length == 3)
+    r_pcrel = r_pcrel ? 0 : 1;
+
+  /* Name was clobbered by aout_write_syms to be symbol index.  */
+
+  /* If this relocation is relative to a symbol then set the
+     r_index to the symbols index, and the r_extern bit.
+
+     Absolute symbols can come in in two ways, either as an offset
+     from the abs section, or as a symbol which has an abs value.
+     check for that here.  */
+
+  if (bfd_is_com_section (output_section)
+      || output_section == & bfd_abs_section
+      || output_section == & bfd_und_section)
+    {
+      if (bfd_abs_section.symbol == sym)
+	{
+	  /* Whoops, looked like an abs symbol, but is really an offset
+	     from the abs section.  */
+	  r_index = 0;
+	  r_extern = 0;
+	}
+      else
+	{
+	  /* Fill in symbol.  */
+	  r_extern = 1;
+	  r_index = (*g->sym_ptr_ptr)->udata.i;
+	}
+    }
+  else
+    {
+      /* Just an ordinary section.  */
+      r_extern = 0;
+      r_index  = output_section->target_index;
+    }
+
+  /* Now the fun stuff.  */
+  if (bfd_header_big_endian (abfd))
+    {
+      natptr->r_index[0] = r_index >> 16;
+      natptr->r_index[1] = r_index >> 8;
+      natptr->r_index[2] = r_index;
+      natptr->r_type[0] =
+	(  (r_extern ?   RELOC_STD_BITS_EXTERN_BIG: 0)
+	 | (r_pcrel  ?   RELOC_STD_BITS_PCREL_BIG: 0)
+	 | (r_neg    ?   RELOC_STD_BITS_BASEREL_BIG: 0)
+	 | (r_length <<  RELOC_STD_BITS_LENGTH_SH_BIG));
+    }
+  else
+    {
+      natptr->r_index[2] = r_index >> 16;
+      natptr->r_index[1] = r_index >> 8;
+      natptr->r_index[0] = r_index;
+      natptr->r_type[0] =
+	(  (r_extern ?   RELOC_STD_BITS_EXTERN_LITTLE: 0)
+	 | (r_pcrel  ?   RELOC_STD_BITS_PCREL_LITTLE: 0)
+	 | (r_neg    ?   RELOC_STD_BITS_BASEREL_LITTLE: 0)
+	 | (r_length <<  RELOC_STD_BITS_LENGTH_SH_LITTLE));
+    }
+}
+
+static bfd_boolean
+riscix_squirt_out_relocs (bfd *abfd, asection *section)
+{
+  arelent **generic;
+  unsigned char *native, *natptr;
+  size_t each_size;
+  unsigned int count = section->reloc_count;
+  bfd_size_type natsize;
+
+  if (count == 0)
+    return TRUE;
+
+  each_size = obj_reloc_entry_size (abfd);
+  natsize = each_size;
+  natsize *= count;
+  native = bfd_zalloc (abfd, natsize);
+  if (!native)
+    return FALSE;
+
+  generic = section->orelocation;
+
+  for (natptr = native;
+       count != 0;
+       --count, natptr += each_size, ++generic)
+    riscix_swap_std_reloc_out (abfd, *generic,
+			       (struct reloc_std_external *) natptr);
+
+  if (bfd_bwrite ((void *) native, natsize, abfd) != natsize)
+    {
+      bfd_release (abfd, native);
+      return FALSE;
+    }
+
+  bfd_release (abfd, native);
+  return TRUE;
+}
+
+/* This is just like the standard aoutx.h version but we need to do our
+   own mapping of external reloc type values to howto entries.  */
+
+static long
+MY (canonicalize_reloc) (bfd *abfd,
+			 sec_ptr section,
+			 arelent **relptr,
+			 asymbol **symbols)
+{
+  arelent *tblptr = section->relocation;
+  unsigned int count, c;
+  extern reloc_howto_type NAME (aout, std_howto_table)[];
+
+  /* If we have already read in the relocation table, return the values.  */
+  if (section->flags & SEC_CONSTRUCTOR)
+    {
+      arelent_chain *chain = section->constructor_chain;
+
+      for (count = 0; count < section->reloc_count; count++)
+	{
+	  *relptr++ = &chain->relent;
+	  chain = chain->next;
+	}
+      *relptr = 0;
+      return section->reloc_count;
+    }
+
+  if (tblptr && section->reloc_count)
+    {
+      for (count = 0; count++ < section->reloc_count;)
+	*relptr++ = tblptr++;
+      *relptr = 0;
+      return section->reloc_count;
+    }
+
+  if (!NAME (aout, slurp_reloc_table) (abfd, section, symbols))
+    return -1;
+  tblptr = section->relocation;
+
+  /* Fix up howto entries.  */
+  for (count = 0; count++ < section->reloc_count;)
+    {
+      c = tblptr->howto - NAME(aout,std_howto_table);
+      BFD_ASSERT (c < RISCIX_TABLE_SIZE);
+      tblptr->howto = &riscix_std_reloc_howto[c];
+
+      *relptr++ = tblptr++;
+    }
+  *relptr = 0;
+  return section->reloc_count;
+}
+
+/* This is the same as NAME(aout,some_aout_object_p), but has different
+   expansions of the macro definitions.  */
+
+static const bfd_target *
+riscix_some_aout_object_p (bfd *abfd,
+			   struct internal_exec *execp,
+			   const bfd_target *(*callback_to_real_object_p) (bfd *))
+{
+  struct aout_data_struct *rawptr, *oldrawptr;
+  const bfd_target *result;
+  bfd_size_type amt = sizeof (struct aout_data_struct);
+
+  rawptr = bfd_zalloc (abfd, amt);
+
+  if (rawptr == NULL)
+    return NULL;
+
+  oldrawptr = abfd->tdata.aout_data;
+  abfd->tdata.aout_data = rawptr;
+
+  /* Copy the contents of the old tdata struct.
+     In particular, we want the subformat, since for hpux it was set in
+     hp300hpux.c:swap_exec_header_in and will be used in
+     hp300hpux.c:callback.  */
+  if (oldrawptr != NULL)
+    *abfd->tdata.aout_data = *oldrawptr;
+
+  abfd->tdata.aout_data->a.hdr = &rawptr->e;
+  /* Copy in the internal_exec struct.  */
+  *(abfd->tdata.aout_data->a.hdr) = *execp;
+  execp = abfd->tdata.aout_data->a.hdr;
+
+  /* Set the file flags.  */
+  abfd->flags = BFD_NO_FLAGS;
+  if (execp->a_drsize || execp->a_trsize)
+    abfd->flags |= HAS_RELOC;
+  /* Setting of EXEC_P has been deferred to the bottom of this function.  */
+  if (execp->a_syms)
+    abfd->flags |= HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS;
+  if (N_DYNAMIC(*execp))
+    abfd->flags |= DYNAMIC;
+
+ /* Squeezed files aren't supported (yet)!  */
+  if ((execp->a_info & MF_SQUEEZED) != 0)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+  else if ((execp->a_info & MF_IS_SL) != 0)
+    {
+      /* Nor are shared libraries.  */
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+  else if (N_MAGIC (*execp) == ZMAGIC)
+    {
+      abfd->flags |= D_PAGED | WP_TEXT;
+      adata (abfd).magic = z_magic;
+    }
+  else if (N_MAGIC (*execp) == NMAGIC)
+    {
+      abfd->flags |= WP_TEXT;
+      adata (abfd).magic = n_magic;
+    }
+  else if (N_MAGIC (*execp) == OMAGIC)
+    adata (abfd).magic = o_magic;
+  else
+    /* Should have been checked with N_BADMAG before this routine
+       was called.  */
+    abort ();
+
+  bfd_get_start_address (abfd) = execp->a_entry;
+
+  obj_aout_symbols (abfd) = NULL;
+  bfd_get_symcount (abfd) = execp->a_syms / sizeof (struct external_nlist);
+
+  /* The default relocation entry size is that of traditional V7 Unix.  */
+  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+
+  /* The default symbol entry size is that of traditional Unix.  */
+  obj_symbol_entry_size (abfd) = EXTERNAL_NLIST_SIZE;
+
+  obj_aout_external_syms (abfd) = NULL;
+  obj_aout_external_strings (abfd) = NULL;
+  obj_aout_sym_hashes (abfd) = NULL;
+
+  if (! NAME (aout, make_sections) (abfd))
+    return NULL;
+
+  obj_datasec (abfd)->size = execp->a_data;
+  obj_bsssec (abfd)->size = execp->a_bss;
+
+  obj_textsec (abfd)->flags =
+    (execp->a_trsize != 0
+     ? (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS | SEC_RELOC)
+     : (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS));
+  obj_datasec (abfd)->flags =
+    (execp->a_drsize != 0
+     ? (SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_HAS_CONTENTS | SEC_RELOC)
+     : (SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_HAS_CONTENTS));
+  obj_bsssec (abfd)->flags = SEC_ALLOC;
+
+  result = (*callback_to_real_object_p) (abfd);
+
+#if defined(MACH) || defined(STAT_FOR_EXEC)
+  /* The original heuristic doesn't work in some important cases. The
+     a.out file has no information about the text start address. For
+     files (like kernels) linked to non-standard addresses (ld -Ttext
+     nnn) the entry point may not be between the default text start
+     (obj_textsec(abfd)->vma) and (obj_textsec(abfd)->vma) + text size
+     This is not just a mach issue. Many kernels are loaded at non
+     standard addresses.  */
+  {
+    struct stat stat_buf;
+
+    if (abfd->iostream != NULL
+	&& (abfd->flags & BFD_IN_MEMORY) == 0
+        && (fstat(fileno((FILE *) (abfd->iostream)), &stat_buf) == 0)
+        && ((stat_buf.st_mode & 0111) != 0))
+      abfd->flags |= EXEC_P;
+  }
+#else /* ! MACH */
+  /* Now that the segment addresses have been worked out, take a better
+     guess at whether the file is executable.  If the entry point
+     is within the text segment, assume it is.  (This makes files
+     executable even if their entry point address is 0, as long as
+     their text starts at zero.)
+
+     At some point we should probably break down and stat the file and
+     declare it executable if (one of) its 'x' bits are on...  */
+  if ((execp->a_entry >= obj_textsec(abfd)->vma) &&
+      (execp->a_entry < obj_textsec(abfd)->vma + obj_textsec(abfd)->size))
+    abfd->flags |= EXEC_P;
+#endif /* MACH */
+  if (result == NULL)
+    {
+      free (rawptr);
+      abfd->tdata.aout_data = oldrawptr;
+    }
+  return result;
+}
+
+static const bfd_target *
+MY (object_p) (bfd *abfd)
+{
+  struct external_exec exec_bytes;      /* Raw exec header from file.  */
+  struct internal_exec exec;            /* Cleaned-up exec header.  */
+  const bfd_target *target;
+
+  if (bfd_bread ((void *) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE, abfd)
+      != EXEC_BYTES_SIZE)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  exec.a_info = H_GET_32 (abfd, exec_bytes.e_info);
+
+  if (N_BADMAG (exec))
+    return NULL;
+
+#ifdef MACHTYPE_OK
+  if (!(MACHTYPE_OK (N_MACHTYPE (exec))))
+    return NULL;
+#endif
+
+  NAME (aout, swap_exec_header_in) (abfd, & exec_bytes, & exec);
+
+  target = riscix_some_aout_object_p (abfd, & exec, MY (callback));
+
+  return target;
+}
+
+#include "aout-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/rs6000-core.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/rs6000-core.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/rs6000-core.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/rs6000-core.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,753 @@
+/* IBM RS/6000 "XCOFF" back-end for BFD.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
+   2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009
+   Free Software Foundation, Inc.
+   Written by Metin G. Ozisik, Mimi Phuong-Thao Vo, and John Gilmore.
+   Archive support from Damon A. Permezel.
+   Contributed by IBM Corporation and Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* This port currently only handles reading object files, except when
+   compiled on an RS/6000 host.  -- no archive support, no core files.
+   In all cases, it does not support writing.
+
+   This is in a separate file from coff-rs6000.c, because it includes
+   system include files that conflict with coff/rs6000.h.  */
+
+/* Internalcoff.h and coffcode.h modify themselves based on this flag.  */
+#define RS6000COFF_C 1
+
+/* The AIX 4.1 kernel is obviously compiled with -D_LONG_LONG, so
+   we have to define _LONG_LONG for older versions of gcc to get the
+   proper alignments in the user structure.  */
+#if defined(_AIX41) && !defined(_LONG_LONG)
+#define _LONG_LONG
+#endif
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#ifdef AIX_CORE
+
+/* AOUTHDR is defined by the above.  We need another defn of it, from the
+   system include files.  Punt the old one and get us a new name for the
+   typedef in the system include files.  */
+#ifdef AOUTHDR
+#undef AOUTHDR
+#endif
+#define	AOUTHDR	second_AOUTHDR
+
+#undef	SCNHDR
+
+/* ------------------------------------------------------------------------ */
+/*	Support for core file stuff..					    */
+/* ------------------------------------------------------------------------ */
+
+#include <sys/user.h>
+#define __LDINFO_PTRACE32__	/* for __ld_info32 */
+#define __LDINFO_PTRACE64__	/* for __ld_info64 */
+#include <sys/ldr.h>
+#include <sys/core.h>
+#include <sys/systemcfg.h>
+
+/* Borrowed from <sys/inttypes.h> on recent AIX versions.  */
+typedef unsigned long ptr_to_uint;
+
+#define	core_hdr(bfd)		((CoreHdr *) bfd->tdata.any)
+
+/* AIX 4.1 changed the names and locations of a few items in the core file.
+   AIX 4.3 defined an entirely new structure, core_dumpx, but kept support for
+   the previous 4.1 structure, core_dump.
+
+   AIX_CORE_DUMPX_CORE is defined (by configure) on AIX 4.3+, and
+   CORE_VERSION_1 is defined (by AIX core.h) as 2 on AIX 4.3+ and as 1 on AIX
+   4.1 and 4.2.  AIX pre-4.1 (aka 3.x) either doesn't define CORE_VERSION_1
+   or else defines it as 0.  */
+
+#if defined(CORE_VERSION_1) && !CORE_VERSION_1
+# undef CORE_VERSION_1
+#endif
+
+/* The following union and macros allow this module to compile on all AIX
+   versions and to handle both core_dumpx and core_dump on 4.3+.  CNEW_*()
+   and COLD_*() macros respectively retrieve core_dumpx and core_dump
+   values.  */
+
+/* Union of 32-bit and 64-bit versions of ld_info.  */
+
+typedef union {
+#ifdef __ld_info32
+  struct __ld_info32 l32;
+  struct __ld_info64 l64;
+#else
+  struct ld_info l32;
+  struct ld_info l64;
+#endif
+} LdInfo;
+
+/* Union of old and new core dump structures.  */
+
+typedef union {
+#ifdef AIX_CORE_DUMPX_CORE
+  struct core_dumpx new_dump;	/* new AIX 4.3+ core dump */
+#else
+  struct core_dump new_dump;		/* for simpler coding */
+#endif
+  struct core_dump old;		/* old AIX 4.2- core dump, still used on
+				   4.3+ with appropriate SMIT config */
+} CoreHdr;
+
+/* Union of old and new vm_info structures.  */
+
+#ifdef CORE_VERSION_1
+typedef union {
+#ifdef AIX_CORE_DUMPX_CORE
+  struct vm_infox new_dump;
+#else
+  struct vm_info new_dump;
+#endif
+  struct vm_info old;
+} VmInfo;
+#endif
+
+/* Return whether CoreHdr C is in new or old format.  */
+
+#ifdef AIX_CORE_DUMPX_CORE
+# define CORE_NEW(c)	(!(c).old.c_entries)
+#else
+# define CORE_NEW(c)	0
+#endif
+
+/* Return whether CoreHdr C usese core_dumpxx structure.
+
+   FIXME: the core file format version number used here definitely indicates
+   that struct core_dumpxx should be used to represent the core file header,
+   but that may not be the only such format version number.  */
+
+#ifdef AIX_5_CORE
+# define CORE_DUMPXX_VERSION  	267312562
+# define CNEW_IS_CORE_DUMPXX(c) ((c).new_dump.c_version == CORE_DUMPXX_VERSION)
+#else
+# define CNEW_IS_CORE_DUMPXX(c) 0
+#endif
+
+/* Return the c_stackorg field from struct core_dumpx C.  */
+
+#ifdef AIX_CORE_DUMPX_CORE
+# define CNEW_STACKORG(c)	(c).c_stackorg
+#else
+# define CNEW_STACKORG(c)	0
+#endif
+
+/* Return the offset to the loader region from struct core_dump C.  */
+
+#ifdef AIX_CORE_DUMPX_CORE
+# define CNEW_LOADER(c)	(c).c_loader
+#else
+# define CNEW_LOADER(c)	0
+#endif
+
+/* Return the offset to the loader region from struct core_dump C.  */
+
+#define COLD_LOADER(c)	(c).c_tab
+
+/* Return the c_lsize field from struct core_dumpx C.  */
+
+#ifdef AIX_CORE_DUMPX_CORE
+# define CNEW_LSIZE(c)	(c).c_lsize
+#else
+# define CNEW_LSIZE(c)	0
+#endif
+
+/* Return the c_dataorg field from struct core_dumpx C.  */
+
+#ifdef AIX_CORE_DUMPX_CORE
+# define CNEW_DATAORG(c)	(c).c_dataorg
+#else
+# define CNEW_DATAORG(c)	0
+#endif
+
+/* Return the c_datasize field from struct core_dumpx C.  */
+
+#ifdef AIX_CORE_DUMPX_CORE
+# define CNEW_DATASIZE(c)	(c).c_datasize
+#else
+# define CNEW_DATASIZE(c)	0
+#endif
+
+/* Return the c_impl field from struct core_dumpx C.  */
+
+#if defined (HAVE_ST_C_IMPL) || defined (AIX_5_CORE)
+# define CNEW_IMPL(c)	(c).c_impl
+#else
+# define CNEW_IMPL(c)	0
+#endif
+
+/* Return the command string from struct core_dumpx C.  */
+
+#ifdef AIX_CORE_DUMPX_CORE
+# define CNEW_COMM(c)	(c).c_u.U_proc.pi_comm
+#else
+# define CNEW_COMM(c)	0
+#endif
+
+/* Return the command string from struct core_dump C.  */
+
+#ifdef CORE_VERSION_1
+# define COLD_COMM(c)	(c).c_u.U_comm
+#else
+# define COLD_COMM(c)	(c).c_u.u_comm
+#endif
+
+/* Return the struct __context64 pointer from struct core_dumpx C.  */
+
+#ifdef AIX_CORE_DUMPX_CORE
+# define CNEW_CONTEXT64(c)	(c).c_flt.hctx.r64
+#else
+# define CNEW_CONTEXT64(c)	c
+#endif
+
+/* Return the struct mstsave pointer from struct core_dumpx C.  */
+
+#ifdef AIX_CORE_DUMPX_CORE
+# define CNEW_MSTSAVE(c)	(c).c_flt.hctx.r32
+#else
+# define CNEW_MSTSAVE(c)	c
+#endif
+
+/* Return the struct mstsave pointer from struct core_dump C.  */
+
+#ifdef CORE_VERSION_1
+# define COLD_MSTSAVE(c)	(c).c_mst
+#else
+# define COLD_MSTSAVE(c)	(c).c_u.u_save
+#endif
+
+/* Return whether struct core_dumpx is from a 64-bit process.  */
+
+#ifdef AIX_CORE_DUMPX_CORE
+# define CNEW_PROC64(c)		IS_PROC64(&(c).c_u.U_proc)
+#else
+# define CNEW_PROC64(c)		0
+#endif
+
+/* Magic end-of-stack addresses for old core dumps.  This is _very_ fragile,
+   but I don't see any easy way to get that info right now.  */
+
+#ifdef CORE_VERSION_1
+# define COLD_STACKEND	0x2ff23000
+#else
+# define COLD_STACKEND	0x2ff80000
+#endif
+
+/* Size of the leading portion that old and new core dump structures have in
+   common.  */
+#define CORE_COMMONSZ	((int) &((struct core_dump *) 0)->c_entries \
+			 + sizeof (((struct core_dump *) 0)->c_entries))
+
+/* Define prototypes for certain functions, to avoid a compiler warning
+   saying that they are missing.  */
+
+const bfd_target * rs6000coff_core_p (bfd *abfd);
+bfd_boolean rs6000coff_core_file_matches_executable_p (bfd *core_bfd,
+                                                       bfd *exec_bfd);
+char * rs6000coff_core_file_failing_command (bfd *abfd);
+int rs6000coff_core_file_failing_signal (bfd *abfd);
+
+/* Try to read into CORE the header from the core file associated with ABFD.
+   Return success.  */
+
+static bfd_boolean
+read_hdr (bfd *abfd, CoreHdr *core)
+{
+  bfd_size_type size;
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    return FALSE;
+
+  /* Read the leading portion that old and new core dump structures have in
+     common.  */
+  size = CORE_COMMONSZ;
+  if (bfd_bread (core, size, abfd) != size)
+    return FALSE;
+
+  /* Read the trailing portion of the structure.  */
+  if (CORE_NEW (*core))
+    size = sizeof (core->new_dump);
+  else
+    size = sizeof (core->old);
+  size -= CORE_COMMONSZ;
+  return bfd_bread ((char *) core + CORE_COMMONSZ, size, abfd) == size;
+}
+
+static asection *
+make_bfd_asection (bfd *abfd, const char *name, flagword flags,
+		   bfd_size_type size, bfd_vma vma, file_ptr filepos)
+{
+  asection *asect;
+
+  asect = bfd_make_section_anyway_with_flags (abfd, name, flags);
+  if (!asect)
+    return NULL;
+
+  asect->size = size;
+  asect->vma = vma;
+  asect->filepos = filepos;
+  asect->alignment_power = 8;
+
+  return asect;
+}
+
+/* Decide if a given bfd represents a `core' file or not. There really is no
+   magic number or anything like, in rs6000coff.  */
+
+const bfd_target *
+rs6000coff_core_p (bfd *abfd)
+{
+  CoreHdr core;
+  struct stat statbuf;
+  bfd_size_type size;
+  char *tmpptr;
+
+  /* Values from new and old core structures.  */
+  int c_flag;
+  file_ptr c_stack, c_regoff, c_loader;
+  bfd_size_type c_size, c_regsize, c_lsize;
+  bfd_vma c_stackend;
+  void *c_regptr;
+  int proc64;
+
+  if (!read_hdr (abfd, &core))
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  /* This isn't the right handler for 64-bit core files on AIX 5.x.  */
+  if (CORE_NEW (core) && CNEW_IS_CORE_DUMPXX (core))
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  /* Copy fields from new or old core structure.  */
+  if (CORE_NEW (core))
+    {
+      c_flag = core.new_dump.c_flag;
+      c_stack = (file_ptr) core.new_dump.c_stack;
+      c_size = core.new_dump.c_size;
+      c_stackend = CNEW_STACKORG (core.new_dump) + c_size;
+      c_lsize = CNEW_LSIZE (core.new_dump);
+      c_loader = CNEW_LOADER (core.new_dump);
+      proc64 = CNEW_PROC64 (core.new_dump);
+    }
+  else
+    {
+      c_flag = core.old.c_flag;
+      c_stack = (file_ptr) (ptr_to_uint) core.old.c_stack;
+      c_size = core.old.c_size;
+      c_stackend = COLD_STACKEND;
+      c_lsize = 0x7ffffff;
+      c_loader = (file_ptr) (ptr_to_uint) COLD_LOADER (core.old);
+      proc64 = 0;
+    }
+
+  if (proc64)
+    {
+      c_regsize = sizeof (CNEW_CONTEXT64 (core.new_dump));
+      c_regptr = &CNEW_CONTEXT64 (core.new_dump);
+    }
+  else if (CORE_NEW (core))
+    {
+      c_regsize = sizeof (CNEW_MSTSAVE (core.new_dump));
+      c_regptr = &CNEW_MSTSAVE (core.new_dump);
+    }
+  else
+    {
+      c_regsize = sizeof (COLD_MSTSAVE (core.old));
+      c_regptr = &COLD_MSTSAVE (core.old);
+    }
+  c_regoff = (char *) c_regptr - (char *) &core;
+
+  if (bfd_stat (abfd, &statbuf) < 0)
+    {
+      bfd_set_error (bfd_error_system_call);
+      return NULL;
+    }
+
+  /* If the core file ulimit is too small, the system will first
+     omit the data segment, then omit the stack, then decline to
+     dump core altogether (as far as I know UBLOCK_VALID and LE_VALID
+     are always set) (this is based on experimentation on AIX 3.2).
+     Now, the thing is that GDB users will be surprised
+     if segments just silently don't appear (well, maybe they would
+     think to check "info files", I don't know).
+
+     For the data segment, we have no choice but to keep going if it's
+     not there, since the default behavior is not to dump it (regardless
+     of the ulimit, it's based on SA_FULLDUMP).  But for the stack segment,
+     if it's not there, we refuse to have anything to do with this core
+     file.  The usefulness of a core dump without a stack segment is pretty
+     limited anyway.  */
+
+  if (!(c_flag & UBLOCK_VALID)
+      || !(c_flag & LE_VALID))
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  if (!(c_flag & USTACK_VALID))
+    {
+      bfd_set_error (bfd_error_file_truncated);
+      return NULL;
+    }
+
+  /* Don't check the core file size for a full core, AIX 4.1 includes
+     additional shared library sections in a full core.  */
+  if (!(c_flag & (FULL_CORE | CORE_TRUNC)))
+    {
+      /* If the size is wrong, it means we're misinterpreting something.  */
+      if (c_stack + (file_ptr) c_size != statbuf.st_size)
+	{
+	  bfd_set_error (bfd_error_wrong_format);
+	  return NULL;
+	}
+    }
+
+  /* Sanity check on the c_tab field.  */
+  if (!CORE_NEW (core) && (c_loader < (file_ptr) sizeof core.old ||
+			   c_loader >= statbuf.st_size ||
+			   c_loader >= c_stack))
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  /* Issue warning if the core file was truncated during writing.  */
+  if (c_flag & CORE_TRUNC)
+    (*_bfd_error_handler) (_("%s: warning core file truncated"),
+			   bfd_get_filename (abfd));
+
+  /* Allocate core file header.  */
+  size = CORE_NEW (core) ? sizeof (core.new_dump) : sizeof (core.old);
+  tmpptr = (char *) bfd_zalloc (abfd, (bfd_size_type) size);
+  if (!tmpptr)
+    return NULL;
+
+  /* Copy core file header.  */
+  memcpy (tmpptr, &core, size);
+  set_tdata (abfd, tmpptr);
+
+  /* Set architecture.  */
+  if (CORE_NEW (core))
+    {
+      enum bfd_architecture arch;
+      unsigned long mach;
+
+      switch (CNEW_IMPL (core.new_dump))
+	{
+	case POWER_RS1:
+	case POWER_RSC:
+	case POWER_RS2:
+	  arch = bfd_arch_rs6000;
+	  mach = bfd_mach_rs6k;
+	  break;
+	default:
+	  arch = bfd_arch_powerpc;
+	  mach = bfd_mach_ppc;
+	  break;
+	}
+      bfd_default_set_arch_mach (abfd, arch, mach);
+    }
+
+  /* .stack section.  */
+  if (!make_bfd_asection (abfd, ".stack",
+			  SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
+			  c_size, c_stackend - c_size, c_stack))
+    goto fail;
+
+  /* .reg section for all registers.  */
+  if (!make_bfd_asection (abfd, ".reg",
+			  SEC_HAS_CONTENTS,
+			  c_regsize, (bfd_vma) 0, c_regoff))
+    goto fail;
+
+  /* .ldinfo section.
+     To actually find out how long this section is in this particular
+     core dump would require going down the whole list of struct ld_info's.
+     See if we can just fake it.  */
+  if (!make_bfd_asection (abfd, ".ldinfo",
+			  SEC_HAS_CONTENTS,
+			  c_lsize, (bfd_vma) 0, c_loader))
+    goto fail;
+
+#ifndef CORE_VERSION_1
+  /* .data section if present.
+     AIX 3 dumps the complete data section and sets FULL_CORE if the
+     ulimit is large enough, otherwise the data section is omitted.
+     AIX 4 sets FULL_CORE even if the core file is truncated, we have
+     to examine core.c_datasize below to find out the actual size of
+     the .data section.  */
+  if (c_flag & FULL_CORE)
+    {
+      if (!make_bfd_asection (abfd, ".data",
+			      SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
+			      (bfd_size_type) core.old.c_u.u_dsize,
+			      (bfd_vma)
+				CDATA_ADDR (core.old.c_u.u_dsize),
+			      c_stack + c_size))
+	goto fail;
+    }
+#endif
+
+#ifdef CORE_VERSION_1
+  /* AIX 4 adds data sections from loaded objects to the core file,
+     which can be found by examining ldinfo, and anonymously mmapped
+     regions.  */
+  {
+    LdInfo ldinfo;
+    bfd_size_type ldi_datasize;
+    file_ptr ldi_core;
+    uint ldi_next;
+    bfd_vma ldi_dataorg;
+
+    /* Fields from new and old core structures.  */
+    bfd_size_type c_datasize, c_vmregions;
+    file_ptr c_data, c_vmm;
+
+    if (CORE_NEW (core))
+      {
+	c_datasize = CNEW_DATASIZE (core.new_dump);
+	c_data = (file_ptr) core.new_dump.c_data;
+	c_vmregions = core.new_dump.c_vmregions;
+	c_vmm = (file_ptr) core.new_dump.c_vmm;
+      }
+    else
+      {
+	c_datasize = core.old.c_datasize;
+	c_data = (file_ptr) (ptr_to_uint) core.old.c_data;
+	c_vmregions = core.old.c_vmregions;
+	c_vmm = (file_ptr) (ptr_to_uint) core.old.c_vmm;
+      }
+
+    /* .data section from executable.  */
+    if (c_datasize)
+      {
+	if (!make_bfd_asection (abfd, ".data",
+				SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
+				c_datasize,
+				(bfd_vma) CDATA_ADDR (c_datasize),
+				c_data))
+	  goto fail;
+      }
+
+    /* .data sections from loaded objects.  */
+    if (proc64)
+      size = (int) ((LdInfo *) 0)->l64.ldinfo_filename;
+    else
+      size = (int) ((LdInfo *) 0)->l32.ldinfo_filename;
+
+    while (1)
+      {
+	if (bfd_seek (abfd, c_loader, SEEK_SET) != 0)
+	  goto fail;
+	if (bfd_bread (&ldinfo, size, abfd) != size)
+	  goto fail;
+
+	if (proc64)
+	  {
+	    ldi_core = ldinfo.l64.ldinfo_core;
+	    ldi_datasize = ldinfo.l64.ldinfo_datasize;
+	    ldi_dataorg = (bfd_vma) ldinfo.l64.ldinfo_dataorg;
+	    ldi_next = ldinfo.l64.ldinfo_next;
+	  }
+	else
+	  {
+	    ldi_core = ldinfo.l32.ldinfo_core;
+	    ldi_datasize = ldinfo.l32.ldinfo_datasize;
+	    ldi_dataorg = (bfd_vma) (long) ldinfo.l32.ldinfo_dataorg;
+	    ldi_next = ldinfo.l32.ldinfo_next;
+	  }
+
+	if (ldi_core)
+	  if (!make_bfd_asection (abfd, ".data",
+				  SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
+				  ldi_datasize, ldi_dataorg, ldi_core))
+	    goto fail;
+
+	if (ldi_next == 0)
+	  break;
+	c_loader += ldi_next;
+      }
+
+    /* .vmdata sections from anonymously mmapped regions.  */
+    if (c_vmregions)
+      {
+	bfd_size_type i;
+
+	if (bfd_seek (abfd, c_vmm, SEEK_SET) != 0)
+	  goto fail;
+
+	for (i = 0; i < c_vmregions; i++)
+	  {
+	    VmInfo vminfo;
+	    bfd_size_type vminfo_size;
+	    file_ptr vminfo_offset;
+	    bfd_vma vminfo_addr;
+
+	    size = CORE_NEW (core) ? sizeof (vminfo.new_dump) : sizeof (vminfo.old);
+	    if (bfd_bread (&vminfo, size, abfd) != size)
+	      goto fail;
+
+	    if (CORE_NEW (core))
+	      {
+		vminfo_addr = (bfd_vma) vminfo.new_dump.vminfo_addr;
+		vminfo_size = vminfo.new_dump.vminfo_size;
+		vminfo_offset = vminfo.new_dump.vminfo_offset;
+	      }
+	    else
+	      {
+		vminfo_addr = (bfd_vma) (long) vminfo.old.vminfo_addr;
+		vminfo_size = vminfo.old.vminfo_size;
+		vminfo_offset = vminfo.old.vminfo_offset;
+	      }
+
+	    if (vminfo_offset)
+	      if (!make_bfd_asection (abfd, ".vmdata",
+				      SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
+				      vminfo_size, vminfo_addr,
+				      vminfo_offset))
+		goto fail;
+	  }
+      }
+  }
+#endif
+
+  return abfd->xvec;		/* This is garbage for now.  */
+
+ fail:
+  bfd_release (abfd, abfd->tdata.any);
+  abfd->tdata.any = NULL;
+  bfd_section_list_clear (abfd);
+  return NULL;
+}
+
+/* Return `TRUE' if given core is from the given executable.  */
+
+bfd_boolean
+rs6000coff_core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)
+{
+  CoreHdr core;
+  bfd_size_type size;
+  char *path, *s;
+  size_t alloc;
+  const char *str1, *str2;
+  bfd_boolean ret;
+  file_ptr c_loader;
+
+  if (!read_hdr (core_bfd, &core))
+    return FALSE;
+
+  if (CORE_NEW (core))
+    c_loader = CNEW_LOADER (core.new_dump);
+  else
+    c_loader = (file_ptr) (ptr_to_uint) COLD_LOADER (core.old);
+
+  if (CORE_NEW (core) && CNEW_PROC64 (core.new_dump))
+    size = (int) ((LdInfo *) 0)->l64.ldinfo_filename;
+  else
+    size = (int) ((LdInfo *) 0)->l32.ldinfo_filename;
+
+  if (bfd_seek (core_bfd, c_loader + size, SEEK_SET) != 0)
+    return FALSE;
+
+  alloc = 100;
+  path = bfd_malloc ((bfd_size_type) alloc);
+  if (path == NULL)
+    return FALSE;
+  s = path;
+
+  while (1)
+    {
+      if (bfd_bread (s, (bfd_size_type) 1, core_bfd) != 1)
+	{
+	  free (path);
+	  return FALSE;
+	}
+      if (*s == '\0')
+	break;
+      ++s;
+      if (s == path + alloc)
+	{
+	  char *n;
+
+	  alloc *= 2;
+	  n = bfd_realloc (path, (bfd_size_type) alloc);
+	  if (n == NULL)
+	    {
+	      free (path);
+	      return FALSE;
+	    }
+	  s = n + (path - s);
+	  path = n;
+	}
+    }
+
+  str1 = strrchr (path, '/');
+  str2 = strrchr (exec_bfd->filename, '/');
+
+  /* step over character '/' */
+  str1 = str1 != NULL ? str1 + 1 : path;
+  str2 = str2 != NULL ? str2 + 1 : exec_bfd->filename;
+
+  if (strcmp (str1, str2) == 0)
+    ret = TRUE;
+  else
+    ret = FALSE;
+
+  free (path);
+
+  return ret;
+}
+
+char *
+rs6000coff_core_file_failing_command (bfd *abfd)
+{
+  CoreHdr *core = core_hdr (abfd);
+  char *com = CORE_NEW (*core) ?
+    CNEW_COMM (core->new_dump) : COLD_COMM (core->old);
+
+  if (*com)
+    return com;
+  else
+    return 0;
+}
+
+int
+rs6000coff_core_file_failing_signal (bfd *abfd)
+{
+  CoreHdr *core = core_hdr (abfd);
+  return CORE_NEW (*core) ? core->new_dump.c_signo : core->old.c_signo;
+}
+
+#endif /* AIX_CORE */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/sco5-core.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/sco5-core.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/sco5-core.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/sco5-core.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,412 @@
+/* BFD back end for SCO5 core files (U-area and raw sections)
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+   2010, 2011
+   Free Software Foundation, Inc.
+   Written by Jouke Numan <jnuman@hiscom.nl>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libaout.h"		/* BFD a.out internal data structures */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/dir.h>
+#include <signal.h>
+
+#include <sys/user.h>		/* After a.out.h  */
+#ifdef SCO5_CORE
+#include <sys/paccess.h>
+#include <sys/region.h>
+#endif
+
+struct sco5_core_struct
+{
+  struct user u;
+};
+
+/* forward declarations */
+
+static asection *make_bfd_asection
+  PARAMS ((bfd *, const char *, flagword, bfd_size_type, bfd_vma, file_ptr));
+static struct user *read_uarea PARAMS ((bfd *, int));
+const bfd_target *sco5_core_file_p PARAMS ((bfd *abfd));
+char *sco5_core_file_failing_command PARAMS ((bfd *abfd));
+int sco5_core_file_failing_signal PARAMS ((bfd *abfd));
+#define sco5_core_file_matches_executable_p generic_core_file_matches_executable_p
+#define sco5_core_file_pid _bfd_nocore_core_file_pid
+static void swap_abort PARAMS ((void));
+
+static asection *
+make_bfd_asection (abfd, name, flags, size, vma, filepos)
+     bfd *abfd;
+     const char *name;
+     flagword flags;
+     bfd_size_type size;
+     bfd_vma vma;
+     file_ptr filepos;
+{
+  asection *asect;
+
+  asect = bfd_make_section_anyway_with_flags (abfd, name, flags);
+  if (!asect)
+    return NULL;
+  asect->size = size;
+  asect->vma = vma;
+  asect->filepos = filepos;
+  asect->alignment_power = 2;
+
+  return asect;
+}
+
+static struct user *
+read_uarea(abfd, filepos)
+     bfd *abfd;
+     int filepos;
+
+{
+  struct sco5_core_struct *rawptr;
+  bfd_size_type amt = sizeof (struct sco5_core_struct);
+
+  rawptr = (struct sco5_core_struct *) bfd_zmalloc (amt);
+  if (rawptr == NULL)
+    return NULL;
+
+  abfd->tdata.sco5_core_data = rawptr;
+
+  if (bfd_seek (abfd, (file_ptr) filepos, SEEK_SET) != 0
+      || bfd_bread ((void *) &rawptr->u, (bfd_size_type) sizeof rawptr->u,
+		   abfd) != sizeof rawptr->u)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  /* Sanity check perhaps??? */
+  if (rawptr->u.u_dsize > 0x1000000)    /* Remember, it's in pages...  */
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+  if (rawptr->u.u_ssize > 0x1000000)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+  return &rawptr->u;
+}
+
+const bfd_target *
+sco5_core_file_p (abfd)
+     bfd *abfd;
+{
+  int coffset_siz, val, nsecs, cheadoffs;
+  int coresize;
+  struct user *u;
+  struct coreoffsets coffsets;
+  struct coresecthead chead;
+  char *secname;
+  flagword flags;
+
+  /* Read coreoffsets region at end of core (see core(FP)).  */
+
+  {
+    struct stat statbuf;
+
+    if (bfd_stat (abfd, &statbuf) < 0)
+      return NULL;
+
+    coresize = statbuf.st_size;
+  }
+  /* Last long in core is sizeof struct coreoffsets, read it */
+  if ((bfd_seek (abfd, (file_ptr) (coresize - sizeof coffset_siz),
+		 SEEK_SET) != 0)
+      || bfd_bread ((void *) &coffset_siz, (bfd_size_type) sizeof coffset_siz,
+		   abfd) != sizeof coffset_siz)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  /* Use it to seek start of coreoffsets region, read it and determine
+     validity */
+  if ((bfd_seek (abfd, (file_ptr) (coresize - coffset_siz), SEEK_SET) != 0)
+      || (bfd_bread ((void *) &coffsets, (bfd_size_type) sizeof coffsets, abfd)
+	  != sizeof coffsets)
+      || ((coffsets.u_info != 1) && (coffsets.u_info != C_VERSION)))
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  if (coffsets.u_info == 1)
+    {
+      /* Old version, no section heads, read info from user struct */
+
+      u = read_uarea (abfd, coffsets.u_user);
+      if (! u)
+	goto fail;
+
+      if (!make_bfd_asection (abfd, ".reg", SEC_HAS_CONTENTS,
+			      (bfd_size_type) coffsets.u_usize,
+			      0 - (bfd_vma) u->u_ar0,
+			      (file_ptr) coffsets.u_user))
+	goto fail;
+
+      if (!make_bfd_asection (abfd, ".data",
+			      SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS,
+			      ((bfd_size_type) u->u_exdata.ux_dsize
+			       + u->u_exdata.ux_bsize),
+			      (bfd_vma) u->u_exdata.ux_datorg,
+			      (file_ptr) coffsets.u_data))
+	goto fail;
+
+      if (!make_bfd_asection (abfd, ".stack",
+			      SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS,
+			      (bfd_size_type) u->u_ssize * NBPC,
+			      (bfd_vma) u->u_sub,
+			      (file_ptr) coffsets.u_stack))
+	goto fail;
+
+      return abfd->xvec;		/* Done for version 1 */
+    }
+
+  /* Immediately before coreoffsets region is a long with offset in core
+     to first coresecthead (CORES_OFFSETS), the long before this is the
+     number of section heads in the list. Read both longs and read the
+     coresecthead and check its validity */
+
+  if ((bfd_seek (abfd,
+		 (file_ptr) (coresize - coffset_siz - 2 * sizeof coffset_siz),
+		 SEEK_SET) != 0)
+      || (bfd_bread ((void *) &nsecs, (bfd_size_type) sizeof nsecs, abfd)
+	  != sizeof nsecs)
+      || (bfd_bread ((void *) &cheadoffs, (bfd_size_type) sizeof cheadoffs,
+		    abfd) != sizeof cheadoffs)
+      || (bfd_seek (abfd, (file_ptr) cheadoffs, SEEK_SET) != 0)
+      || (bfd_bread ((void *) &chead, (bfd_size_type) sizeof chead, abfd)
+	  != sizeof chead)
+      || (chead.cs_stype != CORES_OFFSETS)
+      || (chead.cs_x.csx_magic != COREMAGIC_NUMBER))
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      goto fail;
+    }
+
+  /* OK, we believe you.  You're a core file (sure, sure).  */
+
+  /* Now loop over all regions and map them */
+  nsecs--;				/* We've seen CORES_OFFSETS already */
+  for (; nsecs; nsecs--)
+    {
+      if ((bfd_seek (abfd, (file_ptr) chead.cs_hseek, SEEK_SET) != 0)
+	  || (bfd_bread ((void *) &chead, (bfd_size_type) sizeof chead, abfd)
+	      != sizeof chead))
+	{
+	  bfd_set_error (bfd_error_wrong_format);
+	  goto fail;
+	}
+
+      switch (chead.cs_stype)
+	{
+	case CORES_MAGIC:			/* Core header, check magic */
+	  if (chead.cs_x.csx_magic != COREMAGIC_NUMBER)
+	    {
+	      bfd_set_error (bfd_error_wrong_format);
+	      goto fail;
+	    }
+	  secname = NULL;
+	  nsecs++;				/* MAGIC not in section cnt!*/
+	  break;
+	case CORES_UAREA:			/* U-area, read in tdata */
+	  u = read_uarea (abfd, chead.cs_sseek);
+	  if (! u)
+	    goto fail;
+
+	  /* This is tricky.  As the "register section", we give them
+	     the entire upage and stack.  u.u_ar0 points to where
+	     "register 0" is stored.  There are two tricks with this,
+	     though.  One is that the rest of the registers might be
+	     at positive or negative (or both) displacements from
+	     *u_ar0.  The other is that u_ar0 is sometimes an absolute
+	     address in kernel memory, and on other systems it is an
+	     offset from the beginning of the `struct user'.
+
+	     As a practical matter, we don't know where the registers
+	     actually are, so we have to pass the whole area to GDB.
+	     We encode the value of u_ar0 by setting the .regs section
+	     up so that its virtual memory address 0 is at the place
+	     pointed to by u_ar0 (by setting the vma of the start of
+	     the section to -u_ar0).  GDB uses this info to locate the
+	     regs, using minor trickery to get around the
+	     offset-or-absolute-addr problem.  */
+
+	  chead.cs_vaddr = 0 - (bfd_vma) u->u_ar0;
+
+	  secname = ".reg";
+	  flags = SEC_HAS_CONTENTS;
+
+	  break;
+	case CORES_PREGION:			/* A program region, map it */
+	  switch (chead.cs_x.csx_preg.csxp_rtyp)
+	    {
+	    case PT_DATA:
+	      secname = ".data";	/* Data region.		 */
+	      break;
+	    case PT_STACK:
+	      secname = ".stack";	/* Stack region.	 */
+	      break;
+	    case PT_SHMEM:
+	      secname = ".shmem";	/* Shared memory	 */
+	      break;
+	    case PT_LIBDAT:
+	      secname = ".libdat";	/* Shared library data	 */
+	      break;
+	    case PT_V86:
+	      secname = ".virt86";	/* Virtual 8086 mode	 */
+	      break;
+	    case PT_SHFIL:
+	      secname = ".mmfile";	/* Memory mapped file	 */
+	      break;
+	    case PT_XDATA0:
+	      secname = ".Xdat0";	/* XENIX data region, virtual 0 */
+	      break;
+	    default:
+	      secname = "";
+	    }
+	  flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
+	  break;
+	case CORES_PROC:			/* struct proc */
+	case CORES_ITIMER:			/* interval timers */
+	case CORES_SCOUTSNAME:			/* struct scoutsname */
+	  secname = NULL;	/* Ignore these */
+	  break;
+	default:
+	  (*_bfd_error_handler) ("Unhandled SCO core file section type %d\n",
+				 chead.cs_stype);
+	  continue;
+	}
+
+      if (secname
+	  && !make_bfd_asection (abfd, secname, flags,
+				 (bfd_size_type) chead.cs_vsize,
+				 (bfd_vma) chead.cs_vaddr,
+				 (file_ptr) chead.cs_sseek))
+	goto fail;
+
+    }
+
+  return abfd->xvec;
+
+ fail:
+  if (abfd->tdata.any)
+    {
+      bfd_release (abfd, abfd->tdata.any);
+      abfd->tdata.any = NULL;
+    }
+  bfd_section_list_clear (abfd);
+  return NULL;
+}
+
+char *
+sco5_core_file_failing_command (abfd)
+     bfd *abfd;
+{
+  char *com = abfd->tdata.sco5_core_data->u.u_comm;
+  if (*com)
+    return com;
+  else
+    return NULL;
+}
+
+int
+sco5_core_file_failing_signal (ignore_abfd)
+     bfd *ignore_abfd;
+{
+  return ((ignore_abfd->tdata.sco5_core_data->u.u_sysabort != 0)
+	  ? ignore_abfd->tdata.sco5_core_data->u.u_sysabort
+	  : -1);
+}
+
+/* If somebody calls any byte-swapping routines, shoot them.  */
+static void
+swap_abort ()
+{
+  abort (); /* This way doesn't require any declaration for ANSI to fuck up */
+}
+
+#define	NO_GET ((bfd_vma (*) (const void *)) swap_abort)
+#define	NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
+#define	NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
+#define	NO_GET64 ((bfd_uint64_t (*) (const void *)) swap_abort)
+#define	NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
+#define	NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
+
+const bfd_target sco5_core_vec =
+  {
+    "sco5-core",
+    bfd_target_unknown_flavour,
+    BFD_ENDIAN_LITTLE,	       /* target byte order */
+    BFD_ENDIAN_LITTLE,	       /* target headers byte order */
+    (HAS_RELOC | EXEC_P |	/* object flags */
+     HAS_LINENO | HAS_DEBUG |
+     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+    0,				/* symbol prefix */
+    ' ',			/* ar_pad_char */
+    16,				/* ar_max_namelen */
+    0,				/* match priority.  */
+    NO_GET64, NO_GETS64, NO_PUT64,	/* 64 bit data */
+    NO_GET, NO_GETS, NO_PUT,		/* 32 bit data */
+    NO_GET, NO_GETS, NO_PUT,		/* 16 bit data */
+    NO_GET64, NO_GETS64, NO_PUT64,	/* 64 bit hdrs */
+    NO_GET, NO_GETS, NO_PUT,		/* 32 bit hdrs */
+    NO_GET, NO_GETS, NO_PUT,		/* 16 bit hdrs */
+
+    {				/* bfd_check_format */
+      _bfd_dummy_target,		/* unknown format */
+      _bfd_dummy_target,		/* object file */
+      _bfd_dummy_target,		/* archive */
+      sco5_core_file_p			/* a core file */
+    },
+    {				/* bfd_set_format */
+      bfd_false, bfd_false,
+      bfd_false, bfd_false
+    },
+    {				/* bfd_write_contents */
+      bfd_false, bfd_false,
+      bfd_false, bfd_false
+    },
+
+    BFD_JUMP_TABLE_GENERIC (_bfd_generic),
+    BFD_JUMP_TABLE_COPY (_bfd_generic),
+    BFD_JUMP_TABLE_CORE (sco5),
+    BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+    BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
+    BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+    BFD_JUMP_TABLE_WRITE (_bfd_generic),
+    BFD_JUMP_TABLE_LINK (_bfd_nolink),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    NULL,
+
+    (PTR) 0			/* backend_data */
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/section.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/section.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/section.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/section.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1588 @@
+/* Object file "section" support for the BFD library.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/*
+SECTION
+	Sections
+
+	The raw data contained within a BFD is maintained through the
+	section abstraction.  A single BFD may have any number of
+	sections.  It keeps hold of them by pointing to the first;
+	each one points to the next in the list.
+
+	Sections are supported in BFD in <<section.c>>.
+
+@menu
+@* Section Input::
+@* Section Output::
+@* typedef asection::
+@* section prototypes::
+@end menu
+
+INODE
+Section Input, Section Output, Sections, Sections
+SUBSECTION
+	Section input
+
+	When a BFD is opened for reading, the section structures are
+	created and attached to the BFD.
+
+	Each section has a name which describes the section in the
+	outside world---for example, <<a.out>> would contain at least
+	three sections, called <<.text>>, <<.data>> and <<.bss>>.
+
+	Names need not be unique; for example a COFF file may have several
+	sections named <<.data>>.
+
+	Sometimes a BFD will contain more than the ``natural'' number of
+	sections. A back end may attach other sections containing
+	constructor data, or an application may add a section (using
+	<<bfd_make_section>>) to the sections attached to an already open
+	BFD. For example, the linker creates an extra section
+	<<COMMON>> for each input file's BFD to hold information about
+	common storage.
+
+	The raw data is not necessarily read in when
+	the section descriptor is created. Some targets may leave the
+	data in place until a <<bfd_get_section_contents>> call is
+	made. Other back ends may read in all the data at once.  For
+	example, an S-record file has to be read once to determine the
+	size of the data. An IEEE-695 file doesn't contain raw data in
+	sections, but data and relocation expressions intermixed, so
+	the data area has to be parsed to get out the data and
+	relocations.
+
+INODE
+Section Output, typedef asection, Section Input, Sections
+
+SUBSECTION
+	Section output
+
+	To write a new object style BFD, the various sections to be
+	written have to be created. They are attached to the BFD in
+	the same way as input sections; data is written to the
+	sections using <<bfd_set_section_contents>>.
+
+	Any program that creates or combines sections (e.g., the assembler
+	and linker) must use the <<asection>> fields <<output_section>> and
+	<<output_offset>> to indicate the file sections to which each
+	section must be written.  (If the section is being created from
+	scratch, <<output_section>> should probably point to the section
+	itself and <<output_offset>> should probably be zero.)
+
+	The data to be written comes from input sections attached
+	(via <<output_section>> pointers) to
+	the output sections.  The output section structure can be
+	considered a filter for the input section: the output section
+	determines the vma of the output data and the name, but the
+	input section determines the offset into the output section of
+	the data to be written.
+
+	E.g., to create a section "O", starting at 0x100, 0x123 long,
+	containing two subsections, "A" at offset 0x0 (i.e., at vma
+	0x100) and "B" at offset 0x20 (i.e., at vma 0x120) the <<asection>>
+	structures would look like:
+
+|   section name          "A"
+|     output_offset   0x00
+|     size            0x20
+|     output_section ----------->  section name    "O"
+|                             |    vma             0x100
+|   section name          "B" |    size            0x123
+|     output_offset   0x20    |
+|     size            0x103   |
+|     output_section  --------|
+
+SUBSECTION
+	Link orders
+
+	The data within a section is stored in a @dfn{link_order}.
+	These are much like the fixups in <<gas>>.  The link_order
+	abstraction allows a section to grow and shrink within itself.
+
+	A link_order knows how big it is, and which is the next
+	link_order and where the raw data for it is; it also points to
+	a list of relocations which apply to it.
+
+	The link_order is used by the linker to perform relaxing on
+	final code.  The compiler creates code which is as big as
+	necessary to make it work without relaxing, and the user can
+	select whether to relax.  Sometimes relaxing takes a lot of
+	time.  The linker runs around the relocations to see if any
+	are attached to data which can be shrunk, if so it does it on
+	a link_order by link_order basis.
+
+*/
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "bfdlink.h"
+
+/*
+DOCDD
+INODE
+typedef asection, section prototypes, Section Output, Sections
+SUBSECTION
+	typedef asection
+
+	Here is the section structure:
+
+CODE_FRAGMENT
+.
+.typedef struct bfd_section
+.{
+.  {* The name of the section; the name isn't a copy, the pointer is
+.     the same as that passed to bfd_make_section.  *}
+.  const char *name;
+.
+.  {* A unique sequence number.  *}
+.  int id;
+.
+.  {* Which section in the bfd; 0..n-1 as sections are created in a bfd.  *}
+.  int index;
+.
+.  {* The next section in the list belonging to the BFD, or NULL.  *}
+.  struct bfd_section *next;
+.
+.  {* The previous section in the list belonging to the BFD, or NULL.  *}
+.  struct bfd_section *prev;
+.
+.  {* The field flags contains attributes of the section. Some
+.     flags are read in from the object file, and some are
+.     synthesized from other information.  *}
+.  flagword flags;
+.
+.#define SEC_NO_FLAGS   0x000
+.
+.  {* Tells the OS to allocate space for this section when loading.
+.     This is clear for a section containing debug information only.  *}
+.#define SEC_ALLOC      0x001
+.
+.  {* Tells the OS to load the section from the file when loading.
+.     This is clear for a .bss section.  *}
+.#define SEC_LOAD       0x002
+.
+.  {* The section contains data still to be relocated, so there is
+.     some relocation information too.  *}
+.#define SEC_RELOC      0x004
+.
+.  {* A signal to the OS that the section contains read only data.  *}
+.#define SEC_READONLY   0x008
+.
+.  {* The section contains code only.  *}
+.#define SEC_CODE       0x010
+.
+.  {* The section contains data only.  *}
+.#define SEC_DATA       0x020
+.
+.  {* The section will reside in ROM.  *}
+.#define SEC_ROM        0x040
+.
+.  {* The section contains constructor information. This section
+.     type is used by the linker to create lists of constructors and
+.     destructors used by <<g++>>. When a back end sees a symbol
+.     which should be used in a constructor list, it creates a new
+.     section for the type of name (e.g., <<__CTOR_LIST__>>), attaches
+.     the symbol to it, and builds a relocation. To build the lists
+.     of constructors, all the linker has to do is catenate all the
+.     sections called <<__CTOR_LIST__>> and relocate the data
+.     contained within - exactly the operations it would peform on
+.     standard data.  *}
+.#define SEC_CONSTRUCTOR 0x080
+.
+.  {* The section has contents - a data section could be
+.     <<SEC_ALLOC>> | <<SEC_HAS_CONTENTS>>; a debug section could be
+.     <<SEC_HAS_CONTENTS>>  *}
+.#define SEC_HAS_CONTENTS 0x100
+.
+.  {* An instruction to the linker to not output the section
+.     even if it has information which would normally be written.  *}
+.#define SEC_NEVER_LOAD 0x200
+.
+.  {* The section contains thread local data.  *}
+.#define SEC_THREAD_LOCAL 0x400
+.
+.  {* The section has GOT references.  This flag is only for the
+.     linker, and is currently only used by the elf32-hppa back end.
+.     It will be set if global offset table references were detected
+.     in this section, which indicate to the linker that the section
+.     contains PIC code, and must be handled specially when doing a
+.     static link.  *}
+.#define SEC_HAS_GOT_REF 0x800
+.
+.  {* The section contains common symbols (symbols may be defined
+.     multiple times, the value of a symbol is the amount of
+.     space it requires, and the largest symbol value is the one
+.     used).  Most targets have exactly one of these (which we
+.     translate to bfd_com_section_ptr), but ECOFF has two.  *}
+.#define SEC_IS_COMMON 0x1000
+.
+.  {* The section contains only debugging information.  For
+.     example, this is set for ELF .debug and .stab sections.
+.     strip tests this flag to see if a section can be
+.     discarded.  *}
+.#define SEC_DEBUGGING 0x2000
+.
+.  {* The contents of this section are held in memory pointed to
+.     by the contents field.  This is checked by bfd_get_section_contents,
+.     and the data is retrieved from memory if appropriate.  *}
+.#define SEC_IN_MEMORY 0x4000
+.
+.  {* The contents of this section are to be excluded by the
+.     linker for executable and shared objects unless those
+.     objects are to be further relocated.  *}
+.#define SEC_EXCLUDE 0x8000
+.
+.  {* The contents of this section are to be sorted based on the sum of
+.     the symbol and addend values specified by the associated relocation
+.     entries.  Entries without associated relocation entries will be
+.     appended to the end of the section in an unspecified order.  *}
+.#define SEC_SORT_ENTRIES 0x10000
+.
+.  {* When linking, duplicate sections of the same name should be
+.     discarded, rather than being combined into a single section as
+.     is usually done.  This is similar to how common symbols are
+.     handled.  See SEC_LINK_DUPLICATES below.  *}
+.#define SEC_LINK_ONCE 0x20000
+.
+.  {* If SEC_LINK_ONCE is set, this bitfield describes how the linker
+.     should handle duplicate sections.  *}
+.#define SEC_LINK_DUPLICATES 0xc0000
+.
+.  {* This value for SEC_LINK_DUPLICATES means that duplicate
+.     sections with the same name should simply be discarded.  *}
+.#define SEC_LINK_DUPLICATES_DISCARD 0x0
+.
+.  {* This value for SEC_LINK_DUPLICATES means that the linker
+.     should warn if there are any duplicate sections, although
+.     it should still only link one copy.  *}
+.#define SEC_LINK_DUPLICATES_ONE_ONLY 0x40000
+.
+.  {* This value for SEC_LINK_DUPLICATES means that the linker
+.     should warn if any duplicate sections are a different size.  *}
+.#define SEC_LINK_DUPLICATES_SAME_SIZE 0x80000
+.
+.  {* This value for SEC_LINK_DUPLICATES means that the linker
+.     should warn if any duplicate sections contain different
+.     contents.  *}
+.#define SEC_LINK_DUPLICATES_SAME_CONTENTS \
+.  (SEC_LINK_DUPLICATES_ONE_ONLY | SEC_LINK_DUPLICATES_SAME_SIZE)
+.
+.  {* This section was created by the linker as part of dynamic
+.     relocation or other arcane processing.  It is skipped when
+.     going through the first-pass output, trusting that someone
+.     else up the line will take care of it later.  *}
+.#define SEC_LINKER_CREATED 0x100000
+.
+.  {* This section should not be subject to garbage collection.
+.     Also set to inform the linker that this section should not be
+.     listed in the link map as discarded.  *}
+.#define SEC_KEEP 0x200000
+.
+.  {* This section contains "short" data, and should be placed
+.     "near" the GP.  *}
+.#define SEC_SMALL_DATA 0x400000
+.
+.  {* Attempt to merge identical entities in the section.
+.     Entity size is given in the entsize field.  *}
+.#define SEC_MERGE 0x800000
+.
+.  {* If given with SEC_MERGE, entities to merge are zero terminated
+.     strings where entsize specifies character size instead of fixed
+.     size entries.  *}
+.#define SEC_STRINGS 0x1000000
+.
+.  {* This section contains data about section groups.  *}
+.#define SEC_GROUP 0x2000000
+.
+.  {* The section is a COFF shared library section.  This flag is
+.     only for the linker.  If this type of section appears in
+.     the input file, the linker must copy it to the output file
+.     without changing the vma or size.  FIXME: Although this
+.     was originally intended to be general, it really is COFF
+.     specific (and the flag was renamed to indicate this).  It
+.     might be cleaner to have some more general mechanism to
+.     allow the back end to control what the linker does with
+.     sections.  *}
+.#define SEC_COFF_SHARED_LIBRARY 0x4000000
+.
+.  {* This input section should be copied to output in reverse order
+.     as an array of pointers.  This is for ELF linker internal use
+.     only.  *}
+.#define SEC_ELF_REVERSE_COPY 0x4000000
+.
+.  {* This section contains data which may be shared with other
+.     executables or shared objects. This is for COFF only.  *}
+.#define SEC_COFF_SHARED 0x8000000
+.
+.  {* When a section with this flag is being linked, then if the size of
+.     the input section is less than a page, it should not cross a page
+.     boundary.  If the size of the input section is one page or more,
+.     it should be aligned on a page boundary.  This is for TI
+.     TMS320C54X only.  *}
+.#define SEC_TIC54X_BLOCK 0x10000000
+.
+.  {* Conditionally link this section; do not link if there are no
+.     references found to any symbol in the section.  This is for TI
+.     TMS320C54X only.  *}
+.#define SEC_TIC54X_CLINK 0x20000000
+.
+.  {* Indicate that section has the no read flag set. This happens
+.     when memory read flag isn't set. *}
+.#define SEC_COFF_NOREAD 0x40000000
+.
+.  {*  End of section flags.  *}
+.
+.  {* Some internal packed boolean fields.  *}
+.
+.  {* See the vma field.  *}
+.  unsigned int user_set_vma : 1;
+.
+.  {* A mark flag used by some of the linker backends.  *}
+.  unsigned int linker_mark : 1;
+.
+.  {* Another mark flag used by some of the linker backends.  Set for
+.     output sections that have an input section.  *}
+.  unsigned int linker_has_input : 1;
+.
+.  {* Mark flag used by some linker backends for garbage collection.  *}
+.  unsigned int gc_mark : 1;
+.
+.  {* Section compression status.  *}
+.  unsigned int compress_status : 2;
+.#define COMPRESS_SECTION_NONE    0
+.#define COMPRESS_SECTION_DONE    1
+.#define DECOMPRESS_SECTION_SIZED 2
+.
+.  {* The following flags are used by the ELF linker. *}
+.
+.  {* Mark sections which have been allocated to segments.  *}
+.  unsigned int segment_mark : 1;
+.
+.  {* Type of sec_info information.  *}
+.  unsigned int sec_info_type:3;
+.#define ELF_INFO_TYPE_NONE      0
+.#define ELF_INFO_TYPE_STABS     1
+.#define ELF_INFO_TYPE_MERGE     2
+.#define ELF_INFO_TYPE_EH_FRAME  3
+.#define ELF_INFO_TYPE_JUST_SYMS 4
+.
+.  {* Nonzero if this section uses RELA relocations, rather than REL.  *}
+.  unsigned int use_rela_p:1;
+.
+.  {* Bits used by various backends.  The generic code doesn't touch
+.     these fields.  *}
+.
+.  unsigned int sec_flg0:1;
+.  unsigned int sec_flg1:1;
+.  unsigned int sec_flg2:1;
+.  unsigned int sec_flg3:1;
+.  unsigned int sec_flg4:1;
+.  unsigned int sec_flg5:1;
+.
+.  {* End of internal packed boolean fields.  *}
+.
+.  {*  The virtual memory address of the section - where it will be
+.      at run time.  The symbols are relocated against this.  The
+.      user_set_vma flag is maintained by bfd; if it's not set, the
+.      backend can assign addresses (for example, in <<a.out>>, where
+.      the default address for <<.data>> is dependent on the specific
+.      target and various flags).  *}
+.  bfd_vma vma;
+.
+.  {*  The load address of the section - where it would be in a
+.      rom image; really only used for writing section header
+.      information.  *}
+.  bfd_vma lma;
+.
+.  {* The size of the section in octets, as it will be output.
+.     Contains a value even if the section has no contents (e.g., the
+.     size of <<.bss>>).  *}
+.  bfd_size_type size;
+.
+.  {* For input sections, the original size on disk of the section, in
+.     octets.  This field should be set for any section whose size is
+.     changed by linker relaxation.  It is required for sections where
+.     the linker relaxation scheme doesn't cache altered section and
+.     reloc contents (stabs, eh_frame, SEC_MERGE, some coff relaxing
+.     targets), and thus the original size needs to be kept to read the
+.     section multiple times.  For output sections, rawsize holds the
+.     section size calculated on a previous linker relaxation pass.  *}
+.  bfd_size_type rawsize;
+.
+.  {* The compressed size of the section in octets.  *}
+.  bfd_size_type compressed_size;
+.
+.  {* Relaxation table. *}
+.  struct relax_table *relax;
+.
+.  {* Count of used relaxation table entries. *}
+.  int relax_count;
+.
+.
+.  {* If this section is going to be output, then this value is the
+.     offset in *bytes* into the output section of the first byte in the
+.     input section (byte ==> smallest addressable unit on the
+.     target).  In most cases, if this was going to start at the
+.     100th octet (8-bit quantity) in the output section, this value
+.     would be 100.  However, if the target byte size is 16 bits
+.     (bfd_octets_per_byte is "2"), this value would be 50.  *}
+.  bfd_vma output_offset;
+.
+.  {* The output section through which to map on output.  *}
+.  struct bfd_section *output_section;
+.
+.  {* The alignment requirement of the section, as an exponent of 2 -
+.     e.g., 3 aligns to 2^3 (or 8).  *}
+.  unsigned int alignment_power;
+.
+.  {* If an input section, a pointer to a vector of relocation
+.     records for the data in this section.  *}
+.  struct reloc_cache_entry *relocation;
+.
+.  {* If an output section, a pointer to a vector of pointers to
+.     relocation records for the data in this section.  *}
+.  struct reloc_cache_entry **orelocation;
+.
+.  {* The number of relocation records in one of the above.  *}
+.  unsigned reloc_count;
+.
+.  {* Information below is back end specific - and not always used
+.     or updated.  *}
+.
+.  {* File position of section data.  *}
+.  file_ptr filepos;
+.
+.  {* File position of relocation info.  *}
+.  file_ptr rel_filepos;
+.
+.  {* File position of line data.  *}
+.  file_ptr line_filepos;
+.
+.  {* Pointer to data for applications.  *}
+.  void *userdata;
+.
+.  {* If the SEC_IN_MEMORY flag is set, this points to the actual
+.     contents.  *}
+.  unsigned char *contents;
+.
+.  {* Attached line number information.  *}
+.  alent *lineno;
+.
+.  {* Number of line number records.  *}
+.  unsigned int lineno_count;
+.
+.  {* Entity size for merging purposes.  *}
+.  unsigned int entsize;
+.
+.  {* Points to the kept section if this section is a link-once section,
+.     and is discarded.  *}
+.  struct bfd_section *kept_section;
+.
+.  {* When a section is being output, this value changes as more
+.     linenumbers are written out.  *}
+.  file_ptr moving_line_filepos;
+.
+.  {* What the section number is in the target world.  *}
+.  int target_index;
+.
+.  void *used_by_bfd;
+.
+.  {* If this is a constructor section then here is a list of the
+.     relocations created to relocate items within it.  *}
+.  struct relent_chain *constructor_chain;
+.
+.  {* The BFD which owns the section.  *}
+.  bfd *owner;
+.
+.  {* INPUT_SECTION_FLAGS if specified in the linker script.  *}
+.  struct flag_info *section_flag_info;
+.
+.  {* A symbol which points at this section only.  *}
+.  struct bfd_symbol *symbol;
+.  struct bfd_symbol **symbol_ptr_ptr;
+.
+.  {* Early in the link process, map_head and map_tail are used to build
+.     a list of input sections attached to an output section.  Later,
+.     output sections use these fields for a list of bfd_link_order
+.     structs.  *}
+.  union {
+.    struct bfd_link_order *link_order;
+.    struct bfd_section *s;
+.  } map_head, map_tail;
+.} asection;
+.
+.{* Relax table contains information about instructions which can
+.   be removed by relaxation -- replacing a long address with a 
+.   short address.  *}
+.struct relax_table {
+.  {* Address where bytes may be deleted. *}
+.  bfd_vma addr;
+.  
+.  {* Number of bytes to be deleted.  *}
+.  int size;
+.};
+.
+.{* These sections are global, and are managed by BFD.  The application
+.   and target back end are not permitted to change the values in
+.   these sections.  New code should use the section_ptr macros rather
+.   than referring directly to the const sections.  The const sections
+.   may eventually vanish.  *}
+.#define BFD_ABS_SECTION_NAME "*ABS*"
+.#define BFD_UND_SECTION_NAME "*UND*"
+.#define BFD_COM_SECTION_NAME "*COM*"
+.#define BFD_IND_SECTION_NAME "*IND*"
+.
+.{* The absolute section.  *}
+.extern asection bfd_abs_section;
+.#define bfd_abs_section_ptr ((asection *) &bfd_abs_section)
+.#define bfd_is_abs_section(sec) ((sec) == bfd_abs_section_ptr)
+.{* Pointer to the undefined section.  *}
+.extern asection bfd_und_section;
+.#define bfd_und_section_ptr ((asection *) &bfd_und_section)
+.#define bfd_is_und_section(sec) ((sec) == bfd_und_section_ptr)
+.{* Pointer to the common section.  *}
+.extern asection bfd_com_section;
+.#define bfd_com_section_ptr ((asection *) &bfd_com_section)
+.{* Pointer to the indirect section.  *}
+.extern asection bfd_ind_section;
+.#define bfd_ind_section_ptr ((asection *) &bfd_ind_section)
+.#define bfd_is_ind_section(sec) ((sec) == bfd_ind_section_ptr)
+.
+.#define bfd_is_const_section(SEC)		\
+. (   ((SEC) == bfd_abs_section_ptr)		\
+.  || ((SEC) == bfd_und_section_ptr)		\
+.  || ((SEC) == bfd_com_section_ptr)		\
+.  || ((SEC) == bfd_ind_section_ptr))
+.
+.{* Macros to handle insertion and deletion of a bfd's sections.  These
+.   only handle the list pointers, ie. do not adjust section_count,
+.   target_index etc.  *}
+.#define bfd_section_list_remove(ABFD, S) \
+.  do							\
+.    {							\
+.      asection *_s = S;				\
+.      asection *_next = _s->next;			\
+.      asection *_prev = _s->prev;			\
+.      if (_prev)					\
+.        _prev->next = _next;				\
+.      else						\
+.        (ABFD)->sections = _next;			\
+.      if (_next)					\
+.        _next->prev = _prev;				\
+.      else						\
+.        (ABFD)->section_last = _prev;			\
+.    }							\
+.  while (0)
+.#define bfd_section_list_append(ABFD, S) \
+.  do							\
+.    {							\
+.      asection *_s = S;				\
+.      bfd *_abfd = ABFD;				\
+.      _s->next = NULL;					\
+.      if (_abfd->section_last)				\
+.        {						\
+.          _s->prev = _abfd->section_last;		\
+.          _abfd->section_last->next = _s;		\
+.        }						\
+.      else						\
+.        {						\
+.          _s->prev = NULL;				\
+.          _abfd->sections = _s;			\
+.        }						\
+.      _abfd->section_last = _s;			\
+.    }							\
+.  while (0)
+.#define bfd_section_list_prepend(ABFD, S) \
+.  do							\
+.    {							\
+.      asection *_s = S;				\
+.      bfd *_abfd = ABFD;				\
+.      _s->prev = NULL;					\
+.      if (_abfd->sections)				\
+.        {						\
+.          _s->next = _abfd->sections;			\
+.          _abfd->sections->prev = _s;			\
+.        }						\
+.      else						\
+.        {						\
+.          _s->next = NULL;				\
+.          _abfd->section_last = _s;			\
+.        }						\
+.      _abfd->sections = _s;				\
+.    }							\
+.  while (0)
+.#define bfd_section_list_insert_after(ABFD, A, S) \
+.  do							\
+.    {							\
+.      asection *_a = A;				\
+.      asection *_s = S;				\
+.      asection *_next = _a->next;			\
+.      _s->next = _next;				\
+.      _s->prev = _a;					\
+.      _a->next = _s;					\
+.      if (_next)					\
+.        _next->prev = _s;				\
+.      else						\
+.        (ABFD)->section_last = _s;			\
+.    }							\
+.  while (0)
+.#define bfd_section_list_insert_before(ABFD, B, S) \
+.  do							\
+.    {							\
+.      asection *_b = B;				\
+.      asection *_s = S;				\
+.      asection *_prev = _b->prev;			\
+.      _s->prev = _prev;				\
+.      _s->next = _b;					\
+.      _b->prev = _s;					\
+.      if (_prev)					\
+.        _prev->next = _s;				\
+.      else						\
+.        (ABFD)->sections = _s;				\
+.    }							\
+.  while (0)
+.#define bfd_section_removed_from_list(ABFD, S) \
+.  ((S)->next == NULL ? (ABFD)->section_last != (S) : (S)->next->prev != (S))
+.
+.#define BFD_FAKE_SECTION(SEC, FLAGS, SYM, NAME, IDX)			\
+.  {* name, id,  index, next, prev, flags, user_set_vma,            *}	\
+.  { NAME,  IDX, 0,     NULL, NULL, FLAGS, 0,				\
+.									\
+.  {* linker_mark, linker_has_input, gc_mark, decompress_status,    *}	\
+.     0,           0,                1,       0,			\
+.									\
+.  {* segment_mark, sec_info_type, use_rela_p,                      *}	\
+.     0,            0,             0,					\
+.									\
+.  {* sec_flg0, sec_flg1, sec_flg2, sec_flg3, sec_flg4, sec_flg5,   *}	\
+.     0,        0,        0,        0,        0,        0,		\
+.									\
+.  {* vma, lma, size, rawsize, compressed_size, relax, relax_count, *}	\
+.     0,   0,   0,    0,       0,               0,     0,		\
+.									\
+.  {* output_offset, output_section,              alignment_power,  *}	\
+.     0,             (struct bfd_section *) &SEC, 0,			\
+.									\
+.  {* relocation, orelocation, reloc_count, filepos, rel_filepos,   *}	\
+.     NULL,       NULL,        0,           0,       0,			\
+.									\
+.  {* line_filepos, userdata, contents, lineno, lineno_count,       *}	\
+.     0,            NULL,     NULL,     NULL,   0,			\
+.									\
+.  {* entsize, kept_section, moving_line_filepos,		     *}	\
+.     0,       NULL,	      0,					\
+.									\
+.  {* target_index, used_by_bfd, constructor_chain, owner,          *}	\
+.     0,            NULL,        NULL,              NULL,		\
+.									\
+.  {* flag_info,						    *}  \
+.     NULL,								\
+.									\
+.  {* symbol,                    symbol_ptr_ptr,                    *}	\
+.     (struct bfd_symbol *) SYM, &SEC.symbol,				\
+.									\
+.  {* map_head, map_tail                                            *}	\
+.     { NULL }, { NULL }						\
+.    }
+.
+*/
+
+/* We use a macro to initialize the static asymbol structures because
+   traditional C does not permit us to initialize a union member while
+   gcc warns if we don't initialize it.  */
+ /* the_bfd, name, value, attr, section [, udata] */
+#ifdef __STDC__
+#define GLOBAL_SYM_INIT(NAME, SECTION) \
+  { 0, NAME, 0, BSF_SECTION_SYM, (asection *) SECTION, { 0 }}
+#else
+#define GLOBAL_SYM_INIT(NAME, SECTION) \
+  { 0, NAME, 0, BSF_SECTION_SYM, (asection *) SECTION }
+#endif
+
+/* These symbols are global, not specific to any BFD.  Therefore, anything
+   that tries to change them is broken, and should be repaired.  */
+
+static const asymbol global_syms[] =
+{
+  GLOBAL_SYM_INIT (BFD_COM_SECTION_NAME, &bfd_com_section),
+  GLOBAL_SYM_INIT (BFD_UND_SECTION_NAME, &bfd_und_section),
+  GLOBAL_SYM_INIT (BFD_ABS_SECTION_NAME, &bfd_abs_section),
+  GLOBAL_SYM_INIT (BFD_IND_SECTION_NAME, &bfd_ind_section)
+};
+
+#define STD_SECTION(SEC, FLAGS, NAME, IDX)				\
+  asection SEC = BFD_FAKE_SECTION(SEC, FLAGS, &global_syms[IDX],	\
+				  NAME, IDX)
+
+STD_SECTION (bfd_com_section, SEC_IS_COMMON, BFD_COM_SECTION_NAME, 0);
+STD_SECTION (bfd_und_section, 0, BFD_UND_SECTION_NAME, 1);
+STD_SECTION (bfd_abs_section, 0, BFD_ABS_SECTION_NAME, 2);
+STD_SECTION (bfd_ind_section, 0, BFD_IND_SECTION_NAME, 3);
+#undef STD_SECTION
+
+/* Initialize an entry in the section hash table.  */
+
+struct bfd_hash_entry *
+bfd_section_hash_newfunc (struct bfd_hash_entry *entry,
+			  struct bfd_hash_table *table,
+			  const char *string)
+{
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (entry == NULL)
+    {
+      entry = (struct bfd_hash_entry *)
+	bfd_hash_allocate (table, sizeof (struct section_hash_entry));
+      if (entry == NULL)
+	return entry;
+    }
+
+  /* Call the allocation method of the superclass.  */
+  entry = bfd_hash_newfunc (entry, table, string);
+  if (entry != NULL)
+    memset (&((struct section_hash_entry *) entry)->section, 0,
+	    sizeof (asection));
+
+  return entry;
+}
+
+#define section_hash_lookup(table, string, create, copy) \
+  ((struct section_hash_entry *) \
+   bfd_hash_lookup ((table), (string), (create), (copy)))
+
+/* Create a symbol whose only job is to point to this section.  This
+   is useful for things like relocs which are relative to the base
+   of a section.  */
+
+bfd_boolean
+_bfd_generic_new_section_hook (bfd *abfd, asection *newsect)
+{
+  newsect->symbol = bfd_make_empty_symbol (abfd);
+  if (newsect->symbol == NULL)
+    return FALSE;
+
+  newsect->symbol->name = newsect->name;
+  newsect->symbol->value = 0;
+  newsect->symbol->section = newsect;
+  newsect->symbol->flags = BSF_SECTION_SYM;
+
+  newsect->symbol_ptr_ptr = &newsect->symbol;
+  return TRUE;
+}
+
+/* Initializes a new section.  NEWSECT->NAME is already set.  */
+
+static asection *
+bfd_section_init (bfd *abfd, asection *newsect)
+{
+  static int section_id = 0x10;  /* id 0 to 3 used by STD_SECTION.  */
+
+  newsect->id = section_id;
+  newsect->index = abfd->section_count;
+  newsect->owner = abfd;
+
+  if (! BFD_SEND (abfd, _new_section_hook, (abfd, newsect)))
+    return NULL;
+
+  section_id++;
+  abfd->section_count++;
+  bfd_section_list_append (abfd, newsect);
+  return newsect;
+}
+
+/*
+DOCDD
+INODE
+section prototypes,  , typedef asection, Sections
+SUBSECTION
+	Section prototypes
+
+These are the functions exported by the section handling part of BFD.
+*/
+
+/*
+FUNCTION
+	bfd_section_list_clear
+
+SYNOPSIS
+	void bfd_section_list_clear (bfd *);
+
+DESCRIPTION
+	Clears the section list, and also resets the section count and
+	hash table entries.
+*/
+
+void
+bfd_section_list_clear (bfd *abfd)
+{
+  abfd->sections = NULL;
+  abfd->section_last = NULL;
+  abfd->section_count = 0;
+  memset (abfd->section_htab.table, 0,
+	  abfd->section_htab.size * sizeof (struct bfd_hash_entry *));
+}
+
+/*
+FUNCTION
+	bfd_get_section_by_name
+
+SYNOPSIS
+	asection *bfd_get_section_by_name (bfd *abfd, const char *name);
+
+DESCRIPTION
+	Run through @var{abfd} and return the one of the
+	<<asection>>s whose name matches @var{name}, otherwise <<NULL>>.
+	@xref{Sections}, for more information.
+
+	This should only be used in special cases; the normal way to process
+	all sections of a given name is to use <<bfd_map_over_sections>> and
+	<<strcmp>> on the name (or better yet, base it on the section flags
+	or something else) for each section.
+*/
+
+asection *
+bfd_get_section_by_name (bfd *abfd, const char *name)
+{
+  struct section_hash_entry *sh;
+
+  sh = section_hash_lookup (&abfd->section_htab, name, FALSE, FALSE);
+  if (sh != NULL)
+    return &sh->section;
+
+  return NULL;
+}
+
+/*
+FUNCTION
+	bfd_get_section_by_name_if
+
+SYNOPSIS
+	asection *bfd_get_section_by_name_if
+	  (bfd *abfd,
+	   const char *name,
+	   bfd_boolean (*func) (bfd *abfd, asection *sect, void *obj),
+	   void *obj);
+
+DESCRIPTION
+	Call the provided function @var{func} for each section
+	attached to the BFD @var{abfd} whose name matches @var{name},
+	passing @var{obj} as an argument. The function will be called
+	as if by
+
+|	func (abfd, the_section, obj);
+
+	It returns the first section for which @var{func} returns true,
+	otherwise <<NULL>>.
+
+*/
+
+asection *
+bfd_get_section_by_name_if (bfd *abfd, const char *name,
+			    bfd_boolean (*operation) (bfd *,
+						      asection *,
+						      void *),
+			    void *user_storage)
+{
+  struct section_hash_entry *sh;
+  unsigned long hash;
+
+  sh = section_hash_lookup (&abfd->section_htab, name, FALSE, FALSE);
+  if (sh == NULL)
+    return NULL;
+
+  hash = sh->root.hash;
+  do
+    {
+      if ((*operation) (abfd, &sh->section, user_storage))
+	return &sh->section;
+      sh = (struct section_hash_entry *) sh->root.next;
+    }
+  while (sh != NULL && sh->root.hash == hash
+	 && strcmp (sh->root.string, name) == 0);
+
+  return NULL;
+}
+
+/*
+FUNCTION
+	bfd_get_unique_section_name
+
+SYNOPSIS
+	char *bfd_get_unique_section_name
+	  (bfd *abfd, const char *templat, int *count);
+
+DESCRIPTION
+	Invent a section name that is unique in @var{abfd} by tacking
+	a dot and a digit suffix onto the original @var{templat}.  If
+	@var{count} is non-NULL, then it specifies the first number
+	tried as a suffix to generate a unique name.  The value
+	pointed to by @var{count} will be incremented in this case.
+*/
+
+char *
+bfd_get_unique_section_name (bfd *abfd, const char *templat, int *count)
+{
+  int num;
+  unsigned int len;
+  char *sname;
+
+  len = strlen (templat);
+  sname = (char *) bfd_malloc (len + 8);
+  if (sname == NULL)
+    return NULL;
+  memcpy (sname, templat, len);
+  num = 1;
+  if (count != NULL)
+    num = *count;
+
+  do
+    {
+      /* If we have a million sections, something is badly wrong.  */
+      if (num > 999999)
+	abort ();
+      sprintf (sname + len, ".%d", num++);
+    }
+  while (section_hash_lookup (&abfd->section_htab, sname, FALSE, FALSE));
+
+  if (count != NULL)
+    *count = num;
+  return sname;
+}
+
+/*
+FUNCTION
+	bfd_make_section_old_way
+
+SYNOPSIS
+	asection *bfd_make_section_old_way (bfd *abfd, const char *name);
+
+DESCRIPTION
+	Create a new empty section called @var{name}
+	and attach it to the end of the chain of sections for the
+	BFD @var{abfd}. An attempt to create a section with a name which
+	is already in use returns its pointer without changing the
+	section chain.
+
+	It has the funny name since this is the way it used to be
+	before it was rewritten....
+
+	Possible errors are:
+	o <<bfd_error_invalid_operation>> -
+	If output has already started for this BFD.
+	o <<bfd_error_no_memory>> -
+	If memory allocation fails.
+
+*/
+
+asection *
+bfd_make_section_old_way (bfd *abfd, const char *name)
+{
+  asection *newsect;
+
+  if (abfd->output_has_begun)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return NULL;
+    }
+
+  if (strcmp (name, BFD_ABS_SECTION_NAME) == 0)
+    newsect = bfd_abs_section_ptr;
+  else if (strcmp (name, BFD_COM_SECTION_NAME) == 0)
+    newsect = bfd_com_section_ptr;
+  else if (strcmp (name, BFD_UND_SECTION_NAME) == 0)
+    newsect = bfd_und_section_ptr;
+  else if (strcmp (name, BFD_IND_SECTION_NAME) == 0)
+    newsect = bfd_ind_section_ptr;
+  else
+    {
+      struct section_hash_entry *sh;
+
+      sh = section_hash_lookup (&abfd->section_htab, name, TRUE, FALSE);
+      if (sh == NULL)
+	return NULL;
+
+      newsect = &sh->section;
+      if (newsect->name != NULL)
+	{
+	  /* Section already exists.  */
+	  return newsect;
+	}
+
+      newsect->name = name;
+      return bfd_section_init (abfd, newsect);
+    }
+
+  /* Call new_section_hook when "creating" the standard abs, com, und
+     and ind sections to tack on format specific section data.
+     Also, create a proper section symbol.  */
+  if (! BFD_SEND (abfd, _new_section_hook, (abfd, newsect)))
+    return NULL;
+  return newsect;
+}
+
+/*
+FUNCTION
+	bfd_make_section_anyway_with_flags
+
+SYNOPSIS
+	asection *bfd_make_section_anyway_with_flags
+	  (bfd *abfd, const char *name, flagword flags);
+
+DESCRIPTION
+   Create a new empty section called @var{name} and attach it to the end of
+   the chain of sections for @var{abfd}.  Create a new section even if there
+   is already a section with that name.  Also set the attributes of the
+   new section to the value @var{flags}.
+
+   Return <<NULL>> and set <<bfd_error>> on error; possible errors are:
+   o <<bfd_error_invalid_operation>> - If output has already started for @var{abfd}.
+   o <<bfd_error_no_memory>> - If memory allocation fails.
+*/
+
+sec_ptr
+bfd_make_section_anyway_with_flags (bfd *abfd, const char *name,
+				    flagword flags)
+{
+  struct section_hash_entry *sh;
+  asection *newsect;
+
+  if (abfd->output_has_begun)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return NULL;
+    }
+
+  sh = section_hash_lookup (&abfd->section_htab, name, TRUE, FALSE);
+  if (sh == NULL)
+    return NULL;
+
+  newsect = &sh->section;
+  if (newsect->name != NULL)
+    {
+      /* We are making a section of the same name.  Put it in the
+	 section hash table.  Even though we can't find it directly by a
+	 hash lookup, we'll be able to find the section by traversing
+	 sh->root.next quicker than looking at all the bfd sections.  */
+      struct section_hash_entry *new_sh;
+      new_sh = (struct section_hash_entry *)
+	bfd_section_hash_newfunc (NULL, &abfd->section_htab, name);
+      if (new_sh == NULL)
+	return NULL;
+
+      new_sh->root = sh->root;
+      sh->root.next = &new_sh->root;
+      newsect = &new_sh->section;
+    }
+
+  newsect->flags = flags;
+  newsect->name = name;
+  return bfd_section_init (abfd, newsect);
+}
+
+/*
+FUNCTION
+	bfd_make_section_anyway
+
+SYNOPSIS
+	asection *bfd_make_section_anyway (bfd *abfd, const char *name);
+
+DESCRIPTION
+   Create a new empty section called @var{name} and attach it to the end of
+   the chain of sections for @var{abfd}.  Create a new section even if there
+   is already a section with that name.
+
+   Return <<NULL>> and set <<bfd_error>> on error; possible errors are:
+   o <<bfd_error_invalid_operation>> - If output has already started for @var{abfd}.
+   o <<bfd_error_no_memory>> - If memory allocation fails.
+*/
+
+sec_ptr
+bfd_make_section_anyway (bfd *abfd, const char *name)
+{
+  return bfd_make_section_anyway_with_flags (abfd, name, 0);
+}
+
+/*
+FUNCTION
+	bfd_make_section_with_flags
+
+SYNOPSIS
+	asection *bfd_make_section_with_flags
+	  (bfd *, const char *name, flagword flags);
+
+DESCRIPTION
+   Like <<bfd_make_section_anyway>>, but return <<NULL>> (without calling
+   bfd_set_error ()) without changing the section chain if there is already a
+   section named @var{name}.  Also set the attributes of the new section to
+   the value @var{flags}.  If there is an error, return <<NULL>> and set
+   <<bfd_error>>.
+*/
+
+asection *
+bfd_make_section_with_flags (bfd *abfd, const char *name,
+			     flagword flags)
+{
+  struct section_hash_entry *sh;
+  asection *newsect;
+
+  if (abfd->output_has_begun)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return NULL;
+    }
+
+  if (strcmp (name, BFD_ABS_SECTION_NAME) == 0
+      || strcmp (name, BFD_COM_SECTION_NAME) == 0
+      || strcmp (name, BFD_UND_SECTION_NAME) == 0
+      || strcmp (name, BFD_IND_SECTION_NAME) == 0)
+    return NULL;
+
+  sh = section_hash_lookup (&abfd->section_htab, name, TRUE, FALSE);
+  if (sh == NULL)
+    return NULL;
+
+  newsect = &sh->section;
+  if (newsect->name != NULL)
+    {
+      /* Section already exists.  */
+      return NULL;
+    }
+
+  newsect->name = name;
+  newsect->flags = flags;
+  return bfd_section_init (abfd, newsect);
+}
+
+/*
+FUNCTION
+	bfd_make_section
+
+SYNOPSIS
+	asection *bfd_make_section (bfd *, const char *name);
+
+DESCRIPTION
+   Like <<bfd_make_section_anyway>>, but return <<NULL>> (without calling
+   bfd_set_error ()) without changing the section chain if there is already a
+   section named @var{name}.  If there is an error, return <<NULL>> and set
+   <<bfd_error>>.
+*/
+
+asection *
+bfd_make_section (bfd *abfd, const char *name)
+{
+  return bfd_make_section_with_flags (abfd, name, 0);
+}
+
+/*
+FUNCTION
+	bfd_set_section_flags
+
+SYNOPSIS
+	bfd_boolean bfd_set_section_flags
+	  (bfd *abfd, asection *sec, flagword flags);
+
+DESCRIPTION
+	Set the attributes of the section @var{sec} in the BFD
+	@var{abfd} to the value @var{flags}. Return <<TRUE>> on success,
+	<<FALSE>> on error. Possible error returns are:
+
+	o <<bfd_error_invalid_operation>> -
+	The section cannot have one or more of the attributes
+	requested. For example, a .bss section in <<a.out>> may not
+	have the <<SEC_HAS_CONTENTS>> field set.
+
+*/
+
+bfd_boolean
+bfd_set_section_flags (bfd *abfd ATTRIBUTE_UNUSED,
+		       sec_ptr section,
+		       flagword flags)
+{
+  section->flags = flags;
+  return TRUE;
+}
+
+/*
+FUNCTION
+	bfd_rename_section
+
+SYNOPSIS
+	void bfd_rename_section
+	  (bfd *abfd, asection *sec, const char *newname);
+
+DESCRIPTION
+	Rename section @var{sec} in @var{abfd} to @var{newname}.
+*/
+
+void
+bfd_rename_section (bfd *abfd, sec_ptr sec, const char *newname)
+{
+  struct section_hash_entry *sh;
+
+  sh = (struct section_hash_entry *)
+    ((char *) sec - offsetof (struct section_hash_entry, section));
+  sh->section.name = newname;
+  bfd_hash_rename (&abfd->section_htab, newname, &sh->root);
+}
+
+/*
+FUNCTION
+	bfd_map_over_sections
+
+SYNOPSIS
+	void bfd_map_over_sections
+	  (bfd *abfd,
+	   void (*func) (bfd *abfd, asection *sect, void *obj),
+	   void *obj);
+
+DESCRIPTION
+	Call the provided function @var{func} for each section
+	attached to the BFD @var{abfd}, passing @var{obj} as an
+	argument. The function will be called as if by
+
+|	func (abfd, the_section, obj);
+
+	This is the preferred method for iterating over sections; an
+	alternative would be to use a loop:
+
+|	   section *p;
+|	   for (p = abfd->sections; p != NULL; p = p->next)
+|	      func (abfd, p, ...)
+
+*/
+
+void
+bfd_map_over_sections (bfd *abfd,
+		       void (*operation) (bfd *, asection *, void *),
+		       void *user_storage)
+{
+  asection *sect;
+  unsigned int i = 0;
+
+  for (sect = abfd->sections; sect != NULL; i++, sect = sect->next)
+    (*operation) (abfd, sect, user_storage);
+
+  if (i != abfd->section_count)	/* Debugging */
+    abort ();
+}
+
+/*
+FUNCTION
+	bfd_sections_find_if
+
+SYNOPSIS
+	asection *bfd_sections_find_if
+	  (bfd *abfd,
+	   bfd_boolean (*operation) (bfd *abfd, asection *sect, void *obj),
+	   void *obj);
+
+DESCRIPTION
+	Call the provided function @var{operation} for each section
+	attached to the BFD @var{abfd}, passing @var{obj} as an
+	argument. The function will be called as if by
+
+|	operation (abfd, the_section, obj);
+
+	It returns the first section for which @var{operation} returns true.
+
+*/
+
+asection *
+bfd_sections_find_if (bfd *abfd,
+		      bfd_boolean (*operation) (bfd *, asection *, void *),
+		      void *user_storage)
+{
+  asection *sect;
+
+  for (sect = abfd->sections; sect != NULL; sect = sect->next)
+    if ((*operation) (abfd, sect, user_storage))
+      break;
+
+  return sect;
+}
+
+/*
+FUNCTION
+	bfd_set_section_size
+
+SYNOPSIS
+	bfd_boolean bfd_set_section_size
+	  (bfd *abfd, asection *sec, bfd_size_type val);
+
+DESCRIPTION
+	Set @var{sec} to the size @var{val}. If the operation is
+	ok, then <<TRUE>> is returned, else <<FALSE>>.
+
+	Possible error returns:
+	o <<bfd_error_invalid_operation>> -
+	Writing has started to the BFD, so setting the size is invalid.
+
+*/
+
+bfd_boolean
+bfd_set_section_size (bfd *abfd, sec_ptr ptr, bfd_size_type val)
+{
+  /* Once you've started writing to any section you cannot create or change
+     the size of any others.  */
+
+  if (abfd->output_has_begun)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  ptr->size = val;
+  return TRUE;
+}
+
+/*
+FUNCTION
+	bfd_set_section_contents
+
+SYNOPSIS
+	bfd_boolean bfd_set_section_contents
+	  (bfd *abfd, asection *section, const void *data,
+	   file_ptr offset, bfd_size_type count);
+
+DESCRIPTION
+	Sets the contents of the section @var{section} in BFD
+	@var{abfd} to the data starting in memory at @var{data}. The
+	data is written to the output section starting at offset
+	@var{offset} for @var{count} octets.
+
+	Normally <<TRUE>> is returned, else <<FALSE>>. Possible error
+	returns are:
+	o <<bfd_error_no_contents>> -
+	The output section does not have the <<SEC_HAS_CONTENTS>>
+	attribute, so nothing can be written to it.
+	o and some more too
+
+	This routine is front end to the back end function
+	<<_bfd_set_section_contents>>.
+
+*/
+
+bfd_boolean
+bfd_set_section_contents (bfd *abfd,
+			  sec_ptr section,
+			  const void *location,
+			  file_ptr offset,
+			  bfd_size_type count)
+{
+  bfd_size_type sz;
+
+  if (!(bfd_get_section_flags (abfd, section) & SEC_HAS_CONTENTS))
+    {
+      bfd_set_error (bfd_error_no_contents);
+      return FALSE;
+    }
+
+  sz = section->size;
+  if ((bfd_size_type) offset > sz
+      || count > sz
+      || offset + count > sz
+      || count != (size_t) count)
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  if (!bfd_write_p (abfd))
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  /* Record a copy of the data in memory if desired.  */
+  if (section->contents
+      && location != section->contents + offset)
+    memcpy (section->contents + offset, location, (size_t) count);
+
+  if (BFD_SEND (abfd, _bfd_set_section_contents,
+		(abfd, section, location, offset, count)))
+    {
+      abfd->output_has_begun = TRUE;
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+/*
+FUNCTION
+	bfd_get_section_contents
+
+SYNOPSIS
+	bfd_boolean bfd_get_section_contents
+	  (bfd *abfd, asection *section, void *location, file_ptr offset,
+	   bfd_size_type count);
+
+DESCRIPTION
+	Read data from @var{section} in BFD @var{abfd}
+	into memory starting at @var{location}. The data is read at an
+	offset of @var{offset} from the start of the input section,
+	and is read for @var{count} bytes.
+
+	If the contents of a constructor with the <<SEC_CONSTRUCTOR>>
+	flag set are requested or if the section does not have the
+	<<SEC_HAS_CONTENTS>> flag set, then the @var{location} is filled
+	with zeroes. If no errors occur, <<TRUE>> is returned, else
+	<<FALSE>>.
+
+*/
+bfd_boolean
+bfd_get_section_contents (bfd *abfd,
+			  sec_ptr section,
+			  void *location,
+			  file_ptr offset,
+			  bfd_size_type count)
+{
+  bfd_size_type sz;
+
+  if (section->flags & SEC_CONSTRUCTOR)
+    {
+      memset (location, 0, (size_t) count);
+      return TRUE;
+    }
+
+  if (abfd->direction != write_direction && section->rawsize != 0)
+    sz = section->rawsize;
+  else
+    sz = section->size;
+  if ((bfd_size_type) offset > sz
+      || count > sz
+      || offset + count > sz
+      || count != (size_t) count)
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  if (count == 0)
+    /* Don't bother.  */
+    return TRUE;
+
+  if ((section->flags & SEC_HAS_CONTENTS) == 0)
+    {
+      memset (location, 0, (size_t) count);
+      return TRUE;
+    }
+
+  if ((section->flags & SEC_IN_MEMORY) != 0)
+    {
+      if (section->contents == NULL)
+	{
+	  /* This can happen because of errors earlier on in the linking process.
+	     We do not want to seg-fault here, so clear the flag and return an
+	     error code.  */
+	  section->flags &= ~ SEC_IN_MEMORY;
+	  bfd_set_error (bfd_error_invalid_operation);
+	  return FALSE;
+	}
+      
+      memcpy (location, section->contents + offset, (size_t) count);
+      return TRUE;
+    }
+
+  return BFD_SEND (abfd, _bfd_get_section_contents,
+		   (abfd, section, location, offset, count));
+}
+
+/*
+FUNCTION
+	bfd_malloc_and_get_section
+
+SYNOPSIS
+	bfd_boolean bfd_malloc_and_get_section
+	  (bfd *abfd, asection *section, bfd_byte **buf);
+
+DESCRIPTION
+	Read all data from @var{section} in BFD @var{abfd}
+	into a buffer, *@var{buf}, malloc'd by this function.
+*/
+
+bfd_boolean
+bfd_malloc_and_get_section (bfd *abfd, sec_ptr sec, bfd_byte **buf)
+{
+  *buf = NULL;
+  return bfd_get_full_section_contents (abfd, sec, buf);
+}
+/*
+FUNCTION
+	bfd_copy_private_section_data
+
+SYNOPSIS
+	bfd_boolean bfd_copy_private_section_data
+	  (bfd *ibfd, asection *isec, bfd *obfd, asection *osec);
+
+DESCRIPTION
+	Copy private section information from @var{isec} in the BFD
+	@var{ibfd} to the section @var{osec} in the BFD @var{obfd}.
+	Return <<TRUE>> on success, <<FALSE>> on error.  Possible error
+	returns are:
+
+	o <<bfd_error_no_memory>> -
+	Not enough memory exists to create private data for @var{osec}.
+
+.#define bfd_copy_private_section_data(ibfd, isection, obfd, osection) \
+.     BFD_SEND (obfd, _bfd_copy_private_section_data, \
+.		(ibfd, isection, obfd, osection))
+*/
+
+/*
+FUNCTION
+	bfd_generic_is_group_section
+
+SYNOPSIS
+	bfd_boolean bfd_generic_is_group_section (bfd *, const asection *sec);
+
+DESCRIPTION
+	Returns TRUE if @var{sec} is a member of a group.
+*/
+
+bfd_boolean
+bfd_generic_is_group_section (bfd *abfd ATTRIBUTE_UNUSED,
+			      const asection *sec ATTRIBUTE_UNUSED)
+{
+  return FALSE;
+}
+
+/*
+FUNCTION
+	bfd_generic_discard_group
+
+SYNOPSIS
+	bfd_boolean bfd_generic_discard_group (bfd *abfd, asection *group);
+
+DESCRIPTION
+	Remove all members of @var{group} from the output.
+*/
+
+bfd_boolean
+bfd_generic_discard_group (bfd *abfd ATTRIBUTE_UNUSED,
+			   asection *group ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/simple.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/simple.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/simple.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/simple.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,253 @@
+/* simple.c -- BFD simple client routines
+   Copyright 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Contributed by MontaVista Software, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "bfdlink.h"
+
+static bfd_boolean
+simple_dummy_warning (struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
+		      const char *warning ATTRIBUTE_UNUSED,
+		      const char *symbol ATTRIBUTE_UNUSED,
+		      bfd *abfd ATTRIBUTE_UNUSED,
+		      asection *section ATTRIBUTE_UNUSED,
+		      bfd_vma address ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+static bfd_boolean
+simple_dummy_undefined_symbol (struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
+			       const char *name ATTRIBUTE_UNUSED,
+			       bfd *abfd ATTRIBUTE_UNUSED,
+			       asection *section ATTRIBUTE_UNUSED,
+			       bfd_vma address ATTRIBUTE_UNUSED,
+			       bfd_boolean fatal ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+static bfd_boolean
+simple_dummy_reloc_overflow (struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
+			     struct bfd_link_hash_entry *entry ATTRIBUTE_UNUSED,
+			     const char *name ATTRIBUTE_UNUSED,
+			     const char *reloc_name ATTRIBUTE_UNUSED,
+			     bfd_vma addend ATTRIBUTE_UNUSED,
+			     bfd *abfd ATTRIBUTE_UNUSED,
+			     asection *section ATTRIBUTE_UNUSED,
+			     bfd_vma address ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+static bfd_boolean
+simple_dummy_reloc_dangerous (struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
+			      const char *message ATTRIBUTE_UNUSED,
+			      bfd *abfd ATTRIBUTE_UNUSED,
+			      asection *section ATTRIBUTE_UNUSED,
+			      bfd_vma address ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+static bfd_boolean
+simple_dummy_unattached_reloc (struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
+			       const char *name ATTRIBUTE_UNUSED,
+			       bfd *abfd ATTRIBUTE_UNUSED,
+			       asection *section ATTRIBUTE_UNUSED,
+			       bfd_vma address ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+static bfd_boolean
+simple_dummy_multiple_definition (struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
+				  struct bfd_link_hash_entry *h ATTRIBUTE_UNUSED,
+				  bfd *nbfd ATTRIBUTE_UNUSED,
+				  asection *nsec ATTRIBUTE_UNUSED,
+				  bfd_vma nval ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+static void
+simple_dummy_einfo (const char *fmt ATTRIBUTE_UNUSED, ...)
+{
+}
+
+struct saved_output_info
+{
+  bfd_vma offset;
+  asection *section;
+};
+
+static void
+simple_save_output_info (bfd *abfd ATTRIBUTE_UNUSED,
+			 asection *section,
+			 void *ptr)
+{
+  struct saved_output_info *output_info = (struct saved_output_info *) ptr;
+  output_info[section->index].offset = section->output_offset;
+  output_info[section->index].section = section->output_section;
+  if ((section->flags & SEC_DEBUGGING) != 0
+      || section->output_section == NULL)
+    {
+      section->output_offset = 0;
+      section->output_section = section;
+    }
+}
+
+static void
+simple_restore_output_info (bfd *abfd ATTRIBUTE_UNUSED,
+			    asection *section,
+			    void *ptr)
+{
+  struct saved_output_info *output_info = (struct saved_output_info *) ptr;
+  section->output_offset = output_info[section->index].offset;
+  section->output_section = output_info[section->index].section;
+}
+
+/*
+FUNCTION
+	bfd_simple_relocate_secton
+
+SYNOPSIS
+	bfd_byte *bfd_simple_get_relocated_section_contents
+	  (bfd *abfd, asection *sec, bfd_byte *outbuf, asymbol **symbol_table);
+
+DESCRIPTION
+	Returns the relocated contents of section @var{sec}.  The symbols in
+	@var{symbol_table} will be used, or the symbols from @var{abfd} if
+	@var{symbol_table} is NULL.  The output offsets for debug sections will
+	be temporarily reset to 0.  The result will be stored at @var{outbuf}
+	or allocated with @code{bfd_malloc} if @var{outbuf} is @code{NULL}.
+
+	Returns @code{NULL} on a fatal error; ignores errors applying
+	particular relocations.
+*/
+
+bfd_byte *
+bfd_simple_get_relocated_section_contents (bfd *abfd,
+					   asection *sec,
+					   bfd_byte *outbuf,
+					   asymbol **symbol_table)
+{
+  struct bfd_link_info link_info;
+  struct bfd_link_order link_order;
+  struct bfd_link_callbacks callbacks;
+  bfd_byte *contents, *data;
+  int storage_needed;
+  void *saved_offsets;
+
+  /* Don't apply relocation on executable and shared library.  See
+     PR 4756.  */
+  if ((abfd->flags & (HAS_RELOC | EXEC_P | DYNAMIC)) != HAS_RELOC
+      || ! (sec->flags & SEC_RELOC))
+    {
+      contents = outbuf;
+      if (!bfd_get_full_section_contents (abfd, sec, &contents))
+	return NULL;
+      return contents;
+    }
+
+  /* In order to use bfd_get_relocated_section_contents, we need
+     to forge some data structures that it expects.  */
+
+  /* Fill in the bare minimum number of fields for our purposes.  */
+  memset (&link_info, 0, sizeof (link_info));
+  link_info.output_bfd = abfd;
+  link_info.input_bfds = abfd;
+  link_info.input_bfds_tail = &abfd->link_next;
+
+  link_info.hash = _bfd_generic_link_hash_table_create (abfd);
+  link_info.callbacks = &callbacks;
+  callbacks.warning = simple_dummy_warning;
+  callbacks.undefined_symbol = simple_dummy_undefined_symbol;
+  callbacks.reloc_overflow = simple_dummy_reloc_overflow;
+  callbacks.reloc_dangerous = simple_dummy_reloc_dangerous;
+  callbacks.unattached_reloc = simple_dummy_unattached_reloc;
+  callbacks.multiple_definition = simple_dummy_multiple_definition;
+  callbacks.einfo = simple_dummy_einfo;
+
+  memset (&link_order, 0, sizeof (link_order));
+  link_order.next = NULL;
+  link_order.type = bfd_indirect_link_order;
+  link_order.offset = 0;
+  link_order.size = sec->size;
+  link_order.u.indirect.section = sec;
+
+  data = NULL;
+  if (outbuf == NULL)
+    {
+      bfd_size_type amt = sec->rawsize > sec->size ? sec->rawsize : sec->size;
+      data = (bfd_byte *) bfd_malloc (amt);
+      if (data == NULL)
+	return NULL;
+      outbuf = data;
+    }
+
+  /* The sections in ABFD may already have output sections and offsets set.
+     Because this function is primarily for debug sections, and GCC uses the
+     knowledge that debug sections will generally have VMA 0 when emitting
+     relocations between DWARF-2 sections (which are supposed to be
+     section-relative offsets anyway), we need to reset the output offsets
+     to zero.  We also need to arrange for section->output_section->vma plus
+     section->output_offset to equal section->vma, which we do by setting
+     section->output_section to point back to section.  Save the original
+     output offset and output section to restore later.  */
+  saved_offsets = malloc (sizeof (struct saved_output_info)
+			  * abfd->section_count);
+  if (saved_offsets == NULL)
+    {
+      if (data)
+	free (data);
+      return NULL;
+    }
+  bfd_map_over_sections (abfd, simple_save_output_info, saved_offsets);
+
+  if (symbol_table == NULL)
+    {
+      _bfd_generic_link_add_symbols (abfd, &link_info);
+
+      storage_needed = bfd_get_symtab_upper_bound (abfd);
+      symbol_table = (asymbol **) bfd_malloc (storage_needed);
+      bfd_canonicalize_symtab (abfd, symbol_table);
+    }
+  else
+    storage_needed = 0;
+
+  contents = bfd_get_relocated_section_contents (abfd,
+						 &link_info,
+						 &link_order,
+						 outbuf,
+						 0,
+						 symbol_table);
+  if (contents == NULL && data != NULL)
+    free (data);
+
+  bfd_map_over_sections (abfd, simple_restore_output_info, saved_offsets);
+  free (saved_offsets);
+
+  _bfd_generic_link_hash_table_free (link_info.hash);
+  return contents;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/som.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/som.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/som.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/som.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,6812 @@
+/* bfd back-end for HP PA-RISC SOM objects.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   Contributed by the Center for Software Science at the
+   University of Utah.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#include "alloca-conf.h"
+#include "sysdep.h"
+#include "bfd.h"
+
+#include "libbfd.h"
+#include "som.h"
+#include "safe-ctype.h"
+#include "som/reloc.h"
+#include "aout/ar.h"
+
+static bfd_reloc_status_type hppa_som_reloc
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_boolean som_mkobject (bfd *);
+static bfd_boolean som_is_space (asection *);
+static bfd_boolean som_is_subspace (asection *);
+static int compare_subspaces (const void *, const void *);
+static unsigned long som_compute_checksum (struct som_external_header *);
+static bfd_boolean som_build_and_write_symbol_table (bfd *);
+static unsigned int som_slurp_symbol_table (bfd *);
+
+/* Magic not defined in standard HP-UX header files until 8.0.  */
+
+#ifndef CPU_PA_RISC1_0
+#define CPU_PA_RISC1_0 0x20B
+#endif /* CPU_PA_RISC1_0 */
+
+#ifndef CPU_PA_RISC1_1
+#define CPU_PA_RISC1_1 0x210
+#endif /* CPU_PA_RISC1_1 */
+
+#ifndef CPU_PA_RISC2_0
+#define CPU_PA_RISC2_0 0x214
+#endif /* CPU_PA_RISC2_0 */
+
+#ifndef _PA_RISC1_0_ID
+#define _PA_RISC1_0_ID CPU_PA_RISC1_0
+#endif /* _PA_RISC1_0_ID */
+
+#ifndef _PA_RISC1_1_ID
+#define _PA_RISC1_1_ID CPU_PA_RISC1_1
+#endif /* _PA_RISC1_1_ID */
+
+#ifndef _PA_RISC2_0_ID
+#define _PA_RISC2_0_ID CPU_PA_RISC2_0
+#endif /* _PA_RISC2_0_ID */
+
+#ifndef _PA_RISC_MAXID
+#define _PA_RISC_MAXID	0x2FF
+#endif /* _PA_RISC_MAXID */
+
+#ifndef _PA_RISC_ID
+#define _PA_RISC_ID(__m_num)		\
+    (((__m_num) == _PA_RISC1_0_ID) ||	\
+     ((__m_num) >= _PA_RISC1_1_ID && (__m_num) <= _PA_RISC_MAXID))
+#endif /* _PA_RISC_ID */
+
+/* HIUX in it's infinite stupidity changed the names for several "well
+   known" constants.  Work around such braindamage.  Try the HPUX version
+   first, then the HIUX version, and finally provide a default.  */
+#ifdef HPUX_AUX_ID
+#define EXEC_AUX_ID HPUX_AUX_ID
+#endif
+
+#if !defined (EXEC_AUX_ID) && defined (HIUX_AUX_ID)
+#define EXEC_AUX_ID HIUX_AUX_ID
+#endif
+
+#ifndef EXEC_AUX_ID
+#define EXEC_AUX_ID 0
+#endif
+
+/* Size (in chars) of the temporary buffers used during fixup and string
+   table writes.   */
+
+#define SOM_TMP_BUFSIZE 8192
+
+/* Size of the hash table in archives.  */
+#define SOM_LST_HASH_SIZE 31
+
+/* Max number of SOMs to be found in an archive.  */
+#define SOM_LST_MODULE_LIMIT 1024
+
+/* Generic alignment macro.  */
+#define SOM_ALIGN(val, alignment) \
+  (((val) + (alignment) - 1) &~ ((unsigned long) (alignment) - 1))
+
+/* SOM allows any one of the four previous relocations to be reused
+   with a "R_PREV_FIXUP" relocation entry.  Since R_PREV_FIXUP
+   relocations are always a single byte, using a R_PREV_FIXUP instead
+   of some multi-byte relocation makes object files smaller.
+
+   Note one side effect of using a R_PREV_FIXUP is the relocation that
+   is being repeated moves to the front of the queue.  */
+struct reloc_queue
+{
+  unsigned char *reloc;
+  unsigned int size;
+} reloc_queue[4];
+
+/* This fully describes the symbol types which may be attached to
+   an EXPORT or IMPORT directive.  Only SOM uses this formation
+   (ELF has no need for it).  */
+typedef enum
+{
+  SYMBOL_TYPE_UNKNOWN,
+  SYMBOL_TYPE_ABSOLUTE,
+  SYMBOL_TYPE_CODE,
+  SYMBOL_TYPE_DATA,
+  SYMBOL_TYPE_ENTRY,
+  SYMBOL_TYPE_MILLICODE,
+  SYMBOL_TYPE_PLABEL,
+  SYMBOL_TYPE_PRI_PROG,
+  SYMBOL_TYPE_SEC_PROG,
+} pa_symbol_type;
+
+struct section_to_type
+{
+  const char *section;
+  char type;
+};
+
+/* Assorted symbol information that needs to be derived from the BFD symbol
+   and/or the BFD backend private symbol data.  */
+struct som_misc_symbol_info
+{
+  unsigned int symbol_type;
+  unsigned int symbol_scope;
+  unsigned int arg_reloc;
+  unsigned int symbol_info;
+  unsigned int symbol_value;
+  unsigned int priv_level;
+  unsigned int secondary_def;
+  unsigned int is_comdat;
+  unsigned int is_common;
+  unsigned int dup_common;
+};
+
+/* Map SOM section names to POSIX/BSD single-character symbol types.
+
+   This table includes all the standard subspaces as defined in the
+   current "PRO ABI for PA-RISC Systems", $UNWIND$ which for
+   some reason was left out, and sections specific to embedded stabs.  */
+
+static const struct section_to_type stt[] =
+{
+  {"$TEXT$", 't'},
+  {"$SHLIB_INFO$", 't'},
+  {"$MILLICODE$", 't'},
+  {"$LIT$", 't'},
+  {"$CODE$", 't'},
+  {"$UNWIND_START$", 't'},
+  {"$UNWIND$", 't'},
+  {"$PRIVATE$", 'd'},
+  {"$PLT$", 'd'},
+  {"$SHLIB_DATA$", 'd'},
+  {"$DATA$", 'd'},
+  {"$SHORTDATA$", 'g'},
+  {"$DLT$", 'd'},
+  {"$GLOBAL$", 'g'},
+  {"$SHORTBSS$", 's'},
+  {"$BSS$", 'b'},
+  {"$GDB_STRINGS$", 'N'},
+  {"$GDB_SYMBOLS$", 'N'},
+  {0, 0}
+};
+
+/* About the relocation formatting table...
+
+   There are 256 entries in the table, one for each possible
+   relocation opcode available in SOM.  We index the table by
+   the relocation opcode.  The names and operations are those
+   defined by a.out_800 (4).
+
+   Right now this table is only used to count and perform minimal
+   processing on relocation streams so that they can be internalized
+   into BFD and symbolically printed by utilities.  To make actual use
+   of them would be much more difficult, BFD's concept of relocations
+   is far too simple to handle SOM relocations.  The basic assumption
+   that a relocation can be completely processed independent of other
+   relocations before an object file is written is invalid for SOM.
+
+   The SOM relocations are meant to be processed as a stream, they
+   specify copying of data from the input section to the output section
+   while possibly modifying the data in some manner.  They also can
+   specify that a variable number of zeros or uninitialized data be
+   inserted on in the output segment at the current offset.  Some
+   relocations specify that some previous relocation be re-applied at
+   the current location in the input/output sections.  And finally a number
+   of relocations have effects on other sections (R_ENTRY, R_EXIT,
+   R_UNWIND_AUX and a variety of others).  There isn't even enough room
+   in the BFD relocation data structure to store enough information to
+   perform all the relocations.
+
+   Each entry in the table has three fields.
+
+   The first entry is an index into this "class" of relocations.  This
+   index can then be used as a variable within the relocation itself.
+
+   The second field is a format string which actually controls processing
+   of the relocation.  It uses a simple postfix machine to do calculations
+   based on variables/constants found in the string and the relocation
+   stream.
+
+   The third field specifys whether or not this relocation may use
+   a constant (V) from the previous R_DATA_OVERRIDE rather than a constant
+   stored in the instruction.
+
+   Variables:
+
+   L = input space byte count
+   D = index into class of relocations
+   M = output space byte count
+   N = statement number (unused?)
+   O = stack operation
+   R = parameter relocation bits
+   S = symbol index
+   T = first 32 bits of stack unwind information
+   U = second 32 bits of stack unwind information
+   V = a literal constant (usually used in the next relocation)
+   P = a previous relocation
+
+   Lower case letters (starting with 'b') refer to following
+   bytes in the relocation stream.  'b' is the next 1 byte,
+   c is the next 2 bytes, d is the next 3 bytes, etc...
+   This is the variable part of the relocation entries that
+   makes our life a living hell.
+
+   numerical constants are also used in the format string.  Note
+   the constants are represented in decimal.
+
+   '+', "*" and "=" represents the obvious postfix operators.
+   '<' represents a left shift.
+
+   Stack Operations:
+
+   Parameter Relocation Bits:
+
+   Unwind Entries:
+
+   Previous Relocations:  The index field represents which in the queue
+   of 4 previous fixups should be re-applied.
+
+   Literal Constants:  These are generally used to represent addend
+   parts of relocations when these constants are not stored in the
+   fields of the instructions themselves.  For example the instruction
+   addil foo-$global$-0x1234 would use an override for "0x1234" rather
+   than storing it into the addil itself.  */
+
+struct fixup_format
+{
+  int D;
+  const char *format;
+};
+
+static const struct fixup_format som_fixup_formats[256] =
+{
+  /* R_NO_RELOCATION.  */
+  {  0, "LD1+4*=" },		/* 0x00 */
+  {  1, "LD1+4*=" },		/* 0x01 */
+  {  2, "LD1+4*=" },		/* 0x02 */
+  {  3, "LD1+4*=" },		/* 0x03 */
+  {  4, "LD1+4*=" },		/* 0x04 */
+  {  5, "LD1+4*=" },		/* 0x05 */
+  {  6, "LD1+4*=" },		/* 0x06 */
+  {  7, "LD1+4*=" },		/* 0x07 */
+  {  8, "LD1+4*=" },		/* 0x08 */
+  {  9, "LD1+4*=" },		/* 0x09 */
+  { 10, "LD1+4*=" },		/* 0x0a */
+  { 11, "LD1+4*=" },		/* 0x0b */
+  { 12, "LD1+4*=" },		/* 0x0c */
+  { 13, "LD1+4*=" },		/* 0x0d */
+  { 14, "LD1+4*=" },		/* 0x0e */
+  { 15, "LD1+4*=" },		/* 0x0f */
+  { 16, "LD1+4*=" },		/* 0x10 */
+  { 17, "LD1+4*=" },		/* 0x11 */
+  { 18, "LD1+4*=" },		/* 0x12 */
+  { 19, "LD1+4*=" },		/* 0x13 */
+  { 20, "LD1+4*=" },		/* 0x14 */
+  { 21, "LD1+4*=" },		/* 0x15 */
+  { 22, "LD1+4*=" },		/* 0x16 */
+  { 23, "LD1+4*=" },		/* 0x17 */
+  {  0, "LD8<b+1+4*=" },	/* 0x18 */
+  {  1, "LD8<b+1+4*=" },	/* 0x19 */
+  {  2, "LD8<b+1+4*=" },	/* 0x1a */
+  {  3, "LD8<b+1+4*=" },	/* 0x1b */
+  {  0, "LD16<c+1+4*=" },	/* 0x1c */
+  {  1, "LD16<c+1+4*=" },	/* 0x1d */
+  {  2, "LD16<c+1+4*=" },	/* 0x1e */
+  {  0, "Ld1+=" },		/* 0x1f */
+  /* R_ZEROES.  */
+  {  0, "Lb1+4*=" },		/* 0x20 */
+  {  1, "Ld1+=" },		/* 0x21 */
+  /* R_UNINIT.  */
+  {  0, "Lb1+4*=" },		/* 0x22 */
+  {  1, "Ld1+=" },		/* 0x23 */
+  /* R_RELOCATION.  */
+  {  0, "L4=" },		/* 0x24 */
+  /* R_DATA_ONE_SYMBOL.  */
+  {  0, "L4=Sb=" },		/* 0x25 */
+  {  1, "L4=Sd=" },		/* 0x26 */
+  /* R_DATA_PLABEL.  */
+  {  0, "L4=Sb=" },		/* 0x27 */
+  {  1, "L4=Sd=" },		/* 0x28 */
+  /* R_SPACE_REF.  */
+  {  0, "L4=" },		/* 0x29 */
+  /* R_REPEATED_INIT.  */
+  {  0, "L4=Mb1+4*=" },		/* 0x2a */
+  {  1, "Lb4*=Mb1+L*=" },	/* 0x2b */
+  {  2, "Lb4*=Md1+4*=" },	/* 0x2c */
+  {  3, "Ld1+=Me1+=" },		/* 0x2d */
+  {  0, "" },			/* 0x2e */
+  {  0, "" },			/* 0x2f */
+  /* R_PCREL_CALL.  */
+  {  0, "L4=RD=Sb=" },		/* 0x30 */
+  {  1, "L4=RD=Sb=" },		/* 0x31 */
+  {  2, "L4=RD=Sb=" },		/* 0x32 */
+  {  3, "L4=RD=Sb=" },		/* 0x33 */
+  {  4, "L4=RD=Sb=" },		/* 0x34 */
+  {  5, "L4=RD=Sb=" },		/* 0x35 */
+  {  6, "L4=RD=Sb=" },		/* 0x36 */
+  {  7, "L4=RD=Sb=" },		/* 0x37 */
+  {  8, "L4=RD=Sb=" },		/* 0x38 */
+  {  9, "L4=RD=Sb=" },		/* 0x39 */
+  {  0, "L4=RD8<b+=Sb=" },	/* 0x3a */
+  {  1, "L4=RD8<b+=Sb=" },	/* 0x3b */
+  {  0, "L4=RD8<b+=Sd=" },	/* 0x3c */
+  {  1, "L4=RD8<b+=Sd=" },	/* 0x3d */
+  /* R_SHORT_PCREL_MODE.  */
+  {  0, "" },			/* 0x3e */
+  /* R_LONG_PCREL_MODE.  */
+  {  0, "" },			/* 0x3f */
+  /* R_ABS_CALL.  */
+  {  0, "L4=RD=Sb=" },		/* 0x40 */
+  {  1, "L4=RD=Sb=" },		/* 0x41 */
+  {  2, "L4=RD=Sb=" },		/* 0x42 */
+  {  3, "L4=RD=Sb=" },		/* 0x43 */
+  {  4, "L4=RD=Sb=" },		/* 0x44 */
+  {  5, "L4=RD=Sb=" },		/* 0x45 */
+  {  6, "L4=RD=Sb=" },		/* 0x46 */
+  {  7, "L4=RD=Sb=" },		/* 0x47 */
+  {  8, "L4=RD=Sb=" },		/* 0x48 */
+  {  9, "L4=RD=Sb=" },		/* 0x49 */
+  {  0, "L4=RD8<b+=Sb=" },	/* 0x4a */
+  {  1, "L4=RD8<b+=Sb=" },	/* 0x4b */
+  {  0, "L4=RD8<b+=Sd=" },	/* 0x4c */
+  {  1, "L4=RD8<b+=Sd=" },	/* 0x4d */
+  /* R_RESERVED.  */
+  {  0, "" },			/* 0x4e */
+  {  0, "" },			/* 0x4f */
+  /* R_DP_RELATIVE.  */
+  {  0, "L4=SD=" },		/* 0x50 */
+  {  1, "L4=SD=" },		/* 0x51 */
+  {  2, "L4=SD=" },		/* 0x52 */
+  {  3, "L4=SD=" },		/* 0x53 */
+  {  4, "L4=SD=" },		/* 0x54 */
+  {  5, "L4=SD=" },		/* 0x55 */
+  {  6, "L4=SD=" },		/* 0x56 */
+  {  7, "L4=SD=" },		/* 0x57 */
+  {  8, "L4=SD=" },		/* 0x58 */
+  {  9, "L4=SD=" },		/* 0x59 */
+  { 10, "L4=SD=" },		/* 0x5a */
+  { 11, "L4=SD=" },		/* 0x5b */
+  { 12, "L4=SD=" },		/* 0x5c */
+  { 13, "L4=SD=" },		/* 0x5d */
+  { 14, "L4=SD=" },		/* 0x5e */
+  { 15, "L4=SD=" },		/* 0x5f */
+  { 16, "L4=SD=" },		/* 0x60 */
+  { 17, "L4=SD=" },		/* 0x61 */
+  { 18, "L4=SD=" },		/* 0x62 */
+  { 19, "L4=SD=" },		/* 0x63 */
+  { 20, "L4=SD=" },		/* 0x64 */
+  { 21, "L4=SD=" },		/* 0x65 */
+  { 22, "L4=SD=" },		/* 0x66 */
+  { 23, "L4=SD=" },		/* 0x67 */
+  { 24, "L4=SD=" },		/* 0x68 */
+  { 25, "L4=SD=" },		/* 0x69 */
+  { 26, "L4=SD=" },		/* 0x6a */
+  { 27, "L4=SD=" },		/* 0x6b */
+  { 28, "L4=SD=" },		/* 0x6c */
+  { 29, "L4=SD=" },		/* 0x6d */
+  { 30, "L4=SD=" },		/* 0x6e */
+  { 31, "L4=SD=" },		/* 0x6f */
+  { 32, "L4=Sb=" },		/* 0x70 */
+  { 33, "L4=Sd=" },		/* 0x71 */
+  /* R_DATA_GPREL.  */
+  {  0, "L4=Sd=" },		/* 0x72 */
+  /* R_RESERVED.  */
+  {  0, "" },			/* 0x73 */
+  {  0, "" },			/* 0x74 */
+  {  0, "" },			/* 0x75 */
+  {  0, "" },			/* 0x76 */
+  {  0, "" },			/* 0x77 */
+  /* R_DLT_REL.  */
+  {  0, "L4=Sb=" },		/* 0x78 */
+  {  1, "L4=Sd=" },		/* 0x79 */
+  /* R_RESERVED.  */
+  {  0, "" },			/* 0x7a */
+  {  0, "" },			/* 0x7b */
+  {  0, "" },			/* 0x7c */
+  {  0, "" },			/* 0x7d */
+  {  0, "" },			/* 0x7e */
+  {  0, "" },			/* 0x7f */
+  /* R_CODE_ONE_SYMBOL.  */
+  {  0, "L4=SD=" },		/* 0x80 */
+  {  1, "L4=SD=" },		/* 0x81 */
+  {  2, "L4=SD=" },		/* 0x82 */
+  {  3, "L4=SD=" },		/* 0x83 */
+  {  4, "L4=SD=" },		/* 0x84 */
+  {  5, "L4=SD=" },		/* 0x85 */
+  {  6, "L4=SD=" },		/* 0x86 */
+  {  7, "L4=SD=" },		/* 0x87 */
+  {  8, "L4=SD=" },		/* 0x88 */
+  {  9, "L4=SD=" },		/* 0x89 */
+  { 10, "L4=SD=" },		/* 0x8q */
+  { 11, "L4=SD=" },		/* 0x8b */
+  { 12, "L4=SD=" },		/* 0x8c */
+  { 13, "L4=SD=" },		/* 0x8d */
+  { 14, "L4=SD=" },		/* 0x8e */
+  { 15, "L4=SD=" },		/* 0x8f */
+  { 16, "L4=SD=" },		/* 0x90 */
+  { 17, "L4=SD=" },		/* 0x91 */
+  { 18, "L4=SD=" },		/* 0x92 */
+  { 19, "L4=SD=" },		/* 0x93 */
+  { 20, "L4=SD=" },		/* 0x94 */
+  { 21, "L4=SD=" },		/* 0x95 */
+  { 22, "L4=SD=" },		/* 0x96 */
+  { 23, "L4=SD=" },		/* 0x97 */
+  { 24, "L4=SD=" },		/* 0x98 */
+  { 25, "L4=SD=" },		/* 0x99 */
+  { 26, "L4=SD=" },		/* 0x9a */
+  { 27, "L4=SD=" },		/* 0x9b */
+  { 28, "L4=SD=" },		/* 0x9c */
+  { 29, "L4=SD=" },		/* 0x9d */
+  { 30, "L4=SD=" },		/* 0x9e */
+  { 31, "L4=SD=" },		/* 0x9f */
+  { 32, "L4=Sb=" },		/* 0xa0 */
+  { 33, "L4=Sd=" },		/* 0xa1 */
+  /* R_RESERVED.  */
+  {  0, "" },			/* 0xa2 */
+  {  0, "" },			/* 0xa3 */
+  {  0, "" },			/* 0xa4 */
+  {  0, "" },			/* 0xa5 */
+  {  0, "" },			/* 0xa6 */
+  {  0, "" },			/* 0xa7 */
+  {  0, "" },			/* 0xa8 */
+  {  0, "" },			/* 0xa9 */
+  {  0, "" },			/* 0xaa */
+  {  0, "" },			/* 0xab */
+  {  0, "" },			/* 0xac */
+  {  0, "" },			/* 0xad */
+  /* R_MILLI_REL.  */
+  {  0, "L4=Sb=" },		/* 0xae */
+  {  1, "L4=Sd=" },		/* 0xaf */
+  /* R_CODE_PLABEL.  */
+  {  0, "L4=Sb=" },		/* 0xb0 */
+  {  1, "L4=Sd=" },		/* 0xb1 */
+  /* R_BREAKPOINT.  */
+  {  0, "L4=" },		/* 0xb2 */
+  /* R_ENTRY.  */
+  {  0, "Te=Ue=" },		/* 0xb3 */
+  {  1, "Uf=" },		/* 0xb4 */
+  /* R_ALT_ENTRY.  */
+  {  0, "" },			/* 0xb5 */
+  /* R_EXIT.  */
+  {  0, "" },			/* 0xb6 */
+  /* R_BEGIN_TRY.  */
+  {  0, "" },			/* 0xb7 */
+  /* R_END_TRY.  */
+  {  0, "R0=" },		/* 0xb8 */
+  {  1, "Rb4*=" },		/* 0xb9 */
+  {  2, "Rd4*=" },		/* 0xba */
+  /* R_BEGIN_BRTAB.  */
+  {  0, "" },			/* 0xbb */
+  /* R_END_BRTAB.  */
+  {  0, "" },			/* 0xbc */
+  /* R_STATEMENT.  */
+  {  0, "Nb=" },		/* 0xbd */
+  {  1, "Nc=" },		/* 0xbe */
+  {  2, "Nd=" },		/* 0xbf */
+  /* R_DATA_EXPR.  */
+  {  0, "L4=" },		/* 0xc0 */
+  /* R_CODE_EXPR.  */
+  {  0, "L4=" },		/* 0xc1 */
+  /* R_FSEL.  */
+  {  0, "" },			/* 0xc2 */
+  /* R_LSEL.  */
+  {  0, "" },			/* 0xc3 */
+  /* R_RSEL.  */
+  {  0, "" },			/* 0xc4 */
+  /* R_N_MODE.  */
+  {  0, "" },			/* 0xc5 */
+  /* R_S_MODE.  */
+  {  0, "" },			/* 0xc6 */
+  /* R_D_MODE.  */
+  {  0, "" },			/* 0xc7 */
+  /* R_R_MODE.  */
+  {  0, "" },			/* 0xc8 */
+  /* R_DATA_OVERRIDE.  */
+  {  0, "V0=" },		/* 0xc9 */
+  {  1, "Vb=" },		/* 0xca */
+  {  2, "Vc=" },		/* 0xcb */
+  {  3, "Vd=" },		/* 0xcc */
+  {  4, "Ve=" },		/* 0xcd */
+  /* R_TRANSLATED.  */
+  {  0, "" },			/* 0xce */
+  /* R_AUX_UNWIND.  */
+  {  0,"Sd=Ve=Ee=" },	       /* 0xcf */
+  /* R_COMP1.  */
+  {  0, "Ob=" },		/* 0xd0 */
+  /* R_COMP2.  */
+  {  0, "Ob=Sd=" },		/* 0xd1 */
+  /* R_COMP3.  */
+  {  0, "Ob=Ve=" },		/* 0xd2 */
+  /* R_PREV_FIXUP.  */
+  {  0, "P" },			/* 0xd3 */
+  {  1, "P" },			/* 0xd4 */
+  {  2, "P" },			/* 0xd5 */
+  {  3, "P" },			/* 0xd6 */
+  /* R_SEC_STMT.  */
+  {  0, "" },			/* 0xd7 */
+  /* R_N0SEL.  */
+  {  0, "" },			/* 0xd8 */
+  /* R_N1SEL.  */
+  {  0, "" },			/* 0xd9 */
+  /* R_LINETAB.  */
+  {  0, "Eb=Sd=Ve=" },		/* 0xda */
+  /* R_LINETAB_ESC.  */
+  {  0, "Eb=Mb=" },		/* 0xdb */
+  /* R_LTP_OVERRIDE.  */
+  {  0, "" },			/* 0xdc */
+  /* R_COMMENT.  */
+  {  0, "Ob=Vf=" },		/* 0xdd */
+  /* R_RESERVED.  */
+  {  0, "" },			/* 0xde */
+  {  0, "" },			/* 0xdf */
+  {  0, "" },			/* 0xe0 */
+  {  0, "" },			/* 0xe1 */
+  {  0, "" },			/* 0xe2 */
+  {  0, "" },			/* 0xe3 */
+  {  0, "" },			/* 0xe4 */
+  {  0, "" },			/* 0xe5 */
+  {  0, "" },			/* 0xe6 */
+  {  0, "" },			/* 0xe7 */
+  {  0, "" },			/* 0xe8 */
+  {  0, "" },			/* 0xe9 */
+  {  0, "" },			/* 0xea */
+  {  0, "" },			/* 0xeb */
+  {  0, "" },			/* 0xec */
+  {  0, "" },			/* 0xed */
+  {  0, "" },			/* 0xee */
+  {  0, "" },			/* 0xef */
+  {  0, "" },			/* 0xf0 */
+  {  0, "" },			/* 0xf1 */
+  {  0, "" },			/* 0xf2 */
+  {  0, "" },			/* 0xf3 */
+  {  0, "" },			/* 0xf4 */
+  {  0, "" },			/* 0xf5 */
+  {  0, "" },			/* 0xf6 */
+  {  0, "" },			/* 0xf7 */
+  {  0, "" },			/* 0xf8 */
+  {  0, "" },			/* 0xf9 */
+  {  0, "" },			/* 0xfa */
+  {  0, "" },			/* 0xfb */
+  {  0, "" },			/* 0xfc */
+  {  0, "" },			/* 0xfd */
+  {  0, "" },			/* 0xfe */
+  {  0, "" },			/* 0xff */
+};
+
+static const int comp1_opcodes[] =
+{
+  0x00,
+  0x40,
+  0x41,
+  0x42,
+  0x43,
+  0x44,
+  0x45,
+  0x46,
+  0x47,
+  0x48,
+  0x49,
+  0x4a,
+  0x4b,
+  0x60,
+  0x80,
+  0xa0,
+  0xc0,
+  -1
+};
+
+static const int comp2_opcodes[] =
+{
+  0x00,
+  0x80,
+  0x82,
+  0xc0,
+  -1
+};
+
+static const int comp3_opcodes[] =
+{
+  0x00,
+  0x02,
+  -1
+};
+
+/* These apparently are not in older versions of hpux reloc.h (hpux7).  */
+
+/* And these first appeared in hpux10.  */
+#ifndef R_SHORT_PCREL_MODE
+#define NO_PCREL_MODES
+#define R_SHORT_PCREL_MODE 0x3e
+#endif
+
+#define SOM_HOWTO(TYPE, NAME)	\
+  HOWTO(TYPE, 0, 0, 32, FALSE, 0, 0, hppa_som_reloc, NAME, FALSE, 0, 0, FALSE)
+
+static reloc_howto_type som_hppa_howto_table[] =
+{
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_NO_RELOCATION, "R_NO_RELOCATION"),
+  SOM_HOWTO (R_ZEROES, "R_ZEROES"),
+  SOM_HOWTO (R_ZEROES, "R_ZEROES"),
+  SOM_HOWTO (R_UNINIT, "R_UNINIT"),
+  SOM_HOWTO (R_UNINIT, "R_UNINIT"),
+  SOM_HOWTO (R_RELOCATION, "R_RELOCATION"),
+  SOM_HOWTO (R_DATA_ONE_SYMBOL, "R_DATA_ONE_SYMBOL"),
+  SOM_HOWTO (R_DATA_ONE_SYMBOL, "R_DATA_ONE_SYMBOL"),
+  SOM_HOWTO (R_DATA_PLABEL, "R_DATA_PLABEL"),
+  SOM_HOWTO (R_DATA_PLABEL, "R_DATA_PLABEL"),
+  SOM_HOWTO (R_SPACE_REF, "R_SPACE_REF"),
+  SOM_HOWTO (R_REPEATED_INIT, "REPEATED_INIT"),
+  SOM_HOWTO (R_REPEATED_INIT, "REPEATED_INIT"),
+  SOM_HOWTO (R_REPEATED_INIT, "REPEATED_INIT"),
+  SOM_HOWTO (R_REPEATED_INIT, "REPEATED_INIT"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
+  SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
+  SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
+  SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
+  SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
+  SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
+  SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
+  SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
+  SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
+  SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
+  SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
+  SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
+  SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
+  SOM_HOWTO (R_PCREL_CALL, "R_PCREL_CALL"),
+  SOM_HOWTO (R_SHORT_PCREL_MODE, "R_SHORT_PCREL_MODE"),
+  SOM_HOWTO (R_LONG_PCREL_MODE, "R_LONG_PCREL_MODE"),
+  SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
+  SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
+  SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
+  SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
+  SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
+  SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
+  SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
+  SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
+  SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
+  SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
+  SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
+  SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
+  SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
+  SOM_HOWTO (R_ABS_CALL, "R_ABS_CALL"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DP_RELATIVE, "R_DP_RELATIVE"),
+  SOM_HOWTO (R_DATA_GPREL, "R_DATA_GPREL"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_DLT_REL, "R_DLT_REL"),
+  SOM_HOWTO (R_DLT_REL, "R_DLT_REL"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_CODE_ONE_SYMBOL, "R_CODE_ONE_SYMBOL"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_MILLI_REL, "R_MILLI_REL"),
+  SOM_HOWTO (R_MILLI_REL, "R_MILLI_REL"),
+  SOM_HOWTO (R_CODE_PLABEL, "R_CODE_PLABEL"),
+  SOM_HOWTO (R_CODE_PLABEL, "R_CODE_PLABEL"),
+  SOM_HOWTO (R_BREAKPOINT, "R_BREAKPOINT"),
+  SOM_HOWTO (R_ENTRY, "R_ENTRY"),
+  SOM_HOWTO (R_ENTRY, "R_ENTRY"),
+  SOM_HOWTO (R_ALT_ENTRY, "R_ALT_ENTRY"),
+  SOM_HOWTO (R_EXIT, "R_EXIT"),
+  SOM_HOWTO (R_BEGIN_TRY, "R_BEGIN_TRY"),
+  SOM_HOWTO (R_END_TRY, "R_END_TRY"),
+  SOM_HOWTO (R_END_TRY, "R_END_TRY"),
+  SOM_HOWTO (R_END_TRY, "R_END_TRY"),
+  SOM_HOWTO (R_BEGIN_BRTAB, "R_BEGIN_BRTAB"),
+  SOM_HOWTO (R_END_BRTAB, "R_END_BRTAB"),
+  SOM_HOWTO (R_STATEMENT, "R_STATEMENT"),
+  SOM_HOWTO (R_STATEMENT, "R_STATEMENT"),
+  SOM_HOWTO (R_STATEMENT, "R_STATEMENT"),
+  SOM_HOWTO (R_DATA_EXPR, "R_DATA_EXPR"),
+  SOM_HOWTO (R_CODE_EXPR, "R_CODE_EXPR"),
+  SOM_HOWTO (R_FSEL, "R_FSEL"),
+  SOM_HOWTO (R_LSEL, "R_LSEL"),
+  SOM_HOWTO (R_RSEL, "R_RSEL"),
+  SOM_HOWTO (R_N_MODE, "R_N_MODE"),
+  SOM_HOWTO (R_S_MODE, "R_S_MODE"),
+  SOM_HOWTO (R_D_MODE, "R_D_MODE"),
+  SOM_HOWTO (R_R_MODE, "R_R_MODE"),
+  SOM_HOWTO (R_DATA_OVERRIDE, "R_DATA_OVERRIDE"),
+  SOM_HOWTO (R_DATA_OVERRIDE, "R_DATA_OVERRIDE"),
+  SOM_HOWTO (R_DATA_OVERRIDE, "R_DATA_OVERRIDE"),
+  SOM_HOWTO (R_DATA_OVERRIDE, "R_DATA_OVERRIDE"),
+  SOM_HOWTO (R_DATA_OVERRIDE, "R_DATA_OVERRIDE"),
+  SOM_HOWTO (R_TRANSLATED, "R_TRANSLATED"),
+  SOM_HOWTO (R_AUX_UNWIND, "R_AUX_UNWIND"),
+  SOM_HOWTO (R_COMP1, "R_COMP1"),
+  SOM_HOWTO (R_COMP2, "R_COMP2"),
+  SOM_HOWTO (R_COMP3, "R_COMP3"),
+  SOM_HOWTO (R_PREV_FIXUP, "R_PREV_FIXUP"),
+  SOM_HOWTO (R_PREV_FIXUP, "R_PREV_FIXUP"),
+  SOM_HOWTO (R_PREV_FIXUP, "R_PREV_FIXUP"),
+  SOM_HOWTO (R_PREV_FIXUP, "R_PREV_FIXUP"),
+  SOM_HOWTO (R_SEC_STMT, "R_SEC_STMT"),
+  SOM_HOWTO (R_N0SEL, "R_N0SEL"),
+  SOM_HOWTO (R_N1SEL, "R_N1SEL"),
+  SOM_HOWTO (R_LINETAB, "R_LINETAB"),
+  SOM_HOWTO (R_LINETAB_ESC, "R_LINETAB_ESC"),
+  SOM_HOWTO (R_LTP_OVERRIDE, "R_LTP_OVERRIDE"),
+  SOM_HOWTO (R_COMMENT, "R_COMMENT"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED"),
+  SOM_HOWTO (R_RESERVED, "R_RESERVED")
+};
+
+/* Initialize the SOM relocation queue.  By definition the queue holds
+   the last four multibyte fixups.  */
+
+static void
+som_initialize_reloc_queue (struct reloc_queue *queue)
+{
+  queue[0].reloc = NULL;
+  queue[0].size = 0;
+  queue[1].reloc = NULL;
+  queue[1].size = 0;
+  queue[2].reloc = NULL;
+  queue[2].size = 0;
+  queue[3].reloc = NULL;
+  queue[3].size = 0;
+}
+
+/* Insert a new relocation into the relocation queue.  */
+
+static void
+som_reloc_queue_insert (unsigned char *p,
+			unsigned int size,
+			struct reloc_queue *queue)
+{
+  queue[3].reloc = queue[2].reloc;
+  queue[3].size = queue[2].size;
+  queue[2].reloc = queue[1].reloc;
+  queue[2].size = queue[1].size;
+  queue[1].reloc = queue[0].reloc;
+  queue[1].size = queue[0].size;
+  queue[0].reloc = p;
+  queue[0].size = size;
+}
+
+/* When an entry in the relocation queue is reused, the entry moves
+   to the front of the queue.  */
+
+static void
+som_reloc_queue_fix (struct reloc_queue *queue, unsigned int idx)
+{
+  if (idx == 0)
+    return;
+
+  if (idx == 1)
+    {
+      unsigned char *tmp1 = queue[0].reloc;
+      unsigned int tmp2 = queue[0].size;
+
+      queue[0].reloc = queue[1].reloc;
+      queue[0].size = queue[1].size;
+      queue[1].reloc = tmp1;
+      queue[1].size = tmp2;
+      return;
+    }
+
+  if (idx == 2)
+    {
+      unsigned char *tmp1 = queue[0].reloc;
+      unsigned int tmp2 = queue[0].size;
+
+      queue[0].reloc = queue[2].reloc;
+      queue[0].size = queue[2].size;
+      queue[2].reloc = queue[1].reloc;
+      queue[2].size = queue[1].size;
+      queue[1].reloc = tmp1;
+      queue[1].size = tmp2;
+      return;
+    }
+
+  if (idx == 3)
+    {
+      unsigned char *tmp1 = queue[0].reloc;
+      unsigned int tmp2 = queue[0].size;
+
+      queue[0].reloc = queue[3].reloc;
+      queue[0].size = queue[3].size;
+      queue[3].reloc = queue[2].reloc;
+      queue[3].size = queue[2].size;
+      queue[2].reloc = queue[1].reloc;
+      queue[2].size = queue[1].size;
+      queue[1].reloc = tmp1;
+      queue[1].size = tmp2;
+      return;
+    }
+  abort ();
+}
+
+/* Search for a particular relocation in the relocation queue.  */
+
+static int
+som_reloc_queue_find (unsigned char *p,
+		      unsigned int size,
+		      struct reloc_queue *queue)
+{
+  if (queue[0].reloc && !memcmp (p, queue[0].reloc, size)
+      && size == queue[0].size)
+    return 0;
+  if (queue[1].reloc && !memcmp (p, queue[1].reloc, size)
+      && size == queue[1].size)
+    return 1;
+  if (queue[2].reloc && !memcmp (p, queue[2].reloc, size)
+      && size == queue[2].size)
+    return 2;
+  if (queue[3].reloc && !memcmp (p, queue[3].reloc, size)
+      && size == queue[3].size)
+    return 3;
+  return -1;
+}
+
+static unsigned char *
+try_prev_fixup (bfd *abfd ATTRIBUTE_UNUSED,
+		unsigned int *subspace_reloc_sizep,
+		unsigned char *p,
+		unsigned int size,
+		struct reloc_queue *queue)
+{
+  int queue_index = som_reloc_queue_find (p, size, queue);
+
+  if (queue_index != -1)
+    {
+      /* Found this in a previous fixup.  Undo the fixup we
+	 just built and use R_PREV_FIXUP instead.  We saved
+	 a total of size - 1 bytes in the fixup stream.  */
+      bfd_put_8 (abfd, R_PREV_FIXUP + queue_index, p);
+      p += 1;
+      *subspace_reloc_sizep += 1;
+      som_reloc_queue_fix (queue, queue_index);
+    }
+  else
+    {
+      som_reloc_queue_insert (p, size, queue);
+      *subspace_reloc_sizep += size;
+      p += size;
+    }
+  return p;
+}
+
+/* Emit the proper R_NO_RELOCATION fixups to map the next SKIP
+   bytes without any relocation.  Update the size of the subspace
+   relocation stream via SUBSPACE_RELOC_SIZE_P; also return the
+   current pointer into the relocation stream.  */
+
+static unsigned char *
+som_reloc_skip (bfd *abfd,
+		unsigned int skip,
+		unsigned char *p,
+		unsigned int *subspace_reloc_sizep,
+		struct reloc_queue *queue)
+{
+  /* Use a 4 byte R_NO_RELOCATION entry with a maximal value
+     then R_PREV_FIXUPs to get the difference down to a
+     reasonable size.  */
+  if (skip >= 0x1000000)
+    {
+      skip -= 0x1000000;
+      bfd_put_8 (abfd, R_NO_RELOCATION + 31, p);
+      bfd_put_8 (abfd, 0xff, p + 1);
+      bfd_put_16 (abfd, (bfd_vma) 0xffff, p + 2);
+      p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 4, queue);
+      while (skip >= 0x1000000)
+	{
+	  skip -= 0x1000000;
+	  bfd_put_8 (abfd, R_PREV_FIXUP, p);
+	  p++;
+	  *subspace_reloc_sizep += 1;
+	  /* No need to adjust queue here since we are repeating the
+	     most recent fixup.  */
+	}
+    }
+
+  /* The difference must be less than 0x1000000.  Use one
+     more R_NO_RELOCATION entry to get to the right difference.  */
+  if ((skip & 3) == 0 && skip <= 0xc0000 && skip > 0)
+    {
+      /* Difference can be handled in a simple single-byte
+	 R_NO_RELOCATION entry.  */
+      if (skip <= 0x60)
+	{
+	  bfd_put_8 (abfd, R_NO_RELOCATION + (skip >> 2) - 1, p);
+	  *subspace_reloc_sizep += 1;
+	  p++;
+	}
+      /* Handle it with a two byte R_NO_RELOCATION entry.  */
+      else if (skip <= 0x1000)
+	{
+	  bfd_put_8 (abfd, R_NO_RELOCATION + 24 + (((skip >> 2) - 1) >> 8), p);
+	  bfd_put_8 (abfd, (skip >> 2) - 1, p + 1);
+	  p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 2, queue);
+	}
+      /* Handle it with a three byte R_NO_RELOCATION entry.  */
+      else
+	{
+	  bfd_put_8 (abfd, R_NO_RELOCATION + 28 + (((skip >> 2) - 1) >> 16), p);
+	  bfd_put_16 (abfd, (bfd_vma) (skip >> 2) - 1, p + 1);
+	  p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 3, queue);
+	}
+    }
+  /* Ugh.  Punt and use a 4 byte entry.  */
+  else if (skip > 0)
+    {
+      bfd_put_8 (abfd, R_NO_RELOCATION + 31, p);
+      bfd_put_8 (abfd, (skip - 1) >> 16, p + 1);
+      bfd_put_16 (abfd, (bfd_vma) skip - 1, p + 2);
+      p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 4, queue);
+    }
+  return p;
+}
+
+/* Emit the proper R_DATA_OVERRIDE fixups to handle a nonzero addend
+   from a BFD relocation.  Update the size of the subspace relocation
+   stream via SUBSPACE_RELOC_SIZE_P; also return the current pointer
+   into the relocation stream.  */
+
+static unsigned char *
+som_reloc_addend (bfd *abfd,
+		  bfd_vma addend,
+		  unsigned char *p,
+		  unsigned int *subspace_reloc_sizep,
+		  struct reloc_queue *queue)
+{
+  if (addend + 0x80 < 0x100)
+    {
+      bfd_put_8 (abfd, R_DATA_OVERRIDE + 1, p);
+      bfd_put_8 (abfd, addend, p + 1);
+      p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 2, queue);
+    }
+  else if (addend + 0x8000 < 0x10000)
+    {
+      bfd_put_8 (abfd, R_DATA_OVERRIDE + 2, p);
+      bfd_put_16 (abfd, addend, p + 1);
+      p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 3, queue);
+    }
+  else if (addend + 0x800000 < 0x1000000)
+    {
+      bfd_put_8 (abfd, R_DATA_OVERRIDE + 3, p);
+      bfd_put_8 (abfd, addend >> 16, p + 1);
+      bfd_put_16 (abfd, addend, p + 2);
+      p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 4, queue);
+    }
+  else
+    {
+      bfd_put_8 (abfd, R_DATA_OVERRIDE + 4, p);
+      bfd_put_32 (abfd, addend, p + 1);
+      p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 5, queue);
+    }
+  return p;
+}
+
+/* Handle a single function call relocation.  */
+
+static unsigned char *
+som_reloc_call (bfd *abfd,
+		unsigned char *p,
+		unsigned int *subspace_reloc_sizep,
+		arelent *bfd_reloc,
+		int sym_num,
+		struct reloc_queue *queue)
+{
+  int arg_bits = HPPA_R_ARG_RELOC (bfd_reloc->addend);
+  int rtn_bits = arg_bits & 0x3;
+  int type, done = 0;
+
+  /* You'll never believe all this is necessary to handle relocations
+     for function calls.  Having to compute and pack the argument
+     relocation bits is the real nightmare.
+
+     If you're interested in how this works, just forget it.  You really
+     do not want to know about this braindamage.  */
+
+  /* First see if this can be done with a "simple" relocation.  Simple
+     relocations have a symbol number < 0x100 and have simple encodings
+     of argument relocations.  */
+
+  if (sym_num < 0x100)
+    {
+      switch (arg_bits)
+	{
+	case 0:
+	case 1:
+	  type = 0;
+	  break;
+	case 1 << 8:
+	case 1 << 8 | 1:
+	  type = 1;
+	  break;
+	case 1 << 8 | 1 << 6:
+	case 1 << 8 | 1 << 6 | 1:
+	  type = 2;
+	  break;
+	case 1 << 8 | 1 << 6 | 1 << 4:
+	case 1 << 8 | 1 << 6 | 1 << 4 | 1:
+	  type = 3;
+	  break;
+	case 1 << 8 | 1 << 6 | 1 << 4 | 1 << 2:
+	case 1 << 8 | 1 << 6 | 1 << 4 | 1 << 2 | 1:
+	  type = 4;
+	  break;
+	default:
+	  /* Not one of the easy encodings.  This will have to be
+	     handled by the more complex code below.  */
+	  type = -1;
+	  break;
+	}
+      if (type != -1)
+	{
+	  /* Account for the return value too.  */
+	  if (rtn_bits)
+	    type += 5;
+
+	  /* Emit a 2 byte relocation.  Then see if it can be handled
+	     with a relocation which is already in the relocation queue.  */
+	  bfd_put_8 (abfd, bfd_reloc->howto->type + type, p);
+	  bfd_put_8 (abfd, sym_num, p + 1);
+	  p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 2, queue);
+	  done = 1;
+	}
+    }
+
+  /* If this could not be handled with a simple relocation, then do a hard
+     one.  Hard relocations occur if the symbol number was too high or if
+     the encoding of argument relocation bits is too complex.  */
+  if (! done)
+    {
+      /* Don't ask about these magic sequences.  I took them straight
+	 from gas-1.36 which took them from the a.out man page.  */
+      type = rtn_bits;
+      if ((arg_bits >> 6 & 0xf) == 0xe)
+	type += 9 * 40;
+      else
+	type += (3 * (arg_bits >> 8 & 3) + (arg_bits >> 6 & 3)) * 40;
+      if ((arg_bits >> 2 & 0xf) == 0xe)
+	type += 9 * 4;
+      else
+	type += (3 * (arg_bits >> 4 & 3) + (arg_bits >> 2 & 3)) * 4;
+
+      /* Output the first two bytes of the relocation.  These describe
+	 the length of the relocation and encoding style.  */
+      bfd_put_8 (abfd, bfd_reloc->howto->type + 10
+		 + 2 * (sym_num >= 0x100) + (type >= 0x100),
+		 p);
+      bfd_put_8 (abfd, type, p + 1);
+
+      /* Now output the symbol index and see if this bizarre relocation
+	 just happened to be in the relocation queue.  */
+      if (sym_num < 0x100)
+	{
+	  bfd_put_8 (abfd, sym_num, p + 2);
+	  p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 3, queue);
+	}
+      else
+	{
+	  bfd_put_8 (abfd, sym_num >> 16, p + 2);
+	  bfd_put_16 (abfd, (bfd_vma) sym_num, p + 3);
+	  p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 5, queue);
+	}
+    }
+  return p;
+}
+
+/* Return the logarithm of X, base 2, considering X unsigned,
+   if X is a power of 2.  Otherwise, returns -1.  */
+
+static int
+exact_log2 (unsigned int x)
+{
+  int log = 0;
+
+  /* Test for 0 or a power of 2.  */
+  if (x == 0 || x != (x & -x))
+    return -1;
+
+  while ((x >>= 1) != 0)
+    log++;
+  return log;
+}
+
+static bfd_reloc_status_type
+hppa_som_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+		arelent *reloc_entry,
+		asymbol *symbol_in ATTRIBUTE_UNUSED,
+		void *data ATTRIBUTE_UNUSED,
+		asection *input_section,
+		bfd *output_bfd,
+		char **error_message ATTRIBUTE_UNUSED)
+{
+  if (output_bfd)
+    reloc_entry->address += input_section->output_offset;
+
+  return bfd_reloc_ok;
+}
+
+/* Given a generic HPPA relocation type, the instruction format,
+   and a field selector, return one or more appropriate SOM relocations.  */
+
+int **
+hppa_som_gen_reloc_type (bfd *abfd,
+			 int base_type,
+			 int format,
+			 enum hppa_reloc_field_selector_type_alt field,
+			 int sym_diff,
+			 asymbol *sym)
+{
+  int *final_type, **final_types;
+
+  final_types = bfd_alloc (abfd, (bfd_size_type) sizeof (int *) * 6);
+  final_type = bfd_alloc (abfd, (bfd_size_type) sizeof (int));
+  if (!final_types || !final_type)
+    return NULL;
+
+  /* The field selector may require additional relocations to be
+     generated.  It's impossible to know at this moment if additional
+     relocations will be needed, so we make them.  The code to actually
+     write the relocation/fixup stream is responsible for removing
+     any redundant relocations.  */
+  switch (field)
+    {
+    case e_fsel:
+    case e_psel:
+    case e_lpsel:
+    case e_rpsel:
+      final_types[0] = final_type;
+      final_types[1] = NULL;
+      final_types[2] = NULL;
+      *final_type = base_type;
+      break;
+
+    case e_tsel:
+    case e_ltsel:
+    case e_rtsel:
+      final_types[0] = bfd_alloc (abfd, (bfd_size_type) sizeof (int));
+      if (!final_types[0])
+	return NULL;
+      if (field == e_tsel)
+	*final_types[0] = R_FSEL;
+      else if (field == e_ltsel)
+	*final_types[0] = R_LSEL;
+      else
+	*final_types[0] = R_RSEL;
+      final_types[1] = final_type;
+      final_types[2] = NULL;
+      *final_type = base_type;
+      break;
+
+    case e_lssel:
+    case e_rssel:
+      final_types[0] = bfd_alloc (abfd, (bfd_size_type) sizeof (int));
+      if (!final_types[0])
+	return NULL;
+      *final_types[0] = R_S_MODE;
+      final_types[1] = final_type;
+      final_types[2] = NULL;
+      *final_type = base_type;
+      break;
+
+    case e_lsel:
+    case e_rsel:
+      final_types[0] = bfd_alloc (abfd, (bfd_size_type) sizeof (int));
+      if (!final_types[0])
+	return NULL;
+      *final_types[0] = R_N_MODE;
+      final_types[1] = final_type;
+      final_types[2] = NULL;
+      *final_type = base_type;
+      break;
+
+    case e_ldsel:
+    case e_rdsel:
+      final_types[0] = bfd_alloc (abfd, (bfd_size_type) sizeof (int));
+      if (!final_types[0])
+	return NULL;
+      *final_types[0] = R_D_MODE;
+      final_types[1] = final_type;
+      final_types[2] = NULL;
+      *final_type = base_type;
+      break;
+
+    case e_lrsel:
+    case e_rrsel:
+      final_types[0] = bfd_alloc (abfd, (bfd_size_type) sizeof (int));
+      if (!final_types[0])
+	return NULL;
+      *final_types[0] = R_R_MODE;
+      final_types[1] = final_type;
+      final_types[2] = NULL;
+      *final_type = base_type;
+      break;
+
+    case e_nsel:
+      final_types[0] = bfd_alloc (abfd, (bfd_size_type) sizeof (int));
+      if (!final_types[0])
+	return NULL;
+      *final_types[0] = R_N1SEL;
+      final_types[1] = final_type;
+      final_types[2] = NULL;
+      *final_type = base_type;
+      break;
+
+    case e_nlsel:
+    case e_nlrsel:
+      final_types[0] = bfd_alloc (abfd, (bfd_size_type) sizeof (int));
+      if (!final_types[0])
+	return NULL;
+      *final_types[0] = R_N0SEL;
+      final_types[1] = bfd_alloc (abfd, (bfd_size_type) sizeof (int));
+      if (!final_types[1])
+	return NULL;
+      if (field == e_nlsel)
+	*final_types[1] = R_N_MODE;
+      else
+	*final_types[1] = R_R_MODE;
+      final_types[2] = final_type;
+      final_types[3] = NULL;
+      *final_type = base_type;
+      break;
+
+    /* FIXME: These two field selectors are not currently supported.  */
+    case e_ltpsel:
+    case e_rtpsel:
+      abort ();
+    }
+
+  switch (base_type)
+    {
+    case R_HPPA:
+      /* The difference of two symbols needs *very* special handling.  */
+      if (sym_diff)
+	{
+	  bfd_size_type amt = sizeof (int);
+
+	  final_types[0] = bfd_alloc (abfd, amt);
+	  final_types[1] = bfd_alloc (abfd, amt);
+	  final_types[2] = bfd_alloc (abfd, amt);
+	  final_types[3] = bfd_alloc (abfd, amt);
+	  if (!final_types[0] || !final_types[1] || !final_types[2])
+	    return NULL;
+	  if (field == e_fsel)
+	    *final_types[0] = R_FSEL;
+	  else if (field == e_rsel)
+	    *final_types[0] = R_RSEL;
+	  else if (field == e_lsel)
+	    *final_types[0] = R_LSEL;
+	  *final_types[1] = R_COMP2;
+	  *final_types[2] = R_COMP2;
+	  *final_types[3] = R_COMP1;
+	  final_types[4] = final_type;
+	  if (format == 32)
+	    *final_types[4] = R_DATA_EXPR;
+	  else
+	    *final_types[4] = R_CODE_EXPR;
+	  final_types[5] = NULL;
+	  break;
+	}
+      /* PLABELs get their own relocation type.  */
+      else if (field == e_psel
+	       || field == e_lpsel
+	       || field == e_rpsel)
+	{
+	  /* A PLABEL relocation that has a size of 32 bits must
+	     be a R_DATA_PLABEL.  All others are R_CODE_PLABELs.  */
+	  if (format == 32)
+	    *final_type = R_DATA_PLABEL;
+	  else
+	    *final_type = R_CODE_PLABEL;
+	}
+      /* PIC stuff.  */
+      else if (field == e_tsel
+	       || field == e_ltsel
+	       || field == e_rtsel)
+	*final_type = R_DLT_REL;
+      /* A relocation in the data space is always a full 32bits.  */
+      else if (format == 32)
+	{
+	  *final_type = R_DATA_ONE_SYMBOL;
+
+	  /* If there's no SOM symbol type associated with this BFD
+	     symbol, then set the symbol type to ST_DATA.
+
+	     Only do this if the type is going to default later when
+	     we write the object file.
+
+	     This is done so that the linker never encounters an
+	     R_DATA_ONE_SYMBOL reloc involving an ST_CODE symbol.
+
+	     This allows the compiler to generate exception handling
+	     tables.
+
+	     Note that one day we may need to also emit BEGIN_BRTAB and
+	     END_BRTAB to prevent the linker from optimizing away insns
+	     in exception handling regions.  */
+	  if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_UNKNOWN
+	      && (sym->flags & BSF_SECTION_SYM) == 0
+	      && (sym->flags & BSF_FUNCTION) == 0
+	      && ! bfd_is_com_section (sym->section))
+	    som_symbol_data (sym)->som_type = SYMBOL_TYPE_DATA;
+	}
+      break;
+
+    case R_HPPA_GOTOFF:
+      /* More PLABEL special cases.  */
+      if (field == e_psel
+	  || field == e_lpsel
+	  || field == e_rpsel)
+	*final_type = R_DATA_PLABEL;
+      else if (field == e_fsel && format == 32)
+	*final_type = R_DATA_GPREL;
+      break;
+
+    case R_HPPA_COMPLEX:
+      /* The difference of two symbols needs *very* special handling.  */
+      if (sym_diff)
+	{
+	  bfd_size_type amt = sizeof (int);
+
+	  final_types[0] = bfd_alloc (abfd, amt);
+	  final_types[1] = bfd_alloc (abfd, amt);
+	  final_types[2] = bfd_alloc (abfd, amt);
+	  final_types[3] = bfd_alloc (abfd, amt);
+	  if (!final_types[0] || !final_types[1] || !final_types[2])
+	    return NULL;
+	  if (field == e_fsel)
+	    *final_types[0] = R_FSEL;
+	  else if (field == e_rsel)
+	    *final_types[0] = R_RSEL;
+	  else if (field == e_lsel)
+	    *final_types[0] = R_LSEL;
+	  *final_types[1] = R_COMP2;
+	  *final_types[2] = R_COMP2;
+	  *final_types[3] = R_COMP1;
+	  final_types[4] = final_type;
+	  if (format == 32)
+	    *final_types[4] = R_DATA_EXPR;
+	  else
+	    *final_types[4] = R_CODE_EXPR;
+	  final_types[5] = NULL;
+	  break;
+	}
+      else
+	break;
+
+    case R_HPPA_NONE:
+    case R_HPPA_ABS_CALL:
+      /* Right now we can default all these.  */
+      break;
+
+    case R_HPPA_PCREL_CALL:
+      {
+#ifndef NO_PCREL_MODES
+	/* If we have short and long pcrel modes, then generate the proper
+	   mode selector, then the pcrel relocation.  Redundant selectors
+	   will be eliminated as the relocs are sized and emitted.  */
+	bfd_size_type amt = sizeof (int);
+
+	final_types[0] = bfd_alloc (abfd, amt);
+	if (!final_types[0])
+	  return NULL;
+	if (format == 17)
+	  *final_types[0] = R_SHORT_PCREL_MODE;
+	else
+	  *final_types[0] = R_LONG_PCREL_MODE;
+	final_types[1] = final_type;
+	final_types[2] = NULL;
+	*final_type = base_type;
+#endif
+	break;
+      }
+    }
+  return final_types;
+}
+
+/* Return the address of the correct entry in the PA SOM relocation
+   howto table.  */
+
+static reloc_howto_type *
+som_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			   bfd_reloc_code_real_type code)
+{
+  if ((int) code < (int) R_NO_RELOCATION + 255)
+    {
+      BFD_ASSERT ((int) som_hppa_howto_table[(int) code].type == (int) code);
+      return &som_hppa_howto_table[(int) code];
+    }
+
+  return NULL;
+}
+
+static reloc_howto_type *
+som_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			   const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (som_hppa_howto_table) / sizeof (som_hppa_howto_table[0]);
+       i++)
+    if (som_hppa_howto_table[i].name != NULL
+	&& strcasecmp (som_hppa_howto_table[i].name, r_name) == 0)
+      return &som_hppa_howto_table[i];
+
+  return NULL;
+}
+
+static void
+som_swap_clock_in (struct som_external_clock *src,
+                   struct som_clock *dst)
+{
+  dst->secs = bfd_getb32 (src->secs);
+  dst->nanosecs = bfd_getb32 (src->nanosecs);
+}
+
+static void
+som_swap_clock_out (struct som_clock *src,
+                    struct som_external_clock *dst)
+{
+  bfd_putb32 (src->secs, dst->secs);
+  bfd_putb32 (src->nanosecs, dst->nanosecs);
+}
+
+static void
+som_swap_header_in (struct som_external_header *src,
+                    struct som_header *dst)
+{
+  dst->system_id = bfd_getb16 (src->system_id);
+  dst->a_magic = bfd_getb16 (src->a_magic);
+  dst->version_id = bfd_getb32 (src->version_id);
+  som_swap_clock_in (&src->file_time, &dst->file_time);
+  dst->entry_space = bfd_getb32 (src->entry_space);
+  dst->entry_subspace = bfd_getb32 (src->entry_subspace);
+  dst->entry_offset = bfd_getb32 (src->entry_offset);
+  dst->aux_header_location = bfd_getb32 (src->aux_header_location);
+  dst->aux_header_size = bfd_getb32 (src->aux_header_size);
+  dst->som_length = bfd_getb32 (src->som_length);
+  dst->presumed_dp = bfd_getb32 (src->presumed_dp);
+  dst->space_location = bfd_getb32 (src->space_location);
+  dst->space_total = bfd_getb32 (src->space_total);
+  dst->subspace_location = bfd_getb32 (src->subspace_location);
+  dst->subspace_total = bfd_getb32 (src->subspace_total);
+  dst->loader_fixup_location = bfd_getb32 (src->loader_fixup_location);
+  dst->loader_fixup_total = bfd_getb32 (src->loader_fixup_total);
+  dst->space_strings_location = bfd_getb32 (src->space_strings_location);
+  dst->space_strings_size = bfd_getb32 (src->space_strings_size);
+  dst->init_array_location = bfd_getb32 (src->init_array_location);
+  dst->init_array_total = bfd_getb32 (src->init_array_total);
+  dst->compiler_location = bfd_getb32 (src->compiler_location);
+  dst->compiler_total = bfd_getb32 (src->compiler_total);
+  dst->symbol_location = bfd_getb32 (src->symbol_location);
+  dst->symbol_total = bfd_getb32 (src->symbol_total);
+  dst->fixup_request_location = bfd_getb32 (src->fixup_request_location);
+  dst->fixup_request_total = bfd_getb32 (src->fixup_request_total);
+  dst->symbol_strings_location = bfd_getb32 (src->symbol_strings_location);
+  dst->symbol_strings_size = bfd_getb32 (src->symbol_strings_size);
+  dst->unloadable_sp_location = bfd_getb32 (src->unloadable_sp_location);
+  dst->unloadable_sp_size = bfd_getb32 (src->unloadable_sp_size);
+  dst->checksum = bfd_getb32 (src->checksum);
+}
+
+static void
+som_swap_header_out (struct som_header *src,
+                    struct som_external_header *dst)
+{
+  bfd_putb16 (src->system_id, dst->system_id);
+  bfd_putb16 (src->a_magic, dst->a_magic);
+  bfd_putb32 (src->version_id, dst->version_id);
+  som_swap_clock_out (&src->file_time, &dst->file_time);
+  bfd_putb32 (src->entry_space, dst->entry_space);
+  bfd_putb32 (src->entry_subspace, dst->entry_subspace);
+  bfd_putb32 (src->entry_offset, dst->entry_offset);
+  bfd_putb32 (src->aux_header_location, dst->aux_header_location);
+  bfd_putb32 (src->aux_header_size, dst->aux_header_size);
+  bfd_putb32 (src->som_length, dst->som_length);
+  bfd_putb32 (src->presumed_dp, dst->presumed_dp);
+  bfd_putb32 (src->space_location, dst->space_location);
+  bfd_putb32 (src->space_total, dst->space_total);
+  bfd_putb32 (src->subspace_location, dst->subspace_location);
+  bfd_putb32 (src->subspace_total, dst->subspace_total);
+  bfd_putb32 (src->loader_fixup_location, dst->loader_fixup_location);
+  bfd_putb32 (src->loader_fixup_total, dst->loader_fixup_total);
+  bfd_putb32 (src->space_strings_location, dst->space_strings_location);
+  bfd_putb32 (src->space_strings_size, dst->space_strings_size);
+  bfd_putb32 (src->init_array_location, dst->init_array_location);
+  bfd_putb32 (src->init_array_total, dst->init_array_total);
+  bfd_putb32 (src->compiler_location, dst->compiler_location);
+  bfd_putb32 (src->compiler_total, dst->compiler_total);
+  bfd_putb32 (src->symbol_location, dst->symbol_location);
+  bfd_putb32 (src->symbol_total, dst->symbol_total);
+  bfd_putb32 (src->fixup_request_location, dst->fixup_request_location);
+  bfd_putb32 (src->fixup_request_total, dst->fixup_request_total);
+  bfd_putb32 (src->symbol_strings_location, dst->symbol_strings_location);
+  bfd_putb32 (src->symbol_strings_size, dst->symbol_strings_size);
+  bfd_putb32 (src->unloadable_sp_location, dst->unloadable_sp_location);
+  bfd_putb32 (src->unloadable_sp_size, dst->unloadable_sp_size);
+  bfd_putb32 (src->checksum, dst->checksum);
+}
+
+static void
+som_swap_space_dictionary_in (struct som_external_space_dictionary_record *src,
+                              struct som_space_dictionary_record *dst)
+{
+  unsigned int flags;
+
+  dst->name = bfd_getb32 (src->name);
+  flags = bfd_getb32 (src->flags);
+  dst->is_loadable = (flags & SOM_SPACE_IS_LOADABLE) != 0;
+  dst->is_defined = (flags & SOM_SPACE_IS_DEFINED) != 0;
+  dst->is_private = (flags & SOM_SPACE_IS_PRIVATE) != 0;
+  dst->has_intermediate_code = (flags & SOM_SPACE_HAS_INTERMEDIATE_CODE) != 0;
+  dst->is_tspecific = (flags & SOM_SPACE_IS_TSPECIFIC) != 0;
+  dst->reserved = 0;
+  dst->sort_key = (flags >> SOM_SPACE_SORT_KEY_SH) & SOM_SPACE_SORT_KEY_MASK;
+  dst->reserved2 = 0;
+  dst->space_number = bfd_getb32 (src->space_number);
+  dst->subspace_index = bfd_getb32 (src->subspace_index);
+  dst->subspace_quantity = bfd_getb32 (src->subspace_quantity);
+  dst->loader_fix_index = bfd_getb32 (src->loader_fix_index);
+  dst->loader_fix_quantity = bfd_getb32 (src->loader_fix_quantity);
+  dst->init_pointer_index = bfd_getb32 (src->init_pointer_index);
+  dst->init_pointer_quantity = bfd_getb32 (src->init_pointer_quantity);
+}
+
+static void
+som_swap_space_dictionary_out (struct som_space_dictionary_record *src,
+                               struct som_external_space_dictionary_record *dst)
+{
+  unsigned int flags;
+
+  bfd_putb32 (src->name, dst->name);
+
+  flags = 0;
+  if (src->is_loadable)
+    flags |= SOM_SPACE_IS_LOADABLE;
+  if (src->is_defined)
+    flags |= SOM_SPACE_IS_DEFINED;
+  if (src->is_private)
+    flags |= SOM_SPACE_IS_PRIVATE;
+  if (src->has_intermediate_code)
+    flags |= SOM_SPACE_HAS_INTERMEDIATE_CODE;
+  if (src->is_tspecific)
+    flags |= SOM_SPACE_IS_TSPECIFIC;
+  flags |= (src->sort_key & SOM_SPACE_SORT_KEY_MASK) << SOM_SPACE_SORT_KEY_SH;
+  bfd_putb32 (flags, dst->flags);
+  bfd_putb32 (src->space_number, dst->space_number);
+  bfd_putb32 (src->subspace_index, dst->subspace_index);
+  bfd_putb32 (src->subspace_quantity, dst->subspace_quantity);
+  bfd_putb32 (src->loader_fix_index, dst->loader_fix_index);
+  bfd_putb32 (src->loader_fix_quantity, dst->loader_fix_quantity);
+  bfd_putb32 (src->init_pointer_index, dst->init_pointer_index);
+  bfd_putb32 (src->init_pointer_quantity, dst->init_pointer_quantity);
+}
+
+static void
+som_swap_subspace_dictionary_in
+  (struct som_external_subspace_dictionary_record *src,
+   struct som_subspace_dictionary_record *dst)
+{
+  unsigned int flags;
+  dst->space_index = bfd_getb32 (src->space_index);
+  flags = bfd_getb32 (src->flags);
+  dst->access_control_bits = (flags >> SOM_SUBSPACE_ACCESS_CONTROL_BITS_SH)
+    & SOM_SUBSPACE_ACCESS_CONTROL_BITS_MASK;
+  dst->memory_resident = (flags & SOM_SUBSPACE_MEMORY_RESIDENT) != 0;
+  dst->dup_common = (flags & SOM_SUBSPACE_DUP_COMMON) != 0;
+  dst->is_common = (flags & SOM_SUBSPACE_IS_COMMON) != 0;
+  dst->is_loadable = (flags & SOM_SUBSPACE_IS_LOADABLE) != 0;
+  dst->quadrant = (flags >> SOM_SUBSPACE_QUADRANT_SH)
+    & SOM_SUBSPACE_QUADRANT_MASK;
+  dst->initially_frozen = (flags & SOM_SUBSPACE_INITIALLY_FROZEN) != 0;
+  dst->is_first = (flags & SOM_SUBSPACE_IS_FIRST) != 0;
+  dst->code_only = (flags & SOM_SUBSPACE_CODE_ONLY) != 0;
+  dst->sort_key = (flags >> SOM_SUBSPACE_SORT_KEY_SH)
+    & SOM_SUBSPACE_SORT_KEY_MASK;
+  dst->replicate_init = (flags & SOM_SUBSPACE_REPLICATE_INIT) != 0;
+  dst->continuation = (flags & SOM_SUBSPACE_CONTINUATION) != 0;
+  dst->is_tspecific = (flags & SOM_SUBSPACE_IS_TSPECIFIC) != 0;
+  dst->is_comdat = (flags & SOM_SUBSPACE_IS_COMDAT) != 0;
+  dst->reserved = 0;
+  dst->file_loc_init_value = bfd_getb32 (src->file_loc_init_value);
+  dst->initialization_length = bfd_getb32 (src->initialization_length);
+  dst->subspace_start = bfd_getb32 (src->subspace_start);
+  dst->subspace_length = bfd_getb32 (src->subspace_length);
+  dst->alignment = bfd_getb32 (src->alignment);
+  dst->name = bfd_getb32 (src->name);
+  dst->fixup_request_index = bfd_getb32 (src->fixup_request_index);
+  dst->fixup_request_quantity = bfd_getb32 (src->fixup_request_quantity);
+}
+
+static void
+som_swap_subspace_dictionary_record_out
+  (struct som_subspace_dictionary_record *src,
+   struct som_external_subspace_dictionary_record *dst)
+{
+  unsigned int flags;
+
+  bfd_putb32 (src->space_index, dst->space_index);
+  flags = (src->access_control_bits & SOM_SUBSPACE_ACCESS_CONTROL_BITS_MASK)
+    << SOM_SUBSPACE_ACCESS_CONTROL_BITS_SH;
+  if (src->memory_resident)
+    flags |= SOM_SUBSPACE_MEMORY_RESIDENT;
+  if (src->dup_common)
+    flags |= SOM_SUBSPACE_DUP_COMMON;
+  if (src->is_common)
+    flags |= SOM_SUBSPACE_IS_COMMON;
+  if (src->is_loadable)
+    flags |= SOM_SUBSPACE_IS_LOADABLE;
+  flags |= (src->quadrant & SOM_SUBSPACE_QUADRANT_MASK)
+    << SOM_SUBSPACE_QUADRANT_SH;
+  if (src->initially_frozen)
+    flags |= SOM_SUBSPACE_INITIALLY_FROZEN;
+  if (src->is_first)
+    flags |= SOM_SUBSPACE_IS_FIRST;
+  if (src->code_only)
+    flags |= SOM_SUBSPACE_CODE_ONLY;
+  flags |= (src->sort_key & SOM_SUBSPACE_SORT_KEY_MASK)
+    << SOM_SUBSPACE_SORT_KEY_SH;
+  if (src->replicate_init)
+    flags |= SOM_SUBSPACE_REPLICATE_INIT;
+  if (src->continuation)
+    flags |= SOM_SUBSPACE_CONTINUATION;
+  if (src->is_tspecific)
+    flags |= SOM_SUBSPACE_IS_TSPECIFIC;
+  if (src->is_comdat)
+    flags |= SOM_SUBSPACE_IS_COMDAT;
+  bfd_putb32 (flags, dst->flags);
+  bfd_putb32 (src->file_loc_init_value, dst->file_loc_init_value);
+  bfd_putb32 (src->initialization_length, dst->initialization_length);
+  bfd_putb32 (src->subspace_start, dst->subspace_start);
+  bfd_putb32 (src->subspace_length, dst->subspace_length);
+  bfd_putb32 (src->alignment, dst->alignment);
+  bfd_putb32 (src->name, dst->name);
+  bfd_putb32 (src->fixup_request_index, dst->fixup_request_index);
+  bfd_putb32 (src->fixup_request_quantity, dst->fixup_request_quantity);
+}
+
+static void
+som_swap_aux_id_in (struct som_external_aux_id *src,
+                    struct som_aux_id *dst)
+{
+  unsigned int flags = bfd_getb32 (src->flags);
+
+  dst->mandatory = (flags & SOM_AUX_ID_MANDATORY) != 0;
+  dst->copy = (flags & SOM_AUX_ID_COPY) != 0;
+  dst->append = (flags & SOM_AUX_ID_APPEND) != 0;
+  dst->ignore = (flags & SOM_AUX_ID_IGNORE) != 0;
+  dst->type = (flags >> SOM_AUX_ID_TYPE_SH) & SOM_AUX_ID_TYPE_MASK;
+  dst->length = bfd_getb32 (src->length);
+}
+
+static void
+som_swap_aux_id_out (struct som_aux_id *src,
+                    struct som_external_aux_id *dst)
+{
+  unsigned int flags = 0;
+
+  if (src->mandatory)
+    flags |= SOM_AUX_ID_MANDATORY;
+  if (src->copy)
+    flags |= SOM_AUX_ID_COPY;
+  if (src->append)
+    flags |= SOM_AUX_ID_APPEND;
+  if (src->ignore)
+    flags |= SOM_AUX_ID_IGNORE;
+  flags |= (src->type & SOM_AUX_ID_TYPE_MASK) << SOM_AUX_ID_TYPE_SH;
+  bfd_putb32 (flags, dst->flags);
+  bfd_putb32 (src->length, dst->length);
+}
+
+static void
+som_swap_string_auxhdr_out (struct som_string_auxhdr *src,
+                            struct som_external_string_auxhdr *dst)
+{
+  som_swap_aux_id_out (&src->header_id, &dst->header_id);
+  bfd_putb32 (src->string_length, dst->string_length);
+}
+
+static void
+som_swap_compilation_unit_out (struct som_compilation_unit *src,
+                               struct som_external_compilation_unit *dst)
+{
+  bfd_putb32 (src->name.strx, dst->name);
+  bfd_putb32 (src->language_name.strx, dst->language_name);
+  bfd_putb32 (src->product_id.strx, dst->product_id);
+  bfd_putb32 (src->version_id.strx, dst->version_id);
+  bfd_putb32 (src->flags, dst->flags);
+  som_swap_clock_out (&src->compile_time, &dst->compile_time);
+  som_swap_clock_out (&src->source_time, &dst->source_time);
+}
+
+static void
+som_swap_exec_auxhdr_in (struct som_external_exec_auxhdr *src,
+                         struct som_exec_auxhdr *dst)
+{
+  som_swap_aux_id_in (&src->som_auxhdr, &dst->som_auxhdr);
+  dst->exec_tsize = bfd_getb32 (src->exec_tsize);
+  dst->exec_tmem = bfd_getb32 (src->exec_tmem);
+  dst->exec_tfile = bfd_getb32 (src->exec_tfile);
+  dst->exec_dsize = bfd_getb32 (src->exec_dsize);
+  dst->exec_dmem = bfd_getb32 (src->exec_dmem);
+  dst->exec_dfile = bfd_getb32 (src->exec_dfile);
+  dst->exec_bsize = bfd_getb32 (src->exec_bsize);
+  dst->exec_entry = bfd_getb32 (src->exec_entry);
+  dst->exec_flags = bfd_getb32 (src->exec_flags);
+  dst->exec_bfill = bfd_getb32 (src->exec_bfill);
+}
+
+static void
+som_swap_exec_auxhdr_out (struct som_exec_auxhdr *src,
+                         struct som_external_exec_auxhdr *dst)
+{
+  som_swap_aux_id_out (&src->som_auxhdr, &dst->som_auxhdr);
+  bfd_putb32 (src->exec_tsize, dst->exec_tsize);
+  bfd_putb32 (src->exec_tmem, dst->exec_tmem);
+  bfd_putb32 (src->exec_tfile, dst->exec_tfile);
+  bfd_putb32 (src->exec_dsize, dst->exec_dsize);
+  bfd_putb32 (src->exec_dmem, dst->exec_dmem);
+  bfd_putb32 (src->exec_dfile, dst->exec_dfile);
+  bfd_putb32 (src->exec_bsize, dst->exec_bsize);
+  bfd_putb32 (src->exec_entry, dst->exec_entry);
+  bfd_putb32 (src->exec_flags, dst->exec_flags);
+  bfd_putb32 (src->exec_bfill, dst->exec_bfill);
+}
+
+static void
+som_swap_lst_header_in (struct som_external_lst_header *src,
+                        struct som_lst_header *dst)
+{
+  dst->system_id = bfd_getb16 (src->system_id);
+  dst->a_magic = bfd_getb16 (src->a_magic);
+  dst->version_id = bfd_getb32 (src->version_id);
+  som_swap_clock_in (&src->file_time, &dst->file_time);
+  dst->hash_loc = bfd_getb32 (src->hash_loc);
+  dst->hash_size = bfd_getb32 (src->hash_size);
+  dst->module_count = bfd_getb32 (src->module_count);
+  dst->module_limit = bfd_getb32 (src->module_limit);
+  dst->dir_loc = bfd_getb32 (src->dir_loc);
+  dst->export_loc = bfd_getb32 (src->export_loc);
+  dst->export_count = bfd_getb32 (src->export_count);
+  dst->import_loc = bfd_getb32 (src->import_loc);
+  dst->aux_loc = bfd_getb32 (src->aux_loc);
+  dst->aux_size = bfd_getb32 (src->aux_size);
+  dst->string_loc = bfd_getb32 (src->string_loc);
+  dst->string_size = bfd_getb32 (src->string_size);
+  dst->free_list = bfd_getb32 (src->free_list);
+  dst->file_end = bfd_getb32 (src->file_end);
+  dst->checksum = bfd_getb32 (src->checksum);
+}
+
+/* Perform some initialization for an object.  Save results of this
+   initialization in the BFD.  */
+
+static const bfd_target *
+som_object_setup (bfd *abfd,
+		  struct som_header *file_hdrp,
+		  struct som_exec_auxhdr *aux_hdrp,
+		  unsigned long current_offset)
+{
+  asection *section;
+
+  /* som_mkobject will set bfd_error if som_mkobject fails.  */
+  if (! som_mkobject (abfd))
+    return NULL;
+
+  /* Set BFD flags based on what information is available in the SOM.  */
+  abfd->flags = BFD_NO_FLAGS;
+  if (file_hdrp->symbol_total)
+    abfd->flags |= HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS;
+
+  switch (file_hdrp->a_magic)
+    {
+    case DEMAND_MAGIC:
+      abfd->flags |= (D_PAGED | WP_TEXT | EXEC_P);
+      break;
+    case SHARE_MAGIC:
+      abfd->flags |= (WP_TEXT | EXEC_P);
+      break;
+    case EXEC_MAGIC:
+      abfd->flags |= (EXEC_P);
+      break;
+    case RELOC_MAGIC:
+      abfd->flags |= HAS_RELOC;
+      break;
+#ifdef SHL_MAGIC
+    case SHL_MAGIC:
+#endif
+#ifdef DL_MAGIC
+    case DL_MAGIC:
+#endif
+      abfd->flags |= DYNAMIC;
+      break;
+
+    default:
+      break;
+    }
+
+  /* Save the auxiliary header.  */
+  obj_som_exec_hdr (abfd) = aux_hdrp;
+
+  /* Allocate space to hold the saved exec header information.  */
+  obj_som_exec_data (abfd) = bfd_zalloc (abfd, (bfd_size_type) sizeof (struct som_exec_data));
+  if (obj_som_exec_data (abfd) == NULL)
+    return NULL;
+
+  /* The braindamaged OSF1 linker switched exec_flags and exec_entry!
+
+     We used to identify OSF1 binaries based on NEW_VERSION_ID, but
+     apparently the latest HPUX linker is using NEW_VERSION_ID now.
+
+     It's about time, OSF has used the new id since at least 1992;
+     HPUX didn't start till nearly 1995!.
+
+     The new approach examines the entry field for an executable.  If
+     it is not 4-byte aligned then it's not a proper code address and
+     we guess it's really the executable flags.  For a main program,
+     we also consider zero to be indicative of a buggy linker, since
+     that is not a valid entry point.  The entry point for a shared
+     library, however, can be zero so we do not consider that to be
+     indicative of a buggy linker.  */
+  if (aux_hdrp)
+    {
+      int found = 0;
+
+      for (section = abfd->sections; section; section = section->next)
+	{
+	  bfd_vma entry;
+
+	  if ((section->flags & SEC_CODE) == 0)
+	    continue;
+	  entry = aux_hdrp->exec_entry + aux_hdrp->exec_tmem;
+	  if (entry >= section->vma
+	      && entry < section->vma + section->size)
+	    found = 1;
+	}
+      if ((aux_hdrp->exec_entry == 0 && !(abfd->flags & DYNAMIC))
+	  || (aux_hdrp->exec_entry & 0x3) != 0
+	  || ! found)
+	{
+	  bfd_get_start_address (abfd) = aux_hdrp->exec_flags;
+	  obj_som_exec_data (abfd)->exec_flags = aux_hdrp->exec_entry;
+	}
+      else
+	{
+	  bfd_get_start_address (abfd) = aux_hdrp->exec_entry + current_offset;
+	  obj_som_exec_data (abfd)->exec_flags = aux_hdrp->exec_flags;
+	}
+    }
+
+  obj_som_exec_data (abfd)->version_id = file_hdrp->version_id;
+
+  bfd_default_set_arch_mach (abfd, bfd_arch_hppa, pa10);
+  bfd_get_symcount (abfd) = file_hdrp->symbol_total;
+
+  /* Initialize the saved symbol table and string table to NULL.
+     Save important offsets and sizes from the SOM header into
+     the BFD.  */
+  obj_som_stringtab (abfd) = NULL;
+  obj_som_symtab (abfd) = NULL;
+  obj_som_sorted_syms (abfd) = NULL;
+  obj_som_stringtab_size (abfd) = file_hdrp->symbol_strings_size;
+  obj_som_sym_filepos (abfd) = file_hdrp->symbol_location + current_offset;
+  obj_som_str_filepos (abfd) = (file_hdrp->symbol_strings_location
+				+ current_offset);
+  obj_som_reloc_filepos (abfd) = (file_hdrp->fixup_request_location
+				  + current_offset);
+  obj_som_exec_data (abfd)->system_id = file_hdrp->system_id;
+
+  return abfd->xvec;
+}
+
+/* Convert all of the space and subspace info into BFD sections.  Each space
+   contains a number of subspaces, which in turn describe the mapping between
+   regions of the exec file, and the address space that the program runs in.
+   BFD sections which correspond to spaces will overlap the sections for the
+   associated subspaces.  */
+
+static bfd_boolean
+setup_sections (bfd *abfd,
+		struct som_header *file_hdr,
+		unsigned long current_offset)
+{
+  char *space_strings;
+  unsigned int space_index, i;
+  unsigned int total_subspaces = 0;
+  asection **subspace_sections = NULL;
+  asection *section;
+  bfd_size_type amt;
+
+  /* First, read in space names.  */
+  amt = file_hdr->space_strings_size;
+  space_strings = bfd_malloc (amt);
+  if (!space_strings && amt != 0)
+    goto error_return;
+
+  if (bfd_seek (abfd, current_offset + file_hdr->space_strings_location,
+		SEEK_SET) != 0)
+    goto error_return;
+  if (bfd_bread (space_strings, amt, abfd) != amt)
+    goto error_return;
+
+  /* Loop over all of the space dictionaries, building up sections.  */
+  for (space_index = 0; space_index < file_hdr->space_total; space_index++)
+    {
+      struct som_space_dictionary_record space;
+      struct som_external_space_dictionary_record ext_space;
+      char *space_name;
+      struct som_external_subspace_dictionary_record ext_subspace;
+      struct som_subspace_dictionary_record subspace, save_subspace;
+      unsigned int subspace_index;
+      asection *space_asect;
+      bfd_size_type space_size = 0;
+      char *newname;
+
+      /* Read the space dictionary element.  */
+      if (bfd_seek (abfd,
+		    (current_offset + file_hdr->space_location
+		     + space_index * sizeof (ext_space)),
+		    SEEK_SET) != 0)
+	goto error_return;
+      amt = sizeof ext_space;
+      if (bfd_bread (&ext_space, amt, abfd) != amt)
+	goto error_return;
+
+      som_swap_space_dictionary_in (&ext_space, &space);
+
+      /* Setup the space name string.  */
+      space_name = space.name + space_strings;
+
+      /* Make a section out of it.  */
+      amt = strlen (space_name) + 1;
+      newname = bfd_alloc (abfd, amt);
+      if (!newname)
+	goto error_return;
+      strcpy (newname, space_name);
+
+      space_asect = bfd_make_section_anyway (abfd, newname);
+      if (!space_asect)
+	goto error_return;
+
+      if (space.is_loadable == 0)
+	space_asect->flags |= SEC_DEBUGGING;
+
+      /* Set up all the attributes for the space.  */
+      if (! bfd_som_set_section_attributes (space_asect, space.is_defined,
+					    space.is_private, space.sort_key,
+					    space.space_number))
+	goto error_return;
+
+      /* If the space has no subspaces, then we're done.  */
+      if (space.subspace_quantity == 0)
+	continue;
+
+      /* Now, read in the first subspace for this space.  */
+      if (bfd_seek (abfd,
+		    (current_offset + file_hdr->subspace_location
+		     + space.subspace_index * sizeof ext_subspace),
+		    SEEK_SET) != 0)
+	goto error_return;
+      amt = sizeof ext_subspace;
+      if (bfd_bread (&ext_subspace, amt, abfd) != amt)
+	goto error_return;
+      /* Seek back to the start of the subspaces for loop below.  */
+      if (bfd_seek (abfd,
+		    (current_offset + file_hdr->subspace_location
+		     + space.subspace_index * sizeof ext_subspace),
+		    SEEK_SET) != 0)
+	goto error_return;
+
+      som_swap_subspace_dictionary_in (&ext_subspace, &subspace);
+
+      /* Setup the start address and file loc from the first subspace
+	 record.  */
+      space_asect->vma = subspace.subspace_start;
+      space_asect->filepos = subspace.file_loc_init_value + current_offset;
+      space_asect->alignment_power = exact_log2 (subspace.alignment);
+      if (space_asect->alignment_power == (unsigned) -1)
+	goto error_return;
+
+      /* Initialize save_subspace so we can reliably determine if this
+	 loop placed any useful values into it.  */
+      memset (&save_subspace, 0, sizeof (save_subspace));
+
+      /* Loop over the rest of the subspaces, building up more sections.  */
+      for (subspace_index = 0; subspace_index < space.subspace_quantity;
+	   subspace_index++)
+	{
+	  asection *subspace_asect;
+          char *subspace_name;
+
+	  /* Read in the next subspace.  */
+	  amt = sizeof ext_subspace;
+	  if (bfd_bread (&ext_subspace, amt, abfd) != amt)
+	    goto error_return;
+
+          som_swap_subspace_dictionary_in (&ext_subspace, &subspace);
+
+	  /* Setup the subspace name string.  */
+	  subspace_name = subspace.name + space_strings;
+
+	  amt = strlen (subspace_name) + 1;
+	  newname = bfd_alloc (abfd, amt);
+	  if (!newname)
+	    goto error_return;
+	  strcpy (newname, subspace_name);
+
+	  /* Make a section out of this subspace.  */
+	  subspace_asect = bfd_make_section_anyway (abfd, newname);
+	  if (!subspace_asect)
+	    goto error_return;
+
+	  /* Store private information about the section.  */
+	  if (! bfd_som_set_subsection_attributes (subspace_asect, space_asect,
+						   subspace.access_control_bits,
+						   subspace.sort_key,
+						   subspace.quadrant,
+						   subspace.is_comdat,
+						   subspace.is_common,
+						   subspace.dup_common))
+	    goto error_return;
+
+	  /* Keep an easy mapping between subspaces and sections.
+	     Note we do not necessarily read the subspaces in the
+	     same order in which they appear in the object file.
+
+	     So to make the target index come out correctly, we
+	     store the location of the subspace header in target
+	     index, then sort using the location of the subspace
+	     header as the key.  Then we can assign correct
+	     subspace indices.  */
+	  total_subspaces++;
+	  subspace_asect->target_index = bfd_tell (abfd) - sizeof (subspace);
+
+	  /* Set SEC_READONLY and SEC_CODE/SEC_DATA as specified
+	     by the access_control_bits in the subspace header.  */
+	  switch (subspace.access_control_bits >> 4)
+	    {
+	    /* Readonly data.  */
+	    case 0x0:
+	      subspace_asect->flags |= SEC_DATA | SEC_READONLY;
+	      break;
+
+	    /* Normal data.  */
+	    case 0x1:
+	      subspace_asect->flags |= SEC_DATA;
+	      break;
+
+	    /* Readonly code and the gateways.
+	       Gateways have other attributes which do not map
+	       into anything BFD knows about.  */
+	    case 0x2:
+	    case 0x4:
+	    case 0x5:
+	    case 0x6:
+	    case 0x7:
+	      subspace_asect->flags |= SEC_CODE | SEC_READONLY;
+	      break;
+
+	    /* dynamic (writable) code.  */
+	    case 0x3:
+	      subspace_asect->flags |= SEC_CODE;
+	      break;
+	    }
+
+	  if (subspace.is_comdat || subspace.is_common || subspace.dup_common)
+	    subspace_asect->flags |= SEC_LINK_ONCE;
+
+	  if (subspace.subspace_length > 0)
+	    subspace_asect->flags |= SEC_HAS_CONTENTS;
+
+	  if (subspace.is_loadable)
+	    subspace_asect->flags |= SEC_ALLOC | SEC_LOAD;
+	  else
+	    subspace_asect->flags |= SEC_DEBUGGING;
+
+	  if (subspace.code_only)
+	    subspace_asect->flags |= SEC_CODE;
+
+	  /* Both file_loc_init_value and initialization_length will
+	     be zero for a BSS like subspace.  */
+	  if (subspace.file_loc_init_value == 0
+	      && subspace.initialization_length == 0)
+	    subspace_asect->flags &= ~(SEC_DATA | SEC_LOAD | SEC_HAS_CONTENTS);
+
+	  /* This subspace has relocations.
+	     The fixup_request_quantity is a byte count for the number of
+	     entries in the relocation stream; it is not the actual number
+	     of relocations in the subspace.  */
+	  if (subspace.fixup_request_quantity != 0)
+	    {
+	      subspace_asect->flags |= SEC_RELOC;
+	      subspace_asect->rel_filepos = subspace.fixup_request_index;
+	      som_section_data (subspace_asect)->reloc_size
+		= subspace.fixup_request_quantity;
+	      /* We can not determine this yet.  When we read in the
+		 relocation table the correct value will be filled in.  */
+	      subspace_asect->reloc_count = (unsigned) -1;
+	    }
+
+	  /* Update save_subspace if appropriate.  */
+	  if (subspace.file_loc_init_value > save_subspace.file_loc_init_value)
+	    save_subspace = subspace;
+
+	  subspace_asect->vma = subspace.subspace_start;
+	  subspace_asect->size = subspace.subspace_length;
+	  subspace_asect->filepos = (subspace.file_loc_init_value
+				     + current_offset);
+	  subspace_asect->alignment_power = exact_log2 (subspace.alignment);
+	  if (subspace_asect->alignment_power == (unsigned) -1)
+	    goto error_return;
+
+	  /* Keep track of the accumulated sizes of the sections.  */
+	  space_size += subspace.subspace_length;
+	}
+
+      /* This can happen for a .o which defines symbols in otherwise
+	 empty subspaces.  */
+      if (!save_subspace.file_loc_init_value)
+	space_asect->size = 0;
+      else
+	{
+	  if (file_hdr->a_magic != RELOC_MAGIC)
+	    {
+	      /* Setup the size for the space section based upon the info
+		 in the last subspace of the space.  */
+	      space_asect->size = (save_subspace.subspace_start
+				   - space_asect->vma
+				   + save_subspace.subspace_length);
+	    }
+	  else
+	    {
+	      /* The subspace_start field is not initialised in relocatable
+	         only objects, so it cannot be used for length calculations.
+		 Instead we use the space_size value which we have been
+		 accumulating.  This isn't an accurate estimate since it
+		 ignores alignment and ordering issues.  */
+	      space_asect->size = space_size;
+	    }
+	}
+    }
+  /* Now that we've read in all the subspace records, we need to assign
+     a target index to each subspace.  */
+  amt = total_subspaces;
+  amt *= sizeof (asection *);
+  subspace_sections = bfd_malloc (amt);
+  if (subspace_sections == NULL)
+    goto error_return;
+
+  for (i = 0, section = abfd->sections; section; section = section->next)
+    {
+      if (!som_is_subspace (section))
+	continue;
+
+      subspace_sections[i] = section;
+      i++;
+    }
+  qsort (subspace_sections, total_subspaces,
+	 sizeof (asection *), compare_subspaces);
+
+  /* subspace_sections is now sorted in the order in which the subspaces
+     appear in the object file.  Assign an index to each one now.  */
+  for (i = 0; i < total_subspaces; i++)
+    subspace_sections[i]->target_index = i;
+
+  if (space_strings != NULL)
+    free (space_strings);
+
+  if (subspace_sections != NULL)
+    free (subspace_sections);
+
+  return TRUE;
+
+ error_return:
+  if (space_strings != NULL)
+    free (space_strings);
+
+  if (subspace_sections != NULL)
+    free (subspace_sections);
+  return FALSE;
+}
+
+
+/* Read in a SOM object and make it into a BFD.  */
+
+static const bfd_target *
+som_object_p (bfd *abfd)
+{
+  struct som_external_header ext_file_hdr;
+  struct som_header file_hdr;
+  struct som_exec_auxhdr *aux_hdr_ptr = NULL;
+  unsigned long current_offset = 0;
+  struct som_external_lst_header ext_lst_header;
+  struct som_external_som_entry ext_som_entry;
+  bfd_size_type amt;
+  unsigned int loc;
+#define ENTRY_SIZE sizeof (struct som_external_som_entry)
+
+  amt = sizeof (struct som_external_header);
+  if (bfd_bread (&ext_file_hdr, amt, abfd) != amt)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  som_swap_header_in (&ext_file_hdr, &file_hdr);
+
+  if (!_PA_RISC_ID (file_hdr.system_id))
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  switch (file_hdr.a_magic)
+    {
+    case RELOC_MAGIC:
+    case EXEC_MAGIC:
+    case SHARE_MAGIC:
+    case DEMAND_MAGIC:
+    case DL_MAGIC:
+    case SHL_MAGIC:
+#ifdef SHARED_MAGIC_CNX
+    case SHARED_MAGIC_CNX:
+#endif
+      break;
+
+    case EXECLIBMAGIC:
+      /* Read the lst header and determine where the SOM directory begins.  */
+
+      if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+	{
+	  if (bfd_get_error () != bfd_error_system_call)
+	    bfd_set_error (bfd_error_wrong_format);
+	  return NULL;
+	}
+
+      amt = sizeof (struct som_external_lst_header);
+      if (bfd_bread (&ext_lst_header, amt, abfd) != amt)
+	{
+	  if (bfd_get_error () != bfd_error_system_call)
+	    bfd_set_error (bfd_error_wrong_format);
+	  return NULL;
+	}
+
+      /* Position to and read the first directory entry.  */
+      loc = bfd_getb32 (ext_lst_header.dir_loc);
+      if (bfd_seek (abfd, loc, SEEK_SET) != 0)
+	{
+	  if (bfd_get_error () != bfd_error_system_call)
+	    bfd_set_error (bfd_error_wrong_format);
+	  return NULL;
+	}
+
+      amt = ENTRY_SIZE;
+      if (bfd_bread (&ext_som_entry, amt, abfd) != amt)
+	{
+	  if (bfd_get_error () != bfd_error_system_call)
+	    bfd_set_error (bfd_error_wrong_format);
+	  return NULL;
+	}
+
+      /* Now position to the first SOM.  */
+      current_offset = bfd_getb32 (ext_som_entry.location);
+      if (bfd_seek (abfd, current_offset, SEEK_SET) != 0)
+	{
+	  if (bfd_get_error () != bfd_error_system_call)
+	    bfd_set_error (bfd_error_wrong_format);
+	  return NULL;
+	}
+
+      /* And finally, re-read the som header.  */
+      amt = sizeof (struct som_external_header);
+      if (bfd_bread (&ext_file_hdr, amt, abfd) != amt)
+	{
+	  if (bfd_get_error () != bfd_error_system_call)
+	    bfd_set_error (bfd_error_wrong_format);
+	  return NULL;
+	}
+
+      som_swap_header_in (&ext_file_hdr, &file_hdr);
+
+      break;
+
+    default:
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  if (file_hdr.version_id != OLD_VERSION_ID
+      && file_hdr.version_id != NEW_VERSION_ID)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  /* If the aux_header_size field in the file header is zero, then this
+     object is an incomplete executable (a .o file).  Do not try to read
+     a non-existant auxiliary header.  */
+  if (file_hdr.aux_header_size != 0)
+    {
+      struct som_external_exec_auxhdr ext_exec_auxhdr;
+
+      aux_hdr_ptr = bfd_zalloc (abfd, 
+				(bfd_size_type) sizeof (*aux_hdr_ptr));
+      if (aux_hdr_ptr == NULL)
+	return NULL;
+      amt = sizeof (struct som_external_exec_auxhdr);
+      if (bfd_bread (&ext_exec_auxhdr, amt, abfd) != amt)
+	{
+	  if (bfd_get_error () != bfd_error_system_call)
+	    bfd_set_error (bfd_error_wrong_format);
+	  return NULL;
+	}
+      som_swap_exec_auxhdr_in (&ext_exec_auxhdr, aux_hdr_ptr);
+    }
+
+  if (!setup_sections (abfd, &file_hdr, current_offset))
+    {
+      /* setup_sections does not bubble up a bfd error code.  */
+      bfd_set_error (bfd_error_bad_value);
+      return NULL;
+    }
+
+  /* This appears to be a valid SOM object.  Do some initialization.  */
+  return som_object_setup (abfd, &file_hdr, aux_hdr_ptr, current_offset);
+}
+
+/* Create a SOM object.  */
+
+static bfd_boolean
+som_mkobject (bfd *abfd)
+{
+  /* Allocate memory to hold backend information.  */
+  abfd->tdata.som_data = bfd_zalloc (abfd, (bfd_size_type) sizeof (struct som_data_struct));
+  if (abfd->tdata.som_data == NULL)
+    return FALSE;
+  return TRUE;
+}
+
+/* Initialize some information in the file header.  This routine makes
+   not attempt at doing the right thing for a full executable; it
+   is only meant to handle relocatable objects.  */
+
+static bfd_boolean
+som_prep_headers (bfd *abfd)
+{
+  struct som_header *file_hdr;
+  asection *section;
+  bfd_size_type amt = sizeof (struct som_header);
+
+  /* Make and attach a file header to the BFD.  */
+  file_hdr = bfd_zalloc (abfd, amt);
+  if (file_hdr == NULL)
+    return FALSE;
+  obj_som_file_hdr (abfd) = file_hdr;
+
+  if (abfd->flags & (EXEC_P | DYNAMIC))
+    {
+      /* Make and attach an exec header to the BFD.  */
+      amt = sizeof (struct som_exec_auxhdr);
+      obj_som_exec_hdr (abfd) = bfd_zalloc (abfd, amt);
+      if (obj_som_exec_hdr (abfd) == NULL)
+	return FALSE;
+
+      if (abfd->flags & D_PAGED)
+	file_hdr->a_magic = DEMAND_MAGIC;
+      else if (abfd->flags & WP_TEXT)
+	file_hdr->a_magic = SHARE_MAGIC;
+#ifdef SHL_MAGIC
+      else if (abfd->flags & DYNAMIC)
+	file_hdr->a_magic = SHL_MAGIC;
+#endif
+      else
+	file_hdr->a_magic = EXEC_MAGIC;
+    }
+  else
+    file_hdr->a_magic = RELOC_MAGIC;
+
+  /* These fields are optional, and embedding timestamps is not always
+     a wise thing to do, it makes comparing objects during a multi-stage
+     bootstrap difficult.  */
+  file_hdr->file_time.secs = 0;
+  file_hdr->file_time.nanosecs = 0;
+
+  file_hdr->entry_space = 0;
+  file_hdr->entry_subspace = 0;
+  file_hdr->entry_offset = 0;
+  file_hdr->presumed_dp = 0;
+
+  /* Now iterate over the sections translating information from
+     BFD sections to SOM spaces/subspaces.  */
+  for (section = abfd->sections; section != NULL; section = section->next)
+    {
+      /* Ignore anything which has not been marked as a space or
+	 subspace.  */
+      if (!som_is_space (section) && !som_is_subspace (section))
+	continue;
+
+      if (som_is_space (section))
+	{
+	  /* Allocate space for the space dictionary.  */
+	  amt = sizeof (struct som_space_dictionary_record);
+	  som_section_data (section)->space_dict = bfd_zalloc (abfd, amt);
+	  if (som_section_data (section)->space_dict == NULL)
+	    return FALSE;
+	  /* Set space attributes.  Note most attributes of SOM spaces
+	     are set based on the subspaces it contains.  */
+	  som_section_data (section)->space_dict->loader_fix_index = -1;
+	  som_section_data (section)->space_dict->init_pointer_index = -1;
+
+	  /* Set more attributes that were stuffed away in private data.  */
+	  som_section_data (section)->space_dict->sort_key =
+	    som_section_data (section)->copy_data->sort_key;
+	  som_section_data (section)->space_dict->is_defined =
+	    som_section_data (section)->copy_data->is_defined;
+	  som_section_data (section)->space_dict->is_private =
+	    som_section_data (section)->copy_data->is_private;
+	  som_section_data (section)->space_dict->space_number =
+	    som_section_data (section)->copy_data->space_number;
+	}
+      else
+	{
+	  /* Allocate space for the subspace dictionary.  */
+	  amt = sizeof (struct som_subspace_dictionary_record);
+	  som_section_data (section)->subspace_dict = bfd_zalloc (abfd, amt);
+	  if (som_section_data (section)->subspace_dict == NULL)
+	    return FALSE;
+
+	  /* Set subspace attributes.  Basic stuff is done here, additional
+	     attributes are filled in later as more information becomes
+	     available.  */
+	  if (section->flags & SEC_ALLOC)
+	    som_section_data (section)->subspace_dict->is_loadable = 1;
+
+	  if (section->flags & SEC_CODE)
+	    som_section_data (section)->subspace_dict->code_only = 1;
+
+	  som_section_data (section)->subspace_dict->subspace_start =
+	    section->vma;
+	  som_section_data (section)->subspace_dict->subspace_length =
+	    section->size;
+	  som_section_data (section)->subspace_dict->initialization_length =
+	    section->size;
+	  som_section_data (section)->subspace_dict->alignment =
+	    1 << section->alignment_power;
+
+	  /* Set more attributes that were stuffed away in private data.  */
+	  som_section_data (section)->subspace_dict->sort_key =
+	    som_section_data (section)->copy_data->sort_key;
+	  som_section_data (section)->subspace_dict->access_control_bits =
+	    som_section_data (section)->copy_data->access_control_bits;
+	  som_section_data (section)->subspace_dict->quadrant =
+	    som_section_data (section)->copy_data->quadrant;
+	  som_section_data (section)->subspace_dict->is_comdat =
+	    som_section_data (section)->copy_data->is_comdat;
+	  som_section_data (section)->subspace_dict->is_common =
+	    som_section_data (section)->copy_data->is_common;
+	  som_section_data (section)->subspace_dict->dup_common =
+	    som_section_data (section)->copy_data->dup_common;
+	}
+    }
+  return TRUE;
+}
+
+/* Return TRUE if the given section is a SOM space, FALSE otherwise.  */
+
+static bfd_boolean
+som_is_space (asection *section)
+{
+  /* If no copy data is available, then it's neither a space nor a
+     subspace.  */
+  if (som_section_data (section)->copy_data == NULL)
+    return FALSE;
+
+  /* If the containing space isn't the same as the given section,
+     then this isn't a space.  */
+  if (som_section_data (section)->copy_data->container != section
+      && (som_section_data (section)->copy_data->container->output_section
+	  != section))
+    return FALSE;
+
+  /* OK.  Must be a space.  */
+  return TRUE;
+}
+
+/* Return TRUE if the given section is a SOM subspace, FALSE otherwise.  */
+
+static bfd_boolean
+som_is_subspace (asection *section)
+{
+  /* If no copy data is available, then it's neither a space nor a
+     subspace.  */
+  if (som_section_data (section)->copy_data == NULL)
+    return FALSE;
+
+  /* If the containing space is the same as the given section,
+     then this isn't a subspace.  */
+  if (som_section_data (section)->copy_data->container == section
+      || (som_section_data (section)->copy_data->container->output_section
+	  == section))
+    return FALSE;
+
+  /* OK.  Must be a subspace.  */
+  return TRUE;
+}
+
+/* Return TRUE if the given space contains the given subspace.  It
+   is safe to assume space really is a space, and subspace really
+   is a subspace.  */
+
+static bfd_boolean
+som_is_container (asection *space, asection *subspace)
+{
+  return (som_section_data (subspace)->copy_data->container == space)
+    || (som_section_data (subspace)->copy_data->container->output_section
+	== space);
+}
+
+/* Count and return the number of spaces attached to the given BFD.  */
+
+static unsigned long
+som_count_spaces (bfd *abfd)
+{
+  int count = 0;
+  asection *section;
+
+  for (section = abfd->sections; section != NULL; section = section->next)
+    count += som_is_space (section);
+
+  return count;
+}
+
+/* Count the number of subspaces attached to the given BFD.  */
+
+static unsigned long
+som_count_subspaces (bfd *abfd)
+{
+  int count = 0;
+  asection *section;
+
+  for (section = abfd->sections; section != NULL; section = section->next)
+    count += som_is_subspace (section);
+
+  return count;
+}
+
+/* Return -1, 0, 1 indicating the relative ordering of sym1 and sym2.
+
+   We desire symbols to be ordered starting with the symbol with the
+   highest relocation count down to the symbol with the lowest relocation
+   count.  Doing so compacts the relocation stream.  */
+
+static int
+compare_syms (const void *arg1, const void *arg2)
+{
+  asymbol **sym1 = (asymbol **) arg1;
+  asymbol **sym2 = (asymbol **) arg2;
+  unsigned int count1, count2;
+
+  /* Get relocation count for each symbol.  Note that the count
+     is stored in the udata pointer for section symbols!  */
+  if ((*sym1)->flags & BSF_SECTION_SYM)
+    count1 = (*sym1)->udata.i;
+  else
+    count1 = som_symbol_data (*sym1)->reloc_count;
+
+  if ((*sym2)->flags & BSF_SECTION_SYM)
+    count2 = (*sym2)->udata.i;
+  else
+    count2 = som_symbol_data (*sym2)->reloc_count;
+
+  /* Return the appropriate value.  */
+  if (count1 < count2)
+    return 1;
+  else if (count1 > count2)
+    return -1;
+  return 0;
+}
+
+/* Return -1, 0, 1 indicating the relative ordering of subspace1
+   and subspace.  */
+
+static int
+compare_subspaces (const void *arg1, const void *arg2)
+{
+  asection **subspace1 = (asection **) arg1;
+  asection **subspace2 = (asection **) arg2;
+
+  if ((*subspace1)->target_index < (*subspace2)->target_index)
+    return -1;
+  else if ((*subspace2)->target_index < (*subspace1)->target_index)
+    return 1;
+  else
+    return 0;
+}
+
+/* Perform various work in preparation for emitting the fixup stream.  */
+
+static void
+som_prep_for_fixups (bfd *abfd, asymbol **syms, unsigned long num_syms)
+{
+  unsigned long i;
+  asection *section;
+  asymbol **sorted_syms;
+  bfd_size_type amt;
+
+  /* Most SOM relocations involving a symbol have a length which is
+     dependent on the index of the symbol.  So symbols which are
+     used often in relocations should have a small index.  */
+
+  /* First initialize the counters for each symbol.  */
+  for (i = 0; i < num_syms; i++)
+    {
+      /* Handle a section symbol; these have no pointers back to the
+	 SOM symbol info.  So we just use the udata field to hold the
+	 relocation count.  */
+      if (som_symbol_data (syms[i]) == NULL
+	  || syms[i]->flags & BSF_SECTION_SYM)
+	{
+	  syms[i]->flags |= BSF_SECTION_SYM;
+	  syms[i]->udata.i = 0;
+	}
+      else
+	som_symbol_data (syms[i])->reloc_count = 0;
+    }
+
+  /* Now that the counters are initialized, make a weighted count
+     of how often a given symbol is used in a relocation.  */
+  for (section = abfd->sections; section != NULL; section = section->next)
+    {
+      int j;
+
+      /* Does this section have any relocations?  */
+      if ((int) section->reloc_count <= 0)
+	continue;
+
+      /* Walk through each relocation for this section.  */
+      for (j = 1; j < (int) section->reloc_count; j++)
+	{
+	  arelent *reloc = section->orelocation[j];
+	  int scale;
+
+	  /* A relocation against a symbol in the *ABS* section really
+	     does not have a symbol.  Likewise if the symbol isn't associated
+	     with any section.  */
+	  if (reloc->sym_ptr_ptr == NULL
+	      || bfd_is_abs_section ((*reloc->sym_ptr_ptr)->section))
+	    continue;
+
+	  /* Scaling to encourage symbols involved in R_DP_RELATIVE
+	     and R_CODE_ONE_SYMBOL relocations to come first.  These
+	     two relocations have single byte versions if the symbol
+	     index is very small.  */
+	  if (reloc->howto->type == R_DP_RELATIVE
+	      || reloc->howto->type == R_CODE_ONE_SYMBOL)
+	    scale = 2;
+	  else
+	    scale = 1;
+
+	  /* Handle section symbols by storing the count in the udata
+	     field.  It will not be used and the count is very important
+	     for these symbols.  */
+	  if ((*reloc->sym_ptr_ptr)->flags & BSF_SECTION_SYM)
+	    {
+	      (*reloc->sym_ptr_ptr)->udata.i =
+		(*reloc->sym_ptr_ptr)->udata.i + scale;
+	      continue;
+	    }
+
+	  /* A normal symbol.  Increment the count.  */
+	  som_symbol_data (*reloc->sym_ptr_ptr)->reloc_count += scale;
+	}
+    }
+
+  /* Sort a copy of the symbol table, rather than the canonical
+     output symbol table.  */
+  amt = num_syms;
+  amt *= sizeof (asymbol *);
+  sorted_syms = bfd_zalloc (abfd, amt);
+  memcpy (sorted_syms, syms, num_syms * sizeof (asymbol *));
+  qsort (sorted_syms, num_syms, sizeof (asymbol *), compare_syms);
+  obj_som_sorted_syms (abfd) = sorted_syms;
+
+  /* Compute the symbol indexes, they will be needed by the relocation
+     code.  */
+  for (i = 0; i < num_syms; i++)
+    {
+      /* A section symbol.  Again, there is no pointer to backend symbol
+	 information, so we reuse the udata field again.  */
+      if (sorted_syms[i]->flags & BSF_SECTION_SYM)
+	sorted_syms[i]->udata.i = i;
+      else
+	som_symbol_data (sorted_syms[i])->index = i;
+    }
+}
+
+static bfd_boolean
+som_write_fixups (bfd *abfd,
+		  unsigned long current_offset,
+		  unsigned int *total_reloc_sizep)
+{
+  unsigned int i, j;
+  /* Chunk of memory that we can use as buffer space, then throw
+     away.  */
+  unsigned char tmp_space[SOM_TMP_BUFSIZE];
+  unsigned char *p;
+  unsigned int total_reloc_size = 0;
+  unsigned int subspace_reloc_size = 0;
+  unsigned int num_spaces = obj_som_file_hdr (abfd)->space_total;
+  asection *section = abfd->sections;
+  bfd_size_type amt;
+
+  memset (tmp_space, 0, SOM_TMP_BUFSIZE);
+  p = tmp_space;
+
+  /* All the fixups for a particular subspace are emitted in a single
+     stream.  All the subspaces for a particular space are emitted
+     as a single stream.
+
+     So, to get all the locations correct one must iterate through all the
+     spaces, for each space iterate through its subspaces and output a
+     fixups stream.  */
+  for (i = 0; i < num_spaces; i++)
+    {
+      asection *subsection;
+
+      /* Find a space.  */
+      while (!som_is_space (section))
+	section = section->next;
+
+      /* Now iterate through each of its subspaces.  */
+      for (subsection = abfd->sections;
+	   subsection != NULL;
+	   subsection = subsection->next)
+	{
+	  int reloc_offset;
+	  unsigned int current_rounding_mode;
+#ifndef NO_PCREL_MODES
+	  unsigned int current_call_mode;
+#endif
+
+	  /* Find a subspace of this space.  */
+	  if (!som_is_subspace (subsection)
+	      || !som_is_container (section, subsection))
+	    continue;
+
+	  /* If this subspace does not have real data, then we are
+	     finished with it.  */
+	  if ((subsection->flags & SEC_HAS_CONTENTS) == 0)
+	    {
+	      som_section_data (subsection)->subspace_dict->fixup_request_index
+		= -1;
+	      continue;
+	    }
+
+	  /* This subspace has some relocations.  Put the relocation stream
+	     index into the subspace record.  */
+	  som_section_data (subsection)->subspace_dict->fixup_request_index
+	    = total_reloc_size;
+
+	  /* To make life easier start over with a clean slate for
+	     each subspace.  Seek to the start of the relocation stream
+	     for this subspace in preparation for writing out its fixup
+	     stream.  */
+	  if (bfd_seek (abfd, current_offset + total_reloc_size, SEEK_SET) != 0)
+	    return FALSE;
+
+	  /* Buffer space has already been allocated.  Just perform some
+	     initialization here.  */
+	  p = tmp_space;
+	  subspace_reloc_size = 0;
+	  reloc_offset = 0;
+	  som_initialize_reloc_queue (reloc_queue);
+	  current_rounding_mode = R_N_MODE;
+#ifndef NO_PCREL_MODES
+	  current_call_mode = R_SHORT_PCREL_MODE;
+#endif
+
+	  /* Translate each BFD relocation into one or more SOM
+	     relocations.  */
+	  for (j = 0; j < subsection->reloc_count; j++)
+	    {
+	      arelent *bfd_reloc = subsection->orelocation[j];
+	      unsigned int skip;
+	      int sym_num;
+
+	      /* Get the symbol number.  Remember it's stored in a
+		 special place for section symbols.  */
+	      if ((*bfd_reloc->sym_ptr_ptr)->flags & BSF_SECTION_SYM)
+		sym_num = (*bfd_reloc->sym_ptr_ptr)->udata.i;
+	      else
+		sym_num = som_symbol_data (*bfd_reloc->sym_ptr_ptr)->index;
+
+	      /* If there is not enough room for the next couple relocations,
+		 then dump the current buffer contents now.  Also reinitialize
+		 the relocation queue.
+
+		 No single BFD relocation could ever translate into more
+		 than 100 bytes of SOM relocations (20bytes is probably the
+		 upper limit, but leave lots of space for growth).  */
+	      if (p - tmp_space + 100 > SOM_TMP_BUFSIZE)
+		{
+		  amt = p - tmp_space;
+		  if (bfd_bwrite ((void *) tmp_space, amt, abfd) != amt)
+		    return FALSE;
+
+		  p = tmp_space;
+		  som_initialize_reloc_queue (reloc_queue);
+		}
+
+	      /* Emit R_NO_RELOCATION fixups to map any bytes which were
+		 skipped.  */
+	      skip = bfd_reloc->address - reloc_offset;
+	      p = som_reloc_skip (abfd, skip, p,
+				  &subspace_reloc_size, reloc_queue);
+
+	      /* Update reloc_offset for the next iteration.
+
+		 Many relocations do not consume input bytes.  They
+		 are markers, or set state necessary to perform some
+		 later relocation.  */
+	      switch (bfd_reloc->howto->type)
+		{
+		case R_ENTRY:
+		case R_ALT_ENTRY:
+		case R_EXIT:
+		case R_N_MODE:
+		case R_S_MODE:
+		case R_D_MODE:
+		case R_R_MODE:
+		case R_FSEL:
+		case R_LSEL:
+		case R_RSEL:
+		case R_COMP1:
+		case R_COMP2:
+		case R_BEGIN_BRTAB:
+		case R_END_BRTAB:
+		case R_BEGIN_TRY:
+		case R_END_TRY:
+		case R_N0SEL:
+		case R_N1SEL:
+#ifndef NO_PCREL_MODES
+		case R_SHORT_PCREL_MODE:
+		case R_LONG_PCREL_MODE:
+#endif
+		  reloc_offset = bfd_reloc->address;
+		  break;
+
+		default:
+		  reloc_offset = bfd_reloc->address + 4;
+		  break;
+		}
+
+	      /* Now the actual relocation we care about.  */
+	      switch (bfd_reloc->howto->type)
+		{
+		case R_PCREL_CALL:
+		case R_ABS_CALL:
+		  p = som_reloc_call (abfd, p, &subspace_reloc_size,
+				      bfd_reloc, sym_num, reloc_queue);
+		  break;
+
+		case R_CODE_ONE_SYMBOL:
+		case R_DP_RELATIVE:
+		  /* Account for any addend.  */
+		  if (bfd_reloc->addend)
+		    p = som_reloc_addend (abfd, bfd_reloc->addend, p,
+					  &subspace_reloc_size, reloc_queue);
+
+		  if (sym_num < 0x20)
+		    {
+		      bfd_put_8 (abfd, bfd_reloc->howto->type + sym_num, p);
+		      subspace_reloc_size += 1;
+		      p += 1;
+		    }
+		  else if (sym_num < 0x100)
+		    {
+		      bfd_put_8 (abfd, bfd_reloc->howto->type + 32, p);
+		      bfd_put_8 (abfd, sym_num, p + 1);
+		      p = try_prev_fixup (abfd, &subspace_reloc_size, p,
+					  2, reloc_queue);
+		    }
+		  else if (sym_num < 0x10000000)
+		    {
+		      bfd_put_8 (abfd, bfd_reloc->howto->type + 33, p);
+		      bfd_put_8 (abfd, sym_num >> 16, p + 1);
+		      bfd_put_16 (abfd, (bfd_vma) sym_num, p + 2);
+		      p = try_prev_fixup (abfd, &subspace_reloc_size,
+					  p, 4, reloc_queue);
+		    }
+		  else
+		    abort ();
+		  break;
+
+		case R_DATA_GPREL:
+		  /* Account for any addend.  */
+		  if (bfd_reloc->addend)
+		    p = som_reloc_addend (abfd, bfd_reloc->addend, p,
+					  &subspace_reloc_size, reloc_queue);
+
+		  if (sym_num < 0x10000000)
+		    {
+		      bfd_put_8 (abfd, bfd_reloc->howto->type, p);
+		      bfd_put_8 (abfd, sym_num >> 16, p + 1);
+		      bfd_put_16 (abfd, (bfd_vma) sym_num, p + 2);
+		      p = try_prev_fixup (abfd, &subspace_reloc_size,
+					  p, 4, reloc_queue);
+		    }
+		  else
+		    abort ();
+		  break;
+
+		case R_DATA_ONE_SYMBOL:
+		case R_DATA_PLABEL:
+		case R_CODE_PLABEL:
+		case R_DLT_REL:
+		  /* Account for any addend using R_DATA_OVERRIDE.  */
+		  if (bfd_reloc->howto->type != R_DATA_ONE_SYMBOL
+		      && bfd_reloc->addend)
+		    p = som_reloc_addend (abfd, bfd_reloc->addend, p,
+					  &subspace_reloc_size, reloc_queue);
+
+		  if (sym_num < 0x100)
+		    {
+		      bfd_put_8 (abfd, bfd_reloc->howto->type, p);
+		      bfd_put_8 (abfd, sym_num, p + 1);
+		      p = try_prev_fixup (abfd, &subspace_reloc_size, p,
+					  2, reloc_queue);
+		    }
+		  else if (sym_num < 0x10000000)
+		    {
+		      bfd_put_8 (abfd, bfd_reloc->howto->type + 1, p);
+		      bfd_put_8 (abfd, sym_num >> 16, p + 1);
+		      bfd_put_16 (abfd, (bfd_vma) sym_num, p + 2);
+		      p = try_prev_fixup (abfd, &subspace_reloc_size,
+					  p, 4, reloc_queue);
+		    }
+		  else
+		    abort ();
+		  break;
+
+		case R_ENTRY:
+		  {
+		    unsigned int tmp;
+		    arelent *tmp_reloc = NULL;
+		    bfd_put_8 (abfd, R_ENTRY, p);
+
+		    /* R_ENTRY relocations have 64 bits of associated
+		       data.  Unfortunately the addend field of a bfd
+		       relocation is only 32 bits.  So, we split up
+		       the 64bit unwind information and store part in
+		       the R_ENTRY relocation, and the rest in the R_EXIT
+		       relocation.  */
+		    bfd_put_32 (abfd, bfd_reloc->addend, p + 1);
+
+		    /* Find the next R_EXIT relocation.  */
+		    for (tmp = j; tmp < subsection->reloc_count; tmp++)
+		      {
+			tmp_reloc = subsection->orelocation[tmp];
+			if (tmp_reloc->howto->type == R_EXIT)
+			  break;
+		      }
+
+		    if (tmp == subsection->reloc_count)
+		      abort ();
+
+		    bfd_put_32 (abfd, tmp_reloc->addend, p + 5);
+		    p = try_prev_fixup (abfd, &subspace_reloc_size,
+					p, 9, reloc_queue);
+		    break;
+		  }
+
+		case R_N_MODE:
+		case R_S_MODE:
+		case R_D_MODE:
+		case R_R_MODE:
+		  /* If this relocation requests the current rounding
+		     mode, then it is redundant.  */
+		  if (bfd_reloc->howto->type != current_rounding_mode)
+		    {
+		      bfd_put_8 (abfd, bfd_reloc->howto->type, p);
+		      subspace_reloc_size += 1;
+		      p += 1;
+		      current_rounding_mode = bfd_reloc->howto->type;
+		    }
+		  break;
+
+#ifndef NO_PCREL_MODES
+		case R_LONG_PCREL_MODE:
+		case R_SHORT_PCREL_MODE:
+		  if (bfd_reloc->howto->type != current_call_mode)
+		    {
+		      bfd_put_8 (abfd, bfd_reloc->howto->type, p);
+		      subspace_reloc_size += 1;
+		      p += 1;
+		      current_call_mode = bfd_reloc->howto->type;
+		    }
+		  break;
+#endif
+
+		case R_EXIT:
+		case R_ALT_ENTRY:
+		case R_FSEL:
+		case R_LSEL:
+		case R_RSEL:
+		case R_BEGIN_BRTAB:
+		case R_END_BRTAB:
+		case R_BEGIN_TRY:
+		case R_N0SEL:
+		case R_N1SEL:
+		  bfd_put_8 (abfd, bfd_reloc->howto->type, p);
+		  subspace_reloc_size += 1;
+		  p += 1;
+		  break;
+
+		case R_END_TRY:
+		  /* The end of an exception handling region.  The reloc's
+		     addend contains the offset of the exception handling
+		     code.  */
+		  if (bfd_reloc->addend == 0)
+		    bfd_put_8 (abfd, bfd_reloc->howto->type, p);
+		  else if (bfd_reloc->addend < 1024)
+		    {
+		      bfd_put_8 (abfd, bfd_reloc->howto->type + 1, p);
+		      bfd_put_8 (abfd, bfd_reloc->addend / 4, p + 1);
+		      p = try_prev_fixup (abfd, &subspace_reloc_size,
+					  p, 2, reloc_queue);
+		    }
+		  else
+		    {
+		      bfd_put_8 (abfd, bfd_reloc->howto->type + 2, p);
+		      bfd_put_8 (abfd, (bfd_reloc->addend / 4) >> 16, p + 1);
+		      bfd_put_16 (abfd, bfd_reloc->addend / 4, p + 2);
+		      p = try_prev_fixup (abfd, &subspace_reloc_size,
+					  p, 4, reloc_queue);
+		    }
+		  break;
+
+		case R_COMP1:
+		  /* The only time we generate R_COMP1, R_COMP2 and
+		     R_CODE_EXPR relocs is for the difference of two
+		     symbols.  Hence we can cheat here.  */
+		  bfd_put_8 (abfd, bfd_reloc->howto->type, p);
+		  bfd_put_8 (abfd, 0x44, p + 1);
+		  p = try_prev_fixup (abfd, &subspace_reloc_size,
+				      p, 2, reloc_queue);
+		  break;
+
+		case R_COMP2:
+		  /* The only time we generate R_COMP1, R_COMP2 and
+		     R_CODE_EXPR relocs is for the difference of two
+		     symbols.  Hence we can cheat here.  */
+		  bfd_put_8 (abfd, bfd_reloc->howto->type, p);
+		  bfd_put_8 (abfd, 0x80, p + 1);
+		  bfd_put_8 (abfd, sym_num >> 16, p + 2);
+		  bfd_put_16 (abfd, (bfd_vma) sym_num, p + 3);
+		  p = try_prev_fixup (abfd, &subspace_reloc_size,
+				      p, 5, reloc_queue);
+		  break;
+
+		case R_CODE_EXPR:
+		case R_DATA_EXPR:
+		  /* The only time we generate R_COMP1, R_COMP2 and
+		     R_CODE_EXPR relocs is for the difference of two
+		     symbols.  Hence we can cheat here.  */
+		  bfd_put_8 (abfd, bfd_reloc->howto->type, p);
+		  subspace_reloc_size += 1;
+		  p += 1;
+		  break;
+
+		/* Put a "R_RESERVED" relocation in the stream if
+		   we hit something we do not understand.  The linker
+		   will complain loudly if this ever happens.  */
+		default:
+		  bfd_put_8 (abfd, 0xff, p);
+		  subspace_reloc_size += 1;
+		  p += 1;
+		  break;
+		}
+	    }
+
+	  /* Last BFD relocation for a subspace has been processed.
+	     Map the rest of the subspace with R_NO_RELOCATION fixups.  */
+	  p = som_reloc_skip (abfd, subsection->size - reloc_offset,
+			      p, &subspace_reloc_size, reloc_queue);
+
+	  /* Scribble out the relocations.  */
+	  amt = p - tmp_space;
+	  if (bfd_bwrite ((void *) tmp_space, amt, abfd) != amt)
+	    return FALSE;
+	  p = tmp_space;
+
+	  total_reloc_size += subspace_reloc_size;
+	  som_section_data (subsection)->subspace_dict->fixup_request_quantity
+	    = subspace_reloc_size;
+	}
+      section = section->next;
+    }
+  *total_reloc_sizep = total_reloc_size;
+  return TRUE;
+}
+
+/* Write out the space/subspace string table.  */
+
+static bfd_boolean
+som_write_space_strings (bfd *abfd,
+			 unsigned long current_offset,
+			 unsigned int *string_sizep)
+{
+  /* Chunk of memory that we can use as buffer space, then throw
+     away.  */
+  size_t tmp_space_size = SOM_TMP_BUFSIZE;
+  char *tmp_space = alloca (tmp_space_size);
+  char *p = tmp_space;
+  unsigned int strings_size = 0;
+  asection *section;
+  bfd_size_type amt;
+
+  /* Seek to the start of the space strings in preparation for writing
+     them out.  */
+  if (bfd_seek (abfd, (file_ptr) current_offset, SEEK_SET) != 0)
+    return FALSE;
+
+  /* Walk through all the spaces and subspaces (order is not important)
+     building up and writing string table entries for their names.  */
+  for (section = abfd->sections; section != NULL; section = section->next)
+    {
+      size_t length;
+
+      /* Only work with space/subspaces; avoid any other sections
+	 which might have been made (.text for example).  */
+      if (!som_is_space (section) && !som_is_subspace (section))
+	continue;
+
+      /* Get the length of the space/subspace name.  */
+      length = strlen (section->name);
+
+      /* If there is not enough room for the next entry, then dump the
+	 current buffer contents now and maybe allocate a larger
+	 buffer.  Each entry will take 4 bytes to hold the string
+	 length + the string itself + null terminator.  */
+      if (p - tmp_space + 5 + length > tmp_space_size)
+	{
+	  /* Flush buffer before refilling or reallocating.  */
+	  amt = p - tmp_space;
+	  if (bfd_bwrite ((void *) &tmp_space[0], amt, abfd) != amt)
+	    return FALSE;
+
+	  /* Reallocate if now empty buffer still too small.  */
+	  if (5 + length > tmp_space_size)
+	    {
+	      /* Ensure a minimum growth factor to avoid O(n**2) space
+		 consumption for n strings.  The optimal minimum
+		 factor seems to be 2, as no other value can guarantee
+		 wasting less than 50% space.  (Note that we cannot
+		 deallocate space allocated by `alloca' without
+		 returning from this function.)  The same technique is
+		 used a few more times below when a buffer is
+		 reallocated.  */
+              if (2 * tmp_space_size < length + 5)
+                tmp_space_size = length + 5;
+              else
+                tmp_space_size = 2 * tmp_space_size;
+	      tmp_space = alloca (tmp_space_size);
+	    }
+
+	  /* Reset to beginning of the (possibly new) buffer space.  */
+	  p = tmp_space;
+	}
+
+      /* First element in a string table entry is the length of the
+	 string.  Alignment issues are already handled.  */
+      bfd_put_32 (abfd, (bfd_vma) length, p);
+      p += 4;
+      strings_size += 4;
+
+      /* Record the index in the space/subspace records.  */
+      if (som_is_space (section))
+	som_section_data (section)->space_dict->name = strings_size;
+      else
+	som_section_data (section)->subspace_dict->name = strings_size;
+
+      /* Next comes the string itself + a null terminator.  */
+      strcpy (p, section->name);
+      p += length + 1;
+      strings_size += length + 1;
+
+      /* Always align up to the next word boundary.  */
+      while (strings_size % 4)
+	{
+	  bfd_put_8 (abfd, 0, p);
+	  p++;
+	  strings_size++;
+	}
+    }
+
+  /* Done with the space/subspace strings.  Write out any information
+     contained in a partial block.  */
+  amt = p - tmp_space;
+  if (bfd_bwrite ((void *) &tmp_space[0], amt, abfd) != amt)
+    return FALSE;
+  *string_sizep = strings_size;
+  return TRUE;
+}
+
+/* Write out the symbol string table.  */
+
+static bfd_boolean
+som_write_symbol_strings (bfd *abfd,
+			  unsigned long current_offset,
+			  asymbol **syms,
+			  unsigned int num_syms,
+			  unsigned int *string_sizep,
+			  struct som_compilation_unit *compilation_unit)
+{
+  unsigned int i;
+
+  /* Chunk of memory that we can use as buffer space, then throw
+     away.  */
+  size_t tmp_space_size = SOM_TMP_BUFSIZE;
+  char *tmp_space = alloca (tmp_space_size);
+  char *p = tmp_space;
+
+  unsigned int strings_size = 0;
+  bfd_size_type amt;
+
+  /* This gets a bit gruesome because of the compilation unit.  The
+     strings within the compilation unit are part of the symbol
+     strings, but don't have symbol_dictionary entries.  So, manually
+     write them and update the compilation unit header.  On input, the
+     compilation unit header contains local copies of the strings.
+     Move them aside.  */
+
+  /* Seek to the start of the space strings in preparation for writing
+     them out.  */
+  if (bfd_seek (abfd, (file_ptr) current_offset, SEEK_SET) != 0)
+    return FALSE;
+
+  if (compilation_unit)
+    {
+      for (i = 0; i < 4; i++)
+	{
+          struct som_name_pt *name;
+          size_t length;
+
+	  switch (i)
+	    {
+	    case 0:
+	      name = &compilation_unit->name;
+	      break;
+	    case 1:
+	      name = &compilation_unit->language_name;
+	      break;
+	    case 2:
+	      name = &compilation_unit->product_id;
+	      break;
+	    case 3:
+	      name = &compilation_unit->version_id;
+	      break;
+            default:
+              abort ();
+	    }
+
+	  length = strlen (name->name);
+
+	  /* If there is not enough room for the next entry, then dump
+	     the current buffer contents now and maybe allocate a
+	     larger buffer.  */
+	  if (p - tmp_space + 5 + length > tmp_space_size)
+	    {
+	      /* Flush buffer before refilling or reallocating.  */
+	      amt = p - tmp_space;
+	      if (bfd_bwrite ((void *) &tmp_space[0], amt, abfd) != amt)
+		return FALSE;
+
+	      /* Reallocate if now empty buffer still too small.  */
+	      if (5 + length > tmp_space_size)
+		{
+		  /* See alloca above for discussion of new size.  */
+                  if (2 * tmp_space_size < 5 + length)
+                    tmp_space_size = 5 + length;
+                  else
+                    tmp_space_size = 2 * tmp_space_size;
+		  tmp_space = alloca (tmp_space_size);
+		}
+
+	      /* Reset to beginning of the (possibly new) buffer
+		 space.  */
+	      p = tmp_space;
+	    }
+
+	  /* First element in a string table entry is the length of
+	     the string.  This must always be 4 byte aligned.  This is
+	     also an appropriate time to fill in the string index
+	     field in the symbol table entry.  */
+	  bfd_put_32 (abfd, (bfd_vma) length, p);
+	  strings_size += 4;
+	  p += 4;
+
+	  /* Next comes the string itself + a null terminator.  */
+	  strcpy (p, name->name);
+
+          name->strx = strings_size;
+
+	  p += length + 1;
+	  strings_size += length + 1;
+
+	  /* Always align up to the next word boundary.  */
+	  while (strings_size % 4)
+	    {
+	      bfd_put_8 (abfd, 0, p);
+	      strings_size++;
+	      p++;
+	    }
+	}
+    }
+
+  for (i = 0; i < num_syms; i++)
+    {
+      size_t length = strlen (syms[i]->name);
+
+      /* If there is not enough room for the next entry, then dump the
+	 current buffer contents now and maybe allocate a larger buffer.  */
+     if (p - tmp_space + 5 + length > tmp_space_size)
+	{
+	  /* Flush buffer before refilling or reallocating.  */
+	  amt = p - tmp_space;
+	  if (bfd_bwrite ((void *) &tmp_space[0], amt, abfd) != amt)
+	    return FALSE;
+
+	  /* Reallocate if now empty buffer still too small.  */
+	  if (5 + length > tmp_space_size)
+	    {
+	      /* See alloca above for discussion of new size.  */
+              if (2 * tmp_space_size < 5 + length)
+                tmp_space_size = 5 + length;
+              else
+                tmp_space_size = 2 * tmp_space_size;
+	      tmp_space = alloca (tmp_space_size);
+	    }
+
+	  /* Reset to beginning of the (possibly new) buffer space.  */
+	  p = tmp_space;
+	}
+
+      /* First element in a string table entry is the length of the
+	 string.  This must always be 4 byte aligned.  This is also
+	 an appropriate time to fill in the string index field in the
+	 symbol table entry.  */
+      bfd_put_32 (abfd, (bfd_vma) length, p);
+      strings_size += 4;
+      p += 4;
+
+      /* Next comes the string itself + a null terminator.  */
+      strcpy (p, syms[i]->name);
+
+      som_symbol_data (syms[i])->stringtab_offset = strings_size;
+      p += length + 1;
+      strings_size += length + 1;
+
+      /* Always align up to the next word boundary.  */
+      while (strings_size % 4)
+	{
+	  bfd_put_8 (abfd, 0, p);
+	  strings_size++;
+	  p++;
+	}
+    }
+
+  /* Scribble out any partial block.  */
+  amt = p - tmp_space;
+  if (bfd_bwrite ((void *) &tmp_space[0], amt, abfd) != amt)
+    return FALSE;
+
+  *string_sizep = strings_size;
+  return TRUE;
+}
+
+/* Compute variable information to be placed in the SOM headers,
+   space/subspace dictionaries, relocation streams, etc.  Begin
+   writing parts of the object file.  */
+
+static bfd_boolean
+som_begin_writing (bfd *abfd)
+{
+  unsigned long current_offset = 0;
+  unsigned int strings_size = 0;
+  unsigned long num_spaces, num_subspaces, i;
+  asection *section;
+  unsigned int total_subspaces = 0;
+  struct som_exec_auxhdr *exec_header = NULL;
+
+  /* The file header will always be first in an object file,
+     everything else can be in random locations.  To keep things
+     "simple" BFD will lay out the object file in the manner suggested
+     by the PRO ABI for PA-RISC Systems.  */
+
+  /* Before any output can really begin offsets for all the major
+     portions of the object file must be computed.  So, starting
+     with the initial file header compute (and sometimes write)
+     each portion of the object file.  */
+
+  /* Make room for the file header, it's contents are not complete
+     yet, so it can not be written at this time.  */
+  current_offset += sizeof (struct som_external_header);
+
+  /* Any auxiliary headers will follow the file header.  Right now
+     we support only the copyright and version headers.  */
+  obj_som_file_hdr (abfd)->aux_header_location = current_offset;
+  obj_som_file_hdr (abfd)->aux_header_size = 0;
+  if (abfd->flags & (EXEC_P | DYNAMIC))
+    {
+      /* Parts of the exec header will be filled in later, so
+	 delay writing the header itself.  Fill in the defaults,
+	 and write it later.  */
+      current_offset += sizeof (struct som_external_exec_auxhdr);
+      obj_som_file_hdr (abfd)->aux_header_size
+	+= sizeof (struct som_external_exec_auxhdr);
+      exec_header = obj_som_exec_hdr (abfd);
+      exec_header->som_auxhdr.type = EXEC_AUX_ID;
+      exec_header->som_auxhdr.length = 40;
+    }
+  if (obj_som_version_hdr (abfd) != NULL)
+    {
+      struct som_external_string_auxhdr ext_string_auxhdr;
+      bfd_size_type len;
+
+      if (bfd_seek (abfd, (file_ptr) current_offset, SEEK_SET) != 0)
+	return FALSE;
+
+      /* Write the aux_id structure and the string length.  */
+      len = sizeof (struct som_external_string_auxhdr);
+      obj_som_file_hdr (abfd)->aux_header_size += len;
+      current_offset += len;
+      som_swap_string_auxhdr_out
+        (obj_som_version_hdr (abfd), &ext_string_auxhdr);
+      if (bfd_bwrite (&ext_string_auxhdr, len, abfd) != len)
+	return FALSE;
+
+      /* Write the version string.  */
+      len = obj_som_version_hdr (abfd)->header_id.length - 4;
+      obj_som_file_hdr (abfd)->aux_header_size += len;
+      current_offset += len;
+      if (bfd_bwrite ((void *) obj_som_version_hdr (abfd)->string, len, abfd)
+	  != len)
+	return FALSE;
+    }
+
+  if (obj_som_copyright_hdr (abfd) != NULL)
+    {
+      struct som_external_string_auxhdr ext_string_auxhdr;
+      bfd_size_type len;
+
+      if (bfd_seek (abfd, (file_ptr) current_offset, SEEK_SET) != 0)
+	return FALSE;
+
+      /* Write the aux_id structure and the string length.  */
+      len = sizeof (struct som_external_string_auxhdr);
+      obj_som_file_hdr (abfd)->aux_header_size += len;
+      current_offset += len;
+      som_swap_string_auxhdr_out
+        (obj_som_copyright_hdr (abfd), &ext_string_auxhdr);
+      if (bfd_bwrite (&ext_string_auxhdr, len, abfd) != len)
+	return FALSE;
+
+      /* Write the copyright string.  */
+      len = obj_som_copyright_hdr (abfd)->header_id.length - 4;
+      obj_som_file_hdr (abfd)->aux_header_size += len;
+      current_offset += len;
+      if (bfd_bwrite ((void *) obj_som_copyright_hdr (abfd)->string, len, abfd)
+	  != len)
+	return FALSE;
+    }
+
+  /* Next comes the initialization pointers; we have no initialization
+     pointers, so current offset does not change.  */
+  obj_som_file_hdr (abfd)->init_array_location = current_offset;
+  obj_som_file_hdr (abfd)->init_array_total = 0;
+
+  /* Next are the space records.  These are fixed length records.
+
+     Count the number of spaces to determine how much room is needed
+     in the object file for the space records.
+
+     The names of the spaces are stored in a separate string table,
+     and the index for each space into the string table is computed
+     below.  Therefore, it is not possible to write the space headers
+     at this time.  */
+  num_spaces = som_count_spaces (abfd);
+  obj_som_file_hdr (abfd)->space_location = current_offset;
+  obj_som_file_hdr (abfd)->space_total = num_spaces;
+  current_offset +=
+    num_spaces * sizeof (struct som_external_space_dictionary_record);
+
+  /* Next are the subspace records.  These are fixed length records.
+
+     Count the number of subspaes to determine how much room is needed
+     in the object file for the subspace records.
+
+     A variety if fields in the subspace record are still unknown at
+     this time (index into string table, fixup stream location/size, etc).  */
+  num_subspaces = som_count_subspaces (abfd);
+  obj_som_file_hdr (abfd)->subspace_location = current_offset;
+  obj_som_file_hdr (abfd)->subspace_total = num_subspaces;
+  current_offset
+    += num_subspaces * sizeof (struct som_external_subspace_dictionary_record);
+
+  /* Next is the string table for the space/subspace names.  We will
+     build and write the string table on the fly.  At the same time
+     we will fill in the space/subspace name index fields.  */
+
+  /* The string table needs to be aligned on a word boundary.  */
+  if (current_offset % 4)
+    current_offset += (4 - (current_offset % 4));
+
+  /* Mark the offset of the space/subspace string table in the
+     file header.  */
+  obj_som_file_hdr (abfd)->space_strings_location = current_offset;
+
+  /* Scribble out the space strings.  */
+  if (! som_write_space_strings (abfd, current_offset, &strings_size))
+    return FALSE;
+
+  /* Record total string table size in the header and update the
+     current offset.  */
+  obj_som_file_hdr (abfd)->space_strings_size = strings_size;
+  current_offset += strings_size;
+
+  /* Next is the compilation unit.  */
+  obj_som_file_hdr (abfd)->compiler_location = current_offset;
+  obj_som_file_hdr (abfd)->compiler_total = 0;
+  if (obj_som_compilation_unit (abfd))
+    {
+      obj_som_file_hdr (abfd)->compiler_total = 1;
+      current_offset += sizeof (struct som_external_compilation_unit);
+    }
+
+  /* Now compute the file positions for the loadable subspaces, taking
+     care to make sure everything stays properly aligned.  */
+
+  section = abfd->sections;
+  for (i = 0; i < num_spaces; i++)
+    {
+      asection *subsection;
+      int first_subspace;
+      unsigned int subspace_offset = 0;
+
+      /* Find a space.  */
+      while (!som_is_space (section))
+	section = section->next;
+
+      first_subspace = 1;
+      /* Now look for all its subspaces.  */
+      for (subsection = abfd->sections;
+	   subsection != NULL;
+	   subsection = subsection->next)
+	{
+
+	  if (!som_is_subspace (subsection)
+	      || !som_is_container (section, subsection)
+	      || (subsection->flags & SEC_ALLOC) == 0)
+	    continue;
+
+	  /* If this is the first subspace in the space, and we are
+	     building an executable, then take care to make sure all
+	     the alignments are correct and update the exec header.  */
+	  if (first_subspace
+	      && (abfd->flags & (EXEC_P | DYNAMIC)))
+	    {
+	      /* Demand paged executables have each space aligned to a
+		 page boundary.  Sharable executables (write-protected
+		 text) have just the private (aka data & bss) space aligned
+		 to a page boundary.  Ugh.  Not true for HPUX.
+
+		 The HPUX kernel requires the text to always be page aligned
+		 within the file regardless of the executable's type.  */
+	      if (abfd->flags & (D_PAGED | DYNAMIC)
+		  || (subsection->flags & SEC_CODE)
+		  || ((abfd->flags & WP_TEXT)
+		      && (subsection->flags & SEC_DATA)))
+		current_offset = SOM_ALIGN (current_offset, PA_PAGESIZE);
+
+	      /* Update the exec header.  */
+	      if (subsection->flags & SEC_CODE && exec_header->exec_tfile == 0)
+		{
+		  exec_header->exec_tmem = section->vma;
+		  exec_header->exec_tfile = current_offset;
+		}
+	      if (subsection->flags & SEC_DATA && exec_header->exec_dfile == 0)
+		{
+		  exec_header->exec_dmem = section->vma;
+		  exec_header->exec_dfile = current_offset;
+		}
+
+	      /* Keep track of exactly where we are within a particular
+		 space.  This is necessary as the braindamaged HPUX
+		 loader will create holes between subspaces *and*
+		 subspace alignments are *NOT* preserved.  What a crock.  */
+	      subspace_offset = subsection->vma;
+
+	      /* Only do this for the first subspace within each space.  */
+	      first_subspace = 0;
+	    }
+	  else if (abfd->flags & (EXEC_P | DYNAMIC))
+	    {
+	      /* The braindamaged HPUX loader may have created a hole
+		 between two subspaces.  It is *not* sufficient to use
+		 the alignment specifications within the subspaces to
+		 account for these holes -- I've run into at least one
+		 case where the loader left one code subspace unaligned
+		 in a final executable.
+
+		 To combat this we keep a current offset within each space,
+		 and use the subspace vma fields to detect and preserve
+		 holes.  What a crock!
+
+		 ps.  This is not necessary for unloadable space/subspaces.  */
+	      current_offset += subsection->vma - subspace_offset;
+	      if (subsection->flags & SEC_CODE)
+		exec_header->exec_tsize += subsection->vma - subspace_offset;
+	      else
+		exec_header->exec_dsize += subsection->vma - subspace_offset;
+	      subspace_offset += subsection->vma - subspace_offset;
+	    }
+
+	  subsection->target_index = total_subspaces++;
+	  /* This is real data to be loaded from the file.  */
+	  if (subsection->flags & SEC_LOAD)
+	    {
+	      /* Update the size of the code & data.  */
+	      if (abfd->flags & (EXEC_P | DYNAMIC)
+		  && subsection->flags & SEC_CODE)
+		exec_header->exec_tsize += subsection->size;
+	      else if (abfd->flags & (EXEC_P | DYNAMIC)
+		       && subsection->flags & SEC_DATA)
+		exec_header->exec_dsize += subsection->size;
+	      som_section_data (subsection)->subspace_dict->file_loc_init_value
+		= current_offset;
+	      subsection->filepos = current_offset;
+	      current_offset += subsection->size;
+	      subspace_offset += subsection->size;
+	    }
+	  /* Looks like uninitialized data.  */
+	  else
+	    {
+	      /* Update the size of the bss section.  */
+	      if (abfd->flags & (EXEC_P | DYNAMIC))
+		exec_header->exec_bsize += subsection->size;
+
+	      som_section_data (subsection)->subspace_dict->file_loc_init_value
+		= 0;
+	      som_section_data (subsection)->subspace_dict->
+		initialization_length = 0;
+	    }
+	}
+      /* Goto the next section.  */
+      section = section->next;
+    }
+
+  /* Finally compute the file positions for unloadable subspaces.
+     If building an executable, start the unloadable stuff on its
+     own page.  */
+
+  if (abfd->flags & (EXEC_P | DYNAMIC))
+    current_offset = SOM_ALIGN (current_offset, PA_PAGESIZE);
+
+  obj_som_file_hdr (abfd)->unloadable_sp_location = current_offset;
+  section = abfd->sections;
+  for (i = 0; i < num_spaces; i++)
+    {
+      asection *subsection;
+
+      /* Find a space.  */
+      while (!som_is_space (section))
+	section = section->next;
+
+      if (abfd->flags & (EXEC_P | DYNAMIC))
+	current_offset = SOM_ALIGN (current_offset, PA_PAGESIZE);
+
+      /* Now look for all its subspaces.  */
+      for (subsection = abfd->sections;
+	   subsection != NULL;
+	   subsection = subsection->next)
+	{
+
+	  if (!som_is_subspace (subsection)
+	      || !som_is_container (section, subsection)
+	      || (subsection->flags & SEC_ALLOC) != 0)
+	    continue;
+
+	  subsection->target_index = total_subspaces++;
+	  /* This is real data to be loaded from the file.  */
+	  if ((subsection->flags & SEC_LOAD) == 0)
+	    {
+	      som_section_data (subsection)->subspace_dict->file_loc_init_value
+		= current_offset;
+	      subsection->filepos = current_offset;
+	      current_offset += subsection->size;
+	    }
+	  /* Looks like uninitialized data.  */
+	  else
+	    {
+	      som_section_data (subsection)->subspace_dict->file_loc_init_value
+		= 0;
+	      som_section_data (subsection)->subspace_dict->
+		initialization_length = subsection->size;
+	    }
+	}
+      /* Goto the next section.  */
+      section = section->next;
+    }
+
+  /* If building an executable, then make sure to seek to and write
+     one byte at the end of the file to make sure any necessary
+     zeros are filled in.  Ugh.  */
+  if (abfd->flags & (EXEC_P | DYNAMIC))
+    current_offset = SOM_ALIGN (current_offset, PA_PAGESIZE);
+  if (bfd_seek (abfd, (file_ptr) current_offset - 1, SEEK_SET) != 0)
+    return FALSE;
+  if (bfd_bwrite ((void *) "", (bfd_size_type) 1, abfd) != 1)
+    return FALSE;
+
+  obj_som_file_hdr (abfd)->unloadable_sp_size
+    = current_offset - obj_som_file_hdr (abfd)->unloadable_sp_location;
+
+  /* Loader fixups are not supported in any way shape or form.  */
+  obj_som_file_hdr (abfd)->loader_fixup_location = 0;
+  obj_som_file_hdr (abfd)->loader_fixup_total = 0;
+
+  /* Done.  Store the total size of the SOM so far.  */
+  obj_som_file_hdr (abfd)->som_length = current_offset;
+
+  return TRUE;
+}
+
+/* Finally, scribble out the various headers to the disk.  */
+
+static bfd_boolean
+som_finish_writing (bfd *abfd)
+{
+  int num_spaces = som_count_spaces (abfd);
+  asymbol **syms = bfd_get_outsymbols (abfd);
+  int i, num_syms;
+  int subspace_index = 0;
+  file_ptr location;
+  asection *section;
+  unsigned long current_offset;
+  unsigned int strings_size, total_reloc_size;
+  bfd_size_type amt;
+  struct som_external_header ext_header;
+
+  /* We must set up the version identifier here as objcopy/strip copy
+     private BFD data too late for us to handle this in som_begin_writing.  */
+  if (obj_som_exec_data (abfd)
+      && obj_som_exec_data (abfd)->version_id)
+    obj_som_file_hdr (abfd)->version_id = obj_som_exec_data (abfd)->version_id;
+  else
+    obj_som_file_hdr (abfd)->version_id = NEW_VERSION_ID;
+
+  /* Next is the symbol table.  These are fixed length records.
+
+     Count the number of symbols to determine how much room is needed
+     in the object file for the symbol table.
+
+     The names of the symbols are stored in a separate string table,
+     and the index for each symbol name into the string table is computed
+     below.  Therefore, it is not possible to write the symbol table
+     at this time.
+
+     These used to be output before the subspace contents, but they
+     were moved here to work around a stupid bug in the hpux linker
+     (fixed in hpux10).  */
+  current_offset = obj_som_file_hdr (abfd)->som_length;
+
+  /* Make sure we're on a word boundary.  */
+  if (current_offset % 4)
+    current_offset += (4 - (current_offset % 4));
+
+  num_syms = bfd_get_symcount (abfd);
+  obj_som_file_hdr (abfd)->symbol_location = current_offset;
+  obj_som_file_hdr (abfd)->symbol_total = num_syms;
+  current_offset +=
+    num_syms * sizeof (struct som_external_symbol_dictionary_record);
+
+  /* Next are the symbol strings.
+     Align them to a word boundary.  */
+  if (current_offset % 4)
+    current_offset += (4 - (current_offset % 4));
+  obj_som_file_hdr (abfd)->symbol_strings_location = current_offset;
+
+  /* Scribble out the symbol strings.  */
+  if (! som_write_symbol_strings (abfd, current_offset, syms,
+				  num_syms, &strings_size,
+				  obj_som_compilation_unit (abfd)))
+    return FALSE;
+
+  /* Record total string table size in header and update the
+     current offset.  */
+  obj_som_file_hdr (abfd)->symbol_strings_size = strings_size;
+  current_offset += strings_size;
+
+  /* Do prep work before handling fixups.  */
+  som_prep_for_fixups (abfd,
+		       bfd_get_outsymbols (abfd),
+		       bfd_get_symcount (abfd));
+
+  /* At the end of the file is the fixup stream which starts on a
+     word boundary.  */
+  if (current_offset % 4)
+    current_offset += (4 - (current_offset % 4));
+  obj_som_file_hdr (abfd)->fixup_request_location = current_offset;
+
+  /* Write the fixups and update fields in subspace headers which
+     relate to the fixup stream.  */
+  if (! som_write_fixups (abfd, current_offset, &total_reloc_size))
+    return FALSE;
+
+  /* Record the total size of the fixup stream in the file header.  */
+  obj_som_file_hdr (abfd)->fixup_request_total = total_reloc_size;
+
+  /* Done.  Store the total size of the SOM.  */
+  obj_som_file_hdr (abfd)->som_length = current_offset + total_reloc_size;
+
+  /* Now that the symbol table information is complete, build and
+     write the symbol table.  */
+  if (! som_build_and_write_symbol_table (abfd))
+    return FALSE;
+
+  /* Subspaces are written first so that we can set up information
+     about them in their containing spaces as the subspace is written.  */
+
+  /* Seek to the start of the subspace dictionary records.  */
+  location = obj_som_file_hdr (abfd)->subspace_location;
+  if (bfd_seek (abfd, location, SEEK_SET) != 0)
+    return FALSE;
+
+  section = abfd->sections;
+  /* Now for each loadable space write out records for its subspaces.  */
+  for (i = 0; i < num_spaces; i++)
+    {
+      asection *subsection;
+
+      /* Find a space.  */
+      while (!som_is_space (section))
+	section = section->next;
+
+      /* Now look for all its subspaces.  */
+      for (subsection = abfd->sections;
+	   subsection != NULL;
+	   subsection = subsection->next)
+	{
+          struct som_external_subspace_dictionary_record ext_subspace_dict;
+
+	  /* Skip any section which does not correspond to a space
+	     or subspace.  Or does not have SEC_ALLOC set (and therefore
+	     has no real bits on the disk).  */
+	  if (!som_is_subspace (subsection)
+	      || !som_is_container (section, subsection)
+	      || (subsection->flags & SEC_ALLOC) == 0)
+	    continue;
+
+	  /* If this is the first subspace for this space, then save
+	     the index of the subspace in its containing space.  Also
+	     set "is_loadable" in the containing space.  */
+
+	  if (som_section_data (section)->space_dict->subspace_quantity == 0)
+	    {
+	      som_section_data (section)->space_dict->is_loadable = 1;
+	      som_section_data (section)->space_dict->subspace_index
+		= subspace_index;
+	    }
+
+	  /* Increment the number of subspaces seen and the number of
+	     subspaces contained within the current space.  */
+	  subspace_index++;
+	  som_section_data (section)->space_dict->subspace_quantity++;
+
+	  /* Mark the index of the current space within the subspace's
+	     dictionary record.  */
+	  som_section_data (subsection)->subspace_dict->space_index = i;
+
+	  /* Dump the current subspace header.  */
+          som_swap_subspace_dictionary_record_out
+            (som_section_data (subsection)->subspace_dict, &ext_subspace_dict);
+	  amt = sizeof (struct som_subspace_dictionary_record);
+	  if (bfd_bwrite (&ext_subspace_dict, amt, abfd) != amt)
+	    return FALSE;
+	}
+      /* Goto the next section.  */
+      section = section->next;
+    }
+
+  /* Now repeat the process for unloadable subspaces.  */
+  section = abfd->sections;
+  /* Now for each space write out records for its subspaces.  */
+  for (i = 0; i < num_spaces; i++)
+    {
+      asection *subsection;
+
+      /* Find a space.  */
+      while (!som_is_space (section))
+	section = section->next;
+
+      /* Now look for all its subspaces.  */
+      for (subsection = abfd->sections;
+	   subsection != NULL;
+	   subsection = subsection->next)
+	{
+          struct som_external_subspace_dictionary_record ext_subspace_dict;
+
+	  /* Skip any section which does not correspond to a space or
+	     subspace, or which SEC_ALLOC set (and therefore handled
+	     in the loadable spaces/subspaces code above).  */
+
+	  if (!som_is_subspace (subsection)
+	      || !som_is_container (section, subsection)
+	      || (subsection->flags & SEC_ALLOC) != 0)
+	    continue;
+
+	  /* If this is the first subspace for this space, then save
+	     the index of the subspace in its containing space.  Clear
+	     "is_loadable".  */
+
+	  if (som_section_data (section)->space_dict->subspace_quantity == 0)
+	    {
+	      som_section_data (section)->space_dict->is_loadable = 0;
+	      som_section_data (section)->space_dict->subspace_index
+		= subspace_index;
+	    }
+
+	  /* Increment the number of subspaces seen and the number of
+	     subspaces contained within the current space.  */
+	  som_section_data (section)->space_dict->subspace_quantity++;
+	  subspace_index++;
+
+	  /* Mark the index of the current space within the subspace's
+	     dictionary record.  */
+	  som_section_data (subsection)->subspace_dict->space_index = i;
+
+	  /* Dump this subspace header.  */
+          som_swap_subspace_dictionary_record_out
+            (som_section_data (subsection)->subspace_dict, &ext_subspace_dict);
+	  amt = sizeof (struct som_subspace_dictionary_record);
+	  if (bfd_bwrite (&ext_subspace_dict, amt, abfd) != amt)
+	    return FALSE;
+	}
+      /* Goto the next section.  */
+      section = section->next;
+    }
+
+  /* All the subspace dictionary records are written, and all the
+     fields are set up in the space dictionary records.
+
+     Seek to the right location and start writing the space
+     dictionary records.  */
+  location = obj_som_file_hdr (abfd)->space_location;
+  if (bfd_seek (abfd, location, SEEK_SET) != 0)
+    return FALSE;
+
+  section = abfd->sections;
+  for (i = 0; i < num_spaces; i++)
+    {
+      struct som_external_space_dictionary_record ext_space_dict;
+
+      /* Find a space.  */
+      while (!som_is_space (section))
+	section = section->next;
+
+      /* Dump its header.  */
+      som_swap_space_dictionary_out (som_section_data (section)->space_dict,
+                                     &ext_space_dict);
+      amt = sizeof (struct som_external_space_dictionary_record);
+      if (bfd_bwrite (&ext_space_dict, amt, abfd) != amt)
+	return FALSE;
+
+      /* Goto the next section.  */
+      section = section->next;
+    }
+
+  /* Write the compilation unit record if there is one.  */
+  if (obj_som_compilation_unit (abfd))
+    {
+      struct som_external_compilation_unit ext_comp_unit;
+
+      location = obj_som_file_hdr (abfd)->compiler_location;
+      if (bfd_seek (abfd, location, SEEK_SET) != 0)
+	return FALSE;
+
+      som_swap_compilation_unit_out
+        (obj_som_compilation_unit (abfd), &ext_comp_unit);
+
+      amt = sizeof (struct som_external_compilation_unit);
+      if (bfd_bwrite (&ext_comp_unit, amt, abfd) != amt)
+	return FALSE;
+    }
+
+  /* Setting of the system_id has to happen very late now that copying of
+     BFD private data happens *after* section contents are set.  */
+  if (abfd->flags & (EXEC_P | DYNAMIC))
+    obj_som_file_hdr (abfd)->system_id = obj_som_exec_data (abfd)->system_id;
+  else if (bfd_get_mach (abfd) == pa20)
+    obj_som_file_hdr (abfd)->system_id = CPU_PA_RISC2_0;
+  else if (bfd_get_mach (abfd) == pa11)
+    obj_som_file_hdr (abfd)->system_id = CPU_PA_RISC1_1;
+  else
+    obj_som_file_hdr (abfd)->system_id = CPU_PA_RISC1_0;
+
+  /* Swap and compute the checksum for the file header just before writing
+     the header to disk.  */
+  som_swap_header_out (obj_som_file_hdr (abfd), &ext_header);
+  bfd_putb32 (som_compute_checksum (&ext_header), ext_header.checksum);
+
+  /* Only thing left to do is write out the file header.  It is always
+     at location zero.  Seek there and write it.  */
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    return FALSE;
+  amt = sizeof (struct som_external_header);
+  if (bfd_bwrite (&ext_header, amt, abfd) != amt)
+    return FALSE;
+
+  /* Now write the exec header.  */
+  if (abfd->flags & (EXEC_P | DYNAMIC))
+    {
+      long tmp, som_length;
+      struct som_exec_auxhdr *exec_header;
+      struct som_external_exec_auxhdr ext_exec_header;
+
+      exec_header = obj_som_exec_hdr (abfd);
+      exec_header->exec_entry = bfd_get_start_address (abfd);
+      exec_header->exec_flags = obj_som_exec_data (abfd)->exec_flags;
+
+      /* Oh joys.  Ram some of the BSS data into the DATA section
+	 to be compatible with how the hp linker makes objects
+	 (saves memory space).  */
+      tmp = exec_header->exec_dsize;
+      tmp = SOM_ALIGN (tmp, PA_PAGESIZE);
+      exec_header->exec_bsize -= (tmp - exec_header->exec_dsize);
+      if (exec_header->exec_bsize < 0)
+	exec_header->exec_bsize = 0;
+      exec_header->exec_dsize = tmp;
+
+      /* Now perform some sanity checks.  The idea is to catch bogons now and
+	 inform the user, instead of silently generating a bogus file.  */
+      som_length = obj_som_file_hdr (abfd)->som_length;
+      if (exec_header->exec_tfile + exec_header->exec_tsize > som_length
+	  || exec_header->exec_dfile + exec_header->exec_dsize > som_length)
+	{
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      som_swap_exec_auxhdr_out (exec_header, &ext_exec_header);
+
+      if (bfd_seek (abfd, obj_som_file_hdr (abfd)->aux_header_location,
+		    SEEK_SET) != 0)
+	return FALSE;
+
+      amt = sizeof (ext_exec_header);
+      if (bfd_bwrite (&ext_exec_header, amt, abfd) != amt)
+	return FALSE;
+    }
+  return TRUE;
+}
+
+/* Compute and return the checksum for a SOM file header.  */
+
+static unsigned long
+som_compute_checksum (struct som_external_header *hdr)
+{
+  unsigned long checksum, count, i;
+  unsigned long *buffer = (unsigned long *) hdr;
+
+  checksum = 0;
+  count = sizeof (struct som_external_header) / 4;
+  for (i = 0; i < count; i++)
+    checksum ^= *(buffer + i);
+
+  return checksum;
+}
+
+static void
+som_bfd_derive_misc_symbol_info (bfd *abfd ATTRIBUTE_UNUSED,
+				 asymbol *sym,
+				 struct som_misc_symbol_info *info)
+{
+  /* Initialize.  */
+  memset (info, 0, sizeof (struct som_misc_symbol_info));
+
+  /* The HP SOM linker requires detailed type information about
+     all symbols (including undefined symbols!).  Unfortunately,
+     the type specified in an import/export statement does not
+     always match what the linker wants.  Severe braindamage.  */
+
+  /* Section symbols will not have a SOM symbol type assigned to
+     them yet.  Assign all section symbols type ST_DATA.  */
+  if (sym->flags & BSF_SECTION_SYM)
+    info->symbol_type = ST_DATA;
+  else
+    {
+      /* For BFD style common, the linker will choke unless we set the
+	 type and scope to ST_STORAGE and SS_UNSAT, respectively.  */
+      if (bfd_is_com_section (sym->section))
+	{
+	  info->symbol_type = ST_STORAGE;
+	  info->symbol_scope = SS_UNSAT;
+	}
+
+      /* It is possible to have a symbol without an associated
+	 type.  This happens if the user imported the symbol
+	 without a type and the symbol was never defined
+	 locally.  If BSF_FUNCTION is set for this symbol, then
+	 assign it type ST_CODE (the HP linker requires undefined
+	 external functions to have type ST_CODE rather than ST_ENTRY).  */
+      else if ((som_symbol_data (sym)->som_type == SYMBOL_TYPE_UNKNOWN
+		|| som_symbol_data (sym)->som_type == SYMBOL_TYPE_CODE)
+	       && bfd_is_und_section (sym->section)
+	       && sym->flags & BSF_FUNCTION)
+	info->symbol_type = ST_CODE;
+
+      /* Handle function symbols which were defined in this file.
+	 They should have type ST_ENTRY.  Also retrieve the argument
+	 relocation bits from the SOM backend information.  */
+      else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_ENTRY
+	       || (som_symbol_data (sym)->som_type == SYMBOL_TYPE_CODE
+		   && (sym->flags & BSF_FUNCTION))
+	       || (som_symbol_data (sym)->som_type == SYMBOL_TYPE_UNKNOWN
+		   && (sym->flags & BSF_FUNCTION)))
+	{
+	  info->symbol_type = ST_ENTRY;
+	  info->arg_reloc = som_symbol_data (sym)->tc_data.ap.hppa_arg_reloc;
+	  info->priv_level= som_symbol_data (sym)->tc_data.ap.hppa_priv_level;
+	}
+
+      /* For unknown symbols set the symbol's type based on the symbol's
+	 section (ST_DATA for DATA sections, ST_CODE for CODE sections).  */
+      else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_UNKNOWN)
+	{
+	  if (bfd_is_abs_section (sym->section))
+	    info->symbol_type = ST_ABSOLUTE;
+	  else if (sym->section->flags & SEC_CODE)
+	    info->symbol_type = ST_CODE;
+	  else
+	    info->symbol_type = ST_DATA;
+	}
+
+      /* From now on it's a very simple mapping.  */
+      else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_ABSOLUTE)
+	info->symbol_type = ST_ABSOLUTE;
+      else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_CODE)
+	info->symbol_type = ST_CODE;
+      else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_DATA)
+	info->symbol_type = ST_DATA;
+      else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_MILLICODE)
+	info->symbol_type = ST_MILLICODE;
+      else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_PLABEL)
+	info->symbol_type = ST_PLABEL;
+      else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_PRI_PROG)
+	info->symbol_type = ST_PRI_PROG;
+      else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_SEC_PROG)
+	info->symbol_type = ST_SEC_PROG;
+    }
+
+  /* Now handle the symbol's scope.  Exported data which is not
+     in the common section has scope SS_UNIVERSAL.  Note scope
+     of common symbols was handled earlier!  */
+  if (bfd_is_com_section (sym->section))
+    ;
+  else if (bfd_is_und_section (sym->section))
+    info->symbol_scope = SS_UNSAT;
+  else if (sym->flags & (BSF_EXPORT | BSF_WEAK))
+    info->symbol_scope = SS_UNIVERSAL;
+  /* Anything else which is not in the common section has scope
+     SS_LOCAL.  */
+  else
+    info->symbol_scope = SS_LOCAL;
+
+  /* Now set the symbol_info field.  It has no real meaning
+     for undefined or common symbols, but the HP linker will
+     choke if it's not set to some "reasonable" value.  We
+     use zero as a reasonable value.  */
+  if (bfd_is_com_section (sym->section)
+      || bfd_is_und_section (sym->section)
+      || bfd_is_abs_section (sym->section))
+    info->symbol_info = 0;
+  /* For all other symbols, the symbol_info field contains the
+     subspace index of the space this symbol is contained in.  */
+  else
+    info->symbol_info = sym->section->target_index;
+
+  /* Set the symbol's value.  */
+  info->symbol_value = sym->value + sym->section->vma;
+
+  /* The secondary_def field is for "weak" symbols.  */
+  if (sym->flags & BSF_WEAK)
+    info->secondary_def = TRUE;
+  else
+    info->secondary_def = FALSE;
+
+  /* The is_comdat, is_common and dup_common fields provide various
+     flavors of common.
+
+     For data symbols, setting IS_COMMON provides Fortran style common
+     (duplicate definitions and overlapped initialization).  Setting both
+     IS_COMMON and DUP_COMMON provides Cobol style common (duplicate
+     definitions as long as they are all the same length).  In a shared
+     link data symbols retain their IS_COMMON and DUP_COMMON flags.
+     An IS_COMDAT data symbol is similar to a IS_COMMON | DUP_COMMON
+     symbol except in that it loses its IS_COMDAT flag in a shared link.
+
+     For code symbols, IS_COMDAT and DUP_COMMON have effect.  Universal
+     DUP_COMMON code symbols are not exported from shared libraries.
+     IS_COMDAT symbols are exported but they lose their IS_COMDAT flag.
+
+     We take a simplified approach to setting the is_comdat, is_common
+     and dup_common flags in symbols based on the flag settings of their
+     subspace.  This avoids having to add directives like `.comdat' but
+     the linker behavior is probably undefined if there is more than one
+     universal symbol (comdat key sysmbol) in a subspace.
+
+     The behavior of these flags is not well documentmented, so there
+     may be bugs and some surprising interactions with other flags.  */
+  if (som_section_data (sym->section)
+      && som_section_data (sym->section)->subspace_dict
+      && info->symbol_scope == SS_UNIVERSAL
+      && (info->symbol_type == ST_ENTRY
+	  || info->symbol_type == ST_CODE
+	  || info->symbol_type == ST_DATA))
+    {
+      info->is_comdat
+	= som_section_data (sym->section)->subspace_dict->is_comdat;
+      info->is_common
+	= som_section_data (sym->section)->subspace_dict->is_common;
+      info->dup_common
+	= som_section_data (sym->section)->subspace_dict->dup_common;
+    }
+}
+
+/* Build and write, in one big chunk, the entire symbol table for
+   this BFD.  */
+
+static bfd_boolean
+som_build_and_write_symbol_table (bfd *abfd)
+{
+  unsigned int num_syms = bfd_get_symcount (abfd);
+  file_ptr symtab_location = obj_som_file_hdr (abfd)->symbol_location;
+  asymbol **bfd_syms = obj_som_sorted_syms (abfd);
+  struct som_external_symbol_dictionary_record *som_symtab = NULL;
+  unsigned int i;
+  bfd_size_type symtab_size;
+
+  /* Compute total symbol table size and allocate a chunk of memory
+     to hold the symbol table as we build it.  */
+  symtab_size = num_syms;
+  symtab_size *= sizeof (struct som_external_symbol_dictionary_record);
+  som_symtab = bfd_zmalloc (symtab_size);
+  if (som_symtab == NULL && symtab_size != 0)
+    goto error_return;
+
+  /* Walk over each symbol.  */
+  for (i = 0; i < num_syms; i++)
+    {
+      struct som_misc_symbol_info info;
+      unsigned int flags;
+
+      /* This is really an index into the symbol strings table.
+	 By the time we get here, the index has already been
+	 computed and stored into the name field in the BFD symbol.  */
+      bfd_putb32 (som_symbol_data (bfd_syms[i])->stringtab_offset,
+                  som_symtab[i].name);
+
+      /* Derive SOM information from the BFD symbol.  */
+      som_bfd_derive_misc_symbol_info (abfd, bfd_syms[i], &info);
+
+      /* Now use it.  */
+      flags = (info.symbol_type << SOM_SYMBOL_TYPE_SH)
+        | (info.symbol_scope << SOM_SYMBOL_SCOPE_SH)
+        | (info.arg_reloc << SOM_SYMBOL_ARG_RELOC_SH)
+        | (3 << SOM_SYMBOL_XLEAST_SH)
+        | (info.secondary_def ? SOM_SYMBOL_SECONDARY_DEF : 0)
+        | (info.is_common ? SOM_SYMBOL_IS_COMMON : 0)
+        | (info.dup_common ? SOM_SYMBOL_DUP_COMMON : 0);
+      bfd_putb32 (flags, som_symtab[i].flags);
+
+      flags = (info.symbol_info << SOM_SYMBOL_SYMBOL_INFO_SH)
+        | (info.is_comdat ? SOM_SYMBOL_IS_COMDAT : 0);
+      bfd_putb32 (flags, som_symtab[i].info);
+      bfd_putb32 (info.symbol_value | info.priv_level,
+                  som_symtab[i].symbol_value);
+    }
+
+  /* Everything is ready, seek to the right location and
+     scribble out the symbol table.  */
+  if (bfd_seek (abfd, symtab_location, SEEK_SET) != 0)
+    return FALSE;
+
+  if (bfd_bwrite ((void *) som_symtab, symtab_size, abfd) != symtab_size)
+    goto error_return;
+
+  if (som_symtab != NULL)
+    free (som_symtab);
+  return TRUE;
+ error_return:
+  if (som_symtab != NULL)
+    free (som_symtab);
+  return FALSE;
+}
+
+/* Write an object in SOM format.  */
+
+static bfd_boolean
+som_write_object_contents (bfd *abfd)
+{
+  if (! abfd->output_has_begun)
+    {
+      /* Set up fixed parts of the file, space, and subspace headers.
+	 Notify the world that output has begun.  */
+      som_prep_headers (abfd);
+      abfd->output_has_begun = TRUE;
+      /* Start writing the object file.  This include all the string
+	 tables, fixup streams, and other portions of the object file.  */
+      som_begin_writing (abfd);
+    }
+
+  return som_finish_writing (abfd);
+}
+
+/* Read and save the string table associated with the given BFD.  */
+
+static bfd_boolean
+som_slurp_string_table (bfd *abfd)
+{
+  char *stringtab;
+  bfd_size_type amt;
+
+  /* Use the saved version if its available.  */
+  if (obj_som_stringtab (abfd) != NULL)
+    return TRUE;
+
+  /* I don't think this can currently happen, and I'm not sure it should
+     really be an error, but it's better than getting unpredictable results
+     from the host's malloc when passed a size of zero.  */
+  if (obj_som_stringtab_size (abfd) == 0)
+    {
+      bfd_set_error (bfd_error_no_symbols);
+      return FALSE;
+    }
+
+  /* Allocate and read in the string table.  */
+  amt = obj_som_stringtab_size (abfd);
+  stringtab = bfd_zmalloc (amt);
+  if (stringtab == NULL)
+    return FALSE;
+
+  if (bfd_seek (abfd, obj_som_str_filepos (abfd), SEEK_SET) != 0)
+    return FALSE;
+
+  if (bfd_bread (stringtab, amt, abfd) != amt)
+    return FALSE;
+
+  /* Save our results and return success.  */
+  obj_som_stringtab (abfd) = stringtab;
+  return TRUE;
+}
+
+/* Return the amount of data (in bytes) required to hold the symbol
+   table for this object.  */
+
+static long
+som_get_symtab_upper_bound (bfd *abfd)
+{
+  if (!som_slurp_symbol_table (abfd))
+    return -1;
+
+  return (bfd_get_symcount (abfd) + 1) * sizeof (asymbol *);
+}
+
+/* Convert from a SOM subspace index to a BFD section.  */
+
+static asection *
+bfd_section_from_som_symbol
+  (bfd *abfd, struct som_external_symbol_dictionary_record *symbol)
+{
+  asection *section;
+  unsigned int flags = bfd_getb32 (symbol->flags);
+  unsigned int symbol_type = (flags >> SOM_SYMBOL_TYPE_SH) & SOM_SYMBOL_TYPE_MASK;
+
+  /* The meaning of the symbol_info field changes for functions
+     within executables.  So only use the quick symbol_info mapping for
+     incomplete objects and non-function symbols in executables.  */
+  if ((abfd->flags & (EXEC_P | DYNAMIC)) == 0
+      || (symbol_type != ST_ENTRY
+	  && symbol_type != ST_PRI_PROG
+	  && symbol_type != ST_SEC_PROG
+	  && symbol_type != ST_MILLICODE))
+    {
+      int idx = (bfd_getb32 (symbol->info) >> SOM_SYMBOL_SYMBOL_INFO_SH)
+        & SOM_SYMBOL_SYMBOL_INFO_MASK;
+
+      for (section = abfd->sections; section != NULL; section = section->next)
+	if (section->target_index == idx && som_is_subspace (section))
+	  return section;
+    }
+  else
+    {
+      unsigned int value = bfd_getb32 (symbol->symbol_value);
+
+      /* For executables we will have to use the symbol's address and
+	 find out what section would contain that address.   Yuk.  */
+      for (section = abfd->sections; section; section = section->next)
+	if (value >= section->vma
+	    && value <= section->vma + section->size
+	    && som_is_subspace (section))
+	  return section;
+    }
+
+  /* Could be a symbol from an external library (such as an OMOS
+     shared library).  Don't abort.  */
+  return bfd_abs_section_ptr;
+}
+
+/* Read and save the symbol table associated with the given BFD.  */
+
+static unsigned int
+som_slurp_symbol_table (bfd *abfd)
+{
+  int symbol_count = bfd_get_symcount (abfd);
+  int symsize = sizeof (struct som_external_symbol_dictionary_record);
+  char *stringtab;
+  struct som_external_symbol_dictionary_record *buf = NULL, *bufp, *endbufp;
+  som_symbol_type *sym, *symbase;
+  bfd_size_type amt;
+
+  /* Return saved value if it exists.  */
+  if (obj_som_symtab (abfd) != NULL)
+    goto successful_return;
+
+  /* Special case.  This is *not* an error.  */
+  if (symbol_count == 0)
+    goto successful_return;
+
+  if (!som_slurp_string_table (abfd))
+    goto error_return;
+
+  stringtab = obj_som_stringtab (abfd);
+
+  amt = symbol_count;
+  amt *= sizeof (som_symbol_type);
+  symbase = bfd_zmalloc (amt);
+  if (symbase == NULL)
+    goto error_return;
+
+  /* Read in the external SOM representation.  */
+  amt = symbol_count;
+  amt *= symsize;
+  buf = bfd_malloc (amt);
+  if (buf == NULL && amt != 0)
+    goto error_return;
+  if (bfd_seek (abfd, obj_som_sym_filepos (abfd), SEEK_SET) != 0)
+    goto error_return;
+  if (bfd_bread (buf, amt, abfd) != amt)
+    goto error_return;
+
+  /* Iterate over all the symbols and internalize them.  */
+  endbufp = buf + symbol_count;
+  for (bufp = buf, sym = symbase; bufp < endbufp; ++bufp)
+    {
+      unsigned int flags = bfd_getb32 (bufp->flags);
+      unsigned int symbol_type =
+        (flags >> SOM_SYMBOL_TYPE_SH) & SOM_SYMBOL_TYPE_MASK;
+      unsigned int symbol_scope =
+        (flags >> SOM_SYMBOL_SCOPE_SH) & SOM_SYMBOL_SCOPE_MASK;
+
+      /* I don't think we care about these.  */
+      if (symbol_type == ST_SYM_EXT || symbol_type == ST_ARG_EXT)
+	continue;
+
+      /* Set some private data we care about.  */
+      if (symbol_type == ST_NULL)
+	som_symbol_data (sym)->som_type = SYMBOL_TYPE_UNKNOWN;
+      else if (symbol_type == ST_ABSOLUTE)
+	som_symbol_data (sym)->som_type = SYMBOL_TYPE_ABSOLUTE;
+      else if (symbol_type == ST_DATA)
+	som_symbol_data (sym)->som_type = SYMBOL_TYPE_DATA;
+      else if (symbol_type == ST_CODE)
+	som_symbol_data (sym)->som_type = SYMBOL_TYPE_CODE;
+      else if (symbol_type == ST_PRI_PROG)
+	som_symbol_data (sym)->som_type = SYMBOL_TYPE_PRI_PROG;
+      else if (symbol_type == ST_SEC_PROG)
+	som_symbol_data (sym)->som_type = SYMBOL_TYPE_SEC_PROG;
+      else if (symbol_type == ST_ENTRY)
+	som_symbol_data (sym)->som_type = SYMBOL_TYPE_ENTRY;
+      else if (symbol_type == ST_MILLICODE)
+	som_symbol_data (sym)->som_type = SYMBOL_TYPE_MILLICODE;
+      else if (symbol_type == ST_PLABEL)
+	som_symbol_data (sym)->som_type = SYMBOL_TYPE_PLABEL;
+      else
+	som_symbol_data (sym)->som_type = SYMBOL_TYPE_UNKNOWN;
+      som_symbol_data (sym)->tc_data.ap.hppa_arg_reloc =
+        (flags >> SOM_SYMBOL_ARG_RELOC_SH) & SOM_SYMBOL_ARG_RELOC_MASK;
+
+      /* Some reasonable defaults.  */
+      sym->symbol.the_bfd = abfd;
+      sym->symbol.name = bfd_getb32 (bufp->name) + stringtab;
+      sym->symbol.value = bfd_getb32 (bufp->symbol_value);
+      sym->symbol.section = 0;
+      sym->symbol.flags = 0;
+
+      switch (symbol_type)
+	{
+	case ST_ENTRY:
+	case ST_MILLICODE:
+	  sym->symbol.flags |= BSF_FUNCTION;
+	  som_symbol_data (sym)->tc_data.ap.hppa_priv_level =
+	    sym->symbol.value & 0x3;
+	  sym->symbol.value &= ~0x3;
+	  break;
+
+	case ST_STUB:
+	case ST_CODE:
+	case ST_PRI_PROG:
+	case ST_SEC_PROG:
+	  som_symbol_data (sym)->tc_data.ap.hppa_priv_level =
+	    sym->symbol.value & 0x3;
+	  sym->symbol.value &= ~0x3;
+	  /* If the symbol's scope is SS_UNSAT, then these are
+	     undefined function symbols.  */
+	  if (symbol_scope == SS_UNSAT)
+	    sym->symbol.flags |= BSF_FUNCTION;
+
+	default:
+	  break;
+	}
+
+      /* Handle scoping and section information.  */
+      switch (symbol_scope)
+	{
+	/* symbol_info field is undefined for SS_EXTERNAL and SS_UNSAT symbols,
+	   so the section associated with this symbol can't be known.  */
+	case SS_EXTERNAL:
+	  if (symbol_type != ST_STORAGE)
+	    sym->symbol.section = bfd_und_section_ptr;
+	  else
+	    sym->symbol.section = bfd_com_section_ptr;
+	  sym->symbol.flags |= (BSF_EXPORT | BSF_GLOBAL);
+	  break;
+
+	case SS_UNSAT:
+	  if (symbol_type != ST_STORAGE)
+	    sym->symbol.section = bfd_und_section_ptr;
+	  else
+	    sym->symbol.section = bfd_com_section_ptr;
+	  break;
+
+	case SS_UNIVERSAL:
+	  sym->symbol.flags |= (BSF_EXPORT | BSF_GLOBAL);
+	  sym->symbol.section = bfd_section_from_som_symbol (abfd, bufp);
+	  sym->symbol.value -= sym->symbol.section->vma;
+	  break;
+
+	case SS_LOCAL:
+	  sym->symbol.flags |= BSF_LOCAL;
+	  sym->symbol.section = bfd_section_from_som_symbol (abfd, bufp);
+	  sym->symbol.value -= sym->symbol.section->vma;
+	  break;
+	}
+
+      /* Check for a weak symbol.  */
+      if (flags & SOM_SYMBOL_SECONDARY_DEF)
+	sym->symbol.flags |= BSF_WEAK;
+
+      /* Mark section symbols and symbols used by the debugger.
+	 Note $START$ is a magic code symbol, NOT a section symbol.  */
+      if (sym->symbol.name[0] == '$'
+	  && sym->symbol.name[strlen (sym->symbol.name) - 1] == '$'
+	  && !strcmp (sym->symbol.name, sym->symbol.section->name))
+	sym->symbol.flags |= BSF_SECTION_SYM;
+      else if (CONST_STRNEQ (sym->symbol.name, "L$0\002"))
+	{
+	  sym->symbol.flags |= BSF_SECTION_SYM;
+	  sym->symbol.name = sym->symbol.section->name;
+	}
+      else if (CONST_STRNEQ (sym->symbol.name, "L$0\001"))
+	sym->symbol.flags |= BSF_DEBUGGING;
+
+      /* Note increment at bottom of loop, since we skip some symbols
+	 we can not include it as part of the for statement.  */
+      sym++;
+    }
+
+  /* We modify the symbol count to record the number of BFD symbols we
+     created.  */
+  bfd_get_symcount (abfd) = sym - symbase;
+
+  /* Save our results and return success.  */
+  obj_som_symtab (abfd) = symbase;
+ successful_return:
+  if (buf != NULL)
+    free (buf);
+  return (TRUE);
+
+ error_return:
+  if (buf != NULL)
+    free (buf);
+  return FALSE;
+}
+
+/* Canonicalize a SOM symbol table.  Return the number of entries
+   in the symbol table.  */
+
+static long
+som_canonicalize_symtab (bfd *abfd, asymbol **location)
+{
+  int i;
+  som_symbol_type *symbase;
+
+  if (!som_slurp_symbol_table (abfd))
+    return -1;
+
+  i = bfd_get_symcount (abfd);
+  symbase = obj_som_symtab (abfd);
+
+  for (; i > 0; i--, location++, symbase++)
+    *location = &symbase->symbol;
+
+  /* Final null pointer.  */
+  *location = 0;
+  return (bfd_get_symcount (abfd));
+}
+
+/* Make a SOM symbol.  There is nothing special to do here.  */
+
+static asymbol *
+som_make_empty_symbol (bfd *abfd)
+{
+  bfd_size_type amt = sizeof (som_symbol_type);
+  som_symbol_type *new_symbol_type = bfd_zalloc (abfd, amt);
+
+  if (new_symbol_type == NULL)
+    return NULL;
+  new_symbol_type->symbol.the_bfd = abfd;
+
+  return &new_symbol_type->symbol;
+}
+
+/* Print symbol information.  */
+
+static void
+som_print_symbol (bfd *abfd,
+		  void *afile,
+		  asymbol *symbol,
+		  bfd_print_symbol_type how)
+{
+  FILE *file = (FILE *) afile;
+
+  switch (how)
+    {
+    case bfd_print_symbol_name:
+      fprintf (file, "%s", symbol->name);
+      break;
+    case bfd_print_symbol_more:
+      fprintf (file, "som ");
+      fprintf_vma (file, symbol->value);
+      fprintf (file, " %lx", (long) symbol->flags);
+      break;
+    case bfd_print_symbol_all:
+      {
+	const char *section_name;
+
+	section_name = symbol->section ? symbol->section->name : "(*none*)";
+	bfd_print_symbol_vandf (abfd, (void *) file, symbol);
+	fprintf (file, " %s\t%s", section_name, symbol->name);
+	break;
+      }
+    }
+}
+
+static bfd_boolean
+som_bfd_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED,
+			     const char *name)
+{
+  return name[0] == 'L' && name[1] == '$';
+}
+
+/* Count or process variable-length SOM fixup records.
+
+   To avoid code duplication we use this code both to compute the number
+   of relocations requested by a stream, and to internalize the stream.
+
+   When computing the number of relocations requested by a stream the
+   variables rptr, section, and symbols have no meaning.
+
+   Return the number of relocations requested by the fixup stream.  When
+   not just counting
+
+   This needs at least two or three more passes to get it cleaned up.  */
+
+static unsigned int
+som_set_reloc_info (unsigned char *fixup,
+		    unsigned int end,
+		    arelent *internal_relocs,
+		    asection *section,
+		    asymbol **symbols,
+		    bfd_boolean just_count)
+{
+  unsigned int op, varname, deallocate_contents = 0;
+  unsigned char *end_fixups = &fixup[end];
+  const struct fixup_format *fp;
+  const char *cp;
+  unsigned char *save_fixup;
+  int variables[26], stack[20], c, v, count, prev_fixup, *sp, saved_unwind_bits;
+  const int *subop;
+  arelent *rptr = internal_relocs;
+  unsigned int offset = 0;
+
+#define	var(c)		variables[(c) - 'A']
+#define	push(v)		(*sp++ = (v))
+#define	pop()		(*--sp)
+#define	emptystack()	(sp == stack)
+
+  som_initialize_reloc_queue (reloc_queue);
+  memset (variables, 0, sizeof (variables));
+  memset (stack, 0, sizeof (stack));
+  count = 0;
+  prev_fixup = 0;
+  saved_unwind_bits = 0;
+  sp = stack;
+
+  while (fixup < end_fixups)
+    {
+      /* Save pointer to the start of this fixup.  We'll use
+	 it later to determine if it is necessary to put this fixup
+	 on the queue.  */
+      save_fixup = fixup;
+
+      /* Get the fixup code and its associated format.  */
+      op = *fixup++;
+      fp = &som_fixup_formats[op];
+
+      /* Handle a request for a previous fixup.  */
+      if (*fp->format == 'P')
+	{
+	  /* Get pointer to the beginning of the prev fixup, move
+	     the repeated fixup to the head of the queue.  */
+	  fixup = reloc_queue[fp->D].reloc;
+	  som_reloc_queue_fix (reloc_queue, fp->D);
+	  prev_fixup = 1;
+
+	  /* Get the fixup code and its associated format.  */
+	  op = *fixup++;
+	  fp = &som_fixup_formats[op];
+	}
+
+      /* If this fixup will be passed to BFD, set some reasonable defaults.  */
+      if (! just_count
+	  && som_hppa_howto_table[op].type != R_NO_RELOCATION
+	  && som_hppa_howto_table[op].type != R_DATA_OVERRIDE)
+	{
+	  rptr->address = offset;
+	  rptr->howto = &som_hppa_howto_table[op];
+	  rptr->addend = 0;
+	  rptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+	}
+
+      /* Set default input length to 0.  Get the opcode class index
+	 into D.  */
+      var ('L') = 0;
+      var ('D') = fp->D;
+      var ('U') = saved_unwind_bits;
+
+      /* Get the opcode format.  */
+      cp = fp->format;
+
+      /* Process the format string.  Parsing happens in two phases,
+	 parse RHS, then assign to LHS.  Repeat until no more
+	 characters in the format string.  */
+      while (*cp)
+	{
+	  /* The variable this pass is going to compute a value for.  */
+	  varname = *cp++;
+
+	  /* Start processing RHS.  Continue until a NULL or '=' is found.  */
+	  do
+	    {
+	      c = *cp++;
+
+	      /* If this is a variable, push it on the stack.  */
+	      if (ISUPPER (c))
+		push (var (c));
+
+	      /* If this is a lower case letter, then it represents
+		 additional data from the fixup stream to be pushed onto
+		 the stack.  */
+	      else if (ISLOWER (c))
+		{
+		  int bits = (c - 'a') * 8;
+		  for (v = 0; c > 'a'; --c)
+		    v = (v << 8) | *fixup++;
+		  if (varname == 'V')
+		    v = sign_extend (v, bits);
+		  push (v);
+		}
+
+	      /* A decimal constant.  Push it on the stack.  */
+	      else if (ISDIGIT (c))
+		{
+		  v = c - '0';
+		  while (ISDIGIT (*cp))
+		    v = (v * 10) + (*cp++ - '0');
+		  push (v);
+		}
+	      else
+		/* An operator.  Pop two two values from the stack and
+		   use them as operands to the given operation.  Push
+		   the result of the operation back on the stack.  */
+		switch (c)
+		  {
+		  case '+':
+		    v = pop ();
+		    v += pop ();
+		    push (v);
+		    break;
+		  case '*':
+		    v = pop ();
+		    v *= pop ();
+		    push (v);
+		    break;
+		  case '<':
+		    v = pop ();
+		    v = pop () << v;
+		    push (v);
+		    break;
+		  default:
+		    abort ();
+		  }
+	    }
+	  while (*cp && *cp != '=');
+
+	  /* Move over the equal operator.  */
+	  cp++;
+
+	  /* Pop the RHS off the stack.  */
+	  c = pop ();
+
+	  /* Perform the assignment.  */
+	  var (varname) = c;
+
+	  /* Handle side effects. and special 'O' stack cases.  */
+	  switch (varname)
+	    {
+	    /* Consume some bytes from the input space.  */
+	    case 'L':
+	      offset += c;
+	      break;
+	    /* A symbol to use in the relocation.  Make a note
+	       of this if we are not just counting.  */
+	    case 'S':
+	      if (! just_count)
+		rptr->sym_ptr_ptr = &symbols[c];
+	      break;
+	    /* Argument relocation bits for a function call.  */
+	    case 'R':
+	      if (! just_count)
+		{
+		  unsigned int tmp = var ('R');
+		  rptr->addend = 0;
+
+		  if ((som_hppa_howto_table[op].type == R_PCREL_CALL
+		       && R_PCREL_CALL + 10 > op)
+		      || (som_hppa_howto_table[op].type == R_ABS_CALL
+			  && R_ABS_CALL + 10 > op))
+		    {
+		      /* Simple encoding.  */
+		      if (tmp > 4)
+			{
+			  tmp -= 5;
+			  rptr->addend |= 1;
+			}
+		      if (tmp == 4)
+			rptr->addend |= 1 << 8 | 1 << 6 | 1 << 4 | 1 << 2;
+		      else if (tmp == 3)
+			rptr->addend |= 1 << 8 | 1 << 6 | 1 << 4;
+		      else if (tmp == 2)
+			rptr->addend |= 1 << 8 | 1 << 6;
+		      else if (tmp == 1)
+			rptr->addend |= 1 << 8;
+		    }
+		  else
+		    {
+		      unsigned int tmp1, tmp2;
+
+		      /* First part is easy -- low order two bits are
+			 directly copied, then shifted away.  */
+		      rptr->addend = tmp & 0x3;
+		      tmp >>= 2;
+
+		      /* Diving the result by 10 gives us the second
+			 part.  If it is 9, then the first two words
+			 are a double precision paramater, else it is
+			 3 * the first arg bits + the 2nd arg bits.  */
+		      tmp1 = tmp / 10;
+		      tmp -= tmp1 * 10;
+		      if (tmp1 == 9)
+			rptr->addend += (0xe << 6);
+		      else
+			{
+			  /* Get the two pieces.  */
+			  tmp2 = tmp1 / 3;
+			  tmp1 -= tmp2 * 3;
+			  /* Put them in the addend.  */
+			  rptr->addend += (tmp2 << 8) + (tmp1 << 6);
+			}
+
+		      /* What's left is the third part.  It's unpacked
+			 just like the second.  */
+		      if (tmp == 9)
+			rptr->addend += (0xe << 2);
+		      else
+			{
+			  tmp2 = tmp / 3;
+			  tmp -= tmp2 * 3;
+			  rptr->addend += (tmp2 << 4) + (tmp << 2);
+			}
+		    }
+		  rptr->addend = HPPA_R_ADDEND (rptr->addend, 0);
+		}
+	      break;
+	    /* Handle the linker expression stack.  */
+	    case 'O':
+	      switch (op)
+		{
+		case R_COMP1:
+		  subop = comp1_opcodes;
+		  break;
+		case R_COMP2:
+		  subop = comp2_opcodes;
+		  break;
+		case R_COMP3:
+		  subop = comp3_opcodes;
+		  break;
+		default:
+		  abort ();
+		}
+	      while (*subop <= (unsigned char) c)
+		++subop;
+	      --subop;
+	      break;
+	    /* The lower 32unwind bits must be persistent.  */
+	    case 'U':
+	      saved_unwind_bits = var ('U');
+	      break;
+
+	    default:
+	      break;
+	    }
+	}
+
+      /* If we used a previous fixup, clean up after it.  */
+      if (prev_fixup)
+	{
+	  fixup = save_fixup + 1;
+	  prev_fixup = 0;
+	}
+      /* Queue it.  */
+      else if (fixup > save_fixup + 1)
+	som_reloc_queue_insert (save_fixup, fixup - save_fixup, reloc_queue);
+
+      /* We do not pass R_DATA_OVERRIDE or R_NO_RELOCATION
+	 fixups to BFD.  */
+      if (som_hppa_howto_table[op].type != R_DATA_OVERRIDE
+	  && som_hppa_howto_table[op].type != R_NO_RELOCATION)
+	{
+	  /* Done with a single reloction. Loop back to the top.  */
+	  if (! just_count)
+	    {
+	      if (som_hppa_howto_table[op].type == R_ENTRY)
+		rptr->addend = var ('T');
+	      else if (som_hppa_howto_table[op].type == R_EXIT)
+		rptr->addend = var ('U');
+	      else if (som_hppa_howto_table[op].type == R_PCREL_CALL
+		       || som_hppa_howto_table[op].type == R_ABS_CALL)
+		;
+	      else if (som_hppa_howto_table[op].type == R_DATA_ONE_SYMBOL)
+		{
+		  /* Try what was specified in R_DATA_OVERRIDE first
+		     (if anything).  Then the hard way using the
+		     section contents.  */
+		  rptr->addend = var ('V');
+
+		  if (rptr->addend == 0 && !section->contents)
+		    {
+		      /* Got to read the damn contents first.  We don't
+			 bother saving the contents (yet).  Add it one
+			 day if the need arises.  */
+		      bfd_byte *contents;
+		      if (!bfd_malloc_and_get_section (section->owner, section,
+						       &contents))
+			{
+			  if (contents != NULL)
+			    free (contents);
+			  return (unsigned) -1;
+			}
+		      section->contents = contents;
+		      deallocate_contents = 1;
+		    }
+		  else if (rptr->addend == 0)
+		    rptr->addend = bfd_get_32 (section->owner,
+					       (section->contents
+						+ offset - var ('L')));
+
+		}
+	      else
+		rptr->addend = var ('V');
+	      rptr++;
+	    }
+	  count++;
+	  /* Now that we've handled a "full" relocation, reset
+	     some state.  */
+	  memset (variables, 0, sizeof (variables));
+	  memset (stack, 0, sizeof (stack));
+	}
+    }
+  if (deallocate_contents)
+    free (section->contents);
+
+  return count;
+
+#undef var
+#undef push
+#undef pop
+#undef emptystack
+}
+
+/* Read in the relocs (aka fixups in SOM terms) for a section.
+
+   som_get_reloc_upper_bound calls this routine with JUST_COUNT
+   set to TRUE to indicate it only needs a count of the number
+   of actual relocations.  */
+
+static bfd_boolean
+som_slurp_reloc_table (bfd *abfd,
+		       asection *section,
+		       asymbol **symbols,
+		       bfd_boolean just_count)
+{
+  unsigned char *external_relocs;
+  unsigned int fixup_stream_size;
+  arelent *internal_relocs;
+  unsigned int num_relocs;
+  bfd_size_type amt;
+
+  fixup_stream_size = som_section_data (section)->reloc_size;
+  /* If there were no relocations, then there is nothing to do.  */
+  if (section->reloc_count == 0)
+    return TRUE;
+
+  /* If reloc_count is -1, then the relocation stream has not been
+     parsed.  We must do so now to know how many relocations exist.  */
+  if (section->reloc_count == (unsigned) -1)
+    {
+      amt = fixup_stream_size;
+      external_relocs = bfd_malloc (amt);
+      if (external_relocs == NULL)
+	return FALSE;
+      /* Read in the external forms.  */
+      if (bfd_seek (abfd,
+		    obj_som_reloc_filepos (abfd) + section->rel_filepos,
+		    SEEK_SET)
+	  != 0)
+	return FALSE;
+      if (bfd_bread (external_relocs, amt, abfd) != amt)
+	return FALSE;
+
+      /* Let callers know how many relocations found.
+	 also save the relocation stream as we will
+	 need it again.  */
+      section->reloc_count = som_set_reloc_info (external_relocs,
+						 fixup_stream_size,
+						 NULL, NULL, NULL, TRUE);
+
+      som_section_data (section)->reloc_stream = external_relocs;
+    }
+
+  /* If the caller only wanted a count, then return now.  */
+  if (just_count)
+    return TRUE;
+
+  num_relocs = section->reloc_count;
+  external_relocs = som_section_data (section)->reloc_stream;
+  /* Return saved information about the relocations if it is available.  */
+  if (section->relocation != NULL)
+    return TRUE;
+
+  amt = num_relocs;
+  amt *= sizeof (arelent);
+  internal_relocs = bfd_zalloc (abfd, (amt));
+  if (internal_relocs == NULL)
+    return FALSE;
+
+  /* Process and internalize the relocations.  */
+  som_set_reloc_info (external_relocs, fixup_stream_size,
+		      internal_relocs, section, symbols, FALSE);
+
+  /* We're done with the external relocations.  Free them.  */
+  free (external_relocs);
+  som_section_data (section)->reloc_stream = NULL;
+
+  /* Save our results and return success.  */
+  section->relocation = internal_relocs;
+  return TRUE;
+}
+
+/* Return the number of bytes required to store the relocation
+   information associated with the given section.  */
+
+static long
+som_get_reloc_upper_bound (bfd *abfd, sec_ptr asect)
+{
+  /* If section has relocations, then read in the relocation stream
+     and parse it to determine how many relocations exist.  */
+  if (asect->flags & SEC_RELOC)
+    {
+      if (! som_slurp_reloc_table (abfd, asect, NULL, TRUE))
+	return -1;
+      return (asect->reloc_count + 1) * sizeof (arelent *);
+    }
+
+  /* There are no relocations.  Return enough space to hold the
+     NULL pointer which will be installed if som_canonicalize_reloc
+     is called.  */
+  return sizeof (arelent *);
+}
+
+/* Convert relocations from SOM (external) form into BFD internal
+   form.  Return the number of relocations.  */
+
+static long
+som_canonicalize_reloc (bfd *abfd,
+			sec_ptr section,
+			arelent **relptr,
+			asymbol **symbols)
+{
+  arelent *tblptr;
+  int count;
+
+  if (! som_slurp_reloc_table (abfd, section, symbols, FALSE))
+    return -1;
+
+  count = section->reloc_count;
+  tblptr = section->relocation;
+
+  while (count--)
+    *relptr++ = tblptr++;
+
+  *relptr = NULL;
+  return section->reloc_count;
+}
+
+extern const bfd_target som_vec;
+
+/* A hook to set up object file dependent section information.  */
+
+static bfd_boolean
+som_new_section_hook (bfd *abfd, asection *newsect)
+{
+  if (!newsect->used_by_bfd)
+    {
+      bfd_size_type amt = sizeof (struct som_section_data_struct);
+
+      newsect->used_by_bfd = bfd_zalloc (abfd, amt);
+      if (!newsect->used_by_bfd)
+	return FALSE;
+    }
+  newsect->alignment_power = 3;
+
+  /* We allow more than three sections internally.  */
+  return _bfd_generic_new_section_hook (abfd, newsect);
+}
+
+/* Copy any private info we understand from the input symbol
+   to the output symbol.  */
+
+static bfd_boolean
+som_bfd_copy_private_symbol_data (bfd *ibfd,
+				  asymbol *isymbol,
+				  bfd *obfd,
+				  asymbol *osymbol)
+{
+  struct som_symbol *input_symbol = (struct som_symbol *) isymbol;
+  struct som_symbol *output_symbol = (struct som_symbol *) osymbol;
+
+  /* One day we may try to grok other private data.  */
+  if (ibfd->xvec->flavour != bfd_target_som_flavour
+      || obfd->xvec->flavour != bfd_target_som_flavour)
+    return FALSE;
+
+  /* The only private information we need to copy is the argument relocation
+     bits.  */
+  output_symbol->tc_data.ap.hppa_arg_reloc =
+    input_symbol->tc_data.ap.hppa_arg_reloc;
+
+  return TRUE;
+}
+
+/* Copy any private info we understand from the input section
+   to the output section.  */
+
+static bfd_boolean
+som_bfd_copy_private_section_data (bfd *ibfd,
+				   asection *isection,
+				   bfd *obfd,
+				   asection *osection)
+{
+  bfd_size_type amt;
+
+  /* One day we may try to grok other private data.  */
+  if (ibfd->xvec->flavour != bfd_target_som_flavour
+      || obfd->xvec->flavour != bfd_target_som_flavour
+      || (!som_is_space (isection) && !som_is_subspace (isection)))
+    return TRUE;
+
+  amt = sizeof (struct som_copyable_section_data_struct);
+  som_section_data (osection)->copy_data = bfd_zalloc (obfd, amt);
+  if (som_section_data (osection)->copy_data == NULL)
+    return FALSE;
+
+  memcpy (som_section_data (osection)->copy_data,
+	  som_section_data (isection)->copy_data,
+	  sizeof (struct som_copyable_section_data_struct));
+
+  /* Reparent if necessary.  */
+  if (som_section_data (osection)->copy_data->container)
+    som_section_data (osection)->copy_data->container =
+      som_section_data (osection)->copy_data->container->output_section;
+
+  return TRUE;
+}
+
+/* Copy any private info we understand from the input bfd
+   to the output bfd.  */
+
+static bfd_boolean
+som_bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
+{
+  /* One day we may try to grok other private data.  */
+  if (ibfd->xvec->flavour != bfd_target_som_flavour
+      || obfd->xvec->flavour != bfd_target_som_flavour)
+    return TRUE;
+
+  /* Allocate some memory to hold the data we need.  */
+  obj_som_exec_data (obfd) = bfd_zalloc (obfd, (bfd_size_type) sizeof (struct som_exec_data));
+  if (obj_som_exec_data (obfd) == NULL)
+    return FALSE;
+
+  /* Now copy the data.  */
+  memcpy (obj_som_exec_data (obfd), obj_som_exec_data (ibfd),
+	  sizeof (struct som_exec_data));
+
+  return TRUE;
+}
+
+/* Display the SOM header.  */
+
+static bfd_boolean
+som_bfd_print_private_bfd_data (bfd *abfd, void *farg)
+{
+  struct som_exec_auxhdr *exec_header;
+  struct som_aux_id* auxhdr;
+  FILE *f;
+
+  f = (FILE *) farg;
+
+  exec_header = obj_som_exec_hdr (abfd);
+  if (exec_header)
+    {
+      fprintf (f, _("\nExec Auxiliary Header\n"));
+      fprintf (f, "  flags              ");
+      auxhdr = &exec_header->som_auxhdr;
+      if (auxhdr->mandatory)
+	fprintf (f, "mandatory ");
+      if (auxhdr->copy)
+	fprintf (f, "copy ");
+      if (auxhdr->append)
+	fprintf (f, "append ");
+      if (auxhdr->ignore)
+	fprintf (f, "ignore ");
+      fprintf (f, "\n");
+      fprintf (f, "  type               %#x\n", auxhdr->type);
+      fprintf (f, "  length             %#x\n", auxhdr->length);
+
+      /* Note that, depending on the HP-UX version, the following fields can be
+         either ints, or longs.  */
+
+      fprintf (f, "  text size          %#lx\n", (long) exec_header->exec_tsize);
+      fprintf (f, "  text memory offset %#lx\n", (long) exec_header->exec_tmem);
+      fprintf (f, "  text file offset   %#lx\n", (long) exec_header->exec_tfile);
+      fprintf (f, "  data size          %#lx\n", (long) exec_header->exec_dsize);
+      fprintf (f, "  data memory offset %#lx\n", (long) exec_header->exec_dmem);
+      fprintf (f, "  data file offset   %#lx\n", (long) exec_header->exec_dfile);
+      fprintf (f, "  bss size           %#lx\n", (long) exec_header->exec_bsize);
+      fprintf (f, "  entry point        %#lx\n", (long) exec_header->exec_entry);
+      fprintf (f, "  loader flags       %#lx\n", (long) exec_header->exec_flags);
+      fprintf (f, "  bss initializer    %#lx\n", (long) exec_header->exec_bfill);
+    }
+
+  return TRUE;
+}
+
+/* Set backend info for sections which can not be described
+   in the BFD data structures.  */
+
+bfd_boolean
+bfd_som_set_section_attributes (asection *section,
+				int defined,
+				int private,
+				unsigned int sort_key,
+				int spnum)
+{
+  /* Allocate memory to hold the magic information.  */
+  if (som_section_data (section)->copy_data == NULL)
+    {
+      bfd_size_type amt = sizeof (struct som_copyable_section_data_struct);
+
+      som_section_data (section)->copy_data = bfd_zalloc (section->owner, amt);
+      if (som_section_data (section)->copy_data == NULL)
+	return FALSE;
+    }
+  som_section_data (section)->copy_data->sort_key = sort_key;
+  som_section_data (section)->copy_data->is_defined = defined;
+  som_section_data (section)->copy_data->is_private = private;
+  som_section_data (section)->copy_data->container = section;
+  som_section_data (section)->copy_data->space_number = spnum;
+  return TRUE;
+}
+
+/* Set backend info for subsections which can not be described
+   in the BFD data structures.  */
+
+bfd_boolean
+bfd_som_set_subsection_attributes (asection *section,
+				   asection *container,
+				   int access_ctr,
+				   unsigned int sort_key,
+				   int quadrant,
+				   int comdat,
+				   int common,
+				   int dup_common)
+{
+  /* Allocate memory to hold the magic information.  */
+  if (som_section_data (section)->copy_data == NULL)
+    {
+      bfd_size_type amt = sizeof (struct som_copyable_section_data_struct);
+
+      som_section_data (section)->copy_data = bfd_zalloc (section->owner, amt);
+      if (som_section_data (section)->copy_data == NULL)
+	return FALSE;
+    }
+  som_section_data (section)->copy_data->sort_key = sort_key;
+  som_section_data (section)->copy_data->access_control_bits = access_ctr;
+  som_section_data (section)->copy_data->quadrant = quadrant;
+  som_section_data (section)->copy_data->container = container;
+  som_section_data (section)->copy_data->is_comdat = comdat;
+  som_section_data (section)->copy_data->is_common = common;
+  som_section_data (section)->copy_data->dup_common = dup_common;
+  return TRUE;
+}
+
+/* Set the full SOM symbol type.  SOM needs far more symbol information
+   than any other object file format I'm aware of.  It is mandatory
+   to be able to know if a symbol is an entry point, millicode, data,
+   code, absolute, storage request, or procedure label.  If you get
+   the symbol type wrong your program will not link.  */
+
+void
+bfd_som_set_symbol_type (asymbol *symbol, unsigned int type)
+{
+  som_symbol_data (symbol)->som_type = type;
+}
+
+/* Attach an auxiliary header to the BFD backend so that it may be
+   written into the object file.  */
+
+bfd_boolean
+bfd_som_attach_aux_hdr (bfd *abfd, int type, char *string)
+{
+  bfd_size_type amt;
+
+  if (type == VERSION_AUX_ID)
+    {
+      size_t len = strlen (string);
+      int pad = 0;
+
+      if (len % 4)
+	pad = (4 - (len % 4));
+      amt = sizeof (struct som_string_auxhdr) + len + pad;
+      obj_som_version_hdr (abfd) = bfd_zalloc (abfd, amt);
+      if (!obj_som_version_hdr (abfd))
+	return FALSE;
+      obj_som_version_hdr (abfd)->header_id.type = VERSION_AUX_ID;
+      obj_som_version_hdr (abfd)->header_id.length = 4 + len + pad;
+      obj_som_version_hdr (abfd)->string_length = len;
+      memcpy (obj_som_version_hdr (abfd)->string, string, len);
+      memset (obj_som_version_hdr (abfd)->string + len, 0, pad);
+    }
+  else if (type == COPYRIGHT_AUX_ID)
+    {
+      int len = strlen (string);
+      int pad = 0;
+
+      if (len % 4)
+	pad = (4 - (len % 4));
+      amt = sizeof (struct som_string_auxhdr) + len + pad;
+      obj_som_copyright_hdr (abfd) = bfd_zalloc (abfd, amt);
+      if (!obj_som_copyright_hdr (abfd))
+	return FALSE;
+      obj_som_copyright_hdr (abfd)->header_id.type = COPYRIGHT_AUX_ID;
+      obj_som_copyright_hdr (abfd)->header_id.length = len + pad + 4;
+      obj_som_copyright_hdr (abfd)->string_length = len;
+      memcpy (obj_som_copyright_hdr (abfd)->string, string, len);
+      memset (obj_som_copyright_hdr (abfd)->string + len, 0, pad);
+    }
+  return TRUE;
+}
+
+/* Attach a compilation unit header to the BFD backend so that it may be
+   written into the object file.  */
+
+bfd_boolean
+bfd_som_attach_compilation_unit (bfd *abfd,
+				 const char *name,
+				 const char *language_name,
+				 const char *product_id,
+				 const char *version_id)
+{
+  struct som_compilation_unit *n;
+
+  n = (struct som_compilation_unit *) bfd_zalloc
+    (abfd, (bfd_size_type) sizeof (*n));
+  if (n == NULL)
+    return FALSE;
+
+#define STRDUP(f) \
+  if (f != NULL) \
+    { \
+      n->f.name = bfd_alloc (abfd, (bfd_size_type) strlen (f) + 1); \
+      if (n->f.name == NULL) \
+	return FALSE; \
+      strcpy (n->f.name, f); \
+    }
+
+  STRDUP (name);
+  STRDUP (language_name);
+  STRDUP (product_id);
+  STRDUP (version_id);
+
+#undef STRDUP
+
+  obj_som_compilation_unit (abfd) = n;
+
+  return TRUE;
+}
+
+static bfd_boolean
+som_get_section_contents (bfd *abfd,
+			  sec_ptr section,
+			  void *location,
+			  file_ptr offset,
+			  bfd_size_type count)
+{
+  if (count == 0 || ((section->flags & SEC_HAS_CONTENTS) == 0))
+    return TRUE;
+  if ((bfd_size_type) (offset+count) > section->size
+      || bfd_seek (abfd, (file_ptr) (section->filepos + offset), SEEK_SET) != 0
+      || bfd_bread (location, count, abfd) != count)
+    return FALSE; /* On error.  */
+  return TRUE;
+}
+
+static bfd_boolean
+som_set_section_contents (bfd *abfd,
+			  sec_ptr section,
+			  const void *location,
+			  file_ptr offset,
+			  bfd_size_type count)
+{
+  if (! abfd->output_has_begun)
+    {
+      /* Set up fixed parts of the file, space, and subspace headers.
+	 Notify the world that output has begun.  */
+      som_prep_headers (abfd);
+      abfd->output_has_begun = TRUE;
+      /* Start writing the object file.  This include all the string
+	 tables, fixup streams, and other portions of the object file.  */
+      som_begin_writing (abfd);
+    }
+
+  /* Only write subspaces which have "real" contents (eg. the contents
+     are not generated at run time by the OS).  */
+  if (!som_is_subspace (section)
+      || ((section->flags & SEC_HAS_CONTENTS) == 0))
+    return TRUE;
+
+  /* Seek to the proper offset within the object file and write the
+     data.  */
+  offset += som_section_data (section)->subspace_dict->file_loc_init_value;
+  if (bfd_seek (abfd, offset, SEEK_SET) != 0)
+    return FALSE;
+
+  if (bfd_bwrite (location, count, abfd) != count)
+    return FALSE;
+  return TRUE;
+}
+
+static bfd_boolean
+som_set_arch_mach (bfd *abfd,
+		   enum bfd_architecture arch,
+		   unsigned long machine)
+{
+  /* Allow any architecture to be supported by the SOM backend.  */
+  return bfd_default_set_arch_mach (abfd, arch, machine);
+}
+
+static bfd_boolean
+som_find_nearest_line (bfd *abfd,
+		       asection *section,
+		       asymbol **symbols,
+		       bfd_vma offset,
+		       const char **filename_ptr,
+		       const char **functionname_ptr,
+		       unsigned int *line_ptr)
+{
+  bfd_boolean found;
+  asymbol *func;
+  bfd_vma low_func;
+  asymbol **p;
+
+  if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset,
+                                             & found, filename_ptr,
+                                             functionname_ptr, line_ptr,
+                                             & somdata (abfd).line_info))
+    return FALSE;
+
+  if (found)
+    return TRUE;
+
+  if (symbols == NULL)
+    return FALSE;
+
+  /* Fallback: find function name from symbols table.  */
+  func = NULL;
+  low_func = 0;
+
+  for (p = symbols; *p != NULL; p++)
+    { 
+      som_symbol_type *q = (som_symbol_type *) *p;
+  
+      if (q->som_type == SYMBOL_TYPE_ENTRY
+	  && q->symbol.section == section
+	  && q->symbol.value >= low_func
+	  && q->symbol.value <= offset)
+	{
+	  func = (asymbol *) q;
+	  low_func = q->symbol.value;
+	}
+    }
+
+  if (func == NULL)
+    return FALSE;
+
+  *filename_ptr = NULL;
+  *functionname_ptr = bfd_asymbol_name (func);
+  *line_ptr = 0;
+
+  return TRUE;
+}
+
+static int
+som_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+		    struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  (*_bfd_error_handler) (_("som_sizeof_headers unimplemented"));
+  abort ();
+  return 0;
+}
+
+/* Return the single-character symbol type corresponding to
+   SOM section S, or '?' for an unknown SOM section.  */
+
+static char
+som_section_type (const char *s)
+{
+  const struct section_to_type *t;
+
+  for (t = &stt[0]; t->section; t++)
+    if (!strcmp (s, t->section))
+      return t->type;
+  return '?';
+}
+
+static int
+som_decode_symclass (asymbol *symbol)
+{
+  char c;
+
+  if (bfd_is_com_section (symbol->section))
+    return 'C';
+  if (bfd_is_und_section (symbol->section))
+    {
+      if (symbol->flags & BSF_WEAK)
+	{
+	  /* If weak, determine if it's specifically an object
+	     or non-object weak.  */
+	  if (symbol->flags & BSF_OBJECT)
+	    return 'v';
+	  else
+	    return 'w';
+	}
+      else
+	 return 'U';
+    }
+  if (bfd_is_ind_section (symbol->section))
+    return 'I';
+  if (symbol->flags & BSF_WEAK)
+    {
+      /* If weak, determine if it's specifically an object
+	 or non-object weak.  */
+      if (symbol->flags & BSF_OBJECT)
+	return 'V';
+      else
+	return 'W';
+    }
+  if (!(symbol->flags & (BSF_GLOBAL | BSF_LOCAL)))
+    return '?';
+
+  if (bfd_is_abs_section (symbol->section)
+      || (som_symbol_data (symbol) != NULL
+	  && som_symbol_data (symbol)->som_type == SYMBOL_TYPE_ABSOLUTE))
+    c = 'a';
+  else if (symbol->section)
+    c = som_section_type (symbol->section->name);
+  else
+    return '?';
+  if (symbol->flags & BSF_GLOBAL)
+    c = TOUPPER (c);
+  return c;
+}
+
+/* Return information about SOM symbol SYMBOL in RET.  */
+
+static void
+som_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+		     asymbol *symbol,
+		     symbol_info *ret)
+{
+  ret->type = som_decode_symclass (symbol);
+  if (ret->type != 'U')
+    ret->value = symbol->value + symbol->section->vma;
+  else
+    ret->value = 0;
+  ret->name = symbol->name;
+}
+
+/* Count the number of symbols in the archive symbol table.  Necessary
+   so that we can allocate space for all the carsyms at once.  */
+
+static bfd_boolean
+som_bfd_count_ar_symbols (bfd *abfd,
+			  struct som_lst_header *lst_header,
+			  symindex *count)
+{
+  unsigned int i;
+  unsigned char *hash_table;
+  bfd_size_type amt;
+  file_ptr lst_filepos;
+
+  lst_filepos = bfd_tell (abfd) - sizeof (struct som_external_lst_header);
+
+  amt = lst_header->hash_size * 4;
+  hash_table = bfd_malloc (amt);
+  if (hash_table == NULL && amt != 0)
+    goto error_return;
+
+  /* Don't forget to initialize the counter!  */
+  *count = 0;
+
+  /* Read in the hash table.  The has table is an array of 32bit file offsets
+     which point to the hash chains.  */
+  if (bfd_bread ((void *) hash_table, amt, abfd) != amt)
+    goto error_return;
+
+  /* Walk each chain counting the number of symbols found on that particular
+     chain.  */
+  for (i = 0; i < lst_header->hash_size; i++)
+    {
+      struct som_external_lst_symbol_record ext_lst_symbol;
+      unsigned int hash_val = bfd_getb32 (hash_table + 4 * i);
+
+      /* An empty chain has zero as it's file offset.  */
+      if (hash_val == 0)
+	continue;
+
+      /* Seek to the first symbol in this hash chain.  */
+      if (bfd_seek (abfd, lst_filepos + hash_val, SEEK_SET) != 0)
+	goto error_return;
+
+      /* Read in this symbol and update the counter.  */
+      amt = sizeof (ext_lst_symbol);
+      if (bfd_bread ((void *) &ext_lst_symbol, amt, abfd) != amt)
+	goto error_return;
+
+      (*count)++;
+
+      /* Now iterate through the rest of the symbols on this chain.  */
+      while (1)
+	{
+          unsigned int next_entry = bfd_getb32 (ext_lst_symbol.next_entry);
+
+          if (next_entry == 0)
+            break;
+
+	  /* Seek to the next symbol.  */
+	  if (bfd_seek (abfd, lst_filepos + next_entry, SEEK_SET) != 0)
+	    goto error_return;
+
+	  /* Read the symbol in and update the counter.  */
+	  amt = sizeof (ext_lst_symbol);
+	  if (bfd_bread ((void *) &ext_lst_symbol, amt, abfd) != amt)
+	    goto error_return;
+
+	  (*count)++;
+	}
+    }
+  if (hash_table != NULL)
+    free (hash_table);
+  return TRUE;
+
+ error_return:
+  if (hash_table != NULL)
+    free (hash_table);
+  return FALSE;
+}
+
+/* Fill in the canonical archive symbols (SYMS) from the archive described
+   by ABFD and LST_HEADER.  */
+
+static bfd_boolean
+som_bfd_fill_in_ar_symbols (bfd *abfd,
+			    struct som_lst_header *lst_header,
+			    carsym **syms)
+{
+  unsigned int i;
+  carsym *set = syms[0];
+  unsigned char *hash_table;
+  struct som_external_som_entry *som_dict = NULL;
+  bfd_size_type amt;
+  file_ptr lst_filepos;
+  unsigned int string_loc;
+
+  lst_filepos = bfd_tell (abfd) - sizeof (struct som_external_lst_header);
+  amt = lst_header->hash_size * 4;
+  hash_table = bfd_malloc (amt);
+  if (hash_table == NULL && amt != 0)
+    goto error_return;
+
+  /* Read in the hash table.  The has table is an array of 32bit file offsets
+     which point to the hash chains.  */
+  if (bfd_bread ((void *) hash_table, amt, abfd) != amt)
+    goto error_return;
+
+  /* Seek to and read in the SOM dictionary.  We will need this to fill
+     in the carsym's filepos field.  */
+  if (bfd_seek (abfd, lst_filepos + lst_header->dir_loc, SEEK_SET) != 0)
+    goto error_return;
+
+  amt = lst_header->module_count * sizeof (struct som_external_som_entry);
+  som_dict = bfd_malloc (amt);
+  if (som_dict == NULL && amt != 0)
+    goto error_return;
+
+  if (bfd_bread ((void *) som_dict, amt, abfd) != amt)
+    goto error_return;
+
+  string_loc = lst_header->string_loc;
+
+  /* Walk each chain filling in the carsyms as we go along.  */
+  for (i = 0; i < lst_header->hash_size; i++)
+    {
+      struct som_external_lst_symbol_record lst_symbol;
+      unsigned int hash_val;
+      unsigned int len;
+      unsigned char ext_len[4];
+
+      /* An empty chain has zero as it's file offset.  */
+      hash_val = bfd_getb32 (hash_table + 4 * i);
+      if (hash_val == 0)
+	continue;
+
+      /* Seek to and read the first symbol on the chain.  */
+      if (bfd_seek (abfd, lst_filepos + hash_val, SEEK_SET) != 0)
+	goto error_return;
+
+      amt = sizeof (lst_symbol);
+      if (bfd_bread ((void *) &lst_symbol, amt, abfd) != amt)
+	goto error_return;
+
+      /* Get the name of the symbol, first get the length which is stored
+	 as a 32bit integer just before the symbol.
+
+	 One might ask why we don't just read in the entire string table
+	 and index into it.  Well, according to the SOM ABI the string
+	 index can point *anywhere* in the archive to save space, so just
+	 using the string table would not be safe.  */
+      if (bfd_seek (abfd, (lst_filepos + string_loc
+                           + bfd_getb32 (lst_symbol.name) - 4), SEEK_SET) != 0)
+	goto error_return;
+
+      if (bfd_bread (&ext_len, (bfd_size_type) 4, abfd) != 4)
+	goto error_return;
+      len = bfd_getb32 (ext_len);
+
+      /* Allocate space for the name and null terminate it too.  */
+      set->name = bfd_zalloc (abfd, (bfd_size_type) len + 1);
+      if (!set->name)
+	goto error_return;
+      if (bfd_bread (set->name, (bfd_size_type) len, abfd) != len)
+	goto error_return;
+
+      set->name[len] = 0;
+
+      /* Fill in the file offset.  Note that the "location" field points
+	 to the SOM itself, not the ar_hdr in front of it.  */
+      set->file_offset =
+        bfd_getb32 (som_dict[bfd_getb32 (lst_symbol.som_index)].location)
+        - sizeof (struct ar_hdr);
+
+      /* Go to the next symbol.  */
+      set++;
+
+      /* Iterate through the rest of the chain.  */
+      while (1)
+	{
+          unsigned int next_entry = bfd_getb32 (lst_symbol.next_entry);
+
+          if (next_entry == 0)
+            break;
+
+	  /* Seek to the next symbol and read it in.  */
+	  if (bfd_seek (abfd, lst_filepos + next_entry, SEEK_SET) != 0)
+	    goto error_return;
+
+	  amt = sizeof (lst_symbol);
+	  if (bfd_bread ((void *) &lst_symbol, amt, abfd) != amt)
+	    goto error_return;
+
+	  /* Seek to the name length & string and read them in.  */
+	  if (bfd_seek (abfd, lst_filepos + string_loc
+                        + bfd_getb32 (lst_symbol.name) - 4, SEEK_SET) != 0)
+	    goto error_return;
+
+	  if (bfd_bread (&ext_len, (bfd_size_type) 4, abfd) != 4)
+	    goto error_return;
+          len = bfd_getb32 (ext_len);
+
+	  /* Allocate space for the name and null terminate it too.  */
+	  set->name = bfd_zalloc (abfd, (bfd_size_type) len + 1);
+	  if (!set->name)
+	    goto error_return;
+
+	  if (bfd_bread (set->name, (bfd_size_type) len, abfd) != len)
+	    goto error_return;
+	  set->name[len] = 0;
+
+	  /* Fill in the file offset.  Note that the "location" field points
+	     to the SOM itself, not the ar_hdr in front of it.  */
+	  set->file_offset =
+            bfd_getb32 (som_dict[bfd_getb32 (lst_symbol.som_index)].location)
+            - sizeof (struct ar_hdr);
+
+	  /* Go on to the next symbol.  */
+	  set++;
+	}
+    }
+  /* If we haven't died by now, then we successfully read the entire
+     archive symbol table.  */
+  if (hash_table != NULL)
+    free (hash_table);
+  if (som_dict != NULL)
+    free (som_dict);
+  return TRUE;
+
+ error_return:
+  if (hash_table != NULL)
+    free (hash_table);
+  if (som_dict != NULL)
+    free (som_dict);
+  return FALSE;
+}
+
+/* Read in the LST from the archive.  */
+
+static bfd_boolean
+som_slurp_armap (bfd *abfd)
+{
+  struct som_external_lst_header ext_lst_header;
+  struct som_lst_header lst_header;
+  struct ar_hdr ar_header;
+  unsigned int parsed_size;
+  struct artdata *ardata = bfd_ardata (abfd);
+  char nextname[17];
+  bfd_size_type amt = 16;
+  int i = bfd_bread ((void *) nextname, amt, abfd);
+
+  /* Special cases.  */
+  if (i == 0)
+    return TRUE;
+  if (i != 16)
+    return FALSE;
+
+  if (bfd_seek (abfd, (file_ptr) -16, SEEK_CUR) != 0)
+    return FALSE;
+
+  /* For archives without .o files there is no symbol table.  */
+  if (! CONST_STRNEQ (nextname, "/               "))
+    {
+      bfd_has_map (abfd) = FALSE;
+      return TRUE;
+    }
+
+  /* Read in and sanity check the archive header.  */
+  amt = sizeof (struct ar_hdr);
+  if (bfd_bread ((void *) &ar_header, amt, abfd) != amt)
+    return FALSE;
+
+  if (strncmp (ar_header.ar_fmag, ARFMAG, 2))
+    {
+      bfd_set_error (bfd_error_malformed_archive);
+      return FALSE;
+    }
+
+  /* How big is the archive symbol table entry?  */
+  errno = 0;
+  parsed_size = strtol (ar_header.ar_size, NULL, 10);
+  if (errno != 0)
+    {
+      bfd_set_error (bfd_error_malformed_archive);
+      return FALSE;
+    }
+
+  /* Save off the file offset of the first real user data.  */
+  ardata->first_file_filepos = bfd_tell (abfd) + parsed_size;
+
+  /* Read in the library symbol table.  We'll make heavy use of this
+     in just a minute.  */
+  amt = sizeof (struct som_external_lst_header);
+  if (bfd_bread ((void *) &ext_lst_header, amt, abfd) != amt)
+    return FALSE;
+
+  som_swap_lst_header_in (&ext_lst_header, &lst_header);
+
+  /* Sanity check.  */
+  if (lst_header.a_magic != LIBMAGIC)
+    {
+      bfd_set_error (bfd_error_malformed_archive);
+      return FALSE;
+    }
+
+  /* Count the number of symbols in the library symbol table.  */
+  if (! som_bfd_count_ar_symbols (abfd, &lst_header, &ardata->symdef_count))
+    return FALSE;
+
+  /* Get back to the start of the library symbol table.  */
+  if (bfd_seek (abfd, (ardata->first_file_filepos - parsed_size
+		       + sizeof (struct som_external_lst_header)),
+                SEEK_SET) != 0)
+    return FALSE;
+
+  /* Initialize the cache and allocate space for the library symbols.  */
+  ardata->cache = 0;
+  amt = ardata->symdef_count;
+  amt *= sizeof (carsym);
+  ardata->symdefs = bfd_alloc (abfd, amt);
+  if (!ardata->symdefs)
+    return FALSE;
+
+  /* Now fill in the canonical archive symbols.  */
+  if (! som_bfd_fill_in_ar_symbols (abfd, &lst_header, &ardata->symdefs))
+    return FALSE;
+
+  /* Seek back to the "first" file in the archive.  Note the "first"
+     file may be the extended name table.  */
+  if (bfd_seek (abfd, ardata->first_file_filepos, SEEK_SET) != 0)
+    return FALSE;
+
+  /* Notify the generic archive code that we have a symbol map.  */
+  bfd_has_map (abfd) = TRUE;
+  return TRUE;
+}
+
+/* Begin preparing to write a SOM library symbol table.
+
+   As part of the prep work we need to determine the number of symbols
+   and the size of the associated string section.  */
+
+static bfd_boolean
+som_bfd_prep_for_ar_write (bfd *abfd,
+			   unsigned int *num_syms,
+			   unsigned int *stringsize)
+{
+  bfd *curr_bfd = abfd->archive_head;
+
+  /* Some initialization.  */
+  *num_syms = 0;
+  *stringsize = 0;
+
+  /* Iterate over each BFD within this archive.  */
+  while (curr_bfd != NULL)
+    {
+      unsigned int curr_count, i;
+      som_symbol_type *sym;
+
+      /* Don't bother for non-SOM objects.  */
+      if (curr_bfd->format != bfd_object
+	  || curr_bfd->xvec->flavour != bfd_target_som_flavour)
+	{
+	  curr_bfd = curr_bfd->archive_next;
+	  continue;
+	}
+
+      /* Make sure the symbol table has been read, then snag a pointer
+	 to it.  It's a little slimey to grab the symbols via obj_som_symtab,
+	 but doing so avoids allocating lots of extra memory.  */
+      if (! som_slurp_symbol_table (curr_bfd))
+	return FALSE;
+
+      sym = obj_som_symtab (curr_bfd);
+      curr_count = bfd_get_symcount (curr_bfd);
+
+      /* Examine each symbol to determine if it belongs in the
+	 library symbol table.  */
+      for (i = 0; i < curr_count; i++, sym++)
+	{
+	  struct som_misc_symbol_info info;
+
+	  /* Derive SOM information from the BFD symbol.  */
+	  som_bfd_derive_misc_symbol_info (curr_bfd, &sym->symbol, &info);
+
+	  /* Should we include this symbol?  */
+	  if (info.symbol_type == ST_NULL
+	      || info.symbol_type == ST_SYM_EXT
+	      || info.symbol_type == ST_ARG_EXT)
+	    continue;
+
+	  /* Only global symbols and unsatisfied commons.  */
+	  if (info.symbol_scope != SS_UNIVERSAL
+	      && info.symbol_type != ST_STORAGE)
+	    continue;
+
+	  /* Do no include undefined symbols.  */
+	  if (bfd_is_und_section (sym->symbol.section))
+	    continue;
+
+	  /* Bump the various counters, being careful to honor
+	     alignment considerations in the string table.  */
+	  (*num_syms)++;
+	  *stringsize += strlen (sym->symbol.name) + 5;
+	  while (*stringsize % 4)
+	    (*stringsize)++;
+	}
+
+      curr_bfd = curr_bfd->archive_next;
+    }
+  return TRUE;
+}
+
+/* Hash a symbol name based on the hashing algorithm presented in the
+   SOM ABI.  */
+
+static unsigned int
+som_bfd_ar_symbol_hash (asymbol *symbol)
+{
+  unsigned int len = strlen (symbol->name);
+
+  /* Names with length 1 are special.  */
+  if (len == 1)
+    return 0x1000100 | (symbol->name[0] << 16) | symbol->name[0];
+
+  return ((len & 0x7f) << 24) | (symbol->name[1] << 16)
+	  | (symbol->name[len - 2] << 8) | symbol->name[len - 1];
+}
+
+/* Do the bulk of the work required to write the SOM library
+   symbol table.  */
+
+static bfd_boolean
+som_bfd_ar_write_symbol_stuff (bfd *abfd,
+			       unsigned int nsyms,
+			       unsigned int string_size,
+			       struct som_external_lst_header lst,
+			       unsigned elength)
+{
+  char *strings = NULL, *p;
+  struct som_external_lst_symbol_record *lst_syms = NULL, *curr_lst_sym;
+  bfd *curr_bfd;
+  unsigned char *hash_table = NULL;
+  struct som_external_som_entry *som_dict = NULL;
+  struct som_external_lst_symbol_record **last_hash_entry = NULL;
+  unsigned int curr_som_offset, som_index = 0;
+  bfd_size_type amt;
+  unsigned int module_count;
+  unsigned int hash_size;
+
+  hash_size = bfd_getb32 (lst.hash_size);
+  amt = hash_size * 4;
+  hash_table = bfd_zmalloc (amt);
+  if (hash_table == NULL && hash_size != 0)
+    goto error_return;
+
+  module_count = bfd_getb32 (lst.module_count);
+  amt = module_count * sizeof (struct som_external_som_entry);
+  som_dict = bfd_zmalloc (amt);
+  if (som_dict == NULL && module_count != 0)
+    goto error_return;
+
+  amt = hash_size * sizeof (struct som_external_lst_symbol_record *);
+  last_hash_entry = bfd_zmalloc (amt);
+  if (last_hash_entry == NULL && hash_size != 0)
+    goto error_return;
+
+  /* Symbols have som_index fields, so we have to keep track of the
+     index of each SOM in the archive.
+
+     The SOM dictionary has (among other things) the absolute file
+     position for the SOM which a particular dictionary entry
+     describes.  We have to compute that information as we iterate
+     through the SOMs/symbols.  */
+  som_index = 0;
+
+  /* We add in the size of the archive header twice as the location
+     in the SOM dictionary is the actual offset of the SOM, not the
+     archive header before the SOM.  */
+  curr_som_offset = 8 + 2 * sizeof (struct ar_hdr) + bfd_getb32 (lst.file_end);
+
+  /* Make room for the archive header and the contents of the
+     extended string table.  Note that elength includes the size
+     of the archive header for the extended name table!  */
+  if (elength)
+    curr_som_offset += elength;
+
+  /* Make sure we're properly aligned.  */
+  curr_som_offset = (curr_som_offset + 0x1) & ~0x1;
+
+  /* FIXME should be done with buffers just like everything else...  */
+  amt = nsyms;
+  amt *= sizeof (struct som_external_lst_symbol_record);
+  lst_syms = bfd_malloc (amt);
+  if (lst_syms == NULL && nsyms != 0)
+    goto error_return;
+  strings = bfd_malloc ((bfd_size_type) string_size);
+  if (strings == NULL && string_size != 0)
+    goto error_return;
+
+  p = strings;
+  curr_lst_sym = lst_syms;
+
+  curr_bfd = abfd->archive_head;
+  while (curr_bfd != NULL)
+    {
+      unsigned int curr_count, i;
+      som_symbol_type *sym;
+
+      /* Don't bother for non-SOM objects.  */
+      if (curr_bfd->format != bfd_object
+	  || curr_bfd->xvec->flavour != bfd_target_som_flavour)
+	{
+	  curr_bfd = curr_bfd->archive_next;
+	  continue;
+	}
+
+      /* Make sure the symbol table has been read, then snag a pointer
+	 to it.  It's a little slimey to grab the symbols via obj_som_symtab,
+	 but doing so avoids allocating lots of extra memory.  */
+      if (! som_slurp_symbol_table (curr_bfd))
+	goto error_return;
+
+      sym = obj_som_symtab (curr_bfd);
+      curr_count = bfd_get_symcount (curr_bfd);
+
+      for (i = 0; i < curr_count; i++, sym++)
+	{
+	  struct som_misc_symbol_info info;
+          struct som_external_lst_symbol_record *last;
+          unsigned int symbol_pos;
+          unsigned int slen;
+          unsigned int symbol_key;
+          unsigned int flags;
+
+	  /* Derive SOM information from the BFD symbol.  */
+	  som_bfd_derive_misc_symbol_info (curr_bfd, &sym->symbol, &info);
+
+	  /* Should we include this symbol?  */
+	  if (info.symbol_type == ST_NULL
+	      || info.symbol_type == ST_SYM_EXT
+	      || info.symbol_type == ST_ARG_EXT)
+	    continue;
+
+	  /* Only global symbols and unsatisfied commons.  */
+	  if (info.symbol_scope != SS_UNIVERSAL
+	      && info.symbol_type != ST_STORAGE)
+	    continue;
+
+	  /* Do no include undefined symbols.  */
+	  if (bfd_is_und_section (sym->symbol.section))
+	    continue;
+
+	  /* If this is the first symbol from this SOM, then update
+	     the SOM dictionary too.  */
+	  if (bfd_getb32 (som_dict[som_index].location) == 0)
+	    {
+	      bfd_putb32 (curr_som_offset, som_dict[som_index].location);
+	      bfd_putb32 (arelt_size (curr_bfd), som_dict[som_index].length);
+	    }
+
+          symbol_key = som_bfd_ar_symbol_hash (&sym->symbol);
+
+	  /* Fill in the lst symbol record.  */
+          flags = 0;
+          if (info.secondary_def)
+            flags |= LST_SYMBOL_SECONDARY_DEF;
+          flags |= info.symbol_type << LST_SYMBOL_SYMBOL_TYPE_SH;
+          flags |= info.symbol_scope << LST_SYMBOL_SYMBOL_SCOPE_SH;
+          if (bfd_is_com_section (sym->symbol.section))
+            flags |= LST_SYMBOL_IS_COMMON;
+          if (info.dup_common)
+            flags |= LST_SYMBOL_DUP_COMMON;
+          flags |= 3 << LST_SYMBOL_XLEAST_SH;
+          flags |= info.arg_reloc << LST_SYMBOL_ARG_RELOC_SH;
+          bfd_putb32 (flags, curr_lst_sym->flags);
+          bfd_putb32 (p - strings + 4, curr_lst_sym->name);
+          bfd_putb32 (0, curr_lst_sym->qualifier_name);
+          bfd_putb32 (info.symbol_info, curr_lst_sym->symbol_info);
+          bfd_putb32 (info.symbol_value | info.priv_level,
+                      curr_lst_sym->symbol_value);
+          bfd_putb32 (0, curr_lst_sym->symbol_descriptor);
+          curr_lst_sym->reserved = 0;
+          bfd_putb32 (som_index, curr_lst_sym->som_index);
+          bfd_putb32 (symbol_key, curr_lst_sym->symbol_key);
+          bfd_putb32 (0, curr_lst_sym->next_entry);
+
+	  /* Insert into the hash table.  */
+          symbol_pos =
+            (curr_lst_sym - lst_syms)
+            * sizeof (struct som_external_lst_symbol_record)
+            + hash_size * 4
+            + module_count * sizeof (struct som_external_som_entry)
+            + sizeof (struct som_external_lst_header);
+          last = last_hash_entry[symbol_key % hash_size];
+	  if (last != NULL)
+	    {
+	      /* There is already something at the head of this hash chain,
+		 so tack this symbol onto the end of the chain.  */
+	      bfd_putb32 (symbol_pos, last->next_entry);
+	    }
+	  else
+	    /* First entry in this hash chain.  */
+            bfd_putb32 (symbol_pos, hash_table + 4 * (symbol_key % hash_size));
+
+	  /* Keep track of the last symbol we added to this chain so we can
+	     easily update its next_entry pointer.  */
+          last_hash_entry[symbol_key % hash_size] = curr_lst_sym;
+
+	  /* Update the string table.  */
+          slen = strlen (sym->symbol.name);
+	  bfd_put_32 (abfd, slen, p);
+	  p += 4;
+          slen++; /* Nul terminator.  */
+	  memcpy (p, sym->symbol.name, slen);
+	  p += slen;
+	  while (slen % 4)
+	    {
+	      bfd_put_8 (abfd, 0, p);
+	      p++;
+              slen++;
+	    }
+          BFD_ASSERT (p <= strings + string_size);
+
+	  /* Head to the next symbol.  */
+	  curr_lst_sym++;
+	}
+
+      /* Keep track of where each SOM will finally reside; then look
+	 at the next BFD.  */
+      curr_som_offset += arelt_size (curr_bfd) + sizeof (struct ar_hdr);
+
+      /* A particular object in the archive may have an odd length; the
+	 linker requires objects begin on an even boundary.  So round
+	 up the current offset as necessary.  */
+      curr_som_offset = (curr_som_offset + 0x1) &~ (unsigned) 1;
+      curr_bfd = curr_bfd->archive_next;
+      som_index++;
+    }
+
+  /* Now scribble out the hash table.  */
+  amt = hash_size * 4;
+  if (bfd_bwrite ((void *) hash_table, amt, abfd) != amt)
+    goto error_return;
+
+  /* Then the SOM dictionary.  */
+  amt = module_count * sizeof (struct som_external_som_entry);
+  if (bfd_bwrite ((void *) som_dict, amt, abfd) != amt)
+    goto error_return;
+
+  /* The library symbols.  */
+  amt = nsyms * sizeof (struct som_external_lst_symbol_record);
+  if (bfd_bwrite ((void *) lst_syms, amt, abfd) != amt)
+    goto error_return;
+
+  /* And finally the strings.  */
+  amt = string_size;
+  if (bfd_bwrite ((void *) strings, amt, abfd) != amt)
+    goto error_return;
+
+  if (hash_table != NULL)
+    free (hash_table);
+  if (som_dict != NULL)
+    free (som_dict);
+  if (last_hash_entry != NULL)
+    free (last_hash_entry);
+  if (lst_syms != NULL)
+    free (lst_syms);
+  if (strings != NULL)
+    free (strings);
+  return TRUE;
+
+ error_return:
+  if (hash_table != NULL)
+    free (hash_table);
+  if (som_dict != NULL)
+    free (som_dict);
+  if (last_hash_entry != NULL)
+    free (last_hash_entry);
+  if (lst_syms != NULL)
+    free (lst_syms);
+  if (strings != NULL)
+    free (strings);
+
+  return FALSE;
+}
+
+/* Write out the LST for the archive.
+
+   You'll never believe this is really how armaps are handled in SOM...  */
+
+static bfd_boolean
+som_write_armap (bfd *abfd,
+		 unsigned int elength,
+		 struct orl *map ATTRIBUTE_UNUSED,
+		 unsigned int orl_count ATTRIBUTE_UNUSED,
+		 int stridx ATTRIBUTE_UNUSED)
+{
+  bfd *curr_bfd;
+  struct stat statbuf;
+  unsigned int i, lst_size, nsyms, stringsize;
+  struct ar_hdr hdr;
+  struct som_external_lst_header lst;
+  unsigned char *p;
+  bfd_size_type amt;
+  unsigned int csum;
+  unsigned int module_count;
+
+  /* We'll use this for the archive's date and mode later.  */
+  if (stat (abfd->filename, &statbuf) != 0)
+    {
+      bfd_set_error (bfd_error_system_call);
+      return FALSE;
+    }
+  /* Fudge factor.  */
+  bfd_ardata (abfd)->armap_timestamp = statbuf.st_mtime + 60;
+
+  /* Account for the lst header first.  */
+  lst_size = sizeof (struct som_external_lst_header);
+
+  /* Start building the LST header.  */
+  /* FIXME:  Do we need to examine each element to determine the
+     largest id number?  */
+  bfd_putb16 (CPU_PA_RISC1_0, &lst.system_id);
+  bfd_putb16 (LIBMAGIC, &lst.a_magic);
+  bfd_putb32 (VERSION_ID, &lst.version_id);
+  bfd_putb32 (0, &lst.file_time.secs);
+  bfd_putb32 (0, &lst.file_time.nanosecs);
+
+  bfd_putb32 (lst_size, &lst.hash_loc);
+  bfd_putb32 (SOM_LST_HASH_SIZE, &lst.hash_size);
+
+  /* Hash table is a SOM_LST_HASH_SIZE 32bit offsets.  */
+  lst_size += 4 * SOM_LST_HASH_SIZE;
+
+  /* We need to count the number of SOMs in this archive.  */
+  curr_bfd = abfd->archive_head;
+  module_count = 0;
+  while (curr_bfd != NULL)
+    {
+      /* Only true SOM objects count.  */
+      if (curr_bfd->format == bfd_object
+	  && curr_bfd->xvec->flavour == bfd_target_som_flavour)
+	module_count++;
+      curr_bfd = curr_bfd->archive_next;
+    }
+  bfd_putb32 (module_count, &lst.module_count);
+  bfd_putb32 (module_count, &lst.module_limit);
+  bfd_putb32 (lst_size, &lst.dir_loc);
+  lst_size += sizeof (struct som_external_som_entry) * module_count;
+
+  /* We don't support import/export tables, auxiliary headers,
+     or free lists yet.  Make the linker work a little harder
+     to make our life easier.  */
+
+  bfd_putb32 (0, &lst.export_loc);
+  bfd_putb32 (0, &lst.export_count);
+  bfd_putb32 (0, &lst.import_loc);
+  bfd_putb32 (0, &lst.aux_loc);
+  bfd_putb32 (0, &lst.aux_size);
+
+  /* Count how many symbols we will have on the hash chains and the
+     size of the associated string table.  */
+  if (! som_bfd_prep_for_ar_write (abfd, &nsyms, &stringsize))
+    return FALSE;
+
+  lst_size += sizeof (struct som_external_lst_symbol_record) * nsyms;
+
+  /* For the string table.  One day we might actually use this info
+     to avoid small seeks/reads when reading archives.  */
+  bfd_putb32 (lst_size, &lst.string_loc);
+  bfd_putb32 (stringsize, &lst.string_size);
+  lst_size += stringsize;
+
+  /* SOM ABI says this must be zero.  */
+  bfd_putb32 (0, &lst.free_list);
+  bfd_putb32 (lst_size, &lst.file_end);
+
+  /* Compute the checksum.  Must happen after the entire lst header
+     has filled in.  */
+  p = (unsigned char *) &lst;
+  csum = 0;
+  for (i = 0; i < sizeof (struct som_external_lst_header) - sizeof (int);
+       i += 4)
+    csum ^= bfd_getb32 (&p[i]);
+  bfd_putb32 (csum, &lst.checksum);
+
+  sprintf (hdr.ar_name, "/              ");
+  _bfd_ar_spacepad (hdr.ar_date, sizeof (hdr.ar_date), "%-12ld",
+                    bfd_ardata (abfd)->armap_timestamp);
+  _bfd_ar_spacepad (hdr.ar_uid, sizeof (hdr.ar_uid), "%ld",
+                    statbuf.st_uid);
+  _bfd_ar_spacepad (hdr.ar_gid, sizeof (hdr.ar_gid), "%ld",
+                    statbuf.st_gid);
+  _bfd_ar_spacepad (hdr.ar_mode, sizeof (hdr.ar_mode), "%-8o",
+                    (unsigned int)statbuf.st_mode);
+  _bfd_ar_spacepad (hdr.ar_size, sizeof (hdr.ar_size), "%-10d",
+                    (int) lst_size);
+  hdr.ar_fmag[0] = '`';
+  hdr.ar_fmag[1] = '\012';
+
+  /* Turn any nulls into spaces.  */
+  for (i = 0; i < sizeof (struct ar_hdr); i++)
+    if (((char *) (&hdr))[i] == '\0')
+      (((char *) (&hdr))[i]) = ' ';
+
+  /* Scribble out the ar header.  */
+  amt = sizeof (struct ar_hdr);
+  if (bfd_bwrite ((void *) &hdr, amt, abfd) != amt)
+    return FALSE;
+
+  /* Now scribble out the lst header.  */
+  amt = sizeof (struct som_external_lst_header);
+  if (bfd_bwrite ((void *) &lst, amt, abfd) != amt)
+    return FALSE;
+
+  /* Build and write the armap.  */
+  if (!som_bfd_ar_write_symbol_stuff (abfd, nsyms, stringsize, lst, elength))
+    return FALSE;
+
+  /* Done.  */
+  return TRUE;
+}
+
+/* Free all information we have cached for this BFD.  We can always
+   read it again later if we need it.  */
+
+static bfd_boolean
+som_bfd_free_cached_info (bfd *abfd)
+{
+  asection *o;
+
+  if (bfd_get_format (abfd) != bfd_object)
+    return TRUE;
+
+#define FREE(x) if (x != NULL) { free (x); x = NULL; }
+  /* Free the native string and symbol tables.  */
+  FREE (obj_som_symtab (abfd));
+  FREE (obj_som_stringtab (abfd));
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      /* Free the native relocations.  */
+      o->reloc_count = (unsigned) -1;
+      FREE (som_section_data (o)->reloc_stream);
+      /* Do not free the generic relocations as they are objalloc'ed.  */
+    }
+#undef FREE
+
+  return TRUE;
+}
+
+/* End of miscellaneous support functions.  */
+
+/* Linker support functions.  */
+
+static bfd_boolean
+som_bfd_link_split_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec)
+{
+  return som_is_subspace (sec) && sec->size > 240000;
+}
+
+#define	som_close_and_cleanup		        som_bfd_free_cached_info
+#define som_read_ar_hdr			        _bfd_generic_read_ar_hdr
+#define som_write_ar_hdr		        _bfd_generic_write_ar_hdr
+#define som_openr_next_archived_file	        bfd_generic_openr_next_archived_file
+#define som_get_elt_at_index		        _bfd_generic_get_elt_at_index
+#define som_generic_stat_arch_elt	        bfd_generic_stat_arch_elt
+#define som_truncate_arname		        bfd_bsd_truncate_arname
+#define som_slurp_extended_name_table	        _bfd_slurp_extended_name_table
+#define som_construct_extended_name_table       _bfd_archive_coff_construct_extended_name_table
+#define som_update_armap_timestamp	        bfd_true
+#define som_bfd_is_target_special_symbol   ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define som_get_lineno			        _bfd_nosymbols_get_lineno
+#define som_bfd_make_debug_symbol	        _bfd_nosymbols_bfd_make_debug_symbol
+#define som_read_minisymbols		        _bfd_generic_read_minisymbols
+#define som_minisymbol_to_symbol	        _bfd_generic_minisymbol_to_symbol
+#define som_get_section_contents_in_window      _bfd_generic_get_section_contents_in_window
+#define som_bfd_get_relocated_section_contents  bfd_generic_get_relocated_section_contents
+#define som_bfd_relax_section                   bfd_generic_relax_section
+#define som_bfd_link_hash_table_create          _bfd_generic_link_hash_table_create
+#define som_bfd_link_hash_table_free            _bfd_generic_link_hash_table_free
+#define som_bfd_link_add_symbols                _bfd_generic_link_add_symbols
+#define som_bfd_link_just_syms                  _bfd_generic_link_just_syms
+#define som_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define som_bfd_final_link                      _bfd_generic_final_link
+#define som_bfd_gc_sections		        bfd_generic_gc_sections
+#define som_bfd_lookup_section_flags            bfd_generic_lookup_section_flags
+#define som_bfd_merge_sections		        bfd_generic_merge_sections
+#define som_bfd_is_group_section	        bfd_generic_is_group_section
+#define som_bfd_discard_group		        bfd_generic_discard_group
+#define som_section_already_linked              _bfd_generic_section_already_linked
+#define som_bfd_define_common_symbol            bfd_generic_define_common_symbol
+#define som_bfd_merge_private_bfd_data		_bfd_generic_bfd_merge_private_bfd_data
+#define som_bfd_copy_private_header_data	_bfd_generic_bfd_copy_private_header_data
+#define som_bfd_set_private_flags		_bfd_generic_bfd_set_private_flags
+#define som_find_inliner_info			_bfd_nosymbols_find_inliner_info
+
+const bfd_target som_vec =
+{
+  "som",			/* Name.  */
+  bfd_target_som_flavour,
+  BFD_ENDIAN_BIG,		/* Target byte order.  */
+  BFD_ENDIAN_BIG,		/* Target headers byte order.  */
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED | DYNAMIC),
+  (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS | SEC_LINK_ONCE
+   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),		/* Section flags.  */
+
+  /* Leading_symbol_char: is the first char of a user symbol
+     predictable, and if so what is it.  */
+  0,
+  '/',				/* AR_pad_char.  */
+  14,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Data.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Headers.  */
+  {_bfd_dummy_target,
+   som_object_p,		/* bfd_check_format.  */
+   bfd_generic_archive_p,
+   _bfd_dummy_target
+  },
+  {
+    bfd_false,
+    som_mkobject,
+    _bfd_generic_mkarchive,
+    bfd_false
+  },
+  {
+    bfd_false,
+    som_write_object_contents,
+    _bfd_write_archive_contents,
+    bfd_false,
+  },
+#undef som
+
+  BFD_JUMP_TABLE_GENERIC (som),
+  BFD_JUMP_TABLE_COPY (som),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (som),
+  BFD_JUMP_TABLE_SYMBOLS (som),
+  BFD_JUMP_TABLE_RELOCS (som),
+  BFD_JUMP_TABLE_WRITE (som),
+  BFD_JUMP_TABLE_LINK (som),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  NULL
+};
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/som.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/som.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/som.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/som.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,238 @@
+/* HP PA-RISC SOM object file format:  definitions internal to BFD.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001,
+   2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+
+   Contributed by the Center for Software Science at the
+   University of Utah (pa-gdb-bugs@cs.utah.edu).
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#ifndef _SOM_H
+#define _SOM_H
+
+#include "libhppa.h"
+
+/* We want reloc.h to provide PA 2.0 defines.  */
+#define PA_2_0
+
+#include "som/aout.h"
+#include "som/lst.h"
+#include "som/internal.h"
+
+/* The SOM BFD backend doesn't currently use anything from these
+   two include files, but it's likely to need them in the future.  */
+#ifdef R_DLT_REL
+#include <shl.h>
+#include <dl.h>
+#endif
+
+#if defined (HOST_HPPABSD) || defined (HOST_HPPAOSF)
+/* BSD uses a completely different scheme for object file identification.
+   so for now, define _PA_RISC_ID to accept any random value for a model
+   number.  */
+#undef _PA_RISC_ID
+#define _PA_RISC_ID(__m_num) 1
+#endif /* HOST_HPPABSD */
+
+typedef struct som_symbol
+{
+  asymbol symbol;
+  unsigned int som_type;
+
+  /* Structured like the ELF tc_data union.  Allows more code sharing
+     in GAS this way.  */
+  union
+  {
+    struct
+    {
+      unsigned int hppa_arg_reloc;
+      unsigned int hppa_priv_level;
+    } ap;
+    PTR any;
+  }
+  tc_data;
+
+  /* Index of this symbol in the symbol table.  Only used when
+     building relocation streams for incomplete objects.  */
+  int index;
+
+  /* How many times this symbol is used in a relocation.  By sorting
+     the symbols from most used to least used we can significantly
+     reduce the size of the relocation stream for incomplete objects.  */
+  int reloc_count;
+
+  /* During object file writing, the offset of the name of this symbol
+     in the SOM string table.  */
+  int stringtab_offset;
+}
+som_symbol_type;
+
+/* A structure containing all the magic information stored in a BFD's
+   private data which needs to be copied during an objcopy/strip run.  */
+struct som_exec_data
+{
+  /* Sort-of a magic number.  BSD uses it to distinguish between
+     native executables and hpux executables.  */
+  short system_id;
+
+  /* Magic exec flags.  These control things like whether or not
+     null pointer dereferencing is allowed and the like.  */
+  long exec_flags;
+
+  /* We must preserve the version identifier too.  Some versions
+     of the HP linker do not grok NEW_VERSION_ID for reasons unknown.  */
+  unsigned int version_id;
+
+  /* Add more stuff here as needed.  Good examples of information
+     we might want to pass would be presumed_dp, entry_* and maybe
+     others from the file header.  */
+};
+
+struct somdata
+{
+  /* All the magic information about an executable which lives
+     in the private BFD structure and needs to be copied from
+     the input bfd to the output bfd during an objcopy/strip.  */
+  struct som_exec_data *exec_data;
+
+  /* These three fields are only used when writing files and are
+     generated from scratch.  They need not be copied for objcopy
+     or strip to work.  */
+  struct som_header *file_hdr;
+  struct som_string_auxhdr *copyright_aux_hdr;
+  struct som_string_auxhdr *version_aux_hdr;
+  struct som_exec_auxhdr *exec_hdr;
+  struct som_compilation_unit *comp_unit;
+
+  /* Pointers to a saved copy of the symbol and string tables.  These
+     need not be copied for objcopy or strip to work.  */
+  som_symbol_type *symtab;
+  char *stringtab;
+  asymbol **sorted_syms;
+
+  /* We remember these offsets so that after check_file_format, we have
+     no dependencies on the particular format of the exec_hdr.
+     These offsets need not be copied for objcopy or strip to work.  */
+
+  file_ptr sym_filepos;
+  file_ptr str_filepos;
+  file_ptr reloc_filepos;
+  unsigned stringtab_size;
+  void * line_info;
+};
+
+struct som_data_struct
+{
+  struct somdata a;
+};
+
+/* Substructure of som_section_data_struct used to hold information
+   which can't be represented by the generic BFD section structure,
+   but which must be copied during objcopy or strip.  */
+struct som_copyable_section_data_struct
+{
+  /* Various fields in space and subspace headers that we need
+     to pass around.  */
+  unsigned int sort_key : 8;
+  unsigned int access_control_bits : 7;
+  unsigned int is_defined : 1;
+  unsigned int is_private : 1;
+  unsigned int quadrant : 2;
+  unsigned int is_comdat : 1;
+  unsigned int is_common : 1;
+  unsigned int dup_common : 1;
+
+  /* For subspaces, this points to the section which represents the
+     space in which the subspace is contained.  For spaces it points
+     back to the section for this space.  */
+  asection *container;
+
+  /* The user-specified space number.  It is wrong to use this as
+     an index since duplicates and holes are allowed.  */
+  int space_number;
+
+  /* Add more stuff here as needed.  Good examples of information
+     we might want to pass would be initialization pointers,
+     and the many subspace flags we do not represent yet.  */
+};
+
+/* Used to keep extra SOM specific information for a given section.
+
+   reloc_size holds the size of the relocation stream, note this
+   is very different from the number of relocations as SOM relocations
+   are variable length.
+
+   reloc_stream is the actual stream of relocation entries.  */
+
+struct som_section_data_struct
+{
+  struct som_copyable_section_data_struct *copy_data;
+  unsigned int reloc_size;
+  unsigned char *reloc_stream;
+  struct som_space_dictionary_record *space_dict;
+  struct som_subspace_dictionary_record *subspace_dict;
+};
+
+#define somdata(bfd)			((bfd)->tdata.som_data->a)
+#define obj_som_exec_data(bfd)		(somdata (bfd).exec_data)
+#define obj_som_file_hdr(bfd)		(somdata (bfd).file_hdr)
+#define obj_som_exec_hdr(bfd)		(somdata (bfd).exec_hdr)
+#define obj_som_copyright_hdr(bfd)	(somdata (bfd).copyright_aux_hdr)
+#define obj_som_version_hdr(bfd)	(somdata (bfd).version_aux_hdr)
+#define obj_som_compilation_unit(bfd)	(somdata (bfd).comp_unit)
+#define obj_som_symtab(bfd)		(somdata (bfd).symtab)
+#define obj_som_stringtab(bfd)		(somdata (bfd).stringtab)
+#define obj_som_sym_filepos(bfd)	(somdata (bfd).sym_filepos)
+#define obj_som_str_filepos(bfd)	(somdata (bfd).str_filepos)
+#define obj_som_stringtab_size(bfd)	(somdata (bfd).stringtab_size)
+#define obj_som_reloc_filepos(bfd)	(somdata (bfd).reloc_filepos)
+#define obj_som_sorted_syms(bfd)	(somdata (bfd).sorted_syms)
+#define som_section_data(sec)      ((struct som_section_data_struct *) sec->used_by_bfd)
+#define som_symbol_data(symbol)		((som_symbol_type *) symbol)
+
+/* Defines groups of basic relocations.  FIXME:  These should
+   be the only basic relocations created by GAS.  The rest
+   should be internal to the BFD backend.
+
+   The idea is both SOM and ELF define these basic relocation
+   types so they map into a SOM or ELF specific relocation as
+   appropriate.  This allows GAS to share much more code
+   between the two object formats.  */
+
+#define R_HPPA_NONE			R_NO_RELOCATION
+#define	R_HPPA				R_CODE_ONE_SYMBOL
+#define	R_HPPA_PCREL_CALL		R_PCREL_CALL
+#define R_HPPA_ABS_CALL			R_ABS_CALL
+#define	R_HPPA_GOTOFF			R_DP_RELATIVE
+#define R_HPPA_ENTRY			R_ENTRY
+#define R_HPPA_EXIT			R_EXIT
+#define R_HPPA_COMPLEX			R_COMP1
+#define R_HPPA_BEGIN_BRTAB		R_BEGIN_BRTAB
+#define R_HPPA_END_BRTAB		R_END_BRTAB
+#define R_HPPA_BEGIN_TRY		R_BEGIN_TRY
+#define R_HPPA_END_TRY			R_END_TRY
+
+/* Exported functions, mostly for use by GAS.  */
+bfd_boolean  bfd_som_set_section_attributes    (asection *, int, int, unsigned int, int);
+bfd_boolean  bfd_som_set_subsection_attributes (asection *, asection *, int, unsigned int, int, int, int, int);
+void         bfd_som_set_symbol_type           (asymbol *, unsigned int);
+bfd_boolean  bfd_som_attach_aux_hdr            (bfd *, int, char *);
+int **       hppa_som_gen_reloc_type           (bfd *, int, int, enum hppa_reloc_field_selector_type_alt, int, asymbol *);
+bfd_boolean  bfd_som_attach_compilation_unit   (bfd *, const char *, const char *, const char *, const char *);
+
+#endif /* _SOM_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/sparclinux.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/sparclinux.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/sparclinux.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/sparclinux.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,770 @@
+/* BFD back-end for linux flavored sparc a.out binaries.
+   Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define TARGET_PAGE_SIZE	4096
+#define ZMAGIC_DISK_BLOCK_SIZE	1024
+#define SEGMENT_SIZE		TARGET_PAGE_SIZE
+#define TEXT_START_ADDR		0x0
+
+#define MACHTYPE_OK(mtype) ((mtype) == M_SPARC || (mtype) == M_UNKNOWN)
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "aout/aout64.h"
+#include "aout/stab_gnu.h"
+#include "aout/ar.h"
+#include "libaout.h"           /* BFD a.out internal data structures */
+
+#define DEFAULT_ARCH bfd_arch_sparc
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (sparclinux_,OP)
+#define TARGETNAME "a.out-sparc-linux"
+
+extern const bfd_target MY(vec);
+
+/* We always generate QMAGIC files in preference to ZMAGIC files.  It
+   would be possible to make this a linker option, if that ever
+   becomes important.  */
+
+static void MY_final_link_callback
+  PARAMS ((bfd *, file_ptr *, file_ptr *, file_ptr *));
+
+static bfd_boolean sparclinux_bfd_final_link
+  PARAMS ((bfd *abfd, struct bfd_link_info *info));
+
+static bfd_boolean
+sparclinux_bfd_final_link (abfd, info)
+     bfd *abfd;
+     struct bfd_link_info *info;
+{
+  obj_aout_subformat (abfd) = q_magic_format;
+  return NAME(aout,final_link) (abfd, info, MY_final_link_callback);
+}
+
+#define MY_bfd_final_link sparclinux_bfd_final_link
+
+/* Set the machine type correctly.  */
+
+static bfd_boolean sparclinux_write_object_contents PARAMS ((bfd *abfd));
+
+static bfd_boolean
+sparclinux_write_object_contents (abfd)
+     bfd *abfd;
+{
+  struct external_exec exec_bytes;
+  struct internal_exec *execp = exec_hdr (abfd);
+
+  N_SET_MACHTYPE (*execp, M_SPARC);
+
+  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+
+  WRITE_HEADERS(abfd, execp);
+
+  return TRUE;
+}
+
+#define MY_write_object_contents sparclinux_write_object_contents
+/* Code to link against Linux a.out shared libraries.  */
+
+/* See if a symbol name is a reference to the global offset table.  */
+
+#ifndef GOT_REF_PREFIX
+#define GOT_REF_PREFIX  "__GOT_"
+#endif
+
+#define IS_GOT_SYM(name)  (CONST_STRNEQ (name, GOT_REF_PREFIX))
+
+/* See if a symbol name is a reference to the procedure linkage table.  */
+
+#ifndef PLT_REF_PREFIX
+#define PLT_REF_PREFIX  "__PLT_"
+#endif
+
+#define IS_PLT_SYM(name)  (CONST_STRNEQ (name, PLT_REF_PREFIX))
+
+/* This string is used to generate specialized error messages.  */
+
+#ifndef NEEDS_SHRLIB
+#define NEEDS_SHRLIB "__NEEDS_SHRLIB_"
+#endif
+
+/* This special symbol is a set vector that contains a list of
+   pointers to fixup tables.  It will be present in any dynamically
+   linked file.  The linker generated fixup table should also be added
+   to the list, and it should always appear in the second slot (the
+   first one is a dummy with a magic number that is defined in
+   crt0.o).  */
+
+#ifndef SHARABLE_CONFLICTS
+#define SHARABLE_CONFLICTS "__SHARABLE_CONFLICTS__"
+#endif
+
+/* We keep a list of fixups.  The terminology is a bit strange, but
+   each fixup contains two 32 bit numbers.  A regular fixup contains
+   an address and a pointer, and at runtime we should store the
+   address at the location pointed to by the pointer.  A builtin fixup
+   contains two pointers, and we should read the address using one
+   pointer and store it at the location pointed to by the other
+   pointer.  Builtin fixups come into play when we have duplicate
+   __GOT__ symbols for the same variable.  The builtin fixup will copy
+   the GOT pointer from one over into the other.  */
+
+struct fixup
+{
+  struct fixup *next;
+  struct linux_link_hash_entry *h;
+  bfd_vma value;
+
+  /* Nonzero if this is a jump instruction that needs to be fixed,
+     zero if this is just a pointer */
+  char jump;
+
+  char builtin;
+};
+
+/* We don't need a special hash table entry structure, but we do need
+   to keep some information between linker passes, so we use a special
+   hash table.  */
+
+struct linux_link_hash_entry
+{
+  struct aout_link_hash_entry root;
+};
+
+struct linux_link_hash_table
+{
+  struct aout_link_hash_table root;
+
+  /* First dynamic object found in link.  */
+  bfd *dynobj;
+
+  /* Number of fixups.  */
+  size_t fixup_count;
+
+  /* Number of builtin fixups.  */
+  size_t local_builtins;
+
+  /* List of fixups.  */
+  struct fixup *fixup_list;
+};
+
+static struct bfd_hash_entry *linux_link_hash_newfunc
+  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
+static struct bfd_link_hash_table *linux_link_hash_table_create
+  PARAMS ((bfd *));
+static struct fixup *new_fixup
+  PARAMS ((struct bfd_link_info *, struct linux_link_hash_entry *,
+	  bfd_vma, int));
+static bfd_boolean linux_link_create_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean linux_add_one_symbol
+  PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword, asection *,
+	  bfd_vma, const char *, bfd_boolean, bfd_boolean,
+	  struct bfd_link_hash_entry **));
+static bfd_boolean linux_tally_symbols
+  PARAMS ((struct linux_link_hash_entry *, PTR));
+static bfd_boolean linux_finish_dynamic_link
+  PARAMS ((bfd *, struct bfd_link_info *));
+
+/* Routine to create an entry in an Linux link hash table.  */
+
+static struct bfd_hash_entry *
+linux_link_hash_newfunc (entry, table, string)
+     struct bfd_hash_entry *entry;
+     struct bfd_hash_table *table;
+     const char *string;
+{
+  struct linux_link_hash_entry *ret = (struct linux_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == (struct linux_link_hash_entry *) NULL)
+    ret = ((struct linux_link_hash_entry *)
+	   bfd_hash_allocate (table, sizeof (struct linux_link_hash_entry)));
+  if (ret == NULL)
+    return (struct bfd_hash_entry *) ret;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct linux_link_hash_entry *)
+	 NAME(aout,link_hash_newfunc) ((struct bfd_hash_entry *) ret,
+				       table, string));
+  if (ret != NULL)
+    {
+      /* Set local fields; there aren't any.  */
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Create a Linux link hash table.  */
+
+static struct bfd_link_hash_table *
+linux_link_hash_table_create (abfd)
+     bfd *abfd;
+{
+  struct linux_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct linux_link_hash_table);
+
+  ret = (struct linux_link_hash_table *) bfd_malloc (amt);
+  if (ret == (struct linux_link_hash_table *) NULL)
+    return (struct bfd_link_hash_table *) NULL;
+  if (!NAME(aout,link_hash_table_init) (&ret->root, abfd,
+					linux_link_hash_newfunc,
+					sizeof (struct linux_link_hash_entry)))
+    {
+      free (ret);
+      return (struct bfd_link_hash_table *) NULL;
+    }
+
+  ret->dynobj = NULL;
+  ret->fixup_count = 0;
+  ret->local_builtins = 0;
+  ret->fixup_list = NULL;
+
+  return &ret->root.root;
+}
+
+/* Look up an entry in a Linux link hash table.  */
+
+#define linux_link_hash_lookup(table, string, create, copy, follow) \
+  ((struct linux_link_hash_entry *) \
+   aout_link_hash_lookup (&(table)->root, (string), (create), (copy),\
+			  (follow)))
+
+/* Traverse a Linux link hash table.  */
+
+#define linux_link_hash_traverse(table, func, info)		       \
+  (aout_link_hash_traverse					       \
+   (&(table)->root,						       \
+    (bfd_boolean (*) PARAMS ((struct aout_link_hash_entry *, PTR))) (func), \
+    (info)))
+
+/* Get the Linux link hash table from the info structure.  This is
+   just a cast.  */
+
+#define linux_hash_table(p) ((struct linux_link_hash_table *) ((p)->hash))
+
+/* Store the information for a new fixup.  */
+
+static struct fixup *
+new_fixup (info, h, value, builtin)
+     struct bfd_link_info *info;
+     struct linux_link_hash_entry *h;
+     bfd_vma value;
+     int builtin;
+{
+  struct fixup *f;
+
+  f = (struct fixup *) bfd_hash_allocate (&info->hash->table,
+					  sizeof (struct fixup));
+  if (f == NULL)
+    return f;
+  f->next = linux_hash_table (info)->fixup_list;
+  linux_hash_table (info)->fixup_list = f;
+  f->h = h;
+  f->value = value;
+  f->builtin = builtin;
+  f->jump = 0;
+  ++linux_hash_table (info)->fixup_count;
+  return f;
+}
+
+/* We come here once we realize that we are going to link to a shared
+   library.  We need to create a special section that contains the
+   fixup table, and we ultimately need to add a pointer to this into
+   the set vector for SHARABLE_CONFLICTS.  At this point we do not
+   know the size of the section, but that's OK - we just need to
+   create it for now.  */
+
+static bfd_boolean
+linux_link_create_dynamic_sections (abfd, info)
+     bfd *abfd;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+{
+  flagword flags;
+  register asection *s;
+
+  /* Note that we set the SEC_IN_MEMORY flag.  */
+  flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY;
+
+  /* We choose to use the name ".linux-dynamic" for the fixup table.
+     Why not?  */
+  s = bfd_make_section_with_flags (abfd, ".linux-dynamic", flags);
+  if (s == NULL
+      || ! bfd_set_section_alignment (abfd, s, 2))
+    return FALSE;
+  s->size = 0;
+  s->contents = 0;
+
+  return TRUE;
+}
+
+/* Function to add a single symbol to the linker hash table.  This is
+   a wrapper around _bfd_generic_link_add_one_symbol which handles the
+   tweaking needed for dynamic linking support.  */
+
+static bfd_boolean
+linux_add_one_symbol (info, abfd, name, flags, section, value, string,
+		      copy, collect, hashp)
+     struct bfd_link_info *info;
+     bfd *abfd;
+     const char *name;
+     flagword flags;
+     asection *section;
+     bfd_vma value;
+     const char *string;
+     bfd_boolean copy;
+     bfd_boolean collect;
+     struct bfd_link_hash_entry **hashp;
+{
+  struct linux_link_hash_entry *h;
+  bfd_boolean insert;
+
+  /* Look up and see if we already have this symbol in the hash table.
+     If we do, and the defining entry is from a shared library, we
+     need to create the dynamic sections.
+
+     FIXME: What if abfd->xvec != info->output_bfd->xvec?  We may
+     want to be able to link Linux a.out and ELF objects together,
+     but serious confusion is possible.  */
+
+  insert = FALSE;
+
+  if (! info->relocatable
+      && linux_hash_table (info)->dynobj == NULL
+      && strcmp (name, SHARABLE_CONFLICTS) == 0
+      && (flags & BSF_CONSTRUCTOR) != 0
+      && abfd->xvec == info->output_bfd->xvec)
+    {
+      if (! linux_link_create_dynamic_sections (abfd, info))
+	return FALSE;
+      linux_hash_table (info)->dynobj = abfd;
+      insert = TRUE;
+    }
+
+  if (bfd_is_abs_section (section)
+      && abfd->xvec == info->output_bfd->xvec)
+    {
+      h = linux_link_hash_lookup (linux_hash_table (info), name, FALSE,
+				  FALSE, FALSE);
+      if (h != NULL
+	  && (h->root.root.type == bfd_link_hash_defined
+	      || h->root.root.type == bfd_link_hash_defweak))
+	{
+	  struct fixup *f;
+
+	  if (hashp != NULL)
+	    *hashp = (struct bfd_link_hash_entry *) h;
+
+	  f = new_fixup (info, h, value, ! IS_PLT_SYM (name));
+	  if (f == NULL)
+	    return FALSE;
+	  f->jump = IS_PLT_SYM (name);
+
+	  return TRUE;
+	}
+    }
+
+  /* Do the usual procedure for adding a symbol.  */
+  if (! _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section,
+					  value, string, copy, collect,
+					  hashp))
+    return FALSE;
+
+  /* Insert a pointer to our table in the set vector.  The dynamic
+     linker requires this information.  */
+  if (insert)
+    {
+      asection *s;
+
+      /* Here we do our special thing to add the pointer to the
+	 dynamic section in the SHARABLE_CONFLICTS set vector.  */
+      s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
+				   ".linux-dynamic");
+      BFD_ASSERT (s != NULL);
+
+      if (! (_bfd_generic_link_add_one_symbol
+	     (info, linux_hash_table (info)->dynobj, SHARABLE_CONFLICTS,
+	      BSF_GLOBAL | BSF_CONSTRUCTOR, s, (bfd_vma) 0, NULL,
+	      FALSE, FALSE, NULL)))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* We will crawl the hash table and come here for every global symbol.
+   We will examine each entry and see if there are indications that we
+   need to add a fixup.  There are two possible cases - one is where
+   you have duplicate definitions of PLT or GOT symbols - these will
+   have already been caught and added as "builtin" fixups.  If we find
+   that the corresponding non PLT/GOT symbol is also present, we
+   convert it to a regular fixup instead.
+
+   This function is called via linux_link_hash_traverse.  */
+
+static bfd_boolean
+linux_tally_symbols (struct linux_link_hash_entry *h, void * data)
+{
+  struct bfd_link_info *info = (struct bfd_link_info *) data;
+  struct fixup *f, *f1;
+  int is_plt;
+  struct linux_link_hash_entry *h1, *h2;
+  bfd_boolean exists;
+
+  if (h->root.root.type == bfd_link_hash_undefined
+      && CONST_STRNEQ (h->root.root.root.string, NEEDS_SHRLIB))
+    {
+      const char *name;
+      char *p;
+      char *alloc = NULL;
+
+      name = h->root.root.root.string + sizeof NEEDS_SHRLIB - 1;
+      p = strrchr (name, '_');
+      if (p != NULL)
+	alloc = (char *) bfd_malloc ((bfd_size_type) strlen (name) + 1);
+
+      if (p == NULL || alloc == NULL)
+	(*_bfd_error_handler) (_("Output file requires shared library `%s'\n"),
+			       name);
+      else
+	{
+	  strcpy (alloc, name);
+	  p = strrchr (alloc, '_');
+	  *p++ = '\0';
+	  (*_bfd_error_handler)
+	    (_("Output file requires shared library `%s.so.%s'\n"),
+	     alloc, p);
+	  free (alloc);
+	}
+
+      abort ();
+    }
+
+  /* If this symbol is not a PLT/GOT, we do not even need to look at
+     it.  */
+  is_plt = IS_PLT_SYM (h->root.root.root.string);
+
+  if (is_plt || IS_GOT_SYM (h->root.root.root.string))
+    {
+      /* Look up this symbol twice.  Once just as a regular lookup,
+	 and then again following all of the indirect links until we
+	 reach a real symbol.  */
+      h1 = linux_link_hash_lookup (linux_hash_table (info),
+				   (h->root.root.root.string
+				    + sizeof PLT_REF_PREFIX - 1),
+				   FALSE, FALSE, TRUE);
+      /* h2 does not follow indirect symbols.  */
+      h2 = linux_link_hash_lookup (linux_hash_table (info),
+				   (h->root.root.root.string
+				    + sizeof PLT_REF_PREFIX - 1),
+				   FALSE, FALSE, FALSE);
+
+      /* The real symbol must exist but if it is also an ABS symbol,
+	 there is no need to have a fixup.  This is because they both
+	 came from the same library.  If on the other hand, we had to
+	 use an indirect symbol to get to the real symbol, we add the
+	 fixup anyway, since there are cases where these symbols come
+	 from different shared libraries */
+      if (h1 != NULL
+	  && (((h1->root.root.type == bfd_link_hash_defined
+		|| h1->root.root.type == bfd_link_hash_defweak)
+	       && ! bfd_is_abs_section (h1->root.root.u.def.section))
+	      || h2->root.root.type == bfd_link_hash_indirect))
+	{
+	  /* See if there is a "builtin" fixup already present
+	     involving this symbol.  If so, convert it to a regular
+	     fixup.  In the end, this relaxes some of the requirements
+	     about the order of performing fixups.  */
+	  exists = FALSE;
+	  for (f1 = linux_hash_table (info)->fixup_list;
+	       f1 != NULL;
+	       f1 = f1->next)
+	    {
+	      if ((f1->h != h && f1->h != h1)
+		  || (! f1->builtin && ! f1->jump))
+		continue;
+	      if (f1->h == h1)
+		exists = TRUE;
+	      if (! exists
+		  && bfd_is_abs_section (h->root.root.u.def.section))
+		{
+		  f = new_fixup (info, h1, f1->h->root.root.u.def.value, 0);
+		  f->jump = is_plt;
+		}
+	      f1->h = h1;
+	      f1->jump = is_plt;
+	      f1->builtin = 0;
+	      exists = TRUE;
+	    }
+	  if (! exists
+	      && bfd_is_abs_section (h->root.root.u.def.section))
+	    {
+	      f = new_fixup (info, h1, h->root.root.u.def.value, 0);
+	      if (f == NULL)
+		{
+		  /* FIXME: No way to return error.  */
+		  abort ();
+		}
+	      f->jump = is_plt;
+	    }
+	}
+
+      /* Quick and dirty way of stripping these symbols from the
+	 symtab.  */
+      if (bfd_is_abs_section (h->root.root.u.def.section))
+	h->root.written = TRUE;
+    }
+
+  return TRUE;
+}
+
+/* This is called to set the size of the .linux-dynamic section is.
+   It is called by the Linux linker emulation before_allocation
+   routine.  We have finished reading all of the input files, and now
+   we just scan the hash tables to find out how many additional fixups
+   are required.  */
+
+bfd_boolean
+bfd_sparclinux_size_dynamic_sections (output_bfd, info)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+{
+  struct fixup *f;
+  asection *s;
+
+  if (output_bfd->xvec != &MY(vec))
+    return TRUE;
+
+  /* First find the fixups...  */
+  linux_link_hash_traverse (linux_hash_table (info),
+			    linux_tally_symbols,
+			    (PTR) info);
+
+  /* If there are builtin fixups, leave room for a marker.  This is
+     used by the dynamic linker so that it knows that all that follow
+     are builtin fixups instead of regular fixups.  */
+  for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
+    {
+      if (f->builtin)
+	{
+	  ++linux_hash_table (info)->fixup_count;
+	  ++linux_hash_table (info)->local_builtins;
+	  break;
+	}
+    }
+
+  if (linux_hash_table (info)->dynobj == NULL)
+    {
+      if (linux_hash_table (info)->fixup_count > 0)
+	abort ();
+      return TRUE;
+    }
+
+  /* Allocate memory for our fixup table.  We will fill it in later.  */
+  s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
+			       ".linux-dynamic");
+  if (s != NULL)
+    {
+      s->size = linux_hash_table (info)->fixup_count + 1;
+      s->size *= 8;
+      s->contents = (bfd_byte *) bfd_zalloc (output_bfd, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* We come here once we are ready to actually write the fixup table to
+   the output file.  Scan the fixup tables and so forth and generate
+   the stuff we need.  */
+
+static bfd_boolean
+linux_finish_dynamic_link (output_bfd, info)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+{
+  asection *s, *os, *is;
+  bfd_byte *fixup_table;
+  struct linux_link_hash_entry *h;
+  struct fixup *f;
+  unsigned int new_addr;
+  int section_offset;
+  unsigned int fixups_written;
+
+  if (linux_hash_table (info)->dynobj == NULL)
+    return TRUE;
+
+  s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
+			       ".linux-dynamic");
+  BFD_ASSERT (s != NULL);
+  os = s->output_section;
+  fixups_written = 0;
+
+#ifdef LINUX_LINK_DEBUG
+  printf ("Fixup table file offset: %x  VMA: %x\n",
+	  os->filepos + s->output_offset,
+	  os->vma + s->output_offset);
+#endif
+
+  fixup_table = s->contents;
+  bfd_put_32 (output_bfd,
+	      (bfd_vma) linux_hash_table (info)->fixup_count, fixup_table);
+  fixup_table += 4;
+
+  /* Fill in fixup table.  */
+  for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
+    {
+      if (f->builtin)
+	continue;
+
+      if (f->h->root.root.type != bfd_link_hash_defined
+	  && f->h->root.root.type != bfd_link_hash_defweak)
+	{
+	  (*_bfd_error_handler)
+	    (_("Symbol %s not defined for fixups\n"),
+	     f->h->root.root.root.string);
+	  continue;
+	}
+
+      is = f->h->root.root.u.def.section;
+      section_offset = is->output_section->vma + is->output_offset;
+      new_addr = f->h->root.root.u.def.value + section_offset;
+
+#ifdef LINUX_LINK_DEBUG
+      printf ("Fixup(%d) %s: %x %x\n",f->jump, f->h->root.root.string,
+	      new_addr, f->value);
+#endif
+
+      if (f->jump)
+	{
+	  /* Relative address */
+	  new_addr = new_addr - (f->value + 5);
+	  bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
+	  fixup_table += 4;
+	  bfd_put_32 (output_bfd, f->value + 1, fixup_table);
+	  fixup_table += 4;
+	}
+      else
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
+	  fixup_table += 4;
+	  bfd_put_32 (output_bfd, f->value, fixup_table);
+	  fixup_table += 4;
+	}
+      ++fixups_written;
+    }
+
+  if (linux_hash_table (info)->local_builtins != 0)
+    {
+      /* Special marker so we know to switch to the other type of fixup */
+      bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
+      fixup_table += 4;
+      bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
+      fixup_table += 4;
+      ++fixups_written;
+      for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
+	{
+	  if (! f->builtin)
+	    continue;
+
+	  if (f->h->root.root.type != bfd_link_hash_defined
+	      && f->h->root.root.type != bfd_link_hash_defweak)
+	    {
+	      (*_bfd_error_handler)
+		(_("Symbol %s not defined for fixups\n"),
+		 f->h->root.root.root.string);
+	      continue;
+	    }
+
+	  is = f->h->root.root.u.def.section;
+	  section_offset = is->output_section->vma + is->output_offset;
+	  new_addr = f->h->root.root.u.def.value + section_offset;
+
+#ifdef LINUX_LINK_DEBUG
+	  printf ("Fixup(B) %s: %x %x\n", f->h->root.root.string,
+		  new_addr, f->value);
+#endif
+
+	  bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
+	  fixup_table += 4;
+	  bfd_put_32 (output_bfd, f->value, fixup_table);
+	  fixup_table += 4;
+	  ++fixups_written;
+	}
+    }
+
+  if (linux_hash_table (info)->fixup_count != fixups_written)
+    {
+      (*_bfd_error_handler) (_("Warning: fixup count mismatch\n"));
+      while (linux_hash_table (info)->fixup_count > fixups_written)
+	{
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
+	  fixup_table += 4;
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
+	  fixup_table += 4;
+	  ++fixups_written;
+	}
+    }
+
+  h = linux_link_hash_lookup (linux_hash_table (info),
+			      "__BUILTIN_FIXUPS__",
+			      FALSE, FALSE, FALSE);
+
+  if (h != NULL
+      && (h->root.root.type == bfd_link_hash_defined
+	  || h->root.root.type == bfd_link_hash_defweak))
+    {
+      is = h->root.root.u.def.section;
+      section_offset = is->output_section->vma + is->output_offset;
+      new_addr = h->root.root.u.def.value + section_offset;
+
+#ifdef LINUX_LINK_DEBUG
+      printf ("Builtin fixup table at %x\n", new_addr);
+#endif
+
+      bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table);
+    }
+  else
+    bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);
+
+  if (bfd_seek (output_bfd, (file_ptr) (os->filepos + s->output_offset),
+		SEEK_SET) != 0)
+    return FALSE;
+
+  if (bfd_bwrite ((PTR) s->contents, s->size, output_bfd) != s->size)
+    return FALSE;
+
+  return TRUE;
+}
+
+#define MY_bfd_link_hash_table_create linux_link_hash_table_create
+#define MY_add_one_symbol linux_add_one_symbol
+#define MY_finish_dynamic_link linux_finish_dynamic_link
+
+#define MY_zmagic_contiguous 1
+
+#include "aout-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/sparclynx.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/sparclynx.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/sparclynx.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/sparclynx.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,252 @@
+/* BFD support for Sparc binaries under LynxOS.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000,
+   2001, 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (sparclynx_aout_,OP)
+#define TARGETNAME "a.out-sparc-lynx"
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#include "aout/sun4.h"
+#include "libaout.h"		/* BFD a.out internal data structures */
+
+#include "aout/aout64.h"
+#include "aout/stab_gnu.h"
+#include "aout/ar.h"
+
+void NAME (lynx,set_arch_mach) PARAMS ((bfd *, unsigned long));
+static void choose_reloc_size PARAMS ((bfd *));
+static bfd_boolean NAME (aout,sparclynx_write_object_contents) PARAMS ((bfd *));
+
+/* This is needed to reject a NewsOS file, e.g. in
+   gdb/testsuite/gdb.t10/crossload.exp. <kingdon@cygnus.com>
+   I needed to add M_UNKNOWN to recognize a 68000 object, so this will
+   probably no longer reject a NewsOS object.  <ian@cygnus.com>.  */
+#define MACHTYPE_OK(mtype) ((mtype) == M_UNKNOWN \
+			    || (mtype) == M_68010 \
+			    || (mtype) == M_68020 \
+			    || (mtype) == M_SPARC)
+
+/* The file @code{aoutf1.h} contains the code for BFD's
+   a.out back end. Control over the generated back end is given by these
+   two preprocessor names:
+   @table @code
+   @item ARCH_SIZE
+   This value should be either 32 or 64, depending upon the size of an
+   int in the target format. It changes the sizes of the structs which
+   perform the memory/disk mapping of structures.
+
+   The 64 bit backend may only be used if the host compiler supports 64
+   ints (eg long long with gcc), by defining the name @code{BFD_HOST_64_BIT} in @code{bfd.h}.
+   With this name defined, @emph{all} bfd operations are performed with 64bit
+   arithmetic, not just those to a 64bit target.
+
+   @item TARGETNAME
+   The name put into the target vector.
+   @item
+   @end table  */
+
+void
+NAME(lynx,set_arch_mach) (abfd, machtype)
+     bfd *abfd;
+     unsigned long machtype;
+{
+  /* Determine the architecture and machine type of the object file.  */
+  enum bfd_architecture arch;
+  unsigned long machine;
+
+  switch (machtype)
+    {
+    case M_UNKNOWN:
+      /* Some Sun3s make magic numbers without cpu types in them, so
+	 we'll default to the 68000.  */
+      arch = bfd_arch_m68k;
+      machine = bfd_mach_m68000;
+      break;
+
+    case M_68010:
+    case M_HP200:
+      arch = bfd_arch_m68k;
+      machine = bfd_mach_m68010;
+      break;
+
+    case M_68020:
+    case M_HP300:
+      arch = bfd_arch_m68k;
+      machine = bfd_mach_m68020;
+      break;
+
+    case M_SPARC:
+      arch = bfd_arch_sparc;
+      machine = 0;
+      break;
+
+    case M_386:
+    case M_386_DYNIX:
+      arch = bfd_arch_i386;
+      machine = 0;
+      break;
+
+    case M_HPUX:
+      arch = bfd_arch_m68k;
+      machine = 0;
+      break;
+
+    default:
+      arch = bfd_arch_obscure;
+      machine = 0;
+      break;
+    }
+  bfd_set_arch_mach (abfd, arch, machine);
+}
+
+#define SET_ARCH_MACH(ABFD, EXEC) \
+  NAME(lynx,set_arch_mach) (ABFD, N_MACHTYPE (EXEC)); \
+  choose_reloc_size(ABFD);
+
+/* Determine the size of a relocation entry, based on the architecture.  */
+
+static void
+choose_reloc_size (abfd)
+     bfd *abfd;
+{
+  switch (bfd_get_arch (abfd))
+    {
+    case bfd_arch_sparc:
+      obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;
+      break;
+    default:
+      obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+      break;
+    }
+}
+
+/* Write an object file in LynxOS format.
+  Section contents have already been written.  We write the
+  file header, symbols, and relocation.  */
+
+static bfd_boolean
+NAME(aout,sparclynx_write_object_contents) (abfd)
+     bfd *abfd;
+{
+  struct external_exec exec_bytes;
+  struct internal_exec *execp = exec_hdr (abfd);
+
+  /* Magic number, maestro, please!  */
+  switch (bfd_get_arch (abfd))
+    {
+    case bfd_arch_m68k:
+      switch (bfd_get_mach (abfd))
+	{
+	case bfd_mach_m68010:
+	  N_SET_MACHTYPE (*execp, M_68010);
+	  break;
+	default:
+	case bfd_mach_m68020:
+	  N_SET_MACHTYPE (*execp, M_68020);
+	  break;
+	}
+      break;
+    case bfd_arch_sparc:
+      N_SET_MACHTYPE (*execp, M_SPARC);
+      break;
+    case bfd_arch_i386:
+      N_SET_MACHTYPE (*execp, M_386);
+      break;
+    default:
+      N_SET_MACHTYPE (*execp, M_UNKNOWN);
+    }
+
+  choose_reloc_size (abfd);
+
+  N_SET_FLAGS (*execp, aout_backend_info (abfd)->exec_hdr_flags);
+
+  WRITE_HEADERS (abfd, execp);
+
+  return TRUE;
+}
+
+#define MY_set_sizes sparclynx_set_sizes
+static bfd_boolean sparclynx_set_sizes PARAMS ((bfd *));
+
+static bfd_boolean
+sparclynx_set_sizes (abfd)
+     bfd *abfd;
+{
+  switch (bfd_get_arch (abfd))
+    {
+    default:
+      return FALSE;
+    case bfd_arch_sparc:
+      adata (abfd).page_size = 0x2000;
+      adata (abfd).segment_size = 0x2000;
+      adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
+      return TRUE;
+    case bfd_arch_m68k:
+      adata (abfd).page_size = 0x2000;
+      adata (abfd).segment_size = 0x20000;
+      adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
+      return TRUE;
+    }
+}
+
+static const struct aout_backend_data sparclynx_aout_backend =
+  {
+    0, 1, 0, 1, 0, sparclynx_set_sizes, 0,
+    0,				/* add_dynamic_symbols */
+    0,				/* add_one_symbol */
+    0,				/* link_dynamic_object */
+    0,				/* write_dynamic_symbol */
+    0,				/* check_dynamic_reloc */
+    0				/* finish_dynamic_link */
+  };
+
+
+#define MY_bfd_debug_info_start		bfd_void
+#define MY_bfd_debug_info_end		bfd_void
+#define MY_bfd_debug_info_accumulate	\
+		(void (*) PARAMS ((bfd *, struct bfd_section *))) bfd_void
+
+#define MY_write_object_contents	NAME(aout,sparclynx_write_object_contents)
+#define MY_backend_data			&sparclynx_aout_backend
+
+#define TARGET_IS_BIG_ENDIAN_P
+
+#ifdef LYNX_CORE
+
+char * lynx_core_file_failing_command ();
+int lynx_core_file_failing_signal ();
+bfd_boolean lynx_core_file_matches_executable_p ();
+const bfd_target * lynx_core_file_p ();
+
+#define	MY_core_file_failing_command lynx_core_file_failing_command
+#define	MY_core_file_failing_signal lynx_core_file_failing_signal
+#define	MY_core_file_matches_executable_p lynx_core_file_matches_executable_p
+#define	MY_core_file_p lynx_core_file_p
+
+#endif /* LYNX_CORE */
+
+#include "aout-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/sparcnetbsd.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/sparcnetbsd.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/sparcnetbsd.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/sparcnetbsd.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,40 @@
+/* BFD back-end for NetBSD/sparc a.out-ish binaries.
+   Copyright 1990, 1991, 1992, 1994, 1995, 1997, 1998, 2000, 2001, 2003,
+   2005, 2007  Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+#define TARGET_IS_BIG_ENDIAN_P
+
+/* SPARC chips use either 4K or 8K pages, but object files always
+   assume 8K page alignment so they will work on either one.  */
+#define TARGET_PAGE_SIZE 0x2000
+
+#define DEFAULT_ARCH	bfd_arch_sparc
+#define DEFAULT_MID 	M_SPARC_NETBSD
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (sparcnetbsd_,OP)
+
+/* This needs to start with a.out so GDB knows it is an a.out variant.  */
+#define TARGETNAME "a.out-sparc-netbsd"
+
+#include "netbsd.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/srec.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/srec.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/srec.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/srec.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1380 @@
+/* BFD back-end for s-record objects.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011
+   Free Software Foundation, Inc.
+   Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* SUBSECTION
+	S-Record handling
+
+   DESCRIPTION
+
+	Ordinary S-Records cannot hold anything but addresses and
+	data, so that's all that we implement.
+
+	The only interesting thing is that S-Records may come out of
+	order and there is no header, so an initial scan is required
+	to discover the minimum and maximum addresses used to create
+	the vma and size of the only section we create.  We
+	arbitrarily call this section ".text".
+
+	When bfd_get_section_contents is called the file is read
+	again, and this time the data is placed into a bfd_alloc'd
+	area.
+
+	Any number of sections may be created for output, we save them
+	up and output them when it's time to close the bfd.
+
+	An s record looks like:
+
+   EXAMPLE
+	S<type><length><address><data><checksum>
+
+   DESCRIPTION
+	Where
+	o length
+	is the number of bytes following upto the checksum. Note that
+	this is not the number of chars following, since it takes two
+	chars to represent a byte.
+	o type
+	is one of:
+	0) header record
+	1) two byte address data record
+	2) three byte address data record
+	3) four byte address data record
+	7) four byte address termination record
+	8) three byte address termination record
+	9) two byte address termination record
+
+	o address
+	is the start address of the data following, or in the case of
+	a termination record, the start address of the image
+	o data
+	is the data.
+	o checksum
+	is the sum of all the raw byte data in the record, from the length
+	upwards, modulo 256 and subtracted from 255.
+
+   SUBSECTION
+	Symbol S-Record handling
+
+   DESCRIPTION
+	Some ICE equipment understands an addition to the standard
+	S-Record format; symbols and their addresses can be sent
+	before the data.
+
+	The format of this is:
+	($$ <modulename>
+		(<space> <symbol> <address>)*)
+	$$
+
+	so a short symbol table could look like:
+
+   EXAMPLE
+	$$ flash.x
+	$$ flash.c
+	  _port6 $0
+	  _delay $4
+	  _start $14
+	  _etext $8036
+	  _edata $8036
+ 	  _end $8036
+	$$
+
+   DESCRIPTION
+	We allow symbols to be anywhere in the data stream - the module names
+	are always ignored.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libiberty.h"
+#include "safe-ctype.h"
+
+
+/* Macros for converting between hex and binary.  */
+
+static const char digs[] = "0123456789ABCDEF";
+
+#define NIBBLE(x)    hex_value(x)
+#define HEX(buffer) ((NIBBLE ((buffer)[0])<<4) + NIBBLE ((buffer)[1]))
+#define TOHEX(d, x, ch) \
+	d[1] = digs[(x) & 0xf]; \
+	d[0] = digs[((x)>>4)&0xf]; \
+	ch += ((x) & 0xff);
+#define	ISHEX(x)    hex_p(x)
+
+/* The maximum number of address+data+crc bytes on a line is FF.  */
+#define MAXCHUNK 0xff
+
+/* Default size for a CHUNK.  */
+#define DEFAULT_CHUNK 16
+
+/* The number of data bytes we actually fit onto a line on output.
+   This variable can be modified by objcopy's --srec-len parameter.
+   For a 0x75 byte record you should set --srec-len=0x70.  */
+unsigned int Chunk = DEFAULT_CHUNK;
+
+/* The type of srec output (free or forced to S3).
+   This variable can be modified by objcopy's --srec-forceS3
+   parameter.  */
+bfd_boolean S3Forced = FALSE;
+
+/* When writing an S-record file, the S-records can not be output as
+   they are seen.  This structure is used to hold them in memory.  */
+
+struct srec_data_list_struct
+{
+  struct srec_data_list_struct *next;
+  bfd_byte *data;
+  bfd_vma where;
+  bfd_size_type size;
+};
+
+typedef struct srec_data_list_struct srec_data_list_type;
+
+/* When scanning the S-record file, a linked list of srec_symbol
+   structures is built to represent the symbol table (if there is
+   one).  */
+
+struct srec_symbol
+{
+  struct srec_symbol *next;
+  const char *name;
+  bfd_vma val;
+};
+
+/* The S-record tdata information.  */
+
+typedef struct srec_data_struct
+  {
+    srec_data_list_type *head;
+    srec_data_list_type *tail;
+    unsigned int type;
+    struct srec_symbol *symbols;
+    struct srec_symbol *symtail;
+    asymbol *csymbols;
+  }
+tdata_type;
+
+/* Initialize by filling in the hex conversion array.  */
+
+static void
+srec_init (void)
+{
+  static bfd_boolean inited = FALSE;
+
+  if (! inited)
+    {
+      inited = TRUE;
+      hex_init ();
+    }
+}
+
+/* Set up the S-record tdata information.  */
+
+static bfd_boolean
+srec_mkobject (bfd *abfd)
+{
+  tdata_type *tdata;
+
+  srec_init ();
+
+  tdata = (tdata_type *) bfd_alloc (abfd, sizeof (tdata_type));
+  if (tdata == NULL)
+    return FALSE;
+
+  abfd->tdata.srec_data = tdata;
+  tdata->type = 1;
+  tdata->head = NULL;
+  tdata->tail = NULL;
+  tdata->symbols = NULL;
+  tdata->symtail = NULL;
+  tdata->csymbols = NULL;
+
+  return TRUE;
+}
+
+/* Read a byte from an S record file.  Set *ERRORPTR if an error
+   occurred.  Return EOF on error or end of file.  */
+
+static int
+srec_get_byte (bfd *abfd, bfd_boolean *errorptr)
+{
+  bfd_byte c;
+
+  if (bfd_bread (&c, (bfd_size_type) 1, abfd) != 1)
+    {
+      if (bfd_get_error () != bfd_error_file_truncated)
+	*errorptr = TRUE;
+      return EOF;
+    }
+
+  return (int) (c & 0xff);
+}
+
+/* Report a problem in an S record file.  FIXME: This probably should
+   not call fprintf, but we really do need some mechanism for printing
+   error messages.  */
+
+static void
+srec_bad_byte (bfd *abfd,
+	       unsigned int lineno,
+	       int c,
+	       bfd_boolean error)
+{
+  if (c == EOF)
+    {
+      if (! error)
+	bfd_set_error (bfd_error_file_truncated);
+    }
+  else
+    {
+      char buf[10];
+
+      if (! ISPRINT (c))
+	sprintf (buf, "\\%03o", (unsigned int) c);
+      else
+	{
+	  buf[0] = c;
+	  buf[1] = '\0';
+	}
+      (*_bfd_error_handler)
+	(_("%B:%d: Unexpected character `%s' in S-record file\n"),
+	 abfd, lineno, buf);
+      bfd_set_error (bfd_error_bad_value);
+    }
+}
+
+/* Add a new symbol found in an S-record file.  */
+
+static bfd_boolean
+srec_new_symbol (bfd *abfd, const char *name, bfd_vma val)
+{
+  struct srec_symbol *n;
+
+  n = (struct srec_symbol *) bfd_alloc (abfd, sizeof (* n));
+  if (n == NULL)
+    return FALSE;
+
+  n->name = name;
+  n->val = val;
+
+  if (abfd->tdata.srec_data->symbols == NULL)
+    abfd->tdata.srec_data->symbols = n;
+  else
+    abfd->tdata.srec_data->symtail->next = n;
+  abfd->tdata.srec_data->symtail = n;
+  n->next = NULL;
+
+  ++abfd->symcount;
+
+  return TRUE;
+}
+
+/* Read the S record file and turn it into sections.  We create a new
+   section for each contiguous set of bytes.  */
+
+static bfd_boolean
+srec_scan (bfd *abfd)
+{
+  int c;
+  unsigned int lineno = 1;
+  bfd_boolean error = FALSE;
+  bfd_byte *buf = NULL;
+  size_t bufsize = 0;
+  asection *sec = NULL;
+  char *symbuf = NULL;
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    goto error_return;
+
+  while ((c = srec_get_byte (abfd, &error)) != EOF)
+    {
+      /* We only build sections from contiguous S-records, so if this
+	 is not an S-record, then stop building a section.  */
+      if (c != 'S' && c != '\r' && c != '\n')
+	sec = NULL;
+
+      switch (c)
+	{
+	default:
+	  srec_bad_byte (abfd, lineno, c, error);
+	  goto error_return;
+
+	case '\n':
+	  ++lineno;
+	  break;
+
+	case '\r':
+	  break;
+
+	case '$':
+	  /* Starting a module name, which we ignore.  */
+	  while ((c = srec_get_byte (abfd, &error)) != '\n'
+		 && c != EOF)
+	    ;
+	  if (c == EOF)
+	    {
+	      srec_bad_byte (abfd, lineno, c, error);
+	      goto error_return;
+	    }
+
+	  ++lineno;
+	  break;
+
+	case ' ':
+	  do
+	    {
+	      bfd_size_type alc;
+	      char *p, *symname;
+	      bfd_vma symval;
+
+	      /* Starting a symbol definition.  */
+	      while ((c = srec_get_byte (abfd, &error)) != EOF
+		     && (c == ' ' || c == '\t'))
+		;
+
+	      if (c == '\n' || c == '\r')
+		break;
+
+	      if (c == EOF)
+		{
+		  srec_bad_byte (abfd, lineno, c, error);
+		  goto error_return;
+		}
+
+	      alc = 10;
+	      symbuf = (char *) bfd_malloc (alc + 1);
+	      if (symbuf == NULL)
+		goto error_return;
+
+	      p = symbuf;
+
+	      *p++ = c;
+	      while ((c = srec_get_byte (abfd, &error)) != EOF
+		     && ! ISSPACE (c))
+		{
+		  if ((bfd_size_type) (p - symbuf) >= alc)
+		    {
+		      char *n;
+
+		      alc *= 2;
+		      n = (char *) bfd_realloc (symbuf, alc + 1);
+		      if (n == NULL)
+			goto error_return;
+		      p = n + (p - symbuf);
+		      symbuf = n;
+		    }
+
+		  *p++ = c;
+		}
+
+	      if (c == EOF)
+		{
+		  srec_bad_byte (abfd, lineno, c, error);
+		  goto error_return;
+		}
+
+	      *p++ = '\0';
+	      symname = (char *) bfd_alloc (abfd, (bfd_size_type) (p - symbuf));
+	      if (symname == NULL)
+		goto error_return;
+	      strcpy (symname, symbuf);
+	      free (symbuf);
+	      symbuf = NULL;
+
+	      while ((c = srec_get_byte (abfd, &error)) != EOF
+		     && (c == ' ' || c == '\t'))
+		;
+	      if (c == EOF)
+		{
+		  srec_bad_byte (abfd, lineno, c, error);
+		  goto error_return;
+		}
+
+	      /* Skip a dollar sign before the hex value.  */
+	      if (c == '$')
+		{
+		  c = srec_get_byte (abfd, &error);
+		  if (c == EOF)
+		    {
+		      srec_bad_byte (abfd, lineno, c, error);
+		      goto error_return;
+		    }
+		}
+
+	      symval = 0;
+	      while (ISHEX (c))
+		{
+		  symval <<= 4;
+		  symval += NIBBLE (c);
+		  c = srec_get_byte (abfd, &error);
+		  if (c == EOF)
+		    {
+		      srec_bad_byte (abfd, lineno, c, error);
+		      goto error_return;
+		    }
+		}
+
+	      if (! srec_new_symbol (abfd, symname, symval))
+		goto error_return;
+	    }
+	  while (c == ' ' || c == '\t')
+	    ;
+
+	  if (c == '\n')
+	    ++lineno;
+	  else if (c != '\r')
+	    {
+	      srec_bad_byte (abfd, lineno, c, error);
+	      goto error_return;
+	    }
+
+	  break;
+
+	case 'S':
+	  {
+	    file_ptr pos;
+	    char hdr[3];
+	    unsigned int bytes;
+	    bfd_vma address;
+	    bfd_byte *data;
+	    unsigned char check_sum;
+
+	    /* Starting an S-record.  */
+
+	    pos = bfd_tell (abfd) - 1;
+
+	    if (bfd_bread (hdr, (bfd_size_type) 3, abfd) != 3)
+	      goto error_return;
+
+	    if (! ISHEX (hdr[1]) || ! ISHEX (hdr[2]))
+	      {
+		if (! ISHEX (hdr[1]))
+		  c = hdr[1];
+		else
+		  c = hdr[2];
+		srec_bad_byte (abfd, lineno, c, error);
+		goto error_return;
+	      }
+
+	    check_sum = bytes = HEX (hdr + 1);
+	    if (bytes * 2 > bufsize)
+	      {
+		if (buf != NULL)
+		  free (buf);
+		buf = (bfd_byte *) bfd_malloc ((bfd_size_type) bytes * 2);
+		if (buf == NULL)
+		  goto error_return;
+		bufsize = bytes * 2;
+	      }
+
+	    if (bfd_bread (buf, (bfd_size_type) bytes * 2, abfd) != bytes * 2)
+	      goto error_return;
+
+	    /* Ignore the checksum byte.  */
+	    --bytes;
+
+	    address = 0;
+	    data = buf;
+	    switch (hdr[0])
+	      {
+	      case '0':
+	      case '5':
+		/* Prologue--ignore the file name, but stop building a
+		   section at this point.  */
+		sec = NULL;
+		break;
+
+	      case '3':
+		check_sum += HEX (data);
+		address = HEX (data);
+		data += 2;
+		--bytes;
+		/* Fall through.  */
+	      case '2':
+		check_sum += HEX (data);
+		address = (address << 8) | HEX (data);
+		data += 2;
+		--bytes;
+		/* Fall through.  */
+	      case '1':
+		check_sum += HEX (data);
+		address = (address << 8) | HEX (data);
+		data += 2;
+		check_sum += HEX (data);
+		address = (address << 8) | HEX (data);
+		data += 2;
+		bytes -= 2;
+
+		if (sec != NULL
+		    && sec->vma + sec->size == address)
+		  {
+		    /* This data goes at the end of the section we are
+		       currently building.  */
+		    sec->size += bytes;
+		  }
+		else
+		  {
+		    char secbuf[20];
+		    char *secname;
+		    bfd_size_type amt;
+		    flagword flags;
+
+		    sprintf (secbuf, ".sec%d", bfd_count_sections (abfd) + 1);
+		    amt = strlen (secbuf) + 1;
+		    secname = (char *) bfd_alloc (abfd, amt);
+		    strcpy (secname, secbuf);
+		    flags = SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC;
+		    sec = bfd_make_section_with_flags (abfd, secname, flags);
+		    if (sec == NULL)
+		      goto error_return;
+		    sec->vma = address;
+		    sec->lma = address;
+		    sec->size = bytes;
+		    sec->filepos = pos;
+		  }
+
+		while (bytes > 0)
+		  {
+		    check_sum += HEX (data);
+		    data += 2;
+		    bytes--;
+		  }
+		check_sum = 255 - (check_sum & 0xff);
+		if (check_sum != HEX (data))
+		  {
+		    (*_bfd_error_handler)
+		      (_("%B:%d: Bad checksum in S-record file\n"),
+		       abfd, lineno);
+		    bfd_set_error (bfd_error_bad_value);
+		    goto error_return;
+		  }
+
+		break;
+
+	      case '7':
+		check_sum += HEX (data);
+		address = HEX (data);
+		data += 2;
+		/* Fall through.  */
+	      case '8':
+		check_sum += HEX (data);
+		address = (address << 8) | HEX (data);
+		data += 2;
+		/* Fall through.  */
+	      case '9':
+		check_sum += HEX (data);
+		address = (address << 8) | HEX (data);
+		data += 2;
+		check_sum += HEX (data);
+		address = (address << 8) | HEX (data);
+		data += 2;
+
+		/* This is a termination record.  */
+		abfd->start_address = address;
+
+		check_sum = 255 - (check_sum & 0xff);
+		if (check_sum != HEX (data))
+		  {
+		    (*_bfd_error_handler)
+		      (_("%B:%d: Bad checksum in S-record file\n"),
+		       abfd, lineno);
+		    bfd_set_error (bfd_error_bad_value);
+		    goto error_return;
+		  }
+
+		if (buf != NULL)
+		  free (buf);
+
+		return TRUE;
+	      }
+	  }
+	  break;
+	}
+    }
+
+  if (error)
+    goto error_return;
+
+  if (buf != NULL)
+    free (buf);
+
+  return TRUE;
+
+ error_return:
+  if (symbuf != NULL)
+    free (symbuf);
+  if (buf != NULL)
+    free (buf);
+  return FALSE;
+}
+
+/* Check whether an existing file is an S-record file.  */
+
+static const bfd_target *
+srec_object_p (bfd *abfd)
+{
+  void * tdata_save;
+  bfd_byte b[4];
+
+  srec_init ();
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
+      || bfd_bread (b, (bfd_size_type) 4, abfd) != 4)
+    return NULL;
+
+  if (b[0] != 'S' || !ISHEX (b[1]) || !ISHEX (b[2]) || !ISHEX (b[3]))
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  tdata_save = abfd->tdata.any;
+  if (! srec_mkobject (abfd) || ! srec_scan (abfd))
+    {
+      if (abfd->tdata.any != tdata_save && abfd->tdata.any != NULL)
+	bfd_release (abfd, abfd->tdata.any);
+      abfd->tdata.any = tdata_save;
+      return NULL;
+    }
+
+  if (abfd->symcount > 0)
+    abfd->flags |= HAS_SYMS;
+
+  return abfd->xvec;
+}
+
+/* Check whether an existing file is an S-record file with symbols.  */
+
+static const bfd_target *
+symbolsrec_object_p (bfd *abfd)
+{
+  void * tdata_save;
+  char b[2];
+
+  srec_init ();
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
+      || bfd_bread (b, (bfd_size_type) 2, abfd) != 2)
+    return NULL;
+
+  if (b[0] != '$' || b[1] != '$')
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  tdata_save = abfd->tdata.any;
+  if (! srec_mkobject (abfd) || ! srec_scan (abfd))
+    {
+      if (abfd->tdata.any != tdata_save && abfd->tdata.any != NULL)
+	bfd_release (abfd, abfd->tdata.any);
+      abfd->tdata.any = tdata_save;
+      return NULL;
+    }
+
+  if (abfd->symcount > 0)
+    abfd->flags |= HAS_SYMS;
+
+  return abfd->xvec;
+}
+
+/* Read in the contents of a section in an S-record file.  */
+
+static bfd_boolean
+srec_read_section (bfd *abfd, asection *section, bfd_byte *contents)
+{
+  int c;
+  bfd_size_type sofar = 0;
+  bfd_boolean error = FALSE;
+  bfd_byte *buf = NULL;
+  size_t bufsize = 0;
+
+  if (bfd_seek (abfd, section->filepos, SEEK_SET) != 0)
+    goto error_return;
+
+  while ((c = srec_get_byte (abfd, &error)) != EOF)
+    {
+      bfd_byte hdr[3];
+      unsigned int bytes;
+      bfd_vma address;
+      bfd_byte *data;
+
+      if (c == '\r' || c == '\n')
+	continue;
+
+      /* This is called after srec_scan has already been called, so we
+	 ought to know the exact format.  */
+      BFD_ASSERT (c == 'S');
+
+      if (bfd_bread (hdr, (bfd_size_type) 3, abfd) != 3)
+	goto error_return;
+
+      BFD_ASSERT (ISHEX (hdr[1]) && ISHEX (hdr[2]));
+
+      bytes = HEX (hdr + 1);
+
+      if (bytes * 2 > bufsize)
+	{
+	  if (buf != NULL)
+	    free (buf);
+	  buf = (bfd_byte *) bfd_malloc ((bfd_size_type) bytes * 2);
+	  if (buf == NULL)
+	    goto error_return;
+	  bufsize = bytes * 2;
+	}
+
+      if (bfd_bread (buf, (bfd_size_type) bytes * 2, abfd) != bytes * 2)
+	goto error_return;
+
+      address = 0;
+      data = buf;
+      switch (hdr[0])
+	{
+	default:
+	  BFD_ASSERT (sofar == section->size);
+	  if (buf != NULL)
+	    free (buf);
+	  return TRUE;
+
+	case '3':
+	  address = HEX (data);
+	  data += 2;
+	  --bytes;
+	  /* Fall through.  */
+	case '2':
+	  address = (address << 8) | HEX (data);
+	  data += 2;
+	  --bytes;
+	  /* Fall through.  */
+	case '1':
+	  address = (address << 8) | HEX (data);
+	  data += 2;
+	  address = (address << 8) | HEX (data);
+	  data += 2;
+	  bytes -= 2;
+
+	  if (address != section->vma + sofar)
+	    {
+	      /* We've come to the end of this section.  */
+	      BFD_ASSERT (sofar == section->size);
+	      if (buf != NULL)
+		free (buf);
+	      return TRUE;
+	    }
+
+	  /* Don't consider checksum.  */
+	  --bytes;
+
+	  while (bytes-- != 0)
+	    {
+	      contents[sofar] = HEX (data);
+	      data += 2;
+	      ++sofar;
+	    }
+
+	  break;
+	}
+    }
+
+  if (error)
+    goto error_return;
+
+  BFD_ASSERT (sofar == section->size);
+
+  if (buf != NULL)
+    free (buf);
+
+  return TRUE;
+
+ error_return:
+  if (buf != NULL)
+    free (buf);
+  return FALSE;
+}
+
+/* Get the contents of a section in an S-record file.  */
+
+static bfd_boolean
+srec_get_section_contents (bfd *abfd,
+			   asection *section,
+			   void * location,
+			   file_ptr offset,
+			   bfd_size_type count)
+{
+  if (count == 0)
+    return TRUE;
+
+  if (offset + count < count
+      || offset + count > section->size)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  if (section->used_by_bfd == NULL)
+    {
+      section->used_by_bfd = bfd_alloc (abfd, section->size);
+      if (section->used_by_bfd == NULL)
+	return FALSE;
+
+      if (! srec_read_section (abfd, section,
+                               (bfd_byte *) section->used_by_bfd))
+	return FALSE;
+    }
+
+  memcpy (location, (bfd_byte *) section->used_by_bfd + offset,
+	  (size_t) count);
+
+  return TRUE;
+}
+
+/* Set the architecture.  We accept an unknown architecture here.  */
+
+static bfd_boolean
+srec_set_arch_mach (bfd *abfd, enum bfd_architecture arch, unsigned long mach)
+{
+  if (arch != bfd_arch_unknown)
+    return bfd_default_set_arch_mach (abfd, arch, mach);
+
+  abfd->arch_info = & bfd_default_arch_struct;
+  return TRUE;
+}
+
+/* We have to save up all the Srecords for a splurge before output.  */
+
+static bfd_boolean
+srec_set_section_contents (bfd *abfd,
+			   sec_ptr section,
+			   const void * location,
+			   file_ptr offset,
+			   bfd_size_type bytes_to_do)
+{
+  tdata_type *tdata = abfd->tdata.srec_data;
+  srec_data_list_type *entry;
+
+  entry = (srec_data_list_type *) bfd_alloc (abfd, sizeof (* entry));
+  if (entry == NULL)
+    return FALSE;
+
+  if (bytes_to_do
+      && (section->flags & SEC_ALLOC)
+      && (section->flags & SEC_LOAD))
+    {
+      bfd_byte *data;
+
+      data = (bfd_byte *) bfd_alloc (abfd, bytes_to_do);
+      if (data == NULL)
+	return FALSE;
+      memcpy ((void *) data, location, (size_t) bytes_to_do);
+
+      /* Ff S3Forced is TRUE then always select S3 records,
+	 regardless of the siez of the addresses.  */
+      if (S3Forced)
+	tdata->type = 3;
+      else if ((section->lma + offset + bytes_to_do - 1) <= 0xffff)
+	;  /* The default, S1, is OK.  */
+      else if ((section->lma + offset + bytes_to_do - 1) <= 0xffffff
+	       && tdata->type <= 2)
+	tdata->type = 2;
+      else
+	tdata->type = 3;
+
+      entry->data = data;
+      entry->where = section->lma + offset;
+      entry->size = bytes_to_do;
+
+      /* Sort the records by address.  Optimize for the common case of
+	 adding a record to the end of the list.  */
+      if (tdata->tail != NULL
+	  && entry->where >= tdata->tail->where)
+	{
+	  tdata->tail->next = entry;
+	  entry->next = NULL;
+	  tdata->tail = entry;
+	}
+      else
+	{
+	  srec_data_list_type **look;
+
+	  for (look = &tdata->head;
+	       *look != NULL && (*look)->where < entry->where;
+	       look = &(*look)->next)
+	    ;
+	  entry->next = *look;
+	  *look = entry;
+	  if (entry->next == NULL)
+	    tdata->tail = entry;
+	}
+    }
+  return TRUE;
+}
+
+/* Write a record of type, of the supplied number of bytes. The
+   supplied bytes and length don't have a checksum. That's worked out
+   here.  */
+
+static bfd_boolean
+srec_write_record (bfd *abfd,
+		   unsigned int type,
+		   bfd_vma address,
+		   const bfd_byte *data,
+		   const bfd_byte *end)
+{
+  char buffer[2 * MAXCHUNK + 6];
+  unsigned int check_sum = 0;
+  const bfd_byte *src = data;
+  char *dst = buffer;
+  char *length;
+  bfd_size_type wrlen;
+
+  *dst++ = 'S';
+  *dst++ = '0' + type;
+
+  length = dst;
+  dst += 2;			/* Leave room for dst.  */
+
+  switch (type)
+    {
+    case 3:
+    case 7:
+      TOHEX (dst, (address >> 24), check_sum);
+      dst += 2;
+    case 8:
+    case 2:
+      TOHEX (dst, (address >> 16), check_sum);
+      dst += 2;
+    case 9:
+    case 1:
+    case 0:
+      TOHEX (dst, (address >> 8), check_sum);
+      dst += 2;
+      TOHEX (dst, (address), check_sum);
+      dst += 2;
+      break;
+
+    }
+  for (src = data; src < end; src++)
+    {
+      TOHEX (dst, *src, check_sum);
+      dst += 2;
+    }
+
+  /* Fill in the length.  */
+  TOHEX (length, (dst - length) / 2, check_sum);
+  check_sum &= 0xff;
+  check_sum = 255 - check_sum;
+  TOHEX (dst, check_sum, check_sum);
+  dst += 2;
+
+  *dst++ = '\r';
+  *dst++ = '\n';
+  wrlen = dst - buffer;
+
+  return bfd_bwrite ((void *) buffer, wrlen, abfd) == wrlen;
+}
+
+static bfd_boolean
+srec_write_header (bfd *abfd)
+{
+  unsigned int len = strlen (abfd->filename);
+
+  /* I'll put an arbitrary 40 char limit on header size.  */
+  if (len > 40)
+    len = 40;
+
+  return srec_write_record (abfd, 0, (bfd_vma) 0,
+			    (bfd_byte *) abfd->filename,
+			    (bfd_byte *) abfd->filename + len);
+}
+
+static bfd_boolean
+srec_write_section (bfd *abfd,
+		    tdata_type *tdata,
+		    srec_data_list_type *list)
+{
+  unsigned int octets_written = 0;
+  bfd_byte *location = list->data;
+
+  /* Validate number of data bytes to write.  The srec length byte
+     counts the address, data and crc bytes.  S1 (tdata->type == 1)
+     records have two address bytes, S2 (tdata->type == 2) records
+     have three, and S3 (tdata->type == 3) records have four.
+     The total length can't exceed 255, and a zero data length will
+     spin for a long time.  */
+  if (Chunk == 0)
+    Chunk = 1;
+  else if (Chunk > MAXCHUNK - tdata->type - 2)
+    Chunk = MAXCHUNK - tdata->type - 2;
+
+  while (octets_written < list->size)
+    {
+      bfd_vma address;
+      unsigned int octets_this_chunk = list->size - octets_written;
+
+      if (octets_this_chunk > Chunk)
+	octets_this_chunk = Chunk;
+
+      address = list->where + octets_written / bfd_octets_per_byte (abfd);
+
+      if (! srec_write_record (abfd,
+			       tdata->type,
+			       address,
+			       location,
+			       location + octets_this_chunk))
+	return FALSE;
+
+      octets_written += octets_this_chunk;
+      location += octets_this_chunk;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+srec_write_terminator (bfd *abfd, tdata_type *tdata)
+{
+  return srec_write_record (abfd, 10 - tdata->type,
+			    abfd->start_address, NULL, NULL);
+}
+
+static bfd_boolean
+srec_write_symbols (bfd *abfd)
+{
+  /* Dump out the symbols of a bfd.  */
+  int i;
+  int count = bfd_get_symcount (abfd);
+
+  if (count)
+    {
+      bfd_size_type len;
+      asymbol **table = bfd_get_outsymbols (abfd);
+
+      len = strlen (abfd->filename);
+      if (bfd_bwrite ("$$ ", (bfd_size_type) 3, abfd) != 3
+	  || bfd_bwrite (abfd->filename, len, abfd) != len
+	  || bfd_bwrite ("\r\n", (bfd_size_type) 2, abfd) != 2)
+	return FALSE;
+
+      for (i = 0; i < count; i++)
+	{
+	  asymbol *s = table[i];
+	  if (! bfd_is_local_label (abfd, s)
+	      && (s->flags & BSF_DEBUGGING) == 0)
+	    {
+	      /* Just dump out non debug symbols.  */
+	      char buf[43], *p;
+
+	      len = strlen (s->name);
+	      if (bfd_bwrite ("  ", (bfd_size_type) 2, abfd) != 2
+		  || bfd_bwrite (s->name, len, abfd) != len)
+		return FALSE;
+
+	      sprintf_vma (buf + 2, (s->value
+				     + s->section->output_section->lma
+				     + s->section->output_offset));
+	      p = buf + 2;
+	      while (p[0] == '0' && p[1] != 0)
+		p++;
+	      len = strlen (p);
+	      p[len] = '\r';
+	      p[len + 1] = '\n';
+	      *--p = '$';
+	      *--p = ' ';
+	      len += 4;
+	      if (bfd_bwrite (p, len, abfd) != len)
+		return FALSE;
+	    }
+	}
+      if (bfd_bwrite ("$$ \r\n", (bfd_size_type) 5, abfd) != 5)
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+internal_srec_write_object_contents (bfd *abfd, int symbols)
+{
+  tdata_type *tdata = abfd->tdata.srec_data;
+  srec_data_list_type *list;
+
+  if (symbols)
+    {
+      if (! srec_write_symbols (abfd))
+	return FALSE;
+    }
+
+  if (! srec_write_header (abfd))
+    return FALSE;
+
+  /* Now wander though all the sections provided and output them.  */
+  list = tdata->head;
+
+  while (list != (srec_data_list_type *) NULL)
+    {
+      if (! srec_write_section (abfd, tdata, list))
+	return FALSE;
+      list = list->next;
+    }
+  return srec_write_terminator (abfd, tdata);
+}
+
+static bfd_boolean
+srec_write_object_contents (bfd *abfd)
+{
+  return internal_srec_write_object_contents (abfd, 0);
+}
+
+static bfd_boolean
+symbolsrec_write_object_contents (bfd *abfd)
+{
+  return internal_srec_write_object_contents (abfd, 1);
+}
+
+static int
+srec_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+		     struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+/* Return the amount of memory needed to read the symbol table.  */
+
+static long
+srec_get_symtab_upper_bound (bfd *abfd)
+{
+  return (bfd_get_symcount (abfd) + 1) * sizeof (asymbol *);
+}
+
+/* Return the symbol table.  */
+
+static long
+srec_canonicalize_symtab (bfd *abfd, asymbol **alocation)
+{
+  bfd_size_type symcount = bfd_get_symcount (abfd);
+  asymbol *csymbols;
+  unsigned int i;
+
+  csymbols = abfd->tdata.srec_data->csymbols;
+  if (csymbols == NULL && symcount != 0)
+    {
+      asymbol *c;
+      struct srec_symbol *s;
+
+      csymbols = (asymbol *) bfd_alloc (abfd, symcount * sizeof (asymbol));
+      if (csymbols == NULL)
+	return -1;
+      abfd->tdata.srec_data->csymbols = csymbols;
+
+      for (s = abfd->tdata.srec_data->symbols, c = csymbols;
+	   s != NULL;
+	   s = s->next, ++c)
+	{
+	  c->the_bfd = abfd;
+	  c->name = s->name;
+	  c->value = s->val;
+	  c->flags = BSF_GLOBAL;
+	  c->section = bfd_abs_section_ptr;
+	  c->udata.p = NULL;
+	}
+    }
+
+  for (i = 0; i < symcount; i++)
+    *alocation++ = csymbols++;
+  *alocation = NULL;
+
+  return symcount;
+}
+
+static void
+srec_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+		      asymbol *symbol,
+		      symbol_info *ret)
+{
+  bfd_symbol_info (symbol, ret);
+}
+
+static void
+srec_print_symbol (bfd *abfd,
+		   void * afile,
+		   asymbol *symbol,
+		   bfd_print_symbol_type how)
+{
+  FILE *file = (FILE *) afile;
+
+  switch (how)
+    {
+    case bfd_print_symbol_name:
+      fprintf (file, "%s", symbol->name);
+      break;
+    default:
+      bfd_print_symbol_vandf (abfd, (void *) file, symbol);
+      fprintf (file, " %-5s %s",
+	       symbol->section->name,
+	       symbol->name);
+    }
+}
+
+#define	srec_close_and_cleanup                    _bfd_generic_close_and_cleanup
+#define srec_bfd_free_cached_info                 _bfd_generic_bfd_free_cached_info
+#define srec_new_section_hook                     _bfd_generic_new_section_hook
+#define srec_bfd_is_target_special_symbol         ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define srec_bfd_is_local_label_name              bfd_generic_is_local_label_name
+#define srec_get_lineno                           _bfd_nosymbols_get_lineno
+#define srec_find_nearest_line                    _bfd_nosymbols_find_nearest_line
+#define srec_find_inliner_info                    _bfd_nosymbols_find_inliner_info
+#define srec_make_empty_symbol                    _bfd_generic_make_empty_symbol
+#define srec_bfd_make_debug_symbol                _bfd_nosymbols_bfd_make_debug_symbol
+#define srec_read_minisymbols                     _bfd_generic_read_minisymbols
+#define srec_minisymbol_to_symbol                 _bfd_generic_minisymbol_to_symbol
+#define srec_get_section_contents_in_window       _bfd_generic_get_section_contents_in_window
+#define srec_bfd_get_relocated_section_contents   bfd_generic_get_relocated_section_contents
+#define srec_bfd_relax_section                    bfd_generic_relax_section
+#define srec_bfd_gc_sections                      bfd_generic_gc_sections
+#define srec_bfd_lookup_section_flags             bfd_generic_lookup_section_flags
+#define srec_bfd_merge_sections                   bfd_generic_merge_sections
+#define srec_bfd_is_group_section                 bfd_generic_is_group_section
+#define srec_bfd_discard_group                    bfd_generic_discard_group
+#define srec_section_already_linked               _bfd_generic_section_already_linked
+#define srec_bfd_define_common_symbol             bfd_generic_define_common_symbol
+#define srec_bfd_link_hash_table_create           _bfd_generic_link_hash_table_create
+#define srec_bfd_link_hash_table_free             _bfd_generic_link_hash_table_free
+#define srec_bfd_link_add_symbols                 _bfd_generic_link_add_symbols
+#define srec_bfd_link_just_syms                   _bfd_generic_link_just_syms
+#define srec_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define srec_bfd_final_link                       _bfd_generic_final_link
+#define srec_bfd_link_split_section               _bfd_generic_link_split_section
+
+const bfd_target srec_vec =
+{
+  "srec",			/* Name.  */
+  bfd_target_srec_flavour,
+  BFD_ENDIAN_UNKNOWN,		/* Target byte order.  */
+  BFD_ENDIAN_UNKNOWN,		/* Target headers byte order.  */
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+  (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
+   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* Section flags.  */
+  0,				/* Leading underscore.  */
+  ' ',				/* AR_pad_char.  */
+  16,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Data.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Hdrs.  */
+
+  {
+    _bfd_dummy_target,
+    srec_object_p,		/* bfd_check_format.  */
+    _bfd_dummy_target,
+    _bfd_dummy_target,
+  },
+  {
+    bfd_false,
+    srec_mkobject,
+    _bfd_generic_mkarchive,
+    bfd_false,
+  },
+  {				/* bfd_write_contents.  */
+    bfd_false,
+    srec_write_object_contents,
+    _bfd_write_archive_contents,
+    bfd_false,
+  },
+
+  BFD_JUMP_TABLE_GENERIC (srec),
+  BFD_JUMP_TABLE_COPY (_bfd_generic),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+  BFD_JUMP_TABLE_SYMBOLS (srec),
+  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+  BFD_JUMP_TABLE_WRITE (srec),
+  BFD_JUMP_TABLE_LINK (srec),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  NULL
+};
+
+const bfd_target symbolsrec_vec =
+{
+  "symbolsrec",			/* Name.  */
+  bfd_target_srec_flavour,
+  BFD_ENDIAN_UNKNOWN,		/* Target byte order.  */
+  BFD_ENDIAN_UNKNOWN,		/* Target headers byte order.  */
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+  (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
+   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* Section flags.  */
+  0,				/* Leading underscore.  */
+  ' ',				/* AR_pad_char.  */
+  16,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Data.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Headers.  */
+
+  {
+    _bfd_dummy_target,
+    symbolsrec_object_p,	/* bfd_check_format.  */
+    _bfd_dummy_target,
+    _bfd_dummy_target,
+  },
+  {
+    bfd_false,
+    srec_mkobject,
+    _bfd_generic_mkarchive,
+    bfd_false,
+  },
+  {				/* bfd_write_contents.  */
+    bfd_false,
+    symbolsrec_write_object_contents,
+    _bfd_write_archive_contents,
+    bfd_false,
+  },
+
+  BFD_JUMP_TABLE_GENERIC (srec),
+  BFD_JUMP_TABLE_COPY (_bfd_generic),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+  BFD_JUMP_TABLE_SYMBOLS (srec),
+  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+  BFD_JUMP_TABLE_WRITE (srec),
+  BFD_JUMP_TABLE_LINK (srec),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  NULL
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/stab-syms.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/stab-syms.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/stab-syms.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/stab-syms.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,59 @@
+/* Table of stab names for the BFD library.
+   Copyright 1990, 1991, 1992, 1994, 1995, 1996, 2000, 2005, 2007
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "bfd.h"
+
+#define ARCH_SIZE 32		/* Value doesn't matter.  */
+#include "libaout.h"
+#include "aout/aout64.h"
+
+/* Ignore duplicate stab codes; just return the string for the first
+   one.  */
+#define __define_stab(NAME, CODE, STRING) __define_name(CODE, STRING)
+#define __define_stab_duplicate(NAME, CODE, STRING)
+
+/* These are not really stab symbols, but it is
+   convenient to have them here for the sake of nm.
+   For completeness, we could also add N_TEXT etc, but those
+   are never needed, since nm treats those specially.  */
+#define EXTRA_SYMBOLS \
+  __define_name (N_SETA, "SETA")/* Absolute set element symbol */ \
+  __define_name (N_SETT, "SETT")/* Text set element symbol */ \
+  __define_name (N_SETD, "SETD")/* Data set element symbol */ \
+  __define_name (N_SETB, "SETB")/* Bss set element symbol */ \
+  __define_name (N_SETV, "SETV")/* Pointer to set vector in data area.  */ \
+  __define_name (N_INDR, "INDR") \
+  __define_name (N_WARNING, "WARNING")
+
+const char *
+bfd_get_stab_name (code)
+     int code;
+{
+  switch (code)
+    {
+#define __define_name(val, str) case val: return str;
+#include "aout/stab.def"
+      EXTRA_SYMBOLS
+    }
+
+  return (const char *) 0;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/stabs.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/stabs.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/stabs.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/stabs.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,789 @@
+/* Stabs in sections linking support.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006, 2007, 2008 Free Software Foundation, Inc.
+   Written by Ian Lance Taylor, Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* This file contains support for linking stabs in sections, as used
+   on COFF and ELF.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "aout/stab_gnu.h"
+#include "safe-ctype.h"
+
+/* Stabs entries use a 12 byte format:
+     4 byte string table index
+     1 byte stab type
+     1 byte stab other field
+     2 byte stab desc field
+     4 byte stab value
+   FIXME: This will have to change for a 64 bit object format.
+
+   The stabs symbols are divided into compilation units.  For the
+   first entry in each unit, the type of 0, the value is the length of
+   the string table for this unit, and the desc field is the number of
+   stabs symbols for this unit.  */
+
+#define STRDXOFF  0
+#define TYPEOFF   4
+#define OTHEROFF  5
+#define DESCOFF   6
+#define VALOFF    8
+#define STABSIZE  12
+
+/* A linked list of totals that we have found for a particular header
+   file.  A total is a unique identifier for a particular BINCL...EINCL
+   sequence of STABs that can be used to identify duplicate sequences.
+   It consists of three fields, 'sum_chars' which is the sum of all the
+   STABS characters; 'num_chars' which is the number of these charactes
+   and 'symb' which is a buffer of all the symbols in the sequence.  This
+   buffer is only checked as a last resort.  */
+
+struct stab_link_includes_totals
+{
+  struct stab_link_includes_totals *next;
+  bfd_vma sum_chars;  /* Accumulated sum of STABS characters.  */
+  bfd_vma num_chars;  /* Number of STABS characters.  */
+  const char* symb;   /* The STABS characters themselves.  */
+};
+
+/* An entry in the header file hash table.  */
+
+struct stab_link_includes_entry
+{
+  struct bfd_hash_entry root;
+  /* List of totals we have found for this file.  */
+  struct stab_link_includes_totals *totals;
+};
+
+/* This structure is used to hold a list of N_BINCL symbols, some of
+   which might be converted into N_EXCL symbols.  */
+
+struct stab_excl_list
+{
+  /* The next symbol to convert.  */
+  struct stab_excl_list *next;
+  /* The offset to this symbol in the section contents.  */
+  bfd_size_type offset;
+  /* The value to use for the symbol.  */
+  bfd_vma val;
+  /* The type of this symbol (N_BINCL or N_EXCL).  */
+  int type;
+};
+
+/* This structure is stored with each .stab section.  */
+
+struct stab_section_info
+{
+  /* This is a linked list of N_BINCL symbols which should be
+     converted into N_EXCL symbols.  */
+  struct stab_excl_list *excls;
+
+  /* This is used to map input stab offsets within their sections
+     to output stab offsets, to take into account stabs that have
+     been deleted.  If it is NULL, the output offsets are the same
+     as the input offsets, because no stabs have been deleted from
+     this section.  Otherwise the i'th entry is the number of
+     bytes of stabs that have been deleted prior to the i'th
+     stab.  */
+  bfd_size_type *cumulative_skips;
+
+  /* This is an array of string indices.  For each stab symbol, we
+     store the string index here.  If a stab symbol should not be
+     included in the final output, the string index is -1.  */
+  bfd_size_type stridxs[1];
+};
+
+
+/* The function to create a new entry in the header file hash table.  */
+
+static struct bfd_hash_entry *
+stab_link_includes_newfunc (struct bfd_hash_entry *entry,
+			    struct bfd_hash_table *table,
+			    const char *string)
+{
+  struct stab_link_includes_entry *ret =
+    (struct stab_link_includes_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = (struct stab_link_includes_entry *)
+        bfd_hash_allocate (table, sizeof (struct stab_link_includes_entry));
+  if (ret == NULL)
+    return NULL;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct stab_link_includes_entry *)
+	 bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
+  if (ret)
+    /* Set local fields.  */
+    ret->totals = NULL;
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* This function is called for each input file from the add_symbols
+   pass of the linker.  */
+
+bfd_boolean
+_bfd_link_section_stabs (bfd *abfd,
+			 struct stab_info *sinfo,
+			 asection *stabsec,
+			 asection *stabstrsec,
+			 void * *psecinfo,
+			 bfd_size_type *pstring_offset)
+{
+  bfd_boolean first;
+  bfd_size_type count, amt;
+  struct stab_section_info *secinfo;
+  bfd_byte *stabbuf = NULL;
+  bfd_byte *stabstrbuf = NULL;
+  bfd_byte *sym, *symend;
+  bfd_size_type stroff, next_stroff, skip;
+  bfd_size_type *pstridx;
+
+  if (stabsec->size == 0
+      || stabstrsec->size == 0)
+    /* This file does not contain stabs debugging information.  */
+    return TRUE;
+
+  if (stabsec->size % STABSIZE != 0)
+    /* Something is wrong with the format of these stab symbols.
+       Don't try to optimize them.  */
+    return TRUE;
+
+  if ((stabstrsec->flags & SEC_RELOC) != 0)
+    /* We shouldn't see relocations in the strings, and we aren't
+       prepared to handle them.  */
+    return TRUE;
+
+  if (bfd_is_abs_section (stabsec->output_section)
+      || bfd_is_abs_section (stabstrsec->output_section))
+    /* At least one of the sections is being discarded from the
+       link, so we should just ignore them.  */
+    return TRUE;
+
+  first = FALSE;
+
+  if (sinfo->stabstr == NULL)
+    {
+      flagword flags;
+
+      /* Initialize the stabs information we need to keep track of.  */
+      first = TRUE;
+      sinfo->strings = _bfd_stringtab_init ();
+      if (sinfo->strings == NULL)
+	goto error_return;
+      /* Make sure the first byte is zero.  */
+      (void) _bfd_stringtab_add (sinfo->strings, "", TRUE, TRUE);
+      if (! bfd_hash_table_init (&sinfo->includes,
+				 stab_link_includes_newfunc,
+				 sizeof (struct stab_link_includes_entry)))
+	goto error_return;
+      flags = (SEC_HAS_CONTENTS | SEC_READONLY | SEC_DEBUGGING
+	       | SEC_LINKER_CREATED);
+      sinfo->stabstr = bfd_make_section_anyway_with_flags (abfd, ".stabstr",
+							   flags);
+      if (sinfo->stabstr == NULL)
+	goto error_return;
+    }
+
+  /* Initialize the information we are going to store for this .stab
+     section.  */
+  count = stabsec->size / STABSIZE;
+
+  amt = sizeof (struct stab_section_info);
+  amt += (count - 1) * sizeof (bfd_size_type);
+  *psecinfo = bfd_alloc (abfd, amt);
+  if (*psecinfo == NULL)
+    goto error_return;
+
+  secinfo = (struct stab_section_info *) *psecinfo;
+  secinfo->excls = NULL;
+  stabsec->rawsize = stabsec->size;
+  secinfo->cumulative_skips = NULL;
+  memset (secinfo->stridxs, 0, (size_t) count * sizeof (bfd_size_type));
+
+  /* Read the stabs information from abfd.  */
+  if (!bfd_malloc_and_get_section (abfd, stabsec, &stabbuf)
+      || !bfd_malloc_and_get_section (abfd, stabstrsec, &stabstrbuf))
+    goto error_return;
+
+  /* Look through the stabs symbols, work out the new string indices,
+     and identify N_BINCL symbols which can be eliminated.  */
+  stroff = 0;
+  /* The stabs sections can be split when
+     -split-by-reloc/-split-by-file is used.  We must keep track of
+     each stab section's place in the single concatenated string
+     table.  */
+  next_stroff = pstring_offset ? *pstring_offset : 0;
+  skip = 0;
+
+  symend = stabbuf + stabsec->size;
+  for (sym = stabbuf, pstridx = secinfo->stridxs;
+       sym < symend;
+       sym += STABSIZE, ++pstridx)
+    {
+      bfd_size_type symstroff;
+      int type;
+      const char *string;
+
+      if (*pstridx != 0)
+	/* This symbol has already been handled by an N_BINCL pass.  */
+	continue;
+
+      type = sym[TYPEOFF];
+
+      if (type == 0)
+	{
+	  /* Special type 0 stabs indicate the offset to the next
+	     string table.  We only copy the very first one.  */
+	  stroff = next_stroff;
+	  next_stroff += bfd_get_32 (abfd, sym + 8);
+	  if (pstring_offset)
+	    *pstring_offset = next_stroff;
+	  if (! first)
+	    {
+	      *pstridx = (bfd_size_type) -1;
+	      ++skip;
+	      continue;
+	    }
+	  first = FALSE;
+	}
+
+      /* Store the string in the hash table, and record the index.  */
+      symstroff = stroff + bfd_get_32 (abfd, sym + STRDXOFF);
+      if (symstroff >= stabstrsec->size)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B(%A+0x%lx): Stabs entry has invalid string index."),
+	     abfd, stabsec, (long) (sym - stabbuf));
+	  bfd_set_error (bfd_error_bad_value);
+	  goto error_return;
+	}
+      string = (char *) stabstrbuf + symstroff;
+      *pstridx = _bfd_stringtab_add (sinfo->strings, string, TRUE, TRUE);
+
+      /* An N_BINCL symbol indicates the start of the stabs entries
+	 for a header file.  We need to scan ahead to the next N_EINCL
+	 symbol, ignoring nesting, adding up all the characters in the
+	 symbol names, not including the file numbers in types (the
+	 first number after an open parenthesis).  */
+      if (type == (int) N_BINCL)
+	{
+	  bfd_vma sum_chars;
+	  bfd_vma num_chars;
+	  bfd_vma buf_len = 0;
+	  char * symb;
+	  char * symb_rover;
+	  int nest;
+	  bfd_byte * incl_sym;
+	  struct stab_link_includes_entry * incl_entry;
+	  struct stab_link_includes_totals * t;
+	  struct stab_excl_list * ne;
+
+	  symb = symb_rover = NULL;
+	  sum_chars = num_chars = 0;
+	  nest = 0;
+
+	  for (incl_sym = sym + STABSIZE;
+	       incl_sym < symend;
+	       incl_sym += STABSIZE)
+	    {
+	      int incl_type;
+
+	      incl_type = incl_sym[TYPEOFF];
+	      if (incl_type == 0)
+		break;
+	      else if (incl_type == (int) N_EXCL)
+		continue;
+	      else if (incl_type == (int) N_EINCL)
+		{
+		  if (nest == 0)
+		    break;
+		  --nest;
+		}
+	      else if (incl_type == (int) N_BINCL)
+		++nest;
+	      else if (nest == 0)
+		{
+		  const char *str;
+
+		  str = ((char *) stabstrbuf
+			 + stroff
+			 + bfd_get_32 (abfd, incl_sym + STRDXOFF));
+		  for (; *str != '\0'; str++)
+		    {
+		      if (num_chars >= buf_len)
+			{
+			  buf_len += 32 * 1024;
+			  symb = (char *) bfd_realloc_or_free (symb, buf_len);
+			  if (symb == NULL)
+			    goto error_return;
+			  symb_rover = symb + num_chars;
+			}
+		      * symb_rover ++ = * str;
+		      sum_chars += *str;
+		      num_chars ++;
+		      if (*str == '(')
+			{
+			  /* Skip the file number.  */
+			  ++str;
+			  while (ISDIGIT (*str))
+			    ++str;
+			  --str;
+			}
+		    }
+		}
+	    }
+
+	  BFD_ASSERT (num_chars == (bfd_vma) (symb_rover - symb));
+
+	  /* If we have already included a header file with the same
+	     value, then replaced this one with an N_EXCL symbol.  */
+	  incl_entry = (struct stab_link_includes_entry * )
+	    bfd_hash_lookup (&sinfo->includes, string, TRUE, TRUE);
+	  if (incl_entry == NULL)
+	    goto error_return;
+
+	  for (t = incl_entry->totals; t != NULL; t = t->next)
+	    if (t->sum_chars == sum_chars
+		&& t->num_chars == num_chars
+		&& memcmp (t->symb, symb, num_chars) == 0)
+	      break;
+
+	  /* Record this symbol, so that we can set the value
+	     correctly.  */
+	  amt = sizeof *ne;
+	  ne = (struct stab_excl_list *) bfd_alloc (abfd, amt);
+	  if (ne == NULL)
+	    goto error_return;
+	  ne->offset = sym - stabbuf;
+	  ne->val = sum_chars;
+	  ne->type = (int) N_BINCL;
+	  ne->next = secinfo->excls;
+	  secinfo->excls = ne;
+
+	  if (t == NULL)
+	    {
+	      /* This is the first time we have seen this header file
+		 with this set of stabs strings.  */
+	      t = (struct stab_link_includes_totals *)
+                  bfd_hash_allocate (&sinfo->includes, sizeof *t);
+	      if (t == NULL)
+		goto error_return;
+	      t->sum_chars = sum_chars;
+	      t->num_chars = num_chars;
+              /* Trim data down.  */
+	      t->symb = symb = (char *) bfd_realloc_or_free (symb, num_chars);
+	      t->next = incl_entry->totals;
+	      incl_entry->totals = t;
+	    }
+	  else
+	    {
+	      bfd_size_type *incl_pstridx;
+
+	      /* We have seen this header file before.  Tell the final
+		 pass to change the type to N_EXCL.  */
+	      ne->type = (int) N_EXCL;
+
+	      /* Free off superfluous symbols.  */
+	      free (symb);
+
+	      /* Mark the skipped symbols.  */
+
+	      nest = 0;
+	      for (incl_sym = sym + STABSIZE, incl_pstridx = pstridx + 1;
+		   incl_sym < symend;
+		   incl_sym += STABSIZE, ++incl_pstridx)
+		{
+		  int incl_type;
+
+		  incl_type = incl_sym[TYPEOFF];
+
+		  if (incl_type == (int) N_EINCL)
+		    {
+		      if (nest == 0)
+			{
+			  *incl_pstridx = (bfd_size_type) -1;
+			  ++skip;
+			  break;
+			}
+		      --nest;
+		    }
+		  else if (incl_type == (int) N_BINCL)
+		    ++nest;
+		  else if (incl_type == (int) N_EXCL)
+		    /* Keep existing exclusion marks.  */
+		    continue;
+		  else if (nest == 0)
+		    {
+		      *incl_pstridx = (bfd_size_type) -1;
+		      ++skip;
+		    }
+		}
+	    }
+	}
+    }
+
+  free (stabbuf);
+  stabbuf = NULL;
+  free (stabstrbuf);
+  stabstrbuf = NULL;
+
+  /* We need to set the section sizes such that the linker will
+     compute the output section sizes correctly.  We set the .stab
+     size to not include the entries we don't want.  We set
+     SEC_EXCLUDE for the .stabstr section, so that it will be dropped
+     from the link.  We record the size of the strtab in the first
+     .stabstr section we saw, and make sure we don't set SEC_EXCLUDE
+     for that section.  */
+  stabsec->size = (count - skip) * STABSIZE;
+  if (stabsec->size == 0)
+    stabsec->flags |= SEC_EXCLUDE | SEC_KEEP;
+  stabstrsec->flags |= SEC_EXCLUDE | SEC_KEEP;
+  sinfo->stabstr->size = _bfd_stringtab_size (sinfo->strings);
+
+  /* Calculate the `cumulative_skips' array now that stabs have been
+     deleted for this section.  */
+
+  if (skip != 0)
+    {
+      bfd_size_type i, offset;
+      bfd_size_type *pskips;
+
+      amt = count * sizeof (bfd_size_type);
+      secinfo->cumulative_skips = (bfd_size_type *) bfd_alloc (abfd, amt);
+      if (secinfo->cumulative_skips == NULL)
+	goto error_return;
+
+      pskips = secinfo->cumulative_skips;
+      pstridx = secinfo->stridxs;
+      offset = 0;
+
+      for (i = 0; i < count; i++, pskips++, pstridx++)
+	{
+	  *pskips = offset;
+	  if (*pstridx == (bfd_size_type) -1)
+	    offset += STABSIZE;
+	}
+
+      BFD_ASSERT (offset != 0);
+    }
+
+  return TRUE;
+
+ error_return:
+  if (stabbuf != NULL)
+    free (stabbuf);
+  if (stabstrbuf != NULL)
+    free (stabstrbuf);
+  return FALSE;
+}
+
+/* This function is called for each input file before the stab
+   section is relocated.  It discards stab entries for discarded
+   functions and variables.  The function returns TRUE iff
+   any entries have been deleted.
+*/
+
+bfd_boolean
+_bfd_discard_section_stabs (bfd *abfd,
+			    asection *stabsec,
+			    void * psecinfo,
+			    bfd_boolean (*reloc_symbol_deleted_p) (bfd_vma, void *),
+			    void * cookie)
+{
+  bfd_size_type count, amt;
+  struct stab_section_info *secinfo;
+  bfd_byte *stabbuf = NULL;
+  bfd_byte *sym, *symend;
+  bfd_size_type skip;
+  bfd_size_type *pstridx;
+  int deleting;
+
+  if (stabsec->size == 0)
+    /* This file does not contain stabs debugging information.  */
+    return FALSE;
+
+  if (stabsec->size % STABSIZE != 0)
+    /* Something is wrong with the format of these stab symbols.
+       Don't try to optimize them.  */
+    return FALSE;
+
+  if ((stabsec->output_section != NULL
+       && bfd_is_abs_section (stabsec->output_section)))
+    /* At least one of the sections is being discarded from the
+       link, so we should just ignore them.  */
+    return FALSE;
+
+  /* We should have initialized our data in _bfd_link_stab_sections.
+     If there was some bizarre error reading the string sections, though,
+     we might not have.  Bail rather than asserting.  */
+  if (psecinfo == NULL)
+    return FALSE;
+
+  count = stabsec->rawsize / STABSIZE;
+  secinfo = (struct stab_section_info *) psecinfo;
+
+  /* Read the stabs information from abfd.  */
+  if (!bfd_malloc_and_get_section (abfd, stabsec, &stabbuf))
+    goto error_return;
+
+  /* Look through the stabs symbols and discard any information for
+     discarded functions.  */
+  skip = 0;
+  deleting = -1;
+
+  symend = stabbuf + stabsec->rawsize;
+  for (sym = stabbuf, pstridx = secinfo->stridxs;
+       sym < symend;
+       sym += STABSIZE, ++pstridx)
+    {
+      int type;
+
+      if (*pstridx == (bfd_size_type) -1)
+	/* This stab was deleted in a previous pass.  */
+	continue;
+
+      type = sym[TYPEOFF];
+
+      if (type == (int) N_FUN)
+	{
+	  int strx = bfd_get_32 (abfd, sym + STRDXOFF);
+
+	  if (strx == 0)
+	    {
+	      if (deleting)
+		{
+		  skip++;
+		  *pstridx = -1;
+		}
+	      deleting = -1;
+	      continue;
+	    }
+	  deleting = 0;
+	  if ((*reloc_symbol_deleted_p) (sym + VALOFF - stabbuf, cookie))
+	    deleting = 1;
+	}
+
+      if (deleting == 1)
+	{
+	  *pstridx = -1;
+	  skip++;
+	}
+      else if (deleting == -1)
+	{
+	  /* Outside of a function.  Check for deleted variables.  */
+	  if (type == (int) N_STSYM || type == (int) N_LCSYM)
+	    if ((*reloc_symbol_deleted_p) (sym + VALOFF - stabbuf, cookie))
+	      {
+		*pstridx = -1;
+		skip ++;
+	      }
+	  /* We should also check for N_GSYM entries which reference a
+	     deleted global, but those are less harmful to debuggers
+	     and would require parsing the stab strings.  */
+	}
+    }
+
+  free (stabbuf);
+  stabbuf = NULL;
+
+  /* Shrink the stabsec as needed.  */
+  stabsec->size -= skip * STABSIZE;
+  if (stabsec->size == 0)
+    stabsec->flags |= SEC_EXCLUDE | SEC_KEEP;
+
+  /* Recalculate the `cumulative_skips' array now that stabs have been
+     deleted for this section.  */
+
+  if (skip != 0)
+    {
+      bfd_size_type i, offset;
+      bfd_size_type *pskips;
+
+      if (secinfo->cumulative_skips == NULL)
+	{
+	  amt = count * sizeof (bfd_size_type);
+	  secinfo->cumulative_skips = (bfd_size_type *) bfd_alloc (abfd, amt);
+	  if (secinfo->cumulative_skips == NULL)
+	    goto error_return;
+	}
+
+      pskips = secinfo->cumulative_skips;
+      pstridx = secinfo->stridxs;
+      offset = 0;
+
+      for (i = 0; i < count; i++, pskips++, pstridx++)
+	{
+	  *pskips = offset;
+	  if (*pstridx == (bfd_size_type) -1)
+	    offset += STABSIZE;
+	}
+
+      BFD_ASSERT (offset != 0);
+    }
+
+  return skip > 0;
+
+ error_return:
+  if (stabbuf != NULL)
+    free (stabbuf);
+  return FALSE;
+}
+
+/* Write out the stab section.  This is called with the relocated
+   contents.  */
+
+bfd_boolean
+_bfd_write_section_stabs (bfd *output_bfd,
+			  struct stab_info *sinfo,
+			  asection *stabsec,
+			  void * *psecinfo,
+			  bfd_byte *contents)
+{
+  struct stab_section_info *secinfo;
+  struct stab_excl_list *e;
+  bfd_byte *sym, *tosym, *symend;
+  bfd_size_type *pstridx;
+
+  secinfo = (struct stab_section_info *) *psecinfo;
+
+  if (secinfo == NULL)
+    return bfd_set_section_contents (output_bfd, stabsec->output_section,
+				     contents, stabsec->output_offset,
+				     stabsec->size);
+
+  /* Handle each N_BINCL entry.  */
+  for (e = secinfo->excls; e != NULL; e = e->next)
+    {
+      bfd_byte *excl_sym;
+
+      BFD_ASSERT (e->offset < stabsec->rawsize);
+      excl_sym = contents + e->offset;
+      bfd_put_32 (output_bfd, e->val, excl_sym + VALOFF);
+      excl_sym[TYPEOFF] = e->type;
+    }
+
+  /* Copy over all the stabs symbols, omitting the ones we don't want,
+     and correcting the string indices for those we do want.  */
+  tosym = contents;
+  symend = contents + stabsec->rawsize;
+  for (sym = contents, pstridx = secinfo->stridxs;
+       sym < symend;
+       sym += STABSIZE, ++pstridx)
+    {
+      if (*pstridx != (bfd_size_type) -1)
+	{
+	  if (tosym != sym)
+	    memcpy (tosym, sym, STABSIZE);
+	  bfd_put_32 (output_bfd, *pstridx, tosym + STRDXOFF);
+
+	  if (sym[TYPEOFF] == 0)
+	    {
+	      /* This is the header symbol for the stabs section.  We
+		 don't really need one, since we have merged all the
+		 input stabs sections into one, but we generate one
+		 for the benefit of readers which expect to see one.  */
+	      BFD_ASSERT (sym == contents);
+	      bfd_put_32 (output_bfd, _bfd_stringtab_size (sinfo->strings),
+			  tosym + VALOFF);
+	      bfd_put_16 (output_bfd,
+			  stabsec->output_section->size / STABSIZE - 1,
+			  tosym + DESCOFF);
+	    }
+
+	  tosym += STABSIZE;
+	}
+    }
+
+  BFD_ASSERT ((bfd_size_type) (tosym - contents) == stabsec->size);
+
+  return bfd_set_section_contents (output_bfd, stabsec->output_section,
+				   contents, (file_ptr) stabsec->output_offset,
+				   stabsec->size);
+}
+
+/* Write out the .stabstr section.  */
+
+bfd_boolean
+_bfd_write_stab_strings (bfd *output_bfd, struct stab_info *sinfo)
+{
+  if (bfd_is_abs_section (sinfo->stabstr->output_section))
+    /* The section was discarded from the link.  */
+    return TRUE;
+
+  BFD_ASSERT ((sinfo->stabstr->output_offset
+	       + _bfd_stringtab_size (sinfo->strings))
+	      <= sinfo->stabstr->output_section->size);
+
+  if (bfd_seek (output_bfd,
+		(file_ptr) (sinfo->stabstr->output_section->filepos
+			    + sinfo->stabstr->output_offset),
+		SEEK_SET) != 0)
+    return FALSE;
+
+  if (! _bfd_stringtab_emit (output_bfd, sinfo->strings))
+    return FALSE;
+
+  /* We no longer need the stabs information.  */
+  _bfd_stringtab_free (sinfo->strings);
+  bfd_hash_table_free (&sinfo->includes);
+
+  return TRUE;
+}
+
+/* Adjust an address in the .stab section.  Given OFFSET within
+   STABSEC, this returns the new offset in the adjusted stab section,
+   or -1 if the address refers to a stab which has been removed.  */
+
+bfd_vma
+_bfd_stab_section_offset (asection *stabsec,
+			  void * psecinfo,
+			  bfd_vma offset)
+{
+  struct stab_section_info *secinfo;
+
+  secinfo = (struct stab_section_info *) psecinfo;
+
+  if (secinfo == NULL)
+    return offset;
+
+  if (offset >= stabsec->rawsize)
+    return offset - stabsec->rawsize + stabsec->size;
+
+  if (secinfo->cumulative_skips)
+    {
+      bfd_vma i;
+
+      i = offset / STABSIZE;
+
+      if (secinfo->stridxs [i] == (bfd_size_type) -1)
+	return (bfd_vma) -1;
+
+      return offset - secinfo->cumulative_skips [i];
+    }
+
+  return offset;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/stamp-h.in sdcc-3.2.0+dfsg/support/sdbinutils/bfd/stamp-h.in
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/stamp-h.in	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/stamp-h.in	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1 @@
+timestamp
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/sunos.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/sunos.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/sunos.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/sunos.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2851 @@
+/* BFD backend for SunOS binaries.
+   Copyright 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2011
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define TARGETNAME "a.out-sunos-big"
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (sunos_big_,OP)
+
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libaout.h"
+
+/* ??? Where should this go?  */
+#define MACHTYPE_OK(mtype) \
+  (((mtype) == M_SPARC && bfd_lookup_arch (bfd_arch_sparc, 0) != NULL) \
+   || ((mtype) == M_SPARCLET \
+       && bfd_lookup_arch (bfd_arch_sparc, bfd_mach_sparc_sparclet) != NULL) \
+   || ((mtype) == M_SPARCLITE_LE \
+       && bfd_lookup_arch (bfd_arch_sparc, bfd_mach_sparc_sparclet) != NULL) \
+   || (((mtype) == M_UNKNOWN || (mtype) == M_68010 || (mtype) == M_68020) \
+       && bfd_lookup_arch (bfd_arch_m68k, 0) != NULL))
+
+#define MY_get_dynamic_symtab_upper_bound  sunos_get_dynamic_symtab_upper_bound
+#define MY_canonicalize_dynamic_symtab     sunos_canonicalize_dynamic_symtab
+#define MY_get_synthetic_symtab            _bfd_nodynamic_get_synthetic_symtab
+#define MY_get_dynamic_reloc_upper_bound   sunos_get_dynamic_reloc_upper_bound
+#define MY_canonicalize_dynamic_reloc      sunos_canonicalize_dynamic_reloc
+#define MY_bfd_link_hash_table_create      sunos_link_hash_table_create
+#define MY_add_dynamic_symbols             sunos_add_dynamic_symbols
+#define MY_add_one_symbol                  sunos_add_one_symbol
+#define MY_link_dynamic_object             sunos_link_dynamic_object
+#define MY_write_dynamic_symbol            sunos_write_dynamic_symbol
+#define MY_check_dynamic_reloc             sunos_check_dynamic_reloc
+#define MY_finish_dynamic_link             sunos_finish_dynamic_link
+
+static bfd_boolean sunos_add_dynamic_symbols            (bfd *, struct bfd_link_info *, struct external_nlist **, bfd_size_type *, char **);
+static bfd_boolean sunos_add_one_symbol                 (struct bfd_link_info *, bfd *, const char *, flagword, asection *, bfd_vma, const char *, bfd_boolean, bfd_boolean, struct bfd_link_hash_entry **);
+static bfd_boolean sunos_link_dynamic_object            (struct bfd_link_info *, bfd *);
+static bfd_boolean sunos_write_dynamic_symbol           (bfd *, struct bfd_link_info *, struct aout_link_hash_entry *);
+static bfd_boolean sunos_check_dynamic_reloc            (struct bfd_link_info *, bfd *, asection *, struct aout_link_hash_entry *, void *, bfd_byte *, bfd_boolean *, bfd_vma *);
+static bfd_boolean sunos_finish_dynamic_link            (bfd *, struct bfd_link_info *);
+static struct bfd_link_hash_table *sunos_link_hash_table_create  (bfd *);
+static long        sunos_get_dynamic_symtab_upper_bound (bfd *);
+static long        sunos_canonicalize_dynamic_symtab    (bfd *, asymbol **);
+static long        sunos_get_dynamic_reloc_upper_bound  (bfd *);
+static long        sunos_canonicalize_dynamic_reloc     (bfd *, arelent **, asymbol **);
+
+/* Include the usual a.out support.  */
+#include "aoutf1.h"
+
+/* The SunOS 4.1.4 /usr/include/locale.h defines valid as a macro.  */
+#undef valid
+
+/* SunOS shared library support.  We store a pointer to this structure
+   in obj_aout_dynamic_info (abfd).  */
+
+struct sunos_dynamic_info
+{
+  /* Whether we found any dynamic information.  */
+  bfd_boolean valid;
+  /* Dynamic information.  */
+  struct internal_sun4_dynamic_link dyninfo;
+  /* Number of dynamic symbols.  */
+  unsigned long dynsym_count;
+  /* Read in nlists for dynamic symbols.  */
+  struct external_nlist *dynsym;
+  /* asymbol structures for dynamic symbols.  */
+  aout_symbol_type *canonical_dynsym;
+  /* Read in dynamic string table.  */
+  char *dynstr;
+  /* Number of dynamic relocs.  */
+  unsigned long dynrel_count;
+  /* Read in dynamic relocs.  This may be reloc_std_external or
+     reloc_ext_external.  */
+  void * dynrel;
+  /* arelent structures for dynamic relocs.  */
+  arelent *canonical_dynrel;
+};
+
+/* The hash table of dynamic symbols is composed of two word entries.
+   See include/aout/sun4.h for details.  */
+
+#define HASH_ENTRY_SIZE (2 * BYTES_IN_WORD)
+
+/* Read in the basic dynamic information.  This locates the __DYNAMIC
+   structure and uses it to find the dynamic_link structure.  It
+   creates and saves a sunos_dynamic_info structure.  If it can't find
+   __DYNAMIC, it sets the valid field of the sunos_dynamic_info
+   structure to FALSE to avoid doing this work again.  */
+
+static bfd_boolean
+sunos_read_dynamic_info (bfd *abfd)
+{
+  struct sunos_dynamic_info *info;
+  asection *dynsec;
+  bfd_vma dynoff;
+  struct external_sun4_dynamic dyninfo;
+  unsigned long dynver;
+  struct external_sun4_dynamic_link linkinfo;
+  bfd_size_type amt;
+
+  if (obj_aout_dynamic_info (abfd) != NULL)
+    return TRUE;
+
+  if ((abfd->flags & DYNAMIC) == 0)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  amt = sizeof (struct sunos_dynamic_info);
+  info = bfd_zalloc (abfd, amt);
+  if (!info)
+    return FALSE;
+  info->valid = FALSE;
+  info->dynsym = NULL;
+  info->dynstr = NULL;
+  info->canonical_dynsym = NULL;
+  info->dynrel = NULL;
+  info->canonical_dynrel = NULL;
+  obj_aout_dynamic_info (abfd) = (void *) info;
+
+  /* This code used to look for the __DYNAMIC symbol to locate the dynamic
+     linking information.
+     However this inhibits recovering the dynamic symbols from a
+     stripped object file, so blindly assume that the dynamic linking
+     information is located at the start of the data section.
+     We could verify this assumption later by looking through the dynamic
+     symbols for the __DYNAMIC symbol.  */
+  if ((abfd->flags & DYNAMIC) == 0)
+    return TRUE;
+  if (! bfd_get_section_contents (abfd, obj_datasec (abfd), (void *) &dyninfo,
+				  (file_ptr) 0,
+				  (bfd_size_type) sizeof dyninfo))
+    return TRUE;
+
+  dynver = GET_WORD (abfd, dyninfo.ld_version);
+  if (dynver != 2 && dynver != 3)
+    return TRUE;
+
+  dynoff = GET_WORD (abfd, dyninfo.ld);
+
+  /* dynoff is a virtual address.  It is probably always in the .data
+     section, but this code should work even if it moves.  */
+  if (dynoff < bfd_get_section_vma (abfd, obj_datasec (abfd)))
+    dynsec = obj_textsec (abfd);
+  else
+    dynsec = obj_datasec (abfd);
+  dynoff -= bfd_get_section_vma (abfd, dynsec);
+  if (dynoff > dynsec->size)
+    return TRUE;
+
+  /* This executable appears to be dynamically linked in a way that we
+     can understand.  */
+  if (! bfd_get_section_contents (abfd, dynsec, (void *) &linkinfo,
+				  (file_ptr) dynoff,
+				  (bfd_size_type) sizeof linkinfo))
+    return TRUE;
+
+  /* Swap in the dynamic link information.  */
+  info->dyninfo.ld_loaded = GET_WORD (abfd, linkinfo.ld_loaded);
+  info->dyninfo.ld_need = GET_WORD (abfd, linkinfo.ld_need);
+  info->dyninfo.ld_rules = GET_WORD (abfd, linkinfo.ld_rules);
+  info->dyninfo.ld_got = GET_WORD (abfd, linkinfo.ld_got);
+  info->dyninfo.ld_plt = GET_WORD (abfd, linkinfo.ld_plt);
+  info->dyninfo.ld_rel = GET_WORD (abfd, linkinfo.ld_rel);
+  info->dyninfo.ld_hash = GET_WORD (abfd, linkinfo.ld_hash);
+  info->dyninfo.ld_stab = GET_WORD (abfd, linkinfo.ld_stab);
+  info->dyninfo.ld_stab_hash = GET_WORD (abfd, linkinfo.ld_stab_hash);
+  info->dyninfo.ld_buckets = GET_WORD (abfd, linkinfo.ld_buckets);
+  info->dyninfo.ld_symbols = GET_WORD (abfd, linkinfo.ld_symbols);
+  info->dyninfo.ld_symb_size = GET_WORD (abfd, linkinfo.ld_symb_size);
+  info->dyninfo.ld_text = GET_WORD (abfd, linkinfo.ld_text);
+  info->dyninfo.ld_plt_sz = GET_WORD (abfd, linkinfo.ld_plt_sz);
+
+  /* Reportedly the addresses need to be offset by the size of the
+     exec header in an NMAGIC file.  */
+  if (adata (abfd).magic == n_magic)
+    {
+      unsigned long exec_bytes_size = adata (abfd).exec_bytes_size;
+
+      info->dyninfo.ld_need += exec_bytes_size;
+      info->dyninfo.ld_rules += exec_bytes_size;
+      info->dyninfo.ld_rel += exec_bytes_size;
+      info->dyninfo.ld_hash += exec_bytes_size;
+      info->dyninfo.ld_stab += exec_bytes_size;
+      info->dyninfo.ld_symbols += exec_bytes_size;
+    }
+
+  /* The only way to get the size of the symbol information appears to
+     be to determine the distance between it and the string table.  */
+  info->dynsym_count = ((info->dyninfo.ld_symbols - info->dyninfo.ld_stab)
+			/ EXTERNAL_NLIST_SIZE);
+  BFD_ASSERT (info->dynsym_count * EXTERNAL_NLIST_SIZE
+	      == (unsigned long) (info->dyninfo.ld_symbols
+				  - info->dyninfo.ld_stab));
+
+  /* Similarly, the relocs end at the hash table.  */
+  info->dynrel_count = ((info->dyninfo.ld_hash - info->dyninfo.ld_rel)
+			/ obj_reloc_entry_size (abfd));
+  BFD_ASSERT (info->dynrel_count * obj_reloc_entry_size (abfd)
+	      == (unsigned long) (info->dyninfo.ld_hash
+				  - info->dyninfo.ld_rel));
+
+  info->valid = TRUE;
+
+  return TRUE;
+}
+
+/* Return the amount of memory required for the dynamic symbols.  */
+
+static long
+sunos_get_dynamic_symtab_upper_bound (bfd *abfd)
+{
+  struct sunos_dynamic_info *info;
+
+  if (! sunos_read_dynamic_info (abfd))
+    return -1;
+
+  info = (struct sunos_dynamic_info *) obj_aout_dynamic_info (abfd);
+  if (! info->valid)
+    {
+      bfd_set_error (bfd_error_no_symbols);
+      return -1;
+    }
+
+  return (info->dynsym_count + 1) * sizeof (asymbol *);
+}
+
+/* Read the external dynamic symbols.  */
+
+static bfd_boolean
+sunos_slurp_dynamic_symtab (bfd *abfd)
+{
+  struct sunos_dynamic_info *info;
+  bfd_size_type amt;
+
+  /* Get the general dynamic information.  */
+  if (obj_aout_dynamic_info (abfd) == NULL)
+    {
+      if (! sunos_read_dynamic_info (abfd))
+	  return FALSE;
+    }
+
+  info = (struct sunos_dynamic_info *) obj_aout_dynamic_info (abfd);
+  if (! info->valid)
+    {
+      bfd_set_error (bfd_error_no_symbols);
+      return FALSE;
+    }
+
+  /* Get the dynamic nlist structures.  */
+  if (info->dynsym == NULL)
+    {
+      amt = (bfd_size_type) info->dynsym_count * EXTERNAL_NLIST_SIZE;
+      info->dynsym = bfd_alloc (abfd, amt);
+      if (info->dynsym == NULL && info->dynsym_count != 0)
+	return FALSE;
+      if (bfd_seek (abfd, (file_ptr) info->dyninfo.ld_stab, SEEK_SET) != 0
+	  || bfd_bread ((void *) info->dynsym, amt, abfd) != amt)
+	{
+	  if (info->dynsym != NULL)
+	    {
+	      bfd_release (abfd, info->dynsym);
+	      info->dynsym = NULL;
+	    }
+	  return FALSE;
+	}
+    }
+
+  /* Get the dynamic strings.  */
+  if (info->dynstr == NULL)
+    {
+      amt = info->dyninfo.ld_symb_size;
+      info->dynstr = bfd_alloc (abfd, amt);
+      if (info->dynstr == NULL && info->dyninfo.ld_symb_size != 0)
+	return FALSE;
+      if (bfd_seek (abfd, (file_ptr) info->dyninfo.ld_symbols, SEEK_SET) != 0
+	  || bfd_bread ((void *) info->dynstr, amt, abfd) != amt)
+	{
+	  if (info->dynstr != NULL)
+	    {
+	      bfd_release (abfd, info->dynstr);
+	      info->dynstr = NULL;
+	    }
+	  return FALSE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Read in the dynamic symbols.  */
+
+static long
+sunos_canonicalize_dynamic_symtab (bfd *abfd, asymbol **storage)
+{
+  struct sunos_dynamic_info *info;
+  unsigned long i;
+
+  if (! sunos_slurp_dynamic_symtab (abfd))
+    return -1;
+
+  info = (struct sunos_dynamic_info *) obj_aout_dynamic_info (abfd);
+
+#ifdef CHECK_DYNAMIC_HASH
+  /* Check my understanding of the dynamic hash table by making sure
+     that each symbol can be located in the hash table.  */
+  {
+    bfd_size_type table_size;
+    bfd_byte *table;
+    bfd_size_type i;
+
+    if (info->dyninfo.ld_buckets > info->dynsym_count)
+      abort ();
+    table_size = info->dyninfo.ld_stab - info->dyninfo.ld_hash;
+    table = bfd_malloc (table_size);
+    if (table == NULL && table_size != 0)
+      abort ();
+    if (bfd_seek (abfd, (file_ptr) info->dyninfo.ld_hash, SEEK_SET) != 0
+	|| bfd_bread ((void *) table, table_size, abfd) != table_size)
+      abort ();
+    for (i = 0; i < info->dynsym_count; i++)
+      {
+	unsigned char *name;
+	unsigned long hash;
+
+	name = ((unsigned char *) info->dynstr
+		+ GET_WORD (abfd, info->dynsym[i].e_strx));
+	hash = 0;
+	while (*name != '\0')
+	  hash = (hash << 1) + *name++;
+	hash &= 0x7fffffff;
+	hash %= info->dyninfo.ld_buckets;
+	while (GET_WORD (abfd, table + hash * HASH_ENTRY_SIZE) != i)
+	  {
+	    hash = GET_WORD (abfd,
+			     table + hash * HASH_ENTRY_SIZE + BYTES_IN_WORD);
+	    if (hash == 0 || hash >= table_size / HASH_ENTRY_SIZE)
+	      abort ();
+	  }
+      }
+    free (table);
+  }
+#endif /* CHECK_DYNAMIC_HASH */
+
+  /* Get the asymbol structures corresponding to the dynamic nlist
+     structures.  */
+  if (info->canonical_dynsym == NULL)
+    {
+      bfd_size_type size;
+      bfd_size_type strsize = info->dyninfo.ld_symb_size;
+
+      size = (bfd_size_type) info->dynsym_count * sizeof (aout_symbol_type);
+      info->canonical_dynsym = bfd_alloc (abfd, size);
+      if (info->canonical_dynsym == NULL && info->dynsym_count != 0)
+	return -1;
+
+      if (! aout_32_translate_symbol_table (abfd, info->canonical_dynsym,
+					    info->dynsym,
+					    (bfd_size_type) info->dynsym_count,
+					    info->dynstr, strsize, TRUE))
+	{
+	  if (info->canonical_dynsym != NULL)
+	    {
+	      bfd_release (abfd, info->canonical_dynsym);
+	      info->canonical_dynsym = NULL;
+	    }
+	  return -1;
+	}
+    }
+
+  /* Return pointers to the dynamic asymbol structures.  */
+  for (i = 0; i < info->dynsym_count; i++)
+    *storage++ = (asymbol *) (info->canonical_dynsym + i);
+  *storage = NULL;
+
+  return info->dynsym_count;
+}
+
+/* Return the amount of memory required for the dynamic relocs.  */
+
+static long
+sunos_get_dynamic_reloc_upper_bound (bfd *abfd)
+{
+  struct sunos_dynamic_info *info;
+
+  if (! sunos_read_dynamic_info (abfd))
+    return -1;
+
+  info = (struct sunos_dynamic_info *) obj_aout_dynamic_info (abfd);
+  if (! info->valid)
+    {
+      bfd_set_error (bfd_error_no_symbols);
+      return -1;
+    }
+
+  return (info->dynrel_count + 1) * sizeof (arelent *);
+}
+
+/* Read in the dynamic relocs.  */
+
+static long
+sunos_canonicalize_dynamic_reloc (bfd *abfd, arelent **storage, asymbol **syms)
+{
+  struct sunos_dynamic_info *info;
+  unsigned long i;
+  bfd_size_type size;
+
+  /* Get the general dynamic information.  */
+  if (obj_aout_dynamic_info (abfd) == NULL)
+    {
+      if (! sunos_read_dynamic_info (abfd))
+	return -1;
+    }
+
+  info = (struct sunos_dynamic_info *) obj_aout_dynamic_info (abfd);
+  if (! info->valid)
+    {
+      bfd_set_error (bfd_error_no_symbols);
+      return -1;
+    }
+
+  /* Get the dynamic reloc information.  */
+  if (info->dynrel == NULL)
+    {
+      size = (bfd_size_type) info->dynrel_count * obj_reloc_entry_size (abfd);
+      info->dynrel = bfd_alloc (abfd, size);
+      if (info->dynrel == NULL && size != 0)
+	return -1;
+      if (bfd_seek (abfd, (file_ptr) info->dyninfo.ld_rel, SEEK_SET) != 0
+	  || bfd_bread ((void *) info->dynrel, size, abfd) != size)
+	{
+	  if (info->dynrel != NULL)
+	    {
+	      bfd_release (abfd, info->dynrel);
+	      info->dynrel = NULL;
+	    }
+	  return -1;
+	}
+    }
+
+  /* Get the arelent structures corresponding to the dynamic reloc
+     information.  */
+  if (info->canonical_dynrel == NULL)
+    {
+      arelent *to;
+
+      size = (bfd_size_type) info->dynrel_count * sizeof (arelent);
+      info->canonical_dynrel = bfd_alloc (abfd, size);
+      if (info->canonical_dynrel == NULL && info->dynrel_count != 0)
+	return -1;
+
+      to = info->canonical_dynrel;
+
+      if (obj_reloc_entry_size (abfd) == RELOC_EXT_SIZE)
+	{
+	  struct reloc_ext_external *p;
+	  struct reloc_ext_external *pend;
+
+	  p = (struct reloc_ext_external *) info->dynrel;
+	  pend = p + info->dynrel_count;
+	  for (; p < pend; p++, to++)
+	    NAME (aout, swap_ext_reloc_in) (abfd, p, to, syms,
+					    (bfd_size_type) info->dynsym_count);
+	}
+      else
+	{
+	  struct reloc_std_external *p;
+	  struct reloc_std_external *pend;
+
+	  p = (struct reloc_std_external *) info->dynrel;
+	  pend = p + info->dynrel_count;
+	  for (; p < pend; p++, to++)
+	    NAME (aout, swap_std_reloc_in) (abfd, p, to, syms,
+					    (bfd_size_type) info->dynsym_count);
+	}
+    }
+
+  /* Return pointers to the dynamic arelent structures.  */
+  for (i = 0; i < info->dynrel_count; i++)
+    *storage++ = info->canonical_dynrel + i;
+  *storage = NULL;
+
+  return info->dynrel_count;
+}
+
+/* Code to handle linking of SunOS shared libraries.  */
+
+/* A SPARC procedure linkage table entry is 12 bytes.  The first entry
+   in the table is a jump which is filled in by the runtime linker.
+   The remaining entries are branches back to the first entry,
+   followed by an index into the relocation table encoded to look like
+   a sethi of %g0.  */
+
+#define SPARC_PLT_ENTRY_SIZE (12)
+
+static const bfd_byte sparc_plt_first_entry[SPARC_PLT_ENTRY_SIZE] =
+{
+  /* sethi %hi(0),%g1; address filled in by runtime linker.  */
+  0x3, 0, 0, 0,
+  /* jmp %g1; offset filled in by runtime linker.  */
+  0x81, 0xc0, 0x60, 0,
+  /* nop */
+  0x1, 0, 0, 0
+};
+
+/* save %sp, -96, %sp */
+#define SPARC_PLT_ENTRY_WORD0 ((bfd_vma) 0x9de3bfa0)
+/* call; address filled in later.  */
+#define SPARC_PLT_ENTRY_WORD1 ((bfd_vma) 0x40000000)
+/* sethi; reloc index filled in later.  */
+#define SPARC_PLT_ENTRY_WORD2 ((bfd_vma) 0x01000000)
+
+/* This sequence is used when for the jump table entry to a defined
+   symbol in a complete executable.  It is used when linking PIC
+   compiled code which is not being put into a shared library.  */
+/* sethi <address to be filled in later>, %g1 */
+#define SPARC_PLT_PIC_WORD0 ((bfd_vma) 0x03000000)
+/* jmp %g1 + <address to be filled in later> */
+#define SPARC_PLT_PIC_WORD1 ((bfd_vma) 0x81c06000)
+/* nop */
+#define SPARC_PLT_PIC_WORD2 ((bfd_vma) 0x01000000)
+
+/* An m68k procedure linkage table entry is 8 bytes.  The first entry
+   in the table is a jump which is filled in the by the runtime
+   linker.  The remaining entries are branches back to the first
+   entry, followed by a two byte index into the relocation table.  */
+
+#define M68K_PLT_ENTRY_SIZE (8)
+
+static const bfd_byte m68k_plt_first_entry[M68K_PLT_ENTRY_SIZE] =
+{
+  /* jmps @# */
+  0x4e, 0xf9,
+  /* Filled in by runtime linker with a magic address.  */
+  0, 0, 0, 0,
+  /* Not used?  */
+  0, 0
+};
+
+/* bsrl */
+#define M68K_PLT_ENTRY_WORD0 ((bfd_vma) 0x61ff)
+/* Remaining words filled in later.  */
+
+/* An entry in the SunOS linker hash table.  */
+
+struct sunos_link_hash_entry
+{
+  struct aout_link_hash_entry root;
+
+  /* If this is a dynamic symbol, this is its index into the dynamic
+     symbol table.  This is initialized to -1.  As the linker looks at
+     the input files, it changes this to -2 if it will be added to the
+     dynamic symbol table.  After all the input files have been seen,
+     the linker will know whether to build a dynamic symbol table; if
+     it does build one, this becomes the index into the table.  */
+  long dynindx;
+
+  /* If this is a dynamic symbol, this is the index of the name in the
+     dynamic symbol string table.  */
+  long dynstr_index;
+
+  /* The offset into the global offset table used for this symbol.  If
+     the symbol does not require a GOT entry, this is 0.  */
+  bfd_vma got_offset;
+
+  /* The offset into the procedure linkage table used for this symbol.
+     If the symbol does not require a PLT entry, this is 0.  */
+  bfd_vma plt_offset;
+
+  /* Some linker flags.  */
+  unsigned char flags;
+  /* Symbol is referenced by a regular object.  */
+#define SUNOS_REF_REGULAR 01
+  /* Symbol is defined by a regular object.  */
+#define SUNOS_DEF_REGULAR 02
+  /* Symbol is referenced by a dynamic object.  */
+#define SUNOS_REF_DYNAMIC 04
+  /* Symbol is defined by a dynamic object.  */
+#define SUNOS_DEF_DYNAMIC 010
+  /* Symbol is a constructor symbol in a regular object.  */
+#define SUNOS_CONSTRUCTOR 020
+};
+
+/* The SunOS linker hash table.  */
+
+struct sunos_link_hash_table
+{
+  struct aout_link_hash_table root;
+
+  /* The object which holds the dynamic sections.  */
+  bfd *dynobj;
+
+  /* Whether we have created the dynamic sections.  */
+  bfd_boolean dynamic_sections_created;
+
+  /* Whether we need the dynamic sections.  */
+  bfd_boolean dynamic_sections_needed;
+
+  /* Whether we need the .got table.  */
+  bfd_boolean got_needed;
+
+  /* The number of dynamic symbols.  */
+  size_t dynsymcount;
+
+  /* The number of buckets in the hash table.  */
+  size_t bucketcount;
+
+  /* The list of dynamic objects needed by dynamic objects included in
+     the link.  */
+  struct bfd_link_needed_list *needed;
+
+  /* The offset of __GLOBAL_OFFSET_TABLE_ into the .got section.  */
+  bfd_vma got_base;
+};
+
+/* Routine to create an entry in an SunOS link hash table.  */
+
+static struct bfd_hash_entry *
+sunos_link_hash_newfunc (struct bfd_hash_entry *entry,
+			 struct bfd_hash_table *table,
+			 const char *string)
+{
+  struct sunos_link_hash_entry *ret = (struct sunos_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret ==  NULL)
+    ret = bfd_hash_allocate (table, sizeof (* ret));
+  if (ret == NULL)
+    return NULL;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct sunos_link_hash_entry *)
+	 NAME (aout, link_hash_newfunc) ((struct bfd_hash_entry *) ret,
+					 table, string));
+  if (ret != NULL)
+    {
+      /* Set local fields.  */
+      ret->dynindx = -1;
+      ret->dynstr_index = -1;
+      ret->got_offset = 0;
+      ret->plt_offset = 0;
+      ret->flags = 0;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Create a SunOS link hash table.  */
+
+static struct bfd_link_hash_table *
+sunos_link_hash_table_create (bfd *abfd)
+{
+  struct sunos_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct sunos_link_hash_table);
+
+  ret = bfd_malloc (amt);
+  if (ret ==  NULL)
+    return NULL;
+  if (!NAME (aout, link_hash_table_init) (&ret->root, abfd,
+					  sunos_link_hash_newfunc,
+					  sizeof (struct sunos_link_hash_entry)))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  ret->dynobj = NULL;
+  ret->dynamic_sections_created = FALSE;
+  ret->dynamic_sections_needed = FALSE;
+  ret->got_needed = FALSE;
+  ret->dynsymcount = 0;
+  ret->bucketcount = 0;
+  ret->needed = NULL;
+  ret->got_base = 0;
+
+  return &ret->root.root;
+}
+
+/* Look up an entry in an SunOS link hash table.  */
+
+#define sunos_link_hash_lookup(table, string, create, copy, follow) \
+  ((struct sunos_link_hash_entry *) \
+   aout_link_hash_lookup (&(table)->root, (string), (create), (copy),\
+			  (follow)))
+
+/* Traverse a SunOS link hash table.  */
+
+#define sunos_link_hash_traverse(table, func, info)			\
+  (aout_link_hash_traverse						\
+   (&(table)->root,							\
+    (bfd_boolean (*) (struct aout_link_hash_entry *, void *)) (func),	\
+    (info)))
+
+/* Get the SunOS link hash table from the info structure.  This is
+   just a cast.  */
+
+#define sunos_hash_table(p) ((struct sunos_link_hash_table *) ((p)->hash))
+
+/* Create the dynamic sections needed if we are linking against a
+   dynamic object, or if we are linking PIC compiled code.  ABFD is a
+   bfd we can attach the dynamic sections to.  The linker script will
+   look for these special sections names and put them in the right
+   place in the output file.  See include/aout/sun4.h for more details
+   of the dynamic linking information.  */
+
+static bfd_boolean
+sunos_create_dynamic_sections (bfd *abfd,
+			       struct bfd_link_info *info,
+			       bfd_boolean needed)
+{
+  asection *s;
+
+  if (! sunos_hash_table (info)->dynamic_sections_created)
+    {
+      flagword flags;
+
+      sunos_hash_table (info)->dynobj = abfd;
+
+      flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+	       | SEC_LINKER_CREATED);
+
+      /* The .dynamic section holds the basic dynamic information: the
+	 sun4_dynamic structure, the dynamic debugger information, and
+	 the sun4_dynamic_link structure.  */
+      s = bfd_make_section_with_flags (abfd, ".dynamic", flags);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, 2))
+	return FALSE;
+
+      /* The .got section holds the global offset table.  The address
+	 is put in the ld_got field.  */
+      s = bfd_make_section_with_flags (abfd, ".got", flags);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, 2))
+	return FALSE;
+
+      /* The .plt section holds the procedure linkage table.  The
+	 address is put in the ld_plt field.  */
+      s = bfd_make_section_with_flags (abfd, ".plt", flags | SEC_CODE);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, 2))
+	return FALSE;
+
+      /* The .dynrel section holds the dynamic relocs.  The address is
+	 put in the ld_rel field.  */
+      s = bfd_make_section_with_flags (abfd, ".dynrel", flags | SEC_READONLY);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, 2))
+	return FALSE;
+
+      /* The .hash section holds the dynamic hash table.  The address
+	 is put in the ld_hash field.  */
+      s = bfd_make_section_with_flags (abfd, ".hash", flags | SEC_READONLY);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, 2))
+	return FALSE;
+
+      /* The .dynsym section holds the dynamic symbols.  The address
+	 is put in the ld_stab field.  */
+      s = bfd_make_section_with_flags (abfd, ".dynsym", flags | SEC_READONLY);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, 2))
+	return FALSE;
+
+      /* The .dynstr section holds the dynamic symbol string table.
+	 The address is put in the ld_symbols field.  */
+      s = bfd_make_section_with_flags (abfd, ".dynstr", flags | SEC_READONLY);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, 2))
+	return FALSE;
+
+      sunos_hash_table (info)->dynamic_sections_created = TRUE;
+    }
+
+  if ((needed && ! sunos_hash_table (info)->dynamic_sections_needed)
+      || info->shared)
+    {
+      bfd *dynobj;
+
+      dynobj = sunos_hash_table (info)->dynobj;
+
+      s = bfd_get_section_by_name (dynobj, ".got");
+      if (s->size == 0)
+	s->size = BYTES_IN_WORD;
+
+      sunos_hash_table (info)->dynamic_sections_needed = TRUE;
+      sunos_hash_table (info)->got_needed = TRUE;
+    }
+
+  return TRUE;
+}
+
+/* Add dynamic symbols during a link.  This is called by the a.out
+   backend linker for each object it encounters.  */
+
+static bfd_boolean
+sunos_add_dynamic_symbols (bfd *abfd,
+			   struct bfd_link_info *info,
+			   struct external_nlist **symsp,
+			   bfd_size_type *sym_countp,
+			   char **stringsp)
+{
+  bfd *dynobj;
+  struct sunos_dynamic_info *dinfo;
+  unsigned long need;
+
+  /* Make sure we have all the required sections.  */
+  if (info->output_bfd->xvec == abfd->xvec)
+    {
+      if (! sunos_create_dynamic_sections (abfd, info,
+					   ((abfd->flags & DYNAMIC) != 0
+					    && !info->relocatable)))
+	return FALSE;
+    }
+
+  /* There is nothing else to do for a normal object.  */
+  if ((abfd->flags & DYNAMIC) == 0)
+    return TRUE;
+
+  dynobj = sunos_hash_table (info)->dynobj;
+
+  /* We do not want to include the sections in a dynamic object in the
+     output file.  We hack by simply clobbering the list of sections
+     in the BFD.  This could be handled more cleanly by, say, a new
+     section flag; the existing SEC_NEVER_LOAD flag is not the one we
+     want, because that one still implies that the section takes up
+     space in the output file.  If this is the first object we have
+     seen, we must preserve the dynamic sections we just created.  */
+  if (abfd != dynobj)
+    abfd->sections = NULL;
+  else
+    {
+      asection *s;
+
+      for (s = abfd->sections; s != NULL; s = s->next)
+	{
+	  if ((s->flags & SEC_LINKER_CREATED) == 0)
+	    bfd_section_list_remove (abfd, s);
+	}
+    }
+
+  /* The native linker seems to just ignore dynamic objects when -r is
+     used.  */
+  if (info->relocatable)
+    return TRUE;
+
+  /* There's no hope of using a dynamic object which does not exactly
+     match the format of the output file.  */
+  if (info->output_bfd->xvec != abfd->xvec)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  /* Make sure we have a .need and a .rules sections.  These are only
+     needed if there really is a dynamic object in the link, so they
+     are not added by sunos_create_dynamic_sections.  */
+  if (bfd_get_section_by_name (dynobj, ".need") == NULL)
+    {
+      /* The .need section holds the list of names of shared objets
+	 which must be included at runtime.  The address of this
+	 section is put in the ld_need field.  */
+      flagword flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
+			| SEC_IN_MEMORY | SEC_READONLY);
+      asection *s = bfd_make_section_with_flags (dynobj, ".need", flags);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (dynobj, s, 2))
+	return FALSE;
+    }
+
+  if (bfd_get_section_by_name (dynobj, ".rules") == NULL)
+    {
+      /* The .rules section holds the path to search for shared
+	 objects.  The address of this section is put in the ld_rules
+	 field.  */
+      flagword flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
+			| SEC_IN_MEMORY | SEC_READONLY);
+      asection *s = bfd_make_section_with_flags (dynobj, ".rules", flags);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (dynobj, s, 2))
+	return FALSE;
+    }
+
+  /* Pick up the dynamic symbols and return them to the caller.  */
+  if (! sunos_slurp_dynamic_symtab (abfd))
+    return FALSE;
+
+  dinfo = (struct sunos_dynamic_info *) obj_aout_dynamic_info (abfd);
+  *symsp = dinfo->dynsym;
+  *sym_countp = dinfo->dynsym_count;
+  *stringsp = dinfo->dynstr;
+
+  /* Record information about any other objects needed by this one.  */
+  need = dinfo->dyninfo.ld_need;
+  while (need != 0)
+    {
+      bfd_byte buf[16];
+      unsigned long name, flags;
+      unsigned short major_vno, minor_vno;
+      struct bfd_link_needed_list *needed, **pp;
+      char *namebuf, *p;
+      bfd_size_type alc;
+      bfd_byte b;
+      char *namecopy;
+
+      if (bfd_seek (abfd, (file_ptr) need, SEEK_SET) != 0
+	  || bfd_bread (buf, (bfd_size_type) 16, abfd) != 16)
+	return FALSE;
+
+      /* For the format of an ld_need entry, see aout/sun4.h.  We
+	 should probably define structs for this manipulation.  */
+      name = bfd_get_32 (abfd, buf);
+      flags = bfd_get_32 (abfd, buf + 4);
+      major_vno = (unsigned short) bfd_get_16 (abfd, buf + 8);
+      minor_vno = (unsigned short) bfd_get_16 (abfd, buf + 10);
+      need = bfd_get_32 (abfd, buf + 12);
+
+      alc = sizeof (struct bfd_link_needed_list);
+      needed = bfd_alloc (abfd, alc);
+      if (needed == NULL)
+	return FALSE;
+      needed->by = abfd;
+
+      /* We return the name as [-l]name[.maj][.min].  */
+      alc = 30;
+      namebuf = bfd_malloc (alc + 1);
+      if (namebuf == NULL)
+	return FALSE;
+      p = namebuf;
+
+      if ((flags & 0x80000000) != 0)
+	{
+	  *p++ = '-';
+	  *p++ = 'l';
+	}
+      if (bfd_seek (abfd, (file_ptr) name, SEEK_SET) != 0)
+	{
+	  free (namebuf);
+	  return FALSE;
+	}
+
+      do
+	{
+	  if (bfd_bread (&b, (bfd_size_type) 1, abfd) != 1)
+	    {
+	      free (namebuf);
+	      return FALSE;
+	    }
+
+	  if ((bfd_size_type) (p - namebuf) >= alc)
+	    {
+	      char *n;
+
+	      alc *= 2;
+	      n = bfd_realloc (namebuf, alc + 1);
+	      if (n == NULL)
+		{
+		  free (namebuf);
+		  return FALSE;
+		}
+	      p = n + (p - namebuf);
+	      namebuf = n;
+	    }
+
+	  *p++ = b;
+	}
+      while (b != '\0');
+
+      if (major_vno == 0)
+	*p = '\0';
+      else
+	{
+	  char majbuf[30];
+	  char minbuf[30];
+
+	  sprintf (majbuf, ".%d", major_vno);
+	  if (minor_vno == 0)
+	    minbuf[0] = '\0';
+	  else
+	    sprintf (minbuf, ".%d", minor_vno);
+
+	  if ((p - namebuf) + strlen (majbuf) + strlen (minbuf) >= alc)
+	    {
+	      char *n;
+
+	      alc = (p - namebuf) + strlen (majbuf) + strlen (minbuf);
+	      n = bfd_realloc (namebuf, alc + 1);
+	      if (n == NULL)
+		{
+		  free (namebuf);
+		  return FALSE;
+		}
+	      p = n + (p - namebuf);
+	      namebuf = n;
+	    }
+
+	  strcpy (p, majbuf);
+	  strcat (p, minbuf);
+	}
+
+      namecopy = bfd_alloc (abfd, (bfd_size_type) strlen (namebuf) + 1);
+      if (namecopy == NULL)
+	{
+	  free (namebuf);
+	  return FALSE;
+	}
+      strcpy (namecopy, namebuf);
+      free (namebuf);
+      needed->name = namecopy;
+
+      needed->next = NULL;
+
+      for (pp = &sunos_hash_table (info)->needed;
+	   *pp != NULL;
+	   pp = &(*pp)->next)
+	;
+      *pp = needed;
+    }
+
+  return TRUE;
+}
+
+/* Function to add a single symbol to the linker hash table.  This is
+   a wrapper around _bfd_generic_link_add_one_symbol which handles the
+   tweaking needed for dynamic linking support.  */
+
+static bfd_boolean
+sunos_add_one_symbol (struct bfd_link_info *info,
+		      bfd *abfd,
+		      const char *name,
+		      flagword flags,
+		      asection *section,
+		      bfd_vma value,
+		      const char *string,
+		      bfd_boolean copy,
+		      bfd_boolean collect,
+		      struct bfd_link_hash_entry **hashp)
+{
+  struct sunos_link_hash_entry *h;
+  int new_flag;
+
+  if ((flags & (BSF_INDIRECT | BSF_WARNING | BSF_CONSTRUCTOR)) != 0
+      || ! bfd_is_und_section (section))
+    h = sunos_link_hash_lookup (sunos_hash_table (info), name, TRUE, copy,
+				FALSE);
+  else
+    h = ((struct sunos_link_hash_entry *)
+	 bfd_wrapped_link_hash_lookup (abfd, info, name, TRUE, copy, FALSE));
+  if (h == NULL)
+    return FALSE;
+
+  if (hashp != NULL)
+    *hashp = (struct bfd_link_hash_entry *) h;
+
+  /* Treat a common symbol in a dynamic object as defined in the .bss
+     section of the dynamic object.  We don't want to allocate space
+     for it in our process image.  */
+  if ((abfd->flags & DYNAMIC) != 0
+      && bfd_is_com_section (section))
+    section = obj_bsssec (abfd);
+
+  if (! bfd_is_und_section (section)
+      && h->root.root.type != bfd_link_hash_new
+      && h->root.root.type != bfd_link_hash_undefined
+      && h->root.root.type != bfd_link_hash_defweak)
+    {
+      /* We are defining the symbol, and it is already defined.  This
+	 is a potential multiple definition error.  */
+      if ((abfd->flags & DYNAMIC) != 0)
+	{
+	  /* The definition we are adding is from a dynamic object.
+	     We do not want this new definition to override the
+	     existing definition, so we pretend it is just a
+	     reference.  */
+	  section = bfd_und_section_ptr;
+	}
+      else if (h->root.root.type == bfd_link_hash_defined
+	       && h->root.root.u.def.section->owner != NULL
+	       && (h->root.root.u.def.section->owner->flags & DYNAMIC) != 0)
+	{
+	  /* The existing definition is from a dynamic object.  We
+	     want to override it with the definition we just found.
+	     Clobber the existing definition.  */
+	  h->root.root.type = bfd_link_hash_undefined;
+	  h->root.root.u.undef.abfd = h->root.root.u.def.section->owner;
+	}
+      else if (h->root.root.type == bfd_link_hash_common
+	       && (h->root.root.u.c.p->section->owner->flags & DYNAMIC) != 0)
+	{
+	  /* The existing definition is from a dynamic object.  We
+	     want to override it with the definition we just found.
+	     Clobber the existing definition.  We can't set it to new,
+	     because it is on the undefined list.  */
+	  h->root.root.type = bfd_link_hash_undefined;
+	  h->root.root.u.undef.abfd = h->root.root.u.c.p->section->owner;
+	}
+    }
+
+  if ((abfd->flags & DYNAMIC) != 0
+      && abfd->xvec == info->output_bfd->xvec
+      && (h->flags & SUNOS_CONSTRUCTOR) != 0)
+    /* The existing symbol is a constructor symbol, and this symbol
+       is from a dynamic object.  A constructor symbol is actually a
+       definition, although the type will be bfd_link_hash_undefined
+       at this point.  We want to ignore the definition from the
+       dynamic object.  */
+    section = bfd_und_section_ptr;
+  else if ((flags & BSF_CONSTRUCTOR) != 0
+	   && (abfd->flags & DYNAMIC) == 0
+	   && h->root.root.type == bfd_link_hash_defined
+	   && h->root.root.u.def.section->owner != NULL
+	   && (h->root.root.u.def.section->owner->flags & DYNAMIC) != 0)
+    /* The existing symbol is defined by a dynamic object, and this
+       is a constructor symbol.  As above, we want to force the use
+       of the constructor symbol from the regular object.  */
+    h->root.root.type = bfd_link_hash_new;
+
+  /* Do the usual procedure for adding a symbol.  */
+  if (! _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section,
+					  value, string, copy, collect,
+					  hashp))
+    return FALSE;
+
+  if (abfd->xvec == info->output_bfd->xvec)
+    {
+      /* Set a flag in the hash table entry indicating the type of
+	 reference or definition we just found.  Keep a count of the
+	 number of dynamic symbols we find.  A dynamic symbol is one
+	 which is referenced or defined by both a regular object and a
+	 shared object.  */
+      if ((abfd->flags & DYNAMIC) == 0)
+	{
+	  if (bfd_is_und_section (section))
+	    new_flag = SUNOS_REF_REGULAR;
+	  else
+	    new_flag = SUNOS_DEF_REGULAR;
+	}
+      else
+	{
+	  if (bfd_is_und_section (section))
+	    new_flag = SUNOS_REF_DYNAMIC;
+	  else
+	    new_flag = SUNOS_DEF_DYNAMIC;
+	}
+      h->flags |= new_flag;
+
+      if (h->dynindx == -1
+	  && (h->flags & (SUNOS_DEF_REGULAR | SUNOS_REF_REGULAR)) != 0)
+	{
+	  ++sunos_hash_table (info)->dynsymcount;
+	  h->dynindx = -2;
+	}
+
+      if ((flags & BSF_CONSTRUCTOR) != 0
+	  && (abfd->flags & DYNAMIC) == 0)
+	h->flags |= SUNOS_CONSTRUCTOR;
+    }
+
+  return TRUE;
+}
+
+extern const bfd_target MY (vec);
+
+/* Return the list of objects needed by BFD.  */
+
+struct bfd_link_needed_list *
+bfd_sunos_get_needed_list (bfd *abfd ATTRIBUTE_UNUSED,
+			   struct bfd_link_info *info)
+{
+  if (info->output_bfd->xvec != &MY (vec))
+    return NULL;
+  return sunos_hash_table (info)->needed;
+}
+
+/* Record an assignment made to a symbol by a linker script.  We need
+   this in case some dynamic object refers to this symbol.  */
+
+bfd_boolean
+bfd_sunos_record_link_assignment (bfd *output_bfd,
+				  struct bfd_link_info *info,
+				  const char *name)
+{
+  struct sunos_link_hash_entry *h;
+
+  if (output_bfd->xvec != &MY(vec))
+    return TRUE;
+
+  /* This is called after we have examined all the input objects.  If
+     the symbol does not exist, it merely means that no object refers
+     to it, and we can just ignore it at this point.  */
+  h = sunos_link_hash_lookup (sunos_hash_table (info), name,
+			      FALSE, FALSE, FALSE);
+  if (h == NULL)
+    return TRUE;
+
+  /* In a shared library, the __DYNAMIC symbol does not appear in the
+     dynamic symbol table.  */
+  if (! info->shared || strcmp (name, "__DYNAMIC") != 0)
+    {
+      h->flags |= SUNOS_DEF_REGULAR;
+
+      if (h->dynindx == -1)
+	{
+	  ++sunos_hash_table (info)->dynsymcount;
+	  h->dynindx = -2;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Scan the relocs for an input section using standard relocs.  We
+   need to figure out what to do for each reloc against a dynamic
+   symbol.  If the symbol is in the .text section, an entry is made in
+   the procedure linkage table.  Note that this will do the wrong
+   thing if the symbol is actually data; I don't think the Sun 3
+   native linker handles this case correctly either.  If the symbol is
+   not in the .text section, we must preserve the reloc as a dynamic
+   reloc.  FIXME: We should also handle the PIC relocs here by
+   building global offset table entries.  */
+
+static bfd_boolean
+sunos_scan_std_relocs (struct bfd_link_info *info,
+		       bfd *abfd,
+		       asection *sec ATTRIBUTE_UNUSED,
+		       const struct reloc_std_external *relocs,
+		       bfd_size_type rel_size)
+{
+  bfd *dynobj;
+  asection *splt = NULL;
+  asection *srel = NULL;
+  struct sunos_link_hash_entry **sym_hashes;
+  const struct reloc_std_external *rel, *relend;
+
+  /* We only know how to handle m68k plt entries.  */
+  if (bfd_get_arch (abfd) != bfd_arch_m68k)
+    {
+      bfd_set_error (bfd_error_invalid_target);
+      return FALSE;
+    }
+
+  dynobj = NULL;
+
+  sym_hashes = (struct sunos_link_hash_entry **) obj_aout_sym_hashes (abfd);
+
+  relend = relocs + rel_size / RELOC_STD_SIZE;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      int r_index;
+      struct sunos_link_hash_entry *h;
+
+      /* We only want relocs against external symbols.  */
+      if (bfd_header_big_endian (abfd))
+	{
+	  if ((rel->r_type[0] & RELOC_STD_BITS_EXTERN_BIG) == 0)
+	    continue;
+	}
+      else
+	{
+	  if ((rel->r_type[0] & RELOC_STD_BITS_EXTERN_LITTLE) == 0)
+	    continue;
+	}
+
+      /* Get the symbol index.  */
+      if (bfd_header_big_endian (abfd))
+	r_index = ((rel->r_index[0] << 16)
+		   | (rel->r_index[1] << 8)
+		   | rel->r_index[2]);
+      else
+	r_index = ((rel->r_index[2] << 16)
+		   | (rel->r_index[1] << 8)
+		   | rel->r_index[0]);
+
+      /* Get the hash table entry.  */
+      h = sym_hashes[r_index];
+      if (h == NULL)
+	/* This should not normally happen, but it will in any case
+	   be caught in the relocation phase.  */
+	continue;
+
+      /* At this point common symbols have already been allocated, so
+	 we don't have to worry about them.  We need to consider that
+	 we may have already seen this symbol and marked it undefined;
+	 if the symbol is really undefined, then SUNOS_DEF_DYNAMIC
+	 will be zero.  */
+      if (h->root.root.type != bfd_link_hash_defined
+	  && h->root.root.type != bfd_link_hash_defweak
+	  && h->root.root.type != bfd_link_hash_undefined)
+	continue;
+
+      if ((h->flags & SUNOS_DEF_DYNAMIC) == 0
+	  || (h->flags & SUNOS_DEF_REGULAR) != 0)
+	continue;
+
+      if (dynobj == NULL)
+	{
+	  asection *sgot;
+
+	  if (! sunos_create_dynamic_sections (abfd, info, FALSE))
+	    return FALSE;
+	  dynobj = sunos_hash_table (info)->dynobj;
+	  splt = bfd_get_section_by_name (dynobj, ".plt");
+	  srel = bfd_get_section_by_name (dynobj, ".dynrel");
+	  BFD_ASSERT (splt != NULL && srel != NULL);
+
+	  sgot = bfd_get_section_by_name (dynobj, ".got");
+	  BFD_ASSERT (sgot != NULL);
+	  if (sgot->size == 0)
+	    sgot->size = BYTES_IN_WORD;
+	  sunos_hash_table (info)->got_needed = TRUE;
+	}
+
+      BFD_ASSERT ((h->flags & SUNOS_REF_REGULAR) != 0);
+      BFD_ASSERT (h->plt_offset != 0
+		  || ((h->root.root.type == bfd_link_hash_defined
+		       || h->root.root.type == bfd_link_hash_defweak)
+		      ? (h->root.root.u.def.section->owner->flags
+			 & DYNAMIC) != 0
+		      : (h->root.root.u.undef.abfd->flags & DYNAMIC) != 0));
+
+      /* This reloc is against a symbol defined only by a dynamic
+	 object.  */
+      if (h->root.root.type == bfd_link_hash_undefined)
+	/* Presumably this symbol was marked as being undefined by
+	   an earlier reloc.  */
+	srel->size += RELOC_STD_SIZE;
+      else if ((h->root.root.u.def.section->flags & SEC_CODE) == 0)
+	{
+	  bfd *sub;
+
+	  /* This reloc is not in the .text section.  It must be
+	     copied into the dynamic relocs.  We mark the symbol as
+	     being undefined.  */
+	  srel->size += RELOC_STD_SIZE;
+	  sub = h->root.root.u.def.section->owner;
+	  h->root.root.type = bfd_link_hash_undefined;
+	  h->root.root.u.undef.abfd = sub;
+	}
+      else
+	{
+	  /* This symbol is in the .text section.  We must give it an
+	     entry in the procedure linkage table, if we have not
+	     already done so.  We change the definition of the symbol
+	     to the .plt section; this will cause relocs against it to
+	     be handled correctly.  */
+	  if (h->plt_offset == 0)
+	    {
+	      if (splt->size == 0)
+		splt->size = M68K_PLT_ENTRY_SIZE;
+	      h->plt_offset = splt->size;
+
+	      if ((h->flags & SUNOS_DEF_REGULAR) == 0)
+		{
+		  h->root.root.u.def.section = splt;
+		  h->root.root.u.def.value = splt->size;
+		}
+
+	      splt->size += M68K_PLT_ENTRY_SIZE;
+
+	      /* We may also need a dynamic reloc entry.  */
+	      if ((h->flags & SUNOS_DEF_REGULAR) == 0)
+		srel->size += RELOC_STD_SIZE;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Scan the relocs for an input section using extended relocs.  We
+   need to figure out what to do for each reloc against a dynamic
+   symbol.  If the reloc is a WDISP30, and the symbol is in the .text
+   section, an entry is made in the procedure linkage table.
+   Otherwise, we must preserve the reloc as a dynamic reloc.  */
+
+static bfd_boolean
+sunos_scan_ext_relocs (struct bfd_link_info *info,
+		       bfd *abfd,
+		       asection *sec ATTRIBUTE_UNUSED,
+		       const struct reloc_ext_external *relocs,
+		       bfd_size_type rel_size)
+{
+  bfd *dynobj;
+  struct sunos_link_hash_entry **sym_hashes;
+  const struct reloc_ext_external *rel, *relend;
+  asection *splt = NULL;
+  asection *sgot = NULL;
+  asection *srel = NULL;
+  bfd_size_type amt;
+
+  /* We only know how to handle SPARC plt entries.  */
+  if (bfd_get_arch (abfd) != bfd_arch_sparc)
+    {
+      bfd_set_error (bfd_error_invalid_target);
+      return FALSE;
+    }
+
+  dynobj = NULL;
+
+  sym_hashes = (struct sunos_link_hash_entry **) obj_aout_sym_hashes (abfd);
+
+  relend = relocs + rel_size / RELOC_EXT_SIZE;
+  for (rel = relocs; rel < relend; rel++)
+    {
+      unsigned int r_index;
+      int r_extern;
+      int r_type;
+      struct sunos_link_hash_entry *h = NULL;
+
+      /* Swap in the reloc information.  */
+      if (bfd_header_big_endian (abfd))
+	{
+	  r_index = ((rel->r_index[0] << 16)
+		     | (rel->r_index[1] << 8)
+		     | rel->r_index[2]);
+	  r_extern = (0 != (rel->r_type[0] & RELOC_EXT_BITS_EXTERN_BIG));
+	  r_type = ((rel->r_type[0] & RELOC_EXT_BITS_TYPE_BIG)
+		    >> RELOC_EXT_BITS_TYPE_SH_BIG);
+	}
+      else
+	{
+	  r_index = ((rel->r_index[2] << 16)
+		     | (rel->r_index[1] << 8)
+		     | rel->r_index[0]);
+	  r_extern = (0 != (rel->r_type[0] & RELOC_EXT_BITS_EXTERN_LITTLE));
+	  r_type = ((rel->r_type[0] & RELOC_EXT_BITS_TYPE_LITTLE)
+		    >> RELOC_EXT_BITS_TYPE_SH_LITTLE);
+	}
+
+      if (r_extern)
+	{
+	  h = sym_hashes[r_index];
+	  if (h == NULL)
+	    {
+	      /* This should not normally happen, but it will in any
+		 case be caught in the relocation phase.  */
+	      continue;
+	    }
+	}
+
+      /* If this is a base relative reloc, we need to make an entry in
+	 the .got section.  */
+      if (r_type == RELOC_BASE10
+	  || r_type == RELOC_BASE13
+	  || r_type == RELOC_BASE22)
+	{
+	  if (dynobj == NULL)
+	    {
+	      if (! sunos_create_dynamic_sections (abfd, info, FALSE))
+		return FALSE;
+	      dynobj = sunos_hash_table (info)->dynobj;
+	      splt = bfd_get_section_by_name (dynobj, ".plt");
+	      sgot = bfd_get_section_by_name (dynobj, ".got");
+	      srel = bfd_get_section_by_name (dynobj, ".dynrel");
+	      BFD_ASSERT (splt != NULL && sgot != NULL && srel != NULL);
+
+	      /* Make sure we have an initial entry in the .got table.  */
+	      if (sgot->size == 0)
+		sgot->size = BYTES_IN_WORD;
+	      sunos_hash_table (info)->got_needed = TRUE;
+	    }
+
+	  if (r_extern)
+	    {
+	      if (h->got_offset != 0)
+		continue;
+
+	      h->got_offset = sgot->size;
+	    }
+	  else
+	    {
+	      if (r_index >= bfd_get_symcount (abfd))
+		/* This is abnormal, but should be caught in the
+		   relocation phase.  */
+		continue;
+
+	      if (adata (abfd).local_got_offsets == NULL)
+		{
+		  amt = bfd_get_symcount (abfd);
+		  amt *= sizeof (bfd_vma);
+		  adata (abfd).local_got_offsets = bfd_zalloc (abfd, amt);
+		  if (adata (abfd).local_got_offsets == NULL)
+		    return FALSE;
+		}
+
+	      if (adata (abfd).local_got_offsets[r_index] != 0)
+		continue;
+
+	      adata (abfd).local_got_offsets[r_index] = sgot->size;
+	    }
+
+	  sgot->size += BYTES_IN_WORD;
+
+	  /* If we are making a shared library, or if the symbol is
+	     defined by a dynamic object, we will need a dynamic reloc
+	     entry.  */
+	  if (info->shared
+	      || (h != NULL
+		  && (h->flags & SUNOS_DEF_DYNAMIC) != 0
+		  && (h->flags & SUNOS_DEF_REGULAR) == 0))
+	    srel->size += RELOC_EXT_SIZE;
+
+	  continue;
+	}
+
+      /* Otherwise, we are only interested in relocs against symbols
+	 defined in dynamic objects but not in regular objects.  We
+	 only need to consider relocs against external symbols.  */
+      if (! r_extern)
+	{
+	  /* But, if we are creating a shared library, we need to
+	     generate an absolute reloc.  */
+	  if (info->shared)
+	    {
+	      if (dynobj == NULL)
+		{
+		  if (! sunos_create_dynamic_sections (abfd, info, TRUE))
+		    return FALSE;
+		  dynobj = sunos_hash_table (info)->dynobj;
+		  splt = bfd_get_section_by_name (dynobj, ".plt");
+		  sgot = bfd_get_section_by_name (dynobj, ".got");
+		  srel = bfd_get_section_by_name (dynobj, ".dynrel");
+		  BFD_ASSERT (splt != NULL && sgot != NULL && srel != NULL);
+		}
+
+	      srel->size += RELOC_EXT_SIZE;
+	    }
+
+	  continue;
+	}
+
+      /* At this point common symbols have already been allocated, so
+	 we don't have to worry about them.  We need to consider that
+	 we may have already seen this symbol and marked it undefined;
+	 if the symbol is really undefined, then SUNOS_DEF_DYNAMIC
+	 will be zero.  */
+      if (h->root.root.type != bfd_link_hash_defined
+	  && h->root.root.type != bfd_link_hash_defweak
+	  && h->root.root.type != bfd_link_hash_undefined)
+	continue;
+
+      if (r_type != RELOC_JMP_TBL
+	  && ! info->shared
+	  && ((h->flags & SUNOS_DEF_DYNAMIC) == 0
+	      || (h->flags & SUNOS_DEF_REGULAR) != 0))
+	continue;
+
+      if (r_type == RELOC_JMP_TBL
+	  && ! info->shared
+	  && (h->flags & SUNOS_DEF_DYNAMIC) == 0
+	  && (h->flags & SUNOS_DEF_REGULAR) == 0)
+	{
+	  /* This symbol is apparently undefined.  Don't do anything
+	     here; just let the relocation routine report an undefined
+	     symbol.  */
+	  continue;
+	}
+
+      if (strcmp (h->root.root.root.string, "__GLOBAL_OFFSET_TABLE_") == 0)
+	continue;
+
+      if (dynobj == NULL)
+	{
+	  if (! sunos_create_dynamic_sections (abfd, info, FALSE))
+	    return FALSE;
+	  dynobj = sunos_hash_table (info)->dynobj;
+	  splt = bfd_get_section_by_name (dynobj, ".plt");
+	  sgot = bfd_get_section_by_name (dynobj, ".got");
+	  srel = bfd_get_section_by_name (dynobj, ".dynrel");
+	  BFD_ASSERT (splt != NULL && sgot != NULL && srel != NULL);
+
+	  /* Make sure we have an initial entry in the .got table.  */
+	  if (sgot->size == 0)
+	    sgot->size = BYTES_IN_WORD;
+	  sunos_hash_table (info)->got_needed = TRUE;
+	}
+
+      BFD_ASSERT (r_type == RELOC_JMP_TBL
+		  || info->shared
+		  || (h->flags & SUNOS_REF_REGULAR) != 0);
+      BFD_ASSERT (r_type == RELOC_JMP_TBL
+		  || info->shared
+		  || h->plt_offset != 0
+		  || ((h->root.root.type == bfd_link_hash_defined
+		       || h->root.root.type == bfd_link_hash_defweak)
+		      ? (h->root.root.u.def.section->owner->flags
+			 & DYNAMIC) != 0
+		      : (h->root.root.u.undef.abfd->flags & DYNAMIC) != 0));
+
+      /* This reloc is against a symbol defined only by a dynamic
+	 object, or it is a jump table reloc from PIC compiled code.  */
+
+      if (r_type != RELOC_JMP_TBL
+	  && h->root.root.type == bfd_link_hash_undefined)
+	/* Presumably this symbol was marked as being undefined by
+	   an earlier reloc.  */
+	srel->size += RELOC_EXT_SIZE;
+
+      else if (r_type != RELOC_JMP_TBL
+	       && (h->root.root.u.def.section->flags & SEC_CODE) == 0)
+	{
+	  bfd *sub;
+
+	  /* This reloc is not in the .text section.  It must be
+	     copied into the dynamic relocs.  We mark the symbol as
+	     being undefined.  */
+	  srel->size += RELOC_EXT_SIZE;
+	  if ((h->flags & SUNOS_DEF_REGULAR) == 0)
+	    {
+	      sub = h->root.root.u.def.section->owner;
+	      h->root.root.type = bfd_link_hash_undefined;
+	      h->root.root.u.undef.abfd = sub;
+	    }
+	}
+      else
+	{
+	  /* This symbol is in the .text section.  We must give it an
+	     entry in the procedure linkage table, if we have not
+	     already done so.  We change the definition of the symbol
+	     to the .plt section; this will cause relocs against it to
+	     be handled correctly.  */
+	  if (h->plt_offset == 0)
+	    {
+	      if (splt->size == 0)
+		splt->size = SPARC_PLT_ENTRY_SIZE;
+	      h->plt_offset = splt->size;
+
+	      if ((h->flags & SUNOS_DEF_REGULAR) == 0)
+		{
+		  if (h->root.root.type == bfd_link_hash_undefined)
+		    h->root.root.type = bfd_link_hash_defined;
+		  h->root.root.u.def.section = splt;
+		  h->root.root.u.def.value = splt->size;
+		}
+
+	      splt->size += SPARC_PLT_ENTRY_SIZE;
+
+	      /* We will also need a dynamic reloc entry, unless this
+		 is a JMP_TBL reloc produced by linking PIC compiled
+		 code, and we are not making a shared library.  */
+	      if (info->shared || (h->flags & SUNOS_DEF_REGULAR) == 0)
+		srel->size += RELOC_EXT_SIZE;
+	    }
+
+	  /* If we are creating a shared library, we need to copy over
+	     any reloc other than a jump table reloc.  */
+	  if (info->shared && r_type != RELOC_JMP_TBL)
+	    srel->size += RELOC_EXT_SIZE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Scan the relocs for an input section.  */
+
+static bfd_boolean
+sunos_scan_relocs (struct bfd_link_info *info,
+		   bfd *abfd,
+		   asection *sec,
+		   bfd_size_type rel_size)
+{
+  void * relocs;
+  void * free_relocs = NULL;
+
+  if (rel_size == 0)
+    return TRUE;
+
+  if (! info->keep_memory)
+    relocs = free_relocs = bfd_malloc (rel_size);
+  else
+    {
+      struct aout_section_data_struct *n;
+      bfd_size_type amt = sizeof (struct aout_section_data_struct);
+
+      n = bfd_alloc (abfd, amt);
+      if (n == NULL)
+	relocs = NULL;
+      else
+	{
+	  set_aout_section_data (sec, n);
+	  relocs = bfd_malloc (rel_size);
+	  aout_section_data (sec)->relocs = relocs;
+	}
+    }
+  if (relocs == NULL)
+    return FALSE;
+
+  if (bfd_seek (abfd, sec->rel_filepos, SEEK_SET) != 0
+      || bfd_bread (relocs, rel_size, abfd) != rel_size)
+    goto error_return;
+
+  if (obj_reloc_entry_size (abfd) == RELOC_STD_SIZE)
+    {
+      if (! sunos_scan_std_relocs (info, abfd, sec,
+				   (struct reloc_std_external *) relocs,
+				   rel_size))
+	goto error_return;
+    }
+  else
+    {
+      if (! sunos_scan_ext_relocs (info, abfd, sec,
+				   (struct reloc_ext_external *) relocs,
+				   rel_size))
+	goto error_return;
+    }
+
+  if (free_relocs != NULL)
+    free (free_relocs);
+
+  return TRUE;
+
+ error_return:
+  if (free_relocs != NULL)
+    free (free_relocs);
+  return FALSE;
+}
+
+/* Build the hash table of dynamic symbols, and to mark as written all
+   symbols from dynamic objects which we do not plan to write out.  */
+
+static bfd_boolean
+sunos_scan_dynamic_symbol (struct sunos_link_hash_entry *h, void * data)
+{
+  struct bfd_link_info *info = (struct bfd_link_info *) data;
+
+  /* Set the written flag for symbols we do not want to write out as
+     part of the regular symbol table.  This is all symbols which are
+     not defined in a regular object file.  For some reason symbols
+     which are referenced by a regular object and defined by a dynamic
+     object do not seem to show up in the regular symbol table.  It is
+     possible for a symbol to have only SUNOS_REF_REGULAR set here, it
+     is an undefined symbol which was turned into a common symbol
+     because it was found in an archive object which was not included
+     in the link.  */
+  if ((h->flags & SUNOS_DEF_REGULAR) == 0
+      && (h->flags & SUNOS_DEF_DYNAMIC) != 0
+      && strcmp (h->root.root.root.string, "__DYNAMIC") != 0)
+    h->root.written = TRUE;
+
+  /* If this symbol is defined by a dynamic object and referenced by a
+     regular object, see whether we gave it a reasonable value while
+     scanning the relocs.  */
+  if ((h->flags & SUNOS_DEF_REGULAR) == 0
+      && (h->flags & SUNOS_DEF_DYNAMIC) != 0
+      && (h->flags & SUNOS_REF_REGULAR) != 0)
+    {
+      if ((h->root.root.type == bfd_link_hash_defined
+	   || h->root.root.type == bfd_link_hash_defweak)
+	  && ((h->root.root.u.def.section->owner->flags & DYNAMIC) != 0)
+	  && h->root.root.u.def.section->output_section == NULL)
+	{
+	  bfd *sub;
+
+	  /* This symbol is currently defined in a dynamic section
+	     which is not being put into the output file.  This
+	     implies that there is no reloc against the symbol.  I'm
+	     not sure why this case would ever occur.  In any case, we
+	     change the symbol to be undefined.  */
+	  sub = h->root.root.u.def.section->owner;
+	  h->root.root.type = bfd_link_hash_undefined;
+	  h->root.root.u.undef.abfd = sub;
+	}
+    }
+
+  /* If this symbol is defined or referenced by a regular file, add it
+     to the dynamic symbols.  */
+  if ((h->flags & (SUNOS_DEF_REGULAR | SUNOS_REF_REGULAR)) != 0)
+    {
+      asection *s;
+      size_t len;
+      bfd_byte *contents;
+      unsigned char *name;
+      unsigned long hash;
+      bfd *dynobj;
+
+      BFD_ASSERT (h->dynindx == -2);
+
+      dynobj = sunos_hash_table (info)->dynobj;
+
+      h->dynindx = sunos_hash_table (info)->dynsymcount;
+      ++sunos_hash_table (info)->dynsymcount;
+
+      len = strlen (h->root.root.root.string);
+
+      /* We don't bother to construct a BFD hash table for the strings
+	 which are the names of the dynamic symbols.  Using a hash
+	 table for the regular symbols is beneficial, because the
+	 regular symbols includes the debugging symbols, which have
+	 long names and are often duplicated in several object files.
+	 There are no debugging symbols in the dynamic symbols.  */
+      s = bfd_get_section_by_name (dynobj, ".dynstr");
+      BFD_ASSERT (s != NULL);
+      contents = bfd_realloc (s->contents, s->size + len + 1);
+      if (contents == NULL)
+	return FALSE;
+      s->contents = contents;
+
+      h->dynstr_index = s->size;
+      strcpy ((char *) contents + s->size, h->root.root.root.string);
+      s->size += len + 1;
+
+      /* Add it to the dynamic hash table.  */
+      name = (unsigned char *) h->root.root.root.string;
+      hash = 0;
+      while (*name != '\0')
+	hash = (hash << 1) + *name++;
+      hash &= 0x7fffffff;
+      hash %= sunos_hash_table (info)->bucketcount;
+
+      s = bfd_get_section_by_name (dynobj, ".hash");
+      BFD_ASSERT (s != NULL);
+
+      if (GET_SWORD (dynobj, s->contents + hash * HASH_ENTRY_SIZE) == -1)
+	PUT_WORD (dynobj, h->dynindx, s->contents + hash * HASH_ENTRY_SIZE);
+      else
+	{
+	  bfd_vma next;
+
+	  next = GET_WORD (dynobj,
+			   (s->contents
+			    + hash * HASH_ENTRY_SIZE
+			    + BYTES_IN_WORD));
+	  PUT_WORD (dynobj, s->size / HASH_ENTRY_SIZE,
+		    s->contents + hash * HASH_ENTRY_SIZE + BYTES_IN_WORD);
+	  PUT_WORD (dynobj, h->dynindx, s->contents + s->size);
+	  PUT_WORD (dynobj, next, s->contents + s->size + BYTES_IN_WORD);
+	  s->size += HASH_ENTRY_SIZE;
+	}
+    }
+
+  return TRUE;
+}
+
+/* Set up the sizes and contents of the dynamic sections created in
+   sunos_add_dynamic_symbols.  This is called by the SunOS linker
+   emulation before_allocation routine.  We must set the sizes of the
+   sections before the linker sets the addresses of the various
+   sections.  This unfortunately requires reading all the relocs so
+   that we can work out which ones need to become dynamic relocs.  If
+   info->keep_memory is TRUE, we keep the relocs in memory; otherwise,
+   we discard them, and will read them again later.  */
+
+bfd_boolean
+bfd_sunos_size_dynamic_sections (bfd *output_bfd,
+				 struct bfd_link_info *info,
+				 asection **sdynptr,
+				 asection **sneedptr,
+				 asection **srulesptr)
+{
+  bfd *dynobj;
+  bfd_size_type dynsymcount;
+  struct sunos_link_hash_entry *h;
+  asection *s;
+  size_t bucketcount;
+  bfd_size_type hashalloc;
+  size_t i;
+  bfd *sub;
+
+  *sdynptr = NULL;
+  *sneedptr = NULL;
+  *srulesptr = NULL;
+
+  if (info->relocatable)
+    return TRUE;
+
+  if (output_bfd->xvec != &MY(vec))
+    return TRUE;
+
+  /* Look through all the input BFD's and read their relocs.  It would
+     be better if we didn't have to do this, but there is no other way
+     to determine the number of dynamic relocs we need, and, more
+     importantly, there is no other way to know which symbols should
+     get an entry in the procedure linkage table.  */
+  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+    {
+      if ((sub->flags & DYNAMIC) == 0
+	  && sub->xvec == output_bfd->xvec)
+	{
+	  if (! sunos_scan_relocs (info, sub, obj_textsec (sub),
+				   exec_hdr (sub)->a_trsize)
+	      || ! sunos_scan_relocs (info, sub, obj_datasec (sub),
+				      exec_hdr (sub)->a_drsize))
+	    return FALSE;
+	}
+    }
+
+  dynobj = sunos_hash_table (info)->dynobj;
+  dynsymcount = sunos_hash_table (info)->dynsymcount;
+
+  /* If there were no dynamic objects in the link, and we don't need
+     to build a global offset table, there is nothing to do here.  */
+  if (! sunos_hash_table (info)->dynamic_sections_needed
+      && ! sunos_hash_table (info)->got_needed)
+    return TRUE;
+
+  /* If __GLOBAL_OFFSET_TABLE_ was mentioned, define it.  */
+  h = sunos_link_hash_lookup (sunos_hash_table (info),
+			      "__GLOBAL_OFFSET_TABLE_", FALSE, FALSE, FALSE);
+  if (h != NULL && (h->flags & SUNOS_REF_REGULAR) != 0)
+    {
+      h->flags |= SUNOS_DEF_REGULAR;
+      if (h->dynindx == -1)
+	{
+	  ++sunos_hash_table (info)->dynsymcount;
+	  h->dynindx = -2;
+	}
+      h->root.root.type = bfd_link_hash_defined;
+      h->root.root.u.def.section = bfd_get_section_by_name (dynobj, ".got");
+
+      /* If the .got section is more than 0x1000 bytes, we set
+	 __GLOBAL_OFFSET_TABLE_ to be 0x1000 bytes into the section,
+	 so that 13 bit relocations have a greater chance of working.  */
+      s = bfd_get_section_by_name (dynobj, ".got");
+      BFD_ASSERT (s != NULL);
+      if (s->size >= 0x1000)
+	h->root.root.u.def.value = 0x1000;
+      else
+	h->root.root.u.def.value = 0;
+
+      sunos_hash_table (info)->got_base = h->root.root.u.def.value;
+    }
+
+  /* If there are any shared objects in the link, then we need to set
+     up the dynamic linking information.  */
+  if (sunos_hash_table (info)->dynamic_sections_needed)
+    {
+      *sdynptr = bfd_get_section_by_name (dynobj, ".dynamic");
+
+      /* The .dynamic section is always the same size.  */
+      s = *sdynptr;
+      BFD_ASSERT (s != NULL);
+      s->size = (sizeof (struct external_sun4_dynamic)
+		      + EXTERNAL_SUN4_DYNAMIC_DEBUGGER_SIZE
+		      + sizeof (struct external_sun4_dynamic_link));
+
+      /* Set the size of the .dynsym and .hash sections.  We counted
+	 the number of dynamic symbols as we read the input files.  We
+	 will build the dynamic symbol table (.dynsym) and the hash
+	 table (.hash) when we build the final symbol table, because
+	 until then we do not know the correct value to give the
+	 symbols.  We build the dynamic symbol string table (.dynstr)
+	 in a traversal of the symbol table using
+	 sunos_scan_dynamic_symbol.  */
+      s = bfd_get_section_by_name (dynobj, ".dynsym");
+      BFD_ASSERT (s != NULL);
+      s->size = dynsymcount * sizeof (struct external_nlist);
+      s->contents = bfd_alloc (output_bfd, s->size);
+      if (s->contents == NULL && s->size != 0)
+	return FALSE;
+
+      /* The number of buckets is just the number of symbols divided
+	 by four.  To compute the final size of the hash table, we
+	 must actually compute the hash table.  Normally we need
+	 exactly as many entries in the hash table as there are
+	 dynamic symbols, but if some of the buckets are not used we
+	 will need additional entries.  In the worst case, every
+	 symbol will hash to the same bucket, and we will need
+	 BUCKETCOUNT - 1 extra entries.  */
+      if (dynsymcount >= 4)
+	bucketcount = dynsymcount / 4;
+      else if (dynsymcount > 0)
+	bucketcount = dynsymcount;
+      else
+	bucketcount = 1;
+      s = bfd_get_section_by_name (dynobj, ".hash");
+      BFD_ASSERT (s != NULL);
+      hashalloc = (dynsymcount + bucketcount - 1) * HASH_ENTRY_SIZE;
+      s->contents = bfd_zalloc (dynobj, hashalloc);
+      if (s->contents == NULL && dynsymcount > 0)
+	return FALSE;
+      for (i = 0; i < bucketcount; i++)
+	PUT_WORD (output_bfd, (bfd_vma) -1, s->contents + i * HASH_ENTRY_SIZE);
+      s->size = bucketcount * HASH_ENTRY_SIZE;
+
+      sunos_hash_table (info)->bucketcount = bucketcount;
+
+      /* Scan all the symbols, place them in the dynamic symbol table,
+	 and build the dynamic hash table.  We reuse dynsymcount as a
+	 counter for the number of symbols we have added so far.  */
+      sunos_hash_table (info)->dynsymcount = 0;
+      sunos_link_hash_traverse (sunos_hash_table (info),
+				sunos_scan_dynamic_symbol,
+				(void *) info);
+      BFD_ASSERT (sunos_hash_table (info)->dynsymcount == dynsymcount);
+
+      /* The SunOS native linker seems to align the total size of the
+	 symbol strings to a multiple of 8.  I don't know if this is
+	 important, but it can't hurt much.  */
+      s = bfd_get_section_by_name (dynobj, ".dynstr");
+      BFD_ASSERT (s != NULL);
+      if ((s->size & 7) != 0)
+	{
+	  bfd_size_type add;
+	  bfd_byte *contents;
+
+	  add = 8 - (s->size & 7);
+	  contents = bfd_realloc (s->contents, s->size + add);
+	  if (contents == NULL)
+	    return FALSE;
+	  memset (contents + s->size, 0, (size_t) add);
+	  s->contents = contents;
+	  s->size += add;
+	}
+    }
+
+  /* Now that we have worked out the sizes of the procedure linkage
+     table and the dynamic relocs, allocate storage for them.  */
+  s = bfd_get_section_by_name (dynobj, ".plt");
+  BFD_ASSERT (s != NULL);
+  if (s->size != 0)
+    {
+      s->contents = bfd_alloc (dynobj, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+
+      /* Fill in the first entry in the table.  */
+      switch (bfd_get_arch (dynobj))
+	{
+	case bfd_arch_sparc:
+	  memcpy (s->contents, sparc_plt_first_entry, SPARC_PLT_ENTRY_SIZE);
+	  break;
+
+	case bfd_arch_m68k:
+	  memcpy (s->contents, m68k_plt_first_entry, M68K_PLT_ENTRY_SIZE);
+	  break;
+
+	default:
+	  abort ();
+	}
+    }
+
+  s = bfd_get_section_by_name (dynobj, ".dynrel");
+  if (s->size != 0)
+    {
+      s->contents = bfd_alloc (dynobj, s->size);
+      if (s->contents == NULL)
+	return FALSE;
+    }
+  /* We use the reloc_count field to keep track of how many of the
+     relocs we have output so far.  */
+  s->reloc_count = 0;
+
+  /* Make space for the global offset table.  */
+  s = bfd_get_section_by_name (dynobj, ".got");
+  s->contents = bfd_alloc (dynobj, s->size);
+  if (s->contents == NULL)
+    return FALSE;
+
+  *sneedptr = bfd_get_section_by_name (dynobj, ".need");
+  *srulesptr = bfd_get_section_by_name (dynobj, ".rules");
+
+  return TRUE;
+}
+
+/* Link a dynamic object.  We actually don't have anything to do at
+   this point.  This entry point exists to prevent the regular linker
+   code from doing anything with the object.  */
+
+static bfd_boolean
+sunos_link_dynamic_object (struct bfd_link_info *info ATTRIBUTE_UNUSED,
+			   bfd *abfd ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+/* Write out a dynamic symbol.  This is called by the final traversal
+   over the symbol table.  */
+
+static bfd_boolean
+sunos_write_dynamic_symbol (bfd *output_bfd,
+			    struct bfd_link_info *info,
+			    struct aout_link_hash_entry *harg)
+{
+  struct sunos_link_hash_entry *h = (struct sunos_link_hash_entry *) harg;
+  int type;
+  bfd_vma val;
+  asection *s;
+  struct external_nlist *outsym;
+
+  /* If this symbol is in the procedure linkage table, fill in the
+     table entry.  */
+  if (h->plt_offset != 0)
+    {
+      bfd *dynobj;
+      asection *splt;
+      bfd_byte *p;
+      bfd_vma r_address;
+
+      dynobj = sunos_hash_table (info)->dynobj;
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      p = splt->contents + h->plt_offset;
+
+      s = bfd_get_section_by_name (dynobj, ".dynrel");
+
+      r_address = (splt->output_section->vma
+		   + splt->output_offset
+		   + h->plt_offset);
+
+      switch (bfd_get_arch (output_bfd))
+	{
+	case bfd_arch_sparc:
+	  if (info->shared || (h->flags & SUNOS_DEF_REGULAR) == 0)
+	    {
+	      bfd_put_32 (output_bfd, SPARC_PLT_ENTRY_WORD0, p);
+	      bfd_put_32 (output_bfd,
+			  (SPARC_PLT_ENTRY_WORD1
+			   + (((- (h->plt_offset + 4) >> 2)
+			       & 0x3fffffff))),
+			  p + 4);
+	      bfd_put_32 (output_bfd, SPARC_PLT_ENTRY_WORD2 + s->reloc_count,
+			  p + 8);
+	    }
+	  else
+	    {
+	      val = (h->root.root.u.def.section->output_section->vma
+		     + h->root.root.u.def.section->output_offset
+		     + h->root.root.u.def.value);
+	      bfd_put_32 (output_bfd,
+			  SPARC_PLT_PIC_WORD0 + ((val >> 10) & 0x3fffff),
+			  p);
+	      bfd_put_32 (output_bfd,
+			  SPARC_PLT_PIC_WORD1 + (val & 0x3ff),
+			  p + 4);
+	      bfd_put_32 (output_bfd, SPARC_PLT_PIC_WORD2, p + 8);
+	    }
+	  break;
+
+	case bfd_arch_m68k:
+	  if (! info->shared && (h->flags & SUNOS_DEF_REGULAR) != 0)
+	    abort ();
+	  bfd_put_16 (output_bfd, M68K_PLT_ENTRY_WORD0, p);
+	  bfd_put_32 (output_bfd, (- (h->plt_offset + 2)), p + 2);
+	  bfd_put_16 (output_bfd, (bfd_vma) s->reloc_count, p + 6);
+	  r_address += 2;
+	  break;
+
+	default:
+	  abort ();
+	}
+
+      /* We also need to add a jump table reloc, unless this is the
+	 result of a JMP_TBL reloc from PIC compiled code.  */
+      if (info->shared || (h->flags & SUNOS_DEF_REGULAR) == 0)
+	{
+	  BFD_ASSERT (h->dynindx >= 0);
+	  BFD_ASSERT (s->reloc_count * obj_reloc_entry_size (dynobj)
+		      < s->size);
+	  p = s->contents + s->reloc_count * obj_reloc_entry_size (output_bfd);
+	  if (obj_reloc_entry_size (output_bfd) == RELOC_STD_SIZE)
+	    {
+	      struct reloc_std_external *srel;
+
+	      srel = (struct reloc_std_external *) p;
+	      PUT_WORD (output_bfd, r_address, srel->r_address);
+	      if (bfd_header_big_endian (output_bfd))
+		{
+		  srel->r_index[0] = (bfd_byte) (h->dynindx >> 16);
+		  srel->r_index[1] = (bfd_byte) (h->dynindx >> 8);
+		  srel->r_index[2] = (bfd_byte) (h->dynindx);
+		  srel->r_type[0] = (RELOC_STD_BITS_EXTERN_BIG
+				     | RELOC_STD_BITS_JMPTABLE_BIG);
+		}
+	      else
+		{
+		  srel->r_index[2] = (bfd_byte) (h->dynindx >> 16);
+		  srel->r_index[1] = (bfd_byte) (h->dynindx >> 8);
+		  srel->r_index[0] = (bfd_byte)h->dynindx;
+		  srel->r_type[0] = (RELOC_STD_BITS_EXTERN_LITTLE
+				     | RELOC_STD_BITS_JMPTABLE_LITTLE);
+		}
+	    }
+	  else
+	    {
+	      struct reloc_ext_external *erel;
+
+	      erel = (struct reloc_ext_external *) p;
+	      PUT_WORD (output_bfd, r_address, erel->r_address);
+	      if (bfd_header_big_endian (output_bfd))
+		{
+		  erel->r_index[0] = (bfd_byte) (h->dynindx >> 16);
+		  erel->r_index[1] = (bfd_byte) (h->dynindx >> 8);
+		  erel->r_index[2] = (bfd_byte)h->dynindx;
+		  erel->r_type[0] =
+		    (RELOC_EXT_BITS_EXTERN_BIG
+		     | (RELOC_JMP_SLOT << RELOC_EXT_BITS_TYPE_SH_BIG));
+		}
+	      else
+		{
+		  erel->r_index[2] = (bfd_byte) (h->dynindx >> 16);
+		  erel->r_index[1] = (bfd_byte) (h->dynindx >> 8);
+		  erel->r_index[0] = (bfd_byte)h->dynindx;
+		  erel->r_type[0] =
+		    (RELOC_EXT_BITS_EXTERN_LITTLE
+		     | (RELOC_JMP_SLOT << RELOC_EXT_BITS_TYPE_SH_LITTLE));
+		}
+	      PUT_WORD (output_bfd, (bfd_vma) 0, erel->r_addend);
+	    }
+
+	  ++s->reloc_count;
+	}
+    }
+
+  /* If this is not a dynamic symbol, we don't have to do anything
+     else.  We only check this after handling the PLT entry, because
+     we can have a PLT entry for a nondynamic symbol when linking PIC
+     compiled code from a regular object.  */
+  if (h->dynindx < 0)
+    return TRUE;
+
+  switch (h->root.root.type)
+    {
+    default:
+    case bfd_link_hash_new:
+      abort ();
+      /* Avoid variable not initialized warnings.  */
+      return TRUE;
+    case bfd_link_hash_undefined:
+      type = N_UNDF | N_EXT;
+      val = 0;
+      break;
+    case bfd_link_hash_defined:
+    case bfd_link_hash_defweak:
+      {
+	asection *sec;
+	asection *output_section;
+
+	sec = h->root.root.u.def.section;
+	output_section = sec->output_section;
+	BFD_ASSERT (bfd_is_abs_section (output_section)
+		    || output_section->owner == output_bfd);
+	if (h->plt_offset != 0
+	    && (h->flags & SUNOS_DEF_REGULAR) == 0)
+	  {
+	    type = N_UNDF | N_EXT;
+	    val = 0;
+	  }
+	else
+	  {
+	    if (output_section == obj_textsec (output_bfd))
+	      type = (h->root.root.type == bfd_link_hash_defined
+		      ? N_TEXT
+		      : N_WEAKT);
+	    else if (output_section == obj_datasec (output_bfd))
+	      type = (h->root.root.type == bfd_link_hash_defined
+		      ? N_DATA
+		      : N_WEAKD);
+	    else if (output_section == obj_bsssec (output_bfd))
+	      type = (h->root.root.type == bfd_link_hash_defined
+		      ? N_BSS
+		      : N_WEAKB);
+	    else
+	      type = (h->root.root.type == bfd_link_hash_defined
+		      ? N_ABS
+		      : N_WEAKA);
+	    type |= N_EXT;
+	    val = (h->root.root.u.def.value
+		   + output_section->vma
+		   + sec->output_offset);
+	  }
+      }
+      break;
+    case bfd_link_hash_common:
+      type = N_UNDF | N_EXT;
+      val = h->root.root.u.c.size;
+      break;
+    case bfd_link_hash_undefweak:
+      type = N_WEAKU;
+      val = 0;
+      break;
+    case bfd_link_hash_indirect:
+    case bfd_link_hash_warning:
+      /* FIXME: Ignore these for now.  The circumstances under which
+	 they should be written out are not clear to me.  */
+      return TRUE;
+    }
+
+  s = bfd_get_section_by_name (sunos_hash_table (info)->dynobj, ".dynsym");
+  BFD_ASSERT (s != NULL);
+  outsym = ((struct external_nlist *)
+	    (s->contents + h->dynindx * EXTERNAL_NLIST_SIZE));
+
+  H_PUT_8 (output_bfd, type, outsym->e_type);
+  H_PUT_8 (output_bfd, 0, outsym->e_other);
+
+  /* FIXME: The native linker doesn't use 0 for desc.  It seems to use
+     one less than the desc value in the shared library, although that
+     seems unlikely.  */
+  H_PUT_16 (output_bfd, 0, outsym->e_desc);
+
+  PUT_WORD (output_bfd, h->dynstr_index, outsym->e_strx);
+  PUT_WORD (output_bfd, val, outsym->e_value);
+
+  return TRUE;
+}
+
+/* This is called for each reloc against an external symbol.  If this
+   is a reloc which are are going to copy as a dynamic reloc, then
+   copy it over, and tell the caller to not bother processing this
+   reloc.  */
+
+static bfd_boolean
+sunos_check_dynamic_reloc (struct bfd_link_info *info,
+			   bfd *input_bfd,
+			   asection *input_section,
+			   struct aout_link_hash_entry *harg,
+			   void * reloc,
+			   bfd_byte *contents ATTRIBUTE_UNUSED,
+			   bfd_boolean *skip,
+			   bfd_vma *relocationp)
+{
+  struct sunos_link_hash_entry *h = (struct sunos_link_hash_entry *) harg;
+  bfd *dynobj;
+  bfd_boolean baserel;
+  bfd_boolean jmptbl;
+  bfd_boolean pcrel;
+  asection *s;
+  bfd_byte *p;
+  long indx;
+
+  *skip = FALSE;
+
+  dynobj = sunos_hash_table (info)->dynobj;
+
+  if (h != NULL
+      && h->plt_offset != 0
+      && (info->shared
+	  || (h->flags & SUNOS_DEF_REGULAR) == 0))
+    {
+      asection *splt;
+
+      /* Redirect the relocation to the PLT entry.  */
+      splt = bfd_get_section_by_name (dynobj, ".plt");
+      *relocationp = (splt->output_section->vma
+		      + splt->output_offset
+		      + h->plt_offset);
+    }
+
+  if (obj_reloc_entry_size (input_bfd) == RELOC_STD_SIZE)
+    {
+      struct reloc_std_external *srel;
+
+      srel = (struct reloc_std_external *) reloc;
+      if (bfd_header_big_endian (input_bfd))
+	{
+	  baserel = (0 != (srel->r_type[0] & RELOC_STD_BITS_BASEREL_BIG));
+	  jmptbl = (0 != (srel->r_type[0] & RELOC_STD_BITS_JMPTABLE_BIG));
+	  pcrel = (0 != (srel->r_type[0] & RELOC_STD_BITS_PCREL_BIG));
+	}
+      else
+	{
+	  baserel = (0 != (srel->r_type[0] & RELOC_STD_BITS_BASEREL_LITTLE));
+	  jmptbl = (0 != (srel->r_type[0] & RELOC_STD_BITS_JMPTABLE_LITTLE));
+	  pcrel = (0 != (srel->r_type[0] & RELOC_STD_BITS_PCREL_LITTLE));
+	}
+    }
+  else
+    {
+      struct reloc_ext_external *erel;
+      int r_type;
+
+      erel = (struct reloc_ext_external *) reloc;
+      if (bfd_header_big_endian (input_bfd))
+	r_type = ((erel->r_type[0] & RELOC_EXT_BITS_TYPE_BIG)
+		  >> RELOC_EXT_BITS_TYPE_SH_BIG);
+      else
+	r_type = ((erel->r_type[0] & RELOC_EXT_BITS_TYPE_LITTLE)
+		  >> RELOC_EXT_BITS_TYPE_SH_LITTLE);
+      baserel = (r_type == RELOC_BASE10
+		 || r_type == RELOC_BASE13
+		 || r_type == RELOC_BASE22);
+      jmptbl = r_type == RELOC_JMP_TBL;
+      pcrel = (r_type == RELOC_DISP8
+	       || r_type == RELOC_DISP16
+	       || r_type == RELOC_DISP32
+	       || r_type == RELOC_WDISP30
+	       || r_type == RELOC_WDISP22);
+      /* We don't consider the PC10 and PC22 types to be PC relative,
+	 because they are pcrel_offset.  */
+    }
+
+  if (baserel)
+    {
+      bfd_vma *got_offsetp;
+      asection *sgot;
+
+      if (h != NULL)
+	got_offsetp = &h->got_offset;
+      else if (adata (input_bfd).local_got_offsets == NULL)
+	got_offsetp = NULL;
+      else
+	{
+	  struct reloc_std_external *srel;
+	  int r_index;
+
+	  srel = (struct reloc_std_external *) reloc;
+	  if (obj_reloc_entry_size (input_bfd) == RELOC_STD_SIZE)
+	    {
+	      if (bfd_header_big_endian (input_bfd))
+		r_index = ((srel->r_index[0] << 16)
+			   | (srel->r_index[1] << 8)
+			   | srel->r_index[2]);
+	      else
+		r_index = ((srel->r_index[2] << 16)
+			   | (srel->r_index[1] << 8)
+			   | srel->r_index[0]);
+	    }
+	  else
+	    {
+	      struct reloc_ext_external *erel;
+
+	      erel = (struct reloc_ext_external *) reloc;
+	      if (bfd_header_big_endian (input_bfd))
+		r_index = ((erel->r_index[0] << 16)
+			   | (erel->r_index[1] << 8)
+			   | erel->r_index[2]);
+	      else
+		r_index = ((erel->r_index[2] << 16)
+			   | (erel->r_index[1] << 8)
+			   | erel->r_index[0]);
+	    }
+
+	  got_offsetp = adata (input_bfd).local_got_offsets + r_index;
+	}
+
+      BFD_ASSERT (got_offsetp != NULL && *got_offsetp != 0);
+
+      sgot = bfd_get_section_by_name (dynobj, ".got");
+
+      /* We set the least significant bit to indicate whether we have
+	 already initialized the GOT entry.  */
+      if ((*got_offsetp & 1) == 0)
+	{
+	  if (h == NULL
+	      || (! info->shared
+		  && ((h->flags & SUNOS_DEF_DYNAMIC) == 0
+		      || (h->flags & SUNOS_DEF_REGULAR) != 0)))
+	    PUT_WORD (dynobj, *relocationp, sgot->contents + *got_offsetp);
+	  else
+	    PUT_WORD (dynobj, 0, sgot->contents + *got_offsetp);
+
+	  if (info->shared
+	      || (h != NULL
+		  && (h->flags & SUNOS_DEF_DYNAMIC) != 0
+		  && (h->flags & SUNOS_DEF_REGULAR) == 0))
+	    {
+	      /* We need to create a GLOB_DAT or 32 reloc to tell the
+		 dynamic linker to fill in this entry in the table.  */
+
+	      s = bfd_get_section_by_name (dynobj, ".dynrel");
+	      BFD_ASSERT (s != NULL);
+	      BFD_ASSERT (s->reloc_count * obj_reloc_entry_size (dynobj)
+			  < s->size);
+
+	      p = (s->contents
+		   + s->reloc_count * obj_reloc_entry_size (dynobj));
+
+	      if (h != NULL)
+		indx = h->dynindx;
+	      else
+		indx = 0;
+
+	      if (obj_reloc_entry_size (dynobj) == RELOC_STD_SIZE)
+		{
+		  struct reloc_std_external *srel;
+
+		  srel = (struct reloc_std_external *) p;
+		  PUT_WORD (dynobj,
+			    (*got_offsetp
+			     + sgot->output_section->vma
+			     + sgot->output_offset),
+			    srel->r_address);
+		  if (bfd_header_big_endian (dynobj))
+		    {
+		      srel->r_index[0] = (bfd_byte) (indx >> 16);
+		      srel->r_index[1] = (bfd_byte) (indx >> 8);
+		      srel->r_index[2] = (bfd_byte)indx;
+		      if (h == NULL)
+			srel->r_type[0] = 2 << RELOC_STD_BITS_LENGTH_SH_BIG;
+		      else
+			srel->r_type[0] =
+			  (RELOC_STD_BITS_EXTERN_BIG
+			   | RELOC_STD_BITS_BASEREL_BIG
+			   | RELOC_STD_BITS_RELATIVE_BIG
+			   | (2 << RELOC_STD_BITS_LENGTH_SH_BIG));
+		    }
+		  else
+		    {
+		      srel->r_index[2] = (bfd_byte) (indx >> 16);
+		      srel->r_index[1] = (bfd_byte) (indx >> 8);
+		      srel->r_index[0] = (bfd_byte)indx;
+		      if (h == NULL)
+			srel->r_type[0] = 2 << RELOC_STD_BITS_LENGTH_SH_LITTLE;
+		      else
+			srel->r_type[0] =
+			  (RELOC_STD_BITS_EXTERN_LITTLE
+			   | RELOC_STD_BITS_BASEREL_LITTLE
+			   | RELOC_STD_BITS_RELATIVE_LITTLE
+			   | (2 << RELOC_STD_BITS_LENGTH_SH_LITTLE));
+		    }
+		}
+	      else
+		{
+		  struct reloc_ext_external *erel;
+
+		  erel = (struct reloc_ext_external *) p;
+		  PUT_WORD (dynobj,
+			    (*got_offsetp
+			     + sgot->output_section->vma
+			     + sgot->output_offset),
+			    erel->r_address);
+		  if (bfd_header_big_endian (dynobj))
+		    {
+		      erel->r_index[0] = (bfd_byte) (indx >> 16);
+		      erel->r_index[1] = (bfd_byte) (indx >> 8);
+		      erel->r_index[2] = (bfd_byte)indx;
+		      if (h == NULL)
+			erel->r_type[0] =
+			  RELOC_32 << RELOC_EXT_BITS_TYPE_SH_BIG;
+		      else
+			erel->r_type[0] =
+			  (RELOC_EXT_BITS_EXTERN_BIG
+			   | (RELOC_GLOB_DAT << RELOC_EXT_BITS_TYPE_SH_BIG));
+		    }
+		  else
+		    {
+		      erel->r_index[2] = (bfd_byte) (indx >> 16);
+		      erel->r_index[1] = (bfd_byte) (indx >> 8);
+		      erel->r_index[0] = (bfd_byte)indx;
+		      if (h == NULL)
+			erel->r_type[0] =
+			  RELOC_32 << RELOC_EXT_BITS_TYPE_SH_LITTLE;
+		      else
+			erel->r_type[0] =
+			  (RELOC_EXT_BITS_EXTERN_LITTLE
+			   | (RELOC_GLOB_DAT
+			      << RELOC_EXT_BITS_TYPE_SH_LITTLE));
+		    }
+		  PUT_WORD (dynobj, 0, erel->r_addend);
+		}
+
+	      ++s->reloc_count;
+	    }
+
+	  *got_offsetp |= 1;
+	}
+
+      *relocationp = (sgot->vma
+		      + (*got_offsetp &~ (bfd_vma) 1)
+		      - sunos_hash_table (info)->got_base);
+
+      /* There is nothing else to do for a base relative reloc.  */
+      return TRUE;
+    }
+
+  if (! sunos_hash_table (info)->dynamic_sections_needed)
+    return TRUE;
+  if (! info->shared)
+    {
+      if (h == NULL
+	  || h->dynindx == -1
+	  || h->root.root.type != bfd_link_hash_undefined
+	  || (h->flags & SUNOS_DEF_REGULAR) != 0
+	  || (h->flags & SUNOS_DEF_DYNAMIC) == 0
+	  || (h->root.root.u.undef.abfd->flags & DYNAMIC) == 0)
+	return TRUE;
+    }
+  else
+    {
+      if (h != NULL
+	  && (h->dynindx == -1
+	      || jmptbl
+	      || strcmp (h->root.root.root.string,
+			 "__GLOBAL_OFFSET_TABLE_") == 0))
+	return TRUE;
+    }
+
+  /* It looks like this is a reloc we are supposed to copy.  */
+
+  s = bfd_get_section_by_name (dynobj, ".dynrel");
+  BFD_ASSERT (s != NULL);
+  BFD_ASSERT (s->reloc_count * obj_reloc_entry_size (dynobj) < s->size);
+
+  p = s->contents + s->reloc_count * obj_reloc_entry_size (dynobj);
+
+  /* Copy the reloc over.  */
+  memcpy (p, reloc, obj_reloc_entry_size (dynobj));
+
+  if (h != NULL)
+    indx = h->dynindx;
+  else
+    indx = 0;
+
+  /* Adjust the address and symbol index.  */
+  if (obj_reloc_entry_size (dynobj) == RELOC_STD_SIZE)
+    {
+      struct reloc_std_external *srel;
+
+      srel = (struct reloc_std_external *) p;
+      PUT_WORD (dynobj,
+		(GET_WORD (dynobj, srel->r_address)
+		 + input_section->output_section->vma
+		 + input_section->output_offset),
+		srel->r_address);
+      if (bfd_header_big_endian (dynobj))
+	{
+	  srel->r_index[0] = (bfd_byte) (indx >> 16);
+	  srel->r_index[1] = (bfd_byte) (indx >> 8);
+	  srel->r_index[2] = (bfd_byte)indx;
+	}
+      else
+	{
+	  srel->r_index[2] = (bfd_byte) (indx >> 16);
+	  srel->r_index[1] = (bfd_byte) (indx >> 8);
+	  srel->r_index[0] = (bfd_byte)indx;
+	}
+      /* FIXME: We may have to change the addend for a PC relative
+	 reloc.  */
+    }
+  else
+    {
+      struct reloc_ext_external *erel;
+
+      erel = (struct reloc_ext_external *) p;
+      PUT_WORD (dynobj,
+		(GET_WORD (dynobj, erel->r_address)
+		 + input_section->output_section->vma
+		 + input_section->output_offset),
+		erel->r_address);
+      if (bfd_header_big_endian (dynobj))
+	{
+	  erel->r_index[0] = (bfd_byte) (indx >> 16);
+	  erel->r_index[1] = (bfd_byte) (indx >> 8);
+	  erel->r_index[2] = (bfd_byte)indx;
+	}
+      else
+	{
+	  erel->r_index[2] = (bfd_byte) (indx >> 16);
+	  erel->r_index[1] = (bfd_byte) (indx >> 8);
+	  erel->r_index[0] = (bfd_byte)indx;
+	}
+      if (pcrel && h != NULL)
+	{
+	  /* Adjust the addend for the change in address.  */
+	  PUT_WORD (dynobj,
+		    (GET_WORD (dynobj, erel->r_addend)
+		     - (input_section->output_section->vma
+			+ input_section->output_offset
+			- input_section->vma)),
+		    erel->r_addend);
+	}
+    }
+
+  ++s->reloc_count;
+
+  if (h != NULL)
+    *skip = TRUE;
+
+  return TRUE;
+}
+
+/* Finish up the dynamic linking information.  */
+
+static bfd_boolean
+sunos_finish_dynamic_link (bfd *abfd, struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *o;
+  asection *s;
+  asection *sdyn;
+
+  if (! sunos_hash_table (info)->dynamic_sections_needed
+      && ! sunos_hash_table (info)->got_needed)
+    return TRUE;
+
+  dynobj = sunos_hash_table (info)->dynobj;
+
+  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+  BFD_ASSERT (sdyn != NULL);
+
+  /* Finish up the .need section.  The linker emulation code filled it
+     in, but with offsets from the start of the section instead of
+     real addresses.  Now that we know the section location, we can
+     fill in the final values.  */
+  s = bfd_get_section_by_name (dynobj, ".need");
+  if (s != NULL && s->size != 0)
+    {
+      file_ptr filepos;
+      bfd_byte *p;
+
+      filepos = s->output_section->filepos + s->output_offset;
+      p = s->contents;
+      while (1)
+	{
+	  bfd_vma val;
+
+	  PUT_WORD (dynobj, GET_WORD (dynobj, p) + filepos, p);
+	  val = GET_WORD (dynobj, p + 12);
+	  if (val == 0)
+	    break;
+	  PUT_WORD (dynobj, val + filepos, p + 12);
+	  p += 16;
+	}
+    }
+
+  /* The first entry in the .got section is the address of the
+     dynamic information, unless this is a shared library.  */
+  s = bfd_get_section_by_name (dynobj, ".got");
+  BFD_ASSERT (s != NULL);
+  if (info->shared || sdyn->size == 0)
+    PUT_WORD (dynobj, 0, s->contents);
+  else
+    PUT_WORD (dynobj, sdyn->output_section->vma + sdyn->output_offset,
+	      s->contents);
+
+  for (o = dynobj->sections; o != NULL; o = o->next)
+    {
+      if ((o->flags & SEC_HAS_CONTENTS) != 0
+	  && o->contents != NULL)
+	{
+	  BFD_ASSERT (o->output_section != NULL
+		      && o->output_section->owner == abfd);
+	  if (! bfd_set_section_contents (abfd, o->output_section,
+					  o->contents,
+					  (file_ptr) o->output_offset,
+					  o->size))
+	    return FALSE;
+	}
+    }
+
+  if (sdyn->size > 0)
+    {
+      struct external_sun4_dynamic esd;
+      struct external_sun4_dynamic_link esdl;
+      file_ptr pos;
+
+      /* Finish up the dynamic link information.  */
+      PUT_WORD (dynobj, (bfd_vma) 3, esd.ld_version);
+      PUT_WORD (dynobj,
+		sdyn->output_section->vma + sdyn->output_offset + sizeof esd,
+		esd.ldd);
+      PUT_WORD (dynobj,
+		(sdyn->output_section->vma
+		 + sdyn->output_offset
+		 + sizeof esd
+		 + EXTERNAL_SUN4_DYNAMIC_DEBUGGER_SIZE),
+		esd.ld);
+
+      if (! bfd_set_section_contents (abfd, sdyn->output_section, &esd,
+				      (file_ptr) sdyn->output_offset,
+				      (bfd_size_type) sizeof esd))
+	return FALSE;
+
+      PUT_WORD (dynobj, (bfd_vma) 0, esdl.ld_loaded);
+
+      s = bfd_get_section_by_name (dynobj, ".need");
+      if (s == NULL || s->size == 0)
+	PUT_WORD (dynobj, (bfd_vma) 0, esdl.ld_need);
+      else
+	PUT_WORD (dynobj, s->output_section->filepos + s->output_offset,
+		  esdl.ld_need);
+
+      s = bfd_get_section_by_name (dynobj, ".rules");
+      if (s == NULL || s->size == 0)
+	PUT_WORD (dynobj, (bfd_vma) 0, esdl.ld_rules);
+      else
+	PUT_WORD (dynobj, s->output_section->filepos + s->output_offset,
+		  esdl.ld_rules);
+
+      s = bfd_get_section_by_name (dynobj, ".got");
+      BFD_ASSERT (s != NULL);
+      PUT_WORD (dynobj, s->output_section->vma + s->output_offset,
+		esdl.ld_got);
+
+      s = bfd_get_section_by_name (dynobj, ".plt");
+      BFD_ASSERT (s != NULL);
+      PUT_WORD (dynobj, s->output_section->vma + s->output_offset,
+		esdl.ld_plt);
+      PUT_WORD (dynobj, s->size, esdl.ld_plt_sz);
+
+      s = bfd_get_section_by_name (dynobj, ".dynrel");
+      BFD_ASSERT (s != NULL);
+      BFD_ASSERT (s->reloc_count * obj_reloc_entry_size (dynobj)
+		  == s->size);
+      PUT_WORD (dynobj, s->output_section->filepos + s->output_offset,
+		esdl.ld_rel);
+
+      s = bfd_get_section_by_name (dynobj, ".hash");
+      BFD_ASSERT (s != NULL);
+      PUT_WORD (dynobj, s->output_section->filepos + s->output_offset,
+		esdl.ld_hash);
+
+      s = bfd_get_section_by_name (dynobj, ".dynsym");
+      BFD_ASSERT (s != NULL);
+      PUT_WORD (dynobj, s->output_section->filepos + s->output_offset,
+		esdl.ld_stab);
+
+      PUT_WORD (dynobj, (bfd_vma) 0, esdl.ld_stab_hash);
+
+      PUT_WORD (dynobj, (bfd_vma) sunos_hash_table (info)->bucketcount,
+		esdl.ld_buckets);
+
+      s = bfd_get_section_by_name (dynobj, ".dynstr");
+      BFD_ASSERT (s != NULL);
+      PUT_WORD (dynobj, s->output_section->filepos + s->output_offset,
+		esdl.ld_symbols);
+      PUT_WORD (dynobj, s->size, esdl.ld_symb_size);
+
+      /* The size of the text area is the size of the .text section
+	 rounded up to a page boundary.  FIXME: Should the page size be
+	 conditional on something?  */
+      PUT_WORD (dynobj,
+		BFD_ALIGN (obj_textsec (abfd)->size, 0x2000),
+		esdl.ld_text);
+
+      pos = sdyn->output_offset;
+      pos += sizeof esd + EXTERNAL_SUN4_DYNAMIC_DEBUGGER_SIZE;
+      if (! bfd_set_section_contents (abfd, sdyn->output_section, &esdl,
+				      pos, (bfd_size_type) sizeof esdl))
+	return FALSE;
+
+      abfd->flags |= DYNAMIC;
+    }
+
+  return TRUE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/syms.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/syms.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/syms.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/syms.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1423 @@
+/* Generic symbol-table support for the BFD library.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/*
+SECTION
+	Symbols
+
+	BFD tries to maintain as much symbol information as it can when
+	it moves information from file to file. BFD passes information
+	to applications though the <<asymbol>> structure. When the
+	application requests the symbol table, BFD reads the table in
+	the native form and translates parts of it into the internal
+	format. To maintain more than the information passed to
+	applications, some targets keep some information ``behind the
+	scenes'' in a structure only the particular back end knows
+	about. For example, the coff back end keeps the original
+	symbol table structure as well as the canonical structure when
+	a BFD is read in. On output, the coff back end can reconstruct
+	the output symbol table so that no information is lost, even
+	information unique to coff which BFD doesn't know or
+	understand. If a coff symbol table were read, but were written
+	through an a.out back end, all the coff specific information
+	would be lost. The symbol table of a BFD
+	is not necessarily read in until a canonicalize request is
+	made. Then the BFD back end fills in a table provided by the
+	application with pointers to the canonical information.  To
+	output symbols, the application provides BFD with a table of
+	pointers to pointers to <<asymbol>>s. This allows applications
+	like the linker to output a symbol as it was read, since the ``behind
+	the scenes'' information will be still available.
+@menu
+@* Reading Symbols::
+@* Writing Symbols::
+@* Mini Symbols::
+@* typedef asymbol::
+@* symbol handling functions::
+@end menu
+
+INODE
+Reading Symbols, Writing Symbols, Symbols, Symbols
+SUBSECTION
+	Reading symbols
+
+	There are two stages to reading a symbol table from a BFD:
+	allocating storage, and the actual reading process. This is an
+	excerpt from an application which reads the symbol table:
+
+|	  long storage_needed;
+|	  asymbol **symbol_table;
+|	  long number_of_symbols;
+|	  long i;
+|
+|	  storage_needed = bfd_get_symtab_upper_bound (abfd);
+|
+|         if (storage_needed < 0)
+|           FAIL
+|
+|	  if (storage_needed == 0)
+|	    return;
+|	  
+|	  symbol_table = xmalloc (storage_needed);
+|	    ...
+|	  number_of_symbols =
+|	     bfd_canonicalize_symtab (abfd, symbol_table);
+|
+|         if (number_of_symbols < 0)
+|           FAIL
+|
+|	  for (i = 0; i < number_of_symbols; i++)
+|	    process_symbol (symbol_table[i]);
+
+	All storage for the symbols themselves is in an objalloc
+	connected to the BFD; it is freed when the BFD is closed.
+
+INODE
+Writing Symbols, Mini Symbols, Reading Symbols, Symbols
+SUBSECTION
+	Writing symbols
+
+	Writing of a symbol table is automatic when a BFD open for
+	writing is closed. The application attaches a vector of
+	pointers to pointers to symbols to the BFD being written, and
+	fills in the symbol count. The close and cleanup code reads
+	through the table provided and performs all the necessary
+	operations. The BFD output code must always be provided with an
+	``owned'' symbol: one which has come from another BFD, or one
+	which has been created using <<bfd_make_empty_symbol>>.  Here is an
+	example showing the creation of a symbol table with only one element:
+
+|	#include "bfd.h"
+|	int main (void)
+|	{
+|	  bfd *abfd;
+|	  asymbol *ptrs[2];
+|	  asymbol *new;
+|
+|	  abfd = bfd_openw ("foo","a.out-sunos-big");
+|	  bfd_set_format (abfd, bfd_object);
+|	  new = bfd_make_empty_symbol (abfd);
+|	  new->name = "dummy_symbol";
+|	  new->section = bfd_make_section_old_way (abfd, ".text");
+|	  new->flags = BSF_GLOBAL;
+|	  new->value = 0x12345;
+|
+|	  ptrs[0] = new;
+|	  ptrs[1] = 0;
+|
+|	  bfd_set_symtab (abfd, ptrs, 1);
+|	  bfd_close (abfd);
+|	  return 0;
+|	}
+|
+|	./makesym
+|	nm foo
+|	00012345 A dummy_symbol
+
+	Many formats cannot represent arbitrary symbol information; for
+ 	instance, the <<a.out>> object format does not allow an
+	arbitrary number of sections. A symbol pointing to a section
+	which is not one  of <<.text>>, <<.data>> or <<.bss>> cannot
+	be described.
+
+INODE
+Mini Symbols, typedef asymbol, Writing Symbols, Symbols
+SUBSECTION
+	Mini Symbols
+
+	Mini symbols provide read-only access to the symbol table.
+	They use less memory space, but require more time to access.
+	They can be useful for tools like nm or objdump, which may
+	have to handle symbol tables of extremely large executables.
+
+	The <<bfd_read_minisymbols>> function will read the symbols
+	into memory in an internal form.  It will return a <<void *>>
+	pointer to a block of memory, a symbol count, and the size of
+	each symbol.  The pointer is allocated using <<malloc>>, and
+	should be freed by the caller when it is no longer needed.
+
+	The function <<bfd_minisymbol_to_symbol>> will take a pointer
+	to a minisymbol, and a pointer to a structure returned by
+	<<bfd_make_empty_symbol>>, and return a <<asymbol>> structure.
+	The return value may or may not be the same as the value from
+	<<bfd_make_empty_symbol>> which was passed in.
+
+*/
+
+/*
+DOCDD
+INODE
+typedef asymbol, symbol handling functions, Mini Symbols, Symbols
+
+*/
+/*
+SUBSECTION
+	typedef asymbol
+
+	An <<asymbol>> has the form:
+
+*/
+
+/*
+CODE_FRAGMENT
+
+.
+.typedef struct bfd_symbol
+.{
+.  {* A pointer to the BFD which owns the symbol. This information
+.     is necessary so that a back end can work out what additional
+.     information (invisible to the application writer) is carried
+.     with the symbol.
+.
+.     This field is *almost* redundant, since you can use section->owner
+.     instead, except that some symbols point to the global sections
+.     bfd_{abs,com,und}_section.  This could be fixed by making
+.     these globals be per-bfd (or per-target-flavor).  FIXME.  *}
+.  struct bfd *the_bfd; {* Use bfd_asymbol_bfd(sym) to access this field.  *}
+.
+.  {* The text of the symbol. The name is left alone, and not copied; the
+.     application may not alter it.  *}
+.  const char *name;
+.
+.  {* The value of the symbol.  This really should be a union of a
+.     numeric value with a pointer, since some flags indicate that
+.     a pointer to another symbol is stored here.  *}
+.  symvalue value;
+.
+.  {* Attributes of a symbol.  *}
+.#define BSF_NO_FLAGS    	0x00
+.
+.  {* The symbol has local scope; <<static>> in <<C>>. The value
+.     is the offset into the section of the data.  *}
+.#define BSF_LOCAL		(1 << 0)
+.
+.  {* The symbol has global scope; initialized data in <<C>>. The
+.     value is the offset into the section of the data.  *}
+.#define BSF_GLOBAL		(1 << 1)
+.
+.  {* The symbol has global scope and is exported. The value is
+.     the offset into the section of the data.  *}
+.#define BSF_EXPORT	BSF_GLOBAL {* No real difference.  *}
+.
+.  {* A normal C symbol would be one of:
+.     <<BSF_LOCAL>>, <<BSF_COMMON>>,  <<BSF_UNDEFINED>> or
+.     <<BSF_GLOBAL>>.  *}
+.
+.  {* The symbol is a debugging record. The value has an arbitrary
+.     meaning, unless BSF_DEBUGGING_RELOC is also set.  *}
+.#define BSF_DEBUGGING		(1 << 2)
+.
+.  {* The symbol denotes a function entry point.  Used in ELF,
+.     perhaps others someday.  *}
+.#define BSF_FUNCTION		(1 << 3)
+.
+.  {* Used by the linker.  *}
+.#define BSF_KEEP		(1 << 5)
+.#define BSF_KEEP_G		(1 << 6)
+.
+.  {* A weak global symbol, overridable without warnings by
+.     a regular global symbol of the same name.  *}
+.#define BSF_WEAK		(1 << 7)
+.
+.  {* This symbol was created to point to a section, e.g. ELF's
+.     STT_SECTION symbols.  *}
+.#define BSF_SECTION_SYM	(1 << 8)
+.
+.  {* The symbol used to be a common symbol, but now it is
+.     allocated.  *}
+.#define BSF_OLD_COMMON		(1 << 9)
+.
+.  {* In some files the type of a symbol sometimes alters its
+.     location in an output file - ie in coff a <<ISFCN>> symbol
+.     which is also <<C_EXT>> symbol appears where it was
+.     declared and not at the end of a section.  This bit is set
+.     by the target BFD part to convey this information.  *}
+.#define BSF_NOT_AT_END		(1 << 10)
+.
+.  {* Signal that the symbol is the label of constructor section.  *}
+.#define BSF_CONSTRUCTOR	(1 << 11)
+.
+.  {* Signal that the symbol is a warning symbol.  The name is a
+.     warning.  The name of the next symbol is the one to warn about;
+.     if a reference is made to a symbol with the same name as the next
+.     symbol, a warning is issued by the linker.  *}
+.#define BSF_WARNING		(1 << 12)
+.
+.  {* Signal that the symbol is indirect.  This symbol is an indirect
+.     pointer to the symbol with the same name as the next symbol.  *}
+.#define BSF_INDIRECT		(1 << 13)
+.
+.  {* BSF_FILE marks symbols that contain a file name.  This is used
+.     for ELF STT_FILE symbols.  *}
+.#define BSF_FILE		(1 << 14)
+.
+.  {* Symbol is from dynamic linking information.  *}
+.#define BSF_DYNAMIC		(1 << 15)
+.
+.  {* The symbol denotes a data object.  Used in ELF, and perhaps
+.     others someday.  *}
+.#define BSF_OBJECT		(1 << 16)
+.
+.  {* This symbol is a debugging symbol.  The value is the offset
+.     into the section of the data.  BSF_DEBUGGING should be set
+.     as well.  *}
+.#define BSF_DEBUGGING_RELOC	(1 << 17)
+.
+.  {* This symbol is thread local.  Used in ELF.  *}
+.#define BSF_THREAD_LOCAL	(1 << 18)
+.
+.  {* This symbol represents a complex relocation expression,
+.     with the expression tree serialized in the symbol name.  *}
+.#define BSF_RELC		(1 << 19)
+.
+.  {* This symbol represents a signed complex relocation expression,
+.     with the expression tree serialized in the symbol name.  *}
+.#define BSF_SRELC		(1 << 20)
+.
+.  {* This symbol was created by bfd_get_synthetic_symtab.  *}
+.#define BSF_SYNTHETIC		(1 << 21)
+.
+.  {* This symbol is an indirect code object.  Unrelated to BSF_INDIRECT.
+.     The dynamic linker will compute the value of this symbol by
+.     calling the function that it points to.  BSF_FUNCTION must
+.     also be also set.  *}
+.#define BSF_GNU_INDIRECT_FUNCTION (1 << 22)
+.  {* This symbol is a globally unique data object.  The dynamic linker
+.     will make sure that in the entire process there is just one symbol
+.     with this name and type in use.  BSF_OBJECT must also be set.  *}
+.#define BSF_GNU_UNIQUE		(1 << 23)
+.
+.  flagword flags;
+.
+.  {* A pointer to the section to which this symbol is
+.     relative.  This will always be non NULL, there are special
+.     sections for undefined and absolute symbols.  *}
+.  struct bfd_section *section;
+.
+.  {* Back end special data.  *}
+.  union
+.    {
+.      void *p;
+.      bfd_vma i;
+.    }
+.  udata;
+.}
+.asymbol;
+.
+*/
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "safe-ctype.h"
+#include "bfdlink.h"
+#include "aout/stab_gnu.h"
+
+/*
+DOCDD
+INODE
+symbol handling functions,  , typedef asymbol, Symbols
+SUBSECTION
+	Symbol handling functions
+*/
+
+/*
+FUNCTION
+	bfd_get_symtab_upper_bound
+
+DESCRIPTION
+	Return the number of bytes required to store a vector of pointers
+	to <<asymbols>> for all the symbols in the BFD @var{abfd},
+	including a terminal NULL pointer. If there are no symbols in
+	the BFD, then return 0.  If an error occurs, return -1.
+
+.#define bfd_get_symtab_upper_bound(abfd) \
+.     BFD_SEND (abfd, _bfd_get_symtab_upper_bound, (abfd))
+.
+*/
+
+/*
+FUNCTION
+	bfd_is_local_label
+
+SYNOPSIS
+        bfd_boolean bfd_is_local_label (bfd *abfd, asymbol *sym);
+
+DESCRIPTION
+	Return TRUE if the given symbol @var{sym} in the BFD @var{abfd} is
+	a compiler generated local label, else return FALSE.
+*/
+
+bfd_boolean
+bfd_is_local_label (bfd *abfd, asymbol *sym)
+{
+  /* The BSF_SECTION_SYM check is needed for IA-64, where every label that
+     starts with '.' is local.  This would accidentally catch section names
+     if we didn't reject them here.  */
+  if ((sym->flags & (BSF_GLOBAL | BSF_WEAK | BSF_FILE | BSF_SECTION_SYM)) != 0)
+    return FALSE;
+  if (sym->name == NULL)
+    return FALSE;
+  return bfd_is_local_label_name (abfd, sym->name);
+}
+
+/*
+FUNCTION
+	bfd_is_local_label_name
+
+SYNOPSIS
+        bfd_boolean bfd_is_local_label_name (bfd *abfd, const char *name);
+
+DESCRIPTION
+	Return TRUE if a symbol with the name @var{name} in the BFD
+	@var{abfd} is a compiler generated local label, else return
+	FALSE.  This just checks whether the name has the form of a
+	local label.
+
+.#define bfd_is_local_label_name(abfd, name) \
+.  BFD_SEND (abfd, _bfd_is_local_label_name, (abfd, name))
+.
+*/
+
+/*
+FUNCTION
+	bfd_is_target_special_symbol
+
+SYNOPSIS
+        bfd_boolean bfd_is_target_special_symbol (bfd *abfd, asymbol *sym);
+
+DESCRIPTION
+	Return TRUE iff a symbol @var{sym} in the BFD @var{abfd} is something
+	special to the particular target represented by the BFD.  Such symbols
+	should normally not be mentioned to the user.
+
+.#define bfd_is_target_special_symbol(abfd, sym) \
+.  BFD_SEND (abfd, _bfd_is_target_special_symbol, (abfd, sym))
+.
+*/
+
+/*
+FUNCTION
+	bfd_canonicalize_symtab
+
+DESCRIPTION
+	Read the symbols from the BFD @var{abfd}, and fills in
+	the vector @var{location} with pointers to the symbols and
+	a trailing NULL.
+	Return the actual number of symbol pointers, not
+	including the NULL.
+
+.#define bfd_canonicalize_symtab(abfd, location) \
+.  BFD_SEND (abfd, _bfd_canonicalize_symtab, (abfd, location))
+.
+*/
+
+/*
+FUNCTION
+	bfd_set_symtab
+
+SYNOPSIS
+	bfd_boolean bfd_set_symtab
+	  (bfd *abfd, asymbol **location, unsigned int count);
+
+DESCRIPTION
+	Arrange that when the output BFD @var{abfd} is closed,
+	the table @var{location} of @var{count} pointers to symbols
+	will be written.
+*/
+
+bfd_boolean
+bfd_set_symtab (bfd *abfd, asymbol **location, unsigned int symcount)
+{
+  if (abfd->format != bfd_object || bfd_read_p (abfd))
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  bfd_get_outsymbols (abfd) = location;
+  bfd_get_symcount (abfd) = symcount;
+  return TRUE;
+}
+
+/*
+FUNCTION
+	bfd_print_symbol_vandf
+
+SYNOPSIS
+	void bfd_print_symbol_vandf (bfd *abfd, void *file, asymbol *symbol);
+
+DESCRIPTION
+	Print the value and flags of the @var{symbol} supplied to the
+	stream @var{file}.
+*/
+void
+bfd_print_symbol_vandf (bfd *abfd, void *arg, asymbol *symbol)
+{
+  FILE *file = (FILE *) arg;
+
+  flagword type = symbol->flags;
+
+  if (symbol->section != NULL)
+    bfd_fprintf_vma (abfd, file, symbol->value + symbol->section->vma);
+  else
+    bfd_fprintf_vma (abfd, file, symbol->value);
+
+  /* This presumes that a symbol can not be both BSF_DEBUGGING and
+     BSF_DYNAMIC, nor more than one of BSF_FUNCTION, BSF_FILE, and
+     BSF_OBJECT.  */
+  fprintf (file, " %c%c%c%c%c%c%c",
+	   ((type & BSF_LOCAL)
+	    ? (type & BSF_GLOBAL) ? '!' : 'l'
+	    : (type & BSF_GLOBAL) ? 'g'
+	    : (type & BSF_GNU_UNIQUE) ? 'u' : ' '),
+	   (type & BSF_WEAK) ? 'w' : ' ',
+	   (type & BSF_CONSTRUCTOR) ? 'C' : ' ',
+	   (type & BSF_WARNING) ? 'W' : ' ',
+	   (type & BSF_INDIRECT) ? 'I' : (type & BSF_GNU_INDIRECT_FUNCTION) ? 'i' : ' ',
+	   (type & BSF_DEBUGGING) ? 'd' : (type & BSF_DYNAMIC) ? 'D' : ' ',
+	   ((type & BSF_FUNCTION)
+	    ? 'F'
+	    : ((type & BSF_FILE)
+	       ? 'f'
+	       : ((type & BSF_OBJECT) ? 'O' : ' '))));
+}
+
+/*
+FUNCTION
+	bfd_make_empty_symbol
+
+DESCRIPTION
+	Create a new <<asymbol>> structure for the BFD @var{abfd}
+	and return a pointer to it.
+
+	This routine is necessary because each back end has private
+	information surrounding the <<asymbol>>. Building your own
+	<<asymbol>> and pointing to it will not create the private
+	information, and will cause problems later on.
+
+.#define bfd_make_empty_symbol(abfd) \
+.  BFD_SEND (abfd, _bfd_make_empty_symbol, (abfd))
+.
+*/
+
+/*
+FUNCTION
+	_bfd_generic_make_empty_symbol
+
+SYNOPSIS
+	asymbol *_bfd_generic_make_empty_symbol (bfd *);
+
+DESCRIPTION
+	Create a new <<asymbol>> structure for the BFD @var{abfd}
+	and return a pointer to it.  Used by core file routines,
+	binary back-end and anywhere else where no private info
+	is needed.
+*/
+
+asymbol *
+_bfd_generic_make_empty_symbol (bfd *abfd)
+{
+  bfd_size_type amt = sizeof (asymbol);
+  asymbol *new_symbol = (asymbol *) bfd_zalloc (abfd, amt);
+  if (new_symbol)
+    new_symbol->the_bfd = abfd;
+  return new_symbol;
+}
+
+/*
+FUNCTION
+	bfd_make_debug_symbol
+
+DESCRIPTION
+	Create a new <<asymbol>> structure for the BFD @var{abfd},
+	to be used as a debugging symbol.  Further details of its use have
+	yet to be worked out.
+
+.#define bfd_make_debug_symbol(abfd,ptr,size) \
+.  BFD_SEND (abfd, _bfd_make_debug_symbol, (abfd, ptr, size))
+.
+*/
+
+struct section_to_type
+{
+  const char *section;
+  char type;
+};
+
+/* Map section names to POSIX/BSD single-character symbol types.
+   This table is probably incomplete.  It is sorted for convenience of
+   adding entries.  Since it is so short, a linear search is used.  */
+static const struct section_to_type stt[] =
+{
+  {".bss", 'b'},
+  {"code", 't'},		/* MRI .text */
+  {".data", 'd'},
+  {"*DEBUG*", 'N'},
+  {".debug", 'N'},              /* MSVC's .debug (non-standard debug syms) */
+  {".drectve", 'i'},            /* MSVC's .drective section */
+  {".edata", 'e'},              /* MSVC's .edata (export) section */
+  {".fini", 't'},		/* ELF fini section */
+  {".idata", 'i'},              /* MSVC's .idata (import) section */
+  {".init", 't'},		/* ELF init section */
+  {".pdata", 'p'},              /* MSVC's .pdata (stack unwind) section */
+  {".rdata", 'r'},		/* Read only data.  */
+  {".rodata", 'r'},		/* Read only data.  */
+  {".sbss", 's'},		/* Small BSS (uninitialized data).  */
+  {".scommon", 'c'},		/* Small common.  */
+  {".sdata", 'g'},		/* Small initialized data.  */
+  {".text", 't'},
+  {"vars", 'd'},		/* MRI .data */
+  {"zerovars", 'b'},		/* MRI .bss */
+  {0, 0}
+};
+
+/* Return the single-character symbol type corresponding to
+   section S, or '?' for an unknown COFF section.
+
+   Check for any leading string which matches, so .text5 returns
+   't' as well as .text */
+
+static char
+coff_section_type (const char *s)
+{
+  const struct section_to_type *t;
+
+  for (t = &stt[0]; t->section; t++)
+    if (!strncmp (s, t->section, strlen (t->section)))
+      return t->type;
+
+  return '?';
+}
+
+/* Return the single-character symbol type corresponding to section
+   SECTION, or '?' for an unknown section.  This uses section flags to
+   identify sections.
+
+   FIXME These types are unhandled: c, i, e, p.  If we handled these also,
+   we could perhaps obsolete coff_section_type.  */
+
+static char
+decode_section_type (const struct bfd_section *section)
+{
+  if (section->flags & SEC_CODE)
+    return 't';
+  if (section->flags & SEC_DATA)
+    {
+      if (section->flags & SEC_READONLY)
+	return 'r';
+      else if (section->flags & SEC_SMALL_DATA)
+	return 'g';
+      else
+	return 'd';
+    }
+  if ((section->flags & SEC_HAS_CONTENTS) == 0)
+    {
+      if (section->flags & SEC_SMALL_DATA)
+	return 's';
+      else
+	return 'b';
+    }
+  if (section->flags & SEC_DEBUGGING)
+    return 'N';
+  if ((section->flags & SEC_HAS_CONTENTS) && (section->flags & SEC_READONLY))
+    return 'n';
+
+  return '?';
+}
+
+/*
+FUNCTION
+	bfd_decode_symclass
+
+DESCRIPTION
+	Return a character corresponding to the symbol
+	class of @var{symbol}, or '?' for an unknown class.
+
+SYNOPSIS
+	int bfd_decode_symclass (asymbol *symbol);
+*/
+int
+bfd_decode_symclass (asymbol *symbol)
+{
+  char c;
+
+  if (symbol->section && bfd_is_com_section (symbol->section))
+    return 'C';
+  if (bfd_is_und_section (symbol->section))
+    {
+      if (symbol->flags & BSF_WEAK)
+	{
+	  /* If weak, determine if it's specifically an object
+	     or non-object weak.  */
+	  if (symbol->flags & BSF_OBJECT)
+	    return 'v';
+	  else
+	    return 'w';
+	}
+      else
+	return 'U';
+    }
+  if (bfd_is_ind_section (symbol->section))
+    return 'I';
+  if (symbol->flags & BSF_GNU_INDIRECT_FUNCTION)
+    return 'i';
+  if (symbol->flags & BSF_WEAK)
+    {
+      /* If weak, determine if it's specifically an object
+	 or non-object weak.  */
+      if (symbol->flags & BSF_OBJECT)
+	return 'V';
+      else
+	return 'W';
+    }
+  if (symbol->flags & BSF_GNU_UNIQUE)
+    return 'u';
+  if (!(symbol->flags & (BSF_GLOBAL | BSF_LOCAL)))
+    return '?';
+
+  if (bfd_is_abs_section (symbol->section))
+    c = 'a';
+  else if (symbol->section)
+    {
+      c = coff_section_type (symbol->section->name);
+      if (c == '?')
+	c = decode_section_type (symbol->section);
+    }
+  else
+    return '?';
+  if (symbol->flags & BSF_GLOBAL)
+    c = TOUPPER (c);
+  return c;
+
+  /* We don't have to handle these cases just yet, but we will soon:
+     N_SETV: 'v';
+     N_SETA: 'l';
+     N_SETT: 'x';
+     N_SETD: 'z';
+     N_SETB: 's';
+     N_INDR: 'i';
+     */
+}
+
+/*
+FUNCTION
+	bfd_is_undefined_symclass
+
+DESCRIPTION
+	Returns non-zero if the class symbol returned by
+	bfd_decode_symclass represents an undefined symbol.
+	Returns zero otherwise.
+
+SYNOPSIS
+	bfd_boolean bfd_is_undefined_symclass (int symclass);
+*/
+
+bfd_boolean
+bfd_is_undefined_symclass (int symclass)
+{
+  return symclass == 'U' || symclass == 'w' || symclass == 'v';
+}
+
+/*
+FUNCTION
+	bfd_symbol_info
+
+DESCRIPTION
+	Fill in the basic info about symbol that nm needs.
+	Additional info may be added by the back-ends after
+	calling this function.
+
+SYNOPSIS
+	void bfd_symbol_info (asymbol *symbol, symbol_info *ret);
+*/
+
+void
+bfd_symbol_info (asymbol *symbol, symbol_info *ret)
+{
+  ret->type = bfd_decode_symclass (symbol);
+
+  if (bfd_is_undefined_symclass (ret->type))
+    ret->value = 0;
+  else
+    ret->value = symbol->value + symbol->section->vma;
+
+  ret->name = symbol->name;
+}
+
+/*
+FUNCTION
+	bfd_copy_private_symbol_data
+
+SYNOPSIS
+	bfd_boolean bfd_copy_private_symbol_data
+	  (bfd *ibfd, asymbol *isym, bfd *obfd, asymbol *osym);
+
+DESCRIPTION
+	Copy private symbol information from @var{isym} in the BFD
+	@var{ibfd} to the symbol @var{osym} in the BFD @var{obfd}.
+	Return <<TRUE>> on success, <<FALSE>> on error.  Possible error
+	returns are:
+
+	o <<bfd_error_no_memory>> -
+	Not enough memory exists to create private data for @var{osec}.
+
+.#define bfd_copy_private_symbol_data(ibfd, isymbol, obfd, osymbol) \
+.  BFD_SEND (obfd, _bfd_copy_private_symbol_data, \
+.            (ibfd, isymbol, obfd, osymbol))
+.
+*/
+
+/* The generic version of the function which returns mini symbols.
+   This is used when the backend does not provide a more efficient
+   version.  It just uses BFD asymbol structures as mini symbols.  */
+
+long
+_bfd_generic_read_minisymbols (bfd *abfd,
+			       bfd_boolean dynamic,
+			       void **minisymsp,
+			       unsigned int *sizep)
+{
+  long storage;
+  asymbol **syms = NULL;
+  long symcount;
+
+  if (dynamic)
+    storage = bfd_get_dynamic_symtab_upper_bound (abfd);
+  else
+    storage = bfd_get_symtab_upper_bound (abfd);
+  if (storage < 0)
+    goto error_return;
+  if (storage == 0)
+    return 0;
+
+  syms = (asymbol **) bfd_malloc (storage);
+  if (syms == NULL)
+    goto error_return;
+
+  if (dynamic)
+    symcount = bfd_canonicalize_dynamic_symtab (abfd, syms);
+  else
+    symcount = bfd_canonicalize_symtab (abfd, syms);
+  if (symcount < 0)
+    goto error_return;
+
+  *minisymsp = syms;
+  *sizep = sizeof (asymbol *);
+  return symcount;
+
+ error_return:
+  bfd_set_error (bfd_error_no_symbols);
+  if (syms != NULL)
+    free (syms);
+  return -1;
+}
+
+/* The generic version of the function which converts a minisymbol to
+   an asymbol.  We don't worry about the sym argument we are passed;
+   we just return the asymbol the minisymbol points to.  */
+
+asymbol *
+_bfd_generic_minisymbol_to_symbol (bfd *abfd ATTRIBUTE_UNUSED,
+				   bfd_boolean dynamic ATTRIBUTE_UNUSED,
+				   const void *minisym,
+				   asymbol *sym ATTRIBUTE_UNUSED)
+{
+  return *(asymbol **) minisym;
+}
+
+/* Look through stabs debugging information in .stab and .stabstr
+   sections to find the source file and line closest to a desired
+   location.  This is used by COFF and ELF targets.  It sets *pfound
+   to TRUE if it finds some information.  The *pinfo field is used to
+   pass cached information in and out of this routine; this first time
+   the routine is called for a BFD, *pinfo should be NULL.  The value
+   placed in *pinfo should be saved with the BFD, and passed back each
+   time this function is called.  */
+
+/* We use a cache by default.  */
+
+#define ENABLE_CACHING
+
+/* We keep an array of indexentry structures to record where in the
+   stabs section we should look to find line number information for a
+   particular address.  */
+
+struct indexentry
+{
+  bfd_vma val;
+  bfd_byte *stab;
+  bfd_byte *str;
+  char *directory_name;
+  char *file_name;
+  char *function_name;
+};
+
+/* Compare two indexentry structures.  This is called via qsort.  */
+
+static int
+cmpindexentry (const void *a, const void *b)
+{
+  const struct indexentry *contestantA = (const struct indexentry *) a;
+  const struct indexentry *contestantB = (const struct indexentry *) b;
+
+  if (contestantA->val < contestantB->val)
+    return -1;
+  else if (contestantA->val > contestantB->val)
+    return 1;
+  else
+    return 0;
+}
+
+/* A pointer to this structure is stored in *pinfo.  */
+
+struct stab_find_info
+{
+  /* The .stab section.  */
+  asection *stabsec;
+  /* The .stabstr section.  */
+  asection *strsec;
+  /* The contents of the .stab section.  */
+  bfd_byte *stabs;
+  /* The contents of the .stabstr section.  */
+  bfd_byte *strs;
+
+  /* A table that indexes stabs by memory address.  */
+  struct indexentry *indextable;
+  /* The number of entries in indextable.  */
+  int indextablesize;
+
+#ifdef ENABLE_CACHING
+  /* Cached values to restart quickly.  */
+  struct indexentry *cached_indexentry;
+  bfd_vma cached_offset;
+  bfd_byte *cached_stab;
+  char *cached_file_name;
+#endif
+
+  /* Saved ptr to malloc'ed filename.  */
+  char *filename;
+};
+
+bfd_boolean
+_bfd_stab_section_find_nearest_line (bfd *abfd,
+				     asymbol **symbols,
+				     asection *section,
+				     bfd_vma offset,
+				     bfd_boolean *pfound,
+				     const char **pfilename,
+				     const char **pfnname,
+				     unsigned int *pline,
+				     void **pinfo)
+{
+  struct stab_find_info *info;
+  bfd_size_type stabsize, strsize;
+  bfd_byte *stab, *str;
+  bfd_byte *last_stab = NULL;
+  bfd_size_type stroff;
+  struct indexentry *indexentry;
+  char *file_name;
+  char *directory_name;
+  int saw_fun;
+  bfd_boolean saw_line, saw_func;
+
+  *pfound = FALSE;
+  *pfilename = bfd_get_filename (abfd);
+  *pfnname = NULL;
+  *pline = 0;
+
+  /* Stabs entries use a 12 byte format:
+       4 byte string table index
+       1 byte stab type
+       1 byte stab other field
+       2 byte stab desc field
+       4 byte stab value
+     FIXME: This will have to change for a 64 bit object format.
+
+     The stabs symbols are divided into compilation units.  For the
+     first entry in each unit, the type of 0, the value is the length
+     of the string table for this unit, and the desc field is the
+     number of stabs symbols for this unit.  */
+
+#define STRDXOFF (0)
+#define TYPEOFF (4)
+#define OTHEROFF (5)
+#define DESCOFF (6)
+#define VALOFF (8)
+#define STABSIZE (12)
+
+  info = (struct stab_find_info *) *pinfo;
+  if (info != NULL)
+    {
+      if (info->stabsec == NULL || info->strsec == NULL)
+	{
+	  /* No stabs debugging information.  */
+	  return TRUE;
+	}
+
+      stabsize = (info->stabsec->rawsize
+		  ? info->stabsec->rawsize
+		  : info->stabsec->size);
+      strsize = (info->strsec->rawsize
+		 ? info->strsec->rawsize
+		 : info->strsec->size);
+    }
+  else
+    {
+      long reloc_size, reloc_count;
+      arelent **reloc_vector;
+      int i;
+      char *name;
+      char *function_name;
+      bfd_size_type amt = sizeof *info;
+
+      info = (struct stab_find_info *) bfd_zalloc (abfd, amt);
+      if (info == NULL)
+	return FALSE;
+
+      /* FIXME: When using the linker --split-by-file or
+	 --split-by-reloc options, it is possible for the .stab and
+	 .stabstr sections to be split.  We should handle that.  */
+
+      info->stabsec = bfd_get_section_by_name (abfd, ".stab");
+      info->strsec = bfd_get_section_by_name (abfd, ".stabstr");
+
+      if (info->stabsec == NULL || info->strsec == NULL)
+	{
+	  /* Try SOM section names.  */
+	  info->stabsec = bfd_get_section_by_name (abfd, "$GDB_SYMBOLS$");
+	  info->strsec  = bfd_get_section_by_name (abfd, "$GDB_STRINGS$");
+  
+	  if (info->stabsec == NULL || info->strsec == NULL)
+	    {
+	      /* No stabs debugging information.  Set *pinfo so that we
+		 can return quickly in the info != NULL case above.  */
+	      *pinfo = info;
+	      return TRUE;
+	    }
+	}
+
+      stabsize = (info->stabsec->rawsize
+		  ? info->stabsec->rawsize
+		  : info->stabsec->size);
+      strsize = (info->strsec->rawsize
+		 ? info->strsec->rawsize
+		 : info->strsec->size);
+
+      info->stabs = (bfd_byte *) bfd_alloc (abfd, stabsize);
+      info->strs = (bfd_byte *) bfd_alloc (abfd, strsize);
+      if (info->stabs == NULL || info->strs == NULL)
+	return FALSE;
+
+      if (! bfd_get_section_contents (abfd, info->stabsec, info->stabs,
+				      0, stabsize)
+	  || ! bfd_get_section_contents (abfd, info->strsec, info->strs,
+					 0, strsize))
+	return FALSE;
+
+      /* If this is a relocatable object file, we have to relocate
+	 the entries in .stab.  This should always be simple 32 bit
+	 relocations against symbols defined in this object file, so
+	 this should be no big deal.  */
+      reloc_size = bfd_get_reloc_upper_bound (abfd, info->stabsec);
+      if (reloc_size < 0)
+	return FALSE;
+      reloc_vector = (arelent **) bfd_malloc (reloc_size);
+      if (reloc_vector == NULL && reloc_size != 0)
+	return FALSE;
+      reloc_count = bfd_canonicalize_reloc (abfd, info->stabsec, reloc_vector,
+					    symbols);
+      if (reloc_count < 0)
+	{
+	  if (reloc_vector != NULL)
+	    free (reloc_vector);
+	  return FALSE;
+	}
+      if (reloc_count > 0)
+	{
+	  arelent **pr;
+
+	  for (pr = reloc_vector; *pr != NULL; pr++)
+	    {
+	      arelent *r;
+	      unsigned long val;
+	      asymbol *sym;
+
+	      r = *pr;
+	      /* Ignore R_*_NONE relocs.  */
+	      if (r->howto->dst_mask == 0)
+		continue;
+
+	      if (r->howto->rightshift != 0
+		  || r->howto->size != 2
+		  || r->howto->bitsize != 32
+		  || r->howto->pc_relative
+		  || r->howto->bitpos != 0
+		  || r->howto->dst_mask != 0xffffffff)
+		{
+		  (*_bfd_error_handler)
+		    (_("Unsupported .stab relocation"));
+		  bfd_set_error (bfd_error_invalid_operation);
+		  if (reloc_vector != NULL)
+		    free (reloc_vector);
+		  return FALSE;
+		}
+
+	      val = bfd_get_32 (abfd, info->stabs + r->address);
+	      val &= r->howto->src_mask;
+	      sym = *r->sym_ptr_ptr;
+	      val += sym->value + sym->section->vma + r->addend;
+	      bfd_put_32 (abfd, (bfd_vma) val, info->stabs + r->address);
+	    }
+	}
+
+      if (reloc_vector != NULL)
+	free (reloc_vector);
+
+      /* First time through this function, build a table matching
+	 function VM addresses to stabs, then sort based on starting
+	 VM address.  Do this in two passes: once to count how many
+	 table entries we'll need, and a second to actually build the
+	 table.  */
+
+      info->indextablesize = 0;
+      saw_fun = 1;
+      for (stab = info->stabs; stab < info->stabs + stabsize; stab += STABSIZE)
+	{
+	  if (stab[TYPEOFF] == (bfd_byte) N_SO)
+	    {
+	      /* N_SO with null name indicates EOF */
+	      if (bfd_get_32 (abfd, stab + STRDXOFF) == 0)
+		continue;
+
+	      /* if we did not see a function def, leave space for one.  */
+	      if (saw_fun == 0)
+		++info->indextablesize;
+
+	      saw_fun = 0;
+
+	      /* two N_SO's in a row is a filename and directory. Skip */
+	      if (stab + STABSIZE < info->stabs + stabsize
+		  && *(stab + STABSIZE + TYPEOFF) == (bfd_byte) N_SO)
+		{
+		  stab += STABSIZE;
+		}
+	    }
+	  else if (stab[TYPEOFF] == (bfd_byte) N_FUN)
+	    {
+	      saw_fun = 1;
+	      ++info->indextablesize;
+	    }
+	}
+
+      if (saw_fun == 0)
+	++info->indextablesize;
+
+      if (info->indextablesize == 0)
+	return TRUE;
+      ++info->indextablesize;
+
+      amt = info->indextablesize;
+      amt *= sizeof (struct indexentry);
+      info->indextable = (struct indexentry *) bfd_alloc (abfd, amt);
+      if (info->indextable == NULL)
+	return FALSE;
+
+      file_name = NULL;
+      directory_name = NULL;
+      saw_fun = 1;
+
+      for (i = 0, stroff = 0, stab = info->stabs, str = info->strs;
+	   i < info->indextablesize && stab < info->stabs + stabsize;
+	   stab += STABSIZE)
+	{
+	  switch (stab[TYPEOFF])
+	    {
+	    case 0:
+	      /* This is the first entry in a compilation unit.  */
+	      if ((bfd_size_type) ((info->strs + strsize) - str) < stroff)
+		break;
+	      str += stroff;
+	      stroff = bfd_get_32 (abfd, stab + VALOFF);
+	      break;
+
+	    case N_SO:
+	      /* The main file name.  */
+
+	      /* The following code creates a new indextable entry with
+	         a NULL function name if there were no N_FUNs in a file.
+	         Note that a N_SO without a file name is an EOF and
+	         there could be 2 N_SO following it with the new filename
+	         and directory.  */
+	      if (saw_fun == 0)
+		{
+		  info->indextable[i].val = bfd_get_32 (abfd, last_stab + VALOFF);
+		  info->indextable[i].stab = last_stab;
+		  info->indextable[i].str = str;
+		  info->indextable[i].directory_name = directory_name;
+		  info->indextable[i].file_name = file_name;
+		  info->indextable[i].function_name = NULL;
+		  ++i;
+		}
+	      saw_fun = 0;
+
+	      file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF);
+	      if (*file_name == '\0')
+		{
+		  directory_name = NULL;
+		  file_name = NULL;
+		  saw_fun = 1;
+		}
+	      else
+		{
+		  last_stab = stab;
+		  if (stab + STABSIZE >= info->stabs + stabsize
+		      || *(stab + STABSIZE + TYPEOFF) != (bfd_byte) N_SO)
+		    {
+		      directory_name = NULL;
+		    }
+		  else
+		    {
+		      /* Two consecutive N_SOs are a directory and a
+			 file name.  */
+		      stab += STABSIZE;
+		      directory_name = file_name;
+		      file_name = ((char *) str
+				   + bfd_get_32 (abfd, stab + STRDXOFF));
+		    }
+		}
+	      break;
+
+	    case N_SOL:
+	      /* The name of an include file.  */
+	      file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF);
+	      break;
+
+	    case N_FUN:
+	      /* A function name.  */
+	      saw_fun = 1;
+	      name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF);
+
+	      if (*name == '\0')
+		name = NULL;
+
+	      function_name = name;
+
+	      if (name == NULL)
+		continue;
+
+	      info->indextable[i].val = bfd_get_32 (abfd, stab + VALOFF);
+	      info->indextable[i].stab = stab;
+	      info->indextable[i].str = str;
+	      info->indextable[i].directory_name = directory_name;
+	      info->indextable[i].file_name = file_name;
+	      info->indextable[i].function_name = function_name;
+	      ++i;
+	      break;
+	    }
+	}
+
+      if (saw_fun == 0)
+	{
+	  info->indextable[i].val = bfd_get_32 (abfd, last_stab + VALOFF);
+	  info->indextable[i].stab = last_stab;
+	  info->indextable[i].str = str;
+	  info->indextable[i].directory_name = directory_name;
+	  info->indextable[i].file_name = file_name;
+	  info->indextable[i].function_name = NULL;
+	  ++i;
+	}
+
+      info->indextable[i].val = (bfd_vma) -1;
+      info->indextable[i].stab = info->stabs + stabsize;
+      info->indextable[i].str = str;
+      info->indextable[i].directory_name = NULL;
+      info->indextable[i].file_name = NULL;
+      info->indextable[i].function_name = NULL;
+      ++i;
+
+      info->indextablesize = i;
+      qsort (info->indextable, (size_t) i, sizeof (struct indexentry),
+	     cmpindexentry);
+
+      *pinfo = info;
+    }
+
+  /* We are passed a section relative offset.  The offsets in the
+     stabs information are absolute.  */
+  offset += bfd_get_section_vma (abfd, section);
+
+#ifdef ENABLE_CACHING
+  if (info->cached_indexentry != NULL
+      && offset >= info->cached_offset
+      && offset < (info->cached_indexentry + 1)->val)
+    {
+      stab = info->cached_stab;
+      indexentry = info->cached_indexentry;
+      file_name = info->cached_file_name;
+    }
+  else
+#endif
+    {
+      long low, high;
+      long mid = -1;
+
+      /* Cache non-existent or invalid.  Do binary search on
+         indextable.  */
+      indexentry = NULL;
+
+      low = 0;
+      high = info->indextablesize - 1;
+      while (low != high)
+	{
+	  mid = (high + low) / 2;
+	  if (offset >= info->indextable[mid].val
+	      && offset < info->indextable[mid + 1].val)
+	    {
+	      indexentry = &info->indextable[mid];
+	      break;
+	    }
+
+	  if (info->indextable[mid].val > offset)
+	    high = mid;
+	  else
+	    low = mid + 1;
+	}
+
+      if (indexentry == NULL)
+	return TRUE;
+
+      stab = indexentry->stab + STABSIZE;
+      file_name = indexentry->file_name;
+    }
+
+  directory_name = indexentry->directory_name;
+  str = indexentry->str;
+
+  saw_line = FALSE;
+  saw_func = FALSE;
+  for (; stab < (indexentry+1)->stab; stab += STABSIZE)
+    {
+      bfd_boolean done;
+      bfd_vma val;
+
+      done = FALSE;
+
+      switch (stab[TYPEOFF])
+	{
+	case N_SOL:
+	  /* The name of an include file.  */
+	  val = bfd_get_32 (abfd, stab + VALOFF);
+	  if (val <= offset)
+	    {
+	      file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF);
+	      *pline = 0;
+	    }
+	  break;
+
+	case N_SLINE:
+	case N_DSLINE:
+	case N_BSLINE:
+	  /* A line number.  If the function was specified, then the value
+	     is relative to the start of the function.  Otherwise, the
+	     value is an absolute address.  */
+	  val = ((indexentry->function_name ? indexentry->val : 0)
+		 + bfd_get_32 (abfd, stab + VALOFF));
+	  /* If this line starts before our desired offset, or if it's
+	     the first line we've been able to find, use it.  The
+	     !saw_line check works around a bug in GCC 2.95.3, which emits
+	     the first N_SLINE late.  */
+	  if (!saw_line || val <= offset)
+	    {
+	      *pline = bfd_get_16 (abfd, stab + DESCOFF);
+
+#ifdef ENABLE_CACHING
+	      info->cached_stab = stab;
+	      info->cached_offset = val;
+	      info->cached_file_name = file_name;
+	      info->cached_indexentry = indexentry;
+#endif
+	    }
+	  if (val > offset)
+	    done = TRUE;
+	  saw_line = TRUE;
+	  break;
+
+	case N_FUN:
+	case N_SO:
+	  if (saw_func || saw_line)
+	    done = TRUE;
+	  saw_func = TRUE;
+	  break;
+	}
+
+      if (done)
+	break;
+    }
+
+  *pfound = TRUE;
+
+  if (file_name == NULL || IS_ABSOLUTE_PATH (file_name)
+      || directory_name == NULL)
+    *pfilename = file_name;
+  else
+    {
+      size_t dirlen;
+
+      dirlen = strlen (directory_name);
+      if (info->filename == NULL
+	  || filename_ncmp (info->filename, directory_name, dirlen) != 0
+	  || filename_cmp (info->filename + dirlen, file_name) != 0)
+	{
+	  size_t len;
+
+	  /* Don't free info->filename here.  objdump and other
+	     apps keep a copy of a previously returned file name
+	     pointer.  */
+	  len = strlen (file_name) + 1;
+	  info->filename = (char *) bfd_alloc (abfd, dirlen + len);
+	  if (info->filename == NULL)
+	    return FALSE;
+	  memcpy (info->filename, directory_name, dirlen);
+	  memcpy (info->filename + dirlen, file_name, len);
+	}
+
+      *pfilename = info->filename;
+    }
+
+  if (indexentry->function_name != NULL)
+    {
+      char *s;
+
+      /* This will typically be something like main:F(0,1), so we want
+         to clobber the colon.  It's OK to change the name, since the
+         string is in our own local storage anyhow.  */
+      s = strchr (indexentry->function_name, ':');
+      if (s != NULL)
+	*s = '\0';
+
+      *pfnname = indexentry->function_name;
+    }
+
+  return TRUE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/sysdep.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/sysdep.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/sysdep.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/sysdep.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,202 @@
+/* sysdep.h -- handle host dependencies for the BFD library
+   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2005, 2007, 2009
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef BFD_SYSDEP_H
+#define BFD_SYSDEP_H
+
+#include "config.h"
+
+#include "ansidecl.h"
+
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+#if !(defined(errno) || defined(_MSC_VER) && defined(_INC_ERRNO))
+extern int errno;
+#endif
+
+#ifdef STRING_WITH_STRINGS
+#include <string.h>
+#include <strings.h>
+#else
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#else
+extern char *strchr ();
+extern char *strrchr ();
+#endif
+#endif
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef TIME_WITH_SYS_TIME
+#include <sys/time.h>
+#include <time.h>
+#else
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef USE_BINARY_FOPEN
+#include "fopen-bin.h"
+#else
+#include "fopen-same.h"
+#endif
+
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#else
+#ifdef HAVE_SYS_FILE_H
+#include <sys/file.h>
+#endif
+#endif
+
+#ifndef O_RDONLY
+#define O_RDONLY 0
+#endif
+#ifndef O_WRONLY
+#define O_WRONLY 1
+#endif
+#ifndef O_RDWR
+#define O_RDWR 2
+#endif
+#ifndef O_ACCMODE
+#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
+#endif
+
+#ifndef SEEK_SET
+#define SEEK_SET 0
+#endif
+#ifndef SEEK_CUR
+#define SEEK_CUR 1
+#endif
+
+#include "filenames.h"
+
+#if !HAVE_DECL_FFS
+extern int ffs (int);
+#endif
+
+#if !HAVE_DECL_FREE
+extern void free ();
+#endif
+
+#if !HAVE_DECL_GETENV
+extern char *getenv ();
+#endif
+
+#if !HAVE_DECL_MALLOC
+extern PTR malloc ();
+#endif
+
+#if !HAVE_DECL_REALLOC
+extern PTR realloc ();
+#endif
+
+#if !HAVE_DECL_STPCPY
+extern char *stpcpy (char *__dest, const char *__src);
+#endif
+
+#if !HAVE_DECL_STRSTR
+extern char *strstr ();
+#endif
+
+#ifdef HAVE_FTELLO
+#if !HAVE_DECL_FTELLO
+extern off_t ftello (FILE *stream);
+#endif
+#endif
+
+#ifdef HAVE_FTELLO64
+#if !HAVE_DECL_FTELLO64
+extern off64_t ftello64 (FILE *stream);
+#endif
+#endif
+
+#ifdef HAVE_FSEEKO
+#if !HAVE_DECL_FSEEKO
+extern int fseeko (FILE *stream, off_t offset, int whence);
+#endif
+#endif
+
+#ifdef HAVE_FSEEKO64
+#if !HAVE_DECL_FSEEKO64
+extern int fseeko64 (FILE *stream, off64_t offset, int whence);
+#endif
+#endif
+
+/* Define offsetof for those systems which lack it */
+
+#ifndef offsetof
+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#endif
+
+#ifdef ENABLE_NLS
+#include <libintl.h>
+/* Note the use of dgetext() and PACKAGE here, rather than gettext().
+
+   This is because the code in this directory is used to build a library which
+   will be linked with code in other directories to form programs.  We want to
+   maintain a seperate translation file for this directory however, rather
+   than being forced to merge it with that of any program linked to libbfd.
+   This is a library, so it cannot depend on the catalog currently loaded.
+
+   In order to do this, we have to make sure that when we extract messages we
+   use the OPCODES domain rather than the domain of the program that included
+   the bfd library, (eg OBJDUMP).  Hence we use dgettext (PACKAGE, String)
+   and define PACKAGE to be 'bfd'.  (See the code in configure).  */
+#define _(String) dgettext (PACKAGE, String)
+#ifdef gettext_noop
+#define N_(String) gettext_noop (String)
+#else
+#define N_(String) (String)
+#endif
+#else
+# define gettext(Msgid) (Msgid)
+# define dgettext(Domainname, Msgid) (Msgid)
+# define dcgettext(Domainname, Msgid, Category) (Msgid)
+# define textdomain(Domainname) while (0) /* nothing */
+# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */
+# define _(String) (String)
+# define N_(String) (String)
+#endif
+
+#endif /* ! defined (BFD_SYSDEP_H) */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/targets.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/targets.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/targets.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/targets.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1247 @@
+/* Generic target-file-type support for the BFD library.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "fnmatch.h"
+
+/*
+   It's okay to see some:
+#if 0
+   directives in this source file, as targets.c uses them to exclude
+   certain BFD vectors.  This comment is specially formatted to catch
+   users who grep for ^#if 0, so please keep it this way!
+*/
+
+/*
+SECTION
+	Targets
+
+DESCRIPTION
+	Each port of BFD to a different machine requires the creation
+	of a target back end. All the back end provides to the root
+	part of BFD is a structure containing pointers to functions
+	which perform certain low level operations on files. BFD
+	translates the applications's requests through a pointer into
+	calls to the back end routines.
+
+	When a file is opened with <<bfd_openr>>, its format and
+	target are unknown. BFD uses various mechanisms to determine
+	how to interpret the file. The operations performed are:
+
+	o Create a BFD by calling the internal routine
+	<<_bfd_new_bfd>>, then call <<bfd_find_target>> with the
+	target string supplied to <<bfd_openr>> and the new BFD pointer.
+
+	o If a null target string was provided to <<bfd_find_target>>,
+	look up the environment variable <<GNUTARGET>> and use
+	that as the target string.
+
+	o If the target string is still <<NULL>>, or the target string is
+	<<default>>, then use the first item in the target vector
+	as the target type, and set <<target_defaulted>> in the BFD to
+	cause <<bfd_check_format>> to loop through all the targets.
+	@xref{bfd_target}.  @xref{Formats}.
+
+	o Otherwise, inspect the elements in the target vector
+	one by one, until a match on target name is found. When found,
+	use it.
+
+	o Otherwise return the error <<bfd_error_invalid_target>> to
+	<<bfd_openr>>.
+
+	o <<bfd_openr>> attempts to open the file using
+	<<bfd_open_file>>, and returns the BFD.
+
+	Once the BFD has been opened and the target selected, the file
+	format may be determined. This is done by calling
+	<<bfd_check_format>> on the BFD with a suggested format.
+	If <<target_defaulted>> has been set, each possible target
+	type is tried to see if it recognizes the specified format.
+	<<bfd_check_format>> returns <<TRUE>> when the caller guesses right.
+@menu
+@* bfd_target::
+@end menu
+*/
+
+/*
+
+INODE
+	bfd_target,  , Targets, Targets
+DOCDD
+SUBSECTION
+	bfd_target
+
+DESCRIPTION
+	This structure contains everything that BFD knows about a
+	target. It includes things like its byte order, name, and which
+	routines to call to do various operations.
+
+	Every BFD points to a target structure with its <<xvec>>
+	member.
+
+	The macros below are used to dispatch to functions through the
+	<<bfd_target>> vector. They are used in a number of macros further
+	down in @file{bfd.h}, and are also used when calling various
+	routines by hand inside the BFD implementation.  The @var{arglist}
+	argument must be parenthesized; it contains all the arguments
+	to the called function.
+
+	They make the documentation (more) unpleasant to read, so if
+	someone wants to fix this and not break the above, please do.
+
+.#define BFD_SEND(bfd, message, arglist) \
+.  ((*((bfd)->xvec->message)) arglist)
+.
+.#ifdef DEBUG_BFD_SEND
+.#undef BFD_SEND
+.#define BFD_SEND(bfd, message, arglist) \
+.  (((bfd) && (bfd)->xvec && (bfd)->xvec->message) ? \
+.    ((*((bfd)->xvec->message)) arglist) : \
+.    (bfd_assert (__FILE__,__LINE__), NULL))
+.#endif
+
+	For operations which index on the BFD format:
+
+.#define BFD_SEND_FMT(bfd, message, arglist) \
+.  (((bfd)->xvec->message[(int) ((bfd)->format)]) arglist)
+.
+.#ifdef DEBUG_BFD_SEND
+.#undef BFD_SEND_FMT
+.#define BFD_SEND_FMT(bfd, message, arglist) \
+.  (((bfd) && (bfd)->xvec && (bfd)->xvec->message) ? \
+.   (((bfd)->xvec->message[(int) ((bfd)->format)]) arglist) : \
+.   (bfd_assert (__FILE__,__LINE__), NULL))
+.#endif
+.
+	This is the structure which defines the type of BFD this is.  The
+	<<xvec>> member of the struct <<bfd>> itself points here.  Each
+	module that implements access to a different target under BFD,
+	defines one of these.
+
+	FIXME, these names should be rationalised with the names of
+	the entry points which call them. Too bad we can't have one
+	macro to define them both!
+
+.enum bfd_flavour
+.{
+.  bfd_target_unknown_flavour,
+.  bfd_target_srec_flavour,
+.  bfd_target_ihex_flavour,
+.  bfd_target_asxxxx_flavour
+.};
+.
+.enum bfd_endian { BFD_ENDIAN_BIG, BFD_ENDIAN_LITTLE, BFD_ENDIAN_UNKNOWN };
+.
+.{* Forward declaration.  *}
+.typedef struct bfd_link_info _bfd_link_info;
+.
+.{* Forward declaration.  *}
+.typedef struct flag_info flag_info;
+.
+.typedef struct bfd_target
+.{
+.  {* Identifies the kind of target, e.g., SunOS4, Ultrix, etc.  *}
+.  char *name;
+.
+. {* The "flavour" of a back end is a general indication about
+.    the contents of a file.  *}
+.  enum bfd_flavour flavour;
+.
+.  {* The order of bytes within the data area of a file.  *}
+.  enum bfd_endian byteorder;
+.
+. {* The order of bytes within the header parts of a file.  *}
+.  enum bfd_endian header_byteorder;
+.
+.  {* A mask of all the flags which an executable may have set -
+.     from the set <<BFD_NO_FLAGS>>, <<HAS_RELOC>>, ...<<D_PAGED>>.  *}
+.  flagword object_flags;
+.
+. {* A mask of all the flags which a section may have set - from
+.    the set <<SEC_NO_FLAGS>>, <<SEC_ALLOC>>, ...<<SET_NEVER_LOAD>>.  *}
+.  flagword section_flags;
+.
+. {* The character normally found at the front of a symbol.
+.    (if any), perhaps `_'.  *}
+.  char symbol_leading_char;
+.
+. {* The pad character for file names within an archive header.  *}
+.  char ar_pad_char;
+.
+.  {* The maximum number of characters in an archive header.  *}
+.  unsigned char ar_max_namelen;
+.
+.  {* How well this target matches, used to select between various
+.     possible targets when more than one target matches.  *}
+.  unsigned char match_priority;
+.
+.  {* Entries for byte swapping for data. These are different from the
+.     other entry points, since they don't take a BFD as the first argument.
+.     Certain other handlers could do the same.  *}
+.  bfd_uint64_t   (*bfd_getx64) (const void *);
+.  bfd_int64_t    (*bfd_getx_signed_64) (const void *);
+.  void           (*bfd_putx64) (bfd_uint64_t, void *);
+.  bfd_vma        (*bfd_getx32) (const void *);
+.  bfd_signed_vma (*bfd_getx_signed_32) (const void *);
+.  void           (*bfd_putx32) (bfd_vma, void *);
+.  bfd_vma        (*bfd_getx16) (const void *);
+.  bfd_signed_vma (*bfd_getx_signed_16) (const void *);
+.  void           (*bfd_putx16) (bfd_vma, void *);
+.
+.  {* Byte swapping for the headers.  *}
+.  bfd_uint64_t   (*bfd_h_getx64) (const void *);
+.  bfd_int64_t    (*bfd_h_getx_signed_64) (const void *);
+.  void           (*bfd_h_putx64) (bfd_uint64_t, void *);
+.  bfd_vma        (*bfd_h_getx32) (const void *);
+.  bfd_signed_vma (*bfd_h_getx_signed_32) (const void *);
+.  void           (*bfd_h_putx32) (bfd_vma, void *);
+.  bfd_vma        (*bfd_h_getx16) (const void *);
+.  bfd_signed_vma (*bfd_h_getx_signed_16) (const void *);
+.  void           (*bfd_h_putx16) (bfd_vma, void *);
+.
+.  {* Format dependent routines: these are vectors of entry points
+.     within the target vector structure, one for each format to check.  *}
+.
+.  {* Check the format of a file being read.  Return a <<bfd_target *>> or zero.  *}
+.  const struct bfd_target *(*_bfd_check_format[bfd_type_end]) (bfd *);
+.
+.  {* Set the format of a file being written.  *}
+.  bfd_boolean (*_bfd_set_format[bfd_type_end]) (bfd *);
+.
+.  {* Write cached information into a file being written, at <<bfd_close>>.  *}
+.  bfd_boolean (*_bfd_write_contents[bfd_type_end]) (bfd *);
+.
+The general target vector.  These vectors are initialized using the
+BFD_JUMP_TABLE macros.
+.
+.  {* Generic entry points.  *}
+.#define BFD_JUMP_TABLE_GENERIC(NAME) \
+.  NAME##_close_and_cleanup, \
+.  NAME##_bfd_free_cached_info, \
+.  NAME##_new_section_hook, \
+.  NAME##_get_section_contents, \
+.  NAME##_get_section_contents_in_window
+.
+.  {* Called when the BFD is being closed to do any necessary cleanup.  *}
+.  bfd_boolean (*_close_and_cleanup) (bfd *);
+.  {* Ask the BFD to free all cached information.  *}
+.  bfd_boolean (*_bfd_free_cached_info) (bfd *);
+.  {* Called when a new section is created.  *}
+.  bfd_boolean (*_new_section_hook) (bfd *, sec_ptr);
+.  {* Read the contents of a section.  *}
+.  bfd_boolean (*_bfd_get_section_contents)
+.    (bfd *, sec_ptr, void *, file_ptr, bfd_size_type);
+.  bfd_boolean (*_bfd_get_section_contents_in_window)
+.    (bfd *, sec_ptr, bfd_window *, file_ptr, bfd_size_type);
+.
+.  {* Entry points to copy private data.  *}
+.#define BFD_JUMP_TABLE_COPY(NAME) \
+.  NAME##_bfd_copy_private_bfd_data, \
+.  NAME##_bfd_merge_private_bfd_data, \
+.  _bfd_generic_init_private_section_data, \
+.  NAME##_bfd_copy_private_section_data, \
+.  NAME##_bfd_copy_private_symbol_data, \
+.  NAME##_bfd_copy_private_header_data, \
+.  NAME##_bfd_set_private_flags, \
+.  NAME##_bfd_print_private_bfd_data
+.
+.  {* Called to copy BFD general private data from one object file
+.     to another.  *}
+.  bfd_boolean (*_bfd_copy_private_bfd_data) (bfd *, bfd *);
+.  {* Called to merge BFD general private data from one object file
+.     to a common output file when linking.  *}
+.  bfd_boolean (*_bfd_merge_private_bfd_data) (bfd *, bfd *);
+.  {* Called to initialize BFD private section data from one object file
+.     to another.  *}
+.#define bfd_init_private_section_data(ibfd, isec, obfd, osec, link_info) \
+.  BFD_SEND (obfd, _bfd_init_private_section_data, (ibfd, isec, obfd, osec, link_info))
+.  bfd_boolean (*_bfd_init_private_section_data)
+.    (bfd *, sec_ptr, bfd *, sec_ptr, struct bfd_link_info *);
+.  {* Called to copy BFD private section data from one object file
+.     to another.  *}
+.  bfd_boolean (*_bfd_copy_private_section_data)
+.    (bfd *, sec_ptr, bfd *, sec_ptr);
+.  {* Called to copy BFD private symbol data from one symbol
+.     to another.  *}
+.  bfd_boolean (*_bfd_copy_private_symbol_data)
+.    (bfd *, asymbol *, bfd *, asymbol *);
+.  {* Called to copy BFD private header data from one object file
+.     to another.  *}
+.  bfd_boolean (*_bfd_copy_private_header_data)
+.    (bfd *, bfd *);
+.  {* Called to set private backend flags.  *}
+.  bfd_boolean (*_bfd_set_private_flags) (bfd *, flagword);
+.
+.  {* Called to print private BFD data.  *}
+.  bfd_boolean (*_bfd_print_private_bfd_data) (bfd *, void *);
+.
+.  {* Core file entry points.  *}
+.#define BFD_JUMP_TABLE_CORE(NAME) \
+.  NAME##_core_file_failing_command, \
+.  NAME##_core_file_failing_signal, \
+.  NAME##_core_file_matches_executable_p, \
+.  NAME##_core_file_pid
+.
+.  char *      (*_core_file_failing_command) (bfd *);
+.  int         (*_core_file_failing_signal) (bfd *);
+.  bfd_boolean (*_core_file_matches_executable_p) (bfd *, bfd *);
+.  int         (*_core_file_pid) (bfd *);
+.
+.  {* Archive entry points.  *}
+.#define BFD_JUMP_TABLE_ARCHIVE(NAME) \
+.  NAME##_slurp_armap, \
+.  NAME##_slurp_extended_name_table, \
+.  NAME##_construct_extended_name_table, \
+.  NAME##_truncate_arname, \
+.  NAME##_write_armap, \
+.  NAME##_read_ar_hdr, \
+.  NAME##_write_ar_hdr, \
+.  NAME##_openr_next_archived_file, \
+.  NAME##_get_elt_at_index, \
+.  NAME##_generic_stat_arch_elt, \
+.  NAME##_update_armap_timestamp
+.
+.  bfd_boolean (*_bfd_slurp_armap) (bfd *);
+.  bfd_boolean (*_bfd_slurp_extended_name_table) (bfd *);
+.  bfd_boolean (*_bfd_construct_extended_name_table)
+.    (bfd *, char **, bfd_size_type *, const char **);
+.  void        (*_bfd_truncate_arname) (bfd *, const char *, char *);
+.  bfd_boolean (*write_armap)
+.    (bfd *, unsigned int, struct orl *, unsigned int, int);
+.  void *      (*_bfd_read_ar_hdr_fn) (bfd *);
+.  bfd_boolean (*_bfd_write_ar_hdr_fn) (bfd *, bfd *);
+.  bfd *       (*openr_next_archived_file) (bfd *, bfd *);
+.#define bfd_get_elt_at_index(b,i) BFD_SEND (b, _bfd_get_elt_at_index, (b,i))
+.  bfd *       (*_bfd_get_elt_at_index) (bfd *, symindex);
+.  int         (*_bfd_stat_arch_elt) (bfd *, struct stat *);
+.  bfd_boolean (*_bfd_update_armap_timestamp) (bfd *);
+.
+.  {* Entry points used for symbols.  *}
+.#define BFD_JUMP_TABLE_SYMBOLS(NAME) \
+.  NAME##_get_symtab_upper_bound, \
+.  NAME##_canonicalize_symtab, \
+.  NAME##_make_empty_symbol, \
+.  NAME##_print_symbol, \
+.  NAME##_get_symbol_info, \
+.  NAME##_bfd_is_local_label_name, \
+.  NAME##_bfd_is_target_special_symbol, \
+.  NAME##_get_lineno, \
+.  NAME##_find_nearest_line, \
+.  _bfd_generic_find_line, \
+.  NAME##_find_inliner_info, \
+.  NAME##_bfd_make_debug_symbol, \
+.  NAME##_read_minisymbols, \
+.  NAME##_minisymbol_to_symbol
+.
+.  long        (*_bfd_get_symtab_upper_bound) (bfd *);
+.  long        (*_bfd_canonicalize_symtab)
+.    (bfd *, struct bfd_symbol **);
+.  struct bfd_symbol *
+.              (*_bfd_make_empty_symbol) (bfd *);
+.  void        (*_bfd_print_symbol)
+.    (bfd *, void *, struct bfd_symbol *, bfd_print_symbol_type);
+.#define bfd_print_symbol(b,p,s,e) BFD_SEND (b, _bfd_print_symbol, (b,p,s,e))
+.  void        (*_bfd_get_symbol_info)
+.    (bfd *, struct bfd_symbol *, symbol_info *);
+.#define bfd_get_symbol_info(b,p,e) BFD_SEND (b, _bfd_get_symbol_info, (b,p,e))
+.  bfd_boolean (*_bfd_is_local_label_name) (bfd *, const char *);
+.  bfd_boolean (*_bfd_is_target_special_symbol) (bfd *, asymbol *);
+.  alent *     (*_get_lineno) (bfd *, struct bfd_symbol *);
+.  bfd_boolean (*_bfd_find_nearest_line)
+.    (bfd *, struct bfd_section *, struct bfd_symbol **, bfd_vma,
+.     const char **, const char **, unsigned int *);
+.  bfd_boolean (*_bfd_find_line)
+.    (bfd *, struct bfd_symbol **, struct bfd_symbol *,
+.     const char **, unsigned int *);
+.  bfd_boolean (*_bfd_find_inliner_info)
+.    (bfd *, const char **, const char **, unsigned int *);
+. {* Back-door to allow format-aware applications to create debug symbols
+.    while using BFD for everything else.  Currently used by the assembler
+.    when creating COFF files.  *}
+.  asymbol *   (*_bfd_make_debug_symbol)
+.    (bfd *, void *, unsigned long size);
+.#define bfd_read_minisymbols(b, d, m, s) \
+.  BFD_SEND (b, _read_minisymbols, (b, d, m, s))
+.  long        (*_read_minisymbols)
+.    (bfd *, bfd_boolean, void **, unsigned int *);
+.#define bfd_minisymbol_to_symbol(b, d, m, f) \
+.  BFD_SEND (b, _minisymbol_to_symbol, (b, d, m, f))
+.  asymbol *   (*_minisymbol_to_symbol)
+.    (bfd *, bfd_boolean, const void *, asymbol *);
+.
+.  {* Routines for relocs.  *}
+.#define BFD_JUMP_TABLE_RELOCS(NAME) \
+.  NAME##_get_reloc_upper_bound, \
+.  NAME##_canonicalize_reloc, \
+.  NAME##_bfd_reloc_type_lookup, \
+.  NAME##_bfd_reloc_name_lookup
+.
+.  long        (*_get_reloc_upper_bound) (bfd *, sec_ptr);
+.  long        (*_bfd_canonicalize_reloc)
+.    (bfd *, sec_ptr, arelent **, struct bfd_symbol **);
+.  {* See documentation on reloc types.  *}
+.  reloc_howto_type *
+.              (*reloc_type_lookup) (bfd *, bfd_reloc_code_real_type);
+.  reloc_howto_type *
+.              (*reloc_name_lookup) (bfd *, const char *);
+.
+.
+.  {* Routines used when writing an object file.  *}
+.#define BFD_JUMP_TABLE_WRITE(NAME) \
+.  NAME##_set_arch_mach, \
+.  NAME##_set_section_contents
+.
+.  bfd_boolean (*_bfd_set_arch_mach)
+.    (bfd *, enum bfd_architecture, unsigned long);
+.  bfd_boolean (*_bfd_set_section_contents)
+.    (bfd *, sec_ptr, const void *, file_ptr, bfd_size_type);
+.
+.  {* Routines used by the linker.  *}
+.#define BFD_JUMP_TABLE_LINK(NAME) \
+.  NAME##_sizeof_headers, \
+.  NAME##_bfd_get_relocated_section_contents, \
+.  NAME##_bfd_relax_section, \
+.  NAME##_bfd_link_hash_table_create, \
+.  NAME##_bfd_link_hash_table_free, \
+.  NAME##_bfd_link_add_symbols, \
+.  NAME##_bfd_link_just_syms, \
+.  NAME##_bfd_copy_link_hash_symbol_type, \
+.  NAME##_bfd_final_link, \
+.  NAME##_bfd_link_split_section, \
+.  NAME##_bfd_gc_sections, \
+.  NAME##_bfd_lookup_section_flags, \
+.  NAME##_bfd_merge_sections, \
+.  NAME##_bfd_is_group_section, \
+.  NAME##_bfd_discard_group, \
+.  NAME##_section_already_linked, \
+.  NAME##_bfd_define_common_symbol
+.
+.  int         (*_bfd_sizeof_headers) (bfd *, struct bfd_link_info *);
+.  bfd_byte *  (*_bfd_get_relocated_section_contents)
+.    (bfd *, struct bfd_link_info *, struct bfd_link_order *,
+.     bfd_byte *, bfd_boolean, struct bfd_symbol **);
+.
+.  bfd_boolean (*_bfd_relax_section)
+.    (bfd *, struct bfd_section *, struct bfd_link_info *, bfd_boolean *);
+.
+.  {* Create a hash table for the linker.  Different backends store
+.     different information in this table.  *}
+.  struct bfd_link_hash_table *
+.              (*_bfd_link_hash_table_create) (bfd *);
+.
+.  {* Release the memory associated with the linker hash table.  *}
+.  void        (*_bfd_link_hash_table_free) (struct bfd_link_hash_table *);
+.
+.  {* Add symbols from this object file into the hash table.  *}
+.  bfd_boolean (*_bfd_link_add_symbols) (bfd *, struct bfd_link_info *);
+.
+.  {* Indicate that we are only retrieving symbol values from this section.  *}
+.  void        (*_bfd_link_just_syms) (asection *, struct bfd_link_info *);
+.
+.  {* Copy the symbol type of a linker hash table entry.  *}
+.#define bfd_copy_link_hash_symbol_type(b, t, f) \
+.  BFD_SEND (b, _bfd_copy_link_hash_symbol_type, (b, t, f))
+.  void (*_bfd_copy_link_hash_symbol_type)
+.    (bfd *, struct bfd_link_hash_entry *, struct bfd_link_hash_entry *);
+.
+.  {* Do a link based on the link_order structures attached to each
+.     section of the BFD.  *}
+.  bfd_boolean (*_bfd_final_link) (bfd *, struct bfd_link_info *);
+.
+.  {* Should this section be split up into smaller pieces during linking.  *}
+.  bfd_boolean (*_bfd_link_split_section) (bfd *, struct bfd_section *);
+.
+.  {* Remove sections that are not referenced from the output.  *}
+.  bfd_boolean (*_bfd_gc_sections) (bfd *, struct bfd_link_info *);
+.
+.  {* Sets the bitmask of allowed and disallowed section flags.  *}
+.  void (*_bfd_lookup_section_flags) (struct bfd_link_info *,
+.				      struct flag_info *);
+.
+.  {* Attempt to merge SEC_MERGE sections.  *}
+.  bfd_boolean (*_bfd_merge_sections) (bfd *, struct bfd_link_info *);
+.
+.  {* Is this section a member of a group?  *}
+.  bfd_boolean (*_bfd_is_group_section) (bfd *, const struct bfd_section *);
+.
+.  {* Discard members of a group.  *}
+.  bfd_boolean (*_bfd_discard_group) (bfd *, struct bfd_section *);
+.
+.  {* Check if SEC has been already linked during a reloceatable or
+.     final link.  *}
+.  bfd_boolean (*_section_already_linked) (bfd *, asection *,
+.					   struct bfd_link_info *);
+.
+.  {* Define a common symbol.  *}
+.  bfd_boolean (*_bfd_define_common_symbol) (bfd *, struct bfd_link_info *,
+.					     struct bfd_link_hash_entry *);
+.
+.  {* Routines to handle dynamic symbols and relocs.  *}
+.#define BFD_JUMP_TABLE_DYNAMIC(NAME) \
+.  NAME##_get_dynamic_symtab_upper_bound, \
+.  NAME##_canonicalize_dynamic_symtab, \
+.  NAME##_get_synthetic_symtab, \
+.  NAME##_get_dynamic_reloc_upper_bound, \
+.  NAME##_canonicalize_dynamic_reloc
+.
+.  {* Get the amount of memory required to hold the dynamic symbols.  *}
+.  long        (*_bfd_get_dynamic_symtab_upper_bound) (bfd *);
+.  {* Read in the dynamic symbols.  *}
+.  long        (*_bfd_canonicalize_dynamic_symtab)
+.    (bfd *, struct bfd_symbol **);
+.  {* Create synthetized symbols.  *}
+.  long        (*_bfd_get_synthetic_symtab)
+.    (bfd *, long, struct bfd_symbol **, long, struct bfd_symbol **,
+.     struct bfd_symbol **);
+.  {* Get the amount of memory required to hold the dynamic relocs.  *}
+.  long        (*_bfd_get_dynamic_reloc_upper_bound) (bfd *);
+.  {* Read in the dynamic relocs.  *}
+.  long        (*_bfd_canonicalize_dynamic_reloc)
+.    (bfd *, arelent **, struct bfd_symbol **);
+.
+
+A pointer to an alternative bfd_target in case the current one is not
+satisfactory.  This can happen when the target cpu supports both big
+and little endian code, and target chosen by the linker has the wrong
+endianness.  The function open_output() in ld/ldlang.c uses this field
+to find an alternative output format that is suitable.
+
+.  {* Opposite endian version of this target.  *}
+.  const struct bfd_target * alternative_target;
+.
+
+.  {* Data for use by back-end routines, which isn't
+.     generic enough to belong in this structure.  *}
+.  const void *backend_data;
+.
+.} bfd_target;
+.
+*/
+
+/* All known xvecs (even those that don't compile on all systems).
+   Alphabetized for easy reference.
+   They are listed a second time below, since
+   we can't intermix extern's and initializers.  */
+extern const bfd_target a_out_adobe_vec;
+extern const bfd_target aix5coff64_vec;
+extern const bfd_target aout0_big_vec;
+extern const bfd_target aout_arm_big_vec;
+extern const bfd_target aout_arm_little_vec;
+extern const bfd_target aout_mips_big_vec;
+extern const bfd_target aout_mips_little_vec;
+extern const bfd_target apollocoff_vec;
+extern const bfd_target arm_epoc_pe_big_vec;
+extern const bfd_target arm_epoc_pe_little_vec;
+extern const bfd_target arm_epoc_pei_big_vec;
+extern const bfd_target arm_epoc_pei_little_vec;
+extern const bfd_target arm_wince_pe_big_vec;
+extern const bfd_target arm_wince_pe_little_vec;
+extern const bfd_target arm_wince_pei_big_vec;
+extern const bfd_target arm_wince_pei_little_vec;
+extern const bfd_target armcoff_big_vec;
+extern const bfd_target armcoff_little_vec;
+extern const bfd_target armnetbsd_vec;
+extern const bfd_target armpe_big_vec;
+extern const bfd_target armpe_little_vec;
+extern const bfd_target armpei_big_vec;
+extern const bfd_target armpei_little_vec;
+extern const bfd_target asxxxx_vec;
+extern const bfd_target b_out_vec_big_host;
+extern const bfd_target b_out_vec_little_host;
+extern const bfd_target bfd_pei_ia64_vec;
+extern const bfd_target bfd_elf32_avr_vec;
+extern const bfd_target bfd_elf32_bfin_vec;
+extern const bfd_target bfd_elf32_bfinfdpic_vec;
+extern const bfd_target bfd_elf32_big_generic_vec;
+extern const bfd_target bfd_elf32_bigarc_vec;
+extern const bfd_target bfd_elf32_bigarm_vec;
+extern const bfd_target bfd_elf32_bigarm_symbian_vec;
+extern const bfd_target bfd_elf32_bigarm_vxworks_vec;
+extern const bfd_target bfd_elf32_bigmips_vec;
+extern const bfd_target bfd_elf32_bigmips_vxworks_vec;
+extern const bfd_target bfd_elf32_cr16_vec;
+extern const bfd_target bfd_elf32_cr16c_vec;
+extern const bfd_target bfd_elf32_cris_vec;
+extern const bfd_target bfd_elf32_crx_vec;
+extern const bfd_target bfd_elf32_d10v_vec;
+extern const bfd_target bfd_elf32_d30v_vec;
+extern const bfd_target bfd_elf32_dlx_big_vec;
+extern const bfd_target bfd_elf32_fr30_vec;
+extern const bfd_target bfd_elf32_frv_vec;
+extern const bfd_target bfd_elf32_frvfdpic_vec;
+extern const bfd_target bfd_elf32_moxie_vec;
+extern const bfd_target bfd_elf32_h8300_vec;
+extern const bfd_target bfd_elf32_hppa_linux_vec;
+extern const bfd_target bfd_elf32_hppa_nbsd_vec;
+extern const bfd_target bfd_elf32_hppa_vec;
+extern const bfd_target bfd_elf32_i370_vec;
+extern const bfd_target bfd_elf32_i386_freebsd_vec;
+extern const bfd_target bfd_elf32_i386_nacl_vec;
+extern const bfd_target bfd_elf32_i386_sol2_vec;
+extern const bfd_target bfd_elf32_i386_vxworks_vec;
+extern const bfd_target bfd_elf32_i386_vec;
+extern const bfd_target bfd_elf32_i860_little_vec;
+extern const bfd_target bfd_elf32_i860_vec;
+extern const bfd_target bfd_elf32_i960_vec;
+extern const bfd_target bfd_elf32_ia64_big_vec;
+extern const bfd_target bfd_elf32_ia64_hpux_big_vec;
+extern const bfd_target bfd_elf32_ip2k_vec;
+extern const bfd_target bfd_elf32_iq2000_vec;
+extern const bfd_target bfd_elf32_lm32_vec;
+extern const bfd_target bfd_elf32_lm32fdpic_vec;
+extern const bfd_target bfd_elf32_little_generic_vec;
+extern const bfd_target bfd_elf32_littlearc_vec;
+extern const bfd_target bfd_elf32_littlearm_vec;
+extern const bfd_target bfd_elf32_littlearm_symbian_vec;
+extern const bfd_target bfd_elf32_littlearm_vxworks_vec;
+extern const bfd_target bfd_elf32_littlemips_vec;
+extern const bfd_target bfd_elf32_littlemips_vxworks_vec;
+extern const bfd_target bfd_elf32_m32c_vec;
+extern const bfd_target bfd_elf32_m32r_vec;
+extern const bfd_target bfd_elf32_m32rle_vec;
+extern const bfd_target bfd_elf32_m32rlin_vec;
+extern const bfd_target bfd_elf32_m32rlelin_vec;
+extern const bfd_target bfd_elf32_m68hc11_vec;
+extern const bfd_target bfd_elf32_m68hc12_vec;
+extern const bfd_target bfd_elf32_m68k_vec;
+extern const bfd_target bfd_elf32_m88k_vec;
+extern const bfd_target bfd_elf32_mcore_big_vec;
+extern const bfd_target bfd_elf32_mcore_little_vec;
+extern const bfd_target bfd_elf32_mep_vec;
+extern const bfd_target bfd_elf32_mep_little_vec;
+extern const bfd_target bfd_elf32_microblaze_vec;
+extern const bfd_target bfd_elf32_mn10200_vec;
+extern const bfd_target bfd_elf32_mn10300_vec;
+extern const bfd_target bfd_elf32_mt_vec;
+extern const bfd_target bfd_elf32_msp430_vec;
+extern const bfd_target bfd_elf32_nbigmips_vec;
+extern const bfd_target bfd_elf32_nlittlemips_vec;
+extern const bfd_target bfd_elf32_ntradbigmips_vec;
+extern const bfd_target bfd_elf32_ntradlittlemips_vec;
+extern const bfd_target bfd_elf32_ntradbigmips_freebsd_vec;
+extern const bfd_target bfd_elf32_ntradlittlemips_freebsd_vec;
+extern const bfd_target bfd_elf32_openrisc_vec;
+extern const bfd_target bfd_elf32_or32_big_vec;
+extern const bfd_target bfd_elf32_pj_vec;
+extern const bfd_target bfd_elf32_pjl_vec;
+extern const bfd_target bfd_elf32_powerpc_vec;
+extern const bfd_target bfd_elf32_powerpcle_vec;
+extern const bfd_target bfd_elf32_powerpc_vxworks_vec;
+extern const bfd_target bfd_elf32_rx_le_vec;
+extern const bfd_target bfd_elf32_rx_be_vec;
+extern const bfd_target bfd_elf32_rx_be_ns_vec;
+extern const bfd_target bfd_elf32_s390_vec;
+extern const bfd_target bfd_elf32_bigscore_vec;
+extern const bfd_target bfd_elf32_littlescore_vec;
+extern const bfd_target bfd_elf32_sh64_vec;
+extern const bfd_target bfd_elf32_sh64l_vec;
+extern const bfd_target bfd_elf32_sh64lin_vec;
+extern const bfd_target bfd_elf32_sh64blin_vec;
+extern const bfd_target bfd_elf32_sh64lnbsd_vec;
+extern const bfd_target bfd_elf32_sh64nbsd_vec;
+extern const bfd_target bfd_elf32_sh_vec;
+extern const bfd_target bfd_elf32_shbfd_vec;
+extern const bfd_target bfd_elf32_shblin_vec;
+extern const bfd_target bfd_elf32_shfd_vec;
+extern const bfd_target bfd_elf32_shl_vec;
+extern const bfd_target bfd_elf32_shl_symbian_vec;
+extern const bfd_target bfd_elf32_shlin_vec;
+extern const bfd_target bfd_elf32_shlnbsd_vec;
+extern const bfd_target bfd_elf32_shlvxworks_vec;
+extern const bfd_target bfd_elf32_shnbsd_vec;
+extern const bfd_target bfd_elf32_shvxworks_vec;
+extern const bfd_target bfd_elf32_sparc_vec;
+extern const bfd_target bfd_elf32_sparc_sol2_vec;
+extern const bfd_target bfd_elf32_sparc_vxworks_vec;
+extern const bfd_target bfd_elf32_spu_vec;
+extern const bfd_target bfd_elf32_tic6x_be_vec;
+extern const bfd_target bfd_elf32_tic6x_le_vec;
+extern const bfd_target bfd_elf32_tic6x_elf_be_vec;
+extern const bfd_target bfd_elf32_tic6x_elf_le_vec;
+extern const bfd_target bfd_elf32_tic6x_linux_be_vec;
+extern const bfd_target bfd_elf32_tic6x_linux_le_vec;
+extern const bfd_target bfd_elf32_tilegx_vec;
+extern const bfd_target bfd_elf32_tilepro_vec;
+extern const bfd_target bfd_elf32_tradbigmips_vec;
+extern const bfd_target bfd_elf32_tradlittlemips_vec;
+extern const bfd_target bfd_elf32_tradbigmips_freebsd_vec;
+extern const bfd_target bfd_elf32_tradlittlemips_freebsd_vec;
+extern const bfd_target bfd_elf32_us_cris_vec;
+extern const bfd_target bfd_elf32_v850_vec;
+extern const bfd_target bfd_elf32_vax_vec;
+extern const bfd_target bfd_elf32_xc16x_vec;
+extern const bfd_target bfd_elf32_xstormy16_vec;
+extern const bfd_target bfd_elf32_xtensa_be_vec;
+extern const bfd_target bfd_elf32_xtensa_le_vec;
+extern const bfd_target bfd_elf64_alpha_freebsd_vec;
+extern const bfd_target bfd_elf64_alpha_vec;
+extern const bfd_target bfd_elf64_big_generic_vec;
+extern const bfd_target bfd_elf64_bigmips_vec;
+extern const bfd_target bfd_elf64_hppa_linux_vec;
+extern const bfd_target bfd_elf64_hppa_vec;
+extern const bfd_target bfd_elf64_ia64_big_vec;
+extern const bfd_target bfd_elf64_ia64_hpux_big_vec;
+extern const bfd_target bfd_elf64_ia64_little_vec;
+extern const bfd_target bfd_elf64_ia64_vms_vec;
+extern const bfd_target bfd_elf64_little_generic_vec;
+extern const bfd_target bfd_elf64_littlemips_vec;
+extern const bfd_target bfd_elf64_mmix_vec;
+extern const bfd_target bfd_elf64_powerpc_vec;
+extern const bfd_target bfd_elf64_powerpcle_vec;
+extern const bfd_target bfd_elf64_s390_vec;
+extern const bfd_target bfd_elf64_sh64_vec;
+extern const bfd_target bfd_elf64_sh64l_vec;
+extern const bfd_target bfd_elf64_sh64lin_vec;
+extern const bfd_target bfd_elf64_sh64blin_vec;
+extern const bfd_target bfd_elf64_sh64lnbsd_vec;
+extern const bfd_target bfd_elf64_sh64nbsd_vec;
+extern const bfd_target bfd_elf64_sparc_vec;
+extern const bfd_target bfd_elf64_sparc_freebsd_vec;
+extern const bfd_target bfd_elf64_sparc_sol2_vec;
+extern const bfd_target bfd_elf64_tilegx_vec;
+extern const bfd_target bfd_elf64_tradbigmips_vec;
+extern const bfd_target bfd_elf64_tradlittlemips_vec;
+extern const bfd_target bfd_elf64_tradbigmips_freebsd_vec;
+extern const bfd_target bfd_elf64_tradlittlemips_freebsd_vec;
+extern const bfd_target bfd_elf64_x86_64_freebsd_vec;
+extern const bfd_target bfd_elf64_x86_64_sol2_vec;
+extern const bfd_target bfd_elf64_x86_64_vec;
+extern const bfd_target bfd_elf32_x86_64_vec;
+extern const bfd_target bfd_elf64_l1om_freebsd_vec;
+extern const bfd_target bfd_elf64_l1om_vec;
+extern const bfd_target bfd_elf64_k1om_freebsd_vec;
+extern const bfd_target bfd_elf64_k1om_vec;
+extern const bfd_target bfd_mmo_vec;
+extern const bfd_target bfd_powerpc_pe_vec;
+extern const bfd_target bfd_powerpc_pei_vec;
+extern const bfd_target bfd_powerpcle_pe_vec;
+extern const bfd_target bfd_powerpcle_pei_vec;
+extern const bfd_target cris_aout_vec;
+extern const bfd_target demo_64_vec;
+extern const bfd_target ecoff_big_vec;
+extern const bfd_target ecoff_biglittle_vec;
+extern const bfd_target ecoff_little_vec;
+extern const bfd_target ecoffalpha_little_vec;
+extern const bfd_target go32coff_vec;
+extern const bfd_target go32stubbedcoff_vec;
+extern const bfd_target h8300coff_vec;
+extern const bfd_target h8500coff_vec;
+extern const bfd_target host_aout_vec;
+extern const bfd_target hp300bsd_vec;
+extern const bfd_target hp300hpux_vec;
+extern const bfd_target i386aout_vec;
+extern const bfd_target i386bsd_vec;
+extern const bfd_target i386coff_vec;
+extern const bfd_target i386dynix_vec;
+extern const bfd_target i386freebsd_vec;
+extern const bfd_target i386linux_vec;
+extern const bfd_target i386lynx_aout_vec;
+extern const bfd_target i386lynx_coff_vec;
+extern const bfd_target i386mach3_vec;
+extern const bfd_target i386msdos_vec;
+extern const bfd_target i386netbsd_vec;
+extern const bfd_target i386os9k_vec;
+extern const bfd_target i386pe_vec;
+extern const bfd_target i386pei_vec;
+extern const bfd_target i860coff_vec;
+extern const bfd_target icoff_big_vec;
+extern const bfd_target icoff_little_vec;
+extern const bfd_target ieee_vec;
+extern const bfd_target m68k4knetbsd_vec;
+extern const bfd_target m68kaux_coff_vec;
+extern const bfd_target m68kcoff_vec;
+extern const bfd_target m68kcoffun_vec;
+extern const bfd_target m68klinux_vec;
+extern const bfd_target m68knetbsd_vec;
+extern const bfd_target m68ksysvcoff_vec;
+extern const bfd_target m88kbcs_vec;
+extern const bfd_target m88kmach3_vec;
+extern const bfd_target m88kopenbsd_vec;
+extern const bfd_target mach_o_be_vec;
+extern const bfd_target mach_o_le_vec;
+extern const bfd_target mach_o_fat_vec;
+extern const bfd_target mach_o_i386_vec;
+extern const bfd_target mach_o_x86_64_vec;
+extern const bfd_target mcore_pe_big_vec;
+extern const bfd_target mcore_pe_little_vec;
+extern const bfd_target mcore_pei_big_vec;
+extern const bfd_target mcore_pei_little_vec;
+extern const bfd_target mipslpe_vec;
+extern const bfd_target mipslpei_vec;
+extern const bfd_target newsos3_vec;
+extern const bfd_target nlm32_alpha_vec;
+extern const bfd_target nlm32_i386_vec;
+extern const bfd_target nlm32_powerpc_vec;
+extern const bfd_target nlm32_sparc_vec;
+extern const bfd_target oasys_vec;
+extern const bfd_target or32coff_big_vec;
+extern const bfd_target pc532machaout_vec;
+extern const bfd_target pc532netbsd_vec;
+extern const bfd_target pdp11_aout_vec;
+extern const bfd_target pef_vec;
+extern const bfd_target pef_xlib_vec;
+extern const bfd_target plugin_vec;
+extern const bfd_target pmac_xcoff_vec;
+extern const bfd_target ppcboot_vec;
+extern const bfd_target riscix_vec;
+extern const bfd_target rs6000coff64_vec;
+extern const bfd_target rs6000coff_vec;
+extern const bfd_target shcoff_small_vec;
+extern const bfd_target shcoff_vec;
+extern const bfd_target shlcoff_small_vec;
+extern const bfd_target shlcoff_vec;
+extern const bfd_target shlpe_vec;
+extern const bfd_target shlpei_vec;
+extern const bfd_target som_vec;
+extern const bfd_target sparccoff_vec;
+extern const bfd_target sparcle_aout_vec;
+extern const bfd_target sparclinux_vec;
+extern const bfd_target sparclynx_aout_vec;
+extern const bfd_target sparclynx_coff_vec;
+extern const bfd_target sparcnetbsd_vec;
+extern const bfd_target sunos_big_vec;
+extern const bfd_target sym_vec;
+extern const bfd_target tic30_aout_vec;
+extern const bfd_target tic30_coff_vec;
+extern const bfd_target tic4x_coff0_beh_vec;
+extern const bfd_target tic4x_coff0_vec;
+extern const bfd_target tic4x_coff1_beh_vec;
+extern const bfd_target tic4x_coff1_vec;
+extern const bfd_target tic4x_coff2_beh_vec;
+extern const bfd_target tic4x_coff2_vec;
+extern const bfd_target tic54x_coff0_beh_vec;
+extern const bfd_target tic54x_coff0_vec;
+extern const bfd_target tic54x_coff1_beh_vec;
+extern const bfd_target tic54x_coff1_vec;
+extern const bfd_target tic54x_coff2_beh_vec;
+extern const bfd_target tic54x_coff2_vec;
+extern const bfd_target tic80coff_vec;
+extern const bfd_target vaxbsd_vec;
+extern const bfd_target vaxnetbsd_vec;
+extern const bfd_target vax1knetbsd_vec;
+extern const bfd_target versados_vec;
+extern const bfd_target vms_alpha_vec;
+extern const bfd_target vms_lib_txt_vec;
+extern const bfd_target w65_vec;
+extern const bfd_target we32kcoff_vec;
+extern const bfd_target x86_64pe_vec;
+extern const bfd_target x86_64pei_vec;
+extern const bfd_target x86_64coff_vec;
+extern const bfd_target z80coff_vec;
+extern const bfd_target z8kcoff_vec;
+
+/* These are always included.  */
+extern const bfd_target srec_vec;
+extern const bfd_target verilog_vec;
+extern const bfd_target symbolsrec_vec;
+extern const bfd_target tekhex_vec;
+extern const bfd_target binary_vec;
+extern const bfd_target ihex_vec;
+
+/* All of the xvecs for core files.  */
+extern const bfd_target aix386_core_vec;
+extern const bfd_target cisco_core_big_vec;
+extern const bfd_target cisco_core_little_vec;
+extern const bfd_target hppabsd_core_vec;
+extern const bfd_target hpux_core_vec;
+extern const bfd_target irix_core_vec;
+extern const bfd_target netbsd_core_vec;
+extern const bfd_target osf_core_vec;
+extern const bfd_target ptrace_core_vec;
+extern const bfd_target sco5_core_vec;
+extern const bfd_target trad_core_vec;
+
+extern const bfd_target bfd_elf32_am33lin_vec;
+static const bfd_target * const _bfd_target_vector[] =
+{
+//#ifdef SELECT_VECS
+#if 0
+
+	SELECT_VECS,
+
+#else /* not SELECT_VECS */
+
+//#ifdef DEFAULT_VECTOR
+#if 0
+	&DEFAULT_VECTOR,
+#endif
+        &asxxxx_vec,
+        &srec_vec,
+        &symbolsrec_vec,
+        &ihex_vec,
+#endif
+        NULL /* end of list marker */
+};
+
+const bfd_target * const *bfd_target_vector = _bfd_target_vector;
+
+/* bfd_default_vector[0] contains either the address of the default vector,
+   if there is one, or zero if there isn't.  */
+
+const bfd_target *bfd_default_vector[] = {
+//#ifdef DEFAULT_VECTOR
+#if 0
+	&DEFAULT_VECTOR,
+#endif
+	NULL
+};
+
+/* bfd_associated_vector[] contains the associated target vectors used
+   to reduce the ambiguity in bfd_check_format_matches.  */
+
+static const bfd_target *_bfd_associated_vector[] = {
+//#ifdef ASSOCIATED_VECS
+#if 0
+	ASSOCIATED_VECS,
+#endif
+	NULL
+};
+const bfd_target * const *bfd_associated_vector = _bfd_associated_vector;
+
+/* When there is an ambiguous match, bfd_check_format_matches puts the
+   names of the matching targets in an array.  This variable is the maximum
+   number of entries that the array could possibly need.  */
+const size_t _bfd_target_vector_entries = sizeof (_bfd_target_vector)/sizeof (*_bfd_target_vector);
+
+/* This array maps configuration triplets onto BFD vectors.  */
+
+struct targmatch
+{
+  /* The configuration triplet.  */
+  const char *triplet;
+  /* The BFD vector.  If this is NULL, then the vector is found by
+     searching forward for the next structure with a non NULL vector
+     field.  */
+  const bfd_target *vector;
+};
+
+/* targmatch.h is built by Makefile out of config.bfd.  */
+static const struct targmatch bfd_target_match[] = {
+#include "targmatch.h"
+  { NULL, NULL }
+};
+
+/* Find a target vector, given a name or configuration triplet.  */
+
+static const bfd_target *
+find_target (const char *name)
+{
+  const bfd_target * const *target;
+  const struct targmatch *match;
+
+  for (target = &bfd_target_vector[0]; *target != NULL; target++)
+    if (strcmp (name, (*target)->name) == 0)
+      return *target;
+
+  /* If we couldn't match on the exact name, try matching on the
+     configuration triplet.  FIXME: We should run the triplet through
+     config.sub first, but that is hard.  */
+  for (match = &bfd_target_match[0]; match->triplet != NULL; match++)
+    {
+      if (fnmatch (match->triplet, name, 0) == 0)
+	{
+	  while (match->vector == NULL)
+	    ++match;
+	  return match->vector;
+	}
+    }
+
+  bfd_set_error (bfd_error_invalid_target);
+  return NULL;
+}
+
+/*
+FUNCTION
+	bfd_set_default_target
+
+SYNOPSIS
+	bfd_boolean bfd_set_default_target (const char *name);
+
+DESCRIPTION
+	Set the default target vector to use when recognizing a BFD.
+	This takes the name of the target, which may be a BFD target
+	name or a configuration triplet.
+*/
+
+bfd_boolean
+bfd_set_default_target (const char *name)
+{
+  const bfd_target *target;
+
+  if (bfd_default_vector[0] != NULL
+      && strcmp (name, bfd_default_vector[0]->name) == 0)
+    return TRUE;
+
+  target = find_target (name);
+  if (target == NULL)
+    return FALSE;
+
+  bfd_default_vector[0] = target;
+  return TRUE;
+}
+
+/*
+FUNCTION
+	bfd_find_target
+
+SYNOPSIS
+	const bfd_target *bfd_find_target (const char *target_name, bfd *abfd);
+
+DESCRIPTION
+	Return a pointer to the transfer vector for the object target
+	named @var{target_name}.  If @var{target_name} is <<NULL>>,
+	choose the one in the environment variable <<GNUTARGET>>; if
+	that is null or not defined, then choose the first entry in the
+	target list.  Passing in the string "default" or setting the
+	environment variable to "default" will cause the first entry in
+	the target list to be returned, and "target_defaulted" will be
+	set in the BFD if @var{abfd} isn't <<NULL>>.  This causes
+	<<bfd_check_format>> to loop over all the targets to find the
+	one that matches the file being read.
+*/
+
+const bfd_target *
+bfd_find_target (const char *target_name, bfd *abfd)
+{
+  const char *targname;
+  const bfd_target *target;
+
+  if (target_name != NULL)
+    targname = target_name;
+  else
+    targname = getenv ("GNUTARGET");
+
+  /* This is safe; the vector cannot be null.  */
+  if (targname == NULL || strcmp (targname, "default") == 0)
+    {
+      if (bfd_default_vector[0] != NULL)
+	target = bfd_default_vector[0];
+      else
+	target = bfd_target_vector[0];
+      if (abfd)
+	{
+	  abfd->xvec = target;
+	  abfd->target_defaulted = TRUE;
+	}
+      return target;
+    }
+
+  if (abfd)
+    abfd->target_defaulted = FALSE;
+
+  target = find_target (targname);
+  if (target == NULL)
+    return NULL;
+
+  if (abfd)
+    abfd->xvec = target;
+  return target;
+}
+
+/* Helper function for bfd_get_target_info to determine the target's
+   architecture.  This method handles bfd internal target names as
+   tuples and triplets.  */
+static bfd_boolean
+_bfd_find_arch_match (const char *tname, const char **arch,
+		      const char **def_target_arch)
+{
+  if (!arch)
+    return FALSE;
+
+  while (*arch != NULL)
+    {
+      const char *in_a = strstr (*arch, tname);
+      char end_ch = (in_a ? in_a[strlen (tname)] : 0);
+
+      if (in_a && (in_a == *arch || in_a[-1] == ':')
+          && end_ch == 0)
+        {
+          *def_target_arch = *arch;
+          return TRUE;
+        }
+      arch++;
+    }
+  return FALSE;
+}
+
+/*
+FUNCTION
+	bfd_get_target_info
+SYNOPSIS
+	const bfd_target *bfd_get_target_info (const char *target_name,
+					       bfd *abfd,
+				 	       bfd_boolean *is_bigendian,
+					       int *underscoring,
+					       const char **def_target_arch);
+DESCRIPTION
+        Return a pointer to the transfer vector for the object target
+        named @var{target_name}.  If @var{target_name} is <<NULL>>,
+        choose the one in the environment variable <<GNUTARGET>>; if
+        that is null or not defined, then choose the first entry in the
+        target list.  Passing in the string "default" or setting the
+        environment variable to "default" will cause the first entry in
+        the target list to be returned, and "target_defaulted" will be
+        set in the BFD if @var{abfd} isn't <<NULL>>.  This causes
+        <<bfd_check_format>> to loop over all the targets to find the
+        one that matches the file being read.
+	If @var{is_bigendian} is not <<NULL>>, then set this value to target's
+	endian mode. True for big-endian, FALSE for little-endian or for
+	invalid target.
+	If @var{underscoring} is not <<NULL>>, then set this value to target's
+	underscoring mode. Zero for none-underscoring, -1 for invalid target,
+	else the value of target vector's symbol underscoring.
+	If @var{def_target_arch} is not <<NULL>>, then set it to the architecture
+	string specified by the target_name.
+*/
+const bfd_target *
+bfd_get_target_info (const char *target_name, bfd *abfd,
+		     bfd_boolean *is_bigendian,
+		     int *underscoring, const char **def_target_arch)
+{
+  const bfd_target *target_vec;
+
+  if (is_bigendian)
+    *is_bigendian = FALSE;
+  if (underscoring)
+    *underscoring = -1;
+  if (def_target_arch)
+    *def_target_arch = NULL;
+  target_vec = bfd_find_target (target_name, abfd);
+  if (! target_vec)
+    return NULL;
+  if (is_bigendian)
+    *is_bigendian = ((target_vec->byteorder == BFD_ENDIAN_BIG) ? TRUE
+							       : FALSE);
+  if (underscoring)
+    *underscoring = ((int) target_vec->symbol_leading_char) & 0xff;
+
+  if (def_target_arch)
+    {
+      const char *tname = target_vec->name;
+      const char **arches = bfd_arch_list ();
+
+      if (arches && tname)
+        {
+          char *hyp = strchr (tname, '-');
+
+          if (hyp != NULL)
+            {
+              tname = ++hyp;
+
+	      /* Make sure we detect architecture names
+		 for triplets like "pe-arm-wince-little".  */
+	      if (!_bfd_find_arch_match (tname, arches, def_target_arch))
+		{
+		  char new_tname[50];
+
+		  strcpy (new_tname, hyp);
+		  while ((hyp = strrchr (new_tname, '-')) != NULL)
+		    {
+		      *hyp = 0;
+		      if (_bfd_find_arch_match (new_tname, arches,
+			  			def_target_arch))
+			break;
+		    }
+		}
+	    }
+	  else
+	    _bfd_find_arch_match (tname, arches, def_target_arch);
+	}
+
+      if (arches)
+        free (arches);
+    }
+  return target_vec;
+}
+
+/*
+FUNCTION
+	bfd_target_list
+
+SYNOPSIS
+	const char ** bfd_target_list (void);
+
+DESCRIPTION
+	Return a freshly malloced NULL-terminated
+	vector of the names of all the valid BFD targets. Do not
+	modify the names.
+
+*/
+
+const char **
+bfd_target_list (void)
+{
+  int vec_length = 0;
+  bfd_size_type amt;
+  const bfd_target * const *target;
+  const  char **name_list, **name_ptr;
+
+  for (target = &bfd_target_vector[0]; *target != NULL; target++)
+    vec_length++;
+
+  amt = (vec_length + 1) * sizeof (char **);
+  name_ptr = name_list = (const  char **) bfd_malloc (amt);
+
+  if (name_list == NULL)
+    return NULL;
+
+  for (target = &bfd_target_vector[0]; *target != NULL; target++)
+    if (target == &bfd_target_vector[0]
+	|| *target != bfd_target_vector[0])
+      *name_ptr++ = (*target)->name;
+
+  *name_ptr = NULL;
+  return name_list;
+}
+
+/*
+FUNCTION
+	bfd_seach_for_target
+
+SYNOPSIS
+	const bfd_target *bfd_search_for_target
+	  (int (*search_func) (const bfd_target *, void *),
+	   void *);
+
+DESCRIPTION
+	Return a pointer to the first transfer vector in the list of
+	transfer vectors maintained by BFD that produces a non-zero
+	result when passed to the function @var{search_func}.  The
+	parameter @var{data} is passed, unexamined, to the search
+	function.
+*/
+
+const bfd_target *
+bfd_search_for_target (int (*search_func) (const bfd_target *, void *),
+		       void *data)
+{
+  const bfd_target * const *target;
+
+  for (target = bfd_target_vector; *target != NULL; target ++)
+    if (search_func (*target, data))
+      return *target;
+
+  return NULL;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/targmatch.sed sdcc-3.2.0+dfsg/support/sdbinutils/bfd/targmatch.sed
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/targmatch.sed	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/targmatch.sed	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,33 @@
+1,/START OF targmatch.h/	d
+/END OF targmatch.h/,$		d
+/^[ 	]*case/,/^[ 	]*esac/ d
+s/^#if/KEEP #if/
+s/^#endif/KEEP #endif/
+s/^[ 	]*#.*$//
+s/^KEEP #/#/
+s/[ 	]*\\$//
+t lab1
+	:lab1
+s/[| 	][| 	]*\([^|() 	][^|() 	]*\)[ 	]*|/{ "\1", NULL },/g
+s/[| 	][| 	]*\([^|() 	][^|() 	]*\)[ 	]*)/{ "\1",/g
+t lab2
+s/^[ 	]*targ_defvec=\([^ 	]*\)/#if !defined (SELECT_VECS) || defined (HAVE_\1)/
+t lab3
+s/.*=.*//
+s/;;//
+b
+	:lab2
+H
+d
+	:lab3
+G
+s/\n/%EOL%/g
+s/\(defined (HAVE_\)\([^)]*\)\(.*\)/\1\2\3\
+\&\2 },\
+#endif/
+s/%EOL%/\
+/g
+p
+s/.*//g
+s/\n//g
+h
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/tekhex.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/tekhex.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/tekhex.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/tekhex.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1016 @@
+/* BFD backend for Extended Tektronix Hex Format  objects.
+   Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2006, 2007, 2009, 2011 Free Software Foundation, Inc.
+   Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* SUBSECTION
+	Tektronix Hex Format handling
+
+   DESCRIPTION
+
+	Tek Hex records can hold symbols and data, but not
+	relocations. Their main application is communication with
+	devices like PROM programmers and ICE equipment.
+
+	It seems that the sections are described as being really big,
+        the example I have says that the text section is 0..ffffffff.
+	BFD would barf with this, many apps would try to alloc 4GB to
+	read in the file.
+
+	Tex Hex may contain many sections, but the data which comes in
+	has no tag saying which section it belongs to, so we create
+	one section for each block of data, called "blknnnn" which we
+	stick all the data into.
+
+	TekHex may come out of 	order and there is no header, so an
+	initial scan is required  to discover the minimum and maximum
+	addresses used to create the vma and size of the sections we
+	create.
+	We read in the data into pages of CHUNK_MASK+1 size and read
+	them out from that whenever we need to.
+
+	Any number of sections may be created for output, we save them
+	up and output them when it's time to close the bfd.
+
+	A TekHex record looks like:
+  EXAMPLE
+	%<block length><type><checksum><stuff><cr>
+
+  DESCRIPTION
+	Where
+	o length
+	is the number of bytes in the record not including the % sign.
+	o type
+	is one of:
+	3) symbol record
+	6) data record
+	8) termination record
+
+  The data can come out of order, and may be discontigous. This is a
+  serial protocol, so big files are unlikely, so we keep a list of 8k chunks.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libiberty.h"
+
+typedef struct
+{
+  bfd_vma low;
+  bfd_vma high;
+} addr_range_type;
+
+typedef struct tekhex_symbol_struct
+{
+  asymbol symbol;
+  struct tekhex_symbol_struct *prev;
+} tekhex_symbol_type;
+
+static const char digs[] = "0123456789ABCDEF";
+
+static char sum_block[256];
+
+#define NOT_HEX      20
+#define NIBBLE(x)    hex_value(x)
+#define HEX(buffer) ((NIBBLE ((buffer)[0]) << 4) + NIBBLE ((buffer)[1]))
+#define	ISHEX(x)    hex_p(x)
+#define TOHEX(d, x) \
+  (d)[1] = digs[(x) & 0xf]; \
+  (d)[0] = digs[((x)>>4)&0xf];
+
+/* Here's an example
+   %3A6C6480004E56FFFC4E717063B0AEFFFC6D0652AEFFFC60F24E5E4E75
+   %1B3709T_SEGMENT1108FFFFFFFF
+   %2B3AB9T_SEGMENT7Dgcc_compiled$1087hello$c10
+   %373829T_SEGMENT80int$t1$r1$$214741080char$t2$r2$0$12710
+   %373769T_SEGMENT80long$int$t3$r1$$1080unsigned$int$t4$10
+   %373CA9T_SEGMENT80long$unsigned$in1080short$int$t6$r1$10
+   %373049T_SEGMENT80long$long$int$t71080short$unsigned$i10
+   %373A29T_SEGMENT80long$long$unsign1080signed$char$t10$10
+   %373D69T_SEGMENT80unsigned$char$t11080float$t12$r1$4$010
+   %373D19T_SEGMENT80double$t13$r1$8$1080long$double$t14$10
+   %2734D9T_SEGMENT8Bvoid$t15$151035_main10
+   %2F3CA9T_SEGMENT81$1081$1681$1E81$21487main$F110
+   %2832F9T_SEGMENT83i$18FFFFFFFC81$1481$214
+   %07 8 10 10
+
+   explanation:
+   %3A6C6480004E56FFFC4E717063B0AEFFFC6D0652AEFFFC60F24E5E4E75
+    ^ ^^ ^     ^-data
+    | || +------ 4 char integer 0x8000
+    | |+-------- checksum
+    | +--------- type 6 (data record)
+    +----------- length 3a chars
+   <---------------------- 3a (58 chars) ------------------->
+
+   %1B3709T_SEGMENT1108FFFFFFFF
+         ^         ^^ ^- 8 character integer 0xffffffff
+         |         |+-   1 character integer 0
+         |         +--   type 1 symbol (section definition)
+         +------------   9 char symbol T_SEGMENT
+
+   %2B3AB9T_SEGMENT7Dgcc_compiled$1087hello$c10
+   %373829T_SEGMENT80int$t1$r1$$214741080char$t2$r2$0$12710
+   %373769T_SEGMENT80long$int$t3$r1$$1080unsigned$int$t4$10
+   %373CA9T_SEGMENT80long$unsigned$in1080short$int$t6$r1$10
+   %373049T_SEGMENT80long$long$int$t71080short$unsigned$i10
+   %373A29T_SEGMENT80long$long$unsign1080signed$char$t10$10
+   %373D69T_SEGMENT80unsigned$char$t11080float$t12$r1$4$010
+   %373D19T_SEGMENT80double$t13$r1$8$1080long$double$t14$10
+   %2734D9T_SEGMENT8Bvoid$t15$151035_main10
+   %2F3CA9T_SEGMENT81$1081$1681$1E81$21487main$F110
+   %2832F9T_SEGMENT83i$18FFFFFFFC81$1481$214
+   %0781010
+
+   Turns into
+   sac@thepub$ ./objdump -dx -m m68k f
+
+   f:     file format tekhex
+   -----x--- 9/55728 -134219416 Sep 29 15:13 1995 f
+   architecture: UNKNOWN!, flags 0x00000010:
+   HAS_SYMS
+   start address 0x00000000
+   SECTION 0 [D00000000]	: size 00020000 vma 00000000 align 2**0
+   ALLOC, LOAD
+   SECTION 1 [D00008000]	: size 00002001 vma 00008000 align 2**0
+
+   SECTION 2 [T_SEGMENT]	: size ffffffff vma 00000000 align 2**0
+
+   SYMBOL TABLE:
+   00000000  g       T_SEGMENT gcc_compiled$
+   00000000  g       T_SEGMENT hello$c
+   00000000  g       T_SEGMENT int$t1$r1$$21474
+   00000000  g       T_SEGMENT char$t2$r2$0$127
+   00000000  g       T_SEGMENT long$int$t3$r1$$
+   00000000  g       T_SEGMENT unsigned$int$t4$
+   00000000  g       T_SEGMENT long$unsigned$in
+   00000000  g       T_SEGMENT short$int$t6$r1$
+   00000000  g       T_SEGMENT long$long$int$t7
+   00000000  g       T_SEGMENT short$unsigned$i
+   00000000  g       T_SEGMENT long$long$unsign
+   00000000  g       T_SEGMENT signed$char$t10$
+   00000000  g       T_SEGMENT unsigned$char$t1
+   00000000  g       T_SEGMENT float$t12$r1$4$0
+   00000000  g       T_SEGMENT double$t13$r1$8$
+   00000000  g       T_SEGMENT long$double$t14$
+   00000000  g       T_SEGMENT void$t15$15
+   00000000  g       T_SEGMENT _main
+   00000000  g       T_SEGMENT $
+   00000000  g       T_SEGMENT $
+   00000000  g       T_SEGMENT $
+   00000010  g       T_SEGMENT $
+   00000000  g       T_SEGMENT main$F1
+   fcffffff  g       T_SEGMENT i$1
+   00000000  g       T_SEGMENT $
+   00000010  g       T_SEGMENT $
+
+   RELOCATION RECORDS FOR [D00000000]: (none)
+
+   RELOCATION RECORDS FOR [D00008000]: (none)
+
+   RELOCATION RECORDS FOR [T_SEGMENT]: (none)
+
+   Disassembly of section D00000000:
+   ...
+   00008000 ($+)7ff0 linkw fp,#-4
+   00008004 ($+)7ff4 nop
+   00008006 ($+)7ff6 movel #99,d0
+   00008008 ($+)7ff8 cmpl fp@(-4),d0
+   0000800c ($+)7ffc blts 00008014 ($+)8004
+   0000800e ($+)7ffe addql #1,fp@(-4)
+   00008012 ($+)8002 bras 00008006 ($+)7ff6
+   00008014 ($+)8004 unlk fp
+   00008016 ($+)8006 rts
+   ...  */
+
+static void
+tekhex_init (void)
+{
+  unsigned int i;
+  static bfd_boolean inited = FALSE;
+  int val;
+
+  if (! inited)
+    {
+      inited = TRUE;
+      hex_init ();
+      val = 0;
+      for (i = 0; i < 10; i++)
+	sum_block[i + '0'] = val++;
+
+      for (i = 'A'; i <= 'Z'; i++)
+	sum_block[i] = val++;
+
+      sum_block['$'] = val++;
+      sum_block['%'] = val++;
+      sum_block['.'] = val++;
+      sum_block['_'] = val++;
+      for (i = 'a'; i <= 'z'; i++)
+	sum_block[i] = val++;
+    }
+}
+
+/* The maximum number of bytes on a line is FF.  */
+#define MAXCHUNK 0xff
+/* The number of bytes we fit onto a line on output.  */
+#define CHUNK 21
+
+/* We cannot output our tekhexords as we see them, we have to glue them
+   together, this is done in this structure : */
+
+struct tekhex_data_list_struct
+{
+  unsigned char *data;
+  bfd_vma where;
+  bfd_size_type size;
+  struct tekhex_data_list_struct *next;
+
+};
+typedef struct tekhex_data_list_struct tekhex_data_list_type;
+
+#define CHUNK_MASK 0x1fff
+
+struct data_struct
+{
+  char chunk_data[CHUNK_MASK + 1];
+  char chunk_init[CHUNK_MASK + 1];
+  bfd_vma vma;
+  struct data_struct *next;
+};
+
+typedef struct tekhex_data_struct
+{
+  tekhex_data_list_type *head;
+  unsigned int type;
+  struct tekhex_symbol_struct *symbols;
+  struct data_struct *data;
+} tdata_type;
+
+#define enda(x) (x->vma + x->size)
+
+static bfd_boolean
+getvalue (char **srcp, bfd_vma *valuep)
+{
+  char *src = *srcp;
+  bfd_vma value = 0;
+  unsigned int len;
+
+  if (!ISHEX (*src))
+    return FALSE;
+
+  len = hex_value (*src++);
+  if (len == 0)
+    len = 16;
+  while (len--)
+    {
+      if (!ISHEX (*src))
+	return FALSE;
+      value = value << 4 | hex_value (*src++);
+    }
+
+  *srcp = src;
+  *valuep = value;
+  return TRUE;
+}
+
+static bfd_boolean
+getsym (char *dstp, char **srcp, unsigned int *lenp)
+{
+  char *src = *srcp;
+  unsigned int i;
+  unsigned int len;
+  
+  if (!ISHEX (*src))
+    return FALSE;
+
+  len = hex_value (*src++);
+  if (len == 0)
+    len = 16;
+  for (i = 0; i < len; i++)
+    dstp[i] = src[i];
+  dstp[i] = 0;
+  *srcp = src + i;
+  *lenp = len;
+  return TRUE;
+}
+
+static struct data_struct *
+find_chunk (bfd *abfd, bfd_vma vma)
+{
+  struct data_struct *d = abfd->tdata.tekhex_data->data;
+
+  vma &= ~CHUNK_MASK;
+  while (d && (d->vma) != vma)
+    d = d->next;
+
+  if (!d)
+    {
+      /* No chunk for this address, so make one up.  */
+      d = (struct data_struct *)
+          bfd_zalloc (abfd, (bfd_size_type) sizeof (struct data_struct));
+
+      if (!d)
+	return NULL;
+
+      d->next = abfd->tdata.tekhex_data->data;
+      d->vma = vma;
+      abfd->tdata.tekhex_data->data = d;
+    }
+  return d;
+}
+
+static void
+insert_byte (bfd *abfd, int value, bfd_vma addr)
+{
+  /* Find the chunk that this byte needs and put it in.  */
+  struct data_struct *d = find_chunk (abfd, addr);
+
+  d->chunk_data[addr & CHUNK_MASK] = value;
+  d->chunk_init[addr & CHUNK_MASK] = 1;
+}
+
+/* The first pass is to find the names of all the sections, and see
+  how big the data is.  */
+
+static bfd_boolean
+first_phase (bfd *abfd, int type, char *src)
+{
+  asection *section = bfd_abs_section_ptr;
+  unsigned int len;
+  bfd_vma val;
+  char sym[17];			/* A symbol can only be 16chars long.  */
+
+  switch (type)
+    {
+    case '6':
+      /* Data record - read it and store it.  */
+      {
+	bfd_vma addr;
+
+	if (!getvalue (&src, &addr))
+	  return FALSE;
+
+	while (*src)
+	  {
+	    insert_byte (abfd, HEX (src), addr);
+	    src += 2;
+	    addr++;
+	  }
+      }
+
+      return TRUE;
+    case '3':
+      /* Symbol record, read the segment.  */
+      if (!getsym (sym, &src, &len))
+	return FALSE;
+      section = bfd_get_section_by_name (abfd, sym);
+      if (section == NULL)
+	{
+	  char *n = (char *) bfd_alloc (abfd, (bfd_size_type) len + 1);
+
+	  if (!n)
+	    return FALSE;
+	  memcpy (n, sym, len + 1);
+	  section = bfd_make_section (abfd, n);
+	  if (section == NULL)
+	    return FALSE;
+	}
+      while (*src)
+	{
+	  switch (*src)
+	    {
+	    case '1':		/* Section range.  */
+	      src++;
+	      if (!getvalue (&src, &section->vma))
+		return FALSE;
+	      if (!getvalue (&src, &val))
+		return FALSE;
+	      section->size = val - section->vma;
+	      section->flags = SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC;
+	      break;
+	    case '0':
+	    case '2':
+	    case '3':
+	    case '4':
+	    case '6':
+	    case '7':
+	    case '8':
+	      /* Symbols, add to section.  */
+	      {
+		bfd_size_type amt = sizeof (tekhex_symbol_type);
+		tekhex_symbol_type *new_symbol = (tekhex_symbol_type *)
+                    bfd_alloc (abfd, amt);
+		char stype = (*src);
+
+		if (!new_symbol)
+		  return FALSE;
+		new_symbol->symbol.the_bfd = abfd;
+		src++;
+		abfd->symcount++;
+		abfd->flags |= HAS_SYMS;
+		new_symbol->prev = abfd->tdata.tekhex_data->symbols;
+		abfd->tdata.tekhex_data->symbols = new_symbol;
+		if (!getsym (sym, &src, &len))
+		  return FALSE;
+		new_symbol->symbol.name = (const char *)
+                    bfd_alloc (abfd, (bfd_size_type) len + 1);
+		if (!new_symbol->symbol.name)
+		  return FALSE;
+		memcpy ((char *) (new_symbol->symbol.name), sym, len + 1);
+		new_symbol->symbol.section = section;
+		if (stype <= '4')
+		  new_symbol->symbol.flags = (BSF_GLOBAL | BSF_EXPORT);
+		else
+		  new_symbol->symbol.flags = BSF_LOCAL;
+		if (!getvalue (&src, &val))
+		  return FALSE;
+		new_symbol->symbol.value = val - section->vma;
+		break;
+	      }
+	    default:
+	      return FALSE;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Pass over a tekhex, calling one of the above functions on each
+   record.  */
+
+static bfd_boolean
+pass_over (bfd *abfd, bfd_boolean (*func) (bfd *, int, char *))
+{
+  unsigned int chars_on_line;
+  bfd_boolean is_eof = FALSE;
+
+  /* To the front of the file.  */
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    return FALSE;
+  while (! is_eof)
+    {
+      char src[MAXCHUNK];
+      char type;
+
+      /* Find first '%'.  */
+      is_eof = (bfd_boolean) (bfd_bread (src, (bfd_size_type) 1, abfd) != 1);
+      while (*src != '%' && !is_eof)
+	is_eof = (bfd_boolean) (bfd_bread (src, (bfd_size_type) 1, abfd) != 1);
+
+      if (is_eof)
+	break;
+
+      /* Fetch the type and the length and the checksum.  */
+      if (bfd_bread (src, (bfd_size_type) 5, abfd) != 5)
+	return FALSE;
+
+      type = src[2];
+
+      if (!ISHEX (src[0]) || !ISHEX (src[1]))
+	break;
+
+      /* Already read five chars.  */
+      chars_on_line = HEX (src) - 5;
+
+      if (chars_on_line >= MAXCHUNK)
+	return FALSE;
+
+      if (bfd_bread (src, (bfd_size_type) chars_on_line, abfd) != chars_on_line)
+	return FALSE;
+
+      /* Put a null at the end.  */
+      src[chars_on_line] = 0;
+
+      if (!func (abfd, type, src))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+static long
+tekhex_canonicalize_symtab (bfd *abfd, asymbol **table)
+{
+  tekhex_symbol_type *p = abfd->tdata.tekhex_data->symbols;
+  unsigned int c = bfd_get_symcount (abfd);
+
+  table[c] = 0;
+  while (p)
+    {
+      table[--c] = &(p->symbol);
+      p = p->prev;
+    }
+
+  return bfd_get_symcount (abfd);
+}
+
+static long
+tekhex_get_symtab_upper_bound (bfd *abfd)
+{
+  return (abfd->symcount + 1) * (sizeof (struct tekhex_asymbol_struct *));
+
+}
+
+static bfd_boolean
+tekhex_mkobject (bfd *abfd)
+{
+  tdata_type *tdata;
+
+  tdata = (tdata_type *) bfd_alloc (abfd, (bfd_size_type) sizeof (tdata_type));
+  if (!tdata)
+    return FALSE;
+  abfd->tdata.tekhex_data = tdata;
+  tdata->type = 1;
+  tdata->head =  NULL;
+  tdata->symbols = NULL;
+  tdata->data = NULL;
+  return TRUE;
+}
+
+/* Return TRUE if the file looks like it's in TekHex format. Just look
+   for a percent sign and some hex digits.  */
+
+static const bfd_target *
+tekhex_object_p (bfd *abfd)
+{
+  char b[4];
+
+  tekhex_init ();
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
+      || bfd_bread (b, (bfd_size_type) 4, abfd) != 4)
+    return NULL;
+
+  if (b[0] != '%' || !ISHEX (b[1]) || !ISHEX (b[2]) || !ISHEX (b[3]))
+    return NULL;
+
+  tekhex_mkobject (abfd);
+
+  if (!pass_over (abfd, first_phase))
+    return NULL;
+
+  return abfd->xvec;
+}
+
+static void
+move_section_contents (bfd *abfd,
+		       asection *section,
+		       const void * locationp,
+		       file_ptr offset,
+		       bfd_size_type count,
+		       bfd_boolean get)
+{
+  bfd_vma addr;
+  char *location = (char *) locationp;
+  bfd_vma prev_number = 1;	/* Nothing can have this as a high bit.  */
+  struct data_struct *d = NULL;
+
+  BFD_ASSERT (offset == 0);
+  for (addr = section->vma; count != 0; count--, addr++)
+    {
+      /* Get high bits of address.  */
+      bfd_vma chunk_number = addr & ~(bfd_vma) CHUNK_MASK;
+      bfd_vma low_bits = addr & CHUNK_MASK;
+
+      if (chunk_number != prev_number)
+	/* Different chunk, so move pointer. */
+	d = find_chunk (abfd, chunk_number);
+
+      if (get)
+	{
+	  if (d->chunk_init[low_bits])
+	    *location = d->chunk_data[low_bits];
+	  else
+	    *location = 0;
+	}
+      else
+	{
+	  d->chunk_data[low_bits] = *location;
+	  d->chunk_init[low_bits] = (*location != 0);
+	}
+
+      location++;
+    }
+}
+
+static bfd_boolean
+tekhex_get_section_contents (bfd *abfd,
+			     asection *section,
+			     void * locationp,
+			     file_ptr offset,
+			     bfd_size_type count)
+{
+  if (section->flags & (SEC_LOAD | SEC_ALLOC))
+    {
+      move_section_contents (abfd, section, locationp, offset, count, TRUE);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static bfd_boolean
+tekhex_set_arch_mach (bfd *abfd,
+		      enum bfd_architecture arch,
+		      unsigned long machine)
+{
+  return bfd_default_set_arch_mach (abfd, arch, machine);
+}
+
+/* We have to save up all the Tekhexords for a splurge before output.  */
+
+static bfd_boolean
+tekhex_set_section_contents (bfd *abfd,
+			     sec_ptr section,
+			     const void * locationp,
+			     file_ptr offset,
+			     bfd_size_type bytes_to_do)
+{
+  if (! abfd->output_has_begun)
+    {
+      /* The first time around, allocate enough sections to hold all the chunks.  */
+      asection *s = abfd->sections;
+      bfd_vma vma;
+
+      for (s = abfd->sections; s; s = s->next)
+	{
+	  if (s->flags & SEC_LOAD)
+	    {
+	      for (vma = s->vma & ~(bfd_vma) CHUNK_MASK;
+		   vma < s->vma + s->size;
+		   vma += CHUNK_MASK)
+		find_chunk (abfd, vma);
+	    }
+	}
+    }
+
+  if (section->flags & (SEC_LOAD | SEC_ALLOC))
+    {
+      move_section_contents (abfd, section, locationp, offset, bytes_to_do,
+			     FALSE);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+writevalue (char **dst, bfd_vma value)
+{
+  char *p = *dst;
+  int len;
+  int shift;
+
+  for (len = 8, shift = 28; shift; shift -= 4, len--)
+    {
+      if ((value >> shift) & 0xf)
+	{
+	  *p++ = len + '0';
+	  while (len)
+	    {
+	      *p++ = digs[(value >> shift) & 0xf];
+	      shift -= 4;
+	      len--;
+	    }
+	  *dst = p;
+	  return;
+
+	}
+    }
+  *p++ = '1';
+  *p++ = '0';
+  *dst = p;
+}
+
+static void
+writesym (char **dst, const char *sym)
+{
+  char *p = *dst;
+  int len = (sym ? strlen (sym) : 0);
+
+  if (len >= 16)
+    {
+      *p++ = '0';
+      len = 16;
+    }
+  else
+    {
+      if (len == 0)
+	{
+	  *p++ = '1';
+	  sym = "$";
+	  len = 1;
+	}
+      else
+	*p++ = digs[len];
+    }
+
+  while (len--)
+    *p++ = *sym++;
+
+  *dst = p;
+}
+
+static void
+out (bfd *abfd, int type, char *start, char *end)
+{
+  int sum = 0;
+  char *s;
+  char front[6];
+  bfd_size_type wrlen;
+
+  front[0] = '%';
+  TOHEX (front + 1, end - start + 5);
+  front[3] = type;
+
+  for (s = start; s < end; s++)
+    sum += sum_block[(unsigned char) *s];
+
+  sum += sum_block[(unsigned char) front[1]];	/* Length.  */
+  sum += sum_block[(unsigned char) front[2]];
+  sum += sum_block[(unsigned char) front[3]];	/* Type.  */
+  TOHEX (front + 4, sum);
+  if (bfd_bwrite (front, (bfd_size_type) 6, abfd) != 6)
+    abort ();
+  end[0] = '\n';
+  wrlen = end - start + 1;
+  if (bfd_bwrite (start, wrlen, abfd) != wrlen)
+    abort ();
+}
+
+static bfd_boolean
+tekhex_write_object_contents (bfd *abfd)
+{
+  char buffer[100];
+  asymbol **p;
+  asection *s;
+  struct data_struct *d;
+
+  tekhex_init ();
+
+  /* And the raw data.  */
+  for (d = abfd->tdata.tekhex_data->data;
+       d != NULL;
+       d = d->next)
+    {
+      int low;
+
+      const int span = 32;
+      int addr;
+
+      /* Write it in blocks of 32 bytes.  */
+      for (addr = 0; addr < CHUNK_MASK + 1; addr += span)
+	{
+	  int need = 0;
+
+	  /* Check to see if necessary.  */
+	  for (low = 0; !need && low < span; low++)
+	    if (d->chunk_init[addr + low])
+	      need = 1;
+
+	  if (need)
+	    {
+	      char *dst = buffer;
+
+	      writevalue (&dst, addr + d->vma);
+	      for (low = 0; low < span; low++)
+		{
+		  TOHEX (dst, d->chunk_data[addr + low]);
+		  dst += 2;
+		}
+	      out (abfd, '6', buffer, dst);
+	    }
+	}
+    }
+
+  /* Write all the section headers for the sections.  */
+  for (s = abfd->sections; s != NULL; s = s->next)
+    {
+      char *dst = buffer;
+
+      writesym (&dst, s->name);
+      *dst++ = '1';
+      writevalue (&dst, s->vma);
+      writevalue (&dst, s->vma + s->size);
+      out (abfd, '3', buffer, dst);
+    }
+
+  /* And the symbols.  */
+  if (abfd->outsymbols)
+    {
+      for (p = abfd->outsymbols; *p; p++)
+	{
+	  int section_code = bfd_decode_symclass (*p);
+
+	  if (section_code != '?')
+	    {
+	      /* Do not include debug symbols.  */
+	      asymbol *sym = *p;
+	      char *dst = buffer;
+
+	      writesym (&dst, sym->section->name);
+
+	      switch (section_code)
+		{
+		case 'A':
+		  *dst++ = '2';
+		  break;
+		case 'a':
+		  *dst++ = '6';
+		  break;
+		case 'D':
+		case 'B':
+		case 'O':
+		  *dst++ = '4';
+		  break;
+		case 'd':
+		case 'b':
+		case 'o':
+		  *dst++ = '8';
+		  break;
+		case 'T':
+		  *dst++ = '3';
+		  break;
+		case 't':
+		  *dst++ = '7';
+		  break;
+		case 'C':
+		case 'U':
+		  bfd_set_error (bfd_error_wrong_format);
+		  return FALSE;
+		}
+
+	      writesym (&dst, sym->name);
+	      writevalue (&dst, sym->value + sym->section->vma);
+	      out (abfd, '3', buffer, dst);
+	    }
+	}
+    }
+
+  /* And the terminator.  */
+  if (bfd_bwrite ("%0781010\n", (bfd_size_type) 9, abfd) != 9)
+    abort ();
+  return TRUE;
+}
+
+static int
+tekhex_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+		       struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static asymbol *
+tekhex_make_empty_symbol (bfd *abfd)
+{
+  bfd_size_type amt = sizeof (struct tekhex_symbol_struct);
+  tekhex_symbol_type *new_symbol = (tekhex_symbol_type *) bfd_zalloc (abfd,
+                                                                      amt);
+
+  if (!new_symbol)
+    return NULL;
+  new_symbol->symbol.the_bfd = abfd;
+  new_symbol->prev =  NULL;
+  return &(new_symbol->symbol);
+}
+
+static void
+tekhex_get_symbol_info (bfd *abfd ATTRIBUTE_UNUSED,
+			asymbol *symbol,
+			symbol_info *ret)
+{
+  bfd_symbol_info (symbol, ret);
+}
+
+static void
+tekhex_print_symbol (bfd *abfd,
+		     void * filep,
+		     asymbol *symbol,
+		     bfd_print_symbol_type how)
+{
+  FILE *file = (FILE *) filep;
+
+  switch (how)
+    {
+    case bfd_print_symbol_name:
+      fprintf (file, "%s", symbol->name);
+      break;
+    case bfd_print_symbol_more:
+      break;
+
+    case bfd_print_symbol_all:
+      {
+	const char *section_name = symbol->section->name;
+
+	bfd_print_symbol_vandf (abfd, (void *) file, symbol);
+
+	fprintf (file, " %-5s %s",
+		 section_name, symbol->name);
+      }
+    }
+}
+
+#define	tekhex_close_and_cleanup                    _bfd_generic_close_and_cleanup
+#define tekhex_bfd_free_cached_info                 _bfd_generic_bfd_free_cached_info
+#define tekhex_new_section_hook                     _bfd_generic_new_section_hook
+#define tekhex_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define tekhex_bfd_is_local_label_name               bfd_generic_is_local_label_name
+#define tekhex_get_lineno                           _bfd_nosymbols_get_lineno
+#define tekhex_find_nearest_line                    _bfd_nosymbols_find_nearest_line
+#define tekhex_find_inliner_info                    _bfd_nosymbols_find_inliner_info
+#define tekhex_bfd_make_debug_symbol                _bfd_nosymbols_bfd_make_debug_symbol
+#define tekhex_read_minisymbols                     _bfd_generic_read_minisymbols
+#define tekhex_minisymbol_to_symbol                 _bfd_generic_minisymbol_to_symbol
+#define tekhex_bfd_get_relocated_section_contents   bfd_generic_get_relocated_section_contents
+#define tekhex_bfd_relax_section                    bfd_generic_relax_section
+#define tekhex_bfd_gc_sections                      bfd_generic_gc_sections
+#define tekhex_bfd_lookup_section_flags		    bfd_generic_lookup_section_flags
+#define tekhex_bfd_merge_sections                   bfd_generic_merge_sections
+#define tekhex_bfd_is_group_section                 bfd_generic_is_group_section
+#define tekhex_bfd_discard_group                    bfd_generic_discard_group
+#define tekhex_section_already_linked               _bfd_generic_section_already_linked
+#define tekhex_bfd_define_common_symbol             bfd_generic_define_common_symbol
+#define tekhex_bfd_link_hash_table_create           _bfd_generic_link_hash_table_create
+#define tekhex_bfd_link_hash_table_free             _bfd_generic_link_hash_table_free
+#define tekhex_bfd_link_add_symbols                 _bfd_generic_link_add_symbols
+#define tekhex_bfd_link_just_syms                   _bfd_generic_link_just_syms
+#define tekhex_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define tekhex_bfd_final_link                       _bfd_generic_final_link
+#define tekhex_bfd_link_split_section               _bfd_generic_link_split_section
+#define tekhex_get_section_contents_in_window       _bfd_generic_get_section_contents_in_window
+
+const bfd_target tekhex_vec =
+{
+  "tekhex",			/* Name.  */
+  bfd_target_tekhex_flavour,
+  BFD_ENDIAN_UNKNOWN,		/* Target byte order.  */
+  BFD_ENDIAN_UNKNOWN,		/* Target headers byte order.  */
+  (EXEC_P |			/* Object flags.  */
+   HAS_SYMS | HAS_LINENO | HAS_DEBUG |
+   HAS_RELOC | HAS_LOCALS | WP_TEXT | D_PAGED),
+  (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
+   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* Section flags.  */
+  0,				/* Leading underscore.  */
+  ' ',				/* AR_pad_char.  */
+  16,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Data.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Headers.  */
+
+  {
+    _bfd_dummy_target,
+    tekhex_object_p,		/* bfd_check_format.  */
+    _bfd_dummy_target,
+    _bfd_dummy_target,
+  },
+  {
+    bfd_false,
+    tekhex_mkobject,
+    _bfd_generic_mkarchive,
+    bfd_false,
+  },
+  {				/* bfd_write_contents.  */
+    bfd_false,
+    tekhex_write_object_contents,
+    _bfd_write_archive_contents,
+    bfd_false,
+  },
+
+  BFD_JUMP_TABLE_GENERIC (tekhex),
+  BFD_JUMP_TABLE_COPY (_bfd_generic),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+  BFD_JUMP_TABLE_SYMBOLS (tekhex),
+  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+  BFD_JUMP_TABLE_WRITE (tekhex),
+  BFD_JUMP_TABLE_LINK (tekhex),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  NULL
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ticoff.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ticoff.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/ticoff.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/ticoff.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,124 @@
+/* Copyright 2002, 2005, 2007, 2009 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#undef  F_LSYMS
+#define	F_LSYMS		F_LSYMS_TICOFF
+
+static bfd_boolean
+ticoff0_bad_format_hook (abfd, filehdr)
+     bfd *abfd;
+     PTR filehdr;
+{
+  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
+
+  if (COFF0_BADMAG (*internal_f))
+    return FALSE;
+
+  return TRUE;
+}
+
+static bfd_boolean
+ticoff1_bad_format_hook (abfd, filehdr)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     PTR filehdr;
+{
+  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
+
+  if (COFF1_BADMAG (*internal_f))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Replace the stock _bfd_coff_is_local_label_name
+   to recognize TI COFF local labels.  */
+static bfd_boolean 
+ticoff_bfd_is_local_label_name (abfd, name)
+  bfd *abfd ATTRIBUTE_UNUSED;
+  const char *name;
+{
+  if (TICOFF_LOCAL_LABEL_P(name))
+    return TRUE;
+  return FALSE;
+}
+
+#define coff_bfd_is_local_label_name ticoff_bfd_is_local_label_name
+
+/* Customize coffcode.h; the default coff_ functions are set up to use COFF2; 
+   coff_bad_format_hook uses BADMAG, so set that for COFF2.  The COFF1
+   and COFF0 vectors use custom _bad_format_hook procs instead of setting
+   BADMAG.  */ 
+#define BADMAG(x) COFF2_BADMAG(x)
+#include "coffcode.h"
+
+/* COFF0 differs in file/section header size and relocation entry size.  */
+static bfd_coff_backend_data ticoff0_swap_table = 
+{
+  coff_SWAP_aux_in, coff_SWAP_sym_in, coff_SWAP_lineno_in,
+  coff_SWAP_aux_out, coff_SWAP_sym_out,
+  coff_SWAP_lineno_out, coff_SWAP_reloc_out,
+  coff_SWAP_filehdr_out, coff_SWAP_aouthdr_out,
+  coff_SWAP_scnhdr_out,
+  FILHSZ_V0, AOUTSZ, SCNHSZ_V01, SYMESZ, AUXESZ, RELSZ_V0, LINESZ, FILNMLEN,
+#ifdef COFF_LONG_FILENAMES
+  TRUE,
+#else
+  FALSE,
+#endif
+  COFF_DEFAULT_LONG_SECTION_NAMES,
+#endif
+  COFF_DEFAULT_SECTION_ALIGNMENT_POWER,
+  coff_SWAP_filehdr_in, coff_SWAP_aouthdr_in, coff_SWAP_scnhdr_in,
+  coff_SWAP_reloc_in, ticoff0_bad_format_hook, coff_set_arch_mach_hook,
+  coff_mkobject_hook, styp_to_sec_flags, coff_set_alignment_hook,
+  coff_slurp_symbol_table, symname_in_debug_hook, coff_pointerize_aux_hook,
+  coff_print_aux, coff_reloc16_extra_cases, coff_reloc16_estimate,
+  coff_classify_symbol, coff_compute_section_file_positions,
+  coff_start_final_link, coff_relocate_section, coff_rtype_to_howto,
+  coff_adjust_symndx, coff_link_add_one_symbol,
+  coff_link_output_has_begun, coff_final_link_postscript
+};
+
+/* COFF1 differs in section header size.  */
+static bfd_coff_backend_data ticoff1_swap_table = 
+{
+  coff_SWAP_aux_in, coff_SWAP_sym_in, coff_SWAP_lineno_in,
+  coff_SWAP_aux_out, coff_SWAP_sym_out,
+  coff_SWAP_lineno_out, coff_SWAP_reloc_out,
+  coff_SWAP_filehdr_out, coff_SWAP_aouthdr_out,
+  coff_SWAP_scnhdr_out,
+  FILHSZ, AOUTSZ, SCNHSZ_V01, SYMESZ, AUXESZ, RELSZ, LINESZ, FILNMLEN,
+#ifdef COFF_LONG_FILENAMES
+  TRUE,
+#else
+  FALSE,
+#endif
+  COFF_DEFAULT_LONG_SECTION_NAMES,
+  COFF_DEFAULT_SECTION_ALIGNMENT_POWER,
+  coff_SWAP_filehdr_in, coff_SWAP_aouthdr_in, coff_SWAP_scnhdr_in,
+  coff_SWAP_reloc_in, ticoff1_bad_format_hook, coff_set_arch_mach_hook,
+  coff_mkobject_hook, styp_to_sec_flags, coff_set_alignment_hook,
+  coff_slurp_symbol_table, symname_in_debug_hook, coff_pointerize_aux_hook,
+  coff_print_aux, coff_reloc16_extra_cases, coff_reloc16_estimate,
+  coff_classify_symbol, coff_compute_section_file_positions,
+  coff_start_final_link, coff_relocate_section, coff_rtype_to_howto,
+  coff_adjust_symndx, coff_link_add_one_symbol,
+  coff_link_output_has_begun, coff_final_link_postscript
+};
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/trad-core.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/trad-core.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/trad-core.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/trad-core.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,326 @@
+/* BFD back end for traditional Unix core files (U-area and raw sections)
+   Copyright 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2011
+   Free Software Foundation, Inc.
+   Written by John Gilmore of Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libaout.h"           /* BFD a.out internal data structures */
+
+#include <sys/param.h>
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#else
+# ifdef HAVE_SYS_NDIR_H
+#  include <sys/ndir.h>
+# endif
+# ifdef HAVE_SYS_DIR_H
+#  include <sys/dir.h>
+# endif
+# ifdef HAVE_NDIR_H
+#  include <ndir.h>
+# endif
+#endif
+#include <signal.h>
+
+#include <sys/user.h>		/* After a.out.h  */
+
+#ifdef TRAD_HEADER
+#include TRAD_HEADER
+#endif
+
+#ifndef NBPG
+# define NBPG getpagesize()
+#endif
+
+struct trad_core_struct
+{
+  asection *data_section;
+  asection *stack_section;
+  asection *reg_section;
+  struct user u;
+};
+
+#define core_upage(bfd) (&((bfd)->tdata.trad_core_data->u))
+#define core_datasec(bfd) ((bfd)->tdata.trad_core_data->data_section)
+#define core_stacksec(bfd) ((bfd)->tdata.trad_core_data->stack_section)
+#define core_regsec(bfd) ((bfd)->tdata.trad_core_data->reg_section)
+
+/* forward declarations */
+
+const bfd_target *trad_unix_core_file_p PARAMS ((bfd *abfd));
+char * trad_unix_core_file_failing_command PARAMS ((bfd *abfd));
+int trad_unix_core_file_failing_signal PARAMS ((bfd *abfd));
+#define trad_unix_core_file_matches_executable_p generic_core_file_matches_executable_p
+#define trad_unix_core_file_pid _bfd_nocore_core_file_pid
+static void swap_abort PARAMS ((void));
+
+/* Handle 4.2-style (and perhaps also sysV-style) core dump file.  */
+
+const bfd_target *
+trad_unix_core_file_p (abfd)
+     bfd *abfd;
+
+{
+  int val;
+  struct user u;
+  struct trad_core_struct *rawptr;
+  bfd_size_type amt;
+  flagword flags;
+
+#ifdef TRAD_CORE_USER_OFFSET
+  /* If defined, this macro is the file position of the user struct.  */
+  if (bfd_seek (abfd, (file_ptr) TRAD_CORE_USER_OFFSET, SEEK_SET) != 0)
+    return 0;
+#endif
+
+  val = bfd_bread ((void *) &u, (bfd_size_type) sizeof u, abfd);
+  if (val != sizeof u)
+    {
+      /* Too small to be a core file */
+      bfd_set_error (bfd_error_wrong_format);
+      return 0;
+    }
+
+  /* Sanity check perhaps??? */
+  if (u.u_dsize > 0x1000000)	/* Remember, it's in pages...  */
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return 0;
+    }
+  if (u.u_ssize > 0x1000000)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return 0;
+    }
+
+  /* Check that the size claimed is no greater than the file size.  */
+  {
+    struct stat statbuf;
+
+    if (bfd_stat (abfd, &statbuf) < 0)
+      return 0;
+
+    if ((ufile_ptr) NBPG * (UPAGES + u.u_dsize
+#ifdef TRAD_CORE_DSIZE_INCLUDES_TSIZE
+			    - u.u_tsize
+#endif
+			    + u.u_ssize)
+	> (ufile_ptr) statbuf.st_size)
+      {
+	bfd_set_error (bfd_error_wrong_format);
+	return 0;
+      }
+#ifndef TRAD_CORE_ALLOW_ANY_EXTRA_SIZE
+    if (((ufile_ptr) NBPG * (UPAGES + u.u_dsize + u.u_ssize)
+#ifdef TRAD_CORE_EXTRA_SIZE_ALLOWED
+	/* Some systems write the file too big.  */
+	 + TRAD_CORE_EXTRA_SIZE_ALLOWED
+#endif
+	 )
+	< (ufile_ptr) statbuf.st_size)
+      {
+	/* The file is too big.  Maybe it's not a core file
+	   or we otherwise have bad values for u_dsize and u_ssize).  */
+	bfd_set_error (bfd_error_wrong_format);
+	return 0;
+      }
+#endif
+  }
+
+  /* OK, we believe you.  You're a core file (sure, sure).  */
+
+  /* Allocate both the upage and the struct core_data at once, so
+     a single free() will free them both.  */
+  amt = sizeof (struct trad_core_struct);
+  rawptr = (struct trad_core_struct *) bfd_zmalloc (amt);
+  if (rawptr == NULL)
+    return 0;
+
+  abfd->tdata.trad_core_data = rawptr;
+
+  rawptr->u = u; /*Copy the uarea into the tdata part of the bfd */
+
+  /* Create the sections.  */
+
+  flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
+  core_stacksec(abfd) = bfd_make_section_anyway_with_flags (abfd, ".stack",
+							    flags);
+  if (core_stacksec (abfd) == NULL)
+    goto fail;
+  core_datasec (abfd) = bfd_make_section_anyway_with_flags (abfd, ".data",
+							    flags);
+  if (core_datasec (abfd) == NULL)
+    goto fail;
+  core_regsec (abfd) = bfd_make_section_anyway_with_flags (abfd, ".reg",
+							   SEC_HAS_CONTENTS);
+  if (core_regsec (abfd) == NULL)
+    goto fail;
+
+  core_datasec (abfd)->size =  NBPG * u.u_dsize
+#ifdef TRAD_CORE_DSIZE_INCLUDES_TSIZE
+    - NBPG * u.u_tsize
+#endif
+      ;
+  core_stacksec (abfd)->size = NBPG * u.u_ssize;
+  core_regsec (abfd)->size = NBPG * UPAGES; /* Larger than sizeof struct u */
+
+  /* What a hack... we'd like to steal it from the exec file,
+     since the upage does not seem to provide it.  FIXME.  */
+#ifdef HOST_DATA_START_ADDR
+  core_datasec (abfd)->vma = HOST_DATA_START_ADDR;
+#else
+  core_datasec (abfd)->vma = HOST_TEXT_START_ADDR + (NBPG * u.u_tsize);
+#endif
+
+#ifdef HOST_STACK_START_ADDR
+  core_stacksec (abfd)->vma = HOST_STACK_START_ADDR;
+#else
+  core_stacksec (abfd)->vma = HOST_STACK_END_ADDR - (NBPG * u.u_ssize);
+#endif
+
+  /* This is tricky.  As the "register section", we give them the entire
+     upage and stack.  u.u_ar0 points to where "register 0" is stored.
+     There are two tricks with this, though.  One is that the rest of the
+     registers might be at positive or negative (or both) displacements
+     from *u_ar0.  The other is that u_ar0 is sometimes an absolute address
+     in kernel memory, and on other systems it is an offset from the beginning
+     of the `struct user'.
+
+     As a practical matter, we don't know where the registers actually are,
+     so we have to pass the whole area to GDB.  We encode the value of u_ar0
+     by setting the .regs section up so that its virtual memory address
+     0 is at the place pointed to by u_ar0 (by setting the vma of the start
+     of the section to -u_ar0).  GDB uses this info to locate the regs,
+     using minor trickery to get around the offset-or-absolute-addr problem.  */
+  core_regsec (abfd)->vma = - (bfd_vma) (unsigned long) u.u_ar0;
+
+  core_datasec (abfd)->filepos = NBPG * UPAGES;
+  core_stacksec (abfd)->filepos = (NBPG * UPAGES) + NBPG * u.u_dsize
+#ifdef TRAD_CORE_DSIZE_INCLUDES_TSIZE
+    - NBPG * u.u_tsize
+#endif
+      ;
+  core_regsec (abfd)->filepos = 0; /* Register segment is the upage */
+
+  /* Align to word at least */
+  core_stacksec (abfd)->alignment_power = 2;
+  core_datasec (abfd)->alignment_power = 2;
+  core_regsec (abfd)->alignment_power = 2;
+
+  return abfd->xvec;
+
+ fail:
+  bfd_release (abfd, abfd->tdata.any);
+  abfd->tdata.any = NULL;
+  bfd_section_list_clear (abfd);
+  return NULL;
+}
+
+char *
+trad_unix_core_file_failing_command (abfd)
+     bfd *abfd;
+{
+#ifndef NO_CORE_COMMAND
+  char *com = abfd->tdata.trad_core_data->u.u_comm;
+  if (*com)
+    return com;
+  else
+#endif
+    return 0;
+}
+
+int
+trad_unix_core_file_failing_signal (ignore_abfd)
+     bfd *ignore_abfd ATTRIBUTE_UNUSED;
+{
+#ifdef TRAD_UNIX_CORE_FILE_FAILING_SIGNAL
+  return TRAD_UNIX_CORE_FILE_FAILING_SIGNAL(ignore_abfd);
+#else
+  return -1;		/* FIXME, where is it? */
+#endif
+}
+
+/* If somebody calls any byte-swapping routines, shoot them.  */
+static void
+swap_abort ()
+{
+  abort (); /* This way doesn't require any declaration for ANSI to fuck up */
+}
+
+#define	NO_GET ((bfd_vma (*) (const void *)) swap_abort)
+#define	NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
+#define	NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
+#define	NO_GET64 ((bfd_uint64_t (*) (const void *)) swap_abort)
+#define	NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
+#define	NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
+
+const bfd_target trad_core_vec =
+  {
+    "trad-core",
+    bfd_target_unknown_flavour,
+    BFD_ENDIAN_UNKNOWN,		/* target byte order */
+    BFD_ENDIAN_UNKNOWN,		/* target headers byte order */
+    (HAS_RELOC | EXEC_P |	/* object flags */
+     HAS_LINENO | HAS_DEBUG |
+     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+    0,				/* symbol prefix */
+    ' ',			/* ar_pad_char */
+    16,				/* ar_max_namelen */
+    0,				/* match priority.  */
+    NO_GET64, NO_GETS64, NO_PUT64,	/* 64 bit data */
+    NO_GET, NO_GETS, NO_PUT,		/* 32 bit data */
+    NO_GET, NO_GETS, NO_PUT,		/* 16 bit data */
+    NO_GET64, NO_GETS64, NO_PUT64,	/* 64 bit hdrs */
+    NO_GET, NO_GETS, NO_PUT,		/* 32 bit hdrs */
+    NO_GET, NO_GETS, NO_PUT,		/* 16 bit hdrs */
+
+    {				/* bfd_check_format */
+      _bfd_dummy_target,		/* unknown format */
+      _bfd_dummy_target,		/* object file */
+      _bfd_dummy_target,		/* archive */
+      trad_unix_core_file_p		/* a core file */
+    },
+    {				/* bfd_set_format */
+      bfd_false, bfd_false,
+      bfd_false, bfd_false
+    },
+    {				/* bfd_write_contents */
+      bfd_false, bfd_false,
+      bfd_false, bfd_false
+    },
+
+    BFD_JUMP_TABLE_GENERIC (_bfd_generic),
+    BFD_JUMP_TABLE_COPY (_bfd_generic),
+    BFD_JUMP_TABLE_CORE (trad_unix),
+    BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+    BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
+    BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+    BFD_JUMP_TABLE_WRITE (_bfd_generic),
+    BFD_JUMP_TABLE_LINK (_bfd_nolink),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+    NULL,
+
+    (PTR) 0			/* backend_data */
+  };
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/vax1knetbsd.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/vax1knetbsd.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/vax1knetbsd.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/vax1knetbsd.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,38 @@
+/* BFD back-end for NetBSD/VAX (1K page size) a.out-ish binaries.
+   Copyright 1998, 2000, 2001, 2002, 2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define	BYTES_IN_WORD	4
+#undef TARGET_IS_BIG_ENDIAN_P
+
+#define	TARGET_PAGE_SIZE	1024
+#define	SEGMENT_SIZE	TARGET_PAGE_SIZE
+
+#define	DEFAULT_ARCH	bfd_arch_vax
+#define	DEFAULT_MID 	M_VAX_NETBSD
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (vax1knetbsd_,OP)
+
+/* This needs to start with a.out so GDB knows it is an a.out variant.  */
+#define TARGETNAME "a.out-vax1k-netbsd"
+
+#include "netbsd.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/vaxbsd.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/vaxbsd.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/vaxbsd.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/vaxbsd.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,40 @@
+/* BFD back-end for BSD and Ultrix/VAX (1K page size) a.out-ish binaries.
+   Copyright 2002, 2003, 2005, 2007, 2009 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define N_HEADER_IN_TEXT(x) 0
+#define ENTRY_CAN_BE_ZERO
+#define TEXT_START_ADDR 0
+#define TARGET_PAGE_SIZE 1024
+#define SEGMENT_SIZE TARGET_PAGE_SIZE
+#define DEFAULT_ARCH bfd_arch_vax
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not   
+   remove whitespace added here, and thus will fail to concatenate the 
+   tokens.  */
+#define MY(OP) CONCAT2 (vaxbsd_,OP)
+
+#define TARGETNAME "a.out-vax-bsd"
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libaout.h"
+
+#include "aout-target.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/vaxnetbsd.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/vaxnetbsd.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/vaxnetbsd.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/vaxnetbsd.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,39 @@
+/* BFD back-end for NetBSD/VAX (4K page size) a.out-ish binaries.
+   Copyright 1998, 2000, 2001, 2002, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define	BYTES_IN_WORD	4
+#undef TARGET_IS_BIG_ENDIAN_P
+
+#define	TARGET_PAGE_SIZE	0x1000
+#define	SEGMENT_SIZE	TARGET_PAGE_SIZE
+
+#define	DEFAULT_ARCH	bfd_arch_vax
+#define	DEFAULT_MID 	M_VAX4K_NETBSD
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (vaxnetbsd_,OP)
+
+/* This needs to start with a.out so GDB knows it is an a.out variant.  */
+#define TARGETNAME "a.out-vax-netbsd"
+
+#include "netbsd.h"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/verilog.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/verilog.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/verilog.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/verilog.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,375 @@
+/* BFD back-end for verilog hex memory dump files.
+   Copyright 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Anthony Green <green@moxielogic.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* SUBSECTION
+	Verilog hex memory file handling
+
+   DESCRIPTION
+
+	Verilog hex memory files cannot hold anything but addresses
+	and data, so that's all that we implement.
+
+	The syntax of the text file is described in the IEEE standard
+	for Verilog.  Briefly, the file contains two types of tokens:
+	data and optional addresses.  The tokens are separated by
+	whitespace and comments.  Comments may be single line or
+	multiline, using syntax similar to C++.  Addresses are
+	specified by a leading "at" character (@) and are always
+	hexadecimal strings.  Data and addresses may contain
+	underscore (_) characters.
+
+	If no address is specified, the data is assumed to start at
+	address 0.  Similarly, if data exists before the first
+	specified address, then that data is assumed to start at
+	address 0.
+
+
+   EXAMPLE
+	@1000
+        01 ae 3f 45 12
+
+   DESCRIPTION
+	@1000 specifies the starting address for the memory data.
+	The following characters describe the 5 bytes at 0x1000.  */
+
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libiberty.h"
+#include "safe-ctype.h"
+
+/* Macros for converting between hex and binary.  */
+
+static const char digs[] = "0123456789ABCDEF";
+
+#define NIBBLE(x)    hex_value(x)
+#define HEX(buffer) ((NIBBLE ((buffer)[0])<<4) + NIBBLE ((buffer)[1]))
+#define TOHEX(d, x) \
+	d[1] = digs[(x) & 0xf]; \
+	d[0] = digs[((x) >> 4) & 0xf];
+
+/* When writing a verilog memory dump file, we write them in the order
+   in which they appear in memory. This structure is used to hold them
+   in memory.  */
+
+struct verilog_data_list_struct
+{
+  struct verilog_data_list_struct *next;
+  bfd_byte * data;
+  bfd_vma where;
+  bfd_size_type size;
+};
+
+typedef struct verilog_data_list_struct verilog_data_list_type;
+
+/* The verilog tdata information.  */
+
+typedef struct verilog_data_struct
+{
+  verilog_data_list_type *head;
+  verilog_data_list_type *tail;
+}
+tdata_type;
+
+static bfd_boolean
+verilog_set_arch_mach (bfd *abfd, enum bfd_architecture arch, unsigned long mach)
+{
+  if (arch != bfd_arch_unknown)
+    return bfd_default_set_arch_mach (abfd, arch, mach);
+
+  abfd->arch_info = & bfd_default_arch_struct;
+  return TRUE;
+}
+
+/* We have to save up all the outpu for a splurge before output.  */
+
+static bfd_boolean
+verilog_set_section_contents (bfd *abfd,
+			      sec_ptr section,
+			      const void * location,
+			      file_ptr offset,
+			      bfd_size_type bytes_to_do)
+{
+  tdata_type *tdata = abfd->tdata.verilog_data;
+  verilog_data_list_type *entry;
+
+  entry = (verilog_data_list_type *) bfd_alloc (abfd, sizeof (* entry));
+  if (entry == NULL)
+    return FALSE;
+
+  if (bytes_to_do
+      && (section->flags & SEC_ALLOC)
+      && (section->flags & SEC_LOAD))
+    {
+      bfd_byte *data;
+
+      data = (bfd_byte *) bfd_alloc (abfd, bytes_to_do);
+      if (data == NULL)
+	return FALSE;
+      memcpy ((void *) data, location, (size_t) bytes_to_do);
+
+      entry->data = data;
+      entry->where = section->lma + offset;
+      entry->size = bytes_to_do;
+
+      /* Sort the records by address.  Optimize for the common case of
+	 adding a record to the end of the list.  */
+      if (tdata->tail != NULL
+	  && entry->where >= tdata->tail->where)
+	{
+	  tdata->tail->next = entry;
+	  entry->next = NULL;
+	  tdata->tail = entry;
+	}
+      else
+	{
+	  verilog_data_list_type **look;
+
+	  for (look = &tdata->head;
+	       *look != NULL && (*look)->where < entry->where;
+	       look = &(*look)->next)
+	    ;
+	  entry->next = *look;
+	  *look = entry;
+	  if (entry->next == NULL)
+	    tdata->tail = entry;
+	}
+    }
+  return TRUE;
+}
+
+static bfd_boolean
+verilog_write_address (bfd *abfd, bfd_vma address)
+{
+  char buffer[12];
+  char *dst = buffer;
+  bfd_size_type wrlen;
+
+  /* Write the address.  */
+  *dst++ = '@';
+  TOHEX (dst, (address >> 24));
+  dst += 2;
+  TOHEX (dst, (address >> 16));
+  dst += 2;
+  TOHEX (dst, (address >> 8));
+  dst += 2;
+  TOHEX (dst, (address));
+  dst += 2;
+  *dst++ = '\r';
+  *dst++ = '\n';
+  wrlen = dst - buffer;
+
+  return bfd_bwrite ((void *) buffer, wrlen, abfd) == wrlen;
+}
+
+/* Write a record of type, of the supplied number of bytes. The
+   supplied bytes and length don't have a checksum. That's worked out
+   here.  */
+
+static bfd_boolean
+verilog_write_record (bfd *abfd,
+		      const bfd_byte *data,
+		      const bfd_byte *end)
+{
+  char buffer[48];
+  const bfd_byte *src = data;
+  char *dst = buffer;
+  bfd_size_type wrlen;
+
+  /* Write the data.  */
+  for (src = data; src < end; src++)
+    {
+      TOHEX (dst, *src);
+      dst += 2;
+      *dst++ = ' ';
+    }
+  *dst++ = '\r';
+  *dst++ = '\n';
+  wrlen = dst - buffer;
+
+  return bfd_bwrite ((void *) buffer, wrlen, abfd) == wrlen;
+}
+
+static bfd_boolean
+verilog_write_section (bfd *abfd,
+		       tdata_type *tdata ATTRIBUTE_UNUSED,
+		       verilog_data_list_type *list)
+{
+  unsigned int octets_written = 0;
+  bfd_byte *location = list->data;
+
+  verilog_write_address (abfd, list->where);
+  while (octets_written < list->size)
+    {
+      unsigned int octets_this_chunk = list->size - octets_written;
+
+      if (octets_this_chunk > 16)
+	octets_this_chunk = 16;
+
+      if (! verilog_write_record (abfd,
+				  location,
+				  location + octets_this_chunk))
+	return FALSE;
+
+      octets_written += octets_this_chunk;
+      location += octets_this_chunk;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+verilog_write_object_contents (bfd *abfd)
+{
+  tdata_type *tdata = abfd->tdata.verilog_data;
+  verilog_data_list_type *list;
+
+  /* Now wander though all the sections provided and output them.  */
+  list = tdata->head;
+
+  while (list != (verilog_data_list_type *) NULL)
+    {
+      if (! verilog_write_section (abfd, tdata, list))
+	return FALSE;
+      list = list->next;
+    }
+  return TRUE;
+}
+
+/* Initialize by filling in the hex conversion array.  */
+
+static void
+verilog_init (void)
+{
+  static bfd_boolean inited = FALSE;
+
+  if (! inited)
+    {
+      inited = TRUE;
+      hex_init ();
+    }
+}
+
+/* Set up the verilog tdata information.  */
+
+static bfd_boolean
+verilog_mkobject (bfd *abfd)
+{
+  tdata_type *tdata;
+
+  verilog_init ();
+
+  tdata = (tdata_type *) bfd_alloc (abfd, sizeof (tdata_type));
+  if (tdata == NULL)
+    return FALSE;
+
+  abfd->tdata.verilog_data = tdata;
+  tdata->head = NULL;
+  tdata->tail = NULL;
+
+  return TRUE;
+}
+
+#define	verilog_close_and_cleanup                    _bfd_generic_close_and_cleanup
+#define verilog_bfd_free_cached_info                 _bfd_generic_bfd_free_cached_info
+#define verilog_new_section_hook                     _bfd_generic_new_section_hook
+#define verilog_bfd_is_target_special_symbol         ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define verilog_bfd_is_local_label_name              bfd_generic_is_local_label_name
+#define verilog_get_lineno                           _bfd_nosymbols_get_lineno
+#define verilog_find_nearest_line                    _bfd_nosymbols_find_nearest_line
+#define verilog_find_inliner_info                    _bfd_nosymbols_find_inliner_info
+#define verilog_make_empty_symbol                    _bfd_generic_make_empty_symbol
+#define verilog_bfd_make_debug_symbol                _bfd_nosymbols_bfd_make_debug_symbol
+#define verilog_read_minisymbols                     _bfd_generic_read_minisymbols
+#define verilog_minisymbol_to_symbol                 _bfd_generic_minisymbol_to_symbol
+#define verilog_get_section_contents_in_window       _bfd_generic_get_section_contents_in_window
+#define verilog_bfd_get_relocated_section_contents   bfd_generic_get_relocated_section_contents
+#define verilog_bfd_relax_section                    bfd_generic_relax_section
+#define verilog_bfd_gc_sections                      bfd_generic_gc_sections
+#define verilog_bfd_merge_sections                   bfd_generic_merge_sections
+#define verilog_bfd_is_group_section                 bfd_generic_is_group_section
+#define verilog_bfd_discard_group                    bfd_generic_discard_group
+#define verilog_section_already_linked               _bfd_generic_section_already_linked
+#define verilog_bfd_link_hash_table_create           _bfd_generic_link_hash_table_create
+#define verilog_bfd_link_hash_table_free             _bfd_generic_link_hash_table_free
+#define verilog_bfd_link_add_symbols                 _bfd_generic_link_add_symbols
+#define verilog_bfd_link_just_syms                   _bfd_generic_link_just_syms
+#define verilog_bfd_final_link                       _bfd_generic_final_link
+#define verilog_bfd_link_split_section               _bfd_generic_link_split_section
+
+const bfd_target verilog_vec =
+{
+  "verilog",			/* Name.  */
+  bfd_target_verilog_flavour,
+  BFD_ENDIAN_UNKNOWN,		/* Target byte order.  */
+  BFD_ENDIAN_UNKNOWN,		/* Target headers byte order.  */
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+  (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
+   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* Section flags.  */
+  0,				/* Leading underscore.  */
+  ' ',				/* AR_pad_char.  */
+  16,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Data.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Hdrs.  */
+
+  {
+    _bfd_dummy_target,
+    _bfd_dummy_target,
+    _bfd_dummy_target,
+    _bfd_dummy_target,
+  },
+  {
+    bfd_false,
+    verilog_mkobject,
+    bfd_false,
+    bfd_false,
+  },
+  {				/* bfd_write_contents.  */
+    bfd_false,
+    verilog_write_object_contents,
+    bfd_false,
+    bfd_false,
+  },
+
+  BFD_JUMP_TABLE_GENERIC (_bfd_generic),
+  BFD_JUMP_TABLE_COPY (_bfd_generic),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+  BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
+  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+  BFD_JUMP_TABLE_WRITE (verilog),
+  BFD_JUMP_TABLE_LINK (_bfd_nolink),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  NULL
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/versados.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/versados.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/versados.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/versados.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,878 @@
+/* BFD back-end for VERSAdos-E objects.
+   Copyright 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
+
+   Versados is a Motorola trademark.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/*
+   SUBSECTION
+   VERSAdos-E relocatable object file format
+
+   DESCRIPTION
+
+   This module supports reading of VERSAdos relocatable
+   object files.
+
+   A VERSAdos file looks like contains
+
+   o Identification Record
+   o External Symbol Definition Record
+   o Object Text Record
+   o End Record.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "libiberty.h"
+
+
+#define VHEADER '1'
+#define VESTDEF '2'
+#define VOTR '3'
+#define VEND '4'
+
+#define ES_BASE 17		/* First symbol has esdid 17.  */
+
+/* Per file target dependent information.  */
+
+/* One for each section.  */
+struct esdid
+{
+  asection *section;		/* Ptr to bfd version.  */
+  unsigned char *contents;	/* Used to build image.  */
+  int pc;
+  int relocs;			/* Reloc count, valid end of pass 1.  */
+  int donerel;			/* Have relocs been translated.  */
+};
+
+typedef struct versados_data_struct
+{
+  int es_done;			/* Count of symbol index, starts at ES_BASE.  */
+  asymbol *symbols;		/* Pointer to local symbols.  */
+  char *strings;		/* Strings of all the above.  */
+  int stringlen;		/* Len of string table (valid end of pass1).  */
+  int nsecsyms;			/* Number of sections.  */
+
+  int ndefs;			/* Number of exported symbols (they dont get esdids).  */
+  int nrefs;			/* Number of imported symbols  (valid end of pass1).  */
+
+  int ref_idx;			/* Current processed value of the above.  */
+  int def_idx;
+
+  int pass_2_done;
+
+  struct esdid e[16];		/* Per section info.  */
+  int alert;			/* To see if we're trampling.  */
+  asymbol *rest[256 - 16];	/* Per symbol info.  */
+}
+tdata_type;
+
+#define VDATA(abfd)       (abfd->tdata.versados_data)
+#define EDATA(abfd, n)    (abfd->tdata.versados_data->e[n])
+#define RDATA(abfd, n)    (abfd->tdata.versados_data->rest[n])
+
+struct ext_otr
+{
+  unsigned char size;
+  char type;
+  unsigned char map[4];
+  unsigned char esdid;
+  unsigned char data[200];
+};
+
+struct ext_vheader
+{
+  unsigned char size;
+  char type;			/* Record type.  */
+  char name[10];		/* Module name.  */
+  char rev;			/* Module rev number.  */
+  char lang;
+  char vol[4];
+  char user[2];
+  char cat[8];
+  char fname[8];
+  char ext[2];
+  char time[3];
+  char date[3];
+  char rest[211];
+};
+
+struct ext_esd
+{
+  unsigned char size;
+  char type;
+  unsigned char esd_entries[1];
+};
+
+#define ESD_ABS 	  0
+#define ESD_COMMON 	  1
+#define ESD_STD_REL_SEC   2
+#define ESD_SHRT_REL_SEC  3
+#define ESD_XDEF_IN_SEC   4
+#define ESD_XDEF_IN_ABS   5
+#define ESD_XREF_SEC	  6
+#define ESD_XREF_SYM      7
+
+union ext_any
+{
+  unsigned char size;
+  struct ext_vheader header;
+  struct ext_esd esd;
+  struct ext_otr otr;
+};
+
+/* Initialize by filling in the hex conversion array.  */
+
+/* Set up the tdata information.  */
+
+static bfd_boolean
+versados_mkobject (bfd *abfd)
+{
+  if (abfd->tdata.versados_data == NULL)
+    {
+      bfd_size_type amt = sizeof (tdata_type);
+      tdata_type *tdata = bfd_alloc (abfd, amt);
+
+      if (tdata == NULL)
+	return FALSE;
+      abfd->tdata.versados_data = tdata;
+      tdata->symbols = NULL;
+      VDATA (abfd)->alert = 0x12345678;
+    }
+
+  bfd_default_set_arch_mach (abfd, bfd_arch_m68k, 0);
+  return TRUE;
+}
+
+/* Report a problem in an S record file.  FIXME: This probably should
+   not call fprintf, but we really do need some mechanism for printing
+   error messages.  */
+
+static asymbol *
+versados_new_symbol (bfd *abfd,
+		     int snum,
+		     const char *name,
+		     bfd_vma val,
+		     asection *sec)
+{
+  asymbol *n = VDATA (abfd)->symbols + snum;
+  n->name = name;
+  n->value = val;
+  n->section = sec;
+  n->the_bfd = abfd;
+  n->flags = 0;
+  return n;
+}
+
+static int
+get_record (bfd *abfd, union ext_any *ptr)
+{
+  if (bfd_bread (&ptr->size, (bfd_size_type) 1, abfd) != 1
+      || (bfd_bread ((char *) ptr + 1, (bfd_size_type) ptr->size, abfd)
+	  != ptr->size))
+    return 0;
+  return 1;
+}
+
+static int
+get_4 (unsigned char **pp)
+{
+  unsigned char *p = *pp;
+
+  *pp += 4;
+  return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | (p[3] << 0);
+}
+
+static void
+get_10 (unsigned char **pp, char *name)
+{
+  char *p = (char *) *pp;
+  int len = 10;
+
+  *pp += len;
+  while (*p != ' ' && len)
+    {
+      *name++ = *p++;
+      len--;
+    }
+  *name = 0;
+}
+
+static char *
+new_symbol_string (bfd *abfd, const char *name)
+{
+  char *n = VDATA (abfd)->strings;
+
+  strcpy (VDATA (abfd)->strings, name);
+  VDATA (abfd)->strings += strlen (VDATA (abfd)->strings) + 1;
+  return n;
+}
+
+static void
+process_esd (bfd *abfd, struct ext_esd *esd, int pass)
+{
+  /* Read through the ext def for the est entries.  */
+  int togo = esd->size - 2;
+  bfd_vma size;
+  bfd_vma start;
+  asection *sec;
+  char name[11];
+  unsigned char *ptr = esd->esd_entries;
+  unsigned char *end = ptr + togo;
+
+  while (ptr < end)
+    {
+      int scn = *ptr & 0xf;
+      int typ = (*ptr >> 4) & 0xf;
+
+      /* Declare this section.  */
+      sprintf (name, "%d", scn);
+      sec = bfd_make_section_old_way (abfd, strdup (name));
+      sec->target_index = scn;
+      EDATA (abfd, scn).section = sec;
+      ptr++;
+
+      switch (typ)
+	{
+	default:
+	  abort ();
+	case ESD_XREF_SEC:
+	case ESD_XREF_SYM:
+	  {
+	    int snum = VDATA (abfd)->ref_idx++;
+	    get_10 (&ptr, name);
+	    if (pass == 1)
+	      VDATA (abfd)->stringlen += strlen (name) + 1;
+	    else
+	      {
+		int esidx;
+		asymbol *s;
+		char *n = new_symbol_string (abfd, name);
+
+		s = versados_new_symbol (abfd, snum, n, (bfd_vma) 0,
+					 bfd_und_section_ptr);
+		esidx = VDATA (abfd)->es_done++;
+		RDATA (abfd, esidx - ES_BASE) = s;
+	      }
+	  }
+	  break;
+
+	case ESD_ABS:
+	  size = get_4 (&ptr);
+	  (void) size;
+	  start = get_4 (&ptr);
+	  (void) start;
+	  break;
+	case ESD_STD_REL_SEC:
+	case ESD_SHRT_REL_SEC:
+	  sec->size = get_4 (&ptr);
+	  sec->flags |= SEC_ALLOC;
+	  break;
+	case ESD_XDEF_IN_ABS:
+	  sec = (asection *) & bfd_abs_section;
+	case ESD_XDEF_IN_SEC:
+	  {
+	    int snum = VDATA (abfd)->def_idx++;
+	    bfd_vma val;
+
+	    get_10 (&ptr, name);
+	    val = get_4 (&ptr);
+	    if (pass == 1)
+	      /* Just remember the symbol.  */
+	      VDATA (abfd)->stringlen += strlen (name) + 1;
+	    else
+	      {
+		asymbol *s;
+		char *n = new_symbol_string (abfd, name);
+
+		s = versados_new_symbol (abfd, snum + VDATA (abfd)->nrefs, n,
+					 val, sec);
+		s->flags |= BSF_GLOBAL;
+	      }
+	  }
+	  break;
+	}
+    }
+}
+
+#define R_RELWORD     1
+#define R_RELLONG     2
+#define R_RELWORD_NEG 3
+#define R_RELLONG_NEG 4
+
+reloc_howto_type versados_howto_table[] =
+{
+  HOWTO (R_RELWORD, 0, 1, 16, FALSE,
+	 0, complain_overflow_dont, 0,
+	 "+v16", TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (R_RELLONG, 0, 2, 32, FALSE,
+	 0, complain_overflow_dont, 0,
+	 "+v32", TRUE, 0xffffffff, 0xffffffff, FALSE),
+
+  HOWTO (R_RELWORD_NEG, 0, -1, 16, FALSE,
+	 0, complain_overflow_dont, 0,
+	 "-v16", TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+  HOWTO (R_RELLONG_NEG, 0, -2, 32, FALSE,
+	 0, complain_overflow_dont, 0,
+	 "-v32", TRUE, 0xffffffff, 0xffffffff, FALSE),
+};
+
+static int
+get_offset (int len, unsigned char *ptr)
+{
+  int val = 0;
+
+  if (len)
+    {
+      int i;
+
+      val = *ptr++;
+      if (val & 0x80)
+	val |= ~0xff;
+      for (i = 1; i < len; i++)
+	val = (val << 8) | *ptr++;
+    }
+
+  return val;
+}
+
+static void
+process_otr (bfd *abfd, struct ext_otr *otr, int pass)
+{
+  unsigned long shift;
+  unsigned char *srcp = otr->data;
+  unsigned char *endp = (unsigned char *) otr + otr->size;
+  unsigned int bits = (otr->map[0] << 24)
+  | (otr->map[1] << 16)
+  | (otr->map[2] << 8)
+  | (otr->map[3] << 0);
+
+  struct esdid *esdid = &EDATA (abfd, otr->esdid - 1);
+  unsigned char *contents = esdid->contents;
+  int need_contents = 0;
+  unsigned int dst_idx = esdid->pc;
+
+  for (shift = ((unsigned long) 1 << 31); shift && srcp < endp; shift >>= 1)
+    {
+      if (bits & shift)
+	{
+	  int flag = *srcp++;
+	  int esdids = (flag >> 5) & 0x7;
+	  int sizeinwords = ((flag >> 3) & 1) ? 2 : 1;
+	  int offsetlen = flag & 0x7;
+	  int j;
+
+	  if (esdids == 0)
+	    {
+	      /* A zero esdid means the new pc is the offset given.  */
+	      dst_idx += get_offset (offsetlen, srcp);
+	      srcp += offsetlen;
+	    }
+	  else
+	    {
+	      int val = get_offset (offsetlen, srcp + esdids);
+
+	      if (pass == 1)
+		need_contents = 1;
+	      else
+		for (j = 0; j < sizeinwords * 2; j++)
+		  {
+		    contents[dst_idx + (sizeinwords * 2) - j - 1] = val;
+		    val >>= 8;
+		  }
+
+	      for (j = 0; j < esdids; j++)
+		{
+		  int id = *srcp++;
+
+		  if (id)
+		    {
+		      int rn = EDATA (abfd, otr->esdid - 1).relocs++;
+
+		      if (pass == 1)
+			{
+			  /* This is the first pass over the data,
+			     just remember that we need a reloc.  */
+			}
+		      else
+			{
+			  arelent *n =
+			  EDATA (abfd, otr->esdid - 1).section->relocation + rn;
+			  n->address = dst_idx;
+
+			  n->sym_ptr_ptr = (asymbol **) (size_t) id;
+			  n->addend = 0;
+			  n->howto = versados_howto_table + ((j & 1) * 2) + (sizeinwords - 1);
+			}
+		    }
+		}
+	      srcp += offsetlen;
+	      dst_idx += sizeinwords * 2;
+	    }
+	}
+      else
+	{
+	  need_contents = 1;
+	  if (dst_idx < esdid->section->size)
+	    if (pass == 2)
+	      {
+		/* Absolute code, comes in 16 bit lumps.  */
+		contents[dst_idx] = srcp[0];
+		contents[dst_idx + 1] = srcp[1];
+	      }
+	  dst_idx += 2;
+	  srcp += 2;
+	}
+    }
+  EDATA (abfd, otr->esdid - 1).pc = dst_idx;
+
+  if (!contents && need_contents)
+    {
+      bfd_size_type size = esdid->section->size;
+      esdid->contents = bfd_alloc (abfd, size);
+    }
+}
+
+static bfd_boolean
+versados_scan (bfd *abfd)
+{
+  int loop = 1;
+  int i;
+  int j;
+  int nsecs = 0;
+  bfd_size_type amt;
+
+  VDATA (abfd)->stringlen = 0;
+  VDATA (abfd)->nrefs = 0;
+  VDATA (abfd)->ndefs = 0;
+  VDATA (abfd)->ref_idx = 0;
+  VDATA (abfd)->def_idx = 0;
+  VDATA (abfd)->pass_2_done = 0;
+
+  while (loop)
+    {
+      union ext_any any;
+
+      if (!get_record (abfd, &any))
+	return TRUE;
+      switch (any.header.type)
+	{
+	case VHEADER:
+	  break;
+	case VEND:
+	  loop = 0;
+	  break;
+	case VESTDEF:
+	  process_esd (abfd, &any.esd, 1);
+	  break;
+	case VOTR:
+	  process_otr (abfd, &any.otr, 1);
+	  break;
+	}
+    }
+
+  /* Now allocate space for the relocs and sections.  */
+  VDATA (abfd)->nrefs = VDATA (abfd)->ref_idx;
+  VDATA (abfd)->ndefs = VDATA (abfd)->def_idx;
+  VDATA (abfd)->ref_idx = 0;
+  VDATA (abfd)->def_idx = 0;
+
+  abfd->symcount = VDATA (abfd)->nrefs + VDATA (abfd)->ndefs;
+
+  for (i = 0; i < 16; i++)
+    {
+      struct esdid *esdid = &EDATA (abfd, i);
+
+      if (esdid->section)
+	{
+	  amt = (bfd_size_type) esdid->relocs * sizeof (arelent);
+	  esdid->section->relocation = bfd_alloc (abfd, amt);
+
+	  esdid->pc = 0;
+
+	  if (esdid->contents)
+	    esdid->section->flags |= SEC_HAS_CONTENTS | SEC_LOAD;
+
+	  esdid->section->reloc_count = esdid->relocs;
+	  if (esdid->relocs)
+	    esdid->section->flags |= SEC_RELOC;
+
+	  esdid->relocs = 0;
+
+	  /* Add an entry into the symbol table for it.  */
+	  nsecs++;
+	  VDATA (abfd)->stringlen += strlen (esdid->section->name) + 1;
+	}
+    }
+
+  abfd->symcount += nsecs;
+
+  amt = abfd->symcount;
+  amt *= sizeof (asymbol);
+  VDATA (abfd)->symbols = bfd_alloc (abfd, amt);
+
+  amt = VDATA (abfd)->stringlen;
+  VDATA (abfd)->strings = bfd_alloc (abfd, amt);
+
+  if ((VDATA (abfd)->symbols == NULL && abfd->symcount > 0)
+      || (VDATA (abfd)->strings == NULL && VDATA (abfd)->stringlen > 0))
+    return FALSE;
+
+  /* Actually fill in the section symbols,
+     we stick them at the end of the table.  */
+  for (j = VDATA (abfd)->nrefs + VDATA (abfd)->ndefs, i = 0; i < 16; i++)
+    {
+      struct esdid *esdid = &EDATA (abfd, i);
+      asection *sec = esdid->section;
+
+      if (sec)
+	{
+	  asymbol *s = VDATA (abfd)->symbols + j;
+	  s->name = new_symbol_string (abfd, sec->name);
+	  s->section = sec;
+	  s->flags = BSF_LOCAL;
+	  s->value = 0;
+	  s->the_bfd = abfd;
+	  j++;
+	}
+    }
+
+  if (abfd->symcount)
+    abfd->flags |= HAS_SYMS;
+
+  /* Set this to nsecs - since we've already planted the section
+     symbols.  */
+  VDATA (abfd)->nsecsyms = nsecs;
+
+  VDATA (abfd)->ref_idx = 0;
+
+  return 1;
+}
+
+/* Check whether an existing file is a versados  file.  */
+
+static const bfd_target *
+versados_object_p (bfd *abfd)
+{
+  struct ext_vheader ext;
+  unsigned char len;
+  tdata_type *tdata_save;
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    return NULL;
+
+  if (bfd_bread (&len, (bfd_size_type) 1, abfd) != 1)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  if (bfd_bread (&ext.type, (bfd_size_type) len, abfd) != len)
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  /* We guess that the language field will never be larger than 10.
+     In sample files, it is always either 0 or 1.  Checking for this
+     prevents confusion with Intel Hex files.  */
+  if (ext.type != VHEADER
+      || ext.lang > 10)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  /* OK, looks like a record, build the tdata and read in.  */
+  tdata_save = abfd->tdata.versados_data;
+  if (!versados_mkobject (abfd) || !versados_scan (abfd))
+    {
+      abfd->tdata.versados_data = tdata_save;
+      return NULL;
+    }
+
+  return abfd->xvec;
+}
+
+static bfd_boolean
+versados_pass_2 (bfd *abfd)
+{
+  union ext_any any;
+
+  if (VDATA (abfd)->pass_2_done)
+    return 1;
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    return 0;
+
+  VDATA (abfd)->es_done = ES_BASE;
+
+  /* Read records till we get to where we want to be.  */
+  while (1)
+    {
+      get_record (abfd, &any);
+      switch (any.header.type)
+	{
+	case VEND:
+	  VDATA (abfd)->pass_2_done = 1;
+	  return 1;
+	case VESTDEF:
+	  process_esd (abfd, &any.esd, 2);
+	  break;
+	case VOTR:
+	  process_otr (abfd, &any.otr, 2);
+	  break;
+	}
+    }
+}
+
+static bfd_boolean
+versados_get_section_contents (bfd *abfd,
+			       asection *section,
+			       void * location,
+			       file_ptr offset,
+			       bfd_size_type count)
+{
+  if (!versados_pass_2 (abfd))
+    return FALSE;
+
+  memcpy (location,
+	  EDATA (abfd, section->target_index).contents + offset,
+	  (size_t) count);
+
+  return TRUE;
+}
+
+#define versados_get_section_contents_in_window \
+  _bfd_generic_get_section_contents_in_window
+
+static bfd_boolean
+versados_set_section_contents (bfd *abfd ATTRIBUTE_UNUSED,
+			       sec_ptr section ATTRIBUTE_UNUSED,
+			       const void * location ATTRIBUTE_UNUSED,
+			       file_ptr offset ATTRIBUTE_UNUSED,
+			       bfd_size_type bytes_to_do ATTRIBUTE_UNUSED)
+{
+  return FALSE;
+}
+
+static int
+versados_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+			 struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+/* Return the amount of memory needed to read the symbol table.  */
+
+static long
+versados_get_symtab_upper_bound (bfd *abfd)
+{
+  return (bfd_get_symcount (abfd) + 1) * sizeof (asymbol *);
+}
+
+/* Return the symbol table.  */
+
+static long
+versados_canonicalize_symtab (bfd *abfd, asymbol **alocation)
+{
+  unsigned int symcount = bfd_get_symcount (abfd);
+  unsigned int i;
+  asymbol *s;
+
+  versados_pass_2 (abfd);
+
+  for (i = 0, s = VDATA (abfd)->symbols;
+       i < symcount;
+       s++, i++)
+    *alocation++ = s;
+
+  *alocation = NULL;
+
+  return symcount;
+}
+
+static void
+versados_get_symbol_info (bfd *abfd ATTRIBUTE_UNUSED,
+			  asymbol *symbol,
+			  symbol_info *ret)
+{
+  bfd_symbol_info (symbol, ret);
+}
+
+static void
+versados_print_symbol (bfd *abfd,
+		       void * afile,
+		       asymbol *symbol,
+		       bfd_print_symbol_type how)
+{
+  FILE *file = (FILE *) afile;
+
+  switch (how)
+    {
+    case bfd_print_symbol_name:
+      fprintf (file, "%s", symbol->name);
+      break;
+    default:
+      bfd_print_symbol_vandf (abfd, (void *) file, symbol);
+      fprintf (file, " %-5s %s",
+	       symbol->section->name,
+	       symbol->name);
+    }
+}
+
+static long
+versados_get_reloc_upper_bound (bfd *abfd ATTRIBUTE_UNUSED,
+				sec_ptr asect)
+{
+  return (asect->reloc_count + 1) * sizeof (arelent *);
+}
+
+static long
+versados_canonicalize_reloc (bfd *abfd,
+			     sec_ptr section,
+			     arelent **relptr,
+			     asymbol **symbols)
+{
+  unsigned int count;
+  arelent *src;
+
+  versados_pass_2 (abfd);
+  src = section->relocation;
+  if (!EDATA (abfd, section->target_index).donerel)
+    {
+      EDATA (abfd, section->target_index).donerel = 1;
+      /* Translate from indexes to symptr ptrs.  */
+      for (count = 0; count < section->reloc_count; count++)
+	{
+	  int esdid = (int) (size_t) src[count].sym_ptr_ptr;
+
+	  if (esdid == 0)
+	    src[count].sym_ptr_ptr = bfd_abs_section.symbol_ptr_ptr;
+	  else if (esdid < ES_BASE)
+	    {
+	      /* Section relative thing.  */
+	      struct esdid *e = &EDATA (abfd, esdid - 1);
+
+	      src[count].sym_ptr_ptr = e->section->symbol_ptr_ptr;
+	    }
+	  else
+	    src[count].sym_ptr_ptr = symbols + esdid - ES_BASE;
+	}
+    }
+
+  for (count = 0; count < section->reloc_count; count++)
+    *relptr++ = src++;
+
+  *relptr = 0;
+  return section->reloc_count;
+}
+
+#define	versados_close_and_cleanup                    _bfd_generic_close_and_cleanup
+#define versados_bfd_free_cached_info                 _bfd_generic_bfd_free_cached_info
+#define versados_new_section_hook                     _bfd_generic_new_section_hook
+#define versados_bfd_is_target_special_symbol   ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define versados_bfd_is_local_label_name              bfd_generic_is_local_label_name
+#define versados_get_lineno                           _bfd_nosymbols_get_lineno
+#define versados_find_nearest_line                    _bfd_nosymbols_find_nearest_line
+#define versados_find_inliner_info                    _bfd_nosymbols_find_inliner_info
+#define versados_make_empty_symbol                    _bfd_generic_make_empty_symbol
+#define versados_bfd_make_debug_symbol                _bfd_nosymbols_bfd_make_debug_symbol
+#define versados_read_minisymbols                     _bfd_generic_read_minisymbols
+#define versados_minisymbol_to_symbol                 _bfd_generic_minisymbol_to_symbol
+#define versados_bfd_reloc_type_lookup                _bfd_norelocs_bfd_reloc_type_lookup
+#define versados_bfd_reloc_name_lookup          _bfd_norelocs_bfd_reloc_name_lookup
+#define versados_set_arch_mach                        bfd_default_set_arch_mach
+#define versados_bfd_get_relocated_section_contents   bfd_generic_get_relocated_section_contents
+#define versados_bfd_relax_section                    bfd_generic_relax_section
+#define versados_bfd_gc_sections                      bfd_generic_gc_sections
+#define versados_bfd_lookup_section_flags             bfd_generic_lookup_section_flags
+#define versados_bfd_merge_sections                   bfd_generic_merge_sections
+#define versados_bfd_is_group_section                 bfd_generic_is_group_section
+#define versados_bfd_discard_group                    bfd_generic_discard_group
+#define versados_section_already_linked               _bfd_generic_section_already_linked
+#define versados_bfd_define_common_symbol             bfd_generic_define_common_symbol
+#define versados_bfd_link_hash_table_create           _bfd_generic_link_hash_table_create
+#define versados_bfd_link_hash_table_free             _bfd_generic_link_hash_table_free
+#define versados_bfd_link_add_symbols                 _bfd_generic_link_add_symbols
+#define versados_bfd_link_just_syms                   _bfd_generic_link_just_syms
+#define versados_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define versados_bfd_final_link                       _bfd_generic_final_link
+#define versados_bfd_link_split_section               _bfd_generic_link_split_section
+
+const bfd_target versados_vec =
+{
+  "versados",			/* Name.  */
+  bfd_target_versados_flavour,
+  BFD_ENDIAN_BIG,		/* Target byte order.  */
+  BFD_ENDIAN_BIG,		/* Target headers byte order.  */
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
+  (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
+   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),		/* Section flags.  */
+  0,				/* Leading underscore.  */
+  ' ',				/* AR_pad_char.  */
+  16,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Data.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Headers.  */
+
+  {
+    _bfd_dummy_target,
+    versados_object_p,		/* bfd_check_format.  */
+    _bfd_dummy_target,
+    _bfd_dummy_target,
+  },
+  {
+    bfd_false,
+    versados_mkobject,
+    _bfd_generic_mkarchive,
+    bfd_false,
+  },
+  {				/* bfd_write_contents.  */
+    bfd_false,
+    bfd_false,
+    _bfd_write_archive_contents,
+    bfd_false,
+  },
+
+  BFD_JUMP_TABLE_GENERIC (versados),
+  BFD_JUMP_TABLE_COPY (_bfd_generic),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+  BFD_JUMP_TABLE_SYMBOLS (versados),
+  BFD_JUMP_TABLE_RELOCS (versados),
+  BFD_JUMP_TABLE_WRITE (versados),
+  BFD_JUMP_TABLE_LINK (versados),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  NULL
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/version.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/version.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/version.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/version.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4 @@
+#define BFD_VERSION_DATE 20111121
+#define BFD_VERSION @bfd_version@
+#define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
+#define REPORT_BUGS_TO @report_bugs_to@
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/vms-alpha.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/vms-alpha.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/vms-alpha.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/vms-alpha.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,9406 @@
+/* vms.c -- BFD back-end for EVAX (openVMS/Alpha) files.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+
+   Initial version written by Klaus Kaempf (kkaempf@rmi.de)
+   Major rewrite by Adacore.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* TODO:
+   o  overlayed sections
+   o  PIC
+   o  Generation of shared image
+   o  Relocation optimizations
+   o  EISD for the stack
+   o  Vectors isect
+   o  64 bits sections
+   o  Entry point
+   o  LIB$INITIALIZE
+   o  protected sections (for messages)
+   ...
+*/
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "bfdver.h"
+
+#include "vms.h"
+#include "vms/eihd.h"
+#include "vms/eiha.h"
+#include "vms/eihi.h"
+#include "vms/eihs.h"
+#include "vms/eisd.h"
+#include "vms/dmt.h"
+#include "vms/dst.h"
+#include "vms/eihvn.h"
+#include "vms/eobjrec.h"
+#include "vms/egsd.h"
+#include "vms/egps.h"
+#include "vms/esgps.h"
+#include "vms/eeom.h"
+#include "vms/emh.h"
+#include "vms/eiaf.h"
+#include "vms/shl.h"
+#include "vms/eicp.h"
+#include "vms/etir.h"
+#include "vms/egsy.h"
+#include "vms/esdf.h"
+#include "vms/esdfm.h"
+#include "vms/esdfv.h"
+#include "vms/esrf.h"
+#include "vms/egst.h"
+#include "vms/eidc.h"
+#include "vms/dsc.h"
+#include "vms/prt.h"
+#include "vms/internal.h"
+
+
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+
+/* The r_type field in a reloc is one of the following values.  */
+#define ALPHA_R_IGNORE		0
+#define ALPHA_R_REFQUAD		1
+#define ALPHA_R_BRADDR		2
+#define ALPHA_R_HINT		3
+#define ALPHA_R_SREL16		4
+#define ALPHA_R_SREL32		5
+#define ALPHA_R_SREL64		6
+#define ALPHA_R_OP_PUSH		7
+#define ALPHA_R_OP_STORE	8
+#define ALPHA_R_OP_PSUB		9
+#define ALPHA_R_OP_PRSHIFT	10
+#define ALPHA_R_LINKAGE		11
+#define ALPHA_R_REFLONG		12
+#define ALPHA_R_CODEADDR	13
+#define ALPHA_R_NOP		14
+#define ALPHA_R_BSR		15
+#define ALPHA_R_LDA		16
+#define ALPHA_R_BOH		17
+
+/* These are used with DST_S_C_LINE_NUM.  */
+#define DST_S_C_LINE_NUM_HEADER_SIZE 4
+
+/* These are used with DST_S_C_SOURCE */
+
+#define DST_S_B_PCLINE_UNSBYTE	 1
+#define DST_S_W_PCLINE_UNSWORD	 1
+#define DST_S_L_PCLINE_UNSLONG	 1
+
+#define DST_S_B_MODBEG_NAME	14
+#define DST_S_L_RTNBEG_ADDRESS	 5
+#define DST_S_B_RTNBEG_NAME	13
+#define DST_S_L_RTNEND_SIZE	 5
+
+/* These are used with DST_S_C_SOURCE.  */
+#define DST_S_C_SOURCE_HEADER_SIZE 4
+
+#define DST_S_B_SRC_DF_LENGTH	  1
+#define DST_S_W_SRC_DF_FILEID	  3
+#define DST_S_B_SRC_DF_FILENAME	 20
+#define DST_S_B_SRC_UNSBYTE	  1
+#define DST_S_W_SRC_UNSWORD	  1
+#define DST_S_L_SRC_UNSLONG	  1
+
+/* Debugger symbol definitions.  */
+
+#define DBG_S_L_DMT_MODBEG       0
+#define DBG_S_L_DST_SIZE         4
+#define DBG_S_W_DMT_PSECT_COUNT  8
+#define DBG_S_C_DMT_HEADER_SIZE 12
+
+#define DBG_S_L_DMT_PSECT_START  0
+#define DBG_S_L_DMT_PSECT_LENGTH 4
+#define DBG_S_C_DMT_PSECT_SIZE   8
+
+/* VMS module header.  */
+
+struct hdr_struct
+{
+  char hdr_b_strlvl;
+  int hdr_l_arch1;
+  int hdr_l_arch2;
+  int hdr_l_recsiz;
+  char *hdr_t_name;
+  char *hdr_t_version;
+  char *hdr_t_date;
+  char *hdr_c_lnm;
+  char *hdr_c_src;
+  char *hdr_c_ttl;
+};
+
+#define EMH_DATE_LENGTH  17
+
+/* VMS End-Of-Module records (EOM/EEOM).  */
+
+struct eom_struct
+{
+  unsigned int eom_l_total_lps;
+  unsigned short eom_w_comcod;
+  bfd_boolean eom_has_transfer;
+  unsigned char eom_b_tfrflg;
+  unsigned int eom_l_psindx;
+  unsigned int eom_l_tfradr;
+};
+
+struct vms_symbol_entry
+{
+  bfd *owner;
+
+  /* Common fields.  */
+  unsigned char typ;
+  unsigned char data_type;
+  unsigned short flags;
+
+  /* Section and offset/value of the symbol.  */
+  unsigned int value;
+  asection *section;
+
+  /* Section and offset/value for the entry point (only for subprg).  */
+  asection *code_section;
+  unsigned int code_value;
+
+  /* Symbol vector offset.  */
+  unsigned int symbol_vector;
+
+  /* Length of the name.  */
+  unsigned char namelen;
+
+  char name[1];
+};
+
+/* Stack value for push/pop commands.  */
+
+struct stack_struct
+{
+  bfd_vma value;
+  unsigned int reloc;
+};
+
+#define STACKSIZE 128
+
+/* A minimal decoding of DST compilation units.  We only decode
+   what's needed to get to the line number information.  */
+
+struct fileinfo
+{
+  char *name;
+  unsigned int srec;
+};
+
+struct srecinfo
+{
+  struct srecinfo *next;
+  unsigned int line;
+  unsigned int sfile;
+  unsigned int srec;
+};
+
+struct lineinfo
+{
+  struct lineinfo *next;
+  bfd_vma address;
+  unsigned int line;
+};
+
+struct funcinfo
+{
+  struct funcinfo *next;
+  char *name;
+  bfd_vma low;
+  bfd_vma high;
+};
+
+struct module
+{
+  /* Chain the previously read compilation unit.  */
+  struct module *next;
+
+  /* The module name.  */
+  char *name;
+
+  /* The start offset and size of debug info in the DST section.  */
+  unsigned int modbeg;
+  unsigned int size;
+
+  /* The lowest and highest addresses contained in this compilation
+     unit as specified in the compilation unit header.  */
+  bfd_vma low;
+  bfd_vma high;
+
+  /* The listing line table.  */
+  struct lineinfo *line_table;
+
+  /* The source record table.  */
+  struct srecinfo *srec_table;
+
+  /* A list of the functions found in this module.  */
+  struct funcinfo *func_table;
+
+  /* Current allocation of file_table.  */
+  unsigned int file_table_count;
+
+  /* An array of the files making up this module.  */
+  struct fileinfo *file_table;
+};
+
+/* BFD private data for alpha-vms.  */
+
+struct vms_private_data_struct
+{
+  /* If true, relocs have been read.  */
+  bfd_boolean reloc_done;
+
+  /* Record input buffer.  */
+  struct vms_rec_rd recrd;
+  struct vms_rec_wr recwr;
+
+  struct hdr_struct hdr_data;		/* data from HDR/EMH record  */
+  struct eom_struct eom_data;		/* data from EOM/EEOM record  */
+
+  /* Transfer addresses (entry points).  */
+  bfd_vma transfer_address[4];
+
+  /* Array of GSD sections to get the correspond BFD one.  */
+  unsigned int section_max; 		/* Size of the sections array.  */
+  unsigned int section_count;		/* Number of GSD sections.  */
+  asection **sections;
+
+  /* Array of raw symbols.  */
+  struct vms_symbol_entry **syms;
+
+  /* Canonicalized symbols.  */
+  asymbol **csymbols;
+
+  /* Number of symbols.  */
+  unsigned int gsd_sym_count;
+  /* Size of the syms array.  */
+  unsigned int max_sym_count;
+  /* Number of procedure symbols.  */
+  unsigned int norm_sym_count;
+
+  /* Stack used to evaluate TIR/ETIR commands.  */
+  struct stack_struct *stack;
+  int stackptr;
+
+  /* Content reading.  */
+  asection *image_section;		/* section for image_ptr  */
+  file_ptr image_offset;		/* Offset for image_ptr.  */
+
+  struct module *modules;		/* list of all compilation units */
+
+  /* The DST section.  */
+  asection *dst_section;
+
+  unsigned int dst_ptr_offsets_count;	/* # of offsets in following array  */
+  unsigned int *dst_ptr_offsets;	/* array of saved image_ptr offsets */
+
+  /* Shared library support */
+  bfd_vma symvva; /* relative virtual address of symbol vector */
+  unsigned int ident;
+  unsigned char matchctl;
+
+  /* Shared library index.  This is used for input bfd while linking.  */
+  unsigned int shr_index;
+
+  /* Used to place structures in the file.  */
+  file_ptr file_pos;
+
+  /* Simply linked list of eisd.  */
+  struct vms_internal_eisd_map *eisd_head;
+  struct vms_internal_eisd_map *eisd_tail;
+
+  /* Simply linked list of eisd for shared libraries.  */
+  struct vms_internal_eisd_map *gbl_eisd_head;
+  struct vms_internal_eisd_map *gbl_eisd_tail;
+
+  /* linkage index counter used by conditional store commands */
+  unsigned int vms_linkage_index;
+
+  /* see tc-alpha.c of gas for a description.  */
+  int flag_hash_long_names;	/* -+, hash instead of truncate */
+  int flag_show_after_trunc;	/* -H, show hashing/truncation */
+};
+
+#define PRIV2(abfd, name) \
+  (((struct vms_private_data_struct *)(abfd)->tdata.any)->name)
+#define PRIV(name) PRIV2(abfd,name)
+
+
+/* Used to keep extra VMS specific information for a given section.
+
+   reloc_size holds the size of the relocation stream, note this
+   is very different from the number of relocations as VMS relocations
+   are variable length.
+
+   reloc_stream is the actual stream of relocation entries.  */
+
+struct vms_section_data_struct
+{
+  /* Maximnum number of entries in sec->relocation.  */
+  unsigned reloc_max;
+
+  /* Corresponding eisd.  Used only while generating executables.  */
+  struct vms_internal_eisd_map *eisd;
+
+  /* PSC flags to be clear.  */
+  flagword no_flags;
+
+  /* PSC flags to be set.  */
+  flagword flags;
+};
+
+#define vms_section_data(sec) \
+  ((struct vms_section_data_struct *)sec->used_by_bfd)
+
+/* To be called from the debugger.  */
+struct vms_private_data_struct *bfd_vms_get_data (bfd *abfd);
+
+static int vms_get_remaining_object_record (bfd *abfd, int read_so_far);
+static bfd_boolean _bfd_vms_slurp_object_records (bfd * abfd);
+static void alpha_vms_add_fixup_lp (struct bfd_link_info *, bfd *, bfd *);
+static void alpha_vms_add_fixup_ca (struct bfd_link_info *, bfd *, bfd *);
+static void alpha_vms_add_fixup_qr (struct bfd_link_info *, bfd *, bfd *,
+                                    bfd_vma);
+static void alpha_vms_add_fixup_lr (struct bfd_link_info *, unsigned int,
+                                    bfd_vma);
+static void alpha_vms_add_lw_reloc (struct bfd_link_info *info);
+static void alpha_vms_add_qw_reloc (struct bfd_link_info *info);
+
+struct vector_type
+{
+  unsigned int max_el;
+  unsigned int nbr_el;
+  void *els;
+};
+
+/* Number of elements in VEC.  */
+
+#define VEC_COUNT(VEC) ((VEC).nbr_el)
+
+/* Get the address of the Nth element.  */
+
+#define VEC_EL(VEC, TYPE, N) (((TYPE *)((VEC).els))[N])
+
+#define VEC_INIT(VEC)                           \
+  do {                                          \
+    (VEC).max_el = 0;                           \
+    (VEC).nbr_el = 0;                           \
+    (VEC).els = NULL;                           \
+  } while (0)
+
+/* Be sure there is room for a new element.  */
+
+static void vector_grow1 (struct vector_type *vec, size_t elsz);
+
+/* Allocate room for a new element and return its address.  */
+
+#define VEC_APPEND(VEC, TYPE)                                   \
+  (vector_grow1 (&VEC, sizeof (TYPE)), &VEC_EL(VEC, TYPE, (VEC).nbr_el++))
+
+/* Append an element.  */
+
+#define VEC_APPEND_EL(VEC, TYPE, EL)            \
+  (*(VEC_APPEND (VEC, TYPE)) = EL)
+
+struct alpha_vms_vma_ref
+{
+  bfd_vma vma;	/* Vma in the output.  */
+  bfd_vma ref;	/* Reference in the input.  */
+};
+
+struct alpha_vms_shlib_el
+{
+  bfd *abfd;
+  bfd_boolean has_fixups;
+
+  struct vector_type lp;	/* Vector of bfd_vma.  */
+  struct vector_type ca;	/* Vector of bfd_vma.  */
+  struct vector_type qr;	/* Vector of struct alpha_vms_vma_ref.  */
+};
+
+/* Alpha VMS linker hash table.  */
+
+struct alpha_vms_link_hash_table
+{
+  struct bfd_link_hash_table root;
+
+  /* Vector of shared libraries.  */
+  struct vector_type shrlibs;
+
+  /* Fixup section.  */
+  asection *fixup;
+
+  /* Base address.  Used by fixups.  */
+  bfd_vma base_addr;
+};
+
+#define alpha_vms_link_hash(INFO) \
+  ((struct alpha_vms_link_hash_table *)(INFO->hash))
+
+/* Alpha VMS linker hash table entry.  */
+
+struct alpha_vms_link_hash_entry
+{
+  struct bfd_link_hash_entry root;
+
+  /* Pointer to the original vms symbol.  */
+  struct vms_symbol_entry *sym;
+};
+
+/* Image reading.  */
+
+/* Read & process EIHD record.
+   Return TRUE on success, FALSE on error.  */
+
+static bfd_boolean
+_bfd_vms_slurp_eihd (bfd *abfd, unsigned int *eisd_offset,
+                     unsigned int *eihs_offset)
+{
+  unsigned int imgtype, size;
+  bfd_vma symvva;
+  struct vms_eihd *eihd = (struct vms_eihd *)PRIV (recrd.rec);
+
+  vms_debug2 ((8, "_bfd_vms_slurp_eihd\n"));
+
+  size = bfd_getl32 (eihd->size);
+  imgtype = bfd_getl32 (eihd->imgtype);
+
+  if (imgtype == EIHD__K_EXE || imgtype == EIHD__K_LIM)
+    abfd->flags |= EXEC_P;
+
+  symvva = bfd_getl64 (eihd->symvva);
+  if (symvva != 0)
+    {
+      PRIV (symvva) = symvva;
+      abfd->flags |= DYNAMIC;
+    }
+
+  PRIV (ident) = bfd_getl32 (eihd->ident);
+  PRIV (matchctl) = eihd->matchctl;
+
+  *eisd_offset = bfd_getl32 (eihd->isdoff);
+  *eihs_offset = bfd_getl32 (eihd->symdbgoff);
+
+  vms_debug2 ((4, "EIHD size %d imgtype %d symvva 0x%lx eisd %d eihs %d\n",
+               size, imgtype, (unsigned long)symvva,
+               *eisd_offset, *eihs_offset));
+
+  return TRUE;
+}
+
+/* Read & process EISD record.
+   Return TRUE on success, FALSE on error.  */
+
+static bfd_boolean
+_bfd_vms_slurp_eisd (bfd *abfd, unsigned int offset)
+{
+  int section_count = 0;
+
+  vms_debug2 ((8, "_bfd_vms_slurp_eisd\n"));
+
+  while (1)
+    {
+      struct vms_eisd *eisd;
+      unsigned int rec_size;
+      unsigned int size;
+      unsigned long long vaddr;
+      unsigned int flags;
+      unsigned int vbn;
+      char *name = NULL;
+      asection *section;
+      flagword bfd_flags;
+
+      eisd = (struct vms_eisd *)(PRIV (recrd.rec) + offset);
+      rec_size = bfd_getl32 (eisd->eisdsize);
+
+      if (rec_size == 0)
+        break;
+
+      /* Skip to next block if pad.  */
+      if (rec_size == 0xffffffff)
+        {
+          offset = (offset + VMS_BLOCK_SIZE) & ~(VMS_BLOCK_SIZE - 1);
+          continue;
+        }
+      else
+        offset += rec_size;
+
+      size = bfd_getl32 (eisd->secsize);
+      vaddr = bfd_getl64 (eisd->virt_addr);
+      flags = bfd_getl32 (eisd->flags);
+      vbn = bfd_getl32 (eisd->vbn);
+
+      vms_debug2 ((4, "EISD at 0x%x size 0x%x addr 0x%lx flags 0x%x blk %d\n",
+                   offset, size, (unsigned long)vaddr, flags, vbn));
+
+      /* VMS combines psects from .obj files into isects in the .exe.  This
+	 process doesn't preserve enough information to reliably determine
+	 what's in each section without examining the data.  This is
+	 especially true of DWARF debug sections.  */
+      bfd_flags = SEC_ALLOC;
+      if (vbn != 0)
+        bfd_flags |= SEC_HAS_CONTENTS | SEC_LOAD;
+
+      if (flags & EISD__M_EXE)
+	bfd_flags |= SEC_CODE;
+
+      if (flags & EISD__M_NONSHRADR)
+	bfd_flags |= SEC_DATA;
+
+      if (!(flags & EISD__M_WRT))
+	bfd_flags |= SEC_READONLY;
+
+      if (flags & EISD__M_DZRO)
+	bfd_flags |= SEC_DATA;
+
+      if (flags & EISD__M_FIXUPVEC)
+	bfd_flags |= SEC_DATA;
+
+      if (flags & EISD__M_CRF)
+	bfd_flags |= SEC_DATA;
+
+      if (flags & EISD__M_GBL)
+	{
+	  name = _bfd_vms_save_counted_string (eisd->gblnam);
+	  bfd_flags |= SEC_COFF_SHARED_LIBRARY;
+	  bfd_flags &= ~(SEC_ALLOC | SEC_LOAD);
+	}
+      else if (flags & EISD__M_FIXUPVEC)
+        name = "$FIXUPVEC$";
+      else if (eisd->type == EISD__K_USRSTACK)
+        name = "$STACK$";
+      else
+	{
+          const char *pfx;
+
+	  name = (char*) bfd_alloc (abfd, 32);
+          if (flags & EISD__M_DZRO)
+            pfx = "BSS";
+          else if (flags & EISD__M_EXE)
+            pfx = "CODE";
+          else if (!(flags & EISD__M_WRT))
+            pfx = "RO";
+          else
+            pfx = "LOCAL";
+          BFD_ASSERT (section_count < 999);
+	  sprintf (name, "$%s_%03d$", pfx, section_count++);
+	}
+
+      section = bfd_make_section (abfd, name);
+
+      if (!section)
+	return FALSE;
+
+      section->filepos = vbn ? VMS_BLOCK_SIZE * (vbn - 1) : 0;
+      section->size = size;
+      section->vma = vaddr;
+
+      if (!bfd_set_section_flags (abfd, section, bfd_flags))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Read & process EIHS record.
+   Return TRUE on success, FALSE on error.  */
+
+static bfd_boolean
+_bfd_vms_slurp_eihs (bfd *abfd, unsigned int offset)
+{
+  unsigned char *p = PRIV (recrd.rec) + offset;
+  unsigned int gstvbn = bfd_getl32 (p + EIHS__L_GSTVBN);
+  unsigned int gstsize ATTRIBUTE_UNUSED = bfd_getl32 (p + EIHS__L_GSTSIZE);
+  unsigned int dstvbn = bfd_getl32 (p + EIHS__L_DSTVBN);
+  unsigned int dstsize = bfd_getl32 (p + EIHS__L_DSTSIZE);
+  unsigned int dmtvbn = bfd_getl32 (p + EIHS__L_DMTVBN);
+  unsigned int dmtbytes = bfd_getl32 (p + EIHS__L_DMTBYTES);
+  asection *section;
+
+#if VMS_DEBUG
+  vms_debug (8, "_bfd_vms_slurp_ihs\n");
+  vms_debug (4, "EIHS record gstvbn %d gstsize %d dstvbn %d dstsize %d dmtvbn %d dmtbytes %d\n",
+	     gstvbn, gstsize, dstvbn, dstsize, dmtvbn, dmtbytes);
+#endif
+
+  if (dstvbn)
+    {
+      flagword bfd_flags = SEC_HAS_CONTENTS | SEC_DEBUGGING;
+
+      section = bfd_make_section (abfd, "$DST$");
+      if (!section)
+	return FALSE;
+
+      section->size = dstsize;
+      section->filepos = VMS_BLOCK_SIZE * (dstvbn - 1);
+
+      if (!bfd_set_section_flags (abfd, section, bfd_flags))
+	return FALSE;
+
+      PRIV (dst_section) = section;
+      abfd->flags |= (HAS_DEBUG | HAS_LINENO);
+    }
+
+  if (dmtvbn)
+    {
+      flagword bfd_flags = SEC_HAS_CONTENTS | SEC_DEBUGGING;
+
+      section = bfd_make_section (abfd, "$DMT$");
+      if (!section)
+	return FALSE;
+
+      section->size = dmtbytes;
+      section->filepos = VMS_BLOCK_SIZE * (dmtvbn - 1);
+
+      if (!bfd_set_section_flags (abfd, section, bfd_flags))
+	return FALSE;
+    }
+
+  if (gstvbn)
+    {
+      if (bfd_seek (abfd, VMS_BLOCK_SIZE * (gstvbn - 1), SEEK_SET))
+	{
+	  bfd_set_error (bfd_error_file_truncated);
+	  return FALSE;
+	}
+
+      if (_bfd_vms_slurp_object_records (abfd) != TRUE)
+	return FALSE;
+
+      abfd->flags |= HAS_SYMS;
+    }
+
+  return TRUE;
+}
+
+/* Object file reading.  */
+
+/* Object file input functions.  */
+
+/* Get next record from object file to vms_buf.
+   Set PRIV(buf_size) and return it
+
+   This is a little tricky since it should be portable.
+
+   The openVMS object file has 'variable length' which means that
+   read() returns data in chunks of (hopefully) correct and expected
+   size.  The linker (and other tools on VMS) depend on that. Unix
+   doesn't know about 'formatted' files, so reading and writing such
+   an object file in a Unix environment is not trivial.
+
+   With the tool 'file' (available on all VMS FTP sites), one
+   can view and change the attributes of a file.  Changing from
+   'variable length' to 'fixed length, 512 bytes' reveals the
+   record size at the first 2 bytes of every record.  The same
+   may happen during the transfer of object files from VMS to Unix,
+   at least with UCX, the DEC implementation of TCP/IP.
+
+   The VMS format repeats the size at bytes 2 & 3 of every record.
+
+   On the first call (file_format == FF_UNKNOWN) we check if
+   the first and the third byte pair (!) of the record match.
+   If they do it's an object file in an Unix environment or with
+   wrong attributes (FF_FOREIGN), else we should be in a VMS
+   environment where read() returns the record size (FF_NATIVE).
+
+   Reading is always done in 2 steps:
+    1. first just the record header is read and the size extracted,
+    2. then the read buffer is adjusted and the remaining bytes are
+       read in.
+
+   All file I/O is done on even file positions.  */
+
+#define VMS_OBJECT_ADJUSTMENT  2
+
+static void
+maybe_adjust_record_pointer_for_object (bfd *abfd)
+{
+  /* Set the file format once for all on the first invocation.  */
+  if (PRIV (recrd.file_format) == FF_UNKNOWN)
+    {
+      if (PRIV (recrd.rec)[0] == PRIV (recrd.rec)[4]
+	  && PRIV (recrd.rec)[1] == PRIV (recrd.rec)[5])
+	PRIV (recrd.file_format) = FF_FOREIGN;
+      else
+	PRIV (recrd.file_format) = FF_NATIVE;
+    }
+
+  /* The adjustment is needed only in an Unix environment.  */
+  if (PRIV (recrd.file_format) == FF_FOREIGN)
+    PRIV (recrd.rec) += VMS_OBJECT_ADJUSTMENT;
+}
+
+/* Implement step #1 of the object record reading procedure.
+   Return the record type or -1 on failure.  */
+
+static int
+_bfd_vms_get_object_record (bfd *abfd)
+{
+  unsigned int test_len = 6;
+  int type;
+
+  vms_debug2 ((8, "_bfd_vms_get_obj_record\n"));
+
+  /* Skip alignment byte if the current position is odd.  */
+  if (PRIV (recrd.file_format) == FF_FOREIGN && (bfd_tell (abfd) & 1))
+    {
+      if (bfd_bread (PRIV (recrd.buf), 1, abfd) != 1)
+        {
+          bfd_set_error (bfd_error_file_truncated);
+          return -1;
+        }
+    }
+
+  /* Read the record header  */
+  if (bfd_bread (PRIV (recrd.buf), test_len, abfd) != test_len)
+    {
+      bfd_set_error (bfd_error_file_truncated);
+      return -1;
+    }
+
+  /* Reset the record pointer.  */
+  PRIV (recrd.rec) = PRIV (recrd.buf);
+  maybe_adjust_record_pointer_for_object (abfd);
+
+  if (vms_get_remaining_object_record (abfd, test_len) <= 0)
+    return -1;
+
+  type = bfd_getl16 (PRIV (recrd.rec));
+
+  vms_debug2 ((8, "_bfd_vms_get_obj_record: rec %p, size %d, type %d\n",
+               PRIV (recrd.rec), PRIV (recrd.rec_size), type));
+
+  return type;
+}
+
+/* Implement step #2 of the object record reading procedure.
+   Return the size of the record or 0 on failure.  */
+
+static int
+vms_get_remaining_object_record (bfd *abfd, int read_so_far)
+{
+  unsigned int to_read;
+
+  vms_debug2 ((8, "vms_get_remaining_obj_record\n"));
+
+  /* Extract record size.  */
+  PRIV (recrd.rec_size) = bfd_getl16 (PRIV (recrd.rec) + 2);
+
+  if (PRIV (recrd.rec_size) == 0)
+    {
+      bfd_set_error (bfd_error_file_truncated);
+      return 0;
+    }
+
+  /* That's what the linker manual says.  */
+  if (PRIV (recrd.rec_size) > EOBJ__C_MAXRECSIZ)
+    {
+      bfd_set_error (bfd_error_file_truncated);
+      return 0;
+    }
+
+  /* Take into account object adjustment.  */
+  to_read = PRIV (recrd.rec_size);
+  if (PRIV (recrd.file_format) == FF_FOREIGN)
+    to_read += VMS_OBJECT_ADJUSTMENT;
+
+  /* Adjust the buffer.  */
+  if (to_read > PRIV (recrd.buf_size))
+    {
+      PRIV (recrd.buf)
+        = (unsigned char *) bfd_realloc (PRIV (recrd.buf), to_read);
+      if (PRIV (recrd.buf) == NULL)
+        return 0;
+      PRIV (recrd.buf_size) = to_read;
+    }
+
+  /* Read the remaining record.  */
+  to_read -= read_so_far;
+
+  vms_debug2 ((8, "vms_get_remaining_obj_record: to_read %d\n", to_read));
+
+  if (bfd_bread (PRIV (recrd.buf) + read_so_far, to_read, abfd) != to_read)
+    {
+      bfd_set_error (bfd_error_file_truncated);
+      return 0;
+    }
+
+  /* Reset the record pointer.  */
+  PRIV (recrd.rec) = PRIV (recrd.buf);
+  maybe_adjust_record_pointer_for_object (abfd);
+
+  vms_debug2 ((8, "vms_get_remaining_obj_record: size %d\n",
+               PRIV (recrd.rec_size)));
+
+  return PRIV (recrd.rec_size);
+}
+
+/* Read and process emh record.
+   Return TRUE on success, FALSE on error.  */
+
+static bfd_boolean
+_bfd_vms_slurp_ehdr (bfd *abfd)
+{
+  unsigned char *ptr;
+  unsigned char *vms_rec;
+  int subtype;
+
+  vms_rec = PRIV (recrd.rec);
+
+  vms_debug2 ((2, "HDR/EMH\n"));
+
+  subtype = bfd_getl16 (vms_rec + 4);
+
+  vms_debug2 ((3, "subtype %d\n", subtype));
+
+  switch (subtype)
+    {
+    case EMH__C_MHD:
+      /* Module header.  */
+      PRIV (hdr_data).hdr_b_strlvl = vms_rec[6];
+      PRIV (hdr_data).hdr_l_arch1  = bfd_getl32 (vms_rec + 8);
+      PRIV (hdr_data).hdr_l_arch2  = bfd_getl32 (vms_rec + 12);
+      PRIV (hdr_data).hdr_l_recsiz = bfd_getl32 (vms_rec + 16);
+      PRIV (hdr_data).hdr_t_name   = _bfd_vms_save_counted_string (vms_rec + 20);
+      ptr = vms_rec + 20 + vms_rec[20] + 1;
+      PRIV (hdr_data).hdr_t_version =_bfd_vms_save_counted_string (ptr);
+      ptr += *ptr + 1;
+      PRIV (hdr_data).hdr_t_date = _bfd_vms_save_sized_string (ptr, 17);
+      break;
+
+    case EMH__C_LNM:
+      PRIV (hdr_data).hdr_c_lnm =
+        _bfd_vms_save_sized_string (vms_rec, PRIV (recrd.rec_size - 6));
+      break;
+
+    case EMH__C_SRC:
+      PRIV (hdr_data).hdr_c_src =
+        _bfd_vms_save_sized_string (vms_rec, PRIV (recrd.rec_size - 6));
+      break;
+
+    case EMH__C_TTL:
+      PRIV (hdr_data).hdr_c_ttl =
+        _bfd_vms_save_sized_string (vms_rec, PRIV (recrd.rec_size - 6));
+      break;
+
+    case EMH__C_CPR:
+    case EMH__C_MTC:
+    case EMH__C_GTX:
+      break;
+
+    default:
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Typical sections for evax object files.  */
+
+#define EVAX_ABS_NAME		"$ABS$"
+#define EVAX_CODE_NAME		"$CODE$"
+#define EVAX_LINK_NAME		"$LINK$"
+#define EVAX_DATA_NAME		"$DATA$"
+#define EVAX_BSS_NAME		"$BSS$"
+#define EVAX_READONLYADDR_NAME	"$READONLY_ADDR$"
+#define EVAX_READONLY_NAME	"$READONLY$"
+#define EVAX_LITERAL_NAME	"$LITERAL$"
+#define EVAX_LITERALS_NAME	"$LITERALS"
+#define EVAX_COMMON_NAME	"$COMMON$"
+#define EVAX_LOCAL_NAME		"$LOCAL$"
+
+struct sec_flags_struct
+{
+  const char *name;		/* Name of section.  */
+  int vflags_always;
+  flagword flags_always;	/* Flags we set always.  */
+  int vflags_hassize;
+  flagword flags_hassize;	/* Flags we set if the section has a size > 0.  */
+};
+
+/* These flags are deccrtl/vaxcrtl (openVMS 6.2 Alpha) compatible.  */
+
+static const struct sec_flags_struct evax_section_flags[] =
+  {
+    { EVAX_ABS_NAME,
+      EGPS__V_SHR,
+      0,
+      EGPS__V_SHR,
+      0 },
+    { EVAX_CODE_NAME,
+      EGPS__V_PIC | EGPS__V_REL | EGPS__V_SHR | EGPS__V_EXE,
+      SEC_CODE | SEC_READONLY,
+      EGPS__V_PIC | EGPS__V_REL | EGPS__V_SHR | EGPS__V_EXE,
+      SEC_CODE | SEC_READONLY | SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD },
+    { EVAX_LITERAL_NAME,
+      EGPS__V_PIC | EGPS__V_REL | EGPS__V_SHR | EGPS__V_RD | EGPS__V_NOMOD,
+      SEC_DATA | SEC_READONLY,
+      EGPS__V_PIC | EGPS__V_REL | EGPS__V_SHR | EGPS__V_RD,
+      SEC_DATA | SEC_READONLY | SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD },
+    { EVAX_LINK_NAME,
+      EGPS__V_REL | EGPS__V_RD,
+      SEC_DATA | SEC_READONLY,
+      EGPS__V_REL | EGPS__V_RD,
+      SEC_DATA | SEC_READONLY | SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD },
+    { EVAX_DATA_NAME,
+      EGPS__V_REL | EGPS__V_RD | EGPS__V_WRT | EGPS__V_NOMOD,
+      SEC_DATA,
+      EGPS__V_REL | EGPS__V_RD | EGPS__V_WRT,
+      SEC_DATA | SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD },
+    { EVAX_BSS_NAME,
+      EGPS__V_REL | EGPS__V_RD | EGPS__V_WRT | EGPS__V_NOMOD,
+      SEC_NO_FLAGS,
+      EGPS__V_REL | EGPS__V_RD | EGPS__V_WRT | EGPS__V_NOMOD,
+      SEC_ALLOC },
+    { EVAX_READONLYADDR_NAME,
+      EGPS__V_PIC | EGPS__V_REL | EGPS__V_RD,
+      SEC_DATA | SEC_READONLY,
+      EGPS__V_PIC | EGPS__V_REL | EGPS__V_RD,
+      SEC_DATA | SEC_READONLY | SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD },
+    { EVAX_READONLY_NAME,
+      EGPS__V_PIC | EGPS__V_REL | EGPS__V_SHR | EGPS__V_RD | EGPS__V_NOMOD,
+      SEC_DATA | SEC_READONLY,
+      EGPS__V_PIC | EGPS__V_REL | EGPS__V_SHR | EGPS__V_RD,
+      SEC_DATA | SEC_READONLY | SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD },
+    { EVAX_LOCAL_NAME,
+      EGPS__V_REL | EGPS__V_RD | EGPS__V_WRT,
+      SEC_DATA,
+      EGPS__V_REL | EGPS__V_RD | EGPS__V_WRT,
+      SEC_DATA | SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD },
+    { EVAX_LITERALS_NAME,
+      EGPS__V_PIC | EGPS__V_OVR,
+      SEC_DATA | SEC_READONLY,
+      EGPS__V_PIC | EGPS__V_OVR,
+      SEC_DATA | SEC_READONLY | SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD },
+    { NULL,
+      EGPS__V_REL | EGPS__V_RD | EGPS__V_WRT,
+      SEC_DATA,
+      EGPS__V_REL | EGPS__V_RD | EGPS__V_WRT,
+      SEC_DATA | SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD }
+  };
+
+/* Retrieve BFD section flags by name and size.  */
+
+static flagword
+vms_secflag_by_name (const struct sec_flags_struct *section_flags,
+		     const char *name,
+		     int hassize)
+{
+  int i = 0;
+
+  while (section_flags[i].name != NULL)
+    {
+      if (strcmp (name, section_flags[i].name) == 0)
+        {
+	  if (hassize)
+	    return section_flags[i].flags_hassize;
+	  else
+	    return section_flags[i].flags_always;
+	}
+      i++;
+    }
+  if (hassize)
+    return section_flags[i].flags_hassize;
+  return section_flags[i].flags_always;
+}
+
+/* Retrieve VMS section flags by name and size.  */
+
+static flagword
+vms_esecflag_by_name (const struct sec_flags_struct *section_flags,
+		      const char *name,
+                      int hassize)
+{
+  int i = 0;
+
+  while (section_flags[i].name != NULL)
+    {
+      if (strcmp (name, section_flags[i].name) == 0)
+	{
+	  if (hassize)
+	    return section_flags[i].vflags_hassize;
+	  else
+	    return section_flags[i].vflags_always;
+	}
+      i++;
+    }
+  if (hassize)
+    return section_flags[i].vflags_hassize;
+  return section_flags[i].vflags_always;
+}
+
+/* Add SYM to the symbol table of ABFD.
+   Return FALSE in case of error.  */
+
+static bfd_boolean
+add_symbol_entry (bfd *abfd, struct vms_symbol_entry *sym)
+{
+  if (PRIV (gsd_sym_count) >= PRIV (max_sym_count))
+    {
+      if (PRIV (max_sym_count) == 0)
+        {
+          PRIV (max_sym_count) = 128;
+          PRIV (syms) = bfd_malloc
+            (PRIV (max_sym_count) * sizeof (struct vms_symbol_entry *));
+        }
+      else
+        {
+          PRIV (max_sym_count) *= 2;
+          PRIV (syms) = bfd_realloc
+            (PRIV (syms),
+             (PRIV (max_sym_count) * sizeof (struct vms_symbol_entry *)));
+        }
+      if (PRIV (syms) == NULL)
+        return FALSE;
+    }
+
+  PRIV (syms)[PRIV (gsd_sym_count)++] = sym;
+  return TRUE;
+}
+
+/* Create a symbol whose name is ASCIC and add it to ABFD.
+   Return NULL in case of error.  */
+
+static struct vms_symbol_entry *
+add_symbol (bfd *abfd, const unsigned char *ascic)
+{
+  struct vms_symbol_entry *entry;
+  int len;
+
+  len = *ascic++;
+  entry = (struct vms_symbol_entry *)bfd_zalloc (abfd, sizeof (*entry) + len);
+  if (entry == NULL)
+    return NULL;
+  entry->namelen = len;
+  memcpy (entry->name, ascic, len);
+  entry->name[len] = 0;
+  entry->owner = abfd;
+
+  if (!add_symbol_entry (abfd, entry))
+    return NULL;
+  return entry;
+}
+
+/* Read and process EGSD.  Return FALSE on failure.  */
+
+static bfd_boolean
+_bfd_vms_slurp_egsd (bfd *abfd)
+{
+  int gsd_type, gsd_size;
+  unsigned char *vms_rec;
+  unsigned long base_addr;
+
+  vms_debug2 ((2, "EGSD\n"));
+
+  PRIV (recrd.rec) += 8;	/* Skip type, size, align pad.  */
+  PRIV (recrd.rec_size) -= 8;
+
+  /* Calculate base address for each section.  */
+  base_addr = 0L;
+
+  while (PRIV (recrd.rec_size) > 0)
+    {
+      vms_rec = PRIV (recrd.rec);
+
+      gsd_type = bfd_getl16 (vms_rec);
+      gsd_size = bfd_getl16 (vms_rec + 2);
+
+      vms_debug2 ((3, "egsd_type %d\n", gsd_type));
+
+      switch (gsd_type)
+	{
+	case EGSD__C_PSC:
+          /* Program section definition.  */
+	  {
+            struct vms_egps *egps = (struct vms_egps *)vms_rec;
+            flagword new_flags, vms_flags;
+            asection *section;
+
+	    vms_flags = bfd_getl16 (egps->flags);
+
+            if ((vms_flags & EGPS__V_REL) == 0)
+              {
+                /* Use the global absolute section for all
+                   absolute sections.  */
+                section = bfd_abs_section_ptr;
+              }
+            else
+              {
+                char *name;
+                unsigned long align_addr;
+
+                name = _bfd_vms_save_counted_string (&egps->namlng);
+
+                section = bfd_make_section (abfd, name);
+                if (!section)
+                  return FALSE;
+
+                section->filepos = 0;
+                section->size = bfd_getl32 (egps->alloc);
+                section->alignment_power = egps->align;
+
+                vms_section_data (section)->flags = vms_flags;
+                vms_section_data (section)->no_flags = 0;
+
+                new_flags = vms_secflag_by_name (evax_section_flags, name,
+                                                 section->size > 0);
+                if (section->size > 0)
+                  new_flags |= SEC_LOAD;
+                if (!(vms_flags & EGPS__V_NOMOD) && section->size > 0)
+                  {
+                    /* Set RELOC and HAS_CONTENTS if the section is not
+                       demand-zero and not empty.  */
+                    new_flags |= SEC_HAS_CONTENTS;
+                    if (vms_flags & EGPS__V_REL)
+                      new_flags |= SEC_RELOC;
+                  }
+                if (vms_flags & EGPS__V_EXE)
+                  {
+                    /* Set CODE if section is executable.  */
+                    new_flags |= SEC_CODE;
+                    new_flags &= ~SEC_DATA;
+                  }
+                if (!bfd_set_section_flags (abfd, section, new_flags))
+                  return FALSE;
+
+                /* Give a non-overlapping vma to non absolute sections.  */
+                align_addr = (1 << section->alignment_power);
+                if ((base_addr % align_addr) != 0)
+                  base_addr += (align_addr - (base_addr % align_addr));
+                section->vma = (bfd_vma)base_addr;
+                base_addr += section->size;
+              }
+
+            /* Append it to the section array.  */
+            if (PRIV (section_count) >= PRIV (section_max))
+              {
+                if (PRIV (section_max) == 0)
+                  PRIV (section_max) = 16;
+                else
+                  PRIV (section_max) *= 2;
+                PRIV (sections) = bfd_realloc_or_free
+                  (PRIV (sections), PRIV (section_max) * sizeof (asection *));
+                if (PRIV (sections) == NULL)
+                  return FALSE;
+              }
+
+            PRIV (sections)[PRIV (section_count)] = section;
+            PRIV (section_count)++;
+	  }
+	  break;
+
+	case EGSD__C_SYM:
+	  {
+            int nameoff;
+            struct vms_symbol_entry *entry;
+            struct vms_egsy *egsy = (struct vms_egsy *) vms_rec;
+            flagword old_flags;
+
+	    old_flags = bfd_getl16 (egsy->flags);
+	    if (old_flags & EGSY__V_DEF)
+              nameoff = ESDF__B_NAMLNG;
+            else
+              nameoff = ESRF__B_NAMLNG;
+
+            entry = add_symbol (abfd, vms_rec + nameoff);
+            if (entry == NULL)
+              return FALSE;
+
+            /* Allow only duplicate reference.  */
+            if ((entry->flags & EGSY__V_DEF) && (old_flags & EGSY__V_DEF))
+              abort ();
+
+            if (entry->typ == 0)
+              {
+                entry->typ = gsd_type;
+                entry->data_type = egsy->datyp;
+                entry->flags = old_flags;
+              }
+
+	    if (old_flags & EGSY__V_DEF)
+              {
+                struct vms_esdf *esdf = (struct vms_esdf *)vms_rec;
+
+		entry->value = bfd_getl64 (esdf->value);
+		entry->section = PRIV (sections)[bfd_getl32 (esdf->psindx)];
+
+                if (old_flags & EGSY__V_NORM)
+                  {
+                    PRIV (norm_sym_count)++;
+
+                    entry->code_value = bfd_getl64 (esdf->code_address);
+                    entry->code_section =
+                      PRIV (sections)[bfd_getl32 (esdf->ca_psindx)];
+                  }
+              }
+	  }
+	  break;
+
+	case EGSD__C_SYMG:
+	  {
+            struct vms_symbol_entry *entry;
+            struct vms_egst *egst = (struct vms_egst *)vms_rec;
+            flagword old_flags;
+
+	    old_flags = bfd_getl16 (egst->header.flags);
+
+            entry = add_symbol (abfd, &egst->namlng);
+
+            if (entry == NULL)
+              return FALSE;
+
+            entry->typ = gsd_type;
+            entry->data_type = egst->header.datyp;
+            entry->flags = old_flags;
+
+            entry->symbol_vector = bfd_getl32 (egst->value);
+
+            if (old_flags & EGSY__V_REL)
+              entry->section = PRIV (sections)[bfd_getl32 (egst->psindx)];
+            else
+              entry->section = bfd_abs_section_ptr;
+
+            entry->value = bfd_getl64 (egst->lp_2);
+
+            if (old_flags & EGSY__V_NORM)
+              {
+                PRIV (norm_sym_count)++;
+
+                entry->code_value = bfd_getl64 (egst->lp_1);
+                entry->code_section = bfd_abs_section_ptr;
+              }
+          }
+	  break;
+
+        case EGSD__C_SPSC:
+        case EGSD__C_IDC:
+          /* Currently ignored.  */
+          break;
+	case EGSD__C_SYMM:
+	case EGSD__C_SYMV:
+	default:
+	  (*_bfd_error_handler) (_("Unknown EGSD subtype %d"), gsd_type);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+
+      PRIV (recrd.rec_size) -= gsd_size;
+      PRIV (recrd.rec) += gsd_size;
+    }
+
+  if (PRIV (gsd_sym_count) > 0)
+    abfd->flags |= HAS_SYMS;
+
+  return TRUE;
+}
+
+/* Stack routines for vms ETIR commands.  */
+
+/* Push value and section index.  */
+
+static void
+_bfd_vms_push (bfd *abfd, bfd_vma val, unsigned int reloc)
+{
+  vms_debug2 ((4, "<push %08lx (0x%08x) at %d>\n",
+               (unsigned long)val, reloc, PRIV (stackptr)));
+
+  PRIV (stack[PRIV (stackptr)]).value = val;
+  PRIV (stack[PRIV (stackptr)]).reloc = reloc;
+  PRIV (stackptr)++;
+  if (PRIV (stackptr) >= STACKSIZE)
+    {
+      bfd_set_error (bfd_error_bad_value);
+      (*_bfd_error_handler) (_("Stack overflow (%d) in _bfd_vms_push"), PRIV (stackptr));
+      exit (1);
+    }
+}
+
+/* Pop value and section index.  */
+
+static void
+_bfd_vms_pop (bfd *abfd, bfd_vma *val, unsigned int *rel)
+{
+  if (PRIV (stackptr) == 0)
+    {
+      bfd_set_error (bfd_error_bad_value);
+      (*_bfd_error_handler) (_("Stack underflow in _bfd_vms_pop"));
+      exit (1);
+    }
+  PRIV (stackptr)--;
+  *val = PRIV (stack[PRIV (stackptr)]).value;
+  *rel = PRIV (stack[PRIV (stackptr)]).reloc;
+
+  vms_debug2 ((4, "<pop %08lx (0x%08x)>\n", (unsigned long)*val, *rel));
+}
+
+/* Routines to fill sections contents during tir/etir read.  */
+
+/* Initialize image buffer pointer to be filled.  */
+
+static void
+image_set_ptr (bfd *abfd, bfd_vma vma, int sect, struct bfd_link_info *info)
+{
+  asection *sec;
+
+  vms_debug2 ((4, "image_set_ptr (0x%08x, sect=%d)\n", (unsigned)vma, sect));
+
+  sec = PRIV (sections)[sect];
+
+  if (info)
+    {
+      /* Reading contents to an output bfd.  */
+
+      if (sec->output_section == NULL)
+        {
+          /* Section discarded.  */
+          vms_debug2 ((5, " section %s discarded\n", sec->name));
+
+          /* This is not used.  */
+          PRIV (image_section) = NULL;
+          PRIV (image_offset) = 0;
+          return;
+        }
+      PRIV (image_offset) = sec->output_offset + vma;
+      PRIV (image_section) = sec->output_section;
+    }
+  else
+    {
+      PRIV (image_offset) = vma;
+      PRIV (image_section) = sec;
+    }
+}
+
+/* Increment image buffer pointer by offset.  */
+
+static void
+image_inc_ptr (bfd *abfd, bfd_vma offset)
+{
+  vms_debug2 ((4, "image_inc_ptr (%u)\n", (unsigned)offset));
+
+  PRIV (image_offset) += offset;
+}
+
+/* Save current DST location counter under specified index.  */
+
+static void
+dst_define_location (bfd *abfd, unsigned int loc)
+{
+  vms_debug2 ((4, "dst_define_location (%d)\n", (int)loc));
+
+  /* Grow the ptr offset table if necessary.  */
+  if (loc + 1 > PRIV (dst_ptr_offsets_count))
+    {
+      PRIV (dst_ptr_offsets) = bfd_realloc (PRIV (dst_ptr_offsets),
+					   (loc + 1) * sizeof (unsigned int));
+      PRIV (dst_ptr_offsets_count) = loc + 1;
+    }
+
+  PRIV (dst_ptr_offsets)[loc] = PRIV (image_offset);
+}
+
+/* Restore saved DST location counter from specified index.  */
+
+static void
+dst_restore_location (bfd *abfd, unsigned int loc)
+{
+  vms_debug2 ((4, "dst_restore_location (%d)\n", (int)loc));
+
+  PRIV (image_offset) = PRIV (dst_ptr_offsets)[loc];
+}
+
+/* Retrieve saved DST location counter from specified index.  */
+
+static unsigned int
+dst_retrieve_location (bfd *abfd, unsigned int loc)
+{
+  vms_debug2 ((4, "dst_retrieve_location (%d)\n", (int)loc));
+
+  return PRIV (dst_ptr_offsets)[loc];
+}
+
+/* Write multiple bytes to section image.  */
+
+static bfd_boolean
+image_write (bfd *abfd, unsigned char *ptr, int size)
+{
+#if VMS_DEBUG
+  _bfd_vms_debug (8, "image_write from (%p, %d) to (%ld)\n", ptr, size,
+                  (long)PRIV (image_offset));
+  _bfd_hexdump (9, ptr, size, 0);
+#endif
+
+  if (PRIV (image_section)->contents != NULL)
+    {
+      asection *sec = PRIV (image_section);
+      file_ptr off = PRIV (image_offset);
+
+      /* Check bounds.  */
+      if (off > (file_ptr)sec->size
+          || size > (file_ptr)sec->size
+          || off + size > (file_ptr)sec->size)
+        {
+          bfd_set_error (bfd_error_bad_value);
+          return FALSE;
+        }
+
+      memcpy (sec->contents + off, ptr, size);
+    }
+
+  PRIV (image_offset) += size;
+  return TRUE;
+}
+
+/* Write byte to section image.  */
+
+static bfd_boolean
+image_write_b (bfd * abfd, unsigned int value)
+{
+  unsigned char data[1];
+
+  vms_debug2 ((6, "image_write_b (%02x)\n", (int) value));
+
+  *data = value;
+
+  return image_write (abfd, data, sizeof (data));
+}
+
+/* Write 2-byte word to image.  */
+
+static bfd_boolean
+image_write_w (bfd * abfd, unsigned int value)
+{
+  unsigned char data[2];
+
+  vms_debug2 ((6, "image_write_w (%04x)\n", (int) value));
+
+  bfd_putl16 (value, data);
+  return image_write (abfd, data, sizeof (data));
+}
+
+/* Write 4-byte long to image.  */
+
+static bfd_boolean
+image_write_l (bfd * abfd, unsigned long value)
+{
+  unsigned char data[4];
+
+  vms_debug2 ((6, "image_write_l (%08lx)\n", value));
+
+  bfd_putl32 (value, data);
+  return image_write (abfd, data, sizeof (data));
+}
+
+/* Write 8-byte quad to image.  */
+
+static bfd_boolean
+image_write_q (bfd * abfd, bfd_vma value)
+{
+  unsigned char data[8];
+
+  vms_debug2 ((6, "image_write_q (%08lx)\n", (unsigned long)value));
+
+  bfd_putl64 (value, data);
+  return image_write (abfd, data, sizeof (data));
+}
+
+static const char *
+_bfd_vms_etir_name (int cmd)
+{
+  switch (cmd)
+    {
+    case ETIR__C_STA_GBL: return "ETIR__C_STA_GBL";
+    case ETIR__C_STA_LW: return "ETIR__C_STA_LW";
+    case ETIR__C_STA_QW: return "ETIR__C_STA_QW";
+    case ETIR__C_STA_PQ: return "ETIR__C_STA_PQ";
+    case ETIR__C_STA_LI: return "ETIR__C_STA_LI";
+    case ETIR__C_STA_MOD: return "ETIR__C_STA_MOD";
+    case ETIR__C_STA_CKARG: return "ETIR__C_STA_CKARG";
+    case ETIR__C_STO_B: return "ETIR__C_STO_B";
+    case ETIR__C_STO_W: return "ETIR__C_STO_W";
+    case ETIR__C_STO_GBL: return "ETIR__C_STO_GBL";
+    case ETIR__C_STO_CA: return "ETIR__C_STO_CA";
+    case ETIR__C_STO_RB: return "ETIR__C_STO_RB";
+    case ETIR__C_STO_AB: return "ETIR__C_STO_AB";
+    case ETIR__C_STO_OFF: return "ETIR__C_STO_OFF";
+    case ETIR__C_STO_IMM: return "ETIR__C_STO_IMM";
+    case ETIR__C_STO_IMMR: return "ETIR__C_STO_IMMR";
+    case ETIR__C_STO_LW: return "ETIR__C_STO_LW";
+    case ETIR__C_STO_QW: return "ETIR__C_STO_QW";
+    case ETIR__C_STO_GBL_LW: return "ETIR__C_STO_GBL_LW";
+    case ETIR__C_STO_LP_PSB: return "ETIR__C_STO_LP_PSB";
+    case ETIR__C_STO_HINT_GBL: return "ETIR__C_STO_HINT_GBL";
+    case ETIR__C_STO_HINT_PS: return "ETIR__C_STO_HINT_PS";
+    case ETIR__C_OPR_ADD: return "ETIR__C_OPR_ADD";
+    case ETIR__C_OPR_SUB: return "ETIR__C_OPR_SUB";
+    case ETIR__C_OPR_INSV: return "ETIR__C_OPR_INSV";
+    case ETIR__C_OPR_USH: return "ETIR__C_OPR_USH";
+    case ETIR__C_OPR_ROT: return "ETIR__C_OPR_ROT";
+    case ETIR__C_OPR_REDEF: return "ETIR__C_OPR_REDEF";
+    case ETIR__C_OPR_DFLIT: return "ETIR__C_OPR_DFLIT";
+    case ETIR__C_STC_LP: return "ETIR__C_STC_LP";
+    case ETIR__C_STC_GBL: return "ETIR__C_STC_GBL";
+    case ETIR__C_STC_GCA: return "ETIR__C_STC_GCA";
+    case ETIR__C_STC_PS: return "ETIR__C_STC_PS";
+    case ETIR__C_STC_NBH_PS: return "ETIR__C_STC_NBH_PS";
+    case ETIR__C_STC_NOP_GBL: return "ETIR__C_STC_NOP_GBL";
+    case ETIR__C_STC_NOP_PS: return "ETIR__C_STC_NOP_PS";
+    case ETIR__C_STC_BSR_GBL: return "ETIR__C_STC_BSR_GBL";
+    case ETIR__C_STC_BSR_PS: return "ETIR__C_STC_BSR_PS";
+    case ETIR__C_STC_LDA_GBL: return "ETIR__C_STC_LDA_GBL";
+    case ETIR__C_STC_LDA_PS: return "ETIR__C_STC_LDA_PS";
+    case ETIR__C_STC_BOH_GBL: return "ETIR__C_STC_BOH_GBL";
+    case ETIR__C_STC_BOH_PS: return "ETIR__C_STC_BOH_PS";
+    case ETIR__C_STC_NBH_GBL: return "ETIR__C_STC_NBH_GBL";
+    case ETIR__C_STC_LP_PSB: return "ETIR__C_STC_LP_PSB";
+    case ETIR__C_CTL_SETRB: return "ETIR__C_CTL_SETRB";
+    case ETIR__C_CTL_AUGRB: return "ETIR__C_CTL_AUGRB";
+    case ETIR__C_CTL_DFLOC: return "ETIR__C_CTL_DFLOC";
+    case ETIR__C_CTL_STLOC: return "ETIR__C_CTL_STLOC";
+    case ETIR__C_CTL_STKDL: return "ETIR__C_CTL_STKDL";
+
+    default:
+      /* These names have not yet been added to this switch statement.  */
+      (*_bfd_error_handler) (_("unknown ETIR command %d"), cmd);
+    }
+
+  return NULL;
+}
+#define HIGHBIT(op) ((op & 0x80000000L) == 0x80000000L)
+
+static void
+_bfd_vms_get_value (bfd *abfd, const unsigned char *ascic,
+                    struct bfd_link_info *info,
+                    bfd_vma *vma,
+                    struct alpha_vms_link_hash_entry **hp)
+{
+  char name[257];
+  int len;
+  int i;
+  struct alpha_vms_link_hash_entry *h;
+
+  /* Not linking.  Do not try to resolve the symbol.  */
+  if (info == NULL)
+    {
+      *vma = 0;
+      *hp = NULL;
+      return;
+    }
+
+  len = *ascic;
+  for (i = 0; i < len; i++)
+    name[i] = ascic[i + 1];
+  name[i] = 0;
+
+  h = (struct alpha_vms_link_hash_entry *)
+    bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE);
+
+  *hp = h;
+
+  if (h != NULL
+      && (h->root.type == bfd_link_hash_defined
+          || h->root.type == bfd_link_hash_defweak))
+    *vma = h->root.u.def.value
+      + h->root.u.def.section->output_offset
+      + h->root.u.def.section->output_section->vma;
+  else if (h && h->root.type == bfd_link_hash_undefweak)
+    *vma = 0;
+  else
+    {
+      if (!(*info->callbacks->undefined_symbol)
+          (info, name, abfd, PRIV (image_section), PRIV (image_offset), TRUE))
+        abort ();
+      *vma = 0;
+    }
+}
+
+#define RELC_NONE 0
+#define RELC_REL  1
+#define RELC_SHR_BASE 0x10000
+#define RELC_SEC_BASE 0x20000
+#define RELC_MASK     0x0ffff
+
+static unsigned int
+alpha_vms_sym_to_ctxt (struct alpha_vms_link_hash_entry *h)
+{
+  /* Handle undefined symbols.  */
+  if (h == NULL || h->sym == NULL)
+    return RELC_NONE;
+
+  if (h->sym->typ == EGSD__C_SYMG)
+    {
+      if (h->sym->flags & EGSY__V_REL)
+        return RELC_SHR_BASE + PRIV2 (h->sym->owner, shr_index);
+      else
+        {
+          /* Can this happen (non-relocatable symg) ?  I'd like to see
+             an example.  */
+          abort ();
+        }
+    }
+  if (h->sym->typ == EGSD__C_SYM)
+    {
+      if (h->sym->flags & EGSY__V_REL)
+        return RELC_REL;
+      else
+        return RELC_NONE;
+    }
+  abort ();
+}
+
+static bfd_vma
+alpha_vms_get_sym_value (asection *sect, bfd_vma addr)
+{
+  return sect->output_section->vma + sect->output_offset + addr;
+}
+
+static bfd_vma
+alpha_vms_fix_sec_rel (bfd *abfd, struct bfd_link_info *info,
+                       unsigned int rel, bfd_vma vma)
+{
+  asection *sec = PRIV (sections)[rel & RELC_MASK];
+
+  if (info)
+    {
+      if (sec->output_section == NULL)
+        abort ();
+      return vma + sec->output_section->vma + sec->output_offset;
+    }
+  else
+    return vma + sec->vma;
+}
+
+/* Read an ETIR record from ABFD.  If INFO is not null, put the content into
+   the output section (used during linking).
+   Return FALSE in case of error.  */
+
+static bfd_boolean
+_bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
+{
+  unsigned char *ptr;
+  unsigned int length;
+  unsigned char *maxptr;
+  bfd_vma op1;
+  bfd_vma op2;
+  unsigned int rel1;
+  unsigned int rel2;
+  struct alpha_vms_link_hash_entry *h;
+
+  PRIV (recrd.rec) += ETIR__C_HEADER_SIZE;
+  PRIV (recrd.rec_size) -= ETIR__C_HEADER_SIZE;
+
+  ptr = PRIV (recrd.rec);
+  length = PRIV (recrd.rec_size);
+  maxptr = ptr + length;
+
+  vms_debug2 ((2, "ETIR: %d bytes\n", length));
+
+  while (ptr < maxptr)
+    {
+      int cmd = bfd_getl16 (ptr);
+      int cmd_length = bfd_getl16 (ptr + 2);
+
+      ptr += 4;
+
+#if VMS_DEBUG
+      _bfd_vms_debug (4, "etir: %s(%d)\n",
+                      _bfd_vms_etir_name (cmd), cmd);
+      _bfd_hexdump (8, ptr, cmd_length - 4, 0);
+#endif
+
+      switch (cmd)
+        {
+          /* Stack global
+             arg: cs	symbol name
+
+             stack 32 bit value of symbol (high bits set to 0).  */
+        case ETIR__C_STA_GBL:
+          _bfd_vms_get_value (abfd, ptr, info, &op1, &h);
+          _bfd_vms_push (abfd, op1, alpha_vms_sym_to_ctxt (h));
+          break;
+
+          /* Stack longword
+             arg: lw	value
+
+             stack 32 bit value, sign extend to 64 bit.  */
+        case ETIR__C_STA_LW:
+          _bfd_vms_push (abfd, bfd_getl32 (ptr), RELC_NONE);
+          break;
+
+          /* Stack quadword
+             arg: qw	value
+
+             stack 64 bit value of symbol.  */
+        case ETIR__C_STA_QW:
+          _bfd_vms_push (abfd, bfd_getl64 (ptr), RELC_NONE);
+          break;
+
+          /* Stack psect base plus quadword offset
+             arg: lw	section index
+             qw	signed quadword offset (low 32 bits)
+
+             Stack qw argument and section index
+             (see ETIR__C_STO_OFF, ETIR__C_CTL_SETRB).  */
+        case ETIR__C_STA_PQ:
+          {
+            int psect;
+
+            psect = bfd_getl32 (ptr);
+            if ((unsigned int) psect >= PRIV (section_count))
+              {
+                (*_bfd_error_handler) (_("bad section index in %s"),
+                                       _bfd_vms_etir_name (cmd));
+                bfd_set_error (bfd_error_bad_value);
+                return FALSE;
+              }
+            op1 = bfd_getl64 (ptr + 4);
+            _bfd_vms_push (abfd, op1, psect | RELC_SEC_BASE);
+          }
+          break;
+
+        case ETIR__C_STA_LI:
+        case ETIR__C_STA_MOD:
+        case ETIR__C_STA_CKARG:
+          (*_bfd_error_handler) (_("unsupported STA cmd %s"),
+                                 _bfd_vms_etir_name (cmd));
+          return FALSE;
+          break;
+
+          /* Store byte: pop stack, write byte
+             arg: -.  */
+        case ETIR__C_STO_B:
+          _bfd_vms_pop (abfd, &op1, &rel1);
+          if (rel1 != RELC_NONE)
+            goto bad_context;
+          image_write_b (abfd, (unsigned int) op1 & 0xff);
+          break;
+
+          /* Store word: pop stack, write word
+             arg: -.  */
+        case ETIR__C_STO_W:
+          _bfd_vms_pop (abfd, &op1, &rel1);
+          if (rel1 != RELC_NONE)
+            goto bad_context;
+          image_write_w (abfd, (unsigned int) op1 & 0xffff);
+          break;
+
+          /* Store longword: pop stack, write longword
+             arg: -.  */
+        case ETIR__C_STO_LW:
+          _bfd_vms_pop (abfd, &op1, &rel1);
+          if (rel1 & RELC_SEC_BASE)
+            {
+              op1 = alpha_vms_fix_sec_rel (abfd, info, rel1, op1);
+              rel1 = RELC_REL;
+            }
+          else if (rel1 & RELC_SHR_BASE)
+            {
+              alpha_vms_add_fixup_lr (info, rel1 & RELC_MASK, op1);
+              rel1 = RELC_NONE;
+            }
+          if (rel1 != RELC_NONE)
+            {
+              if (rel1 != RELC_REL)
+                abort ();
+              alpha_vms_add_lw_reloc (info);
+            }
+          image_write_l (abfd, op1);
+          break;
+
+          /* Store quadword: pop stack, write quadword
+             arg: -.  */
+        case ETIR__C_STO_QW:
+          _bfd_vms_pop (abfd, &op1, &rel1);
+          if (rel1 & RELC_SEC_BASE)
+            {
+              op1 = alpha_vms_fix_sec_rel (abfd, info, rel1, op1);
+              rel1 = RELC_REL;
+            }
+          else if (rel1 & RELC_SHR_BASE)
+            abort ();
+          if (rel1 != RELC_NONE)
+            {
+              if (rel1 != RELC_REL)
+                abort ();
+              alpha_vms_add_qw_reloc (info);
+            }
+          image_write_q (abfd, op1);
+          break;
+
+          /* Store immediate repeated: pop stack for repeat count
+             arg: lw	byte count
+             da	data.  */
+        case ETIR__C_STO_IMMR:
+          {
+            int size;
+
+            size = bfd_getl32 (ptr);
+            _bfd_vms_pop (abfd, &op1, &rel1);
+            if (rel1 != RELC_NONE)
+              goto bad_context;
+            while (op1-- > 0)
+              image_write (abfd, ptr + 4, size);
+          }
+          break;
+
+          /* Store global: write symbol value
+             arg: cs	global symbol name.  */
+        case ETIR__C_STO_GBL:
+          _bfd_vms_get_value (abfd, ptr, info, &op1, &h);
+          if (h && h->sym)
+            {
+              if (h->sym->typ == EGSD__C_SYMG)
+                {
+                  alpha_vms_add_fixup_qr
+                    (info, abfd, h->sym->owner, h->sym->symbol_vector);
+                  op1 = 0;
+                }
+              else
+                {
+                  op1 = alpha_vms_get_sym_value (h->sym->section,
+                                                 h->sym->value);
+                  alpha_vms_add_qw_reloc (info);
+                }
+            }
+          image_write_q (abfd, op1);
+          break;
+
+          /* Store code address: write address of entry point
+             arg: cs	global symbol name (procedure).  */
+        case ETIR__C_STO_CA:
+          _bfd_vms_get_value (abfd, ptr, info, &op1, &h);
+          if (h && h->sym)
+            {
+              if (h->sym->flags & EGSY__V_NORM)
+                {
+                  /* That's really a procedure.  */
+                  if (h->sym->typ == EGSD__C_SYMG)
+                    {
+                      alpha_vms_add_fixup_ca (info, abfd, h->sym->owner);
+                      op1 = h->sym->symbol_vector;
+                    }
+                  else
+                    {
+                      op1 = alpha_vms_get_sym_value (h->sym->code_section,
+                                                     h->sym->code_value);
+                      alpha_vms_add_qw_reloc (info);
+                    }
+                }
+              else
+                {
+                  /* Symbol is not a procedure.  */
+                  abort ();
+                }
+            }
+          image_write_q (abfd, op1);
+          break;
+
+          /* Store offset to psect: pop stack, add low 32 bits to base of psect
+             arg: none.  */
+        case ETIR__C_STO_OFF:
+          _bfd_vms_pop (abfd, &op1, &rel1);
+
+          if (!(rel1 & RELC_SEC_BASE))
+            abort ();
+
+          op1 = alpha_vms_fix_sec_rel (abfd, info, rel1, op1);
+          rel1 = RELC_REL;
+          image_write_q (abfd, op1);
+          break;
+
+          /* Store immediate
+             arg: lw	count of bytes
+             da	data.  */
+        case ETIR__C_STO_IMM:
+          {
+            int size;
+
+            size = bfd_getl32 (ptr);
+            image_write (abfd, ptr + 4, size);
+          }
+          break;
+
+          /* This code is 'reserved to digital' according to the openVMS
+             linker manual, however it is generated by the DEC C compiler
+             and defined in the include file.
+             FIXME, since the following is just a guess
+             store global longword: store 32bit value of symbol
+             arg: cs	symbol name.  */
+        case ETIR__C_STO_GBL_LW:
+          _bfd_vms_get_value (abfd, ptr, info, &op1, &h);
+#if 0
+          abort ();
+#endif
+          image_write_l (abfd, op1);
+          break;
+
+        case ETIR__C_STO_RB:
+        case ETIR__C_STO_AB:
+        case ETIR__C_STO_LP_PSB:
+          (*_bfd_error_handler) (_("%s: not supported"),
+                                 _bfd_vms_etir_name (cmd));
+          return FALSE;
+          break;
+        case ETIR__C_STO_HINT_GBL:
+        case ETIR__C_STO_HINT_PS:
+          (*_bfd_error_handler) (_("%s: not implemented"),
+                                 _bfd_vms_etir_name (cmd));
+          return FALSE;
+          break;
+
+          /* 200 Store-conditional Linkage Pair
+             arg: none.  */
+        case ETIR__C_STC_LP:
+
+          /* 202 Store-conditional Address at global address
+             lw	linkage index
+             cs	global name.  */
+
+        case ETIR__C_STC_GBL:
+
+          /* 203 Store-conditional Code Address at global address
+             lw	linkage index
+             cs	procedure name.  */
+        case ETIR__C_STC_GCA:
+
+          /* 204 Store-conditional Address at psect + offset
+             lw	linkage index
+             lw	psect index
+             qw	offset.  */
+        case ETIR__C_STC_PS:
+          (*_bfd_error_handler) (_("%s: not supported"),
+                                 _bfd_vms_etir_name (cmd));
+          return FALSE;
+          break;
+
+          /* 201 Store-conditional Linkage Pair with Procedure Signature
+             lw	linkage index
+             cs	procedure name
+             by	signature length
+             da	signature.  */
+
+        case ETIR__C_STC_LP_PSB:
+          _bfd_vms_get_value (abfd, ptr + 4, info, &op1, &h);
+          if (h && h->sym)
+            {
+              if (h->sym->typ == EGSD__C_SYMG)
+                {
+                  alpha_vms_add_fixup_lp (info, abfd, h->sym->owner);
+                  op1 = h->sym->symbol_vector;
+                  op2 = 0;
+                }
+              else
+                {
+                  op1 = alpha_vms_get_sym_value (h->sym->code_section,
+                                                 h->sym->code_value);
+                  op2 = alpha_vms_get_sym_value (h->sym->section,
+                                                h->sym->value);
+                }
+            }
+          else
+            {
+              /* Undefined symbol.  */
+              op1 = 0;
+              op2 = 0;
+            }
+          image_write_q (abfd, op1);
+          image_write_q (abfd, op2);
+          break;
+
+          /* 205 Store-conditional NOP at address of global
+             arg: none.  */
+        case ETIR__C_STC_NOP_GBL:
+          /* ALPHA_R_NOP */
+
+          /* 207 Store-conditional BSR at global address
+             arg: none.  */
+
+        case ETIR__C_STC_BSR_GBL:
+          /* ALPHA_R_BSR */
+
+          /* 209 Store-conditional LDA at global address
+             arg: none.  */
+
+        case ETIR__C_STC_LDA_GBL:
+          /* ALPHA_R_LDA */
+
+          /* 211 Store-conditional BSR or Hint at global address
+             arg: none.  */
+
+        case ETIR__C_STC_BOH_GBL:
+          /* Currentl ignored.  */
+          break;
+
+          /* 213 Store-conditional NOP,BSR or HINT at global address
+             arg: none.  */
+
+        case ETIR__C_STC_NBH_GBL:
+
+          /* 206 Store-conditional NOP at pect + offset
+             arg: none.  */
+
+        case ETIR__C_STC_NOP_PS:
+
+          /* 208 Store-conditional BSR at pect + offset
+             arg: none.  */
+
+        case ETIR__C_STC_BSR_PS:
+
+          /* 210 Store-conditional LDA at psect + offset
+             arg: none.  */
+
+        case ETIR__C_STC_LDA_PS:
+
+          /* 212 Store-conditional BSR or Hint at pect + offset
+             arg: none.  */
+
+        case ETIR__C_STC_BOH_PS:
+
+          /* 214 Store-conditional NOP, BSR or HINT at psect + offset
+             arg: none.  */
+        case ETIR__C_STC_NBH_PS:
+          (*_bfd_error_handler) ("%s: not supported",
+                                 _bfd_vms_etir_name (cmd));
+          return FALSE;
+          break;
+
+          /* Det relocation base: pop stack, set image location counter
+             arg: none.  */
+        case ETIR__C_CTL_SETRB:
+          _bfd_vms_pop (abfd, &op1, &rel1);
+          if (!(rel1 & RELC_SEC_BASE))
+            abort ();
+          image_set_ptr (abfd, op1, rel1 & RELC_MASK, info);
+          break;
+
+          /* Augment relocation base: increment image location counter by offset
+             arg: lw	offset value.  */
+        case ETIR__C_CTL_AUGRB:
+          op1 = bfd_getl32 (ptr);
+          image_inc_ptr (abfd, op1);
+          break;
+
+          /* Define location: pop index, save location counter under index
+             arg: none.  */
+        case ETIR__C_CTL_DFLOC:
+          _bfd_vms_pop (abfd, &op1, &rel1);
+          if (rel1 != RELC_NONE)
+            goto bad_context;
+          dst_define_location (abfd, op1);
+          break;
+
+          /* Set location: pop index, restore location counter from index
+             arg: none.  */
+        case ETIR__C_CTL_STLOC:
+          _bfd_vms_pop (abfd, &op1, &rel1);
+          if (rel1 != RELC_NONE)
+            goto bad_context;
+          dst_restore_location (abfd, op1);
+          break;
+
+          /* Stack defined location: pop index, push location counter from index
+             arg: none.  */
+        case ETIR__C_CTL_STKDL:
+          _bfd_vms_pop (abfd, &op1, &rel1);
+          if (rel1 != RELC_NONE)
+            goto bad_context;
+          _bfd_vms_push (abfd, dst_retrieve_location (abfd, op1), RELC_NONE);
+          break;
+
+        case ETIR__C_OPR_NOP:      /* No-op.  */
+          break;
+
+        case ETIR__C_OPR_ADD:      /* Add.  */
+          _bfd_vms_pop (abfd, &op1, &rel1);
+          _bfd_vms_pop (abfd, &op2, &rel2);
+          if (rel1 == RELC_NONE && rel2 != RELC_NONE)
+            rel1 = rel2;
+          else if (rel1 != RELC_NONE && rel2 != RELC_NONE)
+            goto bad_context;
+          _bfd_vms_push (abfd, op1 + op2, rel1);
+          break;
+
+        case ETIR__C_OPR_SUB:      /* Subtract.  */
+          _bfd_vms_pop (abfd, &op1, &rel1);
+          _bfd_vms_pop (abfd, &op2, &rel2);
+          if (rel1 == RELC_NONE && rel2 != RELC_NONE)
+            rel1 = rel2;
+          else if ((rel1 & RELC_SEC_BASE) && (rel2 & RELC_SEC_BASE))
+            {
+              op1 = alpha_vms_fix_sec_rel (abfd, info, rel1, op1);
+              op2 = alpha_vms_fix_sec_rel (abfd, info, rel2, op2);
+              rel1 = RELC_NONE;
+            }
+          else if (rel1 != RELC_NONE && rel2 != RELC_NONE)
+            goto bad_context;
+          _bfd_vms_push (abfd, op2 - op1, rel1);
+          break;
+
+        case ETIR__C_OPR_MUL:      /* Multiply.  */
+          _bfd_vms_pop (abfd, &op1, &rel1);
+          _bfd_vms_pop (abfd, &op2, &rel2);
+          if (rel1 != RELC_NONE || rel2 != RELC_NONE)
+            goto bad_context;
+          _bfd_vms_push (abfd, op1 * op2, RELC_NONE);
+          break;
+
+        case ETIR__C_OPR_DIV:      /* Divide.  */
+          _bfd_vms_pop (abfd, &op1, &rel1);
+          _bfd_vms_pop (abfd, &op2, &rel2);
+          if (rel1 != RELC_NONE || rel2 != RELC_NONE)
+            goto bad_context;
+          if (op2 == 0)
+            _bfd_vms_push (abfd, 0, RELC_NONE);
+          else
+            _bfd_vms_push (abfd, op2 / op1, RELC_NONE);
+          break;
+
+        case ETIR__C_OPR_AND:      /* Logical AND.  */
+          _bfd_vms_pop (abfd, &op1, &rel1);
+          _bfd_vms_pop (abfd, &op2, &rel2);
+          if (rel1 != RELC_NONE || rel2 != RELC_NONE)
+            goto bad_context;
+          _bfd_vms_push (abfd, op1 & op2, RELC_NONE);
+          break;
+
+        case ETIR__C_OPR_IOR:      /* Logical inclusive OR.  */
+          _bfd_vms_pop (abfd, &op1, &rel1);
+          _bfd_vms_pop (abfd, &op2, &rel2);
+          if (rel1 != RELC_NONE || rel2 != RELC_NONE)
+            goto bad_context;
+          _bfd_vms_push (abfd, op1 | op2, RELC_NONE);
+          break;
+
+        case ETIR__C_OPR_EOR:      /* Logical exclusive OR.  */
+          _bfd_vms_pop (abfd, &op1, &rel1);
+          _bfd_vms_pop (abfd, &op2, &rel2);
+          if (rel1 != RELC_NONE || rel2 != RELC_NONE)
+            goto bad_context;
+          _bfd_vms_push (abfd, op1 ^ op2, RELC_NONE);
+          break;
+
+        case ETIR__C_OPR_NEG:      /* Negate.  */
+          _bfd_vms_pop (abfd, &op1, &rel1);
+          if (rel1 != RELC_NONE)
+            goto bad_context;
+          _bfd_vms_push (abfd, -op1, RELC_NONE);
+          break;
+
+        case ETIR__C_OPR_COM:      /* Complement.  */
+          _bfd_vms_pop (abfd, &op1, &rel1);
+          if (rel1 != RELC_NONE)
+            goto bad_context;
+          _bfd_vms_push (abfd, ~op1, RELC_NONE);
+          break;
+
+        case ETIR__C_OPR_ASH:      /* Arithmetic shift.  */
+          _bfd_vms_pop (abfd, &op1, &rel1);
+          _bfd_vms_pop (abfd, &op2, &rel2);
+          if (rel1 != RELC_NONE || rel2 != RELC_NONE)
+            {
+            bad_context:
+              (*_bfd_error_handler) (_("invalid use of %s with contexts"),
+                                     _bfd_vms_etir_name (cmd));
+              return FALSE;
+            }
+          if ((int)op2 < 0)		/* Shift right.  */
+            op1 >>= -(int)op2;
+          else			/* Shift left.  */
+            op1 <<= (int)op2;
+          _bfd_vms_push (abfd, op1, RELC_NONE); /* FIXME: sym.  */
+          break;
+
+        case ETIR__C_OPR_INSV:      /* Insert field.   */
+        case ETIR__C_OPR_USH:       /* Unsigned shift.   */
+        case ETIR__C_OPR_ROT:       /* Rotate.  */
+        case ETIR__C_OPR_REDEF:     /* Redefine symbol to current location.  */
+        case ETIR__C_OPR_DFLIT:     /* Define a literal.  */
+          (*_bfd_error_handler) (_("%s: not supported"),
+                                 _bfd_vms_etir_name (cmd));
+          return FALSE;
+          break;
+
+        case ETIR__C_OPR_SEL:      /* Select.  */
+          _bfd_vms_pop (abfd, &op1, &rel1);
+          if (op1 & 0x01L)
+            _bfd_vms_pop (abfd, &op1, &rel1);
+          else
+            {
+              _bfd_vms_pop (abfd, &op1, &rel1);
+              _bfd_vms_pop (abfd, &op2, &rel2);
+              _bfd_vms_push (abfd, op1, rel1);
+            }
+          break;
+
+        default:
+          (*_bfd_error_handler) (_("reserved cmd %d"), cmd);
+          return FALSE;
+          break;
+        }
+
+      ptr += cmd_length - 4;
+    }
+
+  return TRUE;
+}
+
+/* Process EDBG/ETBT record.
+   Return TRUE on success, FALSE on error  */
+
+static bfd_boolean
+vms_slurp_debug (bfd *abfd)
+{
+  asection *section = PRIV (dst_section);
+
+  if (section == NULL)
+    {
+      /* We have no way to find out beforehand how much debug info there
+	 is in an object file, so pick an initial amount and grow it as
+	 needed later.  */
+      flagword flags = SEC_HAS_CONTENTS | SEC_DEBUGGING | SEC_RELOC
+        | SEC_IN_MEMORY;
+
+      section = bfd_make_section (abfd, "$DST$");
+      if (!section)
+	return FALSE;
+      if (!bfd_set_section_flags (abfd, section, flags))
+	return FALSE;
+      PRIV (dst_section) = section;
+    }
+
+  PRIV (image_section) = section;
+  PRIV (image_offset) = section->size;
+
+  if (!_bfd_vms_slurp_etir (abfd, NULL))
+    return FALSE;
+
+  section->size = PRIV (image_offset);
+  return TRUE;
+}
+
+/* Process EDBG record.
+   Return TRUE on success, FALSE on error.  */
+
+static bfd_boolean
+_bfd_vms_slurp_edbg (bfd *abfd)
+{
+  vms_debug2 ((2, "EDBG\n"));
+
+  abfd->flags |= HAS_DEBUG | HAS_LINENO;
+
+  return vms_slurp_debug (abfd);
+}
+
+/* Process ETBT record.
+   Return TRUE on success, FALSE on error.  */
+
+static bfd_boolean
+_bfd_vms_slurp_etbt (bfd *abfd)
+{
+  vms_debug2 ((2, "ETBT\n"));
+
+  abfd->flags |= HAS_LINENO;
+
+  return vms_slurp_debug (abfd);
+}
+
+/* Process EEOM record.
+   Return TRUE on success, FALSE on error.  */
+
+static bfd_boolean
+_bfd_vms_slurp_eeom (bfd *abfd)
+{
+  struct vms_eeom *eeom = (struct vms_eeom *) PRIV (recrd.rec);
+
+  vms_debug2 ((2, "EEOM\n"));
+
+  PRIV (eom_data).eom_l_total_lps = bfd_getl32 (eeom->total_lps);
+  PRIV (eom_data).eom_w_comcod = bfd_getl16 (eeom->comcod);
+  if (PRIV (eom_data).eom_w_comcod > 1)
+    {
+      (*_bfd_error_handler) (_("Object module NOT error-free !\n"));
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  PRIV (eom_data).eom_has_transfer = FALSE;
+  if (PRIV (recrd.rec_size) > 10)
+    {
+      PRIV (eom_data).eom_has_transfer = TRUE;
+      PRIV (eom_data).eom_b_tfrflg = eeom->tfrflg;
+      PRIV (eom_data).eom_l_psindx = bfd_getl32 (eeom->psindx);
+      PRIV (eom_data).eom_l_tfradr = bfd_getl32 (eeom->tfradr);
+
+      abfd->start_address = PRIV (eom_data).eom_l_tfradr;
+    }
+  return TRUE;
+}
+
+/* Slurp an ordered set of VMS object records.  Return FALSE on error.  */
+
+static bfd_boolean
+_bfd_vms_slurp_object_records (bfd * abfd)
+{
+  bfd_boolean err;
+  int type;
+
+  do
+    {
+      vms_debug2 ((7, "reading at %08lx\n", (unsigned long)bfd_tell (abfd)));
+
+      type = _bfd_vms_get_object_record (abfd);
+      if (type < 0)
+	{
+	  vms_debug2 ((2, "next_record failed\n"));
+	  return FALSE;
+	}
+
+      switch (type)
+	{
+        case EOBJ__C_EMH:
+          err = _bfd_vms_slurp_ehdr (abfd);
+          break;
+        case EOBJ__C_EEOM:
+          err = _bfd_vms_slurp_eeom (abfd);
+          break;
+        case EOBJ__C_EGSD:
+          err = _bfd_vms_slurp_egsd (abfd);
+          break;
+        case EOBJ__C_ETIR:
+          err = TRUE; /* _bfd_vms_slurp_etir (abfd); */
+          break;
+        case EOBJ__C_EDBG:
+          err = _bfd_vms_slurp_edbg (abfd);
+          break;
+        case EOBJ__C_ETBT:
+          err = _bfd_vms_slurp_etbt (abfd);
+          break;
+        default:
+          err = FALSE;
+	}
+      if (err != TRUE)
+	{
+	  vms_debug2 ((2, "slurp type %d failed\n", type));
+	  return FALSE;
+	}
+    }
+  while (type != EOBJ__C_EEOM);
+
+  return TRUE;
+}
+
+/* Initialize private data  */
+static bfd_boolean
+vms_initialize (bfd * abfd)
+{
+  bfd_size_type amt;
+
+  amt = sizeof (struct vms_private_data_struct);
+  abfd->tdata.any = bfd_zalloc (abfd, amt);
+  if (abfd->tdata.any == NULL)
+    return FALSE;
+
+  PRIV (recrd.file_format) = FF_UNKNOWN;
+
+  amt = sizeof (struct stack_struct) * STACKSIZE;
+  PRIV (stack) = bfd_alloc (abfd, amt);
+  if (PRIV (stack) == NULL)
+    goto error_ret1;
+
+  return TRUE;
+
+ error_ret1:
+  bfd_release (abfd, abfd->tdata.any);
+  abfd->tdata.any = NULL;
+  return FALSE;
+}
+
+/* Check the format for a file being read.
+   Return a (bfd_target *) if it's an object file or zero if not.  */
+
+static const struct bfd_target *
+alpha_vms_object_p (bfd *abfd)
+{
+  void *tdata_save = abfd->tdata.any;
+  unsigned int test_len;
+  unsigned char *buf;
+
+  vms_debug2 ((1, "vms_object_p(%p)\n", abfd));
+
+  /* Allocate alpha-vms specific data.  */
+  if (!vms_initialize (abfd))
+    goto error_ret;
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET))
+    goto err_wrong_format;
+
+  /* The first challenge with VMS is to discover the kind of the file.
+
+     Image files (executable or shared images) are stored as a raw
+     stream of bytes (like on UNIX), but there is no magic number.
+
+     Object files are written with RMS (record management service), ie
+     each records are preceeded by its length (on a word - 2 bytes), and
+     padded for word-alignment.  That would be simple but when files
+     are transfered to a UNIX filesystem (using ftp), records are lost.
+     Only the raw content of the records are transfered.  Fortunately,
+     the Alpha Object file format also store the length of the record
+     in the records.  Is that clear ?  */
+
+  /* Minimum is 6 bytes for objects (2 bytes size, 2 bytes record id,
+     2 bytes size repeated) and 12 bytes for images (4 bytes major id,
+     4 bytes minor id, 4 bytes length).  */
+  test_len = 12;
+
+  /* Size the main buffer.  */
+  buf = (unsigned char *) bfd_malloc (test_len);
+  if (buf == NULL)
+    goto error_ret;
+  PRIV (recrd.buf) = buf;
+  PRIV (recrd.buf_size) = test_len;
+
+  /* Initialize the record pointer.  */
+  PRIV (recrd.rec) = buf;
+
+  if (bfd_bread (buf, test_len, abfd) != test_len)
+    {
+      bfd_set_error (bfd_error_file_truncated);
+      goto error_ret;
+    }
+
+  /* Is it an image?  */
+  if ((bfd_getl32 (buf) == EIHD__K_MAJORID)
+      && (bfd_getl32 (buf + 4) == EIHD__K_MINORID))
+    {
+      unsigned int to_read;
+      unsigned int read_so_far;
+      unsigned int remaining;
+      unsigned int eisd_offset, eihs_offset;
+
+      /* Extract the header size.  */
+      PRIV (recrd.rec_size) = bfd_getl32 (buf + EIHD__L_SIZE);
+
+      /* The header size is 0 for DSF files.  */
+      if (PRIV (recrd.rec_size) == 0)
+        PRIV (recrd.rec_size) = sizeof (struct vms_eihd);
+
+      if (PRIV (recrd.rec_size) > PRIV (recrd.buf_size))
+        {
+          buf = bfd_realloc_or_free (buf, PRIV (recrd.rec_size));
+
+          if (buf == NULL)
+            {
+              PRIV (recrd.buf) = NULL;
+              bfd_set_error (bfd_error_no_memory);
+              goto error_ret;
+            }
+          PRIV (recrd.buf) = buf;
+          PRIV (recrd.buf_size) = PRIV (recrd.rec_size);
+        }
+
+      /* Read the remaining record.  */
+      remaining = PRIV (recrd.rec_size) - test_len;
+      to_read = MIN (VMS_BLOCK_SIZE - test_len, remaining);
+      read_so_far = test_len;
+
+      while (remaining > 0)
+        {
+          if (bfd_bread (buf + read_so_far, to_read, abfd) != to_read)
+            {
+              bfd_set_error (bfd_error_file_truncated);
+              goto err_wrong_format;
+            }
+
+          read_so_far += to_read;
+          remaining -= to_read;
+
+          to_read = MIN (VMS_BLOCK_SIZE, remaining);
+        }
+
+      /* Reset the record pointer.  */
+      PRIV (recrd.rec) = buf;
+
+      vms_debug2 ((2, "file type is image\n"));
+
+      if (_bfd_vms_slurp_eihd (abfd, &eisd_offset, &eihs_offset) != TRUE)
+        goto err_wrong_format;
+
+      if (_bfd_vms_slurp_eisd (abfd, eisd_offset) != TRUE)
+        goto err_wrong_format;
+
+      /* EIHS is optional.  */
+      if (eihs_offset != 0 && _bfd_vms_slurp_eihs (abfd, eihs_offset) != TRUE)
+        goto err_wrong_format;
+    }
+  else
+    {
+      int type;
+
+      /* Assume it's a module and adjust record pointer if necessary.  */
+      maybe_adjust_record_pointer_for_object (abfd);
+
+      /* But is it really a module?  */
+      if (bfd_getl16 (PRIV (recrd.rec)) <= EOBJ__C_MAXRECTYP
+          && bfd_getl16 (PRIV (recrd.rec) + 2) <= EOBJ__C_MAXRECSIZ)
+        {
+          if (vms_get_remaining_object_record (abfd, test_len) <= 0)
+            goto err_wrong_format;
+
+          vms_debug2 ((2, "file type is module\n"));
+
+          type = bfd_getl16 (PRIV (recrd.rec));
+          if (type != EOBJ__C_EMH || _bfd_vms_slurp_ehdr (abfd) != TRUE)
+            goto err_wrong_format;
+
+          if (_bfd_vms_slurp_object_records (abfd) != TRUE)
+            goto err_wrong_format;
+        }
+      else
+        goto err_wrong_format;
+    }
+
+  /* Set arch_info to alpha.   */
+
+  if (! bfd_default_set_arch_mach (abfd, bfd_arch_alpha, 0))
+    goto err_wrong_format;
+
+  return abfd->xvec;
+
+ err_wrong_format:
+  bfd_set_error (bfd_error_wrong_format);
+
+ error_ret:
+  if (PRIV (recrd.buf))
+    free (PRIV (recrd.buf));
+  if (abfd->tdata.any != tdata_save && abfd->tdata.any != NULL)
+    bfd_release (abfd, abfd->tdata.any);
+  abfd->tdata.any = tdata_save;
+  return NULL;
+}
+
+/* Image write.  */
+
+/* Write an EMH/MHD record.  */
+
+static void
+_bfd_vms_write_emh (bfd *abfd)
+{
+  struct vms_rec_wr *recwr = &PRIV (recwr);
+
+  _bfd_vms_output_alignment (recwr, 2);
+
+  /* EMH.  */
+  _bfd_vms_output_begin (recwr, EOBJ__C_EMH);
+  _bfd_vms_output_short (recwr, EMH__C_MHD);
+  _bfd_vms_output_short (recwr, EOBJ__C_STRLVL);
+  _bfd_vms_output_long (recwr, 0);
+  _bfd_vms_output_long (recwr, 0);
+  _bfd_vms_output_long (recwr, MAX_OUTREC_SIZE);
+
+  /* Create module name from filename.  */
+  if (bfd_get_filename (abfd) != 0)
+    {
+      char *module = vms_get_module_name (bfd_get_filename (abfd), TRUE);
+      _bfd_vms_output_counted (recwr, module);
+      free (module);
+    }
+  else
+    _bfd_vms_output_counted (recwr, "NONAME");
+
+  _bfd_vms_output_counted (recwr, BFD_VERSION_STRING);
+  _bfd_vms_output_dump (recwr, get_vms_time_string (), EMH_DATE_LENGTH);
+  _bfd_vms_output_fill (recwr, 0, EMH_DATE_LENGTH);
+  _bfd_vms_output_end (abfd, recwr);
+}
+
+/* Write an EMH/LMN record.  */
+
+static void
+_bfd_vms_write_lmn (bfd *abfd, const char *name)
+{
+  char version [64];
+  struct vms_rec_wr *recwr = &PRIV (recwr);
+  unsigned int ver = BFD_VERSION / 10000;
+
+  /* LMN.  */
+  _bfd_vms_output_begin (recwr, EOBJ__C_EMH);
+  _bfd_vms_output_short (recwr, EMH__C_LNM);
+  snprintf (version, sizeof (version), "%s %d.%d.%d", name,
+            ver / 10000, (ver / 100) % 100, ver % 100);
+  _bfd_vms_output_dump (recwr, (unsigned char *)version, strlen (version));
+  _bfd_vms_output_end (abfd, recwr);
+}
+
+
+/* Write eom record for bfd abfd.  Return FALSE on error.  */
+
+static bfd_boolean
+_bfd_vms_write_eeom (bfd *abfd)
+{
+  struct vms_rec_wr *recwr = &PRIV (recwr);
+
+  vms_debug2 ((2, "vms_write_eeom\n"));
+
+  _bfd_vms_output_alignment (recwr, 2);
+
+  _bfd_vms_output_begin (recwr, EOBJ__C_EEOM);
+  _bfd_vms_output_long (recwr, PRIV (vms_linkage_index + 1) >> 1);
+  _bfd_vms_output_byte (recwr, 0);	/* Completion code.  */
+  _bfd_vms_output_byte (recwr, 0);	/* Fill byte.  */
+
+  if ((abfd->flags & EXEC_P) == 0
+      && bfd_get_start_address (abfd) != (bfd_vma)-1)
+    {
+      asection *section;
+
+      section = bfd_get_section_by_name (abfd, ".link");
+      if (section == 0)
+	{
+	  bfd_set_error (bfd_error_nonrepresentable_section);
+	  return FALSE;
+	}
+      _bfd_vms_output_short (recwr, 0);
+      _bfd_vms_output_long (recwr, (unsigned long) section->target_index);
+      _bfd_vms_output_long (recwr,
+			     (unsigned long) bfd_get_start_address (abfd));
+      _bfd_vms_output_long (recwr, 0);
+    }
+
+  _bfd_vms_output_end (abfd, recwr);
+  return TRUE;
+}
+
+/* This hash routine borrowed from GNU-EMACS, and strengthened
+   slightly.  ERY.  */
+
+static int
+hash_string (const char *ptr)
+{
+  const unsigned char *p = (unsigned char *) ptr;
+  const unsigned char *end = p + strlen (ptr);
+  unsigned char c;
+  int hash = 0;
+
+  while (p != end)
+    {
+      c = *p++;
+      hash = ((hash << 3) + (hash << 15) + (hash >> 28) + c);
+    }
+  return hash;
+}
+
+/* Generate a length-hashed VMS symbol name (limited to maxlen chars).  */
+
+static char *
+_bfd_vms_length_hash_symbol (bfd *abfd, const char *in, int maxlen)
+{
+  unsigned long result;
+  int in_len;
+  char *new_name;
+  const char *old_name;
+  int i;
+  static char outbuf[EOBJ__C_SYMSIZ + 1];
+  char *out = outbuf;
+
+#if VMS_DEBUG
+  vms_debug (4, "_bfd_vms_length_hash_symbol \"%s\"\n", in);
+#endif
+
+  if (maxlen > EOBJ__C_SYMSIZ)
+    maxlen = EOBJ__C_SYMSIZ;
+
+  /* Save this for later.  */
+  new_name = out;
+
+  /* We may need to truncate the symbol, save the hash for later.  */
+  in_len = strlen (in);
+
+  result = (in_len > maxlen) ? hash_string (in) : 0;
+
+  old_name = in;
+
+  /* Do the length checking.  */
+  if (in_len <= maxlen)
+    i = in_len;
+  else
+    {
+      if (PRIV (flag_hash_long_names))
+	i = maxlen - 9;
+      else
+	i = maxlen;
+    }
+
+  strncpy (out, in, (size_t) i);
+  in += i;
+  out += i;
+
+  if ((in_len > maxlen)
+      && PRIV (flag_hash_long_names))
+    sprintf (out, "_%08lx", result);
+  else
+    *out = 0;
+
+#if VMS_DEBUG
+  vms_debug (4, "--> [%d]\"%s\"\n", (int)strlen (outbuf), outbuf);
+#endif
+
+  if (in_len > maxlen
+	&& PRIV (flag_hash_long_names)
+	&& PRIV (flag_show_after_trunc))
+    printf (_("Symbol %s replaced by %s\n"), old_name, new_name);
+
+  return outbuf;
+}
+
+static void
+vector_grow1 (struct vector_type *vec, size_t elsz)
+{
+  if (vec->nbr_el + 1 < vec->max_el)
+    return;
+
+  if (vec->max_el == 0)
+    {
+      vec->max_el = 16;
+      vec->els = bfd_malloc2 (vec->max_el, elsz);
+    }
+  else
+    {
+      vec->max_el *= 2;
+      vec->els = bfd_realloc2 (vec->els, vec->max_el, elsz);
+    }
+}
+
+/* Bump ABFD file position to next block.  */
+
+static void
+alpha_vms_file_position_block (bfd *abfd)
+{
+  /* Next block.  */
+  PRIV (file_pos) += VMS_BLOCK_SIZE - 1;
+  PRIV (file_pos) -= (PRIV (file_pos) % VMS_BLOCK_SIZE);
+}
+
+/* Convert from internal structure SRC to external structure DST.  */
+
+static void
+alpha_vms_swap_eisd_out (struct vms_internal_eisd_map *src,
+                         struct vms_eisd *dst)
+{
+  bfd_putl32 (src->u.eisd.majorid, dst->majorid);
+  bfd_putl32 (src->u.eisd.minorid, dst->minorid);
+  bfd_putl32 (src->u.eisd.eisdsize, dst->eisdsize);
+  if (src->u.eisd.eisdsize <= EISD__K_LENEND)
+    return;
+  bfd_putl32 (src->u.eisd.secsize, dst->secsize);
+  bfd_putl64 (src->u.eisd.virt_addr, dst->virt_addr);
+  bfd_putl32 (src->u.eisd.flags, dst->flags);
+  bfd_putl32 (src->u.eisd.vbn, dst->vbn);
+  dst->pfc = src->u.eisd.pfc;
+  dst->matchctl = src->u.eisd.matchctl;
+  dst->type = src->u.eisd.type;
+  dst->fill_1 = 0;
+  if (src->u.eisd.flags & EISD__M_GBL)
+    {
+      bfd_putl32 (src->u.gbl_eisd.ident, dst->ident);
+      memcpy (dst->gblnam, src->u.gbl_eisd.gblnam,
+              src->u.gbl_eisd.gblnam[0] + 1);
+    }
+}
+
+/* Append EISD to the list of extra eisd for ABFD.  */
+
+static void
+alpha_vms_append_extra_eisd (bfd *abfd, struct vms_internal_eisd_map *eisd)
+{
+  eisd->next = NULL;
+  if (PRIV (gbl_eisd_head) == NULL)
+    PRIV (gbl_eisd_head) = eisd;
+  else
+    PRIV (gbl_eisd_tail)->next = eisd;
+  PRIV (gbl_eisd_tail) = eisd;
+}
+
+/* Create an EISD for shared image SHRIMG.
+   Return FALSE in case of error.  */
+
+static bfd_boolean
+alpha_vms_create_eisd_for_shared (bfd *abfd, bfd *shrimg)
+{
+  struct vms_internal_eisd_map *eisd;
+  int namlen;
+
+  namlen = strlen (PRIV2 (shrimg, hdr_data.hdr_t_name));
+  if (namlen + 5 > EISD__K_GBLNAMLEN)
+    {
+      /* Won't fit.  */
+      return FALSE;
+    }
+
+  eisd = bfd_alloc (abfd, sizeof (*eisd));
+  if (eisd == NULL)
+    return FALSE;
+
+  /* Fill the fields.  */
+  eisd->u.gbl_eisd.common.majorid = EISD__K_MAJORID;
+  eisd->u.gbl_eisd.common.minorid = EISD__K_MINORID;
+  eisd->u.gbl_eisd.common.eisdsize = (EISD__K_LEN + 4 + namlen + 5 + 3) & ~3;
+  eisd->u.gbl_eisd.common.secsize = VMS_BLOCK_SIZE;	/* Must not be 0.  */
+  eisd->u.gbl_eisd.common.virt_addr = 0;
+  eisd->u.gbl_eisd.common.flags = EISD__M_GBL;
+  eisd->u.gbl_eisd.common.vbn = 0;
+  eisd->u.gbl_eisd.common.pfc = 0;
+  eisd->u.gbl_eisd.common.matchctl = PRIV2 (shrimg, matchctl);
+  eisd->u.gbl_eisd.common.type = EISD__K_SHRPIC;
+
+  eisd->u.gbl_eisd.ident = PRIV2 (shrimg, ident);
+  eisd->u.gbl_eisd.gblnam[0] = namlen + 4;
+  memcpy (eisd->u.gbl_eisd.gblnam + 1, PRIV2 (shrimg, hdr_data.hdr_t_name),
+          namlen);
+  memcpy (eisd->u.gbl_eisd.gblnam + 1 + namlen, "_001", 4);
+
+  /* Append it to the list.  */
+  alpha_vms_append_extra_eisd (abfd, eisd);
+
+  return TRUE;
+}
+
+/* Create an EISD for section SEC.
+   Return FALSE in case of failure.  */
+
+static bfd_boolean
+alpha_vms_create_eisd_for_section (bfd *abfd, asection *sec)
+{
+  struct vms_internal_eisd_map *eisd;
+
+  /* Only for allocating section.  */
+  if (!(sec->flags & SEC_ALLOC))
+    return TRUE;
+
+  BFD_ASSERT (vms_section_data (sec)->eisd == NULL);
+  eisd = bfd_alloc (abfd, sizeof (*eisd));
+  if (eisd == NULL)
+    return FALSE;
+  vms_section_data (sec)->eisd = eisd;
+
+  /* Fill the fields.  */
+  eisd->u.eisd.majorid = EISD__K_MAJORID;
+  eisd->u.eisd.minorid = EISD__K_MINORID;
+  eisd->u.eisd.eisdsize = EISD__K_LEN;
+  eisd->u.eisd.secsize =
+    (sec->size + VMS_BLOCK_SIZE - 1) & ~(VMS_BLOCK_SIZE - 1);
+  eisd->u.eisd.virt_addr = sec->vma;
+  eisd->u.eisd.flags = 0;
+  eisd->u.eisd.vbn = 0; /* To be later defined.  */
+  eisd->u.eisd.pfc = 0; /* Default.  */
+  eisd->u.eisd.matchctl = EISD__K_MATALL;
+  eisd->u.eisd.type = EISD__K_NORMAL;
+
+  if (sec->flags & SEC_CODE)
+    eisd->u.eisd.flags |= EISD__M_EXE;
+  if (!(sec->flags & SEC_READONLY))
+    eisd->u.eisd.flags |= EISD__M_WRT | EISD__M_CRF;
+
+  /* If relocations or fixup will be applied, make this isect writeable.  */
+  if (sec->flags & SEC_RELOC)
+    eisd->u.eisd.flags |= EISD__M_WRT | EISD__M_CRF;
+
+  if (!(sec->flags & SEC_HAS_CONTENTS))
+    {
+      eisd->u.eisd.flags |= EISD__M_DZRO;
+      eisd->u.eisd.flags &= ~EISD__M_CRF;
+    }
+  if (sec->flags & SEC_LINKER_CREATED)
+    {
+      if (strcmp (sec->name, "$FIXUP$") == 0)
+        eisd->u.eisd.flags |= EISD__M_FIXUPVEC;
+    }
+
+  /* Append it to the list.  */
+  eisd->next = NULL;
+  if (PRIV (eisd_head) == NULL)
+    PRIV (eisd_head) = eisd;
+  else
+    PRIV (eisd_tail)->next = eisd;
+  PRIV (eisd_tail) = eisd;
+
+  return TRUE;
+}
+
+/* Layout executable ABFD and write it to the disk.
+   Return FALSE in case of failure.  */
+
+static bfd_boolean
+alpha_vms_write_exec (bfd *abfd)
+{
+  struct vms_eihd eihd;
+  struct vms_eiha *eiha;
+  struct vms_eihi *eihi;
+  struct vms_eihs *eihs = NULL;
+  asection *sec;
+  struct vms_internal_eisd_map *first_eisd;
+  struct vms_internal_eisd_map *eisd;
+  asection *dst;
+  asection *dmt;
+  file_ptr gst_filepos = 0;
+  unsigned int lnkflags = 0;
+
+  /* Build the EIHD.  */
+  PRIV (file_pos) = EIHD__C_LENGTH;
+
+  memset (&eihd, 0, sizeof (eihd));
+  memset (eihd.fill_2, 0xff, sizeof (eihd.fill_2));
+
+  bfd_putl32 (EIHD__K_MAJORID, eihd.majorid);
+  bfd_putl32 (EIHD__K_MINORID, eihd.minorid);
+
+  bfd_putl32 (sizeof (eihd), eihd.size);
+  bfd_putl32 (0, eihd.isdoff);
+  bfd_putl32 (0, eihd.activoff);
+  bfd_putl32 (0, eihd.symdbgoff);
+  bfd_putl32 (0, eihd.imgidoff);
+  bfd_putl32 (0, eihd.patchoff);
+  bfd_putl64 (0, eihd.iafva);
+  bfd_putl32 (0, eihd.version_array_off);
+
+  bfd_putl32 (EIHD__K_EXE, eihd.imgtype);
+  bfd_putl32 (0, eihd.subtype);
+
+  bfd_putl32 (0, eihd.imgiocnt);
+  bfd_putl32 (-1, eihd.privreqs);
+  bfd_putl32 (-1, eihd.privreqs + 4);
+
+  bfd_putl32 ((sizeof (eihd) + VMS_BLOCK_SIZE - 1) / VMS_BLOCK_SIZE,
+              eihd.hdrblkcnt);
+  bfd_putl32 (0, eihd.ident);
+  bfd_putl32 (0, eihd.sysver);
+
+  eihd.matchctl = 0;
+  bfd_putl32 (0, eihd.symvect_size);
+  bfd_putl32 (16, eihd.virt_mem_block_size);
+  bfd_putl32 (0, eihd.ext_fixup_off);
+  bfd_putl32 (0, eihd.noopt_psect_off);
+  bfd_putl32 (-1, eihd.alias);
+
+  /* Alloc EIHA.  */
+  eiha = (struct vms_eiha *)((char *) &eihd + PRIV (file_pos));
+  bfd_putl32 (PRIV (file_pos), eihd.activoff);
+  PRIV (file_pos) += sizeof (struct vms_eiha);
+
+  bfd_putl32 (sizeof (struct vms_eiha), eiha->size);
+  bfd_putl32 (0, eiha->spare);
+  bfd_putl64 (PRIV (transfer_address[0]), eiha->tfradr1);
+  bfd_putl64 (PRIV (transfer_address[1]), eiha->tfradr2);
+  bfd_putl64 (PRIV (transfer_address[2]), eiha->tfradr3);
+  bfd_putl64 (PRIV (transfer_address[3]), eiha->tfradr4);
+  bfd_putl64 (0, eiha->inishr);
+
+  /* Alloc EIHI.  */
+  eihi = (struct vms_eihi *)((char *) &eihd + PRIV (file_pos));
+  bfd_putl32 (PRIV (file_pos), eihd.imgidoff);
+  PRIV (file_pos) += sizeof (struct vms_eihi);
+
+  bfd_putl32 (EIHI__K_MAJORID, eihi->majorid);
+  bfd_putl32 (EIHI__K_MINORID, eihi->minorid);
+  {
+    char *module;
+    unsigned int len;
+
+    /* Set module name.  */
+    module = vms_get_module_name (bfd_get_filename (abfd), TRUE);
+    len = strlen (module);
+    if (len > sizeof (eihi->imgnam) - 1)
+      len = sizeof (eihi->imgnam) - 1;
+    eihi->imgnam[0] = len;
+    memcpy (eihi->imgnam + 1, module, len);
+    free (module);
+  }
+  {
+    unsigned int lo;
+    unsigned int hi;
+
+    /* Set time.  */
+    vms_get_time (&hi, &lo);
+    bfd_putl32 (lo, eihi->linktime + 0);
+    bfd_putl32 (hi, eihi->linktime + 4);
+  }
+  eihi->imgid[0] = 0;
+  eihi->linkid[0] = 0;
+  eihi->imgbid[0] = 0;
+
+  /* Alloc EIHS.  */
+  dst = PRIV (dst_section);
+  dmt = bfd_get_section_by_name (abfd, "$DMT$");
+  if (dst != NULL && dst->size != 0)
+    {
+      eihs = (struct vms_eihs *)((char *) &eihd + PRIV (file_pos));
+      bfd_putl32 (PRIV (file_pos), eihd.symdbgoff);
+      PRIV (file_pos) += sizeof (struct vms_eihs);
+
+      bfd_putl32 (EIHS__K_MAJORID, eihs->majorid);
+      bfd_putl32 (EIHS__K_MINORID, eihs->minorid);
+      bfd_putl32 (0, eihs->dstvbn);
+      bfd_putl32 (0, eihs->dstsize);
+      bfd_putl32 (0, eihs->gstvbn);
+      bfd_putl32 (0, eihs->gstsize);
+      bfd_putl32 (0, eihs->dmtvbn);
+      bfd_putl32 (0, eihs->dmtsize);
+    }
+
+  /* One EISD per section.  */
+  for (sec = abfd->sections; sec; sec = sec->next)
+    {
+      if (!alpha_vms_create_eisd_for_section (abfd, sec))
+        return FALSE;
+    }
+
+  /* Merge section EIDS which extra ones.  */
+  if (PRIV (eisd_tail))
+    PRIV (eisd_tail)->next = PRIV (gbl_eisd_head);
+  else
+    PRIV (eisd_head) = PRIV (gbl_eisd_head);
+  if (PRIV (gbl_eisd_tail))
+    PRIV (eisd_tail) = PRIV (gbl_eisd_tail);
+
+  first_eisd = PRIV (eisd_head);
+
+  /* Add end of eisd.  */
+  if (first_eisd)
+    {
+      eisd = bfd_zalloc (abfd, sizeof (*eisd));
+      if (eisd == NULL)
+        return FALSE;
+      eisd->u.eisd.majorid = 0;
+      eisd->u.eisd.minorid = 0;
+      eisd->u.eisd.eisdsize = 0;
+      alpha_vms_append_extra_eisd (abfd, eisd);
+    }
+
+  /* Place EISD in the file.  */
+  for (eisd = first_eisd; eisd; eisd = eisd->next)
+    {
+      file_ptr room = VMS_BLOCK_SIZE - (PRIV (file_pos) % VMS_BLOCK_SIZE);
+
+      /* First block is a little bit special: there is a word at the end.  */
+      if (PRIV (file_pos) < VMS_BLOCK_SIZE && room > 2)
+        room -= 2;
+      if (room < eisd->u.eisd.eisdsize + EISD__K_LENEND)
+        alpha_vms_file_position_block (abfd);
+
+      eisd->file_pos = PRIV (file_pos);
+      PRIV (file_pos) += eisd->u.eisd.eisdsize;
+
+      if (eisd->u.eisd.flags & EISD__M_FIXUPVEC)
+        bfd_putl64 (eisd->u.eisd.virt_addr, eihd.iafva);
+    }
+
+  if (first_eisd != NULL)
+    {
+      bfd_putl32 (first_eisd->file_pos, eihd.isdoff);
+      /* Real size of end of eisd marker.  */
+      PRIV (file_pos) += EISD__K_LENEND;
+    }
+
+  bfd_putl32 (PRIV (file_pos), eihd.size);
+  bfd_putl32 ((PRIV (file_pos) + VMS_BLOCK_SIZE - 1) / VMS_BLOCK_SIZE,
+              eihd.hdrblkcnt);
+
+  /* Place sections.  */
+  for (sec = abfd->sections; sec; sec = sec->next)
+    {
+      if (!(sec->flags & SEC_HAS_CONTENTS))
+        continue;
+
+      eisd = vms_section_data (sec)->eisd;
+
+      /* Align on a block.  */
+      alpha_vms_file_position_block (abfd);
+      sec->filepos = PRIV (file_pos);
+
+      if (eisd != NULL)
+        eisd->u.eisd.vbn = (sec->filepos / VMS_BLOCK_SIZE) + 1;
+
+      PRIV (file_pos) += sec->size;
+    }
+
+  /* Update EIHS.  */
+  if (eihs != NULL && dst != NULL)
+    {
+      bfd_putl32 ((dst->filepos / VMS_BLOCK_SIZE) + 1, eihs->dstvbn);
+      bfd_putl32 (dst->size, eihs->dstsize);
+
+      if (dmt != NULL)
+        {
+          lnkflags |= EIHD__M_DBGDMT;
+          bfd_putl32 ((dmt->filepos / VMS_BLOCK_SIZE) + 1, eihs->dmtvbn);
+          bfd_putl32 (dmt->size, eihs->dmtsize);
+        }
+      if (PRIV (gsd_sym_count) != 0)
+        {
+          alpha_vms_file_position_block (abfd);
+          gst_filepos = PRIV (file_pos);
+          bfd_putl32 ((gst_filepos / VMS_BLOCK_SIZE) + 1, eihs->gstvbn);
+          bfd_putl32 ((PRIV (gsd_sym_count) + 4) / 5 + 4, eihs->gstsize);
+        }
+    }
+
+  /* Write EISD in hdr.  */
+  for (eisd = first_eisd; eisd && eisd->file_pos < VMS_BLOCK_SIZE;
+       eisd = eisd->next)
+    alpha_vms_swap_eisd_out
+      (eisd, (struct vms_eisd *)((char *)&eihd + eisd->file_pos));
+
+  /* Write first block.  */
+  bfd_putl32 (lnkflags, eihd.lnkflags);
+  if (bfd_bwrite (&eihd, sizeof (eihd), abfd) != sizeof (eihd))
+    return FALSE;
+
+  /* Write remaining eisd.  */
+  if (eisd != NULL)
+    {
+      unsigned char blk[VMS_BLOCK_SIZE];
+      struct vms_internal_eisd_map *next_eisd;
+
+      memset (blk, 0xff, sizeof (blk));
+      while (eisd != NULL)
+        {
+          alpha_vms_swap_eisd_out
+            (eisd,
+             (struct vms_eisd *)(blk + (eisd->file_pos % VMS_BLOCK_SIZE)));
+
+          next_eisd = eisd->next;
+          if (next_eisd == NULL
+              || (next_eisd->file_pos / VMS_BLOCK_SIZE
+                  != eisd->file_pos / VMS_BLOCK_SIZE))
+            {
+              if (bfd_bwrite (blk, sizeof (blk), abfd) != sizeof (blk))
+                return FALSE;
+
+              memset (blk, 0xff, sizeof (blk));
+            }
+          eisd = next_eisd;
+        }
+    }
+
+  /* Write sections.  */
+  for (sec = abfd->sections; sec; sec = sec->next)
+    {
+      unsigned char blk[VMS_BLOCK_SIZE];
+      bfd_size_type len;
+
+      if (sec->size == 0 || !(sec->flags & SEC_HAS_CONTENTS))
+        continue;
+      if (bfd_bwrite (sec->contents, sec->size, abfd) != sec->size)
+        return FALSE;
+
+      /* Pad.  */
+      len = VMS_BLOCK_SIZE - sec->size % VMS_BLOCK_SIZE;
+      if (len != VMS_BLOCK_SIZE)
+        {
+          memset (blk, 0, len);
+          if (bfd_bwrite (blk, len, abfd) != len)
+            return FALSE;
+        }
+    }
+
+  /* Write GST.  */
+  if (gst_filepos != 0)
+    {
+      struct vms_rec_wr *recwr = &PRIV (recwr);
+      unsigned int i;
+
+      _bfd_vms_write_emh (abfd);
+      _bfd_vms_write_lmn (abfd, "GNU LD");
+
+      /* PSC for the absolute section.  */
+      _bfd_vms_output_begin (recwr, EOBJ__C_EGSD);
+      _bfd_vms_output_long (recwr, 0);
+      _bfd_vms_output_begin_subrec (recwr, EGSD__C_PSC);
+      _bfd_vms_output_short (recwr, 0);
+      _bfd_vms_output_short (recwr, EGPS__V_PIC | EGPS__V_LIB | EGPS__V_RD);
+      _bfd_vms_output_long (recwr, 0);
+      _bfd_vms_output_counted (recwr, ".$$ABS$$.");
+      _bfd_vms_output_end_subrec (recwr);
+      _bfd_vms_output_end (abfd, recwr);
+
+      for (i = 0; i < PRIV (gsd_sym_count); i++)
+        {
+          struct vms_symbol_entry *sym = PRIV (syms)[i];
+          char *hash;
+          bfd_vma val;
+          bfd_vma ep;
+
+          if ((i % 5) == 0)
+            {
+              _bfd_vms_output_alignment (recwr, 8);
+              _bfd_vms_output_begin (recwr, EOBJ__C_EGSD);
+              _bfd_vms_output_long (recwr, 0);
+            }
+          _bfd_vms_output_begin_subrec (recwr, EGSD__C_SYMG);
+          _bfd_vms_output_short (recwr, 0); /* Data type, alignment.  */
+          _bfd_vms_output_short (recwr, sym->flags);
+
+          if (sym->code_section)
+            ep = alpha_vms_get_sym_value (sym->code_section, sym->code_value);
+          else
+            {
+              BFD_ASSERT (sym->code_value == 0);
+              ep = 0;
+            }
+          val = alpha_vms_get_sym_value (sym->section, sym->value);
+          _bfd_vms_output_quad
+            (recwr, sym->typ == EGSD__C_SYMG ? sym->symbol_vector : val);
+	  _bfd_vms_output_quad (recwr, ep);
+	  _bfd_vms_output_quad (recwr, val);
+	  _bfd_vms_output_long (recwr, 0);
+          hash = _bfd_vms_length_hash_symbol (abfd, sym->name, EOBJ__C_SYMSIZ);
+          _bfd_vms_output_counted (recwr, hash);
+          _bfd_vms_output_end_subrec (recwr);
+          if ((i % 5) == 4)
+            _bfd_vms_output_end (abfd, recwr);
+        }
+      if ((i % 5) != 0)
+        _bfd_vms_output_end (abfd, recwr);
+
+      if (!_bfd_vms_write_eeom (abfd))
+        return FALSE;
+    }
+  return TRUE;
+}
+
+/* Object write.  */
+
+/* Write section and symbol directory of bfd abfd.  Return FALSE on error.  */
+
+static bfd_boolean
+_bfd_vms_write_egsd (bfd *abfd)
+{
+  asection *section;
+  asymbol *symbol;
+  unsigned int symnum;
+  const char *sname;
+  flagword new_flags, old_flags;
+  int abs_section_index = -1;
+  unsigned int target_index = 0;
+  struct vms_rec_wr *recwr = &PRIV (recwr);
+
+  vms_debug2 ((2, "vms_write_egsd\n"));
+
+  /* Egsd is quadword aligned.  */
+  _bfd_vms_output_alignment (recwr, 8);
+
+  _bfd_vms_output_begin (recwr, EOBJ__C_EGSD);
+  _bfd_vms_output_long (recwr, 0);
+
+  /* Number sections.  */
+  for (section = abfd->sections; section != NULL; section = section->next)
+    {
+      if (section->flags & SEC_DEBUGGING)
+        continue;
+      if (!strcmp (section->name, ".vmsdebug"))
+        {
+          section->flags |= SEC_DEBUGGING;
+          continue;
+        }
+      section->target_index = target_index++;
+    }
+
+  for (section = abfd->sections; section != NULL; section = section->next)
+    {
+      vms_debug2 ((3, "Section #%d %s, %d bytes\n",
+                   section->target_index, section->name, (int)section->size));
+
+      /* Don't write out the VMS debug info section since it is in the
+         ETBT and EDBG sections in etir. */
+      if (section->flags & SEC_DEBUGGING)
+        continue;
+
+      /* 13 bytes egsd, max 31 chars name -> should be 44 bytes.  */
+      if (_bfd_vms_output_check (recwr, 64) < 0)
+	{
+	  _bfd_vms_output_end (abfd, recwr);
+	  _bfd_vms_output_begin (recwr, EOBJ__C_EGSD);
+	  _bfd_vms_output_long (recwr, 0);
+	}
+
+      /* Don't know if this is necessary for the linker but for now it keeps
+	 vms_slurp_gsd happy.  */
+      sname = section->name;
+      if (*sname == '.')
+	{
+          /* Remove leading dot.  */
+	  sname++;
+	  if ((*sname == 't') && (strcmp (sname, "text") == 0))
+	    sname = EVAX_CODE_NAME;
+	  else if ((*sname == 'd') && (strcmp (sname, "data") == 0))
+	    sname = EVAX_DATA_NAME;
+	  else if ((*sname == 'b') && (strcmp (sname, "bss") == 0))
+	    sname = EVAX_BSS_NAME;
+	  else if ((*sname == 'l') && (strcmp (sname, "link") == 0))
+	    sname = EVAX_LINK_NAME;
+	  else if ((*sname == 'r') && (strcmp (sname, "rdata") == 0))
+	    sname = EVAX_READONLY_NAME;
+	  else if ((*sname == 'l') && (strcmp (sname, "literal") == 0))
+	    sname = EVAX_LITERAL_NAME;
+	  else if ((*sname == 'l') && (strcmp (sname, "literals") == 0))
+            sname = EVAX_LITERALS_NAME;
+	  else if ((*sname == 'c') && (strcmp (sname, "comm") == 0))
+	    sname = EVAX_COMMON_NAME;
+	  else if ((*sname == 'l') && (strcmp (sname, "lcomm") == 0))
+	    sname = EVAX_LOCAL_NAME;
+	}
+      else
+	sname = _bfd_vms_length_hash_symbol (abfd, sname, EOBJ__C_SECSIZ);
+
+      if (bfd_is_com_section (section))
+	new_flags = (EGPS__V_OVR | EGPS__V_REL | EGPS__V_GBL | EGPS__V_RD
+		     | EGPS__V_WRT | EGPS__V_NOMOD | EGPS__V_COM);
+      else
+	new_flags = vms_esecflag_by_name (evax_section_flags, sname,
+					  section->size > 0);
+
+      /* Modify them as directed.  */
+      if (section->flags & SEC_READONLY)
+	new_flags &= ~EGPS__V_WRT;
+
+      new_flags &= ~vms_section_data (section)->no_flags;
+      new_flags |= vms_section_data (section)->flags;
+
+      vms_debug2 ((3, "sec flags %x\n", section->flags));
+      vms_debug2 ((3, "new_flags %x, _raw_size %lu\n",
+                   new_flags, (unsigned long)section->size));
+
+      _bfd_vms_output_begin_subrec (recwr, EGSD__C_PSC);
+      _bfd_vms_output_short (recwr, section->alignment_power & 0xff);
+      _bfd_vms_output_short (recwr, new_flags);
+      _bfd_vms_output_long (recwr, (unsigned long) section->size);
+      _bfd_vms_output_counted (recwr, sname);
+      _bfd_vms_output_end_subrec (recwr);
+
+      /* If the section is an obsolute one, remind its index as it will be
+         used later for absolute symbols.  */
+      if ((new_flags & EGPS__V_REL) == 0 && abs_section_index < 0)
+        abs_section_index = section->target_index;
+    }
+
+  /* Output symbols.  */
+  vms_debug2 ((3, "%d symbols found\n", abfd->symcount));
+
+  bfd_set_start_address (abfd, (bfd_vma) -1);
+
+  for (symnum = 0; symnum < abfd->symcount; symnum++)
+    {
+      char *hash;
+
+      symbol = abfd->outsymbols[symnum];
+      old_flags = symbol->flags;
+
+      /* Work-around a missing feature:  consider __main as the main entry
+         point.  */
+      if (*(symbol->name) == '_')
+	{
+	  if (strcmp (symbol->name, "__main") == 0)
+	    bfd_set_start_address (abfd, (bfd_vma)symbol->value);
+	}
+
+      /* Only put in the GSD the global and the undefined symbols.  */
+      if (old_flags & BSF_FILE)
+	continue;
+
+      if ((old_flags & BSF_GLOBAL) == 0 && !bfd_is_und_section (symbol->section))
+        {
+          /* If the LIB$INITIIALIZE section is present, add a reference to
+             LIB$INITIALIZE symbol.  FIXME: this should be done explicitely
+             in the assembly file.  */
+          if (!((old_flags & BSF_SECTION_SYM) != 0
+                && strcmp (symbol->section->name, "LIB$INITIALIZE") == 0))
+            continue;
+        }
+
+      /* 13 bytes egsd, max 64 chars name -> should be 77 bytes.  Add 16 more
+         bytes for a possible ABS section.  */
+      if (_bfd_vms_output_check (recwr, 80 + 16) < 0)
+	{
+	  _bfd_vms_output_end (abfd, recwr);
+	  _bfd_vms_output_begin (recwr, EOBJ__C_EGSD);
+	  _bfd_vms_output_long (recwr, 0);
+	}
+
+      if ((old_flags & BSF_GLOBAL) != 0
+          && bfd_is_abs_section (symbol->section)
+          && abs_section_index <= 0)
+        {
+          /* Create an absolute section if none was defined.  It is highly
+             unlikely that the name $ABS$ clashes with a user defined
+             non-absolute section name.  */
+          _bfd_vms_output_begin_subrec (recwr, EGSD__C_PSC);
+          _bfd_vms_output_short (recwr, 4);
+          _bfd_vms_output_short (recwr, EGPS__V_SHR);
+          _bfd_vms_output_long (recwr, 0);
+          _bfd_vms_output_counted (recwr, "$ABS$");
+          _bfd_vms_output_end_subrec (recwr);
+
+          abs_section_index = target_index++;
+        }
+
+      _bfd_vms_output_begin_subrec (recwr, EGSD__C_SYM);
+
+      /* Data type, alignment.  */
+      _bfd_vms_output_short (recwr, 0);
+
+      new_flags = 0;
+
+      if (old_flags & BSF_WEAK)
+	new_flags |= EGSY__V_WEAK;
+      if (bfd_is_com_section (symbol->section))		/* .comm  */
+	new_flags |= (EGSY__V_WEAK | EGSY__V_COMM);
+
+      if (old_flags & BSF_FUNCTION)
+	{
+	  new_flags |= EGSY__V_NORM;
+	  new_flags |= EGSY__V_REL;
+	}
+      if (old_flags & BSF_GLOBAL)
+	{
+	  new_flags |= EGSY__V_DEF;
+	  if (!bfd_is_abs_section (symbol->section))
+	    new_flags |= EGSY__V_REL;
+	}
+      _bfd_vms_output_short (recwr, new_flags);
+
+      if (old_flags & BSF_GLOBAL)
+	{
+	  /* Symbol definition.  */
+	  bfd_vma code_address = 0;
+	  unsigned long ca_psindx = 0;
+	  unsigned long psindx;
+
+	  if ((old_flags & BSF_FUNCTION) && symbol->udata.p != NULL)
+	    {
+	      asymbol *sym;
+
+              sym =
+                ((struct evax_private_udata_struct *)symbol->udata.p)->enbsym;
+	      code_address = sym->value;
+	      ca_psindx = sym->section->target_index;
+	    }
+	  if (bfd_is_abs_section (symbol->section))
+	    psindx = abs_section_index;
+	  else
+	    psindx = symbol->section->target_index;
+
+	  _bfd_vms_output_quad (recwr, symbol->value);
+	  _bfd_vms_output_quad (recwr, code_address);
+	  _bfd_vms_output_long (recwr, ca_psindx);
+	  _bfd_vms_output_long (recwr, psindx);
+	}
+      hash = _bfd_vms_length_hash_symbol (abfd, symbol->name, EOBJ__C_SYMSIZ);
+      _bfd_vms_output_counted (recwr, hash);
+
+      _bfd_vms_output_end_subrec (recwr);
+    }
+
+  _bfd_vms_output_alignment (recwr, 8);
+  _bfd_vms_output_end (abfd, recwr);
+
+  return TRUE;
+}
+
+/* Write object header for bfd abfd.  Return FALSE on error.  */
+
+static bfd_boolean
+_bfd_vms_write_ehdr (bfd *abfd)
+{
+  asymbol *symbol;
+  unsigned int symnum;
+  int had_case = 0;
+  int had_file = 0;
+  struct vms_rec_wr *recwr = &PRIV (recwr);
+
+  vms_debug2 ((2, "vms_write_ehdr (%p)\n", abfd));
+
+  _bfd_vms_output_alignment (recwr, 2);
+
+  _bfd_vms_write_emh (abfd);
+  _bfd_vms_write_lmn (abfd, "GNU AS");
+
+  /* SRC.  */
+  _bfd_vms_output_begin (recwr, EOBJ__C_EMH);
+  _bfd_vms_output_short (recwr, EMH__C_SRC);
+
+  for (symnum = 0; symnum < abfd->symcount; symnum++)
+    {
+      symbol = abfd->outsymbols[symnum];
+
+      if (symbol->flags & BSF_FILE)
+	{
+	  if (CONST_STRNEQ ((char *)symbol->name, "<CASE:"))
+	    {
+	      PRIV (flag_hash_long_names) = symbol->name[6] - '0';
+	      PRIV (flag_show_after_trunc) = symbol->name[7] - '0';
+
+	      if (had_file)
+		break;
+	      had_case = 1;
+	      continue;
+	    }
+
+	  _bfd_vms_output_dump (recwr, (unsigned char *) symbol->name,
+				(int) strlen (symbol->name));
+	  if (had_case)
+	    break;
+	  had_file = 1;
+	}
+    }
+
+  if (symnum == abfd->symcount)
+    _bfd_vms_output_dump (recwr, (unsigned char *) STRING_COMMA_LEN ("noname"));
+
+  _bfd_vms_output_end (abfd, recwr);
+
+  /* TTL.  */
+  _bfd_vms_output_begin (recwr, EOBJ__C_EMH);
+  _bfd_vms_output_short (recwr, EMH__C_TTL);
+  _bfd_vms_output_dump (recwr, (unsigned char *) STRING_COMMA_LEN ("TTL"));
+  _bfd_vms_output_end (abfd, recwr);
+
+  /* CPR.  */
+  _bfd_vms_output_begin (recwr, EOBJ__C_EMH);
+  _bfd_vms_output_short (recwr, EMH__C_CPR);
+  _bfd_vms_output_dump (recwr,
+                        (unsigned char *)"GNU BFD ported by Klaus Kämpf 1994-1996",
+			 39);
+  _bfd_vms_output_end (abfd, recwr);
+
+  return TRUE;
+}
+
+/* Part 4.6, relocations.  */
+
+
+/* WRITE ETIR SECTION
+
+   This is still under construction and therefore not documented.  */
+
+/* Close the etir/etbt record.  */
+
+static void
+end_etir_record (bfd * abfd)
+{
+  struct vms_rec_wr *recwr = &PRIV (recwr);
+
+  _bfd_vms_output_end (abfd, recwr);
+}
+
+static void
+start_etir_or_etbt_record (bfd *abfd, asection *section, bfd_vma offset)
+{
+  struct vms_rec_wr *recwr = &PRIV (recwr);
+
+  if (section->flags & SEC_DEBUGGING)
+    {
+      _bfd_vms_output_begin (recwr, EOBJ__C_ETBT);
+
+      if (offset == 0)
+        {
+          /* Push start offset.  */
+          _bfd_vms_output_begin_subrec (recwr, ETIR__C_STA_LW);
+          _bfd_vms_output_long (recwr, (unsigned long) 0);
+          _bfd_vms_output_end_subrec (recwr);
+
+          /* Set location.  */
+          _bfd_vms_output_begin_subrec (recwr, ETIR__C_CTL_DFLOC);
+          _bfd_vms_output_end_subrec (recwr);
+        }
+    }
+  else
+    {
+      _bfd_vms_output_begin (recwr, EOBJ__C_ETIR);
+
+      if (offset == 0)
+        {
+          /* Push start offset.  */
+          _bfd_vms_output_begin_subrec (recwr, ETIR__C_STA_PQ);
+          _bfd_vms_output_long (recwr, (unsigned long) section->target_index);
+          _bfd_vms_output_quad (recwr, offset);
+          _bfd_vms_output_end_subrec (recwr);
+
+          /* Start = pop ().  */
+          _bfd_vms_output_begin_subrec (recwr, ETIR__C_CTL_SETRB);
+          _bfd_vms_output_end_subrec (recwr);
+        }
+    }
+}
+
+/* Output a STO_IMM command for SSIZE bytes of data from CPR at virtual
+   address VADDR in section specified by SEC_INDEX and NAME.  */
+
+static void
+sto_imm (bfd *abfd, asection *section,
+         bfd_size_type ssize, unsigned char *cptr, bfd_vma vaddr)
+{
+  bfd_size_type size;
+  struct vms_rec_wr *recwr = &PRIV (recwr);
+
+#if VMS_DEBUG
+  _bfd_vms_debug (8, "sto_imm %d bytes\n", (int) ssize);
+  _bfd_hexdump (9, cptr, (int) ssize, (int) vaddr);
+#endif
+
+  while (ssize > 0)
+    {
+      /* Try all the rest.  */
+      size = ssize;
+
+      if (_bfd_vms_output_check (recwr, size) < 0)
+	{
+	  /* Doesn't fit, split !  */
+	  end_etir_record (abfd);
+
+          start_etir_or_etbt_record (abfd, section, vaddr);
+
+	  size = _bfd_vms_output_check (recwr, 0);	/* get max size */
+	  if (size > ssize)			/* more than what's left ? */
+	    size = ssize;
+	}
+
+      _bfd_vms_output_begin_subrec (recwr, ETIR__C_STO_IMM);
+      _bfd_vms_output_long (recwr, (unsigned long) (size));
+      _bfd_vms_output_dump (recwr, cptr, size);
+      _bfd_vms_output_end_subrec (recwr);
+
+#if VMS_DEBUG
+      _bfd_vms_debug (10, "dumped %d bytes\n", (int) size);
+      _bfd_hexdump (10, cptr, (int) size, (int) vaddr);
+#endif
+
+      vaddr += size;
+      cptr += size;
+      ssize -= size;
+    }
+}
+
+static void
+etir_output_check (bfd *abfd, asection *section, bfd_vma vaddr, int checklen)
+{
+  if (_bfd_vms_output_check (&PRIV (recwr), checklen) < 0)
+    {
+      /* Not enough room in this record.  Close it and open a new one.  */
+      end_etir_record (abfd);
+      start_etir_or_etbt_record (abfd, section, vaddr);
+    }
+}
+
+/* Return whether RELOC must be deferred till the end.  */
+
+static bfd_boolean
+defer_reloc_p (arelent *reloc)
+{
+  switch (reloc->howto->type)
+    {
+    case ALPHA_R_NOP:
+    case ALPHA_R_LDA:
+    case ALPHA_R_BSR:
+    case ALPHA_R_BOH:
+      return TRUE;
+
+    default:
+      return FALSE;
+    }
+}
+
+/* Write section contents for bfd abfd.  Return FALSE on error.  */
+
+static bfd_boolean
+_bfd_vms_write_etir (bfd * abfd, int objtype ATTRIBUTE_UNUSED)
+{
+  asection *section;
+  struct vms_rec_wr *recwr = &PRIV (recwr);
+
+  vms_debug2 ((2, "vms_write_tir (%p, %d)\n", abfd, objtype));
+
+  _bfd_vms_output_alignment (recwr, 4);
+
+  PRIV (vms_linkage_index) = 0;
+
+  for (section = abfd->sections; section; section = section->next)
+    {
+      vms_debug2 ((4, "writing %d. section '%s' (%d bytes)\n",
+                   section->target_index, section->name, (int) (section->size)));
+
+      if (!(section->flags & SEC_HAS_CONTENTS)
+	  || bfd_is_com_section (section))
+	continue;
+
+      if (!section->contents)
+	{
+	  bfd_set_error (bfd_error_no_contents);
+	  return FALSE;
+	}
+
+      start_etir_or_etbt_record (abfd, section, 0);
+
+      if (section->flags & SEC_RELOC)
+	{
+	  bfd_vma curr_addr = 0;
+	  unsigned char *curr_data = section->contents;
+	  bfd_size_type size;
+	  int pass2_needed = 0;
+	  int pass2_in_progress = 0;
+	  unsigned int irel;
+
+	  if (section->reloc_count == 0)
+	    (*_bfd_error_handler)
+	      (_("SEC_RELOC with no relocs in section %s"), section->name);
+
+#if VMS_DEBUG
+	  else
+	    {
+	      int i = section->reloc_count;
+	      arelent **rptr = section->orelocation;
+	      _bfd_vms_debug (4, "%d relocations:\n", i);
+	      while (i-- > 0)
+		{
+		  _bfd_vms_debug (4, "sym %s in sec %s, value %08lx, "
+				     "addr %08lx, off %08lx, len %d: %s\n",
+				  (*(*rptr)->sym_ptr_ptr)->name,
+				  (*(*rptr)->sym_ptr_ptr)->section->name,
+				  (long) (*(*rptr)->sym_ptr_ptr)->value,
+				  (unsigned long)(*rptr)->address,
+                                  (unsigned long)(*rptr)->addend,
+				  bfd_get_reloc_size ((*rptr)->howto),
+                                  ( *rptr)->howto->name);
+		  rptr++;
+		}
+	    }
+#endif
+
+	new_pass:
+	  for (irel = 0; irel < section->reloc_count; irel++)
+	    {
+	      struct evax_private_udata_struct *udata;
+	      arelent *rptr = section->orelocation [irel];
+	      bfd_vma addr = rptr->address;
+	      asymbol *sym = *rptr->sym_ptr_ptr;
+	      asection *sec = sym->section;
+	      bfd_boolean defer = defer_reloc_p (rptr);
+	      unsigned int slen;
+	      char *hash;
+
+	      if (pass2_in_progress)
+		{
+		  /* Non-deferred relocs have already been output.  */
+		  if (!defer)
+		    continue;
+		}
+	      else
+		{
+		  /* Deferred relocs must be output at the very end.  */
+		  if (defer)
+		    {
+		      pass2_needed = 1;
+		      continue;
+		    }
+
+		  /* Regular relocs are intertwined with binary data.  */
+	          if (curr_addr > addr)
+		    (*_bfd_error_handler) (_("Size error in section %s"),
+					   section->name);
+		  size = addr - curr_addr;
+		  sto_imm (abfd, section, size, curr_data, curr_addr);
+		  curr_data += size;
+		  curr_addr += size;
+		}
+
+	      size = bfd_get_reloc_size (rptr->howto);
+
+	      switch (rptr->howto->type)
+	        {
+		case ALPHA_R_IGNORE:
+		  break;
+
+		case ALPHA_R_REFLONG:
+		  if (bfd_is_und_section (sym->section))
+		    {
+		      bfd_vma addend = rptr->addend;
+		      slen = strlen ((char *) sym->name);
+		      hash = _bfd_vms_length_hash_symbol
+                        (abfd, sym->name, EOBJ__C_SYMSIZ);
+		      etir_output_check (abfd, section, curr_addr, slen);
+		      if (addend)
+			{
+			  _bfd_vms_output_begin_subrec (recwr, ETIR__C_STA_GBL);
+			  _bfd_vms_output_counted (recwr, hash);
+			  _bfd_vms_output_end_subrec (recwr);
+			  _bfd_vms_output_begin_subrec (recwr, ETIR__C_STA_LW);
+			  _bfd_vms_output_long (recwr, (unsigned long) addend);
+			  _bfd_vms_output_end_subrec (recwr);
+			  _bfd_vms_output_begin_subrec (recwr, ETIR__C_OPR_ADD);
+			  _bfd_vms_output_end_subrec (recwr);
+			  _bfd_vms_output_begin_subrec (recwr, ETIR__C_STO_LW);
+			  _bfd_vms_output_end_subrec (recwr);
+			}
+		      else
+			{
+			  _bfd_vms_output_begin_subrec
+                            (recwr, ETIR__C_STO_GBL_LW);
+			  _bfd_vms_output_counted (recwr, hash);
+			  _bfd_vms_output_end_subrec (recwr);
+			}
+		    }
+		  else if (bfd_is_abs_section (sym->section))
+		    {
+		      etir_output_check (abfd, section, curr_addr, 16);
+		      _bfd_vms_output_begin_subrec (recwr, ETIR__C_STA_LW);
+		      _bfd_vms_output_long (recwr, (unsigned long) sym->value);
+		      _bfd_vms_output_end_subrec (recwr);
+		      _bfd_vms_output_begin_subrec (recwr, ETIR__C_STO_LW);
+		      _bfd_vms_output_end_subrec (recwr);
+		    }
+		  else
+		    {
+		      etir_output_check (abfd, section, curr_addr, 32);
+		      _bfd_vms_output_begin_subrec (recwr, ETIR__C_STA_PQ);
+		      _bfd_vms_output_long (recwr,
+                                            (unsigned long) sec->target_index);
+		      _bfd_vms_output_quad (recwr, rptr->addend + sym->value);
+		      _bfd_vms_output_end_subrec (recwr);
+		      /* ??? Table B-8 of the OpenVMS Linker Utilily Manual
+			 says that we should have a ETIR__C_STO_OFF here.
+			 But the relocation would not be BFD_RELOC_32 then.
+			 This case is very likely unreachable.  */
+		      _bfd_vms_output_begin_subrec (recwr, ETIR__C_STO_LW);
+		      _bfd_vms_output_end_subrec (recwr);
+		    }
+		  break;
+
+		case ALPHA_R_REFQUAD:
+		  if (bfd_is_und_section (sym->section))
+		    {
+		      bfd_vma addend = rptr->addend;
+		      slen = strlen ((char *) sym->name);
+		      hash = _bfd_vms_length_hash_symbol
+                        (abfd, sym->name, EOBJ__C_SYMSIZ);
+		      etir_output_check (abfd, section, curr_addr, slen);
+		      if (addend)
+			{
+			  _bfd_vms_output_begin_subrec (recwr, ETIR__C_STA_GBL);
+			  _bfd_vms_output_counted (recwr, hash);
+			  _bfd_vms_output_end_subrec (recwr);
+			  _bfd_vms_output_begin_subrec (recwr, ETIR__C_STA_QW);
+			  _bfd_vms_output_quad (recwr, addend);
+			  _bfd_vms_output_end_subrec (recwr);
+			  _bfd_vms_output_begin_subrec (recwr, ETIR__C_OPR_ADD);
+			  _bfd_vms_output_end_subrec (recwr);
+			  _bfd_vms_output_begin_subrec (recwr, ETIR__C_STO_QW);
+			  _bfd_vms_output_end_subrec (recwr);
+			}
+		      else
+			{
+			  _bfd_vms_output_begin_subrec (recwr, ETIR__C_STO_GBL);
+			  _bfd_vms_output_counted (recwr, hash);
+			  _bfd_vms_output_end_subrec (recwr);
+			}
+		    }
+		  else if (bfd_is_abs_section (sym->section))
+		    {
+		      etir_output_check (abfd, section, curr_addr, 16);
+		      _bfd_vms_output_begin_subrec (recwr, ETIR__C_STA_QW);
+		      _bfd_vms_output_quad (recwr, sym->value);
+		      _bfd_vms_output_end_subrec (recwr);
+		      _bfd_vms_output_begin_subrec (recwr, ETIR__C_STO_QW);
+		      _bfd_vms_output_end_subrec (recwr);
+		    }
+		  else
+		    {
+		      etir_output_check (abfd, section, curr_addr, 32);
+		      _bfd_vms_output_begin_subrec (recwr, ETIR__C_STA_PQ);
+		      _bfd_vms_output_long (recwr,
+                                            (unsigned long) sec->target_index);
+		      _bfd_vms_output_quad (recwr, rptr->addend + sym->value);
+		      _bfd_vms_output_end_subrec (recwr);
+		      _bfd_vms_output_begin_subrec (recwr, ETIR__C_STO_OFF);
+		      _bfd_vms_output_end_subrec (recwr);
+		    }
+		  break;
+
+		case ALPHA_R_HINT:
+		  sto_imm (abfd, section, size, curr_data, curr_addr);
+		  break;
+
+		case ALPHA_R_LINKAGE:
+		  etir_output_check (abfd, section, curr_addr, 64);
+		  _bfd_vms_output_begin_subrec (recwr, ETIR__C_STC_LP_PSB);
+		  _bfd_vms_output_long
+		    (recwr, (unsigned long) rptr->addend);
+                  if (rptr->addend > PRIV (vms_linkage_index))
+                    PRIV (vms_linkage_index) = rptr->addend;
+		  hash = _bfd_vms_length_hash_symbol
+                    (abfd, sym->name, EOBJ__C_SYMSIZ);
+		  _bfd_vms_output_counted (recwr, hash);
+		  _bfd_vms_output_byte (recwr, 0);
+		  _bfd_vms_output_end_subrec (recwr);
+		  break;
+
+		case ALPHA_R_CODEADDR:
+		  slen = strlen ((char *) sym->name);
+		  hash = _bfd_vms_length_hash_symbol
+                    (abfd, sym->name, EOBJ__C_SYMSIZ);
+		  etir_output_check (abfd, section, curr_addr, slen);
+		  _bfd_vms_output_begin_subrec (recwr, ETIR__C_STO_CA);
+		  _bfd_vms_output_counted (recwr, hash);
+		  _bfd_vms_output_end_subrec (recwr);
+		  break;
+
+		case ALPHA_R_NOP:
+		  udata
+		    = (struct evax_private_udata_struct *) rptr->sym_ptr_ptr;
+		  etir_output_check (abfd, section, curr_addr,
+				     32 + 1 + strlen (udata->origname));
+		  _bfd_vms_output_begin_subrec (recwr, ETIR__C_STC_NOP_GBL);
+		  _bfd_vms_output_long (recwr, (unsigned long) udata->lkindex);
+		  _bfd_vms_output_long
+		    (recwr, (unsigned long) section->target_index);
+		  _bfd_vms_output_quad (recwr, rptr->address);
+		  _bfd_vms_output_long (recwr, (unsigned long) 0x47ff041f);
+		  _bfd_vms_output_long
+		    (recwr, (unsigned long) section->target_index);
+		  _bfd_vms_output_quad (recwr, rptr->addend);
+		  _bfd_vms_output_counted
+		    (recwr, _bfd_vms_length_hash_symbol
+                     (abfd, udata->origname, EOBJ__C_SYMSIZ));
+		  _bfd_vms_output_end_subrec (recwr);
+		  break;
+
+		case ALPHA_R_BSR:
+		  (*_bfd_error_handler) (_("Spurious ALPHA_R_BSR reloc"));
+		  break;
+
+		case ALPHA_R_LDA:
+		  udata
+		    = (struct evax_private_udata_struct *) rptr->sym_ptr_ptr;
+		  etir_output_check (abfd, section, curr_addr,
+				     32 + 1 + strlen (udata->origname));
+		  _bfd_vms_output_begin_subrec (recwr, ETIR__C_STC_LDA_GBL);
+		  _bfd_vms_output_long
+		    (recwr, (unsigned long) udata->lkindex + 1);
+		  _bfd_vms_output_long
+		    (recwr, (unsigned long) section->target_index);
+		  _bfd_vms_output_quad (recwr, rptr->address);
+		  _bfd_vms_output_long (recwr, (unsigned long) 0x237B0000);
+		  _bfd_vms_output_long
+		    (recwr, (unsigned long) udata->bsym->section->target_index);
+		  _bfd_vms_output_quad (recwr, rptr->addend);
+		  _bfd_vms_output_counted
+		    (recwr, _bfd_vms_length_hash_symbol
+                     (abfd, udata->origname, EOBJ__C_SYMSIZ));
+		  _bfd_vms_output_end_subrec (recwr);
+		  break;
+
+		case ALPHA_R_BOH:
+		  udata
+		    = (struct evax_private_udata_struct *) rptr->sym_ptr_ptr;
+		  etir_output_check (abfd, section, curr_addr,
+				       32 + 1 + strlen (udata->origname));
+		  _bfd_vms_output_begin_subrec (recwr, ETIR__C_STC_BOH_GBL);
+		  _bfd_vms_output_long (recwr, (unsigned long) udata->lkindex);
+		  _bfd_vms_output_long
+		    (recwr, (unsigned long) section->target_index);
+		  _bfd_vms_output_quad (recwr, rptr->address);
+		  _bfd_vms_output_long (recwr, (unsigned long) 0xD3400000);
+		  _bfd_vms_output_long
+		    (recwr, (unsigned long) section->target_index);
+		  _bfd_vms_output_quad (recwr, rptr->addend);
+		  _bfd_vms_output_counted
+		    (recwr, _bfd_vms_length_hash_symbol
+                     (abfd, udata->origname, EOBJ__C_SYMSIZ));
+		  _bfd_vms_output_end_subrec (recwr);
+		  break;
+
+		default:
+		  (*_bfd_error_handler) (_("Unhandled relocation %s"),
+		  			 rptr->howto->name);
+		  break;
+		}
+
+	      curr_data += size;
+	      curr_addr += size;
+	    } /* End of relocs loop.  */
+
+	  if (!pass2_in_progress)
+	    {
+	      /* Output rest of section.  */
+	      if (curr_addr > section->size)
+		(*_bfd_error_handler) (_("Size error in section %s"),
+				       section->name);
+	      size = section->size - curr_addr;
+	      sto_imm (abfd, section, size, curr_data, curr_addr);
+	      curr_data += size;
+	      curr_addr += size;
+
+	      if (pass2_needed)
+		{
+		  pass2_in_progress = 1;
+		  goto new_pass;
+		}
+	    }
+	}
+
+      else /* (section->flags & SEC_RELOC) */
+	sto_imm (abfd, section, section->size, section->contents, 0);
+
+      end_etir_record (abfd);
+    }
+
+  _bfd_vms_output_alignment (recwr, 2);
+  return TRUE;
+}
+
+/* Write cached information into a file being written, at bfd_close.  */
+
+static bfd_boolean
+alpha_vms_write_object_contents (bfd *abfd)
+{
+  vms_debug2 ((1, "vms_write_object_contents (%p)\n", abfd));
+
+  if (abfd->flags & (EXEC_P | DYNAMIC))
+    {
+      return alpha_vms_write_exec (abfd);
+    }
+  else
+    {
+      if (abfd->section_count > 0)			/* we have sections */
+        {
+          if (_bfd_vms_write_ehdr (abfd) != TRUE)
+            return FALSE;
+          if (_bfd_vms_write_egsd (abfd) != TRUE)
+            return FALSE;
+          if (_bfd_vms_write_etir (abfd, EOBJ__C_ETIR) != TRUE)
+            return FALSE;
+          if (_bfd_vms_write_eeom (abfd) != TRUE)
+            return FALSE;
+        }
+    }
+  return TRUE;
+}
+
+/* Debug stuff: nearest line.  */
+
+#define SET_MODULE_PARSED(m) \
+  do { if ((m)->name == NULL) (m)->name = ""; } while (0)
+#define IS_MODULE_PARSED(m) ((m)->name != NULL)
+
+/* Build a new module for the specified BFD.  */
+
+static struct module *
+new_module (bfd *abfd)
+{
+  struct module *module
+    = (struct module *) bfd_zalloc (abfd, sizeof (struct module));
+  module->file_table_count = 16; /* Arbitrary.  */
+  module->file_table
+    = bfd_malloc (module->file_table_count * sizeof (struct fileinfo));
+  return module;
+}
+
+/* Parse debug info for a module and internalize it.  */
+
+static void
+parse_module (bfd *abfd, struct module *module, unsigned char *ptr,
+	      int length)
+{
+  unsigned char *maxptr = ptr + length;
+  unsigned char *src_ptr, *pcl_ptr;
+  unsigned int prev_linum = 0, curr_linenum = 0;
+  bfd_vma prev_pc = 0, curr_pc = 0;
+  struct srecinfo *curr_srec, *srec;
+  struct lineinfo *curr_line, *line;
+  struct funcinfo *funcinfo;
+
+  /* Initialize tables with zero element.  */
+  curr_srec = (struct srecinfo *) bfd_zalloc (abfd, sizeof (struct srecinfo));
+  module->srec_table = curr_srec;
+
+  curr_line = (struct lineinfo *) bfd_zalloc (abfd, sizeof (struct lineinfo));
+  module->line_table = curr_line;
+
+  while (length == -1 || ptr < maxptr)
+    {
+      /* The first byte is not counted in the recorded length.  */
+      int rec_length = bfd_getl16 (ptr) + 1;
+      int rec_type = bfd_getl16 (ptr + 2);
+
+      vms_debug2 ((2, "DST record: leng %d, type %d\n", rec_length, rec_type));
+
+      if (length == -1 && rec_type == DST__K_MODEND)
+        break;
+
+      switch (rec_type)
+	{
+	case DST__K_MODBEG:
+	  module->name
+	    = _bfd_vms_save_counted_string (ptr + DST_S_B_MODBEG_NAME);
+
+	  curr_pc = 0;
+	  prev_pc = 0;
+	  curr_linenum = 0;
+	  prev_linum = 0;
+
+          vms_debug2 ((3, "module: %s\n", module->name));
+	  break;
+
+	case DST__K_MODEND:
+	  break;
+
+	case DST__K_RTNBEG:
+	  funcinfo = (struct funcinfo *)
+	    bfd_zalloc (abfd, sizeof (struct funcinfo));
+          funcinfo->name
+	    = _bfd_vms_save_counted_string (ptr + DST_S_B_RTNBEG_NAME);
+	  funcinfo->low = bfd_getl32 (ptr + DST_S_L_RTNBEG_ADDRESS);
+	  funcinfo->next = module->func_table;
+	  module->func_table = funcinfo;
+
+          vms_debug2 ((3, "routine: %s at 0x%lx\n",
+                       funcinfo->name, (unsigned long) funcinfo->low));
+	  break;
+
+	case DST__K_RTNEND:
+	  module->func_table->high = module->func_table->low
+	    + bfd_getl32 (ptr + DST_S_L_RTNEND_SIZE) - 1;
+
+	  if (module->func_table->high > module->high)
+	    module->high = module->func_table->high;
+
+          vms_debug2 ((3, "end routine\n"));
+	  break;
+
+	case DST__K_PROLOG:
+          vms_debug2 ((3, "prologue\n"));
+	  break;
+
+	case DST__K_EPILOG:
+          vms_debug2 ((3, "epilog\n"));
+	  break;
+
+	case DST__K_BLKBEG:
+          vms_debug2 ((3, "block\n"));
+	  break;
+
+	case DST__K_BLKEND:
+          vms_debug2 ((3, "end block\n"));
+	  break;
+
+	case DST__K_SOURCE:
+	  src_ptr = ptr + DST_S_C_SOURCE_HEADER_SIZE;
+
+	  vms_debug2 ((3, "source info\n"));
+
+	  while (src_ptr < ptr + rec_length)
+	    {
+	      int cmd = src_ptr[0], cmd_length, data;
+
+	      switch (cmd)
+		{
+		case DST__K_SRC_DECLFILE:
+		  {
+		    unsigned int fileid
+		      = bfd_getl16 (src_ptr + DST_S_W_SRC_DF_FILEID);
+		    char *filename
+		      = _bfd_vms_save_counted_string (src_ptr
+			  + DST_S_B_SRC_DF_FILENAME);
+
+		    while (fileid >= module->file_table_count)
+		      {
+			module->file_table_count *= 2;
+			module->file_table
+			  = bfd_realloc (module->file_table,
+					 module->file_table_count
+					   * sizeof (struct fileinfo));
+		      }
+
+		    module->file_table [fileid].name = filename;
+		    module->file_table [fileid].srec = 1;
+		    cmd_length = src_ptr[DST_S_B_SRC_DF_LENGTH] + 2;
+		    vms_debug2 ((4, "DST_S_C_SRC_DECLFILE: %d, %s\n",
+                                 fileid, module->file_table [fileid].name));
+		  }
+		  break;
+
+		case DST__K_SRC_DEFLINES_B:
+		  /* Perform the association and set the next higher index
+		     to the limit.  */
+		  data = src_ptr[DST_S_B_SRC_UNSBYTE];
+		  srec = (struct srecinfo *)
+		    bfd_zalloc (abfd, sizeof (struct srecinfo));
+		  srec->line = curr_srec->line + data;
+		  srec->srec = curr_srec->srec + data;
+		  srec->sfile = curr_srec->sfile;
+		  curr_srec->next = srec;
+		  curr_srec = srec;
+		  cmd_length = 2;
+		  vms_debug2 ((4, "DST_S_C_SRC_DEFLINES_B: %d\n", data));
+		  break;
+
+		case DST__K_SRC_DEFLINES_W:
+		  /* Perform the association and set the next higher index
+		     to the limit.  */
+		  data = bfd_getl16 (src_ptr + DST_S_W_SRC_UNSWORD);
+		  srec = (struct srecinfo *)
+		    bfd_zalloc (abfd, sizeof (struct srecinfo));
+		  srec->line = curr_srec->line + data;
+		  srec->srec = curr_srec->srec + data,
+		  srec->sfile = curr_srec->sfile;
+		  curr_srec->next = srec;
+		  curr_srec = srec;
+		  cmd_length = 3;
+		  vms_debug2 ((4, "DST_S_C_SRC_DEFLINES_W: %d\n", data));
+		  break;
+
+		case DST__K_SRC_INCRLNUM_B:
+		  data = src_ptr[DST_S_B_SRC_UNSBYTE];
+		  curr_srec->line += data;
+		  cmd_length = 2;
+		  vms_debug2 ((4, "DST_S_C_SRC_INCRLNUM_B: %d\n", data));
+		  break;
+
+		case DST__K_SRC_SETFILE:
+		  data = bfd_getl16 (src_ptr + DST_S_W_SRC_UNSWORD);
+		  curr_srec->sfile = data;
+		  curr_srec->srec = module->file_table[data].srec;
+		  cmd_length = 3;
+		  vms_debug2 ((4, "DST_S_C_SRC_SETFILE: %d\n", data));
+		  break;
+
+		case DST__K_SRC_SETLNUM_L:
+		  data = bfd_getl32 (src_ptr + DST_S_L_SRC_UNSLONG);
+		  curr_srec->line = data;
+		  cmd_length = 5;
+		  vms_debug2 ((4, "DST_S_C_SRC_SETLNUM_L: %d\n", data));
+		  break;
+
+		case DST__K_SRC_SETLNUM_W:
+		  data = bfd_getl16 (src_ptr + DST_S_W_SRC_UNSWORD);
+		  curr_srec->line = data;
+		  cmd_length = 3;
+		  vms_debug2 ((4, "DST_S_C_SRC_SETLNUM_W: %d\n", data));
+		  break;
+
+		case DST__K_SRC_SETREC_L:
+		  data = bfd_getl32 (src_ptr + DST_S_L_SRC_UNSLONG);
+		  curr_srec->srec = data;
+		  module->file_table[curr_srec->sfile].srec = data;
+		  cmd_length = 5;
+		  vms_debug2 ((4, "DST_S_C_SRC_SETREC_L: %d\n", data));
+		  break;
+
+		case DST__K_SRC_SETREC_W:
+		  data = bfd_getl16 (src_ptr + DST_S_W_SRC_UNSWORD);
+		  curr_srec->srec = data;
+		  module->file_table[curr_srec->sfile].srec = data;
+		  cmd_length = 3;
+		  vms_debug2 ((4, "DST_S_C_SRC_SETREC_W: %d\n", data));
+		  break;
+
+		case DST__K_SRC_FORMFEED:
+		  cmd_length = 1;
+		  vms_debug2 ((4, "DST_S_C_SRC_FORMFEED\n"));
+		  break;
+
+		default:
+		  (*_bfd_error_handler) (_("unknown source command %d"),
+					 cmd);
+		  cmd_length = 2;
+		  break;
+		}
+
+	      src_ptr += cmd_length;
+	    }
+	  break;
+
+	case DST__K_LINE_NUM:
+	  pcl_ptr = ptr + DST_S_C_LINE_NUM_HEADER_SIZE;
+
+	  vms_debug2 ((3, "line info\n"));
+
+	  while (pcl_ptr < ptr + rec_length)
+	    {
+	      /* The command byte is signed so we must sign-extend it.  */
+	      int cmd = ((signed char *)pcl_ptr)[0], cmd_length, data;
+
+	      switch (cmd)
+		{
+		case DST__K_DELTA_PC_W:
+		  data = bfd_getl16 (pcl_ptr + DST_S_W_PCLINE_UNSWORD);
+		  curr_pc += data;
+		  curr_linenum += 1;
+		  cmd_length = 3;
+		  vms_debug2 ((4, "DST__K_DELTA_PC_W: %d\n", data));
+		  break;
+
+		case DST__K_DELTA_PC_L:
+		  data = bfd_getl32 (pcl_ptr + DST_S_L_PCLINE_UNSLONG);
+		  curr_pc += data;
+		  curr_linenum += 1;
+		  cmd_length = 5;
+		  vms_debug2 ((4, "DST__K_DELTA_PC_L: %d\n", data));
+		  break;
+
+		case DST__K_INCR_LINUM:
+		  data = pcl_ptr[DST_S_B_PCLINE_UNSBYTE];
+		  curr_linenum += data;
+		  cmd_length = 2;
+		  vms_debug2 ((4, "DST__K_INCR_LINUM: %d\n", data));
+		  break;
+
+		case DST__K_INCR_LINUM_W:
+		  data = bfd_getl16 (pcl_ptr + DST_S_W_PCLINE_UNSWORD);
+		  curr_linenum += data;
+		  cmd_length = 3;
+		  vms_debug2 ((4, "DST__K_INCR_LINUM_W: %d\n", data));
+		  break;
+
+		case DST__K_INCR_LINUM_L:
+		  data = bfd_getl32 (pcl_ptr + DST_S_L_PCLINE_UNSLONG);
+		  curr_linenum += data;
+		  cmd_length = 5;
+		  vms_debug2 ((4, "DST__K_INCR_LINUM_L: %d\n", data));
+		  break;
+
+		case DST__K_SET_LINUM_INCR:
+		  (*_bfd_error_handler)
+		    (_("DST__K_SET_LINUM_INCR not implemented"));
+		  cmd_length = 2;
+		  break;
+
+		case DST__K_SET_LINUM_INCR_W:
+		  (*_bfd_error_handler)
+		    (_("DST__K_SET_LINUM_INCR_W not implemented"));
+		  cmd_length = 3;
+		  break;
+
+		case DST__K_RESET_LINUM_INCR:
+		  (*_bfd_error_handler)
+		    (_("DST__K_RESET_LINUM_INCR not implemented"));
+		  cmd_length = 1;
+		  break;
+
+		case DST__K_BEG_STMT_MODE:
+		  (*_bfd_error_handler)
+		    (_("DST__K_BEG_STMT_MODE not implemented"));
+		  cmd_length = 1;
+		  break;
+
+		case DST__K_END_STMT_MODE:
+		  (*_bfd_error_handler)
+		    (_("DST__K_END_STMT_MODE not implemented"));
+		  cmd_length = 1;
+		  break;
+
+		case DST__K_SET_LINUM_B:
+		  data = pcl_ptr[DST_S_B_PCLINE_UNSBYTE];
+		  curr_linenum = data;
+		  cmd_length = 2;
+		  vms_debug2 ((4, "DST__K_SET_LINUM_B: %d\n", data));
+		  break;
+
+		case DST__K_SET_LINUM:
+		  data = bfd_getl16 (pcl_ptr + DST_S_W_PCLINE_UNSWORD);
+		  curr_linenum = data;
+		  cmd_length = 3;
+		  vms_debug2 ((4, "DST__K_SET_LINE_NUM: %d\n", data));
+		  break;
+
+		case DST__K_SET_LINUM_L:
+		  data = bfd_getl32 (pcl_ptr + DST_S_L_PCLINE_UNSLONG);
+		  curr_linenum = data;
+		  cmd_length = 5;
+		  vms_debug2 ((4, "DST__K_SET_LINUM_L: %d\n", data));
+		  break;
+
+		case DST__K_SET_PC:
+		  (*_bfd_error_handler)
+		    (_("DST__K_SET_PC not implemented"));
+		  cmd_length = 2;
+		  break;
+
+		case DST__K_SET_PC_W:
+		  (*_bfd_error_handler)
+		    (_("DST__K_SET_PC_W not implemented"));
+		  cmd_length = 3;
+		  break;
+
+		case DST__K_SET_PC_L:
+		  (*_bfd_error_handler)
+		    (_("DST__K_SET_PC_L not implemented"));
+		  cmd_length = 5;
+		  break;
+
+		case DST__K_SET_STMTNUM:
+		  (*_bfd_error_handler)
+		    (_("DST__K_SET_STMTNUM not implemented"));
+		  cmd_length = 2;
+		  break;
+
+		case DST__K_TERM:
+		  data = pcl_ptr[DST_S_B_PCLINE_UNSBYTE];
+		  curr_pc += data;
+		  cmd_length = 2;
+		  vms_debug2 ((4, "DST__K_TERM: %d\n", data));
+		  break;
+
+		case DST__K_TERM_W:
+		  data = bfd_getl16 (pcl_ptr + DST_S_W_PCLINE_UNSWORD);
+		  curr_pc += data;
+		  cmd_length = 3;
+		  vms_debug2 ((4, "DST__K_TERM_W: %d\n", data));
+		  break;
+
+		case DST__K_TERM_L:
+		  data = bfd_getl32 (pcl_ptr + DST_S_L_PCLINE_UNSLONG);
+		  curr_pc += data;
+		  cmd_length = 5;
+		  vms_debug2 ((4, "DST__K_TERM_L: %d\n", data));
+		  break;
+
+		case DST__K_SET_ABS_PC:
+		  data = bfd_getl32 (pcl_ptr + DST_S_L_PCLINE_UNSLONG);
+		  curr_pc = data;
+		  cmd_length = 5;
+		  vms_debug2 ((4, "DST__K_SET_ABS_PC: 0x%x\n", data));
+		  break;
+
+		default:
+		  if (cmd <= 0)
+		    {
+		      curr_pc -= cmd;
+		      curr_linenum += 1;
+		      cmd_length = 1;
+		      vms_debug2 ((4, "bump pc to 0x%lx and line to %d\n",
+                                   (unsigned long)curr_pc, curr_linenum));
+		    }
+		  else
+		    {
+		      (*_bfd_error_handler) (_("unknown line command %d"),
+					     cmd);
+		      cmd_length = 2;
+		    }
+		  break;
+		}
+
+	      if ((curr_linenum != prev_linum && curr_pc != prev_pc)
+		  || cmd <= 0
+		  || cmd == DST__K_DELTA_PC_L
+		  || cmd == DST__K_DELTA_PC_W)
+		{
+		  line = (struct lineinfo *)
+		    bfd_zalloc (abfd, sizeof (struct lineinfo));
+		  line->address = curr_pc;
+		  line->line = curr_linenum;
+
+		  curr_line->next = line;
+		  curr_line = line;
+
+		  prev_linum = curr_linenum;
+		  prev_pc = curr_pc;
+		  vms_debug2 ((4, "-> correlate pc 0x%lx with line %d\n",
+                               (unsigned long)curr_pc, curr_linenum));
+		}
+
+	      pcl_ptr += cmd_length;
+	    }
+	  break;
+
+	case 0x17: /* Undocumented type used by DEC C to declare equates.  */
+	  vms_debug2 ((3, "undocumented type 0x17\n"));
+	  break;
+
+	default:
+	  vms_debug2 ((3, "ignoring record\n"));
+	  break;
+
+	}
+
+      ptr += rec_length;
+    }
+
+  /* Finalize tables with EOL marker.  */
+  srec = (struct srecinfo *) bfd_zalloc (abfd, sizeof (struct srecinfo));
+  srec->line = (unsigned int) -1;
+  srec->srec = (unsigned int) -1;
+  curr_srec->next = srec;
+
+  line = (struct lineinfo *) bfd_zalloc (abfd, sizeof (struct lineinfo));
+  line->line = (unsigned int) -1;
+  line->address = (bfd_vma) -1;
+  curr_line->next = line;
+
+  /* Advertise that this module has been parsed.  This is needed
+     because parsing can be either performed at module creation
+     or deferred until debug info is consumed.  */
+  SET_MODULE_PARSED (module);
+}
+
+/* Build the list of modules for the specified BFD.  */
+
+static struct module *
+build_module_list (bfd *abfd)
+{
+  struct module *module, *list = NULL;
+  asection *dmt;
+
+  if ((dmt = bfd_get_section_by_name (abfd, "$DMT$")))
+    {
+      /* We have a DMT section so this must be an image.  Parse the
+	 section and build the list of modules.  This is sufficient
+	 since we can compute the start address and the end address
+	 of every module from the section contents.  */
+      bfd_size_type size = bfd_get_section_size (dmt);
+      unsigned char *ptr, *end;
+
+      ptr = (unsigned char *) bfd_alloc (abfd, size);
+      if (! ptr)
+	return NULL;
+
+      if (! bfd_get_section_contents (abfd, dmt, ptr, 0, size))
+	return NULL;
+
+      vms_debug2 ((2, "DMT\n"));
+
+      end = ptr + size;
+
+      while (ptr < end)
+	{
+	  /* Each header declares a module with its start offset and size
+	     of debug info in the DST section, as well as the count of
+	     program sections (i.e. address spans) it contains.  */
+	  int modbeg = bfd_getl32 (ptr + DBG_S_L_DMT_MODBEG);
+	  int msize = bfd_getl32 (ptr + DBG_S_L_DST_SIZE);
+	  int count = bfd_getl16 (ptr + DBG_S_W_DMT_PSECT_COUNT);
+	  ptr += DBG_S_C_DMT_HEADER_SIZE;
+
+	  vms_debug2 ((3, "module: modbeg = %d, size = %d, count = %d\n",
+                       modbeg, msize, count));
+
+	  /* We create a 'module' structure for each program section since
+	     we only support contiguous addresses in a 'module' structure.
+	     As a consequence, the actual debug info in the DST section is
+	     shared and can be parsed multiple times; that doesn't seem to
+	     cause problems in practice.  */
+	  while (count-- > 0)
+	    {
+	      int start = bfd_getl32 (ptr + DBG_S_L_DMT_PSECT_START);
+	      int length = bfd_getl32 (ptr + DBG_S_L_DMT_PSECT_LENGTH);
+	      module = new_module (abfd);
+	      module->modbeg = modbeg;
+	      module->size = msize;
+	      module->low = start;
+	      module->high = start + length;
+	      module->next = list;
+	      list = module;
+	      ptr += DBG_S_C_DMT_PSECT_SIZE;
+
+	      vms_debug2 ((4, "section: start = 0x%x, length = %d\n",
+                           start, length));
+	    }
+	}
+    }
+  else
+    {
+      /* We don't have a DMT section so this must be an object.  Parse
+	 the module right now in order to compute its start address and
+	 end address.  */
+      void *dst = PRIV (dst_section)->contents;
+
+      if (dst == NULL)
+        return NULL;
+
+      module = new_module (abfd);
+      parse_module (abfd, module, PRIV (dst_section)->contents, -1);
+      list = module;
+    }
+
+  return list;
+}
+
+/* Calculate and return the name of the source file and the line nearest
+   to the wanted location in the specified module.  */
+
+static bfd_boolean
+module_find_nearest_line (bfd *abfd, struct module *module, bfd_vma addr,
+			  const char **file, const char **func,
+			  unsigned int *line)
+{
+  struct funcinfo *funcinfo;
+  struct lineinfo *lineinfo;
+  struct srecinfo *srecinfo;
+  bfd_boolean ret = FALSE;
+
+  /* Parse this module if that was not done at module creation.  */
+  if (! IS_MODULE_PARSED (module))
+    {
+      unsigned int size = module->size;
+      unsigned int modbeg = PRIV (dst_section)->filepos + module->modbeg;
+      unsigned char *buffer = (unsigned char *) bfd_malloc (module->size);
+
+      if (bfd_seek (abfd, modbeg, SEEK_SET) != 0
+	  || bfd_bread (buffer, size, abfd) != size)
+	{
+	  bfd_set_error (bfd_error_no_debug_section);
+	  return FALSE;
+	}
+
+      parse_module (abfd, module, buffer, size);
+      free (buffer);
+    }
+
+  /* Find out the function (if any) that contains the address.  */
+  for (funcinfo = module->func_table; funcinfo; funcinfo = funcinfo->next)
+    if (addr >= funcinfo->low && addr <= funcinfo->high)
+      {
+        *func = funcinfo->name;
+	ret = TRUE;
+	break;
+      }
+
+  /* Find out the source file and the line nearest to the address.  */
+  for (lineinfo = module->line_table; lineinfo; lineinfo = lineinfo->next)
+    if (lineinfo->next && addr < lineinfo->next->address)
+      {
+	for (srecinfo = module->srec_table; srecinfo; srecinfo = srecinfo->next)
+	  if (srecinfo->next && lineinfo->line < srecinfo->next->line)
+	    {
+	      if (srecinfo->sfile > 0)
+		{
+		  *file = module->file_table[srecinfo->sfile].name;
+		  *line = srecinfo->srec + lineinfo->line - srecinfo->line;
+		}
+	      else
+		{
+		  *file = module->name;
+		  *line = lineinfo->line;
+		}
+	      return TRUE;
+	    }
+
+	break;
+      }
+
+  return ret;
+}
+
+/* Provided a BFD, a section and an offset into the section, calculate and
+   return the name of the source file and the line nearest to the wanted
+   location.  */
+
+static bfd_boolean
+_bfd_vms_find_nearest_dst_line (bfd *abfd, asection *section,
+				asymbol **symbols ATTRIBUTE_UNUSED,
+				bfd_vma offset, const char **file,
+				const char **func, unsigned int *line)
+{
+  struct module *module;
+
+  /* What address are we looking for?  */
+  bfd_vma addr = section->vma + offset;
+
+  *file = NULL;
+  *func = NULL;
+  *line = 0;
+
+  /* We can't do anything if there is no DST (debug symbol table).  */
+  if (PRIV (dst_section) == NULL)
+    return FALSE;
+
+  /* Create the module list - if not already done.  */
+  if (PRIV (modules) == NULL)
+    {
+      PRIV (modules) = build_module_list (abfd);
+      if (PRIV (modules) == NULL)
+        return FALSE;
+    }
+
+  for (module = PRIV (modules); module; module = module->next)
+    if (addr >= module->low && addr <= module->high)
+      return module_find_nearest_line (abfd, module, addr, file, func, line);
+
+  return FALSE;
+}
+
+/* Canonicalizations.  */
+/* Set name, value, section and flags of SYM from E.  */
+
+static bfd_boolean
+alpha_vms_convert_symbol (bfd *abfd, struct vms_symbol_entry *e, asymbol *sym)
+{
+  flagword flags;
+  symvalue value;
+  asection *sec;
+  const char *name;
+
+  name = e->name;
+  value = 0;
+  flags = BSF_NO_FLAGS;
+  sec = NULL;
+
+  switch (e->typ)
+    {
+    case EGSD__C_SYM:
+      if (e->flags & EGSY__V_WEAK)
+        flags |= BSF_WEAK;
+
+      if (e->flags & EGSY__V_DEF)
+        {
+          /* Symbol definition.  */
+          flags |= BSF_GLOBAL;
+          if (e->flags & EGSY__V_NORM)
+            flags |= BSF_FUNCTION;
+          value = e->value;
+          sec = e->section;
+        }
+      else
+        {
+          /* Symbol reference.  */
+          sec = bfd_und_section_ptr;
+        }
+      break;
+
+    case EGSD__C_SYMG:
+      /* A universal symbol is by definition global...  */
+      flags |= BSF_GLOBAL;
+
+      /* ...and dynamic in shared libraries.  */
+      if (abfd->flags & DYNAMIC)
+        flags |= BSF_DYNAMIC;
+
+      if (e->flags & EGSY__V_WEAK)
+        flags |= BSF_WEAK;
+
+      if (!(e->flags & EGSY__V_DEF))
+        abort ();
+
+      if (e->flags & EGSY__V_NORM)
+        flags |= BSF_FUNCTION;
+
+      value = e->value;
+      /* sec = e->section; */
+      sec = bfd_abs_section_ptr;
+      break;
+
+    default:
+      return FALSE;
+    }
+
+  sym->name = name;
+  sym->section = sec;
+  sym->flags = flags;
+  sym->value = value;
+  return TRUE;
+}
+
+
+/* Return the number of bytes required to store a vector of pointers
+   to asymbols for all the symbols in the BFD abfd, including a
+   terminal NULL pointer. If there are no symbols in the BFD,
+   then return 0.  If an error occurs, return -1.  */
+
+static long
+alpha_vms_get_symtab_upper_bound (bfd *abfd)
+{
+  vms_debug2 ((1, "alpha_vms_get_symtab_upper_bound (%p), %d symbols\n",
+               abfd, PRIV (gsd_sym_count)));
+
+  return (PRIV (gsd_sym_count) + 1) * sizeof (asymbol *);
+}
+
+/* Read the symbols from the BFD abfd, and fills in the vector
+   location with pointers to the symbols and a trailing NULL.
+
+   Return number of symbols read.   */
+
+static long
+alpha_vms_canonicalize_symtab (bfd *abfd, asymbol **symbols)
+{
+  unsigned int i;
+
+  vms_debug2 ((1, "alpha_vms_canonicalize_symtab (%p, <ret>)\n", abfd));
+
+  if (PRIV (csymbols) == NULL)
+    {
+      PRIV (csymbols) = (asymbol **) bfd_alloc
+        (abfd, PRIV (gsd_sym_count) * sizeof (asymbol *));
+
+      /* Traverse table and fill symbols vector.  */
+      for (i = 0; i < PRIV (gsd_sym_count); i++)
+        {
+          struct vms_symbol_entry *e = PRIV (syms)[i];
+          asymbol *sym;
+
+          sym = bfd_make_empty_symbol (abfd);
+          if (sym == NULL || !alpha_vms_convert_symbol (abfd, e, sym))
+            {
+              bfd_release (abfd, PRIV (csymbols));
+              PRIV (csymbols) = NULL;
+              return -1;
+            }
+
+          PRIV (csymbols)[i] = sym;
+        }
+    }
+
+  if (symbols != NULL)
+    {
+      for (i = 0; i < PRIV (gsd_sym_count); i++)
+        symbols[i] = PRIV (csymbols)[i];
+      symbols[i] = NULL;
+    }
+
+  return PRIV (gsd_sym_count);
+}
+
+/* Read and convert relocations from ETIR.  We do it once for all sections.  */
+
+static bfd_boolean
+alpha_vms_slurp_relocs (bfd *abfd)
+{
+  int cur_psect = -1;
+
+  vms_debug2 ((3, "alpha_vms_slurp_relocs\n"));
+
+  /* We slurp relocs only once, for all sections.  */
+  if (PRIV (reloc_done))
+      return TRUE;
+  PRIV (reloc_done) = TRUE;
+
+  if (alpha_vms_canonicalize_symtab (abfd, NULL) < 0)
+    return FALSE;
+
+  if (bfd_seek (abfd, 0, SEEK_SET) != 0)
+    return FALSE;
+
+  while (1)
+    {
+      unsigned char *begin;
+      unsigned char *end;
+      unsigned char *ptr;
+      bfd_reloc_code_real_type reloc_code;
+      int type;
+      bfd_vma vaddr = 0;
+
+      int length;
+
+      bfd_vma cur_address;
+      int cur_psidx = -1;
+      unsigned char *cur_sym = NULL;
+      int prev_cmd = -1;
+      bfd_vma cur_addend = 0;
+
+      /* Skip non-ETIR records.  */
+      type = _bfd_vms_get_object_record (abfd);
+      if (type == EOBJ__C_EEOM)
+        break;
+      if (type != EOBJ__C_ETIR)
+        continue;
+
+      begin = PRIV (recrd.rec) + 4;
+      end = PRIV (recrd.rec) + PRIV (recrd.rec_size);
+
+      for (ptr = begin; ptr < end; ptr += length)
+        {
+          int cmd;
+
+          cmd = bfd_getl16 (ptr);
+          length = bfd_getl16 (ptr + 2);
+
+          cur_address = vaddr;
+
+          vms_debug2 ((4, "alpha_vms_slurp_relocs: etir %s\n",
+                       _bfd_vms_etir_name (cmd)));
+
+          switch (cmd)
+            {
+            case ETIR__C_STA_GBL: /* ALPHA_R_REFLONG und_section, step 1 */
+                                  /* ALPHA_R_REFQUAD und_section, step 1 */
+              cur_sym = ptr + 4;
+              prev_cmd = cmd;
+              continue;
+
+            case ETIR__C_STA_PQ: /* ALPHA_R_REF{LONG|QUAD}, others part 1 */
+              cur_psidx = bfd_getl32 (ptr + 4);
+              cur_addend = bfd_getl64 (ptr + 8);
+              prev_cmd = cmd;
+              continue;
+
+            case ETIR__C_CTL_SETRB:
+              if (prev_cmd != ETIR__C_STA_PQ)
+                {
+                  (*_bfd_error_handler)
+                    (_("Unknown reloc %s + %s"), _bfd_vms_etir_name (prev_cmd),
+                     _bfd_vms_etir_name (cmd));
+                  return FALSE;
+                }
+              cur_psect = cur_psidx;
+              vaddr = cur_addend;
+              cur_psidx = -1;
+              cur_addend = 0;
+              continue;
+
+            case ETIR__C_STA_LW: /* ALPHA_R_REFLONG abs_section, step 1 */
+                                 /* ALPHA_R_REFLONG und_section, step 2 */
+              if (prev_cmd != -1)
+                {
+                  if (prev_cmd != ETIR__C_STA_GBL)
+                    {
+                      (*_bfd_error_handler)
+                        (_("Unknown reloc %s + %s"), _bfd_vms_etir_name (cmd),
+                         _bfd_vms_etir_name (ETIR__C_STA_LW));
+                      return FALSE;
+                    }
+                }
+              cur_addend = bfd_getl32 (ptr + 4);
+              prev_cmd = cmd;
+              continue;
+
+            case ETIR__C_STA_QW: /* ALPHA_R_REFQUAD abs_section, step 1 */
+			         /* ALPHA_R_REFQUAD und_section, step 2 */
+              if (prev_cmd != -1 && prev_cmd != ETIR__C_STA_GBL)
+                {
+                  (*_bfd_error_handler)
+                    (_("Unknown reloc %s + %s"), _bfd_vms_etir_name (cmd),
+                     _bfd_vms_etir_name (ETIR__C_STA_QW));
+                  return FALSE;
+                }
+              cur_addend = bfd_getl64 (ptr + 4);
+              prev_cmd = cmd;
+              continue;
+
+            case ETIR__C_STO_LW: /* ALPHA_R_REFLONG und_section, step 4 */
+			         /* ALPHA_R_REFLONG abs_section, step 2 */
+                                 /* ALPHA_R_REFLONG others, step 2 */
+              if (prev_cmd != ETIR__C_OPR_ADD
+                  && prev_cmd != ETIR__C_STA_LW
+                  && prev_cmd != ETIR__C_STA_PQ)
+                {
+                  (*_bfd_error_handler) (_("Unknown reloc %s + %s"),
+                                         _bfd_vms_etir_name (prev_cmd),
+                                         _bfd_vms_etir_name (ETIR__C_STO_LW));
+                  return FALSE;
+                }
+              reloc_code = BFD_RELOC_32;
+              break;
+
+            case ETIR__C_STO_QW: /* ALPHA_R_REFQUAD und_section, step 4 */
+			         /* ALPHA_R_REFQUAD abs_section, step 2 */
+              if (prev_cmd != ETIR__C_OPR_ADD && prev_cmd != ETIR__C_STA_QW)
+                {
+                  (*_bfd_error_handler) (_("Unknown reloc %s + %s"),
+                                         _bfd_vms_etir_name (prev_cmd),
+                                         _bfd_vms_etir_name (ETIR__C_STO_QW));
+                  return FALSE;
+                }
+              reloc_code = BFD_RELOC_64;
+              break;
+
+            case ETIR__C_STO_OFF: /* ALPHA_R_REFQUAD others, step 2 */
+              if (prev_cmd != ETIR__C_STA_PQ)
+                {
+                  (*_bfd_error_handler) (_("Unknown reloc %s + %s"),
+                                         _bfd_vms_etir_name (prev_cmd),
+                                         _bfd_vms_etir_name (ETIR__C_STO_OFF));
+                  return FALSE;
+                }
+              reloc_code = BFD_RELOC_64;
+              break;
+
+            case ETIR__C_OPR_ADD: /* ALPHA_R_REFLONG und_section, step 3 */
+                                  /* ALPHA_R_REFQUAD und_section, step 3 */
+              if (prev_cmd != ETIR__C_STA_LW && prev_cmd != ETIR__C_STA_QW)
+                {
+                  (*_bfd_error_handler) (_("Unknown reloc %s + %s"),
+                                         _bfd_vms_etir_name (prev_cmd),
+                                         _bfd_vms_etir_name (ETIR__C_OPR_ADD));
+                  return FALSE;
+                }
+              prev_cmd = ETIR__C_OPR_ADD;
+              continue;
+
+            case ETIR__C_STO_CA: /* ALPHA_R_CODEADDR */
+              reloc_code = BFD_RELOC_ALPHA_CODEADDR;
+              cur_sym = ptr + 4;
+              break;
+
+            case ETIR__C_STO_GBL: /* ALPHA_R_REFQUAD und_section */
+              reloc_code = BFD_RELOC_64;
+              cur_sym = ptr + 4;
+              break;
+
+            case ETIR__C_STO_GBL_LW: /* ALPHA_R_REFLONG und_section */
+              reloc_code = BFD_RELOC_32;
+              cur_sym = ptr + 4;
+              break;
+
+            case ETIR__C_STC_LP_PSB: /* ALPHA_R_LINKAGE */
+              reloc_code = BFD_RELOC_ALPHA_LINKAGE;
+              cur_sym = ptr + 8;
+              break;
+
+            case ETIR__C_STC_NOP_GBL: /* ALPHA_R_NOP */
+              reloc_code = BFD_RELOC_ALPHA_NOP;
+              goto call_reloc;
+
+            case ETIR__C_STC_BSR_GBL: /* ALPHA_R_BSR */
+              reloc_code = BFD_RELOC_ALPHA_BSR;
+              goto call_reloc;
+
+            case ETIR__C_STC_LDA_GBL: /* ALPHA_R_LDA */
+              reloc_code = BFD_RELOC_ALPHA_LDA;
+              goto call_reloc;
+
+            case ETIR__C_STC_BOH_GBL: /* ALPHA_R_BOH */
+              reloc_code = BFD_RELOC_ALPHA_BOH;
+              goto call_reloc;
+
+            call_reloc:
+              cur_sym = ptr + 4 + 32;
+              cur_address = bfd_getl64 (ptr + 4 + 8);
+              cur_addend = bfd_getl64 (ptr + 4 + 24);
+              break;
+
+            case ETIR__C_STO_IMM:
+              vaddr += bfd_getl32 (ptr + 4);
+              continue;
+
+            default:
+              (*_bfd_error_handler) (_("Unknown reloc %s"),
+                                     _bfd_vms_etir_name (cmd));
+              return FALSE;
+            }
+
+          {
+            asection *sec;
+            struct vms_section_data_struct *vms_sec;
+            arelent *reloc;
+
+            /* Get section to which the relocation applies.  */
+            if (cur_psect < 0 || cur_psect > (int)PRIV (section_count))
+              {
+                (*_bfd_error_handler) (_("Invalid section index in ETIR"));
+                return FALSE;
+              }
+
+            sec = PRIV (sections)[cur_psect];
+            if (sec == bfd_abs_section_ptr)
+              {
+                (*_bfd_error_handler) (_("Relocation for non-REL psect"));
+                return FALSE;
+              }
+
+            vms_sec = vms_section_data (sec);
+
+            /* Allocate a reloc entry.  */
+            if (sec->reloc_count >= vms_sec->reloc_max)
+              {
+                if (vms_sec->reloc_max == 0)
+                  {
+                    vms_sec->reloc_max = 64;
+                    sec->relocation = bfd_zmalloc
+                      (vms_sec->reloc_max * sizeof (arelent));
+                  }
+                else
+                  {
+                    vms_sec->reloc_max *= 2;
+                    sec->relocation = bfd_realloc
+                      (sec->relocation, vms_sec->reloc_max * sizeof (arelent));
+                  }
+              }
+            reloc = &sec->relocation[sec->reloc_count];
+            sec->reloc_count++;
+
+            reloc->howto = bfd_reloc_type_lookup (abfd, reloc_code);
+
+            if (cur_sym != NULL)
+              {
+                unsigned int j;
+                unsigned int symlen = *cur_sym;
+                asymbol **sym;
+
+                /* Linear search.  */
+                symlen = *cur_sym;
+                cur_sym++;
+                sym = NULL;
+
+                for (j = 0; j < PRIV (gsd_sym_count); j++)
+                  if (PRIV (syms)[j]->namelen == symlen
+                      && memcmp (PRIV (syms)[j]->name, cur_sym, symlen) == 0)
+                    {
+                      sym = &PRIV (csymbols)[j];
+                      break;
+                    }
+                if (sym == NULL)
+                  {
+                    (*_bfd_error_handler) (_("Unknown symbol in command %s"),
+                                           _bfd_vms_etir_name (cmd));
+                    reloc->sym_ptr_ptr = NULL;
+                  }
+                else
+                  reloc->sym_ptr_ptr = sym;
+              }
+            else if (cur_psidx >= 0)
+              reloc->sym_ptr_ptr =
+                PRIV (sections)[cur_psidx]->symbol_ptr_ptr;
+            else
+              reloc->sym_ptr_ptr = NULL;
+
+            reloc->address = cur_address;
+            reloc->addend = cur_addend;
+
+            vaddr += bfd_get_reloc_size (reloc->howto);
+          }
+
+          cur_addend = 0;
+          prev_cmd = -1;
+          cur_sym = NULL;
+          cur_psidx = -1;
+        }
+    }
+  vms_debug2 ((3, "alpha_vms_slurp_relocs: result = TRUE\n"));
+
+  return TRUE;
+}
+
+/* Return the number of bytes required to store the relocation
+   information associated with the given section.  */
+
+static long
+alpha_vms_get_reloc_upper_bound (bfd *abfd ATTRIBUTE_UNUSED, asection *section)
+{
+  alpha_vms_slurp_relocs (abfd);
+
+  return (section->reloc_count + 1) * sizeof (arelent *);
+}
+
+/* Convert relocations from VMS (external) form into BFD internal
+   form.  Return the number of relocations.  */
+
+static long
+alpha_vms_canonicalize_reloc (bfd *abfd, asection *section, arelent **relptr,
+                              asymbol **symbols ATTRIBUTE_UNUSED)
+{
+  arelent *tblptr;
+  int count;
+
+  if (!alpha_vms_slurp_relocs (abfd))
+    return -1;
+
+  count = section->reloc_count;
+  tblptr = section->relocation;
+
+  while (count--)
+    *relptr++ = tblptr++;
+
+  *relptr = (arelent *) NULL;
+  return section->reloc_count;
+}
+
+/* This is just copied from ecoff-alpha, needs to be fixed probably.  */
+
+/* How to process the various reloc types.  */
+
+static bfd_reloc_status_type
+reloc_nil (bfd * abfd ATTRIBUTE_UNUSED,
+	   arelent *reloc ATTRIBUTE_UNUSED,
+	   asymbol *sym ATTRIBUTE_UNUSED,
+	   void * data ATTRIBUTE_UNUSED,
+	   asection *sec ATTRIBUTE_UNUSED,
+	   bfd *output_bfd ATTRIBUTE_UNUSED,
+	   char **error_message ATTRIBUTE_UNUSED)
+{
+#if VMS_DEBUG
+  vms_debug (1, "reloc_nil (abfd %p, output_bfd %p)\n", abfd, output_bfd);
+  vms_debug (2, "In section %s, symbol %s\n",
+	sec->name, sym->name);
+  vms_debug (2, "reloc sym %s, addr %08lx, addend %08lx, reloc is a %s\n",
+		reloc->sym_ptr_ptr[0]->name,
+		(unsigned long)reloc->address,
+		(unsigned long)reloc->addend, reloc->howto->name);
+  vms_debug (2, "data at %p\n", data);
+  /*  _bfd_hexdump (2, data, bfd_get_reloc_size (reloc->howto), 0); */
+#endif
+
+  return bfd_reloc_ok;
+}
+
+/* In case we're on a 32-bit machine, construct a 64-bit "-1" value
+   from smaller values.  Start with zero, widen, *then* decrement.  */
+#define MINUS_ONE	(((bfd_vma)0) - 1)
+
+static reloc_howto_type alpha_howto_table[] =
+{
+  HOWTO (ALPHA_R_IGNORE,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 0,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 8,			/* Bitsize.  */
+	 TRUE,			/* PC relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 reloc_nil,		/* Special_function.  */
+	 "IGNORE",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 0,			/* Source mask */
+	 0,			/* Dest mask.  */
+	 TRUE),			/* PC rel offset.  */
+
+  /* A 64 bit reference to a symbol.  */
+  HOWTO (ALPHA_R_REFQUAD,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 4,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 64,			/* Bitsize.  */
+	 FALSE,			/* PC relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 reloc_nil,		/* Special_function.  */
+	 "REFQUAD",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 MINUS_ONE,		/* Source mask.  */
+	 MINUS_ONE,		/* Dest mask.  */
+	 FALSE),		/* PC rel offset.  */
+
+  /* A 21 bit branch.  The native assembler generates these for
+     branches within the text segment, and also fills in the PC
+     relative offset in the instruction.  */
+  HOWTO (ALPHA_R_BRADDR,	/* Type.  */
+	 2,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 21,			/* Bitsize.  */
+	 TRUE,			/* PC relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 reloc_nil,		/* Special_function.  */
+	 "BRADDR",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 0x1fffff,		/* Source mask.  */
+	 0x1fffff,		/* Dest mask.  */
+	 FALSE),		/* PC rel offset.  */
+
+  /* A hint for a jump to a register.  */
+  HOWTO (ALPHA_R_HINT,		/* Type.  */
+	 2,			/* Rightshift.  */
+	 1,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 14,			/* Bitsize.  */
+	 TRUE,			/* PC relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 reloc_nil,		/* Special_function.  */
+	 "HINT",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 0x3fff,		/* Source mask.  */
+	 0x3fff,		/* Dest mask.  */
+	 FALSE),		/* PC rel offset.  */
+
+  /* 16 bit PC relative offset.  */
+  HOWTO (ALPHA_R_SREL16,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 1,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 16,			/* Bitsize.  */
+	 TRUE,			/* PC relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 reloc_nil,		/* Special_function.  */
+	 "SREL16",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 0xffff,		/* Source mask.  */
+	 0xffff,		/* Dest mask.  */
+	 FALSE),		/* PC rel offset.  */
+
+  /* 32 bit PC relative offset.  */
+  HOWTO (ALPHA_R_SREL32,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* Bitsize.  */
+	 TRUE,			/* PC relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 reloc_nil,		/* Special_function.  */
+	 "SREL32",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Source mask.  */
+	 0xffffffff,		/* Dest mask.  */
+	 FALSE),		/* PC rel offset.  */
+
+  /* A 64 bit PC relative offset.  */
+  HOWTO (ALPHA_R_SREL64,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 4,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 64,			/* Bitsize.  */
+	 TRUE,			/* PC relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 reloc_nil,		/* Special_function.  */
+	 "SREL64",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 MINUS_ONE,		/* Source mask.  */
+	 MINUS_ONE,		/* Dest mask.  */
+	 FALSE),		/* PC rel offset.  */
+
+  /* Push a value on the reloc evaluation stack.  */
+  HOWTO (ALPHA_R_OP_PUSH,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 0,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 0,			/* Bitsize.  */
+	 FALSE,			/* PC relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 reloc_nil,		/* Special_function.  */
+	 "OP_PUSH",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0,			/* Source mask.  */
+	 0,			/* Dest mask.  */
+	 FALSE),		/* PC rel offset.  */
+
+  /* Store the value from the stack at the given address.  Store it in
+     a bitfield of size r_size starting at bit position r_offset.  */
+  HOWTO (ALPHA_R_OP_STORE,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 4,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 64,			/* Bitsize.  */
+	 FALSE,			/* PC relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 reloc_nil,		/* Special_function.  */
+	 "OP_STORE",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0,			/* Source mask.  */
+	 MINUS_ONE,		/* Dest mask.  */
+	 FALSE),		/* PC rel offset.  */
+
+  /* Subtract the reloc address from the value on the top of the
+     relocation stack.  */
+  HOWTO (ALPHA_R_OP_PSUB,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 0,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 0,			/* Bitsize.  */
+	 FALSE,			/* PC relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 reloc_nil,		/* Special_function.  */
+	 "OP_PSUB",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0,			/* Source mask.  */
+	 0,			/* Dest mask.  */
+	 FALSE),		/* PC rel offset.  */
+
+  /* Shift the value on the top of the relocation stack right by the
+     given value.  */
+  HOWTO (ALPHA_R_OP_PRSHIFT,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 0,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 0,			/* Bitsize.  */
+	 FALSE,			/* PC relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 reloc_nil,		/* Special_function.  */
+	 "OP_PRSHIFT",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0,			/* Source mask.  */
+	 0,			/* Dest mask.  */
+	 FALSE),		/* PC rel offset.  */
+
+  /* Hack. Linkage is done by linker.  */
+  HOWTO (ALPHA_R_LINKAGE,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 8,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 256,			/* Bitsize.  */
+	 FALSE,			/* PC relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 reloc_nil,		/* Special_function.  */
+	 "LINKAGE",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0,			/* Source mask.  */
+	 0,			/* Dest mask.  */
+	 FALSE),		/* PC rel offset.  */
+
+  /* A 32 bit reference to a symbol.  */
+  HOWTO (ALPHA_R_REFLONG,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* Bitsize.  */
+	 FALSE,			/* PC relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 reloc_nil,		/* Special_function.  */
+	 "REFLONG",		/* Name.  */
+	 TRUE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Source mask.  */
+	 0xffffffff,		/* Dest mask.  */
+	 FALSE),		/* PC rel offset.  */
+
+  /* A 64 bit reference to a procedure, written as 32 bit value.  */
+  HOWTO (ALPHA_R_CODEADDR,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 4,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 64,			/* Bitsize.  */
+	 FALSE,			/* PC relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed,/* Complain_on_overflow.  */
+	 reloc_nil,		/* Special_function.  */
+	 "CODEADDR",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Source mask.  */
+	 0xffffffff,		/* Dest mask.  */
+	 FALSE),		/* PC rel offset.  */
+
+  HOWTO (ALPHA_R_NOP,		/* Type.  */
+	 0,			/* Rightshift.  */
+	 3,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 0,			/* Bitsize.  */
+	 /* The following value must match that of ALPHA_R_BSR/ALPHA_R_BOH
+	    because the calculations for the 3 relocations are the same.
+	    See B.4.5.2 of the OpenVMS Linker Utility Manual.  */
+	 TRUE,			/* PC relative.  */
+	 0,			/* Bitpos.   */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 reloc_nil,		/* Special_function.  */
+	 "NOP",			/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Source mask.  */
+	 0xffffffff,		/* Dest mask.  */
+	 FALSE),		/* PC rel offset.  */
+
+  HOWTO (ALPHA_R_BSR,		/* Type.  */
+	 0,			/* Rightshift.  */
+	 3,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 0,			/* Bitsize.  */
+	 TRUE,			/* PC relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 reloc_nil,		/* Special_function.  */
+	 "BSR",			/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Source mask.  */
+	 0xffffffff,		/* Dest mask.  */
+	 FALSE),		/* PC rel offset.  */
+
+  HOWTO (ALPHA_R_LDA,		/* Type.  */
+	 0,			/* Rightshift.  */
+	 3,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 0,			/* Bitsize.  */
+	 FALSE,			/* PC relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 reloc_nil,		/* Special_function.  */
+	 "LDA",			/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Source mask.  */
+	 0xffffffff,		/* Dest mask.  */
+	 FALSE),		/* PC rel offset.  */
+
+  HOWTO (ALPHA_R_BOH,		/* Type.  */
+	 0,			/* Rightshift.  */
+	 3,			/* Size (0 = byte, 1 = short, 2 = long, 3 = nil).  */
+	 0,			/* Bitsize.  */
+	 TRUE,			/* PC relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_dont,/* Complain_on_overflow.  */
+	 reloc_nil,		/* Special_function.  */
+	 "BOH",			/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Source mask.  */
+	 0xffffffff,		/* Dest mask.  */
+	 FALSE),		/* PC rel offset.  */
+};
+
+/* Return a pointer to a howto structure which, when invoked, will perform
+   the relocation code on data from the architecture noted.  */
+
+static const struct reloc_howto_struct *
+alpha_vms_bfd_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
+                                 bfd_reloc_code_real_type code)
+{
+  int alpha_type;
+
+  vms_debug2 ((1, "vms_bfd_reloc_type_lookup (%p, %d)\t", abfd, code));
+
+  switch (code)
+    {
+      case BFD_RELOC_16:		alpha_type = ALPHA_R_SREL16;	break;
+      case BFD_RELOC_32:		alpha_type = ALPHA_R_REFLONG;	break;
+      case BFD_RELOC_64:		alpha_type = ALPHA_R_REFQUAD;	break;
+      case BFD_RELOC_CTOR:		alpha_type = ALPHA_R_REFQUAD;	break;
+      case BFD_RELOC_23_PCREL_S2:	alpha_type = ALPHA_R_BRADDR;	break;
+      case BFD_RELOC_ALPHA_HINT:	alpha_type = ALPHA_R_HINT;	break;
+      case BFD_RELOC_16_PCREL:		alpha_type = ALPHA_R_SREL16;	break;
+      case BFD_RELOC_32_PCREL:		alpha_type = ALPHA_R_SREL32;	break;
+      case BFD_RELOC_64_PCREL:		alpha_type = ALPHA_R_SREL64;	break;
+      case BFD_RELOC_ALPHA_LINKAGE:	alpha_type = ALPHA_R_LINKAGE;	break;
+      case BFD_RELOC_ALPHA_CODEADDR:	alpha_type = ALPHA_R_CODEADDR;	break;
+      case BFD_RELOC_ALPHA_NOP:		alpha_type = ALPHA_R_NOP;	break;
+      case BFD_RELOC_ALPHA_BSR:		alpha_type = ALPHA_R_BSR;	break;
+      case BFD_RELOC_ALPHA_LDA:		alpha_type = ALPHA_R_LDA;	break;
+      case BFD_RELOC_ALPHA_BOH:		alpha_type = ALPHA_R_BOH;	break;
+      default:
+	(*_bfd_error_handler) ("reloc (%d) is *UNKNOWN*", code);
+	return NULL;
+    }
+  vms_debug2 ((2, "reloc is %s\n", alpha_howto_table[alpha_type].name));
+  return & alpha_howto_table[alpha_type];
+}
+
+static reloc_howto_type *
+alpha_vms_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                                 const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (alpha_howto_table) / sizeof (alpha_howto_table[0]);
+       i++)
+    if (alpha_howto_table[i].name != NULL
+	&& strcasecmp (alpha_howto_table[i].name, r_name) == 0)
+      return &alpha_howto_table[i];
+
+  return NULL;
+}
+
+static long
+alpha_vms_get_synthetic_symtab (bfd *abfd,
+                                long symcount ATTRIBUTE_UNUSED,
+                                asymbol **usyms ATTRIBUTE_UNUSED,
+                                long dynsymcount ATTRIBUTE_UNUSED,
+                                asymbol **dynsyms ATTRIBUTE_UNUSED,
+                                asymbol **ret)
+{
+  asymbol *syms;
+  unsigned int i;
+  unsigned int n = 0;
+
+  syms = (asymbol *) bfd_malloc (PRIV (norm_sym_count) * sizeof (asymbol));
+  *ret = syms;
+  if (syms == NULL)
+    return -1;
+
+  for (i = 0; i < PRIV (gsd_sym_count); i++)
+    {
+      struct vms_symbol_entry *e = PRIV (syms)[i];
+      asymbol *sym;
+      flagword flags;
+      symvalue value;
+      asection *sec;
+      const char *name;
+      char *sname;
+      int l;
+
+      name = e->name;
+      value = 0;
+      flags = BSF_LOCAL | BSF_SYNTHETIC;
+      sec = NULL;
+
+      switch (e->typ)
+        {
+        case EGSD__C_SYM:
+        case EGSD__C_SYMG:
+          if ((e->flags & EGSY__V_DEF) && (e->flags & EGSY__V_NORM))
+            {
+              value = e->code_value;
+              sec = e->code_section;
+            }
+          else
+            continue;
+          break;
+
+        default:
+          continue;
+        }
+
+      l = strlen (name);
+      sname = bfd_alloc (abfd, l + 5);
+      if (sname == NULL)
+        return FALSE;
+      memcpy (sname, name, l);
+      memcpy (sname + l, "..en", 5);
+
+      sym = &syms[n++];
+      sym->name = sname;
+      sym->section = sec;
+      sym->flags = flags;
+      sym->value = value;
+      sym->udata.p = NULL;
+    }
+
+  return n;
+}
+
+/* Private dump.  */
+
+static const char *
+vms_time_to_str (unsigned char *buf)
+{
+  time_t t = vms_rawtime_to_time_t (buf);
+  char *res = ctime (&t);
+
+  if (!res)
+    res = "*invalid time*";
+  else
+    res[24] = 0;
+  return res;
+}
+
+static void
+evax_bfd_print_emh (FILE *file, unsigned char *rec, unsigned int rec_len)
+{
+  struct vms_emh_common *emh = (struct vms_emh_common *)rec;
+  unsigned int subtype;
+
+  subtype = (unsigned)bfd_getl16 (emh->subtyp);
+
+  fprintf (file, _("  EMH %u (len=%u): "), subtype, rec_len);
+
+  switch (subtype)
+    {
+    case EMH__C_MHD:
+      {
+        struct vms_emh_mhd *mhd = (struct vms_emh_mhd *)rec;
+        const char *name;
+
+        fprintf (file, _("Module header\n"));
+        fprintf (file, _("   structure level: %u\n"), mhd->strlvl);
+        fprintf (file, _("   max record size: %u\n"),
+                 (unsigned)bfd_getl32 (mhd->recsiz));
+        name = (char *)(mhd + 1);
+        fprintf (file, _("   module name    : %.*s\n"), name[0], name + 1);
+        name += name[0] + 1;
+        fprintf (file, _("   module version : %.*s\n"), name[0], name + 1);
+        name += name[0] + 1;
+        fprintf (file, _("   compile date   : %.17s\n"), name);
+      }
+      break;
+    case EMH__C_LNM:
+      {
+        fprintf (file, _("Language Processor Name\n"));
+        fprintf (file, _("   language name: %.*s\n"),
+                 (int)(rec_len - sizeof (struct vms_emh_common)),
+                 (char *)rec + sizeof (struct vms_emh_common));
+      }
+      break;
+    case EMH__C_SRC:
+      {
+        fprintf (file, _("Source Files Header\n"));
+        fprintf (file, _("   file: %.*s\n"),
+                 (int)(rec_len - sizeof (struct vms_emh_common)),
+                 (char *)rec + sizeof (struct vms_emh_common));
+      }
+      break;
+    case EMH__C_TTL:
+      {
+        fprintf (file, _("Title Text Header\n"));
+        fprintf (file, _("   title: %.*s\n"),
+                 (int)(rec_len - sizeof (struct vms_emh_common)),
+                 (char *)rec + sizeof (struct vms_emh_common));
+      }
+      break;
+    case EMH__C_CPR:
+      {
+        fprintf (file, _("Copyright Header\n"));
+        fprintf (file, _("   copyright: %.*s\n"),
+                 (int)(rec_len - sizeof (struct vms_emh_common)),
+                 (char *)rec + sizeof (struct vms_emh_common));
+      }
+      break;
+    default:
+      fprintf (file, _("unhandled emh subtype %u\n"), subtype);
+      break;
+    }
+}
+
+static void
+evax_bfd_print_eeom (FILE *file, unsigned char *rec, unsigned int rec_len)
+{
+  struct vms_eeom *eeom = (struct vms_eeom *)rec;
+
+  fprintf (file, _("  EEOM (len=%u):\n"), rec_len);
+  fprintf (file, _("   number of cond linkage pairs: %u\n"),
+           (unsigned)bfd_getl32 (eeom->total_lps));
+  fprintf (file, _("   completion code: %u\n"),
+           (unsigned)bfd_getl16 (eeom->comcod));
+  if (rec_len > 10)
+    {
+      fprintf (file, _("   transfer addr flags: 0x%02x\n"), eeom->tfrflg);
+      fprintf (file, _("   transfer addr psect: %u\n"),
+               (unsigned)bfd_getl32 (eeom->psindx));
+      fprintf (file, _("   transfer address   : 0x%08x\n"),
+               (unsigned)bfd_getl32 (eeom->tfradr));
+    }
+}
+
+static void
+exav_bfd_print_egsy_flags (unsigned int flags, FILE *file)
+{
+  if (flags & EGSY__V_WEAK)
+    fputs (_(" WEAK"), file);
+  if (flags & EGSY__V_DEF)
+    fputs (_(" DEF"), file);
+  if (flags & EGSY__V_UNI)
+    fputs (_(" UNI"), file);
+  if (flags & EGSY__V_REL)
+    fputs (_(" REL"), file);
+  if (flags & EGSY__V_COMM)
+    fputs (_(" COMM"), file);
+  if (flags & EGSY__V_VECEP)
+    fputs (_(" VECEP"), file);
+  if (flags & EGSY__V_NORM)
+    fputs (_(" NORM"), file);
+  if (flags & EGSY__V_QUAD_VAL)
+    fputs (_(" QVAL"), file);
+}
+
+static void
+evax_bfd_print_egsd_flags (FILE *file, unsigned int flags)
+{
+  if (flags & EGPS__V_PIC)
+    fputs (_(" PIC"), file);
+  if (flags & EGPS__V_LIB)
+    fputs (_(" LIB"), file);
+  if (flags & EGPS__V_OVR)
+    fputs (_(" OVR"), file);
+  if (flags & EGPS__V_REL)
+    fputs (_(" REL"), file);
+  if (flags & EGPS__V_GBL)
+    fputs (_(" GBL"), file);
+  if (flags & EGPS__V_SHR)
+    fputs (_(" SHR"), file);
+  if (flags & EGPS__V_EXE)
+    fputs (_(" EXE"), file);
+  if (flags & EGPS__V_RD)
+    fputs (_(" RD"), file);
+  if (flags & EGPS__V_WRT)
+    fputs (_(" WRT"), file);
+  if (flags & EGPS__V_VEC)
+    fputs (_(" VEC"), file);
+  if (flags & EGPS__V_NOMOD)
+    fputs (_(" NOMOD"), file);
+  if (flags & EGPS__V_COM)
+    fputs (_(" COM"), file);
+  if (flags & EGPS__V_ALLOC_64BIT)
+    fputs (_(" 64B"), file);
+}
+
+static void
+evax_bfd_print_egsd (FILE *file, unsigned char *rec, unsigned int rec_len)
+{
+  unsigned int off = sizeof (struct vms_egsd);
+  unsigned int n;
+
+  fprintf (file, _("  EGSD (len=%u):\n"), rec_len);
+
+  n = 0;
+  for (off = sizeof (struct vms_egsd); off < rec_len; )
+    {
+      struct vms_egsd_entry *e = (struct vms_egsd_entry *)(rec + off);
+      unsigned int type;
+      unsigned int len;
+
+      type = (unsigned)bfd_getl16 (e->gsdtyp);
+      len = (unsigned)bfd_getl16 (e->gsdsiz);
+
+      fprintf (file, _("  EGSD entry %2u (type: %u, len: %u): "),
+               n, type, len);
+      n++;
+
+      switch (type)
+        {
+        case EGSD__C_PSC:
+          {
+            struct vms_egps *egps = (struct vms_egps *)e;
+            unsigned int flags = bfd_getl16 (egps->flags);
+            unsigned int l;
+
+            fprintf (file, _("PSC - Program section definition\n"));
+            fprintf (file, _("   alignment  : 2**%u\n"), egps->align);
+            fprintf (file, _("   flags      : 0x%04x"), flags);
+            evax_bfd_print_egsd_flags (file, flags);
+            fputc ('\n', file);
+            l = bfd_getl32 (egps->alloc);
+            fprintf (file, _("   alloc (len): %u (0x%08x)\n"), l, l);
+            fprintf (file, _("   name       : %.*s\n"),
+                     egps->namlng, egps->name);
+          }
+          break;
+        case EGSD__C_SPSC:
+          {
+            struct vms_esgps *esgps = (struct vms_esgps *)e;
+            unsigned int flags = bfd_getl16 (esgps->flags);
+            unsigned int l;
+
+            fprintf (file, _("SPSC - Shared Image Program section def\n"));
+            fprintf (file, _("   alignment  : 2**%u\n"), esgps->align);
+            fprintf (file, _("   flags      : 0x%04x"), flags);
+            evax_bfd_print_egsd_flags (file, flags);
+            fputc ('\n', file);
+            l = bfd_getl32 (esgps->alloc);
+            fprintf (file, _("   alloc (len)   : %u (0x%08x)\n"), l, l);
+            fprintf (file, _("   image offset  : 0x%08x\n"),
+                     (unsigned int)bfd_getl32 (esgps->base));
+            fprintf (file, _("   symvec offset : 0x%08x\n"),
+                     (unsigned int)bfd_getl32 (esgps->value));
+            fprintf (file, _("   name          : %.*s\n"),
+                     esgps->namlng, esgps->name);
+          }
+          break;
+        case EGSD__C_SYM:
+          {
+            struct vms_egsy *egsy = (struct vms_egsy *)e;
+            unsigned int flags = bfd_getl16 (egsy->flags);
+
+            if (flags & EGSY__V_DEF)
+              {
+                struct vms_esdf *esdf = (struct vms_esdf *)e;
+
+                fprintf (file, _("SYM - Global symbol definition\n"));
+                fprintf (file, _("   flags: 0x%04x"), flags);
+                exav_bfd_print_egsy_flags (flags, file);
+                fputc ('\n', file);
+                fprintf (file, _("   psect offset: 0x%08x\n"),
+                         (unsigned)bfd_getl32 (esdf->value));
+                if (flags & EGSY__V_NORM)
+                  {
+                    fprintf (file, _("   code address: 0x%08x\n"),
+                             (unsigned)bfd_getl32 (esdf->code_address));
+                    fprintf (file, _("   psect index for entry point : %u\n"),
+                             (unsigned)bfd_getl32 (esdf->ca_psindx));
+                  }
+                fprintf (file, _("   psect index : %u\n"),
+                         (unsigned)bfd_getl32 (esdf->psindx));
+                fprintf (file, _("   name        : %.*s\n"),
+                         esdf->namlng, esdf->name);
+              }
+            else
+              {
+                struct vms_esrf *esrf = (struct vms_esrf *)e;
+
+                fprintf (file, _("SYM - Global symbol reference\n"));
+                fprintf (file, _("   name       : %.*s\n"),
+                         esrf->namlng, esrf->name);
+              }
+          }
+          break;
+        case EGSD__C_IDC:
+          {
+            struct vms_eidc *eidc = (struct vms_eidc *)e;
+            unsigned int flags = bfd_getl32 (eidc->flags);
+            unsigned char *p;
+
+            fprintf (file, _("IDC - Ident Consistency check\n"));
+            fprintf (file, _("   flags         : 0x%08x"), flags);
+            if (flags & EIDC__V_BINIDENT)
+              fputs (" BINDENT", file);
+            fputc ('\n', file);
+            fprintf (file, _("   id match      : %x\n"),
+                     (flags >> EIDC__V_IDMATCH_SH) & EIDC__V_IDMATCH_MASK);
+            fprintf (file, _("   error severity: %x\n"),
+                     (flags >> EIDC__V_ERRSEV_SH) & EIDC__V_ERRSEV_MASK);
+            p = eidc->name;
+            fprintf (file, _("   entity name   : %.*s\n"), p[0], p + 1);
+            p += 1 + p[0];
+            fprintf (file, _("   object name   : %.*s\n"), p[0], p + 1);
+            p += 1 + p[0];
+            if (flags & EIDC__V_BINIDENT)
+              fprintf (file, _("   binary ident  : 0x%08x\n"),
+                       (unsigned)bfd_getl32 (p + 1));
+            else
+              fprintf (file, _("   ascii ident   : %.*s\n"), p[0], p + 1);
+          }
+          break;
+        case EGSD__C_SYMG:
+          {
+            struct vms_egst *egst = (struct vms_egst *)e;
+            unsigned int flags = bfd_getl16 (egst->header.flags);
+
+            fprintf (file, _("SYMG - Universal symbol definition\n"));
+            fprintf (file, _("   flags: 0x%04x"), flags);
+            exav_bfd_print_egsy_flags (flags, file);
+            fputc ('\n', file);
+            fprintf (file, _("   symbol vector offset: 0x%08x\n"),
+                     (unsigned)bfd_getl32 (egst->value));
+            fprintf (file, _("   entry point: 0x%08x\n"),
+                     (unsigned)bfd_getl32 (egst->lp_1));
+            fprintf (file, _("   proc descr : 0x%08x\n"),
+                     (unsigned)bfd_getl32 (egst->lp_2));
+            fprintf (file, _("   psect index: %u\n"),
+                     (unsigned)bfd_getl32 (egst->psindx));
+            fprintf (file, _("   name       : %.*s\n"),
+                     egst->namlng, egst->name);
+          }
+          break;
+        case EGSD__C_SYMV:
+          {
+            struct vms_esdfv *esdfv = (struct vms_esdfv *)e;
+            unsigned int flags = bfd_getl16 (esdfv->flags);
+
+            fprintf (file, _("SYMV - Vectored symbol definition\n"));
+            fprintf (file, _("   flags: 0x%04x"), flags);
+            exav_bfd_print_egsy_flags (flags, file);
+            fputc ('\n', file);
+            fprintf (file, _("   vector      : 0x%08x\n"),
+                     (unsigned)bfd_getl32 (esdfv->vector));
+            fprintf (file, _("   psect offset: %u\n"),
+                     (unsigned)bfd_getl32 (esdfv->value));
+            fprintf (file, _("   psect index : %u\n"),
+                     (unsigned)bfd_getl32 (esdfv->psindx));
+            fprintf (file, _("   name        : %.*s\n"),
+                     esdfv->namlng, esdfv->name);
+          }
+          break;
+        case EGSD__C_SYMM:
+          {
+            struct vms_esdfm *esdfm = (struct vms_esdfm *)e;
+            unsigned int flags = bfd_getl16 (esdfm->flags);
+
+            fprintf (file, _("SYMM - Global symbol definition with version\n"));
+            fprintf (file, _("   flags: 0x%04x"), flags);
+            exav_bfd_print_egsy_flags (flags, file);
+            fputc ('\n', file);
+            fprintf (file, _("   version mask: 0x%08x\n"),
+                     (unsigned)bfd_getl32 (esdfm->version_mask));
+            fprintf (file, _("   psect offset: %u\n"),
+                     (unsigned)bfd_getl32 (esdfm->value));
+            fprintf (file, _("   psect index : %u\n"),
+                     (unsigned)bfd_getl32 (esdfm->psindx));
+            fprintf (file, _("   name        : %.*s\n"),
+                     esdfm->namlng, esdfm->name);
+          }
+          break;
+        default:
+          fprintf (file, _("unhandled egsd entry type %u\n"), type);
+          break;
+        }
+      off += len;
+    }
+}
+
+static void
+evax_bfd_print_hex (FILE *file, const char *pfx,
+                    const unsigned char *buf, unsigned int len)
+{
+  unsigned int i;
+  unsigned int n;
+
+  n = 0;
+  for (i = 0; i < len; i++)
+    {
+      if (n == 0)
+        fputs (pfx, file);
+      fprintf (file, " %02x", buf[i]);
+      n++;
+      if (n == 16)
+        {
+          n = 0;
+          fputc ('\n', file);
+        }
+    }
+  if (n != 0)
+    fputc ('\n', file);
+}
+
+static void
+evax_bfd_print_etir_stc_ir (FILE *file, const unsigned char *buf, int is_ps)
+{
+  fprintf (file, _("    linkage index: %u, replacement insn: 0x%08x\n"),
+           (unsigned)bfd_getl32 (buf),
+           (unsigned)bfd_getl32 (buf + 16));
+  fprintf (file, _("    psect idx 1: %u, offset 1: 0x%08x %08x\n"),
+           (unsigned)bfd_getl32 (buf + 4),
+           (unsigned)bfd_getl32 (buf + 12),
+           (unsigned)bfd_getl32 (buf + 8));
+  fprintf (file, _("    psect idx 2: %u, offset 2: 0x%08x %08x\n"),
+           (unsigned)bfd_getl32 (buf + 20),
+           (unsigned)bfd_getl32 (buf + 28),
+           (unsigned)bfd_getl32 (buf + 24));
+  if (is_ps)
+    fprintf (file, _("    psect idx 3: %u, offset 3: 0x%08x %08x\n"),
+             (unsigned)bfd_getl32 (buf + 32),
+             (unsigned)bfd_getl32 (buf + 40),
+             (unsigned)bfd_getl32 (buf + 36));
+  else
+    fprintf (file, _("    global name: %.*s\n"), buf[32], buf + 33);
+}
+
+static void
+evax_bfd_print_etir (FILE *file, const char *name,
+                     unsigned char *rec, unsigned int rec_len)
+{
+  unsigned int off = sizeof (struct vms_egsd);
+  unsigned int sec_len;
+
+  fprintf (file, _("  %s (len=%u+%u):\n"), name,
+           (unsigned)(rec_len - sizeof (struct vms_eobjrec)),
+           (unsigned)sizeof (struct vms_eobjrec));
+
+  for (off = sizeof (struct vms_eobjrec); off < rec_len; )
+    {
+      struct vms_etir *etir = (struct vms_etir *)(rec + off);
+      unsigned char *buf;
+      unsigned int type;
+      unsigned int size;
+
+      type = bfd_getl16 (etir->rectyp);
+      size = bfd_getl16 (etir->size);
+      buf = rec + off + sizeof (struct vms_etir);
+
+      fprintf (file, _("   (type: %3u, size: 4+%3u): "), type, size - 4);
+      switch (type)
+        {
+        case ETIR__C_STA_GBL:
+          fprintf (file, _("STA_GBL (stack global) %.*s\n"),
+                   buf[0], buf + 1);
+          break;
+        case ETIR__C_STA_LW:
+          fprintf (file, _("STA_LW (stack longword) 0x%08x\n"),
+                   (unsigned)bfd_getl32 (buf));
+          break;
+        case ETIR__C_STA_QW:
+          fprintf (file, _("STA_QW (stack quadword) 0x%08x %08x\n"),
+                   (unsigned)bfd_getl32 (buf + 4),
+                   (unsigned)bfd_getl32 (buf + 0));
+          break;
+        case ETIR__C_STA_PQ:
+          fprintf (file, _("STA_PQ (stack psect base + offset)\n"));
+          fprintf (file, _("    psect: %u, offset: 0x%08x %08x\n"),
+                   (unsigned)bfd_getl32 (buf + 0),
+                   (unsigned)bfd_getl32 (buf + 8),
+                   (unsigned)bfd_getl32 (buf + 4));
+          break;
+        case ETIR__C_STA_LI:
+          fprintf (file, _("STA_LI (stack literal)\n"));
+          break;
+        case ETIR__C_STA_MOD:
+          fprintf (file, _("STA_MOD (stack module)\n"));
+          break;
+        case ETIR__C_STA_CKARG:
+          fprintf (file, _("STA_CKARG (compare procedure argument)\n"));
+          break;
+
+        case ETIR__C_STO_B:
+          fprintf (file, _("STO_B (store byte)\n"));
+          break;
+        case ETIR__C_STO_W:
+          fprintf (file, _("STO_W (store word)\n"));
+          break;
+        case ETIR__C_STO_LW:
+          fprintf (file, _("STO_LW (store longword)\n"));
+          break;
+        case ETIR__C_STO_QW:
+          fprintf (file, _("STO_QW (store quadword)\n"));
+          break;
+        case ETIR__C_STO_IMMR:
+          {
+            unsigned int len = bfd_getl32 (buf);
+            fprintf (file,
+                     _("STO_IMMR (store immediate repeat) %u bytes\n"),
+                     len);
+            evax_bfd_print_hex (file, "   ", buf + 4, len);
+            sec_len += len;
+          }
+          break;
+        case ETIR__C_STO_GBL:
+          fprintf (file, _("STO_GBL (store global) %.*s\n"),
+                   buf[0], buf + 1);
+          break;
+        case ETIR__C_STO_CA:
+          fprintf (file, _("STO_CA (store code address) %.*s\n"),
+                   buf[0], buf + 1);
+          break;
+        case ETIR__C_STO_RB:
+          fprintf (file, _("STO_RB (store relative branch)\n"));
+          break;
+        case ETIR__C_STO_AB:
+          fprintf (file, _("STO_AB (store absolute branch)\n"));
+          break;
+        case ETIR__C_STO_OFF:
+          fprintf (file, _("STO_OFF (store offset to psect)\n"));
+          break;
+        case ETIR__C_STO_IMM:
+          {
+            unsigned int len = bfd_getl32 (buf);
+            fprintf (file,
+                     _("STO_IMM (store immediate) %u bytes\n"),
+                     len);
+            evax_bfd_print_hex (file, "   ", buf + 4, len);
+            sec_len += len;
+          }
+          break;
+        case ETIR__C_STO_GBL_LW:
+          fprintf (file, _("STO_GBL_LW (store global longword) %.*s\n"),
+                   buf[0], buf + 1);
+          break;
+        case ETIR__C_STO_LP_PSB:
+          fprintf (file, _("STO_OFF (store LP with procedure signature)\n"));
+          break;
+        case ETIR__C_STO_HINT_GBL:
+          fprintf (file, _("STO_BR_GBL (store branch global) *todo*\n"));
+          break;
+        case ETIR__C_STO_HINT_PS:
+          fprintf (file, _("STO_BR_PS (store branch psect + offset) *todo*\n"));
+          break;
+
+        case ETIR__C_OPR_NOP:
+          fprintf (file, _("OPR_NOP (no-operation)\n"));
+          break;
+        case ETIR__C_OPR_ADD:
+          fprintf (file, _("OPR_ADD (add)\n"));
+          break;
+        case ETIR__C_OPR_SUB:
+          fprintf (file, _("OPR_SUB (substract)\n"));
+          break;
+        case ETIR__C_OPR_MUL:
+          fprintf (file, _("OPR_MUL (multiply)\n"));
+          break;
+        case ETIR__C_OPR_DIV:
+          fprintf (file, _("OPR_DIV (divide)\n"));
+          break;
+        case ETIR__C_OPR_AND:
+          fprintf (file, _("OPR_AND (logical and)\n"));
+          break;
+        case ETIR__C_OPR_IOR:
+          fprintf (file, _("OPR_IOR (logical inclusive or)\n"));
+          break;
+        case ETIR__C_OPR_EOR:
+          fprintf (file, _("OPR_EOR (logical exclusive or)\n"));
+          break;
+        case ETIR__C_OPR_NEG:
+          fprintf (file, _("OPR_NEG (negate)\n"));
+          break;
+        case ETIR__C_OPR_COM:
+          fprintf (file, _("OPR_COM (complement)\n"));
+          break;
+        case ETIR__C_OPR_INSV:
+          fprintf (file, _("OPR_INSV (insert field)\n"));
+          break;
+        case ETIR__C_OPR_ASH:
+          fprintf (file, _("OPR_ASH (arithmetic shift)\n"));
+          break;
+        case ETIR__C_OPR_USH:
+          fprintf (file, _("OPR_USH (unsigned shift)\n"));
+          break;
+        case ETIR__C_OPR_ROT:
+          fprintf (file, _("OPR_ROT (rotate)\n"));
+          break;
+        case ETIR__C_OPR_SEL:
+          fprintf (file, _("OPR_SEL (select)\n"));
+          break;
+        case ETIR__C_OPR_REDEF:
+          fprintf (file, _("OPR_REDEF (redefine symbol to curr location)\n"));
+          break;
+        case ETIR__C_OPR_DFLIT:
+          fprintf (file, _("OPR_REDEF (define a literal)\n"));
+          break;
+
+        case ETIR__C_STC_LP:
+          fprintf (file, _("STC_LP (store cond linkage pair)\n"));
+          break;
+        case ETIR__C_STC_LP_PSB:
+          fprintf (file,
+                   _("STC_LP_PSB (store cond linkage pair + signature)\n"));
+          fprintf (file, _("   linkage index: %u, procedure: %.*s\n"),
+                   (unsigned)bfd_getl32 (buf), buf[4], buf + 5);
+          buf += 4 + 1 + buf[4];
+          fprintf (file, _("   signature: %.*s\n"), buf[0], buf + 1);
+          break;
+        case ETIR__C_STC_GBL:
+          fprintf (file, _("STC_GBL (store cond global)\n"));
+          fprintf (file, _("   linkage index: %u, global: %.*s\n"),
+                   (unsigned)bfd_getl32 (buf), buf[4], buf + 5);
+          break;
+        case ETIR__C_STC_GCA:
+          fprintf (file, _("STC_GCA (store cond code address)\n"));
+          fprintf (file, _("   linkage index: %u, procedure name: %.*s\n"),
+                   (unsigned)bfd_getl32 (buf), buf[4], buf + 5);
+          break;
+        case ETIR__C_STC_PS:
+          fprintf (file, _("STC_PS (store cond psect + offset)\n"));
+          fprintf (file,
+                   _("   linkage index: %u, psect: %u, offset: 0x%08x %08x\n"),
+                   (unsigned)bfd_getl32 (buf),
+                   (unsigned)bfd_getl32 (buf + 4),
+                   (unsigned)bfd_getl32 (buf + 12),
+                   (unsigned)bfd_getl32 (buf + 8));
+          break;
+        case ETIR__C_STC_NOP_GBL:
+          fprintf (file, _("STC_NOP_GBL (store cond NOP at global addr)\n"));
+          evax_bfd_print_etir_stc_ir (file, buf, 0);
+          break;
+        case ETIR__C_STC_NOP_PS:
+          fprintf (file, _("STC_NOP_PS (store cond NOP at psect + offset)\n"));
+          evax_bfd_print_etir_stc_ir (file, buf, 1);
+          break;
+        case ETIR__C_STC_BSR_GBL:
+          fprintf (file, _("STC_BSR_GBL (store cond BSR at global addr)\n"));
+          evax_bfd_print_etir_stc_ir (file, buf, 0);
+          break;
+        case ETIR__C_STC_BSR_PS:
+          fprintf (file, _("STC_BSR_PS (store cond BSR at psect + offset)\n"));
+          evax_bfd_print_etir_stc_ir (file, buf, 1);
+          break;
+        case ETIR__C_STC_LDA_GBL:
+          fprintf (file, _("STC_LDA_GBL (store cond LDA at global addr)\n"));
+          evax_bfd_print_etir_stc_ir (file, buf, 0);
+          break;
+        case ETIR__C_STC_LDA_PS:
+          fprintf (file, _("STC_LDA_PS (store cond LDA at psect + offset)\n"));
+          evax_bfd_print_etir_stc_ir (file, buf, 1);
+          break;
+        case ETIR__C_STC_BOH_GBL:
+          fprintf (file, _("STC_BOH_GBL (store cond BOH at global addr)\n"));
+          evax_bfd_print_etir_stc_ir (file, buf, 0);
+          break;
+        case ETIR__C_STC_BOH_PS:
+          fprintf (file, _("STC_BOH_PS (store cond BOH at psect + offset)\n"));
+          evax_bfd_print_etir_stc_ir (file, buf, 1);
+          break;
+        case ETIR__C_STC_NBH_GBL:
+          fprintf (file,
+                   _("STC_NBH_GBL (store cond or hint at global addr)\n"));
+          break;
+        case ETIR__C_STC_NBH_PS:
+          fprintf (file,
+                   _("STC_NBH_PS (store cond or hint at psect + offset)\n"));
+          break;
+
+        case ETIR__C_CTL_SETRB:
+          fprintf (file, _("CTL_SETRB (set relocation base)\n"));
+          sec_len += 4;
+          break;
+        case ETIR__C_CTL_AUGRB:
+          {
+            unsigned int val = bfd_getl32 (buf);
+            fprintf (file, _("CTL_AUGRB (augment relocation base) %u\n"), val);
+          }
+          break;
+        case ETIR__C_CTL_DFLOC:
+          fprintf (file, _("CTL_DFLOC (define location)\n"));
+          break;
+        case ETIR__C_CTL_STLOC:
+          fprintf (file, _("CTL_STLOC (set location)\n"));
+          break;
+        case ETIR__C_CTL_STKDL:
+          fprintf (file, _("CTL_STKDL (stack defined location)\n"));
+          break;
+        default:
+          fprintf (file, _("*unhandled*\n"));
+          break;
+        }
+      off += size;
+    }
+}
+
+static void
+evax_bfd_print_eobj (struct bfd *abfd, FILE *file)
+{
+  bfd_boolean is_first = TRUE;
+  bfd_boolean has_records = FALSE;
+
+  while (1)
+    {
+      unsigned int rec_len;
+      unsigned int pad_len;
+      unsigned char *rec;
+      unsigned int hdr_size;
+      unsigned int type;
+
+      if (is_first)
+        {
+          unsigned char buf[6];
+
+          is_first = FALSE;
+
+          /* Read 6 bytes.  */
+          if (bfd_bread (buf, sizeof (buf), abfd) != sizeof (buf))
+            {
+              fprintf (file, _("cannot read GST record length\n"));
+              return;
+            }
+          rec_len = bfd_getl16 (buf + 0);
+          if (rec_len == bfd_getl16 (buf + 4)
+              && bfd_getl16 (buf + 2) == EOBJ__C_EMH)
+            {
+              /* The format is raw: record-size, type, record-size.  */
+              has_records = TRUE;
+              pad_len = (rec_len + 1) & ~1U;
+              hdr_size = 4;
+            }
+          else if (rec_len == EOBJ__C_EMH)
+            {
+              has_records = FALSE;
+              pad_len = bfd_getl16 (buf + 2);
+              hdr_size = 6;
+            }
+          else
+            {
+              /* Ill-formed.  */
+              fprintf (file, _("cannot find EMH in first GST record\n"));
+              return;
+            }
+          rec = bfd_malloc (pad_len);
+          memcpy (rec, buf + sizeof (buf) - hdr_size, hdr_size);
+        }
+      else
+        {
+          unsigned int rec_len2 = 0;
+          unsigned char hdr[4];
+
+          if (has_records)
+            {
+              unsigned char buf_len[2];
+
+              if (bfd_bread (buf_len, sizeof (buf_len), abfd)
+                  != sizeof (buf_len))
+                {
+                  fprintf (file, _("cannot read GST record length\n"));
+                  return;
+                }
+              rec_len2 = (unsigned)bfd_getl16 (buf_len);
+            }
+
+          if (bfd_bread (hdr, sizeof (hdr), abfd) != sizeof (hdr))
+            {
+              fprintf (file, _("cannot read GST record header\n"));
+              return;
+            }
+          rec_len = (unsigned)bfd_getl16 (hdr + 2);
+          if (has_records)
+            pad_len = (rec_len + 1) & ~1U;
+          else
+            pad_len = rec_len;
+          rec = bfd_malloc (pad_len);
+          memcpy (rec, hdr, sizeof (hdr));
+          hdr_size = sizeof (hdr);
+          if (has_records && rec_len2 != rec_len)
+            {
+              fprintf (file, _(" corrupted GST\n"));
+              break;
+            }
+        }
+
+      if (bfd_bread (rec + hdr_size, pad_len - hdr_size, abfd)
+          != pad_len - hdr_size)
+        {
+          fprintf (file, _("cannot read GST record\n"));
+          return;
+        }
+
+      type = (unsigned)bfd_getl16 (rec);
+
+      switch (type)
+        {
+        case EOBJ__C_EMH:
+          evax_bfd_print_emh (file, rec, rec_len);
+          break;
+        case EOBJ__C_EGSD:
+          evax_bfd_print_egsd (file, rec, rec_len);
+          break;
+        case EOBJ__C_EEOM:
+          evax_bfd_print_eeom (file, rec, rec_len);
+          free (rec);
+          return;
+          break;
+        case EOBJ__C_ETIR:
+          evax_bfd_print_etir (file, "ETIR", rec, rec_len);
+          break;
+        case EOBJ__C_EDBG:
+          evax_bfd_print_etir (file, "EDBG", rec, rec_len);
+          break;
+        case EOBJ__C_ETBT:
+          evax_bfd_print_etir (file, "ETBT", rec, rec_len);
+          break;
+        default:
+          fprintf (file, _(" unhandled EOBJ record type %u\n"), type);
+          break;
+        }
+      free (rec);
+    }
+}
+
+static void
+evax_bfd_print_relocation_records (FILE *file, const unsigned char *rel,
+                                   unsigned int stride)
+{
+  while (1)
+    {
+      unsigned int base;
+      unsigned int count;
+      unsigned int j;
+
+      count = bfd_getl32 (rel + 0);
+
+      if (count == 0)
+        break;
+      base = bfd_getl32 (rel + 4);
+
+      fprintf (file, _("  bitcount: %u, base addr: 0x%08x\n"),
+               count, base);
+
+      rel += 8;
+      for (j = 0; count > 0; j += 4, count -= 32)
+        {
+          unsigned int k;
+          unsigned int n = 0;
+          unsigned int val;
+
+          val = bfd_getl32 (rel);
+          rel += 4;
+
+          fprintf (file, _("   bitmap: 0x%08x (count: %u):\n"), val, count);
+
+          for (k = 0; k < 32; k++)
+            if (val & (1 << k))
+              {
+                if (n == 0)
+                  fputs ("   ", file);
+                fprintf (file, _(" %08x"), base + (j * 8 + k) * stride);
+                n++;
+                if (n == 8)
+                  {
+                    fputs ("\n", file);
+                    n = 0;
+                  }
+              }
+          if (n)
+            fputs ("\n", file);
+        }
+    }
+}
+
+static void
+evax_bfd_print_address_fixups (FILE *file, const unsigned char *rel)
+{
+  while (1)
+    {
+      unsigned int j;
+      unsigned int count;
+
+      count = bfd_getl32 (rel + 0);
+      if (count == 0)
+        return;
+      fprintf (file, _("  image %u (%u entries)\n"),
+               (unsigned)bfd_getl32 (rel + 4), count);
+      rel += 8;
+      for (j = 0; j < count; j++)
+        {
+          fprintf (file, _("   offset: 0x%08x, val: 0x%08x\n"),
+                   (unsigned)bfd_getl32 (rel + 0),
+                   (unsigned)bfd_getl32 (rel + 4));
+          rel += 8;
+        }
+    }
+}
+
+static void
+evax_bfd_print_reference_fixups (FILE *file, const unsigned char *rel)
+{
+  unsigned int count;
+
+  while (1)
+    {
+      unsigned int j;
+      unsigned int n = 0;
+
+      count = bfd_getl32 (rel + 0);
+      if (count == 0)
+        break;
+      fprintf (file, _("  image %u (%u entries), offsets:\n"),
+               (unsigned)bfd_getl32 (rel + 4), count);
+      rel += 8;
+      for (j = 0; j < count; j++)
+        {
+          if (n == 0)
+            fputs ("   ", file);
+          fprintf (file, _(" 0x%08x"), (unsigned)bfd_getl32 (rel));
+          n++;
+          if (n == 7)
+            {
+              fputs ("\n", file);
+              n = 0;
+            }
+          rel += 4;
+        }
+      if (n)
+        fputs ("\n", file);
+    }
+}
+
+static void
+evax_bfd_print_indent (int indent, FILE *file)
+{
+  for (; indent; indent--)
+    fputc (' ', file);
+}
+
+static const char *
+evax_bfd_get_dsc_name (unsigned int v)
+{
+  switch (v)
+    {
+    case DSC__K_DTYPE_Z:
+      return "Z (Unspecified)";
+    case DSC__K_DTYPE_V:
+      return "V (Bit)";
+    case DSC__K_DTYPE_BU:
+      return "BU (Byte logical)";
+    case DSC__K_DTYPE_WU:
+      return "WU (Word logical)";
+    case DSC__K_DTYPE_LU:
+      return "LU (Longword logical)";
+    case DSC__K_DTYPE_QU:
+      return "QU (Quadword logical)";
+    case DSC__K_DTYPE_B:
+      return "B (Byte integer)";
+    case DSC__K_DTYPE_W:
+      return "W (Word integer)";
+    case DSC__K_DTYPE_L:
+      return "L (Longword integer)";
+    case DSC__K_DTYPE_Q:
+      return "Q (Quadword integer)";
+    case DSC__K_DTYPE_F:
+      return "F (Single-precision floating)";
+    case DSC__K_DTYPE_D:
+      return "D (Double-precision floating)";
+    case DSC__K_DTYPE_FC:
+      return "FC (Complex)";
+    case DSC__K_DTYPE_DC:
+      return "DC (Double-precision Complex)";
+    case DSC__K_DTYPE_T:
+      return "T (ASCII text string)";
+    case DSC__K_DTYPE_NU:
+      return "NU (Numeric string, unsigned)";
+    case DSC__K_DTYPE_NL:
+      return "NL (Numeric string, left separate sign)";
+    case DSC__K_DTYPE_NLO:
+      return "NLO (Numeric string, left overpunched sign)";
+    case DSC__K_DTYPE_NR:
+      return "NR (Numeric string, right separate sign)";
+    case DSC__K_DTYPE_NRO:
+      return "NRO (Numeric string, right overpunched sig)";
+    case DSC__K_DTYPE_NZ:
+      return "NZ (Numeric string, zoned sign)";
+    case DSC__K_DTYPE_P:
+      return "P (Packed decimal string)";
+    case DSC__K_DTYPE_ZI:
+      return "ZI (Sequence of instructions)";
+    case DSC__K_DTYPE_ZEM:
+      return "ZEM (Procedure entry mask)";
+    case DSC__K_DTYPE_DSC:
+      return "DSC (Descriptor, used for arrays of dyn strings)";
+    case DSC__K_DTYPE_OU:
+      return "OU (Octaword logical)";
+    case DSC__K_DTYPE_O:
+      return "O (Octaword integer)";
+    case DSC__K_DTYPE_G:
+      return "G (Double precision G floating, 64 bit)";
+    case DSC__K_DTYPE_H:
+      return "H (Quadruple precision floating, 128 bit)";
+    case DSC__K_DTYPE_GC:
+      return "GC (Double precision complex, G floating)";
+    case DSC__K_DTYPE_HC:
+      return "HC (Quadruple precision complex, H floating)";
+    case DSC__K_DTYPE_CIT:
+      return "CIT (COBOL intermediate temporary)";
+    case DSC__K_DTYPE_BPV:
+      return "BPV (Bound Procedure Value)";
+    case DSC__K_DTYPE_BLV:
+      return "BLV (Bound Label Value)";
+    case DSC__K_DTYPE_VU:
+      return "VU (Bit Unaligned)";
+    case DSC__K_DTYPE_ADT:
+      return "ADT (Absolute Date-Time)";
+    case DSC__K_DTYPE_VT:
+      return "VT (Varying Text)";
+    case DSC__K_DTYPE_T2:
+      return "T2 (16-bit char)";
+    case DSC__K_DTYPE_VT2:
+      return "VT2 (16-bit varying char)";
+    default:
+      return "?? (unknown)";
+    }
+}
+
+static void
+evax_bfd_print_desc (const unsigned char *buf, int indent, FILE *file)
+{
+  unsigned char bclass = buf[3];
+  unsigned char dtype = buf[2];
+  unsigned int len = (unsigned)bfd_getl16 (buf);
+  unsigned int pointer = (unsigned)bfd_getl32 (buf + 4);
+
+  evax_bfd_print_indent (indent, file);
+
+  if (len == 1 && pointer == 0xffffffffUL)
+    {
+      /* 64 bits.  */
+      fprintf (file, _("64 bits *unhandled*\n"));
+    }
+  else
+    {
+      fprintf (file, _("class: %u, dtype: %u, length: %u, pointer: 0x%08x\n"),
+               bclass, dtype, len, pointer);
+      switch (bclass)
+        {
+        case DSC__K_CLASS_NCA:
+          {
+            const struct vms_dsc_nca *dsc = (const void *)buf;
+            unsigned int i;
+            const unsigned char *b;
+
+            evax_bfd_print_indent (indent, file);
+            fprintf (file, _("non-contiguous array of %s\n"),
+                     evax_bfd_get_dsc_name (dsc->dtype));
+            evax_bfd_print_indent (indent + 1, file);
+            fprintf (file,
+                     _("dimct: %u, aflags: 0x%02x, digits: %u, scale: %u\n"),
+                     dsc->dimct, dsc->aflags, dsc->digits, dsc->scale);
+            evax_bfd_print_indent (indent + 1, file);
+            fprintf (file,
+                     _("arsize: %u, a0: 0x%08x\n"),
+                     (unsigned)bfd_getl32 (dsc->arsize),
+                     (unsigned)bfd_getl32 (dsc->a0));
+            evax_bfd_print_indent (indent + 1, file);
+            fprintf (file, _("Strides:\n"));
+            b = buf + sizeof (*dsc);
+            for (i = 0; i < dsc->dimct; i++)
+              {
+                evax_bfd_print_indent (indent + 2, file);
+                fprintf (file, _("[%u]: %u\n"), i + 1,
+                         (unsigned)bfd_getl32 (b));
+                b += 4;
+              }
+            evax_bfd_print_indent (indent + 1, file);
+            fprintf (file, _("Bounds:\n"));
+            b = buf + sizeof (*dsc);
+            for (i = 0; i < dsc->dimct; i++)
+              {
+                evax_bfd_print_indent (indent + 2, file);
+                fprintf (file, _("[%u]: Lower: %u, upper: %u\n"), i + 1,
+                         (unsigned)bfd_getl32 (b + 0),
+                         (unsigned)bfd_getl32 (b + 4));
+                b += 8;
+              }
+          }
+          break;
+        case DSC__K_CLASS_UBS:
+          {
+            const struct vms_dsc_ubs *ubs = (const void *)buf;
+
+            evax_bfd_print_indent (indent, file);
+            fprintf (file, _("unaligned bit-string of %s\n"),
+                     evax_bfd_get_dsc_name (ubs->dtype));
+            evax_bfd_print_indent (indent + 1, file);
+            fprintf (file,
+                     _("base: %u, pos: %u\n"),
+                     (unsigned)bfd_getl32 (ubs->base),
+                     (unsigned)bfd_getl32 (ubs->pos));
+          }
+          break;
+        default:
+          fprintf (file, _("*unhandled*\n"));
+          break;
+        }
+    }
+}
+
+static unsigned int
+evax_bfd_print_valspec (const unsigned char *buf, int indent, FILE *file)
+{
+  unsigned int vflags = buf[0];
+  unsigned int value = (unsigned)bfd_getl32 (buf + 1);
+  unsigned int len = 5;
+
+  evax_bfd_print_indent (indent, file);
+  fprintf (file, _("vflags: 0x%02x, value: 0x%08x "), vflags, value);
+  buf += 5;
+
+  switch (vflags)
+    {
+    case DST__K_VFLAGS_NOVAL:
+      fprintf (file, _("(no value)\n"));
+      break;
+    case DST__K_VFLAGS_NOTACTIVE:
+      fprintf (file, _("(not active)\n"));
+      break;
+    case DST__K_VFLAGS_UNALLOC:
+      fprintf (file, _("(not allocated)\n"));
+      break;
+    case DST__K_VFLAGS_DSC:
+      fprintf (file, _("(descriptor)\n"));
+      evax_bfd_print_desc (buf + value, indent + 1, file);
+      break;
+    case DST__K_VFLAGS_TVS:
+      fprintf (file, _("(trailing value)\n"));
+      break;
+    case DST__K_VS_FOLLOWS:
+      fprintf (file, _("(value spec follows)\n"));
+      break;
+    case DST__K_VFLAGS_BITOFFS:
+      fprintf (file, _("(at bit offset %u)\n"), value);
+      break;
+    default:
+      fprintf (file, _("(reg: %u, disp: %u, indir: %u, kind: "),
+               (vflags & DST__K_REGNUM_MASK) >> DST__K_REGNUM_SHIFT,
+               vflags & DST__K_DISP ? 1 : 0,
+               vflags & DST__K_INDIR ? 1 : 0);
+      switch (vflags & DST__K_VALKIND_MASK)
+        {
+        case DST__K_VALKIND_LITERAL:
+          fputs (_("literal"), file);
+          break;
+        case DST__K_VALKIND_ADDR:
+          fputs (_("address"), file);
+          break;
+        case DST__K_VALKIND_DESC:
+          fputs (_("desc"), file);
+          break;
+        case DST__K_VALKIND_REG:
+          fputs (_("reg"), file);
+          break;
+        }
+      fputs (")\n", file);
+      break;
+    }
+  return len;
+}
+
+static void
+evax_bfd_print_typspec (const unsigned char *buf, int indent, FILE *file)
+{
+  unsigned char kind = buf[2];
+  unsigned int len = (unsigned)bfd_getl16 (buf);
+
+  evax_bfd_print_indent (indent, file);
+  fprintf (file, ("len: %2u, kind: %2u "), len, kind);
+  buf += 3;
+  switch (kind)
+    {
+    case DST__K_TS_ATOM:
+      fprintf (file, ("atomic, type=0x%02x %s\n"),
+               buf[0], evax_bfd_get_dsc_name (buf[0]));
+      break;
+    case DST__K_TS_IND:
+      fprintf (file, ("indirect, defined at 0x%08x\n"),
+               (unsigned)bfd_getl32 (buf));
+      break;
+    case DST__K_TS_TPTR:
+      fprintf (file, ("typed pointer\n"));
+      evax_bfd_print_typspec (buf, indent + 1, file);
+      break;
+    case DST__K_TS_PTR:
+      fprintf (file, ("pointer\n"));
+      break;
+    case DST__K_TS_ARRAY:
+      {
+        const unsigned char *vs;
+        unsigned int vec_len;
+        unsigned int i;
+
+        fprintf (file, ("array, dim: %u, bitmap: "), buf[0]);
+        vec_len = (buf[0] + 1 + 7) / 8;
+        for (i = 0; i < vec_len; i++)
+          fprintf (file, " %02x", buf[i + 1]);
+        fputc ('\n', file);
+        vs = buf + 1 + vec_len;
+        evax_bfd_print_indent (indent, file);
+        fprintf (file, ("array descriptor:\n"));
+        vs += evax_bfd_print_valspec (vs, indent + 1, file);
+        for (i = 0; i < buf[0] + 1U; i++)
+          if (buf[1 + i / 8] & (1 << (i % 8)))
+            {
+              evax_bfd_print_indent (indent, file);
+              if (i == 0)
+                fprintf (file, ("type spec for element:\n"));
+              else
+                fprintf (file, ("type spec for subscript %u:\n"), i);
+              evax_bfd_print_typspec (vs, indent + 1, file);
+              vs += bfd_getl16 (vs);
+            }
+      }
+      break;
+    default:
+      fprintf (file, ("*unhandled*\n"));
+    }
+}
+
+static void
+evax_bfd_print_dst (struct bfd *abfd, unsigned int dst_size, FILE *file)
+{
+  unsigned int off = 0;
+  unsigned int pc = 0;
+  unsigned int line = 0;
+
+  fprintf (file, _("Debug symbol table:\n"));
+
+  while (dst_size > 0)
+    {
+      struct vms_dst_header dsth;
+      unsigned int len;
+      unsigned int type;
+      unsigned char *buf;
+
+      if (bfd_bread (&dsth, sizeof (dsth), abfd) != sizeof (dsth))
+        {
+          fprintf (file, _("cannot read DST header\n"));
+          return;
+        }
+      len = bfd_getl16 (dsth.length);
+      type = bfd_getl16 (dsth.type);
+      fprintf (file, _(" type: %3u, len: %3u (at 0x%08x): "),
+               type, len, off);
+      if (len == 0)
+        {
+          fputc ('\n', file);
+          break;
+        }
+      len++;
+      dst_size -= len;
+      off += len;
+      len -= sizeof (dsth);
+      buf = bfd_malloc (len);
+      if (bfd_bread (buf, len, abfd) != len)
+        {
+          fprintf (file, _("cannot read DST symbol\n"));
+          return;
+        }
+      switch (type)
+        {
+        case DSC__K_DTYPE_V:
+        case DSC__K_DTYPE_BU:
+        case DSC__K_DTYPE_WU:
+        case DSC__K_DTYPE_LU:
+        case DSC__K_DTYPE_QU:
+        case DSC__K_DTYPE_B:
+        case DSC__K_DTYPE_W:
+        case DSC__K_DTYPE_L:
+        case DSC__K_DTYPE_Q:
+        case DSC__K_DTYPE_F:
+        case DSC__K_DTYPE_D:
+        case DSC__K_DTYPE_FC:
+        case DSC__K_DTYPE_DC:
+        case DSC__K_DTYPE_T:
+        case DSC__K_DTYPE_NU:
+        case DSC__K_DTYPE_NL:
+        case DSC__K_DTYPE_NLO:
+        case DSC__K_DTYPE_NR:
+        case DSC__K_DTYPE_NRO:
+        case DSC__K_DTYPE_NZ:
+        case DSC__K_DTYPE_P:
+        case DSC__K_DTYPE_ZI:
+        case DSC__K_DTYPE_ZEM:
+        case DSC__K_DTYPE_DSC:
+        case DSC__K_DTYPE_OU:
+        case DSC__K_DTYPE_O:
+        case DSC__K_DTYPE_G:
+        case DSC__K_DTYPE_H:
+        case DSC__K_DTYPE_GC:
+        case DSC__K_DTYPE_HC:
+        case DSC__K_DTYPE_CIT:
+        case DSC__K_DTYPE_BPV:
+        case DSC__K_DTYPE_BLV:
+        case DSC__K_DTYPE_VU:
+        case DSC__K_DTYPE_ADT:
+        case DSC__K_DTYPE_VT:
+        case DSC__K_DTYPE_T2:
+        case DSC__K_DTYPE_VT2:
+          fprintf (file, _("standard data: %s\n"),
+                   evax_bfd_get_dsc_name (type));
+          evax_bfd_print_valspec (buf, 4, file);
+          fprintf (file, _("    name: %.*s\n"), buf[5], buf + 6);
+          break;
+        case DST__K_MODBEG:
+          {
+            struct vms_dst_modbeg *dst = (void *)buf;
+            const char *name = (const char *)buf + sizeof (*dst);
+
+            fprintf (file, _("modbeg\n"));
+            fprintf (file, _("   flags: %d, language: %u, "
+                             "major: %u, minor: %u\n"),
+                     dst->flags,
+                     (unsigned)bfd_getl32 (dst->language),
+                     (unsigned)bfd_getl16 (dst->major),
+                     (unsigned)bfd_getl16 (dst->minor));
+            fprintf (file, _("   module name: %.*s\n"),
+                     name[0], name + 1);
+            name += name[0] + 1;
+            fprintf (file, _("   compiler   : %.*s\n"),
+                     name[0], name + 1);
+          }
+          break;
+        case DST__K_MODEND:
+          fprintf (file, _("modend\n"));
+          break;
+        case DST__K_RTNBEG:
+          {
+            struct vms_dst_rtnbeg *dst = (void *)buf;
+            const char *name = (const char *)buf + sizeof (*dst);
+
+            fputs (_("rtnbeg\n"), file);
+            fprintf (file, _("    flags: %u, address: 0x%08x, "
+                             "pd-address: 0x%08x\n"),
+                     dst->flags,
+                     (unsigned)bfd_getl32 (dst->address),
+                     (unsigned)bfd_getl32 (dst->pd_address));
+            fprintf (file, _("    routine name: %.*s\n"),
+                     name[0], name + 1);
+          }
+          break;
+        case DST__K_RTNEND:
+          {
+            struct vms_dst_rtnend *dst = (void *)buf;
+
+            fprintf (file, _("rtnend: size 0x%08x\n"),
+                     (unsigned)bfd_getl32 (dst->size));
+          }
+          break;
+        case DST__K_PROLOG:
+          {
+            struct vms_dst_prolog *dst = (void *)buf;
+
+            fprintf (file, _("prolog: bkpt address 0x%08x\n"),
+                     (unsigned)bfd_getl32 (dst->bkpt_addr));
+          }
+          break;
+        case DST__K_EPILOG:
+          {
+            struct vms_dst_epilog *dst = (void *)buf;
+
+            fprintf (file, _("epilog: flags: %u, count: %u\n"),
+                     dst->flags, (unsigned)bfd_getl32 (dst->count));
+          }
+          break;
+        case DST__K_BLKBEG:
+          {
+            struct vms_dst_blkbeg *dst = (void *)buf;
+            const char *name = (const char *)buf + sizeof (*dst);
+
+            fprintf (file, _("blkbeg: address: 0x%08x, name: %.*s\n"),
+                     (unsigned)bfd_getl32 (dst->address),
+                     name[0], name + 1);
+          }
+          break;
+        case DST__K_BLKEND:
+          {
+            struct vms_dst_blkend *dst = (void *)buf;
+
+            fprintf (file, _("blkend: size: 0x%08x\n"),
+                     (unsigned)bfd_getl32 (dst->size));
+          }
+          break;
+        case DST__K_TYPSPEC:
+          {
+            fprintf (file, _("typspec (len: %u)\n"), len);
+            fprintf (file, _("    name: %.*s\n"), buf[0], buf + 1);
+            evax_bfd_print_typspec (buf + 1 + buf[0], 5, file);
+          }
+          break;
+        case DST__K_SEPTYP:
+          {
+            fprintf (file, _("septyp, name: %.*s\n"), buf[5], buf + 6);
+            evax_bfd_print_valspec (buf, 4, file);
+          }
+          break;
+        case DST__K_RECBEG:
+          {
+            struct vms_dst_recbeg *recbeg = (void *)buf;
+            const char *name = (const char *)buf + sizeof (*recbeg);
+
+            fprintf (file, _("recbeg: name: %.*s\n"), name[0], name + 1);
+            evax_bfd_print_valspec (buf, 4, file);
+            fprintf (file, ("    len: %u bits\n"),
+                     (unsigned)bfd_getl32 (name + 1 + name[0]));
+          }
+          break;
+        case DST__K_RECEND:
+          fprintf (file, _("recend\n"));
+          break;
+        case DST__K_ENUMBEG:
+          fprintf (file, _("enumbeg, len: %u, name: %.*s\n"),
+                   buf[0], buf[1], buf + 2);
+          break;
+        case DST__K_ENUMELT:
+          fprintf (file, _("enumelt, name: %.*s\n"), buf[5], buf + 6);
+          evax_bfd_print_valspec (buf, 4, file);
+          break;
+        case DST__K_ENUMEND:
+          fprintf (file, _("enumend\n"));
+          break;
+        case DST__K_LABEL:
+          {
+            struct vms_dst_label *lab = (void *)buf;
+            fprintf (file, ("label, name: %.*s\n"),
+                     lab->name[0], lab->name + 1);
+            fprintf (file, ("    address: 0x%08x\n"),
+                     (unsigned)bfd_getl32 (lab->value));
+          }
+          break;
+        case DST__K_DIS_RANGE:
+          {
+            unsigned int cnt = bfd_getl32 (buf);
+            unsigned char *rng = buf + 4;
+            unsigned int i;
+
+            fprintf (file, _("discontiguous range (nbr: %u)\n"), cnt);
+            for (i = 0; i < cnt; i++, rng += 8)
+              fprintf (file, _("    address: 0x%08x, size: %u\n"),
+                       (unsigned)bfd_getl32 (rng),
+                       (unsigned)bfd_getl32 (rng + 4));
+
+          }
+          break;
+        case DST__K_LINE_NUM:
+          {
+            unsigned char *buf_orig = buf;
+
+            fprintf (file, _("line num  (len: %u)\n"), len);
+
+            while (len > 0)
+              {
+                signed char cmd;
+                unsigned char cmdlen;
+                unsigned int val;
+
+                cmd = buf[0];
+                cmdlen = 0;
+
+                fputs ("    ", file);
+
+                switch (cmd)
+                  {
+                  case DST__K_DELTA_PC_W:
+                    val = bfd_getl16 (buf + 1);
+                    fprintf (file, _("delta_pc_w %u\n"), val);
+                    pc += val;
+                    line++;
+                    cmdlen = 3;
+                    break;
+                  case DST__K_INCR_LINUM:
+                    val = buf[1];
+                    fprintf (file, _("incr_linum(b): +%u\n"), val);
+                    line += val;
+                    cmdlen = 2;
+                    break;
+                  case DST__K_INCR_LINUM_W:
+                    val = bfd_getl16 (buf + 1);
+                    fprintf (file, _("incr_linum_w: +%u\n"), val);
+                    line += val;
+                    cmdlen = 3;
+                    break;
+                  case DST__K_INCR_LINUM_L:
+                    val = bfd_getl32 (buf + 1);
+                    fprintf (file, _("incr_linum_l: +%u\n"), val);
+                    line += val;
+                    cmdlen = 5;
+                    break;
+                  case DST__K_SET_LINUM:
+                    line = bfd_getl16 (buf + 1);
+                    fprintf (file, _("set_line_num(w) %u\n"), line);
+                    cmdlen = 3;
+                    break;
+                  case DST__K_SET_LINUM_B:
+                    line = buf[1];
+                    fprintf (file, _("set_line_num_b %u\n"), line);
+                    cmdlen = 2;
+                    break;
+                  case DST__K_SET_LINUM_L:
+                    line = bfd_getl32 (buf + 1);
+                    fprintf (file, _("set_line_num_l %u\n"), line);
+                    cmdlen = 5;
+                    break;
+                  case DST__K_SET_ABS_PC:
+                    pc = bfd_getl32 (buf + 1);
+                    fprintf (file, _("set_abs_pc: 0x%08x\n"), pc);
+                    cmdlen = 5;
+                    break;
+                  case DST__K_DELTA_PC_L:
+                    fprintf (file, _("delta_pc_l: +0x%08x\n"),
+                             (unsigned)bfd_getl32 (buf + 1));
+                    cmdlen = 5;
+                    break;
+                  case DST__K_TERM:
+                    fprintf (file, _("term(b): 0x%02x"), buf[1]);
+                    pc += buf[1];
+                    fprintf (file, _("        pc: 0x%08x\n"), pc);
+                    cmdlen = 2;
+                    break;
+                  case DST__K_TERM_W:
+                    val = bfd_getl16 (buf + 1);
+                    fprintf (file, _("term_w: 0x%04x"), val);
+                    pc += val;
+                    fprintf (file, _("    pc: 0x%08x\n"), pc);
+                    cmdlen = 3;
+                    break;
+                  default:
+                    if (cmd <= 0)
+                      {
+                        fprintf (file, _("delta pc +%-4d"), -cmd);
+                        line++;  /* FIXME: curr increment.  */
+                        pc += -cmd;
+                        fprintf (file, _("    pc: 0x%08x line: %5u\n"),
+                                 pc, line);
+                        cmdlen = 1;
+                      }
+                    else
+                      fprintf (file, _("    *unhandled* cmd %u\n"), cmd);
+                    break;
+                  }
+                if (cmdlen == 0)
+                  break;
+                len -= cmdlen;
+                buf += cmdlen;
+              }
+            buf = buf_orig;
+          }
+          break;
+        case DST__K_SOURCE:
+          {
+            unsigned char *buf_orig = buf;
+
+            fprintf (file, _("source (len: %u)\n"), len);
+
+            while (len > 0)
+              {
+                signed char cmd = buf[0];
+                unsigned char cmdlen = 0;
+
+                switch (cmd)
+                  {
+                  case DST__K_SRC_DECLFILE:
+                    {
+                      struct vms_dst_src_decl_src *src = (void *)(buf + 1);
+                      const char *name;
+
+                      fprintf (file, _("   declfile: len: %u, flags: %u, "
+                                       "fileid: %u\n"),
+                               src->length, src->flags,
+                               (unsigned)bfd_getl16 (src->fileid));
+                      fprintf (file, _("   rms: cdt: 0x%08x %08x, "
+                                       "ebk: 0x%08x, ffb: 0x%04x, "
+                                       "rfo: %u\n"),
+                               (unsigned)bfd_getl32 (src->rms_cdt + 4),
+                               (unsigned)bfd_getl32 (src->rms_cdt + 0),
+                               (unsigned)bfd_getl32 (src->rms_ebk),
+                               (unsigned)bfd_getl16 (src->rms_ffb),
+                               src->rms_rfo);
+                      name = (const char *)buf + 1 + sizeof (*src);
+                      fprintf (file, _("   filename   : %.*s\n"),
+                               name[0], name + 1);
+                      name += name[0] + 1;
+                      fprintf (file, _("   module name: %.*s\n"),
+                               name[0], name + 1);
+                      cmdlen = 2 + src->length;
+                    }
+                    break;
+                  case DST__K_SRC_SETFILE:
+                    fprintf (file, _("   setfile %u\n"),
+                             (unsigned)bfd_getl16 (buf + 1));
+                    cmdlen = 3;
+                    break;
+                  case DST__K_SRC_SETREC_W:
+                    fprintf (file, _("   setrec %u\n"),
+                             (unsigned)bfd_getl16 (buf + 1));
+                    cmdlen = 3;
+                    break;
+                  case DST__K_SRC_SETREC_L:
+                    fprintf (file, _("   setrec %u\n"),
+                             (unsigned)bfd_getl32 (buf + 1));
+                    cmdlen = 5;
+                    break;
+                  case DST__K_SRC_SETLNUM_W:
+                    fprintf (file, _("   setlnum %u\n"),
+                             (unsigned)bfd_getl16 (buf + 1));
+                    cmdlen = 3;
+                    break;
+                  case DST__K_SRC_SETLNUM_L:
+                    fprintf (file, _("   setlnum %u\n"),
+                             (unsigned)bfd_getl32 (buf + 1));
+                    cmdlen = 5;
+                    break;
+                  case DST__K_SRC_DEFLINES_W:
+                    fprintf (file, _("   deflines %u\n"),
+                             (unsigned)bfd_getl16 (buf + 1));
+                    cmdlen = 3;
+                    break;
+                  case DST__K_SRC_DEFLINES_B:
+                    fprintf (file, _("   deflines %u\n"), buf[1]);
+                    cmdlen = 2;
+                    break;
+                  case DST__K_SRC_FORMFEED:
+                    fprintf (file, _("   formfeed\n"));
+                    cmdlen = 1;
+                    break;
+                  default:
+                    fprintf (file, _("   *unhandled* cmd %u\n"), cmd);
+                    break;
+                  }
+                if (cmdlen == 0)
+                  break;
+                len -= cmdlen;
+                buf += cmdlen;
+              }
+            buf = buf_orig;
+          }
+          break;
+        default:
+          fprintf (file, _("*unhandled* dst type %u\n"), type);
+          break;
+        }
+      free (buf);
+    }
+}
+
+static void
+evax_bfd_print_image (bfd *abfd, FILE *file)
+{
+  struct vms_eihd eihd;
+  const char *name;
+  unsigned int val;
+  unsigned int eiha_off;
+  unsigned int eihi_off;
+  unsigned int eihs_off;
+  unsigned int eisd_off;
+  unsigned int eihef_off = 0;
+  unsigned int eihnp_off = 0;
+  unsigned int dmt_vbn = 0;
+  unsigned int dmt_size = 0;
+  unsigned int dst_vbn = 0;
+  unsigned int dst_size = 0;
+  unsigned int gst_vbn = 0;
+  unsigned int gst_size = 0;
+  unsigned int eiaf_vbn = 0;
+  unsigned int eiaf_size = 0;
+  unsigned int eihvn_off;
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET)
+      || bfd_bread (&eihd, sizeof (eihd), abfd) != sizeof (eihd))
+    {
+      fprintf (file, _("cannot read EIHD\n"));
+      return;
+    }
+  fprintf (file, _("EIHD: (size: %u, nbr blocks: %u)\n"),
+           (unsigned)bfd_getl32 (eihd.size),
+           (unsigned)bfd_getl32 (eihd.hdrblkcnt));
+  fprintf (file, _(" majorid: %u, minorid: %u\n"),
+           (unsigned)bfd_getl32 (eihd.majorid),
+           (unsigned)bfd_getl32 (eihd.minorid));
+
+  val = (unsigned)bfd_getl32 (eihd.imgtype);
+  switch (val)
+    {
+    case EIHD__K_EXE:
+      name = _("executable");
+      break;
+    case EIHD__K_LIM:
+      name = _("linkable image");
+      break;
+    default:
+      name = _("unknown");
+      break;
+    }
+  fprintf (file, _(" image type: %u (%s)"), val, name);
+
+  val = (unsigned)bfd_getl32 (eihd.subtype);
+  switch (val)
+    {
+    case EIHD__C_NATIVE:
+      name = _("native");
+      break;
+    case EIHD__C_CLI:
+      name = _("CLI");
+      break;
+    default:
+      name = _("unknown");
+      break;
+    }
+  fprintf (file, _(", subtype: %u (%s)\n"), val, name);
+
+  eisd_off = bfd_getl32 (eihd.isdoff);
+  eiha_off = bfd_getl32 (eihd.activoff);
+  eihi_off = bfd_getl32 (eihd.imgidoff);
+  eihs_off = bfd_getl32 (eihd.symdbgoff);
+  fprintf (file, _(" offsets: isd: %u, activ: %u, symdbg: %u, "
+                   "imgid: %u, patch: %u\n"),
+           eisd_off, eiha_off, eihs_off, eihi_off,
+           (unsigned)bfd_getl32 (eihd.patchoff));
+  fprintf (file, _(" fixup info rva: "));
+  bfd_fprintf_vma (abfd, file, bfd_getl64 (eihd.iafva));
+  fprintf (file, _(", symbol vector rva: "));
+  bfd_fprintf_vma (abfd, file, bfd_getl64 (eihd.symvva));
+  eihvn_off = bfd_getl32 (eihd.version_array_off);
+  fprintf (file, _("\n"
+                   " version array off: %u\n"),
+           eihvn_off);
+  fprintf (file,
+           _(" img I/O count: %u, nbr channels: %u, req pri: %08x%08x\n"),
+           (unsigned)bfd_getl32 (eihd.imgiocnt),
+           (unsigned)bfd_getl32 (eihd.iochancnt),
+           (unsigned)bfd_getl32 (eihd.privreqs + 4),
+           (unsigned)bfd_getl32 (eihd.privreqs + 0));
+  val = (unsigned)bfd_getl32 (eihd.lnkflags);
+  fprintf (file, _(" linker flags: %08x:"), val);
+  if (val & EIHD__M_LNKDEBUG)
+    fprintf (file, " LNKDEBUG");
+  if (val & EIHD__M_LNKNOTFR)
+    fprintf (file, " LNKNOTFR");
+  if (val & EIHD__M_NOP0BUFS)
+    fprintf (file, " NOP0BUFS");
+  if (val & EIHD__M_PICIMG)
+    fprintf (file, " PICIMG");
+  if (val & EIHD__M_P0IMAGE)
+    fprintf (file, " P0IMAGE");
+  if (val & EIHD__M_DBGDMT)
+    fprintf (file, " DBGDMT");
+  if (val & EIHD__M_INISHR)
+    fprintf (file, " INISHR");
+  if (val & EIHD__M_XLATED)
+    fprintf (file, " XLATED");
+  if (val & EIHD__M_BIND_CODE_SEC)
+    fprintf (file, " BIND_CODE_SEC");
+  if (val & EIHD__M_BIND_DATA_SEC)
+    fprintf (file, " BIND_DATA_SEC");
+  if (val & EIHD__M_MKTHREADS)
+    fprintf (file, " MKTHREADS");
+  if (val & EIHD__M_UPCALLS)
+    fprintf (file, " UPCALLS");
+  if (val & EIHD__M_OMV_READY)
+    fprintf (file, " OMV_READY");
+  if (val & EIHD__M_EXT_BIND_SECT)
+    fprintf (file, " EXT_BIND_SECT");
+  fprintf (file, "\n");
+  fprintf (file, _(" ident: 0x%08x, sysver: 0x%08x, "
+                   "match ctrl: %u, symvect_size: %u\n"),
+           (unsigned)bfd_getl32 (eihd.ident),
+           (unsigned)bfd_getl32 (eihd.sysver),
+           eihd.matchctl,
+           (unsigned)bfd_getl32 (eihd.symvect_size));
+  fprintf (file, _(" BPAGE: %u"),
+           (unsigned)bfd_getl32 (eihd.virt_mem_block_size));
+  if (val & (EIHD__M_OMV_READY | EIHD__M_EXT_BIND_SECT))
+    {
+      eihef_off = bfd_getl32 (eihd.ext_fixup_off);
+      eihnp_off = bfd_getl32 (eihd.noopt_psect_off);
+      fprintf (file, _(", ext fixup offset: %u, no_opt psect off: %u"),
+               eihef_off, eihnp_off);
+    }
+  fprintf (file, _(", alias: %u\n"), (unsigned)bfd_getl16 (eihd.alias));
+
+  if (eihvn_off != 0)
+    {
+      struct vms_eihvn eihvn;
+      unsigned int mask;
+      unsigned int j;
+
+      fprintf (file, _("system version array information:\n"));
+      if (bfd_seek (abfd, (file_ptr) eihvn_off, SEEK_SET)
+          || bfd_bread (&eihvn, sizeof (eihvn), abfd) != sizeof (eihvn))
+        {
+          fprintf (file, _("cannot read EIHVN header\n"));
+          return;
+        }
+      mask = bfd_getl32 (eihvn.subsystem_mask);
+      for (j = 0; j < 32; j++)
+        if (mask & (1 << j))
+          {
+            struct vms_eihvn_subversion ver;
+            if (bfd_bread (&ver, sizeof (ver), abfd) != sizeof (ver))
+              {
+                fprintf (file, _("cannot read EIHVN version\n"));
+                return;
+              }
+            fprintf (file, _("   %02u "), j);
+            switch (j)
+              {
+              case EIHVN__BASE_IMAGE_BIT:
+		fputs (_("BASE_IMAGE       "), file);
+                break;
+              case EIHVN__MEMORY_MANAGEMENT_BIT:
+                fputs (_("MEMORY_MANAGEMENT"), file);
+                break;
+              case EIHVN__IO_BIT:
+                fputs (_("IO               "), file);
+                break;
+              case EIHVN__FILES_VOLUMES_BIT:
+                fputs (_("FILES_VOLUMES    "), file);
+                break;
+              case EIHVN__PROCESS_SCHED_BIT:
+                fputs (_("PROCESS_SCHED    "), file);
+                break;
+              case EIHVN__SYSGEN_BIT:
+		fputs (_("SYSGEN           "), file);
+                break;
+              case EIHVN__CLUSTERS_LOCKMGR_BIT:
+                fputs (_("CLUSTERS_LOCKMGR "), file);
+                break;
+              case EIHVN__LOGICAL_NAMES_BIT:
+                fputs (_("LOGICAL_NAMES    "), file);
+                break;
+              case EIHVN__SECURITY_BIT:
+		fputs (_("SECURITY         "), file);
+                break;
+              case EIHVN__IMAGE_ACTIVATOR_BIT:
+                fputs (_("IMAGE_ACTIVATOR  "), file);
+                break;
+              case EIHVN__NETWORKS_BIT:
+		fputs (_("NETWORKS         "), file);
+                break;
+              case EIHVN__COUNTERS_BIT:
+		fputs (_("COUNTERS         "), file);
+                break;
+              case EIHVN__STABLE_BIT:
+		fputs (_("STABLE           "), file);
+                break;
+              case EIHVN__MISC_BIT:
+                fputs (_("MISC             "), file);
+                break;
+              case EIHVN__CPU_BIT:
+                fputs (_("CPU              "), file);
+                break;
+              case EIHVN__VOLATILE_BIT:
+		fputs (_("VOLATILE         "), file);
+                break;
+              case EIHVN__SHELL_BIT:
+		fputs (_("SHELL            "), file);
+                break;
+              case EIHVN__POSIX_BIT:
+		fputs (_("POSIX            "), file);
+                break;
+              case EIHVN__MULTI_PROCESSING_BIT:
+                fputs (_("MULTI_PROCESSING "), file);
+                break;
+              case EIHVN__GALAXY_BIT:
+		fputs (_("GALAXY           "), file);
+                break;
+              default:
+                fputs (_("*unknown*        "), file);
+                break;
+              }
+            fprintf (file, _(": %u.%u\n"),
+                     (unsigned)bfd_getl16 (ver.major),
+                     (unsigned)bfd_getl16 (ver.minor));
+          }
+    }
+
+  if (eiha_off != 0)
+    {
+      struct vms_eiha eiha;
+
+      if (bfd_seek (abfd, (file_ptr) eiha_off, SEEK_SET)
+          || bfd_bread (&eiha, sizeof (eiha), abfd) != sizeof (eiha))
+        {
+          fprintf (file, _("cannot read EIHA\n"));
+          return;
+        }
+      fprintf (file, _("Image activation:  (size=%u)\n"),
+               (unsigned)bfd_getl32 (eiha.size));
+      fprintf (file, _(" First address : 0x%08x 0x%08x\n"),
+               (unsigned)bfd_getl32 (eiha.tfradr1_h),
+               (unsigned)bfd_getl32 (eiha.tfradr1));
+      fprintf (file, _(" Second address: 0x%08x 0x%08x\n"),
+               (unsigned)bfd_getl32 (eiha.tfradr2_h),
+               (unsigned)bfd_getl32 (eiha.tfradr2));
+      fprintf (file, _(" Third address : 0x%08x 0x%08x\n"),
+               (unsigned)bfd_getl32 (eiha.tfradr3_h),
+               (unsigned)bfd_getl32 (eiha.tfradr3));
+      fprintf (file, _(" Fourth address: 0x%08x 0x%08x\n"),
+               (unsigned)bfd_getl32 (eiha.tfradr4_h),
+               (unsigned)bfd_getl32 (eiha.tfradr4));
+      fprintf (file, _(" Shared image  : 0x%08x 0x%08x\n"),
+               (unsigned)bfd_getl32 (eiha.inishr_h),
+               (unsigned)bfd_getl32 (eiha.inishr));
+    }
+  if (eihi_off != 0)
+    {
+      struct vms_eihi eihi;
+
+      if (bfd_seek (abfd, (file_ptr) eihi_off, SEEK_SET)
+          || bfd_bread (&eihi, sizeof (eihi), abfd) != sizeof (eihi))
+        {
+          fprintf (file, _("cannot read EIHI\n"));
+          return;
+        }
+      fprintf (file, _("Image identification: (major: %u, minor: %u)\n"),
+               (unsigned)bfd_getl32 (eihi.majorid),
+               (unsigned)bfd_getl32 (eihi.minorid));
+      fprintf (file, _(" image name       : %.*s\n"),
+               eihi.imgnam[0], eihi.imgnam + 1);
+      fprintf (file, _(" link time        : %s\n"),
+               vms_time_to_str (eihi.linktime));
+      fprintf (file, _(" image ident      : %.*s\n"),
+               eihi.imgid[0], eihi.imgid + 1);
+      fprintf (file, _(" linker ident     : %.*s\n"),
+               eihi.linkid[0], eihi.linkid + 1);
+      fprintf (file, _(" image build ident: %.*s\n"),
+               eihi.imgbid[0], eihi.imgbid + 1);
+    }
+  if (eihs_off != 0)
+    {
+      struct vms_eihs eihs;
+
+      if (bfd_seek (abfd, (file_ptr) eihs_off, SEEK_SET)
+          || bfd_bread (&eihs, sizeof (eihs), abfd) != sizeof (eihs))
+        {
+          fprintf (file, _("cannot read EIHS\n"));
+          return;
+        }
+      fprintf (file, _("Image symbol & debug table: (major: %u, minor: %u)\n"),
+               (unsigned)bfd_getl32 (eihs.majorid),
+               (unsigned)bfd_getl32 (eihs.minorid));
+      dst_vbn = bfd_getl32 (eihs.dstvbn);
+      dst_size = bfd_getl32 (eihs.dstsize);
+      fprintf (file, _(" debug symbol table : vbn: %u, size: %u (0x%x)\n"),
+               dst_vbn, dst_size, dst_size);
+      gst_vbn = bfd_getl32 (eihs.gstvbn);
+      gst_size = bfd_getl32 (eihs.gstsize);
+      fprintf (file, _(" global symbol table: vbn: %u, records: %u\n"),
+               gst_vbn, gst_size);
+      dmt_vbn = bfd_getl32 (eihs.dmtvbn);
+      dmt_size = bfd_getl32 (eihs.dmtsize);
+      fprintf (file, _(" debug module table : vbn: %u, size: %u\n"),
+               dmt_vbn, dmt_size);
+    }
+  while (eisd_off != 0)
+    {
+      struct vms_eisd eisd;
+      unsigned int len;
+
+      while (1)
+        {
+          if (bfd_seek (abfd, (file_ptr) eisd_off, SEEK_SET)
+              || bfd_bread (&eisd, sizeof (eisd), abfd) != sizeof (eisd))
+            {
+              fprintf (file, _("cannot read EISD\n"));
+              return;
+            }
+          len = (unsigned)bfd_getl32 (eisd.eisdsize);
+          if (len != (unsigned)-1)
+            break;
+
+          /* Next block.  */
+          eisd_off = (eisd_off + VMS_BLOCK_SIZE) & ~(VMS_BLOCK_SIZE - 1);
+        }
+      fprintf (file, _("Image section descriptor: (major: %u, minor: %u, "
+                       "size: %u, offset: %u)\n"),
+               (unsigned)bfd_getl32 (eisd.majorid),
+               (unsigned)bfd_getl32 (eisd.minorid),
+               len, eisd_off);
+      if (len == 0)
+        break;
+      fprintf (file, _(" section: base: 0x%08x%08x size: 0x%08x\n"),
+               (unsigned)bfd_getl32 (eisd.virt_addr + 4),
+               (unsigned)bfd_getl32 (eisd.virt_addr + 0),
+               (unsigned)bfd_getl32 (eisd.secsize));
+      val = (unsigned)bfd_getl32 (eisd.flags);
+      fprintf (file, _(" flags: 0x%04x"), val);
+      if (val & EISD__M_GBL)
+        fprintf (file, " GBL");
+      if (val & EISD__M_CRF)
+        fprintf (file, " CRF");
+      if (val & EISD__M_DZRO)
+        fprintf (file, " DZRO");
+      if (val & EISD__M_WRT)
+        fprintf (file, " WRT");
+      if (val & EISD__M_INITALCODE)
+	fprintf (file, " INITALCODE");
+      if (val & EISD__M_BASED)
+        fprintf (file, " BASED");
+      if (val & EISD__M_FIXUPVEC)
+	fprintf (file, " FIXUPVEC");
+      if (val & EISD__M_RESIDENT)
+	fprintf (file, " RESIDENT");
+      if (val & EISD__M_VECTOR)
+        fprintf (file, " VECTOR");
+      if (val & EISD__M_PROTECT)
+	fprintf (file, " PROTECT");
+      if (val & EISD__M_LASTCLU)
+	fprintf (file, " LASTCLU");
+      if (val & EISD__M_EXE)
+        fprintf (file, " EXE");
+      if (val & EISD__M_NONSHRADR)
+	fprintf (file, " NONSHRADR");
+      if (val & EISD__M_QUAD_LENGTH)
+	fprintf (file, " QUAD_LENGTH");
+      if (val & EISD__M_ALLOC_64BIT)
+	fprintf (file, " ALLOC_64BIT");
+      fprintf (file, "\n");
+      if (val & EISD__M_FIXUPVEC)
+        {
+          eiaf_vbn = bfd_getl32 (eisd.vbn);
+          eiaf_size = bfd_getl32 (eisd.secsize);
+        }
+      fprintf (file, _(" vbn: %u, pfc: %u, matchctl: %u type: %u ("),
+               (unsigned)bfd_getl32 (eisd.vbn),
+               eisd.pfc, eisd.matchctl, eisd.type);
+      switch (eisd.type)
+        {
+        case EISD__K_NORMAL:
+          fputs (_("NORMAL"), file);
+          break;
+        case EISD__K_SHRFXD:
+          fputs (_("SHRFXD"), file);
+          break;
+        case EISD__K_PRVFXD:
+          fputs (_("PRVFXD"), file);
+          break;
+        case EISD__K_SHRPIC:
+          fputs (_("SHRPIC"), file);
+          break;
+        case EISD__K_PRVPIC:
+          fputs (_("PRVPIC"), file);
+          break;
+        case EISD__K_USRSTACK:
+          fputs (_("USRSTACK"), file);
+          break;
+        default:
+          fputs (_("*unknown*"), file);
+          break;
+        }
+      fputs (_(")\n"), file);
+      if (val & EISD__M_GBL)
+        fprintf (file, _(" ident: 0x%08x, name: %.*s\n"),
+                 (unsigned)bfd_getl32 (eisd.ident),
+                 eisd.gblnam[0], eisd.gblnam + 1);
+      eisd_off += len;
+    }
+
+  if (dmt_vbn != 0)
+    {
+      if (bfd_seek (abfd, (file_ptr) (dmt_vbn - 1) * VMS_BLOCK_SIZE, SEEK_SET))
+        {
+          fprintf (file, _("cannot read DMT\n"));
+          return;
+        }
+
+      fprintf (file, _("Debug module table:\n"));
+
+      while (dmt_size > 0)
+        {
+          struct vms_dmt_header dmth;
+          unsigned int count;
+
+          if (bfd_bread (&dmth, sizeof (dmth), abfd) != sizeof (dmth))
+            {
+              fprintf (file, _("cannot read DMT header\n"));
+              return;
+            }
+          count = bfd_getl16 (dmth.psect_count);
+          fprintf (file,
+                   _(" module offset: 0x%08x, size: 0x%08x, (%u psects)\n"),
+                   (unsigned)bfd_getl32 (dmth.modbeg),
+                   (unsigned)bfd_getl32 (dmth.size), count);
+          dmt_size -= sizeof (dmth);
+          while (count > 0)
+            {
+              struct vms_dmt_psect dmtp;
+
+              if (bfd_bread (&dmtp, sizeof (dmtp), abfd) != sizeof (dmtp))
+                {
+                  fprintf (file, _("cannot read DMT psect\n"));
+                  return;
+                }
+              fprintf (file, _("  psect start: 0x%08x, length: %u\n"),
+                       (unsigned)bfd_getl32 (dmtp.start),
+                       (unsigned)bfd_getl32 (dmtp.length));
+              count--;
+              dmt_size -= sizeof (dmtp);
+            }
+        }
+    }
+
+  if (dst_vbn != 0)
+    {
+      if (bfd_seek (abfd, (file_ptr) (dst_vbn - 1) * VMS_BLOCK_SIZE, SEEK_SET))
+        {
+          fprintf (file, _("cannot read DST\n"));
+          return;
+        }
+
+      evax_bfd_print_dst (abfd, dst_size, file);
+    }
+  if (gst_vbn != 0)
+    {
+      if (bfd_seek (abfd, (file_ptr) (gst_vbn - 1) * VMS_BLOCK_SIZE, SEEK_SET))
+        {
+          fprintf (file, _("cannot read GST\n"));
+          return;
+        }
+
+      fprintf (file, _("Global symbol table:\n"));
+      evax_bfd_print_eobj (abfd, file);
+    }
+  if (eiaf_vbn != 0)
+    {
+      unsigned char *buf;
+      struct vms_eiaf *eiaf;
+      unsigned int qrelfixoff;
+      unsigned int lrelfixoff;
+      unsigned int qdotadroff;
+      unsigned int ldotadroff;
+      unsigned int shrimgcnt;
+      unsigned int shlstoff;
+      unsigned int codeadroff;
+      unsigned int lpfixoff;
+      unsigned int chgprtoff;
+
+      buf = bfd_malloc (eiaf_size);
+
+      if (bfd_seek (abfd, (file_ptr) (eiaf_vbn - 1) * VMS_BLOCK_SIZE, SEEK_SET)
+          || bfd_bread (buf, eiaf_size, abfd) != eiaf_size)
+        {
+          fprintf (file, _("cannot read EIHA\n"));
+          free (buf);
+          return;
+        }
+      eiaf = (struct vms_eiaf *)buf;
+      fprintf (file,
+               _("Image activator fixup: (major: %u, minor: %u)\n"),
+               (unsigned)bfd_getl32 (eiaf->majorid),
+               (unsigned)bfd_getl32 (eiaf->minorid));
+      fprintf (file, _("  iaflink : 0x%08x %08x\n"),
+               (unsigned)bfd_getl32 (eiaf->iaflink + 0),
+               (unsigned)bfd_getl32 (eiaf->iaflink + 4));
+      fprintf (file, _("  fixuplnk: 0x%08x %08x\n"),
+               (unsigned)bfd_getl32 (eiaf->fixuplnk + 0),
+               (unsigned)bfd_getl32 (eiaf->fixuplnk + 4));
+      fprintf (file, _("  size : %u\n"),
+               (unsigned)bfd_getl32 (eiaf->size));
+      fprintf (file, _("  flags: 0x%08x\n"),
+               (unsigned)bfd_getl32 (eiaf->flags));
+      qrelfixoff = bfd_getl32 (eiaf->qrelfixoff);
+      lrelfixoff = bfd_getl32 (eiaf->lrelfixoff);
+      fprintf (file, _("  qrelfixoff: %5u, lrelfixoff: %5u\n"),
+               qrelfixoff, lrelfixoff);
+      qdotadroff = bfd_getl32 (eiaf->qdotadroff);
+      ldotadroff = bfd_getl32 (eiaf->ldotadroff);
+      fprintf (file, _("  qdotadroff: %5u, ldotadroff: %5u\n"),
+               qdotadroff, ldotadroff);
+      codeadroff = bfd_getl32 (eiaf->codeadroff);
+      lpfixoff = bfd_getl32 (eiaf->lpfixoff);
+      fprintf (file, _("  codeadroff: %5u, lpfixoff  : %5u\n"),
+               codeadroff, lpfixoff);
+      chgprtoff = bfd_getl32 (eiaf->chgprtoff);
+      fprintf (file, _("  chgprtoff : %5u\n"), chgprtoff);
+      shrimgcnt = bfd_getl32 (eiaf->shrimgcnt);
+      shlstoff = bfd_getl32 (eiaf->shlstoff);
+      fprintf (file, _("  shlstoff  : %5u, shrimgcnt : %5u\n"),
+               shlstoff, shrimgcnt);
+      fprintf (file, _("  shlextra  : %5u, permctx   : %5u\n"),
+               (unsigned)bfd_getl32 (eiaf->shlextra),
+               (unsigned)bfd_getl32 (eiaf->permctx));
+      fprintf (file, _("  base_va : 0x%08x\n"),
+               (unsigned)bfd_getl32 (eiaf->base_va));
+      fprintf (file, _("  lppsbfixoff: %5u\n"),
+               (unsigned)bfd_getl32 (eiaf->lppsbfixoff));
+
+      if (shlstoff)
+        {
+          struct vms_shl *shl = (struct vms_shl *)(buf + shlstoff);
+          unsigned int j;
+
+          fprintf (file, _(" Shareable images:\n"));
+          for (j = 0; j < shrimgcnt; j++, shl++)
+            {
+              fprintf (file,
+                       _("  %u: size: %u, flags: 0x%02x, name: %.*s\n"),
+                       j, shl->size, shl->flags,
+                       shl->imgnam[0], shl->imgnam + 1);
+            }
+        }
+      if (qrelfixoff != 0)
+        {
+          fprintf (file, _(" quad-word relocation fixups:\n"));
+          evax_bfd_print_relocation_records (file, buf + qrelfixoff, 8);
+        }
+      if (lrelfixoff != 0)
+        {
+          fprintf (file, _(" long-word relocation fixups:\n"));
+          evax_bfd_print_relocation_records (file, buf + lrelfixoff, 4);
+        }
+      if (qdotadroff != 0)
+        {
+          fprintf (file, _(" quad-word .address reference fixups:\n"));
+          evax_bfd_print_address_fixups (file, buf + qdotadroff);
+        }
+      if (ldotadroff != 0)
+        {
+          fprintf (file, _(" long-word .address reference fixups:\n"));
+          evax_bfd_print_address_fixups (file, buf + ldotadroff);
+        }
+      if (codeadroff != 0)
+        {
+          fprintf (file, _(" Code Address Reference Fixups:\n"));
+          evax_bfd_print_reference_fixups (file, buf + codeadroff);
+        }
+      if (lpfixoff != 0)
+        {
+          fprintf (file, _(" Linkage Pairs Referece Fixups:\n"));
+          evax_bfd_print_reference_fixups (file, buf + lpfixoff);
+        }
+      if (chgprtoff)
+        {
+          unsigned int count = (unsigned)bfd_getl32 (buf + chgprtoff);
+          struct vms_eicp *eicp = (struct vms_eicp *)(buf + chgprtoff + 4);
+          unsigned int j;
+
+          fprintf (file, _(" Change Protection (%u entries):\n"), count);
+          for (j = 0; j < count; j++, eicp++)
+            {
+              unsigned int prot = bfd_getl32 (eicp->newprt);
+              fprintf (file,
+                       _("  base: 0x%08x %08x, size: 0x%08x, prot: 0x%08x "),
+                       (unsigned)bfd_getl32 (eicp->baseva + 4),
+                       (unsigned)bfd_getl32 (eicp->baseva + 0),
+                       (unsigned)bfd_getl32 (eicp->size),
+                       (unsigned)bfd_getl32 (eicp->newprt));
+              switch (prot)
+                {
+                case PRT__C_NA:
+                  fprintf (file, "NA");
+                  break;
+                case PRT__C_RESERVED:
+                  fprintf (file, "RES");
+                  break;
+                case PRT__C_KW:
+                  fprintf (file, "KW");
+                  break;
+                case PRT__C_KR:
+                  fprintf (file, "KR");
+                  break;
+                case PRT__C_UW:
+                  fprintf (file, "UW");
+                  break;
+                case PRT__C_EW:
+                  fprintf (file, "EW");
+                  break;
+                case PRT__C_ERKW:
+                  fprintf (file, "ERKW");
+                  break;
+                case PRT__C_ER:
+                  fprintf (file, "ER");
+                  break;
+                case PRT__C_SW:
+                  fprintf (file, "SW");
+                  break;
+                case PRT__C_SREW:
+                  fprintf (file, "SREW");
+                  break;
+                case PRT__C_SRKW:
+                  fprintf (file, "SRKW");
+                  break;
+                case PRT__C_SR:
+                  fprintf (file, "SR");
+                  break;
+                case PRT__C_URSW:
+                  fprintf (file, "URSW");
+                  break;
+                case PRT__C_UREW:
+                  fprintf (file, "UREW");
+                  break;
+                case PRT__C_URKW:
+                  fprintf (file, "URKW");
+                  break;
+                case PRT__C_UR:
+                  fprintf (file, "UR");
+                  break;
+                default:
+                  fputs ("??", file);
+                  break;
+                }
+              fputc ('\n', file);
+            }
+        }
+      free (buf);
+    }
+}
+
+static bfd_boolean
+vms_bfd_print_private_bfd_data (bfd *abfd, void *ptr)
+{
+  FILE *file = (FILE *)ptr;
+
+  if (bfd_get_file_flags (abfd) & (EXEC_P | DYNAMIC))
+    evax_bfd_print_image (abfd, file);
+  else
+    {
+      if (bfd_seek (abfd, 0, SEEK_SET))
+        return FALSE;
+      evax_bfd_print_eobj (abfd, file);
+    }
+  return TRUE;
+}
+
+/* Linking.  */
+
+/* Slurp ETIR/EDBG/ETBT VMS object records.  */
+
+static bfd_boolean
+alpha_vms_read_sections_content (bfd *abfd, struct bfd_link_info *info)
+{
+  asection *cur_section;
+  file_ptr cur_offset;
+  asection *dst_section;
+  file_ptr dst_offset;
+
+  if (bfd_seek (abfd, 0, SEEK_SET) != 0)
+    return FALSE;
+
+  cur_section = NULL;
+  cur_offset = 0;
+
+  dst_section = PRIV (dst_section);
+  dst_offset = 0;
+  if (info)
+    {
+      if (info->strip == strip_all || info->strip == strip_debugger)
+        {
+          /* Discard the DST section.  */
+          dst_offset = 0;
+          dst_section = NULL;
+        }
+      else if (dst_section)
+        {
+          dst_offset = dst_section->output_offset;
+          dst_section = dst_section->output_section;
+        }
+    }
+
+  while (1)
+    {
+      int type;
+      bfd_boolean res;
+
+      type = _bfd_vms_get_object_record (abfd);
+      if (type < 0)
+	{
+	  vms_debug2 ((2, "next_record failed\n"));
+	  return FALSE;
+	}
+      switch (type)
+        {
+        case EOBJ__C_ETIR:
+          PRIV (image_section) = cur_section;
+          PRIV (image_offset) = cur_offset;
+          res = _bfd_vms_slurp_etir (abfd, info);
+          cur_section = PRIV (image_section);
+          cur_offset = PRIV (image_offset);
+          break;
+        case EOBJ__C_EDBG:
+        case EOBJ__C_ETBT:
+          if (dst_section == NULL)
+            continue;
+          PRIV (image_section) = dst_section;
+          PRIV (image_offset) = dst_offset;
+          res = _bfd_vms_slurp_etir (abfd, info);
+          dst_offset = PRIV (image_offset);
+          break;
+        case EOBJ__C_EEOM:
+          return TRUE;
+        default:
+          continue;
+        }
+      if (!res)
+        {
+          vms_debug2 ((2, "slurp eobj type %d failed\n", type));
+          return FALSE;
+        }
+    }
+}
+
+static int
+alpha_vms_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+                          struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+/* Add a linkage pair fixup at address SECT + OFFSET to SHLIB. */
+
+static void
+alpha_vms_add_fixup_lp (struct bfd_link_info *info, bfd *src, bfd *shlib)
+{
+  struct alpha_vms_shlib_el *sl;
+  asection *sect = PRIV2 (src, image_section);
+  file_ptr offset = PRIV2 (src, image_offset);
+
+  sl = &VEC_EL (alpha_vms_link_hash (info)->shrlibs,
+                struct alpha_vms_shlib_el, PRIV2 (shlib, shr_index));
+  sl->has_fixups = TRUE;
+  VEC_APPEND_EL (sl->lp, bfd_vma,
+                 sect->output_section->vma + sect->output_offset + offset);
+  sect->output_section->flags |= SEC_RELOC;
+}
+
+/* Add a code address fixup at address SECT + OFFSET to SHLIB. */
+
+static void
+alpha_vms_add_fixup_ca (struct bfd_link_info *info, bfd *src, bfd *shlib)
+{
+  struct alpha_vms_shlib_el *sl;
+  asection *sect = PRIV2 (src, image_section);
+  file_ptr offset = PRIV2 (src, image_offset);
+
+  sl = &VEC_EL (alpha_vms_link_hash (info)->shrlibs,
+                struct alpha_vms_shlib_el, PRIV2 (shlib, shr_index));
+  sl->has_fixups = TRUE;
+  VEC_APPEND_EL (sl->ca, bfd_vma,
+                 sect->output_section->vma + sect->output_offset + offset);
+  sect->output_section->flags |= SEC_RELOC;
+}
+
+/* Add a quad word relocation fixup at address SECT + OFFSET to SHLIB. */
+
+static void
+alpha_vms_add_fixup_qr (struct bfd_link_info *info, bfd *src,
+                        bfd *shlib, bfd_vma vec)
+{
+  struct alpha_vms_shlib_el *sl;
+  struct alpha_vms_vma_ref *r;
+  asection *sect = PRIV2 (src, image_section);
+  file_ptr offset = PRIV2 (src, image_offset);
+
+  sl = &VEC_EL (alpha_vms_link_hash (info)->shrlibs,
+                struct alpha_vms_shlib_el, PRIV2 (shlib, shr_index));
+  sl->has_fixups = TRUE;
+  r = VEC_APPEND (sl->qr, struct alpha_vms_vma_ref);
+  r->vma = sect->output_section->vma + sect->output_offset + offset;
+  r->ref = vec;
+  sect->output_section->flags |= SEC_RELOC;
+}
+
+static void
+alpha_vms_add_fixup_lr (struct bfd_link_info *info ATTRIBUTE_UNUSED,
+                        unsigned int shr ATTRIBUTE_UNUSED,
+                        bfd_vma vec ATTRIBUTE_UNUSED)
+{
+  /* Not yet supported.  */
+  abort ();
+}
+
+/* Add relocation.  FIXME: Not yet emitted.  */
+
+static void
+alpha_vms_add_lw_reloc (struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+}
+
+static void
+alpha_vms_add_qw_reloc (struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+}
+
+static struct bfd_hash_entry *
+alpha_vms_link_hash_newfunc (struct bfd_hash_entry *entry,
+                             struct bfd_hash_table *table,
+                             const char *string)
+{
+  struct alpha_vms_link_hash_entry *ret =
+    (struct alpha_vms_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = ((struct alpha_vms_link_hash_entry *)
+	   bfd_hash_allocate (table,
+                              sizeof (struct alpha_vms_link_hash_entry)));
+  if (ret == NULL)
+    return NULL;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct alpha_vms_link_hash_entry *)
+	 _bfd_link_hash_newfunc ((struct bfd_hash_entry *) ret,
+				 table, string));
+
+  ret->sym = NULL;
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Create an Alpha/VMS link hash table.  */
+
+static struct bfd_link_hash_table *
+alpha_vms_bfd_link_hash_table_create (bfd *abfd)
+{
+  struct alpha_vms_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct alpha_vms_link_hash_table);
+
+  ret = (struct alpha_vms_link_hash_table *) bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+  if (!_bfd_link_hash_table_init (&ret->root, abfd,
+				  alpha_vms_link_hash_newfunc,
+				  sizeof (struct alpha_vms_link_hash_entry)))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  VEC_INIT (ret->shrlibs);
+  ret->fixup = NULL;
+
+  return &ret->root;
+}
+
+static bfd_boolean
+alpha_vms_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  unsigned int i;
+
+  for (i = 0; i < PRIV (gsd_sym_count); i++)
+    {
+      struct vms_symbol_entry *e = PRIV (syms)[i];
+      struct alpha_vms_link_hash_entry *h;
+      struct bfd_link_hash_entry *h_root;
+      asymbol sym;
+
+      if (!alpha_vms_convert_symbol (abfd, e, &sym))
+        return FALSE;
+
+      if ((e->flags & EGSY__V_DEF) && abfd->selective_search)
+        {
+          /* In selective_search mode, only add definition that are
+             required.  */
+          h = (struct alpha_vms_link_hash_entry *)bfd_link_hash_lookup
+            (info->hash, sym.name, FALSE, FALSE, FALSE);
+          if (h == NULL || h->root.type != bfd_link_hash_undefined)
+            continue;
+        }
+      else
+        h = NULL;
+
+      h_root = (struct bfd_link_hash_entry *) h;
+      if (_bfd_generic_link_add_one_symbol
+          (info, abfd, sym.name, sym.flags, sym.section, sym.value,
+           NULL, FALSE, FALSE, &h_root) == FALSE)
+        return FALSE;
+      h = (struct alpha_vms_link_hash_entry *) h_root;
+
+      if ((e->flags & EGSY__V_DEF)
+          && h->sym == NULL
+          && abfd->xvec == info->output_bfd->xvec)
+        h->sym = e;
+    }
+
+  if (abfd->flags & DYNAMIC)
+    {
+      struct alpha_vms_shlib_el *shlib;
+
+      /* We do not want to include any of the sections in a dynamic
+         object in the output file.  See comment in elflink.c.  */
+      bfd_section_list_clear (abfd);
+
+      shlib = VEC_APPEND (alpha_vms_link_hash (info)->shrlibs,
+                          struct alpha_vms_shlib_el);
+      shlib->abfd = abfd;
+      VEC_INIT (shlib->ca);
+      VEC_INIT (shlib->lp);
+      VEC_INIT (shlib->qr);
+      PRIV (shr_index) = VEC_COUNT (alpha_vms_link_hash (info)->shrlibs) - 1;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+alpha_vms_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  int pass;
+  struct bfd_link_hash_entry **pundef;
+  struct bfd_link_hash_entry **next_pundef;
+
+  /* We only accept VMS libraries.  */
+  if (info->output_bfd->xvec != abfd->xvec)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+
+  /* The archive_pass field in the archive itself is used to
+     initialize PASS, since we may search the same archive multiple
+     times.  */
+  pass = ++abfd->archive_pass;
+
+  /* Look through the list of undefined symbols.  */
+  for (pundef = &info->hash->undefs; *pundef != NULL; pundef = next_pundef)
+    {
+      struct bfd_link_hash_entry *h;
+      symindex symidx;
+      bfd *element;
+      bfd *orig_element;
+
+      h = *pundef;
+      next_pundef = &(*pundef)->u.undef.next;
+
+      /* When a symbol is defined, it is not necessarily removed from
+	 the list.  */
+      if (h->type != bfd_link_hash_undefined
+	  && h->type != bfd_link_hash_common)
+	{
+	  /* Remove this entry from the list, for general cleanliness
+	     and because we are going to look through the list again
+	     if we search any more libraries.  We can't remove the
+	     entry if it is the tail, because that would lose any
+	     entries we add to the list later on.  */
+	  if (*pundef != info->hash->undefs_tail)
+            {
+              *pundef = *next_pundef;
+              next_pundef = pundef;
+            }
+	  continue;
+	}
+
+      /* Look for this symbol in the archive hash table.  */
+      symidx = _bfd_vms_lib_find_symbol (abfd, h->root.string);
+      if (symidx == BFD_NO_MORE_SYMBOLS)
+	{
+	  /* Nothing in this slot.  */
+	  continue;
+	}
+
+      element = bfd_get_elt_at_index (abfd, symidx);
+      if (element == NULL)
+	return FALSE;
+
+      if (element->archive_pass == -1 || element->archive_pass == pass)
+        {
+          /* Next symbol if this archive is wrong or already handled.  */
+          continue;
+        }
+
+      if (! bfd_check_format (element, bfd_object))
+        {
+          element->archive_pass = -1;
+          return FALSE;
+        }
+
+      orig_element = element;
+      if (bfd_is_thin_archive (abfd))
+        {
+          element = _bfd_vms_lib_get_imagelib_file (element);
+          if (element == NULL || !bfd_check_format (element, bfd_object))
+            {
+              orig_element->archive_pass = -1;
+              return FALSE;
+            }
+        }
+
+      /* Unlike the generic linker, we know that this element provides
+	 a definition for an undefined symbol and we know that we want
+	 to include it.  We don't need to check anything.  */
+      if (!(*info->callbacks
+	    ->add_archive_element) (info, element, h->root.string, &element))
+	return FALSE;
+      if (!alpha_vms_link_add_object_symbols (element, info))
+	return FALSE;
+
+      orig_element->archive_pass = pass;
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+alpha_vms_bfd_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  switch (bfd_get_format (abfd))
+    {
+    case bfd_object:
+      vms_debug2 ((2, "vms_link_add_symbols for object %s\n",
+                   abfd->filename));
+      return alpha_vms_link_add_object_symbols (abfd, info);
+      break;
+    case bfd_archive:
+      vms_debug2 ((2, "vms_link_add_symbols for archive %s\n",
+                   abfd->filename));
+      return alpha_vms_link_add_archive_symbols (abfd, info);
+      break;
+    default:
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+}
+
+static bfd_boolean
+alpha_vms_build_fixups (struct bfd_link_info *info)
+{
+  struct alpha_vms_link_hash_table *t = alpha_vms_link_hash (info);
+  unsigned char *content;
+  unsigned int i;
+  unsigned int sz = 0;
+  unsigned int lp_sz = 0;
+  unsigned int ca_sz = 0;
+  unsigned int qr_sz = 0;
+  unsigned int shrimg_cnt = 0;
+  unsigned int chgprt_num = 0;
+  unsigned int chgprt_sz = 0;
+  struct vms_eiaf *eiaf;
+  unsigned int off;
+  asection *sec;
+
+  /* Shared libraries.  */
+  for (i = 0; i < VEC_COUNT (t->shrlibs); i++)
+    {
+      struct alpha_vms_shlib_el *shlib;
+
+      shlib = &VEC_EL (t->shrlibs, struct alpha_vms_shlib_el, i);
+
+      if (!shlib->has_fixups)
+        continue;
+
+      shrimg_cnt++;
+
+      if (VEC_COUNT (shlib->ca) > 0)
+        {
+          /* Header + entries.  */
+          ca_sz += 8;
+          ca_sz += VEC_COUNT (shlib->ca) * 4;
+        }
+      if (VEC_COUNT (shlib->lp) > 0)
+        {
+          /* Header + entries.  */
+          lp_sz += 8;
+          lp_sz += VEC_COUNT (shlib->lp) * 4;
+        }
+      if (VEC_COUNT (shlib->qr) > 0)
+        {
+          /* Header + entries.  */
+          qr_sz += 8;
+          qr_sz += VEC_COUNT (shlib->qr) * 8;
+        }
+    }
+  /* Add markers.  */
+  if (ca_sz > 0)
+    ca_sz += 8;
+  if (lp_sz > 0)
+    lp_sz += 8;
+  if (qr_sz > 0)
+    qr_sz += 8;
+
+  /* Finish now if there is no content.  */
+  if (ca_sz + lp_sz + qr_sz == 0)
+    return TRUE;
+
+  /* Add an eicp entry for the fixup itself.  */
+  chgprt_num = 1;
+  for (sec = info->output_bfd->sections; sec != NULL; sec = sec->next)
+    {
+      /* This isect could be made RO or EXE after relocations are applied.  */
+      if ((sec->flags & SEC_RELOC) != 0
+          && (sec->flags & (SEC_CODE | SEC_READONLY)) != 0)
+        chgprt_num++;
+    }
+  chgprt_sz = 4 + chgprt_num * sizeof (struct vms_eicp);
+
+  /* Allocate section content (round-up size)  */
+  sz = sizeof (struct vms_eiaf) + shrimg_cnt * sizeof (struct vms_shl)
+    + ca_sz + lp_sz + qr_sz + chgprt_sz;
+  sz = (sz + VMS_BLOCK_SIZE - 1) & ~(VMS_BLOCK_SIZE - 1);
+  content = bfd_zalloc (info->output_bfd, sz);
+  if (content == NULL)
+    return FALSE;
+
+  sec = alpha_vms_link_hash (info)->fixup;
+  sec->contents = content;
+  sec->size = sz;
+
+  eiaf = (struct vms_eiaf *)content;
+  off = sizeof (struct vms_eiaf);
+  bfd_putl32 (0, eiaf->majorid);
+  bfd_putl32 (0, eiaf->minorid);
+  bfd_putl32 (0, eiaf->iaflink);
+  bfd_putl32 (0, eiaf->fixuplnk);
+  bfd_putl32 (sizeof (struct vms_eiaf), eiaf->size);
+  bfd_putl32 (0, eiaf->flags);
+  bfd_putl32 (0, eiaf->qrelfixoff);
+  bfd_putl32 (0, eiaf->lrelfixoff);
+  bfd_putl32 (0, eiaf->qdotadroff);
+  bfd_putl32 (0, eiaf->ldotadroff);
+  bfd_putl32 (0, eiaf->codeadroff);
+  bfd_putl32 (0, eiaf->lpfixoff);
+  bfd_putl32 (0, eiaf->chgprtoff);
+  bfd_putl32 (shrimg_cnt ? off : 0, eiaf->shlstoff);
+  bfd_putl32 (shrimg_cnt, eiaf->shrimgcnt);
+  bfd_putl32 (0, eiaf->shlextra);
+  bfd_putl32 (0, eiaf->permctx);
+  bfd_putl32 (0, eiaf->base_va);
+  bfd_putl32 (0, eiaf->lppsbfixoff);
+
+  if (shrimg_cnt)
+    {
+      shrimg_cnt = 0;
+
+      /* Write shl.  */
+      for (i = 0; i < VEC_COUNT (t->shrlibs); i++)
+        {
+          struct alpha_vms_shlib_el *shlib;
+          struct vms_shl *shl;
+
+          shlib = &VEC_EL (t->shrlibs, struct alpha_vms_shlib_el, i);
+
+          if (!shlib->has_fixups)
+            continue;
+
+          /* Renumber shared images.  */
+          PRIV2 (shlib->abfd, shr_index) = shrimg_cnt++;
+
+          shl = (struct vms_shl *)(content + off);
+          bfd_putl32 (0, shl->baseva);
+          bfd_putl32 (0, shl->shlptr);
+          bfd_putl32 (0, shl->ident);
+          bfd_putl32 (0, shl->permctx);
+          shl->size = sizeof (struct vms_shl);
+          bfd_putl16 (0, shl->fill_1);
+          shl->flags = 0;
+          bfd_putl32 (0, shl->icb);
+          shl->imgnam[0] = strlen (PRIV2 (shlib->abfd, hdr_data.hdr_t_name));
+          memcpy (shl->imgnam + 1, PRIV2 (shlib->abfd, hdr_data.hdr_t_name),
+                  shl->imgnam[0]);
+
+          off += sizeof (struct vms_shl);
+        }
+
+      /* CA fixups.  */
+      if (ca_sz != 0)
+        {
+          bfd_putl32 (off, eiaf->codeadroff);
+
+          for (i = 0; i < VEC_COUNT (t->shrlibs); i++)
+            {
+              struct alpha_vms_shlib_el *shlib;
+              unsigned int j;
+
+              shlib = &VEC_EL (t->shrlibs, struct alpha_vms_shlib_el, i);
+
+              if (VEC_COUNT (shlib->ca) == 0)
+                continue;
+
+              bfd_putl32 (VEC_COUNT (shlib->ca), content + off);
+              bfd_putl32 (PRIV2 (shlib->abfd, shr_index), content + off + 4);
+              off += 8;
+
+              for (j = 0; j < VEC_COUNT (shlib->ca); j++)
+                {
+                  bfd_putl32 (VEC_EL (shlib->ca, bfd_vma, j) - t->base_addr,
+                              content + off);
+                  off += 4;
+                }
+            }
+
+          bfd_putl32 (0, content + off);
+          bfd_putl32 (0, content + off + 4);
+          off += 8;
+        }
+
+      /* LP fixups.  */
+      if (lp_sz != 0)
+        {
+          bfd_putl32 (off, eiaf->lpfixoff);
+
+          for (i = 0; i < VEC_COUNT (t->shrlibs); i++)
+            {
+              struct alpha_vms_shlib_el *shlib;
+              unsigned int j;
+
+              shlib = &VEC_EL (t->shrlibs, struct alpha_vms_shlib_el, i);
+
+              if (VEC_COUNT (shlib->lp) == 0)
+                continue;
+
+              bfd_putl32 (VEC_COUNT (shlib->lp), content + off);
+              bfd_putl32 (PRIV2 (shlib->abfd, shr_index), content + off + 4);
+              off += 8;
+
+              for (j = 0; j < VEC_COUNT (shlib->lp); j++)
+                {
+                  bfd_putl32 (VEC_EL (shlib->lp, bfd_vma, j) - t->base_addr,
+                              content + off);
+                  off += 4;
+                }
+            }
+
+          bfd_putl32 (0, content + off);
+          bfd_putl32 (0, content + off + 4);
+          off += 8;
+        }
+
+      /* QR fixups.  */
+      if (qr_sz != 0)
+        {
+          bfd_putl32 (off, eiaf->qdotadroff);
+
+          for (i = 0; i < VEC_COUNT (t->shrlibs); i++)
+            {
+              struct alpha_vms_shlib_el *shlib;
+              unsigned int j;
+
+              shlib = &VEC_EL (t->shrlibs, struct alpha_vms_shlib_el, i);
+
+              if (VEC_COUNT (shlib->qr) == 0)
+                continue;
+
+              bfd_putl32 (VEC_COUNT (shlib->qr), content + off);
+              bfd_putl32 (PRIV2 (shlib->abfd, shr_index), content + off + 4);
+              off += 8;
+
+              for (j = 0; j < VEC_COUNT (shlib->qr); j++)
+                {
+                  struct alpha_vms_vma_ref *r;
+                  r = &VEC_EL (shlib->qr, struct alpha_vms_vma_ref, j);
+                  bfd_putl32 (r->vma - t->base_addr, content + off);
+                  bfd_putl32 (r->ref, content + off + 4);
+                  off += 8;
+                }
+            }
+
+          bfd_putl32 (0, content + off);
+          bfd_putl32 (0, content + off + 4);
+          off += 8;
+        }
+    }
+
+  /* Write the change protection table.  */
+  bfd_putl32 (off, eiaf->chgprtoff);
+  bfd_putl32 (chgprt_num, content + off);
+  off += 4;
+
+  for (sec = info->output_bfd->sections; sec != NULL; sec = sec->next)
+    {
+      struct vms_eicp *eicp;
+      unsigned int prot;
+
+      if ((sec->flags & SEC_LINKER_CREATED) != 0 &&
+          strcmp (sec->name, "$FIXUP$") == 0)
+        prot = PRT__C_UREW;
+      else if ((sec->flags & SEC_RELOC) != 0
+               && (sec->flags & (SEC_CODE | SEC_READONLY)) != 0)
+        prot = PRT__C_UR;
+      else
+        continue;
+
+      eicp = (struct vms_eicp *)(content + off);
+      bfd_putl64 (sec->vma - t->base_addr, eicp->baseva);
+      bfd_putl32 ((sec->size + VMS_BLOCK_SIZE - 1) & ~(VMS_BLOCK_SIZE - 1),
+                  eicp->size);
+      bfd_putl32 (prot, eicp->newprt);
+      off += sizeof (struct vms_eicp);
+    }
+
+  return TRUE;
+}
+
+/* Called by bfd_hash_traverse to fill the symbol table.
+   Return FALSE in case of failure.  */
+
+static bfd_boolean
+alpha_vms_link_output_symbol (struct bfd_hash_entry *bh, void *infov)
+{
+  struct bfd_link_hash_entry *hc = (struct bfd_link_hash_entry *) bh;
+  struct bfd_link_info *info = (struct bfd_link_info *)infov;
+  struct alpha_vms_link_hash_entry *h;
+  struct vms_symbol_entry *sym;
+
+  if (hc->type == bfd_link_hash_warning)
+    {
+      hc = hc->u.i.link;
+      if (hc->type == bfd_link_hash_new)
+	return TRUE;
+    }
+  h = (struct alpha_vms_link_hash_entry *) hc;
+
+  switch (h->root.type)
+    {
+    case bfd_link_hash_undefined:
+      return TRUE;
+    case bfd_link_hash_new:
+    case bfd_link_hash_warning:
+      abort ();
+    case bfd_link_hash_undefweak:
+      return TRUE;
+    case bfd_link_hash_defined:
+    case bfd_link_hash_defweak:
+      {
+        asection *sec = h->root.u.def.section;
+
+        /* FIXME: this is certainly a symbol from a dynamic library.  */
+        if (bfd_is_abs_section (sec))
+          return TRUE;
+
+        if (sec->owner->flags & DYNAMIC)
+          return TRUE;
+      }
+      break;
+    case bfd_link_hash_common:
+      break;
+    case bfd_link_hash_indirect:
+      return TRUE;
+    }
+
+  /* Do not write not kept symbols.  */
+  if (info->strip == strip_some
+      && bfd_hash_lookup (info->keep_hash, h->root.root.string,
+                          FALSE, FALSE) != NULL)
+    return TRUE;
+
+  if (h->sym == NULL)
+    {
+      /* This symbol doesn't come from a VMS object.  So we suppose it is
+         a data.  */
+      int len = strlen (h->root.root.string);
+
+      sym = (struct vms_symbol_entry *)bfd_zalloc (info->output_bfd,
+                                                   sizeof (*sym) + len);
+      if (sym == NULL)
+        abort ();
+      sym->namelen = len;
+      memcpy (sym->name, h->root.root.string, len);
+      sym->name[len] = 0;
+      sym->owner = info->output_bfd;
+
+      sym->typ = EGSD__C_SYMG;
+      sym->data_type = 0;
+      sym->flags = EGSY__V_DEF | EGSY__V_REL;
+      sym->symbol_vector = h->root.u.def.value;
+      sym->section = h->root.u.def.section;
+      sym->value = h->root.u.def.value;
+    }
+  else
+    sym = h->sym;
+
+  if (!add_symbol_entry (info->output_bfd, sym))
+    return FALSE;
+
+  return TRUE;
+}
+
+static bfd_boolean
+alpha_vms_bfd_final_link (bfd *abfd, struct bfd_link_info *info)
+{
+  asection *o;
+  struct bfd_link_order *p;
+  bfd *sub;
+  asection *fixupsec;
+  bfd_vma base_addr;
+  bfd_vma last_addr;
+  asection *dst;
+  asection *dmt;
+
+  if (info->relocatable)
+    {
+      /* FIXME: we do not yet support relocatable link.  It is not obvious
+         how to do it for debug infos.  */
+      (*info->callbacks->einfo)(_("%P: relocatable link is not supported\n"));
+      return FALSE;
+    }
+
+  bfd_get_outsymbols (abfd) = NULL;
+  bfd_get_symcount (abfd) = 0;
+
+  /* Mark all sections which will be included in the output file.  */
+  for (o = abfd->sections; o != NULL; o = o->next)
+    for (p = o->map_head.link_order; p != NULL; p = p->next)
+      if (p->type == bfd_indirect_link_order)
+	p->u.indirect.section->linker_mark = TRUE;
+
+#if 0
+  /* Handle all the link order information for the sections.  */
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      printf ("For section %s (at 0x%08x, flags=0x%08x):\n",
+              o->name, (unsigned)o->vma, (unsigned)o->flags);
+
+      for (p = o->map_head.link_order; p != NULL; p = p->next)
+	{
+          printf (" at 0x%08x - 0x%08x: ",
+                  (unsigned)p->offset, (unsigned)(p->offset + p->size - 1));
+	  switch (p->type)
+	    {
+	    case bfd_section_reloc_link_order:
+	    case bfd_symbol_reloc_link_order:
+              printf ("  section/symbol reloc\n");
+	      break;
+	    case bfd_indirect_link_order:
+              printf ("  section %s of %s\n",
+                      p->u.indirect.section->name,
+                      p->u.indirect.section->owner->filename);
+	      break;
+            case bfd_data_link_order:
+              printf ("  explicit data\n");
+              break;
+	    default:
+              printf ("  *unknown* type %u\n", p->type);
+	      break;
+	    }
+	}
+    }
+#endif
+
+  /* Generate the symbol table.  */
+  BFD_ASSERT (PRIV (syms) == NULL);
+  if (info->strip != strip_all)
+    bfd_hash_traverse (&info->hash->table, alpha_vms_link_output_symbol, info);
+
+  /* Find the entry point.  */
+  if (bfd_get_start_address (abfd) == 0)
+    {
+      bfd *startbfd = NULL;
+
+      for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+        {
+          /* Consider only VMS object files.  */
+          if (sub->xvec != abfd->xvec)
+            continue;
+
+          if (!PRIV2 (sub, eom_data).eom_has_transfer)
+            continue;
+          if ((PRIV2 (sub, eom_data).eom_b_tfrflg & EEOM__M_WKTFR) && startbfd)
+            continue;
+          if (startbfd != NULL
+              && !(PRIV2 (sub, eom_data).eom_b_tfrflg & EEOM__M_WKTFR))
+            {
+              (*info->callbacks->einfo)
+                (_("%P: multiple entry points: in modules %B and %B\n"),
+                 startbfd, sub);
+              continue;
+            }
+          startbfd = sub;
+        }
+
+      if (startbfd)
+        {
+          unsigned int ps_idx = PRIV2 (startbfd, eom_data).eom_l_psindx;
+          bfd_vma tfradr = PRIV2 (startbfd, eom_data).eom_l_tfradr;
+          asection *sec;
+
+          sec = PRIV2 (startbfd, sections)[ps_idx];
+
+          bfd_set_start_address
+            (abfd, sec->output_section->vma + sec->output_offset + tfradr);
+        }
+    }
+
+  /* Set transfer addresses.  */
+  {
+    int i;
+    struct bfd_link_hash_entry *h;
+
+    i = 0;
+    PRIV (transfer_address[i++]) = 0xffffffff00000340ULL;	/* SYS$IMGACT */
+    h = bfd_link_hash_lookup (info->hash, "LIB$INITIALIZE", FALSE, FALSE, TRUE);
+    if (h != NULL && h->type == bfd_link_hash_defined)
+      PRIV (transfer_address[i++]) =
+        alpha_vms_get_sym_value (h->u.def.section, h->u.def.value);
+    PRIV (transfer_address[i++]) = bfd_get_start_address (abfd);
+    while (i < 4)
+      PRIV (transfer_address[i++]) = 0;
+  }
+
+  /* Allocate contents.
+     Also compute the virtual base address.  */
+  base_addr = (bfd_vma)-1;
+  last_addr = 0;
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      if (o->flags & SEC_HAS_CONTENTS)
+        {
+          o->contents = bfd_alloc (abfd, o->size);
+          if (o->contents == NULL)
+            return FALSE;
+        }
+      if (o->flags & SEC_LOAD)
+        {
+          if (o->vma < base_addr)
+            base_addr = o->vma;
+          if (o->vma + o->size > last_addr)
+            last_addr = o->vma + o->size;
+        }
+      /* Clear the RELOC flags.  Currently we don't support incremental
+         linking.  We use the RELOC flag for computing the eicp entries.  */
+      o->flags &= ~SEC_RELOC;
+    }
+
+  /* Create the fixup section.  */
+  fixupsec = bfd_make_section_anyway_with_flags
+    (info->output_bfd, "$FIXUP$",
+     SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_LINKER_CREATED);
+  if (fixupsec == NULL)
+    return FALSE;
+  last_addr = (last_addr + 0xffff) & ~0xffff;
+  fixupsec->vma = last_addr;
+
+  alpha_vms_link_hash (info)->fixup = fixupsec;
+  alpha_vms_link_hash (info)->base_addr = base_addr;
+
+  /* Create the DMT section, if necessary.  */
+  BFD_ASSERT (PRIV (dst_section) == NULL);
+  dst = bfd_get_section_by_name (abfd, "$DST$");
+  if (dst != NULL && dst->size == 0)
+    dst = NULL;
+  if (dst != NULL)
+    {
+      PRIV (dst_section) = dst;
+      dmt = bfd_make_section_anyway_with_flags
+        (info->output_bfd, "$DMT$",
+         SEC_DEBUGGING | SEC_HAS_CONTENTS | SEC_LINKER_CREATED);
+      if (dmt == NULL)
+        return FALSE;
+    }
+  else
+    dmt = NULL;
+
+  /* Read all sections from the inputs.  */
+  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+    {
+      if (sub->flags & DYNAMIC)
+        {
+          alpha_vms_create_eisd_for_shared (abfd, sub);
+          continue;
+        }
+
+      if (!alpha_vms_read_sections_content (sub, info))
+        return FALSE;
+    }
+
+  /* Handle all the link order information for the sections.
+     Note: past this point, it is not possible to create new sections.  */
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      for (p = o->map_head.link_order; p != NULL; p = p->next)
+	{
+	  switch (p->type)
+	    {
+	    case bfd_section_reloc_link_order:
+	    case bfd_symbol_reloc_link_order:
+              abort ();
+              return FALSE;
+	    case bfd_indirect_link_order:
+              /* Already done.  */
+	      break;
+	    default:
+	      if (! _bfd_default_link_order (abfd, info, o, p))
+		return FALSE;
+	      break;
+	    }
+	}
+    }
+
+  /* Compute fixups.  */
+  if (!alpha_vms_build_fixups (info))
+    return FALSE;
+
+  /* Compute the DMT.  */
+  if (dmt != NULL)
+    {
+      int pass;
+      unsigned char *contents = NULL;
+
+      /* In pass 1, compute the size.  In pass 2, write the DMT contents.  */
+      for (pass = 0; pass < 2; pass++)
+        {
+          unsigned int off = 0;
+
+          /* For each object file (ie for each module).  */
+          for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+            {
+              asection *sub_dst;
+              struct vms_dmt_header *dmth = NULL;
+              unsigned int psect_count;
+
+              /* Skip this module if it has no DST.  */
+              sub_dst = PRIV2 (sub, dst_section);
+              if (sub_dst == NULL || sub_dst->size == 0)
+                continue;
+
+              if (pass == 1)
+                {
+                  /* Write the header.  */
+                  dmth = (struct vms_dmt_header *)(contents + off);
+                  bfd_putl32 (sub_dst->output_offset, dmth->modbeg);
+                  bfd_putl32 (sub_dst->size, dmth->size);
+                }
+
+              off += sizeof (struct vms_dmt_header);
+              psect_count = 0;
+
+              /* For each section (ie for each psect).  */
+              for (o = sub->sections; o != NULL; o = o->next)
+                {
+                  /* Only consider interesting sections.  */
+                  if (!(o->flags & SEC_ALLOC))
+                    continue;
+                  if (o->flags & SEC_LINKER_CREATED)
+                    continue;
+
+                  if (pass == 1)
+                    {
+                      /* Write an entry.  */
+                      struct vms_dmt_psect *dmtp;
+
+                      dmtp = (struct vms_dmt_psect *)(contents + off);
+                      bfd_putl32 (o->output_offset + o->output_section->vma,
+                                  dmtp->start);
+                      bfd_putl32 (o->size, dmtp->length);
+                      psect_count++;
+                    }
+                  off += sizeof (struct vms_dmt_psect);
+                }
+              if (pass == 1)
+                bfd_putl32 (psect_count, dmth->psect_count);
+            }
+
+          if (pass == 0)
+            {
+              contents = bfd_zalloc (info->output_bfd, off);
+              if (contents == NULL)
+                return FALSE;
+              dmt->contents = contents;
+              dmt->size = off;
+            }
+          else
+            {
+              BFD_ASSERT (off == dmt->size);
+            }
+        }
+    }
+
+  return TRUE;
+}
+
+/* Read the contents of a section.
+   buf points to a buffer of buf_size bytes to be filled with
+   section data (starting at offset into section)  */
+
+static bfd_boolean
+alpha_vms_get_section_contents (bfd *abfd, asection *section,
+                                void *buf, file_ptr offset,
+                                bfd_size_type count)
+{
+  asection *sec;
+
+  /* Image are easy.  */
+  if (bfd_get_file_flags (abfd) & (EXEC_P | DYNAMIC))
+    return _bfd_generic_get_section_contents (abfd, section,
+                                              buf, offset, count);
+
+  /* Safety check.  */
+  if (offset + count < count
+      || offset + count > section->size)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  /* If the section is already in memory, just copy it.  */
+  if (section->flags & SEC_IN_MEMORY)
+    {
+      BFD_ASSERT (section->contents != NULL);
+      memcpy (buf, section->contents + offset, count);
+      return TRUE;
+    }
+  if (section->size == 0)
+    return TRUE;
+
+  /* Alloc in memory and read ETIRs.  */
+  for (sec = abfd->sections; sec; sec = sec->next)
+    {
+      BFD_ASSERT (sec->contents == NULL);
+
+      if (sec->size != 0 && (sec->flags & SEC_HAS_CONTENTS))
+        {
+          sec->contents = bfd_alloc (abfd, sec->size);
+          if (sec->contents == NULL)
+            return FALSE;
+        }
+    }
+  if (!alpha_vms_read_sections_content (abfd, NULL))
+    return FALSE;
+  for (sec = abfd->sections; sec; sec = sec->next)
+    if (sec->contents)
+      sec->flags |= SEC_IN_MEMORY;
+  memcpy (buf, section->contents + offset, count);
+  return TRUE;
+}
+
+
+/* Set the format of a file being written.  */
+
+static bfd_boolean
+alpha_vms_mkobject (bfd * abfd)
+{
+  const bfd_arch_info_type *arch;
+
+  vms_debug2 ((1, "alpha_vms_mkobject (%p)\n", abfd));
+
+  if (!vms_initialize (abfd))
+    return FALSE;
+
+  PRIV (recwr.buf) = bfd_alloc (abfd, MAX_OUTREC_SIZE);
+  if (PRIV (recwr.buf) == NULL)
+    return FALSE;
+
+  arch = bfd_scan_arch ("alpha");
+
+  if (arch == 0)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+
+  abfd->arch_info = arch;
+  return TRUE;
+}
+
+
+/* 4.1, generic.  */
+
+/* Called when the BFD is being closed to do any necessary cleanup.  */
+
+static bfd_boolean
+vms_close_and_cleanup (bfd * abfd)
+{
+  vms_debug2 ((1, "vms_close_and_cleanup (%p)\n", abfd));
+
+  if (abfd == NULL || abfd->tdata.any == NULL)
+    return TRUE;
+
+  if (abfd->format == bfd_archive)
+    {
+      bfd_release (abfd, abfd->tdata.any);
+      abfd->tdata.any = NULL;
+      return TRUE;
+    }
+
+  if (PRIV (recrd.buf) != NULL)
+    free (PRIV (recrd.buf));
+
+  if (PRIV (sections) != NULL)
+    free (PRIV (sections));
+
+  bfd_release (abfd, abfd->tdata.any);
+  abfd->tdata.any = NULL;
+
+#ifdef VMS
+  if (abfd->direction == write_direction)
+    {
+      /* Last step on VMS is to convert the file to variable record length
+	 format.  */
+      if (bfd_cache_close (abfd) != TRUE)
+	return FALSE;
+      if (_bfd_vms_convert_to_var_unix_filename (abfd->filename) != TRUE)
+	return FALSE;
+    }
+#endif
+
+  return TRUE;
+}
+
+/* Called when a new section is created.  */
+
+static bfd_boolean
+vms_new_section_hook (bfd * abfd, asection *section)
+{
+  bfd_size_type amt;
+
+  vms_debug2 ((1, "vms_new_section_hook (%p, [%d]%s)\n",
+               abfd, section->index, section->name));
+
+  bfd_set_section_alignment (abfd, section, 0);
+
+  vms_debug2 ((7, "%d: %s\n", section->index, section->name));
+
+  amt = sizeof (struct vms_section_data_struct);
+  section->used_by_bfd = bfd_zalloc (abfd, amt);
+  if (section->used_by_bfd == NULL)
+    return FALSE;
+
+  /* Create the section symbol.  */
+  return _bfd_generic_new_section_hook (abfd, section);
+}
+
+/* Part 4.5, symbols.  */
+
+/* Print symbol to file according to how. how is one of
+   bfd_print_symbol_name	just print the name
+   bfd_print_symbol_more	print more (???)
+   bfd_print_symbol_all	print all we know, which is not much right now :-).  */
+
+static void
+vms_print_symbol (bfd * abfd,
+		  void * file,
+		  asymbol *symbol,
+		  bfd_print_symbol_type how)
+{
+  vms_debug2 ((1, "vms_print_symbol (%p, %p, %p, %d)\n",
+               abfd, file, symbol, how));
+
+  switch (how)
+    {
+      case bfd_print_symbol_name:
+      case bfd_print_symbol_more:
+	fprintf ((FILE *)file," %s", symbol->name);
+      break;
+
+      case bfd_print_symbol_all:
+	{
+	  const char *section_name = symbol->section->name;
+
+	  bfd_print_symbol_vandf (abfd, file, symbol);
+
+	  fprintf ((FILE *) file," %-8s %s", section_name, symbol->name);
+        }
+      break;
+    }
+}
+
+/* Return information about symbol in ret.
+
+   fill type, value and name
+   type:
+	A	absolute
+	B	bss segment symbol
+	C	common symbol
+	D	data segment symbol
+	f	filename
+	t	a static function symbol
+	T	text segment symbol
+	U	undefined
+	-	debug.  */
+
+static void
+vms_get_symbol_info (bfd * abfd ATTRIBUTE_UNUSED,
+		     asymbol *symbol,
+		     symbol_info *ret)
+{
+  asection *sec;
+
+  vms_debug2 ((1, "vms_get_symbol_info (%p, %p, %p)\n", abfd, symbol, ret));
+
+  sec = symbol->section;
+
+  if (ret == NULL)
+    return;
+
+  if (sec == NULL)
+    ret->type = 'U';
+  else if (bfd_is_com_section (sec))
+    ret->type = 'C';
+  else if (bfd_is_abs_section (sec))
+    ret->type = 'A';
+  else if (bfd_is_und_section (sec))
+    ret->type = 'U';
+  else if (bfd_is_ind_section (sec))
+    ret->type = 'I';
+  else if ((symbol->flags & BSF_FUNCTION)
+           || (bfd_get_section_flags (abfd, sec) & SEC_CODE))
+    ret->type = 'T';
+  else if (bfd_get_section_flags (abfd, sec) & SEC_DATA)
+    ret->type = 'D';
+  else if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)
+    ret->type = 'B';
+  else
+    ret->type = '?';
+
+  if (ret->type != 'U')
+    ret->value = symbol->value + symbol->section->vma;
+  else
+    ret->value = 0;
+  ret->name = symbol->name;
+}
+
+/* Return TRUE if the given symbol sym in the BFD abfd is
+   a compiler generated local label, else return FALSE.  */
+
+static bfd_boolean
+vms_bfd_is_local_label_name (bfd * abfd ATTRIBUTE_UNUSED,
+			     const char *name)
+{
+  vms_debug2 ((1, "vms_bfd_is_local_label_name (%p, %s)\n", abfd, name));
+  return name[0] == '$';
+}
+
+/* Part 4.7, writing an object file.  */
+
+/* Sets the contents of the section section in BFD abfd to the data starting
+   in memory at LOCATION. The data is written to the output section starting
+   at offset offset for count bytes.
+
+   Normally TRUE is returned, else FALSE. Possible error returns are:
+   o bfd_error_no_contents - The output section does not have the
+	SEC_HAS_CONTENTS attribute, so nothing can be written to it.
+   o and some more too  */
+
+static bfd_boolean
+_bfd_vms_set_section_contents (bfd * abfd,
+                               asection *section,
+                               const void * location,
+                               file_ptr offset,
+                               bfd_size_type count)
+{
+  if (section->contents == NULL)
+    {
+      section->contents = bfd_alloc (abfd, section->size);
+      if (section->contents == NULL)
+        return FALSE;
+
+      memcpy (section->contents + offset, location, (size_t) count);
+    }
+
+  return TRUE;
+}
+
+/* Set the architecture and machine type in BFD abfd to arch and mach.
+   Find the correct pointer to a structure and insert it into the arch_info
+   pointer.  */
+
+static bfd_boolean
+alpha_vms_set_arch_mach (bfd *abfd,
+                         enum bfd_architecture arch, unsigned long mach)
+{
+  if (arch != bfd_arch_alpha
+      && arch != bfd_arch_unknown)
+    return FALSE;
+
+  return bfd_default_set_arch_mach (abfd, arch, mach);
+}
+
+/* Set section VMS flags.  Clear NO_FLAGS and set FLAGS.  */
+
+void
+bfd_vms_set_section_flags (bfd *abfd ATTRIBUTE_UNUSED,
+			   asection *sec, flagword no_flags, flagword flags)
+{
+  vms_section_data (sec)->no_flags = no_flags;
+  vms_section_data (sec)->flags = flags;
+}
+
+struct vms_private_data_struct *
+bfd_vms_get_data (bfd *abfd)
+{
+  return (struct vms_private_data_struct *)abfd->tdata.any;
+}
+
+#define vms_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define vms_bfd_link_just_syms            _bfd_generic_link_just_syms
+#define vms_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define vms_bfd_is_group_section          bfd_generic_is_group_section
+#define vms_bfd_discard_group             bfd_generic_discard_group
+#define vms_section_already_linked        _bfd_generic_section_already_linked
+#define vms_bfd_define_common_symbol      bfd_generic_define_common_symbol
+#define vms_bfd_copy_private_header_data  _bfd_generic_bfd_copy_private_header_data
+
+#define vms_bfd_copy_private_bfd_data	  _bfd_generic_bfd_copy_private_bfd_data
+#define vms_bfd_free_cached_info	  _bfd_generic_bfd_free_cached_info
+#define vms_bfd_copy_private_section_data _bfd_generic_bfd_copy_private_section_data
+#define vms_bfd_copy_private_symbol_data  _bfd_generic_bfd_copy_private_symbol_data
+#define vms_bfd_set_private_flags         _bfd_generic_bfd_set_private_flags
+#define vms_bfd_merge_private_bfd_data    _bfd_generic_bfd_merge_private_bfd_data
+
+/* Symbols table.  */
+#define alpha_vms_make_empty_symbol        _bfd_generic_make_empty_symbol
+#define alpha_vms_bfd_is_target_special_symbol \
+   ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define alpha_vms_print_symbol             vms_print_symbol
+#define alpha_vms_get_symbol_info          vms_get_symbol_info
+#define alpha_vms_read_minisymbols         _bfd_generic_read_minisymbols
+#define alpha_vms_minisymbol_to_symbol     _bfd_generic_minisymbol_to_symbol
+#define alpha_vms_get_lineno               _bfd_nosymbols_get_lineno
+#define alpha_vms_find_inliner_info        _bfd_nosymbols_find_inliner_info
+#define alpha_vms_bfd_make_debug_symbol    _bfd_nosymbols_bfd_make_debug_symbol
+#define alpha_vms_find_nearest_line        _bfd_vms_find_nearest_dst_line
+#define alpha_vms_bfd_is_local_label_name  vms_bfd_is_local_label_name
+
+/* Generic table.  */
+#define alpha_vms_close_and_cleanup	   vms_close_and_cleanup
+#define alpha_vms_bfd_free_cached_info	   vms_bfd_free_cached_info
+#define alpha_vms_new_section_hook	   vms_new_section_hook
+#define alpha_vms_set_section_contents	   _bfd_vms_set_section_contents
+#define alpha_vms_get_section_contents_in_window _bfd_generic_get_section_contents_in_window
+
+#define alpha_vms_bfd_get_relocated_section_contents \
+  bfd_generic_get_relocated_section_contents
+
+#define alpha_vms_bfd_relax_section bfd_generic_relax_section
+#define alpha_vms_bfd_gc_sections bfd_generic_gc_sections
+#define alpha_vms_bfd_lookup_section_flags bfd_generic_lookup_section_flags
+#define alpha_vms_bfd_merge_sections bfd_generic_merge_sections
+#define alpha_vms_bfd_is_group_section bfd_generic_is_group_section
+#define alpha_vms_bfd_discard_group bfd_generic_discard_group
+#define alpha_vms_section_already_linked \
+  _bfd_generic_section_already_linked
+
+#define alpha_vms_bfd_define_common_symbol bfd_generic_define_common_symbol
+#define alpha_vms_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
+#define alpha_vms_bfd_link_just_syms _bfd_generic_link_just_syms
+#define alpha_vms_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+
+#define alpha_vms_bfd_link_split_section  _bfd_generic_link_split_section
+
+#define alpha_vms_get_dynamic_symtab_upper_bound \
+  _bfd_nodynamic_get_dynamic_symtab_upper_bound
+#define alpha_vms_canonicalize_dynamic_symtab \
+  _bfd_nodynamic_canonicalize_dynamic_symtab
+#define alpha_vms_get_dynamic_reloc_upper_bound \
+  _bfd_nodynamic_get_dynamic_reloc_upper_bound
+#define alpha_vms_canonicalize_dynamic_reloc \
+  _bfd_nodynamic_canonicalize_dynamic_reloc
+
+const bfd_target vms_alpha_vec =
+{
+  "vms-alpha",			/* Name.  */
+  bfd_target_evax_flavour,
+  BFD_ENDIAN_LITTLE,		/* Data byte order is little.  */
+  BFD_ENDIAN_LITTLE,		/* Header byte order is little.  */
+
+  (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS
+   | WP_TEXT | D_PAGED),	/* Object flags.  */
+  (SEC_ALLOC | SEC_LOAD | SEC_RELOC
+   | SEC_READONLY | SEC_CODE | SEC_DATA
+   | SEC_HAS_CONTENTS | SEC_IN_MEMORY),		/* Sect flags.  */
+  0,				/* symbol_leading_char.  */
+  ' ',				/* ar_pad_char.  */
+  15,				/* ar_max_namelen.  */
+  0,				/* match priority.  */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16,
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16,
+
+  {_bfd_dummy_target, alpha_vms_object_p,	/* bfd_check_format.  */
+   _bfd_vms_lib_alpha_archive_p, _bfd_dummy_target},
+  {bfd_false, alpha_vms_mkobject,		/* bfd_set_format.  */
+   _bfd_vms_lib_alpha_mkarchive, bfd_false},
+  {bfd_false, alpha_vms_write_object_contents,	/* bfd_write_contents.  */
+   _bfd_vms_lib_write_archive_contents, bfd_false},
+
+  BFD_JUMP_TABLE_GENERIC (alpha_vms),
+  BFD_JUMP_TABLE_COPY (vms),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_vms_lib),
+  BFD_JUMP_TABLE_SYMBOLS (alpha_vms),
+  BFD_JUMP_TABLE_RELOCS (alpha_vms),
+  BFD_JUMP_TABLE_WRITE (alpha_vms),
+  BFD_JUMP_TABLE_LINK (alpha_vms),
+  BFD_JUMP_TABLE_DYNAMIC (alpha_vms),
+
+  NULL,
+
+  NULL
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/vms-lib.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/vms-lib.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/vms-lib.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/vms-lib.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2299 @@
+/* BFD back-end for VMS archive files.
+
+   Copyright 2010, 2011 Free Software Foundation, Inc.
+   Written by Tristan Gingold <gingold@adacore.com>, AdaCore.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "safe-ctype.h"
+#include "bfdver.h"
+#include "vms.h"
+#include "vms/lbr.h"
+#include "vms/dcx.h"
+
+/* The standard VMS disk block size.  */
+#ifndef VMS_BLOCK_SIZE
+#define VMS_BLOCK_SIZE 512
+#endif
+
+/* Maximum key length (which is also the maximum symbol length in archive).  */
+#define MAX_KEYLEN 129
+
+/* DCX Submaps.  */
+
+struct dcxsbm_desc
+{
+  unsigned char min_char;
+  unsigned char max_char;
+  unsigned char *flags;
+  unsigned char *nodes;
+  unsigned short *next;
+};
+
+/* Kind of library.  Used to filter in archive_p.  */
+
+enum vms_lib_kind
+  {
+    vms_lib_vax,
+    vms_lib_alpha,
+    vms_lib_ia64,
+    vms_lib_txt
+  };
+
+/* Back-end private data.  */
+
+struct lib_tdata
+{
+  /* Standard tdata for an archive.  But we don't use many fields.  */
+  struct artdata artdata;
+
+  /* Major version.  */
+  unsigned char ver;
+
+  /* Type of the archive.  */
+  unsigned char type;
+
+  /* Kind of archive.  Summary of its type.  */
+  enum vms_lib_kind kind;
+
+  /* Total size of the mhd (element header).  */
+  unsigned int mhd_size;
+
+  /* Creation date.  */
+  unsigned int credat_lo;
+  unsigned int credat_hi;
+
+  /* Vector of modules (archive elements), already sorted.  */
+  unsigned int nbr_modules;
+  struct carsym *modules;
+  bfd **cache;
+
+  /* DCX (decompression) data.  */
+  unsigned int nbr_dcxsbm;
+  struct dcxsbm_desc *dcxsbm;
+};
+
+#define bfd_libdata(bfd) ((struct lib_tdata *)((bfd)->tdata.any))
+
+/* End-Of-Text pattern.  This is a special record to mark the end of file.  */
+
+static const unsigned char eotdesc[] = { 0x03, 0x00, 0x77, 0x00, 0x77, 0x00 };
+
+/* Describe the current state of carsym entries while building the archive
+   table of content.  Things are simple with Alpha archives as the number
+   of entries is known, but with IA64 archives a entry can make a reference
+   to severals members.  Therefore we must be able to extend the table on the
+   fly, but it should be allocated on the bfd - which doesn't support realloc.
+   To reduce the overhead, the table is initially allocated in the BFD's
+   objalloc and extended if necessary on the heap.  In the later case, it
+   is finally copied to the BFD's objalloc so that it will automatically be
+   freed.  */
+
+struct carsym_mem
+{
+  /* The table of content.  */
+  struct carsym *idx;
+
+  /* Number of entries used in the table.  */
+  unsigned int nbr;
+
+  /* Maximum number of entries.  */
+  unsigned int max;
+
+  /* If true, the table was reallocated on the heap.  If false, it is still
+     in the BFD's objalloc.  */
+  bfd_boolean realloced;
+};
+
+/* Simply add a name to the index.  */
+
+static bfd_boolean
+vms_add_index (struct carsym_mem *cs, char *name,
+               unsigned int idx_vbn, unsigned int idx_off)
+{
+  if (cs->nbr == cs->max)
+    {
+      struct carsym *n;
+
+      cs->max = 2 * cs->max + 32;
+
+      if (!cs->realloced)
+        {
+          n = bfd_malloc2 (cs->max, sizeof (struct carsym));
+          if (n == NULL)
+            return FALSE;
+          memcpy (n, cs->idx, cs->nbr * sizeof (struct carsym));
+          /* And unfortunately we can't free cs->idx.  */
+        }
+      else
+        {
+          n = bfd_realloc_or_free (cs->idx, cs->nbr * sizeof (struct carsym));
+          if (n == NULL)
+            return FALSE;
+        }
+      cs->idx = n;
+      cs->realloced = TRUE;
+    }
+  cs->idx[cs->nbr].file_offset = (idx_vbn - 1) * VMS_BLOCK_SIZE + idx_off;
+  cs->idx[cs->nbr].name = name;
+  cs->nbr++;
+  return TRUE;
+}
+
+/* Follow all member of a lns list (pointed by RFA) and add indexes for
+   NAME.  Return FALSE in case of error.  */
+
+static bfd_boolean
+vms_add_indexes_from_list (bfd *abfd, struct carsym_mem *cs, char *name,
+                           struct vms_rfa *rfa)
+{
+  struct vms_lns lns;
+  unsigned int vbn;
+  file_ptr off;
+
+  while (1)
+    {
+      vbn = bfd_getl32 (rfa->vbn);
+      if (vbn == 0)
+        return TRUE;
+
+      /* Read the LHS.  */
+      off = (vbn - 1) * VMS_BLOCK_SIZE + bfd_getl16 (rfa->offset);
+      if (bfd_seek (abfd, off, SEEK_SET) != 0
+          || bfd_bread (&lns, sizeof (lns), abfd) != sizeof (lns))
+        return FALSE;
+
+      if (!vms_add_index (cs, name,
+                          bfd_getl32 (lns.modrfa.vbn),
+                          bfd_getl16 (lns.modrfa.offset)))
+        return FALSE;
+
+      rfa = &lns.nxtrfa;
+    }
+}
+
+/* Read block VBN from ABFD and store it into BLK.  Return FALSE in case of error.  */
+
+static bfd_boolean
+vms_read_block (bfd *abfd, unsigned int vbn, void *blk)
+{
+  file_ptr off;
+
+  off = (vbn - 1) * VMS_BLOCK_SIZE;
+  if (bfd_seek (abfd, off, SEEK_SET) != 0
+      || bfd_bread (blk, VMS_BLOCK_SIZE, abfd) != VMS_BLOCK_SIZE)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Write the content of BLK to block VBN of ABFD.  Return FALSE in case of error.  */
+
+static bfd_boolean
+vms_write_block (bfd *abfd, unsigned int vbn, void *blk)
+{
+  file_ptr off;
+
+  off = (vbn - 1) * VMS_BLOCK_SIZE;
+  if (bfd_seek (abfd, off, SEEK_SET) != 0
+      || bfd_bwrite (blk, VMS_BLOCK_SIZE, abfd) != VMS_BLOCK_SIZE)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Read index block VBN and put the entry in **IDX (which is updated).
+   If the entry is indirect, recurse.  */
+
+static bfd_boolean
+vms_traverse_index (bfd *abfd, unsigned int vbn, struct carsym_mem *cs)
+{
+  struct vms_indexdef indexdef;
+  file_ptr off;
+  unsigned char *p;
+  unsigned char *endp;
+
+  /* Read the index block.  */
+  BFD_ASSERT (sizeof (indexdef) == VMS_BLOCK_SIZE);
+  if (!vms_read_block (abfd, vbn, &indexdef))
+    return FALSE;
+
+  /* Traverse it.  */
+  p = &indexdef.keys[0];
+  endp = p + bfd_getl16 (indexdef.used);
+  while (p < endp)
+    {
+      unsigned int idx_vbn;
+      unsigned int idx_off;
+      unsigned int keylen;
+      unsigned char *keyname;
+      unsigned int flags;
+
+      /* Extract key length.  */
+      if (bfd_libdata (abfd)->ver == LBR_MAJORID)
+        {
+          struct vms_idx *ridx = (struct vms_idx *)p;
+
+          idx_vbn = bfd_getl32 (ridx->rfa.vbn);
+          idx_off = bfd_getl16 (ridx->rfa.offset);
+
+          keylen = ridx->keylen;
+          flags = 0;
+          keyname = ridx->keyname;
+        }
+      else if (bfd_libdata (abfd)->ver == LBR_ELFMAJORID)
+        {
+          struct vms_elfidx *ridx = (struct vms_elfidx *)p;
+
+          idx_vbn = bfd_getl32 (ridx->rfa.vbn);
+          idx_off = bfd_getl16 (ridx->rfa.offset);
+
+          keylen = bfd_getl16 (ridx->keylen);
+          flags = ridx->flags;
+          keyname = ridx->keyname;
+        }
+      else
+        return FALSE;
+
+      /* Illegal value.  */
+      if (idx_vbn == 0)
+        return FALSE;
+
+      if (idx_off == RFADEF__C_INDEX)
+        {
+          /* Indirect entry.  Recurse.  */
+          if (!vms_traverse_index (abfd, idx_vbn, cs))
+            return FALSE;
+        }
+      else
+        {
+          /* Add a new entry.  */
+          char *name;
+
+          if (flags & ELFIDX__SYMESC)
+            {
+              /* Extended key name.  */
+              unsigned int noff = 0;
+              unsigned int koff;
+              unsigned int kvbn;
+              struct vms_kbn *kbn;
+              unsigned char kblk[VMS_BLOCK_SIZE];
+
+              /* Sanity check.  */
+              if (keylen != sizeof (struct vms_kbn))
+                return FALSE;
+
+              kbn = (struct vms_kbn *)keyname;
+              keylen = bfd_getl16 (kbn->keylen);
+
+              name = bfd_alloc (abfd, keylen + 1);
+              if (name == NULL)
+                return FALSE;
+              kvbn = bfd_getl32 (kbn->rfa.vbn);
+              koff = bfd_getl16 (kbn->rfa.offset);
+
+              /* Read the key, chunk by chunk.  */
+              do
+                {
+                  unsigned int klen;
+
+                  if (!vms_read_block (abfd, kvbn, kblk))
+                    return FALSE;
+                  kbn = (struct vms_kbn *)(kblk + koff);
+                  klen = bfd_getl16 (kbn->keylen);
+                  kvbn = bfd_getl32 (kbn->rfa.vbn);
+                  koff = bfd_getl16 (kbn->rfa.offset);
+
+                  memcpy (name + noff, kbn + 1, klen);
+                  noff += klen;
+                }
+              while (kvbn != 0);
+
+              /* Sanity check.  */
+              if (noff != keylen)
+                return FALSE;
+            }
+          else
+            {
+              /* Usual key name.  */
+              name = bfd_alloc (abfd, keylen + 1);
+              if (name == NULL)
+                return FALSE;
+
+              memcpy (name, keyname, keylen);
+            }
+          name[keylen] = 0;
+
+          if (flags & ELFIDX__LISTRFA)
+            {
+              struct vms_lhs lhs;
+
+              /* Read the LHS.  */
+              off = (idx_vbn - 1) * VMS_BLOCK_SIZE + idx_off;
+              if (bfd_seek (abfd, off, SEEK_SET) != 0
+                  || bfd_bread (&lhs, sizeof (lhs), abfd) != sizeof (lhs))
+                return FALSE;
+
+              /* FIXME: this adds extra entries that were not accounted.  */
+              if (!vms_add_indexes_from_list (abfd, cs, name, &lhs.ng_g_rfa))
+                return FALSE;
+              if (!vms_add_indexes_from_list (abfd, cs, name, &lhs.ng_wk_rfa))
+                return FALSE;
+              if (!vms_add_indexes_from_list (abfd, cs, name, &lhs.g_g_rfa))
+                return FALSE;
+              if (!vms_add_indexes_from_list (abfd, cs, name, &lhs.g_wk_rfa))
+                return FALSE;
+            }
+          else
+            {
+              if (!vms_add_index (cs, name, idx_vbn, idx_off))
+                return FALSE;
+            }
+        }
+
+      /* Point to the next index entry.  */
+      p = keyname + keylen;
+    }
+
+  return TRUE;
+}
+
+/* Read index #IDX, which must have NBREL entries.  */
+
+static struct carsym *
+vms_lib_read_index (bfd *abfd, int idx, unsigned int *nbrel)
+{
+  struct vms_idd idd;
+  unsigned int flags;
+  unsigned int vbn;
+  struct carsym *csbuf;
+  struct carsym_mem csm;
+
+  /* Read index desription.  */
+  if (bfd_seek (abfd, LHD_IDXDESC + idx * IDD_LENGTH, SEEK_SET) != 0
+      || bfd_bread (&idd, sizeof (idd), abfd) != sizeof (idd))
+    return NULL;
+
+  /* Sanity checks.  */
+  flags = bfd_getl16 (idd.flags);
+  if (!(flags & IDD__FLAGS_ASCII)
+      || !(flags & IDD__FLAGS_VARLENIDX))
+    return NULL;
+
+  csbuf = bfd_alloc (abfd, *nbrel * sizeof (struct carsym));
+  if (csbuf == NULL)
+    return NULL;
+
+  csm.max = *nbrel;
+  csm.nbr = 0;
+  csm.realloced = FALSE;
+  csm.idx = csbuf;
+
+  /* Note: if the index is empty, there is no block to traverse.  */
+  vbn = bfd_getl32 (idd.vbn);
+  if (vbn != 0 && !vms_traverse_index (abfd, vbn, &csm))
+    {
+      if (csm.realloced && csm.idx != NULL)
+        free (csm.idx);
+
+      /* Note: in case of error, we can free what was allocated on the
+         BFD's objalloc.  */
+      bfd_release (abfd, csbuf);
+      return NULL;
+    }
+
+  if (csm.realloced)
+    {
+      /* There are more entries than the first estimate.  Allocate on
+         the BFD's objalloc.  */
+      csbuf = bfd_alloc (abfd, csm.nbr * sizeof (struct carsym));
+      if (csbuf == NULL)
+        return NULL;
+      memcpy (csbuf, csm.idx, csm.nbr * sizeof (struct carsym));
+      free (csm.idx);
+      *nbrel = csm.nbr;
+    }
+  return csbuf;
+}
+
+/* Standard function.  */
+
+static const bfd_target *
+_bfd_vms_lib_archive_p (bfd *abfd, enum vms_lib_kind kind)
+{
+  struct vms_lhd lhd;
+  unsigned int sanity;
+  unsigned int majorid;
+  struct lib_tdata *tdata_hold;
+  struct lib_tdata *tdata;
+  unsigned int dcxvbn;
+  unsigned int nbr_ent;
+
+  /* Read header.  */
+  if (bfd_bread (&lhd, sizeof (lhd), abfd) != sizeof (lhd))
+    {
+      if (bfd_get_error () != bfd_error_system_call)
+	bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+
+  /* Check sanity (= magic) number.  */
+  sanity = bfd_getl32 (lhd.sanity);
+  if (!(sanity == LHD_SANEID3
+        || sanity == LHD_SANEID6
+        || sanity == LHD_SANEID_DCX))
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+  majorid = bfd_getl32 (lhd.majorid);
+
+  /* Check archive kind.  */
+  switch (kind)
+    {
+    case vms_lib_alpha:
+      if ((lhd.type != LBR__C_TYP_EOBJ && lhd.type != LBR__C_TYP_ESHSTB)
+          || majorid != LBR_MAJORID
+          || lhd.nindex != 2)
+        {
+          bfd_set_error (bfd_error_wrong_format);
+          return NULL;
+        }
+      break;
+    case vms_lib_ia64:
+      if ((lhd.type != LBR__C_TYP_IOBJ && lhd.type != LBR__C_TYP_ISHSTB)
+          || majorid != LBR_ELFMAJORID
+          || lhd.nindex != 2)
+        {
+          bfd_set_error (bfd_error_wrong_format);
+          return NULL;
+        }
+      break;
+    case vms_lib_txt:
+      if ((lhd.type != LBR__C_TYP_TXT
+           && lhd.type != LBR__C_TYP_MLB
+           && lhd.type != LBR__C_TYP_HLP)
+          || majorid != LBR_MAJORID
+          || lhd.nindex != 1)
+        {
+          bfd_set_error (bfd_error_wrong_format);
+          return NULL;
+        }
+      break;
+    default:
+      abort ();
+    }
+
+  /* Allocate and initialize private data.  */
+  tdata_hold = bfd_libdata (abfd);
+  tdata = (struct lib_tdata *) bfd_zalloc (abfd, sizeof (struct lib_tdata));
+  if (tdata == NULL)
+    return NULL;
+  abfd->tdata.any = (void *)tdata;
+  tdata->ver = majorid;
+  tdata->mhd_size = MHD__C_USRDAT + lhd.mhdusz;
+  tdata->type = lhd.type;
+  tdata->kind = kind;
+  tdata->credat_lo = bfd_getl32 (lhd.credat + 0);
+  tdata->credat_hi = bfd_getl32 (lhd.credat + 4);
+
+  /* Read indexes.  */
+  tdata->nbr_modules = bfd_getl32 (lhd.modcnt);
+  tdata->artdata.symdef_count = bfd_getl32 (lhd.idxcnt) - tdata->nbr_modules;
+  nbr_ent = tdata->nbr_modules;
+  tdata->modules = vms_lib_read_index (abfd, 0, &nbr_ent);
+  if (tdata->modules == NULL || nbr_ent != tdata->nbr_modules)
+    goto err;
+  if (lhd.nindex == 2)
+    {
+      nbr_ent = tdata->artdata.symdef_count;
+      tdata->artdata.symdefs = vms_lib_read_index (abfd, 1, &nbr_ent);
+      if (tdata->artdata.symdefs == NULL)
+        goto err;
+      /* Only IA64 archives may have more entries in the index that what
+         was declared.  */
+      if (nbr_ent != tdata->artdata.symdef_count
+          && kind != vms_lib_ia64)
+        goto err;
+      tdata->artdata.symdef_count = nbr_ent;
+    }
+  tdata->cache = bfd_zalloc (abfd, sizeof (bfd *) * tdata->nbr_modules);
+  if (tdata->cache == NULL)
+    goto err;
+
+  /* Read DCX submaps.  */
+  dcxvbn = bfd_getl32 (lhd.dcxmapvbn);
+  if (dcxvbn != 0)
+    {
+      unsigned char buf_reclen[4];
+      unsigned int reclen;
+      unsigned char *buf;
+      struct vms_dcxmap *map;
+      unsigned int sbm_off;
+      unsigned int i;
+
+      if (bfd_seek (abfd, (dcxvbn - 1) * VMS_BLOCK_SIZE, SEEK_SET) != 0
+          || bfd_bread (buf_reclen, sizeof (buf_reclen), abfd)
+          != sizeof (buf_reclen))
+        goto err;
+      reclen = bfd_getl32 (buf_reclen);
+      buf = bfd_malloc (reclen);
+      if (buf == NULL)
+        goto err;
+      if (bfd_bread (buf, reclen, abfd) != reclen)
+        {
+          free (buf);
+          goto err;
+        }
+      map = (struct vms_dcxmap *)buf;
+      tdata->nbr_dcxsbm = bfd_getl16 (map->nsubs);
+      sbm_off = bfd_getl16 (map->sub0);
+      tdata->dcxsbm = (struct dcxsbm_desc *)bfd_alloc
+        (abfd, tdata->nbr_dcxsbm * sizeof (struct dcxsbm_desc));
+      for (i = 0; i < tdata->nbr_dcxsbm; i++)
+        {
+          struct vms_dcxsbm *sbm = (struct vms_dcxsbm *) (buf + sbm_off);
+          struct dcxsbm_desc *sbmdesc = &tdata->dcxsbm[i];
+          unsigned int sbm_len;
+          unsigned int sbm_sz;
+          unsigned int off;
+          unsigned char *data = (unsigned char *)sbm;
+          unsigned char *buf1;
+          unsigned int l, j;
+
+          sbm_sz = bfd_getl16 (sbm->size);
+          sbm_off += sbm_sz;
+          BFD_ASSERT (sbm_off <= reclen);
+
+          sbmdesc->min_char = sbm->min_char;
+          BFD_ASSERT (sbmdesc->min_char == 0);
+          sbmdesc->max_char = sbm->max_char;
+          sbm_len = sbmdesc->max_char - sbmdesc->min_char + 1;
+          l = (2 * sbm_len + 7) / 8;
+          BFD_ASSERT
+            (sbm_sz >= sizeof (struct vms_dcxsbm) + l + 3 * sbm_len
+             || (tdata->nbr_dcxsbm == 1
+                 && sbm_sz >= sizeof (struct vms_dcxsbm) + l + sbm_len));
+          sbmdesc->flags = (unsigned char *)bfd_alloc (abfd, l);
+          memcpy (sbmdesc->flags, data + bfd_getl16 (sbm->flags), l);
+          sbmdesc->nodes = (unsigned char *)bfd_alloc (abfd, 2 * sbm_len);
+          memcpy (sbmdesc->nodes, data + bfd_getl16 (sbm->nodes), 2 * sbm_len);
+          off = bfd_getl16 (sbm->next);
+          if (off != 0)
+            {
+              /* Read the 'next' array.  */
+              sbmdesc->next = (unsigned short *)bfd_alloc
+                (abfd, sbm_len * sizeof (unsigned short));
+              buf1 = data + off;
+              for (j = 0; j < sbm_len; j++)
+                sbmdesc->next[j] = bfd_getl16 (buf1 + j * 2);
+            }
+          else
+            {
+              /* There is no next array if there is only one submap.  */
+              BFD_ASSERT (tdata->nbr_dcxsbm == 1);
+              sbmdesc->next = NULL;
+            }
+        }
+      free (buf);
+    }
+  else
+    {
+      tdata->nbr_dcxsbm = 0;
+    }
+
+  /* The map is always present.  Also mark shared image library.  */
+  abfd->has_armap = TRUE;
+  if (tdata->type == LBR__C_TYP_ESHSTB || tdata->type == LBR__C_TYP_ISHSTB)
+    abfd->is_thin_archive = TRUE;
+
+  return abfd->xvec;
+
+ err:
+  bfd_release (abfd, tdata);
+  abfd->tdata.any = (void *)tdata_hold;;
+  return NULL;
+}
+
+/* Standard function for alpha libraries.  */
+
+const bfd_target *
+_bfd_vms_lib_alpha_archive_p (bfd *abfd)
+{
+  return _bfd_vms_lib_archive_p (abfd, vms_lib_alpha);
+}
+
+/* Standard function for ia64 libraries.  */
+
+const bfd_target *
+_bfd_vms_lib_ia64_archive_p (bfd *abfd)
+{
+  return _bfd_vms_lib_archive_p (abfd, vms_lib_ia64);
+}
+
+/* Standard function for text libraries.  */
+
+static const bfd_target *
+_bfd_vms_lib_txt_archive_p (bfd *abfd)
+{
+  return _bfd_vms_lib_archive_p (abfd, vms_lib_txt);
+}
+
+/* Standard bfd function.  */
+
+static bfd_boolean
+_bfd_vms_lib_mkarchive (bfd *abfd, enum vms_lib_kind kind)
+{
+  struct lib_tdata *tdata;
+
+  tdata = (struct lib_tdata *) bfd_zalloc (abfd, sizeof (struct lib_tdata));
+  if (tdata == NULL)
+    return FALSE;
+
+  abfd->tdata.any = (void *)tdata;
+  vms_get_time (&tdata->credat_hi, &tdata->credat_lo);
+
+  tdata->kind = kind;
+  switch (kind)
+    {
+    case vms_lib_alpha:
+      tdata->ver = LBR_MAJORID;
+      tdata->mhd_size = offsetof (struct vms_mhd, pad1);
+      tdata->type = LBR__C_TYP_EOBJ;
+      break;
+    case vms_lib_ia64:
+      tdata->ver = LBR_ELFMAJORID;
+      tdata->mhd_size = sizeof (struct vms_mhd);
+      tdata->type = LBR__C_TYP_IOBJ;
+      break;
+    default:
+      abort ();
+    }
+
+  tdata->nbr_modules = 0;
+  tdata->artdata.symdef_count = 0;
+  tdata->modules = NULL;
+  tdata->artdata.symdefs = NULL;
+  tdata->cache = NULL;
+
+  return TRUE;
+}
+
+bfd_boolean
+_bfd_vms_lib_alpha_mkarchive (bfd *abfd)
+{
+  return _bfd_vms_lib_mkarchive (abfd, vms_lib_alpha);
+}
+
+bfd_boolean
+_bfd_vms_lib_ia64_mkarchive (bfd *abfd)
+{
+  return _bfd_vms_lib_mkarchive (abfd, vms_lib_ia64);
+}
+
+/* Find NAME in the symbol index.  Return the index.  */
+
+symindex
+_bfd_vms_lib_find_symbol (bfd *abfd, const char *name)
+{
+  struct lib_tdata *tdata = bfd_libdata (abfd);
+  carsym *syms = tdata->artdata.symdefs;
+  int lo, hi;
+
+  /* Open-coded binary search for speed.  */
+  lo = 0;
+  hi = tdata->artdata.symdef_count - 1;
+
+  while (lo <= hi)
+    {
+      int mid = lo + (hi - lo) / 2;
+      int diff;
+
+      diff = (char)(name[0] - syms[mid].name[0]);
+      if (diff == 0)
+        diff = strcmp (name, syms[mid].name);
+      if (diff == 0)
+        return mid;
+      else if (diff < 0)
+        hi = mid - 1;
+      else
+        lo = mid + 1;
+    }
+  return BFD_NO_MORE_SYMBOLS;
+}
+
+/* IO vector for archive member.  Need that because members are not linearly
+   stored in archives.  */
+
+struct vms_lib_iovec
+{
+  /* Current offset.  */
+  ufile_ptr where;
+
+  /* Length of the module, when known.  */
+  ufile_ptr file_len;
+
+  /* Current position in the record from bfd_bread point of view (ie, after
+     decompression).  0 means that no data byte have been read, -2 and -1
+     are reserved for the length word.  */
+  int rec_pos;
+#define REC_POS_NL   -4
+#define REC_POS_PAD  -3
+#define REC_POS_LEN0 -2
+#define REC_POS_LEN1 -1
+
+  /* Record length.  */
+  unsigned short rec_len;
+  /* Number of bytes to read in the current record.  */
+  unsigned short rec_rem;
+  /* Offset of the next block.  */
+  file_ptr next_block;
+  /* Current *data* offset in the data block.  */
+  unsigned short blk_off;
+
+  /* Offset of the first block.  Extracted from the index.  */
+  file_ptr first_block;
+
+  /* Initial next_block.  Extracted when the MHD is read.  */
+  file_ptr init_next_block;
+  /* Initial blk_off, once the MHD is read.  */
+  unsigned short init_blk_off;
+
+  /* Used to store any 3 byte record, which could be the EOF pattern.  */
+  unsigned char pattern[4];
+
+  /* DCX.  */
+  struct dcxsbm_desc *dcxsbms;
+  /* Current submap.  */
+  struct dcxsbm_desc *dcx_sbm;
+  /* Current offset in the submap.  */
+  unsigned int dcx_offset;
+  int dcx_pos;
+
+  /* Compressed buffer.  */
+  unsigned char *dcx_buf;
+  /* Size of the buffer.  Used to resize.  */
+  unsigned int dcx_max;
+  /* Number of valid bytes in the buffer.  */
+  unsigned int dcx_rlen;
+};
+
+/* Return the current position.  */
+
+static file_ptr
+vms_lib_btell (struct bfd *abfd)
+{
+  struct vms_lib_iovec *vec = (struct vms_lib_iovec *) abfd->iostream;
+  return vec->where;
+}
+
+/* Read the header of the next data block if all bytes of the current block
+   have been read.  */
+
+static bfd_boolean
+vms_lib_read_block (struct bfd *abfd)
+{
+  struct vms_lib_iovec *vec = (struct vms_lib_iovec *) abfd->iostream;
+
+  if (vec->blk_off == DATA__LENGTH)
+    {
+      unsigned char hdr[DATA__DATA];
+
+      /* Read next block.  */
+      if (bfd_seek (abfd->my_archive, vec->next_block, SEEK_SET) != 0)
+        return FALSE;
+      if (bfd_bread (hdr, sizeof (hdr), abfd->my_archive) != sizeof (hdr))
+        return FALSE;
+      vec->next_block = (bfd_getl32 (hdr + 2) - 1) * VMS_BLOCK_SIZE;
+      vec->blk_off = sizeof (hdr);
+    }
+  return TRUE;
+}
+
+/* Read NBYTES from ABFD into BUF if not NULL.  If BUF is NULL, bytes are
+   not stored.  Read linearly from the library, but handle blocks.  This
+   function does not handle records nor EOF.  */
+
+static file_ptr
+vms_lib_bread_raw (struct bfd *abfd, unsigned char *buf, file_ptr nbytes)
+{
+  struct vms_lib_iovec *vec = (struct vms_lib_iovec *) abfd->iostream;
+  file_ptr res;
+
+  res = 0;
+  while (nbytes > 0)
+    {
+      unsigned int l;
+
+      /* Be sure the current data block is read.  */
+      if (!vms_lib_read_block (abfd))
+        return -1;
+
+      /* Do not read past the data block, do not read more than requested.  */
+      l = DATA__LENGTH - vec->blk_off;
+      if (l > nbytes)
+        l = nbytes;
+      if (l == 0)
+        return 0;
+      if (buf != NULL)
+        {
+          /* Really read into BUF.  */
+          if (bfd_bread (buf, l, abfd->my_archive) != l)
+            return -1;
+        }
+      else
+        {
+          /* Make as if we are reading.  */
+          if (bfd_seek (abfd->my_archive, l, SEEK_CUR) != 0)
+            return -1;
+        }
+
+      if (buf != NULL)
+        buf += l;
+      vec->blk_off += l;
+      nbytes -= l;
+      res += l;
+    }
+  return res;
+}
+
+/* Decompress NBYTES from VEC.  Store the bytes into BUF if not NULL.  */
+
+static file_ptr
+vms_lib_dcx (struct vms_lib_iovec *vec, unsigned char *buf, file_ptr nbytes)
+{
+  struct dcxsbm_desc *sbm;
+  unsigned int i;
+  unsigned int offset;
+  unsigned int j;
+  file_ptr res = 0;
+
+  /* The loop below expect to deliver at least one byte.  */
+  if (nbytes == 0)
+    return 0;
+
+  /* Get the current state.  */
+  sbm = vec->dcx_sbm;
+  offset = vec->dcx_offset;
+  j = vec->dcx_pos & 7;
+
+  for (i = vec->dcx_pos >> 3; i < vec->dcx_rlen; i++)
+    {
+      unsigned char b = vec->dcx_buf[i];
+
+      for (; j < 8; j++)
+        {
+          if (b & (1 << j))
+            offset++;
+          if (!(sbm->flags[offset >> 3] & (1 << (offset & 7))))
+            {
+              unsigned int n_offset = sbm->nodes[offset];
+              if (n_offset == 0)
+                {
+                  /* End of buffer.  Stay where we are.  */
+                  vec->dcx_pos = (i << 3) + j;
+                  if (b & (1 << j))
+                    offset--;
+                  vec->dcx_offset = offset;
+                  vec->dcx_sbm = sbm;
+                  return res;
+                }
+              offset = 2 * n_offset;
+            }
+          else
+            {
+              unsigned char v = sbm->nodes[offset];
+
+              if (sbm->next != NULL)
+                sbm = vec->dcxsbms + sbm->next[v];
+              offset = 0;
+              res++;
+
+              if (buf)
+                {
+                  *buf++ = v;
+                  nbytes--;
+
+                  if (nbytes == 0)
+                    {
+                      vec->dcx_pos = (i << 3) + j + 1;
+                      vec->dcx_offset = offset;
+                      vec->dcx_sbm = sbm;
+
+                      return res;
+                    }
+                }
+            }
+        }
+      j = 0;
+    }
+  return -1;
+}
+
+/* Standard IOVEC function.  */
+
+static file_ptr
+vms_lib_bread (struct bfd *abfd, void *vbuf, file_ptr nbytes)
+{
+  struct vms_lib_iovec *vec = (struct vms_lib_iovec *) abfd->iostream;
+  file_ptr res;
+  file_ptr chunk;
+  unsigned char *buf = (unsigned char *)vbuf;
+
+  /* Do not read past the end.  */
+  if (vec->where >= vec->file_len)
+    return 0;
+
+  res = 0;
+  while (nbytes > 0)
+    {
+      if (vec->rec_rem == 0)
+        {
+          unsigned char blen[2];
+
+          /* Read record length.  */
+          if (vms_lib_bread_raw (abfd, blen, sizeof (blen)) != sizeof (blen))
+            return -1;
+          vec->rec_len = bfd_getl16 (blen);
+          if (bfd_libdata (abfd->my_archive)->kind == vms_lib_txt)
+            {
+              /* Discard record size and align byte.  */
+              vec->rec_pos = 0;
+              vec->rec_rem = vec->rec_len;
+            }
+          else
+            {
+              /* Prepend record size.  */
+              vec->rec_pos = REC_POS_LEN0;
+              vec->rec_rem = (vec->rec_len + 1) & ~1;	/* With align byte.  */
+            }
+          if (vec->rec_len == 3)
+            {
+              /* Possibly end of file.  Check the pattern.  */
+              if (vms_lib_bread_raw (abfd, vec->pattern, 4) != 4)
+                return -1;
+              if (!memcmp (vec->pattern, eotdesc + 2, 3))
+                {
+                  /* This is really an EOF.  */
+                  vec->where += res;
+                  vec->file_len = vec->where;
+                  return res;
+                }
+            }
+
+          if (vec->dcxsbms != NULL)
+            {
+              /* This is a compressed member.  */
+              unsigned int len;
+              file_ptr elen;
+
+              /* Be sure there is enough room for the expansion.  */
+              len = (vec->rec_len + 1) & ~1;
+              if (len > vec->dcx_max)
+                {
+                  while (len > vec->dcx_max)
+                    vec->dcx_max *= 2;
+                  vec->dcx_buf = bfd_alloc (abfd, vec->dcx_max);
+                  if (vec->dcx_buf == NULL)
+                    return -1;
+                }
+
+              /* Read the compressed record.  */
+              vec->dcx_rlen = len;
+              if (vec->rec_len == 3)
+                {
+                  /* Already read.  */
+                  memcpy (vec->dcx_buf, vec->pattern, 3);
+                }
+              else
+                {
+                  elen = vms_lib_bread_raw (abfd, vec->dcx_buf, len);
+                  if (elen != len)
+                    return -1;
+                }
+
+              /* Dummy expansion to get the expanded length.  */
+              vec->dcx_offset = 0;
+              vec->dcx_sbm = vec->dcxsbms;
+              vec->dcx_pos = 0;
+              elen = vms_lib_dcx (vec, NULL, 0x10000);
+              if (elen < 0)
+                return -1;
+              vec->rec_len = elen;
+              vec->rec_rem = elen;
+
+              /* Reset the state.  */
+              vec->dcx_offset = 0;
+              vec->dcx_sbm = vec->dcxsbms;
+              vec->dcx_pos = 0;
+            }
+        }
+      if (vec->rec_pos < 0)
+        {
+          unsigned char c;
+          switch (vec->rec_pos)
+            {
+            case REC_POS_LEN0:
+              c = vec->rec_len & 0xff;
+              vec->rec_pos = REC_POS_LEN1;
+              break;
+            case REC_POS_LEN1:
+              c = (vec->rec_len >> 8) & 0xff;
+              vec->rec_pos = 0;
+              break;
+            case REC_POS_PAD:
+              c = 0;
+              vec->rec_rem = 0;
+              break;
+            case REC_POS_NL:
+              c = '\n';
+              vec->rec_rem = 0;
+              break;
+            default:
+              abort ();
+            }
+          if (buf != NULL)
+            {
+              *buf = c;
+              buf++;
+            }
+          nbytes--;
+          res++;
+          continue;
+        }
+
+      if (nbytes > vec->rec_rem)
+        chunk = vec->rec_rem;
+      else
+        chunk = nbytes;
+
+      if (vec->dcxsbms != NULL)
+        {
+          /* Optimize the stat() case: no need to decompress again as we
+             know the length.  */
+          if (!(buf == NULL && chunk == vec->rec_rem))
+            chunk = vms_lib_dcx (vec, buf, chunk);
+        }
+      else
+        {
+          if (vec->rec_len == 3)
+            {
+              if (buf != NULL)
+                memcpy (buf, vec->pattern + vec->rec_pos, chunk);
+            }
+          else
+            chunk = vms_lib_bread_raw (abfd, buf, chunk);
+        }
+      if (chunk < 0)
+        return -1;
+      res += chunk;
+      if (buf != NULL)
+        buf += chunk;
+      nbytes -= chunk;
+      vec->rec_pos += chunk;
+      vec->rec_rem -= chunk;
+
+      if (vec->rec_rem == 0)
+        {
+          /* End of record reached.  */
+          if (bfd_libdata (abfd->my_archive)->kind == vms_lib_txt)
+            {
+              if ((vec->rec_len & 1) == 1
+                  && vec->rec_len != 3
+                  && vec->dcxsbms == NULL)
+                {
+                  /* Eat the pad byte.  */
+                  unsigned char pad;
+                  if (vms_lib_bread_raw (abfd, &pad, 1) != 1)
+                    return -1;
+                }
+              vec->rec_pos = REC_POS_NL;
+              vec->rec_rem = 1;
+            }
+          else
+            {
+              if ((vec->rec_len & 1) == 1 && vec->dcxsbms != NULL)
+                {
+                  vec->rec_pos = REC_POS_PAD;
+                  vec->rec_rem = 1;
+                }
+            }
+        }
+    }
+  vec->where += res;
+  return res;
+}
+
+/* Standard function, but we currently only handle the rewind case.  */
+
+static int
+vms_lib_bseek (struct bfd *abfd, file_ptr offset, int whence)
+{
+  struct vms_lib_iovec *vec = (struct vms_lib_iovec *) abfd->iostream;
+
+  if (whence == SEEK_SET && offset == 0)
+    {
+      vec->where = 0;
+      vec->rec_rem = 0;
+      vec->dcx_pos = -1;
+      vec->blk_off = vec->init_blk_off;
+      vec->next_block = vec->init_next_block;
+
+      if (bfd_seek (abfd->my_archive, vec->first_block, SEEK_SET) != 0)
+        return -1;
+    }
+  else
+    abort ();
+  return 0;
+}
+
+static file_ptr
+vms_lib_bwrite (struct bfd *abfd ATTRIBUTE_UNUSED,
+	      const void *where ATTRIBUTE_UNUSED,
+	      file_ptr nbytes ATTRIBUTE_UNUSED)
+{
+  return -1;
+}
+
+static int
+vms_lib_bclose (struct bfd *abfd)
+{
+  abfd->iostream = NULL;
+  return 0;
+}
+
+static int
+vms_lib_bflush (struct bfd *abfd ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+vms_lib_bstat (struct bfd *abfd ATTRIBUTE_UNUSED,
+               struct stat *sb ATTRIBUTE_UNUSED)
+{
+  /* Not supported.  */
+  return 0;
+}
+
+static void *
+vms_lib_bmmap (struct bfd *abfd ATTRIBUTE_UNUSED,
+               void *addr ATTRIBUTE_UNUSED,
+               bfd_size_type len ATTRIBUTE_UNUSED,
+               int prot ATTRIBUTE_UNUSED,
+               int flags ATTRIBUTE_UNUSED,
+               file_ptr offset ATTRIBUTE_UNUSED,
+               void **map_addr ATTRIBUTE_UNUSED,
+               bfd_size_type *map_len ATTRIBUTE_UNUSED)
+{
+  return (void *) -1;
+}
+
+static const struct bfd_iovec vms_lib_iovec = {
+  &vms_lib_bread, &vms_lib_bwrite, &vms_lib_btell, &vms_lib_bseek,
+  &vms_lib_bclose, &vms_lib_bflush, &vms_lib_bstat, &vms_lib_bmmap
+};
+
+/* Open a library module.  FILEPOS is the position of the module header.  */
+
+static bfd_boolean
+vms_lib_bopen (bfd *el, file_ptr filepos)
+{
+  struct vms_lib_iovec *vec;
+  unsigned char buf[256];
+  struct vms_mhd *mhd;
+  struct lib_tdata *tdata = bfd_libdata (el->my_archive);
+  unsigned int len;
+
+  /* Allocate and initialized the iovec.  */
+  vec = bfd_zalloc (el, sizeof (*vec));
+  if (vec == NULL)
+    return FALSE;
+
+  el->iostream = vec;
+  el->iovec = &vms_lib_iovec;
+
+  /* File length is not known.  */
+  vec->file_len = -1;
+
+  /* Read the first data block.  */
+  vec->next_block = filepos & ~(VMS_BLOCK_SIZE - 1);
+  vec->blk_off = DATA__LENGTH;
+  if (!vms_lib_read_block (el))
+    return FALSE;
+
+  /* Prepare to read the first record.  */
+  vec->blk_off = filepos & (VMS_BLOCK_SIZE - 1);
+  vec->rec_rem = 0;
+  if (bfd_seek (el->my_archive, filepos, SEEK_SET) != 0)
+    return FALSE;
+
+  /* Read Record length + MHD + align byte.  */
+  len = tdata->mhd_size;
+  if (vms_lib_bread_raw (el, buf, 2) != 2)
+    return FALSE;
+  if (bfd_getl16 (buf) != len)
+    return FALSE;
+  len = (len + 1) & ~1;
+  BFD_ASSERT (len <= sizeof (buf));
+  if (vms_lib_bread_raw (el, buf, len) != len)
+    return FALSE;
+
+  /* Get info from mhd.  */
+  mhd = (struct vms_mhd *)buf;
+  /* Check id.  */
+  if (mhd->id != MHD__C_MHDID)
+    return FALSE;
+  if (len >= MHD__C_MHDLEN + 1)
+    el->selective_search = (mhd->objstat & MHD__M_SELSRC) ? 1 : 0;
+  el->mtime = vms_rawtime_to_time_t (mhd->datim);
+  el->mtime_set = TRUE;
+
+  /* Reinit the iovec so that seek() will point to the first record after
+     the mhd.  */
+  vec->where = 0;
+  vec->init_blk_off = vec->blk_off;
+  vec->init_next_block = vec->next_block;
+  vec->first_block = bfd_tell (el->my_archive);
+  vec->dcxsbms = bfd_libdata (el->my_archive)->dcxsbm;
+
+  if (vec->dcxsbms != NULL)
+    {
+      /* Handle DCX.  */
+      vec->dcx_max = 10 * 1024;
+      vec->dcx_buf = bfd_alloc (el, vec->dcx_max);
+      vec->dcx_pos = -1;
+      if (vec->dcx_buf == NULL)
+        return -1;
+    }
+  return TRUE;
+}
+
+/* Get member MODIDX.  Return NULL in case of error.  */
+
+static bfd *
+_bfd_vms_lib_get_module (bfd *abfd, unsigned int modidx)
+{
+  struct lib_tdata *tdata = bfd_libdata (abfd);
+  bfd *res;
+  file_ptr file_off;
+
+  /* Sanity check.  */
+  if (modidx >= tdata->nbr_modules)
+    return NULL;
+
+  /* Already loaded.  */
+  if (tdata->cache[modidx])
+    return tdata->cache[modidx];
+
+  /* Build it.  */
+  file_off = tdata->modules[modidx].file_offset;
+  if (tdata->type != LBR__C_TYP_IOBJ)
+    {
+      res = _bfd_create_empty_archive_element_shell (abfd);
+      if (res == NULL)
+        return NULL;
+
+      /* Special reader to deal with data blocks.  */
+      if (!vms_lib_bopen (res, file_off))
+        return NULL;
+    }
+  else
+    {
+      char buf[256];
+      struct vms_mhd *mhd;
+      struct areltdata *arelt;
+
+      /* Sanity check.  The MHD must be big enough to contain module size.  */
+      if (tdata->mhd_size < offsetof (struct vms_mhd, modsize) + 4)
+        return NULL;
+
+      /* Read the MHD now.  */
+      if (bfd_seek (abfd, file_off, SEEK_SET) != 0)
+        return NULL;
+      if (bfd_bread (buf, tdata->mhd_size, abfd) != tdata->mhd_size)
+        return NULL;
+
+      res = _bfd_create_empty_archive_element_shell (abfd);
+      if (res == NULL)
+        return NULL;
+      arelt = bfd_zalloc (res, sizeof (*arelt));
+      if (arelt == NULL)
+        return NULL;
+      res->arelt_data = arelt;
+
+      /* Get info from mhd.  */
+      mhd = (struct vms_mhd *)buf;
+      if (mhd->id != MHD__C_MHDID)
+        return NULL;
+      if (tdata->mhd_size >= offsetof (struct vms_mhd, objstat) + 1)
+        res->selective_search = (mhd->objstat & MHD__M_SELSRC) ? 1 : 0;
+      res->mtime = vms_rawtime_to_time_t (mhd->datim);
+      res->mtime_set = TRUE;
+
+      arelt->parsed_size = bfd_getl32 (mhd->modsize);
+
+      /* No need for a special reader as members are stored linearly.
+         Just skip the MHD.  */
+      res->origin = file_off + tdata->mhd_size;
+    }
+
+  res->filename = tdata->modules[modidx].name;
+
+  tdata->cache[modidx] = res;
+
+  return res;
+}
+
+/* Standard function: get member at IDX.  */
+
+bfd *
+_bfd_vms_lib_get_elt_at_index (bfd *abfd, symindex symidx)
+{
+  struct lib_tdata *tdata = bfd_libdata (abfd);
+  file_ptr file_off;
+  unsigned int modidx;
+
+  /* Check symidx.  */
+  if (symidx > tdata->artdata.symdef_count)
+    return NULL;
+  file_off = tdata->artdata.symdefs[symidx].file_offset;
+
+  /* Linear-scan.  */
+  for (modidx = 0; modidx < tdata->nbr_modules; modidx++)
+    {
+      if (tdata->modules[modidx].file_offset == file_off)
+        break;
+    }
+  if (modidx >= tdata->nbr_modules)
+    return NULL;
+
+  return _bfd_vms_lib_get_module (abfd, modidx);
+}
+
+/* Elements of an imagelib are stubs.  You can get the real image with this
+   function.  */
+
+bfd *
+_bfd_vms_lib_get_imagelib_file (bfd *el)
+{
+  bfd *archive = el->my_archive;
+  const char *modname = el->filename;
+  int modlen = strlen (modname);
+  char *filename;
+  int j;
+  bfd *res;
+
+  /* Convert module name to lower case and append '.exe'.  */
+  filename = bfd_alloc (el, modlen + 5);
+  if (filename == NULL)
+    return NULL;
+  for (j = 0; j < modlen; j++)
+    if (ISALPHA (modname[j]))
+      filename[j] = TOLOWER (modname[j]);
+    else
+      filename[j] = modname[j];
+  memcpy (filename + modlen, ".exe", 5);
+
+  filename = _bfd_append_relative_path (archive, filename);
+  if (filename == NULL)
+    return NULL;
+  res = bfd_openr (filename, NULL);
+
+  if (res == NULL)
+    {
+      (*_bfd_error_handler)(_("could not open shared image '%s' from '%s'"),
+                            filename, archive->filename);
+      bfd_release (archive, filename);
+      return NULL;
+    }
+
+  /* FIXME: put it in a cache ?  */
+  return res;
+}
+
+/* Standard function.  */
+
+bfd *
+_bfd_vms_lib_openr_next_archived_file (bfd *archive,
+                                       bfd *last_file)
+{
+  unsigned int idx;
+  bfd *res;
+
+  if (!last_file)
+    idx = 0;
+  else
+    idx = last_file->proxy_origin + 1;
+
+  if (idx >= bfd_libdata (archive)->nbr_modules)
+    {
+      bfd_set_error (bfd_error_no_more_archived_files);
+      return NULL;
+    }
+
+  res = _bfd_vms_lib_get_module (archive, idx);
+  if (res == NULL)
+    return res;
+  res->proxy_origin = idx;
+  return res;
+}
+
+/* Standard function.  Just compute the length.  */
+
+int
+_bfd_vms_lib_generic_stat_arch_elt (bfd *abfd, struct stat *st)
+{
+  struct lib_tdata *tdata;
+
+  /* Sanity check.  */
+  if (abfd->my_archive == NULL)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return -1;
+    }
+
+  tdata = bfd_libdata (abfd->my_archive);
+  if (tdata->type != LBR__C_TYP_IOBJ)
+    {
+      struct vms_lib_iovec *vec = (struct vms_lib_iovec *) abfd->iostream;
+
+      if (vec->file_len == (ufile_ptr)-1)
+        {
+          if (vms_lib_bseek (abfd, 0, SEEK_SET) != 0)
+            return -1;
+
+          /* Compute length.  */
+          while (vms_lib_bread (abfd, NULL, 1 << 20) > 0)
+            ;
+        }
+      st->st_size = vec->file_len;
+    }
+  else
+    {
+      st->st_size = ((struct areltdata *)abfd->arelt_data)->parsed_size;
+    }
+
+  if (abfd->mtime_set)
+    st->st_mtime = abfd->mtime;
+  else
+    st->st_mtime = 0;
+  st->st_uid = 0;
+  st->st_gid = 0;
+  st->st_mode = 0644;
+
+  return 0;
+}
+
+/* Internal representation of an index entry.  */
+
+struct lib_index
+{
+  /* Corresponding archive member.  */
+  bfd *abfd;
+
+  /* Number of reference to this entry.  */
+  unsigned int ref;
+
+  /* Length of the key.  */
+  unsigned short namlen;
+
+  /* Key.  */
+  const char *name;
+};
+
+/* Used to sort index entries.  */
+
+static int
+lib_index_cmp (const void *lv, const void *rv)
+{
+  const struct lib_index *l = lv;
+  const struct lib_index *r = rv;
+
+  return strcmp (l->name, r->name);
+}
+
+/* Maximum number of index blocks level.  */
+
+#define MAX_LEVEL 10
+
+/* Get the size of an index entry.  */
+
+static unsigned int
+get_idxlen (struct lib_index *idx, bfd_boolean is_elfidx)
+{
+  if (is_elfidx)
+    {
+      if (idx->namlen > MAX_KEYLEN)
+        return 9 + sizeof (struct vms_rfa);
+      else
+        return 9 + idx->namlen;
+    }
+  else
+    return 7 + idx->namlen;
+}
+
+/* Write the index.  VBN is the first vbn to be used, and will contain
+   on return the last vbn.
+   Can be called with ABFD set to NULL just to size the index.
+   Return TRUE on success.  */
+
+static bfd_boolean
+vms_write_index (bfd *abfd,
+                 struct lib_index *idx, unsigned int nbr, unsigned int *vbn,
+                 unsigned int *topvbn, bfd_boolean is_elfidx)
+{
+  unsigned int i;
+  int j;
+  int level;
+  struct vms_indexdef *rblk[MAX_LEVEL];
+  struct idxblk
+  {
+    unsigned int vbn;
+    unsigned short len;
+    unsigned short lastlen;
+  } blk[MAX_LEVEL];
+
+  /* The kbn blocks are used to store long symbol names.  */
+  unsigned int kbn_sz = 0;   /* Number of bytes available in the kbn block.  */
+  unsigned int kbn_vbn = 0;  /* VBN of the kbn block.  */
+  unsigned char *kbn_blk = NULL; /* Contents of the kbn block.  */
+
+  if (nbr == 0)
+    {
+      /* No entries.  Very easy to handle.  */
+      if (topvbn != NULL)
+        *topvbn = 0;
+      return TRUE;
+    }
+
+  if (abfd == NULL)
+    {
+      /* Sort the index the first time this function is called.  */
+      qsort (idx, nbr, sizeof (struct lib_index), lib_index_cmp);
+    }
+
+  /* Allocate first index block.  */
+  level = 1;
+  if (abfd != NULL)
+    rblk[0] = bfd_zmalloc (sizeof (struct vms_indexdef));
+  blk[0].vbn = (*vbn)++;
+  blk[0].len = 0;
+  blk[0].lastlen = 0;
+
+  for (i = 0; i < nbr; i++, idx++)
+    {
+      unsigned int idxlen;
+      int flush = 0;
+      unsigned int key_vbn = 0;
+      unsigned int key_off = 0;
+
+      idxlen = get_idxlen (idx, is_elfidx);
+
+      if (is_elfidx && idx->namlen >= MAX_KEYLEN)
+        {
+          /* If the key (ie name) is too long, write it in the kbn block.  */
+          unsigned int kl = idx->namlen;
+          unsigned int kl_chunk;
+          const char *key = idx->name;
+
+          /* Write the key in the kbn, chunk after chunk.  */
+          do
+            {
+              if (kbn_sz < sizeof (struct vms_kbn))
+                {
+                  /* Not enough room in the kbn block.  */
+                  if (abfd != NULL)
+                    {
+                      /* Write it to the disk (if there is one).  */
+                      if (kbn_vbn != 0)
+                        {
+                          if (vms_write_block (abfd, kbn_vbn, kbn_blk) != TRUE)
+                            return FALSE;
+                        }
+                      else
+                        {
+                          kbn_blk = bfd_malloc (VMS_BLOCK_SIZE);
+                          if (kbn_blk == NULL)
+                            return FALSE;
+                        }
+                      *(unsigned short *)kbn_blk = 0;
+                    }
+                  kbn_vbn = (*vbn)++;
+                  kbn_sz = VMS_BLOCK_SIZE - 2;
+                }
+              if (kl + sizeof (struct vms_kbn) > kbn_sz)
+                kl_chunk = kbn_sz - sizeof (struct vms_kbn);
+              else
+                kl_chunk = kl;
+
+              if (kbn_blk != NULL)
+                {
+                  struct vms_kbn *kbn;
+
+                  kbn = (struct vms_kbn *)(kbn_blk + VMS_BLOCK_SIZE - kbn_sz);
+
+                  if (key_vbn == 0)
+                    {
+                      /* Save the rfa of the first chunk.  */
+                      key_vbn = kbn_vbn;
+                      key_off = VMS_BLOCK_SIZE - kbn_sz;
+                    }
+
+                  bfd_putl16 (kl_chunk, kbn->keylen);
+                  if (kl_chunk == kl)
+                    {
+                      /* No next chunk.  */
+                      bfd_putl32 (0, kbn->rfa.vbn);
+                      bfd_putl16 (0, kbn->rfa.offset);
+                    }
+                  else
+                    {
+                      /* Next chunk will be at the start of the next block.  */
+                      bfd_putl32 (*vbn, kbn->rfa.vbn);
+                      bfd_putl16 (2, kbn->rfa.offset);
+                    }
+                  memcpy ((char *)(kbn + 1), key, kl_chunk);
+                  key += kl_chunk;
+                }
+              kl -= kl_chunk;
+              kl_chunk = (kl_chunk + 1) & ~1;	  /* Always align.  */
+              kbn_sz -= kl_chunk + sizeof (struct vms_kbn);
+            }
+          while (kl > 0);
+        }
+
+      /* Check if a block might overflow.  In this case we will flush this
+         block and all the blocks below it.  */
+      for (j = 0; j < level; j++)
+        if (blk[j].len + blk[j].lastlen + idxlen > INDEXDEF__BLKSIZ)
+          flush = j + 1;
+
+      for (j = 0; j < level; j++)
+        {
+          if (j < flush)
+            {
+              /* There is not enough room to write the new entry in this
+                 block or in a parent block.  */
+
+              if (j + 1 == level)
+                {
+                  BFD_ASSERT (level < MAX_LEVEL);
+
+                  /* Need to create a parent.  */
+                  if (abfd != NULL)
+                    {
+                      rblk[level] = bfd_zmalloc (sizeof (struct vms_indexdef));
+                      bfd_putl32 (*vbn, rblk[j]->parent);
+                    }
+                  blk[level].vbn = (*vbn)++;
+                  blk[level].len = 0;
+                  blk[level].lastlen = 0;
+
+                  level++;
+                }
+
+              /* Update parent block: write the new entry.  */
+              if (abfd != NULL)
+                {
+                  struct vms_rfa *rfa;
+
+                  /* Copy the whole entry.  */
+                  memcpy (rblk[j + 1]->keys + blk[j + 1].len,
+                          rblk[j]->keys + blk[j].len,
+                          blk[j].lastlen);
+                  /* Fix the entry (which in always the first field of an
+		     entry.  */
+                  rfa = (struct vms_rfa *)(rblk[j + 1]->keys + blk[j + 1].len);
+                  bfd_putl32 (blk[j].vbn, rfa->vbn);
+                  bfd_putl16 (RFADEF__C_INDEX, rfa->offset);
+                }
+
+              if (j + 1 == flush)
+                {
+                  /* And allocate it.  Do it only on the block that won't be
+                     flushed (so that the parent of the parent can be
+                     updated too).  */
+                  blk[j + 1].len += blk[j].lastlen;
+                  blk[j + 1].lastlen = 0;
+                }
+
+              /* Write this block on the disk.  */
+              if (abfd != NULL)
+                {
+                  bfd_putl16 (blk[j].len + blk[j].lastlen, rblk[j]->used);
+                  if (vms_write_block (abfd, blk[j].vbn, rblk[j]) != TRUE)
+                    return FALSE;
+                }
+
+              /* Reset this block.  */
+              blk[j].len = 0;
+              blk[j].lastlen = 0;
+              blk[j].vbn = (*vbn)++;
+            }
+
+          /* Append it to the block.  */
+          if (j == 0)
+            {
+              blk[j].len += blk[j].lastlen;
+
+              if (abfd != NULL)
+                {
+                  struct vms_rfa *rfa;
+
+                  rfa = (struct vms_rfa *)(rblk[j]->keys + blk[j].len);
+                  bfd_putl32 ((idx->abfd->proxy_origin / VMS_BLOCK_SIZE) + 1,
+                              rfa->vbn);
+                  bfd_putl16
+                    ((idx->abfd->proxy_origin % VMS_BLOCK_SIZE)
+                     + (is_elfidx ? 0 : DATA__DATA),
+                     rfa->offset);
+
+                  if (is_elfidx)
+                    {
+                      /* Use elfidx format.  */
+                      struct vms_elfidx *en = (struct vms_elfidx *)rfa;
+
+                      en->flags = 0;
+                      if (key_vbn != 0)
+                        {
+                          /* Long symbol name.  */
+                          struct vms_kbn *k = (struct vms_kbn *)(en->keyname);
+                          bfd_putl16 (sizeof (struct vms_kbn), en->keylen);
+                          bfd_putl16 (idx->namlen, k->keylen);
+                          bfd_putl32 (key_vbn, k->rfa.vbn);
+                          bfd_putl16 (key_off, k->rfa.offset);
+                          en->flags |= ELFIDX__SYMESC;
+                        }
+                      else
+                        {
+                          bfd_putl16 (idx->namlen, en->keylen);
+                          memcpy (en->keyname, idx->name, idx->namlen);
+                        }
+                    }
+                  else
+                    {
+                      /* Use idx format.  */
+                      struct vms_idx *en = (struct vms_idx *)rfa;
+                      en->keylen = idx->namlen;
+                      memcpy (en->keyname, idx->name, idx->namlen);
+                    }
+                }
+            }
+
+          blk[j].lastlen = idxlen;
+        }
+    }
+
+  if (topvbn != NULL)
+    *topvbn = blk[level - 1].vbn;
+
+  if (abfd == NULL)
+    return TRUE;
+
+  /* Flush.  */
+  for (j = 1; j < level; j++)
+    {
+      /* Update parent block: write the new entry.  */
+      unsigned char *en;
+      unsigned char *par;
+      struct vms_rfa *rfa;
+
+      en = rblk[j - 1]->keys + blk[j - 1].len;
+      par = rblk[j]->keys + blk[j].len;
+      memcpy (par, en, blk[j - 1].lastlen);
+      rfa = (struct vms_rfa *)par;
+      bfd_putl32 (blk[j - 1].vbn, rfa->vbn);
+      bfd_putl16 (RFADEF__C_INDEX, rfa->offset);
+    }
+
+  for (j = 0; j < level; j++)
+    {
+      /* Write this block on the disk.  */
+      bfd_putl16 (blk[j].len + blk[j].lastlen, rblk[j]->used);
+      if (vms_write_block (abfd, blk[j].vbn, rblk[j]) != TRUE)
+        return FALSE;
+
+      free (rblk[j]);
+    }
+
+  /* Write the last kbn (if any).  */
+  if (kbn_vbn != 0)
+    {
+      if (vms_write_block (abfd, kbn_vbn, kbn_blk) != TRUE)
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Append data to the data block DATA.  Force write if PAD is true.  */
+
+static bfd_boolean
+vms_write_data_block (bfd *arch, struct vms_datadef *data, file_ptr *off,
+                      const unsigned char *buf, unsigned int len, int pad)
+{
+  while (len > 0 || pad)
+    {
+      unsigned int doff = *off & (VMS_BLOCK_SIZE - 1);
+      unsigned int remlen = (DATA__LENGTH - DATA__DATA) - doff;
+      unsigned int l;
+
+      l = (len > remlen) ? remlen : len;
+      memcpy (data->data + doff, buf, l);
+      buf += l;
+      len -= l;
+      doff += l;
+      *off += l;
+
+      if (doff == (DATA__LENGTH - DATA__DATA) || (len == 0 && pad))
+        {
+          data->recs = 0;
+          data->fill_1 = 0;
+          bfd_putl32 ((*off / VMS_BLOCK_SIZE) + 2, data->link);
+
+          if (bfd_bwrite (data, sizeof (*data), arch) != sizeof (*data))
+            return FALSE;
+
+          *off += DATA__LENGTH - doff;
+
+          if (len == 0)
+            break;
+        }
+    }
+  return TRUE;
+}
+
+/* Build the symbols index.  */
+
+static bfd_boolean
+_bfd_vms_lib_build_map (unsigned int nbr_modules,
+                        struct lib_index *modules,
+                        unsigned int *res_cnt,
+                        struct lib_index **res)
+{
+  unsigned int i;
+  asymbol **syms = NULL;
+  long syms_max = 0;
+  struct lib_index *map = NULL;
+  unsigned int map_max = 1024;		/* Fine initial default.  */
+  unsigned int map_count = 0;
+
+  map = (struct lib_index *) bfd_malloc (map_max * sizeof (struct lib_index));
+  if (map == NULL)
+    goto error_return;
+
+  /* Gather symbols.  */
+  for (i = 0; i < nbr_modules; i++)
+    {
+      long storage;
+      long symcount;
+      long src_count;
+      bfd *current = modules[i].abfd;
+
+      if ((bfd_get_file_flags (current) & HAS_SYMS) == 0)
+        continue;
+
+      storage = bfd_get_symtab_upper_bound (current);
+      if (storage < 0)
+        goto error_return;
+
+      if (storage != 0)
+        {
+          if (storage > syms_max)
+            {
+              if (syms_max > 0)
+                free (syms);
+              syms_max = storage;
+              syms = (asymbol **) bfd_malloc (syms_max);
+              if (syms == NULL)
+                goto error_return;
+            }
+          symcount = bfd_canonicalize_symtab (current, syms);
+          if (symcount < 0)
+            goto error_return;
+
+          /* Now map over all the symbols, picking out the ones we
+             want.  */
+          for (src_count = 0; src_count < symcount; src_count++)
+            {
+              flagword flags = (syms[src_count])->flags;
+              asection *sec = syms[src_count]->section;
+
+              if ((flags & BSF_GLOBAL
+                   || flags & BSF_WEAK
+                   || flags & BSF_INDIRECT
+                   || bfd_is_com_section (sec))
+                  && ! bfd_is_und_section (sec))
+                {
+                  struct lib_index *new_map;
+
+                  /* This symbol will go into the archive header.  */
+                  if (map_count == map_max)
+                    {
+                      map_max *= 2;
+                      new_map = (struct lib_index *)
+                        bfd_realloc (map, map_max * sizeof (struct lib_index));
+                      if (new_map == NULL)
+                        goto error_return;
+                      map = new_map;
+                    }
+
+                  map[map_count].abfd = current;
+                  map[map_count].namlen = strlen (syms[src_count]->name);
+                  map[map_count].name = syms[src_count]->name;
+                  map_count++;
+                  modules[i].ref++;
+                }
+            }
+	}
+    }
+
+  *res_cnt = map_count;
+  *res = map;
+  return TRUE;
+
+ error_return:
+  if (syms_max > 0)
+    free (syms);
+  if (map != NULL)
+    free (map);
+  return FALSE;
+}
+
+/* Do the hard work: write an archive on the disk.  */
+
+bfd_boolean
+_bfd_vms_lib_write_archive_contents (bfd *arch)
+{
+  bfd *current;
+  unsigned int nbr_modules;
+  struct lib_index *modules;
+  unsigned int nbr_symbols;
+  struct lib_index *symbols;
+  struct lib_tdata *tdata = bfd_libdata (arch);
+  unsigned int i;
+  file_ptr off;
+  unsigned int nbr_mod_iblk;
+  unsigned int nbr_sym_iblk;
+  unsigned int vbn;
+  unsigned int mod_idx_vbn;
+  unsigned int sym_idx_vbn;
+  bfd_boolean is_elfidx = tdata->kind == vms_lib_ia64;
+
+  /* Count the number of modules (and do a first sanity check).  */
+  nbr_modules = 0;
+  for (current = arch->archive_head;
+       current != NULL;
+       current = current->archive_next)
+    {
+      /* This check is checking the bfds for the objects we're reading
+	 from (which are usually either an object file or archive on
+	 disk), not the archive entries we're writing to.  We don't
+	 actually create bfds for the archive members, we just copy
+	 them byte-wise when we write out the archive.  */
+      if (bfd_write_p (current) || !bfd_check_format (current, bfd_object))
+	{
+	  bfd_set_error (bfd_error_invalid_operation);
+	  goto input_err;
+	}
+
+      nbr_modules++;
+    }
+
+  /* Build the modules list.  */
+  BFD_ASSERT (tdata->modules == NULL);
+  modules = bfd_alloc (arch, nbr_modules * sizeof (struct lib_index));
+  if (modules == NULL)
+    return FALSE;
+
+  for (current = arch->archive_head, i = 0;
+       current != NULL;
+       current = current->archive_next, i++)
+    {
+      int nl;
+
+      modules[i].abfd = current;
+      modules[i].name = vms_get_module_name (current->filename, FALSE);
+      modules[i].ref = 1;
+
+      /* FIXME: silently truncate long names ?  */
+      nl = strlen (modules[i].name);
+      modules[i].namlen = (nl > MAX_KEYLEN ? MAX_KEYLEN : nl);
+    }
+
+  /* Create the module index.  */
+  vbn = 0;
+  if (!vms_write_index (NULL, modules, nbr_modules, &vbn, NULL, is_elfidx))
+    return FALSE;
+  nbr_mod_iblk = vbn;
+
+  /* Create symbol index.  */
+  if (!_bfd_vms_lib_build_map (nbr_modules, modules, &nbr_symbols, &symbols))
+    return FALSE;
+
+  vbn = 0;
+  if (!vms_write_index (NULL, symbols, nbr_symbols, &vbn, NULL, is_elfidx))
+    return FALSE;
+  nbr_sym_iblk = vbn;
+
+  /* Write modules and remember their position.  */
+  off = (1 + nbr_mod_iblk + nbr_sym_iblk) * VMS_BLOCK_SIZE;
+
+  if (bfd_seek (arch, off, SEEK_SET) != 0)
+    return FALSE;
+
+  for (i = 0; i < nbr_modules; i++)
+    {
+      struct vms_datadef data;
+      unsigned char blk[VMS_BLOCK_SIZE];
+      struct vms_mhd *mhd;
+      unsigned int sz;
+
+      current = modules[i].abfd;
+      current->proxy_origin = off;
+
+      if (is_elfidx)
+        sz = 0;
+      else
+        {
+          /* Write the MHD as a record (ie, size first).  */
+          sz = 2;
+          bfd_putl16 (tdata->mhd_size, blk);
+        }
+      mhd = (struct vms_mhd *)(blk + sz);
+      memset (mhd, 0, sizeof (struct vms_mhd));
+      mhd->lbrflag = 0;
+      mhd->id = MHD__C_MHDID;
+      mhd->objidlng = 4;
+      memcpy (mhd->objid, "V1.0", 4);
+      bfd_putl32 (modules[i].ref, mhd->refcnt);
+      /* FIXME: datim.  */
+
+      sz += tdata->mhd_size;
+      sz = (sz + 1) & ~1;
+
+      /* Rewind the member to be put into the archive.  */
+      if (bfd_seek (current, 0, SEEK_SET) != 0)
+        goto input_err;
+
+      /* Copy the member into the archive.  */
+      if (is_elfidx)
+        {
+          unsigned int modsize = 0;
+          bfd_size_type amt;
+          file_ptr off_hdr = off;
+
+          /* Read to complete the first block.  */
+          amt = bfd_bread (blk + sz, VMS_BLOCK_SIZE - sz, current);
+          if (amt == (bfd_size_type)-1)
+            goto input_err;
+          modsize = amt;
+          if (amt < VMS_BLOCK_SIZE - sz)
+            {
+              /* The member size is less than a block.  Pad the block.  */
+              memset (blk + sz + amt, 0, VMS_BLOCK_SIZE - sz - amt);
+            }
+          bfd_putl32 (modsize, mhd->modsize);
+
+          /* Write the first block (which contains an mhd).  */
+          if (bfd_bwrite (blk, VMS_BLOCK_SIZE, arch) != VMS_BLOCK_SIZE)
+            goto input_err;
+          off += VMS_BLOCK_SIZE;
+
+          if (amt == VMS_BLOCK_SIZE - sz)
+            {
+              /* Copy the remaining.  */
+              char buffer[DEFAULT_BUFFERSIZE];
+
+              while (1)
+                {
+                  amt = bfd_bread (buffer, sizeof (buffer), current);
+                  if (amt == (bfd_size_type)-1)
+                    goto input_err;
+                  if (amt == 0)
+                    break;
+                  modsize += amt;
+                  if (amt != sizeof (buffer))
+                    {
+                      /* Clear the padding.  */
+                      memset (buffer + amt, 0, sizeof (buffer) - amt);
+                      amt = (amt + VMS_BLOCK_SIZE) & ~(VMS_BLOCK_SIZE - 1);
+                    }
+                  if (bfd_bwrite (buffer, amt, arch) != amt)
+                    goto input_err;
+                  off += amt;
+                }
+
+              /* Now that the size is known, write the first block (again).  */
+              bfd_putl32 (modsize, mhd->modsize);
+              if (bfd_seek (arch, off_hdr, SEEK_SET) != 0
+                  || bfd_bwrite (blk, VMS_BLOCK_SIZE, arch) != VMS_BLOCK_SIZE)
+                goto input_err;
+              if (bfd_seek (arch, off, SEEK_SET) != 0)
+                goto input_err;
+            }
+        }
+      else
+        {
+          /* Write the MHD.  */
+          if (vms_write_data_block (arch, &data, &off, blk, sz, 0) < 0)
+            goto input_err;
+
+          /* Write the member.  */
+          while (1)
+            {
+              sz = bfd_bread (blk, sizeof (blk), current);
+              if (sz == 0)
+                break;
+              if (vms_write_data_block (arch, &data, &off, blk, sz, 0) < 0)
+                goto input_err;
+            }
+
+          /* Write the end of module marker.  */
+          if (vms_write_data_block (arch, &data, &off,
+                                    eotdesc, sizeof (eotdesc), 1) < 0)
+            goto input_err;
+        }
+    }
+
+  /* Write the indexes.  */
+  vbn = 2;
+  if (vms_write_index (arch, modules, nbr_modules, &vbn, &mod_idx_vbn,
+                       is_elfidx) != TRUE)
+    return FALSE;
+  if (vms_write_index (arch, symbols, nbr_symbols, &vbn, &sym_idx_vbn,
+                       is_elfidx) != TRUE)
+    return FALSE;
+
+  /* Write libary header.  */
+  {
+    unsigned char blk[VMS_BLOCK_SIZE];
+    struct vms_lhd *lhd = (struct vms_lhd *)blk;
+    struct vms_idd *idd = (struct vms_idd *)(blk + sizeof (*lhd));
+    unsigned int idd_flags;
+    unsigned int saneid;
+
+    memset (blk, 0, sizeof (blk));
+
+    lhd->type = tdata->type;
+    lhd->nindex = 2;
+    switch (tdata->kind)
+      {
+      case vms_lib_alpha:
+        saneid = LHD_SANEID3;
+        break;
+      case vms_lib_ia64:
+        saneid = LHD_SANEID6;
+        break;
+      default:
+        abort ();
+      }
+    bfd_putl32 (saneid, lhd->sanity);
+    bfd_putl16 (tdata->ver, lhd->majorid);
+    bfd_putl16 (0, lhd->minorid);
+    snprintf ((char *)lhd->lbrver + 1, sizeof (lhd->lbrver) - 1,
+              "GNU ar %u.%u.%u",
+              (unsigned)(BFD_VERSION / 100000000UL),
+              (unsigned)(BFD_VERSION / 1000000UL) % 100,
+              (unsigned)(BFD_VERSION / 10000UL) % 100);
+    lhd->lbrver[sizeof (lhd->lbrver) - 1] = 0;
+    lhd->lbrver[0] = strlen ((char *)lhd->lbrver + 1);
+
+    bfd_putl32 (tdata->credat_lo, lhd->credat + 0);
+    bfd_putl32 (tdata->credat_hi, lhd->credat + 4);
+    vms_raw_get_time (lhd->updtim);
+
+    lhd->mhdusz = tdata->mhd_size - MHD__C_USRDAT;
+
+    bfd_putl32 (nbr_modules + nbr_symbols, lhd->idxcnt);
+    bfd_putl32 (nbr_modules, lhd->modcnt);
+    bfd_putl32 (nbr_modules, lhd->modhdrs);
+
+    bfd_putl32 (vbn - 1, lhd->hipreal);
+    bfd_putl32 (vbn - 1, lhd->hiprusd);
+
+    /* First index (modules name).  */
+    idd_flags = IDD__FLAGS_ASCII | IDD__FLAGS_VARLENIDX
+      | IDD__FLAGS_NOCASECMP | IDD__FLAGS_NOCASENTR;
+    bfd_putl16 (idd_flags, idd->flags);
+    bfd_putl16 (MAX_KEYLEN, idd->keylen);
+    bfd_putl16 (mod_idx_vbn, idd->vbn);
+    idd++;
+
+    /* Second index (symbols name).  */
+    bfd_putl16 (idd_flags, idd->flags);
+    bfd_putl16 (MAX_KEYLEN, idd->keylen);
+    bfd_putl16 (sym_idx_vbn, idd->vbn);
+    idd++;
+
+    if (vms_write_block (arch, 1, blk) != TRUE)
+      return FALSE;
+  }
+
+  return TRUE;
+
+ input_err:
+  bfd_set_error (bfd_error_on_input, current, bfd_get_error ());
+  return FALSE;
+}
+
+/* Add a target for text library.  This costs almost nothing and is useful to
+   read VMS library on the host.  */
+
+const bfd_target vms_lib_txt_vec =
+{
+  "vms-libtxt",			/* Name.  */
+  bfd_target_unknown_flavour,
+  BFD_ENDIAN_UNKNOWN,		/* byteorder */
+  BFD_ENDIAN_UNKNOWN,		/* header_byteorder */
+  0,				/* Object flags.  */
+  0,				/* Sect flags.  */
+  0,				/* symbol_leading_char.  */
+  ' ',				/* ar_pad_char.  */
+  15,				/* ar_max_namelen.  */
+  0,				/* match priority.  */
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16,
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16,
+
+  {_bfd_dummy_target, _bfd_dummy_target,	/* bfd_check_format.  */
+   _bfd_vms_lib_txt_archive_p, _bfd_dummy_target},
+  {bfd_false, bfd_false, bfd_false, bfd_false},	/* bfd_set_format.  */
+  {bfd_false, bfd_false, bfd_false, bfd_false},	/* bfd_write_contents.  */
+
+  BFD_JUMP_TABLE_GENERIC (_bfd_generic),
+  BFD_JUMP_TABLE_COPY (_bfd_generic),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_vms_lib),
+  BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
+  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+  BFD_JUMP_TABLE_WRITE (_bfd_nowrite),
+  BFD_JUMP_TABLE_LINK (_bfd_nolink),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  (PTR) 0
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/vms-misc.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/vms-misc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/vms-misc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/vms-misc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,671 @@
+/* vms-misc.c -- BFD back-end for VMS/VAX (openVMS/VAX) and
+   EVAX (openVMS/Alpha) files.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+
+   Miscellaneous functions.
+
+   Written by Klaus K"ampf (kkaempf@rmi.de)
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#if __STDC__
+#include <stdarg.h>
+#endif
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "safe-ctype.h"
+
+#ifdef VMS
+#define __NEW_STARLET
+#include <rms.h>
+#include <unixlib.h>
+#include <gen64def.h>
+#include <starlet.h>
+#define RME$C_SETRFM 0x00000001
+#include <unistd.h>
+#endif
+#include <time.h>
+
+#include "vms.h"
+#include "vms/emh.h"
+
+#if VMS_DEBUG
+/* Debug functions.  */
+
+/* Debug function for all vms extensions evaluates environment
+   variable VMS_DEBUG for a numerical value on the first call all
+   error levels below this value are printed:
+
+   Levels:
+   1	toplevel bfd calls (functions from the bfd vector)
+   2	functions called by bfd calls
+   ...
+   9	almost everything
+
+   Level is also indentation level. Indentation is performed
+   if level > 0.  */
+
+void
+_bfd_vms_debug (int level, char *format, ...)
+{
+  static int min_level = -1;
+  static FILE *output = NULL;
+  char *eptr;
+  va_list args;
+  int abslvl = (level > 0) ? level : - level;
+
+  if (min_level == -1)
+    {
+      if ((eptr = getenv ("VMS_DEBUG")) != NULL)
+	{
+	  min_level = atoi (eptr);
+	  output = stderr;
+	}
+      else
+	min_level = 0;
+    }
+  if (output == NULL)
+    return;
+  if (abslvl > min_level)
+    return;
+
+  while (--level > 0)
+    fprintf (output, " ");
+  va_start (args, format);
+  vfprintf (output, format, args);
+  fflush (output);
+  va_end (args);
+}
+
+/* A debug function
+   hex dump 'size' bytes starting at 'ptr'.  */
+
+void
+_bfd_hexdump (int level, unsigned char *ptr, int size, int offset)
+{
+  unsigned char *lptr = ptr;
+  int count = 0;
+  long start = offset;
+
+  while (size-- > 0)
+    {
+      if ((count % 16) == 0)
+	vms_debug (level, "%08lx:", start);
+      vms_debug (-level, " %02x", *ptr++);
+      count++;
+      start++;
+      if (size == 0)
+	{
+	  while ((count % 16) != 0)
+	    {
+	      vms_debug (-level, "   ");
+	      count++;
+	    }
+	}
+      if ((count % 16) == 0)
+	{
+	  vms_debug (-level, " ");
+	  while (lptr < ptr)
+	    {
+	      vms_debug (-level, "%c", (*lptr < 32) ? '.' : *lptr);
+	      lptr++;
+	    }
+	  vms_debug (-level, "\n");
+	}
+    }
+  if ((count % 16) != 0)
+    vms_debug (-level, "\n");
+}
+#endif
+
+
+/* Copy sized string (string with fixed size) to new allocated area
+   size is string size (size of record)  */
+
+char *
+_bfd_vms_save_sized_string (unsigned char *str, int size)
+{
+  char *newstr = bfd_malloc ((bfd_size_type) size + 1);
+
+  if (newstr == NULL)
+    return NULL;
+  memcpy (newstr, (char *) str, (size_t) size);
+  newstr[size] = 0;
+
+  return newstr;
+}
+
+/* Copy counted string (string with size at first byte) to new allocated area
+   ptr points to size byte on entry  */
+
+char *
+_bfd_vms_save_counted_string (unsigned char *ptr)
+{
+  int len = *ptr++;
+
+  return _bfd_vms_save_sized_string (ptr, len);
+}
+
+/* Object output routines.   */
+
+/* Begin new record.
+   Write 2 bytes rectype and 2 bytes record length.  */
+
+void
+_bfd_vms_output_begin (struct vms_rec_wr *recwr, int rectype)
+{
+  vms_debug2 ((6, "_bfd_vms_output_begin (type %d)\n", rectype));
+
+  /* Record must have been closed.  */
+  BFD_ASSERT (recwr->size == 0);
+
+  _bfd_vms_output_short (recwr, (unsigned int) rectype);
+
+  /* Placeholder for length.  */
+  _bfd_vms_output_short (recwr, 0);
+}
+
+/* Begin new sub-record.
+   Write 2 bytes rectype, and 2 bytes record length.  */
+
+void
+_bfd_vms_output_begin_subrec (struct vms_rec_wr *recwr, int rectype)
+{
+  vms_debug2 ((6, "_bfd_vms_output_begin_subrec (type %d)\n", rectype));
+
+  /* Subrecord must have been closed.  */
+  BFD_ASSERT (recwr->subrec_offset == 0);
+
+  /* Save start of subrecord offset.  */
+  recwr->subrec_offset = recwr->size;
+
+  /* Subrecord type.  */
+  _bfd_vms_output_short (recwr, (unsigned int) rectype);
+
+  /* Placeholder for length.  */
+  _bfd_vms_output_short (recwr, 0);
+}
+
+/* Set record/subrecord alignment.   */
+
+void
+_bfd_vms_output_alignment (struct vms_rec_wr *recwr, int alignto)
+{
+  vms_debug2 ((6, "_bfd_vms_output_alignment (%d)\n", alignto));
+  recwr->align = alignto;
+}
+
+/* Align the size of the current record (whose length is LENGTH).
+   Warning: this obviously changes the record (and the possible subrecord)
+   length.  */
+
+static void
+_bfd_vms_output_align (struct vms_rec_wr *recwr, unsigned int length)
+{
+  unsigned int real_size = recwr->size;
+  unsigned int aligncount;
+
+  /* Pad with 0 if alignment is required.  */
+  aligncount = (recwr->align - (length % recwr->align)) % recwr->align;
+  vms_debug2 ((6, "align: adding %d bytes\n", aligncount));
+  while (aligncount-- > 0)
+    recwr->buf[real_size++] = 0;
+
+  recwr->size = real_size;
+}
+
+/* Ends current sub-record.  Set length field.  */
+
+void
+_bfd_vms_output_end_subrec (struct vms_rec_wr *recwr)
+{
+  int real_size = recwr->size;
+  int length;
+
+  /* Subrecord must be open.  */
+  BFD_ASSERT (recwr->subrec_offset != 0);
+
+  length = real_size - recwr->subrec_offset;
+
+  if (length == 0)
+    return;
+
+  _bfd_vms_output_align (recwr, length);
+
+  /* Put length to buffer.  */
+  bfd_putl16 ((bfd_vma) (recwr->size - recwr->subrec_offset),
+              recwr->buf + recwr->subrec_offset + 2);
+
+  /* Close the subrecord.  */
+  recwr->subrec_offset = 0;
+}
+
+/* Ends current record (and write it).  */
+
+void
+_bfd_vms_output_end (bfd *abfd, struct vms_rec_wr *recwr)
+{
+  vms_debug2 ((6, "_bfd_vms_output_end (size %u)\n", recwr->size));
+
+  /* Subrecord must have been closed.  */
+  BFD_ASSERT (recwr->subrec_offset == 0);
+
+  if (recwr->size == 0)
+    return;
+
+  _bfd_vms_output_align (recwr, recwr->size);
+
+  /* Write the length word.  */
+  bfd_putl16 ((bfd_vma) recwr->size, recwr->buf + 2);
+
+  /* File is open in undefined (UDF) format on VMS, but ultimately will be
+     converted to variable length (VAR) format.  VAR format has a length
+     word first which must be explicitly output in UDF format.  */
+  /* So, first the length word.  */
+  bfd_bwrite (recwr->buf + 2, 2, abfd);
+
+  /* Align.  */
+  if (recwr->size & 1)
+    recwr->buf[recwr->size++] = 0;
+
+  /* Then the record.  */
+  bfd_bwrite (recwr->buf, (size_t) recwr->size, abfd);
+
+  recwr->size = 0;
+}
+
+/* Check remaining buffer size.  Return what's left.  */
+
+int
+_bfd_vms_output_check (struct vms_rec_wr *recwr, int size)
+{
+  vms_debug2 ((6, "_bfd_vms_output_check (%d)\n", size));
+
+  return (MAX_OUTREC_SIZE - (recwr->size + size + MIN_OUTREC_LUFT));
+}
+
+/* Output byte (8 bit) value.  */
+
+void
+_bfd_vms_output_byte (struct vms_rec_wr *recwr, unsigned int value)
+{
+  vms_debug2 ((6, "_bfd_vms_output_byte (%02x)\n", value));
+
+  *(recwr->buf + recwr->size) = value;
+  recwr->size += 1;
+}
+
+/* Output short (16 bit) value.  */
+
+void
+_bfd_vms_output_short (struct vms_rec_wr *recwr, unsigned int value)
+{
+  vms_debug2 ((6, "_bfd_vms_output_short (%04x)\n", value));
+
+  bfd_putl16 ((bfd_vma) value & 0xffff, recwr->buf + recwr->size);
+  recwr->size += 2;
+}
+
+/* Output long (32 bit) value.  */
+
+void
+_bfd_vms_output_long (struct vms_rec_wr *recwr, unsigned long value)
+{
+  vms_debug2 ((6, "_bfd_vms_output_long (%08lx)\n", value));
+
+  bfd_putl32 ((bfd_vma) value, recwr->buf + recwr->size);
+  recwr->size += 4;
+}
+
+/* Output quad (64 bit) value.  */
+
+void
+_bfd_vms_output_quad (struct vms_rec_wr *recwr, bfd_vma value)
+{
+  vms_debug2 ((6, "_bfd_vms_output_quad (%08lx)\n", (unsigned long)value));
+
+  bfd_putl64 (value, recwr->buf + recwr->size);
+  recwr->size += 8;
+}
+
+/* Output c-string as counted string.  */
+
+void
+_bfd_vms_output_counted (struct vms_rec_wr *recwr, const char *value)
+{
+  int len;
+
+  vms_debug2 ((6, "_bfd_vms_output_counted (%s)\n", value));
+
+  len = strlen (value);
+  if (len == 0)
+    {
+      (*_bfd_error_handler) (_("_bfd_vms_output_counted called with zero bytes"));
+      return;
+    }
+  if (len > 255)
+    {
+      (*_bfd_error_handler) (_("_bfd_vms_output_counted called with too many bytes"));
+      return;
+    }
+  _bfd_vms_output_byte (recwr, (unsigned int) len & 0xff);
+  _bfd_vms_output_dump (recwr, (const unsigned char *)value, len);
+}
+
+/* Output character area.  */
+
+void
+_bfd_vms_output_dump (struct vms_rec_wr *recwr, const unsigned char *data, int len)
+{
+  vms_debug2 ((6, "_bfd_vms_output_dump (%d)\n", len));
+
+  if (len == 0)
+    return;
+
+  memcpy (recwr->buf + recwr->size, data, (size_t) len);
+  recwr->size += len;
+}
+
+/* Output count bytes of value.  */
+
+void
+_bfd_vms_output_fill (struct vms_rec_wr *recwr, int value, int count)
+{
+  vms_debug2 ((6, "_bfd_vms_output_fill (val %02x times %d)\n", value, count));
+
+  if (count == 0)
+    return;
+  memset (recwr->buf + recwr->size, value, (size_t) count);
+  recwr->size += count;
+}
+
+#ifdef VMS
+/* Convert the file to variable record length format. This is done
+   using undocumented system call sys$modify().
+   Pure VMS version.  */
+
+static void
+vms_convert_to_var (char * vms_filename)
+{
+  struct FAB fab = cc$rms_fab;
+
+  fab.fab$l_fna = vms_filename;
+  fab.fab$b_fns = strlen (vms_filename);
+  fab.fab$b_fac = FAB$M_PUT;
+  fab.fab$l_fop = FAB$M_ESC;
+  fab.fab$l_ctx = RME$C_SETRFM;
+
+  sys$open (&fab);
+
+  fab.fab$b_rfm = FAB$C_VAR;
+
+  sys$modify (&fab);
+  sys$close (&fab);
+}
+
+static int
+vms_convert_to_var_1 (char *filename, int type)
+{
+  if (type != DECC$K_FILE)
+    return FALSE;
+  vms_convert_to_var (filename);
+  return TRUE;
+}
+
+/* Convert the file to variable record length format. This is done
+   using undocumented system call sys$modify().
+   Unix filename version.  */
+
+int
+_bfd_vms_convert_to_var_unix_filename (const char *unix_filename)
+{
+  if (decc$to_vms (unix_filename, &vms_convert_to_var_1, 0, 1) != 1)
+    return FALSE;
+  return TRUE;
+}
+#endif /* VMS */
+
+/* Manufacture a VMS like time on a unix based system.
+   stolen from obj-vms.c.  */
+
+unsigned char *
+get_vms_time_string (void)
+{
+  static unsigned char tbuf[18];
+#ifndef VMS
+  char *pnt;
+  time_t timeb;
+
+  time (& timeb);
+  pnt = ctime (&timeb);
+  pnt[3] = 0;
+  pnt[7] = 0;
+  pnt[10] = 0;
+  pnt[16] = 0;
+  pnt[24] = 0;
+  sprintf ((char *) tbuf, "%2s-%3s-%s %s",
+	   pnt + 8, pnt + 4, pnt + 20, pnt + 11);
+#else
+  struct
+  {
+    int Size;
+    unsigned char *Ptr;
+  } Descriptor;
+  Descriptor.Size = 17;
+  Descriptor.Ptr = tbuf;
+  SYS$ASCTIM (0, &Descriptor, 0, 0);
+#endif /* not VMS */
+
+  vms_debug2 ((6, "vmstimestring:'%s'\n", tbuf));
+
+  return tbuf;
+}
+
+/* Create module name from filename (ie, extract the basename and convert it
+   in upper cases).  Works on both VMS and UNIX pathes.
+   The result has to be free().  */
+
+char *
+vms_get_module_name (const char *filename, bfd_boolean upcase)
+{
+  char *fname, *fptr;
+  const char *fout;
+
+  /* Strip VMS path.  */
+  fout = strrchr (filename, ']');
+  if (fout == NULL)
+    fout = strchr (filename, ':');
+  if (fout != NULL)
+    fout++;
+  else
+    fout = filename;
+
+  /* Strip UNIX path.  */
+  fptr = strrchr (fout, '/');
+  if (fptr != NULL)
+    fout = fptr + 1;
+
+  fname = strdup (fout);
+
+  /* Strip suffix.  */
+  fptr = strrchr (fname, '.');
+  if (fptr != 0)
+    *fptr = 0;
+
+  /* Convert to upper case and truncate at 31 characters.
+     (VMS object file format restricts module name length to 31).  */
+  fptr = fname;
+  for (fptr = fname; *fptr != 0; fptr++)
+    {
+      if (*fptr == ';' || (fptr - fname) >= 31)
+        {
+          *fptr = 0;
+          break;
+        }
+      if (upcase)
+        *fptr = TOUPPER (*fptr);
+    }
+  return fname;
+}
+
+/* Compared to usual UNIX time_t, VMS time has less limits:
+   -  64 bit (63 bits in fact as the MSB must be 0)
+   -  100ns granularity
+   -  epoch is Nov 17, 1858.
+   Here has the constants and the routines used to convert VMS from/to UNIX time.
+   The conversion routines don't assume 64 bits arithmetic.
+
+   Here we assume that the definition of time_t is the UNIX one, ie integer
+   type, expressing seconds since the epoch.  */
+
+/* UNIX time granularity for VMS, ie 1s / 100ns.  */
+#define VMS_TIME_FACTOR 10000000
+
+/* Number of seconds since VMS epoch of the UNIX epoch.  */
+#define VMS_TIME_OFFSET 3506716800U
+
+/* Convert a VMS time to a unix time.  */
+
+time_t
+vms_time_to_time_t (unsigned int hi, unsigned int lo)
+{
+  unsigned int tmp;
+  unsigned int rlo;
+  int i;
+  time_t res;
+
+  /* First convert to seconds.  */
+  tmp = hi % VMS_TIME_FACTOR;
+  hi = hi / VMS_TIME_FACTOR;
+  rlo = 0;
+  for (i = 0; i < 4; i++)
+    {
+      tmp = (tmp << 8) | (lo >> 24);
+      lo <<= 8;
+
+      rlo = (rlo << 8) | (tmp / VMS_TIME_FACTOR);
+      tmp %= VMS_TIME_FACTOR;
+    }
+  lo = rlo;
+
+  /* Return 0 in case of overflow.  */
+  if (hi > 1
+      || (hi == 1 && lo >= VMS_TIME_OFFSET))
+    return 0;
+
+  /* Return 0 in case of underflow.  */
+  if (hi == 0 && lo < VMS_TIME_OFFSET)
+    return 0;
+
+  res = lo - VMS_TIME_OFFSET;
+  if (res <= 0)
+    return 0;
+  return res;
+}
+
+/* Convert a time_t to a VMS time.  */
+
+void
+vms_time_t_to_vms_time (time_t ut, unsigned int *hi, unsigned int *lo)
+{
+  unsigned short val[4];
+  unsigned short tmp[4];
+  unsigned int carry;
+  int i;
+
+  /* Put into val.  */
+  val[0] = ut & 0xffff;
+  val[1] = (ut >> 16) & 0xffff;
+  val[2] = sizeof (ut) > 4 ? (ut >> 32) & 0xffff : 0;
+  val[3] = sizeof (ut) > 4 ? (ut >> 48) & 0xffff : 0;
+
+  /* Add offset.  */
+  tmp[0] = VMS_TIME_OFFSET & 0xffff;
+  tmp[1] = VMS_TIME_OFFSET >> 16;
+  tmp[2] = 0;
+  tmp[3] = 0;
+  carry = 0;
+  for (i = 0; i < 4; i++)
+    {
+      carry += tmp[i] + val[i];
+      val[i] = carry & 0xffff;
+      carry = carry >> 16;
+    }
+
+  /* Multiply by factor, well first by 10000 and then by 1000.  */
+  carry = 0;
+  for (i = 0; i < 4; i++)
+    {
+      carry += val[i] * 10000;
+      val[i] = carry & 0xffff;
+      carry = carry >> 16;
+    }
+  carry = 0;
+  for (i = 0; i < 4; i++)
+    {
+      carry += val[i] * 1000;
+      val[i] = carry & 0xffff;
+      carry = carry >> 16;
+    }
+
+  /* Write the result.  */
+  *lo = val[0] | (val[1] << 16);
+  *hi = val[2] | (val[3] << 16);
+}
+
+/* Convert a raw (stored in a buffer) VMS time to a unix time.  */
+
+time_t
+vms_rawtime_to_time_t (unsigned char *buf)
+{
+  unsigned int hi = bfd_getl32 (buf + 4);
+  unsigned int lo = bfd_getl32 (buf + 0);
+
+  return vms_time_to_time_t (hi, lo);
+}
+
+void
+vms_get_time (unsigned int *hi, unsigned int *lo)
+{
+#ifdef VMS
+  struct _generic_64 t;
+
+  sys$gettim (&t);
+  *lo = t.gen64$q_quadword;
+  *hi = t.gen64$q_quadword >> 32;
+#else
+  time_t t;
+
+  time (&t);
+  vms_time_t_to_vms_time (t, hi, lo);
+#endif
+}
+
+/* Get the current time into a raw buffer BUF.  */
+
+void
+vms_raw_get_time (unsigned char *buf)
+{
+  unsigned int hi, lo;
+
+  vms_get_time (&hi, &lo);
+  bfd_putl32 (lo, buf + 0);
+  bfd_putl32 (hi, buf + 4);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/vms.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/vms.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/vms.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/vms.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,143 @@
+/* vms.h -- Header file for VMS (Alpha and Vax) support.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007,
+   2008, 2009, 2010 Free Software Foundation, Inc.
+
+   Main header file.
+
+   Written by Klaus K"ampf (kkaempf@rmi.de)
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#undef vms
+#ifndef VMS_H
+#define VMS_H
+
+#include <time.h>
+
+/* Size of a VMS block on disk.  */
+
+#define VMS_BLOCK_SIZE  512
+
+/* Miscellaneous definitions.  */
+
+#define MAX_OUTREC_SIZE 4096
+#define MIN_OUTREC_LUFT 64
+
+/* File format.  */
+
+enum file_format_enum
+  {
+    /* Not yet known.  */
+    FF_UNKNOWN,
+
+    /* Unix format.  Each record is preceeded by the record length,
+       on 2 bytes.  */
+    FF_FOREIGN,
+
+    /* Native (=VMS) format.  The file only contains the content of the
+       records.  This may also appear on Unix, depending on which tool
+       was used to transfer files.  */
+    FF_NATIVE
+  };
+
+/* VMS records input buffer.  */
+
+struct vms_rec_rd
+{
+  /* Buffer and its size.  */
+  unsigned char *buf;
+  unsigned int buf_size;
+
+  /* Current record and its size.  */
+  unsigned char *rec;
+  unsigned int rec_size;
+
+  /* Input file format.  */
+  enum file_format_enum file_format;
+};
+
+/* VMS records output buffer.  */
+
+struct vms_rec_wr
+{
+  /* Output buffer.  */
+  unsigned char *buf;
+
+  /* Current length of the record.  */
+  unsigned short int size;
+
+  /* Sub-record start offset.  */
+  unsigned short int subrec_offset;
+
+  /* Some records must have a size that is a multiple of the alignment.
+     Mustn't be 0.  */
+  unsigned short int align;
+};
+
+struct evax_private_udata_struct
+{
+  asymbol *bsym;
+  asymbol *enbsym;
+  char *origname;
+  int lkindex;
+};
+
+/* vms-misc.c.  */
+
+#define VMS_DEBUG 1
+
+#if VMS_DEBUG
+extern void _bfd_vms_debug (int, char *, ...) ATTRIBUTE_PRINTF_2;
+extern void _bfd_hexdump   (int, unsigned char *, int, int);
+
+#define vms_debug _bfd_vms_debug
+#define vms_debug2(X) _bfd_vms_debug X
+#else
+#define vms_debug2(X)
+#endif
+
+extern char * vms_get_module_name (const char *, bfd_boolean);
+extern unsigned char *get_vms_time_string (void);
+extern time_t vms_time_to_time_t (unsigned int hi, unsigned int lo);
+extern time_t vms_rawtime_to_time_t (unsigned char *);
+extern void vms_time_t_to_vms_time (time_t ut, unsigned int *hi, unsigned int *lo);
+extern void vms_get_time (unsigned int *hi, unsigned int *lo);
+extern void vms_raw_get_time (unsigned char *buf);
+
+extern char * _bfd_vms_save_sized_string (unsigned char *, int);
+extern char * _bfd_vms_save_counted_string (unsigned char *);
+extern void   _bfd_vms_output_begin (struct vms_rec_wr *, int);
+extern void   _bfd_vms_output_alignment (struct vms_rec_wr *, int);
+extern void   _bfd_vms_output_begin_subrec (struct vms_rec_wr *, int);
+extern void   _bfd_vms_output_end_subrec (struct vms_rec_wr *);
+extern void   _bfd_vms_output_end (bfd *, struct vms_rec_wr *);
+extern int    _bfd_vms_output_check (struct vms_rec_wr *, int);
+extern void   _bfd_vms_output_byte (struct vms_rec_wr *, unsigned);
+extern void   _bfd_vms_output_short (struct vms_rec_wr *, unsigned);
+extern void   _bfd_vms_output_long (struct vms_rec_wr *, unsigned long);
+extern void   _bfd_vms_output_quad (struct vms_rec_wr *, bfd_vma);
+extern void   _bfd_vms_output_counted (struct vms_rec_wr *, const char *);
+extern void   _bfd_vms_output_dump (struct vms_rec_wr *, const unsigned char *, int);
+extern void   _bfd_vms_output_fill (struct vms_rec_wr *, int, int);
+extern int    _bfd_vms_convert_to_var_unix_filename (const char *);
+
+/* vms-alpha.c  */
+
+extern void bfd_vms_set_section_flags (bfd *, asection *, flagword, flagword);
+
+#endif /* VMS_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/warning.m4 sdcc-3.2.0+dfsg/support/sdbinutils/bfd/warning.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/warning.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/warning.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,60 @@
+dnl Common configure.in fragment
+
+AC_DEFUN([AM_BINUTILS_WARNINGS],[
+GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
+AC_EGREP_CPP([^[0-3]$],[__GNUC__],,GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wshadow")
+
+AC_ARG_ENABLE(werror,
+  [  --enable-werror         treat compile warnings as errors],
+  [case "${enableval}" in
+     yes | y) ERROR_ON_WARNING="yes" ;;
+     no | n)  ERROR_ON_WARNING="no" ;;
+     *) AC_MSG_ERROR(bad value ${enableval} for --enable-werror) ;;
+   esac])
+
+# Disable -Wformat by default when using gcc on mingw
+case "${host}" in
+  *-*-mingw32*)
+    if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
+      GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format"
+    fi
+    ;;
+  *) ;;
+esac
+
+# Enable -Werror by default when using gcc
+if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
+    ERROR_ON_WARNING=yes
+fi
+
+NO_WERROR=
+if test "${ERROR_ON_WARNING}" = yes ; then
+    GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror"
+    NO_WERROR="-Wno-error"
+fi
+		   
+if test "${GCC}" = yes ; then
+  WARN_CFLAGS="${GCC_WARN_CFLAGS}"
+fi
+
+AC_ARG_ENABLE(build-warnings,
+[  --enable-build-warnings enable build-time compiler warnings],
+[case "${enableval}" in
+  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}";;
+  no)	if test "${GCC}" = yes ; then
+	  WARN_CFLAGS="-w"
+	fi;;
+  ,*)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
+        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";;
+  *,)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
+        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";;
+  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;;
+esac])
+
+if test x"$silent" != x"yes" && test x"$WARN_CFLAGS" != x""; then
+  echo "Setting warning flags = $WARN_CFLAGS" 6>&1
+fi
+
+AC_SUBST(WARN_CFLAGS)
+AC_SUBST(NO_WERROR)
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/xcofflink.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/xcofflink.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/xcofflink.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/xcofflink.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,6452 @@
+/* POWER/PowerPC XCOFF linker support.
+   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Written by Ian Lance Taylor <ian@cygnus.com>, Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bfdlink.h"
+#include "libbfd.h"
+#include "coff/internal.h"
+#include "coff/xcoff.h"
+#include "libcoff.h"
+#include "libxcoff.h"
+#include "libiberty.h"
+
+/* This file holds the XCOFF linker code.  */
+
+#undef  STRING_SIZE_SIZE
+#define STRING_SIZE_SIZE 4
+
+/* We reuse the SEC_ROM flag as a mark flag for garbage collection.
+   This flag will only be used on input sections.  */
+
+#define SEC_MARK (SEC_ROM)
+
+/* The list of import files.  */
+
+struct xcoff_import_file
+{
+  /* The next entry in the list.  */
+  struct xcoff_import_file *next;
+  /* The path.  */
+  const char *path;
+  /* The file name.  */
+  const char *file;
+  /* The member name.  */
+  const char *member;
+};
+
+/* Information we keep for each section in the output file during the
+   final link phase.  */
+
+struct xcoff_link_section_info
+{
+  /* The relocs to be output.  */
+  struct internal_reloc *relocs;
+  /* For each reloc against a global symbol whose index was not known
+     when the reloc was handled, the global hash table entry.  */
+  struct xcoff_link_hash_entry **rel_hashes;
+  /* If there is a TOC relative reloc against a global symbol, and the
+     index of the TOC symbol is not known when the reloc was handled,
+     an entry is added to this linked list.  This is not an array,
+     like rel_hashes, because this case is quite uncommon.  */
+  struct xcoff_toc_rel_hash
+  {
+    struct xcoff_toc_rel_hash *next;
+    struct xcoff_link_hash_entry *h;
+    struct internal_reloc *rel;
+  } *toc_rel_hashes;
+};
+
+/* Information that the XCOFF linker collects about an archive.  */
+struct xcoff_archive_info
+{
+  /* The archive described by this entry.  */
+  bfd *archive;
+
+  /* The import path and import filename to use when referring to
+     this archive in the .loader section.  */
+  const char *imppath;
+  const char *impfile;
+
+  /* True if the archive contains a dynamic object.  */
+  unsigned int contains_shared_object_p : 1;
+
+  /* True if the previous field is valid.  */
+  unsigned int know_contains_shared_object_p : 1;
+};
+
+struct xcoff_link_hash_table
+{
+  struct bfd_link_hash_table root;
+
+  /* The .debug string hash table.  We need to compute this while
+     reading the input files, so that we know how large the .debug
+     section will be before we assign section positions.  */
+  struct bfd_strtab_hash *debug_strtab;
+
+  /* The .debug section we will use for the final output.  */
+  asection *debug_section;
+
+  /* The .loader section we will use for the final output.  */
+  asection *loader_section;
+
+  /* A count of non TOC relative relocs which will need to be
+     allocated in the .loader section.  */
+  size_t ldrel_count;
+
+  /* The .loader section header.  */
+  struct internal_ldhdr ldhdr;
+
+  /* The .gl section we use to hold global linkage code.  */
+  asection *linkage_section;
+
+  /* The .tc section we use to hold toc entries we build for global
+     linkage code.  */
+  asection *toc_section;
+
+  /* The .ds section we use to hold function descriptors which we
+     create for exported symbols.  */
+  asection *descriptor_section;
+
+  /* The list of import files.  */
+  struct xcoff_import_file *imports;
+
+  /* Required alignment of sections within the output file.  */
+  unsigned long file_align;
+
+  /* Whether the .text section must be read-only.  */
+  bfd_boolean textro;
+
+  /* Whether -brtl was specified.  */
+  bfd_boolean rtld;
+
+  /* Whether garbage collection was done.  */
+  bfd_boolean gc;
+
+  /* A linked list of symbols for which we have size information.  */
+  struct xcoff_link_size_list
+  {
+    struct xcoff_link_size_list *next;
+    struct xcoff_link_hash_entry *h;
+    bfd_size_type size;
+  } 
+  *size_list;
+
+  /* Information about archives.  */
+  htab_t archive_info;
+
+  /* Magic sections: _text, _etext, _data, _edata, _end, end. */
+  asection *special_sections[XCOFF_NUMBER_OF_SPECIAL_SECTIONS];
+};
+
+/* Information that we pass around while doing the final link step.  */
+
+struct xcoff_final_link_info
+{
+  /* General link information.  */
+  struct bfd_link_info *info;
+  /* Output BFD.  */
+  bfd *output_bfd;
+  /* Hash table for long symbol names.  */
+  struct bfd_strtab_hash *strtab;
+  /* Array of information kept for each output section, indexed by the
+     target_index field.  */
+  struct xcoff_link_section_info *section_info;
+  /* Symbol index of last C_FILE symbol (-1 if none).  */
+  long last_file_index;
+  /* Contents of last C_FILE symbol.  */
+  struct internal_syment last_file;
+  /* Symbol index of TOC symbol.  */
+  long toc_symindx;
+  /* Start of .loader symbols.  */
+  bfd_byte *ldsym;
+  /* Next .loader reloc to swap out.  */
+  bfd_byte *ldrel;
+  /* File position of start of line numbers.  */
+  file_ptr line_filepos;
+  /* Buffer large enough to hold swapped symbols of any input file.  */
+  struct internal_syment *internal_syms;
+  /* Buffer large enough to hold output indices of symbols of any
+     input file.  */
+  long *sym_indices;
+  /* Buffer large enough to hold output symbols for any input file.  */
+  bfd_byte *outsyms;
+  /* Buffer large enough to hold external line numbers for any input
+     section.  */
+  bfd_byte *linenos;
+  /* Buffer large enough to hold any input section.  */
+  bfd_byte *contents;
+  /* Buffer large enough to hold external relocs of any input section.  */
+  bfd_byte *external_relocs;
+};
+
+static bfd_boolean xcoff_mark (struct bfd_link_info *, asection *);
+
+
+
+/* Routines to read XCOFF dynamic information.  This don't really
+   belong here, but we already have the ldsym manipulation routines
+   here.  */
+
+/* Read the contents of a section.  */
+
+static bfd_boolean
+xcoff_get_section_contents (bfd *abfd, asection *sec)
+{
+  if (coff_section_data (abfd, sec) == NULL)
+    {
+      bfd_size_type amt = sizeof (struct coff_section_tdata);
+
+      sec->used_by_bfd = bfd_zalloc (abfd, amt);
+      if (sec->used_by_bfd == NULL)
+	return FALSE;
+    }
+
+  if (coff_section_data (abfd, sec)->contents == NULL)
+    {
+      bfd_byte *contents;
+
+      if (! bfd_malloc_and_get_section (abfd, sec, &contents))
+	{
+	  if (contents != NULL)
+	    free (contents);
+	  return FALSE;
+	}
+      coff_section_data (abfd, sec)->contents = contents;
+    }
+
+  return TRUE;
+}
+
+/* Get the size required to hold the dynamic symbols.  */
+
+long
+_bfd_xcoff_get_dynamic_symtab_upper_bound (bfd *abfd)
+{
+  asection *lsec;
+  bfd_byte *contents;
+  struct internal_ldhdr ldhdr;
+
+  if ((abfd->flags & DYNAMIC) == 0)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return -1;
+    }
+
+  lsec = bfd_get_section_by_name (abfd, ".loader");
+  if (lsec == NULL)
+    {
+      bfd_set_error (bfd_error_no_symbols);
+      return -1;
+    }
+
+  if (! xcoff_get_section_contents (abfd, lsec))
+    return -1;
+  contents = coff_section_data (abfd, lsec)->contents;
+
+  bfd_xcoff_swap_ldhdr_in (abfd, (void *) contents, &ldhdr);
+
+  return (ldhdr.l_nsyms + 1) * sizeof (asymbol *);
+}
+
+/* Get the dynamic symbols.  */
+
+long
+_bfd_xcoff_canonicalize_dynamic_symtab (bfd *abfd, asymbol **psyms)
+{
+  asection *lsec;
+  bfd_byte *contents;
+  struct internal_ldhdr ldhdr;
+  const char *strings;
+  bfd_byte *elsym, *elsymend;
+  coff_symbol_type *symbuf;
+
+  if ((abfd->flags & DYNAMIC) == 0)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return -1;
+    }
+
+  lsec = bfd_get_section_by_name (abfd, ".loader");
+  if (lsec == NULL)
+    {
+      bfd_set_error (bfd_error_no_symbols);
+      return -1;
+    }
+
+  if (! xcoff_get_section_contents (abfd, lsec))
+    return -1;
+  contents = coff_section_data (abfd, lsec)->contents;
+
+  coff_section_data (abfd, lsec)->keep_contents = TRUE;
+
+  bfd_xcoff_swap_ldhdr_in (abfd, contents, &ldhdr);
+
+  strings = (char *) contents + ldhdr.l_stoff;
+
+  symbuf = bfd_zalloc (abfd, ldhdr.l_nsyms * sizeof (* symbuf));
+  if (symbuf == NULL)
+    return -1;
+
+  elsym = contents + bfd_xcoff_loader_symbol_offset(abfd, &ldhdr);
+
+  elsymend = elsym + ldhdr.l_nsyms * bfd_xcoff_ldsymsz(abfd);
+  for (; elsym < elsymend; elsym += bfd_xcoff_ldsymsz(abfd), symbuf++, psyms++)
+    {
+      struct internal_ldsym ldsym;
+
+      bfd_xcoff_swap_ldsym_in (abfd, elsym, &ldsym);
+
+      symbuf->symbol.the_bfd = abfd;
+
+      if (ldsym._l._l_l._l_zeroes == 0)
+	symbuf->symbol.name = strings + ldsym._l._l_l._l_offset;
+      else
+	{
+	  char *c;
+
+	  c = bfd_alloc (abfd, (bfd_size_type) SYMNMLEN + 1);
+	  if (c == NULL)
+	    return -1;
+	  memcpy (c, ldsym._l._l_name, SYMNMLEN);
+	  c[SYMNMLEN] = '\0';
+	  symbuf->symbol.name = c;
+	}
+
+      if (ldsym.l_smclas == XMC_XO)
+	symbuf->symbol.section = bfd_abs_section_ptr;
+      else
+	symbuf->symbol.section = coff_section_from_bfd_index (abfd,
+							      ldsym.l_scnum);
+      symbuf->symbol.value = ldsym.l_value - symbuf->symbol.section->vma;
+
+      symbuf->symbol.flags = BSF_NO_FLAGS;
+      if ((ldsym.l_smtype & L_EXPORT) != 0)
+	{
+	  if ((ldsym.l_smtype & L_WEAK) != 0)
+	    symbuf->symbol.flags |= BSF_WEAK;
+	  else
+	    symbuf->symbol.flags |= BSF_GLOBAL;
+	}
+
+      /* FIXME: We have no way to record the other information stored
+	 with the loader symbol.  */
+      *psyms = (asymbol *) symbuf;
+    }
+
+  *psyms = NULL;
+
+  return ldhdr.l_nsyms;
+}
+
+/* Get the size required to hold the dynamic relocs.  */
+
+long
+_bfd_xcoff_get_dynamic_reloc_upper_bound (bfd *abfd)
+{
+  asection *lsec;
+  bfd_byte *contents;
+  struct internal_ldhdr ldhdr;
+
+  if ((abfd->flags & DYNAMIC) == 0)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return -1;
+    }
+
+  lsec = bfd_get_section_by_name (abfd, ".loader");
+  if (lsec == NULL)
+    {
+      bfd_set_error (bfd_error_no_symbols);
+      return -1;
+    }
+
+  if (! xcoff_get_section_contents (abfd, lsec))
+    return -1;
+  contents = coff_section_data (abfd, lsec)->contents;
+
+  bfd_xcoff_swap_ldhdr_in (abfd, (struct external_ldhdr *) contents, &ldhdr);
+
+  return (ldhdr.l_nreloc + 1) * sizeof (arelent *);
+}
+
+/* Get the dynamic relocs.  */
+
+long
+_bfd_xcoff_canonicalize_dynamic_reloc (bfd *abfd,
+				       arelent **prelocs,
+				       asymbol **syms)
+{
+  asection *lsec;
+  bfd_byte *contents;
+  struct internal_ldhdr ldhdr;
+  arelent *relbuf;
+  bfd_byte *elrel, *elrelend;
+
+  if ((abfd->flags & DYNAMIC) == 0)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return -1;
+    }
+
+  lsec = bfd_get_section_by_name (abfd, ".loader");
+  if (lsec == NULL)
+    {
+      bfd_set_error (bfd_error_no_symbols);
+      return -1;
+    }
+
+  if (! xcoff_get_section_contents (abfd, lsec))
+    return -1;
+  contents = coff_section_data (abfd, lsec)->contents;
+
+  bfd_xcoff_swap_ldhdr_in (abfd, contents, &ldhdr);
+
+  relbuf = bfd_alloc (abfd, ldhdr.l_nreloc * sizeof (arelent));
+  if (relbuf == NULL)
+    return -1;
+
+  elrel = contents + bfd_xcoff_loader_reloc_offset(abfd, &ldhdr);
+
+  elrelend = elrel + ldhdr.l_nreloc * bfd_xcoff_ldrelsz(abfd);
+  for (; elrel < elrelend; elrel += bfd_xcoff_ldrelsz(abfd), relbuf++,
+	 prelocs++)
+    {
+      struct internal_ldrel ldrel;
+
+      bfd_xcoff_swap_ldrel_in (abfd, elrel, &ldrel);
+
+      if (ldrel.l_symndx >= 3)
+	relbuf->sym_ptr_ptr = syms + (ldrel.l_symndx - 3);
+      else
+	{
+	  const char *name;
+	  asection *sec;
+
+	  switch (ldrel.l_symndx)
+	    {
+	    case 0:
+	      name = ".text";
+	      break;
+	    case 1:
+	      name = ".data";
+	      break;
+	    case 2:
+	      name = ".bss";
+	      break;
+	    default:
+	      abort ();
+	      break;
+	    }
+
+	  sec = bfd_get_section_by_name (abfd, name);
+	  if (sec == NULL)
+	    {
+	      bfd_set_error (bfd_error_bad_value);
+	      return -1;
+	    }
+
+	  relbuf->sym_ptr_ptr = sec->symbol_ptr_ptr;
+	}
+
+      relbuf->address = ldrel.l_vaddr;
+      relbuf->addend = 0;
+
+      /* Most dynamic relocs have the same type.  FIXME: This is only
+	 correct if ldrel.l_rtype == 0.  In other cases, we should use
+	 a different howto.  */
+      relbuf->howto = bfd_xcoff_dynamic_reloc_howto(abfd);
+
+      /* FIXME: We have no way to record the l_rsecnm field.  */
+
+      *prelocs = relbuf;
+    }
+
+  *prelocs = NULL;
+
+  return ldhdr.l_nreloc;
+}
+
+/* Hash functions for xcoff_link_hash_table's archive_info.  */
+
+static hashval_t
+xcoff_archive_info_hash (const void *data)
+{
+  const struct xcoff_archive_info *info;
+
+  info = (const struct xcoff_archive_info *) data;
+  return htab_hash_pointer (info->archive);
+}
+
+static int
+xcoff_archive_info_eq (const void *data1, const void *data2)
+{
+  const struct xcoff_archive_info *info1;
+  const struct xcoff_archive_info *info2;
+
+  info1 = (const struct xcoff_archive_info *) data1;
+  info2 = (const struct xcoff_archive_info *) data2;
+  return info1->archive == info2->archive;
+}
+
+/* Return information about archive ARCHIVE.  Return NULL on error.  */
+
+static struct xcoff_archive_info *
+xcoff_get_archive_info (struct bfd_link_info *info, bfd *archive)
+{
+  struct xcoff_link_hash_table *htab;
+  struct xcoff_archive_info *entryp, entry;
+  void **slot;
+
+  htab = xcoff_hash_table (info);
+  entry.archive = archive;
+  slot = htab_find_slot (htab->archive_info, &entry, INSERT);
+  if (!slot)
+    return NULL;
+
+  entryp = *slot;
+  if (!entryp)
+    {
+      entryp = bfd_zalloc (archive, sizeof (entry));
+      if (!entryp)
+	return NULL;
+
+      entryp->archive = archive;
+      *slot = entryp;
+    }
+  return entryp;
+}
+
+/* Routine to create an entry in an XCOFF link hash table.  */
+
+static struct bfd_hash_entry *
+xcoff_link_hash_newfunc (struct bfd_hash_entry *entry,
+			 struct bfd_hash_table *table,
+			 const char *string)
+{
+  struct xcoff_link_hash_entry *ret = (struct xcoff_link_hash_entry *) entry;
+
+  /* Allocate the structure if it has not already been allocated by a
+     subclass.  */
+  if (ret == NULL)
+    ret = bfd_hash_allocate (table, sizeof (* ret));
+  if (ret == NULL)
+    return NULL;
+
+  /* Call the allocation method of the superclass.  */
+  ret = ((struct xcoff_link_hash_entry *)
+	 _bfd_link_hash_newfunc ((struct bfd_hash_entry *) ret,
+				 table, string));
+  if (ret != NULL)
+    {
+      /* Set local fields.  */
+      ret->indx = -1;
+      ret->toc_section = NULL;
+      ret->u.toc_indx = -1;
+      ret->descriptor = NULL;
+      ret->ldsym = NULL;
+      ret->ldindx = -1;
+      ret->flags = 0;
+      ret->smclas = XMC_UA;
+    }
+
+  return (struct bfd_hash_entry *) ret;
+}
+
+/* Create a XCOFF link hash table.  */
+
+struct bfd_link_hash_table *
+_bfd_xcoff_bfd_link_hash_table_create (bfd *abfd)
+{
+  struct xcoff_link_hash_table *ret;
+  bfd_size_type amt = sizeof (* ret);
+
+  ret = bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+  if (!_bfd_link_hash_table_init (&ret->root, abfd, xcoff_link_hash_newfunc,
+				  sizeof (struct xcoff_link_hash_entry)))
+    {
+      free (ret);
+      return NULL;
+    }
+
+  ret->debug_strtab = _bfd_xcoff_stringtab_init ();
+  ret->debug_section = NULL;
+  ret->loader_section = NULL;
+  ret->ldrel_count = 0;
+  memset (&ret->ldhdr, 0, sizeof (struct internal_ldhdr));
+  ret->linkage_section = NULL;
+  ret->toc_section = NULL;
+  ret->descriptor_section = NULL;
+  ret->imports = NULL;
+  ret->file_align = 0;
+  ret->textro = FALSE;
+  ret->gc = FALSE;
+  ret->archive_info = htab_create (37, xcoff_archive_info_hash,
+				   xcoff_archive_info_eq, NULL);
+  memset (ret->special_sections, 0, sizeof ret->special_sections);
+
+  /* The linker will always generate a full a.out header.  We need to
+     record that fact now, before the sizeof_headers routine could be
+     called.  */
+  xcoff_data (abfd)->full_aouthdr = TRUE;
+
+  return &ret->root;
+}
+
+/* Free a XCOFF link hash table.  */
+
+void
+_bfd_xcoff_bfd_link_hash_table_free (struct bfd_link_hash_table *hash)
+{
+  struct xcoff_link_hash_table *ret = (struct xcoff_link_hash_table *) hash;
+
+  _bfd_stringtab_free (ret->debug_strtab);
+  bfd_hash_table_free (&ret->root.table);
+  free (ret);
+}
+
+/* Read internal relocs for an XCOFF csect.  This is a wrapper around
+   _bfd_coff_read_internal_relocs which tries to take advantage of any
+   relocs which may have been cached for the enclosing section.  */
+
+static struct internal_reloc *
+xcoff_read_internal_relocs (bfd *abfd,
+			    asection *sec,
+			    bfd_boolean cache,
+			    bfd_byte *external_relocs,
+			    bfd_boolean require_internal,
+			    struct internal_reloc *internal_relocs)
+{
+  if (coff_section_data (abfd, sec) != NULL
+      && coff_section_data (abfd, sec)->relocs == NULL
+      && xcoff_section_data (abfd, sec) != NULL)
+    {
+      asection *enclosing;
+
+      enclosing = xcoff_section_data (abfd, sec)->enclosing;
+
+      if (enclosing != NULL
+	  && (coff_section_data (abfd, enclosing) == NULL
+	      || coff_section_data (abfd, enclosing)->relocs == NULL)
+	  && cache
+	  && enclosing->reloc_count > 0)
+	{
+	  if (_bfd_coff_read_internal_relocs (abfd, enclosing, TRUE,
+					      external_relocs, FALSE, NULL)
+	      == NULL)
+	    return NULL;
+	}
+
+      if (enclosing != NULL
+	  && coff_section_data (abfd, enclosing) != NULL
+	  && coff_section_data (abfd, enclosing)->relocs != NULL)
+	{
+	  size_t off;
+
+	  off = ((sec->rel_filepos - enclosing->rel_filepos)
+		 / bfd_coff_relsz (abfd));
+
+	  if (! require_internal)
+	    return coff_section_data (abfd, enclosing)->relocs + off;
+	  memcpy (internal_relocs,
+		  coff_section_data (abfd, enclosing)->relocs + off,
+		  sec->reloc_count * sizeof (struct internal_reloc));
+	  return internal_relocs;
+	}
+    }
+
+  return _bfd_coff_read_internal_relocs (abfd, sec, cache, external_relocs,
+					 require_internal, internal_relocs);
+}
+
+/* Split FILENAME into an import path and an import filename,
+   storing them in *IMPPATH and *IMPFILE respectively.  */
+
+bfd_boolean
+bfd_xcoff_split_import_path (bfd *abfd, const char *filename,
+			     const char **imppath, const char **impfile)
+{
+  const char *base;
+  size_t length;
+  char *path;
+
+  base = lbasename (filename);
+  length = base - filename;
+  if (length == 0)
+    /* The filename has no directory component, so use an empty path.  */
+    *imppath = "";
+  else if (length == 1)
+    /* The filename is in the root directory.  */
+    *imppath = "/";
+  else
+    {
+      /* Extract the (non-empty) directory part.  Note that we don't
+	 need to strip duplicate directory separators from any part
+	 of the string; the native linker doesn't do that either.  */
+      path = bfd_alloc (abfd, length);
+      if (path == NULL)
+	return FALSE;
+      memcpy (path, filename, length - 1);
+      path[length - 1] = 0;
+      *imppath = path;
+    }
+  *impfile = base;
+  return TRUE;
+}
+
+/* Set ARCHIVE's import path as though its filename had been given
+   as FILENAME.  */
+
+bfd_boolean
+bfd_xcoff_set_archive_import_path (struct bfd_link_info *info,
+				   bfd *archive, const char *filename)
+{
+  struct xcoff_archive_info *archive_info;
+
+  archive_info = xcoff_get_archive_info (info, archive);
+  return (archive_info != NULL
+	  && bfd_xcoff_split_import_path (archive, filename,
+					  &archive_info->imppath,
+					  &archive_info->impfile));
+}
+
+/* H is an imported symbol.  Set the import module's path, file and member
+   to IMPATH, IMPFILE and IMPMEMBER respectively.  All three are null if
+   no specific import module is specified.  */
+
+static bfd_boolean
+xcoff_set_import_path (struct bfd_link_info *info,
+		       struct xcoff_link_hash_entry *h,
+		       const char *imppath, const char *impfile,
+		       const char *impmember)
+{
+  unsigned int c;
+  struct xcoff_import_file **pp;
+
+  /* We overload the ldindx field to hold the l_ifile value for this
+     symbol.  */
+  BFD_ASSERT (h->ldsym == NULL);
+  BFD_ASSERT ((h->flags & XCOFF_BUILT_LDSYM) == 0);
+  if (imppath == NULL)
+    h->ldindx = -1;
+  else
+    {
+      /* We start c at 1 because the first entry in the import list is
+	 reserved for the library search path.  */
+      for (pp = &xcoff_hash_table (info)->imports, c = 1;
+	   *pp != NULL;
+	   pp = &(*pp)->next, ++c)
+	{
+	  if (filename_cmp ((*pp)->path, imppath) == 0
+	      && filename_cmp ((*pp)->file, impfile) == 0
+	      && filename_cmp ((*pp)->member, impmember) == 0)
+	    break;
+	}
+
+      if (*pp == NULL)
+	{
+	  struct xcoff_import_file *n;
+	  bfd_size_type amt = sizeof (* n);
+
+	  n = bfd_alloc (info->output_bfd, amt);
+	  if (n == NULL)
+	    return FALSE;
+	  n->next = NULL;
+	  n->path = imppath;
+	  n->file = impfile;
+	  n->member = impmember;
+	  *pp = n;
+	}
+      h->ldindx = c;
+    }
+  return TRUE;
+}
+
+/* H is the bfd symbol associated with exported .loader symbol LDSYM.
+   Return true if LDSYM defines H.  */
+
+static bfd_boolean
+xcoff_dynamic_definition_p (struct xcoff_link_hash_entry *h,
+			    struct internal_ldsym *ldsym)
+{
+  /* If we didn't know about H before processing LDSYM, LDSYM
+     definitely defines H.  */
+  if (h->root.type == bfd_link_hash_new)
+    return TRUE;
+
+  /* If H is currently a weak dynamic symbol, and if LDSYM is a strong
+     dynamic symbol, LDSYM trumps the current definition of H.  */
+  if ((ldsym->l_smtype & L_WEAK) == 0
+      && (h->flags & XCOFF_DEF_DYNAMIC) != 0
+      && (h->flags & XCOFF_DEF_REGULAR) == 0
+      && (h->root.type == bfd_link_hash_defweak
+	  || h->root.type == bfd_link_hash_undefweak))
+    return TRUE;
+
+  /* If H is currently undefined, LDSYM defines it.  */
+  if ((h->flags & XCOFF_DEF_DYNAMIC) == 0
+      && (h->root.type == bfd_link_hash_undefined
+	  || h->root.type == bfd_link_hash_undefweak))
+    return TRUE;
+
+  return FALSE;
+}
+
+/* This function is used to add symbols from a dynamic object to the
+   global symbol table.  */
+
+static bfd_boolean
+xcoff_link_add_dynamic_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  asection *lsec;
+  bfd_byte *contents;
+  struct internal_ldhdr ldhdr;
+  const char *strings;
+  bfd_byte *elsym, *elsymend;
+  struct xcoff_import_file *n;
+  unsigned int c;
+  struct xcoff_import_file **pp;
+
+  /* We can only handle a dynamic object if we are generating an XCOFF
+     output file.  */
+   if (info->output_bfd->xvec != abfd->xvec)
+    {
+      (*_bfd_error_handler)
+	(_("%s: XCOFF shared object when not producing XCOFF output"),
+	 bfd_get_filename (abfd));
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+
+  /* The symbols we use from a dynamic object are not the symbols in
+     the normal symbol table, but, rather, the symbols in the export
+     table.  If there is a global symbol in a dynamic object which is
+     not in the export table, the loader will not be able to find it,
+     so we don't want to find it either.  Also, on AIX 4.1.3, shr.o in
+     libc.a has symbols in the export table which are not in the
+     symbol table.  */
+
+  /* Read in the .loader section.  FIXME: We should really use the
+     o_snloader field in the a.out header, rather than grabbing the
+     section by name.  */
+  lsec = bfd_get_section_by_name (abfd, ".loader");
+  if (lsec == NULL)
+    {
+      (*_bfd_error_handler)
+	(_("%s: dynamic object with no .loader section"),
+	 bfd_get_filename (abfd));
+      bfd_set_error (bfd_error_no_symbols);
+      return FALSE;
+    }
+
+  if (! xcoff_get_section_contents (abfd, lsec))
+    return FALSE;
+  contents = coff_section_data (abfd, lsec)->contents;
+
+  /* Remove the sections from this object, so that they do not get
+     included in the link.  */
+  bfd_section_list_clear (abfd);
+
+  bfd_xcoff_swap_ldhdr_in (abfd, contents, &ldhdr);
+
+  strings = (char *) contents + ldhdr.l_stoff;
+
+  elsym = contents + bfd_xcoff_loader_symbol_offset(abfd, &ldhdr);
+
+  elsymend = elsym + ldhdr.l_nsyms * bfd_xcoff_ldsymsz(abfd);
+
+  for (; elsym < elsymend; elsym += bfd_xcoff_ldsymsz(abfd))
+    {
+      struct internal_ldsym ldsym;
+      char nambuf[SYMNMLEN + 1];
+      const char *name;
+      struct xcoff_link_hash_entry *h;
+
+      bfd_xcoff_swap_ldsym_in (abfd, elsym, &ldsym);
+
+      /* We are only interested in exported symbols.  */
+      if ((ldsym.l_smtype & L_EXPORT) == 0)
+	continue;
+
+      if (ldsym._l._l_l._l_zeroes == 0)
+	name = strings + ldsym._l._l_l._l_offset;
+      else
+	{
+	  memcpy (nambuf, ldsym._l._l_name, SYMNMLEN);
+	  nambuf[SYMNMLEN] = '\0';
+	  name = nambuf;
+	}
+
+      /* Normally we could not call xcoff_link_hash_lookup in an add
+	 symbols routine, since we might not be using an XCOFF hash
+	 table.  However, we verified above that we are using an XCOFF
+	 hash table.  */
+
+      h = xcoff_link_hash_lookup (xcoff_hash_table (info), name, TRUE,
+				  TRUE, TRUE);
+      if (h == NULL)
+	return FALSE;
+
+      if (!xcoff_dynamic_definition_p (h, &ldsym))
+	continue;
+
+      h->flags |= XCOFF_DEF_DYNAMIC;
+      h->smclas = ldsym.l_smclas;
+      if (h->smclas == XMC_XO)
+	{
+	  /* This symbol has an absolute value.  */
+	  if ((ldsym.l_smtype & L_WEAK) != 0)
+	    h->root.type = bfd_link_hash_defweak;
+	  else
+	    h->root.type = bfd_link_hash_defined;
+	  h->root.u.def.section = bfd_abs_section_ptr;
+	  h->root.u.def.value = ldsym.l_value;
+	}
+      else
+	{
+	  /* Otherwise, we don't bother to actually define the symbol,
+	     since we don't have a section to put it in anyhow.
+	     We assume instead that an undefined XCOFF_DEF_DYNAMIC symbol
+	     should be imported from the symbol's undef.abfd.  */
+	  if ((ldsym.l_smtype & L_WEAK) != 0)
+	    h->root.type = bfd_link_hash_undefweak;
+	  else
+	    h->root.type = bfd_link_hash_undefined;
+	  h->root.u.undef.abfd = abfd;
+	}
+
+      /* If this symbol defines a function descriptor, then it
+	 implicitly defines the function code as well.  */
+      if (h->smclas == XMC_DS
+	  || (h->smclas == XMC_XO && name[0] != '.'))
+	h->flags |= XCOFF_DESCRIPTOR;
+      if ((h->flags & XCOFF_DESCRIPTOR) != 0)
+	{
+	  struct xcoff_link_hash_entry *hds;
+
+	  hds = h->descriptor;
+	  if (hds == NULL)
+	    {
+	      char *dsnm;
+
+	      dsnm = bfd_malloc ((bfd_size_type) strlen (name) + 2);
+	      if (dsnm == NULL)
+		return FALSE;
+	      dsnm[0] = '.';
+	      strcpy (dsnm + 1, name);
+	      hds = xcoff_link_hash_lookup (xcoff_hash_table (info), dsnm,
+					    TRUE, TRUE, TRUE);
+	      free (dsnm);
+	      if (hds == NULL)
+		return FALSE;
+
+	      hds->descriptor = h;
+	      h->descriptor = hds;
+	    }
+
+	  if (xcoff_dynamic_definition_p (hds, &ldsym))
+	    {
+	      hds->root.type = h->root.type;
+	      hds->flags |= XCOFF_DEF_DYNAMIC;
+	      if (h->smclas == XMC_XO)
+		{
+		  /* An absolute symbol appears to actually define code, not a
+		     function descriptor.  This is how some math functions are
+		     implemented on AIX 4.1.  */
+		  hds->smclas = XMC_XO;
+		  hds->root.u.def.section = bfd_abs_section_ptr;
+		  hds->root.u.def.value = ldsym.l_value;
+		}
+	      else
+		{
+		  hds->smclas = XMC_PR;
+		  hds->root.u.undef.abfd = abfd;
+		  /* We do not want to add this to the undefined
+		     symbol list.  */
+		}
+	    }
+	}
+    }
+
+  if (contents != NULL && ! coff_section_data (abfd, lsec)->keep_contents)
+    {
+      free (coff_section_data (abfd, lsec)->contents);
+      coff_section_data (abfd, lsec)->contents = NULL;
+    }
+
+  /* Record this file in the import files.  */
+  n = bfd_alloc (abfd, (bfd_size_type) sizeof (struct xcoff_import_file));
+  if (n == NULL)
+    return FALSE;
+  n->next = NULL;
+
+  if (abfd->my_archive == NULL)
+    {
+      if (!bfd_xcoff_split_import_path (abfd, abfd->filename,
+					&n->path, &n->file))
+	return FALSE;
+      n->member = "";
+    }
+  else
+    {
+      struct xcoff_archive_info *archive_info;
+
+      archive_info = xcoff_get_archive_info (info, abfd->my_archive);
+      if (!archive_info->impfile)
+	{
+	  if (!bfd_xcoff_split_import_path (archive_info->archive,
+					    archive_info->archive->filename,
+					    &archive_info->imppath,
+					    &archive_info->impfile))
+	    return FALSE;
+	}
+      n->path = archive_info->imppath;
+      n->file = archive_info->impfile;
+      n->member = bfd_get_filename (abfd);
+    }
+
+  /* We start c at 1 because the first import file number is reserved
+     for LIBPATH.  */
+  for (pp = &xcoff_hash_table (info)->imports, c = 1;
+       *pp != NULL;
+       pp = &(*pp)->next, ++c)
+    ;
+  *pp = n;
+
+  xcoff_data (abfd)->import_file_id = c;
+
+  return TRUE;
+}
+
+/* xcoff_link_create_extra_sections
+
+   Takes care of creating the .loader, .gl, .ds, .debug and sections.  */
+
+static bfd_boolean
+xcoff_link_create_extra_sections (bfd * abfd, struct bfd_link_info *info)
+{
+  bfd_boolean return_value = FALSE;
+
+  if (info->output_bfd->xvec == abfd->xvec)
+    {
+      /* We need to build a .loader section, so we do it here.  This
+	 won't work if we're producing an XCOFF output file with no
+	 XCOFF input files.  FIXME.  */
+
+      if (!info->relocatable
+	  && xcoff_hash_table (info)->loader_section == NULL)
+	{
+	  asection *lsec;
+	  flagword flags = SEC_HAS_CONTENTS | SEC_IN_MEMORY;
+
+	  lsec = bfd_make_section_anyway_with_flags (abfd, ".loader", flags);
+	  if (lsec == NULL)
+	    goto end_return;
+
+	  xcoff_hash_table (info)->loader_section = lsec;
+	}
+
+      /* Likewise for the linkage section.  */
+      if (xcoff_hash_table (info)->linkage_section == NULL)
+	{
+	  asection *lsec;
+	  flagword flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
+			    | SEC_IN_MEMORY);
+
+	  lsec = bfd_make_section_anyway_with_flags (abfd, ".gl", flags);
+	  if (lsec == NULL)
+	    goto end_return;
+
+	  xcoff_hash_table (info)->linkage_section = lsec;
+	  lsec->alignment_power = 2;
+	}
+
+      /* Likewise for the TOC section.  */
+      if (xcoff_hash_table (info)->toc_section == NULL)
+	{
+	  asection *tsec;
+	  flagword flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
+			    | SEC_IN_MEMORY);
+
+	  tsec = bfd_make_section_anyway_with_flags (abfd, ".tc", flags);
+	  if (tsec == NULL)
+	    goto end_return;
+
+	  xcoff_hash_table (info)->toc_section = tsec;
+	  tsec->alignment_power = 2;
+	}
+
+      /* Likewise for the descriptor section.  */
+      if (xcoff_hash_table (info)->descriptor_section == NULL)
+	{
+	  asection *dsec;
+	  flagword flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
+			    | SEC_IN_MEMORY);
+
+	  dsec = bfd_make_section_anyway_with_flags (abfd, ".ds", flags);
+	  if (dsec == NULL)
+	    goto end_return;
+
+	  xcoff_hash_table (info)->descriptor_section = dsec;
+	  dsec->alignment_power = 2;
+	}
+
+      /* Likewise for the .debug section.  */
+      if (xcoff_hash_table (info)->debug_section == NULL
+	  && info->strip != strip_all)
+	{
+	  asection *dsec;
+	  flagword flags = SEC_HAS_CONTENTS | SEC_IN_MEMORY;
+
+	  dsec = bfd_make_section_anyway_with_flags (abfd, ".debug", flags);
+	  if (dsec == NULL)
+	    goto end_return;
+
+	  xcoff_hash_table (info)->debug_section = dsec;
+	}
+    }
+
+  return_value = TRUE;
+
+ end_return:
+
+  return return_value;
+}
+
+/* Returns the index of reloc in RELOCS with the least address greater
+   than or equal to ADDRESS.  The relocs are sorted by address.  */
+
+static bfd_size_type
+xcoff_find_reloc (struct internal_reloc *relocs,
+		  bfd_size_type count,
+		  bfd_vma address)
+{
+  bfd_size_type min, max, this;
+
+  if (count < 2)
+    {
+      if (count == 1 && relocs[0].r_vaddr < address)
+	return 1;
+      else
+	return 0;
+    }
+
+  min = 0;
+  max = count;
+
+  /* Do a binary search over (min,max].  */
+  while (min + 1 < max)
+    {
+      bfd_vma raddr;
+
+      this = (max + min) / 2;
+      raddr = relocs[this].r_vaddr;
+      if (raddr > address)
+	max = this;
+      else if (raddr < address)
+	min = this;
+      else
+	{
+	  min = this;
+	  break;
+	}
+    }
+
+  if (relocs[min].r_vaddr < address)
+    return min + 1;
+
+  while (min > 0
+	 && relocs[min - 1].r_vaddr == address)
+    --min;
+
+  return min;
+}
+
+/* Add all the symbols from an object file to the hash table.
+
+   XCOFF is a weird format.  A normal XCOFF .o files will have three
+   COFF sections--.text, .data, and .bss--but each COFF section will
+   contain many csects.  These csects are described in the symbol
+   table.  From the linker's point of view, each csect must be
+   considered a section in its own right.  For example, a TOC entry is
+   handled as a small XMC_TC csect.  The linker must be able to merge
+   different TOC entries together, which means that it must be able to
+   extract the XMC_TC csects from the .data section of the input .o
+   file.
+
+   From the point of view of our linker, this is, of course, a hideous
+   nightmare.  We cope by actually creating sections for each csect,
+   and discarding the original sections.  We then have to handle the
+   relocation entries carefully, since the only way to tell which
+   csect they belong to is to examine the address.  */
+
+static bfd_boolean
+xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  unsigned int n_tmask;
+  unsigned int n_btshft;
+  bfd_boolean default_copy;
+  bfd_size_type symcount;
+  struct xcoff_link_hash_entry **sym_hash;
+  asection **csect_cache;
+  unsigned int *lineno_counts;
+  bfd_size_type linesz;
+  asection *o;
+  asection *last_real;
+  bfd_boolean keep_syms;
+  asection *csect;
+  unsigned int csect_index;
+  asection *first_csect;
+  bfd_size_type symesz;
+  bfd_byte *esym;
+  bfd_byte *esym_end;
+  struct reloc_info_struct
+  {
+    struct internal_reloc *relocs;
+    asection **csects;
+    bfd_byte *linenos;
+  } *reloc_info = NULL;
+  bfd_size_type amt;
+
+  keep_syms = obj_coff_keep_syms (abfd);
+
+  if ((abfd->flags & DYNAMIC) != 0
+      && ! info->static_link)
+    {
+      if (! xcoff_link_add_dynamic_symbols (abfd, info))
+	return FALSE;
+    }
+
+  /* Create the loader, toc, gl, ds and debug sections, if needed.  */
+  if (! xcoff_link_create_extra_sections (abfd, info))
+    goto error_return;
+
+  if ((abfd->flags & DYNAMIC) != 0
+      && ! info->static_link)
+    return TRUE;
+
+  n_tmask = coff_data (abfd)->local_n_tmask;
+  n_btshft = coff_data (abfd)->local_n_btshft;
+
+  /* Define macros so that ISFCN, et. al., macros work correctly.  */
+#define N_TMASK n_tmask
+#define N_BTSHFT n_btshft
+
+  if (info->keep_memory)
+    default_copy = FALSE;
+  else
+    default_copy = TRUE;
+
+  symcount = obj_raw_syment_count (abfd);
+
+  /* We keep a list of the linker hash table entries that correspond
+     to each external symbol.  */
+  amt = symcount * sizeof (struct xcoff_link_hash_entry *);
+  sym_hash = bfd_zalloc (abfd, amt);
+  if (sym_hash == NULL && symcount != 0)
+    goto error_return;
+  coff_data (abfd)->sym_hashes = (struct coff_link_hash_entry **) sym_hash;
+
+  /* Because of the weird stuff we are doing with XCOFF csects, we can
+     not easily determine which section a symbol is in, so we store
+     the information in the tdata for the input file.  */
+  amt = symcount * sizeof (asection *);
+  csect_cache = bfd_zalloc (abfd, amt);
+  if (csect_cache == NULL && symcount != 0)
+    goto error_return;
+  xcoff_data (abfd)->csects = csect_cache;
+
+  /* We garbage-collect line-number information on a symbol-by-symbol
+     basis, so we need to have quick access to the number of entries
+     per symbol.  */
+  amt = symcount * sizeof (unsigned int);
+  lineno_counts = bfd_zalloc (abfd, amt);
+  if (lineno_counts == NULL && symcount != 0)
+    goto error_return;
+  xcoff_data (abfd)->lineno_counts = lineno_counts;
+
+  /* While splitting sections into csects, we need to assign the
+     relocs correctly.  The relocs and the csects must both be in
+     order by VMA within a given section, so we handle this by
+     scanning along the relocs as we process the csects.  We index
+     into reloc_info using the section target_index.  */
+  amt = abfd->section_count + 1;
+  amt *= sizeof (struct reloc_info_struct);
+  reloc_info = bfd_zmalloc (amt);
+  if (reloc_info == NULL)
+    goto error_return;
+
+  /* Read in the relocs and line numbers for each section.  */
+  linesz = bfd_coff_linesz (abfd);
+  last_real = NULL;
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      last_real = o;
+
+      if ((o->flags & SEC_RELOC) != 0)
+	{
+	  reloc_info[o->target_index].relocs =
+	    xcoff_read_internal_relocs (abfd, o, TRUE, NULL, FALSE, NULL);
+	  amt = o->reloc_count;
+	  amt *= sizeof (asection *);
+	  reloc_info[o->target_index].csects = bfd_zmalloc (amt);
+	  if (reloc_info[o->target_index].csects == NULL)
+	    goto error_return;
+	}
+
+      if ((info->strip == strip_none || info->strip == strip_some)
+	  && o->lineno_count > 0)
+	{
+	  bfd_byte *linenos;
+
+	  amt = linesz * o->lineno_count;
+	  linenos = bfd_malloc (amt);
+	  if (linenos == NULL)
+	    goto error_return;
+	  reloc_info[o->target_index].linenos = linenos;
+	  if (bfd_seek (abfd, o->line_filepos, SEEK_SET) != 0
+	      || bfd_bread (linenos, amt, abfd) != amt)
+	    goto error_return;
+	}
+    }
+
+  /* Don't let the linker relocation routines discard the symbols.  */
+  obj_coff_keep_syms (abfd) = TRUE;
+
+  csect = NULL;
+  csect_index = 0;
+  first_csect = NULL;
+
+  symesz = bfd_coff_symesz (abfd);
+  BFD_ASSERT (symesz == bfd_coff_auxesz (abfd));
+  esym = (bfd_byte *) obj_coff_external_syms (abfd);
+  esym_end = esym + symcount * symesz;
+
+  while (esym < esym_end)
+    {
+      struct internal_syment sym;
+      union internal_auxent aux;
+      const char *name;
+      char buf[SYMNMLEN + 1];
+      int smtyp;
+      asection *section;
+      bfd_vma value;
+      struct xcoff_link_hash_entry *set_toc;
+
+      bfd_coff_swap_sym_in (abfd, (void *) esym, (void *) &sym);
+
+      /* In this pass we are only interested in symbols with csect
+	 information.  */
+      if (!CSECT_SYM_P (sym.n_sclass))
+	{
+	  /* Set csect_cache,
+	     Normally csect is a .pr, .rw  etc. created in the loop
+	     If C_FILE or first time, handle special
+
+	     Advance esym, sym_hash, csect_hash ptrs.  */
+	  if (sym.n_sclass == C_FILE || sym.n_sclass == C_DWARF)
+	    csect = NULL;
+	  if (csect != NULL)
+	    *csect_cache = csect;
+	  else if (first_csect == NULL
+                   || sym.n_sclass == C_FILE || sym.n_sclass == C_DWARF)
+	    *csect_cache = coff_section_from_bfd_index (abfd, sym.n_scnum);
+	  else
+	    *csect_cache = NULL;
+	  esym += (sym.n_numaux + 1) * symesz;
+	  sym_hash += sym.n_numaux + 1;
+	  csect_cache += sym.n_numaux + 1;
+	  lineno_counts += sym.n_numaux + 1;
+
+	  continue;
+	}
+
+      name = _bfd_coff_internal_syment_name (abfd, &sym, buf);
+
+      if (name == NULL)
+	goto error_return;
+
+      /* If this symbol has line number information attached to it,
+	 and we're not stripping it, count the number of entries and
+	 add them to the count for this csect.  In the final link pass
+	 we are going to attach line number information by symbol,
+	 rather than by section, in order to more easily handle
+	 garbage collection.  */
+      if ((info->strip == strip_none || info->strip == strip_some)
+	  && sym.n_numaux > 1
+	  && csect != NULL
+	  && ISFCN (sym.n_type))
+	{
+	  union internal_auxent auxlin;
+
+	  bfd_coff_swap_aux_in (abfd, (void *) (esym + symesz),
+				sym.n_type, sym.n_sclass,
+				0, sym.n_numaux, (void *) &auxlin);
+
+	  if (auxlin.x_sym.x_fcnary.x_fcn.x_lnnoptr != 0)
+	    {
+	      asection *enclosing;
+	      bfd_signed_vma linoff;
+
+	      enclosing = xcoff_section_data (abfd, csect)->enclosing;
+	      if (enclosing == NULL)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B: `%s' has line numbers but no enclosing section"),
+		     abfd, name);
+		  bfd_set_error (bfd_error_bad_value);
+		  goto error_return;
+		}
+	      linoff = (auxlin.x_sym.x_fcnary.x_fcn.x_lnnoptr
+			- enclosing->line_filepos);
+	      /* Explicit cast to bfd_signed_vma for compiler.  */
+	      if (linoff < (bfd_signed_vma) (enclosing->lineno_count * linesz))
+		{
+		  struct internal_lineno lin;
+		  bfd_byte *linpstart;
+
+		  linpstart = (reloc_info[enclosing->target_index].linenos
+			       + linoff);
+		  bfd_coff_swap_lineno_in (abfd, (void *) linpstart, (void *) &lin);
+		  if (lin.l_lnno == 0
+		      && ((bfd_size_type) lin.l_addr.l_symndx
+			  == ((esym
+			       - (bfd_byte *) obj_coff_external_syms (abfd))
+			      / symesz)))
+		    {
+		      bfd_byte *linpend, *linp;
+
+		      linpend = (reloc_info[enclosing->target_index].linenos
+				 + enclosing->lineno_count * linesz);
+		      for (linp = linpstart + linesz;
+			   linp < linpend;
+			   linp += linesz)
+			{
+			  bfd_coff_swap_lineno_in (abfd, (void *) linp,
+						   (void *) &lin);
+			  if (lin.l_lnno == 0)
+			    break;
+			}
+		      *lineno_counts = (linp - linpstart) / linesz;
+		      /* The setting of line_filepos will only be
+			 useful if all the line number entries for a
+			 csect are contiguous; this only matters for
+			 error reporting.  */
+		      if (csect->line_filepos == 0)
+			csect->line_filepos =
+			  auxlin.x_sym.x_fcnary.x_fcn.x_lnnoptr;
+		    }
+		}
+	    }
+	}
+
+      /* Pick up the csect auxiliary information.  */
+      if (sym.n_numaux == 0)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B: class %d symbol `%s' has no aux entries"),
+	     abfd, sym.n_sclass, name);
+	  bfd_set_error (bfd_error_bad_value);
+	  goto error_return;
+	}
+
+      bfd_coff_swap_aux_in (abfd,
+			    (void *) (esym + symesz * sym.n_numaux),
+			    sym.n_type, sym.n_sclass,
+			    sym.n_numaux - 1, sym.n_numaux,
+			    (void *) &aux);
+
+      smtyp = SMTYP_SMTYP (aux.x_csect.x_smtyp);
+
+      section = NULL;
+      value = 0;
+      set_toc = NULL;
+
+      switch (smtyp)
+	{
+	default:
+	  (*_bfd_error_handler)
+	    (_("%B: symbol `%s' has unrecognized csect type %d"),
+	     abfd, name, smtyp);
+	  bfd_set_error (bfd_error_bad_value);
+	  goto error_return;
+
+	case XTY_ER:
+	  /* This is an external reference.  */
+	  if (sym.n_sclass == C_HIDEXT
+	      || sym.n_scnum != N_UNDEF
+	      || aux.x_csect.x_scnlen.l != 0)
+	    {
+	      (*_bfd_error_handler)
+		(_("%B: bad XTY_ER symbol `%s': class %d scnum %d scnlen %d"),
+		 abfd, name, sym.n_sclass, sym.n_scnum,
+		 aux.x_csect.x_scnlen.l);
+	      bfd_set_error (bfd_error_bad_value);
+	      goto error_return;
+	    }
+
+	  /* An XMC_XO external reference is actually a reference to
+	     an absolute location.  */
+	  if (aux.x_csect.x_smclas != XMC_XO)
+	    section = bfd_und_section_ptr;
+	  else
+	    {
+	      section = bfd_abs_section_ptr;
+	      value = sym.n_value;
+	    }
+	  break;
+
+	case XTY_SD:
+	  csect = NULL;
+	  csect_index = -(unsigned) 1;
+
+	  /* When we see a TOC anchor, we record the TOC value.  */
+	  if (aux.x_csect.x_smclas == XMC_TC0)
+	    {
+	      if (sym.n_sclass != C_HIDEXT
+		  || aux.x_csect.x_scnlen.l != 0)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B: XMC_TC0 symbol `%s' is class %d scnlen %d"),
+		     abfd, name, sym.n_sclass, aux.x_csect.x_scnlen.l);
+		  bfd_set_error (bfd_error_bad_value);
+		  goto error_return;
+		}
+	      xcoff_data (abfd)->toc = sym.n_value;
+	    }
+
+	  /* We must merge TOC entries for the same symbol.  We can
+	     merge two TOC entries if they are both C_HIDEXT, they
+	     both have the same name, they are both 4 or 8 bytes long, and
+	     they both have a relocation table entry for an external
+	     symbol with the same name.  Unfortunately, this means
+	     that we must look through the relocations.  Ick.
+
+	     Logic for 32 bit vs 64 bit.
+	     32 bit has a csect length of 4 for TOC
+	     64 bit has a csect length of 8 for TOC
+
+	     The conditions to get past the if-check are not that bad.
+	     They are what is used to create the TOC csects in the first
+	     place.  */
+	  if (aux.x_csect.x_smclas == XMC_TC
+	      && sym.n_sclass == C_HIDEXT
+	      && info->output_bfd->xvec == abfd->xvec
+	      && ((bfd_xcoff_is_xcoff32 (abfd)
+		   && aux.x_csect.x_scnlen.l == 4)
+		  || (bfd_xcoff_is_xcoff64 (abfd)
+		      && aux.x_csect.x_scnlen.l == 8)))
+	    {
+	      asection *enclosing;
+	      struct internal_reloc *relocs;
+	      bfd_size_type relindx;
+	      struct internal_reloc *rel;
+
+	      enclosing = coff_section_from_bfd_index (abfd, sym.n_scnum);
+	      if (enclosing == NULL)
+		goto error_return;
+
+	      relocs = reloc_info[enclosing->target_index].relocs;
+	      amt = enclosing->reloc_count;
+	      relindx = xcoff_find_reloc (relocs, amt, sym.n_value);
+	      rel = relocs + relindx;
+
+	      /* 32 bit R_POS r_size is 31
+		 64 bit R_POS r_size is 63  */
+	      if (relindx < enclosing->reloc_count
+		  && rel->r_vaddr == (bfd_vma) sym.n_value
+		  && rel->r_type == R_POS
+		  && ((bfd_xcoff_is_xcoff32 (abfd)
+		       && rel->r_size == 31)
+		      || (bfd_xcoff_is_xcoff64 (abfd)
+			  && rel->r_size == 63)))
+		{
+		  bfd_byte *erelsym;
+
+		  struct internal_syment relsym;
+
+		  erelsym = ((bfd_byte *) obj_coff_external_syms (abfd)
+			     + rel->r_symndx * symesz);
+		  bfd_coff_swap_sym_in (abfd, (void *) erelsym, (void *) &relsym);
+		  if (EXTERN_SYM_P (relsym.n_sclass))
+		    {
+		      const char *relname;
+		      char relbuf[SYMNMLEN + 1];
+		      bfd_boolean copy;
+		      struct xcoff_link_hash_entry *h;
+
+		      /* At this point we know that the TOC entry is
+			 for an externally visible symbol.  */
+		      relname = _bfd_coff_internal_syment_name (abfd, &relsym,
+								relbuf);
+		      if (relname == NULL)
+			goto error_return;
+
+		      /* We only merge TOC entries if the TC name is
+			 the same as the symbol name.  This handles
+			 the normal case, but not common cases like
+			 SYM.P4 which gcc generates to store SYM + 4
+			 in the TOC.  FIXME.  */
+		      if (strcmp (name, relname) == 0)
+			{
+			  copy = (! info->keep_memory
+				  || relsym._n._n_n._n_zeroes != 0
+				  || relsym._n._n_n._n_offset == 0);
+			  h = xcoff_link_hash_lookup (xcoff_hash_table (info),
+						      relname, TRUE, copy,
+						      FALSE);
+			  if (h == NULL)
+			    goto error_return;
+
+			  /* At this point h->root.type could be
+			     bfd_link_hash_new.  That should be OK,
+			     since we know for sure that we will come
+			     across this symbol as we step through the
+			     file.  */
+
+			  /* We store h in *sym_hash for the
+			     convenience of the relocate_section
+			     function.  */
+			  *sym_hash = h;
+
+			  if (h->toc_section != NULL)
+			    {
+			      asection **rel_csects;
+
+			      /* We already have a TOC entry for this
+				 symbol, so we can just ignore this
+				 one.  */
+			      rel_csects =
+				reloc_info[enclosing->target_index].csects;
+			      rel_csects[relindx] = bfd_und_section_ptr;
+			      break;
+			    }
+
+			  /* We are about to create a TOC entry for
+			     this symbol.  */
+			  set_toc = h;
+			}
+		    }
+		}
+	    }
+
+	  {
+	    asection *enclosing;
+
+	    /* We need to create a new section.  We get the name from
+	       the csect storage mapping class, so that the linker can
+	       accumulate similar csects together.  */
+
+	    csect = bfd_xcoff_create_csect_from_smclas(abfd, &aux, name);
+	    if (NULL == csect)
+	      goto error_return;
+
+	    /* The enclosing section is the main section : .data, .text
+	       or .bss that the csect is coming from.  */
+	    enclosing = coff_section_from_bfd_index (abfd, sym.n_scnum);
+	    if (enclosing == NULL)
+	      goto error_return;
+
+	    if (! bfd_is_abs_section (enclosing)
+		&& ((bfd_vma) sym.n_value < enclosing->vma
+		    || ((bfd_vma) sym.n_value + aux.x_csect.x_scnlen.l
+			> enclosing->vma + enclosing->size)))
+	      {
+		(*_bfd_error_handler)
+		  (_("%B: csect `%s' not in enclosing section"),
+		   abfd, name);
+		bfd_set_error (bfd_error_bad_value);
+		goto error_return;
+	      }
+	    csect->vma = sym.n_value;
+	    csect->filepos = (enclosing->filepos
+			      + sym.n_value
+			      - enclosing->vma);
+	    csect->size = aux.x_csect.x_scnlen.l;
+	    csect->flags |= SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;
+	    csect->alignment_power = SMTYP_ALIGN (aux.x_csect.x_smtyp);
+
+	    /* Record the enclosing section in the tdata for this new
+	       section.  */
+	    amt = sizeof (struct coff_section_tdata);
+	    csect->used_by_bfd = bfd_zalloc (abfd, amt);
+	    if (csect->used_by_bfd == NULL)
+	      goto error_return;
+	    amt = sizeof (struct xcoff_section_tdata);
+	    coff_section_data (abfd, csect)->tdata = bfd_zalloc (abfd, amt);
+	    if (coff_section_data (abfd, csect)->tdata == NULL)
+	      goto error_return;
+	    xcoff_section_data (abfd, csect)->enclosing = enclosing;
+	    xcoff_section_data (abfd, csect)->lineno_count =
+	      enclosing->lineno_count;
+
+	    if (enclosing->owner == abfd)
+	      {
+		struct internal_reloc *relocs;
+		bfd_size_type relindx;
+		struct internal_reloc *rel;
+		asection **rel_csect;
+
+		relocs = reloc_info[enclosing->target_index].relocs;
+		amt = enclosing->reloc_count;
+		relindx = xcoff_find_reloc (relocs, amt, csect->vma);
+
+		rel = relocs + relindx;
+		rel_csect = (reloc_info[enclosing->target_index].csects
+			     + relindx);
+
+		csect->rel_filepos = (enclosing->rel_filepos
+				      + relindx * bfd_coff_relsz (abfd));
+		while (relindx < enclosing->reloc_count
+		       && *rel_csect == NULL
+		       && rel->r_vaddr < csect->vma + csect->size)
+		  {
+
+		    *rel_csect = csect;
+		    csect->flags |= SEC_RELOC;
+		    ++csect->reloc_count;
+		    ++relindx;
+		    ++rel;
+		    ++rel_csect;
+		  }
+	      }
+
+	    /* There are a number of other fields and section flags
+	       which we do not bother to set.  */
+
+	    csect_index = ((esym
+			    - (bfd_byte *) obj_coff_external_syms (abfd))
+			   / symesz);
+
+	    xcoff_section_data (abfd, csect)->first_symndx = csect_index;
+
+	    if (first_csect == NULL)
+	      first_csect = csect;
+
+	    /* If this symbol is external, we treat it as starting at the
+	       beginning of the newly created section.  */
+	    if (EXTERN_SYM_P (sym.n_sclass))
+	      {
+		section = csect;
+		value = 0;
+	      }
+
+	    /* If this is a TOC section for a symbol, record it.  */
+	    if (set_toc != NULL)
+	      set_toc->toc_section = csect;
+	  }
+	  break;
+
+	case XTY_LD:
+	  /* This is a label definition.  The x_scnlen field is the
+	     symbol index of the csect.  Usually the XTY_LD symbol will
+	     follow its appropriate XTY_SD symbol.  The .set pseudo op can
+	     cause the XTY_LD to not follow the XTY_SD symbol. */
+	  {
+	    bfd_boolean bad;
+
+	    bad = FALSE;
+	    if (aux.x_csect.x_scnlen.l < 0
+		|| (aux.x_csect.x_scnlen.l
+		    >= esym - (bfd_byte *) obj_coff_external_syms (abfd)))
+	      bad = TRUE;
+	    if (! bad)
+	      {
+		section = xcoff_data (abfd)->csects[aux.x_csect.x_scnlen.l];
+		if (section == NULL
+		    || (section->flags & SEC_HAS_CONTENTS) == 0)
+		  bad = TRUE;
+	      }
+	    if (bad)
+	      {
+		(*_bfd_error_handler)
+		  (_("%B: misplaced XTY_LD `%s'"),
+		   abfd, name);
+		bfd_set_error (bfd_error_bad_value);
+		goto error_return;
+	      }
+ 	    csect = section;
+	    value = sym.n_value - csect->vma;
+	  }
+	  break;
+
+	case XTY_CM:
+	  /* This is an unitialized csect.  We could base the name on
+	     the storage mapping class, but we don't bother except for
+	     an XMC_TD symbol.  If this csect is externally visible,
+	     it is a common symbol.  We put XMC_TD symbols in sections
+	     named .tocbss, and rely on the linker script to put that
+	     in the TOC area.  */
+
+	  if (aux.x_csect.x_smclas == XMC_TD)
+	    {
+	      /* The linker script puts the .td section in the data
+		 section after the .tc section.  */
+	      csect = bfd_make_section_anyway_with_flags (abfd, ".td",
+							  SEC_ALLOC);
+	    }
+	  else
+	    csect = bfd_make_section_anyway_with_flags (abfd, ".bss",
+							SEC_ALLOC);
+
+	  if (csect == NULL)
+	    goto error_return;
+	  csect->vma = sym.n_value;
+	  csect->size = aux.x_csect.x_scnlen.l;
+	  csect->alignment_power = SMTYP_ALIGN (aux.x_csect.x_smtyp);
+	  /* There are a number of other fields and section flags
+	     which we do not bother to set.  */
+
+	  csect_index = ((esym
+			  - (bfd_byte *) obj_coff_external_syms (abfd))
+			 / symesz);
+
+	  amt = sizeof (struct coff_section_tdata);
+	  csect->used_by_bfd = bfd_zalloc (abfd, amt);
+	  if (csect->used_by_bfd == NULL)
+	    goto error_return;
+	  amt = sizeof (struct xcoff_section_tdata);
+	  coff_section_data (abfd, csect)->tdata = bfd_zalloc (abfd, amt);
+	  if (coff_section_data (abfd, csect)->tdata == NULL)
+	    goto error_return;
+	  xcoff_section_data (abfd, csect)->first_symndx = csect_index;
+
+	  if (first_csect == NULL)
+	    first_csect = csect;
+
+	  if (EXTERN_SYM_P (sym.n_sclass))
+	    {
+	      csect->flags |= SEC_IS_COMMON;
+	      csect->size = 0;
+	      section = csect;
+	      value = aux.x_csect.x_scnlen.l;
+	    }
+
+	  break;
+	}
+
+      /* Check for magic symbol names.  */
+      if ((smtyp == XTY_SD || smtyp == XTY_CM)
+	  && aux.x_csect.x_smclas != XMC_TC
+	  && aux.x_csect.x_smclas != XMC_TD)
+	{
+	  int i = -1;
+
+	  if (name[0] == '_')
+	    {
+	      if (strcmp (name, "_text") == 0)
+		i = XCOFF_SPECIAL_SECTION_TEXT;
+	      else if (strcmp (name, "_etext") == 0)
+		i = XCOFF_SPECIAL_SECTION_ETEXT;
+	      else if (strcmp (name, "_data") == 0)
+		i = XCOFF_SPECIAL_SECTION_DATA;
+	      else if (strcmp (name, "_edata") == 0)
+		i = XCOFF_SPECIAL_SECTION_EDATA;
+	      else if (strcmp (name, "_end") == 0)
+		i = XCOFF_SPECIAL_SECTION_END;
+	    }
+	  else if (name[0] == 'e' && strcmp (name, "end") == 0)
+	    i = XCOFF_SPECIAL_SECTION_END2;
+
+	  if (i != -1)
+	    xcoff_hash_table (info)->special_sections[i] = csect;
+	}
+
+      /* Now we have enough information to add the symbol to the
+	 linker hash table.  */
+
+      if (EXTERN_SYM_P (sym.n_sclass))
+	{
+	  bfd_boolean copy;
+	  flagword flags;
+
+	  BFD_ASSERT (section != NULL);
+
+	  /* We must copy the name into memory if we got it from the
+	     syment itself, rather than the string table.  */
+	  copy = default_copy;
+	  if (sym._n._n_n._n_zeroes != 0
+	      || sym._n._n_n._n_offset == 0)
+	    copy = TRUE;
+
+	  /* Ignore global linkage code when linking statically.  */
+	  if (info->static_link
+	      && (smtyp == XTY_SD || smtyp == XTY_LD)
+	      && aux.x_csect.x_smclas == XMC_GL)
+	    {
+	      section = bfd_und_section_ptr;
+	      value = 0;
+	    }
+
+	  /* The AIX linker appears to only detect multiple symbol
+	     definitions when there is a reference to the symbol.  If
+	     a symbol is defined multiple times, and the only
+	     references are from the same object file, the AIX linker
+	     appears to permit it.  It does not merge the different
+	     definitions, but handles them independently.  On the
+	     other hand, if there is a reference, the linker reports
+	     an error.
+
+	     This matters because the AIX <net/net_globals.h> header
+	     file actually defines an initialized array, so we have to
+	     actually permit that to work.
+
+	     Just to make matters even more confusing, the AIX linker
+	     appears to permit multiple symbol definitions whenever
+	     the second definition is in an archive rather than an
+	     object file.  This may be a consequence of the manner in
+	     which it handles archives: I think it may load the entire
+	     archive in as separate csects, and then let garbage
+	     collection discard symbols.
+
+	     We also have to handle the case of statically linking a
+	     shared object, which will cause symbol redefinitions,
+	     although this is an easier case to detect.  */
+ 	  else if (info->output_bfd->xvec == abfd->xvec)
+	    {
+	      if (! bfd_is_und_section (section))
+		*sym_hash = xcoff_link_hash_lookup (xcoff_hash_table (info),
+						    name, TRUE, copy, FALSE);
+	      else
+		/* Make a copy of the symbol name to prevent problems with
+		   merging symbols.  */
+		*sym_hash = ((struct xcoff_link_hash_entry *)
+			     bfd_wrapped_link_hash_lookup (abfd, info, name,
+							   TRUE, TRUE, FALSE));
+
+	      if (*sym_hash == NULL)
+		goto error_return;
+	      if (((*sym_hash)->root.type == bfd_link_hash_defined
+		   || (*sym_hash)->root.type == bfd_link_hash_defweak)
+		  && ! bfd_is_und_section (section)
+		  && ! bfd_is_com_section (section))
+		{
+		  /* This is a second definition of a defined symbol.  */
+		  if (((*sym_hash)->flags & XCOFF_DEF_REGULAR) == 0
+		      && ((*sym_hash)->flags & XCOFF_DEF_DYNAMIC) != 0)
+		    {
+		      /* The existing symbol is from a shared library.
+			 Replace it.  */
+		      (*sym_hash)->root.type = bfd_link_hash_undefined;
+		      (*sym_hash)->root.u.undef.abfd =
+			(*sym_hash)->root.u.def.section->owner;
+		    }
+		  else if (abfd->my_archive != NULL)
+		    {
+		      /* This is a redefinition in an object contained
+			 in an archive.  Just ignore it.  See the
+			 comment above.  */
+		      section = bfd_und_section_ptr;
+		      value = 0;
+		    }
+		  else if (sym.n_sclass == C_AIX_WEAKEXT
+			   || (*sym_hash)->root.type == bfd_link_hash_defweak)
+		    {
+		      /* At least one of the definitions is weak.
+			 Allow the normal rules to take effect.  */
+		    }
+		  else if ((*sym_hash)->root.u.undef.next != NULL
+			   || info->hash->undefs_tail == &(*sym_hash)->root)
+		    {
+		      /* This symbol has been referenced.  In this
+			 case, we just continue and permit the
+			 multiple definition error.  See the comment
+			 above about the behaviour of the AIX linker.  */
+		    }
+		  else if ((*sym_hash)->smclas == aux.x_csect.x_smclas)
+		    {
+		      /* The symbols are both csects of the same
+			 class.  There is at least a chance that this
+			 is a semi-legitimate redefinition.  */
+		      section = bfd_und_section_ptr;
+		      value = 0;
+		      (*sym_hash)->flags |= XCOFF_MULTIPLY_DEFINED;
+		    }
+		}
+	      else if (((*sym_hash)->flags & XCOFF_MULTIPLY_DEFINED) != 0
+		       && (*sym_hash)->root.type == bfd_link_hash_defined
+		       && (bfd_is_und_section (section)
+			   || bfd_is_com_section (section)))
+		{
+		  /* This is a reference to a multiply defined symbol.
+		     Report the error now.  See the comment above
+		     about the behaviour of the AIX linker.  We could
+		     also do this with warning symbols, but I'm not
+		     sure the XCOFF linker is wholly prepared to
+		     handle them, and that would only be a warning,
+		     not an error.  */
+		  if (! ((*info->callbacks->multiple_definition)
+			 (info, &(*sym_hash)->root, NULL, NULL, (bfd_vma) 0)))
+		    goto error_return;
+		  /* Try not to give this error too many times.  */
+		  (*sym_hash)->flags &= ~XCOFF_MULTIPLY_DEFINED;
+		}
+	    }
+
+	  /* _bfd_generic_link_add_one_symbol may call the linker to
+	     generate an error message, and the linker may try to read
+	     the symbol table to give a good error.  Right now, the
+	     line numbers are in an inconsistent state, since they are
+	     counted both in the real sections and in the new csects.
+	     We need to leave the count in the real sections so that
+	     the linker can report the line number of the error
+	     correctly, so temporarily clobber the link to the csects
+	     so that the linker will not try to read the line numbers
+	     a second time from the csects.  */
+	  BFD_ASSERT (last_real->next == first_csect);
+	  last_real->next = NULL;
+	  flags = (sym.n_sclass == C_EXT ? BSF_GLOBAL : BSF_WEAK);
+	  if (! (_bfd_generic_link_add_one_symbol
+		 (info, abfd, name, flags, section, value,
+		  NULL, copy, TRUE,
+		  (struct bfd_link_hash_entry **) sym_hash)))
+	    goto error_return;
+	  last_real->next = first_csect;
+
+	  if (smtyp == XTY_CM)
+	    {
+	      if ((*sym_hash)->root.type != bfd_link_hash_common
+		  || (*sym_hash)->root.u.c.p->section != csect)
+		/* We don't need the common csect we just created.  */
+		csect->size = 0;
+	      else
+		(*sym_hash)->root.u.c.p->alignment_power
+		  = csect->alignment_power;
+	    }
+
+ 	  if (info->output_bfd->xvec == abfd->xvec)
+	    {
+	      int flag;
+
+	      if (smtyp == XTY_ER
+		  || smtyp == XTY_CM
+		  || section == bfd_und_section_ptr)
+		flag = XCOFF_REF_REGULAR;
+	      else
+		flag = XCOFF_DEF_REGULAR;
+	      (*sym_hash)->flags |= flag;
+
+	      if ((*sym_hash)->smclas == XMC_UA
+		  || flag == XCOFF_DEF_REGULAR)
+		(*sym_hash)->smclas = aux.x_csect.x_smclas;
+	    }
+	}
+
+      if (smtyp == XTY_ER)
+	*csect_cache = section;
+      else
+	{
+	  *csect_cache = csect;
+	  if (csect != NULL)
+	    xcoff_section_data (abfd, csect)->last_symndx
+	      = (esym - (bfd_byte *) obj_coff_external_syms (abfd)) / symesz;
+	}
+
+      esym += (sym.n_numaux + 1) * symesz;
+      sym_hash += sym.n_numaux + 1;
+      csect_cache += sym.n_numaux + 1;
+      lineno_counts += sym.n_numaux + 1;
+    }
+
+  BFD_ASSERT (last_real == NULL || last_real->next == first_csect);
+
+  /* Make sure that we have seen all the relocs.  */
+  for (o = abfd->sections; o != first_csect; o = o->next)
+    {
+      /* Debugging sections have no csects.  */
+      if (bfd_get_section_flags (abfd, o) & SEC_DEBUGGING)
+        continue;
+
+      /* Reset the section size and the line number count, since the
+	 data is now attached to the csects.  Don't reset the size of
+	 the .debug section, since we need to read it below in
+	 bfd_xcoff_size_dynamic_sections.  */
+      if (strcmp (bfd_get_section_name (abfd, o), ".debug") != 0)
+	o->size = 0;
+      o->lineno_count = 0;
+
+      if ((o->flags & SEC_RELOC) != 0)
+	{
+	  bfd_size_type i;
+	  struct internal_reloc *rel;
+	  asection **rel_csect;
+
+	  rel = reloc_info[o->target_index].relocs;
+	  rel_csect = reloc_info[o->target_index].csects;
+
+	  for (i = 0; i < o->reloc_count; i++, rel++, rel_csect++)
+	    {
+	      if (*rel_csect == NULL)
+		{
+		  (*_bfd_error_handler)
+		    (_("%B: reloc %s:%d not in csect"),
+		     abfd, o->name, i);
+		  bfd_set_error (bfd_error_bad_value);
+		  goto error_return;
+		}
+
+	      /* We identify all function symbols that are the target
+		 of a relocation, so that we can create glue code for
+		 functions imported from dynamic objects.  */
+ 	      if (info->output_bfd->xvec == abfd->xvec
+		  && *rel_csect != bfd_und_section_ptr
+		  && obj_xcoff_sym_hashes (abfd)[rel->r_symndx] != NULL)
+		{
+		  struct xcoff_link_hash_entry *h;
+
+		  h = obj_xcoff_sym_hashes (abfd)[rel->r_symndx];
+		  /* If the symbol name starts with a period, it is
+		     the code of a function.  If the symbol is
+		     currently undefined, then add an undefined symbol
+		     for the function descriptor.  This should do no
+		     harm, because any regular object that defines the
+		     function should also define the function
+		     descriptor.  It helps, because it means that we
+		     will identify the function descriptor with a
+		     dynamic object if a dynamic object defines it.  */
+		  if (h->root.root.string[0] == '.'
+		      && h->descriptor == NULL)
+		    {
+		      struct xcoff_link_hash_entry *hds;
+		      struct bfd_link_hash_entry *bh;
+
+		      hds = xcoff_link_hash_lookup (xcoff_hash_table (info),
+						    h->root.root.string + 1,
+						    TRUE, FALSE, TRUE);
+		      if (hds == NULL)
+			goto error_return;
+		      if (hds->root.type == bfd_link_hash_new)
+			{
+			  bh = &hds->root;
+			  if (! (_bfd_generic_link_add_one_symbol
+				 (info, abfd, hds->root.root.string,
+				  (flagword) 0, bfd_und_section_ptr,
+				  (bfd_vma) 0, NULL, FALSE,
+				  TRUE, &bh)))
+			    goto error_return;
+			  hds = (struct xcoff_link_hash_entry *) bh;
+			}
+		      hds->flags |= XCOFF_DESCRIPTOR;
+		      BFD_ASSERT ((h->flags & XCOFF_DESCRIPTOR) == 0);
+		      hds->descriptor = h;
+		      h->descriptor = hds;
+		    }
+		  if (h->root.root.string[0] == '.')
+		    h->flags |= XCOFF_CALLED;
+		}
+	    }
+
+	  free (reloc_info[o->target_index].csects);
+	  reloc_info[o->target_index].csects = NULL;
+
+	  /* Reset SEC_RELOC and the reloc_count, since the reloc
+	     information is now attached to the csects.  */
+	  o->flags &=~ SEC_RELOC;
+	  o->reloc_count = 0;
+
+	  /* If we are not keeping memory, free the reloc information.  */
+	  if (! info->keep_memory
+	      && coff_section_data (abfd, o) != NULL
+	      && coff_section_data (abfd, o)->relocs != NULL
+	      && ! coff_section_data (abfd, o)->keep_relocs)
+	    {
+	      free (coff_section_data (abfd, o)->relocs);
+	      coff_section_data (abfd, o)->relocs = NULL;
+	    }
+	}
+
+      /* Free up the line numbers.  FIXME: We could cache these
+	 somewhere for the final link, to avoid reading them again.  */
+      if (reloc_info[o->target_index].linenos != NULL)
+	{
+	  free (reloc_info[o->target_index].linenos);
+	  reloc_info[o->target_index].linenos = NULL;
+	}
+    }
+
+  free (reloc_info);
+
+  obj_coff_keep_syms (abfd) = keep_syms;
+
+  return TRUE;
+
+ error_return:
+  if (reloc_info != NULL)
+    {
+      for (o = abfd->sections; o != NULL; o = o->next)
+	{
+	  if (reloc_info[o->target_index].csects != NULL)
+	    free (reloc_info[o->target_index].csects);
+	  if (reloc_info[o->target_index].linenos != NULL)
+	    free (reloc_info[o->target_index].linenos);
+	}
+      free (reloc_info);
+    }
+  obj_coff_keep_syms (abfd) = keep_syms;
+  return FALSE;
+}
+
+#undef N_TMASK
+#undef N_BTSHFT
+
+/* Add symbols from an XCOFF object file.  */
+
+static bfd_boolean
+xcoff_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  if (! _bfd_coff_get_external_symbols (abfd))
+    return FALSE;
+  if (! xcoff_link_add_symbols (abfd, info))
+    return FALSE;
+  if (! info->keep_memory)
+    {
+      if (! _bfd_coff_free_symbols (abfd))
+	return FALSE;
+    }
+  return TRUE;
+}
+
+/* Look through the loader symbols to see if this dynamic object
+   should be included in the link.  The native linker uses the loader
+   symbols, not the normal symbol table, so we do too.  */
+
+static bfd_boolean
+xcoff_link_check_dynamic_ar_symbols (bfd *abfd,
+				     struct bfd_link_info *info,
+				     bfd_boolean *pneeded,
+				     bfd **subsbfd)
+{
+  asection *lsec;
+  bfd_byte *contents;
+  struct internal_ldhdr ldhdr;
+  const char *strings;
+  bfd_byte *elsym, *elsymend;
+
+  *pneeded = FALSE;
+
+  lsec = bfd_get_section_by_name (abfd, ".loader");
+  if (lsec == NULL)
+    /* There are no symbols, so don't try to include it.  */
+    return TRUE;
+
+  if (! xcoff_get_section_contents (abfd, lsec))
+    return FALSE;
+  contents = coff_section_data (abfd, lsec)->contents;
+
+  bfd_xcoff_swap_ldhdr_in (abfd, contents, &ldhdr);
+
+  strings = (char *) contents + ldhdr.l_stoff;
+
+  elsym = contents + bfd_xcoff_loader_symbol_offset (abfd, &ldhdr);
+
+  elsymend = elsym + ldhdr.l_nsyms * bfd_xcoff_ldsymsz (abfd);
+  for (; elsym < elsymend; elsym += bfd_xcoff_ldsymsz (abfd))
+    {
+      struct internal_ldsym ldsym;
+      char nambuf[SYMNMLEN + 1];
+      const char *name;
+      struct bfd_link_hash_entry *h;
+
+      bfd_xcoff_swap_ldsym_in (abfd, elsym, &ldsym);
+
+      /* We are only interested in exported symbols.  */
+      if ((ldsym.l_smtype & L_EXPORT) == 0)
+	continue;
+
+      if (ldsym._l._l_l._l_zeroes == 0)
+	name = strings + ldsym._l._l_l._l_offset;
+      else
+	{
+	  memcpy (nambuf, ldsym._l._l_name, SYMNMLEN);
+	  nambuf[SYMNMLEN] = '\0';
+	  name = nambuf;
+	}
+
+      h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE);
+
+      /* We are only interested in symbols that are currently
+	 undefined.  At this point we know that we are using an XCOFF
+	 hash table.  */
+      if (h != NULL
+	  && h->type == bfd_link_hash_undefined
+	  && (((struct xcoff_link_hash_entry *) h)->flags
+	      & XCOFF_DEF_DYNAMIC) == 0)
+	{
+	  if (!(*info->callbacks
+		->add_archive_element) (info, abfd, name, subsbfd))
+	    return FALSE;
+	  *pneeded = TRUE;
+	  return TRUE;
+	}
+    }
+
+  /* We do not need this shared object.  */
+  if (contents != NULL && ! coff_section_data (abfd, lsec)->keep_contents)
+    {
+      free (coff_section_data (abfd, lsec)->contents);
+      coff_section_data (abfd, lsec)->contents = NULL;
+    }
+
+  return TRUE;
+}
+
+/* Look through the symbols to see if this object file should be
+   included in the link.  */
+
+static bfd_boolean
+xcoff_link_check_ar_symbols (bfd *abfd,
+			     struct bfd_link_info *info,
+			     bfd_boolean *pneeded,
+			     bfd **subsbfd)
+{
+  bfd_size_type symesz;
+  bfd_byte *esym;
+  bfd_byte *esym_end;
+
+  *pneeded = FALSE;
+
+  if ((abfd->flags & DYNAMIC) != 0
+      && ! info->static_link
+      && info->output_bfd->xvec == abfd->xvec)
+    return xcoff_link_check_dynamic_ar_symbols (abfd, info, pneeded, subsbfd);
+
+  symesz = bfd_coff_symesz (abfd);
+  esym = (bfd_byte *) obj_coff_external_syms (abfd);
+  esym_end = esym + obj_raw_syment_count (abfd) * symesz;
+  while (esym < esym_end)
+    {
+      struct internal_syment sym;
+
+      bfd_coff_swap_sym_in (abfd, (void *) esym, (void *) &sym);
+
+      if (EXTERN_SYM_P (sym.n_sclass) && sym.n_scnum != N_UNDEF)
+	{
+	  const char *name;
+	  char buf[SYMNMLEN + 1];
+	  struct bfd_link_hash_entry *h;
+
+	  /* This symbol is externally visible, and is defined by this
+	     object file.  */
+	  name = _bfd_coff_internal_syment_name (abfd, &sym, buf);
+
+	  if (name == NULL)
+	    return FALSE;
+	  h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE);
+
+	  /* We are only interested in symbols that are currently
+	     undefined.  If a symbol is currently known to be common,
+	     XCOFF linkers do not bring in an object file which
+	     defines it.  We also don't bring in symbols to satisfy
+	     undefined references in shared objects.  */
+	  if (h != NULL
+	      && h->type == bfd_link_hash_undefined
+ 	      && (info->output_bfd->xvec != abfd->xvec
+		  || (((struct xcoff_link_hash_entry *) h)->flags
+		      & XCOFF_DEF_DYNAMIC) == 0))
+	    {
+	      if (!(*info->callbacks
+		    ->add_archive_element) (info, abfd, name, subsbfd))
+		return FALSE;
+	      *pneeded = TRUE;
+	      return TRUE;
+	    }
+	}
+
+      esym += (sym.n_numaux + 1) * symesz;
+    }
+
+  /* We do not need this object file.  */
+  return TRUE;
+}
+
+/* Check a single archive element to see if we need to include it in
+   the link.  *PNEEDED is set according to whether this element is
+   needed in the link or not.  This is called via
+   _bfd_generic_link_add_archive_symbols.  */
+
+static bfd_boolean
+xcoff_link_check_archive_element (bfd *abfd,
+				  struct bfd_link_info *info,
+				  bfd_boolean *pneeded)
+{
+  bfd_boolean keep_syms_p;
+  bfd *oldbfd;
+
+  keep_syms_p = (obj_coff_external_syms (abfd) != NULL);
+  if (!_bfd_coff_get_external_symbols (abfd))
+    return FALSE;
+
+  oldbfd = abfd;
+  if (!xcoff_link_check_ar_symbols (abfd, info, pneeded, &abfd))
+    return FALSE;
+
+  if (*pneeded)
+    {
+      /* Potentially, the add_archive_element hook may have set a
+	 substitute BFD for us.  */
+      if (abfd != oldbfd)
+	{
+	  if (!keep_syms_p
+	      && !_bfd_coff_free_symbols (oldbfd))
+	    return FALSE;
+	  keep_syms_p = (obj_coff_external_syms (abfd) != NULL);
+	  if (!_bfd_coff_get_external_symbols (abfd))
+	    return FALSE;
+	}
+      if (!xcoff_link_add_symbols (abfd, info))
+	return FALSE;
+      if (info->keep_memory)
+	keep_syms_p = TRUE;
+    }
+
+  if (!keep_syms_p)
+    {
+      if (!_bfd_coff_free_symbols (abfd))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Given an XCOFF BFD, add symbols to the global hash table as
+   appropriate.  */
+
+bfd_boolean
+_bfd_xcoff_bfd_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  switch (bfd_get_format (abfd))
+    {
+    case bfd_object:
+      return xcoff_link_add_object_symbols (abfd, info);
+
+    case bfd_archive:
+      /* If the archive has a map, do the usual search.  We then need
+	 to check the archive for dynamic objects, because they may not
+	 appear in the archive map even though they should, perhaps, be
+	 included.  If the archive has no map, we just consider each object
+	 file in turn, since that apparently is what the AIX native linker
+	 does.  */
+      if (bfd_has_map (abfd))
+	{
+	  if (! (_bfd_generic_link_add_archive_symbols
+		 (abfd, info, xcoff_link_check_archive_element)))
+	    return FALSE;
+	}
+
+      {
+	bfd *member;
+
+	member = bfd_openr_next_archived_file (abfd, NULL);
+	while (member != NULL)
+	  {
+	    if (bfd_check_format (member, bfd_object)
+		&& (info->output_bfd->xvec == member->xvec)
+		&& (! bfd_has_map (abfd) || (member->flags & DYNAMIC) != 0))
+	      {
+		bfd_boolean needed;
+
+		if (! xcoff_link_check_archive_element (member, info,
+							&needed))
+		  return FALSE;
+		if (needed)
+		  member->archive_pass = -1;
+	      }
+	    member = bfd_openr_next_archived_file (abfd, member);
+	  }
+      }
+
+      return TRUE;
+
+    default:
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+}
+
+bfd_boolean
+_bfd_xcoff_define_common_symbol (bfd *output_bfd ATTRIBUTE_UNUSED,
+				 struct bfd_link_info *info ATTRIBUTE_UNUSED,
+				 struct bfd_link_hash_entry *harg)
+{
+  struct xcoff_link_hash_entry *h;
+
+  if (!bfd_generic_define_common_symbol (output_bfd, info, harg))
+    return FALSE;
+
+  h = (struct xcoff_link_hash_entry *) harg;
+  h->flags |= XCOFF_DEF_REGULAR;
+  return TRUE;
+}
+
+/* If symbol H has not been interpreted as a function descriptor,
+   see whether it should be.  Set up its descriptor information if so.  */
+
+static bfd_boolean
+xcoff_find_function (struct bfd_link_info *info,
+		     struct xcoff_link_hash_entry *h)
+{
+  if ((h->flags & XCOFF_DESCRIPTOR) == 0
+      && h->root.root.string[0] != '.')
+    {
+      char *fnname;
+      struct xcoff_link_hash_entry *hfn;
+      bfd_size_type amt;
+
+      amt = strlen (h->root.root.string) + 2;
+      fnname = bfd_malloc (amt);
+      if (fnname == NULL)
+	return FALSE;
+      fnname[0] = '.';
+      strcpy (fnname + 1, h->root.root.string);
+      hfn = xcoff_link_hash_lookup (xcoff_hash_table (info),
+				    fnname, FALSE, FALSE, TRUE);
+      free (fnname);
+      if (hfn != NULL
+	  && hfn->smclas == XMC_PR
+	  && (hfn->root.type == bfd_link_hash_defined
+	      || hfn->root.type == bfd_link_hash_defweak))
+	{
+	  h->flags |= XCOFF_DESCRIPTOR;
+	  h->descriptor = hfn;
+	  hfn->descriptor = h;
+	}
+    }
+  return TRUE;
+}
+
+/* Return true if the given bfd contains at least one shared object.  */
+
+static bfd_boolean
+xcoff_archive_contains_shared_object_p (struct bfd_link_info *info,
+					bfd *archive)
+{
+  struct xcoff_archive_info *archive_info;
+  bfd *member;
+
+  archive_info = xcoff_get_archive_info (info, archive);
+  if (!archive_info->know_contains_shared_object_p)
+    {
+      member = bfd_openr_next_archived_file (archive, NULL);
+      while (member != NULL && (member->flags & DYNAMIC) == 0)
+	member = bfd_openr_next_archived_file (archive, member);
+
+      archive_info->contains_shared_object_p = (member != NULL);
+      archive_info->know_contains_shared_object_p = 1;
+    }
+  return archive_info->contains_shared_object_p;
+}
+
+/* Symbol H qualifies for export by -bexpfull.  Return true if it also
+   qualifies for export by -bexpall.  */
+
+static bfd_boolean
+xcoff_covered_by_expall_p (struct xcoff_link_hash_entry *h)
+{
+  /* Exclude symbols beginning with '_'.  */
+  if (h->root.root.string[0] == '_')
+    return FALSE;
+
+  /* Exclude archive members that would otherwise be unreferenced.  */
+  if ((h->flags & XCOFF_MARK) == 0
+      && (h->root.type == bfd_link_hash_defined
+	  || h->root.type == bfd_link_hash_defweak)
+      && h->root.u.def.section->owner != NULL
+      && h->root.u.def.section->owner->my_archive != NULL)
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Return true if symbol H qualifies for the forms of automatic export
+   specified by AUTO_EXPORT_FLAGS.  */
+
+static bfd_boolean
+xcoff_auto_export_p (struct bfd_link_info *info,
+		     struct xcoff_link_hash_entry *h,
+		     unsigned int auto_export_flags)
+{
+  /* Don't automatically export things that were explicitly exported.  */
+  if ((h->flags & XCOFF_EXPORT) != 0)
+    return FALSE;
+
+  /* Don't export things that we don't define.  */
+  if ((h->flags & XCOFF_DEF_REGULAR) == 0)
+    return FALSE;
+
+  /* Don't export functions; export their descriptors instead.  */
+  if (h->root.root.string[0] == '.')
+    return FALSE;
+
+  /* We don't export a symbol which is being defined by an object
+     included from an archive which contains a shared object.  The
+     rationale is that if an archive contains both an unshared and
+     a shared object, then there must be some reason that the
+     unshared object is unshared, and we don't want to start
+     providing a shared version of it.  In particular, this solves
+     a bug involving the _savefNN set of functions.  gcc will call
+     those functions without providing a slot to restore the TOC,
+     so it is essential that these functions be linked in directly
+     and not from a shared object, which means that a shared
+     object which also happens to link them in must not export
+     them.  This is confusing, but I haven't been able to think of
+     a different approach.  Note that the symbols can, of course,
+     be exported explicitly.  */
+  if (h->root.type == bfd_link_hash_defined
+      || h->root.type == bfd_link_hash_defweak)
+    {
+      bfd *owner;
+
+      owner = h->root.u.def.section->owner;
+      if (owner != NULL
+	  && owner->my_archive != NULL
+	  && xcoff_archive_contains_shared_object_p (info, owner->my_archive))
+	return FALSE;
+    }
+
+  /* Otherwise, all symbols are exported by -bexpfull.  */
+  if ((auto_export_flags & XCOFF_EXPFULL) != 0)
+    return TRUE;
+
+  /* Despite its name, -bexpall exports most but not all symbols.  */
+  if ((auto_export_flags & XCOFF_EXPALL) != 0
+      && xcoff_covered_by_expall_p (h))
+    return TRUE;
+
+  return FALSE;
+}
+
+/* Return true if relocation REL needs to be copied to the .loader section.
+   If REL is against a global symbol, H is that symbol, otherwise it
+   is null.  */
+
+static bfd_boolean
+xcoff_need_ldrel_p (struct bfd_link_info *info, struct internal_reloc *rel,
+		    struct xcoff_link_hash_entry *h)
+{
+  if (!xcoff_hash_table (info)->loader_section)
+    return FALSE;
+
+  switch (rel->r_type)
+    {
+    case R_TOC:
+    case R_GL:
+    case R_TCL:
+    case R_TRL:
+    case R_TRLA:
+      /* We should never need a .loader reloc for a TOC-relative reloc.  */
+      return FALSE;
+
+    default:
+      /* In this case, relocations against defined symbols can be resolved
+	 statically.  */
+      if (h == NULL
+	  || h->root.type == bfd_link_hash_defined
+	  || h->root.type == bfd_link_hash_defweak
+	  || h->root.type == bfd_link_hash_common)
+	return FALSE;
+
+      /* We will always provide a local definition of function symbols,
+	 even if we don't have one yet.  */
+      if ((h->flags & XCOFF_CALLED) != 0)
+	return FALSE;
+
+      return TRUE;
+
+    case R_POS:
+    case R_NEG:
+    case R_RL:
+    case R_RLA:
+      /* Absolute relocations against absolute symbols can be
+	 resolved statically.  */
+      if (h != NULL
+	  && (h->root.type == bfd_link_hash_defined
+	      || h->root.type == bfd_link_hash_defweak)
+	  && bfd_is_abs_section (h->root.u.def.section))
+	return FALSE;
+
+      return TRUE;
+    }
+}
+
+/* Mark a symbol as not being garbage, including the section in which
+   it is defined.  */
+
+static inline bfd_boolean
+xcoff_mark_symbol (struct bfd_link_info *info, struct xcoff_link_hash_entry *h)
+{
+  if ((h->flags & XCOFF_MARK) != 0)
+    return TRUE;
+
+  h->flags |= XCOFF_MARK;
+
+  /* If we're marking an undefined symbol, try find some way of
+     defining it.  */
+  if (!info->relocatable
+      && (h->flags & XCOFF_IMPORT) == 0
+      && (h->flags & XCOFF_DEF_REGULAR) == 0
+      && (h->root.type == bfd_link_hash_undefined
+	  || h->root.type == bfd_link_hash_undefweak))
+    {
+      /* First check whether this symbol can be interpreted as an
+	 undefined function descriptor for a defined function symbol.  */
+      if (!xcoff_find_function (info, h))
+	return FALSE;
+
+      if ((h->flags & XCOFF_DESCRIPTOR) != 0
+	  && (h->descriptor->root.type == bfd_link_hash_defined
+	      || h->descriptor->root.type == bfd_link_hash_defweak))
+	{
+	  /* This is a descriptor for a defined symbol, but the input
+	     objects have not defined the descriptor itself.  Fill in
+	     the definition automatically.
+
+	     Note that we do this even if we found a dynamic definition
+	     of H.  The local function definition logically overrides
+	     the dynamic one.  */
+	  asection *sec;
+
+	  sec = xcoff_hash_table (info)->descriptor_section;
+	  h->root.type = bfd_link_hash_defined;
+	  h->root.u.def.section = sec;
+	  h->root.u.def.value = sec->size;
+	  h->smclas = XMC_DS;
+	  h->flags |= XCOFF_DEF_REGULAR;
+
+	  /* The size of the function descriptor depends on whether this
+	     is xcoff32 (12) or xcoff64 (24).  */
+	  sec->size += bfd_xcoff_function_descriptor_size (sec->owner);
+
+	  /* A function descriptor uses two relocs: one for the
+	     associated code, and one for the TOC address.  */
+	  xcoff_hash_table (info)->ldrel_count += 2;
+	  sec->reloc_count += 2;
+
+	  /* Mark the function itself.  */
+	  if (!xcoff_mark_symbol (info, h->descriptor))
+	    return FALSE;
+
+	  /* Mark the TOC section, so that we get an anchor
+	     to relocate against.  */
+	  if (!xcoff_mark (info, xcoff_hash_table (info)->toc_section))
+	    return FALSE;
+
+	  /* We handle writing out the contents of the descriptor in
+	     xcoff_write_global_symbol.  */
+	}
+      else if (info->static_link)
+	/* We can't get a symbol value dynamically, so just assume
+	   that it's undefined.  */
+	h->flags |= XCOFF_WAS_UNDEFINED;
+      else if ((h->flags & XCOFF_CALLED) != 0)
+	{
+	  /* This is a function symbol for which we need to create
+	     linkage code.  */
+	  asection *sec;
+	  struct xcoff_link_hash_entry *hds;
+
+	  /* Mark the descriptor (and its TOC section).  */
+	  hds = h->descriptor;
+	  BFD_ASSERT ((hds->root.type == bfd_link_hash_undefined
+		       || hds->root.type == bfd_link_hash_undefweak)
+		      && (hds->flags & XCOFF_DEF_REGULAR) == 0);
+	  if (!xcoff_mark_symbol (info, hds))
+	    return FALSE;
+
+	  /* Treat this symbol as undefined if the descriptor was.  */
+	  if ((hds->flags & XCOFF_WAS_UNDEFINED) != 0)
+	    h->flags |= XCOFF_WAS_UNDEFINED;
+
+	  /* Allocate room for the global linkage code itself.  */
+	  sec = xcoff_hash_table (info)->linkage_section;
+	  h->root.type = bfd_link_hash_defined;
+	  h->root.u.def.section = sec;
+	  h->root.u.def.value = sec->size;
+	  h->smclas = XMC_GL;
+	  h->flags |= XCOFF_DEF_REGULAR;
+	  sec->size += bfd_xcoff_glink_code_size (info->output_bfd);
+
+	  /* The global linkage code requires a TOC entry for the
+	     descriptor.  */
+	  if (hds->toc_section == NULL)
+	    {
+	      int byte_size;
+
+	      /* 32 vs 64
+		 xcoff32 uses 4 bytes in the toc.
+		 xcoff64 uses 8 bytes in the toc.  */
+	      if (bfd_xcoff_is_xcoff64 (info->output_bfd))
+		byte_size = 8;
+	      else if (bfd_xcoff_is_xcoff32 (info->output_bfd))
+		byte_size = 4;
+	      else
+		return FALSE;
+
+	      /* Allocate room in the fallback TOC section.  */
+	      hds->toc_section = xcoff_hash_table (info)->toc_section;
+	      hds->u.toc_offset = hds->toc_section->size;
+	      hds->toc_section->size += byte_size;
+	      if (!xcoff_mark (info, hds->toc_section))
+		return FALSE;
+
+	      /* Allocate room for a static and dynamic R_TOC
+		 relocation.  */
+	      ++xcoff_hash_table (info)->ldrel_count;
+	      ++hds->toc_section->reloc_count;
+
+	      /* Set the index to -2 to force this symbol to
+		 get written out.  */
+	      hds->indx = -2;
+	      hds->flags |= XCOFF_SET_TOC | XCOFF_LDREL;
+	    }
+	}
+      else if ((h->flags & XCOFF_DEF_DYNAMIC) == 0)
+	{
+	  /* Record that the symbol was undefined, then import it.
+	     -brtl links use a special fake import file.  */
+	  h->flags |= XCOFF_WAS_UNDEFINED | XCOFF_IMPORT;
+	  if (xcoff_hash_table (info)->rtld)
+	    {
+	      if (!xcoff_set_import_path (info, h, "", "..", ""))
+		return FALSE;
+	    }
+	  else
+	    {
+	      if (!xcoff_set_import_path (info, h, NULL, NULL, NULL))
+		return FALSE;
+	    }
+	}
+    }
+
+  if (h->root.type == bfd_link_hash_defined
+      || h->root.type == bfd_link_hash_defweak)
+    {
+      asection *hsec;
+
+      hsec = h->root.u.def.section;
+      if (! bfd_is_abs_section (hsec)
+	  && (hsec->flags & SEC_MARK) == 0)
+	{
+	  if (! xcoff_mark (info, hsec))
+	    return FALSE;
+	}
+    }
+
+  if (h->toc_section != NULL
+      && (h->toc_section->flags & SEC_MARK) == 0)
+    {
+      if (! xcoff_mark (info, h->toc_section))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Look for a symbol called NAME.  If the symbol is defined, mark it.
+   If the symbol exists, set FLAGS.  */
+
+static bfd_boolean
+xcoff_mark_symbol_by_name (struct bfd_link_info *info,
+			   const char *name, unsigned int flags)
+{
+  struct xcoff_link_hash_entry *h;
+
+  h = xcoff_link_hash_lookup (xcoff_hash_table (info), name,
+			      FALSE, FALSE, TRUE);
+  if (h != NULL)
+    {
+      h->flags |= flags;
+      if (h->root.type == bfd_link_hash_defined
+	  || h->root.type == bfd_link_hash_defweak)
+	{
+	  if (!xcoff_mark (info, h->root.u.def.section))
+	    return FALSE;
+	}
+    }
+  return TRUE;
+}
+
+/* The mark phase of garbage collection.  For a given section, mark
+   it, and all the sections which define symbols to which it refers.
+   Because this function needs to look at the relocs, we also count
+   the number of relocs which need to be copied into the .loader
+   section.  */
+
+static bfd_boolean
+xcoff_mark (struct bfd_link_info *info, asection *sec)
+{
+  if (bfd_is_abs_section (sec)
+      || (sec->flags & SEC_MARK) != 0)
+    return TRUE;
+
+  sec->flags |= SEC_MARK;
+
+  if (sec->owner->xvec == info->output_bfd->xvec
+      && coff_section_data (sec->owner, sec) != NULL
+      && xcoff_section_data (sec->owner, sec) != NULL)
+    {
+      struct xcoff_link_hash_entry **syms;
+      struct internal_reloc *rel, *relend;
+      asection **csects;
+      unsigned long i, first, last;
+
+      /* Mark all the symbols in this section.  */
+      syms = obj_xcoff_sym_hashes (sec->owner);
+      csects = xcoff_data (sec->owner)->csects;
+      first = xcoff_section_data (sec->owner, sec)->first_symndx;
+      last = xcoff_section_data (sec->owner, sec)->last_symndx;
+      for (i = first; i <= last; i++)
+	if (csects[i] == sec
+	    && syms[i] != NULL
+	    && (syms[i]->flags & XCOFF_MARK) == 0)
+	  {
+	    if (!xcoff_mark_symbol (info, syms[i]))
+	      return FALSE;
+	  }
+
+      /* Look through the section relocs.  */
+      if ((sec->flags & SEC_RELOC) != 0
+	  && sec->reloc_count > 0)
+	{
+	  rel = xcoff_read_internal_relocs (sec->owner, sec, TRUE,
+					    NULL, FALSE, NULL);
+	  if (rel == NULL)
+	    return FALSE;
+	  relend = rel + sec->reloc_count;
+	  for (; rel < relend; rel++)
+	    {
+	      struct xcoff_link_hash_entry *h;
+
+	      if ((unsigned int) rel->r_symndx
+		  > obj_raw_syment_count (sec->owner))
+		continue;
+
+	      h = obj_xcoff_sym_hashes (sec->owner)[rel->r_symndx];
+	      if (h != NULL)
+		{
+		  if ((h->flags & XCOFF_MARK) == 0)
+		    {
+		      if (!xcoff_mark_symbol (info, h))
+			return FALSE;
+		    }
+		}
+	      else
+		{
+		  asection *rsec;
+
+		  rsec = xcoff_data (sec->owner)->csects[rel->r_symndx];
+		  if (rsec != NULL
+		      && (rsec->flags & SEC_MARK) == 0)
+		    {
+		      if (!xcoff_mark (info, rsec))
+			return FALSE;
+		    }
+		}
+
+	      /* See if this reloc needs to be copied into the .loader
+		 section.  */
+	      if (xcoff_need_ldrel_p (info, rel, h))
+		{
+		  ++xcoff_hash_table (info)->ldrel_count;
+		  if (h != NULL)
+		    h->flags |= XCOFF_LDREL;
+		}
+	    }
+
+	  if (! info->keep_memory
+	      && coff_section_data (sec->owner, sec) != NULL
+	      && coff_section_data (sec->owner, sec)->relocs != NULL
+	      && ! coff_section_data (sec->owner, sec)->keep_relocs)
+	    {
+	      free (coff_section_data (sec->owner, sec)->relocs);
+	      coff_section_data (sec->owner, sec)->relocs = NULL;
+	    }
+	}
+    }
+
+  return TRUE;
+}
+
+/* Routines that are called after all the input files have been
+   handled, but before the sections are laid out in memory.  */
+
+/* The sweep phase of garbage collection.  Remove all garbage
+   sections.  */
+
+static void
+xcoff_sweep (struct bfd_link_info *info)
+{
+  bfd *sub;
+
+  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+    {
+      asection *o;
+
+      for (o = sub->sections; o != NULL; o = o->next)
+	{
+	  if ((o->flags & SEC_MARK) == 0)
+	    {
+	      /* Keep all sections from non-XCOFF input files.  Keep
+		 special sections.  Keep .debug sections for the
+		 moment.  */
+	      if (sub->xvec != info->output_bfd->xvec
+		  || o == xcoff_hash_table (info)->debug_section
+		  || o == xcoff_hash_table (info)->loader_section
+		  || o == xcoff_hash_table (info)->linkage_section
+		  || o == xcoff_hash_table (info)->descriptor_section
+                  || (bfd_get_section_flags (sub, o) & SEC_DEBUGGING)
+		  || strcmp (o->name, ".debug") == 0)
+		o->flags |= SEC_MARK;
+	      else
+		{
+		  o->size = 0;
+		  o->reloc_count = 0;
+		}
+	    }
+	}
+    }
+}
+
+/* Record the number of elements in a set.  This is used to output the
+   correct csect length.  */
+
+bfd_boolean
+bfd_xcoff_link_record_set (bfd *output_bfd,
+			   struct bfd_link_info *info,
+			   struct bfd_link_hash_entry *harg,
+			   bfd_size_type size)
+{
+  struct xcoff_link_hash_entry *h = (struct xcoff_link_hash_entry *) harg;
+  struct xcoff_link_size_list *n;
+  bfd_size_type amt;
+
+  if (bfd_get_flavour (output_bfd) != bfd_target_xcoff_flavour)
+    return TRUE;
+
+  /* This will hardly ever be called.  I don't want to burn four bytes
+     per global symbol, so instead the size is kept on a linked list
+     attached to the hash table.  */
+  amt = sizeof (* n);
+  n = bfd_alloc (output_bfd, amt);
+  if (n == NULL)
+    return FALSE;
+  n->next = xcoff_hash_table (info)->size_list;
+  n->h = h;
+  n->size = size;
+  xcoff_hash_table (info)->size_list = n;
+
+  h->flags |= XCOFF_HAS_SIZE;
+
+  return TRUE;
+}
+
+/* Import a symbol.  */
+
+bfd_boolean
+bfd_xcoff_import_symbol (bfd *output_bfd,
+			 struct bfd_link_info *info,
+			 struct bfd_link_hash_entry *harg,
+			 bfd_vma val,
+			 const char *imppath,
+			 const char *impfile,
+			 const char *impmember,
+			 unsigned int syscall_flag)
+{
+  struct xcoff_link_hash_entry *h = (struct xcoff_link_hash_entry *) harg;
+
+  if (bfd_get_flavour (output_bfd) != bfd_target_xcoff_flavour)
+    return TRUE;
+
+  /* A symbol name which starts with a period is the code for a
+     function.  If the symbol is undefined, then add an undefined
+     symbol for the function descriptor, and import that instead.  */
+  if (h->root.root.string[0] == '.'
+      && h->root.type == bfd_link_hash_undefined
+      && val == (bfd_vma) -1)
+    {
+      struct xcoff_link_hash_entry *hds;
+
+      hds = h->descriptor;
+      if (hds == NULL)
+	{
+	  hds = xcoff_link_hash_lookup (xcoff_hash_table (info),
+					h->root.root.string + 1,
+					TRUE, FALSE, TRUE);
+	  if (hds == NULL)
+	    return FALSE;
+	  if (hds->root.type == bfd_link_hash_new)
+	    {
+	      hds->root.type = bfd_link_hash_undefined;
+	      hds->root.u.undef.abfd = h->root.u.undef.abfd;
+	    }
+	  hds->flags |= XCOFF_DESCRIPTOR;
+	  BFD_ASSERT ((h->flags & XCOFF_DESCRIPTOR) == 0);
+	  hds->descriptor = h;
+	  h->descriptor = hds;
+	}
+
+      /* Now, if the descriptor is undefined, import the descriptor
+	 rather than the symbol we were told to import.  FIXME: Is
+	 this correct in all cases?  */
+      if (hds->root.type == bfd_link_hash_undefined)
+	h = hds;
+    }
+
+  h->flags |= (XCOFF_IMPORT | syscall_flag);
+
+  if (val != (bfd_vma) -1)
+    {
+      if (h->root.type == bfd_link_hash_defined
+	  && (! bfd_is_abs_section (h->root.u.def.section)
+	      || h->root.u.def.value != val))
+	{
+	  if (! ((*info->callbacks->multiple_definition)
+		 (info, &h->root, output_bfd, bfd_abs_section_ptr, val)))
+	    return FALSE;
+	}
+
+      h->root.type = bfd_link_hash_defined;
+      h->root.u.def.section = bfd_abs_section_ptr;
+      h->root.u.def.value = val;
+      h->smclas = XMC_XO;
+    }
+
+  if (!xcoff_set_import_path (info, h, imppath, impfile, impmember))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* Export a symbol.  */
+
+bfd_boolean
+bfd_xcoff_export_symbol (bfd *output_bfd,
+			 struct bfd_link_info *info,
+			 struct bfd_link_hash_entry *harg)
+{
+  struct xcoff_link_hash_entry *h = (struct xcoff_link_hash_entry *) harg;
+
+  if (bfd_get_flavour (output_bfd) != bfd_target_xcoff_flavour)
+    return TRUE;
+
+  h->flags |= XCOFF_EXPORT;
+
+  /* FIXME: I'm not at all sure what syscall is supposed to mean, so
+     I'm just going to ignore it until somebody explains it.  */
+
+  /* Make sure we don't garbage collect this symbol.  */
+  if (! xcoff_mark_symbol (info, h))
+    return FALSE;
+
+  /* If this is a function descriptor, make sure we don't garbage
+     collect the associated function code.  We normally don't have to
+     worry about this, because the descriptor will be attached to a
+     section with relocs, but if we are creating the descriptor
+     ourselves those relocs will not be visible to the mark code.  */
+  if ((h->flags & XCOFF_DESCRIPTOR) != 0)
+    {
+      if (! xcoff_mark_symbol (info, h->descriptor))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Count a reloc against a symbol.  This is called for relocs
+   generated by the linker script, typically for global constructors
+   and destructors.  */
+
+bfd_boolean
+bfd_xcoff_link_count_reloc (bfd *output_bfd,
+			    struct bfd_link_info *info,
+			    const char *name)
+{
+  struct xcoff_link_hash_entry *h;
+
+  if (bfd_get_flavour (output_bfd) != bfd_target_xcoff_flavour)
+    return TRUE;
+
+  h = ((struct xcoff_link_hash_entry *)
+       bfd_wrapped_link_hash_lookup (output_bfd, info, name, FALSE, FALSE,
+				     FALSE));
+  if (h == NULL)
+    {
+      (*_bfd_error_handler) (_("%s: no such symbol"), name);
+      bfd_set_error (bfd_error_no_symbols);
+      return FALSE;
+    }
+
+  h->flags |= XCOFF_REF_REGULAR;
+  if (xcoff_hash_table (info)->loader_section)
+    {
+      h->flags |= XCOFF_LDREL;
+      ++xcoff_hash_table (info)->ldrel_count;
+    }
+
+  /* Mark the symbol to avoid garbage collection.  */
+  if (! xcoff_mark_symbol (info, h))
+    return FALSE;
+
+  return TRUE;
+}
+
+/* This function is called for each symbol to which the linker script
+   assigns a value.  */
+
+bfd_boolean
+bfd_xcoff_record_link_assignment (bfd *output_bfd,
+				  struct bfd_link_info *info,
+				  const char *name)
+{
+  struct xcoff_link_hash_entry *h;
+
+  if (bfd_get_flavour (output_bfd) != bfd_target_xcoff_flavour)
+    return TRUE;
+
+  h = xcoff_link_hash_lookup (xcoff_hash_table (info), name, TRUE, TRUE,
+			      FALSE);
+  if (h == NULL)
+    return FALSE;
+
+  h->flags |= XCOFF_DEF_REGULAR;
+
+  return TRUE;
+}
+
+/* An xcoff_link_hash_traverse callback for which DATA points to an
+   xcoff_loader_info.  Mark all symbols that should be automatically
+   exported.  */
+
+static bfd_boolean
+xcoff_mark_auto_exports (struct xcoff_link_hash_entry *h, void *data)
+{
+  struct xcoff_loader_info *ldinfo;
+
+  ldinfo = (struct xcoff_loader_info *) data;
+  if (xcoff_auto_export_p (ldinfo->info, h, ldinfo->auto_export_flags))
+    {
+      if (!xcoff_mark_symbol (ldinfo->info, h))
+	ldinfo->failed = TRUE;
+    }
+  return TRUE;
+}
+
+/* Add a symbol to the .loader symbols, if necessary.  */
+
+/* INPUT_BFD has an external symbol associated with hash table entry H
+   and csect CSECT.   Return true if INPUT_BFD defines H.  */
+
+static bfd_boolean
+xcoff_final_definition_p (bfd *input_bfd, struct xcoff_link_hash_entry *h,
+			  asection *csect)
+{
+  switch (h->root.type)
+    {
+    case bfd_link_hash_defined:
+    case bfd_link_hash_defweak:
+      /* No input bfd owns absolute symbols.  They are written by
+	 xcoff_write_global_symbol instead.  */
+      return (!bfd_is_abs_section (csect)
+	      && h->root.u.def.section == csect);
+
+    case bfd_link_hash_common:
+      return h->root.u.c.p->section->owner == input_bfd;
+
+    case bfd_link_hash_undefined:
+    case bfd_link_hash_undefweak:
+      /* We can't treat undef.abfd as the owner because that bfd
+	 might be a dynamic object.  Allow any bfd to claim it.  */
+      return TRUE;
+
+    default:
+      abort ();
+    }
+}
+
+/* See if H should have a loader symbol associated with it.  */
+
+static bfd_boolean
+xcoff_build_ldsym (struct xcoff_loader_info *ldinfo,
+		   struct xcoff_link_hash_entry *h)
+{
+  bfd_size_type amt;
+
+  /* Warn if this symbol is exported but not defined.  */
+  if ((h->flags & XCOFF_EXPORT) != 0
+      && (h->flags & XCOFF_WAS_UNDEFINED) != 0)
+    {
+      (*_bfd_error_handler)
+	(_("warning: attempt to export undefined symbol `%s'"),
+	 h->root.root.string);
+      return TRUE;
+    }
+
+  /* We need to add a symbol to the .loader section if it is mentioned
+     in a reloc which we are copying to the .loader section and it was
+     not defined or common, or if it is the entry point, or if it is
+     being exported.  */
+  if (((h->flags & XCOFF_LDREL) == 0
+       || h->root.type == bfd_link_hash_defined
+       || h->root.type == bfd_link_hash_defweak
+       || h->root.type == bfd_link_hash_common)
+      && (h->flags & XCOFF_ENTRY) == 0
+      && (h->flags & XCOFF_EXPORT) == 0)
+    return TRUE;
+
+  /* We need to add this symbol to the .loader symbols.  */
+
+  BFD_ASSERT (h->ldsym == NULL);
+  amt = sizeof (struct internal_ldsym);
+  h->ldsym = bfd_zalloc (ldinfo->output_bfd, amt);
+  if (h->ldsym == NULL)
+    {
+      ldinfo->failed = TRUE;
+      return FALSE;
+    }
+
+  if ((h->flags & XCOFF_IMPORT) != 0)
+    {
+      /* Give imported descriptors class XMC_DS rather than XMC_UA.  */
+      if ((h->flags & XCOFF_DESCRIPTOR) != 0)
+	h->smclas = XMC_DS;
+      h->ldsym->l_ifile = h->ldindx;
+    }
+
+  /* The first 3 symbol table indices are reserved to indicate the
+     data, text and bss sections.  */
+  h->ldindx = ldinfo->ldsym_count + 3;
+
+  ++ldinfo->ldsym_count;
+
+  if (! bfd_xcoff_put_ldsymbol_name (ldinfo->output_bfd, ldinfo,
+				     h->ldsym, h->root.root.string))
+    return FALSE;
+
+  h->flags |= XCOFF_BUILT_LDSYM;
+  return TRUE;
+}
+
+/* An xcoff_htab_traverse callback that is called for each symbol
+   once garbage collection is complete.  */
+
+static bfd_boolean
+xcoff_post_gc_symbol (struct xcoff_link_hash_entry *h, void * p)
+{
+  struct xcoff_loader_info *ldinfo = (struct xcoff_loader_info *) p;
+
+  /* __rtinit, this symbol has special handling. */
+  if (h->flags & XCOFF_RTINIT)
+    return TRUE;
+
+  /* We don't want to garbage collect symbols which are not defined in
+     XCOFF files.  This is a convenient place to mark them.  */
+  if (xcoff_hash_table (ldinfo->info)->gc
+      && (h->flags & XCOFF_MARK) == 0
+      && (h->root.type == bfd_link_hash_defined
+	  || h->root.type == bfd_link_hash_defweak)
+      && (h->root.u.def.section->owner == NULL
+	  || (h->root.u.def.section->owner->xvec
+	      != ldinfo->info->output_bfd->xvec)))
+    h->flags |= XCOFF_MARK;
+
+  /* Skip discarded symbols.  */
+  if (xcoff_hash_table (ldinfo->info)->gc
+      && (h->flags & XCOFF_MARK) == 0)
+    return TRUE;
+
+  /* If this is still a common symbol, and it wasn't garbage
+     collected, we need to actually allocate space for it in the .bss
+     section.  */
+  if (h->root.type == bfd_link_hash_common
+      && h->root.u.c.p->section->size == 0)
+    {
+      BFD_ASSERT (bfd_is_com_section (h->root.u.c.p->section));
+      h->root.u.c.p->section->size = h->root.u.c.size;
+    }
+
+  if (xcoff_hash_table (ldinfo->info)->loader_section)
+    {
+      if (xcoff_auto_export_p (ldinfo->info, h, ldinfo->auto_export_flags))
+	h->flags |= XCOFF_EXPORT;
+
+      if (!xcoff_build_ldsym (ldinfo, h))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* INPUT_BFD includes XCOFF symbol ISYM, which is associated with linker
+   hash table entry H and csect CSECT.  AUX contains ISYM's auxillary
+   csect information, if any.  NAME is the function's name if the name
+   is stored in the .debug section, otherwise it is null.
+
+   Return 1 if we should include an appropriately-adjusted ISYM
+   in the output file, 0 if we should discard ISYM, or -1 if an
+   error occured.  */
+
+static int
+xcoff_keep_symbol_p (struct bfd_link_info *info, bfd *input_bfd,
+		     struct internal_syment *isym,
+		     union internal_auxent *aux,
+		     struct xcoff_link_hash_entry *h,
+		     asection *csect, const char *name)
+{
+  int smtyp;
+
+  /* If we are skipping this csect, we want to strip the symbol too.  */
+  if (csect == NULL)
+    return 0;
+
+  /* Likewise if we garbage-collected the csect.  */
+  if (xcoff_hash_table (info)->gc
+      && !bfd_is_abs_section (csect)
+      && !bfd_is_und_section (csect)
+      && (csect->flags & SEC_MARK) == 0)
+    return 0;
+
+  /* An XCOFF linker always removes C_STAT symbols.  */
+  if (isym->n_sclass == C_STAT)
+    return 0;
+
+  /* We generate the TOC anchor separately.  */
+  if (isym->n_sclass == C_HIDEXT
+      && aux->x_csect.x_smclas == XMC_TC0)
+    return 0;
+
+  /* If we are stripping all symbols, we want to discard this one.  */
+  if (info->strip == strip_all)
+    return 0;
+
+  /* Discard symbols that are defined elsewhere.  */
+  if (EXTERN_SYM_P (isym->n_sclass))
+    {
+      if ((h->flags & XCOFF_ALLOCATED) != 0)
+	return 0;
+      if (!xcoff_final_definition_p (input_bfd, h, csect))
+	return 0;
+    }
+
+  /* If we're discarding local symbols, check whether ISYM is local.  */
+  smtyp = SMTYP_SMTYP (aux->x_csect.x_smtyp);
+  if (info->discard == discard_all
+      && !EXTERN_SYM_P (isym->n_sclass)
+      && (isym->n_sclass != C_HIDEXT || smtyp != XTY_SD))
+    return 0;
+
+  /* If we're stripping debugging symbols, check whether ISYM is one.  */
+  if (info->strip == strip_debugger
+      && isym->n_scnum == N_DEBUG)
+    return 0;
+
+  /* If we are stripping symbols based on name, check how ISYM's
+     name should be handled.  */
+  if (info->strip == strip_some
+      || info->discard == discard_l)
+    {
+      char buf[SYMNMLEN + 1];
+
+      if (name == NULL)
+	{
+	  name = _bfd_coff_internal_syment_name (input_bfd, isym, buf);
+	  if (name == NULL)
+	    return -1;
+	}
+
+      if (info->strip == strip_some
+	  && bfd_hash_lookup (info->keep_hash, name, FALSE, FALSE) == NULL)
+	return 0;
+
+      if (info->discard == discard_l
+	  && !EXTERN_SYM_P (isym->n_sclass)
+	  && (isym->n_sclass != C_HIDEXT || smtyp != XTY_SD)
+	  && bfd_is_local_label_name (input_bfd, name))
+	return 0;
+    }
+
+  return 1;
+}
+
+/* Lay out the .loader section, filling in the header and the import paths.
+   LIBPATH is as for bfd_xcoff_size_dynamic_sections.  */
+
+static bfd_boolean
+xcoff_build_loader_section (struct xcoff_loader_info *ldinfo,
+			    const char *libpath)
+{
+  bfd *output_bfd;
+  struct xcoff_link_hash_table *htab;
+  struct internal_ldhdr *ldhdr;
+  struct xcoff_import_file *fl;
+  bfd_size_type stoff;
+  size_t impsize, impcount;
+  asection *lsec;
+  char *out;
+
+  /* Work out the size of the import file names.  Each import file ID
+     consists of three null terminated strings: the path, the file
+     name, and the archive member name.  The first entry in the list
+     of names is the path to use to find objects, which the linker has
+     passed in as the libpath argument.  For some reason, the path
+     entry in the other import file names appears to always be empty.  */
+  output_bfd = ldinfo->output_bfd;
+  htab = xcoff_hash_table (ldinfo->info);
+  impsize = strlen (libpath) + 3;
+  impcount = 1;
+  for (fl = htab->imports; fl != NULL; fl = fl->next)
+    {
+      ++impcount;
+      impsize += (strlen (fl->path)
+		  + strlen (fl->file)
+		  + strlen (fl->member)
+		  + 3);
+    }
+
+  /* Set up the .loader section header.  */
+  ldhdr = &htab->ldhdr;
+  ldhdr->l_version = bfd_xcoff_ldhdr_version(output_bfd);
+  ldhdr->l_nsyms = ldinfo->ldsym_count;
+  ldhdr->l_nreloc = htab->ldrel_count;
+  ldhdr->l_istlen = impsize;
+  ldhdr->l_nimpid = impcount;
+  ldhdr->l_impoff = (bfd_xcoff_ldhdrsz (output_bfd)
+		     + ldhdr->l_nsyms * bfd_xcoff_ldsymsz (output_bfd)
+		     + ldhdr->l_nreloc * bfd_xcoff_ldrelsz (output_bfd));
+  ldhdr->l_stlen = ldinfo->string_size;
+  stoff = ldhdr->l_impoff + impsize;
+  if (ldinfo->string_size == 0)
+    ldhdr->l_stoff = 0;
+  else
+    ldhdr->l_stoff = stoff;
+
+  /* 64 bit elements to ldhdr
+     The swap out routine for 32 bit will ignore them.
+     Nothing fancy, symbols come after the header and relocs come
+     after symbols.  */
+  ldhdr->l_symoff = bfd_xcoff_ldhdrsz (output_bfd);
+  ldhdr->l_rldoff = (bfd_xcoff_ldhdrsz (output_bfd)
+		     + ldhdr->l_nsyms * bfd_xcoff_ldsymsz (output_bfd));
+
+  /* We now know the final size of the .loader section.  Allocate
+     space for it.  */
+  lsec = htab->loader_section;
+  lsec->size = stoff + ldhdr->l_stlen;
+  lsec->contents = bfd_zalloc (output_bfd, lsec->size);
+  if (lsec->contents == NULL)
+    return FALSE;
+
+  /* Set up the header.  */
+  bfd_xcoff_swap_ldhdr_out (output_bfd, ldhdr, lsec->contents);
+
+  /* Set up the import file names.  */
+  out = (char *) lsec->contents + ldhdr->l_impoff;
+  strcpy (out, libpath);
+  out += strlen (libpath) + 1;
+  *out++ = '\0';
+  *out++ = '\0';
+  for (fl = htab->imports; fl != NULL; fl = fl->next)
+    {
+      const char *s;
+
+      s = fl->path;
+      while ((*out++ = *s++) != '\0')
+	;
+      s = fl->file;
+      while ((*out++ = *s++) != '\0')
+	;
+      s = fl->member;
+      while ((*out++ = *s++) != '\0')
+	;
+    }
+
+  BFD_ASSERT ((bfd_size_type) ((bfd_byte *) out - lsec->contents) == stoff);
+
+  /* Set up the symbol string table.  */
+  if (ldinfo->string_size > 0)
+    {
+      memcpy (out, ldinfo->strings, ldinfo->string_size);
+      free (ldinfo->strings);
+      ldinfo->strings = NULL;
+    }
+
+  /* We can't set up the symbol table or the relocs yet, because we
+     don't yet know the final position of the various sections.  The
+     .loader symbols are written out when the corresponding normal
+     symbols are written out in xcoff_link_input_bfd or
+     xcoff_write_global_symbol.  The .loader relocs are written out
+     when the corresponding normal relocs are handled in
+     xcoff_link_input_bfd.  */
+
+  return TRUE;
+}
+
+/* Build the .loader section.  This is called by the XCOFF linker
+   emulation before_allocation routine.  We must set the size of the
+   .loader section before the linker lays out the output file.
+   LIBPATH is the library path to search for shared objects; this is
+   normally built from the -L arguments passed to the linker.  ENTRY
+   is the name of the entry point symbol (the -e linker option).
+   FILE_ALIGN is the alignment to use for sections within the file
+   (the -H linker option).  MAXSTACK is the maximum stack size (the
+   -bmaxstack linker option).  MAXDATA is the maximum data size (the
+   -bmaxdata linker option).  GC is whether to do garbage collection
+   (the -bgc linker option).  MODTYPE is the module type (the
+   -bmodtype linker option).  TEXTRO is whether the text section must
+   be read only (the -btextro linker option).  AUTO_EXPORT_FLAGS
+   is a mask of XCOFF_EXPALL and XCOFF_EXPFULL.  SPECIAL_SECTIONS
+   is set by this routine to csects with magic names like _end.  */
+
+bfd_boolean
+bfd_xcoff_size_dynamic_sections (bfd *output_bfd,
+				 struct bfd_link_info *info,
+				 const char *libpath,
+				 const char *entry,
+				 unsigned long file_align,
+				 unsigned long maxstack,
+				 unsigned long maxdata,
+				 bfd_boolean gc,
+				 int modtype,
+				 bfd_boolean textro,
+				 unsigned int auto_export_flags,
+				 asection **special_sections,
+				 bfd_boolean rtld)
+{
+  struct xcoff_loader_info ldinfo;
+  int i;
+  asection *sec;
+  bfd *sub;
+  struct bfd_strtab_hash *debug_strtab;
+  bfd_byte *debug_contents = NULL;
+  bfd_size_type amt;
+
+  if (bfd_get_flavour (output_bfd) != bfd_target_xcoff_flavour)
+    {
+      for (i = 0; i < XCOFF_NUMBER_OF_SPECIAL_SECTIONS; i++)
+	special_sections[i] = NULL;
+      return TRUE;
+    }
+
+  ldinfo.failed = FALSE;
+  ldinfo.output_bfd = output_bfd;
+  ldinfo.info = info;
+  ldinfo.auto_export_flags = auto_export_flags;
+  ldinfo.ldsym_count = 0;
+  ldinfo.string_size = 0;
+  ldinfo.strings = NULL;
+  ldinfo.string_alc = 0;
+
+  xcoff_data (output_bfd)->maxstack = maxstack;
+  xcoff_data (output_bfd)->maxdata = maxdata;
+  xcoff_data (output_bfd)->modtype = modtype;
+
+  xcoff_hash_table (info)->file_align = file_align;
+  xcoff_hash_table (info)->textro = textro;
+  xcoff_hash_table (info)->rtld = rtld;
+
+  /* __rtinit */
+  if (xcoff_hash_table (info)->loader_section
+      && (info->init_function || info->fini_function || rtld))
+    {
+      struct xcoff_link_hash_entry *hsym;
+      struct internal_ldsym *ldsym;
+
+      hsym = xcoff_link_hash_lookup (xcoff_hash_table (info),
+				     "__rtinit", FALSE, FALSE, TRUE);
+      if (hsym == NULL)
+	{
+	  (*_bfd_error_handler)
+	    (_("error: undefined symbol __rtinit"));
+	  return FALSE;
+	}
+
+      xcoff_mark_symbol (info, hsym);
+      hsym->flags |= (XCOFF_DEF_REGULAR | XCOFF_RTINIT);
+
+      /* __rtinit initialized.  */
+      amt = sizeof (* ldsym);
+      ldsym = bfd_malloc (amt);
+
+      ldsym->l_value = 0;		/* Will be filled in later.  */
+      ldsym->l_scnum = 2;		/* Data section.  */
+      ldsym->l_smtype = XTY_SD;		/* Csect section definition.  */
+      ldsym->l_smclas = 5;		/* .rw.  */
+      ldsym->l_ifile = 0;		/* Special system loader symbol.  */
+      ldsym->l_parm = 0;		/* NA.  */
+
+      /* Force __rtinit to be the first symbol in the loader symbol table
+	 See xcoff_build_ldsyms
+
+	 The first 3 symbol table indices are reserved to indicate the data,
+	 text and bss sections.  */
+      BFD_ASSERT (0 == ldinfo.ldsym_count);
+
+      hsym->ldindx = 3;
+      ldinfo.ldsym_count = 1;
+      hsym->ldsym = ldsym;
+
+      if (! bfd_xcoff_put_ldsymbol_name (ldinfo.output_bfd, &ldinfo,
+					 hsym->ldsym, hsym->root.root.string))
+	return FALSE;
+
+      /* This symbol is written out by xcoff_write_global_symbol
+	 Set stuff up so xcoff_write_global_symbol logic works.  */
+      hsym->flags |= XCOFF_DEF_REGULAR | XCOFF_MARK;
+      hsym->root.type = bfd_link_hash_defined;
+      hsym->root.u.def.value = 0;
+    }
+
+  /* Garbage collect unused sections.  */
+  if (info->relocatable || !gc)
+    {
+      gc = FALSE;
+      xcoff_hash_table (info)->gc = FALSE;
+
+      /* We still need to call xcoff_mark, in order to set ldrel_count
+	 correctly.  */
+      for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+	{
+	  asection *o;
+
+	  for (o = sub->sections; o != NULL; o = o->next)
+	    {
+	      /* We shouldn't unconditionaly mark the TOC section.
+		 The output file should only have a TOC if either
+		 (a) one of the input files did or (b) we end up
+		 creating TOC references as part of the link process.  */
+	      if (o != xcoff_hash_table (info)->toc_section
+		  && (o->flags & SEC_MARK) == 0)
+		{
+		  if (! xcoff_mark (info, o))
+		    goto error_return;
+		}
+	    }
+	}
+    }
+  else
+    {
+      if (entry != NULL
+	  && !xcoff_mark_symbol_by_name (info, entry, XCOFF_ENTRY))
+	goto error_return;
+      if (info->init_function != NULL
+	  && !xcoff_mark_symbol_by_name (info, info->init_function, 0))
+	goto error_return;
+      if (info->fini_function != NULL
+	  && !xcoff_mark_symbol_by_name (info, info->fini_function, 0))
+	goto error_return;
+      if (auto_export_flags != 0)
+	{
+	  xcoff_link_hash_traverse (xcoff_hash_table (info),
+				    xcoff_mark_auto_exports, &ldinfo);
+	  if (ldinfo.failed)
+	    goto error_return;
+	}
+      xcoff_sweep (info);
+      xcoff_hash_table (info)->gc = TRUE;
+    }
+
+  /* Return special sections to the caller.  */
+  for (i = 0; i < XCOFF_NUMBER_OF_SPECIAL_SECTIONS; i++)
+    {
+      sec = xcoff_hash_table (info)->special_sections[i];
+
+      if (sec != NULL
+	  && gc
+	  && (sec->flags & SEC_MARK) == 0)
+	sec = NULL;
+
+      special_sections[i] = sec;
+    }
+
+  if (info->input_bfds == NULL)
+    /* I'm not sure what to do in this bizarre case.  */
+    return TRUE;
+
+  xcoff_link_hash_traverse (xcoff_hash_table (info), xcoff_post_gc_symbol,
+			    (void *) &ldinfo);
+  if (ldinfo.failed)
+    goto error_return;
+
+  if (xcoff_hash_table (info)->loader_section
+      && !xcoff_build_loader_section (&ldinfo, libpath))
+    goto error_return;
+
+  /* Allocate space for the magic sections.  */
+  sec = xcoff_hash_table (info)->linkage_section;
+  if (sec->size > 0)
+    {
+      sec->contents = bfd_zalloc (output_bfd, sec->size);
+      if (sec->contents == NULL)
+	goto error_return;
+    }
+  sec = xcoff_hash_table (info)->toc_section;
+  if (sec->size > 0)
+    {
+      sec->contents = bfd_zalloc (output_bfd, sec->size);
+      if (sec->contents == NULL)
+	goto error_return;
+    }
+  sec = xcoff_hash_table (info)->descriptor_section;
+  if (sec->size > 0)
+    {
+      sec->contents = bfd_zalloc (output_bfd, sec->size);
+      if (sec->contents == NULL)
+	goto error_return;
+    }
+
+  /* Now that we've done garbage collection, decide which symbols to keep,
+     and figure out the contents of the .debug section.  */
+  debug_strtab = xcoff_hash_table (info)->debug_strtab;
+
+  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+    {
+      asection *subdeb;
+      bfd_size_type symcount;
+      long *debug_index;
+      asection **csectpp;
+      unsigned int *lineno_counts;
+      struct xcoff_link_hash_entry **sym_hash;
+      bfd_byte *esym, *esymend;
+      bfd_size_type symesz;
+
+      if (sub->xvec != info->output_bfd->xvec)
+	continue;
+
+      if ((sub->flags & DYNAMIC) != 0
+	  && !info->static_link)
+	continue;
+
+      if (! _bfd_coff_get_external_symbols (sub))
+	goto error_return;
+
+      symcount = obj_raw_syment_count (sub);
+      debug_index = bfd_zalloc (sub, symcount * sizeof (long));
+      if (debug_index == NULL)
+	goto error_return;
+      xcoff_data (sub)->debug_indices = debug_index;
+
+      if (info->strip == strip_all
+	  || info->strip == strip_debugger
+	  || info->discard == discard_all)
+	/* We're stripping all debugging information, so there's no need
+	   to read SUB's .debug section.  */
+	subdeb = NULL;
+      else
+	{
+	  /* Grab the contents of SUB's .debug section, if any.  */
+	  subdeb = bfd_get_section_by_name (sub, ".debug");
+	  if (subdeb != NULL && subdeb->size > 0)
+	    {
+	      /* We use malloc and copy the names into the debug
+		 stringtab, rather than bfd_alloc, because I expect
+		 that, when linking many files together, many of the
+		 strings will be the same.  Storing the strings in the
+		 hash table should save space in this case.  */
+	      if (!bfd_malloc_and_get_section (sub, subdeb, &debug_contents))
+		goto error_return;
+	    }
+	}
+
+      csectpp = xcoff_data (sub)->csects;
+      lineno_counts = xcoff_data (sub)->lineno_counts;
+      sym_hash = obj_xcoff_sym_hashes (sub);
+      symesz = bfd_coff_symesz (sub);
+      esym = (bfd_byte *) obj_coff_external_syms (sub);
+      esymend = esym + symcount * symesz;
+
+      while (esym < esymend)
+	{
+	  struct internal_syment sym;
+	  union internal_auxent aux;
+	  asection *csect;
+	  const char *name;
+	  int keep_p;
+
+	  bfd_coff_swap_sym_in (sub, esym, &sym);
+
+	  /* Read in the csect information, if any.  */
+	  if (CSECT_SYM_P (sym.n_sclass))
+	    {
+	      BFD_ASSERT (sym.n_numaux > 0);
+	      bfd_coff_swap_aux_in (sub, esym + symesz * sym.n_numaux,
+				    sym.n_type, sym.n_sclass,
+				    sym.n_numaux - 1, sym.n_numaux, &aux);
+	    }
+
+	  /* If this symbol's name is stored in the debug section,
+	     get a pointer to it.  */
+	  if (debug_contents != NULL
+	      && sym._n._n_n._n_zeroes == 0
+	      && bfd_coff_symname_in_debug (sub, &sym))
+	    name = (const char *) debug_contents + sym._n._n_n._n_offset;
+	  else
+	    name = NULL;
+
+	  /* Decide whether to copy this symbol to the output file.  */
+	  csect = *csectpp;
+	  keep_p = xcoff_keep_symbol_p (info, sub, &sym, &aux,
+					*sym_hash, csect, name);
+	  if (keep_p < 0)
+	    return FALSE;
+
+	  if (!keep_p)
+	    /* Use a debug_index of -2 to record that a symbol should
+	       be stripped.  */
+	    *debug_index = -2;
+	  else
+	    {
+	      /* See whether we should store the symbol name in the
+		 output .debug section.  */
+	      if (name != NULL)
+		{
+		  bfd_size_type indx;
+
+		  indx = _bfd_stringtab_add (debug_strtab, name, TRUE, TRUE);
+		  if (indx == (bfd_size_type) -1)
+		    goto error_return;
+		  *debug_index = indx;
+		}
+	      else
+		*debug_index = -1;
+	      if (*sym_hash != 0)
+		(*sym_hash)->flags |= XCOFF_ALLOCATED;
+	      if (*lineno_counts > 0)
+		csect->output_section->lineno_count += *lineno_counts;
+	    }
+
+	  esym += (sym.n_numaux + 1) * symesz;
+	  csectpp += sym.n_numaux + 1;
+	  sym_hash += sym.n_numaux + 1;
+	  lineno_counts += sym.n_numaux + 1;
+	  debug_index += sym.n_numaux + 1;
+	}
+
+      if (debug_contents)
+	{
+	  free (debug_contents);
+	  debug_contents = NULL;
+
+	  /* Clear the size of subdeb, so that it is not included directly
+	     in the output file.  */
+	  subdeb->size = 0;
+	}
+
+      if (! info->keep_memory)
+	{
+	  if (! _bfd_coff_free_symbols (sub))
+	    goto error_return;
+	}
+    }
+
+  if (info->strip != strip_all)
+    xcoff_hash_table (info)->debug_section->size =
+      _bfd_stringtab_size (debug_strtab);
+
+  return TRUE;
+
+ error_return:
+  if (ldinfo.strings != NULL)
+    free (ldinfo.strings);
+  if (debug_contents != NULL)
+    free (debug_contents);
+  return FALSE;
+}
+
+bfd_boolean
+bfd_xcoff_link_generate_rtinit (bfd *abfd,
+				const char *init,
+				const char *fini,
+				bfd_boolean rtld)
+{
+  struct bfd_in_memory *bim;
+
+  bim = bfd_malloc ((bfd_size_type) sizeof (* bim));
+  if (bim == NULL)
+    return FALSE;
+
+  bim->size = 0;
+  bim->buffer = 0;
+
+  abfd->link_next = 0;
+  abfd->format = bfd_object;
+  abfd->iostream = (void *) bim;
+  abfd->flags = BFD_IN_MEMORY;
+  abfd->iovec = &_bfd_memory_iovec;
+  abfd->direction = write_direction;
+  abfd->origin = 0;
+  abfd->where = 0;
+
+  if (! bfd_xcoff_generate_rtinit (abfd, init, fini, rtld))
+    return FALSE;
+
+  /* need to reset to unknown or it will not be read back in correctly */
+  abfd->format = bfd_unknown;
+  abfd->direction = read_direction;
+  abfd->where = 0;
+
+  return TRUE;
+}
+
+/* Return the section that defines H.  Return null if no section does.  */
+
+static asection *
+xcoff_symbol_section (struct xcoff_link_hash_entry *h)
+{
+  switch (h->root.type)
+    {
+    case bfd_link_hash_defined:
+    case bfd_link_hash_defweak:
+      return h->root.u.def.section;
+
+    case bfd_link_hash_common:
+      return h->root.u.c.p->section;
+
+    default:
+      return NULL;
+    }
+}
+
+/* Add a .loader relocation for input relocation IREL.  If the loader
+   relocation should be against an output section, HSEC points to the
+   input section that IREL is against, otherwise HSEC is null.  H is the
+   symbol that IREL is against, or null if it isn't against a global symbol.
+   REFERENCE_BFD is the bfd to use in error messages about the relocation.  */
+
+static bfd_boolean
+xcoff_create_ldrel (bfd *output_bfd, struct xcoff_final_link_info *flinfo,
+		    asection *output_section, bfd *reference_bfd,
+		    struct internal_reloc *irel, asection *hsec,
+		    struct xcoff_link_hash_entry *h)
+{
+  struct internal_ldrel ldrel;
+
+  ldrel.l_vaddr = irel->r_vaddr;
+  if (hsec != NULL)
+    {
+      const char *secname;
+
+      secname = hsec->output_section->name;
+      if (strcmp (secname, ".text") == 0)
+	ldrel.l_symndx = 0;
+      else if (strcmp (secname, ".data") == 0)
+	ldrel.l_symndx = 1;
+      else if (strcmp (secname, ".bss") == 0)
+	ldrel.l_symndx = 2;
+      else
+	{
+	  (*_bfd_error_handler)
+	    (_("%B: loader reloc in unrecognized section `%s'"),
+	     reference_bfd, secname);
+	  bfd_set_error (bfd_error_nonrepresentable_section);
+	  return FALSE;
+	}
+    }
+  else if (h != NULL)
+    {
+      if (h->ldindx < 0)
+	{
+	  (*_bfd_error_handler)
+	    (_("%B: `%s' in loader reloc but not loader sym"),
+	     reference_bfd, h->root.root.string);
+	  bfd_set_error (bfd_error_bad_value);
+	  return FALSE;
+	}
+      ldrel.l_symndx = h->ldindx;
+    }
+  else
+    ldrel.l_symndx = -(bfd_size_type) 1;
+
+  ldrel.l_rtype = (irel->r_size << 8) | irel->r_type;
+  ldrel.l_rsecnm = output_section->target_index;
+  if (xcoff_hash_table (flinfo->info)->textro
+      && strcmp (output_section->name, ".text") == 0)
+    {
+      (*_bfd_error_handler)
+	(_("%B: loader reloc in read-only section %A"),
+	 reference_bfd, output_section);
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+  bfd_xcoff_swap_ldrel_out (output_bfd, &ldrel, flinfo->ldrel);
+  flinfo->ldrel += bfd_xcoff_ldrelsz (output_bfd);
+  return TRUE;
+}
+
+/* Link an input file into the linker output file.  This function
+   handles all the sections and relocations of the input file at once.  */
+
+static bfd_boolean
+xcoff_link_input_bfd (struct xcoff_final_link_info *flinfo,
+		      bfd *input_bfd)
+{
+  bfd *output_bfd;
+  const char *strings;
+  bfd_size_type syment_base;
+  unsigned int n_tmask;
+  unsigned int n_btshft;
+  bfd_boolean copy, hash;
+  bfd_size_type isymesz;
+  bfd_size_type osymesz;
+  bfd_size_type linesz;
+  bfd_byte *esym;
+  bfd_byte *esym_end;
+  struct xcoff_link_hash_entry **sym_hash;
+  struct internal_syment *isymp;
+  asection **csectpp;
+  unsigned int *lineno_counts;
+  long *debug_index;
+  long *indexp;
+  unsigned long output_index;
+  bfd_byte *outsym;
+  unsigned int incls;
+  asection *oline;
+  bfd_boolean keep_syms;
+  asection *o;
+
+  /* We can just skip DYNAMIC files, unless this is a static link.  */
+  if ((input_bfd->flags & DYNAMIC) != 0
+      && ! flinfo->info->static_link)
+    return TRUE;
+
+  /* Move all the symbols to the output file.  */
+  output_bfd = flinfo->output_bfd;
+  strings = NULL;
+  syment_base = obj_raw_syment_count (output_bfd);
+  isymesz = bfd_coff_symesz (input_bfd);
+  osymesz = bfd_coff_symesz (output_bfd);
+  linesz = bfd_coff_linesz (input_bfd);
+  BFD_ASSERT (linesz == bfd_coff_linesz (output_bfd));
+
+  n_tmask = coff_data (input_bfd)->local_n_tmask;
+  n_btshft = coff_data (input_bfd)->local_n_btshft;
+
+  /* Define macros so that ISFCN, et. al., macros work correctly.  */
+#define N_TMASK n_tmask
+#define N_BTSHFT n_btshft
+
+  copy = FALSE;
+  if (! flinfo->info->keep_memory)
+    copy = TRUE;
+  hash = TRUE;
+  if ((output_bfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
+    hash = FALSE;
+
+  if (! _bfd_coff_get_external_symbols (input_bfd))
+    return FALSE;
+
+  /* Make one pass over the symbols and assign indices to symbols that
+     we have decided to keep.  Also use create .loader symbol information
+     and update information in hash table entries.  */
+  esym = (bfd_byte *) obj_coff_external_syms (input_bfd);
+  esym_end = esym + obj_raw_syment_count (input_bfd) * isymesz;
+  sym_hash = obj_xcoff_sym_hashes (input_bfd);
+  csectpp = xcoff_data (input_bfd)->csects;
+  debug_index = xcoff_data (input_bfd)->debug_indices;
+  isymp = flinfo->internal_syms;
+  indexp = flinfo->sym_indices;
+  output_index = syment_base;
+  while (esym < esym_end)
+    {
+      union internal_auxent aux;
+      int smtyp = 0;
+      int add;
+
+      bfd_coff_swap_sym_in (input_bfd, (void *) esym, (void *) isymp);
+
+      /* Read in the csect information, if any.  */
+      if (CSECT_SYM_P (isymp->n_sclass))
+	{
+	  BFD_ASSERT (isymp->n_numaux > 0);
+	  bfd_coff_swap_aux_in (input_bfd,
+				(void *) (esym + isymesz * isymp->n_numaux),
+				isymp->n_type, isymp->n_sclass,
+				isymp->n_numaux - 1, isymp->n_numaux,
+				(void *) &aux);
+
+	  smtyp = SMTYP_SMTYP (aux.x_csect.x_smtyp);
+	}
+
+      /* If this symbol is in the .loader section, swap out the
+	 .loader symbol information.  If this is an external symbol
+	 reference to a defined symbol, though, then wait until we get
+	 to the definition.  */
+      if (EXTERN_SYM_P (isymp->n_sclass)
+	  && *sym_hash != NULL
+	  && (*sym_hash)->ldsym != NULL
+	  && xcoff_final_definition_p (input_bfd, *sym_hash, *csectpp))
+	{
+	  struct xcoff_link_hash_entry *h;
+	  struct internal_ldsym *ldsym;
+
+	  h = *sym_hash;
+	  ldsym = h->ldsym;
+	  if (isymp->n_scnum > 0)
+	    {
+	      ldsym->l_scnum = (*csectpp)->output_section->target_index;
+	      ldsym->l_value = (isymp->n_value
+				+ (*csectpp)->output_section->vma
+				+ (*csectpp)->output_offset
+				- (*csectpp)->vma);
+	    }
+	  else
+	    {
+	      ldsym->l_scnum = isymp->n_scnum;
+	      ldsym->l_value = isymp->n_value;
+	    }
+
+	  ldsym->l_smtype = smtyp;
+	  if (((h->flags & XCOFF_DEF_REGULAR) == 0
+	       && (h->flags & XCOFF_DEF_DYNAMIC) != 0)
+	      || (h->flags & XCOFF_IMPORT) != 0)
+	    ldsym->l_smtype |= L_IMPORT;
+	  if (((h->flags & XCOFF_DEF_REGULAR) != 0
+	       && (h->flags & XCOFF_DEF_DYNAMIC) != 0)
+	      || (h->flags & XCOFF_EXPORT) != 0)
+	    ldsym->l_smtype |= L_EXPORT;
+	  if ((h->flags & XCOFF_ENTRY) != 0)
+	    ldsym->l_smtype |= L_ENTRY;
+	  if (isymp->n_sclass == C_AIX_WEAKEXT)
+	    ldsym->l_smtype |= L_WEAK;
+
+	  ldsym->l_smclas = aux.x_csect.x_smclas;
+
+	  if (ldsym->l_ifile == (bfd_size_type) -1)
+	    ldsym->l_ifile = 0;
+	  else if (ldsym->l_ifile == 0)
+	    {
+	      if ((ldsym->l_smtype & L_IMPORT) == 0)
+		ldsym->l_ifile = 0;
+	      else
+		{
+		  bfd *impbfd;
+
+		  if (h->root.type == bfd_link_hash_defined
+		      || h->root.type == bfd_link_hash_defweak)
+		    impbfd = h->root.u.def.section->owner;
+		  else if (h->root.type == bfd_link_hash_undefined
+			   || h->root.type == bfd_link_hash_undefweak)
+		    impbfd = h->root.u.undef.abfd;
+		  else
+		    impbfd = NULL;
+
+		  if (impbfd == NULL)
+		    ldsym->l_ifile = 0;
+		  else
+		    {
+		      BFD_ASSERT (impbfd->xvec == flinfo->output_bfd->xvec);
+		      ldsym->l_ifile = xcoff_data (impbfd)->import_file_id;
+		    }
+		}
+	    }
+
+	  ldsym->l_parm = 0;
+
+	  BFD_ASSERT (h->ldindx >= 0);
+	  bfd_xcoff_swap_ldsym_out (flinfo->output_bfd, ldsym,
+				    (flinfo->ldsym
+				     + ((h->ldindx - 3)
+					* bfd_xcoff_ldsymsz (flinfo->output_bfd))));
+	  h->ldsym = NULL;
+
+	  /* Fill in snentry now that we know the target_index.  */
+	  if ((h->flags & XCOFF_ENTRY) != 0
+	      && (h->root.type == bfd_link_hash_defined
+		  || h->root.type == bfd_link_hash_defweak))
+	    {
+	      xcoff_data (output_bfd)->snentry =
+		h->root.u.def.section->output_section->target_index;
+	    }
+	}
+
+      add = 1 + isymp->n_numaux;
+
+      if (*debug_index == -2)
+	/* We've decided to strip this symbol.  */
+	*indexp = -1;
+      else
+	{
+	  /* Assign the next unused index to this symbol.  */
+	  *indexp = output_index;
+
+	  if (EXTERN_SYM_P (isymp->n_sclass))
+	    {
+	      BFD_ASSERT (*sym_hash != NULL);
+	      (*sym_hash)->indx = output_index;
+	    }
+
+	  /* If this is a symbol in the TOC which we may have merged
+	     (class XMC_TC), remember the symbol index of the TOC
+	     symbol.  */
+	  if (isymp->n_sclass == C_HIDEXT
+	      && aux.x_csect.x_smclas == XMC_TC
+	      && *sym_hash != NULL)
+	    {
+	      BFD_ASSERT (((*sym_hash)->flags & XCOFF_SET_TOC) == 0);
+	      BFD_ASSERT ((*sym_hash)->toc_section != NULL);
+	      (*sym_hash)->u.toc_indx = output_index;
+	    }
+
+	  output_index += add;
+	}
+
+      esym += add * isymesz;
+      isymp += add;
+      csectpp += add;
+      sym_hash += add;
+      debug_index += add;
+      ++indexp;
+      for (--add; add > 0; --add)
+	*indexp++ = -1;
+    }
+
+  /* Now write out the symbols that we decided to keep.  */
+
+  esym = (bfd_byte *) obj_coff_external_syms (input_bfd);
+  esym_end = esym + obj_raw_syment_count (input_bfd) * isymesz;
+  sym_hash = obj_xcoff_sym_hashes (input_bfd);
+  isymp = flinfo->internal_syms;
+  indexp = flinfo->sym_indices;
+  csectpp = xcoff_data (input_bfd)->csects;
+  lineno_counts = xcoff_data (input_bfd)->lineno_counts;
+  debug_index = xcoff_data (input_bfd)->debug_indices;
+  outsym = flinfo->outsyms;
+  incls = 0;
+  oline = NULL;
+  while (esym < esym_end)
+    {
+      int add;
+
+      add = 1 + isymp->n_numaux;
+
+      if (*indexp < 0)
+	esym += add * isymesz;
+      else
+	{
+	  struct internal_syment isym;
+	  int i;
+
+	  /* Adjust the symbol in order to output it.  */
+	  isym = *isymp;
+	  if (isym._n._n_n._n_zeroes == 0
+	      && isym._n._n_n._n_offset != 0)
+	    {
+	      /* This symbol has a long name.  Enter it in the string
+		 table we are building.  If *debug_index != -1, the
+		 name has already been entered in the .debug section.  */
+	      if (*debug_index >= 0)
+		isym._n._n_n._n_offset = *debug_index;
+	      else
+		{
+		  const char *name;
+		  bfd_size_type indx;
+
+		  name = _bfd_coff_internal_syment_name (input_bfd, &isym, NULL);
+
+		  if (name == NULL)
+		    return FALSE;
+		  indx = _bfd_stringtab_add (flinfo->strtab, name, hash, copy);
+		  if (indx == (bfd_size_type) -1)
+		    return FALSE;
+		  isym._n._n_n._n_offset = STRING_SIZE_SIZE + indx;
+		}
+	    }
+
+	  /* Make __rtinit C_HIDEXT rather than C_EXT.  This avoids
+	     multiple definition problems when linking a shared object
+	     statically.  (The native linker doesn't enter __rtinit into
+	     the normal table at all, but having a local symbol can make
+	     the objdump output easier to read.)  */
+	  if (isym.n_sclass == C_EXT
+	      && *sym_hash
+	      && ((*sym_hash)->flags & XCOFF_RTINIT) != 0)
+	    isym.n_sclass = C_HIDEXT;
+
+	  /* The value of a C_FILE symbol is the symbol index of the
+	     next C_FILE symbol.  The value of the last C_FILE symbol
+	     is -1.  We try to get this right, below, just before we
+	     write the symbols out, but in the general case we may
+	     have to write the symbol out twice.  */
+	  if (isym.n_sclass == C_FILE)
+	    {
+	      if (flinfo->last_file_index != -1
+		  && flinfo->last_file.n_value != (bfd_vma) *indexp)
+		{
+		  /* We must correct the value of the last C_FILE entry.  */
+		  flinfo->last_file.n_value = *indexp;
+		  if ((bfd_size_type) flinfo->last_file_index >= syment_base)
+		    {
+		      /* The last C_FILE symbol is in this input file.  */
+		      bfd_coff_swap_sym_out (output_bfd,
+					     (void *) &flinfo->last_file,
+					     (void *) (flinfo->outsyms
+						    + ((flinfo->last_file_index
+							- syment_base)
+						       * osymesz)));
+		    }
+		  else
+		    {
+		      /* We have already written out the last C_FILE
+			 symbol.  We need to write it out again.  We
+			 borrow *outsym temporarily.  */
+		      file_ptr pos;
+
+		      bfd_coff_swap_sym_out (output_bfd,
+					     (void *) &flinfo->last_file,
+					     (void *) outsym);
+
+		      pos = obj_sym_filepos (output_bfd);
+		      pos += flinfo->last_file_index * osymesz;
+		      if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
+			  || (bfd_bwrite (outsym, osymesz, output_bfd)
+			      != osymesz))
+			return FALSE;
+		    }
+		}
+
+	      flinfo->last_file_index = *indexp;
+	      flinfo->last_file = isym;
+	    }
+
+	  /* The value of a C_BINCL or C_EINCL symbol is a file offset
+	     into the line numbers.  We update the symbol values when
+	     we handle the line numbers.  */
+	  if (isym.n_sclass == C_BINCL
+	      || isym.n_sclass == C_EINCL)
+	    {
+	      isym.n_value = flinfo->line_filepos;
+	      ++incls;
+	    }
+	  /* The value of a C_BSTAT symbol is the symbol table
+	     index of the containing csect.  */
+	  else if (isym.n_sclass == C_BSTAT)
+	    {
+	      bfd_vma indx;
+
+	      indx = isym.n_value;
+	      if (indx < obj_raw_syment_count (input_bfd))
+		{
+		  long symindx;
+
+		  symindx = flinfo->sym_indices[indx];
+		  if (symindx < 0)
+		    isym.n_value = 0;
+		  else
+		    isym.n_value = symindx;
+		}
+	    }
+	  else if (isym.n_sclass != C_ESTAT
+		   && isym.n_sclass != C_DECL
+		   && isym.n_scnum > 0)
+	    {
+	      isym.n_scnum = (*csectpp)->output_section->target_index;
+	      isym.n_value += ((*csectpp)->output_section->vma
+			       + (*csectpp)->output_offset
+			       - (*csectpp)->vma);
+	    }
+
+	  /* Output the symbol.  */
+	  bfd_coff_swap_sym_out (output_bfd, (void *) &isym, (void *) outsym);
+
+	  esym += isymesz;
+	  outsym += osymesz;
+
+	  for (i = 0; i < isymp->n_numaux && esym < esym_end; i++)
+	    {
+	      union internal_auxent aux;
+
+	      bfd_coff_swap_aux_in (input_bfd, (void *) esym, isymp->n_type,
+				    isymp->n_sclass, i, isymp->n_numaux,
+				    (void *) &aux);
+
+	      if (isymp->n_sclass == C_FILE)
+		{
+		  /* This is the file name (or some comment put in by
+		     the compiler).  If it is long, we must put it in
+		     the string table.  */
+		  if (aux.x_file.x_n.x_zeroes == 0
+		      && aux.x_file.x_n.x_offset != 0)
+		    {
+		      const char *filename;
+		      bfd_size_type indx;
+
+		      BFD_ASSERT (aux.x_file.x_n.x_offset
+				  >= STRING_SIZE_SIZE);
+		      if (strings == NULL)
+			{
+			  strings = _bfd_coff_read_string_table (input_bfd);
+			  if (strings == NULL)
+			    return FALSE;
+			}
+		      filename = strings + aux.x_file.x_n.x_offset;
+		      indx = _bfd_stringtab_add (flinfo->strtab, filename,
+						 hash, copy);
+		      if (indx == (bfd_size_type) -1)
+			return FALSE;
+		      aux.x_file.x_n.x_offset = STRING_SIZE_SIZE + indx;
+		    }
+		}
+	      else if (CSECT_SYM_P (isymp->n_sclass)
+		       && i + 1 == isymp->n_numaux)
+		{
+
+		  /* We don't support type checking.  I don't know if
+		     anybody does.  */
+		  aux.x_csect.x_parmhash = 0;
+		  /* I don't think anybody uses these fields, but we'd
+		     better clobber them just in case.  */
+		  aux.x_csect.x_stab = 0;
+		  aux.x_csect.x_snstab = 0;
+
+		  if (SMTYP_SMTYP (aux.x_csect.x_smtyp) == XTY_LD)
+		    {
+		      unsigned long indx;
+
+		      indx = aux.x_csect.x_scnlen.l;
+		      if (indx < obj_raw_syment_count (input_bfd))
+			{
+			  long symindx;
+
+			  symindx = flinfo->sym_indices[indx];
+			  if (symindx < 0)
+			    {
+			      aux.x_csect.x_scnlen.l = 0;
+			    }
+			  else
+			    {
+			      aux.x_csect.x_scnlen.l = symindx;
+			    }
+			}
+		    }
+		}
+	      else if (isymp->n_sclass != C_STAT || isymp->n_type != T_NULL)
+		{
+		  unsigned long indx;
+
+		  if (ISFCN (isymp->n_type)
+		      || ISTAG (isymp->n_sclass)
+		      || isymp->n_sclass == C_BLOCK
+		      || isymp->n_sclass == C_FCN)
+		    {
+		      indx = aux.x_sym.x_fcnary.x_fcn.x_endndx.l;
+		      if (indx > 0
+			  && indx < obj_raw_syment_count (input_bfd))
+			{
+			  /* We look forward through the symbol for
+			     the index of the next symbol we are going
+			     to include.  I don't know if this is
+			     entirely right.  */
+			  while (flinfo->sym_indices[indx] < 0
+				 && indx < obj_raw_syment_count (input_bfd))
+			    ++indx;
+			  if (indx >= obj_raw_syment_count (input_bfd))
+			    indx = output_index;
+			  else
+			    indx = flinfo->sym_indices[indx];
+			  aux.x_sym.x_fcnary.x_fcn.x_endndx.l = indx;
+
+			}
+		    }
+
+		  indx = aux.x_sym.x_tagndx.l;
+		  if (indx > 0 && indx < obj_raw_syment_count (input_bfd))
+		    {
+		      long symindx;
+
+		      symindx = flinfo->sym_indices[indx];
+		      if (symindx < 0)
+			aux.x_sym.x_tagndx.l = 0;
+		      else
+			aux.x_sym.x_tagndx.l = symindx;
+		    }
+
+		}
+
+	      /* Copy over the line numbers, unless we are stripping
+		 them.  We do this on a symbol by symbol basis in
+		 order to more easily handle garbage collection.  */
+	      if (CSECT_SYM_P (isymp->n_sclass)
+		  && i == 0
+		  && isymp->n_numaux > 1
+		  && ISFCN (isymp->n_type)
+		  && aux.x_sym.x_fcnary.x_fcn.x_lnnoptr != 0)
+		{
+		  if (*lineno_counts == 0)
+		    aux.x_sym.x_fcnary.x_fcn.x_lnnoptr = 0;
+		  else
+		    {
+		      asection *enclosing;
+		      unsigned int enc_count;
+		      bfd_signed_vma linoff;
+		      struct internal_lineno lin;
+		      bfd_byte *linp;
+		      bfd_byte *linpend;
+		      bfd_vma offset;
+		      file_ptr pos;
+		      bfd_size_type amt;
+
+		      /* Read in the enclosing section's line-number
+			 information, if we haven't already.  */
+		      o = *csectpp;
+		      enclosing = xcoff_section_data (abfd, o)->enclosing;
+		      enc_count = xcoff_section_data (abfd, o)->lineno_count;
+		      if (oline != enclosing)
+			{
+			  pos = enclosing->line_filepos;
+			  amt = linesz * enc_count;
+			  if (bfd_seek (input_bfd, pos, SEEK_SET) != 0
+			      || (bfd_bread (flinfo->linenos, amt, input_bfd)
+				  != amt))
+			    return FALSE;
+			  oline = enclosing;
+			}
+
+		      /* Copy across the first entry, adjusting its
+			 symbol index.  */
+		      linoff = (aux.x_sym.x_fcnary.x_fcn.x_lnnoptr
+				- enclosing->line_filepos);
+		      linp = flinfo->linenos + linoff;
+		      bfd_coff_swap_lineno_in (input_bfd, linp, &lin);
+		      lin.l_addr.l_symndx = *indexp;
+		      bfd_coff_swap_lineno_out (output_bfd, &lin, linp);
+
+		      /* Copy the other entries, adjusting their addresses.  */
+		      linpend = linp + *lineno_counts * linesz;
+		      offset = (o->output_section->vma
+				+ o->output_offset
+				- o->vma);
+		      for (linp += linesz; linp < linpend; linp += linesz)
+			{
+			  bfd_coff_swap_lineno_in (input_bfd, linp, &lin);
+			  lin.l_addr.l_paddr += offset;
+			  bfd_coff_swap_lineno_out (output_bfd, &lin, linp);
+			}
+
+		      /* Write out the entries we've just processed.  */
+		      pos = (o->output_section->line_filepos
+			     + o->output_section->lineno_count * linesz);
+		      amt = linesz * *lineno_counts;
+		      if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
+			  || bfd_bwrite (flinfo->linenos + linoff,
+					 amt, output_bfd) != amt)
+			return FALSE;
+		      o->output_section->lineno_count += *lineno_counts;
+
+		      /* Record the offset of the symbol's line numbers
+			 in the output file.  */
+		      aux.x_sym.x_fcnary.x_fcn.x_lnnoptr = pos;
+
+		      if (incls > 0)
+			{
+			  struct internal_syment *iisp, *iispend;
+			  long *iindp;
+			  bfd_byte *oos;
+			  bfd_vma range_start, range_end;
+			  int iiadd;
+
+			  /* Update any C_BINCL or C_EINCL symbols
+			     that refer to a line number in the
+			     range we just output.  */
+			  iisp = flinfo->internal_syms;
+			  iispend = iisp + obj_raw_syment_count (input_bfd);
+			  iindp = flinfo->sym_indices;
+			  oos = flinfo->outsyms;
+			  range_start = enclosing->line_filepos + linoff;
+			  range_end = range_start + *lineno_counts * linesz;
+			  while (iisp < iispend)
+			    {
+			      if (*iindp >= 0
+				  && (iisp->n_sclass == C_BINCL
+				      || iisp->n_sclass == C_EINCL)
+				  && iisp->n_value >= range_start
+				  && iisp->n_value < range_end)
+				{
+				  struct internal_syment iis;
+
+				  bfd_coff_swap_sym_in (output_bfd, oos, &iis);
+				  iis.n_value = (iisp->n_value
+						 - range_start
+						 + pos);
+				  bfd_coff_swap_sym_out (output_bfd,
+							 &iis, oos);
+				  --incls;
+				}
+
+			      iiadd = 1 + iisp->n_numaux;
+			      if (*iindp >= 0)
+				oos += iiadd * osymesz;
+			      iisp += iiadd;
+			      iindp += iiadd;
+			    }
+			}
+		    }
+		}
+
+	      bfd_coff_swap_aux_out (output_bfd, (void *) &aux, isymp->n_type,
+				     isymp->n_sclass, i, isymp->n_numaux,
+				     (void *) outsym);
+	      outsym += osymesz;
+	      esym += isymesz;
+	    }
+	}
+
+      sym_hash += add;
+      indexp += add;
+      isymp += add;
+      csectpp += add;
+      lineno_counts += add;
+      debug_index += add;
+    }
+
+  /* If we swapped out a C_FILE symbol, guess that the next C_FILE
+     symbol will be the first symbol in the next input file.  In the
+     normal case, this will save us from writing out the C_FILE symbol
+     again.  */
+  if (flinfo->last_file_index != -1
+      && (bfd_size_type) flinfo->last_file_index >= syment_base)
+    {
+      flinfo->last_file.n_value = output_index;
+      bfd_coff_swap_sym_out (output_bfd, (void *) &flinfo->last_file,
+			     (void *) (flinfo->outsyms
+ 				    + ((flinfo->last_file_index - syment_base)
+ 				       * osymesz)));
+    }
+
+  /* Write the modified symbols to the output file.  */
+  if (outsym > flinfo->outsyms)
+    {
+      file_ptr pos = obj_sym_filepos (output_bfd) + syment_base * osymesz;
+      bfd_size_type amt = outsym - flinfo->outsyms;
+      if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
+	  || bfd_bwrite (flinfo->outsyms, amt, output_bfd) != amt)
+	return FALSE;
+
+      BFD_ASSERT ((obj_raw_syment_count (output_bfd)
+		   + (outsym - flinfo->outsyms) / osymesz)
+		  == output_index);
+
+      obj_raw_syment_count (output_bfd) = output_index;
+    }
+
+  /* Don't let the linker relocation routines discard the symbols.  */
+  keep_syms = obj_coff_keep_syms (input_bfd);
+  obj_coff_keep_syms (input_bfd) = TRUE;
+
+  /* Relocate the contents of each section.  */
+  for (o = input_bfd->sections; o != NULL; o = o->next)
+    {
+      bfd_byte *contents;
+
+      if (! o->linker_mark)
+	/* This section was omitted from the link.  */
+	continue;
+
+      if ((o->flags & SEC_HAS_CONTENTS) == 0
+	  || o->size == 0
+	  || (o->flags & SEC_IN_MEMORY) != 0)
+	continue;
+
+      /* We have set filepos correctly for the sections we created to
+	 represent csects, so bfd_get_section_contents should work.  */
+      if (coff_section_data (input_bfd, o) != NULL
+	  && coff_section_data (input_bfd, o)->contents != NULL)
+	contents = coff_section_data (input_bfd, o)->contents;
+      else
+	{
+	  bfd_size_type sz = o->rawsize ? o->rawsize : o->size;
+	  if (!bfd_get_section_contents (input_bfd, o, flinfo->contents, 0, sz))
+	    return FALSE;
+	  contents = flinfo->contents;
+	}
+
+      if ((o->flags & SEC_RELOC) != 0)
+	{
+	  int target_index;
+	  struct internal_reloc *internal_relocs;
+	  struct internal_reloc *irel;
+	  bfd_vma offset;
+	  struct internal_reloc *irelend;
+	  struct xcoff_link_hash_entry **rel_hash;
+	  long r_symndx;
+
+	  /* Read in the relocs.  */
+	  target_index = o->output_section->target_index;
+	  internal_relocs = (xcoff_read_internal_relocs
+			     (input_bfd, o, FALSE, flinfo->external_relocs,
+			      TRUE,
+			      (flinfo->section_info[target_index].relocs
+			       + o->output_section->reloc_count)));
+	  if (internal_relocs == NULL)
+	    return FALSE;
+
+	  /* Call processor specific code to relocate the section
+	     contents.  */
+	  if (! bfd_coff_relocate_section (output_bfd, flinfo->info,
+					   input_bfd, o,
+					   contents,
+					   internal_relocs,
+					   flinfo->internal_syms,
+					   xcoff_data (input_bfd)->csects))
+	    return FALSE;
+
+	  offset = o->output_section->vma + o->output_offset - o->vma;
+	  irel = internal_relocs;
+	  irelend = irel + o->reloc_count;
+	  rel_hash = (flinfo->section_info[target_index].rel_hashes
+		      + o->output_section->reloc_count);
+	  for (; irel < irelend; irel++, rel_hash++)
+	    {
+	      struct xcoff_link_hash_entry *h = NULL;
+
+	      *rel_hash = NULL;
+
+	      /* Adjust the reloc address and symbol index.  */
+
+	      irel->r_vaddr += offset;
+
+	      r_symndx = irel->r_symndx;
+
+	      if (r_symndx == -1)
+		h = NULL;
+	      else
+		h = obj_xcoff_sym_hashes (input_bfd)[r_symndx];
+
+	      if (r_symndx != -1 && flinfo->info->strip != strip_all)
+		{
+		  if (h != NULL
+		      && h->smclas != XMC_TD
+		      && (irel->r_type == R_TOC
+			  || irel->r_type == R_GL
+			  || irel->r_type == R_TCL
+			  || irel->r_type == R_TRL
+			  || irel->r_type == R_TRLA))
+		    {
+		      /* This is a TOC relative reloc with a symbol
+			 attached.  The symbol should be the one which
+			 this reloc is for.  We want to make this
+			 reloc against the TOC address of the symbol,
+			 not the symbol itself.  */
+		      BFD_ASSERT (h->toc_section != NULL);
+		      BFD_ASSERT ((h->flags & XCOFF_SET_TOC) == 0);
+		      if (h->u.toc_indx != -1)
+			irel->r_symndx = h->u.toc_indx;
+		      else
+			{
+			  struct xcoff_toc_rel_hash *n;
+			  struct xcoff_link_section_info *si;
+			  bfd_size_type amt;
+
+			  amt = sizeof (* n);
+			  n = bfd_alloc (flinfo->output_bfd, amt);
+			  if (n == NULL)
+			    return FALSE;
+			  si = flinfo->section_info + target_index;
+			  n->next = si->toc_rel_hashes;
+			  n->h = h;
+			  n->rel = irel;
+			  si->toc_rel_hashes = n;
+			}
+		    }
+		  else if (h != NULL)
+		    {
+		      /* This is a global symbol.  */
+		      if (h->indx >= 0)
+			irel->r_symndx = h->indx;
+		      else
+			{
+			  /* This symbol is being written at the end
+			     of the file, and we do not yet know the
+			     symbol index.  We save the pointer to the
+			     hash table entry in the rel_hash list.
+			     We set the indx field to -2 to indicate
+			     that this symbol must not be stripped.  */
+			  *rel_hash = h;
+			  h->indx = -2;
+			}
+		    }
+		  else
+		    {
+		      long indx;
+
+		      indx = flinfo->sym_indices[r_symndx];
+
+		      if (indx == -1)
+			{
+			  struct internal_syment *is;
+
+			  /* Relocations against a TC0 TOC anchor are
+			     automatically transformed to be against
+			     the TOC anchor in the output file.  */
+			  is = flinfo->internal_syms + r_symndx;
+			  if (is->n_sclass == C_HIDEXT
+			      && is->n_numaux > 0)
+			    {
+			      void * auxptr;
+			      union internal_auxent aux;
+
+			      auxptr = ((void *)
+					(((bfd_byte *)
+					  obj_coff_external_syms (input_bfd))
+					 + ((r_symndx + is->n_numaux)
+					    * isymesz)));
+			      bfd_coff_swap_aux_in (input_bfd, auxptr,
+						    is->n_type, is->n_sclass,
+						    is->n_numaux - 1,
+						    is->n_numaux,
+						    (void *) &aux);
+			      if (SMTYP_SMTYP (aux.x_csect.x_smtyp) == XTY_SD
+				  && aux.x_csect.x_smclas == XMC_TC0)
+				indx = flinfo->toc_symindx;
+			    }
+			}
+
+		      if (indx != -1)
+			irel->r_symndx = indx;
+		      else
+			{
+
+			  struct internal_syment *is;
+
+			  const char *name;
+			  char buf[SYMNMLEN + 1];
+
+			  /* This reloc is against a symbol we are
+			     stripping.  It would be possible to handle
+			     this case, but I don't think it's worth it.  */
+			  is = flinfo->internal_syms + r_symndx;
+
+                          if (is->n_sclass != C_DWARF)
+                            {
+                              name = (_bfd_coff_internal_syment_name
+                                      (input_bfd, is, buf));
+
+                              if (name == NULL)
+                                return FALSE;
+
+                              if (!(*flinfo->info->callbacks->unattached_reloc)
+                                  (flinfo->info, name, input_bfd, o,
+                                   irel->r_vaddr))
+                                return FALSE;
+                            }
+			}
+		    }
+		}
+
+	      if ((o->flags & SEC_DEBUGGING) == 0
+                  && xcoff_need_ldrel_p (flinfo->info, irel, h))
+		{
+		  asection *sec;
+
+		  if (r_symndx == -1)
+		    sec = NULL;
+		  else if (h == NULL)
+		    sec = xcoff_data (input_bfd)->csects[r_symndx];
+		  else
+		    sec = xcoff_symbol_section (h);
+		  if (!xcoff_create_ldrel (output_bfd, flinfo,
+					   o->output_section, input_bfd,
+					   irel, sec, h))
+		    return FALSE;
+		}
+	    }
+
+	  o->output_section->reloc_count += o->reloc_count;
+	}
+
+      /* Write out the modified section contents.  */
+      if (! bfd_set_section_contents (output_bfd, o->output_section,
+				      contents, (file_ptr) o->output_offset,
+				      o->size))
+	return FALSE;
+    }
+
+  obj_coff_keep_syms (input_bfd) = keep_syms;
+
+  if (! flinfo->info->keep_memory)
+    {
+      if (! _bfd_coff_free_symbols (input_bfd))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+#undef N_TMASK
+#undef N_BTSHFT
+
+/* Sort relocs by VMA.  This is called via qsort.  */
+
+static int
+xcoff_sort_relocs (const void * p1, const void * p2)
+{
+  const struct internal_reloc *r1 = (const struct internal_reloc *) p1;
+  const struct internal_reloc *r2 = (const struct internal_reloc *) p2;
+
+  if (r1->r_vaddr > r2->r_vaddr)
+    return 1;
+  else if (r1->r_vaddr < r2->r_vaddr)
+    return -1;
+  else
+    return 0;
+}
+
+/* Return true if section SEC is a TOC section.  */
+
+static inline bfd_boolean
+xcoff_toc_section_p (asection *sec)
+{
+  const char *name;
+
+  name = sec->name;
+  if (name[0] == '.' && name[1] == 't')
+    {
+      if (name[2] == 'c')
+	{
+	  if (name[3] == '0' && name[4] == 0)
+	    return TRUE;
+	  if (name[3] == 0)
+	    return TRUE;
+	}
+      if (name[2] == 'd' && name[3] == 0)
+	return TRUE;
+    }
+  return FALSE;
+}
+
+/* See if the link requires a TOC (it usually does!).  If so, find a
+   good place to put the TOC anchor csect, and write out the associated
+   symbol.  */
+
+static bfd_boolean
+xcoff_find_tc0 (bfd *output_bfd, struct xcoff_final_link_info *flinfo)
+{
+  bfd_vma toc_start, toc_end, start, end, best_address;
+  asection *sec;
+  bfd *input_bfd;
+  int section_index;
+  struct internal_syment irsym;
+  union internal_auxent iraux;
+  file_ptr pos;
+  size_t size;
+
+  /* Set [TOC_START, TOC_END) to the range of the TOC.  Record the
+     index of a csect at the beginning of the TOC.  */
+  toc_start = ~(bfd_vma) 0;
+  toc_end = 0;
+  section_index = -1;
+  for (input_bfd = flinfo->info->input_bfds;
+       input_bfd != NULL;
+       input_bfd = input_bfd->link_next)
+    for (sec = input_bfd->sections; sec != NULL; sec = sec->next)
+      if ((sec->flags & SEC_MARK) != 0 && xcoff_toc_section_p (sec))
+	{
+	  start = sec->output_section->vma + sec->output_offset;
+	  if (toc_start > start)
+	    {
+	      toc_start = start;
+	      section_index = sec->output_section->target_index;
+	    }
+
+	  end = start + sec->size;
+	  if (toc_end < end)
+	    toc_end = end;
+	}
+
+  /* There's no need for a TC0 symbol if we don't have a TOC.  */
+  if (toc_end < toc_start)
+    {
+      xcoff_data (output_bfd)->toc = toc_start;
+      return TRUE;
+    }
+
+  if (toc_end - toc_start < 0x8000)
+    /* Every TOC csect can be accessed from TOC_START.  */
+    best_address = toc_start;
+  else
+    {
+      /* Find the lowest TOC csect that is still within range of TOC_END.  */
+      best_address = toc_end;
+      for (input_bfd = flinfo->info->input_bfds;
+	   input_bfd != NULL;
+	   input_bfd = input_bfd->link_next)
+	for (sec = input_bfd->sections; sec != NULL; sec = sec->next)
+	  if ((sec->flags & SEC_MARK) != 0 && xcoff_toc_section_p (sec))
+	    {
+	      start = sec->output_section->vma + sec->output_offset;
+	      if (start < best_address
+		  && start + 0x8000 >= toc_end)
+		{
+		  best_address = start;
+		  section_index = sec->output_section->target_index;
+		}
+	    }
+
+      /* Make sure that the start of the TOC is also within range.  */
+      if (best_address > toc_start + 0x8000)
+	{
+	  (*_bfd_error_handler)
+	    (_("TOC overflow: 0x%lx > 0x10000; try -mminimal-toc "
+	       "when compiling"),
+	     (unsigned long) (toc_end - toc_start));
+	  bfd_set_error (bfd_error_file_too_big);
+	  return FALSE;
+	}
+    }
+
+  /* Record the chosen TOC value.  */
+  flinfo->toc_symindx = obj_raw_syment_count (output_bfd);
+  xcoff_data (output_bfd)->toc = best_address;
+  xcoff_data (output_bfd)->sntoc = section_index;
+
+  /* Fill out the TC0 symbol.  */
+  if (!bfd_xcoff_put_symbol_name (output_bfd, flinfo->strtab, &irsym, "TOC"))
+    return FALSE;
+  irsym.n_value = best_address;
+  irsym.n_scnum = section_index;
+  irsym.n_sclass = C_HIDEXT;
+  irsym.n_type = T_NULL;
+  irsym.n_numaux = 1;
+  bfd_coff_swap_sym_out (output_bfd, &irsym, flinfo->outsyms);
+
+  /* Fill out the auxillary csect information.  */
+  memset (&iraux, 0, sizeof iraux);
+  iraux.x_csect.x_smtyp = XTY_SD;
+  iraux.x_csect.x_smclas = XMC_TC0;
+  iraux.x_csect.x_scnlen.l = 0;
+  bfd_coff_swap_aux_out (output_bfd, &iraux, T_NULL, C_HIDEXT, 0, 1,
+			 flinfo->outsyms + bfd_coff_symesz (output_bfd));
+
+  /* Write the contents to the file.  */
+  pos = obj_sym_filepos (output_bfd);
+  pos += obj_raw_syment_count (output_bfd) * bfd_coff_symesz (output_bfd);
+  size = 2 * bfd_coff_symesz (output_bfd);
+  if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
+      || bfd_bwrite (flinfo->outsyms, size, output_bfd) != size)
+    return FALSE;
+  obj_raw_syment_count (output_bfd) += 2;
+
+  return TRUE;
+}
+
+/* Write out a non-XCOFF global symbol.  */
+
+static bfd_boolean
+xcoff_write_global_symbol (struct bfd_hash_entry *bh, void * inf)
+{
+  struct xcoff_link_hash_entry *h = (struct xcoff_link_hash_entry *) bh;
+  struct xcoff_final_link_info *flinfo = (struct xcoff_final_link_info *) inf;
+  bfd *output_bfd;
+  bfd_byte *outsym;
+  struct internal_syment isym;
+  union internal_auxent aux;
+  bfd_boolean result;
+  file_ptr pos;
+  bfd_size_type amt;
+
+  output_bfd = flinfo->output_bfd;
+  outsym = flinfo->outsyms;
+
+  if (h->root.type == bfd_link_hash_warning)
+    {
+      h = (struct xcoff_link_hash_entry *) h->root.u.i.link;
+      if (h->root.type == bfd_link_hash_new)
+	return TRUE;
+    }
+
+  /* If this symbol was garbage collected, just skip it.  */
+  if (xcoff_hash_table (flinfo->info)->gc
+      && (h->flags & XCOFF_MARK) == 0)
+    return TRUE;
+
+  /* If we need a .loader section entry, write it out.  */
+  if (h->ldsym != NULL)
+    {
+      struct internal_ldsym *ldsym;
+      bfd *impbfd;
+
+      ldsym = h->ldsym;
+
+      if (h->root.type == bfd_link_hash_undefined
+	  || h->root.type == bfd_link_hash_undefweak)
+	{
+
+	  ldsym->l_value = 0;
+	  ldsym->l_scnum = N_UNDEF;
+	  ldsym->l_smtype = XTY_ER;
+	  impbfd = h->root.u.undef.abfd;
+
+	}
+      else if (h->root.type == bfd_link_hash_defined
+	       || h->root.type == bfd_link_hash_defweak)
+	{
+	  asection *sec;
+
+	  sec = h->root.u.def.section;
+	  ldsym->l_value = (sec->output_section->vma
+			    + sec->output_offset
+			    + h->root.u.def.value);
+	  ldsym->l_scnum = sec->output_section->target_index;
+	  ldsym->l_smtype = XTY_SD;
+	  impbfd = sec->owner;
+
+	}
+      else
+	abort ();
+
+      if (((h->flags & XCOFF_DEF_REGULAR) == 0
+	   && (h->flags & XCOFF_DEF_DYNAMIC) != 0)
+	  || (h->flags & XCOFF_IMPORT) != 0)
+	/* Clear l_smtype
+	   Import symbols are defined so the check above will make
+	   the l_smtype XTY_SD.  But this is not correct, it should
+	   be cleared.  */
+	ldsym->l_smtype |= L_IMPORT;
+
+      if (((h->flags & XCOFF_DEF_REGULAR) != 0
+	   && (h->flags & XCOFF_DEF_DYNAMIC) != 0)
+	  || (h->flags & XCOFF_EXPORT) != 0)
+	ldsym->l_smtype |= L_EXPORT;
+
+      if ((h->flags & XCOFF_ENTRY) != 0)
+	ldsym->l_smtype |= L_ENTRY;
+
+      if ((h->flags & XCOFF_RTINIT) != 0)
+	ldsym->l_smtype = XTY_SD;
+
+      ldsym->l_smclas = h->smclas;
+
+      if (ldsym->l_smtype & L_IMPORT)
+	{
+	  if ((h->root.type == bfd_link_hash_defined
+	       || h->root.type == bfd_link_hash_defweak)
+	      && (h->root.u.def.value != 0))
+	    ldsym->l_smclas = XMC_XO;
+
+	  else if ((h->flags & (XCOFF_SYSCALL32 | XCOFF_SYSCALL64)) ==
+		   (XCOFF_SYSCALL32 | XCOFF_SYSCALL64))
+	    ldsym->l_smclas = XMC_SV3264;
+
+	  else if (h->flags & XCOFF_SYSCALL32)
+	    ldsym->l_smclas = XMC_SV;
+
+	  else if (h->flags & XCOFF_SYSCALL64)
+	    ldsym->l_smclas = XMC_SV64;
+	}
+
+      if (ldsym->l_ifile == -(bfd_size_type) 1)
+	{
+	  ldsym->l_ifile = 0;
+	}
+      else if (ldsym->l_ifile == 0)
+	{
+	  if ((ldsym->l_smtype & L_IMPORT) == 0)
+	    ldsym->l_ifile = 0;
+	  else if (impbfd == NULL)
+	    ldsym->l_ifile = 0;
+	  else
+	    {
+	      BFD_ASSERT (impbfd->xvec == output_bfd->xvec);
+	      ldsym->l_ifile = xcoff_data (impbfd)->import_file_id;
+	    }
+	}
+
+      ldsym->l_parm = 0;
+
+      BFD_ASSERT (h->ldindx >= 0);
+
+      bfd_xcoff_swap_ldsym_out (output_bfd, ldsym,
+				(flinfo->ldsym +
+				 (h->ldindx - 3)
+				 * bfd_xcoff_ldsymsz(flinfo->output_bfd)));
+      h->ldsym = NULL;
+    }
+
+  /* If this symbol needs global linkage code, write it out.  */
+  if (h->root.type == bfd_link_hash_defined
+      && (h->root.u.def.section
+	  == xcoff_hash_table (flinfo->info)->linkage_section))
+    {
+      bfd_byte *p;
+      bfd_vma tocoff;
+      unsigned int i;
+
+      p = h->root.u.def.section->contents + h->root.u.def.value;
+
+      /* The first instruction in the global linkage code loads a
+	 specific TOC element.  */
+      tocoff = (h->descriptor->toc_section->output_section->vma
+		+ h->descriptor->toc_section->output_offset
+		- xcoff_data (output_bfd)->toc);
+
+      if ((h->descriptor->flags & XCOFF_SET_TOC) != 0)
+	tocoff += h->descriptor->u.toc_offset;
+
+      /* The first instruction in the glink code needs to be
+	 cooked to to hold the correct offset in the toc.  The
+	 rest are just output raw.  */
+      bfd_put_32 (output_bfd,
+		  bfd_xcoff_glink_code(output_bfd, 0) | (tocoff & 0xffff), p);
+
+      /* Start with i == 1 to get past the first instruction done above
+	 The /4 is because the glink code is in bytes and we are going
+	 4 at a pop.  */
+      for (i = 1; i < bfd_xcoff_glink_code_size(output_bfd) / 4; i++)
+	bfd_put_32 (output_bfd,
+		    (bfd_vma) bfd_xcoff_glink_code(output_bfd, i),
+		    &p[4 * i]);
+    }
+
+  /* If we created a TOC entry for this symbol, write out the required
+     relocs.  */
+  if ((h->flags & XCOFF_SET_TOC) != 0)
+    {
+      asection *tocsec;
+      asection *osec;
+      int oindx;
+      struct internal_reloc *irel;
+      struct internal_syment irsym;
+      union internal_auxent iraux;
+
+      tocsec = h->toc_section;
+      osec = tocsec->output_section;
+      oindx = osec->target_index;
+      irel = flinfo->section_info[oindx].relocs + osec->reloc_count;
+      irel->r_vaddr = (osec->vma
+		       + tocsec->output_offset
+		       + h->u.toc_offset);
+
+      if (h->indx >= 0)
+	irel->r_symndx = h->indx;
+      else
+	{
+	  h->indx = -2;
+	  irel->r_symndx = obj_raw_syment_count (output_bfd);
+	}
+
+      BFD_ASSERT (h->ldindx >= 0);
+
+      /* Initialize the aux union here instead of closer to when it is
+	 written out below because the length of the csect depends on
+	 whether the output is 32 or 64 bit.  */
+      memset (&iraux, 0, sizeof iraux);
+      iraux.x_csect.x_smtyp = XTY_SD;
+      /* iraux.x_csect.x_scnlen.l = 4 or 8, see below.  */
+      iraux.x_csect.x_smclas = XMC_TC;
+
+      /* 32 bit uses a 32 bit R_POS to do the relocations
+	 64 bit uses a 64 bit R_POS to do the relocations
+
+	 Also needs to change the csect size : 4 for 32 bit, 8 for 64 bit
+
+	 Which one is determined by the backend.  */
+      if (bfd_xcoff_is_xcoff64 (output_bfd))
+	{
+	  irel->r_size = 63;
+	  iraux.x_csect.x_scnlen.l = 8;
+	}
+      else if (bfd_xcoff_is_xcoff32 (output_bfd))
+	{
+	  irel->r_size = 31;
+	  iraux.x_csect.x_scnlen.l = 4;
+	}
+      else
+	return FALSE;
+
+      irel->r_type = R_POS;
+      flinfo->section_info[oindx].rel_hashes[osec->reloc_count] = NULL;
+      ++osec->reloc_count;
+
+      if (!xcoff_create_ldrel (output_bfd, flinfo, osec,
+			       output_bfd, irel, NULL, h))
+	return FALSE;
+
+      /* We need to emit a symbol to define a csect which holds
+	 the reloc.  */
+      if (flinfo->info->strip != strip_all)
+	{
+	  result = bfd_xcoff_put_symbol_name (output_bfd, flinfo->strtab,
+					      &irsym, h->root.root.string);
+	  if (!result)
+	    return FALSE;
+
+	  irsym.n_value = irel->r_vaddr;
+	  irsym.n_scnum = osec->target_index;
+	  irsym.n_sclass = C_HIDEXT;
+	  irsym.n_type = T_NULL;
+	  irsym.n_numaux = 1;
+
+	  bfd_coff_swap_sym_out (output_bfd, (void *) &irsym, (void *) outsym);
+	  outsym += bfd_coff_symesz (output_bfd);
+
+	  /* Note : iraux is initialized above.  */
+	  bfd_coff_swap_aux_out (output_bfd, (void *) &iraux, T_NULL, C_HIDEXT,
+				 0, 1, (void *) outsym);
+	  outsym += bfd_coff_auxesz (output_bfd);
+
+	  if (h->indx >= 0)
+	    {
+	      /* We aren't going to write out the symbols below, so we
+		 need to write them out now.  */
+	      pos = obj_sym_filepos (output_bfd);
+	      pos += (obj_raw_syment_count (output_bfd)
+		      * bfd_coff_symesz (output_bfd));
+	      amt = outsym - flinfo->outsyms;
+	      if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
+		  || bfd_bwrite (flinfo->outsyms, amt, output_bfd) != amt)
+		return FALSE;
+	      obj_raw_syment_count (output_bfd) +=
+		(outsym - flinfo->outsyms) / bfd_coff_symesz (output_bfd);
+
+	      outsym = flinfo->outsyms;
+	    }
+	}
+    }
+
+  /* If this symbol is a specially defined function descriptor, write
+     it out.  The first word is the address of the function code
+     itself, the second word is the address of the TOC, and the third
+     word is zero.
+
+     32 bit vs 64 bit
+     The addresses for the 32 bit will take 4 bytes and the addresses
+     for 64 bit will take 8 bytes.  Similar for the relocs.  This type
+     of logic was also done above to create a TOC entry in
+     xcoff_write_global_symbol.  */
+  if ((h->flags & XCOFF_DESCRIPTOR) != 0
+      && h->root.type == bfd_link_hash_defined
+      && (h->root.u.def.section
+	  == xcoff_hash_table (flinfo->info)->descriptor_section))
+    {
+      asection *sec;
+      asection *osec;
+      int oindx;
+      bfd_byte *p;
+      struct xcoff_link_hash_entry *hentry;
+      asection *esec;
+      struct internal_reloc *irel;
+      asection *tsec;
+      unsigned int reloc_size, byte_size;
+
+      if (bfd_xcoff_is_xcoff64 (output_bfd))
+	{
+	  reloc_size = 63;
+	  byte_size = 8;
+	}
+      else if (bfd_xcoff_is_xcoff32 (output_bfd))
+	{
+	  reloc_size = 31;
+	  byte_size = 4;
+	}
+      else
+	return FALSE;
+
+      sec = h->root.u.def.section;
+      osec = sec->output_section;
+      oindx = osec->target_index;
+      p = sec->contents + h->root.u.def.value;
+
+      hentry = h->descriptor;
+      BFD_ASSERT (hentry != NULL
+		  && (hentry->root.type == bfd_link_hash_defined
+		      || hentry->root.type == bfd_link_hash_defweak));
+      esec = hentry->root.u.def.section;
+
+      irel = flinfo->section_info[oindx].relocs + osec->reloc_count;
+      irel->r_vaddr = (osec->vma
+		       + sec->output_offset
+		       + h->root.u.def.value);
+      irel->r_symndx = esec->output_section->target_index;
+      irel->r_type = R_POS;
+      irel->r_size = reloc_size;
+      flinfo->section_info[oindx].rel_hashes[osec->reloc_count] = NULL;
+      ++osec->reloc_count;
+
+      if (!xcoff_create_ldrel (output_bfd, flinfo, osec,
+			       output_bfd, irel, esec, NULL))
+	return FALSE;
+
+      /* There are three items to write out,
+	 the address of the code
+	 the address of the toc anchor
+	 the environment pointer.
+	 We are ignoring the environment pointer.  So set it to zero.  */
+      if (bfd_xcoff_is_xcoff64 (output_bfd))
+	{
+	  bfd_put_64 (output_bfd,
+		      (esec->output_section->vma + esec->output_offset
+		       + hentry->root.u.def.value),
+		      p);
+	  bfd_put_64 (output_bfd, xcoff_data (output_bfd)->toc, p + 8);
+	  bfd_put_64 (output_bfd, (bfd_vma) 0, p + 16);
+	}
+      else
+	{
+	  /* 32 bit backend
+	     This logic was already called above so the error case where
+	     the backend is neither has already been checked.  */
+	  bfd_put_32 (output_bfd,
+		      (esec->output_section->vma + esec->output_offset
+		       + hentry->root.u.def.value),
+		      p);
+	  bfd_put_32 (output_bfd, xcoff_data (output_bfd)->toc, p + 4);
+	  bfd_put_32 (output_bfd, (bfd_vma) 0, p + 8);
+	}
+
+      tsec = coff_section_from_bfd_index (output_bfd,
+					  xcoff_data (output_bfd)->sntoc);
+
+      ++irel;
+      irel->r_vaddr = (osec->vma
+		       + sec->output_offset
+		       + h->root.u.def.value
+		       + byte_size);
+      irel->r_symndx = tsec->output_section->target_index;
+      irel->r_type = R_POS;
+      irel->r_size = reloc_size;
+      flinfo->section_info[oindx].rel_hashes[osec->reloc_count] = NULL;
+      ++osec->reloc_count;
+
+      if (!xcoff_create_ldrel (output_bfd, flinfo, osec,
+			       output_bfd, irel, tsec, NULL))
+	return FALSE;
+    }
+
+  if (h->indx >= 0 || flinfo->info->strip == strip_all)
+    {
+      BFD_ASSERT (outsym == flinfo->outsyms);
+      return TRUE;
+    }
+
+  if (h->indx != -2
+      && (flinfo->info->strip == strip_all
+	  || (flinfo->info->strip == strip_some
+	      && bfd_hash_lookup (flinfo->info->keep_hash, h->root.root.string,
+				  FALSE, FALSE) == NULL)))
+    {
+      BFD_ASSERT (outsym == flinfo->outsyms);
+      return TRUE;
+    }
+
+  if (h->indx != -2
+      && (h->flags & (XCOFF_REF_REGULAR | XCOFF_DEF_REGULAR)) == 0)
+    {
+      BFD_ASSERT (outsym == flinfo->outsyms);
+      return TRUE;
+    }
+
+  memset (&aux, 0, sizeof aux);
+
+  h->indx = obj_raw_syment_count (output_bfd);
+
+  result = bfd_xcoff_put_symbol_name (output_bfd, flinfo->strtab, &isym,
+				      h->root.root.string);
+  if (!result)
+    return FALSE;
+
+  if (h->root.type == bfd_link_hash_undefined
+      || h->root.type == bfd_link_hash_undefweak)
+    {
+      isym.n_value = 0;
+      isym.n_scnum = N_UNDEF;
+      if (h->root.type == bfd_link_hash_undefweak
+	  && C_WEAKEXT == C_AIX_WEAKEXT)
+	isym.n_sclass = C_WEAKEXT;
+      else
+	isym.n_sclass = C_EXT;
+      aux.x_csect.x_smtyp = XTY_ER;
+    }
+  else if ((h->root.type == bfd_link_hash_defined
+	    || h->root.type == bfd_link_hash_defweak)
+	   && h->smclas == XMC_XO)
+    {
+      BFD_ASSERT (bfd_is_abs_section (h->root.u.def.section));
+      isym.n_value = h->root.u.def.value;
+      isym.n_scnum = N_UNDEF;
+      if (h->root.type == bfd_link_hash_undefweak
+	  && C_WEAKEXT == C_AIX_WEAKEXT)
+	isym.n_sclass = C_WEAKEXT;
+      else
+	isym.n_sclass = C_EXT;
+      aux.x_csect.x_smtyp = XTY_ER;
+    }
+  else if (h->root.type == bfd_link_hash_defined
+	   || h->root.type == bfd_link_hash_defweak)
+    {
+      struct xcoff_link_size_list *l;
+
+      isym.n_value = (h->root.u.def.section->output_section->vma
+		      + h->root.u.def.section->output_offset
+		      + h->root.u.def.value);
+      if (bfd_is_abs_section (h->root.u.def.section->output_section))
+	isym.n_scnum = N_ABS;
+      else
+	isym.n_scnum = h->root.u.def.section->output_section->target_index;
+      isym.n_sclass = C_HIDEXT;
+      aux.x_csect.x_smtyp = XTY_SD;
+
+      if ((h->flags & XCOFF_HAS_SIZE) != 0)
+	{
+	  for (l = xcoff_hash_table (flinfo->info)->size_list;
+	       l != NULL;
+	       l = l->next)
+	    {
+	      if (l->h == h)
+		{
+		  aux.x_csect.x_scnlen.l = l->size;
+		  break;
+		}
+	    }
+	}
+    }
+  else if (h->root.type == bfd_link_hash_common)
+    {
+      isym.n_value = (h->root.u.c.p->section->output_section->vma
+		      + h->root.u.c.p->section->output_offset);
+      isym.n_scnum = h->root.u.c.p->section->output_section->target_index;
+      isym.n_sclass = C_EXT;
+      aux.x_csect.x_smtyp = XTY_CM;
+      aux.x_csect.x_scnlen.l = h->root.u.c.size;
+    }
+  else
+    abort ();
+
+  isym.n_type = T_NULL;
+  isym.n_numaux = 1;
+
+  bfd_coff_swap_sym_out (output_bfd, (void *) &isym, (void *) outsym);
+  outsym += bfd_coff_symesz (output_bfd);
+
+  aux.x_csect.x_smclas = h->smclas;
+  bfd_coff_swap_aux_out (output_bfd, (void *) &aux, T_NULL, isym.n_sclass, 0, 1,
+			 (void *) outsym);
+  outsym += bfd_coff_auxesz (output_bfd);
+
+  if ((h->root.type == bfd_link_hash_defined
+       || h->root.type == bfd_link_hash_defweak)
+      && h->smclas != XMC_XO)
+    {
+      /* We just output an SD symbol.  Now output an LD symbol.  */
+      h->indx += 2;
+
+      if (h->root.type == bfd_link_hash_undefweak
+	  && C_WEAKEXT == C_AIX_WEAKEXT)
+	isym.n_sclass = C_WEAKEXT;
+      else
+	isym.n_sclass = C_EXT;
+      bfd_coff_swap_sym_out (output_bfd, (void *) &isym, (void *) outsym);
+      outsym += bfd_coff_symesz (output_bfd);
+
+      aux.x_csect.x_smtyp = XTY_LD;
+      aux.x_csect.x_scnlen.l = obj_raw_syment_count (output_bfd);
+      bfd_coff_swap_aux_out (output_bfd, (void *) &aux, T_NULL, C_EXT, 0, 1,
+			     (void *) outsym);
+      outsym += bfd_coff_auxesz (output_bfd);
+    }
+
+  pos = obj_sym_filepos (output_bfd);
+  pos += obj_raw_syment_count (output_bfd) * bfd_coff_symesz (output_bfd);
+  amt = outsym - flinfo->outsyms;
+  if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
+      || bfd_bwrite (flinfo->outsyms, amt, output_bfd) != amt)
+    return FALSE;
+  obj_raw_syment_count (output_bfd) +=
+    (outsym - flinfo->outsyms) / bfd_coff_symesz (output_bfd);
+
+  return TRUE;
+}
+
+/* Handle a link order which is supposed to generate a reloc.  */
+
+static bfd_boolean
+xcoff_reloc_link_order (bfd *output_bfd,
+			struct xcoff_final_link_info *flinfo,
+			asection *output_section,
+			struct bfd_link_order *link_order)
+{
+  reloc_howto_type *howto;
+  struct xcoff_link_hash_entry *h;
+  asection *hsec;
+  bfd_vma hval;
+  bfd_vma addend;
+  struct internal_reloc *irel;
+  struct xcoff_link_hash_entry **rel_hash_ptr;
+
+  if (link_order->type == bfd_section_reloc_link_order)
+    /* We need to somehow locate a symbol in the right section.  The
+       symbol must either have a value of zero, or we must adjust
+       the addend by the value of the symbol.  FIXME: Write this
+       when we need it.  The old linker couldn't handle this anyhow.  */
+    abort ();
+
+  howto = bfd_reloc_type_lookup (output_bfd, link_order->u.reloc.p->reloc);
+  if (howto == NULL)
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  h = ((struct xcoff_link_hash_entry *)
+       bfd_wrapped_link_hash_lookup (output_bfd, flinfo->info,
+				     link_order->u.reloc.p->u.name,
+				     FALSE, FALSE, TRUE));
+  if (h == NULL)
+    {
+      if (! ((*flinfo->info->callbacks->unattached_reloc)
+	     (flinfo->info, link_order->u.reloc.p->u.name, NULL, NULL, (bfd_vma) 0)))
+	return FALSE;
+      return TRUE;
+    }
+
+  hsec = xcoff_symbol_section (h);
+  if (h->root.type == bfd_link_hash_defined
+      || h->root.type == bfd_link_hash_defweak)
+    hval = h->root.u.def.value;
+  else
+    hval = 0;
+
+  addend = link_order->u.reloc.p->addend;
+  if (hsec != NULL)
+    addend += (hsec->output_section->vma
+	       + hsec->output_offset
+	       + hval);
+
+  if (addend != 0)
+    {
+      bfd_size_type size;
+      bfd_byte *buf;
+      bfd_reloc_status_type rstat;
+      bfd_boolean ok;
+
+      size = bfd_get_reloc_size (howto);
+      buf = bfd_zmalloc (size);
+      if (buf == NULL)
+	return FALSE;
+
+      rstat = _bfd_relocate_contents (howto, output_bfd, addend, buf);
+      switch (rstat)
+	{
+	case bfd_reloc_ok:
+	  break;
+	default:
+	case bfd_reloc_outofrange:
+	  abort ();
+	case bfd_reloc_overflow:
+	  if (! ((*flinfo->info->callbacks->reloc_overflow)
+		 (flinfo->info, NULL, link_order->u.reloc.p->u.name,
+		  howto->name, addend, NULL, NULL, (bfd_vma) 0)))
+	    {
+	      free (buf);
+	      return FALSE;
+	    }
+	  break;
+	}
+      ok = bfd_set_section_contents (output_bfd, output_section, (void *) buf,
+				     (file_ptr) link_order->offset, size);
+      free (buf);
+      if (! ok)
+	return FALSE;
+    }
+
+  /* Store the reloc information in the right place.  It will get
+     swapped and written out at the end of the final_link routine.  */
+  irel = (flinfo->section_info[output_section->target_index].relocs
+	  + output_section->reloc_count);
+  rel_hash_ptr = (flinfo->section_info[output_section->target_index].rel_hashes
+		  + output_section->reloc_count);
+
+  memset (irel, 0, sizeof (struct internal_reloc));
+  *rel_hash_ptr = NULL;
+
+  irel->r_vaddr = output_section->vma + link_order->offset;
+
+  if (h->indx >= 0)
+    irel->r_symndx = h->indx;
+  else
+    {
+      /* Set the index to -2 to force this symbol to get written out.  */
+      h->indx = -2;
+      *rel_hash_ptr = h;
+      irel->r_symndx = 0;
+    }
+
+  irel->r_type = howto->type;
+  irel->r_size = howto->bitsize - 1;
+  if (howto->complain_on_overflow == complain_overflow_signed)
+    irel->r_size |= 0x80;
+
+  ++output_section->reloc_count;
+
+  /* Now output the reloc to the .loader section.  */
+  if (xcoff_hash_table (flinfo->info)->loader_section)
+    {
+      if (!xcoff_create_ldrel (output_bfd, flinfo, output_section,
+			       output_bfd, irel, hsec, h))
+	return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Do the final link step.  */
+
+bfd_boolean
+_bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info)
+{
+  bfd_size_type symesz;
+  struct xcoff_final_link_info flinfo;
+  asection *o;
+  struct bfd_link_order *p;
+  bfd_size_type max_contents_size;
+  bfd_size_type max_sym_count;
+  bfd_size_type max_lineno_count;
+  bfd_size_type max_reloc_count;
+  bfd_size_type max_output_reloc_count;
+  file_ptr rel_filepos;
+  unsigned int relsz;
+  file_ptr line_filepos;
+  unsigned int linesz;
+  bfd *sub;
+  bfd_byte *external_relocs = NULL;
+  char strbuf[STRING_SIZE_SIZE];
+  file_ptr pos;
+  bfd_size_type amt;
+
+  if (info->shared)
+    abfd->flags |= DYNAMIC;
+
+  symesz = bfd_coff_symesz (abfd);
+
+  flinfo.info = info;
+  flinfo.output_bfd = abfd;
+  flinfo.strtab = NULL;
+  flinfo.section_info = NULL;
+  flinfo.last_file_index = -1;
+  flinfo.toc_symindx = -1;
+  flinfo.internal_syms = NULL;
+  flinfo.sym_indices = NULL;
+  flinfo.outsyms = NULL;
+  flinfo.linenos = NULL;
+  flinfo.contents = NULL;
+  flinfo.external_relocs = NULL;
+
+  if (xcoff_hash_table (info)->loader_section)
+    {
+      flinfo.ldsym = (xcoff_hash_table (info)->loader_section->contents
+		     + bfd_xcoff_ldhdrsz (abfd));
+      flinfo.ldrel = (xcoff_hash_table (info)->loader_section->contents
+		     + bfd_xcoff_ldhdrsz (abfd)
+		     + (xcoff_hash_table (info)->ldhdr.l_nsyms
+			* bfd_xcoff_ldsymsz (abfd)));
+    }
+  else
+    {
+      flinfo.ldsym = NULL;
+      flinfo.ldrel = NULL;
+    }
+
+  xcoff_data (abfd)->coff.link_info = info;
+
+  flinfo.strtab = _bfd_stringtab_init ();
+  if (flinfo.strtab == NULL)
+    goto error_return;
+
+  /* Count the relocation entries required for the output file.
+     (We've already counted the line numbers.)  Determine a few
+     maximum sizes.  */
+  max_contents_size = 0;
+  max_lineno_count = 0;
+  max_reloc_count = 0;
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      o->reloc_count = 0;
+      for (p = o->map_head.link_order; p != NULL; p = p->next)
+	{
+	  if (p->type == bfd_indirect_link_order)
+	    {
+	      asection *sec;
+
+	      sec = p->u.indirect.section;
+
+	      /* Mark all sections which are to be included in the
+		 link.  This will normally be every section.  We need
+		 to do this so that we can identify any sections which
+		 the linker has decided to not include.  */
+	      sec->linker_mark = TRUE;
+
+	      o->reloc_count += sec->reloc_count;
+
+	      if ((sec->flags & SEC_IN_MEMORY) == 0)
+		{
+		  if (sec->rawsize > max_contents_size)
+		    max_contents_size = sec->rawsize;
+		  if (sec->size > max_contents_size)
+		    max_contents_size = sec->size;
+		}
+	      if (coff_section_data (sec->owner, sec) != NULL
+		  && xcoff_section_data (sec->owner, sec) != NULL
+		  && (xcoff_section_data (sec->owner, sec)->lineno_count
+		      > max_lineno_count))
+		max_lineno_count =
+		  xcoff_section_data (sec->owner, sec)->lineno_count;
+	      if (sec->reloc_count > max_reloc_count)
+		max_reloc_count = sec->reloc_count;
+	    }
+	  else if (p->type == bfd_section_reloc_link_order
+		   || p->type == bfd_symbol_reloc_link_order)
+	    ++o->reloc_count;
+	}
+    }
+
+  /* Compute the file positions for all the sections.  */
+  if (abfd->output_has_begun)
+    {
+      if (xcoff_hash_table (info)->file_align != 0)
+	abort ();
+    }
+  else
+    {
+      bfd_vma file_align;
+
+      file_align = xcoff_hash_table (info)->file_align;
+      if (file_align != 0)
+	{
+	  bfd_boolean saw_contents;
+	  int indx;
+	  file_ptr sofar;
+
+	  /* Insert .pad sections before every section which has
+	     contents and is loaded, if it is preceded by some other
+	     section which has contents and is loaded.  */
+	  saw_contents = TRUE;
+	  for (o = abfd->sections; o != NULL; o = o->next)
+	    {
+	      if (strcmp (o->name, ".pad") == 0)
+		saw_contents = FALSE;
+	      else if ((o->flags & SEC_HAS_CONTENTS) != 0
+		       && (o->flags & SEC_LOAD) != 0)
+		{
+		  if (! saw_contents)
+		    saw_contents = TRUE;
+		  else
+		    {
+		      asection *n;
+
+		      /* Create a pad section and place it before the section
+			 that needs padding.  This requires unlinking and
+			 relinking the bfd's section list.  */
+
+		      n = bfd_make_section_anyway_with_flags (abfd, ".pad",
+							      SEC_HAS_CONTENTS);
+		      n->alignment_power = 0;
+
+		      bfd_section_list_remove (abfd, n);
+		      bfd_section_list_insert_before (abfd, o, n);
+		      saw_contents = FALSE;
+		    }
+		}
+	    }
+
+	  /* Reset the section indices after inserting the new
+	     sections.  */
+	  indx = 0;
+	  for (o = abfd->sections; o != NULL; o = o->next)
+	    {
+	      ++indx;
+	      o->target_index = indx;
+	    }
+	  BFD_ASSERT ((unsigned int) indx == abfd->section_count);
+
+	  /* Work out appropriate sizes for the .pad sections to force
+	     each section to land on a page boundary.  This bit of
+	     code knows what compute_section_file_positions is going
+	     to do.  */
+	  sofar = bfd_coff_filhsz (abfd);
+	  sofar += bfd_coff_aoutsz (abfd);
+	  sofar += abfd->section_count * bfd_coff_scnhsz (abfd);
+	  for (o = abfd->sections; o != NULL; o = o->next)
+	    if ((bfd_xcoff_is_reloc_count_overflow
+		 (abfd, (bfd_vma) o->reloc_count))
+		|| (bfd_xcoff_is_lineno_count_overflow
+		    (abfd, (bfd_vma) o->lineno_count)))
+	      /* 64 does not overflow, need to check if 32 does */
+	      sofar += bfd_coff_scnhsz (abfd);
+
+	  for (o = abfd->sections; o != NULL; o = o->next)
+	    {
+	      if (strcmp (o->name, ".pad") == 0)
+		{
+		  bfd_vma pageoff;
+
+		  BFD_ASSERT (o->size == 0);
+		  pageoff = sofar & (file_align - 1);
+		  if (pageoff != 0)
+		    {
+		      o->size = file_align - pageoff;
+		      sofar += file_align - pageoff;
+		      o->flags |= SEC_HAS_CONTENTS;
+		    }
+		}
+	      else
+		{
+		  if ((o->flags & SEC_HAS_CONTENTS) != 0)
+		    sofar += BFD_ALIGN (o->size,
+					1 << o->alignment_power);
+		}
+	    }
+	}
+
+      if (! bfd_coff_compute_section_file_positions (abfd))
+	goto error_return;
+    }
+
+  /* Allocate space for the pointers we need to keep for the relocs.  */
+  {
+    unsigned int i;
+
+    /* We use section_count + 1, rather than section_count, because
+       the target_index fields are 1 based.  */
+    amt = abfd->section_count + 1;
+    amt *= sizeof (struct xcoff_link_section_info);
+    flinfo.section_info = bfd_malloc (amt);
+    if (flinfo.section_info == NULL)
+      goto error_return;
+    for (i = 0; i <= abfd->section_count; i++)
+      {
+	flinfo.section_info[i].relocs = NULL;
+	flinfo.section_info[i].rel_hashes = NULL;
+	flinfo.section_info[i].toc_rel_hashes = NULL;
+      }
+  }
+
+  /* Set the file positions for the relocs.  */
+  rel_filepos = obj_relocbase (abfd);
+  relsz = bfd_coff_relsz (abfd);
+  max_output_reloc_count = 0;
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      if (o->reloc_count == 0)
+	o->rel_filepos = 0;
+      else
+	{
+	  /* A stripped file has no relocs.  However, we still
+	     allocate the buffers, so that later code doesn't have to
+	     worry about whether we are stripping or not.  */
+	  if (info->strip == strip_all)
+	    o->rel_filepos = 0;
+	  else
+	    {
+	      o->flags |= SEC_RELOC;
+	      o->rel_filepos = rel_filepos;
+	      rel_filepos += o->reloc_count * relsz;
+	    }
+
+	  /* We don't know the indices of global symbols until we have
+	     written out all the local symbols.  For each section in
+	     the output file, we keep an array of pointers to hash
+	     table entries.  Each entry in the array corresponds to a
+	     reloc.  When we find a reloc against a global symbol, we
+	     set the corresponding entry in this array so that we can
+	     fix up the symbol index after we have written out all the
+	     local symbols.
+
+	     Because of this problem, we also keep the relocs in
+	     memory until the end of the link.  This wastes memory.
+	     We could backpatch the file later, I suppose, although it
+	     would be slow.  */
+	  amt = o->reloc_count;
+	  amt *= sizeof (struct internal_reloc);
+	  flinfo.section_info[o->target_index].relocs = bfd_malloc (amt);
+
+	  amt = o->reloc_count;
+	  amt *= sizeof (struct xcoff_link_hash_entry *);
+	  flinfo.section_info[o->target_index].rel_hashes = bfd_malloc (amt);
+
+	  if (flinfo.section_info[o->target_index].relocs == NULL
+	      || flinfo.section_info[o->target_index].rel_hashes == NULL)
+	    goto error_return;
+
+	  if (o->reloc_count > max_output_reloc_count)
+	    max_output_reloc_count = o->reloc_count;
+	}
+    }
+
+  /* We now know the size of the relocs, so we can determine the file
+     positions of the line numbers.  */
+  line_filepos = rel_filepos;
+  flinfo.line_filepos = line_filepos;
+  linesz = bfd_coff_linesz (abfd);
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      if (o->lineno_count == 0)
+	o->line_filepos = 0;
+      else
+	{
+	  o->line_filepos = line_filepos;
+	  line_filepos += o->lineno_count * linesz;
+	}
+
+      /* Reset the reloc and lineno counts, so that we can use them to
+	 count the number of entries we have output so far.  */
+      o->reloc_count = 0;
+      o->lineno_count = 0;
+    }
+
+  obj_sym_filepos (abfd) = line_filepos;
+
+  /* Figure out the largest number of symbols in an input BFD.  Take
+     the opportunity to clear the output_has_begun fields of all the
+     input BFD's.  We want at least 6 symbols, since that is the
+     number which xcoff_write_global_symbol may need.  */
+  max_sym_count = 6;
+  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
+    {
+      bfd_size_type sz;
+
+      sub->output_has_begun = FALSE;
+      sz = obj_raw_syment_count (sub);
+      if (sz > max_sym_count)
+	max_sym_count = sz;
+    }
+
+  /* Allocate some buffers used while linking.  */
+  amt = max_sym_count * sizeof (struct internal_syment);
+  flinfo.internal_syms = bfd_malloc (amt);
+
+  amt = max_sym_count * sizeof (long);
+  flinfo.sym_indices = bfd_malloc (amt);
+
+  amt = (max_sym_count + 1) * symesz;
+  flinfo.outsyms = bfd_malloc (amt);
+
+  amt = max_lineno_count * bfd_coff_linesz (abfd);
+  flinfo.linenos = bfd_malloc (amt);
+
+  amt = max_contents_size;
+  flinfo.contents = bfd_malloc (amt);
+
+  amt = max_reloc_count * relsz;
+  flinfo.external_relocs = bfd_malloc (amt);
+
+  if ((flinfo.internal_syms == NULL && max_sym_count > 0)
+      || (flinfo.sym_indices == NULL && max_sym_count > 0)
+      || flinfo.outsyms == NULL
+      || (flinfo.linenos == NULL && max_lineno_count > 0)
+      || (flinfo.contents == NULL && max_contents_size > 0)
+      || (flinfo.external_relocs == NULL && max_reloc_count > 0))
+    goto error_return;
+
+  obj_raw_syment_count (abfd) = 0;
+
+  /* Find a TOC symbol, if we need one.  */
+  if (!xcoff_find_tc0 (abfd, &flinfo))
+    goto error_return;
+
+  /* We now know the position of everything in the file, except that
+     we don't know the size of the symbol table and therefore we don't
+     know where the string table starts.  We just build the string
+     table in memory as we go along.  We process all the relocations
+     for a single input file at once.  */
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      for (p = o->map_head.link_order; p != NULL; p = p->next)
+	{
+	  if (p->type == bfd_indirect_link_order
+	      && p->u.indirect.section->owner->xvec == abfd->xvec)
+	    {
+	      sub = p->u.indirect.section->owner;
+	      if (! sub->output_has_begun)
+		{
+		  if (! xcoff_link_input_bfd (&flinfo, sub))
+		    goto error_return;
+		  sub->output_has_begun = TRUE;
+		}
+	    }
+	  else if (p->type == bfd_section_reloc_link_order
+		   || p->type == bfd_symbol_reloc_link_order)
+	    {
+	      if (! xcoff_reloc_link_order (abfd, &flinfo, o, p))
+		goto error_return;
+	    }
+	  else
+	    {
+	      if (! _bfd_default_link_order (abfd, info, o, p))
+		goto error_return;
+	    }
+	}
+    }
+
+  /* Free up the buffers used by xcoff_link_input_bfd.  */
+  if (flinfo.internal_syms != NULL)
+    {
+      free (flinfo.internal_syms);
+      flinfo.internal_syms = NULL;
+    }
+  if (flinfo.sym_indices != NULL)
+    {
+      free (flinfo.sym_indices);
+      flinfo.sym_indices = NULL;
+    }
+  if (flinfo.linenos != NULL)
+    {
+      free (flinfo.linenos);
+      flinfo.linenos = NULL;
+    }
+  if (flinfo.contents != NULL)
+    {
+      free (flinfo.contents);
+      flinfo.contents = NULL;
+    }
+  if (flinfo.external_relocs != NULL)
+    {
+      free (flinfo.external_relocs);
+      flinfo.external_relocs = NULL;
+    }
+
+  /* The value of the last C_FILE symbol is supposed to be -1.  Write
+     it out again.  */
+  if (flinfo.last_file_index != -1)
+    {
+      flinfo.last_file.n_value = -(bfd_vma) 1;
+      bfd_coff_swap_sym_out (abfd, (void *) &flinfo.last_file,
+			     (void *) flinfo.outsyms);
+      pos = obj_sym_filepos (abfd) + flinfo.last_file_index * symesz;
+      if (bfd_seek (abfd, pos, SEEK_SET) != 0
+	  || bfd_bwrite (flinfo.outsyms, symesz, abfd) != symesz)
+	goto error_return;
+    }
+
+  /* Write out all the global symbols which do not come from XCOFF
+     input files.  */
+  bfd_hash_traverse (&info->hash->table, xcoff_write_global_symbol, &flinfo);
+
+  if (flinfo.outsyms != NULL)
+    {
+      free (flinfo.outsyms);
+      flinfo.outsyms = NULL;
+    }
+
+  /* Now that we have written out all the global symbols, we know the
+     symbol indices to use for relocs against them, and we can finally
+     write out the relocs.  */
+  amt = max_output_reloc_count * relsz;
+  external_relocs = bfd_malloc (amt);
+  if (external_relocs == NULL && max_output_reloc_count != 0)
+    goto error_return;
+
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      struct internal_reloc *irel;
+      struct internal_reloc *irelend;
+      struct xcoff_link_hash_entry **rel_hash;
+      struct xcoff_toc_rel_hash *toc_rel_hash;
+      bfd_byte *erel;
+      bfd_size_type rel_size;
+
+      /* A stripped file has no relocs.  */
+      if (info->strip == strip_all)
+	{
+	  o->reloc_count = 0;
+	  continue;
+	}
+
+      if (o->reloc_count == 0)
+	continue;
+
+      irel = flinfo.section_info[o->target_index].relocs;
+      irelend = irel + o->reloc_count;
+      rel_hash = flinfo.section_info[o->target_index].rel_hashes;
+      for (; irel < irelend; irel++, rel_hash++, erel += relsz)
+	{
+	  if (*rel_hash != NULL)
+	    {
+	      if ((*rel_hash)->indx < 0)
+		{
+		  if (! ((*info->callbacks->unattached_reloc)
+			 (info, (*rel_hash)->root.root.string,
+			  NULL, o, irel->r_vaddr)))
+		    goto error_return;
+		  (*rel_hash)->indx = 0;
+		}
+	      irel->r_symndx = (*rel_hash)->indx;
+	    }
+	}
+
+      for (toc_rel_hash = flinfo.section_info[o->target_index].toc_rel_hashes;
+	   toc_rel_hash != NULL;
+	   toc_rel_hash = toc_rel_hash->next)
+	{
+	  if (toc_rel_hash->h->u.toc_indx < 0)
+	    {
+	      if (! ((*info->callbacks->unattached_reloc)
+		     (info, toc_rel_hash->h->root.root.string,
+		      NULL, o, toc_rel_hash->rel->r_vaddr)))
+		goto error_return;
+	      toc_rel_hash->h->u.toc_indx = 0;
+	    }
+	  toc_rel_hash->rel->r_symndx = toc_rel_hash->h->u.toc_indx;
+	}
+
+      /* XCOFF requires that the relocs be sorted by address.  We tend
+	 to produce them in the order in which their containing csects
+	 appear in the symbol table, which is not necessarily by
+	 address.  So we sort them here.  There may be a better way to
+	 do this.  */
+      qsort ((void *) flinfo.section_info[o->target_index].relocs,
+	     o->reloc_count, sizeof (struct internal_reloc),
+	     xcoff_sort_relocs);
+
+      irel = flinfo.section_info[o->target_index].relocs;
+      irelend = irel + o->reloc_count;
+      erel = external_relocs;
+      for (; irel < irelend; irel++, rel_hash++, erel += relsz)
+	bfd_coff_swap_reloc_out (abfd, (void *) irel, (void *) erel);
+
+      rel_size = relsz * o->reloc_count;
+      if (bfd_seek (abfd, o->rel_filepos, SEEK_SET) != 0
+	  || bfd_bwrite ((void *) external_relocs, rel_size, abfd) != rel_size)
+	goto error_return;
+    }
+
+  if (external_relocs != NULL)
+    {
+      free (external_relocs);
+      external_relocs = NULL;
+    }
+
+  /* Free up the section information.  */
+  if (flinfo.section_info != NULL)
+    {
+      unsigned int i;
+
+      for (i = 0; i < abfd->section_count; i++)
+	{
+	  if (flinfo.section_info[i].relocs != NULL)
+	    free (flinfo.section_info[i].relocs);
+	  if (flinfo.section_info[i].rel_hashes != NULL)
+	    free (flinfo.section_info[i].rel_hashes);
+	}
+      free (flinfo.section_info);
+      flinfo.section_info = NULL;
+    }
+
+  /* Write out the loader section contents.  */
+  o = xcoff_hash_table (info)->loader_section;
+  if (o)
+    {
+      BFD_ASSERT ((bfd_byte *) flinfo.ldrel
+		  == (xcoff_hash_table (info)->loader_section->contents
+		      + xcoff_hash_table (info)->ldhdr.l_impoff));
+      if (!bfd_set_section_contents (abfd, o->output_section, o->contents,
+				     (file_ptr) o->output_offset, o->size))
+	goto error_return;
+    }
+
+  /* Write out the magic sections.  */
+  o = xcoff_hash_table (info)->linkage_section;
+  if (o->size > 0
+      && ! bfd_set_section_contents (abfd, o->output_section, o->contents,
+				     (file_ptr) o->output_offset,
+				     o->size))
+    goto error_return;
+  o = xcoff_hash_table (info)->toc_section;
+  if (o->size > 0
+      && ! bfd_set_section_contents (abfd, o->output_section, o->contents,
+				     (file_ptr) o->output_offset,
+				     o->size))
+    goto error_return;
+  o = xcoff_hash_table (info)->descriptor_section;
+  if (o->size > 0
+      && ! bfd_set_section_contents (abfd, o->output_section, o->contents,
+				     (file_ptr) o->output_offset,
+				     o->size))
+    goto error_return;
+
+  /* Write out the string table.  */
+  pos = obj_sym_filepos (abfd) + obj_raw_syment_count (abfd) * symesz;
+  if (bfd_seek (abfd, pos, SEEK_SET) != 0)
+    goto error_return;
+  H_PUT_32 (abfd,
+	    _bfd_stringtab_size (flinfo.strtab) + STRING_SIZE_SIZE,
+	    strbuf);
+  amt = STRING_SIZE_SIZE;
+  if (bfd_bwrite (strbuf, amt, abfd) != amt)
+    goto error_return;
+  if (! _bfd_stringtab_emit (abfd, flinfo.strtab))
+    goto error_return;
+
+  _bfd_stringtab_free (flinfo.strtab);
+
+  /* Write out the debugging string table.  */
+  o = xcoff_hash_table (info)->debug_section;
+  if (o != NULL)
+    {
+      struct bfd_strtab_hash *debug_strtab;
+
+      debug_strtab = xcoff_hash_table (info)->debug_strtab;
+      BFD_ASSERT (o->output_section->size - o->output_offset
+		  >= _bfd_stringtab_size (debug_strtab));
+      pos = o->output_section->filepos + o->output_offset;
+      if (bfd_seek (abfd, pos, SEEK_SET) != 0)
+	goto error_return;
+      if (! _bfd_stringtab_emit (abfd, debug_strtab))
+	goto error_return;
+    }
+
+  /* Setting bfd_get_symcount to 0 will cause write_object_contents to
+     not try to write out the symbols.  */
+  bfd_get_symcount (abfd) = 0;
+
+  return TRUE;
+
+ error_return:
+  if (flinfo.strtab != NULL)
+    _bfd_stringtab_free (flinfo.strtab);
+
+  if (flinfo.section_info != NULL)
+    {
+      unsigned int i;
+
+      for (i = 0; i < abfd->section_count; i++)
+	{
+	  if (flinfo.section_info[i].relocs != NULL)
+	    free (flinfo.section_info[i].relocs);
+	  if (flinfo.section_info[i].rel_hashes != NULL)
+	    free (flinfo.section_info[i].rel_hashes);
+	}
+      free (flinfo.section_info);
+    }
+
+  if (flinfo.internal_syms != NULL)
+    free (flinfo.internal_syms);
+  if (flinfo.sym_indices != NULL)
+    free (flinfo.sym_indices);
+  if (flinfo.outsyms != NULL)
+    free (flinfo.outsyms);
+  if (flinfo.linenos != NULL)
+    free (flinfo.linenos);
+  if (flinfo.contents != NULL)
+    free (flinfo.contents);
+  if (flinfo.external_relocs != NULL)
+    free (flinfo.external_relocs);
+  if (external_relocs != NULL)
+    free (external_relocs);
+  return FALSE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/xsym.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/xsym.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/xsym.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/xsym.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2359 @@
+/* xSYM symbol-file support for BFD.
+   Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+   2009, 2010, 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "alloca-conf.h"
+#include "sysdep.h"
+#include "xsym.h"
+#include "bfd.h"
+#include "libbfd.h"
+
+#define bfd_sym_close_and_cleanup                   _bfd_generic_close_and_cleanup
+#define bfd_sym_bfd_free_cached_info                _bfd_generic_bfd_free_cached_info
+#define bfd_sym_new_section_hook                    _bfd_generic_new_section_hook
+#define bfd_sym_bfd_is_local_label_name             bfd_generic_is_local_label_name
+#define bfd_sym_bfd_is_target_special_symbol       ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define bfd_sym_get_lineno                          _bfd_nosymbols_get_lineno
+#define bfd_sym_find_nearest_line                   _bfd_nosymbols_find_nearest_line
+#define bfd_sym_find_inliner_info                   _bfd_nosymbols_find_inliner_info
+#define bfd_sym_bfd_make_debug_symbol               _bfd_nosymbols_bfd_make_debug_symbol
+#define bfd_sym_read_minisymbols                    _bfd_generic_read_minisymbols
+#define bfd_sym_minisymbol_to_symbol                _bfd_generic_minisymbol_to_symbol
+#define bfd_sym_set_arch_mach                       _bfd_generic_set_arch_mach
+#define bfd_sym_get_section_contents                _bfd_generic_get_section_contents
+#define bfd_sym_set_section_contents                _bfd_generic_set_section_contents
+#define bfd_sym_bfd_get_relocated_section_contents  bfd_generic_get_relocated_section_contents
+#define bfd_sym_bfd_relax_section                   bfd_generic_relax_section
+#define bfd_sym_bfd_gc_sections                     bfd_generic_gc_sections
+#define bfd_sym_bfd_lookup_section_flags            bfd_generic_lookup_section_flags
+#define bfd_sym_bfd_merge_sections                  bfd_generic_merge_sections
+#define bfd_sym_bfd_is_group_section                bfd_generic_is_group_section
+#define bfd_sym_bfd_discard_group                   bfd_generic_discard_group
+#define bfd_sym_section_already_linked              _bfd_generic_section_already_linked
+#define bfd_sym_bfd_define_common_symbol            bfd_generic_define_common_symbol
+#define bfd_sym_bfd_link_hash_table_create          _bfd_generic_link_hash_table_create
+#define bfd_sym_bfd_link_hash_table_free            _bfd_generic_link_hash_table_free
+#define bfd_sym_bfd_link_add_symbols                _bfd_generic_link_add_symbols
+#define bfd_sym_bfd_link_just_syms                  _bfd_generic_link_just_syms
+#define bfd_sym_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define bfd_sym_bfd_final_link                      _bfd_generic_final_link
+#define bfd_sym_bfd_link_split_section              _bfd_generic_link_split_section
+#define bfd_sym_get_section_contents_in_window      _bfd_generic_get_section_contents_in_window
+
+extern const bfd_target sym_vec;
+
+static int
+pstrcmp (const char *as, const char *bs)
+{
+  const unsigned char *a = (const unsigned char *) as;
+  const unsigned char *b = (const unsigned char *) bs;
+  unsigned char clen;
+  int ret;
+
+  clen = (a[0] > b[0]) ? b[0] : a[0];
+  ret = memcmp (a + 1, b + 1, clen);
+  if (ret != 0)
+    return ret;
+
+  if (a[0] == b[0])
+    return 0;
+  else if (a[0] < b[0])
+    return -1;
+  else
+    return 1;
+}
+
+static unsigned long
+compute_offset (unsigned long first_page,
+		unsigned long page_size,
+		unsigned long entry_size,
+		unsigned long sym_index)
+{
+  unsigned long entries_per_page = page_size / entry_size;
+  unsigned long page_number = first_page + (sym_index / entries_per_page);
+  unsigned long page_offset = (sym_index % entries_per_page) * entry_size;
+
+  return (page_number * page_size) + page_offset;
+}
+
+bfd_boolean
+bfd_sym_mkobject (bfd *abfd ATTRIBUTE_UNUSED)
+{
+  return 1;
+}
+
+void
+bfd_sym_print_symbol (bfd *abfd ATTRIBUTE_UNUSED,
+		      void * afile ATTRIBUTE_UNUSED,
+		      asymbol *symbol ATTRIBUTE_UNUSED,
+		      bfd_print_symbol_type how ATTRIBUTE_UNUSED)
+{
+  return;
+}
+
+bfd_boolean
+bfd_sym_valid (bfd *abfd)
+{
+  if (abfd == NULL || abfd->xvec == NULL)
+    return 0;
+
+  return abfd->xvec == &sym_vec;
+}
+
+unsigned char *
+bfd_sym_read_name_table (bfd *abfd, bfd_sym_header_block *dshb)
+{
+  unsigned char *rstr;
+  long ret;
+  size_t table_size = dshb->dshb_nte.dti_page_count * dshb->dshb_page_size;
+  size_t table_offset = dshb->dshb_nte.dti_first_page * dshb->dshb_page_size;
+
+  rstr = bfd_alloc (abfd, table_size);
+  if (rstr == NULL)
+    return rstr;
+
+  bfd_seek (abfd, table_offset, SEEK_SET);
+  ret = bfd_bread (rstr, table_size, abfd);
+  if (ret < 0 || (unsigned long) ret != table_size)
+    {
+      bfd_release (abfd, rstr);
+      return NULL;
+    }
+
+  return rstr;
+}
+
+void
+bfd_sym_parse_file_reference_v32 (unsigned char *buf,
+				  size_t len,
+				  bfd_sym_file_reference *entry)
+{
+  BFD_ASSERT (len == 6);
+
+  entry->fref_frte_index = bfd_getb16 (buf);
+  entry->fref_offset = bfd_getb32 (buf + 2);
+}
+
+void
+bfd_sym_parse_disk_table_v32 (unsigned char *buf,
+			      size_t len,
+			      bfd_sym_table_info *table)
+{
+  BFD_ASSERT (len == 8);
+
+  table->dti_first_page = bfd_getb16 (buf);
+  table->dti_page_count = bfd_getb16 (buf + 2);
+  table->dti_object_count = bfd_getb32 (buf + 4);
+}
+
+void
+bfd_sym_parse_header_v32 (unsigned char *buf,
+			  size_t len,
+			  bfd_sym_header_block *header)
+{
+  BFD_ASSERT (len == 154);
+
+  memcpy (header->dshb_id, buf, 32);
+  header->dshb_page_size = bfd_getb16 (buf + 32);
+  header->dshb_hash_page = bfd_getb16 (buf + 34);
+  header->dshb_root_mte = bfd_getb16 (buf + 36);
+  header->dshb_mod_date = bfd_getb32 (buf + 38);
+
+  bfd_sym_parse_disk_table_v32 (buf + 42, 8, &header->dshb_frte);
+  bfd_sym_parse_disk_table_v32 (buf + 50, 8, &header->dshb_rte);
+  bfd_sym_parse_disk_table_v32 (buf + 58, 8, &header->dshb_mte);
+  bfd_sym_parse_disk_table_v32 (buf + 66, 8, &header->dshb_cmte);
+  bfd_sym_parse_disk_table_v32 (buf + 74, 8, &header->dshb_cvte);
+  bfd_sym_parse_disk_table_v32 (buf + 82, 8, &header->dshb_csnte);
+  bfd_sym_parse_disk_table_v32 (buf + 90, 8, &header->dshb_clte);
+  bfd_sym_parse_disk_table_v32 (buf + 98, 8, &header->dshb_ctte);
+  bfd_sym_parse_disk_table_v32 (buf + 106, 8, &header->dshb_tte);
+  bfd_sym_parse_disk_table_v32 (buf + 114, 8, &header->dshb_nte);
+  bfd_sym_parse_disk_table_v32 (buf + 122, 8, &header->dshb_tinfo);
+  bfd_sym_parse_disk_table_v32 (buf + 130, 8, &header->dshb_fite);
+  bfd_sym_parse_disk_table_v32 (buf + 138, 8, &header->dshb_const);
+
+  memcpy (&header->dshb_file_creator, buf + 146, 4);
+  memcpy (&header->dshb_file_type, buf + 150, 4);
+}
+
+int
+bfd_sym_read_header_v32 (bfd *abfd, bfd_sym_header_block *header)
+{
+  unsigned char buf[154];
+  long ret;
+
+  ret = bfd_bread (buf, 154, abfd);
+  if (ret != 154)
+    return -1;
+
+  bfd_sym_parse_header_v32 (buf, 154, header);
+
+  return 0;
+}
+
+int
+bfd_sym_read_header_v34 (bfd *abfd ATTRIBUTE_UNUSED,
+			 bfd_sym_header_block *header ATTRIBUTE_UNUSED)
+{
+  abort ();
+}
+
+int
+bfd_sym_read_header (bfd *abfd,
+		     bfd_sym_header_block *header,
+		     bfd_sym_version version)
+{
+  switch (version)
+    {
+    case BFD_SYM_VERSION_3_5:
+    case BFD_SYM_VERSION_3_4:
+      return bfd_sym_read_header_v34 (abfd, header);
+    case BFD_SYM_VERSION_3_3:
+    case BFD_SYM_VERSION_3_2:
+      return bfd_sym_read_header_v32 (abfd, header);
+    case BFD_SYM_VERSION_3_1:
+    default:
+      return 0;
+    }
+}
+
+int
+bfd_sym_read_version (bfd *abfd, bfd_sym_version *version)
+{
+  char version_string[32];
+  long ret;
+
+  ret = bfd_bread (version_string, sizeof (version_string), abfd);
+  if (ret != sizeof (version_string))
+    return -1;
+
+  if (pstrcmp (version_string, BFD_SYM_VERSION_STR_3_1) == 0)
+    *version = BFD_SYM_VERSION_3_1;
+  else if (pstrcmp (version_string, BFD_SYM_VERSION_STR_3_2) == 0)
+    *version = BFD_SYM_VERSION_3_2;
+  else if (pstrcmp (version_string, BFD_SYM_VERSION_STR_3_3) == 0)
+    *version = BFD_SYM_VERSION_3_3;
+  else if (pstrcmp (version_string, BFD_SYM_VERSION_STR_3_4) == 0)
+    *version = BFD_SYM_VERSION_3_4;
+  else if (pstrcmp (version_string, BFD_SYM_VERSION_STR_3_5) == 0)
+    *version = BFD_SYM_VERSION_3_5;
+  else
+    return -1;
+
+  return 0;
+}
+
+void
+bfd_sym_display_table_summary (FILE *f,
+			       bfd_sym_table_info *dti,
+			       const char *name)
+{
+  fprintf (f, "%-6s %13ld %13ld %13ld\n",
+	   name,
+	   dti->dti_first_page,
+	   dti->dti_page_count,
+	   dti->dti_object_count);
+}
+
+void
+bfd_sym_display_header (FILE *f, bfd_sym_header_block *dshb)
+{
+  fprintf (f, "            Version: %.*s\n", dshb->dshb_id[0], dshb->dshb_id + 1);
+  fprintf (f, "          Page Size: 0x%x\n", dshb->dshb_page_size);
+  fprintf (f, "          Hash Page: %lu\n", dshb->dshb_hash_page);
+  fprintf (f, "           Root MTE: %lu\n", dshb->dshb_root_mte);
+  fprintf (f, "  Modification Date: ");
+  fprintf (f, "[unimplemented]");
+  fprintf (f, " (0x%lx)\n", dshb->dshb_mod_date);
+
+  fprintf (f, "       File Creator:  %.4s  Type: %.4s\n\n",
+	   dshb->dshb_file_creator, dshb->dshb_file_type);
+
+  fprintf (f, "Table Name   First Page    Page Count   Object Count\n");
+  fprintf (f, "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n");
+
+  bfd_sym_display_table_summary (f, &dshb->dshb_nte, "NTE");
+  bfd_sym_display_table_summary (f, &dshb->dshb_rte, "RTE");
+  bfd_sym_display_table_summary (f, &dshb->dshb_mte, "MTE");
+  bfd_sym_display_table_summary (f, &dshb->dshb_frte, "FRTE");
+  bfd_sym_display_table_summary (f, &dshb->dshb_cmte, "CMTE");
+  bfd_sym_display_table_summary (f, &dshb->dshb_cvte, "CVTE");
+  bfd_sym_display_table_summary (f, &dshb->dshb_csnte, "CSNTE");
+  bfd_sym_display_table_summary (f, &dshb->dshb_clte, "CLTE");
+  bfd_sym_display_table_summary (f, &dshb->dshb_ctte, "CTTE");
+  bfd_sym_display_table_summary (f, &dshb->dshb_tte, "TTE");
+  bfd_sym_display_table_summary (f, &dshb->dshb_tinfo, "TINFO");
+  bfd_sym_display_table_summary (f, &dshb->dshb_fite, "FITE");
+  bfd_sym_display_table_summary (f, &dshb->dshb_const, "CONST");
+
+  fprintf (f, "\n");
+}
+
+void
+bfd_sym_parse_resources_table_entry_v32 (unsigned char *buf,
+					 size_t len,
+					 bfd_sym_resources_table_entry *entry)
+{
+  BFD_ASSERT (len == 18);
+
+  memcpy (&entry->rte_res_type, buf, 4);
+  entry->rte_res_number = bfd_getb16 (buf + 4);
+  entry->rte_nte_index = bfd_getb32 (buf + 6);
+  entry->rte_mte_first = bfd_getb16 (buf + 10);
+  entry->rte_mte_last = bfd_getb16 (buf + 12);
+  entry->rte_res_size = bfd_getb32 (buf + 14);
+}
+
+void
+bfd_sym_parse_modules_table_entry_v33 (unsigned char *buf,
+				       size_t len,
+				       bfd_sym_modules_table_entry *entry)
+{
+  BFD_ASSERT (len == 46);
+
+  entry->mte_rte_index = bfd_getb16 (buf);
+  entry->mte_res_offset = bfd_getb32 (buf + 2);
+  entry->mte_size = bfd_getb32 (buf + 6);
+  entry->mte_kind = buf[10];
+  entry->mte_scope = buf[11];
+  entry->mte_parent = bfd_getb16 (buf + 12);
+  bfd_sym_parse_file_reference_v32 (buf + 14, 6, &entry->mte_imp_fref);
+  entry->mte_imp_end = bfd_getb32 (buf + 20);
+  entry->mte_nte_index = bfd_getb32 (buf + 24);
+  entry->mte_cmte_index = bfd_getb16 (buf + 28);
+  entry->mte_cvte_index = bfd_getb32 (buf + 30);
+  entry->mte_clte_index = bfd_getb16 (buf + 34);
+  entry->mte_ctte_index = bfd_getb16 (buf + 36);
+  entry->mte_csnte_idx_1 = bfd_getb32 (buf + 38);
+  entry->mte_csnte_idx_2 = bfd_getb32 (buf + 42);
+}
+
+void
+bfd_sym_parse_file_references_table_entry_v32 (unsigned char *buf,
+					       size_t len,
+					       bfd_sym_file_references_table_entry *entry)
+{
+  unsigned int type;
+
+  BFD_ASSERT (len == 10);
+
+  memset (entry, 0, sizeof (bfd_sym_file_references_table_entry));
+  type = bfd_getb16 (buf);
+
+  switch (type)
+    {
+    case BFD_SYM_END_OF_LIST_3_2:
+      entry->generic.type = BFD_SYM_END_OF_LIST;
+      break;
+
+    case BFD_SYM_FILE_NAME_INDEX_3_2:
+      entry->filename.type = BFD_SYM_FILE_NAME_INDEX;
+      entry->filename.nte_index = bfd_getb32 (buf + 2);
+      entry->filename.mod_date = bfd_getb32 (buf + 6);
+      break;
+
+    default:
+      entry->entry.mte_index = type;
+      entry->entry.file_offset = bfd_getb32 (buf + 2);
+    }
+}
+
+void
+bfd_sym_parse_contained_modules_table_entry_v32 (unsigned char *buf,
+						 size_t len,
+						 bfd_sym_contained_modules_table_entry *entry)
+{
+  unsigned int type;
+
+  BFD_ASSERT (len == 6);
+
+  memset (entry, 0, sizeof (bfd_sym_contained_modules_table_entry));
+  type = bfd_getb16 (buf);
+
+  switch (type)
+    {
+    case BFD_SYM_END_OF_LIST_3_2:
+      entry->generic.type = BFD_SYM_END_OF_LIST;
+      break;
+
+    default:
+      entry->entry.mte_index = type;
+      entry->entry.nte_index = bfd_getb32 (buf + 2);
+      break;
+    }
+}
+
+void
+bfd_sym_parse_contained_variables_table_entry_v32 (unsigned char *buf,
+						   size_t len,
+						   bfd_sym_contained_variables_table_entry *entry)
+{
+  unsigned int type;
+
+  BFD_ASSERT (len == 26);
+
+  memset (entry, 0, sizeof (bfd_sym_contained_variables_table_entry));
+  type = bfd_getb16 (buf);
+
+  switch (type)
+    {
+    case BFD_SYM_END_OF_LIST_3_2:
+      entry->generic.type = BFD_SYM_END_OF_LIST;
+      break;
+
+    case BFD_SYM_SOURCE_FILE_CHANGE_3_2:
+      entry->file.type = BFD_SYM_SOURCE_FILE_CHANGE;
+      bfd_sym_parse_file_reference_v32 (buf + 2, 6, &entry->file.fref);
+      break;
+
+    default:
+      entry->entry.tte_index = type;
+      entry->entry.nte_index = bfd_getb32 (buf + 2);
+      entry->entry.file_delta = bfd_getb16 (buf + 6);
+      entry->entry.scope = buf[8];
+      entry->entry.la_size = buf[9];
+
+      if (entry->entry.la_size == BFD_SYM_CVTE_SCA)
+	{
+	  entry->entry.address.scstruct.sca_kind = buf[10];
+	  entry->entry.address.scstruct.sca_class = buf[11];
+	  entry->entry.address.scstruct.sca_offset = bfd_getb32 (buf + 12);
+	}
+      else if (entry->entry.la_size <= BFD_SYM_CVTE_SCA)
+	{
+#if BFD_SYM_CVTE_SCA > 0
+	  memcpy (&entry->entry.address.lastruct.la, buf + 10,
+		  BFD_SYM_CVTE_SCA);
+#endif
+	  entry->entry.address.lastruct.la_kind = buf[23];
+	}
+      else if (entry->entry.la_size == BFD_SYM_CVTE_BIG_LA)
+	{
+	  entry->entry.address.biglastruct.big_la = bfd_getb32 (buf + 10);
+	  entry->entry.address.biglastruct.big_la_kind = buf[12];
+	}
+    }
+}
+
+void
+bfd_sym_parse_contained_statements_table_entry_v32 (unsigned char *buf,
+						    size_t len,
+						    bfd_sym_contained_statements_table_entry *entry)
+{
+  unsigned int type;
+
+  BFD_ASSERT (len == 8);
+
+  memset (entry, 0, sizeof (bfd_sym_contained_statements_table_entry));
+  type = bfd_getb16 (buf);
+
+  switch (type)
+    {
+    case BFD_SYM_END_OF_LIST_3_2:
+      entry->generic.type = BFD_SYM_END_OF_LIST;
+      break;
+
+    case BFD_SYM_SOURCE_FILE_CHANGE_3_2:
+      entry->file.type = BFD_SYM_SOURCE_FILE_CHANGE;
+      bfd_sym_parse_file_reference_v32 (buf + 2, 6, &entry->file.fref);
+      break;
+
+    default:
+      entry->entry.mte_index = type;
+      entry->entry.mte_offset = bfd_getb16 (buf + 2);
+      entry->entry.file_delta = bfd_getb32 (buf + 4);
+      break;
+    }
+}
+
+void
+bfd_sym_parse_contained_labels_table_entry_v32 (unsigned char *buf,
+						size_t len,
+						bfd_sym_contained_labels_table_entry *entry)
+{
+  unsigned int type;
+
+  BFD_ASSERT (len == 12);
+
+  memset (entry, 0, sizeof (bfd_sym_contained_labels_table_entry));
+  type = bfd_getb16 (buf);
+
+  switch (type)
+    {
+    case BFD_SYM_END_OF_LIST_3_2:
+      entry->generic.type = BFD_SYM_END_OF_LIST;
+      break;
+
+    case BFD_SYM_SOURCE_FILE_CHANGE_3_2:
+      entry->file.type = BFD_SYM_SOURCE_FILE_CHANGE;
+      bfd_sym_parse_file_reference_v32 (buf + 2, 6, &entry->file.fref);
+      break;
+
+    default:
+      entry->entry.mte_index = type;
+      entry->entry.mte_offset = bfd_getb16 (buf + 2);
+      entry->entry.nte_index = bfd_getb32 (buf + 4);
+      entry->entry.file_delta = bfd_getb16 (buf + 8);
+      entry->entry.scope = bfd_getb16 (buf + 10);
+      break;
+    }
+}
+
+void
+bfd_sym_parse_type_table_entry_v32 (unsigned char *buf,
+				    size_t len,
+				    bfd_sym_type_table_entry *entry)
+{
+  BFD_ASSERT (len == 4);
+
+  *entry = bfd_getb32 (buf);
+}
+
+int
+bfd_sym_fetch_resources_table_entry (bfd *abfd,
+				     bfd_sym_resources_table_entry *entry,
+				     unsigned long sym_index)
+{
+  void (*parser) (unsigned char *, size_t, bfd_sym_resources_table_entry *);
+  unsigned long offset;
+  unsigned long entry_size;
+  unsigned char buf[18];
+  bfd_sym_data_struct *sdata = NULL;
+
+  parser = NULL;
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  if (sym_index == 0)
+    return -1;
+
+  switch (sdata->version)
+    {
+    case BFD_SYM_VERSION_3_5:
+    case BFD_SYM_VERSION_3_4:
+      return -1;
+
+    case BFD_SYM_VERSION_3_3:
+    case BFD_SYM_VERSION_3_2:
+      entry_size = 18;
+      parser = bfd_sym_parse_resources_table_entry_v32;
+      break;
+
+    case BFD_SYM_VERSION_3_1:
+    default:
+      return -1;
+    }
+  if (parser == NULL)
+    return -1;
+
+  offset = compute_offset (sdata->header.dshb_rte.dti_first_page,
+			   sdata->header.dshb_page_size,
+			   entry_size, sym_index);
+
+  if (bfd_seek (abfd, offset, SEEK_SET) < 0)
+    return -1;
+  if (bfd_bread (buf, entry_size, abfd) != entry_size)
+    return -1;
+
+  (*parser) (buf, entry_size, entry);
+
+  return 0;
+}
+
+int
+bfd_sym_fetch_modules_table_entry (bfd *abfd,
+				   bfd_sym_modules_table_entry *entry,
+				   unsigned long sym_index)
+{
+  void (*parser) (unsigned char *, size_t, bfd_sym_modules_table_entry *);
+  unsigned long offset;
+  unsigned long entry_size;
+  unsigned char buf[46];
+  bfd_sym_data_struct *sdata = NULL;
+
+  parser = NULL;
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  if (sym_index == 0)
+    return -1;
+
+  switch (sdata->version)
+    {
+    case BFD_SYM_VERSION_3_5:
+    case BFD_SYM_VERSION_3_4:
+      return -1;
+
+    case BFD_SYM_VERSION_3_3:
+      entry_size = 46;
+      parser = bfd_sym_parse_modules_table_entry_v33;
+      break;
+
+    case BFD_SYM_VERSION_3_2:
+    case BFD_SYM_VERSION_3_1:
+    default:
+      return -1;
+    }
+  if (parser == NULL)
+    return -1;
+
+  offset = compute_offset (sdata->header.dshb_mte.dti_first_page,
+			   sdata->header.dshb_page_size,
+			   entry_size, sym_index);
+
+  if (bfd_seek (abfd, offset, SEEK_SET) < 0)
+    return -1;
+  if (bfd_bread (buf, entry_size, abfd) != entry_size)
+    return -1;
+
+  (*parser) (buf, entry_size, entry);
+
+  return 0;
+}
+
+int
+bfd_sym_fetch_file_references_table_entry (bfd *abfd,
+					   bfd_sym_file_references_table_entry *entry,
+					   unsigned long sym_index)
+{
+  void (*parser) (unsigned char *, size_t, bfd_sym_file_references_table_entry *);
+  unsigned long offset;
+  unsigned long entry_size = 0;
+  unsigned char buf[8];
+  bfd_sym_data_struct *sdata = NULL;
+
+  parser = NULL;
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  if (sym_index == 0)
+    return -1;
+
+  switch (sdata->version)
+    {
+    case BFD_SYM_VERSION_3_3:
+    case BFD_SYM_VERSION_3_2:
+      entry_size = 10;
+      parser = bfd_sym_parse_file_references_table_entry_v32;
+      break;
+
+    case BFD_SYM_VERSION_3_5:
+    case BFD_SYM_VERSION_3_4:
+    case BFD_SYM_VERSION_3_1:
+    default:
+      break;
+    }
+
+  if (parser == NULL)
+    return -1;
+
+  offset = compute_offset (sdata->header.dshb_frte.dti_first_page,
+			   sdata->header.dshb_page_size,
+			   entry_size, sym_index);
+
+  if (bfd_seek (abfd, offset, SEEK_SET) < 0)
+    return -1;
+  if (bfd_bread (buf, entry_size, abfd) != entry_size)
+    return -1;
+
+  (*parser) (buf, entry_size, entry);
+
+  return 0;
+}
+
+int
+bfd_sym_fetch_contained_modules_table_entry (bfd *abfd,
+					     bfd_sym_contained_modules_table_entry *entry,
+					     unsigned long sym_index)
+{
+  void (*parser) (unsigned char *, size_t, bfd_sym_contained_modules_table_entry *);
+  unsigned long offset;
+  unsigned long entry_size = 0;
+  unsigned char buf[6];
+  bfd_sym_data_struct *sdata = NULL;
+
+  parser = NULL;
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  if (sym_index == 0)
+    return -1;
+
+  switch (sdata->version)
+    {
+    case BFD_SYM_VERSION_3_3:
+    case BFD_SYM_VERSION_3_2:
+      entry_size = 6;
+      parser = bfd_sym_parse_contained_modules_table_entry_v32;
+      break;
+
+    case BFD_SYM_VERSION_3_5:
+    case BFD_SYM_VERSION_3_4:
+    case BFD_SYM_VERSION_3_1:
+    default:
+      break;
+    }
+
+  if (parser == NULL)
+    return -1;
+
+  offset = compute_offset (sdata->header.dshb_cmte.dti_first_page,
+			   sdata->header.dshb_page_size,
+			   entry_size, sym_index);
+
+  if (bfd_seek (abfd, offset, SEEK_SET) < 0)
+    return -1;
+  if (bfd_bread (buf, entry_size, abfd) != entry_size)
+    return -1;
+
+  (*parser) (buf, entry_size, entry);
+
+  return 0;
+}
+
+int
+bfd_sym_fetch_contained_variables_table_entry (bfd *abfd,
+					       bfd_sym_contained_variables_table_entry *entry,
+					       unsigned long sym_index)
+{
+  void (*parser) (unsigned char *, size_t, bfd_sym_contained_variables_table_entry *);
+  unsigned long offset;
+  unsigned long entry_size = 0;
+  unsigned char buf[26];
+  bfd_sym_data_struct *sdata = NULL;
+
+  parser = NULL;
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  if (sym_index == 0)
+    return -1;
+
+  switch (sdata->version)
+    {
+    case BFD_SYM_VERSION_3_3:
+    case BFD_SYM_VERSION_3_2:
+      entry_size = 26;
+      parser = bfd_sym_parse_contained_variables_table_entry_v32;
+      break;
+
+    case BFD_SYM_VERSION_3_5:
+    case BFD_SYM_VERSION_3_4:
+    case BFD_SYM_VERSION_3_1:
+    default:
+      break;
+    }
+
+  if (parser == NULL)
+    return -1;
+
+  offset = compute_offset (sdata->header.dshb_cvte.dti_first_page,
+			   sdata->header.dshb_page_size,
+			   entry_size, sym_index);
+
+  if (bfd_seek (abfd, offset, SEEK_SET) < 0)
+    return -1;
+  if (bfd_bread (buf, entry_size, abfd) != entry_size)
+    return -1;
+
+  (*parser) (buf, entry_size, entry);
+
+  return 0;
+}
+
+int
+bfd_sym_fetch_contained_statements_table_entry (bfd *abfd,
+						bfd_sym_contained_statements_table_entry *entry,
+						unsigned long sym_index)
+{
+  void (*parser) (unsigned char *, size_t, bfd_sym_contained_statements_table_entry *);
+  unsigned long offset;
+  unsigned long entry_size = 0;
+  unsigned char buf[8];
+  bfd_sym_data_struct *sdata = NULL;
+
+  parser = NULL;
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  if (sym_index == 0)
+    return -1;
+
+  switch (sdata->version)
+    {
+    case BFD_SYM_VERSION_3_3:
+    case BFD_SYM_VERSION_3_2:
+      entry_size = 8;
+      parser = bfd_sym_parse_contained_statements_table_entry_v32;
+      break;
+
+    case BFD_SYM_VERSION_3_5:
+    case BFD_SYM_VERSION_3_4:
+    case BFD_SYM_VERSION_3_1:
+    default:
+      break;
+    }
+
+  if (parser == NULL)
+    return -1;
+
+  offset = compute_offset (sdata->header.dshb_csnte.dti_first_page,
+			   sdata->header.dshb_page_size,
+			   entry_size, sym_index);
+
+  if (bfd_seek (abfd, offset, SEEK_SET) < 0)
+    return -1;
+  if (bfd_bread (buf, entry_size, abfd) != entry_size)
+    return -1;
+
+  (*parser) (buf, entry_size, entry);
+
+  return 0;
+}
+
+int
+bfd_sym_fetch_contained_labels_table_entry (bfd *abfd,
+					    bfd_sym_contained_labels_table_entry *entry,
+					    unsigned long sym_index)
+{
+  void (*parser) (unsigned char *, size_t, bfd_sym_contained_labels_table_entry *);
+  unsigned long offset;
+  unsigned long entry_size = 0;
+  unsigned char buf[12];
+  bfd_sym_data_struct *sdata = NULL;
+
+  parser = NULL;
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  if (sym_index == 0)
+    return -1;
+
+  switch (sdata->version)
+    {
+    case BFD_SYM_VERSION_3_3:
+    case BFD_SYM_VERSION_3_2:
+      entry_size = 12;
+      parser = bfd_sym_parse_contained_labels_table_entry_v32;
+      break;
+
+    case BFD_SYM_VERSION_3_5:
+    case BFD_SYM_VERSION_3_4:
+    case BFD_SYM_VERSION_3_1:
+    default:
+      break;
+    }
+
+  if (parser == NULL)
+    return -1;
+
+  offset = compute_offset (sdata->header.dshb_clte.dti_first_page,
+			   sdata->header.dshb_page_size,
+			   entry_size, sym_index);
+
+  if (bfd_seek (abfd, offset, SEEK_SET) < 0)
+    return -1;
+  if (bfd_bread (buf, entry_size, abfd) != entry_size)
+    return -1;
+
+  (*parser) (buf, entry_size, entry);
+
+  return 0;
+}
+
+int
+bfd_sym_fetch_contained_types_table_entry (bfd *abfd,
+					   bfd_sym_contained_types_table_entry *entry,
+					   unsigned long sym_index)
+{
+  void (*parser) (unsigned char *, size_t, bfd_sym_contained_types_table_entry *);
+  unsigned long offset;
+  unsigned long entry_size = 0;
+  unsigned char buf[0];
+  bfd_sym_data_struct *sdata = NULL;
+
+  parser = NULL;
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  if (sym_index == 0)
+    return -1;
+
+  switch (sdata->version)
+    {
+    case BFD_SYM_VERSION_3_3:
+    case BFD_SYM_VERSION_3_2:
+      entry_size = 0;
+      parser = NULL;
+      break;
+
+    case BFD_SYM_VERSION_3_5:
+    case BFD_SYM_VERSION_3_4:
+    case BFD_SYM_VERSION_3_1:
+    default:
+      break;
+    }
+
+  if (parser == NULL)
+    return -1;
+
+  offset = compute_offset (sdata->header.dshb_ctte.dti_first_page,
+			   sdata->header.dshb_page_size,
+			   entry_size, sym_index);
+
+  if (bfd_seek (abfd, offset, SEEK_SET) < 0)
+    return -1;
+  if (bfd_bread (buf, entry_size, abfd) != entry_size)
+    return -1;
+
+  (*parser) (buf, entry_size, entry);
+
+  return 0;
+}
+
+int
+bfd_sym_fetch_file_references_index_table_entry (bfd *abfd,
+						 bfd_sym_file_references_index_table_entry *entry,
+						 unsigned long sym_index)
+{
+  void (*parser) (unsigned char *, size_t, bfd_sym_file_references_index_table_entry *);
+  unsigned long offset;
+  unsigned long entry_size = 0;
+  unsigned char buf[0];
+  bfd_sym_data_struct *sdata = NULL;
+
+  parser = NULL;
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  if (sym_index == 0)
+    return -1;
+
+  switch (sdata->version)
+    {
+    case BFD_SYM_VERSION_3_3:
+    case BFD_SYM_VERSION_3_2:
+      entry_size = 0;
+      parser = NULL;
+      break;
+
+    case BFD_SYM_VERSION_3_5:
+    case BFD_SYM_VERSION_3_4:
+    case BFD_SYM_VERSION_3_1:
+    default:
+      break;
+    }
+
+  if (parser == NULL)
+    return -1;
+
+  offset = compute_offset (sdata->header.dshb_fite.dti_first_page,
+			   sdata->header.dshb_page_size,
+			   entry_size, sym_index);
+
+  if (bfd_seek (abfd, offset, SEEK_SET) < 0)
+    return -1;
+  if (bfd_bread (buf, entry_size, abfd) != entry_size)
+    return -1;
+
+  (*parser) (buf, entry_size, entry);
+
+  return 0;
+}
+
+int
+bfd_sym_fetch_constant_pool_entry (bfd *abfd,
+				   bfd_sym_constant_pool_entry *entry,
+				   unsigned long sym_index)
+{
+  void (*parser) (unsigned char *, size_t, bfd_sym_constant_pool_entry *);
+  unsigned long offset;
+  unsigned long entry_size = 0;
+  unsigned char buf[0];
+  bfd_sym_data_struct *sdata = NULL;
+
+  parser = NULL;
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  if (sym_index == 0)
+    return -1;
+
+  switch (sdata->version)
+    {
+    case BFD_SYM_VERSION_3_3:
+    case BFD_SYM_VERSION_3_2:
+      entry_size = 0;
+      parser = NULL;
+      break;
+
+    case BFD_SYM_VERSION_3_5:
+    case BFD_SYM_VERSION_3_4:
+    case BFD_SYM_VERSION_3_1:
+    default:
+      break;
+    }
+
+  if (parser == NULL)
+    return -1;
+
+  offset = compute_offset (sdata->header.dshb_fite.dti_first_page,
+			   sdata->header.dshb_page_size,
+			   entry_size, sym_index);
+
+  if (bfd_seek (abfd, offset, SEEK_SET) < 0)
+    return -1;
+  if (bfd_bread (buf, entry_size, abfd) != entry_size)
+    return -1;
+
+  (*parser) (buf, entry_size, entry);
+
+  return 0;
+}
+
+int
+bfd_sym_fetch_type_table_entry (bfd *abfd,
+				bfd_sym_type_table_entry *entry,
+				unsigned long sym_index)
+{
+  void (*parser) (unsigned char *, size_t, bfd_sym_type_table_entry *);
+  unsigned long offset;
+  unsigned long entry_size = 0;
+  unsigned char buf[4];
+  bfd_sym_data_struct *sdata = NULL;
+
+  parser = NULL;
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  switch (sdata->version)
+    {
+    case BFD_SYM_VERSION_3_3:
+    case BFD_SYM_VERSION_3_2:
+      entry_size = 4;
+      parser = bfd_sym_parse_type_table_entry_v32;
+      break;
+
+    case BFD_SYM_VERSION_3_5:
+    case BFD_SYM_VERSION_3_4:
+    case BFD_SYM_VERSION_3_1:
+    default:
+      break;
+    }
+
+  if (parser == NULL)
+    return -1;
+
+  offset = compute_offset (sdata->header.dshb_tte.dti_first_page,
+			   sdata->header.dshb_page_size,
+			   entry_size, sym_index);
+
+  if (bfd_seek (abfd, offset, SEEK_SET) < 0)
+    return -1;
+  if (bfd_bread (buf, entry_size, abfd) != entry_size)
+    return -1;
+
+  (*parser) (buf, entry_size, entry);
+
+  return 0;
+}
+
+int
+bfd_sym_fetch_type_information_table_entry (bfd *abfd,
+					    bfd_sym_type_information_table_entry *entry,
+					    unsigned long offset)
+{
+  unsigned char buf[4];
+
+  BFD_ASSERT (bfd_sym_valid (abfd));
+
+  if (offset == 0)
+    return -1;
+
+  if (bfd_seek (abfd, offset, SEEK_SET) < 0)
+    return -1;
+
+  if (bfd_bread (buf, 4, abfd) != 4)
+    return -1;
+  entry->nte_index = bfd_getb32 (buf);
+
+  if (bfd_bread (buf, 2, abfd) != 2)
+    return -1;
+  entry->physical_size = bfd_getb16 (buf);
+
+  if (entry->physical_size & 0x8000)
+    {
+      if (bfd_bread (buf, 4, abfd) != 4)
+	return -1;
+      entry->physical_size &= 0x7fff;
+      entry->logical_size = bfd_getb32 (buf);
+      entry->offset = offset + 10;
+    }
+  else
+    {
+      if (bfd_bread (buf, 2, abfd) != 2)
+	return -1;
+      entry->physical_size &= 0x7fff;
+      entry->logical_size = bfd_getb16 (buf);
+      entry->offset = offset + 8;
+    }
+
+  return 0;
+}
+
+int
+bfd_sym_fetch_type_table_information (bfd *abfd,
+				      bfd_sym_type_information_table_entry *entry,
+				      unsigned long sym_index)
+{
+  bfd_sym_type_table_entry tindex;
+  bfd_sym_data_struct *sdata = NULL;
+
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  if (sdata->header.dshb_tte.dti_object_count <= 99)
+    return -1;
+  if (sym_index < 100)
+    return -1;
+
+  if (bfd_sym_fetch_type_table_entry (abfd, &tindex, sym_index - 100) < 0)
+    return -1;
+  if (bfd_sym_fetch_type_information_table_entry (abfd, entry, tindex) < 0)
+    return -1;
+
+  return 0;
+}
+
+const unsigned char *
+bfd_sym_symbol_name (bfd *abfd, unsigned long sym_index)
+{
+  bfd_sym_data_struct *sdata = NULL;
+
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  if (sym_index == 0)
+    return (const unsigned char *) "";
+
+  sym_index *= 2;
+  if ((sym_index / sdata->header.dshb_page_size)
+      > sdata->header.dshb_nte.dti_page_count)
+    return (const unsigned char *) "\09[INVALID]";
+
+  return (const unsigned char *) sdata->name_table + sym_index;
+}
+
+const unsigned char *
+bfd_sym_module_name (bfd *abfd, unsigned long sym_index)
+{
+  bfd_sym_modules_table_entry entry;
+
+  if (bfd_sym_fetch_modules_table_entry (abfd, &entry, sym_index) < 0)
+    return (const unsigned char *) "\09[INVALID]";
+
+  return bfd_sym_symbol_name (abfd, entry.mte_nte_index);
+}
+
+const char *
+bfd_sym_unparse_storage_kind (enum bfd_sym_storage_kind kind)
+{
+  switch (kind)
+    {
+    case BFD_SYM_STORAGE_KIND_LOCAL: return "LOCAL";
+    case BFD_SYM_STORAGE_KIND_VALUE: return "VALUE";
+    case BFD_SYM_STORAGE_KIND_REFERENCE: return "REFERENCE";
+    case BFD_SYM_STORAGE_KIND_WITH: return "WITH";
+    default: return "[UNKNOWN]";
+    }
+}
+
+const char *
+bfd_sym_unparse_storage_class (enum bfd_sym_storage_class kind)
+{
+  switch (kind)
+    {
+    case BFD_SYM_STORAGE_CLASS_REGISTER: return "REGISTER";
+    case BFD_SYM_STORAGE_CLASS_GLOBAL: return "GLOBAL";
+    case BFD_SYM_STORAGE_CLASS_FRAME_RELATIVE: return "FRAME_RELATIVE";
+    case BFD_SYM_STORAGE_CLASS_STACK_RELATIVE: return "STACK_RELATIVE";
+    case BFD_SYM_STORAGE_CLASS_ABSOLUTE: return "ABSOLUTE";
+    case BFD_SYM_STORAGE_CLASS_CONSTANT: return "CONSTANT";
+    case BFD_SYM_STORAGE_CLASS_RESOURCE: return "RESOURCE";
+    case BFD_SYM_STORAGE_CLASS_BIGCONSTANT: return "BIGCONSTANT";
+    default: return "[UNKNOWN]";
+    }
+}
+
+const char *
+bfd_sym_unparse_module_kind (enum bfd_sym_module_kind kind)
+{
+  switch (kind)
+    {
+    case BFD_SYM_MODULE_KIND_NONE: return "NONE";
+    case BFD_SYM_MODULE_KIND_PROGRAM: return "PROGRAM";
+    case BFD_SYM_MODULE_KIND_UNIT: return "UNIT";
+    case BFD_SYM_MODULE_KIND_PROCEDURE: return "PROCEDURE";
+    case BFD_SYM_MODULE_KIND_FUNCTION: return "FUNCTION";
+    case BFD_SYM_MODULE_KIND_DATA: return "DATA";
+    case BFD_SYM_MODULE_KIND_BLOCK: return "BLOCK";
+    default: return "[UNKNOWN]";
+    }
+}
+
+const char *
+bfd_sym_unparse_symbol_scope (enum bfd_sym_symbol_scope scope)
+{
+  switch (scope)
+    {
+    case BFD_SYM_SYMBOL_SCOPE_LOCAL: return "LOCAL";
+    case BFD_SYM_SYMBOL_SCOPE_GLOBAL: return "GLOBAL";
+    default:
+      return "[UNKNOWN]";
+    }
+}
+
+void
+bfd_sym_print_file_reference (bfd *abfd,
+			      FILE *f,
+			      bfd_sym_file_reference *entry)
+{
+  bfd_sym_file_references_table_entry frtentry;
+  int ret;
+
+  ret = bfd_sym_fetch_file_references_table_entry (abfd, &frtentry,
+						   entry->fref_frte_index);
+  fprintf (f, "FILE ");
+
+  if ((ret < 0) || (frtentry.generic.type != BFD_SYM_FILE_NAME_INDEX))
+    fprintf (f, "[INVALID]");
+  else
+    fprintf (f, "\"%.*s\"",
+	     bfd_sym_symbol_name (abfd, frtentry.filename.nte_index)[0],
+	     &bfd_sym_symbol_name (abfd, frtentry.filename.nte_index)[1]);
+
+  fprintf (f, " (FRTE %lu)", entry->fref_frte_index);
+}
+
+void
+bfd_sym_print_resources_table_entry (bfd *abfd,
+				     FILE *f,
+				     bfd_sym_resources_table_entry *entry)
+{
+  fprintf (f, " \"%.*s\" (NTE %lu), type \"%.4s\", num %u, size %lu, MTE %lu -- %lu",
+	   bfd_sym_symbol_name (abfd, entry->rte_nte_index)[0],
+	   &bfd_sym_symbol_name (abfd, entry->rte_nte_index)[1],
+	   entry->rte_nte_index, entry->rte_res_type, entry->rte_res_number,
+	   entry->rte_res_size, entry->rte_mte_first, entry->rte_mte_last);
+}
+
+void
+bfd_sym_print_modules_table_entry (bfd *abfd,
+				   FILE *f,
+				   bfd_sym_modules_table_entry *entry)
+{
+  fprintf (f, "\"%.*s\" (NTE %lu)",
+	   bfd_sym_symbol_name (abfd, entry->mte_nte_index)[0],
+	   &bfd_sym_symbol_name (abfd, entry->mte_nte_index)[1],
+	   entry->mte_nte_index);
+
+  fprintf (f, "\n            ");
+
+  bfd_sym_print_file_reference (abfd, f, &entry->mte_imp_fref);
+  fprintf (f, " range %lu -- %lu",
+	   entry->mte_imp_fref.fref_offset, entry->mte_imp_end);
+
+  fprintf (f, "\n            ");
+
+  fprintf (f, "kind %s", bfd_sym_unparse_module_kind (entry->mte_kind));
+  fprintf (f, ", scope %s", bfd_sym_unparse_symbol_scope (entry->mte_scope));
+
+  fprintf (f, ", RTE %lu, offset %lu, size %lu",
+	   entry->mte_rte_index, entry->mte_res_offset, entry->mte_size);
+
+  fprintf (f, "\n            ");
+
+  fprintf (f, "CMTE %lu, CVTE %lu, CLTE %lu, CTTE %lu, CSNTE1 %lu, CSNTE2 %lu",
+	   entry->mte_cmte_index, entry->mte_cvte_index,
+	   entry->mte_clte_index, entry->mte_ctte_index,
+	   entry->mte_csnte_idx_1, entry->mte_csnte_idx_2);
+
+  if (entry->mte_parent != 0)
+    fprintf (f, ", parent %lu", entry->mte_parent);
+  else
+    fprintf (f, ", no parent");
+
+  if (entry->mte_cmte_index != 0)
+    fprintf (f, ", child %lu", entry->mte_cmte_index);
+  else
+    fprintf (f, ", no child");
+}
+
+void
+bfd_sym_print_file_references_table_entry (bfd *abfd,
+					   FILE *f,
+					   bfd_sym_file_references_table_entry *entry)
+{
+  switch (entry->generic.type)
+    {
+    case BFD_SYM_FILE_NAME_INDEX:
+      fprintf (f, "FILE \"%.*s\" (NTE %lu), modtime ",
+	       bfd_sym_symbol_name (abfd, entry->filename.nte_index)[0],
+	       &bfd_sym_symbol_name (abfd, entry->filename.nte_index)[1],
+	       entry->filename.nte_index);
+
+      fprintf (f, "[UNIMPLEMENTED]");
+      /* printModDate (entry->filename.mod_date); */
+      fprintf (f, " (0x%lx)", entry->filename.mod_date);
+      break;
+
+    case BFD_SYM_END_OF_LIST:
+      fprintf (f, "END");
+      break;
+
+    default:
+      fprintf (f, "\"%.*s\" (MTE %lu), offset %lu",
+	       bfd_sym_module_name (abfd, entry->entry.mte_index)[0],
+	       &bfd_sym_module_name (abfd, entry->entry.mte_index)[1],
+	       entry->entry.mte_index,
+	       entry->entry.file_offset);
+      break;
+    }
+}
+
+void
+bfd_sym_print_contained_modules_table_entry (bfd *abfd,
+					     FILE *f,
+					     bfd_sym_contained_modules_table_entry *entry)
+{
+  switch (entry->generic.type)
+    {
+    case BFD_SYM_END_OF_LIST:
+      fprintf (f, "END");
+      break;
+
+    default:
+      fprintf (f, "\"%.*s\" (MTE %lu, NTE %lu)",
+	       bfd_sym_module_name (abfd, entry->entry.mte_index)[0],
+	       &bfd_sym_module_name (abfd, entry->entry.mte_index)[1],
+	       entry->entry.mte_index,
+	       entry->entry.nte_index);
+      break;
+    }
+}
+
+void
+bfd_sym_print_contained_variables_table_entry (bfd *abfd,
+					       FILE *f,
+					       bfd_sym_contained_variables_table_entry *entry)
+{
+  if (entry->generic.type == BFD_SYM_END_OF_LIST)
+    {
+      fprintf (f, "END");
+      return;
+    }
+
+  if (entry->generic.type == BFD_SYM_SOURCE_FILE_CHANGE)
+    {
+      bfd_sym_print_file_reference (abfd, f, &entry->file.fref);
+      fprintf (f, " offset %lu", entry->file.fref.fref_offset);
+      return;
+    }
+
+  fprintf (f, "\"%.*s\" (NTE %lu)",
+	   bfd_sym_symbol_name (abfd, entry->entry.nte_index)[0],
+	   &bfd_sym_symbol_name (abfd, entry->entry.nte_index)[1],
+	   entry->entry.nte_index);
+
+  fprintf (f, ", TTE %lu", entry->entry.tte_index);
+  fprintf (f, ", offset %lu", entry->entry.file_delta);
+  fprintf (f, ", scope %s", bfd_sym_unparse_symbol_scope (entry->entry.scope));
+
+  if (entry->entry.la_size == BFD_SYM_CVTE_SCA)
+    fprintf (f, ", latype %s, laclass %s, laoffset %lu",
+	     bfd_sym_unparse_storage_kind (entry->entry.address.scstruct.sca_kind),
+	     bfd_sym_unparse_storage_class (entry->entry.address.scstruct.sca_class),
+	     entry->entry.address.scstruct.sca_offset);
+  else if (entry->entry.la_size <= BFD_SYM_CVTE_LA_MAX_SIZE)
+    {
+      unsigned long i;
+
+      fprintf (f, ", la [");
+      for (i = 0; i < entry->entry.la_size; i++)
+	fprintf (f, "0x%02x ", entry->entry.address.lastruct.la[i]);
+      fprintf (f, "]");
+    }
+  else if (entry->entry.la_size == BFD_SYM_CVTE_BIG_LA)
+    fprintf (f, ", bigla %lu, biglakind %u",
+	     entry->entry.address.biglastruct.big_la,
+	     entry->entry.address.biglastruct.big_la_kind);
+
+  else
+    fprintf (f, ", la [INVALID]");
+}
+
+void
+bfd_sym_print_contained_statements_table_entry (bfd *abfd,
+						FILE *f,
+						bfd_sym_contained_statements_table_entry *entry)
+{
+  if (entry->generic.type == BFD_SYM_END_OF_LIST)
+    {
+      fprintf (f, "END");
+      return;
+    }
+
+  if (entry->generic.type == BFD_SYM_SOURCE_FILE_CHANGE)
+    {
+      bfd_sym_print_file_reference (abfd, f, &entry->file.fref);
+      fprintf (f, " offset %lu", entry->file.fref.fref_offset);
+      return;
+    }
+
+  fprintf (f, "\"%.*s\" (MTE %lu), offset %lu, delta %lu",
+	   bfd_sym_module_name (abfd, entry->entry.mte_index)[0],
+	   &bfd_sym_module_name (abfd, entry->entry.mte_index)[1],
+	   entry->entry.mte_index,
+	   entry->entry.mte_offset,
+	   entry->entry.file_delta);
+}
+
+void
+bfd_sym_print_contained_labels_table_entry (bfd *abfd,
+					    FILE *f,
+					    bfd_sym_contained_labels_table_entry *entry)
+{
+  if (entry->generic.type == BFD_SYM_END_OF_LIST)
+    {
+      fprintf (f, "END");
+      return;
+    }
+
+  if (entry->generic.type == BFD_SYM_SOURCE_FILE_CHANGE)
+    {
+      bfd_sym_print_file_reference (abfd, f, &entry->file.fref);
+      fprintf (f, " offset %lu", entry->file.fref.fref_offset);
+      return;
+    }
+
+  fprintf (f, "\"%.*s\" (MTE %lu), offset %lu, delta %lu, scope %s",
+	   bfd_sym_module_name (abfd, entry->entry.mte_index)[0],
+	   &bfd_sym_module_name (abfd, entry->entry.mte_index)[1],
+	   entry->entry.mte_index,
+	   entry->entry.mte_offset,
+	   entry->entry.file_delta,
+	   bfd_sym_unparse_symbol_scope (entry->entry.scope));
+}
+
+void
+bfd_sym_print_contained_types_table_entry (bfd *abfd ATTRIBUTE_UNUSED,
+					   FILE *f,
+					   bfd_sym_contained_types_table_entry *entry ATTRIBUTE_UNUSED)
+{
+  fprintf (f, "[UNIMPLEMENTED]");
+}
+
+const char *
+bfd_sym_type_operator_name (unsigned char num)
+{
+  switch (num)
+    {
+    case 1: return "TTE";
+    case 2: return "PointerTo";
+    case 3: return "ScalarOf";
+    case 4: return "ConstantOf";
+    case 5: return "EnumerationOf";
+    case 6: return "VectorOf";
+    case 7: return "RecordOf";
+    case 8: return "UnionOf";
+    case 9: return "SubRangeOf";
+    case 10: return "SetOf";
+    case 11: return "NamedTypeOf";
+    case 12: return "ProcOf";
+    case 13: return "ValueOf";
+    case 14: return "ArrayOf";
+    default: return "[UNKNOWN OPERATOR]";
+    }
+}
+
+const char *
+bfd_sym_type_basic_name (unsigned char num)
+{
+  switch (num)
+    {
+    case 0: return "void";
+    case 1: return "pascal string";
+    case 2: return "unsigned long";
+    case 3: return "signed long";
+    case 4: return "extended (10 bytes)";
+    case 5: return "pascal boolean (1 byte)";
+    case 6: return "unsigned byte";
+    case 7: return "signed byte";
+    case 8: return "character (1 byte)";
+    case 9: return "wide character (2 bytes)";
+    case 10: return "unsigned short";
+    case 11: return "signed short";
+    case 12: return "singled";
+    case 13: return "double";
+    case 14: return "extended (12 bytes)";
+    case 15: return "computational (8 bytes)";
+    case 16: return "c string";
+    case 17: return "as-is string";
+    default: return "[UNKNOWN BASIC TYPE]";
+    }
+}
+
+int
+bfd_sym_fetch_long (unsigned char *buf,
+		    unsigned long len,
+		    unsigned long offset,
+		    unsigned long *offsetptr,
+		    long *value)
+{
+  int ret;
+
+  if (offset >= len)
+    {
+      *value = 0;
+      offset += 0;
+      ret = -1;
+    }
+  else if (! (buf[offset] & 0x80))
+    {
+      *value = buf[offset];
+      offset += 1;
+      ret = 0;
+    }
+  else if (buf[offset] == 0xc0)
+    {
+      if ((offset + 5) > len)
+	{
+	  *value = 0;
+	  offset = len;
+	  ret = -1;
+	}
+      else
+	{
+	  *value = bfd_getb32 (buf + offset + 1);
+	  offset += 5;
+	  ret = 0;
+	}
+    }
+  else if ((buf[offset] & 0xc0) == 0xc0)
+    {
+      *value =  -(buf[offset] & 0x3f);
+      offset += 1;
+      ret = 0;
+    }
+  else if ((buf[offset] & 0xc0) == 0x80)
+    {
+      if ((offset + 2) > len)
+	{
+	  *value = 0;
+	  offset = len;
+	  ret = -1;
+	}
+      else
+	{
+	  *value = bfd_getb16 (buf + offset) & 0x3fff;
+	  offset += 2;
+	  ret = 0;
+	}
+    }
+  else
+    abort ();
+
+  if (offsetptr != NULL)
+    *offsetptr = offset;
+
+  return ret;
+}
+
+void
+bfd_sym_print_type_information (bfd *abfd,
+				FILE *f,
+				unsigned char *buf,
+				unsigned long len,
+				unsigned long offset,
+				unsigned long *offsetptr)
+{
+  unsigned int type;
+
+  if (offset >= len)
+    {
+      fprintf (f, "[NULL]");
+
+      if (offsetptr != NULL)
+	*offsetptr = offset;
+      return;
+  }
+
+  type = buf[offset];
+  offset++;
+
+  if (! (type & 0x80))
+    {
+      fprintf (f, "[%s] (0x%x)", bfd_sym_type_basic_name (type & 0x7f), type);
+
+      if (offsetptr != NULL)
+	*offsetptr = offset;
+      return;
+    }
+
+  if (type & 0x40)
+    fprintf (f, "[packed ");
+  else
+    fprintf (f, "[");
+
+  switch (type & 0x3f)
+    {
+    case 1:
+      {
+	long value;
+	bfd_sym_type_information_table_entry tinfo;
+
+	bfd_sym_fetch_long (buf, len, offset, &offset, &value);
+	if (value <= 0)
+	  fprintf (f, "[INVALID]");
+	else
+	  {
+	    if (bfd_sym_fetch_type_table_information (abfd, &tinfo, value) < 0)
+	      fprintf (f, "[INVALID]");
+	    else
+	      fprintf (f, "\"%.*s\"",
+		       bfd_sym_symbol_name (abfd, tinfo.nte_index)[0],
+		       &bfd_sym_symbol_name (abfd, tinfo.nte_index)[1]);
+	  }
+	fprintf (f, " (TTE %lu)", (unsigned long) value);
+	break;
+      }
+
+    case 2:
+      fprintf (f, "pointer (0x%x) to ", type);
+      bfd_sym_print_type_information (abfd, f, buf, len, offset, &offset);
+      break;
+
+    case 3:
+      {
+	long value;
+
+	fprintf (f, "scalar (0x%x) of ", type);
+	bfd_sym_print_type_information (abfd, f, buf, len, offset, &offset);
+	bfd_sym_fetch_long (buf, len, offset, &offset, &value);
+	fprintf (f, " (%lu)", (unsigned long) value);
+	break;
+      }
+
+    case 5:
+      {
+	long lower, upper, nelem;
+	int i;
+
+	fprintf (f, "enumeration (0x%x) of ", type);
+	bfd_sym_print_type_information (abfd, f, buf, len, offset, &offset);
+	bfd_sym_fetch_long (buf, len, offset, &offset, &lower);
+	bfd_sym_fetch_long (buf, len, offset, &offset, &upper);
+	bfd_sym_fetch_long (buf, len, offset, &offset, &nelem);
+	fprintf (f, " from %lu to %lu with %lu elements: ",
+		 (unsigned long) lower, (unsigned long) upper,
+		 (unsigned long) nelem);
+
+	for (i = 0; i < nelem; i++)
+	  {
+	    fprintf (f, "\n                    ");
+	    bfd_sym_print_type_information (abfd, f, buf, len, offset, &offset);
+	  }
+	break;
+      }
+
+    case 6:
+      fprintf (f, "vector (0x%x)", type);
+      fprintf (f, "\n                index ");
+      bfd_sym_print_type_information (abfd, f, buf, len, offset, &offset);
+      fprintf (f, "\n                target ");
+      bfd_sym_print_type_information (abfd, f, buf, len, offset, &offset);
+      break;
+
+    case 7:
+    case 8:
+      {
+	long nrec, eloff, i;
+
+	if ((type & 0x3f) == 7)
+	  fprintf (f, "record (0x%x) of ", type);
+	else
+	  fprintf (f, "union (0x%x) of ", type);
+
+	bfd_sym_fetch_long (buf, len, offset, &offset, &nrec);
+	fprintf (f, "%lu elements: ", (unsigned long) nrec);
+
+	for (i = 0; i < nrec; i++)
+	  {
+	    bfd_sym_fetch_long (buf, len, offset, &offset, &eloff);
+	    fprintf (f, "\n                ");
+	    fprintf (f, "offset %lu: ", (unsigned long) eloff);
+	    bfd_sym_print_type_information (abfd, f, buf, len, offset, &offset);
+	  }
+	break;
+      }
+
+    case 9:
+      fprintf (f, "subrange (0x%x) of ", type);
+      bfd_sym_print_type_information (abfd, f, buf, len, offset, &offset);
+      fprintf (f, " lower ");
+      bfd_sym_print_type_information (abfd, f, buf, len, offset, &offset);
+      fprintf (f, " upper ");
+      bfd_sym_print_type_information (abfd, f, buf, len, offset, &offset);
+      break;
+
+  case 11:
+    {
+      long value;
+
+      fprintf (f, "named type (0x%x) ", type);
+      bfd_sym_fetch_long (buf, len, offset, &offset, &value);
+      if (value <= 0)
+	fprintf (f, "[INVALID]");
+      else
+	fprintf (f, "\"%.*s\"",
+		 bfd_sym_symbol_name (abfd, value)[0],
+		 &bfd_sym_symbol_name (abfd, value)[1]);
+
+      fprintf (f, " (NTE %lu) with type ", (unsigned long) value);
+      bfd_sym_print_type_information (abfd, f, buf, len, offset, &offset);
+      break;
+    }
+
+  default:
+    fprintf (f, "%s (0x%x)", bfd_sym_type_operator_name (type), type);
+    break;
+    }
+
+  if (type == (0x40 | 0x6))
+    {
+      /* Vector.  */
+      long n, width, m;
+      long l;
+      long i;
+
+      bfd_sym_fetch_long (buf, len, offset, &offset, &n);
+      bfd_sym_fetch_long (buf, len, offset, &offset, &width);
+      bfd_sym_fetch_long (buf, len, offset, &offset, &m);
+      /* fprintf (f, "\n                "); */
+      fprintf (f, " N %ld, width %ld, M %ld, ", n, width, m);
+      for (i = 0; i < m; i++)
+	{
+	  bfd_sym_fetch_long (buf, len, offset, &offset, &l);
+	  if (i != 0)
+	    fprintf (f, " ");
+	  fprintf (f, "%ld", l);
+	}
+    }
+  else  if (type & 0x40)
+    {
+      /* Other packed type.  */
+      long msb, lsb;
+
+      bfd_sym_fetch_long (buf, len, offset, &offset, &msb);
+      bfd_sym_fetch_long (buf, len, offset, &offset, &lsb);
+      /* fprintf (f, "\n                "); */
+      fprintf (f, " msb %ld, lsb %ld", msb, lsb);
+    }
+
+  fprintf (f, "]");
+
+  if (offsetptr != NULL)
+    *offsetptr = offset;
+}
+
+void
+bfd_sym_print_type_information_table_entry (bfd *abfd,
+					    FILE *f,
+					    bfd_sym_type_information_table_entry *entry)
+{
+  unsigned char *buf;
+  unsigned long offset;
+  unsigned int i;
+
+  fprintf (f, "\"%.*s\" (NTE %lu), %lu bytes at %lu, logical size %lu",
+	   bfd_sym_symbol_name (abfd, entry->nte_index)[0],
+	   &bfd_sym_symbol_name (abfd, entry->nte_index)[1],
+	   entry->nte_index,
+	   entry->physical_size, entry->offset, entry->logical_size);
+
+  fprintf (f, "\n            ");
+
+  buf = alloca (entry->physical_size);
+  if (buf == NULL)
+    {
+      fprintf (f, "[ERROR]\n");
+      return;
+    }
+  if (bfd_seek (abfd, entry->offset, SEEK_SET) < 0)
+    {
+      fprintf (f, "[ERROR]\n");
+      return;
+    }
+  if (bfd_bread (buf, entry->physical_size, abfd) != entry->physical_size)
+    {
+      fprintf (f, "[ERROR]\n");
+      return;
+    }
+
+  fprintf (f, "[");
+  for (i = 0; i < entry->physical_size; i++)
+    {
+      if (i == 0)
+	fprintf (f, "0x%02x", buf[i]);
+      else
+	fprintf (f, " 0x%02x", buf[i]);
+    }
+
+  fprintf (f, "]");
+  fprintf (f, "\n            ");
+
+  bfd_sym_print_type_information (abfd, f, buf, entry->physical_size, 0, &offset);
+
+  if (offset != entry->physical_size)
+    fprintf (f, "\n            [parser used %lu bytes instead of %lu]", offset, entry->physical_size);
+}
+
+void
+bfd_sym_print_file_references_index_table_entry (bfd *abfd ATTRIBUTE_UNUSED,
+						 FILE *f,
+						 bfd_sym_file_references_index_table_entry *entry ATTRIBUTE_UNUSED)
+{
+  fprintf (f, "[UNIMPLEMENTED]");
+}
+
+void
+bfd_sym_print_constant_pool_entry (bfd *abfd ATTRIBUTE_UNUSED,
+				   FILE *f,
+				   bfd_sym_constant_pool_entry *entry ATTRIBUTE_UNUSED)
+{
+  fprintf (f, "[UNIMPLEMENTED]");
+}
+
+unsigned char *
+bfd_sym_display_name_table_entry (bfd *abfd,
+				  FILE *f,
+				  unsigned char *entry)
+{
+  unsigned long sym_index;
+  unsigned long offset;
+  bfd_sym_data_struct *sdata = NULL;
+
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+  sym_index = (entry - sdata->name_table) / 2;
+
+  if (sdata->version >= BFD_SYM_VERSION_3_4 && entry[0] == 255 && entry[1] == 0)
+    {
+      unsigned short length = bfd_getb16 (entry + 2);
+      fprintf (f, "[%8lu] \"%.*s\"\n", sym_index, length, entry + 4);
+      offset = 2 + length + 1;
+    }
+  else
+    {
+      if (! (entry[0] == 0 || (entry[0] == 1 && entry[1] == '\0')))
+	fprintf (f, "[%8lu] \"%.*s\"\n", sym_index, entry[0], entry + 1);
+
+      if (sdata->version >= BFD_SYM_VERSION_3_4)
+	offset = entry[0] + 2;
+      else
+	offset = entry[0] + 1;
+    }
+
+  return (entry + offset + (offset % 2));
+}
+
+void
+bfd_sym_display_name_table (bfd *abfd, FILE *f)
+{
+  unsigned long name_table_len;
+  unsigned char *name_table, *name_table_end, *cur;
+  bfd_sym_data_struct *sdata = NULL;
+
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  name_table_len = sdata->header.dshb_nte.dti_page_count * sdata->header.dshb_page_size;
+  name_table = sdata->name_table;
+  name_table_end = name_table + name_table_len;
+
+  fprintf (f, "name table (NTE) contains %lu bytes:\n\n", name_table_len);
+
+  cur = name_table;
+  for (;;)
+    {
+      cur = bfd_sym_display_name_table_entry (abfd, f, cur);
+      if (cur >= name_table_end)
+	break;
+    }
+}
+
+void
+bfd_sym_display_resources_table (bfd *abfd, FILE *f)
+{
+  unsigned long i;
+  bfd_sym_resources_table_entry entry;
+  bfd_sym_data_struct *sdata = NULL;
+
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  fprintf (f, "resource table (RTE) contains %lu objects:\n\n",
+	   sdata->header.dshb_rte.dti_object_count);
+
+  for (i = 1; i <= sdata->header.dshb_rte.dti_object_count; i++)
+    {
+      if (bfd_sym_fetch_resources_table_entry (abfd, &entry, i) < 0)
+	fprintf (f, " [%8lu] [INVALID]\n", i);
+      else
+	{
+	  fprintf (f, " [%8lu] ", i);
+	  bfd_sym_print_resources_table_entry (abfd, f, &entry);
+	  fprintf (f, "\n");
+	}
+    }
+}
+
+void
+bfd_sym_display_modules_table (bfd *abfd, FILE *f)
+{
+  unsigned long i;
+  bfd_sym_modules_table_entry entry;
+  bfd_sym_data_struct *sdata = NULL;
+
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  fprintf (f, "module table (MTE) contains %lu objects:\n\n",
+	   sdata->header.dshb_mte.dti_object_count);
+
+  for (i = 1; i <= sdata->header.dshb_mte.dti_object_count; i++)
+    {
+      if (bfd_sym_fetch_modules_table_entry (abfd, &entry, i) < 0)
+	fprintf (f, " [%8lu] [INVALID]\n", i);
+      else
+	{
+	  fprintf (f, " [%8lu] ", i);
+	  bfd_sym_print_modules_table_entry (abfd, f, &entry);
+	  fprintf (f, "\n");
+	}
+    }
+}
+
+void
+bfd_sym_display_file_references_table (bfd *abfd, FILE *f)
+{
+  unsigned long i;
+  bfd_sym_file_references_table_entry entry;
+  bfd_sym_data_struct *sdata = NULL;
+
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  fprintf (f, "file reference table (FRTE) contains %lu objects:\n\n",
+	   sdata->header.dshb_frte.dti_object_count);
+
+  for (i = 1; i <= sdata->header.dshb_frte.dti_object_count; i++)
+    {
+      if (bfd_sym_fetch_file_references_table_entry (abfd, &entry, i) < 0)
+	fprintf (f, " [%8lu] [INVALID]\n", i);
+      else
+	{
+	  fprintf (f, " [%8lu] ", i);
+	  bfd_sym_print_file_references_table_entry (abfd, f, &entry);
+	  fprintf (f, "\n");
+	}
+    }
+}
+
+void
+bfd_sym_display_contained_modules_table (bfd *abfd, FILE *f)
+{
+  unsigned long i;
+  bfd_sym_contained_modules_table_entry entry;
+  bfd_sym_data_struct *sdata = NULL;
+
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  fprintf (f, "contained modules table (CMTE) contains %lu objects:\n\n",
+	   sdata->header.dshb_cmte.dti_object_count);
+
+  for (i = 1; i <= sdata->header.dshb_cmte.dti_object_count; i++)
+    {
+      if (bfd_sym_fetch_contained_modules_table_entry (abfd, &entry, i) < 0)
+	fprintf (f, " [%8lu] [INVALID]\n", i);
+      else
+	{
+	  fprintf (f, " [%8lu] ", i);
+	  bfd_sym_print_contained_modules_table_entry (abfd, f, &entry);
+	  fprintf (f, "\n");
+	}
+    }
+}
+
+void
+bfd_sym_display_contained_variables_table (bfd *abfd, FILE *f)
+{
+  unsigned long i;
+  bfd_sym_contained_variables_table_entry entry;
+  bfd_sym_data_struct *sdata = NULL;
+
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  fprintf (f, "contained variables table (CVTE) contains %lu objects:\n\n",
+	   sdata->header.dshb_cvte.dti_object_count);
+
+  for (i = 1; i <= sdata->header.dshb_cvte.dti_object_count; i++)
+    {
+      if (bfd_sym_fetch_contained_variables_table_entry (abfd, &entry, i) < 0)
+	fprintf (f, " [%8lu] [INVALID]\n", i);
+      else
+	{
+	  fprintf (f, " [%8lu] ", i);
+	  bfd_sym_print_contained_variables_table_entry (abfd, f, &entry);
+	  fprintf (f, "\n");
+	}
+    }
+
+  fprintf (f, "\n");
+}
+
+void
+bfd_sym_display_contained_statements_table (bfd *abfd, FILE *f)
+{
+  unsigned long i;
+  bfd_sym_contained_statements_table_entry entry;
+  bfd_sym_data_struct *sdata = NULL;
+
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  fprintf (f, "contained statements table (CSNTE) contains %lu objects:\n\n",
+	   sdata->header.dshb_csnte.dti_object_count);
+
+  for (i = 1; i <= sdata->header.dshb_csnte.dti_object_count; i++)
+    {
+      if (bfd_sym_fetch_contained_statements_table_entry (abfd, &entry, i) < 0)
+	fprintf (f, " [%8lu] [INVALID]\n", i);
+      else
+	{
+	  fprintf (f, " [%8lu] ", i);
+	  bfd_sym_print_contained_statements_table_entry (abfd, f, &entry);
+	  fprintf (f, "\n");
+	}
+    }
+}
+
+void
+bfd_sym_display_contained_labels_table (bfd *abfd, FILE *f)
+{
+  unsigned long i;
+  bfd_sym_contained_labels_table_entry entry;
+  bfd_sym_data_struct *sdata = NULL;
+
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  fprintf (f, "contained labels table (CLTE) contains %lu objects:\n\n",
+	   sdata->header.dshb_clte.dti_object_count);
+
+  for (i = 1; i <= sdata->header.dshb_clte.dti_object_count; i++)
+    {
+      if (bfd_sym_fetch_contained_labels_table_entry (abfd, &entry, i) < 0)
+	fprintf (f, " [%8lu] [INVALID]\n", i);
+      else
+	{
+	  fprintf (f, " [%8lu] ", i);
+	  bfd_sym_print_contained_labels_table_entry (abfd, f, &entry);
+	  fprintf (f, "\n");
+	}
+    }
+}
+
+void
+bfd_sym_display_contained_types_table (bfd *abfd, FILE *f)
+{
+  unsigned long i;
+  bfd_sym_contained_types_table_entry entry;
+  bfd_sym_data_struct *sdata = NULL;
+
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  fprintf (f, "contained types table (CTTE) contains %lu objects:\n\n",
+	   sdata->header.dshb_ctte.dti_object_count);
+
+  for (i = 1; i <= sdata->header.dshb_ctte.dti_object_count; i++)
+    {
+      if (bfd_sym_fetch_contained_types_table_entry (abfd, &entry, i) < 0)
+	fprintf (f, " [%8lu] [INVALID]\n", i);
+      else
+	{
+	  fprintf (f, " [%8lu] ", i);
+	  bfd_sym_print_contained_types_table_entry (abfd, f, &entry);
+	  fprintf (f, "\n");
+	}
+    }
+}
+
+void
+bfd_sym_display_file_references_index_table (bfd *abfd, FILE *f)
+{
+  unsigned long i;
+  bfd_sym_file_references_index_table_entry entry;
+  bfd_sym_data_struct *sdata = NULL;
+
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  fprintf (f, "file references index table (FITE) contains %lu objects:\n\n",
+	   sdata->header.dshb_fite.dti_object_count);
+
+  for (i = 1; i <= sdata->header.dshb_fite.dti_object_count; i++)
+    {
+      if (bfd_sym_fetch_file_references_index_table_entry (abfd, &entry, i) < 0)
+	fprintf (f, " [%8lu] [INVALID]\n", i);
+      else
+	{
+	  fprintf (f, " [%8lu] ", i);
+	  bfd_sym_print_file_references_index_table_entry (abfd, f, &entry);
+	  fprintf (f, "\n");
+	}
+    }
+}
+
+void
+bfd_sym_display_constant_pool (bfd *abfd, FILE *f)
+{
+  unsigned long i;
+  bfd_sym_constant_pool_entry entry;
+  bfd_sym_data_struct *sdata = NULL;
+
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  fprintf (f, "constant pool (CONST) contains %lu objects:\n\n",
+	   sdata->header.dshb_const.dti_object_count);
+
+  for (i = 1; i <= sdata->header.dshb_const.dti_object_count; i++)
+    {
+      if (bfd_sym_fetch_constant_pool_entry (abfd, &entry, i) < 0)
+	fprintf (f, " [%8lu] [INVALID]\n", i);
+      else
+	{
+	  fprintf (f, " [%8lu] ", i);
+	  bfd_sym_print_constant_pool_entry (abfd, f, &entry);
+	  fprintf (f, "\n");
+	}
+    }
+}
+
+void
+bfd_sym_display_type_information_table (bfd *abfd, FILE *f)
+{
+  unsigned long i;
+  bfd_sym_type_table_entry sym_index;
+  bfd_sym_type_information_table_entry entry;
+  bfd_sym_data_struct *sdata = NULL;
+
+  BFD_ASSERT (bfd_sym_valid (abfd));
+  sdata = abfd->tdata.sym_data;
+
+  if (sdata->header.dshb_tte.dti_object_count > 99)
+    fprintf (f, "type table (TINFO) contains %lu objects:\n\n",
+	     sdata->header.dshb_tte.dti_object_count - 99);
+  else
+    {
+      fprintf (f, "type table (TINFO) contains [INVALID] objects:\n\n");
+      return;
+    }
+
+  for (i = 100; i <= sdata->header.dshb_tte.dti_object_count; i++)
+    {
+      if (bfd_sym_fetch_type_table_entry (abfd, &sym_index, i - 100) < 0)
+	fprintf (f, " [%8lu] [INVALID]\n", i);
+      else
+	{
+	  fprintf (f, " [%8lu] (TINFO %lu) ", i, sym_index);
+
+	  if (bfd_sym_fetch_type_information_table_entry (abfd, &entry, sym_index) < 0)
+	    fprintf (f, "[INVALID]");
+	  else
+	    bfd_sym_print_type_information_table_entry (abfd, f, &entry);
+
+	  fprintf (f, "\n");
+	}
+    }
+}
+
+int
+bfd_sym_scan (bfd *abfd, bfd_sym_version version, bfd_sym_data_struct *mdata)
+{
+  asection *bfdsec;
+  const char *name = "symbols";
+
+  mdata->name_table = 0;
+  mdata->sbfd = abfd;
+  mdata->version = version;
+
+  bfd_seek (abfd, 0, SEEK_SET);
+  if (bfd_sym_read_header (abfd, &mdata->header, mdata->version) != 0)
+    return -1;
+
+  mdata->name_table = bfd_sym_read_name_table (abfd, &mdata->header);
+  if (mdata->name_table == NULL)
+    return -1;
+
+  bfdsec = bfd_make_section_anyway_with_flags (abfd, name, SEC_HAS_CONTENTS);
+  if (bfdsec == NULL)
+    return -1;
+
+  bfdsec->vma = 0;
+  bfdsec->lma = 0;
+  bfdsec->size = 0;
+  bfdsec->filepos = 0;
+  bfdsec->alignment_power = 0;
+
+  abfd->tdata.sym_data = mdata;
+
+  return 0;
+}
+
+const bfd_target *
+bfd_sym_object_p (bfd *abfd)
+{
+  struct bfd_preserve preserve;
+  bfd_sym_version version = -1;
+
+  preserve.marker = NULL;
+  bfd_seek (abfd, 0, SEEK_SET);
+  if (bfd_sym_read_version (abfd, &version) != 0)
+    goto wrong;
+
+  preserve.marker = bfd_alloc (abfd, sizeof (bfd_sym_data_struct));
+  if (preserve.marker == NULL
+      || ! bfd_preserve_save (abfd, &preserve))
+    goto fail;
+
+  if (bfd_sym_scan (abfd, version,
+		    (bfd_sym_data_struct *) preserve.marker) != 0)
+    goto wrong;
+
+  bfd_preserve_finish (abfd, &preserve);
+  return abfd->xvec;
+
+ wrong:
+  bfd_set_error (bfd_error_wrong_format);
+
+ fail:
+  if (preserve.marker != NULL)
+    bfd_preserve_restore (abfd, &preserve);
+  return NULL;
+}
+
+#define bfd_sym_make_empty_symbol _bfd_generic_make_empty_symbol
+
+void
+bfd_sym_get_symbol_info (bfd *abfd ATTRIBUTE_UNUSED, asymbol *symbol, symbol_info *ret)
+{
+  bfd_symbol_info (symbol, ret);
+}
+
+long
+bfd_sym_get_symtab_upper_bound (bfd *abfd ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+long
+bfd_sym_canonicalize_symtab (bfd *abfd ATTRIBUTE_UNUSED, asymbol **sym ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+int
+bfd_sym_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+			struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+const bfd_target sym_vec =
+{
+  "sym",			/* Name.  */
+  bfd_target_sym_flavour,	/* Flavour.  */
+  BFD_ENDIAN_BIG,		/* Byteorder.  */
+  BFD_ENDIAN_BIG,		/* Header byteorder.  */
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED),
+  (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE | SEC_DATA
+   | SEC_ROM | SEC_HAS_CONTENTS), /* Section_flags.  */
+  0,				/* Symbol_leading_char.  */
+  ' ',				/* AR_pad_char.  */
+  16,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Data.  */
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Hdrs.  */
+  {				/* bfd_check_format.  */
+    _bfd_dummy_target,
+    bfd_sym_object_p,		/* bfd_check_format.  */
+    _bfd_dummy_target,
+    _bfd_dummy_target,
+  },
+  {				/* bfd_set_format.  */
+    bfd_false,
+    bfd_sym_mkobject,
+    bfd_false,
+    bfd_false,
+  },
+  {				/* bfd_write_contents.  */
+    bfd_false,
+    bfd_true,
+    bfd_false,
+    bfd_false,
+  },
+
+  BFD_JUMP_TABLE_GENERIC (bfd_sym),
+  BFD_JUMP_TABLE_COPY (_bfd_generic),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+  BFD_JUMP_TABLE_SYMBOLS (bfd_sym),
+  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+  BFD_JUMP_TABLE_WRITE (bfd_sym),
+  BFD_JUMP_TABLE_LINK (bfd_sym),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  NULL
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/xsym.h sdcc-3.2.0+dfsg/support/sdbinutils/bfd/xsym.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/xsym.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/xsym.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,700 @@
+/* xSYM symbol-file support for BFD.
+   Copyright 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "bfd.h"
+#include <stdio.h>
+
+#ifndef __xSYM_H__
+#define __xSYM_H__
+
+#define BFD_SYM_VERSION_STR_3_1 	"\013Version 3.1"
+#define BFD_SYM_VERSION_STR_3_2 	"\013Version 3.2"
+#define BFD_SYM_VERSION_STR_3_3 	"\013Version 3.3"
+#define BFD_SYM_VERSION_STR_3_4 	"\013Version 3.4"
+#define BFD_SYM_VERSION_STR_3_5 	"\013Version 3.5"
+#define BFD_SYM_END_OF_LIST_3_2		0xffff
+#define BFD_SYM_END_OF_LIST_3_4		0xffffffff
+#define BFD_SYM_END_OF_LIST 		BFD_SYM_END_OF_LIST_3_4
+#define BFD_SYM_FILE_NAME_INDEX_3_2	0xfffe
+#define BFD_SYM_FILE_NAME_INDEX_3_4	0xfffffffe
+#define BFD_SYM_FILE_NAME_INDEX		BFD_SYM_FILE_NAME_INDEX_3_4
+#define BFD_SYM_SOURCE_FILE_CHANGE_3_2	0xfffe
+#define BFD_SYM_SOURCE_FILE_CHANGE_3_4	0xfffffffe
+#define BFD_SYM_SOURCE_FILE_CHANGE	BFD_SYM_SOURCE_FILE_CHANGE_3_4
+#define BFD_SYM_MAXIMUM_LEGAL_INDEX_3_2 0xfffd
+#define BFD_SYM_MAXIMUM_LEGAL_INDEX_3_4 0xfffffffd
+#define BFD_SYM_MAXIMUM_LEGAL_INDEX	BFD_SYM_MAXIMUM_LEGAL_INDEX_3_4
+
+enum bfd_sym_storage_class
+{
+  BFD_SYM_STORAGE_CLASS_REGISTER = 0,
+  BFD_SYM_STORAGE_CLASS_GLOBAL = 1,
+  BFD_SYM_STORAGE_CLASS_FRAME_RELATIVE = 2,
+  BFD_SYM_STORAGE_CLASS_STACK_RELATIVE = 3,
+  BFD_SYM_STORAGE_CLASS_ABSOLUTE = 4,
+  BFD_SYM_STORAGE_CLASS_CONSTANT = 5,
+  BFD_SYM_STORAGE_CLASS_BIGCONSTANT = 6,
+  BFD_SYM_STORAGE_CLASS_RESOURCE = 99
+};
+typedef enum bfd_sym_storage_class bfd_sym_storage_class;
+
+enum bfd_sym_storage_kind
+{
+  BFD_SYM_STORAGE_KIND_LOCAL = 0,
+  BFD_SYM_STORAGE_KIND_VALUE = 1,
+  BFD_SYM_STORAGE_KIND_REFERENCE = 2,
+  BFD_SYM_STORAGE_KIND_WITH = 3
+};
+typedef enum bfd_sym_storage_kind bfd_sym_storage_kind;
+
+enum bfd_sym_version
+{
+  BFD_SYM_VERSION_3_1,
+  BFD_SYM_VERSION_3_2,
+  BFD_SYM_VERSION_3_3,
+  BFD_SYM_VERSION_3_4,
+  BFD_SYM_VERSION_3_5
+};
+typedef enum bfd_sym_version bfd_sym_version;
+
+enum bfd_sym_module_kind
+{
+  BFD_SYM_MODULE_KIND_NONE = 0,
+  BFD_SYM_MODULE_KIND_PROGRAM = 1,
+  BFD_SYM_MODULE_KIND_UNIT = 2,
+  BFD_SYM_MODULE_KIND_PROCEDURE = 3,
+  BFD_SYM_MODULE_KIND_FUNCTION = 4,
+  BFD_SYM_MODULE_KIND_DATA = 5,
+  BFD_SYM_MODULE_KIND_BLOCK = 6
+};
+typedef enum bfd_sym_module_kind bfd_sym_module_kind;
+
+enum bfd_sym_symbol_scope
+{
+  BFD_SYM_SYMBOL_SCOPE_LOCAL = 0,  /* Object is seen only inside current scope.  */
+  BFD_SYM_SYMBOL_SCOPE_GLOBAL = 1  /* Object has global scope.  */
+};
+typedef enum bfd_sym_symbol_scope bfd_sym_symbol_scope;
+
+struct bfd_sym_file_reference
+{
+  unsigned long fref_frte_index; /* File reference table index.  */
+  unsigned long fref_offset;     /* Absolute offset into source file.  */
+};
+typedef struct bfd_sym_file_reference bfd_sym_file_reference;
+
+/* NAME TABLE (NTE).  */
+
+/* RESOURCES TABLE (RTE)
+
+   All code and data is *defined* to reside in a resource.  Even A5
+   relative data is defined to reside in a dummy resource of ResType
+   'gbld'.  Code always resides in a resource.  Because a code/data
+   is built of many modules, when walking through a resource we must
+   point back to the modules in the order they were defined.  This is
+   done by requiring the entries in the Modules Entry table to be
+   ordered by resource/resource-number and by the location in that
+   resource.  Hence, the resource table entry points to the first
+   module making up that resource.  All modules table entries following
+   that first one with the same restype/resnum are contiguous and offset
+   from that first entry.  */
+
+struct bfd_sym_resources_table_entry
+{
+  unsigned char rte_res_type[4];  /* Resource Type.  */
+  unsigned short rte_res_number;  /* Resource Number.  */
+  unsigned long rte_nte_index;    /* Name of the resource.  */
+  unsigned long rte_mte_first;    /* Index of first module in the resource.  */
+  unsigned long rte_mte_last;     /* Index of the last module in the resource.	*/
+  unsigned long	rte_res_size;     /* Size of the resource.  */
+};
+typedef struct bfd_sym_resources_table_entry bfd_sym_resources_table_entry;
+
+/* MODULES TABLE (MTE)
+
+   Modules table entries are ordered by their appearance in a resource.
+   (Note that having a single module copied into two resources is not
+   possible).  Modules map back to their resource via an index into the
+   resource table and an offset into the resource.  Modules also point
+   to their source files, both the definition module and implementation
+   module.  Because modules can be textually nested within other
+   modules, a link to the parent (containing) module is required.  This
+   module can textually contain other modules.  A link to the contiguous
+   list of child (contained) modules is required.  Variables, statements,
+   and types defined in the module are pointed to by indexing the head of
+   the contiguous lists of contained variables, contained statements,
+   and contained types.  */
+
+struct bfd_sym_modules_table_entry
+{
+  unsigned long mte_rte_index;         /* Which resource it is in.  */
+  unsigned long mte_res_offset;        /* Offset into the resource.  */
+  unsigned long mte_size;              /* Size of module.  */
+  char mte_kind;                       /* What kind of module this is.  */
+  char mte_scope;                      /* How visible is it?  */
+  unsigned long mte_parent;            /* Containing module.  */
+  bfd_sym_file_reference mte_imp_fref; /* Implementation source.  */
+  unsigned long mte_imp_end;           /* End of implementation source.  */
+  unsigned long mte_nte_index;         /* The name of the module.  */
+  unsigned long mte_cmte_index;        /* Modules contained in this.  */
+  unsigned long mte_cvte_index;        /* Variables contained in this.  */
+  unsigned long mte_clte_index;        /* Local labels defined here.  */
+  unsigned long mte_ctte_index;        /* Types contained in this.  */
+  unsigned long mte_csnte_idx_1;       /* CSNTE index of mte_snbr_first.  */
+  unsigned long mte_csnte_idx_2;       /* CSNTE index of mte_snbr_last.  */
+};
+typedef struct bfd_sym_modules_table_entry bfd_sym_modules_table_entry;
+
+/* FILE REFERENCES TABLE (FRTE)
+
+   The FILE REFERENCES TABLE maps from source file to module & offset.
+   The table is ordered by increasing file offset.  Each new offset
+   references a module.
+
+ 				FRT	= FILE_SOURCE_START
+ 							FILE_SOURCE_INCREMENT*
+ 							END_OF_LIST.
+
+	*** THIS MECHANISM IS VERY SLOW FOR FILE+STATEMENT_NUMBER TO
+ 	*** MODULE/CODE ADDRESS OPERATIONS.  ANOTHER MECHANISM IS
+ 	***	REQUIRED!!  */
+
+union bfd_sym_file_references_table_entry
+{
+  struct
+  {
+    /* END_OF_LIST, FILE_NAME_INDEX, or module table entry.  */
+    unsigned long type;
+  }
+  generic;
+
+  struct
+  {
+    /* FILE_NAME_INDEX.  */
+    unsigned long type;
+    unsigned long nte_index;
+    unsigned long mod_date;
+  }
+  filename;
+
+  struct
+  {
+    /* < FILE_NAME_INDEX.  */
+    unsigned long mte_index;
+    unsigned long file_offset;
+  }
+  entry;
+};
+typedef union bfd_sym_file_references_table_entry bfd_sym_file_references_table_entry;
+
+/* CONTAINED MODULES TABLE (CMTE)
+
+   Contained Modules are lists of indices into the modules table.  The
+   lists are terminated by an END_OF_LIST index.  All entries are of the
+   same size, hence mapping an index into a CMTE list is simple.
+
+   CMT = MTE_INDEX* END_OF_LIST.  */
+
+union bfd_sym_contained_modules_table_entry
+{
+  struct
+  {
+    /* END_OF_LIST, index.  */
+    unsigned long type;
+  }
+  generic;
+
+  struct
+  {
+    unsigned long mte_index; /* Index into the Modules Table.  */
+    unsigned long nte_index; /* The name of the module.  */
+  }
+  entry;
+};
+typedef union bfd_sym_contained_modules_table_entry bfd_sym_contained_modules_table_entry;
+
+/* CONTAINED VARIABLES TABLE (CVTE)
+
+   Contained Variables map into the module table, file table, name table, and type
+   table.  Contained Variables are a contiguous list of source file change record,
+   giving the name of and offset into the source file corresponding to all variables
+   following.  Variable definition records contain an index into the name table (giving
+   the text of the variable as it appears in the source code), an index into the type
+   table giving the type of the variable, an increment added to the source file
+   offset giving the start of the implementation of the variable, and a storage
+   class address, giving information on variable's runtime address.
+
+   CVT = SOURCE_FILE_CHANGE SYMBOL_INFO* END_OF_LIST.
+   SYMBOL_INFO = SYMBOL_DEFINITION | SOURCE_FILE_CHANGE .
+
+   All entries are of the same size, making the fetching of data simple.  The
+   variable entries in the list are in ALPHABETICAL ORDER to simplify the display of
+   available variables for several of the debugger's windows.  */
+
+/* 'la_size' determines the variant used below:
+
+     == BFD_SYM_CVTE_SCA
+     Traditional STORAGE_CLASS_ADDRESS;
+
+     <= BFD_SYM_CVTE_LA_MAX_SIZE
+     That many logical address bytes ("in-situ");
+
+     == BFD_SYM_CVTE_BIG_LA
+     Logical address bytes in constant pool, at offset 'big_la'.  */
+
+#define	BFD_SYM_CVTE_SCA 0          /* Indicate SCA variant of CVTE.  */
+#define	BFD_SYM_CVTE_LA_MAX_SIZE 13 /* Max# of logical address bytes in a CVTE.  */
+#define	BFD_SYM_CVTE_BIG_LA 127     /* Indicates LA redirection to constant pool.  */
+
+union bfd_sym_contained_variables_table_entry
+{
+  struct
+  {
+    /* END_OF_LIST, SOURCE_FILE_CHANGE, or type table entry.  */
+    unsigned long type;
+  }
+  generic;
+
+  struct
+  {
+    /* SOURCE_FILE_CHANGE.  */
+    unsigned long type;
+    bfd_sym_file_reference fref;
+  }
+  file;
+
+  struct
+  {
+    /* < SOURCE_FILE_CHANGE.  */
+    unsigned long tte_index;
+    unsigned long nte_index;
+    unsigned long file_delta;                       /* Increment from previous source.  */
+    unsigned char scope;
+    unsigned char la_size;                          /* #bytes of LAs below.  */
+
+    union
+    {
+      /* la_size == BFD_SYM_CVTE_SCA.  */
+      struct
+      {
+	unsigned char sca_kind;	                    /* Distinguish local from value/var formal.  */
+	unsigned char sca_class;                    /* The storage class itself.  */
+	unsigned long sca_offset;
+      }
+      scstruct;
+
+      /* la_size <= BFD_SYM_CVTE_LA_MAX_SIZE.  */
+      struct {
+	unsigned char la[BFD_SYM_CVTE_LA_MAX_SIZE]; /* Logical address bytes.  */
+	unsigned char la_kind;                      /* Eqv. cvte_location.sca_kind.  */
+      }
+      lastruct;
+
+      /* la_size == BFD_SYM_CVTE_BIG_LA 127.  */
+      struct
+      {
+	unsigned long big_la;                       /* Logical address bytes in constant pool.  */
+	unsigned char big_la_kind;                  /* Eqv. cvte_location.sca_kind.  */
+      }
+      biglastruct;
+    }
+    address;
+  }
+  entry;
+};
+typedef union bfd_sym_contained_variables_table_entry bfd_sym_contained_variables_table_entry;
+
+/* CONTAINED STATEMENTS TABLE (CSNTE)
+
+   Contained Statements table.  This table is similar to the Contained
+   Variables table except that instead of VARIABLE_DEFINITION entries, this
+   module contains STATEMENT_NUMBER_DEFINITION entries.  A statement number
+   definition points back to the containing module (via an index into
+   the module entry table) and contains the file and resource deltas
+   to add to the previous values to get to this statement.
+   All entries are of the same size, making the fetching of data simple.  The
+   entries in the table are in order of increasing statement number within the
+   source file.
+
+   The Contained Statements table is indexed from two places.  An MTE contains
+   an index to the first statement number within the module.  An FRTE contains
+   an index to the first statement in the table (Possibly.  This is slow.)  Or
+   a table of fast statement number to CSNTE entry mappings indexes into the
+   table.  Choice not yet made.  */
+
+union bfd_sym_contained_statements_table_entry
+{
+  struct
+  {
+    /* END_OF_LIST, SOURCE_FILE_CHANGE, or statement table entry.  */
+    unsigned long type;
+  }
+  generic;
+
+  struct
+  {
+    /* SOURCE_FILE_CHANGE.  */
+    unsigned long type;
+    bfd_sym_file_reference fref; /* File name table.  */
+  }
+  file;
+
+  struct
+  {
+    unsigned long mte_index;     /* Which module contains it.  */
+    unsigned long file_delta;    /* Where it is defined.  */
+    unsigned long mte_offset;    /* Where it is in the module.  */
+  }
+  entry;
+};
+typedef union bfd_sym_contained_statements_table_entry bfd_sym_contained_statements_table_entry;
+
+/* CONTAINED LABELS TABLE (CLTE)
+
+   Contained Labels table names those labels local to the module.  It is similar
+   to the Contained Statements table.  */
+
+union bfd_sym_contained_labels_table_entry
+{
+  struct
+  {
+    /* END_OF_LIST, SOURCE_FILE_CHANGE, index.  */
+    unsigned long type;
+  }
+  generic;
+
+  struct
+  {
+    /* SOURCE_FILE_CHANGE.  */
+    unsigned long type;
+    bfd_sym_file_reference fref;
+  }
+  file;
+
+  struct
+  {
+    /* < SOURCE_FILE_CHANGE.  */
+    unsigned long mte_index;   /* Which module contains us.  */
+    unsigned long mte_offset;  /* Where it is in the module.  */
+    unsigned long nte_index;   /* The name of the label.  */
+    unsigned long file_delta;  /* Where it is defined.  */
+    unsigned short scope;      /* How visible the label is.  */
+  }
+  entry;
+};
+typedef union bfd_sym_contained_labels_table_entry bfd_sym_contained_labels_table_entry;
+
+/* CONTAINED TYPES TABLE (CTTE)
+
+   Contained Types define the named types that are in the module.  It is used to
+   map name indices into type indices.  The type entries in the table are in
+   alphabetical order by type name.  */
+
+union bfd_sym_contained_types_table_entry
+{
+  struct
+  {
+    /* END_OF_LIST, SOURCE_FILE_CHANGE, or type table entry.  */
+    unsigned long type;
+  }
+  generic;
+
+  struct
+  {
+    /* SOURCE_FILE_CHANGE.  */
+    unsigned long type;
+    bfd_sym_file_reference fref;
+  }
+  file;
+
+  struct
+  {
+    /* < SOURCE_FILE_CHANGE.  */
+    unsigned long tte_index;
+    unsigned long nte_index;
+    unsigned long file_delta; /* From last file definition.  */
+  }
+  entry;
+};
+typedef union bfd_sym_contained_types_table_entry bfd_sym_contained_types_table_entry;
+
+/* TYPE TABLE (TTE).  */
+
+typedef unsigned long bfd_sym_type_table_entry;
+
+/* TYPE INFORMATION TABLE (TINFO).  */
+
+struct bfd_sym_type_information_table_entry
+{
+  unsigned long nte_index;
+  unsigned long physical_size;
+  unsigned long logical_size;
+  unsigned long offset;
+};
+typedef struct bfd_sym_type_information_table_entry bfd_sym_type_information_table_entry;
+
+/* FILE REFERENCES INDEX TABLE (FITE)
+
+   The FRTE INDEX TABLE indexes into the FILE REFERENCE TABLE above.  The FRTE
+   at that index is the FILE_SOURCE_START for a series of files.  The FRTEs are
+   indexed from 1.  The list is terminated with an END_OF_LIST.  */
+
+union bfd_sym_file_references_index_table_entry
+{
+  struct
+  {
+    unsigned long type;
+  }
+  generic;
+
+  struct
+  {
+    unsigned long frte_index;  /* Index into the FRTE table.  */
+    unsigned long nte_index;   /* Name table index, gives filename.  */
+  }
+  entry;
+};
+typedef union bfd_sym_file_references_index_table_entry bfd_sym_file_references_index_table_entry;
+
+/* CONSTANT POOL (CONST)
+
+   The CONSTANT_POOL consists of entries that start on word boundaries.  The entries
+   are referenced by byte index into the constant pool, not by record number.
+
+   Each entry takes the form:
+
+   <16-bit size>
+   <that many bytes of stuff>
+
+   Entries do not cross page boundaries.  */
+
+typedef short bfd_sym_constant_pool_entry;
+
+/* The DISK_SYMBOL_HEADER_BLOCK is the first record in a .SYM file,
+   defining the physical characteristics of the symbolic information.
+   The remainder of the * .SYM file is stored in fixed block
+   allocations. For the purposes of paging, the * file is considered
+   to be an array of dshb_page_size blocks, with block 0 (and *
+   possibly more) devoted to the DISK_SYMBOL_HEADER_BLOCK.
+
+   The dti_object_count field means that the allowed indices for that
+   type of object are 0 .. dti_object_count. An index of 0, although
+   allowed, is never done.  However, an 0th entry is created in the
+   table.  That entry is filled with all zeroes.  The reason for this
+   is to avoid off-by-one programming errors that would otherwise
+   occur: an index of k *MEANS* k, not k-1 when going to the disk
+   table.  */
+
+struct bfd_sym_table_info
+{
+  unsigned long dti_first_page;   /* First page for this table.  */
+  unsigned long dti_page_count;   /* Number of pages for the table.  */
+  unsigned long dti_object_count; /* Number of objects in the table.  */
+};
+typedef struct bfd_sym_table_info bfd_sym_table_info;
+
+struct bfd_sym_header_block
+{
+  unsigned char dshb_id[32];      /* Version information.  */
+  unsigned short dshb_page_size;  /* Size of the pages/blocks.  */
+  unsigned long dshb_hash_page;   /* Disk page for the hash table.  */
+  unsigned long dshb_root_mte;    /* MTE index of the program root.  */
+  unsigned long dshb_mod_date;    /* modification date of executable.  */
+  bfd_sym_table_info dshb_frte;   /* Per TABLE information.  */
+  bfd_sym_table_info dshb_rte;
+  bfd_sym_table_info dshb_mte;
+  bfd_sym_table_info dshb_cmte;
+  bfd_sym_table_info dshb_cvte;
+  bfd_sym_table_info dshb_csnte;
+  bfd_sym_table_info dshb_clte;
+  bfd_sym_table_info dshb_ctte;
+  bfd_sym_table_info dshb_tte;
+  bfd_sym_table_info dshb_nte;
+  bfd_sym_table_info dshb_tinfo;
+  bfd_sym_table_info dshb_fite;   /* File information.  */
+  bfd_sym_table_info dshb_const;  /* Constant pool.  */
+
+  unsigned char dshb_file_creator[4]; /* Executable's creator.  */
+  unsigned char dshb_file_type[4];    /* Executable's file type.  */
+};
+typedef struct bfd_sym_header_block bfd_sym_header_block;
+
+struct bfd_sym_data_struct
+{
+  unsigned char *name_table;
+  bfd_sym_header_block header;
+  bfd_sym_version version;
+  bfd *sbfd;
+};
+typedef struct bfd_sym_data_struct bfd_sym_data_struct;
+
+extern bfd_boolean bfd_sym_mkobject
+  (bfd *);
+extern void bfd_sym_print_symbol
+  (bfd *, PTR, asymbol *, bfd_print_symbol_type);
+extern bfd_boolean bfd_sym_valid
+  (bfd *);
+extern unsigned char * bfd_sym_read_name_table
+  (bfd *, bfd_sym_header_block *);
+extern void bfd_sym_parse_file_reference_v32
+  (unsigned char *, size_t, bfd_sym_file_reference *);
+extern void bfd_sym_parse_disk_table_v32
+  (unsigned char *, size_t, bfd_sym_table_info *);
+extern void bfd_sym_parse_header_v32
+  (unsigned char *, size_t, bfd_sym_header_block *);
+extern int bfd_sym_read_header_v32
+  (bfd *, bfd_sym_header_block *);
+extern int bfd_sym_read_header_v34
+  (bfd *, bfd_sym_header_block *);
+extern int bfd_sym_read_header
+  (bfd *, bfd_sym_header_block *, bfd_sym_version);
+extern int bfd_sym_read_version
+  (bfd *, bfd_sym_version *);
+extern void bfd_sym_display_table_summary
+  (FILE *, bfd_sym_table_info *, const char *);
+extern void bfd_sym_display_header
+  (FILE *, bfd_sym_header_block *);
+extern void bfd_sym_parse_resources_table_entry_v32
+  (unsigned char *, size_t, bfd_sym_resources_table_entry *);
+extern void bfd_sym_parse_modules_table_entry_v33
+  (unsigned char *, size_t, bfd_sym_modules_table_entry *);
+extern void bfd_sym_parse_file_references_table_entry_v32
+  (unsigned char *, size_t, bfd_sym_file_references_table_entry *);
+extern void bfd_sym_parse_contained_modules_table_entry_v32
+  (unsigned char *, size_t, bfd_sym_contained_modules_table_entry *);
+extern void bfd_sym_parse_contained_variables_table_entry_v32
+  (unsigned char *, size_t, bfd_sym_contained_variables_table_entry *);
+extern void bfd_sym_parse_contained_statements_table_entry_v32
+  (unsigned char *, size_t, bfd_sym_contained_statements_table_entry *);
+extern void bfd_sym_parse_contained_labels_table_entry_v32
+  (unsigned char *, size_t, bfd_sym_contained_labels_table_entry *);
+extern void bfd_sym_parse_type_table_entry_v32
+  (unsigned char *, size_t, bfd_sym_type_table_entry *);
+extern int bfd_sym_fetch_resources_table_entry
+  (bfd *, bfd_sym_resources_table_entry *, unsigned long);
+extern int bfd_sym_fetch_modules_table_entry
+  (bfd *, bfd_sym_modules_table_entry *, unsigned long);
+extern int bfd_sym_fetch_file_references_table_entry
+  (bfd *, bfd_sym_file_references_table_entry *, unsigned long);
+extern int bfd_sym_fetch_contained_modules_table_entry
+  (bfd *, bfd_sym_contained_modules_table_entry *, unsigned long);
+extern int bfd_sym_fetch_contained_variables_table_entry
+  (bfd *, bfd_sym_contained_variables_table_entry *, unsigned long);
+extern int bfd_sym_fetch_contained_statements_table_entry
+  (bfd *, bfd_sym_contained_statements_table_entry *, unsigned long);
+extern int bfd_sym_fetch_contained_labels_table_entry
+  (bfd *, bfd_sym_contained_labels_table_entry *, unsigned long);
+extern int bfd_sym_fetch_contained_types_table_entry
+  (bfd *, bfd_sym_contained_types_table_entry *, unsigned long);
+extern int bfd_sym_fetch_file_references_index_table_entry
+  (bfd *, bfd_sym_file_references_index_table_entry *, unsigned long);
+extern int bfd_sym_fetch_constant_pool_entry
+  (bfd *, bfd_sym_constant_pool_entry *, unsigned long);
+extern int bfd_sym_fetch_type_table_entry
+  (bfd *, bfd_sym_type_table_entry *, unsigned long);
+extern int bfd_sym_fetch_type_information_table_entry
+  (bfd *, bfd_sym_type_information_table_entry *, unsigned long);
+extern int bfd_sym_fetch_type_table_information
+  (bfd *, bfd_sym_type_information_table_entry *, unsigned long);
+extern const unsigned char * bfd_sym_symbol_name
+  (bfd *, unsigned long);
+extern const unsigned char * bfd_sym_module_name
+  (bfd *, unsigned long);
+extern const char * bfd_sym_unparse_storage_kind
+  (enum bfd_sym_storage_kind);
+extern const char * bfd_sym_unparse_storage_class
+  (enum bfd_sym_storage_class);
+extern const char * bfd_sym_unparse_module_kind
+  (enum bfd_sym_module_kind);
+extern const char * bfd_sym_unparse_symbol_scope
+  (enum bfd_sym_symbol_scope);
+extern void bfd_sym_print_file_reference
+  (bfd *, FILE *, bfd_sym_file_reference *);
+extern void bfd_sym_print_resources_table_entry
+  (bfd *, FILE *, bfd_sym_resources_table_entry *);
+extern void bfd_sym_print_modules_table_entry
+  (bfd *, FILE *, bfd_sym_modules_table_entry *);
+extern void bfd_sym_print_file_references_table_entry
+  (bfd *, FILE *, bfd_sym_file_references_table_entry *);
+extern void bfd_sym_print_contained_modules_table_entry
+  (bfd *, FILE *, bfd_sym_contained_modules_table_entry *);
+extern void bfd_sym_print_contained_variables_table_entry
+  (bfd *, FILE *f, bfd_sym_contained_variables_table_entry *);
+extern void bfd_sym_print_contained_statements_table_entry
+  (bfd *, FILE *, bfd_sym_contained_statements_table_entry *);
+extern void bfd_sym_print_contained_labels_table_entry
+  (bfd *, FILE *, bfd_sym_contained_labels_table_entry *);
+extern void bfd_sym_print_contained_types_table_entry
+  (bfd *, FILE *, bfd_sym_contained_types_table_entry *);
+extern const char * bfd_sym_type_operator_name
+  (unsigned char);
+extern const char * bfd_sym_type_basic_name
+  (unsigned char);
+extern int bfd_sym_fetch_long
+  (unsigned char *, unsigned long, unsigned long, unsigned long *, long *);
+extern void bfd_sym_print_type_information
+  (bfd *, FILE *, unsigned char *, unsigned long, unsigned long, unsigned long *);
+extern void bfd_sym_print_type_information_table_entry
+  (bfd *, FILE *, bfd_sym_type_information_table_entry *);
+extern void bfd_sym_print_file_references_index_table_entry
+  (bfd *, FILE *, bfd_sym_file_references_index_table_entry *);
+extern void bfd_sym_print_constant_pool_entry
+  (bfd *, FILE *, bfd_sym_constant_pool_entry *);
+extern unsigned char * bfd_sym_display_name_table_entry
+  (bfd *, FILE *, unsigned char *);
+extern void bfd_sym_display_name_table
+  (bfd *, FILE *);
+extern void bfd_sym_display_resources_table
+  (bfd *, FILE *);
+extern void bfd_sym_display_modules_table
+  (bfd *, FILE *);
+extern void bfd_sym_display_file_references_table
+  (bfd *, FILE *);
+extern void bfd_sym_display_contained_modules_table
+  (bfd *, FILE *);
+extern void bfd_sym_display_contained_variables_table
+  (bfd *, FILE *);
+extern void bfd_sym_display_contained_statements_table
+  (bfd *, FILE *);
+extern void bfd_sym_display_contained_labels_table
+  (bfd *, FILE *);
+extern void bfd_sym_display_contained_types_table
+  (bfd *, FILE *);
+extern void bfd_sym_display_file_references_index_table
+  (bfd *, FILE *);
+extern void bfd_sym_display_constant_pool
+  (bfd *, FILE *);
+extern void bfd_sym_display_type_information_table
+  (bfd *, FILE *);
+extern int bfd_sym_scan
+  (bfd *, bfd_sym_version, bfd_sym_data_struct *);
+extern const bfd_target * bfd_sym_object_p
+  (bfd *);
+extern void bfd_sym_get_symbol_info
+  (bfd *, asymbol *, symbol_info *);
+extern long bfd_sym_get_symtab_upper_bound
+  (bfd *);
+extern long bfd_sym_canonicalize_symtab
+  (bfd *, asymbol **);
+extern int bfd_sym_sizeof_headers
+  (bfd *, struct bfd_link_info *);
+
+#endif /* __xSYM_H__ */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/xtensa-isa.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/xtensa-isa.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/xtensa-isa.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/xtensa-isa.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1793 @@
+/* Configurable Xtensa ISA support.
+   Copyright 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "xtensa-isa.h"
+#include "xtensa-isa-internal.h"
+
+xtensa_isa_status xtisa_errno;
+char xtisa_error_msg[1024];
+
+
+xtensa_isa_status
+xtensa_isa_errno (xtensa_isa isa __attribute__ ((unused)))
+{
+  return xtisa_errno;
+}
+
+
+char *
+xtensa_isa_error_msg (xtensa_isa isa __attribute__ ((unused)))
+{
+  return xtisa_error_msg;
+}
+
+
+#define CHECK_ALLOC(MEM,ERRVAL) \
+  do { \
+    if ((MEM) == 0) \
+      { \
+	xtisa_errno = xtensa_isa_out_of_memory; \
+	strcpy (xtisa_error_msg, "out of memory"); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+#define CHECK_ALLOC_FOR_INIT(MEM,ERRVAL,ERRNO_P,ERROR_MSG_P) \
+  do { \
+    if ((MEM) == 0) \
+      { \
+	xtisa_errno = xtensa_isa_out_of_memory; \
+	strcpy (xtisa_error_msg, "out of memory"); \
+	if (ERRNO_P) *(ERRNO_P) = xtisa_errno; \
+	if (ERROR_MSG_P) *(ERROR_MSG_P) = xtisa_error_msg; \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+
+/* Instruction buffers.  */
+
+int
+xtensa_insnbuf_size (xtensa_isa isa)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  return intisa->insnbuf_size;
+}
+
+
+xtensa_insnbuf
+xtensa_insnbuf_alloc (xtensa_isa isa)
+{
+  xtensa_insnbuf result = (xtensa_insnbuf)
+    malloc (xtensa_insnbuf_size (isa) * sizeof (xtensa_insnbuf_word));
+  CHECK_ALLOC (result, 0);
+  return result;
+}
+
+
+void
+xtensa_insnbuf_free (xtensa_isa isa __attribute__ ((unused)),
+		     xtensa_insnbuf buf)
+{
+  free (buf);
+}
+
+
+/* Given <byte_index>, the index of a byte in a xtensa_insnbuf, our
+   internal representation of a xtensa instruction word, return the index of
+   its word and the bit index of its low order byte in the xtensa_insnbuf.  */
+
+static inline int
+byte_to_word_index (int byte_index)
+{
+  return byte_index / sizeof (xtensa_insnbuf_word);
+}
+
+
+static inline int
+byte_to_bit_index (int byte_index)
+{
+  return (byte_index & 0x3) * 8;
+}
+
+
+/* Copy an instruction in the 32-bit words pointed at by "insn" to
+   characters pointed at by "cp".  This is more complicated than you
+   might think because we want 16-bit instructions in bytes 2 & 3 for
+   big-endian configurations.  This function allows us to specify
+   which byte in "insn" to start with and which way to increment,
+   allowing trivial implementation for both big- and little-endian
+   configurations....and it seems to make pretty good code for
+   both.  */
+
+int
+xtensa_insnbuf_to_chars (xtensa_isa isa,
+			 const xtensa_insnbuf insn,
+			 unsigned char *cp,
+			 int num_chars)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int insn_size = xtensa_isa_maxlength (isa);
+  int fence_post, start, increment, i, byte_count;
+  xtensa_format fmt;
+
+  if (num_chars == 0)
+    num_chars = insn_size;
+
+  if (intisa->is_big_endian)
+    {
+      start = insn_size - 1;
+      increment = -1;
+    }
+  else
+    {
+      start = 0;
+      increment = 1;
+    }
+
+  /* Find the instruction format.  Do nothing if the buffer does not contain
+     a valid instruction since we need to know how many bytes to copy.  */
+  fmt = xtensa_format_decode (isa, insn);
+  if (fmt == XTENSA_UNDEFINED)
+    return XTENSA_UNDEFINED;
+
+  byte_count = xtensa_format_length (isa, fmt);
+  if (byte_count == XTENSA_UNDEFINED)
+    return XTENSA_UNDEFINED;
+
+  if (byte_count > num_chars)
+    {
+      xtisa_errno = xtensa_isa_buffer_overflow;
+      strcpy (xtisa_error_msg, "output buffer too small for instruction");
+      return XTENSA_UNDEFINED;
+    }
+
+  fence_post = start + (byte_count * increment);
+
+  for (i = start; i != fence_post; i += increment, ++cp)
+    {
+      int word_inx = byte_to_word_index (i);
+      int bit_inx = byte_to_bit_index (i);
+
+      *cp = (insn[word_inx] >> bit_inx) & 0xff;
+    }
+
+  return byte_count;
+}
+
+
+/* Inward conversion from byte stream to xtensa_insnbuf.  See
+   xtensa_insnbuf_to_chars for a discussion of why this is complicated
+   by endianness.  */
+    
+void
+xtensa_insnbuf_from_chars (xtensa_isa isa,
+			   xtensa_insnbuf insn,
+			   const unsigned char *cp,
+			   int num_chars)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int max_size, insn_size, fence_post, start, increment, i;
+
+  max_size = xtensa_isa_maxlength (isa);
+
+  /* Decode the instruction length so we know how many bytes to read.  */
+  insn_size = (intisa->length_decode_fn) (cp);
+  if (insn_size == XTENSA_UNDEFINED)
+    {
+      /* This should never happen when the byte stream contains a
+	 valid instruction.  Just read the maximum number of bytes....  */
+      insn_size = max_size;
+    }
+
+  if (num_chars == 0 || num_chars > insn_size)
+    num_chars = insn_size;
+
+  if (intisa->is_big_endian)
+    {
+      start = max_size - 1;
+      increment = -1;
+    }
+  else
+    {
+      start = 0;
+      increment = 1;
+    }
+
+  fence_post = start + (num_chars * increment);
+  memset (insn, 0, xtensa_insnbuf_size (isa) * sizeof (xtensa_insnbuf_word));
+
+  for (i = start; i != fence_post; i += increment, ++cp)
+    {
+      int word_inx = byte_to_word_index (i);
+      int bit_inx = byte_to_bit_index (i);
+
+      insn[word_inx] |= (*cp & 0xff) << bit_inx;
+    }
+}
+
+
+
+/* ISA information.  */
+
+extern xtensa_isa_internal xtensa_modules;
+
+xtensa_isa
+xtensa_isa_init (xtensa_isa_status *errno_p, char **error_msg_p)
+{
+  xtensa_isa_internal *isa = &xtensa_modules;
+  int n, is_user;
+
+  /* Set up the opcode name lookup table.  */
+  isa->opname_lookup_table =
+    bfd_malloc (isa->num_opcodes * sizeof (xtensa_lookup_entry));
+  CHECK_ALLOC_FOR_INIT (isa->opname_lookup_table, NULL, errno_p, error_msg_p);
+  for (n = 0; n < isa->num_opcodes; n++)
+    {
+      isa->opname_lookup_table[n].key = isa->opcodes[n].name;
+      isa->opname_lookup_table[n].u.opcode = n;
+    }
+  qsort (isa->opname_lookup_table, isa->num_opcodes,
+	 sizeof (xtensa_lookup_entry), xtensa_isa_name_compare);
+
+  /* Set up the state name lookup table.  */
+  isa->state_lookup_table =
+    bfd_malloc (isa->num_states * sizeof (xtensa_lookup_entry));
+  CHECK_ALLOC_FOR_INIT (isa->state_lookup_table, NULL, errno_p, error_msg_p);
+  for (n = 0; n < isa->num_states; n++)
+    {
+      isa->state_lookup_table[n].key = isa->states[n].name;
+      isa->state_lookup_table[n].u.state = n;
+    }
+  qsort (isa->state_lookup_table, isa->num_states,
+	 sizeof (xtensa_lookup_entry), xtensa_isa_name_compare);
+
+  /* Set up the sysreg name lookup table.  */
+  isa->sysreg_lookup_table =
+    bfd_malloc (isa->num_sysregs * sizeof (xtensa_lookup_entry));
+  CHECK_ALLOC_FOR_INIT (isa->sysreg_lookup_table, NULL, errno_p, error_msg_p);
+  for (n = 0; n < isa->num_sysregs; n++)
+    {
+      isa->sysreg_lookup_table[n].key = isa->sysregs[n].name;
+      isa->sysreg_lookup_table[n].u.sysreg = n;
+    }
+  qsort (isa->sysreg_lookup_table, isa->num_sysregs,
+	 sizeof (xtensa_lookup_entry), xtensa_isa_name_compare);
+
+  /* Set up the user & system sysreg number tables.  */
+  for (is_user = 0; is_user < 2; is_user++)
+    {
+      isa->sysreg_table[is_user] =
+	bfd_malloc ((isa->max_sysreg_num[is_user] + 1)
+		    * sizeof (xtensa_sysreg));
+      CHECK_ALLOC_FOR_INIT (isa->sysreg_table[is_user], NULL,
+			    errno_p, error_msg_p);
+
+      for (n = 0; n <= isa->max_sysreg_num[is_user]; n++)
+	isa->sysreg_table[is_user][n] = XTENSA_UNDEFINED;
+    }
+  for (n = 0; n < isa->num_sysregs; n++)
+    {
+      xtensa_sysreg_internal *sreg = &isa->sysregs[n];
+      is_user = sreg->is_user;
+
+      isa->sysreg_table[is_user][sreg->number] = n;
+    }
+
+  /* Set up the interface lookup table.  */
+  isa->interface_lookup_table = 
+    bfd_malloc (isa->num_interfaces * sizeof (xtensa_lookup_entry));
+  CHECK_ALLOC_FOR_INIT (isa->interface_lookup_table, NULL, errno_p,
+			error_msg_p);
+  for (n = 0; n < isa->num_interfaces; n++)
+    {
+      isa->interface_lookup_table[n].key = isa->interfaces[n].name;
+      isa->interface_lookup_table[n].u.intf = n;
+    }
+  qsort (isa->interface_lookup_table, isa->num_interfaces,
+	 sizeof (xtensa_lookup_entry), xtensa_isa_name_compare);
+
+  /* Set up the funcUnit lookup table.  */
+  isa->funcUnit_lookup_table = 
+    bfd_malloc (isa->num_funcUnits * sizeof (xtensa_lookup_entry));
+  CHECK_ALLOC_FOR_INIT (isa->funcUnit_lookup_table, NULL, errno_p,
+			error_msg_p);
+  for (n = 0; n < isa->num_funcUnits; n++)
+    {
+      isa->funcUnit_lookup_table[n].key = isa->funcUnits[n].name;
+      isa->funcUnit_lookup_table[n].u.fun = n;
+    }
+  qsort (isa->funcUnit_lookup_table, isa->num_funcUnits,
+	 sizeof (xtensa_lookup_entry), xtensa_isa_name_compare);
+
+  isa->insnbuf_size = ((isa->insn_size + sizeof (xtensa_insnbuf_word) - 1) /
+		       sizeof (xtensa_insnbuf_word));
+
+  return (xtensa_isa) isa;
+}
+
+
+void
+xtensa_isa_free (xtensa_isa isa)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int n;
+
+  /* With this version of the code, the xtensa_isa structure is not
+     dynamically allocated, so this function is not essential.  Free
+     the memory allocated by xtensa_isa_init and restore the xtensa_isa
+     structure to its initial state.  */
+
+  if (intisa->opname_lookup_table)
+    {
+      free (intisa->opname_lookup_table);
+      intisa->opname_lookup_table = 0;
+    }
+
+  if (intisa->state_lookup_table)
+    {
+      free (intisa->state_lookup_table);
+      intisa->state_lookup_table = 0;
+    }
+
+  if (intisa->sysreg_lookup_table)
+    {
+      free (intisa->sysreg_lookup_table);
+      intisa->sysreg_lookup_table = 0;
+    }
+  for (n = 0; n < 2; n++)
+    {
+      if (intisa->sysreg_table[n])
+	{
+	  free (intisa->sysreg_table[n]);
+	  intisa->sysreg_table[n] = 0;
+	}
+    }
+
+  if (intisa->interface_lookup_table)
+    {
+      free (intisa->interface_lookup_table);
+      intisa->interface_lookup_table = 0;
+    }
+
+  if (intisa->funcUnit_lookup_table)
+    {
+      free (intisa->funcUnit_lookup_table);
+      intisa->funcUnit_lookup_table = 0;
+    }
+}
+
+
+int
+xtensa_isa_name_compare (const void *v1, const void *v2)
+{
+  xtensa_lookup_entry *e1 = (xtensa_lookup_entry *) v1;
+  xtensa_lookup_entry *e2 = (xtensa_lookup_entry *) v2;
+
+  return strcasecmp (e1->key, e2->key);
+}
+
+
+int
+xtensa_isa_maxlength (xtensa_isa isa)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  return intisa->insn_size;
+}
+
+
+int
+xtensa_isa_length_from_chars (xtensa_isa isa, const unsigned char *cp)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  return (intisa->length_decode_fn) (cp);
+}
+
+
+int
+xtensa_isa_num_pipe_stages (xtensa_isa isa) 
+{
+  xtensa_opcode opcode;
+  xtensa_funcUnit_use *use;
+  int num_opcodes, num_uses;
+  int i, stage;
+  static int max_stage = XTENSA_UNDEFINED;
+
+  /* Only compute the value once.  */
+  if (max_stage != XTENSA_UNDEFINED)
+    return max_stage + 1;
+
+  num_opcodes = xtensa_isa_num_opcodes (isa);
+  for (opcode = 0; opcode < num_opcodes; opcode++)
+    {
+      num_uses = xtensa_opcode_num_funcUnit_uses (isa, opcode);
+      for (i = 0; i < num_uses; i++)
+	{
+	  use = xtensa_opcode_funcUnit_use (isa, opcode, i);
+	  stage = use->stage;
+	  if (stage > max_stage)
+	    max_stage = stage;
+	}
+    }
+
+  return max_stage + 1;
+}
+
+
+int
+xtensa_isa_num_formats (xtensa_isa isa)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  return intisa->num_formats;
+}
+
+
+int
+xtensa_isa_num_opcodes (xtensa_isa isa)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  return intisa->num_opcodes;
+}
+
+
+int
+xtensa_isa_num_regfiles (xtensa_isa isa)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  return intisa->num_regfiles;
+}
+
+
+int
+xtensa_isa_num_states (xtensa_isa isa)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  return intisa->num_states;
+}
+
+
+int
+xtensa_isa_num_sysregs (xtensa_isa isa)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  return intisa->num_sysregs;
+}
+
+
+int
+xtensa_isa_num_interfaces (xtensa_isa isa)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  return intisa->num_interfaces;
+}
+
+
+int
+xtensa_isa_num_funcUnits (xtensa_isa isa)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  return intisa->num_funcUnits;
+}
+
+
+
+/* Instruction formats.  */
+
+
+#define CHECK_FORMAT(INTISA,FMT,ERRVAL) \
+  do { \
+    if ((FMT) < 0 || (FMT) >= (INTISA)->num_formats) \
+      { \
+	xtisa_errno = xtensa_isa_bad_format; \
+	strcpy (xtisa_error_msg, "invalid format specifier"); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+#define CHECK_SLOT(INTISA,FMT,SLOT,ERRVAL) \
+  do { \
+    if ((SLOT) < 0 || (SLOT) >= (INTISA)->formats[FMT].num_slots) \
+      { \
+	xtisa_errno = xtensa_isa_bad_slot; \
+	strcpy (xtisa_error_msg, "invalid slot specifier"); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+const char *
+xtensa_format_name (xtensa_isa isa, xtensa_format fmt)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_FORMAT (intisa, fmt, NULL);
+  return intisa->formats[fmt].name;
+}
+
+
+xtensa_format
+xtensa_format_lookup (xtensa_isa isa, const char *fmtname)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int fmt;
+
+  if (!fmtname || !*fmtname)
+    {
+      xtisa_errno = xtensa_isa_bad_format;
+      strcpy (xtisa_error_msg, "invalid format name");
+      return XTENSA_UNDEFINED;
+    }
+
+  for (fmt = 0; fmt < intisa->num_formats; fmt++)
+    {
+      if (strcasecmp (fmtname, intisa->formats[fmt].name) == 0)
+	return fmt;
+    }
+  
+  xtisa_errno = xtensa_isa_bad_format;
+  sprintf (xtisa_error_msg, "format \"%s\" not recognized", fmtname);
+  return XTENSA_UNDEFINED;
+}
+
+
+xtensa_format
+xtensa_format_decode (xtensa_isa isa, const xtensa_insnbuf insn)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_format fmt;
+
+  fmt = (intisa->format_decode_fn) (insn);
+  if (fmt != XTENSA_UNDEFINED)
+    return fmt;
+
+  xtisa_errno = xtensa_isa_bad_format;
+  strcpy (xtisa_error_msg, "cannot decode instruction format");
+  return XTENSA_UNDEFINED;
+}
+
+
+int
+xtensa_format_encode (xtensa_isa isa, xtensa_format fmt, xtensa_insnbuf insn)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_FORMAT (intisa, fmt, -1);
+  (*intisa->formats[fmt].encode_fn) (insn);
+  return 0;
+}
+
+
+int
+xtensa_format_length (xtensa_isa isa, xtensa_format fmt)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_FORMAT (intisa, fmt, XTENSA_UNDEFINED);
+  return intisa->formats[fmt].length;
+}
+
+
+int
+xtensa_format_num_slots (xtensa_isa isa, xtensa_format fmt)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_FORMAT (intisa, fmt, XTENSA_UNDEFINED);
+  return intisa->formats[fmt].num_slots;
+}
+
+
+xtensa_opcode
+xtensa_format_slot_nop_opcode (xtensa_isa isa, xtensa_format fmt, int slot)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int slot_id;
+
+  CHECK_FORMAT (intisa, fmt, XTENSA_UNDEFINED);
+  CHECK_SLOT (intisa, fmt, slot, XTENSA_UNDEFINED);
+
+  slot_id = intisa->formats[fmt].slot_id[slot];
+  return xtensa_opcode_lookup (isa, intisa->slots[slot_id].nop_name);
+}
+
+
+int
+xtensa_format_get_slot (xtensa_isa isa, xtensa_format fmt, int slot,
+			const xtensa_insnbuf insn, xtensa_insnbuf slotbuf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int slot_id;
+
+  CHECK_FORMAT (intisa, fmt, -1);
+  CHECK_SLOT (intisa, fmt, slot, -1);
+
+  slot_id = intisa->formats[fmt].slot_id[slot];
+  (*intisa->slots[slot_id].get_fn) (insn, slotbuf);
+  return 0;
+}
+
+
+int
+xtensa_format_set_slot (xtensa_isa isa, xtensa_format fmt, int slot,
+			xtensa_insnbuf insn, const xtensa_insnbuf slotbuf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int slot_id;
+
+  CHECK_FORMAT (intisa, fmt, -1);
+  CHECK_SLOT (intisa, fmt, slot, -1);
+
+  slot_id = intisa->formats[fmt].slot_id[slot];
+  (*intisa->slots[slot_id].set_fn) (insn, slotbuf);
+  return 0;
+}
+
+
+
+/* Opcode information.  */
+
+
+#define CHECK_OPCODE(INTISA,OPC,ERRVAL) \
+  do { \
+    if ((OPC) < 0 || (OPC) >= (INTISA)->num_opcodes) \
+      { \
+	xtisa_errno = xtensa_isa_bad_opcode; \
+	strcpy (xtisa_error_msg, "invalid opcode specifier"); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+xtensa_opcode
+xtensa_opcode_lookup (xtensa_isa isa, const char *opname)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_lookup_entry entry, *result = 0;
+
+  if (!opname || !*opname)
+    {
+      xtisa_errno = xtensa_isa_bad_opcode;
+      strcpy (xtisa_error_msg, "invalid opcode name");
+      return XTENSA_UNDEFINED;
+    }
+
+  if (intisa->num_opcodes != 0)
+    {
+      entry.key = opname;
+      result = bsearch (&entry, intisa->opname_lookup_table,
+			intisa->num_opcodes, sizeof (xtensa_lookup_entry),
+			xtensa_isa_name_compare);
+    }
+
+  if (!result)
+    {
+      xtisa_errno = xtensa_isa_bad_opcode;
+      sprintf (xtisa_error_msg, "opcode \"%s\" not recognized", opname);
+      return XTENSA_UNDEFINED;
+    }
+
+  return result->u.opcode;
+}
+
+
+xtensa_opcode
+xtensa_opcode_decode (xtensa_isa isa, xtensa_format fmt, int slot,
+		      const xtensa_insnbuf slotbuf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int slot_id;
+  xtensa_opcode opc;
+
+  CHECK_FORMAT (intisa, fmt, XTENSA_UNDEFINED);
+  CHECK_SLOT (intisa, fmt, slot, XTENSA_UNDEFINED);
+
+  slot_id = intisa->formats[fmt].slot_id[slot];
+
+  opc = (intisa->slots[slot_id].opcode_decode_fn) (slotbuf);
+  if (opc != XTENSA_UNDEFINED)
+    return opc;
+
+  xtisa_errno = xtensa_isa_bad_opcode;
+  strcpy (xtisa_error_msg, "cannot decode opcode");
+  return XTENSA_UNDEFINED;
+}
+
+
+int
+xtensa_opcode_encode (xtensa_isa isa, xtensa_format fmt, int slot,
+		      xtensa_insnbuf slotbuf, xtensa_opcode opc)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int slot_id;
+  xtensa_opcode_encode_fn encode_fn;
+
+  CHECK_FORMAT (intisa, fmt, -1);
+  CHECK_SLOT (intisa, fmt, slot, -1);
+  CHECK_OPCODE (intisa, opc, -1);
+
+  slot_id = intisa->formats[fmt].slot_id[slot];
+  encode_fn = intisa->opcodes[opc].encode_fns[slot_id];
+  if (!encode_fn)
+    {
+      xtisa_errno = xtensa_isa_wrong_slot;
+      sprintf (xtisa_error_msg,
+	       "opcode \"%s\" is not allowed in slot %d of format \"%s\"",
+	       intisa->opcodes[opc].name, slot, intisa->formats[fmt].name);
+      return -1;
+    }
+  (*encode_fn) (slotbuf);
+  return 0;
+}
+
+
+const char *
+xtensa_opcode_name (xtensa_isa isa, xtensa_opcode opc)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_OPCODE (intisa, opc, NULL);
+  return intisa->opcodes[opc].name;
+}
+
+
+int
+xtensa_opcode_is_branch (xtensa_isa isa, xtensa_opcode opc)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  if ((intisa->opcodes[opc].flags & XTENSA_OPCODE_IS_BRANCH) != 0)
+    return 1;
+  return 0;
+}
+
+
+int
+xtensa_opcode_is_jump (xtensa_isa isa, xtensa_opcode opc)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  if ((intisa->opcodes[opc].flags & XTENSA_OPCODE_IS_JUMP) != 0)
+    return 1;
+  return 0;
+}
+
+
+int
+xtensa_opcode_is_loop (xtensa_isa isa, xtensa_opcode opc)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  if ((intisa->opcodes[opc].flags & XTENSA_OPCODE_IS_LOOP) != 0)
+    return 1;
+  return 0;
+}
+
+
+int
+xtensa_opcode_is_call (xtensa_isa isa, xtensa_opcode opc)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  if ((intisa->opcodes[opc].flags & XTENSA_OPCODE_IS_CALL) != 0)
+    return 1;
+  return 0;
+}
+
+
+int
+xtensa_opcode_num_operands (xtensa_isa isa, xtensa_opcode opc)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int iclass_id;
+
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  iclass_id = intisa->opcodes[opc].iclass_id;
+  return intisa->iclasses[iclass_id].num_operands;
+}
+
+
+int
+xtensa_opcode_num_stateOperands (xtensa_isa isa, xtensa_opcode opc)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int iclass_id;
+
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  iclass_id = intisa->opcodes[opc].iclass_id;
+  return intisa->iclasses[iclass_id].num_stateOperands;
+}
+
+
+int
+xtensa_opcode_num_interfaceOperands (xtensa_isa isa, xtensa_opcode opc)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int iclass_id;
+
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  iclass_id = intisa->opcodes[opc].iclass_id;
+  return intisa->iclasses[iclass_id].num_interfaceOperands;
+}
+
+
+int
+xtensa_opcode_num_funcUnit_uses (xtensa_isa isa, xtensa_opcode opc)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  return intisa->opcodes[opc].num_funcUnit_uses;
+}
+
+
+xtensa_funcUnit_use *
+xtensa_opcode_funcUnit_use (xtensa_isa isa, xtensa_opcode opc, int u)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_OPCODE (intisa, opc, NULL);
+  if (u < 0 || u >= intisa->opcodes[opc].num_funcUnit_uses)
+    {
+      xtisa_errno = xtensa_isa_bad_funcUnit;
+      sprintf (xtisa_error_msg, "invalid functional unit use number (%d); "
+	       "opcode \"%s\" has %d", u, intisa->opcodes[opc].name,
+	       intisa->opcodes[opc].num_funcUnit_uses);
+      return NULL;
+    }
+  return &intisa->opcodes[opc].funcUnit_uses[u];
+}
+
+
+
+/* Operand information.  */
+
+
+#define CHECK_OPERAND(INTISA,OPC,ICLASS,OPND,ERRVAL) \
+  do { \
+    if ((OPND) < 0 || (OPND) >= (ICLASS)->num_operands) \
+      { \
+	xtisa_errno = xtensa_isa_bad_operand; \
+	sprintf (xtisa_error_msg, "invalid operand number (%d); " \
+		 "opcode \"%s\" has %d operands", (OPND), \
+		 (INTISA)->opcodes[(OPC)].name, (ICLASS)->num_operands); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+static xtensa_operand_internal *
+get_operand (xtensa_isa_internal *intisa, xtensa_opcode opc, int opnd)
+{
+  xtensa_iclass_internal *iclass;
+  int iclass_id, operand_id;
+
+  CHECK_OPCODE (intisa, opc, NULL);
+  iclass_id = intisa->opcodes[opc].iclass_id;
+  iclass = &intisa->iclasses[iclass_id];
+  CHECK_OPERAND (intisa, opc, iclass, opnd, NULL);
+  operand_id = iclass->operands[opnd].u.operand_id;
+  return &intisa->operands[operand_id];
+}
+
+
+const char *
+xtensa_operand_name (xtensa_isa isa, xtensa_opcode opc, int opnd)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return NULL;
+  return intop->name;
+}
+
+
+int
+xtensa_operand_is_visible (xtensa_isa isa, xtensa_opcode opc, int opnd)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_iclass_internal *iclass;
+  int iclass_id, operand_id;
+  xtensa_operand_internal *intop;
+
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  iclass_id = intisa->opcodes[opc].iclass_id;
+  iclass = &intisa->iclasses[iclass_id];
+  CHECK_OPERAND (intisa, opc, iclass, opnd, XTENSA_UNDEFINED);
+
+  /* Special case for "sout" operands.  */
+  if (iclass->operands[opnd].inout == 's')
+    return 0;
+
+  operand_id = iclass->operands[opnd].u.operand_id;
+  intop = &intisa->operands[operand_id];
+
+  if ((intop->flags & XTENSA_OPERAND_IS_INVISIBLE) == 0)
+    return 1;
+  return 0;
+}
+
+
+char
+xtensa_operand_inout (xtensa_isa isa, xtensa_opcode opc, int opnd)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_iclass_internal *iclass;
+  int iclass_id;
+  char inout;
+
+  CHECK_OPCODE (intisa, opc, 0);
+  iclass_id = intisa->opcodes[opc].iclass_id;
+  iclass = &intisa->iclasses[iclass_id];
+  CHECK_OPERAND (intisa, opc, iclass, opnd, 0);
+  inout = iclass->operands[opnd].inout;
+
+  /* Special case for "sout" operands.  */
+  if (inout == 's')
+    return 'o';
+
+  return inout;
+}
+
+
+int
+xtensa_operand_get_field (xtensa_isa isa, xtensa_opcode opc, int opnd,
+			  xtensa_format fmt, int slot,
+			  const xtensa_insnbuf slotbuf, uint32 *valp)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+  int slot_id;
+  xtensa_get_field_fn get_fn;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return -1;
+
+  CHECK_FORMAT (intisa, fmt, -1);
+  CHECK_SLOT (intisa, fmt, slot, -1);
+
+  slot_id = intisa->formats[fmt].slot_id[slot];
+  if (intop->field_id == XTENSA_UNDEFINED)
+    {
+      xtisa_errno = xtensa_isa_no_field;
+      strcpy (xtisa_error_msg, "implicit operand has no field");
+      return -1;
+    }
+  get_fn = intisa->slots[slot_id].get_field_fns[intop->field_id];
+  if (!get_fn)
+    {
+      xtisa_errno = xtensa_isa_wrong_slot;
+      sprintf (xtisa_error_msg,
+	       "operand \"%s\" does not exist in slot %d of format \"%s\"",
+	       intop->name, slot, intisa->formats[fmt].name);
+      return -1;
+    }
+  *valp = (*get_fn) (slotbuf);
+  return 0;
+}
+
+
+int
+xtensa_operand_set_field (xtensa_isa isa, xtensa_opcode opc, int opnd,
+			  xtensa_format fmt, int slot,
+			  xtensa_insnbuf slotbuf, uint32 val)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+  int slot_id;
+  xtensa_set_field_fn set_fn;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return -1;
+
+  CHECK_FORMAT (intisa, fmt, -1);
+  CHECK_SLOT (intisa, fmt, slot, -1);
+
+  slot_id = intisa->formats[fmt].slot_id[slot];
+  if (intop->field_id == XTENSA_UNDEFINED)
+    {
+      xtisa_errno = xtensa_isa_no_field;
+      strcpy (xtisa_error_msg, "implicit operand has no field");
+      return -1;
+    }
+  set_fn = intisa->slots[slot_id].set_field_fns[intop->field_id];
+  if (!set_fn)
+    {
+      xtisa_errno = xtensa_isa_wrong_slot;
+      sprintf (xtisa_error_msg,
+	       "operand \"%s\" does not exist in slot %d of format \"%s\"",
+	       intop->name, slot, intisa->formats[fmt].name);
+      return -1;
+    }
+  (*set_fn) (slotbuf, val);
+  return 0;
+}
+
+
+int
+xtensa_operand_encode (xtensa_isa isa, xtensa_opcode opc, int opnd,
+		       uint32 *valp)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+  uint32 test_val, orig_val;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop)
+    return -1;
+
+  if (!intop->encode)
+    {
+      /* This is a default operand for a field.  How can we tell if the
+	 value fits in the field?  Write the value into the field,
+	 read it back, and then make sure we get the same value.  */
+      static xtensa_insnbuf tmpbuf = 0;
+      int slot_id;
+
+      if (!tmpbuf)
+	{
+	  tmpbuf = xtensa_insnbuf_alloc (isa);
+	  CHECK_ALLOC (tmpbuf, -1);
+	}
+
+      /* A default operand is always associated with a field,
+	 but check just to be sure....  */
+      if (intop->field_id == XTENSA_UNDEFINED)
+	{
+	  xtisa_errno = xtensa_isa_internal_error;
+	  strcpy (xtisa_error_msg, "operand has no field");
+	  return -1;
+	}
+
+      /* Find some slot that includes the field.  */
+      for (slot_id = 0; slot_id < intisa->num_slots; slot_id++)
+	{
+	  xtensa_get_field_fn get_fn =
+	    intisa->slots[slot_id].get_field_fns[intop->field_id];
+	  xtensa_set_field_fn set_fn =
+	    intisa->slots[slot_id].set_field_fns[intop->field_id];
+
+	  if (get_fn && set_fn)
+	    {
+	      (*set_fn) (tmpbuf, *valp);
+	      return ((*get_fn) (tmpbuf) != *valp);
+	    }
+	}
+
+      /* Couldn't find any slot containing the field....  */
+      xtisa_errno = xtensa_isa_no_field;
+      strcpy (xtisa_error_msg, "field does not exist in any slot");
+      return -1;
+    }
+
+  /* Encode the value.  In some cases, the encoding function may detect
+     errors, but most of the time the only way to determine if the value
+     was successfully encoded is to decode it and check if it matches
+     the original value.  */
+  orig_val = *valp;
+  if ((*intop->encode) (valp)
+      || (test_val = *valp, (*intop->decode) (&test_val))
+      || test_val != orig_val)
+    {
+      xtisa_errno = xtensa_isa_bad_value;
+      sprintf (xtisa_error_msg, "cannot encode operand value 0x%08x", *valp);
+      return -1;
+    }
+
+  return 0;
+}
+
+
+int
+xtensa_operand_decode (xtensa_isa isa, xtensa_opcode opc, int opnd,
+		       uint32 *valp)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return -1;
+
+  /* Use identity function for "default" operands.  */
+  if (!intop->decode)
+    return 0;
+
+  if ((*intop->decode) (valp))
+    {
+      xtisa_errno = xtensa_isa_bad_value;
+      sprintf (xtisa_error_msg, "cannot decode operand value 0x%08x", *valp);
+      return -1;
+    }
+  return 0;
+}
+
+
+int
+xtensa_operand_is_register (xtensa_isa isa, xtensa_opcode opc, int opnd)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return XTENSA_UNDEFINED;
+
+  if ((intop->flags & XTENSA_OPERAND_IS_REGISTER) != 0)
+    return 1;
+  return 0;
+}
+
+
+xtensa_regfile
+xtensa_operand_regfile (xtensa_isa isa, xtensa_opcode opc, int opnd)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return XTENSA_UNDEFINED;
+
+  return intop->regfile;
+}
+
+
+int
+xtensa_operand_num_regs (xtensa_isa isa, xtensa_opcode opc, int opnd)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return XTENSA_UNDEFINED;
+
+  return intop->num_regs;
+}
+
+
+int
+xtensa_operand_is_known_reg (xtensa_isa isa, xtensa_opcode opc, int opnd)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return XTENSA_UNDEFINED;
+
+  if ((intop->flags & XTENSA_OPERAND_IS_UNKNOWN) == 0)
+    return 1;
+  return 0;
+}
+
+
+int
+xtensa_operand_is_PCrelative (xtensa_isa isa, xtensa_opcode opc, int opnd)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return XTENSA_UNDEFINED;
+
+  if ((intop->flags & XTENSA_OPERAND_IS_PCRELATIVE) != 0)
+    return 1;
+  return 0;
+}
+
+
+int
+xtensa_operand_do_reloc (xtensa_isa isa, xtensa_opcode opc, int opnd,
+			 uint32 *valp, uint32 pc)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return -1;
+
+  if ((intop->flags & XTENSA_OPERAND_IS_PCRELATIVE) == 0)
+    return 0;
+
+  if (!intop->do_reloc)
+    {
+      xtisa_errno = xtensa_isa_internal_error;
+      strcpy (xtisa_error_msg, "operand missing do_reloc function");
+      return -1;
+    }
+
+  if ((*intop->do_reloc) (valp, pc))
+    {
+      xtisa_errno = xtensa_isa_bad_value;
+      sprintf (xtisa_error_msg,
+	       "do_reloc failed for value 0x%08x at PC 0x%08x", *valp, pc);
+      return -1;
+    }
+
+  return 0;
+}
+
+
+int
+xtensa_operand_undo_reloc (xtensa_isa isa, xtensa_opcode opc, int opnd,
+			   uint32 *valp, uint32 pc)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return -1;
+
+  if ((intop->flags & XTENSA_OPERAND_IS_PCRELATIVE) == 0)
+    return 0;
+
+  if (!intop->undo_reloc)
+    {
+      xtisa_errno = xtensa_isa_internal_error;
+      strcpy (xtisa_error_msg, "operand missing undo_reloc function");
+      return -1;
+    }
+
+  if ((*intop->undo_reloc) (valp, pc))
+    {
+      xtisa_errno = xtensa_isa_bad_value;
+      sprintf (xtisa_error_msg,
+	       "undo_reloc failed for value 0x%08x at PC 0x%08x", *valp, pc);
+      return -1;
+    }
+
+  return 0;
+}
+
+
+
+/* State Operands.  */
+
+
+#define CHECK_STATE_OPERAND(INTISA,OPC,ICLASS,STOP,ERRVAL) \
+  do { \
+    if ((STOP) < 0 || (STOP) >= (ICLASS)->num_stateOperands) \
+      { \
+	xtisa_errno = xtensa_isa_bad_operand; \
+	sprintf (xtisa_error_msg, "invalid state operand number (%d); " \
+		 "opcode \"%s\" has %d state operands", (STOP), \
+		 (INTISA)->opcodes[(OPC)].name, (ICLASS)->num_stateOperands); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+xtensa_state
+xtensa_stateOperand_state (xtensa_isa isa, xtensa_opcode opc, int stOp)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_iclass_internal *iclass;
+  int iclass_id;
+
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  iclass_id = intisa->opcodes[opc].iclass_id;
+  iclass = &intisa->iclasses[iclass_id];
+  CHECK_STATE_OPERAND (intisa, opc, iclass, stOp, XTENSA_UNDEFINED);
+  return iclass->stateOperands[stOp].u.state;
+}
+
+
+char
+xtensa_stateOperand_inout (xtensa_isa isa, xtensa_opcode opc, int stOp)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_iclass_internal *iclass;
+  int iclass_id;
+
+  CHECK_OPCODE (intisa, opc, 0);
+  iclass_id = intisa->opcodes[opc].iclass_id;
+  iclass = &intisa->iclasses[iclass_id];
+  CHECK_STATE_OPERAND (intisa, opc, iclass, stOp, 0);
+  return iclass->stateOperands[stOp].inout;
+}
+
+
+
+/* Interface Operands.  */
+
+
+#define CHECK_INTERFACE_OPERAND(INTISA,OPC,ICLASS,IFOP,ERRVAL) \
+  do { \
+    if ((IFOP) < 0 || (IFOP) >= (ICLASS)->num_interfaceOperands) \
+      { \
+	xtisa_errno = xtensa_isa_bad_operand; \
+	sprintf (xtisa_error_msg, "invalid interface operand number (%d); " \
+		 "opcode \"%s\" has %d interface operands", (IFOP), \
+		 (INTISA)->opcodes[(OPC)].name, \
+		 (ICLASS)->num_interfaceOperands); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+xtensa_interface
+xtensa_interfaceOperand_interface (xtensa_isa isa, xtensa_opcode opc,
+				   int ifOp)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_iclass_internal *iclass;
+  int iclass_id;
+
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  iclass_id = intisa->opcodes[opc].iclass_id;
+  iclass = &intisa->iclasses[iclass_id];
+  CHECK_INTERFACE_OPERAND (intisa, opc, iclass, ifOp, XTENSA_UNDEFINED);
+  return iclass->interfaceOperands[ifOp];
+}
+
+
+
+/* Register Files.  */
+
+
+#define CHECK_REGFILE(INTISA,RF,ERRVAL) \
+  do { \
+    if ((RF) < 0 || (RF) >= (INTISA)->num_regfiles) \
+      { \
+	xtisa_errno = xtensa_isa_bad_regfile; \
+	strcpy (xtisa_error_msg, "invalid regfile specifier"); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+xtensa_regfile
+xtensa_regfile_lookup (xtensa_isa isa, const char *name)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int n;
+
+  if (!name || !*name)
+    {
+      xtisa_errno = xtensa_isa_bad_regfile;
+      strcpy (xtisa_error_msg, "invalid regfile name");
+      return XTENSA_UNDEFINED;
+    }
+
+  /* The expected number of regfiles is small; use a linear search.  */
+  for (n = 0; n < intisa->num_regfiles; n++)
+    {
+      if (!filename_cmp (intisa->regfiles[n].name, name))
+	return n;
+    }
+
+  xtisa_errno = xtensa_isa_bad_regfile;
+  sprintf (xtisa_error_msg, "regfile \"%s\" not recognized", name);
+  return XTENSA_UNDEFINED;
+}
+
+
+xtensa_regfile
+xtensa_regfile_lookup_shortname (xtensa_isa isa, const char *shortname)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int n;
+
+  if (!shortname || !*shortname)
+    {
+      xtisa_errno = xtensa_isa_bad_regfile;
+      strcpy (xtisa_error_msg, "invalid regfile shortname");
+      return XTENSA_UNDEFINED;
+    }
+
+  /* The expected number of regfiles is small; use a linear search.  */
+  for (n = 0; n < intisa->num_regfiles; n++)
+    {
+      /* Ignore regfile views since they always have the same shortnames
+	 as their parents.  */
+      if (intisa->regfiles[n].parent != n)
+	continue;
+      if (!filename_cmp (intisa->regfiles[n].shortname, shortname))
+	return n;
+    }
+
+  xtisa_errno = xtensa_isa_bad_regfile;
+  sprintf (xtisa_error_msg, "regfile shortname \"%s\" not recognized",
+	   shortname);
+  return XTENSA_UNDEFINED;
+}
+
+
+const char *
+xtensa_regfile_name (xtensa_isa isa, xtensa_regfile rf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_REGFILE (intisa, rf, NULL);
+  return intisa->regfiles[rf].name;
+}
+
+
+const char *
+xtensa_regfile_shortname (xtensa_isa isa, xtensa_regfile rf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_REGFILE (intisa, rf, NULL);
+  return intisa->regfiles[rf].shortname;
+}
+
+
+xtensa_regfile
+xtensa_regfile_view_parent (xtensa_isa isa, xtensa_regfile rf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_REGFILE (intisa, rf, XTENSA_UNDEFINED);
+  return intisa->regfiles[rf].parent;
+}
+
+
+int
+xtensa_regfile_num_bits (xtensa_isa isa, xtensa_regfile rf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_REGFILE (intisa, rf, XTENSA_UNDEFINED);
+  return intisa->regfiles[rf].num_bits;
+}
+
+
+int
+xtensa_regfile_num_entries (xtensa_isa isa, xtensa_regfile rf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_REGFILE (intisa, rf, XTENSA_UNDEFINED);
+  return intisa->regfiles[rf].num_entries;
+}
+
+
+
+/* Processor States.  */
+
+
+#define CHECK_STATE(INTISA,ST,ERRVAL) \
+  do { \
+    if ((ST) < 0 || (ST) >= (INTISA)->num_states) \
+      { \
+	xtisa_errno = xtensa_isa_bad_state; \
+	strcpy (xtisa_error_msg, "invalid state specifier"); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+xtensa_state
+xtensa_state_lookup (xtensa_isa isa, const char *name)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_lookup_entry entry, *result = 0;
+
+  if (!name || !*name)
+    {
+      xtisa_errno = xtensa_isa_bad_state;
+      strcpy (xtisa_error_msg, "invalid state name");
+      return XTENSA_UNDEFINED;
+    }
+
+  if (intisa->num_states != 0)
+    {
+      entry.key = name;
+      result = bsearch (&entry, intisa->state_lookup_table, intisa->num_states,
+			sizeof (xtensa_lookup_entry), xtensa_isa_name_compare);
+    }
+
+  if (!result)
+    {
+      xtisa_errno = xtensa_isa_bad_state;
+      sprintf (xtisa_error_msg, "state \"%s\" not recognized", name);
+      return XTENSA_UNDEFINED;
+    }
+
+  return result->u.state;
+}
+
+
+const char *
+xtensa_state_name (xtensa_isa isa, xtensa_state st)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_STATE (intisa, st, NULL);
+  return intisa->states[st].name;
+}
+
+
+int
+xtensa_state_num_bits (xtensa_isa isa, xtensa_state st)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_STATE (intisa, st, XTENSA_UNDEFINED);
+  return intisa->states[st].num_bits;
+}
+
+
+int
+xtensa_state_is_exported (xtensa_isa isa, xtensa_state st)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_STATE (intisa, st, XTENSA_UNDEFINED);
+  if ((intisa->states[st].flags & XTENSA_STATE_IS_EXPORTED) != 0)
+    return 1;
+  return 0;
+}
+
+
+int
+xtensa_state_is_shared_or (xtensa_isa isa, xtensa_state st)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_STATE (intisa, st, XTENSA_UNDEFINED);
+  if ((intisa->states[st].flags & XTENSA_STATE_IS_SHARED_OR) != 0)
+    return 1;
+  return 0;
+}
+
+
+
+/* Sysregs.  */
+
+
+#define CHECK_SYSREG(INTISA,SYSREG,ERRVAL) \
+  do { \
+    if ((SYSREG) < 0 || (SYSREG) >= (INTISA)->num_sysregs) \
+      { \
+	xtisa_errno = xtensa_isa_bad_sysreg; \
+	strcpy (xtisa_error_msg, "invalid sysreg specifier"); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+xtensa_sysreg
+xtensa_sysreg_lookup (xtensa_isa isa, int num, int is_user)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+
+  if (is_user != 0)
+    is_user = 1;
+
+  if (num < 0 || num > intisa->max_sysreg_num[is_user]
+      || intisa->sysreg_table[is_user][num] == XTENSA_UNDEFINED)
+    {
+      xtisa_errno = xtensa_isa_bad_sysreg;
+      strcpy (xtisa_error_msg, "sysreg not recognized");
+      return XTENSA_UNDEFINED;
+    }
+
+  return intisa->sysreg_table[is_user][num];
+}
+
+
+xtensa_sysreg
+xtensa_sysreg_lookup_name (xtensa_isa isa, const char *name)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_lookup_entry entry, *result = 0;
+
+  if (!name || !*name)
+    {
+      xtisa_errno = xtensa_isa_bad_sysreg;
+      strcpy (xtisa_error_msg, "invalid sysreg name");
+      return XTENSA_UNDEFINED;
+    }
+
+  if (intisa->num_sysregs != 0)
+    {
+      entry.key = name;
+      result = bsearch (&entry, intisa->sysreg_lookup_table,
+			intisa->num_sysregs, sizeof (xtensa_lookup_entry),
+			xtensa_isa_name_compare);
+    }
+
+  if (!result)
+    {
+      xtisa_errno = xtensa_isa_bad_sysreg;
+      sprintf (xtisa_error_msg, "sysreg \"%s\" not recognized", name);
+      return XTENSA_UNDEFINED;
+    }
+
+  return result->u.sysreg;
+}
+
+
+const char *
+xtensa_sysreg_name (xtensa_isa isa, xtensa_sysreg sysreg)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_SYSREG (intisa, sysreg, NULL);
+  return intisa->sysregs[sysreg].name;
+}
+
+
+int
+xtensa_sysreg_number (xtensa_isa isa, xtensa_sysreg sysreg)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_SYSREG (intisa, sysreg, XTENSA_UNDEFINED);
+  return intisa->sysregs[sysreg].number;
+}
+
+
+int
+xtensa_sysreg_is_user (xtensa_isa isa, xtensa_sysreg sysreg)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_SYSREG (intisa, sysreg, XTENSA_UNDEFINED);
+  if (intisa->sysregs[sysreg].is_user)
+    return 1;
+  return 0;
+}
+
+
+
+/* Interfaces.  */
+
+
+#define CHECK_INTERFACE(INTISA,INTF,ERRVAL) \
+  do { \
+    if ((INTF) < 0 || (INTF) >= (INTISA)->num_interfaces) \
+      { \
+	xtisa_errno = xtensa_isa_bad_interface; \
+	strcpy (xtisa_error_msg, "invalid interface specifier"); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+xtensa_interface
+xtensa_interface_lookup (xtensa_isa isa, const char *ifname)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_lookup_entry entry, *result = 0;
+
+  if (!ifname || !*ifname)
+    {
+      xtisa_errno = xtensa_isa_bad_interface;
+      strcpy (xtisa_error_msg, "invalid interface name");
+      return XTENSA_UNDEFINED;
+    }
+
+  if (intisa->num_interfaces != 0)
+    {
+      entry.key = ifname;
+      result = bsearch (&entry, intisa->interface_lookup_table,
+			intisa->num_interfaces, sizeof (xtensa_lookup_entry),
+			xtensa_isa_name_compare);
+    }
+
+  if (!result)
+    {
+      xtisa_errno = xtensa_isa_bad_interface;
+      sprintf (xtisa_error_msg, "interface \"%s\" not recognized", ifname);
+      return XTENSA_UNDEFINED;
+    }
+
+  return result->u.intf;
+}
+
+
+const char *
+xtensa_interface_name (xtensa_isa isa, xtensa_interface intf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_INTERFACE (intisa, intf, NULL);
+  return intisa->interfaces[intf].name;
+}
+
+
+int
+xtensa_interface_num_bits (xtensa_isa isa, xtensa_interface intf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_INTERFACE (intisa, intf, XTENSA_UNDEFINED);
+  return intisa->interfaces[intf].num_bits;
+}
+
+
+char
+xtensa_interface_inout (xtensa_isa isa, xtensa_interface intf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_INTERFACE (intisa, intf, 0);
+  return intisa->interfaces[intf].inout;
+}
+
+
+int
+xtensa_interface_has_side_effect (xtensa_isa isa, xtensa_interface intf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_INTERFACE (intisa, intf, XTENSA_UNDEFINED);
+  if ((intisa->interfaces[intf].flags & XTENSA_INTERFACE_HAS_SIDE_EFFECT) != 0)
+    return 1;
+  return 0;
+}
+
+
+int
+xtensa_interface_class_id (xtensa_isa isa, xtensa_interface intf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_INTERFACE (intisa, intf, XTENSA_UNDEFINED);
+  return intisa->interfaces[intf].class_id;
+}
+
+
+
+/* Functional Units.  */
+
+
+#define CHECK_FUNCUNIT(INTISA,FUN,ERRVAL) \
+  do { \
+    if ((FUN) < 0 || (FUN) >= (INTISA)->num_funcUnits) \
+      { \
+	xtisa_errno = xtensa_isa_bad_funcUnit; \
+	strcpy (xtisa_error_msg, "invalid functional unit specifier"); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+xtensa_funcUnit
+xtensa_funcUnit_lookup (xtensa_isa isa, const char *fname)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_lookup_entry entry, *result = 0;
+
+  if (!fname || !*fname)
+    {
+      xtisa_errno = xtensa_isa_bad_funcUnit;
+      strcpy (xtisa_error_msg, "invalid functional unit name");
+      return XTENSA_UNDEFINED;
+    }
+
+  if (intisa->num_funcUnits != 0)
+    {
+      entry.key = fname;
+      result = bsearch (&entry, intisa->funcUnit_lookup_table,
+			intisa->num_funcUnits, sizeof (xtensa_lookup_entry),
+			xtensa_isa_name_compare);
+    }
+
+  if (!result)
+    {
+      xtisa_errno = xtensa_isa_bad_funcUnit;
+      sprintf (xtisa_error_msg,
+	       "functional unit \"%s\" not recognized", fname);
+      return XTENSA_UNDEFINED;
+    }
+
+  return result->u.fun;
+}
+
+
+const char *
+xtensa_funcUnit_name (xtensa_isa isa, xtensa_funcUnit fun)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_FUNCUNIT (intisa, fun, NULL);
+  return intisa->funcUnits[fun].name;
+}
+
+
+int
+xtensa_funcUnit_num_copies (xtensa_isa isa, xtensa_funcUnit fun)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_FUNCUNIT (intisa, fun, XTENSA_UNDEFINED);
+  return intisa->funcUnits[fun].num_copies;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/bfd/xtensa-modules.c sdcc-3.2.0+dfsg/support/sdbinutils/bfd/xtensa-modules.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/bfd/xtensa-modules.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/bfd/xtensa-modules.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,21292 @@
+/* Xtensa configuration-specific ISA information.
+   Copyright 2003, 2004, 2005 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#include "ansidecl.h"
+#include <xtensa-isa.h>
+#include "xtensa-isa-internal.h"
+
+
+/* Sysregs.  */
+
+static xtensa_sysreg_internal sysregs[] = {
+  { "LBEG", 0, 0 },
+  { "LEND", 1, 0 },
+  { "LCOUNT", 2, 0 },
+  { "BR", 4, 0 },
+  { "ACCLO", 16, 0 },
+  { "ACCHI", 17, 0 },
+  { "M0", 32, 0 },
+  { "M1", 33, 0 },
+  { "M2", 34, 0 },
+  { "M3", 35, 0 },
+  { "PTEVADDR", 83, 0 },
+  { "MMID", 89, 0 },
+  { "DDR", 104, 0 },
+  { "176", 176, 0 },
+  { "208", 208, 0 },
+  { "INTERRUPT", 226, 0 },
+  { "INTCLEAR", 227, 0 },
+  { "CCOUNT", 234, 0 },
+  { "PRID", 235, 0 },
+  { "ICOUNT", 236, 0 },
+  { "CCOMPARE0", 240, 0 },
+  { "CCOMPARE1", 241, 0 },
+  { "CCOMPARE2", 242, 0 },
+  { "VECBASE", 231, 0 },
+  { "EPC1", 177, 0 },
+  { "EPC2", 178, 0 },
+  { "EPC3", 179, 0 },
+  { "EPC4", 180, 0 },
+  { "EPC5", 181, 0 },
+  { "EPC6", 182, 0 },
+  { "EPC7", 183, 0 },
+  { "EXCSAVE1", 209, 0 },
+  { "EXCSAVE2", 210, 0 },
+  { "EXCSAVE3", 211, 0 },
+  { "EXCSAVE4", 212, 0 },
+  { "EXCSAVE5", 213, 0 },
+  { "EXCSAVE6", 214, 0 },
+  { "EXCSAVE7", 215, 0 },
+  { "EPS2", 194, 0 },
+  { "EPS3", 195, 0 },
+  { "EPS4", 196, 0 },
+  { "EPS5", 197, 0 },
+  { "EPS6", 198, 0 },
+  { "EPS7", 199, 0 },
+  { "EXCCAUSE", 232, 0 },
+  { "DEPC", 192, 0 },
+  { "EXCVADDR", 238, 0 },
+  { "WINDOWBASE", 72, 0 },
+  { "WINDOWSTART", 73, 0 },
+  { "SAR", 3, 0 },
+  { "LITBASE", 5, 0 },
+  { "PS", 230, 0 },
+  { "MISC0", 244, 0 },
+  { "MISC1", 245, 0 },
+  { "MISC2", 246, 0 },
+  { "MISC3", 247, 0 },
+  { "INTENABLE", 228, 0 },
+  { "DBREAKA0", 144, 0 },
+  { "DBREAKC0", 160, 0 },
+  { "DBREAKA1", 145, 0 },
+  { "DBREAKC1", 161, 0 },
+  { "IBREAKA0", 128, 0 },
+  { "IBREAKA1", 129, 0 },
+  { "IBREAKENABLE", 96, 0 },
+  { "ICOUNTLEVEL", 237, 0 },
+  { "DEBUGCAUSE", 233, 0 },
+  { "RASID", 90, 0 },
+  { "ITLBCFG", 91, 0 },
+  { "DTLBCFG", 92, 0 },
+  { "CPENABLE", 224, 0 },
+  { "SCOMPARE1", 12, 0 },
+  { "THREADPTR", 231, 1 },
+  { "FCR", 232, 1 },
+  { "FSR", 233, 1 }
+};
+
+#define NUM_SYSREGS 74
+#define MAX_SPECIAL_REG 247
+#define MAX_USER_REG 233
+
+
+/* Processor states.  */
+
+static xtensa_state_internal states[] = {
+  { "LCOUNT", 32, 0 },
+  { "PC", 32, 0 },
+  { "ICOUNT", 32, 0 },
+  { "DDR", 32, 0 },
+  { "INTERRUPT", 32, 0 },
+  { "CCOUNT", 32, 0 },
+  { "XTSYNC", 1, 0 },
+  { "VECBASE", 22, 0 },
+  { "EPC1", 32, 0 },
+  { "EPC2", 32, 0 },
+  { "EPC3", 32, 0 },
+  { "EPC4", 32, 0 },
+  { "EPC5", 32, 0 },
+  { "EPC6", 32, 0 },
+  { "EPC7", 32, 0 },
+  { "EXCSAVE1", 32, 0 },
+  { "EXCSAVE2", 32, 0 },
+  { "EXCSAVE3", 32, 0 },
+  { "EXCSAVE4", 32, 0 },
+  { "EXCSAVE5", 32, 0 },
+  { "EXCSAVE6", 32, 0 },
+  { "EXCSAVE7", 32, 0 },
+  { "EPS2", 15, 0 },
+  { "EPS3", 15, 0 },
+  { "EPS4", 15, 0 },
+  { "EPS5", 15, 0 },
+  { "EPS6", 15, 0 },
+  { "EPS7", 15, 0 },
+  { "EXCCAUSE", 6, 0 },
+  { "PSINTLEVEL", 4, 0 },
+  { "PSUM", 1, 0 },
+  { "PSWOE", 1, 0 },
+  { "PSRING", 2, 0 },
+  { "PSEXCM", 1, 0 },
+  { "DEPC", 32, 0 },
+  { "EXCVADDR", 32, 0 },
+  { "WindowBase", 4, 0 },
+  { "WindowStart", 16, 0 },
+  { "PSCALLINC", 2, 0 },
+  { "PSOWB", 4, 0 },
+  { "LBEG", 32, 0 },
+  { "LEND", 32, 0 },
+  { "SAR", 6, 0 },
+  { "THREADPTR", 32, 0 },
+  { "LITBADDR", 20, 0 },
+  { "LITBEN", 1, 0 },
+  { "MISC0", 32, 0 },
+  { "MISC1", 32, 0 },
+  { "MISC2", 32, 0 },
+  { "MISC3", 32, 0 },
+  { "ACC", 40, 0 },
+  { "InOCDMode", 1, 0 },
+  { "INTENABLE", 32, 0 },
+  { "DBREAKA0", 32, 0 },
+  { "DBREAKC0", 8, 0 },
+  { "DBREAKA1", 32, 0 },
+  { "DBREAKC1", 8, 0 },
+  { "IBREAKA0", 32, 0 },
+  { "IBREAKA1", 32, 0 },
+  { "IBREAKENABLE", 2, 0 },
+  { "ICOUNTLEVEL", 4, 0 },
+  { "DEBUGCAUSE", 6, 0 },
+  { "DBNUM", 4, 0 },
+  { "CCOMPARE0", 32, 0 },
+  { "CCOMPARE1", 32, 0 },
+  { "CCOMPARE2", 32, 0 },
+  { "ASID3", 8, 0 },
+  { "ASID2", 8, 0 },
+  { "ASID1", 8, 0 },
+  { "INSTPGSZID4", 2, 0 },
+  { "DATAPGSZID4", 2, 0 },
+  { "PTBASE", 10, 0 },
+  { "CPENABLE", 1, 0 },
+  { "SCOMPARE1", 32, 0 },
+  { "RoundMode", 2, 0 },
+  { "InvalidEnable", 1, 0 },
+  { "DivZeroEnable", 1, 0 },
+  { "OverflowEnable", 1, 0 },
+  { "UnderflowEnable", 1, 0 },
+  { "InexactEnable", 1, 0 },
+  { "InvalidFlag", 1, 0 },
+  { "DivZeroFlag", 1, 0 },
+  { "OverflowFlag", 1, 0 },
+  { "UnderflowFlag", 1, 0 },
+  { "InexactFlag", 1, 0 },
+  { "FPreserved20", 20, 0 },
+  { "FPreserved20a", 20, 0 },
+  { "FPreserved5", 5, 0 },
+  { "FPreserved7", 7, 0 }
+};
+
+#define NUM_STATES 89
+
+/* Macros for xtensa_state numbers (for use in iclasses because the
+   state numbers are not available when the iclass table is generated).  */
+
+#define STATE_LCOUNT 0
+#define STATE_PC 1
+#define STATE_ICOUNT 2
+#define STATE_DDR 3
+#define STATE_INTERRUPT 4
+#define STATE_CCOUNT 5
+#define STATE_XTSYNC 6
+#define STATE_VECBASE 7
+#define STATE_EPC1 8
+#define STATE_EPC2 9
+#define STATE_EPC3 10
+#define STATE_EPC4 11
+#define STATE_EPC5 12
+#define STATE_EPC6 13
+#define STATE_EPC7 14
+#define STATE_EXCSAVE1 15
+#define STATE_EXCSAVE2 16
+#define STATE_EXCSAVE3 17
+#define STATE_EXCSAVE4 18
+#define STATE_EXCSAVE5 19
+#define STATE_EXCSAVE6 20
+#define STATE_EXCSAVE7 21
+#define STATE_EPS2 22
+#define STATE_EPS3 23
+#define STATE_EPS4 24
+#define STATE_EPS5 25
+#define STATE_EPS6 26
+#define STATE_EPS7 27
+#define STATE_EXCCAUSE 28
+#define STATE_PSINTLEVEL 29
+#define STATE_PSUM 30
+#define STATE_PSWOE 31
+#define STATE_PSRING 32
+#define STATE_PSEXCM 33
+#define STATE_DEPC 34
+#define STATE_EXCVADDR 35
+#define STATE_WindowBase 36
+#define STATE_WindowStart 37
+#define STATE_PSCALLINC 38
+#define STATE_PSOWB 39
+#define STATE_LBEG 40
+#define STATE_LEND 41
+#define STATE_SAR 42
+#define STATE_THREADPTR 43
+#define STATE_LITBADDR 44
+#define STATE_LITBEN 45
+#define STATE_MISC0 46
+#define STATE_MISC1 47
+#define STATE_MISC2 48
+#define STATE_MISC3 49
+#define STATE_ACC 50
+#define STATE_InOCDMode 51
+#define STATE_INTENABLE 52
+#define STATE_DBREAKA0 53
+#define STATE_DBREAKC0 54
+#define STATE_DBREAKA1 55
+#define STATE_DBREAKC1 56
+#define STATE_IBREAKA0 57
+#define STATE_IBREAKA1 58
+#define STATE_IBREAKENABLE 59
+#define STATE_ICOUNTLEVEL 60
+#define STATE_DEBUGCAUSE 61
+#define STATE_DBNUM 62
+#define STATE_CCOMPARE0 63
+#define STATE_CCOMPARE1 64
+#define STATE_CCOMPARE2 65
+#define STATE_ASID3 66
+#define STATE_ASID2 67
+#define STATE_ASID1 68
+#define STATE_INSTPGSZID4 69
+#define STATE_DATAPGSZID4 70
+#define STATE_PTBASE 71
+#define STATE_CPENABLE 72
+#define STATE_SCOMPARE1 73
+#define STATE_RoundMode 74
+#define STATE_InvalidEnable 75
+#define STATE_DivZeroEnable 76
+#define STATE_OverflowEnable 77
+#define STATE_UnderflowEnable 78
+#define STATE_InexactEnable 79
+#define STATE_InvalidFlag 80
+#define STATE_DivZeroFlag 81
+#define STATE_OverflowFlag 82
+#define STATE_UnderflowFlag 83
+#define STATE_InexactFlag 84
+#define STATE_FPreserved20 85
+#define STATE_FPreserved20a 86
+#define STATE_FPreserved5 87
+#define STATE_FPreserved7 88
+
+
+/* Field definitions.  */
+
+static unsigned
+Field_t_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+  return tie_t;
+}
+
+static void
+Field_t_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+}
+
+static unsigned
+Field_t_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+  return tie_t;
+}
+
+static void
+Field_t_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+}
+
+static unsigned
+Field_t_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+  return tie_t;
+}
+
+static void
+Field_t_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+}
+
+static unsigned
+Field_t_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+  return tie_t;
+}
+
+static void
+Field_t_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+}
+
+static unsigned
+Field_t_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+  return tie_t;
+}
+
+static void
+Field_t_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+}
+
+static unsigned
+Field_t_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+  return tie_t;
+}
+
+static void
+Field_t_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+}
+
+static unsigned
+Field_t_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+  return tie_t;
+}
+
+static void
+Field_t_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+}
+
+static unsigned
+Field_bbi4_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+  return tie_t;
+}
+
+static void
+Field_bbi4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+}
+
+static unsigned
+Field_bbi_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+  tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+  return tie_t;
+}
+
+static void
+Field_bbi_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+  tie_t = (val << 27) >> 31;
+  insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+}
+
+static unsigned
+Field_bbi_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+  return tie_t;
+}
+
+static void
+Field_bbi_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+  tie_t = (val << 27) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+}
+
+static unsigned
+Field_imm12_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 12) | ((insn[0] << 8) >> 20);
+  return tie_t;
+}
+
+static void
+Field_imm12_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 20) >> 20;
+  insn[0] = (insn[0] & ~0xfff000) | (tie_t << 12);
+}
+
+static unsigned
+Field_imm8_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 8) | ((insn[0] << 8) >> 24);
+  return tie_t;
+}
+
+static void
+Field_imm8_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 24) >> 24;
+  insn[0] = (insn[0] & ~0xff0000) | (tie_t << 16);
+}
+
+static unsigned
+Field_imm8_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 8) | ((insn[0] << 12) >> 24);
+  return tie_t;
+}
+
+static void
+Field_imm8_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 24) >> 24;
+  insn[0] = (insn[0] & ~0xff000) | (tie_t << 12);
+}
+
+static unsigned
+Field_imm8_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+  tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+  return tie_t;
+}
+
+static void
+Field_imm8_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+  tie_t = (val << 24) >> 28;
+  insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+}
+
+static unsigned
+Field_s_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+  return tie_t;
+}
+
+static void
+Field_s_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+}
+
+static unsigned
+Field_s_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+  return tie_t;
+}
+
+static void
+Field_s_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+}
+
+static unsigned
+Field_s_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+  return tie_t;
+}
+
+static void
+Field_s_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+}
+
+static unsigned
+Field_s_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+  return tie_t;
+}
+
+static void
+Field_s_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+}
+
+static unsigned
+Field_s_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+  return tie_t;
+}
+
+static void
+Field_s_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+}
+
+static unsigned
+Field_s_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+  return tie_t;
+}
+
+static void
+Field_s_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+}
+
+static unsigned
+Field_s_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+  return tie_t;
+}
+
+static void
+Field_s_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+}
+
+static unsigned
+Field_imm12b_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+  tie_t = (tie_t << 8) | ((insn[0] << 8) >> 24);
+  return tie_t;
+}
+
+static void
+Field_imm12b_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 24) >> 24;
+  insn[0] = (insn[0] & ~0xff0000) | (tie_t << 16);
+  tie_t = (val << 20) >> 28;
+  insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+}
+
+static unsigned
+Field_imm12b_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+  tie_t = (tie_t << 8) | ((insn[0] << 12) >> 24);
+  return tie_t;
+}
+
+static void
+Field_imm12b_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 24) >> 24;
+  insn[0] = (insn[0] & ~0xff000) | (tie_t << 12);
+  tie_t = (val << 20) >> 28;
+  insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+}
+
+static unsigned
+Field_imm12b_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 12) | ((insn[0] << 16) >> 20);
+  return tie_t;
+}
+
+static void
+Field_imm12b_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 20) >> 20;
+  insn[0] = (insn[0] & ~0xfff0) | (tie_t << 4);
+}
+
+static unsigned
+Field_imm16_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 16) | ((insn[0] << 8) >> 16);
+  return tie_t;
+}
+
+static void
+Field_imm16_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 16) >> 16;
+  insn[0] = (insn[0] & ~0xffff00) | (tie_t << 8);
+}
+
+static unsigned
+Field_imm16_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 16) | ((insn[0] << 12) >> 16);
+  return tie_t;
+}
+
+static void
+Field_imm16_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 16) >> 16;
+  insn[0] = (insn[0] & ~0xffff0) | (tie_t << 4);
+}
+
+static unsigned
+Field_m_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 24) >> 30);
+  return tie_t;
+}
+
+static void
+Field_m_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0xc0) | (tie_t << 6);
+}
+
+static unsigned
+Field_m_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 28) >> 30);
+  return tie_t;
+}
+
+static void
+Field_m_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0xc) | (tie_t << 2);
+}
+
+static unsigned
+Field_n_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
+  return tie_t;
+}
+
+static void
+Field_n_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
+}
+
+static unsigned
+Field_n_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 30) >> 30);
+  return tie_t;
+}
+
+static void
+Field_n_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0x3) | (tie_t << 0);
+}
+
+static unsigned
+Field_offset_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 18) | ((insn[0] << 8) >> 14);
+  return tie_t;
+}
+
+static void
+Field_offset_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 14) >> 14;
+  insn[0] = (insn[0] & ~0xffffc0) | (tie_t << 6);
+}
+
+static unsigned
+Field_offset_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 18) | ((insn[0] << 14) >> 14);
+  return tie_t;
+}
+
+static void
+Field_offset_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 14) >> 14;
+  insn[0] = (insn[0] & ~0x3ffff) | (tie_t << 0);
+}
+
+static unsigned
+Field_op0_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+  return tie_t;
+}
+
+static void
+Field_op0_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+}
+
+static unsigned
+Field_op0_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+  return tie_t;
+}
+
+static void
+Field_op0_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+}
+
+static unsigned
+Field_op0_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+  return tie_t;
+}
+
+static void
+Field_op0_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+}
+
+static unsigned
+Field_op1_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 12) >> 28);
+  return tie_t;
+}
+
+static void
+Field_op1_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf0000) | (tie_t << 16);
+}
+
+static unsigned
+Field_op1_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+  return tie_t;
+}
+
+static void
+Field_op1_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+}
+
+static unsigned
+Field_op2_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 8) >> 28);
+  return tie_t;
+}
+
+static void
+Field_op2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf00000) | (tie_t << 20);
+}
+
+static unsigned
+Field_op2_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 12) >> 28);
+  return tie_t;
+}
+
+static void
+Field_op2_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf0000) | (tie_t << 16);
+}
+
+static unsigned
+Field_op2_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+  return tie_t;
+}
+
+static void
+Field_op2_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+}
+
+static unsigned
+Field_r_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+  return tie_t;
+}
+
+static void
+Field_r_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+}
+
+static unsigned
+Field_r_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+  return tie_t;
+}
+
+static void
+Field_r_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+}
+
+static unsigned
+Field_r_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+  return tie_t;
+}
+
+static void
+Field_r_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+}
+
+static unsigned
+Field_r_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+  return tie_t;
+}
+
+static void
+Field_r_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+}
+
+static unsigned
+Field_r_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+  return tie_t;
+}
+
+static void
+Field_r_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+}
+
+static unsigned
+Field_r_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+  return tie_t;
+}
+
+static void
+Field_r_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+}
+
+static unsigned
+Field_r_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+  return tie_t;
+}
+
+static void
+Field_r_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+}
+
+static unsigned
+Field_sa4_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 11) >> 31);
+  return tie_t;
+}
+
+static void
+Field_sa4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x100000) | (tie_t << 20);
+}
+
+static unsigned
+Field_sae4_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 15) >> 31);
+  return tie_t;
+}
+
+static void
+Field_sae4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x10000) | (tie_t << 16);
+}
+
+static unsigned
+Field_sae4_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+  return tie_t;
+}
+
+static void
+Field_sae4_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+}
+
+static unsigned
+Field_sae_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 15) >> 31);
+  tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+  return tie_t;
+}
+
+static void
+Field_sae_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+  tie_t = (val << 27) >> 31;
+  insn[0] = (insn[0] & ~0x10000) | (tie_t << 16);
+}
+
+static unsigned
+Field_sae_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+  tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+  return tie_t;
+}
+
+static void
+Field_sae_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+  tie_t = (val << 27) >> 31;
+  insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+}
+
+static unsigned
+Field_sae_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 5) | ((insn[0] << 15) >> 27);
+  return tie_t;
+}
+
+static void
+Field_sae_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 27) >> 27;
+  insn[0] = (insn[0] & ~0x1f000) | (tie_t << 12);
+}
+
+static unsigned
+Field_sal_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 11) >> 31);
+  tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+  return tie_t;
+}
+
+static void
+Field_sal_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+  tie_t = (val << 27) >> 31;
+  insn[0] = (insn[0] & ~0x100000) | (tie_t << 20);
+}
+
+static unsigned
+Field_sal_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 15) >> 31);
+  tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+  return tie_t;
+}
+
+static void
+Field_sal_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+  tie_t = (val << 27) >> 31;
+  insn[0] = (insn[0] & ~0x10000) | (tie_t << 16);
+}
+
+static unsigned
+Field_sal_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+  tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+  return tie_t;
+}
+
+static void
+Field_sal_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+  tie_t = (val << 27) >> 31;
+  insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+}
+
+static unsigned
+Field_sargt_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 11) >> 31);
+  tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+  return tie_t;
+}
+
+static void
+Field_sargt_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+  tie_t = (val << 27) >> 31;
+  insn[0] = (insn[0] & ~0x100000) | (tie_t << 20);
+}
+
+static unsigned
+Field_sargt_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 15) >> 31);
+  tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+  return tie_t;
+}
+
+static void
+Field_sargt_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+  tie_t = (val << 27) >> 31;
+  insn[0] = (insn[0] & ~0x10000) | (tie_t << 16);
+}
+
+static unsigned
+Field_sargt_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 5) | ((insn[0] << 19) >> 27);
+  return tie_t;
+}
+
+static void
+Field_sargt_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 27) >> 27;
+  insn[0] = (insn[0] & ~0x1f00) | (tie_t << 8);
+}
+
+static unsigned
+Field_sargt_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 5) | ((insn[0] << 19) >> 27);
+  return tie_t;
+}
+
+static void
+Field_sargt_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 27) >> 27;
+  insn[0] = (insn[0] & ~0x1f00) | (tie_t << 8);
+}
+
+static unsigned
+Field_sas4_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 27) >> 31);
+  return tie_t;
+}
+
+static void
+Field_sas4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x10) | (tie_t << 4);
+}
+
+static unsigned
+Field_sas_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 27) >> 31);
+  tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+  return tie_t;
+}
+
+static void
+Field_sas_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+  tie_t = (val << 27) >> 31;
+  insn[0] = (insn[0] & ~0x10) | (tie_t << 4);
+}
+
+static unsigned
+Field_sas_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 31) >> 31);
+  tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+  return tie_t;
+}
+
+static void
+Field_sas_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+  tie_t = (val << 27) >> 31;
+  insn[0] = (insn[0] & ~0x1) | (tie_t << 0);
+}
+
+static unsigned
+Field_sr_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+  tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+  return tie_t;
+}
+
+static void
+Field_sr_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+  tie_t = (val << 24) >> 28;
+  insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+}
+
+static unsigned
+Field_sr_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+  tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+  return tie_t;
+}
+
+static void
+Field_sr_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+  tie_t = (val << 24) >> 28;
+  insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+}
+
+static unsigned
+Field_sr_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+  tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+  return tie_t;
+}
+
+static void
+Field_sr_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+  tie_t = (val << 24) >> 28;
+  insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+}
+
+static unsigned
+Field_st_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+  tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+  return tie_t;
+}
+
+static void
+Field_st_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+  tie_t = (val << 24) >> 28;
+  insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+}
+
+static unsigned
+Field_st_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+  tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+  return tie_t;
+}
+
+static void
+Field_st_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+  tie_t = (val << 24) >> 28;
+  insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+}
+
+static unsigned
+Field_st_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+  tie_t = (tie_t << 4) | ((insn[0] << 24) >> 28);
+  return tie_t;
+}
+
+static void
+Field_st_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf0) | (tie_t << 4);
+  tie_t = (val << 24) >> 28;
+  insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+}
+
+static unsigned
+Field_thi3_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 24) >> 29);
+  return tie_t;
+}
+
+static void
+Field_thi3_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0xe0) | (tie_t << 5);
+}
+
+static unsigned
+Field_thi3_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 28) >> 29);
+  return tie_t;
+}
+
+static void
+Field_thi3_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0xe) | (tie_t << 1);
+}
+
+static unsigned
+Field_imm4_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+  return tie_t;
+}
+
+static void
+Field_imm4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+}
+
+static unsigned
+Field_imm4_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+  return tie_t;
+}
+
+static void
+Field_imm4_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+}
+
+static unsigned
+Field_imm4_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+  return tie_t;
+}
+
+static void
+Field_imm4_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+}
+
+static unsigned
+Field_mn_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 24) >> 30);
+  tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
+  return tie_t;
+}
+
+static void
+Field_mn_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
+  tie_t = (val << 28) >> 30;
+  insn[0] = (insn[0] & ~0xc0) | (tie_t << 6);
+}
+
+static unsigned
+Field_i_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+  return tie_t;
+}
+
+static void
+Field_i_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+}
+
+static unsigned
+Field_i_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+  return tie_t;
+}
+
+static void
+Field_i_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+}
+
+static unsigned
+Field_imm6lo_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+  return tie_t;
+}
+
+static void
+Field_imm6lo_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+}
+
+static unsigned
+Field_imm6lo_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+  return tie_t;
+}
+
+static void
+Field_imm6lo_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+}
+
+static unsigned
+Field_imm6hi_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
+  return tie_t;
+}
+
+static void
+Field_imm6hi_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
+}
+
+static unsigned
+Field_imm6hi_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
+  return tie_t;
+}
+
+static void
+Field_imm6hi_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
+}
+
+static unsigned
+Field_imm7lo_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+  return tie_t;
+}
+
+static void
+Field_imm7lo_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+}
+
+static unsigned
+Field_imm7lo_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+  return tie_t;
+}
+
+static void
+Field_imm7lo_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+}
+
+static unsigned
+Field_imm7hi_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 25) >> 29);
+  return tie_t;
+}
+
+static void
+Field_imm7hi_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0x70) | (tie_t << 4);
+}
+
+static unsigned
+Field_imm7hi_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 25) >> 29);
+  return tie_t;
+}
+
+static void
+Field_imm7hi_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0x70) | (tie_t << 4);
+}
+
+static unsigned
+Field_z_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 25) >> 31);
+  return tie_t;
+}
+
+static void
+Field_z_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x40) | (tie_t << 6);
+}
+
+static unsigned
+Field_z_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 25) >> 31);
+  return tie_t;
+}
+
+static void
+Field_z_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x40) | (tie_t << 6);
+}
+
+static unsigned
+Field_imm6_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
+  tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+  return tie_t;
+}
+
+static void
+Field_imm6_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+  tie_t = (val << 26) >> 30;
+  insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
+}
+
+static unsigned
+Field_imm6_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
+  tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+  return tie_t;
+}
+
+static void
+Field_imm6_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+  tie_t = (val << 26) >> 30;
+  insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
+}
+
+static unsigned
+Field_imm7_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 25) >> 29);
+  tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+  return tie_t;
+}
+
+static void
+Field_imm7_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+  tie_t = (val << 25) >> 29;
+  insn[0] = (insn[0] & ~0x70) | (tie_t << 4);
+}
+
+static unsigned
+Field_imm7_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 25) >> 29);
+  tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+  return tie_t;
+}
+
+static void
+Field_imm7_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+  tie_t = (val << 25) >> 29;
+  insn[0] = (insn[0] & ~0x70) | (tie_t << 4);
+}
+
+static unsigned
+Field_imm7_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 7) | ((insn[0] << 25) >> 25);
+  return tie_t;
+}
+
+static void
+Field_imm7_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 25) >> 25;
+  insn[0] = (insn[0] & ~0x7f) | (tie_t << 0);
+}
+
+static unsigned
+Field_r3_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
+  return tie_t;
+}
+
+static void
+Field_r3_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
+}
+
+static unsigned
+Field_rbit2_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 17) >> 31);
+  return tie_t;
+}
+
+static void
+Field_rbit2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x4000) | (tie_t << 14);
+}
+
+static unsigned
+Field_rhi_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 16) >> 30);
+  return tie_t;
+}
+
+static void
+Field_rhi_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0xc000) | (tie_t << 14);
+}
+
+static unsigned
+Field_t3_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+  return tie_t;
+}
+
+static void
+Field_t3_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+}
+
+static unsigned
+Field_tbit2_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 25) >> 31);
+  return tie_t;
+}
+
+static void
+Field_tbit2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x40) | (tie_t << 6);
+}
+
+static unsigned
+Field_tlo_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 26) >> 30);
+  return tie_t;
+}
+
+static void
+Field_tlo_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0x30) | (tie_t << 4);
+}
+
+static unsigned
+Field_w_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 18) >> 30);
+  return tie_t;
+}
+
+static void
+Field_w_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0x3000) | (tie_t << 12);
+}
+
+static unsigned
+Field_y_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 25) >> 31);
+  return tie_t;
+}
+
+static void
+Field_y_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x40) | (tie_t << 6);
+}
+
+static unsigned
+Field_x_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 17) >> 31);
+  return tie_t;
+}
+
+static void
+Field_x_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x4000) | (tie_t << 14);
+}
+
+static unsigned
+Field_t2_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 24) >> 29);
+  return tie_t;
+}
+
+static void
+Field_t2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0xe0) | (tie_t << 5);
+}
+
+static unsigned
+Field_t2_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 24) >> 29);
+  return tie_t;
+}
+
+static void
+Field_t2_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0xe0) | (tie_t << 5);
+}
+
+static unsigned
+Field_t2_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 24) >> 29);
+  return tie_t;
+}
+
+static void
+Field_t2_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0xe0) | (tie_t << 5);
+}
+
+static unsigned
+Field_s2_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
+  return tie_t;
+}
+
+static void
+Field_s2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
+}
+
+static unsigned
+Field_s2_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
+  return tie_t;
+}
+
+static void
+Field_s2_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
+}
+
+static unsigned
+Field_s2_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 20) >> 29);
+  return tie_t;
+}
+
+static void
+Field_s2_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0xe00) | (tie_t << 9);
+}
+
+static unsigned
+Field_r2_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
+  return tie_t;
+}
+
+static void
+Field_r2_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
+}
+
+static unsigned
+Field_r2_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
+  return tie_t;
+}
+
+static void
+Field_r2_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
+}
+
+static unsigned
+Field_r2_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
+  return tie_t;
+}
+
+static void
+Field_r2_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
+}
+
+static unsigned
+Field_t4_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 24) >> 30);
+  return tie_t;
+}
+
+static void
+Field_t4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0xc0) | (tie_t << 6);
+}
+
+static unsigned
+Field_t4_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 24) >> 30);
+  return tie_t;
+}
+
+static void
+Field_t4_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0xc0) | (tie_t << 6);
+}
+
+static unsigned
+Field_t4_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 24) >> 30);
+  return tie_t;
+}
+
+static void
+Field_t4_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0xc0) | (tie_t << 6);
+}
+
+static unsigned
+Field_s4_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 20) >> 30);
+  return tie_t;
+}
+
+static void
+Field_s4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0xc00) | (tie_t << 10);
+}
+
+static unsigned
+Field_s4_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 20) >> 30);
+  return tie_t;
+}
+
+static void
+Field_s4_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0xc00) | (tie_t << 10);
+}
+
+static unsigned
+Field_s4_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 20) >> 30);
+  return tie_t;
+}
+
+static void
+Field_s4_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0xc00) | (tie_t << 10);
+}
+
+static unsigned
+Field_r4_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 16) >> 30);
+  return tie_t;
+}
+
+static void
+Field_r4_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0xc000) | (tie_t << 14);
+}
+
+static unsigned
+Field_r4_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 16) >> 30);
+  return tie_t;
+}
+
+static void
+Field_r4_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0xc000) | (tie_t << 14);
+}
+
+static unsigned
+Field_r4_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 16) >> 30);
+  return tie_t;
+}
+
+static void
+Field_r4_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0xc000) | (tie_t << 14);
+}
+
+static unsigned
+Field_t8_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+  return tie_t;
+}
+
+static void
+Field_t8_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+}
+
+static unsigned
+Field_t8_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+  return tie_t;
+}
+
+static void
+Field_t8_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+}
+
+static unsigned
+Field_t8_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+  return tie_t;
+}
+
+static void
+Field_t8_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+}
+
+static unsigned
+Field_s8_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 20) >> 31);
+  return tie_t;
+}
+
+static void
+Field_s8_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
+}
+
+static unsigned
+Field_s8_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 20) >> 31);
+  return tie_t;
+}
+
+static void
+Field_s8_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
+}
+
+static unsigned
+Field_s8_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 20) >> 31);
+  return tie_t;
+}
+
+static void
+Field_s8_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
+}
+
+static unsigned
+Field_r8_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
+  return tie_t;
+}
+
+static void
+Field_r8_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
+}
+
+static unsigned
+Field_r8_Slot_inst16a_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
+  return tie_t;
+}
+
+static void
+Field_r8_Slot_inst16a_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
+}
+
+static unsigned
+Field_r8_Slot_inst16b_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 16) >> 31);
+  return tie_t;
+}
+
+static void
+Field_r8_Slot_inst16b_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x8000) | (tie_t << 15);
+}
+
+static unsigned
+Field_xt_wbr15_imm_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 15) | ((insn[0] << 8) >> 17);
+  return tie_t;
+}
+
+static void
+Field_xt_wbr15_imm_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 17) >> 17;
+  insn[0] = (insn[0] & ~0xfffe00) | (tie_t << 9);
+}
+
+static unsigned
+Field_xt_wbr18_imm_Slot_inst_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 18) | ((insn[0] << 8) >> 14);
+  return tie_t;
+}
+
+static void
+Field_xt_wbr18_imm_Slot_inst_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 14) >> 14;
+  insn[0] = (insn[0] & ~0xffffc0) | (tie_t << 6);
+}
+
+static unsigned
+Field_xt_wbr18_imm_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 18) | ((insn[0] << 6) >> 14);
+  return tie_t;
+}
+
+static void
+Field_xt_wbr18_imm_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 14) >> 14;
+  insn[0] = (insn[0] & ~0x3ffff00) | (tie_t << 8);
+}
+
+static unsigned
+Field_op0_xt_flix64_slot0_s3_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 8) >> 28);
+  return tie_t;
+}
+
+static void
+Field_op0_xt_flix64_slot0_s3_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf00000) | (tie_t << 20);
+}
+
+static unsigned
+Field_combined3e2c5767_fld7_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld7_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
+}
+
+static unsigned
+Field_combined3e2c5767_fld8_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld8_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
+}
+
+static unsigned
+Field_combined3e2c5767_fld9_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 12) >> 29);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld9_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0xe0000) | (tie_t << 17);
+}
+
+static unsigned
+Field_combined3e2c5767_fld11_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 12) >> 29);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld11_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0xe0000) | (tie_t << 17);
+}
+
+static unsigned
+Field_combined3e2c5767_fld49xt_flix64_slot0_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 12) >> 28);
+  tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld49xt_flix64_slot0_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+  tie_t = (val << 24) >> 28;
+  insn[0] = (insn[0] & ~0xf0000) | (tie_t << 16);
+}
+
+static unsigned
+Field_op0_s4_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 12) >> 30);
+  return tie_t;
+}
+
+static void
+Field_op0_s4_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0xc0000) | (tie_t << 18);
+}
+
+static unsigned
+Field_combined3e2c5767_fld16_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 16) >> 28);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld16_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf000) | (tie_t << 12);
+}
+
+static unsigned
+Field_combined3e2c5767_fld19xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 14) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld19xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x20000) | (tie_t << 17);
+}
+
+static unsigned
+Field_combined3e2c5767_fld20xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 14) >> 30);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld20xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0x30000) | (tie_t << 16);
+}
+
+static unsigned
+Field_combined3e2c5767_fld21xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 5) | ((insn[0] << 14) >> 27);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld21xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 27) >> 27;
+  insn[0] = (insn[0] & ~0x3e000) | (tie_t << 13);
+}
+
+static unsigned
+Field_combined3e2c5767_fld22xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld22xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 26) >> 26;
+  insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
+}
+
+static unsigned
+Field_combined3e2c5767_fld23xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
+  tie_t = (tie_t << 3) | ((insn[0] << 25) >> 29);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld23xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0x70) | (tie_t << 4);
+  tie_t = (val << 23) >> 26;
+  insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
+}
+
+static unsigned
+Field_combined3e2c5767_fld25xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
+  tie_t = (tie_t << 3) | ((insn[0] << 25) >> 29);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld25xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0x70) | (tie_t << 4);
+  tie_t = (val << 23) >> 26;
+  insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
+}
+
+static unsigned
+Field_combined3e2c5767_fld26xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
+  tie_t = (tie_t << 2) | ((insn[0] << 25) >> 30);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld26xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0x60) | (tie_t << 5);
+  tie_t = (val << 24) >> 26;
+  insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
+}
+
+static unsigned
+Field_combined3e2c5767_fld28xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
+  tie_t = (tie_t << 1) | ((insn[0] << 25) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld28xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x40) | (tie_t << 6);
+  tie_t = (val << 25) >> 26;
+  insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
+}
+
+static unsigned
+Field_combined3e2c5767_fld30xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
+  tie_t = (tie_t << 2) | ((insn[0] << 22) >> 30);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld30xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0x300) | (tie_t << 8);
+  tie_t = (val << 24) >> 26;
+  insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
+}
+
+static unsigned
+Field_combined3e2c5767_fld32xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
+  tie_t = (tie_t << 2) | ((insn[0] << 22) >> 30);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld32xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0x300) | (tie_t << 8);
+  tie_t = (val << 24) >> 26;
+  insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
+}
+
+static unsigned
+Field_combined3e2c5767_fld33xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 6) | ((insn[0] << 14) >> 26);
+  tie_t = (tie_t << 1) | ((insn[0] << 22) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld33xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x200) | (tie_t << 9);
+  tie_t = (val << 25) >> 26;
+  insn[0] = (insn[0] & ~0x3f000) | (tie_t << 12);
+}
+
+static unsigned
+Field_combined3e2c5767_fld35xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 14) >> 29);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld35xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0x38000) | (tie_t << 15);
+}
+
+static unsigned
+Field_combined3e2c5767_fld51xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld51xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+}
+
+static unsigned
+Field_combined3e2c5767_fld52xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+  tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld52xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+  tie_t = (val << 27) >> 31;
+  insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+}
+
+static unsigned
+Field_combined3e2c5767_fld53xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 20) >> 30);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld53xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0xc00) | (tie_t << 10);
+}
+
+static unsigned
+Field_combined3e2c5767_fld54xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 5) | ((insn[0] << 20) >> 27);
+  tie_t = (tie_t << 6) | ((insn[0] << 26) >> 26);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld54xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 26) >> 26;
+  insn[0] = (insn[0] & ~0x3f) | (tie_t << 0);
+  tie_t = (val << 21) >> 27;
+  insn[0] = (insn[0] & ~0xf80) | (tie_t << 7);
+}
+
+static unsigned
+Field_combined3e2c5767_fld57xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+  tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld57xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+  tie_t = (val << 27) >> 31;
+  insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+}
+
+static unsigned
+Field_combined3e2c5767_fld58xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 20) >> 30);
+  tie_t = (tie_t << 1) | ((insn[0] << 23) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld58xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x100) | (tie_t << 8);
+  tie_t = (val << 29) >> 30;
+  insn[0] = (insn[0] & ~0xc00) | (tie_t << 10);
+}
+
+static unsigned
+Field_combined3e2c5767_fld60xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+  tie_t = (tie_t << 5) | ((insn[0] << 27) >> 27);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld60xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 27) >> 27;
+  insn[0] = (insn[0] & ~0x1f) | (tie_t << 0);
+  tie_t = (val << 26) >> 31;
+  insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+}
+
+static unsigned
+Field_combined3e2c5767_fld62xt_flix64_slot1_Slot_xt_flix64_slot1_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 17) >> 29);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld62xt_flix64_slot1_Slot_xt_flix64_slot1_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0x7000) | (tie_t << 12);
+}
+
+static unsigned
+Field_op0_s5_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[0] << 16) >> 29);
+  return tie_t;
+}
+
+static void
+Field_op0_s5_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0xe000) | (tie_t << 13);
+}
+
+static unsigned
+Field_combined3e2c5767_fld36xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld36xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+}
+
+static unsigned
+Field_combined3e2c5767_fld37xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+  tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld37xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+  tie_t = (val << 30) >> 31;
+  insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+}
+
+static unsigned
+Field_combined3e2c5767_fld39xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+  tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+  tie_t = (tie_t << 1) | ((insn[0] << 27) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld39xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x10) | (tie_t << 4);
+  tie_t = (val << 30) >> 31;
+  insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+  tie_t = (val << 29) >> 31;
+  insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+}
+
+static unsigned
+Field_combined3e2c5767_fld41xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+  tie_t = (tie_t << 1) | ((insn[0] << 24) >> 31);
+  tie_t = (tie_t << 1) | ((insn[0] << 27) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld41xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x10) | (tie_t << 4);
+  tie_t = (val << 30) >> 31;
+  insn[0] = (insn[0] & ~0x80) | (tie_t << 7);
+  tie_t = (val << 29) >> 31;
+  insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+}
+
+static unsigned
+Field_combined3e2c5767_fld42xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+  tie_t = (tie_t << 3) | ((insn[0] << 21) >> 29);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld42xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0x700) | (tie_t << 8);
+  tie_t = (val << 28) >> 31;
+  insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+}
+
+static unsigned
+Field_combined3e2c5767_fld44xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+  tie_t = (tie_t << 3) | ((insn[0] << 21) >> 29);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld44xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[0] = (insn[0] & ~0x700) | (tie_t << 8);
+  tie_t = (val << 28) >> 31;
+  insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+}
+
+static unsigned
+Field_combined3e2c5767_fld45xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+  tie_t = (tie_t << 2) | ((insn[0] << 21) >> 30);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld45xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0x600) | (tie_t << 9);
+  tie_t = (val << 29) >> 31;
+  insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+}
+
+static unsigned
+Field_combined3e2c5767_fld47xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 19) >> 31);
+  tie_t = (tie_t << 1) | ((insn[0] << 21) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld47xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x400) | (tie_t << 10);
+  tie_t = (val << 30) >> 31;
+  insn[0] = (insn[0] & ~0x1000) | (tie_t << 12);
+}
+
+static unsigned
+Field_combined3e2c5767_fld63xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 2) | ((insn[0] << 25) >> 30);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld63xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0x60) | (tie_t << 5);
+}
+
+static unsigned
+Field_combined3e2c5767_fld64xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 20) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld64xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
+}
+
+static unsigned
+Field_combined3e2c5767_fld65xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 20) >> 28);
+  tie_t = (tie_t << 2) | ((insn[0] << 25) >> 30);
+  tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld65xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+  tie_t = (val << 26) >> 30;
+  insn[0] = (insn[0] & ~0x60) | (tie_t << 5);
+  tie_t = (val << 22) >> 28;
+  insn[0] = (insn[0] & ~0xf00) | (tie_t << 8);
+}
+
+static unsigned
+Field_combined3e2c5767_fld66xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 20) >> 31);
+  tie_t = (tie_t << 1) | ((insn[0] << 23) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld66xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x100) | (tie_t << 8);
+  tie_t = (val << 30) >> 31;
+  insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
+}
+
+static unsigned
+Field_combined3e2c5767_fld68xt_flix64_slot2_Slot_xt_flix64_slot2_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 1) | ((insn[0] << 20) >> 31);
+  tie_t = (tie_t << 2) | ((insn[0] << 22) >> 30);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld68xt_flix64_slot2_Slot_xt_flix64_slot2_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 30) >> 30;
+  insn[0] = (insn[0] & ~0x300) | (tie_t << 8);
+  tie_t = (val << 29) >> 31;
+  insn[0] = (insn[0] & ~0x800) | (tie_t << 11);
+}
+
+static unsigned
+Field_op0_s6_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 5) | ((insn[0] << 0) >> 27);
+  return tie_t;
+}
+
+static void
+Field_op0_s6_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 27) >> 27;
+  insn[0] = (insn[0] & ~0xf8000000) | (tie_t << 27);
+}
+
+static unsigned
+Field_combined3e2c5767_fld70xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld70xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+  tie_t = (val << 27) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 24) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld71_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld71_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 29) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld72xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld72xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+  tie_t = (val << 27) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 24) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld73xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld73xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+  tie_t = (val << 27) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 24) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld74xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  tie_t = (tie_t << 4) | ((insn[0] << 28) >> 28);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld74xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf) | (tie_t << 0);
+  tie_t = (val << 27) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 24) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld75xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld75xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 28) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld76xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld76xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 28) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld77xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld77xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 28) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld78xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld78xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 28) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld79xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld79xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 28) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld80xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld80xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 28) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld81xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld81xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 28) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld82xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld82xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 28) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld83xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld83xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 28) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld84xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld84xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 28) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld85xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld85xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 28) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld86xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld86xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 28) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld87xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld87xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 28) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld88xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld88xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 28) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld89xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld89xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 28) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld90xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld90xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 28) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld91xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld91xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 28) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld92xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 1) | ((insn[0] << 5) >> 31);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld92xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 31) >> 31;
+  insn[0] = (insn[0] & ~0x4000000) | (tie_t << 26);
+  tie_t = (val << 28) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_combined3e2c5767_fld93xt_flix64_slot3_Slot_xt_flix64_slot3_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 3) | ((insn[1] << 29) >> 29);
+  tie_t = (tie_t << 27) | ((insn[0] << 5) >> 5);
+  return tie_t;
+}
+
+static void
+Field_combined3e2c5767_fld93xt_flix64_slot3_Slot_xt_flix64_slot3_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 5) >> 5;
+  insn[0] = (insn[0] & ~0x7ffffff) | (tie_t << 0);
+  tie_t = (val << 2) >> 29;
+  insn[1] = (insn[1] & ~0x7) | (tie_t << 0);
+}
+
+static unsigned
+Field_op0_xt_flix64_slot0_Slot_xt_flix64_slot0_get (const xtensa_insnbuf insn)
+{
+  unsigned tie_t = 0;
+  tie_t = (tie_t << 4) | ((insn[0] << 8) >> 28);
+  return tie_t;
+}
+
+static void
+Field_op0_xt_flix64_slot0_Slot_xt_flix64_slot0_set (xtensa_insnbuf insn, uint32 val)
+{
+  uint32 tie_t;
+  tie_t = (val << 28) >> 28;
+  insn[0] = (insn[0] & ~0xf00000) | (tie_t << 20);
+}
+
+static void
+Implicit_Field_set (xtensa_insnbuf insn ATTRIBUTE_UNUSED,
+		    uint32 val ATTRIBUTE_UNUSED)
+{
+  /* Do nothing.  */
+}
+
+static unsigned
+Implicit_Field_ar0_get (const xtensa_insnbuf insn ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static unsigned
+Implicit_Field_ar4_get (const xtensa_insnbuf insn ATTRIBUTE_UNUSED)
+{
+  return 4;
+}
+
+static unsigned
+Implicit_Field_ar8_get (const xtensa_insnbuf insn ATTRIBUTE_UNUSED)
+{
+  return 8;
+}
+
+static unsigned
+Implicit_Field_ar12_get (const xtensa_insnbuf insn ATTRIBUTE_UNUSED)
+{
+  return 12;
+}
+
+static unsigned
+Implicit_Field_mr0_get (const xtensa_insnbuf insn ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static unsigned
+Implicit_Field_mr1_get (const xtensa_insnbuf insn ATTRIBUTE_UNUSED)
+{
+  return 1;
+}
+
+static unsigned
+Implicit_Field_mr2_get (const xtensa_insnbuf insn ATTRIBUTE_UNUSED)
+{
+  return 2;
+}
+
+static unsigned
+Implicit_Field_mr3_get (const xtensa_insnbuf insn ATTRIBUTE_UNUSED)
+{
+  return 3;
+}
+
+static unsigned
+Implicit_Field_bt16_get (const xtensa_insnbuf insn ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static unsigned
+Implicit_Field_bs16_get (const xtensa_insnbuf insn ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static unsigned
+Implicit_Field_br16_get (const xtensa_insnbuf insn ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static unsigned
+Implicit_Field_brall_get (const xtensa_insnbuf insn ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+
+/* Functional units.  */
+
+static xtensa_funcUnit_internal funcUnits[] = {
+
+};
+
+
+/* Register files.  */
+
+static xtensa_regfile_internal regfiles[] = {
+  { "AR", "a", 0, 32, 64 },
+  { "MR", "m", 1, 32, 4 },
+  { "BR", "b", 2, 1, 16 },
+  { "FR", "f", 3, 32, 16 },
+  { "BR2", "b", 2, 2, 8 },
+  { "BR4", "b", 2, 4, 4 },
+  { "BR8", "b", 2, 8, 2 },
+  { "BR16", "b", 2, 16, 1 }
+};
+
+
+/* Interfaces.  */
+
+static xtensa_interface_internal interfaces[] = {
+
+};
+
+
+/* Constant tables.  */
+
+/* constant table ai4c */
+static const unsigned CONST_TBL_ai4c_0[] = {
+  0xffffffff,
+  0x1,
+  0x2,
+  0x3,
+  0x4,
+  0x5,
+  0x6,
+  0x7,
+  0x8,
+  0x9,
+  0xa,
+  0xb,
+  0xc,
+  0xd,
+  0xe,
+  0xf,
+  0
+};
+
+/* constant table b4c */
+static const unsigned CONST_TBL_b4c_0[] = {
+  0xffffffff,
+  0x1,
+  0x2,
+  0x3,
+  0x4,
+  0x5,
+  0x6,
+  0x7,
+  0x8,
+  0xa,
+  0xc,
+  0x10,
+  0x20,
+  0x40,
+  0x80,
+  0x100,
+  0
+};
+
+/* constant table b4cu */
+static const unsigned CONST_TBL_b4cu_0[] = {
+  0x8000,
+  0x10000,
+  0x2,
+  0x3,
+  0x4,
+  0x5,
+  0x6,
+  0x7,
+  0x8,
+  0xa,
+  0xc,
+  0x10,
+  0x20,
+  0x40,
+  0x80,
+  0x100,
+  0
+};
+
+
+/* Instruction operands.  */
+
+static int
+Operand_soffsetx4_decode (uint32 *valp)
+{
+  unsigned soffsetx4_0, offset_0;
+  offset_0 = *valp & 0x3ffff;
+  soffsetx4_0 = 0x4 + ((((int) offset_0 << 14) >> 14) << 2);
+  *valp = soffsetx4_0;
+  return 0;
+}
+
+static int
+Operand_soffsetx4_encode (uint32 *valp)
+{
+  unsigned offset_0, soffsetx4_0;
+  soffsetx4_0 = *valp;
+  offset_0 = ((soffsetx4_0 - 0x4) >> 2) & 0x3ffff;
+  *valp = offset_0;
+  return 0;
+}
+
+static int
+Operand_soffsetx4_ator (uint32 *valp, uint32 pc)
+{
+  *valp -= (pc & ~0x3);
+  return 0;
+}
+
+static int
+Operand_soffsetx4_rtoa (uint32 *valp, uint32 pc)
+{
+  *valp += (pc & ~0x3);
+  return 0;
+}
+
+static int
+Operand_uimm12x8_decode (uint32 *valp)
+{
+  unsigned uimm12x8_0, imm12_0;
+  imm12_0 = *valp & 0xfff;
+  uimm12x8_0 = imm12_0 << 3;
+  *valp = uimm12x8_0;
+  return 0;
+}
+
+static int
+Operand_uimm12x8_encode (uint32 *valp)
+{
+  unsigned imm12_0, uimm12x8_0;
+  uimm12x8_0 = *valp;
+  imm12_0 = ((uimm12x8_0 >> 3) & 0xfff);
+  *valp = imm12_0;
+  return 0;
+}
+
+static int
+Operand_simm4_decode (uint32 *valp)
+{
+  unsigned simm4_0, mn_0;
+  mn_0 = *valp & 0xf;
+  simm4_0 = ((int) mn_0 << 28) >> 28;
+  *valp = simm4_0;
+  return 0;
+}
+
+static int
+Operand_simm4_encode (uint32 *valp)
+{
+  unsigned mn_0, simm4_0;
+  simm4_0 = *valp;
+  mn_0 = (simm4_0 & 0xf);
+  *valp = mn_0;
+  return 0;
+}
+
+static int
+Operand_arr_decode (uint32 *valp ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+Operand_arr_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~0xf) != 0;
+  return error;
+}
+
+static int
+Operand_ars_decode (uint32 *valp ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+Operand_ars_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~0xf) != 0;
+  return error;
+}
+
+static int
+Operand_art_decode (uint32 *valp ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+Operand_art_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~0xf) != 0;
+  return error;
+}
+
+static int
+Operand_ar0_decode (uint32 *valp ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+Operand_ar0_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~0x3f) != 0;
+  return error;
+}
+
+static int
+Operand_ar4_decode (uint32 *valp ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+Operand_ar4_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~0x3f) != 0;
+  return error;
+}
+
+static int
+Operand_ar8_decode (uint32 *valp ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+Operand_ar8_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~0x3f) != 0;
+  return error;
+}
+
+static int
+Operand_ar12_decode (uint32 *valp ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+Operand_ar12_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~0x3f) != 0;
+  return error;
+}
+
+static int
+Operand_ars_entry_decode (uint32 *valp ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+Operand_ars_entry_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~0x3f) != 0;
+  return error;
+}
+
+static int
+Operand_immrx4_decode (uint32 *valp)
+{
+  unsigned immrx4_0, r_0;
+  r_0 = *valp & 0xf;
+  immrx4_0 = (((0xfffffff) << 4) | r_0) << 2;
+  *valp = immrx4_0;
+  return 0;
+}
+
+static int
+Operand_immrx4_encode (uint32 *valp)
+{
+  unsigned r_0, immrx4_0;
+  immrx4_0 = *valp;
+  r_0 = ((immrx4_0 >> 2) & 0xf);
+  *valp = r_0;
+  return 0;
+}
+
+static int
+Operand_lsi4x4_decode (uint32 *valp)
+{
+  unsigned lsi4x4_0, r_0;
+  r_0 = *valp & 0xf;
+  lsi4x4_0 = r_0 << 2;
+  *valp = lsi4x4_0;
+  return 0;
+}
+
+static int
+Operand_lsi4x4_encode (uint32 *valp)
+{
+  unsigned r_0, lsi4x4_0;
+  lsi4x4_0 = *valp;
+  r_0 = ((lsi4x4_0 >> 2) & 0xf);
+  *valp = r_0;
+  return 0;
+}
+
+static int
+Operand_simm7_decode (uint32 *valp)
+{
+  unsigned simm7_0, imm7_0;
+  imm7_0 = *valp & 0x7f;
+  simm7_0 = ((((-((((imm7_0 >> 6) & 1)) & (((imm7_0 >> 5) & 1)))) & 0x1ffffff)) << 7) | imm7_0;
+  *valp = simm7_0;
+  return 0;
+}
+
+static int
+Operand_simm7_encode (uint32 *valp)
+{
+  unsigned imm7_0, simm7_0;
+  simm7_0 = *valp;
+  imm7_0 = (simm7_0 & 0x7f);
+  *valp = imm7_0;
+  return 0;
+}
+
+static int
+Operand_uimm6_decode (uint32 *valp)
+{
+  unsigned uimm6_0, imm6_0;
+  imm6_0 = *valp & 0x3f;
+  uimm6_0 = 0x4 + (((0) << 6) | imm6_0);
+  *valp = uimm6_0;
+  return 0;
+}
+
+static int
+Operand_uimm6_encode (uint32 *valp)
+{
+  unsigned imm6_0, uimm6_0;
+  uimm6_0 = *valp;
+  imm6_0 = (uimm6_0 - 0x4) & 0x3f;
+  *valp = imm6_0;
+  return 0;
+}
+
+static int
+Operand_uimm6_ator (uint32 *valp, uint32 pc)
+{
+  *valp -= pc;
+  return 0;
+}
+
+static int
+Operand_uimm6_rtoa (uint32 *valp, uint32 pc)
+{
+  *valp += pc;
+  return 0;
+}
+
+static int
+Operand_ai4const_decode (uint32 *valp)
+{
+  unsigned ai4const_0, t_0;
+  t_0 = *valp & 0xf;
+  ai4const_0 = CONST_TBL_ai4c_0[t_0 & 0xf];
+  *valp = ai4const_0;
+  return 0;
+}
+
+static int
+Operand_ai4const_encode (uint32 *valp)
+{
+  unsigned t_0, ai4const_0;
+  ai4const_0 = *valp;
+  switch (ai4const_0)
+    {
+    case 0xffffffff: t_0 = 0; break;
+    case 0x1: t_0 = 0x1; break;
+    case 0x2: t_0 = 0x2; break;
+    case 0x3: t_0 = 0x3; break;
+    case 0x4: t_0 = 0x4; break;
+    case 0x5: t_0 = 0x5; break;
+    case 0x6: t_0 = 0x6; break;
+    case 0x7: t_0 = 0x7; break;
+    case 0x8: t_0 = 0x8; break;
+    case 0x9: t_0 = 0x9; break;
+    case 0xa: t_0 = 0xa; break;
+    case 0xb: t_0 = 0xb; break;
+    case 0xc: t_0 = 0xc; break;
+    case 0xd: t_0 = 0xd; break;
+    case 0xe: t_0 = 0xe; break;
+    default: t_0 = 0xf; break;
+    }
+  *valp = t_0;
+  return 0;
+}
+
+static int
+Operand_b4const_decode (uint32 *valp)
+{
+  unsigned b4const_0, r_0;
+  r_0 = *valp & 0xf;
+  b4const_0 = CONST_TBL_b4c_0[r_0 & 0xf];
+  *valp = b4const_0;
+  return 0;
+}
+
+static int
+Operand_b4const_encode (uint32 *valp)
+{
+  unsigned r_0, b4const_0;
+  b4const_0 = *valp;
+  switch (b4const_0)
+    {
+    case 0xffffffff: r_0 = 0; break;
+    case 0x1: r_0 = 0x1; break;
+    case 0x2: r_0 = 0x2; break;
+    case 0x3: r_0 = 0x3; break;
+    case 0x4: r_0 = 0x4; break;
+    case 0x5: r_0 = 0x5; break;
+    case 0x6: r_0 = 0x6; break;
+    case 0x7: r_0 = 0x7; break;
+    case 0x8: r_0 = 0x8; break;
+    case 0xa: r_0 = 0x9; break;
+    case 0xc: r_0 = 0xa; break;
+    case 0x10: r_0 = 0xb; break;
+    case 0x20: r_0 = 0xc; break;
+    case 0x40: r_0 = 0xd; break;
+    case 0x80: r_0 = 0xe; break;
+    default: r_0 = 0xf; break;
+    }
+  *valp = r_0;
+  return 0;
+}
+
+static int
+Operand_b4constu_decode (uint32 *valp)
+{
+  unsigned b4constu_0, r_0;
+  r_0 = *valp & 0xf;
+  b4constu_0 = CONST_TBL_b4cu_0[r_0 & 0xf];
+  *valp = b4constu_0;
+  return 0;
+}
+
+static int
+Operand_b4constu_encode (uint32 *valp)
+{
+  unsigned r_0, b4constu_0;
+  b4constu_0 = *valp;
+  switch (b4constu_0)
+    {
+    case 0x8000: r_0 = 0; break;
+    case 0x10000: r_0 = 0x1; break;
+    case 0x2: r_0 = 0x2; break;
+    case 0x3: r_0 = 0x3; break;
+    case 0x4: r_0 = 0x4; break;
+    case 0x5: r_0 = 0x5; break;
+    case 0x6: r_0 = 0x6; break;
+    case 0x7: r_0 = 0x7; break;
+    case 0x8: r_0 = 0x8; break;
+    case 0xa: r_0 = 0x9; break;
+    case 0xc: r_0 = 0xa; break;
+    case 0x10: r_0 = 0xb; break;
+    case 0x20: r_0 = 0xc; break;
+    case 0x40: r_0 = 0xd; break;
+    case 0x80: r_0 = 0xe; break;
+    default: r_0 = 0xf; break;
+    }
+  *valp = r_0;
+  return 0;
+}
+
+static int
+Operand_uimm8_decode (uint32 *valp)
+{
+  unsigned uimm8_0, imm8_0;
+  imm8_0 = *valp & 0xff;
+  uimm8_0 = imm8_0;
+  *valp = uimm8_0;
+  return 0;
+}
+
+static int
+Operand_uimm8_encode (uint32 *valp)
+{
+  unsigned imm8_0, uimm8_0;
+  uimm8_0 = *valp;
+  imm8_0 = (uimm8_0 & 0xff);
+  *valp = imm8_0;
+  return 0;
+}
+
+static int
+Operand_uimm8x2_decode (uint32 *valp)
+{
+  unsigned uimm8x2_0, imm8_0;
+  imm8_0 = *valp & 0xff;
+  uimm8x2_0 = imm8_0 << 1;
+  *valp = uimm8x2_0;
+  return 0;
+}
+
+static int
+Operand_uimm8x2_encode (uint32 *valp)
+{
+  unsigned imm8_0, uimm8x2_0;
+  uimm8x2_0 = *valp;
+  imm8_0 = ((uimm8x2_0 >> 1) & 0xff);
+  *valp = imm8_0;
+  return 0;
+}
+
+static int
+Operand_uimm8x4_decode (uint32 *valp)
+{
+  unsigned uimm8x4_0, imm8_0;
+  imm8_0 = *valp & 0xff;
+  uimm8x4_0 = imm8_0 << 2;
+  *valp = uimm8x4_0;
+  return 0;
+}
+
+static int
+Operand_uimm8x4_encode (uint32 *valp)
+{
+  unsigned imm8_0, uimm8x4_0;
+  uimm8x4_0 = *valp;
+  imm8_0 = ((uimm8x4_0 >> 2) & 0xff);
+  *valp = imm8_0;
+  return 0;
+}
+
+static int
+Operand_uimm4x16_decode (uint32 *valp)
+{
+  unsigned uimm4x16_0, op2_0;
+  op2_0 = *valp & 0xf;
+  uimm4x16_0 = op2_0 << 4;
+  *valp = uimm4x16_0;
+  return 0;
+}
+
+static int
+Operand_uimm4x16_encode (uint32 *valp)
+{
+  unsigned op2_0, uimm4x16_0;
+  uimm4x16_0 = *valp;
+  op2_0 = ((uimm4x16_0 >> 4) & 0xf);
+  *valp = op2_0;
+  return 0;
+}
+
+static int
+Operand_simm8_decode (uint32 *valp)
+{
+  unsigned simm8_0, imm8_0;
+  imm8_0 = *valp & 0xff;
+  simm8_0 = ((int) imm8_0 << 24) >> 24;
+  *valp = simm8_0;
+  return 0;
+}
+
+static int
+Operand_simm8_encode (uint32 *valp)
+{
+  unsigned imm8_0, simm8_0;
+  simm8_0 = *valp;
+  imm8_0 = (simm8_0 & 0xff);
+  *valp = imm8_0;
+  return 0;
+}
+
+static int
+Operand_simm8x256_decode (uint32 *valp)
+{
+  unsigned simm8x256_0, imm8_0;
+  imm8_0 = *valp & 0xff;
+  simm8x256_0 = (((int) imm8_0 << 24) >> 24) << 8;
+  *valp = simm8x256_0;
+  return 0;
+}
+
+static int
+Operand_simm8x256_encode (uint32 *valp)
+{
+  unsigned imm8_0, simm8x256_0;
+  simm8x256_0 = *valp;
+  imm8_0 = ((simm8x256_0 >> 8) & 0xff);
+  *valp = imm8_0;
+  return 0;
+}
+
+static int
+Operand_simm12b_decode (uint32 *valp)
+{
+  unsigned simm12b_0, imm12b_0;
+  imm12b_0 = *valp & 0xfff;
+  simm12b_0 = ((int) imm12b_0 << 20) >> 20;
+  *valp = simm12b_0;
+  return 0;
+}
+
+static int
+Operand_simm12b_encode (uint32 *valp)
+{
+  unsigned imm12b_0, simm12b_0;
+  simm12b_0 = *valp;
+  imm12b_0 = (simm12b_0 & 0xfff);
+  *valp = imm12b_0;
+  return 0;
+}
+
+static int
+Operand_msalp32_decode (uint32 *valp)
+{
+  unsigned msalp32_0, sal_0;
+  sal_0 = *valp & 0x1f;
+  msalp32_0 = 0x20 - sal_0;
+  *valp = msalp32_0;
+  return 0;
+}
+
+static int
+Operand_msalp32_encode (uint32 *valp)
+{
+  unsigned sal_0, msalp32_0;
+  msalp32_0 = *valp;
+  sal_0 = (0x20 - msalp32_0) & 0x1f;
+  *valp = sal_0;
+  return 0;
+}
+
+static int
+Operand_op2p1_decode (uint32 *valp)
+{
+  unsigned op2p1_0, op2_0;
+  op2_0 = *valp & 0xf;
+  op2p1_0 = op2_0 + 0x1;
+  *valp = op2p1_0;
+  return 0;
+}
+
+static int
+Operand_op2p1_encode (uint32 *valp)
+{
+  unsigned op2_0, op2p1_0;
+  op2p1_0 = *valp;
+  op2_0 = (op2p1_0 - 0x1) & 0xf;
+  *valp = op2_0;
+  return 0;
+}
+
+static int
+Operand_label8_decode (uint32 *valp)
+{
+  unsigned label8_0, imm8_0;
+  imm8_0 = *valp & 0xff;
+  label8_0 = 0x4 + (((int) imm8_0 << 24) >> 24);
+  *valp = label8_0;
+  return 0;
+}
+
+static int
+Operand_label8_encode (uint32 *valp)
+{
+  unsigned imm8_0, label8_0;
+  label8_0 = *valp;
+  imm8_0 = (label8_0 - 0x4) & 0xff;
+  *valp = imm8_0;
+  return 0;
+}
+
+static int
+Operand_label8_ator (uint32 *valp, uint32 pc)
+{
+  *valp -= pc;
+  return 0;
+}
+
+static int
+Operand_label8_rtoa (uint32 *valp, uint32 pc)
+{
+  *valp += pc;
+  return 0;
+}
+
+static int
+Operand_ulabel8_decode (uint32 *valp)
+{
+  unsigned ulabel8_0, imm8_0;
+  imm8_0 = *valp & 0xff;
+  ulabel8_0 = 0x4 + (((0) << 8) | imm8_0);
+  *valp = ulabel8_0;
+  return 0;
+}
+
+static int
+Operand_ulabel8_encode (uint32 *valp)
+{
+  unsigned imm8_0, ulabel8_0;
+  ulabel8_0 = *valp;
+  imm8_0 = (ulabel8_0 - 0x4) & 0xff;
+  *valp = imm8_0;
+  return 0;
+}
+
+static int
+Operand_ulabel8_ator (uint32 *valp, uint32 pc)
+{
+  *valp -= pc;
+  return 0;
+}
+
+static int
+Operand_ulabel8_rtoa (uint32 *valp, uint32 pc)
+{
+  *valp += pc;
+  return 0;
+}
+
+static int
+Operand_label12_decode (uint32 *valp)
+{
+  unsigned label12_0, imm12_0;
+  imm12_0 = *valp & 0xfff;
+  label12_0 = 0x4 + (((int) imm12_0 << 20) >> 20);
+  *valp = label12_0;
+  return 0;
+}
+
+static int
+Operand_label12_encode (uint32 *valp)
+{
+  unsigned imm12_0, label12_0;
+  label12_0 = *valp;
+  imm12_0 = (label12_0 - 0x4) & 0xfff;
+  *valp = imm12_0;
+  return 0;
+}
+
+static int
+Operand_label12_ator (uint32 *valp, uint32 pc)
+{
+  *valp -= pc;
+  return 0;
+}
+
+static int
+Operand_label12_rtoa (uint32 *valp, uint32 pc)
+{
+  *valp += pc;
+  return 0;
+}
+
+static int
+Operand_soffset_decode (uint32 *valp)
+{
+  unsigned soffset_0, offset_0;
+  offset_0 = *valp & 0x3ffff;
+  soffset_0 = 0x4 + (((int) offset_0 << 14) >> 14);
+  *valp = soffset_0;
+  return 0;
+}
+
+static int
+Operand_soffset_encode (uint32 *valp)
+{
+  unsigned offset_0, soffset_0;
+  soffset_0 = *valp;
+  offset_0 = (soffset_0 - 0x4) & 0x3ffff;
+  *valp = offset_0;
+  return 0;
+}
+
+static int
+Operand_soffset_ator (uint32 *valp, uint32 pc)
+{
+  *valp -= pc;
+  return 0;
+}
+
+static int
+Operand_soffset_rtoa (uint32 *valp, uint32 pc)
+{
+  *valp += pc;
+  return 0;
+}
+
+static int
+Operand_uimm16x4_decode (uint32 *valp)
+{
+  unsigned uimm16x4_0, imm16_0;
+  imm16_0 = *valp & 0xffff;
+  uimm16x4_0 = (((0xffff) << 16) | imm16_0) << 2;
+  *valp = uimm16x4_0;
+  return 0;
+}
+
+static int
+Operand_uimm16x4_encode (uint32 *valp)
+{
+  unsigned imm16_0, uimm16x4_0;
+  uimm16x4_0 = *valp;
+  imm16_0 = (uimm16x4_0 >> 2) & 0xffff;
+  *valp = imm16_0;
+  return 0;
+}
+
+static int
+Operand_uimm16x4_ator (uint32 *valp, uint32 pc)
+{
+  *valp -= ((pc + 3) & ~0x3);
+  return 0;
+}
+
+static int
+Operand_uimm16x4_rtoa (uint32 *valp, uint32 pc)
+{
+  *valp += ((pc + 3) & ~0x3);
+  return 0;
+}
+
+static int
+Operand_mx_decode (uint32 *valp ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+Operand_mx_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~0x3) != 0;
+  return error;
+}
+
+static int
+Operand_my_decode (uint32 *valp)
+{
+  *valp += 2;
+  return 0;
+}
+
+static int
+Operand_my_encode (uint32 *valp)
+{
+  int error;
+  error = ((*valp & ~0x3) != 0) || ((*valp & 0x2) == 0);
+  *valp = *valp & 1;
+  return error;
+}
+
+static int
+Operand_mw_decode (uint32 *valp ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+Operand_mw_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~0x3) != 0;
+  return error;
+}
+
+static int
+Operand_mr0_decode (uint32 *valp ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+Operand_mr0_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~0x3) != 0;
+  return error;
+}
+
+static int
+Operand_mr1_decode (uint32 *valp ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+Operand_mr1_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~0x3) != 0;
+  return error;
+}
+
+static int
+Operand_mr2_decode (uint32 *valp ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+Operand_mr2_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~0x3) != 0;
+  return error;
+}
+
+static int
+Operand_mr3_decode (uint32 *valp ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+Operand_mr3_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~0x3) != 0;
+  return error;
+}
+
+static int
+Operand_immt_decode (uint32 *valp)
+{
+  unsigned immt_0, t_0;
+  t_0 = *valp & 0xf;
+  immt_0 = t_0;
+  *valp = immt_0;
+  return 0;
+}
+
+static int
+Operand_immt_encode (uint32 *valp)
+{
+  unsigned t_0, immt_0;
+  immt_0 = *valp;
+  t_0 = immt_0 & 0xf;
+  *valp = t_0;
+  return 0;
+}
+
+static int
+Operand_imms_decode (uint32 *valp)
+{
+  unsigned imms_0, s_0;
+  s_0 = *valp & 0xf;
+  imms_0 = s_0;
+  *valp = imms_0;
+  return 0;
+}
+
+static int
+Operand_imms_encode (uint32 *valp)
+{
+  unsigned s_0, imms_0;
+  imms_0 = *valp;
+  s_0 = imms_0 & 0xf;
+  *valp = s_0;
+  return 0;
+}
+
+static int
+Operand_bt_decode (uint32 *valp ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+Operand_bt_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~0xf) != 0;
+  return error;
+}
+
+static int
+Operand_bs_decode (uint32 *valp ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+Operand_bs_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~0xf) != 0;
+  return error;
+}
+
+static int
+Operand_br_decode (uint32 *valp ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+Operand_br_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~0xf) != 0;
+  return error;
+}
+
+static int
+Operand_bt2_decode (uint32 *valp)
+{
+  *valp = *valp << 1;
+  return 0;
+}
+
+static int
+Operand_bt2_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~(0x7 << 1)) != 0;
+  *valp = *valp >> 1;
+  return error;
+}
+
+static int
+Operand_bs2_decode (uint32 *valp)
+{
+  *valp = *valp << 1;
+  return 0;
+}
+
+static int
+Operand_bs2_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~(0x7 << 1)) != 0;
+  *valp = *valp >> 1;
+  return error;
+}
+
+static int
+Operand_br2_decode (uint32 *valp)
+{
+  *valp = *valp << 1;
+  return 0;
+}
+
+static int
+Operand_br2_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~(0x7 << 1)) != 0;
+  *valp = *valp >> 1;
+  return error;
+}
+
+static int
+Operand_bt4_decode (uint32 *valp)
+{
+  *valp = *valp << 2;
+  return 0;
+}
+
+static int
+Operand_bt4_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~(0x3 << 2)) != 0;
+  *valp = *valp >> 2;
+  return error;
+}
+
+static int
+Operand_bs4_decode (uint32 *valp)
+{
+  *valp = *valp << 2;
+  return 0;
+}
+
+static int
+Operand_bs4_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~(0x3 << 2)) != 0;
+  *valp = *valp >> 2;
+  return error;
+}
+
+static int
+Operand_br4_decode (uint32 *valp)
+{
+  *valp = *valp << 2;
+  return 0;
+}
+
+static int
+Operand_br4_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~(0x3 << 2)) != 0;
+  *valp = *valp >> 2;
+  return error;
+}
+
+static int
+Operand_bt8_decode (uint32 *valp)
+{
+  *valp = *valp << 3;
+  return 0;
+}
+
+static int
+Operand_bt8_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~(0x1 << 3)) != 0;
+  *valp = *valp >> 3;
+  return error;
+}
+
+static int
+Operand_bs8_decode (uint32 *valp)
+{
+  *valp = *valp << 3;
+  return 0;
+}
+
+static int
+Operand_bs8_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~(0x1 << 3)) != 0;
+  *valp = *valp >> 3;
+  return error;
+}
+
+static int
+Operand_br8_decode (uint32 *valp)
+{
+  *valp = *valp << 3;
+  return 0;
+}
+
+static int
+Operand_br8_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~(0x1 << 3)) != 0;
+  *valp = *valp >> 3;
+  return error;
+}
+
+static int
+Operand_bt16_decode (uint32 *valp)
+{
+  *valp = *valp << 4;
+  return 0;
+}
+
+static int
+Operand_bt16_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~(0 << 4)) != 0;
+  *valp = *valp >> 4;
+  return error;
+}
+
+static int
+Operand_bs16_decode (uint32 *valp)
+{
+  *valp = *valp << 4;
+  return 0;
+}
+
+static int
+Operand_bs16_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~(0 << 4)) != 0;
+  *valp = *valp >> 4;
+  return error;
+}
+
+static int
+Operand_br16_decode (uint32 *valp)
+{
+  *valp = *valp << 4;
+  return 0;
+}
+
+static int
+Operand_br16_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~(0 << 4)) != 0;
+  *valp = *valp >> 4;
+  return error;
+}
+
+static int
+Operand_brall_decode (uint32 *valp)
+{
+  *valp = *valp << 4;
+  return 0;
+}
+
+static int
+Operand_brall_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~(0 << 4)) != 0;
+  *valp = *valp >> 4;
+  return error;
+}
+
+static int
+Operand_tp7_decode (uint32 *valp)
+{
+  unsigned tp7_0, t_0;
+  t_0 = *valp & 0xf;
+  tp7_0 = t_0 + 0x7;
+  *valp = tp7_0;
+  return 0;
+}
+
+static int
+Operand_tp7_encode (uint32 *valp)
+{
+  unsigned t_0, tp7_0;
+  tp7_0 = *valp;
+  t_0 = (tp7_0 - 0x7) & 0xf;
+  *valp = t_0;
+  return 0;
+}
+
+static int
+Operand_xt_wbr15_label_decode (uint32 *valp)
+{
+  unsigned xt_wbr15_label_0, xt_wbr15_imm_0;
+  xt_wbr15_imm_0 = *valp & 0x7fff;
+  xt_wbr15_label_0 = 0x4 + (((int) xt_wbr15_imm_0 << 17) >> 17);
+  *valp = xt_wbr15_label_0;
+  return 0;
+}
+
+static int
+Operand_xt_wbr15_label_encode (uint32 *valp)
+{
+  unsigned xt_wbr15_imm_0, xt_wbr15_label_0;
+  xt_wbr15_label_0 = *valp;
+  xt_wbr15_imm_0 = (xt_wbr15_label_0 - 0x4) & 0x7fff;
+  *valp = xt_wbr15_imm_0;
+  return 0;
+}
+
+static int
+Operand_xt_wbr15_label_ator (uint32 *valp, uint32 pc)
+{
+  *valp -= pc;
+  return 0;
+}
+
+static int
+Operand_xt_wbr15_label_rtoa (uint32 *valp, uint32 pc)
+{
+  *valp += pc;
+  return 0;
+}
+
+static int
+Operand_xt_wbr18_label_decode (uint32 *valp)
+{
+  unsigned xt_wbr18_label_0, xt_wbr18_imm_0;
+  xt_wbr18_imm_0 = *valp & 0x3ffff;
+  xt_wbr18_label_0 = 0x4 + (((int) xt_wbr18_imm_0 << 14) >> 14);
+  *valp = xt_wbr18_label_0;
+  return 0;
+}
+
+static int
+Operand_xt_wbr18_label_encode (uint32 *valp)
+{
+  unsigned xt_wbr18_imm_0, xt_wbr18_label_0;
+  xt_wbr18_label_0 = *valp;
+  xt_wbr18_imm_0 = (xt_wbr18_label_0 - 0x4) & 0x3ffff;
+  *valp = xt_wbr18_imm_0;
+  return 0;
+}
+
+static int
+Operand_xt_wbr18_label_ator (uint32 *valp, uint32 pc)
+{
+  *valp -= pc;
+  return 0;
+}
+
+static int
+Operand_xt_wbr18_label_rtoa (uint32 *valp, uint32 pc)
+{
+  *valp += pc;
+  return 0;
+}
+
+static int
+Operand_cimm8x4_decode (uint32 *valp)
+{
+  unsigned cimm8x4_0, imm8_0;
+  imm8_0 = *valp & 0xff;
+  cimm8x4_0 = (imm8_0 << 2) | 0;
+  *valp = cimm8x4_0;
+  return 0;
+}
+
+static int
+Operand_cimm8x4_encode (uint32 *valp)
+{
+  unsigned imm8_0, cimm8x4_0;
+  cimm8x4_0 = *valp;
+  imm8_0 = (cimm8x4_0 >> 2) & 0xff;
+  *valp = imm8_0;
+  return 0;
+}
+
+static int
+Operand_frr_decode (uint32 *valp ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+Operand_frr_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~0xf) != 0;
+  return error;
+}
+
+static int
+Operand_frs_decode (uint32 *valp ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+Operand_frs_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~0xf) != 0;
+  return error;
+}
+
+static int
+Operand_frt_decode (uint32 *valp ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+static int
+Operand_frt_encode (uint32 *valp)
+{
+  int error;
+  error = (*valp & ~0xf) != 0;
+  return error;
+}
+
+static xtensa_operand_internal operands[] = {
+  { "soffsetx4", 10, -1, 0,
+    XTENSA_OPERAND_IS_PCRELATIVE,
+    Operand_soffsetx4_encode, Operand_soffsetx4_decode,
+    Operand_soffsetx4_ator, Operand_soffsetx4_rtoa },
+  { "uimm12x8", 3, -1, 0,
+    0,
+    Operand_uimm12x8_encode, Operand_uimm12x8_decode,
+    0, 0 },
+  { "simm4", 26, -1, 0,
+    0,
+    Operand_simm4_encode, Operand_simm4_decode,
+    0, 0 },
+  { "arr", 14, 0, 1,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_arr_encode, Operand_arr_decode,
+    0, 0 },
+  { "ars", 5, 0, 1,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_ars_encode, Operand_ars_decode,
+    0, 0 },
+  { "*ars_invisible", 5, 0, 1,
+    XTENSA_OPERAND_IS_REGISTER | XTENSA_OPERAND_IS_INVISIBLE,
+    Operand_ars_encode, Operand_ars_decode,
+    0, 0 },
+  { "art", 0, 0, 1,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_art_encode, Operand_art_decode,
+    0, 0 },
+  { "ar0", 123, 0, 1,
+    XTENSA_OPERAND_IS_REGISTER | XTENSA_OPERAND_IS_INVISIBLE,
+    Operand_ar0_encode, Operand_ar0_decode,
+    0, 0 },
+  { "ar4", 124, 0, 1,
+    XTENSA_OPERAND_IS_REGISTER | XTENSA_OPERAND_IS_INVISIBLE,
+    Operand_ar4_encode, Operand_ar4_decode,
+    0, 0 },
+  { "ar8", 125, 0, 1,
+    XTENSA_OPERAND_IS_REGISTER | XTENSA_OPERAND_IS_INVISIBLE,
+    Operand_ar8_encode, Operand_ar8_decode,
+    0, 0 },
+  { "ar12", 126, 0, 1,
+    XTENSA_OPERAND_IS_REGISTER | XTENSA_OPERAND_IS_INVISIBLE,
+    Operand_ar12_encode, Operand_ar12_decode,
+    0, 0 },
+  { "ars_entry", 5, 0, 1,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_ars_entry_encode, Operand_ars_entry_decode,
+    0, 0 },
+  { "immrx4", 14, -1, 0,
+    0,
+    Operand_immrx4_encode, Operand_immrx4_decode,
+    0, 0 },
+  { "lsi4x4", 14, -1, 0,
+    0,
+    Operand_lsi4x4_encode, Operand_lsi4x4_decode,
+    0, 0 },
+  { "simm7", 34, -1, 0,
+    0,
+    Operand_simm7_encode, Operand_simm7_decode,
+    0, 0 },
+  { "uimm6", 33, -1, 0,
+    XTENSA_OPERAND_IS_PCRELATIVE,
+    Operand_uimm6_encode, Operand_uimm6_decode,
+    Operand_uimm6_ator, Operand_uimm6_rtoa },
+  { "ai4const", 0, -1, 0,
+    0,
+    Operand_ai4const_encode, Operand_ai4const_decode,
+    0, 0 },
+  { "b4const", 14, -1, 0,
+    0,
+    Operand_b4const_encode, Operand_b4const_decode,
+    0, 0 },
+  { "b4constu", 14, -1, 0,
+    0,
+    Operand_b4constu_encode, Operand_b4constu_decode,
+    0, 0 },
+  { "uimm8", 4, -1, 0,
+    0,
+    Operand_uimm8_encode, Operand_uimm8_decode,
+    0, 0 },
+  { "uimm8x2", 4, -1, 0,
+    0,
+    Operand_uimm8x2_encode, Operand_uimm8x2_decode,
+    0, 0 },
+  { "uimm8x4", 4, -1, 0,
+    0,
+    Operand_uimm8x4_encode, Operand_uimm8x4_decode,
+    0, 0 },
+  { "uimm4x16", 13, -1, 0,
+    0,
+    Operand_uimm4x16_encode, Operand_uimm4x16_decode,
+    0, 0 },
+  { "simm8", 4, -1, 0,
+    0,
+    Operand_simm8_encode, Operand_simm8_decode,
+    0, 0 },
+  { "simm8x256", 4, -1, 0,
+    0,
+    Operand_simm8x256_encode, Operand_simm8x256_decode,
+    0, 0 },
+  { "simm12b", 6, -1, 0,
+    0,
+    Operand_simm12b_encode, Operand_simm12b_decode,
+    0, 0 },
+  { "msalp32", 18, -1, 0,
+    0,
+    Operand_msalp32_encode, Operand_msalp32_decode,
+    0, 0 },
+  { "op2p1", 13, -1, 0,
+    0,
+    Operand_op2p1_encode, Operand_op2p1_decode,
+    0, 0 },
+  { "label8", 4, -1, 0,
+    XTENSA_OPERAND_IS_PCRELATIVE,
+    Operand_label8_encode, Operand_label8_decode,
+    Operand_label8_ator, Operand_label8_rtoa },
+  { "ulabel8", 4, -1, 0,
+    XTENSA_OPERAND_IS_PCRELATIVE,
+    Operand_ulabel8_encode, Operand_ulabel8_decode,
+    Operand_ulabel8_ator, Operand_ulabel8_rtoa },
+  { "label12", 3, -1, 0,
+    XTENSA_OPERAND_IS_PCRELATIVE,
+    Operand_label12_encode, Operand_label12_decode,
+    Operand_label12_ator, Operand_label12_rtoa },
+  { "soffset", 10, -1, 0,
+    XTENSA_OPERAND_IS_PCRELATIVE,
+    Operand_soffset_encode, Operand_soffset_decode,
+    Operand_soffset_ator, Operand_soffset_rtoa },
+  { "uimm16x4", 7, -1, 0,
+    XTENSA_OPERAND_IS_PCRELATIVE,
+    Operand_uimm16x4_encode, Operand_uimm16x4_decode,
+    Operand_uimm16x4_ator, Operand_uimm16x4_rtoa },
+  { "mx", 43, 1, 1,
+    XTENSA_OPERAND_IS_REGISTER | XTENSA_OPERAND_IS_UNKNOWN,
+    Operand_mx_encode, Operand_mx_decode,
+    0, 0 },
+  { "my", 42, 1, 1,
+    XTENSA_OPERAND_IS_REGISTER | XTENSA_OPERAND_IS_UNKNOWN,
+    Operand_my_encode, Operand_my_decode,
+    0, 0 },
+  { "mw", 41, 1, 1,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_mw_encode, Operand_mw_decode,
+    0, 0 },
+  { "mr0", 127, 1, 1,
+    XTENSA_OPERAND_IS_REGISTER | XTENSA_OPERAND_IS_INVISIBLE,
+    Operand_mr0_encode, Operand_mr0_decode,
+    0, 0 },
+  { "mr1", 128, 1, 1,
+    XTENSA_OPERAND_IS_REGISTER | XTENSA_OPERAND_IS_INVISIBLE,
+    Operand_mr1_encode, Operand_mr1_decode,
+    0, 0 },
+  { "mr2", 129, 1, 1,
+    XTENSA_OPERAND_IS_REGISTER | XTENSA_OPERAND_IS_INVISIBLE,
+    Operand_mr2_encode, Operand_mr2_decode,
+    0, 0 },
+  { "mr3", 130, 1, 1,
+    XTENSA_OPERAND_IS_REGISTER | XTENSA_OPERAND_IS_INVISIBLE,
+    Operand_mr3_encode, Operand_mr3_decode,
+    0, 0 },
+  { "immt", 0, -1, 0,
+    0,
+    Operand_immt_encode, Operand_immt_decode,
+    0, 0 },
+  { "imms", 5, -1, 0,
+    0,
+    Operand_imms_encode, Operand_imms_decode,
+    0, 0 },
+  { "bt", 0, 2, 1,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_bt_encode, Operand_bt_decode,
+    0, 0 },
+  { "bs", 5, 2, 1,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_bs_encode, Operand_bs_decode,
+    0, 0 },
+  { "br", 14, 2, 1,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_br_encode, Operand_br_decode,
+    0, 0 },
+  { "bt2", 44, 2, 2,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_bt2_encode, Operand_bt2_decode,
+    0, 0 },
+  { "bs2", 45, 2, 2,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_bs2_encode, Operand_bs2_decode,
+    0, 0 },
+  { "br2", 46, 2, 2,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_br2_encode, Operand_br2_decode,
+    0, 0 },
+  { "bt4", 47, 2, 4,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_bt4_encode, Operand_bt4_decode,
+    0, 0 },
+  { "bs4", 48, 2, 4,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_bs4_encode, Operand_bs4_decode,
+    0, 0 },
+  { "br4", 49, 2, 4,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_br4_encode, Operand_br4_decode,
+    0, 0 },
+  { "bt8", 50, 2, 8,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_bt8_encode, Operand_bt8_decode,
+    0, 0 },
+  { "bs8", 51, 2, 8,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_bs8_encode, Operand_bs8_decode,
+    0, 0 },
+  { "br8", 52, 2, 8,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_br8_encode, Operand_br8_decode,
+    0, 0 },
+  { "bt16", 131, 2, 16,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_bt16_encode, Operand_bt16_decode,
+    0, 0 },
+  { "bs16", 132, 2, 16,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_bs16_encode, Operand_bs16_decode,
+    0, 0 },
+  { "br16", 133, 2, 16,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_br16_encode, Operand_br16_decode,
+    0, 0 },
+  { "brall", 134, 2, 16,
+    XTENSA_OPERAND_IS_REGISTER | XTENSA_OPERAND_IS_INVISIBLE,
+    Operand_brall_encode, Operand_brall_decode,
+    0, 0 },
+  { "tp7", 0, -1, 0,
+    0,
+    Operand_tp7_encode, Operand_tp7_decode,
+    0, 0 },
+  { "xt_wbr15_label", 53, -1, 0,
+    XTENSA_OPERAND_IS_PCRELATIVE,
+    Operand_xt_wbr15_label_encode, Operand_xt_wbr15_label_decode,
+    Operand_xt_wbr15_label_ator, Operand_xt_wbr15_label_rtoa },
+  { "xt_wbr18_label", 54, -1, 0,
+    XTENSA_OPERAND_IS_PCRELATIVE,
+    Operand_xt_wbr18_label_encode, Operand_xt_wbr18_label_decode,
+    Operand_xt_wbr18_label_ator, Operand_xt_wbr18_label_rtoa },
+  { "cimm8x4", 4, -1, 0,
+    0,
+    Operand_cimm8x4_encode, Operand_cimm8x4_decode,
+    0, 0 },
+  { "frr", 14, 3, 1,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_frr_encode, Operand_frr_decode,
+    0, 0 },
+  { "frs", 5, 3, 1,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_frs_encode, Operand_frs_decode,
+    0, 0 },
+  { "frt", 0, 3, 1,
+    XTENSA_OPERAND_IS_REGISTER,
+    Operand_frt_encode, Operand_frt_decode,
+    0, 0 },
+  { "t", 0, -1, 0, 0, 0, 0, 0, 0 },
+  { "bbi4", 1, -1, 0, 0, 0, 0, 0, 0 },
+  { "bbi", 2, -1, 0, 0, 0, 0, 0, 0 },
+  { "imm12", 3, -1, 0, 0, 0, 0, 0, 0 },
+  { "imm8", 4, -1, 0, 0, 0, 0, 0, 0 },
+  { "s", 5, -1, 0, 0, 0, 0, 0, 0 },
+  { "imm12b", 6, -1, 0, 0, 0, 0, 0, 0 },
+  { "imm16", 7, -1, 0, 0, 0, 0, 0, 0 },
+  { "m", 8, -1, 0, 0, 0, 0, 0, 0 },
+  { "n", 9, -1, 0, 0, 0, 0, 0, 0 },
+  { "offset", 10, -1, 0, 0, 0, 0, 0, 0 },
+  { "op0", 11, -1, 0, 0, 0, 0, 0, 0 },
+  { "op1", 12, -1, 0, 0, 0, 0, 0, 0 },
+  { "op2", 13, -1, 0, 0, 0, 0, 0, 0 },
+  { "r", 14, -1, 0, 0, 0, 0, 0, 0 },
+  { "sa4", 15, -1, 0, 0, 0, 0, 0, 0 },
+  { "sae4", 16, -1, 0, 0, 0, 0, 0, 0 },
+  { "sae", 17, -1, 0, 0, 0, 0, 0, 0 },
+  { "sal", 18, -1, 0, 0, 0, 0, 0, 0 },
+  { "sargt", 19, -1, 0, 0, 0, 0, 0, 0 },
+  { "sas4", 20, -1, 0, 0, 0, 0, 0, 0 },
+  { "sas", 21, -1, 0, 0, 0, 0, 0, 0 },
+  { "sr", 22, -1, 0, 0, 0, 0, 0, 0 },
+  { "st", 23, -1, 0, 0, 0, 0, 0, 0 },
+  { "thi3", 24, -1, 0, 0, 0, 0, 0, 0 },
+  { "imm4", 25, -1, 0, 0, 0, 0, 0, 0 },
+  { "mn", 26, -1, 0, 0, 0, 0, 0, 0 },
+  { "i", 27, -1, 0, 0, 0, 0, 0, 0 },
+  { "imm6lo", 28, -1, 0, 0, 0, 0, 0, 0 },
+  { "imm6hi", 29, -1, 0, 0, 0, 0, 0, 0 },
+  { "imm7lo", 30, -1, 0, 0, 0, 0, 0, 0 },
+  { "imm7hi", 31, -1, 0, 0, 0, 0, 0, 0 },
+  { "z", 32, -1, 0, 0, 0, 0, 0, 0 },
+  { "imm6", 33, -1, 0, 0, 0, 0, 0, 0 },
+  { "imm7", 34, -1, 0, 0, 0, 0, 0, 0 },
+  { "r3", 35, -1, 0, 0, 0, 0, 0, 0 },
+  { "rbit2", 36, -1, 0, 0, 0, 0, 0, 0 },
+  { "rhi", 37, -1, 0, 0, 0, 0, 0, 0 },
+  { "t3", 38, -1, 0, 0, 0, 0, 0, 0 },
+  { "tbit2", 39, -1, 0, 0, 0, 0, 0, 0 },
+  { "tlo", 40, -1, 0, 0, 0, 0, 0, 0 },
+  { "w", 41, -1, 0, 0, 0, 0, 0, 0 },
+  { "y", 42, -1, 0, 0, 0, 0, 0, 0 },
+  { "x", 43, -1, 0, 0, 0, 0, 0, 0 },
+  { "t2", 44, -1, 0, 0, 0, 0, 0, 0 },
+  { "s2", 45, -1, 0, 0, 0, 0, 0, 0 },
+  { "r2", 46, -1, 0, 0, 0, 0, 0, 0 },
+  { "t4", 47, -1, 0, 0, 0, 0, 0, 0 },
+  { "s4", 48, -1, 0, 0, 0, 0, 0, 0 },
+  { "r4", 49, -1, 0, 0, 0, 0, 0, 0 },
+  { "t8", 50, -1, 0, 0, 0, 0, 0, 0 },
+  { "s8", 51, -1, 0, 0, 0, 0, 0, 0 },
+  { "r8", 52, -1, 0, 0, 0, 0, 0, 0 },
+  { "xt_wbr15_imm", 53, -1, 0, 0, 0, 0, 0, 0 },
+  { "xt_wbr18_imm", 54, -1, 0, 0, 0, 0, 0, 0 },
+  { "op0_xt_flix64_slot0_s3", 55, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld7", 56, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld8", 57, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld9", 58, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld11", 59, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld49xt_flix64_slot0", 60, -1, 0, 0, 0, 0, 0, 0 },
+  { "op0_s4", 61, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld16", 62, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld19xt_flix64_slot1", 63, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld20xt_flix64_slot1", 64, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld21xt_flix64_slot1", 65, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld22xt_flix64_slot1", 66, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld23xt_flix64_slot1", 67, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld25xt_flix64_slot1", 68, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld26xt_flix64_slot1", 69, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld28xt_flix64_slot1", 70, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld30xt_flix64_slot1", 71, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld32xt_flix64_slot1", 72, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld33xt_flix64_slot1", 73, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld35xt_flix64_slot1", 74, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld51xt_flix64_slot1", 75, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld52xt_flix64_slot1", 76, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld53xt_flix64_slot1", 77, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld54xt_flix64_slot1", 78, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld57xt_flix64_slot1", 79, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld58xt_flix64_slot1", 80, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld60xt_flix64_slot1", 81, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld62xt_flix64_slot1", 82, -1, 0, 0, 0, 0, 0, 0 },
+  { "op0_s5", 83, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld36xt_flix64_slot2", 84, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld37xt_flix64_slot2", 85, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld39xt_flix64_slot2", 86, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld41xt_flix64_slot2", 87, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld42xt_flix64_slot2", 88, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld44xt_flix64_slot2", 89, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld45xt_flix64_slot2", 90, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld47xt_flix64_slot2", 91, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld63xt_flix64_slot2", 92, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld64xt_flix64_slot2", 93, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld65xt_flix64_slot2", 94, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld66xt_flix64_slot2", 95, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld68xt_flix64_slot2", 96, -1, 0, 0, 0, 0, 0, 0 },
+  { "op0_s6", 97, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld70xt_flix64_slot3", 98, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld71", 99, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld72xt_flix64_slot3", 100, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld73xt_flix64_slot3", 101, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld74xt_flix64_slot3", 102, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld75xt_flix64_slot3", 103, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld76xt_flix64_slot3", 104, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld77xt_flix64_slot3", 105, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld78xt_flix64_slot3", 106, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld79xt_flix64_slot3", 107, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld80xt_flix64_slot3", 108, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld81xt_flix64_slot3", 109, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld82xt_flix64_slot3", 110, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld83xt_flix64_slot3", 111, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld84xt_flix64_slot3", 112, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld85xt_flix64_slot3", 113, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld86xt_flix64_slot3", 114, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld87xt_flix64_slot3", 115, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld88xt_flix64_slot3", 116, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld89xt_flix64_slot3", 117, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld90xt_flix64_slot3", 118, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld91xt_flix64_slot3", 119, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld92xt_flix64_slot3", 120, -1, 0, 0, 0, 0, 0, 0 },
+  { "combined3e2c5767_fld93xt_flix64_slot3", 121, -1, 0, 0, 0, 0, 0, 0 },
+  { "op0_xt_flix64_slot0", 122, -1, 0, 0, 0, 0, 0, 0 }
+};
+
+
+/* Iclass table.  */
+
+static xtensa_arg_internal Iclass_xt_iclass_rfe_stateArgs[] = {
+  { { STATE_PSRING }, 'i' },
+  { { STATE_PSEXCM }, 'm' },
+  { { STATE_EPC1 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rfde_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DEPC }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_call12_args[] = {
+  { { 0 /* soffsetx4 */ }, 'i' },
+  { { 10 /* ar12 */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_call12_stateArgs[] = {
+  { { STATE_PSCALLINC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_call8_args[] = {
+  { { 0 /* soffsetx4 */ }, 'i' },
+  { { 9 /* ar8 */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_call8_stateArgs[] = {
+  { { STATE_PSCALLINC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_call4_args[] = {
+  { { 0 /* soffsetx4 */ }, 'i' },
+  { { 8 /* ar4 */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_call4_stateArgs[] = {
+  { { STATE_PSCALLINC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_callx12_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 10 /* ar12 */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_callx12_stateArgs[] = {
+  { { STATE_PSCALLINC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_callx8_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 9 /* ar8 */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_callx8_stateArgs[] = {
+  { { STATE_PSCALLINC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_callx4_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 8 /* ar4 */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_callx4_stateArgs[] = {
+  { { STATE_PSCALLINC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_entry_args[] = {
+  { { 11 /* ars_entry */ }, 's' },
+  { { 4 /* ars */ }, 'i' },
+  { { 1 /* uimm12x8 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_entry_stateArgs[] = {
+  { { STATE_PSCALLINC }, 'i' },
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSWOE }, 'i' },
+  { { STATE_WindowBase }, 'm' },
+  { { STATE_WindowStart }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_movsp_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 4 /* ars */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_movsp_stateArgs[] = {
+  { { STATE_WindowBase }, 'i' },
+  { { STATE_WindowStart }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rotw_args[] = {
+  { { 2 /* simm4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rotw_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_WindowBase }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_retw_args[] = {
+  { { 5 /* *ars_invisible */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_retw_stateArgs[] = {
+  { { STATE_WindowBase }, 'm' },
+  { { STATE_WindowStart }, 'm' },
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSWOE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rfwou_stateArgs[] = {
+  { { STATE_EPC1 }, 'i' },
+  { { STATE_PSEXCM }, 'm' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_WindowBase }, 'm' },
+  { { STATE_WindowStart }, 'm' },
+  { { STATE_PSOWB }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_l32e_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 12 /* immrx4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_l32e_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_s32e_args[] = {
+  { { 6 /* art */ }, 'i' },
+  { { 4 /* ars */ }, 'i' },
+  { { 12 /* immrx4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_s32e_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_windowbase_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_windowbase_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_WindowBase }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_windowbase_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_windowbase_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_WindowBase }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_windowbase_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_windowbase_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_WindowBase }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_windowstart_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_windowstart_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_WindowStart }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_windowstart_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_windowstart_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_WindowStart }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_windowstart_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_windowstart_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_WindowStart }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_add_n_args[] = {
+  { { 3 /* arr */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_addi_n_args[] = {
+  { { 3 /* arr */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 16 /* ai4const */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_bz6_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 15 /* uimm6 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_loadi4_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 13 /* lsi4x4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mov_n_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 4 /* ars */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_movi_n_args[] = {
+  { { 4 /* ars */ }, 'o' },
+  { { 14 /* simm7 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_retn_args[] = {
+  { { 5 /* *ars_invisible */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_storei4_args[] = {
+  { { 6 /* art */ }, 'i' },
+  { { 4 /* ars */ }, 'i' },
+  { { 13 /* lsi4x4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_rur_threadptr_args[] = {
+  { { 3 /* arr */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_rur_threadptr_stateArgs[] = {
+  { { STATE_THREADPTR }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_wur_threadptr_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_wur_threadptr_stateArgs[] = {
+  { { STATE_THREADPTR }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_addi_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 23 /* simm8 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_addmi_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 24 /* simm8x256 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_addsub_args[] = {
+  { { 3 /* arr */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_bit_args[] = {
+  { { 3 /* arr */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_bsi8_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 17 /* b4const */ }, 'i' },
+  { { 28 /* label8 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_bsi8b_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 67 /* bbi */ }, 'i' },
+  { { 28 /* label8 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_bsi8u_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 18 /* b4constu */ }, 'i' },
+  { { 28 /* label8 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_bst8_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 6 /* art */ }, 'i' },
+  { { 28 /* label8 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_bsz12_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 30 /* label12 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_call0_args[] = {
+  { { 0 /* soffsetx4 */ }, 'i' },
+  { { 7 /* ar0 */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_callx0_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 7 /* ar0 */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_exti_args[] = {
+  { { 3 /* arr */ }, 'o' },
+  { { 6 /* art */ }, 'i' },
+  { { 82 /* sae */ }, 'i' },
+  { { 27 /* op2p1 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_jump_args[] = {
+  { { 31 /* soffset */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_jumpx_args[] = {
+  { { 4 /* ars */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_l16ui_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 20 /* uimm8x2 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_l16si_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 20 /* uimm8x2 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_l32i_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 21 /* uimm8x4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_l32r_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 32 /* uimm16x4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_l32r_stateArgs[] = {
+  { { STATE_LITBADDR }, 'i' },
+  { { STATE_LITBEN }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_l8i_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 19 /* uimm8 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_loop_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 29 /* ulabel8 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_loop_stateArgs[] = {
+  { { STATE_LBEG }, 'o' },
+  { { STATE_LEND }, 'o' },
+  { { STATE_LCOUNT }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_loopz_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 29 /* ulabel8 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_loopz_stateArgs[] = {
+  { { STATE_LBEG }, 'o' },
+  { { STATE_LEND }, 'o' },
+  { { STATE_LCOUNT }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_movi_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 25 /* simm12b */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_movz_args[] = {
+  { { 3 /* arr */ }, 'm' },
+  { { 4 /* ars */ }, 'i' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_neg_args[] = {
+  { { 3 /* arr */ }, 'o' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_return_args[] = {
+  { { 5 /* *ars_invisible */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_s16i_args[] = {
+  { { 6 /* art */ }, 'i' },
+  { { 4 /* ars */ }, 'i' },
+  { { 20 /* uimm8x2 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_s32i_args[] = {
+  { { 6 /* art */ }, 'i' },
+  { { 4 /* ars */ }, 'i' },
+  { { 21 /* uimm8x4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_s8i_args[] = {
+  { { 6 /* art */ }, 'i' },
+  { { 4 /* ars */ }, 'i' },
+  { { 19 /* uimm8 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_sar_args[] = {
+  { { 4 /* ars */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_sar_stateArgs[] = {
+  { { STATE_SAR }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_sari_args[] = {
+  { { 86 /* sas */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_sari_stateArgs[] = {
+  { { STATE_SAR }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_shifts_args[] = {
+  { { 3 /* arr */ }, 'o' },
+  { { 4 /* ars */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_shifts_stateArgs[] = {
+  { { STATE_SAR }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_shiftst_args[] = {
+  { { 3 /* arr */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_shiftst_stateArgs[] = {
+  { { STATE_SAR }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_shiftt_args[] = {
+  { { 3 /* arr */ }, 'o' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_shiftt_stateArgs[] = {
+  { { STATE_SAR }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_slli_args[] = {
+  { { 3 /* arr */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 26 /* msalp32 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_srai_args[] = {
+  { { 3 /* arr */ }, 'o' },
+  { { 6 /* art */ }, 'i' },
+  { { 84 /* sargt */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_srli_args[] = {
+  { { 3 /* arr */ }, 'o' },
+  { { 6 /* art */ }, 'i' },
+  { { 70 /* s */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_sync_stateArgs[] = {
+  { { STATE_XTSYNC }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsil_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 70 /* s */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsil_stateArgs[] = {
+  { { STATE_PSWOE }, 'i' },
+  { { STATE_PSCALLINC }, 'i' },
+  { { STATE_PSOWB }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_PSUM }, 'i' },
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSINTLEVEL }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_lend_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_lend_stateArgs[] = {
+  { { STATE_LEND }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_lend_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_lend_stateArgs[] = {
+  { { STATE_LEND }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_lend_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_lend_stateArgs[] = {
+  { { STATE_LEND }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_lcount_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_lcount_stateArgs[] = {
+  { { STATE_LCOUNT }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_lcount_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_lcount_stateArgs[] = {
+  { { STATE_XTSYNC }, 'o' },
+  { { STATE_LCOUNT }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_lcount_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_lcount_stateArgs[] = {
+  { { STATE_XTSYNC }, 'o' },
+  { { STATE_LCOUNT }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_lbeg_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_lbeg_stateArgs[] = {
+  { { STATE_LBEG }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_lbeg_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_lbeg_stateArgs[] = {
+  { { STATE_LBEG }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_lbeg_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_lbeg_stateArgs[] = {
+  { { STATE_LBEG }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_sar_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_sar_stateArgs[] = {
+  { { STATE_SAR }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_sar_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_sar_stateArgs[] = {
+  { { STATE_SAR }, 'o' },
+  { { STATE_XTSYNC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_sar_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_sar_stateArgs[] = {
+  { { STATE_SAR }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_litbase_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_litbase_stateArgs[] = {
+  { { STATE_LITBADDR }, 'i' },
+  { { STATE_LITBEN }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_litbase_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_litbase_stateArgs[] = {
+  { { STATE_LITBADDR }, 'o' },
+  { { STATE_LITBEN }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_litbase_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_litbase_stateArgs[] = {
+  { { STATE_LITBADDR }, 'm' },
+  { { STATE_LITBEN }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_176_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_176_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_208_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_208_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_ps_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_ps_stateArgs[] = {
+  { { STATE_PSWOE }, 'i' },
+  { { STATE_PSCALLINC }, 'i' },
+  { { STATE_PSOWB }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_PSUM }, 'i' },
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSINTLEVEL }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_ps_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_ps_stateArgs[] = {
+  { { STATE_PSWOE }, 'o' },
+  { { STATE_PSCALLINC }, 'o' },
+  { { STATE_PSOWB }, 'o' },
+  { { STATE_PSRING }, 'm' },
+  { { STATE_PSUM }, 'o' },
+  { { STATE_PSEXCM }, 'm' },
+  { { STATE_PSINTLEVEL }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_ps_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_ps_stateArgs[] = {
+  { { STATE_PSWOE }, 'm' },
+  { { STATE_PSCALLINC }, 'm' },
+  { { STATE_PSOWB }, 'm' },
+  { { STATE_PSRING }, 'm' },
+  { { STATE_PSUM }, 'm' },
+  { { STATE_PSEXCM }, 'm' },
+  { { STATE_PSINTLEVEL }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_epc1_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_epc1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC1 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_epc1_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_epc1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC1 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_epc1_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_epc1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC1 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_excsave1_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_excsave1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE1 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_excsave1_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_excsave1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE1 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_excsave1_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_excsave1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE1 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_epc2_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_epc2_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC2 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_epc2_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_epc2_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC2 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_epc2_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_epc2_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC2 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_excsave2_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_excsave2_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE2 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_excsave2_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_excsave2_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE2 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_excsave2_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_excsave2_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE2 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_epc3_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_epc3_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC3 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_epc3_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_epc3_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC3 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_epc3_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_epc3_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC3 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_excsave3_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_excsave3_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE3 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_excsave3_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_excsave3_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE3 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_excsave3_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_excsave3_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE3 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_epc4_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_epc4_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC4 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_epc4_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_epc4_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC4 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_epc4_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_epc4_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC4 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_excsave4_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_excsave4_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE4 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_excsave4_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_excsave4_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE4 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_excsave4_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_excsave4_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE4 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_epc5_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_epc5_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC5 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_epc5_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_epc5_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC5 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_epc5_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_epc5_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC5 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_excsave5_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_excsave5_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE5 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_excsave5_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_excsave5_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE5 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_excsave5_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_excsave5_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE5 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_epc6_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_epc6_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC6 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_epc6_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_epc6_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC6 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_epc6_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_epc6_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC6 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_excsave6_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_excsave6_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE6 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_excsave6_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_excsave6_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE6 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_excsave6_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_excsave6_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE6 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_epc7_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_epc7_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC7 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_epc7_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_epc7_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC7 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_epc7_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_epc7_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPC7 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_excsave7_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_excsave7_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE7 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_excsave7_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_excsave7_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE7 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_excsave7_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_excsave7_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCSAVE7 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_eps2_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_eps2_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPS2 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_eps2_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_eps2_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPS2 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_eps2_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_eps2_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPS2 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_eps3_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_eps3_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPS3 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_eps3_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_eps3_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPS3 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_eps3_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_eps3_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPS3 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_eps4_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_eps4_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPS4 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_eps4_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_eps4_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPS4 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_eps4_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_eps4_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPS4 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_eps5_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_eps5_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPS5 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_eps5_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_eps5_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPS5 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_eps5_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_eps5_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPS5 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_eps6_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_eps6_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPS6 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_eps6_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_eps6_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPS6 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_eps6_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_eps6_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPS6 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_eps7_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_eps7_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPS7 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_eps7_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_eps7_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPS7 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_eps7_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_eps7_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EPS7 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_excvaddr_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_excvaddr_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCVADDR }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_excvaddr_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_excvaddr_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCVADDR }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_excvaddr_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_excvaddr_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCVADDR }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_depc_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_depc_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DEPC }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_depc_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_depc_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DEPC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_depc_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_depc_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DEPC }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_exccause_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_exccause_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCCAUSE }, 'i' },
+  { { STATE_XTSYNC }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_exccause_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_exccause_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCCAUSE }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_exccause_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_exccause_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_EXCCAUSE }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_misc0_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_misc0_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_MISC0 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_misc0_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_misc0_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_MISC0 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_misc0_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_misc0_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_MISC0 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_misc1_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_misc1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_MISC1 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_misc1_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_misc1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_MISC1 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_misc1_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_misc1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_MISC1 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_misc2_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_misc2_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_MISC2 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_misc2_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_misc2_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_MISC2 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_misc2_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_misc2_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_MISC2 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_misc3_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_misc3_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_MISC3 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_misc3_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_misc3_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_MISC3 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_misc3_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_misc3_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_MISC3 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_prid_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_prid_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_vecbase_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_vecbase_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_VECBASE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_vecbase_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_vecbase_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_VECBASE }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_vecbase_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_vecbase_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_VECBASE }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16_aa_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16_aa_stateArgs[] = {
+  { { STATE_ACC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16_ad_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 34 /* my */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16_ad_stateArgs[] = {
+  { { STATE_ACC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16_da_args[] = {
+  { { 33 /* mx */ }, 'i' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16_da_stateArgs[] = {
+  { { STATE_ACC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16_dd_args[] = {
+  { { 33 /* mx */ }, 'i' },
+  { { 34 /* my */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16_dd_stateArgs[] = {
+  { { STATE_ACC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16a_aa_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16a_aa_stateArgs[] = {
+  { { STATE_ACC }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16a_ad_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 34 /* my */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16a_ad_stateArgs[] = {
+  { { STATE_ACC }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16a_da_args[] = {
+  { { 33 /* mx */ }, 'i' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16a_da_stateArgs[] = {
+  { { STATE_ACC }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16a_dd_args[] = {
+  { { 33 /* mx */ }, 'i' },
+  { { 34 /* my */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16a_dd_stateArgs[] = {
+  { { STATE_ACC }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16al_da_args[] = {
+  { { 35 /* mw */ }, 'o' },
+  { { 4 /* ars */ }, 'm' },
+  { { 33 /* mx */ }, 'i' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16al_da_stateArgs[] = {
+  { { STATE_ACC }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16al_dd_args[] = {
+  { { 35 /* mw */ }, 'o' },
+  { { 4 /* ars */ }, 'm' },
+  { { 33 /* mx */ }, 'i' },
+  { { 34 /* my */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16al_dd_stateArgs[] = {
+  { { STATE_ACC }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mac16_l_args[] = {
+  { { 35 /* mw */ }, 'o' },
+  { { 4 /* ars */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_mul16_args[] = {
+  { { 3 /* arr */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_m0_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 36 /* mr0 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_m0_args[] = {
+  { { 6 /* art */ }, 'i' },
+  { { 36 /* mr0 */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_m0_args[] = {
+  { { 6 /* art */ }, 'm' },
+  { { 36 /* mr0 */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_m1_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 37 /* mr1 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_m1_args[] = {
+  { { 6 /* art */ }, 'i' },
+  { { 37 /* mr1 */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_m1_args[] = {
+  { { 6 /* art */ }, 'm' },
+  { { 37 /* mr1 */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_m2_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 38 /* mr2 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_m2_args[] = {
+  { { 6 /* art */ }, 'i' },
+  { { 38 /* mr2 */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_m2_args[] = {
+  { { 6 /* art */ }, 'm' },
+  { { 38 /* mr2 */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_m3_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 39 /* mr3 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_m3_args[] = {
+  { { 6 /* art */ }, 'i' },
+  { { 39 /* mr3 */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_m3_args[] = {
+  { { 6 /* art */ }, 'm' },
+  { { 39 /* mr3 */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_acclo_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_acclo_stateArgs[] = {
+  { { STATE_ACC }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_acclo_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_acclo_stateArgs[] = {
+  { { STATE_ACC }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_acclo_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_acclo_stateArgs[] = {
+  { { STATE_ACC }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_acchi_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_acchi_stateArgs[] = {
+  { { STATE_ACC }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_acchi_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_acchi_stateArgs[] = {
+  { { STATE_ACC }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_acchi_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_acchi_stateArgs[] = {
+  { { STATE_ACC }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rfi_args[] = {
+  { { 70 /* s */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rfi_stateArgs[] = {
+  { { STATE_PSWOE }, 'o' },
+  { { STATE_PSCALLINC }, 'o' },
+  { { STATE_PSOWB }, 'o' },
+  { { STATE_PSRING }, 'm' },
+  { { STATE_PSUM }, 'o' },
+  { { STATE_PSEXCM }, 'm' },
+  { { STATE_PSINTLEVEL }, 'o' },
+  { { STATE_EPC1 }, 'i' },
+  { { STATE_EPC2 }, 'i' },
+  { { STATE_EPC3 }, 'i' },
+  { { STATE_EPC4 }, 'i' },
+  { { STATE_EPC5 }, 'i' },
+  { { STATE_EPC6 }, 'i' },
+  { { STATE_EPC7 }, 'i' },
+  { { STATE_EPS2 }, 'i' },
+  { { STATE_EPS3 }, 'i' },
+  { { STATE_EPS4 }, 'i' },
+  { { STATE_EPS5 }, 'i' },
+  { { STATE_EPS6 }, 'i' },
+  { { STATE_EPS7 }, 'i' },
+  { { STATE_InOCDMode }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wait_args[] = {
+  { { 70 /* s */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wait_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_PSINTLEVEL }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_interrupt_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_interrupt_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_INTERRUPT }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_intset_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_intset_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_XTSYNC }, 'o' },
+  { { STATE_INTERRUPT }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_intclear_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_intclear_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_XTSYNC }, 'o' },
+  { { STATE_INTERRUPT }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_intenable_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_intenable_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_INTENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_intenable_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_intenable_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_INTENABLE }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_intenable_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_intenable_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_INTENABLE }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_break_args[] = {
+  { { 41 /* imms */ }, 'i' },
+  { { 40 /* immt */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_break_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSINTLEVEL }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_break_n_args[] = {
+  { { 41 /* imms */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_break_n_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSINTLEVEL }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_dbreaka0_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_dbreaka0_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DBREAKA0 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_dbreaka0_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_dbreaka0_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DBREAKA0 }, 'o' },
+  { { STATE_XTSYNC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_dbreaka0_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_dbreaka0_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DBREAKA0 }, 'm' },
+  { { STATE_XTSYNC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_dbreakc0_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_dbreakc0_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DBREAKC0 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_dbreakc0_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_dbreakc0_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DBREAKC0 }, 'o' },
+  { { STATE_XTSYNC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_dbreakc0_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_dbreakc0_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DBREAKC0 }, 'm' },
+  { { STATE_XTSYNC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_dbreaka1_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_dbreaka1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DBREAKA1 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_dbreaka1_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_dbreaka1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DBREAKA1 }, 'o' },
+  { { STATE_XTSYNC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_dbreaka1_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_dbreaka1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DBREAKA1 }, 'm' },
+  { { STATE_XTSYNC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_dbreakc1_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_dbreakc1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DBREAKC1 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_dbreakc1_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_dbreakc1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DBREAKC1 }, 'o' },
+  { { STATE_XTSYNC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_dbreakc1_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_dbreakc1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DBREAKC1 }, 'm' },
+  { { STATE_XTSYNC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_ibreaka0_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_ibreaka0_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_IBREAKA0 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_ibreaka0_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_ibreaka0_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_IBREAKA0 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_ibreaka0_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_ibreaka0_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_IBREAKA0 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_ibreaka1_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_ibreaka1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_IBREAKA1 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_ibreaka1_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_ibreaka1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_IBREAKA1 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_ibreaka1_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_ibreaka1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_IBREAKA1 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_ibreakenable_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_ibreakenable_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_IBREAKENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_ibreakenable_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_ibreakenable_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_IBREAKENABLE }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_ibreakenable_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_ibreakenable_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_IBREAKENABLE }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_debugcause_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_debugcause_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DEBUGCAUSE }, 'i' },
+  { { STATE_DBNUM }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_debugcause_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_debugcause_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DEBUGCAUSE }, 'o' },
+  { { STATE_DBNUM }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_debugcause_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_debugcause_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DEBUGCAUSE }, 'm' },
+  { { STATE_DBNUM }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_icount_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_icount_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_ICOUNT }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_icount_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_icount_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_XTSYNC }, 'o' },
+  { { STATE_ICOUNT }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_icount_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_icount_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_XTSYNC }, 'o' },
+  { { STATE_ICOUNT }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_icountlevel_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_icountlevel_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_ICOUNTLEVEL }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_icountlevel_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_icountlevel_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_ICOUNTLEVEL }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_icountlevel_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_icountlevel_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_ICOUNTLEVEL }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_ddr_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_ddr_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DDR }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_ddr_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_ddr_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_XTSYNC }, 'o' },
+  { { STATE_DDR }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_ddr_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_ddr_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_XTSYNC }, 'o' },
+  { { STATE_DDR }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rfdo_args[] = {
+  { { 41 /* imms */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rfdo_stateArgs[] = {
+  { { STATE_InOCDMode }, 'm' },
+  { { STATE_EPC6 }, 'i' },
+  { { STATE_PSWOE }, 'o' },
+  { { STATE_PSCALLINC }, 'o' },
+  { { STATE_PSOWB }, 'o' },
+  { { STATE_PSRING }, 'o' },
+  { { STATE_PSUM }, 'o' },
+  { { STATE_PSEXCM }, 'o' },
+  { { STATE_PSINTLEVEL }, 'o' },
+  { { STATE_EPS6 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rfdd_stateArgs[] = {
+  { { STATE_InOCDMode }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_mmid_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_mmid_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_XTSYNC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_bbool1_args[] = {
+  { { 44 /* br */ }, 'o' },
+  { { 43 /* bs */ }, 'i' },
+  { { 42 /* bt */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_bbool4_args[] = {
+  { { 42 /* bt */ }, 'o' },
+  { { 49 /* bs4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_bbool8_args[] = {
+  { { 42 /* bt */ }, 'o' },
+  { { 52 /* bs8 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_bbranch_args[] = {
+  { { 43 /* bs */ }, 'i' },
+  { { 28 /* label8 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_bmove_args[] = {
+  { { 3 /* arr */ }, 'm' },
+  { { 4 /* ars */ }, 'i' },
+  { { 42 /* bt */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_RSR_BR_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 57 /* brall */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_WSR_BR_args[] = {
+  { { 6 /* art */ }, 'i' },
+  { { 57 /* brall */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_XSR_BR_args[] = {
+  { { 6 /* art */ }, 'm' },
+  { { 57 /* brall */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_ccount_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_ccount_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_CCOUNT }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_ccount_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_ccount_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_XTSYNC }, 'o' },
+  { { STATE_CCOUNT }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_ccount_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_ccount_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_XTSYNC }, 'o' },
+  { { STATE_CCOUNT }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_ccompare0_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_ccompare0_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_CCOMPARE0 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_ccompare0_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_ccompare0_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_CCOMPARE0 }, 'o' },
+  { { STATE_INTERRUPT }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_ccompare0_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_ccompare0_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_CCOMPARE0 }, 'm' },
+  { { STATE_INTERRUPT }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_ccompare1_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_ccompare1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_CCOMPARE1 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_ccompare1_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_ccompare1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_CCOMPARE1 }, 'o' },
+  { { STATE_INTERRUPT }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_ccompare1_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_ccompare1_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_CCOMPARE1 }, 'm' },
+  { { STATE_INTERRUPT }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_ccompare2_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_ccompare2_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_CCOMPARE2 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_ccompare2_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_ccompare2_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_CCOMPARE2 }, 'o' },
+  { { STATE_INTERRUPT }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_ccompare2_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_ccompare2_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_CCOMPARE2 }, 'm' },
+  { { STATE_INTERRUPT }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_icache_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 21 /* uimm8x4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_icache_lock_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 22 /* uimm4x16 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_icache_lock_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_icache_inv_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 21 /* uimm8x4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_icache_inv_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_licx_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 4 /* ars */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_licx_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_sicx_args[] = {
+  { { 6 /* art */ }, 'i' },
+  { { 4 /* ars */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_sicx_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_dcache_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 21 /* uimm8x4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_dcache_ind_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 22 /* uimm4x16 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_dcache_ind_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_dcache_inv_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 21 /* uimm8x4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_dcache_inv_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_dpf_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 21 /* uimm8x4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_dcache_lock_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 22 /* uimm4x16 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_dcache_lock_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_sdct_args[] = {
+  { { 6 /* art */ }, 'i' },
+  { { 4 /* ars */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_sdct_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_ldct_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 4 /* ars */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_ldct_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_ptevaddr_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_ptevaddr_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_PTBASE }, 'o' },
+  { { STATE_XTSYNC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_ptevaddr_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_ptevaddr_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_PTBASE }, 'i' },
+  { { STATE_EXCVADDR }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_ptevaddr_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_ptevaddr_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_PTBASE }, 'm' },
+  { { STATE_EXCVADDR }, 'i' },
+  { { STATE_XTSYNC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_rasid_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_rasid_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_ASID3 }, 'i' },
+  { { STATE_ASID2 }, 'i' },
+  { { STATE_ASID1 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_rasid_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_rasid_stateArgs[] = {
+  { { STATE_XTSYNC }, 'o' },
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_ASID3 }, 'o' },
+  { { STATE_ASID2 }, 'o' },
+  { { STATE_ASID1 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_rasid_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_rasid_stateArgs[] = {
+  { { STATE_XTSYNC }, 'o' },
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_ASID3 }, 'm' },
+  { { STATE_ASID2 }, 'm' },
+  { { STATE_ASID1 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_itlbcfg_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_itlbcfg_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_INSTPGSZID4 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_itlbcfg_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_itlbcfg_stateArgs[] = {
+  { { STATE_XTSYNC }, 'o' },
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_INSTPGSZID4 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_itlbcfg_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_itlbcfg_stateArgs[] = {
+  { { STATE_XTSYNC }, 'o' },
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_INSTPGSZID4 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_dtlbcfg_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_dtlbcfg_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DATAPGSZID4 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_dtlbcfg_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_dtlbcfg_stateArgs[] = {
+  { { STATE_XTSYNC }, 'o' },
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DATAPGSZID4 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_dtlbcfg_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_dtlbcfg_stateArgs[] = {
+  { { STATE_XTSYNC }, 'o' },
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_DATAPGSZID4 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_idtlb_args[] = {
+  { { 4 /* ars */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_idtlb_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_XTSYNC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rdtlb_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 4 /* ars */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rdtlb_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wdtlb_args[] = {
+  { { 6 /* art */ }, 'i' },
+  { { 4 /* ars */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wdtlb_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_XTSYNC }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_iitlb_args[] = {
+  { { 4 /* ars */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_iitlb_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_ritlb_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 4 /* ars */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_ritlb_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_witlb_args[] = {
+  { { 6 /* art */ }, 'i' },
+  { { 4 /* ars */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_witlb_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_ldpte_stateArgs[] = {
+  { { STATE_PTBASE }, 'i' },
+  { { STATE_EXCVADDR }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_hwwitlba_stateArgs[] = {
+  { { STATE_EXCVADDR }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_hwwdtlba_stateArgs[] = {
+  { { STATE_EXCVADDR }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_cpenable_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_cpenable_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_cpenable_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_cpenable_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_CPENABLE }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_cpenable_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_cpenable_stateArgs[] = {
+  { { STATE_PSEXCM }, 'i' },
+  { { STATE_PSRING }, 'i' },
+  { { STATE_CPENABLE }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_clamp_args[] = {
+  { { 3 /* arr */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 58 /* tp7 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_minmax_args[] = {
+  { { 3 /* arr */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_nsa_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 4 /* ars */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_sx_args[] = {
+  { { 3 /* arr */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 58 /* tp7 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_l32ai_args[] = {
+  { { 6 /* art */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 21 /* uimm8x4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_s32ri_args[] = {
+  { { 6 /* art */ }, 'i' },
+  { { 4 /* ars */ }, 'i' },
+  { { 21 /* uimm8x4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_s32c1i_args[] = {
+  { { 6 /* art */ }, 'm' },
+  { { 4 /* ars */ }, 'i' },
+  { { 21 /* uimm8x4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_s32c1i_stateArgs[] = {
+  { { STATE_SCOMPARE1 }, 'i' },
+  { { STATE_SCOMPARE1 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_scompare1_args[] = {
+  { { 6 /* art */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_rsr_scompare1_stateArgs[] = {
+  { { STATE_SCOMPARE1 }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_scompare1_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wsr_scompare1_stateArgs[] = {
+  { { STATE_SCOMPARE1 }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_scompare1_args[] = {
+  { { 6 /* art */ }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_xsr_scompare1_stateArgs[] = {
+  { { STATE_SCOMPARE1 }, 'm' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_div_args[] = {
+  { { 3 /* arr */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_mul32_args[] = {
+  { { 3 /* arr */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_rur_fcr_args[] = {
+  { { 3 /* arr */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_rur_fcr_stateArgs[] = {
+  { { STATE_RoundMode }, 'i' },
+  { { STATE_InvalidEnable }, 'i' },
+  { { STATE_DivZeroEnable }, 'i' },
+  { { STATE_OverflowEnable }, 'i' },
+  { { STATE_UnderflowEnable }, 'i' },
+  { { STATE_InexactEnable }, 'i' },
+  { { STATE_FPreserved20 }, 'i' },
+  { { STATE_FPreserved5 }, 'i' },
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_wur_fcr_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_wur_fcr_stateArgs[] = {
+  { { STATE_RoundMode }, 'o' },
+  { { STATE_InvalidEnable }, 'o' },
+  { { STATE_DivZeroEnable }, 'o' },
+  { { STATE_OverflowEnable }, 'o' },
+  { { STATE_UnderflowEnable }, 'o' },
+  { { STATE_InexactEnable }, 'o' },
+  { { STATE_FPreserved20 }, 'o' },
+  { { STATE_FPreserved5 }, 'o' },
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_rur_fsr_args[] = {
+  { { 3 /* arr */ }, 'o' }
+};
+
+static xtensa_arg_internal Iclass_rur_fsr_stateArgs[] = {
+  { { STATE_InvalidFlag }, 'i' },
+  { { STATE_DivZeroFlag }, 'i' },
+  { { STATE_OverflowFlag }, 'i' },
+  { { STATE_UnderflowFlag }, 'i' },
+  { { STATE_InexactFlag }, 'i' },
+  { { STATE_FPreserved20a }, 'i' },
+  { { STATE_FPreserved7 }, 'i' },
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_wur_fsr_args[] = {
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_wur_fsr_stateArgs[] = {
+  { { STATE_InvalidFlag }, 'o' },
+  { { STATE_DivZeroFlag }, 'o' },
+  { { STATE_OverflowFlag }, 'o' },
+  { { STATE_UnderflowFlag }, 'o' },
+  { { STATE_InexactFlag }, 'o' },
+  { { STATE_FPreserved20a }, 'o' },
+  { { STATE_FPreserved7 }, 'o' },
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_args[] = {
+  { { 62 /* frr */ }, 'o' },
+  { { 63 /* frs */ }, 'i' },
+  { { 64 /* frt */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_stateArgs[] = {
+  { { STATE_RoundMode }, 'i' },
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_mac_args[] = {
+  { { 62 /* frr */ }, 'm' },
+  { { 63 /* frs */ }, 'i' },
+  { { 64 /* frt */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_mac_stateArgs[] = {
+  { { STATE_RoundMode }, 'i' },
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_cmov_args[] = {
+  { { 62 /* frr */ }, 'm' },
+  { { 63 /* frs */ }, 'i' },
+  { { 42 /* bt */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_cmov_stateArgs[] = {
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_mov_args[] = {
+  { { 62 /* frr */ }, 'm' },
+  { { 63 /* frs */ }, 'i' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_mov_stateArgs[] = {
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_mov2_args[] = {
+  { { 62 /* frr */ }, 'o' },
+  { { 63 /* frs */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_mov2_stateArgs[] = {
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_cmp_args[] = {
+  { { 44 /* br */ }, 'o' },
+  { { 63 /* frs */ }, 'i' },
+  { { 64 /* frt */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_cmp_stateArgs[] = {
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_float_args[] = {
+  { { 62 /* frr */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 65 /* t */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_float_stateArgs[] = {
+  { { STATE_RoundMode }, 'i' },
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_int_args[] = {
+  { { 3 /* arr */ }, 'o' },
+  { { 63 /* frs */ }, 'i' },
+  { { 65 /* t */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_int_stateArgs[] = {
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_rfr_args[] = {
+  { { 3 /* arr */ }, 'o' },
+  { { 63 /* frs */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_rfr_stateArgs[] = {
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_wfr_args[] = {
+  { { 62 /* frr */ }, 'o' },
+  { { 4 /* ars */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_wfr_stateArgs[] = {
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_lsi_args[] = {
+  { { 64 /* frt */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 61 /* cimm8x4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_lsi_stateArgs[] = {
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_lsiu_args[] = {
+  { { 64 /* frt */ }, 'o' },
+  { { 4 /* ars */ }, 'm' },
+  { { 61 /* cimm8x4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_lsiu_stateArgs[] = {
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_lsx_args[] = {
+  { { 62 /* frr */ }, 'o' },
+  { { 4 /* ars */ }, 'i' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_lsx_stateArgs[] = {
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_lsxu_args[] = {
+  { { 62 /* frr */ }, 'o' },
+  { { 4 /* ars */ }, 'm' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_lsxu_stateArgs[] = {
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_ssi_args[] = {
+  { { 64 /* frt */ }, 'i' },
+  { { 4 /* ars */ }, 'i' },
+  { { 61 /* cimm8x4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_ssi_stateArgs[] = {
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_ssiu_args[] = {
+  { { 64 /* frt */ }, 'i' },
+  { { 4 /* ars */ }, 'm' },
+  { { 61 /* cimm8x4 */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_ssiu_stateArgs[] = {
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_ssx_args[] = {
+  { { 62 /* frr */ }, 'i' },
+  { { 4 /* ars */ }, 'i' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_ssx_stateArgs[] = {
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_ssxu_args[] = {
+  { { 62 /* frr */ }, 'i' },
+  { { 4 /* ars */ }, 'm' },
+  { { 6 /* art */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_fp_ssxu_stateArgs[] = {
+  { { STATE_CPENABLE }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wb18_0_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 60 /* xt_wbr18_label */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wb18_1_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 17 /* b4const */ }, 'i' },
+  { { 60 /* xt_wbr18_label */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wb18_2_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 18 /* b4constu */ }, 'i' },
+  { { 60 /* xt_wbr18_label */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wb18_3_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 67 /* bbi */ }, 'i' },
+  { { 60 /* xt_wbr18_label */ }, 'i' }
+};
+
+static xtensa_arg_internal Iclass_xt_iclass_wb18_4_args[] = {
+  { { 4 /* ars */ }, 'i' },
+  { { 6 /* art */ }, 'i' },
+  { { 60 /* xt_wbr18_label */ }, 'i' }
+};
+
+static xtensa_iclass_internal iclasses[] = {
+  { 0, 0 /* xt_iclass_excw */,
+    0, 0, 0, 0 },
+  { 0, 0 /* xt_iclass_rfe */,
+    3, Iclass_xt_iclass_rfe_stateArgs, 0, 0 },
+  { 0, 0 /* xt_iclass_rfde */,
+    3, Iclass_xt_iclass_rfde_stateArgs, 0, 0 },
+  { 0, 0 /* xt_iclass_syscall */,
+    0, 0, 0, 0 },
+  { 0, 0 /* xt_iclass_simcall */,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_call12_args,
+    1, Iclass_xt_iclass_call12_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_call8_args,
+    1, Iclass_xt_iclass_call8_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_call4_args,
+    1, Iclass_xt_iclass_call4_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_callx12_args,
+    1, Iclass_xt_iclass_callx12_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_callx8_args,
+    1, Iclass_xt_iclass_callx8_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_callx4_args,
+    1, Iclass_xt_iclass_callx4_stateArgs, 0, 0 },
+  { 3, Iclass_xt_iclass_entry_args,
+    5, Iclass_xt_iclass_entry_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_movsp_args,
+    2, Iclass_xt_iclass_movsp_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rotw_args,
+    3, Iclass_xt_iclass_rotw_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_retw_args,
+    4, Iclass_xt_iclass_retw_stateArgs, 0, 0 },
+  { 0, 0 /* xt_iclass_rfwou */,
+    6, Iclass_xt_iclass_rfwou_stateArgs, 0, 0 },
+  { 3, Iclass_xt_iclass_l32e_args,
+    2, Iclass_xt_iclass_l32e_stateArgs, 0, 0 },
+  { 3, Iclass_xt_iclass_s32e_args,
+    2, Iclass_xt_iclass_s32e_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_windowbase_args,
+    3, Iclass_xt_iclass_rsr_windowbase_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_windowbase_args,
+    3, Iclass_xt_iclass_wsr_windowbase_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_windowbase_args,
+    3, Iclass_xt_iclass_xsr_windowbase_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_windowstart_args,
+    3, Iclass_xt_iclass_rsr_windowstart_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_windowstart_args,
+    3, Iclass_xt_iclass_wsr_windowstart_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_windowstart_args,
+    3, Iclass_xt_iclass_xsr_windowstart_stateArgs, 0, 0 },
+  { 3, Iclass_xt_iclass_add_n_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_addi_n_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_bz6_args,
+    0, 0, 0, 0 },
+  { 0, 0 /* xt_iclass_ill_n */,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_loadi4_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_mov_n_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_movi_n_args,
+    0, 0, 0, 0 },
+  { 0, 0 /* xt_iclass_nopn */,
+    0, 0, 0, 0 },
+  { 1, Iclass_xt_iclass_retn_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_storei4_args,
+    0, 0, 0, 0 },
+  { 1, Iclass_rur_threadptr_args,
+    1, Iclass_rur_threadptr_stateArgs, 0, 0 },
+  { 1, Iclass_wur_threadptr_args,
+    1, Iclass_wur_threadptr_stateArgs, 0, 0 },
+  { 3, Iclass_xt_iclass_addi_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_addmi_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_addsub_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_bit_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_bsi8_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_bsi8b_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_bsi8u_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_bst8_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_bsz12_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_call0_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_callx0_args,
+    0, 0, 0, 0 },
+  { 4, Iclass_xt_iclass_exti_args,
+    0, 0, 0, 0 },
+  { 0, 0 /* xt_iclass_ill */,
+    0, 0, 0, 0 },
+  { 1, Iclass_xt_iclass_jump_args,
+    0, 0, 0, 0 },
+  { 1, Iclass_xt_iclass_jumpx_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_l16ui_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_l16si_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_l32i_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_l32r_args,
+    2, Iclass_xt_iclass_l32r_stateArgs, 0, 0 },
+  { 3, Iclass_xt_iclass_l8i_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_loop_args,
+    3, Iclass_xt_iclass_loop_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_loopz_args,
+    3, Iclass_xt_iclass_loopz_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_movi_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_movz_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_neg_args,
+    0, 0, 0, 0 },
+  { 0, 0 /* xt_iclass_nop */,
+    0, 0, 0, 0 },
+  { 1, Iclass_xt_iclass_return_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_s16i_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_s32i_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_s8i_args,
+    0, 0, 0, 0 },
+  { 1, Iclass_xt_iclass_sar_args,
+    1, Iclass_xt_iclass_sar_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_sari_args,
+    1, Iclass_xt_iclass_sari_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_shifts_args,
+    1, Iclass_xt_iclass_shifts_stateArgs, 0, 0 },
+  { 3, Iclass_xt_iclass_shiftst_args,
+    1, Iclass_xt_iclass_shiftst_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_shiftt_args,
+    1, Iclass_xt_iclass_shiftt_stateArgs, 0, 0 },
+  { 3, Iclass_xt_iclass_slli_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_srai_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_srli_args,
+    0, 0, 0, 0 },
+  { 0, 0 /* xt_iclass_memw */,
+    0, 0, 0, 0 },
+  { 0, 0 /* xt_iclass_extw */,
+    0, 0, 0, 0 },
+  { 0, 0 /* xt_iclass_isync */,
+    0, 0, 0, 0 },
+  { 0, 0 /* xt_iclass_sync */,
+    1, Iclass_xt_iclass_sync_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_rsil_args,
+    7, Iclass_xt_iclass_rsil_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_lend_args,
+    1, Iclass_xt_iclass_rsr_lend_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_lend_args,
+    1, Iclass_xt_iclass_wsr_lend_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_lend_args,
+    1, Iclass_xt_iclass_xsr_lend_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_lcount_args,
+    1, Iclass_xt_iclass_rsr_lcount_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_lcount_args,
+    2, Iclass_xt_iclass_wsr_lcount_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_lcount_args,
+    2, Iclass_xt_iclass_xsr_lcount_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_lbeg_args,
+    1, Iclass_xt_iclass_rsr_lbeg_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_lbeg_args,
+    1, Iclass_xt_iclass_wsr_lbeg_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_lbeg_args,
+    1, Iclass_xt_iclass_xsr_lbeg_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_sar_args,
+    1, Iclass_xt_iclass_rsr_sar_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_sar_args,
+    2, Iclass_xt_iclass_wsr_sar_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_sar_args,
+    1, Iclass_xt_iclass_xsr_sar_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_litbase_args,
+    2, Iclass_xt_iclass_rsr_litbase_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_litbase_args,
+    2, Iclass_xt_iclass_wsr_litbase_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_litbase_args,
+    2, Iclass_xt_iclass_xsr_litbase_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_176_args,
+    2, Iclass_xt_iclass_rsr_176_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_208_args,
+    2, Iclass_xt_iclass_rsr_208_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_ps_args,
+    7, Iclass_xt_iclass_rsr_ps_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_ps_args,
+    7, Iclass_xt_iclass_wsr_ps_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_ps_args,
+    7, Iclass_xt_iclass_xsr_ps_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_epc1_args,
+    3, Iclass_xt_iclass_rsr_epc1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_epc1_args,
+    3, Iclass_xt_iclass_wsr_epc1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_epc1_args,
+    3, Iclass_xt_iclass_xsr_epc1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_excsave1_args,
+    3, Iclass_xt_iclass_rsr_excsave1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_excsave1_args,
+    3, Iclass_xt_iclass_wsr_excsave1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_excsave1_args,
+    3, Iclass_xt_iclass_xsr_excsave1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_epc2_args,
+    3, Iclass_xt_iclass_rsr_epc2_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_epc2_args,
+    3, Iclass_xt_iclass_wsr_epc2_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_epc2_args,
+    3, Iclass_xt_iclass_xsr_epc2_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_excsave2_args,
+    3, Iclass_xt_iclass_rsr_excsave2_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_excsave2_args,
+    3, Iclass_xt_iclass_wsr_excsave2_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_excsave2_args,
+    3, Iclass_xt_iclass_xsr_excsave2_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_epc3_args,
+    3, Iclass_xt_iclass_rsr_epc3_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_epc3_args,
+    3, Iclass_xt_iclass_wsr_epc3_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_epc3_args,
+    3, Iclass_xt_iclass_xsr_epc3_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_excsave3_args,
+    3, Iclass_xt_iclass_rsr_excsave3_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_excsave3_args,
+    3, Iclass_xt_iclass_wsr_excsave3_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_excsave3_args,
+    3, Iclass_xt_iclass_xsr_excsave3_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_epc4_args,
+    3, Iclass_xt_iclass_rsr_epc4_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_epc4_args,
+    3, Iclass_xt_iclass_wsr_epc4_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_epc4_args,
+    3, Iclass_xt_iclass_xsr_epc4_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_excsave4_args,
+    3, Iclass_xt_iclass_rsr_excsave4_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_excsave4_args,
+    3, Iclass_xt_iclass_wsr_excsave4_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_excsave4_args,
+    3, Iclass_xt_iclass_xsr_excsave4_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_epc5_args,
+    3, Iclass_xt_iclass_rsr_epc5_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_epc5_args,
+    3, Iclass_xt_iclass_wsr_epc5_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_epc5_args,
+    3, Iclass_xt_iclass_xsr_epc5_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_excsave5_args,
+    3, Iclass_xt_iclass_rsr_excsave5_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_excsave5_args,
+    3, Iclass_xt_iclass_wsr_excsave5_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_excsave5_args,
+    3, Iclass_xt_iclass_xsr_excsave5_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_epc6_args,
+    3, Iclass_xt_iclass_rsr_epc6_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_epc6_args,
+    3, Iclass_xt_iclass_wsr_epc6_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_epc6_args,
+    3, Iclass_xt_iclass_xsr_epc6_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_excsave6_args,
+    3, Iclass_xt_iclass_rsr_excsave6_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_excsave6_args,
+    3, Iclass_xt_iclass_wsr_excsave6_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_excsave6_args,
+    3, Iclass_xt_iclass_xsr_excsave6_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_epc7_args,
+    3, Iclass_xt_iclass_rsr_epc7_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_epc7_args,
+    3, Iclass_xt_iclass_wsr_epc7_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_epc7_args,
+    3, Iclass_xt_iclass_xsr_epc7_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_excsave7_args,
+    3, Iclass_xt_iclass_rsr_excsave7_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_excsave7_args,
+    3, Iclass_xt_iclass_wsr_excsave7_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_excsave7_args,
+    3, Iclass_xt_iclass_xsr_excsave7_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_eps2_args,
+    3, Iclass_xt_iclass_rsr_eps2_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_eps2_args,
+    3, Iclass_xt_iclass_wsr_eps2_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_eps2_args,
+    3, Iclass_xt_iclass_xsr_eps2_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_eps3_args,
+    3, Iclass_xt_iclass_rsr_eps3_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_eps3_args,
+    3, Iclass_xt_iclass_wsr_eps3_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_eps3_args,
+    3, Iclass_xt_iclass_xsr_eps3_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_eps4_args,
+    3, Iclass_xt_iclass_rsr_eps4_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_eps4_args,
+    3, Iclass_xt_iclass_wsr_eps4_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_eps4_args,
+    3, Iclass_xt_iclass_xsr_eps4_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_eps5_args,
+    3, Iclass_xt_iclass_rsr_eps5_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_eps5_args,
+    3, Iclass_xt_iclass_wsr_eps5_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_eps5_args,
+    3, Iclass_xt_iclass_xsr_eps5_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_eps6_args,
+    3, Iclass_xt_iclass_rsr_eps6_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_eps6_args,
+    3, Iclass_xt_iclass_wsr_eps6_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_eps6_args,
+    3, Iclass_xt_iclass_xsr_eps6_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_eps7_args,
+    3, Iclass_xt_iclass_rsr_eps7_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_eps7_args,
+    3, Iclass_xt_iclass_wsr_eps7_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_eps7_args,
+    3, Iclass_xt_iclass_xsr_eps7_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_excvaddr_args,
+    3, Iclass_xt_iclass_rsr_excvaddr_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_excvaddr_args,
+    3, Iclass_xt_iclass_wsr_excvaddr_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_excvaddr_args,
+    3, Iclass_xt_iclass_xsr_excvaddr_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_depc_args,
+    3, Iclass_xt_iclass_rsr_depc_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_depc_args,
+    3, Iclass_xt_iclass_wsr_depc_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_depc_args,
+    3, Iclass_xt_iclass_xsr_depc_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_exccause_args,
+    4, Iclass_xt_iclass_rsr_exccause_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_exccause_args,
+    3, Iclass_xt_iclass_wsr_exccause_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_exccause_args,
+    3, Iclass_xt_iclass_xsr_exccause_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_misc0_args,
+    3, Iclass_xt_iclass_rsr_misc0_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_misc0_args,
+    3, Iclass_xt_iclass_wsr_misc0_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_misc0_args,
+    3, Iclass_xt_iclass_xsr_misc0_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_misc1_args,
+    3, Iclass_xt_iclass_rsr_misc1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_misc1_args,
+    3, Iclass_xt_iclass_wsr_misc1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_misc1_args,
+    3, Iclass_xt_iclass_xsr_misc1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_misc2_args,
+    3, Iclass_xt_iclass_rsr_misc2_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_misc2_args,
+    3, Iclass_xt_iclass_wsr_misc2_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_misc2_args,
+    3, Iclass_xt_iclass_xsr_misc2_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_misc3_args,
+    3, Iclass_xt_iclass_rsr_misc3_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_misc3_args,
+    3, Iclass_xt_iclass_wsr_misc3_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_misc3_args,
+    3, Iclass_xt_iclass_xsr_misc3_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_prid_args,
+    2, Iclass_xt_iclass_rsr_prid_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_vecbase_args,
+    3, Iclass_xt_iclass_rsr_vecbase_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_vecbase_args,
+    3, Iclass_xt_iclass_wsr_vecbase_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_vecbase_args,
+    3, Iclass_xt_iclass_xsr_vecbase_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_mac16_aa_args,
+    1, Iclass_xt_iclass_mac16_aa_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_mac16_ad_args,
+    1, Iclass_xt_iclass_mac16_ad_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_mac16_da_args,
+    1, Iclass_xt_iclass_mac16_da_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_mac16_dd_args,
+    1, Iclass_xt_iclass_mac16_dd_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_mac16a_aa_args,
+    1, Iclass_xt_iclass_mac16a_aa_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_mac16a_ad_args,
+    1, Iclass_xt_iclass_mac16a_ad_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_mac16a_da_args,
+    1, Iclass_xt_iclass_mac16a_da_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_mac16a_dd_args,
+    1, Iclass_xt_iclass_mac16a_dd_stateArgs, 0, 0 },
+  { 4, Iclass_xt_iclass_mac16al_da_args,
+    1, Iclass_xt_iclass_mac16al_da_stateArgs, 0, 0 },
+  { 4, Iclass_xt_iclass_mac16al_dd_args,
+    1, Iclass_xt_iclass_mac16al_dd_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_mac16_l_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_mul16_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_rsr_m0_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_wsr_m0_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_xsr_m0_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_rsr_m1_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_wsr_m1_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_xsr_m1_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_rsr_m2_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_wsr_m2_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_xsr_m2_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_rsr_m3_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_wsr_m3_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_xsr_m3_args,
+    0, 0, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_acclo_args,
+    1, Iclass_xt_iclass_rsr_acclo_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_acclo_args,
+    1, Iclass_xt_iclass_wsr_acclo_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_acclo_args,
+    1, Iclass_xt_iclass_xsr_acclo_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_acchi_args,
+    1, Iclass_xt_iclass_rsr_acchi_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_acchi_args,
+    1, Iclass_xt_iclass_wsr_acchi_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_acchi_args,
+    1, Iclass_xt_iclass_xsr_acchi_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rfi_args,
+    21, Iclass_xt_iclass_rfi_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wait_args,
+    3, Iclass_xt_iclass_wait_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_interrupt_args,
+    3, Iclass_xt_iclass_rsr_interrupt_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_intset_args,
+    4, Iclass_xt_iclass_wsr_intset_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_intclear_args,
+    4, Iclass_xt_iclass_wsr_intclear_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_intenable_args,
+    3, Iclass_xt_iclass_rsr_intenable_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_intenable_args,
+    3, Iclass_xt_iclass_wsr_intenable_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_intenable_args,
+    3, Iclass_xt_iclass_xsr_intenable_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_break_args,
+    2, Iclass_xt_iclass_break_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_break_n_args,
+    2, Iclass_xt_iclass_break_n_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_dbreaka0_args,
+    3, Iclass_xt_iclass_rsr_dbreaka0_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_dbreaka0_args,
+    4, Iclass_xt_iclass_wsr_dbreaka0_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_dbreaka0_args,
+    4, Iclass_xt_iclass_xsr_dbreaka0_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_dbreakc0_args,
+    3, Iclass_xt_iclass_rsr_dbreakc0_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_dbreakc0_args,
+    4, Iclass_xt_iclass_wsr_dbreakc0_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_dbreakc0_args,
+    4, Iclass_xt_iclass_xsr_dbreakc0_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_dbreaka1_args,
+    3, Iclass_xt_iclass_rsr_dbreaka1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_dbreaka1_args,
+    4, Iclass_xt_iclass_wsr_dbreaka1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_dbreaka1_args,
+    4, Iclass_xt_iclass_xsr_dbreaka1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_dbreakc1_args,
+    3, Iclass_xt_iclass_rsr_dbreakc1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_dbreakc1_args,
+    4, Iclass_xt_iclass_wsr_dbreakc1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_dbreakc1_args,
+    4, Iclass_xt_iclass_xsr_dbreakc1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_ibreaka0_args,
+    3, Iclass_xt_iclass_rsr_ibreaka0_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_ibreaka0_args,
+    3, Iclass_xt_iclass_wsr_ibreaka0_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_ibreaka0_args,
+    3, Iclass_xt_iclass_xsr_ibreaka0_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_ibreaka1_args,
+    3, Iclass_xt_iclass_rsr_ibreaka1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_ibreaka1_args,
+    3, Iclass_xt_iclass_wsr_ibreaka1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_ibreaka1_args,
+    3, Iclass_xt_iclass_xsr_ibreaka1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_ibreakenable_args,
+    3, Iclass_xt_iclass_rsr_ibreakenable_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_ibreakenable_args,
+    3, Iclass_xt_iclass_wsr_ibreakenable_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_ibreakenable_args,
+    3, Iclass_xt_iclass_xsr_ibreakenable_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_debugcause_args,
+    4, Iclass_xt_iclass_rsr_debugcause_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_debugcause_args,
+    4, Iclass_xt_iclass_wsr_debugcause_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_debugcause_args,
+    4, Iclass_xt_iclass_xsr_debugcause_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_icount_args,
+    3, Iclass_xt_iclass_rsr_icount_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_icount_args,
+    4, Iclass_xt_iclass_wsr_icount_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_icount_args,
+    4, Iclass_xt_iclass_xsr_icount_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_icountlevel_args,
+    3, Iclass_xt_iclass_rsr_icountlevel_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_icountlevel_args,
+    3, Iclass_xt_iclass_wsr_icountlevel_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_icountlevel_args,
+    3, Iclass_xt_iclass_xsr_icountlevel_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_ddr_args,
+    3, Iclass_xt_iclass_rsr_ddr_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_ddr_args,
+    4, Iclass_xt_iclass_wsr_ddr_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_ddr_args,
+    4, Iclass_xt_iclass_xsr_ddr_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rfdo_args,
+    10, Iclass_xt_iclass_rfdo_stateArgs, 0, 0 },
+  { 0, 0 /* xt_iclass_rfdd */,
+    1, Iclass_xt_iclass_rfdd_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_mmid_args,
+    3, Iclass_xt_iclass_wsr_mmid_stateArgs, 0, 0 },
+  { 3, Iclass_xt_iclass_bbool1_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_bbool4_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_bbool8_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_bbranch_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_bmove_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_RSR_BR_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_WSR_BR_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_XSR_BR_args,
+    0, 0, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_ccount_args,
+    3, Iclass_xt_iclass_rsr_ccount_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_ccount_args,
+    4, Iclass_xt_iclass_wsr_ccount_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_ccount_args,
+    4, Iclass_xt_iclass_xsr_ccount_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_ccompare0_args,
+    3, Iclass_xt_iclass_rsr_ccompare0_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_ccompare0_args,
+    4, Iclass_xt_iclass_wsr_ccompare0_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_ccompare0_args,
+    4, Iclass_xt_iclass_xsr_ccompare0_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_ccompare1_args,
+    3, Iclass_xt_iclass_rsr_ccompare1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_ccompare1_args,
+    4, Iclass_xt_iclass_wsr_ccompare1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_ccompare1_args,
+    4, Iclass_xt_iclass_xsr_ccompare1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_ccompare2_args,
+    3, Iclass_xt_iclass_rsr_ccompare2_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_ccompare2_args,
+    4, Iclass_xt_iclass_wsr_ccompare2_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_ccompare2_args,
+    4, Iclass_xt_iclass_xsr_ccompare2_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_icache_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_icache_lock_args,
+    2, Iclass_xt_iclass_icache_lock_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_icache_inv_args,
+    2, Iclass_xt_iclass_icache_inv_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_licx_args,
+    2, Iclass_xt_iclass_licx_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_sicx_args,
+    2, Iclass_xt_iclass_sicx_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_dcache_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_dcache_ind_args,
+    2, Iclass_xt_iclass_dcache_ind_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_dcache_inv_args,
+    2, Iclass_xt_iclass_dcache_inv_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_dpf_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_dcache_lock_args,
+    2, Iclass_xt_iclass_dcache_lock_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_sdct_args,
+    2, Iclass_xt_iclass_sdct_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_ldct_args,
+    2, Iclass_xt_iclass_ldct_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_ptevaddr_args,
+    4, Iclass_xt_iclass_wsr_ptevaddr_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_ptevaddr_args,
+    4, Iclass_xt_iclass_rsr_ptevaddr_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_ptevaddr_args,
+    5, Iclass_xt_iclass_xsr_ptevaddr_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_rasid_args,
+    5, Iclass_xt_iclass_rsr_rasid_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_rasid_args,
+    6, Iclass_xt_iclass_wsr_rasid_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_rasid_args,
+    6, Iclass_xt_iclass_xsr_rasid_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_itlbcfg_args,
+    3, Iclass_xt_iclass_rsr_itlbcfg_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_itlbcfg_args,
+    4, Iclass_xt_iclass_wsr_itlbcfg_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_itlbcfg_args,
+    4, Iclass_xt_iclass_xsr_itlbcfg_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_dtlbcfg_args,
+    3, Iclass_xt_iclass_rsr_dtlbcfg_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_dtlbcfg_args,
+    4, Iclass_xt_iclass_wsr_dtlbcfg_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_dtlbcfg_args,
+    4, Iclass_xt_iclass_xsr_dtlbcfg_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_idtlb_args,
+    3, Iclass_xt_iclass_idtlb_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_rdtlb_args,
+    2, Iclass_xt_iclass_rdtlb_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_wdtlb_args,
+    3, Iclass_xt_iclass_wdtlb_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_iitlb_args,
+    2, Iclass_xt_iclass_iitlb_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_ritlb_args,
+    2, Iclass_xt_iclass_ritlb_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_witlb_args,
+    2, Iclass_xt_iclass_witlb_stateArgs, 0, 0 },
+  { 0, 0 /* xt_iclass_ldpte */,
+    2, Iclass_xt_iclass_ldpte_stateArgs, 0, 0 },
+  { 0, 0 /* xt_iclass_hwwitlba */,
+    1, Iclass_xt_iclass_hwwitlba_stateArgs, 0, 0 },
+  { 0, 0 /* xt_iclass_hwwdtlba */,
+    1, Iclass_xt_iclass_hwwdtlba_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_cpenable_args,
+    3, Iclass_xt_iclass_rsr_cpenable_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_cpenable_args,
+    3, Iclass_xt_iclass_wsr_cpenable_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_cpenable_args,
+    3, Iclass_xt_iclass_xsr_cpenable_stateArgs, 0, 0 },
+  { 3, Iclass_xt_iclass_clamp_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_minmax_args,
+    0, 0, 0, 0 },
+  { 2, Iclass_xt_iclass_nsa_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_sx_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_l32ai_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_s32ri_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_s32c1i_args,
+    2, Iclass_xt_iclass_s32c1i_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_rsr_scompare1_args,
+    1, Iclass_xt_iclass_rsr_scompare1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_wsr_scompare1_args,
+    1, Iclass_xt_iclass_wsr_scompare1_stateArgs, 0, 0 },
+  { 1, Iclass_xt_iclass_xsr_scompare1_args,
+    1, Iclass_xt_iclass_xsr_scompare1_stateArgs, 0, 0 },
+  { 3, Iclass_xt_iclass_div_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_mul32_args,
+    0, 0, 0, 0 },
+  { 1, Iclass_rur_fcr_args,
+    9, Iclass_rur_fcr_stateArgs, 0, 0 },
+  { 1, Iclass_wur_fcr_args,
+    9, Iclass_wur_fcr_stateArgs, 0, 0 },
+  { 1, Iclass_rur_fsr_args,
+    8, Iclass_rur_fsr_stateArgs, 0, 0 },
+  { 1, Iclass_wur_fsr_args,
+    8, Iclass_wur_fsr_stateArgs, 0, 0 },
+  { 3, Iclass_fp_args,
+    2, Iclass_fp_stateArgs, 0, 0 },
+  { 3, Iclass_fp_mac_args,
+    2, Iclass_fp_mac_stateArgs, 0, 0 },
+  { 3, Iclass_fp_cmov_args,
+    1, Iclass_fp_cmov_stateArgs, 0, 0 },
+  { 3, Iclass_fp_mov_args,
+    1, Iclass_fp_mov_stateArgs, 0, 0 },
+  { 2, Iclass_fp_mov2_args,
+    1, Iclass_fp_mov2_stateArgs, 0, 0 },
+  { 3, Iclass_fp_cmp_args,
+    1, Iclass_fp_cmp_stateArgs, 0, 0 },
+  { 3, Iclass_fp_float_args,
+    2, Iclass_fp_float_stateArgs, 0, 0 },
+  { 3, Iclass_fp_int_args,
+    1, Iclass_fp_int_stateArgs, 0, 0 },
+  { 2, Iclass_fp_rfr_args,
+    1, Iclass_fp_rfr_stateArgs, 0, 0 },
+  { 2, Iclass_fp_wfr_args,
+    1, Iclass_fp_wfr_stateArgs, 0, 0 },
+  { 3, Iclass_fp_lsi_args,
+    1, Iclass_fp_lsi_stateArgs, 0, 0 },
+  { 3, Iclass_fp_lsiu_args,
+    1, Iclass_fp_lsiu_stateArgs, 0, 0 },
+  { 3, Iclass_fp_lsx_args,
+    1, Iclass_fp_lsx_stateArgs, 0, 0 },
+  { 3, Iclass_fp_lsxu_args,
+    1, Iclass_fp_lsxu_stateArgs, 0, 0 },
+  { 3, Iclass_fp_ssi_args,
+    1, Iclass_fp_ssi_stateArgs, 0, 0 },
+  { 3, Iclass_fp_ssiu_args,
+    1, Iclass_fp_ssiu_stateArgs, 0, 0 },
+  { 3, Iclass_fp_ssx_args,
+    1, Iclass_fp_ssx_stateArgs, 0, 0 },
+  { 3, Iclass_fp_ssxu_args,
+    1, Iclass_fp_ssxu_stateArgs, 0, 0 },
+  { 2, Iclass_xt_iclass_wb18_0_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_wb18_1_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_wb18_2_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_wb18_3_args,
+    0, 0, 0, 0 },
+  { 3, Iclass_xt_iclass_wb18_4_args,
+    0, 0, 0, 0 }
+};
+
+
+/*  Opcode encodings.  */
+
+static void
+Opcode_excw_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x2080;
+}
+
+static void
+Opcode_rfe_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3000;
+}
+
+static void
+Opcode_rfde_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3200;
+}
+
+static void
+Opcode_syscall_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x5000;
+}
+
+static void
+Opcode_simcall_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x5100;
+}
+
+static void
+Opcode_call12_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x35;
+}
+
+static void
+Opcode_call8_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x25;
+}
+
+static void
+Opcode_call4_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x15;
+}
+
+static void
+Opcode_callx12_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf0;
+}
+
+static void
+Opcode_callx8_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xe0;
+}
+
+static void
+Opcode_callx4_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xd0;
+}
+
+static void
+Opcode_entry_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x36;
+}
+
+static void
+Opcode_movsp_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x1000;
+}
+
+static void
+Opcode_rotw_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x408000;
+}
+
+static void
+Opcode_retw_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x90;
+}
+
+static void
+Opcode_retw_n_Slot_inst16b_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf01d;
+}
+
+static void
+Opcode_rfwo_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3400;
+}
+
+static void
+Opcode_rfwu_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3500;
+}
+
+static void
+Opcode_l32e_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x90000;
+}
+
+static void
+Opcode_s32e_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x490000;
+}
+
+static void
+Opcode_rsr_windowbase_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x34800;
+}
+
+static void
+Opcode_wsr_windowbase_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x134800;
+}
+
+static void
+Opcode_xsr_windowbase_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x614800;
+}
+
+static void
+Opcode_rsr_windowstart_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x34900;
+}
+
+static void
+Opcode_wsr_windowstart_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x134900;
+}
+
+static void
+Opcode_xsr_windowstart_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x614900;
+}
+
+static void
+Opcode_add_n_Slot_inst16a_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa;
+}
+
+static void
+Opcode_addi_n_Slot_inst16a_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xb;
+}
+
+static void
+Opcode_addi_n_Slot_xt_flix64_slot2_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3000;
+}
+
+static void
+Opcode_beqz_n_Slot_inst16b_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x8c;
+}
+
+static void
+Opcode_bnez_n_Slot_inst16b_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xcc;
+}
+
+static void
+Opcode_ill_n_Slot_inst16b_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf06d;
+}
+
+static void
+Opcode_l32i_n_Slot_inst16a_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x8;
+}
+
+static void
+Opcode_mov_n_Slot_inst16b_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xd;
+}
+
+static void
+Opcode_mov_n_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x6000;
+}
+
+static void
+Opcode_mov_n_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa3000;
+}
+
+static void
+Opcode_mov_n_Slot_xt_flix64_slot2_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xc080;
+}
+
+static void
+Opcode_movi_n_Slot_inst16b_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xc;
+}
+
+static void
+Opcode_movi_n_Slot_xt_flix64_slot2_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xc000;
+}
+
+static void
+Opcode_nop_n_Slot_inst16b_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf03d;
+}
+
+static void
+Opcode_ret_n_Slot_inst16b_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf00d;
+}
+
+static void
+Opcode_s32i_n_Slot_inst16a_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x9;
+}
+
+static void
+Opcode_rur_threadptr_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xe30e70;
+}
+
+static void
+Opcode_wur_threadptr_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf3e700;
+}
+
+static void
+Opcode_addi_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xc002;
+}
+
+static void
+Opcode_addi_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x60000;
+}
+
+static void
+Opcode_addi_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x200c00;
+}
+
+static void
+Opcode_addmi_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xd002;
+}
+
+static void
+Opcode_addmi_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x70000;
+}
+
+static void
+Opcode_addmi_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x200d00;
+}
+
+static void
+Opcode_add_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x800000;
+}
+
+static void
+Opcode_add_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x92000;
+}
+
+static void
+Opcode_add_Slot_xt_flix64_slot2_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x2000;
+}
+
+static void
+Opcode_add_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x80000;
+}
+
+static void
+Opcode_sub_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xc00000;
+}
+
+static void
+Opcode_sub_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa8000;
+}
+
+static void
+Opcode_sub_Slot_xt_flix64_slot2_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa000;
+}
+
+static void
+Opcode_sub_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xc0000;
+}
+
+static void
+Opcode_addx2_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x900000;
+}
+
+static void
+Opcode_addx2_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x94000;
+}
+
+static void
+Opcode_addx2_Slot_xt_flix64_slot2_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x4000;
+}
+
+static void
+Opcode_addx2_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x90000;
+}
+
+static void
+Opcode_addx4_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa00000;
+}
+
+static void
+Opcode_addx4_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x98000;
+}
+
+static void
+Opcode_addx4_Slot_xt_flix64_slot2_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x5000;
+}
+
+static void
+Opcode_addx4_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa0000;
+}
+
+static void
+Opcode_addx8_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xb00000;
+}
+
+static void
+Opcode_addx8_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x93000;
+}
+
+static void
+Opcode_addx8_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xb0000;
+}
+
+static void
+Opcode_subx2_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xd00000;
+}
+
+static void
+Opcode_subx2_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xd0000;
+}
+
+static void
+Opcode_subx4_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xe00000;
+}
+
+static void
+Opcode_subx4_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xe0000;
+}
+
+static void
+Opcode_subx8_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf00000;
+}
+
+static void
+Opcode_subx8_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf0000;
+}
+
+static void
+Opcode_and_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x100000;
+}
+
+static void
+Opcode_and_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x95000;
+}
+
+static void
+Opcode_and_Slot_xt_flix64_slot2_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x6000;
+}
+
+static void
+Opcode_and_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x10000;
+}
+
+static void
+Opcode_or_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x200000;
+}
+
+static void
+Opcode_or_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x9e000;
+}
+
+static void
+Opcode_or_Slot_xt_flix64_slot2_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x7000;
+}
+
+static void
+Opcode_or_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x20000;
+}
+
+static void
+Opcode_xor_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x300000;
+}
+
+static void
+Opcode_xor_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xb0000;
+}
+
+static void
+Opcode_xor_Slot_xt_flix64_slot2_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xb000;
+}
+
+static void
+Opcode_xor_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x30000;
+}
+
+static void
+Opcode_beqi_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x26;
+}
+
+static void
+Opcode_bnei_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x66;
+}
+
+static void
+Opcode_bgei_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xe6;
+}
+
+static void
+Opcode_blti_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa6;
+}
+
+static void
+Opcode_bbci_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x6007;
+}
+
+static void
+Opcode_bbsi_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xe007;
+}
+
+static void
+Opcode_bgeui_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf6;
+}
+
+static void
+Opcode_bltui_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xb6;
+}
+
+static void
+Opcode_beq_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x1007;
+}
+
+static void
+Opcode_bne_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x9007;
+}
+
+static void
+Opcode_bge_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa007;
+}
+
+static void
+Opcode_blt_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x2007;
+}
+
+static void
+Opcode_bgeu_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xb007;
+}
+
+static void
+Opcode_bltu_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3007;
+}
+
+static void
+Opcode_bany_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x8007;
+}
+
+static void
+Opcode_bnone_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x7;
+}
+
+static void
+Opcode_ball_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x4007;
+}
+
+static void
+Opcode_bnall_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xc007;
+}
+
+static void
+Opcode_bbc_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x5007;
+}
+
+static void
+Opcode_bbs_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xd007;
+}
+
+static void
+Opcode_beqz_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x16;
+}
+
+static void
+Opcode_bnez_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x56;
+}
+
+static void
+Opcode_bgez_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xd6;
+}
+
+static void
+Opcode_bltz_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x96;
+}
+
+static void
+Opcode_call0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x5;
+}
+
+static void
+Opcode_callx0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xc0;
+}
+
+static void
+Opcode_extui_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x40000;
+}
+
+static void
+Opcode_extui_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x40000;
+}
+
+static void
+Opcode_extui_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x4000;
+}
+
+static void
+Opcode_ill_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0;
+}
+
+static void
+Opcode_j_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x6;
+}
+
+static void
+Opcode_j_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xc0000;
+}
+
+static void
+Opcode_jx_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa0;
+}
+
+static void
+Opcode_jx_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa3010;
+}
+
+static void
+Opcode_l16ui_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x1002;
+}
+
+static void
+Opcode_l16ui_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x200100;
+}
+
+static void
+Opcode_l16si_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x9002;
+}
+
+static void
+Opcode_l16si_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x200900;
+}
+
+static void
+Opcode_l32i_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x2002;
+}
+
+static void
+Opcode_l32i_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x200200;
+}
+
+static void
+Opcode_l32r_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x1;
+}
+
+static void
+Opcode_l32r_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x100000;
+}
+
+static void
+Opcode_l8ui_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x2;
+}
+
+static void
+Opcode_l8ui_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x200000;
+}
+
+static void
+Opcode_loop_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x8076;
+}
+
+static void
+Opcode_loopnez_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x9076;
+}
+
+static void
+Opcode_loopgtz_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa076;
+}
+
+static void
+Opcode_movi_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa002;
+}
+
+static void
+Opcode_movi_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x80000;
+}
+
+static void
+Opcode_movi_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x200a00;
+}
+
+static void
+Opcode_moveqz_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x830000;
+}
+
+static void
+Opcode_moveqz_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x96000;
+}
+
+static void
+Opcode_moveqz_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x83000;
+}
+
+static void
+Opcode_movnez_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x930000;
+}
+
+static void
+Opcode_movnez_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x9a000;
+}
+
+static void
+Opcode_movnez_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x93000;
+}
+
+static void
+Opcode_movltz_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa30000;
+}
+
+static void
+Opcode_movltz_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x99000;
+}
+
+static void
+Opcode_movltz_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa3000;
+}
+
+static void
+Opcode_movgez_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xb30000;
+}
+
+static void
+Opcode_movgez_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x97000;
+}
+
+static void
+Opcode_movgez_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xb3000;
+}
+
+static void
+Opcode_neg_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x600000;
+}
+
+static void
+Opcode_neg_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa5000;
+}
+
+static void
+Opcode_neg_Slot_xt_flix64_slot2_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xd100;
+}
+
+static void
+Opcode_neg_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x60000;
+}
+
+static void
+Opcode_abs_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x600100;
+}
+
+static void
+Opcode_abs_Slot_xt_flix64_slot2_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xd000;
+}
+
+static void
+Opcode_abs_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x60010;
+}
+
+static void
+Opcode_nop_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x20f0;
+}
+
+static void
+Opcode_nop_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa3040;
+}
+
+static void
+Opcode_nop_Slot_xt_flix64_slot2_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xc090;
+}
+
+static void
+Opcode_nop_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xc8000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_nop_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x20f;
+}
+
+static void
+Opcode_ret_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x80;
+}
+
+static void
+Opcode_s16i_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x5002;
+}
+
+static void
+Opcode_s16i_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x200500;
+}
+
+static void
+Opcode_s32i_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x6002;
+}
+
+static void
+Opcode_s32i_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x200600;
+}
+
+static void
+Opcode_s8i_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x4002;
+}
+
+static void
+Opcode_s8i_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x200400;
+}
+
+static void
+Opcode_ssr_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x400000;
+}
+
+static void
+Opcode_ssr_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x40000;
+}
+
+static void
+Opcode_ssl_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x401000;
+}
+
+static void
+Opcode_ssl_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa3020;
+}
+
+static void
+Opcode_ssl_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x40100;
+}
+
+static void
+Opcode_ssa8l_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x402000;
+}
+
+static void
+Opcode_ssa8l_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x40200;
+}
+
+static void
+Opcode_ssa8b_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x403000;
+}
+
+static void
+Opcode_ssa8b_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x40300;
+}
+
+static void
+Opcode_ssai_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x404000;
+}
+
+static void
+Opcode_ssai_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x40400;
+}
+
+static void
+Opcode_sll_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa10000;
+}
+
+static void
+Opcode_sll_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa6000;
+}
+
+static void
+Opcode_sll_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa1000;
+}
+
+static void
+Opcode_src_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x810000;
+}
+
+static void
+Opcode_src_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa2000;
+}
+
+static void
+Opcode_src_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x81000;
+}
+
+static void
+Opcode_srl_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x910000;
+}
+
+static void
+Opcode_srl_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa5200;
+}
+
+static void
+Opcode_srl_Slot_xt_flix64_slot2_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xd400;
+}
+
+static void
+Opcode_srl_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x91000;
+}
+
+static void
+Opcode_sra_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xb10000;
+}
+
+static void
+Opcode_sra_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa5100;
+}
+
+static void
+Opcode_sra_Slot_xt_flix64_slot2_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xd200;
+}
+
+static void
+Opcode_sra_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xb1000;
+}
+
+static void
+Opcode_slli_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x10000;
+}
+
+static void
+Opcode_slli_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x90000;
+}
+
+static void
+Opcode_slli_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x1000;
+}
+
+static void
+Opcode_srai_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x210000;
+}
+
+static void
+Opcode_srai_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa0000;
+}
+
+static void
+Opcode_srai_Slot_xt_flix64_slot2_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xe000;
+}
+
+static void
+Opcode_srai_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x21000;
+}
+
+static void
+Opcode_srli_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x410000;
+}
+
+static void
+Opcode_srli_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa4000;
+}
+
+static void
+Opcode_srli_Slot_xt_flix64_slot2_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x9000;
+}
+
+static void
+Opcode_srli_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x41000;
+}
+
+static void
+Opcode_memw_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x20c0;
+}
+
+static void
+Opcode_extw_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x20d0;
+}
+
+static void
+Opcode_isync_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x2000;
+}
+
+static void
+Opcode_rsync_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x2010;
+}
+
+static void
+Opcode_esync_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x2020;
+}
+
+static void
+Opcode_dsync_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x2030;
+}
+
+static void
+Opcode_rsil_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x6000;
+}
+
+static void
+Opcode_rsr_lend_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x30100;
+}
+
+static void
+Opcode_wsr_lend_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x130100;
+}
+
+static void
+Opcode_xsr_lend_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x610100;
+}
+
+static void
+Opcode_rsr_lcount_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x30200;
+}
+
+static void
+Opcode_wsr_lcount_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x130200;
+}
+
+static void
+Opcode_xsr_lcount_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x610200;
+}
+
+static void
+Opcode_rsr_lbeg_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x30000;
+}
+
+static void
+Opcode_wsr_lbeg_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x130000;
+}
+
+static void
+Opcode_xsr_lbeg_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x610000;
+}
+
+static void
+Opcode_rsr_sar_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x30300;
+}
+
+static void
+Opcode_wsr_sar_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x130300;
+}
+
+static void
+Opcode_xsr_sar_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x610300;
+}
+
+static void
+Opcode_rsr_litbase_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x30500;
+}
+
+static void
+Opcode_wsr_litbase_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x130500;
+}
+
+static void
+Opcode_xsr_litbase_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x610500;
+}
+
+static void
+Opcode_rsr_176_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3b000;
+}
+
+static void
+Opcode_rsr_208_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3d000;
+}
+
+static void
+Opcode_rsr_ps_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3e600;
+}
+
+static void
+Opcode_wsr_ps_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13e600;
+}
+
+static void
+Opcode_xsr_ps_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61e600;
+}
+
+static void
+Opcode_rsr_epc1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3b100;
+}
+
+static void
+Opcode_wsr_epc1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13b100;
+}
+
+static void
+Opcode_xsr_epc1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61b100;
+}
+
+static void
+Opcode_rsr_excsave1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3d100;
+}
+
+static void
+Opcode_wsr_excsave1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13d100;
+}
+
+static void
+Opcode_xsr_excsave1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61d100;
+}
+
+static void
+Opcode_rsr_epc2_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3b200;
+}
+
+static void
+Opcode_wsr_epc2_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13b200;
+}
+
+static void
+Opcode_xsr_epc2_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61b200;
+}
+
+static void
+Opcode_rsr_excsave2_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3d200;
+}
+
+static void
+Opcode_wsr_excsave2_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13d200;
+}
+
+static void
+Opcode_xsr_excsave2_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61d200;
+}
+
+static void
+Opcode_rsr_epc3_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3b300;
+}
+
+static void
+Opcode_wsr_epc3_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13b300;
+}
+
+static void
+Opcode_xsr_epc3_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61b300;
+}
+
+static void
+Opcode_rsr_excsave3_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3d300;
+}
+
+static void
+Opcode_wsr_excsave3_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13d300;
+}
+
+static void
+Opcode_xsr_excsave3_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61d300;
+}
+
+static void
+Opcode_rsr_epc4_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3b400;
+}
+
+static void
+Opcode_wsr_epc4_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13b400;
+}
+
+static void
+Opcode_xsr_epc4_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61b400;
+}
+
+static void
+Opcode_rsr_excsave4_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3d400;
+}
+
+static void
+Opcode_wsr_excsave4_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13d400;
+}
+
+static void
+Opcode_xsr_excsave4_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61d400;
+}
+
+static void
+Opcode_rsr_epc5_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3b500;
+}
+
+static void
+Opcode_wsr_epc5_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13b500;
+}
+
+static void
+Opcode_xsr_epc5_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61b500;
+}
+
+static void
+Opcode_rsr_excsave5_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3d500;
+}
+
+static void
+Opcode_wsr_excsave5_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13d500;
+}
+
+static void
+Opcode_xsr_excsave5_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61d500;
+}
+
+static void
+Opcode_rsr_epc6_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3b600;
+}
+
+static void
+Opcode_wsr_epc6_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13b600;
+}
+
+static void
+Opcode_xsr_epc6_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61b600;
+}
+
+static void
+Opcode_rsr_excsave6_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3d600;
+}
+
+static void
+Opcode_wsr_excsave6_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13d600;
+}
+
+static void
+Opcode_xsr_excsave6_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61d600;
+}
+
+static void
+Opcode_rsr_epc7_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3b700;
+}
+
+static void
+Opcode_wsr_epc7_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13b700;
+}
+
+static void
+Opcode_xsr_epc7_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61b700;
+}
+
+static void
+Opcode_rsr_excsave7_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3d700;
+}
+
+static void
+Opcode_wsr_excsave7_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13d700;
+}
+
+static void
+Opcode_xsr_excsave7_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61d700;
+}
+
+static void
+Opcode_rsr_eps2_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3c200;
+}
+
+static void
+Opcode_wsr_eps2_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13c200;
+}
+
+static void
+Opcode_xsr_eps2_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61c200;
+}
+
+static void
+Opcode_rsr_eps3_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3c300;
+}
+
+static void
+Opcode_wsr_eps3_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13c300;
+}
+
+static void
+Opcode_xsr_eps3_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61c300;
+}
+
+static void
+Opcode_rsr_eps4_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3c400;
+}
+
+static void
+Opcode_wsr_eps4_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13c400;
+}
+
+static void
+Opcode_xsr_eps4_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61c400;
+}
+
+static void
+Opcode_rsr_eps5_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3c500;
+}
+
+static void
+Opcode_wsr_eps5_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13c500;
+}
+
+static void
+Opcode_xsr_eps5_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61c500;
+}
+
+static void
+Opcode_rsr_eps6_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3c600;
+}
+
+static void
+Opcode_wsr_eps6_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13c600;
+}
+
+static void
+Opcode_xsr_eps6_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61c600;
+}
+
+static void
+Opcode_rsr_eps7_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3c700;
+}
+
+static void
+Opcode_wsr_eps7_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13c700;
+}
+
+static void
+Opcode_xsr_eps7_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61c700;
+}
+
+static void
+Opcode_rsr_excvaddr_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3ee00;
+}
+
+static void
+Opcode_wsr_excvaddr_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13ee00;
+}
+
+static void
+Opcode_xsr_excvaddr_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61ee00;
+}
+
+static void
+Opcode_rsr_depc_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3c000;
+}
+
+static void
+Opcode_wsr_depc_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13c000;
+}
+
+static void
+Opcode_xsr_depc_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61c000;
+}
+
+static void
+Opcode_rsr_exccause_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3e800;
+}
+
+static void
+Opcode_wsr_exccause_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13e800;
+}
+
+static void
+Opcode_xsr_exccause_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61e800;
+}
+
+static void
+Opcode_rsr_misc0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3f400;
+}
+
+static void
+Opcode_wsr_misc0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13f400;
+}
+
+static void
+Opcode_xsr_misc0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61f400;
+}
+
+static void
+Opcode_rsr_misc1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3f500;
+}
+
+static void
+Opcode_wsr_misc1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13f500;
+}
+
+static void
+Opcode_xsr_misc1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61f500;
+}
+
+static void
+Opcode_rsr_misc2_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3f600;
+}
+
+static void
+Opcode_wsr_misc2_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13f600;
+}
+
+static void
+Opcode_xsr_misc2_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61f600;
+}
+
+static void
+Opcode_rsr_misc3_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3f700;
+}
+
+static void
+Opcode_wsr_misc3_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13f700;
+}
+
+static void
+Opcode_xsr_misc3_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61f700;
+}
+
+static void
+Opcode_rsr_prid_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3eb00;
+}
+
+static void
+Opcode_rsr_vecbase_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3e700;
+}
+
+static void
+Opcode_wsr_vecbase_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13e700;
+}
+
+static void
+Opcode_xsr_vecbase_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61e700;
+}
+
+static void
+Opcode_mul_aa_ll_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x740004;
+}
+
+static void
+Opcode_mul_aa_hl_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x750004;
+}
+
+static void
+Opcode_mul_aa_lh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x760004;
+}
+
+static void
+Opcode_mul_aa_hh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x770004;
+}
+
+static void
+Opcode_umul_aa_ll_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x700004;
+}
+
+static void
+Opcode_umul_aa_hl_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x710004;
+}
+
+static void
+Opcode_umul_aa_lh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x720004;
+}
+
+static void
+Opcode_umul_aa_hh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x730004;
+}
+
+static void
+Opcode_mul_ad_ll_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x340004;
+}
+
+static void
+Opcode_mul_ad_hl_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x350004;
+}
+
+static void
+Opcode_mul_ad_lh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x360004;
+}
+
+static void
+Opcode_mul_ad_hh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x370004;
+}
+
+static void
+Opcode_mul_da_ll_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x640004;
+}
+
+static void
+Opcode_mul_da_hl_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x650004;
+}
+
+static void
+Opcode_mul_da_lh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x660004;
+}
+
+static void
+Opcode_mul_da_hh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x670004;
+}
+
+static void
+Opcode_mul_dd_ll_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x240004;
+}
+
+static void
+Opcode_mul_dd_hl_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x250004;
+}
+
+static void
+Opcode_mul_dd_lh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x260004;
+}
+
+static void
+Opcode_mul_dd_hh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x270004;
+}
+
+static void
+Opcode_mula_aa_ll_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x780004;
+}
+
+static void
+Opcode_mula_aa_hl_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x790004;
+}
+
+static void
+Opcode_mula_aa_lh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x7a0004;
+}
+
+static void
+Opcode_mula_aa_hh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x7b0004;
+}
+
+static void
+Opcode_muls_aa_ll_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x7c0004;
+}
+
+static void
+Opcode_muls_aa_hl_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x7d0004;
+}
+
+static void
+Opcode_muls_aa_lh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x7e0004;
+}
+
+static void
+Opcode_muls_aa_hh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x7f0004;
+}
+
+static void
+Opcode_mula_ad_ll_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x380004;
+}
+
+static void
+Opcode_mula_ad_hl_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x390004;
+}
+
+static void
+Opcode_mula_ad_lh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3a0004;
+}
+
+static void
+Opcode_mula_ad_hh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3b0004;
+}
+
+static void
+Opcode_muls_ad_ll_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3c0004;
+}
+
+static void
+Opcode_muls_ad_hl_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3d0004;
+}
+
+static void
+Opcode_muls_ad_lh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3e0004;
+}
+
+static void
+Opcode_muls_ad_hh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3f0004;
+}
+
+static void
+Opcode_mula_da_ll_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x680004;
+}
+
+static void
+Opcode_mula_da_hl_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x690004;
+}
+
+static void
+Opcode_mula_da_lh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x6a0004;
+}
+
+static void
+Opcode_mula_da_hh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x6b0004;
+}
+
+static void
+Opcode_muls_da_ll_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x6c0004;
+}
+
+static void
+Opcode_muls_da_hl_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x6d0004;
+}
+
+static void
+Opcode_muls_da_lh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x6e0004;
+}
+
+static void
+Opcode_muls_da_hh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x6f0004;
+}
+
+static void
+Opcode_mula_dd_ll_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x280004;
+}
+
+static void
+Opcode_mula_dd_hl_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x290004;
+}
+
+static void
+Opcode_mula_dd_lh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x2a0004;
+}
+
+static void
+Opcode_mula_dd_hh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x2b0004;
+}
+
+static void
+Opcode_muls_dd_ll_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x2c0004;
+}
+
+static void
+Opcode_muls_dd_hl_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x2d0004;
+}
+
+static void
+Opcode_muls_dd_lh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x2e0004;
+}
+
+static void
+Opcode_muls_dd_hh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x2f0004;
+}
+
+static void
+Opcode_mula_da_ll_lddec_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x580004;
+}
+
+static void
+Opcode_mula_da_ll_ldinc_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x480004;
+}
+
+static void
+Opcode_mula_da_hl_lddec_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x590004;
+}
+
+static void
+Opcode_mula_da_hl_ldinc_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x490004;
+}
+
+static void
+Opcode_mula_da_lh_lddec_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x5a0004;
+}
+
+static void
+Opcode_mula_da_lh_ldinc_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x4a0004;
+}
+
+static void
+Opcode_mula_da_hh_lddec_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x5b0004;
+}
+
+static void
+Opcode_mula_da_hh_ldinc_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x4b0004;
+}
+
+static void
+Opcode_mula_dd_ll_lddec_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x180004;
+}
+
+static void
+Opcode_mula_dd_ll_ldinc_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x80004;
+}
+
+static void
+Opcode_mula_dd_hl_lddec_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x190004;
+}
+
+static void
+Opcode_mula_dd_hl_ldinc_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x90004;
+}
+
+static void
+Opcode_mula_dd_lh_lddec_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x1a0004;
+}
+
+static void
+Opcode_mula_dd_lh_ldinc_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa0004;
+}
+
+static void
+Opcode_mula_dd_hh_lddec_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x1b0004;
+}
+
+static void
+Opcode_mula_dd_hh_ldinc_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xb0004;
+}
+
+static void
+Opcode_lddec_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x900004;
+}
+
+static void
+Opcode_ldinc_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x800004;
+}
+
+static void
+Opcode_mul16u_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xc10000;
+}
+
+static void
+Opcode_mul16u_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x9b000;
+}
+
+static void
+Opcode_mul16u_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xc1000;
+}
+
+static void
+Opcode_mul16s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xd10000;
+}
+
+static void
+Opcode_mul16s_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x9c000;
+}
+
+static void
+Opcode_mul16s_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xd1000;
+}
+
+static void
+Opcode_rsr_m0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x32000;
+}
+
+static void
+Opcode_wsr_m0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x132000;
+}
+
+static void
+Opcode_xsr_m0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x612000;
+}
+
+static void
+Opcode_rsr_m1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x32100;
+}
+
+static void
+Opcode_wsr_m1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x132100;
+}
+
+static void
+Opcode_xsr_m1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x612100;
+}
+
+static void
+Opcode_rsr_m2_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x32200;
+}
+
+static void
+Opcode_wsr_m2_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x132200;
+}
+
+static void
+Opcode_xsr_m2_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x612200;
+}
+
+static void
+Opcode_rsr_m3_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x32300;
+}
+
+static void
+Opcode_wsr_m3_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x132300;
+}
+
+static void
+Opcode_xsr_m3_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x612300;
+}
+
+static void
+Opcode_rsr_acclo_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x31000;
+}
+
+static void
+Opcode_wsr_acclo_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x131000;
+}
+
+static void
+Opcode_xsr_acclo_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x611000;
+}
+
+static void
+Opcode_rsr_acchi_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x31100;
+}
+
+static void
+Opcode_wsr_acchi_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x131100;
+}
+
+static void
+Opcode_xsr_acchi_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x611100;
+}
+
+static void
+Opcode_rfi_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3010;
+}
+
+static void
+Opcode_waiti_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x7000;
+}
+
+static void
+Opcode_rsr_interrupt_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3e200;
+}
+
+static void
+Opcode_wsr_intset_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13e200;
+}
+
+static void
+Opcode_wsr_intclear_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13e300;
+}
+
+static void
+Opcode_rsr_intenable_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3e400;
+}
+
+static void
+Opcode_wsr_intenable_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13e400;
+}
+
+static void
+Opcode_xsr_intenable_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61e400;
+}
+
+static void
+Opcode_break_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x4000;
+}
+
+static void
+Opcode_break_n_Slot_inst16b_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf02d;
+}
+
+static void
+Opcode_rsr_dbreaka0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x39000;
+}
+
+static void
+Opcode_wsr_dbreaka0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x139000;
+}
+
+static void
+Opcode_xsr_dbreaka0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x619000;
+}
+
+static void
+Opcode_rsr_dbreakc0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3a000;
+}
+
+static void
+Opcode_wsr_dbreakc0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13a000;
+}
+
+static void
+Opcode_xsr_dbreakc0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61a000;
+}
+
+static void
+Opcode_rsr_dbreaka1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x39100;
+}
+
+static void
+Opcode_wsr_dbreaka1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x139100;
+}
+
+static void
+Opcode_xsr_dbreaka1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x619100;
+}
+
+static void
+Opcode_rsr_dbreakc1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3a100;
+}
+
+static void
+Opcode_wsr_dbreakc1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13a100;
+}
+
+static void
+Opcode_xsr_dbreakc1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61a100;
+}
+
+static void
+Opcode_rsr_ibreaka0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x38000;
+}
+
+static void
+Opcode_wsr_ibreaka0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x138000;
+}
+
+static void
+Opcode_xsr_ibreaka0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x618000;
+}
+
+static void
+Opcode_rsr_ibreaka1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x38100;
+}
+
+static void
+Opcode_wsr_ibreaka1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x138100;
+}
+
+static void
+Opcode_xsr_ibreaka1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x618100;
+}
+
+static void
+Opcode_rsr_ibreakenable_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x36000;
+}
+
+static void
+Opcode_wsr_ibreakenable_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x136000;
+}
+
+static void
+Opcode_xsr_ibreakenable_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x616000;
+}
+
+static void
+Opcode_rsr_debugcause_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3e900;
+}
+
+static void
+Opcode_wsr_debugcause_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13e900;
+}
+
+static void
+Opcode_xsr_debugcause_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61e900;
+}
+
+static void
+Opcode_rsr_icount_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3ec00;
+}
+
+static void
+Opcode_wsr_icount_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13ec00;
+}
+
+static void
+Opcode_xsr_icount_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61ec00;
+}
+
+static void
+Opcode_rsr_icountlevel_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3ed00;
+}
+
+static void
+Opcode_wsr_icountlevel_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13ed00;
+}
+
+static void
+Opcode_xsr_icountlevel_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61ed00;
+}
+
+static void
+Opcode_rsr_ddr_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x36800;
+}
+
+static void
+Opcode_wsr_ddr_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x136800;
+}
+
+static void
+Opcode_xsr_ddr_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x616800;
+}
+
+static void
+Opcode_rfdo_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf1e000;
+}
+
+static void
+Opcode_rfdd_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf1e010;
+}
+
+static void
+Opcode_wsr_mmid_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x135900;
+}
+
+static void
+Opcode_andb_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x20000;
+}
+
+static void
+Opcode_andbc_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x120000;
+}
+
+static void
+Opcode_orb_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x220000;
+}
+
+static void
+Opcode_orbc_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x320000;
+}
+
+static void
+Opcode_xorb_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x420000;
+}
+
+static void
+Opcode_any4_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x8000;
+}
+
+static void
+Opcode_all4_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x9000;
+}
+
+static void
+Opcode_any8_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa000;
+}
+
+static void
+Opcode_all8_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xb000;
+}
+
+static void
+Opcode_bf_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x76;
+}
+
+static void
+Opcode_bt_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x1076;
+}
+
+static void
+Opcode_movf_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xc30000;
+}
+
+static void
+Opcode_movt_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xd30000;
+}
+
+static void
+Opcode_rsr_br_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x30400;
+}
+
+static void
+Opcode_wsr_br_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x130400;
+}
+
+static void
+Opcode_xsr_br_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x610400;
+}
+
+static void
+Opcode_rsr_ccount_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3ea00;
+}
+
+static void
+Opcode_wsr_ccount_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13ea00;
+}
+
+static void
+Opcode_xsr_ccount_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61ea00;
+}
+
+static void
+Opcode_rsr_ccompare0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3f000;
+}
+
+static void
+Opcode_wsr_ccompare0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13f000;
+}
+
+static void
+Opcode_xsr_ccompare0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61f000;
+}
+
+static void
+Opcode_rsr_ccompare1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3f100;
+}
+
+static void
+Opcode_wsr_ccompare1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13f100;
+}
+
+static void
+Opcode_xsr_ccompare1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61f100;
+}
+
+static void
+Opcode_rsr_ccompare2_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3f200;
+}
+
+static void
+Opcode_wsr_ccompare2_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13f200;
+}
+
+static void
+Opcode_xsr_ccompare2_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61f200;
+}
+
+static void
+Opcode_ipf_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x70c2;
+}
+
+static void
+Opcode_ihi_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x70e2;
+}
+
+static void
+Opcode_ipfl_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x70d2;
+}
+
+static void
+Opcode_ihu_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x270d2;
+}
+
+static void
+Opcode_iiu_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x370d2;
+}
+
+static void
+Opcode_iii_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x70f2;
+}
+
+static void
+Opcode_lict_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf10000;
+}
+
+static void
+Opcode_licw_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf12000;
+}
+
+static void
+Opcode_sict_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf11000;
+}
+
+static void
+Opcode_sicw_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf13000;
+}
+
+static void
+Opcode_dhwb_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x7042;
+}
+
+static void
+Opcode_dhwbi_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x7052;
+}
+
+static void
+Opcode_diwb_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x47082;
+}
+
+static void
+Opcode_diwbi_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x57082;
+}
+
+static void
+Opcode_dhi_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x7062;
+}
+
+static void
+Opcode_dii_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x7072;
+}
+
+static void
+Opcode_dpfr_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x7002;
+}
+
+static void
+Opcode_dpfw_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x7012;
+}
+
+static void
+Opcode_dpfro_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x7022;
+}
+
+static void
+Opcode_dpfwo_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x7032;
+}
+
+static void
+Opcode_dpfl_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x7082;
+}
+
+static void
+Opcode_dhu_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x27082;
+}
+
+static void
+Opcode_diu_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x37082;
+}
+
+static void
+Opcode_sdct_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf19000;
+}
+
+static void
+Opcode_ldct_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf18000;
+}
+
+static void
+Opcode_wsr_ptevaddr_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x135300;
+}
+
+static void
+Opcode_rsr_ptevaddr_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x35300;
+}
+
+static void
+Opcode_xsr_ptevaddr_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x615300;
+}
+
+static void
+Opcode_rsr_rasid_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x35a00;
+}
+
+static void
+Opcode_wsr_rasid_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x135a00;
+}
+
+static void
+Opcode_xsr_rasid_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x615a00;
+}
+
+static void
+Opcode_rsr_itlbcfg_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x35b00;
+}
+
+static void
+Opcode_wsr_itlbcfg_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x135b00;
+}
+
+static void
+Opcode_xsr_itlbcfg_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x615b00;
+}
+
+static void
+Opcode_rsr_dtlbcfg_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x35c00;
+}
+
+static void
+Opcode_wsr_dtlbcfg_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x135c00;
+}
+
+static void
+Opcode_xsr_dtlbcfg_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x615c00;
+}
+
+static void
+Opcode_idtlb_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x50c000;
+}
+
+static void
+Opcode_pdtlb_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x50d000;
+}
+
+static void
+Opcode_rdtlb0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x50b000;
+}
+
+static void
+Opcode_rdtlb1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x50f000;
+}
+
+static void
+Opcode_wdtlb_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x50e000;
+}
+
+static void
+Opcode_iitlb_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x504000;
+}
+
+static void
+Opcode_pitlb_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x505000;
+}
+
+static void
+Opcode_ritlb0_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x503000;
+}
+
+static void
+Opcode_ritlb1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x507000;
+}
+
+static void
+Opcode_witlb_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x506000;
+}
+
+static void
+Opcode_ldpte_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf1f000;
+}
+
+static void
+Opcode_hwwitlba_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x501000;
+}
+
+static void
+Opcode_hwwdtlba_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x509000;
+}
+
+static void
+Opcode_rsr_cpenable_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3e000;
+}
+
+static void
+Opcode_wsr_cpenable_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x13e000;
+}
+
+static void
+Opcode_xsr_cpenable_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x61e000;
+}
+
+static void
+Opcode_clamps_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x330000;
+}
+
+static void
+Opcode_clamps_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x33000;
+}
+
+static void
+Opcode_min_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x430000;
+}
+
+static void
+Opcode_min_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x43000;
+}
+
+static void
+Opcode_max_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x530000;
+}
+
+static void
+Opcode_max_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x53000;
+}
+
+static void
+Opcode_minu_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x630000;
+}
+
+static void
+Opcode_minu_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x63000;
+}
+
+static void
+Opcode_maxu_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x730000;
+}
+
+static void
+Opcode_maxu_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x73000;
+}
+
+static void
+Opcode_nsa_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x40e000;
+}
+
+static void
+Opcode_nsa_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x40e00;
+}
+
+static void
+Opcode_nsau_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x40f000;
+}
+
+static void
+Opcode_nsau_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x40f00;
+}
+
+static void
+Opcode_sext_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x230000;
+}
+
+static void
+Opcode_sext_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x9f000;
+}
+
+static void
+Opcode_sext_Slot_xt_flix64_slot2_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x8000;
+}
+
+static void
+Opcode_sext_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x23000;
+}
+
+static void
+Opcode_l32ai_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xb002;
+}
+
+static void
+Opcode_s32ri_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf002;
+}
+
+static void
+Opcode_s32c1i_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xe002;
+}
+
+static void
+Opcode_rsr_scompare1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x30c00;
+}
+
+static void
+Opcode_wsr_scompare1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x130c00;
+}
+
+static void
+Opcode_xsr_scompare1_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x610c00;
+}
+
+static void
+Opcode_quou_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xc20000;
+}
+
+static void
+Opcode_quos_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xd20000;
+}
+
+static void
+Opcode_remu_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xe20000;
+}
+
+static void
+Opcode_rems_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf20000;
+}
+
+static void
+Opcode_mull_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x820000;
+}
+
+static void
+Opcode_mull_Slot_xt_flix64_slot1_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x9d000;
+}
+
+static void
+Opcode_mull_Slot_xt_flix64_slot0_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x82000;
+}
+
+static void
+Opcode_muluh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa20000;
+}
+
+static void
+Opcode_mulsh_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xb20000;
+}
+
+static void
+Opcode_rur_fcr_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xe30e80;
+}
+
+static void
+Opcode_wur_fcr_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf3e800;
+}
+
+static void
+Opcode_rur_fsr_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xe30e90;
+}
+
+static void
+Opcode_wur_fsr_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xf3e900;
+}
+
+static void
+Opcode_add_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa0000;
+}
+
+static void
+Opcode_sub_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x1a0000;
+}
+
+static void
+Opcode_mul_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x2a0000;
+}
+
+static void
+Opcode_madd_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x4a0000;
+}
+
+static void
+Opcode_msub_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x5a0000;
+}
+
+static void
+Opcode_movf_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xcb0000;
+}
+
+static void
+Opcode_movt_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xdb0000;
+}
+
+static void
+Opcode_moveqz_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x8b0000;
+}
+
+static void
+Opcode_movnez_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x9b0000;
+}
+
+static void
+Opcode_movltz_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xab0000;
+}
+
+static void
+Opcode_movgez_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xbb0000;
+}
+
+static void
+Opcode_abs_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xfa0010;
+}
+
+static void
+Opcode_mov_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xfa0000;
+}
+
+static void
+Opcode_neg_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xfa0060;
+}
+
+static void
+Opcode_un_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x1b0000;
+}
+
+static void
+Opcode_oeq_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x2b0000;
+}
+
+static void
+Opcode_ueq_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3b0000;
+}
+
+static void
+Opcode_olt_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x4b0000;
+}
+
+static void
+Opcode_ult_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x5b0000;
+}
+
+static void
+Opcode_ole_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x6b0000;
+}
+
+static void
+Opcode_ule_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x7b0000;
+}
+
+static void
+Opcode_float_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xca0000;
+}
+
+static void
+Opcode_ufloat_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xda0000;
+}
+
+static void
+Opcode_round_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x8a0000;
+}
+
+static void
+Opcode_ceil_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xba0000;
+}
+
+static void
+Opcode_floor_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xaa0000;
+}
+
+static void
+Opcode_trunc_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x9a0000;
+}
+
+static void
+Opcode_utrunc_s_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xea0000;
+}
+
+static void
+Opcode_rfr_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xfa0040;
+}
+
+static void
+Opcode_wfr_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xfa0050;
+}
+
+static void
+Opcode_lsi_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x3;
+}
+
+static void
+Opcode_lsiu_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x8003;
+}
+
+static void
+Opcode_lsx_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x80000;
+}
+
+static void
+Opcode_lsxu_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x180000;
+}
+
+static void
+Opcode_ssi_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x4003;
+}
+
+static void
+Opcode_ssiu_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xc003;
+}
+
+static void
+Opcode_ssx_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x480000;
+}
+
+static void
+Opcode_ssxu_Slot_inst_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x580000;
+}
+
+static void
+Opcode_beqz_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa8000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_bnez_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xc0000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_bgez_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xb0000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_bltz_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xb8000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_beqi_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x40000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_bnei_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x98000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_bgei_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x50000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_blti_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x70000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_bgeui_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x60000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_bltui_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x80000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_bbci_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x8000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_bbsi_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x10000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_beq_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x38000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_bne_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x90000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_bge_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x48000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_blt_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x68000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_bgeu_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x58000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_bltu_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x78000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_bany_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x20000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_bnone_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0xa0000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_ball_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x18000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_bnall_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x88000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_bbc_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x28000000;
+  slotbuf[1] = 0;
+}
+
+static void
+Opcode_bbs_w18_Slot_xt_flix64_slot3_encode (xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = 0x30000000;
+  slotbuf[1] = 0;
+}
+
+xtensa_opcode_encode_fn Opcode_excw_encode_fns[] = {
+  Opcode_excw_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rfe_encode_fns[] = {
+  Opcode_rfe_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rfde_encode_fns[] = {
+  Opcode_rfde_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_syscall_encode_fns[] = {
+  Opcode_syscall_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_simcall_encode_fns[] = {
+  Opcode_simcall_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_call12_encode_fns[] = {
+  Opcode_call12_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_call8_encode_fns[] = {
+  Opcode_call8_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_call4_encode_fns[] = {
+  Opcode_call4_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_callx12_encode_fns[] = {
+  Opcode_callx12_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_callx8_encode_fns[] = {
+  Opcode_callx8_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_callx4_encode_fns[] = {
+  Opcode_callx4_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_entry_encode_fns[] = {
+  Opcode_entry_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_movsp_encode_fns[] = {
+  Opcode_movsp_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rotw_encode_fns[] = {
+  Opcode_rotw_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_retw_encode_fns[] = {
+  Opcode_retw_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_retw_n_encode_fns[] = {
+  0, 0, Opcode_retw_n_Slot_inst16b_encode, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rfwo_encode_fns[] = {
+  Opcode_rfwo_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rfwu_encode_fns[] = {
+  Opcode_rfwu_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_l32e_encode_fns[] = {
+  Opcode_l32e_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_s32e_encode_fns[] = {
+  Opcode_s32e_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_windowbase_encode_fns[] = {
+  Opcode_rsr_windowbase_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_windowbase_encode_fns[] = {
+  Opcode_wsr_windowbase_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_windowbase_encode_fns[] = {
+  Opcode_xsr_windowbase_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_windowstart_encode_fns[] = {
+  Opcode_rsr_windowstart_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_windowstart_encode_fns[] = {
+  Opcode_wsr_windowstart_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_windowstart_encode_fns[] = {
+  Opcode_xsr_windowstart_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_add_n_encode_fns[] = {
+  0, Opcode_add_n_Slot_inst16a_encode, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_addi_n_encode_fns[] = {
+  0, Opcode_addi_n_Slot_inst16a_encode, 0, 0, 0, 0, Opcode_addi_n_Slot_xt_flix64_slot2_encode, 0
+};
+
+xtensa_opcode_encode_fn Opcode_beqz_n_encode_fns[] = {
+  0, 0, Opcode_beqz_n_Slot_inst16b_encode, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bnez_n_encode_fns[] = {
+  0, 0, Opcode_bnez_n_Slot_inst16b_encode, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ill_n_encode_fns[] = {
+  0, 0, Opcode_ill_n_Slot_inst16b_encode, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_l32i_n_encode_fns[] = {
+  0, Opcode_l32i_n_Slot_inst16a_encode, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mov_n_encode_fns[] = {
+  0, 0, Opcode_mov_n_Slot_inst16b_encode, Opcode_mov_n_Slot_xt_flix64_slot0_encode, Opcode_mov_n_Slot_xt_flix64_slot0_encode, Opcode_mov_n_Slot_xt_flix64_slot1_encode, Opcode_mov_n_Slot_xt_flix64_slot2_encode, 0
+};
+
+xtensa_opcode_encode_fn Opcode_movi_n_encode_fns[] = {
+  0, 0, Opcode_movi_n_Slot_inst16b_encode, 0, 0, 0, Opcode_movi_n_Slot_xt_flix64_slot2_encode, 0
+};
+
+xtensa_opcode_encode_fn Opcode_nop_n_encode_fns[] = {
+  0, 0, Opcode_nop_n_Slot_inst16b_encode, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ret_n_encode_fns[] = {
+  0, 0, Opcode_ret_n_Slot_inst16b_encode, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_s32i_n_encode_fns[] = {
+  0, Opcode_s32i_n_Slot_inst16a_encode, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rur_threadptr_encode_fns[] = {
+  Opcode_rur_threadptr_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wur_threadptr_encode_fns[] = {
+  Opcode_wur_threadptr_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_addi_encode_fns[] = {
+  Opcode_addi_Slot_inst_encode, 0, 0, Opcode_addi_Slot_xt_flix64_slot0_encode, Opcode_addi_Slot_xt_flix64_slot0_encode, Opcode_addi_Slot_xt_flix64_slot1_encode, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_addmi_encode_fns[] = {
+  Opcode_addmi_Slot_inst_encode, 0, 0, Opcode_addmi_Slot_xt_flix64_slot0_encode, Opcode_addmi_Slot_xt_flix64_slot0_encode, Opcode_addmi_Slot_xt_flix64_slot1_encode, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_add_encode_fns[] = {
+  Opcode_add_Slot_inst_encode, 0, 0, Opcode_add_Slot_xt_flix64_slot0_encode, Opcode_add_Slot_xt_flix64_slot0_encode, Opcode_add_Slot_xt_flix64_slot1_encode, Opcode_add_Slot_xt_flix64_slot2_encode, 0
+};
+
+xtensa_opcode_encode_fn Opcode_sub_encode_fns[] = {
+  Opcode_sub_Slot_inst_encode, 0, 0, Opcode_sub_Slot_xt_flix64_slot0_encode, Opcode_sub_Slot_xt_flix64_slot0_encode, Opcode_sub_Slot_xt_flix64_slot1_encode, Opcode_sub_Slot_xt_flix64_slot2_encode, 0
+};
+
+xtensa_opcode_encode_fn Opcode_addx2_encode_fns[] = {
+  Opcode_addx2_Slot_inst_encode, 0, 0, Opcode_addx2_Slot_xt_flix64_slot0_encode, Opcode_addx2_Slot_xt_flix64_slot0_encode, Opcode_addx2_Slot_xt_flix64_slot1_encode, Opcode_addx2_Slot_xt_flix64_slot2_encode, 0
+};
+
+xtensa_opcode_encode_fn Opcode_addx4_encode_fns[] = {
+  Opcode_addx4_Slot_inst_encode, 0, 0, Opcode_addx4_Slot_xt_flix64_slot0_encode, Opcode_addx4_Slot_xt_flix64_slot0_encode, Opcode_addx4_Slot_xt_flix64_slot1_encode, Opcode_addx4_Slot_xt_flix64_slot2_encode, 0
+};
+
+xtensa_opcode_encode_fn Opcode_addx8_encode_fns[] = {
+  Opcode_addx8_Slot_inst_encode, 0, 0, Opcode_addx8_Slot_xt_flix64_slot0_encode, Opcode_addx8_Slot_xt_flix64_slot0_encode, Opcode_addx8_Slot_xt_flix64_slot1_encode, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_subx2_encode_fns[] = {
+  Opcode_subx2_Slot_inst_encode, 0, 0, Opcode_subx2_Slot_xt_flix64_slot0_encode, Opcode_subx2_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_subx4_encode_fns[] = {
+  Opcode_subx4_Slot_inst_encode, 0, 0, Opcode_subx4_Slot_xt_flix64_slot0_encode, Opcode_subx4_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_subx8_encode_fns[] = {
+  Opcode_subx8_Slot_inst_encode, 0, 0, Opcode_subx8_Slot_xt_flix64_slot0_encode, Opcode_subx8_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_and_encode_fns[] = {
+  Opcode_and_Slot_inst_encode, 0, 0, Opcode_and_Slot_xt_flix64_slot0_encode, Opcode_and_Slot_xt_flix64_slot0_encode, Opcode_and_Slot_xt_flix64_slot1_encode, Opcode_and_Slot_xt_flix64_slot2_encode, 0
+};
+
+xtensa_opcode_encode_fn Opcode_or_encode_fns[] = {
+  Opcode_or_Slot_inst_encode, 0, 0, Opcode_or_Slot_xt_flix64_slot0_encode, Opcode_or_Slot_xt_flix64_slot0_encode, Opcode_or_Slot_xt_flix64_slot1_encode, Opcode_or_Slot_xt_flix64_slot2_encode, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xor_encode_fns[] = {
+  Opcode_xor_Slot_inst_encode, 0, 0, Opcode_xor_Slot_xt_flix64_slot0_encode, Opcode_xor_Slot_xt_flix64_slot0_encode, Opcode_xor_Slot_xt_flix64_slot1_encode, Opcode_xor_Slot_xt_flix64_slot2_encode, 0
+};
+
+xtensa_opcode_encode_fn Opcode_beqi_encode_fns[] = {
+  Opcode_beqi_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bnei_encode_fns[] = {
+  Opcode_bnei_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bgei_encode_fns[] = {
+  Opcode_bgei_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_blti_encode_fns[] = {
+  Opcode_blti_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bbci_encode_fns[] = {
+  Opcode_bbci_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bbsi_encode_fns[] = {
+  Opcode_bbsi_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bgeui_encode_fns[] = {
+  Opcode_bgeui_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bltui_encode_fns[] = {
+  Opcode_bltui_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_beq_encode_fns[] = {
+  Opcode_beq_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bne_encode_fns[] = {
+  Opcode_bne_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bge_encode_fns[] = {
+  Opcode_bge_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_blt_encode_fns[] = {
+  Opcode_blt_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bgeu_encode_fns[] = {
+  Opcode_bgeu_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bltu_encode_fns[] = {
+  Opcode_bltu_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bany_encode_fns[] = {
+  Opcode_bany_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bnone_encode_fns[] = {
+  Opcode_bnone_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ball_encode_fns[] = {
+  Opcode_ball_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bnall_encode_fns[] = {
+  Opcode_bnall_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bbc_encode_fns[] = {
+  Opcode_bbc_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bbs_encode_fns[] = {
+  Opcode_bbs_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_beqz_encode_fns[] = {
+  Opcode_beqz_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bnez_encode_fns[] = {
+  Opcode_bnez_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bgez_encode_fns[] = {
+  Opcode_bgez_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bltz_encode_fns[] = {
+  Opcode_bltz_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_call0_encode_fns[] = {
+  Opcode_call0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_callx0_encode_fns[] = {
+  Opcode_callx0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_extui_encode_fns[] = {
+  Opcode_extui_Slot_inst_encode, 0, 0, Opcode_extui_Slot_xt_flix64_slot0_encode, Opcode_extui_Slot_xt_flix64_slot0_encode, Opcode_extui_Slot_xt_flix64_slot1_encode, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ill_encode_fns[] = {
+  Opcode_ill_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_j_encode_fns[] = {
+  Opcode_j_Slot_inst_encode, 0, 0, 0, 0, Opcode_j_Slot_xt_flix64_slot1_encode, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_jx_encode_fns[] = {
+  Opcode_jx_Slot_inst_encode, 0, 0, 0, 0, Opcode_jx_Slot_xt_flix64_slot1_encode, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_l16ui_encode_fns[] = {
+  Opcode_l16ui_Slot_inst_encode, 0, 0, Opcode_l16ui_Slot_xt_flix64_slot0_encode, Opcode_l16ui_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_l16si_encode_fns[] = {
+  Opcode_l16si_Slot_inst_encode, 0, 0, Opcode_l16si_Slot_xt_flix64_slot0_encode, Opcode_l16si_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_l32i_encode_fns[] = {
+  Opcode_l32i_Slot_inst_encode, 0, 0, Opcode_l32i_Slot_xt_flix64_slot0_encode, Opcode_l32i_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_l32r_encode_fns[] = {
+  Opcode_l32r_Slot_inst_encode, 0, 0, Opcode_l32r_Slot_xt_flix64_slot0_encode, Opcode_l32r_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_l8ui_encode_fns[] = {
+  Opcode_l8ui_Slot_inst_encode, 0, 0, Opcode_l8ui_Slot_xt_flix64_slot0_encode, Opcode_l8ui_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_loop_encode_fns[] = {
+  Opcode_loop_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_loopnez_encode_fns[] = {
+  Opcode_loopnez_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_loopgtz_encode_fns[] = {
+  Opcode_loopgtz_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_movi_encode_fns[] = {
+  Opcode_movi_Slot_inst_encode, 0, 0, Opcode_movi_Slot_xt_flix64_slot0_encode, Opcode_movi_Slot_xt_flix64_slot0_encode, Opcode_movi_Slot_xt_flix64_slot1_encode, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_moveqz_encode_fns[] = {
+  Opcode_moveqz_Slot_inst_encode, 0, 0, Opcode_moveqz_Slot_xt_flix64_slot0_encode, Opcode_moveqz_Slot_xt_flix64_slot0_encode, Opcode_moveqz_Slot_xt_flix64_slot1_encode, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_movnez_encode_fns[] = {
+  Opcode_movnez_Slot_inst_encode, 0, 0, Opcode_movnez_Slot_xt_flix64_slot0_encode, Opcode_movnez_Slot_xt_flix64_slot0_encode, Opcode_movnez_Slot_xt_flix64_slot1_encode, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_movltz_encode_fns[] = {
+  Opcode_movltz_Slot_inst_encode, 0, 0, Opcode_movltz_Slot_xt_flix64_slot0_encode, Opcode_movltz_Slot_xt_flix64_slot0_encode, Opcode_movltz_Slot_xt_flix64_slot1_encode, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_movgez_encode_fns[] = {
+  Opcode_movgez_Slot_inst_encode, 0, 0, Opcode_movgez_Slot_xt_flix64_slot0_encode, Opcode_movgez_Slot_xt_flix64_slot0_encode, Opcode_movgez_Slot_xt_flix64_slot1_encode, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_neg_encode_fns[] = {
+  Opcode_neg_Slot_inst_encode, 0, 0, Opcode_neg_Slot_xt_flix64_slot0_encode, Opcode_neg_Slot_xt_flix64_slot0_encode, Opcode_neg_Slot_xt_flix64_slot1_encode, Opcode_neg_Slot_xt_flix64_slot2_encode, 0
+};
+
+xtensa_opcode_encode_fn Opcode_abs_encode_fns[] = {
+  Opcode_abs_Slot_inst_encode, 0, 0, Opcode_abs_Slot_xt_flix64_slot0_encode, Opcode_abs_Slot_xt_flix64_slot0_encode, 0, Opcode_abs_Slot_xt_flix64_slot2_encode, 0
+};
+
+xtensa_opcode_encode_fn Opcode_nop_encode_fns[] = {
+  Opcode_nop_Slot_inst_encode, 0, 0, Opcode_nop_Slot_xt_flix64_slot0_encode, Opcode_nop_Slot_xt_flix64_slot0_encode, Opcode_nop_Slot_xt_flix64_slot1_encode, Opcode_nop_Slot_xt_flix64_slot2_encode, Opcode_nop_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_ret_encode_fns[] = {
+  Opcode_ret_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_s16i_encode_fns[] = {
+  Opcode_s16i_Slot_inst_encode, 0, 0, Opcode_s16i_Slot_xt_flix64_slot0_encode, Opcode_s16i_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_s32i_encode_fns[] = {
+  Opcode_s32i_Slot_inst_encode, 0, 0, Opcode_s32i_Slot_xt_flix64_slot0_encode, Opcode_s32i_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_s8i_encode_fns[] = {
+  Opcode_s8i_Slot_inst_encode, 0, 0, Opcode_s8i_Slot_xt_flix64_slot0_encode, Opcode_s8i_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ssr_encode_fns[] = {
+  Opcode_ssr_Slot_inst_encode, 0, 0, Opcode_ssr_Slot_xt_flix64_slot0_encode, Opcode_ssr_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ssl_encode_fns[] = {
+  Opcode_ssl_Slot_inst_encode, 0, 0, Opcode_ssl_Slot_xt_flix64_slot0_encode, Opcode_ssl_Slot_xt_flix64_slot0_encode, Opcode_ssl_Slot_xt_flix64_slot1_encode, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ssa8l_encode_fns[] = {
+  Opcode_ssa8l_Slot_inst_encode, 0, 0, Opcode_ssa8l_Slot_xt_flix64_slot0_encode, Opcode_ssa8l_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ssa8b_encode_fns[] = {
+  Opcode_ssa8b_Slot_inst_encode, 0, 0, Opcode_ssa8b_Slot_xt_flix64_slot0_encode, Opcode_ssa8b_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ssai_encode_fns[] = {
+  Opcode_ssai_Slot_inst_encode, 0, 0, Opcode_ssai_Slot_xt_flix64_slot0_encode, Opcode_ssai_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_sll_encode_fns[] = {
+  Opcode_sll_Slot_inst_encode, 0, 0, Opcode_sll_Slot_xt_flix64_slot0_encode, Opcode_sll_Slot_xt_flix64_slot0_encode, Opcode_sll_Slot_xt_flix64_slot1_encode, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_src_encode_fns[] = {
+  Opcode_src_Slot_inst_encode, 0, 0, Opcode_src_Slot_xt_flix64_slot0_encode, Opcode_src_Slot_xt_flix64_slot0_encode, Opcode_src_Slot_xt_flix64_slot1_encode, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_srl_encode_fns[] = {
+  Opcode_srl_Slot_inst_encode, 0, 0, Opcode_srl_Slot_xt_flix64_slot0_encode, Opcode_srl_Slot_xt_flix64_slot0_encode, Opcode_srl_Slot_xt_flix64_slot1_encode, Opcode_srl_Slot_xt_flix64_slot2_encode, 0
+};
+
+xtensa_opcode_encode_fn Opcode_sra_encode_fns[] = {
+  Opcode_sra_Slot_inst_encode, 0, 0, Opcode_sra_Slot_xt_flix64_slot0_encode, Opcode_sra_Slot_xt_flix64_slot0_encode, Opcode_sra_Slot_xt_flix64_slot1_encode, Opcode_sra_Slot_xt_flix64_slot2_encode, 0
+};
+
+xtensa_opcode_encode_fn Opcode_slli_encode_fns[] = {
+  Opcode_slli_Slot_inst_encode, 0, 0, Opcode_slli_Slot_xt_flix64_slot0_encode, Opcode_slli_Slot_xt_flix64_slot0_encode, Opcode_slli_Slot_xt_flix64_slot1_encode, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_srai_encode_fns[] = {
+  Opcode_srai_Slot_inst_encode, 0, 0, Opcode_srai_Slot_xt_flix64_slot0_encode, Opcode_srai_Slot_xt_flix64_slot0_encode, Opcode_srai_Slot_xt_flix64_slot1_encode, Opcode_srai_Slot_xt_flix64_slot2_encode, 0
+};
+
+xtensa_opcode_encode_fn Opcode_srli_encode_fns[] = {
+  Opcode_srli_Slot_inst_encode, 0, 0, Opcode_srli_Slot_xt_flix64_slot0_encode, Opcode_srli_Slot_xt_flix64_slot0_encode, Opcode_srli_Slot_xt_flix64_slot1_encode, Opcode_srli_Slot_xt_flix64_slot2_encode, 0
+};
+
+xtensa_opcode_encode_fn Opcode_memw_encode_fns[] = {
+  Opcode_memw_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_extw_encode_fns[] = {
+  Opcode_extw_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_isync_encode_fns[] = {
+  Opcode_isync_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsync_encode_fns[] = {
+  Opcode_rsync_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_esync_encode_fns[] = {
+  Opcode_esync_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_dsync_encode_fns[] = {
+  Opcode_dsync_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsil_encode_fns[] = {
+  Opcode_rsil_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_lend_encode_fns[] = {
+  Opcode_rsr_lend_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_lend_encode_fns[] = {
+  Opcode_wsr_lend_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_lend_encode_fns[] = {
+  Opcode_xsr_lend_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_lcount_encode_fns[] = {
+  Opcode_rsr_lcount_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_lcount_encode_fns[] = {
+  Opcode_wsr_lcount_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_lcount_encode_fns[] = {
+  Opcode_xsr_lcount_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_lbeg_encode_fns[] = {
+  Opcode_rsr_lbeg_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_lbeg_encode_fns[] = {
+  Opcode_wsr_lbeg_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_lbeg_encode_fns[] = {
+  Opcode_xsr_lbeg_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_sar_encode_fns[] = {
+  Opcode_rsr_sar_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_sar_encode_fns[] = {
+  Opcode_wsr_sar_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_sar_encode_fns[] = {
+  Opcode_xsr_sar_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_litbase_encode_fns[] = {
+  Opcode_rsr_litbase_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_litbase_encode_fns[] = {
+  Opcode_wsr_litbase_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_litbase_encode_fns[] = {
+  Opcode_xsr_litbase_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_176_encode_fns[] = {
+  Opcode_rsr_176_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_208_encode_fns[] = {
+  Opcode_rsr_208_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_ps_encode_fns[] = {
+  Opcode_rsr_ps_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_ps_encode_fns[] = {
+  Opcode_wsr_ps_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_ps_encode_fns[] = {
+  Opcode_xsr_ps_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_epc1_encode_fns[] = {
+  Opcode_rsr_epc1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_epc1_encode_fns[] = {
+  Opcode_wsr_epc1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_epc1_encode_fns[] = {
+  Opcode_xsr_epc1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_excsave1_encode_fns[] = {
+  Opcode_rsr_excsave1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_excsave1_encode_fns[] = {
+  Opcode_wsr_excsave1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_excsave1_encode_fns[] = {
+  Opcode_xsr_excsave1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_epc2_encode_fns[] = {
+  Opcode_rsr_epc2_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_epc2_encode_fns[] = {
+  Opcode_wsr_epc2_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_epc2_encode_fns[] = {
+  Opcode_xsr_epc2_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_excsave2_encode_fns[] = {
+  Opcode_rsr_excsave2_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_excsave2_encode_fns[] = {
+  Opcode_wsr_excsave2_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_excsave2_encode_fns[] = {
+  Opcode_xsr_excsave2_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_epc3_encode_fns[] = {
+  Opcode_rsr_epc3_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_epc3_encode_fns[] = {
+  Opcode_wsr_epc3_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_epc3_encode_fns[] = {
+  Opcode_xsr_epc3_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_excsave3_encode_fns[] = {
+  Opcode_rsr_excsave3_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_excsave3_encode_fns[] = {
+  Opcode_wsr_excsave3_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_excsave3_encode_fns[] = {
+  Opcode_xsr_excsave3_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_epc4_encode_fns[] = {
+  Opcode_rsr_epc4_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_epc4_encode_fns[] = {
+  Opcode_wsr_epc4_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_epc4_encode_fns[] = {
+  Opcode_xsr_epc4_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_excsave4_encode_fns[] = {
+  Opcode_rsr_excsave4_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_excsave4_encode_fns[] = {
+  Opcode_wsr_excsave4_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_excsave4_encode_fns[] = {
+  Opcode_xsr_excsave4_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_epc5_encode_fns[] = {
+  Opcode_rsr_epc5_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_epc5_encode_fns[] = {
+  Opcode_wsr_epc5_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_epc5_encode_fns[] = {
+  Opcode_xsr_epc5_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_excsave5_encode_fns[] = {
+  Opcode_rsr_excsave5_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_excsave5_encode_fns[] = {
+  Opcode_wsr_excsave5_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_excsave5_encode_fns[] = {
+  Opcode_xsr_excsave5_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_epc6_encode_fns[] = {
+  Opcode_rsr_epc6_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_epc6_encode_fns[] = {
+  Opcode_wsr_epc6_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_epc6_encode_fns[] = {
+  Opcode_xsr_epc6_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_excsave6_encode_fns[] = {
+  Opcode_rsr_excsave6_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_excsave6_encode_fns[] = {
+  Opcode_wsr_excsave6_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_excsave6_encode_fns[] = {
+  Opcode_xsr_excsave6_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_epc7_encode_fns[] = {
+  Opcode_rsr_epc7_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_epc7_encode_fns[] = {
+  Opcode_wsr_epc7_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_epc7_encode_fns[] = {
+  Opcode_xsr_epc7_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_excsave7_encode_fns[] = {
+  Opcode_rsr_excsave7_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_excsave7_encode_fns[] = {
+  Opcode_wsr_excsave7_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_excsave7_encode_fns[] = {
+  Opcode_xsr_excsave7_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_eps2_encode_fns[] = {
+  Opcode_rsr_eps2_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_eps2_encode_fns[] = {
+  Opcode_wsr_eps2_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_eps2_encode_fns[] = {
+  Opcode_xsr_eps2_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_eps3_encode_fns[] = {
+  Opcode_rsr_eps3_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_eps3_encode_fns[] = {
+  Opcode_wsr_eps3_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_eps3_encode_fns[] = {
+  Opcode_xsr_eps3_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_eps4_encode_fns[] = {
+  Opcode_rsr_eps4_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_eps4_encode_fns[] = {
+  Opcode_wsr_eps4_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_eps4_encode_fns[] = {
+  Opcode_xsr_eps4_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_eps5_encode_fns[] = {
+  Opcode_rsr_eps5_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_eps5_encode_fns[] = {
+  Opcode_wsr_eps5_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_eps5_encode_fns[] = {
+  Opcode_xsr_eps5_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_eps6_encode_fns[] = {
+  Opcode_rsr_eps6_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_eps6_encode_fns[] = {
+  Opcode_wsr_eps6_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_eps6_encode_fns[] = {
+  Opcode_xsr_eps6_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_eps7_encode_fns[] = {
+  Opcode_rsr_eps7_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_eps7_encode_fns[] = {
+  Opcode_wsr_eps7_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_eps7_encode_fns[] = {
+  Opcode_xsr_eps7_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_excvaddr_encode_fns[] = {
+  Opcode_rsr_excvaddr_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_excvaddr_encode_fns[] = {
+  Opcode_wsr_excvaddr_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_excvaddr_encode_fns[] = {
+  Opcode_xsr_excvaddr_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_depc_encode_fns[] = {
+  Opcode_rsr_depc_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_depc_encode_fns[] = {
+  Opcode_wsr_depc_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_depc_encode_fns[] = {
+  Opcode_xsr_depc_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_exccause_encode_fns[] = {
+  Opcode_rsr_exccause_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_exccause_encode_fns[] = {
+  Opcode_wsr_exccause_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_exccause_encode_fns[] = {
+  Opcode_xsr_exccause_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_misc0_encode_fns[] = {
+  Opcode_rsr_misc0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_misc0_encode_fns[] = {
+  Opcode_wsr_misc0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_misc0_encode_fns[] = {
+  Opcode_xsr_misc0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_misc1_encode_fns[] = {
+  Opcode_rsr_misc1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_misc1_encode_fns[] = {
+  Opcode_wsr_misc1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_misc1_encode_fns[] = {
+  Opcode_xsr_misc1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_misc2_encode_fns[] = {
+  Opcode_rsr_misc2_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_misc2_encode_fns[] = {
+  Opcode_wsr_misc2_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_misc2_encode_fns[] = {
+  Opcode_xsr_misc2_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_misc3_encode_fns[] = {
+  Opcode_rsr_misc3_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_misc3_encode_fns[] = {
+  Opcode_wsr_misc3_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_misc3_encode_fns[] = {
+  Opcode_xsr_misc3_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_prid_encode_fns[] = {
+  Opcode_rsr_prid_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_vecbase_encode_fns[] = {
+  Opcode_rsr_vecbase_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_vecbase_encode_fns[] = {
+  Opcode_wsr_vecbase_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_vecbase_encode_fns[] = {
+  Opcode_xsr_vecbase_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mul_aa_ll_encode_fns[] = {
+  Opcode_mul_aa_ll_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mul_aa_hl_encode_fns[] = {
+  Opcode_mul_aa_hl_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mul_aa_lh_encode_fns[] = {
+  Opcode_mul_aa_lh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mul_aa_hh_encode_fns[] = {
+  Opcode_mul_aa_hh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_umul_aa_ll_encode_fns[] = {
+  Opcode_umul_aa_ll_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_umul_aa_hl_encode_fns[] = {
+  Opcode_umul_aa_hl_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_umul_aa_lh_encode_fns[] = {
+  Opcode_umul_aa_lh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_umul_aa_hh_encode_fns[] = {
+  Opcode_umul_aa_hh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mul_ad_ll_encode_fns[] = {
+  Opcode_mul_ad_ll_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mul_ad_hl_encode_fns[] = {
+  Opcode_mul_ad_hl_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mul_ad_lh_encode_fns[] = {
+  Opcode_mul_ad_lh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mul_ad_hh_encode_fns[] = {
+  Opcode_mul_ad_hh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mul_da_ll_encode_fns[] = {
+  Opcode_mul_da_ll_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mul_da_hl_encode_fns[] = {
+  Opcode_mul_da_hl_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mul_da_lh_encode_fns[] = {
+  Opcode_mul_da_lh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mul_da_hh_encode_fns[] = {
+  Opcode_mul_da_hh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mul_dd_ll_encode_fns[] = {
+  Opcode_mul_dd_ll_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mul_dd_hl_encode_fns[] = {
+  Opcode_mul_dd_hl_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mul_dd_lh_encode_fns[] = {
+  Opcode_mul_dd_lh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mul_dd_hh_encode_fns[] = {
+  Opcode_mul_dd_hh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_aa_ll_encode_fns[] = {
+  Opcode_mula_aa_ll_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_aa_hl_encode_fns[] = {
+  Opcode_mula_aa_hl_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_aa_lh_encode_fns[] = {
+  Opcode_mula_aa_lh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_aa_hh_encode_fns[] = {
+  Opcode_mula_aa_hh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_muls_aa_ll_encode_fns[] = {
+  Opcode_muls_aa_ll_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_muls_aa_hl_encode_fns[] = {
+  Opcode_muls_aa_hl_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_muls_aa_lh_encode_fns[] = {
+  Opcode_muls_aa_lh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_muls_aa_hh_encode_fns[] = {
+  Opcode_muls_aa_hh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_ad_ll_encode_fns[] = {
+  Opcode_mula_ad_ll_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_ad_hl_encode_fns[] = {
+  Opcode_mula_ad_hl_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_ad_lh_encode_fns[] = {
+  Opcode_mula_ad_lh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_ad_hh_encode_fns[] = {
+  Opcode_mula_ad_hh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_muls_ad_ll_encode_fns[] = {
+  Opcode_muls_ad_ll_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_muls_ad_hl_encode_fns[] = {
+  Opcode_muls_ad_hl_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_muls_ad_lh_encode_fns[] = {
+  Opcode_muls_ad_lh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_muls_ad_hh_encode_fns[] = {
+  Opcode_muls_ad_hh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_da_ll_encode_fns[] = {
+  Opcode_mula_da_ll_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_da_hl_encode_fns[] = {
+  Opcode_mula_da_hl_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_da_lh_encode_fns[] = {
+  Opcode_mula_da_lh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_da_hh_encode_fns[] = {
+  Opcode_mula_da_hh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_muls_da_ll_encode_fns[] = {
+  Opcode_muls_da_ll_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_muls_da_hl_encode_fns[] = {
+  Opcode_muls_da_hl_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_muls_da_lh_encode_fns[] = {
+  Opcode_muls_da_lh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_muls_da_hh_encode_fns[] = {
+  Opcode_muls_da_hh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_dd_ll_encode_fns[] = {
+  Opcode_mula_dd_ll_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_dd_hl_encode_fns[] = {
+  Opcode_mula_dd_hl_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_dd_lh_encode_fns[] = {
+  Opcode_mula_dd_lh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_dd_hh_encode_fns[] = {
+  Opcode_mula_dd_hh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_muls_dd_ll_encode_fns[] = {
+  Opcode_muls_dd_ll_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_muls_dd_hl_encode_fns[] = {
+  Opcode_muls_dd_hl_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_muls_dd_lh_encode_fns[] = {
+  Opcode_muls_dd_lh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_muls_dd_hh_encode_fns[] = {
+  Opcode_muls_dd_hh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_da_ll_lddec_encode_fns[] = {
+  Opcode_mula_da_ll_lddec_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_da_ll_ldinc_encode_fns[] = {
+  Opcode_mula_da_ll_ldinc_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_da_hl_lddec_encode_fns[] = {
+  Opcode_mula_da_hl_lddec_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_da_hl_ldinc_encode_fns[] = {
+  Opcode_mula_da_hl_ldinc_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_da_lh_lddec_encode_fns[] = {
+  Opcode_mula_da_lh_lddec_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_da_lh_ldinc_encode_fns[] = {
+  Opcode_mula_da_lh_ldinc_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_da_hh_lddec_encode_fns[] = {
+  Opcode_mula_da_hh_lddec_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_da_hh_ldinc_encode_fns[] = {
+  Opcode_mula_da_hh_ldinc_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_dd_ll_lddec_encode_fns[] = {
+  Opcode_mula_dd_ll_lddec_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_dd_ll_ldinc_encode_fns[] = {
+  Opcode_mula_dd_ll_ldinc_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_dd_hl_lddec_encode_fns[] = {
+  Opcode_mula_dd_hl_lddec_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_dd_hl_ldinc_encode_fns[] = {
+  Opcode_mula_dd_hl_ldinc_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_dd_lh_lddec_encode_fns[] = {
+  Opcode_mula_dd_lh_lddec_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_dd_lh_ldinc_encode_fns[] = {
+  Opcode_mula_dd_lh_ldinc_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_dd_hh_lddec_encode_fns[] = {
+  Opcode_mula_dd_hh_lddec_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mula_dd_hh_ldinc_encode_fns[] = {
+  Opcode_mula_dd_hh_ldinc_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_lddec_encode_fns[] = {
+  Opcode_lddec_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ldinc_encode_fns[] = {
+  Opcode_ldinc_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mul16u_encode_fns[] = {
+  Opcode_mul16u_Slot_inst_encode, 0, 0, Opcode_mul16u_Slot_xt_flix64_slot0_encode, Opcode_mul16u_Slot_xt_flix64_slot0_encode, Opcode_mul16u_Slot_xt_flix64_slot1_encode, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mul16s_encode_fns[] = {
+  Opcode_mul16s_Slot_inst_encode, 0, 0, Opcode_mul16s_Slot_xt_flix64_slot0_encode, Opcode_mul16s_Slot_xt_flix64_slot0_encode, Opcode_mul16s_Slot_xt_flix64_slot1_encode, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_m0_encode_fns[] = {
+  Opcode_rsr_m0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_m0_encode_fns[] = {
+  Opcode_wsr_m0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_m0_encode_fns[] = {
+  Opcode_xsr_m0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_m1_encode_fns[] = {
+  Opcode_rsr_m1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_m1_encode_fns[] = {
+  Opcode_wsr_m1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_m1_encode_fns[] = {
+  Opcode_xsr_m1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_m2_encode_fns[] = {
+  Opcode_rsr_m2_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_m2_encode_fns[] = {
+  Opcode_wsr_m2_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_m2_encode_fns[] = {
+  Opcode_xsr_m2_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_m3_encode_fns[] = {
+  Opcode_rsr_m3_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_m3_encode_fns[] = {
+  Opcode_wsr_m3_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_m3_encode_fns[] = {
+  Opcode_xsr_m3_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_acclo_encode_fns[] = {
+  Opcode_rsr_acclo_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_acclo_encode_fns[] = {
+  Opcode_wsr_acclo_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_acclo_encode_fns[] = {
+  Opcode_xsr_acclo_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_acchi_encode_fns[] = {
+  Opcode_rsr_acchi_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_acchi_encode_fns[] = {
+  Opcode_wsr_acchi_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_acchi_encode_fns[] = {
+  Opcode_xsr_acchi_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rfi_encode_fns[] = {
+  Opcode_rfi_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_waiti_encode_fns[] = {
+  Opcode_waiti_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_interrupt_encode_fns[] = {
+  Opcode_rsr_interrupt_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_intset_encode_fns[] = {
+  Opcode_wsr_intset_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_intclear_encode_fns[] = {
+  Opcode_wsr_intclear_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_intenable_encode_fns[] = {
+  Opcode_rsr_intenable_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_intenable_encode_fns[] = {
+  Opcode_wsr_intenable_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_intenable_encode_fns[] = {
+  Opcode_xsr_intenable_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_break_encode_fns[] = {
+  Opcode_break_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_break_n_encode_fns[] = {
+  0, 0, Opcode_break_n_Slot_inst16b_encode, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_dbreaka0_encode_fns[] = {
+  Opcode_rsr_dbreaka0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_dbreaka0_encode_fns[] = {
+  Opcode_wsr_dbreaka0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_dbreaka0_encode_fns[] = {
+  Opcode_xsr_dbreaka0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_dbreakc0_encode_fns[] = {
+  Opcode_rsr_dbreakc0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_dbreakc0_encode_fns[] = {
+  Opcode_wsr_dbreakc0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_dbreakc0_encode_fns[] = {
+  Opcode_xsr_dbreakc0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_dbreaka1_encode_fns[] = {
+  Opcode_rsr_dbreaka1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_dbreaka1_encode_fns[] = {
+  Opcode_wsr_dbreaka1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_dbreaka1_encode_fns[] = {
+  Opcode_xsr_dbreaka1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_dbreakc1_encode_fns[] = {
+  Opcode_rsr_dbreakc1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_dbreakc1_encode_fns[] = {
+  Opcode_wsr_dbreakc1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_dbreakc1_encode_fns[] = {
+  Opcode_xsr_dbreakc1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_ibreaka0_encode_fns[] = {
+  Opcode_rsr_ibreaka0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_ibreaka0_encode_fns[] = {
+  Opcode_wsr_ibreaka0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_ibreaka0_encode_fns[] = {
+  Opcode_xsr_ibreaka0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_ibreaka1_encode_fns[] = {
+  Opcode_rsr_ibreaka1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_ibreaka1_encode_fns[] = {
+  Opcode_wsr_ibreaka1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_ibreaka1_encode_fns[] = {
+  Opcode_xsr_ibreaka1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_ibreakenable_encode_fns[] = {
+  Opcode_rsr_ibreakenable_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_ibreakenable_encode_fns[] = {
+  Opcode_wsr_ibreakenable_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_ibreakenable_encode_fns[] = {
+  Opcode_xsr_ibreakenable_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_debugcause_encode_fns[] = {
+  Opcode_rsr_debugcause_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_debugcause_encode_fns[] = {
+  Opcode_wsr_debugcause_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_debugcause_encode_fns[] = {
+  Opcode_xsr_debugcause_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_icount_encode_fns[] = {
+  Opcode_rsr_icount_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_icount_encode_fns[] = {
+  Opcode_wsr_icount_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_icount_encode_fns[] = {
+  Opcode_xsr_icount_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_icountlevel_encode_fns[] = {
+  Opcode_rsr_icountlevel_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_icountlevel_encode_fns[] = {
+  Opcode_wsr_icountlevel_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_icountlevel_encode_fns[] = {
+  Opcode_xsr_icountlevel_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_ddr_encode_fns[] = {
+  Opcode_rsr_ddr_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_ddr_encode_fns[] = {
+  Opcode_wsr_ddr_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_ddr_encode_fns[] = {
+  Opcode_xsr_ddr_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rfdo_encode_fns[] = {
+  Opcode_rfdo_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rfdd_encode_fns[] = {
+  Opcode_rfdd_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_mmid_encode_fns[] = {
+  Opcode_wsr_mmid_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_andb_encode_fns[] = {
+  Opcode_andb_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_andbc_encode_fns[] = {
+  Opcode_andbc_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_orb_encode_fns[] = {
+  Opcode_orb_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_orbc_encode_fns[] = {
+  Opcode_orbc_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xorb_encode_fns[] = {
+  Opcode_xorb_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_any4_encode_fns[] = {
+  Opcode_any4_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_all4_encode_fns[] = {
+  Opcode_all4_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_any8_encode_fns[] = {
+  Opcode_any8_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_all8_encode_fns[] = {
+  Opcode_all8_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bf_encode_fns[] = {
+  Opcode_bf_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_bt_encode_fns[] = {
+  Opcode_bt_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_movf_encode_fns[] = {
+  Opcode_movf_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_movt_encode_fns[] = {
+  Opcode_movt_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_br_encode_fns[] = {
+  Opcode_rsr_br_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_br_encode_fns[] = {
+  Opcode_wsr_br_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_br_encode_fns[] = {
+  Opcode_xsr_br_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_ccount_encode_fns[] = {
+  Opcode_rsr_ccount_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_ccount_encode_fns[] = {
+  Opcode_wsr_ccount_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_ccount_encode_fns[] = {
+  Opcode_xsr_ccount_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_ccompare0_encode_fns[] = {
+  Opcode_rsr_ccompare0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_ccompare0_encode_fns[] = {
+  Opcode_wsr_ccompare0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_ccompare0_encode_fns[] = {
+  Opcode_xsr_ccompare0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_ccompare1_encode_fns[] = {
+  Opcode_rsr_ccompare1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_ccompare1_encode_fns[] = {
+  Opcode_wsr_ccompare1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_ccompare1_encode_fns[] = {
+  Opcode_xsr_ccompare1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_ccompare2_encode_fns[] = {
+  Opcode_rsr_ccompare2_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_ccompare2_encode_fns[] = {
+  Opcode_wsr_ccompare2_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_ccompare2_encode_fns[] = {
+  Opcode_xsr_ccompare2_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ipf_encode_fns[] = {
+  Opcode_ipf_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ihi_encode_fns[] = {
+  Opcode_ihi_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ipfl_encode_fns[] = {
+  Opcode_ipfl_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ihu_encode_fns[] = {
+  Opcode_ihu_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_iiu_encode_fns[] = {
+  Opcode_iiu_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_iii_encode_fns[] = {
+  Opcode_iii_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_lict_encode_fns[] = {
+  Opcode_lict_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_licw_encode_fns[] = {
+  Opcode_licw_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_sict_encode_fns[] = {
+  Opcode_sict_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_sicw_encode_fns[] = {
+  Opcode_sicw_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_dhwb_encode_fns[] = {
+  Opcode_dhwb_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_dhwbi_encode_fns[] = {
+  Opcode_dhwbi_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_diwb_encode_fns[] = {
+  Opcode_diwb_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_diwbi_encode_fns[] = {
+  Opcode_diwbi_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_dhi_encode_fns[] = {
+  Opcode_dhi_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_dii_encode_fns[] = {
+  Opcode_dii_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_dpfr_encode_fns[] = {
+  Opcode_dpfr_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_dpfw_encode_fns[] = {
+  Opcode_dpfw_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_dpfro_encode_fns[] = {
+  Opcode_dpfro_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_dpfwo_encode_fns[] = {
+  Opcode_dpfwo_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_dpfl_encode_fns[] = {
+  Opcode_dpfl_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_dhu_encode_fns[] = {
+  Opcode_dhu_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_diu_encode_fns[] = {
+  Opcode_diu_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_sdct_encode_fns[] = {
+  Opcode_sdct_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ldct_encode_fns[] = {
+  Opcode_ldct_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_ptevaddr_encode_fns[] = {
+  Opcode_wsr_ptevaddr_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_ptevaddr_encode_fns[] = {
+  Opcode_rsr_ptevaddr_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_ptevaddr_encode_fns[] = {
+  Opcode_xsr_ptevaddr_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_rasid_encode_fns[] = {
+  Opcode_rsr_rasid_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_rasid_encode_fns[] = {
+  Opcode_wsr_rasid_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_rasid_encode_fns[] = {
+  Opcode_xsr_rasid_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_itlbcfg_encode_fns[] = {
+  Opcode_rsr_itlbcfg_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_itlbcfg_encode_fns[] = {
+  Opcode_wsr_itlbcfg_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_itlbcfg_encode_fns[] = {
+  Opcode_xsr_itlbcfg_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_dtlbcfg_encode_fns[] = {
+  Opcode_rsr_dtlbcfg_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_dtlbcfg_encode_fns[] = {
+  Opcode_wsr_dtlbcfg_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_dtlbcfg_encode_fns[] = {
+  Opcode_xsr_dtlbcfg_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_idtlb_encode_fns[] = {
+  Opcode_idtlb_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_pdtlb_encode_fns[] = {
+  Opcode_pdtlb_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rdtlb0_encode_fns[] = {
+  Opcode_rdtlb0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rdtlb1_encode_fns[] = {
+  Opcode_rdtlb1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wdtlb_encode_fns[] = {
+  Opcode_wdtlb_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_iitlb_encode_fns[] = {
+  Opcode_iitlb_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_pitlb_encode_fns[] = {
+  Opcode_pitlb_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ritlb0_encode_fns[] = {
+  Opcode_ritlb0_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ritlb1_encode_fns[] = {
+  Opcode_ritlb1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_witlb_encode_fns[] = {
+  Opcode_witlb_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ldpte_encode_fns[] = {
+  Opcode_ldpte_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_hwwitlba_encode_fns[] = {
+  Opcode_hwwitlba_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_hwwdtlba_encode_fns[] = {
+  Opcode_hwwdtlba_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_cpenable_encode_fns[] = {
+  Opcode_rsr_cpenable_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_cpenable_encode_fns[] = {
+  Opcode_wsr_cpenable_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_cpenable_encode_fns[] = {
+  Opcode_xsr_cpenable_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_clamps_encode_fns[] = {
+  Opcode_clamps_Slot_inst_encode, 0, 0, Opcode_clamps_Slot_xt_flix64_slot0_encode, Opcode_clamps_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_min_encode_fns[] = {
+  Opcode_min_Slot_inst_encode, 0, 0, Opcode_min_Slot_xt_flix64_slot0_encode, Opcode_min_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_max_encode_fns[] = {
+  Opcode_max_Slot_inst_encode, 0, 0, Opcode_max_Slot_xt_flix64_slot0_encode, Opcode_max_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_minu_encode_fns[] = {
+  Opcode_minu_Slot_inst_encode, 0, 0, Opcode_minu_Slot_xt_flix64_slot0_encode, Opcode_minu_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_maxu_encode_fns[] = {
+  Opcode_maxu_Slot_inst_encode, 0, 0, Opcode_maxu_Slot_xt_flix64_slot0_encode, Opcode_maxu_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_nsa_encode_fns[] = {
+  Opcode_nsa_Slot_inst_encode, 0, 0, Opcode_nsa_Slot_xt_flix64_slot0_encode, Opcode_nsa_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_nsau_encode_fns[] = {
+  Opcode_nsau_Slot_inst_encode, 0, 0, Opcode_nsau_Slot_xt_flix64_slot0_encode, Opcode_nsau_Slot_xt_flix64_slot0_encode, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_sext_encode_fns[] = {
+  Opcode_sext_Slot_inst_encode, 0, 0, Opcode_sext_Slot_xt_flix64_slot0_encode, Opcode_sext_Slot_xt_flix64_slot0_encode, Opcode_sext_Slot_xt_flix64_slot1_encode, Opcode_sext_Slot_xt_flix64_slot2_encode, 0
+};
+
+xtensa_opcode_encode_fn Opcode_l32ai_encode_fns[] = {
+  Opcode_l32ai_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_s32ri_encode_fns[] = {
+  Opcode_s32ri_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_s32c1i_encode_fns[] = {
+  Opcode_s32c1i_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rsr_scompare1_encode_fns[] = {
+  Opcode_rsr_scompare1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wsr_scompare1_encode_fns[] = {
+  Opcode_wsr_scompare1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_xsr_scompare1_encode_fns[] = {
+  Opcode_xsr_scompare1_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_quou_encode_fns[] = {
+  Opcode_quou_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_quos_encode_fns[] = {
+  Opcode_quos_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_remu_encode_fns[] = {
+  Opcode_remu_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rems_encode_fns[] = {
+  Opcode_rems_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mull_encode_fns[] = {
+  Opcode_mull_Slot_inst_encode, 0, 0, Opcode_mull_Slot_xt_flix64_slot0_encode, Opcode_mull_Slot_xt_flix64_slot0_encode, Opcode_mull_Slot_xt_flix64_slot1_encode, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_muluh_encode_fns[] = {
+  Opcode_muluh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mulsh_encode_fns[] = {
+  Opcode_mulsh_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rur_fcr_encode_fns[] = {
+  Opcode_rur_fcr_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wur_fcr_encode_fns[] = {
+  Opcode_wur_fcr_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rur_fsr_encode_fns[] = {
+  Opcode_rur_fsr_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wur_fsr_encode_fns[] = {
+  Opcode_wur_fsr_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_add_s_encode_fns[] = {
+  Opcode_add_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_sub_s_encode_fns[] = {
+  Opcode_sub_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mul_s_encode_fns[] = {
+  Opcode_mul_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_madd_s_encode_fns[] = {
+  Opcode_madd_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_msub_s_encode_fns[] = {
+  Opcode_msub_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_movf_s_encode_fns[] = {
+  Opcode_movf_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_movt_s_encode_fns[] = {
+  Opcode_movt_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_moveqz_s_encode_fns[] = {
+  Opcode_moveqz_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_movnez_s_encode_fns[] = {
+  Opcode_movnez_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_movltz_s_encode_fns[] = {
+  Opcode_movltz_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_movgez_s_encode_fns[] = {
+  Opcode_movgez_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_abs_s_encode_fns[] = {
+  Opcode_abs_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_mov_s_encode_fns[] = {
+  Opcode_mov_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_neg_s_encode_fns[] = {
+  Opcode_neg_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_un_s_encode_fns[] = {
+  Opcode_un_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_oeq_s_encode_fns[] = {
+  Opcode_oeq_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ueq_s_encode_fns[] = {
+  Opcode_ueq_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_olt_s_encode_fns[] = {
+  Opcode_olt_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ult_s_encode_fns[] = {
+  Opcode_ult_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ole_s_encode_fns[] = {
+  Opcode_ole_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ule_s_encode_fns[] = {
+  Opcode_ule_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_float_s_encode_fns[] = {
+  Opcode_float_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ufloat_s_encode_fns[] = {
+  Opcode_ufloat_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_round_s_encode_fns[] = {
+  Opcode_round_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ceil_s_encode_fns[] = {
+  Opcode_ceil_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_floor_s_encode_fns[] = {
+  Opcode_floor_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_trunc_s_encode_fns[] = {
+  Opcode_trunc_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_utrunc_s_encode_fns[] = {
+  Opcode_utrunc_s_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_rfr_encode_fns[] = {
+  Opcode_rfr_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_wfr_encode_fns[] = {
+  Opcode_wfr_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_lsi_encode_fns[] = {
+  Opcode_lsi_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_lsiu_encode_fns[] = {
+  Opcode_lsiu_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_lsx_encode_fns[] = {
+  Opcode_lsx_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_lsxu_encode_fns[] = {
+  Opcode_lsxu_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ssi_encode_fns[] = {
+  Opcode_ssi_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ssiu_encode_fns[] = {
+  Opcode_ssiu_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ssx_encode_fns[] = {
+  Opcode_ssx_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_ssxu_encode_fns[] = {
+  Opcode_ssxu_Slot_inst_encode, 0, 0, 0, 0, 0, 0, 0
+};
+
+xtensa_opcode_encode_fn Opcode_beqz_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_beqz_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_bnez_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_bnez_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_bgez_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_bgez_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_bltz_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_bltz_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_beqi_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_beqi_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_bnei_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_bnei_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_bgei_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_bgei_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_blti_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_blti_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_bgeui_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_bgeui_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_bltui_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_bltui_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_bbci_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_bbci_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_bbsi_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_bbsi_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_beq_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_beq_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_bne_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_bne_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_bge_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_bge_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_blt_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_blt_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_bgeu_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_bgeu_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_bltu_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_bltu_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_bany_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_bany_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_bnone_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_bnone_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_ball_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_ball_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_bnall_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_bnall_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_bbc_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_bbc_w18_Slot_xt_flix64_slot3_encode
+};
+
+xtensa_opcode_encode_fn Opcode_bbs_w18_encode_fns[] = {
+  0, 0, 0, 0, 0, 0, 0, Opcode_bbs_w18_Slot_xt_flix64_slot3_encode
+};
+
+
+/* Opcode table.  */
+
+static xtensa_opcode_internal opcodes[] = {
+  { "excw", 0 /* xt_iclass_excw */,
+    0,
+    Opcode_excw_encode_fns, 0, 0 },
+  { "rfe", 1 /* xt_iclass_rfe */,
+    XTENSA_OPCODE_IS_JUMP,
+    Opcode_rfe_encode_fns, 0, 0 },
+  { "rfde", 2 /* xt_iclass_rfde */,
+    XTENSA_OPCODE_IS_JUMP,
+    Opcode_rfde_encode_fns, 0, 0 },
+  { "syscall", 3 /* xt_iclass_syscall */,
+    0,
+    Opcode_syscall_encode_fns, 0, 0 },
+  { "simcall", 4 /* xt_iclass_simcall */,
+    0,
+    Opcode_simcall_encode_fns, 0, 0 },
+  { "call12", 5 /* xt_iclass_call12 */,
+    XTENSA_OPCODE_IS_CALL,
+    Opcode_call12_encode_fns, 0, 0 },
+  { "call8", 6 /* xt_iclass_call8 */,
+    XTENSA_OPCODE_IS_CALL,
+    Opcode_call8_encode_fns, 0, 0 },
+  { "call4", 7 /* xt_iclass_call4 */,
+    XTENSA_OPCODE_IS_CALL,
+    Opcode_call4_encode_fns, 0, 0 },
+  { "callx12", 8 /* xt_iclass_callx12 */,
+    XTENSA_OPCODE_IS_CALL,
+    Opcode_callx12_encode_fns, 0, 0 },
+  { "callx8", 9 /* xt_iclass_callx8 */,
+    XTENSA_OPCODE_IS_CALL,
+    Opcode_callx8_encode_fns, 0, 0 },
+  { "callx4", 10 /* xt_iclass_callx4 */,
+    XTENSA_OPCODE_IS_CALL,
+    Opcode_callx4_encode_fns, 0, 0 },
+  { "entry", 11 /* xt_iclass_entry */,
+    0,
+    Opcode_entry_encode_fns, 0, 0 },
+  { "movsp", 12 /* xt_iclass_movsp */,
+    0,
+    Opcode_movsp_encode_fns, 0, 0 },
+  { "rotw", 13 /* xt_iclass_rotw */,
+    0,
+    Opcode_rotw_encode_fns, 0, 0 },
+  { "retw", 14 /* xt_iclass_retw */,
+    XTENSA_OPCODE_IS_JUMP,
+    Opcode_retw_encode_fns, 0, 0 },
+  { "retw.n", 14 /* xt_iclass_retw */,
+    XTENSA_OPCODE_IS_JUMP,
+    Opcode_retw_n_encode_fns, 0, 0 },
+  { "rfwo", 15 /* xt_iclass_rfwou */,
+    XTENSA_OPCODE_IS_JUMP,
+    Opcode_rfwo_encode_fns, 0, 0 },
+  { "rfwu", 15 /* xt_iclass_rfwou */,
+    XTENSA_OPCODE_IS_JUMP,
+    Opcode_rfwu_encode_fns, 0, 0 },
+  { "l32e", 16 /* xt_iclass_l32e */,
+    0,
+    Opcode_l32e_encode_fns, 0, 0 },
+  { "s32e", 17 /* xt_iclass_s32e */,
+    0,
+    Opcode_s32e_encode_fns, 0, 0 },
+  { "rsr.windowbase", 18 /* xt_iclass_rsr.windowbase */,
+    0,
+    Opcode_rsr_windowbase_encode_fns, 0, 0 },
+  { "wsr.windowbase", 19 /* xt_iclass_wsr.windowbase */,
+    0,
+    Opcode_wsr_windowbase_encode_fns, 0, 0 },
+  { "xsr.windowbase", 20 /* xt_iclass_xsr.windowbase */,
+    0,
+    Opcode_xsr_windowbase_encode_fns, 0, 0 },
+  { "rsr.windowstart", 21 /* xt_iclass_rsr.windowstart */,
+    0,
+    Opcode_rsr_windowstart_encode_fns, 0, 0 },
+  { "wsr.windowstart", 22 /* xt_iclass_wsr.windowstart */,
+    0,
+    Opcode_wsr_windowstart_encode_fns, 0, 0 },
+  { "xsr.windowstart", 23 /* xt_iclass_xsr.windowstart */,
+    0,
+    Opcode_xsr_windowstart_encode_fns, 0, 0 },
+  { "add.n", 24 /* xt_iclass_add.n */,
+    0,
+    Opcode_add_n_encode_fns, 0, 0 },
+  { "addi.n", 25 /* xt_iclass_addi.n */,
+    0,
+    Opcode_addi_n_encode_fns, 0, 0 },
+  { "beqz.n", 26 /* xt_iclass_bz6 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_beqz_n_encode_fns, 0, 0 },
+  { "bnez.n", 26 /* xt_iclass_bz6 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bnez_n_encode_fns, 0, 0 },
+  { "ill.n", 27 /* xt_iclass_ill.n */,
+    0,
+    Opcode_ill_n_encode_fns, 0, 0 },
+  { "l32i.n", 28 /* xt_iclass_loadi4 */,
+    0,
+    Opcode_l32i_n_encode_fns, 0, 0 },
+  { "mov.n", 29 /* xt_iclass_mov.n */,
+    0,
+    Opcode_mov_n_encode_fns, 0, 0 },
+  { "movi.n", 30 /* xt_iclass_movi.n */,
+    0,
+    Opcode_movi_n_encode_fns, 0, 0 },
+  { "nop.n", 31 /* xt_iclass_nopn */,
+    0,
+    Opcode_nop_n_encode_fns, 0, 0 },
+  { "ret.n", 32 /* xt_iclass_retn */,
+    XTENSA_OPCODE_IS_JUMP,
+    Opcode_ret_n_encode_fns, 0, 0 },
+  { "s32i.n", 33 /* xt_iclass_storei4 */,
+    0,
+    Opcode_s32i_n_encode_fns, 0, 0 },
+  { "rur.threadptr", 34 /* rur_threadptr */,
+    0,
+    Opcode_rur_threadptr_encode_fns, 0, 0 },
+  { "wur.threadptr", 35 /* wur_threadptr */,
+    0,
+    Opcode_wur_threadptr_encode_fns, 0, 0 },
+  { "addi", 36 /* xt_iclass_addi */,
+    0,
+    Opcode_addi_encode_fns, 0, 0 },
+  { "addmi", 37 /* xt_iclass_addmi */,
+    0,
+    Opcode_addmi_encode_fns, 0, 0 },
+  { "add", 38 /* xt_iclass_addsub */,
+    0,
+    Opcode_add_encode_fns, 0, 0 },
+  { "sub", 38 /* xt_iclass_addsub */,
+    0,
+    Opcode_sub_encode_fns, 0, 0 },
+  { "addx2", 38 /* xt_iclass_addsub */,
+    0,
+    Opcode_addx2_encode_fns, 0, 0 },
+  { "addx4", 38 /* xt_iclass_addsub */,
+    0,
+    Opcode_addx4_encode_fns, 0, 0 },
+  { "addx8", 38 /* xt_iclass_addsub */,
+    0,
+    Opcode_addx8_encode_fns, 0, 0 },
+  { "subx2", 38 /* xt_iclass_addsub */,
+    0,
+    Opcode_subx2_encode_fns, 0, 0 },
+  { "subx4", 38 /* xt_iclass_addsub */,
+    0,
+    Opcode_subx4_encode_fns, 0, 0 },
+  { "subx8", 38 /* xt_iclass_addsub */,
+    0,
+    Opcode_subx8_encode_fns, 0, 0 },
+  { "and", 39 /* xt_iclass_bit */,
+    0,
+    Opcode_and_encode_fns, 0, 0 },
+  { "or", 39 /* xt_iclass_bit */,
+    0,
+    Opcode_or_encode_fns, 0, 0 },
+  { "xor", 39 /* xt_iclass_bit */,
+    0,
+    Opcode_xor_encode_fns, 0, 0 },
+  { "beqi", 40 /* xt_iclass_bsi8 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_beqi_encode_fns, 0, 0 },
+  { "bnei", 40 /* xt_iclass_bsi8 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bnei_encode_fns, 0, 0 },
+  { "bgei", 40 /* xt_iclass_bsi8 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bgei_encode_fns, 0, 0 },
+  { "blti", 40 /* xt_iclass_bsi8 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_blti_encode_fns, 0, 0 },
+  { "bbci", 41 /* xt_iclass_bsi8b */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bbci_encode_fns, 0, 0 },
+  { "bbsi", 41 /* xt_iclass_bsi8b */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bbsi_encode_fns, 0, 0 },
+  { "bgeui", 42 /* xt_iclass_bsi8u */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bgeui_encode_fns, 0, 0 },
+  { "bltui", 42 /* xt_iclass_bsi8u */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bltui_encode_fns, 0, 0 },
+  { "beq", 43 /* xt_iclass_bst8 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_beq_encode_fns, 0, 0 },
+  { "bne", 43 /* xt_iclass_bst8 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bne_encode_fns, 0, 0 },
+  { "bge", 43 /* xt_iclass_bst8 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bge_encode_fns, 0, 0 },
+  { "blt", 43 /* xt_iclass_bst8 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_blt_encode_fns, 0, 0 },
+  { "bgeu", 43 /* xt_iclass_bst8 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bgeu_encode_fns, 0, 0 },
+  { "bltu", 43 /* xt_iclass_bst8 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bltu_encode_fns, 0, 0 },
+  { "bany", 43 /* xt_iclass_bst8 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bany_encode_fns, 0, 0 },
+  { "bnone", 43 /* xt_iclass_bst8 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bnone_encode_fns, 0, 0 },
+  { "ball", 43 /* xt_iclass_bst8 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_ball_encode_fns, 0, 0 },
+  { "bnall", 43 /* xt_iclass_bst8 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bnall_encode_fns, 0, 0 },
+  { "bbc", 43 /* xt_iclass_bst8 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bbc_encode_fns, 0, 0 },
+  { "bbs", 43 /* xt_iclass_bst8 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bbs_encode_fns, 0, 0 },
+  { "beqz", 44 /* xt_iclass_bsz12 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_beqz_encode_fns, 0, 0 },
+  { "bnez", 44 /* xt_iclass_bsz12 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bnez_encode_fns, 0, 0 },
+  { "bgez", 44 /* xt_iclass_bsz12 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bgez_encode_fns, 0, 0 },
+  { "bltz", 44 /* xt_iclass_bsz12 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bltz_encode_fns, 0, 0 },
+  { "call0", 45 /* xt_iclass_call0 */,
+    XTENSA_OPCODE_IS_CALL,
+    Opcode_call0_encode_fns, 0, 0 },
+  { "callx0", 46 /* xt_iclass_callx0 */,
+    XTENSA_OPCODE_IS_CALL,
+    Opcode_callx0_encode_fns, 0, 0 },
+  { "extui", 47 /* xt_iclass_exti */,
+    0,
+    Opcode_extui_encode_fns, 0, 0 },
+  { "ill", 48 /* xt_iclass_ill */,
+    0,
+    Opcode_ill_encode_fns, 0, 0 },
+  { "j", 49 /* xt_iclass_jump */,
+    XTENSA_OPCODE_IS_JUMP,
+    Opcode_j_encode_fns, 0, 0 },
+  { "jx", 50 /* xt_iclass_jumpx */,
+    XTENSA_OPCODE_IS_JUMP,
+    Opcode_jx_encode_fns, 0, 0 },
+  { "l16ui", 51 /* xt_iclass_l16ui */,
+    0,
+    Opcode_l16ui_encode_fns, 0, 0 },
+  { "l16si", 52 /* xt_iclass_l16si */,
+    0,
+    Opcode_l16si_encode_fns, 0, 0 },
+  { "l32i", 53 /* xt_iclass_l32i */,
+    0,
+    Opcode_l32i_encode_fns, 0, 0 },
+  { "l32r", 54 /* xt_iclass_l32r */,
+    0,
+    Opcode_l32r_encode_fns, 0, 0 },
+  { "l8ui", 55 /* xt_iclass_l8i */,
+    0,
+    Opcode_l8ui_encode_fns, 0, 0 },
+  { "loop", 56 /* xt_iclass_loop */,
+    XTENSA_OPCODE_IS_LOOP,
+    Opcode_loop_encode_fns, 0, 0 },
+  { "loopnez", 57 /* xt_iclass_loopz */,
+    XTENSA_OPCODE_IS_LOOP,
+    Opcode_loopnez_encode_fns, 0, 0 },
+  { "loopgtz", 57 /* xt_iclass_loopz */,
+    XTENSA_OPCODE_IS_LOOP,
+    Opcode_loopgtz_encode_fns, 0, 0 },
+  { "movi", 58 /* xt_iclass_movi */,
+    0,
+    Opcode_movi_encode_fns, 0, 0 },
+  { "moveqz", 59 /* xt_iclass_movz */,
+    0,
+    Opcode_moveqz_encode_fns, 0, 0 },
+  { "movnez", 59 /* xt_iclass_movz */,
+    0,
+    Opcode_movnez_encode_fns, 0, 0 },
+  { "movltz", 59 /* xt_iclass_movz */,
+    0,
+    Opcode_movltz_encode_fns, 0, 0 },
+  { "movgez", 59 /* xt_iclass_movz */,
+    0,
+    Opcode_movgez_encode_fns, 0, 0 },
+  { "neg", 60 /* xt_iclass_neg */,
+    0,
+    Opcode_neg_encode_fns, 0, 0 },
+  { "abs", 60 /* xt_iclass_neg */,
+    0,
+    Opcode_abs_encode_fns, 0, 0 },
+  { "nop", 61 /* xt_iclass_nop */,
+    0,
+    Opcode_nop_encode_fns, 0, 0 },
+  { "ret", 62 /* xt_iclass_return */,
+    XTENSA_OPCODE_IS_JUMP,
+    Opcode_ret_encode_fns, 0, 0 },
+  { "s16i", 63 /* xt_iclass_s16i */,
+    0,
+    Opcode_s16i_encode_fns, 0, 0 },
+  { "s32i", 64 /* xt_iclass_s32i */,
+    0,
+    Opcode_s32i_encode_fns, 0, 0 },
+  { "s8i", 65 /* xt_iclass_s8i */,
+    0,
+    Opcode_s8i_encode_fns, 0, 0 },
+  { "ssr", 66 /* xt_iclass_sar */,
+    0,
+    Opcode_ssr_encode_fns, 0, 0 },
+  { "ssl", 66 /* xt_iclass_sar */,
+    0,
+    Opcode_ssl_encode_fns, 0, 0 },
+  { "ssa8l", 66 /* xt_iclass_sar */,
+    0,
+    Opcode_ssa8l_encode_fns, 0, 0 },
+  { "ssa8b", 66 /* xt_iclass_sar */,
+    0,
+    Opcode_ssa8b_encode_fns, 0, 0 },
+  { "ssai", 67 /* xt_iclass_sari */,
+    0,
+    Opcode_ssai_encode_fns, 0, 0 },
+  { "sll", 68 /* xt_iclass_shifts */,
+    0,
+    Opcode_sll_encode_fns, 0, 0 },
+  { "src", 69 /* xt_iclass_shiftst */,
+    0,
+    Opcode_src_encode_fns, 0, 0 },
+  { "srl", 70 /* xt_iclass_shiftt */,
+    0,
+    Opcode_srl_encode_fns, 0, 0 },
+  { "sra", 70 /* xt_iclass_shiftt */,
+    0,
+    Opcode_sra_encode_fns, 0, 0 },
+  { "slli", 71 /* xt_iclass_slli */,
+    0,
+    Opcode_slli_encode_fns, 0, 0 },
+  { "srai", 72 /* xt_iclass_srai */,
+    0,
+    Opcode_srai_encode_fns, 0, 0 },
+  { "srli", 73 /* xt_iclass_srli */,
+    0,
+    Opcode_srli_encode_fns, 0, 0 },
+  { "memw", 74 /* xt_iclass_memw */,
+    0,
+    Opcode_memw_encode_fns, 0, 0 },
+  { "extw", 75 /* xt_iclass_extw */,
+    0,
+    Opcode_extw_encode_fns, 0, 0 },
+  { "isync", 76 /* xt_iclass_isync */,
+    0,
+    Opcode_isync_encode_fns, 0, 0 },
+  { "rsync", 77 /* xt_iclass_sync */,
+    0,
+    Opcode_rsync_encode_fns, 0, 0 },
+  { "esync", 77 /* xt_iclass_sync */,
+    0,
+    Opcode_esync_encode_fns, 0, 0 },
+  { "dsync", 77 /* xt_iclass_sync */,
+    0,
+    Opcode_dsync_encode_fns, 0, 0 },
+  { "rsil", 78 /* xt_iclass_rsil */,
+    0,
+    Opcode_rsil_encode_fns, 0, 0 },
+  { "rsr.lend", 79 /* xt_iclass_rsr.lend */,
+    0,
+    Opcode_rsr_lend_encode_fns, 0, 0 },
+  { "wsr.lend", 80 /* xt_iclass_wsr.lend */,
+    0,
+    Opcode_wsr_lend_encode_fns, 0, 0 },
+  { "xsr.lend", 81 /* xt_iclass_xsr.lend */,
+    0,
+    Opcode_xsr_lend_encode_fns, 0, 0 },
+  { "rsr.lcount", 82 /* xt_iclass_rsr.lcount */,
+    0,
+    Opcode_rsr_lcount_encode_fns, 0, 0 },
+  { "wsr.lcount", 83 /* xt_iclass_wsr.lcount */,
+    0,
+    Opcode_wsr_lcount_encode_fns, 0, 0 },
+  { "xsr.lcount", 84 /* xt_iclass_xsr.lcount */,
+    0,
+    Opcode_xsr_lcount_encode_fns, 0, 0 },
+  { "rsr.lbeg", 85 /* xt_iclass_rsr.lbeg */,
+    0,
+    Opcode_rsr_lbeg_encode_fns, 0, 0 },
+  { "wsr.lbeg", 86 /* xt_iclass_wsr.lbeg */,
+    0,
+    Opcode_wsr_lbeg_encode_fns, 0, 0 },
+  { "xsr.lbeg", 87 /* xt_iclass_xsr.lbeg */,
+    0,
+    Opcode_xsr_lbeg_encode_fns, 0, 0 },
+  { "rsr.sar", 88 /* xt_iclass_rsr.sar */,
+    0,
+    Opcode_rsr_sar_encode_fns, 0, 0 },
+  { "wsr.sar", 89 /* xt_iclass_wsr.sar */,
+    0,
+    Opcode_wsr_sar_encode_fns, 0, 0 },
+  { "xsr.sar", 90 /* xt_iclass_xsr.sar */,
+    0,
+    Opcode_xsr_sar_encode_fns, 0, 0 },
+  { "rsr.litbase", 91 /* xt_iclass_rsr.litbase */,
+    0,
+    Opcode_rsr_litbase_encode_fns, 0, 0 },
+  { "wsr.litbase", 92 /* xt_iclass_wsr.litbase */,
+    0,
+    Opcode_wsr_litbase_encode_fns, 0, 0 },
+  { "xsr.litbase", 93 /* xt_iclass_xsr.litbase */,
+    0,
+    Opcode_xsr_litbase_encode_fns, 0, 0 },
+  { "rsr.176", 94 /* xt_iclass_rsr.176 */,
+    0,
+    Opcode_rsr_176_encode_fns, 0, 0 },
+  { "rsr.208", 95 /* xt_iclass_rsr.208 */,
+    0,
+    Opcode_rsr_208_encode_fns, 0, 0 },
+  { "rsr.ps", 96 /* xt_iclass_rsr.ps */,
+    0,
+    Opcode_rsr_ps_encode_fns, 0, 0 },
+  { "wsr.ps", 97 /* xt_iclass_wsr.ps */,
+    0,
+    Opcode_wsr_ps_encode_fns, 0, 0 },
+  { "xsr.ps", 98 /* xt_iclass_xsr.ps */,
+    0,
+    Opcode_xsr_ps_encode_fns, 0, 0 },
+  { "rsr.epc1", 99 /* xt_iclass_rsr.epc1 */,
+    0,
+    Opcode_rsr_epc1_encode_fns, 0, 0 },
+  { "wsr.epc1", 100 /* xt_iclass_wsr.epc1 */,
+    0,
+    Opcode_wsr_epc1_encode_fns, 0, 0 },
+  { "xsr.epc1", 101 /* xt_iclass_xsr.epc1 */,
+    0,
+    Opcode_xsr_epc1_encode_fns, 0, 0 },
+  { "rsr.excsave1", 102 /* xt_iclass_rsr.excsave1 */,
+    0,
+    Opcode_rsr_excsave1_encode_fns, 0, 0 },
+  { "wsr.excsave1", 103 /* xt_iclass_wsr.excsave1 */,
+    0,
+    Opcode_wsr_excsave1_encode_fns, 0, 0 },
+  { "xsr.excsave1", 104 /* xt_iclass_xsr.excsave1 */,
+    0,
+    Opcode_xsr_excsave1_encode_fns, 0, 0 },
+  { "rsr.epc2", 105 /* xt_iclass_rsr.epc2 */,
+    0,
+    Opcode_rsr_epc2_encode_fns, 0, 0 },
+  { "wsr.epc2", 106 /* xt_iclass_wsr.epc2 */,
+    0,
+    Opcode_wsr_epc2_encode_fns, 0, 0 },
+  { "xsr.epc2", 107 /* xt_iclass_xsr.epc2 */,
+    0,
+    Opcode_xsr_epc2_encode_fns, 0, 0 },
+  { "rsr.excsave2", 108 /* xt_iclass_rsr.excsave2 */,
+    0,
+    Opcode_rsr_excsave2_encode_fns, 0, 0 },
+  { "wsr.excsave2", 109 /* xt_iclass_wsr.excsave2 */,
+    0,
+    Opcode_wsr_excsave2_encode_fns, 0, 0 },
+  { "xsr.excsave2", 110 /* xt_iclass_xsr.excsave2 */,
+    0,
+    Opcode_xsr_excsave2_encode_fns, 0, 0 },
+  { "rsr.epc3", 111 /* xt_iclass_rsr.epc3 */,
+    0,
+    Opcode_rsr_epc3_encode_fns, 0, 0 },
+  { "wsr.epc3", 112 /* xt_iclass_wsr.epc3 */,
+    0,
+    Opcode_wsr_epc3_encode_fns, 0, 0 },
+  { "xsr.epc3", 113 /* xt_iclass_xsr.epc3 */,
+    0,
+    Opcode_xsr_epc3_encode_fns, 0, 0 },
+  { "rsr.excsave3", 114 /* xt_iclass_rsr.excsave3 */,
+    0,
+    Opcode_rsr_excsave3_encode_fns, 0, 0 },
+  { "wsr.excsave3", 115 /* xt_iclass_wsr.excsave3 */,
+    0,
+    Opcode_wsr_excsave3_encode_fns, 0, 0 },
+  { "xsr.excsave3", 116 /* xt_iclass_xsr.excsave3 */,
+    0,
+    Opcode_xsr_excsave3_encode_fns, 0, 0 },
+  { "rsr.epc4", 117 /* xt_iclass_rsr.epc4 */,
+    0,
+    Opcode_rsr_epc4_encode_fns, 0, 0 },
+  { "wsr.epc4", 118 /* xt_iclass_wsr.epc4 */,
+    0,
+    Opcode_wsr_epc4_encode_fns, 0, 0 },
+  { "xsr.epc4", 119 /* xt_iclass_xsr.epc4 */,
+    0,
+    Opcode_xsr_epc4_encode_fns, 0, 0 },
+  { "rsr.excsave4", 120 /* xt_iclass_rsr.excsave4 */,
+    0,
+    Opcode_rsr_excsave4_encode_fns, 0, 0 },
+  { "wsr.excsave4", 121 /* xt_iclass_wsr.excsave4 */,
+    0,
+    Opcode_wsr_excsave4_encode_fns, 0, 0 },
+  { "xsr.excsave4", 122 /* xt_iclass_xsr.excsave4 */,
+    0,
+    Opcode_xsr_excsave4_encode_fns, 0, 0 },
+  { "rsr.epc5", 123 /* xt_iclass_rsr.epc5 */,
+    0,
+    Opcode_rsr_epc5_encode_fns, 0, 0 },
+  { "wsr.epc5", 124 /* xt_iclass_wsr.epc5 */,
+    0,
+    Opcode_wsr_epc5_encode_fns, 0, 0 },
+  { "xsr.epc5", 125 /* xt_iclass_xsr.epc5 */,
+    0,
+    Opcode_xsr_epc5_encode_fns, 0, 0 },
+  { "rsr.excsave5", 126 /* xt_iclass_rsr.excsave5 */,
+    0,
+    Opcode_rsr_excsave5_encode_fns, 0, 0 },
+  { "wsr.excsave5", 127 /* xt_iclass_wsr.excsave5 */,
+    0,
+    Opcode_wsr_excsave5_encode_fns, 0, 0 },
+  { "xsr.excsave5", 128 /* xt_iclass_xsr.excsave5 */,
+    0,
+    Opcode_xsr_excsave5_encode_fns, 0, 0 },
+  { "rsr.epc6", 129 /* xt_iclass_rsr.epc6 */,
+    0,
+    Opcode_rsr_epc6_encode_fns, 0, 0 },
+  { "wsr.epc6", 130 /* xt_iclass_wsr.epc6 */,
+    0,
+    Opcode_wsr_epc6_encode_fns, 0, 0 },
+  { "xsr.epc6", 131 /* xt_iclass_xsr.epc6 */,
+    0,
+    Opcode_xsr_epc6_encode_fns, 0, 0 },
+  { "rsr.excsave6", 132 /* xt_iclass_rsr.excsave6 */,
+    0,
+    Opcode_rsr_excsave6_encode_fns, 0, 0 },
+  { "wsr.excsave6", 133 /* xt_iclass_wsr.excsave6 */,
+    0,
+    Opcode_wsr_excsave6_encode_fns, 0, 0 },
+  { "xsr.excsave6", 134 /* xt_iclass_xsr.excsave6 */,
+    0,
+    Opcode_xsr_excsave6_encode_fns, 0, 0 },
+  { "rsr.epc7", 135 /* xt_iclass_rsr.epc7 */,
+    0,
+    Opcode_rsr_epc7_encode_fns, 0, 0 },
+  { "wsr.epc7", 136 /* xt_iclass_wsr.epc7 */,
+    0,
+    Opcode_wsr_epc7_encode_fns, 0, 0 },
+  { "xsr.epc7", 137 /* xt_iclass_xsr.epc7 */,
+    0,
+    Opcode_xsr_epc7_encode_fns, 0, 0 },
+  { "rsr.excsave7", 138 /* xt_iclass_rsr.excsave7 */,
+    0,
+    Opcode_rsr_excsave7_encode_fns, 0, 0 },
+  { "wsr.excsave7", 139 /* xt_iclass_wsr.excsave7 */,
+    0,
+    Opcode_wsr_excsave7_encode_fns, 0, 0 },
+  { "xsr.excsave7", 140 /* xt_iclass_xsr.excsave7 */,
+    0,
+    Opcode_xsr_excsave7_encode_fns, 0, 0 },
+  { "rsr.eps2", 141 /* xt_iclass_rsr.eps2 */,
+    0,
+    Opcode_rsr_eps2_encode_fns, 0, 0 },
+  { "wsr.eps2", 142 /* xt_iclass_wsr.eps2 */,
+    0,
+    Opcode_wsr_eps2_encode_fns, 0, 0 },
+  { "xsr.eps2", 143 /* xt_iclass_xsr.eps2 */,
+    0,
+    Opcode_xsr_eps2_encode_fns, 0, 0 },
+  { "rsr.eps3", 144 /* xt_iclass_rsr.eps3 */,
+    0,
+    Opcode_rsr_eps3_encode_fns, 0, 0 },
+  { "wsr.eps3", 145 /* xt_iclass_wsr.eps3 */,
+    0,
+    Opcode_wsr_eps3_encode_fns, 0, 0 },
+  { "xsr.eps3", 146 /* xt_iclass_xsr.eps3 */,
+    0,
+    Opcode_xsr_eps3_encode_fns, 0, 0 },
+  { "rsr.eps4", 147 /* xt_iclass_rsr.eps4 */,
+    0,
+    Opcode_rsr_eps4_encode_fns, 0, 0 },
+  { "wsr.eps4", 148 /* xt_iclass_wsr.eps4 */,
+    0,
+    Opcode_wsr_eps4_encode_fns, 0, 0 },
+  { "xsr.eps4", 149 /* xt_iclass_xsr.eps4 */,
+    0,
+    Opcode_xsr_eps4_encode_fns, 0, 0 },
+  { "rsr.eps5", 150 /* xt_iclass_rsr.eps5 */,
+    0,
+    Opcode_rsr_eps5_encode_fns, 0, 0 },
+  { "wsr.eps5", 151 /* xt_iclass_wsr.eps5 */,
+    0,
+    Opcode_wsr_eps5_encode_fns, 0, 0 },
+  { "xsr.eps5", 152 /* xt_iclass_xsr.eps5 */,
+    0,
+    Opcode_xsr_eps5_encode_fns, 0, 0 },
+  { "rsr.eps6", 153 /* xt_iclass_rsr.eps6 */,
+    0,
+    Opcode_rsr_eps6_encode_fns, 0, 0 },
+  { "wsr.eps6", 154 /* xt_iclass_wsr.eps6 */,
+    0,
+    Opcode_wsr_eps6_encode_fns, 0, 0 },
+  { "xsr.eps6", 155 /* xt_iclass_xsr.eps6 */,
+    0,
+    Opcode_xsr_eps6_encode_fns, 0, 0 },
+  { "rsr.eps7", 156 /* xt_iclass_rsr.eps7 */,
+    0,
+    Opcode_rsr_eps7_encode_fns, 0, 0 },
+  { "wsr.eps7", 157 /* xt_iclass_wsr.eps7 */,
+    0,
+    Opcode_wsr_eps7_encode_fns, 0, 0 },
+  { "xsr.eps7", 158 /* xt_iclass_xsr.eps7 */,
+    0,
+    Opcode_xsr_eps7_encode_fns, 0, 0 },
+  { "rsr.excvaddr", 159 /* xt_iclass_rsr.excvaddr */,
+    0,
+    Opcode_rsr_excvaddr_encode_fns, 0, 0 },
+  { "wsr.excvaddr", 160 /* xt_iclass_wsr.excvaddr */,
+    0,
+    Opcode_wsr_excvaddr_encode_fns, 0, 0 },
+  { "xsr.excvaddr", 161 /* xt_iclass_xsr.excvaddr */,
+    0,
+    Opcode_xsr_excvaddr_encode_fns, 0, 0 },
+  { "rsr.depc", 162 /* xt_iclass_rsr.depc */,
+    0,
+    Opcode_rsr_depc_encode_fns, 0, 0 },
+  { "wsr.depc", 163 /* xt_iclass_wsr.depc */,
+    0,
+    Opcode_wsr_depc_encode_fns, 0, 0 },
+  { "xsr.depc", 164 /* xt_iclass_xsr.depc */,
+    0,
+    Opcode_xsr_depc_encode_fns, 0, 0 },
+  { "rsr.exccause", 165 /* xt_iclass_rsr.exccause */,
+    0,
+    Opcode_rsr_exccause_encode_fns, 0, 0 },
+  { "wsr.exccause", 166 /* xt_iclass_wsr.exccause */,
+    0,
+    Opcode_wsr_exccause_encode_fns, 0, 0 },
+  { "xsr.exccause", 167 /* xt_iclass_xsr.exccause */,
+    0,
+    Opcode_xsr_exccause_encode_fns, 0, 0 },
+  { "rsr.misc0", 168 /* xt_iclass_rsr.misc0 */,
+    0,
+    Opcode_rsr_misc0_encode_fns, 0, 0 },
+  { "wsr.misc0", 169 /* xt_iclass_wsr.misc0 */,
+    0,
+    Opcode_wsr_misc0_encode_fns, 0, 0 },
+  { "xsr.misc0", 170 /* xt_iclass_xsr.misc0 */,
+    0,
+    Opcode_xsr_misc0_encode_fns, 0, 0 },
+  { "rsr.misc1", 171 /* xt_iclass_rsr.misc1 */,
+    0,
+    Opcode_rsr_misc1_encode_fns, 0, 0 },
+  { "wsr.misc1", 172 /* xt_iclass_wsr.misc1 */,
+    0,
+    Opcode_wsr_misc1_encode_fns, 0, 0 },
+  { "xsr.misc1", 173 /* xt_iclass_xsr.misc1 */,
+    0,
+    Opcode_xsr_misc1_encode_fns, 0, 0 },
+  { "rsr.misc2", 174 /* xt_iclass_rsr.misc2 */,
+    0,
+    Opcode_rsr_misc2_encode_fns, 0, 0 },
+  { "wsr.misc2", 175 /* xt_iclass_wsr.misc2 */,
+    0,
+    Opcode_wsr_misc2_encode_fns, 0, 0 },
+  { "xsr.misc2", 176 /* xt_iclass_xsr.misc2 */,
+    0,
+    Opcode_xsr_misc2_encode_fns, 0, 0 },
+  { "rsr.misc3", 177 /* xt_iclass_rsr.misc3 */,
+    0,
+    Opcode_rsr_misc3_encode_fns, 0, 0 },
+  { "wsr.misc3", 178 /* xt_iclass_wsr.misc3 */,
+    0,
+    Opcode_wsr_misc3_encode_fns, 0, 0 },
+  { "xsr.misc3", 179 /* xt_iclass_xsr.misc3 */,
+    0,
+    Opcode_xsr_misc3_encode_fns, 0, 0 },
+  { "rsr.prid", 180 /* xt_iclass_rsr.prid */,
+    0,
+    Opcode_rsr_prid_encode_fns, 0, 0 },
+  { "rsr.vecbase", 181 /* xt_iclass_rsr.vecbase */,
+    0,
+    Opcode_rsr_vecbase_encode_fns, 0, 0 },
+  { "wsr.vecbase", 182 /* xt_iclass_wsr.vecbase */,
+    0,
+    Opcode_wsr_vecbase_encode_fns, 0, 0 },
+  { "xsr.vecbase", 183 /* xt_iclass_xsr.vecbase */,
+    0,
+    Opcode_xsr_vecbase_encode_fns, 0, 0 },
+  { "mul.aa.ll", 184 /* xt_iclass_mac16_aa */,
+    0,
+    Opcode_mul_aa_ll_encode_fns, 0, 0 },
+  { "mul.aa.hl", 184 /* xt_iclass_mac16_aa */,
+    0,
+    Opcode_mul_aa_hl_encode_fns, 0, 0 },
+  { "mul.aa.lh", 184 /* xt_iclass_mac16_aa */,
+    0,
+    Opcode_mul_aa_lh_encode_fns, 0, 0 },
+  { "mul.aa.hh", 184 /* xt_iclass_mac16_aa */,
+    0,
+    Opcode_mul_aa_hh_encode_fns, 0, 0 },
+  { "umul.aa.ll", 184 /* xt_iclass_mac16_aa */,
+    0,
+    Opcode_umul_aa_ll_encode_fns, 0, 0 },
+  { "umul.aa.hl", 184 /* xt_iclass_mac16_aa */,
+    0,
+    Opcode_umul_aa_hl_encode_fns, 0, 0 },
+  { "umul.aa.lh", 184 /* xt_iclass_mac16_aa */,
+    0,
+    Opcode_umul_aa_lh_encode_fns, 0, 0 },
+  { "umul.aa.hh", 184 /* xt_iclass_mac16_aa */,
+    0,
+    Opcode_umul_aa_hh_encode_fns, 0, 0 },
+  { "mul.ad.ll", 185 /* xt_iclass_mac16_ad */,
+    0,
+    Opcode_mul_ad_ll_encode_fns, 0, 0 },
+  { "mul.ad.hl", 185 /* xt_iclass_mac16_ad */,
+    0,
+    Opcode_mul_ad_hl_encode_fns, 0, 0 },
+  { "mul.ad.lh", 185 /* xt_iclass_mac16_ad */,
+    0,
+    Opcode_mul_ad_lh_encode_fns, 0, 0 },
+  { "mul.ad.hh", 185 /* xt_iclass_mac16_ad */,
+    0,
+    Opcode_mul_ad_hh_encode_fns, 0, 0 },
+  { "mul.da.ll", 186 /* xt_iclass_mac16_da */,
+    0,
+    Opcode_mul_da_ll_encode_fns, 0, 0 },
+  { "mul.da.hl", 186 /* xt_iclass_mac16_da */,
+    0,
+    Opcode_mul_da_hl_encode_fns, 0, 0 },
+  { "mul.da.lh", 186 /* xt_iclass_mac16_da */,
+    0,
+    Opcode_mul_da_lh_encode_fns, 0, 0 },
+  { "mul.da.hh", 186 /* xt_iclass_mac16_da */,
+    0,
+    Opcode_mul_da_hh_encode_fns, 0, 0 },
+  { "mul.dd.ll", 187 /* xt_iclass_mac16_dd */,
+    0,
+    Opcode_mul_dd_ll_encode_fns, 0, 0 },
+  { "mul.dd.hl", 187 /* xt_iclass_mac16_dd */,
+    0,
+    Opcode_mul_dd_hl_encode_fns, 0, 0 },
+  { "mul.dd.lh", 187 /* xt_iclass_mac16_dd */,
+    0,
+    Opcode_mul_dd_lh_encode_fns, 0, 0 },
+  { "mul.dd.hh", 187 /* xt_iclass_mac16_dd */,
+    0,
+    Opcode_mul_dd_hh_encode_fns, 0, 0 },
+  { "mula.aa.ll", 188 /* xt_iclass_mac16a_aa */,
+    0,
+    Opcode_mula_aa_ll_encode_fns, 0, 0 },
+  { "mula.aa.hl", 188 /* xt_iclass_mac16a_aa */,
+    0,
+    Opcode_mula_aa_hl_encode_fns, 0, 0 },
+  { "mula.aa.lh", 188 /* xt_iclass_mac16a_aa */,
+    0,
+    Opcode_mula_aa_lh_encode_fns, 0, 0 },
+  { "mula.aa.hh", 188 /* xt_iclass_mac16a_aa */,
+    0,
+    Opcode_mula_aa_hh_encode_fns, 0, 0 },
+  { "muls.aa.ll", 188 /* xt_iclass_mac16a_aa */,
+    0,
+    Opcode_muls_aa_ll_encode_fns, 0, 0 },
+  { "muls.aa.hl", 188 /* xt_iclass_mac16a_aa */,
+    0,
+    Opcode_muls_aa_hl_encode_fns, 0, 0 },
+  { "muls.aa.lh", 188 /* xt_iclass_mac16a_aa */,
+    0,
+    Opcode_muls_aa_lh_encode_fns, 0, 0 },
+  { "muls.aa.hh", 188 /* xt_iclass_mac16a_aa */,
+    0,
+    Opcode_muls_aa_hh_encode_fns, 0, 0 },
+  { "mula.ad.ll", 189 /* xt_iclass_mac16a_ad */,
+    0,
+    Opcode_mula_ad_ll_encode_fns, 0, 0 },
+  { "mula.ad.hl", 189 /* xt_iclass_mac16a_ad */,
+    0,
+    Opcode_mula_ad_hl_encode_fns, 0, 0 },
+  { "mula.ad.lh", 189 /* xt_iclass_mac16a_ad */,
+    0,
+    Opcode_mula_ad_lh_encode_fns, 0, 0 },
+  { "mula.ad.hh", 189 /* xt_iclass_mac16a_ad */,
+    0,
+    Opcode_mula_ad_hh_encode_fns, 0, 0 },
+  { "muls.ad.ll", 189 /* xt_iclass_mac16a_ad */,
+    0,
+    Opcode_muls_ad_ll_encode_fns, 0, 0 },
+  { "muls.ad.hl", 189 /* xt_iclass_mac16a_ad */,
+    0,
+    Opcode_muls_ad_hl_encode_fns, 0, 0 },
+  { "muls.ad.lh", 189 /* xt_iclass_mac16a_ad */,
+    0,
+    Opcode_muls_ad_lh_encode_fns, 0, 0 },
+  { "muls.ad.hh", 189 /* xt_iclass_mac16a_ad */,
+    0,
+    Opcode_muls_ad_hh_encode_fns, 0, 0 },
+  { "mula.da.ll", 190 /* xt_iclass_mac16a_da */,
+    0,
+    Opcode_mula_da_ll_encode_fns, 0, 0 },
+  { "mula.da.hl", 190 /* xt_iclass_mac16a_da */,
+    0,
+    Opcode_mula_da_hl_encode_fns, 0, 0 },
+  { "mula.da.lh", 190 /* xt_iclass_mac16a_da */,
+    0,
+    Opcode_mula_da_lh_encode_fns, 0, 0 },
+  { "mula.da.hh", 190 /* xt_iclass_mac16a_da */,
+    0,
+    Opcode_mula_da_hh_encode_fns, 0, 0 },
+  { "muls.da.ll", 190 /* xt_iclass_mac16a_da */,
+    0,
+    Opcode_muls_da_ll_encode_fns, 0, 0 },
+  { "muls.da.hl", 190 /* xt_iclass_mac16a_da */,
+    0,
+    Opcode_muls_da_hl_encode_fns, 0, 0 },
+  { "muls.da.lh", 190 /* xt_iclass_mac16a_da */,
+    0,
+    Opcode_muls_da_lh_encode_fns, 0, 0 },
+  { "muls.da.hh", 190 /* xt_iclass_mac16a_da */,
+    0,
+    Opcode_muls_da_hh_encode_fns, 0, 0 },
+  { "mula.dd.ll", 191 /* xt_iclass_mac16a_dd */,
+    0,
+    Opcode_mula_dd_ll_encode_fns, 0, 0 },
+  { "mula.dd.hl", 191 /* xt_iclass_mac16a_dd */,
+    0,
+    Opcode_mula_dd_hl_encode_fns, 0, 0 },
+  { "mula.dd.lh", 191 /* xt_iclass_mac16a_dd */,
+    0,
+    Opcode_mula_dd_lh_encode_fns, 0, 0 },
+  { "mula.dd.hh", 191 /* xt_iclass_mac16a_dd */,
+    0,
+    Opcode_mula_dd_hh_encode_fns, 0, 0 },
+  { "muls.dd.ll", 191 /* xt_iclass_mac16a_dd */,
+    0,
+    Opcode_muls_dd_ll_encode_fns, 0, 0 },
+  { "muls.dd.hl", 191 /* xt_iclass_mac16a_dd */,
+    0,
+    Opcode_muls_dd_hl_encode_fns, 0, 0 },
+  { "muls.dd.lh", 191 /* xt_iclass_mac16a_dd */,
+    0,
+    Opcode_muls_dd_lh_encode_fns, 0, 0 },
+  { "muls.dd.hh", 191 /* xt_iclass_mac16a_dd */,
+    0,
+    Opcode_muls_dd_hh_encode_fns, 0, 0 },
+  { "mula.da.ll.lddec", 192 /* xt_iclass_mac16al_da */,
+    0,
+    Opcode_mula_da_ll_lddec_encode_fns, 0, 0 },
+  { "mula.da.ll.ldinc", 192 /* xt_iclass_mac16al_da */,
+    0,
+    Opcode_mula_da_ll_ldinc_encode_fns, 0, 0 },
+  { "mula.da.hl.lddec", 192 /* xt_iclass_mac16al_da */,
+    0,
+    Opcode_mula_da_hl_lddec_encode_fns, 0, 0 },
+  { "mula.da.hl.ldinc", 192 /* xt_iclass_mac16al_da */,
+    0,
+    Opcode_mula_da_hl_ldinc_encode_fns, 0, 0 },
+  { "mula.da.lh.lddec", 192 /* xt_iclass_mac16al_da */,
+    0,
+    Opcode_mula_da_lh_lddec_encode_fns, 0, 0 },
+  { "mula.da.lh.ldinc", 192 /* xt_iclass_mac16al_da */,
+    0,
+    Opcode_mula_da_lh_ldinc_encode_fns, 0, 0 },
+  { "mula.da.hh.lddec", 192 /* xt_iclass_mac16al_da */,
+    0,
+    Opcode_mula_da_hh_lddec_encode_fns, 0, 0 },
+  { "mula.da.hh.ldinc", 192 /* xt_iclass_mac16al_da */,
+    0,
+    Opcode_mula_da_hh_ldinc_encode_fns, 0, 0 },
+  { "mula.dd.ll.lddec", 193 /* xt_iclass_mac16al_dd */,
+    0,
+    Opcode_mula_dd_ll_lddec_encode_fns, 0, 0 },
+  { "mula.dd.ll.ldinc", 193 /* xt_iclass_mac16al_dd */,
+    0,
+    Opcode_mula_dd_ll_ldinc_encode_fns, 0, 0 },
+  { "mula.dd.hl.lddec", 193 /* xt_iclass_mac16al_dd */,
+    0,
+    Opcode_mula_dd_hl_lddec_encode_fns, 0, 0 },
+  { "mula.dd.hl.ldinc", 193 /* xt_iclass_mac16al_dd */,
+    0,
+    Opcode_mula_dd_hl_ldinc_encode_fns, 0, 0 },
+  { "mula.dd.lh.lddec", 193 /* xt_iclass_mac16al_dd */,
+    0,
+    Opcode_mula_dd_lh_lddec_encode_fns, 0, 0 },
+  { "mula.dd.lh.ldinc", 193 /* xt_iclass_mac16al_dd */,
+    0,
+    Opcode_mula_dd_lh_ldinc_encode_fns, 0, 0 },
+  { "mula.dd.hh.lddec", 193 /* xt_iclass_mac16al_dd */,
+    0,
+    Opcode_mula_dd_hh_lddec_encode_fns, 0, 0 },
+  { "mula.dd.hh.ldinc", 193 /* xt_iclass_mac16al_dd */,
+    0,
+    Opcode_mula_dd_hh_ldinc_encode_fns, 0, 0 },
+  { "lddec", 194 /* xt_iclass_mac16_l */,
+    0,
+    Opcode_lddec_encode_fns, 0, 0 },
+  { "ldinc", 194 /* xt_iclass_mac16_l */,
+    0,
+    Opcode_ldinc_encode_fns, 0, 0 },
+  { "mul16u", 195 /* xt_iclass_mul16 */,
+    0,
+    Opcode_mul16u_encode_fns, 0, 0 },
+  { "mul16s", 195 /* xt_iclass_mul16 */,
+    0,
+    Opcode_mul16s_encode_fns, 0, 0 },
+  { "rsr.m0", 196 /* xt_iclass_rsr.m0 */,
+    0,
+    Opcode_rsr_m0_encode_fns, 0, 0 },
+  { "wsr.m0", 197 /* xt_iclass_wsr.m0 */,
+    0,
+    Opcode_wsr_m0_encode_fns, 0, 0 },
+  { "xsr.m0", 198 /* xt_iclass_xsr.m0 */,
+    0,
+    Opcode_xsr_m0_encode_fns, 0, 0 },
+  { "rsr.m1", 199 /* xt_iclass_rsr.m1 */,
+    0,
+    Opcode_rsr_m1_encode_fns, 0, 0 },
+  { "wsr.m1", 200 /* xt_iclass_wsr.m1 */,
+    0,
+    Opcode_wsr_m1_encode_fns, 0, 0 },
+  { "xsr.m1", 201 /* xt_iclass_xsr.m1 */,
+    0,
+    Opcode_xsr_m1_encode_fns, 0, 0 },
+  { "rsr.m2", 202 /* xt_iclass_rsr.m2 */,
+    0,
+    Opcode_rsr_m2_encode_fns, 0, 0 },
+  { "wsr.m2", 203 /* xt_iclass_wsr.m2 */,
+    0,
+    Opcode_wsr_m2_encode_fns, 0, 0 },
+  { "xsr.m2", 204 /* xt_iclass_xsr.m2 */,
+    0,
+    Opcode_xsr_m2_encode_fns, 0, 0 },
+  { "rsr.m3", 205 /* xt_iclass_rsr.m3 */,
+    0,
+    Opcode_rsr_m3_encode_fns, 0, 0 },
+  { "wsr.m3", 206 /* xt_iclass_wsr.m3 */,
+    0,
+    Opcode_wsr_m3_encode_fns, 0, 0 },
+  { "xsr.m3", 207 /* xt_iclass_xsr.m3 */,
+    0,
+    Opcode_xsr_m3_encode_fns, 0, 0 },
+  { "rsr.acclo", 208 /* xt_iclass_rsr.acclo */,
+    0,
+    Opcode_rsr_acclo_encode_fns, 0, 0 },
+  { "wsr.acclo", 209 /* xt_iclass_wsr.acclo */,
+    0,
+    Opcode_wsr_acclo_encode_fns, 0, 0 },
+  { "xsr.acclo", 210 /* xt_iclass_xsr.acclo */,
+    0,
+    Opcode_xsr_acclo_encode_fns, 0, 0 },
+  { "rsr.acchi", 211 /* xt_iclass_rsr.acchi */,
+    0,
+    Opcode_rsr_acchi_encode_fns, 0, 0 },
+  { "wsr.acchi", 212 /* xt_iclass_wsr.acchi */,
+    0,
+    Opcode_wsr_acchi_encode_fns, 0, 0 },
+  { "xsr.acchi", 213 /* xt_iclass_xsr.acchi */,
+    0,
+    Opcode_xsr_acchi_encode_fns, 0, 0 },
+  { "rfi", 214 /* xt_iclass_rfi */,
+    XTENSA_OPCODE_IS_JUMP,
+    Opcode_rfi_encode_fns, 0, 0 },
+  { "waiti", 215 /* xt_iclass_wait */,
+    0,
+    Opcode_waiti_encode_fns, 0, 0 },
+  { "rsr.interrupt", 216 /* xt_iclass_rsr.interrupt */,
+    0,
+    Opcode_rsr_interrupt_encode_fns, 0, 0 },
+  { "wsr.intset", 217 /* xt_iclass_wsr.intset */,
+    0,
+    Opcode_wsr_intset_encode_fns, 0, 0 },
+  { "wsr.intclear", 218 /* xt_iclass_wsr.intclear */,
+    0,
+    Opcode_wsr_intclear_encode_fns, 0, 0 },
+  { "rsr.intenable", 219 /* xt_iclass_rsr.intenable */,
+    0,
+    Opcode_rsr_intenable_encode_fns, 0, 0 },
+  { "wsr.intenable", 220 /* xt_iclass_wsr.intenable */,
+    0,
+    Opcode_wsr_intenable_encode_fns, 0, 0 },
+  { "xsr.intenable", 221 /* xt_iclass_xsr.intenable */,
+    0,
+    Opcode_xsr_intenable_encode_fns, 0, 0 },
+  { "break", 222 /* xt_iclass_break */,
+    0,
+    Opcode_break_encode_fns, 0, 0 },
+  { "break.n", 223 /* xt_iclass_break.n */,
+    0,
+    Opcode_break_n_encode_fns, 0, 0 },
+  { "rsr.dbreaka0", 224 /* xt_iclass_rsr.dbreaka0 */,
+    0,
+    Opcode_rsr_dbreaka0_encode_fns, 0, 0 },
+  { "wsr.dbreaka0", 225 /* xt_iclass_wsr.dbreaka0 */,
+    0,
+    Opcode_wsr_dbreaka0_encode_fns, 0, 0 },
+  { "xsr.dbreaka0", 226 /* xt_iclass_xsr.dbreaka0 */,
+    0,
+    Opcode_xsr_dbreaka0_encode_fns, 0, 0 },
+  { "rsr.dbreakc0", 227 /* xt_iclass_rsr.dbreakc0 */,
+    0,
+    Opcode_rsr_dbreakc0_encode_fns, 0, 0 },
+  { "wsr.dbreakc0", 228 /* xt_iclass_wsr.dbreakc0 */,
+    0,
+    Opcode_wsr_dbreakc0_encode_fns, 0, 0 },
+  { "xsr.dbreakc0", 229 /* xt_iclass_xsr.dbreakc0 */,
+    0,
+    Opcode_xsr_dbreakc0_encode_fns, 0, 0 },
+  { "rsr.dbreaka1", 230 /* xt_iclass_rsr.dbreaka1 */,
+    0,
+    Opcode_rsr_dbreaka1_encode_fns, 0, 0 },
+  { "wsr.dbreaka1", 231 /* xt_iclass_wsr.dbreaka1 */,
+    0,
+    Opcode_wsr_dbreaka1_encode_fns, 0, 0 },
+  { "xsr.dbreaka1", 232 /* xt_iclass_xsr.dbreaka1 */,
+    0,
+    Opcode_xsr_dbreaka1_encode_fns, 0, 0 },
+  { "rsr.dbreakc1", 233 /* xt_iclass_rsr.dbreakc1 */,
+    0,
+    Opcode_rsr_dbreakc1_encode_fns, 0, 0 },
+  { "wsr.dbreakc1", 234 /* xt_iclass_wsr.dbreakc1 */,
+    0,
+    Opcode_wsr_dbreakc1_encode_fns, 0, 0 },
+  { "xsr.dbreakc1", 235 /* xt_iclass_xsr.dbreakc1 */,
+    0,
+    Opcode_xsr_dbreakc1_encode_fns, 0, 0 },
+  { "rsr.ibreaka0", 236 /* xt_iclass_rsr.ibreaka0 */,
+    0,
+    Opcode_rsr_ibreaka0_encode_fns, 0, 0 },
+  { "wsr.ibreaka0", 237 /* xt_iclass_wsr.ibreaka0 */,
+    0,
+    Opcode_wsr_ibreaka0_encode_fns, 0, 0 },
+  { "xsr.ibreaka0", 238 /* xt_iclass_xsr.ibreaka0 */,
+    0,
+    Opcode_xsr_ibreaka0_encode_fns, 0, 0 },
+  { "rsr.ibreaka1", 239 /* xt_iclass_rsr.ibreaka1 */,
+    0,
+    Opcode_rsr_ibreaka1_encode_fns, 0, 0 },
+  { "wsr.ibreaka1", 240 /* xt_iclass_wsr.ibreaka1 */,
+    0,
+    Opcode_wsr_ibreaka1_encode_fns, 0, 0 },
+  { "xsr.ibreaka1", 241 /* xt_iclass_xsr.ibreaka1 */,
+    0,
+    Opcode_xsr_ibreaka1_encode_fns, 0, 0 },
+  { "rsr.ibreakenable", 242 /* xt_iclass_rsr.ibreakenable */,
+    0,
+    Opcode_rsr_ibreakenable_encode_fns, 0, 0 },
+  { "wsr.ibreakenable", 243 /* xt_iclass_wsr.ibreakenable */,
+    0,
+    Opcode_wsr_ibreakenable_encode_fns, 0, 0 },
+  { "xsr.ibreakenable", 244 /* xt_iclass_xsr.ibreakenable */,
+    0,
+    Opcode_xsr_ibreakenable_encode_fns, 0, 0 },
+  { "rsr.debugcause", 245 /* xt_iclass_rsr.debugcause */,
+    0,
+    Opcode_rsr_debugcause_encode_fns, 0, 0 },
+  { "wsr.debugcause", 246 /* xt_iclass_wsr.debugcause */,
+    0,
+    Opcode_wsr_debugcause_encode_fns, 0, 0 },
+  { "xsr.debugcause", 247 /* xt_iclass_xsr.debugcause */,
+    0,
+    Opcode_xsr_debugcause_encode_fns, 0, 0 },
+  { "rsr.icount", 248 /* xt_iclass_rsr.icount */,
+    0,
+    Opcode_rsr_icount_encode_fns, 0, 0 },
+  { "wsr.icount", 249 /* xt_iclass_wsr.icount */,
+    0,
+    Opcode_wsr_icount_encode_fns, 0, 0 },
+  { "xsr.icount", 250 /* xt_iclass_xsr.icount */,
+    0,
+    Opcode_xsr_icount_encode_fns, 0, 0 },
+  { "rsr.icountlevel", 251 /* xt_iclass_rsr.icountlevel */,
+    0,
+    Opcode_rsr_icountlevel_encode_fns, 0, 0 },
+  { "wsr.icountlevel", 252 /* xt_iclass_wsr.icountlevel */,
+    0,
+    Opcode_wsr_icountlevel_encode_fns, 0, 0 },
+  { "xsr.icountlevel", 253 /* xt_iclass_xsr.icountlevel */,
+    0,
+    Opcode_xsr_icountlevel_encode_fns, 0, 0 },
+  { "rsr.ddr", 254 /* xt_iclass_rsr.ddr */,
+    0,
+    Opcode_rsr_ddr_encode_fns, 0, 0 },
+  { "wsr.ddr", 255 /* xt_iclass_wsr.ddr */,
+    0,
+    Opcode_wsr_ddr_encode_fns, 0, 0 },
+  { "xsr.ddr", 256 /* xt_iclass_xsr.ddr */,
+    0,
+    Opcode_xsr_ddr_encode_fns, 0, 0 },
+  { "rfdo", 257 /* xt_iclass_rfdo */,
+    XTENSA_OPCODE_IS_JUMP,
+    Opcode_rfdo_encode_fns, 0, 0 },
+  { "rfdd", 258 /* xt_iclass_rfdd */,
+    XTENSA_OPCODE_IS_JUMP,
+    Opcode_rfdd_encode_fns, 0, 0 },
+  { "wsr.mmid", 259 /* xt_iclass_wsr.mmid */,
+    0,
+    Opcode_wsr_mmid_encode_fns, 0, 0 },
+  { "andb", 260 /* xt_iclass_bbool1 */,
+    0,
+    Opcode_andb_encode_fns, 0, 0 },
+  { "andbc", 260 /* xt_iclass_bbool1 */,
+    0,
+    Opcode_andbc_encode_fns, 0, 0 },
+  { "orb", 260 /* xt_iclass_bbool1 */,
+    0,
+    Opcode_orb_encode_fns, 0, 0 },
+  { "orbc", 260 /* xt_iclass_bbool1 */,
+    0,
+    Opcode_orbc_encode_fns, 0, 0 },
+  { "xorb", 260 /* xt_iclass_bbool1 */,
+    0,
+    Opcode_xorb_encode_fns, 0, 0 },
+  { "any4", 261 /* xt_iclass_bbool4 */,
+    0,
+    Opcode_any4_encode_fns, 0, 0 },
+  { "all4", 261 /* xt_iclass_bbool4 */,
+    0,
+    Opcode_all4_encode_fns, 0, 0 },
+  { "any8", 262 /* xt_iclass_bbool8 */,
+    0,
+    Opcode_any8_encode_fns, 0, 0 },
+  { "all8", 262 /* xt_iclass_bbool8 */,
+    0,
+    Opcode_all8_encode_fns, 0, 0 },
+  { "bf", 263 /* xt_iclass_bbranch */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bf_encode_fns, 0, 0 },
+  { "bt", 263 /* xt_iclass_bbranch */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bt_encode_fns, 0, 0 },
+  { "movf", 264 /* xt_iclass_bmove */,
+    0,
+    Opcode_movf_encode_fns, 0, 0 },
+  { "movt", 264 /* xt_iclass_bmove */,
+    0,
+    Opcode_movt_encode_fns, 0, 0 },
+  { "rsr.br", 265 /* xt_iclass_RSR.BR */,
+    0,
+    Opcode_rsr_br_encode_fns, 0, 0 },
+  { "wsr.br", 266 /* xt_iclass_WSR.BR */,
+    0,
+    Opcode_wsr_br_encode_fns, 0, 0 },
+  { "xsr.br", 267 /* xt_iclass_XSR.BR */,
+    0,
+    Opcode_xsr_br_encode_fns, 0, 0 },
+  { "rsr.ccount", 268 /* xt_iclass_rsr.ccount */,
+    0,
+    Opcode_rsr_ccount_encode_fns, 0, 0 },
+  { "wsr.ccount", 269 /* xt_iclass_wsr.ccount */,
+    0,
+    Opcode_wsr_ccount_encode_fns, 0, 0 },
+  { "xsr.ccount", 270 /* xt_iclass_xsr.ccount */,
+    0,
+    Opcode_xsr_ccount_encode_fns, 0, 0 },
+  { "rsr.ccompare0", 271 /* xt_iclass_rsr.ccompare0 */,
+    0,
+    Opcode_rsr_ccompare0_encode_fns, 0, 0 },
+  { "wsr.ccompare0", 272 /* xt_iclass_wsr.ccompare0 */,
+    0,
+    Opcode_wsr_ccompare0_encode_fns, 0, 0 },
+  { "xsr.ccompare0", 273 /* xt_iclass_xsr.ccompare0 */,
+    0,
+    Opcode_xsr_ccompare0_encode_fns, 0, 0 },
+  { "rsr.ccompare1", 274 /* xt_iclass_rsr.ccompare1 */,
+    0,
+    Opcode_rsr_ccompare1_encode_fns, 0, 0 },
+  { "wsr.ccompare1", 275 /* xt_iclass_wsr.ccompare1 */,
+    0,
+    Opcode_wsr_ccompare1_encode_fns, 0, 0 },
+  { "xsr.ccompare1", 276 /* xt_iclass_xsr.ccompare1 */,
+    0,
+    Opcode_xsr_ccompare1_encode_fns, 0, 0 },
+  { "rsr.ccompare2", 277 /* xt_iclass_rsr.ccompare2 */,
+    0,
+    Opcode_rsr_ccompare2_encode_fns, 0, 0 },
+  { "wsr.ccompare2", 278 /* xt_iclass_wsr.ccompare2 */,
+    0,
+    Opcode_wsr_ccompare2_encode_fns, 0, 0 },
+  { "xsr.ccompare2", 279 /* xt_iclass_xsr.ccompare2 */,
+    0,
+    Opcode_xsr_ccompare2_encode_fns, 0, 0 },
+  { "ipf", 280 /* xt_iclass_icache */,
+    0,
+    Opcode_ipf_encode_fns, 0, 0 },
+  { "ihi", 280 /* xt_iclass_icache */,
+    0,
+    Opcode_ihi_encode_fns, 0, 0 },
+  { "ipfl", 281 /* xt_iclass_icache_lock */,
+    0,
+    Opcode_ipfl_encode_fns, 0, 0 },
+  { "ihu", 281 /* xt_iclass_icache_lock */,
+    0,
+    Opcode_ihu_encode_fns, 0, 0 },
+  { "iiu", 281 /* xt_iclass_icache_lock */,
+    0,
+    Opcode_iiu_encode_fns, 0, 0 },
+  { "iii", 282 /* xt_iclass_icache_inv */,
+    0,
+    Opcode_iii_encode_fns, 0, 0 },
+  { "lict", 283 /* xt_iclass_licx */,
+    0,
+    Opcode_lict_encode_fns, 0, 0 },
+  { "licw", 283 /* xt_iclass_licx */,
+    0,
+    Opcode_licw_encode_fns, 0, 0 },
+  { "sict", 284 /* xt_iclass_sicx */,
+    0,
+    Opcode_sict_encode_fns, 0, 0 },
+  { "sicw", 284 /* xt_iclass_sicx */,
+    0,
+    Opcode_sicw_encode_fns, 0, 0 },
+  { "dhwb", 285 /* xt_iclass_dcache */,
+    0,
+    Opcode_dhwb_encode_fns, 0, 0 },
+  { "dhwbi", 285 /* xt_iclass_dcache */,
+    0,
+    Opcode_dhwbi_encode_fns, 0, 0 },
+  { "diwb", 286 /* xt_iclass_dcache_ind */,
+    0,
+    Opcode_diwb_encode_fns, 0, 0 },
+  { "diwbi", 286 /* xt_iclass_dcache_ind */,
+    0,
+    Opcode_diwbi_encode_fns, 0, 0 },
+  { "dhi", 287 /* xt_iclass_dcache_inv */,
+    0,
+    Opcode_dhi_encode_fns, 0, 0 },
+  { "dii", 287 /* xt_iclass_dcache_inv */,
+    0,
+    Opcode_dii_encode_fns, 0, 0 },
+  { "dpfr", 288 /* xt_iclass_dpf */,
+    0,
+    Opcode_dpfr_encode_fns, 0, 0 },
+  { "dpfw", 288 /* xt_iclass_dpf */,
+    0,
+    Opcode_dpfw_encode_fns, 0, 0 },
+  { "dpfro", 288 /* xt_iclass_dpf */,
+    0,
+    Opcode_dpfro_encode_fns, 0, 0 },
+  { "dpfwo", 288 /* xt_iclass_dpf */,
+    0,
+    Opcode_dpfwo_encode_fns, 0, 0 },
+  { "dpfl", 289 /* xt_iclass_dcache_lock */,
+    0,
+    Opcode_dpfl_encode_fns, 0, 0 },
+  { "dhu", 289 /* xt_iclass_dcache_lock */,
+    0,
+    Opcode_dhu_encode_fns, 0, 0 },
+  { "diu", 289 /* xt_iclass_dcache_lock */,
+    0,
+    Opcode_diu_encode_fns, 0, 0 },
+  { "sdct", 290 /* xt_iclass_sdct */,
+    0,
+    Opcode_sdct_encode_fns, 0, 0 },
+  { "ldct", 291 /* xt_iclass_ldct */,
+    0,
+    Opcode_ldct_encode_fns, 0, 0 },
+  { "wsr.ptevaddr", 292 /* xt_iclass_wsr.ptevaddr */,
+    0,
+    Opcode_wsr_ptevaddr_encode_fns, 0, 0 },
+  { "rsr.ptevaddr", 293 /* xt_iclass_rsr.ptevaddr */,
+    0,
+    Opcode_rsr_ptevaddr_encode_fns, 0, 0 },
+  { "xsr.ptevaddr", 294 /* xt_iclass_xsr.ptevaddr */,
+    0,
+    Opcode_xsr_ptevaddr_encode_fns, 0, 0 },
+  { "rsr.rasid", 295 /* xt_iclass_rsr.rasid */,
+    0,
+    Opcode_rsr_rasid_encode_fns, 0, 0 },
+  { "wsr.rasid", 296 /* xt_iclass_wsr.rasid */,
+    0,
+    Opcode_wsr_rasid_encode_fns, 0, 0 },
+  { "xsr.rasid", 297 /* xt_iclass_xsr.rasid */,
+    0,
+    Opcode_xsr_rasid_encode_fns, 0, 0 },
+  { "rsr.itlbcfg", 298 /* xt_iclass_rsr.itlbcfg */,
+    0,
+    Opcode_rsr_itlbcfg_encode_fns, 0, 0 },
+  { "wsr.itlbcfg", 299 /* xt_iclass_wsr.itlbcfg */,
+    0,
+    Opcode_wsr_itlbcfg_encode_fns, 0, 0 },
+  { "xsr.itlbcfg", 300 /* xt_iclass_xsr.itlbcfg */,
+    0,
+    Opcode_xsr_itlbcfg_encode_fns, 0, 0 },
+  { "rsr.dtlbcfg", 301 /* xt_iclass_rsr.dtlbcfg */,
+    0,
+    Opcode_rsr_dtlbcfg_encode_fns, 0, 0 },
+  { "wsr.dtlbcfg", 302 /* xt_iclass_wsr.dtlbcfg */,
+    0,
+    Opcode_wsr_dtlbcfg_encode_fns, 0, 0 },
+  { "xsr.dtlbcfg", 303 /* xt_iclass_xsr.dtlbcfg */,
+    0,
+    Opcode_xsr_dtlbcfg_encode_fns, 0, 0 },
+  { "idtlb", 304 /* xt_iclass_idtlb */,
+    0,
+    Opcode_idtlb_encode_fns, 0, 0 },
+  { "pdtlb", 305 /* xt_iclass_rdtlb */,
+    0,
+    Opcode_pdtlb_encode_fns, 0, 0 },
+  { "rdtlb0", 305 /* xt_iclass_rdtlb */,
+    0,
+    Opcode_rdtlb0_encode_fns, 0, 0 },
+  { "rdtlb1", 305 /* xt_iclass_rdtlb */,
+    0,
+    Opcode_rdtlb1_encode_fns, 0, 0 },
+  { "wdtlb", 306 /* xt_iclass_wdtlb */,
+    0,
+    Opcode_wdtlb_encode_fns, 0, 0 },
+  { "iitlb", 307 /* xt_iclass_iitlb */,
+    0,
+    Opcode_iitlb_encode_fns, 0, 0 },
+  { "pitlb", 308 /* xt_iclass_ritlb */,
+    0,
+    Opcode_pitlb_encode_fns, 0, 0 },
+  { "ritlb0", 308 /* xt_iclass_ritlb */,
+    0,
+    Opcode_ritlb0_encode_fns, 0, 0 },
+  { "ritlb1", 308 /* xt_iclass_ritlb */,
+    0,
+    Opcode_ritlb1_encode_fns, 0, 0 },
+  { "witlb", 309 /* xt_iclass_witlb */,
+    0,
+    Opcode_witlb_encode_fns, 0, 0 },
+  { "ldpte", 310 /* xt_iclass_ldpte */,
+    0,
+    Opcode_ldpte_encode_fns, 0, 0 },
+  { "hwwitlba", 311 /* xt_iclass_hwwitlba */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_hwwitlba_encode_fns, 0, 0 },
+  { "hwwdtlba", 312 /* xt_iclass_hwwdtlba */,
+    0,
+    Opcode_hwwdtlba_encode_fns, 0, 0 },
+  { "rsr.cpenable", 313 /* xt_iclass_rsr.cpenable */,
+    0,
+    Opcode_rsr_cpenable_encode_fns, 0, 0 },
+  { "wsr.cpenable", 314 /* xt_iclass_wsr.cpenable */,
+    0,
+    Opcode_wsr_cpenable_encode_fns, 0, 0 },
+  { "xsr.cpenable", 315 /* xt_iclass_xsr.cpenable */,
+    0,
+    Opcode_xsr_cpenable_encode_fns, 0, 0 },
+  { "clamps", 316 /* xt_iclass_clamp */,
+    0,
+    Opcode_clamps_encode_fns, 0, 0 },
+  { "min", 317 /* xt_iclass_minmax */,
+    0,
+    Opcode_min_encode_fns, 0, 0 },
+  { "max", 317 /* xt_iclass_minmax */,
+    0,
+    Opcode_max_encode_fns, 0, 0 },
+  { "minu", 317 /* xt_iclass_minmax */,
+    0,
+    Opcode_minu_encode_fns, 0, 0 },
+  { "maxu", 317 /* xt_iclass_minmax */,
+    0,
+    Opcode_maxu_encode_fns, 0, 0 },
+  { "nsa", 318 /* xt_iclass_nsa */,
+    0,
+    Opcode_nsa_encode_fns, 0, 0 },
+  { "nsau", 318 /* xt_iclass_nsa */,
+    0,
+    Opcode_nsau_encode_fns, 0, 0 },
+  { "sext", 319 /* xt_iclass_sx */,
+    0,
+    Opcode_sext_encode_fns, 0, 0 },
+  { "l32ai", 320 /* xt_iclass_l32ai */,
+    0,
+    Opcode_l32ai_encode_fns, 0, 0 },
+  { "s32ri", 321 /* xt_iclass_s32ri */,
+    0,
+    Opcode_s32ri_encode_fns, 0, 0 },
+  { "s32c1i", 322 /* xt_iclass_s32c1i */,
+    0,
+    Opcode_s32c1i_encode_fns, 0, 0 },
+  { "rsr.scompare1", 323 /* xt_iclass_rsr.scompare1 */,
+    0,
+    Opcode_rsr_scompare1_encode_fns, 0, 0 },
+  { "wsr.scompare1", 324 /* xt_iclass_wsr.scompare1 */,
+    0,
+    Opcode_wsr_scompare1_encode_fns, 0, 0 },
+  { "xsr.scompare1", 325 /* xt_iclass_xsr.scompare1 */,
+    0,
+    Opcode_xsr_scompare1_encode_fns, 0, 0 },
+  { "quou", 326 /* xt_iclass_div */,
+    0,
+    Opcode_quou_encode_fns, 0, 0 },
+  { "quos", 326 /* xt_iclass_div */,
+    0,
+    Opcode_quos_encode_fns, 0, 0 },
+  { "remu", 326 /* xt_iclass_div */,
+    0,
+    Opcode_remu_encode_fns, 0, 0 },
+  { "rems", 326 /* xt_iclass_div */,
+    0,
+    Opcode_rems_encode_fns, 0, 0 },
+  { "mull", 327 /* xt_mul32 */,
+    0,
+    Opcode_mull_encode_fns, 0, 0 },
+  { "muluh", 327 /* xt_mul32 */,
+    0,
+    Opcode_muluh_encode_fns, 0, 0 },
+  { "mulsh", 327 /* xt_mul32 */,
+    0,
+    Opcode_mulsh_encode_fns, 0, 0 },
+  { "rur.fcr", 328 /* rur_fcr */,
+    0,
+    Opcode_rur_fcr_encode_fns, 0, 0 },
+  { "wur.fcr", 329 /* wur_fcr */,
+    0,
+    Opcode_wur_fcr_encode_fns, 0, 0 },
+  { "rur.fsr", 330 /* rur_fsr */,
+    0,
+    Opcode_rur_fsr_encode_fns, 0, 0 },
+  { "wur.fsr", 331 /* wur_fsr */,
+    0,
+    Opcode_wur_fsr_encode_fns, 0, 0 },
+  { "add.s", 332 /* fp */,
+    0,
+    Opcode_add_s_encode_fns, 0, 0 },
+  { "sub.s", 332 /* fp */,
+    0,
+    Opcode_sub_s_encode_fns, 0, 0 },
+  { "mul.s", 332 /* fp */,
+    0,
+    Opcode_mul_s_encode_fns, 0, 0 },
+  { "madd.s", 333 /* fp_mac */,
+    0,
+    Opcode_madd_s_encode_fns, 0, 0 },
+  { "msub.s", 333 /* fp_mac */,
+    0,
+    Opcode_msub_s_encode_fns, 0, 0 },
+  { "movf.s", 334 /* fp_cmov */,
+    0,
+    Opcode_movf_s_encode_fns, 0, 0 },
+  { "movt.s", 334 /* fp_cmov */,
+    0,
+    Opcode_movt_s_encode_fns, 0, 0 },
+  { "moveqz.s", 335 /* fp_mov */,
+    0,
+    Opcode_moveqz_s_encode_fns, 0, 0 },
+  { "movnez.s", 335 /* fp_mov */,
+    0,
+    Opcode_movnez_s_encode_fns, 0, 0 },
+  { "movltz.s", 335 /* fp_mov */,
+    0,
+    Opcode_movltz_s_encode_fns, 0, 0 },
+  { "movgez.s", 335 /* fp_mov */,
+    0,
+    Opcode_movgez_s_encode_fns, 0, 0 },
+  { "abs.s", 336 /* fp_mov2 */,
+    0,
+    Opcode_abs_s_encode_fns, 0, 0 },
+  { "mov.s", 336 /* fp_mov2 */,
+    0,
+    Opcode_mov_s_encode_fns, 0, 0 },
+  { "neg.s", 336 /* fp_mov2 */,
+    0,
+    Opcode_neg_s_encode_fns, 0, 0 },
+  { "un.s", 337 /* fp_cmp */,
+    0,
+    Opcode_un_s_encode_fns, 0, 0 },
+  { "oeq.s", 337 /* fp_cmp */,
+    0,
+    Opcode_oeq_s_encode_fns, 0, 0 },
+  { "ueq.s", 337 /* fp_cmp */,
+    0,
+    Opcode_ueq_s_encode_fns, 0, 0 },
+  { "olt.s", 337 /* fp_cmp */,
+    0,
+    Opcode_olt_s_encode_fns, 0, 0 },
+  { "ult.s", 337 /* fp_cmp */,
+    0,
+    Opcode_ult_s_encode_fns, 0, 0 },
+  { "ole.s", 337 /* fp_cmp */,
+    0,
+    Opcode_ole_s_encode_fns, 0, 0 },
+  { "ule.s", 337 /* fp_cmp */,
+    0,
+    Opcode_ule_s_encode_fns, 0, 0 },
+  { "float.s", 338 /* fp_float */,
+    0,
+    Opcode_float_s_encode_fns, 0, 0 },
+  { "ufloat.s", 338 /* fp_float */,
+    0,
+    Opcode_ufloat_s_encode_fns, 0, 0 },
+  { "round.s", 339 /* fp_int */,
+    0,
+    Opcode_round_s_encode_fns, 0, 0 },
+  { "ceil.s", 339 /* fp_int */,
+    0,
+    Opcode_ceil_s_encode_fns, 0, 0 },
+  { "floor.s", 339 /* fp_int */,
+    0,
+    Opcode_floor_s_encode_fns, 0, 0 },
+  { "trunc.s", 339 /* fp_int */,
+    0,
+    Opcode_trunc_s_encode_fns, 0, 0 },
+  { "utrunc.s", 339 /* fp_int */,
+    0,
+    Opcode_utrunc_s_encode_fns, 0, 0 },
+  { "rfr", 340 /* fp_rfr */,
+    0,
+    Opcode_rfr_encode_fns, 0, 0 },
+  { "wfr", 341 /* fp_wfr */,
+    0,
+    Opcode_wfr_encode_fns, 0, 0 },
+  { "lsi", 342 /* fp_lsi */,
+    0,
+    Opcode_lsi_encode_fns, 0, 0 },
+  { "lsiu", 343 /* fp_lsiu */,
+    0,
+    Opcode_lsiu_encode_fns, 0, 0 },
+  { "lsx", 344 /* fp_lsx */,
+    0,
+    Opcode_lsx_encode_fns, 0, 0 },
+  { "lsxu", 345 /* fp_lsxu */,
+    0,
+    Opcode_lsxu_encode_fns, 0, 0 },
+  { "ssi", 346 /* fp_ssi */,
+    0,
+    Opcode_ssi_encode_fns, 0, 0 },
+  { "ssiu", 347 /* fp_ssiu */,
+    0,
+    Opcode_ssiu_encode_fns, 0, 0 },
+  { "ssx", 348 /* fp_ssx */,
+    0,
+    Opcode_ssx_encode_fns, 0, 0 },
+  { "ssxu", 349 /* fp_ssxu */,
+    0,
+    Opcode_ssxu_encode_fns, 0, 0 },
+  { "beqz.w18", 350 /* xt_iclass_wb18_0 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_beqz_w18_encode_fns, 0, 0 },
+  { "bnez.w18", 350 /* xt_iclass_wb18_0 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bnez_w18_encode_fns, 0, 0 },
+  { "bgez.w18", 350 /* xt_iclass_wb18_0 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bgez_w18_encode_fns, 0, 0 },
+  { "bltz.w18", 350 /* xt_iclass_wb18_0 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bltz_w18_encode_fns, 0, 0 },
+  { "beqi.w18", 351 /* xt_iclass_wb18_1 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_beqi_w18_encode_fns, 0, 0 },
+  { "bnei.w18", 351 /* xt_iclass_wb18_1 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bnei_w18_encode_fns, 0, 0 },
+  { "bgei.w18", 351 /* xt_iclass_wb18_1 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bgei_w18_encode_fns, 0, 0 },
+  { "blti.w18", 351 /* xt_iclass_wb18_1 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_blti_w18_encode_fns, 0, 0 },
+  { "bgeui.w18", 352 /* xt_iclass_wb18_2 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bgeui_w18_encode_fns, 0, 0 },
+  { "bltui.w18", 352 /* xt_iclass_wb18_2 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bltui_w18_encode_fns, 0, 0 },
+  { "bbci.w18", 353 /* xt_iclass_wb18_3 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bbci_w18_encode_fns, 0, 0 },
+  { "bbsi.w18", 353 /* xt_iclass_wb18_3 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bbsi_w18_encode_fns, 0, 0 },
+  { "beq.w18", 354 /* xt_iclass_wb18_4 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_beq_w18_encode_fns, 0, 0 },
+  { "bne.w18", 354 /* xt_iclass_wb18_4 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bne_w18_encode_fns, 0, 0 },
+  { "bge.w18", 354 /* xt_iclass_wb18_4 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bge_w18_encode_fns, 0, 0 },
+  { "blt.w18", 354 /* xt_iclass_wb18_4 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_blt_w18_encode_fns, 0, 0 },
+  { "bgeu.w18", 354 /* xt_iclass_wb18_4 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bgeu_w18_encode_fns, 0, 0 },
+  { "bltu.w18", 354 /* xt_iclass_wb18_4 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bltu_w18_encode_fns, 0, 0 },
+  { "bany.w18", 354 /* xt_iclass_wb18_4 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bany_w18_encode_fns, 0, 0 },
+  { "bnone.w18", 354 /* xt_iclass_wb18_4 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bnone_w18_encode_fns, 0, 0 },
+  { "ball.w18", 354 /* xt_iclass_wb18_4 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_ball_w18_encode_fns, 0, 0 },
+  { "bnall.w18", 354 /* xt_iclass_wb18_4 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bnall_w18_encode_fns, 0, 0 },
+  { "bbc.w18", 354 /* xt_iclass_wb18_4 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bbc_w18_encode_fns, 0, 0 },
+  { "bbs.w18", 354 /* xt_iclass_wb18_4 */,
+    XTENSA_OPCODE_IS_BRANCH,
+    Opcode_bbs_w18_encode_fns, 0, 0 }
+};
+
+
+/* Slot-specific opcode decode functions.  */
+
+static int
+Slot_inst_decode (const xtensa_insnbuf insn)
+{
+  switch (Field_op0_Slot_inst_get (insn))
+    {
+    case 0:
+      switch (Field_op1_Slot_inst_get (insn))
+	{
+	case 0:
+	  switch (Field_op2_Slot_inst_get (insn))
+	    {
+	    case 0:
+	      switch (Field_r_Slot_inst_get (insn))
+		{
+		case 0:
+		  switch (Field_m_Slot_inst_get (insn))
+		    {
+		    case 0:
+		      if (Field_s_Slot_inst_get (insn) == 0 &&
+			  Field_n_Slot_inst_get (insn) == 0)
+			return 79; /* ill */
+		      break;
+		    case 2:
+		      switch (Field_n_Slot_inst_get (insn))
+			{
+			case 0:
+			  return 98; /* ret */
+			case 1:
+			  return 14; /* retw */
+			case 2:
+			  return 81; /* jx */
+			}
+		      break;
+		    case 3:
+		      switch (Field_n_Slot_inst_get (insn))
+			{
+			case 0:
+			  return 77; /* callx0 */
+			case 1:
+			  return 10; /* callx4 */
+			case 2:
+			  return 9; /* callx8 */
+			case 3:
+			  return 8; /* callx12 */
+			}
+		      break;
+		    }
+		  break;
+		case 1:
+		  return 12; /* movsp */
+		case 2:
+		  if (Field_s_Slot_inst_get (insn) == 0)
+		    {
+		      switch (Field_t_Slot_inst_get (insn))
+			{
+			case 0:
+			  return 116; /* isync */
+			case 1:
+			  return 117; /* rsync */
+			case 2:
+			  return 118; /* esync */
+			case 3:
+			  return 119; /* dsync */
+			case 8:
+			  return 0; /* excw */
+			case 12:
+			  return 114; /* memw */
+			case 13:
+			  return 115; /* extw */
+			case 15:
+			  return 97; /* nop */
+			}
+		    }
+		  break;
+		case 3:
+		  switch (Field_t_Slot_inst_get (insn))
+		    {
+		    case 0:
+		      switch (Field_s_Slot_inst_get (insn))
+			{
+			case 0:
+			  return 1; /* rfe */
+			case 2:
+			  return 2; /* rfde */
+			case 4:
+			  return 16; /* rfwo */
+			case 5:
+			  return 17; /* rfwu */
+			}
+		      break;
+		    case 1:
+		      return 316; /* rfi */
+		    }
+		  break;
+		case 4:
+		  return 324; /* break */
+		case 5:
+		  switch (Field_s_Slot_inst_get (insn))
+		    {
+		    case 0:
+		      if (Field_t_Slot_inst_get (insn) == 0)
+			return 3; /* syscall */
+		      break;
+		    case 1:
+		      if (Field_t_Slot_inst_get (insn) == 0)
+			return 4; /* simcall */
+		      break;
+		    }
+		  break;
+		case 6:
+		  return 120; /* rsil */
+		case 7:
+		  if (Field_t_Slot_inst_get (insn) == 0)
+		    return 317; /* waiti */
+		  break;
+		case 8:
+		  return 367; /* any4 */
+		case 9:
+		  return 368; /* all4 */
+		case 10:
+		  return 369; /* any8 */
+		case 11:
+		  return 370; /* all8 */
+		}
+	      break;
+	    case 1:
+	      return 49; /* and */
+	    case 2:
+	      return 50; /* or */
+	    case 3:
+	      return 51; /* xor */
+	    case 4:
+	      switch (Field_r_Slot_inst_get (insn))
+		{
+		case 0:
+		  if (Field_t_Slot_inst_get (insn) == 0)
+		    return 102; /* ssr */
+		  break;
+		case 1:
+		  if (Field_t_Slot_inst_get (insn) == 0)
+		    return 103; /* ssl */
+		  break;
+		case 2:
+		  if (Field_t_Slot_inst_get (insn) == 0)
+		    return 104; /* ssa8l */
+		  break;
+		case 3:
+		  if (Field_t_Slot_inst_get (insn) == 0)
+		    return 105; /* ssa8b */
+		  break;
+		case 4:
+		  if (Field_thi3_Slot_inst_get (insn) == 0)
+		    return 106; /* ssai */
+		  break;
+		case 8:
+		  if (Field_s_Slot_inst_get (insn) == 0)
+		    return 13; /* rotw */
+		  break;
+		case 14:
+		  return 448; /* nsa */
+		case 15:
+		  return 449; /* nsau */
+		}
+	      break;
+	    case 5:
+	      switch (Field_r_Slot_inst_get (insn))
+		{
+		case 1:
+		  return 438; /* hwwitlba */
+		case 3:
+		  return 434; /* ritlb0 */
+		case 4:
+		  if (Field_t_Slot_inst_get (insn) == 0)
+		    return 432; /* iitlb */
+		  break;
+		case 5:
+		  return 433; /* pitlb */
+		case 6:
+		  return 436; /* witlb */
+		case 7:
+		  return 435; /* ritlb1 */
+		case 9:
+		  return 439; /* hwwdtlba */
+		case 11:
+		  return 429; /* rdtlb0 */
+		case 12:
+		  if (Field_t_Slot_inst_get (insn) == 0)
+		    return 427; /* idtlb */
+		  break;
+		case 13:
+		  return 428; /* pdtlb */
+		case 14:
+		  return 431; /* wdtlb */
+		case 15:
+		  return 430; /* rdtlb1 */
+		}
+	      break;
+	    case 6:
+	      switch (Field_s_Slot_inst_get (insn))
+		{
+		case 0:
+		  return 95; /* neg */
+		case 1:
+		  return 96; /* abs */
+		}
+	      break;
+	    case 8:
+	      return 41; /* add */
+	    case 9:
+	      return 43; /* addx2 */
+	    case 10:
+	      return 44; /* addx4 */
+	    case 11:
+	      return 45; /* addx8 */
+	    case 12:
+	      return 42; /* sub */
+	    case 13:
+	      return 46; /* subx2 */
+	    case 14:
+	      return 47; /* subx4 */
+	    case 15:
+	      return 48; /* subx8 */
+	    }
+	  break;
+	case 1:
+	  switch (Field_op2_Slot_inst_get (insn))
+	    {
+	    case 0:
+	    case 1:
+	      return 111; /* slli */
+	    case 2:
+	    case 3:
+	      return 112; /* srai */
+	    case 4:
+	      return 113; /* srli */
+	    case 6:
+	      switch (Field_sr_Slot_inst_get (insn))
+		{
+		case 0:
+		  return 129; /* xsr.lbeg */
+		case 1:
+		  return 123; /* xsr.lend */
+		case 2:
+		  return 126; /* xsr.lcount */
+		case 3:
+		  return 132; /* xsr.sar */
+		case 4:
+		  return 377; /* xsr.br */
+		case 5:
+		  return 135; /* xsr.litbase */
+		case 12:
+		  return 456; /* xsr.scompare1 */
+		case 16:
+		  return 312; /* xsr.acclo */
+		case 17:
+		  return 315; /* xsr.acchi */
+		case 32:
+		  return 300; /* xsr.m0 */
+		case 33:
+		  return 303; /* xsr.m1 */
+		case 34:
+		  return 306; /* xsr.m2 */
+		case 35:
+		  return 309; /* xsr.m3 */
+		case 72:
+		  return 22; /* xsr.windowbase */
+		case 73:
+		  return 25; /* xsr.windowstart */
+		case 83:
+		  return 417; /* xsr.ptevaddr */
+		case 90:
+		  return 420; /* xsr.rasid */
+		case 91:
+		  return 423; /* xsr.itlbcfg */
+		case 92:
+		  return 426; /* xsr.dtlbcfg */
+		case 96:
+		  return 346; /* xsr.ibreakenable */
+		case 104:
+		  return 358; /* xsr.ddr */
+		case 128:
+		  return 340; /* xsr.ibreaka0 */
+		case 129:
+		  return 343; /* xsr.ibreaka1 */
+		case 144:
+		  return 328; /* xsr.dbreaka0 */
+		case 145:
+		  return 334; /* xsr.dbreaka1 */
+		case 160:
+		  return 331; /* xsr.dbreakc0 */
+		case 161:
+		  return 337; /* xsr.dbreakc1 */
+		case 177:
+		  return 143; /* xsr.epc1 */
+		case 178:
+		  return 149; /* xsr.epc2 */
+		case 179:
+		  return 155; /* xsr.epc3 */
+		case 180:
+		  return 161; /* xsr.epc4 */
+		case 181:
+		  return 167; /* xsr.epc5 */
+		case 182:
+		  return 173; /* xsr.epc6 */
+		case 183:
+		  return 179; /* xsr.epc7 */
+		case 192:
+		  return 206; /* xsr.depc */
+		case 194:
+		  return 185; /* xsr.eps2 */
+		case 195:
+		  return 188; /* xsr.eps3 */
+		case 196:
+		  return 191; /* xsr.eps4 */
+		case 197:
+		  return 194; /* xsr.eps5 */
+		case 198:
+		  return 197; /* xsr.eps6 */
+		case 199:
+		  return 200; /* xsr.eps7 */
+		case 209:
+		  return 146; /* xsr.excsave1 */
+		case 210:
+		  return 152; /* xsr.excsave2 */
+		case 211:
+		  return 158; /* xsr.excsave3 */
+		case 212:
+		  return 164; /* xsr.excsave4 */
+		case 213:
+		  return 170; /* xsr.excsave5 */
+		case 214:
+		  return 176; /* xsr.excsave6 */
+		case 215:
+		  return 182; /* xsr.excsave7 */
+		case 224:
+		  return 442; /* xsr.cpenable */
+		case 228:
+		  return 323; /* xsr.intenable */
+		case 230:
+		  return 140; /* xsr.ps */
+		case 231:
+		  return 225; /* xsr.vecbase */
+		case 232:
+		  return 209; /* xsr.exccause */
+		case 233:
+		  return 349; /* xsr.debugcause */
+		case 234:
+		  return 380; /* xsr.ccount */
+		case 236:
+		  return 352; /* xsr.icount */
+		case 237:
+		  return 355; /* xsr.icountlevel */
+		case 238:
+		  return 203; /* xsr.excvaddr */
+		case 240:
+		  return 383; /* xsr.ccompare0 */
+		case 241:
+		  return 386; /* xsr.ccompare1 */
+		case 242:
+		  return 389; /* xsr.ccompare2 */
+		case 244:
+		  return 212; /* xsr.misc0 */
+		case 245:
+		  return 215; /* xsr.misc1 */
+		case 246:
+		  return 218; /* xsr.misc2 */
+		case 247:
+		  return 221; /* xsr.misc3 */
+		}
+	      break;
+	    case 8:
+	      return 108; /* src */
+	    case 9:
+	      if (Field_s_Slot_inst_get (insn) == 0)
+		return 109; /* srl */
+	      break;
+	    case 10:
+	      if (Field_t_Slot_inst_get (insn) == 0)
+		return 107; /* sll */
+	      break;
+	    case 11:
+	      if (Field_s_Slot_inst_get (insn) == 0)
+		return 110; /* sra */
+	      break;
+	    case 12:
+	      return 296; /* mul16u */
+	    case 13:
+	      return 297; /* mul16s */
+	    case 15:
+	      switch (Field_r_Slot_inst_get (insn))
+		{
+		case 0:
+		  return 396; /* lict */
+		case 1:
+		  return 398; /* sict */
+		case 2:
+		  return 397; /* licw */
+		case 3:
+		  return 399; /* sicw */
+		case 8:
+		  return 414; /* ldct */
+		case 9:
+		  return 413; /* sdct */
+		case 14:
+		  if (Field_t_Slot_inst_get (insn) == 0)
+		    return 359; /* rfdo */
+		  if (Field_t_Slot_inst_get (insn) == 1)
+		    return 360; /* rfdd */
+		  break;
+		case 15:
+		  return 437; /* ldpte */
+		}
+	      break;
+	    }
+	  break;
+	case 2:
+	  switch (Field_op2_Slot_inst_get (insn))
+	    {
+	    case 0:
+	      return 362; /* andb */
+	    case 1:
+	      return 363; /* andbc */
+	    case 2:
+	      return 364; /* orb */
+	    case 3:
+	      return 365; /* orbc */
+	    case 4:
+	      return 366; /* xorb */
+	    case 8:
+	      return 461; /* mull */
+	    case 10:
+	      return 462; /* muluh */
+	    case 11:
+	      return 463; /* mulsh */
+	    case 12:
+	      return 457; /* quou */
+	    case 13:
+	      return 458; /* quos */
+	    case 14:
+	      return 459; /* remu */
+	    case 15:
+	      return 460; /* rems */
+	    }
+	  break;
+	case 3:
+	  switch (Field_op2_Slot_inst_get (insn))
+	    {
+	    case 0:
+	      switch (Field_sr_Slot_inst_get (insn))
+		{
+		case 0:
+		  return 127; /* rsr.lbeg */
+		case 1:
+		  return 121; /* rsr.lend */
+		case 2:
+		  return 124; /* rsr.lcount */
+		case 3:
+		  return 130; /* rsr.sar */
+		case 4:
+		  return 375; /* rsr.br */
+		case 5:
+		  return 133; /* rsr.litbase */
+		case 12:
+		  return 454; /* rsr.scompare1 */
+		case 16:
+		  return 310; /* rsr.acclo */
+		case 17:
+		  return 313; /* rsr.acchi */
+		case 32:
+		  return 298; /* rsr.m0 */
+		case 33:
+		  return 301; /* rsr.m1 */
+		case 34:
+		  return 304; /* rsr.m2 */
+		case 35:
+		  return 307; /* rsr.m3 */
+		case 72:
+		  return 20; /* rsr.windowbase */
+		case 73:
+		  return 23; /* rsr.windowstart */
+		case 83:
+		  return 416; /* rsr.ptevaddr */
+		case 90:
+		  return 418; /* rsr.rasid */
+		case 91:
+		  return 421; /* rsr.itlbcfg */
+		case 92:
+		  return 424; /* rsr.dtlbcfg */
+		case 96:
+		  return 344; /* rsr.ibreakenable */
+		case 104:
+		  return 356; /* rsr.ddr */
+		case 128:
+		  return 338; /* rsr.ibreaka0 */
+		case 129:
+		  return 341; /* rsr.ibreaka1 */
+		case 144:
+		  return 326; /* rsr.dbreaka0 */
+		case 145:
+		  return 332; /* rsr.dbreaka1 */
+		case 160:
+		  return 329; /* rsr.dbreakc0 */
+		case 161:
+		  return 335; /* rsr.dbreakc1 */
+		case 176:
+		  return 136; /* rsr.176 */
+		case 177:
+		  return 141; /* rsr.epc1 */
+		case 178:
+		  return 147; /* rsr.epc2 */
+		case 179:
+		  return 153; /* rsr.epc3 */
+		case 180:
+		  return 159; /* rsr.epc4 */
+		case 181:
+		  return 165; /* rsr.epc5 */
+		case 182:
+		  return 171; /* rsr.epc6 */
+		case 183:
+		  return 177; /* rsr.epc7 */
+		case 192:
+		  return 204; /* rsr.depc */
+		case 194:
+		  return 183; /* rsr.eps2 */
+		case 195:
+		  return 186; /* rsr.eps3 */
+		case 196:
+		  return 189; /* rsr.eps4 */
+		case 197:
+		  return 192; /* rsr.eps5 */
+		case 198:
+		  return 195; /* rsr.eps6 */
+		case 199:
+		  return 198; /* rsr.eps7 */
+		case 208:
+		  return 137; /* rsr.208 */
+		case 209:
+		  return 144; /* rsr.excsave1 */
+		case 210:
+		  return 150; /* rsr.excsave2 */
+		case 211:
+		  return 156; /* rsr.excsave3 */
+		case 212:
+		  return 162; /* rsr.excsave4 */
+		case 213:
+		  return 168; /* rsr.excsave5 */
+		case 214:
+		  return 174; /* rsr.excsave6 */
+		case 215:
+		  return 180; /* rsr.excsave7 */
+		case 224:
+		  return 440; /* rsr.cpenable */
+		case 226:
+		  return 318; /* rsr.interrupt */
+		case 228:
+		  return 321; /* rsr.intenable */
+		case 230:
+		  return 138; /* rsr.ps */
+		case 231:
+		  return 223; /* rsr.vecbase */
+		case 232:
+		  return 207; /* rsr.exccause */
+		case 233:
+		  return 347; /* rsr.debugcause */
+		case 234:
+		  return 378; /* rsr.ccount */
+		case 235:
+		  return 222; /* rsr.prid */
+		case 236:
+		  return 350; /* rsr.icount */
+		case 237:
+		  return 353; /* rsr.icountlevel */
+		case 238:
+		  return 201; /* rsr.excvaddr */
+		case 240:
+		  return 381; /* rsr.ccompare0 */
+		case 241:
+		  return 384; /* rsr.ccompare1 */
+		case 242:
+		  return 387; /* rsr.ccompare2 */
+		case 244:
+		  return 210; /* rsr.misc0 */
+		case 245:
+		  return 213; /* rsr.misc1 */
+		case 246:
+		  return 216; /* rsr.misc2 */
+		case 247:
+		  return 219; /* rsr.misc3 */
+		}
+	      break;
+	    case 1:
+	      switch (Field_sr_Slot_inst_get (insn))
+		{
+		case 0:
+		  return 128; /* wsr.lbeg */
+		case 1:
+		  return 122; /* wsr.lend */
+		case 2:
+		  return 125; /* wsr.lcount */
+		case 3:
+		  return 131; /* wsr.sar */
+		case 4:
+		  return 376; /* wsr.br */
+		case 5:
+		  return 134; /* wsr.litbase */
+		case 12:
+		  return 455; /* wsr.scompare1 */
+		case 16:
+		  return 311; /* wsr.acclo */
+		case 17:
+		  return 314; /* wsr.acchi */
+		case 32:
+		  return 299; /* wsr.m0 */
+		case 33:
+		  return 302; /* wsr.m1 */
+		case 34:
+		  return 305; /* wsr.m2 */
+		case 35:
+		  return 308; /* wsr.m3 */
+		case 72:
+		  return 21; /* wsr.windowbase */
+		case 73:
+		  return 24; /* wsr.windowstart */
+		case 83:
+		  return 415; /* wsr.ptevaddr */
+		case 89:
+		  return 361; /* wsr.mmid */
+		case 90:
+		  return 419; /* wsr.rasid */
+		case 91:
+		  return 422; /* wsr.itlbcfg */
+		case 92:
+		  return 425; /* wsr.dtlbcfg */
+		case 96:
+		  return 345; /* wsr.ibreakenable */
+		case 104:
+		  return 357; /* wsr.ddr */
+		case 128:
+		  return 339; /* wsr.ibreaka0 */
+		case 129:
+		  return 342; /* wsr.ibreaka1 */
+		case 144:
+		  return 327; /* wsr.dbreaka0 */
+		case 145:
+		  return 333; /* wsr.dbreaka1 */
+		case 160:
+		  return 330; /* wsr.dbreakc0 */
+		case 161:
+		  return 336; /* wsr.dbreakc1 */
+		case 177:
+		  return 142; /* wsr.epc1 */
+		case 178:
+		  return 148; /* wsr.epc2 */
+		case 179:
+		  return 154; /* wsr.epc3 */
+		case 180:
+		  return 160; /* wsr.epc4 */
+		case 181:
+		  return 166; /* wsr.epc5 */
+		case 182:
+		  return 172; /* wsr.epc6 */
+		case 183:
+		  return 178; /* wsr.epc7 */
+		case 192:
+		  return 205; /* wsr.depc */
+		case 194:
+		  return 184; /* wsr.eps2 */
+		case 195:
+		  return 187; /* wsr.eps3 */
+		case 196:
+		  return 190; /* wsr.eps4 */
+		case 197:
+		  return 193; /* wsr.eps5 */
+		case 198:
+		  return 196; /* wsr.eps6 */
+		case 199:
+		  return 199; /* wsr.eps7 */
+		case 209:
+		  return 145; /* wsr.excsave1 */
+		case 210:
+		  return 151; /* wsr.excsave2 */
+		case 211:
+		  return 157; /* wsr.excsave3 */
+		case 212:
+		  return 163; /* wsr.excsave4 */
+		case 213:
+		  return 169; /* wsr.excsave5 */
+		case 214:
+		  return 175; /* wsr.excsave6 */
+		case 215:
+		  return 181; /* wsr.excsave7 */
+		case 224:
+		  return 441; /* wsr.cpenable */
+		case 226:
+		  return 319; /* wsr.intset */
+		case 227:
+		  return 320; /* wsr.intclear */
+		case 228:
+		  return 322; /* wsr.intenable */
+		case 230:
+		  return 139; /* wsr.ps */
+		case 231:
+		  return 224; /* wsr.vecbase */
+		case 232:
+		  return 208; /* wsr.exccause */
+		case 233:
+		  return 348; /* wsr.debugcause */
+		case 234:
+		  return 379; /* wsr.ccount */
+		case 236:
+		  return 351; /* wsr.icount */
+		case 237:
+		  return 354; /* wsr.icountlevel */
+		case 238:
+		  return 202; /* wsr.excvaddr */
+		case 240:
+		  return 382; /* wsr.ccompare0 */
+		case 241:
+		  return 385; /* wsr.ccompare1 */
+		case 242:
+		  return 388; /* wsr.ccompare2 */
+		case 244:
+		  return 211; /* wsr.misc0 */
+		case 245:
+		  return 214; /* wsr.misc1 */
+		case 246:
+		  return 217; /* wsr.misc2 */
+		case 247:
+		  return 220; /* wsr.misc3 */
+		}
+	      break;
+	    case 2:
+	      return 450; /* sext */
+	    case 3:
+	      return 443; /* clamps */
+	    case 4:
+	      return 444; /* min */
+	    case 5:
+	      return 445; /* max */
+	    case 6:
+	      return 446; /* minu */
+	    case 7:
+	      return 447; /* maxu */
+	    case 8:
+	      return 91; /* moveqz */
+	    case 9:
+	      return 92; /* movnez */
+	    case 10:
+	      return 93; /* movltz */
+	    case 11:
+	      return 94; /* movgez */
+	    case 12:
+	      return 373; /* movf */
+	    case 13:
+	      return 374; /* movt */
+	    case 14:
+	      switch (Field_st_Slot_inst_get (insn))
+		{
+		case 231:
+		  return 37; /* rur.threadptr */
+		case 232:
+		  return 464; /* rur.fcr */
+		case 233:
+		  return 466; /* rur.fsr */
+		}
+	      break;
+	    case 15:
+	      switch (Field_sr_Slot_inst_get (insn))
+		{
+		case 231:
+		  return 38; /* wur.threadptr */
+		case 232:
+		  return 465; /* wur.fcr */
+		case 233:
+		  return 467; /* wur.fsr */
+		}
+	      break;
+	    }
+	  break;
+	case 4:
+	case 5:
+	  return 78; /* extui */
+	case 8:
+	  switch (Field_op2_Slot_inst_get (insn))
+	    {
+	    case 0:
+	      return 500; /* lsx */
+	    case 1:
+	      return 501; /* lsxu */
+	    case 4:
+	      return 504; /* ssx */
+	    case 5:
+	      return 505; /* ssxu */
+	    }
+	  break;
+	case 9:
+	  switch (Field_op2_Slot_inst_get (insn))
+	    {
+	    case 0:
+	      return 18; /* l32e */
+	    case 4:
+	      return 19; /* s32e */
+	    }
+	  break;
+	case 10:
+	  switch (Field_op2_Slot_inst_get (insn))
+	    {
+	    case 0:
+	      return 468; /* add.s */
+	    case 1:
+	      return 469; /* sub.s */
+	    case 2:
+	      return 470; /* mul.s */
+	    case 4:
+	      return 471; /* madd.s */
+	    case 5:
+	      return 472; /* msub.s */
+	    case 8:
+	      return 491; /* round.s */
+	    case 9:
+	      return 494; /* trunc.s */
+	    case 10:
+	      return 493; /* floor.s */
+	    case 11:
+	      return 492; /* ceil.s */
+	    case 12:
+	      return 489; /* float.s */
+	    case 13:
+	      return 490; /* ufloat.s */
+	    case 14:
+	      return 495; /* utrunc.s */
+	    case 15:
+	      switch (Field_t_Slot_inst_get (insn))
+		{
+		case 0:
+		  return 480; /* mov.s */
+		case 1:
+		  return 479; /* abs.s */
+		case 4:
+		  return 496; /* rfr */
+		case 5:
+		  return 497; /* wfr */
+		case 6:
+		  return 481; /* neg.s */
+		}
+	      break;
+	    }
+	  break;
+	case 11:
+	  switch (Field_op2_Slot_inst_get (insn))
+	    {
+	    case 1:
+	      return 482; /* un.s */
+	    case 2:
+	      return 483; /* oeq.s */
+	    case 3:
+	      return 484; /* ueq.s */
+	    case 4:
+	      return 485; /* olt.s */
+	    case 5:
+	      return 486; /* ult.s */
+	    case 6:
+	      return 487; /* ole.s */
+	    case 7:
+	      return 488; /* ule.s */
+	    case 8:
+	      return 475; /* moveqz.s */
+	    case 9:
+	      return 476; /* movnez.s */
+	    case 10:
+	      return 477; /* movltz.s */
+	    case 11:
+	      return 478; /* movgez.s */
+	    case 12:
+	      return 473; /* movf.s */
+	    case 13:
+	      return 474; /* movt.s */
+	    }
+	  break;
+	}
+      break;
+    case 1:
+      return 85; /* l32r */
+    case 2:
+      switch (Field_r_Slot_inst_get (insn))
+	{
+	case 0:
+	  return 86; /* l8ui */
+	case 1:
+	  return 82; /* l16ui */
+	case 2:
+	  return 84; /* l32i */
+	case 4:
+	  return 101; /* s8i */
+	case 5:
+	  return 99; /* s16i */
+	case 6:
+	  return 100; /* s32i */
+	case 7:
+	  switch (Field_t_Slot_inst_get (insn))
+	    {
+	    case 0:
+	      return 406; /* dpfr */
+	    case 1:
+	      return 407; /* dpfw */
+	    case 2:
+	      return 408; /* dpfro */
+	    case 3:
+	      return 409; /* dpfwo */
+	    case 4:
+	      return 400; /* dhwb */
+	    case 5:
+	      return 401; /* dhwbi */
+	    case 6:
+	      return 404; /* dhi */
+	    case 7:
+	      return 405; /* dii */
+	    case 8:
+	      switch (Field_op1_Slot_inst_get (insn))
+		{
+		case 0:
+		  return 410; /* dpfl */
+		case 2:
+		  return 411; /* dhu */
+		case 3:
+		  return 412; /* diu */
+		case 4:
+		  return 402; /* diwb */
+		case 5:
+		  return 403; /* diwbi */
+		}
+	      break;
+	    case 12:
+	      return 390; /* ipf */
+	    case 13:
+	      switch (Field_op1_Slot_inst_get (insn))
+		{
+		case 0:
+		  return 392; /* ipfl */
+		case 2:
+		  return 393; /* ihu */
+		case 3:
+		  return 394; /* iiu */
+		}
+	      break;
+	    case 14:
+	      return 391; /* ihi */
+	    case 15:
+	      return 395; /* iii */
+	    }
+	  break;
+	case 9:
+	  return 83; /* l16si */
+	case 10:
+	  return 90; /* movi */
+	case 11:
+	  return 451; /* l32ai */
+	case 12:
+	  return 39; /* addi */
+	case 13:
+	  return 40; /* addmi */
+	case 14:
+	  return 453; /* s32c1i */
+	case 15:
+	  return 452; /* s32ri */
+	}
+      break;
+    case 3:
+      switch (Field_r_Slot_inst_get (insn))
+	{
+	case 0:
+	  return 498; /* lsi */
+	case 4:
+	  return 502; /* ssi */
+	case 8:
+	  return 499; /* lsiu */
+	case 12:
+	  return 503; /* ssiu */
+	}
+      break;
+    case 4:
+      switch (Field_op2_Slot_inst_get (insn))
+	{
+	case 0:
+	  switch (Field_op1_Slot_inst_get (insn))
+	    {
+	    case 8:
+	      if (Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0)
+		return 287; /* mula.dd.ll.ldinc */
+	      break;
+	    case 9:
+	      if (Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0)
+		return 289; /* mula.dd.hl.ldinc */
+	      break;
+	    case 10:
+	      if (Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0)
+		return 291; /* mula.dd.lh.ldinc */
+	      break;
+	    case 11:
+	      if (Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0)
+		return 293; /* mula.dd.hh.ldinc */
+	      break;
+	    }
+	  break;
+	case 1:
+	  switch (Field_op1_Slot_inst_get (insn))
+	    {
+	    case 8:
+	      if (Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0)
+		return 286; /* mula.dd.ll.lddec */
+	      break;
+	    case 9:
+	      if (Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0)
+		return 288; /* mula.dd.hl.lddec */
+	      break;
+	    case 10:
+	      if (Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0)
+		return 290; /* mula.dd.lh.lddec */
+	      break;
+	    case 11:
+	      if (Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0)
+		return 292; /* mula.dd.hh.lddec */
+	      break;
+	    }
+	  break;
+	case 2:
+	  switch (Field_op1_Slot_inst_get (insn))
+	    {
+	    case 4:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 242; /* mul.dd.ll */
+	      break;
+	    case 5:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 243; /* mul.dd.hl */
+	      break;
+	    case 6:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 244; /* mul.dd.lh */
+	      break;
+	    case 7:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 245; /* mul.dd.hh */
+	      break;
+	    case 8:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 270; /* mula.dd.ll */
+	      break;
+	    case 9:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 271; /* mula.dd.hl */
+	      break;
+	    case 10:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 272; /* mula.dd.lh */
+	      break;
+	    case 11:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 273; /* mula.dd.hh */
+	      break;
+	    case 12:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 274; /* muls.dd.ll */
+	      break;
+	    case 13:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 275; /* muls.dd.hl */
+	      break;
+	    case 14:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 276; /* muls.dd.lh */
+	      break;
+	    case 15:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 277; /* muls.dd.hh */
+	      break;
+	    }
+	  break;
+	case 3:
+	  switch (Field_op1_Slot_inst_get (insn))
+	    {
+	    case 4:
+	      if (Field_r_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 234; /* mul.ad.ll */
+	      break;
+	    case 5:
+	      if (Field_r_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 235; /* mul.ad.hl */
+	      break;
+	    case 6:
+	      if (Field_r_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 236; /* mul.ad.lh */
+	      break;
+	    case 7:
+	      if (Field_r_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 237; /* mul.ad.hh */
+	      break;
+	    case 8:
+	      if (Field_r_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 254; /* mula.ad.ll */
+	      break;
+	    case 9:
+	      if (Field_r_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 255; /* mula.ad.hl */
+	      break;
+	    case 10:
+	      if (Field_r_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 256; /* mula.ad.lh */
+	      break;
+	    case 11:
+	      if (Field_r_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 257; /* mula.ad.hh */
+	      break;
+	    case 12:
+	      if (Field_r_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 258; /* muls.ad.ll */
+	      break;
+	    case 13:
+	      if (Field_r_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 259; /* muls.ad.hl */
+	      break;
+	    case 14:
+	      if (Field_r_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 260; /* muls.ad.lh */
+	      break;
+	    case 15:
+	      if (Field_r_Slot_inst_get (insn) == 0 &&
+		  Field_t3_Slot_inst_get (insn) == 0 &&
+		  Field_tlo_Slot_inst_get (insn) == 0)
+		return 261; /* muls.ad.hh */
+	      break;
+	    }
+	  break;
+	case 4:
+	  switch (Field_op1_Slot_inst_get (insn))
+	    {
+	    case 8:
+	      if (Field_r3_Slot_inst_get (insn) == 0)
+		return 279; /* mula.da.ll.ldinc */
+	      break;
+	    case 9:
+	      if (Field_r3_Slot_inst_get (insn) == 0)
+		return 281; /* mula.da.hl.ldinc */
+	      break;
+	    case 10:
+	      if (Field_r3_Slot_inst_get (insn) == 0)
+		return 283; /* mula.da.lh.ldinc */
+	      break;
+	    case 11:
+	      if (Field_r3_Slot_inst_get (insn) == 0)
+		return 285; /* mula.da.hh.ldinc */
+	      break;
+	    }
+	  break;
+	case 5:
+	  switch (Field_op1_Slot_inst_get (insn))
+	    {
+	    case 8:
+	      if (Field_r3_Slot_inst_get (insn) == 0)
+		return 278; /* mula.da.ll.lddec */
+	      break;
+	    case 9:
+	      if (Field_r3_Slot_inst_get (insn) == 0)
+		return 280; /* mula.da.hl.lddec */
+	      break;
+	    case 10:
+	      if (Field_r3_Slot_inst_get (insn) == 0)
+		return 282; /* mula.da.lh.lddec */
+	      break;
+	    case 11:
+	      if (Field_r3_Slot_inst_get (insn) == 0)
+		return 284; /* mula.da.hh.lddec */
+	      break;
+	    }
+	  break;
+	case 6:
+	  switch (Field_op1_Slot_inst_get (insn))
+	    {
+	    case 4:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0)
+		return 238; /* mul.da.ll */
+	      break;
+	    case 5:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0)
+		return 239; /* mul.da.hl */
+	      break;
+	    case 6:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0)
+		return 240; /* mul.da.lh */
+	      break;
+	    case 7:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0)
+		return 241; /* mul.da.hh */
+	      break;
+	    case 8:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0)
+		return 262; /* mula.da.ll */
+	      break;
+	    case 9:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0)
+		return 263; /* mula.da.hl */
+	      break;
+	    case 10:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0)
+		return 264; /* mula.da.lh */
+	      break;
+	    case 11:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0)
+		return 265; /* mula.da.hh */
+	      break;
+	    case 12:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0)
+		return 266; /* muls.da.ll */
+	      break;
+	    case 13:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0)
+		return 267; /* muls.da.hl */
+	      break;
+	    case 14:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0)
+		return 268; /* muls.da.lh */
+	      break;
+	    case 15:
+	      if (Field_s_Slot_inst_get (insn) == 0 &&
+		  Field_w_Slot_inst_get (insn) == 0 &&
+		  Field_r3_Slot_inst_get (insn) == 0)
+		return 269; /* muls.da.hh */
+	      break;
+	    }
+	  break;
+	case 7:
+	  switch (Field_op1_Slot_inst_get (insn))
+	    {
+	    case 0:
+	      if (Field_r_Slot_inst_get (insn) == 0)
+		return 230; /* umul.aa.ll */
+	      break;
+	    case 1:
+	      if (Field_r_Slot_inst_get (insn) == 0)
+		return 231; /* umul.aa.hl */
+	      break;
+	    case 2:
+	      if (Field_r_Slot_inst_get (insn) == 0)
+		return 232; /* umul.aa.lh */
+	      break;
+	    case 3:
+	      if (Field_r_Slot_inst_get (insn) == 0)
+		return 233; /* umul.aa.hh */
+	      break;
+	    case 4:
+	      if (Field_r_Slot_inst_get (insn) == 0)
+		return 226; /* mul.aa.ll */
+	      break;
+	    case 5:
+	      if (Field_r_Slot_inst_get (insn) == 0)
+		return 227; /* mul.aa.hl */
+	      break;
+	    case 6:
+	      if (Field_r_Slot_inst_get (insn) == 0)
+		return 228; /* mul.aa.lh */
+	      break;
+	    case 7:
+	      if (Field_r_Slot_inst_get (insn) == 0)
+		return 229; /* mul.aa.hh */
+	      break;
+	    case 8:
+	      if (Field_r_Slot_inst_get (insn) == 0)
+		return 246; /* mula.aa.ll */
+	      break;
+	    case 9:
+	      if (Field_r_Slot_inst_get (insn) == 0)
+		return 247; /* mula.aa.hl */
+	      break;
+	    case 10:
+	      if (Field_r_Slot_inst_get (insn) == 0)
+		return 248; /* mula.aa.lh */
+	      break;
+	    case 11:
+	      if (Field_r_Slot_inst_get (insn) == 0)
+		return 249; /* mula.aa.hh */
+	      break;
+	    case 12:
+	      if (Field_r_Slot_inst_get (insn) == 0)
+		return 250; /* muls.aa.ll */
+	      break;
+	    case 13:
+	      if (Field_r_Slot_inst_get (insn) == 0)
+		return 251; /* muls.aa.hl */
+	      break;
+	    case 14:
+	      if (Field_r_Slot_inst_get (insn) == 0)
+		return 252; /* muls.aa.lh */
+	      break;
+	    case 15:
+	      if (Field_r_Slot_inst_get (insn) == 0)
+		return 253; /* muls.aa.hh */
+	      break;
+	    }
+	  break;
+	case 8:
+	  if (Field_op1_Slot_inst_get (insn) == 0 &&
+	      Field_t_Slot_inst_get (insn) == 0 &&
+	      Field_rhi_Slot_inst_get (insn) == 0)
+	    return 295; /* ldinc */
+	  break;
+	case 9:
+	  if (Field_op1_Slot_inst_get (insn) == 0 &&
+	      Field_t_Slot_inst_get (insn) == 0 &&
+	      Field_rhi_Slot_inst_get (insn) == 0)
+	    return 294; /* lddec */
+	  break;
+	}
+      break;
+    case 5:
+      switch (Field_n_Slot_inst_get (insn))
+	{
+	case 0:
+	  return 76; /* call0 */
+	case 1:
+	  return 7; /* call4 */
+	case 2:
+	  return 6; /* call8 */
+	case 3:
+	  return 5; /* call12 */
+	}
+      break;
+    case 6:
+      switch (Field_n_Slot_inst_get (insn))
+	{
+	case 0:
+	  return 80; /* j */
+	case 1:
+	  switch (Field_m_Slot_inst_get (insn))
+	    {
+	    case 0:
+	      return 72; /* beqz */
+	    case 1:
+	      return 73; /* bnez */
+	    case 2:
+	      return 75; /* bltz */
+	    case 3:
+	      return 74; /* bgez */
+	    }
+	  break;
+	case 2:
+	  switch (Field_m_Slot_inst_get (insn))
+	    {
+	    case 0:
+	      return 52; /* beqi */
+	    case 1:
+	      return 53; /* bnei */
+	    case 2:
+	      return 55; /* blti */
+	    case 3:
+	      return 54; /* bgei */
+	    }
+	  break;
+	case 3:
+	  switch (Field_m_Slot_inst_get (insn))
+	    {
+	    case 0:
+	      return 11; /* entry */
+	    case 1:
+	      switch (Field_r_Slot_inst_get (insn))
+		{
+		case 0:
+		  return 371; /* bf */
+		case 1:
+		  return 372; /* bt */
+		case 8:
+		  return 87; /* loop */
+		case 9:
+		  return 88; /* loopnez */
+		case 10:
+		  return 89; /* loopgtz */
+		}
+	      break;
+	    case 2:
+	      return 59; /* bltui */
+	    case 3:
+	      return 58; /* bgeui */
+	    }
+	  break;
+	}
+      break;
+    case 7:
+      switch (Field_r_Slot_inst_get (insn))
+	{
+	case 0:
+	  return 67; /* bnone */
+	case 1:
+	  return 60; /* beq */
+	case 2:
+	  return 63; /* blt */
+	case 3:
+	  return 65; /* bltu */
+	case 4:
+	  return 68; /* ball */
+	case 5:
+	  return 70; /* bbc */
+	case 6:
+	case 7:
+	  return 56; /* bbci */
+	case 8:
+	  return 66; /* bany */
+	case 9:
+	  return 61; /* bne */
+	case 10:
+	  return 62; /* bge */
+	case 11:
+	  return 64; /* bgeu */
+	case 12:
+	  return 69; /* bnall */
+	case 13:
+	  return 71; /* bbs */
+	case 14:
+	case 15:
+	  return 57; /* bbsi */
+	}
+      break;
+    }
+  return 0;
+}
+
+static int
+Slot_inst16b_decode (const xtensa_insnbuf insn)
+{
+  switch (Field_op0_Slot_inst16b_get (insn))
+    {
+    case 12:
+      switch (Field_i_Slot_inst16b_get (insn))
+	{
+	case 0:
+	  return 33; /* movi.n */
+	case 1:
+	  switch (Field_z_Slot_inst16b_get (insn))
+	    {
+	    case 0:
+	      return 28; /* beqz.n */
+	    case 1:
+	      return 29; /* bnez.n */
+	    }
+	  break;
+	}
+      break;
+    case 13:
+      switch (Field_r_Slot_inst16b_get (insn))
+	{
+	case 0:
+	  return 32; /* mov.n */
+	case 15:
+	  switch (Field_t_Slot_inst16b_get (insn))
+	    {
+	    case 0:
+	      return 35; /* ret.n */
+	    case 1:
+	      return 15; /* retw.n */
+	    case 2:
+	      return 325; /* break.n */
+	    case 3:
+	      if (Field_s_Slot_inst16b_get (insn) == 0)
+		return 34; /* nop.n */
+	      break;
+	    case 6:
+	      if (Field_s_Slot_inst16b_get (insn) == 0)
+		return 30; /* ill.n */
+	      break;
+	    }
+	  break;
+	}
+      break;
+    }
+  return 0;
+}
+
+static int
+Slot_inst16a_decode (const xtensa_insnbuf insn)
+{
+  switch (Field_op0_Slot_inst16a_get (insn))
+    {
+    case 8:
+      return 31; /* l32i.n */
+    case 9:
+      return 36; /* s32i.n */
+    case 10:
+      return 26; /* add.n */
+    case 11:
+      return 27; /* addi.n */
+    }
+  return 0;
+}
+
+static int
+Slot_xt_flix64_slot2_decode (const xtensa_insnbuf insn)
+{
+  switch (Field_combined3e2c5767_fld36xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn))
+    {
+    case 0:
+      if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 1)
+	return 41; /* add */
+      if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 5)
+	return 42; /* sub */
+      if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 2)
+	return 43; /* addx2 */
+      if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 3)
+	return 49; /* and */
+      if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 4)
+	return 450; /* sext */
+      break;
+    case 1:
+      if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 1)
+	return 27; /* addi.n */
+      if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 2)
+	return 44; /* addx4 */
+      if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 3)
+	return 50; /* or */
+      if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 5)
+	return 51; /* xor */
+      if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 4)
+	return 113; /* srli */
+      break;
+    }
+  if (Field_combined3e2c5767_fld37xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0 &&
+      Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6)
+    return 33; /* movi.n */
+  if (Field_combined3e2c5767_fld39xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 2 &&
+      Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6 &&
+      Field_combined3e2c5767_fld63xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0)
+    return 32; /* mov.n */
+  if (Field_combined3e2c5767_fld41xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 3 &&
+      Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6 &&
+      Field_combined3e2c5767_fld65xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0)
+    return 97; /* nop */
+  if (Field_combined3e2c5767_fld42xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 8 &&
+      Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6 &&
+      Field_combined3e2c5767_fld64xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0)
+    return 96; /* abs */
+  if (Field_combined3e2c5767_fld44xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 9 &&
+      Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6 &&
+      Field_combined3e2c5767_fld64xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0)
+    return 95; /* neg */
+  if (Field_combined3e2c5767_fld45xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 5 &&
+      Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6 &&
+      Field_combined3e2c5767_fld66xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0)
+    return 110; /* sra */
+  if (Field_combined3e2c5767_fld47xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 3 &&
+      Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 6 &&
+      Field_combined3e2c5767_fld68xt_flix64_slot2_Slot_xt_flix64_slot2_get (insn) == 0)
+    return 109; /* srl */
+  if (Field_op0_s5_Slot_xt_flix64_slot2_get (insn) == 7)
+    return 112; /* srai */
+  return 0;
+}
+
+static int
+Slot_xt_flix64_slot0_decode (const xtensa_insnbuf insn)
+{
+  switch (Field_op0_xt_flix64_slot0_Slot_xt_flix64_slot0_get (insn))
+    {
+    case 0:
+      if (Field_combined3e2c5767_fld7_Slot_xt_flix64_slot0_get (insn) == 2)
+	return 78; /* extui */
+      switch (Field_op1_Slot_xt_flix64_slot0_get (insn))
+	{
+	case 0:
+	  switch (Field_op2_Slot_xt_flix64_slot0_get (insn))
+	    {
+	    case 0:
+	      if (Field_r_Slot_xt_flix64_slot0_get (insn) == 2)
+		{
+		  if (Field_s_Slot_xt_flix64_slot0_get (insn) == 0)
+		    {
+		      if (Field_t_Slot_xt_flix64_slot0_get (insn) == 15)
+			return 97; /* nop */
+		    }
+		}
+	      break;
+	    case 1:
+	      return 49; /* and */
+	    case 2:
+	      return 50; /* or */
+	    case 3:
+	      return 51; /* xor */
+	    case 4:
+	      switch (Field_r_Slot_xt_flix64_slot0_get (insn))
+		{
+		case 0:
+		  if (Field_t_Slot_xt_flix64_slot0_get (insn) == 0)
+		    return 102; /* ssr */
+		  break;
+		case 1:
+		  if (Field_t_Slot_xt_flix64_slot0_get (insn) == 0)
+		    return 103; /* ssl */
+		  break;
+		case 2:
+		  if (Field_t_Slot_xt_flix64_slot0_get (insn) == 0)
+		    return 104; /* ssa8l */
+		  break;
+		case 3:
+		  if (Field_t_Slot_xt_flix64_slot0_get (insn) == 0)
+		    return 105; /* ssa8b */
+		  break;
+		case 4:
+		  if (Field_thi3_Slot_xt_flix64_slot0_get (insn) == 0)
+		    return 106; /* ssai */
+		  break;
+		case 14:
+		  return 448; /* nsa */
+		case 15:
+		  return 449; /* nsau */
+		}
+	      break;
+	    case 6:
+	      switch (Field_s_Slot_xt_flix64_slot0_get (insn))
+		{
+		case 0:
+		  return 95; /* neg */
+		case 1:
+		  return 96; /* abs */
+		}
+	      break;
+	    case 8:
+	      return 41; /* add */
+	    case 9:
+	      return 43; /* addx2 */
+	    case 10:
+	      return 44; /* addx4 */
+	    case 11:
+	      return 45; /* addx8 */
+	    case 12:
+	      return 42; /* sub */
+	    case 13:
+	      return 46; /* subx2 */
+	    case 14:
+	      return 47; /* subx4 */
+	    case 15:
+	      return 48; /* subx8 */
+	    }
+	  break;
+	case 1:
+	  if (Field_combined3e2c5767_fld11_Slot_xt_flix64_slot0_get (insn) == 1)
+	    return 112; /* srai */
+	  if (Field_combined3e2c5767_fld9_Slot_xt_flix64_slot0_get (insn) == 0)
+	    return 111; /* slli */
+	  switch (Field_op2_Slot_xt_flix64_slot0_get (insn))
+	    {
+	    case 4:
+	      return 113; /* srli */
+	    case 8:
+	      return 108; /* src */
+	    case 9:
+	      if (Field_s_Slot_xt_flix64_slot0_get (insn) == 0)
+		return 109; /* srl */
+	      break;
+	    case 10:
+	      if (Field_t_Slot_xt_flix64_slot0_get (insn) == 0)
+		return 107; /* sll */
+	      break;
+	    case 11:
+	      if (Field_s_Slot_xt_flix64_slot0_get (insn) == 0)
+		return 110; /* sra */
+	      break;
+	    case 12:
+	      return 296; /* mul16u */
+	    case 13:
+	      return 297; /* mul16s */
+	    }
+	  break;
+	case 2:
+	  if (Field_op2_Slot_xt_flix64_slot0_get (insn) == 8)
+	    return 461; /* mull */
+	  break;
+	case 3:
+	  switch (Field_op2_Slot_xt_flix64_slot0_get (insn))
+	    {
+	    case 2:
+	      return 450; /* sext */
+	    case 3:
+	      return 443; /* clamps */
+	    case 4:
+	      return 444; /* min */
+	    case 5:
+	      return 445; /* max */
+	    case 6:
+	      return 446; /* minu */
+	    case 7:
+	      return 447; /* maxu */
+	    case 8:
+	      return 91; /* moveqz */
+	    case 9:
+	      return 92; /* movnez */
+	    case 10:
+	      return 93; /* movltz */
+	    case 11:
+	      return 94; /* movgez */
+	    }
+	  break;
+	}
+      break;
+    case 2:
+      switch (Field_r_Slot_xt_flix64_slot0_get (insn))
+	{
+	case 0:
+	  return 86; /* l8ui */
+	case 1:
+	  return 82; /* l16ui */
+	case 2:
+	  return 84; /* l32i */
+	case 4:
+	  return 101; /* s8i */
+	case 5:
+	  return 99; /* s16i */
+	case 6:
+	  return 100; /* s32i */
+	case 9:
+	  return 83; /* l16si */
+	case 10:
+	  return 90; /* movi */
+	case 12:
+	  return 39; /* addi */
+	case 13:
+	  return 40; /* addmi */
+	}
+      break;
+    }
+  if (Field_op0_xt_flix64_slot0_s3_Slot_xt_flix64_slot0_get (insn) == 1)
+    return 85; /* l32r */
+  if (Field_sae4_Slot_xt_flix64_slot0_get (insn) == 0 &&
+      Field_combined3e2c5767_fld8_Slot_xt_flix64_slot0_get (insn) == 3 &&
+      Field_op0_xt_flix64_slot0_s3_Slot_xt_flix64_slot0_get (insn) == 0 &&
+      Field_combined3e2c5767_fld49xt_flix64_slot0_Slot_xt_flix64_slot0_get (insn) == 0)
+    return 32; /* mov.n */
+  return 0;
+}
+
+static int
+Slot_xt_flix64_slot1_decode (const xtensa_insnbuf insn)
+{
+  if (Field_combined3e2c5767_fld19xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0 &&
+      Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 1)
+    return 78; /* extui */
+  switch (Field_combined3e2c5767_fld20xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn))
+    {
+    case 0:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
+	return 90; /* movi */
+      break;
+    case 2:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 1)
+	return 39; /* addi */
+      break;
+    case 3:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 1)
+	return 40; /* addmi */
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
+	  Field_combined3e2c5767_fld16_Slot_xt_flix64_slot1_get (insn) == 0)
+	return 51; /* xor */
+      break;
+    }
+  switch (Field_combined3e2c5767_fld21xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn))
+    {
+    case 8:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
+	return 111; /* slli */
+      break;
+    case 16:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
+	return 112; /* srai */
+      break;
+    case 19:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
+	  Field_combined3e2c5767_fld57xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0)
+	return 107; /* sll */
+      break;
+    }
+  switch (Field_combined3e2c5767_fld22xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn))
+    {
+    case 18:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
+	return 41; /* add */
+      break;
+    case 19:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
+	return 45; /* addx8 */
+      break;
+    case 20:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
+	return 43; /* addx2 */
+      break;
+    case 21:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
+	return 49; /* and */
+      break;
+    case 22:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
+	return 91; /* moveqz */
+      break;
+    case 23:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
+	return 94; /* movgez */
+      break;
+    case 24:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
+	return 44; /* addx4 */
+      break;
+    case 25:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
+	return 93; /* movltz */
+      break;
+    case 26:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
+	return 92; /* movnez */
+      break;
+    case 27:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
+	return 296; /* mul16u */
+      break;
+    case 28:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
+	return 297; /* mul16s */
+      break;
+    case 29:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
+	return 461; /* mull */
+      break;
+    case 30:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
+	return 50; /* or */
+      break;
+    case 31:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
+	return 450; /* sext */
+      break;
+    case 34:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
+	return 108; /* src */
+      break;
+    case 36:
+      if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2)
+	return 113; /* srli */
+      break;
+    }
+  if (Field_combined3e2c5767_fld23xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 280 &&
+      Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
+      Field_combined3e2c5767_fld51xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0)
+    return 32; /* mov.n */
+  if (Field_combined3e2c5767_fld25xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 281 &&
+      Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
+      Field_combined3e2c5767_fld52xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0)
+    return 81; /* jx */
+  if (Field_combined3e2c5767_fld26xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 141 &&
+      Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
+      Field_combined3e2c5767_fld60xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0)
+    return 103; /* ssl */
+  if (Field_combined3e2c5767_fld28xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 71 &&
+      Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
+      Field_combined3e2c5767_fld54xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0)
+    return 97; /* nop */
+  if (Field_combined3e2c5767_fld30xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 148 &&
+      Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
+      Field_combined3e2c5767_fld53xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0)
+    return 95; /* neg */
+  if (Field_combined3e2c5767_fld32xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 149 &&
+      Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
+      Field_combined3e2c5767_fld53xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0)
+    return 110; /* sra */
+  if (Field_combined3e2c5767_fld33xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 75 &&
+      Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
+      Field_combined3e2c5767_fld58xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0)
+    return 109; /* srl */
+  if (Field_combined3e2c5767_fld35xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 5 &&
+      Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 2 &&
+      Field_combined3e2c5767_fld62xt_flix64_slot1_Slot_xt_flix64_slot1_get (insn) == 0)
+    return 42; /* sub */
+  if (Field_op0_s4_Slot_xt_flix64_slot1_get (insn) == 3)
+    return 80; /* j */
+  return 0;
+}
+
+static int
+Slot_xt_flix64_slot3_decode (const xtensa_insnbuf insn)
+{
+  switch (Field_op0_s6_Slot_xt_flix64_slot3_get (insn))
+    {
+    case 1:
+      if (Field_combined3e2c5767_fld71_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 516; /* bbci.w18 */
+      break;
+    case 2:
+      if (Field_combined3e2c5767_fld71_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 517; /* bbsi.w18 */
+      break;
+    case 3:
+      if (Field_combined3e2c5767_fld89xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 526; /* ball.w18 */
+      break;
+    case 4:
+      if (Field_combined3e2c5767_fld87xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 524; /* bany.w18 */
+      break;
+    case 5:
+      if (Field_combined3e2c5767_fld91xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 528; /* bbc.w18 */
+      break;
+    case 6:
+      if (Field_combined3e2c5767_fld92xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 529; /* bbs.w18 */
+      break;
+    case 7:
+      if (Field_combined3e2c5767_fld81xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 518; /* beq.w18 */
+      break;
+    case 8:
+      if (Field_combined3e2c5767_fld75xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 510; /* beqi.w18 */
+      break;
+    case 9:
+      if (Field_combined3e2c5767_fld83xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 520; /* bge.w18 */
+      break;
+    case 10:
+      if (Field_combined3e2c5767_fld77xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 512; /* bgei.w18 */
+      break;
+    case 11:
+      if (Field_combined3e2c5767_fld85xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 522; /* bgeu.w18 */
+      break;
+    case 12:
+      if (Field_combined3e2c5767_fld79xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 514; /* bgeui.w18 */
+      break;
+    case 13:
+      if (Field_combined3e2c5767_fld84xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 521; /* blt.w18 */
+      break;
+    case 14:
+      if (Field_combined3e2c5767_fld78xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 513; /* blti.w18 */
+      break;
+    case 15:
+      if (Field_combined3e2c5767_fld86xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 523; /* bltu.w18 */
+      break;
+    case 16:
+      if (Field_combined3e2c5767_fld80xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 515; /* bltui.w18 */
+      break;
+    case 17:
+      if (Field_combined3e2c5767_fld90xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 527; /* bnall.w18 */
+      break;
+    case 18:
+      if (Field_combined3e2c5767_fld82xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 519; /* bne.w18 */
+      break;
+    case 19:
+      if (Field_combined3e2c5767_fld76xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 511; /* bnei.w18 */
+      break;
+    case 20:
+      if (Field_combined3e2c5767_fld88xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 525; /* bnone.w18 */
+      break;
+    case 21:
+      if (Field_combined3e2c5767_fld70xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 506; /* beqz.w18 */
+      break;
+    case 22:
+      if (Field_combined3e2c5767_fld73xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 508; /* bgez.w18 */
+      break;
+    case 23:
+      if (Field_combined3e2c5767_fld74xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 509; /* bltz.w18 */
+      break;
+    case 24:
+      if (Field_combined3e2c5767_fld72xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 507; /* bnez.w18 */
+      break;
+    case 25:
+      if (Field_combined3e2c5767_fld93xt_flix64_slot3_Slot_xt_flix64_slot3_get (insn) == 0)
+	return 97; /* nop */
+      break;
+    }
+  return 0;
+}
+
+
+/* Instruction slots.  */
+
+static void
+Slot_x24_Format_inst_0_get (const xtensa_insnbuf insn,
+			    xtensa_insnbuf slotbuf)
+{
+  slotbuf[1] = 0;
+  slotbuf[0] = (insn[0] & 0xffffff);
+}
+
+static void
+Slot_x24_Format_inst_0_set (xtensa_insnbuf insn,
+			    const xtensa_insnbuf slotbuf)
+{
+  insn[0] = (insn[0] & ~0xffffff) | (slotbuf[0] & 0xffffff);
+}
+
+static void
+Slot_x16a_Format_inst16a_0_get (const xtensa_insnbuf insn,
+				xtensa_insnbuf slotbuf)
+{
+  slotbuf[1] = 0;
+  slotbuf[0] = (insn[0] & 0xffff);
+}
+
+static void
+Slot_x16a_Format_inst16a_0_set (xtensa_insnbuf insn,
+				const xtensa_insnbuf slotbuf)
+{
+  insn[0] = (insn[0] & ~0xffff) | (slotbuf[0] & 0xffff);
+}
+
+static void
+Slot_x16b_Format_inst16b_0_get (const xtensa_insnbuf insn,
+				xtensa_insnbuf slotbuf)
+{
+  slotbuf[1] = 0;
+  slotbuf[0] = (insn[0] & 0xffff);
+}
+
+static void
+Slot_x16b_Format_inst16b_0_set (xtensa_insnbuf insn,
+				const xtensa_insnbuf slotbuf)
+{
+  insn[0] = (insn[0] & ~0xffff) | (slotbuf[0] & 0xffff);
+}
+
+static void
+Slot_xt_format1_Format_xt_flix64_slot0_4_get (const xtensa_insnbuf insn,
+					      xtensa_insnbuf slotbuf)
+{
+  slotbuf[1] = 0;
+  slotbuf[0] = ((insn[0] & 0xffffff0) >> 4);
+}
+
+static void
+Slot_xt_format1_Format_xt_flix64_slot0_4_set (xtensa_insnbuf insn,
+					      const xtensa_insnbuf slotbuf)
+{
+  insn[0] = (insn[0] & ~0xffffff0) | ((slotbuf[0] & 0xffffff) << 4);
+}
+
+static void
+Slot_xt_format2_Format_xt_flix64_slot0_4_get (const xtensa_insnbuf insn,
+					      xtensa_insnbuf slotbuf)
+{
+  slotbuf[1] = 0;
+  slotbuf[0] = ((insn[0] & 0xffffff0) >> 4);
+}
+
+static void
+Slot_xt_format2_Format_xt_flix64_slot0_4_set (xtensa_insnbuf insn,
+					      const xtensa_insnbuf slotbuf)
+{
+  insn[0] = (insn[0] & ~0xffffff0) | ((slotbuf[0] & 0xffffff) << 4);
+}
+
+static void
+Slot_xt_format1_Format_xt_flix64_slot1_28_get (const xtensa_insnbuf insn,
+					      xtensa_insnbuf slotbuf)
+{
+  slotbuf[1] = 0;
+  slotbuf[0] = ((insn[0] & 0xf0000000) >> 28);
+  slotbuf[0] = (slotbuf[0] & ~0xffff0) | ((insn[1] & 0xffff) << 4);
+}
+
+static void
+Slot_xt_format1_Format_xt_flix64_slot1_28_set (xtensa_insnbuf insn,
+					      const xtensa_insnbuf slotbuf)
+{
+  insn[0] = (insn[0] & ~0xf0000000) | ((slotbuf[0] & 0xf) << 28);
+  insn[1] = (insn[1] & ~0xffff) | ((slotbuf[0] & 0xffff0) >> 4);
+}
+
+static void
+Slot_xt_format1_Format_xt_flix64_slot2_48_get (const xtensa_insnbuf insn,
+					      xtensa_insnbuf slotbuf)
+{
+  slotbuf[1] = 0;
+  slotbuf[0] = ((insn[1] & 0xffff0000) >> 16);
+}
+
+static void
+Slot_xt_format1_Format_xt_flix64_slot2_48_set (xtensa_insnbuf insn,
+					      const xtensa_insnbuf slotbuf)
+{
+  insn[1] = (insn[1] & ~0xffff0000) | ((slotbuf[0] & 0xffff) << 16);
+}
+
+static void
+Slot_xt_format2_Format_xt_flix64_slot3_28_get (const xtensa_insnbuf insn,
+					      xtensa_insnbuf slotbuf)
+{
+  slotbuf[0] = ((insn[0] & 0xf0000000) >> 28);
+  slotbuf[0] = (slotbuf[0] & ~0xfffffff0) | ((insn[1] & 0xfffffff) << 4);
+  slotbuf[1] = ((insn[1] & 0x70000000) >> 28);
+}
+
+static void
+Slot_xt_format2_Format_xt_flix64_slot3_28_set (xtensa_insnbuf insn,
+					      const xtensa_insnbuf slotbuf)
+{
+  insn[0] = (insn[0] & ~0xf0000000) | ((slotbuf[0] & 0xf) << 28);
+  insn[1] = (insn[1] & ~0xfffffff) | ((slotbuf[0] & 0xfffffff0) >> 4);
+  insn[1] = (insn[1] & ~0x70000000) | ((slotbuf[1] & 0x7) << 28);
+}
+
+static xtensa_get_field_fn
+Slot_inst_get_field_fns[] = {
+  Field_t_Slot_inst_get,
+  Field_bbi4_Slot_inst_get,
+  Field_bbi_Slot_inst_get,
+  Field_imm12_Slot_inst_get,
+  Field_imm8_Slot_inst_get,
+  Field_s_Slot_inst_get,
+  Field_imm12b_Slot_inst_get,
+  Field_imm16_Slot_inst_get,
+  Field_m_Slot_inst_get,
+  Field_n_Slot_inst_get,
+  Field_offset_Slot_inst_get,
+  Field_op0_Slot_inst_get,
+  Field_op1_Slot_inst_get,
+  Field_op2_Slot_inst_get,
+  Field_r_Slot_inst_get,
+  Field_sa4_Slot_inst_get,
+  Field_sae4_Slot_inst_get,
+  Field_sae_Slot_inst_get,
+  Field_sal_Slot_inst_get,
+  Field_sargt_Slot_inst_get,
+  Field_sas4_Slot_inst_get,
+  Field_sas_Slot_inst_get,
+  Field_sr_Slot_inst_get,
+  Field_st_Slot_inst_get,
+  Field_thi3_Slot_inst_get,
+  Field_imm4_Slot_inst_get,
+  Field_mn_Slot_inst_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_r3_Slot_inst_get,
+  Field_rbit2_Slot_inst_get,
+  Field_rhi_Slot_inst_get,
+  Field_t3_Slot_inst_get,
+  Field_tbit2_Slot_inst_get,
+  Field_tlo_Slot_inst_get,
+  Field_w_Slot_inst_get,
+  Field_y_Slot_inst_get,
+  Field_x_Slot_inst_get,
+  Field_t2_Slot_inst_get,
+  Field_s2_Slot_inst_get,
+  Field_r2_Slot_inst_get,
+  Field_t4_Slot_inst_get,
+  Field_s4_Slot_inst_get,
+  Field_r4_Slot_inst_get,
+  Field_t8_Slot_inst_get,
+  Field_s8_Slot_inst_get,
+  Field_r8_Slot_inst_get,
+  Field_xt_wbr15_imm_Slot_inst_get,
+  Field_xt_wbr18_imm_Slot_inst_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Implicit_Field_ar0_get,
+  Implicit_Field_ar4_get,
+  Implicit_Field_ar8_get,
+  Implicit_Field_ar12_get,
+  Implicit_Field_mr0_get,
+  Implicit_Field_mr1_get,
+  Implicit_Field_mr2_get,
+  Implicit_Field_mr3_get,
+  Implicit_Field_bt16_get,
+  Implicit_Field_bs16_get,
+  Implicit_Field_br16_get,
+  Implicit_Field_brall_get
+};
+
+static xtensa_set_field_fn
+Slot_inst_set_field_fns[] = {
+  Field_t_Slot_inst_set,
+  Field_bbi4_Slot_inst_set,
+  Field_bbi_Slot_inst_set,
+  Field_imm12_Slot_inst_set,
+  Field_imm8_Slot_inst_set,
+  Field_s_Slot_inst_set,
+  Field_imm12b_Slot_inst_set,
+  Field_imm16_Slot_inst_set,
+  Field_m_Slot_inst_set,
+  Field_n_Slot_inst_set,
+  Field_offset_Slot_inst_set,
+  Field_op0_Slot_inst_set,
+  Field_op1_Slot_inst_set,
+  Field_op2_Slot_inst_set,
+  Field_r_Slot_inst_set,
+  Field_sa4_Slot_inst_set,
+  Field_sae4_Slot_inst_set,
+  Field_sae_Slot_inst_set,
+  Field_sal_Slot_inst_set,
+  Field_sargt_Slot_inst_set,
+  Field_sas4_Slot_inst_set,
+  Field_sas_Slot_inst_set,
+  Field_sr_Slot_inst_set,
+  Field_st_Slot_inst_set,
+  Field_thi3_Slot_inst_set,
+  Field_imm4_Slot_inst_set,
+  Field_mn_Slot_inst_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_r3_Slot_inst_set,
+  Field_rbit2_Slot_inst_set,
+  Field_rhi_Slot_inst_set,
+  Field_t3_Slot_inst_set,
+  Field_tbit2_Slot_inst_set,
+  Field_tlo_Slot_inst_set,
+  Field_w_Slot_inst_set,
+  Field_y_Slot_inst_set,
+  Field_x_Slot_inst_set,
+  Field_t2_Slot_inst_set,
+  Field_s2_Slot_inst_set,
+  Field_r2_Slot_inst_set,
+  Field_t4_Slot_inst_set,
+  Field_s4_Slot_inst_set,
+  Field_r4_Slot_inst_set,
+  Field_t8_Slot_inst_set,
+  Field_s8_Slot_inst_set,
+  Field_r8_Slot_inst_set,
+  Field_xt_wbr15_imm_Slot_inst_set,
+  Field_xt_wbr18_imm_Slot_inst_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set
+};
+
+static xtensa_get_field_fn
+Slot_inst16a_get_field_fns[] = {
+  Field_t_Slot_inst16a_get,
+  0,
+  0,
+  0,
+  0,
+  Field_s_Slot_inst16a_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_op0_Slot_inst16a_get,
+  0,
+  0,
+  Field_r_Slot_inst16a_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_sr_Slot_inst16a_get,
+  Field_st_Slot_inst16a_get,
+  0,
+  Field_imm4_Slot_inst16a_get,
+  0,
+  Field_i_Slot_inst16a_get,
+  Field_imm6lo_Slot_inst16a_get,
+  Field_imm6hi_Slot_inst16a_get,
+  Field_imm7lo_Slot_inst16a_get,
+  Field_imm7hi_Slot_inst16a_get,
+  Field_z_Slot_inst16a_get,
+  Field_imm6_Slot_inst16a_get,
+  Field_imm7_Slot_inst16a_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_t2_Slot_inst16a_get,
+  Field_s2_Slot_inst16a_get,
+  Field_r2_Slot_inst16a_get,
+  Field_t4_Slot_inst16a_get,
+  Field_s4_Slot_inst16a_get,
+  Field_r4_Slot_inst16a_get,
+  Field_t8_Slot_inst16a_get,
+  Field_s8_Slot_inst16a_get,
+  Field_r8_Slot_inst16a_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Implicit_Field_ar0_get,
+  Implicit_Field_ar4_get,
+  Implicit_Field_ar8_get,
+  Implicit_Field_ar12_get,
+  Implicit_Field_mr0_get,
+  Implicit_Field_mr1_get,
+  Implicit_Field_mr2_get,
+  Implicit_Field_mr3_get,
+  Implicit_Field_bt16_get,
+  Implicit_Field_bs16_get,
+  Implicit_Field_br16_get,
+  Implicit_Field_brall_get
+};
+
+static xtensa_set_field_fn
+Slot_inst16a_set_field_fns[] = {
+  Field_t_Slot_inst16a_set,
+  0,
+  0,
+  0,
+  0,
+  Field_s_Slot_inst16a_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_op0_Slot_inst16a_set,
+  0,
+  0,
+  Field_r_Slot_inst16a_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_sr_Slot_inst16a_set,
+  Field_st_Slot_inst16a_set,
+  0,
+  Field_imm4_Slot_inst16a_set,
+  0,
+  Field_i_Slot_inst16a_set,
+  Field_imm6lo_Slot_inst16a_set,
+  Field_imm6hi_Slot_inst16a_set,
+  Field_imm7lo_Slot_inst16a_set,
+  Field_imm7hi_Slot_inst16a_set,
+  Field_z_Slot_inst16a_set,
+  Field_imm6_Slot_inst16a_set,
+  Field_imm7_Slot_inst16a_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_t2_Slot_inst16a_set,
+  Field_s2_Slot_inst16a_set,
+  Field_r2_Slot_inst16a_set,
+  Field_t4_Slot_inst16a_set,
+  Field_s4_Slot_inst16a_set,
+  Field_r4_Slot_inst16a_set,
+  Field_t8_Slot_inst16a_set,
+  Field_s8_Slot_inst16a_set,
+  Field_r8_Slot_inst16a_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set
+};
+
+static xtensa_get_field_fn
+Slot_inst16b_get_field_fns[] = {
+  Field_t_Slot_inst16b_get,
+  0,
+  0,
+  0,
+  0,
+  Field_s_Slot_inst16b_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_op0_Slot_inst16b_get,
+  0,
+  0,
+  Field_r_Slot_inst16b_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_sr_Slot_inst16b_get,
+  Field_st_Slot_inst16b_get,
+  0,
+  Field_imm4_Slot_inst16b_get,
+  0,
+  Field_i_Slot_inst16b_get,
+  Field_imm6lo_Slot_inst16b_get,
+  Field_imm6hi_Slot_inst16b_get,
+  Field_imm7lo_Slot_inst16b_get,
+  Field_imm7hi_Slot_inst16b_get,
+  Field_z_Slot_inst16b_get,
+  Field_imm6_Slot_inst16b_get,
+  Field_imm7_Slot_inst16b_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_t2_Slot_inst16b_get,
+  Field_s2_Slot_inst16b_get,
+  Field_r2_Slot_inst16b_get,
+  Field_t4_Slot_inst16b_get,
+  Field_s4_Slot_inst16b_get,
+  Field_r4_Slot_inst16b_get,
+  Field_t8_Slot_inst16b_get,
+  Field_s8_Slot_inst16b_get,
+  Field_r8_Slot_inst16b_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Implicit_Field_ar0_get,
+  Implicit_Field_ar4_get,
+  Implicit_Field_ar8_get,
+  Implicit_Field_ar12_get,
+  Implicit_Field_mr0_get,
+  Implicit_Field_mr1_get,
+  Implicit_Field_mr2_get,
+  Implicit_Field_mr3_get,
+  Implicit_Field_bt16_get,
+  Implicit_Field_bs16_get,
+  Implicit_Field_br16_get,
+  Implicit_Field_brall_get
+};
+
+static xtensa_set_field_fn
+Slot_inst16b_set_field_fns[] = {
+  Field_t_Slot_inst16b_set,
+  0,
+  0,
+  0,
+  0,
+  Field_s_Slot_inst16b_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_op0_Slot_inst16b_set,
+  0,
+  0,
+  Field_r_Slot_inst16b_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_sr_Slot_inst16b_set,
+  Field_st_Slot_inst16b_set,
+  0,
+  Field_imm4_Slot_inst16b_set,
+  0,
+  Field_i_Slot_inst16b_set,
+  Field_imm6lo_Slot_inst16b_set,
+  Field_imm6hi_Slot_inst16b_set,
+  Field_imm7lo_Slot_inst16b_set,
+  Field_imm7hi_Slot_inst16b_set,
+  Field_z_Slot_inst16b_set,
+  Field_imm6_Slot_inst16b_set,
+  Field_imm7_Slot_inst16b_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_t2_Slot_inst16b_set,
+  Field_s2_Slot_inst16b_set,
+  Field_r2_Slot_inst16b_set,
+  Field_t4_Slot_inst16b_set,
+  Field_s4_Slot_inst16b_set,
+  Field_r4_Slot_inst16b_set,
+  Field_t8_Slot_inst16b_set,
+  Field_s8_Slot_inst16b_set,
+  Field_r8_Slot_inst16b_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set
+};
+
+static xtensa_get_field_fn
+Slot_xt_flix64_slot0_get_field_fns[] = {
+  Field_t_Slot_xt_flix64_slot0_get,
+  0,
+  0,
+  0,
+  Field_imm8_Slot_xt_flix64_slot0_get,
+  Field_s_Slot_xt_flix64_slot0_get,
+  Field_imm12b_Slot_xt_flix64_slot0_get,
+  Field_imm16_Slot_xt_flix64_slot0_get,
+  Field_m_Slot_xt_flix64_slot0_get,
+  Field_n_Slot_xt_flix64_slot0_get,
+  0,
+  0,
+  Field_op1_Slot_xt_flix64_slot0_get,
+  Field_op2_Slot_xt_flix64_slot0_get,
+  Field_r_Slot_xt_flix64_slot0_get,
+  0,
+  Field_sae4_Slot_xt_flix64_slot0_get,
+  Field_sae_Slot_xt_flix64_slot0_get,
+  Field_sal_Slot_xt_flix64_slot0_get,
+  Field_sargt_Slot_xt_flix64_slot0_get,
+  0,
+  Field_sas_Slot_xt_flix64_slot0_get,
+  0,
+  0,
+  Field_thi3_Slot_xt_flix64_slot0_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_op0_xt_flix64_slot0_s3_Slot_xt_flix64_slot0_get,
+  Field_combined3e2c5767_fld7_Slot_xt_flix64_slot0_get,
+  Field_combined3e2c5767_fld8_Slot_xt_flix64_slot0_get,
+  Field_combined3e2c5767_fld9_Slot_xt_flix64_slot0_get,
+  Field_combined3e2c5767_fld11_Slot_xt_flix64_slot0_get,
+  Field_combined3e2c5767_fld49xt_flix64_slot0_Slot_xt_flix64_slot0_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_op0_xt_flix64_slot0_Slot_xt_flix64_slot0_get,
+  Implicit_Field_ar0_get,
+  Implicit_Field_ar4_get,
+  Implicit_Field_ar8_get,
+  Implicit_Field_ar12_get,
+  Implicit_Field_mr0_get,
+  Implicit_Field_mr1_get,
+  Implicit_Field_mr2_get,
+  Implicit_Field_mr3_get,
+  Implicit_Field_bt16_get,
+  Implicit_Field_bs16_get,
+  Implicit_Field_br16_get,
+  Implicit_Field_brall_get
+};
+
+static xtensa_set_field_fn
+Slot_xt_flix64_slot0_set_field_fns[] = {
+  Field_t_Slot_xt_flix64_slot0_set,
+  0,
+  0,
+  0,
+  Field_imm8_Slot_xt_flix64_slot0_set,
+  Field_s_Slot_xt_flix64_slot0_set,
+  Field_imm12b_Slot_xt_flix64_slot0_set,
+  Field_imm16_Slot_xt_flix64_slot0_set,
+  Field_m_Slot_xt_flix64_slot0_set,
+  Field_n_Slot_xt_flix64_slot0_set,
+  0,
+  0,
+  Field_op1_Slot_xt_flix64_slot0_set,
+  Field_op2_Slot_xt_flix64_slot0_set,
+  Field_r_Slot_xt_flix64_slot0_set,
+  0,
+  Field_sae4_Slot_xt_flix64_slot0_set,
+  Field_sae_Slot_xt_flix64_slot0_set,
+  Field_sal_Slot_xt_flix64_slot0_set,
+  Field_sargt_Slot_xt_flix64_slot0_set,
+  0,
+  Field_sas_Slot_xt_flix64_slot0_set,
+  0,
+  0,
+  Field_thi3_Slot_xt_flix64_slot0_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_op0_xt_flix64_slot0_s3_Slot_xt_flix64_slot0_set,
+  Field_combined3e2c5767_fld7_Slot_xt_flix64_slot0_set,
+  Field_combined3e2c5767_fld8_Slot_xt_flix64_slot0_set,
+  Field_combined3e2c5767_fld9_Slot_xt_flix64_slot0_set,
+  Field_combined3e2c5767_fld11_Slot_xt_flix64_slot0_set,
+  Field_combined3e2c5767_fld49xt_flix64_slot0_Slot_xt_flix64_slot0_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_op0_xt_flix64_slot0_Slot_xt_flix64_slot0_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set
+};
+
+static xtensa_get_field_fn
+Slot_xt_flix64_slot1_get_field_fns[] = {
+  Field_t_Slot_xt_flix64_slot1_get,
+  0,
+  0,
+  0,
+  Field_imm8_Slot_xt_flix64_slot1_get,
+  Field_s_Slot_xt_flix64_slot1_get,
+  Field_imm12b_Slot_xt_flix64_slot1_get,
+  0,
+  0,
+  0,
+  Field_offset_Slot_xt_flix64_slot1_get,
+  0,
+  0,
+  Field_op2_Slot_xt_flix64_slot1_get,
+  Field_r_Slot_xt_flix64_slot1_get,
+  0,
+  0,
+  Field_sae_Slot_xt_flix64_slot1_get,
+  Field_sal_Slot_xt_flix64_slot1_get,
+  Field_sargt_Slot_xt_flix64_slot1_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_op0_s4_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld16_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld19xt_flix64_slot1_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld20xt_flix64_slot1_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld21xt_flix64_slot1_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld22xt_flix64_slot1_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld23xt_flix64_slot1_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld25xt_flix64_slot1_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld26xt_flix64_slot1_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld28xt_flix64_slot1_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld30xt_flix64_slot1_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld32xt_flix64_slot1_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld33xt_flix64_slot1_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld35xt_flix64_slot1_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld51xt_flix64_slot1_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld52xt_flix64_slot1_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld53xt_flix64_slot1_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld54xt_flix64_slot1_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld57xt_flix64_slot1_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld58xt_flix64_slot1_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld60xt_flix64_slot1_Slot_xt_flix64_slot1_get,
+  Field_combined3e2c5767_fld62xt_flix64_slot1_Slot_xt_flix64_slot1_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Implicit_Field_ar0_get,
+  Implicit_Field_ar4_get,
+  Implicit_Field_ar8_get,
+  Implicit_Field_ar12_get,
+  Implicit_Field_mr0_get,
+  Implicit_Field_mr1_get,
+  Implicit_Field_mr2_get,
+  Implicit_Field_mr3_get,
+  Implicit_Field_bt16_get,
+  Implicit_Field_bs16_get,
+  Implicit_Field_br16_get,
+  Implicit_Field_brall_get
+};
+
+static xtensa_set_field_fn
+Slot_xt_flix64_slot1_set_field_fns[] = {
+  Field_t_Slot_xt_flix64_slot1_set,
+  0,
+  0,
+  0,
+  Field_imm8_Slot_xt_flix64_slot1_set,
+  Field_s_Slot_xt_flix64_slot1_set,
+  Field_imm12b_Slot_xt_flix64_slot1_set,
+  0,
+  0,
+  0,
+  Field_offset_Slot_xt_flix64_slot1_set,
+  0,
+  0,
+  Field_op2_Slot_xt_flix64_slot1_set,
+  Field_r_Slot_xt_flix64_slot1_set,
+  0,
+  0,
+  Field_sae_Slot_xt_flix64_slot1_set,
+  Field_sal_Slot_xt_flix64_slot1_set,
+  Field_sargt_Slot_xt_flix64_slot1_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_op0_s4_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld16_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld19xt_flix64_slot1_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld20xt_flix64_slot1_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld21xt_flix64_slot1_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld22xt_flix64_slot1_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld23xt_flix64_slot1_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld25xt_flix64_slot1_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld26xt_flix64_slot1_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld28xt_flix64_slot1_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld30xt_flix64_slot1_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld32xt_flix64_slot1_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld33xt_flix64_slot1_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld35xt_flix64_slot1_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld51xt_flix64_slot1_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld52xt_flix64_slot1_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld53xt_flix64_slot1_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld54xt_flix64_slot1_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld57xt_flix64_slot1_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld58xt_flix64_slot1_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld60xt_flix64_slot1_Slot_xt_flix64_slot1_set,
+  Field_combined3e2c5767_fld62xt_flix64_slot1_Slot_xt_flix64_slot1_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set
+};
+
+static xtensa_get_field_fn
+Slot_xt_flix64_slot2_get_field_fns[] = {
+  Field_t_Slot_xt_flix64_slot2_get,
+  0,
+  0,
+  0,
+  0,
+  Field_s_Slot_xt_flix64_slot2_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_r_Slot_xt_flix64_slot2_get,
+  0,
+  0,
+  0,
+  0,
+  Field_sargt_Slot_xt_flix64_slot2_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_imm7_Slot_xt_flix64_slot2_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_op0_s5_Slot_xt_flix64_slot2_get,
+  Field_combined3e2c5767_fld36xt_flix64_slot2_Slot_xt_flix64_slot2_get,
+  Field_combined3e2c5767_fld37xt_flix64_slot2_Slot_xt_flix64_slot2_get,
+  Field_combined3e2c5767_fld39xt_flix64_slot2_Slot_xt_flix64_slot2_get,
+  Field_combined3e2c5767_fld41xt_flix64_slot2_Slot_xt_flix64_slot2_get,
+  Field_combined3e2c5767_fld42xt_flix64_slot2_Slot_xt_flix64_slot2_get,
+  Field_combined3e2c5767_fld44xt_flix64_slot2_Slot_xt_flix64_slot2_get,
+  Field_combined3e2c5767_fld45xt_flix64_slot2_Slot_xt_flix64_slot2_get,
+  Field_combined3e2c5767_fld47xt_flix64_slot2_Slot_xt_flix64_slot2_get,
+  Field_combined3e2c5767_fld63xt_flix64_slot2_Slot_xt_flix64_slot2_get,
+  Field_combined3e2c5767_fld64xt_flix64_slot2_Slot_xt_flix64_slot2_get,
+  Field_combined3e2c5767_fld65xt_flix64_slot2_Slot_xt_flix64_slot2_get,
+  Field_combined3e2c5767_fld66xt_flix64_slot2_Slot_xt_flix64_slot2_get,
+  Field_combined3e2c5767_fld68xt_flix64_slot2_Slot_xt_flix64_slot2_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Implicit_Field_ar0_get,
+  Implicit_Field_ar4_get,
+  Implicit_Field_ar8_get,
+  Implicit_Field_ar12_get,
+  Implicit_Field_mr0_get,
+  Implicit_Field_mr1_get,
+  Implicit_Field_mr2_get,
+  Implicit_Field_mr3_get,
+  Implicit_Field_bt16_get,
+  Implicit_Field_bs16_get,
+  Implicit_Field_br16_get,
+  Implicit_Field_brall_get
+};
+
+static xtensa_set_field_fn
+Slot_xt_flix64_slot2_set_field_fns[] = {
+  Field_t_Slot_xt_flix64_slot2_set,
+  0,
+  0,
+  0,
+  0,
+  Field_s_Slot_xt_flix64_slot2_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_r_Slot_xt_flix64_slot2_set,
+  0,
+  0,
+  0,
+  0,
+  Field_sargt_Slot_xt_flix64_slot2_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_imm7_Slot_xt_flix64_slot2_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_op0_s5_Slot_xt_flix64_slot2_set,
+  Field_combined3e2c5767_fld36xt_flix64_slot2_Slot_xt_flix64_slot2_set,
+  Field_combined3e2c5767_fld37xt_flix64_slot2_Slot_xt_flix64_slot2_set,
+  Field_combined3e2c5767_fld39xt_flix64_slot2_Slot_xt_flix64_slot2_set,
+  Field_combined3e2c5767_fld41xt_flix64_slot2_Slot_xt_flix64_slot2_set,
+  Field_combined3e2c5767_fld42xt_flix64_slot2_Slot_xt_flix64_slot2_set,
+  Field_combined3e2c5767_fld44xt_flix64_slot2_Slot_xt_flix64_slot2_set,
+  Field_combined3e2c5767_fld45xt_flix64_slot2_Slot_xt_flix64_slot2_set,
+  Field_combined3e2c5767_fld47xt_flix64_slot2_Slot_xt_flix64_slot2_set,
+  Field_combined3e2c5767_fld63xt_flix64_slot2_Slot_xt_flix64_slot2_set,
+  Field_combined3e2c5767_fld64xt_flix64_slot2_Slot_xt_flix64_slot2_set,
+  Field_combined3e2c5767_fld65xt_flix64_slot2_Slot_xt_flix64_slot2_set,
+  Field_combined3e2c5767_fld66xt_flix64_slot2_Slot_xt_flix64_slot2_set,
+  Field_combined3e2c5767_fld68xt_flix64_slot2_Slot_xt_flix64_slot2_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set
+};
+
+static xtensa_get_field_fn
+Slot_xt_flix64_slot3_get_field_fns[] = {
+  Field_t_Slot_xt_flix64_slot3_get,
+  0,
+  Field_bbi_Slot_xt_flix64_slot3_get,
+  0,
+  0,
+  Field_s_Slot_xt_flix64_slot3_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_r_Slot_xt_flix64_slot3_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_xt_wbr18_imm_Slot_xt_flix64_slot3_get,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_op0_s6_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld70xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld71_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld72xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld73xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld74xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld75xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld76xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld77xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld78xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld79xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld80xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld81xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld82xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld83xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld84xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld85xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld86xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld87xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld88xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld89xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld90xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld91xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld92xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  Field_combined3e2c5767_fld93xt_flix64_slot3_Slot_xt_flix64_slot3_get,
+  0,
+  Implicit_Field_ar0_get,
+  Implicit_Field_ar4_get,
+  Implicit_Field_ar8_get,
+  Implicit_Field_ar12_get,
+  Implicit_Field_mr0_get,
+  Implicit_Field_mr1_get,
+  Implicit_Field_mr2_get,
+  Implicit_Field_mr3_get,
+  Implicit_Field_bt16_get,
+  Implicit_Field_bs16_get,
+  Implicit_Field_br16_get,
+  Implicit_Field_brall_get
+};
+
+static xtensa_set_field_fn
+Slot_xt_flix64_slot3_set_field_fns[] = {
+  Field_t_Slot_xt_flix64_slot3_set,
+  0,
+  Field_bbi_Slot_xt_flix64_slot3_set,
+  0,
+  0,
+  Field_s_Slot_xt_flix64_slot3_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_r_Slot_xt_flix64_slot3_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_xt_wbr18_imm_Slot_xt_flix64_slot3_set,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  Field_op0_s6_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld70xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld71_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld72xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld73xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld74xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld75xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld76xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld77xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld78xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld79xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld80xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld81xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld82xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld83xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld84xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld85xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld86xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld87xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld88xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld89xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld90xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld91xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld92xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  Field_combined3e2c5767_fld93xt_flix64_slot3_Slot_xt_flix64_slot3_set,
+  0,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set,
+  Implicit_Field_set
+};
+
+static xtensa_slot_internal slots[] = {
+  { "Inst", "x24", 0,
+    Slot_x24_Format_inst_0_get, Slot_x24_Format_inst_0_set,
+    Slot_inst_get_field_fns, Slot_inst_set_field_fns,
+    Slot_inst_decode, "nop" },
+  { "Inst16a", "x16a", 0,
+    Slot_x16a_Format_inst16a_0_get, Slot_x16a_Format_inst16a_0_set,
+    Slot_inst16a_get_field_fns, Slot_inst16a_set_field_fns,
+    Slot_inst16a_decode, "" },
+  { "Inst16b", "x16b", 0,
+    Slot_x16b_Format_inst16b_0_get, Slot_x16b_Format_inst16b_0_set,
+    Slot_inst16b_get_field_fns, Slot_inst16b_set_field_fns,
+    Slot_inst16b_decode, "nop.n" },
+  { "xt_flix64_slot0", "xt_format1", 0,
+    Slot_xt_format1_Format_xt_flix64_slot0_4_get, Slot_xt_format1_Format_xt_flix64_slot0_4_set,
+    Slot_xt_flix64_slot0_get_field_fns, Slot_xt_flix64_slot0_set_field_fns,
+    Slot_xt_flix64_slot0_decode, "nop" },
+  { "xt_flix64_slot0", "xt_format2", 0,
+    Slot_xt_format2_Format_xt_flix64_slot0_4_get, Slot_xt_format2_Format_xt_flix64_slot0_4_set,
+    Slot_xt_flix64_slot0_get_field_fns, Slot_xt_flix64_slot0_set_field_fns,
+    Slot_xt_flix64_slot0_decode, "nop" },
+  { "xt_flix64_slot1", "xt_format1", 1,
+    Slot_xt_format1_Format_xt_flix64_slot1_28_get, Slot_xt_format1_Format_xt_flix64_slot1_28_set,
+    Slot_xt_flix64_slot1_get_field_fns, Slot_xt_flix64_slot1_set_field_fns,
+    Slot_xt_flix64_slot1_decode, "nop" },
+  { "xt_flix64_slot2", "xt_format1", 2,
+    Slot_xt_format1_Format_xt_flix64_slot2_48_get, Slot_xt_format1_Format_xt_flix64_slot2_48_set,
+    Slot_xt_flix64_slot2_get_field_fns, Slot_xt_flix64_slot2_set_field_fns,
+    Slot_xt_flix64_slot2_decode, "nop" },
+  { "xt_flix64_slot3", "xt_format2", 1,
+    Slot_xt_format2_Format_xt_flix64_slot3_28_get, Slot_xt_format2_Format_xt_flix64_slot3_28_set,
+    Slot_xt_flix64_slot3_get_field_fns, Slot_xt_flix64_slot3_set_field_fns,
+    Slot_xt_flix64_slot3_decode, "nop" }
+};
+
+
+/* Instruction formats.  */
+
+static void
+Format_x24_encode (xtensa_insnbuf insn)
+{
+  insn[0] = 0;
+  insn[1] = 0;
+}
+
+static void
+Format_x16a_encode (xtensa_insnbuf insn)
+{
+  insn[0] = 0x8;
+  insn[1] = 0;
+}
+
+static void
+Format_x16b_encode (xtensa_insnbuf insn)
+{
+  insn[0] = 0xc;
+  insn[1] = 0;
+}
+
+static void
+Format_xt_format1_encode (xtensa_insnbuf insn)
+{
+  insn[0] = 0xe;
+  insn[1] = 0;
+}
+
+static void
+Format_xt_format2_encode (xtensa_insnbuf insn)
+{
+  insn[0] = 0xf;
+  insn[1] = 0;
+}
+
+static int Format_x24_slots[] = { 0 };
+
+static int Format_x16a_slots[] = { 1 };
+
+static int Format_x16b_slots[] = { 2 };
+
+static int Format_xt_format1_slots[] = { 3, 5, 6 };
+
+static int Format_xt_format2_slots[] = { 4, 7 };
+
+static xtensa_format_internal formats[] = {
+  { "x24", 3, Format_x24_encode, 1, Format_x24_slots },
+  { "x16a", 2, Format_x16a_encode, 1, Format_x16a_slots },
+  { "x16b", 2, Format_x16b_encode, 1, Format_x16b_slots },
+  { "xt_format1", 8, Format_xt_format1_encode, 3, Format_xt_format1_slots },
+  { "xt_format2", 8, Format_xt_format2_encode, 2, Format_xt_format2_slots }
+};
+
+
+static int
+format_decoder (const xtensa_insnbuf insn)
+{
+  if ((insn[0] & 0x8) == 0 && (insn[1] & 0) == 0)
+    return 0; /* x24 */
+  if ((insn[0] & 0xc) == 0x8 && (insn[1] & 0) == 0)
+    return 1; /* x16a */
+  if ((insn[0] & 0xe) == 0xc && (insn[1] & 0) == 0)
+    return 2; /* x16b */
+  if ((insn[0] & 0xf) == 0xe && (insn[1] & 0) == 0)
+    return 3; /* xt_format1 */
+  if ((insn[0] & 0xf) == 0xf && (insn[1] & 0x80000000) == 0)
+    return 4; /* xt_format2 */
+  return -1;
+}
+
+static int length_table[16] = {
+  3,
+  3,
+  3,
+  3,
+  3,
+  3,
+  3,
+  3,
+  2,
+  2,
+  2,
+  2,
+  2,
+  2,
+  8,
+  8
+};
+
+static int
+length_decoder (const unsigned char *insn)
+{
+  int op0 = insn[0] & 0xf;
+  return length_table[op0];
+}
+
+
+/* Top-level ISA structure.  */
+
+xtensa_isa_internal xtensa_modules = {
+  0 /* little-endian */,
+  8 /* insn_size */, 0,
+  5, formats, format_decoder, length_decoder,
+  8, slots,
+  135 /* num_fields */,
+  188, operands,
+  355, iclasses,
+  530, opcodes, 0,
+  8, regfiles,
+  NUM_STATES, states, 0,
+  NUM_SYSREGS, sysregs, 0,
+  { MAX_SPECIAL_REG, MAX_USER_REG }, { 0, 0 },
+  0, interfaces, 0,
+  0, funcUnits, 0
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/BRANCHES sdcc-3.2.0+dfsg/support/sdbinutils/binutils/BRANCHES
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/BRANCHES	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/BRANCHES	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,40 @@
+Please keep the following tables alphabetical.
+
+Organization Tag	Organization Name
+----------------	-----------------
+csl			CodeSourcery, LLC	
+
+This table lists branches created by particular organizations.  Please
+include the branch name, and a description of the branch.  The branch
+description should name the owner of the branch (i.e., the person to
+contact regarding the branch) and a description of the commit policy
+for the branch (e.g., "no commits without permission of X or Y").
+	
+Organization Branches	Description
+---------------------	-----------
+binutils-csl-arm-2005q1-branch
+			CodeSourcery toolchain release branches.
+			Please do not commit to these branches without
+			permission from a CodeSourcery developer.
+
+binutils-csl-gxxpro-3_4-branch
+binutils-csl-2_17-branch
+			CodeSourcery branded GNU Toolchain release branches.
+			Please do not commit to this branch without
+			permission from a CodeSourcery developer.
+
+Release Branches
+----------------
+binutils-2_10-branch
+binutils-2_11-branch
+binutils-2_12-branch
+binutils-2_13-branch
+binutils-2_14-branch
+binutils-2_15-branch
+binutils-2_16-branch
+binutils-2_17-branch
+binutils-2_18-branch
+binutils-2_19-branch
+binutils-2_20-branch
+binutils-2_21-branch
+binutils-2_22-branch
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,652 @@
+2011-10-25  Alan Modra  <amodra@gmail.com>
+
+	Apply mainline patches
+	2011-10-16  H.J. Lu  <hongjiu.lu@intel.com>
+	PR binutils/13278
+	* ar.c (open_inarch): Set the target from the the first object
+	on the list only if it isn't set.
+
+2011-09-22  Tristan Gingold  <gingold@adacore.com>
+
+	* NEWS: Add marker for 2.22.
+
+2011-09-21  David S. Miller  <davem@davemloft.net>
+
+	* MAINTAINER: Take over from Jakub Jalinek as SPARC maintainer.
+
+	* readelf.c (display_sparc_hwcaps): New.
+	(display_sparc_gnu_attribute): New.
+	(process_sparc_specific): New.
+	(process_arch_specific): When EM_SPARC, EM_SPARC32PLUS,
+	or EM_SPARCV9 invoke process_sparc_specific.
+
+2011-09-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/13196
+	* dwarf.c (display_debug_aranges): Check zero address size.
+
+2011-09-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/13180
+	* objcopy.c (is_strip_section_1): New.
+	(is_strip_section): Use it.  Remove the group section if all
+	members are removed.
+
+2011-09-08  Nick Clifton  <nickc@redhat.com>
+
+	* po/ja.po: Updated Japanese translation.
+
+2011-08-26  Nick Clifton  <nickc@redhat.com>
+
+	* po/es.po: Updated Spanish translation.
+
+2011-08-08  Marcus Comstedt  <marcus@mc.pp.se>
+
+	PR binutils/12964
+	* Makefile.am (embedspu): Use awk rather than sed.
+	* Makefile.in: Regenerate.
+
+2011-07-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* dwarf.c (read_and_display_attr_value): Recognize DW_FORM_data4 and
+	DW_FORM_data8 as location list pointers only for DWARF < 4.
+
+2011-07-26  Jakub Jelinek  <jakub@redhat.com>
+
+	* NEWS: Mention .debug_macro support.
+	* dwarf.c (read_and_display_attr_value): Don't print a tab
+	if attribute is 0.
+	(get_AT_name): Handle DW_AT_GNU_macros.
+	(get_line_filename_and_dirname, display_debug_macro): New
+	functions.
+	(debug_displays): Add an entry for .debug_macro and .zdebug_macro.
+	* readelf.c (process_section_headers): With do_debug_macinfo
+	handle also .debug_macro sections.
+	* dwarf.h (dwarf_section_display_enum): Add macro.
+
+2011-07-24  Chao-ying Fu  <fu@mips.com>
+            Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* readelf.c (get_machine_flags): Handle microMIPS ASE.
+	(get_mips_symbol_other): Likewise.
+
+2011-07-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* dwarf.c (init_dwarf_regnames): Handle EM_K1OM.
+
+	* elfedit.c (elf_machine): Support EM_K1OM.
+	(elf_class): Likewise.
+
+	* readelf.c (guess_is_rela): Handle EM_K1OM.
+	(dump_relocations): Likewise.
+	(get_machine_name): Likewise.
+	(get_section_type_name): Likewise.
+	(get_elf_section_flags): Likewise.
+	(process_section_headers): Likewise.
+	(get_symbol_index_type): Likewise.
+	(is_32bit_abs_reloc): Likewise.
+	(is_32bit_pcrel_reloc): Likewise.
+	(is_64bit_abs_reloc): Likewise.
+	(is_64bit_pcrel_reloc): Likewise.
+	(is_none_reloc): Likewise.
+
+	* doc/binutils.texi: Mention K1OM for elfedit.
+
+2011-07-11  Cary Coutant  <ccoutant@google.com>
+
+	PR 12983
+	* binutils/nm.c (display_file): Decompress debug sections when
+	printing line numbers.
+
+2011-07-03  Samuel Thibault  <samuel.thibault@gnu.org>
+	    Thomas Schwinge  <thomas@schwinge.name>
+
+	PR binutils/12913
+	* elfedit.c (osabis): Use ELFOSABI_GNU name instead of ELFOSABI_LINUX
+	alias and ELFOSABI_HURD.  Add GNU alias.
+	* readelf.c (get_osabi_name, get_symbol_binding, get_symbol_type):
+	Likewise.
+	* doc/binutils.texi <elfedit>: Update accordingly.
+
+2011-07-01  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/12325
+	* doc/binutils.texi (ar cmdline): Document --target, --version and
+	--help command line options.
+
+2011-06-30  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/12558
+	* ar.c (main): When asked to move members in an archive that is
+	being created, ignore the move request.
+
+2011-06-29  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (get_section_type_name): When displaying an unknown
+	section type display the hex value first on the assumption that
+	the full message will probably be truncated into a 15 character
+	field.
+
+2011-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf.c (decode_location_expression): For DW_OP_GNU_convert and
+	DW_OP_GNU_reinterpret, if uvalue is 0, don't add cu_offset.
+	Handle DW_OP_GNU_parameter_ref.
+
+2011-06-16  Tom Tromey  <tromey@redhat.com>
+
+	* dwarf-mode.el (dwarf-do-insert-substructure): Call
+	expand-file-name.
+	(dwarf-do-refresh): Likewise.
+
+2011-06-15  Ulrich Weigand  <ulrich.weigand@linaro.org>
+
+	* readelf.c (get_note_type): Handle NT_ARM_VFP.
+
+2011-06-13  Walter Lee  <walt@tilera.com>
+
+	* readelf.c: Include tilepro.h and tilegx.h.
+	(guess_is_rela): Handle EM_TILEGX and EM_TILEPRO.
+	(dump_relocations): Likewise.
+	(get_machine_name): Likewise.
+	(is_32bit_abs_reloc): Likewise.
+	(is_32bit_pcerel_reloc): Likewise.
+	(is_64bit_abs_reloc): Likewise.
+	(is_64bit_pcrel_reloc): Likewise.
+
+2011-06-09  Tristan Gingold  <gingold@adacore.com>
+
+	* od-xcoff.c (xcoff32_read_symbols): Allow missing string table
+	length.
+
+2011-06-08  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/12855
+	* readelf.c (process_version_sections): Handle binaries containing
+	corrupt version information.
+	(process_symbol_table): Stop processing a symbol's version
+	information if it could not be read in.
+
+	(get_data): Add comment describing the function.
+	(process_section_headers): Set dynamic_strings_length to 0 if the
+	dynamic strings could not be read in.
+	(process_dynamic_section): Likewise.
+	(process_section_groups): Stop processing the group information if
+	the data could not be read in.
+	(hppa_processs_unwind): Assert that there is only one string table
+	in the file.
+	(arm_process_unwind): Likewise.
+	(ia64_process_unwind): Likewise.
+	Set the size of the unwind auxillary information to 0 if the data
+	could not be read.
+	(load_specific_debug_section): Handle a failure to read in the
+	section.
+	(process_mips_specific): Stop display of the PLT GOT section if it
+	could not be read in.
+
+2011-06-08  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms (DEFS): Define OBJDUMP_PRIVATE_VECTORS.
+
+2011-06-07  Cary Coutant  <ccoutant@google.com>
+
+	* dwarf.c: Fix conversion to TU number.
+
+2011-06-02  Nick Clifton  <nickc@redhat.com>
+
+	* resres.c: Fix spelling typo.
+	* windint.h: Likewise.
+	* windmc.c: Likewise.
+	* windres.c: Likewise.
+	* po/POTFILES.in: Regenerate.
+	* po/binutils.pot: Regenerate.
+
+2011-06-01  Daniel Jacobowitz  <drow@false.org>
+
+	* MAINTAINERS: Update my email address.
+
+2011-05-31  Matthias Klose  <doko@ubuntu.com>
+
+	* configure.in (BUILD_INSTALL_MISC): Only add embedspu once.
+	* configure: Regenerate.
+
+2011-05-30  Alan Modra  <amodra@gmail.com>
+
+	PR binutils/12820
+	* Makefile.am (bin_PROGRAMS): Move BUILD_INSTALL_MISC to..
+	(bin_SCRIPTS): ..here.
+	(EXTRA_SCRIPTS): Define.
+	(EXTRA_DIST): Add embedspu.sh.
+	(DISTCLEANFILES): Add embedspu.
+	(embedspu): Depend on Makefile.  Replace sed "s" command with "c".
+	* Makefile.in: Regenerate.
+
+2011-05-25  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf.c (loc_offsets): New variable.
+	(loc_offsets_compar): New routine.
+	(display_debug_loc): Handle loc_offsets not being in ascending order
+	and also a single .debug_loc entry being used multiple times.
+
+2011-05-18  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/12753
+	* nm.c (filter_symbols): Treat unique symbols as global symbols.
+	* doc/binutils.texi (nm): Mention that some lowercase letters
+	actually indicate global symbols.
+
+2011-05-15  Tristan Gingold  <gingold@adacore.com>
+
+	* od-xcoff.c: New file.
+	* objdump.h: New file.
+	* objdump.c: Include objdump.h
+	(dump_private_options, objdump_private_vectors): New variables.
+	(usage): Mention -P/--private.  Display handled options.
+	(long_options): Add -P/--private.
+	(dump_target_specific): New function.
+	(dump_bfd): Handle dump_private_options.
+	(main): Handle -P.
+	* doc/binutils.texi (objdump): Document -P/--private.
+	* configure.in (OBJDUMP_PRIVATE_VECTORS, OBJDUMP_PRIVATE_OFILES):
+	New variables, compute them.
+	(od_vectors): Add vectors for private dumpers. Make them uniq.
+	(OBJDUMP_DEFS): Add OBJDUMP_PRIVATE_VECTORS.
+	* Makefile.am (HFILES): Add objdump.h
+	(CFILES): Add od-xcoff.c
+	(OBJDUMP_PRIVATE_OFILES): New variable.
+	(objdump_DEPENDENCIES): Append OBJDUMP_PRIVATE_OFILES.
+	(objdump_LDADD): Ditto.
+	(EXTRA_objdump_SOURCES): Define.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2011-05-10  Tristan Gingold  <gingold@adacore.com>
+
+	* dwarf.c (process_extended_line_op): Dump unknown records.
+
+2011-05-07  Alan Modra  <amodra@gmail.com>
+
+	PR binutils/12632
+	* objcopy.c (copy_archive): Check bfd_openw result in unknown object
+	case.  Rewrite without goto.
+
+2011-05-03  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf.c (decode_location_expression): Handle DW_OP_GNU_const_type,
+	DW_OP_GNU_regval_type, DW_OP_GNU_deref_type, DW_OP_GNU_convert
+	and DW_OP_GNU_reinterpret.
+
+	* MAINTAINERS: Add myself as DWARF2 maintainer.
+
+2011-05-02  Alan Modra  <amodra@gmail.com>
+
+	PR binutils/12720
+	Revert the following change
+	Michael Snyder  <msnyder@vmware.com>
+	* ar.c (move_members): Plug memory leak.
+	(delete_members): Plug memory leak.
+
+2011-04-28  Tom Tromey  <tromey@redhat.com>
+
+	* NEWS: Add note about --dwarf-depth, --dwarf-start, and
+	dwarf-mode.el.
+	* objdump.c (suppress_bfd_header): New global.
+	(usage): Update.
+	(OPTION_DWARF_DEPTH, OPTION_DWARF_START): New constants.
+	(options): Add dwarf-depth and dwarf-start entries.
+	(dump_bfd): Use suppress_bfd_header.
+	(main): Handle OPTION_DWARF_START, OPTION_DWARF_DEPTH.
+	* doc/binutils.texi (objcopy): Document --dwarf-depth and
+	--dwarf-start.
+	(readelf): Likewise.
+	* dwarf-mode.el: New file.
+	* dwarf.c (dwarf_cutoff_level, dwarf_start_die): New globals.
+	(read_and_display_attr_value): Also check debug_info_p.
+	(process_debug_info): Handle dwarf_start_die and
+	dwarf_cutoff_level.
+	* dwarf.h (dwarf_cutoff_level, dwarf_start_die): Declare.
+	* readelf.c (usage): Update.
+	(OPTION_DWARF_DEPTH): New macro.
+	(OPTION_DWARF_START): Likewise.
+	(options): Add dwarf-depth and dwarf-start entries.
+	(parse_args): Handle OPTION_DWARF_START and OPTION_DWARF_DEPTH.
+
+2011-04-28  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* dwarf.c (display_gdb_index): Support version 5, warn on version 4.
+
+2011-04-27  Tristan Gingold  <gingold@adacore.com>
+
+	* dwarf.c (process_extended_line_op): Handle
+	DW_LNE_HP_source_file_correlation.
+
+2011-04-27  Nick Clifton  <nickc@redhat.com>
+
+	* po/da.po: Updated Danish translation.
+
+2011-04-21  Tom Tromey  <tromey@redhat.com>
+
+	* readelf.c (print_stapsdt_note): New function.
+	(process_note): Use it.
+
+2011-04-21  Tom Tromey  <tromey@redhat.com>
+
+	* readelf.c (get_stapsdt_note_type): New function.
+	(process_note): Recognize "stapsdt" notes.
+
+2011-04-21  Tom Tromey  <tromey@redhat.com>
+
+	* readelf.c (process_corefile_note_segment): Change header field
+	widths.
+	(process_note): Change field widths.
+
+2011-04-21  Tom Tromey  <tromey@redhat.com>
+
+	* readelf.c (print_gnu_note): New function.
+	(process_note): Use it.
+
+2011-04-21  Jie Zhang  <jzhang918@gmail.com>
+
+	* MAINTAINERS: Update my email address.
+
+2011-04-11  Kai Tietz  <ktietz@redhat.com>
+
+	* windres.c (usage): Add new --preprocessor-arg option.
+	(option_values): Add new OPTION_PREPROCESSOR_ARG enumerator.
+	(option long_options): Add preprocessor-arg option.
+	(main): Handle it.
+	* doc/binutils.texi: Add documentation for --preprocessor-arg
+	option.
+	* NEWS: Add line about new --preprocessor-arg option for windres.
+
+2011-04-08  John Marino  <binutils@marino.st>
+
+	* arlex.l: Prevent redefinition of YY_NO_UNPUT.
+	* syslex.l: Likewise.
+
+2011-04-07  Paul Brook  <paul@codesourcery.com>
+
+	* readelf.c (arm_section_get_word): Handle C6000 relocations.
+	(decode_tic6x_unwind_regmask, decode_arm_unwind_bytecode,
+	decode_tic6x_unwind_bytecode, expand_prel31): New functions.
+	(decode_arm_unwind): Split out common code from ARM specific bits.
+	(dump_arm_unwind): Use expand_prel31.
+	(arm_process_unwind): Handle SHT_C6000_UNWIND sections.
+	(process_unwind): Add SHT_C6000_UNWIND.
+
+2011-04-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.in (thumb-*-pe*): Remove.
+	* configure: Regenerate.
+
+2011-04-05  Sterling Augustine  <augustine.sterling@gmail.com>
+
+	* MAINTAINERS: Update my email address.
+
+2011-04-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/12632
+	* objcopy.c (copy_unknown_object): Make the archive element
+	readable.
+
+2011-04-03  David S. Miller  <davem@davemloft.net>
+
+	* objdump.c (dump_reloc_set): Output R_SPARC_OLO10 relocations
+	accurately, rather than how they are represented internally.
+
+2011-03-31  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms (readelf.exe): New target.
+
+2011-03-31  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms (DEBUG_OBJS): Add elfcomm.obj.
+
+2011-03-31  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* readelf.c (get_symbol_index_type): Handle SCOM for TIC6X.
+	(dump_relocations): Likewise.
+
+2011-03-31  Tristan Gingold  <gingold@adacore.com>
+
+	* readelf.c (get_ia64_vms_note_type): New function.
+	(print_ia64_vms_note): Ditto.
+	(process_note): Recognize VMS/ia64 specific notes.
+	Display them.
+	(process_corefile_note_segment): Decode VMS notes.
+
+2011-03-30  Catherine Moore  <clm@codesourcery.com>
+
+	* addr2line.c (translate_addresses): Sign extend the pc
+	if sign_extend_vma is enabled.
+
+2011-03-30  Michael Snyder  <msnyder@msnyder-server.eng.vmware.com>
+
+	* readelf.c (process_gnu_liblist): Stop memory leak.
+
+2011-03-29  Alan Modra  <amodra@gmail.com>
+
+	* coffdump.c: Include bfd_stdint.h
+
+2011-03-28  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	* coffdump.c (coff_dump): Correct spelling error.
+	(show_usage): Replace SYSROFF by COFF.
+
+2011-03-25  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	* coffdump.c (dump_coff_scope): Use double typecast for pointer P
+	to allow compilation for all targets.
+
+2011-03-25  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	* dwarf.c (process_debug_info): Use offset_size to determine
+	the bit-size of the computation unit's offset.
+	(decode_location_expression): Use dwarf_vmatoa function to display
+	DW_OP_addr OP.
+	(process_debug_info): Use dwarf_vma type for local variables
+	length and type_offset.
+
+2011-03-25  Michael Snyder  <msnyder@vmware.com>
+
+	* strings.c (print_strings): Plug memory leak.
+	* ar.c (move_members): Plug memory leak.
+	(delete_members): Plug memory leak.
+	(write_archive): Plug memory leak.
+	* ieee.c (ieee_add_bb11): Plug memory leak.
+	(ieee_function_type): Likewise.
+	(ieee_class_baseclass): Likewise.
+	* prdbg.c (pr_function_type): Close memory leaks.
+	(pr_method_type): Likewise.
+	(tg_class_static_member): Likewise.
+	(tg_class_method_variant): Likewise.
+	(tg_class_static_method_variant): Likewise.
+	* stabs.c (parse_stab_enum_type): Fix memory leaks.
+	(parse_stab_struct_type): Likewise.
+	(parse_stab_struct_fields): Likewise.
+	(parse_stab_one_struct_field): Likewise.
+	(parse_stab_members): Likewise.
+	(stab_demangle_qualified): Likewise.
+	* objdump.c (dump_reloc_set): Free malloced memory.
+	* bucomm.c (make_tempname): Stop memory leak.
+
+2011-03-25  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	Replace bfd_vma type and analog types by dwarf_vma and analogs.
+	Use dwarf specific print functions to display these type values.
+	* dwarf.h (dwarf_signed_vma): New type;
+	(DWARF2_External_LineInfo): Replace bfd_vma by dwarf_vma.
+	(DWARF2_External_PubNames): Likewise.
+	(DWARF2_External_CompUnit): Likewise.
+	(DWARF2_External_ARange): Likewise.
+	(read_leb128): Change return type to dwarf_vma.
+	* dwarf.c (print_dwarf_vma): Use __MINGW32__ conditional and
+	check byte_size values.
+	(dwarf_vmatoa): Change parameter type to dwarf_vma.
+	(dwarf_svmatoa): New static function.
+	(read_leb128): Change return type to dwarf_vma.
+	(read_sleb128): New static function.
+	(struct State_Machine_Registers): Change address field type to
+	dwarf_vma.
+	(process_extended_line_op): Adapt to type changes.
+	(fetch_indirect_string): Likewise.
+	(idisplay_block): Likewise.
+	(decode_location_expression): Likewise.
+	(read_and_display_attr_value): Likewise.
+	(process_debug_info): Likewise.
+	(display_debug_lines_raw): Likewise.
+	(display_debug_lines_decoded): Likewise.
+	(SLEB macro): Use new read_sleb128 function.
+
+2011-03-17  Alan Modra  <amodra@gmail.com>
+
+	PR 12590
+	* ar.c (ranlib_main): Init arg_index properly.
+	(usage): Describe --target.
+
+2011-03-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf.c (dw_TAG_name): Handle DW_TAG_GNU_call_site_parameter.
+	(read_and_display_attr_value): Handle DW_AT_GNU_call_site_data_value,
+	DW_AT_GNU_call_site_target and DW_AT_GNU_call_site_target_clobbered.
+	(get_AT_name): Handle DW_AT_GNU_call_site_value,
+	DW_AT_GNU_call_site_data_value, DW_AT_GNU_call_site_target,
+	DW_AT_GNU_call_site_target_clobbered, DW_AT_GNU_tail_call,
+	DW_AT_GNU_all_tail_call_sites, DW_AT_GNU_all_call_sites and
+	DW_AT_GNU_all_source_call_sites.
+	(decode_location_expression) <case DW_OP_GNU_entry_value>: Adjust
+	handling.
+
+2011-03-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* dwarf.c (get_TAG_name): Handle DW_TAG_GNU_call_site.
+	(decode_location_expression): Handle DW_OP_GNU_entry_value.
+	(read_and_display_attr_value): Handle DW_AT_GNU_call_site_value.
+	(get_AT_name): Likewise.
+
+2011-03-14  Michael Snyder  <msnyder@vmware.com>
+
+	* objcopy.c (set_pe_subsystem): Free subsystem.
+
+	* wrstabs.c (stab_start_struct_type): Close memory leak.
+
+	* readelf.c (process_version_sections): Free symbols.
+
+	* nm.c (display_rel_file): Free symsizes.
+
+2011-03-10  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (get_machine_name): Update EM_V850 entry.
+
+2011-03-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* objdump.c (usage): Fix single typo.
+	* po/bg.po, po/binutils.pot, po/da.po, po/es.po, po/fi.po,
+	po/fr.po, po/id.po, po/ja.po, po/ru.po, po/vi.po: Likewise.
+
+2011-03-01  Akos Pasztory  <akos.pasztory@gmail.com>
+
+	PR binutils/12523
+	* readelf.c (process_object): Clear dynamic_info_DT_GNU_HASH.
+
+2011-02-28  Kai Tietz  <kai.tietz@onevision.com>
+
+	* debug.c (debug_start_source): Use filename_(n)cmp.
+	* ieee.c (ieee_finish_compilation_unit): Likewise.
+	(ieee_lineno): Likewise.
+	* nlmconv.c (main): Likewise.
+	* objcopy.c (strip_main): Likewise.
+	(copy_main): Likewise.
+	* objdump.c (show_line): Likewise.
+	(dump_reloc_set): Likewise.
+	* srconv.c (main): Likewise.
+	* wrstabs.c (stab_lineno): Likewise.
+
+2011-02-24  Zachary T Welch  <zwelch@codesourcery.com>
+
+	* readelf.c (decode_arm_unwind): Implement decoding of remaining
+	ARM unwind instructions (i.e. VFP/NEON and Intel Wireless MMX).
+
+2011-02-23  Kai Tietz  <kai.tietz@onevision.com>
+
+	* dwarf.c (read_leb128): Use bfd_vma instead of
+	long type.
+	(dwarf_vmatoa): New helper routine.
+	(process_extended_line_op): Use for adr bfd_vma
+	type and print those typed values via BFD_VMA_FMT
+	or via dwarf_vmatoa for localized prints.
+	(fetch_indirect_string): Adjust offset's type.
+	(decode_location_expression): Adjust argument types
+	and uvalue type.
+	(read_and_display_attr_value): Likewise.
+	(read_and_display_attr): Likewise.
+	(decode_location_expression): Adjust printf format.
+	(process_debug_info): Likewise.
+	(display_debug_lines_raw): Likewise.
+	(display_debug_lines_decoded): Likewise.
+	(display_debug_pubnames): Likewise.
+	(display_debug_loc): Likewise.
+	(display_debug_aranges): Likewise.
+	* dwarf.h (DWARF2_External_LineInfo,
+	DWARF2_Internal_LineInfo, DWARF2_External_PubNames,
+	DWARF2_Internal_PubNames, DWARF2_External_CompUnit,
+	DWARF2_Internal_CompUnit, DWARF2_External_ARange,
+	DWARF2_Internal_ARange): Added..
+	(read_leb128): Adjust return type.
+
+2011-02-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure: Regenerate.
+
+2011-02-08  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/12467
+	* readelf.c (process_program_headers): Issue a warning if there
+	are no program headers but the file header has a non-zero program
+	header offset.
+	(process_section_headers): Issue a warning if there are no section
+	headers but the file header has a non-zero section header offset.
+	(process_section_groups): Reword the no section message so that it
+	can be distinguished from the one issued by process_section_headers.
+
+2011-01-26  Jan Kratochvil  <jan.kratochvil@redhat.com>
+	    Doug Evans  <dje@google.com>
+
+	* dwarf.c (display_gdb_index): Support version 4, warn on version 3.
+
+2011-01-19  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* readelf.c (process_object): Free dynamic_section after use.
+
+2011-01-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/12408
+	* readelf.c (process_archive): Free and reset dump_sects
+	after processing each archive member.
+
+2011-01-11  Andreas Schwab  <schwab@redhat.com>
+
+	* readelf.c (print_symbol): Handle symbol characters as unsigned.
+	Whitespace fixes.
+
+2011-01-10  Nick Clifton  <nickc@redhat.com>
+
+	* po/da.po: Updated Danish translation.
+
+2011-01-06  Vladimir Siminov  <sv@sw.ru>
+
+	* bucomm.c (get_file_size): Check for negative sizes and issue a
+	warning message if encountered.
+
+2011-01-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* version.c (print_version): Update copyright to 2011.
+
+For older changes see ChangeLog-2010
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-0001 sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-0001
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-0001	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-0001	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2060 @@
+2001-12-20  Julian v. Bock  <julian@wongr.net>
+
+	* readelf.c (print_symbol): New function: Print a formatted symbol
+	name.  If --wide is specified do not truncate it.
+	(dump_relocations): Use print_symbol() to print symbol names.
+	(process_symbol_table): Likewise.
+	(process_syminfo): Likewise.
+	(process_mips_specific): Likewise.
+	(usage): Document new feature of --wide switch.
+	* doc/binutils.texi (objdump): Document additional behaviour of
+	--wide.
+
+2001-12-18  Michael Snyder  <msnyder@redhat.com>
+
+	* objcopy.c (copy_file): Accept corefiles (format bfd_core).
+	(copy_object): Don't set the start address or flags of a core file.
+	(copy_section): Don't relocate a core file.  Don't copy contents
+	if the input section has the contents flag set, but the output
+	section does not (which happens with the fake 'note' pseudo-
+	sections that BFD creates for corefiles).
+
+2001-12-18  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* readelf.c (get_machine_flags): Recognize header flags for ABI and
+	ASE extensions. More robust code for ISA checking. Ignore empty fields
+	in header flags for GNU extensions.
+
+2001-12-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* objcopy.c (copy_archive): Set output bfd format outside the loop.
+
+2001-12-18  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* po/ja.po: Import from translation project.
+	* configure.in (ALL_LINGUAS): Add ja.
+	* configure: Regenerate.
+
+2001-12-18  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* addr2line.c (main): Protoype.
+	* ar.c (main): Protoype.
+	* nm.c (main): Protoype.
+	* objcopy.c (main): Protoype.
+	* objdump.c (main): Protoype.
+	* size.c (main): Protoype.
+	* strings.c (main): Protoype.
+
+2001-12-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (symtab_shndx_hdr): New global.
+	(SECTION_HEADER_INDEX): Define.
+	(SECTION_HEADER_NUM): Define.
+	(SECTION_HEADER): Define.
+	(GET_ELF_SYMBOLS): Pass two params rather than three.
+	(get_32bit_elf_symbols): Take file and section args.  Read and
+	use SHT_SYMTAB_SHNDX.
+	(get_64bit_elf_symbols): Likewise.
+	(dump_relocations): Use SECTION_HEADER to index "section_headers".
+	(process_section_headers): Likewise.  Use SECTION_HEADER_NUM too.
+	Remember symtab_shdx_hdr.
+	(process_program_headers): Scan from index 1 for segment map.
+	(slurp_ia64_unwind_table): Use SECTION_HEADER to index
+	"section_headers".
+	(process_relocs): Likewise.  Also adjust call to GET_ELF_SYMBOLS.
+	(process_unwind): Likewise.
+	(process_version_sections): Likewise.
+	(process_symbol_table): Likewise.
+	(display_debug_info): Likewise.
+	(process_dynamic_segment): Fake up a symtab section for changed
+	GET_ELF_SYMBOLS.
+	(get_symbol_index_type): Check SHN_LOOS before SHN_LORESERVE.
+	(process_program_headers): Kill signed/unsigned warning.
+	(load_debug_str): Likewise.
+	(display_debug_info): Likewise.
+
+2001-12-13  Jakub Jelinek  <jakub@redhat.com>
+
+	* readelf.c (get_segment_type): Support PT_GNU_EH_FRAME.
+
+2001-12-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (process_file_header): Print extended e_shnum and
+	e_shdtrndx values.  Set elf_header values for same.
+	(get_32bit_section_headers): Add "num" arg to read "num" headers.
+	(get_64bit_section_headers): Likewise.
+	(process_section_headers): Update calls.
+	(get_file_header): Call get_32bit_section_headers or 64bit variant.
+
+2001-12-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* objcopy.c (setup_section): Copy entsize.
+
+2001-12-07  Geoffrey Keating  <geoffk@redhat.com>
+
+	* readelf.c (guess_is_rela): Add support for stormy16.
+	(dump_relocations): Likewise.
+	(get_machine_name): Likewise.
+
+2001-12-05  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* dllwrap.c (main) Replace multiple strings describing a
+	single error with a single, newline escaped sentence to permit
+	better translation into foreign languages.
+
+	* readelf.c (get_elf_class): Remove internalionalisation of ELF
+	class names.
+
+2001-12-04  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* strings.c (get_char): Initialize value.
+
+2001-12-04  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* arlex.l: Silence compile warnings.
+	* arsup.h: Likewise. Fix formatting.
+
+2001-12-04  Jakub Jelinek  <jakub@redhat.com>
+
+	* strings.c: Include config.h before bfd.h.
+	(file_off): New type.
+	(file_open): Define.
+	(print_strings): Use file_off instead of file_ptr.  Print addresses
+	which don't fit into long correctly.
+	(get_char): Use file_off instead of file_ptr.  Use getc_unlocked if
+	available.
+	(strings_file): Use file_off instead of file_ptr.  Use file_open.
+	* configure.in: Check for getc_unlocked.
+	Check for fopen64 and whether _LARGEFILE64_SOURCE needs to
+	be defined for it.
+	* configure: Rebuilt.
+	* config.h.in: Rebuilt.
+
+2001-11-29  H.J. Lu <hjl@gnu.org>
+
+	* bucomm.c (make_tempname): Revert the changes made on
+	2001-11-14 and 2001-11-12. They won't work with directories.
+
+2001-11-23  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* binutils/Makefile.am (check-DEJAGNU): Pass CC_FOR_TARGET and
+	CFLAGS_FOR_TARGET to runtest in environment.
+	* Makefile.in: Rebuild.
+	* doc/Makefile.in: Rebuild.
+
+2001-11-28  Mike Stump  <mrs@wrs.com>
+
+	* objcopy.c (setup_section): Preserve SEC_RELOC when
+	--set-section-flags is used.
+
+2001-11-19  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* readelf.c (do_debug_str): New variable.
+	(display_debug_str): New function: Display the contents of a
+	.debug_str section.
+	(load_debug_str): New function: Load in the contents of a
+	.debug_str section.
+	(free_debug_str): New function: Free the memory used by
+	load_debug_str().
+	(fetch_indirect_string): Retrieve a string from the .debug_str
+	section.
+	(usage): Add -ws.
+	(parse_args): Accept -ws.
+	(process_section_headers): Allow the display of the .debug_str
+	section.
+	(read_and_display_attr_value): Use fetch_indirect_string.  Show
+	offset into .debug_str section.
+	(display_debug_info): Use load_debug_str and free_debug_str.
+	(debug_displays): Add .debug_str.
+	* doc/binutils.texi: Document -ws.
+
+2001-11-19  Andreas Jaeger  <aj@suse.de>
+
+	* testsuite/binutils-all/objdump.exp: Add x86-64.
+
+2001-11-15  Andreas Schwab  <schwab@suse.de>
+
+	* readelf.c: Fix warnings without terminating newline.
+
+2001-11-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* doc/binutils.texi (objdump): Document ppc -M options.
+
+2001-11-14  Andreas Jaeger  <aj@suse.de>
+
+	* doc/binutils.texi (objdump): Fix description to use x86-64.
+
+2001-11-14  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* bucomm.c (make_tempname): Use mkstemps instead of mkstemp, since
+	not all systems provide mkstemp.
+
+2001-11-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* doc/binutils.texi (objdump): Document x86 -M options.
+
+2001-11-13  Keith Walker <keith.walker@arm.com>
+
+	* readelf.c (read_and_display_attr_value): New function to
+	handle DW_FORM_indirect.
+	(read_and_display_attr): Use it.
+
+2001-11-13  Geoffrey Keating  <geoffk@redhat.com>
+
+	* readelf.c (display_debug_lines): Deal with unknown standard
+	opcodes.  Handle DW_LNS_set_prologue_end, DW_LNS_set_epilogue_begin,
+	DW_LNS_set_isa.
+
+2001-11-13  Timothy Wall  <twall@alum.mit.edu>
+
+	* MAINTAINERS: Add self as tic54x maintainer.  This target
+	includes the IBM C54XDSP clone.
+
+2001-11-12  * Steven J. Hill <sjhill@realitydiluted.com>
+
+	* bucomm.c (make_tempname): Use mkstemp in place of mktemp.
+
+2001-11-09  Jeffrey A Law  (law@cygnus.com)
+
+	* unwind-ia64.c (unw_print_brmask): Fix ISO C portability glitch.
+	(unw_print_grmask, unw_print_frmask, unw_print_abreg): Likewise.
+	(unw_print_xyreg, unw_decode_x1, unw_decode_x2): Likewise.
+	(unw_decode_x3, unw_decode_r1, unw_decode_r2): Likewise.
+	(unw_decode_r3, unw_decode_p1, unw_decode_p2_p5): Likewise.
+	(unw_decode_p6, unw_decode_p7_p10, unw_decode_b1): Likewise.
+	(unw_decode_b2, unw_decode_b3_b4): Likewise.
+
+	* readelf.c (get_elf_class): Fix ISO portability glitch.
+	(get_data_encoding, get_osabi_name, request_dump): Likewise.
+
+2001-11-07  Jakub Jelinek  <jakub@redhat.com>
+
+	* readelf.c (debug_str, debug_str_size): New.
+	(display_debug_abbrev): If no abbrevs were read, skip the CU.
+	Call free_abbrevs.
+	(read_and_display_addr): Handle DW_FORM_strp.
+	(display_debug_info): Read .debug_str section if present,
+	so that DW_FORM_strp can be handled.
+	Fix test for non-existant .debug_abbrev section.
+
+2001-11-05  Jakub Jelinek  <jakub@redhat.com>
+
+	* arlex.l: Accept `\' in filenames.  Patch by <earl_chew@agilent.com>.
+
+	* arsup.c (ar_open): Prepend tmp- to basename, not whole path.
+
+2001-11-05  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* MAINTAINERS: Add self as s390/s390x maintainer.
+
+2001-11-02  Tom Rix  <trix@bluey.cygnus.com>
+
+	* MAINTAINERS: Add self as PPC XCOFF maintainer.
+
+2001-11-02  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* configure.in (ALL_LINGUAS): Add "fr" and "tr".
+	* configure: Regernate.
+	* po/fr.po: New file.
+	* po/tr.po: New file.
+
+2001-10-30  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* MAINTAINERS: Add self as MMIX port maintainer.
+	* readelf.c: Include elf/mmix.h.
+	(guess_is_rela): MMIX is RELA.
+	(dump_relocations): Handle MMIX relocations.
+	* Makefile.am: Regenerate dependencies.
+	* Makefile.in: Regenerate.
+
+2001-10-13  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* readelf.c (parse_args): Handle multiple options to the -w
+	switch.
+
+2001-10-12  Jakub Jelinek  <jakub@redhat.com>
+
+	* readelf.c (get_section_type_name): Don't print SHT_ prefix for
+	LOPROC, LOOS and LOUSER.
+
+2001-10-11  J"orn Rennecke <amylaar@onetel.net.uk>
+
+	* MAINTAINERS: Update my email address.
+
+2001-10-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* doc/Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2001-10-02  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* readelf.c (display_debug_line, display_debug_pubnames,
+	display_debug_info, display_debug_frames): Detect and warn
+	about 64-bit format entries.
+	(display_debug_aranges): Reword 64-bit warning.
+	(debug_displays): Add .debug_pubtypes as a known, but not yet
+	supported, debug section.
+
+2001-10-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* coffdump.c (PROGRAM_VERSION): Delete.
+	(main <'V'>): Call print_version.
+	* srconv.c: Likewise.
+	* sysdump.c: Likewise.
+	* version.c (program_version): Remove.
+	(print_version): Use BFD_VERSION_STRING.  Just print the current
+	year in copyright message.
+	* addr2line.c (program_version): Remove unused declaration.
+	* objdump.c (display_target_tables): Use BFD_VERSION_STRING in
+	place of BFD_VERSION.
+	* Makefile.am (Makefile): Depend on bfd/configure.in.
+	(cplus-dem.o): Depend on Makefile.
+	Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2001-10-01  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* readelf.c (display_debug_aranges): Detect and warn about DWARF64
+	format .debug_arange sections.
+	(main): Add missing prototype.
+
+2001-09-30  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* Makefile.am: Update dependencies with "make dep-am".
+	* Makefile.in: Regenerate.
+
+2001-09-28  Richard Henderson  <rth@redhat.com>
+
+	* objdump.c (dump_section_header): Dump SEC_ARCH_BIT_0.
+
+2001-09-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* bucomm.c (fatal): Define using VPARAMS, VA_OPEN, VA_FIXEDARG,
+	VA_CLOSE.
+	(non_fatal): Likewise.
+	* objdump.c (objdump_sprintf): Likewise.
+	* readelf.c (error): Likewise.
+	(warn): Likewise.
+
+2001-09-25  Jakub Jelinek  <jakub@redhat.com>
+
+	* readelf.c (do_wide): New.
+	(options): Add --wide.
+	(usage, parse_args): Likewise.
+	(process_program_headers): Put each segment on a single line if
+	--wide is given.
+	(process_section_headers): Put each section on a single line if
+	--wide is given.
+	* doc/binutils.texi: Document it.
+	* NEWS: Likewise.
+
+2001-09-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (print_vma): Print 8 digits of low hex value.
+
+2001-09-24  Andreas Jaeger  <aj@suse.de>
+
+	* nlmconv.c: Fix warnings about unused attributes and function
+	prototypes.
+
+	* strings.c: Add prototype for get_char.
+
+2000-09-19  H.J. Lu  <hjl@gnu.org>
+
+	* doc/Makefile.am ($(DEMANGLER_NAME).1): Try cxxfilt.man and
+	$(srcdir)/cxxfilt.man.
+	* doc/Makefile.in: Rebuild.
+
+2001-09-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* objcopy.c (copy_main): Correct rename-section string parsing.
+	Consolidate new_name parsing, and error messages.
+
+2001-09-18  Bruno Haible  <haible@clisp.cons.org>
+
+	* addr2line.c: Don't include <ctype.h>.
+	(main): For gettext, also set the LC_CTYPE locate facet.
+	* ar.c (main): Likewise.
+	* coffdump.c (main): Likewise.
+	* dlltool.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(main): For gettext, also set the LC_CTYPE locate facet.
+	Use ISALNUM instead of isalpha/isdigit.
+	* dllwrap.c: Don't include <ctype.h>.
+	(main): For gettext, also set the LC_CTYPE locate facet.
+	* nlmconv.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(main): For gettext, also set the LC_CTYPE locate facet.
+	Use TOUPPER instead of islower/toupper.
+	* nlmheader.y: Include "safe-ctype.h" instead of <ctype.h>.
+	(yylex): Use ISSPACE/ISALNUM instead of isspace/isalnum.
+	Use TOUPPER instead of islower/toupper.
+	* nm.c (main): For gettext, also set the LC_CTYPE locate facet.
+	* objcopy.c (main): Likewise.
+	* objdump.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(disassemble_bytes): Use ISPRINT instead of isprint.
+	(dump_section_stabs): Use ISDIGIT instead of isdigit.
+	(dump_data): Use ISPRINT instead of isprint.
+	(main): For gettext, also set the LC_CTYPE locate facet.
+	* rclex.l: Include "safe-ctype.h" instead of <ctype.h>.
+	(cpp_line, handle_quotes): Use ISSPACE instead of isspace.
+	* rcparse.y: Include "safe-ctype.h" instead of <ctype.h>.
+	Use TOUPPER instead of islower/toupper.
+	* readelf.c (main): For gettext, also set the LC_CTYPE locate facet.
+	* resrc.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(write_rc_accelerators): Use ISPRINT instead of isprint.
+	(write_rc_rcdata): Likewise.
+	* size.c (main): For gettext, also set the LC_CTYPE locate facet.
+	* srconv.c (main): Likewise.
+	* stabs.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(parse_number): Use ISDIGIT/ISUPPER/ISLOWER instead of
+	isdigit/isupper/islower.
+	(parse_stab_string, parse_stab_type, parse_stab_argtypes,
+	parse_stab_array_type, stab_demangle_count, stab_demangle_get_count,
+	stab_demangle_prefix, stab_demangle_qualified,
+	stab_demangle_template, stab_demangle_type,
+	stab_demangle_fund_type): Use ISDIGIT instead of isdigit.
+	* strings.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(isgraphic): Use ISPRINT instead of isascii/isprint.
+	(main): Remove HAVE_LC_MESSAGES dependency.
+	* sysdump.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(pbarray): Use ISPRINT instead of isprint.
+	(main): For gettext, also set the LC_CTYPE locate facet.
+	* windres.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(format_from_filename): Use ISPRINT instead of isprint.
+	(main): For gettext, also set the LC_CTYPE locate facet.
+	* winduni.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(unicode_print): Use ISPRINT instead of isprint.
+	* wrstabs.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(stab_variable): Use ISDIGIT instead of isdigit.
+
+2001-09-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* ar.c (print_contents): Cast args of bfd_seek to the right types.
+	Replace bfd_read call with call to bfd_bread.
+	(extract_file): Likewise.
+
+	* objdump.c (dump_section_header): Cast section->filepos to
+	unsigned long to suit printf format string.
+	* readelf.c (process_section_headers): Similarly for sh_offset.
+	(process_unwind): Likewise.
+
+2001-09-14  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* strings.c (encoding, encoding_bytes): New variables.
+	(long_options): Add --encoding.
+	(main): Accept -e and --encoding.
+	(get_char): New function.  Read a, possibly wide, character from
+	the input stream.
+	(print_strings): Use get_char().
+	(usage): Document new command line option.
+	* doc/binutils.texi: Document new command line option.
+	* NEWS: Announce new command line option.
+
+2001-09-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* readelf.c (guess_is_rela, dump_relocations, get_machine_name,
+	get_machine_flags): Added EM_M32R, EM_D10V, EM_V850, EM_D30V,
+	EM_MN10200, EM_MN10300, EM_FR30, EM_AVR_OLD and EM_PJ_OLD.
+	Removed EM_CYGNUS_ARC.
+
+2001-09-04  Jeffrey A Law  (law@cygnus.com)
+
+	* readelf.c: Include elf/h8 for H8 series definitions.
+	(guess_is_rela): H8 series if RELA.
+	(dump_relocations): Handle H8 series relocations.
+
+2001-08-31  Eric Christopher  <echristo@redhat.com>
+
+	* readelf.c (get_machine_flags): Remove E_MIPS_MACH_MIPS32_4K.
+
+2001-08-29  Peter Targett  <peter.targett@arccores.com>
+
+	* MAINTAINERS: Include ARC Maintainer.
+
+2001-08-29  Ben Elliston  <bje@redhat.com>
+
+	* stabs.c (stab_demangle_template): Initialise s4.
+
+2001-08-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (dump_relocations): Recognise EM_PPC64.
+
+2001-08-26  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* readelf.c (get_machine_flags): Add detection of EF_MIPS_32BITMODE.
+
+2001-08-25  H.J. Lu  <hjl@gnu.org>
+
+	* nm.c (print_width): New.
+	(display_rel_file): Set `print_width' according to
+	bfd_sprintf_vma.
+	(print_symbol_info_bsd): Check `print_width' instead of BFD64.
+
+2001-08-24  Alexandre Oliva  <aoliva@redhat.com>
+
+	* objcopy.c (use_alt_mach_code): New variable.
+	(OPTION_ALT_MACH_CODE): Define.
+	(copy_options): Added --alt-machine-code.
+	(copy_main): Handle it.
+	(copy_object): Switch to alternate machine code if requested.
+	* doc/binutils.texi: Document new option.
+	* NEWS: Likewise.
+
+2001-08-22  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* readelf.c (get_machine_flags): Add detection of EF_MIPS_UCODE.
+
+2001-08-21  H.J. Lu  <hjl@gnu.org>
+
+	* readelf.c (dump_relocations): Support ELF64 on 32bit hosts.
+	(display_debug_info): Cast for 64bit hosts.
+	(display_debug_frames): Likewise.
+	(process_mips_specific): Likewise.
+
+2001-08-21  Andreas Jaeger  <aj@suse.de>
+
+	* coffgrok.h: Add missing parameter for prototype of coff_grok.
+
+	* sysdump.c: Add missing prototypes.
+	* srconv.c: Likewise.
+	* unwind-ia64.c: Likewise.
+	* coffdump.c: Likewise.
+
+	* sysinfo.y: Print prototypes, include <ansidecl.h>.
+
+	* coffgrok.c: Add missing prototypes, include libiberty.h instead
+	of declaring xcalloc.
+
+2001-08-10  H.J. Lu  <hjl@gnu.org>
+
+	* nm.c (print_value): Add one arg, bfd *.
+	(print_value): Replace fprintf_vma with bfd_fprintf_vma.
+	(print_symbol_info_bsd): Also pass `abfd' to print_value ().
+	(print_symbol_info_sysv): Likewise.
+	(print_symbol_info_posix): Likewise.
+
+	* objdump.c (dump_section_header): Replace printf_vma with
+	bfd_printf_vma.
+	(print_section_stabs): Likewise.
+	(dump_bfd_header): Likewise.
+	(objdump_print_value): Replace sprintf_vma with
+	bfd_sprintf_vma.
+	(disassemble_bytes): Likewise.
+	(dump_reloc_set): Likewise.
+
+2001-08-10  Andreas Jaeger  <aj@suse.de>
+
+	* configure.in: Add -Wstrict-prototypes and -Wmissing-prototypes
+	to build warnings.
+	* configure: Regenerate.
+
+2001-08-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c: Add missing prototypes.
+	* objdump.c: Likewise.  Format existing prototypes.
+
+2001-08-08  Alexandre Oliva  <aoliva@redhat.com>
+
+	* readelf.c (display_debug_info): Add to abbrev_offset the addend
+	of any RELA relocation for the abbrev_offset memory location that
+	refers to the .debug_abbrev section symbol.
+
+2001-08-07  H.J. Lu  <hjl@gnu.org>
+
+	* readelf.c (process_file): Return 0 if OK, otherwise return 1.
+	(main): Return process_file ().
+
+2001-08-05  Philip Blundell  <philb@gnu.org>
+
+	* doc/binutils.texi: Use "Thumb" not "THUMB".
+
+2001-08-03  John Healy  <jhealy@redhat.com>
+
+	Patch suggested by Frank Eigler <fche@redhat.com>.
+	* objdump.c (disassemble_data): Fill in section member of the
+	disasm_info structure.
+
+2001-08-03  Tom Walsh  <tom@cyberiansoftware.com>
+
+	* configure.in: Added --with-windres option.
+	* configure: Regenerated.
+
+2001-07-11  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
+
+	* doc/binutils.texi: Use @command{name} for commands;
+	use @option{-opt} for options; use @table @env for list of options;
+	remove spaces arround [ | ] in synopsis.
+
+	* doc/Makefile.am (POD2MAN): Use 'GNU Development Tools' for the
+	center title.
+
+2001-07-31  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* objcopy.c: Fix formatting.
+	(section_rename): New structure.
+	(OPTION_RENAME_SECTION): New switch.
+	(copy_usage): Document new switch.
+	(add_section_rename): New function: Add a node to the section
+	rename list.
+	(find_section_rename): New function: Find the new name and
+	flags for a section.
+	(setup_section): Call find_section_name to determine the name
+	of the output section.
+	(copy_main): Handle OPTION_RENAME_SECTION.
+	* binutils.texi: Document new switch.
+	* NEWS: Mention new switch.
+
+2001-07-30  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* README: Rename bug-gnu-utils@gcc.org to bug-binutils@gcc.org.
+	* MAINTAINERS: Rename bug-gnu-utils@gcc.org to
+	bug-binutils@gcc.org.
+
+2001-07-28  Matthias Kramm  <kramm@quiss.org>
+
+	* bucomm.c (list_supported_architectures): New function.
+	* bucomm.h (list_supported_architectures): Declare.
+	* objdump.c (usage): Call the above.
+
+2001-07-25  Dave Brolley  <brolley@redhat.com>
+
+	* objdump.c (SKIP_ZEROES): Only define it if it is not already defined.
+	(SKIP_ZEROES_AT_END): Only define it if it is not already defined.
+
+2001-07-19  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* README: Update for 2.11.  Change bug reporting email address.
+	* MAINTAINERS: Tidy up.  Change bug reporting email address.
+
+2001-07-16  DJ Delorie  <dj@redhat.com>
+
+	* resres.c (write_res_header): Align header size.
+	(res_align_file): Calculate alignment correctly.
+
+	* rcparse.y (styles): use SUBLANG_SHIFT instead of 8 (or the more
+	correct 10).
+	* resrc.c (write_rc_resource): Likewise.
+	* windres.h (SUBLANG_SHIFT): Define - as 10.
+
+2001-07-15  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* MAINTAINERS: Add Christian Groessler as maintainer for z8k port.
+
+2001-07-11  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* MAINTAINERS: Add notes about branch checkins.
+
+2001-07-05  Daniel Berlin  <dan@cgsoftware.com>
+
+	* readelf.c (display_debug_macinfo): New function, display
+	.debug_macinfo section.
+	(do_debug_macinfo): New variable.
+	(parse_args): Handle "-w[mM]" to mean display macro info.
+	(process_section_headers): Handle debug_macinfo.
+	(debug_displays): Replace unsupported function with macinfo
+	function for .debug_macinfo display.
+	* doc/binutils.texi: Document new command line switch.
+	* NEWS: Document new feature of readelf.
+
+2001-07-05  H.J. Lu  <hjl@gnu.org>
+
+	* objcopy.c (filter_symbols): Don't turn undefined symbols
+	into local.
+
+2001-07-03  H.J. Lu <hjl@gnu.org>
+
+	* doc/Makefile.am (addr2line.1): Use addr2line.pod instead of
+	$@.pod.
+	(ar.1): Likewise.
+	(dlltool.1): Likewise.
+	(nlmconv.1): Likewise.
+	(nm.1): Likewise.
+	(objcopy.1): Likewise.
+	(objdump.1): Likewise.
+	(ranlib.1): Likewise.
+	(readelf.1): Likewise.
+	(size.1): Likewise.
+	(strings.1): Likewise.
+	(strip.1): Likewise.
+	(windres.1): Likewise.
+	(cxxfilt.man): Use $(DEMANGLER_NAME).pod instead of $@.pod.
+	($(DEMANGLER_NAME).1): Also substitute cxxfilt with
+	$(DEMANGLER_NAME).
+	(as.1): Removed.
+	* doc/Makefile.in: Regenerated.
+
+2001-07-03  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* MAINTAINERS: Change MIPS maintainer to Eric Christopher.
+
+2001-07-01  Daniel Berlin  <dan@cgsoftware.com>
+
+	* readelf.c: Support DWARF 2.1 tags, encodings, languages.
+
+2001-06-29  James Cownie <jcownie@etnus.com>
+
+	* readelf.c: Support DWARF 2.1 attributes.
+
+2001-06-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (GET_DATA_ALLOC): Remove.
+	(GET_DATA): Remove.
+	(get_data): New function combining above macros, with an extra
+	test for zero size.
+	(slurp_rela_relocs): Use get_data, and catch error return.
+	(slurp_rel_relocs): Likewise.
+	(get_32bit_program_headers): Likewise.
+	(get_64bit_program_headers): Likewise.
+	(get_32bit_section_headers): Likewise.
+	(get_64bit_section_headers): Likewise.
+	(get_32bit_elf_symbols): Likewise.
+	(get_64bit_elf_symbols): Likewise.
+	(process_section_headers): Likewise.
+	(process_relocs): Likewise.
+	(slurp_ia64_unwind_table): Likewise.
+	(process_unwind): Likewise.
+	(get_32bit_dynamic_segment): Likewise.
+	(get_64bit_dynamic_segment): Likewise.
+	(process_dynamic_segment): Likewise.
+	(process_version_sections): Likewise.
+	(process_symbol_table): Likewise.
+	(dump_section): Likewise.
+	(display_debug_info): Likewise.
+	(display_debug_section): Likewise.
+	(process_section_contents): Likewise.
+	(process_corefile_note_segment): Likewise.
+	(process_mips_specific): Likewise.  Also free econf32, econf64.
+
+2001-06-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (dump_relocations): Print "bad symbol index" if
+	symtab == NULL with non-zero symtab_index.
+	(process_relocs): Don't bomb if reloc section has no symsec.
+
+2001-06-24  H.J. Lu  <hjl@gnu.org>
+
+	* objcopy.c (strip_main): Revert the change made on 2001-05-30
+	by accident.
+	(copy_main): Apply the the change made to strip_main on
+	2001-05-30 by accident.
+
+2001-06-23  Andreas Jaeger  <aj@suse.de>
+
+	* unwind-ia64.c (unw_decode_x1): Add unused attribute for
+	parameter 'code'.
+	(unw_decode_x2): Likewise.
+	(unw_decode_x3): Likewise.
+	(unw_decode_x4): Likewise.
+
+2001-06-23  Ben Elliston  <bje@redhat.com>
+
+	* MAINTAINERS: Add myself as M88k maintainer.
+
+2001-06-22  Jocelyn Mayer  <jocelyn.mayer@netgem.com>
+
+	* objcopy.c (strip_main): Support -o or --output-file command lien
+	switch.
+
+2001-06-19  H.J. Lu <hjl@gnu.org>
+
+	* doc/Makefile.in: Regenerated.
+
+2001-06-19  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* readelf.c: Restore formatting.
+
+2001-06-18  H.J. Lu <hjl@gnu.org> & Nick Clifton <nickc@redhat.com>
+
+	* Makefile.am: Move documentation into doc subdirectory.
+	* Makefile.in: Regenerated.
+	* binutils.texi: Move into doc subdirectory.
+	* addr2line.1: Removed.
+	* ar.1: Likewise.
+	* dlltool.1: Likewise.
+	* nlmconv.1: Likewise.
+	* nm.1: Likewise.
+	* objcopy.1: Likewise.
+	* objdump.1: Likewise.
+	* ranlib.1: Likewise.
+	* readelf.1: Likewise.
+	* size.1: Likewise.
+	* strings.1: Likewise.
+	* strip.1: Likewise.
+	* windres.1: Likewise.
+	* cxxfilt.man: Likewise.
+	* doc: New Directory.
+	* doc/Makefile.am: New file.
+	* doc/Makefile.in: Generate.
+
+2001-06-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* NEWS: Fix a typo.  Mention hppa64-elf.  Add binutils-2.11 marker.
+
+2001-06-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* MAINTAINERS: Update my email address.
+
+2001-05-30  Honda Hiroki  <hhonda@kobe-catv.ne.jp>
+
+	* objcopy.c: Add new switches: --keep-global-symbol,
+	--keep-symbols, --localize-symbols, --keep-global-symbols and
+	--weaken-symbols.
+	* binutils.texi: Document new switches.
+	* objcopy.1: Regenerate.
+	* NEWS: Announce new feature.
+
+2001-05-28  Andreas Jaeger  <aj@suse.de>
+
+	* readelf.c (display_debug_frames): Fix warnings: Remove unused
+	variables, fix format strings.
+
+2001-05-28  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* objdump.c (disassemble_bytes): Remove section VMA adjustment
+	when computing the address of the line to show.
+
+2001-05-16  Richard Henderson  <rth@redhat.com>
+
+	* readelf.c (do_debug_frames_interp): New.
+	(byte_get_little_endian): If BFD64, always read entire 8-byte fields.
+	(byte_get_big_endian): Likewise.
+	(parse_args) ['F']: Set do_debug_frames_interp.
+	(Frame_Chunk): Make data_factor signed, add fde_encoding.
+	(frame_display_row): Don't trunc pc_begin to int.
+	(size_of_encoded_value): New.
+	(display_debug_frames): Handle 64-bit targets.  Print raw data
+	unless do_debug_frames_interp.
+	(debug_displays): Remove duplicate .debug_frame.
+
+2001-05-15  Ralf Baechle  <ralf@gnu.org>
+
+	* readelf.c: Replace uses of EM_MIPS_RS4_BE with EM_MIPS_RS3_LE.
+	The former constant was never in active use and is used otherwise
+	by the ABI.
+
+2001-05-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* readelf.c (process_unwind): Print all unwind sections, not just
+	one.
+
+2001-05-07  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* readelf.c (process_unwind): Remove const specifier.
+
+2001-04-27  Michal Svec <rebel@atrey.karlin.mff.cuni.cz>
+
+	* strings.c (isgraphic): Do not use isascii() unless it is needed
+	for isprint() to work.
+	(main): Set the locale domain to LC_ALL not just LC_MESSAGES.
+
+2001-04-27  Johan Rydberg  <jrydberg@opencores.org>
+
+	* NEWS: Announce support for OpenRISC.
+
+2001-04-17  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* dlltool.c (do_default_excludes): Initialise to true.
+
+2001-04-10  Alan Modra  <amodra@one.net.au>
+
+	* MAINTAINERS: Update my email address
+	* nm.c (print_symbol_info_bsd): Use a simple printf string.
+
+2001-04-05  Hans-Peter Nilsson  <hp@axis.com>
+
+	* readelf.c (display_debug_lines): Fix typo for "Prologue".
+
+2001-03-30  H.J. Lu  <hjl@gnu.org>
+
+	* readelf.c (process_unwind): Just return if do_unwind is 0.
+
+2001-03-28  Roger Sayle  <roger@metaphorics.com>
+
+	* dlltool.c (make_one_lib_file): Fix section flags for
+	.text, .data and .bss in stub ds*.o files to match those
+	generated by gas.
+
+2001-03-29  H.J. Lu  <hjl@gnu.org>
+
+	* readelf.c (process_unwind): Only do unwind sections for
+	IA64.
+
+2001-03-28  H.J. Lu  <hjl@gnu.org>
+
+	* Makefile.am ($(srcdir)/dlltool.1): Remove the extra target.
+	* Makefile.in: Regenerate.
+
+2001-03-26  Andreas Jaeger  <aj@suse.de>
+
+	* binutils.texi (nm): Fix texi syntax.
+
+2001-03-25  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
+
+	* binutils.texi: Put @c man begin and @c man end indications
+	to generate man pages using texi2pod and pod2man. Put @c man title
+	to identify each man. Add SEEALSO entries.
+	* Makefile.am (MANCONF, TEXI2POD, POD2MAN): New variable.
+	(man_MANS): Add dlltool.1, nlmconv.1, readelf.1, windres.1,
+	sort the list.
+	(*.1): Build the man pages from binutils.texi.
+	* Makefile.in: Regenerate.
+
+2001-03-13  Eric Kohl  <ekohl@rz-online.de>
+
+	* defparse.y (opt_equal_name): allow "." in name.
+	* dlltool.c (def_exports): Added ability to generate forwarded exports.
+	(gen_exp_file): Likewise.
+
+2001-03-12  Stefan Geuken <mail@stefan-geuken.de>
+
+	* NEWS: Document addition of -B switch to objcopy.
+	* binutils.texi:  Document addition of -B switch to objcopy.
+	* objcopy.c: (copy_options): Add --binary-architecture.
+	(copy_usage): Document -B/--binary-architecture.
+	(copy_main): Support -B/--binary-architecture.  Set
+	bfd_external_binary_architecture.
+
+2001-03-11  Andreas Jaeger  <aj@suse.de>
+
+	* readelf.c (guess_is_rela): Handle EM_S390_OLD.
+	(dump_relocations): Likewise.
+	(get_machine_name): Likewise.
+
+2001-02-28  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c: (struct unw_aux_info): Remove const modifier for
+	'strtab' field.
+	(process_unwind): Remove non-K&R compliant LHS type cast in call
+	to GET_DATA_ALLOC macro.
+
+2001-02-28  Philip Blundell  <pb@futuretv.com>
+
+	* readelf.c (decode_ARM_machine_flags): Explicitly mention which
+	ABI is in use; remove ambiguity between the "unknown" EABI and
+	unrecognised ABIs.  Handle version 2 ARM EABI.  Update uses of
+	renamed EF_xx constants.
+
+2001-02-27  Alan Modra  <alan@linuxcare.com.au>
+
+	* configure.in (BFD_VERSION): New.
+	(AM_INIT_AUTOMAKE): Use $BFD_VERSION.
+	* configure: Regenerate.
+	* Makefile.am: Run "make dep-am"
+	* Makefile.in: Regenerate.
+
+2001-02-14  Nick Clifton  <nickc@redhat.com>
+
+	* MAINTAINERS: Add "Obvious Fix" rule.
+
+2001-02-11  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* unwind-ia64.c: Don't use ANSI C preprocessor stringisation and string
+	literal concatenation.
+
+2001-02-11  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* readelf.c (struct unw_aux_info): Remove const from the info member.
+	(process_unwind): Don't type-cast the third argument to the
+	GET_DATA_ALLOC macro.
+
+2001-02-11  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (dump_relocations): Free corrected allocated
+	array.
+	(process_unwind): Fix compile time warning.
+
+2001-02-10  Nick Clifton  <nickc@redhat.com>
+
+	* binutils.texi: Document new --unwind option to readelf.
+
+2001-02-09  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* readelf.c: Add linux target for S/390.
+
+2001-02-10  Alan Modra  <alan@linuxcare.com.au>
+
+	* nm.c (print_symbol_info_bsd): Don't #ifdef inside printf in case
+	printf is a macro.
+
+2001-02-08  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* acinclude.m4 (AM_PROG_LEX): Override installed definition.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+
+2001-02-07  Todd Vierling  <tv@wasabisystems.com>
+
+	* bucomm.c (bfd_target_vector): Change extern array to pointer.
+	* objdump.c (bfd_target_vector): Likewise.
+
+2001-02-07  David Mosberger  <davidm@hpl.hp.com>
+
+	* readelf.c (process_unwind): New function.
+	(slurp_ia64_unwind_table): Ditto.
+	(dump_ia64_unwind): Ditto.
+	(find_symbol_for_address): Ditto.
+	(slurp_rela_relocs): New function (split off from dump_relocations()).
+	(slurp_rel_relocs): Ditto.
+	(parse_args): Handle '-u' option.
+
+	* unwind-ia64.c: New file.
+	* unwind-ia64.h: New file.
+	* Makefile.am: Include unwind-ia64.c in readelf build.
+	* Makefile.in: Regenerate.
+	* po/binutils.pot: Regenerate.
+
+2001-02-04  Philip Blundell  <philb@gnu.org>
+
+	* configure.in (OBJDUMP_DEFS): Match `arm*-*', not just `arm-*'.
+	* configure: Regenerate.
+
+2001-01-31  Steve deRosier  <sderosier@vari-lite.com>
+
+	* ieee.c (ieee_add_bb11): Don't check for backslashes
+	unless HAVE_DOS_BASED_FILE_SYSTEM is defined.
+
+2001-01-24  Mark Elbrecht  <snowball3@bigfoot.com>
+
+	* ieee.c: Update copyright.
+	(ieee_start_compilation_unit): Don't check for backslashes
+	unless HAVE_DOS_BASED_FILE_SYSTEM is defined.
+
+	* stabs.c: Update copyright. Include "filenames.h".
+	(parse_stab): Use IS_ABSOLUTE_PATH. Ignore N_WARNING stabs.
+
+2001-01-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* readelf.c (process_version_sections): Check if VERDEF or VERNEED
+	sections are present before using them.  Remove code duplication.
+	(process_symbol_table): Check if VERDEF or VERNEED sections are
+	present before using them.
+
+2001-01-17  Nick Clifton  <nickc@redhat.com>
+
+	* objcopy.c (copy_object): Fail if attempting to convert the
+	endianness of the input object file.
+
+	* binutils.texi: Explain that objcopy cannot convert endianness.
+
+2001-01-16  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (string_table_length): New variable.
+	(SECTION_NAME): Catch out of range indices and missing section
+	pointers.
+	(process_section_headers): Delete useless local variable
+	string_table_offset.  Set the value of string_table_length
+	after loading the string table.
+	(process_mips_specific): Use SECTION_NAME macro.
+	(process_file): Set string_table_length to 0 when it is freed.
+
+2001-01-12  Nick Clifton  <nickc@redhat.com>
+
+	* version.c (print_version): Update copyright date.
+
+2001-01-11  Peter Targett  <peter.targett@arccores.com>
+
+	* readelf.c (dump_relocations): Include selection with EM_ARC.
+	(get_machine_name) Update name to "ARC".
+
+2001-01-09  Nick Clifton  <nickc@redhat.com>
+
+	* Makefile.am: Add rule to build objdump.o from objdump.c and
+	using OBJDUMP_DEFS.
+	* Makefile.in: Regenerate.
+
+	* configure.in: Define OBJDUMP_DEFS.  Default to empty.
+	(arm, xscale, d10v): For these targets define OBJDUMP_DEFS to
+	-DDISASSEMBLER_NEEDS_RELOCS.
+	* configure: Regenerate.
+
+	* objdump.c (disassemble_bytes): If DISASSEMBLER_NEEDS_RELOCS
+	is defined read in the relocs even if dump_reloc_info is
+	false.
+
+2001-01-07  Philip Blundell  <philb@gnu.org>
+
+	* binutils.texi (Bug Reporting): Replace `bug-gnu-utils' with
+	`bug-binutils'.
+	* README: Likewise.
+
+2000-12-19  Nick Clifton  <nickc@redhat.com>
+
+	* dlltool.c: Add missing support for arm-epoc-pe.
+	* configure.in: Add missing support for arm-epoc-pe.
+	* configure: Regenerate.
+
+2000-12-15  Nick Clifton  <nickc@redhat.com>
+
+	* MAINTAINERS: Add Diego Novillo as a maintainer for the Intel
+	Mode parts of the x86 port.
+
+2000-12-04  Andreas Jaeger  <aj@suse.de>
+
+	* readelf.c (guess_is_rela): Add EM_X86_64.
+	(dump_relocations): Add EM_X86_64.
+	(get_machine_name): Add EM_X86_64.
+	Include "elf/x86-64.h".
+
+2000-12-12  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c: Fix formatting.
+
+2000-12-11  Jan Hubicka  <jh@suse.cz>
+
+	* MAINTAINERS: Add myself and Andreas Jaeger as x86_64 maintainer.
+
+2000-12-07  Andrew Haley  <aph@redhat.com>
+
+	* readelf.c (display_debug_frames): Only display columns that are
+	referenced by the frame debug info.
+
+2000-12-05  Nick Clifton  <nickc@redhat.com>
+
+	* MAINTAINERS: Add Jason Merrill as DWARF2 maintainer.
+
+2000-12-04  Jason Merrill  <jason@redhat.com>
+
+	* readelf.c (process_section_headers): Handle linkonce.wi sections.
+	(display_debug_section): Likewise.
+	(display_debug_info): Display CU header before bailing.
+
+2000-12-01  Chris Demetriou  <cgd@sibyte.com>
+
+	* readelf.c (get_machine_flags): Recognize MIPS32 ISA in
+	EF_MIPS_ARCH.  Replace use of E_MIPS_MACH_MIPS32 with
+	E_MIPS_MACH_MIPS32_4K and adjust printed CPU name similarly.
+
+	* readelf.c (get_machine_flags): Add cases for E_MIPS_ARCH_5,
+	and E_MIPS_ARCH_64.
+
+	* readelf.c (get_machine_flags): Add case for
+	E_MIPS_MACH_SB1.
+
+2000-11-30  Richard Earnshaw  <rearnsha@arm.com>
+
+	* readelf.c (frame_display_row): Output 's' for DW_CFA_same_value.
+
+2000-11-28  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* MAINTAINERS: Add J��rn Rennecke and self as SH maintainers.
+	Change sourceware.cygnus.com to sources.redhat.com.
+	Fix typo for "amongst".
+
+2000-11-28  Nick Clifton  <nickc@redhat.com>
+
+	* strip.1 (COPYING): Mention that the GNU Free Documentation
+	License is present in the sources, but not the output, and
+	also available from the GNU website.
+	(GNU Free Documentation License): Comment out this section.
+	* strings.1: Ditto.
+	* size.1: Ditto.
+	* ranlib.1: Ditto.
+	* objdump.1: Ditto.
+	* objcopy.1: Ditto.
+	* nm.1: Ditto.
+	* nlmconv.1: Ditto.
+	* ar.1: Ditto.
+	* addr2line.1: Ditto.
+
+2000-11-27  DJ Delorie  <dj@redhat.com>
+
+	* readelf.c (usage): Add -wf (--debug-dump=frames) option.
+	(parse_args): Support -wf option.
+	(process_section_headers): Ditto.
+	(debug_displays): Ditto.
+	(display_debug_frames): New, dump *_frame sections.
+	(frame_need_space): Support for above.
+	(frame_display_row): Ditto.
+	* binutils.texi: Document it.
+
+2000-11-24  Nick Clifton  <nickc@redhat.com>
+
+	* NEWS: Announce support for v5t, v5te and XScale.
+
+2000-11-22  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (get_machine_name): Add EM_JAVELIN, EM_FIREPATH,
+	EM_ZSP, EM_MMIX, EM_HUANY, EM_PRISM.
+	(get_section_type_name): Add SHT_GROUP and SHT_SYMTAB_SHNDX.
+	(get_elf_section_flags: Add SHF_GROUP.
+	(process_section_headers): Adjust output for 32-bit binaries
+	to look nice on an 80 column terminal.
+
+2000-11-20  H.J. Lu  <hjl@gnu.org>
+
+	* readelf.c (get_osabi_name): Change ELFOSABI_MONTEREY to
+	ELFOSABI_AIX.
+
+2000-11-17  Richard Henderson  <rth@redhat.com>
+
+	* readelf.c (display_debug_lines): Adjust last change to
+	use sizeof (external->li_length).
+
+2000-11-17  Richard Henderson  <rth@redhat.com>
+
+	* readelf.c (display_debug_lines): Fix section length check
+	and end_of_sequence computation.
+
+2000-11-06  Nick Clifton  <nickc@redhat.com>
+
+	* binutils.texi: Add GNU Free Documentation License.
+	* objcopy.1: Add GNU Free Documentation License.
+	* objdump.1: Add GNU Free Documentation License.
+	* addr2line.1: Add GNU Free Documentation License.
+	* ar.1: Add GNU Free Documentation License.
+	* nlmconv.1: Add GNU Free Documentation License.
+	* nm.1: Add GNU Free Documentation License.
+	* ranlib.1: Add GNU Free Documentation License.
+	* size.1: Add GNU Free Documentation License.
+	* strings.1: Add GNU Free Documentation License.
+	* strip.1: Add GNU Free Documentation License.
+
+2000-10-06  Luciano Gemme <ishitawa@yahoo.com>
+
+	* objcopy.c (--srec-len=nn): New parameter to set the
+	maximum length of generated Srecords.
+	(--srec-forceS3): New parameter that restricts the generation of
+	Srecords to type S3 only.
+	* binutils.texi: Document new command line switches.
+	* objcopy.1: Docuemnt the new command line switches.
+	* NEWS: Announce the existence of the new command line switches.
+
+2000-10-31  Nick Clifton  <nickc@redhat.com>
+
+	* MAINTAINERS: Add Jim Wilson as the maintainer for the IA64
+	code.  Add Eric Chrisopher as maintainer of MN10300 port.
+
+2000-10-12  Roger Sayle  <roger@metaphorics.com>
+
+	* Make comma after string after icon/control optional.
+
+2000-09-13  Anders Norlander  <anorland@acc.umu.se>
+
+	* readelf.c (get_machine_flags): Also print EF_MIPS_MACH field.
+
+	* NEWS: Mention support for MIPS32.
+
+2000-09-08  Nick Clifton  <nickc@redhat.com>
+
+	* MAINTAINERS: Add Stephane Carrez as maintainer for 68HC[11|12].
+
+2000-09-07  H.J. Lu  <hjl@gnu.org>
+
+	* configure.in (AC_ISC_POSIX): Put after AC_CANONICAL_SYSTEM.
+	* configure: Rebuild.
+
+2000-09-06  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure: Rebuilt with new libtool.m4.
+
+2000-09-05  Nick Clifton  <nickc@redhat.com>
+
+	* aclocal.m4: Regenerate.
+	* config.in: Regenerate.
+	* configure: Regenerate.
+
+2000-09-04  Todd Vierling  <tv@wasabisystems.com>
+
+	* strip.1: Fix stray '\' in -o formatting.
+
+2000-09-02  Nick Clifton  <nickc@redhat.com>
+
+	* configure.in: Increase version number to 2.10.91.
+	* configure: Regenerate.
+	* aclocal.m4: Regenerate.
+	* config.in: Regenerate.
+	* po/binutils.pot: Regenerate.
+
+2000-08-31  Alexandre Oliva  <aoliva@redhat.com>
+
+	* acinclude.m4: Include libtool and gettext macros from the
+	top level.
+	* aclocal.m4, configure: Rebuilt.
+
+2000-08-30  Jamie Guinan  <guinan@bluebutton.com>
+
+	* resrc.c (close_input_stream): Delete extraneous logic
+
+2000-08-24  Hans-Peter Nilsson  <hp@axis.com>
+
+	* NEWS: Mention support for CRIS.
+
+2000-08-21  Nick Clifton  <nickc@redhat.com>
+
+	* addr2line.c: Changed email address for Ulrich Lauther.
+
+2000-08-17  Christopher C. Chimelis <chris@debian.org>
+
+	* objdump.c (LONGEST_ARCH): Set to sizeof("powerpc:common").
+
+2000-08-17  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (display_debug_pubnames): Only issue warning
+	message once.  Terminate message with a new line.
+	(display_debug_aranges): Only display version 2 debug info.
+
+2000-08-14  Todd Vierling <tv@wasabisystems.com>
+
+	* objcopy.c (strip_main): Silently accept -d as an alias for -g
+	for compatibility with old BSD systems.
+
+2000-08-14  Jason Eckhardt  <jle@cygnus.com>
+
+	* NEWS: Mention i860 support.
+
+2000-08-11  Carlo Wood <carlo@alinoe.com>
+
+	* addr2line.c (main): Add const to char *.
+
+2000-08-11  Geoff Keating  <geoffk@cygnus.com>
+
+	* ar.c (main): Don't crash if called with no arguments
+	or only '-X32_64' as an argument.
+
+2000-08-08  DJ Delorie  <dj@redhat.com>
+
+	* resrc.c: use "gcc -xc" instead of -xc-header
+
+2000-08-05  Jason Eckhardt  <jle@cygnus.com>
+
+	* readelf.c (elf/i860.h): Include.
+	(dump_relocations): Add recognition of i860 architecture.
+	(guess_is_rela): Add recognition of i860 architecture.
+
+2000-08-03  Nick Clifton  <nickc@cygnus.com>
+
+	* MAINTAINERS: Add information about CGEN maintainers.
+
+2000-07-26  Geoff Keating  <geoffk@cygnus.com>
+
+	* nm.c (main): Ignore '-X32_64' as an option.
+	* ar.c (main): Likewise.
+	* binutils.texi (nm): Document new option.
+	(ar): Likewise.
+
+2000-07-23  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* rdcoff.c (external_coff_symbol_p): K&R-ise.
+
+2000-07-20  H.J. Lu  <hjl@gnu.org>
+
+	* binutils.texi: Put back "@end table" deleted by
+	accident.
+
+2000-07-05  Kenneth Block  <krblock@computer.org>
+
+	* nm.c: Add optional style to demangle switch.
+	* objdump.c: Add optional style to demangle switch.
+	* addr2line.c: Add optional style to demangle switch.
+	* binutils.texi: Document optional style to demangle
+	switch.
+
+2000-07-20  Hans-Peter Nilsson  <hp@axis.com>
+
+	* MAINTAINERS: Add self as CRIS port maintainer.
+	* readelf.c: Include elf/cris.h.
+	(guess_is_rela): Handle EM_CRIS.
+	(dump_relocations): Ditto.
+	(get_machine_name): Ditto.
+	* Makefile.am: Rebuild dependencies.
+	* Makefile.in: Regenerate.
+	* po/binutils.pot: Regenerate.
+
+2000-07-19  H.J. Lu  <hjl@gnu.org>
+
+	* readelf.c (get_dynamic_type): Change "AUXILARY" to
+	"AUXILIARY".
+	(process_dynamic_segment): Print out strings for DT_CONFIG,
+	DT_DEPAUDIT, DT_AUDIT and DT_RUNPATH.
+
+2000-07-19  Mark Kettenis  <kettenis@gnu.org>
+
+	* nm.c (usage): Change output of `nm --help' to include a
+	description of the purpose of the program and a detailed
+	description of the accepted options.
+
+2000-07-19  H.J. Lu  <hjl@gnu.org>
+
+	* readelf.c (process_dynamic_segment): Change DF_1_NODEPLIB
+	to DF_1_NODEFLIB.
+
+2000-07-19  H.J. Lu  <hjl@gnu.org>
+
+	* readelf.c (get_dynamic_type): Fix DT_CHECKSUM.
+
+2000-07-19  H.J. Lu  <hjl@gnu.org>
+
+	* readelf.c (get_dynamic_type): Change DT_FEATURE_1 to
+	DT_FEATURE.
+	(process_dynamic_segment): Likewise.
+
+	* readelf.c (get_dynamic_type): Handle DT_CONFIG, DT_DEPAUDIT,
+	DT_AUDIT, DT_PLTPAD, DT_MOVETAB and DT_CHECKSUM.
+	(process_dynamic_segment): Handle DTF_1_CONFEXP, DF_1_NODEPLIB,
+	DF_1_NODUMP and DF_1_CONLFAT.
+
+2000-07-18  Nick Clifton  <nickc@cygnus.com>
+
+	* binutils.texi (readelf): Fix spelling typo.
+
+2000-07-11  Mark Kettenis  <kettenis@gnu.org>
+
+	* objdump.c (usage): Make output of `objdump --help' more
+	consistent with the rest of the GNU world.  Add a line describing
+	the purpose of the program.
+
+2000-07-10  David Huggins-Daines  <dhd@linuxcare.com>
+
+	* stabs.c (parse_stab_range_type): Cast to proper type to fix
+	warning.
+
+2000-07-10  Ryan Bradetich  <rbradetich@uswest.net>
+
+	* readelf.c (get_dynamic_data): Add casts and use unsigned chars
+	to fix warnings.
+	(process_symbol_table): Ditto.
+	(procesS_extended_line_op): Ditto.
+	(display_debug_lines): Ditto.
+	(display_debug_pubnames): Ditto.
+	(read_and_display_attr): Ditto.
+
+2000-07-09  Nick Clifton  <nickc@cygnus.com>
+
+	* MAINTAINERS: Add several more port specific maintainers.
+
+2000-07-05  Nick Clifton  <nickc@cygnus.com>
+
+	* MAINTAINERS: Add blanket write privs for Michael Meissner.
+
+2000-06-05  DJ Delorie  <dj@redhat.com>
+
+	* MAINTAINERS: New.
+
+2000-07-01  Eric Fifer  <EFifer@sanwaint.com>
+
+	* dllwrap.c: Changed mistaken dyn_string_append() calls
+	to dyn_string_append_cstr().
+
+2000-07-01  Alexander Aganichev <AAganichev@hypercom.com>
+
+	* stabs.c (parse_stab_type): Divide size in bits by 8 as binutils
+	struct debug_type stores size in bytes.
+
+2000-07-01  Alan Modra  <alan@linuxcare.com.au>
+
+	* Makefile.am (DEP): Fix 2000-06-22.  grep after running dep.sed
+	(CLEANFILES): Add DEPA.
+	* Makefile.in: Regenerate.
+
+2000-06-27  Alan Modra  <alan@linuxcare.com.au>
+
+	* ar.c: Revert incorrect 2000-06-25 patch.
+	* bucomm.c: Likewise.
+
+2000-06-25 Mark Elbrecht <snowball3@bigfoot.com>
+
+	* rdcoff (parse_coff_symbol): Treat GNU weak symbols as external.
+	(external_coff_symbol_p): New function.
+	(parse_coff): Use it.
+
+2000-06-25  Alexander Aganichev <AAganichev@hypercom.com>
+
+	* ar.c (normalize): Advance past both characters in a DOS based
+	<letter>: filepath prefix.
+	(main): Likewise.
+	* bucomm.c (make_tempname): Likewise.
+
+2000-06-24  Nick Clifton  <nickc@cygnus.com>
+
+	* objdump.c (usage): Fix description of --stabs switch.
+
+2000-06-22  Alan Modra  <alan@linuxcare.com.au>
+
+	* Makefile.am (DEP): grep for leading `/' in DEP1, and fail if we
+	find one.
+	* Makefile.in: Regenerate.
+
+2000-06-20  Alexander Aganichev <AAganichev@hypercom.com>
+
+	* ar.c (normalize): Correct pointer comparison when checking for
+	backslashes.
+	(main): Likewise.
+	* bucomm.c (make_tempname): Likewise.
+
+	* ieee.c (ieee_start_compilation_unit): Correct pointer comparison
+	and search for backslashes in the original pathname.
+	(ieee_add_bb11): Likewise.
+
+2000-06-18  Nick Clifton  <nickc@redhat.com>
+
+	* ar.c (print_contents): Improve verbose message.
+
+2000-06-15  H.J. Lu  <hjl@gnu.org>
+
+	* dyn-string.c: Removed. Not needed with dyn-string.c in
+	libiberty.
+	* dyn-string.h: Likewise.
+
+	* Makefile.am: Remove references to dyn-string.c and
+	dyn-string.h. Rebuild dependency.
+	* Makefile.in: Rebuild.
+
+2000-06-15  H.J. Lu  <hjl@gnu.org>
+
+	* binutils.texi: Put a warning on copying relocatable object
+	files between two different formats.
+
+2000-06-13  DJ Delorie  <dj@cygnus.com>
+
+	* rcparse.y (control): ICON controls take an id as the first
+	parameter, not an optional string.  Also, call new convenience
+	function that takes res_id's.
+	* resrc.c (define_control): missing text means zero-length string,
+	not zero ID.
+	(define_icon_control): New.
+	* windres.h: declare define_icon_control.
+
+2000-06-13  H.J. Lu  <hjl@gnu.org>
+
+	* configure: Regenerate.
+
+2000-06-08  David O'Brien  <obrien@FreeBSD.org>
+
+	* configure.in (VERSION): Update to show this is the CVS mainline.
+
+2000-06-02  David O'Brien  <obrien@FreeBSD.org>
+
+	* strings.c (isgraphic): Interpret <TAB> as a printable character,
+	analogous to <SPACE>.
+
+2000-05-30  Alan Modra  <alan@linuxcare.com.au>
+
+	* objdump.c (display_target_list): Use bfd_close_all_done, not
+	bfd_close to fix crash caused by 2000-05-24 change.
+
+2000-05-25  DJ Delorie  <dj@cygnus.com>
+
+	* resrc.c (close_input_stream): zero out cpp_pipe after closing it.
+
+2000-05-26  Alan Modra  <alan@linuxcare.com.au>
+
+	* Makefile.am: Update dependencies with "make dep-am"
+	* Makefile.in: Regenerate.
+
+2000-05-26  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* ar.c: Include filenames.h.
+	(normalize) [HAVE_DOS_BASED_FILE_SYSTEM]: Support backslashes
+	and drive letters in file names.
+	(main): Support backslashes and drive letters in argv[0].  Drop
+	the .exe suffix, if any, in argv[0] if is_ranlib is negative.  Use
+	FILENAME_CMP instead of strcmp to compare file names.
+	(open_inarch) [__GO32__]: Don't ifdef errno != ENOENT test for
+	DJGPP v2.
+	(do_quick_append) [__GO32__]: Ditto.
+	(get_pos_bfd, delete_members, move_members, replace_members):
+	Compare file names with FILENAME_CMP.
+
+	* bucomm.c: Include filenames.h.
+	(make_tempname) [HAVE_DOS_BASED_FILE_SYSTEM]: Support mixed
+	forward/backward slashes and drive letters in file names.
+
+	* ieee.c (ieee_start_compilation_unit, ieee_add_bb11): Support
+	mixed forward/backward slashes and drive letters in file names.
+
+	* strings.c (O_BINARY, setmode, SET_BINARY): Define.
+	(main) [SET_BINARY]: Use SET_BINARY to switch stdin into binary
+	mode.
+
+	* objcopy.c: Include filenames.h.
+	(main) [HAVE_DOS_BASED_FILE_SYSTEM]: Drop the .exe suffix
+	before comparing to "strip".
+	Use FILENAME_CMP to compare file names.
+
+	* arsup.c: Include filenames.h.
+	(map_over_list, ar_delete, ar_replace, ar_extract): Use
+	FILENAME_CMP to compare file names.
+	(ar_open): Prepend "tmp-" instead of appending "-tmp", to create
+	the temporary file name.
+
+	* configure.in: Check for setmode.
+	* configure: Regenerate.
+
+2000-05-24  Alan Modra  <alan@linuxcare.com.au>
+
+	* objdump.c (display_target_list): Close the bfd.
+	(display_info_table): Likewise.
+
+2000-05-14  H.J. Lu  (hjl@gnu.org)
+
+	* objcopy.c (filter_symbols): Don't strip global symbols in
+	relocatable object files.
+
+2000-05-14  Alan Modra  <alan@linuxcare.com.au>
+
+	* size.c (usage): Associate short options with corresponding long
+	option to give a clue as to their function.
+
+2000-05-14  Philippe De Muyter  <phdm@macqel.be>
+
+	* size.c (main): Accept and ignore `-f' option.
+
+2000-05-13  Alan Modra  <alan@linuxcare.com.au>
+
+	* bucomm.h (gettext, dgettext, dcgettext, textdomain,
+	bindtextdomain): Replace defines with those from intl/libgettext.h
+	to quieten gcc warnings.
+
+2000-05-12  H.J. Lu  <hjl@gnu.org>
+
+	* nlmconv.c (temp_filename): Removed.
+
+	* nlmconv.c (link_inputs): Use make_temp_file () instead of
+	choose_temp_base ().
+	* objdump.c (display_target_list): Likewise.
+	(display_info_table): Likewise.
+
+2000-05-08  Alan Modra  <alan@linuxcare.com.au>
+
+	* objcopy.c (setup_section): Add const and gettext calls for err.
+
+2000-05-02  H.J. Lu  <hjl@gnu.org>
+
+	* readelf.c (get_osabi_name): Handle ELFOSABI_NONE instead of
+	ELFOSABI_SYSV. Also handle ELFOSABI_NETBSD, ELFOSABI_HURD,
+	ELFOSABI_SOLARIS, ELFOSABI_MONTEREY, ELFOSABI_IRIX,
+	ELFOSABI_FREEBSD, ELFOSABI_TRU64, ELFOSABI_MODESTO
+	and ELFOSABI_OPENBSD.
+
+2000-05-02  Kazu Hirata  <kazu@hxi.com>
+
+	* coffgrok.c: Add ATTRIBUTE_UNUSED as appropriate.
+	* srconv.c: Likewise.
+	* sysdump.c: Likewise.
+
+2000-04-23  Denis Chertykov  <denisc@overta.ru>
+
+	* readelf.c (guess_is_rela): AVR uses RELA relocations.
+	(get_machine_name): machine name for EM_AVR added.
+
+2000-04-21  Richard Henderson  <rth@cygnus.com>
+	    David Mosberger  <davidm@hpl.hp.com>
+
+	* Makefile.am (readelf.o): Add elf/ia64.h.
+	* Makefile.in: Rebuild.
+	* readelf.c: Include elf/ia64.h.
+	(guess_is_rela, dump_relocations): Handle EM_IA_64.
+
+2000-04-17  Timothy Wall  <twall@cygnus.com>
+
+	* objdump.c (disassemble_data): Set octets per byte *after*
+	resolving arch/mach for binary files.
+
+2000-04-14  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* arlex.l: Add directives to increase lex buffer size.
+
+	* objdump.c, readelf.c: Don't include strarg.h or varargs.h. They are
+	already included by bucomm.h.
+
+2000-04-10  Philippe De Muyter  <phdm@macqel.be>
+
+	* readelf.c (dynamic_segment_mips_val): Call `sprintf', not
+	`strftime' since strftime is not available on all systems.
+	(process_mips_specific): Ditto.
+
+2000-04-07  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure.in (WARN_CFLAGS): Set to -W -Wall by default.  Add
+	--enable-build-warnings option.
+	* Makefile.am (AM_CFLAGS, WARN_CFLAGS): Add definitions.
+	* Makefile.in, configure: Re-generate.
+
+2000-04-06  Alan Modra  <alan@linuxcare.com.au>
+
+	* addr2line.c: Update copyright.
+	* objcopy.1: Likewise, and title.
+	* strings.1: Likewise.
+
+	* version.c (print_version): Add 2000.
+
+	* rddbg.c (read_section_stabs_debugging_info): Don't use
+	bfd_size_type for strx to avoid printf problems if BFD64.
+
+	* bucomm.c: (report): Remove `static'.
+	Move inclusion of stdarg.h/vararg.h from here.
+	* bucomm.h: To here.
+	(CONST): Change all occurences to const.
+	(report): Declare it.
+	(bfd_fatal): Add ATTRIBUTE_NORETURN.
+	(fatal): Add ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN.
+	(non_fatal): Add ATTRIBUTE_PRINTF_1.
+
+	* ar.c (main): Use fatal or non_fatal instead of fprintf.
+	Correct a typo in an error message.
+	(do_quick_append): Use non_fatal instead of fprintf.
+	(move_members): Use fatal instead of fprintf, exit.
+	* coffdump.c (main): Same here.
+
+	* dlltool.c (display): Delete.
+	(warn): Delete.
+	(inform): Use `report' instead of `display'.
+	(rvaafter): Remove trailing \n from fatal error msg.
+	(rvabefore): Ditto.
+	(asm_prefix): Ditto.
+	(yyerror): Replace `warn' with `non_fatal', and remove \n.
+	(def_name): Likewise.
+	(run): Likewise.
+	(scan_all_symbols): Likewise.
+	(gen_lib_file): Likewise.
+	(def_library): Likewise.  Remove extra program_name too.
+	(run): Remove \n from inform strings.
+	(scan_drectve_symbols): Likewise.
+	(add_excludes): Likewise.
+	(scan_open_obj_file): Likewise.
+	(gen_exp_file): Likewise.
+	(gen_lib_file): Likewise.
+	(process_duplicates): Likewise.
+
+	* Makefile.am (dllwrap_SOURCES): Add version.c.
+	* dllwrap.c (program_version): Delete.
+	(print_version): Delete.
+	(display): Always print trailing \n.
+	(warn): New.
+	(delete_temp_files): Use warn instead of fprintf.  Use gettext.
+	(run): Here too.
+	(main): And here.
+	(usage): gettext'ify.
+	(long_options): Add missing initialisers.
+
+	* nlmconv.c (main): Use fatal/non_fatal instead of fprintf.
+	(select_output_format): Likewise.
+	(powerpc_mangle_relocs): Likewise.
+	(link_inputs): Likewise.
+
+	* nm.c (set_print_radix): Use fatal instead of fprintf, exit.
+	(set_output_format): Likewise.
+	(main): Use non_fatal instead of fprintf.
+	(display_rel_file): Likewise.
+
+	* objdump.c (slurp_symtab): Use non_fatal instead of fprintf.
+	(slurp_dynamic_symtab): Same here.
+	(disassemble_data): And here.
+	(read_section_stabs): And here.
+	(read_section_stabs): And here.
+	(dump_bfd): And here.
+	(main): And here.
+	(objdump_sprintf): Use fatal instead of fprintf, exit.
+	(disassemble_data): Same here.
+
+	* rdcoff.c (parse_coff_type): Use non_fatal instead of fprintf.
+	(parse_coff_struct_type): Same here.
+	(parse_coff_enum_type): And here.
+	(parse_coff): And here.
+	* rddbg.c (read_debugging_info): And here.
+	* size.c (main): And here.
+	* windres.c (format_from_name): And here.
+	* wrstabs.c (stab_write_symbol): Here too.
+	(write_stabs_in_sections_debugging_info): And here.
+	(stab_int_type): And here.
+	(stab_struct_field): And here.
+	(stab_typdef): And here.
+
+	* rescoff.c (read_coff_rsrc): Use fatal instead of fprintf, exit.
+	* srconv.c (main): Same here.
+	* strings.c (main): And here.
+	(integer_arg): And here.
+	* sysdump.c (main): And here.
+
+2000-04-06  Timothy Wall  <twall@cygnus.com>
+
+	* objdump.c (dump_section_header): Print CLINK and BLOCK flags.
+
+2000-04-06  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* readelf.c (decode_location_expression): Loop through multiple
+	operations.
+	(read_and_display_attr): Pass in length.
+
+	* readelf.c (read_and_display_attr): Add CU offset to references.
+	(display_debug_info): Pass it in.
+
+2000-04-06  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (decode_ARM_machine_flags): New function.
+	(get_machine_flags): Call decode_ARM_machine_flags for ARM
+	targets.
+
+	(get_machine_name): Catch EM_AVR
+
+2000-04-05  Alan Modra  <alan@linuxcare.com.au>
+
+	* binutils.texi: Remove optional `=' from long options that have
+	an `=' in the argument.
+	* objcopy.1: Here too.  Remove extra space on discard-all.
+
+	* binutils.texi (objcopy): Mention --redefine-sym.
+	* objcopy.1: Here too.
+	* NEWS: And here.
+
+	* objcopy.c (parse_flags): Split off flag names from error message
+	gettext as they are not translated.
+	(copy_main): Similarly split off option name for --add-section,
+	--set-section-flags, --change-section-vma, --change-section-lma
+	error messages.
+	Some white space changes.
+
+	from Matthew Benjamin <matt@linuxbox.nu>
+	* objcopy.c (struct redefine_node): New.
+	(redefine_sym_list): New.
+	(redefine_list_append): New.
+	(lookup_sym_redefinition): New.
+	(OPTION_REDEFINE_SYM): New.
+	(copy_options): Add --redefine-sym option.
+	(copy_usage): Mention it.
+	(filter_symbols): Rename symbols on redefine_sym_list.
+	(copy_object): Call filter_symbols if redefine_sym_list != NULL.
+	(copy_main): Handle OPTION_REDEFINE_SYM.
+
+2000-04-04  H.J. Lu  <hjl@gnu.org>
+
+	* readelf.c (process_symbol_table): Correctly read in symbol
+	versioning information.
+
+2000-04-04  Alan Modra  <alan@linuxcare.com.au>
+
+	* po/binutils.pot: Regenerate.
+
+	* addr2line.c (usage): Restore translated part of bug string.
+	* ar.c (usage): Likewise.
+	* nlmconv.c (show_usage): Likewise.
+	* nm.c (usage): Likewise.
+	* objcopy.c (copy_usage): Likewise.
+	(strip_usage): Likewise.
+	* objdump.c (usage): Likewise.
+	* readelf.c (usage): Likewise.
+	* size.c (usage): Likewise.
+	* strings.c (usage): Likewise.
+	* windres.c (usage): Likewise.
+
+	* Makefile.am (MKDEP): Use gcc -MM rather than mkdep.
+	(DEP): Quote when passing vars to sub-make.  Add warning
+	message to end.
+	(DEP1): Rewrite for "gcc -MM".
+	(CLEANFILES): Add DEP2.
+	Update dependencies.
+	* Makefile.in: Regenerate.
+
+2000-04-04  H.J. Lu  <hjl@gnu.org>
+
+	* Makefile.am (GENERATED_HFILES): Add rcparse.h
+	(arparse.h): Depend on arparse.c
+	(defparse.h, nlmheader.h, rcparse.h, sysinfo.h): Similarly.
+
+2000-04-03  H.J. Lu  (hjl@gnu.org)
+
+	* size.c (usage): Use REPORT_BUGS_TO.
+
+2000-04-03  Alan Modra  <alan@linuxcare.com.au>
+
+	* bucomm.h: #include "bin-bugs.h"
+	* addr2line.c (usage): Use REPORT_BUGS_TO.
+	* ar.c (usage): Likewise.
+	* nlmconv.c (show_usage): Likewise.
+	* nm.c (usage): Likewise.
+	(OPTION_TARGET): Define.
+	(long_options): Use OPTION_TARGET rather than 200.
+	(main): Likewise.
+
+	* objcopy.c (copy_usage): Use REPORT_BUGS_TO.
+	(strip_usage): Likewise.
+	* objdump.c (usage): Likewise.
+	* readelf.c (usage): Likewise.
+	* strings.c (usage): Likewise.
+	* windres.c (usage): Likewise.
+
+2000-03-31  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* readelf.c: Include sys/types.h before sys/stat.h for ultrix.
+
+2000-03-27  Nick Clifton  <nickc@cygnus.com>
+
+	* rddbg.c (read_section_stabs_debugging_info): Catch out of range
+	string offsets in corrupt stabs entries.
+
+2000-03-27  Alan Modra  <alan@linuxcare.com.au>
+
+	* readelf.c: Include elf/avr.h
+	(dump_relocations): Add EM_AVR case.
+
+2000-03-09  Tim Waugh  <twaugh@redhat.com>
+
+	* strings.1: Correct '-bytes' to '--bytes'.
+
+2000-03-08  H.J. Lu  <hjl@gnu.org>
+
+	* Makefile.am (install-exec-local): Depend on
+	install-binPROGRAMS for parallel make.
+	* Makefile.in: Regenerated.
+
+2000-02-27  Ian Lance Taylor  <ian@zembu.com>
+
+	From Brad Lucier <lucier@math.purdue.edu>:
+	* readelf.c (process_dynamic_segment): Add cast to make sure
+	argument to %* is int.
+
+2000-02-25  H.J. Lu  <hjl@gnu.org>
+
+	* configure.in (AC_SEARCH_LIBS): Pass m, not -lm.
+
+2000-02-24  Nick Clifton  <nickc@cygnus.com>
+
+	* configure.in: Add arm-wince, mips-pe and sh-pe targets.
+	* configure: Regenerate.
+
+	* dlltool.c: Add support for sh-pe and mips-pe targets.
+	* rescoff.c: Add support for sh-pe and mips-pe targets.
+
+2000-02-23  H.J. Lu  <hjl@gnu.org>
+
+	* readelf.c (get_osabi_name): Handle ELFOSABI_LINUX.
+
+2000-02-22  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (process_symbol_table): Remove use of ELF_ST_OTHER.
+
+2000-02-22  Ian Lance Taylor  <ian@zembu.com>
+
+	From Brad Lucier <lucier@math.purdue.edu>:
+	* readelf.c (process_version_sections): Add casts to make sure
+	argument to %* is an int.
+	(process_mips_specific): Add casts to make printf arguments match
+	format.
+
+2000-02-21  Alan Modra  <alan@spri.levels.unisa.edu.au>
+
+	* objdump.c (dump_section_header): Change `opb' to unsigned.
+	(find_symbol_for_address): Same here.
+	(disassemble_data): And here.  Change `addr_offset',
+	`stop_offset', `nextstop_offset' to unsigned long.
+	(dump_data): Change opb to unsigned.
+
+2000-02-18  Frank Ch. Eigler  <fche@redhat.com>
+
+	* resrc.c: Remove unmatched #if for cygwin.
+
+2000-02-14  Fernando Nasser  <fnasser@totem.to.cygnus.com>
+
+	* binutils.texi: Document the change of flavor name from atpcs-special
+	to special-atpcs to prevent name conflict in gdb.
+
+2000-02-08  Timothy Wall  <twall@redhat.com>
+
+	* objdump.c (show_line): Fix bug preventing printing of the very
+	first line (line zero) of a file when interlisting source and
+	assembly.  Added option to print entire context from start of file
+	when the first line from that file is encountered.
+
+2000-02-03  Timothy Wall <twall@redhat.com>
+
+	* objdump.c (dump_section_header, find_symbol_for_address,
+	show_line, disassemble_bytes, disassemble_data, dump_data):
+	distinguish between octets and bytes.
+
+2000-01-27  Thomas de Lellis  <tdel@windriver.com>
+
+	* nm.c (print_symbol_info_bsd): Use bfd_is_undefined_symclass to
+	check to unresolved symbols.
+	(print_symbol_info_sysv):  Ditto.
+	(print_symbol_info_posix):  Ditto.
+
+	* binutils.texi: Document new 'V' symclass flag for nm.
+
+2000-01-27  Nick Clifton  <nickc@redhat.com>
+
+	* binutils.texi (objdump): Document new ARM specific
+	disassembler options.
+
+	* objdump.c (usage): Call disassembler_usage().
+
+2000-01-27  Alan Modra  <alan@spri.levels.unisa.edu.au>
+
+	* readelf.c (get_dynamic_flags): Return buff.
+	(process_dynamic_segment): Don't pass error strings to printf
+	as format arg.
+	(read_and_display_attr): Use lx and ld to print longs.
+	(process_corefile_note_segment): Cast bfd_vma to unsigned long
+	before printing.
+	Update copyright.
+
+2000-01-17  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (get_osabi_name): Recognise ELFOSABI_ARM.
+
+2000-01-15  Alan Modra  <alan@spri.levels.unisa.edu.au>
+
+	* debug.c (debug_name_type): Return DEBUG_TYPE_NULL rather than
+	false.
+	(debug_tag_type): Here too.
+	* ieee.c (ieee_builtin_type): And here.
+	* stabs.c (parse_stab_type, parse_stab_array_type): And here.
+
+2000-01-13  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (get_machine_name): Change EM_S370 to return "IBM
+	System/370".
+
+2000-01-11  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (get_dynamic_type): Remove DT_ENCODING.
+
+2000-01-10  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (get_note_type): Display NT_WIN32PSTATUS notes.
+
+2000-01-07  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* windres.c (long_options): Add --use-temp-file and
+	--no-use-temp-file options.
+	(usage): Document.
+	(main): Handle.
+
+	* windres.h: Update read_rc_file prototype.
+
+	* resrc.c (cpp_temp_file): New static variable.
+	(istream_type): New static variable.
+	(close_pipe): Delete function.
+	(run_cmd): New static function.
+	(open_input_stream): New static function.
+	(close_input_stream): New static function.
+	(look_for_default): Handle DOS directory separator. Use
+	open_input_stream instead of popen.
+	(read_rc_file): Likewise.
+
+	* binutils.texi: Document --use-temp-file, --no-use-temp-file
+	options.
+
+2000-01-04  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* dlltool.c (create_compat_implib): New variable.
+	(gen_exp_file): Use.
+	(make_one_lib_file): Use.
+	(long_options): Add --compat-implib option.
+	(usage): Handle.
+	(main): Handle.
+
+	* dllwrap.c (enum target_type): Rename MINGW32_TARGET to MINGW_TARGET.
+	(main): Use. Don't look for "32" in cygwin and mingw target names.
+
+2000-01-03  Nick Clifton  <nickc@cygnus.com>
+
+	* binutils.texi: Document new, ARM specific disassembler
+	command line switch "-M force-thumb".
+
+For older changes see ChangeLog-9899
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-0203 sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-0203
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-0203	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-0203	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2181 @@
+2003-12-31  Daniel Jacobowitz  <drow@mvista.com>
+
+	* MAINTAINERS: Rename CONFIGURE to BUILD SYSTEM and add myself.
+
+2003-12-29  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (debug_line_pointer_size): Replace with an array
+        called 'debug_line_pointer_sizes'.
+        (num_debug_line_pointer_sizes): New variable.
+        (display_debug_lines): Extract pointer size from the
+        debug_line_pointer_sizes array.
+        (display_debug_loc): Likewise.
+        (prescan_debug_info): Fill in the debug_line_pointer_sizes
+        array.
+
+2003-12-23  Ralf Baechle  <ralf@gnu.org>
+	    Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+	* objcopy.c (bfd_flags_to_set, bfd_flags_to_clear): New variables
+	to handle flags for tweaking.
+	(copy_options): New options: impure, pure, readonly-text,
+	writable-text.
+	(copy_usage, copy_object, command_line_switch): Handle the new
+	options.
+	* doc/binutils.texi: Document the new options.
+
+2003-12-22  Jakub Jelinek  <jakub@redhat.com>
+
+	* objdump.c (disassemble_bytes): Subtract rel_offset from printed
+	reloc address.
+	(disassemble_section): Set rel_offset to section->vma instead of
+	pinfo->buffer_vma.
+
+2003-12-19  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
+
+	* readelf.c (guess_is_rela): Changed m32r's default type to RELA.
+
+2003-12-11  Nick Clifton  <nickc@redhat.com>
+
+	* objcopy.c (strip_usage): Add --only-keep-debug.
+	(copy_usage): Likewise.
+
+2003-12-04  Nick Clifton  <nickc@redhat.com>
+
+	* objcopy.c (copy_object): Do not copy the object if the
+	output file's format cannot be set to that of the input file.
+	If the input file's format is unknown, fail.
+
+2003-11-28  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* cxxfilt.c (usage): Mention new -p/--no-params options.
+
+2003-11-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (install-exec-local): Remove common term from string
+	comparison.
+	* Makefile.in: Regenerate.
+	* doc/Makefile.am: Don't use $<.
+	* doc/Makefile.in: Regenerate.
+
+2003-11-27  Nick Clifton  <nickc@redhat.com>
+
+	* rename.c (smart_rename): Make sure that we have write
+	permission on the destination file before renaming.
+
+2003-11-26  Daniel Jacobowitz <drow@mvista.com>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c: Add a comment describing the difference between
+	readelf and objdump.
+	* doc/binutils.texi (readelf): Likewise.
+
+2003-11-25  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* doc/binutils.texi (dlltool): Document dlltool --temp-prefix
+	option.
+	* dlltool.c (usage): Likewise.
+
+2003-11-22  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* cxxfilt.c (long_options): Add --no-params.
+	(main): Handle -p/--no-params.
+	* doc/binutils.texi (c++filt): Document -p/--no-params.
+
+2003-11-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* objdump.c: Wrap long lines, init vars separately from decl.
+	(disassemble_section): Reset require_sec after call to
+	find_symbol_for_address.
+
+2003-11-14  Nick Clifton  <nickc@redhat.com>
+
+	* objdump.c (find_symbol_for_address): Change parameters so
+	that the entire disassemble_info structure is passed, not just
+	a few fields.  Use the symbol_is_valid field to check the
+	validity of located symbols and continue searching if they are
+	not valid.
+	(objdump_print_addr): Alter parameters passed to
+	find_symbol_for_address.
+	(objdump_symbol_at_address): Likewise.
+	(disassemble_section): Likewise.  Also use symbol_is_valid
+	function to check the validity of located symbols.
+
+2003-11-13  Tobias Burnus  <tobias.burnus@physik.fu-berlin.de>
+
+	* ar.c (open_inarch): Emit a warning when an archive is created
+	(only shown with -v) in order to confrom to POSIX specification.
+
+2003-11-11  Wang Li  <charles@linux.net.cn>
+
+	* objcopy.c (wildcard): New variable.  True if wildcard pattern
+	matching is allowed in symbol names.
+	(strip_options): Add -w option to enable wildcard pattern
+	matching.
+	(copy_options): Likewise.
+	(copy_usage): Mention new switch.
+	(strip_usage): Likewise.
+	(is_specified_symbol): If performing wildcard matches use fnmatch
+	to compare symbol names with entries on the symbol list.
+	(strip_main): Accept -w switch.
+	(copy_main): Likewise.
+	* Makefile.am: Add dependency on fnmatch.h for objcopy.c
+	* Makefile.in: Regenerate.
+	* doc/binutils.texi: Document new switch.
+	* NEWS: Mention new switch.
+
+2003-11-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* objdump.c: Revert rev 1.81 commit.
+
+2003-11-10  Tobias Burnus <tobias.burnus@physik.fu-berlin.de>
+
+	* ar.c (print_contents): Remove "member" from verbose output in
+	order to conform to POSIX specification.
+
+2003-11-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* README: Expand bug reporting information.
+
+2003-11-07  Jonathan R. Grant  <jg-binutils@jguk.org>
+
+	* bucomm,c (get_file_size): New function.  Returns the size of a
+	  file.
+	* bucomm.h: Add prototype for get_file_size.
+	* addr2line.c (process_file): Use new function.
+	* ar.c (main, ranlib_only, ranlib_touch): Likewise.
+	* nm.c (display_file): Likewise.
+	* objcopy.c (add_specific_symbols, copy_file, strip_main,
+	  copy_main): Likewise.
+	* objdump.c (display_file): Likewise.
+	* size.c (display_file): Likewise.
+	* strings.c (strings_file): Likewise.
+	* readelf.c (process_file): Use similar code to get_file_size.
+
+2003-11-06  Bruno Rohee  <bruno@rohee.com>
+
+	* ieee.c: Fix "the the" typo.
+	* stabs.c: Likewise.
+
+2003-10-30  Marshall T. Vandegrift  <llasram@wuli.nu>
+
+	* readelf.c (dump_section): Do not dump the contents of SHT_NOBITS
+	sections - they have no file space assigned to their contents.
+
+2003-10-28  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* readelf.c (dump_section): Don't display DEL characters.
+
+2003-10-27  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* ChangeLog: Fix typos.
+	* ChangeLog-9197: Likewise.
+	* ChangeLog-9899: Likewise.
+	* NEWS: Likewise.
+	* ar.c: Fix comment typos.
+	* arsup.c: Likewise.
+	* coffgrok.c: Likewise.
+	* debug.c: Likewise.
+	* debug.h: Likewise.
+	* dlltool.c: Likewise.
+	* ieee.c: Likewise.
+	* nm.c: Likewise.
+	* objdump.c: Likewise.
+	* prdbg.c: Likewise.
+	* readelf.c: Likewise.
+	* resrc.c: Likewise.
+	* sysinfo.y: Likewise.
+	* windres.c: Likewise.
+
+2003-10-27  Nick Clifton  <nickc@redhat.com>
+
+	* objcopy.c (copy_section): Do not complain when a target does not
+	support relocations.
+	(mark_symbols_used_in_relocations): Likewise.
+
+2003-10-14  Anil Paranjpe  <anilp1@KPITCummins.com>
+
+	* objcopy.c (copy_main): Reads machine flags from arch_info
+	structure.
+
+2003-10-20  Andrew Cagney  <cagney@redhat.com>
+
+	* coffgrok.h (coff_section): Replace 'struct sec" with "struct
+	bfd_section".
+
+2003-10-07  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* objdump.c (read_section_stabs): Just read one section, return
+	pointer to it. Add size parameter.
+	(print_section_stabs): Add string offset parameter. Adjust.
+	(struct stab_section_names): Add string offset member.
+	(find_stabs_sections): Correct check for split section suffix,
+	adjust read_section_stabs and print_section_stabs calls.
+	(dump_stabs_section): Clear string_offset, free string table.
+
+2003-10-01  Martin Fuchs  <martin-fuchs@gmx.net>
+
+	* resrc.c (define_icon): Fix storage of color attributes 'planes' and
+	'bit count' in icon groups.
+
+2003-09-30  Chris Demetriou  <cgd@broadcom.com>
+
+	* NEWS: Add an indication of the cutoff for 2.14.
+
+2003-09-30  Chris Demetriou  <cgd@broadcom.com>
+
+	* readelf.c (get_machine_flags): Handle E_MIPS_ARCH_64R2.
+
+2003-09-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (dump_relocations): Support SHN_IA_64_ANSI_COMMON.
+	(get_symbol_index_type): Likewise.
+
+2003-09-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (process_version_sections): Indent version names.
+
+2003-09-15  Anthony Green  <green@redhat.com>
+
+	* dlltool.c (prefix_encode): Fix ISO C90 conversion.
+	(dlltmp): Ditto.
+	(dtab): Ditto.
+
+2003-09-14  Andreas Jaeger  <aj@suse.de>
+
+	* addr2line.c: Convert to ISO C90 prototypes, change PTR, remove
+	unneeded (void *) casts.
+	* ar.c: Likewise.
+	* arlex.l: Likewise.
+	* arparse.y: Likewise.
+	* arsup.c: Likewise.
+	* binemul.c: Likewise.
+	* binemul.h: Likewise.
+	* bucomm.c: Likewise.
+	* bucomm.h: Likewise.
+	* budbg.h: Likewise.
+	* budemang.c: Likewise.
+	* budemang.h: Likewise.
+	* coffdump.c: Likewise.
+	* coffgrok.c: Likewise.
+	* cxxfilt.c: Likewise.
+	* debug.c: Likewise.
+	* debug.h: Likewise.
+	* deflex.l: Likewise.
+	* dlltool.c: Likewise.
+	* dlltool.h: Likewise.
+	* dllwrap.c: Likewise.
+	* emul_aix.c: Likewise.
+	* filemode.c: Likewise.
+	* ieee.c: Likewise.
+	* nlmconv.c: Likewise.
+	* nlmconv.h: Likewise.
+	* nlmheader.y: Likewise.
+	* nm.c: Likewise.
+	* prdbg.c: Likewise.
+	* rclex.l: Likewise.
+	* rcparse.y: Likewise.
+	* rdcoff.c: Likewise.
+	* rddbg.c: Likewise.
+	* rename.c: Likewise.
+	* resbin.c: Likewise.
+	* rescoff.c: Likewise.
+	* resrc.c: Likewise.
+	* size.c: Likewise.
+	* srconv.c: Likewise.
+	* stabs.c: Likewise.
+	* strings.c: Likewise.
+	* sysdump.c: Likewise.
+	* sysinfo.y: Likewise.
+	* syslex.l: Likewise.
+	* unwind-ia64.c: Likewise.
+	* unwind-ia64.h: Likewise.
+	* version.c: Likewise.
+	* windres.c: Likewise.
+	* windres.h: Likewise.
+	* winduni.c: Likewise.
+	* wrstabs.c: Likewise.
+
+2003-09-10  James E Wilson  <wilson@specifixinc.com>
+
+	* MAINTAINERS: Update my e-mail address.
+
+2003-09-09  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* MAINTAINERS: Update my e-mail address.
+
+2003-09-04  Nick Clifton  <nickc@redhat.com>
+
+	* MAINTAINERS: Make it clear what should be done with patches to
+	the top level configure files (other than config.guess and
+	config.sub).  Add binutils@sources.redhat.com as an address to
+	which patches can be sent.
+
+2003-09-04  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (get_machine_flags): Recognise V850E1 machine type.
+
+2003-09-03  Andrew Cagney  <cagney@redhat.com>
+
+	* objdump.c: Refer to init_disassemble_info in comments.
+	(disassemble_data): Replace INIT_DISASSEMBLE_INFO with
+	init_disassemble_info.
+
+2003-09-03  Nick Clifton  <nickc@redhat.com>
+
+	* objdump.c (struct objdump_disasm_info): Add new fields
+	'dynrelbuf', 'dynrelcount' and 'disassemble_fn'.
+	(process_section_p): New function:  Returns TRUE if a section
+	can be dumped.
+	(disassemble_section): New function: Contains the body of
+	disassemble_data(), but just for one section.
+	(disassemble_data): Use bfd_map_over_sections to walk section
+	chain.
+	(find_stabs_section): New function: Find a stabs containing
+	section and then dump it.
+	(dump_stabs_section): New function: Use bfd_map_over_sections
+	to find the section to dump.
+	(dump_stabs): Use dump_stabs_section.
+	(dump_section): New function: Display the contents of a
+	section.
+	(dump_data): Use bfd_map_over_sections to display section
+	contents.
+	(dump_relocs_in_section): Display the relocs in a given section.
+	(dump_relocs): Use bfd_map_over_sections to display relocs.
+	(adjust_addresses): New function: Adjust the vma and lma of
+	sections.
+	(dump_bfd): Use bfd_map_over_sections.
+	* doc/binutils.texi: Document the "objdump -s" (no longer)
+	dumps empty sections.
+
+2003-08-24  Jonathan R. Grant  <jg-binutils@jguk.org>
+
+	* objdump.c: Improve comments/documentation.
+	dump_data: Eliminate duplicate function calls to bfd_section_size.
+
+2003-09-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* MAINTAINERS: Move Dave Anglin's entry to where it belongs.
+
+2003-08-21  Nick Clifton  <nickc@redhat.com>
+
+	* po/tr.po: Updated Turkish translation.
+
+2003-08-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* dep-in.sed: Remove libintl.h.
+	* Makefile.am (POTFILES.in): Unset LC_COLLATE.
+	Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2003-08-11  Ian Lance Taylor  <ian@airs.com>
+
+	* readelf.c (process_archive): Fix error handling.  Remove memory
+	leak.
+
+	* readelf.c: Add ability to read archives.
+	(archive_file_offset): New variable.
+	(archive_file_size): New variable.
+	(get_data): Include archive_file_offset in file offset
+	calculation when fseeking.
+	(process_program_headers): Likewise.
+	(process_symbol_table): Likewise.
+	(process_dynamic_segment): Handle computation of end of file
+	position when the file is in an archive.
+	(process_object): New function.  Contains the body of
+	process_file().
+	(process_archive): New function.  Call process_object on each
+	member of an archive.
+	(process_file): Detect archives and handle appropriately.
+	* Makefile.am: Add dependency on aout/ar.h for readelf.c
+	* Makefile.in: Regenerate.
+	* NEWS: Document readelf's new ability.
+	* doc/binutils: Alter text to say that readelf supports archives
+	and 64-bit ELF files.
+
+2003-08-08  Nick Clifton  <nickc@redhat.com>
+
+	* po/fr.po: Updated French translation.
+
+2003-08-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* objcopy.c: Remove unnecessary prototypes and casts.
+	* objdump.c: Remove unnecessary casts.
+	* readelf.c: Convert to C90.  Remove unnecessary prototypes and casts.
+	(get_osabi_name): Move so we don't need a forward declaration.
+
+2003-08-04  Bradley Harrington  <bharring@us.ibm.com>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* objdump.c (include_paths, include_path_count): New vars.
+	(usage): Describe --include.
+	(long_options): Add "include".
+	(add_include_path): New function.
+	(struct print_file_list): Make filename const.  Add modname.
+	(try_print_file_open, update_source_path): New functions.
+	(show_line): Use them.
+	(main): Handle 'I' option.  Don't check for NULL xrealloc arg.
+
+2003-07-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* objdump.c: Remove unnecessary prototypes.
+	(disassemble_bytes): Add rel_offset parameter.  Simplify reloc skipping
+	code, and print relocs when dump_dynamic_reloc_info.
+	(disassemble_data): Read and handle dynamic relocs.  Correct reloc
+	skip code.  Formatting.
+	(dump_bfd): Don't dump dynamic relocs when disassembling.
+
+2003-07-29  Ben Elliston  <bje@wasabisystems.com>
+
+	* MAINTAINERS: Remove self as M88k maintainer.  Future M88k
+	maintenance defaults to the blanket write privilege maintainers.
+
+2003-07-29  Michael Meissner  <gnu@the-meissners.org>
+
+	* MAINTAINERS: Updated my email address.
+
+2003-07-29  Nick Clifton  <nickc@redhat.com>
+
+	* objdump.c: Update to ISO C.
+
+2003-07-24  Nick Clifton  <nickc@redhat.com>
+
+	* objdump.c (disassemble_data): Do not ignore sections without the
+	LOAD flag when disassemble_all is true.  Only print a message
+	about disassembling a section if it contains some data.
+
+	* po/fr.po: Updated French translation.
+
+2003-07-23  Nick Clifton  <nickc@redhat.com>
+
+	* objcopy.c: Switch to ISO C.  Remove debugging code accidentally
+	left in.  Some formatting tidy ups.
+
+2003-07-22  Salvador Eduardo Tropea <set@computer.org>
+
+	* objdump.c: New command line option --debugging-tags.
+	* doc/binutils.texi: Document new command line option.
+	* prdbg.c: Code to print the debug info as tags compatible
+	with ctags.
+	* budbg.h: Adjust prototype.
+	* NEWS: Mention new switch
+
+2003-07-18  Nick Clifton  <nickc@redhat.com>
+
+	* objdump.c (main) :Accept multiple -M switch.
+	* doc/binutils.texi: Document that multiple -M switches are
+	accepted and that a single -M switch can contain comma
+	separated options.
+
+2003-07-17  Nick Clifton  <nickc@redhat.com>
+
+	* objdump.c (main): Issue a warning message if multiple -M
+	switches are used.
+
+	* doc/binutils.texi (objdump): Update documentation about -M
+	option.
+
+2003-07-17  Nick Clifton  <nickc@redhat.com>
+
+	* po/es.po: New Spanish translation.
+
+2003-07-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* po/binutils.pot: Regenerate.
+
+2003-07-05  Christopher Faylor  <cgf@redhat.com>
+
+	* dlltool.c (prefix_encode): Use a fixed length for alpha.
+
+2003-07-04  Christopher Faylor  <cgf@redhat.com>
+
+	* dlltool.c (prefix_encode): New function.  Encode temp file prefix
+	from pid.
+	(dlltmp): Pass address of pointer being alloced or suffer neverending
+	mallocs.
+	(make_one_lib_file): Allocate enough space for new longer stub names.
+	(gen_lib_file): Ditto.
+	(main): Generate the temp file prefix from the pid if prefix was not
+	specified on the command line.
+
+2003-07-04  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (get_data): Print (unsigned) hex values for size and
+	offset in error messages.
+	(process_section_headers): If the string table could not be
+	allocated, do not continue.
+
+2003-07-01  Jakub Jelinek  <jakub@redhat.com>
+
+	* readelf.c (dynamic_segment_ia64_val): Print address and newline
+	for sections by default.  Comment fix.
+
+2003-06-28  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* rcparse.y (res_text_field): New res_id variable.
+	(res_null_text): New static const struct res_id object,
+	with empty unicode name field.
+	(control): Pop parsing of optresidc up one level. Set
+	res_text_field to $2 except for controls which do not accept
+	a text field.  Set res_text_field to res_null_text for the
+	special cases (viz. COMBOBOX, EDITTEXT, LISTBOX, SCROLLBAR).
+	(control_params): Adjust to use res_text_field rather
+	than optresidc.
+	(COMBOBOX): Add comment about discrepency between documented
+	vs. observed default style.
+	* resrc.c (define_control): Make first param const.
+	* windres.h (define_control): Adjust prototype.
+
+2003-06-27  Nick Clifton  <nickc@redhat.com>
+
+	* objcopy.c (copy_object): Replace call to
+	bfd_create_gnu_debuglink_section with separate calls to
+	bfd_add_gnu_debuglink_section and
+	bfd_fill_in_gnu_debuglink_section, separated by a walk over the
+	symbol tables.
+
+2003-06-26  Roland McGrath  <roland@redhat.com>
+
+	* readelf.c (loadaddr): Variable removed.
+	(dynamic_info, version_info): Fix type long -> bfd_vma.
+	(program_headers): New variable.
+	(get_program_headers): New function, broken out of
+	process_program_headers.
+	(process_program_headers): Call it.  Don't set `loadaddr'.
+	(slurp_ia64_unwind_table): Use get_program_headers.
+	(process_corefile_note_segments):  Likewise.
+	(offset_from_vma): New function.
+	(process_relocs, process_dynamic_segment): Call that instead of
+	subtracting `loadaddr'.
+	(process_version_sections, process_symbol_table): Likewise.
+	(process_mips_specific): Likewise.
+
+2003-06-26  Nick Clifton  <nickc@redhat.com>
+
+	* objcopy (enum strip_action): Add STRIP_NONDEBUG.
+	(OPTION_ONLY_KEEP_DEBUG): New.
+	(strip_options): Add --only-keep-debug.
+	(copy_options): Likewise.
+	(is_strip_section): Invert return value if STRIP_NONDEBUG is
+	active.
+	(copy_object): Do not copy private data when STRIP_NONDEBUG is
+	active.
+	(setup_section): Likewise.
+	(strip_main): Handle --only-keep-debug.
+	(copy_main): Likewise.
+	* NEWS: Mention new switch
+	* doc/binutils.texi: Document new switch.
+
+2003-06-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* NEWS: Correct spelling of "relocatable".
+	* objdump.c: Likewise.
+	* sysroff.info: Likewise.
+
+2003-06-19  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (print_vma): When printing DEC_5 values, if the
+	number is bigger than 99999 switch to using hexadecimal
+	notation.
+
+2003-06-11  Nick Clifton  <nickc@redhat.com>
+
+	* objcopy.c (gnu_debuglink_filename): New variable.
+	(OPTION_ADD_GNU_DEBUGLINK): New switch
+	(copy_options): Describe --add-gnu-debuglink switch.
+	Mention that --strip-debug removes sections as well.
+	(is_strip_section): Process the sections removed and kept
+	lists before checking for debugging sections.
+	(add_redefine_syms_file): Make function static.
+	(copy_object): Use is_strip_section.
+	Check to see if a .gnu_debuglink section should be added.  If
+	so, call bfd_add_gnu_debuglink.
+	(setup_section): Use is_strip_section.
+	(copy_section): Use is_strip_section.
+	(copy_main): Handle OPTION_ADD_GNU_DEBUGLINK.
+	* NEWS: Mention new objcopy switch.
+	* doc/binutils.texi: Document new switch.
+
+2003-06-11  H.J. Lu <hongjiu.lu@intel.com>
+
+	* po/Make-in (DESTDIR): New.
+	(install-data-yes): Support $(DESTDIR).
+	(uninstall): Likewise.
+
+2003-06-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
+2003-05-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* readelf.c (get_segment_type): Handle PT_GNU_STACK.
+
+2003-06-03  Elias Athanasopoulos  <elathan@phys.uoa.gr>
+
+	* NEWS: Document the new BSD/POSIX single-character mapping for
+	.comment/.note sections.
+
+2003-06-02  Chris Demetriou  <cgd@broadcom.com>
+	    Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* objcopy.c (redefine_list_append): Add an argument that
+	indicates the context from which this function is being
+	called.  Change all callers.
+	(copy_options): Add a new option, --redefine-syms.
+	(copy_usage): Document new option.
+	(copy_main): Handle the --redefine-syms option.
+	* doc/binutils.text (objcopy): Document new option.
+
+2003-05-31  Richard Henderson  <rth@redhat.com>
+
+	* readelf.c (byte_get_signed): New.
+	(get_encoded_value): New.
+	(display_debug_frames): Use it.  Always pre-process opcodes.
+
+2003-05-20  Michal Ludvig  <mludvig@suse.cz>
+
+	* readelf.c (display_debug_frames): Print both registers
+	for DW_CFA_register.
+
+2003-05-16  Kelley Cook  <kelleycook@wideopenwest.com>
+
+	* configure.in: Accept i[3-7]86 variants. Escape '[]' for
+	i[3-7]86-*-interix.
+	* configure.in: Regenerate.
+
+2003-05-13  Michael Eager <eager@mvista.com>
+
+	* objcopy.c: Treat identical src/dst file names as if only one
+	entered.  One Windows creating an output file of the same name as
+	the input file will delete the input file before it is read.
+
+2003-05-12  Salvador Eduardo Tropea  <salvador@inti.gov.ar>
+
+	* debug.c (debug_get_real_type): Extend test for circular debug
+	references.
+
+2003-05-12  Nick Clifton  <nickc@redhat.com>
+
+	* configure.in (ALL_LINGUAS): Add zh_CN.
+	* configure: Regenerate.
+	* po/zh_CN.po: New file: Chinese (simplified) translation.
+
+2003-05-11  Jason Eckhardt  <jle@rice.edu>
+
+	* MAINTAINERS: Update my mail address.
+
+2003-05-07  H.J. Lu <hongjiu.lu@intel.com>
+
+	* readelf.c (dump_relocations): Enlarge the type field in wide
+	mode by one character.
+
+2003-05-03  Richard Henderson  <rth@redhat.com>
+
+	* readelf.c (struct Frame_Chunk): Add cfa_exp.
+	(frame_display_row): Just print "exp" for cfa or register
+	defined by a location expression.
+	(display_debug_frames): Handle DW_CFA_def_cfa_expression,
+	DW_CFA_expression, DW_CFA_MIPS_advance_loc8.
+
+2003-04-30  H.J. Lu <hjl@gnu.org>
+
+	* objdump.c (only): Change it to char **.
+	(only_size): New.
+	(only_used): New.
+	(disassemble_data): Check only as an array.
+	(dump_data): Likewise.
+	(dump_relocs): Likewise.
+	(main): Treat only as an array.
+
+2003-04-24  Dimitrie O. Paun <dpaun@rogers.com>
+
+	* doc/binutils.texi: Fix the documentation for the -fo option.
+
+2003-04-23  J"orn Rennecke <joern.rennecke@superh.com>
+
+	* readelf.c (get_machine_name) <EM_SH>: Amend return value
+	to refer to SuperH.
+
+	* readelf.c (decode_location_expression): Don't add a trailing ';'.
+
+2003-04-23  Dimitrie O. Paun <dpaun@rogers.com>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* windres.c (long_options): Move close to main, where it is used.
+	Add 'input' and 'output' long options.
+	(main): Accept "-fo" as an alias for "-o".  This is for rc
+	comptibility.
+	* doc/binutils.texi: Mention that -fo is accepted as an alias for
+	-o, but discourage its use.
+
+2003-04-22  Dimitrie O. Paun  <dpaun@rogers.com>
+
+	* windres.c (format_from_name): Make the exit on error
+	behaviour optional.
+	(main): Rename the -I option to -J. Introduce -I as a synonym
+	for --include-dir.  For backwards compatibility also support the
+	old -I behaviour, but issue a deprecation warning.
+	* doc/binutils.texi: Rename -I to -J.  Document the new behaviour
+	of the -I option.
+
+2003-04-22  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
+
+	* readelf.c: Replace references to Mitsubishi M32R with
+	references to Renesas M32R.
+
+2003-04-15  Rohit Kumar Srivastava <rohits@kpitcummins.com>
+
+	* readelf.c: Replace occurrances of 'Hitachi' with 'Renesas'.
+
+2003-04-09  Alexandre Oliva  <aoliva@redhat.com>
+
+	* doc/binutils.texi (objdump) [--debugging]: Suggest readelf -w
+	for debugging information types not supported by objdump.
+
+2003-04-09  Bernd Jendrissek <berndj@prism.co.za>
+
+	* configure.in: Recognize canonical form of i[3-6]86-pe*.
+	* configure: Regenerate.
+
+2003-04-09  Alexandre Oliva  <aoliva@redhat.com>
+
+	* readelf.c (display_debug_info): Apply RELA relocations on the
+	entire section.
+	(byte_put_little_endian, byte_put_big_endian): New functions.
+	(byte_put): New variable.
+	(get_file_header): Initialize it.
+
+2003-04-05  Dimitrie O. Paun <dpaun@rogers.com>
+
+	* windres.c: Add -l for compatibility with wrc, and rc.
+	Use the short option as a key for long options that have
+	a synonymous short option.
+	* doc/binutils.texi: Added -l to the list of options.
+
+2003-04-03  Dimitrie O. Paun <dpaun@rogers.com>
+
+	* windres.c: Add -U for compatibility with wrc, rc, and cpp.
+	(main): Just pass the -U option down to the preprocessor.
+	* doc/binutils.texi: Added -U to the list of options.
+
+2003-04-01  Dimitrie O. Paun <dpaun@rogers.com>
+
+	* windres.c (usage): Report -r option.
+	(main): Ignore the -r option.
+	* doc/binutils.texi: Add -r to the list of options.
+
+2003-04-01  Bob Wilson  <bob.wilson@acm.org>
+
+	* MAINTAINERS: Add myself as Xtensa maintainer.
+
+2003-04-01  Bob Wilson  <bob.wilson@acm.org>
+
+	* readelf.c: Include "elf/xtensa.h".
+	(guess_is_rela): Add EM_XTENSA and EM_XTENSA_OLD to list of
+	targets that use RELA relocations.
+	(dump_relocations): Call elf_xtensa_reloc_type for
+	EM_XTENSA and EM_XTENSA_OLD.
+	(get_machine_name): Handle EM_XTENSA and EM_XTENSA_OLD.
+
+2003-04-01  Nick Clifton  <nickc@redhat.com>
+
+	* configure.in: Change "arm-pe*" to "arm-*-pe*".  Similarly for
+	thumb-pe*, mcore-pe and mcore-*elf.
+	* configure: Regenerate.
+
+2003-03-31  Alexandre Oliva  <aoliva@redhat.com>
+
+	* objdump.c (dump_data): Don't truncate the address to long; make
+	the width large enough, and uniform for all entries in a section.
+
+2003-03-31  H.J. Lu <hjl@gnu.org>
+
+	* readelf.c: Include "libiberty.h".
+	(dynamic_relocations): New.
+	(process_relocs): Properly handle dynamic relocation.
+	(process_dynamic_segment): Fill relocation elements in
+	dynamic_info.
+
+2003-03-31  Kevin Buettner <kevinb@redhat.com>
+
+	* readelf.c (read_and_display_attr, read_and_display_attr_value):
+	Add new arguments ``offset_size'' and ``dwarf_version''.  Adjust
+	all callers.
+	(display_debug_lines, display_debug_pubnames, display_debug_info)
+	(display_debug_aranges, display_debug_frames, read_and_display_attr)
+	(read_and_display_attr_value): Add 64-bit DWARF support.
+
+2003-03-31  Ian Lance Taylor <ian@airs.com>
+
+	* rcparse.y: Replace uses of 'optstringrc' with 'optresid'.
+	(optresid): Handle a resource id that can be a string or a number.
+	* resrc.c (define_control): Replace 'text' parameter with 'iid' a
+	struct res_id.
+	(define_icon_control): Pass a struct res_id to define_control.
+	* windres.h (define_control): Change prototype.
+
+2003-03-24  Elias Athanasopoulos  <elathan@phys.uoa.gr>
+
+	* objcopy (OPTION_FORMATS_INFO): Define.
+	(strip_options): Add "info"/OPTION_FORMATS_INFO option.
+	(copy_options): Likewise.
+	(strip_usage): Add "--info" to usage.
+	(copy_usage): Likewise.
+	(strip_main): Declare formats_info. Iniatilize it to FALSE.
+	Handle "info".
+	(copy_main). Likewise.
+	* doc/binutils.texi. Document the "--info" option for
+	objcopy/strip.
+	* NEWS: Mention the new command line switch.
+
+	* objdump.c (endian_string): Move to bucomm.c.
+	(display_info): Likewise.
+	(display_target_list): Likewise.
+	(display_info_table): Likewise.
+	(display_target_tables): Likewise.
+	(main): Assign the return value of display_info to exit_status.
+	* bucomm.c: Include bfdver.h and libbfd.h
+	(display_target_list): Call bfd_nonfatal instead of nonfatal and
+	return 0 on a non-fatal error, 1 on success.
+	(display_info_table): Likewise.
+	* bucomm.h (display_info): Provide a prototype.
+	* Makefile.am (bucomm.o): Add dependencies on bfdver.h and
+	libbfd.h.
+	* Makefile.in: Regenerate.
+
+2003-03-22  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* dlltool.c (gen_def_file): Put demangled name comments on
+	own line preceding export name.
+
+2003-03-17  Nick Clifton  <nickc@redhat.com>
+
+	* objdump.c (disassemble_data): Use disasm_info.fprintf_func not
+	printf for emitting new lines.
+
+2003-03-16  Elias Athanasopoulos  <elathan@phys.uoa.gr>
+
+	* nm.c (print_symbol_info_bsd): Print the symbol's size instead of
+	the symbol's value when --size-sort is used, unless -S is used.
+	doc/binutils.texi (--size-sort): For non-bsd formats both the
+	value and size of the symbols are displayed.
+
+2003-03-13  Nick Clifton  <nickc@redhat.com>
+
+	* po/da.po: Update.
+
+2003-03-12  Nick Clifton  <nickc@redhat.com>
+
+	* MAINTAINERS: Remove Peter Targett as ARC maintainer.
+
+2003-03-10  Ben Elliston  <bje@wasabisystems.com>
+
+	* MAINTAINERS: Update my mail address.
+
+2003-03-06  Elias Athanasopoulos  <elathan@phys.uoa.gr>
+
+	* stabs.c (BYTES_IN_WORD): Remove definition.
+	* wrstabs.c (BYTES_IN_WORD): Likewise.
+
+2003-03-04  Nick Clifton  <nickc@redhat.com>
+
+	* nm.c (main): Print a warning message if --size-sort and
+	--undefined-only are used together.
+
+2003-03-04  Elias Athanasopoulos  <elathan@phys.uoa.gr>
+
+	* nm.c (print_symbol): Remove check for undefined_only.
+
+2003-03-03  Nick Clifton  <nickc@redhat.com>
+
+	* po/da.po: Installed latest translation.
+
+2003-02-24  Nick Clifton  <nickc@redhat.com>
+
+	* README: Update binutils references to 2.13.
+	Add paragraph about using --disable-nls.
+
+2003-02-24  Elias Athanasopoulos  <elathan@phys.uoa.gr>
+
+	* doc/binutils.texi (nm --size-sort): Update.
+
+2003-02-21  James E Wilson  <wilson@tuliptree.org>
+
+	* MAINTAINERS: Update email address.
+
+2003-02-21  Ian Wienand  <ianw@gelato.unsw.edu.au>
+
+	* readelf.c (get_ia64_dynamic_type): New function.
+	(dynamic_segment_ia64_val): New function.
+	(get_dynamic_type): If machine type is EM_IA_64 call
+	get_ia64_dynamic_val.
+	(get_ia64_section_type_name): Handle sections with types in the
+	SHT_IA_64_LOPSREG to SHT_IA_64_HIPSREG range.
+	(get_dynamic_flags): If machine type is EM_IA_64 call
+	dynamic_segment_ia64_val.
+
+2003-02-21  Bob Wilson  <bob.wilson@acm.org>
+
+	* doc/binutils.texi: Fix typos and obvious texinfo mistakes.  Make
+	section title capitalization more consistent.  Update descriptions
+	of various options to be consistent with the code.  Fix errors and
+	incomplete list in the description of c++filt format options.  Remove
+	information about the linker.  Change to be more polite about poor
+	bug reports.  Replace FDL appendix with include of fdl.texi.
+	* doc/fdl.texi: New file.
+
+2003-02-21  Roger Sayle  <roger@eyesopen.com>
+
+	* objcopy.c (filter_symbols): Fix compilation problems with
+	HP-UX's C compiler.
+
+2003-02-19  Christopher Faylor  <cgf@redhat.com>
+
+	* rclex.l (handle_quotes): Fix minor formatting problems introduced in
+	previous change.
+
+2003-02-19  Mark Blackburn  <marklist@fangorn.ca>
+
+	* rclex.l (handle_quotes): Handle strings spanning more than one line.
+
+2003-02-12  Bob Wilson  <bob.wilson@acm.org>
+
+	* nm.c (usage): Add `java' and `gnat' demangle styles and make
+	quotes consistent.
+	* objdump.c (usage): Ditto.  Also fix some typos.
+
+	* readelf.c (parse_args): Include 'H' option in call to getopt_long.
+
+	* debug.c (debug_record_variable): Handle global register variables.
+
+	* stabs.c (parse_stab): For N_SLINE only include
+	function_start_offset if the symbol is within a function;
+	otherwise, the value is absolute.
+
+2003-02-10  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (decode_ARM_machine_flags): Handle the
+	EF_ARM_MAVERICK_FLOAT flag.
+
+2003-02-04  Andreas Schwab  <schwab@suse.de>
+
+	* rddbg.c (read_section_stabs_debugging_info): Cast ptrdiff_t to
+	long and use %ld in printf format.
+
+2003-01-28  Richard Sandiford  <rsandifo@redhat.com>
+
+	* readelf.c (dump_relocations): Reorder the r_info field for
+	little-endian mips elf64.  Move #ifdef BFD64 to cover the new code.
+
+2003-01-21  Daniel Berlin  <dan@dberlin.org>
+
+	* readelf.c (display_debug_loc): Skip address base changes.
+
+2003-01-17  Fabio Alemagna  <falemagn@aros.org>
+
+	* readelf.c (get_osabi_name): Handle ELFOSABI_AROS, ELFOSABI_OPENVMS
+	and ELFOSABI_NSK.
+
+2003-01-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c: Include elf/ppc64.h.
+	(dump_relocations <EM_PPC64>): Use elf_ppc64_reloc_type.
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2003-01-02  Ben Elliston  <bje@redhat.com>
+
+	* readelf.c (guess_is_rela): Handle EM_IQ2000.
+	(get_machine_name): Likewise.
+	(dump_relocations): Likewise.
+	* NEWS: Mention IQ2000 support.
+
+2003-01-02  Richard Sandiford  <rsandifo@redhat.com>
+
+	* readelf.c (get_machine_flags): Handle E_MIPS_ARCH_32R2.
+
+2002-12-30  Chris Demetriou  <cgd@broadcom.com>
+
+	* doc/binutils.texi (objdump): Note MIPS HWR (Hardware Register)
+	changes in MIPS -M options.
+
+2002-12-30    Dmitry Diky <diwil@mail.ru>
+
+	* Makefile.am: Add msp430 target.
+	* Makefile.in: Regenerate.
+	* readelf.c: Add support for msp430 target.
+
+2002-12-27  Chris Demetriou  <cgd@broadcom.com>
+
+	* doc/binutils.texi (objdump): Document MIPS -M options.
+
+2002-12-23  Andreas Schwab  <schwab@suse.de>
+
+	* readelf.c (main): Reset dump request after each file.
+
+2002-12-23  Nick Clifton  <nickc@redhat.com>
+
+	* nlmconv.c (main): Pass TRUE as third argument to
+	bfd_arch_get_compatible.
+
+2002-12-23  Nick Clifton  <nickc@redhat.com>
+
+	* strings.c (isgraphic): Replace definition with STRING_ISGRAPHIC
+	macro.  Handle 'S' encoding, accepting 8-bit characters.
+	(main): Parse 'S' encoding.
+	(get_char): Accept 'S' encoding.
+	(print_strings): Use STRING_ISGRAPHIC.
+	(usage): Document support of 'S' encoding.
+	* doc/binutils.texi: Document support of 'S' encoding/
+	* NEWS: Mention new feature.
+
+2002-12-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* README <building ar>: Don't use libibery's needed_list or
+	required_list, instead link libiberty/*.o.
+
+2002-12-19  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* doc/binutils.texi: Fix typos.
+
+2002-12-14  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* doc/binutils.texi: Add missing parenthesis.
+
+2002-12-15  Nick Kelsey  <nickk@ubicom.com>
+
+	* objcopy.c: Add --prefix-symbols=<prefix> option to rename all
+	symbols by adding the given prefix to the begining of the symbol
+	name. This is useful to provide name space separation regardless
+	of how the object file was created. Added --prefix-sections=
+	<prefix> and --prefix-alloc-sections=<prefix> options to rename all
+	sections (or all sections with the alloc flag set) by adding the given
+	prefix to the begining of the symbol name.
+	* NEWS: Mention this new feature.
+	* doc/binutils.texi: Document this new feature.
+
+2002-12-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* dlltool.c (mcore_elf_gen_out_file): Replace all occurrences of
+	dyn_string_append with dyn_string_append_cstr.
+
+	* emul_aix.c (ar_emul_aix_create): Remove unused function.
+
+2002-12-10  James Cownie <jcownie@etnus.com>
+
+	* readelf.h (get_TAG_name, get_AT_name,
+	read_and_display_attr_value): Add support for UPC extensions to
+	DWARF2 spec.
+	* NEWS: Mention this new support.
+
+2002-12-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* NEWS: Mention that bfd no longer declares a "boolean" type.
+
+2002-12-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (process_program_headers): When setting loadaddr, don't
+	assume segment size is 4k.  Use p_align instead.
+	(loadaddr): Change from int to long.
+	(dynamic_addr, dynamic_info, version_info): Likewise.
+	(process_dynamic_segment <syminsz>): Likewise.
+	(process_dynamic_segment): Adjust print format string.
+	(rela_addr, rela_size): Delete.
+	(process_relocs): Formatting.
+
+2002-12-05  Jim Wilson  <wilson@redhat.com>
+
+	* configure.in (OBJDUMP_DEFS): Define SKIP_ZEROES as 16 for IA-64.
+	* configure: Regenerate.
+
+2002-12-04  Ian Lance Taylor  <ian@airs.com>
+
+	* MAINTAINERS: Change e-mail address back to airs.com.
+
+2002-12-04  Aldy Hernandez  <aldyh@redhat.com>
+
+	* MAINTAINERS: Add self.
+
+2002-11-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* addr2line.c, ar.c, arsup.c, binemul.c, binemul.h, bucomm.c, bucomm.h,
+	budbg.h, debug.c, debug.h, dlltool.c, emul_aix.c, ieee.c, nlmconv.c,
+	nlmconv.h, nlmheader.y, nm.c, objcopy.c, objdump.c, prdbg.c, rdcoff.c,
+	rddbg.c, readelf.c, rename.c, size.c, stabs.c, strings.c,
+	unwind-ia64.h, wrstabs.c: Replace boolean with bfd_boolean, true with
+	TRUE, false with FALSE.  Simplify comparisons of bfd_boolean vars
+	with TRUE/FALSE.  Formatting.
+
+2002-11-29  Jakub Jelinek  <jakub@redhat.com>
+
+	* readelf.c Replace occurrences of Elf32_Internal_* and
+	Elf64_Internal_* with Elf_Internal_*.
+	(slurp_rel_relocs): Change Elf_Internal_Rel to Elf_Internal_Rela.
+	Zero r_addend fields.
+	(dump_relocations): Remove relas variable, change Elf_Internal_Rel to
+	Elf_Internal_Rela.
+
+2002-11-23  Nick Clifton  <nickc@redhat.com>
+
+	* size.c (usage): Fix typo describing switch for hex format.
+
+2002-11-18  Svein E. Seldal  <Svein.Seldal@solidas.com>
+
+	* testsuite/binutils-all/objcopy.exp: Disable tic4x from test
+	* testsuite/binutils-all/objdump.exp: Setup proper values for tic4x
+	testcase
+
+2002-11-14  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (process_program_headers): Add comment about return
+	value.  Ensure that 0 is returned if the headers are not loaded.
+	(process_file): If process_section_headers failed to load the
+	headers disable any tests that rely upon them.  Similarly for
+	process_program_headers.
+
+2002-11-12  Nick Clifton  <nickc@redhat.com>
+
+	* po/da.po: Updated Danish translation.
+
+2002-11-12  Klee Dienes  <kdienes@apple.com>
+
+	* rddbg.c (read_section_stabs_debugging_info): Also recognize
+	LC_SYMTAB.stab/LC_SYMTAB.stabstr as a valid pair of sections.
+
+2002-11-11  Christopher Faylor  <cgf@redhat.com>
+
+	* MAINTAINERS: Reinstate DJ Delorie as COFF maintainer.  Drop COFF from
+	cgf maintainership.
+
+2002-11-11  Christopher Faylor  <cgf@redhat.com>
+
+	* MAINTAINERS: Replace DJ Delorie as PE/COFF maintainer.
+
+2002-11-07  Nick Clifton  <nickc@redhat.com>
+
+	* configure.in (ALL_LINGUAS): Add 'da'.
+	* configure: Regenerate.
+	* po/da.po: New Danish translation.
+
+	* readelf.c (get_symbol_index_type): Revert part of previous
+	patch: Display unknown symbol types in decimal, not hex.
+
+2002-11-07  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* dlltool.c (add_excludes): Don't prefix excluded fastcall
+	symbols	with underscore.
+	(xlate): Ignore add_underscore for decorated fastcall symbols.
+
+2002-11-07  Eric Kohl  <ekohl@rz-online.de>
+
+	* deflex.l: Accept '@' as first character of an ID.
+	* dlltool.c (gen_exp_file): Use existing '@' prefix rather than
+	ASM_PREFIX for fastcall symbols.
+	(scan_drectve_symbols): Handle fastcall symbols when generating
+	undecorated aliases for symbols in drectve section.
+	(scan_filtered_symbols): Likewise, with export-all.
+	(xlate): Likewise, with --kill-at.
+	(make_imp_label): New function to handle fastcall symbols
+	correctly.
+	(make_one_lib_file): Use make_imp_label instead of make_label
+	for imp	symbols.
+
+2002-11-06  Svein E. Seldal  <Svein.Seldal@solidas.com>
+
+	* MAINTAINERS: Add self as TIC4X maintainer.
+
+2002-11-06  Hiroyuki Machida  <machida@sm.sony.co.jp>
+
+	* readelf.c (get_symbol_index_type): Add hex number to
+	PROCESSOR-specific, OS-specific, reserved and unknown symbol
+	types.
+
+2002-11-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (byte_get_little_endian): Comment typo fix.
+	(print_symbol): Constify "symbol" arg.  Don't pass "symbol" to printf
+	as the format string.
+	(dump_relocations): Correct section sym names.
+	(process_section_headers): Clear symtab_shndx_hdr.
+	(read_and_display_attr_value): Don't pass indirect string to printf
+	as the format string.
+	(display_debug_frames): Indicate when zero terminator found.  Decode
+	DW_EH_PE_pcrel addresses.
+
+2002-10-23  Svein E. Seldal  <Svein.Seldal@solidas.com>
+
+	* configure.in: Define SKIP_ZEROES as 32 for tic4x target in
+	order to ensure proper disassembly of the valid 0-value opcode.
+	* configure: Regenerate.
+	* aclocal.m4: Regenerate.
+	* config.in: Regenerate.
+	* configure.in: Regenerate.
+	* doc/Makefile.in: Regenerate.
+	* po/binutils.pot: Regenerate.
+
+2002-10-23  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* MAINTAINERS: Add self as SH maintainer.
+
+2002-10-23  Ben Elliston  <bje@redhat.com>
+
+	* doc/binutils.texi (objdump): Document -z and move the entry for
+	--disassemble-zeroes to the end of the options section (for `z').
+
+2002-10-21  Nick Clifton  <nickc@redhat.com>
+
+	* MAINTAINERS: Discontinue Hans-Peter Nilsson as SH maintainer.
+
+2002-10-21  Svein E. Seldal  <Svein.Seldal@solidas.com>
+
+	* objdump.c (dump_data): Correct addr_offset for opb != 1.
+
+2002-10-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* bucomm.c (list_supported_targets): Use bfd_target_list.
+
+	* objcopy.c (copy_file): Report ambiguous bfd_object matches, and
+	other object errors in preference to bfd_core errors.
+
+2002-10-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* objdump.c: #include "bfdver.h".
+	* version.c: Likewise.
+	* Makefile.in: Regenerate.
+	* config.in: Regenerate.
+	* configure: Regenerate.
+	* po/POTFILES.in: Regenerate.
+
+2002-10-09  Daniel Jacobowitz  <drow@mvista.com>
+
+	* readelf.c (display_debug_info): Ignore empty .rela.debug_info
+	sections.  Allow relocations against the absolute symbol.  Don't
+	use the value in compunit.cu_abbrev_offset if we found a RELA
+	relocation.
+
+2002-10-07  Gordon Chaffee <chaffee@netvmg.com>
+
+	* addr2line.c (slurp_symtab): Read in dynamic symbols if no
+	ordinary ones are available.
+
+2002-09-30  H.J. Lu <hjl@gnu.org>
+
+	* readelf.c (get_machine_flags): Handle E_MIPS_MACH_4120,
+	E_MIPS_MACH_5400 and E_MIPS_MACH_5500.
+
+2002-09-17  Zack Weinberg  <zack@codesourcery.com>
+
+	* Makefile.am (CFILES): Add cxxfilt.c.
+	(cxxfilt_SOURCES): Now just cxxfilt.c $(BULIBS).
+	(cxxfilt_LDADD): Delete.
+	Remove all references to underscore.c.
+	Regen dependencies.
+	* configure.in: Define TARGET_PREPENDS_UNDERSCORE in
+	config.h from $UNDERSCORE, rather than AC_SUBSTing it.
+	* binutils/cxxfilt.c: Moved here from gcc/cp, minor
+	adjustments to fit into binutils framework.
+	* configure, config.in, Makefile.in, doc/Makefile.in: Regenerate.
+
+2002-09-12  Roland McGrath  <roland@redhat.com>
+
+	* readelf.c (decode_location_expression): DW_OP_calli -> DW_OP_call_ref
+	Handle DW_OP_GNU_push_tls_address.
+
+2002-09-11  Nick Clifton  <nickc@redhat.com>
+
+	* po/tr.po: Updated Turkish translation.
+
+2002-09-10  Nick Clifton  <nickc@redhat.com>
+
+	* MAINTAINERS: Add Ben Elliston as a maintainer for configure and
+	testsuite changes.  Add paragraphs about testsuite and config
+	patches.
+
+2002-08-29  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (get_machine_flags): Remove redundant reference to
+	E_V850EA_ARCH.
+
+2002-08-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* objdump.c (dump_bfd): Restore lines accidentally deleted in
+	last commit.
+
+2002-08-28  Michael Hayes <m.hayes@elec.canterbury.ac.nz>
+
+	* objdump.c (dump_headers): Add printing of HAS_LOAD_PAGE flag.
+	(dump_bfd_header): Likewise.
+
+2002-08-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* nm.c: Revert last change.
+
+2002-08-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* nm.c (display_rel_file): Don't report "no symbols" as an error.
+	* objdump.c (slurp_symtab): Likewise.
+	(slurp_dynamic_symtab): Likewise.
+	(dump_symbols): Likewise.  Do print "no symbols" to stdout.
+
+2002-08-24  Geoffrey Keating  <geoffk@redhat.com>
+
+	* MAINTAINERS: Change my mailing address.
+
+2002-08-23  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* MAINTAINERS: Add Dave Anglin as HPPA co-maintainer.
+
+2002-08-22  Nick Clifton  <nickc@redhat.com>
+
+	* MAINTAINERS: Add Jeff Law as (maintainance) maintainer for
+	HPPA.
+
+2002-08-21  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* readelf.c (parse_args): Change debug_dump_opt to static.
+
+2002-08-16  Sivaguru Sankaridurg  <siva@eternal-systems.com>
+
+	* stabs.c (parse_stab_argtype): Pass length of physname to
+	stab_demangle_argtypes.
+	(stab_demangle_argtypes): Add new parameter - length of physname.
+	Pass length of physname on to stab_demangle_prefix.
+	(stab_demangle_prefix): Add new parameter - length of physname.
+	Use length of physname (if supplied) to compute end of function
+	name.
+
+2002-08-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c: Include elf/i370.h.
+	(dump_relocations): Handle EM_S370.
+	(dynamic_segment_parisc_val): Print \n.
+	(process_dynamic_segment <DT_BIND_NOW>): Here too.
+
+2002-08-14  Nick Clifton  <nickc@redhat.com>
+
+	* nm.c (usage): Change 'gnu-new-abi' to 'gnu-v3'.
+	* objdump.c (usage): Likewise.
+	* doc/binutils.texi: Likewise.
+
+2002-08-14  Luke Dunstan  <infidel@users.sourceforge.net>
+
+	* rcparse.y (acc_entry): Don't warn about ALT use with
+	non-VIRTKEY.
+
+2002-08-13  H.J. Lu <hjl@gnu.org>
+
+	* objcopy.c (copy_object): Don't warn about the unsupported
+	architecture unless the input target is defaulted or the
+	output architecture is different from the input.
+
+2002-08-09  Nick Clifton  <nickc@redhat.com>
+
+	* po/sv.po: Updated Swedish translation.
+
+2002-08-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* prdbg.c (pr_fix_visibility): Remove assert.
+
+2002-07-31  Nick Clifton  <nickc@redhat.com>
+
+	* addr2line.c (process_file): Rename parameter 'filename' to
+	'file_name' in order to avoid shadowing global symbol of the
+	same name.
+	(main): Likewise.
+
+2002-07-30  Jakub Jelinek  <jakub@redhat.com>
+
+	* readelf.c (OPTION_DEBUG_DUMP): Define.
+	(options): Use it.
+	(usage): Update help.
+	(parse_args): Handle --debug-dump separately from -w.
+	* doc/binutils.texi (readelf): Update documentation.
+
+2002-07-25  Nick Clifton  <nickc@redhat.com>
+
+	* po/es.po: Updated Spanish translation.
+	* po/fr.po: Updated French translation.
+
+2002-07-24  Nick Clifton  <nickc@redhat.com>
+
+	* po/es.po: Updated Spanish translation.
+
+2002-07-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2002-07-23  Nick Clifton  <nickc@redhat.com>
+
+	* po/fr.po: Updated French translation.
+
+2002-07-23  Eric S. Raymond  <esr@golux.thyrsus.com>
+
+	* doc/binutils.texi (addr2line <man synopsis>): Correct brackets.
+
+2002-07-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* budemang.c: Include config.h and string.h/strings.h.
+
+2002-07-18 Denis Chertykov  <denisc@overta.ru>
+	   Frank Ch. Eigler  <fche@redhat.com>
+
+	* readelf.c: Include "elf/ip2k.h".
+	(guess_is_rela): Add support for EM_IP2K and EM_IP2K_OLD.
+	(dump_relocations): Likewise.
+	(get_machine_name): Likewise.
+	* NEWS: Mention IP2K support.
+
+2002-07-16  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* NEWS: Add 'Changes in 2.13'.
+
+2002-07-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* readelf.c (get_dynamic_type): Handle DT_GNU_PRELINKED,
+	DT_GNU_CONFLICT* and DT_GNU_LIBLISZ*.
+	(get_section_type_name): Handle SHT_GNU_LIBLIST.
+	(process_dynamic_segment): Handle DT_GNU_CONFLICTSZ,
+	DT_GNU_LIBLISTSZ and DT_GNU_PRELINKED.
+	(process_gnu_liblist): New.
+	(process_file): Call it.
+
+2002-07-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (check-DEJAGNU): Revert 2002-06-25 change.
+	* Makefile.in: Regenerate.
+
+2002-07-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* budemang.c: New file, "demangle" function.
+	* budemang.h: New file.
+	* addr2line.c (translate_addresses): Use "demangle".
+	* nm.c (print_symname): Likewise.
+	* objdump.c (objdump_print_symname): Likewise.
+	(dump_symbols): Likewise.  Also, don't use bfd_asymbol_name macro
+	here since that obfuscates.
+	* rdcoff.c: Don't #include demangle.h.
+	* Makefile.am (CFILES): Add budemang.c, emul_aix.c,
+	emul_vanilla.c.  Remove emul_$(EMULATION).c.  Sort.
+	(HFILES): Add budemang.h.  Sort.
+	(nm_new_SOURCES, objdump_SOURCES, addr2line_SOURCES): Add budemang.c.
+	Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2002-07-01  Matt Thomas  <matt@3am-software.com>
+
+	* readelf.c: Include "elf/vax.h".
+	(guess_is_rela): Move EM_VAX from unknown to RELA case.
+	(dump_relocations): Handle VAX relocations.
+	(get_machine_flags): Handle VAX machine flags.
+
+2002-06-29  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* readelf.c (dump_relocations): Handle 68HC11/68HC12 relocations.
+
+2002-06-26  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* MAINTAINERS: Remove Tom Rix from d10v and pcc maintainerships.
+
+2002-06-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* nm.c (print_symname): When demangling, strip leading dots from
+	symbol names to avoid confusing the demangler.
+
+2002-06-25  H.J. Lu <hjl@gnu.org>
+
+	* Makefile.am (check-DEJAGNU): Set LC_ALL=C and export it.
+	* Makefile.in: Regenerated.
+
+2002-06-21  Igor Schein  <igor@txc.com>
+
+	* configure.in: Quote bu_cv_have_fopen64.
+	* configure: Regenerate.
+
+2002-06-21  Mitsru Chinen  <chinen@jp.ibm.com>
+
+	* configure.in: Check for strcoll.
+	* configure: Regenerate.
+	* config.in: Regenerate.
+	* nm.c (main): Set locale for LC_COLLATE category.
+	(non_numeric_forward): Use strcoll if available.
+
+2002-06-20  Dave Brolley  <brolley@redhat.com>
+
+	* MAINTAINERS: Add self as fr30 and frv maintainer.
+
+2002-06-18  H.J. Lu  (hjl@gnu.org)
+
+	* nm.c: Include "elf/common.h".
+	(extended_symbol_info): Add elfinfo, a pointer to
+	elf_symbol_type.
+	(SYM_SIZE): Use elfinfo if it is not NULL.
+	(get_symbol_type): New function.
+	(display_archive): Set print_width for each archive member.
+	(display_file): Likewise.
+	(display_rel_file): Don't set print_width here.
+	(print_object_filename_sysv): Handle print_width.
+	(print_archive_member_sysv): Likewise.
+	(print_symbols): Pass (bfd_vma) 0 to print_symbol.
+	(print_symbol): Set the elfinfo field in extended_symbol_info
+	for ELF.
+	(print_object_filename_sysv): Fix the output format.
+	(print_symbol_info_sysv): Print type and section for ELF.
+
+2002-06-18  Elias Athanasopoulos  <eathan@otenet.gr>
+
+	* nm.c (print_size_symbols): Remove assignment, which makes
+	the symbol's size equal to its value when --size-sort is
+	used.
+
+2002-06-18  Dave Brolley  <brolley@redhat.com>
+
+	From Catherine Moore:
+	* readelf.c (elf/frv.h): #include it.
+	(guess_is_rela): Support EM_CYGNUS_FRV.
+	(dump_relocations): Ditto.
+	(get_machine_name): Ditto.
+	* Makefile.am (readelf.o): add dependency on $(INCDIR)/elf/frv.h.
+
+2002-06-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* readelf.c (get_file_header): Only read the first section header if
+	e_shoff is non-zero.
+
+2002-06-15  H.J. Lu  (hjl@gnu.org)
+
+	* nm.c (print_size): New variable. Initialize to 0.
+	(long_options): Add 'S'/"print-size".
+	(main): Handle 'S'.
+	(print_symbol_info_bsd): Print size only if print_size is not
+	0.
+
+	* doc/binutils.texi: Document -S/--print-size.
+
+2002-6-13  Elias Athanasopoulos  <eathan@otenet.gr>
+
+	* nm.c (struct extended_symbol_info): New structure: Add the size
+	of the symbols to the information provided by the symbol_info
+	structure.
+	(print_symbols): Pass the symbol size to print_symbol.
+	(print_size_symbols): Pass the symbol size to print_symbol.
+	(print_symbol): Extra argument: The size of the symbol.  Store
+	this in the extended_symbol_info structure.
+	(print_symbol_info): Change type of info parameter to
+	extended_symbol_info.  Display the size, if known.
+	(print_symbol_info_posix): Likewise.
+	(print_symbol_info_sysv): Likewise.
+
+2002-06-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* doc/Makefile.in: Regnerate.
+
+	* bucomm.c: Replace CONST with const.
+	* nm.c: Likewise.
+	* objdump.c: Likewise.
+
+2002-06-07  H.J. Lu <hjl@gnu.org>
+
+	* readelf.c (DW_CFA_GNU_args_size): Don't define.
+	(DW_CFA_GNU_negative_offset_extended): Likewise.
+	(DW_CFA_GNU_window_save): Likewise.
+	(display_debug_frames): Handle DW_CFA_offset_extended_sf,
+	DW_CFA_def_cfa_sf and DW_CFA_def_cfa_offset_sf.
+
+2002-06-07  Elias Athanasopoulos  <eathan@otenet.gr>
+
+	* nm.c: When computing size of symbols for an ELF target use the
+	internal size field.
+
+2002-06-06  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* testsuite/binutils-all/objcopy.exp: clear xfail for
+	"hppa*64*-*-hpux*".
+	* testsuite/binutils-all/hppa/objdump.exp: Return if
+	"*64*-*-*".
+
+2002-06-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* objcopy.c (copy_section): Don't copy SEC_GROUP sections.
+
+2002-06-03  Elias Athanasopoulos  <eathan@otenet.gr>
+
+	* objdump.c: Fix formatting.
+
+2002-05-29  Ben Elliston  <bje@redhat.com>
+
+	* MAINTAINERS: Add self as M68k maintainer.
+
+2002-05-28  Kuang Hwa Lin <kuang@sbcglobal.net>
+
+	* readelf.c: Modified/Added DLX elf support.
+
+2002-05-27  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* arsup.c: Fix formatting.
+	* debug.c (debug_record_label): Add missing colon to error
+	message.
+	* ieee.c (parse_ieee_ty): Fix spelling typo.
+	* readelf.c (process_program_headers): Remove English assumption
+	about making a plural word.
+	(process_section_headers): Likewise.
+	(process_relocs): Allow quotes to be translated.
+	(process_unwind): Likewise,
+	(process_mips_specific): Improve error message.
+	(get_note_type): Fix spelling typo.
+
+	* configure.in (ALL_LINGUAS): Add sv
+	* po/sv.po: New file.
+
+2002-05-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* unwind-ia64.c (unw_print_brmask): Don't use sprintf.
+	(unw_print_grmask): Likewise.
+	(unw_print_frmask): Likewise.
+
+2002-05-26  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* arsup.c: Remove ARGSUSED.
+	* debug.c: Likewise.
+	* ieee.c: Likewise.
+	* nlmconv.c: Likewise.
+	* prdbg.c: Likewise.
+	* stabs.c: Likewise.
+	* wrstabs.c: Likewise.
+
+2002-05-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* arlex.l: Use #include "" instead of <> for local header files.
+	* coffdump.c: Likewise.
+	* coffgrok.c: Likewise.
+	* nlmconv.c: Likewise.
+	* nlmheader.y: Likewise.
+	* srconv.c: Likewise.
+	* strings.c: Likewise.
+	* sysdump.c: Likewise.
+	* unwind-ia64.h: Likewise.
+	* windres.h: Likewise.
+	* winduni.h: Likewise.
+
+2002-05-24  Tom Rix  <trix@redhat.com>
+
+	* MAINTAINERS: Add self as the d10v maintainer.
+
+2002-05-24   TAMURA Kent <kent@netbsd.org>
+
+	* configure.in: Builds dlltool for i386-netbsdpe.
+	* configure: Regenerate.
+
+2002-05-23  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* size.c: Fix formatting.
+	* srconv.c: Likewise.
+	* stabs.c: Likewise.
+	* sysdump.c: Likewise.
+	* unwind-ia64.c: Likewise.
+	* wrstabs.c: Likewise.
+
+2002-05-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* readelf.c (get_segment_type): Add PT_TLS.
+	(get_elf_section_flags): Add SHF_TLS.
+	(get_dynamic_flags): Optimize.  Add DF_STATIC_TLS.
+	(process_dynamic_segment): Use puts instead of printf.
+	(get_symbol_type): Support STT_TLS.
+	* objdump.c (dump_section_header): Remove SEC_CONSTRUCTOR_TEXT,
+	SEC_CONSTRUCTOR_DATA, SEC_CONSTRUCTOR_BSS.
+	Add SEC_THREAD_LOCAL.
+
+2002-05-23  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* rdcoff.c: Fix formatting.
+	* rddbg.c: Likewise.
+	* readelf.c: Likewise.
+	* rename.c: Likewise.
+	* resbin.c: Likewise.
+	* resrc.c: Likewise.
+	* resres.c: Likewise.
+
+2002-05-21  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* filemode.c: Fix formatting.
+	* ieee.c: Likewise.
+	* is-ranlib.c: Likewise.
+	* is-strip.c: Likewise.
+	* maybe-ranlib.c: Likewise.
+	* maybe-strip.c: Likewise.
+	* nlmconv.c: Likewise.
+	* nm.c: Likewise.
+	* not-ranlib.c: Likewise.
+	* not-strip.c: Likewise.
+	* objcopy.c: Likewise.
+	* objdump.c: Likewise.
+
+2002-05-21  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* objdump.c (dump_headers): Fix output formatting for ELF32
+	architectures in a BFD64 enabled toolchain.
+
+2002-05-20  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* debug.c: Fix formatting.
+	* debug.h: Likewise.
+	* dlltool.c: Likewise.
+	* dllwrap.c: Likewise.
+	* emul_aix.c: Likewise.
+	* emul_vanilla.c: Likewise.
+
+2002-05-19  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* addr2line.c: Fix formatting.
+	* ar.c: Likewise.
+	* arsup.c: Likewise.
+	* arsup.h: Likewise.
+	* binemul.c: Likewise.
+	* binemul.h: Likewise.
+	* bucomm.c: Likewise.
+	* coffdump.c: Likewise.
+	* coffgrok.c: Likewise.
+	* coffgrok.h: Likewise.
+
+2002-05-16  Marek Michalkiewicz  <marekm@amelek.gda.pl>
+
+	* MAINTAINERS: Add myself as the second AVR port maintainer.
+
+2002-05-16  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* MAINTAINERS: Update my email address.
+
+2002-05-09  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* MAINTAINERS: Add Jason Thorpe as VAX maintainer.
+
+2002-05-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* configure.in: Replace `*pe' with `pe' throughout.
+	* configure: Regenerate.
+
+2002-05-07  Federico G. Schwindt <fgsch@olimpo.com.br>
+
+	* Makefile.am: Honour DESTDIR.
+	* Makefile.in: Regenerate.
+
+2002-05-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* dlltool.c (process_def_file): Add missing prototype.
+	(new_directive, assemble_file, main): Likewise.
+	(process_def_file, new_directive): Make static.
+	(inform): Rewrite using VA_FIXEDARG.
+	* dllwrap.c (mybasename): Add missing prototype.
+	(strhash, main): Likewise.
+	(inform): Rewrite using VA_FIXEDARG.
+	(warn): Likewise.
+	(cleanup_and_exit): Use old style function definition.
+	(strhash): Likewise.
+	* windres.c (define_resource): Use one memset to clear all of
+	struct res_resource.
+
+	* rcparse.y: Remove newcmd rule.  Move rcparse_discard_strings
+	call to rules that need no lookahead.  Check for no lookahead.
+
+2002-05-06  Borut Razem  <borut.razem@siol.net>
+
+	* rclex.l (get_string): Correct "strings" list handling.
+	* resrc.c (read_rc_file): Discard strings.
+
+2002-05-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* ar.c (replace_members): Remove unused var.  Formatting fix.
+	* binemul.c (ar_emul_default_parse_arg): Add ATTRIBUTE_UNUSED.
+
+	* MAINTAINERS: Sort port maintainers by CPU.
+
+2002-05-04  Bob Byrnes  <byrnes@curl.com>
+
+	* size.c (display_archive): Add last_arfile and code to close archives.
+
+2002-05-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* nm.c (print_symbol): Check returned filename from
+	bfd_find_nearest_line is non-NULL.
+
+2002-04-25  Elena Zannoni <ezannoni@redhat.com>
+
+	* readelf.c (get_AT_name): Handle DW_AT_GNU_vector.
+
+2002-04-24  Christian Groessler <chris@groessler.org>
+
+	* MAINTAINERS: Changed my email address.
+
+2002-04-17  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* arparse.y: Fix syntax warning.
+
+2002-04-16  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* readelf.c (fetch_location_list): Remove unused function.
+
+	* readelf.c (process_corefile_note_segment): Catch corrupt notes
+	and display a warning message, then exit the loop.
+
+	* rcparse.y: Set MEMFLAG_DISCARDABLE by default.
+
+2002-04-15  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* resrc.c (write_rc_dialog): If charset is non-default value
+	display all of the DIALOGEX parameters.
+
+2002-04-15  Eric Kohl <ekohl@rz-online.de>
+
+	* rcparse.y: Allow two to five parameter in FONT statement of
+	DIALOGEX resources.
+	* resbin.c (bin_to_res_dialog): Fixed read/write code for dialogex
+	resource data.
+	(res_to_bin_dialog): Likewise.
+	* windres.h: Added misssing charset variable to dialog_ex
+	structure.
+
+2002-04-10  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* rcparse.y: Set MEMFLAG_PURE by default.
+
+2002-04-09  Bernd Herd <info@herdsoft.com>
+
+	* rcparse.y: CLASS definitions in DIALOG resources
+	are quoted.
+	Fix typo in BEDIT warning.
+	Don't add default dialog style when explicit style specified.
+	Add WS_CAPTION dialog style if CAPTION is specified.
+
+	* rclex.l (handle_quotes): "\xhex" encoding in strings corrected.
+	(handle_quotes) "\a" escape (used for right justified key
+	definitions in menus) is encodes as binary 8.
+
+	* resrc.c (write_rc_dialog): Print style even if it is 0.
+	(write_rc_directory): Fix overlooked sublang shift bug.
+	(bin_to_res_dialog): Don't print empty dialog caption.
+
+	* resbin.c (bin_to_res_dialog): Use signature to identify
+	DIALOGEX.
+
+	* windres.c (main): Set default LANGUAGE to english/us.
+
+2002-04-09  Gunnar Degnbol <degnbol@danbbs.dk>
+
+	* resrc.c: print CLASS names in quotes
+
+2002-04-09  J"orn Rennecke <joern.rennecke@superh.com>
+
+	* MAINTAINERS: Update my email address.
+
+2002-04-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* dep-in.sed: Cope with absolute paths.
+	* Makefile.am (dep.sed): Subst TOPDIR.
+	Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2002-03-27  Peter Targett  <peter.targett@arc.com>
+
+	* MAINTAINERS: Update my email address.
+
+2002-03-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* doc/Makefile.in: Regenerate.
+	* po/POTFILES.in: Regenerate.
+	* aclocal.m4: Regenerate.
+	* config.in: Regenerate.
+	* configure: Regenerate.
+
+2002-03-20  Daniel Berlin  <dan@dberlin.org>
+
+	* readelf.c: Add support for displaying dwarf2 location lists.
+	(do_debug_loc, debug_loc_section, debug_loc_size): New.
+	(parse_args): Use 'O' as shorthand for displaying location list
+	section.
+	(process_section_headers): Handle debug_loc as well.
+	(load_debug_loc): New.
+	(free_debug_loc): New.
+	(fetch_location_list): New.
+	(display_debug_loc): New.
+	(display_debug_info): Call load_debug_loc and free_debug_loc.
+	(debug_displays): We can display .debug_loc now, too.
+	(usage): Update usage string.
+	(read_and_display_attr_value): Note location lists, but don't
+	display them inline.
+
+2002-03-18  Tom Rix  <trix@redhat.com>
+
+	* Makefile.am: Add binutils emulation support.
+	* configure.in: Same.
+	* configure.tgt: New file.  Same.
+	* ar.c (main): Use ar_emul_parse_arg.
+	(usage): Use ar_emul_usage.
+	(replace_members): Use ar_emul_replace, ar_emul_append.
+	* binemul.c: New file.  Define the binutils emulation
+	layer. Define default methods.
+	* binemul.h: New file.  Binutils emulation layer header file.
+	* emul_aix.c: New file.  AIX binutils emulation.
+	* emul_vanilla.c: New file. Default binutils emulation.
+	* Makefile.in: Regenerate.
+	* configure: Same.
+
+2002-03-18  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* po/fr.po: Updated version.
+
+2002-03-13  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* po/fr.po: Updated version.
+
+2002-03-07  Daniel Jacobowitz  <drow@mvista.com>
+
+	* README: Update some version numbers.
+
+2002-03-07  Daniel Jacobowitz  <drow@mvista.com>
+
+	* doc/binutils.texi (Target Selection): Fix LD crossreferences.
+	(Architecture Selection): Likewise.
+
+2002-03-01  Dmitry Timoshkov <dmitry@baikal.ru>
+
+	* dlltool.c (gen_exp_file): Take into account --kill-at (-k) while
+	generating .exp file.
+
+2002-02-21  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* readelf.c (dump_relocations): Fix typo.
+
+2002-02-20  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* NEWS: Mark 2.12 branch.
+
+2002-02-18  Timothy Daly  <remote_bob@yahoo.com>
+
+	* readelf.c (dump_relocations): Display 2nd and 3rd reloc
+	types for 64-bit MIPS.  Narrow some fields for 80-char
+	output.
+	(dump_relocations): Change spelling from 'unrecognised'
+	to 'unrecognized'.
+	(decode_ARM_machine_flags): Likewise.
+	(parse_args): Likewise.
+	(read_and_display_attr_value): Likewise.
+	(display_debug_section): Likewise.
+
+2002-02-15  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* NEWS: Mention support for MMIX.
+
+2002-02-13  Matt Fredette  <fredette@netbsd.org>
+
+	* readelf.c (get_machine_flags): Recognize EF_M68000.
+
+2002-02-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* MAINTAINERS: Added self as MN10300 co-maintainer.
+
+2002-02-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (get_ppc64_dynamic_type): Handle DT_PPC64_OPD and
+	DT_PPC64_OPDSZ.
+
+2002-02-11  Daniel Jacobowitz  <drow@mvista.com>
+
+	* MAINTAINERS: List myself as branch maintainer.
+
+2002-02-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* configure: Regenerate.
+	* objcopy.c: Update copyright date.
+	* doc/Makefile.in: Regenerate.
+
+2002-02-10  Daniel Jacobowitz  <drow@mvista.com>
+
+	* nlmconv.c: Back out localtime PARAMS change.
+
+2002-02-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* objcopy.c (MKDIR): Define.
+	(copy_archive): Make name_list.name const.  Use MKDIR.
+	Handle duplicate files in archives by making more temp dirs.
+
+2002-02-10  Daniel Jacobowitz  <drow@mvista.com>
+
+	* coffdump.c: Include "getopt.h" after "bucomm.h"
+	so that macros are defined correctly.
+	* nlmconv.c: Add PARAMS ((const time_t *)) to localtime
+	prototype.  Prototype main.
+	* nlmheader.y: Add PARAMS ((int)) to strerror prototype.
+
+2002-02-06  Alexandre Oliva  <aoliva@redhat.com>
+
+	* MAINTAINERS: Added self as SH co-maintainer.
+
+2002-02-05  Nick Clifton <nickc@redhat.com>
+
+	* po/tr.po: Updated translation.
+
+2002-02-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am"
+	* Makefile.in: Regenerate.
+
+2002-01-29  Daniel Jacobowitz  <drow@mvista.com>
+
+	* nm.c (print_value): Mark abfd unused.
+
+2002-01-29  Daniel Jacobowitz  <drow@mvista.com>
+
+	* unwind-ia64.c (unw_decoder): Change second argument
+	to unsigned int, to match function prototypes.
+
+2002-01-29  Daniel Jacobowitz  <drow@mvista.com>
+
+	* objdump.c: Include "getopt.h" after "bucomm.h" so that
+	__GNU_LIBRARY__ will be defined.
+	* size.c: Likewise.
+
+2002-01-27  Daniel Jacobowitz  <drow@mvista.com>
+
+	* configure: Regenerated.
+
+2002-01-26  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* doc/Makefile.am (install): Depend on install-info.
+	* doc/Makefile.in: Regenerate.
+
+2002-01-25  Jason R. Thorpe <thorpej@wasabisystems.com>
+
+	* objcopy.c (strip_usage): Document -d as an alias
+	--strip-debug.
+
+	* size.c (usage): Document [-t | --totals] options.
+	(long_options): Add --totals option.
+	(main): If the [-t | --totals] option is specified and
+	the output format is Berkeley-style, print the total
+	text, data, and bss sizes of all objects listed.
+	(print_berkeley_format): If the [-t | --totals] option
+	is specified, track the total text, data, and bss
+	sizes.
+	* doc/binutils.texi (size): Document [-t | --totals] options.
+	(strip): Document -d as an alias for --strip-debug.
+	* NEWS: Mention new feature of size.
+
+2002-01-25  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* po/fr.po: Updated version.
+	* po/es.po: Updated version.
+
+2002-01-23  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* addr2line.c (usage): Update text to provide verbose
+	description of the command line options.
+	* ar.c (usage): Update text to provide verbose
+	description of the command line options.
+	(main): Accept -h and -H when running as ranlib.
+	* coffdump.c (show_usage): Update text to provide verbose
+	description of the command line options.
+	* dlltool.c (main): Accept -H as an alias for --help.
+	* nlmconv.c (show_usage): Update text to provide verbose
+	description of the command line options.
+	* nm.c (usage): Replace OPTIONS with option(s).
+	(main): Accept -H as an alias for --help.
+	* objcopy.c (strip_main): Accept -H as an alias for --help.
+	* objdump.c (main): Accept -v as an alias for --verbose.
+	* readelf.c (usage): Adjust format to match style used in
+	other binutils.
+	* size.c (usage): Update text to provide verbose description
+	of the command line options.
+	(main): Accept -v, -h and -H as command line options.
+	* srconv.c (show_usage): Update text to provide verbose
+	description of the command line options.
+	* strings.c (main): Accept -H and -v as command line options.
+	(usage): Update text to provide verbose description of the
+	command line options.
+	* sysdump.c (show_usage): Update text to provide verbose
+	description of the command line options.
+	* windres.c (usage): Adjust format to match style used in
+	other binutils.
+
+	* coffdump.c: Fix formatting.
+	* nlmconv.c: Fix formatting.
+	* srconv.c: Fix formatting.
+	* sysdump.c: Fix formatting.
+
+2002-01-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2002-01-18  Andreas Jaeger  <aj@suse.de>
+
+	* version.c (print_version): Update year.
+
+2002-01-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (get_machine_name): Handle EM_PPC64.
+	(guess_is_rela): Here too.
+
+2002-01-17  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* po/binutils.pot: Regenerate.
+	* po/fr.po: Regenerate.
+	* po/tr.po: Regenerate.
+
+2002-01-16  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* po/tr.po: Import new version.
+
+2002-01-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (get_ppc64_dynamic_type): New.
+	(get_dynamic_type): Call it.
+
+2002-01-15  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* objcopy.c (copy_usage): Use "options" instead of "switches".
+	(strip_usage): Use "options" instead of "switches".
+	* doc/binutils.texi (dlltool):  Refer to "options" instead of
+	"switches".
+
+2002-01-14  Richard Earnshaw  <rearnsha@arm.com>
+
+	* MAINTAINERS: Add self as co-maintainer for the ARM code.
+
+2001-12-18  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* po/es.po: Import from translation project.
+	* configure.in (ALL_LINGUAS): Add es.
+	* configure: Regenerate.
+
+2002-01-09  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* readelf.c (get_netbsd_elfcore_note_type): Use
+	NT_NETBSDCORE_PROCINFO and NT_NETBSDCORE_FIRSTMACH.
+
+2002-01-09  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* readelf.c: Update copyright years.
+	(get_note_type): Return a const char *.
+	(get_netbsd_elfcore_note_type): New function.
+	(process_note): Use get_netbsd_elfcore_note_type to get
+	the note type string for NetBSD ELF core files.
+
+2002-01-06  Steve Ellcey  <sje@cup.hp.com>
+
+	* readelf.c (get_ia64_segment_type): Add support for macros.
+	(get_segment_type): Add support for IA64 specific macros.
+
+For older changes see ChangeLog-0001
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-2004 sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-2004
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-2004	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-2004	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,793 @@
+2004-12-31  Alan Modra  <amodra@bigpond.net.au>
+
+	* objdump.c (remove_useless_symbols): Discard section symbols.
+
+2004-12-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (read_leb128): Support 64bit host.
+
+2004-12-23  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/616
+	* readelf.c (debug_info): Add 'cu_offset' field.
+	(get+pointer_size_of_comp_unit): Rename to
+	'get_pointer_size_and_offset_of_comp_unit'.  Add code to return
+	the offset of the comp_unit if requested.
+	(get_debug_info): Record comp_unit offsets as well.
+	(display_debug_lines): Call get_pointer_size_of_comp_unit.
+	(decode_location_expression): Add an extra parameter - the offset
+	of the current comp-unit.  Use this when decoding the DW_OP_call2
+	and DW_OP_call4 operators.
+	(display_debug_loc): Call get_pointer_size_of_comp_unit, pass the
+	comp_unit offset on the decode_location_expression.
+	(read_and_display_attr_value): Pass the	comp_unit offset on the
+	decode_location_expression.
+	(display_debug_frames): Pass 0 as the comp_unit offset to
+	decode_location_expression.
+
+2004-12-22  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (last_pointer_size, warned_about_missing_comp_units):
+	New variables associated with obtaining the pointer size for a
+	comp_unit.
+	(get_pointer_size_of_comp_unit): Add an extra parameter - the name
+	of the section requesting the pointer size.  Use this name in
+	error messages.  If there are not enough comp_units available
+	produce a warning message, but return the last known pointer size
+	so that section dumping can continue.
+	(get_debug_info): Reset the new variables.
+	(display_debug_lines): Add extra parameter to invocation of
+	get_pointer_size_of_comp_unit and remove error message when it
+	returns 0.
+	(display_debug_loc): Likewise.
+
+2004-12-15 Jan Beulich  <jbeulich@novell.com>
+
+	* doc/binutils.texi: Document --strip-unneeded-symbol and
+	--strip-unneeded-symbols.
+	* objcopy.c (strip_unneeded_list): New.
+	(enum command_line_switch): Add OPTION_STRIP_UNNEEDED_SYMBOL
+	and OPTION_STRIP_UNNEEDED_SYMBOLS.
+	(copy_options): Add  --strip-unneeded-symbol and
+	--strip-unneeded-symbols.
+	(copy_usage): Likewise.
+	(filter_symbols): Suppress copying of symbol if in strip_unneeded_list
+	and the symbol is not needed.
+	(copy_main): Handle OPTION_STRIP_UNNEEDED_SYMBOL and
+	OPTION_STRIP_UNNEEDED_SYMBOLS.
+
+2004-12-09  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* readelf.c (get_machine_flags): Handle E_MIPS_MACH_9000.
+
+2004-12-08  Ben Elliston  <bje@au.ibm.com>
+
+	* arlex.l: Fix formatting.
+
+2004-12-08  Ben Elliston  <bje@au.ibm.com>
+
+	* doc/Makefile.am (config.texi): Emit a @set UPDATED command to
+	config.texi whose value is the current month and year.
+	* doc/Makefile.in: Rebuild.
+	* doc/binutils.texi: Set the document subtitle to be the value of
+	the Texinfo UPDATED variable (obtained from config.texi).
+
+2004-12-07  Ben Elliston  <bje@au.ibm.com>
+
+	PR binutils/249
+	* doc/binutils.texi (def file format): New node.
+	(dlltool): Use the tool name as the @chapter name, like all the
+	other binutils.  Use @file{.def} throughout for consistency.
+
+2004-12-06  Ben Elliston  <bje@au.ibm.com>
+
+	* dlltool.c: Comment fix.
+
+2004-12-06  Ben Elliston  <bje@au.ibm.com>
+
+	* doc/binutils.texi: Update copyright years.
+
+2004-12-03  Richard Sandiford  <rsandifo@redhat.com>
+
+	* MAINTAINERS: Remove mention of config.if.
+
+2004-11-30  Tero Niemela  <tero_niemela@yahoo.com>
+
+	* Makefile.am: Change LOCALEDIR to $(datadir)/share.
+	* Makefile.in: Regenerate.
+
+2004-11-10  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	PR binutils/536
+	* stabs.c (stab_demangle_template): Call stab_demangle_count
+	rather than stab_demangle_get_count to get the length of a pointer
+	target.
+
+2004-11-10  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* defparse.y: Remove unnecessary commas from token list.
+
+2004-11-08  Aaron W. LaFramboise <aaron98wiridge9@aaronwl.com>
+
+	* doc/binutils.texi (nm): Update description of weak symbols.
+
+2004-11-03  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (do_debug_ranges): New variable.
+	(usage): Document new switch: -wR or --debug-dump=Ranges.
+	(parse_args): Handle new switch.  Replace switch statement for the
+	long options with a more compact table structure.
+	(process_section_headers): Allow the dumping of .debug_ranges
+	sections if so requested.
+	(debug_displays): Likewise.
+	(load_debug_range): New function: Grabs the contents of a
+	.debug_ranges section.
+	(free_debug_range): New function: Releases the grabbed
+	.debug_ranges section.
+	(decode_64bit_range): New function: Displays a 64-bit range in a
+	.debug_ranges section.
+	(decode_range): New function: Displays a 32-bit range in a
+	.debug_ranges section.
+	(read_and_display_attr_value): Record the value of DW_AT_low_pc
+	attributes.  Use decode_ranges() to display a DW_AT_ranges
+	attribute.
+	(display_debug_info): Use load_debug_range() and
+	free_debug_range().
+	(display_64bit_debug_ranges): New function.  Displays the contents
+	of a 64-bit format .debug_ranges section.
+	(display_debug_ranges): New function: Displays the contents of a
+	32-bit .debug_ranges section.
+
+	(main): Move cmdline_dump_sects and num_cmdline_dump_sects into the
+	global scope.
+	(process_object): Initialise the dump_sects array from the
+	cmdline_dump_sects array before processing each object file.
+
+	(streq, strneq): New macros.  Use them to replace occurrences of
+	strcmp() and strncmp().
+
+	(debug_information): New structure array to replace
+	debug_line_pointer_sizes array.
+	(num_debug_info_entries): New variable to replace
+	num_debug_line_pointers.
+	(get_pointer_size_of_comp_unit): New function: Returns the pointer
+	size of a given compilation unit.
+	(get_debug_info): New function to replace
+	get_debug_line_pointer_sizes.
+	(display_debug_lines): Use the new functions.
+	(display_debug_loc): Likewise.
+
+	(disassemble_section): Change return type to int.
+	(display_debug_lines): Move local variables to their
+	innermost scope.
+	(display_debug_section): Likewise.  Also record the return value
+	of functions called and pass this back to the parent.  Also only
+	warn about undumped sections when the user explicitly requested
+	their dumping.
+
+	(debug_apply_rela_addends): Allow relocations against STT_OBJECT
+	types as well.
+
+	* NEWS: Mention the support for decoding .debug_ranges sections.
+	* doc/binutils.texi: Document the new command line switch to
+	readelf.
+
+2004-11-03  Randolph Chung  <tausq@debian.org>
+
+	* readelf.c (ia64_unw_aux_info, ia64_unw_table_entry): Rename from
+	unw_aux_info and unw_table_entry.
+	(find_symbol_for_address): Pass symtab and strtab info explicitly.
+	(dump_ia64_unwind): Rename unw_{aux_info,table_entry} with ia64_
+	prefix.
+	(slurp_ia64_unwind_table): Likewise.
+	(ia64_process_unwind): Rename from old process_unwind.
+	(hppa_unw_aux_info): New.
+	(dump_hppa_unwind): New.
+	(slurp_hppa_unwind_table): New.
+	(hppa_process_unwind): New.
+	(process_unwind): Factor out common unwinding checks; dispatch to
+	unwind handler based on machine type.
+
+2004-11-02  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (display_debug_lines): Fix typo in error message.
+
+2004-10-26  Mark Mitchell  <mark@codesourcery.com>
+
+	* readelf.c (get_note_type): Handle notes not in core files.
+	(process_note_sections): New function.
+	(process_corefile_contents): Rename to ...
+	(process_notes): ... this.
+	(process_object): Call process_notes, not
+	process_corefile_contents.
+	* doc/binutils.texi: Update readelf -n documentation.
+
+2004-10-26  Jakub Jelinek  <jakub@redhat.com>
+
+	* ar.c (extract_file): Set atime to mtime for ar xo.
+
+2004-10-25  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* stabs.c (stab_demangle_v3_arglist): New static function, broken
+	out of stab_demangle_v3_argtypes.
+	(stab_demangle_v3_argtypes): Call it.
+	(stab_demangle_v3_arg): Handle DEMANGLE_COMPONENT_FUNCTION_TYPE.
+	If we find an unrecognized component, print out its number.
+
+2004-10-25  David Mosberger  <davidm@hpl.hp.com>
+
+	* readelf.c (slurp_ia64_unwind_table): Support relocations against
+	non-section symbols by adding in the symbol value.
+
+2004-10-25  Nick Clifton  <nickc@redhat.com>
+
+	PR 465
+	* readelf.c (dynamic_strings_length): New global variable.
+	(VALID_DYNAMIC_NAME, GET_DYNAMIC_NAME): New macros for accessing
+	strings in the dynamic string table.
+	(process_section_headers): Initialise dynamic_strings_length.
+	(process_dynamic_section): Likewise.
+	(process_object): Reset dynamic_string_length when the buffer is freed.
+	(dynamic_sections_mips_val): Use the new macros.
+	(process_dynamic_section): Likewise.
+	(process_version_sections): Likewise.
+	(process_symbol_table): Likewise.
+	(process_syminfo): Likewise.
+	(process_mips_specific): Likewise.
+	(dump_relocations): Add a new parameter 'strtablen' and use this
+	to verify that string offset in a given reloc is valid.  Print a
+	suitable error message otherwise.
+	(process_relocs): Pass the new argument to dump_relocations.
+
+2004-10-23  Aaron W. LaFramboise  <aaron98wiridge9@aaronwl.com>
+
+	* dlltool.c: Include <assert.h>.
+	(PREFIX_ALIAS_BASE): Define.
+	(struct export): Add member import_name;
+	(def_exports): Set import_name.
+	(make_one_lib_file): Remove prefix alias code, use import_name
+	in .idata$6.
+	(gen_lib_file): Create and delete aliases.
+
+2004-10-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (process_section_groups): Free symtab after use.
+
+2004-10-18  Tommy Pettersson <ptp@lysator.liu.se>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* strings.c (usage): Place radix values for -t option into the
+	correct order.
+
+	* objcopy.c (add_redefine_syms_file): Change error messages to use
+	<filename>:<linenumber>: format for easier parsing by automatic
+	tools.
+
+	* srconv.c (show_usage): Fix spelling typo.
+
+	* windres.c (format_from_filename): Suggest the use of -J instead
+	of -I if the file type cannot be determined.
+
+2004-10-18  Aaron W. LaFramboise  <aaron98wiridge9@aaronwl.com>
+
+	* strings.c: Include <sys/stat.h>.
+
+2004-10-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* budemang.c (demangle): Fix thinko.
+
+	* budemang.c (demangle): Handle "@plt" suffix.
+
+2004-10-14  Nick Clifton  <nickc@redhat.com>
+
+	* nm.c (usage): Fix description of --special-syms switch.
+
+2004-10-13  Jakub Jelinek  <jakub@redhat.com>
+
+	* strings.c (statbuf): New typedef.
+	(file_stat): Define.
+	(strings_object_file): Avoid using get_file_size, instead do the
+	checks here, using file_stat.
+	* configure.in (HAVE_STAT64): New test.
+	* configure: Rebuilt.
+	* config.in: Rebuilt.
+
+2004-10-12  Paul Brook  <paul@codesourcery.com>
+
+	* readelf.c (decode_ARM_machine_flags): Support EABI version 4.
+
+2004-10-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* objdump.c (dump_symbols): Fix thinko last change.  Improve error
+	messages.
+
+2004-10-08  Nick Clifton  <nickc@redhat.com>
+
+	* nm.c: Add a new switch --special-syms which, if enabled, will
+	include the ARM Mapping symbols in nm's output.
+	(usage): Mention the switch.
+	(filter_symbols): Handle the switch.
+	* objdump.c: Add a similar switch.
+	(usage): Mention the switch.
+	(dump_symbols): Handle the switch.
+	* doc/binutils.texi: Document the new switches.
+	* NEWS: Mention the new switches.
+
+2004-10-08  Daniel Jacobowitz  <dan@debian.org>
+
+	* readelf.c (get_x86_64_section_type_name): New function.
+	(get_section_type_name): Use it.
+
+2004-10-08  Aaron W. LaFramboise  <aaron98wiridge9@aaronwl.com>
+
+	* dlltool.c (make_one_lib_file): Revert 2004-09-02 and 2004-09-04
+	patches.
+	* doc/binutils.texi (dlltool): Revert 2004-09-06 patch.
+
+2004-10-07  Alexandre Oliva  <aoliva@redhat.com>
+
+	* readelf.c (get_machine_flags): Don't fall through into m68k cpu
+	types.
+
+2004-10-01  Paul Brook  <paul@codesourcery.com>
+
+	* readelf.c (get_arm_section_type_name): New function.
+	(get_section_type_name): Use it.
+
+2004-09-28  Nick Clifton  <nickc@redhat.com>
+
+	* nm.c: Reorder functions to eliminate most of the static function
+	prototypes.
+
+2004-09-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (process_program_headers): Don't include .tbss in non-TLS
+	segments.
+
+2004-09-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* config.in: Regenerate.
+	* configure: Regenerate.
+	* doc/Makefile.in: Regenerate.
+	* po/binutils.pot: Regenerate.
+
+2004-09-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (decode_location_expression): Sign extend value for
+	DW_OP_const1s, DW_OP_const2s, DW_OP_const4s, DW_OP_bra, DW_OP_skip.
+
+2004-09-09  Nick Clifton  <nickc@redhat.com>
+
+	PR 363
+	* ar.c (replace_members): Do not use get_file_size as
+	ar_emul_append correctly handles missing files.
+
+2004-09-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure: Regenerated with autconfig 2.13.
+
+2004-09-06  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* doc/binutils.texi (dlltool): Update --add-underscore, --kill-at
+	documentation.
+
+2004-09-06  Michael Wardle  <mbw@endbracket.net>
+
+	* doc/binutils.texi (objdump): Document that the -x switch includes
+	the effect of the -p switch.
+
+2004-09-04  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* dlltool.c (make_one_lib_file): Test if internal_name was
+	specified by user before using it.
+
+2004-09-02  Carlo Wood  <carlo@alinoe.com>
+
+	PR binutils/351
+	* dlltool.c (make_one_lib_file): For IDATA6 take the name from
+	exp->internal_name if it is present.
+
+2004-09-02  Alexandre Oliva  <aoliva@redhat.com>
+
+	* MAINTAINERS: Add self as co-maintainer of FR-V.
+	* readelf.c (get_machine_flags): Print FR-V cpu types.
+
+2004-08-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* nm.c (show_synthetic): New var.
+	(long_options): Add "synthetic".
+	(usage): Here too.
+	(display_rel_file): Handle show_synthetic.
+
+2004-08-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* objdump.c (dump_bfd): Pass both symbol tables to
+	bfd_get_synthetic_symtab.
+
+2004-08-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* objdump.c (dump_bfd): For relocatable objects, pass syms instead
+	of dynsyms to bfd_get_synthetic_symtab.
+
+2004-08-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (debug_apply_rela_addends): New function, extracted from..
+	(display_debug_info): ..here.
+	(display_debug_frames): Call debug_apply_rela_addends.  Don't do
+	DW_EH_PE_pcrel adjustment for ET_REL.
+
+2004-08-06  Andreas Schwab  <schwab@suse.de>
+
+	* readelf.c (dump_relocations): Fix typo when calculating
+	sec_index.
+
+2004-08-02  Jakub Bogusz  <qboosh@pld-linux.org>
+
+	* dllwrap.c (deduce_name): Fix typos introduced when program_name
+	was renamed to prog_name.
+
+2004-07-29  Alexandre Oliva  <aoliva@redhat.com>
+
+	* readelf.c (get_machine_flags <EM_SH>): Handle EF_SH2A and
+	EF_SH2A_NOFPU.
+
+2004-07-28  Alexandre Oliva  <aoliva@redhat.com>
+
+	2003-07-08  Alexandre Oliva  <aoliva@redhat.com>
+	* readelf.c (get_machine_flags <EM_SH)): Handle EF_SH4_NOFPU and
+	EF_SH4A_NOFPU.
+	2003-06-12  Alexandre Oliva  <aoliva@redhat.com>
+	* readelf.c (get_machine_flags <EM_SH>): Print SH ISA name.
+
+2004-07-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* objcopy.c (filter_symbols): Use bfd_coff_get_comdat_section
+	to access comdat.
+	* objdump.c (dump_section_header): Likewise.
+
+2004-07-15  Aravinda PR  <aravindapr@rediffmail.com>
+
+	* nlmconv.c (main): Pass map_file argument to link_inputs.
+	(link_inputs): Use map_file argument if it is defined.
+
+2004-07-13  Nick Clifton  <nickc@redhat.com>
+
+	* dllwrap.c: Replace 'program_name' with 'prog_name' to avoid
+	conflicts with exported global defined in bucomm.h.
+	(deduce_name): Rename parameter 'program_name' to 'name' to avoid
+	shadowing the global defined in bucomm.h.
+
+2004-07-12  Aaron W. LaFramboise  <aaron98wiridge9@aaronwl.com>
+
+	* dlltool.c (ext_prefix_alias): New global variable.
+	(make_one_lib_file): Add aliases with prefixes for external
+	and import definitions.
+	(usage): Document -p option.
+	(long_options): Add --ext-prefix-alias option.
+	(main): Handle -p.
+	* doc/binutils.texi: Document new switch.
+	* NEWS: Mention new switch.
+
+2004-07-09  Aaron W. LaFramboise <aaron98wiridge9@aaronwl.com>
+
+	* binutils/dlltool.c (asm_prefix): Add parameter: name.
+	No underscore for symbols beginning with ?.
+	(ASM_PREFIX): Add parameter: NAME.
+	(gen_exp_file): Use new parameter.
+	(make_label): Likewise.
+	(make_imp_label): Likewise.
+	(make_one_lib_file): Likewise.
+
+2004-07-07  Tomer Levi  <Tomer.Levi@nsc.com>
+
+	* MAINTAINERS: Added myself to the list.
+	* readelf.c: Include "elf/crx.h".
+	(guess_is_rela): Handle EM_CRX.
+	(get_machine_name): Likewise.
+	(dump_relocations): Likewise.
+
+2004-07-03  Aaron W. LaFramboise  <aaron98wiridge9@aaronwl.com>
+
+	* doc/binutils.texi (nm): Clarify weak symbol description.
+
+2004-06-24  Ben Elliston  <bje@au.ibm.com>
+
+	* readelf.c (get_segment_type): Display "GNU_STACK", not just
+	"STACK", when a PT_GNU_STACK segment is encountered.
+
+2004-06-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* objcopy.c (copy_section): Don't set _cooked_size.
+
+2004-06-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (Elf32_Word): Delete.
+	(get_32bit_dynamic_section): Handle SGI ELF dynamic segment.
+	(get_64bit_dynamic_section): Likewise.
+
+	* readelf.c (get_32bit_dynamic_section): Stop at first DT_NULL entry.
+	(get_64bit_dynamic_section): Likewise.
+
+	* readelf.c (dynamic_nent): New variable.
+	(get_32bit_dynamic_section): Set it.
+	(get_64bit_dynamic_section): Here too.
+	(process_dynamic_section): Use it instead of dynamic_size.
+	(process_syminfo): Likewise.
+
+	* readelf.c (get_32bit_dynamic_section): Correct number of entries
+	translated from external to internal form.
+	(get_64bit_dynamic_section): Likewise.
+
+2004-06-18  Jie Zhang  <zhangjie@magima.com.cn>
+
+	* readelf.c (process_program_headers): When locating the dynamic
+	section use the section table if it is present.
+	(dynamic_segment): Renamed to dynamic_section.
+	Replace references to dynamic segment with references to dynamic
+	section, except where appropriate.
+	(dynamic_segment_mips_val): Rename to dynamic_section_mips_val.
+	(dynamic_segment_parisc_val): Rename to dynamic_section_parisc_val.
+	(dynamic_segment_ia64_val): Rename to dynamic_section_ia64_val.
+	(get_32bit_dynamic_segment): Rename to get_32bit_dynamic_section.
+	Remove tag counting code as it is no longer needed.
+	(get_64bit_dynamic_segment): Rename to get_64bit_dynamic_section.
+	Remove tag counting code as it is no longer needed.
+	(process_dynamic_segment): Rename to process_dynamic_section.
+
+2004-06-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* objcopy.c (copy_section): Use bfd_get_section_size instead of
+	_raw_size or bfd_get_section_size_before_reloc.  Don't set reloc_done.
+	(compare_section_lma): Likewise.
+	* addr2line.c (find_address_in_section): Likewise.
+	* coffgrok.c (do_sections_p1): Likewise.
+	* dlltool.c (scan_drectve_symbols): Likewise.
+	* nlmconv.c (main): Likewise.
+	(copy_sections): Likewise.
+	(powerpc_mangle_relocs): Likewise.
+	* objdump.c (disassemble_section): Likewise.
+	* prdbg.c (find_address_in_section): Likewise.
+	* size.c (berkeley_sum): Likewise.
+	* srconv.c (wr_ob): Likewise.
+	* strings.c (strings_a_section): Likewise.
+
+2004-05-28  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* readelf.c (decode_ARM_machine_flags): Add EF_ARM_VFP_FLOAT.
+
+2004-05-17  David Heine  <dlheine@tensilica.com>
+
+	* objcopy.c (setup_bfd_headers): New function.
+	(copy_object): Call setup_bfd_headers.
+
+2004-05-13  Paul Brook  <paul@codesourcery.com>
+
+	* readelf.c (display_debug_frames): Handle dwarf3 format CIE
+	entries.
+
+2004-05-13  Nick Clifton  <nickc@redhat.com>
+
+	* po/fr.po: Updated French translation.
+
+2004-05-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* readelf.c (get_segment_type): Handle PT_GNU_RELRO.
+
+2004-05-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (section_groups): New.
+	(group_count): New.
+	(section_headers_groups): New.
+	(process_section_groups): Populate group_count, section_groups
+	and section_headers_groups.
+	(process_unwind): Support section group.
+	(process_object): Always call process_section_groups. Free
+	section_groups and section_headers_groups.
+
+2004-04-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (process_section_headers): Use %3lu on sh_info.
+
+2004-04-30  Michael Deutschmann  <michael@talamasca.ocis.net>
+
+	* ranlib.sh: Quote $1 argument in case it contains spaces.
+
+2004-04-27  John Paul Wallington  <jpw@gnu.org>
+
+	* objcopy.c (copy_usage, strip_usage): Fix spelling.
+
+2004-04-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (do_section_groups): New.
+	(options): Add --section-groups/-g.
+	(usage): Mention --section-groups/-g.
+	(parse_args): Support --section-groups/-g.
+	(get_group_flags): New.
+	(process_section_groups): New.
+	(process_object): Call process_section_groups.
+
+2004-04-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* objdump.c (disassemble_section): Don't disassemble sections
+	without SEC_HAS_CONTENTS.
+
+2004-04-22  Jakub Jelinek  <jakub@redhat.com>
+
+	* objdump.c (synthsyms, synthcount): New variables.
+	(disassemble_data): Use dynsyms for stripped binaries or libraries.
+	Add synthetized symbols.
+	(dump_bfd): For disassemble, initialize dynsyms always and
+	also synthsyms.  Free synthsyms and clear {sym,dynsym,synth}count
+	before returning.
+
+2004-04-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* strings.c (print_strings): Cast file_off to unsigned long in
+	printf arg list.
+
+2004-04-07  Benjamin Monate  <benjamin.monate@cea.fr>
+
+	PR 86
+	* arsup.c (ar_save): Use smart_rename.
+
+2004-04-01  Dean Luick <luick@cray.com>
+
+	* readelf.c (display_debug_pubnames): Align offset and data
+	columns.
+	(read_and_display_attr_value): Add missing break;
+	(debug_displays): Enable the display of the .debug_pubtypes
+	section.
+
+2004-03-30  Stan Shebs  <shebs@apple.com>
+
+	* mpw-config.in, mpw-make.sed, mac-binutils.r: Remove MPW
+	support files, no longer used.
+
+2004-03-23  Paul Brook  <paul@codesourcery.com>
+
+	* readelf.c (decode_ARM_machine_flags): Add EABI v3.
+
+2004-03-21  Richard Henderson  <rth@redhat.com>
+
+	* readelf.c (display_debug_frames): Don't crash for mismatched
+	DW_CFA_restore_state.
+
+2004-03-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* aclocal.m4: Regenerate.
+	* config.in: Regenerate.
+	* configure: Regenerate.
+	* po/binutils.pot: Regenerate.
+
+2004-03-15  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* objdump.c (struct SFILE): Replace current pointer with pos
+	offset, rename size to alloc.
+	(objdump_sprintf): Avoid unnecessary copies in the common case
+	(disassemble_bytes): Keep sfile live throughout the
+	function. Adjust usage appropriately.
+
+2004-03-10  Ben Elliston  <bje@gnu.org>
+
+	* MAINTAINERS: Update my mail address.
+
+2004-03-08  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* deflex.l: Handle "PRIVATE" string.
+	* defparse.y (%token): Add PRIVATE.
+	(%type): Add opt_PRIVATE.
+	(expline): Pass opt_PRIVATE to def_exports.
+	(opt_PRIVATE): Handle PRIVATE token.
+	* dlltool.h (def_exports): Add 7th param for private flag to
+	declaration.
+	* dlltool.c: Add PRIVATE to comment on EXPORTS syntax.
+	(struct export): Add 'private' field.
+	(def_exports): Set 'private' field of struct exports.
+	(scan_drectve_symbols): Adjust calls to def_exports.
+	(scan_filtered_symbols): Likewise.
+	(dump_def_info): Print 'private' field.
+	(gen_def_file): Likewise.
+	(gen_lib_file): Skip generation of lib object if private.
+	Delete tmp object files in same order as they were generated.
+	Don't delete non-existent private object files.
+
+2004-02-27  Andreas Schwab  <schwab@suse.de>
+
+	* ar.c (main): Support POSIX-compatible argument parsing.
+
+2004-02-23  Daniel Lucq  <daniel@lucq.org>
+
+	* readelf.c (process_mips_specific): Print conflictsno as an
+	unsigned long.
+
+2004-02-21  Dmitry Timoshkov  <dmitry@baikal.ru>
+
+	* dlltool.c (gen_exp_file): Always output names for forwarded symbols.
+
+2004-02-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* objcopy.c (copy_section): Avoid warnings.
+
+2004-02-14  Andrew Cagney  <cagney@redhat.com>
+
+	* ar.c (remove_output): Use bfd_cache_close.
+	* arsup.c (ar_end): Ditto.
+
+2004-01-21  Roland McGrath  <roland@redhat.com>
+
+	* readelf.c (get_note_type): Match NT_AUXV.
+
+2004-01-20  Nick Clifton  <nickc@redhat.com>
+
+	* version.c (print_version): Update copyright year to 2004.
+
+2004-01-14  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+	* acinclude.m4: Quote names of macros to be defined by AC_DEFUN
+	throughout.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+
+2004-01-12  Jakub Jelinek  <jakub@redhat.com>
+
+	* objcopy.c: Include elf-bfd.h.
+	(is_strip_section): Don't strip debugging sections if
+	STRIP_NONDEBUG.
+	(setup_section): If STRIP_NONDEBUG make SEC_ALLOC sections
+	~(SEC_LOAD | SEC_HAS_CONTENTS) and on ELF targets also SHT_NOBITS.
+
+	* objcopy.c (copy_section): Free relpp if relcount == 0.
+
+2004-01-12  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* stabs.c (parse_stab_argtypes): Handle g++ ABI version 3 names.
+	(stab_demangle_argtypes): Likewise.
+	(stab_demangle_v3_argtypes): New static function.
+	(stab_demangle_v3_arg): New static function.
+
+2004-01-12  Nick Clifton  <nickc@redhat.com>
+
+	* objcopy.c (copy_object): Make the function boolean, returning
+	FALSE upon failure.
+	(copy_archive): Handle the return value from copy_object.
+	(copy_file): Likewise.
+
+2004-01-07  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (find_section): New function.  Locates a named
+	section.
+	(get_debug_line_pointer_sizes): New function:  Initialises the
+	debug_line_pointer_sizes array.
+	(display_debug_lines): Call get_debug_line_pointer_sizes.
+	(display_debug_loc): Likewise.
+	(load_debug_loc): Use find_section.
+	(load_debug_str): Likewise.
+	(display_debug_info): Likewise.
+	(prescan_debug_info): Delete.
+	(debug_displays): Remove prescan field.
+	(process_section_contents): Do not perform prescans.
+
+2004-01-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* objcopy.c (filter_bytes): Delete.  Move code to..
+	(copy_section): ..here.  Simplify size adjustment.  Divide
+	section lma by interleave.
+
+2004-01-02  Nick Clifton  <nickc@redhat.com>
+
+	* po/ru.po: New file: Russian translation.
+	* configure.in (ALL_LINGUAS): Add ru
+	* configure: Regenerate.
+
+For older changes see ChangeLog-0203
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-2005 sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-2005
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-2005	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-2005	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1350 @@
+2005-12-30  Jie Zhang  <jie.zhang@analog.com>
+
+	* readelf.c (get_machine_name): Add case for Blackfin.
+
+2005-12-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	(Makefile): Remove dependency.
+	* Makefile.in: Regenerate.
+
+2005-12-26  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
+
+	* MAINTAINERS: Add myself as VAX maintainer.
+
+2005-12-22  Randolph Chung  <tausq@debian.org>
+
+	* rddbg.c (read_section_stabs_debugging_info): Add $GDB_SYMBOLS$
+	entry to names[] array for SOM binaries.
+
+2005-12-21  H.J. Lu  <hjl@gnu.org>
+
+	* MAINTAINERS: Add myself as x86_64 maintainer.
+
+2005-12-16  Nathan Sidwell  <nathan@codesourcery.com>
+
+	Second part of ms1 to mt renaming.
+	* readelf.c (guess_is_rela): Use EM_MT.
+	(dump_relocations, get_machine_name): Adjust.
+
+2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* Makefile.am: Replace ms1 files with mt files.
+	* Makefile.in: Rebuilt.
+	* readelf.c (elf/mt.h): Adjust #include.
+
+2005-11-30  Nick Clifton  <nickc@redhat.com>
+
+	* configure.in (ALL_LINGUAS): Add fi.
+	* configure: Regenerate.
+	* po/fi.po: New file: Finnish translation.
+
+2005-11-21  Arnold Metselaar <arnoldm@sourceware.org>
+
+	* MAINTAINERS: add myself as Z80 maintainer
+
+2005-11-17  Andrew Haley  <aph@redhat.com>
+
+	* cxxfilt.c (main): Flush output at newline.
+
+2005-11-16  Mark Mitchell  <mark@codesourcery.com>
+
+	* doc/binutils.texi: Include config.texi and @file documentation
+	for manual pages.
+
+2005-11-15  Jan Beulich  <jbeulich@novell.com>
+
+	* objcopy.c (keep_file_symbols): New.
+	(enum command_line_switch): Add OPTION_KEEP_FILE_SYMBOLS.
+	(strip_options): Add --keep-file-symbols.
+	(copy_options): Likewise.
+	(copy_usage): Likewise.
+	(strip_usage): Likewise.
+	(filter_symbols): Act upon keep_file_symbols.
+	(strip_main): Handle OPTION_KEEP_FILE_SYMBOLS.
+	(copy_main): Likewise.
+	* doc/binutils.texi: Document --keep-file-symbols for objcopy
+	and strip.
+
+2005-11-14  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* readelf.c (struct dump_list_entry, request_dump_byname)
+	(initialise_dumps_byname): New.
+	(parse_args): Call request_dump_byname.
+	(process_section_contents): Call initialise_dumps_byname.
+	* doc/binutils.texi (readelf): Mention -x NAME.
+	* NEWS: Likewise.
+
+2005-11-11  Nick Clifton  <nickc@redhat.com>
+
+	PR 1150
+	* readelf.c (get_mips_symbol_other): New function.
+	(get_symbol_other): New function.
+	(process_symbol_table): Call get_symbol_other() to get a
+	description of the st_other field if it contains more information
+	than just the visibility.
+
+2005-11-07  Steve Ellcey  <sje@cup.hp.com>
+
+	* configure: Regenerate after modifying bfd/warning.m4.
+
+2005-10-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerated.
+
+	* dep-in.sed: Replace " ./" with " ".
+
+2005-10-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* po/POTFILES.in: Regenerate.
+	* po/binutils.pot: Regenerate.
+
+2005-10-24  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	* MAINTAINERS: Add self as BFIN maintainer.
+
+2005-10-18  Jie Zhang  <jie.zhang@analog.com>
+
+	* MAINTAINERS: Add self as BFIN maintainer.
+
+2005-10-11  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* rclex.l (handle quotes): Stop parsing hex notation escaped
+	chars after the first two digits,
+
+2005-10-11  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/1437
+	* cxxfilt.c (flags): Remove DMGL_TYPES;
+	(long_options): Rename --no-types to --types.
+	(usage): Likewise.
+	(demangle_it): Add a comment describing why _ and $ prefixes are
+	skipped.  Use printf rather than puts to emit the demangled output
+	in order to avoid emitting a new line character.
+	(main): Have the -t flag enable type demangling.
+	Emit a newline after every demangled command line argument.
+	Copy whitespace from stdin to stdout.
+	* doc/binutils.texi (c++filt): Document the change to the -t
+	switch.
+	Document why demangling names on the command line is slightly
+	different to demangling names read from the standard input.
+
+2005-10-10  Mark Mitchell  <mark@codesourcery.com>
+
+	* doc/Makefile.am (config.texi): Set top_srcdir.
+	* doc/Makefile.in: Regenerated.
+	* doc/binutils.texi: Use at-file.texi from libiberty.
+
+2005-10-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/1436
+	* readelf.c (ABSADDR): New.
+	(dump_ia64_unwind): Use ABSADDR to get the unwind info address.
+
+2005-10-10  Thomas Weidenmueller  <w3seek@reactos.com>
+
+	* resbin.c (res_to_bin_accelerator): Place the terminating NUL at
+	the correct location in the bindata structure.
+
+2005-10-10  Bryce Schober  <bryce.schober@dynonavionics.com>
+
+	* doc/binutils.texi (objdump): Fix typo: -reg-name-std should be
+	-reg-names-std.
+
+2005-10-04  Nick Clifton  <nickc@redhat.com>
+
+	* cxxfilt.c: Treat mangled names specified on the command line in
+	the same way as mangled names read from stdin.
+	Add -i switch to disable the display of implementation details.
+	Add -t switch to disable the demangling of types.
+	* NEWS: Mention the new switches.
+	* doc/binutils.texi (cxxfilt): Document the -i and -t switches.
+
+2005-10-03  Mark Mitchell  <mark@codesourcery.com>
+
+	* addr2line.c (usage): Document @file.
+	* ar.c (usage): Likewise.
+	* coffdump (usage): Likewise.
+	* cxxfilt.c (usage): Likewise.
+	* dlltool.c (usage): Likewise.
+	* dllwrap.c (usage): Likewise.
+	* nlmconv.c (usage): Likewise.
+	* nm.c (usage): Likewise.
+	* objcopy.c (usage): Likewise.
+	* objdump.c (usage): Likewise.
+	* readelf.c (usage): Likewise.
+	* size.c (usage): Likeise.
+	* srconv.c (usage): Likewise.
+	* strings.c (usage): Likewise.
+	* windres.c (usage): Likewise.
+	* doc/binutils.texi: Add section on common options. 
+
+2005-10-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* NEWS: Mention -W/--dwarf.
+
+	* doc/binutils.texi: Document -W/--dwarf for objdump.
+
+2005-10-01  Paul Brook  <paul@codesourcery.com>
+
+	* readelf.c (arm_attr_tag_CPU_arch, arm_attr_tag_ARM_ISA_use,
+	arm_attr_tag_THUMB_ISA_use, arm_attr_tag_VFP_arch,
+	arm_attr_tag_WMMX_arch, arm_attr_tag_NEON_arch,
+	arm_attr_tag_ABI_PCS_config, arm_attr_tag_ABI_PCS_R9_use,
+	arm_attr_tag_ABI_PCS_RW_data, arm_attr_tag_ABI_PCS_RO_DATA,
+	arm_attr_tag_ABI_PCS_GOT_use, arm_attr_tag_ABI_PCS_wchar_t,
+	arm_attr_tag_ABI_FP_rounding, arm_attr_tag_ABI_FP_denormal,
+	arm_attr_tag_ABI_FP_exceptions, arm_attr_tag_ABI_FP_user_exceptions,
+	arm_attr_tag_ABI_FP_number_model, arm_attr_tag_ABI_align8_needed,
+	arm_attr_tag_ABI_align8_preserved, arm_attr_tag_ABI_enum_size,
+	arm_attr_tag_ABI_HardFP_use, arm_attr_tag_ABI_VFP_args,
+	arm_attr_tag_ABI_WMMX_args, arm_attr_tag_ABI_optimization_goals,
+	arm_attr_tag_ABI_FP_optimization_goals, arm_attr_public_tags): New.
+	(display_arm_attribute, process_arm_specific): New functions.
+	(process_arch_specific): Add EM_ARM.
+
+2005-09-30  Mark Mitchell  <mark@codesourcery.com>
+
+	* dlltool.c (main): Fix typo.
+	* windres.c (main): Likewise.
+
+2005-09-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.in: Regenerated.
+
+2005-09-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysinfo.y (main): Undo last change.
+
+2005-08-30  Mark Mitchell  <mark@codesourcery.com>
+
+	* addr2line.c (main): Use expandargv.
+	* ar.c (main): Likewise.
+	* coffdump.c (main): Likewise.
+	* cxxfilt.c (main): Likewise.
+	* dlltool.c (main): Likewise.
+	* dllwrap.c (main): Likewise.
+	* nlmconv.c (main): Likewise.
+	* nm.c (main): Likewise.
+	* objcopy.c (main): Likewise.
+	* objdump.c (main): Likewise.
+	* readelf.c (main): Likewise.
+	* size.c (main): Likeiwse.
+	* srcconv.c (main): Likewise.
+	* strings.c (main): Likewise.
+	* sysdump.c (main): Likewise.
+	* sysinfo.y (main): Likewise.
+	* windres.c (main): Likewise.
+	
+2005-09-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerated.
+	* aclocal.m4: Likewise.
+
+2005-09-30  Catherine Moore  <clm@cm00re.com>
+
+	* Makefile.am: Bfin support.
+	* Makefile.in: Regenerated.
+	* aclocal.m4: Regenerated.
+	* readelf.c (elf/bfin.h): Include.
+	(guess_is_rela): EM_BLACKFIN support.
+	(dump_relocations): Likewise.
+
+2005-09-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* dwarf.c (fetch_indirect_string): Adjust for section address.
+	(process_debug_info): Likewise.
+	(display_debug_loc): Likewise.
+	(display_debug_ranges): Likewise.
+
+	* objdump.c (mach_o_dwarf_sections): New.
+	(generic_dwarf_sections): Likewise.
+	(check_mach_o_dwarf): Likewise.
+	(dump_dwarf): Call check_mach_o_dwarf.
+
+2005-09-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am (objdump_SOURCES): Add dwarf.c.
+	* Makefile.in: Regenerated.
+
+	* objdump.c: Include "dwarf.h".
+	(usage): Add -W/--dwarf.
+	(long_options): Likewise.
+	(dump_dwarf_section_info): New.
+	(load_debug_section): Likewise.
+	(free_debug_section): Likewise.
+	(dump_dwarf_section): Likewise.
+	(dump_dwarf): Likewise.
+	(dump_bfd): Load symbol table and call dump_dwarf if
+	dump_dwarf_section_info isn't zero.
+	(main): Handle -W/--dwarf.
+
+2005-09-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c: Reordered.
+	(is_relocatable): New.
+	(dwarf_section): New structure for DWARF section.
+	(load_debug_section): New.
+	(free_debug_section): Likewise.
+	(debug_str_section): Likewise.
+	(debug_abbrev_section): Likewise.
+	(debug_str_contents): Removed.
+	(debug_str_size): Likewise.
+	(debug_loc_contents): Likewise.
+	(debug_loc_size): Likewise.
+	(debug_range_contents): Likewise.
+	(debug_range_size): Likewise.
+	(load_debug_str): Likewise.
+	(free_debug_str): Likewise.
+	(load_debug_loc): Likewise.
+	(free_debug_loc): Likewise.
+	(load_debug_arange): Likewise.
+	(free_debug_arange): Likewise.
+	(load_debug_abbrev): Likewise.
+	(free_debug_abbrev): Likewise.
+	(fetch_indirect_string): Updated.
+	(debug_apply_rela_addends): Likewise.
+	(process_debug_info): Likewise.
+	(get_debug_info): Likewise.
+	(display_debug_lines): Likewise.
+	(display_debug_pubnames): Likewise.
+	(display_debug_macinfo): Likewise.
+	(display_debug_abbrev): Likewise.
+	(display_debug_loc): Likewise.
+	(display_debug_str): Likewise.
+	(display_debug_info): Likewise.
+	(display_debug_aranges): Likewise.
+	(display_debug_ranges): Likewise.
+	(display_debug_frames): Likewise.
+	(display_debug_not_supported): Likewise.
+	(debug_displays): Likewise.
+	(display_debug_section): Likewise.
+	(get_file_header): Set is_relocatable.
+
+2005-09-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (debug_apply_rela_addends): Relocate the whole
+	section.
+	(process_debug_info): Don't call debug_apply_rela_addends.
+	(display_debug_frames): Likewise.
+	(get_debug_info): Call debug_apply_rela_addends.
+	(debug_displays): Add the "relocate" field.
+	(display_debug_section): Call debug_apply_rela_addends if
+	needed.
+
+2005-09-30  Matthias Kurz  <mk@baerlap.north.de>
+
+	* bucomm.h: Prevent the inclusion of <libintl.h> from the Solaris
+	version of <locale.h> when ENABLE_NLS is not defined.
+
+2005-09-26  Mark Mitchell  <mark@codesourcery.com>
+
+	* BRANCHES: Mention binutils-csl-gxxpro-3_4-branch.
+
+2005-09-20  Richard Henderson  <rth@redhat.com>
+
+	* readelf.c (display_debug_lines): Use unsigned long for address
+	increments.  Use 0x prefix for all hex numbers.
+
+2005-09-09  Richard Earnshaw  <richard.earnshaw@arm.com>
+
+	* readelf.c (get_arm_section_type_name): Add SHT_ARM_PREEMPTMAP and
+	SHT_ARM_ATTRIBUTES.
+
+2005-09-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (get_elf_section_flags): Handle 64bit sh_flags.
+
+2005-09-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (debug_abbrev_contents): New.
+	(debug_abbrev_size): Likewise.
+	(load_debug_abbrev): Likewise.
+	(free_debug_abbrev): Likewise.
+	(process_debug_info): Use them.
+
+2005-08-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/1179
+	* objdump.c (disassemble_bytes): Don't adjust
+	adjust_section_vma.
+	(adjust_addresses): Don't adjust vma for debugging section.
+	Adjust lma only for relocatable files.
+	(dump_bfd): Tell adjust_addresses if it is a relocatable file.
+
+2005-08-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bucomm.h (stpcpy): Declare if HAVE_DECL_STPCPY isn't defined.
+
+	* configure.in (AC_GNU_SOURCE): Added.
+	(AC_CHECK_DECLS): Add stpcpy.
+	* configure: Regenerated.
+	* config.in: Likewise.
+
+2005-08-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* unwind-ia64.c (UNW_DEC_SPILL_SPREL, UNW_DEC_SPILL_PSPREL,
+	UNW_DEC_RESTORE, UNW_DEC_SPILL_REG): Increase {,ab,t}regname
+	buffer sizes.
+
+2005-08-15  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* doc/binutils.texi (objdump): Document -M e300.
+
+2005-08-14  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* readelf.c (slurp_hppa_unwind_table): Fix entry size on hppa64-hpux.
+	Don't access table entries past the end of the table.
+
+2005-08-13  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* readelf.c (get_parisc_segment_type): Handle PT_PARISC_WEAKORDER.
+	(get_parisc_section_type_name): Handle SHT_PARISC_DLKM.
+
+2005-08-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* NEWS: Mention "-t/--section-details" and
+	"-N/--full-section-name".
+
+	* doc/binutils.texi: Document "-t/--section-details". Remove
+	"-N/--full-section-name".
+
+	* readelf.c (do_full_section_name): Renamed to ...
+	(do_section_details): This.
+	(option): Rename "-N/--full-section-name" to
+	"-t/--section-details".
+	(usage): Likewise.
+	(parse_args): Likewise.
+	(get_elf_section_flags): Support do_section_details.
+	(process_section_headers): Updated for do_section_details.
+
+2005-08-04  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* readelf.c (get_parisc_dynamic_type): Add new dynamic types.
+	(get_dynamic_type): Use old values for DT_LOOS and DT_HIOS when
+	e_machine is EM_PARISC.
+	(get_parisc_segment_type): Add new segment types.
+	(get_parisc_section_type_name): Add new section names.
+	(dynamic_section_parisc_val): Add new table entries.
+
+2005-08-01  Filip Navara  <navaraf@reactos.com>
+
+	* dlltool.c (alphafunc): Remove and replace usage with nfunc.
+	(nfunc): Fix sorting of fastcall symbols when --kill-at is used.
+
+2005-07-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (dump_relocations): Handle SHN_X86_64_LCOMMON.
+	(get_symbol_index_type): Likewise.
+	(get_elf_section_flags): Handle SHF_X86_64_LARGE.
+
+2005-07-21  Eric Christopher  <echristo@apple.com>
+
+	* MAINTAINERS: Change affiliation.
+
+2005-07-19  Ben Elliston  <bje@au.ibm.com>
+
+	* readelf.c (read_and_display_attr_value): Remove comment adjacent
+	to DW_ATE_decimal_float about it being a GNU extension.
+
+2005-07-18  Nick Clifton  <nickc@redhat.com>
+
+	* binemul.c: Fix name of Red Hat.
+	* binemul.h: Likewise.
+	* emul_aix.c: Likewise.
+	* emul_vanilla: Likewise.
+
+2005-07-18  Ben Elliston  <bje@au.ibm.com>
+
+	* readelf.c (read_and_display_attr_value): Handle a DW_AT_encoding
+	value of DW_ATE_decimal_float instead of DW_ATE_GNU_decimal_float.
+
+2005-07-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2005-07-15  Eric Christopher  <echristo@redhat.com>
+
+	* MAINTAINERS: Change affiliation.
+
+2005-07-14  Jim Blandy  <jimb@redhat.com>
+
+	* readelf.c: #include "elf/m32c.h"
+	(guess_is_rela, dump_relocations, get_machine_name): Add cases for
+	EM_M32C.
+	* Makefile.am (readelf.o): Update dependencies.
+	* Makefile.in: Regenerated.
+
+2005-07-08  Ben Elliston  <bje@au.ibm.com>
+
+	* bucomm.h: Include <stdarg.h> unconditionally, not only when
+	ANSI_PROTOTYPES is defined.  Remove #ifdef logic.
+	* dlltool.c: Likewise.
+	* dllwrap.c: Likewise.
+
+2005-07-07  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* bucomm.h (report): Add format attribute.
+	* dlltool.c (inform): Likewise.
+	* dllwrap.c (display, inform, warn): Likewise.
+	* objdump.c (objdump_sprintf): Likewise.
+	* readelf.c (error, warn): Likewise.  Fix format bugs.
+
+2005-07-05  Dmitry V. Levin  <ldv@altlinux.org>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* strings.c (filename_and_size_t): New typedef.
+	(strings_a_section): Skip sections with size greater or equal to
+	the file size.  Cache the file size to avoid repeated stat()s.
+	(strings_object_file): Pass filename_and_size_t argument to
+	strings_a_section() via bfd_map_over_sections().
+
+2005-07-04  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 1004
+	* objcopy.c (copy_object): Use bfd_make_section_with_flags.
+	(write_debugging_info): Likewise.
+	(setup_section): Use bfd_make_section_anyway_with_flags.
+
+2005-07-01  Steve Ellcey  <sje@cup.hp.com>
+
+	* configure.in (AM_BINUTILS_WARNINGS): Add.
+	(BFD_NEED_DECLARATION): Replace with AC_CHECK_DECLS.
+	* configure: Regenerate.
+	* config.in: Regenerate.
+	* objdump.c (NEED_DECLARATION_*): Replace with !HAVE_DECL_*.
+	* bucomm.h: (NEED_DECLARATION_*): Ditto.
+
+2005-06-30  Ben Elliston  <bje@gnu.org>
+
+	* Makefile.am (check-DEJAGNU): Don't search for expect.
+	* Makefile.in: Regenerate.
+
+2005-06-30  Ben Elliston  <bje@gnu.org>
+
+	* Makefile.am (EXPECT): Set to expect.
+	(RUNTEST): Likewise, set to runtest.
+	* Makefile.in: Regenerate.
+
+2005-06-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* readelf.c (CHECK_ENTSIZE_VALUES, CHECK_ENTSIZE): Define.
+	(process_section_headers): Use it.
+	(process_relocs): Don't crash if symsec is not SHT_SYMTAB
+	or SHT_DYNSYM.
+	(process_version_sections): Use sizeof (Elf_External_Versym)
+	instead of sh_entsize.
+
+2005-06-16  Nick Clifton  <nickc@redhat.com>
+
+	* rename.c (simple_copy): Only define if it is going to be used.
+	(smart_rename): Mark the preserve_dates parameter as possibly
+	being unused.
+
+	* resres.c (write_res_data): Prevent a potential compile time
+	warning by casting the return value from fwrite.
+
+2005-06-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 995
+	* ar.c (BUFSIZE): Moved to ...
+	* bucomm.h (BUFSIZE): Here.
+
+	* bucomm.c: Include <assert.h>.
+	(bfd_get_archive_filename): New.
+	* bucomm.h (bfd_get_archive_filename): New.
+
+	* objcopy.c (copy_unknown_object): New.
+	(copy_object): Use bfd_get_archive_filename when reporting input
+	error. Don't call fatal on unknown arch.
+	(copy_archive): Call copy_unknown_object on unknown format or
+	arch.
+
+2005-06-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* readelf.c (cmalloc, xcmalloc, xcrealloc): New functions.
+	(get_data): Add nmemb argument.  Return NULL if nmemb * size
+	overflows.  If var == NULL, allocate one extra byte and
+	clear it.
+	(slurp_rela_relocs, slurp_rel_relocs, get_32bit_program_headers,
+	get_64bit_program_headers, get_program_headers,
+	get_32bit_section_headers, get_64bit_section_headers,
+	get_32bit_elf_symbols, get_64bit_elf_symbols, process_section_headers,
+	process_section_groups, process_relocs, slurp_ia64_unwind_table,
+	ia64_process_unwind, slurp_hppa_unwind_table, hppa_process_unwind,
+	get_32bit_dynamic_section, get_64bit_dynamic_section,
+	process_dynamic_section, process_version_sections, get_dynamic_data,
+	process_symbol_table, dump_section, load_debug_str, load_debug_loc,
+	load_debug_range, read_and_display_attr_value, process_debug_info,
+	get_debug_info, frame_need_space, display_debug_frames,
+	display_debug_section, process_mips_specific, process_gnu_liblist,
+	process_corefile_note_segment): Adjust get_data callers.  Use
+	cmalloc, xcmalloc and xcrealloc instead of {m,xm,xre}alloc where
+	passed size is a product of 2 numbers.
+
+	* readelf.c (print_mode): Fix comment typo.
+	(slurp_rela_relocs, slurp_rel_relocs): Fix memory leaks.
+	(dump_relocations): Fix a thinko in check for invalid st_name.
+	(process_program_headers): Don't crash if string_table is NULL.
+	(process_section_headers): Don't crash if e_shstrndx is invalid.
+	Ensure string_table_length is 0 if string_table == NULL.
+	Don't return just because string_table is NULL.
+	(process_section_groups): Don't crash if symtab's sh_link or
+	symbol's st_name is invalid.  Fix a memory leak.  Fix check for
+	invalid section number entry.
+	(process_relocs): Don't crash if relocation or symbol section's
+	sh_link is invalid.
+	(slurp_ia64_unwind_table, slurp_hppa_unwind_table): Don't crash if
+	relocation section's sh_info is invalid.
+	(ia64_process_unwind, hppa_process_unwind): Don't crash if symbol
+	table's sh_link is invalid.
+	(process_version_sections): Don't crash on version or symbol
+	section's sh_link is invalid.  Don't crash if symbol's st_shndx
+	is invalid.
+	(process_symbol_table): Don't crash if string table is corrupt
+	or symbol's st_name, st_shndx, vna_name or vda_name is invalid.
+	(debug_apply_rela_addends): Don't crash if relocation section's
+	sh_info or sh_link is invalid.
+	(display_debug_loc): Warn for unterminated .debug_loc section
+	or start offsets not within .debug_loc section boundaries.
+	(process_gnu_liblist): Don't crash if liblist section's sh_link
+	or entry's l_name is invalid.
+
+2005-06-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* objdump.c (disassemble_bytes): Don't crash if q->howto == NULL.
+	If q->howto->name == NULL, print q->howto->type as number instead.
+	(dump_reloc_set): Likewise.
+
+2005-06-07  Eric Christopher  <echristo@redhat.com>
+
+	* readelf.c (guess_is_rela): Support ms1.
+	(dump_relocations): Ditto.
+	(get_machine_name): Ditto.
+
+2005-06-07  Aldy Hernandez  <aldyh@redhat.com>
+	    Michael Snyder  <msnyder@redhat.com>
+	    Stan Cox  <scox@redhat.com>
+
+	* Makefile.am (readelf.o): Depend on ms1.h.
+
+	* Makefile.in: Regenerate.
+
+	* readelf.c: Include ms1.h.
+
+2005-06-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 990
+	* nm.c (print_symbol): Call bfd_find_line before
+	bfd_find_nearest_line.
+
+2005-06-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* NEWS: Mention new powerpc ld support.
+
+2005-06-03  Steve Ellcey  <sje@cup.hp.com>
+
+	* configure.in: Check for getc_unlocked prototype.
+	* configure: Regenerate.
+	* config.in: Regenerate.
+	* strings.c (get_char): Only call getc_unlocked if we have seen a
+	prototype.
+
+2005-06-03  Nick Clifton  <nickc@redhat.com>
+
+	* configure.in (ALL_LINGUAS): Add zh_TW
+	* configure: Regenerate.
+	* po/zh_TW.po: New Chinese (traditional) translation.
+
+2005-05-31  Richard Henderson  <rth@redhat.com>
+
+	* readelf.c (dump_relocations): Special case R_ALPHA_LITUSE.
+
+2005-05-29  Richard Henderson  <rth@redhat.com>
+
+	* readelf.c (get_alpha_dynamic_type): New.
+	(get_dynamic_type): Call it.
+
+2005-05-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (process_section_groups): Report group section
+	index. Check if the section member index is valid.
+
+2005-05-23  Fred Fish  <fnf@specifixinc.com>
+
+	* addr2line.c (unwind_inlines): New flag for 'i' option.
+	(usage): Document '-i' option.
+	(long_options): Recognize '--inlines'.
+	(translate_addresses): Loop, calling bfd_find_inliner_info as
+	necessary and printing multiple output lines.
+	(main): Handle 'i' option.
+	* doc/binutils.texi (addr2line): Document '-i' option.
+	* NEWS: Mention new addr2line '-i' option.
+
+2005-05-23  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (fetch_indirect_string): Display a warning message
+	when a corrupt DW_FORM_strp value is encountered.
+
+	(process_debug_info): Mention that the compilation unit offset is
+	being displayed in hexadecimal.
+
+	(display_debug_lines): Fix typo in name of .debug_line section.
+
+2005-05-19  Zack Weinberg  <zack@codesourcery.com>
+
+	* Makefile.am: Have 'all' depend on 'info'.
+	* Makefile.in: Regenerate.
+
+2005-05-19  Ben Elliston  <bje@au.ibm.com>
+
+	* readelf.c (read_and_display_attr_value): Handle a DW_AT_encoding
+	value of DW_ATE_GNU_decimal_float.
+
+2005-05-17  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* doc/Makefile.am (config.texi): Don't use $<.
+	* doc/Makefile.in: Regenerated.
+
+2005-05-15  Yitzchak Scott-Thoennes  <sthoenna@efn.org>
+
+	* deflex.l: Ignore CRs
+
+2005-05-15  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* acinclude.m4: Remove obsolete code.
+	* configure.in: Update AC_PREREQ.
+	* doc/Makefile.am (binutils_TEXINFOS): Define.
+	(config.texi): Depend on distributed files instead of built
+	files.
+	(binutils.dvi, binutils.info): Remove unnecessary rules.
+	(DISTCLEANFILES): Remove.
+	(install-data-local): Renamed from install.
+	(info-local): Renamed from info.
+	* Makefile.in, aclocal.m4, config.in, configure,
+	doc/Makefile.in: Regenerated.
+
+2005-05-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (get_ppc_dynamic_type): Display DT_PPC_GOT, not
+	DT_PPC_GLINK.
+
+2005-05-13  Fred Fish  <fnf@specifixinc.com>
+
+	* readelf.c: Fix a couple of obvious comment typos,
+	'debug_str' -> 'debug_ranges' and proecess' -> 'process'.
+
+2005-05-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (dump_ia64_unwind): Get stamp with proper size.
+
+2005-05-12  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (display_debug_lines): If pointer_size has not been
+	found then assume that it is 4 in order to prevent a seg fault
+	when process_extend_line_op attempts to read the line data.
+
+2005-05-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (get_ppc_dynamic_type): New function for DT_PPC_GLINK.
+	(get_dynamic_type): Call the above.
+
+2005-05-07  Nick Clifton  <nickc@redhat.com>
+
+	* Update the address and phone number of the FSF organization in
+	the GPL notices in the following files:
+	aclocal.m4, addr2line.c, ar.c, arlex.l, arparse.y, arsup.c,
+	arsup.h, binemul.c, binemul.h, bucomm.c, bucomm.h, budbg.h,
+	budemang.c, budemang.h, coffdump.c, coffgrok.c, coffgrok.h,
+	cxxfilt.c, debug.c, debug.h, deflex.l, defparse.y, dlltool.c,
+	dlltool.h, dllwrap.c, emul_aix.c, emul_vanilla.c, filemode.c,
+	ieee.c, nlmconv.c, nlmconv.h, nlmheader.y, nm.c, objcopy.c,
+	objdump.c, prdbg.c, rclex.l, rcparse.y, rdcoff.c, rddbg.c,
+	readelf.c, rename.c, resbin.c, rescoff.c, resrc.c, resres.c,
+	size.c, srconv.c, stabs.c, strings.c, sysdump.c, sysinfo.y,
+	syslex.l, unwind-ia64.c, unwind-ia64.h, version.c, windres.c,
+	windres.h, winduni.c, winduni.h wrstabs.c, doc/fdl.texi
+
+2005-05-06  Jan Beulich  <jbeulich@novell.com>
+
+	* objcopy.c (copy_file): Don't delete output upon error here.
+	(copy_main): Delete output upon error.
+
+2005-05-02  Ben Elliston  <bje@au.ibm.com>
+
+	* dlltool.c (dtab): Remove empty function.
+	(process_duplicates): Remove calls to dtab().
+
+2005-05-01  Maciej W. Rozycki  <macro@linux-mips.org>
+
+	* doc/binutils.texi (strip, objcopy): Clarify the description of
+	the "--strip-debug" option.  Fix a typo.
+
+2005-04-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bucomm.c: Undo the last change.
+	* bucomm.h: Likewise.
+
+2005-04-29  Ben Elliston  <bje@au.ibm.com>
+
+	* syslex.l (word, number, unit): Remove unused variables.
+	* nlmheader.y (keyword_tokens): Make static.
+	* coffdump.c (dump_coff_symbol, coff_dump): Make static.
+	* coffgrok.c (lofile, last_function_symbol, last_function_type,
+	last_struct, last_enum, cur_sfile): Make variables static.
+	* sysdump.c (getCHARS, fillup, getBARRAY, getINT, getBITS,
+	sysroff_swap_tr_in, sysroff_print_tr_out): Make static.
+	* sysinfo.y (writecode, it, code, repeat, oldrepeat, name, rdepth,
+	names, pnames): Likewise.
+
+2005-04-29  Ben Elliston  <bje@au.ibm.com>
+
+	* ar.c (mri_mode): Make static.
+	* arsup.c (obfd, real_name, outfile): Likewise.
+	* binemul.c (ar_emul_create): Remove unused function.
+	(ar_emul_default_create): Likewise.
+	* binemul.h (ar_emul_create): Remove declaration.
+	(ar_emul_default_create): Likewise.
+	(struct bin_emulation_xfer_struct): Remove ar_create member.
+	* bucomm.c (report): Make static.
+	* bucomm.h (report): Remove declaration.
+	* cxxfilt.c (mbuffer): Make static.
+	(main): Use unsigned ints for some loop control variables.
+	* readelf.c: Make many global variables static.
+	* size.c (berkeley_format): Make static.
+	(long_options): Likewise.
+	* emul_aix.c (bin_aix_emulation): Remove ar_emul_default_create
+	structure initialiser.
+	(bin_aix5_emulation): Likewise.
+	* emul_vanilla.c (bin_vanilla_emulation): Likewise.
+
+2005-04-27  Ben Elliston  <bje@au.ibm.com>
+
+	* syslex.l: Adjust top-of-file comment: this file is part of GNU
+	binutils, not GNU ld.
+
+2005-04-25  Nick Clifton  <nickc@redhat.com>
+
+	PR872
+	* objcopy.c (copy_archive): Initialise 'obfd' field of new
+	name_list structure.
+
+	* objcopy.c (copy_usage): Fix description of -K switch.
+
+	* doc/binutils.texi (strip, objcopy): Fix description of -K
+	switch.
+
+2005-04-20  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* readelf.c (display_debug_frames): Use data factor for
+	DW_CFA_def_cfa_sf and DW_CFA_def_cfa_offset_sf.
+
+2005-04-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* objdump.c (dump_section_header): Skip linker created section.
+
+2005-04-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* objdump.c (dump_section_header): Support SEC_GROUP.
+
+2005-04-16  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (debug_apply_rela_addends): Remove redundant %s from
+	printf string.
+
+2005-04-15  Nick Clifton  <nickc@redhat.com>
+
+	* objcopy.c (copy_file): Issue an error message when attmepting to
+	copy an empty input file.
+
+2005-04-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (NO_WERROR): Define.  Use instead of -Wno-error.
+	* configure.in: Include ../bfd/warning.m4 contents.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+	* doc/Makefile.in: Regenerate.
+
+2005-04-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	(syslex.o, sysinfo.o, arparse.o, arlex.o): Add -Wno-error to command.
+	(sysroff.o, defparse.o, deflex.o): Likewise.
+	(nlmheader.o, rcparse.o, rclex.o): Likewise.
+	* Makefile.in: Regenerate.
+	* aclocal.m4: Regenerate.
+	* config.in: Regenerate.
+	* configure: Regenerate.
+
+2005-04-11  Jan Beulich  <jbeulich@novell.com>
+
+	* MAINTAINERS: Add myself as ix86 Intel mode maintainer.
+
+2005-04-06  Nick Clifton  <nickc@redhat.com>
+	    H.J. Lu  <hongjiu.lu@intel.com>
+
+	* po/rw.po: New translation: Kinyarwanda.
+	* configure.in (ALL_LINGUAS): Add rw.
+	* configure: Regenerate.
+
+2005-04-04  Maciej W. Rozycki  <macro@linux-mips.org>
+
+	* readelf.c (debug_apply_rela_addends): Reorder r_info as
+	necessary for 64-bit MIPS.
+
+2005-04-04  Maciej W. Rozycki  <macro@linux-mips.org>
+
+	* doc/binutils.texi (readelf): Remove a duplicate paragraph.
+
+2005-04-04  Ramana Radhakrishnan  <ramana.radhakrishnan@codito.com>
+
+	PR binutils/813
+	* objdump.c (dump_symbols): Add a check to see if the section for
+	the symbol is chosen using process_section_p.
+
+2005-04-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* NEWS: Mention new readelf options, "-N/--full-section-name"
+	and "-g/--section-groups".
+
+	* doc/binutils.texi: Document new readelf options,
+	"-N/--full-section-name" and "-g/--section-groups".
+
+2005-03-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (do_full_section_name): New.
+	(options): Add "--full-section-name"/'N'.
+	(usage): Add -N/--full-section-name.
+	(parse_args): Handle 'N'.
+	(process_section_headers): Print out the full section name if
+	do_full_section_name isn't 0.
+
+2005-03-31  Nick Clifton  <nickc@redhat.com>
+
+	* configure.in: Add a check for <unistd.h> providing a prototype
+	for getopt() which is compatible with the one in
+	include/getopt.h.  If so then define HAVE_DECL_GETOPT.
+	* configure: Regenerate.
+	* config.in (HAVE_DECL_GETOPT): Add.
+	* aclocal.m4: Regenerate.
+	* addr2line.c: Include "config.h" before "bfd.h" so that
+	HAVE_DECL_GETOPT is defined before getopt.h is included.
+
+2005-03-21  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
+
+	* doc/binutils.texi: Document new VAX disassembler-specific option
+	-M entry:0xfooba8.
+	* NEWS: Mention the new option.
+
+2005-03-29  Anil Paranjpe  <anilp1@kpitcummins.com>
+
+	* MAINTAINERS: Add myself as H8300 maintainer.
+
+2005-03-28  Aaron W. LaFramboise  <aaron98wiridge9@aaronwl.com>
+
+	* objdump.c (disassemble_bytes): Remove cast.
+
+2005-03-25  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* BRANCHES: Add binutils-csl-arm-2005q1-branch and
+	binutils-2_16-branch.
+
+2005-03-25  Mark Kettenis  <kettenis@gnu.org>
+
+	* MAINTAINERS: Add myself as M88k maintainer.
+
+2005-03-24  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* winduni.c (unicode_from_ascii): Don't declare variables
+	's' and 'w' if _WIN32.  Use MultiByteToWideChar to set the unicode
+	string len.
+
+2005-03-24  Dmitry Diky   <diwil@spec.ru>
+
+	* MAINTAINERS: Add myself as MSP430 maintainer.
+
+2005-03-23  Nick Clifton  <nickc@redhat.com>
+
+	* po/fr.po: Updated translation.
+
+2005-03-22  Nick Clifton  <nickc@redhat.com>
+
+	* MAINTAINERS: Add Daniel Jacobwitz to the blanket write
+	privileges list.
+
+2005-03-17  Paul Brook <paul@codesourcery.com>
+	    Dan Jacobowitz <dan@codesourcery.com>
+	    Mark Mitchell  <mark@codesourcery.com>
+
+	* binutils/readelf.c (get_arm_segment_type): New function.
+	(get_segment_type): Use it.
+
+2005-03-18  Paul Brook  <paul@codesourcery.com>
+
+	* objdump.c (objdump_print_addr): Avoid uninitialized warning.
+
+2005-03-17  Diego Novillo  <dnovillo@redhat.com>
+
+	* MAINTAINERS: Remove self as maintainer of x86 intel
+	mode.
+
+2005-03-16  Nick Clifton  <nickc@redhat.com>
+	    Ben Elliston  <bje@au.ibm.com>
+
+	* configure.in (werror): New switch: Add -Werror to the
+	compiler command line.  Enabled by default.  Disable via
+	--disable-werror.
+	* configure: Regenerate.
+
+2005-03-15  Daniel Marques  <marques@cs.cornell.edu>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* objcopy.c (globalize_specific_list): New linked list of symbols
+	to convert from local binding into global binding.
+	(command_line_switch): Add OPTION_GLOBALIZE_SYMBOL and
+	OPTION_GLOBALIZE_SYMBOLS.
+	(copy_options): Add "globalize-symbol" and "globalize-symbols".
+	(copy_usage): Document the new switches.
+	(filter_symbols): Convert defined local symbols mentioned on the
+	globalize_specific_list into global symbols.
+	(copy_object): Perform actions if the globalize_specific_list is
+	not empty.
+	(copy_main): Handle new switches.
+	* NEWS: Mention new feature.
+	* doc/binutils.texi: Document new switches.
+
+2005-03-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* po/es.po: Commit new Spanish translation.
+
+	* po/fr.po: Commit new French translation.
+
+2005-03-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* po/tr.po: Commit new Turkish translation.
+
+2005-03-11  Nick Clifton  <nickc@redhat.com>
+
+	* po/fr.po: Updated French translation.
+
+2005-03-10  Nick Clifton  <nickc@redhat.com>
+
+	* configure.in (ALL_LINGUAS): Add Romanian lingua "ro".
+	* configure: Regenerate.
+	* po/ro.po: New file.
+
+	* po/ru.po: Updated file.
+
+2005-03-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* po/binutils.pot: Regenerate.
+
+2005-03-02  Jan Beulich  <jbeulich@novell.com>
+
+	* ar.c (remove_output): Use unlink_if_ordinary instead of unlink.
+	* objcopy.c (copy_file): Likewise.
+	(strip_main): Likewise.
+
+2005-03-01  Stig Petter Olsroed  <stigpo@users.sourceforge.net>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* objdump.c: Fix coding for DISASSEMBLER_NEEDS_RELOC:
+	(struct objdump_disasm_info): Add 'reloc' field.
+	(disassemble_bytes): Fix check for when an insn has a reloc
+	associated with it.  Improve comment explaining why the use of
+	octets is wrong.  Set the 'reloc' field in objdump_disasm_info
+	structure.
+	(objdump_print_addr): Use new 'reloc' field to lookup the correct
+	address for the symbol associated with the current instruction's
+	relocation.
+	(disassemble_info): Initialise 'reloc' field.
+
+2005-02-28  Jakub Jelinek  <jakub@redhat.com>
+
+	* readelf.c (get_file_type, get_machine_name, get_osabi_name,
+	get_segment_type, get_section_type_name, get_elf_class,
+	get_data_encoding, get_group_flags, dynamic_section_mips_val,
+	get_symbol_binding, get_symbol_type, get_TAG_name, get_FORM_name,
+	get_AT_name, process_mips_specific, process_gnu_liblist,
+	get_note_type, get_netbsd_elfcore_note_type): Use snprintf instead of
+	sprintf where needed.
+	(get_dynamic_type): Likewise.  Increase buff to 64 bytes.
+	(get_elf_section_flags): Increase buff to 33 bytes.  Avoid
+	using strcat.
+	(get_dynamic_flags): Renamed to...
+	(print_dynamic_flags): ... this.  Print the flags to stdout instead
+	of returning them as string.
+	(process_dynamic_section): Adjust caller.
+
+2005-02-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (display_debug_ranges): Print out offset for end of
+	list.
+
+2005-02-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* dlltool.c: Warning fixes.
+	* objdump.c: Likewise.
+
+2005-02-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (syslex.o, sysinfo.o): Pass AM_CFLAGS to compiler.
+	(syslex.o, sysinfo.o, dlltool.o, rescoff.o): Remove duplicate
+	dependencies.  Run "make dep-am".
+	* nlmconv.c: Warning fixes.
+	* readelf.c: Likewise.
+	* srconv.c: Likewise.
+	* sysdump.c: Likewise.
+	* sysinfo.y: Likewise.
+	* syslex.l: Likewise.  Use yyleng instead of strlen, memcpy instead
+	of strcpy.
+	* Makefile.in: Regenerate.
+
+2005-02-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* objcopy.c (parse_flags): Replace SEC_SHARED with
+	SEC_COFF_SHARED.
+
+	* objdump.c (dump_section_header): Dump SEC_TIC54X_BLOCK and
+	SEC_TIC54X_CLINK for TI c54x only. Remove SEC_ARCH_BIT_0. Dump
+	SEC_COFF_SHARED for COFF only.
+
+2005-02-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am"
+	* Makefile.in: Regenerate.
+	* doc/Makefile.in: Regenerate.
+
+2005-02-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (BYTE_GET8): Delete.  Replace uses with BYTE_GET.
+	(byte_get_little_endian): Don't handle size of -8.
+	(byte_get_signed, byte_get_big_endian): Likewise.
+	(print_dec_vma, print_hex_vma): New functions.
+	(print_vma): Use them.  Return chars output.
+	(get_dynamic_data): Return a bfd_vma array.  Add ent_size parm.
+	(process_symbol_table): Handle alpha and s390 .hash.
+
+2005-02-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (display_debug_loc): Print out offset for end of
+	list.
+
+2005-02-18  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* Makefile.am (TOOL_PROGS): Add objdump.
+	* Makefile.in: Regenerate.
+
+2005-02-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* deflex.l (YY_NO_UNPUT): Define.
+	* rclex.l (YY_NO_UNPUT): Define.
+	* rcparse.y (null_unichar): New static var.
+	(res_null_text): Use it rather than attempting to init from wchar_t.
+	* windres.c: Include assert.h and time.h before getopt.h.
+	Include config.h and unistd.h too.
+
+2005-02-15  Nick Clifton  <nickc@redhat.com>
+
+	* nlmconv.c: Provide a full prototype for the localtime() function
+	in order to avoid a compile time warning.
+
+2005-02-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (group_count): Don't initialize it.
+	(process_section_groups): Reurn 1 if we won't do unwind nor
+	section groups. Set group_count to 0 before counting group
+	sections and return 1 if there are no group sections. Reread
+	SHT_SYMTAB/SHT_STRTAB sections only when needed. Don't skip
+	section 0.
+	(process_object): Only set do_unwind to 0 if
+	process_section_groups return 0.
+
+2005-02-10  Ian Lance Taylor  <ian@airs.com>
+
+	* MAINTAINERS: Update my e-mail address.
+
+2005-02-10  Mark Mitchell  <mark@codesourcery.com>
+
+	* MAINTAINERS: Add Paul Brook and Mark Mitchell as ARM (Symbian)
+	maintainers.
+
+2005-02-07  Inderpreet Singh <inderpreetb@noida.hcltech.com>
+
+	 * MAINTAINERS: Add self as maintainer of MAXQ.
+
+2005-01-31  Richard Sandiford  <rsandifo@redhat.com>
+
+	* readelf.c (eh_addr_size): New variable.
+	(find_section): Move earlier in file.  Return empty sections too.
+	(process_program_headers): Use find_section to find .dynamic.
+	(process_section_headers): Initialize eh_addr_size.
+	(dump_ia64_unwind, slurp_ia64_unwind_table, ia64_process_unwind)
+	(dump_hppa_unwind, slurp_hppa_unwind_table, hppa_process_unwind)
+	(display_debug_frames): Use it instead of local addr_size variable.
+	(size_of_encoded_value): Get pointer size from eh_addr_size rather
+	than is_32bit_elf.
+
+2005-01-31  Andrew Cagney  <cagney@gnu.org>
+
+	* configure: Regenerate to track ../gettext.m4.
+
+2005-01-31  Nick Clifton  <nickc@redhat.com>
+
+	* version.c (print_version): Bump the copyright date to 2005.
+
+2005-01-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* nm.c (display_rel_file): Read dynamic syms before calling
+	bfd_get_synthetic_symtab.
+
+2005-01-21  Ben Elliston  <bje@au.ibm.com>
+
+	* dlltool.c (dump_iat): Remove unused function.
+	(gen_exp_file): Remove #if 0'd code.
+	(make_one_lib_file): Likewise.
+	* srconv.c: Remove #if 0'd code throughout.
+	* size.c (lprint_number): Remove.
+	(print_berkeley_format): Remove #if 0'd code.
+	* ar.c (do_quick_append): Remove declaration and definiton.
+	(main): Remove #if 0'd code.
+	* filemode.c (filemodestring): Remove #if 0'd function.
+	* sysdump.c (unit_info_list): Remove function.
+	(object_body_list): Likewise.
+	(program_structure): Likewise.
+	(debug_list): Likewise.
+	(module): Remove #if 0'd code.
+
+2005-01-20  Mark Mitchell  <mark@codesourcery.com>
+
+	* BRANCHES: Add binutils-2_15-branch.
+
+	* MAINTAINERS: Document branch policy.
+	* BRANCHES: New file.
+
+2005-01-19  Fred Fish  <fnf@specifixinc.com>
+
+	* NEWS: Make note of the new MIPS disassembly option "no-aliases".
+	* doc/binutils.texi (objdump): Document the "no-aliases"
+	disassembly option.
+
+2005-01-17   Eugene Kotlyarov  <ekot@narod.ru>
+
+	PR binutils/647
+	* rcparse.y (RCDATA): Allow a filename to be supplied as the
+	parameter.  Parse it with define_rcdata_file().
+	* resrc.c (define_rcdata_file): New function.
+	* windres.h: Provide a prototype for the new function.
+
+	* resrc.c (define_user_file): Fix typo by replacing "font file"
+	with "file".
+
+2005-01-16  Jason Thorpe  <thorpej@netbsd.org>
+
+	* MAINTAINERS: Update my email address.
+
+2005-01-16  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* dlltool.c (set_dll_name_from_def): New function.  Strip name
+	to basename, with warning.
+	(def_name): Use it.
+	(def_library): Likwise.
+	(main): Strip arg of --dllname to basename, with warning.
+	Only use basename of exp_name when inferring dll_name.
+
+2005-01-11  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/637
+	* doc/binutils.texi (c++filt): Use uppercase CXXFILT in the
+	footnote in order to prevent the sed script in the Makefile from
+	converting it into c++filt.
+
+2005-01-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	BZ 635
+	readelf.c (saved_base_address): Removed.
+	(decode_64bit_range): Likewise.
+	(decode_range): Likewise.
+	(display_64bit_debug_ranges): Likewise.
+	(debug_info): Add range_lists, num_range_lists and
+	max_range_lists.
+	(read_and_display_attr_value): Handle do_debug_ranges.
+	(process_debug_info): Likewise.
+	(display_debug_ranges): Rewrite.
+	(process_object): Free range_lists.
+
+2005-01-10  Andreas Schwab  <schwab@suse.de>
+
+	* configure.in: Don't define SKIP_ZEROES.
+	* configure: Regenerate.
+	* objdump.c (disassemble_data): Set skip_zeroes and
+	skip_zeroes_at_end in disasm_info to defaults.
+	(DEFAULT_SKIP_ZEROES): Rename from SKIP_ZEROES and always define.
+	(DEFAULT_SKIP_ZEROES_AT_END): Rename from SKIP_ZEROES_AT_END and
+	always define.
+	(disassemble_bytes): Use skip_zeroes and skip_zeroes_at_end from
+	objdump_disasm_info.
+
+2005-01-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (display_debug_loc): Display base address
+	specifiers.  Always output <End of list>.
+
+2005-01-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (have_frame_base): New.
+	(need_base_address): Likewise.
+	(saved_base_address): Likewise.
+	(decode_location_expression): Return 1 if DW_AT_frame_base is
+	needed.
+	(debug_info): Add base_address and a have_frame_base pointer.
+	(read_and_display_attr_value): Replace saved_DW_AT_low_pc with
+	saved_base_address. Record base address. Set have_frame_base.
+	Record if a location list has DW_AT_frame_base. Display if a
+	location expression has no DW_AT_frame_base but needs one. Set
+	saved_base_address only if needed.
+	(process_debug_info): Clear have_frame_base, saved_base_address
+	and set need_base_address.
+	(display_debug_loc): Display if a location expression has no
+	DW_AT_frame_base but needs one. Display if start >= end. Don't
+	adjust for section address. Properly handle base address.
+	(process_object): Free the have_frame_base pointer in
+	debug_info.
+
+2005-01-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (display_debug_loc): Display offsets for hole and
+	overlap.
+	(display_debug_str): Add a newline at the end.
+
+2005-01-04  Armin Diehl  <diehl@nordrhein.de>
+
+	PR binutils/630
+	* nlmconv.c (main): Only store the basename of the output filename
+	in the module table.
+
+2005-01-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	BZ 615
+	* readelf.c (process_debug_info): New.
+	(debug_info): Add num_loc_offsets, loc_offsets and
+	last_loc_offset_p.
+	(get_debug_info): Use process_debug_info.
+	(display_debug_loc): Properly handle location list. Warn if bad
+	location lists are encoutnered.
+	(read_and_process_attr_value): New.
+	(read_and_display_attr_value): Use "%lx" for DW_FORM_data4.
+	(display_debug_info): Use process_debug_info.
+	(process_object): Also free loc_offsets in debug_information.
+
+For older changes see ChangeLog-2004
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-2006 sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-2006
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-2006	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-2006	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,599 @@
+2006-12-25  Kazu Hirata  <kazu@codesourcery.com>
+
+	* readelf.c (get_machine_flags): Handle EF_M68K_CPU32_FIDO_A.
+
+2006-12-11  J"orn Rennecke  <joern.rennecke@arc.com>
+
+	MAINTAINERS (SH): Remove my entry.
+
+2006-12-11  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* configure.in: Define GENINSRC_NEVER.
+	* doc/Makefile.am (MAINTAINERCLEANFILES): Add info file.
+	(DISTCLEANFILES): Pretend to add info file.
+	* po/Make-in (.po.gmo): Put gmo files in objdir.
+	* configure, Makefile.in, doc/Makefile.in: Regenerated.
+
+2006-12-07  Kazu Hirata  <kazu@codesourcery.com>
+
+	* readelf.c: Update uses of EF_M68K_*.
+
+2006-10-30  Paul Brook  <paul@codesourcery.com>
+
+	* objdump.c (disassemble_section): Set info->symtab_pos.
+	(disassemble_data): Set info->symtab and info->symtab_size.
+
+2006-10-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/3384
+	* configure.in (AC_CHECK_HEADERS): Add limits.h and sys/param.h.
+	* configure: Regenerated.
+	* config.in: Likewise.
+
+	* readelf.c: Include <limits.h> and <sys/param.h> for PATH_MAX.
+	(program_interpreter): Allocate PATH_MAX bytes instead of 64.
+	(process_program_headers): Don't assume that program interpreter
+	is shorter than 64 characters.
+
+2006-10-25  Trevor Smigiel  <Trevor_Smigiel@playstation.sony.com>
+	    Yukishige Shibata  <shibata@rd.scei.sony.co.jp>
+	    Nobuhisa Fujinami  <fnami@rd.scei.sony.co.jp>
+	    Takeaki Fukuoka  <fukuoka@rd.scei.sony.co.jp>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c: Add SPU support.
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2006-10-13  Robert Connolly  <robert@linuxfromscratch.org>
+
+	PR binutils/2876
+	* configure.in: Check for the mkstemp and mkdtemp functions.
+	* configure: Regenerate.
+	* config.in (HAVE_MKDTEMP): New potential define.
+	(MAKE_MKSTEMP): Likewise.
+	* bucomm.c (make_tempname): Use mkstemp if it is available.
+	(make_tempdir): New function: Create a temporary directory using
+	mkdtemp, if it is available.
+	* bucomm.h (make_tempdir): New prototype.
+	* objcopy.c (copy_archive): Use make_tempdir if it is available.
+	(strip_main): Produce an warning message if a temporary file could
+	not be created.
+	(copy_main): Likewise.
+	* ar.c (write_archive): Likewise.
+
+2006-10-10  Andreas Schwab  <schwab@suse.de>
+
+	* dwarf.c (display_debug_loc): Don't dereference loc_offsets when
+	there are no location lists.
+	(display_debug_ranges): Similar for range_lists.
+
+2006-10-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (debug_apply_rela_addends): Don't ignore relocation
+	against symbols without type.
+
+2006-09-25 Pedro Alves <pedro_alves@portugalmail.pt>
+
+	* nlmconv.c (main) : Use LITMEMCPY.
+	* prdbg.c (tg_class_static_member) : Use LITSTRCPY.
+
+2006-09-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/3257
+	* strings.c (main): Handle "-T format".
+
+2006-09-26  Nick Clifton  <nickc@redhat.com>
+
+	* MAINTAINERS: Add Mei Ligang as maintainer of the Score port.
+
+2006-09-26  Thiemo Seufer  <ths@networkno.de>
+
+	* configure.in: Remove broken changequote lines.
+
+2006-09-20  Kai Tietz  <Kai.Tietz@onevision.com>
+
+	* configure.in: Add new target x86_64-pc-mingw64.
+	* configure: Regenerate.
+	* dlltool.c: Adjust include for this target.
+	(DLLTOOL_MX86_64): Added macro to handle target specific code.
+	(mname): Added default target static as "i386:x86-64".
+	(MX86):	Added macro for target ident.
+	(mtable): Added target specific definitions.
+	(rvaafter): Add handling of MX86.
+	(rvabefore): Add handling of MX86.
+	(asmprefix): Add handling of MX86.
+
+2006-09-17  Mei Ligang  <ligang@sunnorth.com.cn>
+
+	* readelf.c: Add support for Score binaries.
+	* Makefile.am: Update readelf's dependencies.
+	* Makefile.in: Regenerate.
+
+2006-09-16  Nick Clifton  <nickc@redhat.com>
+	    Pedro Alves  <pedro_alves@portugalmail.pt>
+
+	* ar.c: Make use of new STRING_COMMA_LEN and CONST_STRNEQ
+	macros defined in bfd.h.
+	* dlltool.c: Likewise.
+	* emul_aix.c: Likewise.
+	* nlmconv.c: Likewise.
+	* objdump.c: Likewise.
+	* prdbg.c: Likewise.
+	* stabs.c: Likewise.
+	* readelf.c (const_strneq): New macro.
+	(process_section_headers, slurp_ia64_unwind_table,
+	slurp_hppa_unwind_table, display_debug_section, process_notes,
+	process_archive): Use the new macro.
+
+2006-09-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/3181
+	* objcopy.c (group_signature): Return proper group signature.
+
+2006-09-14  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 3181
+	* objcopy.c (group_signature): New function, split out from..
+	(setup_section): ..here.
+	(is_strip_section): Return true for SHT_GROUP sections that are
+	going to lose their group signature symbol.
+
+2006-09-14  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 3181
+	* objcopy.c (copy_object): Load symbols earlier.
+	(setup_section): Mark group signature symbols with BSF_KEEP.
+
+2006-09-09  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/3110
+	* objcopy.c (copy_archive): Add new parameter:
+	force_output_target.  If not true, then perserve the file formats
+	of each copied archive element, otherwise force them to be one
+	specific file format.
+	(copy_file): Compute force_output_target parameter to pass to
+	copy_archive. 
+
+2006-09-05  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/3166
+	* objcopy.c (is_strip_section): Do not treat group sections as
+	debugging sections.
+	* doc/binutils.texi (--only-keep-debug): Document that this switch
+	is only intended for use on fully linked files.
+
+2006-09-01  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/3146
+	* readelf.c (dump_relocations): Check for a NULL value in rtype
+	before using it.
+
+2006-08-21  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+	* configure.in: Split arm-pe and arm-wince-pe. Build dlltool
+	with -DDLLTOOL_ARM_WINCE for Windows CE case.
+	* configure: Regenerate.
+	* dlltool.c: Add support for arm-wince.
+
+2006-08-15  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/3039
+	* wrstabs.c (stab_tag_type): Initialize 'size'.
+
+2006-08-10  J"orn Rennecke  <joern.rennecke@st.com>
+
+	PR binutils/3017
+	* doc/Makefile.am: Use single quotes inside backquotes for
+	date command while generating config.texi.
+	* doc/Makefile.in: Regenerate.
+
+2006-08-08  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/2768
+	* dwarf.c (display_debug_aranges): When the address size is
+	greater than 4 display addresses and lengths as 16 hex digits,
+	otherwise use 8 hex digits.
+
+2006-08-06  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/3001
+	* addr2line.c (process_file): Change function from void to
+	returning an int.  Return 0 upon success, 1 otherwise.
+	(main): Use return value from process_file as the exit value.
+	* ar.c (ranlib_only):  Change function from void to returning an
+	int.  Return 0 upon success, 1 otherwise.
+	(ranlib_touch): Likewise.
+	(main): Use return value from ranlib functions as exit value.
+	* objcopy.c (add_specific_symbol): Set status to 1 if get_file_size
+	fails.
+	(copy_file): Likewise.
+	(strip_main): Likewise.
+	(copy_main): Likewise.
+	* objdump.c (display_file): Set exit_status to 1 if get_file_size
+	fails.
+	* size.c (display_file): Set return_code to 1 if get_file_size
+	fails.
+
+2006-08-02  Thiemo Seufer  <ths@mips.com>
+            Nigel Stephens  <nigel@mips.com>
+
+	* readelf.c (dump_relocations): Handle MIPS-specific
+	SHN_MIPS_SCOMMON and SHN_MIPS_SUNDEFINED. 
+	(get_symbol_index_type): Similarly.
+
+2006-07-24  Ralk Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* doc/binutils.texinfo: Fix spelling mistakes.
+
+2006-07-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* readelf.c (get_dynamic_type): Handle DT_GNU_HASH.
+	(get_section_type_name): Handle SHT_GNU_HASH.
+	(dynamic_info_DT_GNU_HASH): New variable.
+	(process_dynamic_section): Handle DT_GNU_HASH.
+	(process_symbol_table): Print also DT_GNU_HASH histogram.
+
+2006-07-06  Mohammed Adnène Trojette  <adn@diwi.org>
+
+	PR binutils/2879
+	* doc/binutils.texi (Strings): Document -T shorthand for --target
+	switch.
+	* strings.c: Update comment to include -T option.
+
+	PR binutils/2875
+	* doc/binutils.texi (readelf): Fix spelling typo.
+
+2006-06-30  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf.c (display_debug_frames): Catch a corrupt length field
+	generating an end of block address that is beyond the end of the
+	section.
+	When encountering a corrupt CIE pointer do not reset the start
+	pointer as more data still has to be read.
+	Do not warn about user defined call frame instructions.
+
+2006-06-29  DJ Delorie  <dj@redhat.com>
+
+	* readelf.c (process_section_headers): Add H8/300 support.
+
+2006-06-23  Richard Sandiford  <richard@codesourcery.com>
+
+	* objcopy.c (localize_hidden): New variable.
+	(OPTION_LOCALIZE_HIDDEN): New command_line_switch value.
+	(copy_options): Add --localize-hidden.
+	(copy_usage): Mention --localize-hidden.
+	(is_hidden_symbol): New function.
+	(filter_symbols): Handle localize_hidden.
+	(copy_object): Call filter_symbols if localize_hidden.
+	(copy_main): Handle OPTION_LOCALIZE_HIDDEN.
+	* doc/binutils.texi (--localize-hidden): Document new option.
+
+2006-06-23  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.am (ar_DEPENDENCIES, ranlib_DEPENDENCIES)
+	(dlltool_DEPENDENCIES, windres_DEPENDENCIES): Remove @LEXLIB@.
+	* Makefile.in: Regenerate.
+
+2006-06-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (*_DEPENDENCIES): Add missing dependencies.
+	* Makefile.in: Regenerate.
+
+2006-06-07  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* po/Make-in (pdf, ps): New dummy targets.
+
+2006-06-05  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* po/Make-in (top_builddir): Define.
+
+2006-06-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* config.in: Regenerate.
+
+2006-06-02  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* doc/Makefile.am (TEXI2DVI): Define.
+	* doc/Makefile.in: Regenerate.
+
+2006-05-31  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.am: Replace INTLLIBS with LIBINTL everywhere.  Add
+	DEPENDENCIES variables for every program.
+	(INTLLIBS): Remove.
+	(INCLUDES): Use @INCINTL@.
+	* acinclude.m4: Include new gettext macros.
+	* configure.in: Use ZW_GNU_GETTEXT_SISTER_DIR and AM_PO_SUBDIRS.
+	Remove local code for po/Makefile.
+	* Makefile.in, configure, doc/Makefile.in: Regenerated.
+
+2006-05-30  Nick Clifton  <nickc@redhat.com>
+
+	* po/es.po: Updated Spanish translation.
+
+2006-05-25  J"orn Rennecke <joern.rennecke@st.com>
+
+	* MAINTAINERS: Update my email address.
+
+2006-05-24  Nick Clifton  <nickc@redhat.com>
+
+	* po/fr.po: Updated French translation.
+
+2006-05-23  Nick Clifton  <nickc@redhat.com>
+
+	* po/vi.po: Updated Vietnamese translation.
+
+2006-05-22  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* po/ru.po: Updated translation.
+
+2006-05-19  Andreas Schwab  <schwab@suse.de>
+
+	* doc/Makefile.am (addr2line.1): Depend on $(binutils_TEXINFOS).
+	(ar.1): Likewise.
+	(dlltool.1): Likewise.
+	(nlmconv.1): Likewise.
+	(nm.1): Likewise.
+	(objcopy.1): Likewise.
+	(objdump.1): Likewise.
+	(ranlib.1): Likewise.
+	(readelf.1): Likewise.
+	(size.1): Likewise.
+	(strings.1): Likewise.
+	(strip.1): Likewise.
+	(windres.1): Likewise.
+	(cxxfilt.man): Likewise.
+	* doc/Makefile.in: Regenerated.
+
+2006-05-17  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* doc/binutils.texi: Use "Binutils Index" for index name.
+
+2006-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* dwarf.c (display_debug_frames): Don't return on ZERO
+	terminator.
+
+2006-05-02  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* doc/Makefile.am (AM_MAKEINFOFLAGS): New.
+	(TEXI2POD): Use AM_MAKEINFOFLAGS.
+	(config.texi): Don't set top_srcdir.
+	* doc/binutils.texi: Don't use top_srcdir.
+	* aclocal.m4, Makefile.in, doc/Makefile.in: Regenerated.
+
+2006-04-26  Julian Brown  <julian@codesourcery.com>
+
+	* readelf.c (arm_attr_tag_VFP_arch): Add VFPv3.
+
+2006-04-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2006-04-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* configure: Regenerate.
+
+2006-04-18  Nick Clifton  <nickc@redhat.com>
+
+	PR 2257
+	* readelf.c (SECTION_NAME): Cope with a missing string table.
+	(process_file_header): Cope with a corrupt e_shstrndx field.
+	(process_section_headers): Correctly handle an e_shstrndx value of
+	SHF_UNDEF.
+
+2006-04-12  Nick Clifton  <nickc@redhat.com>
+
+	* objdump.c (objdump_symbol_at_address): Fix typo in comment.
+
+2006-04-10  Ben Elliston  <bje@gnu.org>
+
+	* MAINTAINERS (CGEN Maintainers): Remove myself.
+
+2006-04-06  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* po/Make-in: Add install-html target.
+	* Makefile.am: Add install-html and install-html-recursive targets.
+	* Makefile.in: Regenerate.
+	* configure.in: AC_SUBST datarootdir, docdir and htmldir.
+	* configure: Regenerate.
+	* doc/Makefile.am: Add install-html and install-html-am targets.
+	* doc/Makefile.in: Regenerate.
+
+2006-04-05  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* addr2line.c (long_options): Add new option 'section'.
+	(usage): Document new -j/--section option.
+	(find_offset_in_section): New function.
+	(translate_addresses): Add 'section' parameter.
+	If it is non-null, call find_offset_in_section on it.
+	(process_file): Add 'section_name' parameter.
+	If it is non-null, look for the section in the BFD object.
+	Pass the section to translate_addresses.
+	(main): Handle new -j option.
+	Pass the section name to process_file.
+	* doc/binutils.texi (addr2line): Document new -j/--section option.
+
+2006-03-29  Ben Elliston  <bje@au.ibm.com>
+
+	* resbin.c: Avoid duplicating constants in calls to reswr_alloc.
+
+2006-03-20  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* BRANCHES: Remove binutils-csl-arm-2006q1-branch.  Document
+	binutils-csl-2_17-branch instead.
+
+2006-03-20  Paul Brook  <paul@codesourcery.com>
+
+	* BRANCHES: Mention binutils-csl-arm-2006q1-branch.
+
+2006-03-16  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 2434
+	* ieee.c (write_ieee_debugging_info): Adjust bfd_hash_table_init calls.
+	* wrstabs.c (write_stabs_in_sections_debugging_info): Likewise.
+
+2006-03-13  Ben Elliston  <bje@au.ibm.com>
+
+	* bucomm.c (display_target_list): Make local variable `a' to be of
+	type enum bfd_architecture.  Thus no need to cast enums to int.
+	(display_info_table): Likewise.
+
+2006-03-10  Paul Brook  <paul@codesourcery.com>
+
+	* readelf.c (decode_ARM_machine_flags):  Handle EABIv5.
+
+2006-03-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* dwarf.c (process_extended_line_op): Remove pointer_size param.
+	Use length instead to determine address size.
+	(get_pointer_size_and_offset_of_comp_unit): Delete.
+	(display_debug_lines): Adjust for above.
+	(display_debug_aranges): Don't stop on finding two zeros.
+	(display_debug_frames): For warning, print offset not pointer.
+
+2006-03-09  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* dlltool.c: Update copyright year.
+	* doc/binutils.texi: Likewise.
+
+2006-03-09  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* dlltool.c (add_stdcall_underscore): New flag.
+	(xlate): Also add underscore to stdcall symbol if
+	add_stdcall_underscore set.
+	(usage): Document --add-stdcall-underscore option.
+	(OPTION_ADD_STDCALL_UNDERSCORE): New define.
+	(long_options): Use it for --add-stdcall-underscore option.
+	(main): Handle it.
+	* doc/binutils.texi: Document --add-stdcall-underscore option
+	and differentiate from --add-underscore.
+
+2006-03-06  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* readelf.c (get_machine_flags): Adjust.
+
+2006-03-03  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf.c (frame_display_row, display_debug_frames): Handle
+	DW_CFA_val_offset, DW_CFA_val_offset_sf and DW_CFA_val_expression.
+
+2006-02-28  Nick Clifton  <nickc@redhat.com>
+
+	* objcopy.c (use_alt_mach_code): Change type to unsigned long.
+	(copy_object):  If bfd_alt_mach_code fails emit a more helpful
+	message and if the target architecture is ELF use the alternative
+	as replacement value for the e_machine number.
+	(copy_main): Use strtoul to parse the number provided with the
+	--alt-mach-code switch.
+	* doc/binutils.texi (--alt-mach-code): Document that this switch
+	can now set the absolute e_machine value.
+
+2006-02-27  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* po/Make-in: Add html target.
+
+2006-02-17  Nick Hudson  <nick.hudson@dsl.pipex.com>
+
+	* readelf.c (get_machine_flags): Add logic for missing EF_SH flags.
+
+2006-02-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* config.in: Rebuilt.
+
+2006-02-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/2258
+	* readelf.c (process_program_headers): Use
+	ELF_IS_SECTION_IN_SEGMENT_MEMORY.
+
+2006-02-09  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	* configure.in (CHECK_DECLS): Add snprintf and vsnprintf.
+	* configure: Regenerate.
+	* objdump.c (fprintf): Remove declaration.
+	* bucomm.h (fprintf): Declare if not already declared.
+	(snprintf): Likewise.
+	(vsnprintf): Likewise.
+
+2006-02-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (process_program_headers): Match PT_TLS segment
+	only with SHT_TLS sections.
+
+2006-02-07  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* readelf.c (get_machine_flags): Add logic for EF_M68K flags.
+
+2006-02-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (process_program_headers): Undo the last change.
+
+2006-02-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (process_program_headers): Undo the change made on
+	2004-09-22.  Match PT_DYNAMIC segment only with SHT_DYNAMIC
+	sections.
+
+2006-01-30  Nick Clifton  <nickc@redhat.com>
+
+	* objcopy.c (copy_object): Catch the case where an attempt is made
+	to add a section that already exists and produce a more helpful
+	warning message.
+
+2006-01-26  Nick Clifton  <nickc@redhat.com>
+
+	* po/vi.po: New Vietnamese translation.
+	* configure.in (ALL_LINGUAS): Add vi.
+	* configure: Regenerate.
+
+2006-01-18  Alexandre Oliva  <aoliva@redhat.com>
+
+	Introduce TLS descriptors for i386 and x86_64.
+	* readelf.c (get_dynamic_type): Handle DT_TLSDESC_GOT and
+	DT_TLSDESC_PLT.
+
+2006-01-18  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/1391
+	* objcopy.c (copy_object): For PE format targets set the VMA of a
+	newly created gnu_debuglink section to a non-zero, aligned,
+	contiguous value.
+	* Makefile.am (objcopy.c): Add a dependency upon libbfd.h.
+	* Makefile.in: Regenerate.
+
+2006-01-17  Andreas Schwab  <schwab@suse.de>
+
+	PR binutils/1486
+	* configure.in: Don't define DISASSEMBLER_NEEDS_RELOCS.
+	* configure: Regenerate.
+	* objdump.c (struct objdump_disasm_info): Don't check for
+	DISASSEMBLER_NEEDS_RELOCS.
+	(objdump_print_addr): Likewise.
+	(disassemble_bytes): Check disassembler_needs_relocs from
+	disassemble_info at run-time instead of DISASSEMBLER_NEEDS_RELOCS
+	at compile-time.
+	(disassemble_section): Likewise.
+	(disassemble_data): Initialize it.
+
+2006-01-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* objcopy.c (copy_object): Fix thinko.
+
+	* objcopy.c (copy_object): Set isympp and osympp to NULL after free.
+
+2006-01-09  Mike Frysinger  <vapier@gentoo.org>:
+
+	* readelf.c (guess_is_rela): Add case for Nios/Nios II.
+	(get_machine_name): Likewise.
+
+For older changes see ChangeLog-2005
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-2007 sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-2007
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-2007	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-2007	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1165 @@
+2007-12-24  Nick Clifton  <nickc@redhat.com>
+
+	* po/ru.po: Updated Russian translation.
+
+2007-12-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* doc/binutils.texi: Document the new intel-mnemonic and
+	intel-mnemonic options for i386 disassembler.
+
+2007-12-07  Bob Wilson  <bob.wilson@acm.org>
+
+	* readelf.c (is_32bit_pcrel_reloc): Add Xtensa.
+	
+2007-12-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (is_32bit_abs_reloc, is_32bit_pcrel_reloc): Add SPU.
+
+2007-11-29  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* readelf.c (get_machine_flags): Handle Loongson-2E and -2F
+	flags.
+
+2007-11-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* cxxfilt.c (demangle_it): Don't call printf without format string.
+
+2007-11-21  Hans-Peter Nilsson  <hp@axis.com>
+
+	* dwarf.c (display_debug_loc): Cast section_end - start to long
+	for output format.
+
+2007-11-20  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf.c (display_debug_loc): Issue a warning if there are bytes
+	at the end of the .debug_loc section which are not referenced by
+	any attribute in the .debug_info section.
+
+2007-11-19  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (is_32bit_abs_reloc): Add support for NIOS relocs.
+	(is_64bit_abs_reloc): Add support for HPPA relocs.
+	(is_16bit_abs_reloc): Add support for NIOS relocs.
+
+2007-11-17  Thiemo Seufer  <ths@mips.com>
+
+	* readelf.c (display_mips_gnu_attribute): Recognize -mips32r2 -mfp64
+	objects.
+
+2007-11-16  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf.c (process_extended_line_op): Add cases for HP extensions
+	to the line ops.  Mention if an unknown op code is in the user
+	defined range.
+	(decode_location_expression): Add cases for HP extensions, the
+	DW_OP_GNU_uninit extension and the DW_OP_call_frame_cfa and
+	DW_OP_bit_piece DWARF3 operators.
+	(read_and_display_attr): Correct list of attributes which can
+	reference a location list.
+	(read_and_display_attr_value): Add cases for DWARF3 values and HP
+	extensions.
+	Correct list of attributes which can reference a location list.
+	(get_AT_name): Add cases for DWARF3 values and HP and PGI
+	extensions.
+
+2007-11-07  Karl Berry  <karl@gnu.org>
+
+	* doc/binutils.texi: Update to FDL 1.2.
+	(Top): consistent punctuation in menu entries.
+	(Index): Rename from Binutils Index.
+	* doc/fdl.texi: Update from http://www.gnu.org/licenses/fdl.texi.
+
+2007-10-31  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf.c (is_relocatable): Remove definition.
+	(display_debug_frames): Remove check in is_relocatable.
+	* dwarf.h (is_relocatable): Remove declaration.
+	* objdump.c (is_relocatable): New static definition.
+	* readelf.c (dump_relocations): Make the function void.
+	(is_32bit_abs_reloc): Add support for x86, Arc, Arm, D10V, Dlx,
+	OR32 and Score.
+	(is_32bit_pcrel_reloc): Add support for x86 and Arm.
+	(is_16bit_abs_reloc): Add support for D10V.
+	(debug_apply_rela_addends): Rename to debug_apply_relocations.
+	Add code to support rel relocations.
+	(load_debug_section): Fix call to debug_apply_relocations.
+	(get_file_header): Remove setting of is_relocatable.
+
+2007-10-31  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (debug_apply_rela_addends): Clarify FIXME.
+
+2007-10-29  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (is_32bit_abs_reloc): Add knowledge of reloc used by
+	IA64.
+	(is_64bit_abs_reloc): Likewise.
+
+2007-10-28  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf.c (process_debug_info): Check for corrupt lengths.
+	* readelf.c (get_reloc_type): New function.  Returns the reloc
+	number extracted from the info field of a reloc.
+	(get_reloc_symindex): New function.  Returns the symbol index
+	extracted from the info field of a reloc.
+	(dump_relocations): Use the new functions.
+	(slurp_ia64_unwind_table): Use the new functions.
+	(slurp_hppa_unwind_table): Use the new functions.
+	(dump_section_as_bytes): Use the new functions.
+	(get_reloc_size): Delete function.
+	(is_32bit_abs_reloc): New function.  Determines if a given reloc
+	type is a 32-bit absolute relocation.
+	(is_32bit_pcrel_reloc): New function.  Like is_32bit_abs_reloc but
+	for pc-relative relocations.
+	(is_64bit_abs_reloc): New function.  Like is_32bit_abs_reloc but
+	for 64-bit absolute relocations.
+	(is_16bit_abs_reloc): New function.  Like is_32bit_abs_reloc but
+	for 32-bit absolute relocations.
+	(debug_apply_rela_addends): Use the new functions.  Skip and warn
+	about any unrecognised relocations.
+
+2007-10-26  Karl Berry  <karl@freefriends.org>
+
+	* doc/binutils.texi: Move top stuff to the top.
+	Use @direntry/@dircategory, format entries to play nicely with
+	others.
+	Avoid duplicate copying strings.
+	Don't misspell "Texinfo".
+
+2007-10-25  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* readelf.c (display_power_gnu_attribute): Add support for
+	Tag_GNU_Power_ABI_Vector.
+
+2007-10-25  Carlos Eduardo Seo  <cseo@linux.vnet.ibm.com>
+
+	* readelf.c (get_note_type): Handle NT_PPC_VMX.
+
+2007-10-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* po/POTFILES.in: Regenerate.
+
+2007-10-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* strings.c (print_strings): Don't use %L, use %ll in printf
+	format strings.
+
+2007-10-24  Tristan Gingold  <gingold@adacore.com>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (process_program_headers): Use dynamic segment unless
+	dynamic section is found.
+
+2007-10-16  Bob Wilson  <bob.wilson@acm.org>
+
+	* doc/binutils.texi (objcopy, strip): Replace hyphens with em-dashes.
+	(objdump, strip, c++filt): Correct punctuation for "e.g." and "i.e."
+	and change to spell out "for example" in two places.
+
+2007-10-16  Nick Clifton  <nickc@redhat.com>
+
+	* configure.in: Build windows tools for --enable-targets=all.
+	* configure: Regenerate.
+
+2007-10-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* objdump.c (print_line): Check fwrite return value.
+	* srconv.c (checksum, wr_tr, wr_cs): Likewise.
+	* sysdump.c (fillup): Return zero on getc or fread EOF.  Return count
+	read.
+
+2007-10-10  Jim Blandy  <jimb@codesourcery.com>
+
+	* dwarf.c (process_debug_info): Line up section offsets of
+	attribute values with those of dies.
+	(read_and_display_attr): Reduce spacing here.
+
+	* dwarf.c (display_debug_lines): Print the offset of each line
+	number program header.
+
+2007-10-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/4476
+	* readelf.c (print_dynamic_symbol): New.
+	(process_symbol_table): Handle DT_GNU_HASH for dynamic symbols.
+
+2007-10-08  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* resrc.c (read_rc_file): Rename e to edit, and c to dir.
+	Pass dir to windres_add_include_dir.  Add comments.
+	(close_input_stream): Check pclose error, and call fatal if
+	the preprocessor failed.
+	* windres.c (windres_add_include_dir): Assert that p is non-NULL,
+	and not an empty string. 
+
+2007-10-04  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/5098
+	* dlltool.c: Fix spelling typos.
+
+2007-10-03  Masaki Muranaka  <monaka@monami-software.com>
+
+	* readelf.c (dump_section_as_strings): Use %6tx instead of %6zx.
+
+2007-09-25  Thien-Thi Nguyen  <ttn@gnuvola.org>
+
+	* MAINTAINERS: Fix typo.
+
+2007-09-17  Shen Feng  <shen@cn.fujitsu.com>
+
+	* readelf.c (do_archive_index): New.
+	(options): Add -c and --archive-index option.
+	(usage): Add -c option.
+	(parse_args): Add c option parsing.
+	(process_archive): Dump archive index.
+	* NEWS: Mention the new feature.
+	* doc/binutils.texi: Document the new feature.
+
+2007-09-17  Nick Clifton  <nickc@redhat.com>
+
+	* po/es.po: Updated Spanish translation.
+
+2007-09-17  Nick Clifton  <nickc@redhat.com>
+
+	* doc/binutils.texi (objdump): Describe the output of the --syms
+	option in more detail. 
+
+2007-09-17  Alon Bar-Lev  <alon.barlev@gmail.com>
+
+	PR binutils/4987
+        * resrc.c: (read_rc_file): Move 'filename' default initialization 
+	to start of function.
+
+2007-08-31  Michael Meissner  <michael.meissner@amd.com>
+	    Dwarakanath Rajagopal  <dwarak.rajagopal@amd.com>
+
+	* NEWS: Add note about SSE5 being added on i386.
+
+2007-09-13  Alan Modra  <amodra@bigpond.net.au>
+	    Zhou Drangon <drangon.mail@gmail.com>
+
+	* nm.c (value_format_64bit, set_print_radix, print_value): Handle
+	BFD_HOST_64BIT_LONG_LONG.
+	* readelf.c (print_dec_vma): Don't define if BFD_HOST_64BIT_LONG_LONG.
+	(print_vma): Handle BFD_HOST_64BIT_LONG_LONG.
+	(dump_relocations): Likewise.  Expand _bfd_int64_low in a
+	number of places.
+
+2007-09-11  Kai Tietz  <kai.tietz@onevision.com>
+
+	* rcparse.y: (string_data): Removed ill token removal.
+
+2007-09-10  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 5011
+	* readelf.c (process_version_sections): Don't read past end of
+	various section buffers.
+
+2007-08-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am (INCLUDES): Remove -D_GNU_SOURCE.
+	* Makefile.in: Regenerated.
+
+	* sysdep.h: Include "config.h" first.
+
+2007-08-31  Nick Clifton  <nickc@redhat.com>
+
+	* po/sk.po: New Slovakian translation.
+	* configure.in (LINGUAS): Add sk.
+	* configure: Regenerate.
+
+2007-08-30  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (dump_type): New type used to classify the kinds of
+	dump requested by the user.
+	(dump_sects, cmdline_dump_sects): Use the new type.
+	(options): Add --string-dump option.
+	(request_dump): Rename to request_dump_bynumber.  Use dump_type.
+	(request_dump_byname): Use dump_type.
+	(parse_args): Parse --string-dump option.
+	(process_section_headers): Fix calls to request_dump.
+	(initialise_dumps_byname): Likewise.
+	(dump_section): Rename to dump_section_as_bytes.
+	(dump_section_as_strings): New function.  Display the contents of
+	a section as printable strings.
+	(process_section_contents): String dump the section if requested.
+	(process_object): Use dump_type.
+	(main): Likewise.
+	* Makefile.am: Add dependency for readelf.c on safe-ctype.h.
+	* Makefile.in: Regenerate.
+	* NEWS: Mention the new feature.
+	* doc/binutils.texi: Document the new feature.
+
+2007-08-30  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* bucomm.c (bfd_nonfatal_message): New.
+	* bucomm.h (bfd_nonfatal_message): Declare.
+	* objcopy.c (RETURN_NONFATAL): Take BFD not NAME, use
+	bfd_nonfatal_message.
+	(copy_unknown_object): Adjust bfd_nonfatal and RETURN_NONFATAL
+	calls, or replace with bfd_nonfatal_message calls as appropriate.
+	(copy_object, copy_archive, copy_file, setup_section,
+	copy_section, write_debugging_info): Likewise.
+
+2007-08-28  Nick Clifton  <nickc@redhat.com>
+
+	* NEWS: Mention Coverity's contribution.
+
+2007-08-25  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* readelf.c (process_note): Recognize SPU core file notes.
+
+2007-08-24  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* configure.in: Install embedspu on powerpc*-*-eabi* also.
+	* configure: Regenerated.
+
+2007-08-24  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* po/uk.po: Updated Ukrainian translation.
+
+2007-08-22  Ben Elliston  <bje@au.ibm.com>
+
+	* doc/binutils.texi (objdump): Document -Mppcps.
+
+2007-08-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* po/Make-in: Add --msgid-bugs-address to xgettext invocation.
+
+2007-08-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c: Revert last change.
+
+2007-08-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (get_segment_type): Change PT_GNU_STACK to
+	PT_GNU_ATTR.
+
+2007-08-12  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* NEWS: Add a marker for the 2.18 features.
+
+2007-08-12  Matthias Klose  <doko@ubuntu.com>
+
+	* doc/Makefile.am (AM_MAKEINFOFLAGS, TEXI2DVI): Include
+	$(top_srcdir)/../../bfd/doc.
+	* doc/Makefile.in: Regenerate.
+
+2007-08-10  M R Swami Reddy <MR.Swami.Reddy@nsc.com>
+
+	* MAINTAINERS: Add myself as CR16 support maintainer and
+	update myself as CRX support maintainer.
+
+2007-08-10  Nick Clifton  <nickc@redhat.com>
+
+	* po/fi.po: Updated Finnish translation.
+	* po/vi.po: Updated Vietnamese translation.
+
+2007-08-10  Kai Tietz  <kai.tietz@onevision.com>
+
+	* doc/binutils.texi: (windmc): Correct incorrect desciption.
+
+2007-08-04  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 4888
+	* objcopy.c (setup_section): Do modify section flags for ELF
+	STRIP_NONDEBUG (reverting part of 2007-05-30 change).  Prevent
+	header rewrite by twiddling input section flags instead.
+	Simplify code setting SHT_NOBITS.
+
+2007-07-28  Christopher Faylor  <me+binutils@cgf.cx>
+
+	* MAINTAINERS: Update my email address.
+
+2007-07-26  Adam Nemet  <anemet@caviumnetworks.com>
+
+	* readelf.c (process_archive): Also skip Irix6-style archive symbol
+	tables.
+
+2007-07-24  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (NUM_ELEM): Remove redundant macro; replace references
+	to it with references to ARRAY_SIZE.
+	Add support for CR16.
+	Fix formatting.
+
+2007-07-19  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/4802
+	* srconv.c (strip_suffix): Add const qualifier to argument.
+
+2007-07-16  Nick Clifton  <nickc@redhat.com>
+
+	* po/uk.po: New Ukrainian translation.
+	* configure.in (ALL_LINGUAS): Add 'uk'.
+	* configure: Regenerate.
+
+2007-07-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* objdump.c (dump_dwarf): Correct setting of is_relocatable.
+
+2007-07-09  Roland McGrath  <roland@redhat.com>
+
+	* readelf.c (get_gnu_elf_note_type): New function.
+	(process_note): Use it for "GNU" name.
+
+2007-07-08  Andreas Schwab  <schwab@suse.de>
+
+	* Makefile.am (HFILES): Add dwarf.h, sysdep.h and unwind-ia64.h.
+	(CFILES): Add unwind-ia64.c.
+	Regenerate dependencies.
+	* Makefile.in: Regenerate.
+
+2007-07-05  Nick Clifton  <nickc@redhat.com>
+
+	* addr2line.c: Update copyright notice to refer to GPLv3.
+	* ar.c, arlex.l, arparse.y, arsup.c, arsup.h, bin2c.c, binemul.c,
+	binemul.h, bucomm.c, bucomm.h, budbg.h, coffdump.c, coffgrok.c,
+	coffgrok.h, cxxfilt.c, debug.c, debug.h, deflex.l, defparse.y,
+	dlltool.c, dlltool.h, dllwrap.c, dwarf.c, dwarf.h, embedspu.sh,
+	emul_aix.c, emul_vanilla.c, filemode.c, ieee.c, mclex.c,
+	mcparse.y, nlmconv.c, nlmconv.h, nlmheader.y, nm.c, objcopy.c,
+	objdump.c, prdbg.c, rclex.c, rcparse.y, rdcoff.c, rddbg.c,
+	readelf.c, rename.c, resbin.c, rescoff.c, resrc.c, resres.c,
+	size.c, srconv.c, stabs.c, strings.c, sysdep.h, sysdump.c,
+	sysinfo.y, syslex.l, unwind-ia64.c, unwind-ia64.h, version.c,
+	windint.h, windmc.c, windmc.h, windres.c, windres.h, winduni.c,
+	winduni.h, wrstabs.c: Likewise.
+	* is-ranlib.c, is-strip.c, maybe-ranlib.c, maybe-strip.c,
+	not-ranlib.c, not-strip.c, ranlib.sh, sanity.sh: Add a copyright
+	notice.
+	* NEWS: Mention that the sources are now released under GPLv3.
+	Add a marker for the changes that went into v2.17.
+	* version.c (print_version): Specify that the program is released
+	under version 3 of the GPL.
+
+2007-07-05  Kai Tietz  <kai.tietz@onevision.com>
+
+	* resrc.c: (read_rc_file): Add include path of user passed rc
+	input file.
+	* windres.c: (windres_add_include_dir): New.
+	(main): Use of windres_add_include_dir.
+	* windres.h: (windres_add_include_dir): Add prototype.
+
+2007-07-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* doc/binutils.texi (size): Document --common.
+	* size.c: Make a number of vars static.  Delete unnecessary
+	function declarations.
+	(show_common, common_size): New vars.
+	(usage): Describe --common.
+	(OPTION_FORMAT, OPTION_RADIX, OPTION_TARGET): Define and use.
+	(long_options): Add common.
+	(calculate_common_size): New function.
+	(print_berkeley_format): Add common_size to bsssize.
+	(sysv_one_line): New function split out from..
+	(sysv_internal_printer): ..here.
+	(print_sysv_format): Handle display of *COM*.
+	(print_sizes): Call calculate_common_size.
+
+2007-07-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* emul_aix.c (ar_emul_aix_internal): Rename "next" to "archive_next".
+
+2007-07-02  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 4716
+	* objcopy.c (filter_symbols): Correct relocatable file test.
+
+2007-07-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* aclocal.m4: Regenerate.
+	* config.in: Regenerate.
+	* doc/Makefile.in: Regenerate.
+	* po/POTFILES.in: Regenerate.
+	* po/binutils.pot: Regenerate.
+
+2007-06-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* aclocal.m4: Regenerated.
+	* doc/Makefile.in: Likewise.
+	* Makefile.in: Likewise.
+
+2007-06-29  Joseph Myers  <joseph@codesourcery.com>
+
+	* readelf.c (display_power_gnu_attribute, process_power_specific):
+	New.
+	(process_arch_specific): Call process_power_specific.
+
+2007-06-29  Joseph Myers  <joseph@codesourcery.com>
+
+	* readelf.c (display_mips_gnu_attribute): New.
+	(process_mips_specific): Call process_attributes.
+
+2007-06-29  Joseph Myers  <joseph@codesourcery.com>
+
+	* readelf.c (display_gnu_attribute): New.
+	(process_arm_specific): Rearrange as process_attributes.
+	(process_arm_specific): Replace by wrapper of process_attributes.
+
+2007-06-28  Roland McGrath  <roland@frob.com>
+
+	* objcopy.c (setup_section): Don't reset ELF section type to
+	SHT_NOBITS when it is SHT_NOTE.
+	* doc/binutils.texi (objcopy, strip): Mention under --only-keep-debug.
+
+2007-06-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* ar.c: Rename uses of bfd.next to bfd.archive_next throughout.
+	* arsup.c: Likewise.
+	* binemul.c: Likewise.
+	* objcopy.c: Likewise.
+	* dlltool.c: Likewise.
+
+2007-06-26  Shantonu Sen  <ssen@apple.com>
+
+	PR binutils/4693
+	* Makefile.am (windres_DEPENDENCIES, windmc_DEPENDENCIES): Move
+	dependency on $(LIBICONV) to ...
+	(windres_LDADD, windmc_LDADD) ... here.
+	* Makefile.in: Regenerate.
+
+2007-06-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* embedspu.sh (relas): Correct sh_info parsing.
+
+2007-06-19  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* objdump.c: Include sys/stat.h.
+
+2007-06-19  Kai Tietz  <kai.tietz@onevision.com>
+
+	* Makefile.am: Add windmc tool.
+	* Makefile.in: Regenerate.
+	* configure.in: Add windmc tool.
+	* configure: Regenerate.
+	* mclex.c: New.
+	* mcparse.y: New.
+	* windmc.c: New.
+	* windmc.h: New.
+	* doc/Makefile.am: Add windmc tool.
+	* doc/Makefile.in: Regenerate.
+	* doc/binutils.texi: Add windmc documentation.
+	* NEWS: Mention new tool.
+
+2007-06-18  Andi Kleen  <ak@suse.de>
+
+	* objdump.c: Include sys/mman.h
+	(print_file_list): Remove f, add map, mapsize, linemap, maxline,
+	last_line, first fields.
+	(slurp_file): Add.
+	(index_file): Add.
+	(print_file_open): Call slurp_file and index_file. Initialize new
+	fields.
+	(skip_to_line): Rename to print_line and write only single line.
+	(dump_line): Add.
+	(show_line): Change to new algorithm.
+
+2007-06-18  Thomas Weidenmueller  <w3seek@reactos.org>
+
+	* resres.c (probe_binary): Fix test for badly formatted headers.
+
+2007-06-18  Kai Tietz  <Kai.Tietz@onevision.com>
+
+	* rclex.c: (cpp_line): Add code_page pragma support.
+	* windres.c: (usage, long_options, main): Add new option
+	--codepage or -c.
+	* winduni.c: (wind_default_codepage, wind_current_codepage): New.
+	(unicode_from_ascii, ascii_from_unicode): Use
+	wind_current_codepage as codepage parameter.
+	(unicode_print): Print 4 characters for hexadecimal values in
+	unicode strings.
+	* winduni.h:  (wind_default_codepage, wind_current_codepage):
+	Export.
+	* doc/binutils.texi: Document new option.
+	* NEWS: Mention new features of windres.
+
+2007-06-18  Brian D. Watt  <bwatt@us.ibm.com>
+
+	* embedspu.sh: Parse _SPUEAR_ symbol values as hex.
+
+2007-06-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am (ACLOCAL_AMFLAGS): Add -I ../config -I ../bfd.
+
+	* acinclude.m4: Removed.
+
+	* Makefile.in: Regenerated.
+	* aclocal.m4: Likewise.
+	* configure: Likewise.
+
+2007-06-11  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* dwarf.c (decode_location_expression): Add DW_OP_form_tls_address.
+
+2007-06-06  Kai Tietz  <Kai.Tietz@onevision.com>
+
+	PR binutils/4356 binutils/591
+	* resrc.c (filename_need_quotes): New function.
+	(look_for_default): If filename_need_quotes is true then quote the
+	filename in the command line being created.
+	(read_rc_file): Likewise.
+
+2007-06-06  Ben Elliston  <bje@au.ibm.com>
+
+	* doc/binutils.texi (objdump): Fix capitalisation of "PowerPC".
+
+2007-06-05  Kai Tietz  <Kai.Tietz@onevision.com>
+
+	* Makefile.am: Add LIBICONV to windres.
+	* acinclude.m4: Added missing "lib-*.m4" and "lt*.m4" files.
+	* configure.in: Add AC_CHECK_HEADER for iconv.h and use AM_ICONV.
+	* config.in: Add ICONV defines.
+	* aclocal.m4: Regenerate.
+	* confugure: Regenerate.
+	* winduni.c: (local_iconv_map codepages, wind_language_t,
+	languages, unicode_is_valid_codepage, wind_find_language_by_id,
+	wind_find_language_by_codepage, wind_find_codepage_info,
+	unicode_from_codepage, codepage_from_unicode, iconv_onechar,
+	wind_iconv_cp, wind_MultiByteToWideChar wind_WideCharToMultiByte):
+	New.
+	(ascii_from_unicode): Use codepage_from_unicode.
+	(ascii_from_unicode): Use unicode_from_codepage.
+	Use for cygwin windows API for unicode transformation.
+	* winduni.h: (CP_ACP, CP_UTF7, CP_UTF8, CP_OEM, CP_UTF16): New
+	macros.
+	(wind_language_t, local_iconv_map): New types.
+	(wind_find_language_by_id, wind_find_language_by_codepage,
+	unicode_is_valid_codepage, wind_find_codepage_info,
+	unicode_from_codepage, codepage_from_unicode): New
+	prototypes.
+
+2007-06-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* embedspu.sh: Handle R_SPU_PPU* relocs with no symbol.
+
+2007-05-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* objcopy.c (copy_object): Revert 2007-05-11 change.  Don't
+	avoid calling bfd_copy_private_bfd_data for ELF STRIP_NONDEBUG.
+	(setup_section): Don't modify flags, and don't avoid calling
+	bfd_copy_private_section_data for ELF STRIP_NONDEBUG.
+	* readelf.c (process_program_headers): Ignore .dynamic of type
+	SHT_NOBITS.
+
+2007-05-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* embedspu.sh: Emit SPU ELF image to .data.rel.ro.speelf if
+	pic or pie and image needs relocs.
+
+2007-05-24  Steve Ellcey  <sje@cup.hp.com>
+
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+	* aclocal.m4: Regenerate.
+	* doc/Makefile.in: Regenerate.
+
+2007-05-24  Kai Tietz  <Kai.Tietz@onevision.com>
+
+	* rcparse.y: Join strings for elements having no side-effects in
+	"rc"-grammar.
+
+2007-05-23  Kai Tietz  <Kai.Tietz@onevision.com>
+
+	* rclex.c: New file replacing rclex.l.
+	* rclex.l: Removed.
+	* windint.h: New file holding common structure and type
+	definitions.
+	* Makefile.am: Added new header windint.h and exchanged rclex.l by
+	rclex.c.
+	* Makefile.in: Regenerate.
+	* rcparse.y: Renamed some structures.
+	Use in internal representation always bfd_vma instead of long or
+	int.
+	Removed from %union unused stringtable.
+	Added to %union suni structure for unicode strings.
+	Added new tokens for ANICURSOR, ANIICON, DLGINCLUDE,
+	DLGINIT, FONTDIR, HTML, MANIFEST, PLUGPLAY, VXD,
+	TOOLBAR, BUTTON, QUOTEDUNISTRING, and SIZEDUNISTRING.
+	Added support for these new rc file tokens.
+	* resbin.c: Rewrote using bfd and binary structures, and support
+	new resource types.
+	* rescoff.c: Likewise.
+	* resres.c: Likewise.
+	* resrc.c: Likewise. Dumps as RC are now recompilable.
+	* windres.c: As above. Using bfd for res and provide target
+	specific endianess support.
+	* windres.h: Use windint.h as include. Additionally removed K&R
+	syntax.
+	* winduni.c: New printing and unichar support routines.
+	* winduni.h: Prototypes for new unichar helpers.
+	* windint.h: New file.
+
+2007-05-22  Paul Brook  <paul@codesourcery.com>
+
+	* objdump.c (find_symbol_for_address): Merge section and target
+	specific filtering code.
+
+2007-05-22  Nick Clifton  <nickc@redhat.com>
+
+	* doc/binutils.texi: Use @copying around the copyright notice.
+
+2007-05-21  Richard Sandiford  <richard@codesourcery.com>
+
+	* objdump.c (disassemble_bytes): Ignore disassembler_needs_relocs
+	for executables and shared libraries.
+
+2007-05-18  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* objcopy.c (strip_main): Detect identical input and output file
+	names.
+	(copy_main): Refactor tempname detection and use.
+
+2007-05-17  Nick Clifton  <nickc@redhat.com>
+
+	* objdump.c (load_debug_section): Select bias for DWARF debug
+	addresses based on the flavour of the bfd.
+
+2007-05-11  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 4479
+	* objcopy.c (copy_object): Don't copy ELF program headers for
+	--only-keep-debug.
+
+2007-05-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* embedspu.sh (find_prog): Prefer prog in same dir as embedspu
+	over one found on the users path.
+	(main): Generate .reloc for each R_SPU_PPU* reloc.
+
+2007-04-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* prdbg.c (tg_variable): Adjust for changed demangler.
+	(tg_start_function): Likewise.
+
+2007-04-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* bucumm.h: Split off host dependencies to..
+	* sysdep.h: ..here.
+	Many files: Include sysdep.h.  Remove duplicate headers and reorder.
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2007-04-24  Nick Clifton  <nickc@redhat.com>
+
+	* srconv.c (walk_tree_type_1): Initialise dpt.dunno.
+
+2007-04-24  Nathan Froyd  <froydnj@codesourcery.com>
+	    Phil Edwards  <phil@codesourcery.com>
+
+	* objcopy.c (filter_symbols): Explicitly stripping a symbol
+	used in relocations is an error.
+	Retype 'keep' to bfd_boolean.
+
+2007-04-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+	* doc/Makefile.in: Regenerate.
+
+2007-04-20  Nathan Froyd  <froydnj@codesourcery.com>
+	    Phil Edwards  <phil@codesourcery.com>
+	    Thomas de Lellis <tdel@windriver.com>
+
+	* objcopy.c (reverse_bytes):  New variable.
+	(command_line_switch, copy_main):  Add OPTION_REVERSE_ENDIAN.
+	(copy_options, copy_usage):  Add "reverse-bytes" entry.
+	(copy_section):  Reverse bytes within output sections.
+	* doc/binutils.texi:  Document new objcopy option.
+
+2007-04-20  Nick Clifton  <nickc@redhat.com>
+
+	* rclex.l: Allow underscores at the start of identifiers.
+
+2007-04-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* budemang.c: Delete.
+	* budemang.h: Delete.
+	* addr2line.c (translate_addresses): Call bfd_demangle rather than
+	demangle.
+	* nm.c (print_symname): Likewise.
+	* objdump.c (objdump_print_symname, dump_symbols): Likewise.
+	(dump_bfd): Likewise.
+	* prdbg.c (struct pr_handle <demangler>): Add int param.
+	(tg_variable, tg_start_function): Adjust demangler calls.
+	* Makefile.am: Remove mention of budemang.[ch].  Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* po/POTFILES.in: Regenerate.
+
+2007-04-14  Steve Ellcey  <sje@cup.hp.com>
+
+	* Makefile.am: Add ACLOCAL_AMFLAGS.
+	* configure.in: Change macro call order.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2007-04-13  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* Makefile.am (TOOL_PROGS): Add objcopy.
+	* Makefile.in: Rebuilt.
+
+2007-04-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/4348
+	* objcopy.c (copy_object): Don't stop when there are no
+	sections to be copied.
+
+2007-04-10  Vladimir Prus  <vladimir@codesourcery.com>
+
+	* NEWS: Mention disjoint histograms support in
+	gprof.
+
+2007-04-09  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* dwarf.c (process_debug_info): Do not require DW_AT_frame_base for
+	DW_TAG_inlined_subroutine.
+
+2007-04-06  Matt Thomas  <matt@netbsd.org>
+
+	* MAINTAINERS: Add myself as VAX and NetBSD support maintainer.
+
+2007-04-05  Alan Modra  <amodra@bigpond.net.au>
+
+	PR binutils/4292
+	* nm.c (print_value): Cast bfd_vma to unsigned long to suit
+	value_format_32bit.
+
+2007-04-02  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/4292
+	* nm.c (value_format): Replace with value_format_32bit and
+	value_format_64bit.
+	(set_radix): Update setting of value_format.
+	(set_print_width): New function.  Compute the address size of a
+	given bfd and set the print_width global appropriately.
+	(display_archive): Use set_print_width.
+	(display_file): Likewise,
+	(print_object_filename_sysv): Update use of print_width.
+	(print_archive_member_sysv): Likewise.
+	(print_symbol_filename_posix): Likewise.
+	(print_sumbol_info_bfd, print_symbol_info_sysv): Likewise.
+
+2007-03-28  Richard Sandiford  <richard@codesourcery.com>
+	    Phil Edwards  <phil@codesourcery.com>
+
+	* doc/binutils.texi: Put the contents after the title page rather
+	than at the end of the document.
+
+2007-03-28  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (slurp_rela_relocs): Add newline to end of error
+	messages.
+	(slurp_rel_relocs, request_dump, request_dump_byname,
+	process_program_headers, process_dynamic_section,
+	process_symbol_table, process_mips_specific, main): Likewise.
+
+2007-03-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* MAINTAINERS: Update mailing list addresses.  Add myself
+	as PPC maintainer.
+
+2007-03-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* embedspu.sh: Correct toe_addr quoting.
+
+2007-03-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* embedspu.sh: Combine "_EAR_" and "_EAR_*" patterns.  Tighten
+	.toe section and .toe address checks.  Use .reloc for _EAR*
+	symbols defined in non-BSS sections.  Build table for _SPUEAR_
+	symbols.
+
+2007-03-23  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	PR gas/3811
+	* readelf.c (debug_apply_rela_addends): Do nothing for SH.
+
+2007-03-22  Joseph Myers  <joseph@codesourcery.com>
+
+	* doc/binutils.texi: Include VERSION_PACKAGE when reporting
+	version.
+
+2007-03-16  Kai Tietz  <Kai.Tietz@onevision.com>
+
+	* dlltool.c (make_one_lib_file): Use pc-relative relocation
+	instead of an absolute relocation for x86_64-pc-mingw32 target.
+
+2007-03-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am (REPORT_BUGS_TO): Removed.
+	(INCLUDES): Remove -DREPORT_BUGS_TO.
+	* Makefile.in: Regenerated.
+
+	* bucomm.c: Don't include bfdver.h.
+	* objdump.c: Likewise.
+	* version.c: Likewise.
+
+	* bucomm.h: Include bfdver.h.
+
+	* configure.in (--with-bugurl): Removed.
+	* configure: Regenerated.
+
+	* doc/Makefile.am (binutils_TEXINFOS): Removed.
+	(AM_MAKEINFOFLAGS): Add -I ../../bfd/doc.
+	(TEXI2DVI): Likewise.
+	(config.texi): Removed.
+	(MOSTLYCLEANFILES): Remove config.texi.
+	* doc/Makefile.in: Regenerated.
+
+	* doc/binutils.texi: Include bfdver.texi instead of
+	config.texi.
+
+2007-03-13  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (dump_section): Also test for SHT_REL sections when
+	producing the warning about unapplied relocs.
+
+2007-03-07  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.in (REPORT_BUGS_TEXI): Define to Texinfo version of
+	bug-reporting URL.
+	* doc/Makefile.am (config.texi): Define BUGURL.
+	* doc/binutils.texi: Use BUGURL.  Remove text about large files
+	and uuencoding.
+	* Makefile.in, configure, doc/Makefile.in: Regenerate.
+
+2007-03-01  Phil Edwards  <phil@codesourcery.com>
+	    Richard Sandiford  <richard@codesourcery.com>
+
+	* NEWS: Mention addition of --extract-symbol.
+	* doc/binutils.texi: Document it.
+	* objcopy.c (extract_symbol): New variable.
+	(OPTION_EXTRACT_SYMBOLS): New command_line_switch.
+	(copy_options): Add an entry for --extract-symbol.
+	(copy_usage): Mention --extract-symbol.
+	(copy_object): Set the start address to zero for --extract-symbol.
+	Do not copy private BFD data in that case.
+	(setup_section): Set the size, LMA and VMA to zero for
+	--extract-symbol.  Do not copy private BFD data in that case.
+	(copy_section): Do not copy section contents if --extract-symbol
+	is passed.
+	(copy_main): Set extract_symbol to TRUE if --extract-symbol
+	is passed.
+
+2007-03-01  Paul Brook  <paul@codesourcery.com>
+
+	* MAINTAINERS: Update my entry.
+
+2007-03-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* version.c: Update copyright date.
+
+2007-03-01  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.am (install-exec-local): Depend on $(noinst_PROGRAMS).
+	Adjust $(EXEEXT) handling for $(RENAMED_PROGS).
+	* Makefile.in, doc/Makefile.in: Regenerate.
+
+2007-03-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* embedspu.sh: Set type and size of global program handle symbol.
+
+2007-02-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (PROGS): Delete.
+	(RENAMED_PROGS): Define.  Extracted from..
+	(noinst_PROGRAMS): ..here.  Add BUILD_MISC.
+	(install-exec-local): Adjust.
+	* Makefile.in: Regenerate.
+
+2007-02-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (PROGS): Add BUILD_INSTALL_MISC.
+	(bin_PROGRAMS): Replace BUILD_MISC with BUILD_INSTALL_MISC.
+	(EXTRA_PROGRAMS): Remove bin2c.
+	(bin2c$(EXEEXT_FOR_BUILD)): New rule.
+	(bin2c_SOURCES): Delete.
+	(DISTCLEANFILES): Remove sysinfo.
+	(MOSTLYCLEANFILES): Add sysinfo$(EXEEXT_FOR_BUILD) and
+	bin2c$(EXEEXT_FOR_BUILD).
+	* configure.in (BUILD_MISC): Add $(EXEEXT_FOR_BUILD) to bin2c.
+	Move embedspu to..
+	(BUILD_INSTALL_MISC): ..here.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2007-02-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* bin2c.c: New file.
+	* Makefile.am (EXTRA_PROGRAMS): Add bin2c.
+	(CFILES): Add bin2c.c.
+	(bin2c_SOURCES): Define.
+	(bin2c.o): Dependencies from "make dep-am".
+	* configure.in (BUILD_MISC): Add bin2c.
+	* version.c: Update year.
+	* po/POTFILES.in: Regenerate.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2007-02-17  Mark Mitchell  <mark@codesourcery.com>
+	    Nathan Sidwell  <nathan@codesourcery.com>
+	    Vladimir Prus  <vladimir@codesourcery.com
+	    Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.in (--with-bugurl): New option.
+	* configure: Regenerate.
+	* Makefile.am (REPORT_BUGS_TO): Define.
+	(INCLUDES): Define REPORT_BUGS_TO.
+	Regenerate dependencies.
+	* Makefile.in: Regenerate.
+	* doc/Makefile.in: Regenerate.
+	* bucomm.h: Remove include of bin-bugs.h.
+	* addr2line.c (usage): Don't print empty REPORT_BUGS_TO.
+	* ar.c (usage): Pass s to list_supported_targets.  Don't print
+	empty REPORT_BUGS_TO.
+	* coffdump.c (show_usage): Don't print empty REPORT_BUGS_TO.
+	* cxxfilt.c (usage): Print bug url when giving help.
+	* dlltool.c (usage): Likewise.
+	* dllwrap.c (usage): Likewise.
+	* nlmconv.c (show_usage): Don't print empty REPORT_BUGS_TO.
+	* nm.c (usage): Likewise.
+	* objcopy.c (copy_usage, strip_usage): Likewise.
+	* objdump.c (usage): Likewise.
+	* readelf.c ((usage): Likewise. Add STREAM argument.  Adjust
+	callers.
+	* size.c (usage): Don't print empty REPORT_BUGS_TO.
+	* srconv.c (show_usage): Likewise.
+	* strings.c (usage): Likewise.
+	* sysdymp.c (show_usage): Likewise.
+	* windres.c (usage): Likewise.
+
+2007-02-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* embedspu.sh: Add -W to readelf invocation.
+
+2007-02-06  Dave Brolley  <brolley@redhat.com>
+
+	* MAINTAINERS: Add myself as the maintainer of the MeP port.
+
+2007-02-06  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/3800
+	* readelf.c: Include elf/h8.h twice.  The first time in order to
+	get the reloc numbers, the second time in order to get the reloc
+	decoder function.
+	(dump_section): Tell the user if the section being displayed has
+	unprocessed relocs associated with it.
+	(get_reloc_size): New function - returns the size of a reloc.
+	(debug_apply_rela_addends): Use get_reloc_size().
+	* dwarf.c (read_and_display_attr_value): Extend number of
+	languages known for the DW_AT_language attribute.
+	(process_debug_info): Display the attribute offset before decoding
+	the attribute, in case there are problems.
+
+2007-02-05  Dave Brolley  <brolley@redhat.com>
+
+	* readelf.c (dump_relocations): Don't check for
+	(rtype == NULL && type == R_RELC).
+
+2007-02-05  Dave Brolley  <brolley@redhat.com>
+
+	* Makefile.am (readelf.o): Depends on $(INCDIR)/elf/mep.h.
+	* Makefile.in: Regenerated.
+	* Contribute the following changes:
+	2003-10-29  Dave Brolley  <brolley@redhat.com>
+
+	* configure.in: Define SKIP_ZEROES and SKIP_ZEROES_AT_END for mep.
+	* configure: Regenerated.
+
+	2001-04-03  Ben Elliston  <bje@redhat.com>
+
+	* readelf.c: Include "elf/mep.h".
+	(guess_is_rela): Handle EM_CYGNUS_MEP.
+	(get_machine_name): Ditto.
+	(dump_relocations): Ditto.
+
+2007-02-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* MAINTAINERS: Add a space between H.J. and Lu.
+
+2007-02-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* doc/binutils.texi (objdump): Document the new addr64 option
+	for i386 disassembler.
+
+2007-02-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/3945
+	* configure.in (DLLTOOL_DEFAULT): New. Defined for the first PE
+	target.
+	(DLLTOOL_DEFS): Add $DLLTOOL_DEFAULT.
+	* configure: Regenerated.
+
+	* dlltool.c (mname): Defined with DLLTOOL_DEFAULT_XXX.
+
+2007-02-02  Nick Clifton  <nickc@redhat.com>
+
+	* doc/binutils.texi (objdump): Document support for disassembling
+	the 440 PowerPC architecture.
+
+2007-01-31  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* dwarf.c (process_debug_info): Protect against bogus length and
+	abbrev offsets.
+
+2007-01-25  Kazu Hirata  <kazu@codesourcery.com>
+
+	* ar.c (print_contents, extract_file): Cast the return value
+	of fwrite to size_t.
+
+2007-01-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* ar.c (open_inarch): Check fwrite return.  Use size_t.
+	(extract_file): Likewise.  Remove test for "negative" file size.
+	* readelf.c (process_program_headers): Check fscanf return.
+
+2007-01-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bucomm.c (template_in_dir): Fix typo.
+
+2007-01-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* embedspu.sh: New file.
+	* Makefile.am (embedspu): Add rule.
+	* configure.in (BUILD_MISC): Add embedspu for powerpc-linux.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2007-01-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* bucomm.h (make_tempdir): Declare independently of HAVE_MKDTEMP.
+	* bucomm.c (template_in_dir): New function, split out from..
+	(make_tempname): ..here.  Open the file with O_EXCL if !HAVE_MKSTEMP.
+	(make_tempdir): Use template_in_dir.  Handle directory creation
+	when !HAVE_MKDTEMP.
+	* objcopy.c (MKDIR): Don't define.
+	(copy_archive): Use make_tempdir when !HAVE_MKDTEMP too.  Fix
+	error message.
+
+2007-01-08  Kazu Hirata  <kazu@codesourcery.com>
+
+	* readelf.c (get_machine_flags): Treat Fido as an architecture
+	by itself.
+
+2007-01-08  Kai Tietz	<kai.tietz@onevision.com>
+
+	* configure.in: Renamed target x86_64-*-mingw64 to
+	x86_64-*-mingw*.
+	* configure: Regenerated.
+
+2007-01-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (dump_section): Don't print 32-bit values, which
+	were done incorrectly for little-endian.  Instead print bytes.
+
+For older changes see ChangeLog-2006
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-2008 sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-2008
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-2008	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-2008	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,874 @@
+2008-12-23  Jon Beniston <jon@beniston.com>
+
+	* MAINTAINERS: Added Jon Beniston as maintainer for LM32 port.
+	* readelf.c: Add support for LM32 machine number.
+
+2008-12-23  Kai Tietz  <kai.tietz@onevision.com>
+
+	* rcparse.y (rcdata_data): Allow empty comma elements.
+
+2008-12-23  Nick Clifton  <nickc@redhat.com>
+
+	* objdump.c (dump_reloc_set): Remove STT_IFUNC support.
+	* readelf.c (dump_relocations): Likewise.
+	(get_symbol_type): Likewise.
+	* doc/binutils.texi: Likewise.
+
+2008-12-18  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure: Regenerate.
+
+2008-12-09  Tom Tromey  <tromey@redhat.com>
+
+	* srconv.c (wr_hd): Add parens to placate gcc 4.4.
+
+2008-12-09  Andrew Stubbs  <ams@codesourcery.com>
+
+	* readelf.c (arm_attr_tag_CPU_arch): Add "v6-M" and "v6S-M".
+	(arm_attr_tag_WMMX_arch): Add "WMMXv2".
+	(arm_attr_tag_NEON_arch): Rename to ...
+	(arm_attr_tag_Advanced_SIMD_arch): ... official name.
+	(arm_attr_tag_ABI_PCS_config): Rename to ...
+	(arm_attr_tag_PCS_config): ... official name.
+	(arm_attr_tag_ABI_PCS_RO_DATA): Rename to ...
+	(arm_attr_tag_ABI_PCS_RO_data): ... official name.
+	(arm_attr_tag_ABI_FP_denormal): Add "Sign only".
+	(arm_attr_tag_CPU_unaligned_access): New array.
+	(arm_attr_tag_T2EE_use): New array.
+	(arm_attr_tag_Virtualization_use): New array.
+	(arm_attr_tag_MPextension_use): New array.
+	(arm_attr_publ): NEON_arch -> Advanced_SIMD_arch.
+	ABI_PCS_config -> PCS_config.
+	ABI_PCS_RO_DATA -> ABI_PCS_RO_data.
+	Add CPU_unaligned_access, nodefaults, also_compatible_with,
+	T2EE_use, conformance, Virtualization_use and MPextension_use.
+	(display_arm_attribute): Handle Tag_nodefaults and
+	Tag_also_compatible_with.
+
+2008-12-04  Ben Elliston  <bje@au.ibm.com>
+
+	* doc/binutils.texi (objdump): Update booke documentation.
+	* NEWS: Document user-visible changes to command line options.
+
+2008-12-04  Nick Clifton  <nickc@redhat.com>
+
+	* objdump.c (dump_reloc_set): Append "()" to symbol names which
+	have the BSF_INDIRECT_FUNCTION type.
+	* readelf.c (print_symbol): Fix handling of negative widths.
+	(dump_relocations): Append "()" to symbol names which have the
+	STT_IFUNC type. Display negative offsets as a positive number with
+	a "-" prefix.
+	(get_symbol_type): Return "IFUNC" for STT_IFUNC symbols.
+	* doc/binutils.texi: Document 'i' symbol type.
+
+2008-11-26  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* strings.c (main): New variable `s'.  Have string_min parsing
+	call fatal for invalid input strings.
+
+2008-11-25  Nick Clifton  <nickc@redhat.com>
+
+	PR7044
+	* dlltool.c (run): Use formatting string to avoid compile time
+	warning.
+	(gen_exp_file): Check return value from fread.
+	* windmc.c (main): Check return value from fread.
+
+2008-11-21 Sterling Augustine <sterling@tensilica.com>
+
+	* MAINTAINERS: Take over from Bob Wilson as Xtensa maintainer.
+
+2008-11-19  Nick Clifton  <nickc@redhat.com>
+
+	* doc/fdl.texi: Update to v1.3
+	* doc/binutils.texinfo: Change license to v1.3.
+
+2008-11-18  Catherine Moore  <clm@codesourcery.com>
+
+	* readelf.c (arm_attr_tag_ABI_FP_16bit_format): New.
+	(arm_attr_tag_VFP_HP_extension): New.
+	(arm_attr_public_tag arm_attr_public_tags): Support
+	new attributes. 
+
+2008-11-17  Nick Clifton  <nickc@redhat.com>
+
+	* version.c (print_version): Update copyright year.
+
+2008-11-16  Danny Smith  <dannysmith@usesr.sourceforge.net>
+
+	* dlltool.c (identify_search_section): Cast argument, not return
+	value, of xstrdup to 'char*'.
+
+2008-11-15  Charles Wilson  <cygwin@cwilson.fastmail.fm>
+
+	Added --identify option to dlltool.
+	* binutils/dlltool.c: Add new global variables
+	identify_imp_name and identify_dll_name.
+	(identify_dll_for_implib, identify_search_archive,
+	identify_search_member, identify_process_section_p,
+	identify_search_section): New functions.
+	(usage): Added --identify.
+	(long_options): Added --identify.
+	(main): Handle --identify option.
+	* binutils/doc/binutils.texi: Document --identify.
+
+2008-11-14  Tristan Gingold  <gingold@adacore.com>
+
+	Remove outdated mach-o specific tests.
+	* objdump.c (load_debug_section): Remove mach-o specific test.
+	(mach_o_uncompressed_dwarf_sections): Removed.
+	(mach_o_compressed_dwarf_sections): Removed.
+	(generic_uncompressed_dwarf_sections): Removed.
+	(generic_compressed_dwarf_sections): Removed.
+	(check_mach_o_dwarf): Removed.
+	(dump_dwarf): Remove call to check_mach_o_dwarf.
+
+2008-11-14  Tristan Gingold  <gingold@adacore.com>
+
+	* configure.com: Get version from configure.in of bfd.
+	* makefile.vms-in (DEBUG_OBJS): Add dwarf.obj.
+	(CFLAGS): Update flags.
+
+2008-11-13  Hans-Peter Nilsson  <hp@axis.com>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* nm.c (filter_symbols): Only call memcpy when from != to.
+
+2008-11-10  Tristan Gingold  <gingold@adacore.com>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* objdump.c (disassemble_bytes): Don't skip leading zeros when
+	end of section calculation overflows.
+
+2008-11-07  Prafulla Thakare  <prafulla.thakare@kpitcummins.com>
+
+	* MAINTAINERS: Take over from Anil Paranjpe as H8300 maintainer.
+
+2008-10-31  Alan Modra  <amodra@bigpond.net.au>
+
+	* po/id.po: New file.
+	* configure.in (ALL_LINGUAS): Add id.
+	* configure: Regenerate.
+
+2008-10-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* windmc.c (res_alloc): Remove unnecessary cast.
+	* windres.c (res_alloc, reswr_alloc): Likewise.
+
+2008-10-20  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c: Tidy up code formatting.
+
+2008-10-10  Nathan Froyd  <froydnj@codesourcery.com>
+
+	* readelf.c (display_power_gnu_attribute): Decode
+	Tag_GNU_Power_ABI_Struct_Return.
+
+2008-10-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* embedspu.sh: Pass -Wa,-noexecstack to $CC.
+
+2008-10-09  Kai Tietz  <kai.tietz@onevision.com>
+
+	* dlltool.c (PAGE_SIZE): Make sure it has bfd_vma type.
+	(PAGE_MASK): Likewise.
+	(sfunc): Change to address size of bfd_vma for base-file.
+	(flush_page): Likewise.
+	(gen_exp_file): Likewise.
+
+2008-10-07  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* readelf.c (process_section_headers): Do not cut the section names and
+	types if running with --wide.
+
+2008-10-06  Tom Tromey  <tromey@redhat.com>
+
+	* dwarf.c (display_debug_frames): Change text for uniformity.
+	(process_debug_info): Likewise.
+	(display_debug_aranges): Likewise.  Indent address output.
+	(display_debug_pubnames): Print offset in hex.
+
+2008-10-02  Andrew Paprocki  <andrew@ishiboo.com>
+
+	PR 6934
+	* stabs.c (parse_stab_string): Parse and ignore =Y<name> strings
+	generated by the SUNPro C++ compiler.
+
+2008-09-30  Andrew Paprocki  <andrew@ishiboo.com>
+
+	PR 6922
+	* stabs.c (parse_stab_sun_builtin_type): Parse, but ignore SUN's
+	'b' and 'v' extensions.
+
+2008-09-29  Peter O'Gorman  <pogma@thewrittenword.com>
+	    Steve Ellcey  <sje@cup.hp.com>
+
+	* configure: Regenerate for new libtool.
+	* aclocal.m4: Ditto.
+	* Makefile.in: Ditto.
+	* doc/Makefile.in: Ditto.
+
+2008-09-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* objcopy.c (setup_section): Set elf_group_id.
+
+2008-09-24  Richard Henderson  <rth@redhat.com>
+
+	* dwarf.c (size_of_encoded_value, get_encoded_value): Move up.
+	(decode_location_expression): Add section parameter.  Handle
+	DW_OP_GNU_encoded_addr.
+	(read_and_display_attr_value): Update decode_location_expression call.
+	(display_debug_loc, display_debug_frames): Likewise.
+
+2008-09-25  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 6913
+	* dwarf.c (print_dwarf_vma): Don't call printf without format string.
+
+2008-09-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Suppress warnings on NONE relocations to discarded sections.
+	* readelf.c (is_none_reloc): New function.
+	(debug_apply_relocations): Ignore is_none_reloc() relocations.
+
+2008-09-11  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Fix loading large elf64 binaries on 32bit hosts.
+	* configure.in: Call AC_SYS_LARGEFILE.
+	* config.in: Regenerate.
+	* configure: Regenerate.
+
+2008-09-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* po/sv.po: Update.
+
+2008-09-08  Tristan Gingold  <gingold@adacore.com>
+
+	* BRANCHES: Add 2.18 and 2.19 release branches.
+
+2008-09-08  Tristan Gingold  <gingold@adacore.com>
+
+	* NEWS: Add a marker for the 2.19 features.
+
+2008-09-05  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* readelf.c (load_specific_debug_section): New function, from
+	load_debug_section.
+	(load_debug_section): Use load_specific_debug_section.
+	(display_debug_section): Use load_specific_debug_section.  Check for
+	multiple sections with the same name.
+
+2008-08-28  Tristan Gingold  <gingold@adacore.com>
+
+	* objdump.c (dump_stabs): Add sections for Darwin.
+
+2008-08-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* sysdep.h: Include "binary-io.h".
+	(O_BINARY): Don't define here.
+	* bin2c.c (O_BINARY, O_TEXT, SET_BINARY): Don't define here.
+	* strings.c: Likewise.
+	(main): Remove #ifdef SET_BINARY.
+	* Makefile.am: Run "make dep-am"
+	* Makefile.in: Regenerate.
+
+2008-08-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* configure.in: Update a number of obsolete autoconf macros.
+	* configure: Regenerate.
+	* aclocal.m4: Regenerate.
+
+2008-08-21  Richard Henderson  <rth@redhat.com>
+
+	* readelf.c (is_32bit_pcrel_reloc): Fix hppa entry.
+	(is_64bit_pcrel_reloc): New.
+	(debug_apply_relocations): Use it.  Handle hppa pcrel bias.
+
+2008-08-15  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 6526
+	* configure.in: Invoke AC_USE_SYSTEM_EXTENSIONS.
+	* Makefile.in: Regenerate.
+	* aclocal.m4: Regenerate.
+	* config.in: Regenerate.
+	* configure: Regenerate.
+	* doc/Makefile.in: Regenerate.
+
+2008-08-09  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 6615
+	* rename.c (smart_rename): Punctuate error messages.
+
+2008-08-08  Richard Sandiford  <rdsandiford@googlemail.com>
+	    Daniel Jacobowitz  <dan@codesourcery.com>
+	    Catherine Moore  <clm@codesourcery.com>
+	    Mark Shinwell  <shinwell@codesourcery.com>
+
+	* readelf.c (get_mips_symbol_other): Handle STO_MIPS_PLT and
+	STO_MIPS_PIC.
+	(slurp_rela_relocs, slurp_rel_relocs): Handle MIPS ELF64 here.
+	(dump_relocations, debug_apply_relocations): Don't handle it here.
+	(get_mips_dynamic_type): Handle DT_MIPS_PLTGOT and DT_MIPS_RWPLT.
+	(print_mips_pltgot_entry): New function.
+	(process_mips_specific): Dump the PLT GOT.
+
+2008-08-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (is_64bit_abs_reloc): Return true for R_MIPS_64.
+
+2008-08-06  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 6774
+	* objcopy.c (copy_object): Don't setup_bfd_headers when extract_symbol.
+	(setup_section): Don't zero vma and lma when extract_symbol.
+	(copy_section): Discard relocations when extract_symbol.
+	* doc/binutils.texi: Update --extract-symbol description.
+
+2008-08-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am (POTFILES.in): Set LC_ALL=C.
+	* Makefile.in: Regenerate.
+
+2008-08-04  Markus Weiss  <weissms@aros.org>
+
+	* readelf.c (get_osabi_name <ELFOSABI_AROS>): Change name.
+
+2008-08-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* dwarf.c (dwarf_regnames_i386): Remove AVX registers.
+	(dwarf_regnames_x86_64): Likewise.
+
+2008-07-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* dlltool.c, dwarf.c, objdump.c, readelf.c, resrc.c, resres.c,
+	windmc.c: Silence gcc warnings.
+
+2008-07-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (print_vma): Typo fix.
+
+2008-07-28  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 6769
+	* readelf.c (print_dec_vma, print_hex_vma): Delete.
+	(print_vma): Use BFD_VMA_FMT.
+	* size.c (size_number, rprint_number): Likewise.
+
+2008-07-26  Michael Eager <eager@eagercon.com>
+
+	* readelf.c (display_power_gnu_attribute): Display
+	single-precision hard float.
+
+2008-07-21  Luis Machado  <luisgpm@br.ibm.com>
+
+	* readelf.c (get_note_type): Handle VSX notes.
+
+2008-07-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* objdump.c (load_debug_section): Initialize section_is_compressed 
+	for gcc 3.4/ia64.
+	* readelf.c (load_debug_section): Likewise.
+
+2008-07-12  Jie Zhang  <jie.zhang@analog.com>
+
+	Revert
+	2008-07-12  Jie Zhang  <jie.zhang@analog.com>
+	* readelf.c (get_machine_flags): Deal with Blackfin specific
+	flags.
+
+2008-07-12  Jie Zhang  <jie.zhang@analog.com>
+
+	* readelf.c (get_machine_flags): Deal with Blackfin specific
+	flags.
+
+2008-07-09  Craig Silverstein  <csilvers@google.com>
+
+	* config.in: Add HAVE_ZLIB_H
+	* configure.in: Add test for libz and zlib.h
+	* configure: Regenerate.
+	* dwarf.c (debug_displays): Add .zdebug_* strings.
+	* dwarf.h (struct dwarf_section): Add fields uncompressed_namd
+	and compressed_name.
+	* objdump.c (load_debug_section): Call
+	bfd_uncompress_section_contents when loading a compressed
+	section.
+	(dump_dwarf_section): Recognize compressed section name.
+	(mach_o_dwarf_sections): Rename as
+	mach_o_uncompressed_dwarf_sections.
+	(mach_o_compressed_dwarf_sections): New variable.
+	(generic_dwarf_section): Rename as
+	generic_uncompressed_dwarf_sections.
+	(generic_compressed_dwarf_sections): New variable.
+	(check_mach_o_dwarf): Save and restore
+	mach_o_compressed_dwarf_sections.
+	* readelf.c: Add #include for config.h and zlib.h
+	(process_section_headers): Recognize compressed section name.
+	(uncompress_section_contents): New function.
+	(load_debug_section): Call uncompress_section_contents when
+	loading a compressed section.
+	(display_debug_section): Recognize compressed section name.
+
+2008-07-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* objdump.c (find_symbol_for_address): Prefer symbols in current
+	section.
+
+2008-07-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* ieee.c (write_ieee_debugging_info): Use bfd_make_section_with_flags.
+	* nlmconv.c (main, powerpc_build_stubs): Likewise.
+	* rescoff.c (write_coff_file): Likewise.
+	* resres.c (write_res_file): Likewise.
+	* windmc.c (windmc_write_bin): Likewise.
+
+2008-06-18  M R Swami Reddy <MR.Swami.Reddy@nsc.com>
+
+	* readelf.c (guess_is_rela): Add EM_CR16_OLD.
+	(dump_relocations): Likewise.
+	(get_machine_name): Likewise.
+	(is_32bit_abs_reloc): Likewise.
+
+2008-06-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure: Regenerate.
+
+2008-06-12  DJ Delorie  <dj@redhat.com>
+
+	* readelf.c (guess_is_rela): Add EM_M32C_OLD.
+	(dump_relocations): Likewise.
+	(process_section_headers): Likewise.
+	(is_32bit_abs_reloc): Likewise.
+	(is_16bit_abs_reloc): Likewise.
+
+2008-06-12  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/6483
+	* objdump.c (dump_bfd): If the -g option found no STABS or IEEE
+	debug information to display, try dumping DWARF information
+	instead.
+	* rddbg.c (read_debugging_info): Add a parameter to suppress the
+	display of a warning message when no debug information is found.
+	* budbg.h (read_debugging_info): Update prototype.
+	* objcopy.c (copy_object): Continue to allow read_debugging_info
+	to produce warning messages.
+	* doc/binutils.texi (--debugging): Document new behaviour of the
+	-g/--debugging option.
+
+2008-06-10  Ben Elliston  <bje@gnu.org>
+
+	* MAINTAINERS: Remove myself as m68k maintainer.
+
+2008-05-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+	* doc/Makefile.in: Regenerate.
+
+2008-05-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* embedspu.sh: Test for presence of ._ea by looking at section
+	table rather than looking at relocs.  Correct toe_addr substitution.
+
+2008-05-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* embedspu.sh: Take note of R_SPU_PPU32/64 relocs without a symbol,
+	and if present, put image in ".data.speelf".  Put program handle
+	in ".data.spehandle".
+
+2008-05-01  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (print_symbol): Add code to display non-printing
+	characters.
+
+2008-04-30  John Heidemann  <johnh@isi.edu>
+
+	* doc/binutils.texi (strings): Add "unicode" to the documentation
+	of strings in order to make explicit that it supports this
+	feature.
+
+2008-04-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (process_program_headers): Correct section in segment
+	display.
+
+2008-04-28  M Thomas  <mthomas@rhrk.uni-kl.de>
+	    Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/6449
+	* objdump.c (slurp_file): Open the file in binary mode.
+	* ar.c: Remove conditional definition of O_BINARY.
+	* bin2.c: Likewise.
+	* rename.c: Likewise.
+	* strings.c: Likewise.
+	* sysdep.h: Add conditional definition of O_BINARY.
+
+2008-04-23  Paolo Bonzini  <bonzini@gnu.org>
+
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+
+2008-04-16  Jean-Yves Lefort  <jylefort@brutele.be>
+
+	PR binutils/6034
+	* objcopy.c (stuct symlist): Rename to
+	is_specified_symbol_predicate_data.
+	(strip_specific_list): Rename to strip_specific_htab.
+	(strip_unneeded_list): Rename to strip_unneeded_htab.
+	(keep_specific_list):  Rename to keep_specific_htab.
+	(localize_specific_list): Rename to localize_specific_htab.
+	(globalize_specific_list): Rename to globalize_specific_htab.
+	(keepglobal_specific_list): Rename to keepglobal_specific_htab.
+	(weaken_specific_list): Rename to weaken_specific_htab.
+	(eq_string): New function.
+	(create_symbol_htab): New function.
+	(create_symbol_htabs): New function.
+	(add_specific_symbol): Change to use hash tables.
+	(is_specified_symbol_predicate): New function.
+	(is_specified_symbol): Use hash table lookup.
+	(is_strip_section): Update to use new functions and hash tables.
+	(filter_symbols): Likewise.
+	(copy_object): Likewise.
+	(copy_section): Likewise.
+	(strip_main): Likewise.
+	(copy_main): Likewise.
+	(main): Likewise.
+
+2008-04-14  David S. Miller  <davem@davemloft.net>
+
+	* readelf.c (get_gnu_elf_note_type): Recognize NT_GNU_GOLD_VERSION.
+
+2008-04-11  Torleif Sandnes  <torleif.sandnes@gmail.com>
+
+	* dwarf.c (display_debug_lines): Rename to
+	display_debug_lines_raw.
+	(display_debug_lines_decoded): New function.  Displays the
+	interpreted contents of a .debug_line section.
+	(display_debug_lines): New function: Selects either a raw dump or
+	a decoded dump (or both) as requested by the user.
+	* dwarf.h (do_debug_lines_decoded): New extern.
+	* readelf.c: Add support for -wL or --debug-dump=decodedline
+	option to display the decoded contents of a .debug_line section.
+	* doc/binutils.texi: Document the new option.
+	* NEWS: Mention the new feature.
+
+2008-04-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* dwarf.c: Remove trailing whitespace throughout file.
+
+2008-04-04  Nick Clifton  <nickc@redhat.com>
+
+	* po/sk.po: Updated Slovak translation.
+
+2008-04-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* dwarf.c (dwarf_regnames_i386): Add AVX registers.
+	(dwarf_regnames_x86_64): Likewise.
+
+2008-03-27  Cary Coutant <ccoutant@google.com>
+
+	Add support for thin archives.
+	* ar.c (make_thin_archive): New global flag.
+	(map_over_members): Deal with full pathnames in thin archives.
+	(usage, main): Add 'T' option for building thin archives.
+	(replace_members): Pass thin archive flag to ar_emul_append.
+	* arsup.c (ar_open): Initialize new flag.
+	* binemul.c (ar_emul_append): Add new parameter for
+	flattening nested archives.
+	(do_ar_emul_default_append): New function.
+	(ar_emul_default_append): Factored out recursive code.
+	* binutils/binemul.h (ar_emul_default_append): Add new parameter.
+	(struct bin_emulation_xfer_struct): New parameter for ar_append.
+	* dlltool.c (gen_lib_file): Initialize thin archive flag.
+	* emul_aix.c (ar_emul_aix_internal): Add new flatten
+	parameter, currently unimplemented.
+	All callers changed.
+	* objcopy.c (copy_archive): Preserve thin archive flag.
+	* doc/binutils.texi: Update ar documentation.
+	* NEWS: Mention the new feature.
+
+2008-03-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (process_mips_specific): Declare addr_size as int.
+
+2008-03-20  Richard Sandiford  <rsandifo@nildram.co.uk>
+
+	* readelf.c (print_mips_got_entry): New function.
+	(process_mips_specific): Print GOT information.
+
+2008-03-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* aclocal.m4: Regenerate.
+	* configure: Likewise.
+	* Makefile.in: Likewise.
+	* doc/Makefile.in: Likewise.
+
+2008-03-16  Brian Dessent  <brian@dessent.net>
+
+	* rcparse.y (resid): Allow control text to span multiple lines.
+
+2008-03-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c: Use %u throughout when printing sh_link or sh_info,
+	%lu when printing sh_addralign.
+	(process_version_sections): Use identical formats when printing
+	all offset and sh_link fields.
+
+2008-03-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* doc/Makefile.in: Regenerate.
+	* configure: Regenerate.
+
+2008-03-12  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 5900
+	* readelf.c (SECTION_HEADER_INDEX, SECTION_HEADER_NUM): Delete.
+	Remove use throughout file.
+	(SECTION_HEADER): Likewise.
+	(dump_relocations): Don't adjust st_shndx for reserved range.
+	(process_file_header): Mask SHN_XINDEX to values seen in external
+	elf structs.  Simplify valid section index tests.
+	(get_32bit_elf_symbols, get_64bit_elf_symbols): Mask SHN_XINDEX.
+	Map reserved st_shndx to internal form.
+	(process_section_groups): Test that group symbol st_shndx is in
+	range, not just non-zero.  Delete reserved range check.
+	(get_symbol_index_type): Mask "type" to 16 bits when printing PRC,
+	OS or RSV.
+
+2008-03-09  Paul Brook  <paul@codesourcery.com>
+
+	* readelf.c (arm_attr_tag_VFP_arch): Add "VFPv3-D16".
+
+2008-03-03  James E. Wilson  <wilson@tuliptree.org>
+
+	* MAINTAINERS: Update my email address.
+
+2008-03-03  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf.c (decode_location_expression): Handle
+	DW_OP_PGI_omp_thread_num.
+
+2008-03-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* objdump.c (objdump_print_addr): Initialise "sym".
+
+2008-02-27  Justin Pryzby  <justinpryzby@users.sourceforge.net>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* ar.c (usage): Mention -t command line switch.
+	* doc/binutils.texi (ranlib): Document -t command line switch.
+
+2008-02-26  Nick Clifton  <nickc@redhat.com>
+
+	* objdump.c (objdump_print_addr): If displaying file offsets, show
+	the offset even if there are no symbols available.
+	(dump_section): Display nothing if none of the section is going to
+	be dumped.  Display the file offset, if requested, of the location
+	from where the dump starts.
+	* doc/binutils.texi (objdump): Mention that dumping via the -s
+	switch is also affected by the -F option.
+
+2008-02-26  Nick Clifton  <nickc@redhat.com>
+
+	Re-apply this patch which was accidentally deleted:
+	2006-05-16  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* doc/binutils.texi: Use "Binutils Index" for index name.
+
+2008-02-22  Nick Clifton  <nickc@redhat.com>
+
+	* objdump.c (display_file_offsets): New variable.
+	(long_options): Add -F/--file-offsets.
+	(objdump_print_addr_with_sym): If displaying file offsets, print
+	the offset of the given address.
+	(disassemble_bytes): If displaying file offsets, tell the user how
+	many zeroes are skipped and the file offset of the point where
+	dumping resumes.
+	(disassemble_section): Only display the name of the section if
+	data is going to be dumped from it.
+	(main): Handle new option.  Produce error messages if the start or
+	stop addresses do not make sense.
+	* doc/binutils.texi: Document the new feature.
+	* NEWS: Mention the new feature.
+
+2008-02-15  Chu Li  <chul@cn.fujitsu.com>
+	    Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/5713
+	* strings.c (integer_arg): Delete function.
+	(string_min): Initialise to 4.
+	(main): Use strtoul to parse integer arguments.
+	Move check for an invalid string length to after all the arguments
+	have been parsed.
+	(usage): Use indentation to indicate that -<n> is a another form
+	of the --bytes= command line option.
+
+2008-02-12  Nick Clifton  <nickc@redhat.com>
+
+	* dlltool.c (mcore_elf_cache_filename): Add a const qualifier to
+	the argument.
+	(scan_obj_filename): Do not drop the const qualifier when calling
+	mcore_elf_cache_filename.
+	(struct fname_cache): Add const qualifier to filename field.
+
+2008-02-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/5713
+	* strings.c (main): Set string_min to 4 if it is <= 0.
+
+2008-02-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* objdump.c (main): Don't pass unadorned NULL to concat.
+
+2008-02-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 5715
+	* configure: Regenerated.
+
+2008-02-03  Adam Nemet  <anemet@caviumnetworks.com>
+
+	* readelf.c (get_machine_flags): Handle Octeon.
+
+2008-01-30  Tristan Gingold  <gingold@adacore.com>
+
+	* readelf.c (dump_relocations): Decode OpenVMS-specific sections.
+	(get_ia64_dynamic_type): Decode OpenVMS-specific tags.
+	(get_dynamic_type): Handle IA64-specific tags.
+	(get_ia64_section_type_name): Handle OpenVMS-specific sections.
+	(get_section_type_name): Handle OS-specific sections (and
+	particularly IA64 OpenVMS one).
+	(get_elf_section_flags): Makes flags static.  Add entries for IA64 and
+	decode them.
+
+2008-01-29  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf.c (print_dwarf_vma): New function.  Display the value of a
+	dwarf_vma type at a specified precision.  Use mingw field type
+	specifier if necessary.
+	(display_debug_loc): Use dwarf_vma type for begin and end values.
+	Use print_dwarf_vma to display their values.  Use byte_get_signed
+	in order to correctly detect the -1 escape value.
+	(display_debug_aranges): Likewise.
+	(display_debug_ranges): Likewise.
+
+2008-01-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* dwarf.c (display_debug_loc): Correct test for base address
+	entry when 64-bit host dumping 32-bit object.
+
+2008-01-29  Alan Modra  <amodra@bigpond.net.au>
+
+	* MAINTAINERS: Remove myself as ix86 maintainer.  Add for SPU.
+
+2008-01-28  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/5529
+	* rclex.c (yylex): Also allow the hypen character.
+
+2008-01-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* dwarf.c: Include "elf/common.h".
+	(eh_addr_size): Changed to int.
+	(dwarf_regnames_i386): New.
+	(dwarf_regnames_x86_64): Likewise.
+	(dwarf_regnames): Likewise.
+	(dwarf_regnames_count): Likewise.
+	(init_dwarf_regnames): Likewise.
+	(regname): Likewise.
+	(frame_display_row): Properly support different address size.
+	Call regname to get register name.
+	(display_debug_frames): Call regname to get register name.
+	Display DW_CFA_def_cfa_register as DW_CFA_def_cfa_register
+	instead of DW_CFA_def_cfa_reg.
+
+	* dwarf.h (init_dwarf_regnames): New.
+
+	* objdump.c: Include "elf-bfd.h".
+	(dump_dwarf): Call init_dwarf_regnames on ELF input.
+
+	* readelf.c (guess_is_rela): Change argument to int.
+	(parse_args): Remove the undocumented upper case options for
+	-wX.
+	(process_file_header): Call init_dwarf_regnames.
+
+2008-01-25  DJ Delorie  <dj@redhat.com>
+
+	* readelf.c (process_section_headers): Add m16c handler.
+	(is_16bit_abs_reloc): Recognize R_M32C_16.
+
+2008-01-25  Kai Tietz  <kai.tietz@onevision.com>
+
+	* prdbg.c: Correct formatter style use.
+	* readelf.c: Likewise.
+	* strings.c: Likewise.
+
+2008-01-25  Nick Clifton  <nickc@redhat.com>
+
+	* po/ru.po: Updated Russian translation.
+
+2008-01-17  H.J. Lu  <hjl.tools@gmail.com>
+
+	* MAINTAINERS: Update my email address.
+
+2008-01-14  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf.c (process_debug_info): Include the CU offset and corrupt
+	version value when reporting unrecognised DWARF version numbers.
+	(load_debug_info): Remember a failed attempt to load and parse the
+	.debug_info section and do not repeat such attempts.
+	(display_debug_lines): Check the return value from load_debug_info
+	and return whilst displaying a warning message if the load failed.
+	(display_debug_loc): Likewise.
+	(display_debug_ranges): Likewise.
+	(DEBUG_INFO_UNAVAILABLE): Value stored in num_debug_info_entries
+	when the .debug_info section could not be loaded/parsed.
+	(process_debug_info): Display the length of the compilation unit
+	in hex, so that it corresponds with the offsets that will follow.
+	Tell the user if the length was 32-bit or 64-bit.
+	If a DIE abbreviation could not be found, tell the user the offset
+	of the DIE.
+	(free_debug_memory): Do not attempt to free any entries in the
+	debug_information array if num_debug_info_entries is set to
+	DEBUG_INFO_UNAVAILABLE.
+
+2008-01-10  Andreas Schwab  <schwab@suse.de>
+
+	* readelf.c (is_64bit_abs_reloc): Handle R_S390_64.
+
+2008-01-09  Jakub Zawadzki  <darkjames@darkjames.ath.cx>
+
+	PR binutils/55326
+	* bucomm.c (list_supported_architectures): Free architecture list
+	after use.
+	* windres.c (set_endianess): Likewise.
+	* windmc.c (set_endianess): Likewise.
+
+2008-01-08  Kai Tietz  <kai.tietz@onevision.com>
+
+	PR binutils/5529
+	* binutils/rclex.c: (yylex): Add ':', '_', '\\', and '/' to post
+	characters for name tokens.
+
+2008-01-04  Greg McGary  <greg@mcgary.org>
+
+	* prdbg.c (print_vma): Print as long long, if host supports it.
+
+2008-01-03  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf.c (read_and_display_attr_value): Prefix values that are
+	displayed in hexadecimal with 0x.
+	For the DW_AT_import attribute display the abbreviation number and
+	tag of the imported DIE.
+	(process_debug_info): Warn about lengths that reserved by the
+	DWARF3 specification.
+	Provide more information when corrupted DIEs are detected.
+	Warn if DIE corruption makes the sibling level negative.
+
+For older changes see ChangeLog-2007
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-2009 sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-2009
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-2009	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-2009	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1355 @@
+2009-12-31  Eirik Byrkjeflot Anonsen  <eirik@opera.com>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* objcopy.c (add_redefine_syms_file): Avoid symbol buffer
+	overrun.
+
+2009-12-21  Alan Modra  <amodra@gmail.com>
+
+	* MAINTAINERS: Update my email address.
+
+2009-12-18  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* readelf.c (get_note_type): Handle NT_S390_HIGH_GPRS notes.
+
+2009-12-11  Nick Clifton  <nickc@redhat.com>
+
+	* Makefile.in: Regenerate.
+	* doc/Makefile.in: Regenerate.
+	* ar.c: Fix shadowed variable warnings.
+	* bucomm.c: Likewise.
+	* coffgrok.c: Likewise.
+	* configure: Likewise.
+	* dlltool.c: Likewise.
+	* dllwrap.c: Likewise.
+	* dwarf.c: Likewise.
+	* ieee.c: Likewise.
+	* nlmconv.c: Likewise.
+	* nm.c: Likewise.
+	* objcopy.c: Likewise.
+	* objdump.c: Likewise.
+	* prdbg.c: Likewise.
+	* readelf.c: Likewise.
+	* resbin.c: Likewise.
+	* resrc.c: Likewise.
+	* resres.c: Likewise.
+	* srconv.c: Likewise.
+	* stabs.c: Likewise.
+	* sysdump.c: Likewise.
+	* sysinfo.y: Likewise.
+	* wrstabs.c: Likewise.
+
+2009-12-10  Tristan Gingold  <gingold@adacore.com>
+
+	* addr2line.c (pretty_print): New variable.
+	(long_options): Add an entry for -p/--pretty-print.
+	(usage): Document -p/--pretty-print.
+	(translate_addresses): Handle pretty_print.  Reindent.
+	(main): Handle option -p.
+	* doc/binutils.texi (addr2line): Document -p/--pretty-print.
+	* NEWS: Mention new feature.
+
+2009-12-09  Tristan Gingold  <gingold@adacore.com>
+
+	* addr2line.c (translate_addresses): Display addresses
+	if option -a is used.
+	(with_addresses): New variable.
+	(long_options): Add option '-a'.
+	(usage): Add usage for option '-a'.
+	(main): Handle option '-a'.
+	* doc/binutils.texi (addr2line): Document option '-a'.
+	* NEWS: Mention new feature.
+
+2009-12-08  Cary Coutant  <ccoutant@google.com>
+
+	* dwarf.c (dwarf_select_sections_by_names): Handle pubtypes correctly.
+	(debug_displays): Remove duplicate entry for debug_pubtypes.
+
+2009-12-03  David Daney  <ddaney@caviumnetworks.com>
+	    Adam Nemet  <adambnemet@gmail.com>
+
+	* readelf.c (get_machine_flags): Handle E_MIPS_MACH_OCTEON2 case.
+
+2009-12-03  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/11045
+	* dwarf.c (do_debug_pubtypes): New variable.
+	(dwarf_select_sections_by_names): Handle .debug_pubtypes.
+	(dwarf_select_sections_by_letters): Add 't' for .debug_pubtype.
+	(dwarf_select_sections_all): Set do_debug_pubtypes.
+	(debug_displays): Add support for .debug_pubtypes.
+	* dwarf.h (do_debug_pubtypes): Export.
+	* objdump.c (usage): Add -wt or --dwarf=pubtypes.
+	* readelf.c (usage): Likewise.
+	(process_section_headers): Enable debug display if
+	do_debug_pubtypes is set.
+	* doc/binutils.texi: Document -wt/--dwarf=pubtypes option.
+
+2009-12-02  Jerker B�ck  <jerker.back@gmail.com>
+
+	PR binutils/11017
+	* dlltool.c (PAGE_SIZE): Delete.
+	(PAGE_MASK): Provide default definition based on COFF_PAGE_SIZE.
+	Check for DLLTOOL_DEFAULT_MX86_64 and DLLTOOL_DEFAULT_I386.
+
+2009-12-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* readelf.c (get_machine_name, get_osabi_name): Handle more
+	allocated values.
+
+2009-11-30  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure: Regenerate.
+
+2009-11-20  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c: Include xc16x.h.
+	(dump_relocations): Handle relocations for the xc16x target.
+	(get_machine_name): Accept EM_C166 for xc16x targets.
+	(is_32bit_abs_reloc): Add support for xc16c 32-bit absolute reloc.
+	(is_16bit_abs_reloc): Add support for xc16c 16-bit absolute reloc.
+	(is_none_reloc): Add support for xc16c null reloc.
+	
+2009-11-20  Ben Elliston  <bje@au.ibm.com>
+
+	* Makefile.am (syslex.o): Use $(NO_WERROR) not -Wno-error.
+	(sysinfo.o): Likewise.
+	* Makefile.in: Regenerate.
+
+2009-11-19  Ben Elliston  <bje@au.ibm.com>
+
+	* arlex.l: Enable noinput, nounput flex options.
+	* syslex.l: Likewise.
+
+2009-11-17  Paul Brook  <paul@codesourcery.com>
+	    Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* readelf.c (arm_attr_tag_CPU_arch): Add v7E-M.
+
+2009-11-16  Kai Tietz  <kai.tietz@onevision.com>
+
+	* windmc.c (set_endianess): Use bfd_get_target_info.
+	* windres.c (set_endianess): Likewise.
+	(find_arch_match): Removed.
+
+2009-11-11  Nick Clifton  <nickc@redhat.com>
+
+	* po/id.po: Updated Indonesian translation.
+
+2009-11-11  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* configure.in: Stop checking for fopen64 and stat64.
+	* strings.c (file_off, file_open, statbuf, file_stat): Remove.
+	(strings_file): Change file_off to file_ptr, file_open to fopen,
+	statbuf to struct stat and file_stat to stat.
+	(get_char): Change parameter type file_off * to file_ptr *.
+	(print_strings): Change parameter and variable `start' type file_off to
+	file_ptr.
+	* configure: Regenerate.
+	* config.in: Regenerate.
+
+2009-11-11  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* configure.in: Call ACX_LARGEFILE.  Stop calling AC_PLUGINS,
+	AC_SYS_LARGEFILE and checking the Solaris largefile exception.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+
+2009-11-09  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* bucomm.c (get_file_size): Update comment for the error return value.
+
+2009-11-08  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* readelf.c (slurp_hppa_unwind_table): Don't relocate address twice.
+
+2009-11-05  Kai Tietz  <kai.tietz@onevision.com>
+
+	* dllwrap.c (is_leading_underscore): New variable.
+	(cpu_type): New enum type.
+	(which_cpu): New variable.
+	(usage): Add new options --no-leading-underscore
+	and --leading-underscore.
+	(long_options): Likewise.
+	(OPTION_NO_LEADING_UNDERSCORE): New define.
+	(OPTION_LEADING_UNDERSCORE): Likewise.
+	(main): Initialize which_host, pass new options
+	to dlltool, do underscoring dependent on
+	is_leading_underscore, and do '@12' decoration
+	only for x86.
+
+2009-11-02  Paul Brook  <paul@codesourcery.com>
+
+	* readelf.c (arm_attr_tag_VFP_arch): Add VFPv4 and VFPv4-D16.
+
+2009-10-28  Kai Tietz <kai.tietz@onevision.com>
+
+	* dlltool.c (leading_underscore): New local variable.
+	(asm_prefix): Interpret leading_underscore.
+	(xlate): Likewise.
+	(add_excludes): Use leading_underscore for making
+	symbol name.
+	(gen_exp_file): Use leading_underscore for internal
+	_imp_ symbols.
+	(usage): Add display of --no-leading-underscore and
+	--leading-underscore option.
+	(OPTION_NO_LEADING_UNDERSCORE): New.
+	(OPTION_LEADING_UNDERSCORE): New.
+	(long_options): Add --no-leading-underscore and
+	--leading-underscore option.
+	(main): Handle new options.
+	* doc/binutils.text: Add documentation of the options
+	--no-leading-underscore and --leading-underscore.
+
+2009-10-23  Kai Tietz  <kai.tietz@onevision.com>
+
+	* deflex.l: Allow '<' and '>' in ID names.
+
+	* defparse.y (EQUAL): New token constant.
+	(opt_import_name): New rule for emptry or '==' ID.
+	(expline): Add opt_import_name as last line element.
+	(impline): Likewise.
+	* dlltool.c (ifunct): New member its_name.
+	(export): Likewise.
+	(append_import): Add its_name argument.
+	(defexports): Likewise.
+	(defimport): Likewise.
+	(scan_drectve_symbols): Adjust calls to def_exports.
+	(dump_def_info): Print new optinal import/export table
+	symbol name.
+	(generate_idata_ofile): Use its_name member.
+	(make_one_lib_file): Likewise.
+	(nfunc): Take its_name in account on sort.
+	* dlltool.h (def_exports): Add its_name as argument.
+	(def_import): Likewise.
+	* doc/binutils.texi: Add new def file syntax extension.
+	* deflex.l (EQUAL): Add rule for '=='.
+	* NEWS: Mention new feature.
+
+2009-10-23  Thomas Cougnard  <thomas.cougnard@gmail.com>
+
+	* readelf.c (dynamic_info): Correct size of array.
+
+2009-10-21  Ben Elliston  <bje@gnu.org>
+
+	* MAINTAINERS (BUILD SYSTEM, TESTSUITES): Remove myself.
+
+2009-10-19  Jerker B�ck  <jerker.back@gmail.com>
+
+	PR binutils/10793
+	* prdbg.c (tg_end_struct_type): Warning fix.
+
+	PR binutils/10792
+	* dlltool.c (dll_name_list_append): Declare variable at start
+	of block.
+	(dll_name_list_count, dll_name-list_print): Likewise.
+
+2009-10-16  Doug Evans  <dje@sebabeach.org>
+
+	* MAINTAINERS: Add myself as m32r maintainer.
+
+2009-10-16  Jerker B�ck <jerker.back@gmail.com>
+
+	PR 10764
+	* Makefile.am (sysinfo.o, syslex.o): Place source file after all
+	command line switches.
+	* Makefile.in: Regenerate.
+
+2009-10-16  Yann Droneaud  <yann@droneaud.fr>
+
+	PR 10768
+	* dlltool.c (bfd_get_errmsg): New macro.
+	(scan_obj_file): Use it.
+	(make_one_lib_file): Use it.
+	(make_head): Use it.
+	(make_delay_head): Use it.
+	(make_tail): Use it.
+	(gen_lib_file): Use it.
+	(identify_dll_for_implib): Use it.
+	(identify_search_archive):  Use it.
+
+2009-10-16  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (usage): Add mention of --debug-dump=frames-interp.
+	Wrap output to 80 columns.
+	* objdump.c (usage): Likewise.
+	* doc/binutils.texi (readelf): Add note about =frames-interp.
+
+2009-10-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* addr2line.c (slurp_symtab): Don't use bfd_read_minisymbols.
+
+2009-09-29  Nick Clifton  <nickc@redhat.com>
+
+	* doc/binutils.texi (c++filt): Remove spurious description of
+	nonexistent --java command line switch for cxxfilt.
+
+2009-09-29  DJ Delorie  <dj@redhat.com>
+
+	* readelf.c: Add support for RX target.
+	* MAINTAINERS: Add DJ and NickC as maintainers for RX.
+
+2009-09-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* configure.in: Don't invoke configure.tgt on $enable_targets.
+	* configure: Regenerate.
+
+2009-09-28  Nick Clifton  <nickc@redhat.com>
+
+	PR 10478
+	* readelf.c (get_elf_section_flags): Allow SHN_BEFORE and
+	SHN_AFTER section link values in x86 binaries.
+	(process_section_headers): Likewise.
+
+2009-09-25  Dmitry Gorbachev  <d.g.gorbachev@gmail.com>
+
+	PR 10656
+	* readelf.c: Remove duplicate declaration of variable do_wide.
+	* dwarf.h: Add export of do_wide.
+
+2009-09-24  Cary Coutant  <ccoutant@google.com>
+
+	* dwarf.c (get_TAG_name): Add missing DWARF-3 and new DWARF-4 tags.
+	(get_FORM_name): Add new DWARF-4 forms.
+	(read_and_display_attr_value): Add DW_FORM_ref_sig8, DW_LANG_Python.
+	(get_AT_name): Add new DWARF-4 and GNU-specific attributes.
+	(process_debug_info): Add do_types parameter; change all callers.
+	Add support for .debug_types sections.
+	(display_debug_types): New function.
+	(debug_displays): Add .debug_types section.
+	* readelf.c (process_section_headers): Add .debug_types section.
+	(display_debug_section): Simplify call to streq.
+
+2009-09-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (print_dynamic_symbol): Format entries as for
+	normal symbol table.
+	(process_symbol_table): Use -7s format string for visibility.
+
+2009-09-22  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* objdump.c (disassemble_section): Use bfd_get_arch_size
+	instead of assuming that the address size is 32 bits.
+
+2009-09-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* readelf.c (get_ppc_dynamic_type): Add TLSOPT.
+	(get_ppc64_dynamic_type): Likewise.
+
+2009-09-18  Nick Clifton  <nickc@redhat.com>
+
+	* po/es.po: Updated Spanish translation.
+	* po/vi.po: Updated Vietnamese translation.
+
+2009-09-11  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+	* readelf.c (process_version_sections, process_symbol_table):
+	Use symbolic constants.
+
+2009-09-11  Nick Clifton  <nickc@redhat.com>
+
+	* po/binutils.pot: Updated by the Translation project.
+
+2009-09-11  Philippe De Muyter  <phdm@macqel.be>
+
+	* obcopy.c (copy_object): New parameter `input_arch', architecture
+	of input file, if not specified in input file itself; all callers
+	updated; `binary_architecture' hack removed.
+	(copy_archive, copy_file): New parameter `input_arch', for
+	`copy_object' usage.
+	(copy_main): Accept `-B' (`--binary-architecture') option also
+	for any arch-less input ifile format, not only `binary'; remove
+	bfd_external_binary_architecture hack; instead, add `input_arch'
+	to calls to `copy_file'.
+	* windres.c, windmc.c : Obsolete and useless external references
+	to `bfd_external_binary_architecture' or `bfd_external_machine'
+	removed.
+	* doc/binutils.texi: Mention that -B parameter can be used for any
+	input file type which does not have its own architecture.
+
+2009-09-10  Martin Thuresson  <martin@mtme.org>
+
+	Update sources to compile cleanly with -Wc++-compat:
+	* addr2line.c (slurp_symtab): Fix casts. Introduce variable
+	minisyms to avoid aliasing varning.
+	* ar.c: Add casts.
+	(normalize): Use name del instead of delete.
+	(display_target_list,display_info_table): Change loop counter
+	variable a to int.
+	* bucomm.c: Add casts.
+	* debug.c: Update function to use new names.
+	(struct debug_baseclass): Rename member from virtual to
+	is_virtual.
+	(struct debug_type_s, struct debug_field_s, struct
+	debug_baseclass_s, struct debug_method_s, struct
+	debug_method_variant_s, struct debug_type_s): Rename struct from
+	avoid name collision.
+	* debug.h: Use new struct names.
+	* dwarf.c: Add casts.
+	(free_debug_memory): Change loop counter variable a to int.
+	* ieee.c: Add casts.
+	(enum ieee_var_kind): Move to top level.
+	(ieee_class_baseclass): Rename parameter virtual to is_virtual.
+	(ieee_class_method_var): Rename variable virtual to is_virtual.
+	* nm.c: Add casts.
+	* objcopy.c: Add casts.
+	(copy_archive): Rename variable delete to del.
+	* objdump.c: Add casts.
+	(dump_dwarf_section): Change loop counter variable i to int.
+	* prdbg.c: Add casts.
+	(pr_class_baseclass,tg_class_baseclass): Rename parameters virtual
+	to is_virtual.
+	* readelf.c: Add casts.
+	(struct ia64_unw_table_entry,struct hppa_unw_table_entry): Move to
+	top level.
+	* size.c: Add casts.
+	* stabs.c (parse_stab_type, parse_stab_range_type,
+	(parse_stab_cpp_abbrev): Rename parameter from typename to
+	type_name.
+	(parse_stab_baseclasses): Rename variable virtual to is_virtual.
+	* strings.c: Add casts.
+	* wrstabs.c (stab_class_baseclass): Rename parameter virtual to
+	is_virtual.
+
+2009-09-09  Nick Clifton  <nickc@redhat.com>
+
+	PR 10478:
+	readelf.c (get_elf_section_flags): Add support for SHF_EXCLUDE and
+	SHF_ORDERED.
+	(process_section_headers): Warn about out of range sh_link
+	values.  When displaying detailed section header information
+	annote the SHN_BEFORE and SHN_AFTER values.
+
+2009-09-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* dwarf.c (byte_get_little_endian): Handle size of 3.
+	(byte_get_big_endian): Likewise.
+	* readelf.c (byte_put_little_endian): Likewise.
+	(byte_put_big_endian): Likewise.
+	(is_24bit_abs_reloc): New function.
+	(is_none_reloc): Formatting.
+	(apply_relocations): Use is_24bit_abs_reloc.  Handle pj and xtensa
+	reloc peculiarity.
+
+2009-09-07  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* readelf.c (is_none_reloc <EM_XTENSA_OLD>, is_none_reloc <EM_XTENSA>):
+	New.
+
+2009-09-07  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* dwarf.c (process_debug_info): Support section padding abbrev codes.
+
+2009-09-07  Tristan Gingold  <gingold@adacore.com>
+
+	* po/binutils.pot: Regenerate.
+
+2009-09-05  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* Makefile.am (sysdump.o): Depend on sysroff.c.
+	* Makefile.in: Regenerate.
+
+2009-09-05  Martin Thuresson  <martin@mtme.org>
+
+	* ieee.c (ieee_read_cxx_misc, ieee_read_cxx_class,
+	ieee_read_reference): Rename variables named class to cxxclass.
+
+2009-09-04  Tristan Gingold  <gingold@adacore.com>
+
+	* BRANCHES: Add binutils-2_20-branch.
+
+2009-09-04  Tristan Gingold  <gingold@adacore.com>
+
+	* NEWS: Add marker for 2.20.
+
+2009-09-04  Timo Kreuzer  <timo.kreuzer@web.de>
+
+	* dlltool.c (delayimp_name): Add new global variable
+	(usage, long_options, main): Add new option "-y" / "--output-delaylib"
+	(struct mac): Add fields how_dljtab_size, how_dljtab_roff1,
+	how_dljtab_roff2, how_dljtab, trampoline.
+	(i386_dljtab): Add binary stub for x86 delay import.
+	(i386_trampoline): Add text assembly stub for x86 delay import.
+	(mtable): Add delay import data for M386 and MX86 only.
+	(make_delay_head): New function.
+	(make_one_lib_file): New arg delay creates delay-load import stub.
+	(gen_lib_file): New arg delay likewise.
+	(HOW_JTAB, HOW_JTAB_SIZE, HOW_JTAB_ROFF): New arg delay likewise.
+	(HOW_JTAB_ROFF2, HOW_JTAB_ROFF3): New macros for delay import.
+	(make_tail): Convert hard TABS embedded in strings to "\t" escapes.
+	* NEWS: Mention new feature.  Also fix whitespace.
+	* doc/binutils.texi: Updated dlltool documentation.
+
+2009-09-02  Tristan Gingold  <gingold@adacore.com>
+
+	* configure.com: Do not copy makefile.vms-in to makefile.vms
+	* makefile.vms-in: Renamed to...
+	* makefile.vms: ... this usual name as it is not processed anymore.
+	Remove WRITE_DEBUG_OBJS (unused) and reorder object files for
+	objdump.exe.
+
+2009-09-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.am (arparse.o, arlex.o, sysroff.o, defparse.o)
+	(deflex.o, nlmheaders.o, rcparse.o, mcparse.o): Supply correct
+	source file name for generated files which may be in $(srcdir).
+	* Makefile.in: Regenerate.
+
+2009-09-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* version.c (print_version): Change to "Copyright 2009".
+
+2009-09-01  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms-in: Remove unused VERSION variable.  Remove unused
+	dependencies.
+	* configure.com: Ported to Itanium VMS.  Create build.com DCL script.
+
+2009-08-29  Martin Thuresson  <martin@mtme.org>
+
+	* nlmconv.c (main): Rename variable new to new_name.
+
+2009-08-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am (sysinfo$(EXEEXT_FOR_BUILD)): Replace
+	CFLAGS/LDFLAGS with CFLAGS_FOR_BUILD/LDFLAGS_FOR_BUILD.
+	(syslex.o): Likewise.
+	(sysinfo.o): Likewise.
+	(bin2c$(EXEEXT_FOR_BUILD)): Likewise.
+	* Makefile.in: Regenerated.
+
+2009-08-27  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* doc/binutils.texi (--only-keep-debug): Relocate stray para here ...
+	(--subsystem): ... from here.
+
+2009-08-24  Cary Coutant  <ccoutant@google.com>
+
+	* objdump.c (find_symbol_for_address): Avoid costly call to
+	bfd_octets_per_byte.
+
+2009-08-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.am (am__skiplex, am__skipyacc): New.
+	* Makefile.in: Regenerate.
+
+2009-08-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.am (syslex.o): Depend on sysinfo.h config.h.
+	* Makefile.in: Regenerate.
+
+2009-08-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.am (AM_CPPFLAGS): Renamed from ...
+	(INCLUDES): ... this.
+	(bin2c$(EXEEXT_FOR_BUILD): Adjust rule.
+	(installcheck-local): Renamed from ...
+	(installcheck): ... this.
+	* Makefile.in: Regenerate.
+
+	* Makefile.am (AUTOMAKE_OPTIONS): Remove cygnus, add no-dist and
+	foreign.
+	(MKDEP, CLEANFILES): Remove now-unneeded variables.
+	(DEP, DEP1, dep.sed, dep, dep-in, dep-am): Remove.
+	(mkdep section): Remove.
+	(BUILT_SOURCES): New variable, list $(GENERATED_HFILES).
+	(EXTRA_ar_SOURCES): New, list $(CFILES).
+	(syslex.o): Depend on syslex.c.
+	(sysinfo.o): Depend on sysinfo.c.
+	(arparse.h, defparse.h, nlmheaders.h rcparse.h mcparse.h):
+	Remove dependencies, now tracked by automake.
+	(srconv.o): Depend on sysroff.c.
+	(objdump.o, arparse.o, arlex.o, sysroff.o, defparse.o, deflex.o)
+	(nlmheader.o, rcparse.o, mcparse.o, rclex.o, mclex.o, dlltool.o)
+	(rescoff.o, nlmconv.o): Rewrite using automake-style dependency
+	tracking rules; only list the dependency upon the primary source
+	file, but no included headers.
+	* Makefile.in: Regenerate.
+
+	* Makefile.am (install-pdf, install-pdf-recursive, install-html)
+	(install-html-recursive): Remove.
+	* Makefile.in: Regenerate.
+	* doc/Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am)
+	(html__strip_dir, install-html, install-html-am): Remove.
+	* doc/Makefile.in: Regenerate.
+
+	* Makefile.in: Regenerate.
+	* aclocal.m4: Likewise.
+	* config.in: Likewise.
+	* configure: Likewise.
+	* doc/Makefile.in: Likewise.
+
+2009-08-17  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (is_32bit_abs_reloc): Treat R_PARISC_SECREL32 as a
+	32-bit absolute reloc for the purposes of processing debug
+	sections.
+
+2009-08-10  Daniel Gutson  <dgutson@codesourcery.com>
+
+	* readelf.c (get_arm_section_type_name): Added support for
+	new sections headers.
+
+2009-08-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/10364
+	* objcopy.c (strip_main): Check return from smart_rename.
+	(copy_main): Likewise.
+
+2009-07-27  Nick Clifton  <nickc@redhat.com>
+
+	PR 10413
+	* objdump.c (dump_section_header): Skip sections that we are
+	ignoring.
+
+2009-07-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (guess_is_rela): Handle EM_L1OM.
+	(dump_relocations): Likewise.
+	(get_machine_name): Likewise.
+	(get_section_type_name): Likewise.
+	(get_elf_section_flags): Likewise.
+	(get_symbol_index_type): Likewise.
+	(is_32bit_abs_reloc): Likewise.
+	(is_32bit_pcrel_reloc): Likewise.
+	(is_64bit_abs_reloc): Likewise.
+	(is_64bit_pcrel_reloc): Likewise.
+	(is_none_reloc): Likewise.
+
+2009-07-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* readelf.c (get_symbol_binding): For Linux targeted files return
+	UNIQUE for symbols with the STB_GNU_UNIQUE binding.
+	* doc/binutils.texi: Document the meaning of the 'u' symbol
+	binding in the output of nm and objdump --syms.
+
+2009-07-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* NEWS: Mention --insn-width.
+
+	* objdump.c (insn_width): New.
+	(usage): Display --insn-width.
+	(option_values): Add OPTION_INSN_WIDTH.
+	(long_options): Add --insn-width.
+	(disassemble_bytes): Handle insn_width.
+	(main): Handle OPTION_INSN_WIDTH.
+
+	* doc/binutils.texi: Document --insn-width.
+
+2009-07-17  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf.c (display_debug_lines): If do_debug_lines has not been
+	set then default to displaying raw .debug_line section contents.
+
+2009-07-14  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Support unordered .debug_info references to .debug_ranges.
+	* dwarf.c (struct range_entry, range_entry_compar): New.
+	(display_debug_ranges): Remove variables last_offset, first, j,
+	seen_first_offset, use_debug_info and next.  New variables
+	range_entries and range_entry_fill.  Create the sorted copy
+	range_entries.  Remove the FIXME error on detected unordered references.
+	* dwarf.h (debug_info <range_lists>): New comment.
+
+2009-07-14  Nick Clifton  <nickc@redhat.com>
+
+	PR 10380
+	* README: Document use of LDFLAGS="--static".
+
+2009-07-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerated.
+
+2009-07-10  Tom Tromey  <tromey@redhat.com>
+
+	* Makefile.am (dwarf.o): Refer to dwarf2.h, not elf/dwarf2.h.
+	* Makefile.in: Rebuild.
+	* dwarf.c: Include dwarf2.h, not elf/dwarf2.h.
+
+2009-07-06  Tristan Gingold  <gingold@adacore.com>
+
+	* objdump.c (dump_dwarf_section): Handle .eh_frame like other dwarf
+	sections.
+	* dwarf.h (struct dwarf_section_display): Remove eh_frame field.
+	* dwarf.c (debug_displays): Adjust for removed field.
+
+2009-07-03  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf.c (decode_location_expression): Handle DW_OP_stack_value
+	and DW_OP_implicit_value.
+
+2009-07-01  Nick Clifton  <nickc@redhat.com>
+
+	PR 6714
+	* rclex.c (handle_quotes): Do not complain about whitespace
+	separating quoted strings.
+	(rclex_string): Ignore whitespace when looking for a new opening
+	quote following a closing quote.
+
+2009-06-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/10321
+	* bucomm.c (get_file_size): Return -1 on error.
+
+	* objcopy.c (copy_file): Report empty file.
+
+2009-06-23  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf.c (display_debug_lines_raw): Include the name of the
+	section in warning message.
+	(struct debug_display): Enable reloc processing for .debug_line
+	and .debug_ranges sections.
+
+	* readelf.c: Add --relocated-dump command line option to dump the
+	relocated contents of a specified section.
+	(request_dump): New function.
+	(parse_args): Use it.
+	(dump_section_as_bytes): Add parameter to indicate whether the
+	contents should be relocated.
+	(target_specific_reloc_handling): Add code for a R_MN10300_16
+	reloc found after a R_MN10300_SYM_DIFF reloc.
+	(debug_apply_relocations): Rename to apply_relocations.
+	(get_section_contents): New function.  Replaces common code found
+	in dump_section_as_strings and dump_section_as_bytes.
+	* doc/binutils.texi: Document new command line option.
+	* NEWS: Mention the new feature.
+
+2009-06-22  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (target_specific_reloc_handling): New function:
+	Processes relocs in a target specific manner.
+	(debug_apply_relocations): Use the new function.
+	* dwarf.c (display_debug_loc): End the dump with a blank line.
+	(struct debug_display): Enable reloc processing for .debug_aranges
+	and .debug_loc sections.
+
+2009-06-19  Nick Clifton  <nickc@redhat.com>
+
+	* ar.c (usage): Do not use #ifdef inside _("...).
+	* nm.c (usage): Likewise.
+
+2009-06-18  Nick Clifton  <nickc@redhat.com>
+
+	PR 10288
+	* objdump.c (disassemble_bytes): Set the
+	USER_SPECIFIED_MACHINE_TYPE flag in the disassemble_info structure
+	if the user has invoked the -m switch.
+	* doc/binutils.texi: Document the additional behaviour of
+	objdump's -m switch for ARM targets.
+
+2009-06-18  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* configure.in: Merge cegcc and mingw32ce target name changes from
+	CeGCC project.
+
+2007-12-25  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+	* configure.in: Add arm*-*-cegcc* and arm*-*-mingw32ce* targets.
+	* configure: Regenerate.
+
+2009-06-15  Nick Clifton  <nickc@redhat.com>
+
+	PR 10263
+	* objdump.c (disassemble_bytes): Set the DISASSEMBLE_DATA bit in
+	the flags field of the disassemble_info structure if the -D switch
+	is in operation.
+
+2009-06-12  Homer Xing  <homer.xing@yahoo.com>
+
+	* NEWS: Mention new feature added to gprof.
+
+2009-06-12  John Reiser  <jreiser@BitWagon.com>
+
+	* readelf.c (process_symbol_table): Set gnubuckets to NULL after
+	freeing it and before returning.
+
+2009-06-12  Jakub Jelinek  <jakub@redhat.com>
+
+	* readelf.c (process_symbol_table): Don't return early if
+	.hash/.gnu.hash is empty/unusable and not -D.
+
+2009-06-09  Tom Bramer  <tjb@postpro.net>
+
+	PR 10165
+	* winduni.c (wind_MultiByteToWideChar): Do not pass MB_PRECOMPOSED
+	to MultiByteToWideChar when using the CP_UTF8 or CO_UTF7 types.
+
+2009-06-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* strings.c (main): Delay parsing of decimal digits.
+
+2009-06-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* dep-in.sed: Don't use \n in replacement part of s command.
+	* Makefile.am (DEP1): LC_ALL for uniq.
+	Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2009-06-03  Tristan Gingold  <gingold@adacore.com>
+
+	* MAINTAINERS: Add myself as Mach-O maintainer.
+
+2009-06-01  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 10199
+	* doc/binutils.texi (nm): Correct -S description.
+
+2009-05-28  Nick Clifton  <nickc@redhat.com>
+
+	* po/da.po: Updated Danish translation.
+
+2009-05-28  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (display_debug_section): Do not display debug sections
+	with the NOBITS section type.
+
+2009-05-27  Rafael Avila de Espindola  <espindola@google.com>
+
+	* aclocal.m4: Include ../config/plugins.m4.
+	* configure.in: Use AC_PLUGINS.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+	* doc/Makefile.in: Regenerate.
+
+2009-05-27  Rafael Avila de Espindola  <espindola@google.com>
+
+	* ar.c (main): Call bfd_plugin_set_program_name.
+	* nm.c (main): Call bfd_plugin_set_program_name.
+
+2009-05-27  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* sysdump.c (tab): Use puts rather than two printfs.
+
+2009-05-26  Nick Clifton  <nickc@redhat.com>
+
+	* po/id.po: Updated Indonesian translation.
+	* po/binutils.pot: Updated template file.
+
+2009-05-26  Rafael Avila de Espindola  <espindola@google.com>
+
+	* ar.c: Include plugin.h.
+	(main): Handle the --plugin option.
+	* nm.c: Include plugin.h.
+	(OPTION_PLUGIN): New.
+	(long_options): Add plugin.
+	(main): Handle OPTION_PLUGIN.
+	* NEWS: Mention  the new feature.
+	* doc/binutils: Documement the new command line options.
+	* configure.in: Check for --enable-plugins.
+	* configure: Regenerate.
+
+2009-05-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* dep-in.sed: Output one filename per line with all lines having
+	continuation backslash.  Prefix first line with "A", following
+	lines with "B".
+	* Makefile.am (DEP): Don't use dep.sed here.
+	(DEP1): Run $MKDEP on single files, use dep.sed here on dependencies,
+	sort and uniq.
+	* Makefile.in: Regenerate.
+
+2009-05-25  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms-in: Fix CFLAGS, add addr2line.exe target.
+
+	* configure.com: Fix it: handle alloca and define TARGET in config.h.
+
+2009-05-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2009-05-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* objcopy.c (set_long_section_mode): Check input_bfd is coff
+	before accessing coff specific fields of bfd.
+
+2009-05-09  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* MAINTAINERS:  Add myself as PE/COFF co-maintainer.
+
+2009-05-08  Kai Tietz  <kai.tietz@onevision.com>
+
+	* winduni.c (iconv_onechar): Only define when HAVE_ICONV
+	is defined, but not when __CYGWIN__ or _WIN32 are defined.
+	See wind_iconv_cp for call logic of this local funtion.
+
+2009-05-05  Guillaume Duhamel  <guillaume.duhamel@gmail.com>
+
+	PR 10109
+	* winduni.c: Replace test of HAVE_ICONV_H with a test of
+	HAVE_ICONV.
+	(iconv_onechar): Use ICONV_CONST instead of "const".
+	(wind_MultiByteToWideChar): Initialise local strings.
+
+2009-04-30  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (dump_relocations): Display a relocation against an
+	ifunc symbol as if it were a function invocation.
+	(get_symbol_type): Handle STT_GNU_IFUNC.
+
+2009-04-29  Anthony Green  <green@moxielogic.com>
+
+	* NEWS: Tweak verilog support description.
+
+2009-04-29  Alan Modra  <amodra@bigpond.net.au>
+	    Denis Scherbakov <denis_scherbakov@yahoo.com>
+
+	* readelf.c (slurp_ia64_unwind_table): Correct 64-bit unwind table
+	read, and merge with 32-bit case.
+
+2009-04-27  Anthony Green  <green@moxielogic.com>
+
+	* NEWS: Mention verilog support added to bfd.
+
+2009-04-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* objcopy.c (copy_object): Copy pe_opthdr before changing PE
+	parameters.
+
+2009-04-24  Cary Coutant  <ccoutant@google.com>
+
+	* dwarf.c (process_extended_line_op): Add DW_LNE_set_discriminator.
+	Add missing newlines to HP extensions.
+
+2009-04-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* objcopy.c (set_pe_subsystem): Replace efi-rom with sal-rtd.
+	* doc/binutils.texi: Likewise.
+
+2009-04-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/10074
+	* objcopy.c: Include coff/i386.h and coff/pe.h.
+	(pe_file_alignment): New.
+	(pe_heap_commit): Likewise.
+	(pe_heap_reserve): Likewise.
+	(pe_image_base): Likewise.
+	(pe_section_alignment): Likewise.
+	(pe_stack_commit): Likewise.
+	(pe_stack_reserve): Likewise.
+	(pe_subsystem): Likewise.
+	(pe_major_subsystem_version): Likewise.
+	(pe_minor_subsystem_version): Likewise.
+	(set_pe_subsystem): Likewise.
+	(convert_efi_target): Likewise.
+	(command_line_switch): Add OPTION_FILE_ALIGNMENT,
+	OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
+	OPTION_STACK and OPTION_SUBSYSTEM.
+	(copy_options): Likewise.
+	(copy_usage): Add --file-alignment, --heap, --image-base,
+	--section-alignment, --stack and --subsystem.
+	(copy_object): Set up PE parameters.
+	(copy_main): Process Add OPTION_FILE_ALIGNMENT,
+	OPTION_HEAP, OPTION_IMAGE_BASE, OPTION_SECTION_ALIGNMENT,
+	OPTION_STACK and OPTION_SUBSYSTEM.   Convert EFI target to
+	PEI target.
+
+	* NEWS: Mention --file-alignment, --heap, --image-base,
+	--section-alignment, --stack and --subsystem command line
+	options for objcopy.
+
+	* doc/binutils.texi: Document --file-alignment, --heap,
+	--image-base, --section-alignment, --stack and --subsystem
+	command line options for objcopy.
+
+2009-04-15  Anthony Green  <green@moxielogic.com>
+
+	* MAINTAINERS: Add myself as Moxie port maintainer.
+
+2009-04-14  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* objcopy.c (enum long_section_name_handling):  New enum type.
+	(enum command_line_switch):  Add OPTION_LONG_SECTION_NAMES.
+	(copy_options[]):  Add entry for --long-section-names option.
+	(copy_usage):  Document it.
+	(set_long_section_mode):  New subroutine.
+	(copy_file):  Call it.
+	(copy_main):  Accept OPTION_LONG_SECTION_NAMES and parse arg.
+	* doc/binutils.texi:  Update objcopy documentation with details
+	of new option.
+
+2009-04-01  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* dlltool.c (set_dll_name_from_def):  Accept new second arg that
+	indicates if we are building DLL or EXE, and use it to add a
+	default suffix to the output filename when none is already present.
+	(def_name):  Indicate we are building an EXE when calling it.
+	(def_library):  Indicate we are building a DLL when calling it.
+
+2009-04-01  Jari Aalto  <jari.aalto@cante.net>
+
+	PR 9972
+	* doc/binutils.texi (strings): Document the -V alias for the
+	--version option.
+	* strings.c (usage): Likewise.
+
+2009-03-31  Nick Clifton  <nickc@redhat.com>
+
+	PR 9992
+	* configure.in: Import Solaris specific largefile test from
+	bfd/configure.in.
+	* configure: Regenerate.
+
+2009-03-30  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* MAINTAINERS: Add self.
+
+2009-03-27  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf.c (display_debug_ranges): Add the base address to the
+	displayed values for 'Begin' and 'End'.
+
+2009-03-25  Ryan Mansfield  <rmansfield@qnx.com>
+
+	* readelf.c (process_file_header): Don't report a corrupt string
+	table index if it is zero.
+
+2009-03-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* dwarf.c (dwarf_regnames): Moved before frame_need_space.
+	(dwarf_regnames_count): Likewise.
+	(frame_need_space): Return int.
+	(display_debug_frames): Check invalid registers.
+
+2009-03-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (debug_apply_relocations): Check relocations
+	against STT_SECTION symbol.
+
+2009-03-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (debug_apply_relocations): Allow relocations
+	against function symbols.
+
+2009-03-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* sysdep.h: Include alloca-conf.h instead of config.h and remove
+	existing #if's handling alloca.
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* configure.tgt: Extend AIX 5 behavior to AIX 6 and above.
+	* configure.in: Likewise.
+	* configure: Regenerate.
+
+2009-03-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/9945
+	* objcopy.c (copy_object): Clear HAS_RELOC when stripping all.
+
+2009-03-11  Chris Demetriou  <cgd@google.com>
+
+	* ar.c (deterministic): New global variable.
+	(main): Recognize new 'D' option, which enables 'deterministic mode'.
+	(usage): Document new 'D' option.
+	(write_archive): Set BFD_DETERMINISTIC_OUTPUT in output archive's
+	flags if deterministic mode was requested.
+	* doc/binutils.texi (ar): Document deterministic mode ('D' option).
+
+2009-03-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/9933
+	* objcopy.c (filter_symbols): Properly handle common symbols
+	in relocatable file.
+
+2009-03-06  Nick Clifton  <nickc@redhat.com>
+
+	* po/es.po: Updated Spanish translation.
+
+2009-03-05  Nick Clifton  <nickc@redhat.com>
+
+	* objdump.c (disassemble_section): If the computed next offset is
+	not beyond the current offset then just continue to the end.
+
+2009-03-04  Tristan Gingold  <gingold@adacore.com>
+
+	* MAINTAINERS: Add myself as VMS maintainer.
+
+2009-03-03  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c: Update formatting.
+
+2009-03-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
+2009-03-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* objdump.c (disassemble_section): Mask address before sign extending.
+
+2009-03-02  Sebastian Biallas  <sb@biallas.net>
+
+	* ieee.c (parse_ieee_ty): Add support for undocumented 'v' type.
+	(parse_ieee_bb): Set the filename if it has not already been
+	discovered.
+
+2009-03-02  Cary Coutant  <ccoutant@google.com>
+
+	* readelf.c (adjust_relative_path): New function.
+	(struct archive_info): New type.
+	(setup_archive): New function.
+	(release_archive): New function.
+	(setup_nested_archive): New function.
+	(get_archive_member_name): New function.
+	(get_archive_member_name_at): New function.
+	(make_qualified_name): New function.
+	(process_archive): Factor out code for reading archive index and
+	long filename table to setup_archive.  Add support for thin archives.
+
+2009-03-02  Nick Clifton  <nickc@redhat.com>
+
+	* po/sk.po: Updated Slovak translation.
+
+2009-03-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure: Regenerate.
+
+2009-02-23  Cary Coutant <ccoutant@google.com>
+
+	* objdump.c (load_specific_debug_section): New function, from
+	load_debug_section.
+	(load_debug_section): Use load_specific_debug_section.
+	(dump_dwarf_section): Likewise.
+
+2009-02-23  Cary Coutant <ccoutant@google.com>
+
+	* readelf.c (parse_args): Select all sections explicitly for -w.
+
+2009-02-09  Kai Tietz  <kai.tietz@onevision.com>
+
+	* windres.c (set_endianess): Copy name without leading '-'.
+
+2009-02-09  Tristan Gingold  <gingold@adacore.com>
+
+	* NEWS: Mention feature match between objdump and readelf for dumping
+	dwarf info.
+
+	* doc/binutils.texi (objdump): Document -W/--dwarf improvments to
+	objdump.
+
+	* objdump.c (usage): Update documentation for -W/--dwarf.
+	(enum option_values): Add OPTION_DWARF.
+	(long_options): --dwarf can accept arguments.
+	(dump_dwarf_section): Also check enabled field.
+	(main): Option -W can accept arguments, code moved to
+	dwarf.c and call dwarf_select_sections_all instead.
+	* readelf.c (process_section_headers): Remove do_debug_lines_decoded.
+	(parse_args): Move code to...
+	* dwarf.c (dwarf_select_sections_by_letters,
+	dwarf_select_sections_by_names): : ...here (new functions).
+	(do_debug_lines_decoded): Remove and replaced by ...
+	(FLAG_DEBUG_LINES_RAW, FLAG_DEBUG_LINES_DECODED): ... new macros.
+	(display_debug_lines): Adjust for previous change.
+	(dwarf_select_sections_all): New function.
+	(debug_displays): Add initializer for enabled field.
+	* dwarf.h (do_debug_lines_decoded): Remove.
+	Add prototypes for the new functions.
+	(struct dwarf_section_display): Add enabled field.
+
+2009-02-06  Nick Clifton  <nickc@redhat.com>
+
+	* po/vi.po: Updated Vietnamese translation.
+
+2009-02-03  Sandip Matte  <sandip@rmicorp.com>
+
+	* readelf.c (get_machine_flags): Handle E_MIPS_MACH_XLR.
+
+2009-02-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* NEWS: Move --as-needed change to ...
+	* ../ld/NEWS: Here.
+
+2009-02-03  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* configure.in: AC_SUBST pdfdir.
+	* Makefile.am: Add install-pdf, install-pdf-am,
+	and install-pdf-recursive targets.
+	* doc/Makefile.am: Define pdf__strip_dir. Add
+	install-pdf and install-pdf-am targets.
+	* po/Make-in: Add install-pdf target.
+	* configure: Regenerate.
+	* Makefile.in: Regenerate.
+	* doc/Makefile.in: Regenerate.
+
+2009-02-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/9784
+	* NEWS: Mention --prefix=PREFIX and --prefix-strip=LEVEL.
+
+	* doc/binutils.texi: Document --prefix=PREFIX and
+	--prefix-strip=LEVEL.
+
+	* objdump.c: Include "filenames.h".
+	(prefix): New.
+	(prefix_strip): Likewise.
+	(prefix_length): Likewise.
+	(usage): Add --prefix=PREFIX and --prefix-strip=LEVEL.
+	(option_values): Add OPTION_PREFIX and OPTION_PREFIX_STRIP.
+	(long_options): Likewise.
+	(show_line): Handle prefix and prefix_strip.
+	(main): Handle OPTION_PREFIX and OPTION_PREFIX_STRIP.
+
+	* readelf.c (PATH_MAX): Moved to ...
+	* sysdep.h: Here.
+
+2009-01-31  Alan Modra  <amodra@bigpond.net.au>
+
+	* NEWS: Mention --as-needed change.
+
+2009-01-29  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 9798
+	* bucomm.c (bfd_nonfatal_message): Use bfd_get_archive_filename.
+	(bfd_get_archive_filename): Constify param.
+	* bucomm.h (bfd_get_archive_filename): Update prototype.
+	* objcopy.c (RETURN_NONFATAL): Delete.
+	(copy_unknown_object): Don't call bfd_get_archive_filename for
+	bfd_nonfatal_message filename, instead just pass bfd.
+	(copy_object): Likewise.
+	(copy_archive, copy_file): Likewise.  Expand RETURN_NONFATAL.  On
+	bfd_close errors, do not pass the bfd to bfd_nonfatal_message.
+	(setup_bfd_headers): Fix error message.
+
+2009-01-27  Nick Clifton  <nickc@redhat.com>
+
+	PR 9774
+	* objdump.c (disassemble_section): When the target uses signed
+	addresses make sure that we compute signed values.
+
+2009-01-27  Nick Clifton  <nickc@redhat.com>
+
+	* MAINTAINERS: Remove Thiemo Seufer's name from the list of MIPS
+	maintainers.
+
+2009-01-26  Nick Clifton  <nickc@redhat.com>
+
+	PR 9766
+	* dlltool.c (xlate): When strip text after the @ sign, look for
+	the last one not the first one.
+
+2009-01-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* configure.in (commonbfdlib): Delete.
+	* configure: Regenerate.
+
+2008-01-14  Charles Wilson  <cygwin@cwilson.fastmail.fm>
+
+	Cleanup code related to --identify option.
+
+	* dlltool.c (file scope): Removed globals identify_ms,
+	identify_member_contains_symname_result,
+	identify_dll_name_list_head, and identify_dll_name_list_tail.
+	Renamed existing typedef dll_name_list_type to
+	dll_name_list_node_type.
+	Added new typedefs dll_name_list_type, symname_search_data_type,
+	and identify_data_type.
+	(identify_append_dll_name_to_list): Renamed to...
+	(dll_name_list_append): ...here.  Changed signature to accept list
+	argument rather than use global.
+	(identify_count_dll_name_list): Renamed to...
+	(dll_name_list_count): ...here.  Changed signature to accept list
+	argument rather than use global.
+	(identify_print_dll_name_list): Renamed to...
+	(dll_name_list_print): ...here.  Changed signature to accept list
+	argument rather than use global.
+	(identify_free_dll_name_list): Renamed to...
+	(dll_name_list_free_contents): ...here.
+	(dll_name_list_free): New function.
+	(dll_name_list_create): New function.
+	(identify_process_section_p): Changed signature to accept
+	ms_style_implib argument rather than use global.
+	(identify_member_contains_symname): Expect incoming void * data to
+	be symname_search_data_type.
+	(identify_dll_for_implib): Use new functions dll_name_list_create
+	and dll_name_list_free.  Use new types symname_search_data_type
+	and identify_data_type to communicate with search routines.
+	(identify_search_section): Expect incoming void * data to be
+	identify_data_type. Use its contents rather than global
+	variables.
+
+2009-01-13  Charles Wilson  <cygwin@cwilson.fastmail.fm>
+
+	Add --identify-strict option.  Handle ms-style implibs:
+
+	* dlltool.c (file scope): Added new globals identify_ms and
+	identify_strict. New typedef dll_name_list_type, and globals
+	identify_dll_name_list_head and identify_dll_name_list_tail. Added
+	new global identify_member_contains_symname_result.
+	(identify_append_dll_name_to_list): New function.
+	(identify_count_dll_name_list): New function.
+	(identify_print_dll_name_list): New function.
+	(identify_free_dll_name_list): New function.
+	(identify_search_archive): Changed signature to take function
+	pointer to operation to apply to each member, and data to pass on
+	to that function.
+	(identify_search_member): Changed signature to accept user data
+	from caller.
+	(identify_member_contains_symname): New function.
+	(identify_dll_for_implib): Rewrite. Now determines whether implib
+	is ms- or binutils- style, before searching sections for
+	dllname. Allows multiple dllnames.
+	(identify_process_section_p): Search alternate section for dllname
+	when implib is ms-style.
+	(identify_search_section): Add additional conditions to excludes
+	candidate sections from consideration.
+	(usage): Added --identify-strict.
+	(long_options): Added --identify-strict.
+	(main): Handle --identify-strict option.
+	* doc/binutils.texi: Document --identify-strict	option.
+	* NEWS: Document --identify and	--identify-strict options.
+
+2009-01-13  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 7034
+	* doc/binutils.texi (objdump -R): Note effect of -d or -D.
+
+2009-01-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* objdump.c (disassemble_section): Don't assume non-instruction
+	data if object symbol at given address is in different section.
+
+2009-01-12  Kai Tietz  <kai.tietz@onevision.com>
+
+	* dlltool.c (create_for_pep): New.
+	(flush_page): Use create_for_pep instead of using
+	macro DLLTOOL_MX86_64 clause.
+	(generate_idata_ofile): Likewise.
+	(make_one_lib_file): Likewise.
+	(make_head): Likewise.
+	(make_tail): Likewise.
+	(main): Initialize create_for_pep.
+
+2009-01-08  Kai Tietz  <kai.tietz@onevision.com>
+
+	* dlltool.c (use_nul_prefixed_import_tables): New.
+	(make_head): Make prefix leading zero prefix element for
+	idata$4 and idata$5 dependent to new flag.
+	(usage): Add new option  --use-nul-prefixed-import-tables.
+	(OPTION_USE_NUL_PREFIXED_IMPORT_TABLES): New.
+	(long_options): Add --use-nul-prefixed-import-tables.
+	(main): Likewise.
+	* doc/binutils.texi: Add new option documentation for
+	--use-nul-prefixed-import-tables.
+	* NEWS: Add new option.
+
+2009-01-06  Kai Tietz  <kai.tietz@onevision.com>
+
+	* windres.c (set_endianess): Get architecture name
+	for internal target names like "pe-arm-wince-little".
+	(find_arch_match): New helper.
+	* ChangeLog: Reset it.
+	* ChangeLog-2008: Moved old ChangeLog.
+
+For older changes see ChangeLog-2008
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-2010 sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-2010
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-2010	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-2010	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1077 @@
+2010-12-15  Kai Tietz  <kai.tietz@onevision.com>
+
+	* dwarf.c (display_gdb_index): Fix printf types for
+	used formatters.
+
+2010-12-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	PR binutils/12306
+	* doc/binutils.texi: Fix typos in elfedit documentation.
+
+2010-12-10  Alan Modra  <amodra@gmail.com>
+
+	* binemul.h (do_ar_emul_append): Declare.
+	* binemul.c (any_ok): New function.
+	(do_ar_emul_append): Rename from do_ar_emul_default_append.  Make
+	global, add check arg.  Adjust callers.
+	(ar_emul_default_replace): Tidy.
+	* configure.tgt (powerpc-*-aix[5-9]*,rs6000-*-aix[5-9]*): Use
+	bin_aix_emulation.
+	* emul_aix.c (bin_aix5_emulation, ar_emul_aix_internal): Delete.
+	(ar_emul_aix5_append, ar_emul_aix5_replace): Delete.
+	(check_aix): New function.
+	(ar_emul_aix_append, ar_emul_aix_replace): Rewrite.
+
+2010-12-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* .gitignore: New file.
+
+2010-12-08  Alan Modra  <amodra@gmail.com>
+
+	* ar.c: Formatting.
+	(usage): Correct help strings.
+	(decode_options): Correct getopt_long short options.  Remove
+	duplicate non-handled option message.
+	(main): Don't handle -M specially.
+
+2010-12-08  Arnaud Lacombe  <lacombar@gmail.com>
+
+	* ar.c (long_options): Add target.
+	(decode_options): Handle the --target option.
+	(open_inarch): Check for plugin's target, default to --target
+	(replace_members): Use generic `target'.
+
+	* ar.c (operation): New global variable.
+	(show_version): Likewise.
+	(show_help): Likewise.
+	(long_options): Likewise.
+	(usage): Fix help string argument order.
+	(decode_options): New.
+	(ranlib_main): Use getopt_long.
+	(main): Use decode_options.
+
+	* ar.c (main): Split ranlib path.
+	(ranlib_usage): New
+	(ranlib_main): New
+
+2010-12-03  Doug Evans  <dje@google.com>
+
+	* dwarf.c: #include "bfd_stdint.h".
+	(do_gdb_index): New global.
+	(display_gdb_index): New function.
+	(dwarf_select_sections_by_names) Add "gdb_index".
+	(dwarf_select_sections_all): Set do_gdb_index.
+	(debug_displays): Add .gdb_index.
+	* dwarf.h (do_gdb_index): Declare.
+	* objdump.c (usage): Add gdb_index.
+	* readelf.c (usage): Add gdb_index.
+	(process_section_headers): Process ".gdb_index".
+	* doc/binutils.texi (readelf): Document gdb_index dump.
+	(objdump): Ditto.
+
+2010-12-01  Kai Tietz  <kai.tietz@onevision.com>
+
+	PR binutils/11065
+	* dlltool.c (dll_name_set_by_exp_name): New variable.
+	(def_name): Allow setting of dll_name by .def file.
+	(def_library): Likewise.
+	(main): Set dll_name_set_by_exp_name, if dll_name is
+	set indirect by exp_name.
+
+2010-11-26  Alan Modra  <amodra@gmail.com>
+
+	* dwarf.c (decode_location_expression, display_debug_frames): Move
+	code handling DW_EH_PE_pcrel into..
+	(get_encoded_value): ..here.
+
+2010-11-26  Alan Modra  <amodra@gmail.com>
+
+	* po/ja.po: Update.
+
+2010-11-25  Alan Modra  <amodra@gmail.com>
+
+	* po/bg.po: Update.
+	* po/es.po: Update.
+	* po/fi.po: Update.
+	* po/ja.po: Update.
+	* po/ru.po: Update.
+	* po/zh_CN.po: Update.
+
+2010-11-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/12235
+	* elfcomm.c: New.
+	* elfcomm.h: Likewise.
+
+	* Makefile.am (HFILES): Add elfcomm.h.
+	(CFILES): Add elfcomm.c.
+	(ELFLIBS): New.
+	(readelf_SOURCES): Add $(ELFLIBS).
+	(elfedit_SOURCES): Likewise.
+	(objdump_SOURCES): Likewise.
+	* Makefile.in: Regenerated.
+
+	* dwarf.c: Include "elfcomm.h".
+	(byte_get): Removed.
+	(byte_get_little_endian): Likewise.
+	(byte_get_big_endian): Likewise.
+	(byte_get_signed): Likewise.
+	(error): Likewise.
+	(warn): Likewise.
+
+	* dwarf.h (dwarf_vma): Defined with HOST_WIDEST_INT.
+	(dwarf_size_type): Likewise.
+	(byte_get): Removed.
+	(byte_get_signed): Likewise.
+	(byte_get_little_endian): Likewise.
+	(byte_get_big_endian): Likewise.
+	(error): Likewise.
+	(warn): Likewise.
+
+	* elfedit.c: Include "elfcomm.h".  Don't include "aout/ar.h".
+	Call error () instead of non_fatal ().
+	(streq): Removed.
+	(strneq): Likewise.
+	(const_strneq): Likewise.
+	(non_fatal): Likewise.
+	(BYTE_GET): Likewise.
+	(BYTE_PUT): Likewise.
+	(byte_get): Likewise.
+	(byte_put): Likewise.
+	(byte_get_little_endian): Likewise.
+	(byte_get_big_endian): Likewise.
+	(byte_put_little_endian): Likewise.
+	(byte_put_big_endian): Likewise.
+	(adjust_relative_path): Likewise.
+	(archive_info): Likewise.
+	(setup_archive): Likewise.
+	(release_archive): Likewise.
+	(setup_nested_archive): Likewise.
+	(get_archive_member_name): Likewise.
+	(get_archive_member_name_at): Likewise.
+	(make_qualified_name): Likewise.
+
+	* objdump.c: Include "elfcomm.h".
+
+	* readelf.c: Include "elfcomm.h".  Don't include "aout/ar.h".
+	(BYTE_GET): Removed.
+	(BYTE_GET_SIGNED): Removed.
+	(streq): Likewise.
+	(strneq): Likewise.
+	(const_strneq): Likewise.
+	(byte_put): Likewise.
+	(byte_put_little_endian): Likewise.
+	(byte_put_big_endian): Likewise.
+	(adjust_relative_path): Likewise.
+	(archive_info): Likewise.
+	(setup_archive): Likewise.
+	(release_archive): Likewise.
+	(setup_nested_archive): Likewise.
+	(get_archive_member_name): Likewise.
+	(get_archive_member_name_at): Likewise.
+	(make_qualified_name): Likewise.
+
+2010-11-18  Alan Modra  <amodra@gmail.com>
+
+	PR binutils/11742
+	* readelf.c (get_archive_member_name): Formatting.  Properly
+	handle full size ar_name.
+
+2010-11-17  Alan Modra  <amodra@gmail.com>
+
+	* ar.c (print_contents): Don't internationalize strings without words.
+	* dwarf.c (process_extended_line_op): Likewise.
+	(process_debug_info): Likwise.
+	(display_debug_lines_raw): Likewise.
+	(display_debug_lines_decoded): Likewise.
+	(display_debug_abbrev): Likewise.
+	* readelf.c (process_file_header): Likewise.
+	(GET_OP): Likewise.
+	(decode_arm_unwind): Likewise.
+	(process_mips_specific): Likewise.
+	* resrc.c (run_cmd): Likewise.
+	(rcparse_warning): Likewise.
+	* objdump.c (dump_headers): Don't print "Pg".
+
+2010-11-16  Jorma Karvonen  <karvonen.jorma@gmail.com>
+
+	* windmc.c: ,%s' -> `%s' in a number of strings.
+
+2010-11-16  Jie Zhang  <jie.zhang@analog.com>
+
+	* readelf.c (get_machine_flags): Deal with Blackfin specific flags.
+
+2010-11-11  Mingming Sun  <mingm.sun@gmail.com>
+
+	* readelf.c (get_machine_flags): Add loongson-3a.
+
+2010-11-10  Nick Clifton  <nickc@redhat.com>
+
+	* po/ja.po: Updated Japanese translation.
+	* po/fr.po: Updated French translation.
+
+2010-11-08  Nick Clifton  <nickc@redhat.com>
+
+	* po/ja.po: Updated Japanese translation.
+
+2010-11-08  Alan Modra  <amodra@gmail.com>
+
+	* objcopy.c (copy_main): No need to rename sections when compressing
+	or decompressing.
+
+2010-11-05  Alan Modra  <amodra@gmail.com>
+
+	* bin2c.c: Remove internationalization and version report.
+	* Makefile.am: Update bin2c rule.
+	* Makefile.in: Regenerate.
+
+2010-11-05  Tristan Gingold  <gingold@adacore.com>
+
+	* po/binutils.pot: Regenerate
+
+2010-11-05  Tristan Gingold  <gingold@adacore.com>
+
+	* NEWS: Add marker for 2.21.
+
+2010-11-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* objdump.c (dump_bfd_header): Don't display
+	BFD_FLAGS_FOR_BFD_USE_MASK bits in abfd->flags.
+
+2010-11-02  Joseph Myers  <joseph@codesourcery.com>
+
+	* readelf.c (display_tic6x_attribute): Handle more attributes.
+
+2010-10-30  Kai Tietz  <kai.tietz@onevision.com>
+
+	* dlltool.c (scan_drectve_symbols): Allow quoted strings for -export
+	directives.
+
+2010-10-29  Joseph Myers  <joseph@codesourcery.com>
+
+	* readelf.c (display_tic6x_attribute): Use Tag_ABI_compatibility
+	not hardcoded 32.  Display name of this attribute.
+
+2010-10-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* addr2line.c (process_file): Set BFD_DECOMPRESS.
+
+	* objcopy.c (do_debug_sections): New.
+	(OPTION_COMPRESS_DEBUG_SECTIONS): New.
+	(OPTION_DECOMPRESS_DEBUG_SECTIONS): Likewise.
+	(copy_options): Add OPTION_COMPRESS_DEBUG_SECTIONS and
+	OPTION_DECOMPRESS_DEBUG_SECTIONS.
+	(copy_usage): Add --compress-debug-sections and
+	--decompress-debug-sections.
+	(copy_file): Set BFD_COMPRESS or BFD_DECOMPRESS.
+	(copy_section): Replace bfd_get_section_contents with
+	bfd_get_full_section_contents.
+	(copy_main): Handle OPTION_COMPRESS_DEBUG_SECTIONS and
+	OPTION_DECOMPRESS_DEBUG_SECTIONS.  Check do_debug_sections to
+	rename DWARF debug sections.
+
+	* objdump.c (load_specific_debug_section): Replace
+	bfd_get_section_contents with bfd_get_full_section_contents.
+	Remove bfd_uncompress_section_contents.
+	(dump_section): Replace bfd_get_section_contents with
+	bfd_get_full_section_contents.
+	(display_file): Set BFD_DECOMPRESS if needed.
+
+	* readelf.c (uncompress_section_contents): Set buffer to NULL
+	to indiate decompression failure.
+	(load_specific_debug_section): Always call
+	uncompress_section_contents.
+
+	* doc/binutils.texi: Document --compress-debug-sections and
+	--decompress-debug-sections.
+
+2010-10-29  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/12058
+	* ar.c (usage): Revert previous change.  Describe how 's' can be
+	used as a command letter.
+	* doc/binutils.texi (ar cmdline): Describe how 's' can be used as
+	a command letter.
+
+2010-10-29  Bernd Schmidt  <bernds@codesourcery.com>
+            Joseph Myers  <joseph@codesourcery.com>
+
+	* readelf.c (display_tic6x_attribute): Handle Tag_ABI_DSBT.
+
+2010-10-28  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/12058
+	* ar.c (usage): Remove spurious 's' from list of accepted command
+	letters.
+
+2010-10-28  Alan Modra  <amodra@gmail.com>
+
+	* readelf.c (is_32bit_abs_reloc): Support i960 and microblaze.
+	(is_32bit_pcrel_reloc): Support microblaze.
+
+2010-10-26  Nick Clifton  <nickc@redhat.com>
+
+	* po/ja.po: Updated Japanese transaltion.
+
+2010-10-21  Joseph Myers  <joseph@codesourcery.com>
+
+	* readelf.c (display_tic6x_attribute): Update for attribute
+	renaming.
+
+2010-10-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* dwarf.c (byte_get_signed): Make it extern.
+
+	* dwarf.h (byte_get_signed): New.
+
+	* readelf.c (BYTE_GET_SIGNED): New.
+	(slurp_rela_relocs): Use BYTE_GET_SIGNED on r_addend.
+	(dump_relocations): Properly dump r_addend.
+
+2010-10-08  Joseph Myers  <joseph@codesourcery.com>
+
+	* nm.c (value_format_64bit): Define appropriately for __MSVCRT__.
+	(set_print_radix): Update for __MSVCRT__ definition of
+	value_format_64bit.
+
+2010-10-08  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	Fix build with -DDEBUG=7
+	* nlmheader.y (DEBUG token): Rename to DEBUG_K.
+
+2010-10-06  Alan Modra  <amodra@gmail.com>
+
+	* bucomm.c (bfd_nonfatal, bfd_nonfatal_message): Don't clobber errno.
+
+2010-10-05  Alan Modra  <amodra@gmail.com>
+
+	* bucomm.c (bfd_nonfatal): Flush stdout before output to stderr.
+	(bfd_nonfatal_message, report, list_matching_formats): Likewise.
+	(list_supported_targets): Tidy.
+	* objdump.c (free_only_list): Formatting.
+	(slurp_dynamic_symtab): Non-zero exit status for "not a dynamic
+	object".
+	(update_source_path): Delete redundant check for NULL filename.
+	(disassemble_bytes): Error if disassemble_fn returns a value
+	that won't increment address.
+	(disassemble_data): Don't capitalize error message.
+	(read_section_stabs): Likewise.
+	(main): Return non-zero exit status on bad options.
+
+2010-10-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/12088
+	* nm.c (plugin_target): New.
+	(main): Set plugin_target to "plugin" for --plugin.
+	(display_file): Pass plugin_target to bfd_openr if target
+	isn't set.
+
+2010-09-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure: Regenerate.
+
+2010-09-22  Mike Frysinger  <vapier@gentoo.org>
+
+	* MAINTAINERS: Add self as ADI Blackfin maintainer.
+
+2010-09-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* emul_aix.c (ar_emul_aix_append): Add a target argument
+	and ignore it if it is set.
+	(ar_emul_aix5_append): Likewise.
+	(ar_emul_aix_replace): Likewise.
+	(ar_emul_aix5_replace): Likewise.
+
+2010-09-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ar.c (plugin_target): New.
+	(main): Set plugin_target to "plugin" for --plugin.
+	(open_inarch): Initialize target to plugin_target.
+	(replace_members): Pass plugin_target to ar_emul_replace
+	and ar_emul_append.
+
+	* binemul.h (ar_emul_append): Add a target argument.
+	(ar_emul_default_append): Likewise.
+	(ar_emul_replace): Likewise.
+	(ar_emul_default_replace): Likewise.
+	(bin_emulation_xfer_struct): Add a target argument to
+	ar_append and ar_replace.
+
+	* binemul.c (ar_emul_append): Updated.  Pass target to bfd_openr.
+	(do_ar_emul_default_append): Likewise.
+	(ar_emul_default_append): Likewise.
+	(ar_emul_replace): Likewise.
+	(ar_emul_default_replace): Likewise.
+
+2010-09-10  Ben Gardiner  <bengardiner@nanometrics.ca>
+
+	* objcopy.c: Add --interleave-width option to allow interleaving
+	of more than one byte at a time.
+	(copy_width): New variable.
+	(copy_options): Add --interleave-width.
+	(copy_section): When interleaving copy in units of copy_width
+	bytes.
+	(copy_main): Parse the new option.
+	* doc/binutils: Document the new option.
+	* NEWS: Mention the new feature.
+
+2010-09-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf.c (decode_location_expression): Fix data adjustment
+	for DW_OP_GNU_implicit_pointer in v3+.
+
+2010-09-09  Tristan Gingold  <gingold@adacore.com>
+
+	* NEWS: Add entry to NEWS for hppa/som.
+
+2010-09-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf.h (debug_info): Add offset_info and dwarf_version fields.
+	* dwarf.c (decode_location_expression): Add offset_size and
+	dwarf_version arguments.  Prefix DIE offset with 0x for
+	DW_OP_call{2,4,_ref}.  Fix up DW_OP_call_ref operand size,
+	complain if in frame info section.  Handle
+	DW_OP_GNU_implicit_pointer.
+	(read_and_display_attr_value, display_debug_loc,
+	display_debug_frames): Adjust decode_location_expression callers.
+	(process_debug_info): Save offset_size and dwarf_version values
+	into debug_information array.
+
+2010-09-07  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (process_section_headers): Mention meaning of 'l'
+	section flag for x86-64 targets.
+
+2010-09-03  Jan Kratochvil  <jan.kratochvil@redhat.com>
+	    Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf.c (regname): New declaration.
+	(decode_location_expression): Print for registers also regname output.
+
+2010-09-02  Richard Henderson  <rth@redhat.com>
+
+	* dwarf.c (init_dwarf_regnames_i386, init_dwarf_regnames_x86_64): New.
+	(init_dwarf_regnames): Use them.
+	* dwarf.h: Declare them.
+	* objdump.c (dump_dwarf): Use bfd_get_arch + bfd_get_mach to set up
+	the regnames, rather than using elf_machine_code.
+
+2010-09-02  Richard Henderson  <rth@redhat.com>
+
+	* objdump.c (dump_dwarf): Use bfd_arch_bits_per_address.
+
+2010-08-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfedit.c (input_elf_osabi): New.
+	(output_elf_osbi): Likewise.
+	(osabis): Likewise.
+	(elf_osabi): Likewise.
+	(update_elf_header): Support updating ELF OSABI.
+	(make_qualified_name): Break long line.
+	(command_line_switch): Add OPTION_INPUT_OSABI and
+	OPTION_OUTPUT_OSABI.
+	(options): Likewise.
+	(usage): Add --input-osabi and --output-osabi.
+	(main): Handle OPTION_INPUT_OSABI and OPTION_OUTPUT_OSABI.
+
+	* doc/binutils.texi: Document --input-osabi and --output-osabi
+	for elfedit.
+
+2010-08-23  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* readelf.c (display_mips_gnu_attribute): Replace GCC options
+	with a textual description of a MIPS32r2 64-bit FPU.
+
+2010-08-13  Dan Rosenberg  <dan.j.rosenberg@gmail.com>
+
+	PR binutils/11889
+	* readelf.c (get_32bit_elf_symbols): Check for a corrupt
+	sh_entsize.
+	(get_64bit_elf_symbols): Likewise.
+	(process_symbol_table): Likewise.
+	(process_section_groups): Check for corrupt headers.
+	(process_version_sections): Check for corrupt indicies.
+	(process_corefile_note_segment): Likewise.
+
+2010-08-13  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* readelf.c (get_machine_flags): Detect CF ISA C and EMAC_B
+	variants.
+
+2010-08-13  Tom Tromey  <tromey@redhat.com>
+
+	* dwarf.c (process_debug_info): Don't subtract section address
+	when calculating location of cu abbrev within section.
+
+2010-08-12  Michael Haubenwallner  <haubi@gentoo.org>
+
+	PR binutils/11742
+	* readelf.c (get_archive_member_name): Do not read beyond the end
+	of the ar_name field.
+
+2010-08-03  Tristan Gingold  <gingold@adacore.com>
+
+	* dwarf.c (display_debug_lines): Mark file argument unused.
+	Do not try to load .debug_info section.
+
+2010-08-02  Alan Modra  <amodra@gmail.com>
+
+	* readelf.c (apply_relocations): D30V is really REL.
+
+2010-07-23  Naveen.H.S  <naveen.S@kpitcummins.com>
+	    Ina Pandit  <ina.pandit@kpitcummins.com>
+
+	* binutils/readelf.c: Add support for V850E2 and V850E2V3.
+
+2010-07-22  Alan Modra  <amodra@gmail.com>
+
+	* readelf.c: Add Moxie support.
+
+2010-07-20  Alan Modra  <amodra@gmail.com>
+
+	* readelf.c (process_program_headers): Don't ignore all zero size
+	sections.
+
+2010-07-19  Andreas Schwab  <schwab@redhat.com>
+
+	* readelf.c (process_section_headers): Update key to flags.
+
+2010-07-17  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* objcopy.c (copy_usage): Tweak previous typofix.
+
+2010-07-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* objcopy.c (copy_usage): Fix a typo.
+
+2010-07-15  Kai Tietz <kai.tietz@onevision.com>
+
+	* dllwrap.c (main): Make sure is_leading_underscore
+	gets initialized with correct default.
+
+2010-07-05  Alan Modra  <amodra@gmail.com>
+
+	* readelf.c (uncompress_section_contents): Avoid gcc-4.6 warning.
+
+2010-07-03  Cary Coutant  <ccoutant@google.com>
+
+	* objdump.c (load_specific_debug_section): Decompress section contents
+	before applying relocations.
+	* readelf.c (load_specific_debug_section): Update section size after
+	decompression.
+
+2010-06-29  Alan Modra  <amodra@gmail.com>
+
+	PR binutils/3166
+	* objcopy.c (is_strip_section): Revert 2006-09-05.
+	(setup_section): Make SHT_GROUP section nobits.
+
+2010-06-29  Alan Modra  <amodra@gmail.com>
+
+	* configure: Regenerate.
+	* po/POTFILES.in: Regenerate.
+
+2010-06-27  Alan Modra  <amodra@gmail.com>
+
+	* resbin.c (res_to_bin_accelerator): Delete set but unused variables.
+
+2010-06-17  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/11711
+	* windres.c (enum option_values): New enum.
+	(long_options): Use separate option number for --include-dir
+	option.
+	(main): Separate backwards compatibility check from code to
+	implement --include-dir.  Check to see if directory exists and do
+	not complain if it does.
+
+2010-06-15  Joseph Myers  <joseph@codesourcery.com>
+
+	* readelf.c (display_tic6x_attribute, process_tic6x_specific):
+	New.
+	(process_arch_specific): Call process_tic6x_specific for
+	EM_TI_C6000.
+
+2010-06-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (dump_ia64_vms_dynamic_fixups): Cast to unsigned long
+	for 0x%lx.
+
+2010-06-11  Tristan Gingold  <gingold@adacore.com>
+	    Doug Rupp <rupp@gnat.com>
+
+	* readelf.c (is_ia64_vms): New function.
+	(dump_relocations): Use it.
+	(get_machine_flags): Display IA-64 OpenVMS flags.
+	(process_program_headers): No error on OpenVMS if no .dynamic section.
+	(struct ia64_vms_dynfixup, struct ia64_vms_dynimgrela): New
+	declarations.
+	(dump_ia64_vms_dynamic_fixups): New function.
+	(dump_ia64_vms_dynamic_relocs): Ditto.
+	(process_ia64_vms_dynamic_relocs): Ditto.
+	(process_relocs): Handle IA-64 OpenVMS relocs.
+	(VMS_EPOCH_OFFSET, VMS_GRANULARITY_FACTOR): New macros.
+	(print_vms_time): New function.
+	(dynamic_section_ia64_val): Handle DT_IA_64_VMS_LINKTIME and
+	DT_IA_64_VMS_LNKFLAGS.
+	(get_ia64_symbol_other): New function.
+	(get_symbol_other): Handle EM_IA_64.
+
+2010-06-11  Tristan Gingold  <gingold@adacore.com>
+
+	* unwind-ia64.c (unw_print_abreg): Add const to special_reg.
+	(UNW_DEC_ABI): Ditto for abiname.
+	(unw_decode_table): Make it const.
+
+2010-06-10  Tristan Gingold  <gingold@adacore.com>
+
+	* readelf.c (slurp_ia64_unwind_table): IA64 rela relocations are
+	not inplace.
+
+2010-05-25  Daniel Jacobowitz  <dan@codesourcery.com>
+	    Joseph Myers  <joseph@codesourcery.com>
+	    Andrew Stubbs  <ams@codesourcery.com>
+
+	* readelf.c (get_machine_flags): Handle EF_SH_PIC and EF_SH_FDPIC.
+
+2010-05-25  Jay Krell  <jay.krell@cornell.edu>
+
+	PR ld/11621
+	* Makefile.am: Replace all occurences of .o with .@OBJEXT@
+	* Makefile.in: Regenerate.
+
+2010-05-24  Tristan Gingold  <gingold@adacore.com>
+
+	* readelf.c (usage): Add new trace sections for --debug-dump.
+	(process_section_headers): Handle dump of trace sections.
+	* objdump.c (usage): Add new trace sections for --dwarf.
+	* dwarf.h (do_trace_info, do_trace_abbrevs): New variables.
+	(do_trace_aranges): Ditto.
+	(enum dwarf_section_display_enum): Add trace_info, trace_abbrev
+	and trace_aranges literals.
+	* dwarf.c (do_trace_info, do_trace_abbrevs): New variables.
+	(do_trace_aranges): Ditto.
+	(process_debug_info): Add abbrev_sec argument and replace
+	abbrev with abbrev_sec.
+	(load_debug_info): Adjust call of process_debug_info.
+	(display_debug_info): Ditto.
+	(display_trace_info): New function.
+	(dwarf_select_sections_by_names): Add trace_info, trace_abbrevs
+	and trace_aranges sections name.
+	(dwarf_select_sections_all): Also select trace sections.
+	(debug_displays): Reindent.  Add entries for the trace sections.
+	* doc/binutils.texi (readelf): Document new --dwarf parameters.
+	(objdump): Ditto.
+
+2010-05-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gas/11600
+	* readelf.c (get_elf_section_flags): Treat SHF_EXCLUDE as a
+	generic flag.
+
+2010-05-07  Tristan Gingold  <gingold@adacore.com>
+
+	* Makefile.in: Regenerate with automake 1.11.1.
+	* aclocal.m4: Ditto.
+	* doc/Makefile.in: Ditto.
+
+2010-05-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* dwarf.c (init_dwarf_regnames): Handle EM_L1OM.
+	* readelf.c (get_elf_section_flags): Likewise.
+	(process_section_headers): Likewise.
+
+2010-05-05  Nick Clifton  <nickc@redhat.com>
+
+	* po/es.po: Updated Spanish translation.
+
+2010-04-27  Kai Tietz  <kai.tietz@onevision.com>
+
+	* dlltool.c (main): Query for bfd's underscoring default for
+	default target case.
+
+2010-04-27  Nick Clifton  <nickc@redhat.com>
+
+	* po/ru.po: Updated Russian translation.
+
+2010-04-23  Alan Modra  <amodra@gmail.com>
+
+	* readelf.c (process_program_headers): Replace use of
+	ELF_IS_SECTION_IN_SEGMENT_MEMORY with ELF_SECTION_IN_SEGMENT.
+
+2010-04-22  Nick Clifton  <nickc@redhat.com>
+
+	* po/binutils.pot: Updated by the Translation project.
+	* po/fi.po: Updated Finnish translation.
+	* po/vi.po: Updated Vietnamese translation.
+	* po/bg.po: New Bulgarian translation.
+	* configure.in (ALL_LINGUAS): Add bg.
+	* configure: Regenerate.
+
+2010-04-20  Nick Clifton  <nickc@redhat.com>
+
+	* po/fr.po: Updated french translation.
+
+2010-04-20  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c: Add _() macros to constant strings that are
+	translatable.
+
+	* readelf.c (display_mips_gnu_attribute): Replace GCC options
+	with a textual description of single and double precision float.
+
+2010-04-15  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+	* readelf.c (arm_attr_tag_FP_arch): Rename from arm_attr_tag_VFP_arch.
+	(arm_attr_tag_ABI_align8_needed): Remove.
+	(arm_attr_tag_ABI_align8_preserved): Remove.
+	(arm_attr_tag_ABI_HardFP_use): Update text strings.
+	(arm_attr_public_tags): Add strings for ABI v2.08 attribute tags.
+	(display_arm_attribute): Add decoding of ABI v2.08 attributes.
+
+2010-04-13  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/11419
+	* dwarf.c (process_debug_info): Initialise the signature array.
+
+2010-04-09  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf.c (process_debug_info): Remove unused variable
+	cu_abbrev_offset_ptr.
+	(display_debug_lines_decoded): Remove unused variable prev_line.
+	* elfedit.c (process_archive): Remove unused variable
+	file_name_size.
+	* ieee.c (ieee_start_compilation_unit): Remove unused variable
+	nindx.
+	(ieee_set_type): Remove unused variables info, targetindx and
+	baseindx.
+	* objdump.c (disassmble_byte): Remove unused variable done_dot.
+	* rddbg.c (read_section_stabs_debugging_info): Remove unused
+	variable other.
+	* readelf.c (dump_section_as_strings): Remove unused variable
+	addr.
+	(process_archive): Remove unused variable file_name_size.
+	* stabs.c (parse_stab_string): Mark desc parameter as unused.
+	Remove unused variable lineno.
+	(parse_stab_struct_type): Remove unused variable orig.
+	(stab_demangle_type): Remove unused variables constp, volatilep
+	and hold.
+
+2010-04-07  Alan Modra  <amodra@gmail.com>
+
+	* configure: Regenerate.
+
+2010-04-06  Nick Clifton  <nickc@redhat.com>
+
+	* po/vi.po: Updated Vietnamese translation.
+
+2010-04-05  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf.c (struct Frame_Chunk): Add ptr_size and segment_size
+	fields.
+	(display_debug_frames): Handle CIE version 4.
+
+	* dwarf.c (struct State_Machine_Registers): Add op_index field,
+	change end_sequence type to unsigned char.
+	(reset_state_machine): Clear op_index.
+	(process_extended_line_op): For DW_LNE_set_address clear op_index.
+	(display_debug_lines_raw): Initialize li_max_ops_per_insn.
+	Track op_index state machine register and print it if
+	li_max_ops_per_insn is != 1.
+	(display_debug_lines_decoded): Likewise.
+
+2010-04-01  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf.c (read_and_display_attr_value): Don't reject
+	dwarf_version == 4.  Handle DW_FORM_sec_offset, DW_FORM_flag_present
+	and DW_FORM_exprloc.
+	(process_debug_info): Handle cu_version == 4.
+	(display_debug_lines_raw, display_debug_lines_decoded): Handle
+	li_version == 4.
+
+2010-03-30  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* Makefile.am (CONFIG_STATUS_DEPENDENCIES): Define.
+	* Makefile.in: Regenerate.
+
+2010-03-25  Joseph Myers  <joseph@codesourcery.com>
+
+	* MAINTAINERS: Add self as TI C6X maintainer.
+	* NEWS: Add news entry for TI C6X support.
+	* readelf.c: Include elf/tic6x.h.
+	(guess_is_rela): Handle EM_TI_C6000.
+	(dump_relocations): Likewise.
+	(get_tic6x_dynamic_type): New.
+	(get_dynamic_type): Call it.
+	(get_machine_flags): Handle EF_C6000_REL.
+	(get_osabi_name): Handle machine-specific values only for relevant
+	machines.  Handle C6X values.
+	(get_tic6x_segment_type): New.
+	(get_segment_type): Call it.
+	(get_tic6x_section_type_name): New.
+	(get_section_type_name): Call it.
+	(is_32bit_abs_reloc, is_16bit_abs_reloc, is_none_reloc): Handle
+	EM_TI_C6000.
+
+2010-03-25  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* doc/binutils.texi (readelf) <unwind information>: Mention support for
+	ARM unwind tables.
+
+2010-03-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (decode_arm_unwind): Increase buf size to 9 byte.
+
+2010-03-17  Alan Modra  <amodra@gmail.com>
+
+	* readelf.c (dump_arm_unwind): Warning fix.
+
+2010-03-16  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* MAINTAINERS: Update my email address.  List Tristan Gingold
+	as the release branch maintainer.
+
+2010-03-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* readelf.c (get_ver_flags): Handle VER_FLG_INFO.
+
+2010-03-02  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* NEWS: Document .ARM.exidx / .ARM.extab support.
+
+	* dwarf.c (read_leb128): Make non-static.
+	* dwarf.h (read_leb128): Declare.
+	* readelf.c (REMOVE_ARCH_BITS): Define.
+	(find_section_by_address): New.
+	(read_uleb128): Move higher.  Use read_leb128 from dwarf.c.
+	(find_symbol_for_address): Handle the Thumb bit for ARM, by
+	using REMOVE_ARCH_BITS.
+	(struct arm_section, struct arm_unw_aux_info, arm_print_vma_and_name)
+	(arm_free_section, arm_section_get_word, decode_arm_unwind)
+	(dump_arm_unwind, arm_process_unwind): New.
+	(process_unwind): Handle ARM.
+
+2010-02-26  Jie Zhang  <jie@codesourcery.com>
+
+	* MAINTAINERS: Update my email address.
+
+2010-02-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	PR binutils/11298
+	* doc/binutils.texi (windmc): Fix synopsis and description of
+	ASCII options.
+
+2010-02-19  Alan Modra  <amodra@gmail.com>
+
+	* readelf.c (get_group_flags): Return empty string when flags zero.
+	Add space in other returned values.
+	(process_section_groups): Adjust format string.
+
+2010-02-18  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+	* readelf.c (arm_attr_tag_Advanced_SIMD_arch): Add description of
+	newly permitted attribute values.
+	(arm_attr_tag_Virtualization_use): Likewise.
+	(arm_attr_tag_DIV_use): Add description of new attribute.
+	(arm_attr_tag_MPextension_use_legacy): Likewise.
+
+2010-02-15  Nick Clifton  <nickc@redhat.com>
+
+	* po/vi.po: Updated Vietnamese translation.
+
+2010-02-09  Michael Holzheu  <holzheu@de.ibm.com>
+
+	* readelf.c (get_note_type): Handle NT_S390_TIMER, NT_S390_TODCMP,
+	NT_S390_TODPREG, NT_S390_CTRS and NT_S390_PREFIX.
+
+2010-02-08  Jim Blandy  <jimb@red-bean.com>
+
+	* dwarf.c (display_debug_frames): Skip the 'S' character in CFI
+	'z' augmentation strings.
+
+2010-02-08  Christophe Lyon  <christophe.lyon@st.com>
+
+	* objdump.c (disassemble_bytes): Clear aux->reloc before printing
+	a new address, so as not to reuse a previous, non-related reloc.
+
+2010-02-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (get_note_type): Handle NT_X86_XSTATE.
+
+2010-02-01  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* objcopy.c (copy_object): Set SEC_LINKER_CREATED when adding
+	sections.
+
+2010-01-28  Nick Clifton  <nickc@redhat.com>
+
+	PR 11225
+	* objdump.c (only): Replace with linked list.
+	(only_size, only_used): Replace with only_list.
+	(process_section_p): Set seen field on matches sections.
+	(add_only): New function.
+	(free_only_list): New function.
+	(disassemble_section): Check only_list.
+	(main): Use add_only and free_only_list.
+
+2010-01-26  Tristan Gingold  <gingold@adacore.com>
+
+	* Makefile.am (bin2c): Add libintl dependance and library.
+	* Makefile.in: Regenerate.
+
+2010-01-21  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* readelf.c (get_machine_flags): Handle EF_S390_HIGH_GPRS.
+
+2010-01-19  Ian Lance Taylor  <iant@google.com>
+
+	* objcopy.c (copy_main): Rewrite OPTION_ADD_SECTION code to work
+	with non-ordinary files like /dev/null.
+
+2010-01-19  Daisuke Hatayama  <d.hatayama@jp.fujitsu.com>
+	    Alan Modra <amodra@gmail.com>
+
+	* readelf.c (process_file_header): Handle e_phnum extension.
+
+2010-01-14  Tristan Gingold  <gingold@adacore.com>
+
+	* dwarf.c (get_AT_name): Handle DW_AT_use_GNAT_descriptive_type
+	and DW_AT_GNAT_descriptive_type.
+
+2010-01-13  Tristan Gingold  <gingold@adacore.com>
+
+	* ar.c (main): Use lbasename.
+	(normalize): Ditto.
+	* objdump.c (update_source_path): Ditto.
+
+2010-01-12  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms (CFLAGS): Turns warnings into informational messages.
+
+2010-01-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/11146
+	* NEWS: Mention --dyn-syms for readelf.
+
+	* readelf.c (do_dyn_syms): New.
+	(OPTION_DYN_SYMS): Likewise.
+	(options): Add "dyn-syms".
+	(usage): Add --dyn-syms.
+	(parse_args): Handle OPTION_DYN_SYMS.
+	(process_symbol_table): Handle do_dyn_syms.
+	(process_object): Likewise.
+	(process_archive): Likewise.
+
+	* doc/binutils.texi: Document --dyn-syms for readelf.  Mention
+	symbol hash tables for -D.
+
+2010-01-11  Nick Clifton  <nickc@redhat.com>
+
+	* NEWS: Mention addition of elfedit.
+
+	* po/fi.po: Updated Finnish translation.
+
+2010-01-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+	* doc/Makefile.in: Regenerate.
+
+2010-01-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* version.c (print_version): Change to "Copyright 2010".
+
+2010-01-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfedit.c (input_elf_type): New.
+	(output_elf_type): Likewise.
+	(elf_type): Likewise.
+	(update_elf_header): Support updating ELF file type.
+	(command_line_switch): Add OPTION_INPUT_TYPE and
+	OPTION_OUTPUT_TYPE.
+	(options): Likewise.
+	(usage): Add --input-type and --output-type.
+	(main): Handle OPTION_INPUT_TYPE and OPTION_OUTPUT_TYPE.  Check
+	one of --output-mach and --output-type must be specified.
+
+	* doc/binutils.texi: Document --input-type and --output-type
+	for elfedit.
+
+2010-01-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* doc/binutils.texi: Fix a typo.
+
+2010-01-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfedit.c (update_elf_header): Don't change input_elf_class
+	nor input_elf_machine if they are -1.
+
+2010-01-08  Tristan Gingold  <gingold@adacore.com>
+
+	* ar.c: Remove bfd_special_undocumented_glue prototype.
+
+2010-01-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfedit.c (update_elf_header): Reformat.
+
+2010-01-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (usage): Fix indent for --symbols.
+
+2010-01-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* doc/binutils.texi: Replace -histogram with --histogram.
+
+2010-01-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/11131
+	* Makefile.am (ELFEDIT_PROG): New.
+	(bin_PROGRAMS): Add $(ELFEDIT_PROG).
+	(CFILES): Add elfedit.c.
+	(elfedit_DEPENDENCIES): New.
+	(elfedit_SOURCES): Likewise.
+	(elfedit_LDADD): Likewise.
+	* Makefile.in: Regenerated.
+
+	* elfedit.c: New.
+
+	* doc/binutils.texi: Document elfedit.
+
+	* doc/Makefile.am (man_MANS): Add elfedit.1.
+	(elfedit.1): New.
+	* doc/Makefile.in: Regenerated.
+
+2010-01-06  Tristan Gingold  <gingold@adacore.com>
+
+	* nm.c (usage): Remove extra blanks.
+
+2010-01-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* objcopy.c: Update copyright.
+	* readelf.c: Likewise.
+
+2010-01-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/11130
+	* objcopy.c (copy_object): Remove "Warning: " from error
+	message.
+
+2010-01-04  Nick Clifton  <nickc@redhat.com>
+
+	PR 11128
+	* readelf.c (dump_section_as_strings): Use two separate
+	invocations of printf() in order to work around bugs in
+	the Solaris 8 implementation.
+
+2010-01-04  Nick Clifton  <nickc@redhat.com>
+
+	* po/ru.po: Updated Russian translation.
+
+For older changes see ChangeLog-2009
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-9197 sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-9197
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-9197	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-9197	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,5217 @@
+Mon Dec 29 16:58:05 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	From Matthew Bellantoni <matthew@chrysalis.com>:
+	* ar.c (get_pos_bfd): Add default_posname parameter.  Change all
+	callers.
+	(replace_members): Default to replacing in the same position.
+
+Mon Dec 22 11:27:22 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* rclex.l: Don't permit a comma in a STRING.
+	* rcparse.y (acc_entry): Warn if an inappropriate modifier is used
+	with a non VIRTKEY.
+	(acc_event): For a control character, set VIRTKEY, and force the
+	character to uppercase.
+	(acc_options): Don't require a comma separator.
+
+Tue Dec  9 13:25:42 1997  Michael Meissner  <meissner@cygnus.com>
+
+	* size.c (size_number): New function to provide size of field.
+	({l,r}print_number): For octal and hex fields, print field using
+	'0' and '0x' suffixes.  Do not include following tab.
+	(sysv_internal_sizer): Size section name, section size, and vma
+	address fields.
+	(sysv_internal_printer): Use calculated sizes for the columns.
+	(print_sysv_format): Size columns before printing.
+	(print_berkeley_format): Print tabs between numbers now that
+	{l,r}print_number doesn't.  Print fields right justified.
+
+Mon Dec  8 11:22:04 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* objdump.c (objdump_print_addr_with_sym): Remove call to
+	disasm_symaddr() as this function no longer exists.
+
+Tue Dec  2 10:23:50 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* objdump.c (objdump_print_addr_with_sym): Call disasm_symaddr()
+	to allow backend to know which symbol has just been displayed.
+
+Tue Dec  2 13:06:46 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* windres.h (ESCAPE_*): Define standard escape sequences.
+	* rclex.l (handle_quotes): Handle standard escape sequences.  Warn
+	about an unrecognized escape character.
+	* windres.c (unicode_print): Print standard escape sequences.
+	* rcparse.y (acc_event): Initialize $$.next.
+	* resbin.c (bin_to_res_menuitems): Don't set MENUITEM_POPUP or
+	MENUITEM_ENDMENU in the menu item flags.
+	(bin_to_res_accelerators): Allocate a structure (the old code
+	never worked).
+	(res_to_bin_accelerator): Correct the test for setting ACC_LAST.
+	(res_to_bin_dialog): Save the extended style rather than saving
+	the style twice.  Remove useless shadowing length variable.  Set
+	the length of control data correctly.
+	* resrc.c (write_rc_dialog): Don't print the class or menu if the
+	string length is zero.
+
+Mon Nov 24 18:52:43 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* stabs.c (parse_stab_argtypes): Don't try to parse the name of a
+	destructor as mangled argument types.
+
+Mon Nov 10 17:51:41 1997  Gavin Koch  <gavin@cygnus.com>
+
+	* addr2line.c (translate_addresses): Use bfd_scan_vma rather
+	than strtol to scan addresses.
+
+Sun Nov  9 11:01:31 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.am (bin_PROGRAMS): Don't use line continuations here.
+
+Tue Nov  4 11:56:14 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objcopy.c (copy_section): Don't crash if there is no particular
+	information for a section.
+
+Mon Nov  3 12:36:19 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objcopy.c (parse_flags): Make flag check case insensitive.
+	Check for `contents' flag.  Give an error for unrecognized flags.
+	(copy_section): If the contents flag was set for a section that
+	had no contents, zero out the new contents.
+	* binutils.texi (objcopy): Document contents section flag.
+
+Sun Nov  2 14:49:56 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objcopy.c: Move new struct and variable definitions to top of
+	file.  Remove obsolete add_strip_symbol and is_strip_symbol
+	declarations.  Add prototype declarations for add_specific_symbol
+	and is_specified_symbol.
+
+Mon Oct 20 15:31:43 1997  Klaus K"ampf  <kkaempf@progis.de>
+
+	* configure.com (HAVE_SBRK): Undefine.
+
+Tue Oct 14 16:14:35 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* objdump.c (objdump_symbol_at_address): New function.  Returns
+	true if a symbol can be found at the address passed in.
+	(disassemble_data): Set the symbol_at_address_func field to point
+	to objdump_symbol_at_address.
+
+Fri Oct 10 14:13:09 1997  Richard Henderson  <rth@cygnus.com>
+
+	* objcopy.c, objcopy.1, binutils.texi: "localize" is a better name
+	than "privatize".  Update all references.
+
+Thu Oct  9 15:57:29 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* binutils.texi (strip): Remove duplicate --target.  From Marty
+	Leisner <leisner@sdsp.mc.xerox.com>.
+
+	* nm.c (lineno_cache_bfd): New file static variable.
+	(lineno_cache_rel_bfd): New file static variable.
+	(display_archive): Clear lineno_cache_bfd and lineno_cache_rel_bfd
+	when closing a BFD.
+	(display_file): Likewise.
+	(print_symbol): Use lineno_cache_bfd and lineno_cache_rel_bfd
+	instead of cache_bfd and cache_rel_bfd.  Make seccount static, and
+	only set it when setting relocs.
+
+Wed Oct  8 21:19:11 1997  Richard Henderson  <rth@cygnus.com>
+
+	* objcopy.c (keep_specific_list, privatize_specific_list,
+	weaken_specific_list): New variables.
+	(keep_symbols): Removed.
+	(add_specific_symbol): New function from the carcas of
+	add_strip_symbol.  Takes a list as an argument.
+	(is_specified_symbol): Likewise from is_strip_symbol.
+	(filter_symbols): Honor the new privatize and weaken lists.
+	Optimize bfd_asymbol_name handling.
+	(copy_object, copy_options, copy_usage): Add privatize-symbol &
+	weaken-symbol options.
+
+	* objcopy.1, binutils.texi: Update docs.
+
+Sun Oct  5 09:05:44 1997  Frank Ch. Eigler  <fche@cygnus.com>
+
+	* objdump.c (disassemble_data): Make "--prefix-addresses"
+ 	disassembly adjust to mixed-length instructions.
+	(objdump_print_addr_with_sym): Add "0x" prefix for hexadecimal
+ 	symbol-offsets in disassembly.
+
+Fri Oct  3 12:04:25 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objcopy.c (set_times): New static function, replacing
+	make_same_dates.
+	(strip_main): If preserve_dates, stat the input file before
+	copying it, and call set_times afterward.
+	(copy_main): Likewise.
+
+	* wrstabs.c (write_stabs_in_sections_debugging_info): Cast p to
+	char * when calling strcpy and strlen.
+
+Wed Sep 24 11:34:05 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* binutils.texi	(ar cmdline): Document that q now works like r.
+	From Marty Leisner <leisner@sdsp.mc.xerox.com>.
+
+	* binutils.texi (size): The object file argument is optional.
+	From Marty Leisner <leisner@sdsp.mc.xerox.com>.
+
+	* aclocal.m4: Rebuild with new libtool.
+	* configure: Rebuild.
+
+Tue Aug 26 17:48:34 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (EXEEXT_FOR_BUILD): New variable.  Use it in all
+	references to the sysinfo program.
+	* configure.in: Rebuild with new bfd/acinclude.m4.
+	* Makefile.in: Rebuild.
+
+Fri Aug  8 15:32:49 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* windres.c: Include <time.h>.
+	(define_resource): Set a timestamp for the resource.
+
+Wed Aug  6 13:37:58 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Define TARGET in header file.
+	* acconfig.h (TARGET): Add #undef.
+	* Makefile.am (version.o, bucomm.o): Remove special targets.
+	* bucomm.c (target): Remove.
+	* nm.c (program_name): Don't declare.
+	(target): Make static.
+	* size.c (target): Make static.
+	* configure, config.in, Makefile.in: Rebuild.
+
+Tue Aug  5 00:01:41 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (check-DEJAGNU): Export r.
+	(.dep1): Use $(INCLUDES) rather than $(ALL_CFLAGS).
+	* Makefile.in: Rebuild.
+
+	* nlmheader.y: Use VERSIONK rather than VERSION.
+
+	* Makefile.am (STRIP_PROG): Change from strip.new to strip-new.
+	(NM_PROG): Change from nm.new to nm-new.
+	(TOOL_PROGS, install-exec-local): Adjust accordingly.
+	* Makefile.in: Rebuild.
+
+Mon Aug  4 11:47:31 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Remove AC_ARG_PROGRAM; it's invoked by
+	AM_INIT_AUTOMAKE.
+	* configure: Rebuild.
+
+	* Makefile.am (install-exec-local): Create $(tooldir)/bin before
+	trying to install anything into it.
+	* Makefile.in: Rebuild.
+
+	* Makefile.am (TOOL_PROGS): Use an explicit $(EXEEXT).
+	(install-exec-local): When handling $(noinst_PROGRAMS), only use
+	$(EXEEXT) on the installed file.  When handling $(TOOL_PROGS),
+	handle $(EXEEXT) correctly.
+	* configure.in: Add an explicit $(EXEEXT) when substituting for
+	the name of a program to build.
+	* Makefile.in, configure: Rebuild.
+
+	* aclocal.m4, configure, Makefile.in: Rebuild with new automake
+	patches.
+
+	* deflex.l, defparse.y: Use VERSIONK rather than VERSION.
+	* rclex.l, rcparse.y: Likewise.
+	* Makefile.am (windres_SOURCES): Add $(BULIBS).
+	* Makefile.in: Rebuild.
+
+Fri Aug  1 13:08:39 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* acinclude.m4: Include bfd/acinclude.m4, not bfd/acmacros.m4.
+	* aclocal.m4, configure: Rebuild with new libtool.
+
+Thu Jul 31 11:51:35 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am: New file, based on old Makefile.in.
+	* acinclude.m4: New file, from old aclocal.m4.
+	* configure.in: Call AM_INIT_AUTOMAKE and AM_PROG_LIBTOOL.  Remove
+	shared library handling; now handled by libtool.  Replace
+	AC_CONFIG_HEADER with AM_CONFIG_HEADER.  Call AC_PROG_YACC,
+	AC_PROG_LEX, AC_DECL_YYTEST, AM_MAINTAINER_MODE, AM_CYGWIN32, and
+	AM_EXEEXT.  Replace AC_PROG_INSTALL with AM_PROG_INSTALL.  Remove
+	stamp-h handling in AC_OUTPUT.
+	* acconfig.h: Mention PACKAGE and VERSION.
+	* stamp-h.in: New file.
+	* Makefile.in: Now built with automake.
+	* aclocal.m4: Now built with aclocal.
+	* config.in, configure: Rebuild.
+
+	From Ton van Overbeek <tvoverbe@wk.estec.esa.nl>:
+	* rcparse.y (dialog): Default menu and class to be named.
+	(styles): If FONT is seen, set DS_SETFONT in dialog style.
+	* resbin.c (res_to_bin_dialog): Correct computation of font
+	information length.
+
+Wed Jul 30 11:21:06 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	From Ton van Overbeek <tvoverbe@wk.estec.esa.nl>:
+	* resbin.c (res_to_bin_menu): Correct computation of menu
+	vs. menuex length.
+	* resrc.c (define_stringtable): Add 1 to resource ID.
+
+Tue Jul 29 11:06:03 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* resbin.c (bin_to_res_string): Correct adjustment of data and
+	length.  From Ton van Overbeek <tvoverbe@wk.estec.esa.nl>.
+
+Tue Jul 22 18:01:23 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* nlmconv.c (link_inputs): Call libiberty pexecute function.
+	(pexecute) [multiple versions]: Remove.
+
+Tue Jul 22 16:19:34 1997  Robert Hoehne <robert.hoehne@Mathematik.TU-Chemnitz.DE>
+
+	* bucomm.c (make_tempname): If we might be using a DOS filesystem,
+	check for a backslash as well as a slash.
+
+Thu Jun 26 13:53:17 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* windres.c (main): Quit if we didn't get any resources.
+	(usage): Fix --yydebug usage message.
+	* rescoff.c (write_coff_file): Don't free the relocation array
+	until after we've closed the BFD.
+	(read_coff_rsrc): Quit rather than try to read standard input.
+	(write_coff_file): Quit rather than try to write to standard
+	output.
+	* rcparse.y: Add a couple of missing semicolons (accepted by bison
+	but not byacc).
+	* binutils.texi: Document windres.
+
+Wed Jun 25 20:57:06 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* resbin.c: New file.
+	* rclex.l, rcparse.y, rescoff.c, resrc.c, windres.c, windres.h:
+	Numerous fixes and improvements.
+	* Makefile.in: Rebuild dependencies.
+ 	(CFILES): Add resbin.c.
+	(WINDRES_OBJS): Add resbin.o.
+
+Sun Jun 22 17:29:41 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	First stab at Windows resource compiler:
+	* windres.h: New file.
+	* windres.c: New file.
+	* resrc.c: New file.
+	* rcparse.y: New file.
+	* rclex.l: New file.
+	* rescoff.c: New file.
+	* configure.in: Define and substitute BUILD_WINDRES.
+	* configure: Rebuild.
+	* Makefile.in: Rebuild dependencies.
+ 	(WINDRES_PROG): New variable.
+	(PROGS): Add @BUILD_WINDRES@.
+	(HFILES): Add dlltool.h and windres.h.
+	(CFILES): Add windres.c and resrc.c.
+	(GENERATED_CFILES): Add rcparse.c and rclex.c.
+	(WINDRES_OBJS): New variable.
+	$(WINDRES_PROG): New target.
+	(rcparse.c, rcparse.h, rclex.c): New targets.
+
+Thu Jun 12 12:27:51 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* dlltool.c (export_type): Add data field.
+	(def_exports): Add data parameter.  Change all callers.
+	(dump_def_info): Print data field.
+	(gen_def_file): Likewise.
+	(make_one_lib_file): Handle data field by not emitting simple
+	label and not emitting anything in SEC_TEXT.
+	(dtab): Print data field.
+	(process_duplicates): Merge data field.
+	* dlltool.h (def_exports): Update declaration.
+	* defparse.y (expline): Accept opt_DATA.  Pass it to def_exports.
+	(opt_DATA): New non-terminal.
+
+Wed Jun 11 17:15:47 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* dlltool.h: New file.
+	* deflex.l: Include dlltool.h and libiberty.h.  Don't declare
+	strdup.  Use xstrdup rather than strdup.
+	* defparse.y: Include bfd.h, bucomm.h, and dlltool.h.
+	* dlltool.c: Include dlltool.h and time.h.  Make a lot of
+	variables and functions static.  Make a lot of char * variables
+	and parameters const.  Add declarations for static functions.  Do
+	some reindenting.  Hide more PowerPC stuff inside DLLTOOL_PPC.
+
+Wed Jun 11 12:05:52 1997  H.J. Lu  <hjl@gnu.ai.mit.edu>
+
+	* ar.c (bfd_special_undocumented_glue): Add const.
+
+Mon May 12 22:09:35 1997  Bob Manson  <manson@charmed.cygnus.com>
+
+	* Makefile.in (check): Pass CC_FOR_TARGET and CFLAGS_FOR_TARGET
+	to runtest.
+
+Mon May 12 13:14:22 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Don't clear OPCODES when --enable-commonbfdlib is
+	used on HP/UX.
+	* configure: Rebuild.
+
+Fri Apr 25 14:22:08 1997  H.J. Lu  <hjl@gnu.ai.mit.edu>
+
+	* Makefile.in (maintainer-clean realclean): Change *.info*
+	to binutils.info* to save sysroff.info.
+
+Tue Apr 15 13:42:22 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (INSTALL): Set to @INSTALL@.
+	(INSTALL_XFORM, INSTALL_XFORM1): Remove.
+	(install): Depend upon installdirs.  Use $(program_transform_name)
+	directly, rather than using $(INSTALL_XFORM) and
+	$(INSTALL_XFORM1).
+	(installdirs): New target.
+	(install-info): Run mkinstalldirs.
+
+Mon Apr 14 11:52:39 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (INSTALL): Change install.sh to install-sh.
+
+	From Thomas Graichen <graichen@rzpd.de>:
+	* Makefile.in: Always use $(SHELL) when running move-if-change.
+	* configure.in: Use ${CONFIG_SHELL} when running $ac_config_sub.
+	* configure: Rebuild.
+
+Fri Apr  4 13:28:02 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Add AC_FUNC_ALLOCA.
+	* configure, config.in: Rebuild.
+	* bucomm.h: Add alloca handling, copied from gas/as.h.
+	* dlltool.c: Add #pragma alloca for AIX to start of file.
+	* nlmconv.c: Likewise.
+
+	* Makefile.in (distclean): Remove site.exp and site.bak.  Remove
+	everything that clean removes.
+
+Thu Apr  3 13:18:39 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (VERSION): Set to 2.8.1.
+
+	* Branched binutils 2.8.
+
+Tue Apr  1 16:21:44 1997  Klaus Kaempf  <kkaempf@progis.de>
+
+	* configure.com: New file.
+	* config.h-vms: Remove file.
+	* makefile.vms: Update for new configure scheme.
+
+Mon Mar 31 15:30:43 1997  Philippe De Muyter  <phdm@info.ucl.ac.be>
+
+	* objcopy.c (make_same_dates): Use statbuf, not buf, if not
+	HAVE_GOOD_UTIME_H.
+
+Fri Mar 28 17:57:53 1997  Alan Modra  <alan@spri.levels.unisa.edu.au>
+
+	* Makefile.in ($(OBJDUMP_PROG)): Don't link against BFDLIB twice.
+	* configure.in: Add AC_ARG_ENABLE for commonbfdlib.  If it is set,
+	set OPCODES to empty.
+	* configure: Rebuild.
+
+Thu Mar 27 16:03:02 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	Based on patch from Marty Leisner <leisner@sdsp.mc.xerox.com>:
+	* objcopy.c: Include <utime.h> or <sys/time.h>.
+	(strip_options): Add "preserve-dates".
+	(copy_options): Likewise.
+	(copy_usage): Mention -p and --preserve-dates.
+	(strip_usage): Likewise.
+	(make_same_dates): New static function.
+	(strip_main): Handle -p.
+	(copy_main): Likewise.
+	* binutils.texi, strip.1, objcopy.1: Document new option.
+
+	addr2line.c contributed by Ulrich Lauther
+	<Ulrich.Lauther@zfe.siemens.de>:
+	* addr2line.c: New file.
+	* Makefile.in: Rebuild dependencies.
+ 	(ADDR2LINE_PROG): New variable.
+	(MANPAGES): Add addr2line.
+	(PROGS): Add $(ADDR2LINE_PROG).
+	(CFILES): Add addr2line.c.
+	($(ADDR2LINE_PROG)): New target.
+	* binutils.texi: Document addr2line.
+	* addr2line.1: New file.
+
+	* version.c (print_version): Update copyright date.
+
+Mon Mar 24 10:52:45 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* objdump.c (disassemble_data): Don't exit if a file cannot be
+	disassembled, instead just return.
+
+Thu Mar 20 21:16:51 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* size.c (usage): Make definition match its prototype.
+	(display_bfd, lprint_number, rprint_number): Likewise.
+	(print_berkeley_format, sysv_internal_printer): Likewise.
+	(print_sysv_format): Likewise.
+	* nm.c (set_print_radix, set_output_format): Likewise.
+	* objcopy.c (filter_bytes): Likewise.
+
+Tue Mar 18 16:39:55 1997  H.J. Lu  <hjl@lucon.org>
+
+	* Many files: Add function prototypes.
+	* ar.c (mri_emul, get_pos_bfd): Make static.
+	* arlex.l: Include "libiberty.h".  Don't declare strdup.  Use
+	xstrdup rather than strdup.
+	* arparse.y (yyerror): Make argument const.  Correct typo.
+	* arsup.c (strdup): Don't declare.
+	(ar_save): Use xstrdup rather than strdup.
+	* filemode.c: Include "bucomm.h".
+	* nm.c (usage): Make static.
+	(print_symname): Make format and name const.
+	* objcopy.c (cat): Remove.
+	(copy_archive): Make output_target const.  Use concat, not cat.
+	(copy_file, simple_copy, smart_rename): Make arguments const.
+	* objdump.c (read_section_stabs): Likewise.
+	(print_section_stabs): Likewise.
+	(display_target_tables): Don't declare getenv.
+	* strings.c (strings_object_file): Change file to const.
+	(print_strings): Change filename to const.
+	* Makefile.in: Rebuild dependencies.
+
+Tue Mar 18 11:37:24 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Add BFD_NEED_DECLARATION(getenv).
+	* acconfig.h: Add NEED_DECLARATION_GETENV.
+	* bucomm.h (getenv): Declare if NEED_DECLARATION_GETENV.
+	* configure, config.in: Rebuild.
+	* nlmconv.c (getenv): Don't declare.
+
+	* Makefile.in: Rebuild dependencies.
+
+Sat Mar 15 15:35:56 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	Based on patches from Jamie Lokier <jamie@rebellion.co.uk>:
+	* objdump.c: Include "demangle.h".
+	(do_demangle): New static variable.
+	(usage): Mention -C/--demangle.
+	(long_options): Add "demangle".
+	(objdump_print_symname): New static function.
+	(objdump_print_addr_with_sym): Use objdump_print_symname.
+	(disassemble_bytes): Likewise.
+	(dump_reloc_set): Likewise.
+	(dump_symbols): Demangle symbol name.
+	(main): Handle -C.
+	* binutils.texi, objdump.1: Document -C/--demangle.
+
+	* objdump.c (usage): Mention --no-show-raw-insn.
+	(long_options): Add "no-show-raw-insn".
+	(disassemble_bytes): Handle --no-show-raw-insn.
+	* binutils.texi, objdump.1: Document --no-show-raw-insn.
+
+Wed Mar 12 11:42:00 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* rddbg.c (free_saved_stabs): Set the strings to NULL after being
+	freed.
+
+Fri Feb 28 17:18:45 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bucomm.c (set_default_bfd_target): New function.
+	* bucomm.h (set_default_bfd_target): Declare.
+	* ar.c (main): Call set_default_bfd_target.
+	* nlmconv.c (main): Likewise.
+	* nm.c (main): Likewise.
+	* objcopy.c (main): Likewise.
+	* objdump.c (main): Likewise.
+	* size.c (main): Likewise.
+	* strings.c (main): Likewise.
+	* Makefile.in (bucomm.o): New target, to define TARGET.
+
+Tue Feb 25 21:28:38 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (adjust_section_vma): New static variable.
+	(usage): Mention --adjust-section-vma.
+	(OPTION_ADJUST_VMA): Define.
+	(long_options): Add "addjust-vma".
+	(display_bfd): If adjust_section_vma is not 0, add it to all the
+	section addresses.
+	(main): Handle OPTION_ADJUST_VMA.
+	* binutils.texi, objdump.1: Document --adjust-vma.
+
+Fri Feb 14 18:46:47 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* nm.c (print_symbol): Cache the BFD as well as the symbols and
+ 	relocs, and don't try to use the symbols or relocs with a
+ 	different BFD.
+
+Thu Feb 13 21:34:43 1997  Klaus Kaempf  (kkaempf@progis.de)
+
+	* config.h-vms: sbrk() is provided on openVMS/Alpha.
+	* makefile.vms: allow compiling with current gcc snapshot.
+
+Thu Feb 13 20:14:40 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* arsup.c, coffgrok.c, dlltool.c, nlmconv.c: Use xmalloc rather
+	than malloc.
+
+Wed Feb 12 16:12:02 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (disassemble_data): Correct VMA argument to
+	find_symbol_for_address.  Improve handling of code with no symbol
+	followed by code with a symbol.
+
+Wed Feb 12 12:16:47 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* objdump.c (disassemble_bytes): Make output of raw instructions
+	work better for non-standard values of bytes_per_chunk and
+	bytes_per_line.
+
+Thu Feb  6 14:14:59 1997  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* objdump.c (disassemble_bytes): Added code to allow some control
+ 	over the way raw instructions are displayed.
+
+Thu Feb  6 12:36:03 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* stabs.c (struct bincl_file): Add next_stack field.
+	(push_bincl): Put the new file on both bincl_list and
+	bincl_stack.  Clear the file_types field.
+	(pop_bincl): Use the next_stack field when popping the stack.
+	Don't put the file on bincl_list.
+	(find_excl): Include the file name when warning about an unfound
+	N_EXCL.
+
+	* debug.c (debug_type_samep): Don't crash if we are passed NULL.
+
+Thu Feb  6 11:54:24 1997  Alan Modra  <alan@spri.levels.unisa.edu.au>
+
+	* objcopy.1: Add missing space after .B.
+
+Fri Jan 31 10:33:07 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* objdump.c (disassemble_data): Initialize `aux.require_sec'.
+
+Wed Jan 29 13:21:21 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (objdump_print_value): Add skip_zeroes parameter.
+	Change all callers.
+	(objdump_print_addr_with_sym): Likewise.  Call objdump_print_value
+	to print address.
+	(objdump_print_addr): New static function.
+	(objdump_print_address): Just call objdump_print_addr.
+	(disassemble_bytes): Print real address, not function offset.
+	Skip a certain number of leading zeroes.
+
+	* objdump.c (disassemble_zeroes): New static variable.
+	(usage): Mention --disassemble-zeroes.
+	(long_options): Add "disassemble-zeroes".
+	(disassemble_bytes): Check disassemble_zeroes.
+
+Tue Jan 28 16:47:26 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (disassemble_bytes): Don't skip zeroes if the
+	disassembler has told us that we are in a branch delay slot.
+
+Mon Jan 20 14:24:04 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* size.c (berkeley_sum): Rewrite.  Skip sections which are not
+	SEC_ALLOC.  Count SEC_READONLY sections as text.
+
+Tue Jan 14 15:14:14 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (maintainer-clean realclean): Remove *.info*, not
+	just *.info.  From H.J. Lu <hjl@lucon.org>.
+
+Tue Dec 31 15:42:54 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (ALL_CFLAGS): Add -D_GNU_SOURCE.
+
+Fri Dec 27 11:19:26 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Work around bug in AC_FUNC_VFORK in autoconf 2.12.
+	* configure: Rebuild.
+
+Thu Dec 19 13:11:20 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	Based on patch from Andrew J Klossner <andrew@pogo.wv.tek.com>:
+	* objcopy.c (OPTION_WEAKEN): Define.
+	(copy_options): Add "weaken".
+	(copy_usage): Mention --weaken.
+	(weaken): New static variable.
+	(filter_symbols): Handle weaken.
+	(copy_object): Call filter_symbols if weaken.
+	(copy_main): Handle OPTION_WEAKEN.
+	* binutils.texi, objcopy.1: Document --weaken.
+
+Wed Dec 18 22:49:13 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-make.sed: Use NewFolderRecursive for installation.
+
+Sat Dec  7 10:17:25 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (install): Add "else true" clause to cater to
+	broken "make" on some systems.
+
+Fri Dec  6 17:21:41 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c (parse_ieee_bb): Always initialize namcopy to avoid gcc
+	warning about uninitialized variable.
+	(ieee_read_cxx_class): Likewise, for pf.
+	(ieee_enum_type): Likewise, for i.
+
+Tue Nov 26 17:01:25 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* wrstabs.c (stab_array_type): Add casts when printing
+	bfd_signed_vma values.
+
+	* configure: Rebuild with autoconf 2.12.
+
+Mon Nov 25 16:53:18 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (disassemble_data): Don't crash if there is no
+	symbol.
+
+Fri Nov 22 17:29:14 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* ar.c (open_inarch): Don't call bfd_openr with a null name.
+
+Fri Nov  1 12:08:13 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* binutils.texi: Add section on reporting bugs.
+
+Thu Oct 31 18:20:53 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* stabs.c (struct stab_handle): Add bincl_list field.
+	(parse_stab): Pass value to push_bincl.  Call find_excl for
+	N_EXCL.
+	(struct bincl_file): Add hash, file and file_types fields.
+	(push_bincl): Add hash parameter.  Save it in the new hash field.
+	Save the file number in the new file field.
+	(pop_bincl): Put the bincl_file on bincl_list, rather than freeing
+	it.  Save the file types in the new file_types field.
+	(find_excl): New static function.
+
+	* ieee.c (ieee_lineno): Don't compare line number addresses to
+	info->highaddr (undo part of October 28 patch).
+
+Tue Oct 29 16:40:22 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (objdump_print_value): Don't print the empty string
+	for zero.
+
+Mon Oct 28 16:58:14 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* stabs.c (struct stab_handle): Add function_end field.
+	(start_stab): Initialize function_end.
+	(finish_stab): Pass info->function_end to debug_end_function.
+	(parse_stab): If info->function_end is set, use it as the address
+	which ends a function.
+
+	* ieee.c (ieee_array_type): Remember the correct size.
+
+	* ieee.c (ieee_finish_compilation_unit): Permit coalescing ranges
+	that are up to 0x1000 bytes apart, not just 64.
+	(ieee_add_bb11_blocks): Don't bother to emit a BB11 that is less
+	than 0x100 bytes.
+	(ieee_lineno): Only emit line numbers that are less than
+	info->highaddr.
+
+Fri Oct 25 12:12:17 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c (struct ieee_defined_enum): Add defined field.
+	(ieee_enum_type): If the enum tag has been seen before but not
+	defined, reuse the same type index, and define it.
+	(ieee_tag_type): If this enum has not been defined, add an
+	undefined entry to the list of enums.
+
+	* objdump.c (disassemble_bytes): Let the disassembler override the
+	number of bytes printed on a line.
+
+Thu Oct 24 16:42:10 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (prefix_addresses): New static variable.
+	(long_options): Add "prefix-addresses".
+	(compare_symbols): Sort BSF_FUNCTION symbols before other
+	symbols.
+	(find_symbol_for_address): New static function, broken out of
+	objdump_print_address.
+	(objdump_print_addr_with_sym): New static function, broken out of
+	objdump_print_address.
+	(objdump_print_address): Call new functions.
+	(disassemble_bytes): New static function, broken out of
+	disassemble_data.  Change disassembly format, unless
+	prefix_addresses is set.
+	(disassemble_data): Call disassemble_bytes.  Unless
+	prefix_addresses is set, disassemble in chunks headed by a
+	symbol.
+	* binutils.texi, objdump.1: Document --prefix-addresses.
+
+	* rddbg.c (read_section_stabs_debugging_info): Preserve the
+	backslash when concatenating multiple stabs strings.
+
+Thu Oct 10 11:36:31 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* dlltool.c (scan_open_obj_file): Fix loop exit test.
+	Add missing parameter to def_exports.
+
+Tue Oct  8 12:06:17 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (LEX_OPTIONS): Set to empty string.  -I -Cem is the
+	default for flex, and is not recognized by lex.
+
+Thu Oct  3 17:41:23 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* binutils.texi (Target Selection): Document that you can now
+	specify targets using configuration triplets.
+
+	* ar.c (usage): Declare.  Make sure all callers pass an argument.
+
+Thu Oct  3 15:39:42 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
+
+	* Makefile.in (clean): Remove config.log.
+
+Wed Oct  2 15:49:16 1996  Klaus Kaempf  <kkaempf@progis.de>
+
+	* makefile.vms: Bump version date.
+
+Tue Oct  1 15:00:59 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* version.c (print_version): New function.
+	* bucomm.h (print_version): Declare.
+	* ar.c (program_version): Don't declare.
+	(do_show_version): Remove.
+	(usage): Add help parameter.  Print bug report address.
+	(main): Set is_ranlib at start.  Check for --help and --version.
+	Call print_version, not do_show_version.
+	* nlmconv.c (program_version): Don't declare.
+	(main): Call print_version.
+	(show_usage): Print bug report address.
+	* nm.c (program_version, print_version): Don't declare.
+	(usage): Print bug report address.
+	(main): Call print_version.
+	* objcopy.c (program_version): Don't declare.
+	(copy_usage): Print bug report address.
+	(strip_usage): Likewise.
+	(strip_main): Call print_version.
+	(copy_main): Likewise.
+	* objdump.c (program_version): Don't declare.
+	(usage): Print bug report address.
+	(main): Call print_version.
+	* size.c (program_version): Don't declare.
+	(usage): Print bug report address.
+	(main): Call print_version.
+	* strings.c (program_version): Don't declare.
+	(main): Call print_version.
+	(usage): Print bug report address.
+	* Makefile.in: Update dependencies.
+
+Thu Sep 19 14:53:15 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c: Revert Monday's reflocalp patch, and apply this patch
+	instead:
+ 	(write_ieee_debugging_info): Write a dummy type at the end of the
+	global type block.
+
+Mon Sep 16 15:30:54 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c (struct ieee_write_type): Add reflocalp field.
+	(ieee_pointer_type): Set reflocalp after pushing type.
+	(ieee_function_type): If reflocalp is set, make this type local.
+	(ieee_range_type, ieee_array_type, ieee_set_type): Likewise.
+	(ieee_const_type, ieee_volatile_type): Likewise.
+	(ieee_struct_field, ieee_class_baseclass): Likewise.
+
+	* ieee.c (struct ieee_info): Add global_types field.
+	(parse_ieee_bb): When starting a BB1, initialize the types field
+	to the global_types field.
+	(parse_ieee_be): When ending a BB2, copy the types field to the
+	global_types field.
+
+Fri Sep 13 17:32:21 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objcopy.c (change_leading_char): New static variable.
+	(OPTION_CHANGE_LEADING_CHAR): Define.
+	(copy_options): Add "change-leading-char".
+	(copy_usage): Mention --change-leading-char.
+	(filter_symbols): Add obfd parameter.  Change all callers.
+	Implement change_leading_char.
+	(copy_object): Call filter_symbols if change_leading_char.
+	(copy_main): Handle OPTION_CHANGE_LEADING_CHAR.
+	* binutils.texi, objcopy.1: Document --change-leading-char.
+
+Tue Sep  3 14:05:29 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c (ieee_enum_type): Don't check index into a NULL names
+	array.
+	* nm.c (sort_symbols_by_size): Always initialize next.
+	* rdcoff.c (parse_coff_type): Warn about an incomprehensible
+	type rather than crashing.
+	* rddbg.c (read_symbol_stabs_debugging_info): Initialize f.
+	* stabs.c (parse_stab_members): Set context in all cases.
+
+Thu Aug 29 16:56:52 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* configure.in (i[345]86-*-*): Recognize i686 for pentium pro.
+	* configure: Regenerate.
+
+Thu Aug 29 11:29:20 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (L_tmpnam): Never define.
+	(display_target_list): Use choose_temp_base instead of tmpnam.
+	(display_info_table): Likewise.
+
+Tue Aug 27 18:15:01 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* stabs.c (parse_stab): An N_FUN symbol with an empty string
+	indicates the end of a function.
+
+Thu Aug 22 17:08:00 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* wrstabs.c (struct string_hash_entry): Add next field.
+	(struct stab_write_handle): Change strings to a pointer to
+	string_hash_entry.  Add last_strings field.  Remove strings_alloc
+	field.
+	(string_hash_newfunc): Initialize next field.
+	(stab_write_symbol): Copy string into hash table rather than into
+	buffer.  Keep a list of hash table entries.
+	(write_stabs_in_sections_debugging_info): Initialize last_string.
+	Copy strings from list of hash table entries in memory.
+	(stab_modify_type): If the entry on the stack is a definition,
+	make a new definition rather than failing an assert.
+	(stab_array_type): The size is only zero if high is strictly less
+	than low.
+
+	* ieee.c (struct ieee_info): Add saw_filename field.
+	(parse_ieee): Initialize saw_filename.
+	(parse_ieee_bb): Set saw_filename for a BB1 or BB2.  In a BB1,
+	discard the current variables and types.  In a BB10, if no
+	filename has been seen, call debug_set_filename.
+	(parse_ieee_ty): In case 'g', the type is optional.
+
+	* prdbg.c (pr_fix_visibility): Don't abort on
+	DEBUG_VISIBILITY_IGNORE.
+
+	* debug.c (debug_name_type): Correct error message.
+
+	* configure.in: Substitute HLDENV.
+	* configure: Rebuild.
+	* Makefile.in (HLDENV): New variable.  Use it whenever linking a
+	program.
+
+Thu Aug 15 19:30:41 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-make.sed: Add symbolic doublequotes around the version
+	number.
+
+Thu Aug  8 12:27:52 1996  Klaus Kaempf  <kkaempf@progis.de>
+
+	* makefile.vms: Add better support for DEC C compilation.
+	Add new macros as in Makefile.in.
+
+Wed Aug  7 14:27:33 1996  Philippe De Muyter  <phdm@info.ucl.ac.be>
+
+	* configure.in: Call BFD_NEED_DECLARATION on strstr and sbrk.
+	* acconfig.h (NEED_DECLARATION_STRSTR): New macro.
+	(NEED_DECLARATION_SBRK): New macro.
+	* configure, config.in: Rebuild.
+	* bucomm.h (strstr): Declare if NEED_DECLARATION_STRSTR.
+	(sbrk): Declare if HAVE_SBRK and NEED_DECLARATION_SBRK.
+
+	* prdbg.c (pr_end_struct_type): Avoid using a string constant in
+	assert, for the benefit of broken assert macros.
+
+Fri Jul 26 14:06:50 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (disassemble_data): Set disasm_info.flavour from
+	abfd.
+
+Tue Jul 23 13:59:54 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* dlltool.c (secdata): In non DLLTOOL_PPC case, change alignment
+	of .text section to 2.
+
+Mon Jul 22 08:46:15 1996  Stu Grossman  (grossman@lisa.cygnus.com)
+
+	* objdump.c (dump_section_stabs):  Fix test for stabs sections
+	ending with numbers.  This fixes a problem with .stab being
+	confused with .stab.index.
+
+Wed Jul 10 13:32:28 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* stabs.c (stab_demangle_fund_type): Return a void * for a
+	template, rather than simply aborting.
+
+Mon Jul  8 15:28:05 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ar.c (open_inarch): Add file parameter.  Change all callers.  If
+	this is a newly created archive, set the target based on the
+	file.
+	* arsup.h (open_inarch): Update declaration.
+
+Thu Jul  4 12:00:55 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (VERSION): Set to cygnus-2.7.1.
+
+	* Released binutils 2.7.
+
+	* rdcoff.c (parse_coff): Get address to pass to debug_end_function
+	from function size, not value of .ef symbol.  From Ning
+	Mosberger-Tang <ning@AZStarNet.com>.
+
+Sat Jun 29 21:18:09 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objcopy.c (strip_main): Add -o option, and handle it.
+	(strip_usage): Mention -o.
+	* binutils.texi, strip.1: Mention -o.
+
+Mon Jun 24 17:19:02 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
+
+	* Makefile.in (bindir, libdir, datadir, mandir, infodir, includedir,
+	INSTALL_PROGRAM, INSTALL_DATA): Use autoconf set values.
+	(docdir): Removed.
+	* configure.in (AC_PREREQ): Autoconf 2.5 or higher.
+
+Mon Jun 24 11:59:13 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (endian): New static variable.
+	(usage): Mention -EB/-EL/--endian.
+	(long_options): Add "endian".
+	(disassemble_data): If endianness was specified, replace
+	abfd->xvec with a copy of itself with the given endianness.
+	(main): Handle -EB/-EL/--endian.
+	* binutils.texi, objdump.1: Mention -EB/-EL/--endian.
+
+	* objdump.c: Make most variables and functions static.
+
+	* configure.in: On alpha*-*-osf*, link against libbfd.a if not
+	using shared libraries.
+	* configure: Rebuild with autoconf 2.10.
+
+Sun Jun 23 14:47:36 1996  Kim Knuttila  <krk@cygnus.com>
+
+	* dlltool.c (secdata): Changed .rdata to .reldata so .reloc will work.
+	(make_one_lib_file): Removed cruft. (#if 1)
+
+Wed Jun 19 14:46:38 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (stabs): Change from struct internal_nlist * to
+	bfd_byte *.
+	(print_section_stabs): Fetch stabs information directly, rather
+	than assuming that struct internal_nlist is the right size.
+
+	* binutils.texi: Document change to binary format: file position
+	based on load address, not section VMA.
+
+	* bucomm.h: Define SEEK_SET, SEEK_CUR, and SEEK_END if they are
+	not already defined.
+
+Tue Jun 18 18:25:00 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (DISTSTUFF): Add deflex.c.
+
+Tue Jun 18 15:03:44 1996  Klaus Kaempf  <kkaempf@progis.de>
+
+	* config.h-vms, makefile.vms: New files.
+
+Mon Jun 17 09:47:31 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* dlltool.c (make_one_lib_file): Use BFD_RELOC_RVA rather than
+	BFD_RELOC_32 in IDATA7.
+
+Wed Jun 12 11:52:06 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* nm.c (struct get_relocs_info): Define.
+	(line_numbers): New static variable.
+	(long_options): Add "line-numbers".
+	(usage): Mention -l and --line-numbers.
+	(main): Handle -l.
+	(print_symbol): Print line numbers if requested.
+	(get_relocs): New static function.
+	* binutils.texi, nm.1: Document -l/--line-numbers.
+
+Tue Jun 11 20:12:15 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (dump_reloc_set): Add sec parameter.  Change all
+	callers.  If with_line_numbers is set, display line numbers of
+	relocation entries.
+	* binutils.texi, objdump.1: Document -l with -r.
+
+Mon Jun 10 23:42:59 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ar.c (open_inarch): Report BFD error message if an archive can
+	not be recognized.  List matching formats if the file is
+	ambiguously recognized.
+	(ranlib_touch): Likewise.
+
+Thu Jun  6 13:56:14 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* README: Add notes on how to build if you don't have ar.
+
+	* Makefile.in: Remove old incorrect setting of CC.
+
+Tue Jun  4 10:52:49 1996  Tom Tromey  <tromey@csk3.cygnus.com>
+
+	* Makefile.in (install): Don't check to see if tooldir exists.
+	Make $(tooldir) and $(tooldir)/bin.
+
+Mon Jun  3 17:40:23 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* strings.c (main): Make main an int function, not void.
+
+Fri May 31 13:59:24 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* nm.c (filter_symbols): Check for BSF_WEAK as well as
+	BSF_GLOBAL.
+	* objcopy.c (filter_symbols): Likewise.
+
+Wed May  8 16:57:20 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objcopy.c (copy_object): Make clear that it is only a warning
+	when the output file can not represent the architecture.
+
+Fri May  3 11:30:17 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (disassemble_data): Don't refer to bytes past the end
+	of data.
+
+Wed Apr 24 14:10:21 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* rddbg.c (read_symbol_stabs_debugging_info): Move call to
+	free_saved_stabs outside the loop over the symbols.
+
+Tue Apr 23 12:56:11 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (compare_symbols): Sort symbols whose names start with
+ 	`.' after other symbols.  If no other decision can be made, sort
+	symbols by name.
+
+Thu Apr 18 16:02:11 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* dep-in.sed: Substitute $(BFDDIR) for @BFDDIR@.
+	* Makefile.in: Rebuild dependencies.
+	(dep.sed): Substitute $(BFDDIR) for @BFDDIR@.
+
+Tue Apr 16 13:50:22 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* rdcoff.c: New file.
+	* rddbg.c (read_debugging_info): Read COFF symbols if COFF flavour
+	and no stabs were found.
+	* budbg.h (parse_coff): Declare.
+	* Makefile.in: Rebuild dependencies.
+	(CFILES): Add rdcoff.c.
+	(DEBUG_OBJS): Add rdcoff.o.
+
+Mon Apr 15 15:55:01 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* nlmconv.c (choose_temp_base{,_try}): Delete, in libiberty now.
+	(link_inputs): Update call to choose_temp_base.
+
+Mon Apr  8 14:40:05 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Permit --enable-shared to specify a list of
+	directories.
+	* configure: Rebuild.
+
+Fri Mar 29 16:11:33 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (dump_section_header): Print the SEC_LINK_ONCE flag
+	and the SEC_LINK_DUPLICATES field.
+
+Fri Mar 29 11:35:55 1996  J.T. Conklin  (jtc@lisa.cygnus.com)
+
+	* nlmconv.1: Changed to be recognized by catman -w on Solaris.
+
+Thu Mar 28 14:17:02 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* wrstabs.c (stab_enum_type): Set buf before using it.
+
+Fri Mar 22 15:49:08 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* stabs.c (struct stab_handle): Add field abfd.
+	(start_stab): Add abfd parameter.
+	(parse_stab_string): Skip the symbol leading char when searching
+	for the value of a global symbol.
+	* budbg.h (start_stab): Update declaration.
+	* rddbg.c (read_section_stabs_debugging_info): Pass abfd to
+	start_stab.
+	(read_symbol_stabs_debugging_info): Likewise.
+
+Thu Mar 21 12:40:48 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* wrstabs.c (stab_function_type): Output an empty typedef for an
+	unused argument, rather than making up a meaningless name.
+	(stab_variable): Use N_RSYM for a DEBUG_REGISTER variable.
+
+	* ieee.c (struct ieee_info): Add global_vars field.
+	(parse_ieee_be): When ending the global typedef block, copy the
+	variables into info->global_vars.
+	(parse_ieee_atn): Don't require an NN record for a pmisc ATN.
+	(ieee_read_reference): Search the global variables after the local
+	variables.
+
+Wed Mar 20 18:08:19 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* objdump.c (disassemble_data): Make sure sym_name is always set.
+	(dump_section_header): Always put a space after the section name.
+	(dump_bfd_header): Terminate output with newline.
+
+Wed Mar 20 16:35:20 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* wrstabs.c: New file.
+	* budbg.h (write_stabs_in_sections_debugging_info): Declare.
+	* objcopy.c (write_debugging_info): For COFF or ELF, output stabs
+	in sections.
+	* Makefile.in: Rebuild dependencies.
+	(CFILES): Add wrstabs.c.
+	(WRITE_DEBUG_OBJS): New variable.
+	($(OBJCOPY_PROG)): Use $(WRITE_DEBUG_OBJS), not $(DEBUG_OBJS).
+	($(STRIP_PROG)): Likewise.
+
+	* stabs.c (parse_stab_members): Make type stub detection more like
+	gdb.
+
+	* ieee.c (struct ieee_handle): Add fields complex_float_index and
+	complex_double_index.
+	(ieee_complex_type): Cache type index in complex_float_index and
+	complex_double_index, depending upon size.  Set size on type stack
+	to size * 2.
+
+	* ieee.c (ieee_empty_type): Use builtin_unknown, not 0.
+	(ieee_void_type): Use builtin_void, not 1.
+
+	* ieee.c (parse_ieee_ty): Handle 'V' type code.
+	(parse_ieee_atn): Don't require two numbers for type 10.
+
+	* ieee.c (parse_ieee_be): Add one to offset at end of function or
+	block.
+
+	* ieee.c (struct ieee_block): Add field skip.
+	(parse_ieee_bb): Don't call debug_record_function for __XRYCPP
+	function, and set skip field.
+	(parse_ieee_be): Don't call debug_end_function if skip is set.
+
+	* debug.c (struct debug_handle): Add fields current_write_lineno
+	and current_write_lineno_index.
+	(debug_write): Initialize current_write_lineno and
+	current_write_lineno_index for each unit.  Call
+	debug_write_linenos rather than writing out the line numbers
+	directly.
+	(debug_write_function): Call debug_write_linenos.
+	(debug_write_block): Likewise.
+	(debug_write_linenos): New static function.
+
+	* debug.c (debug_write_type): For DEBUG_KIND_FUNCTION, push return
+	type before arguments.
+
+Mon Mar 18 18:05:33 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Add AC_FUNC_VFORK.
+	* configure, config.in: Rebuild.
+	* dlltool.c, nlmconv.c: Include <vfork.h> if HAVE_VFORK_H is
+	defined.
+
+	* stabs.c (parse_stab_range_type): A complex type is defined as a
+	subrange of itself with the high bound zero.
+	* ieee.c (ieee_complex_type): Don't crash on sizes of 12 or 16.
+
+Tue Mar 12 12:09:43 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c (ieee_write_undefined_tag): Switch to global_types even
+	if it is not empty.
+	(ieee_tag_type): For an enum, look through info->enums.
+
+	* configure: Rebuild with autoconf 2.8.
+
+	* debug.c (debug_type_samep): Don't loop endlessly in
+	DEBUG_KIND_ENUM case.  From Eric Baur <ecb@nexen.com>.
+
+Mon Mar 11 12:35:03 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* rddbg.c (read_section_stabs_debugging_info): Call save_stab for
+	each stab entry, call stab_context on an error, and call
+	free_saved_stabs before rturning.
+	(read_symbol_stabs_debugging_info): Likewise.
+	(SAVE_STABS_COUNT): Define.
+	(struct saved_stab): Define.
+	(saved_stabs, saved_stabs_index): New static variables.
+	(save_stab, stab_context, free_saved_stabs): New static functios.
+
+	* objdump.c (stab_name): Remove.
+	(struct stab_print): Remove.
+	(stab_print): Remove.
+	(dump_stabs): Don't initialize stab_name.
+	(print_section_stabs): Call bfd_get_stab_name rather than using
+	the stab_name array.
+
+Tue Feb 27 19:52:01 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* prdbg.c (pr_int_constant): Initialize info correctly.
+	(pr_float_constant): Likewise.
+
+Mon Feb 26 18:11:37 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-make.sed: Update to handle shared library support.
+
+Sat Feb 24 11:21:49 1996  Alan Modra  <alan@spri.levels.unisa.edu.au>:
+
+	* Makefile.in ($(OBJDUMP_PROG)): Search $(BFDLIB) before
+	$(OPCODES).
+
+Thu Feb 15 12:44:45 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Don't tamper with LDFLAGS.  Call AC_PROG_CC before
+	configure.host.
+	* configure: Rebuild.
+
+	* configure.in: Substitute RPATH_ENVVAR.
+	* configure: Rebuild.
+	* Makefile.in (RPATH_ENVVAR): New variable.
+	(check): Use $(RPATH_ENVVAR) rather than LD_LIBRARY_PATH.
+
+	* objcopy.c (smart_rename): Rather than doing chmod then chown, do
+	chmod without setuid, then chown, then chmod with setuid.
+
+Wed Feb 14 16:46:42 1996  Martin Anantharaman  <martin@mail.imech.uni-duisburg.de>
+
+	* arsup.c (map_over_list): Reindent.  Don't assume that the
+	function does not delete the BFD.
+	(ar_addlib_doer): Don't set prev->next if prev is NULL.
+
+Wed Feb 14 15:12:17 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c (ieee_regno_to_genreg): Convert register numbers for m68k
+	and i960.
+	(ieee_genreg_to_regno): Likewise.
+
+Mon Feb 12 14:19:59 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c: Extensive changes to write code to put types in the
+	global type block when possible, to output ranges for all memory
+	occupied by the module, and to improve efficiency.
+
+	* debug.c (struct debug_handle): Remove class_mark field.  Add
+	id_list and compare_list fields.
+	(struct debug_class_id): Define.
+	(struct debug_type_compare_list): Define.
+	(debug_write): Initialize info->id_list
+	(debug_write_name): Remove reference to info->class_mark.
+	(debug_write_type): Get id for all structs and classes.  Simplify
+	test for whether struct has already been written.
+	(debug_write_class_type): Get id for all classes.  Simplify test
+	for whether class has already been written.
+	(debug_write_block): Don't write out blocks other than the top
+	level block if they have no local variables.
+	(debug_set_class_id): New static function.
+	(debug_type_samep): New static function.
+	(debug_class_type_samep): New static function.
+	* prdbg.c (pr_start_struct_type): Always print id.
+	(pr_start_class_type): Likewise.
+	(pr_tag_type): Likewise.
+
+	* stabs.c (struct stab_handle): Add syms and symcount fields.
+	(start_stab): Add syms and symcount parameters.  Change all
+	callers.
+	(parse_stab_string): Look up global variables in the symbol table
+	to get the right value.
+	* budbg.h (start_stab): Update declaration.
+	* rddbg.c (read_section_stabs_debugging_info): Add syms and
+	symcount parameters.  Change all callers.
+
+	* stabs.c (parse_stab_array_type): If the index type is 0, use
+	int.
+
+Wed Feb  7 14:17:45 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c (ieee_start_compilation_unit): Clear modified and
+	modified_alloc fields of info.
+
+	* configure.in: Check for --enable-shared.  Substitute new
+	variables BFDLIB and OPCODES.
+	* configure: Rebuild.
+	* Makefile.in (BFDLIB): Set to @BFDLIB@.
+	(OPCODES): Set to @OPCODES@.
+
+Mon Feb  5 16:18:42 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	Support for building bfd and opcodes as shared libraries, based on
+	patches from Alan Modra <alan@spri.levels.unisa.edu.au>:
+	* configure.in (HLDFLAGS): New substitution.
+	* configure: Rebuild.
+	* Makefile.in (HLDFLAGS): New variable.  Make all links use
+	$(HLDFLAGS) before $(CFLAGS) and $(LDFLAGS).
+	(BFDLIB_DEP): New variable.  Replace all occurrences of $(BFD) as
+	a dependency with $(BFDLIB_DEP).  Remove $(BFD) as a dependency if
+	there is also a dependency on $(ADDL_DEPS).
+	(BFDLIB): Rename from BFD; change all uses; set to -L../bfd -lbfd.
+	(OPCODES_DEP): New variable.  Replace all occurrends of $(OPCODES)
+	as a dependency with $(OPCODES_DEP).
+	(OPCODES): Set to -L../opcodes -lopcodes.
+	(ADDL_DEPS): New variable.  Replace all occurrences of
+	$(ADDL_LIBS) as a dependency with $(ADDL_DEPS).
+	(check): Set LD_LIBRARY_PATH in the environment.
+	(config.status): Depend upon BFD configure.host and config.bfd.
+
+Fri Feb  2 17:02:59 1996  Doug Evans  <dje@charmed.cygnus.com>
+
+	* objdump.c: #include stdarg.h or varargs.h.
+	(objdump_print_value): Change FILE* arg to struct disassemble_info*.
+	All callers updated.  Use fprintf_func.
+	(objdump_print_address): Consistently use fprintf_func.
+	(objdump_sprintf): New function.
+	(disassemble_data): Print insn into a buffer, print raw insn ourselves,
+	then print insn mnemonic.
+
+Fri Feb  2 16:48:55 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Regenerate.
+
+Thu Feb  1 09:38:18 1996  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* configure.in (i[3-6]86-*-win32): Becomes i[3-6]86-*-cygwin32.
+	(powerpc*-*-cygwin32): New.
+	* configure: Regenerated.
+
+Wed Jan 31 13:22:03 1996  Richard Henderson  <rth@tamu.edu>
+
+	* Makefile.in (distclean): Remove $(DEMANGLER_PROG).1.
+
+Mon Jan 29 17:36:29 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	Based on patches from H J Lu <hjl@zoom.com>:
+	* objcopy.c (remove_leading_char): New static variable.
+	(OPTION_REMOVE_LEADING_CHAR): Define.
+	(copy_usage): Mention --remove-leading-char.
+	(filter_symbols): If remove_leading_char, and the first character
+	of a global symbol matches the symbol leading char of the BFD,
+	remove the first character.
+	(copy_object): Filter the symbols if remove_leading_char is set.
+	(copy_main): Handle --remove-leading-char.
+	* binutils.texi, objcopy.1: Document --remove-leading-char.
+
+Sat Jan 27 15:40:13 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* objdump.c (fprintf): Add prototype to avoid compiler warning on
+	SunOS.
+
+Fri Jan 26 11:53:42 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* binutils.texi (nm): Improve documentation on symbol types.
+	(objdump): Reference the stabs manual from the discussion of the
+	--stabs option.
+
+Thu Jan 25 11:21:46 1996  Raymond Jou  <rjou@mexican.cygnus.com>
+
+	* mpw-make.sed: Add a "stamps" target.
+
+Thu Jan 25 13:51:44 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (dump_headers, dump_section_header): Change objdump -h
+	output to be simpler and to include section file offsets.
+
+Wed Jan 24 12:06:05 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* stabs.c (parse_stab_members): Don't adjust voffset.
+
+	* ieee.c (ieee_read_cxx_class): Don't multiply voffset by 4.
+	(struct ieee_write_type): Add name field.
+	(struct ieee_type_class): Remove name field.  Change all uses to
+	use new name field in type instead.
+	(struct ieee_name_type): Likewise.
+	(ieee_start_struct_type): Initialize name field of type.
+	(ieee_start_class_type): Don't initialize classdef entry of tag.
+	(ieee_class_method_var): Don't adjust voffset.
+	(ieee_end_class_type): Likewise.
+	(ieee_tag_type): Initialize new name field of type.
+	(ieee_typdef): Set name after copying in type information.
+
+	* debug.c (VOFFSET_STATIC_METHOD): Define as -1, not 1.
+
+	* ieee.c (struct ieee_modified_type): Define.
+	(struct ieee_handle): Add modified and modified_alloc fields.
+	(ieee_get_modified_info): New static function.
+	(ieee_pointer_type): Cache type index.
+	(ieee_const_type): Likewise.
+	(ieee_volatile_type): Likewise.
+
+	* ieee.c (ieee_define_named_type): When creating a tag for an
+	anonymous struct, copy the name into memory.
+	(ieee_tag_type): Likewise.
+	* debug.c (debug_write_type): Only check and set id field for an
+	unnamed object.
+	(debug_write_class_type): Likewise.
+
+	* ieee.c: Various changes to write out types for functions and
+	references, and to not write out unnecessary function types.
+
+	* ieee.c (struct ieee_var): Remove variable field.  Add kind
+	field, and define some enum constants for it.
+	(parse_ieee_ty): Set kind field of variable for 'x' and 'X' types.
+	(parse_ieee_atn): Make an indirect slot for an external variable,
+	although we otherwise don't record it.  Set kind field rather than
+	variable field of pvar.
+	(ieee_read_cxx_class): Try to get the type of a static member.
+	(ieee_read_reference): Check kind field rather than variable
+	field.
+
+Tue Jan 23 15:54:18 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c: Various changes to handle reading C++ reference type
+	information.
+
+	* debug.h (enum debug_var_kind): Add DEBUG_VAR_ILLEGAL.
+	(enum debug_parm_kind): Add DEBUG_PARM_ILLEGAL.
+	* debug.c (debug_get_parameter_types): Handle DEBUG_KIND_FUNCTION.
+
+	* ieee.c: Various changes to write out definitions of C++ classes.
+
+	* debug.c (debug_append_filename): Remove.
+	* debug.h (debug_append_filename): Don't declare.
+
+	* stabs.c (struct stab_handle): Remove last_type field.  Add
+	so_string and so_value fields.
+	(finish_stab): Call stab_emit_pending_vars before calling
+	debug_end_function.  Don't warn about pending variables.
+	(parse_stab): Accumulate N_SO strings until a non N_SO symbol is
+	seen, rather than calling debug_append_filename.  Call
+	stab_emit_pending_vars before calling debug_end_function.  Don't
+	set info->last_type.
+
+Tue Jan 23 09:53:54 1996  Doug Evans  <dje@charmed.cygnus.com>
+
+	* objdump.c (disassemble_data): Handle unknown endianness.
+	Pass fprintf to INIT_DISASSEMBLE_INFO.
+
+Mon Jan 22 16:46:43 1996  Doug Evans  <dje@charmed.cygnus.com>
+
+	Add new option --show-raw-insn.
+	* objdump.c (show_raw_insn): New global.
+	(usage): Update.
+	(long_options): Update.
+	(disassemble_data): Set disasm_info.flags if --show-raw-insn.
+
+	* objdump.c (disassemble_data): Set new arch,mach,endian fields in
+	disasm_info.
+
+Mon Jan 22 19:29:36 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c: Extensive changes to pass a single info argument around
+	in the reading routines, rather than several arguments.  Add code
+	to read C++ debugging records.
+
+	* debug.h (debug_get_type_size): Declare.
+	(debug_get_field_name): Declare.
+	(debug_get_field_bitpos): Declare.
+	(debug_get_field_bitsize): Declare.
+	(debug_get_field_visibility): Declare.
+	(debug_get_field_physname): Declare.
+	* debug.c (debug_get_real_type): Handle DEBUG_KIND_TAGGED.
+	(debug_get_type_size): New function.
+	(debug_get_field_name): New function.
+	(debug_get_field_bitpos): New function.
+	(debug_get_field_bitsize): New function.
+	(debug_get_field_visibility): New function.
+	(debug_get_field_physname): New function.
+	(debug_write_type): Make sure we pass the real kind, not INDIRECT,
+	to tag_type.  Pass the name recursively for INDIRECT.
+
+Fri Jan 19 12:31:57 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* debug.h (struct debug_write_fns): Remove ellipsis_type.  Add int
+	and boolean parameters to function_type.  Add boolean parameter to
+	method_type.
+	(debug_make_ellipsis_type): Don't declare.
+	(debug_make_function_type): Add debug_type * and boolean
+	parameters.  Change all callers.
+	(debug_make_method_type): Add boolean parameter.  Change all
+	callers.
+	(debug_get_parameter_types): Add boolean * parameter.  Change all
+	callers.
+	(debug_get_target_type): Declare.
+	* debug.c (struct debug_function_type): Add fields arg_types and
+	varargs.
+	(struct debug_method_type): Add field varargs.
+	(debug_ellipsis_type, ELLIPSIS_P): Remove.
+	(debug_make_ellipsis_type): Remove.
+	(debug_make_function_type): Add arg_types and varargs parameters.
+	(debug_make_method_type): Add varargs parameter.
+	(debug_get_parameter_types): Add pvarargs parameter.
+	(debug_get_target_type): New function.
+	(debug_write_type): In case DEBUG_KIND_FUNCTION, push argument
+	types and pass count to function_type.  In DEBUG_KIND_METHOD, use
+	a signed int for the count, don't call ellipsis_type, and pass
+	varargs to method_type.
+	* stabs.c (struct stab_demangle_info): Add varargs field.
+	(stab_demangle_argtypes): Add pvarargs parameter.  Change all
+	callers.
+	(stab_demangle_args): Likewise.
+	(stab_demangle_type): In case 'F', pick up argument types.
+	* prdbg.c (pr_ellipsis_type): Remove.
+	(pr_function_type): Add argcount and varargs parameters.
+	(pr_method_type): Add varargs parameter.
+	* ieee.c (ieee_ellipsis_type): Remove.
+	(ieee_function_type): Add argcount and varargs parameters.
+	(ieee_method_type): Add varargs parameter.  Remove most of
+	function body, and just call ieee_function_type.
+
+	* stabs.c: Include "demangle.h".  Added several new static
+	functions not listed below to demangle argument types; they are
+	all called via stab_demangle_argtypes.
+	(finish_stab): If the kind of an undefined tag is
+	DEBUG_KIND_ILLEGAL, use DEBUG_KIND_STRUCT instead.  Warn if there
+	are any pending variable.
+	(parse_stab): Don't close the function when the block depth goes
+	to zero.  Pass value to debug_end_function.
+	(parse_stab_string): In case 'T', pass the name to
+	parse_stab_type.
+	(parse_stab_type): In case 'x', use stab_find_tagged_type.  In
+	case '#', handle functions with variable numbers of arguments.
+	(parse_stab_struct_type): Add tagname parameter.  Change all
+	callers.
+	(parse_stab_members): Add tagname and typenums parameters.  Change
+	all callers.  If the type of a method is a stub, call
+	parse_stab_argtypes to demangle the argument types and get the
+	physical name of the function.
+	(parse_stab_argtypes): New static function.
+	(stab_record_variable): For a DEBUG_GLOBAL or DEBUG_STATIC
+	variable, call debug_record_variable immediately.
+	(stab_find_tagged_type): New static function.
+
+	* debug.h (enum debug_type_kind): Add DEBUG_KIND_ILLEGAL.
+	(struct debug_write_fns): Add field ellipsis_type.  Add id
+	parameter to start_struct_type, start_class_type, and tag_type.
+	(debug_make_ellipsis_type): Declare.
+	(debug_find_named_type): Declare.
+	(debug_get_type_kind): Declare.
+	(debug_get_return_type): Declare.
+	(debug_get_parameter_types): Declare.
+	(debug_get_fields): Declare.
+	(debug_get_field_type): Declare.
+	* debug.c (struct debug_handle): Add fields class_id and base_id.
+	(struct debug_class_type): Add field id.
+	(struct debug_method_variant): Rename argtypes to physname.
+	Change all uses.
+	(debug_ellipsis_type): New static variable.
+	(ELLIPSIS_P): New macro.
+	(debug_make_ellipsis_type): New function.
+	(debug_make_method_variant): Rename argtypes to physname.
+	(debug_make_static_method_variant): Likewise.
+	(debug_name_type): Always put types in the global namespace.
+	(debug_find_named_type): New function.
+	(debug_find_tagged_type): Treat DEBUG_KIND_ILLEGAL specially,
+	rather than DEBUG_KIND_VOID.
+	(debug_get_real_type): New static function.
+	(debug_get_type_kind): New function.
+	(debug_get_return_type): New function.
+	(debug_get_parameter_types): New function.
+	(debug_get_fields): New function.
+	(debug_get_field_type): New function.
+	(debug_write): Initialize base_id.
+	(debug_write_type): Pass new id argument to tag_type.  Handle
+	DEBUG_KIND_ILLEGAL.  Use id for	DEBUG_KIND_STRUCT and
+	DEBUG_KIND_UNION.  Handle ellipsis for method arguments.
+	(debug_write_class_type): Don't dereference kclass if it is NULL.
+	Use id.
+	* prdbg.c (pr_fns): Add pr_ellipsis_type.
+	(pr_ellipsis_type): New static function.
+	(pr_pointer_type): If this is a pointer to an array, parenthesize
+	it correctly.
+	(pr_start_struct_type): Add id parameter.
+	(pr_start_class_type): Likewise.
+	(pr_tag_type): Likewise.
+	(pr_fix_visibility): Add the visibility to the top of the stack,
+	not the second element on the stack.
+	(pr_struct_field): Pop the stack before calling pr_fix_visibility.
+	(pr_class_static_member): Likewise.
+	(pr_class_start_method): Don't push a type, just set the method
+	name in the type on the top of the stack.
+	(pr_class_end_method): Don't pop the stack.
+	(pr_class_method_variant): Rename argtypes parameter to physname.
+	Append const and volatile rather than prepending them.  Add a
+	space after the physname.
+	(pr_class_static_method_variant): Likewise.
+	* ieee.c (ieee_fns): Add ieee_ellipsis_type.
+	(ieee_define_named_type): Use DEBUG_KIND_ILLEGAL rather than
+	DEBUG_KIND_VOID.
+	(write_ieee_debugging_info): Likewise.
+	(ieee_typdef): Likewise.
+	(ieee_ellipsis_type): New static function.
+	(ieee_start_struct_type): Add id parameter.
+	(ieee_start_class_type): Likewise.
+	(ieee_tag_type): Likewise.
+	(ieee_class_method_variant): Rename name to physname.
+	(ieee_class_static_method_variant): Likewise.
+
+	* Makefile.in (DEBUG_OBJS): Remove prdbg.o.
+	($(OBJDUMP_PROG)): Depend upon, and link against, prdbg.o.
+
+Thu Jan 18 17:35:06 1996  Kim Knuttila  <krk@cygnus.com>
+
+	* dlltool.c (make_tail): Changed the order of the sections to avoid
+	an alignment problem.
+
+Wed Jan 17 14:23:00 1996  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* srconv.c (wr_du): Set du.stackfrmt to 0.
+	(wr_un, wr_sc): Emit all sections, even those with 0 size.
+
+Tue Jan 16 16:15:49 1996  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* srconv.c (wr_hd): Space size within segment was being
+	stored in segment identifier field.
+
+Tue Jan 16 12:07:25 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-config.in (BUILD_NLMCONV, BUILD_SRCONV, SYSINFO_PROG,
+	BUILD_DLLTOOL): Put definitions for these into makefile when
+	configuring, instead of always clearing in mpw-make.sed.
+	* mpw-make.sed: Edit out any host_alias or target_alias settings,
+	fix pathname to BFD internal include files, remove dependency
+	calculation rules.
+
+Thu Jan 11 17:31:38 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* objdump.c (dump_section_header): Add new section flags
+	SEC_{EXCLUDE,SORT_ENTRIES}.
+
+Thu Jan 11 11:45:34 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objcopy.c (filter_symbols): NULL terminate the output symbols.
+	(copy_object): Allocate space for a possible extra NULL pointer.
+
+	* debug.c (debug_make_undefined_tagged_type): Make sure we are
+	given a kind of type we can handle.
+	(debug_write_type): Handle undefined enums and structs.
+	(debug_write_class_type): Handle undefined classes.
+	* prdbg.c (pr_enum_type): Handle an undefined enum.
+	* ieee.c (ieee_enum_type): Likewise.
+
+Wed Jan 10 15:33:18 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in: Updated dependencies.
+	(ALLOCA, MALLOC): Remove variables.
+	(ADDL_LIBS): Remove $(MALLOC) from definition.
+	* alloca.c, gmalloc.c: Remove.
+
+Mon Jan  8 18:02:29 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c: Add global function write_ieee_debugging_info and a
+	bunch of static functions and structs used to write out IEEE
+	debugging information.
+	* budbg.h (write_ieee_debugging_info): Declare.
+
+	* ieee.c (struct ieee_type): Add pslot field.
+	(enum builtin_types): Define.
+	(ieee_builtin_type): For a pointer, return a pointer to the named
+	type.  Use enum values rather than numbers.
+	(ieee_alloc_type): New static function.
+	(ieee_read_type_index): Use ieee_alloc_type.
+	(parse_ieee_bb): Likewise.
+	(parse_ieee_ty): Likewise.  Use ieee_builtin_type for array range,
+	rather than making a new integer type.  Store the new type in the
+	slot, if there is one.
+	(parse_ieee_atn): Treat ATN10 as defining a register variable.
+	(ieee_regno_to_genreg): Rename from ieee_regno_to_gen.  Change all
+	callers.
+	(ieee_genreg_to_regno): New static function.
+
+	* stabs.c (parse_stab_type): Add new typename parameter.  Change
+	all callers.
+	(parse_stab_range_type): Add new typename parameter.  Change all
+	callers.
+
+	* debug.h (struct debug_write_fns): Add tag parameter to
+	enum_type, start_struct_type, and start_class_type.
+	* debug.c (debug_write_type): Pass any tag name to
+	start_struct_type, debug_write_class_type, and enum_type.  If
+	DEBUG_KIND_TAGGED, pass the name in the recursive call.
+	(debug_write_class_type): Accept a new tag parameter, and pass it
+	to start_class_type.
+	* prdbg.c (pop_type): Don't remove '+' character.
+	(pr_enum_type): Accept and use tag parameter.
+	(pr_start_struct_type): Likewise.
+	(pr_start_class_type): Likewise.
+	(pr_class_baseclass): Adjust algorithm used to find where to put
+	the baseclass name.
+	(pr_tag): Don't bother to insert the tag name.
+
+	* objcopy.c: Include budbg.h.
+	(convert_debugging): New static variable.
+	(OPTION_DEBUGGING): Define.
+	(copy_options): Add "debugging".
+	(copy_usage): Mention --debugging.
+	(is_strip_section): Skip debugging sections if convert_debugging.
+	(setup_section, copy_section): Likewise.
+	(filter_symbols): Skip debugging symbols if convert_debugging.
+	(copy_object): If convert_debugging, read and write debugging
+	information.
+	(write_debugging_info): New static function.
+	(copy_main): Handle --debugging.
+	* Makefile.in (DEBUG_OBJS): New variable.
+	($(OBJCOPY_PROG)): Depend upon and link against $(DEBUG_OBJS).
+	($(STRIP_PROG)): Likewise.
+	(OBJDUMP_OBJS): Remove variable.
+	($(OBJDUMP_PROG)): Use objdump.o $(DEBUG_OBJS) rather than
+	$(OBJDUMP_OBJS).
+	* binutils.texi, objcopy.1: Document --debugging.
+
+Thu Jan  4 16:31:21 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.c: New file with code to read IEEE debugging information.
+	* budbg.h (parse_ieee): Declare.
+	* rddbg.c (read_debugging_info): Handle IEEE flavour files.
+	(read_ieee_debugging_info): New static function.
+	* Makefile.in: Rebuild dependencies.
+	(CFILES): Add ieee.c.
+	(OBJDUMP_OBJS): Add ieee.o.
+
+	* bucomm.h (xrealloc): Change type of first parameter from char *
+	to PTR.
+
+Tue Jan  2 17:44:07 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in: Add targets to automatically rebuild dependencies.
+	Remove targets which just listed dependencies of .o files.
+	(DEP): New variable.
+	(HFILES, GENERATED_HFILES): New variables.
+	(CFILES, GENERATED_CFILES): New variables.
+	(underscore.c): Don't do anything, just depend upon stamp-under.
+	(stamp-under): New target; do what underscore.c used to do.
+	(nlmconv.o): Depend upon sym.h and ecoff.h.
+	(.dep, .dep1, dep.sed, dep, dep-in): New targets.
+	(stage1, stage2, stage3, against, comparison): Remove.
+	(de-stage1, de-stage2, de-stage3): Remove.
+	(clean, distclean): Remove stamp-under and dep.sed.
+	* dep-in.sed: New file.
+
+	Implement generic debugging support.  Implement a stabs reader and
+	a generic printer.
+	* budbg.h, debug.c, debug.h, prdbg.c, rddbg.c, stabs.c: New files.
+	* objdump.c: Include "debug.h" and "budbg.h".
+	(dump_debugging): New global variable.
+	(usage): Mention --debugging.
+	(long_options): Add "debugging".
+	(display_bfd): Handle --debugging.
+	* Makefile.in (OBJDUMP_OBJS): New variable.
+	($(OBJDUMP_PROG)): Use $(OBJDUMP_OBJS).
+	* binutils.texi, objdump.1: Document --debugging.
+
+Sat Dec 30 09:59:51 1995  Jeffrey A Law  (law@cygnus.com)
+
+	* nm.c ( long_options): Add "--defined-only" option.
+	(usage): Update for new "--defined-only" option.
+	(filter_symbols): Handle "--defined-only".
+
+Fri Dec 29 16:04:56 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* arparse.y: Include "bucomm.h", not <sysdep.h>.
+	* nlmheader.y: Don't include "sysdep.h".
+
+Tue Dec 26 18:23:18 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* nm.c (print_symdef_entry): Check return value of
+	bfd_get_elt_at_index.
+
+Sat Dec 23 11:03:16 1995  Michael Meissner  <meissner@tiktok.cgynsu.com>
+
+	* configure.in (DLLTOOL_DEFS): Build dlltool for PowerPC if target
+	is powerpc*-*-win* in addition to powerpc*-*-*pe*.
+
+Fri Dec 15 16:30:57 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (endian_string): New static function.
+	(display_target_list): Use it.
+	* nlmconv.c (main): Use new bfd_big_endian macro.
+
+Fri Dec 15 07:51:34 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* dlltool.c (fill_ordinals): Start from 1 if no other instructions
+ 	given.
+
+Tue Dec 12 12:05:21 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (clean): Remove $(DEMANGLER_PROG).1.  From Ronald
+	F. Guilmette <rfg@monkeys.com>.
+
+Mon Dec 11 14:33:05 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mac-binutils.r: Fix copyright and version strings.
+
+	* Makefile.in (version): Remove, no longer used.
+
+Fri Dec  1 14:41:56 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-make.sed (install, install-only): Edit in Mac-specific
+	install procedure.
+
+Thu Nov 30 20:26:02 1995  Kim Knuttila  <krk@cygnus.com>
+
+	* dlltool.c (ppc_jtab): The binary glue for PowerPC dll linkage,
+	including the return instruction.
+	sinfo: added a preferred alignment field.
+	(secdata): section data for the PowerPC version.
+	(make_one_lib_file): More symbols, More sections (pdata, rdata)
+	(make_tail): Use idata$6 instead of idata$7 for ppc. Also added a
+	NULL idata$3 descriptor (temporary).
+
+Tue Nov 28 17:23:44 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* dlltool.c (fill_ordinals): Don't reference d_export_vec if
+	there are no exported functions.
+
+Mon Nov 27 13:05:59 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Regenerate with autoconf 2.7.
+
+Wed Nov 22 13:17:15 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* dlltool.c (fill_ordinals): Start assigning ordinals at 1.
+
+	* Makefile.in (EXPECT): Use $$r, not $${rootme}.
+	(check): Set r, not rootme.
+
+Tue Nov 21 18:04:09 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Use BFD_NEED_DECLARATION.
+	* acconfig.h: Put NEED_DECLARATION_FPRINTF in @TOP@ section.
+	* configure, config.in: Rebuild with autoconf 2.6.
+
+Fri Nov 17 10:34:37 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (CC_FOR_TARGET): Use @host@ and @target@, not
+	$(host_canonical) and $(target_canonical).
+
+Thu Nov 16 03:39:20 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	Version 2.6 released.
+	* Makefile.in (VERSION): Update to 2.6.
+
+Wed Nov 15 12:14:17 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (CC_FOR_TARGET): Define.
+	(check): Pass CC and CFLAGS to runtest.
+
+	* nm.c (display_rel_file): Don't require a DYNAMIC object when
+	dumping the dynamic symbol table.
+
+	* objdump.c (compare_symbols): Sort global symbols before local
+	symbols before debugging symbols.
+	(objdump_print_address): Don't futz around looking for a global
+	symbol with the same value.
+
+Tue Nov 14 17:19:11 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* dlltool.c: Use FOPEN_* macros rather than "r" or "w".
+
+	* dlltool.c (fill_ordinals): Correct memset call.
+
+Sun Nov 12 12:56:05 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-make.sed (DEMANGLER_PROG): Edit out attempts to do anything
+ 	with the man page.
+
+Fri Nov 10 11:41:22 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objcopy.c (setup_section): Copy the section lma independently of
+	the vma.
+
+Wed Nov  8 11:33:00 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* arsup.c (ar_open): Cast malloc return value.
+
+Tue Nov  7 09:01:26 1995  Kim Knuttila  <krk@cygnus.com>
+
+	* configure.in, configure (DLLTOOL_DEFS): Added ppc target.
+	* dlltool.c (MPPC): Added basic PPC definitions.
+
+Tue Nov  7 14:02:57 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Don't treat rs6000-*-lynx* specially.
+	* configure: Rebuild.
+	* config/rslynx: Remove.
+	* Makefile.in: Remove @target_makefile_fragment@.
+
+Mon Nov  6 15:00:50 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bucomm.h: Include <sys/types.h>.
+	* ar.c: Don't include <sys/types.h> or <stdio.h>.
+	* bucomm.c, dlltool.c, nlmconv.c, objcopy.c, objdump.c: Likewise.
+
+Fri Nov  3 12:38:09 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c: Include <sys/types.h>.
+
+	Permit user to override DEMANGLER_PROG from command line.  From
+	Manfred Hollstein <manfred@lts.sel.alcatel.de>.
+	* Makefile.in ($(DEMANGLER_PROG)): Depend upon
+	$(DEMANGLER_PROG).1.
+	(install): Don't depend upon $(DEMANGLER_PROG).1.  Only install
+	$(DEMANGLER_PROG).1 if $(DEMANGLER_PROG) is not empty.
+
+Wed Nov  1 15:04:57 1995  Manfred Hollstein KS/EF4A 60/1F/110 #40283  <manfred@lts.sel.alcatel.de>
+
+	* Makefile.in (syslex.o): add -I$(srcdir) if compiling in a
+	separate directory.
+
+Mon Oct 30 14:24:18 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (objdump_print_value): New static function.
+	(objdump_print_address): Use it.  If we need the right section for
+	the symbol, and we can't find it, print an offset from the section
+	rather than using a symbol from some other section.
+
+Thu Oct 26 10:23:14 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* dlltool.c (no_idata4, no_idata5): New.
+	(arm_jtab): Use correct encoding of jump instruction.
+	(usage, main, make_head, make_tail): Act on no_idata4, no_idata5.
+
+Wed Oct 25 12:10:07 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-make.sed: Edit paths to generated y.tab.[ch] files.
+
+Fri Oct 20 18:40:34 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* binutils.texi: Change --with-targets to --enable-targets.
+
+Thu Oct 19 17:47:41 1995  Fred Fish  <fnf@cygnus.com>
+
+	* Makefile.in:  Remove extraneous tab on otherwise empty line,
+	which confuses many non-GNU versions of "make".
+
+Wed Oct 18 16:31:58 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* dlltool.c (i386_jtab, arm_jtab): New
+	(gen_lib_file): Rewritten to use bfd.
+
+Fri Oct 13 16:10:07 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* Makefile.in (install): Don't give error message if dlltool
+	wasn't built.
+
+Fri Oct 13 11:04:37 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* deflex.l: Allow quoting of IDs.
+	* defparse.y (%union): string deleted.
+	(command): DESCRIPTION takes ID.
+	* dlltool.c (gen_def_file): Quote outgoing name if
+	necessary.  Preserve NONAME.
+	(gen_lib_file): Run ranlib.
+	(workout_prefix): Deleted.
+	(main, usage, long_options): Add --as, --ranlib, --ar options.
+
+Wed Oct 11 13:36:13 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* dlltool.c (mtable): HOW_ALIGN_LONG, new.
+	(d_ord): Deleted.
+	(d_low_ord, d_high_ord, d_named_funcs): New.
+	(gen_exp_file): Create noname entries correctly.
+	(gen_lib_file): Dump exports alphabetically.
+	(process_duplicates):  Count nonamed functions.
+	(fill_ordinals): Keep track of highest ord too.
+	(mangle_defs): Create alphabetically ordered list of names.
+
+Tue Oct 10 09:39:09 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* Makefile.in (TOOL_PROGS): Include DLLTOOL_PROG.
+
+Mon Oct  9 13:06:31 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* dlltool.c (add_underscore): New.
+	(xlate): Use new name.
+	(main, usage): Update.
+
+Fri Oct  6 14:08:51 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* sysinfo.y: Eliminate unused terminals "[" and "]" and unused
+	nonterminal "name".  One s/r conflict remains.
+
+	Mon Sep 25 22:49:32 1995  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* nm.c (print_symname): Don't try to demangle an empty
+	name.
+	* objdump.c (slurp_symtab): Reset symcount if there are
+	no symbols.
+	(slurp_dynamic_symtab): Likewise, for dynsymcount.
+	(disassemble_data): Fix memory leak: free sorted_syms when done.
+	(display_bfd): Likewise, for syms and dynsyms.
+	(dump_relocs): Don't print header before possibly generating an
+	error message.
+	(dump_dynamic_relocs): Likewise.
+
+	* ar.1, nm.1, objdump.1, size.1, strings.1, strip.1: Fix typos and
+	formatting bugs.
+
+Fri Oct  6 12:00:25 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ar.c (do_quick_append): Comment out.
+	(replace_members): Add quick argument.
+	(main): Don't call do_quick_append.
+	(open_inarch): Don't call quick_append to create an empty archive.
+	Instead call bfd_openw/bfd_set_format/bfd_close.
+
+Thu Oct  5 20:53:08 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* bucomm.c: Always include time.h.
+
+Thu Oct  5 17:25:21 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (compare_symbols): Sort gnu_compiled and gcc2_compiled
+	symbols after other symbols with the same value.  Likewise for
+	symbols which look like file names.
+	(objdump_print_address): Always chose the first reasonable symbol
+	with a given value.
+
+Tue Oct  3 22:38:55 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* arsup.c (ar_save): Use rename, not unlink/link/unlink.
+
+Mon Oct  2 12:10:25 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* strings.c (main): Exit with zero status if no files are given
+	and standard input is read.
+
+Thu Sep 28 20:03:07 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-config.in: Calculate underscore and put into makefile
+	fragment, generate config.h.
+	* mpw-make.sed: New file, sed commands to edit Unix makefile
+	into MPW syntax.
+	* mpw-make.in: Remove.
+	* mac-binutils.r: New file, Mac resources.
+
+Thu Sep 28 15:49:00 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* dlltool.c: (gen_exp_file): Always emit a .reloc section if
+	relocatable.
+	(imp_name_lab): New.
+	(gen_def_file): New.
+	(gen_lib_file): Use imp_name_lab.
+	(main): Initialize imp_name_lab.
+
+Mon Sep 25 12:05:34 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Call AC_HEADER_SYS_WAIT.
+	* configure: Rebuild.
+	* config.in: Rebuild.
+	* dlltool.c: Include "libiberty.h" and "bucomm.h".  Don't include
+	<stdio.h>, <stdlib.h>, or <string.h>.  Don't include <wait.h>.
+	Include <sys/types.h>.  Use HAVE_SYS_WAIT_H to control whether to
+	include <sys/wait.h> or define the wait macros by hand.  Don't
+	declare xmalloc.
+	(gen_lib_file): Don't assume that sprintf returns the number of
+	characters; use strlen instead.
+
+Fri Sep 22 17:16:41 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (disassemble_data): Don't use the old BFD based
+	disassembler interface.  Make info a const pointer.
+
+Wed Sep 13 18:33:44 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (start_address): New variable.
+	(stop_address): New variable.
+	(usage): Mention --start-address and --stop-address.
+	(OPTION_START_ADDRESS, OPTION_STOP_ADDRESS): Define.
+	(long_options): Add "start-address" and "stop-address".
+	(disassemble_data): Handle start_address and stop_address.
+	(dump_data, dump_reloc_set): Likewise.
+	(main): Don't set seenflag for -l.  Handle OPTION_START_ADDRESS
+	and OPTION_STOP_ADDRESS.
+	* objcopy.c (parse_vma): Move to bucomm.c.
+	* bucomm.c (parse_vma): New function, moved in from objcopy.c.
+	* bucomm.h (parse_vma): Declare.
+	* binutils.texi, objdump.1: Document new objdump options.
+
+Tue Sep 12 12:37:39 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (maintainer-clean): New target.
+
+	* ar.c (replace_members): Don't call write_archive if nothing
+	changed.
+
+	* objdump.c (disassemble_data): Add casts to avoid gcc warnings.
+
+Thu Sep  7 12:12:17 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.in: Rename from config.h.in.
+	* configure.in: Call AC_CONFIG_HEADER with config.h:config.in.
+	Check for config.h:config.in when creating stamp-h.
+	* configure: Rebuild.
+	* Makefile.in (stamp-h): Depend upon config.in rather than
+	config.h.in.  Set CONFIG_HEADERS to config.h:config.in when
+	calling config.status.
+
+	* Makefile.in (distclean): Remove config.h, stamp-h, and
+        config.log.
+
+	* nm.c (value_format): Initialize based on BFD64 and
+	BFD_HOST_64BIT_LONG.
+	(print_radix): New static variable.
+	(set_print_radix): Set print_radix.  Adjust changes to
+	value_format.
+	(print_value): New static function, to print 64 bit octal and
+	decimal values correctly.
+	(print_symbol_info_bsd): Check BFD64, not BFD_HOST_64_BIT.  Use
+	print_value.
+	(print_symbol_info_sysv): Use print_value.
+	(print_symbol_info_posix): Likewise.
+
+Wed Sep  6 15:02:55 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (*.o): Remove incorrect dependencies on
+	$(BFDDIR)/hosts/std-host.h.
+
+	* Makefile.in (INSTALL_DATA): Add -m 644.
+	(INSTALL_XFORM1): Likewise.
+	(CC_FOR_BUILD): Set to @CC_FOR_BUILD@ rather than $(CC).
+	(mostlyclean): Remove config.log.
+	(distclean): Remove config.cache.
+
+	* configure.in: Call BFD_CC_FOR_BUILD and BFD_BINARY_FOPEN.
+	* configure: Rebuild.
+
+Tue Sep  5 20:22:42 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Rewrite to use autoconf.
+	* aclocal.m4: New file.
+	* configure: New file, built by autoconf.
+	* acconfig.h: New file.
+	* config.h.in: New file, built by autoheader.
+	* Makefile.in: Various changes for new configure script.  Also:
+	(PROGS): Remove $(SYSINFO_PROG).
+	(ALL_CFLAGS): Remove $(TDEFINES).
+	(version.o): Use $(ALL_CFLAGS).
+	(cplus-dem.o, dlltool.o, nlmconv.o): Likewise.
+	(sysdump.o): Depend upon bucomm.h and config.h.
+	(srconv.o, arsup.o, strings.o): Depend upon config.h.
+	(filemode.o): Don't depend upon ../bfd/sysdep.h.
+	(bucomm.o): Depend upon config.h, not ../bfd/sysdep.h.
+	(size.o, objdump.o, nm.o, ar.o, objcopy.o): Likewise.
+	(nlmheader.o, nlmconv.o): Likewise.
+	(distclean): Don't remove sysdep.h.
+	* bucomm.h: Include "ansidecl.h", <stdio.h>, and "config.h".
+  	Include "fopen-same.h" or "fopen-bin.h", based on
+ 	USE_BINARY_FOPEN.  Include <errno.h>, and declare errno if it is
+ 	not a macro.  Include <unistd.h>, <string.h>, <strings.h>,
+ 	<stdlib.h>, and <fcntl.h> if they are present.  Declare strchr,
+ 	strrchr, and strstr if no string header file exists.  Include
+	<sys/file.h> if it exists and <fcntl.h> does not.  Define
+	O_RDONLY and O_RDWR if necessary.
+	* ar.c:  Don't include "sysdep.h".  Do include <sys/types.h> and
+	<sys/stat.h>.  Use HAVE_GOOD_UTIME_H rather than POSIX_UTIME.  Use
+	HAVE_UTIMES rather than !USE_UTIME.  Don't include <errno.h>, and
+	don't declare errno.
+	* arsup.c: Don't include <sysdep.h>.
+	* bucomm.c: Don't include "sysdep.h".  Include <stdio.h>,
+	<sys/types.h>, and <sys/stat.h>.  Include <time.h> if it defines
+	time_t.  Define time_t if necessary.
+	* coffdump.c: Don't include "sysdep.h".
+	* coffgrok.c, filemode.c, nlmconv.c, size.c: Likewise.
+	* srconv.c, strings.c: Likewise.
+	* nm.c: Don't include "sysdep.h".  Don't try to define HAVE_SBRK.
+	* objcopy.c: Don't include "sysdep.h".  Include <sys/types.h> and
+	<sys/stat.h>.
+	(simple_copy): Use creat rather than assuming that O_CREAT is
+	defined.
+	* objdump.c: Don't include "sysdep.h".  Use
+	NEED_DECLARATION_PRINTF rather than !FPRINTF_ALREADY_DECLARED.
+	* sysdump.c: Include "bfd.h" and "bucomm.h".  Don't include
+	"sysdep.h" or <stdlib.h>.
+	(dump_symbol_info): Rename from symbol_info.  Change all callers.
+
+Mon Sep  4 14:30:00 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in (host_makefile_frag): Don't set.  Substitute for
+	@CC@, @CFLAGS@, @HDEFINES@ and @LDFLAGS@ in Makefile.
+	* Makefile.in (AR_FLAGS): Set to rc rather than qv.
+	(CC): Define as @CC@.
+	(CFLAGS): Set to @CFLAGS@.
+	(LDFLAGS): Define as @LDFLAGS@.
+	(ALL_CFLAGS): Use @HDEFINES@ rather than $(HDEFINES).
+
+	* configure.in: Don't bother to call config.bfd for each target.
+	Just call it for the default target, and use the shell variable to
+	decide whether underscores are used.
+
+Thu Aug 31 19:21:48 1995  Jason Molenda    (crash@phydeaux.cygnus.com)
+
+	* configure.in: match i[3-6]86-*-win32, not just i386-*-win32.
+
+Thu Aug 31 16:30:22 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* dlltool.c (add_indirect): New.
+	(asm_prefix): New
+	(gen_exp_file): Timestamp should be 0. Insert prefix when
+	needed. New code for indirection.
+	(gen_lib_file): Timestamp should be 0. Insert prefix
+	when needed.
+	(usage): Document --add-indirect.
+	(main): Cope with new option.
+
+	* objdump.c (dump_private_headers): New.
+	(usage): Document new option.
+	(long_option): Add private-headers.
+	(dump_bfd_private_header): New.
+	(main): Cope with new option.
+
+Thu Aug 31 04:09:16 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* dlltool.c (run): Add missing 3rd arg to waitpid.
+
+Wed Aug 30 11:02:11 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* Makefile.in (TOOL_PROGS): Include dlltool if needed.
+
+Tue Aug 29 13:25:21 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* dlltool.c (rva): Deleted.
+	(rvaafter, rva_before): Use new assembler pseudo.
+	(flush_page, gen_exp_file, gen_lib_file): Use new way of RVAing.
+	(gen_exp_file): Don't generate .edata if no need.
+	(gen_lib_file): Don't make timestamp.
+	Put _iname in idata$7.
+	(workout_prefix): Fix memory initialization bug.
+	(usage): Tidy up, delete many single char options.
+	(main): rva option is gone.
+
+Mon Aug 21 18:41:28 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* dlltool.c (options): image-base is a synonym for rva.
+	(gen_lib_file): Put dll name into ibase$7.
+
+Sun Aug 20 09:59:00 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	Modified to generate archives and objects rather than .s files.
+	* dlltool.c (run) New function.
+ 	(gen_exp_file, gen_lib_file): Use run.
+	(workout_prefix): New.
+	(usage): Document new options.
+	(main): Parse new options.
+
+Wed Aug 16 16:26:52 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* dlltool.c (gen_exp_file): Fix RVA handling.
+	(rva_s, rva_n): Delete.
+
+Fri Aug 11 18:27:18 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* nm.c (main): Ignore -e.
+
+Thu Aug 10 17:35:00 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* Makefile.in (config.texi): New target.  Write out a setting for
+	texinfo variable VERSION.
+	(binutils.dvi, binutils.info): Depend on it.
+	* binutils.texi: Include it, and reference @value{VERSION} instead
+	of explicitly specifying 2.2(!).
+
+Thu Aug 10 16:07:53 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffgrok.c (do_type): Handle array dimensions the same way gdb
+	does.
+
+Tue Aug  8 17:10:42 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* dlltool.c (mtable): New fields.
+	(ASM_RVA_BEFORE, ASM_RVA_AFTER): New.
+	(flush_page): Use new macros.
+
+Sat Aug  5 00:16:37 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* objcopy.c (mark_symbols_used_in_relocations): Handle sections
+	with no relocations.
+	* coffgrok.c (do_sections_p1): Likewise.
+
+Mon Jul 31 12:51:06 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* strings.c (print_strings): For compatibility with existing
+	strings programs, print strings which are not terminated with a
+	null byte or a newline.
+	* binutils.texi, strings.1: Update documentation accordingly.
+
+	* ar.c (replace_members): For compatibility with existing ar
+	programs, permit users to add the same file multiple times.
+
+Tue Jul 25 11:21:53 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* strings.c (DATA_FLAGS): Remove SEC_DATA.
+	(main): If no file names are given, scan standard input.
+	* binutils.texi, strings.1: strings now scans non-data sections by
+	default.
+
+Mon Jul 24 13:52:28 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* srconv.c (wr_hd): Set afl field to 4 for bfd_arch_sh.
+	(writeINT): When size == -2, use 2 bytes for the h8300 and 4 bytes
+	for the	sh.
+
+	* sysdump.c (fillup): Return size - 1, the last byte is a checksum
+	and shouldn't be counted.
+	* sysroff.info (hd): Changed segment identifier from a byte to a 1
+	bit field.  The sysroff 2.0-01 specification seems to be in error
+	here.  Reduce width of following "spare" field from 4 to 3 bits.
+	(rl): Changed order and width of first 4 bitfields to correspond
+	to sysroff specification.
+	(dln_head, dln_inside, dln_tail): Removed.
+
+Tue Jul 18 23:00:03 1995  Fred Fish  <fnf@cygnus.com>
+
+	* nm.c (sort_symbols_by_size):  Enclose expression being casted
+	in parens so result is casted, not just first operand.  Can't
+	do pointer arithmetic on void* pointers.
+
+Fri Jul 14 13:42:42 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* sysdump.c (dh): Changed format of output to be 16 hex digits
+	followed by 16 ascii characters, similar to Emacs' hexl-mode,
+	to make it easier to read.
+	(xcalloc): fix typo.
+
+Thu Jul 13 15:27:44 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* srconv.c (wr_tr): Write out handcrafted tr block.
+	(walk_tree_symbol): Use evallen and evalue instead of
+	vallen & value because of corresponding changes in
+	sysroff.info.
+
+	* sysdump.c (sysroff_swap_tr_in, sysroff_print_tr_out): New
+	functions.
+
+	* sysroff.info (tr): the tr block is a special case --- a block
+	without contents --- which can't be handled by generated code.
+	(den, dpp): only first byte is present for DENend, DPPend.
+	(dsy): describe a conditional portion of block, rename some fields.
+	(dps): describe a conditional portion of block.
+	(dfl): removed.
+
+	* sysinfo.y (yyerror): write error message to standard error.
+
+Thu Jul 13 10:43:59 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (DISTSTUFF): Add arparse.h and sysinfo.h.
+	(mostlyclean): Remove y.output.
+	(clean): Remove sysroff, sysroff.c, sysroff.h, and sysinfo.
+
+	* nlmconv.c (powerpc_mangle_relocs): Cast memset arg to size_t.
+	* objcopy.c (copy_object): Likewise.
+
+	* nm.c (HAVE_SBRK): Define except on amigados and WINDOWS_NT.
+	(struct size_sym): Define.
+	(show_stats): New static variable.
+	(long_options): Add undocumented option "stats".
+	(main): Print memory stats if requested.
+	(sort_bfd, sort_dynamic, sort_x, sort_y): New static variables.
+	(numeric_forward): Use minisymbols rather than asymbols.
+	(non_numeric_forward): Likewise.
+	(size_forward1): Rename from size_forward.  Use minisymbols.
+	(size_forward2): New static function.
+	(sort_symbols_by_size): Take new arguments dynamic, size, and
+	symsizep.  Use minisymbols.  Don't store the size back in the
+	symbol; store in a newly allocate struct size_sym array.
+	(display_rel_file): Read minisymbols rather than asymbols.  Set
+	sort_* variables.  Call print_size_symbols if sorting by size.
+	(filter_symbols): Take new arguments dynamic and size.  Use
+	minisymbols.
+	(print_symbols): Likewise.  Call print_symbol for actual printing.
+	(print_size_symbols): New static function.
+	(print_symbol): New static function.
+
+Wed Jul 12 10:43:05 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (dump_section_stabs): Only print each stabs section
+	once.
+	(compare_relocs): Make it clear to gcc that this always returns a
+	value.
+
+Wed Jul 12 10:40:23 1995  H.J. Lu  <hjl@nynexst.com>
+
+	* objcopy.c (simple_copy): Preserve errno on failure.
+	(smart_rename): Print error mesage if simple_copy fails.
+
+Tue Jul 11 13:10:52 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* sysdump.c: re-indented file.
+	(module): read blocks sequentially instead of trying to parse
+	them, as that would require changing the parser recognize the
+	difference between a DPSstart and DPSend block.
+	(getone): Add break's between switch blocks as appropriate.
+	(object_body_list): parse blocks according to sysroff spec.
+
+Mon Jul 10 12:37:25 1995  J.T. Conklin  <jtc@poseidon.cygnus.com>
+
+	* sysroff.info: re-indented file, prior formatting was confusing
+	because it was indentation did not reflect nesting of conditional
+	records.  Change "space size within segment" record in hd record
+	from bit to byte.
+
+	* sysinfo.y (cond_it_field): Use xcalloc instead of calloc.
+
+	* srconv.c (wr_cs): Reformatted cs header array, tag each byte
+	with a comment describing the field.
+	(wr_unit_info): Use SEEK_SET macro instead of constant 0.
+	(main): Use FOPEN_WB macro instead of literal "wb".
+	* sysroff.info: Remove fdl (dfl) field from cs block.  Compare
+	ptr->type with ED_TYPE_CONST instead of constant 2 in ed block.
+
+Tue Jul  4 14:48:42 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* nm.c (size_forward): Check yf against yn, not xn.
+
+	* objcopy.c (copy_archive): Record all output BFD's, and close
+	them before unlinking them and removing the temporary directory,
+	to avoid NFS problems.
+
+	* ar.c (replace_members): In verbose messages, use 'r' when
+        replacing a member, and 'a' when adding one.
+
+	* ar.c (ar_truncate): New static variable.
+	(normalize): Change return type to const char *.  Add abfd
+	argument.  Change all callers.  If ar_truncate, chop the filename
+	to abfd->ar_max_namelen.
+	(main): For the 'f' modifier, set ar_truncate to true.  Don't
+	change quick_append to replace if ar_truncate is true.
+	(do_quick_append): If ar_truncate, set BFD_TRADITIONAL_FORMAT.
+	(write_archive): Likewise.
+	* binutils.texi, ar.1: Document 'f' modifier.
+
+	* objcopy.c (enum strip_action): Define strip_unneeded.
+	(OPTION_STRIP_UNNEEDED): Define.
+	(strip_options): Add "strip-unneeded".
+	(copy_options): Likewise.
+	(copy_usage): Mention --strip-unneeded.
+	(strip_usage): Likewise.
+	(is_strip_section): Strip debugging sections if strip_unneeded.
+	(filter_symbols): If strip_unneeded, only keep BSF_KEEP symbols.
+	(copy_object): If strip_all, discard symbols without checking
+	discard_locals.
+	(copy_object): Call filter_symbols if strip_unneeded.
+	(setup_section): Strip debugging sections if strip_unneeded.
+	(copy_section): Likewise.
+	(strip_main): Handle OPTION_STRIP_UNNEEDED.
+	(copy_main): Likewise.
+	* binutils.texi, objcopy.1, strip.1: Document --strip-unneeded.
+
+Mon Jul  3 14:16:47 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* configure.in (i386-*-win32): New configuration.
+	* dlltool.c (killat, xlate, usage, long_options, main):
+	Understand and cope with -k option.
+
+Sat Jul  1 12:25:15 1995  Fred Fish  <fnf@cygnus.com>
+
+	* ar.c: (extract_file):  Change "#if POSIX_UTIME" to
+	"#ifdef POSIX_UTIME" to match other tests of POSIX_UTIME
+	and avoid lossage when POSIX_UTIME is not defined at all.
+
+Wed Jun 28 17:51:24 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* ar.c: (print_contents.c, extract_file, do_quick_append):
+	Malloc buffers rather than allocate on stack (so it works
+	on NT).
+	* deflex.l: Names can have an @ in them.
+	* dlltool.c: Loads of stuff. Can now generate .imp files which
+	work with NT .dlls.
+
+Thu Jun 22 19:10:50 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-make.in (demangle.c.o): Remove.
+	(arparse.h): Depend on arparse.c instead of arparse.y.
+
+Wed Jun 21 17:32:45 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* Makefile.in (DISTSTUFF): Don't include info here.
+	(diststuff): Include it here.
+	(realclean): Remove *.info.
+
+	* objdump.c (compare_relocs): If relocation entries have the same
+	address, keep them in file order.
+
+Mon Jun 19 09:06:49 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* dlltool.c: Change names of generated files. .*.s-> -*.s
+
+	* objdump.c (dump_section_stabs):  Check for names
+	which are supersets of selected names.
+
+Wed Jun 14 19:43:52 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* dlltool.c (mtable, ARM jump): Must redirect via pc offsetable ptr.
+
+Wed Jun 14 13:27:22 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* deflex.l, defparse.y, dlltool.c: New files.
+	* Makefile.in, configure.in: Support for them.
+
+Mon Jun 12 11:27:54 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* sysdump.c: Include sysdep.h
+	(main): Open input with FOPEN_RB.
+
+Fri Jun  9 17:26:11 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* objdump.c (wide_output): New flag variable.
+	(usage): Print new -w, --wide options.
+	(long_options): Add --wide support.
+	(dump_section_header): If --wide, don't print a newline between
+	the section's first line and the flags.
+	(objdump_print_address): Use unsigned comparisons for the binary
+	search, not signed.
+	(disassemble_data): If --wide, don't put a \n between the
+	disassembly output and relocation information.
+	(main): Support -w option being the same as --wide.
+
+Thu Jun  1 17:09:27 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	Sat May  6 08:52:24 1995  H.J. Lu (hjl@nynexst.com)
+
+	* objcopy.c (smart_rename): make it smarter, clean up
+	  if rename () fails.
+
+Tue May 30 14:24:15 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* Makefile.in: Delete lines with lots of #### because four or more
+	indicate a point for makefile fragment substitution.
+
+Tue May  9 17:17:05 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* configure.in: Don't build nlmconv on PowerPC eabi any more, it
+	is not needed.
+
+Thu Apr 27 20:21:24 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* Makefile.in (EXPECT): Define.
+	(RUNTEST): Use one in source tree if present.
+	(check): Set `rootme' for $(EXPECT).
+
+Wed Apr 26 18:26:21 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* srconv.c (main): Add support for -n option which disables
+	prescan of common symbols.
+	(wr_ob): If reading past the end of a section, fill with zeros.
+
+Tue Apr 25 19:14:37 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* objdump.c (dump_section_header): Display load address after
+	virtual memory (run-time) address.
+
+Wed Apr 19 09:44:06 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* Makefile.in (cplus-dem.o): Pass -DVERSION='"$(VERSION)"' to the
+        compile.
+	(DEMANGLER_PROG): No longer uses version.o.
+
+Mon Apr 10 13:29:49 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	Merge in support for Mac MPW as a host.
+	(Old change descriptions retained for informational value.)
+
+	* mpw-config.in (TDEFINES): Define as empty in makefile frag.
+
+	* mpw-config.in: Create mk.tmp, define ARCHDEFS in it.
+
+	* mpw-config.in: New file, MPW configure fragment for binutils.
+	* mpw-make.in (install-only): New target.
+	(install): Also depend on install-only.
+
+	* mpw-make.in (cplusfilt): Renamed from c++filt.
+	(INCLUDES): Add more paths.
+
+	* mpw-make.in: New file, MPW makefile fragment for binutils.
+	(Normally automatically generated from Makefile.in.)
+
+Mon Mar 27 11:52:57 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ar.c (write_archive): Call make_tempname to get output file
+	name, rather than using a fixed name based on the input file.
+
+	* objcopy.c (make_tempname): Copy from here...
+	* bucomm.c (make_tempname): ...to here, and make global.
+	* bucomm.h (make_tempname): Declare.
+
+Fri Mar 24 11:47:42 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* strings.c: Include "bfd.h" before other headers.  Include
+	"sysdep.h".
+	* bucomm.c (print_arelt_descr): Cast st_uid and st_gid to long,
+	and print them with %ld.
+
+Fri Mar 10 13:09:42 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objcopy.c (strip_options): Add --keep-symbol.
+	(copy_options): Likewise.
+	(copy_usage): Mention --keep-symbol and -K.
+	(strip_usage): Likewise.
+	(keep_symbols): New static variable.
+	(is_strip_symbol): Adjust the return value according to
+	keep_symbols.
+	(strip_main): Handle -K.  For -N, check that -K was not given.
+	(copy_main): Likewise.
+	* binutils.texi, objcopy.1, strip.1: Document -K.
+
+Mon Mar  6 13:33:47 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* objcopy.c (copy_archive): Check result of mkdir.
+	(copy_main): Cast an xmalloc result.
+
+	* objdump.c (usage): Break long format string into shorter ones.
+
+Mon Mar  6 13:46:12 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bucomm.c (list_supported_targets): New function.
+	* bucomm.h (list_supported_targets): Declare.
+	* ar.c (usage): Call list_supported_targets.
+	* nm.c (usage): Likewise.
+	* objcopy.c (copy_usage, strip_usage): Likewise.
+	* objdump.c (usage): Likewise.
+	* size.c (usage): Likewise.
+	* strings.c (usage): Likewise.
+
+Tue Feb 28 15:13:58 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bucomm.c (print_arelt_descr): Cast st_size to long before
+	passing it to fprintf.
+
+Fri Feb 17 13:36:45 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objcopy.c (struct section_list): Add fields remove, set_flags,
+	and flags.  Change adjust from boolean to enum.
+	(remove_sections): Remove static variable.
+	(sections_removed): New static variable.
+	(copy_options): Add --set-section-flags.
+	(copy_usage): Mention --set-section-flags.
+	(parse_flags): New static function.
+	(find_section_list): New static function.
+	(is_strip_symbol): Change return type from int to boolean.
+	(is_strip_section): New static function.
+	(filter_symbols): Call is_strip_section.
+	(copy_object): When adding sections, check for specified flags or
+	VMA.  Call filter_symbols if any sections are being removed.
+	(setup_section): Use find_section_list function rather than
+	looking through remove_sections and adjust_sections.  Handle
+	--set-section-flags.
+	(copy_section): Use find_section_list rather than looking through
+	remove_sections.
+	(strip_main): Use find_section_list instead of adding items to
+	sections_removed.
+	(copy_main): Use find_section_list instead of adding items to
+	sections_removed and adjust_sections.  Handle --set-section-flags.
+	* binutils.texi, objcopy.1: Document --set-section-flags.
+
+Tue Feb 14 18:03:03 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (with_source_code): New global variable.
+	(usage): Mention -S/--source.
+	(long_options): Add --source.
+	(prev_functionname, prev_line): New static variables.
+	(struct print_file_list): Define.
+	(print_files): New static variable.
+	(skip_to_line, show_line): New static functions.
+	(disassemble_data): Call show_line to handle -l and -S.
+	(main): Handle -S.
+	* binutils.texi, objdump.1: Document -S/--source.
+
+Thu Feb  9 16:11:53 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objcopy.c (copy_usage): Rename parameter to avoid shadowing.
+	(strip_usage): Likewise.
+
+	* objcopy.c (struct section_add): Define.
+	(add_sections): New static variable.
+	(copy_options): Accept --add-section.
+	(copy_usage): Mention --add-section.
+	(copy_object): Add sections from the add_sections list.
+	(copy_main): Handle --add-section.
+	* binutils.texi, objcopy.1: Document --add-section.
+
+Wed Feb  1 15:04:57 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* objdump.c (disassemble_data): Pass section offset, not absolute
+	address, to bfd_find_nearest_line.
+
+	* nlmconv.c (powerpc_mangle_relocs): Don't use const with
+	reloc_howto_type.
+
+Thu Jan 26 18:50:06 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (compare_symbols): Use bfd_asymbol_value (VAR) rather
+	than VAR->value.
+	(objdump_print_address): Likewise.
+	(disassemble_data): Don't change the symbol values.  It can
+	confuse bfd_canonicalize_reloc.
+
+Thu Jan 26 12:03:56 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* configure.in: Add support for powerpc-*-ebai.
+
+Wed Jan 18 10:02:12 1995  Steve Chamberlain  <sac@splat>
+
+	* coffdump.c: Include sysdep.h.
+	(dump_coff_type): Handle coff_secdef_type.
+	* coffgrok.c : Include sysdep.h.
+	* srconv.c: Include libiberty.h
+	(absolute_p, dty_start, dty_end, dump_tree_structure): Remove.
+
+Wed Jan 18 12:24:14 1995  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* coffdump.c (dump_coff_scope): Cast pointer to unsigned long for
+	printf.
+	* coffgrok.c: Include bucomm.h.  Don't declare xmalloc.
+	(push_scope): Declare type of parameter link.
+	* size.c: Include libiberty.h.
+	* srconv.c: Include bucomm.h.
+	(find_base): Declare at top of file.
+	(wr_hd): Add default case to architecture switch.
+	(wr_dps_start): Declare type of parameter nest.
+	(wr_du): Comment out variables used only in commented out blocks.
+	(wr_dus): Remove unused variable i.
+	(wr_sc): Remove unused variables myinfo, low, and high.
+	* strings.c: Include libiberty.h.
+	* sysdump.c: Include <ctype.h>.
+
+Tue Dec 20 19:13:44 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* ar.c (main): Ignore 'f' modifier used on HP/UX 9.
+
+Thu Dec 15 17:34:12 1994  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* ar.c, nm.c, objcopy.c, objdump.c: Include progress.h.
+	* ar.c, nm.c, objcopy.c, objdump.c (main): Add START_PROGRESS
+	and END_PROGRESS.
+	* ar.c (map_over_members, open_inarch): Call PROGRESS.
+	* nm.c (main, display_archive, filter_symbols, print_symbols):
+	Call PROGRESS.
+
+	* objcopy.c (copy_usage): Break up long usage string.
+
+Wed Dec 14 15:51:56 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* objcopy.c (copy_object): Don't bother setting status after
+	nonfatal() "call", because it won't return.
+
+Fri Dec  9 00:22:54 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlmconv.c (powerpc_mangle_relocs): Don't switch a reloc to use
+	the section symbol if the symbol is undefined.
+
+Thu Dec  8 14:45:50 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* objcopy.c (add_strip_symbol): Cast return value of xmalloc.
+
+Wed Nov 30 11:05:43 1994  Ian Lance Taylor  <ian@rtl.cygnus.com>
+
+	* ar.c (replace_members): Pass current->filename to normalize when
+	checking for duplicates, because the filename of a newly added
+	file will not have been normalized yet.
+
+Thu Nov 17 15:00:13 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* ar.c (main): Don't call do_quick_append if any of the archive
+	names are longer than 14 characters.
+
+	* objcopy.c (main): Fix is_strip test.  From
+	pirker@eiunix.tuwien.ac.at (Martin Pirker).
+
+Thu Nov 17 15:37:19 1994  Mark W. Eichin  <eichin@cygnus.com>
+
+	* objcopy.c (add_strip_symbol): New function, adds a name to an
+	explicit list of symbols to strip.
+	(is_strip_symbol): New function, reports whether the name argument
+	is in the explicit list.
+	(filter_symbols): Check against is_strip_symbol above all.
+	(strip_main): Recognize -N option. If used, don't default to
+	strip_all.
+	(copy_main): Recognize -N option.
+	(strip_usage): Document -N and --strip-symbol options.
+	(copy_usage): Ditto.
+	* objcopy.1, strip.1, binutils.texi: Document -N and
+	--strip-symbol options.
+
+Tue Nov  8 13:12:54 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* objdump.c (display_target_list, display_info_table): Pass an
+	array to tmparg, rather than NULL, since some systems can't handle
+	NULL.
+
+	* objcopy.c (copy_archive): Keep a list of the names of the
+        temporary files we created.  Close each input BFD after we open
+        its successor.
+
+Mon Nov  7 15:48:39 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* Makefile.in (VERSION): Bump to 2.5.3.
+
+Thu Nov  3 19:04:34 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* Makefile.in (install-info): Install info files from whatever
+	directory they were found in.
+
+	Patch from DJ Delorie:
+	* configure.bat: do c++filt -> cxxfilt right
+
+	* sysinfo.y: Include system header files early, so any potential
+	declaration of abort() occurs before its use.
+
+	* strings.c (strings_file): Try opening the file in binary mode
+	first.
+
+Wed Nov  2 15:44:13 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* ar.c (main): Treat ar qs like ar rs.
+
+Tue Oct 25 16:19:25 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* objcopy.c (gap_fill): Explicitly initialize, for clarity.
+	(pad_to_set, pad_to): New static variables.
+	(copy_options): Accept --pad-to.
+	(copy_usage): Mention --pad-to.
+	(copy_object): Support --pad-to.
+	(compare_section_vma): Sort non loadable sections to the front.
+	Sort sections with the same VMA by size.
+	(copy_main): Handle --pad-to.
+	* binutils.texi, objcopy.1: Document --pad-to.
+
+Thu Oct 20 13:51:31 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* objcopy.c (gap_fill_set, gap_fill): New static variables.
+	(copy_options): Accept --gap-fill.
+	(copy_usage): Mention --gap-fill.
+	(copy_object): Support --gap-fill.
+	(get_sections, compare_section_vma): New static functions.
+	(copy_main): Handle --gap-fill.
+	* binutils.texi, objcopy.1: Document --gap-fill.
+
+Wed Oct 19 14:09:16 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* Makefile.in (check): Add a dummy else clause to the if
+	statement.
+
+	* objcopy.c (copy_object): Revert yesterday's change.
+	* binutils.texi, objcopy.1: Remove special mention of --set-start
+	and `binary' output format.
+
+Tue Oct 18 11:12:01 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* objcopy.c (copy_object): If the output file format is `binary',
+	and the start address was not set using --set-start, default the
+	start address to zero.  This hack is because the `binary' output
+	file format uses the start address to set the virtual address of
+	the first byte in the file.
+	* binutils.texi, objcopy.1: Add some notes on generating S-records
+	and binary files.
+
+	* nm.c (print_symdef_entry): Call print_symname to print the
+	symbol name, so that --demangle works.
+
+	* Makefile.in (mostlyclean): Remove tmpdir.
+
+	* objcopy.c (struct section_list): Add fields used, adjust, val.
+	(adjust_start, set_start_set, set_start): New static variables.
+	(adjust_section_vma, adjust_sections): New static variables.
+	(copy_options): Add --adjust-start, --adjust-vma,
+	--adjust-section-vma, --adjust-warnings, --no-adjust-warnings,
+	--set-start.
+	(parse_vma): New static function.
+	(copy_usage): Mention new options.
+	(copy_object): Handle --set-start and --adjust-start.
+	(setup_section): Correct type of last argument to PTR.  Set used
+	field if section is removed.  Handle --adjust-vma and
+	--adjust-section-vma.
+	(copy_section): Correct type of last argument to PTR.
+	(mark_symbols_used_in_relocations): Likewise.
+	(strip_main): Clear used field when handling -R.
+	(copy_main): Handle new options.
+	* binutils.texi (objcopy): Document new options.
+	* objcopy.1: Document new options.
+
+Fri Oct 14 14:38:13 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* configure.in (configdirs): Remove definition--testsuite is no
+	longer configured.
+	* Makefile.in (testsuite): Remove target.
+	(site.exp): New target.
+	(check): Rewrite.
+	(clean, distclean): Don't recur into testsuite directory.
+
+Thu Oct 13 19:24:09 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* Makefile.in (VERSION): Updated to 2.5.
+	* Version 2.5 released.
+
+Tue Oct 11 15:26:42 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* Makefile.in (sysdump.o): Depends upon sysroff.c.
+
+Mon Oct 10 13:50:30 1994  J.T. Conklin  (jtc@rtl.cygnus.com)
+
+	* nlmconv.c (link_inputs): Pass -Ur flag to ld so that the
+	  ctor/dtor tables needed by C++ programs are built.
+
+Sun Oct  9 18:04:00 1994  Jim Wilson  (wilson@sphagnum.cygnus.com)
+
+	* Makefile.in (srconv.o): Add dependence on sysroff.c.
+
+Tue Oct  4 12:19:51 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* configure.in: Use ${config_shell} when running config.bfd.
+
+	* Makefile.in (sysroff.h): Split target away from sysroff.c.
+	(srconv.o, sysdump.o): New targets.
+	(srconv, sysdump): Don't depend upon sysroff.c.
+
+Wed Sep 28 13:04:34 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* Makefile.in (arparse.c): Don't ignore errors from mv.
+	(sysinfo.c): Likewise.  Also, depend upon arparse.c, to prevent a
+	parallel make from trying to build both arparse.c and sysinfo.c
+	simultaneously.
+	(nlmheader.c): Similar change.
+	(arparse.h): Separate target from arparse.c, so that a parallel
+	make does not try to build both at once.  Depend upon arparse.c.
+	(sysinfo.h): Similar change.
+
+	* objdump.c (disassemble_data): Pass the reloc buffer to free, not
+	the pointer used to loop over the relocs.
+
+Sat Sep 24 16:16:57 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* objdump.c (disassemble_data): Cast result of xmalloc.
+
+Wed Sep 21 19:30:35 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* objdump.c (sorted_syms, sorted_symcount): New global variables.
+	(objdump_print_address): Use sorted_syms and sorted_symcount
+	instead of syms and symcount.
+	(disassemble_data): Don't bother to get the relocs before looping
+	over the sections.  Before filtering and sorting the symbol table,
+	copy it into sorted_syms.
+
+Fri Sep 16 11:27:39 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* objdump.c (struct objdump_disasm_info): Add field require_sec.
+	(objdump_print_address): If aux->require_sec, require that the
+	symbol be in aux->sec even if HAS_RELOC is not set.  If we can't
+	find a smaller symbol in the right section, look for a larger one.
+	(disassemble_data): Set aux.require_sec around the
+	objdump_print_address call for the instruction address.
+
+Thu Sep 15 21:43:17 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ar.c: Call xexit rather than exit.
+	(output_filename, output_file, output_bfd): New static variables.
+	(remove_output): New static function.
+	(main): Call xatexit (remove_output).  Call xexit rather than
+	returning.
+	(extract_file): Set output_filename and output_file while output
+	file is open.
+	(write_archive): Likewise, but use output_bfd, not output_file.
+	* arsup.c: Include libiberty.h.  Call xexit rather than exit.
+	* bucomm.c: Likewise.
+
+	* objdump.c (disassemble_all): New global variable.
+	(usage): Document --disassemble-all.
+	(long_options): Add disassemble-all as a synonym for -D.
+	(compare_symbols): Make pointers const.
+	(compare_relocs): New static function.
+	(disassemble_data): Rename disassemble to disassemble_fn to avoid
+	shadowing.  If dump_reloc_info, print relocs along with
+	disassembly.  Skip sections which are not SEC_CODE unless
+	disassemble_all or only is set.
+	(display_bfd): Don't call dump_relocs if disassemble is set.
+	(main): Accept and handle -D.
+	* binutils.texi: Document -D/--disassemble-all.
+	* objdump.1: Likewise.
+
+Wed Sep 14 12:19:07 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* objdump.c (disassemble_data): Initialize prevline to 0.  Make
+	prev_function non const.  Copy functionname into an malloc buffer
+	when setting prev_function, instead of assuming that the string
+	will last forever.
+
+	* nm.c: Include libiberty.h.
+	(sort_by_size): New static variable.
+	(long_options): Add --size-sort.
+	(usage): Mention --size-sort.
+	(numeric_forward): Make static.  Change from void * to PTR.
+	(numeric_reverse): Likewise.
+	(non_numeric_forward, non_numeric_reverse): Likewise.
+	(sorters): Change declaration from void * to PTR.
+	(size_forward, sort_symbol_by_size): New static functions.
+	(display_rel_file): Handle sort_by_size.
+	(filter_symbols): If sort_by_size, discard absolute and undefined
+	symbols.
+	* binutils.texi (nm): Document --size-sort.
+	* nm.1: Document --size-sort.
+
+Tue Sep 13 21:06:06 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* objcopy.c (copy_main): Initialize input_filename and
+	output_filename to NULL.
+
+Tue Sep 13 14:17:24 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* Makefile.in (version.o): Depend upon Makefile, so that version.o
+	gets rebuilt when make variable VERSION is changed.
+
+	* objdump.c (dump_section_header): Print the SEC_NEVER_LOAD flag.
+
+Wed Aug 24 12:40:09 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* configure.in: Change i[34]86 to i[345]86.
+
+Tue Aug 23 11:00:40 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* ar.c (ranlib_touch): Don't update the archive map if there isn't
+	one.
+
+Mon Aug 22 16:02:18 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* ar.c: Include libiberty.h.
+	(inarch): Remove variable.
+	(map_over_members): Make static.  Add arch argument, and use it
+	instead of inarch.  Change all callers.
+	(main): Treat --version as -v.  Accept -t argument.  Accept any
+	number of archive arguments.  Catch and use open_inarch return
+	value, rather than using inarch.
+	(open_inarch): Return newly opened BFD, rather than using inarch.
+	(do_quick_append): Make archive_filename const.
+	(write_archive): Add iarch argument, and use it instead of inarch.
+	Change all callers.
+	(delete_members, move_members, replace_members): Likewise.
+	(ranlib_only): Don't exit on success.  Catch and use open_inarch
+	return value.
+	(ranlib_touch): New function.
+	* arsup.h (map_over_members): Don't declare.
+	(ar_end, ar_extract): Declare.
+	(open_inarch): Change return value in declaration to bfd *.
+	* arsup.c (map_over_list): Make static. Always pass two arguments
+	to function.  Add arch argument, and use it instead of inarch.
+	Change all callers.
+	(ar_directory_doer): Make static.  Add ignored second argument.
+	Change all callers.
+	(ar_directory): Use open_inarch return value rather than inarch.
+	(ar_addlib_doer): Make static.
+	(ar_addlib): Use open_inarch return value rather than inarch.
+	(ar_extract): Remove unused local variable abfd.
+
+Thu Aug 11 14:55:57 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	Add support for removing named sections to objcopy and strip.
+	* objcopy.c (struct section_list): Define.
+	(remove_sections): New static variable.
+	(strip_options, copy_options): Add remove-section.
+	(copy_usage, strip_usage): Mention -R and --remove-section.
+	(setup_section): If section is in remove_sections list, ignore it.
+	(copy_section): Likewise.
+	(strip_main, copy_main): Handle -R.
+	* binutils.texi, objcopy.1, strip.1: Document new options.
+
+Wed Aug 10 10:19:55 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* nlmconv.c (powerpc_mangle_relocs): Rename symvalue to sym_value,
+	so as not to conflict with the symvalue typedef in bfd.h.
+
+Mon Aug  1 13:19:09 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* nlmheader.y: Per current NetWare docs, accept a revision number
+	of 0 and treat a revision number greater than 26 as 0.
+
+Mon Jul 25 12:58:36 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* objdump.c (objdump_print_address): Correct handling of end of
+	symbols when looking for next symbol with a different value.
+
+Fri Jul 22 16:48:34 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* nm.c (numeric_forward): Treat undefined symbols as "less than"
+	defined symbols with zero values.  If numeric values are equal, or
+	both symbols are undefined, sort alphabetically.  Don't assume
+	that the difference of two bfd_vma values will truncate to "int"
+	and still have the same sign.
+	(numeric_reverse): Call numeric_forward and negate the result.
+	(print_symbol_info_bsd): For undefined symbols, print leading
+	spaces equivalent to the width of a printed bfd_vma, rather than
+	assuming that 8 will look right.
+
+Fri Jul 22 10:36:50 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
+
+	* coffgrok.c (doit):  Zero all fields of new structure.
+	* srconv.c (sysroff_swap_*_out): Remove redundant trailing arg.
+	* sysinfo.y: Generate sysroff_swap_*_out without requiring extra
+	arg.
+
+Fri Jul 22 10:09:53 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
+
+	* nlmheader.y: Make "stack" and "stacksize" synonyms in the lexer
+	  rather than the parser.
+
+Thu Jul 21 10:25:09 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* config/mh-alphaosf, config/mh-apollo68v, config/mh-delta88:
+	Remove; obsolete.
+
+Sat Jul 16 22:34:39 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* objdump.c (slurp_dynamic_symtab): Try to get the dynamic symbols
+	even if the bfd is not marked DYNAMIC.  ELF executables are not
+	marked DYNAMIC, but do have dynamic symbols.
+
+Fri Jul 15 01:41:35 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
+
+	* coffgrok.c (do_where): Make data with no type 'int'.
+	(do_define):  Keep info on source file of a symbol.
+	* coffgrok.h (coff_symbol): New field.
+	* srconv.c (PROGRAM_VERSION): Now 1.3
+	(wr_rl): Use external ref number for symbol.
+	(wr_dus): Only keep one source file per debug unit.
+	(wr_dln): Always emit line numbers for first source file,
+	(wr_globals):  Emit globals in the du of their owning source file.
+
+Mon Jul 11 15:59:03 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
+
+	* nlmheader.y: Null terminate var_hdr->threadName.
+
+Fri Jul  8 17:33:22 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* Makefile.in (syslex.o, sysinfo.o): Permit C source files to be
+	in $(srcdir), as they will be for FSF releases.
+
+Wed Jul  6 01:13:14 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlmconv.c (setup_sections): Preserve existing section flags when
+	copying in flags from a new section.
+
+Tue Jul  5 15:56:01 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* objcopy.c: Include libiberty.h.
+	(copy_file): If output_target is NULL, set it to the target of the
+	input file.
+
+Wed Jun 29 17:17:14 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
+
+	* nlmconv.c (link_inputs): Fixed memory allocation bug.
+
+Thu Jun 23 12:52:46 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+	* configure.in: Change --with-targets to --enable-targets.
+
+Tue Jun 21 12:53:21 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* Makefile.in (sysinfo): Does not depend upon $(ADDL_LIBS).
+
+	* nlmconv.c (powerpc_build_stubs): Don't generate the PowerPC
+	NetWare custom header; no longer needed.
+	(powerpc_mangle_relocs): Convert relocs against the uninitialized
+	data section into relocs against the data section.
+
+	* configure.in: Set nlmconv_defs to -DNLMCONV_cputype for all the
+	netware targets.  Write it into Makefile as NLMCONV_DEFS.
+	* Makefile.in (nlmconv.o): Pass $(NLMCONV_DEFS) to $(CC).
+	* nlmconv.c: Only compile code for specific CPU types if
+	NLMCONV_cputype is defined.
+
+	* nlmconv.c (main): Change uses of bfd_abs_section, etc., to use
+	bfd_abs_section_ptr or bfd_is_abs_section, etc.
+	(i386_mangle_relocs, alpha_mangle_relocs): Likewise.
+	(powerpc_build_stubs): Likewise.
+	* nm.c (filter_symbols, print_symbols): Likewise.
+	* objcopy.c (filter_symbols): Likewise.
+	(mark_symbols_used_in_relocations): Likewise.
+	* objdump.c (remove_useless_symbols, dump_relocs): Likewise.
+	* size.c (sysv_internal_printer): Likewise.
+
+Mon Jun 20 16:43:03 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* Makefile.in (MANPAGES): Remove $(DEMANGLER_PROG).
+	(install): Install it explicitly, from build dir, not srcdir.
+
+Mon Jun 20 16:29:54 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* objdump.c: Don't include elf/internal.h.
+	(bfd_elf_find_section): Don't declare.
+	(read_section_stabs): No special handling for ELF.  Always read
+	using BFD sections.
+
+Thu Jun 16 17:25:20 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* configure.in: Set UNDERSCORE in Makefile based on result of
+	invoking config.bfd with a second argument of ``_''.
+	* Makefile.in (underscore.c): Depend upon Makefile.  Don't try to
+	run $(CC) and $(NM), just use $(UNDERSCORE).  Create via temporary
+	file.
+	(demangle.o): Remove target.
+	($(NM_PROG)): Don't depend upon demangle.o, and	don't link against
+	demangle.o.  It's in libiberty anyhow.
+	(cplus-dem.o): Don't depend upon demangle.o.
+	* binutils.texi: Mention -n and --no-strip-underscores arguments
+	to c++filt.
+
+Wed Jun 15 12:10:31 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nm.c (long_options): Add --no-demangle to turn off --demangle,
+	and --no-cplus for Linux compatibility.
+	(usage): Mention --no-demangle.
+	* binutils.texi: Document --no-demangle.
+
+Fri Jun 10 15:41:25 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nm.c: HOST_64_BIT was renamed to BFD_HOST_64_BIT.
+
+	* objcopy.c (copy_archive): Make the temporary directory in the
+	same directory as the output BFD, since we may not have write
+	permission on the current directory.  Set the permissions of the
+	new directory to 0700, not 0777.
+
+Mon Jun  6 21:36:43 1994  D. V. Henkel-Wallace  (gumby@cygnus.com)
+
+	* configure.in: if this is an rs6000 (and we're not building for
+	any other bfd targets) then build only nm (collect needs it on
+	rs6000-lynx).
+
+	* Makefile.in: define TOOL_PROGS which the list of programes to
+	install in $tooldir -- replaces a hard-coded list.
+
+Fri Jun  3 10:59:18 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* objdump.c (display_target_list): Remove unused local ok.
+
+Thu May 26 18:05:52 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* config/mh-alphaosf (CFLAGS): Don't specify both -g and -O;
+	they're not compatible under native cc.  Use -O1 instead.
+
+	* Makefile.in (VERSION): Updated to cygnus-2.4.1.
+
+	Changes from binutils-2.4 net release:
+
+	* Makefile.in (MANPAGES): Use $(DEMANGLER_PROG).
+	($(DEMANGLER_PROG).1): Build from cxxfilt.man, using sed.
+	* cxxfilt.man: Renamed from c++filt.1, replaced "c++filt" with
+	magic token to be replaced by sed.
+
+	Wed May 11 22:32:00 1994  DJ Delorie (dj@ctron.com)
+
+	* configure.bat: update for latest makefile.in
+
+Fri May 13 23:25:13 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* bucomm.c: Check ANSI_PROTOTYPES rather than __STDC__.
+
+Tue May 10 18:22:06 1994  Jason Molenda    (crash@sendai.cygnus.com)
+
+	* objcopy.c (copy_section): Set section size correctly if using
+	interleave.
+
+Sat May  7 16:49:36 1994  Steve Chamberlain  (sac@cygnus.com)
+
+	* Makefile.in: Add rule for sysinfo.h
+
+Fri May  6 12:18:33 1994  Steve Chamberlain  (sac@cygnus.com)
+
+	* Makefile.in (SRCONV_PROG): Define.
+	(PROGS): Use $(SRCONV_PROG) too.
+
+Thu May  5 19:41:43 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* Makefile.in (DISTSTUFF): Add sysinfo.c, syslex.c, in case
+	someone configures with `targets=all'.
+	(distclean): Remove y.*.
+	(syslex.o): Depend on sysinfo.h.
+	(sysinfo.c): Rename y.tab.h to sysinfo.h.
+	(install-info): Don't try to install into $(infodir)/$(srcdir).
+	* syslex.l: Include sysinfo.h, not y.tab.h.
+
+Thu May  5 11:50:55 1994  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+	* syslex.l (yywrap): Define as function if not defined as a macro.
+
+	* Makefile.in (objdump.o): Deleted special rule.
+	* configure.in: Don't bother building ARCHDEFS variable for
+	Makefile.
+	* objdump.c (ARCH_*): Deleted handling.
+	(disassemble_data): Call `disassembler' from opcodes library.
+
+Thu May  5 13:28:42 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* Makefile.in (install): Correct handling of $(tooldir) and
+	$(bindir) being on different devices.
+
+Fri Apr 29 09:50:38 1994  Steve Chamberlain  (sac@cygnus.com)
+
+	* sysdump.c (h8300, sh): Add declarations.
+
+Wed Apr 27 11:25:18 1994  Steve Chamberlain  (sac@cygnus.com)
+
+	* Makefile.in (syslex, sysinfo): Use CC_FOR_BUILD.
+	* coffdump.c, coffgrok.c, coffgrok.h, srconv.c, sysdump.c,
+	sysroff.info: Major changes.
+
+Tue Apr 26 18:18:24 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* objdump.c (print_section_stabs): Indicate the stab header symbol
+	more clearly, print numbers of unrecognized stab n_type values.
+
+Tue Apr 26 16:22:55 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlmconv.c (copy_sections): Copy arelent pointers, not arelents.
+
+Mon Apr 25 16:14:32 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* Makefile.in (distclean): Remove $(PROGS) and underscore.c.
+
+Fri Apr 22 11:14:19 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlmconv.c (setup_sections): Remove special handling of .reginfo
+	section.
+	(copy_sections): Likewise.
+	(alpha_mangle_relocs): Use bfd_ecoff_get_gp_value rather than the
+	special ECOFF .reginfo section.
+
+	* objcopy.c (copy_object): Call bfd_copy_private_bfd_data after
+	copying everything else, to let it fiddle with the file in its
+	final state.
+
+	* objdump.c: Include libiberty.h.
+	(display_target_list): If a format fails, just go on to the next
+	one.  Check return value of bfd_set_format.
+	(display_info_table): Likewise.  Don't increment loop variable in
+	for loop test, since that skips the first element.
+	(display_target_tables): Rewrite loop for clarity.  Ensure that it
+	always prints at least one element.
+
+	* nlmconv.c (main): Use CyGnUsEx rather than CyGnUsSeCs for
+	sections header.  Rename from cygnus_sections to cygnus_ext.
+
+Thu Apr 21 12:12:26 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* objdump.c (_DUMMY_NAME_): Don't define.
+	(display_target_list): Use tmpnam to get a file name rather than
+	using _DUMMY_NAME_.  Unlink it when done.
+	(display_info_table): Likewise.
+
+	* nlmconv.c (secsec): New static variable.
+	(main): Create .nlmsections section in output BFD.  Store
+	information about it in sections header.
+	(setup_sections): Allocate space in sections header.
+	(copy_sections): Copy zero sized sections.  Put information about
+	each section in the sections header.
+
+Wed Apr 20 14:34:51 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlmconv.c (powerpc_build_stubs): Take new outbfd argument.
+	Change caller.  Create custom header for new PowerPC NetWare
+	format.
+
+	* Makefile.in (nlmheader.o, nlmconv.o): Update dependencies.
+	* nlmconv.c: Include bfd.h and libiberty.h with "", not <>.
+	* nlmheader.y: Include bfd.h with "", not <>.
+
+Wed Apr 13 10:52:50 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* objdump.c: Do an ifdef on __GO32__, not unix.
+
+Wed Apr  6 21:54:49 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Added -D (--dynamic) option to nm and -T (--dynamic-syms) and -R
+	(--dynamic-reloc) arguments to objdump.
+	* nm.c (dynamic): New static variable.
+	(long_options): Added "dynamic".
+	(usage): Mention -D and --dynamic.
+	(main): Add D to getopt string.  Handle -D by setting dynamic.
+	(display_rel_file): If dynamic is non-zero, read dynamic symbols
+	rather than normal symbols.
+	* nm.1: Updated for -D (--dynamic) option.
+	* objdump.c (dump_dynamic_symtab): New global variable.
+	(dump_dynamic_reloc_info): New global variable.
+	(dynsyms, dynsymcount): New global variables.
+	(usage): Mention -R, -T, --dynamic-syms and --dynamic-reloc.
+	(long_options): Added "dynamic-reloc" and "dynamic-syms".
+	(slurp_symtab): If no symbols, return rather than exit.
+	(slurp_dynamic_symtab): New function.
+	(display_bfd): Handle dump_dynamic_symtab and
+	dump_dynamic_reloc_info.
+	(dump_symbols): Take new dynamic argument, indicating whether to
+	display dynamic symbols.
+	(dump_relocs): Move most printing into dump_reloc_set.
+	(dump_dynamic_relocs): New function.
+	(dump_reloc_set): New function, extracted from dump_relocs.
+	(main): Add R and T to getopt string.  Handle -T by setting
+	dump_dynamic_symtab and -R by setting dump_dynamic_reloc_info.
+	* objdump.1: Updated for -R (--dynamic-reloc) and -T
+	(--dynamic-syms) options.
+	* binutils.texi: Updated for new nm and objdump options.
+
+Wed Mar 30 15:52:40 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Update for recent BFD changes to symbol and reloc reading.  Rename
+	all uses of get_symtab_upper_bound to bfd_get_symtab_upper_bound.
+	Also:
+	* coffgrok.c (symcount): Change to long.
+	(do_sections_p1): Check for error return from
+	bfd_get_reloc_upper_bound.  Change relcount to long, and check for
+	error from bfd_canonicalize_reloc.
+	(coff_grok): Change storage to long.  Check for error from
+	bfd_get_symtab_upper_bound and bfd_canonicalize_symtab.
+	* nlmconv.c (main): Change symcount, newsymalloc, newsymcount, and
+	i to long.  Check for error from bfd_get_symtab_upper_bound and
+	bfd_canonicalize_symtab.
+	(copy_sections): Change reloc_size and reloc_count to long.  Check
+	for error from bfd_get_reloc_upper_bound and
+	bfd_canonicalize_reloc.
+	(mangle_relocs, i386_mangle_relocs, alpha_mangle_relocs): Change
+	reloc_count_ptr argument to long *.  Make corresponding changes to
+	variables loaded from *reloc_count_ptr.
+	* nm.c (display_rel_file): Change storage and symcount to long.
+	Check for errors from bfd_get_symtab_upper_bound and
+	bfd_canonicalize_symtab.
+	* objcopy.c (filter_symbols): Change symcount, src_count and
+	dst_count to long.
+	(copy_object): Change symcount to long.  Pass another argument to
+	fprintf.  Check for errors from bfd_get_symtab_upper_bound and
+	bfd_canonicalize_symtab.
+	(copy_section): Change relcount to long.  Check for errors from
+	bfd_get_reloc_upper_bound and bfd_canonicalize_reloc.
+	(mark_symbols_used_in_relocations): Change relcount and i to long.
+	Check for errors form bfd_get_reloc_upper_bound and
+	bfd_canonicalize_reloc.
+	* objdump.c (storage): Remove global variable.
+	(symcount): Changed to long.
+	(slurp_symtab): New local variable storage.  Check for errors from
+	bfd_get_symtab_upper_bound and bfd_canonicalize_symtab.
+	(remove_useless_symbols): Change return value and count to long.
+	(objdump_print_address): Change min, max, thisplace and i to long.
+	(disassemble_data): Change i to long.
+	(dump_symbols): Change count to long.
+	(dump_relocs): Change relcount to long.  Check for errors from
+	bfd_ret_reloc_upper_bound and bfd_canonicalize_reloc.
+	(display_info_table): Add casts when passing LONGEST_ARCH for
+	printf %* argument.
+
+Tue Mar 29 14:59:04 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nm.c (display_archive): Close each archive element after it has
+	been displayed.
+	* objdump.c (display_file): Likewise.
+
+Mon Mar 28 13:04:08 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* configure.in: Change error message to refer to bfd/config.bfd
+	rather than bfd/configure.in.
+
+Sun Mar 27 16:23:39 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* More fixes for object formats which allow multiple sections
+	with the same name:
+	* objcopy.c (setup_section): Make a new output section even if
+	one already exists with the given name.
+	(copy_section): Use isection->output_section rather than trying
+	to look the output section up by its (possibly non-unique) name.
+
+	* Makefile.in (install-info): Look for binutils.info in the
+	current directory, then in $(srcdir).  Don't use $<.
+
+Mon Mar 21 12:55:45 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* objdump.c (objdump_print_address): Make static.  Declare with
+	prototype.  Change vardiff from int to bfd_signed_vma.  Correct
+	binary search termination condition.  When looking for same
+	section symbol in relocatable file, handle final symbol correctly.
+
+Sun Mar 20 11:26:36 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* Makefile.in: Avoid bug in hpux sed.
+
+	* objcopy.c: Changes to keep it from stripping symbols used
+	in output relocations.
+	(mark_symbols_used_in_relocations): New function.  Mark symbols
+	used in output relocations with BSF_KEEP.
+	(filter_symbols): Do not strip symbols marked with BSF_KEEP.
+	(copy_object): Reorder actions.  First setup sections, then
+	build the output symbol table, then copy the section contents.
+
+Fri Mar 18 10:53:55 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ar.c (write_archive): Allocate space for the null byte.  From
+	Robert Lipe <robertl@arnet.com>.
+
+Thu Mar 17 16:20:28 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* Makefile.in: Built nm.new and strip.new to avoid problems with
+	collect when . is in PATH.
+	(STRIP_PROG): Change from strip to strip.new.
+	(NM_PROG): Change from nm to nm.new.
+	(install): Remove the .new when installing.
+
+Wed Mar 16 16:27:05 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlmconv.c (powerpc_build_stubs): Set BSF_DYNAMIC flag for each
+	symbol for which we build a stub.
+	(powerpc_mangle_relocs): Only reset TOC pointer for a call to a
+	symbol with BSF_DYNAMIC flag set.
+
+Tue Mar 15 23:04:13 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* objcopy.c (filter_symbols): Use bfd_is_local_label to determine
+	if a symbol represents a compiler-generated local label.
+	(copy_object): Give the BFD backends a chance to copy any private
+	bfd data from the input BFD to the output BFD.
+	(setup_section): Give the BFD backends a chance to copy any private
+	section data from the input section to the output section.
+
+Mon Mar 14 11:15:58 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* objcopy.c (mangle_section): Delete unused function.
+	(setup_section): Set osection here instead of calling
+	mangle section to do it.
+
+Mon Mar 14 12:11:01 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ar.c (write_archive): Close inarch before unlinking it.
+
+Fri Mar 11 22:20:48 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlmconv.c (main): For PowerPC, call powerpc_build_stubs and
+	powerpc_resolve_stubs.  Use __GOT0, not __toc_start.  Handle it if
+	the start and end symbols are not in the text section.
+	(struct powerpc_stub): New struct definition.
+	(powerpc_stubs, powerpc_stub_insns): New static variables.
+	(powerpc_initial_got_size): New static variable.
+	(powerpc_build_stubs): New function.
+	(powerpc_resolve_stubs): New function.
+	(powerpc_mangle_relocs): Clear extraneous data in .got section.
+	Rearrange reloc handling to handle ELF relocs that are not
+	partial_inplace.  Resolve PC relative relocs.
+
+Wed Mar  9 13:48:11 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
+
+	* ar.c (move_members): Fix it so that the abi positional modifiers
+	don't delete all archive members following the insert point.
+
+Tue Mar  8 13:14:43 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
+
+	* coffgrok.[ch]: New files, understand coff objects.
+	* coffdump.c: Uses coffgrok to dump out the debug info of a coff
+	file.
+	* sysroff.info: Description of a SYSROFF object file.
+	* sysinfo.y, syslex.l: Parse info file, generate a reader, writer,
+	header files and a printer.
+	* srconv.c: Uses coffgrok.c and sysroff.info to convert a coff
+	file to a SYSROFF file.
+
+Sat Feb 26 13:35:26 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* ar.c (do_quick_append): Pad with a genuine character 10,
+	rather than whatever '\n' might happen to be.
+
+Tue Feb 22 18:25:52 1994  Ian Lance Taylor  (ian@cygnus.com)
+
+	* nlmconv.c (main): Ignore debugging symbols when looking for
+	special symbols by name.
+
+Sun Feb 20 18:47:42 1994  Ian Lance Taylor  (ian@lisa.cygnus.com)
+
+	* nlmconv.c: Include libiberty.h.
+
+	Support for PowerPC NetWare.
+	* nlmconv.c (main): For PowerPC NetWare, automatically define the
+	special symbols __toc_start.
+	(select_output_format): Handle bfd_arch_powerpc.
+	(mangle_relocs): Likewise.
+	(powerpc_mangle_relocs): New function.
+
+Thu Feb 17 09:28:23 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* ar.c, bucomm.c, nlmconv.c, nm.c, objcopy.c, objdump.c,
+	size.c: Use bfd_get_error and bfd_set_error and new error names.
+
+Fri Feb 11 15:54:51 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* objcopy.c (strip_main, copy_main): Add missing 'break' in switch.
+
+Mon Feb  7 19:45:52 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* objdump.c (disassemble_data): Handle bfd_arch_powerpc.
+
+Sun Feb  6 22:08:20 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* strings.c objdump.c nlmconv.c objcopy.c nm.c ar.c size.c (main):
+	Call xmalloc_set_program_name.
+
+Fri Feb  4 10:46:01 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* objcopy.c (filter_bytes): Make MEMHUNK a char *, not PTR, so we
+	can do arithmetic on it.
+
+Thu Feb  3 14:06:41 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* objdump.c (dump_section_stabs, read_section_stabs,
+	print_section_stabs): Functions broken out of dump_stabs_1.
+	Free the stabs and strings when done with them.
+
+Wed Feb  2 13:42:23 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* nlmconv.c (main): Use bfd_get_flavour instead of struct member.
+	* ar.c (print_contents, extract_file), size.c
+	(print_berkeley_format, print_sysv_format): Use bfd_get_filename and
+	bfd_my_archive instead of dereferencing the structs directly.
+
+	* ar.c: Use bfd_fatal and bfd_nonfatal instead of bfd_perror and exit.
+	Indent.  Remove DEFUNs.
+
+	* nlmconv.c (main), objcopy.c (copy_file): Print matching formats
+	if ambiguous match.
+	* nm.c (display_file, display_archive), size.c (display_bfd):
+	Eliminate gotos.
+	Print matching formats if there is an ambiguous match.  Use
+	bfd_nonfatal instead of hardcoded error message if nothing matches.
+
+	* arsup.c, ar.c, objdump.c: Use bfd_get_filename instead of
+	abfd->filename.
+
+	* nm.c (display_archive): New function, from code in display_file.
+	(display_rel_file): Renamed from do_one_rel_file.
+
+	* size.c: Indent.
+	(display_archive): New function from code in display_file.
+	(display_file): Check bfd_close error return.
+
+	* strings.c (strings_object_file): Check bfd_check_format
+	error return.
+
+	* strings.c, objdump.c, size.c: Use bfd_nonfatal instead of bfd_perror.
+
+	* bucomm.c: Delete references to exit_handler.  It wasn't set
+	anywhere, and now that we're using the libiberty xmalloc, it
+	wouldn't always get called before exiting.
+	(list_matching_formats): Function moved from objdump.c.
+	* bucomm.h: Declare it.
+
+	* objdump.c (disassemble_data): Move some variable decls closer to
+	their use.  Add some comments.  Replace a nested block with a
+	return.
+
+Mon Jan 31 18:50:41 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* objdump.c (display_target_list, display_info_table): Check that
+	the bfd of the dummy output file is not null.
+
+Wed Jan 26 13:13:18 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* objcopy.c (filter_bytes): New function.
+	(copy_section): Call it.
+	(copy_options, copy_usage, copy_main): Add --byte option to
+	activate it.  Appropriate the -b option (which was an undocumented
+	synonym for -F) for it, also.  Add --interleave, -i option for
+	additional control.
+	(setup_section, copy_section, mangle_section): Renamed with no `s'
+	on the end.
+	* objcopy.1, binutils.texi: Document the new options.
+
+	* objdump.c (display_target_tables, display_target_list):
+	New functions broken out of display_info.
+	Eliminate some magic constants.  Use more meaningful variable names.
+	(dump_bfd_header): New function broken out of display_bfd.
+	(dump_section_header): New function broken out of dump_headers.
+	(remove_useless_symbols): Don't shadow global variable name with
+	parameter.
+	(objdump_print_address): Fix backward test.
+
+Tue Jan 25 19:40:54 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* bucomm.c (print_arelt_descr): Change decl of `when' to time_t.
+	* objdump.h: Removed.
+
+Mon Jan 24 13:29:02 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* objdump.c (display_file): Remove call to list_matching_formats.
+	It would never be called.
+	(list_matching_formats): Take an arg giving the list of matching
+	formats.
+	(display_bfd): Pass the arg, and get it filled in by calling
+	bfd_check_format_matches instead of bfd_check_format.
+	(display_info, display_info_table): target_vector was renamed to
+	bfd_target_vector.
+
+	* binutils.texi (objdump): Note some limitations of -h section
+	address printing.
+
+Sat Jan 22 16:20:46 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* Makefile.in (MALLOC): Set to emptiness by default.
+	(ALL_CFLAGS): Add and use.
+	(arparse.h): Make it depend on arparse.y.
+	* ar.c (libbfd.h): Don't require to be in ../bfd.
+	* objdump.c (comp): Rename to compare_symbols.
+
+Fri Jan 21 20:22:30 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* objdump.c (list_matching_formats): If the file format is ambiguous,
+	print the matching names so the user can choose one.
+	(display_bfd): Call it.
+	(display_file): Call it.
+
+Fri Jan 21 19:17:25 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* objdump.c (disassemble_data): Support bfd_arch_rs6000.
+
+Mon Jan 17 13:57:25 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* objdump.c (stab_name): Allocate dynamically.
+	(stab_print): Use pointers to strings instead of char arrays.
+	(dump_stabs): Change alloc and init of arrays appropriately.
+	(dump_stabs_1): Always decide whether to print stab_name or
+	the stab's type number, if unnamed.
+
+Fri Jan 14 14:42:48 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* objcopy.c (strip_main, copy_main): Don't clobber the input file
+	if copy_file fails.
+
+	* nlmconv.c (main): Warn about an attempt to use a shared library
+	with uninitialized data.
+
+	* nlmconv.c (setup_sections): Make sure that we align the
+	output_offset of each input section appropriately.
+
+Thu Jan 13 17:32:44 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* objdump.c (dump_relocs): Don't crash if section name is NULL.
+
+Tue Jan 11 19:46:33 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* filemode.c (filemodestring): Commented out; not used.
+	(mode_string): Use POSIX definitions.
+	(ftypelet): Likewise.
+	(rwx): Removed; no longer used.
+	* bucomm.c: Include bucomm.h.
+	(bfd_nonfatal, bfd_fatal): Argument is const.
+	(fatal): Make __STDC__ version.
+	* bucomm.h (mode_string): Declare.
+	* Makefile.in (bucomm.o): Depend upon bucomm.h
+
+Sun Jan  9 12:03:20 1994  Ken Raeburn  (raeburn@rtl.cygnus.com)
+
+	* bucomm.c (xmalloc, xrealloc): Deleted.
+	* bucomm.h (xmalloc, xrealloc): Fix prototypes, to correspond to
+	libiberty version of functions.
+
+Thu Jan  6 06:18:15 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* binutils.texi: Add a chapter summarizing the ways to select
+	aspects of the target for each program.
+
+	* objdump.c (long_options, usage): Add long equivalents for all
+	remaining short options that lacked them.
+	* binutils.texi objdump.1: Document them.
+
+	* size.c (usage): Tweak usage message.
+	* size.1: Add missing `=' in examples.
+
+	* binutils.texi strip.1 objcopy.1 nlmconv.1 objcopy.c nlmconv.c:
+	Use "--target=bfdname" as the option to select the BFD target,
+	like nm and size already do.
+	Reserve "--format=format" for textual output selection options, but
+	for now keep old option names as obsolete for backward compatibility.
+
+	* strings.c (main, strings_object_file, usage): Add --target option.
+	* binutils.texi strings.1: Document it.
+
+Sat Jan  1 13:58:24 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* ar.c (main): Add \n in error message.
+
+Thu Dec 23 12:23:11 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	gcc -Wall lint:
+	* ar.c (main): Put parens around assignment used as truth value.
+	* objcopy.c (strip_main): Remove unused variables.  Return 0.
+	(copy_main): Remove unused variables.  Return 0.
+	* objdump.c (display_bfd): Declare return value as void.
+	(stab_print): Use "" instead of 0 to initialize array.
+	(dump_stabs_1): Print vma using printf_vma.
+	(display_info): Put parens around assignment used as truth value.
+	* strings.c (print_strings): Cast printf arguments.
+
+	* objcopy.c (copy_main): Use copy_options, not strip_options.
+
+	* nlmheader.y (command): Warn about illegal date values.
+
+Wed Dec 15 11:18:03 1993  David J. MacKenzie  (djm@frosty.eng.umd.edu)
+
+	* bucomm.c bucomm.h: Run through indent.  De-ansidecl-ify.
+	(bfd_nonfatal): New function.
+	(bfd_fatal): Call it.
+
+	* objcopy.c (smart_rename): Do a copy if the dest file has
+	multiple hard links.  Remove source file on successful copy.
+	Try to preserve mode and owner on successful rename.
+
+	* objcopy.c: Run through indent.  Clean up a bit.
+	Make global variables static.
+	Make {input,output}_{target,filename}, show_version local
+	to various functions.
+	New global variable `status' for exit status.
+	(strip_main, copy_main): New functions with code from main.
+	(nonfatal): New macro.  Use it globally instead of bfd_perror and
+	bfd_fatal.
+
+	(copy_object): Call mangle_sections with bfd_map_over_sections.
+	(mangle_sections): Adjust for new calling convention.
+
+Fri Dec 10 11:28:11 1993  Ian Lance Taylor  (ian@deneb.cygnus.com)
+
+	* nlmheader.y (command): Accept MAP and FULLMAP without arguments.
+	* nlmconv.c (main): Change error message for MAP and FULLMAP.
+
+Thu Dec  9 17:47:19 1993  Ian Lance Taylor  (ian@deneb.cygnus.com)
+
+	* nlmconv.c (main): Warn about imported symbols that are not in
+	the IMPORT list even if the IMPORT keyword is not used.
+
+	* nlmconv.c (debug, unlink_on_exit): New static variables.
+	(long_options): Add "debug" and "linker".
+	(main): Handle -d and -l arguments.  Make command line input and
+	output files optional.  Parse the command file before opening the
+	BFD's, which requires storing more information in local variables.
+	If INPUT names multiple files, link them together.  Use OUTPUT for
+	the output file name if not named on command line.
+	(show_usage): Changed for new options.
+	(link_inputs): New function to automatically invoke linker to
+	handle multiple INPUT files.
+	(choose_temp_base_try, choose_temp_base, pexecute): New functions,
+	mostly copied from gcc/gcc.c.
+	* nlmconv.h (input_files, output_file): Declare.
+	* nlmheader.y (input_files, output_file): Define.
+	(command): Support INPUT with a string_list argument.  Support
+	OUTPUT.
+	(string_list): Renamed from module_list.
+	* Makefile.in (nlmconv.o): Define LD_NAME based on
+	program_transform_name.
+
+Wed Dec  8 10:09:04 1993  Ian Lance Taylor  (ian@deneb.cygnus.com)
+
+	* nlmheader.y (nlmheader_identify): New function.  Use it to print
+	the program name just once, instead of with every error message.
+
+Mon Dec  6 16:11:32 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlmconv.c (long_options): Changed --header-info to --header-file
+	to match documentation and usage message.
+
+Sun Dec  5 01:31:01 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* objdump.c (dump_relocs): Avoid dereferencing a NULL sym_ptr_ptr
+	in a relocation.
+
+Thu Dec  2 16:00:06 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlmconv.c (main): Change various types from bfd_size_type to
+	size_t, since they have to be arguments to fread and fwrite.
+	Change set from char * to unsigned char *.
+	(select_output_format): Make mach argument unsigned.  Handle
+	bfd_arch_alpha.
+	(setup_sections): Don't copy the .reginfo section of an ECOFF
+	file.  Call bfd_set_reloc to initialize the relocation fields.
+	(copy_sections): Don't copy the .reginfo section of an ECOFF file.
+	Combine all relocs for a section.
+	(mangle_relocs): Change type of relocs to permit specific
+	functions to change it.  Call alpha_mangle_relocs for alpha,
+	default_mangle_relocs for other architectures.
+	(default_mangle_relocs): New function.  Adjust the address of all
+	relocs by the output_offset.
+	(i386_mangle_relocs): Change type of relocs argument.  Cast length
+	argument to memmove to size_t.
+	(alpha_mangle_relocs): New function.
+
+Wed Nov 17 17:38:58 1993  Sean Eric Fagan  (sef@cygnus.com)
+
+	* nlmconv.c (select_output_format): Use nlm32-sparc for
+	bfd_arch_sparc.
+
+Wed Nov 17 14:41:35 1993  Jeffrey Osier  (jeffrey@thepub.cygnus.com)
+
+        * nlmconv.1:   added man page
+	* objcopy.1:   fixed format errors
+
+Wed Nov 17 12:03:41 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* Makefile.in: Use CFLAGS as well as LDFLAGS when linking.
+
+Wed Nov 17 04:50:55 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* strings.1: Fix typo.
+
+Mon Nov 15 12:03:20 1993  Ken Raeburn  (raeburn@rtl.cygnus.com)
+
+	* Makefile.in (DISTSTUFF): Build "info".
+	(VERSION): Updated to cygnus-2.3.1; 2.3 has gone out.
+
+Sun Nov 14 00:27:24 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* objdump.c (dump_stabs): Handle stabs-in-som as implemented
+	by the new BFD SOM assembler.
+
+Sat Nov 13 07:14:05 1993  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+	* ar.1 c++filt.1 nm.1 objcopy.1 objdump.1 ranlib.1 size.1
+	strings.1 strip.1: Replace \(em in NAME section with \- so
+	makewhatis can grok it.
+
+Tue Nov  9 15:22:12 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlmconv.c (i386_mangle_relocs): Adjust reloc address by
+	section output_offset.
+
+Fri Nov  5 12:11:52 1993  Jeffrey Osier  (jeffrey@thepub.cygnus.com)
+
+	* binutils.texi:  added nlmconv chapter
+
+Wed Nov  3 16:10:50 1993  Jeffrey Wheat  (cassidy@cygnus.com)
+
+	* Makefile.in: Change RUNTESTFLAGS to RUNTEST_FLAGS
+
+Wed Nov  3 15:09:23 1993  Ken Raeburn  (raeburn@rover.cygnus.com)
+
+	* Makefile.in (distclean): Don't get rid of dvi or info files.
+
+Tue Nov  2 13:29:59 1993  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+	* objcopy.c (S_ISLNK): Define as 0 if there's no S_IFLNK.
+
+Fri Oct 29 16:02:34 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* binutils.texi: Move objcopy docs into alphabetical order.
+
+	* objdump.c: Use xmalloc instead of malloc.
+
+Fri Oct 29 11:11:14 1993  Stan Shebs  (shebs@rtl.cygnus.com)
+
+	* objdump.c (info): Rename to formats_info.
+	(dump_stabs_1): Better comments and formatting.
+
+Thu Oct 28 19:43:16 1993  Stan Shebs  (shebs@rtl.cygnus.com)
+
+	* ar.c (main): Always create the archive when quick appending,
+	even if no input files have been given.
+
+Wed Oct 27 12:03:06 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlmconv.c (main): Set sharedDebugRecordOffset and
+	sharedDebugRecordCount fields in extended header.
+
+	* nlmconv.c (main): Force moduleName field to upper case.
+
+Mon Oct 25 16:45:42 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* objcopy.c (main): Give a usage message if there are too many
+	arguments.
+
+Mon Oct 25 10:37:08 1993  Ken Raeburn  (raeburn@rover.cygnus.com)
+
+	* Makefile.in (install-info): Rewrite to take advantage of VPATH,
+	so FSF distributions (with info files in $(srcdir)) install
+	properly.
+	(DISTSTUFF): Build nlmheader.c too.
+
+Fri Oct 22 11:43:23 1993  Ken Raeburn  (raeburn@rover.cygnus.com)
+
+	* ar.c (program_name): Don't define here.
+	* objdump.c: Include "bucomm.h".
+	(xmalloc): Don't declare here.
+	(program_name): Don't define here.
+	(program_version): Fixed type in declaration.
+	* size.c: Include "bucomm.h".
+	(program_name): Don't declare here.
+
+Fri Oct 22 14:10:41 1993  Mark Eichin  (eichin@cygnus.com)
+
+	* objdump.c (fprintf): hide declaration in FPRINTF_ALREADY_DECLARED
+
+Fri Oct  1 12:43:00 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlmconv.c (i386_mangle_relocs): Resolve and remove PC relative
+	relocs against defined symbols in the same section.
+
+Thu Sep 30 16:46:26 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+
+	* Makefile.in (binutils.dvi): use TEXIDIR to find texinfo.tex
+
+Sat Sep 25 18:09:29 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* objcopy.c (simple_copy, smart_rename): New functions.
+	(main): Use them.
+
+Fri Sep 24 15:38:29 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* Makefile.in (clean, distclean): Recurse into testsuite.
+
+Thu Sep 23 01:05:06 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* objcopy.c (setup_sections, copy_sections): If stripping, don't
+	copy SEC_DEBUGGING sections.
+	* objdump.c (dump_headers): Print SEC_DEBUGGING flag.
+
+	* objdump.c (usage): Mention --stabs.
+
+	* objcopy.c (copy_object): Copy all applicable file flags.
+	(copy_file): Don't copy EXEC_P specially here.
+
+Mon Sep 20 19:28:57 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlmconv.c (main): Adjust data section size to correspond to bss
+	alignment adjustment.  Clear BSF_SECTION_SYM if symbol is moved to
+	a different section.  Use time_t for time variable.
+	(setup_sections): Only put sections with contents in output NLM.
+	(i386_mangle_relocs): No symbols are common at this point.  Add
+	casts to avoid warnings.
+
+Fri Sep 10 11:00:40 1993  Stan Shebs  (shebs@rtl.cygnus.com)
+
+	* objdump.c: Made the --stabs option work for stabs-in-coff.
+	(ELF_STAB_DISPLAY): Removed.
+	(dump_elf_stabs): Renamed to dump_stabs, changed to run for
+	any object file format.
+	(dump_elf_stabs_1): Renamed to dump_stabs_1, added calls to
+	generic BFD routines for non-ELF case, changed format of message
+	for no-section-found case.
+	(display_bfd): Always call dump_stabs if requested.
+	(dump_data): Call bfd_section_size to get section size.
+
+Fri Sep 10 08:12:23 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* Makefile.in (install): Don't put strings in tooldir/bin.
+
+Mon Sep  6 15:39:04 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlmconv.c (total_bss_size): Removed.
+	(main): Set the bss vma to always follow the data section.  Move
+	symbols into new sections, and adjust values by output_offset.
+	(setup_sections): Don't copy all sections, but instead point all
+	text sections to .text, all data sections to .data, and all bss
+	sections to .bss.
+	(copy_sections): Adjust accordingly.
+
+Thu Sep  2 12:34:03 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Only build nlmconv if configured for a NetWare target.
+	* configure.in: If we have some *-*-netware* target, or are using
+	all targets, set BUILD_NLMCONV to $(NLMCONV_PROG) in Makefile.
+	* Makefile.in (PROGS): Use $(BUILD_NLMCONV) rather than
+	$(NLMCONV_PROG).
+
+Tue Aug 31 14:13:35 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* objdump.c (ARCH_all): Define ARCH_hppa too.
+	(dump_headers): Don't test for SEC_BALIGN if it's not defined by
+	bfd.h.
+
+Tue Aug 31 13:29:12 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* nlmconv.c (main): Force creation of .bss section.  Set up the
+	sections before looking at the symbols.  Move all common symbols
+	into .bss section.  Automatically define _edata and _end.  Only
+	export symbols in the export list, with multiple prefixes if
+	necessary.  Warn if no version.  Always create extended header.
+	Set date automatically if not already set.
+	(setup_sections): Count size of bss sections.
+	(mangle_relocs, i386_mangle_relocs): Accept section argument, and
+	take reloc_count as a changeable pointer; changed callers.
+	(i386_mangle_relocs): Remove PC relative relocs within a section,
+	as they require no adjustment.
+	* nlmheader.y: Fixed memory allocation throughout: token STRING is
+	now allocated on the heap, and freed if not needed.  Null
+	terminated copyright message.  Accept version with only two
+	strings.
+	(symbol_list_opt): New nonterminal, either symbol_list or empty.
+	(symbol_list): Use left recursion to avoid overflowing parser
+	stack.
+	(yylex): Rearranged beginning of line check.  Accept quoted
+	strings using single quotes.  End generic argument at comment
+	character or parentheses.
+	(string_list_append): Fixed.
+	(string_list_append1): New function.
+
+	* bucomm.h: The first argument to xrealloc is PTR, not char *.
+	* bucomm.c (xrealloc): Use PTR rather than char *.
+	* Makefile.in (objdump.o): Depend upon config.status to notice
+	--with-targets changes.
+	(nlmconv.o): Depend upon bucomm.h.
+
+Tue Aug 17 09:46:01 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* configure.in: Don't pass cpu to config.bfd.
+
+Thu Aug 12 16:43:04 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* Makefile.in ($(NM_PROG)): Depend on demangle.o.
+	(demangle.o): New target.
+	(cplus-dem.o): Depend on it, to force compilation order when doing
+	parallel compiles.
+
+	* nm.c (print_symbol_info_{bsd,sysv,posix}): Take a bfd arg.
+	(struct output_fns print_symbol_info): Ditto.
+	(long_options, usage, main): Add -C --demangle option.
+	(print_symname): New function, demangling if requested.
+	(print_symbols, print_symbol_info_{bsd,sysv,posix}): Use it.
+
+Wed Aug 11 22:57:23 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* Makefile.in: Put CFLAGS last in compilation rules and omit from
+	linking rules.  Use ARCHDEFS to compile objdump.c.
+	Update dependencies.
+	* configure.in: Construct ARCHDEFS based on the BFD target makefile
+	fragments.
+	* objdump.c: Conditionalize calls to the print_insn_ARCH functions
+	according to ARCHDEFS.
+
+Thu Aug 12 08:06:15 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* ar.c: Removed obsolete and non-functional GNU960 code.
+
+Wed Aug 11 13:08:26 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* size.c (berkeley_sum): New function.
+	(bsssize, datasize, textsize): New global variables.
+	(bss_section_name, data_section_name, text_section_name): Removed.
+	(print_berkeley_format): Map berkeley_sum over all the sections,
+	rather than only reporting sizes of specifically named sections.
+	* Makefile.in ($(OBJDUMP_PROG)): Removed dependency on size.o.
+
+Tue Aug 10 10:46:01 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* nlmconv.c, nlmconv.h, nlmheader.y: New files for program to
+	convert object files into NetWare Loadable Modules.
+	* Makefile.in (NLMCONV_PROG): New macro, define to be nlmconv.
+	(PROGS): Add NLMCONV_PROG.
+	(nlmheader.c, nlmheader.o, nlmconv.o, $(NLMCONV_PROG)): New
+	targets.
+
+Thu Aug  5 15:48:32 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* Makefile.in: define MAKEOVERRIDES to an empty string
+
+Wed Aug  4 17:08:08 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* objcopy.c (copy_file): Make failures to process a file nonfatal.
+
+Mon Aug  2 11:28:23 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* nm.c: Add -B option, like --format=bsd.
+
+Tue Jul 27 16:29:54 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* objcopy.c (copy_file): If the file is neither an object nor an
+	archive, give an error rather than returning success.
+
+Mon Jul 19 16:13:40 1993  Ken Raeburn  (raeburn@rtl.cygnus.com)
+
+	* objdump.c (objdump_print_address): Prefer non-local symbols over
+	local ones, and especially discriminate against debugging symbols.
+	Also, for relocateable files, try to find a symbol in the current
+	section, instead of picking one from some random section with a
+	convenient value (read, section offset).
+	(disassemble_data): Cast argument to malloc to size_t first.
+	(dump_data): Likewise.
+	(dump_relocs): If a single section name is specified, show relocs
+	only for that section.  Otherwise, silently omit sections without
+	relocs.  Format table nicely even if values are printed using 16
+	digits instead of 8.
+
+Fri Jul 16 15:19:59 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* nm.c: Changes for final version of POSIX.2.
+	(print_symbol_filename_{bsd,sysv,posix}): New functions.
+	(formats): Add an element for a pointer to them.
+	(print_symbols): Call it.
+	(print_object_filename_posix, print_archive_member_posix): Produce
+	output according to new POSIX.2 spec.
+
+	* strings.c (print_strings): Handle STREAM being NULL.
+	(strings_a_section): Pass a NULL.
+	(main): Don't open /dev/null.
+
+Thu Jul 15 12:44:09 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* objdump.c (disassemble_data): Handle the m88k.
+	(display_bfd): Use bfd_errmsg, rather than just claiming that the
+	bfd is not an object file.
+
+Mon Jul 12 17:55:34 1993  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in (TAGS): make work again by naming directories
+	  explicitly rather than depending on undefined macros.
+	  (INSTALL_XFORM): correct bad install target.
+
+Fri Jul  2 16:58:34 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* strings.c: Doc fixes.
+
+Sun Jun 27 13:35:24 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* Makefile.in: Note dependencies on bucomm.h.
+	(cplus-dem.o): Link c++filt with version.o.
+
+	* strings.c: Include bucomm.h and add prototypes to other decls.
+	Remove -h option.
+
+	* bucomm.h: Declare xrealloc.
+
+	* nm.c, objcopy.c, objdump.c, size.c, strings.c (main, usage): Add
+	--help option.  Put "GNU" in the version message.
+	(usage): Take stream and exit status as args.
+	(main): Pass new args to usage.
+
+Fri Jun 25 23:12:12 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* strings.c, strings.1: New files.
+	* binutils.texi: Document strings.
+	* Makefile.in: Add rules for it.
+
+Fri Jun 25 20:44:43 1993  Ken Raeburn  (raeburn@poseidon.cygnus.com)
+
+	* objdump.c: Use size-independent bfd elf section names.
+
+Sun Jun 20 23:09:06 1993  Ken Raeburn  (raeburn@poseidon.cygnus.com)
+
+	* objdump.c (objdump_print_address): Handle wide offsets by
+	calling sprintf_vma.
+
+Fri Jun 18 14:29:12 1993  Per Bothner  (bothner@deneb.cygnus.com)
+
+	* objdump.c (syms2):  Removed unused variable.
+	* objdump.c (remove_useless_symbols):  New function.
+	* objdump.c (comp):  Simplify.
+	* objdump.c (dis-assemble_data):  Make simpler and more
+	efficient how we filter out useless symbols:  Just filter
+	BEFORE the sort (using remove_useless_symbols).
+	* objdump.c (objdump_print_address):  Simplify.
+	Change output syntax to match gdb.
+
+Thu Jun 17 16:53:56 1993  david d `zoo' zuhn (zoo@cygnus.com)
+
+	* Makefile.in: canonicalize install.sh; for use within
+	this directory (and subdirs)
+
+Mon Jun 14 12:13:22 1993  david d `zoo' zuhn  (zoo at rtl.cygnus.com)
+
+	* Makefile.in (install, install-info): remove parentdir support,
+	use INSTALL_XFORM; define INSTALL_XFORM
+
+Thu Jun 10 17:29:21 1993  Per Bothner  (bothner@cygnus.com)
+
+	* objcopy.c (copy_object):  Fix bad size passed to xmalloc().
+
+Mon Jun  7 12:41:12 1993  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Makefile.in (INCLUDES):  Add -I../bfd for sysdep.h and bfd.h.
+	* configure.in:  No longer need to configure to get sysdep.h.
+	* objcopy.c (copy_object):  Fix symbol table handling.
+
+Fri Jun  4 17:20:03 1993  Per Bothner  (bothner@cygnus.com)
+
+	* objcopy.c (filter_symbols):  Cannot filter the symbols
+	in place, because that confuses the relocs, so take separate
+	parameter for output array.
+	* objcopy.c (sympp):  Make two variables: isympp and osympp.
+	* objcopy.c (copy_object):  Allocate separate array (osympp)
+	for filtered symbols.
+
+Fri Jun  4 10:51:44 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: change recursion test to presence of a configured
+	testsuite directory
+
+Thu Jun  3 14:05:57 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* Makefile.in (underscore.c): Hack the backquoted command so it
+	doesn't cause Solaris make to bomb.
+
+Thu Jun  3 10:40:19 1993  Jeffrey Osier  (jeffrey@cygnus.com)
+
+	* Makefile.in:  added c++filt and objcopy to MANPAGES variable
+
+Thu Jun  3 00:32:52 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: rename LOADLIBES to EXTRALIBS
+
+Wed Jun  2 18:30:24 1993  Jeffrey Osier  (jeffrey@cygnus.com)
+
+	* c++filt.1, objcopy.1:  new man pages
+
+Fri May 28 15:01:24 1993  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Makefile.in (install):  Also install ar and ranlib in
+	$(tooldir)/bin;  needed for building libgcc.a.
+	* objdump.c (objdump_print_address):  Fix the check
+	"coincidental" label matches by dis-allowing undefined
+	or com symbols.
+
+Thu May 27 16:58:31 1993  Jeffrey Osier  (jeffrey@cygnus.com)
+
+        * binutils.texi:  revised c++filt chapter
+
+Wed May 26 17:24:17 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (FLAGS_TO_PASS): Pass down CC and CFLAGS.
+
+Tue May 25 00:26:47 1993  Ken Raeburn  (raeburn@cygnus.com)
+
+	* objdump.c (slurp_symtab): Print warning for bad symbol table.
+	(bfd_elf32_find_section, Elf32_Internal_Shdr): Updated
+	declarations and uses.
+
+	* Makefile.in (DISTSTUFF): Don't build binutils.mm.
+
+Fri May 21 10:51:19 1993  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+	* nm.c: Add -f/--format, -P/--portability, -t/--radix options.
+	Make global variables static.
+	(main): Make -v like -n, not -V, and make -A like -o, for POSIX.2.
+	(set_print_radix, set_output_format,
+	print_{object_filename,archive_filename,archive_member,symbol_info}
+	{bsd,sysv,posix}): New functions.
+	(display_file, print_symbols): Call them.
+
+	* ar.c: Improve error messages.
+
+	* nm.c (main): Handle long options that just set a flag.
+
+	* nm.c (main), ar.c (do_show_version), objcopy.c (main), size.c
+	(main): Exit after printing the version number, per the GNU coding
+	standards.
+
+Mon May 17 13:20:25 1993  Per Bothner  (bothner@cygnus.com)
+
+	* README, Makefile.in:  Minor updates for 2.2.
+
+Fri May 14 11:12:26 1993  Per Bothner  (bothner@cygnus.com)
+
+	* Makefile.in (underscore.c):  Automatically generate
+	(using nm) a file with the variable prepends_underscore.
+	* Makefile.in (c++filt):  Link underscore.o with cplus-dem.o
+	so that initial underscores get removed iff appropriate.
+	* binutils.texi:  Preliminary documentation for c++filt.
+	* Makefile.in, binutils.texi:  Set to version 2.2.
+
+	* NEWS:  Mention copy->objcopy renaming and new c++filt program.
+
+Wed May 12 12:05:36 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (cplus-dem.o, $(DEMANGLER_PROG)): Build the
+	demangler via cplus-dem.o, rather than directly from the .c file.
+
+	* objcopy.c: Renamed from copy.c, updated comments accordingly.
+	* Makefile.in, binutils.texi: Renamed copy to objcopy.
+	* is-strip.c, maybe-strip.c, not-strip.c: Updated comments for
+	rename of copy to objcopy.
+
+Mon May 10 17:20:18 1993  Per Bothner  (bothner@cygnus.com)
+
+	* binutils.texi (strip, -v option):  Fix typo.
+
+Fri May  7 13:57:50 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (RUNTEST): Define.
+	(FLAGS_TO_PASS): Pass down RUNTEST.
+
+Tue May  4 10:06:50 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (DEMANGLER_PROG): Name it c++filt.
+	(PROG): Also build and install COPY_PROG.
+
+Mon May  3 19:11:48 1993  Per Bothner  (bothner@cygnus.com)
+
+	* Makefile.in:  Change definition of $(tooldir) to match FSF.
+
+Wed Apr 28 23:41:32 1993  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+	* size.c (usage): Add missing options.
+	(main): Clean up option parser.
+
+	* objdump.c (usage): Add missing options.
+	(display_file): Print program name before calling
+	bdf_perror.
+
+	* nm.c (usage): Add missing options.
+	(main): Clean up option parser.
+	(display_file): Print program name before calling
+	bdf_perror.
+
+	* copy.c (copy_usage, strip_usage): Add missing options.
+
+	* ar.c (usage): New function.
+	(main): Call it.
+	(open_inarch, do_quick_append): Print program name before calling
+	bdf_perror.
+
+Thu Apr 22 15:01:35 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* nm.c (main): Accept and ignore -A and -B for MIPS compatibility.
+
+Mon Apr 19 14:06:59 1993  Rob Savoye  (rob@cygnus.com)
+
+	* Makefile.in: Added FLAGS_TO_PASS so tests get run on freshly
+	built binaries if they exist. (otherwise the path)
+
+Wed Apr  7 22:22:50 1993  Rob Savoye  (rob@cygnus.com)
+
+	* Makefile.in: Changed check target to use DejaGnu.
+
+Thu Apr  1 12:37:13 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* Makefile.in: Remove am29k-pinsn.c, i960-pinsn.c.
+	objdump.c: a29k and i960 are `disassemble' not `print'.
+
+	* objdump.c: Rename print_address to objdump_print_address
+	and change parameters.
+	(disassemble_data): Use objdump_print_address.
+
+Wed Mar 31 10:25:29 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* objdump.c (disassemble_data): print_insn_sparc is now a
+	`disassemble' not a `print'.
+	Makefile.in: Remove sparc-pinsn.c (now in libopcodes.a).
+
+	* objdump.c (disassemble_data): Use new read_memory_func stuff.
+
+Thu Mar 25 10:38:11 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* objdump.c (fprintf): Declaration of variadic function had better
+	be a prototype for ANSI C systems.
+
+Mon Mar 22 23:19:46 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: rename test-install to install-check
+
+Fri Mar 19 14:40:08 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* objdump.c (disassemble_data): Add H8500.
+
+Fri Mar 19 10:56:51 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* objdump.c (usage): Mention long options.
+
+Thu Mar 18 14:22:17 1993  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* nm.c:  Modify behavior of -o flag for archives to match
+	BSD4.4 and Sunos 4:  Prefix archive name before each line.
+
+	* m68k-pinsn.c:  Removed.  Subsumed by ../opcodes/m68k-dis.c.
+	* i386-pinsn.c:  Removed.  Subsumed by ../opcodes/i386-dis.c.
+	* Makefile.in:  Adjust accordingly.
+	* objdump.c:  Support new-style disassemblers (ones that use
+	the interface of ../include/dis-asm.h).
+
+Thu Feb 25 15:57:00 1993  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Makefile.in:  When making tar file, remove texinfo/*,
+	except for texinfo/texinfo.tex.
+	* ardup.c:  Add extern declaration of strdup.
+	* Makefile.in (testsuite):  Add 'else true' since otherwise
+	Ultrix /bin/sh complains.
+
+Wed Feb 24 19:44:18 1993  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Makefile.in:  Set VERSION to 2.1.
+	* README, NEWS: Updates.
+	* nm.c:  Add -v as a synonym for -V.
+
+Tue Feb 23 19:00:50 1993  Mike Werner  (mtw@poseidon.cygnus.com)
+
+	* configure.in: added testsuite to configdirs.
+	* Makefile.in: added support for building testsuite.
+
+Mon Feb 22 22:52:10 1993  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* objdump.c (disassemble_data):  Print function names when
+	given by bfd_find_nearest_line.  If not - still print
+	line numbers.
+
+Mon Feb 22 07:54:03 1993  Mike Werner  (mtw@poseidon.cygnus.com)
+
+	* testsuite: made modifications to testcases, etc., to allow
+        them to work properly  given the reorganization of deja-gnu and the
+	relocation of the testcases from deja-gnu to a "tool" subdirectory.
+
+Mon Feb 22 10:27:24 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* objdump.c (dump_data): Free up section contents each time
+	through the loop.  Reported by minyard@bnr.ca.
+
+Sun Feb 21 10:55:55 1993  Mike Werner  (mtw@poseidon.cygnus.com)
+
+	* testsuite: Initial creation of binutils/testsuite.
+	Migrated dejagnu testcases and support files for testing nm to
+	binutils/testsuite from deja-gnu.  These files were moved "as is"
+	with no modifications.	This migration is part of a major overhaul
+	of dejagnu.  The modifications to these testcases, etc., which
+	will allow them to work with the new version of dejagnu will be
+	made in a future update.
+
+Fri Feb 12 10:05:20 1993  Fred Fish  (fnf@cygnus.com)
+
+	* Makefile.in (LIBIBERTY_SRC_DIR, LIBIBERTY_BIN_DIR): New macros.
+	* Makefile.in (LIBIBERTY):  Use LIBIBERTY_BIN_DIR.
+	* Makefile.in (DEMANGLER_PROG):  New program to build.  Add macro
+	and rule.
+	* Makefile.in (PROGS):  Add DEMANGLER_PROG.
+
+Tue Jan 26 11:56:33 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* copy.c, nm.c, objdump.c, size.c: Use new bfd_is_com_section
+	macro rather than checking for equality to bfd_com_section.
+
+Fri Jan  8 15:50:05 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* objdump.c (disassemble_data): Fix code to find first useless
+	symbol.
+
+Thu Jan  7 13:13:31 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* objdump.c (disassemble_data): Use mips_print_insn for MIPS.
+	Don't core dump if bfd_find_nearest_line returns false.
+
+Wed Jan  6 17:14:01 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* objdump.c (disassemble_data): know how to disassemble z8000s
+	too.
+
+Wed Jan  6 15:16:27 1993  Per Bothner  (bothner@cygnus.com)
+
+	* arsup.h (interactive), bucomm.h (program_name):  Prefix
+	with 'extern', to avoid warnings from some compilers.
+
+Wed Jan  6 15:14:11 1993  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* arparse.y: fix unnecessary shift/reduce
+
+Tue Dec 22 15:46:56 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Makefile.in:  Make check depend on all.
+	* Makefile.in (distclean): Remove sysdep.h.
+	* size.c:  Use %u format where appropriate.
+	* objdump.c:  Standardize:  L_SET -> SEEK_SET.
+	* objdump.c:  Use new macro bfd_asymbol_bfd.
+	* configure.in:  Allow std-host as the default ${mys_host}.
+
+Thu Dec 17 19:38:19 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: added dvi target, define and use TEXI2DVI
+
+Tue Dec 15 18:05:07 1992  Per Bothner  (bothner@cygnus.com)
+
+	* Makefile.in (dist):  Fix permissions before release.
+	* size.c:  Use bfd_size_type (and long) where appropriate.
+	* ar.c:  Make writing a map the default, to be compatible
+	with SYSV and Posix.2.  Remove some bogus kludges that
+	handled __.SYMDEF directly.
+	* NEWS:  New file.
+
+Mon Nov  9 13:36:53 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: flex no longer needs the -S flag
+
+Sat Nov  7 15:06:13 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+        * ar.c (extract_file): utime needs a pointer to a utimbuf
+
+	* Makefile.in: handle -I includes better, adding $(BASEDIR)/bfd to
+	the list (since some of the bfd/hosts/*.h files include other
+	files from that directory)
+
+Fri Nov  6 00:12:51 1992  John Gilmore  (gnu@cygnus.com)
+
+	* i960-pinsn.c (MEM_MAX, MEM_SIZ):  Set upper bound properly.
+
+Thu Nov  5 03:37:15 1992  John Gilmore  (gnu@cygnus.com)
+
+	Clean up some old BFD ansification macros.
+
+	* arsup.h, bucomm.h, objdump.h:  Remove EXFUN from binutils.
+	It still remains as a local macro in gmalloc.c, which is derived
+	from some other copy of GNU Malloc somewhere (FIXME).
+
+	* ar.c, objdump.c, size.c:  Replace EXFUN with PROTO.  Make static
+	fns really static.
+	* arsup.h:  Declare extract_files.
+
+Mon Nov  2 12:42:11 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* ar.c (extract_file): instead of checking USG: if POSIX_UTIME,
+	use utime and utimbuf structure, otherwise if USE_UTIME use utime
+	and array of two longs, otherwise use utimes.
+
+Thu Oct 15 13:57:35 1992  Per Bothner  (bothner@cygnus.com)
+
+	* binutils.texi:  Document yesterday's changes to strip and copy.
+
+Wed Oct 14 13:22:14 1992  Per Bothner  (bothner@cygnus.com)
+
+	* copy.c:  Re-do command-line parsing to use getopt_long().
+	Add long option names.  Re-think option letters to be more
+	consistent.
+	* copy.c:  New function filter_symbols() for stripping only
+	debug-symbols and/or local symbols.  Use these to support
+	the previously-missing options of the old FSF strip.
+
+Tue Oct 13 01:24:20 1992  John Gilmore  (gnu@cygnus.com)
+
+	* configure.in (host):  Use ${srcdir}/../bfd/configure.host rather
+	than repeating a copy of it here.
+
+Wed Oct  7 12:53:52 1992  Ken Raeburn  (raeburn@cygnus.com)
+
+	* copy.c (main): Even if is_strip, accept -d argument indicating
+	alternate output format.  Needed by gdb for Nindy.
+
+	* m68k-pinsn.c (print_insn_arg): Handle new "`" operand type.
+
+Tue Oct  6 16:33:56 1992  Jeffrey Osier  (jeffrey@cygnus.com)
+
+	* binutils.texi:  added documentation for "copy"
+
+Tue Oct  6 14:22:56 1992  Per Bothner  (bothner at PersSony)
+
+	* Makefile.in (*clean rules): Some cleaning up.
+	* Makefile.in (dist): Make diststuff in gprof for a dist.
+
+	* ar.c (do_show_version):  New function.
+	* ar.c (main):  Fix so "ar -V" works.
+
+Thu Oct  1 22:44:45 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: now uses the cpu-vendor-os triple instead of
+	nested cases.
+
+Fri Sep 25 22:41:08 1992  John Gilmore  (gnu@cygnus.com)
+
+	* i960-pinsn.c:  Change bzero to memset.
+	* sparc-pinsn.c:  Change index to strchr.
+
+Mon Sep 21 14:39:56 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* m68k-pinsn (print_insn_arg, fetch_arg): added support for
+	operands to memory management instructions, from WRS.
+
+Tue Sep 15 15:26:38 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (install): if $(tooldir) exists, install nm and
+	strip in $(tooldir)/bin.
+
+Thu Sep  3 11:57:40 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Makefile.in:  Let's call it version 2.0.
+
+Wed Sep  2 00:25:13 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Makefile.in:  Bump to version 0.98.
+	* TODO, README:  Minor updates.
+
+	* Makefile.in:  Added mostlyclean, distclean rules,
+	and cleaned up clean, realclean.
+
+Sun Aug 30 21:18:59 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in: map program names through program_transform_name
+	when installing.
+
+Sun Aug 30 18:09:03 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Makefile.in:  Bump to versions 1.97.90.
+	* cplus-dem.c:  Removed.  Was nowhere used - and if some
+	programs are changed to to demangling should now use the
+	versions in libiberty.
+
+Thu Aug 27 12:58:09 1992  Brendan Kehoe  (brendan@cygnus.com)
+
+	* configure.in: add we32k
+
+Mon Aug 24 14:53:42 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* ar.c (map_over_members): if the element of the archive has a
+	null name, fill it in.
+
+	* nm.c (do_one_rel_file): only warn if a bfd's flags say there
+	will be symbols and there aren't any.
+
+Wed Aug 19 11:20:25 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* m68k-pinsn.c: handle new operand type 'r', introduced for cas2.
+
+Tue Aug 18 20:45:48 1992  Rob Savoye  (rob@cygnus.com)
+
+	* nm.c objdump.c: Added support for a +version (-V)
+	to print the version number.
+
+	* ar.c, copy.c: Added support for a -V option to print
+	the version number.
+
+Tue Aug 18 13:28:44 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* config/mh-apollo68v: removed -g from CC definition.
+
+	* Makefile.in: always create installation directories.
+
+Mon Aug 17 18:33:41 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* m68k-pinsn.c:  Minor fix in style of output (don't use
+	range to indicate floating point control registers).
+
+Tue Aug 11 23:42:21 1992  Per Bothner  (bothner@cygnus.com)
+
+	* ar.c (main):  Don't *always* set the verbose flag!
+
+Wed Aug  5 11:25:27 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* copy.c:  When is_strip (because it is invoked as the strip
+	program), follow traditional argv processing:
+	'strip file1 file2' now strips file1 and file2, rather
+	than stripping file1 (as input), leaving output in file2.
+
+Mon Jul 27 16:28:08 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* objdump.c (display_info, display_info_table):  Call
+	bfd_set_format() on dummy bfd before using it (twice).
+	* ar.c:  Make sure archive is created on command 'r'
+	even when no elements are inserted.  (Clean up and
+	simplify some non-working related code.)
+
+Mon Jul 20 02:48:38 1992  D. V. Henkel-Wallace  (gumby@cygnus.com)
+
+	* configure.in: hppa support doesn't assume hp OS (from sef).
+
+Sat Jul 18 14:35:22 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: recognize hppa hosts (bsd & hpux), error messages
+	to stderr, not stdout
+
+Fri Jul 17 18:39:44 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* ar.1, binutils.texi, i960-pinsn.c, nm.1, objdump.1, ranlib.1,
+	  size.1, sparc-pinsn.c, strip.1: removed rcsid's.
+
+Thu Jul 16 16:55:24 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* Makefile.dos: removed rcsid.
+
+Thu Jul 16 08:23:07 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* objdump.c (display_bfd): print state of BFD_IS_RELAXABLE too
+
+Tue Jun 30 20:26:15 1992  D. V. Henkel-Wallace  (gumby@cygnus.com)
+
+	* Makefile.in: Add program_suffix (parallel to program_prefix)
+
+Thu Jun 25 04:52:45 1992  John Gilmore  (gnu at cygnus.com)
+
+	* nm.c (sorters):  Lint.  Remove excess whitespace.
+
+Wed Jun 24 13:48:07 1992  Per Bothner  (bothner@cygnus.com)
+
+	* nm.c (valueof macro):  Add missing parentheses.
+	(Their lack screwed up numeric_forward().)
+
+Sun Jun 14 10:33:27 1992  John Gilmore  (gnu at cygnus.com)
+
+	* objdump.c (dump_elf_stabs):  Also dump .stab.index and
+	.stab.excl sections.
+	(dump_elf_stabs_1):  Split out main body of old dump_elf_stabs.
+	* objdump.1, binutils.texi:  Document new sections dumped.
+
+Fri Jun 12 22:23:35 1992  John Gilmore  (gnu at cygnus.com)
+
+	* size.c, objdump.c, bucomm.c:  Lint.
+
+Thu Jun 11 01:19:06 1992  John Gilmore  (gnu at cygnus.com)
+
+	* objdump.c (dump_elf_stabs): New feature: --stabs prints out a
+	.stab section from an ELF file.  Installed under #ifdef
+	ELF_STAB_DISPLAY so it can be easily disabled, since it requires
+	bfd-internals header files and such.
+	* objdump.1, binutils.texi:  Update for --stabs.  Also fix
+	objdump's doc to use -- rather than + for long options.
+	(FIXME:  Not yet fixed everywhere in binutils.texinfo.)
+
+Wed Jun 10 07:53:24 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* objdump.c(display_info), patches from
+	mohring@informatik.tu-muenchen.de to print the table much more
+	nicely.
+
+Thu May 28 13:36:16 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* objdump.c:  Add another enum->int cast, for the sake of
+	old compilers (such as PCC).
+
+Wed May 27 13:01:44 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* arlex.l:  Don't include <sysdep.h> (unneeded conflicts).
+	Add declaration of strdup().
+
+Fri May 22 13:40:37 1992  Per Bothner  (bothner@cygnus.com)
+
+	* Makefile.in:  Use srcdir instead of VPATH in ldgram/ldlex
+	rules, since these are used when building a distribution.
+	* Makefile.in (arlex.c):  Don't re-direct output, since that
+	leaves a bogus output files if it fails.
+
+	* arlex.l:  Make work with lex, for what it's worth.
+	* Makefile.in:  Better lex support.
+	* Makefile.in (dist):  Generate flex and bison outputs
+	for distribution.
+
+Thu May 14 17:17:59 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* Makefile.in: get BISON definition right.
+
+Fri May  8 07:47:08 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* sanity.sh: default TMPDIR to ".".
+
+Thu May  7 12:34:50 1992  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+
+	* binutils.texi: add doc for ar command language.
+
+Wed May  6 18:05:36 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* arparse.y: make END call ar_end
+	* arsup.c (ar_end): added, deletes temp file if archive session
+	aborted.
+
+
+Wed May  6 11:08:53 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* Makefile.in: use bison & flex from ../ if they exist.  Also,
+	  FLEX->LEX.
+
+	* sanity.sh: remove temporary directory when finished.
+
+Tue May  5 12:00:58 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Makefile.in:  Bump to version 1.97.
+	* ar.c:  Declare errno for machines that need it.
+
+Mon May  4 23:29:51 1992  John Gilmore  (gnu@cygnus.com)
+
+	* objdump.c (display_info):  Handle error cases without coredump.
+	Close the dummy temporary file we open in the loop.
+	* Makefile.in (arsup.o):  Add kludge to build with Sun Make.
+
+Fri May  1 16:20:23 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in: added test-install target.
+
+	* sanity.sh: new file.
+
+	* Makefile.in: use sanity test on make check.
+
+Tue Apr 21 13:38:37 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in: rework CFLAGS so that they can be passed on the
+	  command line to make.  Remove MINUS_G.  Default CFLAGS to -g.
+
+Wed Apr 15 14:33:07 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* arsup.c, arsup.h, arparse.y, arlex.l: support for archive
+	scripting language.
+
+Fri Mar  6 21:54:53 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in: added check target.
+
+Thu Mar  5 21:35:49 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in: added clean-info target.
+
+Tue Mar  3 15:36:37 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* Makefile.in: remove $(COPY_PROG) from PROGS.  It shouldn't be
+	  installed. added tooldir and program_prefix.
+
+Wed Feb 26 18:04:40 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in, configure.in: removed traces of namesubdir,
+	  -subdirs, $(subdir), $(unsubdir), some rcs triggers.  Forced
+	  copyrights to '92, changed some from Cygnus to FSF.
+
+Sun Feb 16 12:53:02 1992  Per Bothner  (bothner at cygnus.com)
+
+	* Makefile.in:  Bump version to 1.96, and remove -beta
+	suffix from distribution name.
+	* m68k-pinsn.c:  New macro COERCE_SIGNED_CHAR to extract
+	the signed value of a character (even if chars are unsigned).
+	* sparc-pinsn.c:  Add new operand types.
+
+Thu Feb  6 12:14:19 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* objdump.c (disassemble_data): don't print a section's contents
+	if it's not loadable (eg bss)
+
+Tue Jan 28 11:11:06 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* m68k-pinsn.c (print_insn_arg): fixed so that -ve branch
+	displacements don't get printed as large +ve ones.
+
+Fri Jan 24 14:47:53 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* copy.c, nm.c, objdump.c, size.c : changed to use the
+	new reloc scheme.
+
+
+Mon Dec 30 18:34:41 1991  Per Bothner  (bothner at cygnus.com)
+
+	* bucomm.c (print_arelt_descr):  Tweek the output format
+	so that 'ar tv' output follows Posix 1003.2/D11.
+	Output is now also identical to Sun's (except __.SYMDEF).
+
+Mon Dec 30 06:09:53 1991  John Gilmore  (gnu at cygnus.com)
+
+	* Makefile.in:  Make `make' output more readable.
+
+Wed Dec 18 15:04:45 1991  Per Bothner  (bothner at cygnus.com)
+
+	* Makefile.in:  Bump to version 1.94.
+
+Wed Dec 11 16:48:09 1991  Steve Chamberlain  (sac at cygnus.com)
+
+	* ar.c: added "b" to fopens for dos
+	* configdj.bat, makefile.dos new files from DJ
+
+Tue Dec 10 04:07:26 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* Makefile.in: infodir belongs in datadir.
+
+Sat Dec  7 17:09:37 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* bucomm.h: created to hold prototypes of bucomm.c
+	* objdump.h: created to hold prototyes of objdump.c
+	* am29k-pinsn.c: include objdump.h
+	* ar.c: include bucomm.h, get ar.h from the right place and
+	include libbfd.h
+	* bucomm.c: defunize bfd_fatal
+	* copy.c: include bucomm.h, lint.
+	* i960-pinsn.h: include bucomm.h
+	* m68k-pinsn.h: lint
+	* nm.c: include bucomm.h, lint
+	* objdump.c: lint
+	* sparc-pinsn.c: include objdump.h
+
+
+
+Fri Dec  6 23:02:14 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* Makefile.in: added standards.text support.  install using
+	  INSTALL_PROGRAM and INSTALL_DATA.
+
+	* configure.in: configure now does all of it's work from objdir so
+	  make file existence tests against ${srcdir}.
+
+Thu Dec  5 22:46:22 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* Makefile.in: idestdir and ddestdir go away.  Added copyrights
+	  and shift gpl to v2.  Added ChangeLog if it didn't exist. docdir
+	  and mandir now keyed off datadir by default.
+
+Wed Dec  4 22:42:03 1991  Per Bothner  (bothner at cygnus.com)
+
+	* Makefile.in:  Bump to version 1.93.
+	* Makefile.in:  Add make-strip.o:maybe-strip.c dependency
+	for make versions that provide half-baked VPATH-support (e.g. Sun's).
+	* size.c:  Improvements suggested by
+	"david d [zoo] zuhn" <zoo@aps1.spa.umn.edu>:
+	- Don't emit (Berkeley) headers if no files were found.
+	- Return a non-zero return code on failure.
+
+Sat Nov 30 21:34:19 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	Changes due to include file renaming:
+	* am29k-pinsn.c: a29k-opcode.h	-> opcode/a29k.h
+	* sparc-pinsn.c: sparc-opcode.h	-> opcode/sparc.h
+	* m68k-pinsn.c:	 m68k-opcode.h	-> opcode/m68k.h
+	* nm.c:		 stab.gnu.h	-> aout/stab_gnu.h
+
+Tue Nov 19 19:20:43 1991  Per Bothner  (bothner at cygnus.com)
+
+	* README:  Mention MINIMIZE flag for bfd's make.
+
+Mon Nov 18 12:05:37 1991  Per Bothner  (bothner at cygnus.com)
+
+	* README:  Various improvements.
+
+Sun Nov 17 23:40:59 1991  Per Bothner  (bothner at cygnus.com)
+
+	* Makefile.in:  Bump to version 1.92.
+	* version.c, Makefile.in:  Get version string from Makefile.
+	* copy.c, is-strip.c, not-strip.c, maybe-strip.c, Makefile.in:
+	Make the same change that we earlier did for ar/ranlib:
+	Generate two different binaries for strip and copy and use
+	a global variable with different values to distinguish
+	ostrip from copy.  (-1 means to use argv[0] to decide,
+	so you can get the old behavior, but it is no longer the default).
+	* copy.c (copy_file):  Set EXEC_P of output bfd if input is so.
+	* copy.c (main):  If is_strip==-1, compare last 5 chars
+	of argv[0], not the whole path.
+	* copy.c (main): Return 0, not 1.
+	* copy.c (setup_sections):  Fix due to change in bfd_make_section
+	now failing if asked for a duplicate section.
+	* strip.c, ostrip.c:  Removed obsolete files.
+	* ar.c, not-ranlib.c, maybe-ranlib.c:
+	Change encoding of is_ranlib variable to be consistent
+	with is_strip for strip.copy (i.e -1 to means use argv[0]).
+
+Thu Nov 14 20:11:02 1991  Per Bothner  (bothner at cygnus.com)
+
+	* version.c (program_version): Update to version 1.92.
+
+Tue Nov 12 16:17:53 1991  Per Bothner  (bothner at cygnus.com)
+
+	* ar.c (get_pos_bfd):  Previous fix was missing a "break".
+
+Thu Nov  7 08:55:56 1991  Steve Chamberlain  (sac at cygnus.com)
+
+	* am29k-pinsn.c: Fixed bug in mtacc, dmac and fmac instruction
+	encodings. (Thaks to David Wood)
+
+Sun Nov  3 14:50:23 1991  Per Bothner  (bothner at cygnus.com)
+
+	* Makefile.in ($(DIST_NAME).tar.Z), TODO:  Various fixes.
+	* ar.c (get_pos_bfd): Fix to handling of before/after
+	positioning options.
+	* bucomm.c (fatal):  MISSING_VFPRINTF is no longer an issue,
+	since libiberty contains vfprintf etc if otherwise missing.
+	* m68k-pinsn.c (print_insn_arg):  Support BB/BW/BL
+	type operands, as used by branch instructions.
+	* nm.c:  Delegate printing of symbols to BFD,
+	by using bfd_print_symbol to do the formatting.
+
+Mon Oct 28 11:20:47 1991  Steve Chamberlain  (steve at cygnus.com)
+
+	* ar.c (write_archive.c): added unlink before rename since some
+	systems can't rename onto an existant file.
+
+Mon Oct 21 09:47:23 1991  Steve Chamberlain  (steve at rtl.cygnus.com)
+
+	* nm.c: now doesn't crash if a symbol with no section and no
+	SEC_ABS appears.
+
+Thu Oct 17 15:25:50 1991  Per Bothner  (bothner at cygnus.com)
+
+	* Makefile.in, version.c:  Bump to version 1.91.
+
+Wed Oct 16 11:45:36 1991  Per Bothner  (bothner at cygnus.com)
+
+	* Makefile.in, ar.c, bucomm.c, copy.c, cplus-dem.c, filemode.c,
+	i960-pinsn.c, m68k-pinsn.c, nm.c, objdump.c, size.c, sparc-pinsn.c,
+	* strip.c: Add or update Copyright notice.
+	* TODO:  Add note on 'nm -a'.
+	* version.c: Update version number to 1.90.
+	* Makefile.in: Fix making of documentation for dist.
+
+Tue Oct 15 00:17:17 1991  Per Bothner  (bothner at cygnus.com)
+
+	* README: New file.
+	* Makefile.in: New kludgy rules for making a tarfile.
+	* Makefile.in: Fix bindir path.
+
+Mon Oct 14 17:34:29 1991  Roland H. Pesch  (pesch at cygnus.com)
+
+	* Makefile.in: add targets binutils.mm, binutils.me
+
+Fri Oct 11 22:44:21 1991  John Gilmore  (gnu at cygnus.com)
+
+	* Makefile.in:  Avoid Sun Make VPATH bugs by adding dependencies.
+
+Fri Oct 11 12:51:33 1991  Roland H. Pesch  (pesch at cygnus.com)
+
+	* Makefile.in: add target "binutils.ms"
+
+	* binutils.texinfo: minor restructuring for texi2roff comfort.
+
+Fri Oct 11 04:12:28 1991  John Gilmore  (gnu at cygnus.com)
+
+	Restructure configuration scheme for bfd, binutils, ld.
+
+	* configure.in:  Revise to symlink sysdep.h to ../bfd/hosts/h-xxx.h.
+	Change some config names to match other dirs.
+	* *.c:  Include bfd.h before sysdep.h, so ansidecl and PROTO()
+	get defined first.
+	* Makefile.in:  Use -I. to get sysdep.h.
+
+Wed Oct  9 22:42:56 1991  Per Bothner  (bothner at cygnus.com)
+
+	* nm.c (print_symbols):  Handle NULL name field of symbol.
+	* Makefile.in: Removed spurious comment.
+
+Tue Oct  8 16:55:03 1991  Roland H. Pesch  (pesch at cygnus.com)
+
+	* binutils.texinfo: minor typos, phrasing, formatting fixes.
+
+Tue Oct  8 15:13:20 1991  Per Bothner  (bothner at cygnus.com)
+
+	* configure.in: Get host file from ../bfd/config, not config.
+	* config/*: Remove config directory and its files.
+
+Tue Oct  8 13:58:59 1991  Roland H. Pesch  (pesch at cygnus.com)
+
+	* Makefile.in: new targets binutils.dvi, binutils.info
+
+	* binutils.texinfo: remove most remaining FIXME's, delete
+	references to __.SYMDEF by name
+
+
+Tue Oct  8 10:23:44 1991  Steve Chamberlain  (steve at cygnus.com)
+
+	* objdump.c (print_address) Print addresses nicely.
+
+Mon Oct  7 11:31:05 1991  Per Bothner  (bothner at cygnus.com)
+
+	* ar.c, Makefile.in, new files {is,not,maybe}-ranlib.c:
+	Make two different binaries for ar and ranlib, instead of
+	distinguishing them at run time using argv[0].
+	(Old behavior is still available if you "make ar_with_ranlib",
+	but it is not the default.)
+	* ranlib.sh (new):  An alternative one-line
+	shell implementation of ranlib.
+
+Fri Oct  4 21:49:44 1991  John Gilmore  (gnu at cygnus.com)
+
+	* objdump.c:  Cope with renames of a few BFD types & enums.
+
+Fri Oct  4 19:08:09 1991  Roland H. Pesch  (pesch at cygnus.com)
+
+	* binutils.texinfo: add new file (rudimentary docn)
+
+Mon Sep 30 12:30:39 1991  Per Bothner  (bothner at cygnus.com)
+
+	* config/hmake-news: Add new file (for Sony NEWSOS3).
+	* bucomm.c (fatal):  Conditionally compile fatal() depending on
+	MISSING_VFPRINTF, and don't confuse the issue with NO_VARARGS.
+	* objdump.c (dump_headers):  Trivial output format change.
+	* objdump.c (display_info): Loop over integers, not enums,
+	to appease old compilers.
+
+Mon May 20 16:14:07 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+
+        *objdump.c *nm.c *copy.c: Changed some types to work with 64 bit
+	object files.
+
+Thu May 16 16:06:55 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
+     from bother
+	* objdump.c (print_address): Make disasembled output more
+	consistent with gdb and as: Add 0x when printing hex.
+	Don't print extra leading zeros.
+	Attempt to not print "filename.o".
+	* objdump.c: Add some enum-to-int casts to accommodate old compilers.
+
+
+Fri May  3 22:21:44 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	* copy.c:  Change =& constructs to = &, since they confuse older
+	C compilers.
+
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-9899 sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-9899
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ChangeLog-9899	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ChangeLog-9899	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1908 @@
+1999-12-28  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c: Update with new constants added by Oct 4, 1999
+	ELF ABI draft.
+	(guess_is_rela): Add new machine codes, but leave
+	rel type undetermined.
+	(get_machine_name): Add new machine codes.
+	(get_section_type_name): Add new section types.
+	(get_elf_section_flags): New function: Decode section flags.
+	(process_section_headers): Call get_elf_section_flags() in
+	order to decode flags in section header.
+	(get_dynamic_flags): New function: Decode dynamic section
+	flags.
+	(process_dynamic_section): Display flags (if present).
+	(get_symbol_type): Add STT_COMMON.
+	(get_symbol_visibility): New function: Decode a symbol's
+	visibility.
+	(process_symbol_table): Call get_symbol_visibility().
+	(get_note_type): Add NT_PRXFPREGS.
+
+1999-12-26  Ian Lance Taylor  <ian@zembu.com>
+
+	* strings.c (main): Correct handling of numeric argument.
+
+1999-12-23  Andrew Haley  <aph@cygnus.com>
+
+	* dlltool.c (mtable): mcore how_jtab_roff is 4 bytes into the
+	jtab; was 8.
+
+1999-12-17  Nick Clifton  <nickc@cygnus.com>
+
+	* dlltool.c (mtable): Stop compile time warnings about missing
+	initialisers.
+	(yyerror): Stop compile time warnings about unused paramater.
+	(INIT_SEC_DATA): New macro: initialise an entry in the secdata
+	array.
+	(secdata): Stop ccompile time warnings about uninitialised
+	fields.
+	(dtab): Stop compile time warnings about unused parameter.
+	(long_options): Stop compile time warning about missing
+	initialiser. 
+
+1999-12-10  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (print_vma): Support native 64bit ELF systems.
+
+1999-12-09  Nick Clifton  <nickc@cygnus.com>
+
+	* dlltool.c (mtable): Add epoc-arm specific entry.
+	Make default arm entry pass -mpacs-26 to assembler.
+	(flush_page): Do not mangle null entries.
+	
+1999-12-07  H . J . Lu  hjl@valinux.com
+
+	* readelf.c: Fix compile time warnings.  Support more than 999
+	symbols.
+
+1999-12-03  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (enum print_mode): New type.
+	(print_vma): New function.
+	(dump_relocations): Use print_vma to display bfd_vma values.
+	(process_file_header): Use print_vma to display bfd_vma values.
+	(process_program_headers): Use print_vma to display bfd_vma values.
+	(process_section_headers): Use print_vma to display bfd_vma values.
+	(dynamic_segment_parisc_val): Use print_vma to display bfd_vma values.
+	(process_dynamic_segment): Use print_vma to display bfd_vma values.
+	(process_symbol_table): Use print_vma to display bfd_vma values.
+	(process_mips_specific): Use print_vma to display bfd_vma values.
+
+1999-11-25  Fred Fish  <fnf@cygnus.com>
+
+	* readelf.c (process_note): Change arg from Elf_External_Note
+	to Elf32_Internal_Note, which also turns the function body
+	into little more than a call to printf.
+	(process_corefile_note_segment):  Substantially rewritten
+	to properly handle case where target and host are different
+	endianness, handle note sections with padding, and add some
+	cruft to handle notes with unterminated name data.
+
+1999-11-22  Nick Clifton  <nickc@cygnus.com>
+
+	* objcopy.c (copy_usage): Reformat.
+	(strip_usage): Reformat.
+
+1999-11-21  Nick Clifton  <nickc@cygnus.com>
+
+	* objdump.c (usage): Overhaul output:  One line per switch.
+	Textual description of each switch.  Distinguish between
+	optional switches and required switches.
+	(long_options): Add 'g', 'G' and 'z' short options.
+	(main): Distinguish between optional switches and required
+	switches.
+
+	* binutils.texi: Add -g -G and -z short options for
+	--debugging, --stabs and --disassemble-zeroes.
+
+1999-11-03  Nick Clifton  <nickc@cygnus.com>
+
+	* dlltool.c (flush_page): Clip short values to prevent warnings
+	from the assembler.
+	Change default mcore machine name to 'mcore-le' and rename
+	big-endian version to 'mcore-be'. 
+
+1999-10-27  Fred Fish  <fnf@cygnus.com>
+
+	* objdump.c (display_bfd): Break into two functions.  The
+	actual dumping code moves to dump_bfd.  If bfd is not
+	unambiguously recognized as a bfd_object, attempt to dump
+	it as a bfd_core.
+	(dump_bfd): New function.
+
+1999-10-26  Nick Clifton  <nickc@cygnus.com>
+
+	* dlltool.c (assemble_file): Remove spurious test of exp_name.
+
+1999-10-22  Nick Clifton  <nickc@cygnus.com>
+
+	* dlltool.c (struct mac): Add new field 'how_default_as_switches'.
+	(mtable): Initialise new field.  Some machines have a non empty
+	string for this field.
+	(HOW_BFD_TARGET): Undefine and replace with...
+	(HOW_BFD_READ_TARGET): New macro: bfd target to use when opening a
+	file for reading.  This is set to 0 so that any recognisable bfd
+	format can be read.
+	(HOW_BFD_WRITE_TARGET): New macro: bfd target to use when opening
+	a file for writing.  This is set to the target machine type.
+	(ASM_SWITCHES): New macro: default switches to use when assembling
+	a file.
+	(assemble_file): New function: Assemble a source file into a
+	destination object file.
+	(gen_exp_file): Use assemble_file to create the exp file.
+	(make_one_lib_file): Use assemble_file to create the lib file.
+	Open output file use HOW_BFD_WRITE_TARGET and input files using
+	HOW_BFD_READ_TARGET.
+	(make_head): Use assemble_file to create the head file.
+	(make_tail): Use assemble_file to create the tail file.
+	(gen_lib_file): Open output file use HOW_BFD_WRITE_TARGET.
+
+1999-10-15  Ian Lance Taylor  <ian@zembu.com>
+
+	* ar.c (normalize): Fix full_pathname code.
+
+1999-10-08  Ben Elliston  <bje@cygnus.com>
+
+        * binutils.texi: Some rewording and clarifications.
+
+1999-09-15  Ulrich Drepper  <drepper@cygnus.com>
+
+	* readelf.c (dynamic_segment_parisc_val): Print 0 for DLD_FLAGS if
+	the value is zero.
+	(process_symbol_table): Don't print histogram if hash table is empty.
+
+1999-09-15  Ulrich Drepper  <drepper@cygnus.com>
+
+	* readelf.c (get_parisc_dynamic_type): Handle DT_HP_GST_* values.
+
+1999-09-02  Ulrich Drepper  <drepper@cygnus.com>
+
+	* readelf.c (get_symbol_type): Add support for HPUX and PARISC
+	specific symbol types.
+
+	* readelf.c: Add HPUX and PARISC extensions to dynamic and program
+	header table printing.
+
+	* readelf.c (get_machine_flags): Add handling of PARISC.
+
+1999-09-29  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* dlltool.c (scan_drectve_symbols): Handle type tags in exported
+	symbols.
+	(scan_filtered_symbols): Likewise.
+
+1999-09-19  Ian Lance Taylor  <ian@zembu.com>
+
+	* resrc.c (write_rc_rcdata): Fix local variable shadowing
+	problem.  If RCDATA_BUFFER data can be read as strings, modify
+	code to print the strings as comments.
+	* resres.c: Add casts to avoid warnings.
+	(write_res_data, read_res_data): Don't put the program name in the
+	error message; fatal already puts it there.
+
+1999-09-14  Michael Meissner  <meissner@cygnus.com>
+
+	* configure.in (Canonicalization of target names): Remove adding
+	${CONFIG_SHELL} in front of $ac_config_sub, since autoconfig 2.14
+	generates $ac_config_sub with a ${CONFIG_SHELL} already.
+	* configure: Regenerate.
+
+1999-09-12  Ian Lance Taylor  <ian@zembu.com>
+
+	* ar.c (main): Clear output_file if we don't change the archive.
+	(delete_members, replace_members): Likewise.
+
+1999-09-12  Donn Terry  <donn@interix.com>
+
+	* objdump.c (dump_headers): If wide_output, print Flags header.
+
+	* objdump.c (dump_section_header): Print any comdat information.
+
+	* objcopy.c (parse_flags): Handle "noload", "debug", and "share".
+	* binutils.texi, objcopy.1: Document new flags.
+
+	* ar.c (counted_name_mode): New static variable.
+	(counted_name_counter): New static variable.
+	(map_over_members): Handle counted mode.
+	(usage): Mention N modifier.
+	(main): Handle N modifier.
+	(delete_members): Handle counted mode.
+	* binutils.texi, ar.1: Document N modifier.
+
+	* ar.c (print_contents): Change printing of member name for
+	POSIX.2 conformance.
+
+	* ar.c (output_filename): Make const.
+	(open_inarch): If creating a new empty archive, set
+	output_filename.
+
+1999-09-12  Ian Lance Taylor  <ian@zembu.com>
+
+	* ar.c (full_pathname): New static variable.
+	(map_over_members): Call normalize on command line parameter.
+	(usage): Mention P modifier.
+	(normalize): If full_pathname is true, don't do anything.
+	(main): Accept P modifier.
+	(delete_members): Call normalize on command line parameter.
+	* binutils.texi, ar.1: Document P modifier.
+
+1999-09-09  Andreas Schwab  <schwab@suse.de>
+
+	* binutils.texi: Add info dir entries for all programs described
+	here.  Fix arguments of @var to not contain punctuation.
+
+1999-09-06  Donn Terry  <donn@interix.com>
+
+	* nm.c (print_symbol_info_bsd): Check for 'w' as well as 'U'.
+	(print_symbol_info_sysv): Likewise.
+	(print_symbol_info_posix): Likewise.
+
+1999-09-04  Steve Chamberlain  <sac@pobox.com>
+
+	* readelf.c: Include "elf/pj.h".
+	(dump_relocations): Handle EM_PJ.
+	(get_machine_name): Likewise.
+	(get_machine_flags): Likewise.
+
+1999-08-31  Scott Bambrough <scottb@netwinder.org>
+
+	* readelf.c (get_note_type): New function:  Decode the e_type
+	value of a note.
+	(process_note): New function: Display the contents of a core note.
+	(process_corefile_note_segment): New function.
+	(process_corefile_note_segments): New function.
+	(process_corefile_contents): New function.
+	(process_file): Add call to process_corefile_contents.
+	(parse_args): Add parsing of -n/--notes command line switch.
+	(usage): Document new command line switch.
+
+	* binutils.texi: Documemnt new command line switch to readelf.
+
+1999-08-31  Ian Lance Taylor  <ian@zembu.com>
+
+	* binutils.texi (Bug Reporting): Clarify that large files should
+	not be sent to bug-gnu-utils.
+
+1999-08-28  Stephane Carrez  <stcarrez@worldnet.fr>
+
+	* readelf.c (process_extended_line_op): New parameter pointer_size,
+	read the address according to pointer_size.
+	(debug_line_pointer_size): New global to indicate the
+	size of address in .debug_line section.
+	(debug_displays, prescan_debug_info): Prescan the .debug_info section
+	to record the size of address in `debug_line_pointer_size'.
+	(process_section_contents): Before dumping any section, execute
+	the pre-scan operation defined for some debug sections.
+
+1999-08-27  Jim Wilson  <wilson@cygnus.com>
+
+	* readelf.c (display_debug_lines): Use i-1 not i in standard_opcodes
+	access.
+	(display_debug_aranges): New local excess.  Use for calculating padding
+	and add that into ranges.  Break from loop only if length is also 0.
+
+1999-08-27  Jim Wilson  <wilson@cygnus.com>
+
+	* readelf.c (display_debug_lines, case DW_LNS_const_add_pc): Multiply
+	adv by info.li_min_insn_length.
+
+1999-08-26  Jakub Jelinek  <jj@ultra.linux.cz>
+
+	* readelf.c (get_sparc64_dynamic_type): New function.
+	(get_dynamic_type): Use it.
+
+1999-08-26  Jim Wilson  <wilson@cygnus.com>
+
+	* readelf.c (display_debug_lines, case default): Change second line
+	setting	adv to use = not +=.
+
+1999-08-19  Nick Clifton  <nickc@cygnus.com>
+
+	* dlltool.c: Added more examples to the comment at the start.
+
+1999-08-18  Nick Clifton  <nickc@cygnus.com>
+
+	* dlltool.c (make_head): Only emit interworking directive if
+	necessary.
+
+Thu Jul 15 22:44:21 1999  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* readelf.c (process_abbrev_section): Handle standard-conforming
+	single zero at the end of the section.
+
+1999-08-09  Ian Lance Taylor  <ian@zembu.com>
+
+	* objdump.c (exit_status): New static variable.
+	(nonfatal): New static function.
+	(disassemble_data): Set exit_status on error.
+	(read_section_stabs): Likewise.
+	(display_bfd): Likewise.  Call nonfatal rather than bfd_nonfatal.
+	(display_file): Call nonfatal rather than bfd_nonfatal.
+	(display_target_list, display_info_table): Likewise.
+	(main): Return exit_status rather than 0.
+
+1999-08-08  Ian Lance Taylor  <ian@zembu.com>
+
+	* objdump.c (dump_section_header): Update for renaming of
+	SEC_SHORT to SEC_SMALL_DATA.  Print SEC_SHARED flag.
+
+	From Eli Zaretskii <eliz@gnu.org>:
+	* binutils.texi: Document cxxfilt as MS-DOS name for c++filt.
+
+	* configure.in: Define and substitute DEMANGLER_NAME.
+	* Makefile.am (DEMANGLER_PROG): Set to cxxfilt.
+	(man_MANS): Use DEMANGLER_NAME rather than DEMANGLER_PROG.
+	(bin_PROGRAMS): Remove $(DEMANGLER_PROG).
+	(noinst_PROGRAMS): Add $(DEMANGLER_PROG).
+	(cxxfilt_SOURCES): Rename from c__filt_SOURCES.
+	(cxxfilt_LDADD): Rename from c__filt_LDADD.
+	($(DEMANGLER_NAME).1): Rename from $(DEMANGLER_PROG).1.  Use
+	DEMANGLER_NAME rather than DEMANGLER_PROG in substitution.
+	(MOSTLYCLEANFILES): Use DEMANGLER_NAME rather than
+	DEMANGLER_PROG.
+	(install-exec-local): When installing noinst_PROGRAMS, change
+	cxxfilt to $(DEMANGLER_NAME).
+	* configure, Makefile.in: Rebuild.
+
+	* Makefile.am: Rename .dep* files to DEP*.  Change DEP variable to
+	MKDEP.
+	* Makefile.in: Rebuild.
+
+1999-08-05  Donn Terry  <donn@interix.com>
+
+	* Makefile.am (YACC): If bison is not in the source tree, use
+	@YACC@ rather than bison -y.
+	(LEX): If flex is not in the source tree, use @LEX@ rather than
+	flex.
+	* configure.in: Build dlltool for i[3-6]86-*-interix.
+	* Makefile.in, configure: Rebuild.
+
+1999-07-21  Ian Lance Taylor  <ian@zembu.com>
+
+	From Mark Elbrecht:
+	* configure.bat: Remove; obsolete.
+
+1999-07-16  Jakub Jelinek  <jj@ultra.linux.cz>
+
+	* readelf.c (get_machine_flags): Print EF_SPARC_SUN_US3.
+
+1999-07-15  Ian Lance Taylor  <ian@zembu.com>
+
+	* configure.in: Bump version number to 2.9.5.
+	* configure: Rebuild.
+
+1999-07-14  Richard Henderson  <rth@cygnus.com>
+
+	* objdump.c (dump_section_header): Print SEC_SHORT.
+
+1999-07-11  Ian Lance Taylor  <ian@zembu.com>
+
+	* Many files: Changes to avoid gcc warnings: Add ATTRIBUTE_UNUSED
+	as appropriate.  Add variable initializations.  Add casts.
+	* objdump.c (disassemble_bytes): Change j to bfd_vma.
+	* readelf.c (process_syminfo): Change i to unsigned int.
+	(display_debug_info): Change abbrev_number to unsigned long.
+	(process_mips_specific): Change fcnt to size_t.
+
+1999-07-09  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c: Only support decoding 64bit ELF files if the compiler
+	supports a 64 bit data type.
+	Add -I equivalent for --histogram.
+	Add -A command-line option to display architecture specific information.
+
+1999-07-08  Jakub Jelinek  <jj@ultra.linux.cz>
+
+	* readelf.c (guess_is_rela): Sparcv9 and v8plus use rela.
+	(dump_relocations): Use ELF64_R_TYPE_ID for Sparc, for R_SPARC_OLO10
+	print the secondary addend.
+	(get_machine_flags): Print Sparc machine flags.
+	(get_symbol_type): Print STT_REGISTER.
+
+1999-07-08  Ian Lance Taylor  <ian@zembu.com>
+
+	* stabs.c (parse_stab_type): Fix handling of template names with
+	template parameters containing `::'.
+	(stab_demangle_type): Handle a qualified name in a pointer to
+	member.
+
+1999-06-23  Ian Lance Taylor  <ian@zembu.com>
+
+	* Makefile.am (dlltool_SOURCES): Add dyn-string.c.
+	* Makefile.in: Rebuild.
+
+1999-06-23  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* configure.in (HAVE_EXECUTABLE_SUFFIX): Define.
+	* dlltool.c (look_for_prog): Use HAVE_EXECUTABLE_SUFFIX.
+	* dllwrap.c (look_for_prog): Likewise.
+	* resrc.c (look_for_default): Likewise.
+	* configure, config.in: Rebuild.
+
+1999-06-22  Ian Lance Taylor  <ian@zembu.com>
+
+	Based on patches from Mumit Khan <khan@xraylith.wisc.EDU>:
+	* configure.in: Define EXECUTABLE_SUFFIX.
+	* dlltool.c: Include "dyn-string.h".  Include <stdarg.h> based on
+	ANSI_PROTOTYPES, not __STDC__.
+	(outfile): Remove.
+	(gen_exp_file): Change uses of outfile to use alloca.
+	(make_one_lib_file, make_head, make_tail): Likewise.
+	(gen_lib_file): Likewise.
+	(look_for_prog): New static function.
+	(deduce_name): Rewrite to use look_for_prog.
+	(mcore_elf_gen_out_file): Use dyn_string_t rather than outfile.
+	* dllwrap.c: Don't include <stdio.h>, <errno.h>, <string.h>,
+	<stdlib.h>, or <unistd.h>.  Include <sys/stat.h> and either
+	<stdarg.h> or <varargs.h>.
+	(driver_name): Initialize to NULL, not "gcc".
+	(dlltool_name): Initialize to NULL, not "dlltool".
+	(display, inform, look_for_prog, deduce_name): New static
+	functions.
+	(usage): Mention -mno-cygwin.
+	(OPTION_MNO_CYGWIN): Define.
+	(main): Handle -mno-cygwin.  Deduce driver_name and dlltool_name.
+	* resrc.c (look_for_default): Make static.  Remove unused local
+	path.  Check using EXECUTABLE_SUFFIX.
+	(read_rc_file): Allocate enough space to hold EXECUTABLE_SUFFIX.
+	* Makefile.am: Rebuild dependencies.
+	(dllwrap_LDADD): Add $(INTLLIBS).
+	* configure, Makefile.in, config.in: Rebuild.
+
+Mon Jun 21 16:49:11 1999  Jeffrey A Law  (law@cygnus.com)
+
+        * readelf.c (dump_relocations): Use elf_hppa_reloc_type instead of
+        elf32_hppa_reloc_type.
+
+1999-06-17  Nick Clifton  <nickc@cygnus.com>
+
+	* dlltool.c (mcore_elf_gen_out_file): Link object files with the
+	.exp file, not the .lib file.
+
+Fri Jun 18 20:17:51 1999  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* deflex.l: Accept single-character symbol names.
+
+1999-06-16  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (get_symbol_type): Detect ARM symbols typed as Thumb
+	functions.
+
+1999-06-14  Nick Clifton  <nickc@cygnus.com>
+
+	* objdump.c (disassembler_options): New variable.
+	(usage): Document new -M/--disassembler-options option.
+	(long_options): Add --disassembler-options.
+	(disassemble_data): Initialise disassembler_options field of
+	disassembler_info structure.
+	(main): Add parsing of -M option.
+
+	* binutils.texi: Document new command line switch to objdump.
+
+	* NEWS: Describe new command line switch to objdump.
+
+
+Mon Jun 14 10:27:54 1999  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* binutils.texi: Fix typos.
+
+1999-06-13  Ian Lance Taylor  <ian@zembu.com>
+
+	* objdump.c (disassemble_bytes): If the disassembler returns an
+	error, print out anything it may have printed to the buffer.  From
+	H.J. Lu <hjl@gnu.org>.
+
+	* defparse.y (explist): Remove separate expline to eliminate
+	shift/reduce conflict.
+
+	From Kai-Uwe Rommel <rommel@ars.de>:
+	* defparse.y: Add tokens NONSHARED, SINGLE, MULTIPLE,
+	INITINSTANCE, INITGLOBAL, TERMINSTANCE, and TERMGLOBAL.
+	(command): Add option_list after LIBRARY.
+	(attr): Accept and ignore NONSHARED, SINGLE, and MULTIPLE.
+	(option_list, option): New nonterminals.
+	* deflex.l: Recognize NONSHARED, SINGLE, MULTIPLE, INITINSTANCE,
+	INITGLOBAL, TERMINSTANCE, and TERMGLOBAL.
+
+1999-06-12  Ian Lance Taylor  <ian@zembu.com>
+
+	* ar.c (O_BINARY): Define as 0 if not defined.
+	(ranlib_touch): Open file with O_BINARY.
+
+	* rename.c (O_BINARY): Define as 0 if not defined.
+	(simple_copy): Open files with O_BINARY.
+
+	Based on patch from H. Peter Anvin <hpa@transmeta.com>:
+	* objcopy.c (struct section_list): Add copy field.
+	(sections_copied): New static variable.
+	(copy_options): Add "only-section".
+	(copy_usage): Mention -j and --only-section.
+	(find_section_list): Initialize copy field.
+	(is_strip_section): Check for copying sections.
+	(copy_object): Check sections_copied when calling filter_symbols.
+	(setup_section): Check for copying sections.
+	(copy_section): Likewise.
+	(copy_main): Handle -j/--only-section.
+	* binutils.texi, objcopy.1: Document -j/--only-section.
+
+	* configure.in: If frexp is not available, check in -lm.
+	* configure: Rebuild.
+
+	* readelf.c (get_elf_class): Use correct printf format for type.
+	(get_data_encoding): Likewise.
+	(get_osabi_name): Likewise.
+	(process_file_header): Don't pass an extra argument to printf.
+	(process_dynamic_segment): Cast dynamic_size to long before
+	printing.
+	(decode_location_expression): Cast byte_get to long before
+	printing.
+
+Wed Jun  9 11:40:16 1999  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* readelf.c (dump_section): Cast values from byte_get to
+ 	[unsigned] long for printing, in case it is wider than long.
+	(display_block): Likewise.
+	(read_and_display_attr): Likewise.
+	(decode_location_expression): Likewise.  Don't depend on
+ 	evaluation order.
+
+Mon Jun  7 12:14:57 1999  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* windres.c (usage): Fix typo.
+
+1999-06-04  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c: Use 64bit wide fields in internal structures even if
+	targetting a 32bit architecture.
+	(dump_relocations): Take a new parameter - the number of symbols
+	in the symbol table.
+
+1999-06-04  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c: Add support for 64bit ELF files.
+
+1999-06-03  Nick Clifton  <nickc@cygnus.com>
+
+	* dlltool.c (mcore_elf_gen_out_file): Use constants for temporary
+	file names.
+
+Wed Jun  2 12:34:36 1999  Richard Henderson  <rth@cygnus.com>
+
+	* dlltool.c (gen_exp_file): Revert 19990411 change.
+
+Mon May 31 09:56:22 1999  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* readelf.c (process_relocs): Determine type of reloc from
+	DT_PLTREL and from section type.
+
+1999-05-29  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (get_elf_class): Display unknown class number.
+	(get_data_encoding): Display unknown encoding number.
+	(get_osabi_name): Display unknown ABI number.
+	(process_file_header): Display unknown version number.
+
+1999-05-29  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (dump_relocations): Fix typo.
+
+1999-05-28  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (dump_relocations): Add extra parameter: is_rela to
+	specify the kind of relocations to be dumped.  Call guess_is_rela
+	if this parameter has a value of UNKNOWN.
+	(guess_is_rela): New function:  Guess the kind of reloc being used
+	baced on the machine number.
+	(process_relocs): Determine type of reloc before calling
+	dump_relocations.
+
+1999-05-28  Ian Lance Taylor  <ian@zembu.com>
+
+	* readelf.c: Include "elf/i960.h".
+	(dump_relocations): Handle EM_960.
+
+Thu May 27 11:58:33 1999  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* objcopy.c (copy_archive): Preserve dates of archive members if
+	requested.
+
+	* readelf.c (dump_relocations): Always print the addend on RELA
+	systems even if there is no symbol.
+	(process_program_headers): Reset dynamic_size before looping
+	through the program headers.
+	(process_version_sections): Cast sh_offset to unsigned long for
+	printing in case bfd_vma is wider.
+	(process_symbol_table): Use get_symbol_index_type when printing
+	st_shndx.
+
+1999-05-17  DJ Delorie  <dj@cygnus.com>
+
+	* windres.c: add verbose option
+	(main): process verbose option
+	* resrc.c (look_for_default): new.  Look for the default
+	preprocessor in a given location.
+	(read_rc_file): for foo/bar-windres, look for foo/bar-gcc,
+	foo/gcc (in case of foo/windres), and then gcc (the old default).
+
+1999-05-16  Nick Clifton  <nickc@cygnus.com>
+
+	* dlltool.c (deduce_name): New function: Deduce name of program to
+	run.
+	(mcore_elf_out_file): New variable: Name of mcore-elf output file.
+	(mcore_elf_linker): New variable: Name of linker to use.
+	(mcore_elf_linker_flags): New variable: Linker flags to pass.
+	(scan_obj_file): Cache filenames if necessary.
+	(usage): Document new command line options.
+	(main): Support new command line options: -M (generate an
+	mcore-elf output file) -L (name of linker to use) -F (flags to
+	pass to linker).
+	(mcore_elf_cache_filename): Store a filename in a cache.
+	(mcore_elf_gen_out_file): New function: Generate an output file
+	per the mcore-elf spec.
+
+1999-05-15  Nick Clifton  <nickc@cygnus.com>
+
+	* configure.in (BUILD_MISC): Build dlltool for mcore
+	* configure: Regenerate.
+	* dlltool.c: Update example in comment.
+	(DLLTOOL_MCORE): Define.
+	(DLLTOOL_MCORE_ELF): Define.
+	(DRECTVE_SECTION_NAME): Define.
+	(mcore_be_jtab, mcore_le_jtab): Binary for performing an mcore
+	jump to address.
+	(mtable): Add entries for mcore variants.
+	(rvaafter, rvabefore, asm_prefix): Add mcore suppport.
+	(scan_drectve_symbols): Use DRECTVE_SECTION_NAME.
+	(make_head, make_tail): Cope if file cannot be created.
+	(usage): Improve layout.
+
+1999-05-13  DJ Delorie  <dj@cygnus.com>
+
+	* rclex.l: add code to suppress certain output from cpp, replace
+	all returns with MAYBE_RETURN
+	(MAYBE_RETURN): new, implement the suppression by returning
+	IGNORED_TOKEN as needed.
+	(cpp_line): remember which file we're in, mark data from included
+	*.h files for suppression.
+	* rcparse.y (input): allow IGNORED_TOKEN outside of known constructs
+
+1999-05-10  DJ Delorie  <dj@cygnus.com>
+
+	* windres.c (quot): Quote shell metacharacters in a string
+	(main): quote parameters to cpp that might have metacharacters in
+	them.  Allow -D as an alias for --define to allow for sharing make
+	macros with gcc.
+
+	* objdump.c (dump_reloc_set): don't core if howto->name is NULL
+
+	* Makefile.am: Give rescoff.c a cpu-specific -D so it can set
+	the correct BFD.
+	* Makefile.in: ditto
+	* rescoff.c (write_coff_file): Set the correct BFD
+
+1999-05-06  Ian Lance Taylor  <ian@zembu.com>
+
+	* rename.c (smart_rename): Fix test of whether file exists.
+
+1999-05-06  Nick Clifton  <nickc@cygnus.com>
+
+	* objdump.c (disassemble_data): Set display_endian based on target
+	endianism.
+
+1999-05-05  Catherine Moore  <clm@cygnus.com>
+
+	* dlltool.c (interwork): Remove.
+	(arm_interwork_jtab): Use bx insn.
+	(thumb_jtab): Likewise.
+	(MARM_INTERWORK): New machine type.
+	(rvaafter): Handle it.
+	(rvabefore) Likewise.
+	(asm_prefix): Likewise.
+	(gen_exp_type): Check machine type instead of
+	interwork flag.
+	(make_one_lib_file): Likewise.
+	(make_head): Likewise.
+	(make_tail): Likewise.
+	(usage): Update machine types.
+	(main): Remove -interwork support.
+
+1999-05-05  Catherine Moore  <clm@cygnus.com>
+
+	* readelf.c (get_machine_flags):  Check for EF_CPU32.
+	(get_data_encoding): Fix typo.
+
+1999-04-26  Tom Tromey  <tromey@cygnus.com>
+
+	* aclocal.m4, configure: Updated for new version of libtool.
+
+1999-04-18  Ian Lance Taylor  <ian@zembu.com>
+
+	* stabs.c (parse_stab_range_type): Correct parenthesization in
+	BFD64 case.
+
+	* readelf.c (get_section_type_name): Use correct types in printf
+	formats.
+	(process_relocs): Likewise.
+	(process_dynamic_segment): Likewise.
+	(process_symbol_table): Likewise.
+	(process_mips_specific): Likewise.
+
+Tue Apr 13 21:22:00 1999  Catherine Moore  <clm@cygnus.com>
+
+	* dlltool.c (make_one_lib_file): Mark thumb functions as
+	C_THUMBEXTFUNC.
+
+1999-04-11  Richard Henderson  <rth@cygnus.com>
+
+	* bucomm.h (environ): Declare it, if needed.
+	(alloca) [C_ALLOCA]: Don't use gcc's builtin or <alloca.h>.
+	* configure.in (environ): Detect declaration.
+	* nm.c (main): Don't declare environ.
+	* configure, config.in: Rebuild.
+
+	* dlltool.c (gen_exp_file): Pad out the .reloc section to a
+	32-byte boundary with dummy relocations, to make the BeOS loader
+	happy.  Patch from Bob Manson <manson@charmed.cygnus.com>.
+
+1999-04-08  Tom Tromey  <tromey@cygnus.com>
+
+	* binutils.texi (c++filt): Updated for -j/--java, and hp/edg
+	formats.
+
+1999-04-08  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c: Add ability to decode new constants found in April 25
+	1998 Draft of System V ABI spec.
+
+1999-04-06  Ian Lance Taylor  <ian@zembu.com>
+
+	* bucomm.h (LC_MESSAGES): Never define.
+	* addr2line.c (main): Don't pass LC_MESSAGES to setlocale if the
+	system does not define it.
+	* ar.c (main): Likewise.
+	* coffdump.c (main): Likewise.
+	* dlltool.c (main): Likewise.
+	* nlmconv.c (main): Likewise.
+	* nm.c (main): Likewise.
+	* objcopy.c (main): Likewise.
+	* objdump.c (main): Likewise.
+	* size.c (main): Likewise.
+	* srconv.c (main): Likewise.
+	* strings.c (main): Likewise.
+	* sysdump.c (main): Likewise.
+	* windres.c (main): Likewise.
+	* readelf.c (main): Call locale setting functions.
+
+1999-04-05  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (decode_location_expression): Fix DW_OP_const8{s|u}
+	decodes.
+
+1999-04-04  Ian Lance Taylor  <ian@zembu.com>
+
+	* rename.c: New file, copied out of objcopy.c with a few changes.
+	* bucomm.h (set_times, smart_rename): Declare.
+	* ar.c: Don't include <utime.h>.
+	(extract_file): Call set_times rather than utime.
+	(write_archive): Call smart_rename rather than unlink and rename.
+	* objcopy.c: Don't include <utime.h>.
+	(simple_copy, smart_rename, set_times): Move to rename.c.
+	(strip_main): Update smart_rename call for new parameter.
+	(copy_main): Likewise.
+	* Makefile.am: Rebuild dependencies.
+	(CFILES): Add rename.c.
+	(objcopy_SOURCES, strip_new_SOURCES): Add rename.c.
+	(ar_SOURCES, ranlib_SOURCES): Add rename.c.
+	* Makefile.in: Rebuild.
+
+	* Makefile.am: Rebuild dependencies.
+	(EXTRA_PROGRAMS): Remove backslash which troubles current version
+	of automake.
+	* Makefile.in: Rebuild.
+
+	* dllwrap.c (main): Expect correct type in format string.
+	* resres.c: Include "bfd.h", "bucomm.h", "libiberty.h", and
+	<time.h>.  Don't include <stdio.h> and <errno.h>.
+	(write_res_file): Remove unused locals e and i.
+	(read_resource_entry): Remove unused locals rtype and n.
+	(read_unistring): Remove unused local n.
+
+1999-04-03  Ian Lance Taylor  <ian@zembu.com>
+
+	* arparse.y: Declare yylex.
+	* objdump.c (disassemble_bytes): Initialize bytes.  Add comment
+	for incorrect use of bytes.
+	* readelf.c: Change many formats to avoid warnings.
+
+1999-04-01  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (reset_state_machine): New function.  Resets the
+	registers of the source line number state machine.
+	(process_extended_line_op): Use state machine.
+	(display_debug_lines): Use state machine.  Handle multiple line
+	number blocks within the same section.
+
+1999-03-29  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* readelf.c (process_extended_line_op): end_sequence also resets
+	the line number.
+	(display_debug_lines): advance_line takes a signed operand.
+	(read_and_display_attr): Print refs as <%x>, addresses as %#x,
+	others as %d.  Handle other location expression attributes.
+	(display_debug_info): Handle nesting.  Always print the	offset.
+
+1999-03-23  Ian Lance Taylor  <ian@zembu.com>
+
+	* objcopy.c (filter_symbols): When checking whether to keep a
+	symbol, check the BFD section symbol for a symbol with
+	BSF_SECTION_SYM set.
+
+1999-03-10  Ulrich Drepper  <drepper@cygnus.com>
+
+	* readelf.c (process_dynamic_segment): Print new Solaris dynamic
+	section entries.  Correct printing of DT_POSFLAG_1 and DT_FLAGS_1.
+
+1999-03-10  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (request_dump): New function.
+	Removed arbitary limit on the number of sections that can be
+	dumped.
+
+Wed Mar 10 15:10:14 1999  Stan Cox  <scox@cygnus.com>
+
+	* dlltool.c (make_one_lib_file): Use %05d to output the stub name so
+	order in the import library is preserved.
+
+1999-02-19  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c: Fix compile time warings.
+
+1999-02-17  DJ Delorie  <dj@cygnus.com>
+
+	* resbin.c (res_to_bin_versioninfo): Instead of entering a value
+	length of zero in a version info string, enter the appropriate
+	length.
+
+Tue Feb 16 16:00:33 1999  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Require autoconf 2.13.  Change AM_PROG_INSTALL to
+	AC_PROG_INSTALL.  Add comments for AC_DEFINE calls.
+	* acconfig.h: Remove.
+	* aclocal.m4: Rebuild.
+	* configure: Rebuild.
+	* Makefile.in: Rebuild.
+	* config.in: Rebuild.
+
+1999-02-02  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (read_and_display_attr): Add display of basic type
+	encodings.
+	(display_debug_aranges): New function: Display the contents of a
+	.debug_aranges section.
+	(display_debug_info): Dump tags found after compunit entry.
+
+	* binutils.texi: Fixed bug in readelf documentation.
+
+Mon Feb  1 12:38:01 1999  Catherine Moore  <clm@cygnus.com>
+
+	* readelf.c (dump_relocations):  Handle EM_ARM as REL.
+
+1999-01-29  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (process_symbol_table): Do not produce a histogram of
+	bucket chains if none were found.
+
+1999-01-27  Nick Clifton  <nickc@cygnus.com>
+
+	* version.c: Add 1999 copyright.
+
+	* binutils.texi (readelf): Document new command line options
+	--debug-dump and --histogram.
+
+	* readelf.c: Add ability to display contents of some or all of the
+	Dwarf2 debug sections.  {Work only partially completed}.
+	(display_debug_section): New function.
+	(display_debug_info): New function.
+	(display_debug_not_supported): New function.
+	(display_debug_line): New function.
+	(display_debug_abbrev): New function.
+	(process_abbrev_section): New function.
+	(read_leb128): New function.
+	(process_extended_line_op): New function.
+	(get_TAG_name): New function.
+	(get_AT_name): New function.
+	(get_FORM_name): New function.
+	(free_abbrevs): New function.
+	(add_abbrev): New function.
+	(add_abbrev_attr): New function.
+	(read_and_display_attr): New function.
+	(display_block): New function.
+
+Thu Jan 14 23:36:11 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* coffdump.c (xcalloc): Remove, in libiberty now.
+	* srconv.c (xcalloc): Likewise.
+	* sysdump.c (xcalloc): Likewise.
+
+1999-01-14  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (process_section_headers): Omit trailing space at end
+	of section header contents line.
+
+Wed Dec 16 17:20:05 1998  Doug Evans  <devans@canuck.cygnus.com>
+
+	* aclocal.m4: Regenerate.
+
+Mon Dec 14 12:55:36 1998  Jim Wilson  <wilson@cygnus.com>
+
+	* dllwrap.c: Include bfd.h and bucomm.h.  Move getopt.h include
+	after libiberty.h include.
+
+Tue Dec  8 16:29:43 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.1: Fix typo (-d to -D).  From Nokubi Hirotaka
+	<hnokubi@yyy.or.jp>.
+
+Sun Dec  6 13:28:09 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objdump.c (SFILE): Add size field.
+	(objdump_sprintf): Merge both versions into one.  Increase buffer
+	size as needed to avoid overflow.
+	(disassemble_bytes): Change buf from 1000 bytes to 50.  Change
+	initialization and use of sfile to match changes to
+	objdump_sprintf.
+
+	* strip.1: Fix typo (-V to -v).  From Issei Hirayama
+	<iss@mail.wbs.or.jp>.
+
+1998-12-03  Ulrich Drepper  <drepper@cygnus.com>
+
+	* readelf.c (process_dynamic_segment): Improve output format for
+	various DT_* values.
+
+1998-12-02  Ulrich Drepper  <drepper@cygnus.com>
+
+	* readelf.c (process_mips_specific): Print .conflict section
+	content.
+
+	* readelf.c (process_mips_specific): Print l_flags in liblist in
+	textual form.
+
+1998-11-30  Nick Clifton  <nickc@cygnus.com>
+
+	* ar.c (extract_file): Add some paranoia checks for negatively
+	sized files.
+
+Tue Nov 24 09:39:24 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* stabs.c (DIR_SEPARATOR): Define as '\\' if WIN32 is defined.
+
+Tue Nov 17 10:25:26 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* Makefile.in: Regenerate.
+
+Mon Nov 16 19:17:23 1998  Dave Brolley  <brolley@cygnus.com>
+
+	* po/binutils.pot: Regenerate.
+
+Mon Nov 16 10:18:53 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* Makefile.am: Regernated dependencies.
+	* aclocal.m4: Regenerated.
+	* configure: Regenerated.
+
+Sat Nov 14 14:50:56 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* debug.c (debug_name_type): Correct return type from false to
+	DEBUG_TYPE_NULL.
+
+Sat Nov 14 14:48:21 1998  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* objdump.c (disassemble_data): Skip over relocs below start
+	address.
+
+Tue Nov 10 15:31:52 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* Makefile.am: Add dependency of readelf.c on elf/fr30.h
+	* Makefile.in: Regenerate.
+
+Wed Nov  4 16:25:55 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c: Add support for the FR30.
+
+Mon Nov  2 14:59:33 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* configure.in: detect cygwin* instead of cygwin32*
+	* configure: regenerate
+
+Fri Oct 30 15:14:49 1998  Geoffrey Noer  <noer@cygnus.com>
+
+        * dllwrap.c: change all references to cygwin32_ to cygwin_,
+	change Cygwin target def to CYGWIN.
+
+Wed Oct 28 10:31:19 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* objdump.c (disassemble_data): Replace 'unsigned long' with
+	'bfd_vma'.
+
+Tue Oct 27 14:39:00 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* objdump.c (disassemble_bytes): Applied this patch from Philip
+	Blundell <pb@nexus.co.uk>:  Make address variables unsigned to
+	avoid problems when disassembling code at high-bit-set addresses.
+
+Mon Oct 26 14:07:59 1998  Mumit Khan  <khan@xraylith.wisc.edu>
+
+        * dllwrap.c (strhash): New function.
+        (main): Use it to supply image base if not supplied by user.
+        (program_version): Up to 0.2.4.
+
+Mon Oct 26 14:07:59 1998  Mumit Khan  <khan@xraylith.wisc.edu>
+
+        * dlltool.c (add_stdcall_alias): New global.
+        (long_options): Add --add-stdcall-alias option.
+        (main): Handle it.
+        (scan_drectve_symbols): Add alias if --add-stdcall-alias is
+        specified.
+        (scan_filtered_symbols): Likewise.
+        (gen_def_file): Output alias for stdcall syms if appropriate.
+
+        * binutils.texi (dlltool): Document --add-stdcall-alias option.
+
+        * dllwrap.c (long_options): Add --add-stdcall-alias option.
+        (main): Handle it.
+
+        * defparse.y (opt_name): Allow "." in name.
+        * dlltool.c (def_name): Set dll_name from NAME entry in def file.
+        (def_library): Set dll_name from LIBRARY entry in def file.
+
+Mon Oct 26 14:07:59 1998  Mumit Khan  <khan@xraylith.wisc.edu>
+
+        * dllwrap.c (long_options): --implib synonym for --output-lib.
+        (main): Pass --export-all to dlltool only if specified.
+        (program_version): Up to 0.2.3.
+
+Mon Oct 26 14:07:59 1998  Mumit Khan  <khan@xraylith.wisc.edu>
+
+        * dllwrap.c (mybasename): New function.
+        (main): Run dlltool to create export definition file and import
+        library file if necessary.
+        Change exp_file_name so that it's based on the dll name.
+
+Sun Oct 25 10:37:45 1998  Mumit Khan  <khan@xraylith.wisc.edu>
+
+        * dlltool.c (scan_all_symbols): Fix patch error.
+
+Fri Oct 16 22:56:20 1998  Felix Lee  <flee@cygnus.com>
+
+	* nm.c (display_rel_file): fix "no symbols" messages.
+	* objdump.c (slurp_symtab): ditto.
+	* po/POTFILES.in, po/binutils.pot: rebuilt
+
+Mon Oct 12 14:28:03 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (dump_relocations): Rename field from Value to Info to
+	match name of field in ELF structures.
+
+Thu Oct  8 15:33:08 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* configure.in: call AC_EXEEXT instead of AM_EXEEXT and
+	AM_CYGWIN32.
+	* aclocal.m4: remove local AM_EXEEXT/AM_CYGWIN32 macros.
+	* configure: regenerate
+
+Thu Oct  8 15:33:08 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	From Mumit Khan  <khan@xraylith.wisc.edu>:
+        * dlltool.c (scan_all_symbols): Don't re-export symbols exported
+        by other DLLs.
+
+Thu Oct  8 15:33:08 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* Makefile.am (BUILD_DLLWRAP): Add.
+	(BUILD_DLLWRAP, DLLWRAP_PROG): Add.
+	(bin_PROGRAMS): Add dllwrap.
+	* Makefile.in: regenerate with automake
+
+	From Mumit Khan  <khan@xraylith.wisc.edu>:
+        * dllwrap.c: New file from dllhelpers v0.2.1.
+	(print_version): New function.
+	(long_options): Add --version.
+	(main): Handle.
+        * dyn-string.h, dyn-string.c: New files from egcs-1.1/gcc.
+        * configure.in (BUILD_DLLWRAP): Add.
+        * configure: Regenerate.
+
+Tue Oct  6 18:20:10 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* Makefile.am (windres_SOURCES): Add resres.c.
+	(windres_OBJECTS): Add resres.o.
+	* Makefile.in: regenerate with automake
+
+        From Anders Norlander <anorland@hem2.passagen.se>.
+        * resres.c: New file.  Implementation of read_res_file and
+        write_res_file functions for windres.
+        * rcparse.y: Handle CONTROL's with named classes.
+        * resbin.c: Bug in res_to_bin_dialog and bin_to_res_dialog
+        when dialog is extended: The version and signature fields should
+        be reversed (despite what the docs say). Id is 32 bits long in
+        extended dialogs.
+        * resrc.c (write_rc_dialog): properly print controls with named
+        classes.
+        * windres.c (read_res_file, write_res_file): Remove stubs.
+        * resres.c (write_res): Rename RT_ACCELERATORS to RT_ACCELERATOR.
+
+Sun Oct  4 20:34:42 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	From Nokubi Hirotaka <hnokubi@yyy.or.jp>:
+	* objcopy.1: Fix typo in --remove-leading-char docs.
+	* objdump.1: Fix formatting in --stabs docs.
+
+Sat Sep 19 23:33:56 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* rcparse.y (memflags_move): Correct recursion.
+
+1998-09-10  Ulrich Drepper  <drepper@cygnus.com>
+
+	* readelf.c (process_symbol_table): Print in histogram how many
+	symbols are covered by the current chain length.
+
+Sun Sep  6 16:15:47 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (process_section_contents): Do not try to dump empty
+	sections.
+
+Sat Sep  5 19:17:10 1998  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* dlltool.c (scan_all_symbols): Don't re-export symbols exported
+	by other DLLs.
+
+1998-09-02 14:50  Ulrich Drepper  <drepper@cygnus.com>
+
+	* readelf.c (process_dynamic_segment): Print DT_* value only if
+	do_dynamic.
+	(do_histogram): New variable.
+	(options): New long option histogram.  Set do_histogram if this
+	option is used.
+	(usage): Document --histogram.
+	(parse_args): Handle 0 return value from getopt_long.  Enable
+	do_histogram for -a.
+	(process_symbol_table): Read hash table also if only do_histogram.
+	Add code to print hash table histogram.
+
+1998-08-25 16:45  Ulrich Drepper  <drepper@cygnus.com>
+
+	* readelf.c (process_dynamic_segment): Read syminfo section if
+	available.
+	(process_syminfo): New function.  Print syminfo information.
+	(process_file): Call process_syminfo and free syminfo data at the end.
+
+Wed Aug 19 16:19:51 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* dlltool.c (usage): Add file parameter.  Change all callers.
+	(main): Don't treat '?' as a special case in getopt return.
+
+	* binutils.texi (dlltool): Document new options.  Add some uses of
+	@var.
+
+Wed Aug 19 16:19:07 1998  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* dlltool.c (gen_def_file): Plug memory leak.  Don't print
+	demangled name if it is NULL.
+
+	Support for exporting all symbols to an output export def file:
+	* dlltool.c ({export_all_symbols, no_default_excludes,
+	no_default_excludes, excludes}): New file static variables.
+	(struct string_list): Type to hold list of symbols to exclude.
+	(scan_drectve_symbols): Renamed from scan_open_obj_file.
+	(scan_filtered_symbols): New static function.
+	(add_excludes): New static function.
+	(match_exclude): New static function.
+	(set_default_excludes): New static function.
+	(filter_symbols): New static function.
+	(scan_all_symbols): New static function.
+	(scan_open_obj_file): New static function.
+	(usage): Document new options.
+	(long_options): Add new options.
+	(main): Handle new options.
+
+1998-07-31 21:24  Ulrich Drepper  <drepper@cygnus.com>
+
+	* readelf.c (process_program_headers): Print p_offset value with
+	six hex digits.
+	(dynamic_segment_mips_val): Add support for DT_MIPS_FLAGS,
+	DT_MIPS_IVERSION, and DT_MIPS_TIME_STAMP.
+	(process_mips_specific): Also print seconds of time stamp.
+
+Fri Jul 31 10:04:23 1998  Catherine Moore  <clm@cygnus.com>
+
+        * readelf.c (dump_relocations):  EM_ARM uses rela relocs.
+
+1998-07-30 16:25  Ulrich Drepper  <drepper@cygnus.com>
+
+	* readelf.c (get_dynamic_type): Don't used gettext on the names.
+	Add new DT_* values from Solaris.  Don't print nuemric value in
+	case of an unknown entry.
+	(process_dynamic_segment): Handle new DT_* entries.  Print numeric
+	values in decimal, not hex.
+
+Fri Jul 24 16:28:57 1998  Jeff Holcomb  <jeffh@cygnus.com>
+
+	* readelf.c (get_dynamic_type): Remove empty default from switch
+	statement.
+
+Fri Jul 24 16:28:12 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (install-exec-local): Don't remove the file before
+	checking whether $(bindir) == $(tooldir)/bin.  From Maciej
+	W. Rozycki <macro@ds2.pg.gda.pl>.
+	* Makefile.in: Rebuild.
+
+Fri Jul 24 09:38:59 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* objcopy.c: Removed spurious inclusion of elf/internal.h and
+	elf-bfd.h.
+
+1998-07-22  Ulrich Drepper  <drepper@cygnus.com>
+
+	* readelf.c: Consistantly use elf_ prefix for *_reloc_type
+	functions.
+
+Wed Jul 22 16:29:12 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (dump_relocations): Add dumps of HPPA and ARC
+	relocations.
+
+	(process_relocs): Do not abort if no string table can be found.
+
+1998-07-22 14:58  Ulrich Drepper  <drepper@cygnus.com>
+
+	* readelf.c: Remove definition of functions to return relocation
+	symbol strings.  They now get implicitly defined when include the
+	system specific ELF header.
+
+1998-07-22 13:51  Ulrich Drepper  <drepper@cygnus.com>
+
+	* readelf.c: Before include system specific ELF header define
+	START_RELOC_NUMBERS, RELOC_NUMBER, and END_RELOC_NUMBERS.  For now
+	used for ppc, mips, and mn10300.
+
+Wed Jul 22 10:26:32 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (dump_relocations): Display number of unrecognised
+	relocations.
+
+1998-07-21 13:13  Ulrich Drepper  <drepper@cygnus.com>
+
+	* readelf.c: Use symbolic names of relocation entries for the various
+	architectures.  Correct more layout details.
+	Print names of MIPS specific section types.  Print Alpha, ARM, and
+	MIPS relocation type names.
+
+1998-07-20  Vladimir N. Makarov  <vmakarov@cygnus.com>
+
+	* objcopy.c (filter_symbols): Add code for strip all symbols case.
+        (copy_objects): Strip all case is now processed also through
+	filter_symbols.  No marking symbols used in relocations when strip
+	all symbols case.
+	(copy_section): When strip all symbols case, remove relocations
+	which are not in keep strip specific list.
+	(strip_main): Remove guard `strip_specific_list == NULL' for
+	setting up strip all symbols by default.
+
+Mon Jul 20 12:51:16 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* addr2line.c (find_address_in_section): Only consider a section
+	if the pc value is completely contained within it.
+	(translate_addresses): Don't crash if functionname or filename are
+	null.
+
+1998-07-20 07:45  Ulrich Drepper  <drepper@cygnus.com>
+
+	* readelf.c (process_symbol_table): Fix little alignment problem
+	in printed table header.
+
+1998-07-20 07:14  Ulrich Drepper  <drepper@cygnus.com>
+
+	* readelf.c: Correct reading of .dynamic section.
+	(dynamic_section): Now a global variable.
+	(process_mips_fpe_exception, process_mips_specific,
+	process_arch_specific): New functions.
+	(get_file_header): Call process_arch_specific.
+
+1998-07-19 15:15  Ulrich Drepper  <drepper@cygnus.com>
+
+	* readelf.c: Fix several versioning related bugs.  Produce nicer
+	output.
+	Add support for processor specific information on MIPS.
+
+Fri Jul 10 15:57:58 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c: Switch prototypes from unsigned short to unsigned
+	int.
+
+Fri Jul 10 16:17:50 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	From Christian Holland <CHolland@de.lucent.com>:
+	* ieee.c (parse_ieee): Initialize info.global_vars and
+	info.global_types.
+	(parse_ieee_atn): Ignore register lifetime information reportedly
+	emitted by MRI compiler.
+
+Thu Jul  9 13:08:01 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (MAINTAINERCLEANFILES): Define.
+	* Makefile.in: Rebuild.
+
+Tue Jul  7 21:48:54 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* readelf.c (byte_get): Use PARAMS in prototype.
+	(error): Make it work with non-ANSI compilers.
+	(warn): Likewise.
+	(get_ver_flags): Don't use an ANSI prototype in the definition.
+
+Tue Jul  7 13:26:13 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objcopy.c (filter_bytes): Set size correctly if the size of the
+	section is not an even multiple of the interleave.  Based on patch
+	from Brion Stone <Brion.Stone@attws.com>.
+
+Thu Jul  2 14:01:34 1998  Klaus Kaempf  <kkaempf@rmi.de>
+
+	* configure.com: Add vax/vms support.
+	* makefile.vms-in: Renamed from makefile.vms.  Add substitutions
+	now done by configure.com.
+
+Wed Jul  1 20:43:52 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* stabs.c (parse_stab_range_type): Handle 4 and 8 byte signed
+ 	integers with real upper bounds.  Handle a lower bound one larger
+ 	than the upper bound as a signed integer.  Handle 8 byte signed
+	integers.
+	(stab_demangle_template): Optionally return the demangled name of
+	the template.
+	(stab_demangle_qualified): Treat a template name as a tagged
+	type.
+	(stab_demangle_fund_type): Likewise.
+
+Wed Jul  1 16:29:50 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* objcopy.c: Minor formatting improvements.
+	* readelf.c: Minor output formatting improvement.
+
+Wed Jul  1 14:23:48 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* rclex.l: Add casts and change types to avoid warnings.
+	* rcparse.y: Likewise.
+	* resbin.c: Likewise.
+	* rescoff.c: Likewise.
+	* resrc.c: Likewise.
+
+	* Makefile.am: Rebuild dependencies.
+ 	(HFILES): Remove readelf.h.
+	* Makefile.in: Rebuild.
+
+	Based on patches from Andrew Kozin
+	<Andrew.Kozin@p14.f960.n5020.z2.fidonet.org>:
+	* winduni.h: New file, from windres.h.
+	* winduni.c: New file, from windres.c.
+	* windres.c: Move Unicode functions into winduni.c.
+	* windres.h: Move Unicode declarations into winduni.h.  Include
+	winduni.h.
+ 	(RT_ACCELERATOR): Rename from RT_ACCELERATORS to match Windows
+	macro.  Change all uses.
+	(RT_PLUGPLAY, RT_VXD): Correct values.
+	* Makefile.am (HFILES): Add windres.h.
+	(CFILES): Add winduni.c.
+	(windres_SOURCES): Add winduni.c.
+
+Mon Jun 29 17:01:21 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c: Use BFD Internal and External Elf structures.
+	* readelf.h: Removed - no longer needed.
+	* Makefile.in: Remove readelf.c's dependency upon readelf.h.
+
+1998-06-26  Vladimir N. Makarov  <vmakarov@cygnus.com>
+
+	* objcopy.c (strip_main): keep_specific_list == NULL as additional
+	condition to set up strip all symbols by default.
+	(copy_archive): don't change archive when error in object files of
+	the archive.
+
+Wed Jun 24 17:53:47 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* stabs.c (parse_number): Sign extend negative values correctly if
+	bfd_vma is larger than unsigned long.
+
+Tue Jun 23 14:55:05 1998  Mike Stump  <mrs@wrs.com>
+
+	* Makefile.am (install-exec-local): Don't let EXEEXT interfere
+	with the program transform name.
+	* Makefile.in: Rebuild.
+
+Tue Jun 23 11:08:53 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c: Rewrite to use fopen/fread ratehr than mmap.
+
+	Add --section-headers command line switch, which is an alias for
+	--sections.
+
+	Incorporate improvemnts made by Andreas Schwab
+	<schwab@issan.informatik.uni-dortmund.de> including output
+	formatting and version info display.
+
+	* binutils.texi: Document --section-headers switch to readelf.
+
+Mon Jun 22 18:28:19 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* readelf.c: Include bfd.h and bucomm.h before system header
+	files.
+	(parse_args): Change type of c from char to int.
+
+Sun Jun 14 14:26:28 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c (usage): Write to stdout, not stderr.
+
+Fri Jun 12 13:33:51 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* po/Make-in (all-yes): Depend on .pot file if maintainer mode
+	enabled.
+	($(PACKAGE).pot): Unconditionally depend on POTFILES.
+
+Fri Jun 12 16:06:15 1998  Michael Meissner  <meissner@cygnus.com>
+
+	* readelf.c (get_ppc_rel_type): New PowerPC support.
+	(dump_relocations): PowerPC uses RELA relocations.
+	(get_machine_name): Spell PowerPC correctly.
+	(get_file_type): Change unsigned short parameter to unsigned.
+	(get_machine_name): Ditto.
+	(get_machine_data): Return whether big endian or little endian.
+	(get_machine_flags): Interpret PowerPC, M32R, and MIPS flags.
+	(process_elf_header): Print endian-ess.  Convert all numeric
+	formats to long or unsigned long.  Print out machine specific flag
+	bits.
+	(process_section_headers): Increase name by 3 columns and decrease
+	type by the same so that .gcc_except_table fits in the space.
+
+	* readelf.h: Include elf/ppc.h, elf/mips.h, and elf/m32r.h to get
+	machine specific flag bits.
+
+Thu Jun 11 17:54:26 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c: Remove extraneous #includes.  Fix warnings produced
+	by -Wall when compiling under Linux.
+
+	* Makefile.am (readelf_LDADD): Add $(LIBIBERTY).
+
+Thu Jun 11 18:30:20 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* stabs.c (struct stab_handle): Add self_crossref field.
+	(parse_stab_string): If a tag is a cross reference to itself,
+	don't define it in the tags list.
+	(parse_stab_type): Set info->self_crossref.
+
+	* debug.c (struct debug_type_real_list): Define.
+	(debug_get_real_type): Add list parameter.  Change all callers.
+	Check for circularity to avoid crashing when it occurs.
+
+Thu Jun 11 14:48:32 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* readelf.c: New file: Display contents of ELF format file.
+	* readelf.h: New file: Header file for readelf.c
+	* Makefile.am: Add rules to build readelf.
+	* Makefile.in: Rebuilt.
+	* binutils.texi: Document readelf.
+	* NEWS: Mention inclusion of readelf into binutils.
+	* po/POTFILES.in; Rebuilt.
+
+Fri Jun  5 18:43:40 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objcopy.c (setup_section): Adjust the section size if copy_byte
+	is >= 0.
+	(copy_section): Do not call bfd_set_section_size.
+
+Thu Jun  4 09:12:27 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* objcopy.c (copy_usage): Add missing \n\ from help description.
+
+Wed Jun  3 19:31:33 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (YACC): Correct bison -L option.
+	* Makefile.in: Rebuild.
+
+	* binutils.texi, objdump.1: Document -p/--private-headers.
+
+Wed Jun  3 12:09:40 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* objcopy.c: Add new command line options: --change-section-lma
+	and --change-section-vma.  Rename old command line option
+	--adjust-section-vma to --change-section-address.  Rename
+	--adjust-vma to --change-addresses and --adjust-start to
+	--change-start.  Provide aliases to support the old versions of
+	these command line options.
+
+	Change the names of macros and enum elements to upper case to
+	match the GNU coding standard.
+
+	Replace calls to fprintf (stderr,...) with calls to fatal () or
+	non_fatal () as appropriate.
+
+	* objcopy.1: Document command line option changes.
+	* binutils.texi: Document command line option changes.
+
+	* bucomm.h: New exported funtion from bucomm.c: non_fatal().
+	* bucomm.c (non_fatal): New exported function.  Just like fatal()
+	except that it returns rather than calling xexit().
+
+	(bfd_check_format_matches): Call fatal() rather than bfd_fatal().
+
+	(check_matching_formats): Fix C formating.
+
+	(parse_vma): Call fatal().
+
+Mon Jun  1 18:26:40 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	From Yuli Barcohen <yuli.barcohen@telrad.co.il>:
+	* debug.c (debug_type_samep): Avoid endless loops comparing
+	function and method parameter types.
+
+Fri May 22 14:02:42 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* dlltool.c (dump_iat): Comment out; not used.
+	(display): Rename from tell.  Change all callers.
+
+Thu May 14 14:00:56 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* dlltool.c: Add support for Thumb DLLs.  Add support for
+	interworking between ARM and Thumb programs and DLLs.  Tidy the
+	code.
+
+	* binutils.texi: Document dlltool.
+
+	* configure: Build dlltool for thumb-pe targets.
+
+	* version.c (print_version): Include 1998 in copyright strings.
+
+	* stabs.c (parse_stab): Support Win32 style directory separators.
+
+Sun May 10 22:34:44 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* po/Make-in (install-info): New target.
+
+Fri May  8 10:33:13 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* ar.c (usage): Extend information provided about command line
+	options.
+
+Wed May  6 15:28:51 1998  Klaus Kaempf  <kkaempf@progis.de>
+
+	* makefile.vms: Run dec c with /nodebug.  Pass CC value when
+	calling make.
+
+Tue May  5 15:19:00 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* configure: Build dlltool for thumb-pe target.
+	* configure.in: Build dlltool for thumb-pe target.
+
+Sun May  3 22:04:49 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (EXTRA_PROGRAMS): Change $(SRCONV_PROG) to sysconf
+	sysdump coffdump to avoid extra $(EXEEXT).
+	* Makefile.in: Rebuild.
+
+Wed Apr 29 22:22:55 1998  Geoffrey Noer <noer@cygnus.com>
+
+	* configure.in: Stop appending EXEEXT to the end of
+	SRCONV_PROG (wrong because that variable may contain multiple
+	programs)
+	* Makefile.am: instead, add EXEEXTs to each SRCONV_PROG
+	program
+	* Makefile.in: regenerate
+	* configure: regenerate
+
+Tue Apr 28 19:14:34 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* addr2line.c (main): Conditionally call setlocale.
+	* windres.c (main): Likewise.
+	* sysdump.c (main): Likewise.
+	* strings.c (main): Likewise.
+	* srconv.c (main): Likewise.
+	* size.c (main): Likewise.
+	* objdump.c (main): Likewise.
+	* objcopy.c (main): Likewise.
+	* nm.c (main): Likewise.
+	* nlmconv.c (main): Likewise.
+	* dlltool.c (main): Likewise.
+	* coffdump.c (main): Likewise.
+	* ar.c (main): Likewise.
+	* bucomm.h: Include <locale.h> if HAVE_LOCALE_H.
+	(LC_MESSAGES): Now can be defined even when ENABLE_NLS.
+
+Tue Apr 28 10:33:07 1998  Bill Moyer  <ttk@cygnus.com>
+
+	Add support for IMPORTS:
+	* defparse.y (impline): Add IMPORTS syntaxes.
+	* dlltool.c (ifunctype, iheadtype): New typedefs.
+	(import_list): New static variable.
+	(append_import): New static function.
+	(def_import): Add an entry to import_list.
+	(generate_idata_ofile): New static function.
+	(gen_exp_file): Call generate_idata_ofile.
+	* dlltool.h (def_import): Update declaration.
+
+Mon Apr 27 16:39:22 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Change version number to 2.9.4
+	* configure: Rebuild.
+
+Wed Apr 22 16:00:35 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* po/Make-in (MKINSTALLDIRS): Don't look in $(top_srcdir).
+
+Wed Apr 22 00:33:56 1998  Tom Tromey  <tromey@scribbles.cygnus.com>
+
+	* Makefile.am (INCLUDES): Search intl dirs for headers; define
+	LOCALEDIR.
+	* addr2line.c (main): Call setlocale, bindtextdomain, textdomain.
+	* ar.c (main): Likewise.
+	* coffdump.c (main): Likewise.
+	* dlltool.c (main): Likewise.
+	* nlmconv.c (main): Likewise.
+	* nm.c (main): Likewise.
+	* objcopy.c (main): Likewise.
+	* objdump.c (main): Likewise.
+	* size.c (main): Likewise.
+	* srconv.c (main): Likewise.
+	* strings.c (main): Likewise.
+	* sysdump.c (main): Likewise.
+	* windres.c (main): Likewise.
+
+Tue Apr 21 22:13:08 1998  Tom Tromey  <tromey@scribbles.cygnus.com>
+
+	* Many files: Added gettext invocations around user-visible
+	strings.
+	* bucomm.h: Added gettext-related includes and defines.
+	* acconfig.h (ENABLE_NLS, HAVE_CATGETS, HAVE_GETTEXT, HAVE_STPCPY,
+	HAVE_LC_MESSAGES): Define.
+	* configure.in: Call CY_GNU_GETTEXT.  Create po/Makefile.in and
+	po/Makefile.  Use AM_PROG_LEX.
+	* Makefile.am (SUBDIRS): New macro.
+	(POTFILES): Likewise.
+	(po/POTFILES.in): New target.
+	(LDADD): Added INTLLIBS.
+	(objdump_LDADD): Likewise.
+	(c__filt_LDADD): Likewise.
+	(ar_LDADD): Likewise.
+	(ranlib_LDADD): Likewise.
+	(dlltool_LDADD): Likewise.
+	(windres_LDADD): Likewise.
+	* po/Make-in, po/POTFILES.in, po/binutils.pot: New files.
+
+Tue Apr 21 16:07:18 1998  Stanislav Brabec  <utx@k332.feld.cvut.cz>
+
+	* objcopy.c (preserve_dates): New file static variable.
+	(smart_rename): If preserve_dates, call set_times when copying.
+	(strip_main): Remove preserve_dates local variable.
+	(copy_main): Likewise.
+
+Tue Apr  7 15:41:15 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (DISTSTUFF): Add defparse.h, defparse.c, rclex.c,
+	rcparse.h, and rcparse.c
+	* Makefile.in: Rebuild.
+
+Mon Apr  6 16:24:35 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (PROGS): Move $(ADDR2LINE_PROG) to end, so that
+	Makefile.in doesn't have an empty continuation line.
+	(bin_PROGRAMS): Likewise.
+	* Makefile.in: Rebuild.
+
+Fri Apr  3 14:48:42 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (DISTCLEANFILES): Add site.exp and site.bak.
+	(MOSTLYCLEANFILES): Add binutils.log, binutils.sum, and abcdefgh*.
+	(mostlyclean-local): New target.
+	* Makefile.in: Rebuild.
+
+Wed Apr  1 15:54:16 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	From Zack Weinberg <zack@rabi.phys.columbia.edu> and H.J. Lu
+	<hjl@gnu.org>:
+	* ar.c (usage): Mention S modifier.
+	(main): Add S modifier.
+	* ar.1, binutils.texi: Document S modifier.
+
+Wed Apr  1 13:11:23 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* binutils.texi: Use @itemx for a secondary item in a table.
+
+Tue Mar 31 18:44:13 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* dep-in.sed: Add rule to remove @OBJDIR@.
+	* Makefile.am (dep.sed): Substitute for @OBJDIR@.
+	* Makefile.in: Rebuild.
+
+Mon Mar 30 12:47:18 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Set version to 2.9.1.
+	* configure: Rebuild.
+
+	* Branched binutils 2.9.
+
+	* Makefile.am (DISTCLEANFILES): Remove defparse.h, arparse.h,
+	rcparse.h, and nlmheader.h.
+	* Makefile.in: Rebuild.
+
+Sat Mar 28 17:39:27 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (MOSTLYCLEANFILES): Define.
+	* Makefile.in: Rebuild.
+
+	Fix some gcc -Wall warnings:
+	* nlmconv.c (main): Add casts to avoid warnings.
+	(alpha_mangle_relocs): Likewise.
+	* objdump.c (dump_section_stabs): Likewise.
+	* size.c (print_sysv_format): Likewise.
+	* srcconv.c (wr_ob): Likewise.
+	* wrstabs.c (stab_modify_type): Likewise.
+	(stab_variable): Likewise.
+	* nlmconv.c (main): Initialize variables to avoid warnings.
+	* nm.c (sort_symbols_by_size): Likewise.
+	* objdump.c (disassemble_bytes): Likewise.
+	* wrstabs.c (stab_end_class_type): Likewise.
+	* coffgrok.c (do_sections_p2): Change j to unsigned int.
+	(do_lines): Change l to unsigned int.
+	* nlmheader.y (yylex): Change i to unsigned int.
+	* nm.c (print_symbol): Change j to long.
+	* size.c (lprint_number): Comment out.
+	* srconv.c (wr_ob): Change i to bfd_size_type.
+	* sysdump.c (unit_info_list): Comment out.
+	(object_body_list, program_structure, debug_list): Likewise.
+	* sysinfo.y (yyerror): Return value.
+
+Thu Mar 26 17:06:51 1998  Richard Henderson  <rth@cygnus.com>
+
+	* defparse.y (explist): Allow epsilon.
+	Suggestion from Jonathan-Harris@psion.com.
+
+Thu Mar 26 16:59:09 1998  Richard Henderson  <rth@cygnus.com>
+
+	* coffgrok.c (do_sections_p1): Use the section's lma instead of vma
+	for the benefit of prom loaders.
+
+Wed Mar 25 13:05:39 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	Based on patch from H.J. Lu  <hjl@gnu.org>:
+	* Makefile.am (DISTSTUFF): New variable.
+	(diststuff): New target.
+	(DISTCLEANFILES): New variable.
+	* Makefile.in: Rebuild.
+
+Tue Mar 24 19:33:08 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* rclex.l: Accept { and } as synonyms for BEGIN and END.
+
+Fri Mar 20 19:18:08 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aclocal.m4, configure: Rebuild with libtool 1.2.
+
+Tue Feb 24 13:07:50 1998  Doug Evans  <devans@canuck.cygnus.com>
+
+	* objdump.c (disassemble_data): Delete "++place" after call to
+	find_symbol_for_address.  Set disasm_info.symbols to array of
+	symbols at the current address.
+
+Wed Feb 18 23:39:46 1998  Richard Henderson  <rth@cygnus.com>
+
+	* Makefile.am (install-exec-local): Install properly when ln
+	fails or tooldir == prefix.
+
+Tue Feb 17 18:40:55 1998  Richard Henderson  <rth@cygnus.com>
+
+	* objcopy.c (compare_section_lma): Rename from _vma.
+        (copy_object): Gap fill based on LMA not VMA.
+	* binutils.texi: Update and clarify.
+	* objcopy.1: Likewise.
+
+Tue Feb 17 20:34:11 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* dlltool.c (gen_exp_file): Generate _imp__%s as well as __imp_%s,
+	for Microsoft compatibility.
+	(make_one_lib_file): Likewise.
+
+	* dlltool.c (make_one_lib_file): Don't add 1 to hint.
+
+Fri Feb 13 16:37:44 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.am (AUTOMAKE_OPTIONS): Define.
+	* configure, Makefile.in, aclocal.m4: Rebuild with automake 1.2e.
+
+Thu Feb 12 14:13:46 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* deflex.l: Accept '?' in symbol names, for VC++ mangled names.
+	From Mikey <jeffdb@netzone.com>.
+
+	* addr2line.c (usage): Update bug-gnu-utils address.
+	* ar.c (usage): Likewise.
+	* nlmconv.c (show_usage): Likewise.
+	* nm.c (usage): Likewise.
+	* objcopy.c (copy_usage): Likewise.
+	(strip_usage): Likewise.
+	* objdump.c (usage): Likewise.
+	* size.c (usage): Likewise.
+	* strings.c (usage): Likewise.
+	* windres.c (usage): Likewise.
+	* binutils.texi (Bug Reporting): Likewise.
+
+Sat Feb  7 15:36:24 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure, aclocal.m4: Rebuild with new libtool.
+
+Thu Feb  5 12:21:13 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure, Makefile.in, aclocal.m4: Rebuild with new libtool.
+
+Fri Jan 30 19:16:28 1998  Doug Evans  <devans@canuck.cygnus.com>
+
+	* Makefile.am (CC_FOR_TARGET,nlmcomv.o): Change program_transform_name
+	to transform.
+	* Makefile.in: Regenerate.
+
+Thu Jan 29 16:24:04 1998  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* dlltool.c: Define exit status macros for _WIN32 but not
+	__CYGWIN32__.
+	(gen_lib_file): Check for exit status of unlink.
+	* resrc.c: Define popen and pclose if _WIN32 but not
+	__CYGWIN32__.
+
+Wed Jan 28 17:45:46 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Remove vfork check.
+	* nlmconv.c: Never include vfork.h.
+	* aclocal.m4, configure, Makefile.in, config.in: Rebuild.
+
+Wed Jan 28 17:43:02 1998  J.J. van der Heijden <J.J.vanderHeijden@student.utwente.nl>
+
+	* objcopy.c (copy_archive): Only pass one argument to mkdir if
+	_WIN32 but not __CYGWIN32__.
+	(smart_rename): Add code for _WIN32 (not __CYGWIN32__), to cope
+	with different rename behaviour and lack of chown.
+
+	* configure.in: Check for mingw32 when deciding whether to build
+	dlltool.
+	* dlltool.c: Never include vfork.h.
+	(run): Use pexecute rather than vfork.
+	(gen_lib_file): Check for errors from bfd_set_archive_head and
+	bfd_close.  Close all the BFDs in the archive before deleting the
+	temporary files.
+
+Thu Jan 22 16:22:55 1998  Fred Fish  <fnf@cygnus.com>
+
+	* objdump.c (disassemble_bytes): Add flag INSN_HAS_RELOC to tell
+	disassembly function there is a reloc on this line.
+
+Wed Jan 14 15:29:43 1998  Richard Henderson  <rth@cygnus.com>
+
+	* srconv.c (sh, h8300): Delete variables.
+	(addrsize, toolname, rnames): New variables.
+	(writeINT): Use addrsize.
+	(wr_un): Use toolname.
+	(wr_hd): Set up addrsize et al properly for h8300[hs].
+	(walk_tree_symbol): Zero dsy.  Use rnames.
+	(wr_un, wr_hd, wr_ob, wr_du): Use proper bfd access macros.
+	* sysdump.c (sh, h8300): Delete variables.
+	(addrsize): New variable.
+	(getINT): Use it.
+	(getone): Initialize it.
+	(getBITS): Range check on MAX.
+
+For older changes see ChangeLog-9197
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/MAINTAINERS sdcc-3.2.0+dfsg/support/sdbinutils/binutils/MAINTAINERS
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/MAINTAINERS	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/MAINTAINERS	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,265 @@
+		========= Binutils Maintainers =========
+
+This is the list of individuals responsible for maintenance and update
+of the GNU Binary Utilities project.  This includes the linker (ld),
+the assembler (gas), the profiler (gprof), a whole suite of other
+programs (binutils) and the libraries that they use (bfd and
+opcodes).  This project shares a common set of header files with the
+GCC and GDB projects (include), so maintainership of those files is
+shared amoungst the projects.
+
+The home page for binutils is:
+
+  http://www.gnu.org/software/binutils/binutils.html
+
+and patches should be sent to:
+
+  binutils@sourceware.org
+
+with "[Patch]" as part of the subject line.  Note - patches to the
+top level config.guess and config.sub scripts should be sent to:
+
+  config-patches@gnu.org
+
+and not to the binutils lists.  Patches to the other top level
+configure files (configure, configure.in, config-ml.in) should
+be sent to the binutils lists, and copied to the gcc and gdb
+lists as well (gcc-patches@gcc.gnu.org and
+gdb-patches@sourceware.org).
+
+		--------- Blanket Write Privs ---------
+
+The following people have permission to check patches into the
+repository without obtaining approval first:
+
+  Nick Clifton <nickc@redhat.com> (head maintainer)
+  Richard Henderson <rth@redhat.com>
+  Ian Lance Taylor <ian@airs.com>
+  Jeff Law <law@redhat.com>
+  Jim Wilson <wilson@tuliptree.org>
+  DJ Delorie <dj@redhat.com>
+  Alan Modra <amodra@gmail.com>
+  Michael Meissner <gnu@the-meissners.org>
+  Daniel Jacobowitz <drow@false.org>
+  Richard Sandiford <rdsandiford@googlemail.com>
+
+      --------- Maintainers ---------
+
+Maintainers are individuals who are responsible for, and have
+permission to check in changes in, certain subsets of the code.  Note
+that maintainers still need approval to check in changes outside of
+the immediate domain that they maintain.
+
+If there is no maintainer for a given domain then the responsibility
+falls to the head maintainer (above).  If there are several
+maintainers for a given domain then responsibility falls to the first
+maintainer.  The first maintainer is free to devolve that
+responsibility among the other maintainers.
+
+  ALPHA            Richard Henderson <rth@redhat.com>
+  ARM		   Nick Clifton <nickc@redhat.com>
+  ARM		   Richard Earnshaw <rearnsha@arm.com>
+  ARM		   Paul Brook <paul@codesourcery.com>
+  ARM (Symbian)	   Mark Mitchell <mark@codesourcery.com>
+  AVR		   Denis Chertykov <denisc@overta.ru>
+  AVR		   Marek Michalkiewicz <marekm@amelek.gda.pl>
+  BFIN		   Jie Zhang <jzhang918@gmail.com>
+  BFIN		   Bernd Schmidt <bernd.schmidt@analog.com>
+  BFIN		   Mike Frysinger <michael.frysinger@analog.com>
+  BUILD SYSTEM	   Daniel Jacobowitz <drow@false.org>
+  CR16		   M R Swami Reddy <MR.Swami.Reddy@nsc.com>
+  CRIS		   Hans-Peter Nilsson <hp@axis.com>
+  CRX		   M R Swami Reddy <MR.Swami.Reddy@nsc.com>
+  DLX              Nikolaos Kavvadias <nkavv@physics.auth.gr>
+  DWARF2	   Jason Merrill <jason@redhat.com>
+  DWARF2	   Jakub Jelinek <jakub@redhat.com>
+  FR30		   Dave Brolley <brolley@redhat.com>
+  FRV		   Dave Brolley <brolley@redhat.com>
+  FRV		   Alexandre Oliva <aoliva@redhat.com>
+  H8300		   Prafulla Thakare <prafulla.thakare@kpitcummins.com>
+  HPPA		   Dave Anglin <dave.anglin@nrc.ca>
+  HPPA elf32	   Alan Modra <amodra@gmail.com>
+  HPPA elf64	   Jeff Law <law@redhat.com> [Basic maintainance only]
+  IA-64		   Jim Wilson <wilson@tuliptree.org>
+  IQ2000	   Stan Cox <scox@redhat.com>
+  i860		   Jason Eckhardt <jle@rice.edu>
+  ix86		   H.J. Lu <hjl.tools@gmail.com>
+  ix86 PE	   Christopher Faylor <me+binutils@cgf.cx>
+  ix86 COFF	   DJ Delorie <dj@redhat.com>
+  ix86 PE/COFF	   Dave Korn <dave.korn.cygwin@gmail.com>
+  ix86 INTEL MODE  Jan Beulich <jbeulich@novell.com>
+  LM32             Jon Beniston <jon@beniston.com>
+  M32R             Doug Evans <dje@sebabeach.org>
+  M68HC11 M68HC12  Stephane Carrez <stcarrez@nerim.fr>
+  M88k		   Mark Kettenis <kettenis@gnu.org>
+  MACH-O           Tristan Gingold <gingold@adacore.com>
+  MAXQ		   Inderpreet Singh <inderpreetb@noida.hcltech.com>
+  MEP		   Dave Brolley <brolley@redhat.com>
+  MICROBLAZE	   Michael Eager <eager@eagercon.com>
+  MIPS		   Eric Christopher <echristo@apple.com>
+  MMIX		   Hans-Peter Nilsson <hp@bitrange.com>
+  MN10300	   Eric Christopher <echristo@apple.com>
+  MN10300	   Alexandre Oliva <aoliva@redhat.com>
+  Moxie		   Anthony Green <green@moxielogic.com>
+  MSP430	   Dmitry Diky <diwil@spec.ru>
+  NetBSD support   Matt Thomas <matt@netbsd.org>
+  PPC		   Geoff Keating <geoffk@geoffk.org>
+  PPC		   Alan Modra <amodra@gmail.com>
+  PPC vector ext   Aldy Hernandez <aldyh@redhat.com>
+  RX               DJ Delorie <dj@redhat.com>
+  RX               Nick Clifton <nickc@redhat.com>
+  s390, s390x	   Martin Schwidefsky <schwidefsky@de.ibm.com>
+  SCORE		   Mei Ligang <ligang@sunnorth.com.cn>
+  SH		   Alexandre Oliva <aoliva@redhat.com>
+  SH		   Kaz Kojima <kkojima@rr.iij4u.or.jp>
+  SPARC		   David S. Miller <davem@davemloft.net>
+  SPU		   Alan Modra <amodra@gmail.com>
+  TIC4X            Svein Seldal <svein@dev.seldal.com>
+  TIC54X           Timothy Wall <twall@alum.mit.edu>
+  TIC6X            Joseph Myers <joseph@codesourcery.com>
+  VAX		   Matt Thomas <matt@netbsd.org>
+  VAX		   Jan-Benedict Glaw <jbglaw@lug-owl.de>
+  VMS		   Tristan Gingold <gingold@adacore.com>
+  x86_64	   Jan Hubicka <jh@suse.cz>
+  x86_64	   Andreas Jaeger <aj@suse.de>
+  x86_64	   H.J. Lu <hjl.tools@gmail.com>
+  XCOFF 	   Richard Sandiford <r.sandiford@uk.ibm.com>
+  Xtensa	   Sterling Augustine <augustine.sterling@gmail.com> 
+  z80		   Arnold Metselaar <arnold.metselaar@planet.nl>
+  z8k		   Christian Groessler <chris@groessler.org>
+
+
+      --------- CGEN Maintainers -------------
+
+CGEN is a tool for building, amongst other things, assemblers,
+disassemblers and simulators from a single description of a CPU.
+It creates files in several of the binutils directories, but it
+is mentioned here since there is a single group that maintains
+CGEN and the files that it creates.
+
+If you have CGEN related problems you can send email to;
+
+   cgen@sourceware.org
+
+The current CGEN maintainers are:
+
+  Doug Evans, Frank Eigler
+
+     --------- Write After Approval ---------
+
+Individuals with "write after approval" have the ability to check in
+changes, but they must get approval for each change from someone in
+one of the above lists (blanket write or maintainers).
+
+[It's a huge list, folks.  You know who you are.  If you have the
+ *ability* to do binutils checkins, you're in this group.  Just
+ remember to get approval before checking anything in.]
+
+     -------------  Obvious Fixes -------------
+
+Fixes for obvious mistakes do not need approval, and can be checked in
+right away, but the patch should still be sent to the binutils list.
+The definition of obvious is a bit hazy, and if you are not sure, then
+you should seek approval first.  Obvious fixes include fixes for
+spelling mistakes, blatantly incorrect code (where the correct code is
+also blatantly obvious), and so on.  Obvious fixes should always be
+small, the larger they are, the more likely it is that they contain
+some un-obvious side effect or consequence.
+
+    --------- Branch Checkins ---------
+
+If a patch is approved for check in to the mainline sources, it can
+also be checked into the current release branch.  Normally however
+only bug fixes should be applied to the branch.  New features, new
+ports, etc, should be restricted to the mainline.  (Otherwise the
+burden of maintaining the branch in sync with the mainline becomes too
+great).  If you are uncertain as to whether a patch is appropriate for
+the branch, ask the branch maintainer.  This is:
+
+   Tristan Gingold  <gingold@adacore.com>
+
+    -------- Testsuites ---------------
+
+In general patches to any of the binutils testsuites should be
+considered generic and sent to the binutils mailing list for
+approval.  Patches to target specific tests are the responsibility the
+relevent port maintainer(s), and can be approved/checked in by them.
+Other testsuite patches need the approval of a blanket-write-priveleges
+person.
+
+    -------- Configure patches ----------
+
+Patches to the top level configure files (config.sub & config.guess)
+are not the domain of the binutils project and they cannot be approved
+by the binutils group.  Instead they should be submitted to the config
+maintainer at:
+
+	config-patches@gnu.org
+
+    --------- Creating Branches ---------
+
+Anyone with at least write-after-approval access may create a branch
+to use for their own development purposes.  In keeping with FSF
+policies, all patches applied to such a branch must come from people
+with appropriate copyright assignments on file.  All legal
+requirements that would apply to any other contribution apply equally
+to contributions on a branch.
+
+Before creating the branch, you should select a name for the branch of
+the form:
+
+  binutils-<org>-<name>
+
+where "org" is the initials of your organization, or your own initials
+if you are acting as an individual.  For example, for a branch created
+by The GNUDist Company, "tgc" would be an appropriate choice for
+"org".  It's up to each organization to select an appropriate choice
+for "name"; some organizations may use more structure than others, so
+"name" may contain additional hyphens.
+
+Suppose that The GNUDist Company was creating a branch to develop a
+port of Binutils to the FullMonty processor.  Then, an appropriate
+choice of branch name would be:
+
+  binutils-tgc-fm
+
+A date stamp is not required as part of the name field, but some
+organizations like to have one.  If you do include the date, you
+should follow these rules:
+
+1. The date should be the date that the branch was created.
+
+2. The date should be numerical and in the form YYYYMMDD.
+
+For example:
+
+  binutils-tgc-fm_20050101
+
+would be appropriate if the branch was created on January 1st, 2005.
+
+Having selected the branch name, create the branch as follows:
+
+1. Check out binutils, so that you have a CVS checkout corresponding
+   to the initial state of your branch.
+
+2. Create a tag:
+
+     cvs tag binutils-<org>-<name>-branchpoint
+
+   That tag will allow you, and others, to easily determine what's
+   changed on the branch relative to the initial state.
+
+3. Create the branch:
+
+     cvs rtag -b -r binutils-<org>-<name>-branchpoint \
+       binutils-<org>-<name>-branch
+
+4. Document the branch:
+
+     Add a description of the branch to binutils/BRANCHES, and check
+     that file in.  All branch descriptions should be added to the
+     HEAD revision of the file; it doesn't help to modify
+     binutils/BRANCHES on a branch!
+
+Please do not commit any patches to a branch you did not create
+without the explicit permission of the person who created the branch.
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/Makefile.am sdcc-3.2.0+dfsg/support/sdbinutils/binutils/Makefile.am
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/Makefile.am	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/Makefile.am	2012-05-06 09:49:14.000000000 +0000
@@ -0,0 +1,555 @@
+## Process this file with automake to generate Makefile.in
+
+AUTOMAKE_OPTIONS = dejagnu no-dist foreign
+ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
+
+####SUBDIRS = doc po
+SUBDIRS =
+
+tooldir = $(exec_prefix)/$(target_alias)
+
+## These aren't set by automake, because they appear in
+## bfd/acinclude.m4, which is included by binutils/acinclude.m4, and
+## thus is not seen by automake.
+CC_FOR_BUILD = @CC_FOR_BUILD@
+EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
+
+YACC = `if [ -f ../bison/bison ]; then echo ../bison/bison -y -L$(srcdir)/../bison/; else echo @YACC@; fi`
+YFLAGS = -d
+LEX = `if [ -f ../flex/flex ]; then echo ../flex/flex; else echo @LEX@; fi`
+
+# Automake 1.10+ disables lex and yacc output file regeneration if
+# maintainer mode is disabled.  Avoid this.
+am__skiplex =
+am__skipyacc =
+
+WARN_CFLAGS = @WARN_CFLAGS@
+NO_WERROR = @NO_WERROR@
+AM_CFLAGS = $(WARN_CFLAGS)
+LIBICONV = @LIBICONV@
+
+# these two are almost the same program
+####AR_PROG=ar
+####RANLIB_PROG=ranlib
+SDAR_PROG=sdar
+SDRANLIB_PROG=sdranlib
+
+# objcopy and strip should be the same program
+####OBJCOPY_PROG=objcopy
+####STRIP_PROG=strip-new
+
+####STRINGS_PROG=strings
+
+####READELF_PROG=readelf
+
+####ELFEDIT_PROG=elfedit
+
+# These should all be the same program too.
+####SIZE_PROG=size
+SDNM_PROG=sdnm
+####OBJDUMP_PROG=objdump
+
+# This is the demangler, as a standalone program.
+# Note: This one is used as the installed name too, unlike the above.
+####DEMANGLER_PROG=cxxfilt
+
+####ADDR2LINE_PROG=addr2line
+
+####NLMCONV_PROG=nlmconv
+####DLLTOOL_PROG=dlltool
+####WINDRES_PROG=windres
+####WINDMC_PROG=windmc
+####DLLWRAP_PROG=dllwrap
+
+####SRCONV_PROG=srconv$(EXEEXT) sysdump$(EXEEXT) coffdump$(EXEEXT)
+
+#bin_PROGRAMS = $(SIZE_PROG) $(OBJDUMP_PROG) $(AR_PROG) $(STRINGS_PROG) $(RANLIB_PROG) $(OBJCOPY_PROG) @BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ @BUILD_WINDMC@ $(ADDR2LINE_PROG) $(READELF_PROG) $(ELFEDIT_PROG) @BUILD_DLLWRAP@
+####bin_PROGRAMS = $(AR_PROG) $(RANLIB_PROG)
+bin_PROGRAMS = $(SDAR_PROG) $(SDRANLIB_PROG)
+
+bin_SCRIPTS = @BUILD_INSTALL_MISC@
+EXTRA_SCRIPTS = embedspu
+
+## We need a special rule to install the programs which are built with
+## -new, and to rename cxxfilt to c++filt.
+####RENAMED_PROGS = $(NM_PROG) $(STRIP_PROG) $(DEMANGLER_PROG)
+RENAMED_PROGS = $(SDNM_PROG)
+noinst_PROGRAMS = $(RENAMED_PROGS) @BUILD_MISC@
+
+####EXTRA_PROGRAMS = $(NLMCONV_PROG) srconv sysdump coffdump $(DLLTOOL_PROG) $(WINDRES_PROG) $(WINDMC_PROG) $(DLLWRAP_PROG)
+EXTRA_PROGRAMS =
+
+# Stuff that goes in tooldir/ if appropriate.
+####TOOL_PROGS = nm-new strip-new ar ranlib dlltool objdump objcopy
+TOOL_PROGS = sdnm ar ranlib
+
+BASEDIR = $(srcdir)/..
+BFDDIR = $(BASEDIR)/bfd
+INCDIR	= $(BASEDIR)/include
+
+AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \
+	 @HDEFINES@ \
+	 @INCINTL@ \
+	 -DLOCALEDIR="\"$(datadir)/locale\"" \
+	 -Dbin_dummy_emulation=$(EMULATION_VECTOR)
+
+####++HFILES = \
+####	arsup.h binemul.h bucomm.h budbg.h \
+####	coffgrok.h debug.h dlltool.h dwarf.h elfcomm.h nlmconv.h \
+####	objdump.h sysdep.h unwind-ia64.h windres.h winduni.h windint.h \
+####	windmc.h
+
+HFILES = \
+	arsup.h binemul.h bucomm.h sysdep.h
+
+####++GENERATED_HFILES = arparse.h sysroff.h sysinfo.h defparse.h rcparse.h mcparse.h
+GENERATED_HFILES = arparse.h
+
+####++BUILT_SOURCES = $(GENERATED_HFILES)
+
+BUILT_SOURCES = $(GENERATED_HFILES)
+
+####++CFILES = \
+####	addr2line.c ar.c arsup.c bin2c.c binemul.c bucomm.c \
+####	coffdump.c coffgrok.c cxxfilt.c \
+####	dwarf.c debug.c dlltool.c dllwrap.c \
+####	elfcomm.c emul_aix.c emul_vanilla.c filemode.c \
+####	ieee.c is-ranlib.c is-strip.c maybe-ranlib.c maybe-strip.c \
+####	nlmconv.c nm.c not-ranlib.c not-strip.c \
+####	objcopy.c objdump.c prdbg.c \
+####	od-xcoff.c \
+####	rclex.c rdcoff.c rddbg.c readelf.c rename.c \
+####	resbin.c rescoff.c resrc.c resres.c \
+####	size.c srconv.c stabs.c strings.c sysdump.c \
+####	unwind-ia64.c elfedit.c version.c \
+####	windres.c winduni.c wrstabs.c \
+####	windmc.c mclex.c
+
+CFILES = \
+	ar.c arsup.c binemul.c bucomm.c emul_vanilla.c filemode.c nm.c \
+	not-ranlib.c rename.c version.c 
+
+####++GENERATED_CFILES = \
+####	arparse.c arlex.c sysroff.c sysinfo.c syslex.c \
+####	defparse.c deflex.c nlmheader.c rcparse.c mcparse.c
+
+GENERATED_CFILES = \
+	arparse.c arlex.c
+
+####DEBUG_SRCS = rddbg.c debug.c stabs.c ieee.c rdcoff.c
+####WRITE_DEBUG_SRCS = $(DEBUG_SRCS) wrstabs.c
+
+##### Extra object files for objdump
+####OBJDUMP_PRIVATE_OFILES = @OBJDUMP_PRIVATE_OFILES@
+
+# Code shared by all the binutils.
+BULIBS = bucomm.c version.c filemode.c
+
+# Code shared by the ELF related programs.
+####ELFLIBS = elfcomm.c
+
+BFDLIB = ../bfd/libbfd.la
+
+####OPCODES = ../opcodes/libopcodes.la
+
+LIBIBERTY = ../libiberty/libiberty.a
+
+####POTFILES = $(CFILES) $(DEBUG_SRCS) $(HFILES)
+####po/POTFILES.in: @MAINT@ Makefile
+####	for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \
+####	  && mv tmp $(srcdir)/po/POTFILES.in
+
+EXPECT = expect
+RUNTEST = runtest
+
+CC_FOR_TARGET = ` \
+  if [ -f $$r/../gcc/xgcc ] ; then \
+    if [ -f $$r/../newlib/Makefile ] ; then \
+      echo $$r/../gcc/xgcc -B$$r/../gcc/ -idirafter $$r/../newlib/targ-include -idirafter $${srcroot}/../newlib/libc/include -nostdinc; \
+    else \
+      echo $$r/../gcc/xgcc -B$$r/../gcc/; \
+    fi; \
+  else \
+    if [ "@host@" = "@target@" ] ; then \
+      echo $(CC); \
+    else \
+      echo gcc | sed '$(transform)'; \
+    fi; \
+  fi`
+
+####check-DEJAGNU: site.exp
+####	srcdir=`cd $(srcdir) && pwd`; export srcdir; \
+####	r=`pwd`; export r; \
+####	EXPECT=$(EXPECT); export EXPECT; \
+####	runtest=$(RUNTEST); \
+####	if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
+####	  CC_FOR_TARGET="$(CC_FOR_TARGET)" CFLAGS_FOR_TARGET="$(CFLAGS)" \
+####		$$runtest --tool $(DEJATOOL) --srcdir $${srcdir}/testsuite \
+####			$(RUNTESTFLAGS); \
+####	else echo "WARNING: could not find \`runtest'" 1>&2; :;\
+####	fi
+
+installcheck-local:
+	/bin/sh $(srcdir)/sanity.sh $(bindir)
+
+# There's no global DEPENDENCIES.  So, we must explicitly list everything
+# which depends on libintl, since we don't know whether LIBINTL_DEP will be
+# non-empty until configure time.  Ugh!
+####size_DEPENDENCIES =      $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####objdump_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) $(OPCODES) $(OBJDUMP_PRIVATE_OFILES)
+sdnm_DEPENDENCIES =      $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####ar_DEPENDENCIES =        $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+sdar_DEPENDENCIES =      $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####strings_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####strip_new_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####ranlib_DEPENDENCIES =    $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+sdranlib_DEPENDENCIES =  $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####cxxfilt_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####objcopy_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####nlmconv_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####srconv_DEPENDENCIES =    $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####sysdump_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####coffdump_DEPENDENCIES =  $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####dlltool_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####windres_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####windmc_DEPENDENCIES =    $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####addr2line_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####readelf_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY)
+####elfedit_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY)
+####dllwrap_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY)
+
+LDADD = $(BFDLIB) $(LIBIBERTY) $(LIBINTL)
+
+####size_SOURCES = size.c $(BULIBS)
+
+####objcopy_SOURCES = objcopy.c not-strip.c rename.c $(WRITE_DEBUG_SRCS) $(BULIBS)
+
+####strings_SOURCES = strings.c $(BULIBS)
+
+####readelf_SOURCES = readelf.c version.c unwind-ia64.c dwarf.c $(ELFLIBS)
+####readelf_LDADD   = $(LIBINTL) $(LIBIBERTY)
+
+####elfedit_SOURCES = elfedit.c version.c $(ELFLIBS)
+####elfedit_LDADD = $(LIBINTL) $(LIBIBERTY)
+
+####strip_new_SOURCES = objcopy.c is-strip.c rename.c $(WRITE_DEBUG_SRCS) $(BULIBS)
+
+sdnm_SOURCES = nm.c $(BULIBS)
+
+####objdump_SOURCES = objdump.c dwarf.c prdbg.c $(DEBUG_SRCS) $(BULIBS) $(ELFLIBS)
+####EXTRA_objdump_SOURCES = od-xcoff.c
+####objdump_LDADD = $(OBJDUMP_PRIVATE_OFILES) $(OPCODES) $(BFDLIB) $(LIBIBERTY) $(LIBINTL)
+####
+####objdump.@OBJEXT@:objdump.c
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $(OBJDUMP_DEFS) $(srcdir)/objdump.c
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='objdump.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c $(OBJDUMP_DEFS) $(srcdir)/objdump.c
+####endif
+
+####cxxfilt_SOURCES = cxxfilt.c $(BULIBS)
+
+####ar_SOURCES = arparse.y arlex.l ar.c not-ranlib.c arsup.c rename.c binemul.c \
+####	emul_$(EMULATION).c $(BULIBS)
+####EXTRA_ar_SOURCES = $(CFILES)
+####ar_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL)
+sdar_SOURCES = arparse.y arlex.l ar.c not-ranlib.c arsup.c rename.c binemul.c \
+	emul_$(EMULATION).c $(BULIBS)
+EXTRA_sdar_SOURCES = $(CFILES)
+sdar_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL)
+
+####ranlib_SOURCES = ar.c is-ranlib.c arparse.y arlex.l arsup.c rename.c \
+####	binemul.c emul_$(EMULATION).c $(BULIBS)
+####ranlib_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL)
+sdranlib_SOURCES = ar.c is-ranlib.c arparse.y arlex.l arsup.c rename.c \
+	binemul.c emul_$(EMULATION).c $(BULIBS)
+sdranlib_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL)
+
+####addr2line_SOURCES = addr2line.c $(BULIBS)
+
+# The following is commented out for the conversion to automake.
+# This rule creates a single binary that switches between ar and ranlib
+# by looking at argv[0].  Use this kludge to save some disk space.
+# However, you have to install things by hand.
+# (That is after 'make install', replace the installed ranlib by a link to ar.)
+# Alternatively, you can install ranlib.sh as ranlib.
+# ar_with_ranlib: $(ADDL_DEPS) ar.o maybe-ranlib.o
+#	$(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(AR_PROG) ar.o maybe-ranlib.o $(ADDL_LIBS) $(EXTRALIBS)
+#	-rm -f $(RANLIB_PROG)
+#	-ln $(AR_PROG) $(RANLIB_PROG)
+#
+# objcopy and strip in one binary that uses argv[0] to decide its action.
+#
+#objcopy_with_strip: $(ADDL_DEPS) objcopy.o maybe-strip.o
+#	$(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(OBJCOPY_PROG) objcopy.o maybe-strip.o $(ADDL_LIBS) $(EXTRALIBS)
+#	-rm -f $(STRIP_PROG)
+#	-ln $(OBJCOPY_PROG) $(STRIP_PROG)
+
+####sysroff.c: sysinfo$(EXEEXT_FOR_BUILD) sysroff.info
+####	./sysinfo$(EXEEXT_FOR_BUILD) -c <$(srcdir)/sysroff.info >sysroff.c
+####	./sysinfo$(EXEEXT_FOR_BUILD) -i <$(srcdir)/sysroff.info >>sysroff.c
+####	./sysinfo$(EXEEXT_FOR_BUILD) -g <$(srcdir)/sysroff.info >>sysroff.c
+
+####sysroff.h: sysinfo$(EXEEXT_FOR_BUILD) sysroff.info
+####	./sysinfo$(EXEEXT_FOR_BUILD) -d <$(srcdir)/sysroff.info >sysroff.h
+
+####sysinfo$(EXEEXT_FOR_BUILD): sysinfo.@OBJEXT@ syslex.@OBJEXT@
+####	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.@OBJEXT@ syslex.@OBJEXT@
+
+####syslex.@OBJEXT@: syslex.c sysinfo.h config.h
+####	if [ -r syslex.c ]; then \
+####	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) syslex.c ; \
+####	else \
+####	  $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex.c ;\
+####	fi
+
+####sysinfo.@OBJEXT@: sysinfo.c
+####	if [ -r sysinfo.c ]; then \
+####	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) sysinfo.c ; \
+####	else \
+####	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/sysinfo.c ; \
+####	fi
+
+####bin2c$(EXEEXT_FOR_BUILD): bin2c.c
+####	$(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c
+
+####embedspu: embedspu.sh Makefile
+####	awk '/^program_transform_name=/ {print "program_transform_name=\"$(program_transform_name)\""; next} {print}' < $< > $@
+####	chmod a+x $@
+
+# We need these for parallel make.
+####sysinfo.h: sysinfo.c
+
+# Disable -Werror, if it has been enabled, since old versions of bison/
+# yacc will produce working code which contain compile time warnings.
+arparse.@OBJEXT@: arparse.c
+if am__fastdepCC
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f arparse.c || echo $(srcdir)/`arparse.c $(NO_WERROR)
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+else
+if AMDEP
+	source='arparse.c' object='$@' libtool=no @AMDEPBACKSLASH@
+	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif
+	$(COMPILE) -c `test -f arparse.c || echo $(srcdir)/`arparse.c $(NO_WERROR)
+endif
+
+arlex.@OBJEXT@: arlex.c
+if am__fastdepCC
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f arlex.c || echo $(srcdir)/`arlex.c $(NO_WERROR)
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+else
+if AMDEP
+	source='arlex.c' object='$@' libtool=no @AMDEPBACKSLASH@
+	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif
+	$(COMPILE) -c `test -f arlex.c || echo $(srcdir)/`arlex.c $(NO_WERROR)
+endif
+
+####sysroff.@OBJEXT@: sysroff.c
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f sysroff.c || echo $(srcdir)/`sysroff.c $(NO_WERROR)
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='sysroff.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c `test -f sysroff.c || echo $(srcdir)/`sysroff.c $(NO_WERROR)
+####endif
+
+####defparse.@OBJEXT@: defparse.c
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f defparse.c || echo $(srcdir)/`defparse.c $(NO_WERROR)
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='defparse.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c `test -f defparse.c || echo $(srcdir)/`defparse.c $(NO_WERROR)
+####endif
+
+####deflex.@OBJEXT@: deflex.c
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f deflex.c || echo $(srcdir)/`deflex.c $(NO_WERROR)
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='deflex.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c `test -f deflex.c || echo $(srcdir)/`deflex.c $(NO_WERROR)
+####endif
+
+####nlmheader.@OBJEXT@: nlmheader.c
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f nlmheader.c || echo $(srcdir)/`nlmheader.c $(NO_WERROR)
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='nlmheader.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c `test -f nlmheader.c || echo $(srcdir)/`nlmheader.c $(NO_WERROR)
+####endif
+
+####rcparse.@OBJEXT@: rcparse.c
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f rcparse.c || echo $(srcdir)/`rcparse.c $(NO_WERROR)
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='rcparse.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c `test -f rcparse.c || echo $(srcdir)/`rcparse.c $(NO_WERROR)
+####endif
+
+####mcparse.@OBJEXT@: mcparse.c
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f mcparse.c || echo $(srcdir)/`mcparse.c $(NO_WERROR)
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='mcparse.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c `test -f mcparse.c || echo $(srcdir)/`mcparse.c $(NO_WERROR)
+####endif
+
+####rclex.@OBJEXT@: rclex.c
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $(srcdir)/rclex.c $(NO_WERROR)
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='rclex.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c $(srcdir)/rclex.c $(NO_WERROR)
+####endif
+
+####mclex.@OBJEXT@: mclex.c
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $(srcdir)/mclex.c $(NO_WERROR)
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='mclex.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c $(srcdir)/mclex.c $(NO_WERROR)
+####endif
+
+####srconv_SOURCES = srconv.c coffgrok.c $(BULIBS)
+####srconv.@OBJEXT@: sysroff.c
+
+####dlltool_SOURCES = dlltool.c defparse.y deflex.l $(BULIBS)
+####dlltool_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL)
+
+####dlltool.@OBJEXT@:
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@  $(DLLTOOL_DEFS) $(srcdir)/dlltool.c
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='dlltool.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c $(DLLTOOL_DEFS) $(srcdir)/dlltool.c
+####endif
+
+####rescoff.@OBJEXT@:
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@  $(DLLTOOL_DEFS) $(srcdir)/rescoff.c
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='rescoff.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c $(DLLTOOL_DEFS) $(srcdir)/rescoff.c
+####endif
+
+####coffdump_SOURCES = coffdump.c coffgrok.c $(BULIBS)
+
+####sysdump_SOURCES = sysdump.c $(BULIBS)
+####sysdump.@OBJEXT@: sysroff.c
+
+##### coff/sym.h and coff/ecoff.h won't be found by the automatic dependency
+##### scripts, since they are only included conditionally.
+####nlmconv.@OBJEXT@: nlmconv.c
+####if am__fastdepCC
+####	ldname=`echo ld | sed '$(transform)'`; \
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ \
+####	  -DLD_NAME="\"$${ldname}\"" @NLMCONV_DEFS@ $(srcdir)/nlmconv.c
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='nlmconv.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	ldname=`echo ld | sed '$(transform)'`; \
+####	$(COMPILE) -c -DLD_NAME="\"$${ldname}\"" @NLMCONV_DEFS@ $(srcdir)/nlmconv.c
+####endif
+
+####nlmconv_SOURCES = nlmconv.c nlmheader.y $(BULIBS)
+
+####windres_SOURCES = windres.c resrc.c rescoff.c resbin.c rcparse.y rclex.c \
+####	winduni.c resres.c $(BULIBS)
+####windres_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL) $(LIBICONV)
+
+####windmc_SOURCES = windmc.c mcparse.y mclex.c \
+####	winduni.c $(BULIBS)
+####windmc_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL) $(LIBICONV)
+
+####dllwrap_SOURCES = dllwrap.c version.c
+####dllwrap_LDADD = $(LIBIBERTY) $(LIBINTL)
+
+
+EXTRA_DIST = arparse.c arparse.h arlex.c nlmheader.c sysinfo.c sysinfo.h \
+	syslex.c deflex.c defparse.h defparse.c rcparse.h rcparse.c \
+	mcparse.h mcparse.c embedspu.sh
+
+diststuff: $(EXTRA_DIST) info
+all: info
+
+# We extract version from bfd/configure.in, make sure to rerun configure
+# when BFD's version changes.
+CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in
+
+DISTCLEANFILES = sysroff.c sysroff.h site.exp site.bak embedspu
+
+MOSTLYCLEANFILES = sysinfo$(EXEEXT_FOR_BUILD) bin2c$(EXEEXT_FOR_BUILD) \
+  binutils.log binutils.sum abcdefgh*
+mostlyclean-local:
+	-rm -rf tmpdir
+
+.PHONY: install-exec-local
+
+install-exec-local: install-binPROGRAMS $(bin_PROGRAMS) $(noinst_PROGRAMS)
+	@list='$(RENAMED_PROGS)'; for p in $$list; do \
+	  if test -f $$p$(EXEEXT); then \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p$(EXEEXT) $(bindir)/`echo $$p|sed -e 's/-new//' -e 's/cxxfilt/$(DEMANGLER_NAME)/'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p$(EXEEXT) $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/-new//' -e 's/cxxfilt/$(DEMANGLER_NAME)/'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  else :; fi; \
+	done
+####	$(mkinstalldirs) $(DESTDIR)$(tooldir)/bin
+####	for i in $(TOOL_PROGS); do \
+####	  if [ -f $$i$(EXEEXT) ]; then \
+####	    j=`echo $$i | sed -e 's/-new//'`; \
+####	    k=`echo $$j | sed '$(transform)'`; \
+####	    if [ "$(bindir)/$$k" != "$(tooldir)/bin/$$j" ]; then \
+####	      rm -f $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT); \
+####	      ln $(DESTDIR)$(bindir)/$$k$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT) >/dev/null 2>/dev/null \
+####		|| $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT); \
+####	    fi; \
+####	  else true; \
+####	  fi; \
+####	done
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/Makefile.in sdcc-3.2.0+dfsg/support/sdbinutils/binutils/Makefile.in
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/Makefile.in	2012-05-06 09:49:14.000000000 +0000
@@ -0,0 +1,1341 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
+noinst_PROGRAMS = $(am__EXEEXT_4) @BUILD_MISC@
+EXTRA_PROGRAMS =
+subdir = .
+DIST_COMMON = NEWS README ChangeLog $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(srcdir)/config.in \
+	$(srcdir)/../mkinstalldirs arparse.h arparse.c arlex.c \
+	arparse.h arparse.c arlex.c $(srcdir)/../depcomp \
+	$(srcdir)/../ylwrap
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \
+	$(top_srcdir)/../config/zlib.m4 \
+	$(top_srcdir)/../bfd/warning.m4 \
+	$(top_srcdir)/../config/depstand.m4 \
+	$(top_srcdir)/../config/gettext-sister.m4 \
+	$(top_srcdir)/../config/iconv.m4 \
+	$(top_srcdir)/../config/largefile.m4 \
+	$(top_srcdir)/../config/lead-dot.m4 \
+	$(top_srcdir)/../config/lib-ld.m4 \
+	$(top_srcdir)/../config/lib-link.m4 \
+	$(top_srcdir)/../config/lib-prefix.m4 \
+	$(top_srcdir)/../config/nls.m4 \
+	$(top_srcdir)/../config/override.m4 \
+	$(top_srcdir)/../config/plugins.m4 \
+	$(top_srcdir)/../config/po.m4 \
+	$(top_srcdir)/../config/progtest.m4 \
+	$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
+	$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
+	$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__EXEEXT_1 = sdar$(EXEEXT)
+am__EXEEXT_2 = sdranlib$(EXEEXT)
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
+am__EXEEXT_3 = sdnm$(EXEEXT)
+am__EXEEXT_4 = $(am__EXEEXT_3)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+am__objects_1 = bucomm.$(OBJEXT) version.$(OBJEXT) filemode.$(OBJEXT)
+am_sdar_OBJECTS = arparse.$(OBJEXT) arlex.$(OBJEXT) ar.$(OBJEXT) \
+	not-ranlib.$(OBJEXT) arsup.$(OBJEXT) rename.$(OBJEXT) \
+	binemul.$(OBJEXT) emul_$(EMULATION).$(OBJEXT) $(am__objects_1)
+sdar_OBJECTS = $(am_sdar_OBJECTS)
+am__DEPENDENCIES_1 =
+am_sdnm_OBJECTS = nm.$(OBJEXT) $(am__objects_1)
+sdnm_OBJECTS = $(am_sdnm_OBJECTS)
+sdnm_LDADD = $(LDADD)
+am_sdranlib_OBJECTS = ar.$(OBJEXT) is-ranlib.$(OBJEXT) \
+	arparse.$(OBJEXT) arlex.$(OBJEXT) arsup.$(OBJEXT) \
+	rename.$(OBJEXT) binemul.$(OBJEXT) emul_$(EMULATION).$(OBJEXT) \
+	$(am__objects_1)
+sdranlib_OBJECTS = $(am_sdranlib_OBJECTS)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+SCRIPTS = $(bin_SCRIPTS)
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/../depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+@MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
+LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
+LTLEXCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+YLWRAP = $(top_srcdir)/../ylwrap
+@MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ ||
+YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
+SOURCES = $(sdar_SOURCES) $(EXTRA_sdar_SOURCES) $(sdnm_SOURCES) \
+	$(sdranlib_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS
+ETAGS = etags
+CTAGS = ctags
+DEJATOOL = $(PACKAGE)
+RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
+DIST_SUBDIRS = $(SUBDIRS)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_DLLTOOL = @BUILD_DLLTOOL@
+BUILD_DLLWRAP = @BUILD_DLLWRAP@
+BUILD_INSTALL_MISC = @BUILD_INSTALL_MISC@
+BUILD_MISC = @BUILD_MISC@
+BUILD_NLMCONV = @BUILD_NLMCONV@
+BUILD_SRCONV = @BUILD_SRCONV@
+BUILD_WINDMC = @BUILD_WINDMC@
+BUILD_WINDRES = @BUILD_WINDRES@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEMANGLER_NAME = @DEMANGLER_NAME@
+DEPDIR = @DEPDIR@
+DLLTOOL_DEFS = @DLLTOOL_DEFS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EMULATION = @EMULATION@
+EMULATION_VECTOR = @EMULATION_VECTOR@
+EXEEXT = @EXEEXT@
+EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
+FGREP = @FGREP@
+GENCAT = @GENCAT@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HDEFINES = @HDEFINES@
+INCINTL = @INCINTL@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = `if [ -f ../flex/flex ]; then echo ../flex/flex; else echo @LEX@; fi`
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBINTL_DEP = @LIBINTL_DEP@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NLMCONV_DEFS = @NLMCONV_DEFS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NO_WERROR = @NO_WERROR@
+OBJDUMP = @OBJDUMP@
+OBJDUMP_DEFS = @OBJDUMP_DEFS@
+OBJDUMP_PRIVATE_OFILES = @OBJDUMP_PRIVATE_OFILES@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+YACC = `if [ -f ../bison/bison ]; then echo ../bison/bison -y -L$(srcdir)/../bison/; else echo @YACC@; fi`
+YFLAGS = -d
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = dejagnu no-dist foreign
+ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
+
+####SUBDIRS = doc po
+SUBDIRS = 
+tooldir = $(exec_prefix)/$(target_alias)
+
+# Automake 1.10+ disables lex and yacc output file regeneration if
+# maintainer mode is disabled.  Avoid this.
+am__skiplex = 
+am__skipyacc = 
+AM_CFLAGS = $(WARN_CFLAGS)
+
+# these two are almost the same program
+####AR_PROG=ar
+####RANLIB_PROG=ranlib
+SDAR_PROG = sdar
+SDRANLIB_PROG = sdranlib
+
+# objcopy and strip should be the same program
+####OBJCOPY_PROG=objcopy
+####STRIP_PROG=strip-new
+
+####STRINGS_PROG=strings
+
+####READELF_PROG=readelf
+
+####ELFEDIT_PROG=elfedit
+
+# These should all be the same program too.
+####SIZE_PROG=size
+SDNM_PROG = sdnm
+bin_SCRIPTS = @BUILD_INSTALL_MISC@
+EXTRA_SCRIPTS = embedspu
+
+####RENAMED_PROGS = $(NM_PROG) $(STRIP_PROG) $(DEMANGLER_PROG)
+RENAMED_PROGS = $(SDNM_PROG)
+
+# Stuff that goes in tooldir/ if appropriate.
+####TOOL_PROGS = nm-new strip-new ar ranlib dlltool objdump objcopy
+TOOL_PROGS = sdnm ar ranlib
+BASEDIR = $(srcdir)/..
+BFDDIR = $(BASEDIR)/bfd
+INCDIR = $(BASEDIR)/include
+AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \
+	 @HDEFINES@ \
+	 @INCINTL@ \
+	 -DLOCALEDIR="\"$(datadir)/locale\"" \
+	 -Dbin_dummy_emulation=$(EMULATION_VECTOR)
+
+
+####++HFILES = \
+####	arsup.h binemul.h bucomm.h budbg.h \
+####	coffgrok.h debug.h dlltool.h dwarf.h elfcomm.h nlmconv.h \
+####	objdump.h sysdep.h unwind-ia64.h windres.h winduni.h windint.h \
+####	windmc.h
+HFILES = \
+	arsup.h binemul.h bucomm.h sysdep.h
+
+
+####++GENERATED_HFILES = arparse.h sysroff.h sysinfo.h defparse.h rcparse.h mcparse.h
+GENERATED_HFILES = arparse.h
+
+####++BUILT_SOURCES = $(GENERATED_HFILES)
+BUILT_SOURCES = $(GENERATED_HFILES)
+
+####++CFILES = \
+####	addr2line.c ar.c arsup.c bin2c.c binemul.c bucomm.c \
+####	coffdump.c coffgrok.c cxxfilt.c \
+####	dwarf.c debug.c dlltool.c dllwrap.c \
+####	elfcomm.c emul_aix.c emul_vanilla.c filemode.c \
+####	ieee.c is-ranlib.c is-strip.c maybe-ranlib.c maybe-strip.c \
+####	nlmconv.c nm.c not-ranlib.c not-strip.c \
+####	objcopy.c objdump.c prdbg.c \
+####	od-xcoff.c \
+####	rclex.c rdcoff.c rddbg.c readelf.c rename.c \
+####	resbin.c rescoff.c resrc.c resres.c \
+####	size.c srconv.c stabs.c strings.c sysdump.c \
+####	unwind-ia64.c elfedit.c version.c \
+####	windres.c winduni.c wrstabs.c \
+####	windmc.c mclex.c
+CFILES = \
+	ar.c arsup.c binemul.c bucomm.c emul_vanilla.c filemode.c nm.c \
+	not-ranlib.c rename.c version.c 
+
+
+####++GENERATED_CFILES = \
+####	arparse.c arlex.c sysroff.c sysinfo.c syslex.c \
+####	defparse.c deflex.c nlmheader.c rcparse.c mcparse.c
+GENERATED_CFILES = \
+	arparse.c arlex.c
+
+
+####DEBUG_SRCS = rddbg.c debug.c stabs.c ieee.c rdcoff.c
+####WRITE_DEBUG_SRCS = $(DEBUG_SRCS) wrstabs.c
+
+##### Extra object files for objdump
+####OBJDUMP_PRIVATE_OFILES = @OBJDUMP_PRIVATE_OFILES@
+
+# Code shared by all the binutils.
+BULIBS = bucomm.c version.c filemode.c
+
+# Code shared by the ELF related programs.
+####ELFLIBS = elfcomm.c
+BFDLIB = ../bfd/libbfd.la
+
+####OPCODES = ../opcodes/libopcodes.la
+LIBIBERTY = ../libiberty/libiberty.a
+
+####POTFILES = $(CFILES) $(DEBUG_SRCS) $(HFILES)
+####po/POTFILES.in: @MAINT@ Makefile
+####	for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \
+####	  && mv tmp $(srcdir)/po/POTFILES.in
+EXPECT = expect
+RUNTEST = runtest
+CC_FOR_TARGET = ` \
+  if [ -f $$r/../gcc/xgcc ] ; then \
+    if [ -f $$r/../newlib/Makefile ] ; then \
+      echo $$r/../gcc/xgcc -B$$r/../gcc/ -idirafter $$r/../newlib/targ-include -idirafter $${srcroot}/../newlib/libc/include -nostdinc; \
+    else \
+      echo $$r/../gcc/xgcc -B$$r/../gcc/; \
+    fi; \
+  else \
+    if [ "@host@" = "@target@" ] ; then \
+      echo $(CC); \
+    else \
+      echo gcc | sed '$(transform)'; \
+    fi; \
+  fi`
+
+
+# There's no global DEPENDENCIES.  So, we must explicitly list everything
+# which depends on libintl, since we don't know whether LIBINTL_DEP will be
+# non-empty until configure time.  Ugh!
+####size_DEPENDENCIES =      $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####objdump_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) $(OPCODES) $(OBJDUMP_PRIVATE_OFILES)
+sdnm_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####ar_DEPENDENCIES =        $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+sdar_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####strings_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####strip_new_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####ranlib_DEPENDENCIES =    $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+sdranlib_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####cxxfilt_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####objcopy_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####nlmconv_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####srconv_DEPENDENCIES =    $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####sysdump_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####coffdump_DEPENDENCIES =  $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####dlltool_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####windres_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####windmc_DEPENDENCIES =    $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####addr2line_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+####readelf_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY)
+####elfedit_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY)
+####dllwrap_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY)
+LDADD = $(BFDLIB) $(LIBIBERTY) $(LIBINTL)
+
+####size_SOURCES = size.c $(BULIBS)
+
+####objcopy_SOURCES = objcopy.c not-strip.c rename.c $(WRITE_DEBUG_SRCS) $(BULIBS)
+
+####strings_SOURCES = strings.c $(BULIBS)
+
+####readelf_SOURCES = readelf.c version.c unwind-ia64.c dwarf.c $(ELFLIBS)
+####readelf_LDADD   = $(LIBINTL) $(LIBIBERTY)
+
+####elfedit_SOURCES = elfedit.c version.c $(ELFLIBS)
+####elfedit_LDADD = $(LIBINTL) $(LIBIBERTY)
+
+####strip_new_SOURCES = objcopy.c is-strip.c rename.c $(WRITE_DEBUG_SRCS) $(BULIBS)
+sdnm_SOURCES = nm.c $(BULIBS)
+
+####objdump_SOURCES = objdump.c dwarf.c prdbg.c $(DEBUG_SRCS) $(BULIBS) $(ELFLIBS)
+####EXTRA_objdump_SOURCES = od-xcoff.c
+####objdump_LDADD = $(OBJDUMP_PRIVATE_OFILES) $(OPCODES) $(BFDLIB) $(LIBIBERTY) $(LIBINTL)
+####
+####objdump.@OBJEXT@:objdump.c
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $(OBJDUMP_DEFS) $(srcdir)/objdump.c
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='objdump.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c $(OBJDUMP_DEFS) $(srcdir)/objdump.c
+####endif
+
+####cxxfilt_SOURCES = cxxfilt.c $(BULIBS)
+
+####ar_SOURCES = arparse.y arlex.l ar.c not-ranlib.c arsup.c rename.c binemul.c \
+####	emul_$(EMULATION).c $(BULIBS)
+####EXTRA_ar_SOURCES = $(CFILES)
+####ar_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL)
+sdar_SOURCES = arparse.y arlex.l ar.c not-ranlib.c arsup.c rename.c binemul.c \
+	emul_$(EMULATION).c $(BULIBS)
+
+EXTRA_sdar_SOURCES = $(CFILES)
+sdar_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL)
+
+####ranlib_SOURCES = ar.c is-ranlib.c arparse.y arlex.l arsup.c rename.c \
+####	binemul.c emul_$(EMULATION).c $(BULIBS)
+####ranlib_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL)
+sdranlib_SOURCES = ar.c is-ranlib.c arparse.y arlex.l arsup.c rename.c \
+	binemul.c emul_$(EMULATION).c $(BULIBS)
+
+sdranlib_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL)
+
+####sysroff.@OBJEXT@: sysroff.c
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f sysroff.c || echo $(srcdir)/`sysroff.c $(NO_WERROR)
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='sysroff.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c `test -f sysroff.c || echo $(srcdir)/`sysroff.c $(NO_WERROR)
+####endif
+
+####defparse.@OBJEXT@: defparse.c
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f defparse.c || echo $(srcdir)/`defparse.c $(NO_WERROR)
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='defparse.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c `test -f defparse.c || echo $(srcdir)/`defparse.c $(NO_WERROR)
+####endif
+
+####deflex.@OBJEXT@: deflex.c
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f deflex.c || echo $(srcdir)/`deflex.c $(NO_WERROR)
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='deflex.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c `test -f deflex.c || echo $(srcdir)/`deflex.c $(NO_WERROR)
+####endif
+
+####nlmheader.@OBJEXT@: nlmheader.c
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f nlmheader.c || echo $(srcdir)/`nlmheader.c $(NO_WERROR)
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='nlmheader.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c `test -f nlmheader.c || echo $(srcdir)/`nlmheader.c $(NO_WERROR)
+####endif
+
+####rcparse.@OBJEXT@: rcparse.c
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f rcparse.c || echo $(srcdir)/`rcparse.c $(NO_WERROR)
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='rcparse.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c `test -f rcparse.c || echo $(srcdir)/`rcparse.c $(NO_WERROR)
+####endif
+
+####mcparse.@OBJEXT@: mcparse.c
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f mcparse.c || echo $(srcdir)/`mcparse.c $(NO_WERROR)
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='mcparse.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c `test -f mcparse.c || echo $(srcdir)/`mcparse.c $(NO_WERROR)
+####endif
+
+####rclex.@OBJEXT@: rclex.c
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $(srcdir)/rclex.c $(NO_WERROR)
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='rclex.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c $(srcdir)/rclex.c $(NO_WERROR)
+####endif
+
+####mclex.@OBJEXT@: mclex.c
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $(srcdir)/mclex.c $(NO_WERROR)
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='mclex.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c $(srcdir)/mclex.c $(NO_WERROR)
+####endif
+
+####srconv_SOURCES = srconv.c coffgrok.c $(BULIBS)
+####srconv.@OBJEXT@: sysroff.c
+
+####dlltool_SOURCES = dlltool.c defparse.y deflex.l $(BULIBS)
+####dlltool_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL)
+
+####dlltool.@OBJEXT@:
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@  $(DLLTOOL_DEFS) $(srcdir)/dlltool.c
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='dlltool.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c $(DLLTOOL_DEFS) $(srcdir)/dlltool.c
+####endif
+
+####rescoff.@OBJEXT@:
+####if am__fastdepCC
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@  $(DLLTOOL_DEFS) $(srcdir)/rescoff.c
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='rescoff.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	$(COMPILE) -c $(DLLTOOL_DEFS) $(srcdir)/rescoff.c
+####endif
+
+####coffdump_SOURCES = coffdump.c coffgrok.c $(BULIBS)
+
+####sysdump_SOURCES = sysdump.c $(BULIBS)
+####sysdump.@OBJEXT@: sysroff.c
+
+##### coff/sym.h and coff/ecoff.h won't be found by the automatic dependency
+##### scripts, since they are only included conditionally.
+####nlmconv.@OBJEXT@: nlmconv.c
+####if am__fastdepCC
+####	ldname=`echo ld | sed '$(transform)'`; \
+####	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ \
+####	  -DLD_NAME="\"$${ldname}\"" @NLMCONV_DEFS@ $(srcdir)/nlmconv.c
+####	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+####else
+####if AMDEP
+####	source='nlmconv.c' object='$@' libtool=no @AMDEPBACKSLASH@
+####	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+####endif
+####	ldname=`echo ld | sed '$(transform)'`; \
+####	$(COMPILE) -c -DLD_NAME="\"$${ldname}\"" @NLMCONV_DEFS@ $(srcdir)/nlmconv.c
+####endif
+
+####nlmconv_SOURCES = nlmconv.c nlmheader.y $(BULIBS)
+
+####windres_SOURCES = windres.c resrc.c rescoff.c resbin.c rcparse.y rclex.c \
+####	winduni.c resres.c $(BULIBS)
+####windres_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL) $(LIBICONV)
+
+####windmc_SOURCES = windmc.c mcparse.y mclex.c \
+####	winduni.c $(BULIBS)
+####windmc_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL) $(LIBICONV)
+
+####dllwrap_SOURCES = dllwrap.c version.c
+####dllwrap_LDADD = $(LIBIBERTY) $(LIBINTL)
+EXTRA_DIST = arparse.c arparse.h arlex.c nlmheader.c sysinfo.c sysinfo.h \
+	syslex.c deflex.c defparse.h defparse.c rcparse.h rcparse.c \
+	mcparse.h mcparse.c embedspu.sh
+
+
+# We extract version from bfd/configure.in, make sure to rerun configure
+# when BFD's version changes.
+CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in
+DISTCLEANFILES = sysroff.c sysroff.h site.exp site.bak embedspu
+MOSTLYCLEANFILES = sysinfo$(EXEEXT_FOR_BUILD) bin2c$(EXEEXT_FOR_BUILD) \
+  binutils.log binutils.sum abcdefgh*
+
+all: $(BUILT_SOURCES) config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .l .lo .o .obj .y
+am--refresh:
+	@:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+
+config.h: stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+	else :; fi
+
+stamp-h1: $(srcdir)/config.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+arparse.h: arparse.c
+	@if test ! -f $@; then \
+	  rm -f arparse.c; \
+	  $(MAKE) $(AM_MAKEFLAGS) arparse.c; \
+	else :; fi
+sdar$(EXEEXT): $(sdar_OBJECTS) $(sdar_DEPENDENCIES) 
+	@rm -f sdar$(EXEEXT)
+	$(LINK) $(sdar_OBJECTS) $(sdar_LDADD) $(LIBS)
+sdnm$(EXEEXT): $(sdnm_OBJECTS) $(sdnm_DEPENDENCIES) 
+	@rm -f sdnm$(EXEEXT)
+	$(LINK) $(sdnm_OBJECTS) $(sdnm_LDADD) $(LIBS)
+sdranlib$(EXEEXT): $(sdranlib_OBJECTS) $(sdranlib_DEPENDENCIES) 
+	@rm -f sdranlib$(EXEEXT)
+	$(LINK) $(sdranlib_OBJECTS) $(sdranlib_LDADD) $(LIBS)
+install-binSCRIPTS: $(bin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	     } \
+	; done
+
+uninstall-binSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ar.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arlex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arparse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arsup.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binemul.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bucomm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emul_$(EMULATION).Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emul_vanilla.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filemode.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/is-ranlib.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/not-ranlib.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rename.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+.l.c:
+	$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
+
+.y.c:
+	$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool config.lt
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+check-DEJAGNU: site.exp
+	srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
+	EXPECT=$(EXPECT); export EXPECT; \
+	runtest=$(RUNTEST); \
+	if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
+	  exit_status=0; l='$(DEJATOOL)'; for tool in $$l; do \
+	    if $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \
+	    then :; else exit_status=1; fi; \
+	  done; \
+	else echo "WARNING: could not find \`runtest'" 1>&2; :;\
+	fi; \
+	exit $$exit_status
+site.exp: Makefile
+	@echo 'Making a new site.exp file...'
+	@echo '## these variables are automatically generated by make ##' >site.tmp
+	@echo '# Do not edit here.  If you wish to override these values' >>site.tmp
+	@echo '# edit the last section' >>site.tmp
+	@echo 'set srcdir $(srcdir)' >>site.tmp
+	@echo "set objdir `pwd`" >>site.tmp
+	@echo 'set build_alias "$(build_alias)"' >>site.tmp
+	@echo 'set build_triplet $(build_triplet)' >>site.tmp
+	@echo 'set host_alias "$(host_alias)"' >>site.tmp
+	@echo 'set host_triplet $(host_triplet)' >>site.tmp
+	@echo 'set target_alias "$(target_alias)"' >>site.tmp
+	@echo 'set target_triplet $(target_triplet)' >>site.tmp
+	@echo '## All variables above are generated by configure. Do Not Edit ##' >>site.tmp
+	@test ! -f site.exp || \
+	  sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp
+	@-rm -f site.bak
+	@test ! -f site.exp || mv site.exp site.bak
+	@mv site.tmp site.exp
+
+distclean-DEJAGNU:
+	-rm -f site.exp site.bak
+	-l='$(DEJATOOL)'; for tool in $$l; do \
+	  rm -f $$tool.sum $$tool.log; \
+	done
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-recursive
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) config.h
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-rm -f arlex.c
+	-rm -f arparse.c
+	-rm -f arparse.h
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-recursive
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
+	clean-noinstPROGRAMS mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-DEJAGNU distclean-compile \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS install-binSCRIPTS \
+	install-exec-local
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am: installcheck-local
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-local
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
+	check-am ctags-recursive install install-am install-strip \
+	tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-DEJAGNU check-am clean \
+	clean-binPROGRAMS clean-generic clean-libtool \
+	clean-noinstPROGRAMS ctags ctags-recursive distclean \
+	distclean-DEJAGNU distclean-compile distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-binSCRIPTS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-local \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installcheck-local installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-binSCRIPTS
+
+
+####check-DEJAGNU: site.exp
+####	srcdir=`cd $(srcdir) && pwd`; export srcdir; \
+####	r=`pwd`; export r; \
+####	EXPECT=$(EXPECT); export EXPECT; \
+####	runtest=$(RUNTEST); \
+####	if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
+####	  CC_FOR_TARGET="$(CC_FOR_TARGET)" CFLAGS_FOR_TARGET="$(CFLAGS)" \
+####		$$runtest --tool $(DEJATOOL) --srcdir $${srcdir}/testsuite \
+####			$(RUNTESTFLAGS); \
+####	else echo "WARNING: could not find \`runtest'" 1>&2; :;\
+####	fi
+
+installcheck-local:
+	/bin/sh $(srcdir)/sanity.sh $(bindir)
+
+####addr2line_SOURCES = addr2line.c $(BULIBS)
+
+# The following is commented out for the conversion to automake.
+# This rule creates a single binary that switches between ar and ranlib
+# by looking at argv[0].  Use this kludge to save some disk space.
+# However, you have to install things by hand.
+# (That is after 'make install', replace the installed ranlib by a link to ar.)
+# Alternatively, you can install ranlib.sh as ranlib.
+# ar_with_ranlib: $(ADDL_DEPS) ar.o maybe-ranlib.o
+#	$(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(AR_PROG) ar.o maybe-ranlib.o $(ADDL_LIBS) $(EXTRALIBS)
+#	-rm -f $(RANLIB_PROG)
+#	-ln $(AR_PROG) $(RANLIB_PROG)
+#
+# objcopy and strip in one binary that uses argv[0] to decide its action.
+#
+#objcopy_with_strip: $(ADDL_DEPS) objcopy.o maybe-strip.o
+#	$(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(OBJCOPY_PROG) objcopy.o maybe-strip.o $(ADDL_LIBS) $(EXTRALIBS)
+#	-rm -f $(STRIP_PROG)
+#	-ln $(OBJCOPY_PROG) $(STRIP_PROG)
+
+####sysroff.c: sysinfo$(EXEEXT_FOR_BUILD) sysroff.info
+####	./sysinfo$(EXEEXT_FOR_BUILD) -c <$(srcdir)/sysroff.info >sysroff.c
+####	./sysinfo$(EXEEXT_FOR_BUILD) -i <$(srcdir)/sysroff.info >>sysroff.c
+####	./sysinfo$(EXEEXT_FOR_BUILD) -g <$(srcdir)/sysroff.info >>sysroff.c
+
+####sysroff.h: sysinfo$(EXEEXT_FOR_BUILD) sysroff.info
+####	./sysinfo$(EXEEXT_FOR_BUILD) -d <$(srcdir)/sysroff.info >sysroff.h
+
+####sysinfo$(EXEEXT_FOR_BUILD): sysinfo.@OBJEXT@ syslex.@OBJEXT@
+####	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.@OBJEXT@ syslex.@OBJEXT@
+
+####syslex.@OBJEXT@: syslex.c sysinfo.h config.h
+####	if [ -r syslex.c ]; then \
+####	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) syslex.c ; \
+####	else \
+####	  $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex.c ;\
+####	fi
+
+####sysinfo.@OBJEXT@: sysinfo.c
+####	if [ -r sysinfo.c ]; then \
+####	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) sysinfo.c ; \
+####	else \
+####	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/sysinfo.c ; \
+####	fi
+
+####bin2c$(EXEEXT_FOR_BUILD): bin2c.c
+####	$(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c
+
+####embedspu: embedspu.sh Makefile
+####	awk '/^program_transform_name=/ {print "program_transform_name=\"$(program_transform_name)\""; next} {print}' < $< > $@
+####	chmod a+x $@
+
+# We need these for parallel make.
+####sysinfo.h: sysinfo.c
+
+# Disable -Werror, if it has been enabled, since old versions of bison/
+# yacc will produce working code which contain compile time warnings.
+arparse.@OBJEXT@: arparse.c
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f arparse.c || echo $(srcdir)/`arparse.c $(NO_WERROR)
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='arparse.c' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f arparse.c || echo $(srcdir)/`arparse.c $(NO_WERROR)
+
+arlex.@OBJEXT@: arlex.c
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f arlex.c || echo $(srcdir)/`arlex.c $(NO_WERROR)
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='arlex.c' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f arlex.c || echo $(srcdir)/`arlex.c $(NO_WERROR)
+
+diststuff: $(EXTRA_DIST) info
+all: info
+mostlyclean-local:
+	-rm -rf tmpdir
+
+.PHONY: install-exec-local
+
+install-exec-local: install-binPROGRAMS $(bin_PROGRAMS) $(noinst_PROGRAMS)
+	@list='$(RENAMED_PROGS)'; for p in $$list; do \
+	  if test -f $$p$(EXEEXT); then \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p$(EXEEXT) $(bindir)/`echo $$p|sed -e 's/-new//' -e 's/cxxfilt/$(DEMANGLER_NAME)/'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p$(EXEEXT) $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/-new//' -e 's/cxxfilt/$(DEMANGLER_NAME)/'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  else :; fi; \
+	done
+####	$(mkinstalldirs) $(DESTDIR)$(tooldir)/bin
+####	for i in $(TOOL_PROGS); do \
+####	  if [ -f $$i$(EXEEXT) ]; then \
+####	    j=`echo $$i | sed -e 's/-new//'`; \
+####	    k=`echo $$j | sed '$(transform)'`; \
+####	    if [ "$(bindir)/$$k" != "$(tooldir)/bin/$$j" ]; then \
+####	      rm -f $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT); \
+####	      ln $(DESTDIR)$(bindir)/$$k$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT) >/dev/null 2>/dev/null \
+####		|| $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$$j$(EXEEXT); \
+####	    fi; \
+####	  else true; \
+####	  fi; \
+####	done
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/NEWS sdcc-3.2.0+dfsg/support/sdbinutils/binutils/NEWS
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/NEWS	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/NEWS	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,469 @@
+-*- text -*-
+
+Changes in 2.22:
+
+* Add support for displaying the contents of .debug.macro sections.
+
+* Add --preprocessor-arg option to windres to specify additional options
+  passed to preprocessor.
+
+* Add --dwarf-start and --dwarf-end to readelf and objdump.  These are used by
+  the new Emacs mode, see dwarf-mode.el.
+
+Changes in 2.21:
+
+* Add --interleave-width option to objcopy to allowing copying a range of
+  bytes from the input to the output with the --interleave option.
+
+* Add support for the TMS320C6000 (TI C6X) processor family.
+
+* Readelf can now display ARM unwind tables (.ARM.exidx / .ARM.extab) using
+  the -u / --unwind option.
+
+* Add --dyn-syms to readelf to dump dynamic symbol table.
+
+* A new tool - elfedit - has been added to directly manipulate ELF format
+  binaries.
+
+* Add to dlltool .def file feature of aliasing PE internal symbol name by
+  '== <ID>' option.
+
+* Add a new command line option -a / --addresses to addr2line to display the
+  address before function name or source filename.
+
+* Add a new command line option -p / --pretty-print to addr2line to have
+  a more human readable output.
+
+* The hppa/som targets can now be compiled on any host.
+
+Changes in 2.20:
+
+* Add support for delay importing to dlltool.  Use the --output-delaylib <file>
+  switch to create a delay-import library.  The resulting app will load the dll
+  as soon as the first function is called.  It will link to __delayLoadHelper2()
+  from the static delayimp library, which will import LoadLibraryA and
+  GetProcAddress from kernel32.
+
+* Add a new command line option, --insn-width=WIDTH, to objdump to specify
+  number of bytes to be displayed on a single line when disassembling
+  instructions.
+
+* Readelf can now display the relocated contents of a section as a sequence
+  of bytes via the --relocated-dump=<name|number> command line option.
+
+* The gprof program has been given a new command line option:
+  --external-symbols-table=<filename> which reads in symbols from a specified
+  file.
+
+* The plugin target has been added to bfd. It can load the same shared objects
+  used by gold and uses them to provide basic support for new file formats.
+
+* The verilog memory hex dump file format is now supported as an output format
+  for objcopy.
+
+* Add --file-alignment, --heap, --image-base, --section-alignment,
+  --stack and --subsystem command line options to objcopy, which will
+  set PE optional header.
+
+* Option --dwarf/-W of objdump is now as flexible as readelf --debug-dump/-w.
+
+* --as-needed now links in a dynamic library if it satisfies undefined
+  symbols in regular objects, or in other dynamic libraries.  In the
+  latter case the library is not linked if it is found in a DT_NEEDED
+  entry of one of the libraries already linked.
+
+* Added --prefix=PREFIX and --prefix-strip=LEVEL switches to objdump to
+  add absolute paths for -S.
+
+* Add new option --use-nul-prefixed-import-tables to dlltool to allow fall-
+  back to old import table generation with null element prefix.
+
+* Added --identify-strict switch to cause --identify <implib> to 
+  report an error when the import library is associated with
+  multiple DLLs.
+
+* Added --identify <implib> option to dlltool, which determines the
+  name of the DLL associated with the specified <implib>.
+
+* Support for PowerPC booke64 instructions has been removed.  The assembler no
+  longer accepts -mbooke32 or -mbooke64 and the disassembler no longer accepts
+  -Mbooke32 or -Mbooke64.  Instead, -mbooke and -Mbooke should be used.
+
+Changes in 2.19:
+
+* Added -wL switch to dump decoded contents of .debug_line.
+
+* Added support for "thin" archives which contain pathnames pointing to
+  object files rather than the files themselves and which contain a
+  flattened symbol index for all objects, and archives, which have been
+  added to the archive.
+  
+* Added -F switch to objdump to include file offsets in the disassembly.
+
+* Added -c switch to readelf to allow string dumps of archive symbol index.
+
+* Support for SSE5 has been added to the i386 port.
+
+* Added -p switch to readelf to allow string dumps of sections.
+
+Changes in 2.18:
+
+* Resolved 37 coding problems in bfd including static array overruns, null
+  pointer dereferences and use of a malloc buffer after it has been freed, as
+  revealed by static analysis donated by Coverity, Inc. (http://scan.coverity.com).
+
+* The binutils sources are now released under version 3 of the GNU General
+  Public License.
+
+* A new tool "windmc" has been added for some targets.  This is a message
+  compiler which attempts to be compatible with the MS version.
+
+* Add codepage support to the windres tool.  It now supports many new
+  resource types (e.g. MANIFEST, TOOLBAR, etc).  The output generation
+  for binary files is done now via bfd itself.  The endianess problems
+  for different hosts are solved.  Dumps of .res files can now be
+  re-compiled by windres without lossing resources or compilation errors.
+  Some problems on dialog resource translations are corrected.
+
+* Add --extract-symbol command line option to objcopy, which will
+  strip everything out of an ordinary object file or executable except
+  for its symbol table.  Files containing just symbols can be useful
+  to some OSes.
+
+Changes in 2.17:
+
+* Add "-x NAME" to readelf in addition to "-x NUMBER".
+
+* Add -i and -t switches to cxxfilt.  -i disables the display of implementation
+  specific extra demangling information (if any) and -t disables the demangling
+  of types.
+
+* Add support for the "@<file>" syntax to the command lines of all tools, so
+  that extra switches can be read from <file>.
+
+* Add "-W/--dwarf" to objdump to display the contents of the DWARF
+  debug sections.
+
+* Add "-t/--section-details" to readelf to display section details.
+  "-N/--full-section-name" is deprecated.
+
+* powerpc-linux ld now supports a variant form of PLT and GOT for the security
+  conscious.  This form will automatically be chosen when ld detects that all
+  code in regular object files was generated by gcc -msecure-plt.  The old PLT
+  and GOT may be forced by a new ld option, --bss-plt.
+
+* Add "-i/--inlines" to addr2line to print enclosing scope information
+  for inlined function chains, back to first non-inlined function.
+
+* Add "-N/--full-section-name" to readelf to display full section name.
+
+* Add "-M entry:<addr>" switch to objdump to specify a function entry address
+  when disassembling VAX binaries.
+
+* Add "--globalize-symbol <name>" and "--globalize-symbols <filename>" switches
+  to objcopy to convert local symbols into global symbols.
+  
+* gprof now allows input files to have histogram records for
+  several memory ranges, provided those ranges are disjoint.  
+
+Changes in 2.16:
+
+* Add "-g/--section-groups" to readelf to display section groups.
+
+* objcopy recognizes two new options --strip-unneeded-symbol and
+  --strip-unneeded-symbols, namely for use together with the wildcard
+  matching the original --strip-symbol/--strip-symbols provided, but
+  retaining any symbols matching but needed by relocations.
+
+* readelf can now display address ranges from .debug_range sections.  This
+  happens automatically when a DW_AT_range attribute is encountered.  The
+  command line switch --debug-dump=Ranges (or -wR) can also be used to display
+  the contents of the .debug_range section.
+
+* nm and objdump now have a switch "--special-syms" to enable the displaying of
+  symbols which the target considers to be special.  By default these symbols
+  are no longer displayed.  Currently the only special symbols are the Mapping
+  symbols used by the ARM port to mark transitions between text and data and
+  between ARM and THUMB code.
+
+* dlltool has a switch "--ext-prefix-alias <prefix>" to generate additional
+  import and export symbols with <preifx> prepended to them.
+
+Changes in 2.15:
+
+* objcopy for MIPS targets now accepts "-M no-aliases" as an option to the
+  disassembler to print the "raw" mips instruction mnemonic instead of some
+  pseudo instruction name.  I.E. print "daddu" or "or" instead of "move",
+  "sll" instead of "nop", etc.
+
+* objcopy and strip can now take wildcard patterns in symbol names specified on
+  the command line provided that the --wildcard switch is used to enable them.
+
+* readelf can now parse archives.
+
+* objdump now accepts --debugging-tags to print the debug information in a
+  format compatible with ctags tool.
+
+* objcopy and strip now accept --only-keep-debug to create a file containing
+  those sections that would be stripped out by --strip-debug.  The idea is that
+  this can be used in conjunction with the --add-gnu-debuglink switch to create
+  a two part program distribution - one a stripped executable and the other the
+  debugging info.
+
+* objcopy now accepts --add-gnu-debuglink=<file> to insert a .gnu_debuglink
+  section into a (presumably stripped) executable.  This allows the debug
+  information for the file to be held in a separate file.
+  
+* BFD marks the sections .comment and .note as 'n' in the BSD/POSIX
+  single-character representation.  This can be checked by running nm
+  with the -a switch.
+
+Changes in 2.14:
+
+* Added --info switch to objcopy and strip.
+
+* Support for Vitesse IQ2000 added by Red Hat.
+
+* Added 'S' encoding to strings to allow the display of 8-bit characters.
+
+* Added --prefix-symbols=<text>, --prefix-sections=<text> and
+  --prefix-alloc-sections=<text> to objcopy.
+
+* readelf can handle the extensions to the DWARF2 spec used by the Unified
+  Parallel C compiler.
+
+* BFD no longer declares a "boolean" type, to avoid clashes with other
+  headers that declare the same.  Users of BFD should replace boolean,
+  false and true, with int, 0 and 1, or define their own boolean type.
+
+* Support for IP2K added by Denis Chertykov.
+
+Changes in 2.13:
+
+* Support for the Fujitsu FRV architecture added by Red Hat. Models for FR400
+  and FR500 included.
+
+Changes in version 2.12:
+
+* Support for Don Knuth's MMIX, by Hans-Peter Nilsson.
+
+* size: Add --totals to display summary of sizes (Berkeley format only).
+
+* readelf: Add --wide option to not break section header or segment listing
+  lines to fit into 80 columns.
+
+* strings: Add --encoding to display wide character strings.  By Markus Kuhn.
+
+* objcopy: Add --rename-section to change section names.
+
+* readelf: Support added for DWARF 2.1 extensions.  Support added for
+  displaying the contents of .debug.macinfo sections.
+
+* New command line switches added to objcopy to allow symbols to be kept as
+  global symbols, and also to specify files containing lists of such symbols.
+  by Honda Hiroki.
+
+* Support for OpenRISC by Johan Rydberg.
+
+* New command line switch to objcopy --alt-machine-code which creates a binary
+  with an alternate machine code if one is defined in the architecture
+  description.  Only supported for ELF targets.  By Alexandre Oliva.
+
+* New command line switch to objcopy -B (or --binary-architecture) which sets
+  the architecture of the output file to the given argument.  This option only
+  makes sense, if the input target is binary.  Otherwise it is ignored.
+  By Stefan Geuken.
+
+* Support for PDP-11 by Lars Brinkhoff.
+
+Changes in binutils 2.11:
+
+* Add support for ARM v5t and v5te architectures and Intel's XScale ARM
+  extenstions.
+
+* Add --srec-len and --srec-forceS3 command line switch to objcopy.
+  By Luciano Gemme.
+
+* Support for the MIPS32, by Anders Norlander.
+
+* Support for the i860, by Jason Eckhardt.
+
+* Support for CRIS (Axis Communications ETRAX series).
+
+Changes in binutils 2.10:
+
+* Support for 64-bit ELF on HPPA.
+
+* New command line switch to objdump --file-start-context which shows the
+  entire file contents up to the source line first encountered for a given
+  file.
+
+* New command line switch to objdump -M (or --disassembler-options) which takes
+  a parameter which can then be interpreted on a per-target basis by the
+  disassembler.  Used by ARM targets to select register name sets, ISA, APCS or
+  raw verions.
+
+* objdump support for -mi386:intel which causes disassembly to be displayed
+  with intel syntax.
+
+* New program: readelf.  This displays the contents of ELF format files,
+  regardless of target machine.
+
+* objcopy now takes --change-section-lma, --change-section-vma, and
+  --change-section-address options.  The old --adjust-section-vma option is
+  equivalent to --change-section-address.  The other --adjust-* options are now
+  renamed to --change-*, although --adjust-* continues to work.
+
+* objcopy has a --redefine-sym option that lets you rename symbols.
+
+* objcopy now takes a -j/--only-section option to copy only the specified
+  sections.
+
+* dlltool now supports the IMPORTS command.
+
+* dlltool now takes --export-all-symbols, --no-export-all-symbols,
+  --exclude-symbols, and --no-default-excludes options.
+
+Changes in binutils 2.9:
+
+* Added windres program, which can be used to manipulate resources in WIN32
+  files as used on Windows 95 and Windows NT.
+
+* The objcopy --gap-fill and --pad-to options operate on the LMA rather than
+  the VMA of the sections.
+
+* Added S modifier to ar to not build a symbol table.
+
+Changes in binutils 2.8:
+
+* The objdump disassembly format has been changed, and hopefully improved.  Use
+  the new --prefix-addresses option to get the old format.  There are also new
+  --disassemble-zeroes and --no-show-raw-insn options which affect disassembler
+  output.
+
+* Formats may now be specified as configuration triplets.  For example,
+  objdump -b i386-pc-linux.  The triplets are not passed through config.sub,
+  so they must be in canonical form.
+
+* Added new addr2line program.  This uses the debugging information to convert
+  an address into a file name and line number within a program.
+
+* Added --change-leading-char argument to objcopy.
+
+* Added --weaken argument to objcopy.
+
+* objdump --dynamic-reloc now works on ELF executables and shared libraries.
+
+* Added --adjust-vma option to objdump.
+
+* Added -C/--demangle option to objdump.
+
+* Added -p/--preserve-dates option to strip and objcopy.
+
+Changes in binutils 2.7:
+
+* Added --enable-shared and --enable-commonbfdlib options to configure.
+
+* Added --debugging argument to objdump and objcopy.
+
+* Added --defined-only argument to nm.
+
+* Added --remove-leading-char argument to objcopy.
+
+* The objdump --line-numbers option is now meaningful with --reloc.
+
+* Added --line-numbers option to nm.
+
+* Added --endian/-EB/-EL option to objdump.
+
+* Added support for Alpha OpenVMS/AXP.
+
+Changes in binutils 2.6:
+
+* Added -N/--strip-symbol and -K/--keep-symbol arguments to strip and objcopy.
+
+* Added several arguments to objcopy to provide some control over how the new
+  file is laid out in memory.  Also added binary output format to BFD to permit
+  generating plain binary files.
+
+* Added --start-address and --stop-address options to objdump.
+
+* ar and ranlib now work on AIX.  The tools are now built by default on AIX.
+
+Changes in binutils 2.5:
+
+* Changed objdump -dr to dump the relocs interspersed with the assembly
+  listing, for a more useful listing of relocatable files.
+
+* Changed objdump -d/--disassemble to only disassemble SEC_CODE sections.
+  Added -D/--disassemble-all option to disassemble all sections.
+
+* Added --size-sort option to nm.
+
+* strip and objcopy should now be able to handle dynamically linked ELF
+  executables.
+
+Changes in binutils 2.4:
+
+* Support for HP-PA (by Jeff Law), i386 Mach (by David Mackenzie), RS/6000 and
+  PowerPC (except ar and ranlib; by Ian Taylor).
+
+* Support for Irix 5.
+
+* Programs `strip' and `objcopy' will not attempt to write dynamically linked
+  ELF output files, since BFD currently can't create them properly.
+
+Changes in binutils 2.3:
+
+* A new --stabs argument has been added to objdump to dump stabs sections in
+  ELF and COFF files.
+
+* A new program, nlmconv, has been added.  It can convert object files into
+  Novell NetWare Loadable Modules.
+
+* The strings program has been added.
+
+Changes in binutils 2.2:
+
+* The 'copy' program has been renamed to 'objcopy', for consistency with
+  'objdump', and because 'copy' might more plausibly be used as a synonym for
+  'cp'.
+
+* The new stand-alone program c++filt is a filter that converts encoded
+  (mangled) C++ assembly-level identifiers to user-level names.  (Note: This
+  may get moved to the gcc distribution.)
+
+* nm -o on an archive now prefixes each line with the archive name, matching
+  the output from BSD nm.
+
+* ar (and ld) can now read (but not write) BSD4.4-style archives.
+
+* New support for H8500, Z8000, and the Hitach SH.
+
+* Dis-assembler interface changed to allow sharing with gdb.
+
+* There is new Elf code, but it is not yet ready for general use.
+
+* There is the beginnings of a test suite.
+
+Changes in binutils 2.1:
+
+* There is now support for writing ECOFF files, so ld and the other utilities
+  should work on Risc/Ultrix and Irix.  Please let us know how well this works.
+
+* ar now automatically creates a symbol table (a __.SYMDEF member, in the BSD
+  version), if there are any object files in the archive.  So running ranlib is
+  now redundant (unless the non-standard q command is used).  This is required
+  for Posix.2 conformance.
+
+* The archive-reading code now reads both BSD-style and SYSV-style archives
+  independently of the selected target format.  This is to encourage people to
+  switch to SYSV-format, which has a number of advantages.
+
+* The strip and copy programs now have options to remove debug-symbols only
+  and/or local symbols only.  They now also support long options.
+
+
+Local variables:
+fill-column: 79
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/README sdcc-3.2.0+dfsg/support/sdbinutils/binutils/README
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/README	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/README	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,284 @@
+		README for BINUTILS
+
+These are the GNU binutils.  These are utilities of use when dealing
+with binary files, either object files or executables.  These tools
+consist of the linker (ld), the assembler (gas), and the profiler
+(gprof) each of which have their own sub-directory named after them.
+There is also a collection of other binary tools, including the
+disassembler (objdump) in this directory.  These tools make use of a
+pair of libraries (bfd and opcodes) and a common set of header files
+(include).
+
+There are README and NEWS files in most of the program sub-directories
+which give more information about those specific programs.
+
+
+Unpacking and Installation -- quick overview
+============================================
+
+When you unpack the binutils archive file, you will get a directory
+called something like `binutils-XXX', where XXX is the number of the
+release.  (Probably 2.13 or higher).  This directory contains
+various files and sub-directories.  Most of the files in the top
+directory are for information and for configuration.  The actual
+source code is in sub-directories.
+
+To build binutils, you can just do:
+
+	cd binutils-XXX
+	./configure [options]
+	make
+	make install # copies the programs files into /usr/local/bin
+		     # by default.
+
+This will configure and build all the libraries as well as the
+assembler, the binutils, and the linker.
+
+If you have GNU make, we recommend building in a different directory:
+
+	mkdir objdir
+	cd objdir
+	../binutils-XXX/configure [options]
+	make
+	make install
+
+This relies on the VPATH feature of GNU make.
+
+By default, the binutils will be configured to support the system on
+which they are built.  When doing cross development, use the --target
+configure option to specify a different target, eg:
+
+	./configure --target=foo-elf        
+
+The --enable-targets option adds support for more binary file formats
+besides the default.  List them as the argument to --enable-targets,
+separated by commas.  For example:
+
+	./configure --enable-targets=sun3,rs6000-aix,decstation
+
+The name 'all' compiles in support for all valid BFD targets:
+
+	./configure --enable-targets=all
+
+On 32-bit hosts though, this support will be restricted to 32-bit
+target unless the --enable-64-bit-bfd option is also used:
+
+	./configure --enable-64-bit-bfd --enable-targets=all
+
+You can also specify the --enable-shared option when you run
+configure.  This will build the BFD and opcodes libraries as shared
+libraries.  You can use arguments with the --enable-shared option to
+indicate that only certain libraries should be built shared; for
+example, --enable-shared=bfd.  The only potential shared libraries in
+a binutils release are bfd and opcodes.
+
+The binutils will be linked against the shared libraries.  The build
+step will attempt to place the correct library in the run-time search
+path for the binaries.  However, in some cases, after you install the
+binaries, you may have to set an environment variable, normally
+LD_LIBRARY_PATH, so that the system can find the installed libbfd
+shared library.
+
+On hosts that support shared system libraries the binutils will be
+linked against them.  If you have static versions of the system
+libraries installed as well and you wish to create static binaries
+instead then use the LDFLAGS environment variable,  like this:
+
+  ../binutils-XXX/configure LDFLAGS="--static" [more options]
+
+Note: the two dashes are important.  The binutils make use of the
+libtool script which has a special interpretation of "-static" when it
+is in the LDFLAGS environment variable.
+
+To build under openVMS/AXP, see the file makefile.vms in the top level
+directory.
+
+
+Native Language Support
+=======================
+
+By default Native Language Support will be enabled for binutils.  On
+some systems however this support is not present and can lead to error
+messages such as "undefined reference to `libintl_gettext'" when
+building there tools.  If that happens the NLS support can be disabled
+by adding the --disable-nls switch to the configure line like this:
+
+	../binutils-XXX/configure --disable-nls
+
+
+If you don't have ar
+====================
+
+If your system does not already have an 'ar' program, the normal
+binutils build process will not work.  In this case, run configure as
+usual.  Before running make, run this script:
+
+#!/bin/sh
+MAKE_PROG="${MAKE-make}"
+MAKE="${MAKE_PROG} AR=true LINK=true"
+export MAKE
+${MAKE} $* all-libiberty
+${MAKE} $* all-intl
+${MAKE} $* all-bfd
+cd binutils
+MAKE="${MAKE_PROG}"
+export MAKE
+${MAKE} $* ar_DEPENDENCIES= ar_LDADD='../bfd/*.o ../libiberty/*.o `if test -f ../intl/gettext.o; then echo '../intl/*.o'; fi`' ar
+
+This script will build an ar program in binutils/ar.  Move binutils/ar
+into a directory on your PATH.  After doing this, you can run make as
+usual to build the complete binutils distribution.  You do not need
+the ranlib program in order to build the distribution.
+
+Porting
+=======
+
+Binutils-2.13 supports many different architectures, but there
+are many more not supported, including some that were supported
+by earlier versions.  We are hoping for volunteers to improve this
+situation.
+
+The major effort in porting binutils to a new host and/or target
+architecture involves the BFD library.  There is some documentation
+in ../bfd/doc.  The file ../gdb/doc/gdbint.texinfo (distributed
+with gdb-5.x) may also be of help.
+
+Reporting bugs
+==============
+
+Send bug reports and patches to:
+
+   bug-binutils@gnu.org.
+
+Please include the following in bug reports:
+
+- A description of exactly what went wrong, and exactly what should have
+  happened instead.
+
+- The configuration name(s) given to the "configure" script.  The
+  "config.status" file should have this information.  This is assuming
+  you built binutils yourself.  If you didn't build binutils youself,
+  then we need information regarding your machine and operating system,
+  and it may be more appropriate to report bugs to wherever you obtained
+  binutils.
+
+- The options given to the tool (gas, objcopy, ld etc.) at run time.
+
+- The actual input file that caused the problem.
+
+Always mention the version number you are running; this is printed by
+running any of the binutils with the --version option.  We appreciate
+reports about bugs, but we do not promise to fix them, particularly so
+when the bug report is against an old version.  If you are able, please
+consider building the latest tools from CVS to check that your bug has
+not already been fixed.
+
+When reporting problems about gas and ld, it's useful to provide a
+testcase that triggers the problem.  In the case of a gas problem, we
+want input files to gas and command line switches used.  The inputs to
+gas are _NOT_ .c or .i files, but rather .s files.  If your original
+source was a C program, you can generate the .s file and see the command
+line options by passing -v -save-temps to gcc in addition to all the
+usual options you use.  The reason we don't want C files is that we
+might not have a C compiler around for the target you use.  While it
+might be possible to build a compiler, that takes considerable time and
+disk space, and we might not end up with exactly the same compiler you
+use.
+
+In the case of a ld problem, the input files are .o, .a and .so files,
+and possibly a linker script specified with -T.  Again, when using gcc
+to link, you can see these files by adding options to the gcc command
+line.  Use -v -save-temps -Wl,-t, except that on targets that use gcc's
+collect2, you would add -v -save-temps -Wl,-t,-debug.  The -t option
+tells ld to print all files and libraries used, so that, for example,
+you can associate -lc on the ld command line with the actual libc used.
+Note that your simple two line C program to trigger a problem typically
+expands into several megabytes of objects by the time you include
+libraries.
+
+It is antisocial to post megabyte sized attachments to mailing lists, so
+please put large testcases somewhere on an ftp or web site so that only
+interested developers need to download them, or offer to email them on
+request.  Better still, try to reduce the testcase, for example, try to
+develop a ld testcase that doesn't use system libraries.  However,
+please be sure it is a complete testcase and that it really does
+demonstrate the problem.  Also, don't bother paring it down if that will
+cause large delays in filing the bug report.
+
+If you expect to be contributing a large number of test cases, it would
+be helpful if you would look at the test suite included in the release
+(based on the Deja Gnu testing framework, available from the usual ftp
+sites) and write test cases to fit into that framework.  This is
+certainly not required.
+
+VMS
+===
+
+This section was written by Klaus K"ampf <kkaempf@rmi.de>.  It
+describes how to build and install the binutils on openVMS (Alpha and
+Vax).  (The BFD library only supports reading Vax object files.)
+
+Compiling the release:
+
+To compile the gnu binary utilities and the gnu assembler, you'll
+need DEC C or GNU C for openVMS/Alpha. You'll need *both* compilers
+on openVMS/Vax.
+
+Compiling with either DEC C or GNU C works on openVMS/Alpha only. Some
+of the opcodes and binutils files trap a bug in the DEC C optimizer,
+so these files must be compiled with /noopt.
+
+Compiling on openVMS/Vax is a bit complicated, as the bfd library traps
+a bug in GNU C and the gnu assembler a bug in (my version of) DEC C.
+
+I never tried compiling with VAX C.
+
+
+You further need GNU Make Version 3.76 or later. This is available
+at ftp.progis.de or any GNU archive site. The makefiles assume that
+gmake starts gnu make as a foreign command.
+
+If you're compiling with DEC C or VAX C, you must run
+
+  $ @setup
+
+before starting gnu-make. This isn't needed with GNU C.
+
+On the Alpha you can choose the compiler by editing the toplevel
+makefile.vms. Either select CC=cc (for DEC C) or CC=gcc (for GNU C)
+
+
+Installing the release
+
+Provided that your directory setup conforms to the GNU on openVMS
+standard, you already have a concealed device named 'GNU_ROOT'.
+In this case, a simple
+
+ $ gmake install
+
+suffices to copy all programs and libraries to the proper directories.
+
+Define the programs as foreign commands by adding these lines to your
+login.com:
+
+  $ gas :== $GNU_ROOT:[bin]as.exe
+  $ size :== $GNU_ROOT:[bin]size.exe
+  $ nm :== $GNU_ROOT:[bin]nm.exe
+  $ objdump :== $GNU_ROOT:[bin]objdump.exe
+  $ strings :== $GNU_ROOT:[bin]strings.exe
+
+If you have a different directory setup, copy the binary utilities
+([.binutils]size.exe, [.binutils]nm.exe, [.binutils]objdump.exe,
+and [.binutils]strings.exe) and the gnu assembler and preprocessor
+([.gas]as.exe and [.gas]gasp.exe]) to a directory of your choice
+and define all programs as foreign commands.
+
+
+If you're satisfied with the compilation, you may want to remove
+unneeded objects and libraries:
+
+  $ gmake clean
+
+
+If you have any problems or questions about the binutils on VMS, feel
+free to mail me at kkaempf@rmi.de.
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/aclocal.m4 sdcc-3.2.0+dfsg/support/sdbinutils/binutils/aclocal.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/aclocal.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/aclocal.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1011 @@
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
+[m4_warning([this file was generated for autoconf 2.64.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.11'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.11.1], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 9
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 10
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+#serial 5
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[{
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 16
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.62])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+		  [_AM_DEPENDENCIES(CC)],
+		  [define([AC_PROG_CC],
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+		  [_AM_DEPENDENCIES(CXX)],
+		  [define([AC_PROG_CXX],
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+		  [_AM_DEPENDENCIES(OBJC)],
+		  [define([AC_PROG_OBJC],
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
+
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+AC_SUBST(install_sh)])
+
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 5
+
+# AM_PROG_LEX
+# -----------
+# Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
+# "missing" invocation, for better error output.
+AC_DEFUN([AM_PROG_LEX],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
+AC_REQUIRE([AC_PROG_LEX])dnl
+if test "$LEX" = :; then
+  LEX=${am_missing_run}flex
+fi])
+
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 5
+
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
+# ----------------------------------
+# Control maintainer-specific portions of Makefiles.
+# Default is to disable them, unless `enable' is passed literally.
+# For symmetry, `disable' may be passed as well.  Anyway, the user
+# can override the default with the --enable/--disable switch.
+AC_DEFUN([AM_MAINTAINER_MODE],
+[m4_case(m4_default([$1], [disable]),
+       [enable], [m4_define([am_maintainer_other], [disable])],
+       [disable], [m4_define([am_maintainer_other], [enable])],
+       [m4_define([am_maintainer_other], [enable])
+        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+  AC_ARG_ENABLE([maintainer-mode],
+[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer],
+      [USE_MAINTAINER_MODE=$enableval],
+      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST([MAINT])dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 6
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 5
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
+m4_include([../bfd/acinclude.m4])
+m4_include([../bfd/warning.m4])
+m4_include([../config/depstand.m4])
+m4_include([../config/gettext-sister.m4])
+m4_include([../config/iconv.m4])
+m4_include([../config/largefile.m4])
+m4_include([../config/lead-dot.m4])
+m4_include([../config/lib-ld.m4])
+m4_include([../config/lib-link.m4])
+m4_include([../config/lib-prefix.m4])
+m4_include([../config/nls.m4])
+m4_include([../config/override.m4])
+m4_include([../config/plugins.m4])
+m4_include([../config/po.m4])
+m4_include([../config/progtest.m4])
+m4_include([../libtool.m4])
+m4_include([../ltoptions.m4])
+m4_include([../ltsugar.m4])
+m4_include([../ltversion.m4])
+m4_include([../lt~obsolete.m4])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ar.c sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ar.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ar.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ar.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1382 @@
+/* ar.c - Archive modify and extract.
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of GNU Binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/*
+   Bugs: GNU ar used to check file against filesystem in quick_update and
+   replace operations (would check mtime). Doesn't warn when name truncated.
+   No way to specify pos_end. Error messages should be more consistent.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libiberty.h"
+#include "progress.h"
+#include "getopt.h"
+#include "aout/ar.h"
+#include "libbfd.h"
+#include "bucomm.h"
+#include "arsup.h"
+#include "filenames.h"
+#include "binemul.h"
+#include "plugin.h"
+#include <sys/stat.h>
+
+#ifdef __GO32___
+#define EXT_NAME_LEN 3		/* Bufflen of addition to name if it's MS-DOS.  */
+#else
+#define EXT_NAME_LEN 6		/* Ditto for *NIX.  */
+#endif
+
+/* Static declarations.  */
+
+static void mri_emul (void);
+static const char *normalize (const char *, bfd *);
+static void remove_output (void);
+static void map_over_members (bfd *, void (*)(bfd *), char **, int);
+static void print_contents (bfd * member);
+static void delete_members (bfd *, char **files_to_delete);
+
+static void move_members (bfd *, char **files_to_move);
+static void replace_members
+  (bfd *, char **files_to_replace, bfd_boolean quick);
+static void print_descr (bfd * abfd);
+static void write_archive (bfd *);
+static int  ranlib_only (const char *archname);
+static int  ranlib_touch (const char *archname);
+static void usage (int);
+
+/** Globals and flags.  */
+
+static int mri_mode;
+
+/* This flag distinguishes between ar and ranlib:
+   1 means this is 'ranlib'; 0 means this is 'ar'.
+   -1 means if we should use argv[0] to decide.  */
+extern int is_ranlib;
+
+/* Nonzero means don't warn about creating the archive file if necessary.  */
+int silent_create = 0;
+
+/* Nonzero means describe each action performed.  */
+int verbose = 0;
+
+/* Nonzero means preserve dates of members when extracting them.  */
+int preserve_dates = 0;
+
+/* Nonzero means don't replace existing members whose dates are more recent
+   than the corresponding files.  */
+int newer_only = 0;
+
+/* Controls the writing of an archive symbol table (in BSD: a __.SYMDEF
+   member).  -1 means we've been explicitly asked to not write a symbol table;
+   +1 means we've been explicitly asked to write it;
+   0 is the default.
+   Traditionally, the default in BSD has been to not write the table.
+   However, for POSIX.2 compliance the default is now to write a symbol table
+   if any of the members are object files.  */
+int write_armap = 0;
+
+/* Operate in deterministic mode: write zero for timestamps, uids,
+   and gids for archive members and the archive symbol table, and write
+   consistent file modes.  */
+int deterministic = 0;
+
+/* Nonzero means it's the name of an existing member; position new or moved
+   files with respect to this one.  */
+char *posname = NULL;
+
+/* Sez how to use `posname': pos_before means position before that member.
+   pos_after means position after that member. pos_end means always at end.
+   pos_default means default appropriately. For the latter two, `posname'
+   should also be zero.  */
+enum pos
+  {
+    pos_default, pos_before, pos_after, pos_end
+  } postype = pos_default;
+
+enum operations
+  {
+    none = 0, del, replace, print_table,
+    print_files, extract, move, quick_append
+  } operation = none;
+
+static bfd **
+get_pos_bfd (bfd **, enum pos, const char *);
+
+/* For extract/delete only.  If COUNTED_NAME_MODE is TRUE, we only
+   extract the COUNTED_NAME_COUNTER instance of that name.  */
+static bfd_boolean counted_name_mode = 0;
+static int counted_name_counter = 0;
+
+/* Whether to truncate names of files stored in the archive.  */
+static bfd_boolean ar_truncate = FALSE;
+
+/* Whether to use a full file name match when searching an archive.
+   This is convenient for archives created by the Microsoft lib
+   program.  */
+static bfd_boolean full_pathname = FALSE;
+
+/* Whether to create a "thin" archive (symbol index only -- no files).  */
+static bfd_boolean make_thin_archive = FALSE;
+
+static int show_version = 0;
+
+static int show_help = 0;
+
+static const char *plugin_target = NULL;
+
+static const char *target = NULL;
+
+#define OPTION_PLUGIN 201
+#define OPTION_TARGET 202
+
+static struct option long_options[] =
+{
+  {"help", no_argument, &show_help, 1},
+  {"plugin", required_argument, NULL, OPTION_PLUGIN},
+  {"target", required_argument, NULL, OPTION_TARGET},
+  {"version", no_argument, &show_version, 1},
+  {NULL, no_argument, NULL, 0}
+};
+
+int interactive = 0;
+
+static void
+mri_emul (void)
+{
+  interactive = isatty (fileno (stdin));
+  yyparse ();
+}
+
+/* If COUNT is 0, then FUNCTION is called once on each entry.  If nonzero,
+   COUNT is the length of the FILES chain; FUNCTION is called on each entry
+   whose name matches one in FILES.  */
+
+static void
+map_over_members (bfd *arch, void (*function)(bfd *), char **files, int count)
+{
+  bfd *head;
+  int match_count;
+
+  if (count == 0)
+    {
+      for (head = arch->archive_next; head; head = head->archive_next)
+	{
+	  PROGRESS (1);
+	  function (head);
+	}
+      return;
+    }
+
+  /* This may appear to be a baroque way of accomplishing what we want.
+     However we have to iterate over the filenames in order to notice where
+     a filename is requested but does not exist in the archive.  Ditto
+     mapping over each file each time -- we want to hack multiple
+     references.  */
+
+  for (; count > 0; files++, count--)
+    {
+      bfd_boolean found = FALSE;
+
+      match_count = 0;
+      for (head = arch->archive_next; head; head = head->archive_next)
+	{
+	  const char * filename;
+
+	  PROGRESS (1);
+	  filename = head->filename;
+	  if (filename == NULL)
+	    {
+	      /* Some archive formats don't get the filenames filled in
+		 until the elements are opened.  */
+	      struct stat buf;
+	      bfd_stat_arch_elt (head, &buf);
+	    }
+	  else if (bfd_is_thin_archive (arch))
+	    {
+	      /* Thin archives store full pathnames.  Need to normalize.  */
+	      filename = normalize (filename, arch);
+	    }
+
+	  if (filename != NULL
+	      && !FILENAME_CMP (normalize (*files, arch), filename))
+	    {
+	      ++match_count;
+	      if (counted_name_mode
+		  && match_count != counted_name_counter)
+		{
+		  /* Counting, and didn't match on count; go on to the
+                     next one.  */
+		  continue;
+		}
+
+	      found = TRUE;
+	      function (head);
+	    }
+	}
+
+      if (!found)
+	/* xgettext:c-format */
+	fprintf (stderr, _("no entry %s in archive\n"), *files);
+    }
+}
+
+bfd_boolean operation_alters_arch = FALSE;
+
+static void
+usage (int help)
+{
+  FILE *s;
+
+  s = help ? stdout : stderr;
+
+#if BFD_SUPPORTS_PLUGINS
+  /* xgettext:c-format */
+  const char *command_line
+    = _("Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV]"
+	" [--plugin <name>] [member-name] [count] archive-file file...\n");
+
+#else
+  /* xgettext:c-format */
+  const char *command_line
+    = _("Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV]"
+	" [member-name] [count] archive-file file...\n");
+#endif
+  fprintf (s, command_line, program_name);
+
+  /* xgettext:c-format */
+  fprintf (s, _("       %s -M [<mri-script]\n"), program_name);
+  fprintf (s, _(" commands:\n"));
+  fprintf (s, _("  d            - delete file(s) from the archive\n"));
+  fprintf (s, _("  m[ab]        - move file(s) in the archive\n"));
+  fprintf (s, _("  p            - print file(s) found in the archive\n"));
+  fprintf (s, _("  q[f]         - quick append file(s) to the archive\n"));
+  fprintf (s, _("  r[ab][f][u]  - replace existing or insert new file(s) into the archive\n"));
+  fprintf (s, _("  s            - act as ranlib\n"));
+  fprintf (s, _("  t            - display contents of archive\n"));
+  fprintf (s, _("  x[o]         - extract file(s) from the archive\n"));
+  fprintf (s, _(" command specific modifiers:\n"));
+  fprintf (s, _("  [a]          - put file(s) after [member-name]\n"));
+  fprintf (s, _("  [b]          - put file(s) before [member-name] (same as [i])\n"));
+  fprintf (s, _("  [D]          - use zero for timestamps and uids/gids\n"));
+  fprintf (s, _("  [N]          - use instance [count] of name\n"));
+  fprintf (s, _("  [f]          - truncate inserted file names\n"));
+  fprintf (s, _("  [P]          - use full path names when matching\n"));
+  fprintf (s, _("  [o]          - preserve original dates\n"));
+  fprintf (s, _("  [u]          - only replace files that are newer than current archive contents\n"));
+  fprintf (s, _(" generic modifiers:\n"));
+  fprintf (s, _("  [c]          - do not warn if the library had to be created\n"));
+  fprintf (s, _("  [s]          - create an archive index (cf. ranlib)\n"));
+  fprintf (s, _("  [S]          - do not build a symbol table\n"));
+  fprintf (s, _("  [T]          - make a thin archive\n"));
+  fprintf (s, _("  [v]          - be verbose\n"));
+  fprintf (s, _("  [V]          - display the version number\n"));
+  fprintf (s, _("  @<file>      - read options from <file>\n"));
+  fprintf (s, _("  --target=BFDNAME - specify the target object format as BFDNAME\n"));
+#if BFD_SUPPORTS_PLUGINS
+  fprintf (s, _(" optional:\n"));
+  fprintf (s, _("  --plugin <p> - load the specified plugin\n"));
+#endif
+
+  ar_emul_usage (s);
+
+  list_supported_targets (program_name, s);
+
+  if (REPORT_BUGS_TO[0] && help)
+    fprintf (s, _("Report bugs to %s\n"), REPORT_BUGS_TO);
+
+  xexit (help ? 0 : 1);
+}
+
+static void
+ranlib_usage (int help)
+{
+  FILE *s;
+
+  s = help ? stdout : stderr;
+
+  /* xgettext:c-format */
+  fprintf (s, _("Usage: %s [options] archive\n"), program_name);
+  fprintf (s, _(" Generate an index to speed access to archives\n"));
+  fprintf (s, _(" The options are:\n\
+  @<file>                      Read options from <file>\n"));
+#if BFD_SUPPORTS_PLUGINS
+  fprintf (s, _("\
+  --plugin <name>              Load the specified plugin\n"));
+#endif
+  fprintf (s, _("\
+  -t                           Update the archive's symbol map timestamp\n\
+  -h --help                    Print this help message\n\
+  -v --version                 Print version information\n"));
+
+  list_supported_targets (program_name, s);
+
+  if (REPORT_BUGS_TO[0] && help)
+    fprintf (s, _("Report bugs to %s\n"), REPORT_BUGS_TO);
+
+  xexit (help ? 0 : 1);
+}
+
+/* Normalize a file name specified on the command line into a file
+   name which we will use in an archive.  */
+
+static const char *
+normalize (const char *file, bfd *abfd)
+{
+  const char *filename;
+
+  if (full_pathname)
+    return file;
+
+  filename = lbasename (file);
+
+  if (ar_truncate
+      && abfd != NULL
+      && strlen (filename) > abfd->xvec->ar_max_namelen)
+    {
+      char *s;
+
+      /* Space leak.  */
+      s = (char *) xmalloc (abfd->xvec->ar_max_namelen + 1);
+      memcpy (s, filename, abfd->xvec->ar_max_namelen);
+      s[abfd->xvec->ar_max_namelen] = '\0';
+      filename = s;
+    }
+
+  return filename;
+}
+
+/* Remove any output file.  This is only called via xatexit.  */
+
+static const char *output_filename = NULL;
+static FILE *output_file = NULL;
+static bfd *output_bfd = NULL;
+
+static void
+remove_output (void)
+{
+  if (output_filename != NULL)
+    {
+      if (output_bfd != NULL)
+	bfd_cache_close (output_bfd);
+      if (output_file != NULL)
+	fclose (output_file);
+      unlink_if_ordinary (output_filename);
+    }
+}
+
+static char **
+decode_options (int argc, char **argv)
+{
+  int c;
+
+  /* Convert old-style tar call by exploding option element and rearranging
+     options accordingly.  */
+
+  if (argc > 1 && argv[1][0] != '-')
+    {
+      int new_argc;		/* argc value for rearranged arguments */
+      char **new_argv;		/* argv value for rearranged arguments */
+      char *const *in;		/* cursor into original argv */
+      char **out;		/* cursor into rearranged argv */
+      const char *letter;	/* cursor into old option letters */
+      char buffer[3];		/* constructed option buffer */
+
+      /* Initialize a constructed option.  */
+
+      buffer[0] = '-';
+      buffer[2] = '\0';
+
+      /* Allocate a new argument array, and copy program name in it.  */
+
+      new_argc = argc - 1 + strlen (argv[1]);
+      new_argv = xmalloc ((new_argc + 1) * sizeof (*argv));
+      in = argv;
+      out = new_argv;
+      *out++ = *in++;
+
+      /* Copy each old letter option as a separate option.  */
+
+      for (letter = *in++; *letter; letter++)
+	{
+	  buffer[1] = *letter;
+	  *out++ = xstrdup (buffer);
+	}
+
+      /* Copy all remaining options.  */
+
+      while (in < argv + argc)
+	*out++ = *in++;
+      *out = NULL;
+
+      /* Replace the old option list by the new one.  */
+
+      argc = new_argc;
+      argv = new_argv;
+    }
+
+  while ((c = getopt_long (argc, argv, "hdmpqrtxlcoVsSuvabiMNfPTD",
+			   long_options, NULL)) != EOF)
+    {
+      switch (c)
+        {
+        case 'd':
+        case 'm':
+        case 'p':
+        case 'q':
+        case 'r':
+        case 't':
+        case 'x':
+          if (operation != none)
+            fatal (_("two different operation options specified"));
+	  break;
+	}
+
+      switch (c)
+        {
+        case 'h':
+	  show_help = 1;
+	  break;
+        case 'd':
+          operation = del;
+          operation_alters_arch = TRUE;
+          break;
+        case 'm':
+          operation = move;
+          operation_alters_arch = TRUE;
+          break;
+        case 'p':
+          operation = print_files;
+          break;
+        case 'q':
+          operation = quick_append;
+          operation_alters_arch = TRUE;
+          break;
+        case 'r':
+          operation = replace;
+          operation_alters_arch = TRUE;
+          break;
+        case 't':
+          operation = print_table;
+          break;
+        case 'x':
+          operation = extract;
+          break;
+        case 'l':
+          break;
+        case 'c':
+          silent_create = 1;
+          break;
+        case 'o':
+          preserve_dates = 1;
+          break;
+        case 'V':
+          show_version = TRUE;
+          break;
+        case 's':
+          write_armap = 1;
+          break;
+        case 'S':
+          write_armap = -1;
+          break;
+        case 'u':
+          newer_only = 1;
+          break;
+        case 'v':
+          verbose = 1;
+          break;
+        case 'a':
+          postype = pos_after;
+          break;
+        case 'b':
+          postype = pos_before;
+          break;
+        case 'i':
+          postype = pos_before;
+          break;
+        case 'M':
+          mri_mode = 1;
+          break;
+        case 'N':
+          counted_name_mode = TRUE;
+          break;
+        case 'f':
+          ar_truncate = TRUE;
+          break;
+        case 'P':
+          full_pathname = TRUE;
+          break;
+        case 'T':
+          make_thin_archive = TRUE;
+          break;
+        case 'D':
+          deterministic = TRUE;
+          break;
+	case OPTION_PLUGIN:
+#if BFD_SUPPORTS_PLUGINS
+	  plugin_target = "plugin";
+	  bfd_plugin_set_plugin (optarg);
+#else
+	  fprintf (stderr, _("sorry - this program has been built without plugin support\n"));
+	  xexit (1);
+#endif
+	  break;
+	case OPTION_TARGET:
+	  target = optarg;
+	  break;
+	case 0:		/* A long option that just sets a flag.  */
+	  break;
+        default:
+          usage (0);
+        }
+    }
+
+  return &argv[optind];
+}
+
+static void
+ranlib_main (int argc, char **argv)
+{
+  int arg_index, status = 0;
+  bfd_boolean touch = FALSE;
+  int c;
+
+  while ((c = getopt_long (argc, argv, "hHvVt", long_options, NULL)) != EOF)
+    {
+      switch (c)
+        {
+	case 'h':
+	case 'H':
+	  show_help = 1;
+	  break;
+	case 't':
+	  touch = TRUE;
+	  break;
+	case 'v':
+	case 'V':
+	  show_version = 1;
+	  break;
+        }
+    }
+
+  if (argc < 2)
+    ranlib_usage (0);
+
+  if (show_help)
+    usage (1);
+
+  if (show_version)
+    print_version ("ranlib");
+
+  arg_index = optind;
+
+  while (arg_index < argc)
+    {
+      if (! touch)
+        status |= ranlib_only (argv[arg_index]);
+      else
+        status |= ranlib_touch (argv[arg_index]);
+      ++arg_index;
+    }
+
+  xexit (status);
+}
+
+int main (int, char **);
+
+int
+main (int argc, char **argv)
+{
+  int arg_index;
+  char **files;
+  int file_count;
+  char *inarch_filename;
+  int i;
+
+#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
+  setlocale (LC_MESSAGES, "");
+#endif
+#if defined (HAVE_SETLOCALE)
+  setlocale (LC_CTYPE, "");
+#endif
+  bindtextdomain (PACKAGE, LOCALEDIR);
+  textdomain (PACKAGE);
+
+  program_name = argv[0];
+  xmalloc_set_program_name (program_name);
+#if BFD_SUPPORTS_PLUGINS
+  bfd_plugin_set_program_name (program_name);
+#endif
+
+  expandargv (&argc, &argv);
+
+  if (is_ranlib < 0)
+    {
+      const char *temp = lbasename (program_name);
+
+      if (strlen (temp) >= 6
+	  && FILENAME_CMP (temp + strlen (temp) - 6, "ranlib") == 0)
+	is_ranlib = 1;
+      else
+	is_ranlib = 0;
+    }
+
+  START_PROGRESS (program_name, 0);
+
+  bfd_init ();
+  set_default_bfd_target ();
+
+  xatexit (remove_output);
+
+  for (i = 1; i < argc; i++)
+    if (! ar_emul_parse_arg (argv[i]))
+      break;
+  argv += (i - 1);
+  argc -= (i - 1);
+
+  if (is_ranlib)
+    ranlib_main (argc, argv);
+
+  if (argc < 2)
+    usage (0);
+
+  argv = decode_options (argc, argv);
+
+  if (show_help)
+    usage (1);
+
+  if (show_version)
+    print_version ("ar");
+
+  arg_index = 0;
+
+  if (mri_mode)
+    {
+      mri_emul ();
+    }
+  else
+    {
+      bfd *arch;
+
+      /* We don't use do_quick_append any more.  Too many systems
+	 expect ar to always rebuild the symbol table even when q is
+	 used.  */
+
+      /* We can't write an armap when using ar q, so just do ar r
+         instead.  */
+      if (operation == quick_append && write_armap)
+	operation = replace;
+
+      if ((operation == none || operation == print_table)
+	  && write_armap == 1)
+	xexit (ranlib_only (argv[arg_index]));
+
+      if (operation == none)
+	fatal (_("no operation specified"));
+
+      if (newer_only && operation != replace)
+	fatal (_("`u' is only meaningful with the `r' option."));
+
+      if (newer_only && deterministic)
+	fatal (_("`u' is not meaningful with the `D' option."));
+
+      if (postype != pos_default)
+	posname = argv[arg_index++];
+
+      if (counted_name_mode)
+	{
+	  if (operation != extract && operation != del)
+	    fatal (_("`N' is only meaningful with the `x' and `d' options."));
+	  counted_name_counter = atoi (argv[arg_index++]);
+	  if (counted_name_counter <= 0)
+	    fatal (_("Value for `N' must be positive."));
+	}
+
+      inarch_filename = argv[arg_index++];
+
+      for (file_count = 0; argv[arg_index + file_count] != NULL; file_count++)
+	continue;
+
+      files = (file_count > 0) ? argv + arg_index : NULL;
+
+      arch = open_inarch (inarch_filename,
+			  files == NULL ? (char *) NULL : files[0]);
+
+      if (operation == extract && bfd_is_thin_archive (arch))
+	fatal (_("`x' cannot be used on thin archives."));
+
+      switch (operation)
+	{
+	case print_table:
+	  map_over_members (arch, print_descr, files, file_count);
+	  break;
+
+	case print_files:
+	  map_over_members (arch, print_contents, files, file_count);
+	  break;
+
+	case extract:
+	  map_over_members (arch, extract_file, files, file_count);
+	  break;
+
+	case del:
+	  if (files != NULL)
+	    delete_members (arch, files);
+	  else
+	    output_filename = NULL;
+	  break;
+
+	case move:
+	  /* PR 12558: Creating and moving at the same time does
+	     not make sense.  Just create the archive instead.  */
+	  if (! silent_create)
+	    {
+	      if (files != NULL)
+		move_members (arch, files);
+	      else
+		output_filename = NULL;
+	      break;
+	    }
+	  /* Fall through.  */
+
+	case replace:
+	case quick_append:
+	  if (files != NULL || write_armap > 0)
+	    replace_members (arch, files, operation == quick_append);
+	  else
+	    output_filename = NULL;
+	  break;
+
+	  /* Shouldn't happen! */
+	default:
+	  /* xgettext:c-format */
+	  fatal (_("internal error -- this option not implemented"));
+	}
+    }
+
+  END_PROGRESS (program_name);
+
+  xexit (0);
+  return 0;
+}
+
+bfd *
+open_inarch (const char *archive_filename, const char *file)
+{
+  bfd **last_one;
+  bfd *next_one;
+  struct stat sbuf;
+  bfd *arch;
+  char **matching;
+
+  bfd_set_error (bfd_error_no_error);
+
+  if (target == NULL)
+    target = plugin_target;
+
+  if (stat (archive_filename, &sbuf) != 0)
+    {
+#if !defined(__GO32__) || defined(__DJGPP__)
+
+      /* FIXME: I don't understand why this fragment was ifndef'ed
+	 away for __GO32__; perhaps it was in the days of DJGPP v1.x.
+	 stat() works just fine in v2.x, so I think this should be
+	 removed.  For now, I enable it for DJGPP v2. -- EZ.  */
+
+      /* KLUDGE ALERT! Temporary fix until I figger why
+	 stat() is wrong ... think it's buried in GO32's IDT - Jax */
+      if (errno != ENOENT)
+	bfd_fatal (archive_filename);
+#endif
+
+      if (!operation_alters_arch)
+	{
+	  fprintf (stderr, "%s: ", program_name);
+	  perror (archive_filename);
+	  maybequit ();
+	  return NULL;
+	}
+
+      /* If the target isn't set, try to figure out the target to use
+	 for the archive from the first object on the list.  */
+      if (target == NULL && file != NULL)
+	{
+	  bfd *obj;
+
+	  obj = bfd_openr (file, target);
+	  if (obj != NULL)
+	    {
+	      if (bfd_check_format (obj, bfd_object))
+		target = bfd_get_target (obj);
+	      (void) bfd_close (obj);
+	    }
+	}
+
+      /* Create an empty archive.  */
+      arch = bfd_openw (archive_filename, target);
+      if (arch == NULL
+	  || ! bfd_set_format (arch, bfd_archive)
+	  || ! bfd_close (arch))
+	bfd_fatal (archive_filename);
+      else if (!silent_create)
+        non_fatal (_("creating %s"), archive_filename);
+
+      /* If we die creating a new archive, don't leave it around.  */
+      output_filename = archive_filename;
+    }
+
+  arch = bfd_openr (archive_filename, target);
+  if (arch == NULL)
+    {
+    bloser:
+      bfd_fatal (archive_filename);
+    }
+
+  if (! bfd_check_format_matches (arch, bfd_archive, &matching))
+    {
+      bfd_nonfatal (archive_filename);
+      if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
+	{
+	  list_matching_formats (matching);
+	  free (matching);
+	}
+      xexit (1);
+    }
+
+  last_one = &(arch->archive_next);
+  /* Read all the contents right away, regardless.  */
+  for (next_one = bfd_openr_next_archived_file (arch, NULL);
+       next_one;
+       next_one = bfd_openr_next_archived_file (arch, next_one))
+    {
+      PROGRESS (1);
+      *last_one = next_one;
+      last_one = &next_one->archive_next;
+    }
+  *last_one = (bfd *) NULL;
+  if (bfd_get_error () != bfd_error_no_more_archived_files)
+    goto bloser;
+  return arch;
+}
+
+static void
+print_contents (bfd *abfd)
+{
+  size_t ncopied = 0;
+  char *cbuf = (char *) xmalloc (BUFSIZE);
+  struct stat buf;
+  size_t size;
+  if (bfd_stat_arch_elt (abfd, &buf) != 0)
+    /* xgettext:c-format */
+    fatal (_("internal stat error on %s"), bfd_get_filename (abfd));
+
+  if (verbose)
+    printf ("\n<%s>\n\n", bfd_get_filename (abfd));
+
+  bfd_seek (abfd, (file_ptr) 0, SEEK_SET);
+
+  size = buf.st_size;
+  while (ncopied < size)
+    {
+
+      size_t nread;
+      size_t tocopy = size - ncopied;
+      if (tocopy > BUFSIZE)
+	tocopy = BUFSIZE;
+
+      nread = bfd_bread (cbuf, (bfd_size_type) tocopy, abfd);
+      if (nread != tocopy)
+	/* xgettext:c-format */
+	fatal (_("%s is not a valid archive"),
+	       bfd_get_filename (bfd_my_archive (abfd)));
+
+      /* fwrite in mingw32 may return int instead of size_t. Cast the
+	 return value to size_t to avoid comparison between signed and
+	 unsigned values.  */
+      if ((size_t) fwrite (cbuf, 1, nread, stdout) != nread)
+	fatal ("stdout: %s", strerror (errno));
+      ncopied += tocopy;
+    }
+  free (cbuf);
+}
+
+/* Extract a member of the archive into its own file.
+
+   We defer opening the new file until after we have read a BUFSIZ chunk of the
+   old one, since we know we have just read the archive header for the old
+   one.  Since most members are shorter than BUFSIZ, this means we will read
+   the old header, read the old data, write a new inode for the new file, and
+   write the new data, and be done. This 'optimization' is what comes from
+   sitting next to a bare disk and hearing it every time it seeks.  -- Gnu
+   Gilmore  */
+
+void
+extract_file (bfd *abfd)
+{
+  FILE *ostream;
+  char *cbuf = (char *) xmalloc (BUFSIZE);
+  size_t nread, tocopy;
+  size_t ncopied = 0;
+  size_t size;
+  struct stat buf;
+
+  if (bfd_stat_arch_elt (abfd, &buf) != 0)
+    /* xgettext:c-format */
+    fatal (_("internal stat error on %s"), bfd_get_filename (abfd));
+  size = buf.st_size;
+
+  if (verbose)
+    printf ("x - %s\n", bfd_get_filename (abfd));
+
+  bfd_seek (abfd, (file_ptr) 0, SEEK_SET);
+
+  ostream = NULL;
+  if (size == 0)
+    {
+      /* Seems like an abstraction violation, eh?  Well it's OK! */
+      output_filename = bfd_get_filename (abfd);
+
+      ostream = fopen (bfd_get_filename (abfd), FOPEN_WB);
+      if (ostream == NULL)
+	{
+	  perror (bfd_get_filename (abfd));
+	  xexit (1);
+	}
+
+      output_file = ostream;
+    }
+  else
+    while (ncopied < size)
+      {
+	tocopy = size - ncopied;
+	if (tocopy > BUFSIZE)
+	  tocopy = BUFSIZE;
+
+	nread = bfd_bread (cbuf, (bfd_size_type) tocopy, abfd);
+	if (nread != tocopy)
+	  /* xgettext:c-format */
+	  fatal (_("%s is not a valid archive"),
+		 bfd_get_filename (bfd_my_archive (abfd)));
+
+	/* See comment above; this saves disk arm motion */
+	if (ostream == NULL)
+	  {
+	    /* Seems like an abstraction violation, eh?  Well it's OK! */
+	    output_filename = bfd_get_filename (abfd);
+
+	    ostream = fopen (bfd_get_filename (abfd), FOPEN_WB);
+	    if (ostream == NULL)
+	      {
+		perror (bfd_get_filename (abfd));
+		xexit (1);
+	      }
+
+	    output_file = ostream;
+	  }
+
+	/* fwrite in mingw32 may return int instead of size_t. Cast
+	   the return value to size_t to avoid comparison between
+	   signed and unsigned values.  */
+	if ((size_t) fwrite (cbuf, 1, nread, ostream) != nread)
+	  fatal ("%s: %s", output_filename, strerror (errno));
+	ncopied += tocopy;
+      }
+
+  if (ostream != NULL)
+    fclose (ostream);
+
+  output_file = NULL;
+  output_filename = NULL;
+
+  chmod (bfd_get_filename (abfd), buf.st_mode);
+
+  if (preserve_dates)
+    {
+      /* Set access time to modification time.  Only st_mtime is
+	 initialized by bfd_stat_arch_elt.  */
+      buf.st_atime = buf.st_mtime;
+      set_times (bfd_get_filename (abfd), &buf);
+    }
+
+  free (cbuf);
+}
+
+static void
+write_archive (bfd *iarch)
+{
+  bfd *obfd;
+  char *old_name, *new_name;
+  bfd *contents_head = iarch->archive_next;
+
+  old_name = (char *) xmalloc (strlen (bfd_get_filename (iarch)) + 1);
+  strcpy (old_name, bfd_get_filename (iarch));
+  new_name = make_tempname (old_name);
+
+  if (new_name == NULL)
+    bfd_fatal ("could not create temporary file whilst writing archive");
+
+  output_filename = new_name;
+
+  obfd = bfd_openw (new_name, bfd_get_target (iarch));
+
+  if (obfd == NULL)
+    bfd_fatal (old_name);
+
+  output_bfd = obfd;
+
+  bfd_set_format (obfd, bfd_archive);
+
+  /* Request writing the archive symbol table unless we've
+     been explicitly requested not to.  */
+  obfd->has_armap = write_armap >= 0;
+
+  if (ar_truncate)
+    {
+      /* This should really use bfd_set_file_flags, but that rejects
+         archives.  */
+      obfd->flags |= BFD_TRADITIONAL_FORMAT;
+    }
+
+  if (deterministic)
+    obfd->flags |= BFD_DETERMINISTIC_OUTPUT;
+
+  if (make_thin_archive || bfd_is_thin_archive (iarch))
+    bfd_is_thin_archive (obfd) = 1;
+
+  if (!bfd_set_archive_head (obfd, contents_head))
+    bfd_fatal (old_name);
+
+  if (!bfd_close (obfd))
+    bfd_fatal (old_name);
+
+  output_bfd = NULL;
+  output_filename = NULL;
+
+  /* We don't care if this fails; we might be creating the archive.  */
+  bfd_close (iarch);
+
+  if (smart_rename (new_name, old_name, 0) != 0)
+    xexit (1);
+  free (old_name);
+}
+
+/* Return a pointer to the pointer to the entry which should be rplacd'd
+   into when altering.  DEFAULT_POS should be how to interpret pos_default,
+   and should be a pos value.  */
+
+static bfd **
+get_pos_bfd (bfd **contents, enum pos default_pos, const char *default_posname)
+{
+  bfd **after_bfd = contents;
+  enum pos realpos;
+  const char *realposname;
+
+  if (postype == pos_default)
+    {
+      realpos = default_pos;
+      realposname = default_posname;
+    }
+  else
+    {
+      realpos = postype;
+      realposname = posname;
+    }
+
+  if (realpos == pos_end)
+    {
+      while (*after_bfd)
+	after_bfd = &((*after_bfd)->archive_next);
+    }
+  else
+    {
+      for (; *after_bfd; after_bfd = &(*after_bfd)->archive_next)
+	if (FILENAME_CMP ((*after_bfd)->filename, realposname) == 0)
+	  {
+	    if (realpos == pos_after)
+	      after_bfd = &(*after_bfd)->archive_next;
+	    break;
+	  }
+    }
+  return after_bfd;
+}
+
+static void
+delete_members (bfd *arch, char **files_to_delete)
+{
+  bfd **current_ptr_ptr;
+  bfd_boolean found;
+  bfd_boolean something_changed = FALSE;
+  int match_count;
+
+  for (; *files_to_delete != NULL; ++files_to_delete)
+    {
+      /* In a.out systems, the armap is optional.  It's also called
+	 __.SYMDEF.  So if the user asked to delete it, we should remember
+	 that fact. This isn't quite right for COFF systems (where
+	 __.SYMDEF might be regular member), but it's very unlikely
+	 to be a problem.  FIXME */
+
+      if (!strcmp (*files_to_delete, "__.SYMDEF"))
+	{
+	  arch->has_armap = FALSE;
+	  write_armap = -1;
+	  continue;
+	}
+
+      found = FALSE;
+      match_count = 0;
+      current_ptr_ptr = &(arch->archive_next);
+      while (*current_ptr_ptr)
+	{
+	  if (FILENAME_CMP (normalize (*files_to_delete, arch),
+			    (*current_ptr_ptr)->filename) == 0)
+	    {
+	      ++match_count;
+	      if (counted_name_mode
+		  && match_count != counted_name_counter)
+		{
+		  /* Counting, and didn't match on count; go on to the
+                     next one.  */
+		}
+	      else
+		{
+		  found = TRUE;
+		  something_changed = TRUE;
+		  if (verbose)
+		    printf ("d - %s\n",
+			    *files_to_delete);
+		  *current_ptr_ptr = ((*current_ptr_ptr)->archive_next);
+		  goto next_file;
+		}
+	    }
+
+	  current_ptr_ptr = &((*current_ptr_ptr)->archive_next);
+	}
+
+      if (verbose && !found)
+	{
+	  /* xgettext:c-format */
+	  printf (_("No member named `%s'\n"), *files_to_delete);
+	}
+    next_file:
+      ;
+    }
+
+  if (something_changed)
+    write_archive (arch);
+  else
+    output_filename = NULL;
+}
+
+
+/* Reposition existing members within an archive */
+
+static void
+move_members (bfd *arch, char **files_to_move)
+{
+  bfd **after_bfd;		/* New entries go after this one */
+  bfd **current_ptr_ptr;	/* cdr pointer into contents */
+
+  for (; *files_to_move; ++files_to_move)
+    {
+      current_ptr_ptr = &(arch->archive_next);
+      while (*current_ptr_ptr)
+	{
+	  bfd *current_ptr = *current_ptr_ptr;
+	  if (FILENAME_CMP (normalize (*files_to_move, arch),
+			    current_ptr->filename) == 0)
+	    {
+	      /* Move this file to the end of the list - first cut from
+		 where it is.  */
+	      bfd *link_bfd;
+	      *current_ptr_ptr = current_ptr->archive_next;
+
+	      /* Now glue to end */
+	      after_bfd = get_pos_bfd (&arch->archive_next, pos_end, NULL);
+	      link_bfd = *after_bfd;
+	      *after_bfd = current_ptr;
+	      current_ptr->archive_next = link_bfd;
+
+	      if (verbose)
+		printf ("m - %s\n", *files_to_move);
+
+	      goto next_file;
+	    }
+
+	  current_ptr_ptr = &((*current_ptr_ptr)->archive_next);
+	}
+      /* xgettext:c-format */
+      fatal (_("no entry %s in archive %s!"), *files_to_move, arch->filename);
+
+    next_file:;
+    }
+
+  write_archive (arch);
+}
+
+/* Ought to default to replacing in place, but this is existing practice!  */
+
+static void
+replace_members (bfd *arch, char **files_to_move, bfd_boolean quick)
+{
+  bfd_boolean changed = FALSE;
+  bfd **after_bfd;		/* New entries go after this one.  */
+  bfd *current;
+  bfd **current_ptr;
+
+  while (files_to_move && *files_to_move)
+    {
+      if (! quick)
+	{
+	  current_ptr = &arch->archive_next;
+	  while (*current_ptr)
+	    {
+	      current = *current_ptr;
+
+	      /* For compatibility with existing ar programs, we
+		 permit the same file to be added multiple times.  */
+	      if (FILENAME_CMP (normalize (*files_to_move, arch),
+				normalize (current->filename, arch)) == 0
+		  && current->arelt_data != NULL)
+		{
+		  if (newer_only)
+		    {
+		      struct stat fsbuf, asbuf;
+
+		      if (stat (*files_to_move, &fsbuf) != 0)
+			{
+			  if (errno != ENOENT)
+			    bfd_fatal (*files_to_move);
+			  goto next_file;
+			}
+		      if (bfd_stat_arch_elt (current, &asbuf) != 0)
+			/* xgettext:c-format */
+			fatal (_("internal stat error on %s"),
+			       current->filename);
+
+		      if (fsbuf.st_mtime <= asbuf.st_mtime)
+			goto next_file;
+		    }
+
+		  after_bfd = get_pos_bfd (&arch->archive_next, pos_after,
+					   current->filename);
+		  if (ar_emul_replace (after_bfd, *files_to_move,
+				       target, verbose))
+		    {
+		      /* Snip out this entry from the chain.  */
+		      *current_ptr = (*current_ptr)->archive_next;
+		      changed = TRUE;
+		    }
+
+		  goto next_file;
+		}
+	      current_ptr = &(current->archive_next);
+	    }
+	}
+
+      /* Add to the end of the archive.  */
+      after_bfd = get_pos_bfd (&arch->archive_next, pos_end, NULL);
+
+      if (ar_emul_append (after_bfd, *files_to_move, target,
+			  verbose, make_thin_archive))
+	changed = TRUE;
+
+    next_file:;
+
+      files_to_move++;
+    }
+
+  if (changed)
+    write_archive (arch);
+  else
+    output_filename = NULL;
+}
+
+static int
+ranlib_only (const char *archname)
+{
+  bfd *arch;
+
+  if (get_file_size (archname) < 1)
+    return 1;
+  write_armap = 1;
+  arch = open_inarch (archname, (char *) NULL);
+  if (arch == NULL)
+    xexit (1);
+  write_archive (arch);
+  return 0;
+}
+
+/* Update the timestamp of the symbol map of an archive.  */
+
+static int
+ranlib_touch (const char *archname)
+{
+#ifdef __GO32__
+  /* I don't think updating works on go32.  */
+  ranlib_only (archname);
+#else
+  int f;
+  bfd *arch;
+  char **matching;
+
+  if (get_file_size (archname) < 1)
+    return 1;
+  f = open (archname, O_RDWR | O_BINARY, 0);
+  if (f < 0)
+    {
+      bfd_set_error (bfd_error_system_call);
+      bfd_fatal (archname);
+    }
+
+  arch = bfd_fdopenr (archname, (const char *) NULL, f);
+  if (arch == NULL)
+    bfd_fatal (archname);
+  if (! bfd_check_format_matches (arch, bfd_archive, &matching))
+    {
+      bfd_nonfatal (archname);
+      if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
+	{
+	  list_matching_formats (matching);
+	  free (matching);
+	}
+      xexit (1);
+    }
+
+  if (! bfd_has_map (arch))
+    /* xgettext:c-format */
+    fatal (_("%s: no archive map to update"), archname);
+
+  bfd_update_armap_timestamp (arch);
+
+  if (! bfd_close (arch))
+    bfd_fatal (archname);
+#endif
+  return 0;
+}
+
+/* Things which are interesting to map over all or some of the files: */
+
+static void
+print_descr (bfd *abfd)
+{
+  print_arelt_descr (stdout, abfd, verbose);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/arlex.l sdcc-3.2.0+dfsg/support/sdbinutils/binutils/arlex.l
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/arlex.l	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/arlex.l	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,95 @@
+%option noinput nounput
+
+%{
+/* arlex.l - Strange script language lexer */
+
+/* Copyright 1992, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of GNU Binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* Contributed by Steve Chamberlain <sac@cygnus.com>.  */
+
+#define DONTDECLARE_MALLOC
+#include "ansidecl.h"
+#include "libiberty.h"
+#include "arparse.h"
+
+#ifndef YY_NO_UNPUT
+#define YY_NO_UNPUT
+#endif
+ 
+extern int yylex (void);
+
+int linenumber;
+%}
+
+%a 10000
+%o 25000
+
+%%
+
+"ADDLIB"   	{ return ADDLIB; }
+"ADDMOD"   	{ return ADDMOD; }
+"CLEAR"   	{ return CLEAR; }
+"CREATE"   	{ return CREATE; }
+"DELETE"   	{ return DELETE; }
+"DIRECTORY"   	{ return DIRECTORY; }
+"END"   	{ return END; }
+"EXTRACT"   	{ return EXTRACT; }
+"FULLDIR"   	{ return FULLDIR; }
+"HELP"   	{ return HELP; }
+"LIST"		{ return LIST; }
+"OPEN"   	{ return OPEN; }
+"REPLACE"   	{ return REPLACE; }
+"VERBOSE"   	{ return VERBOSE; }
+"SAVE"   	{ return SAVE; }
+"addlib"   	{ return ADDLIB; }
+"addmod"   	{ return ADDMOD; }
+"clear"   	{ return CLEAR; }
+"create"   	{ return CREATE; }
+"delete"   	{ return DELETE; }
+"directory"   	{ return DIRECTORY; }
+"end"   	{ return END; }
+"extract"   	{ return EXTRACT; }
+"fulldir"   	{ return FULLDIR; }
+"help"   	{ return HELP; }
+"list"		{ return LIST; }
+"open"   	{ return OPEN; }
+"replace"   	{ return REPLACE; }
+"verbose"   	{ return VERBOSE; }
+"save"   	{ return SAVE; }
+"+\n"           { linenumber ++; }
+"("             { return '('; }
+")"             { return ')'; }
+","             { return ','; }
+[A-Za-z0-9/\\$:.\-\_]+  { 	
+		yylval.name =  xstrdup (yytext);
+		return FILENAME;
+		}
+"*".* 		{ }
+";".* 		{ }
+" "		{ }
+"\n"	 	 { linenumber ++; return NEWLINE; }	
+
+%%
+#ifndef yywrap
+/* Needed for lex, though not flex. */
+int yywrap(void) { return 1; }
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/arparse.y sdcc-3.2.0+dfsg/support/sdbinutils/binutils/arparse.y
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/arparse.y	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/arparse.y	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,204 @@
+%{
+/* arparse.y - Stange script language parser */
+
+/* Copyright 1992, 1993, 1995, 1997, 1999, 2002, 2003, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of GNU Binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* Contributed by Steve Chamberlain
+   		  sac@cygnus.com
+
+*/
+#define DONTDECLARE_MALLOC
+#include "sysdep.h"
+#include "bfd.h"
+#include "arsup.h"
+extern int verbose;
+extern int yylex (void);
+static int yyerror (const char *);
+%}
+
+%union {
+  char *name;
+struct list *list ;
+
+};
+
+%token NEWLINE
+%token VERBOSE
+%token <name> FILENAME
+%token ADDLIB
+%token LIST
+%token ADDMOD
+%token CLEAR
+%token CREATE
+%token DELETE
+%token DIRECTORY
+%token END
+%token EXTRACT
+%token FULLDIR
+%token HELP
+%token QUIT
+%token REPLACE
+%token SAVE
+%token OPEN
+
+%type <list> modulelist 
+%type <list> modulename
+%type <name> optional_filename
+%%
+
+start:
+	{ prompt(); } session
+	;
+
+session:
+	    session command_line
+	|
+	;
+
+command_line:
+		command NEWLINE { prompt(); }
+	;
+
+command:
+		open_command	
+	|	create_command	
+	| 	verbose_command
+	|	directory_command
+	|	addlib_command
+	|	clear_command
+	|	addmod_command
+	| 	save_command
+        |       extract_command
+	|	replace_command
+	|	delete_command
+	|	list_command
+	| 	END	 { ar_end(); return 0; }
+	| 	error
+	|       FILENAME { yyerror("foo"); }
+	|
+	;
+
+
+extract_command:
+                EXTRACT modulename
+		{ ar_extract($2); }
+	;
+
+replace_command:	
+		REPLACE modulename
+		{ ar_replace($2); }
+	;
+	
+clear_command:
+		CLEAR
+		{ ar_clear(); }
+	;
+
+delete_command:
+		DELETE modulename
+		{ ar_delete($2); }
+	;
+addmod_command:
+	ADDMOD modulename
+		{ ar_addmod($2); }
+	;
+
+list_command:	
+		LIST
+		{ ar_list(); }
+	;
+
+save_command:	
+		SAVE
+		{ ar_save(); }
+	;
+
+
+
+open_command:
+		OPEN FILENAME 
+		{ ar_open($2,0); }
+	;
+
+create_command:
+		CREATE FILENAME 
+		{ ar_open($2,1); }
+	;
+
+
+addlib_command:
+		ADDLIB FILENAME modulelist
+		{ ar_addlib($2,$3); }
+	;
+directory_command:
+		DIRECTORY FILENAME modulelist optional_filename
+		{ ar_directory($2, $3, $4); }
+	;
+
+
+
+optional_filename:
+		FILENAME
+		{ $$ = $1; }
+	|	{ $$ = 0; }
+	;
+
+modulelist:
+	'(' modulename ')' 
+		{ $$ = $2; }
+	|
+		{ $$ = 0; }
+	;
+
+modulename:
+		modulename optcomma FILENAME
+		{ 	struct list *n  = (struct list *) malloc(sizeof(struct list));
+			n->next = $1; 
+			n->name = $3;
+			$$ = n;
+		 }
+	|	{ $$ = 0; }
+	;
+	
+
+optcomma:
+		','
+	|
+	;
+	
+		
+verbose_command:
+	VERBOSE 
+		{ verbose = !verbose; }
+	;
+
+
+%%
+
+static int
+yyerror (const char *x ATTRIBUTE_UNUSED)
+{
+  extern int linenumber;
+
+  printf (_("Syntax error in archive script, line %d\n"), linenumber + 1);
+  return 0;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/arsup.c sdcc-3.2.0+dfsg/support/sdbinutils/binutils/arsup.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/arsup.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/arsup.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,481 @@
+/* arsup.c - Archive support for MRI compatibility
+   Copyright 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+
+   This file is part of GNU Binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* Contributed by Steve Chamberlain
+   sac@cygnus.com
+
+   This file looks after requests from arparse.y, to provide the MRI
+   style librarian command syntax + 1 word LIST.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libiberty.h"
+#include "filenames.h"
+#include "bucomm.h"
+#include "arsup.h"
+
+static void map_over_list
+  (bfd *, void (*function) (bfd *, bfd *), struct list *);
+static void ar_directory_doer (bfd *, bfd *);
+static void ar_addlib_doer (bfd *, bfd *);
+
+extern int verbose;
+
+static bfd *obfd;
+static char *real_name;
+static FILE *outfile;
+
+static void
+map_over_list (bfd *arch, void (*function) (bfd *, bfd *), struct list *list)
+{
+  bfd *head;
+
+  if (list == NULL)
+    {
+      bfd *next;
+
+      head = arch->archive_next;
+      while (head != NULL)
+	{
+	  next = head->archive_next;
+	  function (head, (bfd *) NULL);
+	  head = next;
+	}
+    }
+  else
+    {
+      struct list *ptr;
+
+      /* This may appear to be a baroque way of accomplishing what we
+	 want.  however we have to iterate over the filenames in order
+	 to notice where a filename is requested but does not exist in
+	 the archive.  Ditto mapping over each file each time -- we
+	 want to hack multiple references.  */
+      for (ptr = list; ptr; ptr = ptr->next)
+	{
+	  bfd_boolean found = FALSE;
+	  bfd *prev = arch;
+
+	  for (head = arch->archive_next; head; head = head->archive_next)
+	    {
+	      if (head->filename != NULL
+		  && FILENAME_CMP (ptr->name, head->filename) == 0)
+		{
+		  found = TRUE;
+		  function (head, prev);
+		}
+	      prev = head;
+	    }
+	  if (! found)
+	    fprintf (stderr, _("No entry %s in archive.\n"), ptr->name);
+	}
+    }
+}
+
+
+
+static void
+ar_directory_doer (bfd *abfd, bfd *ignore ATTRIBUTE_UNUSED)
+{
+  print_arelt_descr(outfile, abfd, verbose);
+}
+
+void
+ar_directory (char *ar_name, struct list *list, char *output)
+{
+  bfd *arch;
+
+  arch = open_inarch (ar_name, (char *) NULL);
+  if (output)
+    {
+      outfile = fopen(output,"w");
+      if (outfile == 0)
+	{
+	  outfile = stdout;
+	  fprintf (stderr,_("Can't open file %s\n"), output);
+	  output = 0;
+	}
+    }
+  else
+    outfile = stdout;
+
+  map_over_list (arch, ar_directory_doer, list);
+
+  bfd_close (arch);
+
+  if (output)
+   fclose (outfile);
+}
+
+void
+prompt (void)
+{
+  extern int interactive;
+
+  if (interactive)
+    {
+      printf ("AR >");
+      fflush (stdout);
+    }
+}
+
+void
+maybequit (void)
+{
+  if (! interactive)
+    xexit (9);
+}
+
+
+void
+ar_open (char *name, int t)
+{
+  char *tname = (char *) xmalloc (strlen (name) + 10);
+  const char *bname = lbasename (name);
+  real_name = name;
+
+  /* Prepend tmp- to the beginning, to avoid file-name clashes after
+     truncation on filesystems with limited namespaces (DOS).  */
+  sprintf (tname, "%.*stmp-%s", (int) (bname - name), name, bname);
+  obfd = bfd_openw (tname, NULL);
+
+  if (!obfd)
+    {
+      fprintf (stderr,
+	       _("%s: Can't open output archive %s\n"),
+	       program_name,  tname);
+
+      maybequit ();
+    }
+  else
+    {
+      if (!t)
+	{
+	  bfd **ptr;
+	  bfd *element;
+	  bfd *ibfd;
+
+	  ibfd = bfd_openr (name, NULL);
+
+	  if (!ibfd)
+	    {
+	      fprintf (stderr,_("%s: Can't open input archive %s\n"),
+		       program_name, name);
+	      maybequit ();
+	      return;
+	    }
+
+	  if (!bfd_check_format(ibfd, bfd_archive))
+	    {
+	      fprintf (stderr,
+		       _("%s: file %s is not an archive\n"),
+		       program_name, name);
+	      maybequit ();
+	      return;
+	    }
+
+	  ptr = &(obfd->archive_head);
+	  element = bfd_openr_next_archived_file (ibfd, NULL);
+
+	  while (element)
+	    {
+	      *ptr = element;
+	      ptr = &element->archive_next;
+	      element = bfd_openr_next_archived_file (ibfd, element);
+	    }
+	}
+
+      bfd_set_format (obfd, bfd_archive);
+
+      obfd->has_armap = 1;
+      obfd->is_thin_archive = 0;
+    }
+}
+
+static void
+ar_addlib_doer (bfd *abfd, bfd *prev)
+{
+  /* Add this module to the output bfd.  */
+  if (prev != NULL)
+    prev->archive_next = abfd->archive_next;
+
+  abfd->archive_next = obfd->archive_head;
+  obfd->archive_head = abfd;
+}
+
+void
+ar_addlib (char *name, struct list *list)
+{
+  if (obfd == NULL)
+    {
+      fprintf (stderr, _("%s: no output archive specified yet\n"), program_name);
+      maybequit ();
+    }
+  else
+    {
+      bfd *arch;
+
+      arch = open_inarch (name, (char *) NULL);
+      if (arch != NULL)
+	map_over_list (arch, ar_addlib_doer, list);
+
+      /* Don't close the bfd, since it will make the elements disappear.  */
+    }
+}
+
+void
+ar_addmod (struct list *list)
+{
+  if (!obfd)
+    {
+      fprintf (stderr, _("%s: no open output archive\n"), program_name);
+      maybequit ();
+    }
+  else
+    {
+      while (list)
+	{
+	  bfd *abfd = bfd_openr (list->name, NULL);
+
+	  if (!abfd)
+	    {
+	      fprintf (stderr, _("%s: can't open file %s\n"),
+		       program_name, list->name);
+	      maybequit ();
+	    }
+	  else
+	    {
+	      abfd->archive_next = obfd->archive_head;
+	      obfd->archive_head = abfd;
+	    }
+	  list = list->next;
+	}
+    }
+}
+
+
+void
+ar_clear (void)
+{
+  if (obfd)
+    obfd->archive_head = 0;
+}
+
+void
+ar_delete (struct list *list)
+{
+  if (!obfd)
+    {
+      fprintf (stderr, _("%s: no open output archive\n"), program_name);
+      maybequit ();
+    }
+  else
+    {
+      while (list)
+	{
+	  /* Find this name in the archive.  */
+	  bfd *member = obfd->archive_head;
+	  bfd **prev = &(obfd->archive_head);
+	  int found = 0;
+
+	  while (member)
+	    {
+	      if (FILENAME_CMP(member->filename, list->name) == 0)
+		{
+		  *prev = member->archive_next;
+		  found = 1;
+		}
+	      else
+		prev = &(member->archive_next);
+
+	      member = member->archive_next;
+	    }
+
+	  if (!found)
+	    {
+	      fprintf (stderr, _("%s: can't find module file %s\n"),
+		       program_name, list->name);
+	      maybequit ();
+	    }
+
+	  list = list->next;
+	}
+    }
+}
+
+void
+ar_save (void)
+{
+  if (!obfd)
+    {
+      fprintf (stderr, _("%s: no open output archive\n"), program_name);
+      maybequit ();
+    }
+  else
+    {
+      char *ofilename = xstrdup (bfd_get_filename (obfd));
+
+      bfd_close (obfd);
+
+      smart_rename (ofilename, real_name, 0);
+      obfd = 0;
+      free (ofilename);
+    }
+}
+
+void
+ar_replace (struct list *list)
+{
+  if (!obfd)
+    {
+      fprintf (stderr, _("%s: no open output archive\n"), program_name);
+      maybequit ();
+    }
+  else
+    {
+      while (list)
+	{
+	  /* Find this name in the archive.  */
+	  bfd *member = obfd->archive_head;
+	  bfd **prev = &(obfd->archive_head);
+	  int found = 0;
+
+	  while (member)
+	    {
+	      if (FILENAME_CMP (member->filename, list->name) == 0)
+		{
+		  /* Found the one to replace.  */
+		  bfd *abfd = bfd_openr (list->name, 0);
+
+		  if (!abfd)
+		    {
+		      fprintf (stderr, _("%s: can't open file %s\n"),
+			       program_name, list->name);
+		      maybequit ();
+		    }
+		  else
+		    {
+		      *prev = abfd;
+		      abfd->archive_next = member->archive_next;
+		      found = 1;
+		    }
+		}
+	      else
+		{
+		  prev = &(member->archive_next);
+		}
+	      member = member->archive_next;
+	    }
+
+	  if (!found)
+	    {
+	      bfd *abfd = bfd_openr (list->name, 0);
+
+	      fprintf (stderr,_("%s: can't find module file %s\n"),
+		       program_name, list->name);
+	      if (!abfd)
+		{
+		  fprintf (stderr, _("%s: can't open file %s\n"),
+			   program_name, list->name);
+		  maybequit ();
+		}
+	      else
+		*prev = abfd;
+	    }
+
+	  list = list->next;
+	}
+    }
+}
+
+/* And I added this one.  */
+void
+ar_list (void)
+{
+  if (!obfd)
+    {
+      fprintf (stderr, _("%s: no open output archive\n"), program_name);
+      maybequit ();
+    }
+  else
+    {
+      bfd *abfd;
+
+      outfile = stdout;
+      verbose =1 ;
+      printf (_("Current open archive is %s\n"), bfd_get_filename (obfd));
+
+      for (abfd = obfd->archive_head;
+	   abfd != (bfd *)NULL;
+	   abfd = abfd->archive_next)
+	ar_directory_doer (abfd, (bfd *) NULL);
+    }
+}
+
+void
+ar_end (void)
+{
+  if (obfd)
+    {
+      bfd_cache_close (obfd);
+      unlink (bfd_get_filename (obfd));
+    }
+}
+
+void
+ar_extract (struct list *list)
+{
+  if (!obfd)
+    {
+      fprintf (stderr, _("%s: no open archive\n"), program_name);
+      maybequit ();
+    }
+  else
+    {
+      while (list)
+	{
+	  /* Find this name in the archive.  */
+	  bfd *member = obfd->archive_head;
+	  int found = 0;
+
+	  while (member && !found)
+	    {
+	      if (FILENAME_CMP (member->filename, list->name) == 0)
+		{
+		  extract_file (member);
+		  found = 1;
+		}
+
+	      member = member->archive_next;
+	    }
+
+	  if (!found)
+	    {
+	      bfd_openr (list->name, 0);
+	      fprintf (stderr, _("%s: can't find module file %s\n"),
+		       program_name, list->name);
+	    }
+
+	  list = list->next;
+	}
+    }
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/arsup.h sdcc-3.2.0+dfsg/support/sdbinutils/binutils/arsup.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/arsup.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/arsup.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,63 @@
+/* arsup.h - archive support header file
+   Copyright 1992, 1993, 1994, 1996, 2001, 2002, 2003, 2005, 2007
+   Free Software Foundation, Inc.
+
+   This file is part of GNU Binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+struct list {
+	char *name;
+	struct list *next;
+};
+
+void maybequit (void);
+
+void prompt (void);
+
+void ar_clear (void);
+
+void ar_replace (struct list *);
+
+void ar_delete (struct list *);
+
+void ar_save (void);
+
+void ar_list (void);
+
+void ar_open (char *, int);
+
+void ar_directory (char *, struct list *, char *);
+
+void ar_addmod (struct list *);
+
+void ar_addlib (char *, struct list *);
+
+void ar_end (void);
+
+void ar_extract (struct list *);
+
+bfd *open_inarch (const char *archive_filename, const char *);
+
+extern int yylex (void);
+
+int yyparse (void);
+
+/* Functions from ar.c */
+
+void extract_file (bfd * abfd);
+
+extern int interactive;
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/binemul.c sdcc-3.2.0+dfsg/support/sdbinutils/binutils/binemul.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/binemul.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/binemul.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,149 @@
+/* Binutils emulation layer.
+   Copyright 2002, 2003, 2005, 2007, 2008, 2010
+   Free Software Foundation, Inc.
+   Written by Tom Rix, Red Hat Inc.
+
+   This file is part of GNU Binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "binemul.h"
+
+extern bin_emulation_xfer_type bin_dummy_emulation;
+
+void
+ar_emul_usage (FILE *fp)
+{
+  if (bin_dummy_emulation.ar_usage)
+    bin_dummy_emulation.ar_usage (fp);
+}
+
+void
+ar_emul_default_usage (FILE *fp)
+{
+  AR_EMUL_USAGE_PRINT_OPTION_HEADER (fp);
+  /* xgettext:c-format */
+  fprintf (fp, _("  No emulation specific options\n"));
+}
+
+bfd_boolean
+ar_emul_append (bfd **after_bfd, char *file_name, const char *target,
+		bfd_boolean verbose, bfd_boolean flatten)
+{
+  if (bin_dummy_emulation.ar_append)
+    return bin_dummy_emulation.ar_append (after_bfd, file_name, target,
+					  verbose, flatten);
+
+  return FALSE;
+}
+
+static bfd_boolean
+any_ok (bfd *new_bfd ATTRIBUTE_UNUSED)
+{
+  return TRUE;
+}
+
+bfd_boolean
+do_ar_emul_append (bfd **after_bfd, bfd *new_bfd,
+		   bfd_boolean verbose, bfd_boolean flatten,
+		   bfd_boolean (*check) (bfd *))
+{
+  /* When flattening, add the members of an archive instead of the
+     archive itself.  */
+  if (flatten && bfd_check_format (new_bfd, bfd_archive))
+    {
+      bfd *elt;
+      bfd_boolean added = FALSE;
+
+      for (elt = bfd_openr_next_archived_file (new_bfd, NULL);
+           elt;
+           elt = bfd_openr_next_archived_file (new_bfd, elt))
+        {
+          if (do_ar_emul_append (after_bfd, elt, verbose, TRUE, check))
+            {
+              added = TRUE;
+              after_bfd = &((*after_bfd)->archive_next);
+            }
+        }
+
+      return added;
+    }
+
+  if (!check (new_bfd))
+    return FALSE;
+
+  AR_EMUL_APPEND_PRINT_VERBOSE (verbose, new_bfd->filename);
+
+  new_bfd->archive_next = *after_bfd;
+  *after_bfd = new_bfd;
+
+  return TRUE;
+}
+
+bfd_boolean
+ar_emul_default_append (bfd **after_bfd, char *file_name,
+			const char *target, bfd_boolean verbose,
+			bfd_boolean flatten)
+{
+  bfd *new_bfd;
+
+  new_bfd = bfd_openr (file_name, target);
+  AR_EMUL_ELEMENT_CHECK (new_bfd, file_name);
+  return do_ar_emul_append (after_bfd, new_bfd, verbose, flatten, any_ok);
+}
+
+bfd_boolean
+ar_emul_replace (bfd **after_bfd, char *file_name, const char *target,
+		 bfd_boolean verbose)
+{
+  if (bin_dummy_emulation.ar_replace)
+    return bin_dummy_emulation.ar_replace (after_bfd, file_name,
+					   target, verbose);
+
+  return FALSE;
+}
+
+bfd_boolean
+ar_emul_default_replace (bfd **after_bfd, char *file_name,
+			 const char *target, bfd_boolean verbose)
+{
+  bfd *new_bfd;
+
+  new_bfd = bfd_openr (file_name, target);
+  AR_EMUL_ELEMENT_CHECK (new_bfd, file_name);
+
+  AR_EMUL_REPLACE_PRINT_VERBOSE (verbose, file_name);
+
+  new_bfd->archive_next = *after_bfd;
+  *after_bfd = new_bfd;
+
+  return TRUE;
+}
+
+bfd_boolean
+ar_emul_parse_arg (char *arg)
+{
+  if (bin_dummy_emulation.ar_parse_arg)
+    return bin_dummy_emulation.ar_parse_arg (arg);
+
+  return FALSE;
+}
+
+bfd_boolean
+ar_emul_default_parse_arg (char *arg ATTRIBUTE_UNUSED)
+{
+  return FALSE;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/binemul.h sdcc-3.2.0+dfsg/support/sdbinutils/binutils/binemul.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/binemul.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/binemul.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,71 @@
+/* Binutils emulation layer.
+   Copyright 2002, 2003, 2005, 2007, 2008 Free Software Foundation, Inc.
+   Written by Tom Rix, Red Hat Inc.
+
+   This file is part of GNU Binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef BINEMUL_H
+#define BINEMUL_H
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bucomm.h"
+
+extern void ar_emul_usage (FILE *);
+extern void ar_emul_default_usage (FILE *);
+extern bfd_boolean ar_emul_append (bfd **, char *, const char *,
+				   bfd_boolean, bfd_boolean);
+extern bfd_boolean ar_emul_default_append (bfd **, char *, const char *,
+					   bfd_boolean, bfd_boolean);
+extern bfd_boolean do_ar_emul_append (bfd **, bfd *,
+				      bfd_boolean, bfd_boolean,
+				      bfd_boolean (*)(bfd *));
+extern bfd_boolean ar_emul_replace (bfd **, char *, const char *,
+				    bfd_boolean);
+extern bfd_boolean ar_emul_default_replace (bfd **, char *,
+					    const char *, bfd_boolean);
+extern bfd_boolean ar_emul_parse_arg (char *);
+extern bfd_boolean ar_emul_default_parse_arg (char *);
+
+/* Macros for common output.  */
+
+#define AR_EMUL_USAGE_PRINT_OPTION_HEADER(fp) \
+  /* xgettext:c-format */                     \
+  fprintf (fp, _(" emulation options: \n"))
+
+#define AR_EMUL_ELEMENT_CHECK(abfd, file_name) \
+  do { if ((abfd) == NULL) bfd_fatal (file_name); } while (0)
+
+#define AR_EMUL_APPEND_PRINT_VERBOSE(verbose, file_name) \
+  do { if (verbose) printf ("a - %s\n", file_name); } while (0)
+
+#define AR_EMUL_REPLACE_PRINT_VERBOSE(verbose, file_name) \
+  do { if (verbose) printf ("r - %s\n", file_name); } while (0)
+
+typedef struct bin_emulation_xfer_struct
+{
+  /* Print out the extra options.  */
+  void (* ar_usage) (FILE *fp);
+  bfd_boolean (* ar_append) (bfd **, char *, const char *, bfd_boolean,
+			     bfd_boolean);
+  bfd_boolean (* ar_replace) (bfd **, char *, const char *, bfd_boolean);
+  bfd_boolean (* ar_parse_arg) (char *);
+}
+bin_emulation_xfer_type;
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/bucomm.c sdcc-3.2.0+dfsg/support/sdbinutils/binutils/bucomm.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/bucomm.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/bucomm.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,625 @@
+/* bucomm.c -- Bin Utils COMmon code.
+   Copyright 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000, 2001, 2002,
+   2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of GNU Binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+/* We might put this in a library someday so it could be dynamically
+   loaded, but for now it's not necessary.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libiberty.h"
+#include "filenames.h"
+#include "libbfd.h"
+
+#include <sys/stat.h>
+#include <time.h>		/* ctime, maybe time_t */
+#include <assert.h>
+#include "bucomm.h"
+
+#ifndef HAVE_TIME_T_IN_TIME_H
+#ifndef HAVE_TIME_T_IN_TYPES_H
+typedef long time_t;
+#endif
+#endif
+
+static const char * endian_string (enum bfd_endian);
+static int display_target_list (void);
+static int display_info_table (int, int);
+static int display_target_tables (void);
+
+/* Error reporting.  */
+
+char *program_name;
+
+void
+bfd_nonfatal (const char *string)
+{
+  const char *errmsg;
+
+  errmsg = bfd_errmsg (bfd_get_error ());
+  fflush (stdout);
+  if (string)
+    fprintf (stderr, "%s: %s: %s\n", program_name, string, errmsg);
+  else
+    fprintf (stderr, "%s: %s\n", program_name, errmsg);
+}
+
+/* Issue a non fatal error message.  FILENAME, or if NULL then BFD,
+   are used to indicate the problematic file.  SECTION, if non NULL,
+   is used to provide a section name.  If FORMAT is non-null, then it
+   is used to print additional information via vfprintf.  Finally the
+   bfd error message is printed.  In summary, error messages are of
+   one of the following forms:
+
+   PROGRAM:file: bfd-error-message
+   PROGRAM:file[section]: bfd-error-message
+   PROGRAM:file: printf-message: bfd-error-message
+   PROGRAM:file[section]: printf-message: bfd-error-message.  */
+
+void
+bfd_nonfatal_message (const char *filename,
+		      const bfd *abfd,
+		      const asection *section,
+		      const char *format, ...)
+{
+  const char *errmsg;
+  const char *section_name;
+  va_list args;
+
+  errmsg = bfd_errmsg (bfd_get_error ());
+  fflush (stdout);
+  section_name = NULL;
+  va_start (args, format);
+  fprintf (stderr, "%s", program_name);
+  
+  if (abfd)
+    {
+      if (!filename)
+	filename = bfd_get_archive_filename (abfd);
+      if (section)
+	section_name = bfd_get_section_name (abfd, section);
+    }
+  if (section_name)
+    fprintf (stderr, ":%s[%s]", filename, section_name);
+  else
+    fprintf (stderr, ":%s", filename);
+
+  if (format)
+    {
+      fprintf (stderr, ": ");
+      vfprintf (stderr, format, args);
+    }
+  fprintf (stderr, ": %s\n", errmsg);
+  va_end (args);
+}
+
+void
+bfd_fatal (const char *string)
+{
+  bfd_nonfatal (string);
+  xexit (1);
+}
+
+void
+report (const char * format, va_list args)
+{
+  fflush (stdout);
+  fprintf (stderr, "%s: ", program_name);
+  vfprintf (stderr, format, args);
+  putc ('\n', stderr);
+}
+
+void
+fatal VPARAMS ((const char *format, ...))
+{
+  VA_OPEN (args, format);
+  VA_FIXEDARG (args, const char *, format);
+
+  report (format, args);
+  VA_CLOSE (args);
+  xexit (1);
+}
+
+void
+non_fatal VPARAMS ((const char *format, ...))
+{
+  VA_OPEN (args, format);
+  VA_FIXEDARG (args, const char *, format);
+
+  report (format, args);
+  VA_CLOSE (args);
+}
+
+/* Set the default BFD target based on the configured target.  Doing
+   this permits the binutils to be configured for a particular target,
+   and linked against a shared BFD library which was configured for a
+   different target.  */
+
+void
+set_default_bfd_target (void)
+{
+  /* The macro TARGET is defined by Makefile.  */
+  const char *target = TARGET;
+
+  if (! bfd_set_default_target (target))
+    fatal (_("can't set BFD default target to `%s': %s"),
+	   target, bfd_errmsg (bfd_get_error ()));
+}
+
+/* After a FALSE return from bfd_check_format_matches with
+   bfd_get_error () == bfd_error_file_ambiguously_recognized, print
+   the possible matching targets.  */
+
+void
+list_matching_formats (char **p)
+{
+  fflush (stdout);
+  fprintf (stderr, _("%s: Matching formats:"), program_name);
+  while (*p)
+    fprintf (stderr, " %s", *p++);
+  fputc ('\n', stderr);
+}
+
+/* List the supported targets.  */
+
+void
+list_supported_targets (const char *name, FILE *f)
+{
+  int t;
+  const char **targ_names;
+
+  if (name == NULL)
+    fprintf (f, _("Supported targets:"));
+  else
+    fprintf (f, _("%s: supported targets:"), name);
+
+  targ_names = bfd_target_list ();
+  for (t = 0; targ_names[t] != NULL; t++)
+    fprintf (f, " %s", targ_names[t]);
+  fprintf (f, "\n");
+  free (targ_names);
+}
+
+/* List the supported architectures.  */
+
+void
+list_supported_architectures (const char *name, FILE *f)
+{
+  const char ** arch;
+  const char ** arches;
+
+  if (name == NULL)
+    fprintf (f, _("Supported architectures:"));
+  else
+    fprintf (f, _("%s: supported architectures:"), name);
+
+  for (arch = arches = bfd_arch_list (); *arch; arch++)
+    fprintf (f, " %s", *arch);
+  fprintf (f, "\n");
+  free (arches);
+}
+
+/* The length of the longest architecture name + 1.  */
+#define LONGEST_ARCH sizeof ("powerpc:common")
+
+static const char *
+endian_string (enum bfd_endian endian)
+{
+  switch (endian)
+    {
+    case BFD_ENDIAN_BIG: return "big endian";
+    case BFD_ENDIAN_LITTLE: return "little endian";
+    default: return "endianness unknown";
+    }
+}
+
+/* List the targets that BFD is configured to support, each followed
+   by its endianness and the architectures it supports.  */
+
+static int
+display_target_list (void)
+{
+  char *dummy_name;
+  int t;
+  int ret = 1;
+
+  dummy_name = make_temp_file (NULL);
+  for (t = 0; bfd_target_vector[t]; t++)
+    {
+      const bfd_target *p = bfd_target_vector[t];
+      bfd *abfd = bfd_openw (dummy_name, p->name);
+      int a;
+
+      printf ("%s\n (header %s, data %s)\n", p->name,
+	      endian_string (p->header_byteorder),
+	      endian_string (p->byteorder));
+
+      if (abfd == NULL)
+	{
+          bfd_nonfatal (dummy_name);
+          ret = 0;
+	  continue;
+	}
+
+      if (! bfd_set_format (abfd, bfd_object))
+	{
+	  if (bfd_get_error () != bfd_error_invalid_operation)
+            {
+	      bfd_nonfatal (p->name);
+              ret = 0;
+            }
+	  bfd_close_all_done (abfd);
+	  continue;
+	}
+
+      for (a = bfd_arch_obscure + 1; a < bfd_arch_last; a++)
+	if (bfd_set_arch_mach (abfd, (enum bfd_architecture) a, 0))
+	  printf ("  %s\n",
+		  bfd_printable_arch_mach ((enum bfd_architecture) a, 0));
+      bfd_close_all_done (abfd);
+    }
+  unlink (dummy_name);
+  free (dummy_name);
+
+  return ret;
+}
+
+/* Print a table showing which architectures are supported for entries
+   FIRST through LAST-1 of bfd_target_vector (targets across,
+   architectures down).  */
+
+static int
+display_info_table (int first, int last)
+{
+  int t;
+  int ret = 1;
+  char *dummy_name;
+  int a;
+
+  /* Print heading of target names.  */
+  printf ("\n%*s", (int) LONGEST_ARCH, " ");
+  for (t = first; t < last && bfd_target_vector[t]; t++)
+    printf ("%s ", bfd_target_vector[t]->name);
+  putchar ('\n');
+
+  dummy_name = make_temp_file (NULL);
+  for (a = bfd_arch_obscure + 1; a < bfd_arch_last; a++)
+    if (strcmp (bfd_printable_arch_mach ((enum bfd_architecture) a, 0),
+                "UNKNOWN!") != 0)
+      {
+	printf ("%*s ", (int) LONGEST_ARCH - 1,
+		bfd_printable_arch_mach ((enum bfd_architecture) a, 0));
+	for (t = first; t < last && bfd_target_vector[t]; t++)
+	  {
+	    const bfd_target *p = bfd_target_vector[t];
+	    bfd_boolean ok = TRUE;
+	    bfd *abfd = bfd_openw (dummy_name, p->name);
+
+	    if (abfd == NULL)
+	      {
+		bfd_nonfatal (p->name);
+                ret = 0;
+		ok = FALSE;
+	      }
+
+	    if (ok)
+	      {
+		if (! bfd_set_format (abfd, bfd_object))
+		  {
+		    if (bfd_get_error () != bfd_error_invalid_operation)
+                      {
+		        bfd_nonfatal (p->name);
+                        ret = 0;
+                      }
+		    ok = FALSE;
+		  }
+	      }
+
+	    if (ok)
+	      {
+		if (! bfd_set_arch_mach (abfd, (enum bfd_architecture) a, 0))
+		  ok = FALSE;
+	      }
+
+	    if (ok)
+	      printf ("%s ", p->name);
+	    else
+	      {
+		int l = strlen (p->name);
+		while (l--)
+		  putchar ('-');
+		putchar (' ');
+	      }
+	    if (abfd != NULL)
+	      bfd_close_all_done (abfd);
+	  }
+	putchar ('\n');
+      }
+  unlink (dummy_name);
+  free (dummy_name);
+
+  return ret;
+}
+
+/* Print tables of all the target-architecture combinations that
+   BFD has been configured to support.  */
+
+static int
+display_target_tables (void)
+{
+  int t;
+  int columns;
+  int ret = 1;
+  char *colum;
+
+  columns = 0;
+  colum = getenv ("COLUMNS");
+  if (colum != NULL)
+    columns = atoi (colum);
+  if (columns == 0)
+    columns = 80;
+
+  t = 0;
+  while (bfd_target_vector[t] != NULL)
+    {
+      int oldt = t, wid;
+
+      wid = LONGEST_ARCH + strlen (bfd_target_vector[t]->name) + 1;
+      ++t;
+      while (wid < columns && bfd_target_vector[t] != NULL)
+	{
+	  int newwid;
+
+	  newwid = wid + strlen (bfd_target_vector[t]->name) + 1;
+	  if (newwid >= columns)
+	    break;
+	  wid = newwid;
+	  ++t;
+	}
+      if (! display_info_table (oldt, t))
+        ret = 0;
+    }
+
+  return ret;
+}
+
+int
+display_info (void)
+{
+  printf (_("BFD header file version %s\n"), BFD_VERSION_STRING);
+  if (! display_target_list () || ! display_target_tables ())
+    return 1;
+  else
+    return 0;
+}
+
+/* Display the archive header for an element as if it were an ls -l listing:
+
+   Mode       User\tGroup\tSize\tDate               Name */
+
+void
+print_arelt_descr (FILE *file, bfd *abfd, bfd_boolean verbose)
+{
+  struct stat buf;
+
+  if (verbose)
+    {
+      if (bfd_stat_arch_elt (abfd, &buf) == 0)
+	{
+	  char modebuf[11];
+	  char timebuf[40];
+	  time_t when = buf.st_mtime;
+	  const char *ctime_result = (const char *) ctime (&when);
+
+	  /* POSIX format:  skip weekday and seconds from ctime output.  */
+	  sprintf (timebuf, "%.12s %.4s", ctime_result + 4, ctime_result + 20);
+
+	  mode_string (buf.st_mode, modebuf);
+	  modebuf[10] = '\0';
+	  /* POSIX 1003.2/D11 says to skip first character (entry type).  */
+	  fprintf (file, "%s %ld/%ld %6ld %s ", modebuf + 1,
+		   (long) buf.st_uid, (long) buf.st_gid,
+		   (long) buf.st_size, timebuf);
+	}
+    }
+
+  fprintf (file, "%s\n", bfd_get_filename (abfd));
+}
+
+/* Return a path for a new temporary file in the same directory
+   as file PATH.  */
+
+static char *
+template_in_dir (const char *path)
+{
+#define template "stXXXXXX"
+  const char *slash = strrchr (path, '/');
+  char *tmpname;
+  size_t len;
+
+#ifdef HAVE_DOS_BASED_FILE_SYSTEM
+  {
+    /* We could have foo/bar\\baz, or foo\\bar, or d:bar.  */
+    char *bslash = strrchr (path, '\\');
+
+    if (slash == NULL || (bslash != NULL && bslash > slash))
+      slash = bslash;
+    if (slash == NULL && path[0] != '\0' && path[1] == ':')
+      slash = path + 1;
+  }
+#endif
+
+  if (slash != (char *) NULL)
+    {
+      len = slash - path;
+      tmpname = (char *) xmalloc (len + sizeof (template) + 2);
+      memcpy (tmpname, path, len);
+
+#ifdef HAVE_DOS_BASED_FILE_SYSTEM
+      /* If tmpname is "X:", appending a slash will make it a root
+	 directory on drive X, which is NOT the same as the current
+	 directory on drive X.  */
+      if (len == 2 && tmpname[1] == ':')
+	tmpname[len++] = '.';
+#endif
+      tmpname[len++] = '/';
+    }
+  else
+    {
+      tmpname = (char *) xmalloc (sizeof (template));
+      len = 0;
+    }
+
+  memcpy (tmpname + len, template, sizeof (template));
+  return tmpname;
+#undef template
+}
+
+/* Return the name of a created temporary file in the same directory
+   as FILENAME.  */
+
+char *
+make_tempname (char *filename)
+{
+  char *tmpname = template_in_dir (filename);
+  int fd;
+
+#ifdef HAVE_MKSTEMP
+  fd = mkstemp (tmpname);
+#else
+  tmpname = mktemp (tmpname);
+  if (tmpname == NULL)
+    return NULL;
+  fd = open (tmpname, O_RDWR | O_CREAT | O_EXCL, 0600);
+#endif
+  if (fd == -1)
+    {
+      free (tmpname);
+      return NULL;
+    }
+  close (fd);
+  return tmpname;
+}
+
+/* Return the name of a created temporary directory inside the
+   directory containing FILENAME.  */
+
+char *
+make_tempdir (char *filename)
+{
+  char *tmpname = template_in_dir (filename);
+
+#ifdef HAVE_MKDTEMP
+  return mkdtemp (tmpname);
+#else
+  tmpname = mktemp (tmpname);
+  if (tmpname == NULL)
+    return NULL;
+#if defined (_WIN32) && !defined (__CYGWIN32__)
+  if (mkdir (tmpname) != 0)
+    return NULL;
+#else
+  if (mkdir (tmpname, 0700) != 0)
+    return NULL;
+#endif
+  return tmpname;
+#endif
+}
+
+/* Parse a string into a VMA, with a fatal error if it can't be
+   parsed.  */
+
+bfd_vma
+parse_vma (const char *s, const char *arg)
+{
+  bfd_vma ret;
+  const char *end;
+
+  ret = bfd_scan_vma (s, &end, 0);
+
+  if (*end != '\0')
+    fatal (_("%s: bad number: %s"), arg, s);
+
+  return ret;
+}
+
+/* Returns the size of the named file.  If the file does not
+   exist, or if it is not a real file, then a suitable non-fatal
+   error message is printed and (off_t) -1 is returned.  */
+
+off_t
+get_file_size (const char * file_name)
+{
+  struct stat statbuf;
+  
+  if (stat (file_name, &statbuf) < 0)
+    {
+      if (errno == ENOENT)
+	non_fatal (_("'%s': No such file"), file_name);
+      else
+	non_fatal (_("Warning: could not locate '%s'.  reason: %s"),
+		   file_name, strerror (errno));
+    }  
+  else if (! S_ISREG (statbuf.st_mode))
+    non_fatal (_("Warning: '%s' is not an ordinary file"), file_name);
+  else if (statbuf.st_size < 0)
+    non_fatal (_("Warning: '%s' has negative size, probably it is too large"),
+               file_name);
+  else
+    return statbuf.st_size;
+
+  return (off_t) -1;
+}
+
+/* Return the filename in a static buffer.  */
+
+const char *
+bfd_get_archive_filename (const bfd *abfd)
+{
+  static size_t curr = 0;
+  static char *buf;
+  size_t needed;
+
+  assert (abfd != NULL);
+  
+  if (!abfd->my_archive)
+    return bfd_get_filename (abfd);
+
+  needed = (strlen (bfd_get_filename (abfd->my_archive))
+	    + strlen (bfd_get_filename (abfd)) + 3);
+  if (needed > curr)
+    {
+      if (curr)
+	free (buf);
+      curr = needed + (needed >> 1);
+      buf = (char *) bfd_malloc (curr);
+      /* If we can't malloc, fail safe by returning just the file name.
+	 This function is only used when building error messages.  */
+      if (!buf)
+	{
+	  curr = 0;
+	  return bfd_get_filename (abfd);
+	}
+    }
+  sprintf (buf, "%s(%s)", bfd_get_filename (abfd->my_archive),
+	   bfd_get_filename (abfd));
+  return buf;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/bucomm.h sdcc-3.2.0+dfsg/support/sdbinutils/binutils/bucomm.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/bucomm.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/bucomm.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,79 @@
+/* bucomm.h -- binutils common include file.
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
+   Free Software Foundation, Inc.
+
+   This file is part of GNU Binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _BUCOMM_H
+#define _BUCOMM_H
+
+/* Return the filename in a static buffer.  */
+const char *bfd_get_archive_filename (const bfd *);
+
+void bfd_nonfatal (const char *);
+
+void bfd_nonfatal_message (const char *, const bfd *, const asection *,
+			   const char *, ...);
+
+void bfd_fatal (const char *) ATTRIBUTE_NORETURN;
+
+void report (const char *, va_list) ATTRIBUTE_PRINTF(1,0);
+
+void fatal (const char *, ...) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN;
+
+void non_fatal (const char *, ...) ATTRIBUTE_PRINTF_1;
+
+void set_default_bfd_target (void);
+
+void list_matching_formats (char **);
+
+void list_supported_targets (const char *, FILE *);
+
+void list_supported_architectures (const char *, FILE *);
+
+int display_info (void);
+
+void print_arelt_descr (FILE *, bfd *, bfd_boolean);
+
+char *make_tempname (char *);
+char *make_tempdir (char *);
+
+bfd_vma parse_vma (const char *, const char *);
+
+off_t get_file_size (const char *);
+
+extern char *program_name;
+
+/* filemode.c */
+void mode_string (unsigned long, char *);
+
+/* version.c */
+extern void print_version (const char *);
+
+/* rename.c */
+extern void set_times (const char *, const struct stat *);
+
+extern int smart_rename (const char *, const char *, int);
+
+/* libiberty.  */
+void *xmalloc (size_t);
+
+void *xrealloc (void *, size_t);
+
+#endif /* _BUCOMM_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/config.in sdcc-3.2.0+dfsg/support/sdbinutils/binutils/config.in
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/config.in	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/config.in	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,239 @@
+/* config.in.  Generated from configure.in by autoheader.  */
+
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+#undef CRAY_STACKSEG_END
+
+/* Define to 1 if using `alloca.c'. */
+#undef C_ALLOCA
+
+/* Define to 1 if translation of program messages to the user's native
+   language is requested. */
+#undef ENABLE_NLS
+
+/* Suffix used for executables, if any. */
+#undef EXECUTABLE_SUFFIX
+
+/* Define to 1 if you have `alloca', as a function or macro. */
+#undef HAVE_ALLOCA
+
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
+#undef HAVE_ALLOCA_H
+
+/* Define to 1 if you have the declaration of `environ', and to 0 if you
+   don't. */
+#undef HAVE_DECL_ENVIRON
+
+/* Define to 1 if you have the declaration of `fprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL_FPRINTF
+
+/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
+   don't. */
+#undef HAVE_DECL_GETC_UNLOCKED
+
+/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
+   */
+#undef HAVE_DECL_GETENV
+
+/* Is the prototype for getopt in <unistd.h> in the expected format? */
+#undef HAVE_DECL_GETOPT
+
+/* Define to 1 if you have the declaration of `sbrk', and to 0 if you don't.
+   */
+#undef HAVE_DECL_SBRK
+
+/* Define to 1 if you have the declaration of `snprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL_SNPRINTF
+
+/* Define to 1 if you have the declaration of `stpcpy', and to 0 if you don't.
+   */
+#undef HAVE_DECL_STPCPY
+
+/* Define to 1 if you have the declaration of `strstr', and to 0 if you don't.
+   */
+#undef HAVE_DECL_STRSTR
+
+/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL_VSNPRINTF
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Does the platform use an executable suffix? */
+#undef HAVE_EXECUTABLE_SUFFIX
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define to 1 if you have the `getc_unlocked' function. */
+#undef HAVE_GETC_UNLOCKED
+
+/* Does <utime.h> define struct utimbuf? */
+#undef HAVE_GOOD_UTIME_H
+
+/* Define if you have the iconv() function. */
+#undef HAVE_ICONV
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `mkdtemp' function. */
+#undef HAVE_MKDTEMP
+
+/* Define to 1 if you have the `mkstemp' function. */
+#undef HAVE_MKSTEMP
+
+/* Define to 1 if you have the `sbrk' function. */
+#undef HAVE_SBRK
+
+/* Define to 1 if you have the `setmode' function. */
+#undef HAVE_SETMODE
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strcoll' function. */
+#undef HAVE_STRCOLL
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/file.h> header file. */
+#undef HAVE_SYS_FILE_H
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#undef HAVE_SYS_WAIT_H
+
+/* Is the type time_t defined in <time.h>? */
+#undef HAVE_TIME_T_IN_TIME_H
+
+/* Is the type time_t defined in <sys/types.h>? */
+#undef HAVE_TIME_T_IN_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `utimes' function. */
+#undef HAVE_UTIMES
+
+/* Define to 1 if you have the <zlib.h> header file. */
+#undef HAVE_ZLIB_H
+
+/* Define as const if the declaration of iconv() needs const. */
+#undef ICONV_CONST
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at runtime.
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
+#undef STACK_DIRECTION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Configured target name. */
+#undef TARGET
+
+/* Define to 1 if user symbol names have a leading underscore, 0 if not. */
+#undef TARGET_PREPENDS_UNDERSCORE
+
+/* Use b modifier when opening binary files? */
+#undef USE_BINARY_FOPEN
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+   `char[]'. */
+#undef YYTEXT_POINTER
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/configure sdcc-3.2.0+dfsg/support/sdbinutils/binutils/configure
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/configure	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/configure	2012-05-24 07:03:33.000000000 +0000
@@ -0,0 +1,16482 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.64.
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# Foundation, Inc.
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+
+exec 7<&0 </dev/null 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
+PACKAGE_URL=
+
+ac_unique_file="ar.c"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+LIBOBJS
+EMULATION_VECTOR
+EMULATION
+OBJDUMP_PRIVATE_OFILES
+OBJDUMP_DEFS
+BUILD_INSTALL_MISC
+BUILD_MISC
+BUILD_DLLWRAP
+BUILD_WINDMC
+BUILD_WINDRES
+DLLTOOL_DEFS
+BUILD_DLLTOOL
+BUILD_SRCONV
+BUILD_NLMCONV
+NLMCONV_DEFS
+LTLIBICONV
+LIBICONV
+ALLOCA
+DEMANGLER_NAME
+EXEEXT_FOR_BUILD
+CC_FOR_BUILD
+HDEFINES
+GENINSRC_NEVER_FALSE
+GENINSRC_NEVER_TRUE
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+MSGMERGE
+MSGFMT
+MKINSTALLDIRS
+CATOBJEXT
+GENCAT
+INSTOBJEXT
+DATADIRNAME
+CATALOGS
+POSUB
+GMSGFMT
+XGETTEXT
+INCINTL
+LIBINTL_DEP
+LIBINTL
+USE_NLS
+LEXLIB
+LEX_OUTPUT_ROOT
+LEX
+YFLAGS
+YACC
+NO_WERROR
+WARN_CFLAGS
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+RANLIB
+AR
+OBJDUMP
+LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+SED
+LIBTOOL
+EGREP
+GREP
+CPP
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+target_os
+target_vendor
+target_cpu
+target
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_dependency_tracking
+enable_plugins
+enable_largefile
+enable_shared
+enable_static
+with_pic
+enable_fast_install
+with_gnu_ld
+enable_libtool_lock
+enable_targets
+enable_werror
+enable_build_warnings
+enable_nls
+enable_maintainer_mode
+enable_rpath
+with_libiconv_prefix
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP
+YACC
+YFLAGS'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures this package to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+  --target=TARGET   configure for building compilers for TARGET [HOST]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-plugins        Enable support for plugins (defaults no)
+  --disable-largefile     omit support for large files
+  --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-static[=PKGS]  build static libraries [default=yes]
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-targets        alternative target configurations
+  --enable-werror         treat compile warnings as errors
+  --enable-build-warnings enable build-time compiler warnings
+  --disable-nls           do not use Native Language Support
+  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer
+  --disable-rpath         do not hardcode runtime library paths
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-pic              try to use only PIC/non-PIC objects [default=use
+                          both]
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
+  --without-libiconv-prefix     don't search for libiconv in includedir and libdir
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
+              the first program found out of: `bison -y', `byacc', `yacc'.
+  YFLAGS      The list of arguments that will be passed by default to $YACC.
+              This script will default YFLAGS to the empty string to avoid a
+              default value of `-d' given by some make applications.
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to the package provider.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+configure
+generated by GNU Autoconf 2.64
+
+Copyright (C) 2009 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR
+# ------------------------------------
+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_decl
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by $as_me, which was
+generated by GNU Autoconf 2.64.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    cat <<\_ASBOX
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+_ASBOX
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    cat <<\_ASBOX
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+_ASBOX
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      cat <<\_ASBOX
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
+_ASBOX
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      cat <<\_ASBOX
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+_ASBOX
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  ac_site_file1=$CONFIG_SITE
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special
+  # files actually), so we avoid doing that.
+  if test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+
+
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
+$as_echo_n "checking target system type... " >&6; }
+if test "${ac_cv_target+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$target_alias" = x; then
+  ac_cv_target=$ac_cv_host
+else
+  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
+$as_echo "$ac_cv_target" >&6; }
+case $ac_cv_target in
+*-*-*) ;;
+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
+esac
+target=$ac_cv_target
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_target
+shift
+target_cpu=$1
+target_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+target_os=$*
+IFS=$ac_save_IFS
+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+test -n "$target_alias" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_prefix=${target_alias}-
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    rm -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+if test -z "$ac_file"; then :
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
+fi
+ac_exeext=$ac_cv_exeext
+
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+  if { ac_try='./$ac_file'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+ac_clean_files=$ac_clean_files_save
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
+fi
+rm -f conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if test "${ac_cv_objext+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
+$as_echo_n "checking for library containing strerror... " >&6; }
+if test "${ac_cv_search_strerror+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char strerror ();
+int
+main ()
+{
+return strerror ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' cposix; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_strerror=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_strerror+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_strerror+set}" = set; then :
+
+else
+  ac_cv_search_strerror=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
+$as_echo "$ac_cv_search_strerror" >&6; }
+ac_res=$ac_cv_search_strerror
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+
+BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ 	]*\([^ 	]*\)[ 	]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
+am__api_version='1.11'
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+esac
+
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
+   fi
+
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   as_fn_error "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE=binutils
+ VERSION=${BFD_VERSION}
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+
+
+
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    rm -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
+if test "x$ac_cv_header_minix_config_h" = x""yes; then :
+  MINIX=yes
+else
+  MINIX=
+fi
+
+
+  if test "$MINIX" = yes; then
+
+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
+
+
+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+
+$as_echo "#define _MINIX 1" >>confdefs.h
+
+  fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#	  define __EXTENSIONS__ 1
+	  $ac_includes_default
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_safe_to_define___extensions__=yes
+else
+  ac_cv_safe_to_define___extensions__=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+
+  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+
+
+
+
+
+# The tests for host and target for $enable_largefile require
+# canonical names.
+
+
+
+# As the $enable_largefile decision depends on --enable-plugins we must set it
+# even in directories otherwise not depending on the $plugins option.
+
+
+# Check whether --enable-plugins was given.
+if test "${enable_plugins+set}" = set; then :
+  enableval=$enable_plugins; case "${enableval}" in
+  yes | "") plugins=yes ;;
+  no) plugins=no ;;
+  *) plugins=yes ;;
+ esac
+else
+  plugins=no
+fi
+
+
+
+case "${host}" in
+  sparc-*-solaris*|i[3-7]86-*-solaris*)
+    # On native 32bit sparc and ia32 solaris, large-file and procfs support
+    # are mutually exclusive; and without procfs support, the bfd/ elf module
+    # cannot provide certain routines such as elfcore_write_prpsinfo
+    # or elfcore_write_prstatus.  So unless the user explicitly requested
+    # large-file support through the --enable-largefile switch, disable
+    # large-file support in favor of procfs support.
+    test "${target}" = "${host}" -a "x$plugins" = xno \
+      && : ${enable_largefile="no"}
+    ;;
+esac
+
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+  enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if test "${ac_cv_sys_largefile_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+	 # IRIX 6.2 and later do not support large files by default,
+	 # so use the C compiler's -n32 option if that helps.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+	 if ac_fn_c_try_compile "$LINENO"; then :
+  break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 CC="$CC -n32"
+	 if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_largefile_CC=' -n32'; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=64; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_file_offset_bits=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  if test $ac_cv_sys_file_offset_bits = unknown; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if test "${ac_cv_sys_large_files+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_large_files=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  fi
+fi
+
+
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.2.7a'
+macro_revision='1.3134'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`print -r -- -n 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case "$ECHO" in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if test "${ac_cv_path_SED+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if test "${ac_cv_path_FGREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in fgrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_FGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_FGREP=$FGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if test "${lt_cv_path_LD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if test "${lt_cv_path_NM+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in dumpbin "link -dump"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
+
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if test "${lt_cv_nm_interface+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+    i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+
+fi
+
+if test -n $lt_cv_sys_max_cmd_len ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
+$as_echo "$xsi_shell" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
+$as_echo "$lt_shell_append" >&6; }
+
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+
+
+
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if test "${lt_cv_ld_reload_flag+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_reload_flag='-r'
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if test "${lt_cv_deplibs_check_method+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AR"; then
+  ac_ct_AR=$AR
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_AR="ar"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+else
+  AR="$ac_cv_prog_AR"
+fi
+
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+test -z "$STRIP" && STRIP=:
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+test -z "$RANLIB" && RANLIB=:
+
+
+
+
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+const struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+  enableval=$enable_libtool_lock;
+fi
+
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  ppc64-*linux*|powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  ppc*-*linux*|powerpc*-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if test "${lt_cv_cc_needs_belf+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_cc_needs_belf=yes
+else
+  lt_cv_cc_needs_belf=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LIPO+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OTOOL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_ld_exported_symbols_list=yes
+else
+  lt_cv_ld_exported_symbols_list=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+	LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if test "${lt_cv_ld_force_load+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[012]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+
+# Set options
+
+
+
+        enable_dlopen=no
+
+
+  enable_win32_dll=no
+
+
+            # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_shared=yes
+fi
+
+
+
+
+
+
+
+
+
+  # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_static=yes
+fi
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then :
+  withval=$with_pic; pic_mode="$withval"
+else
+  pic_mode=default
+fi
+
+
+test -z "$pic_mode" && pic_mode=default
+
+
+
+
+
+
+
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then :
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi
+
+
+
+
+
+
+
+
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+test -z "$LN_S" && LN_S="ln -s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if test "${lt_cv_objdir+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
+
+
+
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/${ac_tool_prefix}file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  else
+    MAGIC_CMD=:
+  fi
+fi
+
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+
+lt_save_CC="$CC"
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+
+lt_prog_compiler_no_builtin_flag=
+
+if test "$GCC" = yes; then
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+
+
+
+
+
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+
+  if test "$GCC" = yes; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ F* | *Sun*Fortran*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
+
+
+
+
+
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  runpath_var=
+  allow_undefined_flag=
+  always_export_symbols=no
+  archive_cmds=
+  archive_expsym_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
+  export_dynamic_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_flag_spec_ld=
+  hardcode_libdir_separator=
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
+  link_all_deplibs=unknown
+  module_cmds=
+  module_expsym_cmds=
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  ld_shlibs=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    export_dynamic_flag_spec='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='${wl}--export-all-symbols'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  whole_archive_flag_spec=
+	  tmp_sharedflag='--shared' ;;
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+	  hardcode_libdir_flag_spec=
+	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        ld_shlibs=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+    esac
+
+    if test "$ld_shlibs" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct=unsupported
+      fi
+      ;;
+
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_direct_absolute=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      file_list_spec='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  hardcode_direct=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      export_dynamic_flag_spec='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag="-z nodefs"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag=' ${wl}-bernotok'
+	  allow_undefined_flag=' ${wl}-berok'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
+	  archive_cmds_need_lc=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[45]*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      allow_undefined_flag=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      old_archive_from_new_cmds='true'
+      # FIXME: Should let the user specify the lib program.
+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
+    darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+  else
+    whole_archive_flag_spec=''
+  fi
+  link_all_deplibs=yes
+  allow_undefined_flag="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+
+  else
+  ld_shlibs=no
+  fi
+
+      ;;
+
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_flag_spec_ld='+b $libdir'
+	hardcode_libdir_separator=:
+	hardcode_direct=yes
+	hardcode_direct_absolute=yes
+	export_dynamic_flag_spec='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if test "${lt_cv_prog_compiler__b+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test x"$lt_cv_prog_compiler__b" = xyes; then
+    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+	  ;;
+	*)
+	  hardcode_direct=yes
+	  hardcode_direct_absolute=yes
+	  export_dynamic_flag_spec='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+        save_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo(void) {}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+        LDFLAGS="$save_LDFLAGS"
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      inherit_rpath=yes
+      link_all_deplibs=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_separator=:
+      ;;
+
+    solaris*)
+      no_undefined_flag=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      link_all_deplibs=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds='$CC -r -o $output$reload_objs'
+	  hardcode_direct=no
+        ;;
+	motorola)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='${wl}-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='${wl}-z,text'
+      allow_undefined_flag='${wl}-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-R,$libdir'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	export_dynamic_flag_spec='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
+test "$ld_shlibs" = no && can_build_shared=no
+
+with_gnu_ld=$with_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if test "${lt_cv_archive_cmds_need_lc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag
+	  allow_undefined_flag=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+haiku*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
+   test "X$hardcode_automatic" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$hardcode_direct" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
+     test "$hardcode_minus_L" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
+
+if test "$hardcode_action" = relink ||
+   test "$inherit_rpath" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+  if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+    ;;
+
+  *)
+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = x""yes; then :
+  lt_cv_dlopen="shl_load"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+int
+main ()
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_shl_load=yes
+else
+  ac_cv_lib_dld_shl_load=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+else
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = x""yes; then :
+  lt_cv_dlopen="dlopen"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_svld_dlopen=yes
+else
+  ac_cv_lib_svld_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link ();
+int
+main ()
+{
+return dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_dld_link=yes
+else
+  ac_cv_lib_dld_dld_link=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if test "${lt_cv_dlopen_self+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line 11202 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+void fnord () __attribute__((visibility("default")));
+#endif
+
+void fnord () { int i=42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if test "${lt_cv_dlopen_self_static+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line 11308 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+void fnord () __attribute__((visibility("default")));
+#endif
+
+void fnord () { int i=42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+striplib=
+old_striplib=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+  # Report which library types will actually be built
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[4-9]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+
+
+
+
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC="$lt_save_CC"
+
+
+
+
+
+
+
+
+
+
+
+
+
+        ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+
+# Check whether --enable-targets was given.
+if test "${enable_targets+set}" = set; then :
+  enableval=$enable_targets; case "${enableval}" in
+  yes | "") as_fn_error "enable-targets option must specify target names or 'all'" "$LINENO" 5
+            ;;
+  no)       enable_targets= ;;
+  *)        enable_targets=$enableval ;;
+esac
+fi
+
+
+GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+__GNUC__
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+
+else
+  GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wshadow"
+fi
+rm -f conftest*
+
+
+# Check whether --enable-werror was given.
+if test "${enable_werror+set}" = set; then :
+  enableval=$enable_werror; case "${enableval}" in
+     yes | y) ERROR_ON_WARNING="yes" ;;
+     no | n)  ERROR_ON_WARNING="no" ;;
+     *) as_fn_error "bad value ${enableval} for --enable-werror" "$LINENO" 5 ;;
+   esac
+fi
+
+
+# Disable -Wformat by default when using gcc on mingw
+case "${host}" in
+  *-*-mingw32*)
+    if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
+      GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format"
+    fi
+    ;;
+  *) ;;
+esac
+
+# Enable -Werror by default when using gcc
+if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
+    ERROR_ON_WARNING=yes
+fi
+
+NO_WERROR=
+if test "${ERROR_ON_WARNING}" = yes ; then
+    GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror"
+    NO_WERROR="-Wno-error"
+fi
+
+if test "${GCC}" = yes ; then
+  WARN_CFLAGS="${GCC_WARN_CFLAGS}"
+fi
+
+# Check whether --enable-build-warnings was given.
+if test "${enable_build_warnings+set}" = set; then :
+  enableval=$enable_build_warnings; case "${enableval}" in
+  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}";;
+  no)	if test "${GCC}" = yes ; then
+	  WARN_CFLAGS="-w"
+	fi;;
+  ,*)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
+        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";;
+  *,)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
+        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";;
+  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;;
+esac
+fi
+
+
+if test x"$silent" != x"yes" && test x"$WARN_CFLAGS" != x""; then
+  echo "Setting warning flags = $WARN_CFLAGS" 6>&1
+fi
+
+
+
+
+
+ac_config_headers="$ac_config_headers config.h:config.in"
+
+
+if test -z "$target" ; then
+    as_fn_error "Unrecognized target system type; please check config.sub." "$LINENO" 5
+fi
+if test -z "$host" ; then
+    as_fn_error "Unrecognized host system type; please check config.sub." "$LINENO" 5
+fi
+
+for ac_prog in 'bison -y' byacc
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_YACC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$YACC"; then
+  ac_cv_prog_YACC="$YACC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_YACC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+YACC=$ac_cv_prog_YACC
+if test -n "$YACC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
+$as_echo "$YACC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$YACC" && break
+done
+test -n "$YACC" || YACC="yacc"
+
+for ac_prog in flex lex
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LEX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LEX"; then
+  ac_cv_prog_LEX="$LEX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LEX="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LEX=$ac_cv_prog_LEX
+if test -n "$LEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
+$as_echo "$LEX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$LEX" && break
+done
+test -n "$LEX" || LEX=":"
+
+if test "x$LEX" != "x:"; then
+  cat >conftest.l <<_ACEOF
+%%
+a { ECHO; }
+b { REJECT; }
+c { yymore (); }
+d { yyless (1); }
+e { yyless (input () != 0); }
+f { unput (yytext[0]); }
+. { BEGIN INITIAL; }
+%%
+#ifdef YYTEXT_POINTER
+extern char *yytext;
+#endif
+int
+main (void)
+{
+  return ! yylex () + ! yywrap ();
+}
+_ACEOF
+{ { ac_try="$LEX conftest.l"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$LEX conftest.l") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
+$as_echo_n "checking lex output file root... " >&6; }
+if test "${ac_cv_prog_lex_root+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+if test -f lex.yy.c; then
+  ac_cv_prog_lex_root=lex.yy
+elif test -f lexyy.c; then
+  ac_cv_prog_lex_root=lexyy
+else
+  as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
+$as_echo "$ac_cv_prog_lex_root" >&6; }
+LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
+
+if test -z "${LEXLIB+set}"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
+$as_echo_n "checking lex library... " >&6; }
+if test "${ac_cv_lib_lex+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    ac_save_LIBS=$LIBS
+    ac_cv_lib_lex='none needed'
+    for ac_lib in '' -lfl -ll; do
+      LIBS="$ac_lib $ac_save_LIBS"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+`cat $LEX_OUTPUT_ROOT.c`
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_lex=$ac_lib
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+      test "$ac_cv_lib_lex" != 'none needed' && break
+    done
+    LIBS=$ac_save_LIBS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
+$as_echo "$ac_cv_lib_lex" >&6; }
+  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
+$as_echo_n "checking whether yytext is a pointer... " >&6; }
+if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  # POSIX says lex can declare yytext either as a pointer or an array; the
+# default is implementation-dependent.  Figure out which it is, since
+# not all implementations provide the %pointer and %array declarations.
+ac_cv_prog_lex_yytext_pointer=no
+ac_save_LIBS=$LIBS
+LIBS="$LEXLIB $ac_save_LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define YYTEXT_POINTER 1
+`cat $LEX_OUTPUT_ROOT.c`
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_prog_lex_yytext_pointer=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_save_LIBS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
+$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
+if test $ac_cv_prog_lex_yytext_pointer = yes; then
+
+$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
+
+fi
+rm -f conftest.l $LEX_OUTPUT_ROOT.c
+
+fi
+if test "$LEX" = :; then
+  LEX=${am_missing_run}flex
+fi
+
+ALL_LINGUAS="da es fi fr id ja ro ru rw sk sv tr uk vi zh_CN zh_TW bg"
+# If we haven't got the data from the intl directory,
+# assume NLS is disabled.
+USE_NLS=no
+LIBINTL=
+LIBINTL_DEP=
+INCINTL=
+XGETTEXT=
+GMSGFMT=
+POSUB=
+
+if test -f  ../intl/config.intl; then
+  .  ../intl/config.intl
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
+if test x"$USE_NLS" != xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
+$as_echo_n "checking for catalogs to be installed... " >&6; }
+  # Look for .po and .gmo files in the source directory.
+  CATALOGS=
+  XLINGUAS=
+  for cat in $srcdir/po/*.gmo $srcdir/po/*.po; do
+    # If there aren't any .gmo files the shell will give us the
+    # literal string "../path/to/srcdir/po/*.gmo" which has to be
+    # weeded out.
+    case "$cat" in *\**)
+      continue;;
+    esac
+    # The quadruple backslash is collapsed to a double backslash
+    # by the backticks, then collapsed again by the double quotes,
+    # leaving us with one backslash in the sed expression (right
+    # before the dot that mustn't act as a wildcard).
+    cat=`echo $cat | sed -e "s!$srcdir/po/!!" -e "s!\\\\.po!.gmo!"`
+    lang=`echo $cat | sed -e "s!\\\\.gmo!!"`
+    # The user is allowed to set LINGUAS to a list of languages to
+    # install catalogs for.  If it's empty that means "all of them."
+    if test "x$LINGUAS" = x; then
+      CATALOGS="$CATALOGS $cat"
+      XLINGUAS="$XLINGUAS $lang"
+    else
+      case "$LINGUAS" in *$lang*)
+        CATALOGS="$CATALOGS $cat"
+        XLINGUAS="$XLINGUAS $lang"
+        ;;
+      esac
+    fi
+  done
+  LINGUAS="$XLINGUAS"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
+$as_echo "$LINGUAS" >&6; }
+
+
+    DATADIRNAME=share
+
+  INSTOBJEXT=.mo
+
+  GENCAT=gencat
+
+  CATOBJEXT=.gmo
+
+fi
+
+        MKINSTALLDIRS=
+  if test -n "$ac_aux_dir"; then
+    case "$ac_aux_dir" in
+      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
+      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
+    esac
+  fi
+  if test -z "$MKINSTALLDIRS"; then
+    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+  fi
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
+    # Check whether --enable-nls was given.
+if test "${enable_nls+set}" = set; then :
+  enableval=$enable_nls; USE_NLS=$enableval
+else
+  USE_NLS=yes
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
+
+
+
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case "$MSGFMT" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+            ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
+    ;;
+esac
+fi
+MSGFMT="$ac_cv_path_MSGFMT"
+if test "$MSGFMT" != ":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  # Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GMSGFMT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  ;;
+esac
+fi
+GMSGFMT=$ac_cv_path_GMSGFMT
+if test -n "$GMSGFMT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case "$XGETTEXT" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+            ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+    ;;
+esac
+fi
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test "$XGETTEXT" != ":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+    rm -f messages.po
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "msgmerge", so it can be a program name with args.
+set dummy msgmerge; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case "$MSGMERGE" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
+            ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+  test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
+    ;;
+esac
+fi
+MSGMERGE="$ac_cv_path_MSGMERGE"
+if test "$MSGMERGE" != ":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+$as_echo "$MSGMERGE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+      if test "$GMSGFMT" != ":"; then
+            if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
+       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+      : ;
+    else
+      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
+$as_echo "found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
+      GMSGFMT=":"
+    fi
+  fi
+
+      if test "$XGETTEXT" != ":"; then
+            if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+      : ;
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
+$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
+      XGETTEXT=":"
+    fi
+        rm -f messages.po
+  fi
+
+  ac_config_commands="$ac_config_commands default-1"
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+    # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then :
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+   if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
+ if false; then
+  GENINSRC_NEVER_TRUE=
+  GENINSRC_NEVER_FALSE='#'
+else
+  GENINSRC_NEVER_TRUE='#'
+  GENINSRC_NEVER_FALSE=
+fi
+
+
+if test -n "$EXEEXT"; then
+
+$as_echo "#define HAVE_EXECUTABLE_SUFFIX 1" >>confdefs.h
+
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define EXECUTABLE_SUFFIX "${EXEEXT}"
+_ACEOF
+
+
+# host-specific stuff:
+
+HDEFINES=
+
+. ${srcdir}/../bfd/configure.host
+
+
+AR=${AR-ar}
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+
+
+# Put a plausible default for CC_FOR_BUILD in Makefile.
+if test -z "$CC_FOR_BUILD"; then
+  if test "x$cross_compiling" = "xno"; then
+    CC_FOR_BUILD='$(CC)'
+  else
+    CC_FOR_BUILD=gcc
+  fi
+fi
+
+# Also set EXEEXT_FOR_BUILD.
+if test "x$cross_compiling" = "xno"; then
+  EXEEXT_FOR_BUILD='$(EXEEXT)'
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for build system executable suffix" >&5
+$as_echo_n "checking for build system executable suffix... " >&6; }
+if test "${bfd_cv_build_exeext+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f conftest*
+     echo 'int main () { return 0; }' > conftest.c
+     bfd_cv_build_exeext=
+     ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5
+     for file in conftest.*; do
+       case $file in
+       *.c | *.o | *.obj | *.ilk | *.pdb) ;;
+       *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;;
+       esac
+     done
+     rm -f conftest*
+     test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_build_exeext" >&5
+$as_echo "$bfd_cv_build_exeext" >&6; }
+  EXEEXT_FOR_BUILD=""
+  test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
+fi
+
+
+DEMANGLER_NAME=c++filt
+case "${host}" in
+  *-*-go32* | *-*-msdos*)
+    DEMANGLER_NAME=cxxfilt
+esac
+
+
+for ac_header in string.h strings.h stdlib.h unistd.h fcntl.h sys/file.h limits.h sys/param.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
+$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
+if test "${ac_cv_header_sys_wait_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/wait.h>
+#ifndef WEXITSTATUS
+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
+#endif
+#ifndef WIFEXITED
+# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+#endif
+
+int
+main ()
+{
+  int s;
+  wait (&s);
+  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_sys_wait_h=yes
+else
+  ac_cv_header_sys_wait_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
+$as_echo "$ac_cv_header_sys_wait_h" >&6; }
+if test $ac_cv_header_sys_wait_h = yes; then
+
+$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
+
+fi
+
+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+# for constant arguments.  Useless!
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if test "${ac_cv_working_alloca_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <alloca.h>
+int
+main ()
+{
+char *p = (char *) alloca (2 * sizeof (int));
+			  if (p) return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_working_alloca_h=yes
+else
+  ac_cv_working_alloca_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
+if test $ac_cv_working_alloca_h = yes; then
+
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if test "${ac_cv_func_alloca_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# else
+#  ifdef HAVE_ALLOCA_H
+#   include <alloca.h>
+#  else
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#    endif
+#   endif
+#  endif
+# endif
+#endif
+
+int
+main ()
+{
+char *p = (char *) alloca (1);
+				    if (p) return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_func_alloca_works=yes
+else
+  ac_cv_func_alloca_works=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
+
+if test $ac_cv_func_alloca_works = yes; then
+
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
+
+else
+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+# that cause trouble.  Some versions do not even contain alloca or
+# contain a buggy version.  If you still want to use their alloca,
+# use ar to extract alloca.o from them instead of compiling alloca.c.
+
+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
+
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if test "${ac_cv_os_cray+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if defined CRAY && ! defined CRAY2
+webecray
+#else
+wenotbecray
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "webecray" >/dev/null 2>&1; then :
+  ac_cv_os_cray=yes
+else
+  ac_cv_os_cray=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
+if test $ac_cv_os_cray = yes; then
+  for ac_func in _getb67 GETB67 getb67; do
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define CRAY_STACKSEG_END $ac_func
+_ACEOF
+
+    break
+fi
+
+  done
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if test "${ac_cv_c_stack_direction+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_c_stack_direction=0
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+find_stack_direction ()
+{
+  static char *addr = 0;
+  auto char dummy;
+  if (addr == 0)
+    {
+      addr = &dummy;
+      return find_stack_direction ();
+    }
+  else
+    return (&dummy > addr) ? 1 : -1;
+}
+
+int
+main ()
+{
+  return find_stack_direction () < 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_c_stack_direction=1
+else
+  ac_cv_c_stack_direction=-1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
+cat >>confdefs.h <<_ACEOF
+#define STACK_DIRECTION $ac_cv_c_stack_direction
+_ACEOF
+
+
+fi
+
+for ac_func in sbrk utimes setmode getc_unlocked strcoll
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp"
+if test "x$ac_cv_func_mkstemp" = x""yes; then :
+
+$as_echo "#define HAVE_MKSTEMP 1" >>confdefs.h
+
+fi
+
+ac_fn_c_check_func "$LINENO" "mkdtemp" "ac_cv_func_mkdtemp"
+if test "x$ac_cv_func_mkdtemp" = x""yes; then :
+
+$as_echo "#define HAVE_MKDTEMP 1" >>confdefs.h
+
+fi
+
+
+# Some systems have frexp only in -lm, not in -lc.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing frexp" >&5
+$as_echo_n "checking for library containing frexp... " >&6; }
+if test "${ac_cv_search_frexp+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char frexp ();
+int
+main ()
+{
+return frexp ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' m; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_frexp=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_frexp+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_frexp+set}" = set; then :
+
+else
+  ac_cv_search_frexp=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_frexp" >&5
+$as_echo "$ac_cv_search_frexp" >&6; }
+ac_res=$ac_cv_search_frexp
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for time_t in time.h" >&5
+$as_echo_n "checking for time_t in time.h... " >&6; }
+if test "${bu_cv_decl_time_t_time_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <time.h>
+int
+main ()
+{
+time_t i;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bu_cv_decl_time_t_time_h=yes
+else
+  bu_cv_decl_time_t_time_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bu_cv_decl_time_t_time_h" >&5
+$as_echo "$bu_cv_decl_time_t_time_h" >&6; }
+if test $bu_cv_decl_time_t_time_h = yes; then
+
+$as_echo "#define HAVE_TIME_T_IN_TIME_H 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for time_t in sys/types.h" >&5
+$as_echo_n "checking for time_t in sys/types.h... " >&6; }
+if test "${bu_cv_decl_time_t_types_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+int
+main ()
+{
+time_t i;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bu_cv_decl_time_t_types_h=yes
+else
+  bu_cv_decl_time_t_types_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bu_cv_decl_time_t_types_h" >&5
+$as_echo "$bu_cv_decl_time_t_types_h" >&6; }
+if test $bu_cv_decl_time_t_types_h = yes; then
+
+$as_echo "#define HAVE_TIME_T_IN_TYPES_H 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a known getopt prototype in unistd.h" >&5
+$as_echo_n "checking for a known getopt prototype in unistd.h... " >&6; }
+if test "${bu_cv_decl_getopt_unistd_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <unistd.h>
+int
+main ()
+{
+extern int getopt (int, char *const*, const char *);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bu_cv_decl_getopt_unistd_h=yes
+else
+  bu_cv_decl_getopt_unistd_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bu_cv_decl_getopt_unistd_h" >&5
+$as_echo "$bu_cv_decl_getopt_unistd_h" >&6; }
+if test $bu_cv_decl_getopt_unistd_h = yes; then
+
+$as_echo "#define HAVE_DECL_GETOPT 1" >>confdefs.h
+
+fi
+
+# Under Next 3.2 <utime.h> apparently does not define struct utimbuf
+# by default.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for utime.h" >&5
+$as_echo_n "checking for utime.h... " >&6; }
+if test "${bu_cv_header_utime_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+#include <utime.h>
+int
+main ()
+{
+struct utimbuf s;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bu_cv_header_utime_h=yes
+else
+  bu_cv_header_utime_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bu_cv_header_utime_h" >&5
+$as_echo "$bu_cv_header_utime_h" >&6; }
+if test $bu_cv_header_utime_h = yes; then
+
+$as_echo "#define HAVE_GOOD_UTIME_H 1" >>confdefs.h
+
+fi
+
+ac_fn_c_check_decl "$LINENO" "fprintf" "ac_cv_have_decl_fprintf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_fprintf" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FPRINTF $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "stpcpy" "ac_cv_have_decl_stpcpy" "$ac_includes_default"
+if test "x$ac_cv_have_decl_stpcpy" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STPCPY $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default"
+if test "x$ac_cv_have_decl_strstr" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRSTR $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "sbrk" "ac_cv_have_decl_sbrk" "$ac_includes_default"
+if test "x$ac_cv_have_decl_sbrk" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_SBRK $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getenv" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETENV $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "environ" "ac_cv_have_decl_environ" "$ac_includes_default"
+if test "x$ac_cv_have_decl_environ" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ENVIRON $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getc_unlocked" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_snprintf" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_SNPRINTF $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_VSNPRINTF $ac_have_decl
+_ACEOF
+
+
+# Link in zlib if we can.  This allows us to read compressed debug
+# sections.  This is used only by readelf.c (objdump uses bfd for
+# reading compressed sections).
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing zlibVersion" >&5
+$as_echo_n "checking for library containing zlibVersion... " >&6; }
+if test "${ac_cv_search_zlibVersion+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char zlibVersion ();
+int
+main ()
+{
+return zlibVersion ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' z; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_zlibVersion=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_zlibVersion+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_zlibVersion+set}" = set; then :
+
+else
+  ac_cv_search_zlibVersion=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_zlibVersion" >&5
+$as_echo "$ac_cv_search_zlibVersion" >&6; }
+ac_res=$ac_cv_search_zlibVersion
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  for ac_header in zlib.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_zlib_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ZLIB_H 1
+_ACEOF
+
+fi
+
+done
+
+fi
+
+
+
+case "${host}" in
+*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
+
+$as_echo "#define USE_BINARY_FOPEN 1" >>confdefs.h
+ ;;
+esac
+
+# target-specific stuff:
+
+# Canonicalize the secondary target names.
+if test -n "$enable_targets"; then
+    for targ in `echo $enable_targets | sed 's/,/ /g'`
+    do
+	result=`$ac_config_sub $targ 2>/dev/null`
+	if test -n "$result"; then
+	    canon_targets="$canon_targets $result"
+	else
+	    # Allow targets that config.sub doesn't recognize, like "all".
+	    canon_targets="$canon_targets $targ"
+	fi
+    done
+fi
+
+ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
+if test "x$ac_cv_header_iconv_h" = x""yes; then :
+
+fi
+
+
+
+      if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
+$as_echo_n "checking for ld used by GCC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | [A-Za-z]:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if test "${acl_cv_path_LD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      acl_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some GNU ld's only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+	test "$with_gnu_ld" != no && break
+      else
+	test "$with_gnu_ld" != yes && break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+else
+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${acl_cv_prog_gnu_ld+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+  acl_cv_prog_gnu_ld=yes
+else
+  acl_cv_prog_gnu_ld=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+$as_echo "$acl_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$acl_cv_prog_gnu_ld
+
+
+
+                                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+$as_echo_n "checking for shared library run path origin... " >&6; }
+if test "${acl_cv_rpath+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_rpath=done
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+$as_echo "$acl_cv_rpath" >&6; }
+  wl="$acl_cv_wl"
+  libext="$acl_cv_libext"
+  shlibext="$acl_cv_shlibext"
+  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  hardcode_direct="$acl_cv_hardcode_direct"
+  hardcode_minus_L="$acl_cv_hardcode_minus_L"
+    # Check whether --enable-rpath was given.
+if test "${enable_rpath+set}" = set; then :
+  enableval=$enable_rpath; :
+else
+  enable_rpath=yes
+fi
+
+
+
+
+
+
+
+
+    use_additional=yes
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+
+# Check whether --with-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then :
+  withval=$with_libiconv_prefix;
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/lib"
+      fi
+    fi
+
+fi
+
+      LIBICONV=
+  LTLIBICONV=
+  INCICONV=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='iconv '
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
+          else
+                                    :
+          fi
+        else
+                              found_dir=
+          found_la=
+          found_so=
+          found_a=
+          if test $use_additional = yes; then
+            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+              found_dir="$additional_libdir"
+              found_so="$additional_libdir/lib$name.$shlibext"
+              if test -f "$additional_libdir/lib$name.la"; then
+                found_la="$additional_libdir/lib$name.la"
+              fi
+            else
+              if test -f "$additional_libdir/lib$name.$libext"; then
+                found_dir="$additional_libdir"
+                found_a="$additional_libdir/lib$name.$libext"
+                if test -f "$additional_libdir/lib$name.la"; then
+                  found_la="$additional_libdir/lib$name.la"
+                fi
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIBICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+                    found_dir="$dir"
+                    found_so="$dir/lib$name.$shlibext"
+                    if test -f "$dir/lib$name.la"; then
+                      found_la="$dir/lib$name.la"
+                    fi
+                  else
+                    if test -f "$dir/lib$name.$libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/lib$name.$libext"
+                      if test -f "$dir/lib$name.la"; then
+                        found_la="$dir/lib$name.la"
+                      fi
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+              else
+                                                                                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                                if test "$hardcode_direct" = yes; then
+                                                      LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+                else
+                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+                                                            haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                                                                                haveit=
+                    for x in $LDFLAGS $LIBICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
+                    fi
+                    if test "$hardcode_minus_L" != no; then
+                                                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+                    else
+                                                                                                                                                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
+              else
+                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
+              fi
+            fi
+                        additional_includedir=
+            case "$found_dir" in
+              */lib | */lib/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux*) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INCICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                                            INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+                        if test -n "$found_la"; then
+                                                        save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+                            for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/lib"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/lib"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux*) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIBICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIBICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                                                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
+                    LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+            LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$hardcode_libdir_separator"; then
+                        alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+      done
+            acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+    else
+            for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+            for found_dir in $ltrpathdirs; do
+      LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
+    done
+  fi
+
+
+
+
+
+
+
+          am_save_CPPFLAGS="$CPPFLAGS"
+
+  for element in $INCICONV; do
+    haveit=
+    for x in $CPPFLAGS; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+    fi
+  done
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
+if test "${am_cv_func_iconv+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS $LIBICONV"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+      LIBS="$am_save_LIBS"
+    fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+$as_echo "$am_cv_func_iconv" >&6; }
+  if test "$am_cv_func_iconv" = yes; then
+
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+$as_echo "$LIBICONV" >&6; }
+  else
+            CPPFLAGS="$am_save_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
+  fi
+
+
+
+  if test "$am_cv_func_iconv" = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
+$as_echo_n "checking for iconv declaration... " >&6; }
+    if test "${am_cv_proto_iconv+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  am_cv_proto_iconv_arg1=""
+else
+  am_cv_proto_iconv_arg1="const"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
+fi
+
+    am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
+         }$am_cv_proto_iconv" >&5
+$as_echo "${ac_t:-
+         }$am_cv_proto_iconv" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define ICONV_CONST $am_cv_proto_iconv_arg1
+_ACEOF
+
+  fi
+
+
+all_targets=false
+BUILD_NLMCONV=
+NLMCONV_DEFS=
+BUILD_SRCONV=
+BUILD_DLLTOOL=
+DLLTOOL_DEFS=
+DLLTOOL_DEFAULT=
+BUILD_WINDRES=
+BUILD_WINDMC=
+BUILD_DLLWRAP=
+BUILD_MISC=
+BUILD_INSTALL_MISC=
+OBJDUMP_DEFS=
+OBJDUMP_PRIVATE_VECTORS=
+OBJDUMP_PRIVATE_OFILES=
+od_vectors=
+
+for targ in $target $canon_targets
+do
+    if test "x$targ" = "xall"; then
+        all_targets=true
+	BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
+	BUILD_SRCONV='$(SRCONV_PROG)'
+	NLMCONV_DEFS="-DNLMCONV_I386 -DNLMCONV_ALPHA -DNLMCONV_POWERPC -DNLMCONV_SPARC"
+	BUILD_MISC="${BUILD_MISC} "'bin2c$(EXEEXT_FOR_BUILD)'
+	BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+	BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+	BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	if test -z "$DLLTOOL_DEFAULT"; then
+	  DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_I386"
+	fi
+	DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
+	BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
+	od_vectors="$od_vectors objdump_private_desc_xcoff"
+    else
+	case $targ in
+	i[3-7]86*-*-netware*)
+	  BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
+	  NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_I386"
+	  ;;
+	alpha*-*-netware*)
+	  BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
+	  NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_ALPHA"
+	  ;;
+	powerpc*-*-netware*)
+	  BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
+	  NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_POWERPC"
+	  ;;
+	sparc*-*-netware*)
+	  BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
+	  NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_SPARC"
+	  ;;
+	esac
+
+	case $targ in
+	*-*-hms*) BUILD_SRCONV='$(SRCONV_PROG)' ;;
+	esac
+
+	case $targ in
+	arm-epoc-pe*)
+  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_ARM_EPOC"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM_EPOC -DDLLTOOL_ARM"
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+	  ;;
+	arm-wince-pe* | arm-*-wince | arm*-*-cegcc* | arm*-*-mingw32ce*)
+  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_ARM_WINCE"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM_WINCE -DDLLTOOL_ARM"
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+	  ;;
+	arm-*-pe*)
+  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_ARM"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM"
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+	  ;;
+	x86_64-*-mingw*)
+  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_MX86_64"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MX86_64"
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+	  BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
+	  ;;
+	i[3-7]86-*-pe* | i[3-7]86-*-cygwin* | i[3-7]86-*-mingw32** | i[3-7]86-*-netbsdpe*)
+  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_I386"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+	  BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
+	  ;;
+	i[3-7]86-*-interix)
+	  BUILD_DLLTOOL='$(DLLTOOL_PROG)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_I386"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
+	  ;;
+	powerpc*-aix5.[01])
+	  ;;
+	powerpc*-aix[5-9].*)
+	  OBJDUMP_DEFS="-DAIX_WEAK_SUPPORT"
+	  ;;
+	powerpc*-*-pe* | powerpc*-*-cygwin*)
+  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_PPC"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_PPC"
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+	  ;;
+	sh*-*-pe)
+  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_SH"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_SH"
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+	  ;;
+	spu-*-*)
+	  BUILD_MISC="${BUILD_MISC} "'bin2c$(EXEEXT_FOR_BUILD)'
+	  ;;
+	mips*-*-pe)
+  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_MIPS"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MIPS"
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+	  ;;
+	mcore-*-pe)
+  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_MCORE"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MCORE"
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+	  ;;
+	mcore-*-elf)
+  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_MCORE_ELF"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MCORE_ELF"
+	  ;;
+  	mep-*)
+	  OBJDUMP_DEFS="-DSKIP_ZEROES=256 -DSKIP_ZEROES_AT_END=0"
+	  ;;
+	esac
+
+	# Add objdump private vectors.
+	case $targ in
+	powerpc-*-aix*)
+	od_vectors="$od_vectors objdump_private_desc_xcoff"
+	  ;;
+	esac
+    fi
+done
+
+# Uniq objdump private vector, build objdump target ofiles.
+od_files=
+f=""
+for i in $od_vectors ; do
+    case " $f " in
+    *" $i "*) ;;
+    *)
+	f="$f $i"
+	OBJDUMP_PRIVATE_VECTORS="$OBJDUMP_PRIVATE_VECTORS &$i,"
+	case $i in
+	objdump_private_desc_xcoff)
+	    od_files="$od_files od-xcoff" ;;
+	*) as_fn_error "*** unknown private vector $i" "$LINENO" 5 ;;
+	esac
+	;;
+    esac
+done
+
+# Uniq objdump target ofiles
+f=""
+for i in $od_files ; do
+    case " $f " in
+    *" $i "*) ;;
+    *)
+	f="$f $i"
+	OBJDUMP_PRIVATE_OFILES="$OBJDUMP_PRIVATE_OFILES $i.$objext"
+	;;
+    esac
+done
+
+DLLTOOL_DEFS="$DLLTOOL_DEFS $DLLTOOL_DEFAULT"
+
+if test "${with_windres+set}" = set; then
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+fi
+
+if test "${with_windmc+set}" = set; then
+	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+fi
+
+OBJDUMP_DEFS="${OBJDUMP_DEFS} -DOBJDUMP_PRIVATE_VECTORS=\"${OBJDUMP_PRIVATE_VECTORS}\""
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define TARGET "${target}"
+_ACEOF
+
+
+targ=$target
+. $srcdir/../bfd/config.bfd
+if test "x$targ_underscore" = "xyes"; then
+    UNDERSCORE=1
+else
+    UNDERSCORE=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define TARGET_PREPENDS_UNDERSCORE $UNDERSCORE
+_ACEOF
+
+
+# Emulation
+targ=$target
+. ${srcdir}/configure.tgt
+EMULATION=$targ_emul
+EMULATION_VECTOR=$targ_emul_vector
+
+
+
+
+# Required for html and install-html
+
+
+
+
+
+####AC_CONFIG_FILES(Makefile doc/Makefile po/Makefile.in:po/Make-in)
+ac_config_files="$ac_config_files Makefile"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    test "x$cache_file" != "x/dev/null" &&
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+    cat confcache >$cache_file
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GENINSRC_NEVER_TRUE}" && test -z "${GENINSRC_NEVER_FALSE}"; then
+  as_fn_error "conditional \"GENINSRC_NEVER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+: ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by $as_me, which was
+generated by GNU Autoconf 2.64.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to the package provider."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_version="\\
+config.status
+configured by $0, generated by GNU Autoconf 2.64,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright (C) 2009 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in SHELL \
+ECHO \
+SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+OBJDUMP \
+deplibs_check_method \
+file_magic_cmd \
+AR \
+AR_FLAGS \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_wl \
+lt_prog_compiler_pic \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_flag_spec_ld \
+hardcode_libdir_separator \
+fix_srcfile_path \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+install_override_mode \
+finish_eval \
+old_striplib \
+striplib; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+sys_lib_dlsearch_path_spec; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+ac_aux_dir='$ac_aux_dir'
+xsi_shell='$xsi_shell'
+lt_shell_append='$lt_shell_append'
+
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'
+
+
+
+# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+    # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
+    # from automake.
+    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+    # Capture the value of LINGUAS because we need it to compute CATALOGS.
+    LINGUAS="${LINGUAS-%UNSET%}"
+
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
+    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp=
+  trap 'exit_status=$?
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&2;}
+
+  rm -f "$tmp/stdin"
+  case $ac_file in
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error "could not create -" "$LINENO" 5
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+ ;;
+    "libtool":C)
+
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags=""
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# An object symbol dumper.
+OBJDUMP=$lt_OBJDUMP
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking.  This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  case $xsi_shell in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result="${1##*/}"
+}
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+  func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+  # positional parameters, so assign one to ordinary parameter first.
+  func_stripname_result=${3}
+  func_stripname_result=${func_stripname_result#"${1}"}
+  func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=${1%%=*}
+  func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  case ${1} in
+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+    *)    func_lo2o_result=${1} ;;
+  esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=$(( $* ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=${#1}
+}
+
+_LT_EOF
+    ;;
+  *) # Bourne compatible functions.
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+}
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+  case ${2} in
+    .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+    *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+}
+
+# sed scripts:
+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[^=]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
+  func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=`expr "$@"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
+esac
+
+case $lt_shell_append in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$1+=\$2"
+}
+_LT_EOF
+    ;;
+  *)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$1=\$$1\$2"
+}
+
+_LT_EOF
+    ;;
+  esac
+
+
+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+ ;;
+    "default-1":C)
+    for ac_file in $CONFIG_FILES; do
+      # Support "outfile[:infile[:infile...]]"
+      case "$ac_file" in
+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+      esac
+      # PO directories have a Makefile.in generated from Makefile.in.in.
+      case "$ac_file" in */Makefile.in)
+        # Adjust a relative srcdir.
+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+        # In autoconf-2.13 it is called $ac_given_srcdir.
+        # In autoconf-2.50 it is called $srcdir.
+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+        case "$ac_given_srcdir" in
+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+          /*) top_srcdir="$ac_given_srcdir" ;;
+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+        esac
+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+          rm -f "$ac_dir/POTFILES"
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          POMAKEFILEDEPS="POTFILES.in"
+          # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
+          # on $ac_dir but don't depend on user-specified configuration
+          # parameters.
+          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+            # The LINGUAS file contains the set of available languages.
+            if test -n "$OBSOLETE_ALL_LINGUAS"; then
+              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+            fi
+            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assigment from automake.
+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+          else
+            # The set of available languages was given in configure.in.
+            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+          fi
+          case "$ac_given_srcdir" in
+            .) srcdirpre= ;;
+            *) srcdirpre='$(srcdir)/' ;;
+          esac
+          POFILES=
+          GMOFILES=
+          UPDATEPOFILES=
+          DUMMYPOFILES=
+          for lang in $ALL_LINGUAS; do
+            POFILES="$POFILES $srcdirpre$lang.po"
+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+          done
+          # CATALOGS depends on both $ac_dir and the user's LINGUAS
+          # environment variable.
+          INST_LINGUAS=
+          if test -n "$ALL_LINGUAS"; then
+            for presentlang in $ALL_LINGUAS; do
+              useit=no
+              if test "%UNSET%" != "$LINGUAS"; then
+                desiredlanguages="$LINGUAS"
+              else
+                desiredlanguages="$ALL_LINGUAS"
+              fi
+              for desiredlang in $desiredlanguages; do
+                # Use the presentlang catalog if desiredlang is
+                #   a. equal to presentlang, or
+                #   b. a variant of presentlang (because in this case,
+                #      presentlang can be used as a fallback for messages
+                #      which are not translated in the desiredlang catalog).
+                case "$desiredlang" in
+                  "$presentlang"*) useit=yes;;
+                esac
+              done
+              if test $useit = yes; then
+                INST_LINGUAS="$INST_LINGUAS $presentlang"
+              fi
+            done
+          fi
+          CATALOGS=
+          if test -n "$INST_LINGUAS"; then
+            for lang in $INST_LINGUAS; do
+              CATALOGS="$CATALOGS $lang.gmo"
+            done
+          fi
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+            if test -f "$f"; then
+              case "$f" in
+                *.orig | *.bak | *~) ;;
+                *) cat "$f" >> "$ac_dir/Makefile" ;;
+              esac
+            fi
+          done
+        fi
+        ;;
+      esac
+    done ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit $?
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/configure.com sdcc-3.2.0+dfsg/support/sdbinutils/binutils/configure.com
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/configure.com	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/configure.com	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,109 @@
+$!
+$! This file configures binutils for use with openVMS/Alpha
+$! We do not use the configure script, since we do not have /bin/sh
+$! to execute it.
+$!
+$! Written by Klaus K"ampf (kkaempf@rmi.de)
+$!
+$ arch=F$GETSYI("ARCH_NAME")
+$ arch=F$EDIT(arch,"LOWERCASE")
+$ write sys$output "Configuring binutils for ''arch' target"
+$!
+$! Generate config.h
+$!
+$ create config.h
+/* config.h.  Generated automatically by configure.com  */
+/* Is the type time_t defined in <time.h>?  */
+#define HAVE_TIME_T_IN_TIME_H 1
+/* Is the type time_t defined in <sys/types.h>?  */
+#define HAVE_TIME_T_IN_TYPES_H 1
+/* Does <utime.h> define struct utimbuf?  */
+#define HAVE_GOOD_UTIME_H 1
+/* Whether fprintf must be declared even if <stdio.h> is included.  */
+#define NEED_DECLARATION_FPRINTF 1
+/* Do we need to use the b modifier when opening binary files?  */
+/* #undef USE_BINARY_FOPEN */
+/* Define if you have the utimes function.  */
+#define HAVE_UTIMES 1
+/* Define if you have the <fcntl.h> header file.  */
+#define HAVE_FCNTL_H 1
+/* Define if you have the <stdlib.h> header file.  */
+#define HAVE_STDLIB_H 1
+/* Define if you have the <string.h> header file.  */
+#define HAVE_STRING_H 1
+/* Define if you have the <strings.h> header file.  */
+#define HAVE_STRINGS_H 1
+/* Define if you have the <sys/file.h> header file.  */
+#define HAVE_SYS_FILE_H 1
+/* Define if you have the <unistd.h> header file.  */
+#define HAVE_UNISTD_H 1
+/* Alloca.  */
+#ifdef __DECC
+#include <builtins.h>
+#define C_alloca(x) __ALLOCA(x)
+#endif
+$!
+$! Add TARGET.
+$!
+$ if arch .eqs. "ia64" then target = "elf64-ia64-vms"
+$ if arch .eqs. "alpha" then target = "vms-alpha"
+$ if arch .eqs. "vax" then target = "vms-vax"
+$!
+$ open/append tfile config.h
+$ write tfile "#define TARGET """ + target + """"
+$ close tfile
+$ write sys$output "Created `config.h'"
+$!
+$ write sys$output "Generate binutils build.com"
+$!
+$ create build.com
+$DECK
+$ DEFS=""
+$ OPT="/noopt/debug"
+$ CFLAGS=OPT + "/include=([],""../include"",[-.bfd])" +-
+ "/name=(as_is,shortened)" +-
+ "/prefix=(all,exc=(""getopt"",""optarg"",""optopt"",""optind"",""opterr""))"
+$ BFDLIB = ",[-.bfd]libbfd.olb/lib"
+$ LIBIBERTY = ",[-.libiberty]libiberty.olb/lib"
+$ OPCODES = ",[-.opcodes]libopcodes.olb/lib"
+$ DEBUG_FILES = ",rddbg,debug,stabs,ieee,rdcoff,dwarf"
+$ BULIBS_FILES = ",bucomm,version,filemode"
+$ ALL_FILES="nm,strings,addr2line,size,objdump,prdbg" +-
+   BULIBS_FILES + DEBUG_FILES
+$!
+$ write sys$output "CFLAGS=",CFLAGS
+$ if p1.nes."LINK"
+$ then
+$   NUM = 0
+$   LOOP:
+$     F = F$ELEMENT(NUM,",",ALL_FILES)
+$     IF F.EQS."," THEN GOTO END
+$     write sys$output "Compiling ", F, ".c"
+$     cc 'CFLAGS 'F.c
+$     NUM = NUM + 1
+$     GOTO LOOP
+$   END:
+$ endif
+$ purge
+$!
+$ write sys$output "Building nm.exe"
+$ NM_OBJS="nm.obj" + BULIBS_FILES + BFDLIB + LIBIBERTY
+$ link/exe=nm 'NM_OBJS
+$!
+$ write sys$output "Building strings.exe"
+$ STRINGS_OBJS="strings.obj" + BULIBS_FILES + BFDLIB + LIBIBERTY
+$ link/exe=strings 'STRINGS_OBJS
+$!
+$ write sys$output "Building size.exe"
+$ SIZE_OBJS="size.obj" + BULIBS_FILES + BFDLIB + LIBIBERTY
+$ link/exe=size 'SIZE_OBJS
+$!
+$ write sys$output "Building addr2line.exe"
+$ ADDR2LINE_OBJS="addr2line.obj" + BULIBS_FILES + BFDLIB + LIBIBERTY
+$ link/exe=addr2line 'ADDR2LINE_OBJS
+$!
+$ write sys$output "Building objdump.exe"
+$ OBJDUMP_OBJS="objdump.obj,prdbg.obj" + DEBUG_FILES + BULIBS_FILES +-
+   BFDLIB + OPCODES + LIBIBERTY
+$ link/exe=objdump 'OBJDUMP_OBJS
+$EOD
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/configure.in sdcc-3.2.0+dfsg/support/sdbinutils/binutils/configure.in
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/configure.in	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/configure.in	2012-05-24 07:03:33.000000000 +0000
@@ -0,0 +1,441 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+AC_PREREQ(2.59)
+AC_INIT
+AC_CONFIG_SRCDIR(ar.c)
+
+AC_CANONICAL_TARGET
+AC_ISC_POSIX
+
+changequote(,)dnl
+BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ 	]*\([^ 	]*\)[ 	]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
+changequote([,])dnl
+AM_INIT_AUTOMAKE(binutils, ${BFD_VERSION})
+
+AC_PROG_CC
+AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
+
+ACX_LARGEFILE
+LT_INIT
+
+AC_ARG_ENABLE(targets,
+[  --enable-targets        alternative target configurations],
+[case "${enableval}" in
+  yes | "") AC_MSG_ERROR(enable-targets option must specify target names or 'all')
+            ;;
+  no)       enable_targets= ;;
+  *)        enable_targets=$enableval ;;
+esac])dnl
+
+AM_BINUTILS_WARNINGS
+		   
+AC_CONFIG_HEADERS(config.h:config.in)
+
+if test -z "$target" ; then
+    AC_MSG_ERROR(Unrecognized target system type; please check config.sub.)
+fi
+if test -z "$host" ; then
+    AC_MSG_ERROR(Unrecognized host system type; please check config.sub.)
+fi
+
+AC_PROG_YACC
+AM_PROG_LEX
+
+ALL_LINGUAS="da es fi fr id ja ro ru rw sk sv tr uk vi zh_CN zh_TW bg"
+ZW_GNU_GETTEXT_SISTER_DIR
+AM_PO_SUBDIRS
+
+AM_MAINTAINER_MODE
+AM_CONDITIONAL(GENINSRC_NEVER, false)
+AC_EXEEXT
+if test -n "$EXEEXT"; then
+  AC_DEFINE(HAVE_EXECUTABLE_SUFFIX, 1,
+	    [Does the platform use an executable suffix?])
+fi
+AC_DEFINE_UNQUOTED(EXECUTABLE_SUFFIX, "${EXEEXT}",
+		   [Suffix used for executables, if any.])
+
+# host-specific stuff:
+
+HDEFINES=
+
+. ${srcdir}/../bfd/configure.host
+
+AC_SUBST(HDEFINES)
+AR=${AR-ar}
+AC_SUBST(AR)
+AC_PROG_RANLIB
+AC_PROG_INSTALL
+
+BFD_CC_FOR_BUILD
+
+DEMANGLER_NAME=c++filt
+case "${host}" in
+  *-*-go32* | *-*-msdos*)
+    DEMANGLER_NAME=cxxfilt
+esac
+AC_SUBST(DEMANGLER_NAME)
+
+AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h fcntl.h sys/file.h limits.h sys/param.h)
+AC_HEADER_SYS_WAIT
+AC_FUNC_ALLOCA
+AC_CHECK_FUNCS(sbrk utimes setmode getc_unlocked strcoll)
+AC_CHECK_FUNC([mkstemp],
+	      AC_DEFINE([HAVE_MKSTEMP], 1,
+	      [Define to 1 if you have the `mkstemp' function.]))
+AC_CHECK_FUNC([mkdtemp],
+              AC_DEFINE([HAVE_MKDTEMP], 1,
+              [Define to 1 if you have the `mkdtemp' function.]))
+
+# Some systems have frexp only in -lm, not in -lc.
+AC_SEARCH_LIBS(frexp, m)
+
+AC_MSG_CHECKING(for time_t in time.h)
+AC_CACHE_VAL(bu_cv_decl_time_t_time_h,
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <time.h>], [time_t i;])],
+bu_cv_decl_time_t_time_h=yes, bu_cv_decl_time_t_time_h=no)])
+AC_MSG_RESULT($bu_cv_decl_time_t_time_h)
+if test $bu_cv_decl_time_t_time_h = yes; then
+  AC_DEFINE([HAVE_TIME_T_IN_TIME_H], 1,
+	    [Is the type time_t defined in <time.h>?])
+fi
+
+AC_MSG_CHECKING(for time_t in sys/types.h)
+AC_CACHE_VAL(bu_cv_decl_time_t_types_h,
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>], [time_t i;])],
+bu_cv_decl_time_t_types_h=yes, bu_cv_decl_time_t_types_h=no)])
+AC_MSG_RESULT($bu_cv_decl_time_t_types_h)
+if test $bu_cv_decl_time_t_types_h = yes; then
+  AC_DEFINE([HAVE_TIME_T_IN_TYPES_H], 1,
+	    [Is the type time_t defined in <sys/types.h>?])
+fi
+
+AC_MSG_CHECKING(for a known getopt prototype in unistd.h)
+AC_CACHE_VAL(bu_cv_decl_getopt_unistd_h,
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <unistd.h>], [extern int getopt (int, char *const*, const char *);])],
+bu_cv_decl_getopt_unistd_h=yes, bu_cv_decl_getopt_unistd_h=no)])
+AC_MSG_RESULT($bu_cv_decl_getopt_unistd_h)
+if test $bu_cv_decl_getopt_unistd_h = yes; then
+  AC_DEFINE([HAVE_DECL_GETOPT], 1,
+	    [Is the prototype for getopt in <unistd.h> in the expected format?])
+fi
+
+# Under Next 3.2 <utime.h> apparently does not define struct utimbuf
+# by default.
+AC_MSG_CHECKING([for utime.h])
+AC_CACHE_VAL(bu_cv_header_utime_h,
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+#include <utime.h>],
+[struct utimbuf s;])],
+bu_cv_header_utime_h=yes, bu_cv_header_utime_h=no)])
+AC_MSG_RESULT($bu_cv_header_utime_h)
+if test $bu_cv_header_utime_h = yes; then
+  AC_DEFINE(HAVE_GOOD_UTIME_H, 1, [Does <utime.h> define struct utimbuf?])
+fi
+
+AC_CHECK_DECLS([fprintf, stpcpy, strstr, sbrk, getenv, environ, getc_unlocked,
+		snprintf, vsnprintf])
+
+# Link in zlib if we can.  This allows us to read compressed debug
+# sections.  This is used only by readelf.c (objdump uses bfd for
+# reading compressed sections).
+AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)])
+
+BFD_BINARY_FOPEN
+
+# target-specific stuff:
+
+# Canonicalize the secondary target names.
+if test -n "$enable_targets"; then
+    for targ in `echo $enable_targets | sed 's/,/ /g'`
+    do
+	result=`$ac_config_sub $targ 2>/dev/null`
+	if test -n "$result"; then
+	    canon_targets="$canon_targets $result"
+	else
+	    # Allow targets that config.sub doesn't recognize, like "all".
+	    canon_targets="$canon_targets $targ"
+	fi
+    done
+fi
+
+AC_CHECK_HEADER(iconv.h)
+AM_ICONV
+
+all_targets=false
+BUILD_NLMCONV=
+NLMCONV_DEFS=
+BUILD_SRCONV=
+BUILD_DLLTOOL=
+DLLTOOL_DEFS=
+DLLTOOL_DEFAULT=
+BUILD_WINDRES=
+BUILD_WINDMC=
+BUILD_DLLWRAP=
+BUILD_MISC=
+BUILD_INSTALL_MISC=
+OBJDUMP_DEFS=
+OBJDUMP_PRIVATE_VECTORS=
+OBJDUMP_PRIVATE_OFILES=
+od_vectors=
+
+for targ in $target $canon_targets
+do
+    if test "x$targ" = "xall"; then
+        all_targets=true
+	BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
+	BUILD_SRCONV='$(SRCONV_PROG)'
+	NLMCONV_DEFS="-DNLMCONV_I386 -DNLMCONV_ALPHA -DNLMCONV_POWERPC -DNLMCONV_SPARC"
+	BUILD_MISC="${BUILD_MISC} "'bin2c$(EXEEXT_FOR_BUILD)'
+	BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+	BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+	BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	if test -z "$DLLTOOL_DEFAULT"; then
+	  DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_I386"
+	fi
+	DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
+	BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
+	od_vectors="$od_vectors objdump_private_desc_xcoff"
+    else
+	case $targ in
+changequote(,)dnl
+	i[3-7]86*-*-netware*) 
+changequote([,])dnl
+	  BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
+	  NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_I386"
+	  ;;
+	alpha*-*-netware*)
+	  BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
+	  NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_ALPHA"
+	  ;;
+	powerpc*-*-netware*)
+	  BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
+	  NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_POWERPC"
+	  ;;
+	sparc*-*-netware*)
+	  BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
+	  NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_SPARC"
+	  ;;
+	esac
+
+	case $targ in
+	*-*-hms*) BUILD_SRCONV='$(SRCONV_PROG)' ;;
+	esac
+
+	case $targ in
+	arm-epoc-pe*)
+  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_ARM_EPOC"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM_EPOC -DDLLTOOL_ARM"
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+	  ;;
+	arm-wince-pe* | arm-*-wince | arm*-*-cegcc* | arm*-*-mingw32ce*)
+  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_ARM_WINCE"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM_WINCE -DDLLTOOL_ARM"
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+	  ;;
+	arm-*-pe*)
+  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_ARM"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM"
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+	  ;;
+	x86_64-*-mingw*)
+  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_MX86_64"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MX86_64"
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+	  BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
+	  ;;
+changequote(,)dnl
+	i[3-7]86-*-pe* | i[3-7]86-*-cygwin* | i[3-7]86-*-mingw32** | i[3-7]86-*-netbsdpe*)
+changequote([,])dnl
+  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_I386"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+	  BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
+	  ;;
+changequote(,)dnl
+	i[3-7]86-*-interix)
+changequote([,])dnl
+	  BUILD_DLLTOOL='$(DLLTOOL_PROG)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_I386"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
+	  ;;
+changequote(,)dnl
+	powerpc*-aix5.[01])
+changequote([,])dnl
+	  ;;
+changequote(,)dnl
+	powerpc*-aix[5-9].*)
+changequote([,])dnl
+	  OBJDUMP_DEFS="-DAIX_WEAK_SUPPORT"
+	  ;;
+	powerpc*-*-pe* | powerpc*-*-cygwin*)
+  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_PPC"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_PPC"
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+	  ;;
+	sh*-*-pe)
+  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_SH"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_SH"
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+	  ;;
+	spu-*-*)
+	  BUILD_MISC="${BUILD_MISC} "'bin2c$(EXEEXT_FOR_BUILD)'
+	  ;;
+	mips*-*-pe)
+  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_MIPS"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MIPS"
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+	  ;;
+	mcore-*-pe)
+  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_MCORE"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MCORE"
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+	  ;;
+	mcore-*-elf)
+  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+	  if test -z "$DLLTOOL_DEFAULT"; then
+	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_MCORE_ELF"
+	  fi
+	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MCORE_ELF"
+	  ;;
+  	mep-*)
+	  OBJDUMP_DEFS="-DSKIP_ZEROES=256 -DSKIP_ZEROES_AT_END=0"
+	  ;;
+	esac
+
+	# Add objdump private vectors.
+	case $targ in
+	powerpc-*-aix*)
+	od_vectors="$od_vectors objdump_private_desc_xcoff"
+	  ;;
+	esac
+    fi
+done
+
+# Uniq objdump private vector, build objdump target ofiles.
+od_files=
+f=""
+for i in $od_vectors ; do
+    case " $f " in
+    *" $i "*) ;;
+    *)
+	f="$f $i"
+	OBJDUMP_PRIVATE_VECTORS="$OBJDUMP_PRIVATE_VECTORS &$i,"
+	case $i in
+	objdump_private_desc_xcoff)
+	    od_files="$od_files od-xcoff" ;;
+	*) AC_MSG_ERROR(*** unknown private vector $i) ;;
+	esac
+	;;
+    esac
+done
+
+# Uniq objdump target ofiles
+f=""
+for i in $od_files ; do
+    case " $f " in
+    *" $i "*) ;;
+    *)
+	f="$f $i"
+	OBJDUMP_PRIVATE_OFILES="$OBJDUMP_PRIVATE_OFILES $i.$objext"
+	;;
+    esac
+done
+
+DLLTOOL_DEFS="$DLLTOOL_DEFS $DLLTOOL_DEFAULT"
+
+if test "${with_windres+set}" = set; then
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+fi
+
+if test "${with_windmc+set}" = set; then
+	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+fi
+
+OBJDUMP_DEFS="${OBJDUMP_DEFS} -DOBJDUMP_PRIVATE_VECTORS=\"${OBJDUMP_PRIVATE_VECTORS}\""
+
+AC_SUBST(NLMCONV_DEFS)
+AC_SUBST(BUILD_NLMCONV)
+AC_SUBST(BUILD_SRCONV)
+AC_SUBST(BUILD_DLLTOOL)
+AC_SUBST(DLLTOOL_DEFS)
+AC_SUBST(BUILD_WINDRES)
+AC_SUBST(BUILD_WINDMC)
+AC_SUBST(BUILD_DLLWRAP)
+AC_SUBST(BUILD_MISC)
+AC_SUBST(BUILD_INSTALL_MISC)
+AC_SUBST(OBJDUMP_DEFS)
+AC_SUBST(OBJDUMP_PRIVATE_OFILES)
+
+AC_DEFINE_UNQUOTED(TARGET, "${target}", [Configured target name.])
+
+targ=$target
+. $srcdir/../bfd/config.bfd
+if test "x$targ_underscore" = "xyes"; then
+    UNDERSCORE=1
+else
+    UNDERSCORE=0
+fi
+AC_DEFINE_UNQUOTED(TARGET_PREPENDS_UNDERSCORE, $UNDERSCORE,
+ [Define to 1 if user symbol names have a leading underscore, 0 if not.])
+
+# Emulation 
+targ=$target
+. ${srcdir}/configure.tgt
+EMULATION=$targ_emul
+EMULATION_VECTOR=$targ_emul_vector	
+
+AC_SUBST(EMULATION)
+AC_SUBST(EMULATION_VECTOR)
+
+# Required for html and install-html
+AC_SUBST(datarootdir)
+AC_SUBST(docdir)
+AC_SUBST(htmldir)
+AC_SUBST(pdfdir)
+
+####AC_CONFIG_FILES(Makefile doc/Makefile po/Makefile.in:po/Make-in)
+AC_CONFIG_FILES(Makefile)
+AC_OUTPUT
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/configure.tgt sdcc-3.2.0+dfsg/support/sdbinutils/binutils/configure.tgt
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/configure.tgt	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/configure.tgt	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,26 @@
+# This is the binutils target specific file.  This is invoked by the
+# autoconf generated configure script.  Putting it in a separate shell
+# file lets us skip running autoconf when modifying target specific
+# information.
+
+# This file switches on the shell variable ${targ}, and sets the
+# following shell variables:
+# targ_emul		name of emulation to use
+# targ_emul_vector	name of vector to use
+
+case "${targ}" in
+    powerpc-*-aix[5-9]* | rs6000-*-aix[5-9]*)
+	targ_emul=aix 
+	targ_emul_vector=bin_aix_emulation 
+        ;;
+
+    powerpc-*-aix4.3* | rs6000-*-aix4.3*)
+	targ_emul=aix 
+        targ_emul_vector=bin_aix_emulation 
+        ;;
+
+    *)
+        targ_emul=vanilla 
+        targ_emul_vector=bin_vanilla_emulation 
+        ;;
+esac
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/deflex.l sdcc-3.2.0+dfsg/support/sdbinutils/binutils/deflex.l
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/deflex.l	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/deflex.l	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,98 @@
+%{/* deflex.l - Lexer for .def files */
+
+/* Copyright 1995, 1997, 1998, 1999, 2002, 2003, 2004, 2005, 2007
+   Free Software Foundation, Inc.
+   
+   This file is part of GNU Binutils.
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+/* Contributed by Steve Chamberlain: sac@cygnus.com  */
+
+#define DONTDECLARE_MALLOC
+#include "libiberty.h"
+#include "defparse.h"
+#include "dlltool.h"
+
+#define YY_NO_UNPUT
+
+int linenumber;
+
+%}
+%%
+"NAME" 		{ return NAME;}
+"LIBRARY"	{ return LIBRARY;}
+"DESCRIPTION" 	{ return DESCRIPTION;}
+"STACKSIZE"	{ return STACKSIZE;}
+"HEAPSIZE" 	{ return HEAPSIZE;}
+"CODE" 		{ return CODE;}
+"DATA"		{ return DATA;}
+"SECTIONS"	{ return SECTIONS;}
+"EXPORTS"	{ return EXPORTS;}
+"IMPORTS"	{ return IMPORTS;}
+"VERSION"	{ return VERSIONK;}
+"BASE"		{ return BASE;}
+"CONSTANT"	{ return CONSTANT; }
+"NONAME"	{ return NONAME; }
+"PRIVATE"	{ return PRIVATE; }
+"READ"		{ return READ;}
+"WRITE"		{ return WRITE;}
+"EXECUTE"	{ return EXECUTE;}
+"SHARED"	{ return SHARED;}
+"NONSHARED"	{ return NONSHARED;}
+"SINGLE"	{ return SINGLE;}
+"MULTIPLE"	{ return MULTIPLE;}
+"INITINSTANCE"	{ return INITINSTANCE;}
+"INITGLOBAL"	{ return INITGLOBAL;}
+"TERMINSTANCE"	{ return TERMINSTANCE;}
+"TERMGLOBAL"	{ return TERMGLOBAL;}
+
+[0-9][x0-9A-Fa-f]* { yylval.number = strtol (yytext,0,0); 
+		return NUMBER; }
+
+(@)?[A-Za-z$:\-\_?][A-Za-z0-9/$:\<\>\-\_@?]* { 	
+		yylval.id =  xstrdup (yytext);
+		return ID;
+		}
+
+"\""[^\"]*"\"" {
+		yylval.id = xstrdup (yytext+1);
+		yylval.id[yyleng-2] = 0;
+		return ID;
+		}
+
+"\'"[^\']*"\'" {
+		yylval.id = xstrdup (yytext+1);
+		yylval.id[yyleng-2] = 0;
+		return ID;
+		}
+"*".* 		{ }
+";".* 		{ }
+" "		{ }
+"\t"		{ }
+"\r"		{ }
+"\n"	 	{ linenumber ++ ;}
+"=="		{ return EQUAL;}
+"=" 		{ return '=';}
+"." 		{ return '.';}
+"@"	 	{ return '@';}
+","		{ return ',';}
+%%
+#ifndef yywrap
+/* Needed for lex, though not flex. */
+int yywrap(void) { return 1; }
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/defparse.y sdcc-3.2.0+dfsg/support/sdbinutils/binutils/defparse.y
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/defparse.y	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/defparse.y	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,198 @@
+%{ /* defparse.y - parser for .def files */
+
+/* Copyright 1995, 1997, 1998, 1999, 2001, 2004, 2005, 2007
+   Free Software Foundation, Inc.
+   
+   This file is part of GNU Binutils.
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "libiberty.h"
+#include "dlltool.h"
+%}
+
+%union {
+  char *id;
+  int number;
+};
+
+%token NAME LIBRARY DESCRIPTION STACKSIZE HEAPSIZE CODE DATA
+%token SECTIONS EXPORTS IMPORTS VERSIONK BASE CONSTANT
+%token READ WRITE EXECUTE SHARED NONSHARED NONAME PRIVATE
+%token SINGLE MULTIPLE INITINSTANCE INITGLOBAL TERMINSTANCE TERMGLOBAL
+%token EQUAL
+%token <id> ID
+%token <number> NUMBER
+%type  <number> opt_base opt_ordinal opt_NONAME opt_CONSTANT opt_DATA opt_PRIVATE
+%type  <number> attr attr_list opt_number
+%type  <id> opt_name opt_equal_name opt_import_name
+
+%%
+
+start: start command
+	| command
+	;
+
+command: 
+		NAME opt_name opt_base { def_name ($2, $3); }
+	|	LIBRARY opt_name opt_base option_list { def_library ($2, $3); }
+	|	EXPORTS explist 
+	|	DESCRIPTION ID { def_description ($2);}
+	|	STACKSIZE NUMBER opt_number { def_stacksize ($2, $3);}
+	|	HEAPSIZE NUMBER opt_number { def_heapsize ($2, $3);}
+	|	CODE attr_list { def_code ($2);}
+	|	DATA attr_list  { def_data ($2);}
+	|	SECTIONS seclist
+	|	IMPORTS implist
+	|	VERSIONK NUMBER { def_version ($2,0);}
+	|	VERSIONK NUMBER '.' NUMBER { def_version ($2,$4);}
+	;
+
+
+explist:
+		/* EMPTY */
+	|	explist expline
+	;
+
+expline:
+		ID opt_equal_name opt_ordinal opt_NONAME opt_CONSTANT opt_DATA opt_PRIVATE
+		opt_import_name
+			{ def_exports ($1, $2, $3, $4, $5, $6, $7, $8);}
+	;
+implist:	
+		implist impline
+	|	impline
+	;
+
+impline:
+               ID '=' ID '.' ID '.' ID opt_import_name
+		 { def_import ($1,$3,$5,$7, 0, $8); }
+       |       ID '=' ID '.' ID '.' NUMBER opt_import_name
+		 { def_import ($1,$3,$5, 0,$7, $8); }
+       |       ID '=' ID '.' ID opt_import_name
+		 { def_import ($1,$3, 0,$5, 0, $6); }
+       |       ID '=' ID '.' NUMBER opt_import_name
+		 { def_import ($1,$3, 0, 0,$5, $6); }
+       |       ID '.' ID '.' ID opt_import_name
+		 { def_import ( 0,$1,$3,$5, 0, $6); }
+       |       ID '.' ID '.' NUMBER opt_import_name
+		 { def_import ( 0,$1,$3, 0,$5, $6); }
+       |       ID '.' ID opt_import_name
+		 { def_import ( 0,$1, 0,$3, 0, $4); }
+       |       ID '.' NUMBER opt_import_name
+		 { def_import ( 0,$1, 0, 0,$3, $4); }
+;
+
+seclist:
+		seclist secline
+	|	secline
+	;
+
+secline:
+	ID attr_list { def_section ($1,$2);}
+	;
+
+attr_list:
+	attr_list opt_comma attr
+	| attr
+	;
+
+opt_comma:
+	','
+	| 
+	;
+opt_number: ',' NUMBER { $$=$2;}
+	|	   { $$=-1;}
+	;
+	
+attr:
+		READ { $$ = 1; }
+	|	WRITE { $$ = 2; }
+	|	EXECUTE { $$ = 4; }
+	|	SHARED { $$ = 8; }
+	|	NONSHARED { $$ = 0; }
+	|	SINGLE { $$ = 0; }
+	|	MULTIPLE { $$ = 0; }
+	;
+
+opt_CONSTANT:
+		CONSTANT {$$=1;}
+	|		 {$$=0;}
+	;
+
+opt_NONAME:
+		NONAME {$$=1;}
+	|		 {$$=0;}
+	;
+
+opt_DATA:
+		DATA { $$ = 1; }
+	|	     { $$ = 0; }
+	;
+
+opt_PRIVATE:
+		PRIVATE { $$ = 1; }
+	|		{ $$ = 0; }
+	;
+
+opt_name: ID		{ $$ =$1; }
+	| ID '.' ID	
+	  { 
+	    char *name = xmalloc (strlen ($1) + 1 + strlen ($3) + 1);
+	    sprintf (name, "%s.%s", $1, $3);
+	    $$ = name;
+	  }
+	|		{ $$=""; }
+	;
+
+opt_ordinal: 
+	  '@' NUMBER     { $$=$2;}
+	|                { $$=-1;}
+	;
+
+opt_import_name:
+	  EQUAL ID	{ $$ = $2; }
+	|		{ $$ = 0; }
+	;
+
+opt_equal_name:
+          '=' ID	{ $$ = $2; }
+	| '=' ID '.' ID	
+	  { 
+	    char *name = xmalloc (strlen ($2) + 1 + strlen ($4) + 1);
+	    sprintf (name, "%s.%s", $2, $4);
+	    $$ = name;
+	  }
+        | 		{ $$ =  0; }			 
+	;
+
+opt_base: BASE	'=' NUMBER	{ $$= $3;}
+	|	{ $$=-1;}
+	;
+
+option_list:
+		/* empty */
+	|	option_list opt_comma option
+	;
+
+option:
+		INITINSTANCE
+	|	INITGLOBAL
+	|	TERMINSTANCE
+	|	TERMGLOBAL
+	;
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/dep-in.sed sdcc-3.2.0+dfsg/support/sdbinutils/binutils/dep-in.sed
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/dep-in.sed	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/dep-in.sed	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,20 @@
+:loop
+/\\$/N
+s/\\\n */ /g
+t loop
+
+s! \./! !g
+s!@INCDIR@!$(INCDIR)!g
+s!@TOPDIR@/include!$(INCDIR)!g
+s!@BFDDIR@!$(BFDDIR)!g
+s!@TOPDIR@/bfd!$(BFDDIR)!g
+s!@SRCDIR@/!!g
+s!@OBJDIR@/!!g
+s! \.\./intl/libintl\.h!!g
+
+s/ *$//
+s/  */ /g
+s/^ */A/
+s/ / \\\
+B/g
+$s/$/ \\/
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/dwarf-mode.el sdcc-3.2.0+dfsg/support/sdbinutils/binutils/dwarf-mode.el
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/dwarf-mode.el	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/dwarf-mode.el	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,167 @@
+;;; dwarf-mode.el --- Browser for DWARF information.
+
+;; Version: 1.0
+
+;; This file is not part of GNU Emacs, but is distributed under the
+;; same terms:
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs 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 GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(defvar dwarf-objdump-program "objdump")
+
+(defconst dwarf-font-lock-keywords
+  '(
+    ;; Name and linkage name.
+    ("DW_AT_[a-z_]*name\\s *: .*:\\(.*\\)\\s *$"
+     (1 font-lock-function-name-face))
+
+    ("Compilation Unit @ offset 0x[0-9a-f]+"
+     (0 font-lock-string-face))
+    ))
+
+(defvar dwarf-file nil
+  "Buffer-local variable holding the file name passed to objdump.")
+
+;; Expand a "..." to show all the child DIES.  NEW-DEPTH controls how
+;; deep to display the new dies; `nil' means display all of them.
+(defun dwarf-do-insert-substructure (new-depth die)
+  (let ((inhibit-read-only t))
+    (beginning-of-line)
+    (delete-region (point) (progn
+			     (end-of-line)
+			     (forward-char)
+			     (point)))
+    (save-excursion
+      (apply #'call-process dwarf-objdump-program nil (current-buffer) nil
+	     "-Wi" (concat "--dwarf-start=0x" die)
+	     (expand-file-name dwarf-file)
+	     (if new-depth (list (concat "--dwarf-depth="
+					 (int-to-string new-depth))))))
+    (set-buffer-modified-p nil)))
+
+(defun dwarf-insert-substructure-button (die)
+  (beginning-of-line)
+  (unless (looking-at "^ <\\([0-9]+\\)>")
+    (error "Unrecognized line."))
+  (let ((new-depth (1+ (string-to-int (match-string 1)))))
+    (dwarf-do-insert-substructure new-depth die)))
+
+(defun dwarf-insert-substructure (arg)
+  "Expand a `...' to show children of the current DIE.
+By default, expands just one level of children.
+A prefix argument means expand all children."
+  (interactive "P")
+  (beginning-of-line)
+  (unless (looking-at "^ <\\([0-9]+\\)><\\([0-9a-f]+\\)>")
+    (error "Unrecognized line."))
+  (let ((die (match-string 2)))
+    (if arg
+	(dwarf-do-insert-substructure nil die)
+      (dwarf-insert-substructure-button die))))
+
+;; Called when a button is pressed.
+;; Either follows a DIE reference, or expands a "...".
+(defun dwarf-die-button-action (button)
+  (let* ((die (button-get button 'die))
+	 ;; Note that the first number can only be decimal.
+	 (die-rx (concat "^\\s *\\(<[0-9]+>\\)?<"
+			 die ">[^<]"))
+	 (old (point))
+	 (is-ref (button-get button 'die-ref)))
+    (if is-ref
+	(progn
+	  (goto-char (point-min))
+	  (if (re-search-forward die-rx nil 'move)
+	      (push-mark old)
+	    (goto-char old)
+	    (error "Could not find DIE <0x%s>" die)))
+      (dwarf-insert-substructure-button die))))
+
+;; Button definition.
+(define-button-type 'dwarf-die-button
+  'follow-link t
+  'action #'dwarf-die-button-action)
+
+;; Helper regexp to match a DIE reference.
+(defconst dwarf-die-reference ": \\(<0x\\([0-9a-f]+\\)>\\)\\s *$")
+
+;; Helper regexp to match a `...' indicating that there are hidden
+;; children.
+(defconst dwarf-die-more "^ <[0-9]+><\\([0-9a-z]+\\)>: \\([.][.][.]\\)")
+
+;; jit-lock callback function to fontify a region.  This applies the
+;; buttons, since AFAICT there is no good way to apply buttons via
+;; font-lock.
+(defun dwarf-fontify-region (start end)
+  (save-excursion
+    (let ((beg-line (progn (goto-char start) (line-beginning-position)))
+	  (end-line (progn (goto-char end) (line-end-position))))
+      (goto-char beg-line)
+      (while (re-search-forward dwarf-die-reference end-line 'move)
+	(let ((b-start (match-beginning 1))
+	      (b-end (match-end 1))
+	      (hex (match-string-no-properties 2)))
+	  (make-text-button b-start b-end :type 'dwarf-die-button
+			    'die hex 'die-ref t)))
+      ;; This is a bogus approach.  Why can't we make buttons from the
+      ;; font-lock defaults?
+      (goto-char beg-line)
+      (while (re-search-forward dwarf-die-more end-line 'move)
+	(let ((hex (match-string-no-properties 1))
+	      (b-start (match-beginning 2))
+	      (b-end (match-end 2)))
+	  (make-text-button b-start b-end :type 'dwarf-die-button
+			    'die hex 'die-ref nil))))))
+
+;; Run objdump and insert the contents into the buffer.  The arguments
+;; are the way they are because this is also called as a
+;; revert-buffer-function.
+(defun dwarf-do-refresh (&rest ignore)
+  (let ((inhibit-read-only t))
+    (erase-buffer)
+    (save-excursion
+      (call-process dwarf-objdump-program
+		    nil (current-buffer) nil
+		    "-Wi" "--dwarf-depth=1"
+		    (expand-file-name dwarf-file)))
+    (set-buffer-modified-p nil)))
+
+;;;###autoload
+(define-derived-mode dwarf-mode special-mode "DWARF"
+  "Major mode for browsing DWARF output.
+
+\\{dwarf-mode-map}"
+
+  (set (make-local-variable 'font-lock-defaults) '(dwarf-font-lock-keywords))
+  ;; FIXME: we could be smarter and check the file time.
+  (set (make-local-variable 'revert-buffer-function) #'dwarf-do-refresh)
+  (jit-lock-register #'dwarf-fontify-region))
+
+(define-key dwarf-mode-map [(control ?m)] #'dwarf-insert-substructure)
+
+;;:###autoload
+(defun dwarf-browse (file)
+  "Invoke `objdump' and put output into a `dwarf-mode' buffer.
+This is the main interface to `dwarf-mode'."
+  (interactive "fFile name: ")
+  (let* ((base-name (file-name-nondirectory file))
+	 (buffer (generate-new-buffer (concat "*DWARF for " base-name "*"))))
+    (pop-to-buffer buffer)
+    (dwarf-mode)
+    (set (make-local-variable 'dwarf-file) file)
+    (dwarf-do-refresh)))
+
+(provide 'dwarf-mode)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/embedspu.sh sdcc-3.2.0+dfsg/support/sdbinutils/binutils/embedspu.sh
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/embedspu.sh	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/embedspu.sh	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,260 @@
+#! /bin/sh 
+# Embed an SPU ELF executable into a PowerPC object file.
+#
+# Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
+#
+# This file is part of GNU Binutils.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+usage ()
+{
+  echo "Usage: embedspu [flags] symbol_name input_filename output_filename"
+  echo
+  echo "        input_filename:  SPU ELF executable to be embedded"
+  echo "        output_filename: Resulting PowerPC object file"
+  echo "        symbol_name:     Name of program handle struct to be defined"
+  echo "        flags:           GCC flags defining PowerPC object file format"
+  echo "                         (e.g. -m32 or -m64)"
+  exit 1
+}
+
+program_transform_name=
+mydir=`dirname "$0"`
+
+find_prog ()
+{
+  prog=`echo $1 | sed "$program_transform_name"`
+  prog="$mydir/$prog"
+  test -x "$prog" && return 0
+  prog="$mydir/$1"
+  test -x "$prog" && return 0
+  prog=`echo $1 | sed "$program_transform_name"`
+  which $prog > /dev/null 2> /dev/null && return 0
+  return 1
+}
+
+SYMBOL=
+INFILE=
+OUTFILE=
+FLAGS=
+
+parse_args ()
+{
+  while test -n "$1"; do
+    case "$1" in
+      -*) FLAGS="${FLAGS} $1" ;;
+      *)  if test -z "$SYMBOL"; then
+	    SYMBOL="$1"
+	  elif test -z "$INFILE"; then
+	    INFILE="$1"
+	  elif test -z "$OUTFILE"; then
+	    OUTFILE="$1"
+	  else
+	    echo "Too many arguments!"
+	    usage
+	  fi ;;
+    esac
+    shift
+  done
+  if test -z "$OUTFILE"; then
+    usage
+  fi
+  if test ! -r "$INFILE"; then
+    echo "${INFILE}: File not found"
+    usage
+  fi
+}
+
+main ()
+{
+  parse_args "$@"
+
+  # Find a powerpc gcc.  Support running from a combined tree build.
+  if test -x "$mydir/../gcc/xgcc"; then
+    CC="$mydir/../gcc/xgcc -B$mydir/../gcc/"
+  else
+    find_prog gcc
+    if test $? -ne 0; then
+      echo "Cannot find $prog"
+      exit 1
+    fi
+    CC="$prog"
+  fi
+
+  # Find readelf.  Any old readelf should do.
+  find_prog readelf
+  if test $? -ne 0; then
+    if which readelf > /dev/null 2> /dev/null; then
+      prog=readelf
+    else
+      echo "Cannot find $prog"
+      exit 1
+    fi
+  fi
+  READELF="$prog"
+
+  # Sanity check the input file
+  if ! ${READELF} -h ${INFILE} | grep 'Class:.*ELF32' >/dev/null 2>/dev/null \
+     || ! ${READELF} -h ${INFILE} | grep 'Type:.*EXEC' >/dev/null 2>/dev/null \
+     || ! ${READELF} -h ${INFILE} | egrep 'Machine:.*(SPU|17)' >/dev/null 2>/dev/null
+  then
+    echo "${INFILE}: Does not appear to be an SPU executable"
+    exit 1
+  fi
+
+  toe=`${READELF} -S ${INFILE} | sed -n -e 's, *\[ *\([0-9]*\)\] *\.toe *[PROGN]*BITS *\([0-9a-f]*\).*,\1 \2,p'`
+  toe_addr=`echo $toe | sed -n -e 's,.* ,,p'`
+  toe=`echo $toe | sed -n -e 's, .*,,p'`
+  has_ea=`${READELF} -S ${INFILE} | sed -n -e 's, *\[ *\([0-9]*\)\] *\._ea *PROGBITS.*,\1,p'`
+  # For loaded sections, pick off section number, address, and file offset
+  sections=`${READELF} -S ${INFILE} | sed -n -e 's, *\[ *\([0-9]*\)\] *[^ ]* *PROGBITS *\([0-9a-f]*\) *\([0-9a-f]*\).*,\1 \2 \3,p'`
+  sections=`echo ${sections}`
+  # For relocation sections, pick off file offset and info (points to
+  # section where relocs apply)
+  relas=`${READELF} -S ${INFILE} | sed -n -e 's, *\[ *[0-9]*\] *[^ ]* *RELA *[0-9a-f]* *0*\([0-9a-f][0-9a-f]*\).* \([0-9a-f][0-9a-f]*\) *[0-9a-f][0-9a-f]*$,\1 \2,p'`
+  relas=`echo ${relas}`
+
+  # Build embedded SPU image.
+  # 1. The whole SPU ELF file is written to .rodata.speelf
+  # 2. Symbols starting with the string "_EAR_" in the SPU ELF image are
+  #    special.  They allow an SPU program to access corresponding symbols
+  #    (ie. minus the _EAR_ prefix), in the PowerPC program.  _EAR_ without
+  #    a suffix is used to refer to the addrress of the SPU image in
+  #    PowerPC address space.  _EAR_* symbols must all be defined in .toe
+  #    at 16 byte intervals, or they must be defined in other non-bss
+  #    sections.
+  #    Find all _EAR_ symbols in .toe using readelf, sort by address, and
+  #    write the address of the corresponding PowerPC symbol in a table
+  #    built in .data.spetoe.  For _EAR_ symbols not in .toe, create
+  #    .reloc commands to relocate their location directly.
+  # 3. Look for R_SPU_PPU32 and R_SPU_PPU64 relocations in the SPU ELF image
+  #    and create .reloc commands for them.
+  # 4. Write a struct spe_program_handle to .data.
+  # 5. Write a table of _SPUEAR_ symbols.
+  ${CC} ${FLAGS} -x assembler-with-cpp -nostartfiles -nostdlib \
+	-Wa,-mbig -Wa,-noexecstack -Wl,-r -Wl,-x -o ${OUTFILE} - <<EOF
+ .section .data.spetoe,"aw",@progbits
+ .p2align 7
+__spetoe__:
+`${READELF} -s -W ${INFILE} | grep ' _EAR_' | sort -k 2 | awk \
+'BEGIN { \
+	addr = strtonum ("0x" "'${toe_addr:-0}'"); \
+	split ("'"${sections}"'", s, " "); \
+	for (i = 1; i in s; i += 3) { \
+	    sec_off[s[i]] = strtonum ("0x" s[i+2]) - strtonum ("0x" s[i+1]); \
+	} \
+} \
+$7 == "'${toe}'" && strtonum ("0x" $2) != addr { \
+	print "#error Symbol " $8 " not in 16 byte element toe array!"; \
+} \
+$7 == "'${toe}'" { \
+	addr = addr + 16; \
+} \
+$7 == "'${toe}'" { \
+	print "#ifdef _LP64"; \
+	print " .quad " ($8 == "_EAR_" ? "__speelf__" : substr($8, 6)) ", 0"; \
+	print "#else"; \
+	print " .int 0, " ($8 == "_EAR_" ? "__speelf__" : substr($8, 6)) ", 0, 0"; \
+	print "#endif"; \
+} \
+$7 != "'${toe}'" && $7 in sec_off { \
+	print "#ifdef _LP64"; \
+	print " .reloc __speelf__+" strtonum ("0x" $2) + sec_off[$7] ", R_PPC64_ADDR64, " ($8 == "_EAR_" ? "__speelf__" : substr($8, 6)); \
+	print "#else"; \
+	print " .reloc __speelf__+" strtonum ("0x" $2) + sec_off[$7] + 4 ", R_PPC_ADDR32, " ($8 == "_EAR_" ? "__speelf__" : substr($8, 6)); \
+	print "#endif"; \
+	if (!donedef) { print "#define HAS_RELOCS 1"; donedef = 1; }; \
+} \
+$7 != "'${toe}'" && ! $7 in sec_off { \
+	print "#error Section not found for " $8; \
+} \
+'`
+`test -z "${relas}" || ${READELF} -r -W ${INFILE} | awk \
+'BEGIN { \
+	split ("'"${sections}"'", s, " "); \
+	for (i = 1; i in s; i += 3) { \
+	    sec_off[s[i]] = strtonum ("0x" s[i+2]) - strtonum ("0x" s[i+1]); \
+	} \
+	split ("'"${relas}"'", s, " "); \
+	for (i = 1; i in s; i += 2) { \
+	    rela[s[i]] = strtonum (s[i+1]); \
+	} \
+} \
+/^Relocation section/ { \
+	sec = substr($6, 3); \
+} \
+$3 ~ /R_SPU_PPU/ { \
+	print "#ifdef _LP64"; \
+	print " .reloc __speelf__+" strtonum ("0x" $1) + sec_off[rela[sec]] ", R_PPC64_ADDR" substr($3, 10) ", " ($5 != "" ? $5 "+0x" $7 : "__speelf__ + 0x" $4); \
+	print "#else"; \
+	print " .reloc __speelf__+" strtonum ("0x" $1) + sec_off[rela[sec]] + (substr($3, 10) == "64" ? 4 : 0)", R_PPC_ADDR32, " ($5 != "" ? $5 "+0x" $7 : "__speelf__ + 0x" $4); \
+	print "#endif"; \
+	if (!donedef) { print "#define HAS_RELOCS 1"; donedef = 1; }; \
+} \
+$3 ~ /unrecognized:/ { \
+	print "#ifdef _LP64"; \
+	print " .reloc __speelf__+" strtonum ("0x" $1) + sec_off[rela[sec]] ", R_PPC64_ADDR" ($4 == "f" ? "64" : "32") ", " ($6 != "" ? $6 "+0x" $8 : "__speelf__ + 0x" $5); \
+	print "#else"; \
+	print " .reloc __speelf__+" strtonum ("0x" $1) + sec_off[rela[sec]] + ($4 == "f" ? 4 : 0)", R_PPC_ADDR32, " ($6 != "" ? $6 "+0x" $8 : "__speelf__ + 0x" $5); \
+	print "#endif"; \
+	if (!donedef) { print "#define HAS_RELOCS 1"; donedef = 1; }; \
+} \
+'`
+#if ${has_ea:-0}
+ .section .data.speelf,"aw",@progbits
+#elif defined (HAS_RELOCS) && (defined (__PIC__) || defined (__PIE__))
+ .section .data.rel.ro.speelf,"a",@progbits
+#else
+ .section .rodata.speelf,"a",@progbits
+#endif
+ .p2align 7
+__speelf__:
+ .incbin "${INFILE}"
+
+ .section .data.spehandle,"aw",@progbits
+ .globl ${SYMBOL}
+ .type ${SYMBOL}, @object
+# fill in a struct spe_program_handle
+#ifdef _LP64
+ .p2align 3
+${SYMBOL}:
+ .int 24
+ .int 0
+ .quad __speelf__
+ .quad __spetoe__
+#else
+ .p2align 2
+${SYMBOL}:
+ .int 12
+ .int __speelf__
+ .int __spetoe__
+#endif
+ .size ${SYMBOL}, . - ${SYMBOL}
+
+`${READELF} -s -W ${INFILE} | grep ' _SPUEAR_' | sort -k 2 | awk \
+'{ \
+	print " .globl '${SYMBOL}'_" substr($8, 9); \
+	print " .type '${SYMBOL}'_" substr($8, 9) ", @object"; \
+	print " .size '${SYMBOL}'_" substr($8, 9) ", 4"; \
+	print "'${SYMBOL}'_" substr($8, 9) ":"; \
+	print " .int 0x" $2; \
+} \
+'`
+EOF
+}
+
+main "$@"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/emul_vanilla.c sdcc-3.2.0+dfsg/support/sdbinutils/binutils/emul_vanilla.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/emul_vanilla.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/emul_vanilla.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,30 @@
+/* Binutils emulation layer.
+   Copyright (C) 2002, 2005, 2007 Free Software Foundation, Inc.
+   Written by Tom Rix, Red Hat Inc.
+
+   This file is part of GNU Binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "binemul.h"
+
+struct bin_emulation_xfer_struct bin_vanilla_emulation =
+{
+  ar_emul_default_usage,
+  ar_emul_default_append,
+  ar_emul_default_replace,
+  ar_emul_default_parse_arg,
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/filemode.c sdcc-3.2.0+dfsg/support/sdbinutils/binutils/filemode.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/filemode.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/filemode.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,249 @@
+/* filemode.c -- make a string describing file modes
+   Copyright 1985, 1990, 1991, 1994, 1995, 1997, 1999, 2002, 2003, 2005,
+   2007 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bucomm.h"
+
+static char ftypelet (unsigned long);
+static void setst (unsigned long, char *);
+
+/* filemodestring - fill in string STR with an ls-style ASCII
+   representation of the st_mode field of file stats block STATP.
+   10 characters are stored in STR; no terminating null is added.
+   The characters stored in STR are:
+
+   0	File type.  'd' for directory, 'c' for character
+	special, 'b' for block special, 'm' for multiplex,
+	'l' for symbolic link, 's' for socket, 'p' for fifo,
+	'-' for any other file type
+
+   1	'r' if the owner may read, '-' otherwise.
+
+   2	'w' if the owner may write, '-' otherwise.
+
+   3	'x' if the owner may execute, 's' if the file is
+	set-user-id, '-' otherwise.
+	'S' if the file is set-user-id, but the execute
+	bit isn't set.
+
+   4	'r' if group members may read, '-' otherwise.
+
+   5	'w' if group members may write, '-' otherwise.
+
+   6	'x' if group members may execute, 's' if the file is
+	set-group-id, '-' otherwise.
+	'S' if it is set-group-id but not executable.
+
+   7	'r' if any user may read, '-' otherwise.
+
+   8	'w' if any user may write, '-' otherwise.
+
+   9	'x' if any user may execute, 't' if the file is "sticky"
+	(will be retained in swap space after execution), '-'
+	otherwise.
+	'T' if the file is sticky but not executable.  */
+
+/* Get definitions for the file permission bits.  */
+
+#ifndef S_IRWXU
+#define S_IRWXU 0700
+#endif
+#ifndef S_IRUSR
+#define S_IRUSR 0400
+#endif
+#ifndef S_IWUSR
+#define S_IWUSR 0200
+#endif
+#ifndef S_IXUSR
+#define S_IXUSR 0100
+#endif
+
+#ifndef S_IRWXG
+#define S_IRWXG 0070
+#endif
+#ifndef S_IRGRP
+#define S_IRGRP 0040
+#endif
+#ifndef S_IWGRP
+#define S_IWGRP 0020
+#endif
+#ifndef S_IXGRP
+#define S_IXGRP 0010
+#endif
+
+#ifndef S_IRWXO
+#define S_IRWXO 0007
+#endif
+#ifndef S_IROTH
+#define S_IROTH 0004
+#endif
+#ifndef S_IWOTH
+#define S_IWOTH 0002
+#endif
+#ifndef S_IXOTH
+#define S_IXOTH 0001
+#endif
+
+/* Like filemodestring, but only the relevant part of the `struct stat'
+   is given as an argument.  */
+
+void
+mode_string (unsigned long mode, char *str)
+{
+  str[0] = ftypelet ((unsigned long) mode);
+  str[1] = (mode & S_IRUSR) != 0 ? 'r' : '-';
+  str[2] = (mode & S_IWUSR) != 0 ? 'w' : '-';
+  str[3] = (mode & S_IXUSR) != 0 ? 'x' : '-';
+  str[4] = (mode & S_IRGRP) != 0 ? 'r' : '-';
+  str[5] = (mode & S_IWGRP) != 0 ? 'w' : '-';
+  str[6] = (mode & S_IXGRP) != 0 ? 'x' : '-';
+  str[7] = (mode & S_IROTH) != 0 ? 'r' : '-';
+  str[8] = (mode & S_IWOTH) != 0 ? 'w' : '-';
+  str[9] = (mode & S_IXOTH) != 0 ? 'x' : '-';
+  setst ((unsigned long) mode, str);
+}
+
+/* Return a character indicating the type of file described by
+   file mode BITS:
+   'd' for directories
+   'b' for block special files
+   'c' for character special files
+   'm' for multiplexer files
+   'l' for symbolic links
+   's' for sockets
+   'p' for fifos
+   '-' for any other file type.  */
+
+#ifndef S_ISDIR
+#ifdef S_IFDIR
+#define S_ISDIR(i) (((i) & S_IFMT) == S_IFDIR)
+#else /* ! defined (S_IFDIR) */
+#define S_ISDIR(i) (((i) & 0170000) == 040000)
+#endif /* ! defined (S_IFDIR) */
+#endif /* ! defined (S_ISDIR) */
+
+#ifndef S_ISBLK
+#ifdef S_IFBLK
+#define S_ISBLK(i) (((i) & S_IFMT) == S_IFBLK)
+#else /* ! defined (S_IFBLK) */
+#define S_ISBLK(i) 0
+#endif /* ! defined (S_IFBLK) */
+#endif /* ! defined (S_ISBLK) */
+
+#ifndef S_ISCHR
+#ifdef S_IFCHR
+#define S_ISCHR(i) (((i) & S_IFMT) == S_IFCHR)
+#else /* ! defined (S_IFCHR) */
+#define S_ISCHR(i) 0
+#endif /* ! defined (S_IFCHR) */
+#endif /* ! defined (S_ISCHR) */
+
+#ifndef S_ISFIFO
+#ifdef S_IFIFO
+#define S_ISFIFO(i) (((i) & S_IFMT) == S_IFIFO)
+#else /* ! defined (S_IFIFO) */
+#define S_ISFIFO(i) 0
+#endif /* ! defined (S_IFIFO) */
+#endif /* ! defined (S_ISFIFO) */
+
+#ifndef S_ISSOCK
+#ifdef S_IFSOCK
+#define S_ISSOCK(i) (((i) & S_IFMT) == S_IFSOCK)
+#else /* ! defined (S_IFSOCK) */
+#define S_ISSOCK(i) 0
+#endif /* ! defined (S_IFSOCK) */
+#endif /* ! defined (S_ISSOCK) */
+
+#ifndef S_ISLNK
+#ifdef S_IFLNK
+#define S_ISLNK(i) (((i) & S_IFMT) == S_IFLNK)
+#else /* ! defined (S_IFLNK) */
+#define S_ISLNK(i) 0
+#endif /* ! defined (S_IFLNK) */
+#endif /* ! defined (S_ISLNK) */
+
+static char
+ftypelet (unsigned long bits)
+{
+  if (S_ISDIR (bits))
+    return 'd';
+  if (S_ISLNK (bits))
+    return 'l';
+  if (S_ISBLK (bits))
+    return 'b';
+  if (S_ISCHR (bits))
+    return 'c';
+  if (S_ISSOCK (bits))
+    return 's';
+  if (S_ISFIFO (bits))
+    return 'p';
+
+#ifdef S_IFMT
+#ifdef S_IFMPC
+  if ((bits & S_IFMT) == S_IFMPC
+      || (bits & S_IFMT) == S_IFMPB)
+    return 'm';
+#endif
+#ifdef S_IFNWK
+  if ((bits & S_IFMT) == S_IFNWK)
+    return 'n';
+#endif
+#endif
+
+  return '-';
+}
+
+/* Set the 's' and 't' flags in file attributes string CHARS,
+   according to the file mode BITS.  */
+
+static void
+setst (unsigned long bits ATTRIBUTE_UNUSED, char *chars ATTRIBUTE_UNUSED)
+{
+#ifdef S_ISUID
+  if (bits & S_ISUID)
+    {
+      if (chars[3] != 'x')
+	/* Set-uid, but not executable by owner.  */
+	chars[3] = 'S';
+      else
+	chars[3] = 's';
+    }
+#endif
+#ifdef S_ISGID
+  if (bits & S_ISGID)
+    {
+      if (chars[6] != 'x')
+	/* Set-gid, but not executable by group.  */
+	chars[6] = 'S';
+      else
+	chars[6] = 's';
+    }
+#endif
+#ifdef S_ISVTX
+  if (bits & S_ISVTX)
+    {
+      if (chars[9] != 'x')
+	/* Sticky, but not executable by others.  */
+	chars[9] = 'T';
+      else
+	chars[9] = 't';
+    }
+#endif
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/is-ranlib.c sdcc-3.2.0+dfsg/support/sdbinutils/binutils/is-ranlib.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/is-ranlib.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/is-ranlib.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,22 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of GNU Binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+/* Linked with ar.o to flag that this program is 'ranlib' (not 'ar').  */
+
+int is_ranlib = 1;
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/makefile.vms sdcc-3.2.0+dfsg/support/sdbinutils/binutils/makefile.vms
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/makefile.vms	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/makefile.vms	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,75 @@
+#
+# Makefile for binutils under openVMS (Alpha and Itanium)
+#
+# For use with gnu-make for vms
+#
+# Created by Klaus Kaempf, kkaempf@rmi.de
+#
+#
+
+DEFS=/define=("OBJDUMP_PRIVATE_VECTORS=")
+OPT=/noopt/debug
+CFLAGS=$(OPT)/include=([],"../include",[-.bfd])$(DEFS)\
+ /name=(as_is,shortened)\
+ /prefix=(all,except=("getopt","optarg","optopt","optind","opterr"))\
+ /warns=(info=(ptrmismatch,shiftcount))
+
+LIBBFD = [-.bfd]libbfd.olb/lib
+LIBBFD_DEP = [-.bfd]libbfd.olb
+LIBIBERTY_DEP = [-.libiberty]libiberty.olb
+LIBIBERTY = [-.libiberty]libiberty.olb/lib
+OPCODES_DEP = [-.opcodes]libopcodes.olb
+OPCODES = [-.opcodes]libopcodes.olb/lib
+
+DEBUG_OBJS = rddbg.obj,debug.obj,stabs.obj,ieee.obj,rdcoff.obj,dwarf.obj,\
+  elfcomm.obj
+
+BULIBS = bucomm.obj,version.obj,filemode.obj
+
+ADDL_DEPS = $(BULIBS),$(LIBBFD_DEP),$(LIBIBERTY_DEP)
+ADDL_LIBS = $(BULIBS),$(LIBBFD),$(LIBIBERTY)
+
+SIZEOBJS = $(ADDL_DEPS),size.obj
+
+STRINGSOBJS = $(ADDL_DEPS),strings.obj
+
+NMOBJS = $(ADDL_DEPS),nm.obj
+
+ADDR2LINEOBJS = $(ADDL_DEPS),addr2line.obj
+
+OBJDUMPOBJS = objdump.obj,prdbg.obj,$(DEBUG_OBJS),$(ADDL_DEPS),$(OPCODES_DEP)
+
+READELFOBJS = readelf.obj,dwarf.obj,unwind-ia64.obj,$(ADDL_DEPS)
+
+all: config.h size.exe strings.exe objdump.exe nm.exe addr2line.exe
+
+size.exe: $(SIZEOBJS)
+	link/exe=$@ size.obj,$(ADDL_LIBS)
+
+strings.exe: $(STRINGSOBJS)
+	link/exe=$@ strings.obj,$(ADDL_LIBS)
+
+nm.exe: $(NMOBJS)
+	link/exe=$@ nm.obj,$(ADDL_LIBS)
+
+addr2line.exe: $(ADDR2LINEOBJS)
+	link/exe=$@ addr2line.obj,$(ADDL_LIBS)
+
+objdump.exe: $(OBJDUMPOBJS)
+	link/exe=$@ objdump.obj,prdbg.obj,$(DEBUG_OBJS),$(ADDL_LIBS),$(OPCODES)
+
+readelf.exe: $(READELFOBJS)
+	link/exe=$@ readelf.obj,dwarf.obj,unwind-ia64.obj,$(ADDL_LIBS)
+
+config.h:
+	$$ @configure
+	$(MAKE) -f makefile.vms "CC=$(CC)"
+
+clean:
+	$$ purge
+	$(RM) *.obj;
+	$(RM) *.exe;
+
+distclean: clean
+	$(RM) config.h;
+	$(RM) makefile.vms;
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/mcparse.y sdcc-3.2.0+dfsg/support/sdbinutils/binutils/mcparse.y
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/mcparse.y	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/mcparse.y	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,356 @@
+%{ /* mcparse.y -- parser for Windows mc files
+  Copyright 2007
+  Free Software Foundation, Inc.
+  
+  Parser for Windows mc files
+  Written by Kai Tietz, Onevision.
+  
+  This file is part of GNU Binutils.
+  
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 3 of the License, or
+  (at your option) any later version.
+  
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+  
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+  02110-1301, USA.  */
+
+/* This is a parser for Windows rc files.  It is based on the parser
+   by Gunther Ebert <gunther.ebert@ixos-leipzig.de>.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bucomm.h"
+#include "libiberty.h"
+#include "windmc.h"
+#include "safe-ctype.h"
+
+static rc_uint_type mc_last_id = 0;
+static rc_uint_type mc_sefa_val = 0;
+static unichar *mc_last_symbol = NULL;
+static const mc_keyword *mc_cur_severity = NULL;
+static const mc_keyword *mc_cur_facility = NULL;
+static mc_node *cur_node = NULL;
+
+%}
+
+%union
+{
+  rc_uint_type ival;
+  unichar *ustr;
+  const mc_keyword *tok;
+  mc_node *nod;
+};
+
+%start input
+
+%token NL
+%token<ustr> MCIDENT MCFILENAME MCLINE MCCOMMENT
+%token<tok> MCTOKEN
+%token MCENDLINE
+%token MCLANGUAGENAMES MCFACILITYNAMES MCSEVERITYNAMES MCOUTPUTBASE MCMESSAGEIDTYPEDEF
+%token MCLANGUAGE MCMESSAGEID MCSEVERITY MCFACILITY MCSYMBOLICNAME
+%token <ival> MCNUMBER
+
+%type<ival> id vid sefasy_def
+%type<ustr> alias_name token lines comments
+%type<tok> lang
+
+%%
+input:	  entities
+	;
+
+entities:
+	  /* empty */
+	| entities entity
+	;
+entity:	  global_section
+	| message
+	| comments
+	  {
+	    cur_node = mc_add_node ();
+	    cur_node->user_text = $1;
+	  }
+	| error	{ mc_fatal ("syntax error"); }
+;
+
+global_section:
+	  MCSEVERITYNAMES '=' '(' severitymaps ')'
+	| MCSEVERITYNAMES '=' '(' severitymaps error { mc_fatal ("missing ')' in SeverityNames"); }
+	| MCSEVERITYNAMES '=' error { mc_fatal ("missing '(' in SeverityNames"); }
+	| MCSEVERITYNAMES error { mc_fatal ("missing '=' for SeverityNames"); }
+	| MCLANGUAGENAMES '=' '(' langmaps ')'
+	| MCLANGUAGENAMES '=' '(' langmaps error { mc_fatal ("missing ')' in LanguageNames"); }
+	| MCLANGUAGENAMES '=' error { mc_fatal ("missing '(' in LanguageNames"); }
+	| MCLANGUAGENAMES error { mc_fatal ("missing '=' for LanguageNames"); }
+	| MCFACILITYNAMES '=' '(' facilitymaps ')'
+	| MCFACILITYNAMES '=' '(' facilitymaps error { mc_fatal ("missing ')' in FacilityNames"); }
+	| MCFACILITYNAMES '=' error { mc_fatal ("missing '(' in FacilityNames"); }
+	| MCFACILITYNAMES error { mc_fatal ("missing '=' for FacilityNames"); }
+	| MCOUTPUTBASE '=' MCNUMBER
+	  {
+	    if ($3 != 10 && $3 != 16)
+	      mc_fatal ("OutputBase allows 10 or 16 as value");
+	    mcset_out_values_are_decimal = ($3 == 10 ? 1 : 0);
+	  }
+	| MCMESSAGEIDTYPEDEF '=' MCIDENT
+	  {
+	    mcset_msg_id_typedef = $3;
+	  }
+	| MCMESSAGEIDTYPEDEF '=' error
+	  {
+	    mc_fatal ("MessageIdTypedef expects an identifier");
+	  }
+	| MCMESSAGEIDTYPEDEF error
+	  {
+	    mc_fatal ("missing '=' for MessageIdTypedef");
+	  }
+;
+
+severitymaps:
+	  severitymap
+	| severitymaps severitymap
+	| error { mc_fatal ("severity ident missing"); }
+;
+
+severitymap:
+	  token '=' MCNUMBER alias_name
+	  {
+	    mc_add_keyword ($1, MCTOKEN, "severity", $3, $4);
+	  }
+	| token '=' error { mc_fatal ("severity number missing"); }
+	| token error { mc_fatal ("severity missing '='"); }
+;
+
+facilitymaps:
+	  facilitymap
+	| facilitymaps facilitymap
+	| error { mc_fatal ("missing ident in FacilityNames"); }
+;
+
+facilitymap:
+	  token '=' MCNUMBER alias_name
+	  {
+	    mc_add_keyword ($1, MCTOKEN, "facility", $3, $4);
+	  }
+	| token '=' error { mc_fatal ("facility number missing"); }
+	| token error { mc_fatal ("facility missing '='"); }
+;
+
+langmaps:
+	  langmap
+	| langmaps langmap
+	| error { mc_fatal ("missing ident in LanguageNames"); }
+;
+
+langmap:
+	  token '=' MCNUMBER lex_want_filename ':' MCFILENAME
+	  {
+	    mc_add_keyword ($1, MCTOKEN, "language", $3, $6);
+	  }
+	| token '=' MCNUMBER lex_want_filename ':' error { mc_fatal ("missing filename in LanguageNames"); }
+	| token '=' MCNUMBER error { mc_fatal ("missing ':' in LanguageNames"); }
+	| token '=' error { mc_fatal ("missing language code in LanguageNames"); }
+	| token error { mc_fatal ("missing '=' for LanguageNames"); }
+;
+
+alias_name:
+	  /* empty */
+	  {
+	    $$ = NULL;
+	  }
+	| ':' MCIDENT
+	  {
+	    $$ = $2;
+	  }
+	| ':' error { mc_fatal ("illegal token in identifier"); $$ = NULL; }
+;
+
+message:
+	  id sefasy_def
+	  {
+	    cur_node = mc_add_node ();
+	    cur_node->symbol = mc_last_symbol;
+	    cur_node->facility = mc_cur_facility;
+	    cur_node->severity = mc_cur_severity;
+	    cur_node->id = ($1 & 0xffffUL);
+	    cur_node->vid = ($1 & 0xffffUL) | mc_sefa_val;
+	    mc_last_id = $1;
+	  }
+	  lang_entities
+;
+
+id:	  MCMESSAGEID '=' vid { $$ = $3; }
+	| MCMESSAGEID '=' error { mc_fatal ("missing number in MessageId"); $$ = 0; }
+	| MCMESSAGEID error { mc_fatal ("missing '=' for MessageId"); $$ = 0; }
+;
+
+vid:	  /* empty */
+	  {
+	    $$ = ++mc_last_id;
+	  }
+	| MCNUMBER
+	  {
+	    $$ = $1;
+	  }
+	| '+' MCNUMBER
+	  {
+	    $$ = mc_last_id + $2;
+	  }
+	| '+' error { mc_fatal ("missing number after MessageId '+'"); }
+;
+
+sefasy_def:
+	  /* empty */
+	  {
+	    $$ = 0;
+	    mc_sefa_val = (mcset_custom_bit ? 1 : 0) << 29;
+	    mc_last_symbol = NULL;
+	    mc_cur_severity = NULL;
+	    mc_cur_facility = NULL;
+	  }
+	| sefasy_def severity
+	  {
+	    if ($1 & 1)
+	      mc_warn (_("duplicate definition of Severity"));
+	    $$ = $1 | 1;
+	  }
+	| sefasy_def facility
+	  {
+	    if ($1 & 2)
+	      mc_warn (_("duplicate definition of Facility"));
+	    $$ = $1 | 2;
+	  }
+	| sefasy_def symbol
+	  {
+	    if ($1 & 4)
+	      mc_warn (_("duplicate definition of SymbolicName"));
+	    $$ = $1 | 4;
+	  }
+;
+
+severity: MCSEVERITY '=' MCTOKEN
+	  {
+	    mc_sefa_val &= ~ (0x3UL << 30);
+	    mc_sefa_val |= (($3->nval & 0x3UL) << 30);
+	    mc_cur_severity = $3;
+	  }
+;
+
+facility: MCFACILITY '=' MCTOKEN
+	  {
+	    mc_sefa_val &= ~ (0xfffUL << 16);
+	    mc_sefa_val |= (($3->nval & 0xfffUL) << 16);
+	    mc_cur_facility = $3;
+	  }
+;
+
+symbol: MCSYMBOLICNAME '=' MCIDENT
+	{
+	  mc_last_symbol = $3;
+	}
+;
+
+lang_entities:
+	  lang_entity
+	| lang_entities lang_entity
+;
+
+lang_entity:
+	  lang lex_want_line lines MCENDLINE
+	  {
+	    mc_node_lang *h;
+	    h = mc_add_node_lang (cur_node, $1, cur_node->vid);
+	    h->message = $3;
+	    if (mcset_max_message_length != 0 && unichar_len (h->message) > mcset_max_message_length)
+	      mc_warn ("message length to long");
+	  }
+;
+
+lines:	  MCLINE
+	  {
+	    $$ = $1;
+	  }
+	| lines MCLINE
+	  {
+	    unichar *h;
+	    rc_uint_type l1,l2;
+	    l1 = unichar_len ($1);
+	    l2 = unichar_len ($2);
+	    h = (unichar *) res_alloc ((l1 + l2 + 1) * sizeof (unichar));
+	    if (l1) memcpy (h, $1, l1 * sizeof (unichar));
+	    if (l2) memcpy (&h[l1], $2, l2 * sizeof (unichar));
+	    h[l1 + l2] = 0;
+	    $$ = h;
+	  }
+	| error { mc_fatal ("missing end of message text"); $$ = NULL; }
+	| lines error { mc_fatal ("missing end of message text"); $$ = $1; }
+;
+
+comments: MCCOMMENT { $$ = $1; }
+	| comments MCCOMMENT
+	  {
+	    unichar *h;
+	    rc_uint_type l1,l2;
+	    l1 = unichar_len ($1);
+	    l2 = unichar_len ($2);
+	    h = (unichar *) res_alloc ((l1 + l2 + 1) * sizeof (unichar));
+	    if (l1) memcpy (h, $1, l1 * sizeof (unichar));
+	    if (l2) memcpy (&h[l1], $2, l2 * sizeof (unichar));
+	    h[l1 + l2] = 0;
+	    $$ = h;
+	  }
+;
+
+lang:	  MCLANGUAGE lex_want_nl '=' MCTOKEN NL
+	  {
+	    $$ = $4;
+	  }
+	| MCLANGUAGE lex_want_nl '=' MCIDENT NL
+	  {
+	    $$ = NULL;
+	    mc_fatal (_("undeclared language identifier"));
+	  }
+	| MCLANGUAGE lex_want_nl '=' token error
+	  {
+	    $$ = NULL;
+	    mc_fatal ("missing newline after Language");
+	  }
+	| MCLANGUAGE lex_want_nl '=' error
+	  {
+	    $$ = NULL;
+	    mc_fatal ("missing ident for Language");
+	  }
+	| MCLANGUAGE error
+	  {
+	    $$ = NULL;
+	    mc_fatal ("missing '=' for Language");
+	  }
+;
+
+token: 	MCIDENT { $$ = $1; }
+	|  MCTOKEN { $$ = $1->usz; }
+;
+
+lex_want_nl:
+	  /* Empty */	{ mclex_want_nl = 1; }
+;
+
+lex_want_line:
+	  /* Empty */	{ mclex_want_line = 1; }
+;
+
+lex_want_filename:
+	  /* Empty */	{ mclex_want_filename = 1; }
+;
+
+%%
+
+/* Something else.  */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/nlmheader.y sdcc-3.2.0+dfsg/support/sdbinutils/binutils/nlmheader.y
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/nlmheader.y	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/nlmheader.y	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,960 @@
+%{/* nlmheader.y - parse NLM header specification keywords.
+     Copyright 1993, 1994, 1995, 1997, 1998, 2001, 2002, 2003, 2005, 2007,
+     2010 Free Software Foundation, Inc.
+
+     This file is part of GNU Binutils.
+
+     This program is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 3 of the License, or
+     (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+     MA 02110-1301, USA.  */
+
+/* Written by Ian Lance Taylor <ian@cygnus.com>.
+
+   This bison file parses the commands recognized by the NetWare NLM
+   linker, except for lists of object files.  It stores the
+   information in global variables.
+
+   This implementation is based on the description in the NetWare Tool
+   Maker Specification manual, edition 1.0.  */
+
+#include "sysdep.h"
+#include "safe-ctype.h"
+#include "bfd.h"
+#include "nlm/common.h"
+#include "nlm/internal.h"
+#include "bucomm.h"
+#include "nlmconv.h"
+
+/* Information is stored in the structures pointed to by these
+   variables.  */
+
+Nlm_Internal_Fixed_Header *fixed_hdr;
+Nlm_Internal_Variable_Header *var_hdr;
+Nlm_Internal_Version_Header *version_hdr;
+Nlm_Internal_Copyright_Header *copyright_hdr;
+Nlm_Internal_Extended_Header *extended_hdr;
+
+/* Procedure named by CHECK.  */
+char *check_procedure;
+/* File named by CUSTOM.  */
+char *custom_file;
+/* Whether to generate debugging information (DEBUG).  */
+bfd_boolean debug_info;
+/* Procedure named by EXIT.  */
+char *exit_procedure;
+/* Exported symbols (EXPORT).  */
+struct string_list *export_symbols;
+/* List of files from INPUT.  */
+struct string_list *input_files;
+/* Map file name (MAP, FULLMAP).  */
+char *map_file;
+/* Whether a full map has been requested (FULLMAP).  */
+bfd_boolean full_map;
+/* File named by HELP.  */
+char *help_file;
+/* Imported symbols (IMPORT).  */
+struct string_list *import_symbols;
+/* File named by MESSAGES.  */
+char *message_file;
+/* Autoload module list (MODULE).  */
+struct string_list *modules;
+/* File named by OUTPUT.  */
+char *output_file;
+/* File named by SHARELIB.  */
+char *sharelib_file;
+/* Start procedure name (START).  */
+char *start_procedure;
+/* VERBOSE.  */
+bfd_boolean verbose;
+/* RPC description file (XDCDATA).  */
+char *rpc_file;
+
+/* The number of serious errors that have occurred.  */
+int parse_errors;
+
+/* The current symbol prefix when reading a list of import or export
+   symbols.  */
+static char *symbol_prefix;
+
+/* Parser error message handler.  */
+#define yyerror(msg) nlmheader_error (msg);
+
+/* Local functions.  */
+static int yylex (void);
+static void nlmlex_file_push (const char *);
+static bfd_boolean nlmlex_file_open (const char *);
+static int nlmlex_buf_init (void);
+static char nlmlex_buf_add (int);
+static long nlmlex_get_number (const char *);
+static void nlmheader_identify (void);
+static void nlmheader_warn (const char *, int);
+static void nlmheader_error (const char *);
+static struct string_list * string_list_cons (char *, struct string_list *);
+static struct string_list * string_list_append (struct string_list *,
+						struct string_list *);
+static struct string_list * string_list_append1 (struct string_list *,
+						 char *);
+static char *xstrdup (const char *);
+
+%}
+
+%union
+{
+  char *string;
+  struct string_list *list;
+};
+
+/* The reserved words.  */
+
+%token CHECK CODESTART COPYRIGHT CUSTOM DATE DEBUG_K DESCRIPTION EXIT
+%token EXPORT FLAG_ON FLAG_OFF FULLMAP HELP IMPORT INPUT MAP MESSAGES
+%token MODULE MULTIPLE OS_DOMAIN OUTPUT PSEUDOPREEMPTION REENTRANT
+%token SCREENNAME SHARELIB STACK START SYNCHRONIZE
+%token THREADNAME TYPE VERBOSE VERSIONK XDCDATA
+
+/* Arguments.  */
+
+%token <string> STRING
+%token <string> QUOTED_STRING
+
+/* Typed non-terminals.  */
+%type <list> symbol_list_opt symbol_list string_list
+%type <string> symbol
+
+%%
+
+/* Keywords must start in the leftmost column of the file.  Arguments
+   may appear anywhere else.  The lexer uses this to determine what
+   token to return, so we don't have to worry about it here.  */
+
+/* The entire file is just a list of commands.  */
+
+file:
+	  commands
+	;
+
+/* A possibly empty list of commands.  */
+
+commands:
+	  /* May be empty.  */
+	| command commands
+	;
+
+/* A single command.  There is where most of the work takes place.  */
+
+command:
+	  CHECK STRING
+	  {
+	    check_procedure = $2;
+	  }
+	| CODESTART STRING
+	  {
+	    nlmheader_warn (_("CODESTART is not implemented; sorry"), -1);
+	    free ($2);
+	  }
+	| COPYRIGHT QUOTED_STRING
+	  {
+	    int len;
+
+	    strncpy (copyright_hdr->stamp, "CoPyRiGhT=", 10);
+	    len = strlen ($2);
+	    if (len >= NLM_MAX_COPYRIGHT_MESSAGE_LENGTH)
+	      {
+		nlmheader_warn (_("copyright string is too long"),
+				NLM_MAX_COPYRIGHT_MESSAGE_LENGTH - 1);
+		len = NLM_MAX_COPYRIGHT_MESSAGE_LENGTH - 1;
+	      }
+	    copyright_hdr->copyrightMessageLength = len;
+	    strncpy (copyright_hdr->copyrightMessage, $2, len);
+	    copyright_hdr->copyrightMessage[len] = '\0';
+	    free ($2);
+	  }
+	| CUSTOM STRING
+	  {
+	    custom_file = $2;
+	  }
+	| DATE STRING STRING STRING
+	  {
+	    /* We don't set the version stamp here, because we use the
+	       version stamp to detect whether the required VERSION
+	       keyword was given.  */
+	    version_hdr->month = nlmlex_get_number ($2);
+	    version_hdr->day = nlmlex_get_number ($3);
+	    version_hdr->year = nlmlex_get_number ($4);
+	    free ($2);
+	    free ($3);
+	    free ($4);
+	    if (version_hdr->month < 1 || version_hdr->month > 12)
+	      nlmheader_warn (_("illegal month"), -1);
+	    if (version_hdr->day < 1 || version_hdr->day > 31)
+	      nlmheader_warn (_("illegal day"), -1);
+	    if (version_hdr->year < 1900 || version_hdr->year > 3000)
+	      nlmheader_warn (_("illegal year"), -1);
+	  }
+	| DEBUG_K
+	  {
+	    debug_info = TRUE;
+	  }
+	| DESCRIPTION QUOTED_STRING
+	  {
+	    int len;
+
+	    len = strlen ($2);
+	    if (len > NLM_MAX_DESCRIPTION_LENGTH)
+	      {
+		nlmheader_warn (_("description string is too long"),
+				NLM_MAX_DESCRIPTION_LENGTH);
+		len = NLM_MAX_DESCRIPTION_LENGTH;
+	      }
+	    var_hdr->descriptionLength = len;
+	    strncpy (var_hdr->descriptionText, $2, len);
+	    var_hdr->descriptionText[len] = '\0';
+	    free ($2);
+	  }
+	| EXIT STRING
+	  {
+	    exit_procedure = $2;
+	  }
+	| EXPORT
+	  {
+	    symbol_prefix = NULL;
+	  }
+	  symbol_list_opt
+	  {
+	    export_symbols = string_list_append (export_symbols, $3);
+	  }
+	| FLAG_ON STRING
+	  {
+	    fixed_hdr->flags |= nlmlex_get_number ($2);
+	    free ($2);
+	  }
+	| FLAG_OFF STRING
+	  {
+	    fixed_hdr->flags &=~ nlmlex_get_number ($2);
+	    free ($2);
+	  }
+	| FULLMAP
+	  {
+	    map_file = "";
+	    full_map = TRUE;
+	  }
+	| FULLMAP STRING
+	  {
+	    map_file = $2;
+	    full_map = TRUE;
+	  }
+	| HELP STRING
+	  {
+	    help_file = $2;
+	  }
+	| IMPORT
+	  {
+	    symbol_prefix = NULL;
+	  }
+	  symbol_list_opt
+	  {
+	    import_symbols = string_list_append (import_symbols, $3);
+	  }
+	| INPUT string_list
+	  {
+	    input_files = string_list_append (input_files, $2);
+	  }
+	| MAP
+	  {
+	    map_file = "";
+	  }
+	| MAP STRING
+	  {
+	    map_file = $2;
+	  }
+	| MESSAGES STRING
+	  {
+	    message_file = $2;
+	  }
+	| MODULE string_list
+	  {
+	    modules = string_list_append (modules, $2);
+	  }
+	| MULTIPLE
+	  {
+	    fixed_hdr->flags |= 0x2;
+	  }
+	| OS_DOMAIN
+	  {
+	    fixed_hdr->flags |= 0x10;
+	  }
+	| OUTPUT STRING
+	  {
+	    if (output_file == NULL)
+	      output_file = $2;
+	    else
+	      nlmheader_warn (_("ignoring duplicate OUTPUT statement"), -1);
+	  }
+	| PSEUDOPREEMPTION
+	  {
+	    fixed_hdr->flags |= 0x8;
+	  }
+	| REENTRANT
+	  {
+	    fixed_hdr->flags |= 0x1;
+	  }
+	| SCREENNAME QUOTED_STRING
+	  {
+	    int len;
+
+	    len = strlen ($2);
+	    if (len >= NLM_MAX_SCREEN_NAME_LENGTH)
+	      {
+		nlmheader_warn (_("screen name is too long"),
+				NLM_MAX_SCREEN_NAME_LENGTH);
+		len = NLM_MAX_SCREEN_NAME_LENGTH;
+	      }
+	    var_hdr->screenNameLength = len;
+	    strncpy (var_hdr->screenName, $2, len);
+	    var_hdr->screenName[NLM_MAX_SCREEN_NAME_LENGTH] = '\0';
+	    free ($2);
+	  }
+	| SHARELIB STRING
+	  {
+	    sharelib_file = $2;
+	  }
+	| STACK STRING
+	  {
+	    var_hdr->stackSize = nlmlex_get_number ($2);
+	    free ($2);
+	  }
+	| START STRING
+	  {
+	    start_procedure = $2;
+	  }
+	| SYNCHRONIZE
+	  {
+	    fixed_hdr->flags |= 0x4;
+	  }
+	| THREADNAME QUOTED_STRING
+	  {
+	    int len;
+
+	    len = strlen ($2);
+	    if (len >= NLM_MAX_THREAD_NAME_LENGTH)
+	      {
+		nlmheader_warn (_("thread name is too long"),
+				NLM_MAX_THREAD_NAME_LENGTH);
+		len = NLM_MAX_THREAD_NAME_LENGTH;
+	      }
+	    var_hdr->threadNameLength = len;
+	    strncpy (var_hdr->threadName, $2, len);
+	    var_hdr->threadName[len] = '\0';
+	    free ($2);
+	  }
+	| TYPE STRING
+	  {
+	    fixed_hdr->moduleType = nlmlex_get_number ($2);
+	    free ($2);
+	  }
+	| VERBOSE
+	  {
+	    verbose = TRUE;
+	  }
+	| VERSIONK STRING STRING STRING
+	  {
+	    long val;
+
+	    strncpy (version_hdr->stamp, "VeRsIoN#", 8);
+	    version_hdr->majorVersion = nlmlex_get_number ($2);
+	    val = nlmlex_get_number ($3);
+	    if (val < 0 || val > 99)
+	      nlmheader_warn (_("illegal minor version number (must be between 0 and 99)"),
+			      -1);
+	    else
+	      version_hdr->minorVersion = val;
+	    val = nlmlex_get_number ($4);
+	    if (val < 0)
+	      nlmheader_warn (_("illegal revision number (must be between 0 and 26)"),
+			      -1);
+	    else if (val > 26)
+	      version_hdr->revision = 0;
+	    else
+	      version_hdr->revision = val;
+	    free ($2);
+	    free ($3);
+	    free ($4);
+	  }
+	| VERSIONK STRING STRING
+	  {
+	    long val;
+
+	    strncpy (version_hdr->stamp, "VeRsIoN#", 8);
+	    version_hdr->majorVersion = nlmlex_get_number ($2);
+	    val = nlmlex_get_number ($3);
+	    if (val < 0 || val > 99)
+	      nlmheader_warn (_("illegal minor version number (must be between 0 and 99)"),
+			      -1);
+	    else
+	      version_hdr->minorVersion = val;
+	    version_hdr->revision = 0;
+	    free ($2);
+	    free ($3);
+	  }
+	| XDCDATA STRING
+	  {
+	    rpc_file = $2;
+	  }
+	;
+
+/* A possibly empty list of symbols.  */
+
+symbol_list_opt:
+	  /* Empty.  */
+	  {
+	    $$ = NULL;
+	  }
+	| symbol_list
+	  {
+	    $$ = $1;
+	  }
+	;
+
+/* A list of symbols in an import or export list.  Prefixes may appear
+   in parentheses.  We need to use left recursion here to avoid
+   building up a large import list on the parser stack.  */
+
+symbol_list:
+	  symbol
+	  {
+	    $$ = string_list_cons ($1, NULL);
+	  }
+	| symbol_prefix
+	  {
+	    $$ = NULL;
+	  }
+	| symbol_list symbol
+	  {
+	    $$ = string_list_append1 ($1, $2);
+	  }
+	| symbol_list symbol_prefix
+	  {
+	    $$ = $1;
+	  }
+	;
+
+/* A prefix for subsequent symbols.  */
+
+symbol_prefix:
+	  '(' STRING ')'
+	  {
+	    if (symbol_prefix != NULL)
+	      free (symbol_prefix);
+	    symbol_prefix = $2;
+	  }
+	;
+
+/* A single symbol.  */
+
+symbol:
+	  STRING
+	  {
+	    if (symbol_prefix == NULL)
+	      $$ = $1;
+	    else
+	      {
+		$$ = xmalloc (strlen (symbol_prefix) + strlen ($1) + 2);
+		sprintf ($$, "%s@%s", symbol_prefix, $1);
+		free ($1);
+	      }
+	  }
+	;
+
+/* A list of strings.  */
+
+string_list:
+	  /* May be empty.  */
+	  {
+	    $$ = NULL;
+	  }
+	| STRING string_list
+	  {
+	    $$ = string_list_cons ($1, $2);
+	  }
+	;
+
+%%
+
+/* If strerror is just a macro, we want to use the one from libiberty
+   since it will handle undefined values.  */
+#undef strerror
+extern char *strerror PARAMS ((int));
+
+/* The lexer is simple, too simple for flex.  Keywords are only
+   recognized at the start of lines.  Everything else must be an
+   argument.  A comma is treated as whitespace.  */
+
+/* The states the lexer can be in.  */
+
+enum lex_state
+{
+  /* At the beginning of a line.  */
+  BEGINNING_OF_LINE,
+  /* In the middle of a line.  */
+  IN_LINE
+};
+
+/* We need to keep a stack of files to handle file inclusion.  */
+
+struct input
+{
+  /* The file to read from.  */
+  FILE *file;
+  /* The name of the file.  */
+  char *name;
+  /* The current line number.  */
+  int lineno;
+  /* The current state.  */
+  enum lex_state state;
+  /* The next file on the stack.  */
+  struct input *next;
+};
+
+/* The current input file.  */
+
+static struct input current;
+
+/* The character which introduces comments.  */
+#define COMMENT_CHAR '#'
+
+/* Start the lexer going on the main input file.  */
+
+bfd_boolean
+nlmlex_file (const char *name)
+{
+  current.next = NULL;
+  return nlmlex_file_open (name);
+}
+
+/* Start the lexer going on a subsidiary input file.  */
+
+static void
+nlmlex_file_push (const char *name)
+{
+  struct input *push;
+
+  push = (struct input *) xmalloc (sizeof (struct input));
+  *push = current;
+  if (nlmlex_file_open (name))
+    current.next = push;
+  else
+    {
+      current = *push;
+      free (push);
+    }
+}
+
+/* Start lexing from a file.  */
+
+static bfd_boolean
+nlmlex_file_open (const char *name)
+{
+  current.file = fopen (name, "r");
+  if (current.file == NULL)
+    {
+      fprintf (stderr, "%s:%s: %s\n", program_name, name, strerror (errno));
+      ++parse_errors;
+      return FALSE;
+    }
+  current.name = xstrdup (name);
+  current.lineno = 1;
+  current.state = BEGINNING_OF_LINE;
+  return TRUE;
+}
+
+/* Table used to turn keywords into tokens.  */
+
+struct keyword_tokens_struct
+{
+  const char *keyword;
+  int token;
+};
+
+static struct keyword_tokens_struct keyword_tokens[] =
+{
+  { "CHECK", CHECK },
+  { "CODESTART", CODESTART },
+  { "COPYRIGHT", COPYRIGHT },
+  { "CUSTOM", CUSTOM },
+  { "DATE", DATE },
+  { "DEBUG", DEBUG_K },
+  { "DESCRIPTION", DESCRIPTION },
+  { "EXIT", EXIT },
+  { "EXPORT", EXPORT },
+  { "FLAG_ON", FLAG_ON },
+  { "FLAG_OFF", FLAG_OFF },
+  { "FULLMAP", FULLMAP },
+  { "HELP", HELP },
+  { "IMPORT", IMPORT },
+  { "INPUT", INPUT },
+  { "MAP", MAP },
+  { "MESSAGES", MESSAGES },
+  { "MODULE", MODULE },
+  { "MULTIPLE", MULTIPLE },
+  { "OS_DOMAIN", OS_DOMAIN },
+  { "OUTPUT", OUTPUT },
+  { "PSEUDOPREEMPTION", PSEUDOPREEMPTION },
+  { "REENTRANT", REENTRANT },
+  { "SCREENNAME", SCREENNAME },
+  { "SHARELIB", SHARELIB },
+  { "STACK", STACK },
+  { "STACKSIZE", STACK },
+  { "START", START },
+  { "SYNCHRONIZE", SYNCHRONIZE },
+  { "THREADNAME", THREADNAME },
+  { "TYPE", TYPE },
+  { "VERBOSE", VERBOSE },
+  { "VERSION", VERSIONK },
+  { "XDCDATA", XDCDATA }
+};
+
+#define KEYWORD_COUNT (sizeof (keyword_tokens) / sizeof (keyword_tokens[0]))
+
+/* The lexer accumulates strings in these variables.  */
+static char *lex_buf;
+static int lex_size;
+static int lex_pos;
+
+/* Start accumulating strings into the buffer.  */
+#define BUF_INIT() \
+  ((void) (lex_buf != NULL ? lex_pos = 0 : nlmlex_buf_init ()))
+
+static int
+nlmlex_buf_init (void)
+{
+  lex_size = 10;
+  lex_buf = xmalloc (lex_size + 1);
+  lex_pos = 0;
+  return 0;
+}
+
+/* Finish a string in the buffer.  */
+#define BUF_FINISH() ((void) (lex_buf[lex_pos] = '\0'))
+
+/* Accumulate a character into the buffer.  */
+#define BUF_ADD(c) \
+  ((void) (lex_pos < lex_size \
+	   ? lex_buf[lex_pos++] = (c) \
+	   : nlmlex_buf_add (c)))
+
+static char
+nlmlex_buf_add (int c)
+{
+  if (lex_pos >= lex_size)
+    {
+      lex_size *= 2;
+      lex_buf = xrealloc (lex_buf, lex_size + 1);
+    }
+
+  return lex_buf[lex_pos++] = c;
+}
+
+/* The lexer proper.  This is called by the bison generated parsing
+   code.  */
+
+static int
+yylex (void)
+{
+  int c;
+
+tail_recurse:
+
+  c = getc (current.file);
+
+  /* Commas are treated as whitespace characters.  */
+  while (ISSPACE (c) || c == ',')
+    {
+      current.state = IN_LINE;
+      if (c == '\n')
+	{
+	  ++current.lineno;
+	  current.state = BEGINNING_OF_LINE;
+	}
+      c = getc (current.file);
+    }
+
+  /* At the end of the file we either pop to the previous file or
+     finish up.  */
+  if (c == EOF)
+    {
+      fclose (current.file);
+      free (current.name);
+      if (current.next == NULL)
+	return 0;
+      else
+	{
+	  struct input *next;
+
+	  next = current.next;
+	  current = *next;
+	  free (next);
+	  goto tail_recurse;
+	}
+    }
+
+  /* A comment character always means to drop everything until the
+     next newline.  */
+  if (c == COMMENT_CHAR)
+    {
+      do
+	{
+	  c = getc (current.file);
+	}
+      while (c != '\n');
+      ++current.lineno;
+      current.state = BEGINNING_OF_LINE;
+      goto tail_recurse;
+    }
+
+  /* An '@' introduces an include file.  */
+  if (c == '@')
+    {
+      do
+	{
+	  c = getc (current.file);
+	  if (c == '\n')
+	    ++current.lineno;
+	}
+      while (ISSPACE (c));
+      BUF_INIT ();
+      while (! ISSPACE (c) && c != EOF)
+	{
+	  BUF_ADD (c);
+	  c = getc (current.file);
+	}
+      BUF_FINISH ();
+
+      ungetc (c, current.file);
+
+      nlmlex_file_push (lex_buf);
+      goto tail_recurse;
+    }
+
+  /* A non-space character at the start of a line must be the start of
+     a keyword.  */
+  if (current.state == BEGINNING_OF_LINE)
+    {
+      BUF_INIT ();
+      while (ISALNUM (c) || c == '_')
+	{
+	  BUF_ADD (TOUPPER (c));
+	  c = getc (current.file);
+	}
+      BUF_FINISH ();
+
+      if (c != EOF && ! ISSPACE (c) && c != ',')
+	{
+	  nlmheader_identify ();
+	  fprintf (stderr, _("%s:%d: illegal character in keyword: %c\n"),
+		   current.name, current.lineno, c);
+	}
+      else
+	{
+	  unsigned int i;
+
+	  for (i = 0; i < KEYWORD_COUNT; i++)
+	    {
+	      if (lex_buf[0] == keyword_tokens[i].keyword[0]
+		  && strcmp (lex_buf, keyword_tokens[i].keyword) == 0)
+		{
+		  /* Pushing back the final whitespace avoids worrying
+		     about \n here.  */
+		  ungetc (c, current.file);
+		  current.state = IN_LINE;
+		  return keyword_tokens[i].token;
+		}
+	    }
+
+	  nlmheader_identify ();
+	  fprintf (stderr, _("%s:%d: unrecognized keyword: %s\n"),
+		   current.name, current.lineno, lex_buf);
+	}
+
+      ++parse_errors;
+      /* Treat the rest of this line as a comment.  */
+      ungetc (COMMENT_CHAR, current.file);
+      goto tail_recurse;
+    }
+
+  /* Parentheses just represent themselves.  */
+  if (c == '(' || c == ')')
+    return c;
+
+  /* Handle quoted strings.  */
+  if (c == '"' || c == '\'')
+    {
+      int quote;
+      int start_lineno;
+
+      quote = c;
+      start_lineno = current.lineno;
+
+      c = getc (current.file);
+      BUF_INIT ();
+      while (c != quote && c != EOF)
+	{
+	  BUF_ADD (c);
+	  if (c == '\n')
+	    ++current.lineno;
+	  c = getc (current.file);
+	}
+      BUF_FINISH ();
+
+      if (c == EOF)
+	{
+	  nlmheader_identify ();
+	  fprintf (stderr, _("%s:%d: end of file in quoted string\n"),
+		   current.name, start_lineno);
+	  ++parse_errors;
+	}
+
+      /* FIXME: Possible memory leak.  */
+      yylval.string = xstrdup (lex_buf);
+      return QUOTED_STRING;
+    }
+
+  /* Gather a generic argument.  */
+  BUF_INIT ();
+  while (! ISSPACE (c)
+	 && c != ','
+	 && c != COMMENT_CHAR
+	 && c != '('
+	 && c != ')')
+    {
+      BUF_ADD (c);
+      c = getc (current.file);
+    }
+  BUF_FINISH ();
+
+  ungetc (c, current.file);
+
+  /* FIXME: Possible memory leak.  */
+  yylval.string = xstrdup (lex_buf);
+  return STRING;
+}
+
+/* Get a number from a string.  */
+
+static long
+nlmlex_get_number (const char *s)
+{
+  long ret;
+  char *send;
+
+  ret = strtol (s, &send, 10);
+  if (*send != '\0')
+    nlmheader_warn (_("bad number"), -1);
+  return ret;
+}
+
+/* Prefix the nlmconv warnings with a note as to where they come from.
+   We don't use program_name on every warning, because then some
+   versions of the emacs next-error function can't recognize the line
+   number.  */
+
+static void
+nlmheader_identify (void)
+{
+  static int done;
+
+  if (! done)
+    {
+      fprintf (stderr, _("%s: problems in NLM command language input:\n"),
+	       program_name);
+      done = 1;
+    }
+}
+
+/* Issue a warning.  */
+
+static void
+nlmheader_warn (const char *s, int imax)
+{
+  nlmheader_identify ();
+  fprintf (stderr, "%s:%d: %s", current.name, current.lineno, s);
+  if (imax != -1)
+    fprintf (stderr, " (max %d)", imax);
+  fprintf (stderr, "\n");
+}
+
+/* Report an error.  */
+
+static void
+nlmheader_error (const char *s)
+{
+  nlmheader_warn (s, -1);
+  ++parse_errors;
+}
+
+/* Add a string to a string list.  */
+
+static struct string_list *
+string_list_cons (char *s, struct string_list *l)
+{
+  struct string_list *ret;
+
+  ret = (struct string_list *) xmalloc (sizeof (struct string_list));
+  ret->next = l;
+  ret->string = s;
+  return ret;
+}
+
+/* Append a string list to another string list.  */
+
+static struct string_list *
+string_list_append (struct string_list *l1, struct string_list *l2)
+{
+  register struct string_list **pp;
+
+  for (pp = &l1; *pp != NULL; pp = &(*pp)->next)
+    ;
+  *pp = l2;
+  return l1;
+}
+
+/* Append a string to a string list.  */
+
+static struct string_list *
+string_list_append1 (struct string_list *l, char *s)
+{
+  struct string_list *n;
+  register struct string_list **pp;
+
+  n = (struct string_list *) xmalloc (sizeof (struct string_list));
+  n->next = NULL;
+  n->string = s;
+  for (pp = &l; *pp != NULL; pp = &(*pp)->next)
+    ;
+  *pp = n;
+  return l;
+}
+
+/* Duplicate a string in memory.  */
+
+static char *
+xstrdup (const char *s)
+{
+  unsigned long len;
+  char *ret;
+
+  len = strlen (s);
+  ret = xmalloc (len + 1);
+  strcpy (ret, s);
+  return ret;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/nm.c sdcc-3.2.0+dfsg/support/sdbinutils/binutils/nm.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/nm.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/nm.c	2012-03-06 19:53:17.000000000 +0000
@@ -0,0 +1,1695 @@
+/* nm.c -- Describe symbol table of a rel file.
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+   2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010
+   Free Software Foundation, Inc.
+
+   This file is part of GNU Binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "progress.h"
+#include "getopt.h"
+#include "aout/stab_gnu.h"
+#include "aout/ranlib.h"
+#include "demangle.h"
+#include "libiberty.h"
+#include "elf-bfd.h"
+#include "elf/common.h"
+#include "bucomm.h"
+#include "plugin.h"
+
+/* When sorting by size, we use this structure to hold the size and a
+   pointer to the minisymbol.  */
+
+struct size_sym
+{
+  const void *minisym;
+  bfd_vma size;
+};
+
+/* When fetching relocs, we use this structure to pass information to
+   get_relocs.  */
+
+struct get_relocs_info
+{
+  asection **secs;
+  arelent ***relocs;
+  long *relcount;
+  asymbol **syms;
+};
+
+struct extended_symbol_info
+{
+  symbol_info *sinfo;
+  bfd_vma ssize;
+  elf_symbol_type *elfinfo;
+  /* FIXME: We should add more fields for Type, Line, Section.  */
+};
+#define SYM_NAME(sym)        (sym->sinfo->name)
+#define SYM_VALUE(sym)       (sym->sinfo->value)
+#define SYM_TYPE(sym)        (sym->sinfo->type)
+#define SYM_STAB_NAME(sym)   (sym->sinfo->stab_name)
+#define SYM_STAB_DESC(sym)   (sym->sinfo->stab_desc)
+#define SYM_STAB_OTHER(sym)  (sym->sinfo->stab_other)
+#define SYM_SIZE(sym) \
+  (sym->elfinfo ? sym->elfinfo->internal_elf_sym.st_size: sym->ssize)
+
+/* The output formatting functions.  */
+static void print_object_filename_bsd (char *);
+static void print_object_filename_sysv (char *);
+static void print_object_filename_posix (char *);
+static void print_archive_filename_bsd (char *);
+static void print_archive_filename_sysv (char *);
+static void print_archive_filename_posix (char *);
+static void print_archive_member_bsd (char *, const char *);
+static void print_archive_member_sysv (char *, const char *);
+static void print_archive_member_posix (char *, const char *);
+static void print_symbol_filename_bsd (bfd *, bfd *);
+static void print_symbol_filename_sysv (bfd *, bfd *);
+static void print_symbol_filename_posix (bfd *, bfd *);
+static void print_value (bfd *, bfd_vma);
+static void print_symbol_info_bsd (struct extended_symbol_info *, bfd *);
+static void print_symbol_info_sysv (struct extended_symbol_info *, bfd *);
+static void print_symbol_info_posix (struct extended_symbol_info *, bfd *);
+
+/* Support for different output formats.  */
+struct output_fns
+  {
+    /* Print the name of an object file given on the command line.  */
+    void (*print_object_filename) (char *);
+
+    /* Print the name of an archive file given on the command line.  */
+    void (*print_archive_filename) (char *);
+
+    /* Print the name of an archive member file.  */
+    void (*print_archive_member) (char *, const char *);
+
+    /* Print the name of the file (and archive, if there is one)
+       containing a symbol.  */
+    void (*print_symbol_filename) (bfd *, bfd *);
+
+    /* Print a line of information about a symbol.  */
+    void (*print_symbol_info) (struct extended_symbol_info *, bfd *);
+  };
+
+static struct output_fns formats[] =
+{
+  {print_object_filename_bsd,
+   print_archive_filename_bsd,
+   print_archive_member_bsd,
+   print_symbol_filename_bsd,
+   print_symbol_info_bsd},
+  {print_object_filename_sysv,
+   print_archive_filename_sysv,
+   print_archive_member_sysv,
+   print_symbol_filename_sysv,
+   print_symbol_info_sysv},
+  {print_object_filename_posix,
+   print_archive_filename_posix,
+   print_archive_member_posix,
+   print_symbol_filename_posix,
+   print_symbol_info_posix}
+};
+
+/* Indices in `formats'.  */
+#define FORMAT_BSD 0
+#define FORMAT_SYSV 1
+#define FORMAT_POSIX 2
+#define FORMAT_DEFAULT FORMAT_BSD
+
+/* The output format to use.  */
+static struct output_fns *format = &formats[FORMAT_DEFAULT];
+
+/* Command options.  */
+
+static int do_demangle = 0;	/* Pretty print C++ symbol names.  */
+static int external_only = 0;	/* Print external symbols only.  */
+static int defined_only = 0;	/* Print defined symbols only.  */
+static int no_sort = 0;		/* Don't sort; print syms in order found.  */
+static int print_debug_syms = 0;/* Print debugger-only symbols too.  */
+static int print_armap = 0;	/* Describe __.SYMDEF data in archive files.  */
+static int print_size = 0;	/* Print size of defined symbols.  */
+static int reverse_sort = 0;	/* Sort in downward(alpha or numeric) order.  */
+static int sort_numerically = 0;/* Sort in numeric rather than alpha order.  */
+static int sort_by_size = 0;	/* Sort by size of symbol.  */
+static int undefined_only = 0;	/* Print undefined symbols only.  */
+static int dynamic = 0;		/* Print dynamic symbols.  */
+static int show_version = 0;	/* Show the version number.  */
+static int show_stats = 0;	/* Show statistics.  */
+static int show_synthetic = 0;	/* Display synthesized symbols too.  */
+static int line_numbers = 0;	/* Print line numbers for symbols.  */
+static int allow_special_symbols = 0;  /* Allow special symbols.  */
+
+/* When to print the names of files.  Not mutually exclusive in SYSV format.  */
+static int filename_per_file = 0;	/* Once per file, on its own line.  */
+static int filename_per_symbol = 0;	/* Once per symbol, at start of line.  */
+
+/* Print formats for printing a symbol value.  */
+static char value_format_32bit[] = "%08lx";
+#if BFD_HOST_64BIT_LONG
+static char value_format_64bit[] = "%016lx";
+#elif BFD_HOST_64BIT_LONG_LONG
+#ifndef __MSVCRT__
+static char value_format_64bit[] = "%016llx";
+#else
+static char value_format_64bit[] = "%016I64x";
+#endif
+#endif
+static int print_width = 0;
+static int print_radix = 16;
+/* Print formats for printing stab info.  */
+static char other_format[] = "%02x";
+static char desc_format[] = "%04x";
+
+static char *target = NULL;
+static char *plugin_target = NULL;
+
+/* Used to cache the line numbers for a BFD.  */
+static bfd *lineno_cache_bfd;
+static bfd *lineno_cache_rel_bfd;
+
+#define OPTION_TARGET 200
+#define OPTION_PLUGIN 201
+
+static struct option long_options[] =
+{
+  {"debug-syms", no_argument, &print_debug_syms, 1},
+  {"demangle", optional_argument, 0, 'C'},
+  {"dynamic", no_argument, &dynamic, 1},
+  {"extern-only", no_argument, &external_only, 1},
+  {"format", required_argument, 0, 'f'},
+  {"help", no_argument, 0, 'h'},
+  {"line-numbers", no_argument, 0, 'l'},
+  {"no-cplus", no_argument, &do_demangle, 0},  /* Linux compatibility.  */
+  {"no-demangle", no_argument, &do_demangle, 0},
+  {"no-sort", no_argument, &no_sort, 1},
+  {"numeric-sort", no_argument, &sort_numerically, 1},
+  {"plugin", required_argument, 0, OPTION_PLUGIN},
+  {"portability", no_argument, 0, 'P'},
+  {"print-armap", no_argument, &print_armap, 1},
+  {"print-file-name", no_argument, 0, 'o'},
+  {"print-size", no_argument, 0, 'S'},
+  {"radix", required_argument, 0, 't'},
+  {"reverse-sort", no_argument, &reverse_sort, 1},
+  {"size-sort", no_argument, &sort_by_size, 1},
+  {"special-syms", no_argument, &allow_special_symbols, 1},
+  {"stats", no_argument, &show_stats, 1},
+  {"synthetic", no_argument, &show_synthetic, 1},
+  {"target", required_argument, 0, OPTION_TARGET},
+  {"defined-only", no_argument, &defined_only, 1},
+  {"undefined-only", no_argument, &undefined_only, 1},
+  {"version", no_argument, &show_version, 1},
+  {0, no_argument, 0, 0}
+};
+
+/* Some error-reporting functions.  */
+
+static void
+usage (FILE *stream, int status)
+{
+  fprintf (stream, _("Usage: %s [option(s)] [file(s)]\n"), program_name);
+  fprintf (stream, _(" List symbols in [file(s)] (a.out by default).\n"));
+  fprintf (stream, _(" The options are:\n\
+  -a, --debug-syms       Display debugger-only symbols\n\
+  -A, --print-file-name  Print name of the input file before every symbol\n\
+  -B                     Same as --format=bsd\n\
+  -C, --demangle[=STYLE] Decode low-level symbol names into user-level names\n\
+                          The STYLE, if specified, can be `auto' (the default),\n\
+                          `gnu', `lucid', `arm', `hp', `edg', `gnu-v3', `java'\n\
+                          or `gnat'\n\
+      --no-demangle      Do not demangle low-level symbol names\n\
+  -D, --dynamic          Display dynamic symbols instead of normal symbols\n\
+      --defined-only     Display only defined symbols\n\
+  -e                     (ignored)\n\
+  -f, --format=FORMAT    Use the output format FORMAT.  FORMAT can be `bsd',\n\
+                           `sysv' or `posix'.  The default is `bsd'\n\
+  -g, --extern-only      Display only external symbols\n\
+  -l, --line-numbers     Use debugging information to find a filename and\n\
+                           line number for each symbol\n\
+  -n, --numeric-sort     Sort symbols numerically by address\n\
+  -o                     Same as -A\n\
+  -p, --no-sort          Do not sort the symbols\n\
+  -P, --portability      Same as --format=posix\n\
+  -r, --reverse-sort     Reverse the sense of the sort\n"));
+#if BFD_SUPPORTS_PLUGINS
+  fprintf (stream, _("\
+      --plugin NAME      Load the specified plugin\n"));
+#endif
+  fprintf (stream, _("\
+  -S, --print-size       Print size of defined symbols\n\
+  -s, --print-armap      Include index for symbols from archive members\n\
+      --size-sort        Sort symbols by size\n\
+      --special-syms     Include special symbols in the output\n\
+      --synthetic        Display synthetic symbols as well\n\
+  -t, --radix=RADIX      Use RADIX for printing symbol values\n\
+      --target=BFDNAME   Specify the target object format as BFDNAME\n\
+  -u, --undefined-only   Display only undefined symbols\n\
+  -X 32_64               (ignored)\n\
+  @FILE                  Read options from FILE\n\
+  -h, --help             Display this information\n\
+  -V, --version          Display this program's version number\n\
+\n"));
+  list_supported_targets (program_name, stream);
+  if (REPORT_BUGS_TO[0] && status == 0)
+    fprintf (stream, _("Report bugs to %s.\n"), REPORT_BUGS_TO);
+  exit (status);
+}
+
+/* Set the radix for the symbol value and size according to RADIX.  */
+
+static void
+set_print_radix (char *radix)
+{
+  switch (*radix)
+    {
+    case 'x':
+      break;
+    case 'd':
+    case 'o':
+      if (*radix == 'd')
+	print_radix = 10;
+      else
+	print_radix = 8;
+      value_format_32bit[4] = *radix;
+#if BFD_HOST_64BIT_LONG
+      value_format_64bit[5] = *radix;
+#elif BFD_HOST_64BIT_LONG_LONG
+#ifndef __MSVCRT__
+      value_format_64bit[6] = *radix;
+#else
+      value_format_64bit[7] = *radix;
+#endif
+#endif
+      other_format[3] = desc_format[3] = *radix;
+      break;
+    default:
+      fatal (_("%s: invalid radix"), radix);
+    }
+}
+
+static void
+set_output_format (char *f)
+{
+  int i;
+
+  switch (*f)
+    {
+    case 'b':
+    case 'B':
+      i = FORMAT_BSD;
+      break;
+    case 'p':
+    case 'P':
+      i = FORMAT_POSIX;
+      break;
+    case 's':
+    case 'S':
+      i = FORMAT_SYSV;
+      break;
+    default:
+      fatal (_("%s: invalid output format"), f);
+    }
+  format = &formats[i];
+}
+
+static const char *
+get_symbol_type (unsigned int type)
+{
+  static char buff [32];
+
+  switch (type)
+    {
+    case STT_NOTYPE:   return "NOTYPE";
+    case STT_OBJECT:   return "OBJECT";
+    case STT_FUNC:     return "FUNC";
+    case STT_SECTION:  return "SECTION";
+    case STT_FILE:     return "FILE";
+    case STT_COMMON:   return "COMMON";
+    case STT_TLS:      return "TLS";
+    default:
+      if (type >= STT_LOPROC && type <= STT_HIPROC)
+	sprintf (buff, _("<processor specific>: %d"), type);
+      else if (type >= STT_LOOS && type <= STT_HIOS)
+	sprintf (buff, _("<OS specific>: %d"), type);
+      else
+	sprintf (buff, _("<unknown>: %d"), type);
+      return buff;
+    }
+}
+
+/* Print symbol name NAME, read from ABFD, with printf format FORM,
+   demangling it if requested.  */
+
+static void
+print_symname (const char *form, const char *name, bfd *abfd)
+{
+  if (do_demangle && *name)
+    {
+      char *res = bfd_demangle (abfd, name, DMGL_ANSI | DMGL_PARAMS);
+
+      if (res != NULL)
+	{
+	  printf (form, res);
+	  free (res);
+	  return;
+	}
+    }
+
+  printf (form, name);
+}
+
+static void
+print_symdef_entry (bfd *abfd)
+{
+  symindex idx = BFD_NO_MORE_SYMBOLS;
+  carsym *thesym;
+  bfd_boolean everprinted = FALSE;
+
+  for (idx = bfd_get_next_mapent (abfd, idx, &thesym);
+       idx != BFD_NO_MORE_SYMBOLS;
+       idx = bfd_get_next_mapent (abfd, idx, &thesym))
+    {
+      bfd *elt;
+      if (!everprinted)
+	{
+	  printf (_("\nArchive index:\n"));
+	  everprinted = TRUE;
+	}
+      elt = bfd_get_elt_at_index (abfd, idx);
+      if (elt == NULL)
+	bfd_fatal ("bfd_get_elt_at_index");
+      if (thesym->name != (char *) NULL)
+	{
+	  print_symname ("%s", thesym->name, abfd);
+	  printf (" in %s\n", bfd_get_filename (elt));
+	}
+    }
+}
+
+/* Choose which symbol entries to print;
+   compact them downward to get rid of the rest.
+   Return the number of symbols to be printed.  */
+
+static long
+filter_symbols (bfd *abfd, bfd_boolean is_dynamic, void *minisyms,
+		long symcount, unsigned int size)
+{
+  bfd_byte *from, *fromend, *to;
+  asymbol *store;
+
+  store = bfd_make_empty_symbol (abfd);
+  if (store == NULL)
+    bfd_fatal (bfd_get_filename (abfd));
+
+  from = (bfd_byte *) minisyms;
+  fromend = from + symcount * size;
+  to = (bfd_byte *) minisyms;
+
+  for (; from < fromend; from += size)
+    {
+      int keep = 0;
+      asymbol *sym;
+
+      PROGRESS (1);
+
+      sym = bfd_minisymbol_to_symbol (abfd, is_dynamic, (const void *) from, store);
+      if (sym == NULL)
+	bfd_fatal (bfd_get_filename (abfd));
+
+      if (undefined_only)
+	keep = bfd_is_und_section (sym->section);
+      else if (external_only)
+	keep = ((sym->flags & BSF_GLOBAL) != 0
+		|| (sym->flags & BSF_WEAK) != 0
+		/* PR binutls/12753: Unique symbols are global too.  */
+		|| (sym->flags & BSF_GNU_UNIQUE) != 0
+		|| bfd_is_und_section (sym->section)
+		|| bfd_is_com_section (sym->section));
+      else
+	keep = 1;
+
+      if (keep
+	  && ! print_debug_syms
+	  && (sym->flags & BSF_DEBUGGING) != 0)
+	keep = 0;
+
+      if (keep
+	  && sort_by_size
+	  && (bfd_is_abs_section (sym->section)
+	      || bfd_is_und_section (sym->section)))
+	keep = 0;
+
+      if (keep
+	  && defined_only)
+	{
+	  if (bfd_is_und_section (sym->section))
+	    keep = 0;
+	}
+
+      if (keep
+	  && bfd_is_target_special_symbol (abfd, sym)
+	  && ! allow_special_symbols)
+	keep = 0;
+
+      if (keep)
+	{
+	  if (to != from)
+	    memcpy (to, from, size);
+	  to += size;
+	}
+    }
+
+  return (to - (bfd_byte *) minisyms) / size;
+}
+
+/* These globals are used to pass information into the sorting
+   routines.  */
+static bfd *sort_bfd;
+static bfd_boolean sort_dynamic;
+static asymbol *sort_x;
+static asymbol *sort_y;
+
+/* Symbol-sorting predicates */
+#define valueof(x) ((x)->section->vma + (x)->value)
+
+/* Numeric sorts.  Undefined symbols are always considered "less than"
+   defined symbols with zero values.  Common symbols are not treated
+   specially -- i.e., their sizes are used as their "values".  */
+
+static int
+non_numeric_forward (const void *P_x, const void *P_y)
+{
+  asymbol *x, *y;
+  const char *xn, *yn;
+
+  x = bfd_minisymbol_to_symbol (sort_bfd, sort_dynamic, P_x, sort_x);
+  y = bfd_minisymbol_to_symbol (sort_bfd, sort_dynamic, P_y, sort_y);
+  if (x == NULL || y == NULL)
+    bfd_fatal (bfd_get_filename (sort_bfd));
+
+  xn = bfd_asymbol_name (x);
+  yn = bfd_asymbol_name (y);
+
+  if (yn == NULL)
+    return xn != NULL;
+  if (xn == NULL)
+    return -1;
+
+#ifdef HAVE_STRCOLL
+  /* Solaris 2.5 has a bug in strcoll.
+     strcoll returns invalid values when confronted with empty strings.  */
+  if (*yn == '\0')
+    return *xn != '\0';
+  if (*xn == '\0')
+    return -1;
+
+  return strcoll (xn, yn);
+#else
+  return strcmp (xn, yn);
+#endif
+}
+
+static int
+non_numeric_reverse (const void *x, const void *y)
+{
+  return - non_numeric_forward (x, y);
+}
+
+static int
+numeric_forward (const void *P_x, const void *P_y)
+{
+  asymbol *x, *y;
+  asection *xs, *ys;
+
+  x = bfd_minisymbol_to_symbol (sort_bfd, sort_dynamic, P_x, sort_x);
+  y =  bfd_minisymbol_to_symbol (sort_bfd, sort_dynamic, P_y, sort_y);
+  if (x == NULL || y == NULL)
+    bfd_fatal (bfd_get_filename (sort_bfd));
+
+  xs = bfd_get_section (x);
+  ys = bfd_get_section (y);
+
+  if (bfd_is_und_section (xs))
+    {
+      if (! bfd_is_und_section (ys))
+	return -1;
+    }
+  else if (bfd_is_und_section (ys))
+    return 1;
+  else if (valueof (x) != valueof (y))
+    return valueof (x) < valueof (y) ? -1 : 1;
+
+  return non_numeric_forward (P_x, P_y);
+}
+
+static int
+numeric_reverse (const void *x, const void *y)
+{
+  return - numeric_forward (x, y);
+}
+
+static int (*(sorters[2][2])) (const void *, const void *) =
+{
+  { non_numeric_forward, non_numeric_reverse },
+  { numeric_forward, numeric_reverse }
+};
+
+/* This sort routine is used by sort_symbols_by_size.  It is similar
+   to numeric_forward, but when symbols have the same value it sorts
+   by section VMA.  This simplifies the sort_symbols_by_size code
+   which handles symbols at the end of sections.  Also, this routine
+   tries to sort file names before other symbols with the same value.
+   That will make the file name have a zero size, which will make
+   sort_symbols_by_size choose the non file name symbol, leading to
+   more meaningful output.  For similar reasons, this code sorts
+   gnu_compiled_* and gcc2_compiled before other symbols with the same
+   value.  */
+
+static int
+size_forward1 (const void *P_x, const void *P_y)
+{
+  asymbol *x, *y;
+  asection *xs, *ys;
+  const char *xn, *yn;
+  size_t xnl, ynl;
+  int xf, yf;
+
+  x = bfd_minisymbol_to_symbol (sort_bfd, sort_dynamic, P_x, sort_x);
+  y = bfd_minisymbol_to_symbol (sort_bfd, sort_dynamic, P_y, sort_y);
+  if (x == NULL || y == NULL)
+    bfd_fatal (bfd_get_filename (sort_bfd));
+
+  xs = bfd_get_section (x);
+  ys = bfd_get_section (y);
+
+  if (bfd_is_und_section (xs))
+    abort ();
+  if (bfd_is_und_section (ys))
+    abort ();
+
+  if (valueof (x) != valueof (y))
+    return valueof (x) < valueof (y) ? -1 : 1;
+
+  if (xs->vma != ys->vma)
+    return xs->vma < ys->vma ? -1 : 1;
+
+  xn = bfd_asymbol_name (x);
+  yn = bfd_asymbol_name (y);
+  xnl = strlen (xn);
+  ynl = strlen (yn);
+
+  /* The symbols gnu_compiled and gcc2_compiled convey even less
+     information than the file name, so sort them out first.  */
+
+  xf = (strstr (xn, "gnu_compiled") != NULL
+	|| strstr (xn, "gcc2_compiled") != NULL);
+  yf = (strstr (yn, "gnu_compiled") != NULL
+	|| strstr (yn, "gcc2_compiled") != NULL);
+
+  if (xf && ! yf)
+    return -1;
+  if (! xf && yf)
+    return 1;
+
+  /* We use a heuristic for the file name.  It may not work on non
+     Unix systems, but it doesn't really matter; the only difference
+     is precisely which symbol names get printed.  */
+
+#define file_symbol(s, sn, snl)			\
+  (((s)->flags & BSF_FILE) != 0			\
+   || ((sn)[(snl) - 2] == '.'			\
+       && ((sn)[(snl) - 1] == 'o'		\
+	   || (sn)[(snl) - 1] == 'a')))
+
+  xf = file_symbol (x, xn, xnl);
+  yf = file_symbol (y, yn, ynl);
+
+  if (xf && ! yf)
+    return -1;
+  if (! xf && yf)
+    return 1;
+
+  return non_numeric_forward (P_x, P_y);
+}
+
+/* This sort routine is used by sort_symbols_by_size.  It is sorting
+   an array of size_sym structures into size order.  */
+
+static int
+size_forward2 (const void *P_x, const void *P_y)
+{
+  const struct size_sym *x = (const struct size_sym *) P_x;
+  const struct size_sym *y = (const struct size_sym *) P_y;
+
+  if (x->size < y->size)
+    return reverse_sort ? 1 : -1;
+  else if (x->size > y->size)
+    return reverse_sort ? -1 : 1;
+  else
+    return sorters[0][reverse_sort] (x->minisym, y->minisym);
+}
+
+/* Sort the symbols by size.  ELF provides a size but for other formats
+   we have to make a guess by assuming that the difference between the
+   address of a symbol and the address of the next higher symbol is the
+   size.  */
+
+static long
+sort_symbols_by_size (bfd *abfd, bfd_boolean is_dynamic, void *minisyms,
+		      long symcount, unsigned int size,
+		      struct size_sym **symsizesp)
+{
+  struct size_sym *symsizes;
+  bfd_byte *from, *fromend;
+  asymbol *sym = NULL;
+  asymbol *store_sym, *store_next;
+
+  qsort (minisyms, symcount, size, size_forward1);
+
+  /* We are going to return a special set of symbols and sizes to
+     print.  */
+  symsizes = (struct size_sym *) xmalloc (symcount * sizeof (struct size_sym));
+  *symsizesp = symsizes;
+
+  /* Note that filter_symbols has already removed all absolute and
+     undefined symbols.  Here we remove all symbols whose size winds
+     up as zero.  */
+  from = (bfd_byte *) minisyms;
+  fromend = from + symcount * size;
+
+  store_sym = sort_x;
+  store_next = sort_y;
+
+  if (from < fromend)
+    {
+      sym = bfd_minisymbol_to_symbol (abfd, is_dynamic, (const void *) from,
+				      store_sym);
+      if (sym == NULL)
+	bfd_fatal (bfd_get_filename (abfd));
+    }
+
+  for (; from < fromend; from += size)
+    {
+      asymbol *next;
+      asection *sec;
+      bfd_vma sz;
+      asymbol *temp;
+
+      if (from + size < fromend)
+	{
+	  next = bfd_minisymbol_to_symbol (abfd,
+					   is_dynamic,
+					   (const void *) (from + size),
+					   store_next);
+	  if (next == NULL)
+	    bfd_fatal (bfd_get_filename (abfd));
+	}
+      else
+	next = NULL;
+
+      sec = bfd_get_section (sym);
+
+      if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+	sz = ((elf_symbol_type *) sym)->internal_elf_sym.st_size;
+      else if (bfd_is_com_section (sec))
+	sz = sym->value;
+      else
+	{
+	  if (from + size < fromend
+	      && sec == bfd_get_section (next))
+	    sz = valueof (next) - valueof (sym);
+	  else
+	    sz = (bfd_get_section_vma (abfd, sec)
+		  + bfd_section_size (abfd, sec)
+		  - valueof (sym));
+	}
+
+      if (sz != 0)
+	{
+	  symsizes->minisym = (const void *) from;
+	  symsizes->size = sz;
+	  ++symsizes;
+	}
+
+      sym = next;
+
+      temp = store_sym;
+      store_sym = store_next;
+      store_next = temp;
+    }
+
+  symcount = symsizes - *symsizesp;
+
+  /* We must now sort again by size.  */
+  qsort ((void *) *symsizesp, symcount, sizeof (struct size_sym), size_forward2);
+
+  return symcount;
+}
+
+/* This function is used to get the relocs for a particular section.
+   It is called via bfd_map_over_sections.  */
+
+static void
+get_relocs (bfd *abfd, asection *sec, void *dataarg)
+{
+  struct get_relocs_info *data = (struct get_relocs_info *) dataarg;
+
+  *data->secs = sec;
+
+  if ((sec->flags & SEC_RELOC) == 0)
+    {
+      *data->relocs = NULL;
+      *data->relcount = 0;
+    }
+  else
+    {
+      long relsize;
+
+      relsize = bfd_get_reloc_upper_bound (abfd, sec);
+      if (relsize < 0)
+	bfd_fatal (bfd_get_filename (abfd));
+
+      *data->relocs = (arelent **) xmalloc (relsize);
+      *data->relcount = bfd_canonicalize_reloc (abfd, sec, *data->relocs,
+						data->syms);
+      if (*data->relcount < 0)
+	bfd_fatal (bfd_get_filename (abfd));
+    }
+
+  ++data->secs;
+  ++data->relocs;
+  ++data->relcount;
+}
+
+/* Print a single symbol.  */
+
+static void
+print_symbol (bfd *abfd, asymbol *sym, bfd_vma ssize, bfd *archive_bfd)
+{
+  symbol_info syminfo;
+  struct extended_symbol_info info;
+
+  PROGRESS (1);
+
+  format->print_symbol_filename (archive_bfd, abfd);
+
+  bfd_get_symbol_info (abfd, sym, &syminfo);
+  info.sinfo = &syminfo;
+  info.ssize = ssize;
+  if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+    info.elfinfo = (elf_symbol_type *) sym;
+  else
+    info.elfinfo = NULL;
+  format->print_symbol_info (&info, abfd);
+
+  if (line_numbers)
+    {
+      static asymbol **syms;
+      static long symcount;
+      const char *filename, *functionname;
+      unsigned int lineno;
+
+      /* We need to get the canonical symbols in order to call
+         bfd_find_nearest_line.  This is inefficient, but, then, you
+         don't have to use --line-numbers.  */
+      if (abfd != lineno_cache_bfd && syms != NULL)
+	{
+	  free (syms);
+	  syms = NULL;
+	}
+      if (syms == NULL)
+	{
+	  long symsize;
+
+	  symsize = bfd_get_symtab_upper_bound (abfd);
+	  if (symsize < 0)
+	    bfd_fatal (bfd_get_filename (abfd));
+	  syms = (asymbol **) xmalloc (symsize);
+	  symcount = bfd_canonicalize_symtab (abfd, syms);
+	  if (symcount < 0)
+	    bfd_fatal (bfd_get_filename (abfd));
+	  lineno_cache_bfd = abfd;
+	}
+
+      if (bfd_is_und_section (bfd_get_section (sym)))
+	{
+	  static asection **secs;
+	  static arelent ***relocs;
+	  static long *relcount;
+	  static unsigned int seccount;
+	  unsigned int i;
+	  const char *symname;
+
+	  /* For an undefined symbol, we try to find a reloc for the
+             symbol, and print the line number of the reloc.  */
+	  if (abfd != lineno_cache_rel_bfd && relocs != NULL)
+	    {
+	      for (i = 0; i < seccount; i++)
+		if (relocs[i] != NULL)
+		  free (relocs[i]);
+	      free (secs);
+	      free (relocs);
+	      free (relcount);
+	      secs = NULL;
+	      relocs = NULL;
+	      relcount = NULL;
+	    }
+
+	  if (relocs == NULL)
+	    {
+	      struct get_relocs_info rinfo;
+
+	      seccount = bfd_count_sections (abfd);
+
+	      secs = (asection **) xmalloc (seccount * sizeof *secs);
+	      relocs = (arelent ***) xmalloc (seccount * sizeof *relocs);
+	      relcount = (long *) xmalloc (seccount * sizeof *relcount);
+
+	      rinfo.secs = secs;
+	      rinfo.relocs = relocs;
+	      rinfo.relcount = relcount;
+	      rinfo.syms = syms;
+	      bfd_map_over_sections (abfd, get_relocs, (void *) &rinfo);
+	      lineno_cache_rel_bfd = abfd;
+	    }
+
+	  symname = bfd_asymbol_name (sym);
+	  for (i = 0; i < seccount; i++)
+	    {
+	      long j;
+
+	      for (j = 0; j < relcount[i]; j++)
+		{
+		  arelent *r;
+
+		  r = relocs[i][j];
+		  if (r->sym_ptr_ptr != NULL
+		      && (*r->sym_ptr_ptr)->section == sym->section
+		      && (*r->sym_ptr_ptr)->value == sym->value
+		      && strcmp (symname,
+				 bfd_asymbol_name (*r->sym_ptr_ptr)) == 0
+		      && bfd_find_nearest_line (abfd, secs[i], syms,
+						r->address, &filename,
+						&functionname, &lineno)
+		      && filename != NULL)
+		    {
+		      /* We only print the first one we find.  */
+		      printf ("\t%s:%u", filename, lineno);
+		      i = seccount;
+		      break;
+		    }
+		}
+	    }
+	}
+      else if (bfd_get_section (sym)->owner == abfd)
+	{
+	  if ((bfd_find_line (abfd, syms, sym, &filename, &lineno)
+	       || bfd_find_nearest_line (abfd, bfd_get_section (sym),
+					 syms, sym->value, &filename,
+					 &functionname, &lineno))
+	      && filename != NULL
+	      && lineno != 0)
+	    printf ("\t%s:%u", filename, lineno);
+	}
+    }
+
+  putchar ('\n');
+}
+
+/* Print the symbols when sorting by size.  */
+
+static void
+print_size_symbols (bfd *abfd, bfd_boolean is_dynamic,
+		    struct size_sym *symsizes, long symcount,
+		    bfd *archive_bfd)
+{
+  asymbol *store;
+  struct size_sym *from, *fromend;
+
+  store = bfd_make_empty_symbol (abfd);
+  if (store == NULL)
+    bfd_fatal (bfd_get_filename (abfd));
+
+  from = symsizes;
+  fromend = from + symcount;
+  for (; from < fromend; from++)
+    {
+      asymbol *sym;
+      bfd_vma ssize;
+
+      sym = bfd_minisymbol_to_symbol (abfd, is_dynamic, from->minisym, store);
+      if (sym == NULL)
+	bfd_fatal (bfd_get_filename (abfd));
+
+      /* For elf we have already computed the correct symbol size.  */
+      if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+	ssize = from->size;
+      else
+	ssize = from->size - bfd_section_vma (abfd, bfd_get_section (sym));
+
+      print_symbol (abfd, sym, ssize, archive_bfd);
+    }
+}
+
+
+/* Print the symbols.  If ARCHIVE_BFD is non-NULL, it is the archive
+   containing ABFD.  */
+
+static void
+print_symbols (bfd *abfd, bfd_boolean is_dynamic, void *minisyms, long symcount,
+	       unsigned int size, bfd *archive_bfd)
+{
+  asymbol *store;
+  bfd_byte *from, *fromend;
+
+  store = bfd_make_empty_symbol (abfd);
+  if (store == NULL)
+    bfd_fatal (bfd_get_filename (abfd));
+
+  from = (bfd_byte *) minisyms;
+  fromend = from + symcount * size;
+  for (; from < fromend; from += size)
+    {
+      asymbol *sym;
+
+      sym = bfd_minisymbol_to_symbol (abfd, is_dynamic, from, store);
+      if (sym == NULL)
+	bfd_fatal (bfd_get_filename (abfd));
+
+      print_symbol (abfd, sym, (bfd_vma) 0, archive_bfd);
+    }
+}
+
+/* If ARCHIVE_BFD is non-NULL, it is the archive containing ABFD.  */
+
+static void
+display_rel_file (bfd *abfd, bfd *archive_bfd)
+{
+  long symcount;
+  void *minisyms;
+  unsigned int size;
+  struct size_sym *symsizes;
+
+  if (! dynamic)
+    {
+      if (!(bfd_get_file_flags (abfd) & HAS_SYMS))
+	{
+	  non_fatal (_("%s: no symbols"), bfd_get_filename (abfd));
+	  return;
+	}
+    }
+
+  symcount = bfd_read_minisymbols (abfd, dynamic, &minisyms, &size);
+  if (symcount < 0)
+    bfd_fatal (bfd_get_filename (abfd));
+
+  if (symcount == 0)
+    {
+      non_fatal (_("%s: no symbols"), bfd_get_filename (abfd));
+      return;
+    }
+
+  if (show_synthetic && size == sizeof (asymbol *))
+    {
+      asymbol *synthsyms;
+      long synth_count;
+      asymbol **static_syms = NULL;
+      asymbol **dyn_syms = NULL;
+      long static_count = 0;
+      long dyn_count = 0;
+
+      if (dynamic)
+	{
+	  dyn_count = symcount;
+	  dyn_syms = (asymbol **) minisyms;
+	}
+      else
+	{
+	  long storage = bfd_get_dynamic_symtab_upper_bound (abfd);
+
+	  static_count = symcount;
+	  static_syms = (asymbol **) minisyms;
+
+	  if (storage > 0)
+	    {
+	      dyn_syms = (asymbol **) xmalloc (storage);
+	      dyn_count = bfd_canonicalize_dynamic_symtab (abfd, dyn_syms);
+	      if (dyn_count < 0)
+		bfd_fatal (bfd_get_filename (abfd));
+	    }
+	}
+      synth_count = bfd_get_synthetic_symtab (abfd, static_count, static_syms,
+					      dyn_count, dyn_syms, &synthsyms);
+      if (synth_count > 0)
+	{
+	  asymbol **symp;
+	  void *new_mini;
+	  long i;
+
+	  new_mini = xmalloc ((symcount + synth_count + 1) * sizeof (*symp));
+	  symp = (asymbol **) new_mini;
+	  memcpy (symp, minisyms, symcount * sizeof (*symp));
+	  symp += symcount;
+	  for (i = 0; i < synth_count; i++)
+	    *symp++ = synthsyms + i;
+	  *symp = 0;
+	  minisyms = new_mini;
+	  symcount += synth_count;
+	}
+    }
+
+  /* Discard the symbols we don't want to print.
+     It's OK to do this in place; we'll free the storage anyway
+     (after printing).  */
+
+  symcount = filter_symbols (abfd, dynamic, minisyms, symcount, size);
+
+  symsizes = NULL;
+  if (! no_sort)
+    {
+      sort_bfd = abfd;
+      sort_dynamic = dynamic;
+      sort_x = bfd_make_empty_symbol (abfd);
+      sort_y = bfd_make_empty_symbol (abfd);
+      if (sort_x == NULL || sort_y == NULL)
+	bfd_fatal (bfd_get_filename (abfd));
+
+      if (! sort_by_size)
+	qsort (minisyms, symcount, size,
+	       sorters[sort_numerically][reverse_sort]);
+      else
+	symcount = sort_symbols_by_size (abfd, dynamic, minisyms, symcount,
+					 size, &symsizes);
+    }
+
+  if (! sort_by_size)
+    print_symbols (abfd, dynamic, minisyms, symcount, size, archive_bfd);
+  else
+    print_size_symbols (abfd, dynamic, symsizes, symcount, archive_bfd);
+
+  free (minisyms);
+  free (symsizes);
+}
+
+static void
+set_print_width (bfd *file)
+{
+  print_width = bfd_get_arch_size (file);
+
+  if (print_width == -1)
+    {
+      /* PR binutils/4292
+	 Guess the target's bitsize based on its name.
+	 We assume here than any 64-bit format will include
+	 "64" somewhere in its name.  The only known exception
+	 is the MMO object file format.  */
+      if (strstr (bfd_get_target (file), "64") != NULL
+	  || strcmp (bfd_get_target (file), "mmo") == 0)
+	print_width = 64;
+      else
+	print_width = 32;
+    }
+}
+
+static void
+display_archive (bfd *file)
+{
+  bfd *arfile = NULL;
+  bfd *last_arfile = NULL;
+  char **matching;
+
+  format->print_archive_filename (bfd_get_filename (file));
+
+  if (print_armap)
+    print_symdef_entry (file);
+
+  for (;;)
+    {
+      PROGRESS (1);
+
+      arfile = bfd_openr_next_archived_file (file, arfile);
+
+      if (arfile == NULL)
+	{
+	  if (bfd_get_error () != bfd_error_no_more_archived_files)
+	    bfd_fatal (bfd_get_filename (file));
+	  break;
+	}
+
+      if (bfd_check_format_matches (arfile, bfd_object, &matching))
+	{
+	  set_print_width (arfile);
+	  format->print_archive_member (bfd_get_filename (file),
+					bfd_get_filename (arfile));
+	  display_rel_file (arfile, file);
+	}
+      else
+	{
+	  bfd_nonfatal (bfd_get_filename (arfile));
+	  if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
+	    {
+	      list_matching_formats (matching);
+	      free (matching);
+	    }
+	}
+
+      if (last_arfile != NULL)
+	{
+	  bfd_close (last_arfile);
+	  lineno_cache_bfd = NULL;
+	  lineno_cache_rel_bfd = NULL;
+	}
+      last_arfile = arfile;
+    }
+
+  if (last_arfile != NULL)
+    {
+      bfd_close (last_arfile);
+      lineno_cache_bfd = NULL;
+      lineno_cache_rel_bfd = NULL;
+    }
+}
+
+static bfd_boolean
+display_file (char *filename)
+{
+  bfd_boolean retval = TRUE;
+  bfd *file;
+  char **matching;
+
+  if (get_file_size (filename) < 1)
+    return FALSE;
+
+  file = bfd_openr (filename, target ? target : plugin_target);
+  if (file == NULL)
+    {
+      bfd_nonfatal (filename);
+      return FALSE;
+    }
+
+  /* If printing line numbers, decompress the debug sections.  */
+  if (line_numbers)
+    file->flags |= BFD_DECOMPRESS;
+
+  if (bfd_check_format (file, bfd_archive))
+    {
+      display_archive (file);
+    }
+  else if (bfd_check_format_matches (file, bfd_object, &matching))
+    {
+      set_print_width (file);
+      format->print_object_filename (filename);
+      display_rel_file (file, NULL);
+    }
+  else
+    {
+      bfd_nonfatal (filename);
+      if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
+	{
+	  list_matching_formats (matching);
+	  free (matching);
+	}
+      retval = FALSE;
+    }
+
+  if (!bfd_close (file))
+    bfd_fatal (filename);
+
+  lineno_cache_bfd = NULL;
+  lineno_cache_rel_bfd = NULL;
+
+  return retval;
+}
+
+/* The following 3 groups of functions are called unconditionally,
+   once at the start of processing each file of the appropriate type.
+   They should check `filename_per_file' and `filename_per_symbol',
+   as appropriate for their output format, to determine whether to
+   print anything.  */
+
+/* Print the name of an object file given on the command line.  */
+
+static void
+print_object_filename_bsd (char *filename)
+{
+  if (filename_per_file && !filename_per_symbol)
+    printf ("\n%s:\n", filename);
+}
+
+static void
+print_object_filename_sysv (char *filename)
+{
+  if (undefined_only)
+    printf (_("\n\nUndefined symbols from %s:\n\n"), filename);
+  else
+    printf (_("\n\nSymbols from %s:\n\n"), filename);
+  if (print_width == 32)
+    printf (_("\
+Name                  Value   Class        Type         Size     Line  Section\n\n"));
+  else
+    printf (_("\
+Name                  Value           Class        Type         Size             Line  Section\n\n"));
+}
+
+static void
+print_object_filename_posix (char *filename)
+{
+  if (filename_per_file && !filename_per_symbol)
+    printf ("%s:\n", filename);
+}
+
+/* Print the name of an archive file given on the command line.  */
+
+static void
+print_archive_filename_bsd (char *filename)
+{
+  if (filename_per_file)
+    printf ("\n%s:\n", filename);
+}
+
+static void
+print_archive_filename_sysv (char *filename ATTRIBUTE_UNUSED)
+{
+}
+
+static void
+print_archive_filename_posix (char *filename ATTRIBUTE_UNUSED)
+{
+}
+
+/* Print the name of an archive member file.  */
+
+static void
+print_archive_member_bsd (char *archive ATTRIBUTE_UNUSED,
+			  const char *filename)
+{
+  if (!filename_per_symbol)
+    printf ("\n%s:\n", filename);
+}
+
+static void
+print_archive_member_sysv (char *archive, const char *filename)
+{
+  if (undefined_only)
+    printf (_("\n\nUndefined symbols from %s[%s]:\n\n"), archive, filename);
+  else
+    printf (_("\n\nSymbols from %s[%s]:\n\n"), archive, filename);
+  if (print_width == 32)
+    printf (_("\
+Name                  Value   Class        Type         Size     Line  Section\n\n"));
+  else
+    printf (_("\
+Name                  Value           Class        Type         Size             Line  Section\n\n"));
+}
+
+static void
+print_archive_member_posix (char *archive, const char *filename)
+{
+  if (!filename_per_symbol)
+    printf ("%s[%s]:\n", archive, filename);
+}
+
+/* Print the name of the file (and archive, if there is one)
+   containing a symbol.  */
+
+static void
+print_symbol_filename_bsd (bfd *archive_bfd, bfd *abfd)
+{
+  if (filename_per_symbol)
+    {
+      if (archive_bfd)
+	printf ("%s:", bfd_get_filename (archive_bfd));
+      printf ("%s:", bfd_get_filename (abfd));
+    }
+}
+
+static void
+print_symbol_filename_sysv (bfd *archive_bfd, bfd *abfd)
+{
+  if (filename_per_symbol)
+    {
+      if (archive_bfd)
+	printf ("%s:", bfd_get_filename (archive_bfd));
+      printf ("%s:", bfd_get_filename (abfd));
+    }
+}
+
+static void
+print_symbol_filename_posix (bfd *archive_bfd, bfd *abfd)
+{
+  if (filename_per_symbol)
+    {
+      if (archive_bfd)
+	printf ("%s[%s]: ", bfd_get_filename (archive_bfd),
+		bfd_get_filename (abfd));
+      else
+	printf ("%s: ", bfd_get_filename (abfd));
+    }
+}
+
+/* Print a symbol value.  */
+
+static void
+print_value (bfd *abfd ATTRIBUTE_UNUSED, bfd_vma val)
+{
+  switch (print_width)
+    {
+    case 32:
+      printf (value_format_32bit, (unsigned long) val);
+      break;
+
+    case 64:
+#if BFD_HOST_64BIT_LONG || BFD_HOST_64BIT_LONG_LONG
+      printf (value_format_64bit, val);
+#else
+      /* We have a 64 bit value to print, but the host is only 32 bit.  */
+      if (print_radix == 16)
+	bfd_fprintf_vma (abfd, stdout, val);
+      else
+	{
+	  char buf[30];
+	  char *s;
+
+	  s = buf + sizeof buf;
+	  *--s = '\0';
+	  while (val > 0)
+	    {
+	      *--s = (val % print_radix) + '0';
+	      val /= print_radix;
+	    }
+	  while ((buf + sizeof buf - 1) - s < 16)
+	    *--s = '0';
+	  printf ("%s", s);
+	}
+#endif
+      break;
+
+    default:
+      fatal (_("Print width has not been initialized (%d)"), print_width);
+      break;
+    }
+}
+
+/* Print a line of information about a symbol.  */
+
+static void
+print_symbol_info_bsd (struct extended_symbol_info *info, bfd *abfd)
+{
+  if (bfd_is_undefined_symclass (SYM_TYPE (info)))
+    {
+      if (print_width == 64)
+	printf ("        ");
+      printf ("        ");
+    }
+  else
+    {
+      /* Normally we print the value of the symbol.  If we are printing the
+	 size or sorting by size then we print its size, except for the
+	 (weird) special case where both flags are defined, in which case we
+	 print both values.  This conforms to documented behaviour.  */
+      if (sort_by_size && !print_size)
+	print_value (abfd, SYM_SIZE (info));
+      else
+	print_value (abfd, SYM_VALUE (info));
+
+      if (print_size && SYM_SIZE (info))
+	{
+	  printf (" ");
+	  print_value (abfd, SYM_SIZE (info));
+	}
+    }
+
+  printf (" %c", SYM_TYPE (info));
+
+  if (SYM_TYPE (info) == '-')
+    {
+      /* A stab.  */
+      printf (" ");
+      printf (other_format, SYM_STAB_OTHER (info));
+      printf (" ");
+      printf (desc_format, SYM_STAB_DESC (info));
+      printf (" %5s", SYM_STAB_NAME (info));
+    }
+  print_symname (" %s", SYM_NAME (info), abfd);
+}
+
+static void
+print_symbol_info_sysv (struct extended_symbol_info *info, bfd *abfd)
+{
+  print_symname ("%-20s|", SYM_NAME (info), abfd);
+
+  if (bfd_is_undefined_symclass (SYM_TYPE (info)))
+    {
+      if (print_width == 32)
+	printf ("        ");
+      else
+	printf ("                ");
+    }
+  else
+    print_value (abfd, SYM_VALUE (info));
+
+  printf ("|   %c  |", SYM_TYPE (info));
+
+  if (SYM_TYPE (info) == '-')
+    {
+      /* A stab.  */
+      printf ("%18s|  ", SYM_STAB_NAME (info));		/* (C) Type.  */
+      printf (desc_format, SYM_STAB_DESC (info));	/* Size.  */
+      printf ("|     |");				/* Line, Section.  */
+    }
+  else
+    {
+      /* Type, Size, Line, Section */
+      if (info->elfinfo)
+	printf ("%18s|",
+		get_symbol_type (ELF_ST_TYPE (info->elfinfo->internal_elf_sym.st_info)));
+      else
+	printf ("                  |");
+
+      if (SYM_SIZE (info))
+	print_value (abfd, SYM_SIZE (info));
+      else
+	{
+	  if (print_width == 32)
+	    printf ("        ");
+	  else
+	    printf ("                ");
+	}
+
+      if (info->elfinfo)
+	printf("|     |%s", info->elfinfo->symbol.section->name);
+      else
+	printf("|     |");
+    }
+}
+
+static void
+print_symbol_info_posix (struct extended_symbol_info *info, bfd *abfd)
+{
+  print_symname ("%s ", SYM_NAME (info), abfd);
+  printf ("%c ", SYM_TYPE (info));
+
+  if (bfd_is_undefined_symclass (SYM_TYPE (info)))
+    printf ("        ");
+  else
+    {
+      print_value (abfd, SYM_VALUE (info));
+      printf (" ");
+      if (SYM_SIZE (info))
+	print_value (abfd, SYM_SIZE (info));
+    }
+}
+
+int
+main (int argc, char **argv)
+{
+  int c;
+  int retval;
+
+#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
+  setlocale (LC_MESSAGES, "");
+#endif
+#if defined (HAVE_SETLOCALE)
+  setlocale (LC_CTYPE, "");
+  setlocale (LC_COLLATE, "");
+#endif
+  bindtextdomain (PACKAGE, LOCALEDIR);
+  textdomain (PACKAGE);
+
+  program_name = *argv;
+  xmalloc_set_program_name (program_name);
+#if BFD_SUPPORTS_PLUGINS
+  bfd_plugin_set_program_name (program_name);
+#endif
+
+  START_PROGRESS (program_name, 0);
+
+  expandargv (&argc, &argv);
+
+  bfd_init ();
+  set_default_bfd_target ();
+
+  while ((c = getopt_long (argc, argv, "aABCDef:gHhlnopPrSst:uvVvX:",
+			   long_options, (int *) 0)) != EOF)
+    {
+      switch (c)
+	{
+	case 'a':
+	  print_debug_syms = 1;
+	  break;
+	case 'A':
+	case 'o':
+	  filename_per_symbol = 1;
+	  break;
+	case 'B':		/* For MIPS compatibility.  */
+	  set_output_format ("bsd");
+	  break;
+	case 'C':
+	  do_demangle = 1;
+	  if (optarg != NULL)
+	    {
+	      enum demangling_styles style;
+
+	      style = cplus_demangle_name_to_style (optarg);
+	      if (style == unknown_demangling)
+		fatal (_("unknown demangling style `%s'"),
+		       optarg);
+
+	      cplus_demangle_set_style (style);
+	    }
+	  break;
+	case 'D':
+	  dynamic = 1;
+	  break;
+	case 'e':
+	  /* Ignored for HP/UX compatibility.  */
+	  break;
+	case 'f':
+	  set_output_format (optarg);
+	  break;
+	case 'g':
+	  external_only = 1;
+	  break;
+	case 'H':
+	case 'h':
+	  usage (stdout, 0);
+	case 'l':
+	  line_numbers = 1;
+	  break;
+	case 'n':
+	case 'v':
+	  sort_numerically = 1;
+	  break;
+	case 'p':
+	  no_sort = 1;
+	  break;
+	case 'P':
+	  set_output_format ("posix");
+	  break;
+	case 'r':
+	  reverse_sort = 1;
+	  break;
+	case 's':
+	  print_armap = 1;
+	  break;
+	case 'S':
+	  print_size = 1;
+	  break;
+	case 't':
+	  set_print_radix (optarg);
+	  break;
+	case 'u':
+	  undefined_only = 1;
+	  break;
+	case 'V':
+	  show_version = 1;
+	  break;
+	case 'X':
+	  /* Ignored for (partial) AIX compatibility.  On AIX, the
+	     argument has values 32, 64, or 32_64, and specifies that
+	     only 32-bit, only 64-bit, or both kinds of objects should
+	     be examined.  The default is 32.  So plain AIX nm on a
+	     library archive with both kinds of objects will ignore
+	     the 64-bit ones.  For GNU nm, the default is and always
+	     has been -X 32_64, and other options are not supported.  */
+	  if (strcmp (optarg, "32_64") != 0)
+	    fatal (_("Only -X 32_64 is supported"));
+	  break;
+
+	case OPTION_TARGET:	/* --target */
+	  target = optarg;
+	  break;
+
+	case OPTION_PLUGIN:	/* --plugin */
+#if BFD_SUPPORTS_PLUGINS
+	  plugin_target = "plugin";
+	  bfd_plugin_set_plugin (optarg);
+#else
+	  fatal (_("sorry - this program has been built without plugin support\n"));
+#endif
+	  break;
+
+	case 0:		/* A long option that just sets a flag.  */
+	  break;
+
+	default:
+	  usage (stderr, 1);
+	}
+    }
+
+  if (show_version)
+    print_version ("nm");
+
+  if (sort_by_size && undefined_only)
+    {
+      non_fatal (_("Using the --size-sort and --undefined-only options together"));
+      non_fatal (_("will produce no output, since undefined symbols have no size."));
+      return 0;
+    }
+
+  /* OK, all options now parsed.  If no filename specified, do a.out.  */
+  if (optind == argc)
+    return !display_file ("a.out");
+
+  retval = 0;
+
+  if (argc - optind > 1)
+    filename_per_file = 1;
+
+  /* We were given several filenames to do.  */
+  while (optind < argc)
+    {
+      PROGRESS (1);
+      if (!display_file (argv[optind++]))
+	retval++;
+    }
+
+  END_PROGRESS (program_name);
+
+#ifdef HAVE_SBRK
+  if (show_stats)
+    {
+      char *lim = (char *) sbrk (0);
+
+      non_fatal (_("data size %ld"), (long) (lim - (char *) &environ));
+    }
+#endif
+
+  exit (retval);
+  return retval;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/not-ranlib.c sdcc-3.2.0+dfsg/support/sdbinutils/binutils/not-ranlib.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/not-ranlib.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/not-ranlib.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,22 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of GNU Binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+/* Linked with ar.o to flag that this program is 'ar' (not 'ranlib').  */
+
+int is_ranlib = 0;
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ranlib.sh sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ranlib.sh
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/ranlib.sh	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/ranlib.sh	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,22 @@
+#!/bin/sh
+# A simple ranlib script, to use less disk space than a ranlib program.
+# Copyright 2004, 2007 Free Software Foundation, Inc.
+
+# This program is part of GNU Binutils.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.  */
+
+ar s "$1"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/rcparse.y sdcc-3.2.0+dfsg/support/sdbinutils/binutils/rcparse.y
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/rcparse.y	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/rcparse.y	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1961 @@
+%{ /* rcparse.y -- parser for Windows rc files
+   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2007, 2008
+   Free Software Foundation, Inc.
+   Written by Ian Lance Taylor, Cygnus Support.
+   Extended by Kai Tietz, Onevision.
+
+   This file is part of GNU Binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+
+/* This is a parser for Windows rc files.  It is based on the parser
+   by Gunther Ebert <gunther.ebert@ixos-leipzig.de>.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bucomm.h"
+#include "libiberty.h"
+#include "windres.h"
+#include "safe-ctype.h"
+
+/* The current language.  */
+
+static unsigned short language;
+
+/* The resource information during a sub statement.  */
+
+static rc_res_res_info sub_res_info;
+
+/* Dialog information.  This is built by the nonterminals styles and
+   controls.  */
+
+static rc_dialog dialog;
+
+/* This is used when building a style.  It is modified by the
+   nonterminal styleexpr.  */
+
+static unsigned long style;
+
+/* These are used when building a control.  They are set before using
+   control_params.  */
+
+static rc_uint_type base_style;
+static rc_uint_type default_style;
+static rc_res_id class;
+static rc_res_id res_text_field;
+static unichar null_unichar;
+
+/* This is used for COMBOBOX, LISTBOX and EDITTEXT which
+   do not allow resource 'text' field in control definition. */
+static const rc_res_id res_null_text = { 1, {{0, &null_unichar}}};
+
+%}
+
+%union
+{
+  rc_accelerator acc;
+  rc_accelerator *pacc;
+  rc_dialog_control *dialog_control;
+  rc_menuitem *menuitem;
+  struct
+  {
+    rc_rcdata_item *first;
+    rc_rcdata_item *last;
+  } rcdata;
+  rc_rcdata_item *rcdata_item;
+  rc_fixed_versioninfo *fixver;
+  rc_ver_info *verinfo;
+  rc_ver_stringinfo *verstring;
+  rc_ver_varinfo *vervar;
+  rc_toolbar_item *toobar_item;
+  rc_res_id id;
+  rc_res_res_info res_info;
+  struct
+  {
+    rc_uint_type on;
+    rc_uint_type off;
+  } memflags;
+  struct
+  {
+    rc_uint_type val;
+    /* Nonzero if this number was explicitly specified as long.  */
+    int dword;
+  } i;
+  rc_uint_type il;
+  rc_uint_type is;
+  const char *s;
+  struct
+  {
+    rc_uint_type length;
+    const char *s;
+  } ss;
+  unichar *uni;
+  struct
+  {
+    rc_uint_type length;
+    const unichar *s;
+  } suni;
+};
+
+%token BEG END
+%token ACCELERATORS VIRTKEY ASCII NOINVERT SHIFT CONTROL ALT
+%token BITMAP
+%token CURSOR
+%token DIALOG DIALOGEX EXSTYLE CAPTION CLASS STYLE
+%token AUTO3STATE AUTOCHECKBOX AUTORADIOBUTTON CHECKBOX COMBOBOX CTEXT
+%token DEFPUSHBUTTON EDITTEXT GROUPBOX LISTBOX LTEXT PUSHBOX PUSHBUTTON
+%token RADIOBUTTON RTEXT SCROLLBAR STATE3 USERBUTTON
+%token BEDIT HEDIT IEDIT
+%token FONT
+%token ICON
+%token ANICURSOR ANIICON DLGINCLUDE DLGINIT FONTDIR HTML MANIFEST PLUGPLAY VXD TOOLBAR BUTTON
+%token LANGUAGE CHARACTERISTICS VERSIONK
+%token MENU MENUEX MENUITEM SEPARATOR POPUP CHECKED GRAYED HELP INACTIVE
+%token MENUBARBREAK MENUBREAK
+%token MESSAGETABLE
+%token RCDATA
+%token STRINGTABLE
+%token VERSIONINFO FILEVERSION PRODUCTVERSION FILEFLAGSMASK FILEFLAGS
+%token FILEOS FILETYPE FILESUBTYPE BLOCKSTRINGFILEINFO BLOCKVARFILEINFO
+%token VALUE
+%token <s> BLOCK
+%token MOVEABLE FIXED PURE IMPURE PRELOAD LOADONCALL DISCARDABLE
+%token NOT
+%token <uni> QUOTEDUNISTRING
+%token <s> QUOTEDSTRING STRING
+%token <i> NUMBER
+%token <suni> SIZEDUNISTRING
+%token <ss> SIZEDSTRING
+%token IGNORED_TOKEN
+
+%type <pacc> acc_entries
+%type <acc> acc_entry acc_event
+%type <dialog_control> control control_params
+%type <menuitem> menuitems menuitem menuexitems menuexitem
+%type <rcdata> optrcdata_data optrcdata_data_int rcdata_data
+%type <rcdata_item> opt_control_data
+%type <fixver> fixedverinfo
+%type <verinfo> verblocks
+%type <verstring> vervals
+%type <vervar> vertrans
+%type <toobar_item> toolbar_data
+%type <res_info> suboptions memflags_move_discard memflags_move
+%type <memflags> memflag
+%type <id> id rcdata_id optresidc resref resid cresid
+%type <il> exstyle parennumber
+%type <il> numexpr posnumexpr cnumexpr optcnumexpr cposnumexpr
+%type <is> acc_options acc_option menuitem_flags menuitem_flag
+%type <s> file_name
+%type <uni> res_unicode_string resname res_unicode_string_concat
+%type <ss> sizedstring
+%type <suni> sizedunistring
+%type <i> sizednumexpr sizedposnumexpr
+
+%left '|'
+%left '^'
+%left '&'
+%left '+' '-'
+%left '*' '/' '%'
+%right '~' NEG
+
+%%
+
+input:
+	  /* empty */
+	| input accelerator
+	| input bitmap
+	| input cursor
+	| input dialog
+	| input font
+	| input icon
+	| input language
+	| input menu
+	| input menuex
+	| input messagetable
+	| input stringtable
+	| input toolbar
+	| input user
+	| input versioninfo
+	| input IGNORED_TOKEN
+	;
+
+/* Accelerator resources.  */
+
+accelerator:
+	  id ACCELERATORS suboptions BEG acc_entries END
+	  {
+	    define_accelerator ($1, &$3, $5);
+	    if (yychar != YYEMPTY)
+	      YYERROR;
+	    rcparse_discard_strings ();
+	  }
+	;
+
+acc_entries:
+	  /* empty */
+	  {
+	    $$ = NULL;
+	  }
+	| acc_entries acc_entry
+	  {
+	    rc_accelerator *a;
+
+	    a = (rc_accelerator *) res_alloc (sizeof *a);
+	    *a = $2;
+	    if ($1 == NULL)
+	      $$ = a;
+	    else
+	      {
+		rc_accelerator **pp;
+
+		for (pp = &$1->next; *pp != NULL; pp = &(*pp)->next)
+		  ;
+		*pp = a;
+		$$ = $1;
+	      }
+	  }
+	;
+
+acc_entry:
+	  acc_event cposnumexpr
+	  {
+	    $$ = $1;
+	    $$.id = $2;
+	  }
+	| acc_event cposnumexpr ',' acc_options
+	  {
+	    $$ = $1;
+	    $$.id = $2;
+	    $$.flags |= $4;
+	    if (($$.flags & ACC_VIRTKEY) == 0
+		&& ($$.flags & (ACC_SHIFT | ACC_CONTROL)) != 0)
+	      rcparse_warning (_("inappropriate modifiers for non-VIRTKEY"));
+	  }
+	;
+
+acc_event:
+	  QUOTEDSTRING
+	  {
+	    const char *s = $1;
+	    char ch;
+
+	    $$.next = NULL;
+	    $$.id = 0;
+	    ch = *s;
+	    if (ch != '^')
+	      $$.flags = 0;
+	    else
+	      {
+		$$.flags = ACC_CONTROL | ACC_VIRTKEY;
+		++s;
+		ch = TOUPPER (s[0]);
+	      }
+	    $$.key = ch;
+	    if (s[1] != '\0')
+	      rcparse_warning (_("accelerator should only be one character"));
+	  }
+	| posnumexpr
+	  {
+	    $$.next = NULL;
+	    $$.flags = 0;
+	    $$.id = 0;
+	    $$.key = $1;
+	  }
+	;
+
+acc_options:
+	  acc_option
+	  {
+	    $$ = $1;
+	  }
+	| acc_options ',' acc_option
+	  {
+	    $$ = $1 | $3;
+	  }
+	/* I've had one report that the comma is optional.  */
+	| acc_options acc_option
+	  {
+	    $$ = $1 | $2;
+	  }
+	;
+
+acc_option:
+	  VIRTKEY
+	  {
+	    $$ = ACC_VIRTKEY;
+	  }
+	| ASCII
+	  {
+	    /* This is just the absence of VIRTKEY.  */
+	    $$ = 0;
+	  }
+	| NOINVERT
+	  {
+	    $$ = ACC_NOINVERT;
+	  }
+	| SHIFT
+	  {
+	    $$ = ACC_SHIFT;
+	  }
+	| CONTROL
+	  {
+	    $$ = ACC_CONTROL;
+	  }
+	| ALT
+	  {
+	    $$ = ACC_ALT;
+	  }
+	;
+
+/* Bitmap resources.  */
+
+bitmap:
+	  id BITMAP memflags_move file_name
+	  {
+	    define_bitmap ($1, &$3, $4);
+	    if (yychar != YYEMPTY)
+	      YYERROR;
+	    rcparse_discard_strings ();
+	  }
+	;
+
+/* Cursor resources.  */
+
+cursor:
+	  id CURSOR memflags_move_discard file_name
+	  {
+	    define_cursor ($1, &$3, $4);
+	    if (yychar != YYEMPTY)
+	      YYERROR;
+	    rcparse_discard_strings ();
+	  }
+	;
+
+/* Dialog resources.  */
+
+dialog:
+	  id DIALOG memflags_move exstyle posnumexpr cnumexpr cnumexpr
+	    cnumexpr
+	    {
+	      memset (&dialog, 0, sizeof dialog);
+	      dialog.x = $5;
+	      dialog.y = $6;
+	      dialog.width = $7;
+	      dialog.height = $8;
+	      dialog.style = WS_POPUP | WS_BORDER | WS_SYSMENU;
+	      dialog.exstyle = $4;
+	      dialog.menu.named = 1;
+	      dialog.class.named = 1;
+	      dialog.font = NULL;
+	      dialog.ex = NULL;
+	      dialog.controls = NULL;
+	      sub_res_info = $3;
+	      style = 0;
+	    }
+	    styles BEG controls END
+	  {
+	    define_dialog ($1, &sub_res_info, &dialog);
+	    if (yychar != YYEMPTY)
+	      YYERROR;
+	    rcparse_discard_strings ();
+	  }
+	| id DIALOGEX memflags_move exstyle posnumexpr cnumexpr cnumexpr
+	    cnumexpr
+	    {
+	      memset (&dialog, 0, sizeof dialog);
+	      dialog.x = $5;
+	      dialog.y = $6;
+	      dialog.width = $7;
+	      dialog.height = $8;
+	      dialog.style = WS_POPUP | WS_BORDER | WS_SYSMENU;
+	      dialog.exstyle = $4;
+	      dialog.menu.named = 1;
+	      dialog.class.named = 1;
+	      dialog.font = NULL;
+	      dialog.ex = ((rc_dialog_ex *)
+			   res_alloc (sizeof (rc_dialog_ex)));
+	      memset (dialog.ex, 0, sizeof (rc_dialog_ex));
+	      dialog.controls = NULL;
+	      sub_res_info = $3;
+	      style = 0;
+	    }
+	    styles BEG controls END
+	  {
+	    define_dialog ($1, &sub_res_info, &dialog);
+	    if (yychar != YYEMPTY)
+	      YYERROR;
+	    rcparse_discard_strings ();
+	  }
+	| id DIALOGEX memflags_move exstyle posnumexpr cnumexpr cnumexpr
+	    cnumexpr cnumexpr
+	    {
+	      memset (&dialog, 0, sizeof dialog);
+	      dialog.x = $5;
+	      dialog.y = $6;
+	      dialog.width = $7;
+	      dialog.height = $8;
+	      dialog.style = WS_POPUP | WS_BORDER | WS_SYSMENU;
+	      dialog.exstyle = $4;
+	      dialog.menu.named = 1;
+	      dialog.class.named = 1;
+	      dialog.font = NULL;
+	      dialog.ex = ((rc_dialog_ex *)
+			   res_alloc (sizeof (rc_dialog_ex)));
+	      memset (dialog.ex, 0, sizeof (rc_dialog_ex));
+	      dialog.ex->help = $9;
+	      dialog.controls = NULL;
+	      sub_res_info = $3;
+	      style = 0;
+	    }
+	    styles BEG controls END
+	  {
+	    define_dialog ($1, &sub_res_info, &dialog);
+	    if (yychar != YYEMPTY)
+	      YYERROR;
+	    rcparse_discard_strings ();
+	  }
+	;
+
+exstyle:
+	  /* empty */
+	  {
+	    $$ = 0;
+	  }
+	| EXSTYLE '=' numexpr
+	  {
+	    $$ = $3;
+	  }
+	;
+
+styles:
+	  /* empty */
+	| styles CAPTION res_unicode_string_concat
+	  {
+	    dialog.style |= WS_CAPTION;
+	    style |= WS_CAPTION;
+	    dialog.caption = $3;
+	  }
+	| styles CLASS id
+	  {
+	    dialog.class = $3;
+	  }
+	| styles STYLE
+	    styleexpr
+	  {
+	    dialog.style = style;
+	  }
+	| styles EXSTYLE numexpr
+	  {
+	    dialog.exstyle = $3;
+	  }
+	| styles CLASS res_unicode_string_concat
+	  {
+	    res_unistring_to_id (& dialog.class, $3);
+	  }
+	| styles FONT numexpr ',' res_unicode_string_concat
+	  {
+	    dialog.style |= DS_SETFONT;
+	    style |= DS_SETFONT;
+	    dialog.pointsize = $3;
+	    dialog.font = $5;
+	    if (dialog.ex != NULL)
+	      {
+		dialog.ex->weight = 0;
+		dialog.ex->italic = 0;
+		dialog.ex->charset = 1;
+	      }
+	  }
+	| styles FONT numexpr ',' res_unicode_string_concat cnumexpr
+	  {
+	    dialog.style |= DS_SETFONT;
+	    style |= DS_SETFONT;
+	    dialog.pointsize = $3;
+	    dialog.font = $5;
+	    if (dialog.ex == NULL)
+	      rcparse_warning (_("extended FONT requires DIALOGEX"));
+	    else
+	      {
+		dialog.ex->weight = $6;
+		dialog.ex->italic = 0;
+		dialog.ex->charset = 1;
+	      }
+	  }
+	| styles FONT numexpr ',' res_unicode_string_concat cnumexpr cnumexpr
+	  {
+	    dialog.style |= DS_SETFONT;
+	    style |= DS_SETFONT;
+	    dialog.pointsize = $3;
+	    dialog.font = $5;
+	    if (dialog.ex == NULL)
+	      rcparse_warning (_("extended FONT requires DIALOGEX"));
+	    else
+	      {
+		dialog.ex->weight = $6;
+		dialog.ex->italic = $7;
+		dialog.ex->charset = 1;
+	      }
+	  }
+	| styles FONT numexpr ',' res_unicode_string_concat cnumexpr cnumexpr cnumexpr
+	  {
+	    dialog.style |= DS_SETFONT;
+	    style |= DS_SETFONT;
+	    dialog.pointsize = $3;
+	    dialog.font = $5;
+	    if (dialog.ex == NULL)
+	      rcparse_warning (_("extended FONT requires DIALOGEX"));
+	    else
+	      {
+		dialog.ex->weight = $6;
+		dialog.ex->italic = $7;
+		dialog.ex->charset = $8;
+	      }
+	  }
+	| styles MENU id
+	  {
+	    dialog.menu = $3;
+	  }
+	| styles CHARACTERISTICS numexpr
+	  {
+	    sub_res_info.characteristics = $3;
+	  }
+	| styles LANGUAGE numexpr cnumexpr
+	  {
+	    sub_res_info.language = $3 | ($4 << SUBLANG_SHIFT);
+	  }
+	| styles VERSIONK numexpr
+	  {
+	    sub_res_info.version = $3;
+	  }
+	;
+
+controls:
+	  /* empty */
+	| controls control
+	  {
+	    rc_dialog_control **pp;
+
+	    for (pp = &dialog.controls; *pp != NULL; pp = &(*pp)->next)
+	      ;
+	    *pp = $2;
+	  }
+	;
+
+control:
+	  AUTO3STATE optresidc
+	    {
+	      default_style = BS_AUTO3STATE | WS_TABSTOP;
+	      base_style = BS_AUTO3STATE;
+	      class.named = 0;
+	      class.u.id = CTL_BUTTON;
+	      res_text_field = $2;	
+	    }
+	    control_params
+	  {
+	    $$ = $4;
+	  }
+	| AUTOCHECKBOX optresidc
+	    {
+	      default_style = BS_AUTOCHECKBOX | WS_TABSTOP;
+	      base_style = BS_AUTOCHECKBOX;
+	      class.named = 0;
+	      class.u.id = CTL_BUTTON;
+	      res_text_field = $2;	
+	    }
+	    control_params
+	  {
+	    $$ = $4;
+	  }
+	| AUTORADIOBUTTON optresidc
+	    {
+	      default_style = BS_AUTORADIOBUTTON | WS_TABSTOP;
+	      base_style = BS_AUTORADIOBUTTON;
+	      class.named = 0;
+	      class.u.id = CTL_BUTTON;
+	      res_text_field = $2;	
+	    }
+	    control_params
+	  {
+	    $$ = $4;
+	  }
+	| BEDIT optresidc
+	    {
+	      default_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
+	      base_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
+	      class.named = 0;
+	      class.u.id = CTL_EDIT;
+	      res_text_field = $2;	
+	    }
+	    control_params
+	  {
+	    $$ = $4;
+	    if (dialog.ex == NULL)
+	      rcparse_warning (_("BEDIT requires DIALOGEX"));
+	    res_string_to_id (&$$->class, "BEDIT");
+	  }
+	| CHECKBOX optresidc
+	    {
+	      default_style = BS_CHECKBOX | WS_TABSTOP;
+	      base_style = BS_CHECKBOX | WS_TABSTOP;
+	      class.named = 0;
+	      class.u.id = CTL_BUTTON;
+	      res_text_field = $2;	
+	    }
+	    control_params
+	  {
+	    $$ = $4;
+	  }
+	| COMBOBOX
+	    {
+	      /* This is as per MSDN documentation.  With some (???)
+		 versions of MS rc.exe their is no default style.  */
+	      default_style = CBS_SIMPLE | WS_TABSTOP;
+	      base_style = 0;
+	      class.named = 0;
+	      class.u.id = CTL_COMBOBOX;
+	      res_text_field = res_null_text;	
+	    }
+	    control_params
+	  {
+	    $$ = $3;
+	  }
+	| CONTROL optresidc numexpr cresid control_styleexpr cnumexpr
+	    cnumexpr cnumexpr cnumexpr optcnumexpr opt_control_data
+	  {
+	    $$ = define_control ($2, $3, $6, $7, $8, $9, $4, style, $10);
+	    if ($11 != NULL)
+	      {
+		if (dialog.ex == NULL)
+		  rcparse_warning (_("control data requires DIALOGEX"));
+		$$->data = $11;
+	      }
+	  }
+	| CONTROL optresidc numexpr cresid control_styleexpr cnumexpr
+	    cnumexpr cnumexpr cnumexpr cnumexpr cnumexpr opt_control_data
+	  {
+	    $$ = define_control ($2, $3, $6, $7, $8, $9, $4, style, $10);
+	    if (dialog.ex == NULL)
+	      rcparse_warning (_("help ID requires DIALOGEX"));
+	    $$->help = $11;
+	    $$->data = $12;
+	  }
+	| CTEXT optresidc
+	    {
+	      default_style = SS_CENTER | WS_GROUP;
+	      base_style = SS_CENTER;
+	      class.named = 0;
+	      class.u.id = CTL_STATIC;
+	      res_text_field = $2;	
+	    }
+	    control_params
+	  {
+	    $$ = $4;
+	  }
+	| DEFPUSHBUTTON optresidc
+	    {
+	      default_style = BS_DEFPUSHBUTTON | WS_TABSTOP;
+	      base_style = BS_DEFPUSHBUTTON | WS_TABSTOP;
+	      class.named = 0;
+	      class.u.id = CTL_BUTTON;
+	      res_text_field = $2;	
+	    }
+	    control_params
+	  {
+	    $$ = $4;
+	  }
+	| EDITTEXT
+	    {
+	      default_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
+	      base_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
+	      class.named = 0;
+	      class.u.id = CTL_EDIT;
+	      res_text_field = res_null_text;	
+	    }
+	    control_params
+	  {
+	    $$ = $3;
+	  }
+	| GROUPBOX optresidc
+	    {
+	      default_style = BS_GROUPBOX;
+	      base_style = BS_GROUPBOX;
+	      class.named = 0;
+	      class.u.id = CTL_BUTTON;
+	      res_text_field = $2;	
+	    }
+	    control_params
+	  {
+	    $$ = $4;
+	  }
+	| HEDIT optresidc
+	    {
+	      default_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
+	      base_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
+	      class.named = 0;
+	      class.u.id = CTL_EDIT;
+	      res_text_field = $2;	
+	    }
+	    control_params
+	  {
+	    $$ = $4;
+	    if (dialog.ex == NULL)
+	      rcparse_warning (_("IEDIT requires DIALOGEX"));
+	    res_string_to_id (&$$->class, "HEDIT");
+	  }
+	| ICON resref numexpr cnumexpr cnumexpr opt_control_data
+          {
+	    $$ = define_icon_control ($2, $3, $4, $5, 0, 0, 0, $6,
+				      dialog.ex);
+          }
+	| ICON resref numexpr cnumexpr cnumexpr cnumexpr cnumexpr
+	    opt_control_data
+          {
+	    $$ = define_icon_control ($2, $3, $4, $5, 0, 0, 0, $8,
+				      dialog.ex);
+          }
+	| ICON resref numexpr cnumexpr cnumexpr cnumexpr cnumexpr
+	    icon_styleexpr optcnumexpr opt_control_data
+          {
+	    $$ = define_icon_control ($2, $3, $4, $5, style, $9, 0, $10,
+				      dialog.ex);
+          }
+	| ICON resref numexpr cnumexpr cnumexpr cnumexpr cnumexpr
+	    icon_styleexpr cnumexpr cnumexpr opt_control_data
+          {
+	    $$ = define_icon_control ($2, $3, $4, $5, style, $9, $10, $11,
+				      dialog.ex);
+          }
+	| IEDIT optresidc
+	    {
+	      default_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
+	      base_style = ES_LEFT | WS_BORDER | WS_TABSTOP;
+	      class.named = 0;
+	      class.u.id = CTL_EDIT;
+	      res_text_field = $2;	
+	    }
+	    control_params
+	  {
+	    $$ = $4;
+	    if (dialog.ex == NULL)
+	      rcparse_warning (_("IEDIT requires DIALOGEX"));
+	    res_string_to_id (&$$->class, "IEDIT");
+	  }
+	| LISTBOX
+	    {
+	      default_style = LBS_NOTIFY | WS_BORDER;
+	      base_style = LBS_NOTIFY | WS_BORDER;
+	      class.named = 0;
+	      class.u.id = CTL_LISTBOX;
+	      res_text_field = res_null_text;	
+	    }
+	    control_params
+	  {
+	    $$ = $3;
+	  }
+	| LTEXT optresidc
+	    {
+	      default_style = SS_LEFT | WS_GROUP;
+	      base_style = SS_LEFT;
+	      class.named = 0;
+	      class.u.id = CTL_STATIC;
+	      res_text_field = $2;	
+	    }
+	    control_params
+	  {
+	    $$ = $4;
+	  }
+	| PUSHBOX optresidc
+	    {
+	      default_style = BS_PUSHBOX | WS_TABSTOP;
+	      base_style = BS_PUSHBOX;
+	      class.named = 0;
+	      class.u.id = CTL_BUTTON;
+	    }
+	    control_params
+	  {
+	    $$ = $4;
+	  }
+	| PUSHBUTTON optresidc
+	    {
+	      default_style = BS_PUSHBUTTON | WS_TABSTOP;
+	      base_style = BS_PUSHBUTTON | WS_TABSTOP;
+	      class.named = 0;
+	      class.u.id = CTL_BUTTON;
+	      res_text_field = $2;	
+	    }
+	    control_params
+	  {
+	    $$ = $4;
+	  }
+	| RADIOBUTTON optresidc
+	    {
+	      default_style = BS_RADIOBUTTON | WS_TABSTOP;
+	      base_style = BS_RADIOBUTTON;
+	      class.named = 0;
+	      class.u.id = CTL_BUTTON;
+	      res_text_field = $2;	
+	    }
+	    control_params
+	  {
+	    $$ = $4;
+	  }
+	| RTEXT optresidc
+	    {
+	      default_style = SS_RIGHT | WS_GROUP;
+	      base_style = SS_RIGHT;
+	      class.named = 0;
+	      class.u.id = CTL_STATIC;
+	      res_text_field = $2;	
+	    }
+	    control_params
+	  {
+	    $$ = $4;
+	  }
+	| SCROLLBAR
+	    {
+	      default_style = SBS_HORZ;
+	      base_style = 0;
+	      class.named = 0;
+	      class.u.id = CTL_SCROLLBAR;
+	      res_text_field = res_null_text;	
+	    }
+	    control_params
+	  {
+	    $$ = $3;
+	  }
+	| STATE3 optresidc
+	    {
+	      default_style = BS_3STATE | WS_TABSTOP;
+	      base_style = BS_3STATE;
+	      class.named = 0;
+	      class.u.id = CTL_BUTTON;
+	      res_text_field = $2;	
+	    }
+	    control_params
+	  {
+	    $$ = $4;
+	  }
+	| USERBUTTON resref numexpr ',' numexpr ',' numexpr ','
+	    numexpr ',' numexpr ',' 
+	    { style = WS_CHILD | WS_VISIBLE; }
+	    styleexpr optcnumexpr
+	  {
+	    rc_res_id cid;
+	    cid.named = 0;
+	    cid.u.id = CTL_BUTTON;
+	    $$ = define_control ($2, $3, $5, $7, $9, $11, cid,
+				 style, $15);
+	  }
+	;
+
+/* Parameters for a control.  The static variables DEFAULT_STYLE,
+   BASE_STYLE, and CLASS must be initialized before this nonterminal
+   is used.  DEFAULT_STYLE is the style to use if no style expression
+   is specified.  BASE_STYLE is the base style to use if a style
+   expression is specified; the style expression modifies the base
+   style.  CLASS is the class of the control.  */
+
+control_params:
+	  numexpr cnumexpr cnumexpr cnumexpr cnumexpr opt_control_data
+	  {
+	    $$ = define_control (res_text_field, $1, $2, $3, $4, $5, class,
+				 default_style | WS_CHILD | WS_VISIBLE, 0);
+	    if ($6 != NULL)
+	      {
+		if (dialog.ex == NULL)
+		  rcparse_warning (_("control data requires DIALOGEX"));
+		$$->data = $6;
+	      }
+	  }
+	| numexpr cnumexpr cnumexpr cnumexpr cnumexpr
+	    control_params_styleexpr optcnumexpr opt_control_data
+	  {
+	    $$ = define_control (res_text_field, $1, $2, $3, $4, $5, class, style, $7);
+	    if ($8 != NULL)
+	      {
+		if (dialog.ex == NULL)
+		  rcparse_warning (_("control data requires DIALOGEX"));
+		$$->data = $8;
+	      }
+	  }
+	| numexpr cnumexpr cnumexpr cnumexpr cnumexpr
+	    control_params_styleexpr cnumexpr cnumexpr opt_control_data
+	  {
+	    $$ = define_control (res_text_field, $1, $2, $3, $4, $5, class, style, $7);
+	    if (dialog.ex == NULL)
+	      rcparse_warning (_("help ID requires DIALOGEX"));
+	    $$->help = $8;
+	    $$->data = $9;
+	  }
+	;
+
+cresid:
+	  ',' resid
+	  {
+	    if ($2.named)
+	      res_unistring_to_id (&$$, $2.u.n.name);
+	    else
+	      $$=$2;
+	  }
+	;
+
+optresidc:
+	  /* empty */
+	  {
+	    res_string_to_id (&$$, "");
+	  }
+	| resid ',' { $$=$1; }
+	;
+
+resid:
+	  posnumexpr
+	  {
+	    $$.named = 0;
+	    $$.u.id = $1;
+	  }
+	| res_unicode_string_concat
+	  {
+	    $$.named = 1;
+	    $$.u.n.name = $1;
+	    $$.u.n.length = unichar_len ($1);
+	  }
+	;
+
+opt_control_data:
+	  /* empty */
+	  {
+	    $$ = NULL;
+	  }
+	| BEG optrcdata_data END
+	  {
+	    $$ = $2.first;
+	  }
+	;
+
+/* These only exist to parse a reduction out of a common case.  */
+
+control_styleexpr:
+	  ','
+	  { style = WS_CHILD | WS_VISIBLE; }
+	  styleexpr
+	;
+
+icon_styleexpr:
+	  ','
+	  { style = SS_ICON | WS_CHILD | WS_VISIBLE; }
+	  styleexpr
+	;
+
+control_params_styleexpr:
+	  ','
+	  { style = base_style | WS_CHILD | WS_VISIBLE; }
+	  styleexpr
+	;
+
+/* Font resources.  */
+
+font:
+	  id FONT memflags_move_discard file_name
+	  {
+	    define_font ($1, &$3, $4);
+	    if (yychar != YYEMPTY)
+	      YYERROR;
+	    rcparse_discard_strings ();
+	  }
+	;
+
+/* Icon resources.  */
+
+icon:
+	  id ICON memflags_move_discard file_name
+	  {
+	    define_icon ($1, &$3, $4);
+	    if (yychar != YYEMPTY)
+	      YYERROR;
+	    rcparse_discard_strings ();
+	  }
+	;
+
+/* Language command.  This changes the static variable language, which
+   affects all subsequent resources.  */
+
+language:
+	  LANGUAGE numexpr cnumexpr
+	  {
+	    language = $2 | ($3 << SUBLANG_SHIFT);
+	  }
+	;
+
+/* Menu resources.  */
+
+menu:
+	  id MENU suboptions BEG menuitems END
+	  {
+	    define_menu ($1, &$3, $5);
+	    if (yychar != YYEMPTY)
+	      YYERROR;
+	    rcparse_discard_strings ();
+	  }
+	;
+
+menuitems:
+	  /* empty */
+	  {
+	    $$ = NULL;
+	  }
+	| menuitems menuitem
+	  {
+	    if ($1 == NULL)
+	      $$ = $2;
+	    else
+	      {
+		rc_menuitem **pp;
+
+		for (pp = &$1->next; *pp != NULL; pp = &(*pp)->next)
+		  ;
+		*pp = $2;
+		$$ = $1;
+	      }
+	  }
+	;
+
+menuitem:
+	  MENUITEM res_unicode_string_concat cnumexpr menuitem_flags
+	  {
+	    $$ = define_menuitem ($2, $3, $4, 0, 0, NULL);
+	  }
+	| MENUITEM SEPARATOR
+	  {
+	    $$ = define_menuitem (NULL, 0, 0, 0, 0, NULL);
+	  }
+	| POPUP res_unicode_string_concat menuitem_flags BEG menuitems END
+	  {
+	    $$ = define_menuitem ($2, 0, $3, 0, 0, $5);
+	  }
+	;
+
+menuitem_flags:
+	  /* empty */
+	  {
+	    $$ = 0;
+	  }
+	| menuitem_flags ',' menuitem_flag
+	  {
+	    $$ = $1 | $3;
+	  }
+	| menuitem_flags menuitem_flag
+	  {
+	    $$ = $1 | $2;
+	  }
+	;
+
+menuitem_flag:
+	  CHECKED
+	  {
+	    $$ = MENUITEM_CHECKED;
+	  }
+	| GRAYED
+	  {
+	    $$ = MENUITEM_GRAYED;
+	  }
+	| HELP
+	  {
+	    $$ = MENUITEM_HELP;
+	  }
+	| INACTIVE
+	  {
+	    $$ = MENUITEM_INACTIVE;
+	  }
+	| MENUBARBREAK
+	  {
+	    $$ = MENUITEM_MENUBARBREAK;
+	  }
+	| MENUBREAK
+	  {
+	    $$ = MENUITEM_MENUBREAK;
+	  }
+	;
+
+/* Menuex resources.  */
+
+menuex:
+	  id MENUEX suboptions BEG menuexitems END
+	  {
+	    define_menu ($1, &$3, $5);
+	    if (yychar != YYEMPTY)
+	      YYERROR;
+	    rcparse_discard_strings ();
+	  }
+	;
+
+menuexitems:
+	  /* empty */
+	  {
+	    $$ = NULL;
+	  }
+	| menuexitems menuexitem
+	  {
+	    if ($1 == NULL)
+	      $$ = $2;
+	    else
+	      {
+		rc_menuitem **pp;
+
+		for (pp = &$1->next; *pp != NULL; pp = &(*pp)->next)
+		  ;
+		*pp = $2;
+		$$ = $1;
+	      }
+	  }
+	;
+
+menuexitem:
+	  MENUITEM res_unicode_string_concat
+	  {
+	    $$ = define_menuitem ($2, 0, 0, 0, 0, NULL);
+	  }
+	| MENUITEM res_unicode_string_concat cnumexpr
+	  {
+	    $$ = define_menuitem ($2, $3, 0, 0, 0, NULL);
+	  }
+	| MENUITEM res_unicode_string_concat cnumexpr cnumexpr optcnumexpr
+	  {
+	    $$ = define_menuitem ($2, $3, $4, $5, 0, NULL);
+	  }
+ 	| MENUITEM SEPARATOR
+ 	  {
+ 	    $$ = define_menuitem (NULL, 0, 0, 0, 0, NULL);
+ 	  }
+	| POPUP res_unicode_string_concat BEG menuexitems END
+	  {
+	    $$ = define_menuitem ($2, 0, 0, 0, 0, $4);
+	  }
+	| POPUP res_unicode_string_concat cnumexpr BEG menuexitems END
+	  {
+	    $$ = define_menuitem ($2, $3, 0, 0, 0, $5);
+	  }
+	| POPUP res_unicode_string_concat cnumexpr cnumexpr BEG menuexitems END
+	  {
+	    $$ = define_menuitem ($2, $3, $4, 0, 0, $6);
+	  }
+	| POPUP res_unicode_string_concat cnumexpr cnumexpr cnumexpr optcnumexpr
+	    BEG menuexitems END
+	  {
+	    $$ = define_menuitem ($2, $3, $4, $5, $6, $8);
+	  }
+	;
+
+/* Messagetable resources.  */
+
+messagetable:
+	  id MESSAGETABLE memflags_move file_name
+	  {
+	    define_messagetable ($1, &$3, $4);
+	    if (yychar != YYEMPTY)
+	      YYERROR;
+	    rcparse_discard_strings ();
+	  }
+	;
+
+/* We use a different lexing algorithm, because rcdata strings may
+   contain embedded null bytes, and we need to know the length to use.  */
+
+optrcdata_data:
+	  {
+	    rcparse_rcdata ();
+	  }
+	  optrcdata_data_int
+	  {
+	    rcparse_normal ();
+	    $$ = $2;
+	  }
+	;
+
+optrcdata_data_int:
+	  /* empty */
+	  {
+	    $$.first = NULL;
+	    $$.last = NULL;
+	  }
+	| rcdata_data
+	  {
+	    $$ = $1;
+	  }
+	;
+
+rcdata_data:
+	  sizedstring
+	  {
+	    rc_rcdata_item *ri;
+
+	    ri = define_rcdata_string ($1.s, $1.length);
+	    $$.first = ri;
+	    $$.last = ri;
+	  }
+	| sizedunistring
+	  {
+	    rc_rcdata_item *ri;
+
+	    ri = define_rcdata_unistring ($1.s, $1.length);
+	    $$.first = ri;
+	    $$.last = ri;
+	  }
+	| sizednumexpr
+	  {
+	    rc_rcdata_item *ri;
+
+	    ri = define_rcdata_number ($1.val, $1.dword);
+	    $$.first = ri;
+	    $$.last = ri;
+	  }
+	| rcdata_data ',' sizedstring
+	  {
+	    rc_rcdata_item *ri;
+
+	    ri = define_rcdata_string ($3.s, $3.length);
+	    $$.first = $1.first;
+	    $1.last->next = ri;
+	    $$.last = ri;
+	  }
+	| rcdata_data ',' sizedunistring
+	  {
+	    rc_rcdata_item *ri;
+
+	    ri = define_rcdata_unistring ($3.s, $3.length);
+	    $$.first = $1.first;
+	    $1.last->next = ri;
+	    $$.last = ri;
+	  }
+	| rcdata_data ',' sizednumexpr
+	  {
+	    rc_rcdata_item *ri;
+
+	    ri = define_rcdata_number ($3.val, $3.dword);
+	    $$.first = $1.first;
+	    $1.last->next = ri;
+	    $$.last = ri;
+	  }
+	| rcdata_data ','
+	  {
+	    $$=$1;
+	  }
+	;
+
+/* Stringtable resources.  */
+
+stringtable:
+	  STRINGTABLE suboptions BEG 
+	    { sub_res_info = $2; }
+	    string_data END
+	;
+
+string_data:
+	  /* empty */
+	| string_data numexpr res_unicode_string_concat
+	  {
+	    define_stringtable (&sub_res_info, $2, $3);
+	    rcparse_discard_strings ();
+	  }
+	| string_data numexpr ',' res_unicode_string_concat
+	  {
+	    define_stringtable (&sub_res_info, $2, $4);
+	    rcparse_discard_strings ();
+	  }
+	| string_data error
+	  {
+	    rcparse_warning (_("invalid stringtable resource."));
+	    abort ();
+	  }
+	;
+
+rcdata_id:
+	id
+	  {
+	    $$=$1;
+	  }
+      | HTML
+	{
+	  $$.named = 0;
+	  $$.u.id = 23;
+	}
+      | RCDATA
+        {
+          $$.named = 0;
+          $$.u.id = RT_RCDATA;
+        }
+      | MANIFEST
+        {
+          $$.named = 0;
+          $$.u.id = RT_MANIFEST;
+        }
+      | PLUGPLAY
+        {
+          $$.named = 0;
+          $$.u.id = RT_PLUGPLAY;
+        }
+      | VXD
+        {
+          $$.named = 0;
+          $$.u.id = RT_VXD;
+        }
+      | DLGINCLUDE
+        {
+          $$.named = 0;
+          $$.u.id = RT_DLGINCLUDE;
+        }
+      | DLGINIT
+        {
+          $$.named = 0;
+          $$.u.id = RT_DLGINIT;
+        }
+      | ANICURSOR
+        {
+          $$.named = 0;
+          $$.u.id = RT_ANICURSOR;
+        }
+      | ANIICON
+        {
+          $$.named = 0;
+          $$.u.id = RT_ANIICON;
+        }
+      ;
+
+/* User defined resources.  We accept general suboptions in the
+   file_name case to keep the parser happy.  */
+
+user:
+	  id rcdata_id suboptions BEG optrcdata_data END
+	  {
+	    define_user_data ($1, $2, &$3, $5.first);
+	    if (yychar != YYEMPTY)
+	      YYERROR;
+	    rcparse_discard_strings ();
+	  }
+	| id rcdata_id suboptions file_name
+	  {
+	    define_user_file ($1, $2, &$3, $4);
+	    if (yychar != YYEMPTY)
+	      YYERROR;
+	    rcparse_discard_strings ();
+	  }
+	;
+
+toolbar:
+	id TOOLBAR suboptions numexpr cnumexpr BEG toolbar_data END
+	{
+	  define_toolbar ($1, &$3, $4, $5, $7);
+	}
+	;
+
+toolbar_data: /* empty */ { $$= NULL; }
+	| toolbar_data BUTTON id
+	{
+	  rc_toolbar_item *c,*n;
+	  c = $1;
+	  n= (rc_toolbar_item *)
+	      res_alloc (sizeof (rc_toolbar_item));
+	  if (c != NULL)
+	    while (c->next != NULL)
+	      c = c->next;
+	  n->prev = c;
+	  n->next = NULL;
+	  if (c != NULL)
+	    c->next = n;
+	  n->id = $3;
+	  if ($1 == NULL)
+	    $$ = n;
+	  else
+	    $$ = $1;
+	}
+	| toolbar_data SEPARATOR
+	{
+	  rc_toolbar_item *c,*n;
+	  c = $1;
+	  n= (rc_toolbar_item *)
+	      res_alloc (sizeof (rc_toolbar_item));
+	  if (c != NULL)
+	    while (c->next != NULL)
+	      c = c->next;
+	  n->prev = c;
+	  n->next = NULL;
+	  if (c != NULL)
+	    c->next = n;
+	  n->id.named = 0;
+	  n->id.u.id = 0;
+	  if ($1 == NULL)
+	    $$ = n;
+	  else
+	    $$ = $1;
+	}
+	;
+
+/* Versioninfo resources.  */
+
+versioninfo:
+	  id VERSIONINFO fixedverinfo BEG verblocks END
+	  {
+	    define_versioninfo ($1, language, $3, $5);
+	    if (yychar != YYEMPTY)
+	      YYERROR;
+	    rcparse_discard_strings ();
+	  }
+	;
+
+fixedverinfo:
+	  /* empty */
+	  {
+	    $$ = ((rc_fixed_versioninfo *)
+		  res_alloc (sizeof (rc_fixed_versioninfo)));
+	    memset ($$, 0, sizeof (rc_fixed_versioninfo));
+	  }
+	| fixedverinfo FILEVERSION numexpr cnumexpr cnumexpr cnumexpr
+	  {
+	    $1->file_version_ms = ($3 << 16) | $4;
+	    $1->file_version_ls = ($5 << 16) | $6;
+	    $$ = $1;
+	  }
+	| fixedverinfo PRODUCTVERSION numexpr cnumexpr cnumexpr cnumexpr
+	  {
+	    $1->product_version_ms = ($3 << 16) | $4;
+	    $1->product_version_ls = ($5 << 16) | $6;
+	    $$ = $1;
+	  }
+	| fixedverinfo FILEFLAGSMASK numexpr
+	  {
+	    $1->file_flags_mask = $3;
+	    $$ = $1;
+	  }
+	| fixedverinfo FILEFLAGS numexpr
+	  {
+	    $1->file_flags = $3;
+	    $$ = $1;
+	  }
+	| fixedverinfo FILEOS numexpr
+	  {
+	    $1->file_os = $3;
+	    $$ = $1;
+	  }
+	| fixedverinfo FILETYPE numexpr
+	  {
+	    $1->file_type = $3;
+	    $$ = $1;
+	  }
+	| fixedverinfo FILESUBTYPE numexpr
+	  {
+	    $1->file_subtype = $3;
+	    $$ = $1;
+	  }
+	;
+
+/* To handle verblocks successfully, the lexer handles BLOCK
+   specially.  A BLOCK "StringFileInfo" is returned as
+   BLOCKSTRINGFILEINFO.  A BLOCK "VarFileInfo" is returned as
+   BLOCKVARFILEINFO.  A BLOCK with some other string returns BLOCK
+   with the string as the value.  */
+
+verblocks:
+	  /* empty */
+	  {
+	    $$ = NULL;
+	  }
+	| verblocks BLOCKSTRINGFILEINFO BEG BLOCK BEG vervals END END
+	  {
+	    $$ = append_ver_stringfileinfo ($1, $4, $6);
+	  }
+	| verblocks BLOCKVARFILEINFO BEG VALUE res_unicode_string_concat vertrans END
+	  {
+	    $$ = append_ver_varfileinfo ($1, $5, $6);
+	  }
+	;
+
+vervals:
+	  /* empty */
+	  {
+	    $$ = NULL;
+	  }
+	| vervals VALUE res_unicode_string_concat ',' res_unicode_string_concat
+	  {
+	    $$ = append_verval ($1, $3, $5);
+	  }
+	;
+
+vertrans:
+	  /* empty */
+	  {
+	    $$ = NULL;
+	  }
+	| vertrans cnumexpr cnumexpr
+	  {
+	    $$ = append_vertrans ($1, $2, $3);
+	  }
+	;
+
+/* A resource ID.  */
+
+id:
+	  posnumexpr
+	  {
+	    $$.named = 0;
+	    $$.u.id = $1;
+	  }
+	| resname
+	  {
+	    res_unistring_to_id (&$$, $1);
+	  }
+	;
+
+/* A resource reference.  */
+
+resname:
+	  res_unicode_string
+	  {
+	    $$ = $1;
+	  }
+	| STRING
+	  {
+	    unichar *h = NULL;
+	    unicode_from_ascii ((rc_uint_type *) NULL, &h, $1);
+	    $$ = h;
+	  }
+	;
+
+
+resref:
+	  posnumexpr ','
+	  {
+	    $$.named = 0;
+	    $$.u.id = $1;
+	  }
+	| resname
+	  {
+	    res_unistring_to_id (&$$, $1);
+	  }
+	| resname ','
+	  {
+	    res_unistring_to_id (&$$, $1);
+	  }
+	;
+
+/* Generic suboptions.  These may appear before the BEGIN in any
+   multiline statement.  */
+
+suboptions:
+	  /* empty */
+	  {
+	    memset (&$$, 0, sizeof (rc_res_res_info));
+	    $$.language = language;
+	    /* FIXME: Is this the right default?  */
+	    $$.memflags = MEMFLAG_MOVEABLE | MEMFLAG_PURE | MEMFLAG_DISCARDABLE;
+	  }
+	| suboptions memflag
+	  {
+	    $$ = $1;
+	    $$.memflags |= $2.on;
+	    $$.memflags &=~ $2.off;
+	  }
+	| suboptions CHARACTERISTICS numexpr
+	  {
+	    $$ = $1;
+	    $$.characteristics = $3;
+	  }
+	| suboptions LANGUAGE numexpr cnumexpr
+	  {
+	    $$ = $1;
+	    $$.language = $3 | ($4 << SUBLANG_SHIFT);
+	  }
+	| suboptions VERSIONK numexpr
+	  {
+	    $$ = $1;
+	    $$.version = $3;
+	  }
+	;
+
+/* Memory flags which default to MOVEABLE and DISCARDABLE.  */
+
+memflags_move_discard:
+	  /* empty */
+	  {
+	    memset (&$$, 0, sizeof (rc_res_res_info));
+	    $$.language = language;
+	    $$.memflags = MEMFLAG_MOVEABLE | MEMFLAG_DISCARDABLE;
+	  }
+	| memflags_move_discard memflag
+	  {
+	    $$ = $1;
+	    $$.memflags |= $2.on;
+	    $$.memflags &=~ $2.off;
+	  }
+	;
+
+/* Memory flags which default to MOVEABLE.  */
+
+memflags_move:
+	  /* empty */
+	  {
+	    memset (&$$, 0, sizeof (rc_res_res_info));
+	    $$.language = language;
+	    $$.memflags = MEMFLAG_MOVEABLE | MEMFLAG_PURE | MEMFLAG_DISCARDABLE;
+	  }
+	| memflags_move memflag
+	  {
+	    $$ = $1;
+	    $$.memflags |= $2.on;
+	    $$.memflags &=~ $2.off;
+	  }
+	;
+
+/* Memory flags.  This returns a struct with two integers, because we
+   sometimes want to set bits and we sometimes want to clear them.  */
+
+memflag:
+	  MOVEABLE
+	  {
+	    $$.on = MEMFLAG_MOVEABLE;
+	    $$.off = 0;
+	  }
+	| FIXED
+	  {
+	    $$.on = 0;
+	    $$.off = MEMFLAG_MOVEABLE;
+	  }
+	| PURE
+	  {
+	    $$.on = MEMFLAG_PURE;
+	    $$.off = 0;
+	  }
+	| IMPURE
+	  {
+	    $$.on = 0;
+	    $$.off = MEMFLAG_PURE;
+	  }
+	| PRELOAD
+	  {
+	    $$.on = MEMFLAG_PRELOAD;
+	    $$.off = 0;
+	  }
+	| LOADONCALL
+	  {
+	    $$.on = 0;
+	    $$.off = MEMFLAG_PRELOAD;
+	  }
+	| DISCARDABLE
+	  {
+	    $$.on = MEMFLAG_DISCARDABLE;
+	    $$.off = 0;
+	  }
+	;
+
+/* A file name.  */
+
+file_name:
+	  QUOTEDSTRING
+	  {
+	    $$ = $1;
+	  }
+	| STRING
+	  {
+	    $$ = $1;
+	  }
+	;
+
+/* Concat string */
+res_unicode_string_concat:
+	  res_unicode_string
+	  {
+	    $$ = $1;
+	  }
+	|
+	  res_unicode_string_concat res_unicode_string
+	  {
+	    rc_uint_type l1 = unichar_len ($1);
+	    rc_uint_type l2 = unichar_len ($2);
+	    unichar *h = (unichar *) res_alloc ((l1 + l2 + 1) * sizeof (unichar));
+	    if (l1 != 0)
+	      memcpy (h, $1, l1 * sizeof (unichar));
+	    if (l2 != 0)
+	      memcpy (h + l1, $2, l2  * sizeof (unichar));
+	    h[l1 + l2] = 0;
+	    $$ = h;
+	  }
+	;
+
+res_unicode_string:
+	  QUOTEDUNISTRING
+	  {
+	    $$ = unichar_dup ($1);
+	  }
+	| QUOTEDSTRING
+	  {
+	    unichar *h = NULL;
+	    unicode_from_ascii ((rc_uint_type *) NULL, &h, $1);
+	    $$ = h;
+	  }
+	;
+
+sizedstring:
+	  SIZEDSTRING
+	  {
+	    $$ = $1;
+	  }
+	| sizedstring SIZEDSTRING
+	  {
+	    rc_uint_type l = $1.length + $2.length;
+	    char *h = (char *) res_alloc (l);
+	    memcpy (h, $1.s, $1.length);
+	    memcpy (h + $1.length, $2.s, $2.length);
+	    $$.s = h;
+	    $$.length = l;
+	  }
+	;
+
+sizedunistring:
+	  SIZEDUNISTRING
+	  {
+	    $$ = $1;
+	  }
+	| sizedunistring SIZEDUNISTRING
+	  {
+	    rc_uint_type l = $1.length + $2.length;
+	    unichar *h = (unichar *) res_alloc (l * sizeof (unichar));
+	    memcpy (h, $1.s, $1.length * sizeof (unichar));
+	    memcpy (h + $1.length, $2.s, $2.length  * sizeof (unichar));
+	    $$.s = h;
+	    $$.length = l;
+	  }
+	;
+
+/* A style expression.  This changes the static variable STYLE.  We do
+   it this way because rc appears to permit a style to be set to
+   something like
+       WS_GROUP | NOT WS_TABSTOP
+   to mean that a default of WS_TABSTOP should be removed.  Anything
+   which wants to accept a style must first set STYLE to the default
+   value.  The styleexpr nonterminal will change STYLE as specified by
+   the user.  Note that we do not accept arbitrary expressions here,
+   just numbers separated by '|'.  */
+
+styleexpr:
+	  parennumber
+	  {
+	    style |= $1;
+	  }
+	| NOT parennumber
+	  {
+	    style &=~ $2;
+	  }
+	| styleexpr '|' parennumber
+	  {
+	    style |= $3;
+	  }
+	| styleexpr '|' NOT parennumber
+	  {
+	    style &=~ $4;
+	  }
+	;
+
+parennumber:
+	  NUMBER
+	  {
+	    $$ = $1.val;
+	  }
+	| '(' numexpr ')'
+	  {
+	    $$ = $2;
+	  }
+	;
+
+/* An optional expression with a leading comma.  */
+
+optcnumexpr:
+	  /* empty */
+	  {
+	    $$ = 0;
+	  }
+	| cnumexpr
+	  {
+	    $$ = $1;
+	  }
+	;
+
+/* An expression with a leading comma.  */
+
+cnumexpr:
+	  ',' numexpr
+	  {
+	    $$ = $2;
+	  }
+	;
+
+/* A possibly negated numeric expression.  */
+
+numexpr:
+	  sizednumexpr
+	  {
+	    $$ = $1.val;
+	  }
+	;
+
+/* A possibly negated expression with a size.  */
+
+sizednumexpr:
+	  NUMBER
+	  {
+	    $$ = $1;
+	  }
+	| '(' sizednumexpr ')'
+	  {
+	    $$ = $2;
+	  }
+	| '~' sizednumexpr %prec '~'
+	  {
+	    $$.val = ~ $2.val;
+	    $$.dword = $2.dword;
+	  }
+	| '-' sizednumexpr %prec NEG
+	  {
+	    $$.val = - $2.val;
+	    $$.dword = $2.dword;
+	  }
+	| sizednumexpr '*' sizednumexpr
+	  {
+	    $$.val = $1.val * $3.val;
+	    $$.dword = $1.dword || $3.dword;
+	  }
+	| sizednumexpr '/' sizednumexpr
+	  {
+	    $$.val = $1.val / $3.val;
+	    $$.dword = $1.dword || $3.dword;
+	  }
+	| sizednumexpr '%' sizednumexpr
+	  {
+	    $$.val = $1.val % $3.val;
+	    $$.dword = $1.dword || $3.dword;
+	  }
+	| sizednumexpr '+' sizednumexpr
+	  {
+	    $$.val = $1.val + $3.val;
+	    $$.dword = $1.dword || $3.dword;
+	  }
+	| sizednumexpr '-' sizednumexpr
+	  {
+	    $$.val = $1.val - $3.val;
+	    $$.dword = $1.dword || $3.dword;
+	  }
+	| sizednumexpr '&' sizednumexpr
+	  {
+	    $$.val = $1.val & $3.val;
+	    $$.dword = $1.dword || $3.dword;
+	  }
+	| sizednumexpr '^' sizednumexpr
+	  {
+	    $$.val = $1.val ^ $3.val;
+	    $$.dword = $1.dword || $3.dword;
+	  }
+	| sizednumexpr '|' sizednumexpr
+	  {
+	    $$.val = $1.val | $3.val;
+	    $$.dword = $1.dword || $3.dword;
+	  }
+	;
+
+/* An expression with a leading comma which does not use unary
+   negation.  */
+
+cposnumexpr:
+	  ',' posnumexpr
+	  {
+	    $$ = $2;
+	  }
+	;
+
+/* An expression which does not use unary negation.  */
+
+posnumexpr:
+	  sizedposnumexpr
+	  {
+	    $$ = $1.val;
+	  }
+	;
+
+/* An expression which does not use unary negation.  We separate unary
+   negation to avoid parsing conflicts when two numeric expressions
+   appear consecutively.  */
+
+sizedposnumexpr:
+	  NUMBER
+	  {
+	    $$ = $1;
+	  }
+	| '(' sizednumexpr ')'
+	  {
+	    $$ = $2;
+	  }
+	| '~' sizednumexpr %prec '~'
+	  {
+	    $$.val = ~ $2.val;
+	    $$.dword = $2.dword;
+	  }
+	| sizedposnumexpr '*' sizednumexpr
+	  {
+	    $$.val = $1.val * $3.val;
+	    $$.dword = $1.dword || $3.dword;
+	  }
+	| sizedposnumexpr '/' sizednumexpr
+	  {
+	    $$.val = $1.val / $3.val;
+	    $$.dword = $1.dword || $3.dword;
+	  }
+	| sizedposnumexpr '%' sizednumexpr
+	  {
+	    $$.val = $1.val % $3.val;
+	    $$.dword = $1.dword || $3.dword;
+	  }
+	| sizedposnumexpr '+' sizednumexpr
+	  {
+	    $$.val = $1.val + $3.val;
+	    $$.dword = $1.dword || $3.dword;
+	  }
+	| sizedposnumexpr '-' sizednumexpr
+	  {
+	    $$.val = $1.val - $3.val;
+	    $$.dword = $1.dword || $3.dword;
+	  }
+	| sizedposnumexpr '&' sizednumexpr
+	  {
+	    $$.val = $1.val & $3.val;
+	    $$.dword = $1.dword || $3.dword;
+	  }
+	| sizedposnumexpr '^' sizednumexpr
+	  {
+	    $$.val = $1.val ^ $3.val;
+	    $$.dword = $1.dword || $3.dword;
+	  }
+	| sizedposnumexpr '|' sizednumexpr
+	  {
+	    $$.val = $1.val | $3.val;
+	    $$.dword = $1.dword || $3.dword;
+	  }
+	;
+
+%%
+
+/* Set the language from the command line.  */
+
+void
+rcparse_set_language (int lang)
+{
+  language = lang;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/rename.c sdcc-3.2.0+dfsg/support/sdbinutils/binutils/rename.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/rename.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/rename.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,214 @@
+/* rename.c -- rename a file, preserving symlinks.
+   Copyright 1999, 2002, 2003, 2005, 2007, 2008 Free Software Foundation, Inc.
+
+   This file is part of GNU Binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bucomm.h"
+
+#include <sys/stat.h>
+
+#ifdef HAVE_GOOD_UTIME_H
+#include <utime.h>
+#else /* ! HAVE_GOOD_UTIME_H */
+#ifdef HAVE_UTIMES
+#include <sys/time.h>
+#endif /* HAVE_UTIMES */
+#endif /* ! HAVE_GOOD_UTIME_H */
+
+#if ! defined (_WIN32) || defined (__CYGWIN32__)
+static int simple_copy (const char *, const char *);
+
+/* The number of bytes to copy at once.  */
+#define COPY_BUF 8192
+
+/* Copy file FROM to file TO, performing no translations.
+   Return 0 if ok, -1 if error.  */
+
+static int
+simple_copy (const char *from, const char *to)
+{
+  int fromfd, tofd, nread;
+  int saved;
+  char buf[COPY_BUF];
+
+  fromfd = open (from, O_RDONLY | O_BINARY);
+  if (fromfd < 0)
+    return -1;
+#ifdef O_CREAT
+  tofd = open (to, O_CREAT | O_WRONLY | O_TRUNC | O_BINARY, 0777);
+#else
+  tofd = creat (to, 0777);
+#endif
+  if (tofd < 0)
+    {
+      saved = errno;
+      close (fromfd);
+      errno = saved;
+      return -1;
+    }
+  while ((nread = read (fromfd, buf, sizeof buf)) > 0)
+    {
+      if (write (tofd, buf, nread) != nread)
+	{
+	  saved = errno;
+	  close (fromfd);
+	  close (tofd);
+	  errno = saved;
+	  return -1;
+	}
+    }
+  saved = errno;
+  close (fromfd);
+  close (tofd);
+  if (nread < 0)
+    {
+      errno = saved;
+      return -1;
+    }
+  return 0;
+}
+#endif /* __CYGWIN32__ or not _WIN32 */
+
+/* Set the times of the file DESTINATION to be the same as those in
+   STATBUF.  */
+
+void
+set_times (const char *destination, const struct stat *statbuf)
+{
+  int result;
+
+  {
+#ifdef HAVE_GOOD_UTIME_H
+    struct utimbuf tb;
+
+    tb.actime = statbuf->st_atime;
+    tb.modtime = statbuf->st_mtime;
+    result = utime (destination, &tb);
+#else /* ! HAVE_GOOD_UTIME_H */
+#ifndef HAVE_UTIMES
+    long tb[2];
+
+    tb[0] = statbuf->st_atime;
+    tb[1] = statbuf->st_mtime;
+    result = utime (destination, tb);
+#else /* HAVE_UTIMES */
+    struct timeval tv[2];
+
+    tv[0].tv_sec = statbuf->st_atime;
+    tv[0].tv_usec = 0;
+    tv[1].tv_sec = statbuf->st_mtime;
+    tv[1].tv_usec = 0;
+    result = utimes (destination, tv);
+#endif /* HAVE_UTIMES */
+#endif /* ! HAVE_GOOD_UTIME_H */
+  }
+
+  if (result != 0)
+    non_fatal (_("%s: cannot set time: %s"), destination, strerror (errno));
+}
+
+#ifndef S_ISLNK
+#ifdef S_IFLNK
+#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
+#else
+#define S_ISLNK(m) 0
+#define lstat stat
+#endif
+#endif
+
+/* Rename FROM to TO, copying if TO is a link.
+   Return 0 if ok, -1 if error.  */
+
+int
+smart_rename (const char *from, const char *to, int preserve_dates ATTRIBUTE_UNUSED)
+{
+  bfd_boolean exists;
+  struct stat s;
+  int ret = 0;
+
+  exists = lstat (to, &s) == 0;
+
+#if defined (_WIN32) && !defined (__CYGWIN32__)
+  /* Win32, unlike unix, will not erase `to' in `rename(from, to)' but
+     fail instead.  Also, chown is not present.  */
+
+  if (exists)
+    remove (to);
+
+  ret = rename (from, to);
+  if (ret != 0)
+    {
+      /* We have to clean up here.  */
+      non_fatal (_("unable to rename '%s'; reason: %s"), to, strerror (errno));
+      unlink (from);
+    }
+#else
+  /* Use rename only if TO is not a symbolic link and has
+     only one hard link, and we have permission to write to it.  */
+  if (! exists
+      || (!S_ISLNK (s.st_mode)
+	  && S_ISREG (s.st_mode)
+	  && (s.st_mode & S_IWUSR)
+	  && s.st_nlink == 1)
+      )
+    {
+      ret = rename (from, to);
+      if (ret == 0)
+	{
+	  if (exists)
+	    {
+	      /* Try to preserve the permission bits and ownership of
+		 TO.  First get the mode right except for the setuid
+		 bit.  Then change the ownership.  Then fix the setuid
+		 bit.  We do the chmod before the chown because if the
+		 chown succeeds, and we are a normal user, we won't be
+		 able to do the chmod afterward.  We don't bother to
+		 fix the setuid bit first because that might introduce
+		 a fleeting security problem, and because the chown
+		 will clear the setuid bit anyhow.  We only fix the
+		 setuid bit if the chown succeeds, because we don't
+		 want to introduce an unexpected setuid file owned by
+		 the user running objcopy.  */
+	      chmod (to, s.st_mode & 0777);
+	      if (chown (to, s.st_uid, s.st_gid) >= 0)
+		chmod (to, s.st_mode & 07777);
+	    }
+	}
+      else
+	{
+	  /* We have to clean up here.  */
+	  non_fatal (_("unable to rename '%s'; reason: %s"), to, strerror (errno));
+	  unlink (from);
+	}
+    }
+  else
+    {
+      ret = simple_copy (from, to);
+      if (ret != 0)
+	non_fatal (_("unable to copy file '%s'; reason: %s"), to, strerror (errno));
+
+      if (preserve_dates)
+	set_times (to, &s);
+      unlink (from);
+    }
+#endif /* _WIN32 && !__CYGWIN32__ */
+
+  return ret;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/sanity.sh sdcc-3.2.0+dfsg/support/sdbinutils/binutils/sanity.sh
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/sanity.sh	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/sanity.sh	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,67 @@
+#!/bin/sh
+### quick sanity test for the binutils.
+###
+# This file was written K. Richard Pixley.
+# Copyright 2007 Free Software Foundation, Inc.
+
+# This program is part of GNU Binutils.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.  */
+
+### fail on errors
+set -e
+
+### first arg is directory in which binaries to be tested reside.
+case "$1" in
+"") BIN=. ;;
+*)  BIN="$1" ;;
+esac
+
+### size
+for i in size objdump nm ar strip ranlib ; do
+	${BIN}/size ${BIN}/$i > /dev/null
+done
+
+### objdump
+for i in size objdump nm ar strip ranlib ; do
+	${BIN}/objdump -ahifdrtxsl ${BIN}/$i > /dev/null
+done
+
+### nm
+for i in size objdump nm ar strip ranlib ; do
+	${BIN}/nm ${BIN}/$i > /dev/null
+done
+
+### strip
+TMPDIR=./binutils-$$
+mkdir ${TMPDIR}
+
+cp ${BIN}/strip ${TMPDIR}/strip
+
+for i in size objdump nm ar ranlib ; do
+	cp ${BIN}/$i ${TMPDIR}/$i
+	${BIN}/strip ${TMPDIR}/$i
+	cp ${BIN}/$i ${TMPDIR}/$i
+	${TMPDIR}/strip ${TMPDIR}/$i
+done
+
+### ar
+
+### ranlib
+
+rm -rf ${TMPDIR}
+
+exit 0
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/stamp-h.in sdcc-3.2.0+dfsg/support/sdbinutils/binutils/stamp-h.in
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/stamp-h.in	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/stamp-h.in	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1 @@
+timestamp
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/sysdep.h sdcc-3.2.0+dfsg/support/sdbinutils/binutils/sysdep.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/sysdep.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/sysdep.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,179 @@
+/* sysdep.h -- handle host dependencies for binutils
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+   2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009
+   Free Software Foundation, Inc.
+
+   This file is part of GNU Binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _BIN_SYSDEP_H
+#define _BIN_SYSDEP_H
+
+#include "alloca-conf.h"
+#include "ansidecl.h"
+#include <stdio.h>
+#include <sys/types.h>
+
+#include "bfdver.h"
+
+#include <stdarg.h>
+
+#ifdef USE_BINARY_FOPEN
+#include "fopen-bin.h"
+#else
+#include "fopen-same.h"
+#endif
+
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#else
+extern char *strchr ();
+extern char *strrchr ();
+#endif
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#else
+#ifdef HAVE_SYS_FILE_H
+#include <sys/file.h>
+#endif
+#endif
+
+#include "binary-io.h"
+
+#if !HAVE_DECL_STPCPY
+extern char *stpcpy (char *, const char *);
+#endif
+
+#if !HAVE_DECL_STRSTR
+extern char *strstr ();
+#endif
+
+#ifdef HAVE_SBRK
+#if !HAVE_DECL_SBRK
+extern char *sbrk ();
+#endif
+#endif
+
+#if !HAVE_DECL_GETENV
+extern char *getenv ();
+#endif
+
+#if !HAVE_DECL_ENVIRON
+extern char **environ;
+#endif
+
+#if !HAVE_DECL_FPRINTF
+extern int fprintf (FILE *, const char *, ...);
+#endif
+
+#if !HAVE_DECL_SNPRINTF
+extern int snprintf(char *, size_t, const char *, ...);
+#endif
+
+#if !HAVE_DECL_VSNPRINTF
+extern int vsnprintf(char *, size_t, const char *, va_list);
+#endif
+
+#ifndef O_RDONLY
+#define O_RDONLY 0
+#endif
+
+#ifndef O_RDWR
+#define O_RDWR 2
+#endif
+
+#ifndef SEEK_SET
+#define SEEK_SET 0
+#endif
+#ifndef SEEK_CUR
+#define SEEK_CUR 1
+#endif
+#ifndef SEEK_END
+#define SEEK_END 2
+#endif
+
+#ifdef HAVE_LOCALE_H
+# ifndef ENABLE_NLS
+   /* The Solaris version of locale.h always includes libintl.h.  If we have
+      been configured with --disable-nls then ENABLE_NLS will not be defined
+      and the dummy definitions of bindtextdomain (et al) below will conflict
+      with the defintions in libintl.h.  So we define these values to prevent
+      the bogus inclusion of libintl.h.  */
+#  define _LIBINTL_H
+#  define _LIBGETTEXT_H
+# endif
+# include <locale.h>
+#endif
+
+#ifdef ENABLE_NLS
+# include <libintl.h>
+# define _(String) gettext (String)
+# ifdef gettext_noop
+#  define N_(String) gettext_noop (String)
+# else
+#  define N_(String) (String)
+# endif
+#else
+# define gettext(Msgid) (Msgid)
+# define dgettext(Domainname, Msgid) (Msgid)
+# define dcgettext(Domainname, Msgid, Category) (Msgid)
+# define textdomain(Domainname) while (0) /* nothing */
+# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */
+# define _(String) (String)
+# define N_(String) (String)
+#endif
+
+/* Used by ar.c and objcopy.c.  */
+#define BUFSIZE 8192
+
+/* For PATH_MAX.  */
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
+#ifndef PATH_MAX
+/* For MAXPATHLEN.  */
+# ifdef HAVE_SYS_PARAM_H
+#  include <sys/param.h>
+# endif
+# ifndef PATH_MAX
+#  ifdef MAXPATHLEN
+#   define PATH_MAX MAXPATHLEN
+#  else
+#   define PATH_MAX 1024
+#  endif
+# endif
+#endif
+
+#endif /* _BIN_SYSDEP_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/sysinfo.y sdcc-3.2.0+dfsg/support/sdbinutils/binutils/sysinfo.y
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/sysinfo.y	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/sysinfo.y	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,429 @@
+/* Copyright 2001, 2003, 2005, 2007, 2009 Free Software Foundation, Inc.
+   Written by Steve Chamberlain of Cygnus Support (steve@cygnus.com).
+
+   This file is part of GNU binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+%{
+#include <stdio.h>
+#include <stdlib.h>
+
+static char writecode;
+static char *it;
+static int code;
+static char * repeat;
+static char *oldrepeat;
+static char *name;
+static int rdepth;
+static char *names[] = {" ","[n]","[n][m]"};
+static char *pnames[]= {"","*","**"};
+
+static int yyerror (char *s);
+extern int yylex (void);
+%}
+
+
+%union {
+ int i;
+ char *s;
+} 
+%token COND
+%token REPEAT
+%token '(' ')'
+%token <s> TYPE
+%token <s> NAME
+%token <i> NUMBER UNIT
+%type <i> attr_size 
+%type <s> attr_desc attr_id attr_type
+%%
+
+top:  {
+  switch (writecode)
+    {
+    case 'i':
+      printf("#ifdef SYSROFF_SWAP_IN\n");
+      break; 
+    case 'p':
+      printf("#ifdef SYSROFF_p\n");
+      break; 
+    case 'd':
+      break;
+    case 'g':
+      printf("#ifdef SYSROFF_SWAP_OUT\n");
+      break;
+    case 'c':
+      printf("#ifdef SYSROFF_PRINT\n");
+      printf("#include <stdio.h>\n");
+      printf("#include <stdlib.h>\n");
+      printf("#include <ansidecl.h>\n");
+      break;
+    }
+ } 
+it_list {
+  switch (writecode) {
+  case 'i':
+  case 'p':
+  case 'g':
+  case 'c':
+    printf("#endif\n");
+    break; 
+  case 'd':
+    break;
+  }
+}
+
+  ;
+
+
+it_list: it it_list
+  |
+  ;
+
+it:
+	'(' NAME NUMBER 
+      {
+	it = $2; code = $3;
+	switch (writecode) 
+	  {
+	  case 'd':
+	    printf("\n\n\n#define IT_%s_CODE 0x%x\n", it,code);
+	    printf("struct IT_%s;\n", it);
+	    printf("extern void sysroff_swap_%s_in (struct IT_%s *);\n",
+		   $2, it);
+	    printf("extern void sysroff_swap_%s_out (FILE *, struct IT_%s *);\n",
+		   $2, it);
+	    printf("extern void sysroff_print_%s_out (struct IT_%s *);\n",
+		   $2, it);
+	    printf("struct IT_%s { \n", it);
+	    break;
+	  case 'i':
+	    printf("void sysroff_swap_%s_in (struct IT_%s * ptr)\n",$2,it);
+	    printf("{\n");
+	    printf("\tunsigned char raw[255];\n");
+	    printf("\tint idx = 0;\n");
+	    printf("\tint size;\n");
+	    printf("\tmemset(raw,0,255);\n");	
+	    printf("\tmemset(ptr,0,sizeof(*ptr));\n");
+	    printf("\tsize = fillup(raw);\n");
+	    break;
+	  case 'g':
+	    printf("void sysroff_swap_%s_out (FILE * ffile, struct IT_%s * ptr)\n",$2,it);
+	    printf("{\n");
+	    printf("\tunsigned char raw[255];\n");
+	    printf("\tint idx = 16;\n");
+	    printf("\tmemset (raw, 0, 255);\n");
+	    printf("\tcode = IT_%s_CODE;\n", it);
+	    break;
+	  case 'o':
+	    printf("void sysroff_swap_%s_out (bfd * abfd, struct IT_%s * ptr)\n",$2, it);
+	    printf("{\n");
+	    printf("\tint idx = 0;\n");
+	    break;
+	  case 'c':
+	    printf("void sysroff_print_%s_out (struct IT_%s *ptr)\n",$2,it);
+	    printf("{\n");
+	    printf("itheader(\"%s\", IT_%s_CODE);\n",$2,$2);
+	    break;
+
+	  case 't':
+	    break;
+	  }
+
+      } 
+	it_field_list 
+')'
+{
+  switch (writecode) {
+  case 'd': 
+    printf("};\n");
+    break;
+  case 'g':
+    printf("\tchecksum(ffile,raw, idx, IT_%s_CODE);\n", it);
+    
+  case 'i':
+
+  case 'o':
+  case 'c':
+    printf("}\n");
+  }
+}
+;
+
+
+
+it_field_list:
+		it_field it_field_list
+	|	cond_it_field it_field_list	
+	|	repeat_it_field it_field_list
+	|
+	;
+
+repeat_it_field: '(' REPEAT NAME
+	{
+	  rdepth++;
+	  switch (writecode) 
+	    {
+	    case 'c':
+	      if (rdepth==1)
+	      printf("\tprintf(\"repeat %%d\\n\", %s);\n",$3);
+	      if (rdepth==2)
+	      printf("\tprintf(\"repeat %%d\\n\", %s[n]);\n",$3);
+	    case 'i':
+	    case 'g':
+	    case 'o':
+
+	      if (rdepth==1) 
+		{
+	      printf("\t{ int n; for (n = 0; n < %s; n++) {\n",    $3);
+	    }
+	      if (rdepth == 2) {
+	      printf("\t{ int m; for (m = 0; m < %s[n]; m++) {\n",    $3);
+	    }		
+
+	      break;
+	    }
+
+	  oldrepeat = repeat;
+         repeat = $3;
+	}
+
+	 it_field_list ')' 
+
+	{
+	  repeat = oldrepeat;
+	  oldrepeat =0;
+	  rdepth--;
+	  switch (writecode)
+	    {
+	    case 'i':
+	    case 'g':
+	    case 'o':
+	    case 'c':
+	  printf("\t}}\n");
+	}
+	}
+       ;
+
+
+cond_it_field: '(' COND NAME
+	{
+	  switch (writecode) 
+	    {
+	    case 'i':
+	    case 'g':
+	    case 'o':
+	    case 'c':
+	      printf("\tif (%s) {\n", $3);
+	      break;
+	    }
+	}
+
+	 it_field_list ')' 
+	{
+	  switch (writecode)
+	    {
+	    case 'i':
+	    case 'g':
+	    case 'o':
+	    case 'c':
+	  printf("\t}\n");
+	}
+	}
+       ;
+
+it_field:
+	'(' attr_desc '(' attr_type attr_size ')' attr_id 
+	{name = $7; } 
+	enums ')'
+	{
+	  char *desc = $2;
+	  char *type = $4;
+	  int size = $5;
+	  char *id = $7;
+char *p = names[rdepth];
+char *ptr = pnames[rdepth];
+	  switch (writecode) 
+	    {
+	    case 'g':
+	      if (size % 8) 
+		{
+		  
+		  printf("\twriteBITS(ptr->%s%s,raw,&idx,%d);\n",
+			 id,
+			 names[rdepth], size);
+
+		}
+	      else {
+		printf("\twrite%s(ptr->%s%s,raw,&idx,%d,ffile);\n",
+		       type,
+		       id,
+		       names[rdepth],size/8);
+		}
+	      break;	      
+	    case 'i':
+	      {
+
+		if (rdepth >= 1)
+
+		  {
+		    printf("if (!ptr->%s) ptr->%s = (%s*)xcalloc(%s, sizeof(ptr->%s[0]));\n", 
+			   id, 
+			   id,
+			   type,
+			   repeat,
+			   id);
+		  }
+
+		if (rdepth == 2)
+		  {
+		    printf("if (!ptr->%s[n]) ptr->%s[n] = (%s**)xcalloc(%s[n], sizeof(ptr->%s[n][0]));\n", 
+			   id, 
+			   id,
+			   type,
+			   repeat,
+			   id);
+		  }
+
+	      }
+
+	      if (size % 8) 
+		{
+		  printf("\tptr->%s%s = getBITS(raw,&idx, %d,size);\n",
+			 id,
+			 names[rdepth], 
+			 size);
+		}
+	      else {
+		printf("\tptr->%s%s = get%s(raw,&idx, %d,size);\n",
+		       id,
+		       names[rdepth],
+		       type,
+		       size/8);
+		}
+	      break;
+	    case 'o':
+	      printf("\tput%s(raw,%d,%d,&idx,ptr->%s%s);\n", type,size/8,size%8,id,names[rdepth]);
+	      break;
+	    case 'd':
+	      if (repeat) 
+		printf("\t/* repeat %s */\n", repeat);
+
+		  if (type[0] == 'I') {
+		  printf("\tint %s%s; \t/* %s */\n",ptr,id, desc);
+		}
+		  else if (type[0] =='C') {
+		  printf("\tchar %s*%s;\t /* %s */\n",ptr,id, desc);
+		}
+	      else {
+		printf("\tbarray %s%s;\t /* %s */\n",ptr,id, desc);
+	      }
+		  break;
+		case 'c':
+	      printf("tabout();\n");
+		  printf("\tprintf(\"/*%-30s*/ ptr->%s = \");\n", desc, id);
+
+		  if (type[0] == 'I')
+		  printf("\tprintf(\"%%d\\n\",ptr->%s%s);\n", id,p);
+		  else   if (type[0] == 'C')
+		  printf("\tprintf(\"%%s\\n\",ptr->%s%s);\n", id,p);
+
+		  else   if (type[0] == 'B') 
+		    {
+		  printf("\tpbarray(&ptr->%s%s);\n", id,p);
+		}
+	      else abort();
+		  break;
+		}
+	}
+
+	;
+
+
+attr_type:	
+	 TYPE { $$ = $1; }
+ 	|  { $$ = "INT";}
+	;
+
+attr_desc: 
+	'(' NAME ')'	
+	{ $$ = $2; }
+	;
+
+attr_size:
+	 NUMBER UNIT 
+	{ $$ = $1 * $2; }
+	;
+
+
+attr_id:
+		'(' NAME ')'	{ $$ = $2; }
+	|	{ $$ = "dummy";}
+	;	
+	
+enums: 
+	| '(' enum_list ')' ;
+
+enum_list:
+	|
+	enum_list '(' NAME NAME ')' { 
+	  switch (writecode) 
+	    {
+	    case 'd':
+	      printf("#define %s %s\n", $3,$4);
+	      break;
+	    case 'c':
+		printf("if (ptr->%s%s == %s) { tabout(); printf(\"%s\\n\");}\n", name, names[rdepth],$4,$3);
+	    }
+	}
+
+	;
+
+
+
+%%
+/* four modes
+
+   -d write structure definitions for sysroff in host format
+   -i write functions to swap into sysroff format in
+   -o write functions to swap into sysroff format out
+   -c write code to print info in human form */
+
+int yydebug;
+
+int 
+main (int ac, char **av)
+{
+  yydebug=0;
+  if (ac > 1)
+    writecode = av[1][1];
+if (writecode == 'd')
+  {
+    printf("typedef struct { unsigned char *data; int len; } barray; \n");
+    printf("typedef  int INT;\n");
+    printf("typedef  char * CHARS;\n");
+
+  }
+  yyparse();
+return 0;
+}
+
+static int
+yyerror (char *s)
+{
+  fprintf(stderr, "%s\n" , s);
+  return 0;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/syslex.l sdcc-3.2.0+dfsg/support/sdbinutils/binutils/syslex.l
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/syslex.l	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/syslex.l	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,83 @@
+%option noinput nounput
+
+%{
+/* Copyright 2001, 2003, 2005, 2007, 2011 Free Software Foundation, Inc.
+
+   This file is part of GNU Binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GLD; see the file COPYING.  If not, write to the Free
+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#include "config.h"
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+#include "sysinfo.h"
+
+#ifndef YY_NO_UNPUT
+#define YY_NO_UNPUT
+#endif
+
+#ifndef yywrap
+static int yywrap (void) { return 1; }
+#endif
+
+extern int yylex (void);
+%}
+%%
+"(" { return '(';}
+")" { return ')';}
+"[" { return '[';}
+"]" { return ']';}
+" " { ; }
+";".* { ; } 
+"\t" { ; }
+"\n" { ; }
+"\""[^\"]*"\"" {
+	yylval.s = malloc (yyleng - 1);
+	memcpy (yylval.s, yytext + 1, yyleng - 2);
+	yylval.s[yyleng - 2] = '\0';
+        return NAME;
+	}
+
+0x[0-9a-f]+ {
+        yylval.i = strtol(yytext,0,16);
+	return  NUMBER;
+	}
+
+[0-9]+ {
+        yylval.i = atoi(yytext);
+	return  NUMBER;
+	}
+
+
+"bits" { yylval.i =1 ;return UNIT;}
+"bit" { yylval.i = 1; return UNIT;}
+"bytes" { yylval.i= 8; return UNIT;}
+"byte" { yylval.i = 8; return UNIT;}
+
+"int" { yylval.s = "INT"; return TYPE;}
+"barray" { yylval.s = "BARRAY"; return TYPE;}
+"chars" { yylval.s = "CHARS"; return TYPE;}
+"variable" { yylval.i = 0; return NUMBER;}
+"counted" { yylval.i = -4; return NUMBER;}
+"addrsize" { yylval.i = -2; return NUMBER; }
+"segsize" { yylval.i = -1; return NUMBER; }
+"cond" { return COND;}
+"repeat" { return REPEAT;}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/sysroff.info sdcc-3.2.0+dfsg/support/sdbinutils/binutils/sysroff.info
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/sysroff.info	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/sysroff.info	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,504 @@
+("cs" 0x0
+ (("size") (1 byte) ("size"))
+
+ (("hd") (1 byte) ("hd"))
+ (("hs") (1 byte) ("hs"))
+ (("un") (1 byte) ("un"))
+ (("us") (1 byte) ("us"))
+
+ (("sc") (1 byte) ("sc"))
+ (("ss") (1 byte) ("ss"))
+ (("er") (1 byte) ("er"))
+ (("ed") (1 byte) ("ed"))
+
+ (("sh") (1 byte) ("sh"))
+ (("ob") (1 byte) ("ob"))
+ (("rl") (1 byte) ("rl"))
+ (("du") (1 byte) ("du"))
+
+ (("dps") (1 byte) ("dps"))
+ (("dsy") (1 byte) ("dsy"))
+ (("dty") (1 byte) ("dty"))
+ (("dln") (1 byte) ("dln"))
+
+ (("dso") (1 byte) ("dso"))
+ (("dus") (1 byte) ("dus"))
+ (("dss") (1 byte) ("dss"))
+ (("dbt") (1 byte) ("dbt"))
+
+ (("dpp") (1 byte) ("dpp"))
+ (("dfp") (1 byte) ("dfp"))
+ (("den") (1 byte) ("den"))
+ (("dds") (1 byte) ("dds"))
+
+ (("dar") (1 byte) ("dar"))
+ (("dpt") (1 byte) ("dpt"))
+ (("dul") (1 byte) ("dul"))
+ (("dse") (1 byte) ("dse"))
+
+ (("dot") (1 byte) ("dot")))
+
+
+("hd" 0x04
+ (("module type") (4 bits) ("mt")
+  (("MTYPE_ABS_LM" 	"0")
+   ("MTYPE_REL_LM" 	"1")
+   ("MTYPE_OMS_OR_LMS" 	"2")
+   ("MTYPE_UNSPEC" 	"0xf")))
+ (("spare")(4 bits) ("spare1"))
+ (("creation date")( chars 12 bytes)( "cd"))
+ (("number of units") (2 bytes) ("nu"))
+ (("code") (1 byte) ("code"))
+ (("version") (chars 4 bytes) ("ver"))
+ (("address update") (1 byte) ("au"))
+ (("segment identifier") (1 bit) ("si"))
+ (("address field length") (4 bits) ("afl"))
+ (("spare")(3 bits) ("spare2"))
+ (("space size within segment") (1 byte) ("spcsz"))
+ (("segment size")  	(1 byte) ("segsz"))
+ (("segment shift") 	(1 byte) ("segsh"))
+ (("entry point") 	(1 byte) ("ep"))
+ (cond "ptr->ep"
+       (cond "ptr->mt != MTYPE_ABS_LM" 
+	     (("unit appearance number") (2 bytes) ("uan"))
+	     (("section appearance number") (2 bytes) ("sa")))
+       (cond "segmented_p"
+	     (("segment address") (segsize bytes) ("sad")))
+       (("address") (addrsize bytes) ("address")))
+ (("os name") (chars variable bytes) ("os"))
+ (("sys name") (chars variable bytes) ("sys"))
+ (("module name") (chars variable bytes) ("mn"))
+ (("cpu") (chars variable bytes) ("cpu")))
+
+
+("hs" 0x05
+ (("neg number") (2 bytes) ("neg")))
+
+
+("un" 0x06
+ (("format") (2 bits) ("format")
+  (("FORMAT_LM" "0")
+   ("FORMAT_OM" "1")
+   ("FORMAT_OMS_OR_LMS" "2")))
+ (("spare") (6 bits) ("spare1"))
+ (("number of sections") (2 bytes) ("nsections"))
+ (("number of external refs") (2 bytes) ("nextrefs"))
+ (("number of external defs") (2 bytes) ("nextdefs"))
+ (("unit name") (chars variable byte) ("name"))
+ (("tool name") (chars variable byte) ("tool"))
+ (("creation date") (chars 12 bytes) ("tcd"))
+ (("linker name") (chars variable byte) ("linker"))
+ (("creation date") (chars 12 bytes) ("lcd")))
+
+
+("us" 0x07
+ (("negotiation number") (2 bytes) ("neg")))
+
+
+("sc" 0x08
+ (("format") (2 bits) ("format"))	
+ (("spare") (6 bits) ("spare"))
+ (("segment address") (segsize bytes) ("segadd"))
+ (("address") (addrsize bytes) ("addr"))
+ (("length") (addrsize bytes) ("length"))
+ (("alignment") (addrsize bytes) ("align"))
+ (("contents") (4 bits) ("contents")
+  (("CONTENTS_CODE" "0")
+   ("CONTENTS_DATA" "1")
+   ("CONTENTS_STACK" "2")
+   ("CONTENTS_DUMMY" "3")
+   ("CONTENTS_SPECIAL" "4")
+   ("CONTENTS_NONSPEC" "0xf")))
+ (("concat") (4 bits) ("concat")
+  (("CONCAT_SIMPLE" "0")
+   ("CONCAT_SHAREDC" "1")
+   ("CONCAT_DUMMY" "2")
+   ("CONCAT_GROUP" "3")
+   ("CONCAT_SHARED" "4")
+   ("CONCAT_PRIVATE" "5")
+   ("CONCAT_UNSPEC" "0xf")))
+ (("read") (2 bits) ("read"))
+ (("write") (2 bits) ("write"))
+ (("exec") (2 bits) ("exec"))
+ (("initialized") (2 bits) ("init"))
+ (("mode") (2 bits) ("mode"))
+ (("spare") (6 bits) ("spare1"))
+ (("name") (chars variable byte) ("name")))
+
+
+("ss" 0x09
+ (("neg number") (2 bytes) ("neg")))
+
+	
+("er" 0x0c
+ (("symbol type") (2 bits) ("type")
+  (("ER_ENTRY" "0")
+   ("ER_DATA" "1")
+   ("ER_NOTDEF" "2")
+   ("ER_NOTSPEC" "3")))
+ (("spare") (6 bits) ("spare"))
+ (("symbol name") (chars variable byte) ("name")))
+	
+
+("ed" 0x14
+ (("section appearance number") (2 bytes) ("section"))
+ (("symbol type") (3 bits) ("type")
+  (("ED_TYPE_ENTRY" "0")
+   ("ED_TYPE_DATA" "1")
+   ("ED_TYPE_CONST" "2")
+   ("ED_TYPE_NOTSPEC" "7")))
+ (("spare") (5 bits) ("spare"))
+ (cond "ptr->type==ED_TYPE_ENTRY || ptr->type==ED_TYPE_DATA"
+       (("symbol address") (addrsize bytes) ("address")))
+ (cond "ptr->type==ED_TYPE_CONST"
+       (("constant value") (addrsize bytes) ("constant")))
+ (("symbol name") (chars variable byte) ("name")))
+
+
+("sh" 0x1a
+ (("unit appearance number") (2 bytes) ("unit"))
+ (("section appearance number") (2 bytes) ("section")))
+
+
+("ob" 0x1c
+ (("starting address flag") (1 bit) ("saf"))
+ (("compression flag") (1 bit) ("cpf"))
+ (("spare") (6 bits) ("spare"))
+ (cond "ptr->saf"
+       ( ("starting address") (addrsize bytes) ("address")))
+ (cond "ptr->cpf"
+       (("comp reps") (addrsize bytes) ("compreps")))
+ (("data") (barray counted byte) ("data")))
+	
+
+("rl" 0x20
+ (("boundary of relocatable area") (4 bits) ("boundary"))
+ (("address polarity") (1 bit) ("apol"))
+ (("segment number") (1 bit) ("segment"))
+ (("sign of relocation") (1 bit) ("sign"))
+ (("check range") (1 bit) ("check"))
+ (("reloc address") (addrsize bytes) ("addr"))
+
+ (("bit loc") (1 byte) ("bitloc"))
+ (("field length") (1 byte) ("flen"))
+ (("bcount") (1 byte) ("bcount"))
+ (("operator") (1 byte) ("op")
+  (("OP_RELOC_ADDR" "1")
+   ("OP_SEC_REF" "0")
+   ("OP_EXT_REF" "2")))
+ (cond "ptr->op == OP_EXT_REF"
+       (("symbol number") (2 bytes) ("symn"))	)
+	
+ (cond "ptr->op == OP_SEC_REF"
+       (("section number") (2 bytes) ("secn"))
+       (("const opcode") (1 byte) ("copcode_is_3"))
+       (("addend length") (1 byte) ("alength_is_4"))
+       (("addend") (4 byte) ("addend"))
+       (("plus opcode") (1 byte) ("aopcode_is_0x20")))
+
+ (cond "ptr->op == OP_RELOC_ADDR"
+       (("dunno") (2 bytes) ("dunno")))
+
+ (("end")  (1 byte) ("end")))
+	
+
+("du" 0x30
+ (("format") (2 bits) ("format"))
+ (("optimized") (1 bit) ("optimized"))
+ (("stackfrmt") (2 bits) ("stackfrmt"))
+ (("spare") (3 bits) ("spare"))
+ (("unit number") (2 bytes) ("unit"))
+ (("sections") (2 bytes) ("sections"))
+ (repeat "ptr->sections"
+	 (("section appearance number") (2 bytes) ("san"))
+	 (("address") (addrsize bytes) ("address"))
+	 (("section length") (addrsize bytes) ("length")))
+ (("tool name") (chars variable byte) ("tool"))
+ (("creation date") (chars 12 bytes) ("date")))
+
+
+("dsy" 0x34
+ (("symbol type") (7 bits) ("type")
+  (("STYPE_VAR" "0")
+   ("STYPE_LAB" "1")
+   ("STYPE_PROC" "2")
+   ("STYPE_FUNC" "3")
+   ("STYPE_TYPE" "4")
+   ("STYPE_CONST" "5")
+   ("STYPE_ENTRY" "6")
+   ("STYPE_MEMBER" "7")
+   ("STYPE_ENUM" "8")
+   ("STYPE_TAG" "9")
+   ("STYPE_PACKAGE" "10")
+   ("STYPE_GENERIC" "11")
+   ("STYPE_TASK" "12")
+   ("STYPE_EXCEPTION" "13")
+   ("STYPE_PARAMETER" "14")
+   ("STYPE_EQUATE" "15")
+   ("STYPE_UNSPEC" "0x7f")))
+ (("assignment info") (1 bit) ("assign"))
+ (("symbol id") (2 bytes) ("snumber"))
+ (("symbol name") (chars variable bytes) ("sname"))
+ (("nesting level") (2 bytes) ("nesting"))
+ (cond "ptr->assign"
+       (("assignment type") (1 byte)  ("ainfo")
+	(("AINFO_REG" "1")
+	 ("AINFO_STATIC_EXT_DEF" "2")
+	 ("AINFO_STATIC_EXT_REF" "3")
+	 ("AINFO_STATIC_INT" "4")
+	 ("AINFO_STATIC_COM" "5")
+	 ("AINFO_AUTO" "6")
+	 ("AINFO_CONST" "7")
+	 ("AINFO_UNSPEC" "0xff")))
+       (("data length") (addrsize bytes) ("dlength"))
+       (cond "ptr->ainfo == AINFO_STATIC_EXT_DEF
+            || ptr->ainfo == AINFO_STATIC_INT
+            || ptr->ainfo == AINFO_STATIC_COM"
+	     (("section number")  (2 bytes) ("section")))
+       (cond "ptr->ainfo == AINFO_STATIC_EXT_DEF
+            || ptr->ainfo == AINFO_STATIC_INT
+            || ptr->ainfo == AINFO_STATIC_COM
+            || ptr->ainfo == AINFO_AUTO"
+	     (("address") (addrsize bytes) ("address")))
+       (cond "ptr->ainfo == AINFO_REG"
+	     (("register name") (chars variable bytes) ("reg")))
+       (cond "ptr->ainfo == AINFO_STATIC_EXT_DEF
+	    || ptr->ainfo == AINFO_STATIC_EXT_REF"
+	     (("external name") (chars variable bytes) ("ename")))
+       (cond "ptr->ainfo == AINFO_CONST"
+	     (("constant") (chars variable bytes) ("constant"))))
+ (cond "ptr->type == STYPE_MEMBER"
+       (("assignment unit") (1 bit) ("bitunit"))
+       (("spare") (7 bits) ("spare2"))
+       (("field length") (addrsize bytes) ("field_len"))
+       (("field offset") (addrsize bytes) ("field_off"))
+       (cond "ptr->bitunit"
+	     (("bit offset") (addrsize bytes) ("field_bitoff"))))
+ (cond "ptr->type== STYPE_ENUM"
+       (("value length") (1 byte) ("evallen"))
+       (("value") (4 bytes) ("evalue")))
+ (cond "ptr->type == STYPE_CONST"
+       (("value") (chars variable bytes) ("cvalue")))
+ (cond "ptr->type == STYPE_EQUATE"
+       (("value length") (1 byte) ("qvallen"))
+       (("value") (4 bytes) ("qvalue"))
+       (("basic type") (1 byte) ("btype"))
+       (("size information") (addrsize bytes) ("sizeinfo"))
+       (("sign") (2 bits) ("sign"))
+       (("floating point type") (6 bits) ("flt_type")))
+ (("source file number") (2 bytes) ("sfn"))
+ (("source line number") (2 bytes) ("sln"))
+ (("negotiation number") (2 bytes) ("neg"))
+ (cond "ptr->type == STYPE_TAG"
+       (("magic") (1 byte) ("magic"))))
+
+ 
+
+("dul" 0x52
+ (("max declaration type flag") (1 bit) ("max_variable"))
+ (("max spare") (7 bits) ("maxspare"))
+ (cond "ptr->max_variable == 0"
+       (("maximum") (addrsize bytes) ("max"))
+       (("max mode") (chars variable bytes) ("maxmode")))
+
+ (("min declaration type flag") (1 bit) ("min_variable"))
+ (("min spare") (7 bits) ("minspare"))
+ (cond "ptr->min_variable == 0"
+       (("minimum") (addrsize bytes) ("min"))
+       (("min mode") (chars variable bytes) ("minmode"))))
+
+
+("dty" 0x36
+ (("end flag") (1 bit) ("end"))
+ (("spare") (7 bits) ("spare"))
+ (cond "!ptr->end"
+       (("negotiation") (2 bytes) ("neg"))))
+
+
+("dbt" 0x44
+ (("basic type") (1 byte) ("btype")
+  (("BTYPE_VOID" "0")
+   ("BTYPE_UNDEF" "1")
+   ("BTYPE_CHAR" "2")
+   ("BTYPE_INT" "3")
+   ("BTYPE_FLOAT" "4")
+   ("BTYPE_BIT" "5")
+   ("BTYPE_STRING" "6")
+   ("BTYPE_DECIMAL" "7")
+   ("BTYPE_ENUM" "8")
+   ("BTYPE_STRUCT" "9")
+   ("BTYPE_TYPE" "10")
+   ("BTYPE_TAG" "11")
+   ("BTYPE_UNSPEC" "0xff")))
+ (("size info") (addrsize bytes) ("bitsize"))
+ (("sign") (2 bits) ("sign")
+  (("SIGN_SIGNED" "0")
+   ("SIGN_UNSIGNED" "1")
+   ("SIGN_UNSPEC" "3")))
+ (("floating point type") (6 bits) ("fptype")
+  (("FPTYPE_SINGLE" "0")
+   ("FPTYPE_DOUBLE" "1")
+   ("FPTYPE_EXTENDED" "2")
+   ("FPTYPE_NOTSPEC" "0x3f")))
+ (cond "ptr->btype==BTYPE_TAG || ptr->btype == BTYPE_TYPE"
+       (("symbol id") (2 bytes) ("sid")))
+ (("negotiation") (2 bytes) ("neg")))
+
+("dar" 0x4e
+ (("element length" ) (addrsize bytes) ("length"))
+ (("dims") (1 byte) ("dims"))
+ (repeat "ptr->dims"
+	 (("variable flag") (1 bit) ("variable")
+	  (("VARIABLE_FIXED" "0")
+	   ("VARIABLE_VARIABLE" "1")))
+
+	 (("subscript type") (1 bit) ("subtype")
+	  (("SUB_INTEGER" "0")
+	   ("SUB_TYPE"    "1")))
+
+	 (("spare") (6 bits) ("spare"))
+
+	 (cond "ptr->subtype[n] == SUB_TYPE"
+	       (("sub symbol id") (2 bytes) ("sid")))
+
+	 (cond "ptr->subtype[n] == SUB_INTEGER"
+	       (("max declaration type flag") (1 bit) ("max_variable"))
+	       (("max spare") (7 bits) ("maxspare"))
+	       ;; FIXME: next field should be conditional on max_variable,
+	       (("maximum") (addrsize bytes) ("max"))
+
+	       (("min declaration type flag") (1 bit) ("min_variable"))
+	       (("min spare") (7 bits) ("minspare"))
+	       ;; FIXME: next field should be conditional on min_variable
+	       (("minimum") (addrsize bytes) ("min"))))
+ (("negotiation") (2 bytes) ("neg")))
+
+	       
+("dso" 0x3a
+ (("function name") (2 bytes) ("sid"))
+ (("sp update count") (4 bytes) ("spupdates"))
+ (repeat "ptr->spupdates"
+	 (("update address") (addrsize bytes) ("address"))
+	 (("offset") (addrsize bytes) ("offset"))))
+
+("dln" 0x38
+ (("number of lines") (2 bytes) ("nln"))
+ (repeat "ptr->nln"
+	 (("source file number") (2 bytes) ("sfn"))
+	 (("source line number") (2 bytes) ("sln"))
+	 (("section number") (2 bytes) ("section"))
+	 (("from address") (addrsize bytes) ("from_address"))
+	 (("to address") (addrsize bytes) ("to_address"))
+	 (("call count") (2 bytes) ("cc"))
+	 )
+ (("neg") (2 bytes) ("neg")))
+ 
+("dpp" 0x46
+ (("start/end") (1 bit) ("end"))
+ (("spare") (7 bits) ("spare"))
+ (cond "!ptr->end"
+       (("params") (1 byte) ("params"))
+       (("neg number") (2 bytes) ("neg"))))
+
+("den" 0x4a
+ (("start/end") (1 bit) ("end"))
+ (("spare") (7 bits) ("spare"))
+ (cond "!ptr->end"
+       (("neg number") (2 bytes) ("neg"))))
+
+("dfp" 0x48
+ (("start/end flag") (1 bit) ("end"))
+ (("spare") (7 bits) ("spare"))
+ (cond "!ptr->end"
+       (("number of parameters") (1 byte) ("nparams"))
+       (("neg number") (2 bytes) ("neg"))))
+
+("dds" 0x4c
+ (("start/end") (1 bit) ("end"))
+ (("spare") (7 bits) ("spare"))
+ (cond "!ptr->end"
+       (("neg number") (2 bytes) ("neg"))))
+
+("dpt" 0x50
+ (("neg number") (2 bytes) ("neg"))
+ (("dunno") (1 byte) ("dunno")))
+
+("dse" 0x54
+ (("neg number") (2 bytes) ("neg"))
+ (("dunno") (1 byte) ("dunno")))
+
+("dot" 0x56
+ (("unknown") (1 byte) ("unknown")))
+; FIXME: unknown field should be repeated symbol number?
+
+
+("dss" 0x42
+ (("type") (1 byte) ("type"))
+ (("external/internal") (1 bit) ("internal"))
+ (("spare") (7 bits) ("spare"))
+ (cond "!ptr->internal"
+       (  ("package name") (chars variable byte) ("package")))
+ (cond "ptr->internal"
+       (("symbol id") (2 bytes) ("id")))
+ (("record type") (2 bytes) ("record"))
+ (("rules") (chars variable byte) ("rules"))
+ (("number of symbols") (2 bytes) ("nsymbols"))
+ (("unknown" ) (2 bytes) ("fixme")))
+     
+("pss" 0x40
+ (("negotiation number") (2 bytes) ("efn"))
+ (("number of source files") (2 bytes) ("ns"))
+ (repeat "ptr->ns"
+	 (("directory reference bit") (1 bit) ("drb"))
+	 (("spare") (7 bits) ("spare"))
+	 (("completed file name") (chars variable byte) ("fname"))
+	 (cond "ptr->drb[n]" 
+	       (("directory apperance number") (2 bytes) ("dan"))))
+ 
+ (("number of directories") (2 bytes) ("ndir"))
+ (repeat "ptr->ndir"
+	 (("directory name") (chars variable bytes) ("dname"))))
+
+
+; FIXME: the tr block has no contents. sysinfo, etc. aren't prepared 
+; to deal with that.
+; ("tr" 0x7f)
+
+
+("dus" 0x40
+ (("negotiation number") (2 bytes) ("efn"))
+ (("number of source files") (2 bytes) ("ns"))
+ (repeat "ptr->ns"
+	 (("directory reference bit") (1 bit) ("drb"))
+	 (("spare") (7 bits) ("spare"))
+	 (("completed file name") (chars variable byte) ("fname"))
+	 (cond "ptr->drb[n]" 
+	       (("directory apperance number") (2 bytes) ("dan"))))
+ (("number of directories") (2 bytes) ("ndir"))
+ (repeat "ptr->ndir"
+	 (("directory name") (chars variable bytes) ("dname"))))
+
+
+("dps" 0x32
+ (("start/end flag") (1 bit) ("end"))
+ (("block type") (7 bits) ("type")
+  (("BLOCK_TYPE_COMPUNIT" "0")
+   ("BLOCK_TYPE_PROCEDURE" "2")
+   ("BLOCK_TYPE_FUNCTION" "3")
+   ("BLOCK_TYPE_BLOCK" "4")
+   ("BLOCK_TYPE_BASIC" "9")))
+ (cond "!ptr->end"
+       (("optimization") (1 byte) ("opt"))
+       (("section number") (2 bytes) ("san"))
+       (("address") (addrsize bytes) ("address"))
+       (("block size") (addrsize bytes) ("block_size"))
+       (("nesting") (1 byte) ("nesting"))
+       (cond "ptr->type == BLOCK_TYPE_PROCEDURE 
+	    || ptr->type == BLOCK_TYPE_FUNCTION"
+	     (("return address") (1 bit) ("retaddr"))
+	     (("interrupt function flag") (1 bit) ("intrflag"))
+	     (("stack update flag") (1 bit) ("stackflag"))
+	     (("intra page JMP") (1 bit) ("intrpagejmp"))
+	     (("spare") (4 bits) ("spare")))
+       (("neg number") (2 bytes) ("neg"))))
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/binutils/version.c sdcc-3.2.0+dfsg/support/sdbinutils/binutils/version.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/binutils/version.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/binutils/version.c	2012-03-01 21:43:55.000000000 +0000
@@ -0,0 +1,44 @@
+/* version.c -- binutils version information
+   Copyright 1991, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of GNU Binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+#include "bucomm.h"
+
+/* Print the version number and copyright information, and exit.
+   This implements the --version option for the various programs.  */
+
+void
+print_version (const char *name)
+{
+  /* This output is intended to follow the GNU standards document.  */
+  /* xgettext:c-format */
+  /* changed for sdbinutils */
+  /* printf ("GNU %s %s\n", name, BFD_VERSION_STRING); */
+  printf ("sd%s %s\n", name, BFD_VERSION_STRING);
+  printf (_("Copyright 2011 Free Software Foundation, Inc.\n"));
+  printf (_("\
+This program is free software; you may redistribute it under the terms of\n\
+the GNU General Public License version 3 or (at your option) any later version.\n\
+This program has absolutely no warranty.\n"));
+  exit (0);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/clog.txt sdcc-3.2.0+dfsg/support/sdbinutils/clog.txt
--- sdcc-3.1.0+dfsg/support/sdbinutils/clog.txt	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/clog.txt	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,92 @@
+checking build system type... x86_64-unknown-linux-gnu
+checking host system type... x86_64-unknown-linux-gnu
+checking target system type... x86_64-unknown-linux-gnu
+checking for a BSD-compatible install... /usr/bin/install -c
+checking whether ln works... yes
+checking whether ln -s works... yes
+checking for a sed that does not truncate output... /bin/sed
+checking for gawk... gawk
+checking for gcc... gcc
+checking for C compiler default output file name... a.out
+checking whether the C compiler works... yes
+checking whether we are cross compiling... no
+checking for suffix of executables... 
+checking for suffix of object files... o
+checking whether we are using the GNU C compiler... yes
+checking whether gcc accepts -g... yes
+checking for gcc option to accept ISO C89... none needed
+checking for g++... g++
+checking whether we are using the GNU C++ compiler... yes
+checking whether g++ accepts -g... yes
+checking for gnatbind... no
+checking for gnatmake... no
+checking whether compiler driver understands Ada... no
+checking how to compare bootstrapped objects... cmp --ignore-initial=16 $$f1 $$f2
+checking for objdir... .libs
+checking for PWL_handle_timeout in -lpwl... no
+checking for version 0.11 (revision 0 or later) of PPL... no
+checking for default BUILD_CONFIG... 
+*** removing libiberty/Makefile to force reconfigure
+*** removing bfd/Makefile to force reconfigure
+*** removing binutils/Makefile to force reconfigure
+checking for bison... bison -y
+checking for bison... bison
+checking for gm4... no
+checking for gnum4... no
+checking for m4... m4
+checking for flex... flex
+checking for flex... flex
+checking for makeinfo... makeinfo
+checking for expect... no
+checking for runtest... no
+checking for ar... ar
+checking for as... as
+checking for dlltool... no
+checking for ld... ld
+checking for lipo... no
+checking for nm... nm
+checking for ranlib... ranlib
+checking for strip... strip
+checking for windres... no
+checking for windmc... no
+checking for objcopy... objcopy
+checking for objdump... objdump
+checking for cc... cc
+checking for c++... c++
+checking for gcc... gcc
+checking for gcj... no
+checking for gfortran... no
+checking for gccgo... no
+checking for ar... ar
+checking for as... as
+checking for dlltool... no
+checking for ld... ld
+checking for lipo... no
+checking for nm... nm
+checking for objdump... objdump
+checking for ranlib... ranlib
+checking for strip... strip
+checking for windres... no
+checking for windmc... no
+checking where to find the target ar... just compiled
+checking where to find the target as... host tool
+checking where to find the target cc... host tool
+checking where to find the target c++... host tool
+checking where to find the target c++ for libstdc++... host tool
+checking where to find the target dlltool... just compiled
+checking where to find the target gcc... host tool
+checking where to find the target gcj... host tool
+checking where to find the target gfortran... host tool
+checking where to find the target gccgo... host tool
+checking where to find the target ld... host tool
+checking where to find the target lipo... host tool
+checking where to find the target nm... just compiled
+checking where to find the target objdump... just compiled
+checking where to find the target ranlib... just compiled
+checking where to find the target strip... just compiled
+checking where to find the target windres... just compiled
+checking where to find the target windmc... just compiled
+checking whether to enable maintainer-specific portions of Makefiles... no
+checking whether -fkeep-inline-functions is supported... yes
+configure: creating ./config.status
+config.status: creating Makefile
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/compile sdcc-3.2.0+dfsg/support/sdbinutils/compile
--- sdcc-3.1.0+dfsg/support/sdbinutils/compile	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/compile	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,143 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
+
+scriptversion=2009-04-28.21; # UTC
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
+# Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+esac
+
+ofile=
+cfile=
+eat=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as `compile cc -o foo foo.c'.
+	# So we strip `-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no `-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # `.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/ChangeLog sdcc-3.2.0+dfsg/support/sdbinutils/config/ChangeLog
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/ChangeLog	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/ChangeLog	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1642 @@
+2011-08-22  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* picflag.m4: New file.
+
+2011-07-18  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* elf.m4 (target_elf): Remove *-netware*.
+
+2011-04-20  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* bootstrap-lto.mk: Remove obsolete requirement.
+
+2011-03-24  Paolo Bonzini  <pbonzini@redhat.com>
+
+	* mt-mep: Remove, obsolete.
+	* mt-netware: Remove, obsolete.
+	* mt-wince: Remove, obsolete.
+	* mt-v810: Remove, unused.
+
+2011-03-24  Paolo Bonzini  <bonzini@gnu.org>
+
+	* mh-x86omitfp: Remove.
+
+2011-03-24  Paolo Bonzini  <bonzini@gnu.org>
+
+	* mh-cygwin: Remove obsolete variables and dependencies.
+
+2011-03-24  Paolo Bonzini  <bonzini@gnu.org>
+
+	* mh-sysv4: Remove.
+	* mh-solaris: Remove.
+
+2011-03-24  Paolo Bonzini  <bonzini@gnu.org>
+
+	* mh-sysv4: Remove AR_CFLAGS.
+
+2011-03-24  Joseph Myers  <joseph@codesourcery.com>
+
+	* mh-cxux, mh-decstation, mh-dgux386, mh-lynxrs6k, mh-ncr3000,
+	mh-necv4, mh-sco, mh-sysv5: Remove.
+
+2011-03-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+	    Eric Blake  <eblake@redhat.com>
+
+	* override.m4: Error out if a buggy M4 was detected, to
+	avoid spurious diffs in generated files.
+
+2011-01-25  Jakub Jelinek  <jakub@redhat.com>
+
+	* cloog.m4 (CLOOG_REQUESTED): Use $2 if --without-cloog.
+
+2011-01-10  Jan Hubicka  <jh@suse.cz>
+
+	* bootstrap-lto.mk: -fuse-linker-plugin is default now;
+	pass -fno-lto to STAGEprofile.
+
+2010-12-06  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	PR target/40125
+	PR lto/46695
+	* lthostflags.m4: New file.
+	(ACX_LT_HOST_FLAGS): Define.
+
+2010-12-02  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* mh-cygwin (LDFLAGS): Turn up stack allocation to 12MB.
+	(BOOT_LDFLAGS): Add matching stack size flag.
+	* mh-mingw (LDFLAGS): Likewise.
+	(BOOT_LDFLAGS): Likewise.
+
+2010-11-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* bootstrap-lto.mk (BOOT_ADAFLAGS): Delete.
+
+2010-11-19  Tobias Grosser  <grosser@fim.uni-passau.de>
+
+	* cloog.m4: Use AS_HELP_STRING and fix help formatting.
+
+2010-11-15  Andreas Schwab  <schwab@redhat.com>
+
+	* cloog.m4 (CLOOG_INIT_FLAGS): Fix spelling in option names.
+
+2010-11-12  Tobias Grosser  <grosser@fim.uni-passau.de>
+
+	* cloog.m4: Add -enable-cloog-backend=(isl|ppl|ppl-legacy) to
+	define the cloog backend to use. Furthermore, only pass the ppllibs to
+	the configure checks, if necessary.
+
+2010-11-12  Tobias Grosser  <grosser@fim.uni-passau.de>
+
+	* cloog.m4: Use CLooG predefined macro to check for CLooG PPL.
+
+2010-11-12  Tobias Grosser  <grosser@fim.uni-passau.de>
+
+	* cloog.m4: Fix typo.  verison -> version.
+
+2010-11-12  Tobias Grosser  <grosser@fim.uni-passau.de>
+
+	* cloog.m4: Pass ppl libraries to the CLooG version check.
+
+2010-11-11  Jan Hubicka  <jh@suse.cz>
+
+	* bootstrap-lto: Use -flto.
+
+2010-11-04  Iain Sandoe  <iains@gcc.gnu.org>
+
+	* mh-darwin: Renamed from mh-ppc-darwin.
+
+2010-06-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* po.m4 (AM_PO_SUBDIRS): Fix unportable shell quoting.
+
+2010-09-10  Jonathan Yong  <jon_y@users.sourceforge.net>
+
+	* dfp.m4: Enable decimal float for i?86 cygwin
+	and mingw, and for x86_64 mingw.
+
+2010-09-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/45524
+	* dfp.m4: Don't set enable_decimal_float to dpd if DFP is
+	disabled.  Set default_decimal_float.
+
+2010-09-06  Andreas Schwab  <schwab@redhat.com>
+
+	* dfp.m4: Quote argument of AC_MSG_WARN.
+
+2010-09-03  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* dfp.m4: New file.
+
+2010-09-01  Andi Kleen	<ak@linux.intel.com>
+
+	* bootstrap-lto.mk (STAGE2_CFLAGS, STAGE3_CFLAGS): Change
+	to -fwhopr=jobserver -fuse-linker-plugin -frandom-seed=1.
+
+2010-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	PR target/45084
+	* stdint.m4 (GCC_HEADER_STDINT): Use m4 quotes for arguments
+	of AC_MSG_ERROR.
+
+2010-07-02  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* gc++filt.m4: New file.
+
+2010-06-20  Alexandre Oliva  <aoliva@redhat.com>
+
+	* bootstrap-lto.mk: New.
+
+2010-06-10  Paolo Bonzini  <bonzini@gnu.org>
+
+	* override.m4: Remove obsolete (<2.64) definitions.
+
+2010-06-09  Iain Sandoe  <iains@gcc.gnu.org>
+
+	PR bootstrap/43170
+	* tls.m4 (GCC_CHECK_TLS): Add volatile qualifier to the test
+	references.  Move the main () test reference ahead of
+	pthread_create().  Add a comment to explain the requirements
+	of the test.
+
+2010-06-03  Joern Rennecke <joern.rennecke@embecosm.com>
+	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	PR bootstrap/42798
+	* override.m4 (_AC_CHECK_DECL_BODY, _AC_CHECK_DECLS): Import
+	definitions from git Autoconf.
+
+2010-04-13  Steve Ellcey  <sje@cup.hp.com>
+
+	* elf.m4: Add hppa[12]*-*-hpux* to list of non-elf platforms.
+
+2010-03-23  Kai Tietz  <kai.tietz@onevision.com>
+
+	* mh-mingw: Revert accidentally checking r156315.
+
+2010-01-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* stdint.m4 (GCC_HEADER_STDINT): Don't typedef uint8_t etc. if
+	corresponding macros already exist.
+
+2010-01-02  Richard Guenther  <rguenther@suse.de>
+
+	PR lto/41529
+	* elf.m4: New file.
+
+2009-11-30  Joseph Myers  <joseph@codesourcery.com>
+
+	* largefile.m4 (ACX_LARGEFILE): Require AC_CANONICAL_HOST and
+	AC_CANONICAL_TARGET.
+
+2009-11-24  Joel Brobecker  <brobecker@adacore.com>
+
+	* zlib.m4: New file.
+
+2009-11-09  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* largefile.m4 (ACX_LARGEFILE): Call AC_PLUGINS.
+
+2009-11-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
+	    Joel Brobecker  <brobecker@adacore.com>
+	    Paolo Bonzini  <bonzini@gnu.org>
+
+	* largefile.m4: New file.
+
+2009-10-23  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* acx.m4 (ACX_CHECK_CYGWIN_CAT_WORKS): Use = with test.
+
+2009-09-09  Paolo Bonzini  <bonzini@gnu.org>
+
+	* stdint.m4 (GCC_HEADER_STDINT): Revert changes to this macro in
+	the previous two patches.
+
+2009-09-09  Paolo Bonzini  <bonzini@gnu.org>
+
+	* stdint.m4: Store temporary file in $tmp/_GCC_STDINT_H.
+
+2009-09-08  Paolo Bonzini  <bonzini@gnu.org>
+
+	* stdint.m4: Rewrite by using autoconf 2.64 features.
+
+2009-09-03  Alexandre Oliva  <aoliva@redhat.com>
+
+	* bootstrap-debug-big.mk (STAGE2_CFLAGS): Drop -gtoggle.
+	* bootstrap-debug-lean.mk: Update comments.
+	(STAGE2_CFLAGS): Likewise.
+	(do-compare): Don't override.
+
+2009-09-01  Alexandre Oliva  <aoliva@redhat.com>
+
+	* bootstrap-debug.mk: Add comments.
+	* bootstrap-debug-big.mk: New.
+	* bootstrap-debug-lean.mk: New.
+	* bootstrap-debug-ckovw.mk: Add comments.
+	* bootstrap-debug-lib.mk: Drop CFLAGS for stages.  Use -g0
+	for TFLAGS in stage1.  Drop -fvar-tracking-assignments-toggle.
+
+2009-08-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* override.m4 (_GCC_AUTOCONF_VERSION): Bump to 2.64.
+
+2009-08-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* override.m4 (AC_DISABLE_OPTION_CHECKING): Define to be
+	empty if not defined, to avoid error with 2.59.
+	(_AC_LANG_IO_PROGRAM): When the Autoconf version is exactly
+	2.64, avoid per-language instances to drop fopen from test
+	program.
+
+2009-07-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* extensions.m4 (AC_USE_SYSTEM_EXTENSIONS): Do not expand
+	for Autoconf 2.62 or newer.
+	* tls.m4 (GCC_CHECK_TLS): Fix m4 quotation.
+	* no-executables.m4 (_AC_COMPILER_EXEEXT): Fix m4 quotation.
+	* override.m4 (m4_copy_force, m4_rename_force): Provide
+	macros if not defined.
+	(AC_PREREQ): Use m4_copy_force.
+
+2009-07-17  Joseph Myers  <joseph@codesourcery.com>
+
+	PR other/40784
+	* tls.m4 (GCC_CHECK_TLS): Add extra quoting around argument to
+	AC_LINK_IFELSE.
+
+2009-07-16  Joseph Myers  <joseph@codesourcery.com>
+
+	* tls.m4 (GCC_CHECK_TLS): Also test TLS in a shared library when
+	cross-compiling.
+
+2009-06-25  Olivier Hainque  <hainque@adacore.com>
+
+	* config/mh-ppc-aix (BOOT_ADAFLAGS): Remove -mminimal-toc.
+
+2009-05-26  Rafael Avila de Espindola  <espindola@google.com>
+
+	* plugins.m4: New.
+
+2009-05-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* multi.m4: Save CXX, GFORTRAN and GCJ in config.status.
+	* mt-gnu (CXXFLAGS_FOR_TARGET): Adjust.
+	* bootstrap-O1.mk: New.
+	* bootstrap-O3.mk: New.
+	* bootstrap-debug.mk: New.
+
+2009-02-02  Doug Evans  <dje@google.com>
+
+	* tcl.m4 (SC_PATH_TCLCONFIG): Don't exit 0 if tclconfig fails.
+	(SC_PATH_TKCONFIG): Don't exit 0 if tkconfig fails.
+	(SC_LOAD_TCLCONFIG): Quote all uses of TCL_BIN_DIR, it may contain
+	"# no Tcl configs found".
+	(SC_LOAD_TKCONFIG): Similarily for TK_BIN_DIR.
+
+2009-04-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* lead-dot.m4: Change copyright header to refer to version
+	3 of the GNU General Public License and to point readers at the
+	COPYING3 file and the FSF's license web page.
+	* warnings.m4: Likewise.
+
+2009-02-11  Kai Tietz  <kai.tietz@onevision.com>
+
+	* mh-cygwin (LDFLAGS): Add linker option to increase stack limit
+	up to 8MB.
+
+2009-01-23  Jie Zhang  <jie.zhang@analog.com>
+
+	* tls.m4 (GCC_CHECK_EMUTLS): Define.
+
+2008-12-21  Andrew Pinski  <pinskia@gmail.com>
+
+	PR target/38300
+	* unwind_ipinfo.m4: Darwin before 9 does not have _Unwind_GetIPInfo.
+
+2008-11-21  Kai Tietz  <kai.tietz@onevision.com>
+
+	Fix PR/25502
+	* mh-mingw (BOOT_CFLAGS): Add -Wno-pedantic-ms-format switch.
+
+2008-11-12  Steve Ellcey  <sje@cup.hp.com>
+
+	PR target/27880
+	* unwind_ipinfo.m4 (GCC_CHECK_UNWIND_GETIPINFO): Change from
+	link test to target based test.
+
+2008-08-09  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* mt-mips16-compat: New file, taken from mt-mips-elfoabi.
+	* mt-mips-elfoabi: Include mt-mips16-compat.
+	* mt-mips-gnu: New file.
+
+2008-08-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* mt-spu (all-ld): Update for ld Makefile changes.
+
+2008-08-02  Keith Seitz  <keiths@redhat.com>
+
+	* tcl.m4 (SC_PATH_TCLCONFIG): Add some simple logic to deal
+	with cygwin.
+	(SC_PATH_TKCONFIG): Likewise.
+
+2008-07-30  Paolo Bonzini  <bonzini@gnu.org>
+
+	* mh-pa: New, from gcc/config/pa/x-ada.
+	* mh-pa-hpux10: New, from gcc/config/pa/x-ada-hpux10.
+
+2008-07-25  Keith Seitz  <keiths@redhat.com>
+
+	* acinclude.m4: Remove libide, libgui, and all the other Tcl
+	functions.
+	* tcl.m4: New file.
+
+2008-07-11  Joseph Myers  <joseph@codesourcery.com>
+
+	* mh-mingw (LDFLAGS): Append to rather than replacing previous
+	value.
+
+2008-06-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* override.m4: Use m4_version_prereq throughout.
+	(_AC_ARG_VAR_VALIDATE, AC_MSG_FAILURE): Backport from git
+	Autoconf: output pwd along with fatal errors, so the right
+	config.log file is hinted at more prominently.
+	(PARSE_ARGS): Push setting of ac_pwd in this diversion.
+	(_GCC_AUTOCONF_VERSION): New, define to 2.59 if not defined.
+	(_GCC_AUTOCONF_VERSION_CHECK): New macro, require use of Autoconf
+	version _GCC_AUTOCONF_VERSION throughout the tree.
+	(m4_wrap): New override, fix for Posix semantics of m4wrap.
+
+2008-06-11  Bernhard Fischer  <aldot@gcc.gnu.org>
+
+	* tls.m4: Fix typos.
+
+2008-06-08  Joseph Myers  <joseph@codesourcery.com>
+
+	PR tree-optimization/36218
+	* mh-mingw (LDFLAGS): Define.
+
+2008-06-05  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	PR driver/35916
+	* mh-mingw (CFLAGS): Add -D__USE_MINGW_ACCESS.
+
+2008-05-12  Samuel Tardieu  <sam@rfc1149.net>
+	    Paolo Bonzini  <bonzini@gnu.org>
+
+	PR ada/36001
+	* acx.m4: Add optional parameter to ACX_PROG_GNAT.
+
+2008-04-23  Paolo Bonzini  <bonzini@gnu.org>
+
+	* override.m4: Apply _AC_ARG_VALIDATE fix to all versions
+	but 2.62.
+
+2008-04-18  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/35457
+
+	* confsubdir.m4: Rename to...
+	* override.m4: ... this.  Make sure aclocal always picks it.
+	Add more lenient precious variable check, backported from
+	autoconf trunk.
+
+2008-04-04  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/4334
+	* acx.m4 (ACX_CHECK_CYGWIN_CAT_WORKS): New macro to check that
+	cygwin builds are not running in textmode.
+
+2008-03-27  Paolo Bonzini  <bonzini@gnu.org>
+
+	* extensions.m4: New.
+
+2008-03-27  Paolo Bonzini  <bonzini@gnu.org>
+
+	* mh-armpic: Remove.
+	* mh-i370pic: Remove.
+	* mh-m68kpic: Remove.
+	* mh-ppcpic: Remove.
+	* mh-sparcpic: Remove.
+	* mh-ia64pic: Remove.
+	* mh-papic: Remove.
+	* mh-s390pic: Remove.
+	* mh-x86pic: Remove.
+
+2008-03-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* proginstall.m4: New file, with fixed AC_PROG_INSTALL.
+
+2008-02-20  Uros Bizjak  <ubizjak@gmail.com>
+
+	* mh-ppc-darwin (BOOT_CFLAGS): Use +=, not =.
+
+2008-02-20  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/32009
+	* mh-ppc-darwin (BOOT_CFLAGS): Reenable.
+
+2008-01-08  Jakub Jelinek  <jakub@redhat.com>
+
+	* futex.m4: New file.
+
+2007-12-06  Richard Sandiford  <rsandifo@nildram.co.uk>
+
+	* mt-sde (CFLAGS_FOR_TARGET, CXXFLAGS_FOR_TARGET): Use +=, not =.
+	* mt-mips-elfoabi: Likewise.
+
+2007-10-15  Maciej W. Rozycki  <macro@linux-mips.org>
+
+	* tls.m4 (GCC_CHECK_TLS): Rename have_tls to gcc_cv_have_tls.
+	(GCC_CHECK_CC_TLS): Rename have_cc_tls to gcc_cv_have_cc_tls.
+
+2007-10-03  Richard Sandiford  <richard@codesourcery.com>
+
+	* no-executables.m4 (GCC_TRY_COMPILE_OR_LINK): New function.
+
+2007-10-03  Kazu Hirata  <kazu@codesourcery.com>
+
+	Revert:
+	2007-10-02  Richard Sandiford  <richard@codesourcery.com>
+	* no-executables.m4 (GCC_TRY_COMPILE_OR_LINK): New function.
+
+2007-10-02  Richard Sandiford  <richard@codesourcery.com>
+
+	* no-executables.m4 (GCC_TRY_COMPILE_OR_LINK): New function.
+
+2007-09-21  Richard Sandiford  <rsandifo@nildram.co.uk>
+
+	* mt-sde (CFLAGS_FOR_TARGET): Replace -fno-optimize-sibling-calls
+	with -minterlink-mips16.
+	(CXXFLAGS_FOR_TARGET): Likewise.
+
+2007-09-20  Richard Sandiford  <rsandifo@nildram.co.uk>
+
+	* mt-mips-elfoabi: New file.
+
+2007-09-07  Richard Sandiford  <richard@codesourcery.com>
+
+	* mt-sde (CFLAGS_FOR_TARGET): Add -mno-gpopt.
+	(CXXFLAGS_FOR_TARGET): Likewise.
+
+2007-09-06  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
+	PR target/33281
+	* mh-mingw: New host makefile fragment.
+
+2007-08-18  Paul Brook  <paul@codesourcery.com>
+	    Joseph Myers  <joseph@codesourcery.com>
+
+	* mt-gnu (CXXFLAGS_FOR_TARGET): Add
+	$(DEBUG_PREFIX_CFLAGS_FOR_TARGET).
+
+2007-08-17  Richard Sandiford  <richard@codesourcery.com>
+	    Nigel Stephens  <nigel@mips.com>
+
+	* mt-sde: New file.
+
+2007-07-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* tls.m4 (GCC_CHECK_CC_TLS): New.
+
+2007-07-05  Sebastian Pop  <sebpop@gmail.com>
+
+	PR bootstrap/32622
+	* mh-x86omitfp (BOOT_CFLAGS): Add -fomit-frame-pointer,
+	don't reset its value.
+
+2007-06-27  Mike Stump  <mrs@apple.com>
+
+	* acx.m4 (ACX_CHECK_INSTALLED_TARGET_TOOL): Fixup logic for cross
+	builds.
+
+2007-06-20  Mike Stump  <mrs@apple.com>
+
+	* acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Fix incremental builds.
+	(ACX_HAVE_GCC_FOR_TARGET): Likewise.
+
+2007-06-14  Paolo Bonzini  <bonzini@gnu.org>
+
+	* acx.m4 (ACX_CHECK_PROG_VER): Remove duplicate lines.
+
+2007-06-04  Olivier Hainque  <hainque@adacore.com>
+
+	* mh-ppc-aix: Add default ADAFLAGS to BOOT_ADAFLAGS.
+
+2007-05-27  Paolo Bonzini  <bonzini@gnu.org>
+
+	* confsubdir.m4: Move here from newlib.
+
+2007-05-23  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/32009
+	* mh-ppc-darwin: Temporarily disable.
+
+2007-04-11  Kai Tietz  <kai.tietz@onevision.com>
+
+	* stdint.m4: Make template compatible with older cygwin
+	types.h, wrapping each type in a __XXX_t_defined #ifdef.
+
+2007-03-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* acx.m4 (ACX_BUGURL): Set BUGURL first. Quote $BUGURL first
+	when setting REPORT_BUGS_TEXI.
+
+2007-03-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* acx.m4 (ACX_BUGURL): Replace "@" with "@@" for
+	REPORT_BUGS_TEXI.
+
+2007-03-23  Joseph Myers  <joseph@codesourcery.com>
+
+	* acx.m4 (ACX_PKGVERSION, ACX_BUGURL): Define.
+
+2007-03-07  Andreas Schwab  <schwab@suse.de>
+
+	* acx.m4 (GCC_TARGET_TOOL): Expand backquotes outside
+	AC_MSG_RESULT.
+
+2007-02-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* mt-spu (all-ld): Depend on all-binutils.
+
+2007-02-18  Alexandre Oliva  <aoliva@redhat.com>
+
+	* acx.m4 (NCN_STRICT_CHECK_TOOLS): Mark environment variable as
+	precious.  Prefer it over a cached value.  Use cached value
+	verbosely.
+	(NCN_STRICT_CHECK_TARGET_TOOLS): Likewise.  Don't override
+	environment variable with build-time tools.
+
+2006-12-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* mt-spu: New file.
+
+2007-02-09  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* acx.m4 (ACX_CHECK_INSTALLED_TARGET_TOOL): Avoid AC_PATH_PROG
+	with an empty path.
+
+2007-02-07  Bruno Haible  <bruno@clisp.org>
+
+	PR libgomp/28468
+	* config/tls.m4 (GCC_CHECK_TLS): Also check whether the libc supports
+	TLS via __thread.
+
+2007-01-31  Daniel Franke <franke.daniel@gmail.com>
+
+	PR libgomp/30546
+	* acx.m4 (ACX_PROG_CHECK_VER): Locate a program and check that its
+	version is acceptable.
+
+2007-01-27  Paolo Bonzini  <bonzini@gnu.org>
+
+	* depstand.m4 (ZW_CREATE_DEPDIR): Use mkinstalldirs to make
+	directory.
+
+2007-01-23  Richard Guenther  <rguenther@suse.de>
+
+	PR bootstrap/30541
+	* config/acx.m4 (ACX_PROG_GNAT): Check for gnatmake.
+
+2007-01-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-symbolic.m4: New.
+
+2007-01-11  Paolo Bonzini  <bonzini@gnu.org>
+
+	* warnings.m4: Use m4_expand_once to clear the AC_SUBST'ed variable.
+	(ACX_PROG_CC_WARNINGS_ARE_ERRORS): Fix typo.  Add optional 2nd argument.
+
+2007-01-11  Paolo Bonzini  <bonzini@gnu.org>
+
+	* warnings.m4: Add second parameter with name of variable.
+	Always append to the variable if it exists.
+
+2007-01-01  Mike Stump  <mrs@apple.com>
+
+	* mh-ppc-darwin: Remove support for building with Apple's gcc-3.1.
+
+2006-12-04  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	* tls.m4 (GCC_CHECK_TLS): Do not test TLS with static linking
+	if static linking doesn't even work.
+
+2006-11-13  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* tls.m4 (GCC_CHECK_TLS): Fall back to a link test.
+
+2006-10-14  Geoffrey Keating  <geoffk@apple.com>
+
+	* multi.m4: New file, from automake version 2 branch.
+
+2006-09-18  Tom Tromey  <tromey@redhat.com>
+
+	* tls.m4 (GCC_CHECK_TLS): Pass empty argument as "help arg" to
+	GCC_ENABLE.
+
+2006-07-25  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR build/26188
+	* stdint.m4: Test for uintptr_t even on systems with uint64_t
+	or uint32_t.
+
+2006-07-21  Steve Ellcey  <sje@cup.hp.com>
+
+	PR target/26792
+	* unwind_ipinfo.m4: New.
+
+2006-07-21  David Daney  <ddaney@avtrex.com>
+
+	PR libgcj/28426
+	* gxx-include-dir.m4: Use target_alias in path for cross build.
+
+2006-07-18  Paolo Bonzini  <bonzini@gnu.org>
+
+	* acx.m4: Support --with-build-libsubdir and AC_SUBST
+	build_libsubdir.
+
+2006-06-13  Richard Earnshaw  <rearnsha@arm.com>
+	    Alexandre Oliva <aoliva@redhat.com>
+
+	* gettext-sister.m4 (ZW_GNU_GETTEXT_SISTER_DIR): Add optional
+	argument for where to search for NLS config file.
+
+2006-05-31  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gettext-sister.m4 (ZW_GNU_GETTEXT_SISTER_DIR): Provide some
+	defines otherwise gotten from AM_GNU_GETTEXT.  Remove the
+	po/ prefix from CATALOGS.
+
+2006-02-14  Paolo Bonzini  <bonzini@gnu.org>
+	    Andreas Schwab  <schwab@suse.de>
+
+	* acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Use correct program name.
+	(ACX_CHECK_INSTALLED_TARGET_TOOL): Likewise, and always set $1.
+
+2006-01-26  Paolo Bonzini  <bonzini@gnu.org>
+
+	* acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Test $with_build_time_tools.
+	(ACX_PATH_SEP): New.
+	(ACX_TOOL_DIRS): Move here from the gcc directory.
+	(ACX_CHECK_INSTALLED_TARGET_TOOL): New.
+	(GCC_TARGET_TOOL): Do not use a host tool if we found a target tool
+	with a complete path in either $with_build_time_tools or $exec_prefix.
+
+2006-01-02  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR target/25259
+	* stdint.m4: New.
+
+2005-12-20  Paolo Bonzini  <bonzini@gnu.org>
+
+	Revert Ada-related part of the previous change.
+
+	* mt-ppc-aix: Delete.
+
+2005-12-19  Paolo Bonzini  <bonzini@gnu.org>
+
+	* mt-ppc-aix, mh-ppc-aix: New.
+
+2005-12-05  Paolo Bonzini  <bonzini@gnu.org>
+
+	* acx.m4 (GCC_TARGET_TOOL): New.
+
+2005-09-23  Tom Tromey  <tromey@redhat.com>
+
+	* enable.m4: New file.
+	* tls.m4: New file.
+
+2005-08-12  Paolo Bonzini  <bonzini@gnu.org>
+
+	* config/acx.m4 (NCN_CHECK_TARGET_TOOL, NCN_STRICT_CHECK_TOOL,
+	NCN_STRICT_CHECK_TARGET_TOOL): Remove.
+	(NCN_STRICT_CHECK_TOOLS, NCN_STRICT_CHECK_TARGET_TOOLS): New,
+	based on the deleted macros.
+
+2005-07-27  Mark Mitchell  <mark@codesourcery.com>
+
+	* mt-gnu (CXXFLAGS): Include SYSROOT_CFLAGS_FOR_TARGET.
+
+2005-07-16  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* all files: Update FSF address.
+
+2005-06-14  Tom Tromey  <tromey@redhat.com>
+
+	PR libgcj/19877:
+	* no-executables.m4: Call real AC_FUNC_MMAP when cache variable
+	is set but not 'no'.
+
+2005-06-13  Zack Weinberg  <zack@codesourcery.com>
+
+	* depstand.m4, lead-dot.m4: New files.
+
+2005-05-19  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* accross.m4: Delete file.
+
+2005-05-12  Ryota Kunisawa  <kunisawa@access.co.jp>
+
+	PR bootstrap/21230
+	* warnings.m4 (ACX_PROG_CC_WARNING_ALMOST_PEDANTIC): Add
+	double quotes around GCC variable.
+
+2005-04-29  Paolo Bonzini  <bonzini@gnu.org>
+
+	* acx.m4 (ACX_PROG_GNAT): Remove stray break.
+
+2005-03-31  Paolo Bonzini  <bonzini@gnu.org>
+
+	* gcc-lib-path.m4: Remove.
+
+2005-03-21  Zack Weinberg  <zack@codesourcery.com>
+
+	* gxx-include-dir.m4: In all substitutions, leave $(gcc_version)
+	to be expanded by the Makefile.
+
+2005-03-15  Zack Weinberg  <zack@codesourcery.com>
+
+	* gcc-version.m4: Delete.
+
+2005-02-28  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/17383
+	* acx.m4 (GCC_TOPLEV_SUBDIRS): Set HOST_SUBDIR if an in-src
+	gcc build is going.
+
+2005-01-23  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* warnings.m4 (ACX_PROG_CC_WARNING_ALMOST_PEDANTIC): Don't do
+	anything for non-GCC compilers.
+
+2004-12-03  Richard Sandiford  <rsandifo@redhat.com>
+
+	* gxx-include-dir.m4: New file.
+
+2004-12-02  Richard Sandiford  <rsandifo@redhat.com>
+
+	* gcc-version.m4: New file.
+
+2004-09-24  Zack Weinberg  <zack@codesourcery.com>
+
+	* warnings.m4: New file.
+
+2004-09-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR bootstrap/17369
+	* gcc-lib-path.m4: New file.
+
+2004-09-22  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* gettext-sister.m4: Renamed from gettext.m4
+	* codeset.m4, gettext.m4, glibc21.m4, iconv.m4, intdiv0.m4, po.m4,
+	inttypes.m4, inttypes-pri.m4, inttypes_h.m4, lcmessage.m4, lib-ld.m4,
+	lib-link.m4, lib-prefix.m4, nls.m4, progtest.m4, stdint_h.m4,
+	uintmax_t.m4, ulonglong.m4: Import from gettext-0.12.1 sources.
+
+2004-08-31  Robert Bowdidge <bowdidge@apple.com>
+
+	* mh-ppc-darwin: Add file, and override BOOT_CFLAGS.
+
+2004-08-13  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Add ACX_{TARGET,HOST,BUILD}_NONCANONICAL,
+	which do an automatic AC_SUBST on _GCC_TOPLEV_*_NONCANONICAL.
+	The intention is that we will migrate to these bit by bit.
+
+2004-08-01  Robert Millan  <robertmh@gnu.org>
+
+	* mt-linux: Rename to ...
+	* mt-gnu: ... this.
+
+2004-06-09  Paolo Bonzini  <bonzini@gnu.org>
+
+	* acx.m4 (ACX_PROG_LN): From gcc, modified to
+	accept a parameter.
+
+2004-05-23  Paolo Bonzini  <bonzini@gnu.org>
+
+	* acx.m4 (ACX_HEADER_STDBOOL, ACX_HEADER_STRING):
+	From gcc.
+
+2004-04-16  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* acx.m4 (ACX_PROG_GNAT): Check if ${CC} produces object file for
+	Ada compilation.
+	Fix acx_cv_cc_gcc_supports_ada spelling.
+
+2004-03-08  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR ada/14131
+	Move language detection to the top level.
+	* acx.m4 (ACX_PROG_GNAT): New macro, moved here
+	from the gcc subdirectory.
+
+2004-03-09  Hans-Peter Nilsson  <hp@axis.com>
+
+	* accross.m4 (AC_C_BIGENDIAN_CROSS): Compile endian probe with
+	"-c".  Properly quote parameter for AC_MSG_ERROR.
+
+2004-01-14  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+	* acinclude.m4: Quote names of macros to be defined by AC_DEFUN
+	throughout.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+
+2003-10-14  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* gettext.m4: Properly quote arguments to AC_DEFUN.
+
+2003-09-24  Daniel Jacobowitz  <drow@mvista.com>
+
+	* acx.m4 (AC_PROG_CPP_WERROR): New.
+
+2003-08-27  Daniel Jacobowitz  <drow@mvista.com>
+
+	* no-executables.m4: New file.
+
+2003-07-07  Zack Weinberg  <zack@codesourcery.com>
+
+	* gettext.m4: Delete all former contents.
+	(ZW_GNU_GETTEXT_SISTER_DIR): New macro.
+	* progtest.m4: New file.
+
+2003-07-04  Zack Weinberg  <zack@codesourcery.com>
+
+	* gettext.m4: New file - copy of gettext.m4 from binutils
+	CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
+
+2003-05-14  Kelley Cook  <kelleycook@wideopenwest.com>
+
+	* acinclude.m4: Accept i[3456789]86 for machine type.
+
+2003-05-18  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* acx.m4: Introduce _GCC_TOPLEV_NONCANONICAL_BUILD,
+	_GCC_TOPLEV_NONCANOICAL_HOST, _GCC_TOPLEV_NONCANONICAL_TARGET,
+	GCC_TOPLEV_SUBDIRS.
+
+2003-03-04  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* mh-dgux: Delete.
+
+2002-12-28  Alexandre Oliva  <aoliva@redhat.com>
+
+	* acx.m4: Name cache variables properly.
+	(NCN_STRICT_CHECK_TOOL): If program is not found and
+	value-if-not-found is empty, use ${ncn_tool_prefix}$2 or $2,
+	depending on whether build != host or not.
+	(NCN_STRICT_CHECK_TARGET_TOOL): Ditto, with the target prefix.
+
+2002-12-28  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* acx.m4: New.
+	* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
+	mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
+	mh-riscos, mh-sysv: Delete.
+	* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
+	mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
+
+2002-12-16  Christopher Faylor  <cgf@redhat.com>
+
+	* mh-cygwin: Don't build libtermcap if it doesn't exist.
+
+2002-12-22  Geoffrey Keating  <geoffk@apple.com>
+
+	* mt-aix43: Delete.
+
+2002-11-23  H.J. Lu <hjl@gnu.org>
+
+	* accross.m4: New.
+
+2002-11-10  Stan Shebs  <shebs@apple.com>
+
+	Retire common MPW configury bits.
+	* mpw-mh-mpw: Remove.
+	* mpw: Remove directory along with all of its files.
+
+2002-05-16  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* acinclude.m4: Allow for PWDCMD to override hardcoded pwd.
+
+2002-05-13  Nathanael Nerode  <neroden@twcny.rr.com>
+
+	* mh-apollo68: remove unused HDEFINES setting.
+	* mh-dgux: remove unused HDEFINES setting.
+	* mh-dgux386: remove unused HDEFINES setting, duplicate RANLIB=true.
+
+2002-04-29  Nathanael Nerode  <neroden@twcny.rr.com>
+
+	* mh-cxux: remove dead code
+	* mh-dgux386: remove dead code
+	* mh-hp300: remove dead code
+	* mh-hpux: remove dead code
+	* mh-hpux8: remove dead code
+	* mh-irix5: remove dead code
+	* mh-irix6: remove dead code
+	* mh-ncr3000: remove dead code
+	* mh-ncrsvr43: remove dead code
+	* mh-necv4: remove dead code
+	* mh-sco: remove dead code
+	* mh-solaris: remove dead code
+	* mh-sysv: remove dead code
+	* mh-sysv4: remove dead code
+	* mh-sysv5: remove dead code
+	* mh-irix4: remove, contains only dead code
+
+	* mt-armpic: Delete.
+	* mt-elfalphapic: Delete.
+	* mt-i370pic: Delete.
+	* mt-ia64pic: Delete.
+	* mt-m68kpic: Delete.
+	* mt-papic: Delete.
+	* mt-ppcpic: Delete.
+	* mt-s390pic: Delete.
+	* mt-sparcpic: Delete.
+	* mt-x86pic: Delete.
+
+2002-04-19  Nathanael Nerode  <neroden@twcny.rr.com>
+
+	* mh-a68bsd: clean out dead code
+	* mh-apollo68: clean out dead code
+	* mh-cxux: clean out dead code
+	* mh-decstation: clean out dead code
+	* mh-dgux: clean out dead code
+	* mh-dgux386: clean out dead code
+	* mh-hp300: clean out dead code
+	* mh-hpux: clean out dead code
+	* mh-hpux8: clean out dead code
+	* mh-interix: clean out dead code
+	* mh-irix4: clean out dead code
+	* mh-lynxrs6k: clean out dead code
+	* mh-mingw32: clean out dead code
+	* mh-ncr3000: clean out dead code
+	* mh-ncrsvr43: clean out dead code
+	* mh-necv4: clean out dead code
+	* mh-openedition: clean out dead code
+	* mh-riscos: clean out dead code
+	* mh-sco: clean out dead code
+	* mh-sysv4: clean out dead code
+	* mh-lynxos: removed, contained only dead code
+	* mh-vaxult2: removed, contained only dead code
+	* mh-sun3: removed, contained only dead code
+
+2002-04-15  Keith Seitz  <keiths@redhat.com>
+
+	* acinclude.m4 (CYG_AC_PATH_TCLCONFIG): Search the win/ directory,
+	too.
+	(CYG_AC_PATH_TKCONFIG): Likewise.
+
+2001-10-07  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* acinclude.m4: Fix spelling error of "separate" as "seperate".
+
+2001-05-22  Jason Merrill  <jason_merrill@redhat.com>
+
+	* mt-linux (CXXFLAGS_FOR_TARGET): Lose -fvtable-thunks.
+
+2001-01-27  Richard Henderson  <rth@redhat.com>
+
+	* mt-alphaieee: New file.
+
+2001-01-02  Laurynas Biveinis  <lauras@softhome.net>
+
+	* mh-djgpp: do not set CFLAGS.
+
+2000-08-04  Mark Elbrecht  <snowball3@bigfoot.com>
+
+	* mh-djgpp: Conditionally set 'target_alias' to djgpp. Conditionally
+	modify 'gcc_version'.
+
+2000-07-21  Andrew Haley  <aph@cygnus.com>
+
+	* mh-ia64pic: New file.
+	* mt-ia64pic: New file.
+
+2001-02-09  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* mh-s390pic: New file.
+	* mt-s390pic: New file.
+
+2000-09-26  David Edelsohn  <edelsohn@gnu.org>
+
+	* mt-aix43 (NM_FOR_TARGET): Add -B bsd-style flag.
+
+2000-07-14  Mark P Mitchell  <mark@codesourcery.com>
+
+	* mh-irix6 (CC): Don't set it.
+
+2000-06-21  Branko Cibej  <branko.cibej@hermes.si>
+
+	* mh-sparcpic: Use single instead of double quotes.
+	* mt-sparcpic: Likewise.
+
+2000-06-19  Syd Polk <spolk@redhat.com>
+
+	* acinclude.m4: Updated for Incr Tcl 3.0.
+
+2000-02-23  Linas Vepstas <linas@linas.org>
+
+	* mh-i370pic: New file.
+	* mt-i370pic: New file.
+
+2000-02-22  Nick Clifton  <nickc@cygnus.com>
+
+	* mt-wince: new file: Makefile fragment for WinCE targets.
+
+2000-01-06  Geoff Keating  <geoffk@cygnus.com>
+
+	* mh-aix43: Delete, move to mt-aix43.
+	* mt-aix43: New file.
+
+Tue Sep  7 23:31:01 1999  Linas Vepstas  <linas@linas.org>
+
+	* mh-openedition: New file.
+
+1999-04-07  Michael Meissner  <meissner@cygnus.com>
+
+	* mt-d30v: New file, pass -g -Os -Wa,-C as default options.
+
+Thu Mar 18 00:17:50 1999  Mark Elbrecht <snowball3@usa.net>
+
+	* mh-go32: Delete.
+	* mh-djgpp: New. Renamed from mh-go32.
+
+Wed Feb 24 12:52:17 1999  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mh-windows: Ditto.
+
+1999-02-08  Syd Polk  <spolk@cygnus.com>
+
+	* acinclude.m4: Added macros to find itcl files.
+	Export TCL_CFLAGS from tclConfig.sh.
+	Export TCL_LIB_FULL_PATH, TK_LIB_FULL_PATH, ITCL_LIB_FULL_PATH,
+	ITK_LIB_FULL_PATH, and TIX_LIB_FULL_PATH
+	Replace TIX macros with better ones from snavigator.
+
+Tue Feb  2 22:51:21 1999 Philip Blundell  <philb@gnu.org>
+
+	* mh-armpic: New file.  Patch from Jim Pick <jim@jimpick.com>.
+	* mt-armpic: Likewise.
+
+Sat Jan 30 08:04:00 1999  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* mh-interix: New file.
+
+Mon Jan 18 19:41:08 1999  Christopher Faylor <cgf@cygnus.com>
+
+	* cygwin.mh: Activate commented out dependencies for
+	gdb: libtermcap.
+
+Wed Dec 30 20:34:52 1998  Christopher Faylor <cgf@cygnus.com>
+
+	* mt-cygwin: Remove.
+
+Wed Dec 30 01:13:03 1998  Christopher Faylor <cgf@cygnus.com>
+
+	* mt-cygwin: New file.  libtermcap target info.
+
+Wed Nov 18 20:29:46 1998  Christopher Faylor <cgf@cygnus.com>
+
+	* cygwin.mh: Add extra libtermcap target information.
+	Add commented out dependency for gdb to libtermcap for
+	future readline requirement.
+
+Mon Nov  2 15:15:33 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* mh-cygwin32: delete
+	* mh-cygwin: was mh-cygwin32
+
+1998-10-26  Syd Polk  <spolk@cygnus.com>
+
+	* acinclude.m4: TCLHDIR and TKHDIR need to be run through
+	cygpath for Microsoft builds.
+
+1998-10-20  Syd Polk  <spolk@cygnus.com>
+
+	* acinclude.m4: Re-exported TCL_LIBS and TCL_LD_SEARCH_FLAGS
+	because itcl needs them.
+
+Mon Aug 31 17:50:53 1998  David Edelsohn  <edelsohn@mhpcc.edu>
+
+	* mh-aix43 (NM_FOR_TARGET): Add -X32_64 as well.
+
+Sat Aug 29 14:32:55 1998  David Edelsohn  <edelsohn@mhpcc.edu>
+
+	* mh-aix43: New file.
+
+Mon Aug 10 00:15:47 1998  HJ Lu (hjl@gnu.org)
+
+	* mt-linux (CXXFLAGS_FOR_TARGET): Add -D_GNU_SOURCE.
+
+1998-05-29  Rob Savoye  <rob@chinadoll.cygnus.com>
+
+	* acinclude.m4: New collection of generic autoconf macros.
+
+Wed Apr 22 12:24:28 1998  Michael Meissner  <meissner@cygnus.com>
+
+	* mt-ospace: New file, support using -Os instead of -O2 to compile
+	the libraries.
+
+Wed Apr 22 10:53:14 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* mt-linux (CXXFLAGS_FOR_TARGET): Set this instead of CXXFLAGS.
+
+Sat Apr 11 22:43:17 1998  J. Kean Johnston  <jkj@sco.com>
+
+	* mh-svsv5: New file - support for SCO UnixWare 7 / SVR5.
+
+Thu Mar 26 01:54:25 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* mh-cygwin32: stop configuring and building dosrel.
+
+Fri Feb  6 01:33:52 1998  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* mh-sparcpic (PICFLAG): Define to properly according
+	to current multilib configuration.
+	* mt-sparcpic (PICFLAG_FOR_TARGET): Define to properly
+	according to current multilib configuration.
+
+Sun Jan  4 01:06:55 1998  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* mh-mingw32: New file.
+
+Thu Sep 11 16:43:27 1997  Jim Wilson  <wilson@cygnus.com>
+
+	* mh-elfalphapic, mt-elfalphapic: New files.
+
+1997-09-15 02:37  Ulrich Drepper  <drepper@cygnus.com>
+
+	* mt-linux: Define CXXFLAGS to make sure -fvtable-thunks is used.
+
+Sun Sep 14 20:53:42 1997  Geoffrey Noer  <noer@cygnus.com>
+
+	* mh-cygwin32: ok to build split texinfo files
+
+Wed Jul 23 12:32:18 1997  Robert Hoehne <robert.hoehne@Mathematik.TU-Chemnitz.DE>
+
+	* mh-go32 (CFLAGS): Don't set -fno-omit-frame-pointer.
+
+Mon Jun 16 19:06:41 1997  Geoff Keating  <geoffk@ozemail.com.au>
+
+	* mh-ppcpic: New file.
+	* mt-ppcpic: New file.
+
+Thu Mar 27 15:52:40 1997  Geoffrey Noer  <noer@cygnus.com>
+
+	* mh-cygwin32: override CXXFLAGS, setting to -O2 only
+	(no debug)
+
+Tue Mar 25 18:16:43 1997  Geoffrey Noer  <noer@cygnus.com>
+
+	* mh-cygwin32: override LIBGCC2_DEBUG_CFLAGS so debug info
+	isn't included in cygwin32-hosted libgcc2.a by default
+
+Wed Jan  8 19:56:43 1997  Geoffrey Noer  <noer@cygnus.com>
+
+	* mh-cygwin32: override CFLAGS so debug info isn't included
+	in cygwin32-hosted tools by default
+
+Tue Dec 31 16:04:26 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* mh-linux: Remove.
+
+Mon Nov 11 10:29:51 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* mt-ppc: Delete file, options moved to newlib configure.
+
+Mon Oct 28 17:32:46 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* mh-windows:  Add rules for building MSVC makefiles.
+
+Thu Oct 24 09:02:07 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* mh-windows (HOST_FLAGS):  Set srcroot, which is needed
+	for MSVC build procedure.
+
+Tue Oct  8 08:32:48 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* mh-windows:  Add support for windows host
+	(that is a build done under the Microsoft build environment).
+
+Fri Oct  4 12:21:03 1996  Angela Marie Thomas (angela@cygnus.com)
+
+	* mh-dgux386: New file.  x86 dgux specific flags
+
+Mon Sep 30 15:10:07 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-mh-mpw (EXTRALIBS_PPC_XCOFF): New, was EXTRALIBS_PPC.
+	(EXTRALIBS_PPC): Use shared libraries instead of xcoff.
+
+Sat Aug 17 04:56:25 1996  Geoffrey Noer  <noer@skaro.cygnus.com>
+
+	* mh-cygwin32: don't -D_WIN32 here anymore
+
+Sun Aug 11 20:51:50 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* mh-cygwin32 (CFLAGS):  Define _WIN32 to be compatible
+	with normal Windows compilation environment.
+
+Thu Aug 15 19:46:44 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-mh-mpw (SEGFLAG_68K, SEGFLAG_PPC): Remove.
+	(EXTRALIBS_PPC): Add libgcc.xcoff.
+
+Thu Aug  8 14:51:47 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* mt-ppc: New file, add -mrelocatable-lib and -mno-eabi to all
+	target builds for PowerPC eabi targets.
+
+Fri Jul 12 12:06:01 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw: New subdir, Mac MPW configuration support bits.
+
+Mon Jul  8 17:30:52 1996  Jim Wilson  <wilson@cygnus.com>
+
+	* mh-irix6: New file.
+
+Mon Jul  8 15:15:37 1996  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* mt-sparcpic (PICFLAG_FOR_TARGET): Use -fPIC.
+
+Fri Jul  5 11:49:02 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* mh-irix4 (RANLIB): Don't define; Irix 4 does have ranlib.
+
+Sun Jun 23 22:59:25 1996  Geoffrey Noer  <noer@cygnus.com>
+
+	* mh-cygwin32: new file.  Like mh-go32 without the CFLAGS entry.
+
+Tue Mar 26 14:10:41 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* mh-go32 (CFLAGS): Define.
+
+Thu Mar 14 19:20:54 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* mh-necv4: New file.
+
+Thu Feb 15 13:07:43 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* mh-cxux (CC): New variable.
+	(CFLAGS, LDFLAGS): Remove.
+	* mh-ncrsvr43 (CC): New variable.
+	(CFLAGS): Remove.
+	* mh-solaris (CFLAGS): Remove.
+
+	* mh-go32: Remove most variable settings, since they presumed a
+	Canadian Cross, which is now handled correctly by the configure
+	script.
+
+	* mh-sparcpic (PICFLAG): Set to -fPIC, not -fpic.
+
+Mon Feb 12 14:53:39 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* mh-m68kpic, mt-m68kpic: New files.
+
+Thu Feb  1 14:15:42 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-mh-mpw (CC_MWC68K): Add options similar to those used
+	in CC_MWCPPC, and -mc68020 -model far.
+	(AR_MWLINK68K): Add -xm library.
+	(AR_AR): Define.
+	(CC_LD_MWLINK68K): Remove -d.
+	(EXTRALIBS_MWC68K): Define.
+
+Thu Jan 25 16:05:33 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* mh-ncrsvr43 (CFLAGS): Remove -Hnocopyr.
+
+Thu Nov 30 14:45:25 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* mt-v810 (CC_FOR_TARGET): Add -ansi flag.  NEC compiler
+	defaults to K&R mode, but doesn't have varargs.h, so we have to
+	compile in ANSI mode.
+
+Wed Nov 29 13:49:08 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* mt-v810 (CC_FOR_TARGET, AS_FOR_TARGET, AR_FOR_TARGET,
+	RANLIB_FOR_TARGET): Set as appropriate for NEC v810 toolchain.
+
+Tue Nov 14 15:03:12 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
+
+	* mh-i386win32: add LD_FOR_TARGET.
+
+Tue Nov  7 15:41:30 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-mh-mpw (CC_MWC68K, CC_MWCPPC): Remove unused include path.
+	(CC_MWCPPC): Add -mpw_chars, disable warnings, add comments
+	explaining reasons for various flags.
+	(EXTRALIBS_PPC, EXTRALIBS_MWCPPC ): Put runtime library first.
+
+Fri Oct 13 14:44:25 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
+
+	* mh-aix, mh-sun:  Removed.
+
+	* mh-decstation (X11_EXTRA_CFLAGS): Define.
+
+	* mh-sco, mh-solaris, mh-sysv4 (X11_EXTRA_LIBS): Define.
+
+	* mh-hp300, mh-hpux, mh-hpux8, mh-solaris, mh-sun3, mh-sysv4: Don't
+	hardcode location of X stuff here.
+
+Thu Sep 28 13:14:56 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-mh-mpw: Add definitions for various 68K and PowerMac
+	compilers, add definitions for library and link steps for
+	PowerMacs.
+
+Sat Sep 16 18:31:08 PDT 1995  Angela Marie Thomas <angela@cygnus.com>
+
+	* mh-ncrsvr43: Removed AR_FLAGS
+
+Thu Sep 14 08:20:04 1995  Fred Fish  <fnf@cygnus.com>
+
+	* mh-hp300 (CC): Add "CC = cc -Wp,-H256000" to avoid
+	"too much defining" errors from the HPUX compiler.
+
+Thu Aug 17 17:28:56 1995  Ken Raeburn  <raeburn@kr-laptop.cygnus.com>
+
+	* mh-hp300 (RANLIB): Use "ar ts", in case GNU ar was used and
+	didn't build a symbol table.
+
+Thu Jun 22 17:47:24 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-mh-mpw (CC): Define ANSI_PROTOTYPES.
+
+Mon Jun  5 18:26:36 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* m?-*pic: Define PICFLAG* instead of LIB*FLAGS*.
+
+Mon Apr 10 12:29:48 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-mh-mpw (EXTRALIBS): Always link in Math.o, CSANELIB.o,
+	and ToolLibs.o.
+
+	* mpw-mh-mpw (CC): Define ALMOST_STDC.
+	(CFLAGS): Remove ALMOST_STDC, -mc68881.
+	(LDFLAGS): add -w.
+
+	* mpw-mh-mpw (CFLAGS): Add -b option to put strings at the ends of
+	functions.
+
+	* mpw-mh-mpw: New file, host makefile definitions for MPW.
+
+Fri Mar 31 11:35:17 1995  Jason Molenda (crash@phydeaux.cygnus.com)
+
+	* mt-netware: New file.
+
+Tue Mar 28 14:47:34 1995  Jason Molenda (crash@phydeaux.cygnus.com)
+
+	Revert this change:
+
+	Mon Mar 29 19:59:26 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+		* mh-solaris: SunPRO C needs -Xs to be able to get a
+		working xmakefile for Emacs.
+
+Mon Mar 13 12:31:29 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* mh-hpux8: New file.
+	* mh-hpux: Use X11R5 rather than X11R4.
+
+Thu Feb  9 11:04:13 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* mh-linux (SYSV): Don't define.
+	(RANLIB): Don't define.
+
+Wed Jan 11 16:29:34 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* m?-*pic (LIBCXXFLAGS): Add -fno-implicit-templates.
+
+Sat Nov  5 18:43:30 1994  Jason Merrill  (jason@phydeaux.cygnus.com)
+
+	* m[th]-*pic: Support --enable-shared.
+
+Thu Nov  3 17:27:19 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* mh-irix4 (CC): Increase maximum string length.
+
+	* mh-sco (CC): Define away const, it doesn't work right; elements
+	of arrays of ptr-to-const are considered const themselves.
+
+Sat Jul 16 12:17:49 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* mh-cxux: New file, from Bob Rusk (rrusk@mail.csd.harris.com).
+
+Sat Jun  4 17:22:12 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* mh-ncrsvr43:  New file from Tom McConnell
+	<tmcconne@sedona.intel.com>.
+
+Thu May 19 00:32:11 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* mh-hpux (CC): Add -Wp,-H256000 to avoid "too much defining"
+	errors from the HPUX 8 compilers.
+
+Fri May  6 14:19:25 1994  Steve Chamberlain  (sac@cygnus.com)
+
+	* mh-go32: New fragment.
+
+Thu May  5 20:06:45 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* mh-lynxrs6k: Renamed from mh-lynxosrs6k, to make it
+	unique in 8.3 naming schemes.
+
+Wed May  4 20:14:47 1994  D. V. Henkel-Wallace  (gumby@cygnus.com)
+
+	* mh-lynxrs6k: set SHELL to /bin/bash
+
+Tue Apr 12 12:38:17 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* mh-irix4 (CC): Change -XNh1500 to -XNh2000.
+
+Mon Jan 31 18:40:55 1994  Stu Grossman  (grossman at cygnus.com)
+
+	* mh-lynxosrs6k:  Account for lack of ranlib!
+
+Sat Dec 25 20:03:45 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* mt-hppa: Delete.
+
+Thu Dec  2 14:35:54 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* mh-irix5: New file for Irix 5.
+
+Tue Nov 16 22:54:39 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* mh-a68bsd: Define CC to gcc.
+
+Mon Nov 15 16:56:51 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* mh-linux: Don't put -static in LDFLAGS.  Add comments.
+
+Mon Nov 15 13:37:58 1993  david d `zoo' zuhn  (zoo@cirdan.cygnus.com)
+
+	* mh-sysv4 (AR_FLAGS): change from cq to cr
+
+Fri Nov  5 08:12:32 1993  D. V. Henkel-Wallace  (gumby@blues.cygnus.com)
+
+	* mh-unixware: remove.  It's the same as sysv4, and config.guess
+	can't tell the difference.  So don't allow skew.
+
+Wed Oct 20 20:35:14 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* mh-hp300: Revert yesterday's change, but add comment explaining.
+
+Tue Oct 19 18:58:21 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* mh-hp300: Don't define CFLAGS to empty.  Why should hp300 be
+	different from anything else?  ("gdb doesn't understand the native
+	debug format" isn't a good enough answer because we might be using
+	gcc).
+
+Tue Oct  5 12:17:40 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* mh-alphaosf: Remove, no longer necessary now that gdb knows
+	how to handle OSF/1 shared libraries.
+
+Tue Jul  6 11:27:33 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
+
+	* mh-alphaosf: New file.
+
+Thu Jul  1 15:49:33 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* mh-riscos: New file.
+
+Mon Jun 14 12:03:18 1993  david d `zoo' zuhn  (zoo at rtl.cygnus.com)
+
+	* mh-aix, mh-aix386, mh-decstation, mh-delta88, mh-hpux, mh-irix4,
+	mh-ncr3000, mh-solaris, mh-sysv, mh-sysv4: remove INSTALL=cp line,
+	now that we're using install.sh globally
+
+Fri Jun  4 16:09:34 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* mh-sysv4 (INSTALL): Use cp, not /usr/ucb/install.
+
+Sat Apr 17 17:19:50 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* mh-delta88: remove extraneous GCC references
+
+Thu Apr  8 11:21:52 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* mt-a29k, mt-ebmon29k, mt-os68k, mt-ose68000, mt-ose68k,
+	mt-vxworks68, mt-vxworks960: Removed obsolete, unused target
+	Makefile fragment files.
+
+Wed Mar 31 12:31:56 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* mh-irix4: Bump -XNh value to 1500 to match gcc requirements.
+
+Mon Mar 29 19:59:26 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* mh-sun3: cc needs -J to compile cp-parse.c correctly
+
+	* mh-solaris: SunPRO C needs -Xs to be able to get a
+	working xmakefile for Emacs.
+
+Mon Mar  8 15:05:25 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* mh-aix386: New file; old mh-aix, plus no-op RANLIB.
+
+Tue Mar  2 21:15:58 1993  Fred Fish  (fnf@cygnus.com)
+
+	* mh-vaxult2:  New file.
+
+Sat Jan 23 20:32:01 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* mh-sco: define X11_LIB to the mess that SCO ODT requires
+
+Tue Dec 29 15:06:00 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* mh-sco: Don't override BISON definition.
+
+Mon Dec  7 06:43:27 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* mh-sco: don't default $(CC) to gcc
+
+Mon Nov 30 14:54:34 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* mh-solaris: rework standard X location to use
+	$OPENWINHOME, if defined.
+
+	* mh-sun: handle X11 include locations
+
+	* mh-decstation: define NeedFunctionPrototypes to 0, to
+	work around dain-bramaged DECwindows include files
+
+Fri Nov 27 18:35:54 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* mh-hpux, mh-solaris: define the "standard" locations for
+	the vendor supplied X11 headers and libraries
+
+Thu Oct  1 13:50:48 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* mh-solaris: INSTALL is NOT /usr/ucb/install
+
+Mon Aug 24 14:25:35 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* mt-ose68000, mt-ose68k: renamed from mt-OSE*.
+
+Mon Aug  3 15:41:28 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* mh-solaris: removed the -xs from CFLAGS (let the people
+	with Sun's C compiler deal with it themselved)
+
+Tue Jul 21 02:11:01 1992  D. V. Henkel-Wallace  (gumby@cygnus.com)
+
+	* mt-OSE68k, mt-680000: new configs.
+
+Thu Jul 16 17:12:09 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* mh-irix4: merged changes from progressive.
+
+Wed Jul  8 00:01:30 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* mh-solaris:  Use -xs when compiling so that Sun-C puts
+	a symbol-table into the executable.
+
+Mon Jun 15 12:31:52 1992  Fred Fish  (fnf@cygnus.com)
+
+	* mh-ncr3000 (INSTALL):  Don't use /usr/ucb/install,
+	it is broken on ncr 3000's.
+
+Tue Jun  9 23:29:38 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Everywhere: Change RANLIB=echo>/dev/null (which confuses
+	some shells - and I don't blame them) to RANLIB=true.
+	* mh-solaris:  Use /usr/ucb/install for INSTALL.
+
+Tue Jun  9 17:18:11 1992  Fred Fish  (fnf at cygnus.com)
+
+	* mh-ncr3000, mh-sysv4:  Add INSTALL.
+
+Sun May 31 14:45:23 1992  Mark Eichin  (eichin at cygnus.com)
+
+	* mh-solaris2: Add new configuration for Solaris 2 (sysv, no ranlib)
+
+Wed Apr 22 14:38:34 1992  Fred Fish  (fnf@cygnus.com)
+
+	* mh-delta88, mh-ncr3000:  Replace MINUS_G with
+	CFLAGS per new configuration strategy.
+
+Fri Apr 10 23:10:08 1992  Fred Fish  (fnf@cygnus.com)
+
+	* mh-ncr3000:  Add new configuration for NCR 3000.
+
+Thu Mar  5 12:05:58 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* mh-irix4: Port to SGI Irix-4.x.
+
+Thu Jan 30 16:17:30 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* mh-sco: Fix SCO configuration stuff.
+
+Tue Dec 10 00:10:55 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* ChangeLog: fresh changelog.
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/acinclude.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/acinclude.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/acinclude.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/acinclude.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,746 @@
+dnl This file is included into all any other acinclude file that needs
+dnl to use these macros.
+
+dnl This is copied from autoconf 2.12, but does calls our own AC_PROG_CC_WORKS,
+dnl and doesn't call AC_PROG_CXX_GNU, cause we test for that in  AC_PROG_CC_WORKS.
+dnl We are probably using a cross compiler, which will not be able to fully
+dnl link an executable.  This should really be fixed in autoconf itself.
+dnl Find a working G++ cross compiler. This only works for the GNU C++ compiler.
+AC_DEFUN([CYG_AC_PROG_CXX_CROSS],
+[AC_BEFORE([$0], [AC_PROG_CXXCPP])
+AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
+
+CYG_AC_PROG_GXX_WORKS
+
+if test $ac_cv_prog_gxx = yes; then
+  GXX=yes
+dnl Check whether -g works, even if CXXFLAGS is set, in case the package
+dnl plays around with CXXFLAGS (such as to build both debugging and
+dnl normal versions of a library), tasteless as that idea is.
+  ac_test_CXXFLAGS="${CXXFLAGS+set}"
+  ac_save_CXXFLAGS="$CXXFLAGS"
+  CXXFLAGS=
+  AC_PROG_CXX_G
+  if test "$ac_test_CXXFLAGS" = set; then
+    CXXFLAGS="$ac_save_CXXFLAGS"
+  elif test $ac_cv_prog_cxx_g = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-O2"
+  fi
+else
+  GXX=
+  test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
+fi
+])
+
+dnl See if the G++ compiler we found works.
+AC_DEFUN([CYG_AC_PROG_GXX_WORKS],
+[AC_MSG_CHECKING([whether the G++ compiler ($CXX $CXXFLAGS $LDFLAGS) actually works])
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+dnl Try a test case. We only compile, because it's close to impossible
+dnl to get a correct fully linked executable with a cross compiler. For
+dnl most cross compilers, this test is bogus. For G++, we can use various
+dnl other compile line options to get a decent idea that the cross compiler
+dnl actually does work, even though we can't produce an executable without
+dnl more info about the target it's being compiled for. This only works
+dnl for the GNU C++ compiler.
+
+dnl Transform the name of the compiler to it's cross variant, unless
+dnl CXX is set. This is also what CXX gets set to in the generated
+dnl Makefile.
+if test x"${CXX}" = xc++ ; then
+    CXX=`echo gcc | sed -e "${program_transform_name}"`
+fi
+
+dnl Get G++'s full path to libgcc.a
+libgccpath=`${CXX} --print-libgcc`
+
+dnl If we don't have a path with libgcc.a on the end, this isn't G++.
+if test `echo $libgccpath | sed -e 's:/.*/::'` = libgcc.a ; then
+   ac_cv_prog_gxx=yes
+else
+   ac_cv_prog_gxx=no
+fi
+
+dnl If we are using G++, look for the files that need to exist if this
+dnl compiler works.
+if test x"${ac_cv_prog_gxx}" = xyes ; then
+    gccfiles=`echo $libgccpath | sed -e 's:/libgcc.a::'`
+    if test -f ${gccfiles}/specs -a -f ${gccfiles}/cpp -a -f ${gccfiles}/cc1plus; then
+	gccfiles=yes
+    else
+	gccfiles=no
+    fi
+    gcclibs=`echo $libgccpath | sed -e 's:lib/gcc-lib/::' -e 's:/libgcc.a::' -e 's,\(.*\)/.*,\1,g'`/lib
+    if test -d ${gcclibs}/ldscripts -a -f ${gcclibs}/libc.a -a -f ${gcclibs}/libstdc++.a ; then
+	gcclibs=yes
+    else
+	gcclibs=no
+    fi
+fi
+
+dnl If everything is OK, then we can safely assume the compiler works.
+if test x"${gccfiles}" = xno -o x"${gcclibs}" = xno; then
+    ac_cv_prog_cxx_works=no
+    AC_MSG_ERROR(${CXX} is a non-working cross compiler)
+else
+   ac_cv_prog_cxx_works=yes 
+fi
+
+AC_LANG_RESTORE
+AC_MSG_RESULT($ac_cv_prog_cxx_works)
+if test x"$ac_cv_prog_cxx_works" = xno; then
+  AC_MSG_ERROR([installation or configuration problem: C++ compiler cannot create executables.])
+fi
+AC_MSG_CHECKING([whether the G++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler])
+AC_MSG_RESULT($ac_cv_prog_cxx_cross)
+cross_compiling=$ac_cv_prog_cxx_cross
+AC_SUBST(CXX)
+])
+
+dnl ====================================================================
+dnl Find a working GCC cross compiler. This only works for the GNU gcc compiler.
+dnl This is based on the macros above for G++.
+AC_DEFUN([CYG_AC_PROG_CC_CROSS],
+[AC_BEFORE([$0], [AC_PROG_CCPP])
+AC_CHECK_PROGS(CC, cc, gcc)
+
+CYG_AC_PROG_GCC_WORKS
+
+if test $ac_cv_prog_gcc = yes; then
+  GCC=yes
+dnl Check whether -g works, even if CFLAGS is set, in case the package
+dnl plays around with CFLAGS (such as to build both debugging and
+dnl normal versions of a library), tasteless as that idea is.
+  ac_test_CFLAGS="${CFLAGS+set}"
+  ac_save_CFLAGS="$CFLAGS"
+  CFLAGS=
+  AC_PROG_CC_G
+  if test "$ac_test_CFLAGS" = set; then
+    CFLAGS="$ac_save_CFLAGS"
+  elif test $ac_cv_prog_cc_g = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-O2"
+  fi
+else
+  GXX=
+  test "${CFLAGS+set}" = set || CFLAGS="-g"
+fi
+])
+
+dnl See if the GCC compiler we found works.
+AC_DEFUN([CYG_AC_PROG_GCC_WORKS],
+[AC_MSG_CHECKING([whether the Gcc compiler ($CC $CFLAGS $LDFLAGS) actually works])
+AC_LANG_SAVE
+AC_LANG_C
+dnl Try a test case. We only compile, because it's close to impossible
+dnl to get a correct fully linked executable with a cross
+dnl compiler. For most cross compilers, this test is bogus. For G++,
+dnl we can use various other compile line options to get a decent idea
+dnl that the cross compiler actually does work, even though we can't
+dnl produce an executable without more info about the target it's
+dnl being compiled for. This only works for the GNU C++ compiler.
+
+dnl Transform the name of the compiler to it's cross variant, unless
+dnl CXX is set. This is also what CC gets set to in the generated Makefile.
+if test x"${CC}" = xcc ; then
+    CC=`echo gcc | sed -e "${program_transform_name}"`
+fi
+
+dnl Get Gcc's full path to libgcc.a
+libgccpath=`${CC} --print-libgcc`
+
+dnl If we don't have a path with libgcc.a on the end, this isn't G++.
+if test `echo $libgccpath | sed -e 's:/.*/::'` = libgcc.a ; then
+   ac_cv_prog_gcc=yes
+else
+   ac_cv_prog_gcc=no
+fi
+
+dnl If we are using Gcc, look for the files that need to exist if this
+dnl compiler works.
+if test x"${ac_cv_prog_gcc}" = xyes ; then
+    gccfiles=`echo $libgccpath | sed -e 's:/libgcc.a::'`
+    if test -f ${gccfiles}/specs -a -f ${gccfiles}/cpp -a -f ${gccfiles}/cc1plus; then
+	gccfiles=yes
+    else
+	gccfiles=no
+    fi
+    gcclibs=`echo $libgccpath | sed -e 's:lib/gcc-lib/::' -e 's:/libgcc.a::' -e 's,\(.*\)/.*,\1,g'`/lib
+    if test -d ${gcclibs}/ldscripts -a -f ${gcclibs}/libc.a -a -f ${gcclibs}/libstdc++.a ; then
+	gcclibs=yes
+    else
+	gcclibs=no
+    fi
+fi
+
+dnl If everything is OK, then we can safely assume the compiler works.
+if test x"${gccfiles}" = xno -o x"${gcclibs}" = xno; then
+    ac_cv_prog_cc_works=no
+    AC_MSG_ERROR(${CC} is a non-working cross compiler)    
+else
+    ac_cv_prog_cc_works=yes
+fi
+
+AC_LANG_RESTORE
+AC_MSG_RESULT($ac_cv_prog_cc_works)
+if test x"$ac_cv_prog_cc_works" = xno; then
+  AC_MSG_ERROR([installation or configuration problem: C++ compiler cannot create executables.])
+fi
+AC_MSG_CHECKING([whether the Gcc compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler])
+AC_MSG_RESULT($ac_cv_prog_cc_cross)
+cross_compiling=$ac_cv_prog_cc_cross
+AC_SUBST(CC)
+])
+
+dnl ====================================================================
+dnl Find the BFD library in the build tree. This is used to access and
+dnl manipulate object or executable files.
+AC_DEFUN([CYG_AC_PATH_BFD], [
+AC_MSG_CHECKING(for the bfd header in the build tree)
+dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
+dnl Look for the header file
+AC_CACHE_VAL(ac_cv_c_bfdh,[
+for i in $dirlist; do
+    if test -f "$i/bfd/bfd.h" ; then
+	ac_cv_c_bfdh=`(cd $i/bfd; ${PWDCMD-pwd})`
+	break
+    fi
+done
+])
+if test x"${ac_cv_c_bfdh}" != x; then
+    BFDHDIR="-I${ac_cv_c_bfdh}"
+    AC_MSG_RESULT(${ac_cv_c_bfdh})
+else
+    AC_MSG_RESULT(none)
+fi
+AC_SUBST(BFDHDIR)
+
+dnl Look for the library
+AC_MSG_CHECKING(for the bfd library in the build tree)
+AC_CACHE_VAL(ac_cv_c_bfdlib,[
+for i in $dirlist; do
+    if test -f "$i/bfd/Makefile" ; then
+	ac_cv_c_bfdlib=`(cd $i/bfd; ${PWDCMD-pwd})`
+    fi
+done
+])
+dnl We list two directories cause bfd now uses libtool
+if test x"${ac_cv_c_bfdlib}" != x; then
+    BFDLIB="-L${ac_cv_c_bfdlib} -L${ac_cv_c_bfdlib}/.libs"
+    AC_MSG_RESULT(${ac_cv_c_bfdlib})
+else
+    AC_MSG_RESULT(none)
+fi
+AC_SUBST(BFDLIB)
+])
+
+dnl ====================================================================
+dnl Find the libiberty library. This defines many commonly used C
+dnl functions that exists in various states based on the underlying OS.
+AC_DEFUN([CYG_AC_PATH_LIBERTY], [
+AC_MSG_CHECKING(for the liberty library in the build tree)
+dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
+AC_CACHE_VAL(ac_cv_c_liberty,[
+for i in $dirlist; do
+    if test -f "$i/libiberty/Makefile" ; then
+	ac_cv_c_liberty=`(cd $i/libiberty; ${PWDCMD-pwd})`
+    fi
+done
+])
+if test x"${ac_cv_c_liberty}" != x; then
+    LIBERTY="-L${ac_cv_c_liberty}"
+    AC_MSG_RESULT(${ac_cv_c_liberty})
+else
+    AC_MSG_RESULT(none)
+fi
+AC_SUBST(LIBERTY)
+])
+
+dnl ====================================================================
+dnl Find the opcodes library. This is used to do dissasemblies.
+AC_DEFUN([CYG_AC_PATH_OPCODES], [
+AC_MSG_CHECKING(for the opcodes library in the build tree)
+dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
+AC_CACHE_VAL(ac_cv_c_opc,[
+for i in $dirlist; do
+    if test -f "$i/opcodes/Makefile" ; then
+	ac_cv_c_opc=`(cd $i/opcodes; ${PWDCMD-pwd})`
+    fi
+done
+])
+if test x"${ac_cv_c_opc}" != x; then
+    OPCODESLIB="-L${ac_cv_c_opc}"
+    AC_MSG_RESULT(${ac_cv_c_opc})
+else
+    AC_MSG_RESULT(none)
+fi
+AC_SUBST(OPCODESLIB)
+])
+
+dnl ====================================================================
+dnl Look for the DejaGnu header file in the source tree. This file
+dnl defines the functions used to testing support.
+AC_DEFUN([CYG_AC_PATH_DEJAGNU], [
+AC_MSG_CHECKING(for the testing support files in the source tree)
+dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
+AC_CACHE_VAL(ac_cv_c_dejagnu,[
+for i in $dirlist; do
+    if test -f "$srcdir/$i/ecc/ecc/infra/testlib/current/include/dejagnu.h" ; then
+	ac_cv_c_dejagnu=`(cd $srcdir/$i/ecc/ecc/infra/testlib/current/include; ${PWDCMD-pwd})`
+    fi
+done
+])
+if test x"${ac_cv_c_dejagnu}" != x; then
+    DEJAGNUHDIR="-I${ac_cv_c_dejagnu}"
+    AC_MSG_RESULT(${ac_cv_c_dejagnu})
+else
+    AC_MSG_RESULT(none)
+fi
+AC_CACHE_VAL(ac_cv_c_dejagnulib,[
+for i in $dirlist; do
+    if test -f "$srcdir/$i/infra/testlib/current/lib/hostutil.exp" ; then
+	ac_cv_c_dejagnulib=`(cd $srcdir/$i/infra/testlib/current/lib; ${PWDCMD-pwd})`
+    fi
+done
+])
+if test x"${ac_cv_c_dejagnulib}" != x; then
+    DEJAGNULIB="${ac_cv_c_dejagnulib}"
+else
+    DEJAGNULIB=""
+fi
+AC_MSG_CHECKING(for runtest in the source tree)
+AC_CACHE_VAL(ac_cv_c_runtest,[
+for i in $dirlist; do
+    if test -f "$srcdir/$i/dejagnu/runtest" ; then
+	ac_cv_c_runtest=`(cd $srcdir/$i/dejagnu; ${PWDCMD-pwd})`
+    fi
+done
+])
+if test x"${ac_cv_c_runtest}" != x; then
+    RUNTESTDIR="${ac_cv_c_runtest}"
+   AC_MSG_RESULT(${ac_cv_c_runtest})
+else
+    RUNTESTDIR=""
+    AC_MSG_RESULT(none)
+fi
+AC_SUBST(RUNTESTDIR)
+AC_SUBST(DEJAGNULIB)
+AC_SUBST(DEJAGNUHDIR)
+])
+
+dnl ====================================================================
+dnl Find the libintl library in the build tree. This is for
+dnl  internationalization support.
+AC_DEFUN([CYG_AC_PATH_INTL], [
+AC_MSG_CHECKING(for the intl header in the build tree)
+dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
+dnl Look for the header file
+AC_CACHE_VAL(ac_cv_c_intlh,[
+for i in $dirlist; do
+    if test -f "$i/intl/libintl.h" ; then
+	ac_cv_c_intlh=`(cd $i/intl; ${PWDCMD-pwd})`
+	break
+    fi
+done
+])
+if test x"${ac_cv_c_intlh}" != x; then
+    INTLHDIR="-I${ac_cv_c_intlh}"
+    AC_MSG_RESULT(${ac_cv_c_intlh})
+else
+    AC_MSG_RESULT(none)
+fi
+AC_SUBST(INTLHDIR)
+
+dnl Look for the library
+AC_MSG_CHECKING(for the libintl library in the build tree)
+AC_CACHE_VAL(ac_cv_c_intllib,[
+for i in $dirlist; do
+    if test -f "$i/intl/Makefile" ; then
+	ac_cv_c_intllib=`(cd $i/intl; ${PWDCMD-pwd})`
+    fi
+done
+])
+if test x"${ac_cv_c_intllib}" != x; then
+    INTLLIB="-L${ac_cv_c_intllib} -lintl"
+    AC_MSG_RESULT(${ac_cv_c_intllib})
+else
+    AC_MSG_RESULT(none)
+fi
+AC_SUBST(INTLLIB)
+])
+
+dnl ====================================================================
+dnl Find the simulator library.
+AC_DEFUN([CYG_AC_PATH_SIM], [
+dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.. ../../../../../../../../../.."
+case "$target_cpu" in
+    powerpc)	target_dir=ppc ;;
+    sparc*)	target_dir=erc32 ;;
+    mips*)	target_dir=mips ;;
+    *)		target_dir=$target_cpu ;;
+esac
+dnl First look for the header file
+AC_MSG_CHECKING(for the simulator header file)
+AC_CACHE_VAL(ac_cv_c_simh,[
+for i in $dirlist; do
+    if test -f "${srcdir}/$i/include/remote-sim.h" ; then
+	ac_cv_c_simh=`(cd ${srcdir}/$i/include; ${PWDCMD-pwd})`
+	break
+    fi
+done
+])
+if test x"${ac_cv_c_simh}" != x; then
+    SIMHDIR="-I${ac_cv_c_simh}"
+    AC_MSG_RESULT(${ac_cv_c_simh})
+else
+    AC_MSG_RESULT(none)
+fi
+AC_SUBST(SIMHDIR)
+
+dnl See whether it's a devo or Foundry branch simulator
+AC_MSG_CHECKING(Whether this is a devo simulator )
+AC_CACHE_VAL(ac_cv_c_simdevo,[
+    CPPFLAGS="$CPPFLAGS $SIMHDIR"
+    AC_EGREP_HEADER([SIM_DESC sim_open.*struct _bfd], remote-sim.h,
+        ac_cv_c_simdevo=yes,
+        ac_cv_c_simdevo=no)
+])
+if test x"$ac_cv_c_simdevo" = x"yes" ; then
+    AC_DEFINE(HAVE_DEVO_SIM)
+fi
+AC_MSG_RESULT(${ac_cv_c_simdevo})
+AC_SUBST(HAVE_DEVO_SIM)
+
+dnl Next look for the library
+AC_MSG_CHECKING(for the simulator library)
+AC_CACHE_VAL(ac_cv_c_simlib,[
+for i in $dirlist; do
+    if test -f "$i/sim/$target_dir/Makefile" ; then
+	ac_cv_c_simlib=`(cd $i/sim/$target_dir; ${PWDCMD-pwd})`
+    fi
+done
+])
+if test x"${ac_cv_c_simlib}" != x; then
+    SIMLIB="-L${ac_cv_c_simlib}"
+else
+    AC_MSG_RESULT(none)
+    dnl FIXME: this is kinda bogus, cause umtimately the TM will build
+    dnl all the libraries for several architectures. But for now, this
+    dnl will work till then.
+dnl     AC_MSG_CHECKING(for the simulator installed with the compiler libraries)
+    dnl Transform the name of the compiler to it's cross variant, unless
+    dnl CXX is set. This is also what CXX gets set to in the generated
+    dnl Makefile.
+    CROSS_GCC=`echo gcc | sed -e "s/^/$target/"`
+
+    dnl Get G++'s full path to libgcc.a
+changequote(,)
+    gccpath=`${CROSS_GCC} --print-libgcc | sed -e 's:[a-z0-9A-Z\.\-]*/libgcc.a::' -e 's:lib/gcc-lib/::'`lib
+changequote([,])
+    if test -f $gccpath/libsim.a -o -f $gccpath/libsim.so ; then
+        ac_cv_c_simlib="$gccpath/"
+        SIMLIB="-L${ac_cv_c_simlib}"
+	AC_MSG_RESULT(${ac_cv_c_simlib})
+    else
+        AM_CONDITIONAL(PSIM, test x$psim = xno)
+	SIMLIB=""
+	AC_MSG_RESULT(none)
+dnl         ac_cv_c_simlib=none
+    fi
+fi
+AC_SUBST(SIMLIB)
+])
+
+dnl ====================================================================
+dnl Find the libiberty library.
+AC_DEFUN([CYG_AC_PATH_LIBIBERTY], [
+AC_MSG_CHECKING(for the libiberty library in the build tree)
+dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
+AC_CACHE_VAL(ac_cv_c_libib,[
+for i in $dirlist; do
+    if test -f "$i/libiberty/Makefile" ; then
+	ac_cv_c_libib=`(cd $i/libiberty/; ${PWDCMD-pwd})`
+    fi
+done
+])
+if test x"${ac_cv_c_libib}" != x; then
+    LIBIBERTY="-L${ac_cv_c_libib}"
+    AC_MSG_RESULT(${ac_cv_c_libib})
+else
+    AC_MSG_RESULT(none)
+fi
+AC_SUBST(LIBIBERTY)
+])
+
+dnl ====================================================================
+AC_DEFUN([CYG_AC_PATH_DEVO], [
+AC_MSG_CHECKING(for devo headers in the source tree)
+dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
+AC_CACHE_VAL(ac_cv_c_devoh,[
+for i in $dirlist; do
+    if test -f "${srcdir}/$i/include/remote-sim.h" ; then
+	ac_cv_c_devoh=`(cd ${srcdir}/$i/include; ${PWDCMD-pwd})`
+    fi
+done
+])
+if test x"${ac_cv_c_devoh}" != x; then
+    DEVOHDIR="-I${ac_cv_c_devoh}"
+    AC_MSG_RESULT(${ac_cv_c_devoh})
+else
+    AC_MSG_RESULT(none)
+fi
+AC_SUBST(DEVOHDIR)
+])
+
+dnl ====================================================================
+dnl Find all the ILU headers and libraries
+AC_DEFUN([CYG_AC_PATH_ILU], [
+AC_MSG_CHECKING(for ILU kernel headers in the source tree)
+dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
+AC_CACHE_VAL(ac_cv_c_iluh,[
+for i in $dirlist; do
+    if test -f "${srcdir}/$i/ilu/runtime/kernel/method.h" ; then
+	ac_cv_c_iluh=`(cd ${srcdir}/$i/ilu/runtime/kernel; ${PWDCMD-pwd})`
+    fi
+done
+])
+if test x"${ac_cv_c_iluh}" != x; then
+    ILUHDIR="-I${ac_cv_c_iluh}"
+    AC_MSG_RESULT(${ac_cv_c_iluh})
+else
+    AC_MSG_RESULT(none)
+fi
+
+AC_MSG_CHECKING(for ILU kernel headers in the build tree)
+dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
+AC_CACHE_VAL(ac_cv_c_iluh5,[
+for i in $dirlist; do
+    if test -f "$i/ilu/runtime/kernel/iluconf.h" ; then
+	ac_cv_c_iluh5=`(cd $i/ilu/runtime/kernel; ${PWDCMD-pwd})`
+    fi
+done
+])
+if test x"${ac_cv_c_iluh5}" != x; then
+    ILUHDIR="${ILUHDIR} -I${ac_cv_c_iluh5}"
+    AC_MSG_RESULT(${ac_cv_c_iluh5})
+else
+    AC_MSG_RESULT(none)
+fi
+
+AC_MSG_CHECKING(for ILU C++ headers in the source tree)
+AC_CACHE_VAL(ac_cv_c_iluh2,[
+for i in $dirlist; do
+    if test -f "${srcdir}/$i/ilu/stubbers/cpp/resource.h" ; then
+	ac_cv_c_iluh2=`(cd ${srcdir}/$i/ilu/stubbers/cpp; ${PWDCMD-pwd})`
+    fi
+done
+])
+if test x"${ac_cv_c_iluh2}" != x; then
+    ILUHDIR="${ILUHDIR} -I${ac_cv_c_iluh2}"
+    AC_MSG_RESULT(${ac_cv_c_iluh2})
+else
+    AC_MSG_RESULT(none)
+fi
+
+AC_MSG_CHECKING(for ILU C headers)
+AC_CACHE_VAL(ac_cv_c_iluh3,[
+for i in $dirlist; do
+    if test -f "${srcdir}/$i/ilu/stubbers/c/resource.h" ; then
+	ac_cv_c_iluh3=`(cd ${srcdir}/$i/ilu/stubbers/c  ; ${PWDCMD-pwd})`
+    fi
+done
+])
+if test x"${ac_cv_c_iluh3}" != x; then
+    ILUHDIR="${ILUHDIR} -I${ac_cv_c_iluh3}"
+    AC_MSG_RESULT(${ac_cv_c_iluh3})
+else
+    AC_MSG_RESULT(none)
+fi
+
+AC_MSG_CHECKING(for ILU C runtime headers)
+AC_CACHE_VAL(ac_cv_c_iluh4,[
+for i in $dirlist; do
+    if test -f "${srcdir}/$i/ilu/runtime/c/ilucstub.h" ; then
+	ac_cv_c_iluh4=`(cd ${srcdir}/$i/ilu/runtime/c  ; ${PWDCMD-pwd})`
+    fi
+done
+])
+if test x"${ac_cv_c_iluh4}" != x; then
+    ILUHDIR="${ILUHDIR} -I${ac_cv_c_iluh4}"
+    AC_MSG_RESULT(${ac_cv_c_iluh4})
+else
+    AC_MSG_RESULT(none)
+fi
+
+AC_CACHE_VAL(ac_cv_c_ilupath,[
+for i in $dirlist; do
+    if test -f "$i/ilu/Makefile" ; then
+	ac_cv_c_ilupath=`(cd $i/ilu; ${PWDCMD-pwd})`
+	break
+    fi
+done
+])
+ILUTOP=${ac_cv_c_ilupath}
+
+AC_MSG_CHECKING(for the ILU library in the build tree)
+AC_CACHE_VAL(ac_cv_c_ilulib,[
+if test -f "$ac_cv_c_ilupath/runtime/kernel/Makefile" ; then
+    ac_cv_c_ilulib=`(cd $ac_cv_c_ilupath/runtime/kernel; ${PWDCMD-pwd})`
+    AC_MSG_RESULT(found ${ac_cv_c_ilulib}/libilu.a)
+else
+    AC_MSG_RESULT(no)
+fi])
+   
+AC_MSG_CHECKING(for the ILU C++ bindings library in the build tree)
+AC_CACHE_VAL(ac_cv_c_ilulib2,[
+if test -f "$ac_cv_c_ilupath/runtime/cpp/Makefile" ; then
+    ac_cv_c_ilulib2=`(cd $ac_cv_c_ilupath/runtime/cpp; ${PWDCMD-pwd})`
+    AC_MSG_RESULT(found ${ac_cv_c_ilulib2}/libilu-c++.a)
+else
+    AC_MSG_RESULT(no)
+fi])
+
+AC_MSG_CHECKING(for the ILU C bindings library in the build tree)
+AC_CACHE_VAL(ac_cv_c_ilulib3,[
+if test -f "$ac_cv_c_ilupath/runtime/c/Makefile" ; then
+    ac_cv_c_ilulib3=`(cd $ac_cv_c_ilupath/runtime/c; ${PWDCMD-pwd})`
+    AC_MSG_RESULT(found ${ac_cv_c_ilulib3}/libilu-c.a)
+else
+    AC_MSG_RESULT(no)
+fi])
+
+AC_MSG_CHECKING(for the ILU Tk bindings library in the build tree)
+AC_CACHE_VAL(ac_cv_c_ilulib4,[
+if test -f "$ac_cv_c_ilupath/runtime/mainloop/Makefile" ; then
+    ac_cv_c_ilulib4=`(cd $ac_cv_c_ilupath/runtime/mainloop; ${PWDCMD-pwd})`
+    AC_MSG_RESULT(found ${ac_cv_c_ilulib4}/libilu-tk.a)
+else
+    AC_MSG_RESULT(no)
+fi])
+
+if test x"${ac_cv_c_ilulib}" = x -a x"${ac_cv_c_ilulib2}" = x; then
+  ILUHDIR=""
+fi
+
+if test x"${ac_cv_c_ilulib}" != x -a x"${ac_cv_c_ilulib2}" != x; then
+    ILULIB="-L${ac_cv_c_ilulib} -L${ac_cv_c_ilulib2} -L${ac_cv_c_ilulib3} -L${ac_cv_c_ilulib4}"
+else
+    ILULIB=""
+fi
+
+if test x"${ILULIB}" = x; then
+    AC_MSG_CHECKING(for ILU libraries installed with the compiler)
+    AC_CACHE_VAL(ac_cv_c_ilulib5,[
+    NATIVE_GCC=`echo gcc | sed -e "${program_transform_name}"`
+
+    dnl Get G++'s full path to it's libraries
+    ac_cv_c_ilulib5=`${NATIVE_GCC} --print-libgcc | sed -e 's:lib/gcc-lib/.*::'`lib
+    if test -f $ac_cv_c_ilulib5/libilu-c.a -o -f $ac_cv_c_ilulib5/libilu-c.so ; then
+        if test x"${ILUHDIR}" = x; then
+               ILUHDIR="-I${ac_cv_c_ilulib5}/../include"
+        fi
+        ILULIB="-L${ac_cv_c_ilulib5}"
+        AC_MSG_RESULT(${ac_cv_c_ilulib5})
+    else
+        ac_cv_c_ilulib=none
+        AC_MSG_RESULT(none)
+    fi
+fi])
+AC_SUBST(ILUHDIR)
+AC_SUBST(ILULIB)
+AC_SUBST(ILUTOP)
+])
+
+dnl ====================================================================
+dnl This defines the byte order for the host. We can't use
+dnl AC_C_BIGENDIAN, cause we want to create a config file and
+dnl substitue the real value, so the header files work right
+AC_DEFUN([CYG_AC_C_ENDIAN], [
+AC_MSG_CHECKING(to see if this is a little endian host)
+AC_CACHE_VAL(ac_cv_c_little_endian, [
+ac_cv_c_little_endian=unknown
+# See if sys/param.h defines the BYTE_ORDER macro.
+AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/param.h>], [
+#if !BYTE_ORDER || !_BIG_ENDIAN || !_LITTLE_ENDIAN
+ bogus endian macros
+#endif], [# It does; now see whether it defined to _LITTLE_ENDIAN or not.
+AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/param.h>], [
+#if BYTE_ORDER != _LITTLE_ENDIAN
+ not big endian
+#endif], ac_cv_c_little_endian=yes, ac_cv_c_little_endian=no)
+])
+if test ${ac_cv_c_little_endian} = unknown; then
+old_cflags=$CFLAGS
+CFLAGS=-g
+AC_TRY_RUN([
+main () {
+  /* Are we little or big endian?  From Harbison&Steele.  */
+  union
+  {
+    long l;
+    char c[sizeof (long)];
+  } u;
+  u.l = 1;
+  exit (u.c[0] == 1);
+}],
+ac_cv_c_little_endian=no,
+ac_cv_c_little_endian=yes,[
+dnl Yes, this is ugly, and only used for a canadian cross anyway. This
+dnl is just to keep configure from stopping here.
+case "${host}" in
+changequote(,)
+   i[3456789]86-*-*) ac_cv_c_little_endian=yes ;;
+   sparc*-*-*)    ac_cv_c_little_endian=no ;;
+changequote([,])
+  *)    AC_MSG_WARN(Can't cross compile this test) ;;
+esac])
+CFLAGS=$old_cflags
+fi])
+
+if test x"${ac_cv_c_little_endian}" = xyes; then
+    AC_DEFINE(LITTLE_ENDIAN_HOST)
+    ENDIAN="CYG_LSBFIRST";
+else
+    ENDIAN="CYG_MSBFIRST";
+fi
+AC_MSG_RESULT(${ac_cv_c_little_endian})
+AC_SUBST(ENDIAN)
+])
+
+dnl ====================================================================
+dnl Look for the path to libgcc, so we can use it to directly link
+dnl in libgcc.a with LD.
+AC_DEFUN([CYG_AC_PATH_LIBGCC],
+[AC_MSG_CHECKING([Looking for the path to libgcc.a])
+AC_LANG_SAVE
+AC_LANG_C
+
+dnl Get Gcc's full path to libgcc.a
+libgccpath=`${CC} --print-libgcc`
+
+dnl If we don't have a path with libgcc.a on the end, this isn't G++.
+if test `echo $libgccpath | sed -e 's:/.*/::'` = libgcc.a ; then
+   ac_cv_prog_gcc=yes
+else
+   ac_cv_prog_gcc=no
+fi
+
+dnl 
+if test x"${ac_cv_prog_gcc}" = xyes ; then
+   gccpath=`echo $libgccpath | sed -e 's:/libgcc.a::'`
+   LIBGCC="-L${gccpath}"
+   AC_MSG_RESULT(${gccpath})
+else
+   LIBGCC=""
+   AC_MSG_ERROR(Not using gcc)
+fi
+
+AC_LANG_RESTORE
+AC_SUBST(LIBGCC)
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/acx.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/acx.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/acx.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/acx.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,621 @@
+# Autoconf M4 include file defining utility macros for complex Canadian
+# cross builds.
+
+dnl ####
+dnl # _GCC_TOPLEV_NONCANONICAL_BUILD
+dnl # $build_alias or canonical $build if blank.
+dnl # Used when we would use $build_alias, but empty is not OK.
+AC_DEFUN([_GCC_TOPLEV_NONCANONICAL_BUILD],
+[AC_REQUIRE([AC_CANONICAL_BUILD]) []dnl
+case ${build_alias} in
+  "") build_noncanonical=${build} ;;
+  *) build_noncanonical=${build_alias} ;;
+esac
+]) []dnl # _GCC_TOPLEV_NONCANONICAL_BUILD
+
+dnl ####
+dnl # _GCC_TOPLEV_NONCANONICAL_HOST
+dnl # $host_alias, or $build_noncanonical if blank.
+dnl # Used when we would use $host_alias, but empty is not OK.
+AC_DEFUN([_GCC_TOPLEV_NONCANONICAL_HOST],
+[AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_BUILD]) []dnl
+case ${host_alias} in
+  "") host_noncanonical=${build_noncanonical} ;;
+  *) host_noncanonical=${host_alias} ;;
+esac
+]) []dnl # _GCC_TOPLEV_NONCANONICAL_HOST
+
+dnl ####
+dnl # _GCC_TOPLEV_NONCANONICAL_TARGET
+dnl # $target_alias or $host_noncanonical if blank.
+dnl # Used when we would use $target_alias, but empty is not OK.
+AC_DEFUN([_GCC_TOPLEV_NONCANONICAL_TARGET],
+[AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_HOST]) []dnl
+case ${target_alias} in
+  "") target_noncanonical=${host_noncanonical} ;;
+  *) target_noncanonical=${target_alias} ;;
+esac
+]) []dnl # _GCC_TOPLEV_NONCANONICAL_TARGET
+
+dnl ####
+dnl # ACX_NONCANONICAL_BUILD
+dnl # Like underscored version, but AC_SUBST's.
+AC_DEFUN([ACX_NONCANONICAL_BUILD],
+[AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_BUILD]) []dnl
+AC_SUBST(build_noncanonical)
+]) []dnl # ACX_NONCANONICAL_BUILD
+
+dnl ####
+dnl # ACX_NONCANONICAL_HOST
+dnl # Like underscored version, but AC_SUBST's.
+AC_DEFUN([ACX_NONCANONICAL_HOST],
+[AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_HOST]) []dnl
+AC_SUBST(host_noncanonical)
+]) []dnl # ACX_NONCANONICAL_HOST
+
+dnl ####
+dnl # ACX_NONCANONICAL_TARGET
+dnl # Like underscored version, but AC_SUBST's.
+AC_DEFUN([ACX_NONCANONICAL_TARGET],
+[AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_TARGET]) []dnl
+AC_SUBST(target_noncanonical)
+]) []dnl # ACX_NONCANONICAL_TARGET
+
+dnl ####
+dnl # GCC_TOPLEV_SUBDIRS
+dnl # GCC & friends build 'build', 'host', and 'target' tools.  These must
+dnl # be separated into three well-known subdirectories of the build directory:
+dnl # build_subdir, host_subdir, and target_subdir.  The values are determined
+dnl # here so that they can (theoretically) be changed in the future.  They
+dnl # were previously reproduced across many different files.
+dnl #
+dnl # This logic really amounts to very little with autoconf 2.13; it will
+dnl # amount to a lot more with autoconf 2.5x.
+AC_DEFUN([GCC_TOPLEV_SUBDIRS],
+[AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_TARGET]) []dnl
+AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_BUILD]) []dnl
+
+# post-stage1 host modules use a different CC_FOR_BUILD so, in order to
+# have matching libraries, they should use host libraries: Makefile.tpl
+# arranges to pass --with-build-libsubdir=$(HOST_SUBDIR).
+# However, they still use the build modules, because the corresponding
+# host modules (e.g. bison) are only built for the host when bootstrap
+# finishes. So:
+# - build_subdir is where we find build modules, and never changes.
+# - build_libsubdir is where we find build libraries, and can be overridden.
+
+# Prefix 'build-' so this never conflicts with target_subdir.
+build_subdir="build-${build_noncanonical}"
+AC_ARG_WITH(build-libsubdir,
+[  --with-build-libsubdir=[DIR]  Directory where to find libraries for build system],
+build_libsubdir="$withval",
+build_libsubdir="$build_subdir")
+# --srcdir=. covers the toplevel, while "test -d" covers the subdirectories
+if ( test $srcdir = . && test -d gcc ) \
+   || test -d $srcdir/../host-${host_noncanonical}; then
+  host_subdir="host-${host_noncanonical}"
+else
+  host_subdir=.
+fi
+# No prefix.
+target_subdir=${target_noncanonical}
+AC_SUBST([build_libsubdir]) []dnl
+AC_SUBST([build_subdir]) []dnl
+AC_SUBST([host_subdir]) []dnl
+AC_SUBST([target_subdir]) []dnl
+]) []dnl # GCC_TOPLEV_SUBDIRS
+
+
+####
+# _NCN_TOOL_PREFIXES:  Some stuff that oughtta be done in AC_CANONICAL_SYSTEM 
+# or AC_INIT.
+# These demand that AC_CANONICAL_SYSTEM be called beforehand.
+AC_DEFUN([_NCN_TOOL_PREFIXES],
+[ncn_tool_prefix=
+test -n "$host_alias" && ncn_tool_prefix=$host_alias-
+ncn_target_tool_prefix=
+test -n "$target_alias" && ncn_target_tool_prefix=$target_alias-
+]) []dnl # _NCN_TOOL_PREFIXES
+
+####
+# NCN_STRICT_CHECK_TOOLS(variable, progs-to-check-for,[value-if-not-found],[path])
+# Like plain AC_CHECK_TOOLS, but require prefix if build!=host.
+
+AC_DEFUN([NCN_STRICT_CHECK_TOOLS],
+[AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl
+AC_ARG_VAR([$1], [$1 for the host])
+
+if test -n "[$]$1"; then
+  ac_cv_prog_$1=[$]$1
+elif test -n "$ac_cv_prog_$1"; then
+  $1=$ac_cv_prog_$1
+fi
+
+if test -n "$ac_cv_prog_$1"; then
+  for ncn_progname in $2; do
+    AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4])
+  done
+fi
+
+for ncn_progname in $2; do
+  if test -n "$ncn_tool_prefix"; then
+    AC_CHECK_PROG([$1], [${ncn_tool_prefix}${ncn_progname}], 
+                  [${ncn_tool_prefix}${ncn_progname}], , [$4])
+  fi
+  if test -z "$ac_cv_prog_$1" && test $build = $host ; then
+    AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4]) 
+  fi
+  test -n "$ac_cv_prog_$1" && break
+done
+
+if test -z "$ac_cv_prog_$1" ; then
+  ifelse([$3],[], [set dummy $2
+  if test $build = $host ; then
+    $1="[$]2"
+  else
+    $1="${ncn_tool_prefix}[$]2"
+  fi], [$1="$3"])
+fi
+]) []dnl # NCN_STRICT_CHECK_TOOLS
+
+####
+# NCN_STRICT_CHECK_TARGET_TOOLS(variable, progs-to-check-for,[value-if-not-found],[path])
+# Like CVS Autoconf AC_CHECK_TARGET_TOOLS, but require prefix if build!=target.
+
+AC_DEFUN([NCN_STRICT_CHECK_TARGET_TOOLS],
+[AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl
+AC_ARG_VAR([$1], patsubst([$1], [_FOR_TARGET$], [])[ for the target])
+
+if test -n "[$]$1"; then
+  ac_cv_prog_$1=[$]$1
+elif test -n "$ac_cv_prog_$1"; then
+  $1=$ac_cv_prog_$1
+fi
+
+if test -n "$ac_cv_prog_$1"; then
+  for ncn_progname in $2; do
+    AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4])
+  done
+fi
+
+if test -z "$ac_cv_prog_$1" && test -n "$with_build_time_tools"; then
+  for ncn_progname in $2; do
+    AC_MSG_CHECKING([for ${ncn_progname} in $with_build_time_tools])
+    if test -x $with_build_time_tools/${ncn_progname}; then
+      ac_cv_prog_$1=$with_build_time_tools/${ncn_progname}
+      AC_MSG_RESULT(yes)
+      break
+    else
+      AC_MSG_RESULT(no)
+    fi
+  done
+fi
+
+if test -z "$ac_cv_prog_$1"; then
+  for ncn_progname in $2; do
+    if test -n "$ncn_target_tool_prefix"; then
+      AC_CHECK_PROG([$1], [${ncn_target_tool_prefix}${ncn_progname}], 
+                    [${ncn_target_tool_prefix}${ncn_progname}], , [$4])
+    fi
+    if test -z "$ac_cv_prog_$1" && test $build = $target ; then
+      AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4]) 
+    fi
+    test -n "$ac_cv_prog_$1" && break
+  done
+fi
+  
+if test -z "$ac_cv_prog_$1" ; then
+  ifelse([$3],[], [set dummy $2
+  if test $build = $target ; then
+    $1="[$]2"
+  else
+    $1="${ncn_target_tool_prefix}[$]2"
+  fi], [$1="$3"])
+else
+  $1="$ac_cv_prog_$1"
+fi
+]) []dnl # NCN_STRICT_CHECK_TARGET_TOOLS
+  
+
+# Backported from Autoconf 2.5x; can go away when and if
+# we switch.  Put the OS path separator in $PATH_SEPARATOR.
+AC_DEFUN([ACX_PATH_SEP], [
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=: 
+  fi
+  rm -f conf$$.sh
+fi
+])
+
+
+AC_DEFUN([ACX_TOOL_DIRS], [
+AC_REQUIRE([ACX_PATH_SEP])
+if test "x$exec_prefix" = xNONE; then
+        if test "x$prefix" = xNONE; then
+                gcc_cv_tool_prefix=$ac_default_prefix
+        else
+                gcc_cv_tool_prefix=$prefix
+        fi
+else
+        gcc_cv_tool_prefix=$exec_prefix
+fi
+
+# If there is no compiler in the tree, use the PATH only.  In any
+# case, if there is no compiler in the tree nobody should use
+# AS_FOR_TARGET and LD_FOR_TARGET.
+if test x$host = x$build && test -f $srcdir/gcc/BASE-VER; then
+    gcc_version=`cat $srcdir/gcc/BASE-VER`
+    gcc_cv_tool_dirs="$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
+    gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical$PATH_SEPARATOR"
+    gcc_cv_tool_dirs="$gcc_cv_tool_dirs/usr/lib/gcc/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
+    gcc_cv_tool_dirs="$gcc_cv_tool_dirs/usr/lib/gcc/$target_noncanonical$PATH_SEPARATOR"
+    gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
+    gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/$target_noncanonical/bin$PATH_SEPARATOR"
+else
+    gcc_cv_tool_dirs=
+fi
+
+if test x$build = x$target && test -n "$md_exec_prefix"; then
+        gcc_cv_tool_dirs="$gcc_cv_tool_dirs$md_exec_prefix$PATH_SEPARATOR"
+fi
+
+]) []dnl # ACX_TOOL_DIRS
+
+# ACX_HAVE_GCC_FOR_TARGET
+# Check if the variable GCC_FOR_TARGET really points to a GCC binary.
+AC_DEFUN([ACX_HAVE_GCC_FOR_TARGET], [
+cat > conftest.c << \EOF
+#ifdef __GNUC__
+  gcc_yay;
+#endif
+EOF
+if ($GCC_FOR_TARGET -E conftest.c | grep gcc_yay) > /dev/null 2>&1; then
+  have_gcc_for_target=yes
+else
+  GCC_FOR_TARGET=${ncn_target_tool_prefix}gcc
+  have_gcc_for_target=no
+fi
+rm conftest.c
+])
+
+# ACX_CHECK_INSTALLED_TARGET_TOOL(VAR, PROG)
+# Searching for installed target binutils.  We need to take extra care,
+# else we may find the wrong assembler, linker, etc., and lose.
+#
+# First try --with-build-time-tools, if specified.
+#
+# For build != host, we ask the installed GCC for the name of the tool it
+# uses, and accept it if it is an absolute path.  This is because the
+# only good choice for a compiler is the same GCC version that is being
+# installed (or we couldn't make target libraries), and we assume that
+# on the host system we'll have not only the same GCC version, but also
+# the same binutils version.
+#
+# For build == host, search the same directories that the installed
+# compiler will search.  We used to do this for the assembler, linker,
+# and nm only; for simplicity of configuration, however, we extend this
+# criterion to tools (such as ar and ranlib) that are never invoked by
+# the compiler, to avoid mismatches.
+#
+# Also note we have to check MD_EXEC_PREFIX before checking the user's path
+# if build == target.  This makes the most sense only when bootstrapping,
+# but we also do so when build != host.  In this case, we hope that the
+# build and host systems will have similar contents of MD_EXEC_PREFIX.
+#
+# If we do not find a suitable binary, then try the user's path.
+
+AC_DEFUN([ACX_CHECK_INSTALLED_TARGET_TOOL], [
+AC_REQUIRE([ACX_TOOL_DIRS])
+AC_REQUIRE([ACX_HAVE_GCC_FOR_TARGET])
+if test -z "$ac_cv_path_$1" ; then
+  if test -n "$with_build_time_tools"; then
+    AC_MSG_CHECKING([for $2 in $with_build_time_tools])
+    if test -x $with_build_time_tools/$2; then
+      $1=`cd $with_build_time_tools && pwd`/$2
+      ac_cv_path_$1=[$]$1
+      AC_MSG_RESULT([$ac_cv_path_$1])
+    else
+      AC_MSG_RESULT(no)
+    fi
+  elif test $build != $host && test $have_gcc_for_target = yes; then
+    $1=`$GCC_FOR_TARGET --print-prog-name=$2`
+    test [$]$1 = $2 && $1=
+    test -n "[$]$1" && ac_cv_path_$1=[$]$1
+  fi
+fi
+if test -z "$ac_cv_path_$1" && test -n "$gcc_cv_tool_dirs"; then
+  AC_PATH_PROG([$1], [$2], [], [$gcc_cv_tool_dirs])
+fi
+if test -z "$ac_cv_path_$1" ; then
+  NCN_STRICT_CHECK_TARGET_TOOLS([$1], [$2])
+else
+  $1=$ac_cv_path_$1
+fi
+]) []dnl # ACX_CHECK_INSTALLED_TARGET_TOOL
+
+###
+# AC_PROG_CPP_WERROR
+# Used for autoconf 2.5x to force AC_PREPROC_IFELSE to reject code which
+# triggers warnings from the preprocessor.  Will be in autoconf 2.58.
+# For now, using this also overrides header checks to use only the
+# preprocessor (matches 2.13 behavior; matching 2.58's behavior is a
+# bit harder from here).
+# Eventually autoconf will default to checking headers with the compiler
+# instead, and we'll have to do this differently.
+
+AC_DEFUN([AC_PROG_CPP_WERROR],
+[AC_REQUIRE([AC_PROG_CPP])dnl
+m4_define([AC_CHECK_HEADER],m4_defn([_AC_CHECK_HEADER_OLD]))
+ac_c_preproc_warn_flag=yes])# AC_PROG_CPP_WERROR
+
+# Test for GNAT.
+# We require the gnatbind program, and a compiler driver that
+# understands Ada.  We use the user's CC setting, already found,
+# and possibly add $1 to the command-line parameters.
+#
+# Sets the shell variable have_gnat to yes or no as appropriate, and
+# substitutes GNATBIND and GNATMAKE.
+AC_DEFUN([ACX_PROG_GNAT],
+[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])
+AC_REQUIRE([AC_PROG_CC])
+AC_CHECK_TOOL(GNATBIND, gnatbind, no)
+AC_CHECK_TOOL(GNATMAKE, gnatmake, no)
+AC_CACHE_CHECK([whether compiler driver understands Ada],
+		 acx_cv_cc_gcc_supports_ada,
+[cat >conftest.adb <<EOF
+procedure conftest is begin null; end conftest;
+EOF
+acx_cv_cc_gcc_supports_ada=no
+# There is a bug in old released versions of GCC which causes the
+# driver to exit successfully when the appropriate language module
+# has not been installed.  This is fixed in 2.95.4, 3.0.2, and 3.1.
+# Therefore we must check for the error message as well as an
+# unsuccessful exit.
+# Other compilers, like HP Tru64 UNIX cc, exit successfully when
+# given a .adb file, but produce no object file.  So we must check
+# if an object file was really produced to guard against this.
+errors=`(${CC} $1[]m4_ifval([$1], [ ])-c conftest.adb) 2>&1 || echo failure`
+if test x"$errors" = x && test -f conftest.$ac_objext; then
+  acx_cv_cc_gcc_supports_ada=yes
+fi
+rm -f conftest.*])
+
+if test x$GNATBIND != xno && test x$GNATMAKE != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then
+  have_gnat=yes
+else
+  have_gnat=no
+fi
+])
+
+dnl 'make compare' can be significantly faster, if cmp itself can
+dnl skip bytes instead of using tail.  The test being performed is
+dnl "if cmp --ignore-initial=2 t1 t2 && ! cmp --ignore-initial=1 t1 t2"
+dnl but we need to sink errors and handle broken shells.  We also test
+dnl for the parameter format "cmp file1 file2 skip1 skip2" which is
+dnl accepted by cmp on some systems.
+AC_DEFUN([ACX_PROG_CMP_IGNORE_INITIAL],
+[AC_CACHE_CHECK([how to compare bootstrapped objects], gcc_cv_prog_cmp_skip,
+[ echo abfoo >t1
+  echo cdfoo >t2
+  gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
+  if cmp t1 t2 2 2 > /dev/null 2>&1; then
+    if cmp t1 t2 1 1 > /dev/null 2>&1; then
+      :
+    else
+      gcc_cv_prog_cmp_skip='cmp $$f1 $$f2 16 16'
+    fi
+  fi
+  if cmp --ignore-initial=2 t1 t2 > /dev/null 2>&1; then
+    if cmp --ignore-initial=1 t1 t2 > /dev/null 2>&1; then
+      :
+    else
+      gcc_cv_prog_cmp_skip='cmp --ignore-initial=16 $$f1 $$f2'
+    fi
+  fi
+  rm t1 t2
+])
+do_compare="$gcc_cv_prog_cmp_skip"
+AC_SUBST(do_compare)
+])
+
+dnl See whether we can include both string.h and strings.h.
+AC_DEFUN([ACX_HEADER_STRING],
+[AC_CACHE_CHECK([whether string.h and strings.h may both be included],
+  gcc_cv_header_string,
+[AC_TRY_COMPILE([#include <string.h>
+#include <strings.h>], , gcc_cv_header_string=yes, gcc_cv_header_string=no)])
+if test $gcc_cv_header_string = yes; then
+  AC_DEFINE(STRING_WITH_STRINGS, 1, [Define if you can safely include both <string.h> and <strings.h>.])
+fi
+])
+
+dnl See if stdbool.h properly defines bool and true/false.
+dnl Check whether _Bool is built-in.
+AC_DEFUN([ACX_HEADER_STDBOOL],
+[AC_CACHE_CHECK([for working stdbool.h],
+  ac_cv_header_stdbool_h,
+[AC_TRY_COMPILE([#include <stdbool.h>],
+[bool foo = false;],
+ac_cv_header_stdbool_h=yes, ac_cv_header_stdbool_h=no)])
+if test $ac_cv_header_stdbool_h = yes; then
+  AC_DEFINE(HAVE_STDBOOL_H, 1,
+  [Define if you have a working <stdbool.h> header file.])
+fi
+AC_CACHE_CHECK(for built-in _Bool, gcc_cv_c__bool,
+[AC_TRY_COMPILE(,
+[_Bool foo;],
+gcc_cv_c__bool=yes, gcc_cv_c__bool=no)
+])
+if test $gcc_cv_c__bool = yes; then
+  AC_DEFINE(HAVE__BOOL, 1, [Define if the \`_Bool' type is built-in.])
+fi
+])
+
+dnl See if hard links work and if not, try to substitute $1 or simple copy.
+AC_DEFUN([ACX_PROG_LN],
+[AC_MSG_CHECKING(whether ln works)
+AC_CACHE_VAL(acx_cv_prog_LN,
+[rm -f conftestdata_t
+echo >conftestdata_f
+if ln conftestdata_f conftestdata_t 2>/dev/null
+then
+  acx_cv_prog_LN=ln
+else
+  acx_cv_prog_LN=no
+fi
+rm -f conftestdata_f conftestdata_t
+])dnl
+if test $acx_cv_prog_LN = no; then
+  LN="ifelse([$1],,cp,[$1])"
+  AC_MSG_RESULT([no, using $LN])
+else
+  LN="$acx_cv_prog_LN"
+  AC_MSG_RESULT(yes)
+fi
+AC_SUBST(LN)dnl
+])
+
+dnl GCC_TARGET_TOOL(PROGRAM, TARGET-VAR, HOST-VAR, IN-TREE-TOOL, LANGUAGE)
+AC_DEFUN([GCC_TARGET_TOOL],
+[AC_MSG_CHECKING(where to find the target $1)
+if test "x${build}" != "x${host}" ; then
+  if expr "x[$]$2" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname [$]$2`
+    AC_MSG_RESULT(pre-installed in $ac_dir)
+  else
+    # Canadian cross, just use what we found
+    AC_MSG_RESULT(pre-installed)
+  fi
+else
+  ifelse([$4],,,
+  [ok=yes
+  case " ${configdirs} " in
+    *" patsubst([$4], [/.*], []) "*) ;;
+    *) ok=no ;;
+  esac
+  ifelse([$5],,, 
+  [case ,${enable_languages}, in
+    *,$5,*) ;;
+    *) ok=no ;;
+  esac])
+  if test $ok = yes; then
+    # An in-tree tool is available and we can use it
+    $2='$$r/$(HOST_SUBDIR)/$4'
+    AC_MSG_RESULT(just compiled)
+  el])if expr "x[$]$2" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname [$]$2`
+    AC_MSG_RESULT(pre-installed in $ac_dir)
+  elif test "x$target" = "x$host"; then
+    # We can use an host tool
+    $2='$($3)'
+    AC_MSG_RESULT(host tool)
+  else
+    # We need a cross tool
+    AC_MSG_RESULT(pre-installed)
+  fi
+fi
+AC_SUBST($2)])
+
+
+dnl Locate a program and check that its version is acceptable.
+dnl ACX_PROG_CHECK_VER(var, name, version-switch,
+dnl                    version-extract-regexp, version-glob)
+AC_DEFUN([ACX_CHECK_PROG_VER],[
+  AC_CHECK_PROG([$1], [$2], [$2])
+  if test -n "[$]$1"; then
+    # Found it, now check the version.
+    AC_CACHE_CHECK([for modern $2],
+                   [gcc_cv_prog_$2_modern],
+                   [ac_prog_version=`eval [$]$1 $3 2>&1 |
+                                     sed -n 's/^.*patsubst([[$4]],/,\/).*$/\1/p'`
+
+                    [case $ac_prog_version in
+                      '')  gcc_cv_prog_$2_modern=no;;
+                      $5)  gcc_cv_prog_$2_modern=yes;;
+                      *)   gcc_cv_prog_$2_modern=no;;
+                    esac]
+                   ])
+  else
+    gcc_cv_prog_$2_modern=no
+  fi
+  if test $gcc_cv_prog_$2_modern = no; then
+    $1="${CONFIG_SHELL-/bin/sh} $ac_aux_dir/missing $2"
+  fi
+])
+
+dnl Support the --with-pkgversion configure option.
+dnl ACX_PKGVERSION(default-pkgversion)
+AC_DEFUN([ACX_PKGVERSION],[
+  AC_ARG_WITH(pkgversion,
+    AS_HELP_STRING([--with-pkgversion=PKG],
+                   [Use PKG in the version string in place of "$1"]),
+    [case "$withval" in
+      yes) AC_MSG_ERROR([package version not specified]) ;;
+      no)  PKGVERSION= ;;
+      *)   PKGVERSION="($withval) " ;;
+     esac],
+    PKGVERSION="($1) "
+  )
+  AC_SUBST(PKGVERSION)
+])
+
+dnl Support the --with-bugurl configure option.
+dnl ACX_BUGURL(default-bugurl)
+AC_DEFUN([ACX_BUGURL],[
+  AC_ARG_WITH(bugurl,
+    AS_HELP_STRING([--with-bugurl=URL],
+                   [Direct users to URL to report a bug]),
+    [case "$withval" in
+      yes) AC_MSG_ERROR([bug URL not specified]) ;;
+      no)  BUGURL=
+	   ;;
+      *)   BUGURL="$withval"
+	   ;;
+     esac],
+     BUGURL="$1"
+  )
+  case ${BUGURL} in
+  "")
+    REPORT_BUGS_TO=
+    REPORT_BUGS_TEXI=
+    ;;
+  *)
+    REPORT_BUGS_TO="<$BUGURL>"
+    REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`}
+    ;;
+  esac;
+  AC_SUBST(REPORT_BUGS_TO)
+  AC_SUBST(REPORT_BUGS_TEXI)
+])
+
+dnl ####
+dnl # ACX_CHECK_CYGWIN_CAT_WORKS
+dnl # On Cygwin hosts, check that the cat command ignores 
+dnl # carriage returns as otherwise builds will not work.
+dnl # See binutils PR 4334 for more details.
+AC_DEFUN([ACX_CHECK_CYGWIN_CAT_WORKS],[
+AC_MSG_CHECKING([to see if cat works as expected])
+echo a >cygwin-cat-check
+if test `cat cygwin-cat-check` = a ; then
+  rm cygwin-cat-check
+  AC_MSG_RESULT(yes)
+else
+  rm cygwin-cat-check
+  AC_MSG_RESULT(no)
+  AC_MSG_ERROR([The cat command does not ignore carriage return characters.
+  Please either mount the build directory in binary mode or run the following
+  commands before running any configure script:
+set -o igncr
+export SHELLOPTS 
+  ])
+fi
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/bootstrap-O1.mk sdcc-3.2.0+dfsg/support/sdbinutils/config/bootstrap-O1.mk
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/bootstrap-O1.mk	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/bootstrap-O1.mk	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1 @@
+BOOT_CFLAGS := -O1 $(filter-out -O%, $(BOOT_CFLAGS))
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/bootstrap-O3.mk sdcc-3.2.0+dfsg/support/sdbinutils/config/bootstrap-O3.mk
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/bootstrap-O3.mk	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/bootstrap-O3.mk	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1 @@
+BOOT_CFLAGS := -O3 $(filter-out -O%, $(BOOT_CFLAGS))
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/bootstrap-debug-big.mk sdcc-3.2.0+dfsg/support/sdbinutils/config/bootstrap-debug-big.mk
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/bootstrap-debug-big.mk	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/bootstrap-debug-big.mk	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,8 @@
+# This BUILD_CONFIG option is a bit like bootstrap-debug-lean, but it
+# trades space for speed: instead of recompiling programs during
+# stage3, it generates dumps during stage2 and stage3, saving them all
+# until the final compare.
+
+STAGE2_CFLAGS += -fdump-final-insns
+STAGE3_CFLAGS += -fdump-final-insns
+do-compare = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/bootstrap-debug-ckovw.mk sdcc-3.2.0+dfsg/support/sdbinutils/config/bootstrap-debug-ckovw.mk
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/bootstrap-debug-ckovw.mk	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/bootstrap-debug-ckovw.mk	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,16 @@
+# This BUILD_CONFIG option is to be used along with
+# bootstrap-debug-lean and bootstrap-debug-lib in a full bootstrap, to
+# check that all host and target files are built with -fcompare-debug.
+
+# These arrange for a simple warning to be issued if -fcompare-debug
+# is not given.
+# BOOT_CFLAGS += -fcompare-debug="-w%n-fcompare-debug not overridden"
+# TFLAGS += -fcompare-debug="-w%n-fcompare-debug not overridden"
+
+# GCC_COMPARE_DEBUG="-w%n-fcompare-debug not overridden";
+
+FORCE_COMPARE_DEBUG = \
+	GCC_COMPARE_DEBUG=$${GCC_COMPARE_DEBUG--fcompare-debug-not-overridden}; \
+	export GCC_COMPARE_DEBUG;
+POSTSTAGE1_HOST_EXPORTS += $(FORCE_COMPARE_DEBUG)
+BASE_TARGET_EXPORTS += $(FORCE_COMPARE_DEBUG)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/bootstrap-debug-lean.mk sdcc-3.2.0+dfsg/support/sdbinutils/config/bootstrap-debug-lean.mk
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/bootstrap-debug-lean.mk	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/bootstrap-debug-lean.mk	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,11 @@
+# This BUILD_CONFIG option is a bit like bootstrap-debug, but rather
+# than comparing stripped object files, it compares compiler internal
+# state during stage3.  Both can be used simultaneously.
+
+# This makes it slower than bootstrap-debug alone, for there's
+# additional dumping and recompilation during stage3.
+# bootstrap-debug-big can avoid the recompilation, if plenty of disk
+# space is available.
+
+STAGE2_CFLAGS += -fcompare-debug=
+STAGE3_CFLAGS += -fcompare-debug
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/bootstrap-debug-lib.mk sdcc-3.2.0+dfsg/support/sdbinutils/config/bootstrap-debug-lib.mk
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/bootstrap-debug-lib.mk	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/bootstrap-debug-lib.mk	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,12 @@
+# This BUILD_CONFIG option tests that target libraries built during
+# stage3 would have generated the same executable code if they were
+# compiled with -g0.
+
+# It uses -g0 rather than -gtoggle because -g is default on target
+# library builds, and toggling it where it's supposed to be disabled
+# breaks e.g. crtstuff on ppc.
+
+STAGE1_TFLAGS += -g0 -fcompare-debug=
+STAGE2_TFLAGS += -fcompare-debug=
+STAGE3_TFLAGS += -fcompare-debug=-g0
+do-compare = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/bootstrap-debug.mk sdcc-3.2.0+dfsg/support/sdbinutils/config/bootstrap-debug.mk
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/bootstrap-debug.mk	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/bootstrap-debug.mk	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,12 @@
+# This BUILD_CONFIG option builds checks that toggling debug
+# information generation doesn't affect the generated object code.
+
+# It is very lightweight: in addition to not performing any additional
+# compilation (unlike bootstrap-debug-lean), it actually speeds up
+# stage2, for no debug information is generated when compiling with
+# the unoptimized stage1.
+
+# For more thorough testing, see bootstrap-debug-lean.mk
+
+STAGE2_CFLAGS += -gtoggle
+do-compare = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/bootstrap-lto.mk sdcc-3.2.0+dfsg/support/sdbinutils/config/bootstrap-lto.mk
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/bootstrap-lto.mk	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/bootstrap-lto.mk	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,5 @@
+# This option enables LTO for stage2 and stage3.
+
+STAGE2_CFLAGS += -flto=jobserver -frandom-seed=1
+STAGE3_CFLAGS += -flto=jobserver -frandom-seed=1
+STAGEprofile_CFLAGS += -fno-lto
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/bootstrap-time.mk sdcc-3.2.0+dfsg/support/sdbinutils/config/bootstrap-time.mk
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/bootstrap-time.mk	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/bootstrap-time.mk	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2 @@
+BOOT_CFLAGS += -time=$(shell pwd)/time.log
+TFLAGS += -time=$(shell pwd)/time.log
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/cloog.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/cloog.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/cloog.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/cloog.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,288 @@
+# This file is part of GCC.
+#
+# GCC is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 3, or (at your option) any later
+# version.
+#
+# GCC 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 GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+#
+# Contributed by Andreas Simbuerger <simbuerg@fim.uni-passau.de>
+
+# CLOOG_INIT_FLAGS ()
+# -------------------------
+# Provide configure switches for CLooG support.
+# Initialize clooglibs/clooginc according to the user input.
+AC_DEFUN([CLOOG_INIT_FLAGS],
+[
+  AC_ARG_WITH(cloog,
+    [AS_HELP_STRING(
+      [--with-cloog=PATH],
+      [Specify prefix directory for the installed CLooG-PPL package.
+       Equivalent to --with-cloog-include=PATH/include
+       plus --with-cloog-lib=PATH/lib])])
+  AC_ARG_WITH([cloog-include],
+    [AS_HELP_STRING(
+      [--with-cloog-include=PATH],
+      [Specify directory for installed CLooG include files])])
+  AC_ARG_WITH([cloog-lib],
+    [AS_HELP_STRING(
+      [--with-cloog-lib=PATH],
+      [Specify the directory for the installed CLooG library])])
+
+  AC_ARG_ENABLE(cloog-backend,
+    [AS_HELP_STRING(
+      [--enable-cloog-backend[[=BACKEND]]],
+      [set the CLooG BACKEND used to either isl, ppl or ppl-legacy (default)])],
+    [ if   test "x${enableval}" = "xisl"; then
+	cloog_backend=isl
+      elif test "x${enableval}" = "xppl"; then
+	cloog_backend=ppl
+      else
+	cloog_backend=ppl-legacy
+      fi], cloog_backend=ppl-legacy)
+  AC_ARG_ENABLE(cloog-version-check,
+    [AS_HELP_STRING(
+      [--disable-cloog-version-check],
+      [disable check for CLooG version])],
+    ENABLE_CLOOG_CHECK=$enableval,
+    ENABLE_CLOOG_CHECK=yes)
+  
+  # Initialize clooglibs and clooginc.
+  case $with_cloog in
+    no)
+      clooglibs=
+      clooginc=
+      ;;
+    "" | yes)
+      ;;
+    *)
+      clooglibs="-L$with_cloog/lib"
+      clooginc="-I$with_cloog/include"
+      ;;
+  esac
+  if test "x${with_cloog_include}" != x ; then
+    clooginc="-I$with_cloog_include"
+  fi
+  if test "x${with_cloog_lib}" != x; then
+    clooglibs="-L$with_cloog_lib"
+  fi
+
+  dnl Flags needed for CLOOG
+  AC_SUBST(clooglibs)
+  AC_SUBST(clooginc)
+]
+)
+
+# CLOOG_REQUESTED (ACTION-IF-REQUESTED, ACTION-IF-NOT)
+# ----------------------------------------------------
+# Provide actions for failed CLooG detection.
+AC_DEFUN([CLOOG_REQUESTED],
+[
+  AC_REQUIRE([CLOOG_INIT_FLAGS])
+
+  if test "x${with_cloog}" = xno; then
+    $2
+  elif test "x${with_cloog}" != x \
+    || test "x${with_cloog_include}" != x \
+    || test "x${with_cloog_lib}" != x ; then
+    $1
+  else
+    $2
+  fi
+]
+)
+
+# _CLOOG_ORG_PROG_ISL ()
+# ------------------
+# Helper for detecting CLooG.org's ISL backend.
+m4_define([_CLOOG_ORG_PROG_ISL],[AC_LANG_PROGRAM(
+  [#include "cloog/cloog.h" ],
+  [cloog_version ()])])
+
+# _CLOOG_ORG_PROG_PPL ()
+# ------------------
+# Helper for detecting CLooG.org's PPL backend.
+m4_define([_CLOOG_ORG_PROG_PPL],[AC_LANG_PROGRAM(
+  [#include "cloog/cloog.h"
+   #include "cloog/ppl/cloog.h"],
+  [cloog_version ()])])
+
+# _CLOOG_PPL_LEGACY_PROG ()
+# -------------------------
+# Helper for detecting CLooG-Legacy (CLooG-PPL).
+m4_define([_CLOOG_PPL_LEGACY_PROG], [AC_LANG_PROGRAM(
+  [#include "cloog/cloog.h"],
+  [#ifndef CLOOG_PPL_BACKEND
+    choke me
+   #endif ])])
+
+# CLOOG_FIND_FLAGS ()
+# ------------------
+# Detect the used CLooG-backend and set clooginc/clooglibs/cloog_org.
+# Only look for the CLooG backend type specified in --enable-cloog-backend
+AC_DEFUN([CLOOG_FIND_FLAGS],
+[
+  AC_REQUIRE([CLOOG_INIT_FLAGS])
+
+  _cloog_saved_CFLAGS=$CFLAGS
+  _cloog_saved_CPPFLAGS=$CPPFLAGS
+  _cloog_saved_LDFLAGS=$LDFLAGS
+  _cloog_saved_LIBS=$LIBS
+
+  _cloogorginc="-DCLOOG_INT_GMP -DCLOOG_ORG"
+ 
+  dnl clooglibs & clooginc may have been initialized by CLOOG_INIT_FLAGS.
+  CFLAGS="${CFLAGS} ${clooginc} ${gmpinc}"
+  CPPFLAGS="${CPPFLAGS} ${_cloogorginc}"
+  LDFLAGS="${LDFLAGS} ${clooglibs}"
+
+  case $cloog_backend in
+    "ppl-legacy")
+    CFLAGS="${CFLAGS} ${pplinc}"
+    LDFLAGS="${LDFLAGS} ${ppllibs}"
+    AC_CACHE_CHECK([for installed CLooG PPL Legacy], [gcc_cv_cloog_type],
+      [LIBS="-lcloog ${_cloog_saved_LIBS}"
+      AC_LINK_IFELSE([_CLOOG_PPL_LEGACY_PROG], [gcc_cv_cloog_type="PPL Legacy"],
+		     [gcc_cv_cloog_type=no])])
+    ;;
+    "isl")
+    AC_CACHE_CHECK([for installed CLooG ISL], [gcc_cv_cloog_type],
+      [LIBS="-lcloog-isl ${_cloog_saved_LIBS}"
+      AC_LINK_IFELSE([_CLOOG_ORG_PROG_ISL], [gcc_cv_cloog_type="ISL"],
+		     [gcc_cv_cloog_type=no])])
+    ;;
+    "ppl")
+    CFLAGS="${CFLAGS} ${pplinc}"
+    LDFLAGS="${LDFLAGS} ${ppllibs}"
+    AC_CACHE_CHECK([for installed CLooG PPL], [gcc_cv_cloog_type],
+      [LIBS="-lcloog-ppl ${_cloog_saved_LIBS}"
+      AC_LINK_IFELSE([_CLOOG_ORG_PROG_PPL], [gcc_cv_cloog_type="PPL"],
+		     [gcc_cv_cloog_type=no])])
+    ;;
+    *)
+      gcc_cv_cloog_type=""
+  esac
+
+  case $gcc_cv_cloog_type in
+    "PPL Legacy")
+      clooginc="${clooginc}"
+      clooglibs="${clooglibs} -lcloog"
+      cloog_org=no
+      ;;
+    "ISL")
+      clooginc="${clooginc} ${_cloogorginc}"
+      clooglibs="${clooglibs} -lcloog-isl -lisl"
+      cloog_org=yes
+      ;;
+    "PPL")
+      clooginc="${clooginc} ${_cloogorginc}"
+      clooglibs="${clooglibs} -lcloog-ppl"
+      cloog_org=yes
+      ;;
+    *)
+      clooglibs=
+      clooginc=
+      cloog_org=
+      ;;
+  esac
+
+  LIBS=$_cloog_saved_LIBS
+  CFLAGS=$_cloog_saved_CFLAGS
+  CPPFLAGS=$_cloog_saved_CPPFLAGS
+  LDFLAGS=$_cloog_saved_LDFLAGS
+]
+)
+
+# _CLOOG_CHECK_CT_PROG(MAJOR, MINOR, REVISION)
+# --------------------------------------------
+# Helper for verifying CLooG's compile time version.
+m4_define([_CLOOG_CHECK_CT_PROG],[AC_LANG_PROGRAM(
+  [#include "cloog/cloog.h"],
+  [#if CLOOG_VERSION_MAJOR != $1 \
+    || CLOOG_VERSION_MINOR != $2 \
+    || CLOOG_VERSION_REVISION < $3
+    choke me
+   #endif])])
+
+# _CLOOG_CHECK_RT_PROG ()
+# -----------------------
+# Helper for verifying that CLooG's compile time version
+# matches the run time version.
+m4_define([_CLOOG_CHECK_RT_PROG],[AC_LANG_PROGRAM(
+  [#include "cloog/cloog.h"],
+  [if ((cloog_version_major () != CLOOG_VERSION_MAJOR)
+    && (cloog_version_minor () != CLOOG_VERSION_MINOR)
+    && (cloog_version_revision () != CLOOG_VERSION_REVISION))
+    {
+      return 1;
+    }])])
+
+# CLOOG_CHECK_VERSION CLOOG_CHECK_VERSION (MAJOR, MINOR, REVISION)
+# ----------------------------------------------------------------
+# Test the found CLooG to be exact of version MAJOR.MINOR and at least
+# REVISION.
+# If we're using the old CLooG-PPL (Legacy), the old version check will
+# be executed (Ignores the provided version information).
+AC_DEFUN([CLOOG_CHECK_VERSION],
+[
+  AC_REQUIRE([CLOOG_FIND_FLAGS])
+
+  if test "${ENABLE_CLOOG_CHECK}" = yes ; then
+    _cloog_saved_CFLAGS=$CFLAGS
+    _cloog_saved_LDFLAGS=$LDFLAGS
+
+    CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${pplinc} ${gmpinc}"
+    LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
+
+    if test "${cloog_org}" = yes ; then
+      AC_CACHE_CHECK([for version $1.$2.$3 of CLooG],
+        [gcc_cv_cloog_ct_0_14_0],
+        [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)],
+          [gcc_cv_cloog_ct_0_14_0=yes],
+          [gcc_cv_cloog_ct_0_14_0=no])])
+    elif test "${cloog_org}" = no ; then
+      AC_CACHE_CHECK([for version 0.15.5 (or later revision) of CLooG],
+        [gcc_cv_cloog_ct_0_15_5],
+        [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG(0,15,5)],
+          [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG(0,15,9)],
+           [gcc_cv_cloog_ct_0_15_5=yes],
+            [gcc_cv_cloog_ct_0_15_5="buggy but acceptable"])],
+          [gcc_cv_cloog_ct_0_15_5=no])])
+    fi
+
+    CFLAGS=$_cloog_saved_CFLAGS
+    LDFLAGS=$_cloog_saved_LDFLAGS
+  fi
+]
+)
+
+# CLOOG_IF_FAILED (ACTION-IF-FAILED)
+# ----------------------------------
+# Executes ACTION-IF-FAILED, if GRAPHITE was requested and
+# the checks failed.
+AC_DEFUN([CLOOG_IF_FAILED],
+[
+  CLOOG_REQUESTED([graphite_requested=yes], [graphite_requested=no])
+  
+  if test "${gcc_cv_cloog_ct_0_14_0}" = no \
+    || test "${gcc_cv_cloog_rt_0_14_0}" = no \
+    || test "${gcc_cv_cloog_ct_0_15_5}" = no; then
+    clooglibs=
+    clooginc=
+  fi
+
+  if test "${graphite_requested}" = yes \
+    && test "x${clooglibs}" = x \
+    && test "x${clooginc}" = x ; then
+    $1
+  fi
+]
+)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/codeset.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/codeset.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/codeset.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/codeset.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,23 @@
+# codeset.m4 serial AM1 (gettext-0.10.40)
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_LANGINFO_CODESET],
+[
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
+    [AC_TRY_LINK([#include <langinfo.h>],
+      [char* cs = nl_langinfo(CODESET);],
+      am_cv_langinfo_codeset=yes,
+      am_cv_langinfo_codeset=no)
+    ])
+  if test $am_cv_langinfo_codeset = yes; then
+    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  fi
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/depstand.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/depstand.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/depstand.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/depstand.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,137 @@
+##                                                          -*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 8
+
+# Based on depend.m4 from automake 1.9, modified for standalone use in
+# an environment where GNU make is required. 
+
+# ZW_PROG_COMPILER_DEPENDENCIES
+# -----------------------------
+# Variant of _AM_DEPENDENCIES which just does the dependency probe and
+# sets fooDEPMODE accordingly.  Cache-variable compatible with
+# original; not side-effect compatible.  As the users of this macro
+# may require accurate dependencies for correct builds, it does *not*
+# honor --disable-dependency-checking, and failure to detect a usable
+# method is an error.  depcomp is assumed to be located in
+# $ac_aux_dir.
+#
+# FIXME: Should use the Autoconf 2.5x language-selection mechanism.
+
+AC_DEFUN([ZW_PROG_COMPILER_DEPENDENCIES],
+[ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
+
+am_depcomp=$ac_aux_dir/depcomp
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    if test $depmode = none; then break; fi
+
+    _AS_ECHO([$as_me:$LINENO: trying $depmode], AS_MESSAGE_LOG_FD)
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "include sub/conftest.Po" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    depcmd="depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c"
+    echo "| $depcmd" | sed -e 's/  */ /g' >&AS_MESSAGE_LOG_FD
+    if env $depcmd > conftest.err 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po >>conftest.err 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po >>conftest.err 2>&1 &&
+       ${MAKE-make} -s -f confmf >>conftest.err 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+	_AS_ECHO([$as_me:$LINENO: success], AS_MESSAGE_LOG_FD)
+        break
+      fi
+    fi
+    _AS_ECHO([$as_me:$LINENO: failure, diagnostics are:], AS_MESSAGE_LOG_FD)
+    sed -e 's/^/| /' < conftest.err >&AS_MESSAGE_LOG_FD
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+if test x${am_cv_$1_dependencies_compiler_type-none} = xnone
+then AC_MSG_ERROR([no usable dependency style found])
+else AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+fi
+])
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+# ZW_CREATE_DEPDIR
+# ----------------
+# As AM_SET_DEPDIR, but also create the directory at config.status time.
+AC_DEFUN([ZW_CREATE_DEPDIR],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_CONFIG_COMMANDS([depdir], [$SHELL $ac_aux_dir/mkinstalldirs $DEPDIR],
+			     [ac_aux_dir=$ac_aux_dir DEPDIR=$DEPDIR])
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/dfp.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/dfp.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/dfp.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/dfp.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,56 @@
+dnl @synopsis GCC_AC_ENABLE_DECIMAL_FLOAT([target triplet])
+dnl
+dnl Enable C extension for decimal float if target supports it.
+dnl
+dnl @author Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+AC_DEFUN([GCC_AC_ENABLE_DECIMAL_FLOAT],
+[
+AC_ARG_ENABLE(decimal-float,
+[  --enable-decimal-float={no,yes,bid,dpd}
+			enable decimal float extension to C.  Selecting 'bid'
+			or 'dpd' choses which decimal floating point format
+			to use],
+[
+  case $enable_decimal_float in
+    yes | no | bid | dpd) default_decimal_float=$enable_decimal_float ;;
+    *) AC_MSG_ERROR(['$enable_decimal_float' is an invalid value for --enable-decimal-float.
+Valid choices are 'yes', 'bid', 'dpd', and 'no'.]) ;;
+  esac
+],
+[
+  case $1 in
+    powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux* | \
+    i?86*-*-mingw* | x86_64*-*-mingw* | \
+    i?86*-*-cygwin*)
+      enable_decimal_float=yes
+      ;;
+    *)
+      AC_MSG_WARN([decimal float is not supported for this target, ignored])
+      enable_decimal_float=no
+      ;;
+  esac
+])
+
+# x86's use BID format instead of DPD
+case x$enable_decimal_float in
+  xyes)
+    case $1 in
+      i?86*-*-* | x86_64*-*-*)
+	enable_decimal_float=bid
+	;;
+      *)
+	enable_decimal_float=dpd
+	;;
+    esac
+    default_decimal_float=$enable_decimal_float
+    ;;
+  xno)
+    # ENABLE_DECIMAL_FLOAT is set to 0. But we have to have proper
+    # dependency on libdecnumber.
+    default_decimal_float=dpd
+    ;;
+esac
+AC_SUBST(enable_decimal_float)
+
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/elf.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/elf.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/elf.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/elf.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,27 @@
+dnl Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paolo Bonzini.
+
+dnl usage: ACX_ELF_TARGET_IFELSE([if-elf], [if-not-elf])
+AC_DEFUN([ACX_ELF_TARGET_IFELSE], [
+AC_REQUIRE([AC_CANONICAL_TARGET])
+
+target_elf=no
+case $target in
+  *-darwin* | *-aix* | *-cygwin* | *-mingw* | *-aout* | *-*coff* | \
+  *-msdosdjgpp* | *-vms* | *-wince* | *-*-pe* | \
+  alpha*-dec-osf* | *-interix* | hppa[[12]]*-*-hpux*)
+    target_elf=no
+    ;;
+  *)
+    target_elf=yes
+    ;;
+esac
+
+AS_IF([test $target_elf = yes], [$1], [$2])
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/enable.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/enable.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/enable.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/enable.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,38 @@
+dnl ----------------------------------------------------------------------
+dnl This whole bit snagged from libstdc++-v3.
+
+dnl
+dnl GCC_ENABLE
+dnl    (FEATURE, DEFAULT, HELP-ARG, HELP-STRING)
+dnl    (FEATURE, DEFAULT, HELP-ARG, HELP-STRING, permit a|b|c)
+dnl    (FEATURE, DEFAULT, HELP-ARG, HELP-STRING, SHELL-CODE-HANDLER)
+dnl
+dnl See docs/html/17_intro/configury.html#enable for documentation.
+dnl
+AC_DEFUN([GCC_ENABLE],[dnl
+m4_define([_g_switch],[--enable-$1])dnl
+m4_define([_g_help],[AC_HELP_STRING(_g_switch$3,[$4 @<:@default=$2@:>@])])dnl
+ AC_ARG_ENABLE($1,_g_help,
+  m4_bmatch([$5],
+   [^permit ],
+     [[
+      case "$enableval" in
+       m4_bpatsubst([$5],[permit ])) ;;
+       *) AC_MSG_ERROR(Unknown argument to enable/disable $1) ;;
+          dnl Idea for future:  generate a URL pointing to
+          dnl "onlinedocs/configopts.html#whatever"
+      esac
+     ]],
+   [^$],
+     [[
+      case "$enableval" in
+       yes|no) ;;
+       *) AC_MSG_ERROR(Argument to enable/disable $1 must be yes or no) ;;
+      esac
+     ]],
+   [[$5]]),
+  [enable_]m4_bpatsubst([$1],-,_)[=][$2])
+m4_undefine([_g_switch])dnl
+m4_undefine([_g_help])dnl
+])
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/extensions.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/extensions.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/extensions.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/extensions.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,79 @@
+# serial 6  -*- Autoconf -*-
+# Enable extensions on systems that normally disable them.
+
+# Copyright (C) 2003, 2006, 2007, 2009 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS
+# Autoconf.  Perhaps we can remove this once we can assume Autoconf
+# 2.62 or later everywhere, but since CVS Autoconf mutates rapidly
+# enough in this area it's likely we'll need to redefine
+# AC_USE_SYSTEM_EXTENSIONS for quite some time.
+
+m4_version_prereq([2.62],, [
+
+# AC_USE_SYSTEM_EXTENSIONS
+# ------------------------
+# Enable extensions on systems that normally disable them,
+# typically due to standards-conformance issues.
+# Remember that #undef in AH_VERBATIM gets replaced with #define by
+# AC_DEFINE.  The goal here is to define all known feature-enabling
+# macros, then, if reports of conflicts are made, disable macros that
+# cause problems on some platforms (such as __EXTENSIONS__).
+AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
+[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
+AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
+
+  AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
+  if test "$MINIX" = yes; then
+    AC_DEFINE([_POSIX_SOURCE], [1],
+      [Define to 1 if you need to in order for `stat' and other
+       things to work.])
+    AC_DEFINE([_POSIX_1_SOURCE], [2],
+      [Define to 2 if the system does not provide POSIX.1 features
+       except with this defined.])
+    AC_DEFINE([_MINIX], [1],
+      [Define to 1 if on MINIX.])
+  fi
+
+  AH_VERBATIM([__EXTENSIONS__],
+[/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+])
+  AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
+    [ac_cv_safe_to_define___extensions__],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM([
+#	  define __EXTENSIONS__ 1
+	  AC_INCLUDES_DEFAULT])],
+       [ac_cv_safe_to_define___extensions__=yes],
+       [ac_cv_safe_to_define___extensions__=no])])
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    AC_DEFINE([__EXTENSIONS__])
+  AC_DEFINE([_ALL_SOURCE])
+  AC_DEFINE([_GNU_SOURCE])
+  AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
+  AC_DEFINE([_TANDEM_SOURCE])
+])# AC_USE_SYSTEM_EXTENSIONS
+
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/futex.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/futex.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/futex.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/futex.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,64 @@
+dnl ----------------------------------------------------------------------
+dnl This whole bit snagged from libgomp.
+
+dnl
+dnl GCC_LINUX_FUTEX
+dnl    (SHELL-CODE_HANDLER)
+dnl
+AC_DEFUN([GCC_LINUX_FUTEX],[dnl
+GCC_ENABLE(linux-futex,default, ,[use the Linux futex system call],
+	   permit yes|no|default)
+case "$target" in
+  *-linux*)
+    case "$enable_linux_futex" in
+      default)
+	# If headers don't have gettid/futex syscalls definition, then
+	# default to no, otherwise there will be compile time failures.
+	# Otherwise, default to yes.  If we don't detect we are
+	# compiled/linked against NPTL and not cross-compiling, check
+	# if programs are run by default against NPTL and if not, issue
+	# a warning.
+	enable_linux_futex=no
+	AC_LINK_IFELSE(
+	 [AC_LANG_PROGRAM(
+	  [#include <sys/syscall.h>
+	   int lk;],
+	  [syscall (SYS_gettid); syscall (SYS_futex, &lk, 0, 0, 0);])],
+	  [save_LIBS="$LIBS"
+	   LIBS="-lpthread $LIBS"
+	   AC_LINK_IFELSE(
+	   [AC_LANG_PROGRAM(
+	    [#ifndef _GNU_SOURCE
+	     #define _GNU_SOURCE 1
+	     #endif
+	     #include <pthread.h>
+	     pthread_t th; void *status;],
+	    [pthread_tryjoin_np (th, &status);])],[enable_linux_futex=yes],
+	    [if test x$cross_compiling = xno; then
+	       if getconf GNU_LIBPTHREAD_VERSION 2>/dev/null \
+		  | LC_ALL=C grep -i NPTL > /dev/null 2>/dev/null; then :; else
+		 AC_MSG_WARN([The kernel might not support futex or gettid syscalls.
+If so, please configure with --disable-linux-futex])
+	       fi
+	     fi
+	     enable_linux_futex=yes])
+	   LIBS="$save_LIBS"])
+	;;
+      yes)
+	AC_LINK_IFELSE(
+	 [AC_LANG_PROGRAM(
+	  [#include <sys/syscall.h>
+	   int lk;],
+	  [syscall (SYS_gettid); syscall (SYS_futex, &lk, 0, 0, 0);])],[],
+	  [AC_MSG_ERROR([SYS_gettid and SYS_futex required for --enable-linux-futex])])
+	;;
+    esac
+    ;;
+  *)
+    enable_linux_futex=no
+    ;;
+esac
+if test x$enable_linux_futex = xyes; then
+  $1
+fi
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/gc++filt.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/gc++filt.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/gc++filt.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/gc++filt.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,26 @@
+# gc++filt.m4 serial 1					-*- Autoconf -*-
+# Find an instance of GNU c++filt on PATH.
+
+dnl Copyright (C) 2010 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Rainer Orth.
+
+# GCC_PROG_GNU_CXXFILT
+# --------------------
+# Check for GNU c++filt.
+# FIXME: Maybe need TARGET variant, though c++filt should be target
+# independent.
+AC_DEFUN([GCC_PROG_GNU_CXXFILT],
+  [AC_ARG_VAR([CXXFILT], [Location of GNU c++filt.  Defaults to the first
+    GNU version of `c++filt', `gc++filt' on PATH.])
+  AC_CACHE_CHECK([for GNU c++filt], [ac_cv_path_CXXFILT],
+    [AC_PATH_PROGS_FEATURE_CHECK([CXXFILT], [c++filt gc++filt],
+      [_AC_PATH_PROG_FLAVOR_GNU([$ac_path_CXXFILT],
+	[ac_cv_path_CXXFILT=$ac_path_CXXFILT && ac_path_CXXFILT_found=:])])])
+  CXXFILT=$ac_cv_path_CXXFILT
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/gettext-sister.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/gettext-sister.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/gettext-sister.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/gettext-sister.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,80 @@
+# intl sister-directory configuration rules.
+#
+
+# The idea behind this macro is that there's no need to repeat all the
+# autoconf probes done by the intl directory - it's already done them
+# for us.  In fact, there's no need even to look at the cache for the
+# answers.  All we need to do is nab a few pieces of information.
+# The intl directory is set up to make this easy, by generating a
+# small file which can be sourced as a shell script; then we produce
+# the necessary substitutions and definitions for this directory.
+
+AC_DEFUN([ZW_GNU_GETTEXT_SISTER_DIR],
+[# If we haven't got the data from the intl directory,
+# assume NLS is disabled.
+USE_NLS=no	AC_SUBST(USE_NLS)
+LIBINTL=	AC_SUBST(LIBINTL)
+LIBINTL_DEP=	AC_SUBST(LIBINTL_DEP)
+INCINTL=	AC_SUBST(INCINTL)
+XGETTEXT=	AC_SUBST(XGETTEXT)
+GMSGFMT=	AC_SUBST(GMSGFMT)
+POSUB=		AC_SUBST(POSUB)
+
+if test -f  ifelse([$1],,[../intl],[$1])/config.intl; then
+  .  ifelse([$1],,[../intl],[$1])/config.intl
+fi
+AC_MSG_CHECKING([whether NLS is requested])
+if test x"$USE_NLS" != xyes; then
+  AC_MSG_RESULT(no)
+else
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(ENABLE_NLS, 1, 
+ [Define to 1 if translation of program messages to the 
+  user's native language is requested.])
+
+  AC_MSG_CHECKING(for catalogs to be installed)
+  # Look for .po and .gmo files in the source directory.
+  CATALOGS=  AC_SUBST(CATALOGS)
+  XLINGUAS=
+  for cat in $srcdir/po/*.gmo $srcdir/po/*.po; do
+    # If there aren't any .gmo files the shell will give us the
+    # literal string "../path/to/srcdir/po/*.gmo" which has to be
+    # weeded out.
+    case "$cat" in *\**)
+      continue;;
+    esac
+    # The quadruple backslash is collapsed to a double backslash
+    # by the backticks, then collapsed again by the double quotes,
+    # leaving us with one backslash in the sed expression (right
+    # before the dot that mustn't act as a wildcard).
+    cat=`echo $cat | sed -e "s!$srcdir/po/!!" -e "s!\\\\.po!.gmo!"`
+    lang=`echo $cat | sed -e "s!\\\\.gmo!!"`
+    # The user is allowed to set LINGUAS to a list of languages to
+    # install catalogs for.  If it's empty that means "all of them."
+    if test "x$LINGUAS" = x; then
+      CATALOGS="$CATALOGS $cat"
+      XLINGUAS="$XLINGUAS $lang"
+    else
+      case "$LINGUAS" in *$lang*)
+        CATALOGS="$CATALOGS $cat"
+        XLINGUAS="$XLINGUAS $lang"
+        ;;
+      esac
+    fi
+  done
+  LINGUAS="$XLINGUAS"
+  AC_MSG_RESULT($LINGUAS)
+
+  dnl Set up some additional variables which our po/Make-in files
+  dnl may need.
+
+  dnl For backward compatibility. Some Makefiles may be using these.
+  DATADIRNAME=share
+  AC_SUBST(DATADIRNAME)
+  INSTOBJEXT=.mo
+  AC_SUBST(INSTOBJEXT)
+  GENCAT=gencat
+  AC_SUBST(GENCAT)
+  CATOBJEXT=.gmo
+  AC_SUBST(CATOBJEXT)
+fi])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/gettext.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/gettext.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/gettext.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/gettext.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,415 @@
+# gettext.m4 serial 20 (gettext-0.12)
+dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+dnl Macro to add for using GNU gettext.
+
+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
+dnl    default (if it is not specified or empty) is 'no-libtool'.
+dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
+dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
+dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
+dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl    depending on --{enable,disable}-{shared,static} and on the presence of
+dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
+dnl    $(top_builddir)/intl/libintl.a will be created.
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl    implementations (in libc or libintl) without the ngettext() function
+dnl    will be ignored.  If NEEDSYMBOL is specified and is
+dnl    'need-formatstring-macros', then GNU gettext implementations that don't
+dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
+dnl INTLDIR is used to find the intl libraries.  If empty,
+dnl    the value `$(top_builddir)/intl/' is used.
+dnl
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl    and used.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl    Catalog format: none
+dnl    Catalog extension: none
+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([AM_GNU_GETTEXT],
+[
+  dnl Argument checking.
+  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
+    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
+])])])])])
+  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
+    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
+])])])])
+  define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
+  define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
+
+  AC_REQUIRE([AM_PO_SUBDIRS])dnl
+  ifelse(gt_included_intl, yes, [
+    AC_REQUIRE([AM_INTL_SUBDIR])dnl
+  ])
+
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Sometimes libintl requires libiconv, so first search for libiconv.
+  dnl Ideally we would do this search only after the
+  dnl      if test "$USE_NLS" = "yes"; then
+  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+  dnl the configure script would need to contain the same shell code
+  dnl again, outside any 'if'. There are two solutions:
+  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
+  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
+  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
+  dnl documented, we avoid it.
+  ifelse(gt_included_intl, yes, , [
+    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+  ])
+
+  dnl Set USE_NLS.
+  AM_NLS
+
+  ifelse(gt_included_intl, yes, [
+    BUILD_INCLUDED_LIBINTL=no
+    USE_INCLUDED_LIBINTL=no
+  ])
+  LIBINTL=
+  LTLIBINTL=
+  POSUB=
+
+  dnl If we use NLS figure out what method
+  if test "$USE_NLS" = "yes"; then
+    gt_use_preinstalled_gnugettext=no
+    ifelse(gt_included_intl, yes, [
+      AC_MSG_CHECKING([whether included gettext is requested])
+      AC_ARG_WITH(included-gettext,
+        [  --with-included-gettext use the GNU gettext library included here],
+        nls_cv_force_use_gnu_gettext=$withval,
+        nls_cv_force_use_gnu_gettext=no)
+      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
+
+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+    ])
+        dnl User does not insist on using GNU NLS library.  Figure out what
+        dnl to use.  If GNU gettext is available we use this.  Else we have
+        dnl to fall back to GNU NLS library.
+
+        dnl Add a version number to the cache macros.
+        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
+        define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
+        define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
+
+        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
+         [AC_TRY_LINK([#include <libintl.h>
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;],
+            [bindtextdomain ("", "");
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
+            gt_cv_func_gnugettext_libc=yes,
+            gt_cv_func_gnugettext_libc=no)])
+
+        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+          dnl Sometimes libintl requires libiconv, so first search for libiconv.
+          ifelse(gt_included_intl, yes, , [
+            AM_ICONV_LINK
+          ])
+          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
+          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
+          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
+          dnl even if libiconv doesn't exist.
+          AC_LIB_LINKFLAGS_BODY([intl])
+          AC_CACHE_CHECK([for GNU gettext in libintl],
+            gt_cv_func_gnugettext_libintl,
+           [gt_save_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $INCINTL"
+            gt_save_LIBS="$LIBS"
+            LIBS="$LIBS $LIBINTL"
+            dnl Now see whether libintl exists and does not depend on libiconv.
+            AC_TRY_LINK([#include <libintl.h>
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias ();],
+              [bindtextdomain ("", "");
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
+              gt_cv_func_gnugettext_libintl=yes,
+              gt_cv_func_gnugettext_libintl=no)
+            dnl Now see whether libintl exists and depends on libiconv.
+            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
+              LIBS="$LIBS $LIBICONV"
+              AC_TRY_LINK([#include <libintl.h>
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias ();],
+                [bindtextdomain ("", "");
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
+               [LIBINTL="$LIBINTL $LIBICONV"
+                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                gt_cv_func_gnugettext_libintl=yes
+               ])
+            fi
+            CPPFLAGS="$gt_save_CPPFLAGS"
+            LIBS="$gt_save_LIBS"])
+        fi
+
+        dnl If an already present or preinstalled GNU gettext() is found,
+        dnl use it.  But if this macro is used in GNU gettext, and GNU
+        dnl gettext is already preinstalled in libintl, we update this
+        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
+        if test "$gt_cv_func_gnugettext_libc" = "yes" \
+           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
+                && test "$PACKAGE" != gettext-runtime \
+                && test "$PACKAGE" != gettext-tools; }; then
+          gt_use_preinstalled_gnugettext=yes
+        else
+          dnl Reset the values set by searching for libintl.
+          LIBINTL=
+          LTLIBINTL=
+          INCINTL=
+        fi
+
+    ifelse(gt_included_intl, yes, [
+        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
+          dnl GNU gettext is not found in the C library.
+          dnl Fall back on included GNU gettext library.
+          nls_cv_use_gnu_gettext=yes
+        fi
+      fi
+
+      if test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions used to generate GNU NLS library.
+        BUILD_INCLUDED_LIBINTL=yes
+        USE_INCLUDED_LIBINTL=yes
+        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
+        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
+        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+      fi
+
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions to use GNU gettext tools.
+        CATOBJEXT=.gmo
+      fi
+    ])
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes" \
+       || test "$nls_cv_use_gnu_gettext" = "yes"; then
+      AC_DEFINE(ENABLE_NLS, 1,
+        [Define to 1 if translation of program messages to the user's native language
+   is requested.])
+    else
+      USE_NLS=no
+    fi
+  fi
+
+  AC_MSG_CHECKING([whether to use NLS])
+  AC_MSG_RESULT([$USE_NLS])
+  if test "$USE_NLS" = "yes"; then
+    AC_MSG_CHECKING([where the gettext function comes from])
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+        gt_source="external libintl"
+      else
+        gt_source="libc"
+      fi
+    else
+      gt_source="included intl directory"
+    fi
+    AC_MSG_RESULT([$gt_source])
+  fi
+
+  if test "$USE_NLS" = "yes"; then
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+        AC_MSG_CHECKING([how to link with libintl])
+        AC_MSG_RESULT([$LIBINTL])
+        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
+      fi
+
+      dnl For backward compatibility. Some packages may be using this.
+      AC_DEFINE(HAVE_GETTEXT, 1,
+       [Define if the GNU gettext() function is already present or preinstalled.])
+      AC_DEFINE(HAVE_DCGETTEXT, 1,
+       [Define if the GNU dcgettext() function is already present or preinstalled.])
+    fi
+
+    dnl We need to process the po/ directory.
+    POSUB=po
+  fi
+
+  ifelse(gt_included_intl, yes, [
+    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+    dnl to 'yes' because some of the testsuite requires it.
+    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
+      BUILD_INCLUDED_LIBINTL=yes
+    fi
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST(BUILD_INCLUDED_LIBINTL)
+    AC_SUBST(USE_INCLUDED_LIBINTL)
+    AC_SUBST(CATOBJEXT)
+
+    dnl For backward compatibility. Some configure.ins may be using this.
+    nls_cv_header_intl=
+    nls_cv_header_libgt=
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    DATADIRNAME=share
+    AC_SUBST(DATADIRNAME)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INSTOBJEXT=.mo
+    AC_SUBST(INSTOBJEXT)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    GENCAT=gencat
+    AC_SUBST(GENCAT)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    if test "$USE_INCLUDED_LIBINTL" = yes; then
+      INTLOBJS="\$(GETTOBJS)"
+    fi
+    AC_SUBST(INTLOBJS)
+
+    dnl Enable libtool support if the surrounding package wishes it.
+    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
+    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
+  ])
+
+  dnl For backward compatibility. Some Makefiles may be using this.
+  INTLLIBS="$LIBINTL"
+  AC_SUBST(INTLLIBS)
+
+  dnl Make all documented variables known to autoconf.
+  AC_SUBST(LIBINTL)
+  AC_SUBST(LTLIBINTL)
+  AC_SUBST(POSUB)
+])
+
+
+dnl Checks for all prerequisites of the intl subdirectory,
+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
+dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
+AC_DEFUN([AM_INTL_SUBDIR],
+[
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
+  AC_REQUIRE([AC_PROG_CC])dnl
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
+  AC_REQUIRE([AC_PROG_RANLIB])dnl
+  AC_REQUIRE([AC_ISC_POSIX])dnl
+  AC_REQUIRE([AC_HEADER_STDC])dnl
+  AC_REQUIRE([AC_C_CONST])dnl
+  AC_REQUIRE([AC_C_INLINE])dnl
+  AC_REQUIRE([AC_TYPE_OFF_T])dnl
+  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+  AC_REQUIRE([AC_FUNC_MMAP])dnl
+  AC_REQUIRE([jm_GLIBC21])dnl
+  AC_REQUIRE([gt_INTDIV0])dnl
+  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
+  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
+  AC_REQUIRE([gt_INTTYPES_PRI])dnl
+
+  AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+stdlib.h string.h unistd.h sys/param.h])
+  AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
+geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
+strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next \
+__fsetlocking])
+
+  AM_ICONV
+  AM_LANGINFO_CODESET
+  if test $ac_cv_header_locale_h = yes; then
+    AM_LC_MESSAGES
+  fi
+
+  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
+  dnl because plural.y uses bison specific features. It requires at least
+  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+  dnl compile.
+  dnl bison is only needed for the maintainer (who touches plural.y). But in
+  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+  dnl the rule in general Makefile. Now, some people carelessly touch the
+  dnl files or have a broken "make" program, hence the plural.c rule will
+  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+  dnl present or too old.
+  AC_CHECK_PROGS([INTLBISON], [bison])
+  if test -z "$INTLBISON"; then
+    ac_verc_fail=yes
+  else
+    dnl Found it, now check the version.
+    AC_MSG_CHECKING([version of bison])
+changequote(<<,>>)dnl
+    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+    case $ac_prog_version in
+      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+changequote([,])dnl
+         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+    esac
+    AC_MSG_RESULT([$ac_prog_version])
+  fi
+  if test $ac_verc_fail = yes; then
+    INTLBISON=:
+  fi
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/glibc21.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/glibc21.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/glibc21.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/glibc21.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,32 @@
+# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+# Test for the GNU C Library, version 2.1 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([jm_GLIBC21],
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
+      ac_cv_gnu_library_2_1,
+      [AC_EGREP_CPP([Lucky GNU user],
+	[
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+	],
+	ac_cv_gnu_library_2_1=yes,
+	ac_cv_gnu_library_2_1=no)
+      ]
+    )
+    AC_SUBST(GLIBC21)
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  ]
+)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/gxx-include-dir.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/gxx-include-dir.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/gxx-include-dir.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/gxx-include-dir.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,32 @@
+dnl Usage: TL_AC_GXX_INCLUDE_DIR
+dnl
+dnl Set $gxx_include_dir to the location of the installed C++ include
+dnl directory.  The value depends on $gcc_version and the configuration
+dnl options --with-gxx-include-dir and --enable-version-specific-runtime-libs.
+dnl
+dnl If you change the default here, you'll need to change the gcc and
+dnl libstdc++-v3 subdirectories too.
+AC_DEFUN([TL_AC_GXX_INCLUDE_DIR],
+[
+case "${with_gxx_include_dir}" in
+  yes)
+    AC_MSG_ERROR([--with-gxx-include-dir=[[dir]] requires a directory])
+    ;;
+  no | "")
+    case "${enable_version_specific_runtime_libs}" in
+      yes) gxx_include_dir='$(libsubdir)/include/c++' ;;
+      *)
+	libstdcxx_incdir='c++/$(gcc_version)'
+	gxx_include_dir='include/$(libstdcxx_incdir)'
+	if test -n "$with_cross_host" && 
+           test x"$with_cross_host" != x"no"; then	
+          gxx_include_dir='${prefix}/${target_alias}/'"$gxx_include_dir"
+        else
+          gxx_include_dir='${prefix}/'"$gxx_include_dir"
+        fi;;
+    esac ;;
+  *) gxx_include_dir=${with_gxx_include_dir} ;;
+esac
+AC_SUBST(gxx_include_dir)
+AC_SUBST(libstdcxx_incdir)
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/iconv.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/iconv.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/iconv.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/iconv.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,103 @@
+# iconv.m4 serial AM4 (gettext-0.11.3)
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
+[
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([iconv])
+])
+
+AC_DEFUN([AM_ICONV_LINK],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+
+  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed libiconv and not disabled its use
+  dnl via --without-libiconv-prefix, he wants to use it. The first
+  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
+  am_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
+
+  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+      [iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);],
+      am_cv_func_iconv=yes)
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS $LIBICONV"
+      AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+        [iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);],
+        am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes)
+      LIBS="$am_save_LIBS"
+    fi
+  ])
+  if test "$am_cv_func_iconv" = yes; then
+    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    AC_MSG_CHECKING([how to link with libiconv])
+    AC_MSG_RESULT([$LIBICONV])
+  else
+    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
+    dnl either.
+    CPPFLAGS="$am_save_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
+  fi
+  AC_SUBST(LIBICONV)
+  AC_SUBST(LTLIBICONV)
+])
+
+AC_DEFUN([AM_ICONV],
+[
+  AM_ICONV_LINK
+  if test "$am_cv_func_iconv" = yes; then
+    AC_MSG_CHECKING([for iconv declaration])
+    AC_CACHE_VAL(am_cv_proto_iconv, [
+      AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    AC_MSG_RESULT([$]{ac_t:-
+         }[$]am_cv_proto_iconv)
+    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+      [Define as const if the declaration of iconv() needs const.])
+  fi
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/intdiv0.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/intdiv0.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/intdiv0.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/intdiv0.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,72 @@
+# intdiv0.m4 serial 1 (gettext-0.11.3)
+dnl Copyright (C) 2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([gt_INTDIV0],
+[
+  AC_REQUIRE([AC_PROG_CC])dnl
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+  AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
+    gt_cv_int_divbyzero_sigfpe,
+    [
+      AC_TRY_RUN([
+#include <stdlib.h>
+#include <signal.h>
+
+static void
+#ifdef __cplusplus
+sigfpe_handler (int sig)
+#else
+sigfpe_handler (sig) int sig;
+#endif
+{
+  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
+  exit (sig != SIGFPE);
+}
+
+int x = 1;
+int y = 0;
+int z;
+int nan;
+
+int main ()
+{
+  signal (SIGFPE, sigfpe_handler);
+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
+  signal (SIGTRAP, sigfpe_handler);
+#endif
+/* Linux/SPARC yields signal SIGILL.  */
+#if defined (__sparc__) && defined (__linux__)
+  signal (SIGILL, sigfpe_handler);
+#endif
+
+  z = x / y;
+  nan = y / y;
+  exit (1);
+}
+], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
+        [
+          # Guess based on the CPU.
+          case "$host_cpu" in
+            alpha* | i[34567]86 | m68k | s390*)
+              gt_cv_int_divbyzero_sigfpe="guessing yes";;
+            *)
+              gt_cv_int_divbyzero_sigfpe="guessing no";;
+          esac
+        ])
+    ])
+  case "$gt_cv_int_divbyzero_sigfpe" in
+    *yes) value=1;;
+    *) value=0;;
+  esac
+  AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
+    [Define if integer division by zero raises signal SIGFPE.])
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/inttypes-pri.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/inttypes-pri.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/inttypes-pri.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/inttypes-pri.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,32 @@
+# inttypes-pri.m4 serial 1 (gettext-0.11.4)
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
+# macros to non-string values.  This is the case on AIX 4.3.3.
+
+AC_DEFUN([gt_INTTYPES_PRI],
+[
+  AC_REQUIRE([gt_HEADER_INTTYPES_H])
+  if test $gt_cv_header_inttypes_h = yes; then
+    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
+      gt_cv_inttypes_pri_broken,
+      [
+        AC_TRY_COMPILE([#include <inttypes.h>
+#ifdef PRId32
+char *p = PRId32;
+#endif
+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
+      ])
+  fi
+  if test "$gt_cv_inttypes_pri_broken" = yes; then
+    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
+      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
+  fi
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/inttypes.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/inttypes.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/inttypes.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/inttypes.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,27 @@
+# inttypes.m4 serial 1 (gettext-0.11.4)
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
+# <sys/types.h>.
+
+AC_DEFUN([gt_HEADER_INTTYPES_H],
+[
+  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
+  [
+    AC_TRY_COMPILE(
+      [#include <sys/types.h>
+#include <inttypes.h>],
+      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
+  ])
+  if test $gt_cv_header_inttypes_h = yes; then
+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
+      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
+  fi
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/inttypes_h.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/inttypes_h.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/inttypes_h.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/inttypes_h.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,28 @@
+# inttypes_h.m4 serial 5 (gettext-0.12)
+dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+
+AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
+[
+  AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
+  [AC_TRY_COMPILE(
+    [#include <sys/types.h>
+#include <inttypes.h>],
+    [uintmax_t i = (uintmax_t) -1;],
+    jm_ac_cv_header_inttypes_h=yes,
+    jm_ac_cv_header_inttypes_h=no)])
+  if test $jm_ac_cv_header_inttypes_h = yes; then
+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
+      [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
+       and declares uintmax_t. ])
+  fi
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/largefile.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/largefile.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/largefile.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/largefile.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,34 @@
+# This macro wraps AC_SYS_LARGEFILE with one exception for Solaris.
+# PR 9992/binutils: We have to replicate everywhere the behaviour of
+# bfd's configure script so that all the directories agree on the size
+# of structures used to describe files.
+
+AC_DEFUN([ACX_LARGEFILE],[dnl
+
+# The tests for host and target for $enable_largefile require
+# canonical names.
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([AC_CANONICAL_TARGET])
+
+# As the $enable_largefile decision depends on --enable-plugins we must set it
+# even in directories otherwise not depending on the $plugins option.
+
+AC_PLUGINS
+
+case "${host}" in
+changequote(,)dnl
+  sparc-*-solaris*|i[3-7]86-*-solaris*)
+changequote([,])dnl
+    # On native 32bit sparc and ia32 solaris, large-file and procfs support
+    # are mutually exclusive; and without procfs support, the bfd/ elf module
+    # cannot provide certain routines such as elfcore_write_prpsinfo
+    # or elfcore_write_prstatus.  So unless the user explicitly requested
+    # large-file support through the --enable-largefile switch, disable
+    # large-file support in favor of procfs support.
+    test "${target}" = "${host}" -a "x$plugins" = xno \
+      && : ${enable_largefile="no"}
+    ;;
+esac
+
+AC_SYS_LARGEFILE
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/lcmessage.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/lcmessage.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/lcmessage.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/lcmessage.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,32 @@
+# lcmessage.m4 serial 3 (gettext-0.11.3)
+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
+
+# Check whether LC_MESSAGES is available in <locale.h>.
+
+AC_DEFUN([AM_LC_MESSAGES],
+[
+  AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+  if test $am_cv_val_LC_MESSAGES = yes; then
+    AC_DEFINE(HAVE_LC_MESSAGES, 1,
+      [Define if your <locale.h> file defines LC_MESSAGES.])
+  fi
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/ld-symbolic.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/ld-symbolic.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/ld-symbolic.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/ld-symbolic.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,45 @@
+dnl Copyright (C) 2007 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl Set SYMBOLIC_LDFLAGS to -Bsymbolic-functions for GNU linker if it
+dnl is supported.
+AC_DEFUN([ACX_PROG_LD_GNU_SYMBOLIC],
+[AC_CACHE_CHECK([if the GNU linker ($LD) supports -Bsymbolic-functions],
+acl_cv_prog_gnu_ld_symbolic, [
+acl_cv_prog_gnu_ld_symbolic=no
+AC_REQUIRE([AC_LIB_PROG_LD_GNU])
+if test x"$with_gnu_ld" = x"yes"; then
+  if $LD --help 2>&1 </dev/null | grep Bsymbolic-functions 1>&5; then
+    acl_cv_prog_gnu_ld_symbolic=yes
+  fi
+fi])
+if test x"$acl_cv_prog_gnu_ld_symbolic" = x"yes"; then
+  SYMBOLIC_LDFLAGS="-Wl,-Bsymbolic-functions"
+else
+  SYMBOLIC_LDFLAGS=''
+fi
+])
+
+dnl Set DYNAMIC_LIST_CPP_NEW_LDFLAGS to --dynamic-list-cpp-new for GNU
+dnl linker if it is supported.
+AC_DEFUN([ACX_PROG_LD_GNU_DYNAMIC_LIST_CPP_NEW],
+[AC_CACHE_CHECK([if the GNU linker ($LD) supports --dynamic-list-cpp-new],
+acl_cv_prog_gnu_ld_dynamic_list_cpp_new, [
+acl_cv_prog_gnu_ld_dynamic_list_cpp_new=no
+AC_REQUIRE([ACX_PROG_LD_GNU_SYMBOLIC])
+if test x"$with_gnu_ld" = x"yes" -a \
+	x"$acl_cv_prog_gnu_ld_symbolic" = x"yes"; then
+  if $LD --help 2>&1 </dev/null | grep dynamic-list-cpp-new 1>&5; then
+    acl_cv_prog_gnu_ld_dynamic_list_cpp_new=yes
+  fi
+fi])
+if test x"$acl_cv_prog_gnu_ld_dynamic_list_cpp_new" = x"yes"; then
+   DYNAMIC_LIST_CPP_NEW_LDFLAGS="$SYMBOLIC_LDFLAGS -Wl,--dynamic-list-cpp-new"
+else
+   DYNAMIC_LIST_CPP_NEW_LDFLAGS=''
+fi
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/lead-dot.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/lead-dot.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/lead-dot.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/lead-dot.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,31 @@
+#                                                          -*- Autoconf -*-
+# Copyright (C) 2003, 2009  Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+# serial 1
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/lib-ld.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/lib-ld.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/lib-ld.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/lib-ld.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,110 @@
+# lib-ld.m4 serial 2 (gettext-0.12)
+dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl Subroutines of libtool.m4,
+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
+dnl with libtool.m4.
+
+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+  acl_cv_prog_gnu_ld=yes
+else
+  acl_cv_prog_gnu_ld=no
+fi])
+with_gnu_ld=$acl_cv_prog_gnu_ld
+])
+
+dnl From libtool-1.4. Sets the variable LD.
+AC_DEFUN([AC_LIB_PROG_LD],
+[AC_ARG_WITH(gnu-ld,
+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by GCC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]* | [A-Za-z]:[\\/]*)]
+      [re_direlt='/[^/][^/]*/\.\./']
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(acl_cv_path_LD,
+[if test -z "$LD"; then
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      acl_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some GNU ld's only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+	test "$with_gnu_ld" != no && break
+      else
+	test "$with_gnu_ld" != yes && break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+else
+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_LIB_PROG_LD_GNU
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/lib-link.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/lib-link.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/lib-link.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/lib-link.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,551 @@
+# lib-link.m4 serial 4 (gettext-0.12)
+dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
+AC_DEFUN([AC_LIB_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  define([Name],[translit([$1],[./-], [___])])
+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+    AC_LIB_LINKFLAGS_BODY([$1], [$2])
+    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+  ])
+  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+  dnl results of this search when this library appears as a dependency.
+  HAVE_LIB[]NAME=yes
+  undefine([Name])
+  undefine([NAME])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
+dnl searches for libname and the libraries corresponding to explicit and
+dnl implicit dependencies, together with the specified include files and
+dnl the ability to compile and link the specified testcode. If found, it
+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  define([Name],[translit([$1],[./-], [___])])
+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
+  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed lib[]Name and not disabled its use
+  dnl via --without-lib[]Name-prefix, he wants to use it.
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
+  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+    ac_save_LIBS="$LIBS"
+    LIBS="$LIBS $LIB[]NAME"
+    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
+    LIBS="$ac_save_LIBS"
+  ])
+  if test "$ac_cv_lib[]Name" = yes; then
+    HAVE_LIB[]NAME=yes
+    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
+    AC_MSG_CHECKING([how to link with lib[]$1])
+    AC_MSG_RESULT([$LIB[]NAME])
+  else
+    HAVE_LIB[]NAME=no
+    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
+    dnl $INC[]NAME either.
+    CPPFLAGS="$ac_save_CPPFLAGS"
+    LIB[]NAME=
+    LTLIB[]NAME=
+  fi
+  AC_SUBST([HAVE_LIB]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  undefine([Name])
+  undefine([NAME])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
+dnl hardcode_direct, hardcode_minus_L.
+AC_DEFUN([AC_LIB_RPATH],
+[
+  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
+  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
+  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
+  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_rpath=done
+  ])
+  wl="$acl_cv_wl"
+  libext="$acl_cv_libext"
+  shlibext="$acl_cv_shlibext"
+  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  hardcode_direct="$acl_cv_hardcode_direct"
+  hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE(rpath,
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
+])
+
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_LIB_ARG_WITH([lib$1-prefix],
+[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
+  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/lib"
+      fi
+    fi
+])
+  dnl Search the library and its dependencies in $additional_libdir and
+  dnl $LDFLAGS. Using breadth-first-seach.
+  LIB[]NAME=
+  LTLIB[]NAME=
+  INC[]NAME=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='$1 $2'
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+        dnl or AC_LIB_HAVE_LINKFLAGS call.
+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+          else
+            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+            dnl that this library doesn't exist. So just drop it.
+            :
+          fi
+        else
+          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
+          dnl and the already constructed $LIBNAME/$LTLIBNAME.
+          found_dir=
+          found_la=
+          found_so=
+          found_a=
+          if test $use_additional = yes; then
+            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+              found_dir="$additional_libdir"
+              found_so="$additional_libdir/lib$name.$shlibext"
+              if test -f "$additional_libdir/lib$name.la"; then
+                found_la="$additional_libdir/lib$name.la"
+              fi
+            else
+              if test -f "$additional_libdir/lib$name.$libext"; then
+                found_dir="$additional_libdir"
+                found_a="$additional_libdir/lib$name.$libext"
+                if test -f "$additional_libdir/lib$name.la"; then
+                  found_la="$additional_libdir/lib$name.la"
+                fi
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIB[]NAME; do
+              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+                    found_dir="$dir"
+                    found_so="$dir/lib$name.$shlibext"
+                    if test -f "$dir/lib$name.la"; then
+                      found_la="$dir/lib$name.la"
+                    fi
+                  else
+                    if test -f "$dir/lib$name.$libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/lib$name.$libext"
+                      if test -f "$dir/lib$name.la"; then
+                        found_la="$dir/lib$name.la"
+                      fi
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+            dnl Found the library.
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+              dnl Linking with a shared library. We attempt to hardcode its
+              dnl directory into the executable's runpath, unless it's the
+              dnl standard /usr/lib.
+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+                dnl No hardcoding is needed.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+              else
+                dnl Use an explicit option to hardcode DIR into the resulting
+                dnl binary.
+                dnl Potentially add DIR to ltrpathdirs.
+                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                dnl The hardcoding into $LIBNAME is system dependent.
+                if test "$hardcode_direct" = yes; then
+                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+                  dnl resulting binary.
+                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                else
+                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+                    dnl Use an explicit option to hardcode DIR into the resulting
+                    dnl binary.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    dnl Potentially add DIR to rpathdirs.
+                    dnl The rpathdirs will be appended to $LIBNAME at the end.
+                    haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                    dnl Rely on "-L$found_dir".
+                    dnl But don't add it if it's already contained in the LDFLAGS
+                    dnl or the already constructed $LIBNAME
+                    haveit=
+                    for x in $LDFLAGS $LIB[]NAME; do
+                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+                    fi
+                    if test "$hardcode_minus_L" != no; then
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    else
+                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
+                      dnl here, because this doesn't fit in flags passed to the
+                      dnl compiler. So give up. No hardcoding. This affects only
+                      dnl very old systems.
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                dnl Linking with a static library.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
+              else
+                dnl We shouldn't come here, but anyway it's good to have a
+                dnl fallback.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
+              fi
+            fi
+            dnl Assume the include files are nearby.
+            additional_includedir=
+            case "$found_dir" in
+              */lib | */lib/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+              dnl Potentially add $additional_includedir to $INCNAME.
+              dnl But don't add it
+              dnl   1. if it's the standard /usr/include,
+              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
+              dnl   3. if it's already present in $CPPFLAGS or the already
+              dnl      constructed $INCNAME,
+              dnl   4. if it doesn't exist as a directory.
+              if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux*) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INC[]NAME; do
+                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                      dnl Really add $additional_includedir to $INCNAME.
+                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+            dnl Look for dependencies.
+            if test -n "$found_la"; then
+              dnl Read the .la file. It defines the variables
+              dnl dlname, library_names, old_library, dependency_libs, current,
+              dnl age, revision, installed, dlopen, dlpreopen, libdir.
+              save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+              dnl We use only dependency_libs.
+              for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
+                    dnl But don't add it
+                    dnl   1. if it's the standard /usr/lib,
+                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
+                    dnl   3. if it's already present in $LDFLAGS or the already
+                    dnl      constructed $LIBNAME,
+                    dnl   4. if it doesn't exist as a directory.
+                    if test "X$additional_libdir" != "X/usr/lib"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/lib"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux*) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LIBNAME.
+                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LTLIBNAME.
+                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                    dnl Handle this in the next round.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                    dnl Handle this in the next round. Throw away the .la's
+                    dnl directory; it is already contained in a preceding -L
+                    dnl option.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                    dnl Most likely an immediate library name.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+            dnl Didn't find the library; assume it is in the system directories
+            dnl known to the linker and runtime loader. (All the system
+            dnl directories known to the linker should also be known to the
+            dnl runtime loader, otherwise the system is severely misconfigured.)
+            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$hardcode_libdir_separator"; then
+      dnl Weird platform: only the last -rpath option counts, the user must
+      dnl pass all path elements in one option. We can arrange that for a
+      dnl single library, but not when more than one $LIBNAMEs are used.
+      alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+      done
+      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
+      acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+    else
+      dnl The -rpath options are cumulative.
+      for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+    dnl When using libtool, the option that works for both libraries and
+    dnl executables is -R. The -R options are cumulative.
+    for found_dir in $ltrpathdirs; do
+      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+    done
+  fi
+])
+
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
+AC_DEFUN([AC_LIB_APPENDTOVAR],
+[
+  for element in [$2]; do
+    haveit=
+    for x in $[$1]; do
+      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      [$1]="${[$1]}${[$1]:+ }$element"
+    fi
+  done
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/lib-prefix.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/lib-prefix.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/lib-prefix.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/lib-prefix.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,155 @@
+# lib-prefix.m4 serial 2 (gettext-0.12)
+dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl require excessive bracketing.
+ifdef([AC_HELP_STRING],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
+[
+  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_LIB_ARG_WITH([lib-prefix],
+[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+  --without-lib-prefix    don't search for libraries in includedir and libdir],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/lib"
+      fi
+    fi
+])
+  if test $use_additional = yes; then
+    dnl Potentially add $additional_includedir to $CPPFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/include,
+    dnl   2. if it's already present in $CPPFLAGS,
+    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_includedir" != "X/usr/include"; then
+      haveit=
+      for x in $CPPFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-I$additional_includedir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_includedir" = "X/usr/local/include"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux*) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_includedir"; then
+            dnl Really add $additional_includedir to $CPPFLAGS.
+            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+          fi
+        fi
+      fi
+    fi
+    dnl Potentially add $additional_libdir to $LDFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/lib,
+    dnl   2. if it's already present in $LDFLAGS,
+    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_libdir" != "X/usr/lib"; then
+      haveit=
+      for x in $LDFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-L$additional_libdir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_libdir" = "X/usr/local/lib"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux*) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_libdir"; then
+            dnl Really add $additional_libdir to $LDFLAGS.
+            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+          fi
+        fi
+      fi
+    fi
+  fi
+])
+
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
+dnl acl_final_exec_prefix, containing the values to which $prefix and
+dnl $exec_prefix will expand at the end of the configure script.
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
+[
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  $1
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/lthostflags.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/lthostflags.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/lthostflags.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/lthostflags.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,33 @@
+dnl Copyright (C) 2010 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl usage: ACX_LT_HOST_FLAGS([default_flags])
+dnl Defines and AC_SUBSTs lt_host_flags
+
+
+AC_DEFUN([ACX_LT_HOST_FLAGS], [
+AC_REQUIRE([AC_CANONICAL_SYSTEM])
+
+case $host in
+  *-cygwin* | *-mingw*)
+    # 'host' will be top-level target in the case of a target lib,
+    # we must compare to with_cross_host to decide if this is a native
+    # or cross-compiler and select where to install dlls appropriately.
+    if test -n "$with_cross_host" &&
+	test x"$with_cross_host" != x"no"; then
+      lt_host_flags='-no-undefined -bindir "$(toolexeclibdir)"';
+    else
+      lt_host_flags='-no-undefined -bindir "$(bindir)"';
+    fi
+    ;;
+  *)
+    lt_host_flags=[$1]
+    ;;
+esac
+
+AC_SUBST(lt_host_flags)
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/mh-cygwin sdcc-3.2.0+dfsg/support/sdbinutils/config/mh-cygwin
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/mh-cygwin	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/mh-cygwin	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4 @@
+# Increase stack limit to a figure based on the Linux default, with 4MB added
+# as GCC turns out to need that much more to pass all the limits-* tests.
+LDFLAGS += -Wl,--stack,12582912
+BOOT_LDFLAGS += -Wl,--stack,12582912
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/mh-darwin sdcc-3.2.0+dfsg/support/sdbinutils/config/mh-darwin
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/mh-darwin	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/mh-darwin	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,5 @@
+# The -mdynamic-no-pic ensures that the compiler executable is built without
+# position-independent-code -- the usual default on Darwin. This fix speeds
+# compiles by 3-5%.
+
+BOOT_CFLAGS += -mdynamic-no-pic
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/mh-djgpp sdcc-3.2.0+dfsg/support/sdbinutils/config/mh-djgpp
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/mh-djgpp	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/mh-djgpp	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,14 @@
+# Shorten the target alias so when it is used to set 'libsubdir'
+# the name will work in both short and long filename environments.
+ifeq ($(findstring -pc-msdosdjgpp,$(target_alias)),-pc-msdosdjgpp)
+target_alias=djgpp
+endif
+
+# The version string must be modified to contain just one dot
+# because DOS filenames can only have one dot when long filenames
+# are not available.
+__version:=$(gcc_version)
+__version:=$(subst ., ,$(__version))
+ifeq ($(words $(__version)),3)
+gcc_version=$(word 1,$(__version)).$(word 2,$(__version))$(word 3,$(__version))
+endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/mh-interix sdcc-3.2.0+dfsg/support/sdbinutils/config/mh-interix
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/mh-interix	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/mh-interix	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,7 @@
+# The shell may not be in /bin. 
+SHELL = sh
+
+# We also need to override LIBGCC2_DEBUG_CFLAGS so libgcc2 will be
+# built without debugging information
+
+LIBGCC2_DEBUG_CFLAGS=
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/mh-mingw sdcc-3.2.0+dfsg/support/sdbinutils/config/mh-mingw
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/mh-mingw	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/mh-mingw	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,8 @@
+# Add -D__USE_MINGW_ACCESS to enable the built compiler to work on Windows
+# Vista (see PR33281 for details).
+BOOT_CFLAGS += -D__USE_MINGW_ACCESS -Wno-pedantic-ms-format
+CFLAGS += -D__USE_MINGW_ACCESS
+# Increase stack limit to a figure based on the Linux default, with 4MB added
+# as GCC turns out to need that much more to pass all the limits-* tests.
+LDFLAGS += -Wl,--stack,12582912
+BOOT_LDFLAGS += -Wl,--stack,12582912
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/mh-pa sdcc-3.2.0+dfsg/support/sdbinutils/config/mh-pa
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/mh-pa	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/mh-pa	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4 @@
+# The ada virtual array implementation requires that indexing be disabled on
+# hosts such as hpux that use a segmented memory architecture.  Both the c
+# and ada files need to be compiled with this option for correct operation.
+ADA_CFLAGS = -mdisable-indexing
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/mh-pa-hpux10 sdcc-3.2.0+dfsg/support/sdbinutils/config/mh-pa-hpux10
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/mh-pa-hpux10	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/mh-pa-hpux10	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4 @@
+# The ada virtual array implementation requires that indexing be disabled on
+# hosts such as hpux that use a segmented memory architecture.  Both the c
+# and ada files need to be compiled with this option for correct operation.
+ADA_CFLAGS = -mdisable-indexing -D_X_HPUX10
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/mh-ppc-aix sdcc-3.2.0+dfsg/support/sdbinutils/config/mh-ppc-aix
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/mh-ppc-aix	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/mh-ppc-aix	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,8 @@
+# To prevent the Ada static runtime library from using nearly the entire
+# TOC, we used to compile Ada files with minimal-toc in addition to -gnatg
+# (mandatory to compile language defined units).  This incured a performance
+# penalty and is not required with section anchors enabled by default so we
+# don't do it any more.
+BOOT_ADAFLAGS = -gnatapg
+BOOT_LDFLAGS = -Wl,-bbigtoc
+LDFLAGS = `case $(CC) in *gcc*) echo -Wl,-bbigtoc ;; esac;`
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/mt-alphaieee sdcc-3.2.0+dfsg/support/sdbinutils/config/mt-alphaieee
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/mt-alphaieee	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/mt-alphaieee	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2 @@
+CFLAGS_FOR_TARGET += -mieee
+CXXFLAGS_FOR_TARGET += -mieee
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/mt-d30v sdcc-3.2.0+dfsg/support/sdbinutils/config/mt-d30v
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/mt-d30v	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/mt-d30v	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4 @@
+# Build libraries optimizing for space, not speed.
+# Turn off warnings about symbols named the same as registers
+ CFLAGS_FOR_TARGET = -g -Os -Wa,-C
+ CXXFLAGS_FOR_TARGET = -g -Os -Wa,-C
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/mt-gnu sdcc-3.2.0+dfsg/support/sdbinutils/config/mt-gnu
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/mt-gnu	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/mt-gnu	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1 @@
+CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/mt-mips-elfoabi sdcc-3.2.0+dfsg/support/sdbinutils/config/mt-mips-elfoabi
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/mt-mips-elfoabi	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/mt-mips-elfoabi	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1 @@
+include $(srcdir)/config/mt-mips16-compat
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/mt-mips-gnu sdcc-3.2.0+dfsg/support/sdbinutils/config/mt-mips-gnu
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/mt-mips-gnu	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/mt-mips-gnu	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2 @@
+include $(srcdir)/config/mt-gnu
+include $(srcdir)/config/mt-mips16-compat
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/mt-mips16-compat sdcc-3.2.0+dfsg/support/sdbinutils/config/mt-mips16-compat
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/mt-mips16-compat	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/mt-mips16-compat	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,5 @@
+# Configurations use this fragment if they support MIPS16 and non-MIPS16 code,
+# but if the libraries are all non-MIPS16.  Add -minterlink-mips16 so
+# that the libraries can be used with both ISA modes.
+CFLAGS_FOR_TARGET += -minterlink-mips16
+CXXFLAGS_FOR_TARGET += -minterlink-mips16
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/mt-ospace sdcc-3.2.0+dfsg/support/sdbinutils/config/mt-ospace
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/mt-ospace	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/mt-ospace	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3 @@
+# Build libraries optimizing for space, not speed.
+ CFLAGS_FOR_TARGET = -g -Os
+ CXXFLAGS_FOR_TARGET = -g -Os
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/mt-sde sdcc-3.2.0+dfsg/support/sdbinutils/config/mt-sde
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/mt-sde	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/mt-sde	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,10 @@
+# We default to building libraries optimised for size.  We use
+# -minterlink-mips16 so that the non-MIPS16 libraries can still be
+# linked against partly-MIPS16 code.  The -mcode-xonly option allows
+# MIPS16 libraries to run on Harvard-style split I/D memories, so long
+# as they have the D-to-I redirect for PC-relative loads.  -mno-gpopt
+# has two purposes: it allows libraries to be used in situations where
+# $gp != our _gp, and it allows them to be built with -G8 while
+# retaining link compability with -G0 and -G4.
+CFLAGS_FOR_TARGET += -Os -minterlink-mips16 -mcode-xonly -mno-gpopt
+CXXFLAGS_FOR_TARGET += -Os -minterlink-mips16 -mcode-xonly -mno-gpopt
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/mt-spu sdcc-3.2.0+dfsg/support/sdbinutils/config/mt-spu
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/mt-spu	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/mt-spu	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2 @@
+# spu ld makefile invokes as-new and bin2c in maintainer mode.
+all-ld: $(MAINT) all-gas all-binutils
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/multi.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/multi.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/multi.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/multi.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,68 @@
+##                                                          -*- Autoconf -*-
+# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 6
+
+# AM_ENABLE_MULTILIB([MAKEFILE], [REL-TO-TOP-SRCDIR])
+# ---------------------------------------------------
+# Add --enable-multilib to configure.
+AC_DEFUN([AM_ENABLE_MULTILIB],
+[# Default to --enable-multilib
+AC_ARG_ENABLE(multilib,
+[  --enable-multilib       build many library versions (default)],
+[case "$enableval" in
+  yes) multilib=yes ;;
+  no)  multilib=no ;;
+  *)   AC_MSG_ERROR([bad value $enableval for multilib option]) ;;
+ esac],
+	      [multilib=yes])
+
+# We may get other options which we leave undocumented:
+# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# See config-ml.in if you want the gory details.
+
+if test "$srcdir" = "."; then
+  if test "$with_target_subdir" != "."; then
+    multi_basedir="$srcdir/$with_multisrctop../$2"
+  else
+    multi_basedir="$srcdir/$with_multisrctop$2"
+  fi
+else
+  multi_basedir="$srcdir/$2"
+fi
+AC_SUBST(multi_basedir)
+
+# Even if the default multilib is not a cross compilation,
+# it may be that some of the other multilibs are.
+if test $cross_compiling = no && test $multilib = yes \
+   && test "x${with_multisubdir}" != x ; then
+   cross_compiling=maybe
+fi
+
+AC_OUTPUT_COMMANDS([
+# Only add multilib support code if we just rebuilt the top-level
+# Makefile.
+case " $CONFIG_FILES " in
+ *" ]m4_default([$1],Makefile)[ "*)
+   ac_file=]m4_default([$1],Makefile)[ . ${multi_basedir}/config-ml.in
+   ;;
+esac],
+		   [
+srcdir="$srcdir"
+host="$host"
+target="$target"
+with_multisubdir="$with_multisubdir"
+with_multisrctop="$with_multisrctop"
+with_target_subdir="$with_target_subdir"
+ac_configure_args="${multilib_arg} ${ac_configure_args}"
+multi_basedir="$multi_basedir"
+CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+CC="$CC"
+CXX="$CXX"
+GFORTRAN="$GFORTRAN"
+GCJ="$GCJ"])])dnl
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/nls.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/nls.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/nls.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/nls.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,49 @@
+# nls.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE(nls,
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT($USE_NLS)
+  AC_SUBST(USE_NLS)
+])
+
+AC_DEFUN([AM_MKINSTALLDIRS],
+[
+  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
+  dnl Try to locate it.
+  MKINSTALLDIRS=
+  if test -n "$ac_aux_dir"; then
+    case "$ac_aux_dir" in
+      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
+      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
+    esac
+  fi
+  if test -z "$MKINSTALLDIRS"; then
+    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+  fi
+  AC_SUBST(MKINSTALLDIRS)
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/no-executables.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/no-executables.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/no-executables.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/no-executables.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,69 @@
+# GCC_NO_EXECUTABLES
+# -----------------
+# FIXME: The GCC team has specific needs which the current Autoconf
+# framework cannot solve elegantly.  This macro implements a dirty
+# hack until Autoconf is able to provide the services its users
+# need.
+#
+# Several of the support libraries that are often built with GCC can't
+# assume the tool-chain is already capable of linking a program: the
+# compiler often expects to be able to link with some of such
+# libraries.
+#
+# In several of these libraries, workarounds have been introduced to
+# avoid the AC_PROG_CC_WORKS test, that would just abort their
+# configuration.  The introduction of AC_EXEEXT, enabled either by
+# libtool or by CVS autoconf, have just made matters worse.
+#
+# Unlike the previous AC_NO_EXECUTABLES, this test does not
+# disable link tests at autoconf time, but at configure time.
+# This allows AC_NO_EXECUTABLES to be invoked conditionally.
+AC_DEFUN_ONCE([GCC_NO_EXECUTABLES],
+[m4_divert_push([KILL])
+
+AC_BEFORE([$0], [_AC_COMPILER_EXEEXT])
+AC_BEFORE([$0], [AC_LINK_IFELSE])
+
+m4_define([_AC_COMPILER_EXEEXT],
+[AC_LANG_CONFTEST([AC_LANG_PROGRAM()])
+# FIXME: Cleanup?
+AS_IF([AC_TRY_EVAL(ac_link)], [gcc_no_link=no], [gcc_no_link=yes])
+if test x$gcc_no_link = xyes; then
+  # Setting cross_compile will disable run tests; it will
+  # also disable AC_CHECK_FILE but that's generally
+  # correct if we can't link.
+  cross_compiling=yes
+  EXEEXT=
+else
+  ]m4_defn([_AC_COMPILER_EXEEXT])dnl
+fi
+)
+
+m4_define([AC_LINK_IFELSE],
+if test x$gcc_no_link = xyes; then
+  AC_MSG_ERROR([Link tests are not allowed after [[$0]].])
+fi
+m4_defn([AC_LINK_IFELSE]))
+
+dnl This is a shame.  We have to provide a default for some link tests,
+dnl similar to the default for run tests.
+m4_define([AC_FUNC_MMAP],
+if test x$gcc_no_link = xyes; then
+  if test "x${ac_cv_func_mmap_fixed_mapped+set}" != xset; then
+    ac_cv_func_mmap_fixed_mapped=no
+  fi
+fi
+if test "x${ac_cv_func_mmap_fixed_mapped}" != xno; then
+  m4_defn([AC_FUNC_MMAP])
+fi)
+
+m4_divert_pop()dnl
+])# GCC_NO_EXECUTABLES
+
+# Use the strongest available test out of AC_TRY_COMPILE and AC_TRY_LINK.
+AC_DEFUN([GCC_TRY_COMPILE_OR_LINK],
+[if test x$gcc_no_link = xyes; then
+  AC_TRY_COMPILE([$1], [$2], [$3], [$4])
+else
+  AC_TRY_LINK([$1], [$2], [$3], [$4])
+fi])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/override.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/override.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/override.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/override.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,104 @@
+dnl Fix Autoconf bugs by overriding broken internal Autoconf
+dnl macros with backports of fixes from newer releases.
+dnl
+dnl The override bits of this file should be a no-op for the newest
+dnl Autoconf version, which means they can be removed once the complete
+dnl tree has moved to a new enough Autoconf version.
+dnl
+dnl The _GCC_AUTOCONF_VERSION_TEST ensures that exactly the desired
+dnl Autoconf version is used.  It should be kept for consistency.
+
+dnl Use ifdef/ifelse over m4_ifdef/m4_ifelse to be clean for 2.13.
+ifdef([m4_PACKAGE_VERSION], [
+
+dnl Provide m4_copy_force and m4_rename_force for old Autoconf versions.
+
+m4_ifndef([m4_copy_force],
+[m4_define([m4_copy_force],
+[m4_ifdef([$2], [m4_undefine([$2])])m4_copy($@)])])
+
+m4_ifndef([m4_rename_force],
+[m4_define([m4_rename_force],
+[m4_ifdef([$2], [m4_undefine([$2])])m4_rename($@)])])
+
+dnl AC_DEFUN a commonly used macro so this file is picked up.
+m4_copy([AC_PREREQ], [_AC_PREREQ])
+AC_DEFUN([AC_PREREQ], [frob])
+m4_copy_force([_AC_PREREQ], [AC_PREREQ])
+
+
+dnl Ensure exactly this Autoconf version is used
+m4_ifndef([_GCC_AUTOCONF_VERSION],
+  [m4_define([_GCC_AUTOCONF_VERSION], [2.64])])
+
+dnl Test for the exact version when AC_INIT is expanded.
+dnl This allows to update the tree in steps (for testing)
+dnl by putting
+dnl   m4_define([_GCC_AUTOCONF_VERSION], [X.Y])
+dnl in configure.ac before AC_INIT,
+dnl without rewriting this file.
+dnl Or for updating the whole tree at once with the definition above.
+AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK],
+[m4_if(m4_defn([_GCC_AUTOCONF_VERSION]),
+  m4_defn([m4_PACKAGE_VERSION]), [],
+  [m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])])
+])
+m4_define([AC_INIT], m4_defn([AC_INIT])[
+_GCC_AUTOCONF_VERSION_CHECK
+])
+
+
+dnl Ensure we do not use a buggy M4.
+m4_if(m4_index([..wi.d.], [.d.]), [-1],
+  [m4_fatal(m4_do([m4 with buggy strstr detected.  Please install
+GNU M4 1.4.16 or newer and set the M4 environment variable]))])
+
+
+dnl Fix 2.64 cross compile detection for AVR and RTEMS
+dnl by not trying to compile fopen.
+m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.64],
+  [m4_foreach([_GCC_LANG], [C, C++, Fortran, Fortran 77],
+     [m4_define([_AC_LANG_IO_PROGRAM(]_GCC_LANG[)], m4_defn([AC_LANG_PROGRAM(]_GCC_LANG[)]))])])
+
+m4_version_prereq([2.66],, [
+dnl We need AC_CHECK_DECL which works for overloaded C++ functions.
+
+# _AC_CHECK_DECL_BODY
+# -------------------
+# Shell function body for AC_CHECK_DECL.
+m4_define([_AC_CHECK_DECL_BODY],
+[  AS_LINENO_PUSH([$[]1])
+  [as_decl_name=`echo $][2|sed 's/ *(.*//'`]
+  [as_decl_use=`echo $][2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`]
+  AC_CACHE_CHECK([whether $as_decl_name is declared], [$[]3],
+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$[]4],
+[@%:@ifndef $[]as_decl_name
+@%:@ifdef __cplusplus
+  (void) $[]as_decl_use;
+@%:@else
+  (void) $[]as_decl_name;
+@%:@endif
+@%:@endif
+])],
+		   [AS_VAR_SET([$[]3], [yes])],
+		   [AS_VAR_SET([$[]3], [no])])])
+  AS_LINENO_POP
+])# _AC_CHECK_DECL_BODY
+
+# _AC_CHECK_DECLS(SYMBOL, ACTION-IF_FOUND, ACTION-IF-NOT-FOUND,
+#                 INCLUDES)
+# -------------------------------------------------------------
+# Helper to AC_CHECK_DECLS, which generates the check for a single
+# SYMBOL with INCLUDES, performs the AC_DEFINE, then expands
+# ACTION-IF-FOUND or ACTION-IF-NOT-FOUND.
+m4_define([_AC_CHECK_DECLS],
+[AC_CHECK_DECL([$1], [ac_have_decl=1], [ac_have_decl=0], [$4])]dnl
+[AC_DEFINE_UNQUOTED(AS_TR_CPP(m4_bpatsubst(HAVE_DECL_[$1],[ *(.*])),
+  [$ac_have_decl],
+  [Define to 1 if you have the declaration of `$1',
+   and to 0 if you don't.])]dnl
+[m4_ifvaln([$2$3], [AS_IF([test $ac_have_decl = 1], [$2], [$3])])])
+
+])
+
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/picflag.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/picflag.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/picflag.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/picflag.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,95 @@
+# _GCC_PICFLAG(FLAG, DISPATCH)
+# ----------------------------
+# Store PIC flag corresponding to DISPATCH triplet in FLAG.
+# Explit use of -fpic in CFLAGS corresponding to FLAG overrides default.
+AC_DEFUN([_GCC_PICFLAG], [
+
+case "${$2}" in
+    # PIC is the default on some targets or must not be used.
+    *-*-darwin*)
+	# PIC is the default on this platform
+	# Common symbols not allowed in MH_DYLIB files
+	$1=-fno-common
+	;;
+    alpha*-dec-osf5*)
+	# PIC is the default.
+	;;
+    hppa*64*-*-hpux*)
+	# PIC is the default for 64-bit PA HP-UX.
+	;;
+    i[[34567]]86-*-cygwin* | i[[34567]]86-*-mingw* | x86_64-*-mingw*)
+	;;
+    i[[34567]]86-*-interix3*)
+	# Interix 3.x gcc -fpic/-fPIC options generate broken code.
+	# Instead, we relocate shared libraries at runtime.
+	;;
+    i[[34567]]86-*-nto-qnx*)
+	# QNX uses GNU C++, but need to define -shared option too, otherwise
+	# it will coredump.
+	$1='-fPIC -shared'
+	;;
+    i[[34567]]86-pc-msdosdjgpp*)
+	# DJGPP does not support shared libraries at all.
+	;;
+    ia64*-*-hpux*)
+	# On IA64 HP-UX, PIC is the default but the pic flag
+	# sets the default TLS model and affects inlining.
+	$1=-fPIC
+	;;
+    mips-sgi-irix6*)
+	# PIC is the default.
+	;;
+    rs6000-ibm-aix* | powerpc-ibm-aix*)
+	# All AIX code is PIC.
+	;;
+
+    # Some targets support both -fPIC and -fpic, but prefer the latter.
+    # FIXME: Why?
+    i[[34567]]86-*-* | x86_64-*-*)
+	$1=-fpic
+	;;
+    m68k-*-*)
+	$1=-fpic
+	;;
+    s390*-*-*)
+	$1=-fpic
+	;;
+    # FIXME: Override -fPIC default in libgcc only? 
+    sh-*-linux* | sh[[2346lbe]]*-*-linux*)
+	$1=-fpic
+	;;
+    # FIXME: Simplify to sh*-*-netbsd*?
+    sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
+      sh64-*-netbsd* | sh64l*-*-netbsd*)
+	$1=-fpic
+	;;
+    # Default to -fPIC unless specified otherwise.
+    *)
+	$1=-fPIC
+	;;
+esac
+
+# If the user explicitly uses -fpic/-fPIC, keep that.
+case "${m4_bpatsubsts($1, PICFLAG, CFLAGS)}" in
+    *-fpic*)
+	$1=-fpic
+	;;
+    *-fPIC*)
+	$1=-fPIC
+	;;
+esac
+])
+
+# GCC_PICFLAG
+# -----------
+# Store host PIC flag in PICFLAG.
+AC_DEFUN([GCC_PICFLAG], [
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  _GCC_PICFLAG([PICFLAG], [host])])
+
+# GCC_PICFLAG_FOR_TARGET
+# ----------------------
+# Store target PIC flag in PICFLAG_FOR_TARGET.
+AC_DEFUN([GCC_PICFLAG_FOR_TARGET], [
+  AC_REQUIRE([AC_CANONICAL_TARGET])
+  _GCC_PICFLAG([PICFLAG_FOR_TARGET], [target])])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/plugins.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/plugins.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/plugins.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/plugins.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,11 @@
+AC_DEFUN([AC_PLUGINS],
+[
+AC_ARG_ENABLE([plugins],
+AS_HELP_STRING([--enable-plugins], [Enable support for plugins (defaults no)]),
+[case "${enableval}" in
+  yes | "") plugins=yes ;;
+  no) plugins=no ;;
+  *) plugins=yes ;;
+ esac],
+[plugins=no])
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/po.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/po.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/po.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/po.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,197 @@
+# po.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+dnl Checks for all prerequisites of the po subdirectory.
+AC_DEFUN([AM_PO_SUBDIRS],
+[
+  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
+  AC_REQUIRE([AM_NLS])dnl
+
+  dnl Perform the following tests also if --disable-nls has been given,
+  dnl because they are needed for "make dist" to work.
+
+  dnl Search for GNU msgfmt in the PATH.
+  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
+  dnl The second test excludes FreeBSD msgfmt.
+  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+    [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+
+  dnl Search for GNU xgettext 0.12 or newer in the PATH.
+  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
+  dnl The second test excludes FreeBSD xgettext.
+  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  dnl Remove leftover from FreeBSD xgettext call.
+  rm -f messages.po
+
+  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
+  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
+    [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
+
+  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+  dnl Test whether we really found GNU msgfmt.
+  if test "$GMSGFMT" != ":"; then
+    dnl If it is no GNU msgfmt we define it as : so that the
+    dnl Makefiles still can work.
+    if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
+       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+      : ;
+    else
+      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
+      AC_MSG_RESULT(
+        [found $GMSGFMT program is not GNU msgfmt; ignore it])
+      GMSGFMT=":"
+    fi
+  fi
+
+  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+  dnl Test whether we really found GNU xgettext.
+  if test "$XGETTEXT" != ":"; then
+    dnl If it is no GNU xgettext we define it as : so that the
+    dnl Makefiles still can work.
+    if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+      : ;
+    else
+      AC_MSG_RESULT(
+        [found xgettext program is not GNU xgettext; ignore it])
+      XGETTEXT=":"
+    fi
+    dnl Remove leftover from FreeBSD xgettext call.
+    rm -f messages.po
+  fi
+
+  AC_OUTPUT_COMMANDS([
+    for ac_file in $CONFIG_FILES; do
+      # Support "outfile[:infile[:infile...]]"
+      case "$ac_file" in
+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+      esac
+      # PO directories have a Makefile.in generated from Makefile.in.in.
+      case "$ac_file" in */Makefile.in)
+        # Adjust a relative srcdir.
+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+        # In autoconf-2.13 it is called $ac_given_srcdir.
+        # In autoconf-2.50 it is called $srcdir.
+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+        case "$ac_given_srcdir" in
+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+          /*) top_srcdir="$ac_given_srcdir" ;;
+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+        esac
+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+          rm -f "$ac_dir/POTFILES"
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          POMAKEFILEDEPS="POTFILES.in"
+          # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
+          # on $ac_dir but don't depend on user-specified configuration
+          # parameters.
+          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+            # The LINGUAS file contains the set of available languages.
+            if test -n "$OBSOLETE_ALL_LINGUAS"; then
+              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+            fi
+            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assigment from automake.
+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+          else
+            # The set of available languages was given in configure.in.
+            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+          fi
+          case "$ac_given_srcdir" in
+            .) srcdirpre= ;;
+            *) srcdirpre='$(srcdir)/' ;;
+          esac
+          POFILES=
+          GMOFILES=
+          UPDATEPOFILES=
+          DUMMYPOFILES=
+          for lang in $ALL_LINGUAS; do
+            POFILES="$POFILES $srcdirpre$lang.po"
+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+          done
+          # CATALOGS depends on both $ac_dir and the user's LINGUAS
+          # environment variable.
+          INST_LINGUAS=
+          if test -n "$ALL_LINGUAS"; then
+            for presentlang in $ALL_LINGUAS; do
+              useit=no
+              if test "%UNSET%" != "$LINGUAS"; then
+                desiredlanguages="$LINGUAS"
+              else
+                desiredlanguages="$ALL_LINGUAS"
+              fi
+              for desiredlang in $desiredlanguages; do
+                # Use the presentlang catalog if desiredlang is
+                #   a. equal to presentlang, or
+                #   b. a variant of presentlang (because in this case,
+                #      presentlang can be used as a fallback for messages
+                #      which are not translated in the desiredlang catalog).
+                case "$desiredlang" in
+                  "$presentlang"*) useit=yes;;
+                esac
+              done
+              if test $useit = yes; then
+                INST_LINGUAS="$INST_LINGUAS $presentlang"
+              fi
+            done
+          fi
+          CATALOGS=
+          if test -n "$INST_LINGUAS"; then
+            for lang in $INST_LINGUAS; do
+              CATALOGS="$CATALOGS $lang.gmo"
+            done
+          fi
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+            if test -f "$f"; then
+              case "$f" in
+                *.orig | *.bak | *~) ;;
+                *) cat "$f" >> "$ac_dir/Makefile" ;;
+              esac
+            fi
+          done
+        fi
+        ;;
+      esac
+    done],
+   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+    # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
+    # from automake.
+    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+    # Capture the value of LINGUAS because we need it to compute CATALOGS.
+    LINGUAS="${LINGUAS-%UNSET%}"
+   ])
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/proginstall.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/proginstall.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/proginstall.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/proginstall.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,98 @@
+# AC_PROG_INSTALL
+# ---------------
+#
+# This macro is stolen from Autoconf 2.61a-341.
+# It requires `install' to be able to install multiple files at once.
+# This file will be obsolete when GCC moves to Autoconf 2.62.
+
+m4_version_prereq([2.62], [],
+[
+AC_DEFUN([AC_PROG_INSTALL],
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+dnl AC_REQUIRE_AUX_FILE([install-sh])dnl  This line does not work with 2.59.
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+AC_MSG_CHECKING([for a BSD-compatible install])
+if test -z "$INSTALL"; then
+AC_CACHE_VAL(ac_cv_path_install,
+[_AS_PATH_WALK([$PATH],
+[# Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if AS_EXECUTABLE_P(["$as_dir/$ac_prog$ac_exec_ext"]); then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac])
+rm -rf conftest.one conftest.two conftest.dir
+])dnl
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+dnl Do special magic for INSTALL instead of AC_SUBST, to get
+dnl relative names right.
+AC_MSG_RESULT([$INSTALL])
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+AC_SUBST(INSTALL_PROGRAM)dnl
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+AC_SUBST(INSTALL_SCRIPT)dnl
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+AC_SUBST(INSTALL_DATA)dnl
+])# AC_PROG_INSTALL
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/progtest.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/progtest.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/progtest.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/progtest.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,91 @@
+# progtest.m4 serial 3 (gettext-0.12)
+dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+# Search path for a program which passes the given test.
+
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
+[
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+  [[\\/]]* | ?:[[\\/]]*)
+    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in ifelse([$5], , $PATH, [$5]); do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          if [$3]; then
+            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+    ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+  AC_MSG_RESULT([$]$1)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/stdint.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/stdint.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/stdint.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/stdint.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,586 @@
+AC_DEFUN([GCC_STDINT_TYPES],
+[AC_REQUIRE([AC_TYPE_INT8_T])
+AC_REQUIRE([AC_TYPE_INT16_T])
+AC_REQUIRE([AC_TYPE_INT32_T])
+AC_REQUIRE([AC_TYPE_INT64_T])
+AC_REQUIRE([AC_TYPE_INTMAX_T])
+AC_REQUIRE([AC_TYPE_INTPTR_T])
+AC_REQUIRE([AC_TYPE_UINT8_T])
+AC_REQUIRE([AC_TYPE_UINT16_T])
+AC_REQUIRE([AC_TYPE_UINT32_T])
+AC_REQUIRE([AC_TYPE_UINT64_T])
+AC_REQUIRE([AC_TYPE_UINTMAX_T])
+AC_REQUIRE([AC_TYPE_UINTPTR_T])])
+
+dnl @synopsis GCC_HEADER_STDINT [( HEADER-TO-GENERATE [, HEADERS-TO-CHECK])]
+dnl
+dnl the "ISO C9X: 7.18 Integer types <stdint.h>" section requires the
+dnl existence of an include file <stdint.h> that defines a set of
+dnl typedefs, especially uint8_t,int32_t,uintptr_t.
+dnl Many older installations will not provide this file, but some will
+dnl have the very same definitions in <inttypes.h>. In other enviroments
+dnl we can use the inet-types in <sys/types.h> which would define the
+dnl typedefs int8_t and u_int8_t respectivly.
+dnl
+dnl This macros will create a local "_stdint.h" or the headerfile given as
+dnl an argument. In many cases that file will pick the definition from a
+dnl "#include <stdint.h>" or "#include <inttypes.h>" statement, while
+dnl in other environments it will provide the set of basic 'stdint's defined:
+dnl int8_t,uint8_t,int16_t,uint16_t,int32_t,uint32_t,intptr_t,uintptr_t
+dnl int_least32_t.. int_fast32_t.. intmax_t
+dnl which may or may not rely on the definitions of other files.
+dnl
+dnl Sometimes the stdint.h or inttypes.h headers conflict with sys/types.h,
+dnl so we test the headers together with sys/types.h and always include it
+dnl into the generated header (to match the tests with the generated file).
+dnl Hopefully this is not a big annoyance.
+dnl
+dnl If your installed header files require the stdint-types you will want to
+dnl create an installable file mylib-int.h that all your other installable
+dnl header may include. So, for a library package named "mylib", just use
+dnl      GCC_HEADER_STDINT(mylib-int.h)
+dnl in configure.in and install that header file in Makefile.am along with
+dnl the other headers (mylib.h).  The mylib-specific headers can simply
+dnl use "#include <mylib-int.h>" to obtain the stdint-types.
+dnl
+dnl Remember, if the system already had a valid <stdint.h>, the generated
+dnl file will include it directly. No need for fuzzy HAVE_STDINT_H things...
+dnl
+dnl @author  Guido Draheim <guidod@gmx.de>, Paolo Bonzini <bonzini@gnu.org>
+
+AC_DEFUN([GCC_HEADER_STDINT],
+[m4_define(_GCC_STDINT_H, m4_ifval($1, $1, _stdint.h))
+
+inttype_headers=`echo inttypes.h sys/inttypes.h $2 | sed -e 's/,/ /g'`
+
+acx_cv_header_stdint=stddef.h
+acx_cv_header_stdint_kind="(already complete)"
+for i in stdint.h $inttype_headers; do
+  unset ac_cv_type_uintptr_t
+  unset ac_cv_type_uintmax_t
+  unset ac_cv_type_int_least32_t
+  unset ac_cv_type_int_fast32_t
+  unset ac_cv_type_uint64_t
+  _AS_ECHO_N([looking for a compliant stdint.h in $i, ])
+  AC_CHECK_TYPE(uintmax_t,[acx_cv_header_stdint=$i],continue,[#include <sys/types.h>
+#include <$i>])
+  AC_CHECK_TYPE(uintptr_t,,[acx_cv_header_stdint_kind="(mostly complete)"], [#include <sys/types.h>
+#include <$i>])
+  AC_CHECK_TYPE(int_least32_t,,[acx_cv_header_stdint_kind="(mostly complete)"], [#include <sys/types.h>
+#include <$i>])
+  AC_CHECK_TYPE(int_fast32_t,,[acx_cv_header_stdint_kind="(mostly complete)"], [#include <sys/types.h>
+#include <$i>])
+  AC_CHECK_TYPE(uint64_t,,[acx_cv_header_stdint_kind="(lacks uint64_t)"], [#include <sys/types.h>
+#include <$i>])
+  break
+done
+if test "$acx_cv_header_stdint" = stddef.h; then
+  acx_cv_header_stdint_kind="(lacks uintmax_t)"
+  for i in stdint.h $inttype_headers; do
+    unset ac_cv_type_uintptr_t
+    unset ac_cv_type_uint32_t
+    unset ac_cv_type_uint64_t
+    _AS_ECHO_N([looking for an incomplete stdint.h in $i, ])
+    AC_CHECK_TYPE(uint32_t,[acx_cv_header_stdint=$i],continue,[#include <sys/types.h>
+#include <$i>])
+    AC_CHECK_TYPE(uint64_t,,,[#include <sys/types.h>
+#include <$i>])
+    AC_CHECK_TYPE(uintptr_t,,,[#include <sys/types.h>
+#include <$i>])
+    break
+  done
+fi
+if test "$acx_cv_header_stdint" = stddef.h; then
+  acx_cv_header_stdint_kind="(u_intXX_t style)"
+  for i in sys/types.h $inttype_headers; do
+    unset ac_cv_type_u_int32_t
+    unset ac_cv_type_u_int64_t
+    _AS_ECHO_N([looking for u_intXX_t types in $i, ])
+    AC_CHECK_TYPE(u_int32_t,[acx_cv_header_stdint=$i],continue,[#include <sys/types.h>
+#include <$i>])
+    AC_CHECK_TYPE(u_int64_t,,,[#include <sys/types.h>
+#include <$i>])
+    break
+  done
+fi
+if test "$acx_cv_header_stdint" = stddef.h; then
+  acx_cv_header_stdint_kind="(using manual detection)"
+fi
+
+test -z "$ac_cv_type_uintptr_t" && ac_cv_type_uintptr_t=no
+test -z "$ac_cv_type_uint64_t" && ac_cv_type_uint64_t=no
+test -z "$ac_cv_type_u_int64_t" && ac_cv_type_u_int64_t=no
+test -z "$ac_cv_type_int_least32_t" && ac_cv_type_int_least32_t=no
+test -z "$ac_cv_type_int_fast32_t" && ac_cv_type_int_fast32_t=no
+
+# ----------------- Summarize what we found so far
+
+AC_MSG_CHECKING([what to include in _GCC_STDINT_H])
+
+case `AS_BASENAME(_GCC_STDINT_H)` in
+  stdint.h) AC_MSG_WARN([are you sure you want it there?]) ;;
+  inttypes.h) AC_MSG_WARN([are you sure you want it there?]) ;;
+  *) ;;
+esac
+
+AC_MSG_RESULT($acx_cv_header_stdint $acx_cv_header_stdint_kind)
+
+# ----------------- done included file, check C basic types --------
+
+# Lacking an uintptr_t?  Test size of void *
+case "$acx_cv_header_stdint:$ac_cv_type_uintptr_t" in
+  stddef.h:* | *:no) AC_CHECK_SIZEOF(void *) ;;
+esac
+
+# Lacking an uint64_t?  Test size of long
+case "$acx_cv_header_stdint:$ac_cv_type_uint64_t:$ac_cv_type_u_int64_t" in
+  stddef.h:*:* | *:no:no) AC_CHECK_SIZEOF(long) ;;
+esac
+
+if test $acx_cv_header_stdint = stddef.h; then
+  # Lacking a good header?  Test size of everything and deduce all types.
+  AC_CHECK_SIZEOF(int)
+  AC_CHECK_SIZEOF(short)
+  AC_CHECK_SIZEOF(char)
+
+  AC_MSG_CHECKING(for type equivalent to int8_t)
+  case "$ac_cv_sizeof_char" in
+    1) acx_cv_type_int8_t=char ;;
+    *) AC_MSG_ERROR([no 8-bit type, please report a bug])
+  esac
+  AC_MSG_RESULT($acx_cv_type_int8_t)
+
+  AC_MSG_CHECKING(for type equivalent to int16_t)
+  case "$ac_cv_sizeof_int:$ac_cv_sizeof_short" in
+    2:*) acx_cv_type_int16_t=int ;;
+    *:2) acx_cv_type_int16_t=short ;;
+    *) AC_MSG_ERROR([no 16-bit type, please report a bug])
+  esac
+  AC_MSG_RESULT($acx_cv_type_int16_t)
+
+  AC_MSG_CHECKING(for type equivalent to int32_t)
+  case "$ac_cv_sizeof_int:$ac_cv_sizeof_long" in
+    4:*) acx_cv_type_int32_t=int ;;
+    *:4) acx_cv_type_int32_t=long ;;
+    *) AC_MSG_ERROR([no 32-bit type, please report a bug])
+  esac
+  AC_MSG_RESULT($acx_cv_type_int32_t)
+fi
+
+# These tests are here to make the output prettier
+
+if test "$ac_cv_type_uint64_t" != yes && test "$ac_cv_type_u_int64_t" != yes; then
+  case "$ac_cv_sizeof_long" in
+    8) acx_cv_type_int64_t=long ;;
+  esac
+  AC_MSG_CHECKING(for type equivalent to int64_t)
+  AC_MSG_RESULT(${acx_cv_type_int64_t-'using preprocessor symbols'})
+fi
+
+# Now we can use the above types
+
+if test "$ac_cv_type_uintptr_t" != yes; then
+  AC_MSG_CHECKING(for type equivalent to intptr_t)
+  case $ac_cv_sizeof_void_p in
+    2) acx_cv_type_intptr_t=int16_t ;;
+    4) acx_cv_type_intptr_t=int32_t ;;
+    8) acx_cv_type_intptr_t=int64_t ;;
+    *) AC_MSG_ERROR([no equivalent for intptr_t, please report a bug])
+  esac
+  AC_MSG_RESULT($acx_cv_type_intptr_t)
+fi
+
+# ----------------- done all checks, emit header -------------
+AC_CONFIG_COMMANDS(_GCC_STDINT_H, [
+if test "$GCC" = yes; then
+  echo "/* generated for " `$CC --version | sed 1q` "*/" > tmp-stdint.h
+else
+  echo "/* generated for $CC */" > tmp-stdint.h
+fi
+
+sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+  #ifndef GCC_GENERATED_STDINT_H
+  #define GCC_GENERATED_STDINT_H 1
+
+  #include <sys/types.h>
+EOF
+
+if test "$acx_cv_header_stdint" != stdint.h; then
+  echo "#include <stddef.h>" >> tmp-stdint.h
+fi
+if test "$acx_cv_header_stdint" != stddef.h; then
+  echo "#include <$acx_cv_header_stdint>" >> tmp-stdint.h
+fi
+
+sed 's/^ *//' >> tmp-stdint.h <<EOF
+  /* glibc uses these symbols as guards to prevent redefinitions.  */
+  #ifdef __int8_t_defined
+  #define _INT8_T
+  #define _INT16_T
+  #define _INT32_T
+  #endif
+  #ifdef __uint32_t_defined
+  #define _UINT32_T
+  #endif
+
+EOF
+
+# ----------------- done header, emit basic int types -------------
+if test "$acx_cv_header_stdint" = stddef.h; then
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    #ifndef _UINT8_T
+    #define _UINT8_T
+    #ifndef __uint8_t_defined
+    #define __uint8_t_defined
+    #ifndef uint8_t
+    typedef unsigned $acx_cv_type_int8_t uint8_t;
+    #endif
+    #endif
+    #endif
+
+    #ifndef _UINT16_T
+    #define _UINT16_T
+    #ifndef __uint16_t_defined
+    #define __uint16_t_defined
+    #ifndef uint16_t
+    typedef unsigned $acx_cv_type_int16_t uint16_t;
+    #endif
+    #endif
+    #endif
+
+    #ifndef _UINT32_T
+    #define _UINT32_T
+    #ifndef __uint32_t_defined
+    #define __uint32_t_defined
+    #ifndef uint32_t
+    typedef unsigned $acx_cv_type_int32_t uint32_t;
+    #endif
+    #endif
+    #endif
+
+    #ifndef _INT8_T
+    #define _INT8_T
+    #ifndef __int8_t_defined
+    #define __int8_t_defined
+    #ifndef int8_t
+    typedef $acx_cv_type_int8_t int8_t;
+    #endif
+    #endif
+    #endif
+
+    #ifndef _INT16_T
+    #define _INT16_T
+    #ifndef __int16_t_defined
+    #define __int16_t_defined
+    #ifndef int16_t
+    typedef $acx_cv_type_int16_t int16_t;
+    #endif
+    #endif
+    #endif
+
+    #ifndef _INT32_T
+    #define _INT32_T
+    #ifndef __int32_t_defined
+    #define __int32_t_defined
+    #ifndef int32_t
+    typedef $acx_cv_type_int32_t int32_t;
+    #endif
+    #endif
+    #endif
+EOF
+elif test "$ac_cv_type_u_int32_t" = yes; then
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    /* int8_t int16_t int32_t defined by inet code, we do the u_intXX types */
+    #ifndef _INT8_T
+    #define _INT8_T
+    #endif
+    #ifndef _INT16_T
+    #define _INT16_T
+    #endif
+    #ifndef _INT32_T
+    #define _INT32_T
+    #endif
+
+    #ifndef _UINT8_T
+    #define _UINT8_T
+    #ifndef __uint8_t_defined
+    #define __uint8_t_defined
+    #ifndef uint8_t
+    typedef u_int8_t uint8_t;
+    #endif
+    #endif
+    #endif
+
+    #ifndef _UINT16_T
+    #define _UINT16_T
+    #ifndef __uint16_t_defined
+    #define __uint16_t_defined
+    #ifndef uint16_t
+    typedef u_int16_t uint16_t;
+    #endif
+    #endif
+    #endif
+
+    #ifndef _UINT32_T
+    #define _UINT32_T
+    #ifndef __uint32_t_defined
+    #define __uint32_t_defined
+    #ifndef uint32_t
+    typedef u_int32_t uint32_t;
+    #endif
+    #endif
+    #endif
+EOF
+else
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    /* Some systems have guard macros to prevent redefinitions, define them.  */
+    #ifndef _INT8_T
+    #define _INT8_T
+    #endif
+    #ifndef _INT16_T
+    #define _INT16_T
+    #endif
+    #ifndef _INT32_T
+    #define _INT32_T
+    #endif
+    #ifndef _UINT8_T
+    #define _UINT8_T
+    #endif
+    #ifndef _UINT16_T
+    #define _UINT16_T
+    #endif
+    #ifndef _UINT32_T
+    #define _UINT32_T
+    #endif
+EOF
+fi
+
+# ------------- done basic int types, emit int64_t types ------------
+if test "$ac_cv_type_uint64_t" = yes; then
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    /* system headers have good uint64_t and int64_t */
+    #ifndef _INT64_T
+    #define _INT64_T
+    #endif
+    #ifndef _UINT64_T
+    #define _UINT64_T
+    #endif
+EOF
+elif test "$ac_cv_type_u_int64_t" = yes; then
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    /* system headers have an u_int64_t (and int64_t) */
+    #ifndef _INT64_T
+    #define _INT64_T
+    #endif
+    #ifndef _UINT64_T
+    #define _UINT64_T
+    #ifndef __uint64_t_defined
+    #define __uint64_t_defined
+    #ifndef uint64_t
+    typedef u_int64_t uint64_t;
+    #endif
+    #endif
+    #endif
+EOF
+elif test -n "$acx_cv_type_int64_t"; then
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    /* architecture has a 64-bit type, $acx_cv_type_int64_t */
+    #ifndef _INT64_T
+    #define _INT64_T
+    #ifndef int64_t
+    typedef $acx_cv_type_int64_t int64_t;
+    #endif
+    #endif
+    #ifndef _UINT64_T
+    #define _UINT64_T
+    #ifndef __uint64_t_defined
+    #define __uint64_t_defined
+    #ifndef uint64_t
+    typedef unsigned $acx_cv_type_int64_t uint64_t;
+    #endif
+    #endif
+    #endif
+EOF
+else
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    /* some common heuristics for int64_t, using compiler-specific tests */
+    #if defined __STDC_VERSION__ && (__STDC_VERSION__-0) >= 199901L
+    #ifndef _INT64_T
+    #define _INT64_T
+    #ifndef __int64_t_defined
+    #ifndef int64_t
+    typedef long long int64_t;
+    #endif
+    #endif
+    #endif
+    #ifndef _UINT64_T
+    #define _UINT64_T
+    #ifndef uint64_t
+    typedef unsigned long long uint64_t;
+    #endif
+    #endif
+
+    #elif defined __GNUC__ && defined (__STDC__) && __STDC__-0
+    /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
+       does not implement __extension__.  But that compiler doesn't define
+       __GNUC_MINOR__.  */
+    # if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__)
+    # define __extension__
+    # endif
+
+    # ifndef _INT64_T
+    # define _INT64_T
+    # ifndef int64_t
+    __extension__ typedef long long int64_t;
+    # endif
+    # endif
+    # ifndef _UINT64_T
+    # define _UINT64_T
+    # ifndef uint64_t
+    __extension__ typedef unsigned long long uint64_t;
+    # endif
+    # endif
+
+    #elif !defined __STRICT_ANSI__
+    # if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
+
+    #  ifndef _INT64_T
+    #  define _INT64_T
+    #  ifndef int64_t
+    typedef __int64 int64_t;
+    #  endif
+    #  endif
+    #  ifndef _UINT64_T
+    #  define _UINT64_T
+    #  ifndef uint64_t
+    typedef unsigned __int64 uint64_t;
+    #  endif
+    #  endif
+    # endif /* compiler */
+
+    #endif /* ANSI version */
+EOF
+fi
+
+# ------------- done int64_t types, emit intptr types ------------
+if test "$ac_cv_type_uintptr_t" != yes; then
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    /* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */
+    #ifndef __uintptr_t_defined
+    #ifndef uintptr_t
+    typedef u$acx_cv_type_intptr_t uintptr_t;
+    #endif
+    #endif
+    #ifndef __intptr_t_defined
+    #ifndef intptr_t
+    typedef $acx_cv_type_intptr_t  intptr_t;
+    #endif
+    #endif
+EOF
+fi
+
+# ------------- done intptr types, emit int_least types ------------
+if test "$ac_cv_type_int_least32_t" != yes; then
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    /* Define int_least types */
+    typedef int8_t     int_least8_t;
+    typedef int16_t    int_least16_t;
+    typedef int32_t    int_least32_t;
+    #ifdef _INT64_T
+    typedef int64_t    int_least64_t;
+    #endif
+
+    typedef uint8_t    uint_least8_t;
+    typedef uint16_t   uint_least16_t;
+    typedef uint32_t   uint_least32_t;
+    #ifdef _UINT64_T
+    typedef uint64_t   uint_least64_t;
+    #endif
+EOF
+fi
+
+# ------------- done intptr types, emit int_fast types ------------
+if test "$ac_cv_type_int_fast32_t" != yes; then
+  dnl NOTE: The following code assumes that sizeof (int) > 1.
+  dnl Fix when strange machines are reported.
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    /* Define int_fast types.  short is often slow */
+    typedef int8_t       int_fast8_t;
+    typedef int          int_fast16_t;
+    typedef int32_t      int_fast32_t;
+    #ifdef _INT64_T
+    typedef int64_t      int_fast64_t;
+    #endif
+
+    typedef uint8_t      uint_fast8_t;
+    typedef unsigned int uint_fast16_t;
+    typedef uint32_t     uint_fast32_t;
+    #ifdef _UINT64_T
+    typedef uint64_t     uint_fast64_t;
+    #endif
+EOF
+fi
+
+if test "$ac_cv_type_uintmax_t" != yes; then
+  sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+    /* Define intmax based on what we found */
+    #ifndef intmax_t
+    #ifdef _INT64_T
+    typedef int64_t       intmax_t;
+    #else
+    typedef long          intmax_t;
+    #endif
+    #endif
+    #ifndef uintmax_t
+    #ifdef _UINT64_T
+    typedef uint64_t      uintmax_t;
+    #else
+    typedef unsigned long uintmax_t;
+    #endif
+    #endif
+EOF
+fi
+
+sed 's/^ *//' >> tmp-stdint.h <<EOF
+
+  #endif /* GCC_GENERATED_STDINT_H */
+EOF
+
+if test -r ]_GCC_STDINT_H[ && cmp -s tmp-stdint.h ]_GCC_STDINT_H[; then
+  rm -f tmp-stdint.h
+else
+  mv -f tmp-stdint.h ]_GCC_STDINT_H[
+fi
+
+], [
+GCC="$GCC"
+CC="$CC"
+acx_cv_header_stdint="$acx_cv_header_stdint"
+acx_cv_type_int8_t="$acx_cv_type_int8_t"
+acx_cv_type_int16_t="$acx_cv_type_int16_t"
+acx_cv_type_int32_t="$acx_cv_type_int32_t"
+acx_cv_type_int64_t="$acx_cv_type_int64_t"
+acx_cv_type_intptr_t="$acx_cv_type_intptr_t"
+ac_cv_type_uintmax_t="$ac_cv_type_uintmax_t"
+ac_cv_type_uintptr_t="$ac_cv_type_uintptr_t"
+ac_cv_type_uint64_t="$ac_cv_type_uint64_t"
+ac_cv_type_u_int64_t="$ac_cv_type_u_int64_t"
+ac_cv_type_u_int32_t="$ac_cv_type_u_int32_t"
+ac_cv_type_int_least32_t="$ac_cv_type_int_least32_t"
+ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t"
+ac_cv_sizeof_void_p="$ac_cv_sizeof_void_p"
+])
+
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/stdint_h.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/stdint_h.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/stdint_h.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/stdint_h.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,28 @@
+# stdint_h.m4 serial 3 (gettext-0.12)
+dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+
+AC_DEFUN([jm_AC_HEADER_STDINT_H],
+[
+  AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
+  [AC_TRY_COMPILE(
+    [#include <sys/types.h>
+#include <stdint.h>],
+    [uintmax_t i = (uintmax_t) -1;],
+    jm_ac_cv_header_stdint_h=yes,
+    jm_ac_cv_header_stdint_h=no)])
+  if test $jm_ac_cv_header_stdint_h = yes; then
+    AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
+      [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
+       and declares uintmax_t. ])
+  fi
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/tcl.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/tcl.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/tcl.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/tcl.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3246 @@
+#------------------------------------------------------------------------
+# SC_PATH_TCLCONFIG --
+#
+#	Locate the tclConfig.sh file and perform a sanity check on
+#	the Tcl compile flags
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Adds the following arguments to configure:
+#		--with-tcl=...
+#
+#	Defines the following vars:
+#		TCL_BIN_DIR	Full path to the directory containing
+#				the tclConfig.sh file
+#------------------------------------------------------------------------
+
+AC_DEFUN([SC_PATH_TCLCONFIG], [
+    #
+    # Ok, lets find the tcl configuration
+    # First, look for one uninstalled.
+    # the alternative search directory is invoked by --with-tcl
+    #
+
+    if test x"${no_tcl}" = x ; then
+	# we reset no_tcl in case something fails here
+	no_tcl=true
+	AC_ARG_WITH(tcl, [  --with-tcl              directory containing tcl configuration (tclConfig.sh)], with_tclconfig=${withval})
+	AC_MSG_CHECKING([for Tcl configuration])
+	AC_CACHE_VAL(ac_cv_c_tclconfig,[
+
+	    # First check to see if --with-tcl was specified.
+	    case "${host}" in
+		*-*-cygwin*) platDir="win" ;;
+		*) platDir="unix" ;;
+	    esac
+	    if test x"${with_tclconfig}" != x ; then
+		if test -f "${with_tclconfig}/tclConfig.sh" ; then
+		    ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)`
+		else
+		    AC_MSG_ERROR([${with_tclconfig} directory doesn't contain tclConfig.sh])
+		fi
+	    fi
+
+	    # then check for a private Tcl installation
+	    if test x"${ac_cv_c_tclconfig}" = x ; then
+		for i in \
+			../tcl \
+			`ls -dr ../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ../tcl[[8-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ../tcl[[8-9]].[[0-9]]* 2>/dev/null` \
+			../../tcl \
+			`ls -dr ../../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ../../tcl[[8-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ../../tcl[[8-9]].[[0-9]]* 2>/dev/null` \
+			../../../tcl \
+			`ls -dr ../../../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ../../../tcl[[8-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ../../../tcl[[8-9]].[[0-9]]* 2>/dev/null` ; do
+		    if test -f "$i/$platDir/tclConfig.sh" ; then
+			ac_cv_c_tclconfig=`(cd $i/$platDir; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+	    # on Darwin, check in Framework installation locations
+	    if test "`uname -s`" = "Darwin" -a x"${ac_cv_c_tclconfig}" = x ; then
+		for i in `ls -d ~/Library/Frameworks 2>/dev/null` \
+			`ls -d /Library/Frameworks 2>/dev/null` \
+			`ls -d /Network/Library/Frameworks 2>/dev/null` \
+			`ls -d /System/Library/Frameworks 2>/dev/null` \
+			; do
+		    if test -f "$i/Tcl.framework/tclConfig.sh" ; then
+			ac_cv_c_tclconfig=`(cd $i/Tcl.framework; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+	    # check in a few common install locations
+	    if test x"${ac_cv_c_tclconfig}" = x ; then
+		for i in `ls -d ${libdir} 2>/dev/null` \
+			`ls -d ${exec_prefix}/lib 2>/dev/null` \
+			`ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/local/lib 2>/dev/null` \
+			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/lib 2>/dev/null` \
+			; do
+		    if test -f "$i/tclConfig.sh" ; then
+			ac_cv_c_tclconfig=`(cd $i; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+	    # check in a few other private locations
+	    if test x"${ac_cv_c_tclconfig}" = x ; then
+		for i in \
+			${srcdir}/../tcl \
+			`ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]]* 2>/dev/null` ; do
+		    if test -f "$i/$platDir/tclConfig.sh" ; then
+		    ac_cv_c_tclconfig=`(cd $i/$platDir; pwd)`
+		    break
+		fi
+		done
+	    fi
+	])
+
+	if test x"${ac_cv_c_tclconfig}" = x ; then
+	    TCL_BIN_DIR="# no Tcl configs found"
+	    AC_MSG_WARN([Can't find Tcl configuration definitions])
+	else
+	    no_tcl=
+	    TCL_BIN_DIR=${ac_cv_c_tclconfig}
+	    AC_MSG_RESULT([found ${TCL_BIN_DIR}/tclConfig.sh])
+	fi
+    fi
+])
+
+#------------------------------------------------------------------------
+# SC_PATH_TKCONFIG --
+#
+#	Locate the tkConfig.sh file
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Adds the following arguments to configure:
+#		--with-tk=...
+#
+#	Defines the following vars:
+#		TK_BIN_DIR	Full path to the directory containing
+#				the tkConfig.sh file
+#------------------------------------------------------------------------
+
+AC_DEFUN([SC_PATH_TKCONFIG], [
+    #
+    # Ok, lets find the tk configuration
+    # First, look for one uninstalled.
+    # the alternative search directory is invoked by --with-tk
+    #
+
+    if test x"${no_tk}" = x ; then
+	# we reset no_tk in case something fails here
+	no_tk=true
+	AC_ARG_WITH(tk, [  --with-tk               directory containing tk configuration (tkConfig.sh)], with_tkconfig=${withval})
+	AC_MSG_CHECKING([for Tk configuration])
+	AC_CACHE_VAL(ac_cv_c_tkconfig,[
+
+	    # First check to see if --with-tkconfig was specified.
+	    if test x"${with_tkconfig}" != x ; then
+		if test -f "${with_tkconfig}/tkConfig.sh" ; then
+		    ac_cv_c_tkconfig=`(cd ${with_tkconfig}; pwd)`
+		else
+		    AC_MSG_ERROR([${with_tkconfig} directory doesn't contain tkConfig.sh])
+		fi
+	    fi
+
+	    # then check for a private Tk library
+	    case "${host}" in
+		*-*-cygwin*) platDir="win" ;;
+		*) platDir="unix" ;;
+	    esac
+	    if test x"${ac_cv_c_tkconfig}" = x ; then
+		for i in \
+			../tk \
+			`ls -dr ../tk[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ../tk[[8-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ../tk[[8-9]].[[0-9]]* 2>/dev/null` \
+			../../tk \
+			`ls -dr ../../tk[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ../../tk[[8-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ../../tk[[8-9]].[[0-9]]* 2>/dev/null` \
+			../../../tk \
+			`ls -dr ../../../tk[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ../../../tk[[8-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ../../../tk[[8-9]].[[0-9]]* 2>/dev/null` ; do
+		    if test -f "$i/$platDir/tkConfig.sh" ; then
+			ac_cv_c_tkconfig=`(cd $i/$platDir; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+	    # on Darwin, check in Framework installation locations
+	    if test "`uname -s`" = "Darwin" -a x"${ac_cv_c_tkconfig}" = x ; then
+		for i in `ls -d ~/Library/Frameworks 2>/dev/null` \
+			`ls -d /Library/Frameworks 2>/dev/null` \
+			`ls -d /Network/Library/Frameworks 2>/dev/null` \
+			`ls -d /System/Library/Frameworks 2>/dev/null` \
+			; do
+		    if test -f "$i/Tk.framework/tkConfig.sh" ; then
+			ac_cv_c_tkconfig=`(cd $i/Tk.framework; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+	    # check in a few common install locations
+	    if test x"${ac_cv_c_tkconfig}" = x ; then
+		for i in `ls -d ${libdir} 2>/dev/null` \
+			`ls -d ${exec_prefix}/lib 2>/dev/null` \
+			`ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/local/lib 2>/dev/null` \
+			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/lib 2>/dev/null` \
+			; do
+		    if test -f "$i/tkConfig.sh" ; then
+			ac_cv_c_tkconfig=`(cd $i; pwd)`
+			break
+		    fi
+		done
+	    fi
+	    # check in a few other private locations
+	    if test x"${ac_cv_c_tkconfig}" = x ; then
+		for i in \
+			${srcdir}/../tk \
+			`ls -dr ${srcdir}/../tk[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ${srcdir}/../tk[[8-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ${srcdir}/../tk[[8-9]].[[0-9]]* 2>/dev/null` ; do
+		    if test -f "$i/$platDir/tkConfig.sh" ; then
+			ac_cv_c_tkconfig=`(cd $i/$platDir; pwd)`
+			break
+		    fi
+		done
+	    fi
+	])
+
+	if test x"${ac_cv_c_tkconfig}" = x ; then
+	    TK_BIN_DIR="# no Tk configs found"
+	    AC_MSG_WARN([Can't find Tk configuration definitions])
+	else
+	    no_tk=
+	    TK_BIN_DIR=${ac_cv_c_tkconfig}
+	    AC_MSG_RESULT([found ${TK_BIN_DIR}/tkConfig.sh])
+	fi
+    fi
+])
+
+#------------------------------------------------------------------------
+# SC_LOAD_TCLCONFIG --
+#
+#	Load the tclConfig.sh file
+#
+# Arguments:
+#	
+#	Requires the following vars to be set:
+#		TCL_BIN_DIR
+#
+# Results:
+#
+#	Subst the following vars:
+#		TCL_BIN_DIR
+#		TCL_SRC_DIR
+#		TCL_LIB_FILE
+#
+#------------------------------------------------------------------------
+
+AC_DEFUN([SC_LOAD_TCLCONFIG], [
+    AC_MSG_CHECKING([for existence of ${TCL_BIN_DIR}/tclConfig.sh])
+
+    if test -f "${TCL_BIN_DIR}/tclConfig.sh" ; then
+        AC_MSG_RESULT([loading])
+	. ${TCL_BIN_DIR}/tclConfig.sh
+    else
+        AC_MSG_RESULT([could not find ${TCL_BIN_DIR}/tclConfig.sh])
+    fi
+
+    # eval is required to do the TCL_DBGX substitution
+    eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\""
+    eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
+
+    # If the TCL_BIN_DIR is the build directory (not the install directory),
+    # then set the common variable name to the value of the build variables.
+    # For example, the variable TCL_LIB_SPEC will be set to the value
+    # of TCL_BUILD_LIB_SPEC. An extension should make use of TCL_LIB_SPEC
+    # instead of TCL_BUILD_LIB_SPEC since it will work with both an
+    # installed and uninstalled version of Tcl.
+    if test -f "${TCL_BIN_DIR}/Makefile" ; then
+        TCL_LIB_SPEC=${TCL_BUILD_LIB_SPEC}
+        TCL_STUB_LIB_SPEC=${TCL_BUILD_STUB_LIB_SPEC}
+        TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH}
+    elif test "`uname -s`" = "Darwin"; then
+	# If Tcl was built as a framework, attempt to use the libraries
+	# from the framework at the given location so that linking works
+	# against Tcl.framework installed in an arbitary location.
+	case ${TCL_DEFS} in
+	    *TCL_FRAMEWORK*)
+		if test -f "${TCL_BIN_DIR}/${TCL_LIB_FILE}"; then
+		    for i in "`cd ${TCL_BIN_DIR}; pwd`" \
+			     "`cd ${TCL_BIN_DIR}/../..; pwd`"; do
+			if test "`basename "$i"`" = "${TCL_LIB_FILE}.framework"; then
+			    TCL_LIB_SPEC="-F`dirname "$i"` -framework ${TCL_LIB_FILE}"
+			    break
+			fi
+		    done
+		fi
+		if test -f "${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}"; then
+		    TCL_STUB_LIB_SPEC="-L${TCL_BIN_DIR} ${TCL_STUB_LIB_FLAG}"
+		    TCL_STUB_LIB_PATH="${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}"
+		fi
+		;;
+	esac
+    fi
+
+    # eval is required to do the TCL_DBGX substitution
+    eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\""
+    eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\""
+    eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\""
+    eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\""
+
+    AC_SUBST(TCL_VERSION)
+    AC_SUBST(TCL_PATCH_LEVEL)
+    AC_SUBST(TCL_BIN_DIR)
+    AC_SUBST(TCL_SRC_DIR)
+
+    AC_SUBST(TCL_LIB_FILE)
+    AC_SUBST(TCL_LIB_FLAG)
+    AC_SUBST(TCL_LIB_SPEC)
+
+    AC_SUBST(TCL_STUB_LIB_FILE)
+    AC_SUBST(TCL_STUB_LIB_FLAG)
+    AC_SUBST(TCL_STUB_LIB_SPEC)
+])
+
+#------------------------------------------------------------------------
+# SC_LOAD_TKCONFIG --
+#
+#	Load the tkConfig.sh file
+#
+# Arguments:
+#	
+#	Requires the following vars to be set:
+#		TK_BIN_DIR
+#
+# Results:
+#
+#	Sets the following vars that should be in tkConfig.sh:
+#		TK_BIN_DIR
+#------------------------------------------------------------------------
+
+AC_DEFUN([SC_LOAD_TKCONFIG], [
+    AC_MSG_CHECKING([for existence of ${TK_BIN_DIR}/tkConfig.sh])
+
+    if test -f "${TK_BIN_DIR}/tkConfig.sh" ; then
+        AC_MSG_RESULT([loading])
+	. ${TK_BIN_DIR}/tkConfig.sh
+    else
+        AC_MSG_RESULT([could not find ${TK_BIN_DIR}/tkConfig.sh])
+    fi
+
+    # eval is required to do the TK_DBGX substitution
+    eval "TK_LIB_FILE=\"${TK_LIB_FILE}\""
+    eval "TK_STUB_LIB_FILE=\"${TK_STUB_LIB_FILE}\""
+
+    # If the TK_BIN_DIR is the build directory (not the install directory),
+    # then set the common variable name to the value of the build variables.
+    # For example, the variable TK_LIB_SPEC will be set to the value
+    # of TK_BUILD_LIB_SPEC. An extension should make use of TK_LIB_SPEC
+    # instead of TK_BUILD_LIB_SPEC since it will work with both an
+    # installed and uninstalled version of Tcl.
+    if test -f "${TK_BIN_DIR}/Makefile" ; then
+        TK_LIB_SPEC=${TK_BUILD_LIB_SPEC}
+        TK_STUB_LIB_SPEC=${TK_BUILD_STUB_LIB_SPEC}
+        TK_STUB_LIB_PATH=${TK_BUILD_STUB_LIB_PATH}
+    elif test "`uname -s`" = "Darwin"; then
+	# If Tk was built as a framework, attempt to use the libraries
+	# from the framework at the given location so that linking works
+	# against Tk.framework installed in an arbitary location.
+	case ${TK_DEFS} in
+	    *TK_FRAMEWORK*)
+		if test -f "${TK_BIN_DIR}/${TK_LIB_FILE}"; then
+		    for i in "`cd ${TK_BIN_DIR}; pwd`" \
+			     "`cd ${TK_BIN_DIR}/../..; pwd`"; do
+			if test "`basename "$i"`" = "${TK_LIB_FILE}.framework"; then
+			    TK_LIB_SPEC="-F`dirname "$i"` -framework ${TK_LIB_FILE}"
+			    break
+			fi
+		    done
+		fi
+		if test -f "${TK_BIN_DIR}/${TK_STUB_LIB_FILE}"; then
+		    TK_STUB_LIB_SPEC="-L${TK_BIN_DIR} ${TK_STUB_LIB_FLAG}"
+		    TK_STUB_LIB_PATH="${TK_BIN_DIR}/${TK_STUB_LIB_FILE}"
+		fi
+		;;
+	esac
+    fi
+
+    # eval is required to do the TK_DBGX substitution
+    eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}\""
+    eval "TK_LIB_SPEC=\"${TK_LIB_SPEC}\""
+    eval "TK_STUB_LIB_FLAG=\"${TK_STUB_LIB_FLAG}\""
+    eval "TK_STUB_LIB_SPEC=\"${TK_STUB_LIB_SPEC}\""
+
+    AC_SUBST(TK_VERSION)
+    AC_SUBST(TK_BIN_DIR)
+    AC_SUBST(TK_SRC_DIR)
+
+    AC_SUBST(TK_LIB_FILE)
+    AC_SUBST(TK_LIB_FLAG)
+    AC_SUBST(TK_LIB_SPEC)
+
+    AC_SUBST(TK_STUB_LIB_FILE)
+    AC_SUBST(TK_STUB_LIB_FLAG)
+    AC_SUBST(TK_STUB_LIB_SPEC)
+])
+
+#------------------------------------------------------------------------
+# SC_PROG_TCLSH
+#	Locate a tclsh shell installed on the system path. This macro
+#	will only find a Tcl shell that already exists on the system.
+#	It will not find a Tcl shell in the Tcl build directory or
+#	a Tcl shell that has been installed from the Tcl build directory.
+#	If a Tcl shell can't be located on the PATH, then TCLSH_PROG will
+#	be set to "". Extensions should take care not to create Makefile
+#	rules that are run by default and depend on TCLSH_PROG. An
+#	extension can't assume that an executable Tcl shell exists at
+#	build time.
+#
+# Arguments
+#	none
+#
+# Results
+#	Subst's the following values:
+#		TCLSH_PROG
+#------------------------------------------------------------------------
+
+AC_DEFUN([SC_PROG_TCLSH], [
+    AC_MSG_CHECKING([for tclsh])
+    AC_CACHE_VAL(ac_cv_path_tclsh, [
+	search_path=`echo ${PATH} | sed -e 's/:/ /g'`
+	for dir in $search_path ; do
+	    for j in `ls -r $dir/tclsh[[8-9]]* 2> /dev/null` \
+		    `ls -r $dir/tclsh* 2> /dev/null` ; do
+		if test x"$ac_cv_path_tclsh" = x ; then
+		    if test -f "$j" ; then
+			ac_cv_path_tclsh=$j
+			break
+		    fi
+		fi
+	    done
+	done
+    ])
+
+    if test -f "$ac_cv_path_tclsh" ; then
+	TCLSH_PROG="$ac_cv_path_tclsh"
+	AC_MSG_RESULT([$TCLSH_PROG])
+    else
+	# It is not an error if an installed version of Tcl can't be located.
+	TCLSH_PROG=""
+	AC_MSG_RESULT([No tclsh found on PATH])
+    fi
+    AC_SUBST(TCLSH_PROG)
+])
+
+#------------------------------------------------------------------------
+# SC_BUILD_TCLSH
+#	Determine the fully qualified path name of the tclsh executable
+#	in the Tcl build directory. This macro will correctly determine
+#	the name of the tclsh executable even if tclsh has not yet
+#	been built in the build directory. The build tclsh must be used
+#	when running tests from an extension build directory. It is not
+#	correct to use the TCLSH_PROG in cases like this.
+#
+# Arguments
+#	none
+#
+# Results
+#	Subst's the following values:
+#		BUILD_TCLSH
+#------------------------------------------------------------------------
+
+AC_DEFUN([SC_BUILD_TCLSH], [
+    AC_MSG_CHECKING([for tclsh in Tcl build directory])
+    BUILD_TCLSH=${TCL_BIN_DIR}/tclsh
+    AC_MSG_RESULT([$BUILD_TCLSH])
+    AC_SUBST(BUILD_TCLSH)
+])
+
+#------------------------------------------------------------------------
+# SC_ENABLE_SHARED --
+#
+#	Allows the building of shared libraries
+#
+# Arguments:
+#	none
+#	
+# Results:
+#
+#	Adds the following arguments to configure:
+#		--enable-shared=yes|no
+#
+#	Defines the following vars:
+#		STATIC_BUILD	Used for building import/export libraries
+#				on Windows.
+#
+#	Sets the following vars:
+#		SHARED_BUILD	Value of 1 or 0
+#------------------------------------------------------------------------
+
+AC_DEFUN([SC_ENABLE_SHARED], [
+    AC_MSG_CHECKING([how to build libraries])
+    AC_ARG_ENABLE(shared,
+	[  --enable-shared         build and link with shared libraries [--enable-shared]],
+	[tcl_ok=$enableval], [tcl_ok=yes])
+
+    if test "${enable_shared+set}" = set; then
+	enableval="$enable_shared"
+	tcl_ok=$enableval
+    else
+	tcl_ok=yes
+    fi
+
+    if test "$tcl_ok" = "yes" ; then
+	AC_MSG_RESULT([shared])
+	SHARED_BUILD=1
+    else
+	AC_MSG_RESULT([static])
+	SHARED_BUILD=0
+	AC_DEFINE(STATIC_BUILD)
+    fi
+])
+
+#------------------------------------------------------------------------
+# SC_ENABLE_FRAMEWORK --
+#
+#	Allows the building of shared libraries into frameworks
+#
+# Arguments:
+#	none
+#	
+# Results:
+#
+#	Adds the following arguments to configure:
+#		--enable-framework=yes|no
+#
+#	Sets the following vars:
+#		FRAMEWORK_BUILD	Value of 1 or 0
+#------------------------------------------------------------------------
+
+AC_DEFUN([SC_ENABLE_FRAMEWORK], [
+    if test "`uname -s`" = "Darwin" ; then
+	AC_MSG_CHECKING([how to package libraries])
+	AC_ARG_ENABLE(framework,
+	    [  --enable-framework      package shared libraries in MacOSX frameworks [--disable-framework]],
+	    [enable_framework=$enableval], [enable_framework=no])
+	if test $enable_framework = yes; then
+	    if test $SHARED_BUILD = 0; then
+		AC_MSG_WARN([Frameworks can only be built if --enable-shared is yes])
+		enable_framework=no
+	    fi
+	    if test $tcl_corefoundation = no; then
+		AC_MSG_WARN([Frameworks can only be used when CoreFoundation is available])
+		enable_framework=no
+	    fi
+	fi
+	if test $enable_framework = yes; then
+	    AC_MSG_RESULT([framework])
+	    FRAMEWORK_BUILD=1
+	else
+	    if test $SHARED_BUILD = 1; then
+		AC_MSG_RESULT([shared library])
+	    else
+		AC_MSG_RESULT([static library])
+	    fi
+	    FRAMEWORK_BUILD=0
+	fi
+    fi
+])
+
+#------------------------------------------------------------------------
+# SC_ENABLE_THREADS --
+#
+#	Specify if thread support should be enabled.  TCL_THREADS is
+#	checked so that if you are compiling an extension against a
+#	threaded core, your extension must be compiled threaded as well.
+#
+# Arguments:
+#	none
+#	
+# Results:
+#
+#	Adds the following arguments to configure:
+#		--enable-threads
+#
+#	Sets the following vars:
+#		THREADS_LIBS	Thread library(s)
+#
+#	Defines the following vars:
+#		TCL_THREADS
+#		_REENTRANT
+#		_THREAD_SAFE
+#
+#------------------------------------------------------------------------
+
+AC_DEFUN([SC_ENABLE_THREADS], [
+    AC_ARG_ENABLE(threads, [  --enable-threads        build with threads],
+	[tcl_ok=$enableval], [tcl_ok=no])
+
+    if test "${TCL_THREADS}" = 1; then
+	tcl_threaded_core=1;
+    fi
+
+    if test "$tcl_ok" = "yes" -o "${TCL_THREADS}" = 1; then
+	TCL_THREADS=1
+	# USE_THREAD_ALLOC tells us to try the special thread-based
+	# allocator that significantly reduces lock contention
+	AC_DEFINE(USE_THREAD_ALLOC)
+	AC_DEFINE(_REENTRANT)
+	if test "`uname -s`" = "SunOS" ; then
+	    AC_DEFINE(_POSIX_PTHREAD_SEMANTICS)
+	fi
+	AC_DEFINE(_THREAD_SAFE)
+	AC_CHECK_LIB(pthread,pthread_mutex_init,tcl_ok=yes,tcl_ok=no)
+	if test "$tcl_ok" = "no"; then
+	    # Check a little harder for __pthread_mutex_init in the same
+	    # library, as some systems hide it there until pthread.h is
+	    # defined.  We could alternatively do an AC_TRY_COMPILE with
+	    # pthread.h, but that will work with libpthread really doesn't
+	    # exist, like AIX 4.2.  [Bug: 4359]
+	    AC_CHECK_LIB(pthread, __pthread_mutex_init,
+		tcl_ok=yes, tcl_ok=no)
+	fi
+
+	if test "$tcl_ok" = "yes"; then
+	    # The space is needed
+	    THREADS_LIBS=" -lpthread"
+	else
+	    AC_CHECK_LIB(pthreads, pthread_mutex_init,
+		tcl_ok=yes, tcl_ok=no)
+	    if test "$tcl_ok" = "yes"; then
+		# The space is needed
+		THREADS_LIBS=" -lpthreads"
+	    else
+		AC_CHECK_LIB(c, pthread_mutex_init,
+		    tcl_ok=yes, tcl_ok=no)
+		if test "$tcl_ok" = "no"; then
+		    AC_CHECK_LIB(c_r, pthread_mutex_init,
+			tcl_ok=yes, tcl_ok=no)
+		    if test "$tcl_ok" = "yes"; then
+			# The space is needed
+			THREADS_LIBS=" -pthread"
+		    else
+			TCL_THREADS=0
+			AC_MSG_WARN([Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile...])
+		    fi
+		fi
+	    fi
+	fi
+
+	# Does the pthread-implementation provide
+	# 'pthread_attr_setstacksize' ?
+
+	ac_saved_libs=$LIBS
+	LIBS="$LIBS $THREADS_LIBS"
+	AC_CHECK_FUNCS(pthread_attr_setstacksize)
+	AC_CHECK_FUNCS(pthread_atfork)
+	LIBS=$ac_saved_libs
+    else
+	TCL_THREADS=0
+    fi
+    # Do checking message here to not mess up interleaved configure output
+    AC_MSG_CHECKING([for building with threads])
+    if test "${TCL_THREADS}" = 1; then
+	AC_DEFINE(TCL_THREADS, 1, [Are we building with threads enabled?])
+	if test "${tcl_threaded_core}" = 1; then
+	    AC_MSG_RESULT([yes (threaded core)])
+	else
+	    AC_MSG_RESULT([yes])
+	fi
+    else
+	AC_MSG_RESULT([no (default)])
+    fi
+
+    AC_SUBST(TCL_THREADS)
+])
+
+#------------------------------------------------------------------------
+# SC_ENABLE_SYMBOLS --
+#
+#	Specify if debugging symbols should be used.
+#	Memory (TCL_MEM_DEBUG) and compile (TCL_COMPILE_DEBUG) debugging
+#	can also be enabled.
+#
+# Arguments:
+#	none
+#	
+#	Requires the following vars to be set in the Makefile:
+#		CFLAGS_DEBUG
+#		CFLAGS_OPTIMIZE
+#		LDFLAGS_DEBUG
+#		LDFLAGS_OPTIMIZE
+#	
+# Results:
+#
+#	Adds the following arguments to configure:
+#		--enable-symbols
+#
+#	Defines the following vars:
+#		CFLAGS_DEFAULT	Sets to $(CFLAGS_DEBUG) if true
+#				Sets to $(CFLAGS_OPTIMIZE) if false
+#		LDFLAGS_DEFAULT	Sets to $(LDFLAGS_DEBUG) if true
+#				Sets to $(LDFLAGS_OPTIMIZE) if false
+#		DBGX		Debug library extension
+#
+#------------------------------------------------------------------------
+
+AC_DEFUN([SC_ENABLE_SYMBOLS], [
+    AC_MSG_CHECKING([for build with symbols])
+    AC_ARG_ENABLE(symbols, [  --enable-symbols        build with debugging symbols [--disable-symbols]],    [tcl_ok=$enableval], [tcl_ok=no])
+# FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT.
+    if test "$tcl_ok" = "no"; then
+	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
+	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
+	DBGX=""
+	AC_MSG_RESULT([no])
+    else
+	CFLAGS_DEFAULT='$(CFLAGS_DEBUG)'
+	LDFLAGS_DEFAULT='$(LDFLAGS_DEBUG)'
+	DBGX=g
+	if test "$tcl_ok" = "yes"; then
+	    AC_MSG_RESULT([yes (standard debugging)])
+	fi
+    fi
+    AC_SUBST(CFLAGS_DEFAULT)
+    AC_SUBST(LDFLAGS_DEFAULT)
+
+    if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then
+	AC_DEFINE(TCL_MEM_DEBUG)
+    fi
+
+    if test "$tcl_ok" = "compile" -o "$tcl_ok" = "all"; then
+	AC_DEFINE(TCL_COMPILE_DEBUG)
+	AC_DEFINE(TCL_COMPILE_STATS)
+    fi
+
+    if test "$tcl_ok" != "yes" -a "$tcl_ok" != "no"; then
+	if test "$tcl_ok" = "all"; then
+	    AC_MSG_RESULT([enabled symbols mem compile debugging])
+	else
+	    AC_MSG_RESULT([enabled $tcl_ok debugging])
+	fi
+    fi
+])
+
+#------------------------------------------------------------------------
+# SC_ENABLE_LANGINFO --
+#
+#	Allows use of modern nl_langinfo check for better l10n.
+#	This is only relevant for Unix.
+#
+# Arguments:
+#	none
+#	
+# Results:
+#
+#	Adds the following arguments to configure:
+#		--enable-langinfo=yes|no (default is yes)
+#
+#	Defines the following vars:
+#		HAVE_LANGINFO	Triggers use of nl_langinfo if defined.
+#
+#------------------------------------------------------------------------
+
+AC_DEFUN([SC_ENABLE_LANGINFO], [
+    AC_ARG_ENABLE(langinfo,
+	[  --enable-langinfo	  use nl_langinfo if possible to determine
+			  encoding at startup, otherwise use old heuristic],
+	[langinfo_ok=$enableval], [langinfo_ok=yes])
+
+    HAVE_LANGINFO=0
+    if test "$langinfo_ok" = "yes"; then
+	AC_CHECK_HEADER(langinfo.h,[langinfo_ok=yes],[langinfo_ok=no])
+    fi
+    AC_MSG_CHECKING([whether to use nl_langinfo])
+    if test "$langinfo_ok" = "yes"; then
+	AC_CACHE_VAL(tcl_cv_langinfo_h, [
+	    AC_TRY_COMPILE([#include <langinfo.h>], [nl_langinfo(CODESET);],
+		    [tcl_cv_langinfo_h=yes],[tcl_cv_langinfo_h=no])])
+	AC_MSG_RESULT([$tcl_cv_langinfo_h])
+	if test $tcl_cv_langinfo_h = yes; then
+	    AC_DEFINE(HAVE_LANGINFO)
+	fi
+    else 
+	AC_MSG_RESULT([$langinfo_ok])
+    fi
+])
+
+#--------------------------------------------------------------------
+# SC_CONFIG_MANPAGES
+#	
+#	Decide whether to use symlinks for linking the manpages,
+#	whether to compress the manpages after installation, and
+#	whether to add a package name suffix to the installed
+#	manpages to avoidfile name clashes.
+#	If compression is enabled also find out what file name suffix
+#	the given compression program is using.
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Adds the following arguments to configure:
+#		--enable-man-symlinks
+#		--enable-man-compression=PROG
+#		--enable-man-suffix[=STRING]
+#
+#	Defines the following variable:
+#
+#	MAN_FLAGS -	The apropriate flags for installManPage
+#			according to the user's selection.
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_CONFIG_MANPAGES], [
+    AC_MSG_CHECKING([whether to use symlinks for manpages])
+    AC_ARG_ENABLE(man-symlinks,
+	    [  --enable-man-symlinks   use symlinks for the manpages],
+	test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --symlinks",
+	enableval="no")
+    AC_MSG_RESULT([$enableval])
+
+    AC_MSG_CHECKING([whether to compress the manpages])
+    AC_ARG_ENABLE(man-compression,
+	    [  --enable-man-compression=PROG
+		      compress the manpages with PROG],
+	[case $enableval in
+	    yes) AC_MSG_ERROR([missing argument to --enable-man-compression]);;
+	    no)  ;;
+	    *)   MAN_FLAGS="$MAN_FLAGS --compress $enableval";;
+	esac],
+	enableval="no")
+    AC_MSG_RESULT([$enableval])
+    if test "$enableval" != "no"; then
+	AC_MSG_CHECKING([for compressed file suffix])
+	touch TeST
+	$enableval TeST
+	Z=`ls TeST* | sed 's/^....//'`
+	rm -f TeST*
+	MAN_FLAGS="$MAN_FLAGS --extension $Z"
+	AC_MSG_RESULT([$Z])
+    fi
+
+    AC_MSG_CHECKING([whether to add a package name suffix for the manpages])
+    AC_ARG_ENABLE(man-suffix,
+	    [  --enable-man-suffix=STRING
+		      use STRING as a suffix to manpage file names
+		      (default: $1)],
+	[case $enableval in
+	    yes) enableval="$1" MAN_FLAGS="$MAN_FLAGS --suffix $enableval";;
+	    no)  ;;
+	    *)   MAN_FLAGS="$MAN_FLAGS --suffix $enableval";;
+	esac],
+	enableval="no")
+    AC_MSG_RESULT([$enableval])
+
+    AC_SUBST(MAN_FLAGS)
+])
+
+#--------------------------------------------------------------------
+# SC_CONFIG_SYSTEM
+#
+#	Determine what the system is (some things cannot be easily checked
+#	on a feature-driven basis, alas). This can usually be done via the
+#	"uname" command, but there are a few systems, like Next, where
+#	this doesn't work.
+#
+# Arguments:
+#	none
+#
+# Results:
+#	Defines the following var:
+#
+#	system -	System/platform/version identification code.
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_CONFIG_SYSTEM], [
+    AC_CACHE_CHECK([system version], tcl_cv_sys_version, [
+	if test -f /usr/lib/NextStep/software_version; then
+	    tcl_cv_sys_version=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version`
+	else
+	    tcl_cv_sys_version=`uname -s`-`uname -r`
+	    if test "$?" -ne 0 ; then
+		AC_MSG_WARN([can't find uname command])
+		tcl_cv_sys_version=unknown
+	    else
+		# Special check for weird MP-RAS system (uname returns weird
+		# results, and the version is kept in special file).
+
+		if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+		    tcl_cv_sys_version=MP-RAS-`awk '{print $[3]}' /etc/.relid`
+		fi
+		if test "`uname -s`" = "AIX" ; then
+		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
+		fi
+	    fi
+	fi
+    ])
+    system=$tcl_cv_sys_version
+])
+
+#--------------------------------------------------------------------
+# SC_CONFIG_CFLAGS
+#
+#	Try to determine the proper flags to pass to the compiler
+#	for building shared libraries and other such nonsense.
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Defines and substitutes the following vars:
+#
+#       DL_OBJS -       Name of the object file that implements dynamic
+#                       loading for Tcl on this system.
+#       DL_LIBS -       Library file(s) to include in tclsh and other base
+#                       applications in order for the "load" command to work.
+#       LDFLAGS -      Flags to pass to the compiler when linking object
+#                       files into an executable application binary such
+#                       as tclsh.
+#       LD_SEARCH_FLAGS-Flags to pass to ld, such as "-R /usr/local/tcl/lib",
+#                       that tell the run-time dynamic linker where to look
+#                       for shared libraries such as libtcl.so.  Depends on
+#                       the variable LIB_RUNTIME_DIR in the Makefile. Could
+#                       be the same as CC_SEARCH_FLAGS if ${CC} is used to link.
+#       CC_SEARCH_FLAGS-Flags to pass to ${CC}, such as "-Wl,-rpath,/usr/local/tcl/lib",
+#                       that tell the run-time dynamic linker where to look
+#                       for shared libraries such as libtcl.so.  Depends on
+#                       the variable LIB_RUNTIME_DIR in the Makefile.
+#       MAKE_LIB -      Command to execute to build the a library;
+#                       differs when building shared or static.
+#       MAKE_STUB_LIB -
+#                       Command to execute to build a stub library.
+#       INSTALL_LIB -   Command to execute to install a library;
+#                       differs when building shared or static.
+#       INSTALL_STUB_LIB -
+#                       Command to execute to install a stub library.
+#       STLIB_LD -      Base command to use for combining object files
+#                       into a static library.
+#       SHLIB_CFLAGS -  Flags to pass to cc when compiling the components
+#                       of a shared library (may request position-independent
+#                       code, among other things).
+#       SHLIB_LD -      Base command to use for combining object files
+#                       into a shared library.
+#       SHLIB_LD_LIBS - Dependent libraries for the linker to scan when
+#                       creating shared libraries.  This symbol typically
+#                       goes at the end of the "ld" commands that build
+#                       shared libraries. The value of the symbol is
+#                       "${LIBS}" if all of the dependent libraries should
+#                       be specified when creating a shared library.  If
+#                       dependent libraries should not be specified (as on
+#                       SunOS 4.x, where they cause the link to fail, or in
+#                       general if Tcl and Tk aren't themselves shared
+#                       libraries), then this symbol has an empty string
+#                       as its value.
+#       SHLIB_SUFFIX -  Suffix to use for the names of dynamically loadable
+#                       extensions.  An empty string means we don't know how
+#                       to use shared libraries on this platform.
+# TCL_SHLIB_LD_EXTRAS - Additional element which are added to SHLIB_LD_LIBS
+#  TK_SHLIB_LD_EXTRAS   for the build of Tcl and Tk, but not recorded in the
+#                       tclConfig.sh, since they are only used for the build
+#                       of Tcl and Tk. 
+#                       Examples: MacOS X records the library version and
+#                       compatibility version in the shared library.  But
+#                       of course the Tcl version of this is only used for Tcl.
+#       LIB_SUFFIX -    Specifies everything that comes after the "libfoo"
+#                       in a static or shared library name, using the $VERSION variable
+#                       to put the version in the right place.  This is used
+#                       by platforms that need non-standard library names.
+#                       Examples:  ${VERSION}.so.1.1 on NetBSD, since it needs
+#                       to have a version after the .so, and ${VERSION}.a
+#                       on AIX, since a shared library needs to have
+#                       a .a extension whereas shared objects for loadable
+#                       extensions have a .so extension.  Defaults to
+#                       ${VERSION}${SHLIB_SUFFIX}.
+#       TCL_NEEDS_EXP_FILE -
+#                       1 means that an export file is needed to link to a
+#                       shared library.
+#       TCL_EXP_FILE -  The name of the installed export / import file which
+#                       should be used to link to the Tcl shared library.
+#                       Empty if Tcl is unshared.
+#       TCL_BUILD_EXP_FILE -
+#                       The name of the built export / import file which
+#                       should be used to link to the Tcl shared library.
+#                       Empty if Tcl is unshared.
+#	CFLAGS_DEBUG -
+#			Flags used when running the compiler in debug mode
+#	CFLAGS_OPTIMIZE -
+#			Flags used when running the compiler in optimize mode
+#	CFLAGS -	Additional CFLAGS added as necessary (usually 64-bit)
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_CONFIG_CFLAGS], [
+
+    # Step 0.a: Enable 64 bit support?
+
+    AC_MSG_CHECKING([if 64bit support is requested])
+    AC_ARG_ENABLE(64bit,[  --enable-64bit          enable 64bit support (where applicable)],
+	[do64bit=$enableval], [do64bit=no])
+    AC_MSG_RESULT([$do64bit])
+
+    # Step 0.b: Enable Solaris 64 bit VIS support?
+
+    AC_MSG_CHECKING([if 64bit Sparc VIS support is requested])
+    AC_ARG_ENABLE(64bit-vis,[  --enable-64bit-vis      enable 64bit Sparc VIS support],
+	[do64bitVIS=$enableval], [do64bitVIS=no])
+    AC_MSG_RESULT([$do64bitVIS])
+
+    if test "$do64bitVIS" = "yes"; then
+	# Force 64bit on with VIS
+	do64bit=yes
+    fi
+
+    # Step 1: set the variable "system" to hold the name and version number
+    # for the system.
+
+    SC_CONFIG_SYSTEM
+
+    # Step 2: check for existence of -ldl library.  This is needed because
+    # Linux can use either -ldl or -ldld for dynamic loading.
+
+    AC_CHECK_LIB(dl, dlopen, have_dl=yes, have_dl=no)
+
+    # Require ranlib early so we can override it in special cases below.
+
+    AC_REQUIRE([AC_PROG_RANLIB])
+
+    # Step 3: set configuration options based on system name and version.
+
+    do64bit_ok=no
+    LDFLAGS_ORIG="$LDFLAGS"
+    TCL_EXPORT_FILE_SUFFIX=""
+    UNSHARED_LIB_SUFFIX=""
+    TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
+    ECHO_VERSION='`echo ${VERSION}`'
+    TCL_LIB_VERSIONS_OK=ok
+    CFLAGS_DEBUG=-g
+    CFLAGS_OPTIMIZE=-O
+    if test "$GCC" = "yes" ; then
+	CFLAGS_WARNING="-Wall -Wno-implicit-int -fno-strict-aliasing"
+    else
+	CFLAGS_WARNING=""
+    fi
+    TCL_NEEDS_EXP_FILE=0
+    TCL_BUILD_EXP_FILE=""
+    TCL_EXP_FILE=""
+dnl FIXME: Replace AC_CHECK_PROG with AC_CHECK_TOOL once cross compiling is fixed.
+dnl AC_CHECK_TOOL(AR, ar)
+    AC_CHECK_PROG(AR, ar, ar)
+    if test "${AR}" = "" ; then
+	AC_MSG_ERROR([Required archive tool 'ar' not found on PATH.])
+    fi
+    STLIB_LD='${AR} cr'
+    LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH"
+    PLAT_OBJS=""
+    PLAT_SRCS=""
+    case $system in
+	AIX-*)
+	    if test "${TCL_THREADS}" = "1" -a "$GCC" != "yes" ; then
+		# AIX requires the _r compiler when gcc isn't being used
+		case "${CC}" in
+		    *_r)
+			# ok ...
+			;;
+		    *)
+			CC=${CC}_r
+			;;
+		esac
+		AC_MSG_RESULT([Using $CC for compiling with threads])
+	    fi
+	    LIBS="$LIBS -lc"
+	    SHLIB_CFLAGS=""
+	    # Note: need the LIBS below, otherwise Tk won't find Tcl's
+	    # symbols when dynamically loaded into tclsh.
+	    SHLIB_LD_LIBS='${LIBS}'
+	    SHLIB_SUFFIX=".so"
+
+	    DL_OBJS="tclLoadDl.o"
+	    LD_LIBRARY_PATH_VAR="LIBPATH"
+
+	    # Check to enable 64-bit flags for compiler/linker on AIX 4+
+	    if test "$do64bit" = "yes" -a "`uname -v`" -gt "3" ; then
+		if test "$GCC" = "yes" ; then
+		    AC_MSG_WARN([64bit mode not supported with GCC on $system])
+		else 
+		    do64bit_ok=yes
+		    CFLAGS="$CFLAGS -q64"
+		    LDFLAGS="$LDFLAGS -q64"
+		    RANLIB="${RANLIB} -X64"
+		    AR="${AR} -X64"
+		    SHLIB_LD_FLAGS="-b64"
+		fi
+	    fi
+
+	    if test "`uname -m`" = "ia64" ; then
+		# AIX-5 uses ELF style dynamic libraries on IA-64, but not PPC
+		SHLIB_LD="/usr/ccs/bin/ld -G -z text"
+		# AIX-5 has dl* in libc.so
+		DL_LIBS=""
+		if test "$GCC" = "yes" ; then
+		    CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
+		else
+		    CC_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'
+		fi
+		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
+	    else
+		if test "$GCC" = "yes" ; then
+		    SHLIB_LD="gcc -shared"
+		else
+		    SHLIB_LD="/bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"
+		fi
+		SHLIB_LD="${TCL_SRC_DIR}/unix/ldAix ${SHLIB_LD} ${SHLIB_LD_FLAGS}"
+		DL_LIBS="-ldl"
+		CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+		TCL_NEEDS_EXP_FILE=1
+		TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.exp'
+	    fi
+
+	    # AIX v<=4.1 has some different flags than 4.2+
+	    if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then
+		LIBOBJS="$LIBOBJS tclLoadAix.o"
+		DL_LIBS="-lld"
+	    fi
+
+	    # On AIX <=v4 systems, libbsd.a has to be linked in to support
+	    # non-blocking file IO.  This library has to be linked in after
+	    # the MATH_LIBS or it breaks the pow() function.  The way to
+	    # insure proper sequencing, is to add it to the tail of MATH_LIBS.
+	    # This library also supplies gettimeofday.
+	    #
+	    # AIX does not have a timezone field in struct tm. When the AIX
+	    # bsd library is used, the timezone global and the gettimeofday
+	    # methods are to be avoided for timezone deduction instead, we
+	    # deduce the timezone by comparing the localtime result on a
+	    # known GMT value.
+
+	    AC_CHECK_LIB(bsd, gettimeofday, libbsd=yes, libbsd=no)
+	    if test $libbsd = yes; then
+	    	MATH_LIBS="$MATH_LIBS -lbsd"
+	    	AC_DEFINE(USE_DELTA_FOR_TZ)
+	    fi
+	    ;;
+	BeOS*)
+	    SHLIB_CFLAGS="-fPIC"
+	    SHLIB_LD="${CC} -nostart"
+	    SHLIB_LD_LIBS='${LIBS}'
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS="-ldl"
+
+	    #-----------------------------------------------------------
+	    # Check for inet_ntoa in -lbind, for BeOS (which also needs
+	    # -lsocket, even if the network functions are in -lnet which
+	    # is always linked to, for compatibility.
+	    #-----------------------------------------------------------
+	    AC_CHECK_LIB(bind, inet_ntoa, [LIBS="$LIBS -lbind -lsocket"])
+	    ;;
+	BSD/OS-2.1*|BSD/OS-3*)
+	    SHLIB_CFLAGS=""
+	    SHLIB_LD="shlicc -r"
+	    SHLIB_LD_LIBS='${LIBS}'
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS="-ldl"
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    ;;
+	BSD/OS-4.*)
+	    SHLIB_CFLAGS="-export-dynamic -fPIC"
+	    SHLIB_LD="cc -shared"
+	    SHLIB_LD_LIBS='${LIBS}'
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS="-ldl"
+	    LDFLAGS="$LDFLAGS -export-dynamic"
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    ;;
+	dgux*)
+	    SHLIB_CFLAGS="-K PIC"
+	    SHLIB_LD="cc -G"
+	    SHLIB_LD_LIBS=""
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS="-ldl"
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    ;;
+	HP-UX-*.11.*)
+	    # Use updated header definitions where possible
+	    AC_DEFINE(_XOPEN_SOURCE)          # Use the XOPEN network library
+	    AC_DEFINE(_XOPEN_SOURCE_EXTENDED) # Use the XOPEN network library
+	    LIBS="$LIBS -lxnet"               # Use the XOPEN network library
+
+	    if test "`uname -m`" = "ia64" ; then
+		SHLIB_SUFFIX=".so"
+	    else
+		SHLIB_SUFFIX=".sl"
+	    fi
+	    AC_CHECK_LIB(dld, shl_load, tcl_ok=yes, tcl_ok=no)
+	    if test "$tcl_ok" = yes; then
+		SHLIB_CFLAGS="+z"
+		SHLIB_LD="ld -b"
+		SHLIB_LD_LIBS='${LIBS}'
+		DL_OBJS="tclLoadShl.o"
+		DL_LIBS="-ldld"
+		LDFLAGS="$LDFLAGS -Wl,-E"
+		CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
+		LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
+		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
+	    fi
+	    if test "$GCC" = "yes" ; then
+		SHLIB_LD="gcc -shared"
+		SHLIB_LD_LIBS='${LIBS}'
+		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+	    fi
+
+	    # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc
+	    #CFLAGS="$CFLAGS +DAportable"
+
+	    # Check to enable 64-bit flags for compiler/linker
+	    if test "$do64bit" = "yes" ; then
+		if test "$GCC" = "yes" ; then
+		    hpux_arch=`${CC} -dumpmachine`
+		    case $hpux_arch in
+			hppa64*)
+			    # 64-bit gcc in use.  Fix flags for GNU ld.
+			    do64bit_ok=yes
+			    SHLIB_LD="${CC} -shared"
+			    SHLIB_LD_LIBS='${LIBS}'
+			    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+			    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+			    ;;
+			*)
+			    AC_MSG_WARN([64bit mode not supported with GCC on $system])
+			    ;;
+		    esac
+		else
+		    do64bit_ok=yes
+		    CFLAGS="$CFLAGS +DD64"
+		    LDFLAGS="$LDFLAGS +DD64"
+		fi
+	    fi
+	    ;;
+	HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*)
+	    SHLIB_SUFFIX=".sl"
+	    AC_CHECK_LIB(dld, shl_load, tcl_ok=yes, tcl_ok=no)
+	    if test "$tcl_ok" = yes; then
+		SHLIB_CFLAGS="+z"
+		SHLIB_LD="ld -b"
+		SHLIB_LD_LIBS=""
+		DL_OBJS="tclLoadShl.o"
+		DL_LIBS="-ldld"
+		LDFLAGS="$LDFLAGS -Wl,-E"
+		CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
+		LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
+		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
+	    fi
+	    ;;
+	IRIX-4.*)
+	    SHLIB_CFLAGS="-G 0"
+	    SHLIB_SUFFIX=".a"
+	    SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r -G 0"
+	    SHLIB_LD_LIBS='${LIBS}'
+	    DL_OBJS="tclLoadAout.o"
+	    DL_LIBS=""
+	    LDFLAGS="$LDFLAGS -Wl,-D,08000000"
+	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+	    SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
+	    ;;
+	IRIX-5.*)
+	    SHLIB_CFLAGS=""
+	    SHLIB_LD="ld -shared -rdata_shared"
+	    SHLIB_LD_LIBS='${LIBS}'
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS=""
+	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+	    ;;
+	IRIX-6.*)
+	    SHLIB_CFLAGS=""
+	    SHLIB_LD="ld -n32 -shared -rdata_shared"
+	    SHLIB_LD_LIBS='${LIBS}'
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS=""
+	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+	    if test "$GCC" = "yes" ; then
+		CFLAGS="$CFLAGS -mabi=n32"
+		LDFLAGS="$LDFLAGS -mabi=n32"
+	    else
+		case $system in
+		    IRIX-6.3)
+			# Use to build 6.2 compatible binaries on 6.3.
+			CFLAGS="$CFLAGS -n32 -D_OLD_TERMIOS"
+			;;
+		    *)
+			CFLAGS="$CFLAGS -n32"
+			;;
+		esac
+		LDFLAGS="$LDFLAGS -n32"
+	    fi
+	    ;;
+	IRIX64-6.*)
+	    SHLIB_CFLAGS=""
+	    SHLIB_LD="ld -n32 -shared -rdata_shared"
+	    SHLIB_LD_LIBS='${LIBS}'
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS=""
+	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+
+	    # Check to enable 64-bit flags for compiler/linker
+
+	    if test "$do64bit" = "yes" ; then
+	        if test "$GCC" = "yes" ; then
+	            AC_MSG_WARN([64bit mode not supported by gcc])
+	        else
+	            do64bit_ok=yes
+	            SHLIB_LD="ld -64 -shared -rdata_shared"
+	            CFLAGS="$CFLAGS -64"
+	            LDFLAGS="$LDFLAGS -64"
+	        fi
+	    fi
+	    ;;
+	Linux*)
+	    SHLIB_CFLAGS="-fPIC"
+	    SHLIB_LD_LIBS='${LIBS}'
+	    SHLIB_SUFFIX=".so"
+
+	    CFLAGS_OPTIMIZE=-O2
+	    # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings 
+	    # when you inline the string and math operations.  Turn this off to
+	    # get rid of the warnings.
+	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+
+	    if test "$have_dl" = yes; then
+		SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+		DL_OBJS="tclLoadDl.o"
+		DL_LIBS="-ldl"
+		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+	    else
+		AC_CHECK_HEADER(dld.h, [
+		    SHLIB_LD="ld -shared"
+		    DL_OBJS="tclLoadDld.o"
+		    DL_LIBS="-ldld"
+		    CC_SEARCH_FLAGS=""
+		    LD_SEARCH_FLAGS=""])
+	    fi
+	    if test "`uname -m`" = "alpha" ; then
+		CFLAGS="$CFLAGS -mieee"
+	    fi
+	    if test $do64bit = yes; then
+		AC_CACHE_CHECK([if compiler accepts -m64 flag], tcl_cv_cc_m64, [
+		    hold_cflags=$CFLAGS
+		    CFLAGS="$CFLAGS -m64"
+		    AC_TRY_LINK(,, tcl_cv_cc_m64=yes, tcl_cv_cc_m64=no)
+		    CFLAGS=$hold_cflags])
+		if test $tcl_cv_cc_m64 = yes; then
+		    CFLAGS="$CFLAGS -m64"
+		    do64bit_ok=yes
+		fi
+	    fi
+
+	    # The combo of gcc + glibc has a bug related
+	    # to inlining of functions like strtod(). The
+	    # -fno-builtin flag should address this problem
+	    # but it does not work. The -fno-inline flag
+	    # is kind of overkill but it works.
+	    # Disable inlining only when one of the
+	    # files in compat/*.c is being linked in.
+	    if test x"${LIBOBJS}" != x ; then
+	        CFLAGS="$CFLAGS -fno-inline"
+	    fi
+
+	    # XIM peeking works under XFree86.
+	    AC_DEFINE(PEEK_XCLOSEIM)
+
+	    ;;
+	GNU*)
+	    SHLIB_CFLAGS="-fPIC"
+	    SHLIB_LD_LIBS='${LIBS}'
+	    SHLIB_SUFFIX=".so"
+
+	    if test "$have_dl" = yes; then
+		SHLIB_LD="${CC} -shared"
+		DL_OBJS=""
+		DL_LIBS="-ldl"
+		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+		CC_SEARCH_FLAGS=""
+		LD_SEARCH_FLAGS=""
+	    else
+		AC_CHECK_HEADER(dld.h, [
+		    SHLIB_LD="ld -shared"
+		    DL_OBJS=""
+		    DL_LIBS="-ldld"
+		    CC_SEARCH_FLAGS=""
+		    LD_SEARCH_FLAGS=""])
+	    fi
+	    if test "`uname -m`" = "alpha" ; then
+		CFLAGS="$CFLAGS -mieee"
+	    fi
+	    ;;
+	Lynx*)
+	    SHLIB_CFLAGS="-fPIC"
+	    SHLIB_LD_LIBS='${LIBS}'
+	    SHLIB_SUFFIX=".so"
+	    CFLAGS_OPTIMIZE=-02
+	    SHLIB_LD="${CC} -shared "
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS="-mshared -ldl"
+	    LD_FLAGS="-Wl,--export-dynamic"
+	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+	    ;;
+	MP-RAS-02*)
+	    SHLIB_CFLAGS="-K PIC"
+	    SHLIB_LD="cc -G"
+	    SHLIB_LD_LIBS=""
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS="-ldl"
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    ;;
+	MP-RAS-*)
+	    SHLIB_CFLAGS="-K PIC"
+	    SHLIB_LD="cc -G"
+	    SHLIB_LD_LIBS=""
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS="-ldl"
+	    LDFLAGS="$LDFLAGS -Wl,-Bexport"
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    ;;
+	NetBSD-*|FreeBSD-[[1-2]].*)
+	    # Not available on all versions:  check for include file.
+	    AC_CHECK_HEADER(dlfcn.h, [
+		# NetBSD/SPARC needs -fPIC, -fpic will not do.
+		SHLIB_CFLAGS="-fPIC"
+		SHLIB_LD="ld -Bshareable -x"
+		SHLIB_LD_LIBS='${LIBS}'
+		SHLIB_SUFFIX=".so"
+		DL_OBJS="tclLoadDl.o"
+		DL_LIBS=""
+		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+		AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [
+		    AC_EGREP_CPP(yes, [
+#ifdef __ELF__
+	yes
+#endif
+		    ], tcl_cv_ld_elf=yes, tcl_cv_ld_elf=no)])
+		if test $tcl_cv_ld_elf = yes; then
+		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+		else
+		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+		fi
+	    ], [
+		SHLIB_CFLAGS=""
+		SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
+		SHLIB_LD_LIBS='${LIBS}'
+		SHLIB_SUFFIX=".a"
+		DL_OBJS="tclLoadAout.o"
+		DL_LIBS=""
+		CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+	    ])
+
+	    # FreeBSD doesn't handle version numbers with dots.
+
+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+	    TCL_LIB_VERSIONS_OK=nodots
+	    ;;
+	OpenBSD-*)
+	    case `arch -s` in
+	    m88k|vax)
+		SHLIB_CFLAGS=""
+		SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
+		SHLIB_LD_LIBS='${LIBS}'
+		SHLIB_SUFFIX=".a"
+		DL_OBJS="tclLoadAout.o"
+		DL_LIBS=""
+		LDFLAGS=""
+		CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+		;;
+	    *)
+		# OpenBSD/SPARC[64] needs -fPIC, -fpic will not do.
+		case `machine` in
+		sparc|sparc64)
+		    SHLIB_CFLAGS="-fPIC";;
+	        *)
+		    SHLIB_CFLAGS="-fpic";;
+	        esac
+		SHLIB_LD="${CC} -shared ${SHLIB_CFLAGS}"
+		SHLIB_LD_LIBS='${LIBS}'
+		SHLIB_SUFFIX=".so"
+		DL_OBJS="tclLoadDl.o"
+		DL_LIBS=""
+		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+		AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [
+		    AC_EGREP_CPP(yes, [
+#ifdef __ELF__
+	yes
+#endif
+		    ], tcl_cv_ld_elf=yes, tcl_cv_ld_elf=no)])
+		if test $tcl_cv_ld_elf = yes; then
+		    LDFLAGS=-Wl,-export-dynamic
+		else
+		    LDFLAGS=""
+	        fi
+		;;
+	    esac
+
+	    # OpenBSD doesn't do version numbers with dots.
+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+	    TCL_LIB_VERSIONS_OK=nodots
+	    ;;
+	FreeBSD-*)
+	    # FreeBSD 3.* and greater have ELF.
+	    SHLIB_CFLAGS="-fPIC"
+	    SHLIB_LD="ld -Bshareable -x"
+	    SHLIB_LD_LIBS='${LIBS}'
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS=""
+	    LDFLAGS="$LDFLAGS -export-dynamic"
+	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+	    if test "${TCL_THREADS}" = "1" ; then
+		# The -pthread needs to go in the CFLAGS, not LIBS
+		LIBS=`echo $LIBS | sed s/-pthread//`
+		CFLAGS="$CFLAGS -pthread"
+	    	LDFLAGS="$LDFLAGS -pthread"
+	    fi
+	    case $system in
+	    FreeBSD-3.*)
+	    	# FreeBSD-3 doesn't handle version numbers with dots.
+	    	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+	    	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+	    	TCL_LIB_VERSIONS_OK=nodots
+		;;
+	    esac
+	    ;;
+	Darwin-*)
+	    CFLAGS_OPTIMIZE="-Os"
+	    SHLIB_CFLAGS="-fno-common"
+	    # To avoid discrepancies between what headers configure sees during
+	    # preprocessing tests and compiling tests, move any -isysroot and
+	    # -mmacosx-version-min flags from CFLAGS to CPPFLAGS:
+	    CPPFLAGS="${CPPFLAGS} `echo " ${CFLAGS}" | \
+		awk 'BEGIN {FS=" +-";ORS=" "}; {for (i=2;i<=NF;i++) \
+		if ([$]i~/^(isysroot|mmacosx-version-min)/) print "-"[$]i}'`"
+	    CFLAGS="`echo " ${CFLAGS}" | \
+		awk 'BEGIN {FS=" +-";ORS=" "}; {for (i=2;i<=NF;i++) \
+		if (!([$]i~/^(isysroot|mmacosx-version-min)/)) print "-"[$]i}'`"
+	    if test $do64bit = yes; then
+		case `arch` in
+		    ppc)
+			AC_CACHE_CHECK([if compiler accepts -arch ppc64 flag],
+				tcl_cv_cc_arch_ppc64, [
+			    hold_cflags=$CFLAGS
+			    CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5"
+			    AC_TRY_LINK(,, tcl_cv_cc_arch_ppc64=yes,
+				    tcl_cv_cc_arch_ppc64=no)
+			    CFLAGS=$hold_cflags])
+			if test $tcl_cv_cc_arch_ppc64 = yes; then
+			    CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5"
+			    do64bit_ok=yes
+			fi;;
+		    i386)
+			AC_CACHE_CHECK([if compiler accepts -arch x86_64 flag],
+				tcl_cv_cc_arch_x86_64, [
+			    hold_cflags=$CFLAGS
+			    CFLAGS="$CFLAGS -arch x86_64"
+			    AC_TRY_LINK(,, tcl_cv_cc_arch_x86_64=yes,
+				    tcl_cv_cc_arch_x86_64=no)
+			    CFLAGS=$hold_cflags])
+			if test $tcl_cv_cc_arch_x86_64 = yes; then
+			    CFLAGS="$CFLAGS -arch x86_64"
+			    do64bit_ok=yes
+			fi;;
+		    *)
+			AC_MSG_WARN([Don't know how enable 64-bit on architecture `arch`]);;
+		esac
+	    else
+		# Check for combined 32-bit and 64-bit fat build
+		echo "$CFLAGS " | grep -E -q -- '-arch (ppc64|x86_64) ' && \
+		    echo "$CFLAGS " | grep -E -q -- '-arch (ppc|i386) ' && \
+		    fat_32_64=yes
+	    fi
+	    SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS}'
+	    AC_CACHE_CHECK([if ld accepts -single_module flag], tcl_cv_ld_single_module, [
+		hold_ldflags=$LDFLAGS
+		LDFLAGS="$LDFLAGS -dynamiclib -Wl,-single_module"
+		AC_TRY_LINK(, [int i;], tcl_cv_ld_single_module=yes, tcl_cv_ld_single_module=no)
+		LDFLAGS=$hold_ldflags])
+	    if test $tcl_cv_ld_single_module = yes; then
+		SHLIB_LD="${SHLIB_LD} -Wl,-single_module"
+	    fi
+	    SHLIB_LD_LIBS='${LIBS}'
+	    SHLIB_SUFFIX=".dylib"
+	    DL_OBJS="tclLoadDyld.o"
+	    DL_LIBS=""
+	    # Don't use -prebind when building for Mac OS X 10.4 or later only:
+	    test "`echo "${MACOSX_DEPLOYMENT_TARGET}" | awk -F '10\\.' '{print int([$]2)}'`" -lt 4 -a \
+		"`echo "${CPPFLAGS}" | awk -F '-mmacosx-version-min=10\\.' '{print int([$]2)}'`" -lt 4 && \
+		LDFLAGS="$LDFLAGS -prebind"
+	    LDFLAGS="$LDFLAGS -headerpad_max_install_names"
+	    AC_CACHE_CHECK([if ld accepts -search_paths_first flag], tcl_cv_ld_search_paths_first, [
+		hold_ldflags=$LDFLAGS
+		LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+		AC_TRY_LINK(, [int i;], tcl_cv_ld_search_paths_first=yes, tcl_cv_ld_search_paths_first=no)
+		LDFLAGS=$hold_ldflags])
+	    if test $tcl_cv_ld_search_paths_first = yes; then
+		LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+	    fi
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
+	    PLAT_OBJS=\$\(MAC\_OSX_OBJS\)
+	    PLAT_SRCS=\$\(MAC\_OSX_SRCS\)
+	    AC_MSG_CHECKING([whether to use CoreFoundation])
+	    AC_ARG_ENABLE(corefoundation, [  --enable-corefoundation use CoreFoundation API [--enable-corefoundation]],
+		[tcl_corefoundation=$enableval], [tcl_corefoundation=yes])
+	    AC_MSG_RESULT([$tcl_corefoundation])
+	    if test $tcl_corefoundation = yes; then
+		AC_CACHE_CHECK([for CoreFoundation.framework], tcl_cv_lib_corefoundation, [
+		    hold_libs=$LIBS
+		    if test "$fat_32_64" = yes; then for v in CFLAGS CPPFLAGS LDFLAGS; do
+			# On Tiger there is no 64-bit CF, so remove 64-bit archs
+			# from CFLAGS et al. while testing for presence of CF.
+			# 64-bit CF is disabled in tclUnixPort.h if necessary.
+			eval 'hold_'$v'="$'$v'";'$v'="`echo "$'$v' "|sed -e "s/-arch ppc64 / /g" -e "s/-arch x86_64 / /g"`"'
+		    done; fi
+		    LIBS="$LIBS -framework CoreFoundation"
+		    AC_TRY_LINK([#include <CoreFoundation/CoreFoundation.h>], 
+			[CFBundleRef b = CFBundleGetMainBundle();], 
+			tcl_cv_lib_corefoundation=yes, tcl_cv_lib_corefoundation=no)
+		    if test "$fat_32_64" = yes; then for v in CFLAGS CPPFLAGS LDFLAGS; do
+			eval $v'="$hold_'$v'"'
+		    done; fi; LIBS=$hold_libs])
+		if test $tcl_cv_lib_corefoundation = yes; then
+		    LIBS="$LIBS -framework CoreFoundation"
+		    AC_DEFINE(HAVE_COREFOUNDATION)
+		else
+		    tcl_corefoundation=no
+		fi
+		if test "$fat_32_64" = yes -a $tcl_corefoundation = yes; then
+		    AC_CACHE_CHECK([for 64-bit CoreFoundation], tcl_cv_lib_corefoundation_64, [
+			for v in CFLAGS CPPFLAGS LDFLAGS; do
+			    eval 'hold_'$v'="$'$v'";'$v'="`echo "$'$v' "|sed -e "s/-arch ppc / /g" -e "s/-arch i386 / /g"`"'
+			done
+			AC_TRY_LINK([#include <CoreFoundation/CoreFoundation.h>], 
+			    [CFBundleRef b = CFBundleGetMainBundle();], 
+			    tcl_cv_lib_corefoundation_64=yes, tcl_cv_lib_corefoundation_64=no)
+			for v in CFLAGS CPPFLAGS LDFLAGS; do
+			    eval $v'="$hold_'$v'"'
+			done])
+		    if test $tcl_cv_lib_corefoundation_64 = no; then
+			AC_DEFINE(NO_COREFOUNDATION_64)
+		    fi
+		fi
+	    fi
+	    AC_DEFINE(MAC_OSX_TCL)
+	    ;;
+	NEXTSTEP-*)
+	    SHLIB_CFLAGS=""
+	    SHLIB_LD="cc -nostdlib -r"
+	    SHLIB_LD_LIBS=""
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadNext.o"
+	    DL_LIBS=""
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    ;;
+	OS/390-*)
+	    CFLAGS_OPTIMIZE=""		# Optimizer is buggy
+	    AC_DEFINE(_OE_SOCKETS)	# needed in sys/socket.h
+	    ;;      
+	OSF1-1.0|OSF1-1.1|OSF1-1.2)
+	    # OSF/1 1.[012] from OSF, and derivatives, including Paragon OSF/1
+	    SHLIB_CFLAGS=""
+	    # Hack: make package name same as library name
+	    SHLIB_LD='ld -R -export $@:'
+	    SHLIB_LD_LIBS=""
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadOSF.o"
+	    DL_LIBS=""
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    ;;
+	OSF1-1.*)
+	    # OSF/1 1.3 from OSF using ELF, and derivatives, including AD2
+	    SHLIB_CFLAGS="-fPIC"
+	    if test "$SHARED_BUILD" = "1" ; then
+	        SHLIB_LD="ld -shared"
+	    else
+	        SHLIB_LD="ld -non_shared"
+	    fi
+	    SHLIB_LD_LIBS=""
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS=""
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    ;;
+	OSF1-V*)
+	    # Digital OSF/1
+	    SHLIB_CFLAGS=""
+	    if test "$SHARED_BUILD" = "1" ; then
+	        SHLIB_LD='ld -shared -expect_unresolved "*"'
+	    else
+	        SHLIB_LD='ld -non_shared -expect_unresolved "*"'
+	    fi
+	    SHLIB_LD_LIBS=""
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS=""
+	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+	    if test "$GCC" = "yes" ; then
+		CFLAGS="$CFLAGS -mieee"
+            else
+		CFLAGS="$CFLAGS -DHAVE_TZSET -std1 -ieee"
+	    fi
+	    # see pthread_intro(3) for pthread support on osf1, k.furukawa
+	    if test "${TCL_THREADS}" = "1" ; then
+		CFLAGS="$CFLAGS -DHAVE_PTHREAD_ATTR_SETSTACKSIZE"
+		CFLAGS="$CFLAGS -DTCL_THREAD_STACK_MIN=PTHREAD_STACK_MIN*64"
+		LIBS=`echo $LIBS | sed s/-lpthreads//`
+		if test "$GCC" = "yes" ; then
+		    LIBS="$LIBS -lpthread -lmach -lexc"
+		else
+		    CFLAGS="$CFLAGS -pthread"
+		    LDFLAGS="$LDFLAGS -pthread"
+		fi
+	    fi
+
+	    ;;
+	QNX-6*)
+	    # QNX RTP
+	    # This may work for all QNX, but it was only reported for v6.
+	    SHLIB_CFLAGS="-fPIC"
+	    SHLIB_LD="ld -Bshareable -x"
+	    SHLIB_LD_LIBS=""
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    # dlopen is in -lc on QNX
+	    DL_LIBS=""
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    ;;
+	RISCos-*)
+	    SHLIB_CFLAGS="-G 0"
+	    SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r -G 0"
+	    SHLIB_LD_LIBS='${LIBS}'
+	    SHLIB_SUFFIX=".a"
+	    DL_OBJS="tclLoadAout.o"
+	    DL_LIBS=""
+	    LDFLAGS="$LDFLAGS -Wl,-D,08000000"
+	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+	    ;;
+	SCO_SV-3.2*)
+	    # Note, dlopen is available only on SCO 3.2.5 and greater. However,
+	    # this test works, since "uname -s" was non-standard in 3.2.4 and
+	    # below.
+	    if test "$GCC" = "yes" ; then
+	    	SHLIB_CFLAGS="-fPIC -melf"
+	    	LDFLAGS="$LDFLAGS -melf -Wl,-Bexport"
+	    else
+	    	SHLIB_CFLAGS="-Kpic -belf"
+	    	LDFLAGS="$LDFLAGS -belf -Wl,-Bexport"
+	    fi
+	    SHLIB_LD="ld -G"
+	    SHLIB_LD_LIBS=""
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS=""
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    ;;
+	SINIX*5.4*)
+	    SHLIB_CFLAGS="-K PIC"
+	    SHLIB_LD="cc -G"
+	    SHLIB_LD_LIBS=""
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS="-ldl"
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    ;;
+	SunOS-4*)
+	    SHLIB_CFLAGS="-PIC"
+	    SHLIB_LD="ld"
+	    SHLIB_LD_LIBS=""
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS="-ldl"
+	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+
+	    # SunOS can't handle version numbers with dots in them in library
+	    # specs, like -ltcl7.5, so use -ltcl75 instead.  Also, it
+	    # requires an extra version number at the end of .so file names.
+	    # So, the library has to have a name like libtcl75.so.1.0
+
+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+	    TCL_LIB_VERSIONS_OK=nodots
+	    ;;
+	SunOS-5.[[0-6]])
+	    # Careful to not let 5.10+ fall into this case
+
+	    # Note: If _REENTRANT isn't defined, then Solaris
+	    # won't define thread-safe library routines.
+
+	    AC_DEFINE(_REENTRANT)
+	    AC_DEFINE(_POSIX_PTHREAD_SEMANTICS)
+
+	    SHLIB_CFLAGS="-KPIC"
+
+	    # Note: need the LIBS below, otherwise Tk won't find Tcl's
+	    # symbols when dynamically loaded into tclsh.
+
+	    SHLIB_LD_LIBS='${LIBS}'
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS="-ldl"
+	    if test "$GCC" = "yes" ; then
+		SHLIB_LD="$CC -shared"
+		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
+		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+	    else
+		SHLIB_LD="/usr/ccs/bin/ld -G -z text"
+		CC_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
+		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+	    fi
+	    ;;
+	SunOS-5*)
+	    # Note: If _REENTRANT isn't defined, then Solaris
+	    # won't define thread-safe library routines.
+
+	    AC_DEFINE(_REENTRANT)
+	    AC_DEFINE(_POSIX_PTHREAD_SEMANTICS)
+
+	    SHLIB_CFLAGS="-KPIC"
+
+	    # Check to enable 64-bit flags for compiler/linker
+	    if test "$do64bit" = "yes" ; then
+		arch=`isainfo`
+		if test "$arch" = "sparcv9 sparc" ; then
+			if test "$GCC" = "yes" ; then
+			    if test "`gcc -dumpversion | awk -F. '{print [$]1}'`" -lt "3" ; then
+				AC_MSG_WARN([64bit mode not supported with GCC < 3.2 on $system])
+			    else
+				do64bit_ok=yes
+				CFLAGS="$CFLAGS -m64 -mcpu=v9"
+				LDFLAGS="$LDFLAGS -m64 -mcpu=v9"
+				SHLIB_CFLAGS="-fPIC"
+			    fi
+			else
+			    do64bit_ok=yes
+			    if test "$do64bitVIS" = "yes" ; then
+				CFLAGS="$CFLAGS -xarch=v9a"
+			    	LDFLAGS="$LDFLAGS -xarch=v9a"
+			    else
+				CFLAGS="$CFLAGS -xarch=v9"
+			    	LDFLAGS="$LDFLAGS -xarch=v9"
+			    fi
+			    # Solaris 64 uses this as well
+			    #LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH_64"
+			fi
+		elif test "$arch" = "amd64 i386" ; then
+		    if test "$GCC" = "yes" ; then
+			AC_MSG_WARN([64bit mode not supported with GCC on $system])
+		    else
+			do64bit_ok=yes
+			CFLAGS="$CFLAGS -xarch=amd64"
+			LDFLAGS="$LDFLAGS -xarch=amd64"
+		    fi
+		else
+		    AC_MSG_WARN([64bit mode not supported for $arch])
+		fi
+	    fi
+	    
+	    # Note: need the LIBS below, otherwise Tk won't find Tcl's
+	    # symbols when dynamically loaded into tclsh.
+
+	    SHLIB_LD_LIBS='${LIBS}'
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS="-ldl"
+	    if test "$GCC" = "yes" ; then
+		SHLIB_LD="$CC -shared"
+		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
+		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+		if test "$do64bit_ok" = "yes" ; then
+		    # We need to specify -static-libgcc or we need to
+		    # add the path to the sparv9 libgcc.
+		    SHLIB_LD="$SHLIB_LD -m64 -mcpu=v9 -static-libgcc"
+		    # for finding sparcv9 libgcc, get the regular libgcc
+		    # path, remove so name and append 'sparcv9'
+		    #v9gcclibdir="`gcc -print-file-name=libgcc_s.so` | ..."
+		    #CC_SEARCH_FLAGS="${CC_SEARCH_FLAGS},-R,$v9gcclibdir"
+		fi
+	    else
+		case $system in
+		    SunOS-5.[[1-9]][[0-9]]*)
+			SHLIB_LD='${CC} -G -z text';;
+		    *)
+			SHLIB_LD="/usr/ccs/bin/ld -G -z text";;
+		esac
+		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
+		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
+	    fi
+	    ;;
+	ULTRIX-4.*)
+	    SHLIB_CFLAGS="-G 0"
+	    SHLIB_SUFFIX=".a"
+	    SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r -G 0"
+	    SHLIB_LD_LIBS='${LIBS}'
+	    DL_OBJS="tclLoadAout.o"
+	    DL_LIBS=""
+	    LDFLAGS="$LDFLAGS -Wl,-D,08000000"
+	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+	    if test "$GCC" != "yes" ; then
+		CFLAGS="$CFLAGS -DHAVE_TZSET -std1"
+	    fi
+	    ;;
+	UNIX_SV* | UnixWare-5*)
+	    SHLIB_CFLAGS="-KPIC"
+	    SHLIB_LD="cc -G"
+	    SHLIB_LD_LIBS=""
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS="-ldl"
+	    # Some UNIX_SV* systems (unixware 1.1.2 for example) have linkers
+	    # that don't grok the -Bexport option.  Test that it does.
+	    AC_CACHE_CHECK([for ld accepts -Bexport flag], tcl_cv_ld_Bexport, [
+		hold_ldflags=$LDFLAGS
+		LDFLAGS="$LDFLAGS -Wl,-Bexport"
+		AC_TRY_LINK(, [int i;], tcl_cv_ld_Bexport=yes, tcl_cv_ld_Bexport=no)
+	        LDFLAGS=$hold_ldflags])
+	    if test $tcl_cv_ld_Bexport = yes; then
+		LDFLAGS="$LDFLAGS -Wl,-Bexport"
+	    fi
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    ;;
+    esac
+
+    if test "$do64bit" = "yes" -a "$do64bit_ok" = "no" ; then
+	AC_MSG_WARN([64bit support being disabled -- don't know magic for this platform])
+    fi
+
+dnl # Add any CPPFLAGS set in the environment to our CFLAGS, but delay doing so
+dnl # until the end of configure, as configure's compile and link tests use
+dnl # both CPPFLAGS and CFLAGS (unlike our compile and link) but configure's
+dnl # preprocessing tests use only CPPFLAGS.
+    SC_CONFIG_COMMANDS_PRE([CFLAGS="${CFLAGS} ${CPPFLAGS}"; CPPFLAGS=""])
+
+    # Step 4: If pseudo-static linking is in use (see K. B. Kenny, "Dynamic
+    # Loading for Tcl -- What Became of It?".  Proc. 2nd Tcl/Tk Workshop,
+    # New Orleans, LA, Computerized Processes Unlimited, 1994), then we need
+    # to determine which of several header files defines the a.out file
+    # format (a.out.h, sys/exec.h, or sys/exec_aout.h).  At present, we
+    # support only a file format that is more or less version-7-compatible. 
+    # In particular,
+    #	- a.out files must begin with `struct exec'.
+    #	- the N_TXTOFF on the `struct exec' must compute the seek address
+    #	  of the text segment
+    #	- The `struct exec' must contain a_magic, a_text, a_data, a_bss
+    #	  and a_entry fields.
+    # The following compilation should succeed if and only if either sys/exec.h
+    # or a.out.h is usable for the purpose.
+    #
+    # Note that the modified COFF format used on MIPS Ultrix 4.x is usable; the
+    # `struct exec' includes a second header that contains information that
+    # duplicates the v7 fields that are needed.
+
+    if test "x$DL_OBJS" = "xtclLoadAout.o" ; then
+	AC_CACHE_CHECK([sys/exec.h], tcl_cv_sysexec_h, [
+	AC_TRY_COMPILE([#include <sys/exec.h>],[
+	    struct exec foo;
+	    unsigned long seek;
+	    int flag;
+#if defined(__mips) || defined(mips)
+	    seek = N_TXTOFF (foo.ex_f, foo.ex_o);
+#else
+	    seek = N_TXTOFF (foo);
+#endif
+	    flag = (foo.a_magic == OMAGIC);
+	    return foo.a_text + foo.a_data + foo.a_bss + foo.a_entry;
+    ], tcl_cv_sysexec_h=usable, tcl_cv_sysexec_h=unusable)])
+	if test $tcl_cv_sysexec_h = usable; then
+	    AC_DEFINE(USE_SYS_EXEC_H)
+	else
+	    AC_CACHE_CHECK([a.out.h], tcl_cv_aout_h, [
+	    AC_TRY_COMPILE([#include <a.out.h>],[
+		struct exec foo;
+		unsigned long seek;
+		int flag;
+#if defined(__mips) || defined(mips)
+		seek = N_TXTOFF (foo.ex_f, foo.ex_o);
+#else
+		seek = N_TXTOFF (foo);
+#endif
+		flag = (foo.a_magic == OMAGIC);
+		return foo.a_text + foo.a_data + foo.a_bss + foo.a_entry;
+	    ], tcl_cv_aout_h=usable, tcl_cv_aout_h=unusable)])
+	    if test $tcl_cv_aout_h = usable; then
+		AC_DEFINE(USE_A_OUT_H)
+	    else
+		AC_CACHE_CHECK([sys/exec_aout.h], tcl_cv_sysexecaout_h, [
+		AC_TRY_COMPILE([#include <sys/exec_aout.h>],[
+		    struct exec foo;
+		    unsigned long seek;
+		    int flag;
+#if defined(__mips) || defined(mips)
+		    seek = N_TXTOFF (foo.ex_f, foo.ex_o);
+#else
+		    seek = N_TXTOFF (foo);
+#endif
+		    flag = (foo.a_midmag == OMAGIC);
+		    return foo.a_text + foo.a_data + foo.a_bss + foo.a_entry;
+		], tcl_cv_sysexecaout_h=usable, tcl_cv_sysexecaout_h=unusable)])
+		if test $tcl_cv_sysexecaout_h = usable; then
+		    AC_DEFINE(USE_SYS_EXEC_AOUT_H)
+		else
+		    DL_OBJS=""
+		fi
+	    fi
+	fi
+    fi
+
+    # Step 5: disable dynamic loading if requested via a command-line switch.
+
+    AC_ARG_ENABLE(load, [  --disable-load          disallow dynamic loading and "load" command],
+	[tcl_ok=$enableval], [tcl_ok=yes])
+    if test "$tcl_ok" = "no"; then
+	DL_OBJS=""
+    fi
+
+    if test "x$DL_OBJS" != "x" ; then
+	BUILD_DLTEST="\$(DLTEST_TARGETS)"
+    else
+	echo "Can't figure out how to do dynamic loading or shared libraries"
+	echo "on this system."
+	SHLIB_CFLAGS=""
+	SHLIB_LD=""
+	SHLIB_SUFFIX=""
+	DL_OBJS="tclLoadNone.o"
+	DL_LIBS=""
+	LDFLAGS="$LDFLAGS_ORIG"
+	CC_SEARCH_FLAGS=""
+	LD_SEARCH_FLAGS=""
+	BUILD_DLTEST=""
+    fi
+
+    # If we're running gcc, then change the C flags for compiling shared
+    # libraries to the right flags for gcc, instead of those for the
+    # standard manufacturer compiler.
+
+    if test "$DL_OBJS" != "tclLoadNone.o" ; then
+	if test "$GCC" = "yes" ; then
+	    case $system in
+		AIX-*)
+		    ;;
+		BSD/OS*)
+		    ;;
+		IRIX*)
+		    ;;
+		NetBSD-*|FreeBSD-*|OpenBSD-*)
+		    ;;
+		Darwin-*)
+		    ;;
+		RISCos-*)
+		    ;;
+		SCO_SV-3.2*)
+		    ;;
+		ULTRIX-4.*)
+		    ;;
+		*)
+		    SHLIB_CFLAGS="-fPIC"
+		    ;;
+	    esac
+	fi
+    fi
+
+    if test "$SHARED_LIB_SUFFIX" = "" ; then
+	SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}'
+    fi
+    if test "$UNSHARED_LIB_SUFFIX" = "" ; then
+	UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
+    fi
+
+    if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
+        LIB_SUFFIX=${SHARED_LIB_SUFFIX}
+        MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
+        INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
+    else
+        LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
+
+        if test "$RANLIB" = "" ; then
+            MAKE_LIB='$(STLIB_LD) [$]@ ${OBJS}'
+            INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
+        else
+            MAKE_LIB='${STLIB_LD} [$]@ ${OBJS} ; ${RANLIB} [$]@'
+            INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(LIB_FILE))'
+        fi
+
+dnl        Not at all clear what this was doing in Tcl's configure.in
+dnl        or why it was needed was needed. In any event, this sort of
+dnl        things needs to be done in the big loop above.
+dnl        REMOVE THIS BLOCK LATER! (mdejong)
+dnl        case $system in
+dnl            BSD/OS*)
+dnl                ;;
+dnl            AIX-[[1-4]].*)
+dnl                ;;
+dnl            *)
+dnl                SHLIB_LD_LIBS=""
+dnl                ;;
+dnl        esac
+    fi
+
+
+    # Stub lib does not depend on shared/static configuration
+    if test "$RANLIB" = "" ; then
+        MAKE_STUB_LIB='${STLIB_LD} [$]@ ${STUB_LIB_OBJS}'
+        INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)'
+    else
+        MAKE_STUB_LIB='${STLIB_LD} [$]@ ${STUB_LIB_OBJS} ; ${RANLIB} [$]@'
+        INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(STUB_LIB_FILE))'
+    fi
+
+
+    AC_SUBST(DL_LIBS)
+
+    AC_SUBST(DL_OBJS)
+    AC_SUBST(PLAT_OBJS)
+    AC_SUBST(PLAT_SRCS)
+    AC_SUBST(CFLAGS)
+    AC_SUBST(CFLAGS_DEBUG)
+    AC_SUBST(CFLAGS_OPTIMIZE)
+    AC_SUBST(CFLAGS_WARNING)
+
+    AC_SUBST(LDFLAGS)
+    AC_SUBST(LDFLAGS_DEBUG)
+    AC_SUBST(LDFLAGS_OPTIMIZE)
+    AC_SUBST(CC_SEARCH_FLAGS)
+    AC_SUBST(LD_SEARCH_FLAGS)
+
+    AC_SUBST(STLIB_LD)
+    AC_SUBST(SHLIB_LD)
+    AC_SUBST(TCL_SHLIB_LD_EXTRAS)
+    AC_SUBST(TK_SHLIB_LD_EXTRAS)
+    AC_SUBST(SHLIB_LD_LIBS)
+    AC_SUBST(SHLIB_CFLAGS)
+    AC_SUBST(SHLIB_SUFFIX)
+
+    AC_SUBST(MAKE_LIB)
+    AC_SUBST(MAKE_STUB_LIB)
+    AC_SUBST(INSTALL_LIB)
+    AC_SUBST(INSTALL_STUB_LIB)
+    AC_SUBST(RANLIB)
+])
+
+#--------------------------------------------------------------------
+# SC_SERIAL_PORT
+#
+#	Determine which interface to use to talk to the serial port.
+#	Note that #include lines must begin in leftmost column for
+#	some compilers to recognize them as preprocessor directives,
+#	and some build environments have stdin not pointing at a
+#	pseudo-terminal (usually /dev/null instead.)
+#
+# Arguments:
+#	none
+#	
+# Results:
+#
+#	Defines only one of the following vars:
+#		HAVE_SYS_MODEM_H
+#		USE_TERMIOS
+#		USE_TERMIO
+#		USE_SGTTY
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_SERIAL_PORT], [
+    AC_CHECK_HEADERS(sys/modem.h)
+    AC_CACHE_CHECK([termios vs. termio vs. sgtty], tcl_cv_api_serial, [
+    AC_TRY_RUN([
+#include <termios.h>
+
+int main() {
+    struct termios t;
+    if (tcgetattr(0, &t) == 0) {
+	cfsetospeed(&t, 0);
+	t.c_cflag |= PARENB | PARODD | CSIZE | CSTOPB;
+	return 0;
+    }
+    return 1;
+}], tcl_cv_api_serial=termios, tcl_cv_api_serial=no, tcl_cv_api_serial=no)
+    if test $tcl_cv_api_serial = no ; then
+	AC_TRY_RUN([
+#include <termio.h>
+
+int main() {
+    struct termio t;
+    if (ioctl(0, TCGETA, &t) == 0) {
+	t.c_cflag |= CBAUD | PARENB | PARODD | CSIZE | CSTOPB;
+	return 0;
+    }
+    return 1;
+}], tcl_cv_api_serial=termio, tcl_cv_api_serial=no, tcl_cv_api_serial=no)
+    fi
+    if test $tcl_cv_api_serial = no ; then
+	AC_TRY_RUN([
+#include <sgtty.h>
+
+int main() {
+    struct sgttyb t;
+    if (ioctl(0, TIOCGETP, &t) == 0) {
+	t.sg_ospeed = 0;
+	t.sg_flags |= ODDP | EVENP | RAW;
+	return 0;
+    }
+    return 1;
+}], tcl_cv_api_serial=sgtty, tcl_cv_api_serial=no, tcl_cv_api_serial=no)
+    fi
+    if test $tcl_cv_api_serial = no ; then
+	AC_TRY_RUN([
+#include <termios.h>
+#include <errno.h>
+
+int main() {
+    struct termios t;
+    if (tcgetattr(0, &t) == 0
+	|| errno == ENOTTY || errno == ENXIO || errno == EINVAL) {
+	cfsetospeed(&t, 0);
+	t.c_cflag |= PARENB | PARODD | CSIZE | CSTOPB;
+	return 0;
+    }
+    return 1;
+}], tcl_cv_api_serial=termios, tcl_cv_api_serial=no, tcl_cv_api_serial=no)
+    fi
+    if test $tcl_cv_api_serial = no; then
+	AC_TRY_RUN([
+#include <termio.h>
+#include <errno.h>
+
+int main() {
+    struct termio t;
+    if (ioctl(0, TCGETA, &t) == 0
+	|| errno == ENOTTY || errno == ENXIO || errno == EINVAL) {
+	t.c_cflag |= CBAUD | PARENB | PARODD | CSIZE | CSTOPB;
+	return 0;
+    }
+    return 1;
+    }], tcl_cv_api_serial=termio, tcl_cv_api_serial=no, tcl_cv_api_serial=no)
+    fi
+    if test $tcl_cv_api_serial = no; then
+	AC_TRY_RUN([
+#include <sgtty.h>
+#include <errno.h>
+
+int main() {
+    struct sgttyb t;
+    if (ioctl(0, TIOCGETP, &t) == 0
+	|| errno == ENOTTY || errno == ENXIO || errno == EINVAL) {
+	t.sg_ospeed = 0;
+	t.sg_flags |= ODDP | EVENP | RAW;
+	return 0;
+    }
+    return 1;
+}], tcl_cv_api_serial=sgtty, tcl_cv_api_serial=none, tcl_cv_api_serial=none)
+    fi])
+    case $tcl_cv_api_serial in
+	termios) AC_DEFINE(USE_TERMIOS);;
+	termio)  AC_DEFINE(USE_TERMIO);;
+	sgtty)   AC_DEFINE(USE_SGTTY);;
+    esac
+])
+
+#--------------------------------------------------------------------
+# SC_MISSING_POSIX_HEADERS
+#
+#	Supply substitutes for missing POSIX header files.  Special
+#	notes:
+#	    - stdlib.h doesn't define strtol, strtoul, or
+#	      strtod insome versions of SunOS
+#	    - some versions of string.h don't declare procedures such
+#	      as strstr
+#
+# Arguments:
+#	none
+#	
+# Results:
+#
+#	Defines some of the following vars:
+#		NO_DIRENT_H
+#		NO_ERRNO_H
+#		NO_VALUES_H
+#		HAVE_LIMITS_H or NO_LIMITS_H
+#		NO_STDLIB_H
+#		NO_STRING_H
+#		NO_SYS_WAIT_H
+#		NO_DLFCN_H
+#		HAVE_UNISTD_H
+#		HAVE_SYS_PARAM_H
+#
+#		HAVE_STRING_H ?
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_MISSING_POSIX_HEADERS], [
+    AC_CACHE_CHECK([dirent.h], tcl_cv_dirent_h, [
+    AC_TRY_LINK([#include <sys/types.h>
+#include <dirent.h>], [
+#ifndef _POSIX_SOURCE
+#   ifdef __Lynx__
+	/*
+	 * Generate compilation error to make the test fail:  Lynx headers
+	 * are only valid if really in the POSIX environment.
+	 */
+
+	missing_procedure();
+#   endif
+#endif
+DIR *d;
+struct dirent *entryPtr;
+char *p;
+d = opendir("foobar");
+entryPtr = readdir(d);
+p = entryPtr->d_name;
+closedir(d);
+], tcl_cv_dirent_h=yes, tcl_cv_dirent_h=no)])
+
+    if test $tcl_cv_dirent_h = no; then
+	AC_DEFINE(NO_DIRENT_H)
+    fi
+
+    AC_CHECK_HEADER(errno.h, , [AC_DEFINE(NO_ERRNO_H)])
+    AC_CHECK_HEADER(float.h, , [AC_DEFINE(NO_FLOAT_H)])
+    AC_CHECK_HEADER(values.h, , [AC_DEFINE(NO_VALUES_H)])
+    AC_CHECK_HEADER(limits.h,
+	[AC_DEFINE(HAVE_LIMITS_H)], [AC_DEFINE(NO_LIMITS_H)])
+    AC_CHECK_HEADER(stdlib.h, tcl_ok=1, tcl_ok=0)
+    AC_EGREP_HEADER(strtol, stdlib.h, , tcl_ok=0)
+    AC_EGREP_HEADER(strtoul, stdlib.h, , tcl_ok=0)
+    AC_EGREP_HEADER(strtod, stdlib.h, , tcl_ok=0)
+    if test $tcl_ok = 0; then
+	AC_DEFINE(NO_STDLIB_H)
+    fi
+    AC_CHECK_HEADER(string.h, tcl_ok=1, tcl_ok=0)
+    AC_EGREP_HEADER(strstr, string.h, , tcl_ok=0)
+    AC_EGREP_HEADER(strerror, string.h, , tcl_ok=0)
+
+    # See also memmove check below for a place where NO_STRING_H can be
+    # set and why.
+
+    if test $tcl_ok = 0; then
+	AC_DEFINE(NO_STRING_H)
+    fi
+
+    AC_CHECK_HEADER(sys/wait.h, , [AC_DEFINE(NO_SYS_WAIT_H)])
+    AC_CHECK_HEADER(dlfcn.h, , [AC_DEFINE(NO_DLFCN_H)])
+
+    # OS/390 lacks sys/param.h (and doesn't need it, by chance).
+    AC_HAVE_HEADERS(unistd.h sys/param.h)
+])
+
+#--------------------------------------------------------------------
+# SC_PATH_X
+#
+#	Locate the X11 header files and the X11 library archive.  Try
+#	the ac_path_x macro first, but if it doesn't find the X stuff
+#	(e.g. because there's no xmkmf program) then check through
+#	a list of possible directories.  Under some conditions the
+#	autoconf macro will return an include directory that contains
+#	no include files, so double-check its result just to be safe.
+#
+# Arguments:
+#	none
+#	
+# Results:
+#
+#	Sets the the following vars:
+#		XINCLUDES
+#		XLIBSW
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_PATH_X], [
+    AC_PATH_X
+    not_really_there=""
+    if test "$no_x" = ""; then
+	if test "$x_includes" = ""; then
+	    AC_TRY_CPP([#include <X11/XIntrinsic.h>], , not_really_there="yes")
+	else
+	    if test ! -r $x_includes/X11/Intrinsic.h; then
+		not_really_there="yes"
+	    fi
+	fi
+    fi
+    if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
+	AC_MSG_CHECKING([for X11 header files])
+	found_xincludes="no"
+	AC_TRY_CPP([#include <X11/Intrinsic.h>], found_xincludes="yes", found_xincludes="no")
+	if test "$found_xincludes" = "no"; then
+	    dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/X11R6/include /usr/X11R5/include /usr/include/X11R5 /usr/include/X11R4 /usr/openwin/include /usr/X11/include /usr/sww/include"
+	    for i in $dirs ; do
+		if test -r $i/X11/Intrinsic.h; then
+		    AC_MSG_RESULT([$i])
+		    XINCLUDES=" -I$i"
+		    found_xincludes="yes"
+		    break
+		fi
+	    done
+	fi
+    else
+	if test "$x_includes" != ""; then
+	    XINCLUDES="-I$x_includes"
+	    found_xincludes="yes"
+	fi
+    fi
+    if test found_xincludes = "no"; then
+	AC_MSG_RESULT([couldn't find any!])
+    fi
+
+    if test "$no_x" = yes; then
+	AC_MSG_CHECKING([for X11 libraries])
+	XLIBSW=nope
+	dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
+	for i in $dirs ; do
+	    if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
+		AC_MSG_RESULT([$i])
+		XLIBSW="-L$i -lX11"
+		x_libraries="$i"
+		break
+	    fi
+	done
+    else
+	if test "$x_libraries" = ""; then
+	    XLIBSW=-lX11
+	else
+	    XLIBSW="-L$x_libraries -lX11"
+	fi
+    fi
+    if test "$XLIBSW" = nope ; then
+	AC_CHECK_LIB(Xwindow, XCreateWindow, XLIBSW=-lXwindow)
+    fi
+    if test "$XLIBSW" = nope ; then
+	AC_MSG_RESULT([could not find any!  Using -lX11.])
+	XLIBSW=-lX11
+    fi
+])
+
+#--------------------------------------------------------------------
+# SC_BLOCKING_STYLE
+#
+#	The statements below check for systems where POSIX-style
+#	non-blocking I/O (O_NONBLOCK) doesn't work or is unimplemented. 
+#	On these systems (mostly older ones), use the old BSD-style
+#	FIONBIO approach instead.
+#
+# Arguments:
+#	none
+#	
+# Results:
+#
+#	Defines some of the following vars:
+#		HAVE_SYS_IOCTL_H
+#		HAVE_SYS_FILIO_H
+#		USE_FIONBIO
+#		O_NONBLOCK
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_BLOCKING_STYLE], [
+    AC_CHECK_HEADERS(sys/ioctl.h)
+    AC_CHECK_HEADERS(sys/filio.h)
+    SC_CONFIG_SYSTEM
+    AC_MSG_CHECKING([FIONBIO vs. O_NONBLOCK for nonblocking I/O])
+    case $system in
+	# There used to be code here to use FIONBIO under AIX.  However, it
+	# was reported that FIONBIO doesn't work under AIX 3.2.5.  Since
+	# using O_NONBLOCK seems fine under AIX 4.*, I removed the FIONBIO
+	# code (JO, 5/31/97).
+
+	OSF*)
+	    AC_DEFINE(USE_FIONBIO)
+	    AC_MSG_RESULT([FIONBIO])
+	    ;;
+	SunOS-4*)
+	    AC_DEFINE(USE_FIONBIO)
+	    AC_MSG_RESULT([FIONBIO])
+	    ;;
+	ULTRIX-4.*)
+	    AC_DEFINE(USE_FIONBIO)
+	    AC_MSG_RESULT([FIONBIO])
+	    ;;
+	*)
+	    AC_MSG_RESULT([O_NONBLOCK])
+	    ;;
+    esac
+])
+
+#--------------------------------------------------------------------
+# SC_TIME_HANLDER
+#
+#	Checks how the system deals with time.h, what time structures
+#	are used on the system, and what fields the structures have.
+#
+# Arguments:
+#	none
+#	
+# Results:
+#
+#	Defines some of the following vars:
+#		USE_DELTA_FOR_TZ
+#		HAVE_TM_GMTOFF
+#		HAVE_TM_TZADJ
+#		HAVE_TIMEZONE_VAR
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_TIME_HANDLER], [
+    AC_CHECK_HEADERS(sys/time.h)
+    AC_HEADER_TIME
+    AC_STRUCT_TIMEZONE
+
+    AC_CHECK_FUNCS(gmtime_r localtime_r)
+
+    AC_CACHE_CHECK([tm_tzadj in struct tm], tcl_cv_member_tm_tzadj, [
+	AC_TRY_COMPILE([#include <time.h>], [struct tm tm; tm.tm_tzadj;],
+	    tcl_cv_member_tm_tzadj=yes, tcl_cv_member_tm_tzadj=no)])
+    if test $tcl_cv_member_tm_tzadj = yes ; then
+	AC_DEFINE(HAVE_TM_TZADJ)
+    fi
+
+    AC_CACHE_CHECK([tm_gmtoff in struct tm], tcl_cv_member_tm_gmtoff, [
+	AC_TRY_COMPILE([#include <time.h>], [struct tm tm; tm.tm_gmtoff;],
+	    tcl_cv_member_tm_gmtoff=yes, tcl_cv_member_tm_gmtoff=no)])
+    if test $tcl_cv_member_tm_gmtoff = yes ; then
+	AC_DEFINE(HAVE_TM_GMTOFF)
+    fi
+
+    #
+    # Its important to include time.h in this check, as some systems
+    # (like convex) have timezone functions, etc.
+    #
+    AC_CACHE_CHECK([long timezone variable], tcl_cv_timezone_long, [
+	AC_TRY_COMPILE([#include <time.h>],
+	    [extern long timezone;
+	    timezone += 1;
+	    exit (0);],
+	    tcl_cv_timezone_long=yes, tcl_cv_timezone_long=no)])
+    if test $tcl_cv_timezone_long = yes ; then
+	AC_DEFINE(HAVE_TIMEZONE_VAR)
+    else
+	#
+	# On some systems (eg IRIX 6.2), timezone is a time_t and not a long.
+	#
+	AC_CACHE_CHECK([time_t timezone variable], tcl_cv_timezone_time, [
+	    AC_TRY_COMPILE([#include <time.h>],
+		[extern time_t timezone;
+		timezone += 1;
+		exit (0);],
+		tcl_cv_timezone_time=yes, tcl_cv_timezone_time=no)])
+	if test $tcl_cv_timezone_time = yes ; then
+	    AC_DEFINE(HAVE_TIMEZONE_VAR)
+	fi
+    fi
+])
+
+#--------------------------------------------------------------------
+# SC_BUGGY_STRTOD
+#
+#	Under Solaris 2.4, strtod returns the wrong value for the
+#	terminating character under some conditions.  Check for this
+#	and if the problem exists use a substitute procedure
+#	"fixstrtod" (provided by Tcl) that corrects the error.
+#	Also, on Compaq's Tru64 Unix 5.0,
+#	strtod(" ") returns 0.0 instead of a failure to convert.
+#
+# Arguments:
+#	none
+#	
+# Results:
+#
+#	Might defines some of the following vars:
+#		strtod (=fixstrtod)
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_BUGGY_STRTOD], [
+    AC_CHECK_FUNC(strtod, tcl_strtod=1, tcl_strtod=0)
+    if test "$tcl_strtod" = 1; then
+	AC_CACHE_CHECK([for Solaris2.4/Tru64 strtod bugs], tcl_cv_strtod_buggy,[
+	    AC_TRY_RUN([
+		extern double strtod();
+		int main() {
+		    char *infString="Inf", *nanString="NaN", *spaceString=" ";
+		    char *term;
+		    double value;
+		    value = strtod(infString, &term);
+		    if ((term != infString) && (term[-1] == 0)) {
+			exit(1);
+		    }
+		    value = strtod(nanString, &term);
+		    if ((term != nanString) && (term[-1] == 0)) {
+			exit(1);
+		    }
+		    value = strtod(spaceString, &term);
+		    if (term == (spaceString+1)) {
+			exit(1);
+		    }
+		    exit(0);
+		}], tcl_cv_strtod_buggy=ok, tcl_cv_strtod_buggy=buggy,
+		    tcl_cv_strtod_buggy=buggy)])
+	if test "$tcl_cv_strtod_buggy" = buggy; then
+	    LIBOBJS="$LIBOBJS fixstrtod.o"
+	    AC_DEFINE(strtod, fixstrtod)
+	fi
+    fi
+])
+
+#--------------------------------------------------------------------
+# SC_TCL_LINK_LIBS
+#
+#	Search for the libraries needed to link the Tcl shell.
+#	Things like the math library (-lm) and socket stuff (-lsocket vs.
+#	-lnsl) are dealt with here.
+#
+# Arguments:
+#	Requires the following vars to be set in the Makefile:
+#		DL_LIBS
+#		LIBS
+#		MATH_LIBS
+#	
+# Results:
+#
+#	Subst's the following var:
+#		TCL_LIBS
+#		MATH_LIBS
+#
+#	Might append to the following vars:
+#		LIBS
+#
+#	Might define the following vars:
+#		HAVE_NET_ERRNO_H
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_TCL_LINK_LIBS], [
+    #--------------------------------------------------------------------
+    # On a few very rare systems, all of the libm.a stuff is
+    # already in libc.a.  Set compiler flags accordingly.
+    # Also, Linux requires the "ieee" library for math to work
+    # right (and it must appear before "-lm").
+    #--------------------------------------------------------------------
+
+    AC_CHECK_FUNC(sin, MATH_LIBS="", MATH_LIBS="-lm")
+    AC_CHECK_LIB(ieee, main, [MATH_LIBS="-lieee $MATH_LIBS"])
+
+    #--------------------------------------------------------------------
+    # Interactive UNIX requires -linet instead of -lsocket, plus it
+    # needs net/errno.h to define the socket-related error codes.
+    #--------------------------------------------------------------------
+
+    AC_CHECK_LIB(inet, main, [LIBS="$LIBS -linet"])
+    AC_CHECK_HEADER(net/errno.h, [AC_DEFINE(HAVE_NET_ERRNO_H)])
+
+    #--------------------------------------------------------------------
+    #	Check for the existence of the -lsocket and -lnsl libraries.
+    #	The order here is important, so that they end up in the right
+    #	order in the command line generated by make.  Here are some
+    #	special considerations:
+    #	1. Use "connect" and "accept" to check for -lsocket, and
+    #	   "gethostbyname" to check for -lnsl.
+    #	2. Use each function name only once:  can't redo a check because
+    #	   autoconf caches the results of the last check and won't redo it.
+    #	3. Use -lnsl and -lsocket only if they supply procedures that
+    #	   aren't already present in the normal libraries.  This is because
+    #	   IRIX 5.2 has libraries, but they aren't needed and they're
+    #	   bogus:  they goof up name resolution if used.
+    #	4. On some SVR4 systems, can't use -lsocket without -lnsl too.
+    #	   To get around this problem, check for both libraries together
+    #	   if -lsocket doesn't work by itself.
+    #--------------------------------------------------------------------
+
+    tcl_checkBoth=0
+    AC_CHECK_FUNC(connect, tcl_checkSocket=0, tcl_checkSocket=1)
+    if test "$tcl_checkSocket" = 1; then
+	AC_CHECK_FUNC(setsockopt, , [AC_CHECK_LIB(socket, setsockopt,
+	    LIBS="$LIBS -lsocket", tcl_checkBoth=1)])
+    fi
+    if test "$tcl_checkBoth" = 1; then
+	tk_oldLibs=$LIBS
+	LIBS="$LIBS -lsocket -lnsl"
+	AC_CHECK_FUNC(accept, tcl_checkNsl=0, [LIBS=$tk_oldLibs])
+    fi
+    AC_CHECK_FUNC(gethostbyname, , [AC_CHECK_LIB(nsl, gethostbyname,
+	    [LIBS="$LIBS -lnsl"])])
+    
+    # Don't perform the eval of the libraries here because DL_LIBS
+    # won't be set until we call SC_CONFIG_CFLAGS
+
+    TCL_LIBS='${DL_LIBS} ${LIBS} ${MATH_LIBS}'
+    AC_SUBST(TCL_LIBS)
+    AC_SUBST(MATH_LIBS)
+])
+
+#--------------------------------------------------------------------
+# SC_TCL_EARLY_FLAGS
+#
+#	Check for what flags are needed to be passed so the correct OS
+#	features are available.
+#
+# Arguments:
+#	None
+#	
+# Results:
+#
+#	Might define the following vars:
+#		_ISOC99_SOURCE
+#		_LARGEFILE64_SOURCE
+#		_LARGEFILE_SOURCE64
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_TCL_EARLY_FLAG],[
+    AC_CACHE_VAL([tcl_cv_flag_]translit($1,[A-Z],[a-z]),
+	AC_TRY_COMPILE([$2], $3, [tcl_cv_flag_]translit($1,[A-Z],[a-z])=no,
+	    AC_TRY_COMPILE([[#define ]$1[ 1
+]$2], $3,
+		[tcl_cv_flag_]translit($1,[A-Z],[a-z])=yes,
+		[tcl_cv_flag_]translit($1,[A-Z],[a-z])=no)))
+    if test ["x${tcl_cv_flag_]translit($1,[A-Z],[a-z])[}" = "xyes"] ; then
+	AC_DEFINE($1)
+	tcl_flags="$tcl_flags $1"
+    fi
+])
+
+AC_DEFUN([SC_TCL_EARLY_FLAGS],[
+    AC_MSG_CHECKING([for required early compiler flags])
+    tcl_flags=""
+    SC_TCL_EARLY_FLAG(_ISOC99_SOURCE,[#include <stdlib.h>],
+	[char *p = (char *)strtoll; char *q = (char *)strtoull;])
+    SC_TCL_EARLY_FLAG(_LARGEFILE64_SOURCE,[#include <sys/stat.h>],
+	[struct stat64 buf; int i = stat64("/", &buf);])
+    SC_TCL_EARLY_FLAG(_LARGEFILE_SOURCE64,[#include <sys/stat.h>],
+	[char *p = (char *)open64;])
+    if test "x${tcl_flags}" = "x" ; then
+	AC_MSG_RESULT([none])
+    else
+	AC_MSG_RESULT([${tcl_flags}])
+    fi
+])
+
+#--------------------------------------------------------------------
+# SC_TCL_64BIT_FLAGS
+#
+#	Check for what is defined in the way of 64-bit features.
+#
+# Arguments:
+#	None
+#	
+# Results:
+#
+#	Might define the following vars:
+#		TCL_WIDE_INT_IS_LONG
+#		TCL_WIDE_INT_TYPE
+#		HAVE_STRUCT_DIRENT64
+#		HAVE_STRUCT_STAT64
+#		HAVE_TYPE_OFF64_T
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_TCL_64BIT_FLAGS], [
+    AC_MSG_CHECKING([for 64-bit integer type])
+    AC_CACHE_VAL(tcl_cv_type_64bit,[
+	tcl_cv_type_64bit=none
+	# See if the compiler knows natively about __int64
+	AC_TRY_COMPILE(,[__int64 value = (__int64) 0;],
+	    tcl_type_64bit=__int64, tcl_type_64bit="long long")
+	# See if we should use long anyway  Note that we substitute in the
+	# type that is our current guess for a 64-bit type inside this check
+	# program, so it should be modified only carefully...
+        AC_TRY_COMPILE(,[switch (0) { 
+            case 1: case (sizeof(]${tcl_type_64bit}[)==sizeof(long)): ; 
+        }],tcl_cv_type_64bit=${tcl_type_64bit})])
+    if test "${tcl_cv_type_64bit}" = none ; then
+	AC_DEFINE(TCL_WIDE_INT_IS_LONG)
+	AC_MSG_RESULT([using long])
+    else
+	AC_DEFINE_UNQUOTED(TCL_WIDE_INT_TYPE,${tcl_cv_type_64bit})
+	AC_MSG_RESULT([${tcl_cv_type_64bit}])
+
+	# Now check for auxiliary declarations
+	AC_CACHE_CHECK([for struct dirent64], tcl_cv_struct_dirent64,[
+	    AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/dirent.h>],[struct dirent64 p;],
+		tcl_cv_struct_dirent64=yes,tcl_cv_struct_dirent64=no)])
+	if test "x${tcl_cv_struct_dirent64}" = "xyes" ; then
+	    AC_DEFINE(HAVE_STRUCT_DIRENT64)
+	fi
+
+	AC_CACHE_CHECK([for struct stat64], tcl_cv_struct_stat64,[
+	    AC_TRY_COMPILE([#include <sys/stat.h>],[struct stat64 p;
+],
+		tcl_cv_struct_stat64=yes,tcl_cv_struct_stat64=no)])
+	if test "x${tcl_cv_struct_stat64}" = "xyes" ; then
+	    AC_DEFINE(HAVE_STRUCT_STAT64)
+	fi
+
+	AC_CHECK_FUNCS(open64 lseek64)
+	AC_MSG_CHECKING([for off64_t])
+	AC_CACHE_VAL(tcl_cv_type_off64_t,[
+	    AC_TRY_COMPILE([#include <sys/types.h>],[off64_t offset;
+],
+		tcl_cv_type_off64_t=yes,tcl_cv_type_off64_t=no)])
+	dnl Define HAVE_TYPE_OFF64_T only when the off64_t type and the
+	dnl functions lseek64 and open64 are defined.
+	if test "x${tcl_cv_type_off64_t}" = "xyes" && \
+	        test "x${ac_cv_func_lseek64}" = "xyes" && \
+	        test "x${ac_cv_func_open64}" = "xyes" ; then
+	    AC_DEFINE(HAVE_TYPE_OFF64_T)
+	    AC_MSG_RESULT([yes])
+	else
+	    AC_MSG_RESULT([no])
+	fi
+    fi
+])
+
+#--------------------------------------------------------------------
+# SC_TCL_GETHOSTBYADDR_R
+#
+#	Check if we have MT-safe variant of gethostbyaddr().
+#
+# Arguments:
+#	None
+#	
+# Results:
+#
+#	Might define the following vars:
+#		HAVE_GETHOSTBYADDR_R
+#		HAVE_GETHOSTBYADDR_R_7
+#		HAVE_GETHOSTBYADDR_R_8
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_TCL_GETHOSTBYADDR_R], [AC_CHECK_FUNC(gethostbyaddr_r, [
+    AC_CACHE_CHECK([for gethostbyaddr_r with 7 args], tcl_cv_api_gethostbyaddr_r_7, [
+    AC_TRY_COMPILE([
+	#include <netdb.h>
+    ], [
+	char *addr;
+	int length;
+	int type;
+	struct hostent *result;
+	char buffer[2048];
+	int buflen = 2048;
+	int h_errnop;
+
+	(void) gethostbyaddr_r(addr, length, type, result, buffer, buflen,
+			       &h_errnop);
+    ], tcl_cv_api_gethostbyaddr_r_7=yes, tcl_cv_api_gethostbyaddr_r_7=no)])
+    tcl_ok=$tcl_cv_api_gethostbyaddr_r_7
+    if test "$tcl_ok" = yes; then
+	AC_DEFINE(HAVE_GETHOSTBYADDR_R_7)
+    else
+	AC_CACHE_CHECK([for gethostbyaddr_r with 8 args], tcl_cv_api_gethostbyaddr_r_8, [
+	AC_TRY_COMPILE([
+	    #include <netdb.h>
+	], [
+	    char *addr;
+	    int length;
+	    int type;
+	    struct hostent *result, *resultp;
+	    char buffer[2048];
+	    int buflen = 2048;
+	    int h_errnop;
+
+	    (void) gethostbyaddr_r(addr, length, type, result, buffer, buflen,
+				   &resultp, &h_errnop);
+	], tcl_cv_api_gethostbyaddr_r_8=yes, tcl_cv_api_gethostbyaddr_r_8=no)])
+	tcl_ok=$tcl_cv_api_gethostbyaddr_r_8
+	if test "$tcl_ok" = yes; then
+	    AC_DEFINE(HAVE_GETHOSTBYADDR_R_8)
+	fi
+    fi
+    if test "$tcl_ok" = yes; then
+	AC_DEFINE(HAVE_GETHOSTBYADDR_R)
+    fi
+])])
+
+#--------------------------------------------------------------------
+# SC_TCL_GETHOSTBYNAME_R
+#
+#	Check to see what variant of gethostbyname_r() we have.
+#	Based on David Arnold's example from the comp.programming.threads
+#	FAQ Q213
+#
+# Arguments:
+#	None
+#	
+# Results:
+#
+#	Might define the following vars:
+#		HAVE_GETHOSTBYADDR_R
+#		HAVE_GETHOSTBYADDR_R_3
+#		HAVE_GETHOSTBYADDR_R_5
+#		HAVE_GETHOSTBYADDR_R_6
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_TCL_GETHOSTBYNAME_R], [AC_CHECK_FUNC(gethostbyname_r, [
+    AC_CACHE_CHECK([for gethostbyname_r with 6 args], tcl_cv_api_gethostbyname_r_6, [
+    AC_TRY_COMPILE([
+	#include <netdb.h>
+    ], [
+	char *name;
+	struct hostent *he, *res;
+	char buffer[2048];
+	int buflen = 2048;
+	int h_errnop;
+
+	(void) gethostbyname_r(name, he, buffer, buflen, &res, &h_errnop);
+    ], tcl_cv_api_gethostbyname_r_6=yes, tcl_cv_api_gethostbyname_r_6=no)])
+    tcl_ok=$tcl_cv_api_gethostbyname_r_6
+    if test "$tcl_ok" = yes; then
+	AC_DEFINE(HAVE_GETHOSTBYNAME_R_6)
+    else
+	AC_CACHE_CHECK([for gethostbyname_r with 5 args], tcl_cv_api_gethostbyname_r_5, [
+	AC_TRY_COMPILE([
+	    #include <netdb.h>
+	], [
+	    char *name;
+	    struct hostent *he;
+	    char buffer[2048];
+	    int buflen = 2048;
+	    int h_errnop;
+
+	    (void) gethostbyname_r(name, he, buffer, buflen, &h_errnop);
+	], tcl_cv_api_gethostbyname_r_5=yes, tcl_cv_api_gethostbyname_r_5=no)])
+	tcl_ok=$tcl_cv_api_gethostbyname_r_5
+	if test "$tcl_ok" = yes; then
+	    AC_DEFINE(HAVE_GETHOSTBYNAME_R_5)
+	else
+	    AC_CACHE_CHECK([for gethostbyname_r with 3 args], tcl_cv_api_gethostbyname_r_3, [
+	    AC_TRY_COMPILE([
+		#include <netdb.h>
+	    ], [
+		char *name;
+		struct hostent *he;
+		struct hostent_data data;
+
+		(void) gethostbyname_r(name, he, &data);
+	    ], tcl_cv_api_gethostbyname_r_3=yes, tcl_cv_api_gethostbyname_r_3=no)])
+	    tcl_ok=$tcl_cv_api_gethostbyname_r_3
+	    if test "$tcl_ok" = yes; then
+		AC_DEFINE(HAVE_GETHOSTBYNAME_R_3)
+	    fi
+	fi
+    fi
+    if test "$tcl_ok" = yes; then
+	AC_DEFINE(HAVE_GETHOSTBYNAME_R)
+    fi
+])])
+
+#--------------------------------------------------------------------
+# SC_TCL_GETPWUID_R
+#
+#	Check if we have MT-safe variant of getpwuid() and if yes,
+#	which one exactly.
+#
+# Arguments:
+#	None
+#	
+# Results:
+#
+#	Might define the following vars:
+#		HAVE_GETPWUID_R
+#		HAVE_GETPWUID_R_4
+#		HAVE_GETPWUID_R_5
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_TCL_GETPWUID_R], [AC_CHECK_FUNC(getpwuid_r, [
+    AC_CACHE_CHECK([for getpwuid_r with 5 args], tcl_cv_api_getpwuid_r_5, [
+    AC_TRY_COMPILE([
+	#include <sys/types.h>
+	#include <pwd.h>
+    ], [
+	uid_t uid;
+	struct passwd pw, *pwp;
+	char buf[512];
+	int buflen = 512;
+
+	(void) getpwuid_r(uid, &pw, buf, buflen, &pwp);
+    ], tcl_cv_api_getpwuid_r_5=yes, tcl_cv_api_getpwuid_r_5=no)])
+    tcl_ok=$tcl_cv_api_getpwuid_r_5
+    if test "$tcl_ok" = yes; then
+	AC_DEFINE(HAVE_GETPWUID_R_5)
+    else
+	AC_CACHE_CHECK([for getpwuid_r with 4 args], tcl_cv_api_getpwuid_r_4, [
+	AC_TRY_COMPILE([
+	    #include <sys/types.h>
+	    #include <pwd.h>
+	], [
+	    uid_t uid;
+	    struct passwd pw;
+	    char buf[512];
+	    int buflen = 512;
+
+	    (void)getpwnam_r(uid, &pw, buf, buflen);
+	], tcl_cv_api_getpwuid_r_4=yes, tcl_cv_api_getpwuid_r_4=no)])
+	tcl_ok=$tcl_cv_api_getpwuid_r_4
+	if test "$tcl_ok" = yes; then
+	    AC_DEFINE(HAVE_GETPWUID_R_4)
+	fi
+    fi
+    if test "$tcl_ok" = yes; then
+	AC_DEFINE(HAVE_GETPWUID_R)
+    fi
+])])
+
+#--------------------------------------------------------------------
+# SC_TCL_GETPWNAM_R
+#
+#	Check if we have MT-safe variant of getpwnam() and if yes,
+#	which one exactly.
+#
+# Arguments:
+#	None
+#	
+# Results:
+#
+#	Might define the following vars:
+#		HAVE_GETPWNAM_R
+#		HAVE_GETPWNAM_R_4
+#		HAVE_GETPWNAM_R_5
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_TCL_GETPWNAM_R], [AC_CHECK_FUNC(getpwnam_r, [
+    AC_CACHE_CHECK([for getpwnam_r with 5 args], tcl_cv_api_getpwnam_r_5, [
+    AC_TRY_COMPILE([
+	#include <sys/types.h>
+	#include <pwd.h>
+    ], [
+	char *name;
+	struct passwd pw, *pwp;
+	char buf[512];
+	int buflen = 512;
+
+	(void) getpwnam_r(name, &pw, buf, buflen, &pwp);
+    ], tcl_cv_api_getpwnam_r_5=yes, tcl_cv_api_getpwnam_r_5=no)])
+    tcl_ok=$tcl_cv_api_getpwnam_r_5
+    if test "$tcl_ok" = yes; then
+	AC_DEFINE(HAVE_GETPWNAM_R_5)
+    else
+	AC_CACHE_CHECK([for getpwnam_r with 4 args], tcl_cv_api_getpwnam_r_4, [
+	AC_TRY_COMPILE([
+	    #include <sys/types.h>
+	    #include <pwd.h>
+	], [
+	    char *name;
+	    struct passwd pw;
+	    char buf[512];
+	    int buflen = 512;
+
+	    (void)getpwnam_r(name, &pw, buf, buflen);
+	], tcl_cv_api_getpwnam_r_4=yes, tcl_cv_api_getpwnam_r_4=no)])
+	tcl_ok=$tcl_cv_api_getpwnam_r_4
+	if test "$tcl_ok" = yes; then
+	    AC_DEFINE(HAVE_GETPWNAM_R_4)
+	fi
+    fi
+    if test "$tcl_ok" = yes; then
+	AC_DEFINE(HAVE_GETPWNAM_R)
+    fi
+])])
+
+#--------------------------------------------------------------------
+# SC_TCL_GETGRGID_R
+#
+#	Check if we have MT-safe variant of getgrgid() and if yes,
+#	which one exactly.
+#
+# Arguments:
+#	None
+#	
+# Results:
+#
+#	Might define the following vars:
+#		HAVE_GETGRGID_R
+#		HAVE_GETGRGID_R_4
+#		HAVE_GETGRGID_R_5
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_TCL_GETGRGID_R], [AC_CHECK_FUNC(getgrgid_r, [
+    AC_CACHE_CHECK([for getgrgid_r with 5 args], tcl_cv_api_getgrgid_r_5, [
+    AC_TRY_COMPILE([
+	#include <sys/types.h>
+	#include <grp.h>
+    ], [
+	gid_t gid;
+	struct group gr, *grp;
+	char buf[512];
+	int buflen = 512;
+
+	(void) getgrgid_r(gid, &gr, buf, buflen, &grp);
+    ], tcl_cv_api_getgrgid_r_5=yes, tcl_cv_api_getgrgid_r_5=no)])
+    tcl_ok=$tcl_cv_api_getgrgid_r_5
+    if test "$tcl_ok" = yes; then
+	AC_DEFINE(HAVE_GETGRGID_R_5)
+    else
+	AC_CACHE_CHECK([for getgrgid_r with 4 args], tcl_cv_api_getgrgid_r_4, [
+	AC_TRY_COMPILE([
+	    #include <sys/types.h>
+	    #include <grp.h>
+	], [
+	    gid_t gid;
+	    struct group gr;
+	    char buf[512];
+	    int buflen = 512;
+
+	    (void)getgrgid_r(gid, &gr, buf, buflen);
+	], tcl_cv_api_getgrgid_r_4=yes, tcl_cv_api_getgrgid_r_4=no)])
+	tcl_ok=$tcl_cv_api_getgrgid_r_4
+	if test "$tcl_ok" = yes; then
+	    AC_DEFINE(HAVE_GETGRGID_R_4)
+	fi
+    fi
+    if test "$tcl_ok" = yes; then
+	AC_DEFINE(HAVE_GETGRGID_R)
+    fi
+])])
+
+#--------------------------------------------------------------------
+# SC_TCL_GETGRNAM_R
+#
+#	Check if we have MT-safe variant of getgrnam() and if yes,
+#	which one exactly.
+#
+# Arguments:
+#	None
+#	
+# Results:
+#
+#	Might define the following vars:
+#		HAVE_GETGRNAM_R
+#		HAVE_GETGRNAM_R_4
+#		HAVE_GETGRNAM_R_5
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_TCL_GETGRNAM_R], [AC_CHECK_FUNC(getgrnam_r, [
+    AC_CACHE_CHECK([for getgrnam_r with 5 args], tcl_cv_api_getgrnam_r_5, [
+    AC_TRY_COMPILE([
+	#include <sys/types.h>
+	#include <grp.h>
+    ], [
+	char *name;
+	struct group gr, *grp;
+	char buf[512];
+	int buflen = 512;
+
+	(void) getgrnam_r(name, &gr, buf, buflen, &grp);
+    ], tcl_cv_api_getgrnam_r_5=yes, tcl_cv_api_getgrnam_r_5=no)])
+    tcl_ok=$tcl_cv_api_getgrnam_r_5
+    if test "$tcl_ok" = yes; then
+	AC_DEFINE(HAVE_GETGRNAM_R_5)
+    else
+	AC_CACHE_CHECK([for getgrnam_r with 4 args], tcl_cv_api_getgrnam_r_4, [
+	AC_TRY_COMPILE([
+	    #include <sys/types.h>
+	    #include <grp.h>
+	], [
+	    char *name;
+	    struct group gr;
+	    char buf[512];
+	    int buflen = 512;
+
+	    (void)getgrnam_r(name, &gr, buf, buflen);
+	], tcl_cv_api_getgrnam_r_4=yes, tcl_cv_api_getgrnam_r_4=no)])
+	tcl_ok=$tcl_cv_api_getgrnam_r_4
+	if test "$tcl_ok" = yes; then
+	    AC_DEFINE(HAVE_GETGRNAM_R_4)
+	fi
+    fi
+    if test "$tcl_ok" = yes; then
+	AC_DEFINE(HAVE_GETGRNAM_R)
+    fi
+])])
+
+#--------------------------------------------------------------------
+# SC_CONFIG_COMMANDS_PRE(CMDS)
+#
+#	Replacement for autoconf 2.5x AC_COMMANDS_PRE:
+#		Commands to run right before config.status is
+#		created. Accumulates.
+#
+#	Requires presence of SC_OUTPUT_COMMANDS_PRE at the end
+#	of configure.in (right before AC_OUTPUT).
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_CONFIG_COMMANDS_PRE], [
+    define([SC_OUTPUT_COMMANDS_PRE], defn([SC_OUTPUT_COMMANDS_PRE])[$1
+])])
+AC_DEFUN([SC_OUTPUT_COMMANDS_PRE])
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/tls.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/tls.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/tls.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/tls.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,129 @@
+dnl Check whether the target supports TLS.
+AC_DEFUN([GCC_CHECK_TLS], [
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  GCC_ENABLE(tls, yes, [], [Use thread-local storage])
+  AC_CACHE_CHECK([whether the target supports thread-local storage],
+		 gcc_cv_have_tls, [
+    AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }],
+      [dnl If the test case passed with dynamic linking, try again with
+       dnl static linking, but only if static linking is supported (not
+       dnl on Solaris 10).  This fails with some older Red Hat releases.
+      chktls_save_LDFLAGS="$LDFLAGS"
+      LDFLAGS="-static $LDFLAGS"
+      AC_LINK_IFELSE([int main() { return 0; }],
+	[AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }],
+		       [gcc_cv_have_tls=yes], [gcc_cv_have_tls=no],[])],
+	[gcc_cv_have_tls=yes])
+      LDFLAGS="$chktls_save_LDFLAGS"
+      if test $gcc_cv_have_tls = yes; then
+	dnl So far, the binutils and the compiler support TLS.
+	dnl Also check whether the libc supports TLS, i.e. whether a variable
+	dnl with __thread linkage has a different address in different threads.
+	dnl First, find the thread_CFLAGS necessary for linking a program that
+	dnl calls pthread_create.
+	chktls_save_CFLAGS="$CFLAGS"
+	thread_CFLAGS=failed
+	for flag in '' '-pthread' '-lpthread'; do
+	  CFLAGS="$flag $chktls_save_CFLAGS"
+	  AC_LINK_IFELSE(
+	    [AC_LANG_PROGRAM(
+	       [#include <pthread.h>
+		void *g(void *d) { return NULL; }],
+	       [pthread_t t; pthread_create(&t,NULL,g,NULL);])],
+	    [thread_CFLAGS="$flag"])
+	  if test "X$thread_CFLAGS" != Xfailed; then
+	    break
+	  fi
+	done
+	CFLAGS="$chktls_save_CFLAGS"
+	if test "X$thread_CFLAGS" != Xfailed; then
+	  CFLAGS="$thread_CFLAGS $chktls_save_CFLAGS"
+ 	  dnl Test for an old glibc bug that violated the __thread property.
+	  dnl Use volatile to ensure the compiler won't optimize away pointer
+	  dnl accesses it might otherwise assume to be redundant, or reorder 
+	  dnl them and reuse storage, which might lead to them pointing to
+	  dnl the same location.
+	  AC_RUN_IFELSE(
+	    [AC_LANG_PROGRAM(
+	       [#include <pthread.h>
+		__thread int a;
+		static int *volatile a_in_other_thread;
+		static void *
+		thread_func (void *arg)
+		{
+		  a_in_other_thread = &a;
+		  return (void *)0;
+		}],
+	       [pthread_t thread;
+		void *thread_retval;
+		int *volatile a_in_main_thread;
+		a_in_main_thread = &a;
+		if (pthread_create (&thread, (pthread_attr_t *)0,
+				    thread_func, (void *)0))
+		  return 0;
+		if (pthread_join (thread, &thread_retval))
+		  return 0;
+		return (a_in_other_thread == a_in_main_thread);])],
+	     [gcc_cv_have_tls=yes], [gcc_cv_have_tls=no], [])
+	  CFLAGS="$chktls_save_CFLAGS"
+	fi
+      fi],
+      [gcc_cv_have_tls=no],
+      [dnl This is the cross-compiling case. Assume libc supports TLS if the
+       dnl binutils and the compiler do.
+       AC_LINK_IFELSE([__thread int a; int b; int main() { return a = b; }],
+	 [chktls_save_LDFLAGS="$LDFLAGS"
+	  dnl Shared library options may depend on the host; this check
+	  dnl is only known to be needed for GNU/Linux.
+	  case $host in
+	    *-*-linux*)
+	      LDFLAGS="-shared -Wl,--no-undefined $LDFLAGS"
+	      ;;
+	  esac
+	  chktls_save_CFLAGS="$CFLAGS"
+	  CFLAGS="-fPIC $CFLAGS"
+	  dnl If -shared works, test if TLS works in a shared library.
+	  AC_LINK_IFELSE([int f() { return 0; }],
+	    [AC_LINK_IFELSE([__thread int a; int b; int f() { return a = b; }],
+	      [gcc_cv_have_tls=yes],
+	      [gcc_cv_have_tls=no])],
+	    [gcc_cv_have_tls=yes])
+	  CFLAGS="$chktls_save_CFLAGS"
+	  LDFLAGS="$chktls_save_LDFLAGS"], [gcc_cv_have_tls=no])
+      ]
+    )])
+  if test "$enable_tls $gcc_cv_have_tls" = "yes yes"; then
+    AC_DEFINE(HAVE_TLS, 1,
+	      [Define to 1 if the target supports thread-local storage.])
+  fi])
+
+dnl Check whether the target assembler supports TLS.
+AC_DEFUN([GCC_CHECK_CC_TLS], [
+  GCC_ENABLE(tls, yes, [], [Use thread-local storage])
+  AC_CACHE_CHECK([whether the target assembler supports thread-local storage],
+		 gcc_cv_have_cc_tls, [
+    AC_COMPILE_IFELSE([__thread int a; int b; int main() { return a = b; }],
+      [gcc_cv_have_cc_tls=yes], [gcc_cv_have_cc_tls=no])]
+    )])
+  if test "$enable_tls $gcc_cv_have_cc_tls" = "yes yes"; then
+    AC_DEFINE(HAVE_CC_TLS, 1,
+	      [Define to 1 if the target assembler supports thread-local storage.])
+  fi])
+
+dnl Check whether TLS is emulated.
+AC_DEFUN([GCC_CHECK_EMUTLS], [
+  AC_CACHE_CHECK([whether the thread-local storage support is from emutls],
+  		 gcc_cv_use_emutls, [
+    gcc_cv_use_emutls=no
+    echo '__thread int a; int b; int main() { return a = b; }' > conftest.c
+    if AC_TRY_COMMAND(${CC-cc} -Werror -S -o conftest.s conftest.c 1>&AS_MESSAGE_LOG_FD); then
+      if grep __emutls_get_address conftest.s > /dev/null; then
+	gcc_cv_use_emutls=yes
+      fi
+    fi
+    rm -f conftest.*
+    ])
+  if test "$gcc_cv_use_emutls" = "yes" ; then
+    AC_DEFINE(USE_EMUTLS, 1,
+      	      [Define to 1 if the target use emutls for thread-local storage.])
+  fi])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/uintmax_t.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/uintmax_t.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/uintmax_t.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/uintmax_t.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,32 @@
+# uintmax_t.m4 serial 7 (gettext-0.12)
+dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+AC_PREREQ(2.13)
+
+# Define uintmax_t to 'unsigned long' or 'unsigned long long'
+# if it is not already defined in <stdint.h> or <inttypes.h>.
+
+AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
+[
+  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
+  if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
+    AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
+    test $ac_cv_type_unsigned_long_long = yes \
+      && ac_type='unsigned long long' \
+      || ac_type='unsigned long'
+    AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
+      [Define to unsigned long or unsigned long long
+       if <stdint.h> and <inttypes.h> don't define.])
+  else
+    AC_DEFINE(HAVE_UINTMAX_T, 1,
+      [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
+  fi
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/ulonglong.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/ulonglong.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/ulonglong.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/ulonglong.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,23 @@
+# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
+dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
+[
+  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
+  [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
+    [unsigned long long ullmax = (unsigned long long) -1;
+     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
+    ac_cv_type_unsigned_long_long=yes,
+    ac_cv_type_unsigned_long_long=no)])
+  if test $ac_cv_type_unsigned_long_long = yes; then
+    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
+      [Define if you have the unsigned long long type.])
+  fi
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/unwind_ipinfo.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/unwind_ipinfo.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/unwind_ipinfo.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/unwind_ipinfo.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,37 @@
+dnl
+dnl Check whether _Unwind_GetIPInfo is available without doing a link
+dnl test so we can use this with libstdc++-v3 and libjava.  Need to
+dnl use $target to set defaults because automatic checking is not possible
+dnl without a link test (and maybe even with a link test).
+dnl
+
+AC_DEFUN([GCC_CHECK_UNWIND_GETIPINFO], [
+  AC_ARG_WITH(system-libunwind,
+  [  --with-system-libunwind use installed libunwind])
+  # If system-libunwind was not specifically set, pick a default setting.
+  if test x$with_system_libunwind = x; then
+    case ${target} in
+      ia64-*-hpux*) with_system_libunwind=yes ;;
+      *) with_system_libunwind=no ;;
+    esac
+  fi
+  # Based on system-libunwind and target, do we have ipinfo?
+  if  test x$with_system_libunwind = xyes; then
+    case ${target} in
+      ia64-*-*) have_unwind_getipinfo=no ;;
+      *) have_unwind_getipinfo=yes ;;
+    esac
+  else
+    # Darwin before version 9 does not have _Unwind_GetIPInfo.
+    changequote(,)
+    case ${target} in
+      *-*-darwin[3-8]|*-*-darwin[3-8].*) have_unwind_getipinfo=no ;;
+      *) have_unwind_getipinfo=yes ;;
+    esac
+    changequote([,])
+  fi
+
+  if test x$have_unwind_getipinfo = xyes; then
+    AC_DEFINE(HAVE_GETIPINFO, 1, [Define if _Unwind_GetIPInfo is available.])
+  fi
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/warnings.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/warnings.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/warnings.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/warnings.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,107 @@
+# Autoconf include file defining macros related to compile-time warnings.
+
+# Copyright 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+
+#This file is part of GCC.
+
+#GCC is free software; you can redistribute it and/or modify it under
+#the terms of the GNU General Public License as published by the Free
+#Software Foundation; either version 3, or (at your option) any later
+#version.
+
+#GCC 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 GCC; see the file COPYING3.  If not see
+#<http://www.gnu.org/licenses/>.
+
+# ACX_PROG_CC_WARNING_OPTS(WARNINGS, [VARIABLE = WARN_CFLAGS)
+#   Sets @VARIABLE@ to the subset of the given options which the
+#   compiler accepts.
+AC_DEFUN([ACX_PROG_CC_WARNING_OPTS],
+[AC_REQUIRE([AC_PROG_CC])dnl
+m4_pushdef([acx_Var], [m4_default([$2], [WARN_CFLAGS])])dnl
+AC_SUBST(acx_Var)dnl
+m4_expand_once([acx_Var=
+],m4_quote(acx_Var=))dnl
+save_CFLAGS="$CFLAGS"
+for option in $1; do
+  AS_VAR_PUSHDEF([acx_Woption], [acx_cv_prog_cc_warning_$option])
+  AC_CACHE_CHECK([whether $CC supports $option], acx_Woption,
+    [CFLAGS="$option"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_VAR_SET(acx_Woption, yes)],
+      [AS_VAR_SET(acx_Woption, no)])
+  ])
+  AS_IF([test AS_VAR_GET(acx_Woption) = yes],
+        [acx_Var="$acx_Var${acx_Var:+ }$option"])
+  AS_VAR_POPDEF([acx_Woption])dnl
+done
+CFLAGS="$save_CFLAGS"
+m4_popdef([acx_Var])dnl
+])# ACX_PROG_CC_WARNING_OPTS
+
+# ACX_PROG_CC_WARNING_ALMOST_PEDANTIC(WARNINGS, [VARIABLE = WARN_PEDANTIC)
+#   Append to VARIABLE "-pedantic" + the argument, if the compiler is GCC
+#   and accepts all of those options simultaneously, otherwise to nothing.
+AC_DEFUN([ACX_PROG_CC_WARNING_ALMOST_PEDANTIC],
+[AC_REQUIRE([AC_PROG_CC])dnl
+m4_pushdef([acx_Var], [m4_default([$2], [WARN_PEDANTIC])])dnl
+AC_SUBST(acx_Var)dnl
+m4_expand_once([acx_Var=
+],m4_quote(acx_Var=))dnl
+AS_VAR_PUSHDEF([acx_Pedantic], [acx_cv_prog_cc_pedantic_$1])dnl
+AS_IF([test "$GCC" = yes],
+[AC_CACHE_CHECK([whether $CC supports -pedantic $1], acx_Pedantic,
+[save_CFLAGS="$CFLAGS"
+CFLAGS="-pedantic $1"
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
+   [AS_VAR_SET(acx_Pedantic, yes)],
+   [AS_VAR_SET(acx_Pedantic, no)])
+CFLAGS="$save_CFLAGS"])
+AS_IF([test AS_VAR_GET(acx_Pedantic) = yes],
+      [acx_Var="$acx_Var${acx_Var:+ }-pedantic $1"])
+])
+AS_VAR_POPDEF([acx_Pedantic])dnl
+m4_popdef([acx_Var])dnl
+])# ACX_PROG_CC_WARNING_ALMOST_PEDANTIC
+
+# ACX_PROG_CC_WARNINGS_ARE_ERRORS([x.y.z], [VARIABLE = WERROR])
+#   sets @VARIABLE@ to "-Werror" if the compiler is GCC >=x.y.z, or if
+#   --enable-werror-always was given on the command line, otherwise
+#   to nothing.
+#   If the argument is the word "manual" instead of a version number,
+#   then @VARIABLE@ will be set to -Werror only if --enable-werror-always
+#   appeared on the configure command line.
+AC_DEFUN([ACX_PROG_CC_WARNINGS_ARE_ERRORS],
+[AC_REQUIRE([AC_PROG_CC])dnl
+m4_pushdef([acx_Var], [m4_default([$2], [WERROR])])dnl
+AC_SUBST(acx_Var)dnl
+m4_expand_once([acx_Var=
+],m4_quote(acx_Var=))dnl
+AC_ARG_ENABLE(werror-always, 
+    AS_HELP_STRING([--enable-werror-always],
+		   [enable -Werror despite compiler version]),
+[], [enable_werror_always=no])
+AS_IF([test $enable_werror_always = yes],
+      [acx_Var="$acx_Var${acx_Var:+ }-Werror"])
+ m4_if($1, [manual],,
+ [AS_VAR_PUSHDEF([acx_GCCvers], [acx_cv_prog_cc_gcc_$1_or_newer])dnl
+  AC_CACHE_CHECK([whether $CC is GCC >=$1], acx_GCCvers,
+    [set fnord `echo $1 | tr '.' ' '`
+     shift
+     AC_PREPROC_IFELSE(
+[#if __GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ \
+  < [$]1 * 10000 + [$]2 * 100 + [$]3
+#error insufficient
+#endif],
+   [AS_VAR_SET(acx_GCCvers, yes)],
+   [AS_VAR_SET(acx_GCCvers, no)])])
+ AS_IF([test AS_VAR_GET(acx_GCCvers) = yes],
+       [acx_Var="$acx_Var${acx_Var:+ }-Werror"])
+  AS_VAR_POPDEF([acx_GCCvers])])
+m4_popdef([acx_Var])dnl
+])# ACX_PROG_CC_WARNINGS_ARE_ERRORS
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config/zlib.m4 sdcc-3.2.0+dfsg/support/sdbinutils/config/zlib.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/config/zlib.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config/zlib.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,18 @@
+dnl A function to check for zlib availability.  zlib is used by default
+dnl unless the user configured with --disable-nls.
+
+AC_DEFUN([AM_ZLIB],
+[
+  # See if the user specified whether he wants zlib support or not.
+  AC_ARG_WITH(zlib,
+    [  --with-zlib             include zlib support (auto/yes/no) [default=auto]],
+    [], [with_zlib=auto])
+
+  if test "$with_zlib" != "no"; then
+    AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)])
+    if test "$with_zlib" = "yes" -a "$ac_cv_header_zlib_h" != "yes"; then
+      AC_MSG_ERROR([zlib (libz) library was explicitly requested but not found])
+    fi
+  fi
+])
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config-ml.in sdcc-3.2.0+dfsg/support/sdbinutils/config-ml.in
--- sdcc-3.1.0+dfsg/support/sdbinutils/config-ml.in	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config-ml.in	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,877 @@
+# Configure fragment invoked in the post-target section for subdirs
+# wanting multilib support.
+#
+# Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2010, 2011  Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+#
+# Please report bugs to <gcc-bugs@gnu.org>
+# and send patches to <gcc-patches@gnu.org>.
+
+# It is advisable to support a few --enable/--disable options to let the
+# user select which libraries s/he really wants.
+#
+# Subdirectories wishing to use multilib should put the following lines
+# in the "post-target" section of configure.in.
+#
+# if [ "${srcdir}" = "." ] ; then
+#   if [ "${with_target_subdir}" != "." ] ; then
+#     . ${with_multisrctop}../../config-ml.in
+#   else
+#     . ${with_multisrctop}../config-ml.in
+#   fi
+# else
+#   . ${srcdir}/../config-ml.in
+# fi
+#
+#
+# Things are complicated because 6 separate cases must be handled:
+# 2 (native, cross) x 3 (absolute-path, relative-not-dot, dot) = 6.
+#
+# srcdir=. is special.  It must handle make programs that don't handle VPATH.
+# To implement this, a symlink tree is built for each library and for each
+# multilib subdir.
+#
+# The build tree is layed out as
+#
+# ./
+#   newlib
+#   m68020/
+#          newlib
+#          m68881/
+#                 newlib
+#
+# The nice feature about this arrangement is that inter-library references
+# in the build tree work without having to care where you are.  Note that
+# inter-library references also work in the source tree because symlink trees
+# are built when srcdir=.
+#
+# Unfortunately, trying to access the libraries in the build tree requires
+# the user to manually choose which library to use as GCC won't be able to
+# find the right one.  This is viewed as the lesser of two evils.
+#
+# Configure variables:
+# ${with_target_subdir} = "." for native, or ${target_alias} for cross.
+# Set by top level Makefile.
+# ${with_multisrctop} = how many levels of multilibs there are in the source
+# tree.  It exists to handle the case of configuring in the source tree:
+# ${srcdir} is not constant.
+# ${with_multisubdir} = name of multilib subdirectory (eg: m68020/m68881).
+#
+# Makefile variables:
+# MULTISRCTOP = number of multilib levels in source tree (+1 if cross)
+# (FIXME: note that this is different than ${with_multisrctop}.  Check out.).
+# MULTIBUILDTOP = number of multilib levels in build tree
+# MULTIDIRS = list of multilib subdirs (eg: m68000 m68020 ...)
+# (only defined in each library's main Makefile).
+# MULTISUBDIR = installed subdirectory name with leading '/' (eg: /m68000)
+# (only defined in each multilib subdir).
+
+# FIXME: Multilib is currently disabled by default for everything other than
+# newlib.  It is up to each target to turn on multilib support for the other
+# libraries as desired.
+
+# Autoconf incoming variables:
+# srcdir, host, ac_configure_args
+#
+# We *could* figure srcdir and host out, but we'd have to do work that
+# our caller has already done to figure them out and requiring these two
+# seems reasonable.
+# Note that `host' in this case is GCC's `target'.  Target libraries are
+# configured for a particular host.
+
+Makefile=${ac_file-Makefile}
+ml_config_shell=${CONFIG_SHELL-/bin/sh}
+ml_realsrcdir=${srcdir}
+
+# Scan all the arguments and set all the ones we need.
+
+ml_verbose=--verbose
+for option in ${ac_configure_args}
+do
+  # strip single quotes surrounding individual options
+  case $option in
+  \'*\') eval option=$option ;;
+  esac
+
+  case $option in
+  --*) ;;
+  -*) option=-$option ;;
+  esac
+
+  case $option in
+  --*=*)
+	optarg=`echo $option | sed -e 's/^[^=]*=//'`
+	;;
+  esac
+
+  case $option in
+  --disable-*)
+	enableopt=`echo ${option} | sed 's:^--disable-:enable_:;s:-:_:g'`
+	eval $enableopt=no
+	;;
+  --enable-*)
+	case "$option" in
+	*=*)	;;
+	*)	optarg=yes ;;
+	esac
+	enableopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
+	# enable_shared and enable_static are handled by configure.
+	# Don't undo its work.
+	case $enableopt in
+	enable_shared | enable_static) ;;
+	*) eval $enableopt="$optarg" ;;
+	esac
+	;;
+  --norecursion | --no-recursion)
+	ml_norecursion=yes
+	;;
+  --silent | --sil* | --quiet | --q*)
+	ml_verbose=--silent
+	;;
+  --verbose | --v | --verb*)
+	ml_verbose=--verbose
+	;;
+  --with-*)
+	case "$option" in
+	*=*)	;;
+	*)	optarg=yes ;;
+	esac
+	withopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
+	eval $withopt="$optarg"
+	;;
+  --without-*)
+	withopt=`echo ${option} | sed 's:^--::;s:out::;s:-:_:g'`
+	eval $withopt=no
+	;;
+  esac
+done
+
+# Only do this if --enable-multilib.
+if [ "${enable_multilib}" = yes ]; then
+
+# Compute whether this is the library's top level directory
+# (ie: not a multilib subdirectory, and not a subdirectory like newlib/src).
+# ${with_multisubdir} tells us we're in the right branch, but we could be
+# in a subdir of that.
+# ??? The previous version could void this test by separating the process into
+# two files: one that only the library's toplevel configure.in ran (to
+# configure the multilib subdirs), and another that all configure.in's ran to
+# update the Makefile.  It seemed reasonable to collapse all multilib support
+# into one file, but it does leave us with having to perform this test.
+ml_toplevel_p=no
+if [ -z "${with_multisubdir}" ]; then
+  if [ "${srcdir}" = "." ]; then
+    # Use ${ml_realsrcdir} instead of ${srcdir} here to account for ${subdir}.
+    # ${with_target_subdir} = "." for native, otherwise target alias.
+    if [ "${with_target_subdir}" = "." ]; then
+      if [ -f ${ml_realsrcdir}/../config-ml.in ]; then
+	ml_toplevel_p=yes
+      fi
+    else
+      if [ -f ${ml_realsrcdir}/../../config-ml.in ]; then
+	ml_toplevel_p=yes
+      fi
+    fi
+  else
+    # Use ${ml_realsrcdir} instead of ${srcdir} here to account for ${subdir}.
+    if [ -f ${ml_realsrcdir}/../config-ml.in ]; then
+      ml_toplevel_p=yes
+    fi
+  fi
+fi
+
+# If this is the library's top level directory, set multidirs to the
+# multilib subdirs to support.  This lives at the top because we need
+# `multidirs' set right away.
+
+if [ "${ml_toplevel_p}" = yes ]; then
+
+multidirs=
+for i in `${CC-gcc} --print-multi-lib 2>/dev/null`; do
+  dir=`echo $i | sed -e 's/;.*$//'`
+  if [ "${dir}" = "." ]; then
+    true
+  else
+    if [ -z "${multidirs}" ]; then
+      multidirs="${dir}"
+    else
+      multidirs="${multidirs} ${dir}"
+    fi
+  fi
+done
+
+# Target libraries are configured for the host they run on, so we check
+# $host here, not $target.
+
+case "${host}" in
+arm-*-*)
+	if [ x"$enable_fpu" = xno ]
+	then
+	  old_multidirs=${multidirs}
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "${x}" in
+	      *fpu*) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x"$enable_26bit" = xno ]
+	then
+	  old_multidirs=${multidirs}
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "${x}" in
+	      *26bit*) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x"$enable_underscore" = xno ]
+	then
+	  old_multidirs=${multidirs}
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "${x}" in
+	      *under*) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x"$enable_interwork" = xno ]
+	then
+	  old_multidirs=${multidirs}
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "${x}" in
+	      *interwork*) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_biendian = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *le* ) : ;;
+	      *be* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x"$enable_nofmult" = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *nofmult* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	;;
+m68*-*-*)
+	if [ x$enable_softfloat = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *soft-float* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_m68881 = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *m68881* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_m68000 = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *m68000* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_m68020 = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *m68020* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	;;
+mips*-*-*)
+	if [ x$enable_single_float = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *single* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_biendian = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *el* ) : ;;
+	      *eb* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_softfloat = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *soft-float* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	;;
+powerpc*-*-* | rs6000*-*-*)
+	if [ x$enable_aix64 = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *ppc64* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_pthread = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *pthread* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_softfloat = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *soft-float* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_powercpu = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      power | */power | */power/* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_powerpccpu = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *powerpc* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_powerpcos = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *mcall-linux* | *mcall-solaris* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_biendian = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *mlittle* | *mbig* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_sysv = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *mcall-sysv* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	;;
+esac
+
+# Remove extraneous blanks from multidirs.
+# Tests like `if [ -n "$multidirs" ]' require it.
+multidirs=`echo "$multidirs" | sed -e 's/^[ ][ ]*//' -e 's/[ ][ ]*$//' -e 's/[ ][ ]*/ /g'`
+
+# Add code to library's top level makefile to handle building the multilib
+# subdirs.
+
+cat > Multi.tem <<\EOF
+
+PWD_COMMAND=$${PWDCMD-pwd}
+
+# FIXME: There should be an @-sign in front of the `if'.
+# Leave out until this is tested a bit more.
+multi-do:
+	if [ -z "$(MULTIDIRS)" ]; then \
+	  true; \
+	else \
+	  rootpre=`${PWD_COMMAND}`/; export rootpre; \
+	  srcrootpre=`cd $(srcdir); ${PWD_COMMAND}`/; export srcrootpre; \
+	  lib=`echo "$${rootpre}" | sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \
+	  compiler="$(CC)"; \
+	  for i in `$${compiler} --print-multi-lib 2>/dev/null`; do \
+	    dir=`echo $$i | sed -e 's/;.*$$//'`; \
+	    if [ "$${dir}" = "." ]; then \
+	      true; \
+	    else \
+	      if [ -d ../$${dir}/$${lib} ]; then \
+		flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \
+		if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) \
+				CFLAGS="$(CFLAGS) $${flags}" \
+				CCASFLAGS="$(CCASFLAGS) $${flags}" \
+				FCFLAGS="$(FCFLAGS) $${flags}" \
+				FFLAGS="$(FFLAGS) $${flags}" \
+				ADAFLAGS="$(ADAFLAGS) $${flags}" \
+				prefix="$(prefix)" \
+				exec_prefix="$(exec_prefix)" \
+				GCJFLAGS="$(GCJFLAGS) $${flags}" \
+				GOCFLAGS="$(GOCFLAGS) $${flags}" \
+				CXXFLAGS="$(CXXFLAGS) $${flags}" \
+				LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
+				LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
+				LDFLAGS="$(LDFLAGS) $${flags}" \
+				MULTIFLAGS="$${flags}" \
+				DESTDIR="$(DESTDIR)" \
+				INSTALL="$(INSTALL)" \
+				INSTALL_DATA="$(INSTALL_DATA)" \
+				INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \
+				INSTALL_SCRIPT="$(INSTALL_SCRIPT)" \
+				$(DO)); then \
+		  true; \
+		else \
+		  exit 1; \
+		fi; \
+	      else true; \
+	      fi; \
+	    fi; \
+	  done; \
+	fi
+
+# FIXME: There should be an @-sign in front of the `if'.
+# Leave out until this is tested a bit more.
+multi-clean:
+	if [ -z "$(MULTIDIRS)" ]; then \
+	  true; \
+	else \
+	  lib=`${PWD_COMMAND} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
+	  for dir in : $(MULTIDIRS); do \
+	    test $$dir != : || continue; \
+EOF
+cat >>Multi.tem <<EOF
+	    if [ -f ../\$\${dir}/\$\${lib}/${Makefile} ]; then \\
+EOF
+cat >>Multi.tem <<\EOF
+	      if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \
+	      then true; \
+	      else exit 1; \
+	      fi; \
+	    else true; \
+	    fi; \
+	  done; \
+	fi
+EOF
+
+cat ${Makefile} Multi.tem > Makefile.tem
+rm -f ${Makefile} Multi.tem
+mv Makefile.tem ${Makefile}
+
+fi # ${ml_toplevel_p} = yes
+
+if [ "${ml_verbose}" = --verbose ]; then
+  echo "Adding multilib support to ${Makefile} in ${ml_realsrcdir}"
+  if [ "${ml_toplevel_p}" = yes ]; then
+    echo "multidirs=${multidirs}"
+  fi
+  echo "with_multisubdir=${with_multisubdir}"
+fi
+
+if [ "${srcdir}" = "." ]; then
+  if [ "${with_target_subdir}" != "." ]; then
+    ml_srcdotdot="../"
+  else
+    ml_srcdotdot=""
+  fi
+else
+  ml_srcdotdot=""
+fi
+
+if [ -z "${with_multisubdir}" ]; then
+  ml_subdir=
+  ml_builddotdot=
+  : # ml_srcdotdot= # already set
+else
+  ml_subdir="/${with_multisubdir}"
+  # The '[^/][^/]*' appears that way to work around a SunOS sed bug.
+  ml_builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'`/
+  if [ "$srcdir" = "." ]; then
+    ml_srcdotdot=${ml_srcdotdot}${ml_builddotdot}
+  else
+    : # ml_srcdotdot= # already set
+  fi
+fi
+
+if [ "${ml_toplevel_p}" = yes ]; then
+  ml_do='$(MAKE)'
+  ml_clean='$(MAKE)'
+else
+  ml_do=true
+  ml_clean=true
+fi
+
+# TOP is used by newlib and should not be used elsewhere for this purpose.
+# MULTI{SRC,BUILD}TOP are the proper ones to use.  MULTISRCTOP is empty
+# when srcdir != builddir.  MULTIBUILDTOP is always some number of ../'s.
+# FIXME: newlib needs to be updated to use MULTI{SRC,BUILD}TOP so we can
+# delete TOP.  Newlib may wish to continue to use TOP for its own purposes
+# of course.
+# MULTIDIRS is non-empty for the cpu top level Makefile (eg: newlib/Makefile)
+# and lists the subdirectories to recurse into.
+# MULTISUBDIR is non-empty in each cpu subdirectory's Makefile
+# (eg: newlib/h8300h/Makefile) and is the installed subdirectory name with
+# a leading '/'.
+# MULTIDO is used for targets like all, install, and check where
+# $(FLAGS_TO_PASS) augmented with the subdir's compiler option is needed.
+# MULTICLEAN is used for the *clean targets.
+#
+# ??? It is possible to merge MULTIDO and MULTICLEAN into one.  They are
+# currently kept separate because we don't want the *clean targets to require
+# the existence of the compiler (which MULTIDO currently requires) and
+# therefore we'd have to record the directory options as well as names
+# (currently we just record the names and use --print-multi-lib to get the
+# options).
+
+sed -e "s:^TOP[ 	]*=[ 	]*\([./]*\)[ 	]*$:TOP = ${ml_builddotdot}\1:" \
+    -e "s:^MULTISRCTOP[ 	]*=.*$:MULTISRCTOP = ${ml_srcdotdot}:" \
+    -e "s:^MULTIBUILDTOP[ 	]*=.*$:MULTIBUILDTOP = ${ml_builddotdot}:" \
+    -e "s:^MULTIDIRS[ 	]*=.*$:MULTIDIRS = ${multidirs}:" \
+    -e "s:^MULTISUBDIR[ 	]*=.*$:MULTISUBDIR = ${ml_subdir}:" \
+    -e "s:^MULTIDO[ 	]*=.*$:MULTIDO = $ml_do:" \
+    -e "s:^MULTICLEAN[ 	]*=.*$:MULTICLEAN = $ml_clean:" \
+	${Makefile} > Makefile.tem
+rm -f ${Makefile}
+mv Makefile.tem ${Makefile}
+
+# If this is the library's top level, configure each multilib subdir.
+# This is done at the end because this is the loop that runs configure
+# in each multilib subdir and it seemed reasonable to finish updating the
+# Makefile before going on to configure the subdirs.
+
+if [ "${ml_toplevel_p}" = yes ]; then
+
+# We must freshly configure each subdirectory.  This bit of code is
+# actually partially stolen from the main configure script.  FIXME.
+
+if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
+
+  if [ "${ml_verbose}" = --verbose ]; then
+    echo "Running configure in multilib subdirs ${multidirs}"
+    echo "pwd: `${PWDCMD-pwd}`"
+  fi
+
+  ml_origdir=`${PWDCMD-pwd}`
+  ml_libdir=`echo "$ml_origdir" | sed -e 's,^.*/,,'`
+  # cd to top-level-build-dir/${with_target_subdir}
+  cd ..
+
+  for ml_dir in ${multidirs}; do
+
+    if [ "${ml_verbose}" = --verbose ]; then
+      echo "Running configure in multilib subdir ${ml_dir}"
+      echo "pwd: `${PWDCMD-pwd}`"
+    fi
+
+    if [ -d ${ml_dir} ]; then true; else
+      # ``mkdir -p ${ml_dir}'' See also mkinstalldirs.
+      pathcomp=""
+      for d in `echo ":${ml_dir}" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`; do
+        pathcomp="$pathcomp$d"
+        case "$pathcomp" in
+          -* ) pathcomp=./$pathcomp ;;
+        esac
+        if test ! -d "$pathcomp"; then
+           echo "mkdir $pathcomp" 1>&2
+           mkdir "$pathcomp" > /dev/null 2>&1 || lasterr=$?
+        fi
+        if test ! -d "$pathcomp"; then
+	   exit $lasterr
+        fi
+        pathcomp="$pathcomp/"
+      done
+    fi
+    if [ -d ${ml_dir}/${ml_libdir} ]; then true; else mkdir ${ml_dir}/${ml_libdir}; fi
+
+    # Eg: if ${ml_dir} = m68000/m68881, dotdot = ../../
+    dotdot=../`echo ${ml_dir} | sed -e 's|[^/]||g' -e 's|/|../|g'`
+
+    case ${srcdir} in
+    ".")
+      echo "Building symlink tree in `${PWDCMD-pwd}`/${ml_dir}/${ml_libdir}"
+      if [ "${with_target_subdir}" != "." ]; then
+	ml_unsubdir="../"
+      else
+	ml_unsubdir=""
+      fi
+      (cd ${ml_dir}/${ml_libdir};
+       ../${dotdot}${ml_unsubdir}symlink-tree ../${dotdot}${ml_unsubdir}${ml_libdir} "")
+      if [ -f ${ml_dir}/${ml_libdir}/${Makefile} ]; then
+	if [ x"${MAKE}" = x ]; then
+	  (cd ${ml_dir}/${ml_libdir}; make distclean)
+	else
+	  (cd ${ml_dir}/${ml_libdir}; ${MAKE} distclean)
+	fi
+      fi
+      ml_newsrcdir="."
+      ml_srcdiroption=
+      multisrctop=${dotdot}
+      ;;
+    *)
+      case "${srcdir}" in
+      /* | [A-Za-z]:[\\/]* ) # absolute path
+        ml_newsrcdir=${srcdir}
+        ;;
+      *) # otherwise relative
+        ml_newsrcdir=${dotdot}${srcdir}
+        ;;
+      esac
+      ml_srcdiroption="-srcdir=${ml_newsrcdir}"
+      multisrctop=
+      ;;
+    esac
+
+    case "${progname}" in
+    /* | [A-Za-z]:[\\/]* )     ml_recprog=${progname} ;;
+    *)      ml_recprog=${dotdot}${progname} ;;
+    esac
+
+    # FIXME: POPDIR=${PWD=`pwd`} doesn't work here.
+    ML_POPDIR=`${PWDCMD-pwd}`
+    cd ${ml_dir}/${ml_libdir}
+
+    if [ -f ${ml_newsrcdir}/configure ]; then
+      ml_recprog="${ml_newsrcdir}/configure"
+    fi
+
+    # find compiler flag corresponding to ${ml_dir}
+    for i in `${CC-gcc} --print-multi-lib 2>/dev/null`; do
+      dir=`echo $i | sed -e 's/;.*$//'`
+      if [ "${dir}" = "${ml_dir}" ]; then
+        flags=`echo $i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`
+        break
+      fi
+    done
+    ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GCJ="${GCJ_}$flags" GFORTRAN="${GFORTRAN_}$flags" GOC="${GOC_}$flags"'
+
+    if [ "${with_target_subdir}" = "." ]; then
+	CC_=$CC' '
+	CXX_=$CXX' '
+	F77_=$F77' '
+	GCJ_=$GCJ' '
+	GFORTRAN_=$GFORTRAN' '
+	GOC_=$GOC' '
+    else
+	# Create a regular expression that matches any string as long
+	# as ML_POPDIR.
+	popdir_rx=`echo "${ML_POPDIR}" | sed 's,.,.,g'`
+	CC_=
+	for arg in ${CC}; do
+	  case $arg in
+	  -[BIL]"${ML_POPDIR}"/*)
+	    CC_="${CC_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\1/p"`' ' ;;
+	  "${ML_POPDIR}"/*)
+	    CC_="${CC_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  *)
+	    CC_="${CC_}${arg} " ;;
+	  esac
+	done
+
+	CXX_=
+	for arg in ${CXX}; do
+	  case $arg in
+	  -[BIL]"${ML_POPDIR}"/*)
+	    CXX_="${CXX_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  "${ML_POPDIR}"/*)
+	    CXX_="${CXX_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  *)
+	    CXX_="${CXX_}${arg} " ;;
+	  esac
+	done
+
+	F77_=
+	for arg in ${F77}; do
+	  case $arg in
+	  -[BIL]"${ML_POPDIR}"/*)
+	    F77_="${F77_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  "${ML_POPDIR}"/*)
+	    F77_="${F77_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  *)
+	    F77_="${F77_}${arg} " ;;
+	  esac
+	done
+
+	GCJ_=
+	for arg in ${GCJ}; do
+	  case $arg in
+	  -[BIL]"${ML_POPDIR}"/*)
+	    GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  "${ML_POPDIR}"/*)
+	    GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  *)
+	    GCJ_="${GCJ_}${arg} " ;;
+	  esac
+	done
+
+	GFORTRAN_=
+	for arg in ${GFORTRAN}; do
+	  case $arg in
+	  -[BIL]"${ML_POPDIR}"/*)
+	    GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  "${ML_POPDIR}"/*)
+	    GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  *)
+	    GFORTRAN_="${GFORTRAN_}${arg} " ;;
+	  esac
+	done
+
+	GOC_=
+	for arg in ${GOC}; do
+	  case $arg in
+	  -[BIL]"${ML_POPDIR}"/*)
+	    GOC_="${GOC_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  "${ML_POPDIR}"/*)
+	    GOC_="${GOC_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  *)
+	    GOC_="${GOC_}${arg} " ;;
+	  esac
+	done
+
+	if test "x${LD_LIBRARY_PATH+set}" = xset; then
+	  LD_LIBRARY_PATH_=
+	  for arg in `echo "$LD_LIBRARY_PATH" | tr ':' ' '`; do
+	    case "$arg" in
+	    "${ML_POPDIR}"/*)
+	      arg=`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`
+	      ;;
+	    esac
+	    if test "x$LD_LIBRARY_PATH_" != x; then
+	      LD_LIBRARY_PATH_=$LD_LIBRARY_PATH_:$arg
+	    else
+	      LD_LIBRARY_PATH_=$arg
+	    fi
+          done
+	  ml_config_env="$ml_config_env LD_LIBRARY_PATH=$LD_LIBRARY_PATH_"
+	fi
+
+	if test "x${SHLIB_PATH+set}" = xset; then
+	  SHLIB_PATH_=
+	  for arg in `echo "$SHLIB_PATH" | tr ':' ' '`; do
+	    case "$arg" in
+	    "${ML_POPDIR}"/*)
+	      arg=`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`
+	      ;;
+	    esac
+	    if test "x$SHLIB_PATH_" != x; then
+	      SHLIB_PATH_=$SHLIB_PATH_:$arg
+	    else
+	      SHLIB_PATH_=$arg
+	    fi
+          done
+	  ml_config_env="$ml_config_env SHLIB_PATH=$SHLIB_PATH_"
+	fi
+    fi
+
+    if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
+	--with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \
+	${ac_configure_args} ${ml_config_env} ${ml_srcdiroption} ; then
+      true
+    else
+      exit 1
+    fi
+
+    cd "${ML_POPDIR}"
+
+  done
+
+  cd "${ml_origdir}"
+fi
+
+fi # ${ml_toplevel_p} = yes
+fi # ${enable_multilib} = yes
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config.guess sdcc-3.2.0+dfsg/support/sdbinutils/config.guess
--- sdcc-3.1.0+dfsg/support/sdbinutils/config.guess	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config.guess	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1517 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
+
+timestamp='2011-06-03'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+	echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[4567])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			esac ;;
+		    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+	exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+	exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+	exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+	exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    5000:UNIX_System_V:4.*:*)
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    i*:windows32*:*)
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit ;;
+    crisv32:Linux:*:*)
+	echo crisv32-axis-linux-gnu
+	exit ;;
+    frv:Linux:*:*)
+	echo frv-unknown-linux-gnu
+	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit ;;
+    sh64*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
+    x86_64:Linux:*:*)
+	echo x86_64-unknown-linux-gnu
+	exit ;;
+    xtensa*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+	# Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+		echo mips-nec-sysv${UNAME_RELEASE}
+	else
+		echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+	exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+	echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+	"4"
+#else
+	""
+#endif
+	); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    c34*)
+	echo c34-convex-bsd
+	exit ;;
+    c38*)
+	echo c38-convex-bsd
+	exit ;;
+    c4*)
+	echo c4-convex-bsd
+	exit ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config.rpath sdcc-3.2.0+dfsg/support/sdbinutils/config.rpath
--- sdcc-3.1.0+dfsg/support/sdbinutils/config.rpath	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config.rpath	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,543 @@
+#! /bin/sh
+# Output a system dependent set of variables, describing how to set the
+# run time search path of shared libraries in an executable.
+#
+#   Copyright 1996-2003 Free Software Foundation, Inc.
+#   Taken from GNU libtool, 2001
+#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+#   As a special exception to the GNU General Public License, if you
+#   distribute this file as part of a program that contains a
+#   configuration script generated by Autoconf, you may include it under
+#   the same distribution terms that you use for the rest of that program.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
+# should be set by the caller.
+#
+# The set of defined variables is at the end of this script.
+
+# Known limitations:
+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
+#   than 256 bytes, otherwise the compiler driver will dump core. The only
+#   known workaround is to choose shorter directory names for the build
+#   directory and/or the installation directory.
+
+# All known linkers require a `.a' archive for static linking (except M$VC,
+# which needs '.lib').
+libext=a
+shrext=.so
+
+host="$1"
+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
+
+wl=
+if test "$GCC" = yes; then
+  wl='-Wl,'
+else
+  case "$host_os" in
+    aix*)
+      wl='-Wl,'
+      ;;
+    mingw* | pw32* | os2*)
+      ;;
+    hpux9* | hpux10* | hpux11*)
+      wl='-Wl,'
+      ;;
+    irix5* | irix6* | nonstopux*)
+      wl='-Wl,'
+      ;;
+    newsos6)
+      ;;
+    linux*)
+      case $CC in
+        icc|ecc)
+          wl='-Wl,'
+          ;;
+        ccc)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
+    osf3* | osf4* | osf5*)
+      wl='-Wl,'
+      ;;
+    sco3.2v5*)
+      ;;
+    solaris*)
+      wl='-Wl,'
+      ;;
+    sunos4*)
+      wl='-Qoption ld '
+      ;;
+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+      wl='-Wl,'
+      ;;
+    sysv4*MP*)
+      ;;
+    uts4*)
+      ;;
+  esac
+fi
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
+
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+
+case "$host_os" in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+  case "$host_os" in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+        ld_shlibs=no
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we can use
+      # them.
+      ld_shlibs=no
+      ;;
+    beos*)
+      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    cygwin* | mingw* | pw32*)
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    netbsd*)
+      ;;
+    solaris* | sysv5*)
+      if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+        ld_shlibs=no
+      elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    sunos4*)
+      hardcode_direct=yes
+      ;;
+    *)
+      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+  esac
+  if test "$ld_shlibs" = yes; then
+    # Unlike libtool, we use -rpath here, not --rpath, since the documented
+    # option of GNU ld is called -rpath, not --rpath.
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  fi
+else
+  case "$host_os" in
+    aix3*)
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes; then
+        # Neither direct hardcoding nor static linking is supported with a
+        # broken collect2.
+        hardcode_direct=unsupported
+      fi
+      ;;
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+        # On IA64, the linker does run time linking by default, so we don't
+        # have to do anything special.
+        aix_use_runtimelinking=no
+      else
+        aix_use_runtimelinking=no
+        # Test if we are trying to use run time linking or normal
+        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+        # need to do runtime linking.
+        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+          for ld_flag in $LDFLAGS; do
+            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+              aix_use_runtimelinking=yes
+              break
+            fi
+          done
+        esac
+      fi
+      hardcode_direct=yes
+      hardcode_libdir_separator=':'
+      if test "$GCC" = yes; then
+        case $host_os in aix4.[012]|aix4.[012].*)
+          collect2name=`${CC} -print-prog-name=collect2`
+          if test -f "$collect2name" && \
+            strings "$collect2name" | grep resolve_lib_name >/dev/null
+          then
+            # We have reworked collect2
+            hardcode_direct=yes
+          else
+            # We have old collect2
+            hardcode_direct=unsupported
+            hardcode_minus_L=yes
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_libdir_separator=
+          fi
+        esac
+      fi
+      # Begin _LT_AC_SYS_LIBPATH_AIX.
+      echo 'int main () { return 0; }' > conftest.c
+      ${CC} ${LDFLAGS} conftest.c -o conftest
+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      if test -z "$aix_libpath"; then
+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      fi
+      if test -z "$aix_libpath"; then
+        aix_libpath="/usr/lib:/lib"
+      fi
+      rm -f conftest.c conftest
+      # End _LT_AC_SYS_LIBPATH_AIX.
+      if test "$aix_use_runtimelinking" = yes; then
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+      else
+        if test "$host_cpu" = ia64; then
+          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+        else
+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        fi
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs=no
+      ;;
+    bsdi4*)
+      ;;
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      libext=lib
+      ;;
+    darwin* | rhapsody*)
+      if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+        hardcode_direct=no
+      fi
+      ;;
+    dgux*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    freebsd2.2*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    freebsd2*)
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    freebsd*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    hpux9*)
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      ;;
+    hpux10* | hpux11*)
+      if test "$with_gnu_ld" = no; then
+        case "$host_cpu" in
+          hppa*64*)
+            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+            hardcode_libdir_separator=:
+            hardcode_direct=no
+            ;;
+          ia64*)
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_direct=no
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+          *)
+            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+            hardcode_libdir_separator=:
+            hardcode_direct=yes
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+        esac
+      fi
+      ;;
+    irix5* | irix6* | nonstopux*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    netbsd*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    newsos6)
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    openbsd*)
+      hardcode_direct=yes
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+        case "$host_os" in
+          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+            hardcode_libdir_flag_spec='-R$libdir'
+            ;;
+          *)
+            hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+            ;;
+        esac
+      fi
+      ;;
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      ;;
+    osf3*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    osf4* | osf5*)
+      if test "$GCC" = yes; then
+        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+        # Both cc and cxx compiler support -rpath directly
+        hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      hardcode_libdir_separator=:
+      ;;
+    sco3.2v5*)
+      ;;
+    solaris*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      ;;
+    sunos4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    sysv4)
+      case $host_vendor in
+        sni)
+          hardcode_direct=yes # is this really true???
+          ;;
+        siemens)
+          hardcode_direct=no
+          ;;
+        motorola)
+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+          ;;
+      esac
+      ;;
+    sysv4.3*)
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+        ld_shlibs=yes
+      fi
+      ;;
+    sysv4.2uw2*)
+      hardcode_direct=yes
+      hardcode_minus_L=no
+      ;;
+    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+      ;;
+    sysv5*)
+      hardcode_libdir_flag_spec=
+      ;;
+    uts4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    *)
+      ld_shlibs=no
+      ;;
+  esac
+fi
+
+# Check dynamic linker characteristics
+# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
+libname_spec='lib$name'
+case "$host_os" in
+  aix3*)
+    ;;
+  aix[4-9]*)
+    ;;
+  amigaos*)
+    ;;
+  beos*)
+    ;;
+  bsdi4*)
+    ;;
+  cygwin* | mingw* | pw32*)
+    shrext=.dll
+    ;;
+  darwin* | rhapsody*)
+    shrext=.dylib
+    ;;
+  dgux*)
+    ;;
+  freebsd*)
+    ;;
+  gnu*)
+    ;;
+  hpux9* | hpux10* | hpux11*)
+    case "$host_cpu" in
+      ia64*)
+        shrext=.so
+        ;;
+      hppa*64*)
+        shrext=.sl
+        ;;
+      *)
+        shrext=.sl
+        ;;
+    esac
+    ;;
+  irix5* | irix6* | nonstopux*)
+    case "$host_os" in
+      irix5* | nonstopux*)
+        libsuff= shlibsuff=
+        ;;
+      *)
+        case $LD in
+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
+          *) libsuff= shlibsuff= ;;
+        esac
+        ;;
+    esac
+    ;;
+  linux*oldld* | linux*aout* | linux*coff*)
+    ;;
+  linux*)
+    ;;
+  netbsd*)
+    ;;
+  newsos6)
+    ;;
+  nto-qnx)
+    ;;
+  openbsd*)
+    ;;
+  os2*)
+    libname_spec='$name'
+    shrext=.dll
+    ;;
+  osf3* | osf4* | osf5*)
+    ;;
+  sco3.2v5*)
+    ;;
+  solaris*)
+    ;;
+  sunos4*)
+    ;;
+  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+    ;;
+  sysv4*MP*)
+    ;;
+  uts4*)
+    ;;
+esac
+
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+
+sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+
+# How to pass a linker flag through the compiler.
+wl="$escaped_wl"
+
+# Static library suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally "so").
+shlibext="$shlibext"
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator="$hardcode_libdir_separator"
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct="$hardcode_direct"
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L="$hardcode_minus_L"
+
+EOF
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/config.sub sdcc-3.2.0+dfsg/support/sdbinutils/config.sub
--- sdcc-3.1.0+dfsg/support/sdbinutils/config.sub	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/config.sub	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1756 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
+
+timestamp='2011-06-03'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted GNU ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| bfin \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| fido | fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 \
+	| ns16k | ns32k \
+	| open8 \
+	| or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pyramid \
+	| rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| we32k \
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+		# Motorola 68HC11/12.
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pyramid-* \
+	| romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	microblaze)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc | ppcbe)	basic_machine=powerpc-unknown
+		;;
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+	# First match some system type aliases
+	# that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* | -aros* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	score-*)
+		os=-elf
+		;;
+	spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-cnk*|-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/configure sdcc-3.2.0+dfsg/support/sdbinutils/configure
--- sdcc-3.1.0+dfsg/support/sdbinutils/configure	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/configure	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,15231 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.64.
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# Foundation, Inc.
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 7<&0 </dev/null 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
+PACKAGE_URL=
+
+ac_unique_file="move-if-change"
+enable_option_checking=no
+ac_subst_vars='LTLIBOBJS
+LIBOBJS
+compare_exclusions
+POSTSTAGE1_CONFIGURE_FLAGS
+stage2_werror_flag
+stage1_checking
+stage1_cflags
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+COMPILER_NM_FOR_TARGET
+COMPILER_LD_FOR_TARGET
+COMPILER_AS_FOR_TARGET
+FLAGS_FOR_TARGET
+RAW_CXX_FOR_TARGET
+WINDMC_FOR_TARGET
+WINDRES_FOR_TARGET
+STRIP_FOR_TARGET
+RANLIB_FOR_TARGET
+OBJDUMP_FOR_TARGET
+NM_FOR_TARGET
+LIPO_FOR_TARGET
+LD_FOR_TARGET
+DLLTOOL_FOR_TARGET
+AS_FOR_TARGET
+AR_FOR_TARGET
+GOC_FOR_TARGET
+GFORTRAN_FOR_TARGET
+GCJ_FOR_TARGET
+GCC_FOR_TARGET
+CXX_FOR_TARGET
+CC_FOR_TARGET
+OBJDUMP
+OBJCOPY
+WINDMC
+WINDRES
+STRIP
+RANLIB
+NM
+LIPO
+LD
+DLLTOOL
+AS
+AR
+RUNTEST
+EXPECT
+MAKEINFO
+FLEX
+LEX
+M4
+BISON
+YACC
+WINDRES_FOR_BUILD
+WINDMC_FOR_BUILD
+RANLIB_FOR_BUILD
+NM_FOR_BUILD
+LD_FOR_BUILD
+LDFLAGS_FOR_BUILD
+GOC_FOR_BUILD
+GFORTRAN_FOR_BUILD
+GCJ_FOR_BUILD
+DLLTOOL_FOR_BUILD
+CXX_FOR_BUILD
+CXXFLAGS_FOR_BUILD
+CFLAGS_FOR_BUILD
+CC_FOR_BUILD
+AS_FOR_BUILD
+AR_FOR_BUILD
+target_configdirs
+configdirs
+build_configdirs
+INSTALL_GDB_TK
+GDB_TK
+CONFIGURE_GDB_TK
+build_tooldir
+tooldir
+GCC_SHLIB_SUBDIR
+RPATH_ENVVAR
+target_configargs
+host_configargs
+build_configargs
+BUILD_CONFIG
+LDFLAGS_FOR_TARGET
+CXXFLAGS_FOR_TARGET
+CFLAGS_FOR_TARGET
+DEBUG_PREFIX_CFLAGS_FOR_TARGET
+SYSROOT_CFLAGS_FOR_TARGET
+stage1_languages
+extra_host_libiberty_configure_flags
+clooginc
+clooglibs
+pplinc
+ppllibs
+poststage1_ldflags
+poststage1_libs
+stage1_libs
+stage1_ldflags
+extra_mpc_mpfr_configure_flags
+extra_mpc_gmp_configure_flags
+extra_mpfr_configure_flags
+gmpinc
+gmplibs
+do_compare
+GNATMAKE
+GNATBIND
+ac_ct_CXX
+CXXFLAGS
+CXX
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+EXTRA_CONFIGARGS_LIBJAVA
+target_subdir
+host_subdir
+build_subdir
+build_libsubdir
+AWK
+SED
+LN_S
+LN
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_os
+target_vendor
+target_cpu
+target
+host_os
+host_vendor
+host_cpu
+host
+target_noncanonical
+host_noncanonical
+build_noncanonical
+build_os
+build_vendor
+build_cpu
+build
+TOPLEVEL_CONFIGURE_ARGUMENTS
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files='serialization_dependencies
+host_makefile_frag
+target_makefile_frag
+alphaieee_frag
+ospace_frag'
+ac_user_opts='
+enable_option_checking
+with_build_libsubdir
+enable_gold
+enable_ld
+enable_libquadmath
+enable_libquadmath_support
+enable_libada
+enable_libssp
+enable_static_libjava
+enable_bootstrap
+enable_build_with_cxx
+enable_build_poststage1_with_cxx
+with_mpc
+with_mpc_include
+with_mpc_lib
+with_mpfr_dir
+with_mpfr
+with_mpfr_include
+with_mpfr_lib
+with_gmp_dir
+with_gmp
+with_gmp_include
+with_gmp_lib
+with_host_libstdcxx
+with_stage1_ldflags
+with_stage1_libs
+with_boot_libs
+with_boot_ldflags
+with_ppl
+with_ppl_include
+with_ppl_lib
+enable_ppl_version_check
+with_cloog
+with_cloog_include
+with_cloog_lib
+enable_cloog_backend
+enable_cloog_version_check
+enable_lto
+enable_stage1_languages
+enable_objc_gc
+with_build_sysroot
+with_debug_prefix_map
+with_build_config
+enable_serial_configure
+with_build_time_tools
+enable_maintainer_mode
+enable_stage1_checking
+enable_werror
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CXX
+CXXFLAGS
+CCC
+build_configargs
+host_configargs
+target_configargs
+AR
+AS
+DLLTOOL
+LD
+LIPO
+NM
+RANLIB
+STRIP
+WINDRES
+WINDMC
+OBJCOPY
+OBJDUMP
+CC_FOR_TARGET
+CXX_FOR_TARGET
+GCC_FOR_TARGET
+GCJ_FOR_TARGET
+GFORTRAN_FOR_TARGET
+GOC_FOR_TARGET
+AR_FOR_TARGET
+AS_FOR_TARGET
+DLLTOOL_FOR_TARGET
+LD_FOR_TARGET
+LIPO_FOR_TARGET
+NM_FOR_TARGET
+OBJDUMP_FOR_TARGET
+RANLIB_FOR_TARGET
+STRIP_FOR_TARGET
+WINDRES_FOR_TARGET
+WINDMC_FOR_TARGET'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+case $srcdir in
+  *" "*)
+    as_fn_error "path to source, $srcdir, contains spaces"
+    ;;
+esac
+ac_subdirs_all=`cd $srcdir && echo */configure | sed 's,/configure,,g'`
+
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures this package to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+  --target=TARGET   configure for building compilers for TARGET [HOST]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
+  --enable-ld[=ARG]       build ld [ARG={default,yes,no}]
+  --disable-libquadmath   do not build libquadmath directory
+  --disable-libquadmath-support
+                          disable libquadmath support for Fortran
+  --enable-libada         build libada directory
+  --enable-libssp         build libssp directory
+  --enable-static-libjava[=ARG]
+                          build static libjava [default=no]
+  --enable-bootstrap      enable bootstrapping [yes if native build]
+  --enable-build-with-cxx build with C++ compiler instead of C compiler
+  --enable-build-poststage1-with-cxx
+                          build stages 2 and 3 with C++, not C
+  --disable-ppl-version-check
+                          disable check for PPL version
+  --enable-cloog-backend[=BACKEND]
+                          set the CLooG BACKEND used to either isl, ppl or
+                          ppl-legacy (default)
+  --disable-cloog-version-check
+                          disable check for CLooG version
+  --enable-lto            enable link time optimization support
+  --enable-stage1-languages[=all]
+                          choose additional languages to build during stage1.
+                          Mostly useful for compiler development
+  --enable-objc-gc        enable use of Boehm's garbage collector with the GNU
+                          Objective-C runtime
+  --enable-serial-[{host,target,build}-]configure
+                          force sequential configuration of sub-packages for
+                          the host, target or build machine, or all
+                          sub-packages
+  --enable-maintainer-mode
+                          enable make rules and dependencies not useful (and
+                          sometimes confusing) to the casual installer
+  --enable-stage1-checking[=all]
+                          choose additional checking for stage1 of the
+                          compiler
+  --enable-werror         enable -Werror in bootstrap stage2 and later
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-build-libsubdir=DIR  Directory where to find libraries for build system
+  --with-mpc=PATH         specify prefix directory for installed MPC package.
+                          Equivalent to --with-mpc-include=PATH/include plus
+                          --with-mpc-lib=PATH/lib
+  --with-mpc-include=PATH specify directory for installed MPC include files
+  --with-mpc-lib=PATH     specify directory for the installed MPC library
+  --with-mpfr-dir=PATH    this option has been REMOVED
+  --with-mpfr=PATH        specify prefix directory for installed MPFR package.
+                          Equivalent to --with-mpfr-include=PATH/include plus
+                          --with-mpfr-lib=PATH/lib
+  --with-mpfr-include=PATH
+                          specify directory for installed MPFR include files
+  --with-mpfr-lib=PATH    specify directory for the installed MPFR library
+  --with-gmp-dir=PATH     this option has been REMOVED
+  --with-gmp=PATH         specify prefix directory for the installed GMP
+                          package. Equivalent to
+                          --with-gmp-include=PATH/include plus
+                          --with-gmp-lib=PATH/lib
+  --with-gmp-include=PATH specify directory for installed GMP include files
+  --with-gmp-lib=PATH     specify directory for the installed GMP library
+  --with-host-libstdcxx=L use linker arguments L to link with libstdc++ when
+                          linking with PPL
+  --with-stage1-ldflags=FLAGS
+                          linker flags for stage1
+  --with-stage1-libs=LIBS libraries for stage1
+  --with-boot-libs=LIBS   libraries for stage2 and later
+  --with-boot-ldflags=FLAGS
+                          linker flags for stage2 and later
+  --with-ppl=PATH         specify prefix directory for the installed PPL
+                          package. Equivalent to
+                          --with-ppl-include=PATH/include plus
+                          --with-ppl-lib=PATH/lib
+  --with-ppl-include=PATH specify directory for installed PPL include files
+  --with-ppl-lib=PATH     specify directory for the installed PPL library
+  --with-cloog=PATH       Specify prefix directory for the installed CLooG-PPL
+                          package. Equivalent to
+                          --with-cloog-include=PATH/include plus
+                          --with-cloog-lib=PATH/lib
+  --with-cloog-include=PATH
+                          Specify directory for installed CLooG include files
+  --with-cloog-lib=PATH   Specify the directory for the installed CLooG
+                          library
+  --with-build-sysroot=SYSROOT
+                          use sysroot as the system root during the build
+  --with-debug-prefix-map='A=B C=D ...'
+                          map A to B, C to D ... in debug information
+  --with-build-config='NAME NAME2...'
+                          use config/NAME.mk build configuration
+  --with-build-time-tools=PATH
+                          use given path to find target tools during the build
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CXX         C++ compiler command
+  CXXFLAGS    C++ compiler flags
+  build_configargs
+              additional configure arguments for build directories
+  host_configargs
+              additional configure arguments for host directories
+  target_configargs
+              additional configure arguments for target directories
+  AR          AR for the host
+  AS          AS for the host
+  DLLTOOL     DLLTOOL for the host
+  LD          LD for the host
+  LIPO        LIPO for the host
+  NM          NM for the host
+  RANLIB      RANLIB for the host
+  STRIP       STRIP for the host
+  WINDRES     WINDRES for the host
+  WINDMC      WINDMC for the host
+  OBJCOPY     OBJCOPY for the host
+  OBJDUMP     OBJDUMP for the host
+  CC_FOR_TARGET
+              CC for the target
+  CXX_FOR_TARGET
+              CXX for the target
+  GCC_FOR_TARGET
+              GCC for the target
+  GCJ_FOR_TARGET
+              GCJ for the target
+  GFORTRAN_FOR_TARGET
+              GFORTRAN for the target
+  GOC_FOR_TARGET
+              GOC for the target
+  AR_FOR_TARGET
+              AR for the target
+  AS_FOR_TARGET
+              AS for the target
+  DLLTOOL_FOR_TARGET
+              DLLTOOL for the target
+  LD_FOR_TARGET
+              LD for the target
+  LIPO_FOR_TARGET
+              LIPO for the target
+  NM_FOR_TARGET
+              NM for the target
+  OBJDUMP_FOR_TARGET
+              OBJDUMP for the target
+  RANLIB_FOR_TARGET
+              RANLIB for the target
+  STRIP_FOR_TARGET
+              STRIP for the target
+  WINDRES_FOR_TARGET
+              WINDRES for the target
+  WINDMC_FOR_TARGET
+              WINDMC for the target
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to the package provider.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+configure
+generated by GNU Autoconf 2.64
+
+Copyright (C) 2009 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_cxx_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_link
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by $as_me, which was
+generated by GNU Autoconf 2.64.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    cat <<\_ASBOX
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+_ASBOX
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    cat <<\_ASBOX
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+_ASBOX
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      cat <<\_ASBOX
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
+_ASBOX
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      cat <<\_ASBOX
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+_ASBOX
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  ac_site_file1=$CONFIG_SITE
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special
+  # files actually), so we avoid doing that.
+  if test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+
+
+
+
+progname=$0
+# if PWD already has a value, it is probably wrong.
+if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi
+
+# Export original configure arguments for use by sub-configures.
+# Quote arguments with shell meta charatcers.
+TOPLEVEL_CONFIGURE_ARGUMENTS=
+set -- "$progname" "$@"
+for ac_arg
+do
+  case "$ac_arg" in
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\']*)
+    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
+    # if the argument is of the form -foo=baz, quote the baz part only
+    ac_arg=`echo "'$ac_arg'" | sed "s/^'\([-a-zA-Z0-9]*=\)/\\1'/"` ;;
+  *) ;;
+  esac
+  # Add the quoted argument to the list.
+  TOPLEVEL_CONFIGURE_ARGUMENTS="$TOPLEVEL_CONFIGURE_ARGUMENTS $ac_arg"
+done
+if test "$silent" = yes; then
+  TOPLEVEL_CONFIGURE_ARGUMENTS="$TOPLEVEL_CONFIGURE_ARGUMENTS --silent"
+fi
+# Remove the initial space we just introduced and, as these will be
+# expanded by make, quote '$'.
+TOPLEVEL_CONFIGURE_ARGUMENTS=`echo "x$TOPLEVEL_CONFIGURE_ARGUMENTS" | sed -e 's/^x *//' -e 's,\\$,$$,g'`
+
+
+# Find the build, host, and target systems.
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+ case ${build_alias} in
+  "") build_noncanonical=${build} ;;
+  *) build_noncanonical=${build_alias} ;;
+esac
+
+
+
+ case ${host_alias} in
+  "") host_noncanonical=${build_noncanonical} ;;
+  *) host_noncanonical=${host_alias} ;;
+esac
+
+
+
+ case ${target_alias} in
+  "") target_noncanonical=${host_noncanonical} ;;
+  *) target_noncanonical=${target_alias} ;;
+esac
+
+
+
+
+test "$host_noncanonical" = "$target_noncanonical" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_transform_name=s,y,y,
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
+$as_echo_n "checking target system type... " >&6; }
+if test "${ac_cv_target+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$target_alias" = x; then
+  ac_cv_target=$ac_cv_host
+else
+  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
+$as_echo "$ac_cv_target" >&6; }
+case $ac_cv_target in
+*-*-*) ;;
+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
+esac
+target=$ac_cv_target
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_target
+shift
+target_cpu=$1
+target_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+target_os=$*
+IFS=$ac_save_IFS
+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+test -n "$target_alias" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_prefix=${target_alias}-
+
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+
+
+# Get 'install' or 'install-sh' and its variants.
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln works" >&5
+$as_echo_n "checking whether ln works... " >&6; }
+if test "${acx_cv_prog_LN+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f conftestdata_t
+echo >conftestdata_f
+if ln conftestdata_f conftestdata_t 2>/dev/null
+then
+  acx_cv_prog_LN=ln
+else
+  acx_cv_prog_LN=no
+fi
+rm -f conftestdata_f conftestdata_t
+
+fi
+if test $acx_cv_prog_LN = no; then
+  LN="cp"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN" >&5
+$as_echo "no, using $LN" >&6; }
+else
+  LN="$acx_cv_prog_LN"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if test "${ac_cv_path_SED+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+
+srcpwd=`cd ${srcdir} ; ${PWDCMD-pwd}`
+
+# We pass INSTALL explicitly to sub-makes.  Make sure that it is not
+# a relative path.
+if test "$INSTALL" = "${srcdir}/install-sh -c"; then
+  INSTALL="${srcpwd}/install-sh -c"
+fi
+
+# Set srcdir to "." if that's what it is.
+# This is important for multilib support.
+pwd=`${PWDCMD-pwd}`
+if test "${pwd}" = "${srcpwd}" ; then
+  srcdir=.
+fi
+
+topsrcdir=$srcpwd
+
+extra_host_args=
+
+### To add a new directory to the tree, first choose whether it is a target
+### or a host dependent tool.  Then put it into the appropriate list
+### (library or tools, host or target), doing a dependency sort.
+
+# Subdirs will be configured in the order listed in build_configdirs,
+# configdirs, or target_configdirs; see the serialization section below.
+
+# Dependency sorting is only needed when *configuration* must be done in
+# a particular order.  In all cases a dependency should be specified in
+# the Makefile, whether or not it's implicitly specified here.
+
+# Double entries in build_configdirs, configdirs, or target_configdirs may
+# cause circular dependencies and break everything horribly.
+
+# these library is used by various programs built for the build
+# environment
+#
+build_libs="build-libiberty"
+
+# these tools are built for the build environment
+build_tools="build-texinfo build-flex build-bison build-m4 build-fixincludes"
+
+# these libraries are used by various programs built for the host environment
+#
+host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libelf libiconv"
+
+# these tools are built for the host environment
+# Note, the powerpc-eabi build depends on sim occurring before gdb in order to
+# know that we are building the simulator.
+# binutils, gas and ld appear in that order because it makes sense to run
+# "make check" in that particular order.
+# If --enable-gold is used, "gold" may replace "ld".
+host_tools="flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools"
+
+# libgcj represents the runtime libraries only used by gcj.
+libgcj="target-libffi \
+	target-zlib \
+	target-libjava"
+
+# these libraries are built for the target environment, and are built after
+# the host libraries and the host tools (which may be a cross compiler)
+# Note that libiberty is not a target library.
+target_libraries="target-libgcc \
+		target-libgloss \
+		target-newlib \
+		target-libgomp \
+		target-libstdc++-v3 \
+		target-libmudflap \
+		target-libssp \
+		target-libquadmath \
+		target-libgfortran \
+		target-boehm-gc \
+		${libgcj} \
+		target-libobjc \
+		target-libada \
+		target-libgo"
+
+# these tools are built using the target libraries, and are intended to
+# run only in the target environment
+#
+# note: any program that *uses* libraries that are in the "target_libraries"
+# list belongs in this list.
+#
+target_tools="target-rda"
+
+################################################################################
+
+## All tools belong in one of the four categories, and are assigned above
+## We assign ${configdirs} this way to remove all embedded newlines.  This
+## is important because configure will choke if they ever get through.
+## ${configdirs} is directories we build using the host tools.
+## ${target_configdirs} is directories we build using the target tools.
+configdirs=`echo ${host_libs} ${host_tools}`
+target_configdirs=`echo ${target_libraries} ${target_tools}`
+build_configdirs=`echo ${build_libs} ${build_tools}`
+
+
+
+################################################################################
+
+srcname="gnu development package"
+
+# This gets set non-empty for some net releases of packages.
+appdirs=""
+
+# Define is_cross_compiler to save on calls to 'test'.
+is_cross_compiler=
+if test x"${host}" = x"${target}" ; then
+  is_cross_compiler=no
+else
+  is_cross_compiler=yes
+fi
+
+# Find the build and target subdir names.
+
+# post-stage1 host modules use a different CC_FOR_BUILD so, in order to
+# have matching libraries, they should use host libraries: Makefile.tpl
+# arranges to pass --with-build-libsubdir=$(HOST_SUBDIR).
+# However, they still use the build modules, because the corresponding
+# host modules (e.g. bison) are only built for the host when bootstrap
+# finishes. So:
+# - build_subdir is where we find build modules, and never changes.
+# - build_libsubdir is where we find build libraries, and can be overridden.
+
+# Prefix 'build-' so this never conflicts with target_subdir.
+build_subdir="build-${build_noncanonical}"
+
+# Check whether --with-build-libsubdir was given.
+if test "${with_build_libsubdir+set}" = set; then :
+  withval=$with_build_libsubdir; build_libsubdir="$withval"
+else
+  build_libsubdir="$build_subdir"
+fi
+
+# --srcdir=. covers the toplevel, while "test -d" covers the subdirectories
+if ( test $srcdir = . && test -d gcc ) \
+   || test -d $srcdir/../host-${host_noncanonical}; then
+  host_subdir="host-${host_noncanonical}"
+else
+  host_subdir=.
+fi
+# No prefix.
+target_subdir=${target_noncanonical}
+
+# Be sure to cover against remnants of an in-tree build.
+if test $srcdir != .  && test -d $srcdir/host-${host_noncanonical}; then
+  as_fn_error "building out of tree but $srcdir contains host-${host_noncanonical}.
+Use a pristine source tree when building in a separate tree" "$LINENO" 5
+fi
+
+# Skipdirs are removed silently.
+skipdirs=
+# Noconfigdirs are removed loudly.
+noconfigdirs=""
+
+use_gnu_ld=
+# Make sure we don't let GNU ld be added if we didn't want it.
+if test x$with_gnu_ld = xno ; then
+  use_gnu_ld=no
+  noconfigdirs="$noconfigdirs ld gold"
+fi
+
+use_gnu_as=
+# Make sure we don't let GNU as be added if we didn't want it.
+if test x$with_gnu_as = xno ; then
+  use_gnu_as=no
+  noconfigdirs="$noconfigdirs gas"
+fi
+
+use_included_zlib=
+# Make sure we don't let ZLIB be added if we didn't want it.
+if test x$with_system_zlib = xyes ; then
+  use_included_zlib=no
+  noconfigdirs="$noconfigdirs zlib"
+fi
+
+# some tools are so dependent upon X11 that if we're not building with X,
+# it's not even worth trying to configure, much less build, that tool.
+
+case ${with_x} in
+  yes | "") ;; # the default value for this tree is that X11 is available
+  no)
+    skipdirs="${skipdirs} tk itcl libgui"
+    # We won't be able to build gdbtk without X.
+    enable_gdbtk=no
+    ;;
+  *)  echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2 ;;
+esac
+
+# Some are only suitable for cross toolchains.
+# Remove these if host=target.
+cross_only="target-libgloss target-newlib target-opcodes"
+
+case $is_cross_compiler in
+  no) skipdirs="${skipdirs} ${cross_only}" ;;
+esac
+
+# If both --with-headers and --with-libs are specified, default to
+# --without-newlib.
+if test x"${with_headers}" != x && test x"${with_headers}" != xno \
+   && test x"${with_libs}" != x && test x"${with_libs}" != xno ; then
+  if test x"${with_newlib}" = x ; then
+    with_newlib=no
+  fi
+fi
+
+# Recognize --with-newlib/--without-newlib.
+case ${with_newlib} in
+  no) skipdirs="${skipdirs} target-newlib" ;;
+  yes) skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` ;;
+esac
+
+# Handle --enable-gold, --enable-ld.
+# --disable-gold [--enable-ld]
+#     Build only ld.  Default option.
+# --enable-gold [--enable-ld]
+#     Build both gold and ld.  Install gold as "ld.gold", install ld
+#     as "ld.bfd" and "ld".
+# --enable-gold=default [--enable-ld]
+#     Build both gold and ld.  Install gold as "ld.gold" and "ld",
+#     install ld as "ld.bfd".
+# --enable-gold[=default] --disable-ld
+#     Build only gold, which is then installed as both "ld.gold" and "ld".
+# --enable-gold --enable-ld=default
+#     Build both gold (installed as "ld.gold") and ld (installed as "ld"
+#     and ld.bfd).
+#     In other words, ld is default
+# --enable-gold=default --enable-ld=default
+#     Error.
+
+default_ld=
+# Check whether --enable-gold was given.
+if test "${enable_gold+set}" = set; then :
+  enableval=$enable_gold; ENABLE_GOLD=$enableval
+else
+  ENABLE_GOLD=no
+fi
+
+case "${ENABLE_GOLD}" in
+  yes|default)
+    # Check for ELF target.
+    is_elf=no
+    case "${target}" in
+      *-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \
+      | *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \
+      | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* \
+      | *-*-solaris2* | *-*-nto*)
+        case "${target}" in
+          *-*-linux*aout* | *-*-linux*oldld*)
+            ;;
+          *)
+            is_elf=yes
+            ;;
+        esac
+    esac
+
+    if test "$is_elf" = "yes"; then
+      # Check for target supported by gold.
+      case "${target}" in
+        i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-* | arm*-*-*)
+	  configdirs="$configdirs gold"
+	  if test x${ENABLE_GOLD} = xdefault; then
+	    default_ld=gold
+	  fi
+	  ENABLE_GOLD=yes
+          ;;
+      esac
+    fi
+    ;;
+  no)
+    ;;
+  *)
+    as_fn_error "invalid --enable-gold argument" "$LINENO" 5
+    ;;
+esac
+
+# Check whether --enable-ld was given.
+if test "${enable_ld+set}" = set; then :
+  enableval=$enable_ld; ENABLE_LD=$enableval
+else
+  ENABLE_LD=yes
+fi
+
+
+case "${ENABLE_LD}" in
+  default)
+    if test x${default_ld} != x; then
+      as_fn_error "either gold or ld can be the default ld" "$LINENO" 5
+    fi
+    ;;
+  yes)
+    ;;
+  no)
+    if test x${ENABLE_GOLD} != xyes; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: neither ld nor gold are enabled" >&5
+$as_echo "$as_me: WARNING: neither ld nor gold are enabled" >&2;}
+    fi
+    configdirs=`echo " ${configdirs} " | sed -e 's/ ld / /'`
+    ;;
+  *)
+    as_fn_error "invalid --enable-ld argument" "$LINENO" 5
+    ;;
+esac
+
+# Configure extra directories which are host specific
+
+case "${host}" in
+  *-cygwin*)
+    configdirs="$configdirs libtermcap" ;;
+esac
+
+# A target can indicate whether a language isn't supported for some reason.
+# Only spaces may be used in this macro; not newlines or tabs.
+unsupported_languages=
+
+# Remove more programs from consideration, based on the host or
+# target this usually means that a port of the program doesn't
+# exist yet.
+
+case "${host}" in
+  i[3456789]86-*-msdosdjgpp*)
+    noconfigdirs="$noconfigdirs tcl tk itcl"
+    ;;
+esac
+
+
+# Check whether --enable-libquadmath was given.
+if test "${enable_libquadmath+set}" = set; then :
+  enableval=$enable_libquadmath; ENABLE_LIBQUADMATH=$enableval
+else
+  ENABLE_LIBQUADMATH=yes
+fi
+
+if test "${ENABLE_LIBQUADMATH}" = "no" ; then
+  noconfigdirs="$noconfigdirs target-libquadmath"
+fi
+
+
+# Check whether --enable-libquadmath-support was given.
+if test "${enable_libquadmath_support+set}" = set; then :
+  enableval=$enable_libquadmath_support; ENABLE_LIBQUADMATH_SUPPORT=$enableval
+else
+  ENABLE_LIBQUADMATH_SUPPORT=yes
+fi
+
+enable_libquadmath_support=
+if test "${ENABLE_LIBQUADMATH_SUPPORT}" = "no" ; then
+  enable_libquadmath_support=no
+fi
+
+
+# Check whether --enable-libada was given.
+if test "${enable_libada+set}" = set; then :
+  enableval=$enable_libada; ENABLE_LIBADA=$enableval
+else
+  ENABLE_LIBADA=yes
+fi
+
+if test "${ENABLE_LIBADA}" != "yes" ; then
+  noconfigdirs="$noconfigdirs gnattools"
+fi
+
+# Check whether --enable-libssp was given.
+if test "${enable_libssp+set}" = set; then :
+  enableval=$enable_libssp; ENABLE_LIBSSP=$enableval
+else
+  ENABLE_LIBSSP=yes
+fi
+
+
+# Save it here so that, even in case of --enable-libgcj, if the Java
+# front-end isn't enabled, we still get libgcj disabled.
+libgcj_saved=$libgcj
+case $enable_libgcj in
+yes)
+  # If we reset it here, it won't get added to noconfigdirs in the
+  # target-specific build rules, so it will be forcibly enabled
+  # (unless the Java language itself isn't enabled).
+  libgcj=
+  ;;
+no)
+  # Make sure we get it printed in the list of not supported target libs.
+  # Don't disable libffi, though, other languages use it.
+  noconfigdirs="$noconfigdirs `echo ${libgcj} | sed -e 's/target-libffi//'`"
+  # Clear libgcj_saved so that even if java is enabled libffi won't be
+  # built.
+  libgcj_saved=
+  ;;
+esac
+
+# Check whether --enable-static-libjava was given.
+if test "${enable_static_libjava+set}" = set; then :
+  enableval=$enable_static_libjava; ENABLE_STATIC_LIBJAVA=$enableval
+else
+  ENABLE_STATIC_LIBJAVA=no
+fi
+
+enable_static_libjava=
+if test "${ENABLE_STATIC_LIBJAVA}" = "yes" ; then
+  enable_static_libjava=yes
+fi
+
+if test x$enable_static_libjava != xyes ; then
+  EXTRA_CONFIGARGS_LIBJAVA=--disable-static
+fi
+
+
+# Disable libmudflap on some systems.
+if test x$enable_libmudflap = x ; then
+    case "${target}" in
+    *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | bfin*-*-uclinux* | *-*-kopensolaris*-gnu)
+        # Enable libmudflap by default in GNU and friends.
+	;;
+    *-*-freebsd*)
+        # Enable libmudflap by default in FreeBSD.
+	;;
+    *)
+        # Disable it by default everywhere else.
+	noconfigdirs="$noconfigdirs target-libmudflap"
+	;;
+    esac
+fi
+
+# Disable libgomp on non POSIX hosted systems.
+if test x$enable_libgomp = x ; then
+    # Enable libgomp by default on hosted POSIX systems.
+    case "${target}" in
+    *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
+	;;
+    *-*-netbsd* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly*)
+	;;
+    *-*-solaris2* | *-*-irix6* | *-*-osf* | *-*-hpux11*)
+	;;
+    *-*-darwin* | *-*-aix*)
+	;;
+    *)
+	noconfigdirs="$noconfigdirs target-libgomp"
+	;;
+    esac
+fi
+
+# Disable libssp for some systems.
+case "${target}" in
+  avr-*-*)
+    # No hosted I/O support.
+    noconfigdirs="$noconfigdirs target-libssp"
+    ;;
+  powerpc-*-aix* | rs6000-*-aix*)
+    noconfigdirs="$noconfigdirs target-libssp"
+    ;;
+esac
+
+# Disable libstdc++-v3 for some systems.
+case "${target}" in
+  *-*-vxworks*)
+    # VxWorks uses the Dinkumware C++ library.
+    noconfigdirs="$noconfigdirs target-libstdc++-v3"
+    ;;
+  arm*-wince-pe*)
+    # the C++ libraries don't build on top of CE's C libraries
+    noconfigdirs="$noconfigdirs target-libstdc++-v3"
+    ;;
+  avr-*-*)
+    noconfigdirs="$noconfigdirs target-libstdc++-v3"
+    ;;
+esac
+
+# Disable Fortran for some systems.
+case "${target}" in
+  mmix-*-*)
+    # See <http://gcc.gnu.org/ml/gcc-patches/2004-11/msg00572.html>.
+    unsupported_languages="$unsupported_languages fortran"
+    ;;
+esac
+
+# Disable Java if libffi is not supported.
+case "${target}" in
+  alpha*-*-*)
+    ;;
+  arm*-*-*)
+    ;;
+  cris-*-*)
+    ;;
+  frv-*-*)
+    ;;
+  hppa*-*-linux*)
+    ;;
+  hppa*-*-hpux*)
+    ;;
+  i?86-*-*)
+    ;;
+  ia64*-*-*)
+    ;;
+  m32r*-*-*)
+    ;;
+  m68k-*-*)
+    ;;
+  mips-sgi-irix6.* | mips*-*-rtems*)
+    ;;
+  mips*-*-linux*)
+    ;;
+  powerpc*-*-linux*)
+    ;;
+  powerpc-*-darwin*)
+    ;;
+  powerpc-*-aix* | rs6000-*-aix*)
+    ;;
+  powerpc-*-freebsd*)
+    ;;
+  powerpc64-*-freebsd*)
+    ;;
+  powerpc*-*-rtems*)
+    ;;
+  s390-*-* | s390x-*-*)
+    ;;
+  sh-*-* | sh[34]*-*-*)
+    ;;
+  sh64-*-* | sh5*-*-*)
+    ;;
+  sparc*-*-*)
+    ;;
+  x86_64-*-*)
+    ;;
+  *-*-*)
+    unsupported_languages="$unsupported_languages java"
+    ;;
+esac
+
+# Disable Java, libgcj or related libraries for some systems.
+case "${target}" in
+  powerpc-*-darwin*)
+    ;;
+  i[3456789]86-*-darwin*)
+    ;;
+  x86_64-*-darwin[912]*)
+    ;;
+  *-*-darwin*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  *-*-netware*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  *-*-rtems*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  *-*-tpf*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  *-*-uclinux*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  *-*-vxworks*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  alpha*-*-*vms*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  arm-wince-pe)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  arm*-*-symbianelf*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  bfin-*-*)
+    noconfigdirs="$noconfigdirs target-boehm-gc"
+    ;;
+  cris-*-* | crisv32-*-*)
+    unsupported_languages="$unsupported_languages java"
+    case "${target}" in
+      *-*-linux*)
+	;;
+      *) # See PR46792 regarding target-libffi.
+	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
+    esac
+    ;;
+  hppa*64*-*-linux*)
+    # In this case, it's because the hppa64-linux target is for
+    # the kernel only at this point and has no libc, and thus no
+    # headers, crt*.o, etc., all of which are needed by these.
+    unsupported_languages="$unsupported_languages java"
+    ;;
+  hppa*64*-*-hpux*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  hppa*-hp-hpux11*)
+    ;;
+  hppa*-*-hpux*)
+    # According to Alexandre Oliva <aoliva@redhat.com>, libjava won't
+    # build on HP-UX 10.20.
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  ia64*-*-*vms*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  i[3456789]86-w64-mingw*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  i[3456789]86-*-mingw*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  x86_64-*-mingw*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  mmix-*-*)
+    noconfigdirs="$noconfigdirs target-libffi target-boehm-gc"
+    ;;
+  powerpc-*-aix*)
+    # copied from rs6000-*-* entry
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  rs6000-*-aix*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  mips*-*-irix6*)
+    # Linking libjava exceeds command-line length limits on at least
+    # IRIX 6.2, but not on IRIX 6.5.
+    # Also, boehm-gc won't build on IRIX 6.5, according to Jeffrey Oldham
+    # <oldham@codesourcery.com>
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  *-*-lynxos*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+esac
+
+# Default libgloss CPU subdirectory.
+libgloss_dir="$target_cpu"
+
+case "${target}" in
+  sh*-*-pe|mips*-*-pe|*arm-wince-pe)
+    libgloss_dir=wince
+    ;;
+  arm*-*-*)
+    libgloss_dir=arm
+    ;;
+  cris-*-* | crisv32-*-*)
+    libgloss_dir=cris
+    ;;
+  hppa*-*-*)
+    libgloss_dir=pa
+    ;;
+  i[3456789]86-*-*)
+    libgloss_dir=i386
+    ;;
+  m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*)
+    libgloss_dir=m68hc11
+    ;;
+  m68*-*-* | fido-*-*)
+    libgloss_dir=m68k
+    ;;
+  mips*-*-*)
+    libgloss_dir=mips
+    ;;
+  powerpc*-*-*)
+    libgloss_dir=rs6000
+    ;;
+  sparc*-*-*)
+    libgloss_dir=sparc
+    ;;
+esac
+
+# Disable newlib and libgloss for various target OSes.
+case "${target}" in
+  alpha*-dec-osf*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  i[3456789]86-*-linux*)
+    # This section makes it possible to build newlib natively on linux.
+    # If we are using a cross compiler then don't configure newlib.
+    if test x${is_cross_compiler} != xno ; then
+      noconfigdirs="$noconfigdirs target-newlib"
+    fi
+    noconfigdirs="$noconfigdirs target-libgloss"
+    # If we are not using a cross compiler, do configure newlib.
+    # Note however, that newlib will only be configured in this situation
+    # if the --with-newlib option has been given, because otherwise
+    # 'target-newlib' will appear in skipdirs.
+    ;;
+  i[3456789]86-*-rdos*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  sh*-*-pe|mips*-*-pe|arm-wince-pe)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  sparc-*-sunos4*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-aix*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-beos*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-chorusos)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-dragonfly*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-freebsd*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-lynxos*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-mingw*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-netbsd*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-netware*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-tpf*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-uclinux*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-vxworks*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+esac
+
+case "${target}" in
+  *-*-chorusos)
+    ;;
+  powerpc-*-darwin*)
+    noconfigdirs="$noconfigdirs ld gas gdb gprof"
+    noconfigdirs="$noconfigdirs sim target-rda"
+    ;;
+  i[3456789]86-*-darwin*)
+    noconfigdirs="$noconfigdirs ld gprof"
+    noconfigdirs="$noconfigdirs sim target-rda"
+    ;;
+  x86_64-*-darwin[912]*)
+    noconfigdirs="$noconfigdirs ld gas gprof"
+    noconfigdirs="$noconfigdirs sim target-rda"
+    ;;
+  *-*-darwin*)
+    noconfigdirs="$noconfigdirs ld gas gdb gprof"
+    noconfigdirs="$noconfigdirs sim target-rda"
+    ;;
+  *-*-dragonfly*)
+    ;;
+  *-*-freebsd*)
+    if test "x$with_gmp" = x && test "x$with_gmp_dir" = x \
+	&& test -f /usr/local/include/gmp.h; then
+      with_gmp=/usr/local
+    fi
+    ;;
+  *-*-kaos*)
+    # Remove unsupported stuff on all kaOS configurations.
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  *-*-netbsd*)
+    ;;
+  *-*-netware*)
+    ;;
+  *-*-rtems*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+    # The tpf target doesn't support gdb yet.
+  *-*-tpf*)
+    noconfigdirs="$noconfigdirs gdb tcl tk libgui itcl"
+    ;;
+  *-*-uclinux*)
+    noconfigdirs="$noconfigdirs target-rda"
+    ;;
+  *-*-vxworks*)
+    ;;
+  alpha*-dec-osf*)
+    # ld works, but does not support shared libraries.
+    # gas doesn't generate exception information.
+    noconfigdirs="$noconfigdirs gas ld"
+    ;;
+  alpha*-*-*vms*)
+    noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss"
+    ;;
+  alpha*-*-*)
+    # newlib is not 64 bit ready
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  sh*-*-pe|mips*-*-pe|*arm-wince-pe)
+    noconfigdirs="$noconfigdirs tcl tk itcl libgui sim"
+    ;;
+  arc-*-*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  arm-*-pe*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  arm-*-riscix*)
+    noconfigdirs="$noconfigdirs ld target-libgloss"
+    ;;
+  c4x-*-* | tic4x-*-*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  tic54x-*-*)
+    noconfigdirs="$noconfigdirs target-libgloss gdb"
+    ;;
+  cr16-*-*)
+    noconfigdirs="$noconfigdirs gdb"
+    ;;
+  d10v-*-*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  d30v-*-*)
+    noconfigdirs="$noconfigdirs gdb"
+    ;;
+  fr30-*-elf*)
+    noconfigdirs="$noconfigdirs gdb"
+    ;;
+  moxie-*-*)
+    noconfigdirs="$noconfigdirs gprof"
+    ;;
+  h8300*-*-*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  h8500-*-*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  hppa1.1-*-osf* | hppa1.1-*-bsd* )
+    ;;
+  hppa*64*-*-linux*)
+    ;;
+  hppa*-*-linux*)
+    ;;
+  hppa*-*-*elf* | \
+  hppa*-*-lites* | \
+  hppa*-*-openbsd* | \
+  hppa*64*-*-*)
+    ;;
+  hppa*-hp-hpux11*)
+    noconfigdirs="$noconfigdirs ld"
+    ;;
+  hppa*-*-pro*)
+    ;;
+  hppa*-*-*)
+    noconfigdirs="$noconfigdirs ld"
+    ;;
+  i960-*-*)
+    noconfigdirs="$noconfigdirs gdb"
+    ;;
+  ia64*-*-elf*)
+    # No gdb support yet.
+    noconfigdirs="$noconfigdirs readline libgui itcl gdb"
+    ;;
+  ia64*-**-hpux*)
+    # No ld support yet.
+    noconfigdirs="$noconfigdirs libgui itcl ld"
+    ;;
+  ia64*-*-*vms*)
+    # No gdb or ld support yet.
+    noconfigdirs="$noconfigdirs readline libgui itcl gdb ld"
+    ;;
+  i[3456789]86-w64-mingw*)
+    ;;
+  i[3456789]86-*-mingw*)
+    target_configdirs="$target_configdirs target-winsup"
+    ;;
+  *-*-cygwin*)
+    target_configdirs="$target_configdirs target-libtermcap target-winsup"
+    noconfigdirs="$noconfigdirs target-libgloss"
+    # always build newlib if winsup directory is present.
+    if test -d "$srcdir/winsup/cygwin"; then
+      skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
+    elif test -d "$srcdir/newlib"; then
+      echo "Warning: winsup/cygwin is missing so newlib can't be built."
+    fi
+    ;;
+  i[3456789]86-*-pe)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  i[3456789]86-*-sco3.2v5*)
+    # The linker does not yet know about weak symbols in COFF,
+    # and is not configured to handle mixed ELF and COFF.
+    noconfigdirs="$noconfigdirs ld target-libgloss"
+    ;;
+  i[3456789]86-*-sco*)
+    noconfigdirs="$noconfigdirs gprof target-libgloss"
+    ;;
+  i[3456789]86-*-solaris2* | x86_64-*-solaris2.1[0-9]*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  i[3456789]86-*-sysv4*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  i[3456789]86-*-beos*)
+    noconfigdirs="$noconfigdirs gdb"
+    ;;
+  i[3456789]86-*-rdos*)
+    noconfigdirs="$noconfigdirs gdb"
+    ;;
+  mmix-*-*)
+    noconfigdirs="$noconfigdirs gdb"
+    ;;
+  mt-*-*)
+    noconfigdirs="$noconfigdirs sim"
+    ;;
+  powerpc-*-aix*)
+    # copied from rs6000-*-* entry
+    noconfigdirs="$noconfigdirs gprof"
+    ;;
+  powerpc*-*-winnt* | powerpc*-*-pe*)
+    target_configdirs="$target_configdirs target-winsup"
+    noconfigdirs="$noconfigdirs gdb tcl tk target-libgloss itcl"
+    # always build newlib.
+    skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
+    ;;
+    # This is temporary until we can link against shared libraries
+  powerpcle-*-solaris*)
+    noconfigdirs="$noconfigdirs gdb sim tcl tk itcl"
+    ;;
+  powerpc-*-beos*)
+    noconfigdirs="$noconfigdirs gdb"
+    ;;
+  rs6000-*-lynxos*)
+    noconfigdirs="$noconfigdirs gprof"
+    ;;
+  rs6000-*-aix*)
+    noconfigdirs="$noconfigdirs gprof"
+    ;;
+  rs6000-*-*)
+    noconfigdirs="$noconfigdirs gprof"
+    ;;
+  m68k-apollo-*)
+    noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss"
+    ;;
+  microblaze*)
+    noconfigdirs="$noconfigdirs gprof"
+    ;;
+  mips*-sde-elf*)
+    if test x$with_newlib = xyes; then
+      noconfigdirs="$noconfigdirs gprof"
+    fi
+    ;;
+  mips*-*-irix5*)
+    noconfigdirs="$noconfigdirs gprof target-libgloss"
+    ;;
+  mips*-*-irix6*)
+    noconfigdirs="$noconfigdirs gprof target-libgloss"
+    ;;
+  mips*-*-bsd*)
+    noconfigdirs="$noconfigdirs gprof target-libgloss"
+    ;;
+  mips*-*-linux*)
+    ;;
+  mips*-*-*)
+    noconfigdirs="$noconfigdirs gprof"
+    ;;
+  sh-*-* | sh64-*-*)
+    case "${target}" in
+      sh*-*-elf)
+         ;;
+      *)
+         noconfigdirs="$noconfigdirs target-libgloss" ;;
+    esac
+    ;;
+  sparc-*-sunos4*)
+    if test x${is_cross_compiler} = xno ; then
+           use_gnu_ld=no
+    fi
+    ;;
+  tic6x-*-*)
+    noconfigdirs="$noconfigdirs sim"
+    ;;
+  tilepro-*-* | tilegx-*-*)
+    noconfigdirs="$noconfigdirs sim"
+    ;;
+  v810-*-*)
+    noconfigdirs="$noconfigdirs bfd binutils gas gdb ld opcodes target-libgloss"
+    ;;
+  vax-*-*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+esac
+
+# If we aren't building newlib, then don't build libgloss, since libgloss
+# depends upon some newlib header files.
+case "${noconfigdirs}" in
+  *target-libgloss*) ;;
+  *target-newlib*) noconfigdirs="$noconfigdirs target-libgloss" ;;
+esac
+
+# Work in distributions that contain no compiler tools, like Autoconf.
+host_makefile_frag=/dev/null
+if test -d ${srcdir}/config ; then
+case "${host}" in
+  i[3456789]86-*-msdosdjgpp*)
+    host_makefile_frag="config/mh-djgpp"
+    ;;
+  *-cygwin*)
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if cat works as expected" >&5
+$as_echo_n "checking to see if cat works as expected... " >&6; }
+echo a >cygwin-cat-check
+if test `cat cygwin-cat-check` = a ; then
+  rm cygwin-cat-check
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  rm cygwin-cat-check
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  as_fn_error "The cat command does not ignore carriage return characters.
+  Please either mount the build directory in binary mode or run the following
+  commands before running any configure script:
+set -o igncr
+export SHELLOPTS
+  " "$LINENO" 5
+fi
+
+    host_makefile_frag="config/mh-cygwin"
+    ;;
+  *-mingw*)
+    host_makefile_frag="config/mh-mingw"
+    ;;
+  *-interix*)
+    host_makefile_frag="config/mh-interix"
+    ;;
+  hppa*-hp-hpux10*)
+    host_makefile_frag="config/mh-pa-hpux10"
+    ;;
+  hppa*-hp-hpux*)
+    host_makefile_frag="config/mh-pa"
+    ;;
+  hppa*-*)
+    host_makefile_frag="config/mh-pa"
+    ;;
+  *-*-darwin*)
+    host_makefile_frag="config/mh-darwin"
+    ;;
+  powerpc-*-aix*)
+    host_makefile_frag="config/mh-ppc-aix"
+    ;;
+  rs6000-*-aix*)
+    host_makefile_frag="config/mh-ppc-aix"
+    ;;
+esac
+fi
+
+if test "${build}" != "${host}" ; then
+  AR_FOR_BUILD=${AR_FOR_BUILD-ar}
+  AS_FOR_BUILD=${AS_FOR_BUILD-as}
+  CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
+  CXX_FOR_BUILD=${CXX_FOR_BUILD-g++}
+  GCJ_FOR_BUILD=${GCJ_FOR_BUILD-gcj}
+  GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran}
+  GOC_FOR_BUILD=${GOC_FOR_BUILD-gccgo}
+  DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool}
+  LD_FOR_BUILD=${LD_FOR_BUILD-ld}
+  NM_FOR_BUILD=${NM_FOR_BUILD-nm}
+  RANLIB_FOR_BUILD=${RANLIB_FOR_BUILD-ranlib}
+  WINDRES_FOR_BUILD=${WINDRES_FOR_BUILD-windres}
+  WINDMC_FOR_BUILD=${WINDMC_FOR_BUILD-windmc}
+else
+  AR_FOR_BUILD="\$(AR)"
+  AS_FOR_BUILD="\$(AS)"
+  CC_FOR_BUILD="\$(CC)"
+  CXX_FOR_BUILD="\$(CXX)"
+  GCJ_FOR_BUILD="\$(GCJ)"
+  GFORTRAN_FOR_BUILD="\$(GFORTRAN)"
+  GOC_FOR_BUILD="\$(GOC)"
+  DLLTOOL_FOR_BUILD="\$(DLLTOOL)"
+  LD_FOR_BUILD="\$(LD)"
+  NM_FOR_BUILD="\$(NM)"
+  RANLIB_FOR_BUILD="\$(RANLIB)"
+  WINDRES_FOR_BUILD="\$(WINDRES)"
+  WINDMC_FOR_BUILD="\$(WINDMC)"
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    rm -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+if test -z "$ac_file"; then :
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
+fi
+ac_exeext=$ac_cv_exeext
+
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+  if { ac_try='./$ac_file'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+ac_clean_files=$ac_clean_files_save
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
+fi
+rm -f conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if test "${ac_cv_objext+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CXX" && break
+  done
+fi
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CXX" && break
+done
+
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CXX=$ac_ct_CXX
+  fi
+fi
+
+  fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    rm -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+else
+  CXXFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# We must set the default linker to the linker used by gcc for the correct
+# operation of libtool.  If LD is not defined and we are using gcc, try to
+# set the LD default to the ld used by gcc.
+if test -z "$LD"; then
+  if test "$GCC" = yes; then
+    case $build in
+    *-*-mingw*)
+      gcc_prog_ld=`$CC -print-prog-name=ld 2>&1 | tr -d '\015'` ;;
+    *)
+      gcc_prog_ld=`$CC -print-prog-name=ld 2>&1` ;;
+    esac
+    case $gcc_prog_ld in
+    # Accept absolute paths.
+    [\\/]* | [A-Za-z]:[\\/]*)
+      LD="$gcc_prog_ld" ;;
+    esac
+  fi
+fi
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gnatbind; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_GNATBIND+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GNATBIND"; then
+  ac_cv_prog_GNATBIND="$GNATBIND" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_GNATBIND="${ac_tool_prefix}gnatbind"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GNATBIND=$ac_cv_prog_GNATBIND
+if test -n "$GNATBIND"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNATBIND" >&5
+$as_echo "$GNATBIND" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_GNATBIND"; then
+  ac_ct_GNATBIND=$GNATBIND
+  # Extract the first word of "gnatbind", so it can be a program name with args.
+set dummy gnatbind; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_GNATBIND+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_GNATBIND"; then
+  ac_cv_prog_ac_ct_GNATBIND="$ac_ct_GNATBIND" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_GNATBIND="gnatbind"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_GNATBIND=$ac_cv_prog_ac_ct_GNATBIND
+if test -n "$ac_ct_GNATBIND"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GNATBIND" >&5
+$as_echo "$ac_ct_GNATBIND" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_GNATBIND" = x; then
+    GNATBIND="no"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    GNATBIND=$ac_ct_GNATBIND
+  fi
+else
+  GNATBIND="$ac_cv_prog_GNATBIND"
+fi
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gnatmake", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gnatmake; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_GNATMAKE+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GNATMAKE"; then
+  ac_cv_prog_GNATMAKE="$GNATMAKE" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_GNATMAKE="${ac_tool_prefix}gnatmake"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GNATMAKE=$ac_cv_prog_GNATMAKE
+if test -n "$GNATMAKE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNATMAKE" >&5
+$as_echo "$GNATMAKE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_GNATMAKE"; then
+  ac_ct_GNATMAKE=$GNATMAKE
+  # Extract the first word of "gnatmake", so it can be a program name with args.
+set dummy gnatmake; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_GNATMAKE+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_GNATMAKE"; then
+  ac_cv_prog_ac_ct_GNATMAKE="$ac_ct_GNATMAKE" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_GNATMAKE="gnatmake"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_GNATMAKE=$ac_cv_prog_ac_ct_GNATMAKE
+if test -n "$ac_ct_GNATMAKE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GNATMAKE" >&5
+$as_echo "$ac_ct_GNATMAKE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_GNATMAKE" = x; then
+    GNATMAKE="no"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    GNATMAKE=$ac_ct_GNATMAKE
+  fi
+else
+  GNATMAKE="$ac_cv_prog_GNATMAKE"
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler driver understands Ada" >&5
+$as_echo_n "checking whether compiler driver understands Ada... " >&6; }
+if test "${acx_cv_cc_gcc_supports_ada+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.adb <<EOF
+procedure conftest is begin null; end conftest;
+EOF
+acx_cv_cc_gcc_supports_ada=no
+# There is a bug in old released versions of GCC which causes the
+# driver to exit successfully when the appropriate language module
+# has not been installed.  This is fixed in 2.95.4, 3.0.2, and 3.1.
+# Therefore we must check for the error message as well as an
+# unsuccessful exit.
+# Other compilers, like HP Tru64 UNIX cc, exit successfully when
+# given a .adb file, but produce no object file.  So we must check
+# if an object file was really produced to guard against this.
+errors=`(${CC} -c conftest.adb) 2>&1 || echo failure`
+if test x"$errors" = x && test -f conftest.$ac_objext; then
+  acx_cv_cc_gcc_supports_ada=yes
+fi
+rm -f conftest.*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_cc_gcc_supports_ada" >&5
+$as_echo "$acx_cv_cc_gcc_supports_ada" >&6; }
+
+if test x$GNATBIND != xno && test x$GNATMAKE != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then
+  have_gnat=yes
+else
+  have_gnat=no
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to compare bootstrapped objects" >&5
+$as_echo_n "checking how to compare bootstrapped objects... " >&6; }
+if test "${gcc_cv_prog_cmp_skip+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+   echo abfoo >t1
+  echo cdfoo >t2
+  gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
+  if cmp t1 t2 2 2 > /dev/null 2>&1; then
+    if cmp t1 t2 1 1 > /dev/null 2>&1; then
+      :
+    else
+      gcc_cv_prog_cmp_skip='cmp $$f1 $$f2 16 16'
+    fi
+  fi
+  if cmp --ignore-initial=2 t1 t2 > /dev/null 2>&1; then
+    if cmp --ignore-initial=1 t1 t2 > /dev/null 2>&1; then
+      :
+    else
+      gcc_cv_prog_cmp_skip='cmp --ignore-initial=16 $$f1 $$f2'
+    fi
+  fi
+  rm t1 t2
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_prog_cmp_skip" >&5
+$as_echo "$gcc_cv_prog_cmp_skip" >&6; }
+do_compare="$gcc_cv_prog_cmp_skip"
+
+
+
+# Check whether --enable-bootstrap was given.
+if test "${enable_bootstrap+set}" = set; then :
+  enableval=$enable_bootstrap;
+else
+  enable_bootstrap=default
+fi
+
+
+# Issue errors and warnings for invalid/strange bootstrap combinations.
+if test -r $srcdir/gcc/configure; then
+  have_compiler=yes
+else
+  have_compiler=no
+fi
+
+case "$have_compiler:$host:$target:$enable_bootstrap" in
+  *:*:*:no) ;;
+
+  # Default behavior.  Enable bootstrap if we have a compiler
+  # and we are in a native configuration.
+  yes:$build:$build:default)
+    enable_bootstrap=yes ;;
+
+  *:*:*:default)
+    enable_bootstrap=no ;;
+
+  # We have a compiler and we are in a native configuration, bootstrap is ok
+  yes:$build:$build:yes)
+    ;;
+
+  # Other configurations, but we have a compiler.  Assume the user knows
+  # what he's doing.
+  yes:*:*:yes)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: trying to bootstrap a cross compiler" >&5
+$as_echo "$as_me: WARNING: trying to bootstrap a cross compiler" >&2;}
+    ;;
+
+  # No compiler: if they passed --enable-bootstrap explicitly, fail
+  no:*:*:yes)
+    as_fn_error "cannot bootstrap without a compiler" "$LINENO" 5 ;;
+
+  # Fail if wrong command line
+  *)
+    as_fn_error "invalid option for --enable-bootstrap" "$LINENO" 5
+    ;;
+esac
+
+# See if we are building gcc with C++.
+# Check whether --enable-build-with-cxx was given.
+if test "${enable_build_with_cxx+set}" = set; then :
+  enableval=$enable_build_with_cxx; ENABLE_BUILD_WITH_CXX=$enableval
+else
+  ENABLE_BUILD_WITH_CXX=no
+fi
+
+
+# Build stage1 with C and build stages 2 and 3 with C++.
+# Check whether --enable-build-poststage1-with-cxx was given.
+if test "${enable_build_poststage1_with_cxx+set}" = set; then :
+  enableval=$enable_build_poststage1_with_cxx; ENABLE_BUILD_POSTSTAGE1_WITH_CXX=$enableval
+else
+  ENABLE_BUILD_POSTSTAGE1_WITH_CXX=yes
+fi
+
+
+# Used for setting $lt_cv_objdir
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if test "${lt_cv_objdir+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
+
+
+
+# Check for GMP, MPFR and MPC
+gmplibs="-lmpc -lmpfr -lgmp"
+gmpinc=
+have_gmp=no
+
+# Specify a location for mpc
+# check for this first so it ends up on the link line before mpfr.
+
+# Check whether --with-mpc was given.
+if test "${with_mpc+set}" = set; then :
+  withval=$with_mpc;
+fi
+
+
+# Check whether --with-mpc-include was given.
+if test "${with_mpc_include+set}" = set; then :
+  withval=$with_mpc_include;
+fi
+
+
+# Check whether --with-mpc-lib was given.
+if test "${with_mpc_lib+set}" = set; then :
+  withval=$with_mpc_lib;
+fi
+
+
+if test "x$with_mpc" != x; then
+  gmplibs="-L$with_mpc/lib $gmplibs"
+  gmpinc="-I$with_mpc/include $gmpinc"
+fi
+if test "x$with_mpc_include" != x; then
+  gmpinc="-I$with_mpc_include $gmpinc"
+fi
+if test "x$with_mpc_lib" != x; then
+  gmplibs="-L$with_mpc_lib $gmplibs"
+fi
+if test "x$with_mpc$with_mpc_include$with_mpc_lib" = x && test -d ${srcdir}/mpc; then
+  gmplibs='-L$$r/$(HOST_SUBDIR)/mpc/src/'"$lt_cv_objdir $gmplibs"
+  gmpinc='-I$$s/mpc/src '"$gmpinc"
+  # Do not test the mpc version.  Assume that it is sufficient, since
+  # it is in the source tree, and the library has not been built yet
+  # but it would be included on the link line in the version check below
+  # hence making the test fail.
+  have_gmp=yes
+fi
+
+# Specify a location for mpfr
+# check for this first so it ends up on the link line before gmp.
+
+# Check whether --with-mpfr-dir was given.
+if test "${with_mpfr_dir+set}" = set; then :
+  withval=$with_mpfr_dir; as_fn_error "The --with-mpfr-dir=PATH option has been removed.
+Use --with-mpfr=PATH or --with-mpfr-include=PATH plus --with-mpfr-lib=PATH" "$LINENO" 5
+fi
+
+
+
+# Check whether --with-mpfr was given.
+if test "${with_mpfr+set}" = set; then :
+  withval=$with_mpfr;
+fi
+
+
+# Check whether --with-mpfr-include was given.
+if test "${with_mpfr_include+set}" = set; then :
+  withval=$with_mpfr_include;
+fi
+
+
+# Check whether --with-mpfr-lib was given.
+if test "${with_mpfr_lib+set}" = set; then :
+  withval=$with_mpfr_lib;
+fi
+
+
+if test "x$with_mpfr" != x; then
+  gmplibs="-L$with_mpfr/lib $gmplibs"
+  gmpinc="-I$with_mpfr/include $gmpinc"
+fi
+if test "x$with_mpfr_include" != x; then
+  gmpinc="-I$with_mpfr_include $gmpinc"
+fi
+if test "x$with_mpfr_lib" != x; then
+  gmplibs="-L$with_mpfr_lib $gmplibs"
+fi
+if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then
+  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs"
+  gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
+  extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir"
+  # Do not test the mpfr version.  Assume that it is sufficient, since
+  # it is in the source tree, and the library has not been built yet
+  # but it would be included on the link line in the version check below
+  # hence making the test fail.
+  have_gmp=yes
+fi
+
+# Specify a location for gmp
+
+# Check whether --with-gmp-dir was given.
+if test "${with_gmp_dir+set}" = set; then :
+  withval=$with_gmp_dir; as_fn_error "The --with-gmp-dir=PATH option has been removed.
+Use --with-gmp=PATH or --with-gmp-include=PATH plus --with-gmp-lib=PATH" "$LINENO" 5
+fi
+
+
+
+# Check whether --with-gmp was given.
+if test "${with_gmp+set}" = set; then :
+  withval=$with_gmp;
+fi
+
+
+# Check whether --with-gmp-include was given.
+if test "${with_gmp_include+set}" = set; then :
+  withval=$with_gmp_include;
+fi
+
+
+# Check whether --with-gmp-lib was given.
+if test "${with_gmp_lib+set}" = set; then :
+  withval=$with_gmp_lib;
+fi
+
+
+
+if test "x$with_gmp" != x; then
+  gmplibs="-L$with_gmp/lib $gmplibs"
+  gmpinc="-I$with_gmp/include $gmpinc"
+fi
+if test "x$with_gmp_include" != x; then
+  gmpinc="-I$with_gmp_include $gmpinc"
+fi
+if test "x$with_gmp_lib" != x; then
+  gmplibs="-L$with_gmp_lib $gmplibs"
+fi
+if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
+  gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir $gmplibs"
+  gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
+  extra_mpfr_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
+  extra_mpc_gmp_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
+  # Do not test the gmp version.  Assume that it is sufficient, since
+  # it is in the source tree, and the library has not been built yet
+  # but it would be included on the link line in the version check below
+  # hence making the test fail.
+  have_gmp=yes
+fi
+
+if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then
+  have_gmp=yes
+  saved_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $gmpinc"
+  # Check for the recommended and required versions of GMP.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the correct version of gmp.h" >&5
+$as_echo_n "checking for the correct version of gmp.h... " >&6; }
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include "gmp.h"
+int
+main ()
+{
+
+  #define GCC_GMP_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+  #define GCC_GMP_VERSION GCC_GMP_VERSION_NUM(__GNU_MP_VERSION,__GNU_MP_VERSION_MINOR,__GNU_MP_VERSION_PATCHLEVEL)
+  #if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4,2,0)
+  choke me
+  #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <gmp.h>
+int
+main ()
+{
+
+  #define GCC_GMP_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+  #define GCC_GMP_VERSION GCC_GMP_VERSION_NUM(__GNU_MP_VERSION,__GNU_MP_VERSION_MINOR,__GNU_MP_VERSION_PATCHLEVEL)
+  #if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4,3,2)
+  choke me
+  #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: buggy but acceptable" >&5
+$as_echo "buggy but acceptable" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; have_gmp=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+  # If we have GMP, check the MPFR version.
+  if test x"$have_gmp" = xyes; then
+    # Check for the recommended and required versions of MPFR.
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the correct version of mpfr.h" >&5
+$as_echo_n "checking for the correct version of mpfr.h... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <gmp.h>
+    #include <mpfr.h>
+int
+main ()
+{
+
+    #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1)
+    choke me
+    #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <gmp.h>
+    #include <mpfr.h>
+int
+main ()
+{
+
+    #if MPFR_VERSION < MPFR_VERSION_NUM(2,4,2)
+    choke me
+    #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: buggy but acceptable" >&5
+$as_echo "buggy but acceptable" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; have_gmp=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  fi
+
+  # Check for the MPC header version.
+  if test x"$have_gmp" = xyes ; then
+    # Check for the recommended and required versions of MPC.
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the correct version of mpc.h" >&5
+$as_echo_n "checking for the correct version of mpc.h... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <mpc.h>
+int
+main ()
+{
+
+    #if MPC_VERSION < MPC_VERSION_NUM(0,8,0)
+    choke me
+    #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <mpc.h>
+int
+main ()
+{
+
+    #if MPC_VERSION < MPC_VERSION_NUM(0,8,1)
+    choke me
+    #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: buggy but acceptable" >&5
+$as_echo "buggy but acceptable" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; have_gmp=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  fi
+
+  # Now check the MPFR library.
+  if test x"$have_gmp" = xyes; then
+    saved_LIBS="$LIBS"
+    LIBS="$LIBS $gmplibs"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the correct version of the gmp/mpfr/mpc libraries" >&5
+$as_echo_n "checking for the correct version of the gmp/mpfr/mpc libraries... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <mpc.h>
+int
+main ()
+{
+
+    mpfr_t n;
+    mpfr_t x;
+    mpc_t c;
+    int t;
+    mpfr_init (n);
+    mpfr_init (x);
+    mpfr_atan2 (n, n, x, GMP_RNDN);
+    mpfr_erfc (n, x, GMP_RNDN);
+    mpfr_subnormalize (x, t, GMP_RNDN);
+    mpfr_clear(n);
+    mpfr_clear(x);
+    mpc_init2 (c, 53);
+    mpc_set_ui_ui (c, 1, 1, MPC_RNDNN);
+    mpc_cosh (c, c, MPC_RNDNN);
+    mpc_pow (c, c, c, MPC_RNDNN);
+    mpc_acosh (c, c, MPC_RNDNN);
+    mpc_clear (c);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; have_gmp=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LIBS="$saved_LIBS"
+  fi
+
+  CFLAGS="$saved_CFLAGS"
+
+# The library versions listed in the error message below should match
+# the HARD-minimums enforced above.
+  if test x$have_gmp != xyes; then
+    as_fn_error "Building GCC requires GMP 4.2+, MPFR 2.3.1+ and MPC 0.8.0+.
+Try the --with-gmp, --with-mpfr and/or --with-mpc options to specify
+their locations.  Source code for these libraries can be found at
+their respective hosting sites as well as at
+ftp://gcc.gnu.org/pub/gcc/infrastructure/.  See also
+http://gcc.gnu.org/install/prerequisites.html for additional info.  If
+you obtained GMP, MPFR and/or MPC from a vendor distribution package,
+make sure that you have installed both the libraries and the header
+files.  They may be located in separate packages." "$LINENO" 5
+  fi
+fi
+
+# Flags needed for both GMP, MPFR and/or MPC.
+
+
+
+
+
+
+# Allow host libstdc++ to be specified for static linking with PPL.
+
+# Check whether --with-host-libstdcxx was given.
+if test "${with_host_libstdcxx+set}" = set; then :
+  withval=$with_host_libstdcxx;
+fi
+
+
+case $with_host_libstdcxx in
+  no|yes)
+    as_fn_error "-with-host-libstdcxx needs an argument" "$LINENO" 5
+    ;;
+esac
+
+# Linker flags to use for stage1 or when not boostrapping.
+
+# Check whether --with-stage1-ldflags was given.
+if test "${with_stage1_ldflags+set}" = set; then :
+  withval=$with_stage1_ldflags; if test "$withval" = "no" -o "$withval" = "yes"; then
+   stage1_ldflags=
+ else
+   stage1_ldflags=$withval
+ fi
+else
+  stage1_ldflags=
+fi
+
+
+
+# Libraries to use for stage1 or when not bootstrapping.
+
+# Check whether --with-stage1-libs was given.
+if test "${with_stage1_libs+set}" = set; then :
+  withval=$with_stage1_libs; if test "$withval" = "no" -o "$withval" = "yes"; then
+   stage1_libs=
+ else
+   stage1_libs=$withval
+ fi
+else
+  stage1_libs=$with_host_libstdcxx
+fi
+
+
+
+# Libraries to use for stage2 and later builds.  This defaults to the
+# argument passed to --with-host-libstdcxx.
+
+# Check whether --with-boot-libs was given.
+if test "${with_boot_libs+set}" = set; then :
+  withval=$with_boot_libs; if test "$withval" = "no" -o "$withval" = "yes"; then
+   poststage1_libs=
+ else
+   poststage1_libs=$withval
+ fi
+else
+  poststage1_libs=$with_host_libstdcxx
+fi
+
+
+
+# Linker flags to use for stage2 and later builds.
+
+# Check whether --with-boot-ldflags was given.
+if test "${with_boot_ldflags+set}" = set; then :
+  withval=$with_boot_ldflags; if test "$withval" = "no" -o "$withval" = "yes"; then
+   poststage1_ldflags=
+ else
+   poststage1_ldflags=$withval
+ fi
+else
+  poststage1_ldflags=
+ # In stages 2 and 3, default to linking libstdc++ and libgcc
+ # statically.  But if the user explicitly specified the libraries to
+ # use, trust that they are doing what they want.
+ if test "$poststage1_libs" = ""; then
+   poststage1_ldflags="-static-libstdc++ -static-libgcc"
+ fi
+fi
+
+
+
+# Check for PPL
+ppllibs=
+pplinc=
+pwllib=
+
+
+# Check whether --with-ppl was given.
+if test "${with_ppl+set}" = set; then :
+  withval=$with_ppl;
+fi
+
+
+# Check whether --with-ppl-include was given.
+if test "${with_ppl_include+set}" = set; then :
+  withval=$with_ppl_include;
+fi
+
+
+# Check whether --with-ppl-lib was given.
+if test "${with_ppl_lib+set}" = set; then :
+  withval=$with_ppl_lib;
+fi
+
+
+# Check whether --enable-ppl-version-check was given.
+if test "${enable_ppl_version_check+set}" = set; then :
+  enableval=$enable_ppl_version_check;
+fi
+
+
+case $with_ppl in
+  yes | no | "")
+    ;;
+  *)
+    ppllibs="-L$with_ppl/lib"
+    pplinc="-I$with_ppl/include $pplinc"
+    if test -d "$with_ppl/lib" && test -d "$with_ppl/include"; then
+      with_ppl=yes
+    else
+      as_fn_error "cannot find directories \"$with_ppl/lib\" or \"$with_ppl/include\"" "$LINENO" 5
+    fi
+    ;;
+esac
+
+if test x"$with_ppl_include" != x; then
+  pplinc="-I$with_ppl_include $pplinc"
+  with_ppl=yes
+fi
+
+if test "x$with_ppl_lib" != x; then
+  ppllibs="-L$with_ppl_lib"
+  with_ppl=yes
+fi
+
+if test x"$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
+  if test x"$enable_watchdog" = xyes; then
+    pwllib="-lpwl"
+  fi
+  ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/interfaces/C/'"$lt_cv_objdir"' -L$$r/$(HOST_SUBDIR)/ppl/src/'"$lt_cv_objdir"
+  pplinc='-I$$r/$(HOST_SUBDIR)/ppl/src -I$$r/$(HOST_SUBDIR)/ppl/interfaces/C '
+  enable_ppl_version_check=no
+  with_ppl=yes
+fi
+
+if test "x$with_ppl" != xno; then
+  if test "x$pwllib" = x; then
+    saved_LIBS="$LIBS"
+    LIBS="$LIBS $ppllibs -lstdc++ -lm"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PWL_handle_timeout in -lpwl" >&5
+$as_echo_n "checking for PWL_handle_timeout in -lpwl... " >&6; }
+if test "${ac_cv_lib_pwl_PWL_handle_timeout+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpwl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char PWL_handle_timeout ();
+int
+main ()
+{
+return PWL_handle_timeout ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_pwl_PWL_handle_timeout=yes
+else
+  ac_cv_lib_pwl_PWL_handle_timeout=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pwl_PWL_handle_timeout" >&5
+$as_echo "$ac_cv_lib_pwl_PWL_handle_timeout" >&6; }
+if test "x$ac_cv_lib_pwl_PWL_handle_timeout" = x""yes; then :
+  pwllib="-lpwl"
+fi
+
+    LIBS="$saved_LIBS"
+  fi
+
+  ppllibs="$ppllibs -lppl_c -lppl $pwllib -lgmpxx"
+
+  if test "$enable_ppl_version_check" != no; then
+    saved_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $pplinc $gmpinc"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.11 (revision 0 or later) of PPL" >&5
+$as_echo_n "checking for version 0.11 (revision 0 or later) of PPL... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include "ppl_c.h"
+int
+main ()
+{
+
+    #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11
+    choke me
+    #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; ppllibs= ; pplinc= ; with_ppl=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    CFLAGS="$saved_CFLAGS"
+  fi
+fi
+
+# Flags needed for PPL
+
+
+
+
+# Check for CLOOG
+
+
+
+# Check whether --with-cloog was given.
+if test "${with_cloog+set}" = set; then :
+  withval=$with_cloog;
+fi
+
+
+# Check whether --with-cloog-include was given.
+if test "${with_cloog_include+set}" = set; then :
+  withval=$with_cloog_include;
+fi
+
+
+# Check whether --with-cloog-lib was given.
+if test "${with_cloog_lib+set}" = set; then :
+  withval=$with_cloog_lib;
+fi
+
+
+  # Check whether --enable-cloog-backend was given.
+if test "${enable_cloog_backend+set}" = set; then :
+  enableval=$enable_cloog_backend;  if   test "x${enableval}" = "xisl"; then
+	cloog_backend=isl
+      elif test "x${enableval}" = "xppl"; then
+	cloog_backend=ppl
+      else
+	cloog_backend=ppl-legacy
+      fi
+else
+  cloog_backend=ppl-legacy
+fi
+
+  # Check whether --enable-cloog-version-check was given.
+if test "${enable_cloog_version_check+set}" = set; then :
+  enableval=$enable_cloog_version_check; ENABLE_CLOOG_CHECK=$enableval
+else
+  ENABLE_CLOOG_CHECK=yes
+fi
+
+
+  # Initialize clooglibs and clooginc.
+  case $with_cloog in
+    no)
+      clooglibs=
+      clooginc=
+      ;;
+    "" | yes)
+      ;;
+    *)
+      clooglibs="-L$with_cloog/lib"
+      clooginc="-I$with_cloog/include"
+      ;;
+  esac
+  if test "x${with_cloog_include}" != x ; then
+    clooginc="-I$with_cloog_include"
+  fi
+  if test "x${with_cloog_lib}" != x; then
+    clooglibs="-L$with_cloog_lib"
+  fi
+
+
+
+
+
+if test "x$with_ppl" = "xno"; then
+
+
+
+  if test "x${with_cloog}" = xno; then
+    graphite_requested=no
+  elif test "x${with_cloog}" != x \
+    || test "x${with_cloog_include}" != x \
+    || test "x${with_cloog_lib}" != x ; then
+    graphite_requested=yes
+  else
+    graphite_requested=no
+  fi
+
+
+  if test "${graphite_requested}" = yes; then
+    as_fn_error "Unable to find a usable PPL.  See config.log for details." "$LINENO" 5
+  fi
+  with_cloog=no
+fi
+if test "x${with_cloog}" = x && test "x${with_cloog_include}" = x \
+  && test "x${with_cloog_lib}" = x && test -d ${srcdir}/cloog; then
+  clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' '
+  clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include '
+fi
+if test "x$with_cloog" != "xno"; then
+
+
+
+  _cloog_saved_CFLAGS=$CFLAGS
+  _cloog_saved_CPPFLAGS=$CPPFLAGS
+  _cloog_saved_LDFLAGS=$LDFLAGS
+  _cloog_saved_LIBS=$LIBS
+
+  _cloogorginc="-DCLOOG_INT_GMP -DCLOOG_ORG"
+
+    CFLAGS="${CFLAGS} ${clooginc} ${gmpinc}"
+  CPPFLAGS="${CPPFLAGS} ${_cloogorginc}"
+  LDFLAGS="${LDFLAGS} ${clooglibs}"
+
+  case $cloog_backend in
+    "ppl-legacy")
+    CFLAGS="${CFLAGS} ${pplinc}"
+    LDFLAGS="${LDFLAGS} ${ppllibs}"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG PPL Legacy" >&5
+$as_echo_n "checking for installed CLooG PPL Legacy... " >&6; }
+if test "${gcc_cv_cloog_type+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  LIBS="-lcloog ${_cloog_saved_LIBS}"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include "cloog/cloog.h"
+int
+main ()
+{
+#ifndef CLOOG_PPL_BACKEND
+    choke me
+   #endif
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gcc_cv_cloog_type="PPL Legacy"
+else
+  gcc_cv_cloog_type=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type" >&5
+$as_echo "$gcc_cv_cloog_type" >&6; }
+    ;;
+    "isl")
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG ISL" >&5
+$as_echo_n "checking for installed CLooG ISL... " >&6; }
+if test "${gcc_cv_cloog_type+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  LIBS="-lcloog-isl ${_cloog_saved_LIBS}"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include "cloog/cloog.h"
+int
+main ()
+{
+cloog_version ()
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gcc_cv_cloog_type="ISL"
+else
+  gcc_cv_cloog_type=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type" >&5
+$as_echo "$gcc_cv_cloog_type" >&6; }
+    ;;
+    "ppl")
+    CFLAGS="${CFLAGS} ${pplinc}"
+    LDFLAGS="${LDFLAGS} ${ppllibs}"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG PPL" >&5
+$as_echo_n "checking for installed CLooG PPL... " >&6; }
+if test "${gcc_cv_cloog_type+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  LIBS="-lcloog-ppl ${_cloog_saved_LIBS}"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include "cloog/cloog.h"
+   #include "cloog/ppl/cloog.h"
+int
+main ()
+{
+cloog_version ()
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gcc_cv_cloog_type="PPL"
+else
+  gcc_cv_cloog_type=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type" >&5
+$as_echo "$gcc_cv_cloog_type" >&6; }
+    ;;
+    *)
+      gcc_cv_cloog_type=""
+  esac
+
+  case $gcc_cv_cloog_type in
+    "PPL Legacy")
+      clooginc="${clooginc}"
+      clooglibs="${clooglibs} -lcloog"
+      cloog_org=no
+      ;;
+    "ISL")
+      clooginc="${clooginc} ${_cloogorginc}"
+      clooglibs="${clooglibs} -lcloog-isl -lisl"
+      cloog_org=yes
+      ;;
+    "PPL")
+      clooginc="${clooginc} ${_cloogorginc}"
+      clooglibs="${clooglibs} -lcloog-ppl"
+      cloog_org=yes
+      ;;
+    *)
+      clooglibs=
+      clooginc=
+      cloog_org=
+      ;;
+  esac
+
+  LIBS=$_cloog_saved_LIBS
+  CFLAGS=$_cloog_saved_CFLAGS
+  CPPFLAGS=$_cloog_saved_CPPFLAGS
+  LDFLAGS=$_cloog_saved_LDFLAGS
+
+
+
+
+
+  if test "${ENABLE_CLOOG_CHECK}" = yes ; then
+    _cloog_saved_CFLAGS=$CFLAGS
+    _cloog_saved_LDFLAGS=$LDFLAGS
+
+    CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${pplinc} ${gmpinc}"
+    LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
+
+    if test "${cloog_org}" = yes ; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
+$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
+if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include "cloog/cloog.h"
+int
+main ()
+{
+#if CLOOG_VERSION_MAJOR != 0 \
+    || CLOOG_VERSION_MINOR != 16 \
+    || CLOOG_VERSION_REVISION < 1
+    choke me
+   #endif
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gcc_cv_cloog_ct_0_14_0=yes
+else
+  gcc_cv_cloog_ct_0_14_0=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_ct_0_14_0" >&5
+$as_echo "$gcc_cv_cloog_ct_0_14_0" >&6; }
+    elif test "${cloog_org}" = no ; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.15.5 (or later revision) of CLooG" >&5
+$as_echo_n "checking for version 0.15.5 (or later revision) of CLooG... " >&6; }
+if test "${gcc_cv_cloog_ct_0_15_5+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include "cloog/cloog.h"
+int
+main ()
+{
+#if CLOOG_VERSION_MAJOR != 0 \
+    || CLOOG_VERSION_MINOR != 15 \
+    || CLOOG_VERSION_REVISION < 5
+    choke me
+   #endif
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include "cloog/cloog.h"
+int
+main ()
+{
+#if CLOOG_VERSION_MAJOR != 0 \
+    || CLOOG_VERSION_MINOR != 15 \
+    || CLOOG_VERSION_REVISION < 9
+    choke me
+   #endif
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gcc_cv_cloog_ct_0_15_5=yes
+else
+  gcc_cv_cloog_ct_0_15_5="buggy but acceptable"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  gcc_cv_cloog_ct_0_15_5=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_ct_0_15_5" >&5
+$as_echo "$gcc_cv_cloog_ct_0_15_5" >&6; }
+    fi
+
+    CFLAGS=$_cloog_saved_CFLAGS
+    LDFLAGS=$_cloog_saved_LDFLAGS
+  fi
+
+
+
+
+
+
+
+  if test "x${with_cloog}" = xno; then
+    graphite_requested=no
+  elif test "x${with_cloog}" != x \
+    || test "x${with_cloog_include}" != x \
+    || test "x${with_cloog_lib}" != x ; then
+    graphite_requested=yes
+  else
+    graphite_requested=no
+  fi
+
+
+
+  if test "${gcc_cv_cloog_ct_0_14_0}" = no \
+    || test "${gcc_cv_cloog_rt_0_14_0}" = no \
+    || test "${gcc_cv_cloog_ct_0_15_5}" = no; then
+    clooglibs=
+    clooginc=
+  fi
+
+  if test "${graphite_requested}" = yes \
+    && test "x${clooglibs}" = x \
+    && test "x${clooginc}" = x ; then
+
+    as_fn_error "Unable to find a usable CLooG.  See config.log for details." "$LINENO" 5
+  fi
+
+
+fi
+
+# Check for LTO support.
+# Check whether --enable-lto was given.
+if test "${enable_lto+set}" = set; then :
+  enableval=$enable_lto; enable_lto=$enableval
+else
+  enable_lto=yes; default_enable_lto=yes
+fi
+
+
+
+
+
+target_elf=no
+case $target in
+  *-darwin* | *-aix* | *-cygwin* | *-mingw* | *-aout* | *-*coff* | \
+  *-msdosdjgpp* | *-vms* | *-wince* | *-*-pe* | \
+  alpha*-dec-osf* | *-interix* | hppa[12]*-*-hpux*)
+    target_elf=no
+    ;;
+  *)
+    target_elf=yes
+    ;;
+esac
+
+if test $target_elf = yes; then :
+  # ELF platforms build the lto-plugin always.
+  build_lto_plugin=yes
+
+else
+  if test x"$default_enable_lto" = x"yes" ; then
+    case $target in
+      *-apple-darwin9* | *-cygwin* | *-mingw*) ;;
+      # On other non-ELF platforms, LTO has yet to be validated.
+      *) enable_lto=no ;;
+    esac
+  else
+  # Apart from ELF platforms, only Windows and Darwin support LTO so far.
+  # It would also be nice to check the binutils support, but we don't
+  # have gcc_GAS_CHECK_FEATURE available here.  For now, we'll just
+  # warn during gcc/ subconfigure; unless you're bootstrapping with
+  # -flto it won't be needed until after installation anyway.
+    case $target in
+      *-cygwin* | *-mingw* | *-apple-darwin*) ;;
+      *) if test x"$enable_lto" = x"yes"; then
+	as_fn_error "LTO support is not enabled for this target." "$LINENO" 5
+        fi
+      ;;
+    esac
+  fi
+  # Among non-ELF, only Windows platforms support the lto-plugin so far.
+  # Build it unless LTO was explicitly disabled.
+  case $target in
+    *-cygwin* | *-mingw*) build_lto_plugin=$enable_lto ;;
+    *) ;;
+  esac
+
+fi
+
+
+
+# By default, C is the only stage 1 language.
+stage1_languages=,c,
+
+# Target libraries that we bootstrap.
+bootstrap_target_libs=,target-libgcc,
+
+# Figure out what language subdirectories are present.
+# Look if the user specified --enable-languages="..."; if not, use
+# the environment variable $LANGUAGES if defined. $LANGUAGES might
+# go away some day.
+# NB:  embedded tabs in this IF block -- do not untabify
+if test -d ${srcdir}/gcc; then
+  if test x"${enable_languages+set}" != xset; then
+    if test x"${LANGUAGES+set}" = xset; then
+      enable_languages="${LANGUAGES}"
+        echo configure.in: warning: setting LANGUAGES is deprecated, use --enable-languages instead 1>&2
+    else
+      enable_languages=all
+    fi
+  else
+    if test x"${enable_languages}" = x ||
+       test x"${enable_languages}" = xyes;
+       then
+      echo configure.in: --enable-languages needs at least one language argument 1>&2
+      exit 1
+    fi
+  fi
+  enable_languages=`echo "${enable_languages}" | sed -e 's/[ 	,][ 	,]*/,/g' -e 's/,$//'`
+
+  # 'f95' is the old name for the 'fortran' language. We issue a warning
+  # and make the substitution.
+  case ,${enable_languages}, in
+    *,f95,*)
+      echo configure.in: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2
+      enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'`
+      ;;
+  esac
+
+  # If bootstrapping, then using --enable-build-with-cxx or
+  # --enable-build-poststage1-with-cxx requires enabling C++.
+  case ",$enable_languages,:,$ENABLE_BUILD_WITH_CXX,$ENABLE_BUILD_POSTSTAGE1_WITH_CXX,:$enable_bootstrap" in
+    *,c++,*:*:*) ;;
+    *:*,yes,*:yes)
+      if test -f ${srcdir}/gcc/cp/config-lang.in; then
+        enable_languages="${enable_languages},c++"
+      else
+        as_fn_error "bootstrapping with --enable-build-with-cxx or --enable-build-poststage1-with-cxx requires c++ sources" "$LINENO" 5
+      fi
+      ;;
+  esac
+
+  # First scan to see if an enabled language requires some other language.
+  # We assume that a given config-lang.in will list all the language
+  # front ends it requires, even if some are required indirectly.
+  for lang_frag in ${srcdir}/gcc/*/config-lang.in .. ; do
+    case ${lang_frag} in
+      ..) ;;
+      # The odd quoting in the next line works around
+      # an apparent bug in bash 1.12 on linux.
+      ${srcdir}/gcc/[*]/config-lang.in) ;;
+      *)
+        # From the config-lang.in, get $language, $lang_requires, and
+        # $lang_requires_boot_languages.
+        language=
+        lang_requires=
+        lang_requires_boot_languages=
+        . ${lang_frag}
+        for other in ${lang_requires} ${lang_requires_boot_languages}; do
+          case ,${enable_languages}, in
+	    *,$other,*) ;;
+	    *,all,*) ;;
+	    *,$language,*)
+	      echo " \`$other' language required by \`$language'; enabling" 1>&2
+	      enable_languages="${enable_languages},${other}"
+	      ;;
+	  esac
+        done
+	for other in ${lang_requires_boot_languages} ; do
+	  if test "$other" != "c"; then
+	    case ,${enable_stage1_languages}, in
+	      *,$other,*) ;;
+	      *,all,*) ;;
+	      *)
+		case ,${enable_languages}, in
+		  *,$language,*)
+		    echo " '$other' language required by '$language' in stage 1; enabling" 1>&2
+		    enable_stage1_languages="$enable_stage1_languages,${other}"
+		    ;;
+		esac
+		;;
+	    esac
+          fi
+        done
+        ;;
+    esac
+  done
+
+  new_enable_languages=,c,
+
+  # If LTO is enabled, add the LTO front end.
+  extra_host_libiberty_configure_flags=
+  if test "$enable_lto" = "yes" ; then
+    case ,${enable_languages}, in
+      *,lto,*) ;;
+      *) enable_languages="${enable_languages},lto" ;;
+    esac
+    if test "${build_lto_plugin}" = "yes" ; then
+      configdirs="$configdirs lto-plugin"
+      extra_host_libiberty_configure_flags=--enable-shared
+    fi
+  fi
+
+
+  missing_languages=`echo ",$enable_languages," | sed -e s/,all,/,/ -e s/,c,/,/ `
+  potential_languages=,c,
+
+  enabled_target_libs=
+  disabled_target_libs=
+
+  for lang_frag in ${srcdir}/gcc/*/config-lang.in .. ; do
+    case ${lang_frag} in
+      ..) ;;
+      # The odd quoting in the next line works around
+      # an apparent bug in bash 1.12 on linux.
+      ${srcdir}/gcc/[*]/config-lang.in) ;;
+      *)
+        # From the config-lang.in, get $language, $target_libs,
+        # $lang_dirs, $boot_language, and $build_by_default
+        language=
+        target_libs=
+        lang_dirs=
+        subdir_requires=
+        boot_language=no
+        build_by_default=yes
+        . ${lang_frag}
+        if test x${language} = x; then
+          echo "${lang_frag} doesn't set \$language." 1>&2
+          exit 1
+        fi
+
+	if test "$language" = "c++"; then
+	  if test "$ENABLE_BUILD_WITH_CXX" = "yes" \
+	     || test "$ENABLE_BUILD_POSTSTAGE1_WITH_CXX" = "yes"; then
+	    boot_language=yes
+	  fi
+	fi
+
+        case ,${enable_languages}, in
+          *,${language},*)
+            # Language was explicitly selected; include it.
+            add_this_lang=yes
+            ;;
+          *,all,*)
+            # 'all' was selected, select it if it is a default language
+            add_this_lang=${build_by_default}
+            ;;
+          *)
+            add_this_lang=no
+            ;;
+        esac
+
+        # Disable languages that need other directories if these aren't available.
+	for i in $subdir_requires; do
+	  test -f "$srcdir/gcc/$i/config-lang.in" && continue
+	  case ,${enable_languages}, in
+            *,${language},*)
+              # Specifically requested language; tell them.
+              as_fn_error "The gcc/$i directory contains parts of $language but is missing" "$LINENO" 5
+              ;;
+            *)
+              # Silently disable.
+              add_this_lang=unsupported
+              ;;
+          esac
+	done
+
+        # Disable Ada if no preexisting GNAT is available.
+        case ,${enable_languages},:${language}:${have_gnat} in
+          *,${language},*:ada:no)
+            # Specifically requested language; tell them.
+            as_fn_error "GNAT is required to build $language" "$LINENO" 5
+            ;;
+          *:ada:no)
+            # Silently disable.
+            add_this_lang=unsupported
+            ;;
+        esac
+
+	# Disable a language that is unsupported by the target.
+	case " $unsupported_languages " in
+	  *" $language "*)
+	    add_this_lang=unsupported
+	    ;;
+	esac
+
+	case $add_this_lang in
+	  unsupported)
+            # Remove language-dependent dirs.
+	    disabled_target_libs="$disabled_target_libs $target_libs"
+	    noconfigdirs="$noconfigdirs $lang_dirs"
+	    ;;
+	  no)
+            # Remove language-dependent dirs; still show language as supported.
+	    disabled_target_libs="$disabled_target_libs $target_libs"
+	    noconfigdirs="$noconfigdirs $lang_dirs"
+            potential_languages="${potential_languages}${language},"
+	    ;;
+          yes)
+	    new_enable_languages="${new_enable_languages}${language},"
+            potential_languages="${potential_languages}${language},"
+	    missing_languages=`echo "$missing_languages" | sed "s/,$language,/,/"`
+	    enabled_target_libs="$enabled_target_libs $target_libs"
+	    case "${boot_language}:,$enable_stage1_languages," in
+	      yes:* | *:*,$language,* | *:*,yes, | *:*,all,)
+		# Add to (comma-separated) list of stage 1 languages.
+		case ",$stage1_languages," in
+		  *,$language,* | ,yes, | ,all,) ;;
+		  *) stage1_languages="${stage1_languages}${language}," ;;
+		esac
+		# We need to bootstrap any supporting libraries.
+		bootstrap_target_libs="${bootstrap_target_libs}${target_libs},"
+		;;
+	    esac
+	    ;;
+        esac
+        ;;
+    esac
+  done
+
+  # Add target libraries which are only needed for disabled languages
+  # to noconfigdirs.
+  if test -n "$disabled_target_libs"; then
+    for dir in $disabled_target_libs; do
+      case " $enabled_target_libs " in
+      *" ${dir} "*) ;;
+      *) noconfigdirs="$noconfigdirs $dir" ;;
+      esac
+    done
+  fi
+
+  # Check whether --enable-stage1-languages was given.
+if test "${enable_stage1_languages+set}" = set; then :
+  enableval=$enable_stage1_languages; case ,${enable_stage1_languages}, in
+    ,no,|,,)
+      # Set it to something that will have no effect in the loop below
+      enable_stage1_languages=c ;;
+    ,yes,)
+      enable_stage1_languages=`echo $new_enable_languages | \
+	sed -e "s/^,//" -e "s/,$//" ` ;;
+    *,all,*)
+      enable_stage1_languages=`echo ,$enable_stage1_languages, | \
+	sed -e "s/,all,/$new_enable_languages/" -e "s/^,//" -e "s/,$//" ` ;;
+  esac
+
+  # Add "good" languages from enable_stage1_languages to stage1_languages,
+  # while "bad" languages go in missing_languages.  Leave no duplicates.
+  for i in `echo $enable_stage1_languages | sed 's/,/ /g' `; do
+    case $potential_languages in
+      *,$i,*)
+        case $stage1_languages in
+          *,$i,*) ;;
+          *) stage1_languages="$stage1_languages$i," ;;
+        esac ;;
+      *)
+        case $missing_languages in
+          *,$i,*) ;;
+          *) missing_languages="$missing_languages$i," ;;
+        esac ;;
+     esac
+  done
+fi
+
+
+  # Remove leading/trailing commas that were added for simplicity
+  potential_languages=`echo "$potential_languages" | sed -e "s/^,//" -e "s/,$//"`
+  missing_languages=`echo "$missing_languages" | sed -e "s/^,//" -e "s/,$//"`
+  stage1_languages=`echo "$stage1_languages" | sed -e "s/^,//" -e "s/,$//"`
+  new_enable_languages=`echo "$new_enable_languages" | sed -e "s/^,//" -e "s/,$//"`
+
+  if test "x$missing_languages" != x; then
+    as_fn_error "
+The following requested languages could not be built: ${missing_languages}
+Supported languages are: ${potential_languages}" "$LINENO" 5
+  fi
+  if test "x$new_enable_languages" != "x$enable_languages"; then
+    echo The following languages will be built: ${new_enable_languages}
+    enable_languages="$new_enable_languages"
+  fi
+
+
+  ac_configure_args=`echo " $ac_configure_args" | sed -e "s/ '--enable-languages=[^ ]*'//g" -e "s/$/ '--enable-languages="$enable_languages"'/" `
+fi
+
+# Handle --disable-<component> generically.
+for dir in $configdirs $build_configdirs $target_configdirs ; do
+  dirname=`echo $dir | sed -e s/target-//g -e s/build-//g -e s/-/_/g`
+  varname=`echo $dirname | sed -e s/+/_/g`
+  if eval test x\${enable_${varname}} "=" xno ; then
+    noconfigdirs="$noconfigdirs $dir"
+  fi
+done
+
+# Check for Boehm's garbage collector
+# Check whether --enable-objc-gc was given.
+if test "${enable_objc_gc+set}" = set; then :
+  enableval=$enable_objc_gc; case ,${enable_languages},:${enable_objc_gc}:${noconfigdirs} in
+  *,objc,*:*:yes:*target-boehm-gc*)
+    as_fn_error "Boehm's garbage collector was requested yet not supported in this configuration" "$LINENO" 5
+    ;;
+esac
+fi
+
+
+# Make sure we only build Boehm's garbage collector if required.
+case ,${enable_languages},:${enable_objc_gc} in
+  *,objc,*:yes)
+    # Keep target-boehm-gc if requested for Objective-C.
+    ;;
+  *)
+    # Otherwise remove target-boehm-gc depending on target-libjava.
+    if echo " ${noconfigdirs} " | grep "target-libjava" >/dev/null 2>&1; then
+      noconfigdirs="$noconfigdirs target-boehm-gc"
+    fi
+    ;;
+esac
+
+# Remove the entries in $skipdirs and $noconfigdirs from $configdirs,
+# $build_configdirs and $target_configdirs.
+# If we have the source for $noconfigdirs entries, add them to $notsupp.
+
+notsupp=""
+for dir in . $skipdirs $noconfigdirs ; do
+  dirname=`echo $dir | sed -e s/target-//g -e s/build-//g`
+  if test $dir != .  && echo " ${configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
+    configdirs=`echo " ${configdirs} " | sed -e "s/ ${dir} / /"`
+    if test -r $srcdir/$dirname/configure ; then
+      if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then
+	true
+      else
+	notsupp="$notsupp $dir"
+      fi
+    fi
+  fi
+  if test $dir != .  && echo " ${build_configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
+    build_configdirs=`echo " ${build_configdirs} " | sed -e "s/ ${dir} / /"`
+    if test -r $srcdir/$dirname/configure ; then
+      if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then
+	true
+      else
+	notsupp="$notsupp $dir"
+      fi
+    fi
+  fi
+  if test $dir != . && echo " ${target_configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
+    target_configdirs=`echo " ${target_configdirs} " | sed -e "s/ ${dir} / /"`
+    if test -r $srcdir/$dirname/configure ; then
+      if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then
+	true
+      else
+	notsupp="$notsupp $dir"
+      fi
+    fi
+  fi
+done
+
+# Quietly strip out all directories which aren't configurable in this tree.
+# This relies on all configurable subdirectories being autoconfiscated, which
+# is now the case.
+build_configdirs_all="$build_configdirs"
+build_configdirs=
+for i in ${build_configdirs_all} ; do
+  j=`echo $i | sed -e s/build-//g`
+  if test -f ${srcdir}/$j/configure ; then
+    build_configdirs="${build_configdirs} $i"
+  fi
+done
+
+configdirs_all="$configdirs"
+configdirs=
+for i in ${configdirs_all} ; do
+  if test -f ${srcdir}/$i/configure ; then
+    configdirs="${configdirs} $i"
+  fi
+done
+
+target_configdirs_all="$target_configdirs"
+target_configdirs=
+for i in ${target_configdirs_all} ; do
+  j=`echo $i | sed -e s/target-//g`
+  if test -f ${srcdir}/$j/configure ; then
+    target_configdirs="${target_configdirs} $i"
+  fi
+done
+
+# Produce a warning message for the subdirs we can't configure.
+# This isn't especially interesting in the Cygnus tree, but in the individual
+# FSF releases, it's important to let people know when their machine isn't
+# supported by the one or two programs in a package.
+
+if test -n "${notsupp}" && test -z "${norecursion}" ; then
+  # If $appdirs is non-empty, at least one of those directories must still
+  # be configured, or we error out.  (E.g., if the gas release supports a
+  # specified target in some subdirs but not the gas subdir, we shouldn't
+  # pretend that all is well.)
+  if test -n "$appdirs" ; then
+    for dir in $appdirs ; do
+      if test -r $dir/Makefile.in ; then
+	if echo " ${configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
+	  appdirs=""
+	  break
+	fi
+	if echo " ${target_configdirs} " | grep " target-${dir} " >/dev/null 2>&1; then
+	  appdirs=""
+	  break
+	fi
+      fi
+    done
+    if test -n "$appdirs" ; then
+      echo "*** This configuration is not supported by this package." 1>&2
+      exit 1
+    fi
+  fi
+  # Okay, some application will build, or we don't care to check.  Still
+  # notify of subdirs not getting built.
+  echo "*** This configuration is not supported in the following subdirectories:" 1>&2
+  echo "    ${notsupp}" 1>&2
+  echo "    (Any other directories should still work fine.)" 1>&2
+fi
+
+case "$host" in
+  *msdosdjgpp*)
+    enable_gdbtk=no ;;
+esac
+
+# To find our prefix, in gcc_cv_tool_prefix.
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+
+
+if test "x$exec_prefix" = xNONE; then
+        if test "x$prefix" = xNONE; then
+                gcc_cv_tool_prefix=$ac_default_prefix
+        else
+                gcc_cv_tool_prefix=$prefix
+        fi
+else
+        gcc_cv_tool_prefix=$exec_prefix
+fi
+
+# If there is no compiler in the tree, use the PATH only.  In any
+# case, if there is no compiler in the tree nobody should use
+# AS_FOR_TARGET and LD_FOR_TARGET.
+if test x$host = x$build && test -f $srcdir/gcc/BASE-VER; then
+    gcc_version=`cat $srcdir/gcc/BASE-VER`
+    gcc_cv_tool_dirs="$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
+    gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical$PATH_SEPARATOR"
+    gcc_cv_tool_dirs="$gcc_cv_tool_dirs/usr/lib/gcc/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
+    gcc_cv_tool_dirs="$gcc_cv_tool_dirs/usr/lib/gcc/$target_noncanonical$PATH_SEPARATOR"
+    gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
+    gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/$target_noncanonical/bin$PATH_SEPARATOR"
+else
+    gcc_cv_tool_dirs=
+fi
+
+if test x$build = x$target && test -n "$md_exec_prefix"; then
+        gcc_cv_tool_dirs="$gcc_cv_tool_dirs$md_exec_prefix$PATH_SEPARATOR"
+fi
+
+
+
+copy_dirs=
+
+
+# Check whether --with-build-sysroot was given.
+if test "${with_build_sysroot+set}" = set; then :
+  withval=$with_build_sysroot; if test x"$withval" != x ; then
+     SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval"
+   fi
+else
+  SYSROOT_CFLAGS_FOR_TARGET=
+fi
+
+
+
+
+# Check whether --with-debug-prefix-map was given.
+if test "${with_debug_prefix_map+set}" = set; then :
+  withval=$with_debug_prefix_map; if test x"$withval" != x; then
+     DEBUG_PREFIX_CFLAGS_FOR_TARGET=
+     for debug_map in $withval; do
+       DEBUG_PREFIX_CFLAGS_FOR_TARGET="$DEBUG_PREFIX_CFLAGS_FOR_TARGET -fdebug-prefix-map=$debug_map"
+     done
+   fi
+else
+  DEBUG_PREFIX_CFLAGS_FOR_TARGET=
+fi
+
+
+
+# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
+# might be empty or "-g".  We don't require a C++ compiler, so CXXFLAGS
+# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
+# We want to ensure that TARGET libraries (which we know are built with
+# gcc) are built with "-O2 -g", so include those options when setting
+# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
+if test "x$CFLAGS_FOR_TARGET" = x; then
+  CFLAGS_FOR_TARGET=$CFLAGS
+  case " $CFLAGS " in
+    *" -O2 "*) ;;
+    *) CFLAGS_FOR_TARGET="-O2 $CFLAGS" ;;
+  esac
+  case " $CFLAGS " in
+    *" -g "* | *" -g3 "*) ;;
+    *) CFLAGS_FOR_TARGET="-g $CFLAGS" ;;
+  esac
+fi
+
+
+if test "x$CXXFLAGS_FOR_TARGET" = x; then
+  CXXFLAGS_FOR_TARGET=$CXXFLAGS
+  case " $CXXFLAGS " in
+    *" -O2 "*) ;;
+    *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS" ;;
+  esac
+  case " $CXXFLAGS " in
+    *" -g "* | *" -g3 "*) ;;
+    *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS" ;;
+  esac
+fi
+
+
+
+
+# Handle --with-headers=XXX.  If the value is not "yes", the contents of
+# the named directory are copied to $(tooldir)/sys-include.
+if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
+  if test x${is_cross_compiler} = xno ; then
+    echo 1>&2 '***' --with-headers is only supported when cross compiling
+    exit 1
+  fi
+  if test x"${with_headers}" != xyes ; then
+    x=${gcc_cv_tool_prefix}
+    copy_dirs="${copy_dirs} ${with_headers} $x/${target_noncanonical}/sys-include"
+  fi
+fi
+
+# Handle --with-libs=XXX.  If the value is not "yes", the contents of
+# the name directories are copied to $(tooldir)/lib.  Multiple directories
+# are permitted.
+if test x"${with_libs}" != x && test x"${with_libs}" != xno ; then
+  if test x${is_cross_compiler} = xno ; then
+    echo 1>&2 '***' --with-libs is only supported when cross compiling
+    exit 1
+  fi
+  if test x"${with_libs}" != xyes ; then
+    # Copy the libraries in reverse order, so that files in the first named
+    # library override files in subsequent libraries.
+    x=${gcc_cv_tool_prefix}
+    for l in ${with_libs}; do
+      copy_dirs="$l $x/${target_noncanonical}/lib ${copy_dirs}"
+    done
+  fi
+fi
+
+# Set with_gnu_as, with_gnu_ld, and with_system_zlib as appropriate.
+#
+# This is done by determining whether or not the appropriate directory
+# is available, and by checking whether or not specific configurations
+# have requested that this magic not happen.
+#
+# The command line options always override the explicit settings in
+# configure.in, and the settings in configure.in override this magic.
+#
+# If the default for a toolchain is to use GNU as and ld, and you don't
+# want to do that, then you should use the --without-gnu-as and
+# --without-gnu-ld options for the configure script.  Similarly, if
+# the default is to use the included zlib and you don't want to do that,
+# you should use the --with-system-zlib option for the configure script.
+
+if test x${use_gnu_as} = x &&
+   echo " ${configdirs} " | grep " gas " > /dev/null 2>&1 ; then
+  with_gnu_as=yes
+  extra_host_args="$extra_host_args --with-gnu-as"
+fi
+
+if test x${use_gnu_ld} = x &&
+   echo " ${configdirs} " | egrep " (go)?ld " > /dev/null 2>&1 ; then
+  with_gnu_ld=yes
+  extra_host_args="$extra_host_args --with-gnu-ld"
+fi
+
+if test x${use_included_zlib} = x &&
+   echo " ${configdirs} " | grep " zlib " > /dev/null 2>&1 ; then
+  :
+else
+  with_system_zlib=yes
+  extra_host_args="$extra_host_args --with-system-zlib"
+fi
+
+# If using newlib, add --with-newlib to the extra_host_args so that gcc/configure
+# can detect this case.
+
+if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 ; then
+  with_newlib=yes
+  extra_host_args="$extra_host_args --with-newlib"
+fi
+
+# Handle ${copy_dirs}
+set fnord ${copy_dirs}
+shift
+while test $# != 0 ; do
+  if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then
+    :
+  else
+    echo Copying $1 to $2
+
+    # Use the install script to create the directory and all required
+    # parent directories.
+    if test -d $2 ; then
+      :
+    else
+      echo >config.temp
+      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
+    fi
+
+    # Copy the directory, assuming we have tar.
+    # FIXME: Should we use B in the second tar?  Not all systems support it.
+    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
+
+    # It is the responsibility of the user to correctly adjust all
+    # symlinks.  If somebody can figure out how to handle them correctly
+    # here, feel free to add the code.
+
+    echo $1 > $2/COPIED
+  fi
+  shift; shift
+done
+
+# Determine a target-dependent exec_prefix that the installed
+# gcc will search in.  Keep this list sorted by triplet, with
+# the *-*-osname triplets last.
+md_exec_prefix=
+case "${target}" in
+  i[34567]86-pc-msdosdjgpp*)
+    md_exec_prefix=/dev/env/DJDIR/bin
+    ;;
+  *-*-hpux* | \
+  *-*-nto-qnx* | \
+  *-*-solaris2*)
+    md_exec_prefix=/usr/ccs/bin
+    ;;
+esac
+
+extra_arflags_for_target=
+extra_nmflags_for_target=
+extra_ranlibflags_for_target=
+target_makefile_frag=/dev/null
+case "${target}" in
+  spu-*-*)
+    target_makefile_frag="config/mt-spu"
+    ;;
+  mips*-sde-elf*)
+    target_makefile_frag="config/mt-sde"
+    ;;
+  mipsisa*-*-elfoabi*)
+    target_makefile_frag="config/mt-mips-elfoabi"
+    ;;
+  mips*-*-*linux* | mips*-*-gnu*)
+    target_makefile_frag="config/mt-mips-gnu"
+    ;;
+  *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
+    target_makefile_frag="config/mt-gnu"
+    ;;
+  *-*-aix4.[3456789]* | *-*-aix[56789].*)
+    # nm and ar from AIX 4.3 and above require -X32_64 flag to all ar and nm
+    # commands to handle both 32-bit and 64-bit objects.  These flags are
+    # harmless if we're using GNU nm or ar.
+    extra_arflags_for_target=" -X32_64"
+    extra_nmflags_for_target=" -B -X32_64"
+    ;;
+  *-*-darwin[3-9]*)
+    # ranlib before Darwin10 requires the -c flag to look at common symbols.
+    extra_ranlibflags_for_target=" -c"
+    ;;
+esac
+
+alphaieee_frag=/dev/null
+case $target in
+  alpha*-*-*)
+    # This just makes sure to use the -mieee option to build target libs.
+    # This should probably be set individually by each library.
+    alphaieee_frag="config/mt-alphaieee"
+    ;;
+esac
+
+# If --enable-target-optspace always use -Os instead of -O2 to build
+# the target libraries, similarly if it is not specified, use -Os
+# on selected platforms.
+ospace_frag=/dev/null
+case "${enable_target_optspace}:${target}" in
+  yes:*)
+    ospace_frag="config/mt-ospace"
+    ;;
+  :d30v-*)
+    ospace_frag="config/mt-d30v"
+    ;;
+  :m32r-* | :d10v-* | :fr30-*)
+    ospace_frag="config/mt-ospace"
+    ;;
+  no:* | :*)
+    ;;
+  *)
+    echo "*** bad value \"${enable_target_optspace}\" for --enable-target-optspace flag; ignored" 1>&2
+    ;;
+esac
+
+# Default to using --with-stabs for certain targets.
+if test x${with_stabs} = x ; then
+  case "${target}" in
+  mips*-*-irix[56]*)
+    ;;
+  mips*-*-* | alpha*-*-osf*)
+    with_stabs=yes;
+    extra_host_args="${extra_host_args} --with-stabs"
+    ;;
+  esac
+fi
+
+# Some systems (e.g., one of the i386-aix systems the gas testers are
+# using) don't handle "\$" correctly, so don't use it here.
+tooldir='${exec_prefix}'/${target_noncanonical}
+build_tooldir=${tooldir}
+
+# Create a .gdbinit file which runs the one in srcdir
+# and tells GDB to look there for source files.
+
+if test -r ${srcdir}/.gdbinit ; then
+  case ${srcdir} in
+    .) ;;
+    *) cat > ./.gdbinit <<EOF
+# ${NO_EDIT}
+dir ${srcdir}
+dir .
+source ${srcdir}/.gdbinit
+EOF
+    ;;
+  esac
+fi
+
+# Make sure that the compiler is able to generate an executable.  If it
+# can't, we are probably in trouble.  We don't care whether we can run the
+# executable--we might be using a cross compiler--we only care whether it
+# can be created.  At this point the main configure script has set CC.
+we_are_ok=no
+echo "int main () { return 0; }" > conftest.c
+${CC} -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c
+if test $? = 0 ; then
+  if test -s conftest || test -s conftest.exe ; then
+    we_are_ok=yes
+  fi
+fi
+case $we_are_ok in
+  no)
+    echo 1>&2 "*** The command '${CC} -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c' failed."
+    echo 1>&2 "*** You must set the environment variable CC to a working compiler."
+    rm -f conftest*
+    exit 1
+    ;;
+esac
+rm -f conftest*
+
+# Decide which environment variable is used to find dynamic libraries.
+case "${host}" in
+  *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;;
+  *-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
+  *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;;
+  *) RPATH_ENVVAR=LD_LIBRARY_PATH ;;
+esac
+
+# On systems where the dynamic library environment variable is PATH,
+# gcc/ will put dynamic libraries into a subdirectory to avoid adding
+# built executables to PATH.
+if test "$RPATH_ENVVAR" = PATH; then
+  GCC_SHLIB_SUBDIR=/shlib
+else
+  GCC_SHLIB_SUBDIR=
+fi
+
+# Record target_configdirs and the configure arguments for target and
+# build configuration in Makefile.
+target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'`
+build_configdirs=`echo "${build_configdirs}" | sed -e 's/build-//g'`
+
+# If we are building libgomp, bootstrap it.
+if echo " ${target_configdirs} " | grep " libgomp " > /dev/null 2>&1 ; then
+  bootstrap_target_libs=${bootstrap_target_libs}target-libgomp,
+fi
+
+# Determine whether gdb needs tk/tcl or not.
+# Use 'maybe' since enable_gdbtk might be true even if tk isn't available
+# and in that case we want gdb to be built without tk.  Ugh!
+# In fact I believe gdb is the *only* package directly dependent on tk,
+# so we should be able to put the 'maybe's in unconditionally and
+# leave out the maybe dependencies when enable_gdbtk is false.  I'm not
+# 100% sure that that's safe though.
+
+gdb_tk="maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-libgui"
+case "$enable_gdbtk" in
+  no)
+    GDB_TK="" ;;
+  yes)
+    GDB_TK="${gdb_tk}" ;;
+  *)
+    # Only add the dependency on gdbtk when GDBtk is part of the gdb
+    # distro.  Eventually someone will fix this and move Insight, nee
+    # gdbtk to a separate directory.
+    if test -d ${srcdir}/gdb/gdbtk ; then
+      GDB_TK="${gdb_tk}"
+    else
+      GDB_TK=""
+    fi
+    ;;
+esac
+CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g`
+INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g`
+
+# Strip out unwanted targets.
+
+# While at that, we remove Makefiles if we were started for recursive
+# configuration, so that the top-level Makefile reconfigures them,
+# like we used to do when configure itself was recursive.
+
+# Loop over modules.  We used to use the "$extrasub" feature from Autoconf
+# but now we're fixing up the Makefile ourselves with the additional
+# commands passed to AC_CONFIG_FILES.  Use separate variables
+# extrasub-{build,host,target} not because there is any reason to split
+# the substitutions up that way, but only to remain below the limit of
+# 99 commands in a script, for HP-UX sed.
+# Do not nest @if/@endif pairs, because configure will not warn you at all.
+
+case "$enable_bootstrap:$ENABLE_GOLD: $configdirs :,$stage1_languages," in
+  yes:yes:*\ gold\ *:*,c++,*) ;;
+  yes:yes:*\ gold\ *:*)
+    as_fn_error "in a combined tree, bootstrapping with --enable-gold requires c++ in stage1_languages" "$LINENO" 5
+    ;;
+esac
+
+# Adjust the toplevel makefile according to whether bootstrap was selected.
+case $enable_bootstrap in
+  yes)
+    bootstrap_suffix=bootstrap
+    BUILD_CONFIG=bootstrap-debug
+    ;;
+  no)
+    bootstrap_suffix=no-bootstrap
+    BUILD_CONFIG=
+    ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for default BUILD_CONFIG" >&5
+$as_echo_n "checking for default BUILD_CONFIG... " >&6; }
+
+
+# Check whether --with-build-config was given.
+if test "${with_build_config+set}" = set; then :
+  withval=$with_build_config; case $with_build_config in
+   yes) with_build_config= ;;
+   no) with_build_config= BUILD_CONFIG= ;;
+   esac
+fi
+
+
+if test "x${with_build_config}" != x; then
+  BUILD_CONFIG=$with_build_config
+else
+  case $BUILD_CONFIG in
+  bootstrap-debug)
+    if echo "int f (void) { return 0; }" > conftest.c &&
+       ${CC} -c conftest.c &&
+       mv conftest.o conftest.o.g0 &&
+       ${CC} -c -g conftest.c &&
+       mv conftest.o conftest.o.g &&
+       ${srcdir}/contrib/compare-debug conftest.o.g0 conftest.o.g > /dev/null 2>&1; then
+      :
+    else
+      BUILD_CONFIG=
+    fi
+    rm -f conftest.c conftest.o conftest.o.g0 conftest.o.g
+    ;;
+  esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CONFIG" >&5
+$as_echo "$BUILD_CONFIG" >&6; }
+
+
+extrasub_build=
+for module in ${build_configdirs} ; do
+  if test -z "${no_recursion}" \
+     && test -f ${build_subdir}/${module}/Makefile; then
+    echo 1>&2 "*** removing ${build_subdir}/${module}/Makefile to force reconfigure"
+    rm -f ${build_subdir}/${module}/Makefile
+  fi
+  extrasub_build="$extrasub_build
+/^@if build-$module\$/d
+/^@endif build-$module\$/d
+/^@if build-$module-$bootstrap_suffix\$/d
+/^@endif build-$module-$bootstrap_suffix\$/d"
+done
+extrasub_host=
+for module in ${configdirs} ; do
+  if test -z "${no_recursion}"; then
+    for file in stage*-${module}/Makefile prev-${module}/Makefile ${module}/Makefile; do
+      if test -f ${file}; then
+	echo 1>&2 "*** removing ${file} to force reconfigure"
+	rm -f ${file}
+      fi
+    done
+  fi
+  extrasub_host="$extrasub_host
+/^@if $module\$/d
+/^@endif $module\$/d
+/^@if $module-$bootstrap_suffix\$/d
+/^@endif $module-$bootstrap_suffix\$/d"
+done
+extrasub_target=
+for module in ${target_configdirs} ; do
+  if test -z "${no_recursion}" \
+     && test -f ${target_subdir}/${module}/Makefile; then
+    echo 1>&2 "*** removing ${target_subdir}/${module}/Makefile to force reconfigure"
+    rm -f ${target_subdir}/${module}/Makefile
+  fi
+
+  # We only bootstrap target libraries listed in bootstrap_target_libs.
+  case $bootstrap_target_libs in
+    *,target-$module,*) target_bootstrap_suffix=$bootstrap_suffix ;;
+    *) target_bootstrap_suffix=no-bootstrap ;;
+  esac
+
+  extrasub_target="$extrasub_target
+/^@if target-$module\$/d
+/^@endif target-$module\$/d
+/^@if target-$module-$target_bootstrap_suffix\$/d
+/^@endif target-$module-$target_bootstrap_suffix\$/d"
+done
+
+# Do the final fixup along with target modules.
+extrasub_target="$extrasub_target
+/^@if /,/^@endif /d"
+
+# Create the serialization dependencies.  This uses a temporary file.
+
+# Check whether --enable-serial-configure was given.
+if test "${enable_serial_configure+set}" = set; then :
+  enableval=$enable_serial_configure;
+fi
+
+
+case ${enable_serial_configure} in
+  yes)
+    enable_serial_build_configure=yes
+    enable_serial_host_configure=yes
+    enable_serial_target_configure=yes
+    ;;
+esac
+
+# These force 'configure's to be done one at a time, to avoid problems
+# with contention over a shared config.cache.
+rm -f serdep.tmp
+echo '# serdep.tmp' > serdep.tmp
+olditem=
+test "x${enable_serial_build_configure}" = xyes &&
+for item in ${build_configdirs} ; do
+  case ${olditem} in
+    "") ;;
+    *) echo "configure-build-${item}: configure-build-${olditem}" >> serdep.tmp ;;
+  esac
+  olditem=${item}
+done
+olditem=
+test "x${enable_serial_host_configure}" = xyes &&
+for item in ${configdirs} ; do
+  case ${olditem} in
+    "") ;;
+    *) echo "configure-${item}: configure-${olditem}" >> serdep.tmp ;;
+  esac
+  olditem=${item}
+done
+olditem=
+test "x${enable_serial_target_configure}" = xyes &&
+for item in ${target_configdirs} ; do
+  case ${olditem} in
+    "") ;;
+    *) echo "configure-target-${item}: configure-target-${olditem}" >> serdep.tmp ;;
+  esac
+  olditem=${item}
+done
+serialization_dependencies=serdep.tmp
+
+
+# Base args.  Strip norecursion, cache-file, srcdir, host, build,
+# target, nonopt, and variable assignments.  These are the ones we
+# might not want to pass down to subconfigures.  The exception being
+# --cache-file=/dev/null, which is used to turn off the use of cache
+# files altogether, and which should be passed on to subconfigures.
+# Also strip program-prefix, program-suffix, and program-transform-name,
+# so that we can pass down a consistent program-transform-name.
+baseargs=
+tbaseargs=
+keep_next=no
+skip_next=no
+eval "set -- $ac_configure_args"
+for ac_arg
+do
+  if test X"$skip_next" = X"yes"; then
+    skip_next=no
+    continue
+  fi
+  if test X"$keep_next" = X"yes"; then
+    case $ac_arg in
+      *\'*)
+	ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    baseargs="$baseargs '$ac_arg'"
+    tbaseargs="$tbaseargs '$ac_arg'"
+    keep_next=no
+    continue
+  fi
+
+  # Handle separated arguments.  Based on the logic generated by
+  # autoconf 2.59.
+  case $ac_arg in
+    *=* | --config-cache | -C | -disable-* | --disable-* \
+      | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+      | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+      | -with-* | --with-* | -without-* | --without-* | --x)
+      separate_arg=no
+      ;;
+    -*)
+      separate_arg=yes
+      ;;
+    *)
+      separate_arg=no
+      ;;
+  esac
+
+  skip_targ=no
+  case $ac_arg in
+
+  --with-* | --without-*)
+    libopt=`echo "$ac_arg" | sed -e 's,^--[^-_]*[-_],,' -e 's,=.*$,,'`
+
+    case $libopt in
+    *[-_]include)
+      lib=`echo "$libopt" | sed 's,[-_]include$,,'`
+      ;;
+    *[-_]lib)
+      lib=`echo "$libopt" | sed 's,[-_]lib$,,'`
+      ;;
+    *)
+      lib=$libopt
+      ;;
+    esac
+
+
+    case $lib in
+    mpc | mpfr | gmp | ppl | cloog)
+      # If we're processing --with-$lib, --with-$lib-include or
+      # --with-$lib-lib, for one of the libs above, and target is
+      # different from host, don't pass the current argument to any
+      # target library's configure.
+      if test x$is_cross_compiler = xyes; then
+        skip_targ=yes
+      fi
+      ;;
+    esac
+    ;;
+  esac
+
+  case "$ac_arg" in
+    --cache-file=/dev/null | \
+    -cache-file=/dev/null )
+      # Handled here to avoid the test to skip args below.
+      baseargs="$baseargs '$ac_arg'"
+      tbaseargs="$tbaseargs '$ac_arg'"
+      # Assert: $separate_arg should always be no.
+      keep_next=$separate_arg
+      ;;
+    --no*)
+      continue
+      ;;
+    --c* | \
+    --sr* | \
+    --ho* | \
+    --bu* | \
+    --t* | \
+    --program-* | \
+    -cache_file* | \
+    -srcdir* | \
+    -host* | \
+    -build* | \
+    -target* | \
+    -program-prefix* | \
+    -program-suffix* | \
+    -program-transform-name* )
+      skip_next=$separate_arg
+      continue
+      ;;
+    -*)
+      # An option.  Add it.
+      case $ac_arg in
+	*\'*)
+	  ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      esac
+      baseargs="$baseargs '$ac_arg'"
+      if test X"$skip_targ" = Xno; then
+        tbaseargs="$tbaseargs '$ac_arg'"
+      fi
+      keep_next=$separate_arg
+      ;;
+    *)
+      # Either a variable assignment, or a nonopt (triplet).  Don't
+      # pass it down; let the Makefile handle this.
+      continue
+      ;;
+  esac
+done
+# Remove the initial space we just introduced and, as these will be
+# expanded by make, quote '$'.
+baseargs=`echo "x$baseargs" | sed -e 's/^x *//' -e 's,\\$,$$,g'`
+
+# Add in --program-transform-name, after --program-prefix and
+# --program-suffix have been applied to it.  Autoconf has already
+# doubled dollar signs and backslashes in program_transform_name; we want
+# the backslashes un-doubled, and then the entire thing wrapped in single
+# quotes, because this will be expanded first by make and then by the shell.
+# Also, because we want to override the logic in subdir configure scripts to
+# choose program_transform_name, replace any s,x,x, with s,y,y,.
+sed -e "s,\\\\\\\\,\\\\,g; s,','\\\\'',g; s/s,x,x,/s,y,y,/" <<EOF_SED > conftestsed.out
+${program_transform_name}
+EOF_SED
+gcc_transform_name=`cat conftestsed.out`
+rm -f conftestsed.out
+baseargs="$baseargs --program-transform-name='${gcc_transform_name}'"
+tbaseargs="$tbaseargs --program-transform-name='${gcc_transform_name}'"
+if test "$silent" = yes; then
+  baseargs="$baseargs --silent"
+  tbaseargs="$tbaseargs --silent"
+fi
+baseargs="$baseargs --disable-option-checking"
+tbaseargs="$tbaseargs --disable-option-checking"
+
+# Record and document user additions to sub configure arguments.
+
+
+
+
+# For the build-side libraries, we just need to pretend we're native,
+# and not use the same cache file.  Multilibs are neither needed nor
+# desired.
+build_configargs="$build_configargs --cache-file=../config.cache ${baseargs}"
+
+# For host modules, accept cache file option, or specification as blank.
+case "${cache_file}" in
+"") # empty
+  cache_file_option="" ;;
+/* | [A-Za-z]:[\\/]* ) # absolute path
+  cache_file_option="--cache-file=${cache_file}" ;;
+*) # relative path
+  cache_file_option="--cache-file=../${cache_file}" ;;
+esac
+
+# Host dirs don't like to share a cache file either, horribly enough.
+# This seems to be due to autoconf 2.5x stupidity.
+host_configargs="$host_configargs --cache-file=./config.cache ${extra_host_args} ${baseargs}"
+
+target_configargs="$target_configargs ${tbaseargs}"
+
+# Passing a --with-cross-host argument lets the target libraries know
+# whether they are being built with a cross-compiler or being built
+# native.  However, it would be better to use other mechanisms to make the
+# sorts of decisions they want to make on this basis.  Please consider
+# this option to be deprecated.  FIXME.
+if test x${is_cross_compiler} = xyes ; then
+  target_configargs="--with-cross-host=${host_noncanonical} ${target_configargs}"
+fi
+
+# Default to --enable-multilib.
+if test x${enable_multilib} = x ; then
+  target_configargs="--enable-multilib ${target_configargs}"
+fi
+
+# Pass --with-newlib if appropriate.  Note that target_configdirs has
+# changed from the earlier setting of with_newlib.
+if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " newlib " > /dev/null 2>&1 && test -d ${srcdir}/newlib ; then
+  target_configargs="--with-newlib ${target_configargs}"
+fi
+
+# Different target subdirs use different values of certain variables
+# (notably CXX).  Worse, multilibs use *lots* of different values.
+# Worse yet, autoconf 2.5x makes some of these 'precious', meaning that
+# it doesn't automatically accept command-line overrides of them.
+# This means it's not safe for target subdirs to share a cache file,
+# which is disgusting, but there you have it.  Hopefully this can be
+# fixed in future.  It's still worthwhile to use a cache file for each
+# directory.  I think.
+
+# Pass the appropriate --build, --host, --target and --cache-file arguments.
+# We need to pass --target, as newer autoconf's requires consistency
+# for target_alias and gcc doesn't manage it consistently.
+target_configargs="--cache-file=./config.cache ${target_configargs}"
+
+FLAGS_FOR_TARGET=
+case " $target_configdirs " in
+ *" newlib "*)
+  case " $target_configargs " in
+  *" --with-newlib "*)
+   case "$target" in
+    *-cygwin*)
+      FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -L$$r/$(TARGET_SUBDIR)/winsup/w32api/lib -isystem $$s/winsup/include -isystem $$s/winsup/cygwin/include -isystem $$s/winsup/w32api/include'
+      ;;
+   esac
+
+   # If we're not building GCC, don't discard standard headers.
+   if test -d ${srcdir}/gcc; then
+     FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -nostdinc'
+
+     if test "${build}" != "${host}"; then
+       # On Canadian crosses, CC_FOR_TARGET will have already been set
+       # by `configure', so we won't have an opportunity to add -Bgcc/
+       # to it.  This is right: we don't want to search that directory
+       # for binaries, but we want the header files in there, so add
+       # them explicitly.
+       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include -isystem $$r/$(HOST_SUBDIR)/gcc/include-fixed'
+
+       # Someone might think of using the pre-installed headers on
+       # Canadian crosses, in case the installed compiler is not fully
+       # compatible with the compiler being built.  In this case, it
+       # would be better to flag an error than risking having
+       # incompatible object files being constructed.  We can't
+       # guarantee that an error will be flagged, but let's hope the
+       # compiler will do it, when presented with incompatible header
+       # files.
+     fi
+   fi
+
+   case "${target}-${is_cross_compiler}" in
+   i[3456789]86-*-linux*-no)
+      # Here host == target, so we don't need to build gcc,
+      # so we don't want to discard standard headers.
+      FLAGS_FOR_TARGET=`echo " $FLAGS_FOR_TARGET " | sed -e 's/ -nostdinc / /'`
+      ;;
+   *)
+      # If we're building newlib, use its generic headers last, but search
+      # for any libc-related directories first (so make it the last -B
+      # switch).
+      FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/$(TARGET_SUBDIR)/newlib/ -isystem $$r/$(TARGET_SUBDIR)/newlib/targ-include -isystem $$s/newlib/libc/include'
+
+      # If we're building libgloss, find the startup file, simulator library
+      # and linker script.
+      case " $target_configdirs " in
+	*" libgloss "*)
+	# Look for startup file, simulator library and maybe linker script.
+	FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/$(TARGET_SUBDIR)/libgloss/'"$libgloss_dir"
+	# Look for libnosys.a in case the target needs it.
+	FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/libgloss/libnosys'
+	# Most targets have the linker script in the source directory.
+	FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$s/libgloss/'"$libgloss_dir"
+	;;
+      esac
+      ;;
+   esac
+   ;;
+  esac
+  ;;
+esac
+
+case "$target" in
+  x86_64-*mingw* | *-w64-mingw*)
+  # MinGW-w64 does not use newlib, nor does it use winsup. It may,
+  # however, use a symlink named 'mingw' in ${prefix} .
+    FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L${prefix}/${target}/lib -L${prefix}/mingw/lib -isystem ${prefix}/${target}/include -isystem ${prefix}/mingw/include'
+    ;;
+  *-mingw*)
+  # MinGW can't be handled as Cygwin above since it does not use newlib.
+    FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/mingw -L$$r/$(TARGET_SUBDIR)/winsup/w32api/lib -isystem $$s/winsup/mingw/include -isystem $$s/winsup/w32api/include'
+    ;;
+esac
+
+# Allow the user to override the flags for
+# our build compiler if desired.
+if test x"${build}" = x"${host}" ; then
+  CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
+  CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
+  LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
+fi
+
+# On Canadian crosses, we'll be searching the right directories for
+# the previously-installed cross compiler, so don't bother to add
+# flags for directories within the install tree of the compiler
+# being built; programs in there won't even run.
+if test "${build}" = "${host}" && test -d ${srcdir}/gcc; then
+  # Search for pre-installed headers if nothing else fits.
+  FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$(build_tooldir)/bin/ -B$(build_tooldir)/lib/ -isystem $(build_tooldir)/include -isystem $(build_tooldir)/sys-include'
+fi
+
+if test "x${use_gnu_ld}" = x &&
+   echo " ${configdirs} " | grep " ld " > /dev/null ; then
+  # Arrange for us to find uninstalled linker scripts.
+  FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(HOST_SUBDIR)/ld'
+fi
+
+# Search for other target-specific linker scripts and such.
+case "${target}" in
+  mep*)
+    FLAGS_FOR_TARGET="$FLAGS_FOR_TARGET -mlibrary"
+    ;;
+esac
+
+# Makefile fragments.
+for frag in host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag;
+do
+  eval fragval=\$$frag
+  if test $fragval != /dev/null; then
+    eval $frag=${srcdir}/$fragval
+  fi
+done
+
+
+
+
+
+# Miscellanea: directories, flags, etc.
+
+
+
+
+
+
+
+
+# Build module lists & subconfigure args.
+
+
+
+# Host module lists & subconfigure args.
+
+
+
+
+# Target module lists & subconfigure args.
+
+
+
+# Build tools.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Generate default definitions for YACC, M4, LEX and other programs that run
+# on the build machine.  These are used if the Makefile can't locate these
+# programs in objdir.
+MISSING=`cd $ac_aux_dir && ${PWDCMD-pwd}`/missing
+
+for ac_prog in 'bison -y' byacc yacc
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_YACC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$YACC"; then
+  ac_cv_prog_YACC="$YACC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_YACC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+YACC=$ac_cv_prog_YACC
+if test -n "$YACC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
+$as_echo "$YACC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$YACC" && break
+done
+test -n "$YACC" || YACC="$MISSING bison -y"
+
+case " $build_configdirs " in
+  *" bison "*) YACC='$$r/$(BUILD_SUBDIR)/bison/tests/bison -y' ;;
+esac
+
+for ac_prog in bison
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_BISON+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$BISON"; then
+  ac_cv_prog_BISON="$BISON" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_BISON="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+BISON=$ac_cv_prog_BISON
+if test -n "$BISON"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5
+$as_echo "$BISON" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$BISON" && break
+done
+test -n "$BISON" || BISON="$MISSING bison"
+
+case " $build_configdirs " in
+  *" bison "*) BISON='$$r/$(BUILD_SUBDIR)/bison/tests/bison' ;;
+esac
+
+for ac_prog in gm4 gnum4 m4
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_M4+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$M4"; then
+  ac_cv_prog_M4="$M4" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_M4="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+M4=$ac_cv_prog_M4
+if test -n "$M4"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $M4" >&5
+$as_echo "$M4" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$M4" && break
+done
+test -n "$M4" || M4="$MISSING m4"
+
+case " $build_configdirs " in
+  *" m4 "*) M4='$$r/$(BUILD_SUBDIR)/m4/m4' ;;
+esac
+
+for ac_prog in flex lex
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LEX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LEX"; then
+  ac_cv_prog_LEX="$LEX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LEX="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LEX=$ac_cv_prog_LEX
+if test -n "$LEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
+$as_echo "$LEX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$LEX" && break
+done
+test -n "$LEX" || LEX="$MISSING flex"
+
+case " $build_configdirs " in
+  *" flex "*) LEX='$$r/$(BUILD_SUBDIR)/flex/flex' ;;
+  *" lex "*) LEX='$$r/$(BUILD_SUBDIR)/lex/lex' ;;
+esac
+
+for ac_prog in flex
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_FLEX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$FLEX"; then
+  ac_cv_prog_FLEX="$FLEX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_FLEX="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+FLEX=$ac_cv_prog_FLEX
+if test -n "$FLEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5
+$as_echo "$FLEX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$FLEX" && break
+done
+test -n "$FLEX" || FLEX="$MISSING flex"
+
+case " $build_configdirs " in
+  *" flex "*) FLEX='$$r/$(BUILD_SUBDIR)/flex/flex' ;;
+esac
+
+for ac_prog in makeinfo
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_MAKEINFO+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MAKEINFO"; then
+  ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_MAKEINFO="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MAKEINFO=$ac_cv_prog_MAKEINFO
+if test -n "$MAKEINFO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKEINFO" >&5
+$as_echo "$MAKEINFO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$MAKEINFO" && break
+done
+test -n "$MAKEINFO" || MAKEINFO="$MISSING makeinfo"
+
+case " $build_configdirs " in
+  *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
+  *)
+
+    # For an installed makeinfo, we require it to be from texinfo 4.7 or
+    # higher, else we use the "missing" dummy.
+    if ${MAKEINFO} --version \
+       | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+      :
+    else
+      MAKEINFO="$MISSING makeinfo"
+    fi
+    ;;
+
+esac
+
+# FIXME: expect and dejagnu may become build tools?
+
+for ac_prog in expect
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_EXPECT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$EXPECT"; then
+  ac_cv_prog_EXPECT="$EXPECT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_EXPECT="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+EXPECT=$ac_cv_prog_EXPECT
+if test -n "$EXPECT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXPECT" >&5
+$as_echo "$EXPECT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$EXPECT" && break
+done
+test -n "$EXPECT" || EXPECT="expect"
+
+case " $configdirs " in
+  *" expect "*)
+    test $host = $build && EXPECT='$$r/$(HOST_SUBDIR)/expect/expect'
+    ;;
+esac
+
+for ac_prog in runtest
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RUNTEST+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RUNTEST"; then
+  ac_cv_prog_RUNTEST="$RUNTEST" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RUNTEST="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RUNTEST=$ac_cv_prog_RUNTEST
+if test -n "$RUNTEST"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUNTEST" >&5
+$as_echo "$RUNTEST" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$RUNTEST" && break
+done
+test -n "$RUNTEST" || RUNTEST="runtest"
+
+case " $configdirs " in
+  *" dejagnu "*)
+    test $host = $build && RUNTEST='$$s/$(HOST_SUBDIR)/dejagnu/runtest'
+    ;;
+esac
+
+
+# Host tools.
+ncn_tool_prefix=
+test -n "$host_alias" && ncn_tool_prefix=$host_alias-
+ncn_target_tool_prefix=
+test -n "$target_alias" && ncn_target_tool_prefix=$target_alias-
+
+
+
+if test -n "$AR"; then
+  ac_cv_prog_AR=$AR
+elif test -n "$ac_cv_prog_AR"; then
+  AR=$ac_cv_prog_AR
+fi
+
+if test -n "$ac_cv_prog_AR"; then
+  for ncn_progname in ar; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AR="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+for ncn_progname in ar; do
+  if test -n "$ncn_tool_prefix"; then
+    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AR="${ncn_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  if test -z "$ac_cv_prog_AR" && test $build = $host ; then
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AR="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  test -n "$ac_cv_prog_AR" && break
+done
+
+if test -z "$ac_cv_prog_AR" ; then
+  set dummy ar
+  if test $build = $host ; then
+    AR="$2"
+  else
+    AR="${ncn_tool_prefix}$2"
+  fi
+fi
+
+
+
+if test -n "$AS"; then
+  ac_cv_prog_AS=$AS
+elif test -n "$ac_cv_prog_AS"; then
+  AS=$ac_cv_prog_AS
+fi
+
+if test -n "$ac_cv_prog_AS"; then
+  for ncn_progname in as; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AS+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AS="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+$as_echo "$AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+for ncn_progname in as; do
+  if test -n "$ncn_tool_prefix"; then
+    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AS+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AS="${ncn_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+$as_echo "$AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  if test -z "$ac_cv_prog_AS" && test $build = $host ; then
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AS+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AS="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+$as_echo "$AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  test -n "$ac_cv_prog_AS" && break
+done
+
+if test -z "$ac_cv_prog_AS" ; then
+  set dummy as
+  if test $build = $host ; then
+    AS="$2"
+  else
+    AS="${ncn_tool_prefix}$2"
+  fi
+fi
+
+
+
+if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL=$DLLTOOL
+elif test -n "$ac_cv_prog_DLLTOOL"; then
+  DLLTOOL=$ac_cv_prog_DLLTOOL
+fi
+
+if test -n "$ac_cv_prog_DLLTOOL"; then
+  for ncn_progname in dlltool; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DLLTOOL="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+for ncn_progname in dlltool; do
+  if test -n "$ncn_tool_prefix"; then
+    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DLLTOOL="${ncn_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  if test -z "$ac_cv_prog_DLLTOOL" && test $build = $host ; then
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DLLTOOL="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  test -n "$ac_cv_prog_DLLTOOL" && break
+done
+
+if test -z "$ac_cv_prog_DLLTOOL" ; then
+  set dummy dlltool
+  if test $build = $host ; then
+    DLLTOOL="$2"
+  else
+    DLLTOOL="${ncn_tool_prefix}$2"
+  fi
+fi
+
+
+
+if test -n "$LD"; then
+  ac_cv_prog_LD=$LD
+elif test -n "$ac_cv_prog_LD"; then
+  LD=$ac_cv_prog_LD
+fi
+
+if test -n "$ac_cv_prog_LD"; then
+  for ncn_progname in ld; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LD"; then
+  ac_cv_prog_LD="$LD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LD="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LD=$ac_cv_prog_LD
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+for ncn_progname in ld; do
+  if test -n "$ncn_tool_prefix"; then
+    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LD"; then
+  ac_cv_prog_LD="$LD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LD="${ncn_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LD=$ac_cv_prog_LD
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  if test -z "$ac_cv_prog_LD" && test $build = $host ; then
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LD"; then
+  ac_cv_prog_LD="$LD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LD="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LD=$ac_cv_prog_LD
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  test -n "$ac_cv_prog_LD" && break
+done
+
+if test -z "$ac_cv_prog_LD" ; then
+  set dummy ld
+  if test $build = $host ; then
+    LD="$2"
+  else
+    LD="${ncn_tool_prefix}$2"
+  fi
+fi
+
+
+
+if test -n "$LIPO"; then
+  ac_cv_prog_LIPO=$LIPO
+elif test -n "$ac_cv_prog_LIPO"; then
+  LIPO=$ac_cv_prog_LIPO
+fi
+
+if test -n "$ac_cv_prog_LIPO"; then
+  for ncn_progname in lipo; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LIPO+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LIPO="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+for ncn_progname in lipo; do
+  if test -n "$ncn_tool_prefix"; then
+    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LIPO+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LIPO="${ncn_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  if test -z "$ac_cv_prog_LIPO" && test $build = $host ; then
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LIPO+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LIPO="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  test -n "$ac_cv_prog_LIPO" && break
+done
+
+if test -z "$ac_cv_prog_LIPO" ; then
+  set dummy lipo
+  if test $build = $host ; then
+    LIPO="$2"
+  else
+    LIPO="${ncn_tool_prefix}$2"
+  fi
+fi
+
+
+
+if test -n "$NM"; then
+  ac_cv_prog_NM=$NM
+elif test -n "$ac_cv_prog_NM"; then
+  NM=$ac_cv_prog_NM
+fi
+
+if test -n "$ac_cv_prog_NM"; then
+  for ncn_progname in nm; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NM+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  ac_cv_prog_NM="$NM" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NM="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NM=$ac_cv_prog_NM
+if test -n "$NM"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
+$as_echo "$NM" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+for ncn_progname in nm; do
+  if test -n "$ncn_tool_prefix"; then
+    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NM+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  ac_cv_prog_NM="$NM" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NM="${ncn_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NM=$ac_cv_prog_NM
+if test -n "$NM"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
+$as_echo "$NM" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  if test -z "$ac_cv_prog_NM" && test $build = $host ; then
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NM+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  ac_cv_prog_NM="$NM" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NM="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NM=$ac_cv_prog_NM
+if test -n "$NM"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
+$as_echo "$NM" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  test -n "$ac_cv_prog_NM" && break
+done
+
+if test -z "$ac_cv_prog_NM" ; then
+  set dummy nm
+  if test $build = $host ; then
+    NM="$2"
+  else
+    NM="${ncn_tool_prefix}$2"
+  fi
+fi
+
+
+
+if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB=$RANLIB
+elif test -n "$ac_cv_prog_RANLIB"; then
+  RANLIB=$ac_cv_prog_RANLIB
+fi
+
+if test -n "$ac_cv_prog_RANLIB"; then
+  for ncn_progname in ranlib; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+for ncn_progname in ranlib; do
+  if test -n "$ncn_tool_prefix"; then
+    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB="${ncn_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  if test -z "$ac_cv_prog_RANLIB" && test $build = $host ; then
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  test -n "$ac_cv_prog_RANLIB" && break
+done
+
+if test -z "$ac_cv_prog_RANLIB" ; then
+  RANLIB="true"
+fi
+
+
+
+if test -n "$STRIP"; then
+  ac_cv_prog_STRIP=$STRIP
+elif test -n "$ac_cv_prog_STRIP"; then
+  STRIP=$ac_cv_prog_STRIP
+fi
+
+if test -n "$ac_cv_prog_STRIP"; then
+  for ncn_progname in strip; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+for ncn_progname in strip; do
+  if test -n "$ncn_tool_prefix"; then
+    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ncn_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  if test -z "$ac_cv_prog_STRIP" && test $build = $host ; then
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  test -n "$ac_cv_prog_STRIP" && break
+done
+
+if test -z "$ac_cv_prog_STRIP" ; then
+  STRIP="true"
+fi
+
+
+
+if test -n "$WINDRES"; then
+  ac_cv_prog_WINDRES=$WINDRES
+elif test -n "$ac_cv_prog_WINDRES"; then
+  WINDRES=$ac_cv_prog_WINDRES
+fi
+
+if test -n "$ac_cv_prog_WINDRES"; then
+  for ncn_progname in windres; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_WINDRES+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$WINDRES"; then
+  ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_WINDRES="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+WINDRES=$ac_cv_prog_WINDRES
+if test -n "$WINDRES"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
+$as_echo "$WINDRES" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+for ncn_progname in windres; do
+  if test -n "$ncn_tool_prefix"; then
+    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_WINDRES+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$WINDRES"; then
+  ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_WINDRES="${ncn_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+WINDRES=$ac_cv_prog_WINDRES
+if test -n "$WINDRES"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
+$as_echo "$WINDRES" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  if test -z "$ac_cv_prog_WINDRES" && test $build = $host ; then
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_WINDRES+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$WINDRES"; then
+  ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_WINDRES="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+WINDRES=$ac_cv_prog_WINDRES
+if test -n "$WINDRES"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
+$as_echo "$WINDRES" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  test -n "$ac_cv_prog_WINDRES" && break
+done
+
+if test -z "$ac_cv_prog_WINDRES" ; then
+  set dummy windres
+  if test $build = $host ; then
+    WINDRES="$2"
+  else
+    WINDRES="${ncn_tool_prefix}$2"
+  fi
+fi
+
+
+
+if test -n "$WINDMC"; then
+  ac_cv_prog_WINDMC=$WINDMC
+elif test -n "$ac_cv_prog_WINDMC"; then
+  WINDMC=$ac_cv_prog_WINDMC
+fi
+
+if test -n "$ac_cv_prog_WINDMC"; then
+  for ncn_progname in windmc; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_WINDMC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$WINDMC"; then
+  ac_cv_prog_WINDMC="$WINDMC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_WINDMC="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+WINDMC=$ac_cv_prog_WINDMC
+if test -n "$WINDMC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDMC" >&5
+$as_echo "$WINDMC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+for ncn_progname in windmc; do
+  if test -n "$ncn_tool_prefix"; then
+    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_WINDMC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$WINDMC"; then
+  ac_cv_prog_WINDMC="$WINDMC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_WINDMC="${ncn_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+WINDMC=$ac_cv_prog_WINDMC
+if test -n "$WINDMC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDMC" >&5
+$as_echo "$WINDMC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  if test -z "$ac_cv_prog_WINDMC" && test $build = $host ; then
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_WINDMC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$WINDMC"; then
+  ac_cv_prog_WINDMC="$WINDMC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_WINDMC="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+WINDMC=$ac_cv_prog_WINDMC
+if test -n "$WINDMC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDMC" >&5
+$as_echo "$WINDMC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  test -n "$ac_cv_prog_WINDMC" && break
+done
+
+if test -z "$ac_cv_prog_WINDMC" ; then
+  set dummy windmc
+  if test $build = $host ; then
+    WINDMC="$2"
+  else
+    WINDMC="${ncn_tool_prefix}$2"
+  fi
+fi
+
+
+
+if test -n "$OBJCOPY"; then
+  ac_cv_prog_OBJCOPY=$OBJCOPY
+elif test -n "$ac_cv_prog_OBJCOPY"; then
+  OBJCOPY=$ac_cv_prog_OBJCOPY
+fi
+
+if test -n "$ac_cv_prog_OBJCOPY"; then
+  for ncn_progname in objcopy; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJCOPY+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJCOPY"; then
+  ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OBJCOPY="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJCOPY=$ac_cv_prog_OBJCOPY
+if test -n "$OBJCOPY"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5
+$as_echo "$OBJCOPY" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+for ncn_progname in objcopy; do
+  if test -n "$ncn_tool_prefix"; then
+    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJCOPY+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJCOPY"; then
+  ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OBJCOPY="${ncn_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJCOPY=$ac_cv_prog_OBJCOPY
+if test -n "$OBJCOPY"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5
+$as_echo "$OBJCOPY" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  if test -z "$ac_cv_prog_OBJCOPY" && test $build = $host ; then
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJCOPY+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJCOPY"; then
+  ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OBJCOPY="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJCOPY=$ac_cv_prog_OBJCOPY
+if test -n "$OBJCOPY"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5
+$as_echo "$OBJCOPY" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  test -n "$ac_cv_prog_OBJCOPY" && break
+done
+
+if test -z "$ac_cv_prog_OBJCOPY" ; then
+  set dummy objcopy
+  if test $build = $host ; then
+    OBJCOPY="$2"
+  else
+    OBJCOPY="${ncn_tool_prefix}$2"
+  fi
+fi
+
+
+
+if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP=$OBJDUMP
+elif test -n "$ac_cv_prog_OBJDUMP"; then
+  OBJDUMP=$ac_cv_prog_OBJDUMP
+fi
+
+if test -n "$ac_cv_prog_OBJDUMP"; then
+  for ncn_progname in objdump; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OBJDUMP="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+for ncn_progname in objdump; do
+  if test -n "$ncn_tool_prefix"; then
+    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OBJDUMP="${ncn_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  if test -z "$ac_cv_prog_OBJDUMP" && test $build = $host ; then
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OBJDUMP="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  test -n "$ac_cv_prog_OBJDUMP" && break
+done
+
+if test -z "$ac_cv_prog_OBJDUMP" ; then
+  set dummy objdump
+  if test $build = $host ; then
+    OBJDUMP="$2"
+  else
+    OBJDUMP="${ncn_tool_prefix}$2"
+  fi
+fi
+
+
+
+
+
+
+# Target tools.
+
+# Check whether --with-build-time-tools was given.
+if test "${with_build_time_tools+set}" = set; then :
+  withval=$with_build_time_tools; case x"$withval" in
+     x/*) ;;
+     *)
+       with_build_time_tools=
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: argument to --with-build-time-tools must be an absolute path" >&5
+$as_echo "$as_me: WARNING: argument to --with-build-time-tools must be an absolute path" >&2;}
+       ;;
+   esac
+else
+  with_build_time_tools=
+fi
+
+
+
+
+if test -n "$CC_FOR_TARGET"; then
+  ac_cv_prog_CC_FOR_TARGET=$CC_FOR_TARGET
+elif test -n "$ac_cv_prog_CC_FOR_TARGET"; then
+  CC_FOR_TARGET=$ac_cv_prog_CC_FOR_TARGET
+fi
+
+if test -n "$ac_cv_prog_CC_FOR_TARGET"; then
+  for ncn_progname in cc gcc; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC_FOR_TARGET"; then
+  ac_cv_prog_CC_FOR_TARGET="$CC_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC_FOR_TARGET=$ac_cv_prog_CC_FOR_TARGET
+if test -n "$CC_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_TARGET" >&5
+$as_echo "$CC_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+if test -z "$ac_cv_prog_CC_FOR_TARGET" && test -n "$with_build_time_tools"; then
+  for ncn_progname in cc gcc; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5
+$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/${ncn_progname}; then
+      ac_cv_prog_CC_FOR_TARGET=$with_build_time_tools/${ncn_progname}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      break
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+fi
+
+if test -z "$ac_cv_prog_CC_FOR_TARGET"; then
+  for ncn_progname in cc gcc; do
+    if test -n "$ncn_target_tool_prefix"; then
+      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC_FOR_TARGET"; then
+  ac_cv_prog_CC_FOR_TARGET="$CC_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC_FOR_TARGET=$ac_cv_prog_CC_FOR_TARGET
+if test -n "$CC_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_TARGET" >&5
+$as_echo "$CC_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    if test -z "$ac_cv_prog_CC_FOR_TARGET" && test $build = $target ; then
+      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC_FOR_TARGET"; then
+  ac_cv_prog_CC_FOR_TARGET="$CC_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC_FOR_TARGET=$ac_cv_prog_CC_FOR_TARGET
+if test -n "$CC_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_TARGET" >&5
+$as_echo "$CC_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    test -n "$ac_cv_prog_CC_FOR_TARGET" && break
+  done
+fi
+
+if test -z "$ac_cv_prog_CC_FOR_TARGET" ; then
+  set dummy cc gcc
+  if test $build = $target ; then
+    CC_FOR_TARGET="$2"
+  else
+    CC_FOR_TARGET="${ncn_target_tool_prefix}$2"
+  fi
+else
+  CC_FOR_TARGET="$ac_cv_prog_CC_FOR_TARGET"
+fi
+
+
+
+if test -n "$CXX_FOR_TARGET"; then
+  ac_cv_prog_CXX_FOR_TARGET=$CXX_FOR_TARGET
+elif test -n "$ac_cv_prog_CXX_FOR_TARGET"; then
+  CXX_FOR_TARGET=$ac_cv_prog_CXX_FOR_TARGET
+fi
+
+if test -n "$ac_cv_prog_CXX_FOR_TARGET"; then
+  for ncn_progname in c++ g++ cxx gxx; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CXX_FOR_TARGET"; then
+  ac_cv_prog_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CXX_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX_FOR_TARGET=$ac_cv_prog_CXX_FOR_TARGET
+if test -n "$CXX_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX_FOR_TARGET" >&5
+$as_echo "$CXX_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+if test -z "$ac_cv_prog_CXX_FOR_TARGET" && test -n "$with_build_time_tools"; then
+  for ncn_progname in c++ g++ cxx gxx; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5
+$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/${ncn_progname}; then
+      ac_cv_prog_CXX_FOR_TARGET=$with_build_time_tools/${ncn_progname}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      break
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+fi
+
+if test -z "$ac_cv_prog_CXX_FOR_TARGET"; then
+  for ncn_progname in c++ g++ cxx gxx; do
+    if test -n "$ncn_target_tool_prefix"; then
+      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CXX_FOR_TARGET"; then
+  ac_cv_prog_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CXX_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX_FOR_TARGET=$ac_cv_prog_CXX_FOR_TARGET
+if test -n "$CXX_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX_FOR_TARGET" >&5
+$as_echo "$CXX_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    if test -z "$ac_cv_prog_CXX_FOR_TARGET" && test $build = $target ; then
+      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CXX_FOR_TARGET"; then
+  ac_cv_prog_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CXX_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX_FOR_TARGET=$ac_cv_prog_CXX_FOR_TARGET
+if test -n "$CXX_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX_FOR_TARGET" >&5
+$as_echo "$CXX_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    test -n "$ac_cv_prog_CXX_FOR_TARGET" && break
+  done
+fi
+
+if test -z "$ac_cv_prog_CXX_FOR_TARGET" ; then
+  set dummy c++ g++ cxx gxx
+  if test $build = $target ; then
+    CXX_FOR_TARGET="$2"
+  else
+    CXX_FOR_TARGET="${ncn_target_tool_prefix}$2"
+  fi
+else
+  CXX_FOR_TARGET="$ac_cv_prog_CXX_FOR_TARGET"
+fi
+
+
+
+if test -n "$GCC_FOR_TARGET"; then
+  ac_cv_prog_GCC_FOR_TARGET=$GCC_FOR_TARGET
+elif test -n "$ac_cv_prog_GCC_FOR_TARGET"; then
+  GCC_FOR_TARGET=$ac_cv_prog_GCC_FOR_TARGET
+fi
+
+if test -n "$ac_cv_prog_GCC_FOR_TARGET"; then
+  for ncn_progname in gcc; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_GCC_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GCC_FOR_TARGET"; then
+  ac_cv_prog_GCC_FOR_TARGET="$GCC_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_GCC_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GCC_FOR_TARGET=$ac_cv_prog_GCC_FOR_TARGET
+if test -n "$GCC_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCC_FOR_TARGET" >&5
+$as_echo "$GCC_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+if test -z "$ac_cv_prog_GCC_FOR_TARGET" && test -n "$with_build_time_tools"; then
+  for ncn_progname in gcc; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5
+$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/${ncn_progname}; then
+      ac_cv_prog_GCC_FOR_TARGET=$with_build_time_tools/${ncn_progname}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      break
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+fi
+
+if test -z "$ac_cv_prog_GCC_FOR_TARGET"; then
+  for ncn_progname in gcc; do
+    if test -n "$ncn_target_tool_prefix"; then
+      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_GCC_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GCC_FOR_TARGET"; then
+  ac_cv_prog_GCC_FOR_TARGET="$GCC_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_GCC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GCC_FOR_TARGET=$ac_cv_prog_GCC_FOR_TARGET
+if test -n "$GCC_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCC_FOR_TARGET" >&5
+$as_echo "$GCC_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    if test -z "$ac_cv_prog_GCC_FOR_TARGET" && test $build = $target ; then
+      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_GCC_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GCC_FOR_TARGET"; then
+  ac_cv_prog_GCC_FOR_TARGET="$GCC_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_GCC_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GCC_FOR_TARGET=$ac_cv_prog_GCC_FOR_TARGET
+if test -n "$GCC_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCC_FOR_TARGET" >&5
+$as_echo "$GCC_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    test -n "$ac_cv_prog_GCC_FOR_TARGET" && break
+  done
+fi
+
+if test -z "$ac_cv_prog_GCC_FOR_TARGET" ; then
+  GCC_FOR_TARGET="${CC_FOR_TARGET}"
+else
+  GCC_FOR_TARGET="$ac_cv_prog_GCC_FOR_TARGET"
+fi
+
+
+
+if test -n "$GCJ_FOR_TARGET"; then
+  ac_cv_prog_GCJ_FOR_TARGET=$GCJ_FOR_TARGET
+elif test -n "$ac_cv_prog_GCJ_FOR_TARGET"; then
+  GCJ_FOR_TARGET=$ac_cv_prog_GCJ_FOR_TARGET
+fi
+
+if test -n "$ac_cv_prog_GCJ_FOR_TARGET"; then
+  for ncn_progname in gcj; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_GCJ_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GCJ_FOR_TARGET"; then
+  ac_cv_prog_GCJ_FOR_TARGET="$GCJ_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_GCJ_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GCJ_FOR_TARGET=$ac_cv_prog_GCJ_FOR_TARGET
+if test -n "$GCJ_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCJ_FOR_TARGET" >&5
+$as_echo "$GCJ_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+if test -z "$ac_cv_prog_GCJ_FOR_TARGET" && test -n "$with_build_time_tools"; then
+  for ncn_progname in gcj; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5
+$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/${ncn_progname}; then
+      ac_cv_prog_GCJ_FOR_TARGET=$with_build_time_tools/${ncn_progname}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      break
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+fi
+
+if test -z "$ac_cv_prog_GCJ_FOR_TARGET"; then
+  for ncn_progname in gcj; do
+    if test -n "$ncn_target_tool_prefix"; then
+      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_GCJ_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GCJ_FOR_TARGET"; then
+  ac_cv_prog_GCJ_FOR_TARGET="$GCJ_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_GCJ_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GCJ_FOR_TARGET=$ac_cv_prog_GCJ_FOR_TARGET
+if test -n "$GCJ_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCJ_FOR_TARGET" >&5
+$as_echo "$GCJ_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    if test -z "$ac_cv_prog_GCJ_FOR_TARGET" && test $build = $target ; then
+      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_GCJ_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GCJ_FOR_TARGET"; then
+  ac_cv_prog_GCJ_FOR_TARGET="$GCJ_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_GCJ_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GCJ_FOR_TARGET=$ac_cv_prog_GCJ_FOR_TARGET
+if test -n "$GCJ_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCJ_FOR_TARGET" >&5
+$as_echo "$GCJ_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    test -n "$ac_cv_prog_GCJ_FOR_TARGET" && break
+  done
+fi
+
+if test -z "$ac_cv_prog_GCJ_FOR_TARGET" ; then
+  set dummy gcj
+  if test $build = $target ; then
+    GCJ_FOR_TARGET="$2"
+  else
+    GCJ_FOR_TARGET="${ncn_target_tool_prefix}$2"
+  fi
+else
+  GCJ_FOR_TARGET="$ac_cv_prog_GCJ_FOR_TARGET"
+fi
+
+
+
+if test -n "$GFORTRAN_FOR_TARGET"; then
+  ac_cv_prog_GFORTRAN_FOR_TARGET=$GFORTRAN_FOR_TARGET
+elif test -n "$ac_cv_prog_GFORTRAN_FOR_TARGET"; then
+  GFORTRAN_FOR_TARGET=$ac_cv_prog_GFORTRAN_FOR_TARGET
+fi
+
+if test -n "$ac_cv_prog_GFORTRAN_FOR_TARGET"; then
+  for ncn_progname in gfortran; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_GFORTRAN_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GFORTRAN_FOR_TARGET"; then
+  ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GFORTRAN_FOR_TARGET=$ac_cv_prog_GFORTRAN_FOR_TARGET
+if test -n "$GFORTRAN_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GFORTRAN_FOR_TARGET" >&5
+$as_echo "$GFORTRAN_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" && test -n "$with_build_time_tools"; then
+  for ncn_progname in gfortran; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5
+$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/${ncn_progname}; then
+      ac_cv_prog_GFORTRAN_FOR_TARGET=$with_build_time_tools/${ncn_progname}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      break
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+fi
+
+if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET"; then
+  for ncn_progname in gfortran; do
+    if test -n "$ncn_target_tool_prefix"; then
+      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_GFORTRAN_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GFORTRAN_FOR_TARGET"; then
+  ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GFORTRAN_FOR_TARGET=$ac_cv_prog_GFORTRAN_FOR_TARGET
+if test -n "$GFORTRAN_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GFORTRAN_FOR_TARGET" >&5
+$as_echo "$GFORTRAN_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" && test $build = $target ; then
+      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_GFORTRAN_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GFORTRAN_FOR_TARGET"; then
+  ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GFORTRAN_FOR_TARGET=$ac_cv_prog_GFORTRAN_FOR_TARGET
+if test -n "$GFORTRAN_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GFORTRAN_FOR_TARGET" >&5
+$as_echo "$GFORTRAN_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    test -n "$ac_cv_prog_GFORTRAN_FOR_TARGET" && break
+  done
+fi
+
+if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" ; then
+  set dummy gfortran
+  if test $build = $target ; then
+    GFORTRAN_FOR_TARGET="$2"
+  else
+    GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}$2"
+  fi
+else
+  GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET"
+fi
+
+
+
+if test -n "$GOC_FOR_TARGET"; then
+  ac_cv_prog_GOC_FOR_TARGET=$GOC_FOR_TARGET
+elif test -n "$ac_cv_prog_GOC_FOR_TARGET"; then
+  GOC_FOR_TARGET=$ac_cv_prog_GOC_FOR_TARGET
+fi
+
+if test -n "$ac_cv_prog_GOC_FOR_TARGET"; then
+  for ncn_progname in gccgo; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_GOC_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GOC_FOR_TARGET"; then
+  ac_cv_prog_GOC_FOR_TARGET="$GOC_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_GOC_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GOC_FOR_TARGET=$ac_cv_prog_GOC_FOR_TARGET
+if test -n "$GOC_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOC_FOR_TARGET" >&5
+$as_echo "$GOC_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+if test -z "$ac_cv_prog_GOC_FOR_TARGET" && test -n "$with_build_time_tools"; then
+  for ncn_progname in gccgo; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5
+$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/${ncn_progname}; then
+      ac_cv_prog_GOC_FOR_TARGET=$with_build_time_tools/${ncn_progname}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      break
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+fi
+
+if test -z "$ac_cv_prog_GOC_FOR_TARGET"; then
+  for ncn_progname in gccgo; do
+    if test -n "$ncn_target_tool_prefix"; then
+      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_GOC_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GOC_FOR_TARGET"; then
+  ac_cv_prog_GOC_FOR_TARGET="$GOC_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_GOC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GOC_FOR_TARGET=$ac_cv_prog_GOC_FOR_TARGET
+if test -n "$GOC_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOC_FOR_TARGET" >&5
+$as_echo "$GOC_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    if test -z "$ac_cv_prog_GOC_FOR_TARGET" && test $build = $target ; then
+      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_GOC_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GOC_FOR_TARGET"; then
+  ac_cv_prog_GOC_FOR_TARGET="$GOC_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_GOC_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GOC_FOR_TARGET=$ac_cv_prog_GOC_FOR_TARGET
+if test -n "$GOC_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOC_FOR_TARGET" >&5
+$as_echo "$GOC_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    test -n "$ac_cv_prog_GOC_FOR_TARGET" && break
+  done
+fi
+
+if test -z "$ac_cv_prog_GOC_FOR_TARGET" ; then
+  set dummy gccgo
+  if test $build = $target ; then
+    GOC_FOR_TARGET="$2"
+  else
+    GOC_FOR_TARGET="${ncn_target_tool_prefix}$2"
+  fi
+else
+  GOC_FOR_TARGET="$ac_cv_prog_GOC_FOR_TARGET"
+fi
+
+
+
+cat > conftest.c << \EOF
+#ifdef __GNUC__
+  gcc_yay;
+#endif
+EOF
+if ($GCC_FOR_TARGET -E conftest.c | grep gcc_yay) > /dev/null 2>&1; then
+  have_gcc_for_target=yes
+else
+  GCC_FOR_TARGET=${ncn_target_tool_prefix}gcc
+  have_gcc_for_target=no
+fi
+rm conftest.c
+
+
+
+
+if test -z "$ac_cv_path_AR_FOR_TARGET" ; then
+  if test -n "$with_build_time_tools"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ar in $with_build_time_tools" >&5
+$as_echo_n "checking for ar in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/ar; then
+      AR_FOR_TARGET=`cd $with_build_time_tools && pwd`/ar
+      ac_cv_path_AR_FOR_TARGET=$AR_FOR_TARGET
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_AR_FOR_TARGET" >&5
+$as_echo "$ac_cv_path_AR_FOR_TARGET" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  elif test $build != $host && test $have_gcc_for_target = yes; then
+    AR_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ar`
+    test $AR_FOR_TARGET = ar && AR_FOR_TARGET=
+    test -n "$AR_FOR_TARGET" && ac_cv_path_AR_FOR_TARGET=$AR_FOR_TARGET
+  fi
+fi
+if test -z "$ac_cv_path_AR_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_AR_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $AR_FOR_TARGET in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $gcc_cv_tool_dirs
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_AR_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+AR_FOR_TARGET=$ac_cv_path_AR_FOR_TARGET
+if test -n "$AR_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR_FOR_TARGET" >&5
+$as_echo "$AR_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_AR_FOR_TARGET" ; then
+
+
+if test -n "$AR_FOR_TARGET"; then
+  ac_cv_prog_AR_FOR_TARGET=$AR_FOR_TARGET
+elif test -n "$ac_cv_prog_AR_FOR_TARGET"; then
+  AR_FOR_TARGET=$ac_cv_prog_AR_FOR_TARGET
+fi
+
+if test -n "$ac_cv_prog_AR_FOR_TARGET"; then
+  for ncn_progname in ar; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR_FOR_TARGET"; then
+  ac_cv_prog_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AR_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR_FOR_TARGET=$ac_cv_prog_AR_FOR_TARGET
+if test -n "$AR_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR_FOR_TARGET" >&5
+$as_echo "$AR_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+if test -z "$ac_cv_prog_AR_FOR_TARGET" && test -n "$with_build_time_tools"; then
+  for ncn_progname in ar; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5
+$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/${ncn_progname}; then
+      ac_cv_prog_AR_FOR_TARGET=$with_build_time_tools/${ncn_progname}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      break
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+fi
+
+if test -z "$ac_cv_prog_AR_FOR_TARGET"; then
+  for ncn_progname in ar; do
+    if test -n "$ncn_target_tool_prefix"; then
+      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR_FOR_TARGET"; then
+  ac_cv_prog_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AR_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR_FOR_TARGET=$ac_cv_prog_AR_FOR_TARGET
+if test -n "$AR_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR_FOR_TARGET" >&5
+$as_echo "$AR_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    if test -z "$ac_cv_prog_AR_FOR_TARGET" && test $build = $target ; then
+      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR_FOR_TARGET"; then
+  ac_cv_prog_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AR_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR_FOR_TARGET=$ac_cv_prog_AR_FOR_TARGET
+if test -n "$AR_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR_FOR_TARGET" >&5
+$as_echo "$AR_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    test -n "$ac_cv_prog_AR_FOR_TARGET" && break
+  done
+fi
+
+if test -z "$ac_cv_prog_AR_FOR_TARGET" ; then
+  set dummy ar
+  if test $build = $target ; then
+    AR_FOR_TARGET="$2"
+  else
+    AR_FOR_TARGET="${ncn_target_tool_prefix}$2"
+  fi
+else
+  AR_FOR_TARGET="$ac_cv_prog_AR_FOR_TARGET"
+fi
+
+else
+  AR_FOR_TARGET=$ac_cv_path_AR_FOR_TARGET
+fi
+
+
+
+
+if test -z "$ac_cv_path_AS_FOR_TARGET" ; then
+  if test -n "$with_build_time_tools"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for as in $with_build_time_tools" >&5
+$as_echo_n "checking for as in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/as; then
+      AS_FOR_TARGET=`cd $with_build_time_tools && pwd`/as
+      ac_cv_path_AS_FOR_TARGET=$AS_FOR_TARGET
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_AS_FOR_TARGET" >&5
+$as_echo "$ac_cv_path_AS_FOR_TARGET" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  elif test $build != $host && test $have_gcc_for_target = yes; then
+    AS_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=as`
+    test $AS_FOR_TARGET = as && AS_FOR_TARGET=
+    test -n "$AS_FOR_TARGET" && ac_cv_path_AS_FOR_TARGET=$AS_FOR_TARGET
+  fi
+fi
+if test -z "$ac_cv_path_AS_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
+  # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_AS_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $AS_FOR_TARGET in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $gcc_cv_tool_dirs
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_AS_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+AS_FOR_TARGET=$ac_cv_path_AS_FOR_TARGET
+if test -n "$AS_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS_FOR_TARGET" >&5
+$as_echo "$AS_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_AS_FOR_TARGET" ; then
+
+
+if test -n "$AS_FOR_TARGET"; then
+  ac_cv_prog_AS_FOR_TARGET=$AS_FOR_TARGET
+elif test -n "$ac_cv_prog_AS_FOR_TARGET"; then
+  AS_FOR_TARGET=$ac_cv_prog_AS_FOR_TARGET
+fi
+
+if test -n "$ac_cv_prog_AS_FOR_TARGET"; then
+  for ncn_progname in as; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AS_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AS_FOR_TARGET"; then
+  ac_cv_prog_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AS_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AS_FOR_TARGET=$ac_cv_prog_AS_FOR_TARGET
+if test -n "$AS_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS_FOR_TARGET" >&5
+$as_echo "$AS_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+if test -z "$ac_cv_prog_AS_FOR_TARGET" && test -n "$with_build_time_tools"; then
+  for ncn_progname in as; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5
+$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/${ncn_progname}; then
+      ac_cv_prog_AS_FOR_TARGET=$with_build_time_tools/${ncn_progname}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      break
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+fi
+
+if test -z "$ac_cv_prog_AS_FOR_TARGET"; then
+  for ncn_progname in as; do
+    if test -n "$ncn_target_tool_prefix"; then
+      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AS_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AS_FOR_TARGET"; then
+  ac_cv_prog_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AS_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AS_FOR_TARGET=$ac_cv_prog_AS_FOR_TARGET
+if test -n "$AS_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS_FOR_TARGET" >&5
+$as_echo "$AS_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    if test -z "$ac_cv_prog_AS_FOR_TARGET" && test $build = $target ; then
+      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AS_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AS_FOR_TARGET"; then
+  ac_cv_prog_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AS_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AS_FOR_TARGET=$ac_cv_prog_AS_FOR_TARGET
+if test -n "$AS_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS_FOR_TARGET" >&5
+$as_echo "$AS_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    test -n "$ac_cv_prog_AS_FOR_TARGET" && break
+  done
+fi
+
+if test -z "$ac_cv_prog_AS_FOR_TARGET" ; then
+  set dummy as
+  if test $build = $target ; then
+    AS_FOR_TARGET="$2"
+  else
+    AS_FOR_TARGET="${ncn_target_tool_prefix}$2"
+  fi
+else
+  AS_FOR_TARGET="$ac_cv_prog_AS_FOR_TARGET"
+fi
+
+else
+  AS_FOR_TARGET=$ac_cv_path_AS_FOR_TARGET
+fi
+
+
+
+
+if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then
+  if test -n "$with_build_time_tools"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlltool in $with_build_time_tools" >&5
+$as_echo_n "checking for dlltool in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/dlltool; then
+      DLLTOOL_FOR_TARGET=`cd $with_build_time_tools && pwd`/dlltool
+      ac_cv_path_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_DLLTOOL_FOR_TARGET" >&5
+$as_echo "$ac_cv_path_DLLTOOL_FOR_TARGET" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  elif test $build != $host && test $have_gcc_for_target = yes; then
+    DLLTOOL_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=dlltool`
+    test $DLLTOOL_FOR_TARGET = dlltool && DLLTOOL_FOR_TARGET=
+    test -n "$DLLTOOL_FOR_TARGET" && ac_cv_path_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET
+  fi
+fi
+if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_DLLTOOL_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DLLTOOL_FOR_TARGET in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $gcc_cv_tool_dirs
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_DLLTOOL_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+DLLTOOL_FOR_TARGET=$ac_cv_path_DLLTOOL_FOR_TARGET
+if test -n "$DLLTOOL_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL_FOR_TARGET" >&5
+$as_echo "$DLLTOOL_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then
+
+
+if test -n "$DLLTOOL_FOR_TARGET"; then
+  ac_cv_prog_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET
+elif test -n "$ac_cv_prog_DLLTOOL_FOR_TARGET"; then
+  DLLTOOL_FOR_TARGET=$ac_cv_prog_DLLTOOL_FOR_TARGET
+fi
+
+if test -n "$ac_cv_prog_DLLTOOL_FOR_TARGET"; then
+  for ncn_progname in dlltool; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DLLTOOL_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL_FOR_TARGET"; then
+  ac_cv_prog_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL_FOR_TARGET=$ac_cv_prog_DLLTOOL_FOR_TARGET
+if test -n "$DLLTOOL_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL_FOR_TARGET" >&5
+$as_echo "$DLLTOOL_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" && test -n "$with_build_time_tools"; then
+  for ncn_progname in dlltool; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5
+$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/${ncn_progname}; then
+      ac_cv_prog_DLLTOOL_FOR_TARGET=$with_build_time_tools/${ncn_progname}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      break
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+fi
+
+if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET"; then
+  for ncn_progname in dlltool; do
+    if test -n "$ncn_target_tool_prefix"; then
+      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DLLTOOL_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL_FOR_TARGET"; then
+  ac_cv_prog_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL_FOR_TARGET=$ac_cv_prog_DLLTOOL_FOR_TARGET
+if test -n "$DLLTOOL_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL_FOR_TARGET" >&5
+$as_echo "$DLLTOOL_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" && test $build = $target ; then
+      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DLLTOOL_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL_FOR_TARGET"; then
+  ac_cv_prog_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL_FOR_TARGET=$ac_cv_prog_DLLTOOL_FOR_TARGET
+if test -n "$DLLTOOL_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL_FOR_TARGET" >&5
+$as_echo "$DLLTOOL_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    test -n "$ac_cv_prog_DLLTOOL_FOR_TARGET" && break
+  done
+fi
+
+if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" ; then
+  set dummy dlltool
+  if test $build = $target ; then
+    DLLTOOL_FOR_TARGET="$2"
+  else
+    DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}$2"
+  fi
+else
+  DLLTOOL_FOR_TARGET="$ac_cv_prog_DLLTOOL_FOR_TARGET"
+fi
+
+else
+  DLLTOOL_FOR_TARGET=$ac_cv_path_DLLTOOL_FOR_TARGET
+fi
+
+
+
+
+if test -z "$ac_cv_path_LD_FOR_TARGET" ; then
+  if test -n "$with_build_time_tools"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld in $with_build_time_tools" >&5
+$as_echo_n "checking for ld in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/ld; then
+      LD_FOR_TARGET=`cd $with_build_time_tools && pwd`/ld
+      ac_cv_path_LD_FOR_TARGET=$LD_FOR_TARGET
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_LD_FOR_TARGET" >&5
+$as_echo "$ac_cv_path_LD_FOR_TARGET" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  elif test $build != $host && test $have_gcc_for_target = yes; then
+    LD_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ld`
+    test $LD_FOR_TARGET = ld && LD_FOR_TARGET=
+    test -n "$LD_FOR_TARGET" && ac_cv_path_LD_FOR_TARGET=$LD_FOR_TARGET
+  fi
+fi
+if test -z "$ac_cv_path_LD_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
+  # Extract the first word of "ld", so it can be a program name with args.
+set dummy ld; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_LD_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $LD_FOR_TARGET in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $gcc_cv_tool_dirs
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_LD_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+LD_FOR_TARGET=$ac_cv_path_LD_FOR_TARGET
+if test -n "$LD_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD_FOR_TARGET" >&5
+$as_echo "$LD_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_LD_FOR_TARGET" ; then
+
+
+if test -n "$LD_FOR_TARGET"; then
+  ac_cv_prog_LD_FOR_TARGET=$LD_FOR_TARGET
+elif test -n "$ac_cv_prog_LD_FOR_TARGET"; then
+  LD_FOR_TARGET=$ac_cv_prog_LD_FOR_TARGET
+fi
+
+if test -n "$ac_cv_prog_LD_FOR_TARGET"; then
+  for ncn_progname in ld; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LD_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LD_FOR_TARGET"; then
+  ac_cv_prog_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LD_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LD_FOR_TARGET=$ac_cv_prog_LD_FOR_TARGET
+if test -n "$LD_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD_FOR_TARGET" >&5
+$as_echo "$LD_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+if test -z "$ac_cv_prog_LD_FOR_TARGET" && test -n "$with_build_time_tools"; then
+  for ncn_progname in ld; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5
+$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/${ncn_progname}; then
+      ac_cv_prog_LD_FOR_TARGET=$with_build_time_tools/${ncn_progname}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      break
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+fi
+
+if test -z "$ac_cv_prog_LD_FOR_TARGET"; then
+  for ncn_progname in ld; do
+    if test -n "$ncn_target_tool_prefix"; then
+      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LD_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LD_FOR_TARGET"; then
+  ac_cv_prog_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LD_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LD_FOR_TARGET=$ac_cv_prog_LD_FOR_TARGET
+if test -n "$LD_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD_FOR_TARGET" >&5
+$as_echo "$LD_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    if test -z "$ac_cv_prog_LD_FOR_TARGET" && test $build = $target ; then
+      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LD_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LD_FOR_TARGET"; then
+  ac_cv_prog_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LD_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LD_FOR_TARGET=$ac_cv_prog_LD_FOR_TARGET
+if test -n "$LD_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD_FOR_TARGET" >&5
+$as_echo "$LD_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    test -n "$ac_cv_prog_LD_FOR_TARGET" && break
+  done
+fi
+
+if test -z "$ac_cv_prog_LD_FOR_TARGET" ; then
+  set dummy ld
+  if test $build = $target ; then
+    LD_FOR_TARGET="$2"
+  else
+    LD_FOR_TARGET="${ncn_target_tool_prefix}$2"
+  fi
+else
+  LD_FOR_TARGET="$ac_cv_prog_LD_FOR_TARGET"
+fi
+
+else
+  LD_FOR_TARGET=$ac_cv_path_LD_FOR_TARGET
+fi
+
+
+
+
+if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then
+  if test -n "$with_build_time_tools"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lipo in $with_build_time_tools" >&5
+$as_echo_n "checking for lipo in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/lipo; then
+      LIPO_FOR_TARGET=`cd $with_build_time_tools && pwd`/lipo
+      ac_cv_path_LIPO_FOR_TARGET=$LIPO_FOR_TARGET
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_LIPO_FOR_TARGET" >&5
+$as_echo "$ac_cv_path_LIPO_FOR_TARGET" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  elif test $build != $host && test $have_gcc_for_target = yes; then
+    LIPO_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=lipo`
+    test $LIPO_FOR_TARGET = lipo && LIPO_FOR_TARGET=
+    test -n "$LIPO_FOR_TARGET" && ac_cv_path_LIPO_FOR_TARGET=$LIPO_FOR_TARGET
+  fi
+fi
+if test -z "$ac_cv_path_LIPO_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_LIPO_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $LIPO_FOR_TARGET in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $gcc_cv_tool_dirs
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_LIPO_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+LIPO_FOR_TARGET=$ac_cv_path_LIPO_FOR_TARGET
+if test -n "$LIPO_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO_FOR_TARGET" >&5
+$as_echo "$LIPO_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then
+
+
+if test -n "$LIPO_FOR_TARGET"; then
+  ac_cv_prog_LIPO_FOR_TARGET=$LIPO_FOR_TARGET
+elif test -n "$ac_cv_prog_LIPO_FOR_TARGET"; then
+  LIPO_FOR_TARGET=$ac_cv_prog_LIPO_FOR_TARGET
+fi
+
+if test -n "$ac_cv_prog_LIPO_FOR_TARGET"; then
+  for ncn_progname in lipo; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LIPO_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO_FOR_TARGET"; then
+  ac_cv_prog_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LIPO_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO_FOR_TARGET=$ac_cv_prog_LIPO_FOR_TARGET
+if test -n "$LIPO_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO_FOR_TARGET" >&5
+$as_echo "$LIPO_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+if test -z "$ac_cv_prog_LIPO_FOR_TARGET" && test -n "$with_build_time_tools"; then
+  for ncn_progname in lipo; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5
+$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/${ncn_progname}; then
+      ac_cv_prog_LIPO_FOR_TARGET=$with_build_time_tools/${ncn_progname}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      break
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+fi
+
+if test -z "$ac_cv_prog_LIPO_FOR_TARGET"; then
+  for ncn_progname in lipo; do
+    if test -n "$ncn_target_tool_prefix"; then
+      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LIPO_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO_FOR_TARGET"; then
+  ac_cv_prog_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LIPO_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO_FOR_TARGET=$ac_cv_prog_LIPO_FOR_TARGET
+if test -n "$LIPO_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO_FOR_TARGET" >&5
+$as_echo "$LIPO_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    if test -z "$ac_cv_prog_LIPO_FOR_TARGET" && test $build = $target ; then
+      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LIPO_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO_FOR_TARGET"; then
+  ac_cv_prog_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LIPO_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO_FOR_TARGET=$ac_cv_prog_LIPO_FOR_TARGET
+if test -n "$LIPO_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO_FOR_TARGET" >&5
+$as_echo "$LIPO_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    test -n "$ac_cv_prog_LIPO_FOR_TARGET" && break
+  done
+fi
+
+if test -z "$ac_cv_prog_LIPO_FOR_TARGET" ; then
+  set dummy lipo
+  if test $build = $target ; then
+    LIPO_FOR_TARGET="$2"
+  else
+    LIPO_FOR_TARGET="${ncn_target_tool_prefix}$2"
+  fi
+else
+  LIPO_FOR_TARGET="$ac_cv_prog_LIPO_FOR_TARGET"
+fi
+
+else
+  LIPO_FOR_TARGET=$ac_cv_path_LIPO_FOR_TARGET
+fi
+
+
+
+
+if test -z "$ac_cv_path_NM_FOR_TARGET" ; then
+  if test -n "$with_build_time_tools"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nm in $with_build_time_tools" >&5
+$as_echo_n "checking for nm in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/nm; then
+      NM_FOR_TARGET=`cd $with_build_time_tools && pwd`/nm
+      ac_cv_path_NM_FOR_TARGET=$NM_FOR_TARGET
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_NM_FOR_TARGET" >&5
+$as_echo "$ac_cv_path_NM_FOR_TARGET" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  elif test $build != $host && test $have_gcc_for_target = yes; then
+    NM_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=nm`
+    test $NM_FOR_TARGET = nm && NM_FOR_TARGET=
+    test -n "$NM_FOR_TARGET" && ac_cv_path_NM_FOR_TARGET=$NM_FOR_TARGET
+  fi
+fi
+if test -z "$ac_cv_path_NM_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
+  # Extract the first word of "nm", so it can be a program name with args.
+set dummy nm; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_NM_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $NM_FOR_TARGET in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $gcc_cv_tool_dirs
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_NM_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+NM_FOR_TARGET=$ac_cv_path_NM_FOR_TARGET
+if test -n "$NM_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM_FOR_TARGET" >&5
+$as_echo "$NM_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_NM_FOR_TARGET" ; then
+
+
+if test -n "$NM_FOR_TARGET"; then
+  ac_cv_prog_NM_FOR_TARGET=$NM_FOR_TARGET
+elif test -n "$ac_cv_prog_NM_FOR_TARGET"; then
+  NM_FOR_TARGET=$ac_cv_prog_NM_FOR_TARGET
+fi
+
+if test -n "$ac_cv_prog_NM_FOR_TARGET"; then
+  for ncn_progname in nm; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NM_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM_FOR_TARGET"; then
+  ac_cv_prog_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NM_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NM_FOR_TARGET=$ac_cv_prog_NM_FOR_TARGET
+if test -n "$NM_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM_FOR_TARGET" >&5
+$as_echo "$NM_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+if test -z "$ac_cv_prog_NM_FOR_TARGET" && test -n "$with_build_time_tools"; then
+  for ncn_progname in nm; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5
+$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/${ncn_progname}; then
+      ac_cv_prog_NM_FOR_TARGET=$with_build_time_tools/${ncn_progname}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      break
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+fi
+
+if test -z "$ac_cv_prog_NM_FOR_TARGET"; then
+  for ncn_progname in nm; do
+    if test -n "$ncn_target_tool_prefix"; then
+      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NM_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM_FOR_TARGET"; then
+  ac_cv_prog_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NM_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NM_FOR_TARGET=$ac_cv_prog_NM_FOR_TARGET
+if test -n "$NM_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM_FOR_TARGET" >&5
+$as_echo "$NM_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    if test -z "$ac_cv_prog_NM_FOR_TARGET" && test $build = $target ; then
+      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NM_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM_FOR_TARGET"; then
+  ac_cv_prog_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NM_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NM_FOR_TARGET=$ac_cv_prog_NM_FOR_TARGET
+if test -n "$NM_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM_FOR_TARGET" >&5
+$as_echo "$NM_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    test -n "$ac_cv_prog_NM_FOR_TARGET" && break
+  done
+fi
+
+if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then
+  set dummy nm
+  if test $build = $target ; then
+    NM_FOR_TARGET="$2"
+  else
+    NM_FOR_TARGET="${ncn_target_tool_prefix}$2"
+  fi
+else
+  NM_FOR_TARGET="$ac_cv_prog_NM_FOR_TARGET"
+fi
+
+else
+  NM_FOR_TARGET=$ac_cv_path_NM_FOR_TARGET
+fi
+
+
+
+
+if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then
+  if test -n "$with_build_time_tools"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdump in $with_build_time_tools" >&5
+$as_echo_n "checking for objdump in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/objdump; then
+      OBJDUMP_FOR_TARGET=`cd $with_build_time_tools && pwd`/objdump
+      ac_cv_path_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_OBJDUMP_FOR_TARGET" >&5
+$as_echo "$ac_cv_path_OBJDUMP_FOR_TARGET" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  elif test $build != $host && test $have_gcc_for_target = yes; then
+    OBJDUMP_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=objdump`
+    test $OBJDUMP_FOR_TARGET = objdump && OBJDUMP_FOR_TARGET=
+    test -n "$OBJDUMP_FOR_TARGET" && ac_cv_path_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET
+  fi
+fi
+if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_OBJDUMP_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $OBJDUMP_FOR_TARGET in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $gcc_cv_tool_dirs
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_OBJDUMP_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+OBJDUMP_FOR_TARGET=$ac_cv_path_OBJDUMP_FOR_TARGET
+if test -n "$OBJDUMP_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP_FOR_TARGET" >&5
+$as_echo "$OBJDUMP_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then
+
+
+if test -n "$OBJDUMP_FOR_TARGET"; then
+  ac_cv_prog_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET
+elif test -n "$ac_cv_prog_OBJDUMP_FOR_TARGET"; then
+  OBJDUMP_FOR_TARGET=$ac_cv_prog_OBJDUMP_FOR_TARGET
+fi
+
+if test -n "$ac_cv_prog_OBJDUMP_FOR_TARGET"; then
+  for ncn_progname in objdump; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJDUMP_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP_FOR_TARGET"; then
+  ac_cv_prog_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OBJDUMP_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP_FOR_TARGET=$ac_cv_prog_OBJDUMP_FOR_TARGET
+if test -n "$OBJDUMP_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP_FOR_TARGET" >&5
+$as_echo "$OBJDUMP_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" && test -n "$with_build_time_tools"; then
+  for ncn_progname in objdump; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5
+$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/${ncn_progname}; then
+      ac_cv_prog_OBJDUMP_FOR_TARGET=$with_build_time_tools/${ncn_progname}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      break
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+fi
+
+if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET"; then
+  for ncn_progname in objdump; do
+    if test -n "$ncn_target_tool_prefix"; then
+      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJDUMP_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP_FOR_TARGET"; then
+  ac_cv_prog_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OBJDUMP_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP_FOR_TARGET=$ac_cv_prog_OBJDUMP_FOR_TARGET
+if test -n "$OBJDUMP_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP_FOR_TARGET" >&5
+$as_echo "$OBJDUMP_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" && test $build = $target ; then
+      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJDUMP_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP_FOR_TARGET"; then
+  ac_cv_prog_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OBJDUMP_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP_FOR_TARGET=$ac_cv_prog_OBJDUMP_FOR_TARGET
+if test -n "$OBJDUMP_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP_FOR_TARGET" >&5
+$as_echo "$OBJDUMP_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    test -n "$ac_cv_prog_OBJDUMP_FOR_TARGET" && break
+  done
+fi
+
+if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" ; then
+  set dummy objdump
+  if test $build = $target ; then
+    OBJDUMP_FOR_TARGET="$2"
+  else
+    OBJDUMP_FOR_TARGET="${ncn_target_tool_prefix}$2"
+  fi
+else
+  OBJDUMP_FOR_TARGET="$ac_cv_prog_OBJDUMP_FOR_TARGET"
+fi
+
+else
+  OBJDUMP_FOR_TARGET=$ac_cv_path_OBJDUMP_FOR_TARGET
+fi
+
+
+
+
+if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then
+  if test -n "$with_build_time_tools"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ranlib in $with_build_time_tools" >&5
+$as_echo_n "checking for ranlib in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/ranlib; then
+      RANLIB_FOR_TARGET=`cd $with_build_time_tools && pwd`/ranlib
+      ac_cv_path_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_RANLIB_FOR_TARGET" >&5
+$as_echo "$ac_cv_path_RANLIB_FOR_TARGET" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  elif test $build != $host && test $have_gcc_for_target = yes; then
+    RANLIB_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ranlib`
+    test $RANLIB_FOR_TARGET = ranlib && RANLIB_FOR_TARGET=
+    test -n "$RANLIB_FOR_TARGET" && ac_cv_path_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET
+  fi
+fi
+if test -z "$ac_cv_path_RANLIB_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_RANLIB_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $RANLIB_FOR_TARGET in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $gcc_cv_tool_dirs
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_RANLIB_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+RANLIB_FOR_TARGET=$ac_cv_path_RANLIB_FOR_TARGET
+if test -n "$RANLIB_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB_FOR_TARGET" >&5
+$as_echo "$RANLIB_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then
+
+
+if test -n "$RANLIB_FOR_TARGET"; then
+  ac_cv_prog_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET
+elif test -n "$ac_cv_prog_RANLIB_FOR_TARGET"; then
+  RANLIB_FOR_TARGET=$ac_cv_prog_RANLIB_FOR_TARGET
+fi
+
+if test -n "$ac_cv_prog_RANLIB_FOR_TARGET"; then
+  for ncn_progname in ranlib; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB_FOR_TARGET"; then
+  ac_cv_prog_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB_FOR_TARGET=$ac_cv_prog_RANLIB_FOR_TARGET
+if test -n "$RANLIB_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB_FOR_TARGET" >&5
+$as_echo "$RANLIB_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" && test -n "$with_build_time_tools"; then
+  for ncn_progname in ranlib; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5
+$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/${ncn_progname}; then
+      ac_cv_prog_RANLIB_FOR_TARGET=$with_build_time_tools/${ncn_progname}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      break
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+fi
+
+if test -z "$ac_cv_prog_RANLIB_FOR_TARGET"; then
+  for ncn_progname in ranlib; do
+    if test -n "$ncn_target_tool_prefix"; then
+      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB_FOR_TARGET"; then
+  ac_cv_prog_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB_FOR_TARGET=$ac_cv_prog_RANLIB_FOR_TARGET
+if test -n "$RANLIB_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB_FOR_TARGET" >&5
+$as_echo "$RANLIB_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" && test $build = $target ; then
+      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB_FOR_TARGET"; then
+  ac_cv_prog_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB_FOR_TARGET=$ac_cv_prog_RANLIB_FOR_TARGET
+if test -n "$RANLIB_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB_FOR_TARGET" >&5
+$as_echo "$RANLIB_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    test -n "$ac_cv_prog_RANLIB_FOR_TARGET" && break
+  done
+fi
+
+if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" ; then
+  set dummy ranlib
+  if test $build = $target ; then
+    RANLIB_FOR_TARGET="$2"
+  else
+    RANLIB_FOR_TARGET="${ncn_target_tool_prefix}$2"
+  fi
+else
+  RANLIB_FOR_TARGET="$ac_cv_prog_RANLIB_FOR_TARGET"
+fi
+
+else
+  RANLIB_FOR_TARGET=$ac_cv_path_RANLIB_FOR_TARGET
+fi
+
+
+
+
+if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then
+  if test -n "$with_build_time_tools"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strip in $with_build_time_tools" >&5
+$as_echo_n "checking for strip in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/strip; then
+      STRIP_FOR_TARGET=`cd $with_build_time_tools && pwd`/strip
+      ac_cv_path_STRIP_FOR_TARGET=$STRIP_FOR_TARGET
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_STRIP_FOR_TARGET" >&5
+$as_echo "$ac_cv_path_STRIP_FOR_TARGET" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  elif test $build != $host && test $have_gcc_for_target = yes; then
+    STRIP_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=strip`
+    test $STRIP_FOR_TARGET = strip && STRIP_FOR_TARGET=
+    test -n "$STRIP_FOR_TARGET" && ac_cv_path_STRIP_FOR_TARGET=$STRIP_FOR_TARGET
+  fi
+fi
+if test -z "$ac_cv_path_STRIP_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_STRIP_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $STRIP_FOR_TARGET in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $gcc_cv_tool_dirs
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_STRIP_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+STRIP_FOR_TARGET=$ac_cv_path_STRIP_FOR_TARGET
+if test -n "$STRIP_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP_FOR_TARGET" >&5
+$as_echo "$STRIP_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then
+
+
+if test -n "$STRIP_FOR_TARGET"; then
+  ac_cv_prog_STRIP_FOR_TARGET=$STRIP_FOR_TARGET
+elif test -n "$ac_cv_prog_STRIP_FOR_TARGET"; then
+  STRIP_FOR_TARGET=$ac_cv_prog_STRIP_FOR_TARGET
+fi
+
+if test -n "$ac_cv_prog_STRIP_FOR_TARGET"; then
+  for ncn_progname in strip; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP_FOR_TARGET"; then
+  ac_cv_prog_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP_FOR_TARGET=$ac_cv_prog_STRIP_FOR_TARGET
+if test -n "$STRIP_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP_FOR_TARGET" >&5
+$as_echo "$STRIP_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+if test -z "$ac_cv_prog_STRIP_FOR_TARGET" && test -n "$with_build_time_tools"; then
+  for ncn_progname in strip; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5
+$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/${ncn_progname}; then
+      ac_cv_prog_STRIP_FOR_TARGET=$with_build_time_tools/${ncn_progname}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      break
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+fi
+
+if test -z "$ac_cv_prog_STRIP_FOR_TARGET"; then
+  for ncn_progname in strip; do
+    if test -n "$ncn_target_tool_prefix"; then
+      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP_FOR_TARGET"; then
+  ac_cv_prog_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP_FOR_TARGET=$ac_cv_prog_STRIP_FOR_TARGET
+if test -n "$STRIP_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP_FOR_TARGET" >&5
+$as_echo "$STRIP_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    if test -z "$ac_cv_prog_STRIP_FOR_TARGET" && test $build = $target ; then
+      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP_FOR_TARGET"; then
+  ac_cv_prog_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP_FOR_TARGET=$ac_cv_prog_STRIP_FOR_TARGET
+if test -n "$STRIP_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP_FOR_TARGET" >&5
+$as_echo "$STRIP_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    test -n "$ac_cv_prog_STRIP_FOR_TARGET" && break
+  done
+fi
+
+if test -z "$ac_cv_prog_STRIP_FOR_TARGET" ; then
+  set dummy strip
+  if test $build = $target ; then
+    STRIP_FOR_TARGET="$2"
+  else
+    STRIP_FOR_TARGET="${ncn_target_tool_prefix}$2"
+  fi
+else
+  STRIP_FOR_TARGET="$ac_cv_prog_STRIP_FOR_TARGET"
+fi
+
+else
+  STRIP_FOR_TARGET=$ac_cv_path_STRIP_FOR_TARGET
+fi
+
+
+
+
+if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then
+  if test -n "$with_build_time_tools"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for windres in $with_build_time_tools" >&5
+$as_echo_n "checking for windres in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/windres; then
+      WINDRES_FOR_TARGET=`cd $with_build_time_tools && pwd`/windres
+      ac_cv_path_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_WINDRES_FOR_TARGET" >&5
+$as_echo "$ac_cv_path_WINDRES_FOR_TARGET" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  elif test $build != $host && test $have_gcc_for_target = yes; then
+    WINDRES_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=windres`
+    test $WINDRES_FOR_TARGET = windres && WINDRES_FOR_TARGET=
+    test -n "$WINDRES_FOR_TARGET" && ac_cv_path_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET
+  fi
+fi
+if test -z "$ac_cv_path_WINDRES_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
+  # Extract the first word of "windres", so it can be a program name with args.
+set dummy windres; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_WINDRES_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $WINDRES_FOR_TARGET in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $gcc_cv_tool_dirs
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_WINDRES_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+WINDRES_FOR_TARGET=$ac_cv_path_WINDRES_FOR_TARGET
+if test -n "$WINDRES_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES_FOR_TARGET" >&5
+$as_echo "$WINDRES_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then
+
+
+if test -n "$WINDRES_FOR_TARGET"; then
+  ac_cv_prog_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET
+elif test -n "$ac_cv_prog_WINDRES_FOR_TARGET"; then
+  WINDRES_FOR_TARGET=$ac_cv_prog_WINDRES_FOR_TARGET
+fi
+
+if test -n "$ac_cv_prog_WINDRES_FOR_TARGET"; then
+  for ncn_progname in windres; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_WINDRES_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$WINDRES_FOR_TARGET"; then
+  ac_cv_prog_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_WINDRES_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+WINDRES_FOR_TARGET=$ac_cv_prog_WINDRES_FOR_TARGET
+if test -n "$WINDRES_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES_FOR_TARGET" >&5
+$as_echo "$WINDRES_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" && test -n "$with_build_time_tools"; then
+  for ncn_progname in windres; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5
+$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/${ncn_progname}; then
+      ac_cv_prog_WINDRES_FOR_TARGET=$with_build_time_tools/${ncn_progname}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      break
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+fi
+
+if test -z "$ac_cv_prog_WINDRES_FOR_TARGET"; then
+  for ncn_progname in windres; do
+    if test -n "$ncn_target_tool_prefix"; then
+      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_WINDRES_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$WINDRES_FOR_TARGET"; then
+  ac_cv_prog_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_WINDRES_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+WINDRES_FOR_TARGET=$ac_cv_prog_WINDRES_FOR_TARGET
+if test -n "$WINDRES_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES_FOR_TARGET" >&5
+$as_echo "$WINDRES_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" && test $build = $target ; then
+      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_WINDRES_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$WINDRES_FOR_TARGET"; then
+  ac_cv_prog_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_WINDRES_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+WINDRES_FOR_TARGET=$ac_cv_prog_WINDRES_FOR_TARGET
+if test -n "$WINDRES_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES_FOR_TARGET" >&5
+$as_echo "$WINDRES_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    test -n "$ac_cv_prog_WINDRES_FOR_TARGET" && break
+  done
+fi
+
+if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" ; then
+  set dummy windres
+  if test $build = $target ; then
+    WINDRES_FOR_TARGET="$2"
+  else
+    WINDRES_FOR_TARGET="${ncn_target_tool_prefix}$2"
+  fi
+else
+  WINDRES_FOR_TARGET="$ac_cv_prog_WINDRES_FOR_TARGET"
+fi
+
+else
+  WINDRES_FOR_TARGET=$ac_cv_path_WINDRES_FOR_TARGET
+fi
+
+
+
+
+if test -z "$ac_cv_path_WINDMC_FOR_TARGET" ; then
+  if test -n "$with_build_time_tools"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for windmc in $with_build_time_tools" >&5
+$as_echo_n "checking for windmc in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/windmc; then
+      WINDMC_FOR_TARGET=`cd $with_build_time_tools && pwd`/windmc
+      ac_cv_path_WINDMC_FOR_TARGET=$WINDMC_FOR_TARGET
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_WINDMC_FOR_TARGET" >&5
+$as_echo "$ac_cv_path_WINDMC_FOR_TARGET" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  elif test $build != $host && test $have_gcc_for_target = yes; then
+    WINDMC_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=windmc`
+    test $WINDMC_FOR_TARGET = windmc && WINDMC_FOR_TARGET=
+    test -n "$WINDMC_FOR_TARGET" && ac_cv_path_WINDMC_FOR_TARGET=$WINDMC_FOR_TARGET
+  fi
+fi
+if test -z "$ac_cv_path_WINDMC_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
+  # Extract the first word of "windmc", so it can be a program name with args.
+set dummy windmc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_WINDMC_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $WINDMC_FOR_TARGET in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_WINDMC_FOR_TARGET="$WINDMC_FOR_TARGET" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $gcc_cv_tool_dirs
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_WINDMC_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+WINDMC_FOR_TARGET=$ac_cv_path_WINDMC_FOR_TARGET
+if test -n "$WINDMC_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDMC_FOR_TARGET" >&5
+$as_echo "$WINDMC_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_WINDMC_FOR_TARGET" ; then
+
+
+if test -n "$WINDMC_FOR_TARGET"; then
+  ac_cv_prog_WINDMC_FOR_TARGET=$WINDMC_FOR_TARGET
+elif test -n "$ac_cv_prog_WINDMC_FOR_TARGET"; then
+  WINDMC_FOR_TARGET=$ac_cv_prog_WINDMC_FOR_TARGET
+fi
+
+if test -n "$ac_cv_prog_WINDMC_FOR_TARGET"; then
+  for ncn_progname in windmc; do
+    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_WINDMC_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$WINDMC_FOR_TARGET"; then
+  ac_cv_prog_WINDMC_FOR_TARGET="$WINDMC_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_WINDMC_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+WINDMC_FOR_TARGET=$ac_cv_prog_WINDMC_FOR_TARGET
+if test -n "$WINDMC_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDMC_FOR_TARGET" >&5
+$as_echo "$WINDMC_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  done
+fi
+
+if test -z "$ac_cv_prog_WINDMC_FOR_TARGET" && test -n "$with_build_time_tools"; then
+  for ncn_progname in windmc; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5
+$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; }
+    if test -x $with_build_time_tools/${ncn_progname}; then
+      ac_cv_prog_WINDMC_FOR_TARGET=$with_build_time_tools/${ncn_progname}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      break
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+fi
+
+if test -z "$ac_cv_prog_WINDMC_FOR_TARGET"; then
+  for ncn_progname in windmc; do
+    if test -n "$ncn_target_tool_prefix"; then
+      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_WINDMC_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$WINDMC_FOR_TARGET"; then
+  ac_cv_prog_WINDMC_FOR_TARGET="$WINDMC_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_WINDMC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+WINDMC_FOR_TARGET=$ac_cv_prog_WINDMC_FOR_TARGET
+if test -n "$WINDMC_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDMC_FOR_TARGET" >&5
+$as_echo "$WINDMC_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    if test -z "$ac_cv_prog_WINDMC_FOR_TARGET" && test $build = $target ; then
+      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
+set dummy ${ncn_progname}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_WINDMC_FOR_TARGET+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$WINDMC_FOR_TARGET"; then
+  ac_cv_prog_WINDMC_FOR_TARGET="$WINDMC_FOR_TARGET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_WINDMC_FOR_TARGET="${ncn_progname}"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+WINDMC_FOR_TARGET=$ac_cv_prog_WINDMC_FOR_TARGET
+if test -n "$WINDMC_FOR_TARGET"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDMC_FOR_TARGET" >&5
+$as_echo "$WINDMC_FOR_TARGET" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    test -n "$ac_cv_prog_WINDMC_FOR_TARGET" && break
+  done
+fi
+
+if test -z "$ac_cv_prog_WINDMC_FOR_TARGET" ; then
+  set dummy windmc
+  if test $build = $target ; then
+    WINDMC_FOR_TARGET="$2"
+  else
+    WINDMC_FOR_TARGET="${ncn_target_tool_prefix}$2"
+  fi
+else
+  WINDMC_FOR_TARGET="$ac_cv_prog_WINDMC_FOR_TARGET"
+fi
+
+else
+  WINDMC_FOR_TARGET=$ac_cv_path_WINDMC_FOR_TARGET
+fi
+
+
+RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target ar" >&5
+$as_echo_n "checking where to find the target ar... " >&6; }
+if test "x${build}" != "x${host}" ; then
+  if expr "x$AR_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $AR_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  else
+    # Canadian cross, just use what we found
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+else
+  ok=yes
+  case " ${configdirs} " in
+    *" binutils "*) ;;
+    *) ok=no ;;
+  esac
+
+  if test $ok = yes; then
+    # An in-tree tool is available and we can use it
+    AR_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/ar'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
+$as_echo "just compiled" >&6; }
+  elif expr "x$AR_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $AR_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  elif test "x$target" = "x$host"; then
+    # We can use an host tool
+    AR_FOR_TARGET='$(AR)'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
+$as_echo "host tool" >&6; }
+  else
+    # We need a cross tool
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target as" >&5
+$as_echo_n "checking where to find the target as... " >&6; }
+if test "x${build}" != "x${host}" ; then
+  if expr "x$AS_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $AS_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  else
+    # Canadian cross, just use what we found
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+else
+  ok=yes
+  case " ${configdirs} " in
+    *" gas "*) ;;
+    *) ok=no ;;
+  esac
+
+  if test $ok = yes; then
+    # An in-tree tool is available and we can use it
+    AS_FOR_TARGET='$$r/$(HOST_SUBDIR)/gas/as-new'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
+$as_echo "just compiled" >&6; }
+  elif expr "x$AS_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $AS_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  elif test "x$target" = "x$host"; then
+    # We can use an host tool
+    AS_FOR_TARGET='$(AS)'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
+$as_echo "host tool" >&6; }
+  else
+    # We need a cross tool
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target cc" >&5
+$as_echo_n "checking where to find the target cc... " >&6; }
+if test "x${build}" != "x${host}" ; then
+  if expr "x$CC_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $CC_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  else
+    # Canadian cross, just use what we found
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+else
+  ok=yes
+  case " ${configdirs} " in
+    *" gcc "*) ;;
+    *) ok=no ;;
+  esac
+
+  if test $ok = yes; then
+    # An in-tree tool is available and we can use it
+    CC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
+$as_echo "just compiled" >&6; }
+  elif expr "x$CC_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $CC_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  elif test "x$target" = "x$host"; then
+    # We can use an host tool
+    CC_FOR_TARGET='$(CC)'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
+$as_echo "host tool" >&6; }
+  else
+    # We need a cross tool
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target c++" >&5
+$as_echo_n "checking where to find the target c++... " >&6; }
+if test "x${build}" != "x${host}" ; then
+  if expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $CXX_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  else
+    # Canadian cross, just use what we found
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+else
+  ok=yes
+  case " ${configdirs} " in
+    *" gcc "*) ;;
+    *) ok=no ;;
+  esac
+  case ,${enable_languages}, in
+    *,c++,*) ;;
+    *) ok=no ;;
+  esac
+  if test $ok = yes; then
+    # An in-tree tool is available and we can use it
+    CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `if test -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags; then $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes; else echo -funconfigured-libstdc++-v3 ; fi` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
+$as_echo "just compiled" >&6; }
+  elif expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $CXX_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  elif test "x$target" = "x$host"; then
+    # We can use an host tool
+    CXX_FOR_TARGET='$(CXX)'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
+$as_echo "host tool" >&6; }
+  else
+    # We need a cross tool
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target c++ for libstdc++" >&5
+$as_echo_n "checking where to find the target c++ for libstdc++... " >&6; }
+if test "x${build}" != "x${host}" ; then
+  if expr "x$RAW_CXX_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $RAW_CXX_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  else
+    # Canadian cross, just use what we found
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+else
+  ok=yes
+  case " ${configdirs} " in
+    *" gcc "*) ;;
+    *) ok=no ;;
+  esac
+  case ,${enable_languages}, in
+    *,c++,*) ;;
+    *) ok=no ;;
+  esac
+  if test $ok = yes; then
+    # An in-tree tool is available and we can use it
+    RAW_CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
+$as_echo "just compiled" >&6; }
+  elif expr "x$RAW_CXX_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $RAW_CXX_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  elif test "x$target" = "x$host"; then
+    # We can use an host tool
+    RAW_CXX_FOR_TARGET='$(CXX)'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
+$as_echo "host tool" >&6; }
+  else
+    # We need a cross tool
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target dlltool" >&5
+$as_echo_n "checking where to find the target dlltool... " >&6; }
+if test "x${build}" != "x${host}" ; then
+  if expr "x$DLLTOOL_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $DLLTOOL_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  else
+    # Canadian cross, just use what we found
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+else
+  ok=yes
+  case " ${configdirs} " in
+    *" binutils "*) ;;
+    *) ok=no ;;
+  esac
+
+  if test $ok = yes; then
+    # An in-tree tool is available and we can use it
+    DLLTOOL_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/dlltool'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
+$as_echo "just compiled" >&6; }
+  elif expr "x$DLLTOOL_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $DLLTOOL_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  elif test "x$target" = "x$host"; then
+    # We can use an host tool
+    DLLTOOL_FOR_TARGET='$(DLLTOOL)'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
+$as_echo "host tool" >&6; }
+  else
+    # We need a cross tool
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target gcc" >&5
+$as_echo_n "checking where to find the target gcc... " >&6; }
+if test "x${build}" != "x${host}" ; then
+  if expr "x$GCC_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $GCC_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  else
+    # Canadian cross, just use what we found
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+else
+  ok=yes
+  case " ${configdirs} " in
+    *" gcc "*) ;;
+    *) ok=no ;;
+  esac
+
+  if test $ok = yes; then
+    # An in-tree tool is available and we can use it
+    GCC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
+$as_echo "just compiled" >&6; }
+  elif expr "x$GCC_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $GCC_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  elif test "x$target" = "x$host"; then
+    # We can use an host tool
+    GCC_FOR_TARGET='$()'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
+$as_echo "host tool" >&6; }
+  else
+    # We need a cross tool
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target gcj" >&5
+$as_echo_n "checking where to find the target gcj... " >&6; }
+if test "x${build}" != "x${host}" ; then
+  if expr "x$GCJ_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $GCJ_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  else
+    # Canadian cross, just use what we found
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+else
+  ok=yes
+  case " ${configdirs} " in
+    *" gcc "*) ;;
+    *) ok=no ;;
+  esac
+  case ,${enable_languages}, in
+    *,java,*) ;;
+    *) ok=no ;;
+  esac
+  if test $ok = yes; then
+    # An in-tree tool is available and we can use it
+    GCJ_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
+$as_echo "just compiled" >&6; }
+  elif expr "x$GCJ_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $GCJ_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  elif test "x$target" = "x$host"; then
+    # We can use an host tool
+    GCJ_FOR_TARGET='$(GCJ)'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
+$as_echo "host tool" >&6; }
+  else
+    # We need a cross tool
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target gfortran" >&5
+$as_echo_n "checking where to find the target gfortran... " >&6; }
+if test "x${build}" != "x${host}" ; then
+  if expr "x$GFORTRAN_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $GFORTRAN_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  else
+    # Canadian cross, just use what we found
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+else
+  ok=yes
+  case " ${configdirs} " in
+    *" gcc "*) ;;
+    *) ok=no ;;
+  esac
+  case ,${enable_languages}, in
+    *,fortran,*) ;;
+    *) ok=no ;;
+  esac
+  if test $ok = yes; then
+    # An in-tree tool is available and we can use it
+    GFORTRAN_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
+$as_echo "just compiled" >&6; }
+  elif expr "x$GFORTRAN_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $GFORTRAN_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  elif test "x$target" = "x$host"; then
+    # We can use an host tool
+    GFORTRAN_FOR_TARGET='$(GFORTRAN)'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
+$as_echo "host tool" >&6; }
+  else
+    # We need a cross tool
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target gccgo" >&5
+$as_echo_n "checking where to find the target gccgo... " >&6; }
+if test "x${build}" != "x${host}" ; then
+  if expr "x$GOC_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $GOC_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  else
+    # Canadian cross, just use what we found
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+else
+  ok=yes
+  case " ${configdirs} " in
+    *" gcc "*) ;;
+    *) ok=no ;;
+  esac
+  case ,${enable_languages}, in
+    *,go,*) ;;
+    *) ok=no ;;
+  esac
+  if test $ok = yes; then
+    # An in-tree tool is available and we can use it
+    GOC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gccgo -B$$r/$(HOST_SUBDIR)/gcc/'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
+$as_echo "just compiled" >&6; }
+  elif expr "x$GOC_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $GOC_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  elif test "x$target" = "x$host"; then
+    # We can use an host tool
+    GOC_FOR_TARGET='$(GOC)'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
+$as_echo "host tool" >&6; }
+  else
+    # We need a cross tool
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target ld" >&5
+$as_echo_n "checking where to find the target ld... " >&6; }
+if test "x${build}" != "x${host}" ; then
+  if expr "x$LD_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $LD_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  else
+    # Canadian cross, just use what we found
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+else
+  ok=yes
+  case " ${configdirs} " in
+    *" ld "*) ;;
+    *) ok=no ;;
+  esac
+
+  if test $ok = yes; then
+    # An in-tree tool is available and we can use it
+    LD_FOR_TARGET='$$r/$(HOST_SUBDIR)/ld/ld-new'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
+$as_echo "just compiled" >&6; }
+  elif expr "x$LD_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $LD_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  elif test "x$target" = "x$host"; then
+    # We can use an host tool
+    LD_FOR_TARGET='$(LD)'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
+$as_echo "host tool" >&6; }
+  else
+    # We need a cross tool
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target lipo" >&5
+$as_echo_n "checking where to find the target lipo... " >&6; }
+if test "x${build}" != "x${host}" ; then
+  if expr "x$LIPO_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $LIPO_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  else
+    # Canadian cross, just use what we found
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+else
+  if expr "x$LIPO_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $LIPO_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  elif test "x$target" = "x$host"; then
+    # We can use an host tool
+    LIPO_FOR_TARGET='$(LIPO)'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
+$as_echo "host tool" >&6; }
+  else
+    # We need a cross tool
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target nm" >&5
+$as_echo_n "checking where to find the target nm... " >&6; }
+if test "x${build}" != "x${host}" ; then
+  if expr "x$NM_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $NM_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  else
+    # Canadian cross, just use what we found
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+else
+  ok=yes
+  case " ${configdirs} " in
+    *" binutils "*) ;;
+    *) ok=no ;;
+  esac
+
+  if test $ok = yes; then
+    # An in-tree tool is available and we can use it
+    NM_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/nm-new'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
+$as_echo "just compiled" >&6; }
+  elif expr "x$NM_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $NM_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  elif test "x$target" = "x$host"; then
+    # We can use an host tool
+    NM_FOR_TARGET='$(NM)'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
+$as_echo "host tool" >&6; }
+  else
+    # We need a cross tool
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target objdump" >&5
+$as_echo_n "checking where to find the target objdump... " >&6; }
+if test "x${build}" != "x${host}" ; then
+  if expr "x$OBJDUMP_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $OBJDUMP_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  else
+    # Canadian cross, just use what we found
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+else
+  ok=yes
+  case " ${configdirs} " in
+    *" binutils "*) ;;
+    *) ok=no ;;
+  esac
+
+  if test $ok = yes; then
+    # An in-tree tool is available and we can use it
+    OBJDUMP_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/objdump'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
+$as_echo "just compiled" >&6; }
+  elif expr "x$OBJDUMP_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $OBJDUMP_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  elif test "x$target" = "x$host"; then
+    # We can use an host tool
+    OBJDUMP_FOR_TARGET='$(OBJDUMP)'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
+$as_echo "host tool" >&6; }
+  else
+    # We need a cross tool
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target ranlib" >&5
+$as_echo_n "checking where to find the target ranlib... " >&6; }
+if test "x${build}" != "x${host}" ; then
+  if expr "x$RANLIB_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $RANLIB_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  else
+    # Canadian cross, just use what we found
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+else
+  ok=yes
+  case " ${configdirs} " in
+    *" binutils "*) ;;
+    *) ok=no ;;
+  esac
+
+  if test $ok = yes; then
+    # An in-tree tool is available and we can use it
+    RANLIB_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/ranlib'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
+$as_echo "just compiled" >&6; }
+  elif expr "x$RANLIB_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $RANLIB_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  elif test "x$target" = "x$host"; then
+    # We can use an host tool
+    RANLIB_FOR_TARGET='$(RANLIB)'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
+$as_echo "host tool" >&6; }
+  else
+    # We need a cross tool
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target strip" >&5
+$as_echo_n "checking where to find the target strip... " >&6; }
+if test "x${build}" != "x${host}" ; then
+  if expr "x$STRIP_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $STRIP_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  else
+    # Canadian cross, just use what we found
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+else
+  ok=yes
+  case " ${configdirs} " in
+    *" binutils "*) ;;
+    *) ok=no ;;
+  esac
+
+  if test $ok = yes; then
+    # An in-tree tool is available and we can use it
+    STRIP_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/strip-new'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
+$as_echo "just compiled" >&6; }
+  elif expr "x$STRIP_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $STRIP_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  elif test "x$target" = "x$host"; then
+    # We can use an host tool
+    STRIP_FOR_TARGET='$(STRIP)'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
+$as_echo "host tool" >&6; }
+  else
+    # We need a cross tool
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target windres" >&5
+$as_echo_n "checking where to find the target windres... " >&6; }
+if test "x${build}" != "x${host}" ; then
+  if expr "x$WINDRES_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $WINDRES_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  else
+    # Canadian cross, just use what we found
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+else
+  ok=yes
+  case " ${configdirs} " in
+    *" binutils "*) ;;
+    *) ok=no ;;
+  esac
+
+  if test $ok = yes; then
+    # An in-tree tool is available and we can use it
+    WINDRES_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/windres'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
+$as_echo "just compiled" >&6; }
+  elif expr "x$WINDRES_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $WINDRES_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  elif test "x$target" = "x$host"; then
+    # We can use an host tool
+    WINDRES_FOR_TARGET='$(WINDRES)'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
+$as_echo "host tool" >&6; }
+  else
+    # We need a cross tool
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target windmc" >&5
+$as_echo_n "checking where to find the target windmc... " >&6; }
+if test "x${build}" != "x${host}" ; then
+  if expr "x$WINDMC_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $WINDMC_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  else
+    # Canadian cross, just use what we found
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+else
+  ok=yes
+  case " ${configdirs} " in
+    *" binutils "*) ;;
+    *) ok=no ;;
+  esac
+
+  if test $ok = yes; then
+    # An in-tree tool is available and we can use it
+    WINDMC_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/windmc'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
+$as_echo "just compiled" >&6; }
+  elif expr "x$WINDMC_FOR_TARGET" : "x/" > /dev/null; then
+    # We already found the complete path
+    ac_dir=`dirname $WINDMC_FOR_TARGET`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
+$as_echo "pre-installed in $ac_dir" >&6; }
+  elif test "x$target" = "x$host"; then
+    # We can use an host tool
+    WINDMC_FOR_TARGET='$(WINDMC)'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
+$as_echo "host tool" >&6; }
+  else
+    # We need a cross tool
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
+$as_echo "pre-installed" >&6; }
+  fi
+fi
+
+
+
+
+
+# Certain tools may need extra flags.
+AR_FOR_TARGET=${AR_FOR_TARGET}${extra_arflags_for_target}
+RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target}
+NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}
+
+# When building target libraries, except in a Canadian cross, we use
+# the same toolchain as the compiler we just built.
+COMPILER_AS_FOR_TARGET='$(AS_FOR_TARGET)'
+COMPILER_LD_FOR_TARGET='$(LD_FOR_TARGET)'
+COMPILER_NM_FOR_TARGET='$(NM_FOR_TARGET)'
+if test $host = $build; then
+  case " $configdirs " in
+    *" gcc "*)
+      COMPILER_AS_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/as'
+      COMPILER_LD_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/collect-ld'
+      COMPILER_NM_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/nm'${extra_nmflags_for_target}
+      ;;
+  esac
+fi
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+# Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then :
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+
+
+if test "$USE_MAINTAINER_MODE" = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+MAINT=$MAINTAINER_MODE_TRUE
+
+# ---------------------
+# GCC bootstrap support
+# ---------------------
+
+# Stage specific cflags for build.
+stage1_cflags="-g"
+case $build in
+  vax-*-*)
+    case ${GCC} in
+      yes) stage1_cflags="-g -Wa,-J" ;;
+      *) stage1_cflags="-g -J" ;;
+    esac ;;
+esac
+
+# This is aimed to mimic bootstrap with a non-GCC compiler to catch problems.
+if test "$GCC" = yes -a "$ENABLE_BUILD_WITH_CXX" != yes; then
+  saved_CFLAGS="$CFLAGS"
+
+  # Pass -fkeep-inline-functions for stage 1 if the GCC version supports it.
+  CFLAGS="$CFLAGS -fkeep-inline-functions"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -fkeep-inline-functions is supported" >&5
+$as_echo_n "checking whether -fkeep-inline-functions is supported... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if (__GNUC__ < 3) \
+    || (__GNUC__ == 3 && (__GNUC_MINOR__ < 3 \
+			  || (__GNUC_MINOR__ == 3 && __GNUC_PATCHLEVEL__ < 1)))
+#error http://gcc.gnu.org/PR29382
+#endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }; stage1_cflags="$stage1_cflags -fkeep-inline-functions"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+  CFLAGS="$saved_CFLAGS"
+fi
+
+
+
+# Enable --enable-checking in stage1 of the compiler.
+# Check whether --enable-stage1-checking was given.
+if test "${enable_stage1_checking+set}" = set; then :
+  enableval=$enable_stage1_checking; stage1_checking=--enable-checking=${enable_stage1_checking}
+else
+  if test "x$enable_checking" = xno || test "x$enable_checking" = x; then
+  stage1_checking=--enable-checking=yes,types
+else
+  stage1_checking=--enable-checking=$enable_checking,types
+fi
+fi
+
+
+
+# Enable -Werror in bootstrap stage2 and later.
+# Check whether --enable-werror was given.
+if test "${enable_werror+set}" = set; then :
+  enableval=$enable_werror;
+else
+  if test -d ${srcdir}/gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental; then
+  enable_werror=yes
+else
+  enable_werror=no
+fi
+fi
+
+case ${enable_werror} in
+  yes) stage2_werror_flag="--enable-werror-always" ;;
+  *) stage2_werror_flag="" ;;
+esac
+
+
+# If using ENABLE_BUILD_POSTSTAGE1_WITH_CXX, pass
+# --enable-build-with-cxx after stage1.
+if test "$ENABLE_BUILD_POSTSTAGE1_WITH_CXX" = "yes"; then
+  POSTSTAGE1_CONFIGURE_FLAGS=--enable-build-with-cxx
+else
+  POSTSTAGE1_CONFIGURE_FLAGS=
+fi
+
+
+# Specify what files to not compare during bootstrap.
+
+compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*"
+case "$target" in
+  hppa*64*-*-hpux*) ;;
+  hppa*-*-hpux*) compare_exclusions="gcc/cc*-checksum\$(objext) | */libgcc/lib2funcs* | gcc/ada/*tools/*" ;;
+esac
+case " $configdirs " in
+*" ppl "*) compare_exclusions="$compare_exclusions | ppl/src/ppl-config.o" ;;
+esac
+
+
+ac_config_files="$ac_config_files Makefile"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    test "x$cache_file" != "x/dev/null" &&
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+    cat confcache >$cache_file
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
+t clear
+:clear
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+b any
+:quote
+s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
+s/\[/\\&/g
+s/\]/\\&/g
+s/\$/$$/g
+H
+:any
+${
+	g
+	s/^\n//
+	s/\n/ /g
+	p
+}
+'
+DEFS=`sed -n "$ac_script" confdefs.h`
+
+
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+
+: ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by $as_me, which was
+generated by GNU Autoconf 2.64.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Report bugs to the package provider."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_version="\\
+config.status
+configured by $0, generated by GNU Autoconf 2.64,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright (C) 2009 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h |  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+extrasub_build="$extrasub_build"
+   extrasub_host="$extrasub_host"
+   extrasub_target="$extrasub_target"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp=
+  trap 'exit_status=$?
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+if $AWK 'BEGIN { getline <"/dev/null" }' </dev/null 2>/dev/null; then
+  ac_cs_awk_getline=:
+  ac_cs_awk_pipe_init=
+  ac_cs_awk_read_file='
+      while ((getline aline < (F[key])) > 0)
+	print(aline)
+      close(F[key])'
+  ac_cs_awk_pipe_fini=
+else
+  ac_cs_awk_getline=false
+  ac_cs_awk_pipe_init="print \"cat <<'|#_!!_#|' &&\""
+  ac_cs_awk_read_file='
+      print "|#_!!_#|"
+      print "cat " F[key] " &&"
+      '$ac_cs_awk_pipe_init
+  # The final `:' finishes the AND list.
+  ac_cs_awk_pipe_fini='END { print "|#_!!_#|"; print ":" }'
+fi
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
+
+# Create commands to substitute file output variables.
+{
+  echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" &&
+  echo 'cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&' &&
+  echo "$ac_subst_files" | sed 's/.*/F["&"]="$&"/' &&
+  echo "_ACAWK" &&
+  echo "_ACEOF"
+} >conf$$files.sh &&
+. ./conf$$files.sh ||
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+rm -f conf$$files.sh
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+  \$ac_cs_awk_pipe_init
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+  if (nfields == 3 && !substed) {
+    key = field[2]
+    if (F[key] != "" && line ~ /^[	 ]*@.*@[	 ]*$/) {
+      \$ac_cs_awk_read_file
+      next
+    }
+  }
+  print line
+}
+\$ac_cs_awk_pipe_fini
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+
+eval set X "  :F $CONFIG_FILES      "
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" |
+if $ac_cs_awk_getline; then
+  $AWK -f "$tmp/subs.awk"
+else
+  $AWK -f "$tmp/subs.awk" | $SHELL
+fi >$tmp/out \
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&2;}
+
+  rm -f "$tmp/stdin"
+  case $ac_file in
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
+ ;;
+
+
+
+  esac
+
+
+  case $ac_file$ac_mode in
+    "Makefile":F) sed "$extrasub_build" Makefile |
+   sed "$extrasub_host" |
+   sed "$extrasub_target" > mf$$
+   mv -f mf$$ Makefile ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit $?
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/configure.ac sdcc-3.2.0+dfsg/support/sdbinutils/configure.ac
--- sdcc-3.1.0+dfsg/support/sdbinutils/configure.ac	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/configure.ac	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,3250 @@
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+#   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+#   Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+##############################################################################
+### WARNING: this file contains embedded tabs.  Do not run untabify on this file.
+
+m4_include(config/acx.m4)
+m4_include(config/override.m4)
+m4_include(config/proginstall.m4)
+m4_include(config/elf.m4)
+m4_include([libtool.m4])
+m4_include([ltoptions.m4])
+m4_include([ltsugar.m4])
+m4_include([ltversion.m4])
+m4_include([lt~obsolete.m4])
+m4_include([config/cloog.m4])
+
+AC_INIT(move-if-change)
+AC_PREREQ(2.64)
+AC_DISABLE_OPTION_CHECKING
+
+progname=$0
+# if PWD already has a value, it is probably wrong.
+if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi
+
+# Export original configure arguments for use by sub-configures.
+# Quote arguments with shell meta charatcers.
+TOPLEVEL_CONFIGURE_ARGUMENTS=
+set -- "$progname" "$@"
+for ac_arg
+do
+  case "$ac_arg" in
+  *" "*|*"	"*|*[[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\']]*)
+    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
+    # if the argument is of the form -foo=baz, quote the baz part only
+    ac_arg=`echo "'$ac_arg'" | sed "s/^'\([[-a-zA-Z0-9]]*=\)/\\1'/"` ;;
+  *) ;;
+  esac
+  # Add the quoted argument to the list.
+  TOPLEVEL_CONFIGURE_ARGUMENTS="$TOPLEVEL_CONFIGURE_ARGUMENTS $ac_arg"
+done
+if test "$silent" = yes; then
+  TOPLEVEL_CONFIGURE_ARGUMENTS="$TOPLEVEL_CONFIGURE_ARGUMENTS --silent"
+fi
+# Remove the initial space we just introduced and, as these will be
+# expanded by make, quote '$'.
+TOPLEVEL_CONFIGURE_ARGUMENTS=`echo "x$TOPLEVEL_CONFIGURE_ARGUMENTS" | sed -e 's/^x *//' -e 's,\\$,$$,g'`
+AC_SUBST(TOPLEVEL_CONFIGURE_ARGUMENTS)
+
+# Find the build, host, and target systems.
+ACX_NONCANONICAL_BUILD
+ACX_NONCANONICAL_HOST
+ACX_NONCANONICAL_TARGET
+
+dnl Autoconf 2.5x and later will set a default program prefix if
+dnl --target was used, even if it was the same as --host.  Disable
+dnl that behavior.  This must be done before AC_CANONICAL_SYSTEM
+dnl to take effect.
+test "$host_noncanonical" = "$target_noncanonical" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_transform_name=s,y,y,
+
+AC_CANONICAL_SYSTEM
+AC_ARG_PROGRAM
+
+m4_pattern_allow([^AS_FOR_TARGET$])dnl
+m4_pattern_allow([^AS_FOR_BUILD$])dnl
+
+# Get 'install' or 'install-sh' and its variants.
+AC_PROG_INSTALL
+ACX_PROG_LN
+AC_PROG_LN_S
+AC_PROG_SED
+AC_PROG_AWK
+
+srcpwd=`cd ${srcdir} ; ${PWDCMD-pwd}`
+
+# We pass INSTALL explicitly to sub-makes.  Make sure that it is not
+# a relative path.
+if test "$INSTALL" = "${srcdir}/install-sh -c"; then
+  INSTALL="${srcpwd}/install-sh -c"
+fi
+
+# Set srcdir to "." if that's what it is.
+# This is important for multilib support.
+pwd=`${PWDCMD-pwd}`
+if test "${pwd}" = "${srcpwd}" ; then
+  srcdir=.
+fi
+
+topsrcdir=$srcpwd
+
+extra_host_args=
+
+### To add a new directory to the tree, first choose whether it is a target
+### or a host dependent tool.  Then put it into the appropriate list
+### (library or tools, host or target), doing a dependency sort.
+
+# Subdirs will be configured in the order listed in build_configdirs, 
+# configdirs, or target_configdirs; see the serialization section below.
+
+# Dependency sorting is only needed when *configuration* must be done in 
+# a particular order.  In all cases a dependency should be specified in 
+# the Makefile, whether or not it's implicitly specified here.
+
+# Double entries in build_configdirs, configdirs, or target_configdirs may
+# cause circular dependencies and break everything horribly.
+
+# these library is used by various programs built for the build
+# environment
+#
+build_libs="build-libiberty"
+
+# these tools are built for the build environment
+build_tools="build-texinfo build-flex build-bison build-m4 build-fixincludes"
+
+# these libraries are used by various programs built for the host environment
+#
+host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libelf libiconv"
+
+# these tools are built for the host environment
+# Note, the powerpc-eabi build depends on sim occurring before gdb in order to
+# know that we are building the simulator.
+# binutils, gas and ld appear in that order because it makes sense to run
+# "make check" in that particular order.
+# If --enable-gold is used, "gold" may replace "ld".
+host_tools="flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools"
+
+# libgcj represents the runtime libraries only used by gcj.
+libgcj="target-libffi \
+	target-zlib \
+	target-libjava"
+
+# these libraries are built for the target environment, and are built after
+# the host libraries and the host tools (which may be a cross compiler)
+# Note that libiberty is not a target library.
+target_libraries="target-libgcc \
+		target-libgloss \
+		target-newlib \
+		target-libgomp \
+		target-libstdc++-v3 \
+		target-libmudflap \
+		target-libssp \
+		target-libquadmath \
+		target-libgfortran \
+		target-boehm-gc \
+		${libgcj} \
+		target-libobjc \
+		target-libada \
+		target-libgo"
+
+# these tools are built using the target libraries, and are intended to
+# run only in the target environment
+#
+# note: any program that *uses* libraries that are in the "target_libraries"
+# list belongs in this list.
+#
+target_tools="target-rda"
+
+################################################################################
+
+## All tools belong in one of the four categories, and are assigned above
+## We assign ${configdirs} this way to remove all embedded newlines.  This
+## is important because configure will choke if they ever get through.
+## ${configdirs} is directories we build using the host tools.
+## ${target_configdirs} is directories we build using the target tools.
+configdirs=`echo ${host_libs} ${host_tools}`
+target_configdirs=`echo ${target_libraries} ${target_tools}`
+build_configdirs=`echo ${build_libs} ${build_tools}`
+
+m4_divert_text([PARSE_ARGS],
+[case $srcdir in
+  *" "*)
+m4_pushdef([AS_MESSAGE_LOG_FD], [])dnl
+    AC_MSG_ERROR([path to source, $srcdir, contains spaces])
+m4_popdef([AS_MESSAGE_LOG_FD])dnl
+    ;;
+esac
+ac_subdirs_all=`cd $srcdir && echo */configure | sed 's,/configure,,g'`
+])
+
+################################################################################
+
+srcname="gnu development package"
+
+# This gets set non-empty for some net releases of packages.
+appdirs=""
+
+# Define is_cross_compiler to save on calls to 'test'.
+is_cross_compiler=
+if test x"${host}" = x"${target}" ; then
+  is_cross_compiler=no
+else
+  is_cross_compiler=yes
+fi	
+
+# Find the build and target subdir names.
+GCC_TOPLEV_SUBDIRS
+# Be sure to cover against remnants of an in-tree build.
+if test $srcdir != .  && test -d $srcdir/host-${host_noncanonical}; then
+  AC_MSG_ERROR([building out of tree but $srcdir contains host-${host_noncanonical}.
+Use a pristine source tree when building in a separate tree])
+fi
+
+# Skipdirs are removed silently.
+skipdirs=
+# Noconfigdirs are removed loudly.
+noconfigdirs=""
+
+use_gnu_ld=
+# Make sure we don't let GNU ld be added if we didn't want it.
+if test x$with_gnu_ld = xno ; then
+  use_gnu_ld=no
+  noconfigdirs="$noconfigdirs ld gold"
+fi
+
+use_gnu_as=
+# Make sure we don't let GNU as be added if we didn't want it.
+if test x$with_gnu_as = xno ; then
+  use_gnu_as=no
+  noconfigdirs="$noconfigdirs gas"
+fi
+
+use_included_zlib=
+# Make sure we don't let ZLIB be added if we didn't want it.
+if test x$with_system_zlib = xyes ; then
+  use_included_zlib=no
+  noconfigdirs="$noconfigdirs zlib"
+fi
+
+# some tools are so dependent upon X11 that if we're not building with X, 
+# it's not even worth trying to configure, much less build, that tool.
+
+case ${with_x} in
+  yes | "") ;; # the default value for this tree is that X11 is available
+  no)
+    skipdirs="${skipdirs} tk itcl libgui"
+    # We won't be able to build gdbtk without X.
+    enable_gdbtk=no 
+    ;;
+  *)  echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2 ;;
+esac
+
+# Some are only suitable for cross toolchains.
+# Remove these if host=target.
+cross_only="target-libgloss target-newlib target-opcodes"
+
+case $is_cross_compiler in
+  no) skipdirs="${skipdirs} ${cross_only}" ;;
+esac
+
+# If both --with-headers and --with-libs are specified, default to
+# --without-newlib.
+if test x"${with_headers}" != x && test x"${with_headers}" != xno \
+   && test x"${with_libs}" != x && test x"${with_libs}" != xno ; then
+  if test x"${with_newlib}" = x ; then
+    with_newlib=no
+  fi
+fi
+
+# Recognize --with-newlib/--without-newlib.
+case ${with_newlib} in
+  no) skipdirs="${skipdirs} target-newlib" ;;
+  yes) skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` ;;
+esac
+
+# Handle --enable-gold, --enable-ld.
+# --disable-gold [--enable-ld]
+#     Build only ld.  Default option.
+# --enable-gold [--enable-ld]
+#     Build both gold and ld.  Install gold as "ld.gold", install ld
+#     as "ld.bfd" and "ld".
+# --enable-gold=default [--enable-ld]
+#     Build both gold and ld.  Install gold as "ld.gold" and "ld",
+#     install ld as "ld.bfd".
+# --enable-gold[=default] --disable-ld
+#     Build only gold, which is then installed as both "ld.gold" and "ld".
+# --enable-gold --enable-ld=default
+#     Build both gold (installed as "ld.gold") and ld (installed as "ld"
+#     and ld.bfd).
+#     In other words, ld is default
+# --enable-gold=default --enable-ld=default
+#     Error.
+
+default_ld=
+AC_ARG_ENABLE(gold,
+[AS_HELP_STRING([[--enable-gold[=ARG]]],
+		[build gold @<:@ARG={default,yes,no}@:>@])],
+ENABLE_GOLD=$enableval,
+ENABLE_GOLD=no)
+case "${ENABLE_GOLD}" in
+  yes|default)
+    # Check for ELF target.
+    is_elf=no
+    case "${target}" in
+      *-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \
+      | *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \
+      | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* \
+      | *-*-solaris2* | *-*-nto*)
+        case "${target}" in
+          *-*-linux*aout* | *-*-linux*oldld*)
+            ;;
+          *)
+            is_elf=yes
+            ;;
+        esac
+    esac
+
+    if test "$is_elf" = "yes"; then
+      # Check for target supported by gold.
+      case "${target}" in
+        i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-* | arm*-*-*)
+	  configdirs="$configdirs gold"
+	  if test x${ENABLE_GOLD} = xdefault; then
+	    default_ld=gold
+	  fi
+	  ENABLE_GOLD=yes
+          ;;
+      esac
+    fi
+    ;;
+  no)
+    ;;
+  *)
+    AC_MSG_ERROR([invalid --enable-gold argument])
+    ;;
+esac
+
+AC_ARG_ENABLE(ld,
+[AS_HELP_STRING([[--enable-ld[=ARG]]],
+		[build ld @<:@ARG={default,yes,no}@:>@])],
+ENABLE_LD=$enableval,
+ENABLE_LD=yes)
+
+case "${ENABLE_LD}" in
+  default)
+    if test x${default_ld} != x; then
+      AC_MSG_ERROR([either gold or ld can be the default ld])
+    fi
+    ;;
+  yes)
+    ;;
+  no)
+    if test x${ENABLE_GOLD} != xyes; then
+      AC_MSG_WARN([neither ld nor gold are enabled])
+    fi
+    configdirs=`echo " ${configdirs} " | sed -e 's/ ld / /'`
+    ;;
+  *)
+    AC_MSG_ERROR([invalid --enable-ld argument])
+    ;;
+esac
+
+# Configure extra directories which are host specific
+
+case "${host}" in
+  *-cygwin*)
+    configdirs="$configdirs libtermcap" ;;
+esac
+
+# A target can indicate whether a language isn't supported for some reason.
+# Only spaces may be used in this macro; not newlines or tabs.
+unsupported_languages=
+
+# Remove more programs from consideration, based on the host or 
+# target this usually means that a port of the program doesn't
+# exist yet.
+
+case "${host}" in
+  i[[3456789]]86-*-msdosdjgpp*)
+    noconfigdirs="$noconfigdirs tcl tk itcl"
+    ;;
+esac
+
+
+AC_ARG_ENABLE(libquadmath,
+AS_HELP_STRING([--disable-libquadmath],
+  [do not build libquadmath directory]),
+ENABLE_LIBQUADMATH=$enableval,
+ENABLE_LIBQUADMATH=yes)
+if test "${ENABLE_LIBQUADMATH}" = "no" ; then
+  noconfigdirs="$noconfigdirs target-libquadmath"
+fi
+
+
+AC_ARG_ENABLE(libquadmath-support,
+AS_HELP_STRING([--disable-libquadmath-support],
+  [disable libquadmath support for Fortran]),
+ENABLE_LIBQUADMATH_SUPPORT=$enableval,
+ENABLE_LIBQUADMATH_SUPPORT=yes)
+enable_libquadmath_support=
+if test "${ENABLE_LIBQUADMATH_SUPPORT}" = "no" ; then
+  enable_libquadmath_support=no
+fi
+
+
+AC_ARG_ENABLE(libada,
+[AS_HELP_STRING([--enable-libada], [build libada directory])],
+ENABLE_LIBADA=$enableval,
+ENABLE_LIBADA=yes)
+if test "${ENABLE_LIBADA}" != "yes" ; then
+  noconfigdirs="$noconfigdirs gnattools"
+fi
+
+AC_ARG_ENABLE(libssp,
+[AS_HELP_STRING([--enable-libssp], [build libssp directory])],
+ENABLE_LIBSSP=$enableval,
+ENABLE_LIBSSP=yes)
+
+# Save it here so that, even in case of --enable-libgcj, if the Java
+# front-end isn't enabled, we still get libgcj disabled.
+libgcj_saved=$libgcj
+case $enable_libgcj in
+yes)
+  # If we reset it here, it won't get added to noconfigdirs in the
+  # target-specific build rules, so it will be forcibly enabled
+  # (unless the Java language itself isn't enabled).
+  libgcj=
+  ;;
+no)
+  # Make sure we get it printed in the list of not supported target libs.
+  # Don't disable libffi, though, other languages use it.
+  noconfigdirs="$noconfigdirs `echo ${libgcj} | sed -e 's/target-libffi//'`"
+  # Clear libgcj_saved so that even if java is enabled libffi won't be
+  # built.
+  libgcj_saved=
+  ;;
+esac
+
+AC_ARG_ENABLE(static-libjava,
+[AS_HELP_STRING([[--enable-static-libjava[=ARG]]],
+		[build static libjava @<:@default=no@:>@])],
+ENABLE_STATIC_LIBJAVA=$enableval,
+ENABLE_STATIC_LIBJAVA=no)
+enable_static_libjava=
+if test "${ENABLE_STATIC_LIBJAVA}" = "yes" ; then
+  enable_static_libjava=yes
+fi
+
+if test x$enable_static_libjava != xyes ; then
+  EXTRA_CONFIGARGS_LIBJAVA=--disable-static
+fi
+AC_SUBST(EXTRA_CONFIGARGS_LIBJAVA)
+
+# Disable libmudflap on some systems.
+if test x$enable_libmudflap = x ; then
+    case "${target}" in
+    *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | bfin*-*-uclinux* | *-*-kopensolaris*-gnu)
+        # Enable libmudflap by default in GNU and friends.
+	;;
+    *-*-freebsd*)
+        # Enable libmudflap by default in FreeBSD.
+	;;
+    *)
+        # Disable it by default everywhere else.
+	noconfigdirs="$noconfigdirs target-libmudflap"
+	;;
+    esac
+fi
+
+# Disable libgomp on non POSIX hosted systems.
+if test x$enable_libgomp = x ; then
+    # Enable libgomp by default on hosted POSIX systems.
+    case "${target}" in
+    *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
+	;;
+    *-*-netbsd* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly*)
+	;;
+    *-*-solaris2* | *-*-irix6* | *-*-osf* | *-*-hpux11*)
+	;;
+    *-*-darwin* | *-*-aix*)
+	;;
+    *)
+	noconfigdirs="$noconfigdirs target-libgomp"
+	;;
+    esac
+fi
+
+# Disable libssp for some systems.
+case "${target}" in
+  avr-*-*)
+    # No hosted I/O support.
+    noconfigdirs="$noconfigdirs target-libssp"
+    ;;
+  powerpc-*-aix* | rs6000-*-aix*)
+    noconfigdirs="$noconfigdirs target-libssp"
+    ;;
+esac
+
+# Disable libstdc++-v3 for some systems.
+case "${target}" in
+  *-*-vxworks*)
+    # VxWorks uses the Dinkumware C++ library.
+    noconfigdirs="$noconfigdirs target-libstdc++-v3"
+    ;;
+  arm*-wince-pe*)
+    # the C++ libraries don't build on top of CE's C libraries
+    noconfigdirs="$noconfigdirs target-libstdc++-v3"
+    ;;
+  avr-*-*)
+    noconfigdirs="$noconfigdirs target-libstdc++-v3"
+    ;;
+esac
+
+# Disable Fortran for some systems.
+case "${target}" in
+  mmix-*-*)
+    # See <http://gcc.gnu.org/ml/gcc-patches/2004-11/msg00572.html>.
+    unsupported_languages="$unsupported_languages fortran"
+    ;;
+esac
+
+# Disable Java if libffi is not supported.
+case "${target}" in
+  alpha*-*-*)
+    ;;
+  arm*-*-*)
+    ;;
+  cris-*-*)
+    ;;
+  frv-*-*)
+    ;;
+  hppa*-*-linux*)
+    ;;
+  hppa*-*-hpux*)
+    ;;
+  i?86-*-*)
+    ;;
+  ia64*-*-*)
+    ;;
+  m32r*-*-*)
+    ;;
+  m68k-*-*)
+    ;;
+  mips-sgi-irix6.* | mips*-*-rtems*)
+    ;;
+  mips*-*-linux*)
+    ;;
+  powerpc*-*-linux*)
+    ;;
+  powerpc-*-darwin*)
+    ;;
+  powerpc-*-aix* | rs6000-*-aix*)
+    ;;
+  powerpc-*-freebsd*)
+    ;;
+  powerpc64-*-freebsd*)
+    ;;
+  powerpc*-*-rtems*)
+    ;;
+  s390-*-* | s390x-*-*)
+    ;;
+  sh-*-* | sh[[34]]*-*-*)
+    ;;
+  sh64-*-* | sh5*-*-*)
+    ;;
+  sparc*-*-*)
+    ;;
+  x86_64-*-*)
+    ;;
+  *-*-*)
+    unsupported_languages="$unsupported_languages java"
+    ;;
+esac
+
+# Disable Java, libgcj or related libraries for some systems.
+case "${target}" in
+  powerpc-*-darwin*)
+    ;;
+  i[[3456789]]86-*-darwin*)
+    ;;
+  x86_64-*-darwin[[912]]*)
+    ;;
+  *-*-darwin*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  *-*-netware*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  *-*-rtems*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  *-*-tpf*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  *-*-uclinux*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  *-*-vxworks*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  alpha*-*-*vms*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  arm-wince-pe)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  arm*-*-symbianelf*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  bfin-*-*)
+    noconfigdirs="$noconfigdirs target-boehm-gc"
+    ;;
+  cris-*-* | crisv32-*-*)
+    unsupported_languages="$unsupported_languages java"
+    case "${target}" in
+      *-*-linux*)
+	;;
+      *) # See PR46792 regarding target-libffi.
+	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
+    esac
+    ;;
+  hppa*64*-*-linux*)
+    # In this case, it's because the hppa64-linux target is for
+    # the kernel only at this point and has no libc, and thus no
+    # headers, crt*.o, etc., all of which are needed by these.
+    unsupported_languages="$unsupported_languages java"
+    ;;
+  hppa*64*-*-hpux*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  hppa*-hp-hpux11*)
+    ;;
+  hppa*-*-hpux*)
+    # According to Alexandre Oliva <aoliva@redhat.com>, libjava won't
+    # build on HP-UX 10.20.
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  ia64*-*-*vms*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  i[[3456789]]86-w64-mingw*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  i[[3456789]]86-*-mingw*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  x86_64-*-mingw*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  mmix-*-*)
+    noconfigdirs="$noconfigdirs target-libffi target-boehm-gc"
+    ;;
+  powerpc-*-aix*)
+    # copied from rs6000-*-* entry
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  rs6000-*-aix*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  mips*-*-irix6*)
+    # Linking libjava exceeds command-line length limits on at least
+    # IRIX 6.2, but not on IRIX 6.5.
+    # Also, boehm-gc won't build on IRIX 6.5, according to Jeffrey Oldham
+    # <oldham@codesourcery.com>
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
+  *-*-lynxos*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;; 
+esac
+
+# Default libgloss CPU subdirectory.
+libgloss_dir="$target_cpu"
+
+case "${target}" in
+  sh*-*-pe|mips*-*-pe|*arm-wince-pe)
+    libgloss_dir=wince
+    ;;
+  arm*-*-*)
+    libgloss_dir=arm
+    ;;
+  cris-*-* | crisv32-*-*)
+    libgloss_dir=cris
+    ;;
+  hppa*-*-*)
+    libgloss_dir=pa
+    ;;
+  i[[3456789]]86-*-*)
+    libgloss_dir=i386
+    ;;
+  m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*)
+    libgloss_dir=m68hc11
+    ;;
+  m68*-*-* | fido-*-*)
+    libgloss_dir=m68k
+    ;;
+  mips*-*-*)
+    libgloss_dir=mips
+    ;;
+  powerpc*-*-*)
+    libgloss_dir=rs6000
+    ;;
+  sparc*-*-*)
+    libgloss_dir=sparc
+    ;;
+esac
+
+# Disable newlib and libgloss for various target OSes.
+case "${target}" in
+  alpha*-dec-osf*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  i[[3456789]]86-*-linux*)
+    # This section makes it possible to build newlib natively on linux.
+    # If we are using a cross compiler then don't configure newlib.
+    if test x${is_cross_compiler} != xno ; then
+      noconfigdirs="$noconfigdirs target-newlib"
+    fi
+    noconfigdirs="$noconfigdirs target-libgloss"
+    # If we are not using a cross compiler, do configure newlib.
+    # Note however, that newlib will only be configured in this situation
+    # if the --with-newlib option has been given, because otherwise
+    # 'target-newlib' will appear in skipdirs.
+    ;;
+  i[[3456789]]86-*-rdos*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  sh*-*-pe|mips*-*-pe|arm-wince-pe)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  sparc-*-sunos4*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-aix*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-beos*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-chorusos)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-dragonfly*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-freebsd*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-lynxos*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;; 
+  *-*-mingw*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-netbsd*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-netware*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-tpf*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-uclinux*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  *-*-vxworks*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+esac
+
+case "${target}" in
+  *-*-chorusos)
+    ;;
+  powerpc-*-darwin*)
+    noconfigdirs="$noconfigdirs ld gas gdb gprof"
+    noconfigdirs="$noconfigdirs sim target-rda"
+    ;;
+  i[[3456789]]86-*-darwin*)
+    noconfigdirs="$noconfigdirs ld gprof"
+    noconfigdirs="$noconfigdirs sim target-rda"
+    ;;
+  x86_64-*-darwin[[912]]*)
+    noconfigdirs="$noconfigdirs ld gas gprof"
+    noconfigdirs="$noconfigdirs sim target-rda"
+    ;;
+  *-*-darwin*)
+    noconfigdirs="$noconfigdirs ld gas gdb gprof"
+    noconfigdirs="$noconfigdirs sim target-rda"
+    ;;
+  *-*-dragonfly*)
+    ;;
+  *-*-freebsd*)
+    if test "x$with_gmp" = x && test "x$with_gmp_dir" = x \
+	&& test -f /usr/local/include/gmp.h; then
+      with_gmp=/usr/local
+    fi
+    ;;
+  *-*-kaos*)
+    # Remove unsupported stuff on all kaOS configurations.
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  *-*-netbsd*)
+    ;;
+  *-*-netware*)
+    ;;
+  *-*-rtems*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+    # The tpf target doesn't support gdb yet.
+  *-*-tpf*)
+    noconfigdirs="$noconfigdirs gdb tcl tk libgui itcl"
+    ;;
+  *-*-uclinux*)
+    noconfigdirs="$noconfigdirs target-rda"
+    ;;
+  *-*-vxworks*)
+    ;;
+  alpha*-dec-osf*)
+    # ld works, but does not support shared libraries.
+    # gas doesn't generate exception information.
+    noconfigdirs="$noconfigdirs gas ld"
+    ;;
+  alpha*-*-*vms*)
+    noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss"
+    ;;
+  alpha*-*-*)
+    # newlib is not 64 bit ready
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+  sh*-*-pe|mips*-*-pe|*arm-wince-pe)
+    noconfigdirs="$noconfigdirs tcl tk itcl libgui sim"
+    ;;
+  arc-*-*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  arm-*-pe*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  arm-*-riscix*)
+    noconfigdirs="$noconfigdirs ld target-libgloss"
+    ;;
+  c4x-*-* | tic4x-*-*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  tic54x-*-*)
+    noconfigdirs="$noconfigdirs target-libgloss gdb"
+    ;;
+  cr16-*-*)
+    noconfigdirs="$noconfigdirs gdb"
+    ;;
+  d10v-*-*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  d30v-*-*)
+    noconfigdirs="$noconfigdirs gdb"
+    ;;
+  fr30-*-elf*)
+    noconfigdirs="$noconfigdirs gdb"
+    ;;
+  moxie-*-*)
+    noconfigdirs="$noconfigdirs gprof"
+    ;;
+  h8300*-*-*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  h8500-*-*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  hppa1.1-*-osf* | hppa1.1-*-bsd* )
+    ;;
+  hppa*64*-*-linux*)
+    ;;
+  hppa*-*-linux*)
+    ;;
+  hppa*-*-*elf* | \
+  hppa*-*-lites* | \
+  hppa*-*-openbsd* | \
+  hppa*64*-*-*)
+    ;;
+  hppa*-hp-hpux11*)
+    noconfigdirs="$noconfigdirs ld"
+    ;;
+  hppa*-*-pro*)
+    ;;
+  hppa*-*-*)
+    noconfigdirs="$noconfigdirs ld"
+    ;;
+  i960-*-*)
+    noconfigdirs="$noconfigdirs gdb"
+    ;;
+  ia64*-*-elf*)
+    # No gdb support yet.
+    noconfigdirs="$noconfigdirs readline libgui itcl gdb"
+    ;;
+  ia64*-**-hpux*)
+    # No ld support yet.
+    noconfigdirs="$noconfigdirs libgui itcl ld"
+    ;;
+  ia64*-*-*vms*)
+    # No gdb or ld support yet.
+    noconfigdirs="$noconfigdirs readline libgui itcl gdb ld"
+    ;;
+  i[[3456789]]86-w64-mingw*)
+    ;;
+  i[[3456789]]86-*-mingw*)
+    target_configdirs="$target_configdirs target-winsup"
+    ;;
+  *-*-cygwin*)
+    target_configdirs="$target_configdirs target-libtermcap target-winsup"
+    noconfigdirs="$noconfigdirs target-libgloss"
+    # always build newlib if winsup directory is present.
+    if test -d "$srcdir/winsup/cygwin"; then
+      skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
+    elif test -d "$srcdir/newlib"; then
+      echo "Warning: winsup/cygwin is missing so newlib can't be built."
+    fi
+    ;;
+  i[[3456789]]86-*-pe)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  i[[3456789]]86-*-sco3.2v5*)
+    # The linker does not yet know about weak symbols in COFF,
+    # and is not configured to handle mixed ELF and COFF.
+    noconfigdirs="$noconfigdirs ld target-libgloss"
+    ;;
+  i[[3456789]]86-*-sco*)
+    noconfigdirs="$noconfigdirs gprof target-libgloss"
+    ;;
+  i[[3456789]]86-*-solaris2* | x86_64-*-solaris2.1[[0-9]]*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  i[[3456789]]86-*-sysv4*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  i[[3456789]]86-*-beos*)
+    noconfigdirs="$noconfigdirs gdb"
+    ;;
+  i[[3456789]]86-*-rdos*)
+    noconfigdirs="$noconfigdirs gdb"
+    ;;
+  mmix-*-*)
+    noconfigdirs="$noconfigdirs gdb"
+    ;;
+  mt-*-*)
+    noconfigdirs="$noconfigdirs sim"
+    ;;
+  powerpc-*-aix*)
+    # copied from rs6000-*-* entry
+    noconfigdirs="$noconfigdirs gprof"
+    ;;
+  powerpc*-*-winnt* | powerpc*-*-pe*)
+    target_configdirs="$target_configdirs target-winsup"
+    noconfigdirs="$noconfigdirs gdb tcl tk target-libgloss itcl"
+    # always build newlib.
+    skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
+    ;;
+    # This is temporary until we can link against shared libraries
+  powerpcle-*-solaris*)
+    noconfigdirs="$noconfigdirs gdb sim tcl tk itcl"
+    ;;
+  powerpc-*-beos*)
+    noconfigdirs="$noconfigdirs gdb"
+    ;;
+  rs6000-*-lynxos*)
+    noconfigdirs="$noconfigdirs gprof"
+    ;;
+  rs6000-*-aix*)
+    noconfigdirs="$noconfigdirs gprof"
+    ;;
+  rs6000-*-*)
+    noconfigdirs="$noconfigdirs gprof"
+    ;;
+  m68k-apollo-*)
+    noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss"
+    ;;
+  microblaze*)
+    noconfigdirs="$noconfigdirs gprof"
+    ;;
+  mips*-sde-elf*)
+    if test x$with_newlib = xyes; then
+      noconfigdirs="$noconfigdirs gprof"
+    fi
+    ;;
+  mips*-*-irix5*)
+    noconfigdirs="$noconfigdirs gprof target-libgloss"
+    ;;
+  mips*-*-irix6*)
+    noconfigdirs="$noconfigdirs gprof target-libgloss"
+    ;;
+  mips*-*-bsd*)
+    noconfigdirs="$noconfigdirs gprof target-libgloss"
+    ;;
+  mips*-*-linux*)
+    ;;
+  mips*-*-*)
+    noconfigdirs="$noconfigdirs gprof"
+    ;;
+  sh-*-* | sh64-*-*)
+    case "${target}" in
+      sh*-*-elf)
+         ;;
+      *)
+         noconfigdirs="$noconfigdirs target-libgloss" ;;
+    esac
+    ;;
+  sparc-*-sunos4*)
+    if test x${is_cross_compiler} = xno ; then
+           use_gnu_ld=no
+    fi
+    ;;
+  tic6x-*-*)
+    noconfigdirs="$noconfigdirs sim"
+    ;;
+  tilepro-*-* | tilegx-*-*)
+    noconfigdirs="$noconfigdirs sim"
+    ;;
+  v810-*-*)
+    noconfigdirs="$noconfigdirs bfd binutils gas gdb ld opcodes target-libgloss"
+    ;;
+  vax-*-*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
+esac
+
+# If we aren't building newlib, then don't build libgloss, since libgloss
+# depends upon some newlib header files.
+case "${noconfigdirs}" in
+  *target-libgloss*) ;;
+  *target-newlib*) noconfigdirs="$noconfigdirs target-libgloss" ;;
+esac
+
+# Work in distributions that contain no compiler tools, like Autoconf.
+host_makefile_frag=/dev/null
+if test -d ${srcdir}/config ; then
+case "${host}" in
+  i[[3456789]]86-*-msdosdjgpp*)
+    host_makefile_frag="config/mh-djgpp"
+    ;;
+  *-cygwin*)
+    ACX_CHECK_CYGWIN_CAT_WORKS
+    host_makefile_frag="config/mh-cygwin"
+    ;;
+  *-mingw*)
+    host_makefile_frag="config/mh-mingw"
+    ;;
+  *-interix*)
+    host_makefile_frag="config/mh-interix"
+    ;;
+  hppa*-hp-hpux10*)
+    host_makefile_frag="config/mh-pa-hpux10"
+    ;;
+  hppa*-hp-hpux*)
+    host_makefile_frag="config/mh-pa"
+    ;;
+  hppa*-*)	
+    host_makefile_frag="config/mh-pa"
+    ;;
+  *-*-darwin*)
+    host_makefile_frag="config/mh-darwin"
+    ;;
+  powerpc-*-aix*)
+    host_makefile_frag="config/mh-ppc-aix"
+    ;;
+  rs6000-*-aix*)
+    host_makefile_frag="config/mh-ppc-aix"
+    ;;
+esac
+fi
+
+if test "${build}" != "${host}" ; then
+  AR_FOR_BUILD=${AR_FOR_BUILD-ar}
+  AS_FOR_BUILD=${AS_FOR_BUILD-as}
+  CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
+  CXX_FOR_BUILD=${CXX_FOR_BUILD-g++}
+  GCJ_FOR_BUILD=${GCJ_FOR_BUILD-gcj}
+  GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran}
+  GOC_FOR_BUILD=${GOC_FOR_BUILD-gccgo}
+  DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool}
+  LD_FOR_BUILD=${LD_FOR_BUILD-ld}
+  NM_FOR_BUILD=${NM_FOR_BUILD-nm}
+  RANLIB_FOR_BUILD=${RANLIB_FOR_BUILD-ranlib}
+  WINDRES_FOR_BUILD=${WINDRES_FOR_BUILD-windres}
+  WINDMC_FOR_BUILD=${WINDMC_FOR_BUILD-windmc}
+else
+  AR_FOR_BUILD="\$(AR)"
+  AS_FOR_BUILD="\$(AS)"
+  CC_FOR_BUILD="\$(CC)"
+  CXX_FOR_BUILD="\$(CXX)"
+  GCJ_FOR_BUILD="\$(GCJ)"
+  GFORTRAN_FOR_BUILD="\$(GFORTRAN)"
+  GOC_FOR_BUILD="\$(GOC)"
+  DLLTOOL_FOR_BUILD="\$(DLLTOOL)"
+  LD_FOR_BUILD="\$(LD)"
+  NM_FOR_BUILD="\$(NM)"
+  RANLIB_FOR_BUILD="\$(RANLIB)"
+  WINDRES_FOR_BUILD="\$(WINDRES)"
+  WINDMC_FOR_BUILD="\$(WINDMC)"
+fi
+
+AC_PROG_CC
+AC_PROG_CXX
+
+# We must set the default linker to the linker used by gcc for the correct
+# operation of libtool.  If LD is not defined and we are using gcc, try to
+# set the LD default to the ld used by gcc.
+if test -z "$LD"; then
+  if test "$GCC" = yes; then
+    case $build in
+    *-*-mingw*)
+      gcc_prog_ld=`$CC -print-prog-name=ld 2>&1 | tr -d '\015'` ;;
+    *)
+      gcc_prog_ld=`$CC -print-prog-name=ld 2>&1` ;;
+    esac
+    case $gcc_prog_ld in
+    # Accept absolute paths.
+    [[\\/]* | [A-Za-z]:[\\/]*)]
+      LD="$gcc_prog_ld" ;;
+    esac
+  fi
+fi
+
+ACX_PROG_GNAT
+ACX_PROG_CMP_IGNORE_INITIAL
+
+AC_ARG_ENABLE([bootstrap],
+[AS_HELP_STRING([--enable-bootstrap],
+		[enable bootstrapping @<:@yes if native build@:>@])],,
+enable_bootstrap=default)
+
+# Issue errors and warnings for invalid/strange bootstrap combinations.
+if test -r $srcdir/gcc/configure; then
+  have_compiler=yes
+else
+  have_compiler=no
+fi
+
+case "$have_compiler:$host:$target:$enable_bootstrap" in
+  *:*:*:no) ;;
+
+  # Default behavior.  Enable bootstrap if we have a compiler
+  # and we are in a native configuration.
+  yes:$build:$build:default)
+    enable_bootstrap=yes ;;
+
+  *:*:*:default)
+    enable_bootstrap=no ;;
+
+  # We have a compiler and we are in a native configuration, bootstrap is ok
+  yes:$build:$build:yes)
+    ;;
+
+  # Other configurations, but we have a compiler.  Assume the user knows
+  # what he's doing.
+  yes:*:*:yes)
+    AC_MSG_WARN([trying to bootstrap a cross compiler])
+    ;;
+
+  # No compiler: if they passed --enable-bootstrap explicitly, fail
+  no:*:*:yes)
+    AC_MSG_ERROR([cannot bootstrap without a compiler]) ;;
+
+  # Fail if wrong command line
+  *)
+    AC_MSG_ERROR([invalid option for --enable-bootstrap])
+    ;;
+esac
+
+# See if we are building gcc with C++.
+AC_ARG_ENABLE(build-with-cxx,
+[AS_HELP_STRING([--enable-build-with-cxx],
+		[build with C++ compiler instead of C compiler])],
+ENABLE_BUILD_WITH_CXX=$enableval,
+ENABLE_BUILD_WITH_CXX=no)
+
+# Build stage1 with C and build stages 2 and 3 with C++.
+AC_ARG_ENABLE(build-poststage1-with-cxx,
+[AS_HELP_STRING([--enable-build-poststage1-with-cxx],
+		[build stages 2 and 3 with C++, not C])],
+ENABLE_BUILD_POSTSTAGE1_WITH_CXX=$enableval,
+ENABLE_BUILD_POSTSTAGE1_WITH_CXX=yes)
+
+# Used for setting $lt_cv_objdir
+_LT_CHECK_OBJDIR
+
+# Check for GMP, MPFR and MPC
+gmplibs="-lmpc -lmpfr -lgmp"
+gmpinc=
+have_gmp=no
+
+# Specify a location for mpc
+# check for this first so it ends up on the link line before mpfr.
+AC_ARG_WITH(mpc,
+[AS_HELP_STRING([--with-mpc=PATH],
+		[specify prefix directory for installed MPC package.
+		 Equivalent to --with-mpc-include=PATH/include
+		 plus --with-mpc-lib=PATH/lib])])
+AC_ARG_WITH(mpc-include,
+[AS_HELP_STRING([--with-mpc-include=PATH],
+		[specify directory for installed MPC include files])])
+AC_ARG_WITH(mpc-lib,
+[AS_HELP_STRING([--with-mpc-lib=PATH],
+		[specify directory for the installed MPC library])])
+
+if test "x$with_mpc" != x; then
+  gmplibs="-L$with_mpc/lib $gmplibs"
+  gmpinc="-I$with_mpc/include $gmpinc"
+fi
+if test "x$with_mpc_include" != x; then
+  gmpinc="-I$with_mpc_include $gmpinc"
+fi
+if test "x$with_mpc_lib" != x; then
+  gmplibs="-L$with_mpc_lib $gmplibs"
+fi
+if test "x$with_mpc$with_mpc_include$with_mpc_lib" = x && test -d ${srcdir}/mpc; then
+  gmplibs='-L$$r/$(HOST_SUBDIR)/mpc/src/'"$lt_cv_objdir $gmplibs"
+  gmpinc='-I$$s/mpc/src '"$gmpinc"
+  # Do not test the mpc version.  Assume that it is sufficient, since
+  # it is in the source tree, and the library has not been built yet
+  # but it would be included on the link line in the version check below
+  # hence making the test fail.
+  have_gmp=yes
+fi
+
+# Specify a location for mpfr
+# check for this first so it ends up on the link line before gmp.
+AC_ARG_WITH(mpfr-dir,
+[AS_HELP_STRING([--with-mpfr-dir=PATH], [this option has been REMOVED])],
+[AC_MSG_ERROR([The --with-mpfr-dir=PATH option has been removed.
+Use --with-mpfr=PATH or --with-mpfr-include=PATH plus --with-mpfr-lib=PATH])])
+
+AC_ARG_WITH(mpfr,
+[AS_HELP_STRING([--with-mpfr=PATH],
+		[specify prefix directory for installed MPFR package.
+		 Equivalent to --with-mpfr-include=PATH/include
+		 plus --with-mpfr-lib=PATH/lib])])
+AC_ARG_WITH(mpfr-include,
+[AS_HELP_STRING([--with-mpfr-include=PATH],
+		[specify directory for installed MPFR include files])])
+AC_ARG_WITH(mpfr-lib,
+[AS_HELP_STRING([--with-mpfr-lib=PATH],
+		[specify directory for the installed MPFR library])])
+
+if test "x$with_mpfr" != x; then
+  gmplibs="-L$with_mpfr/lib $gmplibs"
+  gmpinc="-I$with_mpfr/include $gmpinc"
+fi
+if test "x$with_mpfr_include" != x; then
+  gmpinc="-I$with_mpfr_include $gmpinc"
+fi
+if test "x$with_mpfr_lib" != x; then
+  gmplibs="-L$with_mpfr_lib $gmplibs"
+fi
+if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then
+  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs"
+  gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
+  extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir"
+  # Do not test the mpfr version.  Assume that it is sufficient, since
+  # it is in the source tree, and the library has not been built yet
+  # but it would be included on the link line in the version check below
+  # hence making the test fail.
+  have_gmp=yes
+fi
+
+# Specify a location for gmp
+AC_ARG_WITH(gmp-dir,
+[AS_HELP_STRING([--with-gmp-dir=PATH], [this option has been REMOVED])],
+[AC_MSG_ERROR([The --with-gmp-dir=PATH option has been removed.
+Use --with-gmp=PATH or --with-gmp-include=PATH plus --with-gmp-lib=PATH])])
+
+AC_ARG_WITH(gmp,
+[AS_HELP_STRING([--with-gmp=PATH],
+		[specify prefix directory for the installed GMP package.
+		 Equivalent to --with-gmp-include=PATH/include
+		 plus --with-gmp-lib=PATH/lib])])
+AC_ARG_WITH(gmp-include,
+[AS_HELP_STRING([--with-gmp-include=PATH],
+		[specify directory for installed GMP include files])])
+AC_ARG_WITH(gmp-lib,
+[AS_HELP_STRING([--with-gmp-lib=PATH],
+		[specify directory for the installed GMP library])])
+
+
+if test "x$with_gmp" != x; then
+  gmplibs="-L$with_gmp/lib $gmplibs"
+  gmpinc="-I$with_gmp/include $gmpinc"
+fi
+if test "x$with_gmp_include" != x; then
+  gmpinc="-I$with_gmp_include $gmpinc"
+fi
+if test "x$with_gmp_lib" != x; then
+  gmplibs="-L$with_gmp_lib $gmplibs"
+fi
+if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
+  gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir $gmplibs"
+  gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
+  extra_mpfr_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
+  extra_mpc_gmp_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
+  # Do not test the gmp version.  Assume that it is sufficient, since
+  # it is in the source tree, and the library has not been built yet
+  # but it would be included on the link line in the version check below
+  # hence making the test fail.
+  have_gmp=yes
+fi
+
+if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then
+  have_gmp=yes
+  saved_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $gmpinc"
+  # Check for the recommended and required versions of GMP.
+  AC_MSG_CHECKING([for the correct version of gmp.h])
+  AC_TRY_COMPILE([#include "gmp.h"],[
+  #define GCC_GMP_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+  #define GCC_GMP_VERSION GCC_GMP_VERSION_NUM(__GNU_MP_VERSION,__GNU_MP_VERSION_MINOR,__GNU_MP_VERSION_PATCHLEVEL)
+  #if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4,2,0)
+  choke me
+  #endif
+  ], [AC_TRY_COMPILE([#include <gmp.h>],[
+  #define GCC_GMP_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+  #define GCC_GMP_VERSION GCC_GMP_VERSION_NUM(__GNU_MP_VERSION,__GNU_MP_VERSION_MINOR,__GNU_MP_VERSION_PATCHLEVEL)
+  #if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4,3,2)
+  choke me
+  #endif
+  ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])])],
+   [AC_MSG_RESULT([no]); have_gmp=no])
+
+  # If we have GMP, check the MPFR version.
+  if test x"$have_gmp" = xyes; then
+    # Check for the recommended and required versions of MPFR.
+    AC_MSG_CHECKING([for the correct version of mpfr.h])
+    AC_TRY_COMPILE([#include <gmp.h>
+    #include <mpfr.h>],[
+    #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1)
+    choke me
+    #endif
+    ], [AC_TRY_COMPILE([#include <gmp.h>
+    #include <mpfr.h>],[
+    #if MPFR_VERSION < MPFR_VERSION_NUM(2,4,2)
+    choke me
+    #endif
+    ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])])],
+     [AC_MSG_RESULT([no]); have_gmp=no])
+  fi
+
+  # Check for the MPC header version.
+  if test x"$have_gmp" = xyes ; then
+    # Check for the recommended and required versions of MPC.
+    AC_MSG_CHECKING([for the correct version of mpc.h])
+    AC_TRY_COMPILE([#include <mpc.h>],[
+    #if MPC_VERSION < MPC_VERSION_NUM(0,8,0)
+    choke me
+    #endif
+    ], [AC_TRY_COMPILE([#include <mpc.h>],[
+    #if MPC_VERSION < MPC_VERSION_NUM(0,8,1)
+    choke me
+    #endif
+    ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])])],
+     [AC_MSG_RESULT([no]); have_gmp=no])
+  fi
+
+  # Now check the MPFR library.
+  if test x"$have_gmp" = xyes; then
+    saved_LIBS="$LIBS"
+    LIBS="$LIBS $gmplibs"
+    AC_MSG_CHECKING([for the correct version of the gmp/mpfr/mpc libraries])
+    AC_TRY_LINK([#include <mpc.h>],[
+    mpfr_t n;
+    mpfr_t x;
+    mpc_t c;
+    int t;
+    mpfr_init (n);
+    mpfr_init (x);
+    mpfr_atan2 (n, n, x, GMP_RNDN);
+    mpfr_erfc (n, x, GMP_RNDN);
+    mpfr_subnormalize (x, t, GMP_RNDN);
+    mpfr_clear(n);
+    mpfr_clear(x);
+    mpc_init2 (c, 53);
+    mpc_set_ui_ui (c, 1, 1, MPC_RNDNN);
+    mpc_cosh (c, c, MPC_RNDNN);
+    mpc_pow (c, c, c, MPC_RNDNN);
+    mpc_acosh (c, c, MPC_RNDNN);
+    mpc_clear (c);
+    ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); have_gmp=no])
+    LIBS="$saved_LIBS"
+  fi
+
+  CFLAGS="$saved_CFLAGS"
+
+# The library versions listed in the error message below should match
+# the HARD-minimums enforced above.
+  if test x$have_gmp != xyes; then
+    AC_MSG_ERROR([Building GCC requires GMP 4.2+, MPFR 2.3.1+ and MPC 0.8.0+.
+Try the --with-gmp, --with-mpfr and/or --with-mpc options to specify
+their locations.  Source code for these libraries can be found at
+their respective hosting sites as well as at
+ftp://gcc.gnu.org/pub/gcc/infrastructure/.  See also
+http://gcc.gnu.org/install/prerequisites.html for additional info.  If
+you obtained GMP, MPFR and/or MPC from a vendor distribution package,
+make sure that you have installed both the libraries and the header
+files.  They may be located in separate packages.])
+  fi
+fi
+
+# Flags needed for both GMP, MPFR and/or MPC.
+AC_SUBST(gmplibs)
+AC_SUBST(gmpinc)
+AC_SUBST(extra_mpfr_configure_flags)
+AC_SUBST(extra_mpc_gmp_configure_flags)
+AC_SUBST(extra_mpc_mpfr_configure_flags)
+
+# Allow host libstdc++ to be specified for static linking with PPL.
+AC_ARG_WITH(host-libstdcxx,
+[AS_HELP_STRING([--with-host-libstdcxx=L],
+		[use linker arguments L to link with libstdc++
+		 when linking with PPL])])
+
+case $with_host_libstdcxx in
+  no|yes)
+    AC_MSG_ERROR([-with-host-libstdcxx needs an argument])
+    ;;
+esac
+
+# Linker flags to use for stage1 or when not boostrapping.
+AC_ARG_WITH(stage1-ldflags,
+[AS_HELP_STRING([--with-stage1-ldflags=FLAGS], [linker flags for stage1])],
+[if test "$withval" = "no" -o "$withval" = "yes"; then
+   stage1_ldflags=
+ else
+   stage1_ldflags=$withval
+ fi],
+[stage1_ldflags=])
+AC_SUBST(stage1_ldflags)
+
+# Libraries to use for stage1 or when not bootstrapping.
+AC_ARG_WITH(stage1-libs,
+[AS_HELP_STRING([--with-stage1-libs=LIBS], [libraries for stage1])],
+[if test "$withval" = "no" -o "$withval" = "yes"; then
+   stage1_libs=
+ else
+   stage1_libs=$withval
+ fi],
+[stage1_libs=$with_host_libstdcxx])
+AC_SUBST(stage1_libs)
+
+# Libraries to use for stage2 and later builds.  This defaults to the
+# argument passed to --with-host-libstdcxx.
+AC_ARG_WITH(boot-libs,
+[AS_HELP_STRING([--with-boot-libs=LIBS], [libraries for stage2 and later])],
+[if test "$withval" = "no" -o "$withval" = "yes"; then
+   poststage1_libs=
+ else
+   poststage1_libs=$withval
+ fi],
+[poststage1_libs=$with_host_libstdcxx])
+AC_SUBST(poststage1_libs)
+
+# Linker flags to use for stage2 and later builds.
+AC_ARG_WITH(boot-ldflags,
+[AS_HELP_STRING([--with-boot-ldflags=FLAGS],
+		[linker flags for stage2 and later])],
+[if test "$withval" = "no" -o "$withval" = "yes"; then
+   poststage1_ldflags=
+ else
+   poststage1_ldflags=$withval
+ fi],
+[poststage1_ldflags=
+ # In stages 2 and 3, default to linking libstdc++ and libgcc
+ # statically.  But if the user explicitly specified the libraries to
+ # use, trust that they are doing what they want.
+ if test "$poststage1_libs" = ""; then
+   poststage1_ldflags="-static-libstdc++ -static-libgcc"
+ fi])
+AC_SUBST(poststage1_ldflags)
+
+# Check for PPL
+ppllibs=
+pplinc=
+pwllib=
+
+AC_ARG_WITH(ppl,
+[AS_HELP_STRING([--with-ppl=PATH],
+		[specify prefix directory for the installed PPL package.
+		 Equivalent to --with-ppl-include=PATH/include
+		 plus --with-ppl-lib=PATH/lib])])
+AC_ARG_WITH(ppl-include,
+[AS_HELP_STRING([--with-ppl-include=PATH],
+		[specify directory for installed PPL include files])])
+AC_ARG_WITH(ppl-lib,
+[AS_HELP_STRING([--with-ppl-lib=PATH],
+		[specify directory for the installed PPL library])])
+
+AC_ARG_ENABLE(ppl-version-check,
+[AS_HELP_STRING([--disable-ppl-version-check],
+		[disable check for PPL version])])
+
+case $with_ppl in
+  yes | no | "")
+    ;;
+  *)
+    ppllibs="-L$with_ppl/lib"
+    pplinc="-I$with_ppl/include $pplinc"
+    if test -d "$with_ppl/lib" && test -d "$with_ppl/include"; then
+      with_ppl=yes
+    else
+      AC_MSG_ERROR([cannot find directories "$with_ppl/lib" or "$with_ppl/include"])
+    fi
+    ;;
+esac
+
+if test x"$with_ppl_include" != x; then
+  pplinc="-I$with_ppl_include $pplinc"
+  with_ppl=yes
+fi
+
+if test "x$with_ppl_lib" != x; then
+  ppllibs="-L$with_ppl_lib"
+  with_ppl=yes
+fi
+
+if test x"$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
+  if test x"$enable_watchdog" = xyes; then
+    pwllib="-lpwl"
+  fi
+  ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/interfaces/C/'"$lt_cv_objdir"' -L$$r/$(HOST_SUBDIR)/ppl/src/'"$lt_cv_objdir"
+  pplinc='-I$$r/$(HOST_SUBDIR)/ppl/src -I$$r/$(HOST_SUBDIR)/ppl/interfaces/C '
+  enable_ppl_version_check=no
+  with_ppl=yes
+fi
+
+if test "x$with_ppl" != xno; then
+  if test "x$pwllib" = x; then
+    saved_LIBS="$LIBS"
+    LIBS="$LIBS $ppllibs -lstdc++ -lm"
+    AC_CHECK_LIB(pwl, PWL_handle_timeout, [pwllib="-lpwl"])
+    LIBS="$saved_LIBS"
+  fi
+
+  ppllibs="$ppllibs -lppl_c -lppl $pwllib -lgmpxx"
+
+  if test "$enable_ppl_version_check" != no; then
+    saved_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $pplinc $gmpinc"
+    AC_MSG_CHECKING([for version 0.11 (revision 0 or later) of PPL])
+    AC_TRY_COMPILE([#include "ppl_c.h"],[
+    #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11
+    choke me
+    #endif
+    ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ; with_ppl=no ])
+    CFLAGS="$saved_CFLAGS"
+  fi
+fi
+
+# Flags needed for PPL
+AC_SUBST(ppllibs)
+AC_SUBST(pplinc)
+
+
+# Check for CLOOG
+
+dnl Provide configure switches and initialize clooginc & clooglibs
+dnl with user input.
+CLOOG_INIT_FLAGS
+if test "x$with_ppl" = "xno"; then
+  dnl Only execute fail-action, if CLooG has been requested.
+  CLOOG_REQUESTED([graphite_requested=yes], [graphite_requested=no])
+  if test "${graphite_requested}" = yes; then
+    AC_MSG_ERROR([Unable to find a usable PPL.  See config.log for details.])
+  fi
+  with_cloog=no
+fi
+if test "x${with_cloog}" = x && test "x${with_cloog_include}" = x \
+  && test "x${with_cloog_lib}" = x && test -d ${srcdir}/cloog; then
+  clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' '
+  clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include '
+fi
+if test "x$with_cloog" != "xno"; then
+  dnl The minimal version of CLooG required for Graphite.
+  dnl
+  dnl If we use CLooG-Legacy, the provided version information is
+  dnl ignored.
+  CLOOG_CHECK_VERSION(0,16,1)
+
+  dnl Only execute fail-action, if CLooG has been requested.
+  CLOOG_IF_FAILED([
+    AC_MSG_ERROR([Unable to find a usable CLooG.  See config.log for details.])])
+fi
+
+# Check for LTO support.
+AC_ARG_ENABLE(lto,
+[AS_HELP_STRING([--enable-lto], [enable link time optimization support])],
+enable_lto=$enableval,
+enable_lto=yes; default_enable_lto=yes)
+
+ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always.
+  build_lto_plugin=yes
+],[if test x"$default_enable_lto" = x"yes" ; then
+    case $target in
+      *-apple-darwin9* | *-cygwin* | *-mingw*) ;;
+      # On other non-ELF platforms, LTO has yet to be validated.
+      *) enable_lto=no ;;
+    esac
+  else
+  # Apart from ELF platforms, only Windows and Darwin support LTO so far.
+  # It would also be nice to check the binutils support, but we don't
+  # have gcc_GAS_CHECK_FEATURE available here.  For now, we'll just
+  # warn during gcc/ subconfigure; unless you're bootstrapping with
+  # -flto it won't be needed until after installation anyway.
+    case $target in
+      *-cygwin* | *-mingw* | *-apple-darwin*) ;;
+      *) if test x"$enable_lto" = x"yes"; then
+	AC_MSG_ERROR([LTO support is not enabled for this target.])
+        fi
+      ;;
+    esac
+  fi
+  # Among non-ELF, only Windows platforms support the lto-plugin so far.
+  # Build it unless LTO was explicitly disabled.
+  case $target in
+    *-cygwin* | *-mingw*) build_lto_plugin=$enable_lto ;;
+    *) ;;
+  esac
+])
+
+
+# By default, C is the only stage 1 language.
+stage1_languages=,c,
+
+# Target libraries that we bootstrap.
+bootstrap_target_libs=,target-libgcc,
+
+# Figure out what language subdirectories are present.
+# Look if the user specified --enable-languages="..."; if not, use
+# the environment variable $LANGUAGES if defined. $LANGUAGES might
+# go away some day.
+# NB:  embedded tabs in this IF block -- do not untabify
+if test -d ${srcdir}/gcc; then
+  if test x"${enable_languages+set}" != xset; then
+    if test x"${LANGUAGES+set}" = xset; then
+      enable_languages="${LANGUAGES}"
+        echo configure.in: warning: setting LANGUAGES is deprecated, use --enable-languages instead 1>&2
+    else
+      enable_languages=all
+    fi
+  else
+    if test x"${enable_languages}" = x ||
+       test x"${enable_languages}" = xyes;
+       then
+      echo configure.in: --enable-languages needs at least one language argument 1>&2
+      exit 1
+    fi
+  fi
+  enable_languages=`echo "${enable_languages}" | sed -e 's/[[ 	,]][[ 	,]]*/,/g' -e 's/,$//'`
+
+  # 'f95' is the old name for the 'fortran' language. We issue a warning
+  # and make the substitution.
+  case ,${enable_languages}, in
+    *,f95,*)
+      echo configure.in: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2
+      enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'`
+      ;;
+  esac
+
+  # If bootstrapping, then using --enable-build-with-cxx or
+  # --enable-build-poststage1-with-cxx requires enabling C++.
+  case ",$enable_languages,:,$ENABLE_BUILD_WITH_CXX,$ENABLE_BUILD_POSTSTAGE1_WITH_CXX,:$enable_bootstrap" in
+    *,c++,*:*:*) ;;
+    *:*,yes,*:yes)
+      if test -f ${srcdir}/gcc/cp/config-lang.in; then
+        enable_languages="${enable_languages},c++"
+      else
+        AC_MSG_ERROR([bootstrapping with --enable-build-with-cxx or --enable-build-poststage1-with-cxx requires c++ sources])
+      fi
+      ;;
+  esac
+
+  # First scan to see if an enabled language requires some other language.
+  # We assume that a given config-lang.in will list all the language
+  # front ends it requires, even if some are required indirectly.
+  for lang_frag in ${srcdir}/gcc/*/config-lang.in .. ; do
+    case ${lang_frag} in
+      ..) ;;
+      # The odd quoting in the next line works around
+      # an apparent bug in bash 1.12 on linux.
+      ${srcdir}/gcc/[[*]]/config-lang.in) ;;
+      *)
+        # From the config-lang.in, get $language, $lang_requires, and
+        # $lang_requires_boot_languages.
+        language=
+        lang_requires=
+        lang_requires_boot_languages=
+        . ${lang_frag}
+        for other in ${lang_requires} ${lang_requires_boot_languages}; do
+          case ,${enable_languages}, in
+	    *,$other,*) ;;
+	    *,all,*) ;;
+	    *,$language,*)
+	      echo " \`$other' language required by \`$language'; enabling" 1>&2
+	      enable_languages="${enable_languages},${other}"
+	      ;;
+	  esac
+        done
+	for other in ${lang_requires_boot_languages} ; do
+	  if test "$other" != "c"; then
+	    case ,${enable_stage1_languages}, in
+	      *,$other,*) ;;
+	      *,all,*) ;;
+	      *)
+		case ,${enable_languages}, in
+		  *,$language,*)
+		    echo " '$other' language required by '$language' in stage 1; enabling" 1>&2
+		    enable_stage1_languages="$enable_stage1_languages,${other}"
+		    ;;
+		esac
+		;;
+	    esac
+          fi
+        done
+        ;;
+    esac
+  done
+
+  new_enable_languages=,c,
+
+  # If LTO is enabled, add the LTO front end.
+  extra_host_libiberty_configure_flags=
+  if test "$enable_lto" = "yes" ; then
+    case ,${enable_languages}, in
+      *,lto,*) ;;
+      *) enable_languages="${enable_languages},lto" ;;
+    esac
+    if test "${build_lto_plugin}" = "yes" ; then
+      configdirs="$configdirs lto-plugin"
+      extra_host_libiberty_configure_flags=--enable-shared
+    fi
+  fi
+  AC_SUBST(extra_host_libiberty_configure_flags)
+
+  missing_languages=`echo ",$enable_languages," | sed -e s/,all,/,/ -e s/,c,/,/ `
+  potential_languages=,c,
+
+  enabled_target_libs=
+  disabled_target_libs=
+
+  for lang_frag in ${srcdir}/gcc/*/config-lang.in .. ; do
+    case ${lang_frag} in
+      ..) ;;
+      # The odd quoting in the next line works around
+      # an apparent bug in bash 1.12 on linux.
+      ${srcdir}/gcc/[[*]]/config-lang.in) ;;
+      *)
+        # From the config-lang.in, get $language, $target_libs, 
+        # $lang_dirs, $boot_language, and $build_by_default
+        language=
+        target_libs=
+        lang_dirs=
+        subdir_requires=
+        boot_language=no
+        build_by_default=yes
+        . ${lang_frag}
+        if test x${language} = x; then
+          echo "${lang_frag} doesn't set \$language." 1>&2
+          exit 1
+        fi
+
+	if test "$language" = "c++"; then
+	  if test "$ENABLE_BUILD_WITH_CXX" = "yes" \
+	     || test "$ENABLE_BUILD_POSTSTAGE1_WITH_CXX" = "yes"; then
+	    boot_language=yes
+	  fi
+	fi
+
+        case ,${enable_languages}, in
+          *,${language},*)
+            # Language was explicitly selected; include it.
+            add_this_lang=yes
+            ;;
+          *,all,*)
+            # 'all' was selected, select it if it is a default language
+            add_this_lang=${build_by_default}
+            ;;
+          *)
+            add_this_lang=no
+            ;;
+        esac
+
+        # Disable languages that need other directories if these aren't available.
+	for i in $subdir_requires; do
+	  test -f "$srcdir/gcc/$i/config-lang.in" && continue
+	  case ,${enable_languages}, in
+            *,${language},*)
+              # Specifically requested language; tell them.
+              AC_MSG_ERROR([The gcc/$i directory contains parts of $language but is missing])
+              ;;
+            *)
+              # Silently disable.
+              add_this_lang=unsupported
+              ;;
+          esac
+	done
+
+        # Disable Ada if no preexisting GNAT is available.
+        case ,${enable_languages},:${language}:${have_gnat} in
+          *,${language},*:ada:no)
+            # Specifically requested language; tell them.
+            AC_MSG_ERROR([GNAT is required to build $language])
+            ;;
+          *:ada:no)
+            # Silently disable.
+            add_this_lang=unsupported
+            ;;
+        esac
+
+	# Disable a language that is unsupported by the target.
+	case " $unsupported_languages " in
+	  *" $language "*)
+	    add_this_lang=unsupported
+	    ;;
+	esac
+
+	case $add_this_lang in
+	  unsupported)
+            # Remove language-dependent dirs.
+	    disabled_target_libs="$disabled_target_libs $target_libs"
+	    noconfigdirs="$noconfigdirs $lang_dirs"
+	    ;;
+	  no)
+            # Remove language-dependent dirs; still show language as supported.
+	    disabled_target_libs="$disabled_target_libs $target_libs"
+	    noconfigdirs="$noconfigdirs $lang_dirs"
+            potential_languages="${potential_languages}${language},"
+	    ;;
+          yes)
+	    new_enable_languages="${new_enable_languages}${language},"
+            potential_languages="${potential_languages}${language},"
+	    missing_languages=`echo "$missing_languages" | sed "s/,$language,/,/"`
+	    enabled_target_libs="$enabled_target_libs $target_libs"
+	    case "${boot_language}:,$enable_stage1_languages," in
+	      yes:* | *:*,$language,* | *:*,yes, | *:*,all,)
+		# Add to (comma-separated) list of stage 1 languages.
+		case ",$stage1_languages," in
+		  *,$language,* | ,yes, | ,all,) ;;
+		  *) stage1_languages="${stage1_languages}${language}," ;;
+		esac
+		# We need to bootstrap any supporting libraries.
+		bootstrap_target_libs="${bootstrap_target_libs}${target_libs},"
+		;;
+	    esac
+	    ;;
+        esac
+        ;;
+    esac
+  done
+
+  # Add target libraries which are only needed for disabled languages
+  # to noconfigdirs.
+  if test -n "$disabled_target_libs"; then
+    for dir in $disabled_target_libs; do
+      case " $enabled_target_libs " in
+      *" ${dir} "*) ;;
+      *) noconfigdirs="$noconfigdirs $dir" ;;
+      esac
+    done
+  fi
+
+  AC_ARG_ENABLE(stage1-languages,
+  [AS_HELP_STRING([[--enable-stage1-languages[=all]]],
+		  [choose additional languages to build during
+		  stage1.  Mostly useful for compiler development])],
+  [case ,${enable_stage1_languages}, in
+    ,no,|,,)
+      # Set it to something that will have no effect in the loop below
+      enable_stage1_languages=c ;;
+    ,yes,)
+      enable_stage1_languages=`echo $new_enable_languages | \
+	sed -e "s/^,//" -e "s/,$//" ` ;;
+    *,all,*)
+      enable_stage1_languages=`echo ,$enable_stage1_languages, | \
+	sed -e "s/,all,/$new_enable_languages/" -e "s/^,//" -e "s/,$//" ` ;;
+  esac
+
+  # Add "good" languages from enable_stage1_languages to stage1_languages,
+  # while "bad" languages go in missing_languages.  Leave no duplicates.
+  for i in `echo $enable_stage1_languages | sed 's/,/ /g' `; do
+    case $potential_languages in
+      *,$i,*)
+        case $stage1_languages in
+          *,$i,*) ;;
+          *) stage1_languages="$stage1_languages$i," ;;
+        esac ;;
+      *)
+        case $missing_languages in
+          *,$i,*) ;;
+          *) missing_languages="$missing_languages$i," ;;
+        esac ;;
+     esac
+  done])
+
+  # Remove leading/trailing commas that were added for simplicity
+  potential_languages=`echo "$potential_languages" | sed -e "s/^,//" -e "s/,$//"`
+  missing_languages=`echo "$missing_languages" | sed -e "s/^,//" -e "s/,$//"`
+  stage1_languages=`echo "$stage1_languages" | sed -e "s/^,//" -e "s/,$//"`
+  new_enable_languages=`echo "$new_enable_languages" | sed -e "s/^,//" -e "s/,$//"`
+
+  if test "x$missing_languages" != x; then
+    AC_MSG_ERROR([
+The following requested languages could not be built: ${missing_languages}
+Supported languages are: ${potential_languages}])
+  fi
+  if test "x$new_enable_languages" != "x$enable_languages"; then
+    echo The following languages will be built: ${new_enable_languages}
+    enable_languages="$new_enable_languages"
+  fi
+
+  AC_SUBST(stage1_languages)
+  ac_configure_args=`echo " $ac_configure_args" | sed -e "s/ '--enable-languages=[[^ ]]*'//g" -e "s/$/ '--enable-languages="$enable_languages"'/" `
+fi
+
+# Handle --disable-<component> generically.
+for dir in $configdirs $build_configdirs $target_configdirs ; do
+  dirname=`echo $dir | sed -e s/target-//g -e s/build-//g -e s/-/_/g`
+  varname=`echo $dirname | sed -e s/+/_/g`
+  if eval test x\${enable_${varname}} "=" xno ; then
+    noconfigdirs="$noconfigdirs $dir"
+  fi
+done
+
+# Check for Boehm's garbage collector
+AC_ARG_ENABLE(objc-gc,
+[AS_HELP_STRING([--enable-objc-gc],
+		[enable use of Boehm's garbage collector with the
+		 GNU Objective-C runtime])],
+[case ,${enable_languages},:${enable_objc_gc}:${noconfigdirs} in
+  *,objc,*:*:yes:*target-boehm-gc*)
+    AC_MSG_ERROR([Boehm's garbage collector was requested yet not supported in this configuration])
+    ;;
+esac])
+
+# Make sure we only build Boehm's garbage collector if required.
+case ,${enable_languages},:${enable_objc_gc} in
+  *,objc,*:yes)
+    # Keep target-boehm-gc if requested for Objective-C.
+    ;;
+  *)
+    # Otherwise remove target-boehm-gc depending on target-libjava.
+    if echo " ${noconfigdirs} " | grep "target-libjava" >/dev/null 2>&1; then
+      noconfigdirs="$noconfigdirs target-boehm-gc"
+    fi
+    ;;
+esac
+
+# Remove the entries in $skipdirs and $noconfigdirs from $configdirs,
+# $build_configdirs and $target_configdirs.
+# If we have the source for $noconfigdirs entries, add them to $notsupp.
+
+notsupp=""
+for dir in . $skipdirs $noconfigdirs ; do
+  dirname=`echo $dir | sed -e s/target-//g -e s/build-//g`
+  if test $dir != .  && echo " ${configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
+    configdirs=`echo " ${configdirs} " | sed -e "s/ ${dir} / /"`
+    if test -r $srcdir/$dirname/configure ; then
+      if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then
+	true
+      else
+	notsupp="$notsupp $dir"
+      fi
+    fi
+  fi
+  if test $dir != .  && echo " ${build_configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
+    build_configdirs=`echo " ${build_configdirs} " | sed -e "s/ ${dir} / /"`
+    if test -r $srcdir/$dirname/configure ; then
+      if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then
+	true
+      else
+	notsupp="$notsupp $dir"
+      fi
+    fi
+  fi
+  if test $dir != . && echo " ${target_configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
+    target_configdirs=`echo " ${target_configdirs} " | sed -e "s/ ${dir} / /"`
+    if test -r $srcdir/$dirname/configure ; then
+      if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then
+	true
+      else
+	notsupp="$notsupp $dir"
+      fi
+    fi
+  fi
+done
+
+# Quietly strip out all directories which aren't configurable in this tree.
+# This relies on all configurable subdirectories being autoconfiscated, which
+# is now the case.
+build_configdirs_all="$build_configdirs"
+build_configdirs=
+for i in ${build_configdirs_all} ; do
+  j=`echo $i | sed -e s/build-//g` 
+  if test -f ${srcdir}/$j/configure ; then
+    build_configdirs="${build_configdirs} $i"
+  fi
+done
+
+configdirs_all="$configdirs"
+configdirs=
+for i in ${configdirs_all} ; do
+  if test -f ${srcdir}/$i/configure ; then
+    configdirs="${configdirs} $i"
+  fi
+done
+
+target_configdirs_all="$target_configdirs"
+target_configdirs=
+for i in ${target_configdirs_all} ; do
+  j=`echo $i | sed -e s/target-//g` 
+  if test -f ${srcdir}/$j/configure ; then
+    target_configdirs="${target_configdirs} $i"
+  fi
+done
+
+# Produce a warning message for the subdirs we can't configure.
+# This isn't especially interesting in the Cygnus tree, but in the individual
+# FSF releases, it's important to let people know when their machine isn't
+# supported by the one or two programs in a package.
+
+if test -n "${notsupp}" && test -z "${norecursion}" ; then
+  # If $appdirs is non-empty, at least one of those directories must still
+  # be configured, or we error out.  (E.g., if the gas release supports a
+  # specified target in some subdirs but not the gas subdir, we shouldn't
+  # pretend that all is well.)
+  if test -n "$appdirs" ; then
+    for dir in $appdirs ; do
+      if test -r $dir/Makefile.in ; then
+	if echo " ${configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
+	  appdirs=""
+	  break
+	fi
+	if echo " ${target_configdirs} " | grep " target-${dir} " >/dev/null 2>&1; then
+	  appdirs=""
+	  break
+	fi
+      fi
+    done
+    if test -n "$appdirs" ; then
+      echo "*** This configuration is not supported by this package." 1>&2
+      exit 1
+    fi
+  fi
+  # Okay, some application will build, or we don't care to check.  Still
+  # notify of subdirs not getting built.
+  echo "*** This configuration is not supported in the following subdirectories:" 1>&2
+  echo "    ${notsupp}" 1>&2
+  echo "    (Any other directories should still work fine.)" 1>&2
+fi
+
+case "$host" in
+  *msdosdjgpp*)
+    enable_gdbtk=no ;;
+esac
+
+# To find our prefix, in gcc_cv_tool_prefix.
+ACX_TOOL_DIRS
+
+copy_dirs=
+
+AC_ARG_WITH([build-sysroot], 
+  [AS_HELP_STRING([--with-build-sysroot=SYSROOT],
+		  [use sysroot as the system root during the build])],
+  [if test x"$withval" != x ; then
+     SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval"
+   fi],
+  [SYSROOT_CFLAGS_FOR_TARGET=])
+AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET)
+
+AC_ARG_WITH([debug-prefix-map],
+  [AS_HELP_STRING([--with-debug-prefix-map='A=B C=D ...'],
+		  [map A to B, C to D ... in debug information])],
+  [if test x"$withval" != x; then
+     DEBUG_PREFIX_CFLAGS_FOR_TARGET=
+     for debug_map in $withval; do
+       DEBUG_PREFIX_CFLAGS_FOR_TARGET="$DEBUG_PREFIX_CFLAGS_FOR_TARGET -fdebug-prefix-map=$debug_map"
+     done
+   fi],
+  [DEBUG_PREFIX_CFLAGS_FOR_TARGET=])
+AC_SUBST(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
+
+# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
+# might be empty or "-g".  We don't require a C++ compiler, so CXXFLAGS
+# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
+# We want to ensure that TARGET libraries (which we know are built with
+# gcc) are built with "-O2 -g", so include those options when setting
+# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
+if test "x$CFLAGS_FOR_TARGET" = x; then
+  CFLAGS_FOR_TARGET=$CFLAGS
+  case " $CFLAGS " in
+    *" -O2 "*) ;;
+    *) CFLAGS_FOR_TARGET="-O2 $CFLAGS" ;;
+  esac
+  case " $CFLAGS " in
+    *" -g "* | *" -g3 "*) ;;
+    *) CFLAGS_FOR_TARGET="-g $CFLAGS" ;;
+  esac
+fi
+AC_SUBST(CFLAGS_FOR_TARGET)
+
+if test "x$CXXFLAGS_FOR_TARGET" = x; then
+  CXXFLAGS_FOR_TARGET=$CXXFLAGS
+  case " $CXXFLAGS " in
+    *" -O2 "*) ;;
+    *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS" ;;
+  esac
+  case " $CXXFLAGS " in
+    *" -g "* | *" -g3 "*) ;;
+    *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS" ;;
+  esac
+fi
+AC_SUBST(CXXFLAGS_FOR_TARGET)
+
+AC_SUBST(LDFLAGS_FOR_TARGET)
+
+# Handle --with-headers=XXX.  If the value is not "yes", the contents of
+# the named directory are copied to $(tooldir)/sys-include.
+if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
+  if test x${is_cross_compiler} = xno ; then
+    echo 1>&2 '***' --with-headers is only supported when cross compiling
+    exit 1
+  fi
+  if test x"${with_headers}" != xyes ; then
+    x=${gcc_cv_tool_prefix}
+    copy_dirs="${copy_dirs} ${with_headers} $x/${target_noncanonical}/sys-include"
+  fi
+fi
+
+# Handle --with-libs=XXX.  If the value is not "yes", the contents of
+# the name directories are copied to $(tooldir)/lib.  Multiple directories
+# are permitted.
+if test x"${with_libs}" != x && test x"${with_libs}" != xno ; then
+  if test x${is_cross_compiler} = xno ; then
+    echo 1>&2 '***' --with-libs is only supported when cross compiling
+    exit 1
+  fi
+  if test x"${with_libs}" != xyes ; then
+    # Copy the libraries in reverse order, so that files in the first named
+    # library override files in subsequent libraries.
+    x=${gcc_cv_tool_prefix}
+    for l in ${with_libs}; do
+      copy_dirs="$l $x/${target_noncanonical}/lib ${copy_dirs}"
+    done
+  fi
+fi
+
+# Set with_gnu_as, with_gnu_ld, and with_system_zlib as appropriate.
+#
+# This is done by determining whether or not the appropriate directory
+# is available, and by checking whether or not specific configurations
+# have requested that this magic not happen.
+# 
+# The command line options always override the explicit settings in 
+# configure.in, and the settings in configure.in override this magic.
+#
+# If the default for a toolchain is to use GNU as and ld, and you don't 
+# want to do that, then you should use the --without-gnu-as and
+# --without-gnu-ld options for the configure script.  Similarly, if
+# the default is to use the included zlib and you don't want to do that,
+# you should use the --with-system-zlib option for the configure script.
+
+if test x${use_gnu_as} = x &&
+   echo " ${configdirs} " | grep " gas " > /dev/null 2>&1 ; then
+  with_gnu_as=yes
+  extra_host_args="$extra_host_args --with-gnu-as"
+fi
+
+if test x${use_gnu_ld} = x &&
+   echo " ${configdirs} " | egrep " (go)?ld " > /dev/null 2>&1 ; then
+  with_gnu_ld=yes
+  extra_host_args="$extra_host_args --with-gnu-ld"
+fi
+
+if test x${use_included_zlib} = x &&
+   echo " ${configdirs} " | grep " zlib " > /dev/null 2>&1 ; then
+  :
+else
+  with_system_zlib=yes
+  extra_host_args="$extra_host_args --with-system-zlib"
+fi
+
+# If using newlib, add --with-newlib to the extra_host_args so that gcc/configure
+# can detect this case.
+
+if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 ; then
+  with_newlib=yes
+  extra_host_args="$extra_host_args --with-newlib"
+fi
+
+# Handle ${copy_dirs}
+set fnord ${copy_dirs}
+shift
+while test $# != 0 ; do
+  if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then
+    :
+  else
+    echo Copying $1 to $2
+
+    # Use the install script to create the directory and all required
+    # parent directories.
+    if test -d $2 ; then
+      :
+    else
+      echo >config.temp
+      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
+    fi
+
+    # Copy the directory, assuming we have tar.
+    # FIXME: Should we use B in the second tar?  Not all systems support it.
+    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
+
+    # It is the responsibility of the user to correctly adjust all
+    # symlinks.  If somebody can figure out how to handle them correctly
+    # here, feel free to add the code.
+
+    echo $1 > $2/COPIED
+  fi
+  shift; shift
+done
+
+# Determine a target-dependent exec_prefix that the installed
+# gcc will search in.  Keep this list sorted by triplet, with
+# the *-*-osname triplets last.
+md_exec_prefix=
+case "${target}" in
+  i[[34567]]86-pc-msdosdjgpp*)
+    md_exec_prefix=/dev/env/DJDIR/bin
+    ;;
+  *-*-hpux* | \
+  *-*-nto-qnx* | \
+  *-*-solaris2*)
+    md_exec_prefix=/usr/ccs/bin
+    ;;
+esac
+
+extra_arflags_for_target=
+extra_nmflags_for_target=
+extra_ranlibflags_for_target=
+target_makefile_frag=/dev/null
+case "${target}" in
+  spu-*-*)
+    target_makefile_frag="config/mt-spu"
+    ;;
+  mips*-sde-elf*)
+    target_makefile_frag="config/mt-sde"
+    ;;
+  mipsisa*-*-elfoabi*)
+    target_makefile_frag="config/mt-mips-elfoabi"
+    ;;
+  mips*-*-*linux* | mips*-*-gnu*)
+    target_makefile_frag="config/mt-mips-gnu"
+    ;;
+  *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
+    target_makefile_frag="config/mt-gnu"
+    ;;
+  *-*-aix4.[[3456789]]* | *-*-aix[[56789]].*)
+    # nm and ar from AIX 4.3 and above require -X32_64 flag to all ar and nm 
+    # commands to handle both 32-bit and 64-bit objects.  These flags are
+    # harmless if we're using GNU nm or ar.
+    extra_arflags_for_target=" -X32_64"
+    extra_nmflags_for_target=" -B -X32_64"
+    ;;
+  *-*-darwin[[3-9]]*)
+    # ranlib before Darwin10 requires the -c flag to look at common symbols.
+    extra_ranlibflags_for_target=" -c"
+    ;;
+esac
+
+alphaieee_frag=/dev/null
+case $target in
+  alpha*-*-*)
+    # This just makes sure to use the -mieee option to build target libs.
+    # This should probably be set individually by each library.
+    alphaieee_frag="config/mt-alphaieee"
+    ;;
+esac
+
+# If --enable-target-optspace always use -Os instead of -O2 to build
+# the target libraries, similarly if it is not specified, use -Os
+# on selected platforms.
+ospace_frag=/dev/null
+case "${enable_target_optspace}:${target}" in
+  yes:*)
+    ospace_frag="config/mt-ospace"
+    ;;
+  :d30v-*)
+    ospace_frag="config/mt-d30v"
+    ;;
+  :m32r-* | :d10v-* | :fr30-*)
+    ospace_frag="config/mt-ospace"
+    ;;
+  no:* | :*)
+    ;;
+  *)
+    echo "*** bad value \"${enable_target_optspace}\" for --enable-target-optspace flag; ignored" 1>&2
+    ;;
+esac
+
+# Default to using --with-stabs for certain targets.
+if test x${with_stabs} = x ; then
+  case "${target}" in
+  mips*-*-irix[[56]]*)
+    ;;
+  mips*-*-* | alpha*-*-osf*)
+    with_stabs=yes;
+    extra_host_args="${extra_host_args} --with-stabs"
+    ;;
+  esac
+fi
+
+# Some systems (e.g., one of the i386-aix systems the gas testers are
+# using) don't handle "\$" correctly, so don't use it here.
+tooldir='${exec_prefix}'/${target_noncanonical}
+build_tooldir=${tooldir}
+
+# Create a .gdbinit file which runs the one in srcdir
+# and tells GDB to look there for source files.
+
+if test -r ${srcdir}/.gdbinit ; then
+  case ${srcdir} in
+    .) ;;
+    *) cat > ./.gdbinit <<EOF
+# ${NO_EDIT}
+dir ${srcdir}
+dir .
+source ${srcdir}/.gdbinit
+EOF
+    ;;
+  esac
+fi
+
+# Make sure that the compiler is able to generate an executable.  If it
+# can't, we are probably in trouble.  We don't care whether we can run the
+# executable--we might be using a cross compiler--we only care whether it
+# can be created.  At this point the main configure script has set CC.
+we_are_ok=no
+echo "int main () { return 0; }" > conftest.c
+${CC} -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c
+if test $? = 0 ; then
+  if test -s conftest || test -s conftest.exe ; then
+    we_are_ok=yes
+  fi
+fi 
+case $we_are_ok in
+  no)
+    echo 1>&2 "*** The command '${CC} -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c' failed."
+    echo 1>&2 "*** You must set the environment variable CC to a working compiler."
+    rm -f conftest*
+    exit 1
+    ;;
+esac
+rm -f conftest*
+
+# Decide which environment variable is used to find dynamic libraries.
+case "${host}" in
+  *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;;
+  *-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
+  *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;;
+  *) RPATH_ENVVAR=LD_LIBRARY_PATH ;;
+esac
+
+# On systems where the dynamic library environment variable is PATH,
+# gcc/ will put dynamic libraries into a subdirectory to avoid adding
+# built executables to PATH.
+if test "$RPATH_ENVVAR" = PATH; then
+  GCC_SHLIB_SUBDIR=/shlib
+else
+  GCC_SHLIB_SUBDIR=
+fi
+
+# Record target_configdirs and the configure arguments for target and
+# build configuration in Makefile.
+target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'`
+build_configdirs=`echo "${build_configdirs}" | sed -e 's/build-//g'`
+
+# If we are building libgomp, bootstrap it.
+if echo " ${target_configdirs} " | grep " libgomp " > /dev/null 2>&1 ; then
+  bootstrap_target_libs=${bootstrap_target_libs}target-libgomp,
+fi
+
+# Determine whether gdb needs tk/tcl or not.
+# Use 'maybe' since enable_gdbtk might be true even if tk isn't available
+# and in that case we want gdb to be built without tk.  Ugh!
+# In fact I believe gdb is the *only* package directly dependent on tk,
+# so we should be able to put the 'maybe's in unconditionally and
+# leave out the maybe dependencies when enable_gdbtk is false.  I'm not
+# 100% sure that that's safe though.
+
+gdb_tk="maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-libgui"
+case "$enable_gdbtk" in
+  no)
+    GDB_TK="" ;;
+  yes)
+    GDB_TK="${gdb_tk}" ;;
+  *)
+    # Only add the dependency on gdbtk when GDBtk is part of the gdb
+    # distro.  Eventually someone will fix this and move Insight, nee
+    # gdbtk to a separate directory.
+    if test -d ${srcdir}/gdb/gdbtk ; then
+      GDB_TK="${gdb_tk}"
+    else
+      GDB_TK=""
+    fi
+    ;;
+esac
+CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g`
+INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g`
+
+# Strip out unwanted targets.
+
+# While at that, we remove Makefiles if we were started for recursive
+# configuration, so that the top-level Makefile reconfigures them,
+# like we used to do when configure itself was recursive.
+
+# Loop over modules.  We used to use the "$extrasub" feature from Autoconf
+# but now we're fixing up the Makefile ourselves with the additional
+# commands passed to AC_CONFIG_FILES.  Use separate variables
+# extrasub-{build,host,target} not because there is any reason to split
+# the substitutions up that way, but only to remain below the limit of
+# 99 commands in a script, for HP-UX sed.
+# Do not nest @if/@endif pairs, because configure will not warn you at all.
+
+case "$enable_bootstrap:$ENABLE_GOLD: $configdirs :,$stage1_languages," in
+  yes:yes:*\ gold\ *:*,c++,*) ;;
+  yes:yes:*\ gold\ *:*)
+    AC_MSG_ERROR([in a combined tree, bootstrapping with --enable-gold requires c++ in stage1_languages])
+    ;;
+esac
+
+# Adjust the toplevel makefile according to whether bootstrap was selected.
+case $enable_bootstrap in
+  yes)
+    bootstrap_suffix=bootstrap
+    BUILD_CONFIG=bootstrap-debug
+    ;;
+  no)
+    bootstrap_suffix=no-bootstrap
+    BUILD_CONFIG=
+    ;;
+esac
+
+AC_MSG_CHECKING(for default BUILD_CONFIG)
+
+AC_ARG_WITH([build-config],
+  [AS_HELP_STRING([--with-build-config='NAME NAME2...'],
+		  [use config/NAME.mk build configuration])],
+  [case $with_build_config in
+   yes) with_build_config= ;;
+   no) with_build_config= BUILD_CONFIG= ;;
+   esac])
+
+if test "x${with_build_config}" != x; then
+  BUILD_CONFIG=$with_build_config
+else
+  case $BUILD_CONFIG in
+  bootstrap-debug)
+    if echo "int f (void) { return 0; }" > conftest.c &&
+       ${CC} -c conftest.c &&
+       mv conftest.o conftest.o.g0 &&
+       ${CC} -c -g conftest.c &&
+       mv conftest.o conftest.o.g &&
+       ${srcdir}/contrib/compare-debug conftest.o.g0 conftest.o.g > /dev/null 2>&1; then
+      :
+    else
+      BUILD_CONFIG=
+    fi
+    rm -f conftest.c conftest.o conftest.o.g0 conftest.o.g
+    ;;
+  esac
+fi
+AC_MSG_RESULT($BUILD_CONFIG)
+AC_SUBST(BUILD_CONFIG)
+
+extrasub_build=
+for module in ${build_configdirs} ; do
+  if test -z "${no_recursion}" \
+     && test -f ${build_subdir}/${module}/Makefile; then
+    echo 1>&2 "*** removing ${build_subdir}/${module}/Makefile to force reconfigure"
+    rm -f ${build_subdir}/${module}/Makefile
+  fi
+  extrasub_build="$extrasub_build
+/^@if build-$module\$/d
+/^@endif build-$module\$/d
+/^@if build-$module-$bootstrap_suffix\$/d
+/^@endif build-$module-$bootstrap_suffix\$/d"
+done
+extrasub_host=
+for module in ${configdirs} ; do
+  if test -z "${no_recursion}"; then
+    for file in stage*-${module}/Makefile prev-${module}/Makefile ${module}/Makefile; do
+      if test -f ${file}; then
+	echo 1>&2 "*** removing ${file} to force reconfigure"
+	rm -f ${file}
+      fi
+    done
+  fi
+  extrasub_host="$extrasub_host
+/^@if $module\$/d
+/^@endif $module\$/d
+/^@if $module-$bootstrap_suffix\$/d
+/^@endif $module-$bootstrap_suffix\$/d"
+done
+extrasub_target=
+for module in ${target_configdirs} ; do
+  if test -z "${no_recursion}" \
+     && test -f ${target_subdir}/${module}/Makefile; then
+    echo 1>&2 "*** removing ${target_subdir}/${module}/Makefile to force reconfigure"
+    rm -f ${target_subdir}/${module}/Makefile
+  fi
+
+  # We only bootstrap target libraries listed in bootstrap_target_libs.
+  case $bootstrap_target_libs in
+    *,target-$module,*) target_bootstrap_suffix=$bootstrap_suffix ;;
+    *) target_bootstrap_suffix=no-bootstrap ;;
+  esac
+
+  extrasub_target="$extrasub_target
+/^@if target-$module\$/d
+/^@endif target-$module\$/d
+/^@if target-$module-$target_bootstrap_suffix\$/d
+/^@endif target-$module-$target_bootstrap_suffix\$/d"
+done
+
+# Do the final fixup along with target modules.
+extrasub_target="$extrasub_target
+/^@if /,/^@endif /d"
+
+# Create the serialization dependencies.  This uses a temporary file.
+
+AC_ARG_ENABLE([serial-configure],
+[AS_HELP_STRING([[--enable-serial-[{host,target,build}-]configure]],
+		[force sequential configuration of
+		 sub-packages for the host, target or build
+		 machine, or all sub-packages])])
+
+case ${enable_serial_configure} in
+  yes)
+    enable_serial_build_configure=yes
+    enable_serial_host_configure=yes
+    enable_serial_target_configure=yes
+    ;;
+esac
+
+# These force 'configure's to be done one at a time, to avoid problems
+# with contention over a shared config.cache.
+rm -f serdep.tmp
+echo '# serdep.tmp' > serdep.tmp
+olditem=
+test "x${enable_serial_build_configure}" = xyes &&
+for item in ${build_configdirs} ; do
+  case ${olditem} in
+    "") ;;
+    *) echo "configure-build-${item}: configure-build-${olditem}" >> serdep.tmp ;;
+  esac
+  olditem=${item}
+done
+olditem=
+test "x${enable_serial_host_configure}" = xyes &&
+for item in ${configdirs} ; do
+  case ${olditem} in
+    "") ;;
+    *) echo "configure-${item}: configure-${olditem}" >> serdep.tmp ;;
+  esac
+  olditem=${item}
+done
+olditem=
+test "x${enable_serial_target_configure}" = xyes &&
+for item in ${target_configdirs} ; do
+  case ${olditem} in
+    "") ;;
+    *) echo "configure-target-${item}: configure-target-${olditem}" >> serdep.tmp ;;
+  esac
+  olditem=${item}
+done
+serialization_dependencies=serdep.tmp
+AC_SUBST_FILE(serialization_dependencies)
+
+# Base args.  Strip norecursion, cache-file, srcdir, host, build,
+# target, nonopt, and variable assignments.  These are the ones we
+# might not want to pass down to subconfigures.  The exception being
+# --cache-file=/dev/null, which is used to turn off the use of cache
+# files altogether, and which should be passed on to subconfigures.
+# Also strip program-prefix, program-suffix, and program-transform-name,
+# so that we can pass down a consistent program-transform-name.
+baseargs=
+tbaseargs=
+keep_next=no
+skip_next=no
+eval "set -- $ac_configure_args"
+for ac_arg
+do
+  if test X"$skip_next" = X"yes"; then
+    skip_next=no
+    continue
+  fi
+  if test X"$keep_next" = X"yes"; then
+    case $ac_arg in
+      *\'*)
+	ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    baseargs="$baseargs '$ac_arg'"
+    tbaseargs="$tbaseargs '$ac_arg'"
+    keep_next=no
+    continue
+  fi
+
+  # Handle separated arguments.  Based on the logic generated by
+  # autoconf 2.59.
+  case $ac_arg in
+    *=* | --config-cache | -C | -disable-* | --disable-* \
+      | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+      | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+      | -with-* | --with-* | -without-* | --without-* | --x)
+      separate_arg=no
+      ;;
+    -*)
+      separate_arg=yes
+      ;;
+    *)
+      separate_arg=no
+      ;;
+  esac
+
+  skip_targ=no
+  case $ac_arg in
+changequote(,)
+  --with-* | --without-*)
+    libopt=`echo "$ac_arg" | sed -e 's,^--[^-_]*[-_],,' -e 's,=.*$,,'`
+
+    case $libopt in
+    *[-_]include)
+      lib=`echo "$libopt" | sed 's,[-_]include$,,'`
+      ;;
+    *[-_]lib)
+      lib=`echo "$libopt" | sed 's,[-_]lib$,,'`
+      ;;
+    *)
+      lib=$libopt
+      ;;
+    esac
+changequote([,])
+
+    case $lib in
+    mpc | mpfr | gmp | ppl | cloog)
+      # If we're processing --with-$lib, --with-$lib-include or
+      # --with-$lib-lib, for one of the libs above, and target is
+      # different from host, don't pass the current argument to any
+      # target library's configure.
+      if test x$is_cross_compiler = xyes; then
+        skip_targ=yes
+      fi
+      ;;
+    esac
+    ;;
+  esac
+
+  case "$ac_arg" in
+    --cache-file=/dev/null | \
+    -cache-file=/dev/null )
+      # Handled here to avoid the test to skip args below.
+      baseargs="$baseargs '$ac_arg'"
+      tbaseargs="$tbaseargs '$ac_arg'"
+      # Assert: $separate_arg should always be no.
+      keep_next=$separate_arg
+      ;;
+    --no*)
+      continue
+      ;;
+    --c* | \
+    --sr* | \
+    --ho* | \
+    --bu* | \
+    --t* | \
+    --program-* | \
+    -cache_file* | \
+    -srcdir* | \
+    -host* | \
+    -build* | \
+    -target* | \
+    -program-prefix* | \
+    -program-suffix* | \
+    -program-transform-name* )
+      skip_next=$separate_arg
+      continue
+      ;;
+    -*)
+      # An option.  Add it.
+      case $ac_arg in
+	*\'*)
+	  ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      esac
+      baseargs="$baseargs '$ac_arg'"
+      if test X"$skip_targ" = Xno; then
+        tbaseargs="$tbaseargs '$ac_arg'"
+      fi
+      keep_next=$separate_arg
+      ;;
+    *)
+      # Either a variable assignment, or a nonopt (triplet).  Don't
+      # pass it down; let the Makefile handle this.
+      continue
+      ;;
+  esac
+done
+# Remove the initial space we just introduced and, as these will be
+# expanded by make, quote '$'.
+baseargs=`echo "x$baseargs" | sed -e 's/^x *//' -e 's,\\$,$$,g'`
+
+# Add in --program-transform-name, after --program-prefix and
+# --program-suffix have been applied to it.  Autoconf has already
+# doubled dollar signs and backslashes in program_transform_name; we want
+# the backslashes un-doubled, and then the entire thing wrapped in single
+# quotes, because this will be expanded first by make and then by the shell. 
+# Also, because we want to override the logic in subdir configure scripts to
+# choose program_transform_name, replace any s,x,x, with s,y,y,.
+sed -e "s,\\\\\\\\,\\\\,g; s,','\\\\'',g; s/s,x,x,/s,y,y,/" <<EOF_SED > conftestsed.out
+${program_transform_name}
+EOF_SED
+gcc_transform_name=`cat conftestsed.out`
+rm -f conftestsed.out
+baseargs="$baseargs --program-transform-name='${gcc_transform_name}'"
+tbaseargs="$tbaseargs --program-transform-name='${gcc_transform_name}'"
+if test "$silent" = yes; then
+  baseargs="$baseargs --silent"
+  tbaseargs="$tbaseargs --silent"
+fi
+baseargs="$baseargs --disable-option-checking"
+tbaseargs="$tbaseargs --disable-option-checking"
+
+# Record and document user additions to sub configure arguments.
+AC_ARG_VAR([build_configargs],
+	   [additional configure arguments for build directories])
+AC_ARG_VAR([host_configargs],
+	   [additional configure arguments for host directories])
+AC_ARG_VAR([target_configargs],
+	   [additional configure arguments for target directories])
+
+# For the build-side libraries, we just need to pretend we're native,
+# and not use the same cache file.  Multilibs are neither needed nor
+# desired.
+build_configargs="$build_configargs --cache-file=../config.cache ${baseargs}"
+
+# For host modules, accept cache file option, or specification as blank.
+case "${cache_file}" in
+"") # empty
+  cache_file_option="" ;;
+/* | [[A-Za-z]]:[[\\/]]* ) # absolute path
+  cache_file_option="--cache-file=${cache_file}" ;;
+*) # relative path
+  cache_file_option="--cache-file=../${cache_file}" ;;
+esac
+
+# Host dirs don't like to share a cache file either, horribly enough.
+# This seems to be due to autoconf 2.5x stupidity.
+host_configargs="$host_configargs --cache-file=./config.cache ${extra_host_args} ${baseargs}"
+
+target_configargs="$target_configargs ${tbaseargs}"
+
+# Passing a --with-cross-host argument lets the target libraries know
+# whether they are being built with a cross-compiler or being built
+# native.  However, it would be better to use other mechanisms to make the
+# sorts of decisions they want to make on this basis.  Please consider
+# this option to be deprecated.  FIXME.
+if test x${is_cross_compiler} = xyes ; then
+  target_configargs="--with-cross-host=${host_noncanonical} ${target_configargs}"
+fi
+
+# Default to --enable-multilib.
+if test x${enable_multilib} = x ; then
+  target_configargs="--enable-multilib ${target_configargs}"
+fi
+
+# Pass --with-newlib if appropriate.  Note that target_configdirs has
+# changed from the earlier setting of with_newlib.
+if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " newlib " > /dev/null 2>&1 && test -d ${srcdir}/newlib ; then
+  target_configargs="--with-newlib ${target_configargs}"
+fi
+
+# Different target subdirs use different values of certain variables
+# (notably CXX).  Worse, multilibs use *lots* of different values.
+# Worse yet, autoconf 2.5x makes some of these 'precious', meaning that
+# it doesn't automatically accept command-line overrides of them.
+# This means it's not safe for target subdirs to share a cache file,
+# which is disgusting, but there you have it.  Hopefully this can be
+# fixed in future.  It's still worthwhile to use a cache file for each
+# directory.  I think.
+
+# Pass the appropriate --build, --host, --target and --cache-file arguments.
+# We need to pass --target, as newer autoconf's requires consistency
+# for target_alias and gcc doesn't manage it consistently.
+target_configargs="--cache-file=./config.cache ${target_configargs}"
+
+FLAGS_FOR_TARGET=
+case " $target_configdirs " in
+ *" newlib "*)
+  case " $target_configargs " in
+  *" --with-newlib "*)
+   case "$target" in
+    *-cygwin*)
+      FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -L$$r/$(TARGET_SUBDIR)/winsup/w32api/lib -isystem $$s/winsup/include -isystem $$s/winsup/cygwin/include -isystem $$s/winsup/w32api/include'
+      ;;
+   esac
+
+   # If we're not building GCC, don't discard standard headers.
+   if test -d ${srcdir}/gcc; then
+     FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -nostdinc'
+
+     if test "${build}" != "${host}"; then
+       # On Canadian crosses, CC_FOR_TARGET will have already been set
+       # by `configure', so we won't have an opportunity to add -Bgcc/
+       # to it.  This is right: we don't want to search that directory
+       # for binaries, but we want the header files in there, so add
+       # them explicitly.
+       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include -isystem $$r/$(HOST_SUBDIR)/gcc/include-fixed'
+
+       # Someone might think of using the pre-installed headers on
+       # Canadian crosses, in case the installed compiler is not fully
+       # compatible with the compiler being built.  In this case, it
+       # would be better to flag an error than risking having
+       # incompatible object files being constructed.  We can't
+       # guarantee that an error will be flagged, but let's hope the
+       # compiler will do it, when presented with incompatible header
+       # files.
+     fi
+   fi
+
+   case "${target}-${is_cross_compiler}" in
+   i[[3456789]]86-*-linux*-no)
+      # Here host == target, so we don't need to build gcc,
+      # so we don't want to discard standard headers.
+      FLAGS_FOR_TARGET=`echo " $FLAGS_FOR_TARGET " | sed -e 's/ -nostdinc / /'`
+      ;;
+   *)
+      # If we're building newlib, use its generic headers last, but search
+      # for any libc-related directories first (so make it the last -B
+      # switch).
+      FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/$(TARGET_SUBDIR)/newlib/ -isystem $$r/$(TARGET_SUBDIR)/newlib/targ-include -isystem $$s/newlib/libc/include'
+
+      # If we're building libgloss, find the startup file, simulator library
+      # and linker script.
+      case " $target_configdirs " in
+	*" libgloss "*)
+	# Look for startup file, simulator library and maybe linker script.
+	FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/$(TARGET_SUBDIR)/libgloss/'"$libgloss_dir"
+	# Look for libnosys.a in case the target needs it.
+	FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/libgloss/libnosys'
+	# Most targets have the linker script in the source directory.
+	FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$s/libgloss/'"$libgloss_dir"
+	;;
+      esac
+      ;;
+   esac
+   ;;
+  esac
+  ;;
+esac
+
+case "$target" in
+  x86_64-*mingw* | *-w64-mingw*)
+  # MinGW-w64 does not use newlib, nor does it use winsup. It may,
+  # however, use a symlink named 'mingw' in ${prefix} .
+    FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L${prefix}/${target}/lib -L${prefix}/mingw/lib -isystem ${prefix}/${target}/include -isystem ${prefix}/mingw/include'
+    ;;
+  *-mingw*)
+  # MinGW can't be handled as Cygwin above since it does not use newlib.
+    FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/mingw -L$$r/$(TARGET_SUBDIR)/winsup/w32api/lib -isystem $$s/winsup/mingw/include -isystem $$s/winsup/w32api/include'
+    ;;
+esac
+
+# Allow the user to override the flags for
+# our build compiler if desired.
+if test x"${build}" = x"${host}" ; then
+  CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
+  CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
+  LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
+fi
+
+# On Canadian crosses, we'll be searching the right directories for
+# the previously-installed cross compiler, so don't bother to add
+# flags for directories within the install tree of the compiler
+# being built; programs in there won't even run.
+if test "${build}" = "${host}" && test -d ${srcdir}/gcc; then
+  # Search for pre-installed headers if nothing else fits.
+  FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$(build_tooldir)/bin/ -B$(build_tooldir)/lib/ -isystem $(build_tooldir)/include -isystem $(build_tooldir)/sys-include'
+fi
+
+if test "x${use_gnu_ld}" = x &&
+   echo " ${configdirs} " | grep " ld " > /dev/null ; then
+  # Arrange for us to find uninstalled linker scripts.
+  FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(HOST_SUBDIR)/ld'
+fi
+
+# Search for other target-specific linker scripts and such.
+case "${target}" in
+  mep*)
+    FLAGS_FOR_TARGET="$FLAGS_FOR_TARGET -mlibrary"
+    ;;
+esac
+
+# Makefile fragments.
+for frag in host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag;
+do
+  eval fragval=\$$frag
+  if test $fragval != /dev/null; then
+    eval $frag=${srcdir}/$fragval
+  fi
+done
+AC_SUBST_FILE(host_makefile_frag)
+AC_SUBST_FILE(target_makefile_frag)
+AC_SUBST_FILE(alphaieee_frag)
+AC_SUBST_FILE(ospace_frag)
+
+# Miscellanea: directories, flags, etc.
+AC_SUBST(RPATH_ENVVAR)
+AC_SUBST(GCC_SHLIB_SUBDIR)
+AC_SUBST(tooldir)
+AC_SUBST(build_tooldir)
+AC_SUBST(CONFIGURE_GDB_TK)
+AC_SUBST(GDB_TK)
+AC_SUBST(INSTALL_GDB_TK)
+
+# Build module lists & subconfigure args.
+AC_SUBST(build_configargs)
+AC_SUBST(build_configdirs)
+
+# Host module lists & subconfigure args.
+AC_SUBST(host_configargs)
+AC_SUBST(configdirs)
+AC_SUBST(target_configdirs)
+
+# Target module lists & subconfigure args.
+AC_SUBST(target_configargs)
+
+
+# Build tools.
+AC_SUBST(AR_FOR_BUILD)
+AC_SUBST(AS_FOR_BUILD)
+AC_SUBST(CC_FOR_BUILD)
+AC_SUBST(CFLAGS_FOR_BUILD)
+AC_SUBST(CXXFLAGS_FOR_BUILD)
+AC_SUBST(CXX_FOR_BUILD)
+AC_SUBST(DLLTOOL_FOR_BUILD)
+AC_SUBST(GCJ_FOR_BUILD)
+AC_SUBST(GFORTRAN_FOR_BUILD)
+AC_SUBST(GOC_FOR_BUILD)
+AC_SUBST(LDFLAGS_FOR_BUILD)
+AC_SUBST(LD_FOR_BUILD)
+AC_SUBST(NM_FOR_BUILD)
+AC_SUBST(RANLIB_FOR_BUILD)
+AC_SUBST(WINDMC_FOR_BUILD)
+AC_SUBST(WINDRES_FOR_BUILD)
+
+# Generate default definitions for YACC, M4, LEX and other programs that run
+# on the build machine.  These are used if the Makefile can't locate these
+# programs in objdir.
+MISSING=`cd $ac_aux_dir && ${PWDCMD-pwd}`/missing
+
+AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [$MISSING bison -y])
+case " $build_configdirs " in
+  *" bison "*) YACC='$$r/$(BUILD_SUBDIR)/bison/tests/bison -y' ;;
+esac
+
+AC_CHECK_PROGS([BISON], [bison], [$MISSING bison])
+case " $build_configdirs " in
+  *" bison "*) BISON='$$r/$(BUILD_SUBDIR)/bison/tests/bison' ;;
+esac
+
+AC_CHECK_PROGS([M4], [gm4 gnum4 m4], [$MISSING m4])
+case " $build_configdirs " in
+  *" m4 "*) M4='$$r/$(BUILD_SUBDIR)/m4/m4' ;;
+esac
+
+AC_CHECK_PROGS([LEX], [flex lex], [$MISSING flex])
+case " $build_configdirs " in
+  *" flex "*) LEX='$$r/$(BUILD_SUBDIR)/flex/flex' ;;
+  *" lex "*) LEX='$$r/$(BUILD_SUBDIR)/lex/lex' ;;
+esac
+
+AC_CHECK_PROGS([FLEX], [flex], [$MISSING flex])
+case " $build_configdirs " in
+  *" flex "*) FLEX='$$r/$(BUILD_SUBDIR)/flex/flex' ;;
+esac
+
+AC_CHECK_PROGS([MAKEINFO], makeinfo, [$MISSING makeinfo])
+case " $build_configdirs " in
+  *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
+  *)
+changequote(,)
+    # For an installed makeinfo, we require it to be from texinfo 4.7 or
+    # higher, else we use the "missing" dummy.
+    if ${MAKEINFO} --version \
+       | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+      :
+    else
+      MAKEINFO="$MISSING makeinfo"
+    fi
+    ;;
+changequote([,])
+esac
+
+# FIXME: expect and dejagnu may become build tools?
+
+AC_CHECK_PROGS(EXPECT, expect, expect)
+case " $configdirs " in
+  *" expect "*)
+    test $host = $build && EXPECT='$$r/$(HOST_SUBDIR)/expect/expect'
+    ;;
+esac
+
+AC_CHECK_PROGS(RUNTEST, runtest, runtest)
+case " $configdirs " in
+  *" dejagnu "*)
+    test $host = $build && RUNTEST='$$s/$(HOST_SUBDIR)/dejagnu/runtest'
+    ;;
+esac
+
+
+# Host tools.
+NCN_STRICT_CHECK_TOOLS(AR, ar)
+NCN_STRICT_CHECK_TOOLS(AS, as)
+NCN_STRICT_CHECK_TOOLS(DLLTOOL, dlltool)
+NCN_STRICT_CHECK_TOOLS(LD, ld)
+NCN_STRICT_CHECK_TOOLS(LIPO, lipo)
+NCN_STRICT_CHECK_TOOLS(NM, nm)
+NCN_STRICT_CHECK_TOOLS(RANLIB, ranlib, true)
+NCN_STRICT_CHECK_TOOLS(STRIP, strip, true)
+NCN_STRICT_CHECK_TOOLS(WINDRES, windres)
+NCN_STRICT_CHECK_TOOLS(WINDMC, windmc)
+NCN_STRICT_CHECK_TOOLS(OBJCOPY, objcopy)
+NCN_STRICT_CHECK_TOOLS(OBJDUMP, objdump)
+AC_SUBST(CC)
+AC_SUBST(CXX)
+AC_SUBST(CFLAGS)
+AC_SUBST(CXXFLAGS)
+
+# Target tools.
+AC_ARG_WITH([build-time-tools], 
+  [AS_HELP_STRING([--with-build-time-tools=PATH],
+		  [use given path to find target tools during the build])],
+  [case x"$withval" in
+     x/*) ;;
+     *)
+       with_build_time_tools=
+       AC_MSG_WARN([argument to --with-build-time-tools must be an absolute path])
+       ;;
+   esac],
+  [with_build_time_tools=])
+
+NCN_STRICT_CHECK_TARGET_TOOLS(CC_FOR_TARGET, cc gcc)
+NCN_STRICT_CHECK_TARGET_TOOLS(CXX_FOR_TARGET, c++ g++ cxx gxx)
+NCN_STRICT_CHECK_TARGET_TOOLS(GCC_FOR_TARGET, gcc, ${CC_FOR_TARGET})
+NCN_STRICT_CHECK_TARGET_TOOLS(GCJ_FOR_TARGET, gcj)
+NCN_STRICT_CHECK_TARGET_TOOLS(GFORTRAN_FOR_TARGET, gfortran)
+NCN_STRICT_CHECK_TARGET_TOOLS(GOC_FOR_TARGET, gccgo)
+
+ACX_CHECK_INSTALLED_TARGET_TOOL(AR_FOR_TARGET, ar)
+ACX_CHECK_INSTALLED_TARGET_TOOL(AS_FOR_TARGET, as)
+ACX_CHECK_INSTALLED_TARGET_TOOL(DLLTOOL_FOR_TARGET, dlltool)
+ACX_CHECK_INSTALLED_TARGET_TOOL(LD_FOR_TARGET, ld)
+ACX_CHECK_INSTALLED_TARGET_TOOL(LIPO_FOR_TARGET, lipo)
+ACX_CHECK_INSTALLED_TARGET_TOOL(NM_FOR_TARGET, nm)
+ACX_CHECK_INSTALLED_TARGET_TOOL(OBJDUMP_FOR_TARGET, objdump)
+ACX_CHECK_INSTALLED_TARGET_TOOL(RANLIB_FOR_TARGET, ranlib)
+ACX_CHECK_INSTALLED_TARGET_TOOL(STRIP_FOR_TARGET, strip)
+ACX_CHECK_INSTALLED_TARGET_TOOL(WINDRES_FOR_TARGET, windres)
+ACX_CHECK_INSTALLED_TARGET_TOOL(WINDMC_FOR_TARGET, windmc)
+
+RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET"
+
+GCC_TARGET_TOOL(ar, AR_FOR_TARGET, AR, [binutils/ar])
+GCC_TARGET_TOOL(as, AS_FOR_TARGET, AS, [gas/as-new])
+GCC_TARGET_TOOL(cc, CC_FOR_TARGET, CC, [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/])
+dnl see comments for CXX_FOR_TARGET_FLAG_TO_PASS
+GCC_TARGET_TOOL(c++, CXX_FOR_TARGET, CXX,
+		[gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `if test -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags; then $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes; else echo -funconfigured-libstdc++-v3 ; fi` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs],
+		c++)
+GCC_TARGET_TOOL(c++ for libstdc++, RAW_CXX_FOR_TARGET, CXX,
+		[gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs],
+		c++)
+GCC_TARGET_TOOL(dlltool, DLLTOOL_FOR_TARGET, DLLTOOL, [binutils/dlltool])
+GCC_TARGET_TOOL(gcc, GCC_FOR_TARGET, , [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/])
+GCC_TARGET_TOOL(gcj, GCJ_FOR_TARGET, GCJ,
+		[gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/], java)
+GCC_TARGET_TOOL(gfortran, GFORTRAN_FOR_TARGET, GFORTRAN,
+		[gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/], fortran)
+GCC_TARGET_TOOL(gccgo, GOC_FOR_TARGET, GOC,
+		[gcc/gccgo -B$$r/$(HOST_SUBDIR)/gcc/], go)
+GCC_TARGET_TOOL(ld, LD_FOR_TARGET, LD, [ld/ld-new])
+GCC_TARGET_TOOL(lipo, LIPO_FOR_TARGET, LIPO)
+GCC_TARGET_TOOL(nm, NM_FOR_TARGET, NM, [binutils/nm-new])
+GCC_TARGET_TOOL(objdump, OBJDUMP_FOR_TARGET, OBJDUMP, [binutils/objdump])
+GCC_TARGET_TOOL(ranlib, RANLIB_FOR_TARGET, RANLIB, [binutils/ranlib])
+GCC_TARGET_TOOL(strip, STRIP_FOR_TARGET, STRIP, [binutils/strip-new])
+GCC_TARGET_TOOL(windres, WINDRES_FOR_TARGET, WINDRES, [binutils/windres])
+GCC_TARGET_TOOL(windmc, WINDMC_FOR_TARGET, WINDMC, [binutils/windmc])
+
+AC_SUBST(FLAGS_FOR_TARGET)
+AC_SUBST(RAW_CXX_FOR_TARGET)
+
+# Certain tools may need extra flags.
+AR_FOR_TARGET=${AR_FOR_TARGET}${extra_arflags_for_target}
+RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target}
+NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}
+
+# When building target libraries, except in a Canadian cross, we use
+# the same toolchain as the compiler we just built.
+COMPILER_AS_FOR_TARGET='$(AS_FOR_TARGET)'
+COMPILER_LD_FOR_TARGET='$(LD_FOR_TARGET)'
+COMPILER_NM_FOR_TARGET='$(NM_FOR_TARGET)'
+if test $host = $build; then
+  case " $configdirs " in
+    *" gcc "*)
+      COMPILER_AS_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/as'
+      COMPILER_LD_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/collect-ld'
+      COMPILER_NM_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/nm'${extra_nmflags_for_target}
+      ;;
+  esac
+fi
+
+AC_SUBST(COMPILER_AS_FOR_TARGET)
+AC_SUBST(COMPILER_LD_FOR_TARGET)
+AC_SUBST(COMPILER_NM_FOR_TARGET)
+
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+AC_ARG_ENABLE(maintainer-mode,
+[AS_HELP_STRING([--enable-maintainer-mode],
+		[enable make rules and dependencies not useful
+		 (and sometimes confusing) to the casual installer])],
+      USE_MAINTAINER_MODE=$enableval,
+      USE_MAINTAINER_MODE=no)
+AC_MSG_RESULT($USE_MAINTAINER_MODE)
+AC_SUBST(MAINTAINER_MODE_TRUE)
+AC_SUBST(MAINTAINER_MODE_FALSE)
+if test "$USE_MAINTAINER_MODE" = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi	
+MAINT=$MAINTAINER_MODE_TRUE
+AC_SUBST(MAINT)dnl
+
+# ---------------------
+# GCC bootstrap support
+# ---------------------
+
+# Stage specific cflags for build.
+stage1_cflags="-g"
+case $build in
+  vax-*-*)
+    case ${GCC} in
+      yes) stage1_cflags="-g -Wa,-J" ;;
+      *) stage1_cflags="-g -J" ;;
+    esac ;;
+esac
+
+# This is aimed to mimic bootstrap with a non-GCC compiler to catch problems.
+if test "$GCC" = yes -a "$ENABLE_BUILD_WITH_CXX" != yes; then
+  saved_CFLAGS="$CFLAGS"
+
+  # Pass -fkeep-inline-functions for stage 1 if the GCC version supports it.
+  CFLAGS="$CFLAGS -fkeep-inline-functions"
+  AC_MSG_CHECKING([whether -fkeep-inline-functions is supported])
+  AC_TRY_COMPILE([
+#if (__GNUC__ < 3) \
+    || (__GNUC__ == 3 && (__GNUC_MINOR__ < 3 \
+			  || (__GNUC_MINOR__ == 3 && __GNUC_PATCHLEVEL__ < 1)))
+#error http://gcc.gnu.org/PR29382
+#endif
+    ],,
+    [AC_MSG_RESULT([yes]); stage1_cflags="$stage1_cflags -fkeep-inline-functions"],
+    [AC_MSG_RESULT([no])])
+
+  CFLAGS="$saved_CFLAGS"
+fi
+
+AC_SUBST(stage1_cflags)
+
+# Enable --enable-checking in stage1 of the compiler.
+AC_ARG_ENABLE(stage1-checking,
+[AS_HELP_STRING([[--enable-stage1-checking[=all]]],
+		[choose additional checking for stage1 of the compiler])],
+[stage1_checking=--enable-checking=${enable_stage1_checking}],
+[if test "x$enable_checking" = xno || test "x$enable_checking" = x; then
+  stage1_checking=--enable-checking=yes,types
+else
+  stage1_checking=--enable-checking=$enable_checking,types
+fi])
+AC_SUBST(stage1_checking)
+
+# Enable -Werror in bootstrap stage2 and later.
+AC_ARG_ENABLE(werror,
+[AS_HELP_STRING([--enable-werror],
+		[enable -Werror in bootstrap stage2 and later])], [],
+[if test -d ${srcdir}/gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental; then
+  enable_werror=yes
+else
+  enable_werror=no
+fi])
+case ${enable_werror} in
+  yes) stage2_werror_flag="--enable-werror-always" ;;
+  *) stage2_werror_flag="" ;;
+esac
+AC_SUBST(stage2_werror_flag)
+
+# If using ENABLE_BUILD_POSTSTAGE1_WITH_CXX, pass
+# --enable-build-with-cxx after stage1.
+if test "$ENABLE_BUILD_POSTSTAGE1_WITH_CXX" = "yes"; then
+  POSTSTAGE1_CONFIGURE_FLAGS=--enable-build-with-cxx
+else
+  POSTSTAGE1_CONFIGURE_FLAGS=
+fi
+AC_SUBST(POSTSTAGE1_CONFIGURE_FLAGS)
+
+# Specify what files to not compare during bootstrap.
+
+compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*"
+case "$target" in
+  hppa*64*-*-hpux*) ;;
+  hppa*-*-hpux*) compare_exclusions="gcc/cc*-checksum\$(objext) | */libgcc/lib2funcs* | gcc/ada/*tools/*" ;;
+esac
+case " $configdirs " in
+*" ppl "*) compare_exclusions="$compare_exclusions | ppl/src/ppl-config.o" ;;
+esac
+AC_SUBST(compare_exclusions)
+
+AC_CONFIG_FILES([Makefile],
+  [sed "$extrasub_build" Makefile |
+   sed "$extrasub_host" |
+   sed "$extrasub_target" > mf$$
+   mv -f mf$$ Makefile],
+  [extrasub_build="$extrasub_build"
+   extrasub_host="$extrasub_host"
+   extrasub_target="$extrasub_target"])
+AC_OUTPUT
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/depcomp sdcc-3.2.0+dfsg/support/sdbinutils/depcomp
--- sdcc-3.1.0+dfsg/support/sdbinutils/depcomp	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/depcomp	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,630 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2009-04-28.21; # UTC
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
+# Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by `PROGRAMS ARGS'.
+  object      Object file output by `PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputing dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+   # This is just like msvisualcpp but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u="sed s,\\\\\\\\,/,g"
+   depmode=msvisualcpp
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+  tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'.  On the theory
+## that the space means something, we add a space to the output as
+## well.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like `#:fec' to the end of the
+    # dependency line.
+    tr ' ' '
+' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr '
+' ' ' >> "$depfile"
+    echo >> "$depfile"
+
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' '
+' < "$tmpdepfile" \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
+    "$@" -Wc,-M
+  else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
+    "$@" -M
+  fi
+  stat=$?
+
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form `foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # `$object: dependent.h' and one to simply `dependent.h:'.
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+    # That's a tab and a space in the [].
+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+icc)
+  # Intel's C compiler understands `-MD -MF file'.  However on
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # ICC 7.0 will fill foo.d with something like
+  #    foo.o: sub/foo.c
+  #    foo.o: sub/foo.h
+  # which is wrong.  We want:
+  #    sub/foo.o: sub/foo.c
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+  # ICC 7.1 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using \ :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+    sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add `dependent.h:' lines.
+    sed -ne '2,${
+	       s/^ *//
+	       s/ \\*$//
+	       s/$/:/
+	       p
+	     }' "$tmpdepfile" >> "$depfile"
+  else
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+   # The Tru64 compiler uses -MD to generate dependencies as a side
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+   # dependencies in `foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+   if test "$libtool" = yes; then
+      # With Tru64 cc, shared objects can also be used to make a
+      # static library.  This mechanism is used in libtool 1.4 series to
+      # handle both shared and static libraries in a single compilation.
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+      #
+      # With libtool 1.5 this exception was removed, and libtool now
+      # generates 2 separate objects for the 2 libraries.  These two
+      # compilations output dependencies in $dir.libs/$base.o.d and
+      # in $dir$base.o.d.  We have to check for both files, because
+      # one of the two compilations can be disabled.  We should prefer
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      # automatically cleaned when .libs/ is deleted, while ignoring
+      # the former would cause a distcleancheck panic.
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
+      "$@" -Wc,-MD
+   else
+      tmpdepfile1=$dir$base.o.d
+      tmpdepfile2=$dir$base.d
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
+      "$@" -MD
+   fi
+
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+      exit $stat
+   fi
+
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+   do
+     test -f "$tmpdepfile" && break
+   done
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      # That's a tab and a space in the [].
+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for `:'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  "$@" $dashmflag |
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no eat=no
+  for arg
+  do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+	set fnord "$@"
+	shift
+	shift
+	;;
+    *)
+	set fnord "$@" "$arg"
+	shift
+	shift
+	;;
+    esac
+  done
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  echo "	" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/COPYING sdcc-3.2.0+dfsg/support/sdbinutils/include/COPYING
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/COPYING	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/COPYING	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/COPYING3 sdcc-3.2.0+dfsg/support/sdbinutils/include/COPYING3
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/COPYING3	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/COPYING3	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/ChangeLog sdcc-3.2.0+dfsg/support/sdbinutils/include/ChangeLog
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/ChangeLog	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/ChangeLog	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1576 @@
+2011-10-25  Alan Modra  <amodra@gmail.com>
+
+	Apply mainline patches.
+	2011-10-19  Alan Modra  <amodra@gmail.com>
+	PR ld/13254
+	* bfdlink.h (struct bfd_link_info): Add error_textrel.
+
+	2011-09-26  Cary Coutant  <ccoutant@google.com>
+	gcc PR lto/47247
+	* plugin-api.h (enum ld_plugin_symbol_resolution): Add
+	LDPR_PREVAILING_DEF_IRONLY_EXP.
+	(enum ld_plugin_tag): Add LDPT_GET_SYMBOLS_V2.
+
+2011-09-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12975
+	* bfdlink.h (bfd_link_info): Add version_info.
+
+2011-07-25  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* xregex.h (regoff_t): Define.
+
+2011-07-22  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf2.h (DW_AT_GNU_macros): New.
+	(enum dwarf_macro_record_type): New enum.  Add DW_MACRO_GNU_*.
+
+	PR c++/49756
+	* libiberty.h (stack_limit_increase): New prototype.
+
+2011-07-13  Sriraman Tallam  <tmsriram@google.com>
+
+	* plugin-api.h
+	(ld_plugin_section): New struct.
+	(ld_plugin_get_section_count): New typedef.
+	(ld_plugin_get_section_type): New typedef.
+	(ld_plugin_get_section_name): New typedef.
+	(ld_plugin_get_section_contents): New typedef.
+	(ld_plugin_update_section_order): New typedef.
+	(ld_plugin_allow_section_ordering): New typedef.
+	(LDPT_GET_SECTION_COUNT): New enum value.
+	(LDPT_GET_SECTION_TYPE): New enum value.
+	(LDPT_GET_SECTION_NAME): New enum value.
+	(LDPT_GET_SECTION_CONTENTS): New enum value.
+	(LDPT_UPDATE_SECTION_ORDER): New enum value.
+	(LDPT_ALLOW_SECTION_ORDERING): New enum value.
+	(tv_get_section_count): New struct members.
+	(tv_get_section_type): New struct members.
+	(tv_get_section_name): New struct members.
+	(tv_get_section_contents): New struct members.
+	(tv_update_section_order): New struct members.
+	(tv_allow_section_ordering): New struct members.
+
+2011-07-15  Alan Modra  <amodra@gmail.com>
+
+	* bfdlink.h (struct bfd_link_info): Use ENUM_BITFIELD for strip,
+	discard, common_skip_ar_symbols, unresolved_syms_in_objects, and
+	unresolved_syms_in_shared_libs fields.  Move emit_note_gnu_build_id
+	out of bitfields.  Reorder bitfields.
+
+2011-07-13  Sriraman Tallam  <tmsriram@google.com>
+
+	* plugin-api.h (ld_plugin_section): New struct.
+	(ld_plugin_get_section_count): New typedef.
+	(ld_plugin_get_section_type): New typedef.
+	(ld_plugin_get_section_name): New typedef.
+	(ld_plugin_get_section_contents): New typedef.
+	(ld_plugin_update_section_order): New typedef.
+	(ld_plugin_allow_section_ordering): New typedef.
+	(LDPT_GET_SECTION_COUNT): New enum value.
+	(LDPT_GET_SECTION_TYPE): New enum value.
+	(LDPT_GET_SECTION_NAME): New enum value.
+	(LDPT_GET_SECTION_CONTENTS): New enum value.
+	(LDPT_UPDATE_SECTION_ORDER): New enum value.
+	(LDPT_ALLOW_SECTION_ORDERING): New enum value.
+	(tv_get_section_count): New struct members.
+	(tv_get_section_type): New struct members.
+	(tv_get_section_name): New struct members.
+	(tv_get_section_contents): New struct members.
+	(tv_update_section_order): New struct members.
+	(tv_allow_section_ordering): New struct members.
+
+2011-07-11  Catherine Moore  <clm@codesourcery.com>
+
+	* bfdlink.h (flag_type): New enumeration.
+	(flag_info_list): New structure.
+	(flag_info): New structure.
+
+2011-07-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/12942
+	* bfdlink.h (bfd_link_info): Add loading_lto_outputs.
+
+2011-07-01  Joel Brobecker  <brobecker@adacore.com>
+
+	* filenames.h (HAVE_CASE_INSENSITIVE_FILE_SYSTEM): Define
+	on Darwin, as well as on the systems that use a DOS-like
+	filesystem.
+
+2011-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+	PR debug/47858
+	* dwarf2.h (enum dwarf_location_atom): Add DW_OP_GNU_parameter_ref.
+
+2011-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf2.h (enum dwarf_location_atom): Add DW_OP_GNU_parameter_ref.
+
+2011-06-20  Jakub Jelinek  <jakub@redhat.com>
+
+	PR ld/12570
+	* bfdlink.h (struct bfd_link_info): Add no_ld_generated_unwind_info
+	option.
+
+2011-06-13  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* demangle.h (DMGL_RET_POSTFIX): Extend the comment.
+	(DMGL_RET_DROP): New.
+
+2011-06-13  Walter Lee  <walt@tilera.com>
+
+	* dis-asm.h (print_insn_tilegx): Declare.
+	(print_insn_tilepro): Likewise.
+
+2011-05-17  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12760
+	* bfdlink.h (struct bfd_link_callbacks <notice>): Add "flags" and
+	"string" param.
+
+2011-05-16  Alan Modra  <amodra@gmail.com>
+
+	* bfdlink.h (struct bfd_link_hash_entry): Remove u.undef.weak field.
+
+2011-05-09  Paul Brook  <paul@codesourcery.com>
+
+	* elf/tic6x.h (ELF_STRING_C6000_unwind,
+	ELF_STRING_C6000_unwind_info, ELF_STRING_C6000_unwind_once,
+	ELF_STRING_C6000_unwind_info_once): Define.
+
+2011-04-30  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf2.h (DW_OP_GNU_const_type, DW_OP_GNU_regval_type,
+	DW_OP_GNU_deref_type, DW_OP_GNU_convert, DW_OP_GNU_reinterpret): New.
+
+2011-04-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* bfdlink.h (ENUM_BITFIELD): Remove.
+
+2011-04-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* ansidecl.h (ENUM_BITFIELD): New, from gcc/system.h.
+
+2011-04-24  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12365
+	PR ld/12696
+	* bfdlink.h (ENUM_BITFIELD): Define.
+	(struct bfd_link_hash_entry): Make "type" a bitfield.  Add "non_ir_ref".
+	(struct bfd_link_callbacks <notice>): Pass bfd_link_hash_entry pointer
+	rather than "name".
+
+2011-04-20  Alan Modra  <amodra@gmail.com>
+
+	PR ld/12365
+	* bfdlink.h (struct bfd_link_callbacks): Modify multiple_definition
+	and multiple_common parameters to pass in a bfd_link_hash_entry
+	pointer rather than name,bfd etc. found in the hash entry.
+
+2011-03-31  Tristan Gingold  <gingold@adacore.com>
+
+	* dwarf2.h (dwarf_line_number_hp_sfc_ops): New enum.
+
+2011-03-24  Mark Wielaard  <mjw@redhat.com>
+
+	* dwarf2.h (dwarf_form): Remove deprecated DW_FORM_sig8 define.
+
+2010-03-23  Rafael Ávila de Espíndola <respindola@mozilla.com>
+
+	* plugin-api.h (ld_plugin_get_view): New.
+	(ld_plugin_tag): Add LDPT_GET_VIEW.
+	(ld_plugin_tv): Add tv_get_view.
+
+2011-03-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf2.h (DW_TAG_GNU_call_site, DW_TAG_GNU_call_site_parameter,
+	DW_AT_GNU_call_site_value, DW_AT_GNU_call_site_data_value,
+	DW_AT_GNU_call_site_target, DW_AT_GNU_call_site_target_clobbered,
+	DW_AT_GNU_tail_call, DW_AT_GNU_all_tail_call_sites,
+	DW_AT_GNU_all_call_sites,, DW_AT_GNU_all_source_call_sites,
+	DW_OP_GNU_entry_value): New.
+
+2011-02-28  Kai Tietz  <kai.tietz@onevision.com>
+
+	* filenames.h (filename_ncmp): New prototype.
+
+2011-02-23  Kai Tietz  <kai.tietz@onevision.com>
+
+	* dwarf2.h (_ELF_DWARF2_H): Renamed to
+	_DWARF2_H.
+	(DWARF2_External_LineInfo, DWARF2_Internal_LineInfo,
+	DWARF2_External_PubNames, DWARF2_Internal_PubNames,
+	DWARF2_External_CompUnit, DWARF2_Internal_CompUnit,
+	DWARF2_External_ARange, DWARF2_Internal_ARange): Removed.
+
+2011-02-08  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* dwarf2.h (enum dwarf_calling_convention): Add DW_CC_GDB_IBM_OpenCL.
+
+2011-01-12  Iain Sandoe  <iains@gcc.gnu.org>
+
+	* dwarf2.h: Update value for DW_AT_hi_user.
+
+2010-11-16  Ian Lance Taylor  <iant@google.com>
+
+	* simple-object.h (simple_object_attributes_merge): Declare,
+	replacing simple_object_attributes_compare.
+
+2010-11-04  Ian Lance Taylor  <iant@google.com>
+
+	* dwarf2.h (enum dwarf_source_language): Add DW_LANG_Go.
+
+2010-11-02  Ian Lance Taylor  <iant@google.com>
+
+	* simple-object.h: New file.
+
+2010-10-15  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	Sync LD plugin patch series (part 1/6) with src/include/.
+	* plugin-api.h (LDPT_GNU_LD_VERSION): New ld_plugin_tag enum member.
+
+2010-10-14  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	Apply LD plugin patch series (part 6/6).
+	* bfdlink.h (struct_bfd_link_callbacks): Document new argument
+	to add_archive_element callback used to return a replacement bfd which
+	is to be added to the hash table in place of the original element.
+
+2010-10-14  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	Apply LD plugin patch series (part 1/6).
+	* plugin-api.h (LDPT_GNU_LD_VERSION): New ld_plugin_tag enum member.
+
+2010-10-06  Andi Kleen <ak@linux.intel.com>
+
+	* libiberty.h (setproctitle): Add prototype.
+
+2010-09-29  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* opcode/tic6x-control-registers.h (tscl): Now read_write.
+
+2010-09-27  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* opcode/s390.h: Add S390_OPCODE_Z196 to enum s390_opcode_cpu_val.
+
+2010-09-23  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+	* arm.h (ARM_EXT_V6Z): Remove.
+	(ARM_EXT_SEC): New define.
+	(ARM_AEXT_V6Z): Use Security Extensions.
+	(ARM_AEXT_V6ZK): Likeiwse.
+	(ARM_AEXT_V6ZT2): Likewise.
+	(ARM_AEXT_V6ZKT2): Likewise.
+	(ARM_AEXT_V7_ARM): Base v7 does not have Security Extensions.
+	(ARM_ARCH_V7A_SEC): New define.
+	(ARM_ARCH_V7A_MP): Rename...
+	(ARM_ARCH_V7A_MP_SEC): ...to this and add Security Extensions.
+
+2010-09-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf2.h (DW_OP_GNU_implicit_pointer): New.
+
+2010-07-06  Ken Werner  <ken.werner@de.ibm.com>
+
+	* floatformat.h (floatformat_ieee_half_big): Add declaration.
+	(floatformat_ieee_half_little): Likewise.
+
+2010-06-29  Alan Modra  <amodra@gmail.com>
+
+	* dis-asm.h: Remove references to maxq.
+
+2010-06-21  Rafael Espindola  <espindola@google.com>
+
+	* plugin-api.h (ld_plugin_set_extra_library_path): New.
+	(ld_plugin_tag): Add LDPT_SET_EXTRA_LIBRARY_PATH.
+	(ld_plugin_tv): Add tv_set_extra_library_path.
+
+2010-06-21  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf2.h (enum dwarf_type): Add DW_ATE_UTF.
+
+2010-06-18  Rafael Espindola  <espindola@google.com>
+
+	* plugin.h (ld_plugin_add_input_file, ld_plugin_add_input_library):
+	Make argument const.
+
+2010-06-08  Laurynas Biveinis  <laurynas.biveinis@gmail.com>
+
+	* splay-tree.h: Update copyright years.
+	(splay_tree_s): Document fields.
+	(splay_tree_new_typed_alloc): New.
+
+	* hashtab.h: Update copyright years.
+	(htab_create_typed_alloc): New.
+
+2010-06-10  Tristan Gingold  <gingold@adacore.com>
+
+	* dwarf2.h (enum dwarf_tag): Add DW_TAG_HP_Bliss_field and
+	DW_TAG_HP_Bliss_field_set.
+	(enum dwarf_attribute): Add DW_AT_HP_prologue, DW_AT_HP_epilogue,
+	DW_AT_HP_unit_name, DW_AT_HP_unit_size, DW_AT_HP_widened_byte_size,
+	DW_AT_HP_definition_points, DW_AT_HP_default_location and
+	DW_AT_HP_is_result_param.
+	(enum dwarf_type): Add DW_ATE_HP_VAX_float, DW_ATE_HP_VAX_float_d,
+	DW_ATE_HP_packed_decimal, DW_ATE_HP_zoned_decimal, DW_ATE_HP_edited,
+	DW_ATE_HP_signed_fixed, DW_ATE_HP_unsigned_fixed,
+	DW_ATE_HP_VAX_complex_float and DW_ATE_HP_VAX_complex_float_d.
+	(enum dwarf_line_number_x_ops): Add
+	DW_LNE_HP_source_file_correlation.
+	(enum dwarf_source_language): Add DW_LANG_HP_Bliss,
+	DW_LANG_HP_Basic91, DW_LANG_HP_Pascal91, DW_LANG_HP_IMacro,
+	DW_LANG_HP_Assembler.
+
+2010-06-01  Rafael Espindola  <espindola@google.com>
+
+	* plugin-api.h (ld_plugin_tag): Add LDPT_OUTPUT_NAME.
+
+2010-04-26  Pedro Alves  <pedro@codesourcery.com>
+
+	* filenames.h (PATH_SEPARATOR): Delete.
+
+2010-04-23  Pedro Alves  <pedro@codesourcery.com>
+
+	* filenames.h (IS_DIR_SEPARATOR_1): Rename from IS_DIR_SEPARATOR,
+	always define it independently of host, add `dos_based' parameter,
+	and handle it.
+	(PATH_SEPARATOR): Define.
+	(HAS_DRIVE_SPEC_1): Rename from HAS_DRIVE_SPEC, always define it
+	independently of host, add `dos_based' parameter, and handle it.
+	(IS_ABSOLUTE_PATH_1): Rename from IS_ABSOLUTE_PATH, always define
+	it independently of host, add `dos_based' parameter, and handle
+	it.
+	(IS_DOS_DIR_SEPARATOR, IS_DOS_ABSOLUTE_PATH)
+	(IS_UNIX_DIR_SEPARATOR, IS_UNIX_ABSOLUTE_PATH)
+	(HAS_DOS_DRIVE_SPEC): New.
+	(HAS_DRIVE_SPEC): Reimplement on top of HAS_DRIVE_SPEC_1.
+	(IS_DIR_SEPARATOR): Reimplement on top of IS_DIR_SEPARATOR_1.
+	(IS_ABSOLUTE_PATH): Reimplement on top of IS_ABSOLUTE_PATH_1.
+	* libiberty.h (dos_lbasename, unix_lbasename): Declare.
+
+2009-05-31  Ian Lance Taylor  <iant@google.com>
+
+	* ansidecl.h: Add extern "C" when compiling with C++.  Treat C++
+	the way we treat an ISO C compiler.  Don't define inline as a
+	macro when compiling with C++.
+	* dyn-string.h: Add header guard DYN_STRING_H.  Add extern "C"
+	when compiling with C++.
+	* fibheap.h: Add extern "C" when compiling with C++.
+
+2010-04-23  Pedro Alves  <pedro@codesourcery.com>
+
+	* filenames.h (IS_DIR_SEPARATOR_1): Rename from IS_DIR_SEPARATOR,
+	always define it independently of host, add `dos_based' parameter,
+	and handle it.
+	(HAS_DRIVE_SPEC_1): Rename from HAS_DRIVE_SPEC, always define it
+	independently of host, add `dos_based' parameter, and handle it.
+	(IS_ABSOLUTE_PATH_1): Rename from IS_ABSOLUTE_PATH, always define
+	it independently of host, add `dos_based' parameter, and handle
+	it.
+	(IS_DOS_DIR_SEPARATOR, IS_DOS_ABSOLUTE_PATH)
+	(IS_UNIX_DIR_SEPARATOR, IS_UNIX_ABSOLUTE_PATH)
+	(HAS_DOS_DRIVE_SPEC): New.
+	(HAS_DRIVE_SPEC): Reimplement on top of HAS_DRIVE_SPEC_1.
+	(IS_DIR_SEPARATOR): Reimplement on top of IS_DIR_SEPARATOR_1.
+	(IS_ABSOLUTE_PATH): Reimplement on top of IS_ABSOLUTE_PATH_1.
+	* libiberty.h (dos_lbasename, unix_lbasename): Declare.
+
+2010-04-20  Nick Clifton  <nickc@redhat.com>
+
+	* sha1.h: Update copyright notice to use GPLv3.
+
+2010-04-15  Nick Clifton  <nickc@redhat.com>
+
+	* bout.h: Update copyright notice to use GPLv3.
+	* hp-symtab.h: Likewise.
+	* oasys.h: Likewise.
+	* progress.h: Likewise.
+	* sha1.h: Likewise.
+	* xtensa-isa-internal.h: Likewise.
+	* xtensa-isa.h: Likewise.
+
+2010-04-14  Doug Evans  <dje@google.com>
+
+	* filenames.h (HAS_DRIVE_SPEC, STRIP_DRIVE_SPEC): New macros.
+
+2010-04-05  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf2.h (DWARF2_Internal_LineInfo): Add li_max_ops_per_insn
+	field.
+
+2010-03-25  Joseph Myers  <joseph@codesourcery.com>
+
+	* dis-asm.h (print_insn_tic6x): Declare.
+
+2010-03-23  Joseph Myers  <joseph@codesourcery.com>
+
+	* symcat.h (CONCAT5, CONCAT6, XCONCAT5, XCONCAT6): Define.
+
+2010-01-13  Joel Brobecker  <brobecker@adacore.com>
+
+	Add new DW_AT_use_GNAT_descriptive_type CU attribute.
+	* dwarf2.h (dwarf_attribute): Add DW_AT_use_GNAT_descriptive_type.
+
+2010-01-11  Tristan Gingold  <gingold@adacore.com>
+
+	* demangle.h (ada_demangle): Add prototype.
+
+2010-01-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	PR bootstrap/41771
+	* ansidecl.h: Fix inline test for C99 and Sun Studio cc.
+
+2009-12-29  Joel Brobecker  <brobecker@adacore.com>
+
+	* dwarf2.h (enum dwarf_attribute): Add DW_AT_GNAT_descriptive_type.
+
+2009-12-14  Doug Kwan  <dougkwan@google.com>
+
+	* bfdlink.h (struct bfd_link_callbacks): Rename function parameters
+	to avoid shadowed variable warnings.
+	* dis-asm.h (struct disassemble_info): Ditto.
+	(disassemble_init_for_target): Ditto.
+	(init_disassemble_info): Ditto.
+
+2009-12-03  David Daney  <ddaney@caviumnetworks.com>
+	    Adam Nemet  <adambnemet@gmail.com>
+
+	* elf/mips.h (E_MIPS_MACH_OCTEON2): New machine flag.
+
+2009-11-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* alloca-conf.h: Clarify comment.
+
+2009-11-06  Jonas Maebe  <jonas.maebe@elis.ugent.be>
+
+	Add DWARF attribute value for the "Borland fastcall" calling
+	convention.
+	* elf/dwarf2.h: Add DW_CC_GNU_borland_fastcall_i386 constant.
+
+2009-10-23  Kai Tietz  <kai.tietz@onevision.com>
+
+	* splay-tree.h (libi_uhostptr_t): Add gcc specific
+	__extension__ for long long type case to silent cX9.
+	(libi_shostptr_t): Likewise.
+
+2009-10-19  Rafael Avila de Espindola  <espindola@google.com>
+
+	PR40790
+	* plugin-api.h: Don't include stdint.h unconditionally.
+
+2009-10-15  Jakub Jelinek  <jakub@redhat.com>
+
+	* include/dwarf2.h (DW_LANG_Python): Add comment that it is
+	a DWARF 4 addition.
+
+2009-10-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h (enum bfd_link_common_skip_ar_symbols): Rename from
+	bfd_link_common_skip_ar_aymbols.
+	(struct bfd_link_info): Here too.
+
+2009-10-09  Rafael Espindola  <espindola@google.com>
+
+	* plugin-api.h (ld_plugin_add_input_library): Change argument name to
+	libname.
+
+2008-10-03  Rafael Espindola  <espindola@google.com>
+
+	* plugin-api.h: New.
+	* lto-symtab.h: New.
+
+2009-10-05   Rafael Espindola  <espindola@google.com>
+
+	* plugin-api.h (ld_plugin_status): Add LDPS_BAD_HANDLE.
+	(ld_plugin_get_input_file): New.
+	(ld_plugin_release_input_file): New.
+	(ld_plugin_add_input_library): New.
+	(ld_plugin_message): Mark format const.
+	(ld_plugin_level): Add LDPT_GET_INPUT_FILE, LDPT_RELEASE_INPUT_FILE and
+	LDPT_ADD_INPUT_LIBRARY.
+	(ld_plugin_tv): Add tv_get_input_file, tv_release_input_file and
+	tv_add_input_library.
+
+2009-10-04  Jerry Quinn  <jlquinn@optonline.net>
+
+	* plugin-api.h: Fix compile.
+
+2009-09-29  Jason Merrill  <jason@redhat.com>
+
+	* demangle.h (enum demangle_component_type): Add
+	DEMANGLE_COMPONENT_LAMBDA, DEMANGLE_COMPONENT_DEFAULT_ARG,
+	DEMANGLE_COMPONENT_UNNAMED_TYPE.
+	(struct demangle_component): Add s_unary_num.
+
+2009-09-29  DJ Delorie  <dj@redhat.com>
+
+	* dis-asm.h: Add prototype for print_insn_rx.
+
+2009-09-25  Dodji Seketeli  <dodji@redhat.com>
+
+	* dwarf2.h (enum dwarf_tag): Rename DW_TAG_template_parameter_pack and
+	DW_TAG_formal_parameter_pack into DW_TAG_GNU_template_parameter_pack
+	and DW_TAG_formal_parameter_pack until DWARF 5 is out.
+
+2009-09-25  Cary Coutant  <ccoutant@google.com>
+
+	Add rest of new values from DWARF Version 4.
+	* dwarf2.h (DW_TAG_rvalue_reference_type, DW_TAG_template_alias):
+	New tags.
+	(DW_FORM_ref_sig8): New name for DW_FORM_sig8.
+	(DW_AT_main_subprogram, DW_AT_data_bit_offset, DW_AT_const_expr,
+	DW_AT_enum_class, DW_AT_linkage_name, DW_AT_GNU_guarded_by,
+	DW_AT_GNU_pt_guarded_by, DW_AT_GNU_guarded, DW_AT_GNU_pt_guarded,
+	DW_AT_GNU_locks_excluded, DW_AT_GNU_exclusive_locks_required,
+	DW_AT_GNU_shared_locks_required, DW_AT_GNU_odr_signature): New
+	attributes.
+	(DW_LANG_Python): New language.
+
+2009-09-24  Cary Coutant  <ccoutant@google.com>
+
+	* dwarf2.h (DW_TAG_rvalue_reference_type, DW_TAG_template_alias):
+	New tags.
+	(DW_FORM_ref_sig8): New name for DW_FORM_sig8.
+	(DW_AT_main_subprogram, DW_AT_data_bit_offset, DW_AT_const_expr,
+	DW_AT_enum_class, DW_AT_linkage_name, DW_AT_GNU_guarded_by,
+	DW_AT_GNU_pt_guarded_by, DW_AT_GNU_guarded, DW_AT_GNU_pt_guarded,
+	DW_AT_GNU_locks_excluded, DW_AT_GNU_exclusive_locks_required,
+	DW_AT_GNU_shared_locks_required, DW_AT_GNU_odr_signature): New
+	attributes.
+	(DW_LANG_Python): New language.
+
+2009-09-22  Dodji Seketeli  <dodji@redhat.com>
+
+	* dwarf2.h (enum dwarf_tag): Add
+	DW_TAG_template_parameter_pack and DW_TAG_formal_parameter_pack.
+
+2009-09-09  Martin Thuresson  <martin@mtme.org>
+
+	* bfdlink.h (struct bfd_link_hash_common_entry): Move to top
+	level.
+
+2009-09-04  Jie Zhang  <jie.zhang@analog.com>
+
+	* opcode/bfin.h (PseudoDbg_Assert): Add bits_grp and mask_grp.
+	(PseudoDbg_Assert_grp_bits, PseudoDbg_Assert_grp_mask): Define.
+	(PseudoDbg_Assert_dbgop_bits, PseudoDbg_Assert_dbgop_mask,
+	PseudoDbg_Assert_dontcare_bits, PseudoDbg_Assert_dontcare_mask):
+	Adjust accordingly.
+	(init_PseudoDbg_Assert): Add PseudoDbg_Assert_grp_bits and
+	PseudoDbg_Assert_grp_mask.
+
+2009-08-06  Michael Eager <eager@eagercon.com>
+
+	* dis-asm.h: Decl print_insn_microblaze().
+
+2009-07-24  Ian Lance Taylor  <iant@google.com>
+
+	* libiberty.h (crc32): Declare.
+
+2009-07-20  Cary Coutant  <ccoutant@google.com>
+	    Doug Evans  <dje@google.com>
+
+	Add some dwarf4 values.
+	* dwarf2.h (enum dwarf_tag): Add DW_TAG_type_unit.
+	(enum dwarf_form): Add DW_FORM_sec_offset, DW_FORM_exprloc,
+	DW_FORM_flag_present, DW_FORM_sig8.
+	(enum dwarf_attribute): Add DW_AT_signature.
+
+2009-07-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* demangle.h
+	(enum demangle_component_type <DEMANGLE_COMPONENT_GLOBAL_CONSTRUCTORS>)
+	(enum demangle_component_type <DEMANGLE_COMPONENT_GLOBAL_DESTRUCTORS>):
+	New.
+
+2009-07-10  Tom Tromey  <tromey@redhat.com>
+
+	* dwarf2.h: New file, moved from elf/.
+
+2009-07-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf2.h (enum dwarf_location_atom): Add DW_OP_implicit_value
+	and DW_OP_stack_value.
+
+2009-07-09  Tom Tromey  <tromey@redhat.com>
+
+	* elf/dwarf2.h: Remove, renaming to...
+	* dwarf2.h: ... this.
+
+2009-06-29  Tom Tromey  <tromey@redhat.com>
+
+	* elf/dwarf2.h: New file.  Merged with gdb.
+
+2009-06-18  Nick Clifton  <nickc@redhat.com>
+
+	* dis-asm.h (USER_SPECIFIED_MACHINE_TYPE): New value for the flags
+	field of struct disassemble_info.
+
+2009-06-09  Ian Lance Taylor  <ian@airs.com>
+
+	* ansidecl.h (ATTRIBUTE_UNUSED_LABEL): Define for C++.
+
+2009-06-15  Nick Clifton  <nickc@redhat.com>
+
+	* dis-asm.h (DISASSEMBLE_DATA): New value for the flags field of
+	struct disassemble_info.
+
+2009-06-02  Ian Lance Taylor  <iant@google.com>
+
+	* ansidecl.h (EXPORTED_CONST): Define.
+
+2009-05-31  Ian Lance Taylor  <iant@google.com>
+
+	* ansidecl.h: Add extern "C" when compiling with C++.  Treat C++
+	the way we treat an ISO C compiler.  Don't define inline as a
+	macdro when compiling with C++.
+	* dyn-string.h: Add header guard DYN_STRING_H.  Add extern "C"
+	when compiling with C++.
+	* fibheap.h: Add extern "C" when compiling with C++.
+
+2009-05-25  Tristan Gingold  <gingold@adacore.com>
+
+	* fopen-vms.h (FOPEN_RB, FOPEN_WB, FOPEN_AB, FOPEN_RUB, FOPEN_WUB,
+	FOPEN_AUB): Use "rfm=udf,rat=none" attribute.
+
+2009-04-22  Taras Glek <tglek@mozilla.com>
+
+	* hashtab.h: Update GTY annotations to new syntax.
+	* splay-tree.h: Likewise.
+
+2009-04-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfdlink.h (bfd_link_info): Add warn_alternate_em.
+
+2009-03-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* alloca-conf.h: Revise based on autoconf-2.61, autoconf-2.13
+	documentation.
+
+2009-03-17  Jason Merrill  <jason@redhat.com>
+
+	* demangle.h (enum demangle_component_type): Add
+	DEMANGLE_COMPONENT_FUNCTION_PARAM.
+
+2008-12-01  Cary Coutant  <ccoutant@google.com>
+
+	* plugin-api.h (LDPS_BAD_HANDLE): New constant.
+	(ld_plugin_get_input_file): New typedef.
+	(ld_plugin_release_input_file): New typedef.
+	(LDPT_GET_INPUT_FILE, LDPT_RELEASE_INPUT_FILE): New constants.
+	(struct ld_plugin_tv): Add two new fields.
+
+2008-12-23  Jon Beniston <jon@beniston.com>
+
+	* dis-asm.h: Add LM32 disassembler function prototype.
+
+2008-12-10  Jason Merrill  <jason@redhat.com>
+
+	* demangle.h (enum demangle_component_type): Add
+	DEMANGLE_COMPONENT_FIXED_TYPE.
+
+2008-12-01  Cary Coutant  <ccoutant@google.com>
+
+	* plugin-api.h (ld_plugin_message): Change format parameter to const.
+
+2008-12-01  Cary Coutant  <ccoutant@google.com>
+
+	* plugin-api.h: Fix syntax error when compiling with C++.
+
+2008-11-26  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 7047
+	* bfdlink.h (struct bfd_elf_version_expr): Delete "symbol".
+	Add "literal".
+
+2008-11-21  Sterling Augustine  <sterling@tensilica.com>
+
+	* xtensa-isa-internal.h (XTENSA_STATE_IS_SHARED_OR): New flag.
+	* xtensa-isa.h (xtensa_state_is_shared_or): New prototype.
+
+2008-11-19  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-config.h (XCHAL_HAVE_MUL16, XCHAL_HAVE_MUL32, XCHAL_HAVE_DIV32)
+	(XCHAL_HAVE_MINMAX, XCHAL_HAVE_SEXT, XCHAL_HAVE_THREADPTR)
+	(XCHAL_HAVE_RELEASE_SYNC, XCHAL_HAVE_S32C1I): Change to 1.
+	(XCHAL_NUM_AREGS): Change to 32.
+	(XCHAL_ICACHE_SIZE, XCHAL_DCACHE_SIZE): Change to 16K.
+	(XCHAL_ICACHE_LINESIZE, XCHAL_DCACHE_LINESIZE): Change to 32.
+	(XCHAL_ICACHE_LINEWIDTH, XCHAL_DCACHE_LINEWIDTH): Change to 5.
+	(XCHAL_DCACHE_IS_WRITEBACK): Change to 1.
+	(XCHAL_DEBUGLEVEL): Change to 6.
+
+2008-11-14  Tristan Gingold  <gingold@adacore.com>
+
+	* fopen-vms.h (FOPEN_RB): Use a single string to match the
+	standard prototype.
+	(FOPEN_WB): Ditto.
+	(FOPEN_AB): Ditto.
+	(FOPEN_RUB): Ditto.
+	(FOPEN_WUB): Ditto.
+	(FOPEN_AUB): Ditto.
+
+2008-10-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* obstack.h (obstack_finish <!__GNUC__>): Cast result to void *.
+
+2008-10-06  Jason Merrill  <jason@redhat.com>
+
+	* demangle.h (enum demangle_component_type): Add
+	DEMANGLE_COMPONENT_PACK_EXPANSION.
+
+2008-09-24  Richard Henderson  <rth@redhat.com>
+
+	* elf/dwarf2.h (DW_OP_GNU_encoded_addr): New.
+
+2008-09-22 Rafael Espindola  <espindola@google.com>
+
+	* plugin-api.h (ld_plugin_status): Remove comma from the last item.
+	Use C style comment.
+	(ld_plugin_api_version, ld_plugin_output_file_type,
+	ld_plugin_symbol_kind, ld_plugin_symbol_visibility,
+	ld_plugin_symbol_resolution, ld_plugin_level, ld_plugin_tag): Remove
+	comma from the last item.
+
+2008-09-18  Cary Coutant  <ccoutant@google.com>
+
+	Add plugin functionality for link-time optimization (LTO).
+	* plugin-api.h: New file.
+
+2008-09-09  Jason Merrill  <jason@redhat.com>
+
+	* demangle.h (enum demangle_component_type): Add
+	DEMANGLE_COMPONENT_DECLTYPE.
+
+2008-08-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* binary-io.h: New file, imported from gnulib, but don't
+	#include <fcntl.h> or <stdio.h>.
+
+2008-08-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h (bfd_generic_link_read_symbols): Declare.
+
+2008-08-08  Anatoly Sokolov  <aesok@post.ru>
+
+	* elf/avr.h (E_AVR_MACH_AVR25, E_AVR_MACH_AVR31,
+	E_AVR_MACH_AVR35, E_AVR_MACH_AVR51): Define.
+	(EF_AVR_MACH): Redefine to 0x7F.
+	* opcode/avr.h (AVR_ISA_TINY3, AVR_ISA_ALL, AVR_ISA_USB162): Remove.
+	(AVR_ISA_AVR3): Redefine.
+	(AVR_ISA_AVR1, AVR_ISA_AVR2, AVR_ISA_AVR31, AVR_ISA_AVR35,
+	AVR_ISA_AVR3_ALL, AVR_ISA_AVR4, AVR_ISA_AVR5, AVR_ISA_AVR51,
+	AVR_ISA_AVR6): Define.
+
+2008-07-12  Jie Zhang  <jie.zhang@analog.com>
+
+	Revert
+	2008-07-12  Jie Zhang  <jie.zhang@analog.com>
+	* bfdlink.h (struct bfd_link_info): Add sep_code member
+	variable.
+	* elf/bfin.h (EF_BFIN_CODE_IN_L1): Define.
+	(EF_BFIN_DATA_IN_L1): Define.
+
+2008-07-12  Jie Zhang  <jie.zhang@analog.com>
+
+	* bfdlink.h (struct bfd_link_info): Add sep_code member
+	variable.
+	* elf/bfin.h (EF_BFIN_CODE_IN_L1): Define.
+	(EF_BFIN_DATA_IN_L1): Define.
+
+2008-07-07  Stan Shebs  <stan@codesourcery.com>
+
+	* dis-asm.h (struct disassemble_info): Add endian_code field.
+
+2008-07-07  Joel Brobecker  <brobecker@adacore.com>
+
+	* safe-ctype.h: Add #include of ctype.h before redefining
+	the ctype.h macros.
+
+2008-07-04  Joel Brobecker  <brobecker@adacore.com>
+
+	* safe-ctype.h: Remove #error when detecting that ctype.h has been
+	included. Redefine the various macros provided by ctype.h as
+	undefined variables.
+
+2008-06-23  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h (XALLOCA, XDUP, XALLOCAVEC, XDUPVEC, XALLOCAVAR,
+	XDUPVAR, XOBNEWVEC, XOBNEWVAR): New.
+
+2008-06-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h (struct bfd_link_info): Add "path_separator".
+
+2008-04-10  Andreas Krebbel  <krebbel1@de.ibm.com>
+
+	* dis-asm.h (print_s390_disassembler_options):
+	Prototype added.
+
+2008-03-24  Ian Lance Taylor  <iant@google.com>
+
+	* sha1.h: New file, from gnulib.
+
+	* md5.h: Add extern "C" when compiled with C++.
+
+2008-03-24  Ian Lance Taylor  <iant@google.com>
+
+	* md5.h: Add extern "C" when compiled with C++.
+
+2008-03-21  Ian Lance Taylor  <iant@google.com>
+
+	* filenames.h: Add extern "C" when compiled with C++.
+
+2008-02-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h (struct bfd_link_hash_table): Delete creator field.
+	(struct bfd_link_info): Add output_bfd.
+
+2008-02-11  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-config.h (XCHAL_HAVE_THREADPTR): Redefine to zero.
+	(XCHAL_NUM_AREGS, XCHAL_MAX_INSTRUCTION_SIZE): New.
+
+2008-01-26  David Daney  <ddaney@avtrex.com>
+
+	* demangle.h (demangle_component_type):  Add
+	DEMANGLE_COMPONENT_JAVA_RESOURCE,
+	DEMANGLE_COMPONENT_COMPOUND_NAME, and
+	DEMANGLE_COMPONENT_CHARACTER as new enum values.
+	(demangle_component): Add struct s_character to union u.
+
+2007-11-07  Joseph Myers  <joseph@codesourcery.com>
+	    Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* floatformat.h (struct floatformat): Add split_half field.
+	(floatformat_ibm_long_double): New.
+
+2007-09-06  Tom Tromey  <tromey@redhat.com>
+
+	* libiberty.h (pex_free): Document process killing.
+
+2007-08-31  Douglas Gregor  <doug.gregor@gmail.com>
+
+	* demangle.h (enum demangle_component_type): Add
+	DEMANGLE_COMPONENT_RVALUE_REFERENCE.
+
+2007-07-25  Ben Elliston  <bje@au.ibm.com>
+
+	* ternary.h: Remove.
+
+2007-07-18  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-config.h (XCHAL_HAVE_THREADPTR): New.
+	(XCHAL_HAVE_RELEASE_SYNC, XCHAL_HAVE_S32C1I): New.
+
+2007-07-17  Nick Clifton  <nickc@redhat.com>
+
+	* COPYING3: New file.  Contains version 3 of the GNU General
+	Public License.
+
+2007-07-12  Kai Tietz   <kai.tietz@onevision.com>
+
+	* splay-tree.h (libi_uhostptr_t, libi_shostptr_t): Adjust types
+	work-a-round whitespace problem in gcc gengtype.
+
+	* splay-tree.h (libi_uhostptr_t, libi_shostptr_t): New types,
+	needed for WIN64 when a long is not wide enough for a pointer.
+	(splay_tree_key, splay_tree_value): Use the new types.
+
+2007-07-09  Roland McGrath  <roland@redhat.com>
+
+	* bfdlink.h (struct bfd_link_info): Add member emit_note_gnu_build_id.
+
+2007-07-06  Nick Clifton  <nickc@redhat.com>
+
+	* bfdlink.h: Update copyright notice to refer to GPLv3.
+
+2007-06-29  M R Swami Reddy  <MR.Swami.Reddy@nsc.com>
+
+	* dis-asm.h (print_insn_cr16): New prototype.
+
+2007-06-01  Noah Misch  <noah@cs.caltech.edu>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h (struct bfd_link_info): Add input_bfds_tail.
+
+2007-05-07  Nathan Froyd  <froydnj@codesourcery.com>
+
+	* libiberty.h (writeargv): Declare.
+
+2007-04-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h (struct bfd_link_info): Add "info" and "minfo".
+
+2007-04-25  Mark Mitchell  <mark@codesourcery.com>
+
+	* demangle.h: Change license to LGPL + exception.
+
+2007-04-10  Richard Henderson  <rth@redhat.com>
+
+	* bfdlink.h (struct bfd_link_info): Add relax_trip.
+
+2007-03-29  Joel Brobecker  <brobecker@adacore.com>
+
+	* filenames.h (FILENAME_CMP): Adjust define to call filename_cmp
+	regardless of the type of file system.
+
+2007-03-06  Jan Hubicka  <jh@suse.cz>
+
+	* ansidecl.h (ATTRIBUTE_COLD, ATTRIBUTE_HOT): New.
+
+2007-02-21  Nick Clifton  <nickc@redhat.com>
+
+	* bfdlink.h (struct bfd_link_callbacks): Add
+	override_segment_assignment field.
+
+2007-02-17  Mark Mitchell  <mark@codesourcery.com>
+            Nathan Sidwell  <nathan@codesourcery.com>
+            Vladimir Prus  <vladimir@codesourcery.com
+            Joseph Myers  <joseph@codesourcery.com>
+
+	* bin-bugs.h: Remove.
+
+2007-02-09  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* libiberty.h (pex_write_input): Remove prototype.
+
+2007-02-05  Dave Brolley  <brolley@redhat.com>
+
+	* Contribute the following changes:
+	2001-03-26  Ben Elliston  <bje@redhat.com>
+
+	* dis-asm.h (print_insn_mep): Declare.
+
+2007-02-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* dis-asm.h (print_i386_disassembler_options): New.
+
+2007-01-31  Vladimir Prus  <vladimir@codesourcery.com>
+
+	* libiberty.h (PEX_STDERR_TO_PIPE): New define.
+	(PEX_BINARY_ERROR): New define.
+	(pex_read_err): New function.
+
+2007-01-29  Simon Baldwin <simonb@google.com>
+
+	* demangle.h: New cplus_demangle_print_callback,
+	cplus_demangle_v3_callback, and java_demangle_v3_callback function
+	prototypes, and demangle_callbackref type definition.
+
+2007-01-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/3831
+	* bfdlink.h (bfd_link_info): Rename dynamic to dynamic_list.
+	Add dynamic and dynamic_data.
+
+2006-12-05  Michael Tautschnig  <tautschn@model.in.tum.de>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* ansidecl.h (ATTRIBUTE_PACKED): Define.
+
+2006-11-30  Andrew Stubbs  <andrew.stubbs@st.com>
+	    J"orn Rennecke <joern.rennecke@st.com>
+
+	PR driver/29931
+	* libiberty.h (make_relative_prefix_ignore_links): Declare.
+
+2006-11-27  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-config.h (XSHAL_ABI): New.
+	(XTHAL_ABI_WINDOWED, XTHAL_ABI_CALL0): New.
+
+2006-11-27  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-isa.h (STATIC_LIBISA): Delete.
+
+2006-10-30  Paul Brook  <paul@codesourcery.com>
+
+	* dis-asm.h (disassemble_info): Add symtab, symtab_pos and
+	symtab_size.
+
+2006-10-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/3111
+	* bfdlink.h (bfd_link_info): Add reduce_memory_overheads.
+
+2006-10-25  Trevor Smigiel  <Trevor_Smigiel@playstation.sony.com>
+	    Yukishige Shibata  <shibata@rd.scei.sony.co.jp>
+	    Nobuhisa Fujinami  <fnami@rd.scei.sony.co.jp>
+	    Takeaki Fukuoka  <fukuoka@rd.scei.sony.co.jp>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* dis-asm.h (print_insn_spu): Declare.
+
+2006-09-17  Mei Ligang  <ligang@sunnorth.com.cn>
+
+	* dis-asm.h: Add prototypes for Score disassembler routines.
+
+2006-09-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfdlink.h (bfd_elf_dynamic_list): New.
+	(bfd_link_info): Add a dynamic field.
+
+2006-08-04  Marcelo Tosatti  <marcelo@kvack.org>
+
+	* bfdlink.h (struct bfd_link_info): New field: print_gc_sections.
+
+2006-07-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* bfdlink.h (struct bfd_link_info): Add emit_hash and
+	emit_gnu_hash bitfields.
+
+2006-04-11  Jim Blandy  <jimb@codesourcery.com>
+
+	* libiberty.h (pex_input_file, pex_input_pipe): New declarations.
+
+2006-04-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfdlink.h (bfd_link_info): Replace need_relax_finalize with
+	relax_pass.
+
+2006-02-17  Shrirang Khisti  <shrirangk@kpitcummins.com>
+            Anil Paranjape   <anilp1@kpitcummins.com>
+            Shilin Shakti    <shilins@kpitcummins.com>
+
+	* dis-asm.h (print_insn_xc16c): New prototype.
+
+2006-01-18  DJ Delorie  <dj@redhat.com>
+
+	* md5.h: Include ansidecl.h
+
+2006-01-17  Andreas Schwab  <schwab@suse.de>
+
+	PR binutils/1486
+	* dis-asm.h (struct disassemble_info): Add
+	disassembler_needs_relocs.
+
+2006-01-09  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-config.h (XCHAL_HAVE_MUL32_HIGH): Define.
+
+2005-12-30  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-config.h (XCHAL_HAVE_WIDE_BRANCHES): New.
+
+2005-12-16  Nathan Sidwell  <nathan@codesourcery.com>
+
+	Second part of ms1 to mt renaming.
+	* dis-asm.h (print_insn_mt): Renamed.
+
+2005-12-10  Terry Laurenzo  <tlaurenzo@gmail.com>
+
+	PR java/9861
+	* demangle.h : Add DMGL_RET_POSTFIX define to enable alternative
+	output format for return types
+
+2005-11-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h (struct bfd_link_order): Tweak comment.
+
+2005-10-31  Mark Kettenis  <kettenis@gnu.org>
+
+	* floatformat.h (enum floatformat_byteorders): Add
+	floatformat_vax.
+	(floatformat_vax_aingle, floatformat_vax_double): Declare.
+
+2005-10-28  Dave Brolley  <brolley@redhat.com>
+
+	Contribute the following changes:
+	2003-09-29  Dave Brolley  <brolley@redhat.com>
+
+	* dis-asm.h (disassemble_info): insn_sets now (void *) to allow for
+	more exotic underlying types to be used.
+
+2005-10-25  Arnold Metselaar  <arnold.metselaar@planet.nl>
+
+	disasm.h: Add declaration for print_insn_z80
+
+2005-09-30  Catherine Moore  <clm@cm00re.com>
+
+	* dis-asm.h (print_insn_bfin): Declare.
+
+2005-09-26  Mark Mitchell  <mark@codesourcery.com>
+
+	* libiberty.h (expandargv): New function.
+
+2005-08-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h: Remove mention of a29k.
+	* dis-asm.h: Remove a29k support.
+
+2005-08-17  Mark Kettenis  <kettenis@gnu.org>
+
+	* floatformat.h (struct floatformat): Change type of large
+	argument for is_valid member to `const void *'.
+	(floatformat_to_double): Change type of second argument to `const
+	void *'.
+	(floatformat_from_double): Change type of last argument to `void
+	*'.
+	(floatformat_is_valid): Change type of last argument to `const
+	void *'.
+
+2005-07-14  Jim Blandy  <jimb@redhat.com>
+
+	* dis-asm.h (print_insn_m32c): New declaration.
+
+2005-07-12  Ben Elliston  <bje@au.ibm.com>
+
+	* xregex2.h (regexec): Qualify this prototype with __extension__
+	when compiling with GNU C.
+
+2005-07-07  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* dis-asm.h (fprintf_ftype): Add format attribute.
+
+2005-07-03  Steve Ellcey  <sje@cup.hp.com>
+
+	PR other/13906
+	* ansidecl.h (ATTRIBUTE_ALIGNED_ALIGNOF): New.
+	* md5.h (md5_uintptr): New.
+	(md5_ctx): Align buffer field.
+
+2005-06-30  Daniel Berlin  <dberlin@dberlin.org>
+
+	* hashtab.h (HTAB_DELETED_ENTRY): New macro.
+	(HTAB_EMPTY_ENTRY): New macro.
+
+2005-06-20  Geoffrey Keating  <geoffk@apple.com>
+
+	* libiberty.h (strverscmp): Prototype.
+
+2005-06-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf/external.h (GRP_ENTRY_SIZE): Define.
+
+2005-06-08  Zack Weinberg  <zack@codesourcery.com>
+
+	* dis-asm.h (get_arm_regnames): Update prototype.
+
+2005-06-07  Aldy Hernandez  <aldyh@redhat.com>
+	    Michael Snyder  <msnyder@redhat.com>
+	    Stan Cox  <scox@redhat.com>
+
+	* dis-asm.h: Externalize print_insn_ms1.
+
+2005-06-06  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* libiberty.h (XOBFINISH): New.
+
+2005-06-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h (struct bfd_link_callbacks): Add einfo.
+
+2005-06-01  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h (vsnprintf): Add format attribute.
+
+2005-05-29  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* ansidecl.h: Add ATTRIBUTE_FPTR_PRINTF.
+
+2005-05-28  Eli Zaretskii  <eliz@gnu.org>
+
+	* libiberty.h: (snprintf) [!HAVE_DECL_SNPRINTF]: Declare if
+	needed.
+	(vsnprintf) [!HAVE_DECL_VSNPRINTF]: Declare if needed.
+
+2005-05-25  Richard Henderson  <rth@redhat.com>
+
+	* demangle.h (DEMANGLE_COMPONENT_HIDDEN_ALIAS): New.
+
+2005-05-24  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* libiberty.h (ACONCAT): Properly cast value of alloca().
+
+	* ansidecl.h (ATTRIBUTE_UNUSED_LABEL): Don't define if
+	__cplusplus.
+
+2005-05-12  Steve Ellcey  <sje@cup.hp.com>
+
+	libiberty.h: Do not define empty basename prototype.
+
+2005-05-10  Nick Clifton  <nickc@redhat.com>
+
+	* Update the address and phone number of the FSF organization in
+	the GPL notices in the following files:
+	COPYING, ansidecl.h, bfdlink.h, bout.h, demangle.h, dis-asm.h,
+	dyn-string.h, fibheap.h, filenames.h, floatformat.h,
+	fnmatch.h, gdbm.h, getopt.h, hashtab.h, hp-symtab.h, ieee.h,
+	libiberty.h, md5.h, oasys.h, objalloc.h, obstack.h, os9k.h,
+	partition.h, progress.h, safe-ctype.h, sort.h, splay-tree.h,
+	symcat.h, ternary.h, xregex2.h, xtensa-config.h,
+	xtensa-isa-internal.h, xtensa-isa.h
+
+2005-04-25  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h (unlock_std_streams): New.
+
+2005-04-19  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* hashtab.h, libiberty.h, objalloc.h, splay-tree.h, ternary.h:
+	Don't use the PTR macro.
+
+	* sort.h: Don't use the PARAMS macro.
+
+2005-04-16  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h (unlock_stream): New.
+
+2005-04-13  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h (fopen_unlocked, fdopen_unlocked, freopen_unlocked):
+	Remove parameter names.
+
+2005-04-11  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h (fopen_unlocked, fdopen_unlocked, freopen_unlocked):
+	Provide prototypes for new functions.
+
+2005-03-29  Ian Lance Taylor  <ian@airs.com>
+
+	* libiberty.h: Fix indentation.
+
+2005-03-28  Ian Lance Taylor  <ian@airs.com>
+
+	* libiberty.h: Include <stdio.h>.
+	(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
+	(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
+	(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
+	(pex_init, pex_run, pex_read_output): Declare.
+	(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
+	(struct pex_time): Define.
+
+2005-03-28  Mark Mitchell <mark@codesourcery.com>
+
+	* libiberty.h (ffs): Declare, if necessary.
+
+2005-03-27  Gabriel Dos Reis  <gdr@integreable-solutions.net>
+
+	* ternary.h: Don't use PARAMS anymore.
+
+2005-03-27  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* md5.h: Remove definition and uses of __P.
+	* dyn-string.h: Remove uses of PARAMS.
+	* fibheap.h: Likewise.
+	* floatformat.h: Likewise.
+	* hashtab.h: Likewise.
+
+2005-03-26  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* demangle.h: Remove uses of PARAMS.
+
+	* libiberty.h (ANSI_PROTOTYPES): Remove guard since
+	ANSI_PROTOTYPES is always assumed.
+	Remove uses of PARAMS throughout.
+
+2005-03-24  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h (xstrndup): Declare.
+
+2005-03-22  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h (make_relative_prefix): Add ATTRIBUTE_MALLOC.
+
+2005-03-22  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-isa.h: Update a comment and whitespace.
+
+2005-03-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfdlink.h (bfd_link_info): Add gc_sections.
+
+2005-03-09  Mark Mitchell  <mark@codesourcery.com>
+
+	* libiberty.h (gettimeofday): Declare.
+
+2005-03-01  Jan Beulich  <jbeulich@novell.com>
+
+	* libiberty.h: Declare unlink_if_ordinary.
+
+2005-02-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* xtensa-isa-internal.h (xtensa_length_decode_fn): Warning fix.
+	* xtensa-isa.h (xtensa_insnbuf_to_chars): Likewise.
+	(xtensa_insnbuf_from_chars, xtensa_isa_length_from_chars): Likewise.
+
+2005-02-14  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/19818
+	* ansidecl.h (PARAMS): Guard from redefinition.
+
+2005-02-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h (struct bfd_link_hash_entry): Add u.undef.weak.
+
+2005-02-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h (bfd_link_repair_undef_list): Declare.
+
+2005-01-10  Andreas Schwab  <schwab@suse.de>
+
+	* dis-asm.h (struct disassemble_info): Add skip_zeroes and
+	skip_zeroes_at_end.
+
+2004-12-11  Ben Elliston  <bje@au.ibm.com>
+
+	* fibheap.h (struct fibnode): Only use unsigned long bitfields
+	when __GNUC__ is defined and ints are less than 32-bits wide.
+
+2004-11-04  Paul Brook  <paul@codesourcery.com>
+
+	* bfdlink.h (bfd_link_info): Add default_imported_symver.
+
+2004-11-12  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-isa-internal.h (xtensa_interface_internal): Add class_id.
+	* xtensa-isa.h (xtensa_interface_class_id): New prototype.
+
+2004-11-08  Inderpreet Singh   <inderpreetb@nioda.hcltech.com>
+	    Vineet Sharma      <vineets@noida.hcltech.com>
+
+	* dis-asm.h: Add prototype for print_insn_maxq_little.
+
+2004-10-26  Paul Brook  <paul@codesourcery.com>
+
+	* bfdlink.h (struct bfd_link_info): Add create_default_symver.
+
+2004-10-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 463
+	* bfdlink.h (bfd_link_callbacks): Add a pointer to struct
+	bfd_link_hash_entry to reloc_overflow.
+
+2004-10-07  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-config.h (XSHAL_USE_ABSOLUTE_LITERALS,
+	XCHAL_HAVE_PREDICTED_BRANCHES, XCHAL_INST_FETCH_WIDTH): New.
+	(XCHAL_EXTRA_SA_SIZE, XCHAL_EXTRA_SA_ALIGN): Delete.
+
+	* xtensa-isa-internal.h (ISA_INTERFACE_VERSION): Delete.
+	(config_sturct struct): Delete.
+	(XTENSA_OPERAND_IS_REGISTER, XTENSA_OPERAND_IS_PCRELATIVE,
+	XTENSA_OPERAND_IS_INVISIBLE, XTENSA_OPERAND_IS_UNKNOWN,
+	XTENSA_OPCODE_IS_BRANCH, XTENSA_OPCODE_IS_JUMP,
+	XTENSA_OPCODE_IS_LOOP, XTENSA_OPCODE_IS_CALL,
+	XTENSA_STATE_IS_EXPORTED, XTENSA_INTERFACE_HAS_SIDE_EFFECT): Define.
+	(xtensa_format_encode_fn, xtensa_get_slot_fn, xtensa_set_slot_fn): New.
+	(xtensa_insn_decode_fn): Rename to ...
+	(xtensa_opcode_decode_fn): ... this.
+	(xtensa_immed_decode_fn, xtensa_immed_encode_fn, xtensa_do_reloc_fn,
+	xtensa_undo_reloc_fn): Update.
+	(xtensa_encoding_template_fn): Delete.
+	(xtensa_opcode_encode_fn, xtensa_format_decode_fn,
+	xtensa_length_decode_fn): New.
+	(xtensa_format_internal, xtensa_slot_internal): New types.
+	(xtensa_operand_internal): Delete operand_kind, inout, isPCRelative,
+	get_field, and set_field fields.  Add name, field_id, regfile,
+	num_regs, and flags fields.
+	(xtensa_arg_internal): New type.
+	(xtensa_iclass_internal): Change operands field to array of
+	xtensa_arg_internal.  Add num_stateOperands, stateOperands,
+	num_interfaceOperands, and interfaceOperands fields.
+	(xtensa_opcode_internal): Delete length, template, and iclass fields.
+	Add iclass_id, flags, encode_fns, num_funcUnit_uses, and funcUnit_uses.
+	(opname_lookup_entry): Delete.
+	(xtensa_regfile_internal, xtensa_interface_internal,
+	xtensa_funcUnit_internal, xtensa_state_internal,
+	xtensa_sysreg_internal, xtensa_lookup_entry): New.
+	(xtensa_isa_internal): Replace opcode_table field with opcodes field.
+	Change type of opname_lookup_table.  Delete num_modules,
+	module_opcode_base, module_decode_fn, config, and has_density fields.
+	Add num_formats, formats, format_decode_fn, length_decode_fn,
+	num_slots, slots, num_fields, num_operands, operands, num_iclasses,
+	iclasses, num_regfiles, regfiles, num_states, states,
+	state_lookup_table, num_sysregs, sysregs, sysreg_lookup_table,
+	max_sysreg_num, sysreg_table, num_interfaces, interfaces,
+	interface_lookup_table, num_funcUnits, funcUnits and
+	funcUnit_lookup_table fields.
+	(xtensa_isa_module, xtensa_isa_modules): Delete.
+	(xtensa_isa_name_compare): New prototype.
+	(xtisa_errno, xtisa_error_msg): New.
+	* xtensa-isa.h (XTENSA_ISA_VERSION): Define.
+	(xtensa_isa): Change type.
+	(xtensa_operand): Delete.
+	(xtensa_format, xtensa_regfile, xtensa_state, xtensa_sysreg,
+	xtensa_interface, xtensa_funcUnit, xtensa_isa_status,
+	xtensa_funcUnit_use): New types.
+	(libisa_module_specifier): Delete.
+	(xtensa_isa_errno, xtensa_isa_error_msg): New prototypes.
+	(xtensa_insnbuf_free, xtensa_insnbuf_to_chars,
+	xtensa_insnbuf_from_chars): Update prototypes.
+	(xtensa_load_isa, xtensa_extend_isa, xtensa_default_isa,
+	xtensa_insn_maxlength, xtensa_num_opcodes, xtensa_decode_insn,
+	xtensa_encode_insn, xtensa_insn_length,
+	xtensa_insn_length_from_first_byte, xtensa_num_operands,
+	xtensa_operand_kind, xtensa_encode_result,
+	xtensa_operand_isPCRelative): Delete.
+	(xtensa_isa_init, xtensa_operand_inout, xtensa_operand_get_field,
+	xtensa_operand_set_field, xtensa_operand_encode,
+	xtensa_operand_decode, xtensa_operand_do_reloc,
+	xtensa_operand_undo_reloc): Update prototypes.
+	(xtensa_isa_maxlength, xtensa_isa_length_from_chars,
+	xtensa_isa_num_pipe_stages, xtensa_isa_num_formats,
+	xtensa_isa_num_opcodes, xtensa_isa_num_regfiles, xtensa_isa_num_states,
+	xtensa_isa_num_sysregs, xtensa_isa_num_interfaces,
+	xtensa_isa_num_funcUnits, xtensa_format_name, xtensa_format_lookup,
+	xtensa_format_decode, xtensa_format_encode, xtensa_format_length,
+	xtensa_format_num_slots, xtensa_format_slot_nop_opcode,
+	xtensa_format_get_slot, xtensa_format_set_slot, xtensa_opcode_decode,
+	xtensa_opcode_encode, xtensa_opcode_is_branch, xtensa_opcode_is_jump,
+	xtensa_opcode_is_loop, xtensa_opcode_is_call,
+	xtensa_opcode_num_operands, xtensa_opcode_num_stateOperands,
+	xtensa_opcode_num_interfaceOperands, xtensa_opcode_num_funcUnit_uses,
+	xtensa_opcode_funcUnit_use, xtensa_operand_name,
+	xtensa_operand_is_visible, xtensa_operand_is_register,
+	xtensa_operand_regfile, xtensa_operand_num_regs,
+	xtensa_operand_is_known_reg, xtensa_operand_is_PCrelative,
+	xtensa_stateOperand_state, xtensa_stateOperand_inout,
+	xtensa_interfaceOperand_interface, xtensa_regfile_lookup,
+	xtensa_regfile_lookup_shortname, xtensa_regfile_name,
+	xtensa_regfile_shortname, xtensa_regfile_view_parent,
+	xtensa_regfile_num_bits, xtensa_regfile_num_entries,
+	xtensa_state_lookup, xtensa_state_name, xtensa_state_num_bits,
+	xtensa_state_is_exported, xtensa_sysreg_lookup,
+	xtensa_sysreg_lookup_name, xtensa_sysreg_name, xtensa_sysreg_number,
+	xtensa_sysreg_is_user, xtensa_interface_lookup, xtensa_interface_name,
+	xtensa_interface_num_bits, xtensa_interface_inout,
+	xtensa_interface_has_side_effect, xtensa_funcUnit_lookup,
+	xtensa_funcUnit_name, xtensa_funcUnit_num_copies): New prototypes.
+2004-10-07  Jeff Baker  <jbaker@qnx.com>
+
+	* bfdlink.h (bfd_link_info): Add bitfield: warn_shared_textrel.
+
+2004-09-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h (struct bfd_link_hash_entry): Move und_next into elements
+	of union.
+
+2004-09-13  Aaron W. LaFramboise  <aaronavay62@aaronwl.com>
+
+	* libiberty.h (basename): Prototype for __MINGW32__.
+
+2004-09-04  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* ansidecl.h (ATTRIBUTE_SENTINEL): Define.
+	* libiberty.h (concat, reconcat, concat_length, concat_copy,
+	concat_copy2): Use ATTRIBUTE_SENTINEL.
+
+2004-08-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h (struct bfd_link_callbacks): Remove "error_handler".
+	(LD_DEFINITION_IN_DISCARDED_SECTION): Delete.
+
+2004-08-02  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* libiberty.h (XDELETE, XDELETEVEC, XRESIZEVEC): Remove any
+	const-qualification before disposal.
+
+2004-07-24  Bernardo Innocenti  <bernie@develer.com>
+
+	* ansidecl.h (ARG_UNUSED): New Macro.
+
+2004-07-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bin-bugs.h (REPORT_BUGS_TO): Set to
+	"<URL:http://www.sourceware.org/bugzilla/>".
+
+2004-07-21  Paolo Bonzini  <bonzini@gnu.org>
+
+	* ansidecl.h (ATTRIBUTE_PURE): New.
+
+2004-07-13  Bernardo Innocenti  <bernie@develer.com>
+
+	* libiberty.h (XNEW, XCNEW, XNEWVEC, XCNEWVEC, XOBNEW): Move here from
+	libcpp/internal.h.
+	(XDELETE, XRESIZEVEC, XDELETEVEC, XNEWVAR, XCNEWVAR, XRESIZEVAR): New
+	macros.
+
+2004-07-13  Bernardo Innocenti  <bernie@develer.com>
+
+	* libiberty.h (ASTRDUP): Add casts required for stricter
+	type conversion rules of C++.
+	* obstack.h (obstack_free): Likewise.
+
+2004-07-07  Tomer Levi  <Tomer.Levi@nsc.com>
+
+	* dis-asm.h (print_insn_crx): Declare.
+
+2004-06-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h (struct bfd_link_order): Update comment.
+
+2004-05-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* bfdlink.h (struct bfd_link_info): Add relro, relro_start and
+	relro_end fields.
+
+2004-05-04  Andreas Jaeger  <aj@suse.de>
+
+	* demangle.h: Do not use C++ reserved keyword typename as
+	parameter for cplus_demangle_fill_builtin_type.
+
+2004-04-22  Richard Henderson  <rth@redhat.com>
+
+	* hashtab.h (struct htab): Add size_prime_index.
+
+2004-04-13  Jeff Law  <law@redhat.com>
+
+	* hashtab.h (htab_remove_elt_with_hash): Prototype new function.
+
+2004-03-30  Zack Weinberg  <zack@codesourcery.com>
+
+	* hashtab.h, splay-tree.h: Use new shorter form of GTY markers.
+
+2004-03-25  Stan Shebs  <shebs@apple.com>
+
+	* mpw/: Remove subdirectory and everything in it.
+
+2004-03-23  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 51.
+	* bfdlink.h (struct bfd_link_info): Add wrap_char.
+
+2004-03-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfdlink.h (bfd_link_info): Correct comments for the
+	unresolved_syms_in_objects field.
+
+2004-02-24  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* dyn-string.h: Update copyright date.
+
+2004-02-23  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* dyn-string.h: Remove test of IN_LIBGCC2 and IN_GLIBCPP_V3 and
+	the associated #defines.
+
+2004-01-12  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* demangle.h: Instead of checking ANSI_PROTOTYPES, just include
+	"libiberty.h".
+
+	* demangle.h: If ANSI_PROTOTYPES is defined, include <stddef.h>.
+
+	* demangle.h (enum demangle_component_type): Define.
+	(struct demangle_operator_info): Declare.
+	(struct demangle_builtin_type_info): Declare.
+	(struct demangle_component): Define.
+	(cplus_demangle_fill_component): Declare.
+	(cplus_demangle_fill_name): Declare.
+	(cplus_demangle_fill_builtin_type): Declare.
+	(cplus_demangle_fill_operator): Declare.
+	(cplus_demangle_fill_extended_operator): Declare.
+	(cplus_demangle_fill_ctor, cplus_demangle_fill_dtor): Declare.
+	(cplus_demangle_v3_components): Declare.
+	(cplus_demangle_print): Declare.
+
+For older changes see ChangeLog-9103
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/ChangeLog-9103 sdcc-3.2.0+dfsg/support/sdbinutils/include/ChangeLog-9103
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/ChangeLog-9103	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/ChangeLog-9103	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,2682 @@
+2003-12-19  Andreas Tobler  <a.tobler@schweiz.ch>
+
+	* include/fibheap.h (fibnode): Use __extension__ for
+	bit-fields mark and degree if __GNUC__.
+
+2003-12-18  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* include/fibheap.h (fibnode): Use unsigned long int for
+	bit-fields if __GNUC__ is defined.
+
+2003-12-19  Andreas Tobler  <a.tobler@schweiz.ch>
+
+	* fibheap.h (fibnode): Use __extension__ for
+	bit-fields mark and degree if __GNUC__.
+
+2003-12-18  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* fibheap.h (fibnode): Use unsigned long int for
+	bit-fields if __GNUC__ is defined.
+
+2003-12-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfdlink.h (bfd_link_info): Change relax_finalizing to
+	need_relax_finalize.
+
+2003-12-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h (struct bfd_link_hash_entry): Rename "next" to "und_next".
+
+2003-12-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h (struct bfd_link_info): Remove mpc860c0 field.
+
+2003-11-14  Nick Clifton  <nickc@redhat.com>
+
+	* dis-asm.h (struct disassemble_info): Add new field
+	'symbol_is_valid' which is a function which can tell the
+	disassembler to skip certain symbols as they should not be
+	displayed to the user.
+	(arm_symbol_is_valid): New prototype.  This is the ARM
+	specific function for the symbol_is_valid field.
+	(generic_symbol_is_valid): New prototype.  This is the default
+	function pointed to by the symbol_is_valid field.
+
+2003-11-06  Bruno Rohee  <bruno@rohee.com>
+
+	* hp-symtab.h: Fix "the the" typo.
+
+2003-10-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* bfdlink.h (bfd_elf_version_expr): Add "symbol" and remove
+	"wildcard".
+
+2003-10-22  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* obstack.h: Merge the following change from gnulib:
+	2003-10-21  Paul Eggert  <eggert@twinsun.com>
+	* obstack.h (obstack_1grow_fast): Properly parenthesize arg.
+	(obstack_ptr_grow_fast, obstack_int_grow_fast):
+	Don't use lvalue casts, as GCC plans to remove support for them
+	in GCC 3.5.  Reported by Joseph S. Myers.  This bug
+	was also present in the non-GCC version, indicating that this
+	code had always been buggy and had never been widely used.
+	(obstack_1grow, obstack_ptr_grow, obstack_int_grow, obstack_blank):
+	Use the fast variant of each macro, rather than copying the
+	definiens of the fast variant; that way, we'll be more likely to
+	catch future bugs in the fast variants.
+
+2003-10-22  Jakub Jelinek  <jakub@redhat.com>
+
+	* bfdlink.h (struct bfd_elf_version_expr): Remove match field.
+	Add wildcard and mask fields.
+	(BFD_ELF_VERSION_C_TYPE): Define.
+	(BFD_ELF_VERSION_CXX_TYPE): Likewise.
+	(BFD_ELF_VERSION_JAVA_TYPE): Likewise.
+	(struct bfd_elf_version_expr_head): New.
+	(struct bfd_elf_version_tree): Add match field.
+	Change type of globals and locals fields
+	to struct bfd_elf_version_expr_head.
+
+2003-09-22  Andrew Cagney  <cagney@redhat.com>
+
+	* floatformat.h (struct floatformat): Add field "is_valid".
+
+2003-09-15  Andrew Cagney  <cagney@redhat.com>
+
+	* floatformat.h (floatformat_to_double): Make input buffer constant.
+	(floatformat_from_double, floatformat_is_valid): Ditto.
+
+2003-09-15  Andrew Cagney  <cagney@redhat.com>
+
+	* floatformat.h (struct floatformat): Make "exp_bias" signed.
+
+2003-09-15  Daniel Jacobowitz  <drow@mvista.com>
+
+	* floatformat.h (floatformat_is_valid): Add prototype.
+
+2003-08-27  Andrew Cagney  <cagney@redhat.com>
+
+	* dis-asm.h (init_disassemble_info): Declare.
+	(INIT_DISASSEMBLE_INFO): Redefine as a call to
+	init_disassemble_info.
+	(INIT_DISASSEMBLE_INFO_NO_ARCH): Ditto.
+
+2003-08-20  Nick Clifton  <nickc@redhat.com>
+
+	* bfdlink.h (enum report_method): New enum.  Describes how to
+	report something.
+	(struct bfd_link_info): Delete fields 'no_undefined' and
+	'allow_shlib_undefined'.  Replace with
+	'unresolved_symbols_in_objects' and
+	'unresolved_symbols_in_shared_libs'.
+
+2003-08-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h: Remove PARAMS macro.  Replace PTR with void *.
+	* dis-asm.h: Likewise.
+
+2003-07-09  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-config.h: Undef all macros before defining them.
+
+2003-07-06  H.J. Lu <hongjiu.lu@intel.com>
+
+	* demangle.h: Support C++.
+
+2003-07-01  Zack Weinberg  <zack@codesourcery.com>
+
+	* filenames.h: New file imported from binutils.
+
+2003-06-30  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-config.h: New file imported from binutils.
+
+2003-06-30  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-config.h (XCHAL_HAVE_CONST16, XCHAL_HAVE_ABS,
+	XCHAL_HAVE_ADDX, XCHAL_HAVE_L32R): Define.
+
+2003-06-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h: Correct spelling of "relocatable".
+
+2003-06-22  Zack Weinberg  <zack@codesourcery.com>
+
+	* safe-ctype.h (HC_UNKNOWN, HC_ASCII, HC_EBCDIC): Rename to
+	HOST_CHARSET_UNKNOWN, HOST_CHARSET_ASCII, HOST_CHARSET_EBCDIC
+	respectively.
+
+2003-06-21  Zack Weinberg  <zack@codesourcery.com>
+
+	* safe-ctype.h (HC_UNKNOWN, HC_ASCII, HC_EBCDIC, HOST_CHARSET):
+	New #defines.
+
+2003-06-17  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* ansidecl.h: Delete HAVE_LONG_DOUBLE GCC bootstrap support.
+
+2003-05-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* bfdlink.h (struct bfd_link_info): Add execstack and noexecstack.
+
+2003-06-03  H.J. Lu <hongjiu.lu@intel.com>
+
+	* bfdlink.h (LD_DEFINITION_IN_DISCARDED_SECTION): New.
+
+2003-05-30  Ulrich Drepper  <drepper@redhat.com>
+	    Jakub Jelinek  <jakub@redhat.com>
+
+	* bfdlink.h (struct bfd_link_info): Add pie and executable
+	bits.
+
+2003-05-21  Nick Clifton  <nickc@redhat.com>
+
+	* bfdlink.h (struct bfd_link_hash_table): Fix typo in comment.
+
+2003-05-15  Jim Blandy  <jimb@redhat.com>
+
+	* libiberty.h (hex_value): Make the value an unsigned int, to
+	avoid unexpected sign-extension when cast to unsigned types larger
+	than int --- like bfd_vma, on some platforms.
+	(_hex_value): Update declaration.
+
+2003-05-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* xtensa-isa-internal.h (xtensa_isa_module_struct): Remove const on
+	gen_num_opcodes_fn return type.
+
+2003-05-07  Jason Merrill  <jason@redhat.com>
+
+	* hashtab.h (iterative_hash): Prototype.
+	(iterative_hash_object): New macro.
+
+2003-04-28  H.J. Lu <hjl@gnu.org>
+
+	* bfdlink.h (bfd_link_info): Add relax_finalizing.
+
+2003-04-23  H.J. Lu <hjl@gnu.org>
+
+	* bfdlink.h (bfd_link_callbacks): Add error_handler.
+
+2003-04-02  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa-config.h: Remove comment indicating that this is a
+	generated file.
+
+2003-04-01  Bob Wilson  <bob.wilson@acm.org>
+
+	* dis-asm.h (print_insn_xtensa): Declare.
+	* xtensa-config.h: New file.
+	* xtensa-isa-internal.h: Likewise.
+	* xtensa-isa.h: Likewise.
+
+2003-03-17  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* ansidecl.h (ATTRIBUTE_NONNULL, ATTRIBUTE_NULL_PRINTF,
+	ATTRIBUTE_NULL_PRINTF_1, ATTRIBUTE_NULL_PRINTF_2,
+	ATTRIBUTE_NULL_PRINTF_3, ATTRIBUTE_NULL_PRINTF_4,
+	ATTRIBUTE_NULL_PRINTF_5): New.
+	(ATTRIBUTE_PRINTF): Add ATTRIBUTE_NONNULL.
+
+2003-03-17  Jan Hubicka  <jh@suse.cz>
+
+	* hashtab.h (htab_traverse_noresize): Declare.
+
+2003-02-27  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h: Document return value of physmem routines.
+
+2003-02-20  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h (physmem_total, physmem_available): Prototype.
+
+2003-02-20  Daniel Jacobowitz  <drow@mvista.com>
+
+	* libiberty.h (lrealpath): Add declaration.
+
+2003-01-31  Grant Grundler  <grundler@dsl2.external.hp.com>
+
+	* hppa.h (ldwa, ldda): Add ordered opcodes.
+
+2003-01-26  Daniel Jacobowitz  <drow@mvista.com>
+
+	* hashtab.h (htab_alloc_with_arg, htab_free_with_arg): Add new types.
+	(struct htab): Add alloc_arg, alloc_with_arg_f, free_with_arg_f.
+	(htab_create_alloc_ex): New prototype.
+	(htab_set_functions_ex): New prototype.
+
+2002-07-17  Geoffrey Keating  <geoffk@redhat.com>
+
+	* splay-tree.h (GTY): Define if undefined.
+	(splay_tree_allocate_fn): Return PTR for compatibility, not void *.
+	(struct splay_tree_node_s): Support gengtype.
+	(struct splay_tree_s): Likewise.  Make allocate_data a PTR,
+	not a void *.
+
+2002-01-02  Ben Elliston  <bje@redhat.com>
+
+	* dis-asm.h (print_insn_iq2000): Declare.
+
+2002-12-24    Dmitry Diky <diwil@mail.ru>
+
+	* dis-asm.h: Add msp430 disassembler prototype.
+
+2002-12-27  Chris Demetriou  <cgd@broadcom.com>
+
+	* dis-asm.h (print_mips_disassembler_options): Prototype.
+
+2002-12-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h (struct bfd_link_info): Add "strip_discarded".
+
+2002-12-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h (struct bfd_link_info): Replace bfd_boolean fields with
+	bit-fields.  Rearrange to put all like types together.
+
+2002-11-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h: Replace boolean with bfd_boolean.  Formatting.
+
+2002-11-23  Simon Burge  <simonb@wasabisystems.com>
+
+	* libiberty.h (basename): Add NetBSD to the list.
+
+2002-11-22  Daniel Jacobowitz  <drow@mvista.com>
+
+	* libiberty.h (make_relative_prefix): Add prototype.
+
+2002-11-14  Egor Duda  <deo@logos-m.ru>
+
+	* bfdlink.h (struct bfd_link_info): Add new boolean
+	field pei386_runtime_pseudo_reloc.
+
+2002-10-26  Roger Sayle  <roger@eyesopen.com>
+
+	* partition.h:  Close the extern "C" scope when compiling with C++.
+
+2002-10-26  Roger Sayle  <roger@eyesopen.com>
+	    DJ Delorie <dj@redhat.com>
+
+	PR bootstrap/8351
+	* getopt.h: Avoid prototyping getopt with no arguments in C++.
+
+2002-10-24  Nathan Tallent  <eraxxon@alumni.rice.edu>
+
+	* ansidecl.h (__STDC__): Add (__alpha && __cplusplus) to the
+	list of	platform compilers that may look, smell and act
+	like __STDC__ but that may not define it.
+
+2002-10-11  David O'Brien  <obrien@FreeBSD.org>
+
+	* getopt.h: getopt is in unistd.h (based on SUSv2).
+
+2002-09-26  Andrew Cagney  <ac131313@redhat.com>
+
+	* regs/: Delete directory.
+
+2002-09-19  Alexandre Oliva  <aoliva@redhat.com>
+
+	* libiberty.h (asprintf, vasprintf): Don't declare them if the
+	corresponding HAVE_DECL_ macro is 1.
+
+2002-09-19  Nathan Tallent  <eraxxon@alumni.rice.edu>
+
+	* dis-asm.h: Remove (errant) trailing semicolon (;) from the
+	extern "C" { } declaration.
+
+2002-09-04  Nick Clifton  <nickc@redhat.com>
+
+	* dis-asm.h (print_ppc_disassembler_options): Prototype.
+
+2002-08-28  Michael Hayes <m.hayes@elec.canterbury.ac.nz>
+
+	* dis-asm.h: Add standard disassembler for tic4x.
+
+2002-08-07  H.J. Lu <hjl@gnu.org>
+
+	* bfdlink.h (bfd_link_info): Add allow_undefined_version.
+	(bfd_elf_version_expr): Add symver and script.
+
+2002-07-31  Ian Dall  <ian@sibyl.beware.dropbear.id.au>
+
+	* bfdlink.h (bfd_link_common_skip_ar_symbols): New enum.
+	(struct bfd_link_info): Add new field 'common_skip_ar_symbols'.
+
+2002-07-19  Denis Chertykov  <denisc@overta.ru>
+	    Matthew Green  <mrg@redhat.com>
+
+	* dis-asm.h (print_insn_ip2k): Declare.
+
+2002-07-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h (struct bfd_sym_chain): Declare.
+	(struct bfd_link_info): Add gc_sym_list.  Formatting fixes.
+
+2002-06-25  Alan Modra  <amodra@bigpond.net.au>
+
+	* demangle.h: #include "ansidecl.h" rather than #include <ansidecl.h>.
+	* fibheap.h: Likewise.
+	* hashtab.h: Likewise.
+	* partition.h: Likewise.
+	* sort.h: Likewise.
+	* splay-tree.h: Likewise.
+
+2002-06-24  Alan Modra  <amodra@bigpond.net.au>
+
+	* libiberty.h (basename): Don't declare if HAVE_DECL_BASENAME.
+	* getopt.h (getopt): Don't declare if HAVE_DECL_GETOPT.
+
+2002-06-18  Dave Brolley  <brolley@redhat.com>
+
+	From Catherine Moore:
+	* dis-asm.h (print_insn_frv): New prototype.
+
+2002-06-09  Andrew Cagney  <cagney@redhat.com>
+
+	* remote-sim.h: Move to directory gdb/.
+	* callback.h: Move to directory gdb/.
+
+2002-06-07  Charles Wilson  <cwilson@ece.gatech.edu>
+
+	* bfdlink.h (struct bfd_link_info): Change type of
+	pei386_auto_import field to int so that -1 can mean enabled by
+	default and 1 can mean enabled by command line switch.
+
+2002-06-06  DJ Delorie  <dj@redhat.com>
+
+	* hashtab.h (htab): Rearrange new members for backward
+	compatibility.
+	(htab_create): Don't use a macro that requires other headers.
+
+2002-06-05  Geoffrey Keating  <geoffk@redhat.com>
+
+	* hashtab.h (htab_create): Restore prototype for backward
+	compatibility.
+	(htab_try_create): Likewise.
+
+2002-05-22  Geoffrey Keating  <geoffk@redhat.com>
+
+	* hashtab.h (struct htab): Update for change to length specifier.
+
+2002-05-10  Geoffrey Keating  <geoffk@redhat.com>
+
+	* hashtab.h (GTY): Define if undefined.
+	(htab_alloc): New typedef.
+	(htab_free): New typedef.
+	(struct htab): Support gengtype; allow user-specified memory
+	allocation.
+	(htab_create_alloc): New.
+	(htab_create): Replace with #define.
+	(htab_try_create): Delete.
+
+2002-05-28  Kuang Hwa Lin <kuang@sbcglobal.net>
+
+	* dis-asm.h: Prototype print_insn_dlx.
+
+2002-05-23  Andrew Cagney  <ac131313@redhat.com>
+
+	* sim-d10v.h: Delete file.  Moved to include/gdb/.
+
+2002-05-21  H.J. Lu  (hjl@gnu.org)
+
+	* bfdlink.h (bfd_link_info): Add allow_multiple_definition.
+
+2002-05-17  J"orn Rennecke <joern.rennecke@superh.com>
+
+	* dis-asm.h (print_insn_shl, print_insn_sh64l): Remove prototype.
+
+2002-04-16  David S. Miller  <davem@redhat.com>
+
+	* xregex2.h (__restrict_arr): Define to __restrict on GCC
+	3.1 and later.  Do not redefine.
+
+2002-04-01  Phil Edwards  <pme@gcc.gnu.org>
+
+	* dyn-string.h:  Also allow IN_GLIBCPP_V3 to redefine names.
+
+2002-03-10  Daniel Jacobowitz <drow@mvista.com>
+
+	* gdb: New directory.
+
+2002-03-06  Andrew Cagney  <ac131313@redhat.com>
+
+	* floatformat.h (floatformat_arm_ext): Delete declaration.
+
+2002-02-21  Jim Blandy  <jimb@redhat.com>
+
+	Allow the user to specify functions for allocating memory for
+	splay tree roots and nodes.
+	* splay-tree.h (splay_tree_allocate_fn, splay_tree_deallocate_fn):
+	New types.
+	(splay_tree): New fields: `allocate', `deallocate', and
+	`allocate_data'.
+	(splay_tree_new_with_allocator): New function declaration.
+
+2002-02-15  Alan Modra  <amodra@bigpond.net.au>
+
+	Support arbitrary length fill patterns.
+	* bfdlink.h (enum bfd_link_order_type): Remove bfd_fill_link_order.
+	(struct bfd_link_order): Remove fill.  Add data.size.
+
+2002-02-08  Alexandre Oliva  <aoliva@redhat.com>
+
+	Contribute sh64-elf.
+	2000-11-25  Hans-Peter Nilsson  <hpn@cygnus.com>
+	* dis-asm.h (print_insn_sh64): New prototype.
+	(print_insn_sh64l): New prototype.
+	(print_insn_sh64x_media): New prototype.
+
+2002-02-05  Frank Ch. Eigler  <fche@redhat.com>
+
+	* dis-asm.h (disassemble_info): New field `insn_sets'.
+	(INIT_DISASSEMBLE_INFO): Clear it.
+
+2002-02-05  Jason Merrill  <jason@redhat.com>
+
+	* demangle.h (cplus_demangle_v3): Add "options" parm.
+	(cplus_demangle_v3_type): Remove prototype.
+	(DMGL_VERBOSE): New macro.
+	(DMGL_TYPES): New macro.
+
+2002-02-02  H.J. Lu  (hjl@gnu.org)
+
+	* demangle.h (cplus_demangle_v3_type): New prototype.
+
+2002-01-31  Ivan Guzvinec  <ivang@opencores.org>
+
+	* dis-asm.h : Add support for or32 targets
+
+2002-01-28  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h (C_alloca): Add ATTRIBUTE_MALLOC.
+
+2002-01-27  David O'Brien  <obrien@FreeBSD.org>
+
+	* cgen.h (BFD_VERSION): Use BFD_VERSION_DATE instead.
+
+2001-12-14  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* dis-asm.h (INIT_DISASSEMBLE_INFO_NO_ARCH): Initialise the
+	disassembler_options field (to NULL).
+
+2001-12-13  Jakub Jelinek  <jakub@redhat.com>
+
+	* bfdlink.h (struct bfd_link_info): Add eh_frame_hdr field.
+
+2001-12-07  Geoffrey Keating  <geoffk@redhat.com>
+
+	* dis-asm.h (print_insn_xstormy16): Declare.
+
+2001-12-06  Richard Henderson  <rth@redhat.com>
+
+	* demangle.h (no_demangling): New.
+	(NO_DEMANGLING_STYLE_STRING): New.
+
+2001-11-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* dis-asm.h (print_insn_i386): Declare.
+
+2001-11-11  Timothy Wall  <twall@alum.mit.edu>
+
+	* dis-asm.h: Fix comment to refer to octets rather than bytes.
+
+2001-10-30  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* dis-asm.h (print_insn_mmix): Add prototype.
+
+2001-10-24  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+	* safe-ctype.h (_sch_isbasic, IS_ISOBASIC): New.
+
+2001-10-22  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h (hex_init): Revert delete.
+
+	* libiberty.h (_hex_value): Const-ify.
+	(hex_init): Delete.
+
+2001-10-16  Christopher Faylor  <cgf@redhat.com>
+
+	* filenames.h: Add cygwin to the list of dosish style path systems.
+
+2001-10-07  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* demangle.h (demangler_engine): Const-ify.
+	* libiberty.h (buildargv): Likewise.
+
+2001-10-03  Vassili Karpov  <malc@pulsesoft.com>
+
+	* bfdlink.h (struct bfd_link_info): Add nocopyreloc field.
+
+2001-09-24  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h (reconcat): New function.
+
+2001-09-18  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h (concat, concat_length, concat_copy, concat_copy2,
+	ACONCAT): Improve comments.
+
+2001-09-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* objalloc.h (OBJALLOC_ALIGN): Define using offsetof.
+
+2001-09-17  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h (concat_length, concat_copy, concat_copy2,
+	libiberty_concat_ptr, ACONCAT): New.
+
+	* libiberty.h (ASTRDUP): New macro.
+	libiberty_optr, libiberty_nptr, libiberty_len): Declare.
+
+2001-08-29  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* ansidecl.h: Update comments reflecting previous change.
+
+2001-08-27  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* ansidecl.h (VA_OPEN, VA_CLOSE): Allow multiple uses.
+
+2001-08-25  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* bfdlink.h (struct bfd_link_info): Change 'spare_dynamic_tags' to
+	unsigned to remove a compile time warning message.
+
+2001-08-24  H.J. Lu  <hjl@gnu.org>
+
+	* bfdlink.h (bfd_link_hash_table_type): New. The linker hash
+	table type, bfd_link_generic_hash_table and
+	bfd_link_elf_hash_table.
+	(bfd_link_hash_table): Add a new field, type, for the linker
+	hash table type.
+
+2001-08-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* bfdlink.h (struct bfd_link_info): Add combreloc and
+	spare_dynamic_tags fields.
+
+2001-08-23  Lars Brinkhoff  <lars@nocrew.org>
+
+	* dyn-string.h, fibheap.h, partition.h, sort.h, splay-tree.h:
+	replace "GNU CC" with "GCC".
+
+2001-08-21  Richard Henderson  <rth@redhat.com>
+
+	* fibheap.h: Tidy formatting.
+	(fibnode_t): Limit degree to 31 bits to avoid warning.
+
+2001-08-20  Daniel Berlin  <dan@cgsoftware.com>
+
+	* fibheap.h: New file. Fibonacci heap.
+
+2001-08-20  Andrew Cagney  <ac131313@redhat.com>
+
+	* floatformat.h (floatformat_arm_ext): Document as deprecated.
+	(floatformat_arm_ext_big, floatformat_arm_ext_littlebyte_bigword)
+	(floatformat_ia64_spill_little, floatformat_ia64_quad_little)
+	(floatformat_ia64_spill_big, floatformat_ia64_quad_big)
+	(floatformat_m88110_harris_ext): Declare.
+
+2001-08-18  Zack Weinberg  <zackw@panix.com>
+
+	* ansidecl.h: Reorganize for readability, remove documentation
+	of obsolete macros, document PARAMS and VPARAMS.  Add new
+	macros VA_OPEN, VA_CLOSE, and VA_FIXEDARG for nicer variadic
+	function implementation.
+
+2001-08-16  Richard Henderson  <rth@redhat.com>
+
+	* hashtab.h (htab_hash_string): Declare.
+
+2001-08-10  Andrew Cagney  <ac131313@redhat.com>
+
+	* libiberty.h (lbasename): Change function declaration to return a
+	const char pointer.
+
+2001-08-02  Mark Kettenis  <kettenis@gnu.org>
+
+	* xregex.h (_REGEX_RE_COMP): Define.
+	(re_comp): Define to xre_comp.
+	(re_exec): Define to xre_exec.
+
+2001-08-02  Charles Wilson  <cwilson@ece.gatech.edu>
+
+	* bfdlink.h (struct bfd_link_info): add new boolean
+	field pei386_auto_import.
+
+2001-07-18  Andreas Jaeger  <aj@suse.de>
+
+	* xregex2.h: Place under LGPL version 2.1.
+
+2001-07-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* xregex.h: New file to support libiberty regex.
+	* xregex2.h: Ditto.
+
+2001-06-15  Hans-Peter Nilsson  <hp@axis.com>
+
+	* bfdlink.h (struct bfd_link_info): New member export_dynamic.
+
+2001-05-16  Matt Kraai  <kraai@alumni.carnegiemellon.edu>
+
+	* partition.h: Fix misspelling of `implementation'.
+
+2001-05-10  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* ansidecl.h (NULL_PTR): Delete.
+
+2001-05-07  Zack Weinberg  <zackw@stanford.edu>
+
+	* demangle.h: Use PARAMS for all prototypes.
+	* ternary.h: Use PARAMS for all prototypes.  Use PTR, not void *.
+	Make arguments constant where possible.
+
+2001-05-07  Mark Mitchell  <mark@codesourcery.com>
+
+	* splay-tree.h (splay_tree_max): New function.
+	(splay_tree_min): Likewise.
+
+2001-04-27  Johan Rydberg  <jrydberg@opencores.org>
+
+	* dis-asm.h (print_insn_openrisc): Add prototype.
+
+2001-04-15  Daniel Berlin  <dan@cgsoftware.com>
+
+	* ternary.h: New file - Ternary search tree header.
+
+2001-04-13  Jakub Jelinek  <jakub@redhat.com>
+
+	* bfdlink.h (bfd_link_discard): Add discard_sec_merge.
+
+2001-04-03  Zack Weinberg  <zackw@stanford.edu>
+
+	* ansidecl.h: All logic from gcc/gansidecl.h moved here.
+
+2001-03-31  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h (alloca): Handle setting C_ALLOCA.
+
+2001-03-20  Jim Blandy  <jimb@redhat.com>
+
+	* demangle.h (enum gnu_v3_constructor_kinds,
+	is_gnu_v3_mangled_ctor, enum gnu_v3_destructor_kinds,
+	is_gnu_v3_mangled_dtor): New declarations.
+
+2001-03-14  Nick Clifton  <nickc@redhat.com>
+
+	* ansidecl.h: Fix copyright dates.
+	* demangle.h: Fix copyright dates.
+	* floatformat.h: Fix copyright dates.
+	* fnmatch.h: Fix copyright dates.
+	* getopt.h: Fix copyright dates.
+	* libiberty.h: Add FSF copyright notice.
+	* md5.h: Fix copyright dates.
+	* obstack.h: Fix copyright dates.
+	* splay-tree.h: Fix copyright dates.
+
+2001-03-10  Neil Booth  <neil@daikokuya.demon.co.uk>
+	    John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* libiberty.h: Add lbasename.
+
+2001-03-06  Zack Weinberg  <zackw@stanford.edu>
+
+	* libiberty.h: Prototype C_alloca; define alloca to either
+	__builtin_alloca or C_alloca as appropriate.
+
+2001-03-01  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* safe-ctype.h (_sch_test): Cast enum bit to unsigned short int for pcc
+	compatibility.
+
+2001-02-18  lars brinkhoff  <lars@nocrew.org>
+
+	* dis-asm.h: Add PDP-11 target.
+
+2001-02-09  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* dis-asm.h: Add linux target for S/390.
+
+2001-01-11  Peter Targett  <peter.targett@arccores.com>
+
+	* dis-asm.h (arc_get_disassembler): Correct declaration.
+
+2001-01-09  Philip Blundell  <philb@gnu.org>
+
+	* bin-bugs.h (REPORT_BUGS_TO): Set to `bug-binutils@gnu.org'.
+
+2000-12-18  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* COPYING: Update to current
+	ftp://ftp.gnu.org/pub/gnu/Licenses/COPYING-2.0 (fixes references
+	to 19yy as example year in copyright notice).
+
+2000-12-19  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* dis-asm.h (struct disassemble_info): New member "section".
+	(INIT_DISASSEMBLE_INFO_NO_ARCH): Initialize private_data member.
+	Initialize section member.
+
+2000-12-16  Herman A.J. ten Brugge  <Haj.Ten.Brugge@net.HCC.nl>
+
+	* safe-ctype.h: Make code work on all targets and not just on
+	targets where a char is 8 bits.
+
+2000-12-10  Fred Fish  <fnf@be.com>
+
+	* bfdlink.h (struct bfd_link_info): Add new allow_shlib_undefined
+	member to struct for systems where it is normal to have undefined
+	symbols in shared libraries at runtime and the runtime linker
+	takes care of redirecting them.
+
+2000-12-07  Zack Weinberg  <zack@wolery.stanford.edu>
+
+	* safe-ctype.h: New file.
+
+2000-12-06  Rodney Brown  <RodneyBrown@mynd.com>
+
+	* getopt.h obstack.h: Standarize copyright statement.
+
+2000-12-04  Richard Henderson  <rth@redhat.com>
+
+	* demangle.h: Change "new_abi" to "v3" everywhere.
+
+2000-11-22  Zack Weinberg  <zack@wolery.stanford.edu>
+
+	* libiberty.h: Move #includes to top.  Prototype xmalloc_failed.
+
+2000-11-15  Kenneth Block  <kenneth.block@compaq.com>
+
+	* demangle.h: Add gnat and java demangle styles.
+
+2000-11-04  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* hashtab.h (struct htab): Add member return_allocation_failure.
+	(htab_try_create): New prototype.  Mention which functions may
+	return NULL when this is used.
+
+2000-11-03  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* hashtab.h: Change void * to PTR where necessary.
+
+2000-10-11  Mark Mitchell  <mark@codesourcery.com>
+
+	* splay-tree.h (splay_tree_predecessor): Declare.
+
+2000-09-29  Hans-Peter Nilsson  <hp@axis.com>
+
+	* dis-asm.h: Declare cris_get_disassembler, not print_insn_cris.
+	Fix typo in comment.
+
+2000-09-28  John David Anglin <dave@hiauly1.hia.nrc.ca>
+
+	* alloca-conf.h: New file (copied from libiberty).
+
+2000-09-05  John David Anglin <dave@hiauly1.hia.nrc.ca>
+
+	* md5.h (md5_uint32): Choose via INT_MAX instead of UINT_MAX.
+
+2000-09-04  Alex Samuel  <samuel@codesourcery.com>
+
+	* dyn-string.h: Adjust formatting.
+	(dyn_string_insert_char): New macro.  New declaration.
+
+2000-08-28  Jason Merrill  <jason@redhat.com>
+
+	* md5.h: New file.
+
+2000-08-24  Greg McGary  <greg@mcgary.org>
+
+	* libiberty.h (ARRAY_SIZE): New macro.
+
+2000-07-29  Nick Clifton  <nickc@cygnus.com>
+
+	* os9k.h: Add copyright notice.
+	Fix formatting.
+
+2000-07-22  Jason Eckhardt  <jle@cygnus.com>
+
+	* dis-asm.h (print_insn_i860): Add prototype.
+
+2000-07-20  H.J. Lu  <hjl@gnu.org>
+
+	* bfdlink.h (bfd_link_info): Add new_dtags.
+
+2000-07-20  Hans-Peter Nilsson  <hp@axis.com>
+
+	* dis-asm.h (print_insn_cris): Declare.
+
+2000-07-19  H.J. Lu  (hjl@gnu.org)
+
+	* bfdlink.h (bfd_link_info): Add flags and flags_1.
+
+2000-06-05  DJ Delorie  <dj@redhat.com>
+
+	* MAINTAINERS: new
+
+2000-06-21  Alex Samuel  <samuel@codesourcery.com>
+
+	* dyn-string.h (dyn_string_init, dyn_string_new,
+	dyn_string_delete, dyn_string_release, dyn_string_resize,
+	dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
+	dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
+	dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
+	dyn_string_append_char, dyn_string_substring_dyn_string_eq):
+	Define as same name with __cxa_ prepended, if IN_LIBGCC2.
+	(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
+	dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
+	dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
+	dyn_string_append_char, dyn_string_substring): Change return type
+	to int.
+
+2000-06-18  Stephane Carrez  <stcarrez@worldnet.fr>
+
+	* dis-asm.h (print_insn_m68hc12): Define.
+	(print_insn_m68hc11): Likewise.
+
+2000-06-18  Nick Clifton  <nickc@redhat.com>
+
+	* os9k.h: Change values of MODSYNC and CRCCON due to bug report
+	from Russ Magee <rmagee@home.com>.
+
+2000-06-07  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* demangle.h (demangling_styles): Remove trailing comma in enum.
+
+	* dyn-string.h (dyn_string_append_char): Change parameter from
+	char to int.
+
+2000-06-04  Alex Samuel  <samuel@codesourcery.com>
+
+	* dyn-string.h: Move here from gcc/dyn-string.h.  Add new functions.
+
+	* demangle.h (DMGL_GNU_NEW_ABI): New macro.
+	(DMGL_STYLE_MASK): Or in DMGL_GNU_NEW_ABI.
+	(current_demangling_style): Add gnu_new_abi_demangling.
+	(GNU_NEW_ABI_DEMANGLING_STYLE_STRING): New macro.
+	(GNU_NEW_ABI_DEMANGLING): Likewise.
+	(cplus_demangle_new_abi): New declaration.
+
+Tue May 30 16:53:34 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* floatformat.h (struct floatformat): Add field name.
+
+2000-05-26  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* filenames.h: New file.
+	(HAVE_DOS_BASED_FILE_SYSTEM, IS_DIR_SEPARATOR)
+	(IS_ABSOLUTE_PATH, FILENAME_CMP): New macros.
+
+2000-05-23  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* getopt.h (getopt): Also check HAVE_DECL_* when prototyping.
+
+	* libiberty.h (basename): Likewise.
+
+2000-05-17  S. Bharadwaj Yadavalli  <sby@scrugs.lkg.dec.com>
+	    Rick Gorton             <gorton@scrugs.lkg.dec.com>
+
+	* bfdlink.h (struct bfd_link_info): Add emitrelocations flag.
+
+2000-05-08  Alan Modra  <alan@linuxcare.com.au>
+
+	* dis-asm.h (print_insn_tic54x): Declare.
+
+2000-05-06  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* ansidecl.h: #define __extension__ to nothing if
+	GCC_VERSION < 2008.
+
+2000-05-04  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* demangle.h (demangler_engine): Constify.
+
+Thu May  4 17:15:26 2000  Philippe De Muyter  <phdm@macqel.be>
+
+	* sort.h (sys/types.h): File included unconditionnaly.
+	(stddef.h): File include only #ifdef __STDC__.
+
+2000-05-03  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* symcat.h: Remove #endif label.
+
+2000-04-28  Kenneth Block  <block@zk3.dec.com>
+	    Jason Merrill  <jason@casey.cygnus.com>
+
+	* demangle.h (libiberty_demanglers): new table for different styles.
+	(cplus_demangle_set_style): New function for setting style.
+	(cplus_demangle_name_to_style): New function to translate name.
+
+2000-04-24  Mark Mitchell  <mark@codesourcery.com>
+
+	* hashtab.h (hash_pointer): Declare.
+	(eq_pointer): Likewise.
+
+2000-04-23  Mark Mitchell  <mark@codesourcery.com>
+
+	* sort.h: New file.
+
+Fri Apr 21 13:20:53 2000  Richard Henderson  <rth@cygnus.com>
+			  David Mosberger  <davidm@hpl.hp.com>
+
+	* dis-asm.h (print_insn_ia64): Declare.
+
+Tue Apr 18 16:22:30 2000  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
+
+	* hashtab.h (enum insert_option): New type.
+	(htab_find_slot, htab_find_slot_with_hash): Use it.
+
+2000-04-17  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* symcat.h: Honor autoconf macro HAVE_STRINGIZE.  Add
+	comments/caveats with regard to traditional C behavior.
+
+2000-04-05  Richard Henderson  <rth@cygnus.com>
+
+	* splay-tree.h (splay_tree_remove): Declare.
+
+2000-04-04  Alan Modra  <alan@linuxcare.com.au>
+
+	* bin-bugs.h (REPORT_BUGS_TO): Remove translated part.
+
+2000-04-03  Alan Modra  <alan@linuxcare.com.au>
+
+	* bin-bugs.h: New file.
+
+2000-03-30  Mark Mitchell  <mark@codesourcery.com>
+
+	* hashtab.h (hashval_t): New type.
+	(htab_find_with_hash): Use it as an argument.
+	(htab_find_slot_with_hash): Likewise.
+
+2000-03-27  Denis Chertykov  <denisc@overta.ru>
+
+	* dis-asm.h (print_insn_avr): Declare.
+
+2000-03-14  Bernd Schmidt  <bernds@cygnus.co.uk>
+
+	* hashtab.h (htab_trav): Modify type so that first arg is of type
+	void **.
+	(htab_find_with_hash, htab_find_slot_with_hash): Declare new
+	functions.
+
+2000-03-09  Alex Samuel  <samuel@codesourcery.com>
+
+	* partition.h: New file.
+
+2000-03-09  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* hashtab.h (struct htab): Add del_f.
+	(htab_del): New type.
+	(htab_create): Add fourth argument.
+
+2000-03-08  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* hashtab.h (hash_table_t): Rename to htab_t.
+	(struct hash_table): Rename to struct htab.  Shorten element
+	names.  Reorder elements by size.
+	(htab_hash, htab_eq, htab_trav): New typedefs for the callback
+	function pointers.
+	(hash_table_entry_t): Discard; just use void * for element
+	type.
+
+2000-03-01  H.J. Lu  <hjl@gnu.org>
+
+	* bfdlink.h (bfd_link_callbacks): Add a boolean arg to
+	the undefined_symbol callback.
+
+2000-02-23  Linas Vepstas <linas@linas.org>
+
+	* dis-asm.h (print_insn_i370): Declare.
+
+Tue Feb 22 15:19:54 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* remote-sim.h (sim_trace): Document return values.
+	(sim_set_trace): Declare.  Deprecate.
+
+2000-02-21  Alan Modra  <alan@spri.levels.unisa.edu.au>
+
+	* dis-asm.h (struct disassemble_info): Change `length' param of
+	read_memory_func to unsigned.  Change type of `buffer_length' and
+	`octets_per_byte' to unsigned.
+	(buffer_read_memory): Change `length' param to unsigned.
+
+2000-02-16  Nick Clifton  <nickc@cygnus.com>
+
+	* dis-asm.h: Add prototypes for ARM register name functions.
+
+Wed Feb  9 18:45:49 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* wait.h: Delete. No longer used by GDB.
+
+Tue Feb  8 17:01:13 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* remote-sim.h (sim_resume): Clarify use of SIGGNAL.
+	(sim_stop_reason): Clarify meaning of sim_signalled.
+
+2000-02-03  Timothy Wall <twall@redhat.com>
+
+	* dis-asm.h (struct disassemble_info): Added octets_per_byte
+	field and initialize it to one (1).
+
+2000-01-27  Nick Clifton  <nickc@redhat.com>
+
+	* dis-asm.h: Add prototype for disassembler_usage().
+	Add prototype for arm_disassembler_options().
+	Remove prototype for arm_toggle_regnames().
+	Add prototype for parse_arm_disassembler_option().
+
+Sat Jan  1 19:06:52 2000  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* symcat.h (STRINGX) [!__STDC__ || ALMOST_STDC]: Change "?" to "s"
+	to stringify argument s.
+
+Wed Dec 15 11:22:56 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* hp-symtab.h (HP_LANGUAGE_FORTRAN): New enumeration constant.
+	(HP_LANGUAGE_F77): Define using HP_LANGUAGE_FORTRAN.
+
+1999-12-15  Doug Evans  <dje@transmeta.com>
+
+	* dis-asm.h: Enclose in extern "C" ifdef __cplusplus.
+
+1999-12-05  Mark Mitchell  <mark@codesourcery.com>
+
+	* splay-tree.h (struct splay_tree_node): Rename to ...
+	(struct splay_tree_node_s): ... this.
+	(struct splay_tree): Rename to ...
+	(struct splay_tree_s): ... this.
+
+1999-11-30  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* ansidecl.h (ATTRIBUTE_MALLOC): New macro.
+
+	* libiberty.h (buildargv, dupargv, concat, choose_temp_base,
+	make_temp_file, xmalloc, xcalloc, xstrdup, xmemdup): Add
+	ATTRIBUTE_MALLOC.
+	(xatexit): Remove __GNUC__ check, add ATTRIBUTE_NORETURN.
+
+1999-11-28  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h: Include stdarg.h when ANSI_PROTOTYPES is defined.
+	(asprintf, vasprintf): Provide declarations.
+
+Wed Nov 10 12:43:21 1999  Philippe De Muyter  <phdm@macqel.be>
+			  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* ansidecl.h: Define and test `GCC_VERSION', not `HAVE_GCC_VERSION'.
+
+1999-11-04      Jimmy Guo       <guo@cup.hp.com>
+
+	* hp-symtab.h (dntt_type_fparam): Add doc_ranges, misc_kind
+	fields, change location type to CORE_ADDR from int.
+	(dntt_type_const): Name the 5th field location_type.
+
+Sun Oct 24 19:11:32 1999  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* sim-d10v.h (SIM_D10V_TS2_DMAP_REGNUM): Define.
+
+1999-10-23 08:51 -0700  Zack Weinberg  <zack@bitmover.com>
+
+	* hashtab.h: Give hash_table_t a struct tag.  Add prototypes
+	for clear_hash_table_slot and traverse_hash_table.  Correct
+	prototype of all_hash_table_collisions.
+
+Sat Oct 23 19:00:13 1999  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* sim-d10v.h: New file.
+
+Fri Oct 15 01:47:51 1999  Vladimir Makarov  <vmakarov@loony.cygnus.com>
+
+	* hashtab.h: New file.
+
+1999-10-10  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* ansidecl.h (HAVE_GCC_VERSION): New macro.  Use it instead of
+	explicitly testing __GNUC__ and __GNUC_MINOR__.
+
+	(ATTRIBUTE_PRINTF): Use `__format__', not `format'.
+
+1999-09-25  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h (make_temp_file):  Add a prototype.
+
+Tue Sep 14 00:35:02 1999  Marc Espie <espie@cvs.openbsd.org>
+
+	* libiberty.h (basename):  OpenBSD has a correct prototype.
+	(xrealloc):  Remove outdated comment.
+
+1999-09-07  Jeff Garzik  <jgarzik@pobox.com>
+
+	* libiberty.h (xmemdup): Add prototype for new function.
+
+1999-09-04  Steve Chamberlain  <sac@pobox.com>
+
+	* dis-asm.h (print_insn_pj): Declare.
+
+1999-09-01  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* obstack.h (obstack_grow, obstack_grow0): Move (char*) casts
+	in calls to `_obstack_memcpy' from here ...
+
+	(_obstack_memcpy): ... to here, except in the __STDC__ case which
+	doesn't need it.
+
+1999-08-30  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h (getpwd): Prototype.
+
+1999-08-01  Mark Mitchell  <mark@codesourcery.com>
+
+	* splay-tree.h (splay_tree_insert): Return the new node.
+
+1999-07-11  Ian Lance Taylor  <ian@zembu.com>
+
+	* ansidecl.h: Copy attribute support macros from egcs.
+
+1999-06-22  Mark Mitchell  <mark@codesourcery.com>
+
+	* bfdlink.h (struct bfd_link_hash_entry): Add init_function and
+	fini_function.
+
+1999-06-20  Mark Mitchell  <mark@codesourcery.com>
+
+	* mips.h (Elf32_Internal_Msym): New structure.
+	(Elf32_External_Msym): Likewise.
+	(ELF32_MS_REL_INDEX): New macro.
+	(ELF32_MS_FLAGS): Likewise.
+	(ELF32_MS_INFO): Likewise.
+
+1999-06-14  Nick Clifton  <nickc@cygnus.com>
+
+	* dis-asm.h (arm_toggle_regnames): New prototype.
+	(struct diassemble_info): New field: disassembler_options.
+
+1999-04-11  Richard Henderson  <rth@cygnus.com>
+
+	* bfdlink.h (bfd_elf_version_expr): Rename `match' to `pattern'.
+	Add `match' callback function.
+
+1999-04-10  Richard Henderson  <rth@cygnus.com>
+
+	* bfdlink.h (bfd_link_info): Add no_undefined.
+
+1999-04-08  Nick Clifton  <nickc@cygnus.com>
+
+	* dis-asm.h: Add prototype for print_insn_mcore.
+
+1999-04-02  Mark Mitchell  <mark@codesourcery.com>
+
+	* splay-tree.h (splay_tree_compare_pointers): Declare.
+
+1999-03-30  Mark Mitchell  <mark@codesourcery.com>
+
+	* splay-tree.h (splay_tree_compare_ints): Declare.
+
+Wed Mar 24 12:46:29 1999  Andrew Cagney  <cagney@amy.cygnus.com>
+
+	* libiberty.h (basename): Cygwin{,32} should have the prototype.
+
+1999-02-22  Jim Lemke  <jlemke@cygnus.com>
+
+	* bfdlink.h (bfd_link_info): add field "mpc860c0".
+
+Mon Feb  1 21:05:46 1999  Catherine Moore  <clm@cygnus.com>
+
+	* dis-asm.h (print_insn_i386_att):  Declare.
+	(print_insn_i386_intel):  Declare.
+
+1998-12-30  Michael Meissner  <meissner@cygnus.com>
+
+	* dis-asm.h (INIT_DISASSEMBLE_INFO_NO_ARCH): Cast STREAM and
+	FPRINTF_FUNC to avoid compiler warnings.
+
+Wed Dec 30 16:07:14 1998  David Taylor  <taylor@texas.cygnus.com>
+
+	* dis-asm.h: change void * to PTR (two places).
+
+Mon Dec 14 09:53:31 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* demangle.h: Don't check IN_GCC anymore.
+	* splay-tree.h: Likewise.
+
+Tue Dec  8 00:30:31 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
+
+	The following changes were made by Elena Zannoni
+	<ezannoni@kwikemart.cygnus.com> and Edith Epstein
+	<eepstein@sophia.cygnus.com> as part of a project to merge in
+	changes made by HP; HP did not create ChangeLog entries.
+
+	* dis-asm.h (struct disassemble_info): change the type of stream
+	from FILE* to void*, for use with gdb's new type GDB_FILE.
+	(fprintf_ftype): change FILE* parameter type to void*.
+
+	* demangle.h: (DMGL_EDG): new macro for Kuck and Associates
+	(DMGL_STYLE_MASK): modify to include Kuck and Assoc style
+	(demangling_styles): add new edg_demangling style
+	(EDG_DEMANGLING_STYLE_STRING): new macro
+	(EDG_DEMANGLING): new macro
+	(DMGL_HP): new macro, for HP/aCC compiler.
+	(DMGL_STYLE_MASK): modify to include new HP's style.
+	(demangling_styles): add new hp_demangling value.
+	(HP_DEMANGLING_STYLE_STRING): new macro.
+	(ARM_DEMANGLING): coerce to int.
+	(HP_DEMANGLING): new macro.
+
+	* hp-symtab.h: rewritten, from HP.
+	(quick_procedure): change type of language field to unsigned int
+	(quick_module): change type of language field to unsigned int
+	(struct dntt_type_svar): add field thread_specific.
+	(hp_language): add languages modcal and dmpascal.
+
+Fri Nov 20 13:14:00 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* libiberty.h (basename): Add prototype for FreeBSD.
+
+Fri Nov 13 19:19:11 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* libiberty.h: Prototype xcalloc.
+
+Sun Nov  8 17:42:25 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* ansidecl.h: Wrap problematic macros with !IN_GCC.
+
+	* demangle.h: Never define PARAMS().
+	* splay-tree.h: Likewise.
+
+Sat Nov  7 18:30:20 1998  Peter Schauer  <peter.schauer@regent.e-technik.tu-muenchen.de>
+
+	* dis-asm.h (print_insn_vax): Declare.
+
+Sat Nov  7 16:04:03 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* demangle.h: Don't include gansidecl.h.
+	* splay-tree.h: Likewise.
+
+1998-10-26 16:03  Ulrich Drepper  <drepper@cygnus.com>
+
+	* bfdlink.h (struct bfd_link_info): Add new field optimize.
+
+Thu Oct 22 19:58:00 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* splay-tree.h: Wrap function pointer parameter declarations in
+	PARAMS() macro.
+
+1998-10-21  Mark Mitchell  <mark@markmitchell.com>
+
+	* splay-tree.h: New file.
+
+Fri Oct  9 00:02:03 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* Merge devo and egcs include directories.
+
+Sat Sep  5 12:16:33 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* getopt.h, obstack.h: Updated from gcc.
+
+1998-08-03  Jason Molenda  (jsm@bugshack.cygnus.com)
+
+	* libiberty.h (xexit): Change decl to use modern GCC attribute
+	to indicate exit does not return.
+
+Mon Jun  1 13:48:32 1998  Jason Molenda  (crash@bugshack.cygnus.com)
+
+	* obstack.h: Update to latest FSF version.
+
+Tue Feb 24 13:05:02 1998  Doug Evans  <devans@canuck.cygnus.com>
+
+	* dis-asm.h (disassemble_info): Member `symbol' renamed to `symbols'
+	and made an "asymbol **".  New member num_symbols.
+	(INIT_DISASSEMBLE_INFO_NO_ARCH): Update.
+
+Tue Feb 17 12:32:18 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* remote-sim.h (sim_fetch_register, sim_store_register): Add
+	register length parameter.  Functions return actual length of
+	register.
+
+Thu Feb 12 16:29:01 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* getopt.h: Update to latest FSF version.
+
+Wed Feb 11 16:56:06 1998  Doug Evans  <devans@canuck.cygnus.com>
+
+	* symcat.h: New file.
+
+Mon Feb  2 17:13:31 1998  Steve Haworth  <steve@pm.cse.rmit.EDU.AU>
+
+	* dis-asm.h (print_insn_tic30): Declare.
+
+Thu Jan 22 16:23:59 1998  Fred Fish <fnf@cygnus.com>
+
+	* dis-asm.h: Add flag INSN_HAS_RELOC to tell disassembly
+	function there is a reloc on this line.
+
+Mon Dec  8 11:22:23 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* dis-asm.h: Remove prototype of disasm_symaddr() as this function
+	no longer exists.
+
+Tue Dec  2 10:20:53 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* dis-asm.h (disasm_symaddr): New prototype.
+
+Mon Dec  1 11:29:35 1997  Doug Evans  <devans@canuck.cygnus.com>
+
+	* callback.h (CB_SYSCALL): Comment out arg names in prototypes.
+
+Wed Nov 26 16:47:58 1997  Michael Meissner  <meissner@cygnus.com>
+
+	* callback.h (CB_SYSCALL): Consistantly use names for prototype
+	arguments.
+
+Wed Nov 26 11:39:30 1997  Doug Evans  <devans@canuck.cygnus.com>
+
+	* callback.h (CB_SYSCALL): Change byte count arguments to
+	{read,write}_mem to `int'.  New member `magic'.
+	(CB_SYSCALL_MAGIC,CB_SYSCALL_INIT): New macros.
+
+Tue Nov 25 01:35:52 1997  Doug Evans  <devans@seba.cygnus.com>
+
+	* callback.h (struct stat): Move forward decl up.
+	(host_callback): Pass stat struct pointer to stat,fstat.
+	(CB_SYS_nnn): Reorganize.
+	(CB_SYSCALL): New members p1,p2.
+	(cb_host_to_target_stat): Delete fourth arg.
+
+Sat Nov 22 23:34:15 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* remote-sim.h (sim_stop_reason): Clarify sim_signalled SIGRC
+	argument.
+
+Mon Nov 17 14:00:51 1997  Doug Evans  <devans@seba.cygnus.com>
+
+	* callback.h (CB_TARGET_DEFS_MAP): Renamed from target_defs_map.
+	(host_callback): Add stat, fstat, syscall_map, errno_map, open_map,
+	signal_map, stat_map.
+	(errn_map,open_map): Renamed to cb_init_foo_map.
+	(cb_host_to_target_errno,cb_target_to_host_open): Renamed from
+	host_to_target_errno,target_to_host_open.
+	(cb_read_target_syscall_maps): Add prototype.
+	(cb_target_to_host_syscall): Likewise.
+	(cb_host_to_target_stat): Likewise.
+	(cb_syscall): Likewise.
+	(CB_SYS_{exit,open,close,read,write,lseek,unlink,getpid,kill,fstat,
+	argvlen,argv,chdir,stat,chmod,utime,time}): Define.
+	(CB_SYSCALL): New type.
+	(CB_RC): New enum.
+
+Fri Nov  7 10:34:09 1997  Rob Savoye  <rob@darkstar.cygnus.com>
+
+	* libiberty.h: Add extern "C" { so it can be used with C++
+	programs.
+	* remote-sim.h:  Add extern "C" { so it can be used with C++
+	programs.
+
+Tue Oct 14 16:07:51 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* dis-asm.h (struct disassemble_info): New field
+	'symbol_at_address_func'.
+	(INIT_DISASSEMBLE_INFO_NO_ARCH): Initialise new field with
+	generic_symbol_at_address.
+
+Mon Oct 13 10:17:15 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* remote-sim.h: Clarify sim_read, sim_write MEM argument.
+
+Wed Sep 24 18:03:10 1997  Stu Grossman  <grossman@babylon-5.cygnus.com>
+
+	* remote-sim.h (SIM_RC):  Add a bunch of new return codes for
+	breakpoint stuff.
+	* Add functions to tell the simulator to set/clear/enable/disable
+	intrinsic breakpoints.
+
+Thu Aug 28 19:41:42 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* libiberty.h (dupargv): Add prototype.
+
+Tue Aug 26 12:25:49 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* remote-sim.h (sim_create_inferior): Add ABFD arg. Document.
+
+Mon Aug 25 10:50:51 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* remote-sim.h (sim_open): Add ABFD arg. Document.
+
+Fri Aug  8 16:43:56 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* dis-asm.h (arc_get_disassembler): Declare.
+
+Wed Jul 30 11:39:50 1997  Per Bothner  <bothner@deneb.cygnus.com>
+
+	* demangle.h (DMGL_JAVA):  New option to request Java demangling.
+
+Tue Jul 22 17:59:54 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libiberty.h (PEXECUTE_*): Define.
+	(pexecute, pwait): Declare.
+
+Fri Jun  6 13:02:33 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* remote-sim.h (sim_kill): Mark as depreciated.
+
+Fri May 23 13:43:41 1997  Fred Fish  <fnf@cygnus.com>
+
+	* bfdlink.h (struct bfd_link_info): Add task_link member.
+
+Thu May 22 11:32:49 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* remote-sim.h: Review documentation.  Clarify restrictions on
+	when functions can be called.
+
+Wed May 21 16:47:53 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* remote-sim.h (sim_set_profile_size): Add prototype, document as
+	depreciated.
+
+Tue May 20 09:32:22 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* remote-sim.h (sim_open): Add callback struct.
+	(sim_set_callbacks): Drop SIM_DESC argument. Document.
+	(sim_size): Remove recently added SIM_DESC argument. Document.
+
+Mon May 19 19:14:44 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* remote-sim.h: Pass SD into sim_size.
+
+Thu May 15 01:24:16 1997  Mark Alexander  <marka@cygnus.com>
+
+	* obstack.h (obstack_specify_allocation_with_arg, obstack_chunkfun,
+	obstack_freefun): Eliminate compile warnings in gdb.
+
+Tue Apr 22 10:24:34 1997  Fred Fish  <fnf@cygnus.com>
+
+	* floatformat.h (floatformat_byteorders): Add comments for previous
+	formats and add floatformat_littlebyte_bigword, primarily for ARM.
+	Add declaration for floatformat_ieee_double_littlebyte_bigword.
+
+Fri Apr 18 13:04:49 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* remote-sim.h (sim_stop): New interface - asynchronous
+	notification of a request to stop / suspend the running
+	simulation.
+
+	* remote-sim.h (enum sim_stop): Add sim_running and sim_polling as
+	states for use internal to simulators.
+
+	* callback.h (struct host_callback_strut): Put a magic number at
+	the end of the struct to allow basic checking.
+	(struct host_callback_struct ): Add poll_quit - so
+	that the console etc can be polled at regular intervals.
+
+Thu Apr 17 02:17:12 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* remote-sim.h (struct _bfd): Declare.
+	(sim_load): Return SIM_RC.  New arg `abfd'.
+	(sim_create_inferior): Return SIM_RC.  Delete arg `start_address'.
+
+Wed Apr  2 17:09:12 1997  Andrew Cagney  <cagney@kremvax.cygnus.com>
+
+	* remote-sim.h (sim_trace, sim_size): Make these global.  They
+	will go away shortly.
+
+Wed Apr  2 15:23:49 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* remote-sim.h (SIM_OPEN_KIND, SIM_RC): New enums.
+	(sim_open): New argument `kind'.
+
+Wed Apr  2 14:45:51 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* COPYING: Update FSF address.
+
+Fri Mar 28 15:29:54 1997  Mike Meissner  <meissner@cygnus.com>
+
+	* callback.h (top level): Include stdarg.h or varargs.h if
+	va_start is not defined.
+	(host_callback_struct): Make {,e}vprintf_filtered take a va_list
+	instead of void *, since va_list might be an array or structure
+	type.
+
+Fri Mar 28 15:44:41 1997  H.J. Lu  <hjl@gnu.ai.mit.edu>
+
+	* libiberty.h (basename): Add prototype for glibc and linux.
+
+Mon Mar 17 19:22:12 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objalloc.h: New file.
+
+Mon Mar 17 14:57:55 1997  Andrew Cagney  <cagney@kremvax.cygnus.com>
+
+	* remote-sim.h: New file, copied in from gdb/remote-sim.h.  One
+	day this will be placed in a directory of its own.
+
+Sat Mar 15 19:00:14 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* obstack.h: Update to current FSF version.
+
+Thu Mar  6 15:46:59 1997  Andrew Cagney  <cagney@kremvax.cygnus.com>
+
+	* callback.h (struct host_callback_struct): Add callbacks -
+	flush_stdout, write_stderr, flush_stderr, vprintf_filtered,
+	evprintf_filtered.  Delete redundant callbacks - printf_filtered.
+
+Thu Feb 27 23:18:27 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfdlink.h (struct bfd_link_info): Remove lprefix and lprefix_len
+	fields.
+
+Tue Feb 25 00:10:49 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* dis-asm.h (INIT_DISASSEMBLE_INFO_NO_ARCH): Initialize
+	bytes_per_chunk and display_endian.
+
+Mon Feb 24 17:47:02 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	From Eric Youngdale <eric@andante.jic.com>:
+	* bfdlink.h (struct bfd_elf_version_expr): Define.
+	(struct bfd_elf_version_deps): Define.
+	(struct bfd_elf_version_tree): Define.
+
+Thu Feb  6 14:20:01 1997  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* dis-asm.h: (disassemble_info):  Add new fields
+	bytes_per_chunk and display_endian to control the
+	display of raw instructions.
+
+Fri Dec 27 22:17:37 1996  Fred Fish  <fnf@cygnus.com>
+
+	* dis-asm.h (print_insn_tic80): Declare.
+
+Sun Dec  8 17:11:12 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* callback.h (host_callback): New member `error'.
+
+Wed Nov 20 00:40:23 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* callback.h: New file, moved here from gdb.
+
+Mon Nov 18 16:34:00 1996  Dawn Perchik  <dawn@critters.cygnus.com>
+
+	* libiberty.h: Checkin again; last checkin failed due to sticky tag.
+
+Wed Nov 13 08:22:00 1996  Dawn Perchik  <dawn@critters.cygnus.com>
+
+	* libiberty.h: Revert last commit due to conflicts with hpux
+	system headers.
+
+Tue Nov 12 16:31:00 1996  Dawn Perchik  <dawn@critters.cygnus.com>
+
+	* libiberty.h: Move prototypes from argv.c here.
+
+Thu Oct 31 14:56:18 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* ansidecl.h (VPARAMS,VA_START): Define.
+
+Fri Oct 25 12:08:04 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* dis-asm.h (disassemble_info): Add bytes_per_line field.
+	(INIT_DISASSEMBLE_INFO_NO_ARCH): Initialize bytes_per_line field.
+
+Thu Oct 24 17:10:01 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* dis-asm.h (disassemble_info): Add symbol field.
+	(INIT_DISASSEMBLE_INFO_NO_ARCH): Initialize symbol field.
+
+Thu Oct 17 11:17:40 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* dis-asm.h (print_insn_m32r): Declare.
+
+Mon Oct 14 23:56:52 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libiberty.h: Declare parameter types for xmalloc and xrealloc.
+
+Thu Oct  3 13:45:27 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* fnmatch.h: New file.
+
+Thu Oct  3 10:33:14 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* dis-asm.h (print_insn_mn10x00): Delete declaration.
+	(print_insn_mn10200, print_insn_mn10300): Declare.
+
+Wed Oct  2 21:24:43 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* dis-asm.h (print_insn_mn10x00): Declare.
+
+Mon Sep 30 13:56:11 1996  Fred Fish  <fnf@cygnus.com>
+
+	* libiberty.h: Remove #ifndef PRIVATE_XMALLOC.
+
+Sat Aug 31 13:27:06 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* dis-asm.h (print_insn_v850): Declare.
+
+Tue Aug 13 16:10:30 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* obstack.h:  Change bcopy to memcpy.  Works better on Posix
+	systems, which generally lack bcopy.
+
+Mon Aug 12 17:03:18 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* ansidecl.h:  Change WIN32 to _WIN32.
+
+Fri Jul 26 13:58:18 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* dis-asm.h: Add flavour field.
+	(print_insn_alpha): Declare.
+	(print_insn_alpha_osf, print_insn_alpha_vms): Don't declare.
+	(INIT_DISASSEMBLE_INFO): Initialize flavour field.
+
+Tue Jul 23 17:37:58 1996  Fred Fish  <fnf@cygnus.com>
+
+	* libiberty.h (PRIVATE_XMALLOC): Enclose xmalloc/xrealloc
+	definitions inside #ifndef so that programs that want to
+	can define PRIVATE_XMALLOC and then define xmalloc and
+	xrealloc anyway they want.
+	(basename): Document in source that we can't declare the
+	parameter type because it is declared inconsistently across
+	different systems.
+
+Mon Jul 22 13:16:13 1996  Richard Henderson  <rth@tamu.edu>
+
+	* dis-asm.h (print_insn_alpha): Don't declare.
+	(print_insn_alpha_osf, print_insn_alpha_vms): Declare.
+
+Wed Jul 17 14:45:12 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* dis-asm.h: (print_insn_d10v): Declare.
+
+Mon Jul 15 16:55:38 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* dis-asm.h:  Get rid of decls for print_insn_i8086,
+	print_insn_sparc64 and print_insn_sparclite.
+	* (INIT_DISASSEMBLE_INFO):  Split into two pieces.  One,
+	INIT_DISASSEMBLE_INFO_NO_ARCH inits everything except for endian,
+	mach, and arch.
+
+Fri Jul 12 10:19:27 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* dis-asm.h (print_insn_i8086):  Declare.
+
+Wed Jul  3 16:02:39 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* dis-asm.h (print_insn_sparclite):  Declare.
+
+Tue Jun 18 16:02:46 1996  Jeffrey A. Law  <law@rtl.cygnus.com>
+
+	* dis-asm.h (print_insn_h8300s): Declare.
+
+Tue Jun 18 15:11:33 1996  Klaus Kaempf  <kkaempf@progis.de>
+
+	* fopen-vms.h: New file.
+
+Tue Jun  4 18:58:16 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfdlink.h (struct bfd_link_info): Add notice_all field.
+
+Fri Apr 26 10:33:12 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* demangle.h (#ifdef IN_GCC): #include "gansidecl.h".
+	(PROTO,PTR,const): Delete.
+
+Mon Apr 22 17:27:42 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfdlink.h (struct bfd_link_info): Add traditional_format field.
+
+Mon Apr 15 15:16:56 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* libiberty.h (choose_temp_base): Add prototype.
+
+Tue Mar 12 17:29:46 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfdlink.h (bfd_wrapped_link_hash_lookup): Declare.
+	(struct bfd_link_info): Add wrap_hash field.
+
+Wed Feb 14 16:49:17 1996  Martin Anantharaman  <martin@mail.imech.uni-duisburg.de>
+
+	* ieee.h (ieee_record_enum_type): Define
+	ieee_external_reference_info_enum.
+
+Fri Feb  2 17:09:25 1996  Doug Evans  <dje@charmed.cygnus.com>
+
+	* dis-asm.h (DISASM_RAW_INSN): Delete.
+
+Tue Jan 23 09:21:47 1996  Doug Evans  <dje@charmed.cygnus.com>
+
+	* dis-asm.h (INIT_DISASSEMBLE_INFO): Set endian to BFD_ENDIAN_UNKNOWN.
+	New argument FPRINTF_FUNC.
+
+Mon Jan 22 16:37:59 1996  Doug Evans  <dje@charmed.cygnus.com>
+
+	* dis-asm.h (disassemble_info): New members arch, mach, endian.
+	(INIT_DISASSEMBLE_INFO): Initialize them.
+	(DISASM_RAW_INSN{,FLAG}): Define.
+
+Thu Jan 18 11:32:38 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* demangle.h (cplus_demangle_opname): Change opname parameter to
+	const char *.
+	(cplus_mangle_opname): Change return type and opname parameter to
+	const char *.
+
+Fri Jan  5 00:01:22 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ieee.h (enum ieee_record): Add ieee_asn_record_enum,
+	ieee_at_record_enum, ieee_ty_record_enum, ieee_atn_record_enum,
+	ieee_bb_record_enum, and ieee_be_record_enum.
+
+Wed Jan  3 13:12:09 1996  Fred Fish  <fnf@cygnus.com>
+
+	* obstack.h: Update copyright to 1996.
+	(_obstack_memory_used): Declare.
+	(obstack_memory_used): Define macro.
+
+Thu Dec 28 11:42:12 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libiberty.h (xstrdup): Declare.
+
+Thu Dec 21 14:47:17 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* wait.h: Protect all macros with #ifndef.
+
+Tue Oct 24 21:45:40 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfdlink.h (struct bfd_link_info): Add static_link field.
+
+Tue Sep 12 16:28:04 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfdlink.h (struct bfd_link_callbacks): Add symbol parameter to
+	warning callback.
+
+Fri Sep  1 13:11:51 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfdlink.h (struct bfd_link_callbacks): Change warning callback
+	to take BFD, section, and address arguments.
+
+Thu Aug 31 16:45:12 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* bfdlink.h (struct bfd_link_info): Remove PE stuff.
+
+Tue Aug 22 03:18:23 1995  Ken Raeburn  <raeburn@kr-laptop.cygnus.com>
+
+	* libiberty.h: Declare xstrerror.  From Pat Rankin.
+
+Mon Aug 21 18:11:36 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* bfdlink.h (struct bfd_link_info): Remove PE stuff.
+
+Wed Aug  2 08:14:12 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* dis-asm.h (print_insn_sparc64): Declare.
+
+Mon Jul 10 13:26:49 1995  Eric Youngdale  <eric@aib.com>
+
+	* bfdlink.h (struct bfd_link_info): Add new field symbolic.
+
+Sun Jul  2 17:48:40 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfdlink.h (struct bfd_link_info): Change type of base_file to
+	PTR.
+
+Thu Jun 29 00:02:45 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* bfdlink.h (struct bfd_link_info): Added base_file member.
+
+Tue Jun 20 16:40:04 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* ansidecl.h: win32s is ANSI enough.
+
+Thu May 18 04:25:50 1995  Ken Raeburn  <raeburn@kr-laptop.cygnus.com>
+
+	Wed May 10 14:28:16 1995 Richard Earnshaw (rearnsha@armltd.co.uk)
+
+	* dis-asm.h (print_insn_arm): Delete declaration.
+	(print_insn_{little,big}_arm): New declarations.
+
+	* floatformat.h (floatformat_arm_ext): Declare.
+
+Sat May 13 10:14:08 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* bfdlink.h (subsytem, stack_heap_parameters): New.
+
+Thu May  4 14:36:42 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* demangle.h: Don't include ansidecl.h if IN_GCC.
+
+Tue Feb 21 00:37:28 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* hp-symtab.h: Don't use bitfield enumerations, the HP C compiler
+	does not handle them correctly.
+
+Thu Feb  9 14:20:27 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libiberty.h (basename): Don't declare parameter type; some
+	systems have this in their header files.
+
+Wed Feb  8 17:35:38 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfdlink.h (struct bfd_link_hash_entry): Change format of common
+	symbol information, to remove restrictions on maximum size and
+	alignment power, by using a pointer to a structure instead.
+
+Mon Feb  6 14:55:32 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* bfdlink.h (enum bfd_link_hash_type): Rename bfd_link_hash_weak
+	to bfd_link_hash_undefweak.  Add bfd_link_hash_defweak.
+
+Mon Jan 16 21:00:23 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* dis-asm.h (GDB_INIT_DISASSEMBLE_INFO, etc): Remove all
+	GDB-specific definitions.
+
+Sun Jan 15 18:39:35 1995  Steve Chamberlain  <sac@splat>
+
+	* dis-asm.h (print_insn_w65): Declare.
+
+Thu Jan 12 17:51:17 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* libiberty.h (hex_p): Fix sense of test.
+
+Wed Jan 11 22:36:40 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* libiberty.h (_hex_array_size, _hex_bad, _hex_value, hex_init,
+	hex_p, hex_value): New macros and declarations, for hex.c.
+
+Fri Jan  6 17:44:14 1995  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* dis-asm.h: Make idempotent.
+
+Wed Dec 14 13:08:43 1994  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* progress.h: New file, empty definitions for progress macros.
+
+Fri Nov 25 00:14:05 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* hp-symtab.h: New file describing the debug symbols emitted
+	by the HP C compilers.
+
+Fri Nov 11 15:48:37 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* bfdlink.h (struct bfd_link_hash_entry): Change u.c.size from 24
+	to 26 bits, and change u.c.alignment_power from 8 to 6 bits.  6
+	bit in the alignment power is enough for a 64 bit address space.
+
+Mon Oct 31 13:02:51 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* demangle.h (cplus_mangle_opname): Declare.
+
+Tue Oct 25 11:38:02 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* bfdlink.h (struct bfd_link_callbacks): Fix comments for
+	multiple_common field.
+
+Sun Sep 04 17:58:10 1994  Richard Earnshaw (rwe@pegasus.esprit.ec.org)
+
+	* dis-asm.h: Add support for the ARM.
+
+Wed Aug 10 12:51:41 1994  Doug Evans  (dje@canuck.cygnus.com)
+
+	* libiberty.h (strsignal): Document its existence even if we
+	can't declare it.
+
+Tue Aug  2 14:40:03 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* os9k.h: Remove u_int16, u_int32, and owner_id typedefs and
+	expand their uses.  Those names conflict with Mach headers.
+
+Fri Jul 22 14:17:12 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* bfdlink.h (struct bfd_link_hash_entry): Change u.c.size into a
+	bitfield.  Add field u.c.alignment_power.
+
+Sun Jul 10 00:26:39 1994  Ian Dall  (dall@hfrd.dsto.gov.au)
+
+	* dis-asm.h: Add print_insn_ns32k declaration.
+
+Mon Jun 20 17:13:29 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* bfdlink.h (bfd_link_hash_table): Make creator a const pointer.
+
+Sat Jun 18 16:09:32 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* demangle.h (cplus_demangle_opname): Declare.
+
+Thu Jun 16 15:19:03 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* bfdlink.h (struct bfd_link_info): Add new field shared.
+
+Mon Jun  6 14:39:44 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* bfdlink.h (struct bfd_link_hash_entry): Remove written field:
+	not needed for all backends.
+
+Thu Apr 28 19:06:50 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* dis-asm.h (disassembler): Declare.
+
+Fri Apr  1 00:38:17 1994  Jim Wilson  (wilson@mole.gnu.ai.mit.edu)
+
+	* obstack.h: Delete use of IN_GCC to control whether
+	stddef.h or gstddef.h is included.
+
+Tue Mar 22 13:06:02 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* bfdlink.h (enum bfd_link_order_type): Add bfd_data_link_order.
+	(struct bfd_link_order): Add data field to union.
+
+Mon Mar 21 18:45:26 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* bfdlink.h (struct bfd_link_callbacks): Change bitsize argument
+	to add_to_set to reloc.  Remove bitsize argument from constructor.
+	Comment that reloc_overflow, reloc_dangerous and unattached_reloc
+	must handle NULL pointers for reloc location.
+	(enum bfd_link_order_type): Add bfd_section_reloc_link_order and
+	bfd_symbol_reloc_link_order.
+	(struct bfd_link_order): Add reloc field to union.
+	(struct bfd_link_order_reloc): Define.
+
+Mon Mar 14 12:27:50 1994  Ian Lance Taylor  (ian@cygnus.com)
+
+	* ieee-float.h: Removed; no longer used.
+
+Tue Mar  1 18:10:49 1994  Kung Hsu  (kung@mexican.cygnus.com)
+
+	* os9k.h: os9000 target specific header file, the header of the
+	object file is used now.
+
+Sun Feb 27 21:52:26 1994  Jim Kingdon  (kingdon@deneb.cygnus.com)
+
+	* floatformat.h: New file, intended to replace ieee-float.h.
+
+Sun Feb 20 17:15:42 1994  Ian Lance Taylor  (ian@lisa.cygnus.com)
+
+	* ansidecl.h (ANSI_PROTOTYPES): Define if using ANSI prototypes.
+
+Wed Feb 16 01:07:12 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* libiberty.h: Don't declare strsignal, to avoid conflicts with
+	Solaris system header files.
+
+Sat Feb 12 22:11:32 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* libiberty.h (xexit): Use __volatile__ to avoid losing if
+	compiling with gcc -traditional.
+
+Thu Feb 10 14:05:41 1994  Ian Lance Taylor  (ian@cygnus.com)
+
+	* libiberty.h: New file.  Declares functions provided by
+	libiberty.
+
+Tue Feb  8 05:19:52 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	Handle obstack_chunk_alloc returning NULL.  This allows
+	obstacks to be used by libraries, without forcing them
+	to call exit or longjmp.
+	* obstack.h (struct obstack): Add alloc_failed flag.
+	_obstack_begin, _obstack_begin_1): Declare to return int, not void.
+	(obstack_finish): If alloc_failed, return NULL.
+	(obstack_base, obstack_next_free, objstack_object_size):
+	If alloc_failed, return 0.
+	(obstack_grow, obstack_grow0, obstack_1grow, obstack_ptr_grow,
+	obstack_int_grow, obstack_blank): If alloc_failed, do nothing that
+	could corrupt the obstack.
+
+Mon Jan 24 15:06:05 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* bfdlink.h (struct bfd_link_callbacks): Add name, reloc_name and
+	addend argments to reloc_overflow callback.
+
+Fri Jan 21 19:13:12 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* dis-asm.h (print_insn_big_powerpc, print_insn_little_powerpc,
+	print_insn_rs6000): Declare.
+
+Thu Jan  6 14:15:55 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* bfdlink.h (struct bfd_link_callbacks): Add bitsize argument to
+	add_to_set field.  Add new callback named constructor.
+
+Thu Dec 30 10:44:06 1993  Ian Lance Taylor  (ian@rtl.cygnus.com)
+
+	* bfdlink.h: New file for new BFD linker backend routines.
+
+Mon Nov 29 10:43:57 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* dis-asm.h (enum dis_insn_tyupe): Remove non-ANSI trailing comma.
+
+Sat Oct  2 20:42:26 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* dis-asm.h: Move comment to right place.
+
+Mon Aug  9 19:03:35 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* obstack.h (obstack_chunkfun, obstack_freefun): Add defns from
+	previous version.  Are these Cygnus local changes?
+
+Fri Aug  6 17:05:47 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* getopt.h, obstack.h: Update to latest FSF version.
+
+Mon Aug  2 14:45:29 1993  John Gilmore  (gnu@cygnus.com)
+
+	* dis-asm.h:  Move enum outside of struct defn to avoid warnings.
+
+Mon Aug  2 08:49:30 1993  Stu Grossman  (grossman at cygnus.com)
+
+	* wait.h (WEXITSTATUS, WSTOPSIG): Mask down to 8 bits.  This is
+	for systems that store stuff into the high 16 bits of a wait
+	status.
+
+Fri Jul 30 18:38:02 1993  John Gilmore  (gnu@cygnus.com)
+
+	* dis-asm.h:  Add new fields insn_info_valid, branch_delay_insns,
+	data_size, insn_type, target, target2.  These are used to return
+	information from the instruction decoders back to the calling
+	program.  Add comments, make more readable.
+
+Mon Jul 19 22:14:14 1993  Fred Fish  (fnf@deneb.cygnus.com)
+
+	* nlm:  New directory containing NLM/NetWare includes.
+
+Thu Jul 15 12:10:04 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* dis-asm.h (struct disassemble_info): New field application_data.
+
+Thu Jul 15 12:41:15 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* dis-asm.h: Added declaration of print_insn_m88k.
+
+Fri Jul  2 10:31:59 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* ansidecl.h: Use ANSI macros if __mips and _SYSTYPE_SVR4 are
+	defined, since RISC/OS cc handles ANSI declarations in SVR4 mode
+	but does not define __STDC__.
+
+Sun Jun 20 18:27:52 1993  Ken Raeburn  (raeburn@poseidon.cygnus.com)
+
+	* dis-asm.h: Don't need to include ansidecl.h any more.
+
+Fri Jun 18 03:22:10 1993  John Gilmore  (gnu@cygnus.com)
+
+	* oasys.h:  Eliminate "int8_type", "int16_type", "int32_type", and
+	their variants.  These changes are coordinated with corresponding
+	changes in ../bfd/oasys.c.
+
+Wed Jun 16 10:43:08 1993  Fred Fish  (fnf@cygnus.com)
+
+	* bfd.h:  Note that it has been removed.
+
+Tue Jun  8 12:16:03 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
+
+	 Support for H8/300-H
+	* dis-asm.h (print_insn_h8300, print_insn_h8300h): Declare it.
+
+Tue Jun  1 07:35:03 1993  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+	* ansidecl.h (const): Don't define it if it's already defined.
+
+Thu May 27 18:19:51 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* dis-asm.h (print_insn_hppa): Declare it.
+
+	* bfd.h: Moved to bfd directory.  Small stub here includes it
+	without requiring "-I../bfd".
+
+Thu Apr 29 12:06:13 1993  Ken Raeburn  (raeburn@deneb.cygnus.com)
+
+	* bfd.h: Updated with BSF_FUNCTION.
+
+Mon Apr 26 18:15:50 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* bfd.h, dis-asm.h: Updated with Hitachi SH.
+
+Fri Apr 23 18:41:38 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* bfd.h: Updated with alpha changes.
+	* dis-asm.h: Added alpha.
+
+Fri Apr 16 17:35:30 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* bfd.h: Update for signed bfd_*get_*.
+
+Thu Apr 15 09:24:21 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* bfd.h: Updated for file_truncated error.
+
+Thu Apr  8 10:53:47 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* ansidecl.h: If no ANSI, define const to be empty.
+
+Thu Apr  1 09:00:10 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* dis-asm.h: Declare a29k and i960 print_insn_*.
+
+	* dis-asm.h: Add print_address_func and related stuff.
+
+	* dis-asm.h (dis_asm_read_memory): Fix prototype.
+
+Wed Mar 31 17:40:16 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* dis-asm.h: Add print_insn_sparc.
+
+Wed Mar 31 17:51:42 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* bfd.h: Updated for BFD_RELOC_MIPS_GPREL and bfd_[gs]et_gp_size
+	prototypes.
+
+Wed Mar 31 16:35:12 1993  Stu Grossman  (grossman@cygnus.com)
+
+	* dis-asm.h: (disassemble_info):  Fix typo in prototype of
+	dis_asm_memory_error().
+
+Tue Mar 30 19:09:23 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* dis-asm.h (disassembler_info): Add read_memory_func,
+	memory_error_func, buffer, and length.
+	({GDB_,}INIT_DISASSEMBLE_INFO): Set them.
+	print_insn_*: Remove second argument.
+
+Tue Mar 30 14:48:55 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* bfd.h: Update for lma field of section.
+
+Tue Mar 30 12:22:55 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* ansidecl.h: Use ANSI versions on AIX regardless of __STDC__.
+
+Fri Mar 19 14:49:49 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* dis-asm.h: Add h8500.
+
+Thu Mar 18 13:49:09 1993  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* ieee-float.h:  Moved from ../gdb.
+	* dis-asm.h:  New file.  Interface to dis-assembler.
+
+Thu Mar 11 10:52:57 1993  Fred Fish  (fnf@cygnus.com)
+
+	* demangle.h (DMGL_NO_OPTS):  Add define (set to 0) to use
+	in place of bare 0, for readability reasons.
+
+Tue Mar  2 17:50:11 1993  Fred Fish  (fnf@cygnus.com)
+
+	* demangle.h:  Replace all references to cfront with ARM.
+
+Tue Feb 23 12:21:14 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* bfd.h: Update for new elements in JUMP_TABLE.
+
+Tue Feb 16 00:51:30 1993  John Gilmore  (gnu@cygnus.com)
+
+	* bfd.h:  Update for BFD_VERSION 2.1.
+
+Tue Jan 26 11:49:20 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* bfd.h: Update for SEC_IS_COMMON flag.
+
+Tue Jan 19 12:25:12 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* bfd.h: Update for bfd_asymbol_value bug fix.
+
+Fri Jan  8 16:37:18 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* bfd.h: Update to include ECOFF tdata and target_flavour.
+
+Sun Dec 27 17:52:30 1992  Fred Fish  (fnf@cygnus.com)
+
+	* bfd.h:  Add declaration for bfd_get_size().
+
+Tue Dec 22 22:42:46 1992  Fred Fish  (fnf@cygnus.com)
+
+	* demangle.h:  Protect file from multiple inclusions with
+	#if !defined(DEMANGLE_H)...#define DEMANGLE_H...#endif.
+
+Mon Dec 21 21:25:50 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* bfd.h:  Update to get hppa_core_struct from bfd.c.
+
+Thu Dec 17 00:42:35 1992  John Gilmore  (gnu@cygnus.com)
+
+	* bfd.h:  Update to get tekhex tdata name change from bfd.
+
+Mon Nov  9 23:55:42 1992  John Gilmore  (gnu@cygnus.com)
+
+	* ansidecl.h:  Update comments to discourage use of EXFUN.
+
+Thu Nov  5 16:35:44 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* bfd.h: Update to bring in SEC_SHARED_LIBRARY.
+
+Thu Nov  5 03:21:32 1992  John Gilmore  (gnu@cygnus.com)
+
+	* bfd.h:  Update to match EXFUN, bfd_seclet_struct, and SDEF
+	cleanups in bfd.
+
+Wed Nov  4 07:28:05 1992  Ken Raeburn  (raeburn@cygnus.com)
+
+	* bout.h (N_CALLNAME, N_BALNAME): Define as char-type values, so
+	widening works consistently.
+
+Fri Oct 16 03:17:08 1992  John Gilmore  (gnu@cygnus.com)
+
+	* getopt.h:  Update to Revised Standard FSF Version.
+
+Thu Oct 15 21:43:22 1992  K. Richard Pixley  (rich@sendai.cygnus.com)
+
+	* getopt.h (struct option): use the provided enum for has_arg.
+
+	* demangle.h (AUTO_DEMANGLING, GNU_DEMANGLING,
+	  LUCID_DEMANGLING): ultrix compilers require enums to be
+	  enums and ints to be ints and casts where they meet.  cast some
+	  enums into ints.
+
+Thu Oct 15 04:35:51 1992  John Gilmore  (gnu@cygnus.com)
+
+	* bfd.h:  Update after comment changes.
+
+Thu Oct  8 09:03:02 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* bfd.h (bfd_get_symbol_leading_char): new macro for getting in xvec
+
+Thu Sep  3 09:10:50 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* bfd.h (struct reloc_howto_struct):  size needs to be signed if
+	it's going to hold negative values.
+
+Sun Aug 30 17:50:27 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* demangle.h:  New file, moved from ../gdb.  Made independent
+	of gdb.  Allow demangling style option to be passed as a
+	parameter to cplus_demangle(), but using the
+	current_demangling_style global as the default.
+
+Sat Aug 29 10:07:55 1992  Fred Fish  (fnf@cygnus.com)
+
+	* obstack.h:  Merge comment change from current FSF version.
+
+Thu Aug 27 12:59:29 1992  Brendan Kehoe  (brendan@cygnus.com)
+
+	* bfd.h: add we32k
+
+Tue Aug 25 15:07:47 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* bfd.h: new after Z8000 stuff
+
+Mon Aug 17 09:01:23 1992  Ken Raeburn  (raeburn@cygnus.com)
+
+	* bfd.h: Regenerated after page/segment size changes.
+
+Sat Aug  1 13:46:31 1992  Fred Fish  (fnf@cygnus.com)
+
+	* obstack.h: Merge changes from current FSF version.
+
+Mon Jul 20 21:06:23 1992  Fred Fish  (fnf@cygnus.com)
+
+	* obstack.h (area_id, flags):  Remove, replace with extra_arg,
+	use_extra_arg, and maybe_empty_object.
+	* obstack.h (OBSTACK_MAYBE_EMPTY_OBJECT, OBSTACK_MMALLOC_LIKE):
+	Remove, replaced by maybe_empty_object and use_extra_arg bitfields.
+	* obstack.h (obstack_full_begin, _obstack_begin):  Remove area_id
+	and flags arguments.
+	* obstack.h (obstack_alloc_arg):  New macro to set extra_arg.
+
+Thu Jul 16 08:12:44 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* bfd.h: new after adding BFD_IS_RELAXABLE
+
+Sat Jul  4 03:22:23 1992  John Gilmore  (gnu at cygnus.com)
+
+	* bfd.h:  Regen after adding BSF_FILE.
+
+Mon Jun 29 14:18:36 1992  Fred Fish  (fnf at sunfish)
+
+	* obstack.h:  Convert bcopy() use to memcpy(), which is more
+	portable, more standard, and can take advantage of gcc's builtin
+	functions for increased performance.
+
+Thu Jun 25 04:46:08 1992  John Gilmore  (gnu at cygnus.com)
+
+	* ansidecl.h (PARAMS):  Incorporate this macro from gdb's defs.h.
+	It's a cleaner way to forward-declare function prototypes.
+
+Fri Jun 19 15:46:32 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* bfd.h:  HPPA merge.
+
+Tue Jun 16 21:30:56 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* getopt.h: gratuitous white space changes merged from other prep
+	  releases.
+
+Thu Jun 11 01:10:55 1992  John Gilmore  (gnu at cygnus.com)
+
+	* bfd.h:  Regen'd from bfd.c after removing elf_core_tdata_struct.
+
+Mon May 18 17:29:03 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* getopt.h: merged changes from make-3.62.11.
+
+	* getopt.h: merged changes from grep-1.6 (alpha).
+
+Fri May  8 14:53:32 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* getopt.h: merged changes from bison-1.18.
+
+Sat Mar 14 17:25:20 1992  Fred Fish  (fnf@cygnus.com)
+
+	* obstack.h:  Add "area_id" and "flags" members to obstack
+	structure.  Add obstack_chunkfun() and obstack_freefun() to
+	set functions explicitly.  Convert maybe_empty_object to
+	a bit in "flags".
+
+Thu Feb 27 22:01:02 1992  Per Bothner  (bothner@cygnus.com)
+
+	* wait.h (WIFSTOPPED):  Add IBM rs6000-specific version.
+
+Fri Feb 21 20:49:20 1992  John Gilmore  (gnu at cygnus.com)
+
+	* obstack.h:  Add obstack_full_begin.
+	* bfd.h, obstack.h:  Protolint.
+
+Thu Jan 30 01:18:42 1992  John Gilmore  (gnu at cygnus.com)
+
+	* bfd.h:  Remove comma from enum declaration.
+
+Mon Jan 27 22:01:13 1992  Steve Chamberlain  (sac at cygnus.com)
+
+	* bfd.h : new target entr, bfd_relax_section
+
+Wed Dec 18 17:19:44 1991  Stu Grossman  (grossman at cygnus.com)
+
+	* bfd.h, ieee.h:  ANSIfy enums.
+
+Thu Dec 12 20:59:56 1991  John Gilmore  (gnu at cygnus.com)
+
+	* fopen-same.h, fopen-bin.h:  New files for configuring
+	whether fopen distinguishes binary files or not.  For use
+	by host-dependent config files.
+
+Sat Nov 30 20:46:43 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* bfd.h: change the documentation format.
+
+	* created coff, elf and opcode and aout directories. Moved:
+
+	aout64.h	==> aout/aout64.h
+	ar.h		==> aout/ar.h
+	a.out.encap.h	==> aout/encap.h
+	a.out.host.h	==> aout/host.h
+	a.out.hp.h	==> aout/hp.h
+	a.out.sun4.h	==> aout/sun4.h
+	ranlib.h	==> aout/ranlib.h
+	reloc.h		==> aout/reloc.h
+	stab.def	==> aout/stab.def
+	stab.gnu.h	==> aout/stab_gnu.h
+
+	coff-a29k.h	==> coff/a29k.h
+	coff-h8300.h	==> coff/h8300.h
+	coff-i386.h	==> coff/i386.h
+	coff-i960.h	==> coff/i960.h
+	internalcoff.h	==> coff/internal.h
+	coff-m68k.h	==> coff/m68k.h
+	coff-m88k.h	==> coff/m88k.h
+	coff-mips.h	==> coff/mips.h
+	coff-rs6000.h	==> coff/rs6000.h
+
+	elf-common.h	==> elf/common.h
+	dwarf.h		==> elf/dwarf.h
+	elf-external.h	==> elf/external.h
+	elf-internal.h  ==> elf/internal.h
+
+	a29k-opcode.h	==> opcode/a29k.h
+	arm-opcode.h	==> opcode/arm.h
+	h8300-opcode.h	==> opcode/h8300.h
+	i386-opcode.h	==> opcode/i386.h
+	i860-opcode.h	==> opcode/i860.h
+	i960-opcode.h	==> opcode/i960.h
+	m68k-opcode.h	==> opcode/m68k.h
+	m88k-opcode.h	==> opcode/m88k.h
+	mips-opcode.h	==> opcode/mips.h
+	np1-opcode.h	==> opcode/np1.h
+	ns32k-opcode.h	==> opcode/ns32k.h
+	pn-opcode.h	==> opcode/pn.h
+	pyr-opcode.h	==> opcode/pyr.h
+	sparc-opcode.h	==> opcode/sparc.h
+	tahoe-opcode.h	==> opcode/tahoe.h
+	vax-opcode.h	==> opcode/vax.h
+
+
+
+Wed Nov 27 10:38:31 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* internalcoff.h: (internal_scnhdr) took out #def dependency, now
+	s_nreloc and s_nlnno are always long. 	(internal_reloc): allways
+	has an offset field now.
+
+Fri Nov 22 08:12:58 1991  John Gilmore  (gnu at cygnus.com)
+
+	* coff-rs6000.h:  Lint; use unsigned chars for external fields.
+	* internalcoff.h:  Lint; cast storage classes to signed char.
+
+Thu Nov 21 21:01:05 1991  Per Bothner  (bothner at cygnus.com)
+
+	* stab.def: Remove the GNU extended type codes (e.g. N_SETT).
+	* aout64.h:  The heuristic for distinguishing between
+	sunos-style and bsd-style ZMAGIC files (wrt. where the
+	text segment starts) is moved into (the default definition of)
+	the macro N_HEADER_IN_TEXT.  This definition is only used
+	if no other definition is used - e.g. bfd/newsos3.c defines
+	N_HEADER_IN_TEXT(x) to be always 0 (as before).
+
+Thu Nov 21 11:53:03 1991  John Gilmore  (gnu at cygnus.com)
+
+	* aout64.h (N_TXTADDR, N_TXTOFF, N_TXTSIZE):  New definitions
+	that should handle all uses.  LOGICAL_ versions deleted.
+	Eliminate N_HEADER_IN_TEXT, using a_entry to determine which
+	kind of zmagic a.out file we are looking at.
+	* coff-rs6000.h:  Typo.
+
+Tue Nov 19 18:43:37 1991  Per Bothner  (bothner at cygnus.com)
+
+	(Note:  This is a revised entry, as was aout64.h.)
+	* aout64.h:  Some cleanups of N_TXTADDR and N_TXTOFF:
+	Will now work for both old- and new-style ZMAGIC files,
+	depending on N_HEADER_IN_TEXT macro.
+	Add LOGICAL_TXTADDR, LOICAL_TXTOFF and LOGICAL_TXTSIZE
+	that don't count the exec header as part
+	of the text segment, to be consistent with bfd.
+	* a.out.sun4.h:  Simplified/fixed for previous change.
+
+Mon Nov 18 00:02:06 1991  Fred Fish  (fnf at cygnus.com)
+
+	* dwarf.h:  Update to DWARF draft 5 version from gcc2.
+
+Thu Nov 14 19:44:59 1991  Per Bothner  (bothner at cygnus.com)
+
+	* stab.def:  Added defs for extended GNU symbol types,
+	such as N_SETT.  These are normally ifdef'd out (because
+	of conflicts with a.out.gnu.h), but are used by bfb_stab_name().
+
+Thu Nov 14 19:17:03 1991  Fred Fish  (fnf at cygnus.com)
+
+	* elf-common.h:  Add defines to support ELF symbol table code.
+
+Mon Nov 11 19:01:06 1991  Fred Fish  (fnf at cygnus.com)
+
+	* elf-internal.h, elf-external.h, elf-common.h:  Add support for
+	note sections, which are used in ELF core files to hold copies
+	of various /proc structures.
+
+Thu Nov  7 08:58:26 1991  Steve Chamberlain  (sac at cygnus.com)
+
+	* internalcoff.h: took out the M88 dependency in the lineno
+	struct.
+	* coff-m88k.h: defines GET_LINENO_LNNO and PUT_LINENO_LNNO to use
+	32bit linno entries.
+	* a29k-opcode.h: fixed encoding of mtacc
+
+Sun Nov  3 11:54:22 1991  Per Bothner  (bothner at cygnus.com)
+
+	* bfd.h: Updated from ../bfd/bfd-in.h (q.v).
+
+Fri Nov  1 11:13:53 1991  John Gilmore  (gnu at cygnus.com)
+
+	* internalcoff.h:  Add x_csect defines.
+
+Fri Oct 25 03:18:20 1991  John Gilmore  (gnu at cygnus.com)
+
+	* Rename COFF-related files in `coff-ARCH.h' form.
+	coff-a29k.h, coff-i386.h, coff-i960.h, coff-m68k.h, coff-m88k.h,
+	coff-mips.h, coff-rs6000.h to be exact.
+
+Thu Oct 24 22:11:11 1991  John Gilmore  (gnu at cygnus.com)
+
+	RS/6000 support, by Metin G. Ozisik, Mimi Phûông-Thåo Võ, and
+	John Gilmore.
+
+	* a.out.gnu.h:  Update slightly.
+	* bfd.h:  Add new error code, fix doc, add bfd_arch_rs6000.
+	* internalcoff.h:  Add more F_ codes for filehdr.  Add
+	rs/6000-dependent fields to aouthdr.  Add storage classes
+	to syments.  Add 6000-specific auxent.  Add r_size in reloc.
+	* rs6000coff.c:  New file.
+
+Thu Oct 24 04:13:20 1991  Fred Fish  (fnf at cygnus.com)
+
+	* dwarf.h: New file for dwarf support.  Copied from gcc2
+	distribution.
+
+Wed Oct 16 13:31:45 1991  John Gilmore  (gnu at cygnus.com)
+
+	* aout64.h:  Remove PAGE_SIZE defines; they are target-dependent.
+	Add N_FN_SEQ for N_FN symbol type used on Sequent machines.
+	* stab.def:  Include N_FN_SEQ in table.
+	* bout.h:  External formats of structures use unsigned chars.
+
+Fri Oct 11 12:40:43 1991  Steve Chamberlain  (steve at cygnus.com)
+
+	* bfd.h:upgrade from bfd.c
+	* internalcoff.h: add n_name, n_zeroes and n_offset macros
+	* amdcoff.h: Define OMAGIC and AOUTHDRSZ.
+
+Fri Oct 11 10:58:06 1991  Per Bothner  (bothner at cygnus.com)
+
+	* a.out.host.h: Change SEGMENT_SIZE to 0x1000 for Sony.
+	* bfd.h (align_power): Add (actually move) comment.
+
+Tue Oct  8 15:29:32 1991  Per Bothner  (bothner at cygnus.com)
+
+	* sys/h-rtbsd.h: Define MISSING_VFPRINT (for binutils/bucomm.c).
+
+Sun Oct  6 19:24:39 1991  John Gilmore  (gnu at cygnus.com)
+
+	* aout64.h:  Move struct internal_exec to ../bfd/libaout.h so
+	it can be shared by all `a.out-family' code.  Rename
+	EXTERNAL_LIST_SIZE to EXTERNAL_NLIST_SIZE.  Use basic types
+	for nlist members, and make strx integral rather than pointer.
+	More commentary on n_type values.
+	* bout.h:  Provide a struct external_exec rather than an
+	internal_exec.
+	* m68kcoff.h:  Remove `tagentries' which snuck in from the i960
+	COFF port.
+
+Fri Oct  4 01:25:59 1991  John Gilmore  (gnu at cygnus.com)
+
+	* h8300-opcode.h:  Remove `_enum' from the typedef for an enum.
+	* bfd.h:  Update to match bfd changes.
+
+	* sys/h-i386mach.h, sysdep.h:  Add 386 Mach host support.
+
+Tue Oct  1 04:58:42 1991  John Gilmore  (gnu at cygnus.com)
+
+	* bfd.h, elf-common.h, elf-external.h, elf-internal.h:
+	Add preliminary ELF support, sufficient for GDB, from Fred Fish.
+	* sysdep.h, sys/h-amix.h:  Support Amiga SVR4.
+
+	* sys/h-vaxult.h:  Make it work.  (David Taylor <taylor@think.com>)
+	* a.out.vax.h:  Remove unused and confusing file.
+
+Mon Sep 30 12:52:35 1991  Per Bothner  (bothner at cygnus.com)
+
+	* sysdep.h: Define NEWSOS3_SYS, and use it.
+
+Fri Sep 20 13:38:21 1991  John Gilmore  (gnu at cygnus.com)
+
+	* a.out.gnu.h (N_FN):  Its value *really is* 0x1F.
+	Fix it, and add comments warning about or-ing N_EXT with it
+	and/or N_WARNING.
+	* aout64.h (N_FN):  Fix value, add comments about N_EXT.
+	* stab.def (table at end):  Update to show all the type
+	values <0x20, including low order bits.  Move N_FN to
+	its rightful place.
+
+Tue Sep 17 17:41:37 1991  Stu Grossman  (grossman at cygnus.com)
+
+	* sys/h-irix3.h:  sgi/irix support.
+
+Tue Sep 17 07:52:59 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	* stab.def (N_DEFD):  Add GNU Modula-2 debug stab, from Andrew
+	Beers.
+
+Thu Sep 12 14:12:59 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	* internalcoff.h (SYMNMLEN, FILNMLEN, DIMNUM):  Define these
+	for internalcoff, separately from the various external coff's.
+	* amdcoff.h, bcs88kcoff.h, i386coff.h, intel-coff.h, m68kcoff.h,
+	m88k-bcs.h: Prefix SYMNMLEN, FILNMLEN, and DIMNUM with E_'s for
+	the external struct definitions.
+	* ecoff.h: Remove these #define's, kludge no longer needed.
+
+	* sys/h-ultra3.h:  Add new Ultracomputer host.
+	* sysdep.h:  Add ULTRA3_SYM1_SYS and use it.
+
+Tue Sep 10 10:11:46 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	* i386coff.h (LINESZ):  Always 6, not based on sizeof().
+	(Fix from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.)
+
+Wed Sep  4 08:58:37 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	* a.out.gnu.h, aout64.h:  Add N_WARNING.  Change N_FN to 0x0E,
+	to match SunOS and BSD.  Add N_COMM as 0x12 for SunOS shared lib
+	support.
+	* stab.def:  Add N_COMM to table, fix overlap comment.
+
+Tue Sep  3 06:29:20 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	Merge with latest FSF versions of these files.
+
+	* stab.gnu.h:  Add LAST_UNUSED_STAB_CODE.
+	* stab.def:  Update to GPL2.  Move N_WARNING out, since not a
+	debug symbol.  Change comments, and reorder table to numeric
+	order.  Update final table comment.
+	(N_DSLINE, N_BSLINE):  Renumber from 0x66 and 0x68, to 0x46 and 0x48.
+
+	* obstack.h:  GPL2.  Merge.
+
+Fri Aug 23 01:54:23 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	* a.out.gnu.h, a.out.sun4.h:  Make SEGMENT_SIZE able to depend
+	on the particular a.out being examined.
+	* a.out.sun4.h:  Define segment sizes for Sun-3's and Sun-4's.
+	* FIXME:  a.out.gnu.h is almost obsolete.
+	* FIXME:  a.out.sun4.h should be renamed a.out.sun.h now.
+
+Wed Aug 21 20:32:13 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	* Start a ChangeLog for the includes directory.
+
+	* a.out.gnu.h (N_FN):  Fix value -- was 15, should be 0x1E.
+	* stab.def:  Update allocation table in comments at end,
+	to reflect reality as I know it.
+
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/MAINTAINERS sdcc-3.2.0+dfsg/support/sdbinutils/include/MAINTAINERS
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/MAINTAINERS	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/MAINTAINERS	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1 @@
+See ../binutils/MAINTAINERS
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/alloca-conf.h sdcc-3.2.0+dfsg/support/sdbinutils/include/alloca-conf.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/alloca-conf.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/alloca-conf.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,45 @@
+#include "config.h"
+
+/* This is a merge of code recommended in the autoconf-2.61 documentation
+   with that recommended in the autoconf-2.13 documentation, with added
+   tweaks to heed C_ALLOCA.  */
+
+#if defined HAVE_ALLOCA_H && !defined C_ALLOCA
+# include <alloca.h>
+#else
+# if defined __GNUC__ && !defined C_ALLOCA
+#  if !defined alloca
+#   define alloca __builtin_alloca
+#  endif
+# else
+#  if defined _AIX
+/* Indented so that pre-ansi C compilers will ignore it, rather than
+   choke on it.  Some versions of AIX require this to be the first
+   thing seen by the compiler except for comments and preprocessor
+   directives.  */
+    #pragma alloca
+#  else
+#   if defined _MSC_VER && !defined C_ALLOCA
+#    include <malloc.h>
+#    define alloca _alloca
+#   else
+#    if !defined alloca
+#     if defined __STDC__ || defined __hpux
+#      if defined HAVE_STDDEF_H
+#       include <stddef.h>
+#       if defined  __cplusplus
+extern "C" void *alloca (size_t);
+#       else
+extern void *alloca (size_t);
+#       endif
+#      else
+extern void *alloca ();
+#      endif
+#     else
+extern char *alloca ();
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/ansidecl.h sdcc-3.2.0+dfsg/support/sdbinutils/include/ansidecl.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/ansidecl.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/ansidecl.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,432 @@
+/* ANSI and traditional C compatability macros
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+   2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010
+   Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* ANSI and traditional C compatibility macros
+
+   ANSI C is assumed if __STDC__ is #defined.
+
+   Macro		ANSI C definition	Traditional C definition
+   -----		---- - ----------	----------- - ----------
+   ANSI_PROTOTYPES	1			not defined
+   PTR			`void *'		`char *'
+   PTRCONST		`void *const'		`char *'
+   LONG_DOUBLE		`long double'		`double'
+   const		not defined		`'
+   volatile		not defined		`'
+   signed		not defined		`'
+   VA_START(ap, var)	va_start(ap, var)	va_start(ap)
+
+   Note that it is safe to write "void foo();" indicating a function
+   with no return value, in all K+R compilers we have been able to test.
+
+   For declaring functions with prototypes, we also provide these:
+
+   PARAMS ((prototype))
+   -- for functions which take a fixed number of arguments.  Use this
+   when declaring the function.  When defining the function, write a
+   K+R style argument list.  For example:
+
+	char *strcpy PARAMS ((char *dest, char *source));
+	...
+	char *
+	strcpy (dest, source)
+	     char *dest;
+	     char *source;
+	{ ... }
+
+
+   VPARAMS ((prototype, ...))
+   -- for functions which take a variable number of arguments.  Use
+   PARAMS to declare the function, VPARAMS to define it.  For example:
+
+	int printf PARAMS ((const char *format, ...));
+	...
+	int
+	printf VPARAMS ((const char *format, ...))
+	{
+	   ...
+	}
+
+   For writing functions which take variable numbers of arguments, we
+   also provide the VA_OPEN, VA_CLOSE, and VA_FIXEDARG macros.  These
+   hide the differences between K+R <varargs.h> and C89 <stdarg.h> more
+   thoroughly than the simple VA_START() macro mentioned above.
+
+   VA_OPEN and VA_CLOSE are used *instead of* va_start and va_end.
+   Immediately after VA_OPEN, put a sequence of VA_FIXEDARG calls
+   corresponding to the list of fixed arguments.  Then use va_arg
+   normally to get the variable arguments, or pass your va_list object
+   around.  You do not declare the va_list yourself; VA_OPEN does it
+   for you.
+
+   Here is a complete example:
+
+	int
+	printf VPARAMS ((const char *format, ...))
+	{
+	   int result;
+
+	   VA_OPEN (ap, format);
+	   VA_FIXEDARG (ap, const char *, format);
+
+	   result = vfprintf (stdout, format, ap);
+	   VA_CLOSE (ap);
+
+	   return result;
+	}
+
+
+   You can declare variables either before or after the VA_OPEN,
+   VA_FIXEDARG sequence.  Also, VA_OPEN and VA_CLOSE are the beginning
+   and end of a block.  They must appear at the same nesting level,
+   and any variables declared after VA_OPEN go out of scope at
+   VA_CLOSE.  Unfortunately, with a K+R compiler, that includes the
+   argument list.  You can have multiple instances of VA_OPEN/VA_CLOSE
+   pairs in a single function in case you need to traverse the
+   argument list more than once.
+
+   For ease of writing code which uses GCC extensions but needs to be
+   portable to other compilers, we provide the GCC_VERSION macro that
+   simplifies testing __GNUC__ and __GNUC_MINOR__ together, and various
+   wrappers around __attribute__.  Also, __extension__ will be #defined
+   to nothing if it doesn't work.  See below.
+
+   This header also defines a lot of obsolete macros:
+   CONST, VOLATILE, SIGNED, PROTO, EXFUN, DEFUN, DEFUN_VOID,
+   AND, DOTS, NOARGS.  Don't use them.  */
+
+#ifndef	_ANSIDECL_H
+#define _ANSIDECL_H	1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Every source file includes this file,
+   so they will all get the switch for lint.  */
+/* LINTLIBRARY */
+
+/* Using MACRO(x,y) in cpp #if conditionals does not work with some
+   older preprocessors.  Thus we can't define something like this:
+
+#define HAVE_GCC_VERSION(MAJOR, MINOR) \
+  (__GNUC__ > (MAJOR) || (__GNUC__ == (MAJOR) && __GNUC_MINOR__ >= (MINOR)))
+
+and then test "#if HAVE_GCC_VERSION(2,7)".
+
+So instead we use the macro below and test it against specific values.  */
+
+/* This macro simplifies testing whether we are using gcc, and if it
+   is of a particular minimum version. (Both major & minor numbers are
+   significant.)  This macro will evaluate to 0 if we are not using
+   gcc at all.  */
+#ifndef GCC_VERSION
+#define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
+#endif /* GCC_VERSION */
+
+#if defined (__STDC__) || defined(__cplusplus) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(_WIN32)
+/* All known AIX compilers implement these things (but don't always
+   define __STDC__).  The RISC/OS MIPS compiler defines these things
+   in SVR4 mode, but does not define __STDC__.  */
+/* eraxxon@alumni.rice.edu: The Compaq C++ compiler, unlike many other
+   C++ compilers, does not define __STDC__, though it acts as if this
+   was so. (Verified versions: 5.7, 6.2, 6.3, 6.5) */
+
+#define ANSI_PROTOTYPES	1
+#define PTR		void *
+#define PTRCONST	void *const
+#define LONG_DOUBLE	long double
+
+/* PARAMS is often defined elsewhere (e.g. by libintl.h), so wrap it in
+   a #ifndef.  */
+#ifndef PARAMS
+#define PARAMS(ARGS)		ARGS
+#endif
+
+#define VPARAMS(ARGS)		ARGS
+#define VA_START(VA_LIST, VAR)	va_start(VA_LIST, VAR)
+
+/* variadic function helper macros */
+/* "struct Qdmy" swallows the semicolon after VA_OPEN/VA_FIXEDARG's
+   use without inhibiting further decls and without declaring an
+   actual variable.  */
+#define VA_OPEN(AP, VAR)	{ va_list AP; va_start(AP, VAR); { struct Qdmy
+#define VA_CLOSE(AP)		} va_end(AP); }
+#define VA_FIXEDARG(AP, T, N)	struct Qdmy
+ 
+#undef const
+#undef volatile
+#undef signed
+
+/* inline requires special treatment; it's in C99, and GCC >=2.7 supports
+   it too, but it's not in C89.  */
+#undef inline
+#if __STDC_VERSION__ >= 199901L || defined(__cplusplus) || (defined(__SUNPRO_C) && defined(__C99FEATURES__))
+/* it's a keyword */
+#else
+# if GCC_VERSION >= 2007
+#  define inline __inline__   /* __inline__ prevents -pedantic warnings */
+# else
+#  define inline  /* nothing */
+# endif
+#endif
+
+/* These are obsolete.  Do not use.  */
+#ifndef IN_GCC
+#define CONST		const
+#define VOLATILE	volatile
+#define SIGNED		signed
+
+#define PROTO(type, name, arglist)	type name arglist
+#define EXFUN(name, proto)		name proto
+#define DEFUN(name, arglist, args)	name(args)
+#define DEFUN_VOID(name)		name(void)
+#define AND		,
+#define DOTS		, ...
+#define NOARGS		void
+#endif /* ! IN_GCC */
+
+#else	/* Not ANSI C.  */
+
+#undef  ANSI_PROTOTYPES
+#define PTR		char *
+#define PTRCONST	PTR
+#define LONG_DOUBLE	double
+
+#define PARAMS(args)		()
+#define VPARAMS(args)		(va_alist) va_dcl
+#define VA_START(va_list, var)	va_start(va_list)
+
+#define VA_OPEN(AP, VAR)		{ va_list AP; va_start(AP); { struct Qdmy
+#define VA_CLOSE(AP)			} va_end(AP); }
+#define VA_FIXEDARG(AP, TYPE, NAME)	TYPE NAME = va_arg(AP, TYPE)
+
+/* some systems define these in header files for non-ansi mode */
+#undef const
+#undef volatile
+#undef signed
+#undef inline
+#define const
+#define volatile
+#define signed
+#define inline
+
+#ifndef IN_GCC
+#define CONST
+#define VOLATILE
+#define SIGNED
+
+#define PROTO(type, name, arglist)	type name ()
+#define EXFUN(name, proto)		name()
+#define DEFUN(name, arglist, args)	name arglist args;
+#define DEFUN_VOID(name)		name()
+#define AND		;
+#define DOTS
+#define NOARGS
+#endif /* ! IN_GCC */
+
+#endif	/* ANSI C.  */
+
+/* Define macros for some gcc attributes.  This permits us to use the
+   macros freely, and know that they will come into play for the
+   version of gcc in which they are supported.  */
+
+#if (GCC_VERSION < 2007)
+# define __attribute__(x)
+#endif
+
+/* Attribute __malloc__ on functions was valid as of gcc 2.96. */
+#ifndef ATTRIBUTE_MALLOC
+# if (GCC_VERSION >= 2096)
+#  define ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
+# else
+#  define ATTRIBUTE_MALLOC
+# endif /* GNUC >= 2.96 */
+#endif /* ATTRIBUTE_MALLOC */
+
+/* Attributes on labels were valid as of gcc 2.93 and g++ 4.5.  For
+   g++ an attribute on a label must be followed by a semicolon.  */
+#ifndef ATTRIBUTE_UNUSED_LABEL
+# ifndef __cplusplus
+#  if GCC_VERSION >= 2093
+#   define ATTRIBUTE_UNUSED_LABEL ATTRIBUTE_UNUSED
+#  else
+#   define ATTRIBUTE_UNUSED_LABEL
+#  endif
+# else
+#  if GCC_VERSION >= 4005
+#   define ATTRIBUTE_UNUSED_LABEL ATTRIBUTE_UNUSED ;
+#  else
+#   define ATTRIBUTE_UNUSED_LABEL
+#  endif
+# endif
+#endif
+
+#ifndef ATTRIBUTE_UNUSED
+#define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+#endif /* ATTRIBUTE_UNUSED */
+
+/* Before GCC 3.4, the C++ frontend couldn't parse attributes placed after the
+   identifier name.  */
+#if ! defined(__cplusplus) || (GCC_VERSION >= 3004)
+# define ARG_UNUSED(NAME) NAME ATTRIBUTE_UNUSED
+#else /* !__cplusplus || GNUC >= 3.4 */
+# define ARG_UNUSED(NAME) NAME
+#endif /* !__cplusplus || GNUC >= 3.4 */
+
+#ifndef ATTRIBUTE_NORETURN
+#define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+#endif /* ATTRIBUTE_NORETURN */
+
+/* Attribute `nonnull' was valid as of gcc 3.3.  */
+#ifndef ATTRIBUTE_NONNULL
+# if (GCC_VERSION >= 3003)
+#  define ATTRIBUTE_NONNULL(m) __attribute__ ((__nonnull__ (m)))
+# else
+#  define ATTRIBUTE_NONNULL(m)
+# endif /* GNUC >= 3.3 */
+#endif /* ATTRIBUTE_NONNULL */
+
+/* Attribute `pure' was valid as of gcc 3.0.  */
+#ifndef ATTRIBUTE_PURE
+# if (GCC_VERSION >= 3000)
+#  define ATTRIBUTE_PURE __attribute__ ((__pure__))
+# else
+#  define ATTRIBUTE_PURE
+# endif /* GNUC >= 3.0 */
+#endif /* ATTRIBUTE_PURE */
+
+/* Use ATTRIBUTE_PRINTF when the format specifier must not be NULL.
+   This was the case for the `printf' format attribute by itself
+   before GCC 3.3, but as of 3.3 we need to add the `nonnull'
+   attribute to retain this behavior.  */
+#ifndef ATTRIBUTE_PRINTF
+#define ATTRIBUTE_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n))) ATTRIBUTE_NONNULL(m)
+#define ATTRIBUTE_PRINTF_1 ATTRIBUTE_PRINTF(1, 2)
+#define ATTRIBUTE_PRINTF_2 ATTRIBUTE_PRINTF(2, 3)
+#define ATTRIBUTE_PRINTF_3 ATTRIBUTE_PRINTF(3, 4)
+#define ATTRIBUTE_PRINTF_4 ATTRIBUTE_PRINTF(4, 5)
+#define ATTRIBUTE_PRINTF_5 ATTRIBUTE_PRINTF(5, 6)
+#endif /* ATTRIBUTE_PRINTF */
+
+/* Use ATTRIBUTE_FPTR_PRINTF when the format attribute is to be set on
+   a function pointer.  Format attributes were allowed on function
+   pointers as of gcc 3.1.  */
+#ifndef ATTRIBUTE_FPTR_PRINTF
+# if (GCC_VERSION >= 3001)
+#  define ATTRIBUTE_FPTR_PRINTF(m, n) ATTRIBUTE_PRINTF(m, n)
+# else
+#  define ATTRIBUTE_FPTR_PRINTF(m, n)
+# endif /* GNUC >= 3.1 */
+# define ATTRIBUTE_FPTR_PRINTF_1 ATTRIBUTE_FPTR_PRINTF(1, 2)
+# define ATTRIBUTE_FPTR_PRINTF_2 ATTRIBUTE_FPTR_PRINTF(2, 3)
+# define ATTRIBUTE_FPTR_PRINTF_3 ATTRIBUTE_FPTR_PRINTF(3, 4)
+# define ATTRIBUTE_FPTR_PRINTF_4 ATTRIBUTE_FPTR_PRINTF(4, 5)
+# define ATTRIBUTE_FPTR_PRINTF_5 ATTRIBUTE_FPTR_PRINTF(5, 6)
+#endif /* ATTRIBUTE_FPTR_PRINTF */
+
+/* Use ATTRIBUTE_NULL_PRINTF when the format specifier may be NULL.  A
+   NULL format specifier was allowed as of gcc 3.3.  */
+#ifndef ATTRIBUTE_NULL_PRINTF
+# if (GCC_VERSION >= 3003)
+#  define ATTRIBUTE_NULL_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n)))
+# else
+#  define ATTRIBUTE_NULL_PRINTF(m, n)
+# endif /* GNUC >= 3.3 */
+# define ATTRIBUTE_NULL_PRINTF_1 ATTRIBUTE_NULL_PRINTF(1, 2)
+# define ATTRIBUTE_NULL_PRINTF_2 ATTRIBUTE_NULL_PRINTF(2, 3)
+# define ATTRIBUTE_NULL_PRINTF_3 ATTRIBUTE_NULL_PRINTF(3, 4)
+# define ATTRIBUTE_NULL_PRINTF_4 ATTRIBUTE_NULL_PRINTF(4, 5)
+# define ATTRIBUTE_NULL_PRINTF_5 ATTRIBUTE_NULL_PRINTF(5, 6)
+#endif /* ATTRIBUTE_NULL_PRINTF */
+
+/* Attribute `sentinel' was valid as of gcc 3.5.  */
+#ifndef ATTRIBUTE_SENTINEL
+# if (GCC_VERSION >= 3005)
+#  define ATTRIBUTE_SENTINEL __attribute__ ((__sentinel__))
+# else
+#  define ATTRIBUTE_SENTINEL
+# endif /* GNUC >= 3.5 */
+#endif /* ATTRIBUTE_SENTINEL */
+
+
+#ifndef ATTRIBUTE_ALIGNED_ALIGNOF
+# if (GCC_VERSION >= 3000)
+#  define ATTRIBUTE_ALIGNED_ALIGNOF(m) __attribute__ ((__aligned__ (__alignof__ (m))))
+# else
+#  define ATTRIBUTE_ALIGNED_ALIGNOF(m)
+# endif /* GNUC >= 3.0 */
+#endif /* ATTRIBUTE_ALIGNED_ALIGNOF */
+
+/* Useful for structures whose layout must much some binary specification
+   regardless of the alignment and padding qualities of the compiler.  */
+#ifndef ATTRIBUTE_PACKED
+# define ATTRIBUTE_PACKED __attribute__ ((packed))
+#endif
+
+/* Attribute `hot' and `cold' was valid as of gcc 4.3.  */
+#ifndef ATTRIBUTE_COLD
+# if (GCC_VERSION >= 4003)
+#  define ATTRIBUTE_COLD __attribute__ ((__cold__))
+# else
+#  define ATTRIBUTE_COLD
+# endif /* GNUC >= 4.3 */
+#endif /* ATTRIBUTE_COLD */
+#ifndef ATTRIBUTE_HOT
+# if (GCC_VERSION >= 4003)
+#  define ATTRIBUTE_HOT __attribute__ ((__hot__))
+# else
+#  define ATTRIBUTE_HOT
+# endif /* GNUC >= 4.3 */
+#endif /* ATTRIBUTE_HOT */
+
+/* We use __extension__ in some places to suppress -pedantic warnings
+   about GCC extensions.  This feature didn't work properly before
+   gcc 2.8.  */
+#if GCC_VERSION < 2008
+#define __extension__
+#endif
+
+/* This is used to declare a const variable which should be visible
+   outside of the current compilation unit.  Use it as
+     EXPORTED_CONST int i = 1;
+   This is because the semantics of const are different in C and C++.
+   "extern const" is permitted in C but it looks strange, and gcc
+   warns about it when -Wc++-compat is not used.  */
+#ifdef __cplusplus
+#define EXPORTED_CONST extern const
+#else
+#define EXPORTED_CONST const
+#endif
+
+/* Be conservative and only use enum bitfields with GCC.
+   FIXME: provide a complete autoconf test for buggy enum bitfields.  */
+
+#if (GCC_VERSION > 2000)
+#define ENUM_BITFIELD(TYPE) __extension__ enum TYPE
+#else
+#define ENUM_BITFIELD(TYPE) unsigned int
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* ansidecl.h	*/
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/aout/ChangeLog sdcc-3.2.0+dfsg/support/sdbinutils/include/aout/ChangeLog
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/aout/ChangeLog	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/aout/ChangeLog	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,253 @@
+2010-04-15  Nick Clifton  <nickc@redhat.com>
+
+	* adobe.h: Update copyright notice to use GPLv3.
+	* aout64.h: Likewise.
+	* ar.h: Likewise.
+	* dynix3.h: Likewise.
+	* encap.h: Likewise.
+	* host.h: Likewise.
+	* hp.h: Likewise.
+	* hp300hpux.h: Likewise.
+	* ranlib.h: Likewise.
+	* reloc.h: Likewise.
+	* stab.def: Likewise.
+	* stab_gnu.h: Likewise.
+	* sun4.h: Likewise.
+
+2009-10-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* aout64.h (N_SHARED_LIB): Define as zero if not already defined.
+	* sun4.h (N_SHARED_LIB): Define.
+	* hp300hpux.h (N_SHARED_LIB): Don't define.
+
+2008-08-28  Tristan Gingold  <gingold@adacore.com>
+
+	* stab.def: Add BNSYM, ENSYM, OSO for darwin.
+
+2008-03-27  Cary Coutant <ccoutant@google.com>
+
+	* ar.h (ARMAGT): New magic string for thin archives.
+
+2005-08-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* encap.h: Remove a29k support.
+
+2005-05-10  Nick Clifton  <nickc@redhat.com>
+
+	* Update the address and phone number of the FSF organization in
+	the GPL notices in the following files:
+	adobe.h, aout64.h, ar.h, dynix3.h, encap.h, host.h, hp.h,
+	ranlib.h, reloc.h, stab.def, stab_gnu.h, sun4.h
+
+2004-01-06  Mark Kettenis  <kettenis@gnu.org>
+
+	* stab.def: Add N_PATCH to DO definition.
+
+2003-03-06  Elias Athanasopoulos  <elathan@phys.uoa.gr>
+
+	* aout64.h (BYTES_IN_WORD): Define if necessary.
+
+2001-09-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* aout64.h: Formatting fixes.
+	(N_TXTADDR): Evaluate to a bfd_vma.
+	(N_DATADDR): Avoid negative unsigned warning.
+	* hp300hpux.h: Formatting fixes.
+	(N_DATADDR): Avoid negative unsigned warning.
+
+2000-04-03  Hans-Peter Nilsson  <hp@axis.com>
+
+	* aout64.h (RELOC_EXT_BITS_EXTERN_BIG): Wrap definition in #ifndef.
+	(RELOC_EXT_BITS_EXTERN_LITTLE): Ditto.
+	(RELOC_EXT_BITS_TYPE_BIG): Ditto.
+	(RELOC_EXT_BITS_TYPE_SH_BIG): Ditto.
+	(RELOC_EXT_BITS_TYPE_LITTLE): Ditto.
+	(RELOC_EXT_BITS_TYPE_SH_LITTLE): Ditto.
+
+1999-07-12  Ian Lance Taylor  <ian@zembu.com>
+
+	* aout64.h (N_SHARED_LIB): Define as 0 if TEXT_START_ADDR is
+	defined as 0.
+
+1998-06-28  Peter Schauer  <pes@regent.e-technik.tu-muenchen.de>
+
+	* stab.def:  Add N_ALIAS from SunPro F77.
+
+1996-03-11  Ian Lance Taylor  <ian@cygnus.com>
+
+	* stab.def: Use __define_stab_duplicate rather than __define_stab
+	for duplicate entries N_BROWS and N_MOD2.
+	* stab_gnu.h (__define_stab_duplicate): Define before including
+	stab.def.
+
+1995-10-27  Niklas Hallqvist  <niklas@appli.se>
+
+	* aout64.h, host.h, hp300hpux.h, sun4.h: Changed PAGE_SIZE to
+	TARGET_PAGE_SIZE.
+
+1995-09-12  Ian Lance Taylor  <ian@cygnus.com>
+
+	* sun4.h (struct internal_sun4_dynamic_link): Change all fields
+	from long to unsigned long.
+
+1995-07-12  Ken Raeburn  <raeburn@kr-pc.cygnus.com>
+
+	* sun4.h (PAGE_SIZE): Undefine before defining.
+
+1994-09-04  Richard Earnshaw (rwe@pegasus.esprit.ec.org)
+
+	* aout64.h: Only define QMAGIC if it isn't already defined.
+
+1994-06-16  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* aout64.h (BMAGIC): Define.
+
+1994-06-11  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	Add weak symbols as an extension to a.out.
+	* aout64.h (N_WEAKU, N_WEAKA, N_WEAKT, N_WEAKD, N_WEAKB): Define.
+	* stab.def: Update symbol value table.
+
+1994-06-02  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* sun4.h (EXTERNAL_SUN4_DYNAMIC_DEBUGGER_SIZE): Correct from 28 to
+	24.  Fix up ld_got comment.
+
+1994-03-30  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* dynix3.h:  Cleanup, adapt to current bfd version.
+
+1994-02-26  Ian Lance Taylor  (ian@cygnus.com)
+
+	* aout64.h: Add casts to avoid warnings from SVR4 cc.
+
+1994-02-11  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* ar.h (ARMAG, ARMAGB, ARFMAG): Change '\n' to '\012', for greater
+	portability.
+
+1994-01-21  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* sun4.h: Added information about SunOS shared libraries.
+
+1994-01-07  Jim Kingdon  (kingdon@deneb.cygnus.com)
+
+	* aout64.h (N_TXTADDR): Add comment regarding OMAGIC and NMAGIC.
+
+1993-12-25  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* aout64.h (N_DATOFF): Don't pad (revert change of 8 Jul 1993).
+
+1993-11-16  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* aout64.h: New macros ZMAGIC_DISK_BLOCK_SIZE and N_DISK_BLOCK_SIZE
+	for Linux ZMAGIC.
+	(N_TXTOFF, N_DATOFF): Use them.
+
+1993-11-04  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+	* aout64.h (RELOC_STD_BITS_RELATIVE_LITTLE): Fixed value to match
+	sun3 system; used to overlap other fields.
+	(RELOC_STD_BITS_JMPTABLE_LITTLE): Likewise.
+
+1993-11-03  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* aout64.h (RELOC_STD_BITS_BASEREL_LITTLE): Make it 0x10 (Ken's
+	suggestion) to avoid conflict with RELOC_STD_BITS_EXTERN_LITTLE.
+
+1993-10-29  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* hp300hpux.h (N_SHARED_LIB): Define to be 0.
+
+1993-09-13  John Gilmore  (gnu@cygnus.com)
+
+	* ar.h (ARMAP_TIME_OFFSET):  Add and describe.
+
+Mon Aug 23  Sean Fagan  (sef@cygnus.com)
+
+	* aout64.h [ARCH_SIZE != 64]: Allow N_BADMAG to be overridden.
+
+1993-08-16  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* stab_gnu.h: Include aout/stab.def not just stab.def.
+
+1993-07-18  Jim Kingdon  (kingdon@rtl.cygnus.com)
+
+	* dynix3.h: New, for symmetry running dynix.
+
+1993-07-08  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* aout64.h (N_BADMAG): Recognize QMAGIC.
+	N_TXTOFF, N_TXTADDR, N_TXTSIZE: Special code for QMAGIC.
+	N_DATOFF: Pad text size if we need to.
+
+1993-06-18  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* stab.def (N_ECOML): Fix comment.
+
+1993-05-31  Jim Kingdon  (kingdon@cygnus.com)
+
+	* stab.def: Remove Solaris information on N_FUN stabstring grammar;
+	I've transferred it to gdb/doc/stabs.texinfo, where it belongs.
+
+1993-05-10  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+	* hp300hpux.h: Patch from Glenn Engel for linker problem and
+	compatibility fix:
+	(OMAGIC, NMAGIC): New definitions.
+	(SHAREMAGIC): Deleted.
+	(HPUX_DOT_O_MAGIC): New macro.
+	(_N_BADMAG): Adjusted.
+	(N_HEADER_IN_TEXT, N_DATADDR): New macros.
+
+1993-04-29  Ken Raeburn  (raeburn@deneb.cygnus.com)
+
+	* hp300hpux.h: New file from Glenn Engel, glenne@lsid.hp.com.
+
+1993-04-27  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+	* aout64.h (struct external_exec, *MAGIC, N_BADMAG): Don't define
+	if `external_exec' is already defined as a macro.
+	(N_DATOFF, N_TRELOFF, N_DRELOFF, N_SYMOFF, N_STROFF): Don't define
+	if already defined.
+	(struct external_nlist, EXTERNAL_NLIST_SIZE): Don't define if
+	`external_nlist' is already defined as a macro.
+
+1992-08-15  John Gilmore  (gnu@cygnus.com)
+
+	* adobe.h:  Add description of a.out.adobe format.
+
+1992-07-03  John Gilmore  (gnu at cygnus.com)
+
+	* stab.def:  Update more Solaris definitions.
+	* stab_gnu.h:  Add N_SO language types, and Solaris basic float types.
+
+1992-06-14  John Gilmore  (gnu at cygnus.com)
+
+	* stab.def:  Update descriptions of Solaris-2 stabs; add N_UNDF.
+
+1992-06-11  John Gilmore  (gnu at cygnus.com)
+
+	* stab.def:  Add N_OBJ and N_OPT from Solaris-2.
+
+1992-01-30  John Gilmore  (gnu at cygnus.com)
+
+	* aout64.h: N_TXTSIZE needs some more parentheses.
+	I don't trust C precedence.
+
+1991-12-18  Per Bothner  (bothner at cygnus.com)
+
+	* aout64.h:  Move common sunos-specific test
+	to recognize shared libraries into new macro N_SHARED_LIB.
+	Use it to simplify & reformat N_TXTADDR, N_TXTOFF, N_TXTSIZE.
+
+1991-11-30  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* aout64.h, ar.h, encap.h, host.h, hp.h, ranlib.h, reloc.h,
+	stab.def, stab_gnu.h, sun4.h: All moved from the devo/include
+	directory.
+
+
+Local Variables:
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/aout/aout64.h sdcc-3.2.0+dfsg/support/sdbinutils/include/aout/aout64.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/aout/aout64.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/aout/aout64.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,516 @@
+/* `a.out' object-file definitions, including extensions to 64-bit fields
+
+   Copyright 1999, 2000, 2001, 2003, 2009, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef __A_OUT_64_H__
+#define __A_OUT_64_H__
+
+#ifndef BYTES_IN_WORD
+#define BYTES_IN_WORD 4
+#endif
+
+/* This is the layout on disk of the 32-bit or 64-bit exec header.  */
+
+#ifndef external_exec
+struct external_exec 
+{
+  bfd_byte e_info[4];		    /* Magic number and stuff.  */
+  bfd_byte e_text[BYTES_IN_WORD];   /* Length of text section in bytes.  */
+  bfd_byte e_data[BYTES_IN_WORD];   /* Length of data section in bytes.  */
+  bfd_byte e_bss[BYTES_IN_WORD];    /* Length of bss area in bytes.  */
+  bfd_byte e_syms[BYTES_IN_WORD];   /* Length of symbol table in bytes.  */
+  bfd_byte e_entry[BYTES_IN_WORD];  /* Start address.  */
+  bfd_byte e_trsize[BYTES_IN_WORD]; /* Length of text relocation info.  */
+  bfd_byte e_drsize[BYTES_IN_WORD]; /* Length of data relocation info.  */
+};
+
+#define	EXEC_BYTES_SIZE	(4 + BYTES_IN_WORD * 7)
+
+/* Magic numbers for a.out files.  */
+
+#if ARCH_SIZE==64
+#define OMAGIC 0x1001		/* Code indicating object file.  */
+#define ZMAGIC 0x1002		/* Code indicating demand-paged executable.  */
+#define NMAGIC 0x1003		/* Code indicating pure executable.  */
+
+/* There is no 64-bit QMAGIC as far as I know.  */
+
+#define N_BADMAG(x)	  (N_MAGIC(x) != OMAGIC		\
+			&& N_MAGIC(x) != NMAGIC		\
+  			&& N_MAGIC(x) != ZMAGIC)
+#else
+#define OMAGIC 0407		/* Object file or impure executable.  */
+#define NMAGIC 0410		/* Code indicating pure executable.  */
+#define ZMAGIC 0413		/* Code indicating demand-paged executable.  */
+#define BMAGIC 0415		/* Used by a b.out object.  */
+
+/* This indicates a demand-paged executable with the header in the text.
+   It is used by 386BSD (and variants) and Linux, at least.  */
+#ifndef QMAGIC
+#define QMAGIC 0314
+#endif
+# ifndef N_BADMAG
+#  define N_BADMAG(x)	  (N_MAGIC(x) != OMAGIC		\
+			&& N_MAGIC(x) != NMAGIC		\
+  			&& N_MAGIC(x) != ZMAGIC \
+		        && N_MAGIC(x) != QMAGIC)
+# endif /* N_BADMAG */
+#endif
+
+#endif
+
+#ifdef QMAGIC
+#define N_IS_QMAGIC(x) (N_MAGIC (x) == QMAGIC)
+#else
+#define N_IS_QMAGIC(x) (0)
+#endif
+
+/* The difference between TARGET_PAGE_SIZE and N_SEGSIZE is that TARGET_PAGE_SIZE is
+   the finest granularity at which you can page something, thus it
+   controls the padding (if any) before the text segment of a ZMAGIC
+   file.  N_SEGSIZE is the resolution at which things can be marked as
+   read-only versus read/write, so it controls the padding between the
+   text segment and the data segment (in memory; on disk the padding
+   between them is TARGET_PAGE_SIZE).  TARGET_PAGE_SIZE and N_SEGSIZE are the same
+   for most machines, but different for sun3.  */
+
+/* By default, segment size is constant.  But some machines override this
+   to be a function of the a.out header (e.g. machine type).  */
+
+#ifndef	N_SEGSIZE
+#define	N_SEGSIZE(x)	SEGMENT_SIZE
+#endif
+
+/* Virtual memory address of the text section.
+   This is getting very complicated.  A good reason to discard a.out format
+   for something that specifies these fields explicitly.  But til then...
+
+   * OMAGIC and NMAGIC files:
+       (object files: text for "relocatable addr 0" right after the header)
+       start at 0, offset is EXEC_BYTES_SIZE, size as stated.
+   * The text address, offset, and size of ZMAGIC files depend
+     on the entry point of the file:
+     * entry point below TEXT_START_ADDR:
+       (hack for SunOS shared libraries)
+       start at 0, offset is 0, size as stated.
+     * If N_HEADER_IN_TEXT(x) is true (which defaults to being the
+       case when the entry point is EXEC_BYTES_SIZE or further into a page):
+       no padding is needed; text can start after exec header.  Sun
+       considers the text segment of such files to include the exec header;
+       for BFD's purposes, we don't, which makes more work for us.
+       start at TEXT_START_ADDR + EXEC_BYTES_SIZE, offset is EXEC_BYTES_SIZE,
+       size as stated minus EXEC_BYTES_SIZE.
+     * If N_HEADER_IN_TEXT(x) is false (which defaults to being the case when
+       the entry point is less than EXEC_BYTES_SIZE into a page (e.g. page
+       aligned)): (padding is needed so that text can start at a page boundary)
+       start at TEXT_START_ADDR, offset TARGET_PAGE_SIZE, size as stated.
+
+    Specific configurations may want to hardwire N_HEADER_IN_TEXT,
+    for efficiency or to allow people to play games with the entry point.
+    In that case, you would #define N_HEADER_IN_TEXT(x) as 1 for sunos,
+    and as 0 for most other hosts (Sony News, Vax Ultrix, etc).
+    (Do this in the appropriate bfd target file.)
+    (The default is a heuristic that will break if people try changing
+    the entry point, perhaps with the ld -e flag.)
+
+    * QMAGIC is always like a ZMAGIC for which N_HEADER_IN_TEXT is true,
+    and for which the starting address is TARGET_PAGE_SIZE (or should this be
+    SEGMENT_SIZE?) (TEXT_START_ADDR only applies to ZMAGIC, not to QMAGIC).  */
+
+/* This macro is only relevant for ZMAGIC files; QMAGIC always has the header
+   in the text.  */
+#ifndef N_HEADER_IN_TEXT
+#define N_HEADER_IN_TEXT(x) \
+  (((x).a_entry & (TARGET_PAGE_SIZE-1)) >= EXEC_BYTES_SIZE)
+#endif
+
+/* Sun shared libraries, not linux.  This macro is only relevant for ZMAGIC
+   files.  */
+#ifndef N_SHARED_LIB
+#define N_SHARED_LIB(x) (0)
+#endif
+
+/* Returning 0 not TEXT_START_ADDR for OMAGIC and NMAGIC is based on
+   the assumption that we are dealing with a .o file, not an
+   executable.  This is necessary for OMAGIC (but means we don't work
+   right on the output from ld -N); more questionable for NMAGIC.  */
+
+#ifndef N_TXTADDR
+#define N_TXTADDR(x) \
+    (/* The address of a QMAGIC file is always one page in,		\
+        with the header in the text.  */				\
+     N_IS_QMAGIC (x)							\
+     ? (bfd_vma) TARGET_PAGE_SIZE + EXEC_BYTES_SIZE			\
+     : (N_MAGIC (x) != ZMAGIC						\
+	? (bfd_vma) 0	/* Object file or NMAGIC.  */			\
+	: (N_SHARED_LIB (x)						\
+	   ? (bfd_vma) 0						\
+	   : (N_HEADER_IN_TEXT (x)					\
+	      ? (bfd_vma) TEXT_START_ADDR + EXEC_BYTES_SIZE		\
+	      : (bfd_vma) TEXT_START_ADDR))))
+#endif
+
+/* If N_HEADER_IN_TEXT is not true for ZMAGIC, there is some padding
+   to make the text segment start at a certain boundary.  For most
+   systems, this boundary is TARGET_PAGE_SIZE.  But for Linux, in the
+   time-honored tradition of crazy ZMAGIC hacks, it is 1024 which is
+   not what TARGET_PAGE_SIZE needs to be for QMAGIC.  */
+
+#ifndef ZMAGIC_DISK_BLOCK_SIZE
+#define ZMAGIC_DISK_BLOCK_SIZE TARGET_PAGE_SIZE
+#endif
+
+#define N_DISK_BLOCK_SIZE(x) \
+  (N_MAGIC(x) == ZMAGIC ? ZMAGIC_DISK_BLOCK_SIZE : TARGET_PAGE_SIZE)
+
+/* Offset in an a.out of the start of the text section. */
+#ifndef N_TXTOFF
+#define N_TXTOFF(x)							\
+    (/* For {O,N,Q}MAGIC, no padding.  */				\
+     N_MAGIC (x) != ZMAGIC						\
+     ? EXEC_BYTES_SIZE							\
+     : (N_SHARED_LIB (x)						\
+	? 0								\
+	: (N_HEADER_IN_TEXT (x)						\
+	   ? EXEC_BYTES_SIZE		/* No padding.  */		\
+	   : ZMAGIC_DISK_BLOCK_SIZE	/* A page of padding.  */)))
+#endif
+/* Size of the text section.  It's always as stated, except that we
+   offset it to `undo' the adjustment to N_TXTADDR and N_TXTOFF
+   for ZMAGIC files that nominally include the exec header
+   as part of the first page of text.  (BFD doesn't consider the
+   exec header to be part of the text segment.)  */
+#ifndef N_TXTSIZE
+#define	N_TXTSIZE(x) \
+  (/* For QMAGIC, we don't consider the header part of the text section.  */\
+   N_IS_QMAGIC (x)							\
+   ? (x).a_text - EXEC_BYTES_SIZE					\
+   : ((N_MAGIC (x) != ZMAGIC || N_SHARED_LIB (x))			\
+      ? (x).a_text							\
+      : (N_HEADER_IN_TEXT (x)						\
+	 ? (x).a_text - EXEC_BYTES_SIZE	/* No padding.  */		\
+	 : (x).a_text			/* A page of padding.  */ )))
+#endif
+/* The address of the data segment in virtual memory.
+   It is the text segment address, plus text segment size, rounded
+   up to a N_SEGSIZE boundary for pure or pageable files.  */
+#ifndef N_DATADDR
+#define N_DATADDR(x) \
+  (N_MAGIC (x) == OMAGIC						\
+   ? (N_TXTADDR (x) + N_TXTSIZE (x))					\
+   : (N_SEGSIZE (x) + ((N_TXTADDR (x) + N_TXTSIZE (x) - 1)		\
+		       & ~ (bfd_vma) (N_SEGSIZE (x) - 1))))
+#endif
+/* The address of the BSS segment -- immediately after the data segment.  */
+
+#define N_BSSADDR(x)	(N_DATADDR (x) + (x).a_data)
+
+/* Offsets of the various portions of the file after the text segment.  */
+
+/* For {Q,Z}MAGIC, there is padding to make the data segment start on
+   a page boundary.  Most of the time the a_text field (and thus
+   N_TXTSIZE) already contains this padding.  It is possible that for
+   BSDI and/or 386BSD it sometimes doesn't contain the padding, and
+   perhaps we should be adding it here.  But this seems kind of
+   questionable and probably should be BSDI/386BSD-specific if we do
+   do it.
+
+   For NMAGIC (at least for hp300 BSD, probably others), there is
+   padding in memory only, not on disk, so we must *not* ever pad here
+   for NMAGIC.  */
+
+#ifndef N_DATOFF
+#define N_DATOFF(x)	(N_TXTOFF (x) + N_TXTSIZE (x))
+#endif
+#ifndef N_TRELOFF
+#define N_TRELOFF(x)	(N_DATOFF (x) + (x).a_data)
+#endif
+#ifndef N_DRELOFF
+#define N_DRELOFF(x)	(N_TRELOFF (x) + (x).a_trsize)
+#endif
+#ifndef N_SYMOFF
+#define N_SYMOFF(x)	(N_DRELOFF (x) + (x).a_drsize)
+#endif
+#ifndef N_STROFF
+#define N_STROFF(x)	(N_SYMOFF (x) + (x).a_syms)
+#endif
+
+/* Symbols */
+#ifndef external_nlist
+struct external_nlist
+{
+  bfd_byte e_strx[BYTES_IN_WORD];	/* Index into string table of name.  */
+  bfd_byte e_type[1];			/* Type of symbol.  */
+  bfd_byte e_other[1];			/* Misc info (usually empty).  */
+  bfd_byte e_desc[2];			/* Description field.  */
+  bfd_byte e_value[BYTES_IN_WORD];	/* Value of symbol.  */
+};
+#define EXTERNAL_NLIST_SIZE (BYTES_IN_WORD+4+BYTES_IN_WORD)
+#endif
+
+struct internal_nlist
+{
+  unsigned long n_strx;			/* Index into string table of name.  */
+  unsigned char n_type;			/* Type of symbol.  */
+  unsigned char n_other;		/* Misc info (usually empty).  */
+  unsigned short n_desc;		/* Description field.  */
+  bfd_vma n_value;			/* Value of symbol.  */
+};
+
+/* The n_type field is the symbol type, containing:  */
+
+#define N_UNDF	0	/* Undefined symbol.  */
+#define N_ABS 	2	/* Absolute symbol -- defined at particular addr.  */
+#define N_TEXT 	4	/* Text sym -- defined at offset in text seg.  */
+#define N_DATA 	6	/* Data sym -- defined at offset in data seg.  */
+#define N_BSS 	8	/* BSS  sym -- defined at offset in zero'd seg.  */
+#define	N_COMM	0x12	/* Common symbol (visible after shared lib dynlink).  */
+#define N_FN	0x1f	/* File name of .o file.  */
+#define	N_FN_SEQ 0x0C	/* N_FN from Sequent compilers (sigh).  */
+/* Note: N_EXT can only be usefully OR-ed with N_UNDF, N_ABS, N_TEXT,
+   N_DATA, or N_BSS.  When the low-order bit of other types is set,
+   (e.g. N_WARNING versus N_FN), they are two different types.  */
+#define N_EXT 	1	/* External symbol (as opposed to local-to-this-file).  */
+#define N_TYPE  0x1e
+#define N_STAB 	0xe0	/* If any of these bits are on, it's a debug symbol.  */
+
+#define N_INDR 0x0a
+
+/* The following symbols refer to set elements.
+   All the N_SET[ATDB] symbols with the same name form one set.
+   Space is allocated for the set in the text section, and each set
+   elements value is stored into one word of the space.
+   The first word of the space is the length of the set (number of elements).
+
+   The address of the set is made into an N_SETV symbol
+   whose name is the same as the name of the set.
+   This symbol acts like a N_DATA global symbol
+   in that it can satisfy undefined external references.  */
+
+/* These appear as input to LD, in a .o file.  */
+#define	N_SETA	0x14		/* Absolute set element symbol.  */
+#define	N_SETT	0x16		/* Text set element symbol.  */
+#define	N_SETD	0x18		/* Data set element symbol.  */
+#define	N_SETB	0x1A		/* Bss set element symbol.  */
+
+/* This is output from LD.  */
+#define N_SETV	0x1C		/* Pointer to set vector in data area.  */
+
+/* Warning symbol. The text gives a warning message, the next symbol
+   in the table will be undefined. When the symbol is referenced, the
+   message is printed.  */
+
+#define	N_WARNING 0x1e
+
+/* Weak symbols.  These are a GNU extension to the a.out format.  The
+   semantics are those of ELF weak symbols.  Weak symbols are always
+   externally visible.  The N_WEAK? values are squeezed into the
+   available slots.  The value of a N_WEAKU symbol is 0.  The values
+   of the other types are the definitions.  */
+#define N_WEAKU	0x0d		/* Weak undefined symbol.  */
+#define N_WEAKA 0x0e		/* Weak absolute symbol.  */
+#define N_WEAKT 0x0f		/* Weak text symbol.  */
+#define N_WEAKD 0x10		/* Weak data symbol.  */
+#define N_WEAKB 0x11		/* Weak bss symbol.  */
+
+/* Relocations 
+
+  There	are two types of relocation flavours for a.out systems,
+  standard and extended. The standard form is used on systems where the
+  instruction has room for all the bits of an offset to the operand, whilst
+  the extended form is used when an address operand has to be split over n
+  instructions. Eg, on the 68k, each move instruction can reference
+  the target with a displacement of 16 or 32 bits. On the sparc, move
+  instructions use an offset of 14 bits, so the offset is stored in
+  the reloc field, and the data in the section is ignored.  */
+
+/* This structure describes a single relocation to be performed.
+   The text-relocation section of the file is a vector of these structures,
+   all of which apply to the text section.
+   Likewise, the data-relocation section applies to the data section.  */
+
+struct reloc_std_external
+{
+  bfd_byte r_address[BYTES_IN_WORD];	/* Offset of of data to relocate.  */
+  bfd_byte r_index[3];			/* Symbol table index of symbol.  */
+  bfd_byte r_type[1];			/* Relocation type.  */
+};
+
+#define	RELOC_STD_BITS_PCREL_BIG	((unsigned int) 0x80)
+#define	RELOC_STD_BITS_PCREL_LITTLE	((unsigned int) 0x01)
+
+#define	RELOC_STD_BITS_LENGTH_BIG	((unsigned int) 0x60)
+#define	RELOC_STD_BITS_LENGTH_SH_BIG	5
+#define	RELOC_STD_BITS_LENGTH_LITTLE	((unsigned int) 0x06)
+#define	RELOC_STD_BITS_LENGTH_SH_LITTLE	1
+
+#define	RELOC_STD_BITS_EXTERN_BIG	((unsigned int) 0x10)
+#define	RELOC_STD_BITS_EXTERN_LITTLE	((unsigned int) 0x08)
+
+#define	RELOC_STD_BITS_BASEREL_BIG	((unsigned int) 0x08)
+#define	RELOC_STD_BITS_BASEREL_LITTLE	((unsigned int) 0x10)
+
+#define	RELOC_STD_BITS_JMPTABLE_BIG	((unsigned int) 0x04)
+#define	RELOC_STD_BITS_JMPTABLE_LITTLE	((unsigned int) 0x20)
+
+#define	RELOC_STD_BITS_RELATIVE_BIG	((unsigned int) 0x02)
+#define	RELOC_STD_BITS_RELATIVE_LITTLE	((unsigned int) 0x40)
+
+#define	RELOC_STD_SIZE	(BYTES_IN_WORD + 3 + 1)		/* Bytes per relocation entry.  */
+
+struct reloc_std_internal
+{
+  bfd_vma r_address;		/* Address (within segment) to be relocated.  */
+  /* The meaning of r_symbolnum depends on r_extern.  */
+  unsigned int r_symbolnum:24;
+  /* Nonzero means value is a pc-relative offset
+     and it should be relocated for changes in its own address
+     as well as for changes in the symbol or section specified.  */
+  unsigned int r_pcrel:1;
+  /* Length (as exponent of 2) of the field to be relocated.
+     Thus, a value of 2 indicates 1<<2 bytes.  */
+  unsigned int r_length:2;
+  /* 1 => relocate with value of symbol.
+     r_symbolnum is the index of the symbol
+     in files the symbol table.
+     0 => relocate with the address of a segment.
+     r_symbolnum is N_TEXT, N_DATA, N_BSS or N_ABS
+     (the N_EXT bit may be set also, but signifies nothing).  */
+  unsigned int r_extern:1;
+  /* The next three bits are for SunOS shared libraries, and seem to
+     be undocumented.  */
+  unsigned int r_baserel:1;	/* Linkage table relative.  */
+  unsigned int r_jmptable:1;	/* pc-relative to jump table.  */
+  unsigned int r_relative:1;	/* "relative relocation".  */
+  /* unused */
+  unsigned int r_pad:1;		/* Padding -- set to zero.  */
+};
+
+
+/* EXTENDED RELOCS.   */
+
+struct reloc_ext_external
+{
+  bfd_byte r_address[BYTES_IN_WORD];	/* Offset of of data to relocate.  */
+  bfd_byte r_index[3];			/* Symbol table index of symbol.  */
+  bfd_byte r_type[1];			/* Relocation type.  */
+  bfd_byte r_addend[BYTES_IN_WORD];	/* Datum addend.  */
+};
+
+#ifndef RELOC_EXT_BITS_EXTERN_BIG
+#define	RELOC_EXT_BITS_EXTERN_BIG	((unsigned int) 0x80)
+#endif
+
+#ifndef RELOC_EXT_BITS_EXTERN_LITTLE
+#define	RELOC_EXT_BITS_EXTERN_LITTLE	((unsigned int) 0x01)
+#endif
+
+#ifndef RELOC_EXT_BITS_TYPE_BIG
+#define	RELOC_EXT_BITS_TYPE_BIG		((unsigned int) 0x1F)
+#endif
+
+#ifndef RELOC_EXT_BITS_TYPE_SH_BIG
+#define	RELOC_EXT_BITS_TYPE_SH_BIG	0
+#endif
+
+#ifndef RELOC_EXT_BITS_TYPE_LITTLE
+#define	RELOC_EXT_BITS_TYPE_LITTLE	((unsigned int) 0xF8)
+#endif
+
+#ifndef RELOC_EXT_BITS_TYPE_SH_LITTLE
+#define	RELOC_EXT_BITS_TYPE_SH_LITTLE	3
+#endif
+
+/* Bytes per relocation entry.  */
+#define	RELOC_EXT_SIZE	(BYTES_IN_WORD + 3 + 1 + BYTES_IN_WORD)
+
+enum reloc_type
+{
+  /* Simple relocations.  */
+  RELOC_8,			/* data[0:7] = addend + sv 		*/
+  RELOC_16,			/* data[0:15] = addend + sv 		*/
+  RELOC_32,			/* data[0:31] = addend + sv 		*/
+  /* PC-rel displacement.  */
+  RELOC_DISP8,			/* data[0:7] = addend - pc + sv 	*/
+  RELOC_DISP16,			/* data[0:15] = addend - pc + sv 	*/
+  RELOC_DISP32,			/* data[0:31] = addend - pc + sv 	*/
+  /* Special.  */
+  RELOC_WDISP30,		/* data[0:29] = (addend + sv - pc)>>2 	*/
+  RELOC_WDISP22,		/* data[0:21] = (addend + sv - pc)>>2 	*/
+  RELOC_HI22,			/* data[0:21] = (addend + sv)>>10 	*/
+  RELOC_22,			/* data[0:21] = (addend + sv) 		*/
+  RELOC_13,			/* data[0:12] = (addend + sv)		*/
+  RELOC_LO10,			/* data[0:9] = (addend + sv)		*/
+  RELOC_SFA_BASE,		
+  RELOC_SFA_OFF13,
+  /* P.I.C. (base-relative).  */
+  RELOC_BASE10,  		/* Not sure - maybe we can do this the */
+  RELOC_BASE13,			/* right way now */
+  RELOC_BASE22,
+  /* For some sort of pc-rel P.I.C. (?)  */
+  RELOC_PC10,
+  RELOC_PC22,
+  /* P.I.C. jump table.  */
+  RELOC_JMP_TBL,
+  /* Reputedly for shared libraries somehow.  */
+  RELOC_SEGOFF16,
+  RELOC_GLOB_DAT,
+  RELOC_JMP_SLOT,
+  RELOC_RELATIVE,
+
+  RELOC_11,	
+  RELOC_WDISP2_14,
+  RELOC_WDISP19,
+  RELOC_HHI22,			/* data[0:21] = (addend + sv) >> 42     */
+  RELOC_HLO10,			/* data[0:9] = (addend + sv) >> 32      */
+  
+  /* 29K relocation types.  */
+  RELOC_JUMPTARG,
+  RELOC_CONST,
+  RELOC_CONSTH,
+  
+  /* All the new ones I can think of, for sparc v9.  */
+  RELOC_64,			/* data[0:63] = addend + sv 		*/
+  RELOC_DISP64,			/* data[0:63] = addend - pc + sv 	*/
+  RELOC_WDISP21,		/* data[0:20] = (addend + sv - pc)>>2 	*/
+  RELOC_DISP21,			/* data[0:20] = addend - pc + sv        */
+  RELOC_DISP14,			/* data[0:13] = addend - pc + sv 	*/
+  /* Q .
+     What are the other ones,
+     Since this is a clean slate, can we throw away the ones we dont
+     understand ? Should we sort the values ? What about using a
+     microcode format like the 68k ?  */
+  NO_RELOC
+  };
+
+
+struct reloc_internal
+{
+  bfd_vma r_address;		/* Offset of of data to relocate.  */
+  long	r_index;		/* Symbol table index of symbol.  */
+  enum reloc_type r_type;	/* Relocation type.  */
+  bfd_vma r_addend;		/* Datum addend.  */
+};
+
+/* Q.
+   Should the length of the string table be 4 bytes or 8 bytes ?
+
+   Q.
+   What about archive indexes ?  */
+
+#endif				/* __A_OUT_64_H__ */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/aout/ar.h sdcc-3.2.0+dfsg/support/sdbinutils/include/aout/ar.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/aout/ar.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/aout/ar.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,55 @@
+/* archive file definition for GNU software
+
+   Copyright 2001, 2008, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* So far this is correct for BSDish archives.  Don't forget that
+   files must begin on an even byte boundary. */
+
+#ifndef __GNU_AR_H__
+#define __GNU_AR_H__
+
+/* Note that the usual '\n' in magic strings may translate to different
+   characters, as allowed by ANSI.  '\012' has a fixed value, and remains
+   compatible with existing BSDish archives. */
+
+#define ARMAG  "!<arch>\012"	/* For COFF and a.out archives.  */
+#define ARMAGB "!<bout>\012"	/* For b.out archives.  */
+#define ARMAGT "!<thin>\012"	/* For thin archives.  */
+#define SARMAG 8
+#define ARFMAG "`\012"
+
+/* The ar_date field of the armap (__.SYMDEF) member of an archive
+   must be greater than the modified date of the entire file, or 
+   BSD-derived linkers complain.  We originally write the ar_date with
+   this offset from the real file's mod-time.  After finishing the
+   file, we rewrite ar_date if it's not still greater than the mod date.  */
+
+#define ARMAP_TIME_OFFSET       60
+
+struct ar_hdr
+{
+  char ar_name[16];		/* Name of this member.  */
+  char ar_date[12];		/* File mtime.  */
+  char ar_uid[6];		/* Owner uid; printed as decimal.  */
+  char ar_gid[6];		/* Owner gid; printed as decimal.  */
+  char ar_mode[8];		/* File mode, printed as octal.   */
+  char ar_size[10];		/* File size, printed as decimal.  */
+  char ar_fmag[2];		/* Should contain ARFMAG.  */
+};
+
+#endif /* __GNU_AR_H__ */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/aout/ranlib.h sdcc-3.2.0+dfsg/support/sdbinutils/include/aout/ranlib.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/aout/ranlib.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/aout/ranlib.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,63 @@
+/* ranlib.h -- archive library index member definition for GNU.
+   Copyright 1990, 1991, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* The Symdef member of an archive contains two things:
+   a table that maps symbol-string offsets to file offsets,
+   and a symbol-string table.  All the symbol names are
+   run together (each with trailing null) in the symbol-string
+   table.  There is a single longword bytecount on the front
+   of each of these tables.  Thus if we have two symbols,
+   "foo" and "_bar", that are in archive members at offsets
+   200 and 900, it would look like this:
+        16		; byte count of index table
+  	0		; offset of "foo" in string table
+  	200		; offset of foo-module in file
+  	4		; offset of "bar" in string table
+  	900		; offset of bar-module in file
+  	9		; byte count of string table
+  	"foo\0_bar\0"	; string table  */
+
+#define	RANLIBMAG	"__.SYMDEF"	/* Archive file name containing index */
+#define	RANLIBSKEW	3		/* Creation time offset */
+
+/* Format of __.SYMDEF:
+   First, a longword containing the size of the 'symdef' data that follows.
+   Second, zero or more 'symdef' structures.
+   Third, a longword containing the length of symbol name strings.
+   Fourth, zero or more symbol name strings (each followed by a null).  */
+
+struct symdef
+  {
+    union
+      {
+	unsigned long string_offset;	/* In the file */
+	char *name;			/* In memory, sometimes */
+      } s;
+    /* this points to the front of the file header (AKA member header --
+       a struct ar_hdr), not to the front of the file or into the file).
+       in other words it only tells you which file to read */       
+    unsigned long file_offset;
+  };
+
+/* Compatability with BSD code */
+
+#define	ranlib	symdef
+#define	ran_un	s
+#define	ran_strx string_offset
+#define	ran_name name
+#define	ran_off	file_offset
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/aout/stab.def sdcc-3.2.0+dfsg/support/sdbinutils/include/aout/stab.def
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/aout/stab.def	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/aout/stab.def	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,283 @@
+/* Table of DBX symbol codes for the GNU system.
+   Copyright 1988, 1991, 1992, 1993, 1994, 1996, 1998, 2004, 2010
+   Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 3 of the
+   License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* New stab from Solaris 2.  This uses an n_type of 0, which in a.out files
+   overlaps the N_UNDF used for ordinary symbols.  In ELF files, the
+   debug information is in a different file section, so there is no conflict.
+   This symbol's n_value gives the size of the string section associated
+   with this file.  The symbol's n_strx (relative to the just-updated
+   string section start address) gives the name of the source file,
+   e.g. "foo.c", without any path information.  The symbol's n_desc gives
+   the count of upcoming symbols associated with this file (not including
+   this one).  */
+/* __define_stab (N_UNDF, 0x00, "UNDF")  */
+
+/* Global variable.  Only the name is significant.
+   To find the address, look in the corresponding external symbol.  */
+__define_stab (N_GSYM, 0x20, "GSYM")
+
+/* Function name for BSD Fortran.  Only the name is significant.
+   To find the address, look in the corresponding external symbol.  */
+__define_stab (N_FNAME, 0x22, "FNAME")
+
+/* Function name or text-segment variable for C.  Value is its address.
+   Desc is supposedly starting line number, but GCC doesn't set it
+   and DBX seems not to miss it.  */
+__define_stab (N_FUN, 0x24, "FUN")
+
+/* Data-segment variable with internal linkage.  Value is its address.
+   "Static Sym".  */
+__define_stab (N_STSYM, 0x26, "STSYM")
+
+/* BSS-segment variable with internal linkage.  Value is its address.  */
+__define_stab (N_LCSYM, 0x28, "LCSYM")
+
+/* Name of main routine.  Only the name is significant.  */
+__define_stab (N_MAIN, 0x2a, "MAIN")
+
+/* Solaris2:  Read-only data symbols.  */
+__define_stab (N_ROSYM, 0x2c, "ROSYM")
+
+/* MacOS X:
+   The beginning of a relocatable function block - including stabs.  */
+__define_stab (N_BNSYM, 0x2e, "BNSYM")
+
+/* Global symbol in Pascal.
+   Supposedly the value is its line number; I'm skeptical.  */
+__define_stab (N_PC, 0x30, "PC")
+
+/* Number of symbols:  0, files,,funcs,lines according to Ultrix V4.0. */
+__define_stab (N_NSYMS, 0x32, "NSYMS")
+
+/* "No DST map for sym: name, ,0,type,ignored"  according to Ultrix V4.0. */
+__define_stab (N_NOMAP, 0x34, "NOMAP")
+
+/* New stab from Solaris 2.  Like N_SO, but for the object file.  Two in
+   a row provide the build directory and the relative path of the .o from it.
+   Solaris2 uses this to avoid putting the stabs info into the linked
+   executable; this stab goes into the ".stab.index" section, and the debugger
+   reads the real stabs directly from the .o files instead.  */
+__define_stab (N_OBJ, 0x38, "OBJ")
+
+/* New stab from Solaris 2.  Options for the debugger, related to the
+   source language for this module.  E.g. whether to use ANSI
+   integral promotions or traditional integral promotions.  */
+__define_stab (N_OPT, 0x3c, "OPT")
+
+/* Register variable.  Value is number of register.  */
+__define_stab (N_RSYM, 0x40, "RSYM")
+
+/* Modula-2 compilation unit.  Can someone say what info it contains?  */
+__define_stab (N_M2C, 0x42, "M2C")
+
+/* Line number in text segment.  Desc is the line number;
+   value is corresponding address.  On Solaris2, the line number is
+   relative to the start of the current function.  */
+__define_stab (N_SLINE, 0x44, "SLINE")
+
+/* Similar, for data segment.  */
+__define_stab (N_DSLINE, 0x46, "DSLINE")
+
+/* Similar, for bss segment.  */
+__define_stab (N_BSLINE, 0x48, "BSLINE")
+
+/* Sun's source-code browser stabs.  ?? Don't know what the fields are.
+   Supposedly the field is "path to associated .cb file".  THIS VALUE
+   OVERLAPS WITH N_BSLINE!  */
+__define_stab_duplicate (N_BROWS, 0x48, "BROWS")
+
+/* GNU Modula-2 definition module dependency.  Value is the modification time
+   of the definition file.  Other is non-zero if it is imported with the
+   GNU M2 keyword %INITIALIZE.  Perhaps N_M2C can be used if there
+   are enough empty fields? */
+__define_stab(N_DEFD, 0x4a, "DEFD")
+
+/* New in Solaris2.  Function start/body/end line numbers.  */
+__define_stab(N_FLINE, 0x4C, "FLINE")
+
+/* MacOS X: This tells the end of a relocatable function + debugging info.  */
+__define_stab(N_ENSYM, 0x4E, "ENSYM")
+
+/* THE FOLLOWING TWO STAB VALUES CONFLICT.  Happily, one is for Modula-2
+   and one is for C++.   Still,... */
+/* GNU C++ exception variable.  Name is variable name.  */
+__define_stab (N_EHDECL, 0x50, "EHDECL")
+/* Modula2 info "for imc":  name,,0,0,0  according to Ultrix V4.0.  */
+__define_stab_duplicate (N_MOD2, 0x50, "MOD2")
+
+/* GNU C++ `catch' clause.  Value is its address.  Desc is nonzero if
+   this entry is immediately followed by a CAUGHT stab saying what exception
+   was caught.  Multiple CAUGHT stabs means that multiple exceptions
+   can be caught here.  If Desc is 0, it means all exceptions are caught
+   here.  */
+__define_stab (N_CATCH, 0x54, "CATCH")
+
+/* Structure or union element.  Value is offset in the structure.  */
+__define_stab (N_SSYM, 0x60, "SSYM")
+
+/* Solaris2:  Last stab emitted for module.  */
+__define_stab (N_ENDM, 0x62, "ENDM")
+
+/* Name of main source file.
+   Value is starting text address of the compilation.
+   If multiple N_SO's appear, the first to contain a trailing / is the
+   compilation directory.  The first to not contain a trailing / is the
+   source file name, relative to the compilation directory.  Others (perhaps
+   resulting from cfront) are ignored.
+   On Solaris2, value is undefined, but desc is a source-language code.  */
+
+__define_stab (N_SO, 0x64, "SO")
+
+/* Apple:  This is the stab that associated the .o file with the
+   N_SO stab, in the case where debug info is mostly stored in the .o file.  */
+__define_stab (N_OSO, 0x66, "OSO")
+
+/* SunPro F77:  Name of alias.  */
+__define_stab (N_ALIAS, 0x6c, "ALIAS")
+
+/* Automatic variable in the stack.  Value is offset from frame pointer.
+   Also used for type descriptions.  */
+__define_stab (N_LSYM, 0x80, "LSYM")
+
+/* Beginning of an include file.  Only Sun uses this.
+   In an object file, only the name is significant.
+   The Sun linker puts data into some of the other fields.  */
+__define_stab (N_BINCL, 0x82, "BINCL")
+
+/* Name of sub-source file (#include file).
+   Value is starting text address of the compilation.  */
+__define_stab (N_SOL, 0x84, "SOL")
+
+/* Parameter variable.  Value is offset from argument pointer.
+   (On most machines the argument pointer is the same as the frame pointer.  */
+__define_stab (N_PSYM, 0xa0, "PSYM")
+
+/* End of an include file.  No name.
+   This and N_BINCL act as brackets around the file's output.
+   In an object file, there is no significant data in this entry.
+   The Sun linker puts data into some of the fields.  */
+__define_stab (N_EINCL, 0xa2, "EINCL")
+
+/* Alternate entry point.  Value is its address.  */
+__define_stab (N_ENTRY, 0xa4, "ENTRY")
+
+/* Beginning of lexical block.
+   The desc is the nesting level in lexical blocks.
+   The value is the address of the start of the text for the block.
+   The variables declared inside the block *precede* the N_LBRAC symbol.
+   On Solaris2, the value is relative to the start of the current function.  */
+__define_stab (N_LBRAC, 0xc0, "LBRAC")
+
+/* Place holder for deleted include file.  Replaces a N_BINCL and everything
+   up to the corresponding N_EINCL.  The Sun linker generates these when
+   it finds multiple identical copies of the symbols from an include file.
+   This appears only in output from the Sun linker.  */
+__define_stab (N_EXCL, 0xc2, "EXCL")
+
+/* Modula-2 scope information.  Can someone say what info it contains?  */
+__define_stab (N_SCOPE, 0xc4, "SCOPE")
+
+/* Solaris2: Patch Run Time Checker.  */
+__define_stab (N_PATCH, 0xd0, "PATCH")
+
+/* End of a lexical block.  Desc matches the N_LBRAC's desc.
+   The value is the address of the end of the text for the block.
+   On Solaris2, the value is relative to the start of the current function.  */
+__define_stab (N_RBRAC, 0xe0, "RBRAC")
+
+/* Begin named common block.  Only the name is significant.  */
+__define_stab (N_BCOMM, 0xe2, "BCOMM")
+
+/* End named common block.  Only the name is significant
+   (and it should match the N_BCOMM).  */
+__define_stab (N_ECOMM, 0xe4, "ECOMM")
+
+/* Member of a common block; value is offset within the common block.
+   This should occur within a BCOMM/ECOMM pair.  */
+__define_stab (N_ECOML, 0xe8, "ECOML")
+
+/* Solaris2: Pascal "with" statement: type,,0,0,offset */
+__define_stab (N_WITH, 0xea, "WITH")
+
+/* These STAB's are used on Gould systems for Non-Base register symbols
+   or something like that.  FIXME.  I have assigned the values at random
+   since I don't have a Gould here.  Fixups from Gould folk welcome... */
+__define_stab (N_NBTEXT, 0xF0, "NBTEXT")
+__define_stab (N_NBDATA, 0xF2, "NBDATA")
+__define_stab (N_NBBSS,  0xF4, "NBBSS")
+__define_stab (N_NBSTS,  0xF6, "NBSTS")
+__define_stab (N_NBLCS,  0xF8, "NBLCS")
+
+/* Second symbol entry containing a length-value for the preceding entry.
+   The value is the length.  */
+__define_stab (N_LENG, 0xfe, "LENG")
+
+/* The above information, in matrix format.
+
+			STAB MATRIX
+	_________________________________________________
+	| 00 - 1F are not dbx stab symbols		|
+	| In most cases, the low bit is the EXTernal bit|
+
+	| 00 UNDEF  | 02 ABS	| 04 TEXT   | 06 DATA	|
+	| 01  |EXT  | 03  |EXT	| 05  |EXT  | 07  |EXT	|
+
+	| 08 BSS    | 0A INDR	| 0C FN_SEQ | 0E WEAKA	|
+	| 09  |EXT  | 0B 	| 0D WEAKU  | 0F WEAKT	|
+
+	| 10 WEAKD  | 12 COMM	| 14 SETA   | 16 SETT	|
+	| 11 WEAKB  | 13	| 15 	    | 17	|
+
+	| 18 SETD   | 1A SETB	| 1C SETV   | 1E WARNING|
+	| 19	    | 1B	| 1D 	    | 1F FN	|
+
+	|_______________________________________________|
+	| Debug entries with bit 01 set are unused.	|
+	| 20 GSYM   | 22 FNAME	| 24 FUN    | 26 STSYM	|
+	| 28 LCSYM  | 2A MAIN	| 2C ROSYM  | 2E	|
+	| 30 PC	    | 32 NSYMS	| 34 NOMAP  | 36	|
+	| 38 OBJ    | 3A	| 3C OPT    | 3E	|
+	| 40 RSYM   | 42 M2C	| 44 SLINE  | 46 DSLINE |
+	| 48 BSLINE*| 4A DEFD	| 4C FLINE  | 4E	|
+	| 50 EHDECL*| 52	| 54 CATCH  | 56        |
+	| 58        | 5A        | 5C        | 5E	|
+	| 60 SSYM   | 62 ENDM	| 64 SO	    | 66 	|
+	| 68 	    | 6A	| 6C ALIAS  | 6E	|
+	| 70	    | 72	| 74	    | 76	|
+	| 78	    | 7A	| 7C	    | 7E	|
+	| 80 LSYM   | 82 BINCL	| 84 SOL    | 86	|
+	| 88	    | 8A	| 8C	    | 8E	|
+	| 90	    | 92	| 94	    | 96	|
+	| 98	    | 9A	| 9C	    | 9E	|
+	| A0 PSYM   | A2 EINCL	| A4 ENTRY  | A6	|
+	| A8	    | AA	| AC	    | AE	|
+	| B0	    | B2	| B4	    | B6	|
+	| B8	    | BA	| BC	    | BE	|
+	| C0 LBRAC  | C2 EXCL	| C4 SCOPE  | C6	|
+	| C8	    | CA	| CC	    | CE	|
+	| D0 PATCH  | D2	| D4	    | D6	|
+	| D8	    | DA	| DC	    | DE	|
+	| E0 RBRAC  | E2 BCOMM	| E4 ECOMM  | E6	|
+	| E8 ECOML  | EA WITH	| EC	    | EE	|
+	| F0	    | F2	| F4	    | F6	|
+	| F8	    | FA	| FC	    | FE LENG	|
+	+-----------------------------------------------+
+ * 50 EHDECL is also MOD2.
+ * 48 BSLINE is also BROWS.
+ */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/aout/stab_gnu.h sdcc-3.2.0+dfsg/support/sdbinutils/include/aout/stab_gnu.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/aout/stab_gnu.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/aout/stab_gnu.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,55 @@
+/* gnu_stab.h  Definitions for GNU extensions to STABS
+
+   Copyright 2001, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+#ifndef __GNU_STAB__
+
+/* Indicate the GNU stab.h is in use.  */
+
+#define __GNU_STAB__
+
+#define __define_stab(NAME, CODE, STRING) NAME=CODE,
+#define __define_stab_duplicate(NAME, CODE, STRING) NAME=CODE,
+
+enum __stab_debug_code
+{
+#include "aout/stab.def"
+LAST_UNUSED_STAB_CODE
+};
+
+#undef __define_stab
+
+/* Definitions of "desc" field for N_SO stabs in Solaris2.  */
+
+#define	N_SO_AS		1
+#define	N_SO_C		2
+#define	N_SO_ANSI_C	3
+#define	N_SO_CC		4	/* C++ */
+#define	N_SO_FORTRAN	5
+#define	N_SO_PASCAL	6
+
+/* Solaris2: Floating point type values in basic types.  */
+
+#define	NF_NONE		0
+#define	NF_SINGLE	1	/* IEEE 32-bit */
+#define	NF_DOUBLE	2	/* IEEE 64-bit */
+#define	NF_COMPLEX	3	/* Fortran complex */
+#define	NF_COMPLEX16	4	/* Fortran double complex */
+#define	NF_COMPLEX32	5	/* Fortran complex*16 */
+#define	NF_LDOUBLE	6	/* Long double (whatever that is) */
+
+#endif /* __GNU_STAB_ */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/aout/sun4.h sdcc-3.2.0+dfsg/support/sdbinutils/include/aout/sun4.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/aout/sun4.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/aout/sun4.h	2012-02-16 07:35:16.000000000 +0000
@@ -0,0 +1,239 @@
+/* SPARC-specific values for a.out files 
+
+   Copyright 2001, 2009, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* Some systems, e.g., AIX, may have defined this in header files already
+   included.  */
+#undef  TARGET_PAGE_SIZE
+#define TARGET_PAGE_SIZE	0x2000		/* 8K.  aka NBPG in <sys/param.h> */
+/* Note that some SPARCs have 4K pages, some 8K, some others.  */
+
+#define SEG_SIZE_SPARC	TARGET_PAGE_SIZE
+#define	SEG_SIZE_SUN3	0x20000		/* Resolution of r/w protection hw */
+
+#define TEXT_START_ADDR	TARGET_PAGE_SIZE	/* Location 0 is not accessible */
+#define N_HEADER_IN_TEXT(x) 1
+
+/* Non-default definitions of the accessor macros... */
+
+/* Segment size varies on Sun-3 versus Sun-4.  */
+
+#define N_SEGSIZE(x)	(N_MACHTYPE(x) == M_SPARC?	SEG_SIZE_SPARC:	\
+			 N_MACHTYPE(x) == M_68020?	SEG_SIZE_SUN3:	\
+			/* Guess? */			TARGET_PAGE_SIZE)
+
+/* Virtual Address of text segment from the a.out file.  For OMAGIC,
+   (almost always "unlinked .o's" these days), should be zero.
+   Sun added a kludge so that shared libraries linked ZMAGIC get
+   an address of zero if a_entry (!!!) is lower than the otherwise
+   expected text address.  These kludges have gotta go!
+   For linked files, should reflect reality if we know it.  */
+
+#define N_SHARED_LIB(x) ((x).a_entry < TEXT_START_ADDR \
+			 && (x).a_text >= EXEC_BYTES_SIZE)
+
+/* This differs from the version in aout64.h (which we override by defining
+   it here) only for NMAGIC (we return TEXT_START_ADDR+EXEC_BYTES_SIZE;
+   they return 0).  */
+
+#define N_TXTADDR(x) \
+    (N_MAGIC(x)==OMAGIC? 0 \
+     : (N_MAGIC(x) == ZMAGIC && (x).a_entry < TEXT_START_ADDR)? 0 \
+     : TEXT_START_ADDR+EXEC_BYTES_SIZE)
+
+/* When a file is linked against a shared library on SunOS 4, the
+   dynamic bit in the exec header is set, and the first symbol in the
+   symbol table is __DYNAMIC.  Its value is the address of the
+   following structure.  */
+
+struct external_sun4_dynamic
+{
+  /* The version number of the structure.  SunOS 4.1.x creates files
+     with version number 3, which is what this structure is based on.
+     According to gdb, version 2 is similar.  I believe that version 2
+     used a different type of procedure linkage table, and there may
+     have been other differences.  */
+  bfd_byte ld_version[4];
+  /* The virtual address of a 28 byte structure used in debugging.
+     The contents are filled in at run time by ld.so.  */
+  bfd_byte ldd[4];
+  /* The virtual address of another structure with information about
+     how to relocate the executable at run time.  */
+  bfd_byte ld[4];
+};
+
+/* The size of the debugging structure pointed to by the debugger
+   field of __DYNAMIC.  */
+#define EXTERNAL_SUN4_DYNAMIC_DEBUGGER_SIZE (24)
+
+/* The structure pointed to by the linker field of __DYNAMIC.  As far
+   as I can tell, most of the addresses in this structure are offsets
+   within the file, but some are actually virtual addresses.  */
+
+struct internal_sun4_dynamic_link
+{
+  /* Linked list of loaded objects.  This is filled in at runtime by
+     ld.so and probably by dlopen.  */
+  unsigned long ld_loaded;
+
+  /* The address of the list of names of shared objects which must be
+     included at runtime.  Each entry in the list is 16 bytes: the 4
+     byte address of the string naming the object (e.g., for -lc this
+     is "c"); 4 bytes of flags--the high bit is whether to search for
+     the object using the library path; the 2 byte major version
+     number; the 2 byte minor version number; the 4 byte address of
+     the next entry in the list (zero if this is the last entry).  The
+     version numbers seem to only be non-zero when doing library
+     searching.  */
+  unsigned long ld_need;
+
+  /* The address of the path to search for the shared objects which
+     must be included.  This points to a string in PATH format which
+     is generated from the -L arguments to the linker.  According to
+     the man page, ld.so implicitly adds ${LD_LIBRARY_PATH} to the
+     beginning of this string and /lib:/usr/lib:/usr/local/lib to the
+     end.  The string is terminated by a null byte.  This field is
+     zero if there is no additional path.  */
+  unsigned long ld_rules;
+
+  /* The address of the global offset table.  This appears to be a
+     virtual address, not a file offset.  The first entry in the
+     global offset table seems to be the virtual address of the
+     sun4_dynamic structure (the same value as the __DYNAMIC symbol).
+     The global offset table is used for PIC code to hold the
+     addresses of variables.  A dynamically linked file which does not
+     itself contain PIC code has a four byte global offset table.  */
+  unsigned long ld_got;
+
+  /* The address of the procedure linkage table.  This appears to be a
+     virtual address, not a file offset.
+
+     On a SPARC, the table is composed of 12 byte entries, each of
+     which consists of three instructions.  The first entry is
+         sethi %hi(0),%g1
+	 jmp %g1
+	 nop
+     These instructions are changed by ld.so into a jump directly into
+     ld.so itself.  Each subsequent entry is
+         save %sp, -96, %sp
+	 call <address of first entry in procedure linkage table>
+	 <reloc_number | 0x01000000>
+     The reloc_number is the number of the reloc to use to resolve
+     this entry.  The reloc will be a JMP_SLOT reloc against some
+     symbol that is not defined in this object file but should be
+     defined in a shared object (if it is not, ld.so will report a
+     runtime error and exit).  The constant 0x010000000 turns the
+     reloc number into a sethi of %g0, which does nothing since %g0 is
+     hardwired to zero.
+
+     When one of these entries is executed, it winds up calling into
+     ld.so.  ld.so looks at the reloc number, available via the return
+     address, to determine which entry this is.  It then looks at the
+     reloc and patches up the entry in the table into a sethi and jmp
+     to the real address followed by a nop.  This means that the reloc
+     lookup only has to happen once, and it also means that the
+     relocation only needs to be done if the function is actually
+     called.  The relocation is expensive because ld.so must look up
+     the symbol by name.
+
+     The size of the procedure linkage table is given by the ld_plt_sz
+     field.  */
+  unsigned long ld_plt;
+
+  /* The address of the relocs.  These are in the same format as
+     ordinary relocs.  Symbol index numbers refer to the symbols
+     pointed to by ld_stab.  I think the only way to determine the
+     number of relocs is to assume that all the bytes from ld_rel to
+     ld_hash contain reloc entries.  */
+  unsigned long ld_rel;
+
+  /* The address of a hash table of symbols.  The hash table has
+     roughly the same number of entries as there are dynamic symbols;
+     I think the only way to get the exact size is to assume that
+     every byte from ld_hash to ld_stab is devoted to the hash table.
+
+     Each entry in the hash table is eight bytes.  The first four
+     bytes are a symbol index into the dynamic symbols.  The second
+     four bytes are the index of the next hash table entry in the
+     bucket.  The ld_buckets field gives the number of buckets, say B.
+     The first B entries in the hash table each start a bucket which
+     is chained through the second four bytes of each entry.  A value
+     of zero ends the chain.
+
+     The hash function is simply
+         h = 0;
+         while (*string != '\0')
+	   h = (h << 1) + *string++;
+	 h &= 0x7fffffff;
+
+     To look up a symbol, compute the hash value of the name.  Take
+     the modulos of hash value and the number of buckets.  Start at
+     that entry in the hash table.  See if the symbol (from the first
+     four bytes of the hash table entry) has the name you are looking
+     for.  If not, use the chain field (the second four bytes of the
+     hash table entry) to move on to the next entry in this bucket.
+     If the chain field is zero you have reached the end of the
+     bucket, and the symbol is not in the hash table.  */ 
+  unsigned long ld_hash;
+
+  /* The address of the symbol table.  This is a list of
+     external_nlist structures.  The string indices are relative to
+     the ld_symbols field.  I think the only way to determine the
+     number of symbols is to assume that all the bytes between ld_stab
+     and ld_symbols are external_nlist structures.  */
+  unsigned long ld_stab;
+
+  /* I don't know what this is for.  It seems to always be zero.  */
+  unsigned long ld_stab_hash;
+
+  /* The number of buckets in the hash table.  */
+  unsigned long ld_buckets;
+
+  /* The address of the symbol string table.  The first string in this
+     string table need not be the empty string.  */
+  unsigned long ld_symbols;
+
+  /* The size in bytes of the symbol string table.  */
+  unsigned long ld_symb_size;
+
+  /* The size in bytes of the text segment.  */
+  unsigned long ld_text;
+
+  /* The size in bytes of the procedure linkage table.  */
+  unsigned long ld_plt_sz;
+};
+
+/* The external form of the structure.  */
+
+struct external_sun4_dynamic_link
+{
+  bfd_byte ld_loaded[4];
+  bfd_byte ld_need[4];
+  bfd_byte ld_rules[4];
+  bfd_byte ld_got[4];
+  bfd_byte ld_plt[4];
+  bfd_byte ld_rel[4];
+  bfd_byte ld_hash[4];
+  bfd_byte ld_stab[4];
+  bfd_byte ld_stab_hash[4];
+  bfd_byte ld_buckets[4];
+  bfd_byte ld_symbols[4];
+  bfd_byte ld_symb_size[4];
+  bfd_byte ld_text[4];
+  bfd_byte ld_plt_sz[4];
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/bfdlink.h sdcc-3.2.0+dfsg/support/sdbinutils/include/bfdlink.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/bfdlink.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/bfdlink.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,816 @@
+/* bfdlink.h -- header file for BFD link routines
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Steve Chamberlain and Ian Lance Taylor, Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef BFDLINK_H
+#define BFDLINK_H
+
+/* Which symbols to strip during a link.  */
+enum bfd_link_strip
+{
+  strip_none,		/* Don't strip any symbols.  */
+  strip_debugger,	/* Strip debugging symbols.  */
+  strip_some,		/* keep_hash is the list of symbols to keep.  */
+  strip_all		/* Strip all symbols.  */
+};
+
+/* Which local symbols to discard during a link.  This is irrelevant
+   if strip_all is used.  */
+enum bfd_link_discard
+{
+  discard_sec_merge,	/* Discard local temporary symbols in SEC_MERGE
+			   sections.  */
+  discard_none,		/* Don't discard any locals.  */
+  discard_l,		/* Discard local temporary symbols.  */
+  discard_all		/* Discard all locals.  */
+};
+
+/* Describes the type of hash table entry structure being used.
+   Different hash table structure have different fields and so
+   support different linking features.  */
+enum bfd_link_hash_table_type
+  {
+    bfd_link_generic_hash_table,
+    bfd_link_elf_hash_table
+  };
+
+/* These are the possible types of an entry in the BFD link hash
+   table.  */
+
+enum bfd_link_hash_type
+{
+  bfd_link_hash_new,		/* Symbol is new.  */
+  bfd_link_hash_undefined,	/* Symbol seen before, but undefined.  */
+  bfd_link_hash_undefweak,	/* Symbol is weak and undefined.  */
+  bfd_link_hash_defined,	/* Symbol is defined.  */
+  bfd_link_hash_defweak,	/* Symbol is weak and defined.  */
+  bfd_link_hash_common,		/* Symbol is common.  */
+  bfd_link_hash_indirect,	/* Symbol is an indirect link.  */
+  bfd_link_hash_warning		/* Like indirect, but warn if referenced.  */
+};
+
+enum bfd_link_common_skip_ar_symbols
+{
+  bfd_link_common_skip_none,
+  bfd_link_common_skip_text,
+  bfd_link_common_skip_data,
+  bfd_link_common_skip_all
+};
+
+struct bfd_link_hash_common_entry
+  {
+    unsigned int alignment_power;	/* Alignment.  */
+    asection *section;		/* Symbol section.  */
+  };
+
+/* The linking routines use a hash table which uses this structure for
+   its elements.  */
+
+struct bfd_link_hash_entry
+{
+  /* Base hash table entry structure.  */
+  struct bfd_hash_entry root;
+
+  /* Type of this entry.  */
+  ENUM_BITFIELD (bfd_link_hash_type) type : 8;
+
+  unsigned int non_ir_ref : 1;
+
+  /* A union of information depending upon the type.  */
+  union
+    {
+      /* Nothing is kept for bfd_hash_new.  */
+      /* bfd_link_hash_undefined, bfd_link_hash_undefweak.  */
+      struct
+	{
+	  /* Undefined and common symbols are kept in a linked list through
+	     this field.  This field is present in all of the union element
+	     so that we don't need to remove entries from the list when we
+	     change their type.  Removing entries would either require the
+	     list to be doubly linked, which would waste more memory, or
+	     require a traversal.  When an undefined or common symbol is
+	     created, it should be added to this list, the head of which is in
+	     the link hash table itself.  As symbols are defined, they need
+	     not be removed from the list; anything which reads the list must
+	     doublecheck the symbol type.
+
+	     Weak symbols are not kept on this list.
+
+	     Defined and defweak symbols use this field as a reference marker.
+	     If the field is not NULL, or this structure is the tail of the
+	     undefined symbol list, the symbol has been referenced.  If the
+	     symbol is undefined and becomes defined, this field will
+	     automatically be non-NULL since the symbol will have been on the
+	     undefined symbol list.  */
+	  struct bfd_link_hash_entry *next;
+	  bfd *abfd;		/* BFD symbol was found in.  */
+	} undef;
+      /* bfd_link_hash_defined, bfd_link_hash_defweak.  */
+      struct
+	{
+	  struct bfd_link_hash_entry *next;
+	  asection *section;	/* Symbol section.  */
+	  bfd_vma value;	/* Symbol value.  */
+	} def;
+      /* bfd_link_hash_indirect, bfd_link_hash_warning.  */
+      struct
+	{
+	  struct bfd_link_hash_entry *next;
+	  struct bfd_link_hash_entry *link;	/* Real symbol.  */
+	  const char *warning;	/* Warning (bfd_link_hash_warning only).  */
+	} i;
+      /* bfd_link_hash_common.  */
+      struct
+	{
+	  struct bfd_link_hash_entry *next;
+	  /* The linker needs to know three things about common
+	     symbols: the size, the alignment, and the section in
+	     which the symbol should be placed.  We store the size
+	     here, and we allocate a small structure to hold the
+	     section and the alignment.  The alignment is stored as a
+	     power of two.  We don't store all the information
+	     directly because we don't want to increase the size of
+	     the union; this structure is a major space user in the
+	     linker.  */
+	  struct bfd_link_hash_common_entry *p;
+	  bfd_size_type size;	/* Common symbol size.  */
+	} c;
+    } u;
+};
+
+/* This is the link hash table.  It is a derived class of
+   bfd_hash_table.  */
+
+struct bfd_link_hash_table
+{
+  /* The hash table itself.  */
+  struct bfd_hash_table table;
+  /* A linked list of undefined and common symbols, linked through the
+     next field in the bfd_link_hash_entry structure.  */
+  struct bfd_link_hash_entry *undefs;
+  /* Entries are added to the tail of the undefs list.  */
+  struct bfd_link_hash_entry *undefs_tail;
+  /* The type of the link hash table.  */
+  enum bfd_link_hash_table_type type;
+};
+
+/* Look up an entry in a link hash table.  If FOLLOW is TRUE, this
+   follows bfd_link_hash_indirect and bfd_link_hash_warning links to
+   the real symbol.  */
+extern struct bfd_link_hash_entry *bfd_link_hash_lookup
+  (struct bfd_link_hash_table *, const char *, bfd_boolean create,
+   bfd_boolean copy, bfd_boolean follow);
+
+/* Look up an entry in the main linker hash table if the symbol might
+   be wrapped.  This should only be used for references to an
+   undefined symbol, not for definitions of a symbol.  */
+
+extern struct bfd_link_hash_entry *bfd_wrapped_link_hash_lookup
+  (bfd *, struct bfd_link_info *, const char *, bfd_boolean,
+   bfd_boolean, bfd_boolean);
+
+/* Traverse a link hash table.  */
+extern void bfd_link_hash_traverse
+  (struct bfd_link_hash_table *,
+    bfd_boolean (*) (struct bfd_link_hash_entry *, void *),
+    void *);
+
+/* Add an entry to the undefs list.  */
+extern void bfd_link_add_undef
+  (struct bfd_link_hash_table *, struct bfd_link_hash_entry *);
+
+/* Remove symbols from the undefs list that don't belong there.  */
+extern void bfd_link_repair_undef_list
+  (struct bfd_link_hash_table *table);
+
+/* Read symbols and cache symbol pointer array in outsymbols.  */
+extern bfd_boolean bfd_generic_link_read_symbols (bfd *);
+
+struct bfd_sym_chain
+{
+  struct bfd_sym_chain *next;
+  const char *name;
+};
+
+/* How to handle unresolved symbols.
+   There are four possibilities which are enumerated below:  */
+enum report_method
+{
+  /* This is the initial value when then link_info structure is created.
+     It allows the various stages of the linker to determine whether they
+     allowed to set the value.  */
+  RM_NOT_YET_SET = 0,
+  RM_IGNORE,
+  RM_GENERATE_WARNING,
+  RM_GENERATE_ERROR
+};
+
+typedef enum {with_flags, without_flags} flag_type;
+
+/* A section flag list.  */
+struct flag_info_list
+{
+  flag_type with; 
+  const char *name;
+  bfd_boolean valid;
+  struct flag_info_list *next;
+};
+
+/* Section flag info.  */
+struct flag_info
+{
+  flagword only_with_flags;
+  flagword not_with_flags;
+  struct flag_info_list *flag_list;
+  bfd_boolean flags_initialized;
+};
+
+struct bfd_elf_dynamic_list;
+struct bfd_elf_version_tree;
+
+/* This structure holds all the information needed to communicate
+   between BFD and the linker when doing a link.  */
+
+struct bfd_link_info
+{
+  /* TRUE if BFD should generate a shared object (or a pie).  */
+  unsigned int shared: 1;
+
+  /* TRUE if generating an executable, position independent or not.  */
+  unsigned int executable : 1;
+
+  /* TRUE if generating a position independent executable.  */
+  unsigned int pie: 1;
+
+  /* TRUE if BFD should generate a relocatable object file.  */
+  unsigned int relocatable: 1;
+
+  /* TRUE if BFD should pre-bind symbols in a shared object.  */
+  unsigned int symbolic: 1;
+
+  /* TRUE if executable should not contain copy relocs.
+     Setting this true may result in a non-sharable text segment.  */
+  unsigned int nocopyreloc: 1;
+
+  /* TRUE if BFD should export all symbols in the dynamic symbol table
+     of an executable, rather than only those used.  */
+  unsigned int export_dynamic: 1;
+
+  /* TRUE if a default symbol version should be created and used for
+     exported symbols.  */
+  unsigned int create_default_symver: 1;
+
+  /* TRUE if unreferenced sections should be removed.  */
+  unsigned int gc_sections: 1;
+
+  /* TRUE if every symbol should be reported back via the notice
+     callback.  */
+  unsigned int notice_all: 1;
+
+  /* TRUE if we are loading LTO outputs.  */
+  unsigned int loading_lto_outputs: 1;
+
+  /* TRUE if global symbols in discarded sections should be stripped.  */
+  unsigned int strip_discarded: 1;
+
+  /* TRUE if all data symbols should be dynamic.  */
+  unsigned int dynamic_data: 1;
+
+  /* Which symbols to strip.  */
+  ENUM_BITFIELD (bfd_link_strip) strip : 2;
+
+  /* Which local symbols to discard.  */
+  ENUM_BITFIELD (bfd_link_discard) discard : 2;
+
+  /* Criteria for skipping symbols when determining
+     whether to include an object from an archive. */
+  ENUM_BITFIELD (bfd_link_common_skip_ar_symbols) common_skip_ar_symbols : 2;
+
+  /* What to do with unresolved symbols in an object file.
+     When producing executables the default is GENERATE_ERROR.
+     When producing shared libraries the default is IGNORE.  The
+     assumption with shared libraries is that the reference will be
+     resolved at load/execution time.  */
+  ENUM_BITFIELD (report_method) unresolved_syms_in_objects : 2;
+
+  /* What to do with unresolved symbols in a shared library.
+     The same defaults apply.  */
+  ENUM_BITFIELD (report_method) unresolved_syms_in_shared_libs : 2;
+
+  /* TRUE if shared objects should be linked directly, not shared.  */
+  unsigned int static_link: 1;
+
+  /* TRUE if symbols should be retained in memory, FALSE if they
+     should be freed and reread.  */
+  unsigned int keep_memory: 1;
+
+  /* TRUE if BFD should generate relocation information in the final
+     executable.  */
+  unsigned int emitrelocations: 1;
+
+  /* TRUE if PT_GNU_RELRO segment should be created.  */
+  unsigned int relro: 1;
+
+  /* TRUE if .eh_frame_hdr section and PT_GNU_EH_FRAME ELF segment
+     should be created.  */
+  unsigned int eh_frame_hdr: 1;
+
+  /* TRUE if we should warn when adding a DT_TEXTREL to a shared object.  */
+  unsigned int warn_shared_textrel: 1;
+
+  /* TRUE if we should error when adding a DT_TEXTREL.  */
+  unsigned int error_textrel: 1;
+
+  /* TRUE if .hash section should be created.  */
+  unsigned int emit_hash: 1;
+
+  /* TRUE if .gnu.hash section should be created.  */
+  unsigned int emit_gnu_hash: 1;
+
+  /* If TRUE reduce memory overheads, at the expense of speed. This will
+     cause map file generation to use an O(N^2) algorithm and disable
+     caching ELF symbol buffer.  */
+  unsigned int reduce_memory_overheads: 1;
+
+  /* TRUE if the output file should be in a traditional format.  This
+     is equivalent to the setting of the BFD_TRADITIONAL_FORMAT flag
+     on the output file, but may be checked when reading the input
+     files.  */
+  unsigned int traditional_format: 1;
+
+  /* TRUE if non-PLT relocs should be merged into one reloc section
+     and sorted so that relocs against the same symbol come together.  */
+  unsigned int combreloc: 1;
+
+  /* TRUE if a default symbol version should be created and used for
+     imported symbols.  */
+  unsigned int default_imported_symver: 1;
+
+  /* TRUE if the new ELF dynamic tags are enabled. */
+  unsigned int new_dtags: 1;
+
+  /* FALSE if .eh_frame unwind info should be generated for PLT and other
+     linker created sections, TRUE if it should be omitted.  */
+  unsigned int no_ld_generated_unwind_info: 1;
+
+  /* TRUE if BFD should generate a "task linked" object file,
+     similar to relocatable but also with globals converted to
+     statics.  */
+  unsigned int task_link: 1;
+
+  /* TRUE if ok to have multiple definition.  */
+  unsigned int allow_multiple_definition: 1;
+
+  /* TRUE if ok to have version with no definition.  */
+  unsigned int allow_undefined_version: 1;
+
+  /* TRUE if some symbols have to be dynamic, controlled by
+     --dynamic-list command line options.  */
+  unsigned int dynamic: 1;
+
+  /* TRUE if PT_GNU_STACK segment should be created with PF_R|PF_W|PF_X
+     flags.  */
+  unsigned int execstack: 1;
+
+  /* TRUE if PT_GNU_STACK segment should be created with PF_R|PF_W
+     flags.  */
+  unsigned int noexecstack: 1;
+
+  /* TRUE if we want to produced optimized output files.  This might
+     need much more time and therefore must be explicitly selected.  */
+  unsigned int optimize: 1;
+
+  /* TRUE if user should be informed of removed unreferenced sections.  */
+  unsigned int print_gc_sections: 1;
+
+  /* TRUE if we should warn alternate ELF machine code.  */
+  unsigned int warn_alternate_em: 1;
+
+  /* Char that may appear as the first char of a symbol, but should be
+     skipped (like symbol_leading_char) when looking up symbols in
+     wrap_hash.  Used by PowerPC Linux for 'dot' symbols.  */
+  char wrap_char;
+
+  /* Separator between archive and filename in linker script filespecs.  */
+  char path_separator;
+
+  /* Function callbacks.  */
+  const struct bfd_link_callbacks *callbacks;
+
+  /* Hash table handled by BFD.  */
+  struct bfd_link_hash_table *hash;
+
+  /* Hash table of symbols to keep.  This is NULL unless strip is
+     strip_some.  */
+  struct bfd_hash_table *keep_hash;
+
+  /* Hash table of symbols to report back via the notice callback.  If
+     this is NULL, and notice_all is FALSE, then no symbols are
+     reported back.  */
+  struct bfd_hash_table *notice_hash;
+
+  /* Hash table of symbols which are being wrapped (the --wrap linker
+     option).  If this is NULL, no symbols are being wrapped.  */
+  struct bfd_hash_table *wrap_hash;
+
+  /* The output BFD.  */
+  bfd *output_bfd;
+
+  /* The list of input BFD's involved in the link.  These are chained
+     together via the link_next field.  */
+  bfd *input_bfds;
+  bfd **input_bfds_tail;
+
+  /* Non-NULL if .note.gnu.build-id section should be created.  */
+  char *emit_note_gnu_build_id;
+
+  /* If a symbol should be created for each input BFD, this is section
+     where those symbols should be placed.  It must be a section in
+     the output BFD.  It may be NULL, in which case no such symbols
+     will be created.  This is to support CREATE_OBJECT_SYMBOLS in the
+     linker command language.  */
+  asection *create_object_symbols_section;
+
+  /* List of global symbol names that are starting points for marking
+     sections against garbage collection.  */
+  struct bfd_sym_chain *gc_sym_list;
+
+  /* If a base output file is wanted, then this points to it */
+  void *base_file;
+
+  /* The function to call when the executable or shared object is
+     loaded.  */
+  const char *init_function;
+
+  /* The function to call when the executable or shared object is
+     unloaded.  */
+  const char *fini_function;
+
+  /* Number of relaxation passes.  Usually only one relaxation pass
+     is needed.  But a backend can have as many relaxation passes as
+     necessary.  During bfd_relax_section call, it is set to the
+     current pass, starting from 0.  */
+  int relax_pass;
+
+  /* Number of relaxation trips.  This number is incremented every
+     time the relaxation pass is restarted due to a previous
+     relaxation returning true in *AGAIN.  */
+  int relax_trip;
+
+  /* Non-zero if auto-import thunks for DATA items in pei386 DLLs
+     should be generated/linked against.  Set to 1 if this feature
+     is explicitly requested by the user, -1 if enabled by default.  */
+  int pei386_auto_import;
+
+  /* Non-zero if runtime relocs for DATA items with non-zero addends
+     in pei386 DLLs should be generated.  Set to 1 if this feature
+     is explicitly requested by the user, -1 if enabled by default.  */
+  int pei386_runtime_pseudo_reloc;
+
+  /* How many spare .dynamic DT_NULL entries should be added?  */
+  unsigned int spare_dynamic_tags;
+
+  /* May be used to set DT_FLAGS for ELF. */
+  bfd_vma flags;
+
+  /* May be used to set DT_FLAGS_1 for ELF. */
+  bfd_vma flags_1;
+
+  /* Start and end of RELRO region.  */
+  bfd_vma relro_start, relro_end;
+
+  /* List of symbols should be dynamic.  */
+  struct bfd_elf_dynamic_list *dynamic_list;
+
+  /* The version information.  */
+  struct bfd_elf_version_tree *version_info;
+};
+
+/* This structures holds a set of callback functions.  These are called
+   by the BFD linker routines.  Except for the info functions, the first
+   argument to each callback function is the bfd_link_info structure
+   being used and each function returns a boolean value.  If the
+   function returns FALSE, then the BFD function which called it should
+   return with a failure indication.  */
+
+struct bfd_link_callbacks
+{
+  /* A function which is called when an object is added from an
+     archive.  ABFD is the archive element being added.  NAME is the
+     name of the symbol which caused the archive element to be pulled
+     in.  This function may set *SUBSBFD to point to an alternative
+     BFD from which symbols should in fact be added in place of the
+     original BFD's symbols.  */
+  bfd_boolean (*add_archive_element)
+    (struct bfd_link_info *, bfd *abfd, const char *name, bfd **subsbfd);
+  /* A function which is called when a symbol is found with multiple
+     definitions.  H is the symbol which is defined multiple times.
+     NBFD is the new BFD, NSEC is the new section, and NVAL is the new
+     value.  NSEC may be bfd_com_section or bfd_ind_section.  */
+  bfd_boolean (*multiple_definition)
+    (struct bfd_link_info *, struct bfd_link_hash_entry *h,
+     bfd *nbfd, asection *nsec, bfd_vma nval);
+  /* A function which is called when a common symbol is defined
+     multiple times.  H is the symbol appearing multiple times.
+     NBFD is the BFD of the new symbol.  NTYPE is the type of the new
+     symbol, one of bfd_link_hash_defined, bfd_link_hash_common, or
+     bfd_link_hash_indirect.  If NTYPE is bfd_link_hash_common, NSIZE
+     is the size of the new symbol.  */
+  bfd_boolean (*multiple_common)
+    (struct bfd_link_info *, struct bfd_link_hash_entry *h,
+     bfd *nbfd, enum bfd_link_hash_type ntype, bfd_vma nsize);
+  /* A function which is called to add a symbol to a set.  ENTRY is
+     the link hash table entry for the set itself (e.g.,
+     __CTOR_LIST__).  RELOC is the relocation to use for an entry in
+     the set when generating a relocatable file, and is also used to
+     get the size of the entry when generating an executable file.
+     ABFD, SEC and VALUE identify the value to add to the set.  */
+  bfd_boolean (*add_to_set)
+    (struct bfd_link_info *, struct bfd_link_hash_entry *entry,
+     bfd_reloc_code_real_type reloc, bfd *abfd, asection *sec, bfd_vma value);
+  /* A function which is called when the name of a g++ constructor or
+     destructor is found.  This is only called by some object file
+     formats.  CONSTRUCTOR is TRUE for a constructor, FALSE for a
+     destructor.  This will use BFD_RELOC_CTOR when generating a
+     relocatable file.  NAME is the name of the symbol found.  ABFD,
+     SECTION and VALUE are the value of the symbol.  */
+  bfd_boolean (*constructor)
+    (struct bfd_link_info *, bfd_boolean constructor, const char *name,
+     bfd *abfd, asection *sec, bfd_vma value);
+  /* A function which is called to issue a linker warning.  For
+     example, this is called when there is a reference to a warning
+     symbol.  WARNING is the warning to be issued.  SYMBOL is the name
+     of the symbol which triggered the warning; it may be NULL if
+     there is none.  ABFD, SECTION and ADDRESS identify the location
+     which trigerred the warning; either ABFD or SECTION or both may
+     be NULL if the location is not known.  */
+  bfd_boolean (*warning)
+    (struct bfd_link_info *, const char *warning, const char *symbol,
+     bfd *abfd, asection *section, bfd_vma address);
+  /* A function which is called when a relocation is attempted against
+     an undefined symbol.  NAME is the symbol which is undefined.
+     ABFD, SECTION and ADDRESS identify the location from which the
+     reference is made. IS_FATAL indicates whether an undefined symbol is
+     a fatal error or not. In some cases SECTION may be NULL.  */
+  bfd_boolean (*undefined_symbol)
+    (struct bfd_link_info *, const char *name, bfd *abfd,
+     asection *section, bfd_vma address, bfd_boolean is_fatal);
+  /* A function which is called when a reloc overflow occurs. ENTRY is
+     the link hash table entry for the symbol the reloc is against.
+     NAME is the name of the local symbol or section the reloc is
+     against, RELOC_NAME is the name of the relocation, and ADDEND is
+     any addend that is used.  ABFD, SECTION and ADDRESS identify the
+     location at which the overflow occurs; if this is the result of a
+     bfd_section_reloc_link_order or bfd_symbol_reloc_link_order, then
+     ABFD will be NULL.  */
+  bfd_boolean (*reloc_overflow)
+    (struct bfd_link_info *, struct bfd_link_hash_entry *entry,
+     const char *name, const char *reloc_name, bfd_vma addend,
+     bfd *abfd, asection *section, bfd_vma address);
+  /* A function which is called when a dangerous reloc is performed.
+     MESSAGE is an appropriate message.
+     ABFD, SECTION and ADDRESS identify the location at which the
+     problem occurred; if this is the result of a
+     bfd_section_reloc_link_order or bfd_symbol_reloc_link_order, then
+     ABFD will be NULL.  */
+  bfd_boolean (*reloc_dangerous)
+    (struct bfd_link_info *, const char *message,
+     bfd *abfd, asection *section, bfd_vma address);
+  /* A function which is called when a reloc is found to be attached
+     to a symbol which is not being written out.  NAME is the name of
+     the symbol.  ABFD, SECTION and ADDRESS identify the location of
+     the reloc; if this is the result of a
+     bfd_section_reloc_link_order or bfd_symbol_reloc_link_order, then
+     ABFD will be NULL.  */
+  bfd_boolean (*unattached_reloc)
+    (struct bfd_link_info *, const char *name,
+     bfd *abfd, asection *section, bfd_vma address);
+  /* A function which is called when a symbol in notice_hash is
+     defined or referenced.  H is the symbol.  ABFD, SECTION and
+     ADDRESS are the (new) value of the symbol.  If SECTION is
+     bfd_und_section, this is a reference.  FLAGS are the symbol
+     BSF_* flags.  STRING is the name of the symbol to indirect to if
+     the sym is indirect, or the warning string if a warning sym.  */
+  bfd_boolean (*notice)
+    (struct bfd_link_info *, struct bfd_link_hash_entry *h,
+     bfd *abfd, asection *section, bfd_vma address, flagword flags,
+     const char *string);
+  /* Error or warning link info message.  */
+  void (*einfo)
+    (const char *fmt, ...);
+  /* General link info message.  */
+  void (*info)
+    (const char *fmt, ...);
+  /* Message to be printed in linker map file.  */
+  void (*minfo)
+    (const char *fmt, ...);
+  /* This callback provides a chance for users of the BFD library to
+     override its decision about whether to place two adjacent sections
+     into the same segment.  */
+  bfd_boolean (*override_segment_assignment)
+    (struct bfd_link_info *, bfd * abfd,
+     asection * current_section, asection * previous_section,
+     bfd_boolean new_segment);
+};
+
+/* The linker builds link_order structures which tell the code how to
+   include input data in the output file.  */
+
+/* These are the types of link_order structures.  */
+
+enum bfd_link_order_type
+{
+  bfd_undefined_link_order,	/* Undefined.  */
+  bfd_indirect_link_order,	/* Built from a section.  */
+  bfd_data_link_order,		/* Set to explicit data.  */
+  bfd_section_reloc_link_order,	/* Relocate against a section.  */
+  bfd_symbol_reloc_link_order	/* Relocate against a symbol.  */
+};
+
+/* This is the link_order structure itself.  These form a chain
+   attached to the output section whose contents they are describing.  */
+
+struct bfd_link_order
+{
+  /* Next link_order in chain.  */
+  struct bfd_link_order *next;
+  /* Type of link_order.  */
+  enum bfd_link_order_type type;
+  /* Offset within output section.  */
+  bfd_vma offset;
+  /* Size within output section.  */
+  bfd_size_type size;
+  /* Type specific information.  */
+  union
+    {
+      struct
+	{
+	  /* Section to include.  If this is used, then
+	     section->output_section must be the section the
+	     link_order is attached to, section->output_offset must
+	     equal the link_order offset field, and section->size
+	     must equal the link_order size field.  Maybe these
+	     restrictions should be relaxed someday.  */
+	  asection *section;
+	} indirect;
+      struct
+	{
+	  /* Size of contents, or zero when contents size == size
+	     within output section.
+	     A non-zero value allows filling of the output section
+	     with an arbitrary repeated pattern.  */
+	  unsigned int size;
+	  /* Data to put into file.  */
+	  bfd_byte *contents;
+	} data;
+      struct
+	{
+	  /* Description of reloc to generate.  Used for
+	     bfd_section_reloc_link_order and
+	     bfd_symbol_reloc_link_order.  */
+	  struct bfd_link_order_reloc *p;
+	} reloc;
+    } u;
+};
+
+/* A linker order of type bfd_section_reloc_link_order or
+   bfd_symbol_reloc_link_order means to create a reloc against a
+   section or symbol, respectively.  This is used to implement -Ur to
+   generate relocs for the constructor tables.  The
+   bfd_link_order_reloc structure describes the reloc that BFD should
+   create.  It is similar to a arelent, but I didn't use arelent
+   because the linker does not know anything about most symbols, and
+   any asymbol structure it creates will be partially meaningless.
+   This information could logically be in the bfd_link_order struct,
+   but I didn't want to waste the space since these types of relocs
+   are relatively rare.  */
+
+struct bfd_link_order_reloc
+{
+  /* Reloc type.  */
+  bfd_reloc_code_real_type reloc;
+
+  union
+    {
+      /* For type bfd_section_reloc_link_order, this is the section
+	 the reloc should be against.  This must be a section in the
+	 output BFD, not any of the input BFDs.  */
+      asection *section;
+      /* For type bfd_symbol_reloc_link_order, this is the name of the
+	 symbol the reloc should be against.  */
+      const char *name;
+    } u;
+
+  /* Addend to use.  The object file should contain zero.  The BFD
+     backend is responsible for filling in the contents of the object
+     file correctly.  For some object file formats (e.g., COFF) the
+     addend must be stored into in the object file, and for some
+     (e.g., SPARC a.out) it is kept in the reloc.  */
+  bfd_vma addend;
+};
+
+/* Allocate a new link_order for a section.  */
+extern struct bfd_link_order *bfd_new_link_order (bfd *, asection *);
+
+/* These structures are used to describe version information for the
+   ELF linker.  These structures could be manipulated entirely inside
+   BFD, but it would be a pain.  Instead, the regular linker sets up
+   these structures, and then passes them into BFD.  */
+
+/* Glob pattern for a version.  */
+
+struct bfd_elf_version_expr
+{
+  /* Next glob pattern for this version.  */
+  struct bfd_elf_version_expr *next;
+  /* Glob pattern.  */
+  const char *pattern;
+  /* Set if pattern is not a glob.  */
+  unsigned int literal : 1;
+  /* Defined by ".symver".  */
+  unsigned int symver : 1;
+  /* Defined by version script.  */
+  unsigned int script : 1;
+  /* Pattern type.  */
+#define BFD_ELF_VERSION_C_TYPE		1
+#define BFD_ELF_VERSION_CXX_TYPE	2
+#define BFD_ELF_VERSION_JAVA_TYPE	4
+  unsigned int mask : 3;
+};
+
+struct bfd_elf_version_expr_head
+{
+  /* List of all patterns, both wildcards and non-wildcards.  */
+  struct bfd_elf_version_expr *list;
+  /* Hash table for non-wildcards.  */
+  void *htab;
+  /* Remaining patterns.  */
+  struct bfd_elf_version_expr *remaining;
+  /* What kind of pattern types are present in list (bitmask).  */
+  unsigned int mask;
+};
+
+/* Version dependencies.  */
+
+struct bfd_elf_version_deps
+{
+  /* Next dependency for this version.  */
+  struct bfd_elf_version_deps *next;
+  /* The version which this version depends upon.  */
+  struct bfd_elf_version_tree *version_needed;
+};
+
+/* A node in the version tree.  */
+
+struct bfd_elf_version_tree
+{
+  /* Next version.  */
+  struct bfd_elf_version_tree *next;
+  /* Name of this version.  */
+  const char *name;
+  /* Version number.  */
+  unsigned int vernum;
+  /* Regular expressions for global symbols in this version.  */
+  struct bfd_elf_version_expr_head globals;
+  /* Regular expressions for local symbols in this version.  */
+  struct bfd_elf_version_expr_head locals;
+  /* List of versions which this version depends upon.  */
+  struct bfd_elf_version_deps *deps;
+  /* Index of the version name.  This is used within BFD.  */
+  unsigned int name_indx;
+  /* Whether this version tree was used.  This is used within BFD.  */
+  int used;
+  /* Matching hook.  */
+  struct bfd_elf_version_expr *(*match)
+    (struct bfd_elf_version_expr_head *head,
+     struct bfd_elf_version_expr *prev, const char *sym);
+};
+
+struct bfd_elf_dynamic_list
+{
+  struct bfd_elf_version_expr_head head;
+  struct bfd_elf_version_expr *(*match)
+    (struct bfd_elf_version_expr_head *head,
+     struct bfd_elf_version_expr *prev, const char *sym);
+};
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/binary-io.h sdcc-3.2.0+dfsg/support/sdbinutils/include/binary-io.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/binary-io.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/binary-io.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,62 @@
+/* Binary mode I/O.
+   Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _BINARY_H
+#define _BINARY_H
+
+/* Include this header after <fcntl.h> and <stdio.h>, because
+   systems that distinguish between text and binary I/O usually
+   define O_BINARY in <fcntl.h>, and the MSVC7 <stdio.h> doesn't
+   like to be included after '#define fileno ...'
+
+   We don't include <fcntl.h> here because not all systems have
+   that header.  */
+
+#if !defined O_BINARY && defined _O_BINARY
+  /* For MSC-compatible compilers.  */
+# define O_BINARY _O_BINARY
+# define O_TEXT _O_TEXT
+#endif
+#ifdef __BEOS__
+  /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect.  */
+# undef O_BINARY
+# undef O_TEXT
+#endif
+#if O_BINARY
+# if defined __EMX__ || defined __DJGPP__ || defined __CYGWIN__
+#  include <io.h> /* declares setmode() */
+# else
+#  define setmode _setmode
+#  undef fileno
+#  define fileno _fileno
+# endif
+# ifdef __DJGPP__
+#  include <unistd.h> /* declares isatty() */
+#  /* Avoid putting stdin/stdout in binary mode if it is connected to the
+#     console, because that would make it impossible for the user to
+#     interrupt the program through Ctrl-C or Ctrl-Break.  */
+#  define SET_BINARY(fd) (!isatty (fd) ? (setmode (fd, O_BINARY), 0) : 0)
+# else
+#  define SET_BINARY(fd) setmode (fd, O_BINARY)
+# endif
+#else
+  /* On reasonable systems, binary I/O is the default.  */
+# undef O_BINARY
+# define O_BINARY 0
+# define SET_BINARY(fd) /* nothing */
+#endif
+
+#endif /* _BINARY_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/ChangeLog sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/ChangeLog
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/ChangeLog	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/ChangeLog	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,348 @@
+2011-06-02  Nick Clifton  <nickc@redhat.com>
+
+	* i860.h: Fix spelling mistake in comment.
+
+2011-05-04  Tristan Gingold  <gingold@adacore.com>
+
+	* rs6000.h (union external_auxent): Add x_ftype field.
+	* rs6k64.h: (struct external_auxent): Remap x_file field.
+
+2011-05-04  Tristan Gingold  <gingold@adacore.com>
+
+	* rs6000.h (struct external_exceptab): New struct.
+	(EXCEPTSZ): New macro.
+	* rs6k64.h: (struct external_exceptab): New struct.
+	(EXCEPTSZ): New macro.
+
+2011-05-03  Tristan Gingold  <gingold@adacore.com>
+
+	* rs6000.h (struct external_ldsym): Use E_SYMNMLEN instead of
+	SYMNMLEN.
+
+2011-04-27  Tristan Gingold  <gingold@adacore.com>
+
+	* xcoff.h (F_FDPR_PROF, F_FDPR_OPTI, F_DSA, F_VARPG)
+	(STYP_DWARF, SSUBTYP_DWINFO)
+	(SSUBTYP_DWLINE, SSUBTYP_DWPBNMS, SSUBTYP_DWPBTYP)
+	(SSUBTYP_DWARNGE, SSUBTYP_DWABREV, SSUBTYP_DWSTR)
+	(SSUBTYP_DWRNGES, STYP_TDATA, STYP_TBSS, R_TLS, R_TLS_IE)
+	(R_TLS_LD, R_TLS_LE, R_TLSM, R_TLSML, R_TOCU, R_TOCL, C_DWARF):
+	New macros.
+
+2011-03-31  Tristan Gingold  <gingold@adacore.com>
+
+	* internal.h (C_NULL_VALUE): Define.
+
+2010-06-29  Alan Modra  <amodra@gmail.com>
+
+	* maxq.h: Delete file.
+
+2010-04-15  Nick Clifton  <nickc@redhat.com>
+
+	* alpha.h: Update copyright notice to use GPLv3.
+	* apollo.h: Likewise.
+	* arm.h: Likewise.
+	* aux-coff.h: Likewise.
+	* ecoff.h: Likewise.
+	* external.h: Likewise.
+	* go32exe.h: Likewise.
+	* h8300.h: Likewise.
+	* h8500.h: Likewise.
+	* i386.h: Likewise.
+	* i860.h: Likewise.
+	* i960.h: Likewise.
+	* ia64.h: Likewise.
+	* internal.h: Likewise.
+	* m68k.h: Likewise.
+	* m88k.h: Likewise.
+	* maxq.h: Likewise.
+	* mcore.h: Likewise.
+	* mips.h: Likewise.
+	* mipspe.h: Likewise.
+	* or32.h: Likewise.
+	* pe.h: Likewise.
+	* powerpc.h: Likewise.
+	* rs6000.h: Likewise.
+	* rs6k64.h: Likewise.
+	* sh.h: Likewise.
+	* sparc.h: Likewise.
+	* ti.h: Likewise.
+	* tic30.h: Likewise.
+	* tic4x.h: Likewise.
+	* tic54x.h: Likewise.
+	* tic80.h: Likewise.
+	* w65.h: Likewise.
+	* we32k.h: Likewise.
+	* x86_64.h: Likewise.
+	* xcoff.h: Likewise.
+	* z80.h: Likewise.
+	* z8k.h: Likewise.
+
+2009-12-02  Jerker B�ck  <jerker.back@gmail.com>
+
+	PR binutils/11017
+	* i386lh (COFF_PAGE_SIZE): Define.
+	* x86_64.h (COFF_PAGE_SIZE): Define.
+
+2009-10-17  Arnold Metselaar  <arnold.metselaar@planet.nl>
+
+	* z80.h: Store alignment requirement in section header, to allow
+	ld to preserve alignment. Some code was copied from ti.h.
+
+2009-09-05  Martin Thuresson  <martin@mtme.org>
+
+	* ti.h (GET_LNSZ_SIZE, PUT_LNSZ_SIZE): Updated name of class
+	variable to in_class to match changes in function that use this
+	macro.
+
+2009-08-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Fix references past allocated memory for i386-*-go32.
+	* ti.h (COFF_ADJUST_FILEHDR_IN_POST, COFF_ADJUST_FILEHDR_OUT_POST):
+	Reference F_TARGET_ID only when !COFF0_P.
+
+2009-08-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Stop using bfd_usrdata in libbfd.
+	* go32exe.h (struct external_filehdr_go32_exe <stub>, FILHSZ): Replace
+	STUBSIZE by GO32_STUBSIZE.
+	(STUBSIZE): Move the definition ...
+	* internal.h (GO32_STUBSIZE): ... here and rename it.
+	(struct internal_filehdr <go32stub>, F_GO32STUB): New.
+
+2009-06-03  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* symconst.h (btLong64, btULong64, btLongLong64, btULongLong64,
+	btAdr64, btInt64, btUInt64): New defines.
+
+2009-04-21  Kai Tietz  <kai.tietz@onevision.com>
+
+	* pe.h (pex64_runtime_function): New structure.
+	(external_pex64_runtime_function): Likewise.
+	(pex64_unwind_code): Likewise.
+	(external_pex64_unwind_code): Likewise.
+	(pex64_unwind_info): Likewise.
+	(external_pex64_unwind_info): Likewise.
+	(external_pex64_scope): Likewise.
+	(pex64_scope): Likewise.
+	(pex64_scope_entry):  Likewise.
+	(external_pex64_scope_entry): Likewise.
+	(PEX64_IS_RUNTIME_FUNCTION_CHAINED): New macro.
+	(PEX64_GET_UNWINDDATA_UNIFIED_RVA): Likewise.
+	(PEX64_UNWCODE_CODE): Likewise.
+	(PEX64_UNWCODE_INFO): Likewise.
+	(UWOP_...): Add defines for unwind code.
+	(UNW_FLAG_...): Add defined for unwind info flags.
+	(PEX64_SCOPE_ENTRY_SIZE): New macro.
+	(PEX64_UWI_VERSION): Likewise.
+	(PEX64_UWI_FLAGS): Likewise.
+	(PEX64_UWI_FRAMEREG): Likewise.
+	(PEX64_UWI_FRAMEOFF): Likewise.
+	(PEX64_UWI_SIZEOF_UWCODE_ARRAY): Likewise.
+	(PEX64_OFFSET_TO_UNWIND_CODE): Likewise.
+	(PEX64_OFFSET_TO_HANDLER_RVA): Likewise.
+	(PEX64_OFFSET_TO_SCOPE_COUNT): Likewise.
+	(PEX64_SCOPE_ENTRY): Likewise.
+
+2009-04-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* pe.h (IMAGE_SUBSYSTEM_EFI_ROM): Renamed to ...
+	(IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER): This.
+
+2009-04-01  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* xcoff.h (xcoff_link_hash_table): Move to bfd/xcofflink.c.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* xcoff.h (XCOFF_EXPALL, XCOFF_EXPFULL): New flags.
+	(xcoff_loader_info): Add auto_export_flags.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* internal.h (C_AIX_WEAKEXT): New macro.
+	(C_WEAKEXT): Use the GNU definition in the generic part of the file,
+	and conditionally reset it to C_AIX_WEAKEXT in the XCOFF part of
+	the file.
+	(CSECT_SYM_P): New macro.
+	* xcoff.h (L_WEAK): Define.
+	(EXTERN_SYM_P): New macro.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* xcoff.h (XCOFF_ALLOCATED): New flag.
+
+2009-03-14  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* xcoff.h (XCOFF_CALLED, XCOFF_IMPORT): Update comments.
+	(XCOFF_WAS_UNDEFINED): New flag.
+	(xcoff_link_hash_table): Add an "rtld" field.
+
+2009-03-14  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* internal.h (struct internal_extra_pe_aouthdr):  Correct type
+	of DllCharacteristics flags field to unsigned.
+	* 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.
+
+2008-12-23  Johan Olmutz Nielsen  <jnielsen@ddci.com>
+
+	* ti.h (COFF_ADJUST_SCNHDR_OUT_PRE): Define.
+
+2008-06-17  Nick Clifton  <nickc@redhat.com>
+
+	* ti.h (GET_SCNHDR_NLNNO): Provide an alternative version of this
+	macro which does not trigger an array bounds warning in gcc.
+	(PUT_SCNHDR_NLNNO): Likewise.
+	(GET_SCNHDR_FLAGS): Likewise.
+	(PUT_SCNHDR_FLAGS): Likewise.
+	(GET_SCNHDR_PAGE): Likewise.
+	(PUT_SCNHDR_PAGE): Likewise.
+
+2007-11-05  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* pe.h (COFF_ENCODE_ALIGNMENT) Define.
+
+2007-08-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* pe.h (IMAGE_SCN_ALIGN_POWER_BIT_POS): New.
+	(IMAGE_SCN_ALIGN_POWER_BIT_MASK): Likewise.
+	(IMAGE_SCN_ALIGN_POWER_NUM): Likewise.
+	(IMAGE_SCN_ALIGN_POWER_CONST): Likewise.
+	(IMAGE_SCN_ALIGN_128BYTES): Likewise.
+	(IMAGE_SCN_ALIGN_256BYTES): Likewise.
+	(IMAGE_SCN_ALIGN_512BYTES): Likewise.
+	(IMAGE_SCN_ALIGN_1024BYTES): Likewise.
+	(IMAGE_SCN_ALIGN_2048BYTES): Likewise.
+	(IMAGE_SCN_ALIGN_4096BYTES): Likewise.
+	(IMAGE_SCN_ALIGN_8192BYTES): Likewise.
+	(IMAGE_SCN_ALIGN_1BYTES): Redefined with
+	IMAGE_SCN_ALIGN_POWER_CONST.
+	(IMAGE_SCN_ALIGN_2BYTES): Likewise.
+	(IMAGE_SCN_ALIGN_4BYTES): Likewise.
+	(IMAGE_SCN_ALIGN_8BYTES): Likewise.
+	(IMAGE_SCN_ALIGN_16BYTES): Likewise.
+	(IMAGE_SCN_ALIGN_32BYTES): Likewise.
+	(IMAGE_SCN_ALIGN_64BYTES): Likewise.
+
+2007-07-12  Kai Tietz   <kai.tietz@onevision.com>
+
+	* internal.h (struct internal_syment): Use bfd_hostptr_t for
+	_n_zeroes and _n_offset fields.
+
+2007-04-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* rs6000.h: Write Mimi's name in ASCII.
+
+2007-03-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* internal.h (internal_extra_pe_aouthdr): Add Magic,
+	MajorLinkerVersion, MinorLinkerVersion, SizeOfCode,
+	SizeOfInitializedData, SizeOfUninitializedData,
+	AddressOfEntryPoint, BaseOfCode and BaseOfData.
+
+2006-12-05  Michael Tautschnig  <tautschn@model.in.tum.de>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* external.h (struct external_aouthdr): Add ATTRIBUTE_PACKED.
+	(struct external_syment): Likewise.
+	(union external_auxent): Likewise.
+
+2006-11-14  Phil Lello  <phil.lello@homecall.co.uk>
+
+	* pe.h: Added defines for IMAGE_SUBSYSTEM_EFI_ROM and
+	IMAGE_SUBSYSTEM_XBOX.
+	* internal.h: Added defines for PE directory entry types.
+	NB: in internal.h because IMAGE_NUMBEROF_DIRECTORY_ENTRYIES is in
+	pe.h
+
+2006-09-20  Kai Tietz  <Kai.Tietz@onevision.com>
+
+	* external.h: Add proper external_aouthdr64 structure (without
+	data_start member).
+	(AOUTHDRSZ64): Set according structure size.
+	(AOUTHDR64): As typedef of external_aouthdr64 structure.
+	* internal.h: Add relocation identifiers for coff.
+	* pe.h:	Add define IMAGE_FILE_MACHINE_AMD64 the coff signature.
+	(PEPAOUTHDR): Adjust structure to have proper size (using AOUTHDR64).
+	(PEPAOUTSZ): Calculated size of 240.
+	* x86_64.h: Coff information for x86_64 (AMD64).
+
+2006-02-05  Arnold Metselaar  <arnold.metselaar@planet.nl>
+
+	* internal.h: Add relocation number R_IMM24 for Z80.
+
+2005-10-25  Arnold Metselaar  <arnold.metselaar@planet.nl>
+
+	* internal.h: Add relocation number for Z80
+	* z80.h: New file.
+
+2005-08-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* a29k.h: Delete.
+
+2005-07-14  Daniel Marques  <marques@cs.cornell.edu>
+
+	* alpha.h (ALPHA_ECOFF_COMPRESSEDMAG): Define.
+	* ecoff.h (ALPHA_MAGIC_COMPRESSED): Define.
+
+2005-05-10  Nick Clifton  <nickc@redhat.com>
+
+	* Update the address and phone number of the FSF organization in
+	the GPL notices in the following files:
+	a29k.h,	alpha.h, apollo.h, arm.h, aux-coff.h, ecoff.h, external.h,
+	go32exe.h, h8300.h, h8500.h, i386.h, i860.h, i960.h, ia64.h,
+	internal.h, m68k.h, m88k.h, maxq.h, mcore.h, mips.h, mipspe.h,
+	or32.h, pe.h, powerpc.h, rs6k64.h, sh.h, sparc.h, ti.h, tic30.h,
+	tic4x.h, tic54x.h, tic80.h, w65.h, we32k.h, xcoff.h, z8k.h
+
+2005-02-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* xcoff.h (struct xcoff_loader_info): Warning fix.
+
+2005-01-10  Inderpreet Singh <inderpreetb@noida.hcltech.com>
+
+	* maxq.h (F_MAXQ10, F_MAXQ20): Define.
+
+2004-11-08  Inderpreet Singh   <inderpreetb@nioda.hcltech.com>
+	    Vineet Sharma      <vineets@noida.hcltech.com>
+
+	* maxq.h: New file: Defintions for the maxq port.
+
+2004-11-08  Aaron W. LaFramboise <aaron98wiridge9@aaronwl.com>
+
+	* pe.h (IMAGE_WEAK_EXTERN_SEARCH_NOLIBRARY): Define.
+	(IMAGE_WEAK_EXTERN_SEARCH_LIBRARY): Same.
+	(IMAGE_WEAK_EXTERN_SEARCH_ALIAS): Same.
+
+2004-08-13  Mark Kettenis  <kettenis@gnu.org>
+
+	* symconst.h (langMax): Fix typo in comment.
+
+2004-04-23  Chris Demetriou  <cgd@broadcom.com>
+
+	* mips.h (MIPS_R_RELHI, MIPS_R_RELLO, MIPS_R_SWITCH): Remove
+	(MIPS_R_PCREL16): Update comment.
+	* ecoff.h (struct ecoff_value_adjust): Remove structure.
+	(struct ecoff_debug_info): Remove 'adjust' member.
+
+2004-04-20  DJ Delorie  <dj@redhat.com>
+
+	* internal.h (R_SECREL32): Add.
+
+For older changes see ChangeLog-9103
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/ChangeLog-9103 sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/ChangeLog-9103
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/ChangeLog-9103	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/ChangeLog-9103	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1177 @@
+2005-04-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	Moved from ../ChangeLog
+
+	2003-04-04  Svein E. Seldal  <Svein.Seldal@solidas.com>
+	* tic4x.h: Namespace cleanup. Replace s/c4x/tic4x
+	and s/c3x/tic3x/
+
+	2003-01-20  Svein E. Seldal  <Svein.Seldal@solidas.com>
+	* tic4x.h (TICOFF_TARGET_MACHINE_GET): Fixed define bug
+	* ti.h (TICOFF_TARGET_MACHINE_GET): Added macros
+
+	2002-08-28  Michael Hayes <m.hayes@elec.canterbury.ac.nz>
+	* internal.h: Add new relocation types.
+	* ti.h: Add file-header flags for tic4x code.
+	* tic4x.h: New file
+
+2003-12-02  Graham Reed <grahamr@algorithmics.com>
+
+	* internal.h (C_WEAKEXT): Add alternative value for AIX 5.2
+	based targets.
+
+2003-08-23  Jason Eckhardt  <jle@rice.edu>
+
+	* coff/i860.h (COFF860_R_PAIR, COFF860_R_LOW0, COFF860_R_LOW1,
+	COFF860_R_LOW2, COFF860_R_LOW3, COFF860_R_LOW4, COFF860_R_SPLIT0,
+	COFF860_R_SPLIT1, COFF860_R_SPLIT2, COFF860_R_HIGHADJ,
+	COFF860_R_BRADDR): Define new relocation constants and document.
+	Minor formatting adjustments.
+
+2003-08-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* ti.h (GET_SCNHDR_NRELOC): Rename PTR param to LOC.
+	(PUT_SCNHDR_NRELOC, GET_SCNHDR_NLNNO, PUT_SCNHDR_NLNNO): Likewise.
+	(GET_SCNHDR_FLAGS, PUT_SCNHDR_FLAGS): Likewise.
+	(GET_SCNHDR_PAGE, PUT_SCNHDR_PAGE): Likewise.
+
+2003-07-17  Jeff Muizelaar  <muizelaar@rogers.com>
+
+	* pe.h: (IMAGE_FILE_NET_RUN_FROM_SWAP): Define.
+	(IMAGE_FILE_MACHINE_WCEMIPSV2): Define.
+	(IMAGE_FILE_MACHINE_SH3DSP): Define.
+	(IMAGE_FILE_MACHINE_SH3E): Define.
+	(IMAGE_FILE_MACHINE_SH5): Define.
+	(IMAGE_FILE_MACHINE_AM33): Define.
+	(IMAGE_FILE_MACHINE_POWERPCFP): Define.
+	(IMAGE_FILE_MACHINE_AXP64): Define.
+	(IMAGE_FILE_MACHINE_TRICORE): Define.
+	(IMAGE_FILE_MACHINE_CEF): Define.
+	(IMAGE_FILE_MACHINE_EBC): Define.
+	(IMAGE_FILE_MACHINE_AMD64): Define.
+	(IMAGE_FILE_MACHINE_M32R): Define.
+	(IMAGE_FILE_MACHINE_CEE): Define.
+
+2003-07-14  Christian Groessler  <chris@groessler.org>
+
+        * i860.h (AOUTSZ): Define for i860 coff.
+
+2003-06-29  Andreas Jaeger  <aj@suse.de>
+
+	* xcoff.h (struct __rtinit ): Convert to ISO C90 prototypes.
+
+	* ecoff.h: Convert to ISO C90 prototypes.  Replace PTR by void *.
+
+2003-04-24 Dhananjay Deshpande <dhananjayd@kpitcummins.com>
+
+	* coff/h8300.h (H8300HNMAGIC, H8300SNMAGIC): New.
+	(H8300HNBADMAG, H8300SNBADMAG): New.
+
+2003-04-15  Rohit Kumar Srivastava <rohits@kpitcummins.com>
+
+	* sh.h: Replace occurrances of 'Hitachi' with 'Renesas'.
+	* h8300.h: Likewise.
+	* h8500.h: Likewise.
+
+2003-03-25  Stan Cox   <scox@redhat.com>
+	    Nick Clifton  <nickc@redhat.com>
+
+	Contribute support for Intel's iWMMXt chip - an	ARM variant:
+
+	* arm.h (ARM_NOTE_SECTION): Define.
+
+2002-11-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* ecoff.h: Replace boolean with bfd_boolean.
+	* xcoff.h: Likewise.
+
+2002-03-18  Tom Rix  <trix@redhat.com>
+
+	* rs6k64.h: Add U64_TOCMAGIC, AIX 5 64 bit magic number.
+
+2002-02-01  Tom Rix  <trix@redhat.com>
+
+	* xcoff.h: Conditionally support <aiaff> for pre AIX 4.3.
+
+2002-01-31  Ivan Guzvinec  <ivang@opencores.org>
+
+	* or32.h: New file.
+
+2001-12-24  Tom Rix  <trix@redhat.com>
+
+	* xcoff.h (xcoff_big_format_p): Make <bigaf> the default archive
+	format.
+	(XCOFFARMAG_ELEMENT_SIZE, XCOFFARMAGBIG_ELEMENT_SIZE): Define for
+	archive header ascii elements.
+
+2001-12-17  Tom Rix  <trix@redhat.com>
+
+	* xcoff.h :  Add .except and .typchk section string and styp flags.
+	Fix xcoff_big_format_p macro.
+
+2001-12-16  Tom Rix  <trix@redhat.com>
+
+	* xcoff.h : Clean up formatting.
+
+2002-01-15  Richard Earnshaw  <rearnsha@arm.com>
+
+	* arm.h (F_VFP_FLOAT): Define.
+
+2001-11-11  Timothy Wall  <twall@alum.mit.edu>
+
+	* ti.h: Move arch-specific stuff from here...
+	(COFF_ADJUST_SYM_IN/OUT): Optionally put page flag into symbol
+	value.
+	* tic54x.h: ...to here.
+
+2001-10-26  Christian Groessler  <cpg@aladdin.de>
+
+	* external.h (GET_LINENO_LNNO): Fix usage of H_GET_32/16.
+	(PUT_LINENO_LNNO): Likewise with H_PUT_32/16.
+
+2001-09-21  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* ti.h (GET_SCNHDR_PAGE): Fix compile time warning.
+
+2001-09-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* external.h (GET_LINENO_LNNO): Use H_GET_32/16.
+	(PUT_LINENO_LNNO): Use H_PUT_32/16.
+	* m88k.h (GET_LNSZ_SIZE, GET_LNSZ_LNNO, GET_SCN_NRELOC,
+	GET_SCN_NLINNO): Use H_GET_32.
+	(PUT_LNSZ_LNNO, PUT_LNSZ_SIZE, PUT_SCN_NRELOC, PUT_SCN_NLINNO):
+	Use H_PUT_32.
+	* ti.h: Formatting fixes.  Make use of H_GET_* and H_PUT_* throughout.
+	* xcoff.h: White space changes.
+
+2001-09-05  Tom Rix <trix@redhat.com>
+
+	* xcoff.h : Add XCOFF_SYSCALL32 and XCOFF_SYSCALL64 hash table flags.
+
+2001-08-27  Andreas Jaeger  <aj@suse.de>
+
+	* xcoff.h (struct __rtinit): Make proper prototype for rtl.
+
+Fri Aug 24 01:18:51 2001  J"orn Rennecke <amylaar@redhat.com>
+
+	* internal.h (R_JMP2, R_JMPL2, R_MOVL2): Comment spelling fix.
+
+2001-04-05  Tom Rix <trix@redhat.com>
+
+	* rs6000.h : move xcoff32 external structures from xcofflink.
+	* rs6k64.h : move xcoff64 external structures from xcofflink.
+	* internal.h : promote 32 bit structure elements to 64 bit
+	for xcoff64 support
+	* xcoff.h : New file.
+
+2001-03-23  Nick Clifton  <nickc@redhat.com>
+
+	* a29k.h: Fix compile time warning.
+	* external.h: Fix compile time warning.
+	* m88k.h: Fix compile time warning.
+
+2001-03-13  Nick Clifton  <nickc@redhat.com>
+
+	* external.h: New file. Common structure definitions found in
+	other COFF header files.
+
+	* a29k.h: Use external.h.
+	* apollo.h: Use external.h.
+	* arm.h: Use external.h.
+	* h8300.h: Use external.h.
+	* h8500.h: Use external.h.
+	* i386.h: Use external.h.
+	* i860.h: Use external.h.
+	* ia64.h: Use external.h.
+	* m68k.h: Use external.h.
+	* m88k.h: Use external.h.
+	* mcore.h: Use external.h.
+	* mips.h: Use external.h.
+	* mipspe.h: Use external.h.
+	* powerpc.h: Use external.h.
+	* rs6000.h: Use external.h.
+	* rs6k64.h: Use external.h.
+	* sh.h: Use external.h.
+	* sparc.h: Use external.h.
+	* tic30.h: Use external.h.
+	* tic80.h: Use external.h.
+	* w65.h: Use external.h.
+	* we32k.h: Use external.h.
+	* z8k.h: Use external.h.
+
+2001-02-09  David Mosberger  <davidm@hpl.hp.com>
+
+	* pe.h (PEPAOUTSZ): Rename from PEP64AOUTSZ.
+	Rename from PEPAOUTHDR.
+
+2001-01-23  H.J. Lu  <hjl@gnu.org>
+
+	* pe.h (struct external_PEI_DOS_hdr): New.
+	(struct external_PEI_IMAGE_hdr): New.
+
+2000-12-11  Alan Modra  <alan@linuxcare.com.au>
+
+	* ti.h (OCTETS_PER_BYTE_POWER): Change #warning to #error.
+
+2000-12-08  Alan Modra  <alan@linuxcare.com.au>
+
+	* ti.h (OCTETS_PER_BYTE_POWER): Change #warn to #warning.
+
+2000-06-30  DJ Delorie  <dj@cygnus.com>
+
+	* pe.h: Clarify a comment.
+
+2000-05-05  Clinton Popetz  <cpopetz@cygnus.com>
+
+	* rs6k64.h (U802TOC64MAGIC): Change to U803XTOCMAGIC.
+
+2000-04-24  Clinton Popetz  <cpopetz@cygnus.com>
+
+	* rs6k64.h: New file.
+
+2000-04-17  Timothy Wall  <twall@cygnus.com>
+
+	* ti.h: Load page cleanup.
+	* intental.h: Add load page field.
+
+Mon Apr 17 16:44:01 2000  David Mosberger  <davidm@hpl.hp.com>
+
+	* pe.h (PEP64AOUTHDR): New header for PE+.
+	(PEP64AOUTSZ): New macro.
+	(IMAGE_SUBSYSTEM_UNKNOWN): New macro.
+	(IMAGE_SUBSYSTEM_NATIVE): Ditto.
+	(IMAGE_SUBSYSTEM_WINDOWS_GUI): Ditto.
+	(IMAGE_SUBSYSTEM_WINDOWS_CUI): Ditto.
+	(IMAGE_SUBSYSTEM_POSIX_CUI): Ditto.
+	(IMAGE_SUBSYSTEM_WINDOWS_CE_GUI): Ditto.
+	(IMAGE_SUBSYSTEM_EFI_APPLICATION): Ditto.
+	(IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER): Ditto.
+	(IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER): Ditto.
+	* internal.h (PE_DEF_FILE_ALIGNMENT): Define only if not defined
+	already.
+	* ia64.h: New file.
+
+2000-04-13  Alan Modra  <alan@linuxcare.com.au>
+
+	* ti.h (ADDR_MASK): Don't use ul suffix on constants.
+	(PG_MASK): Ditto.
+
+2000-04-11  Timothy Wall  <twall@cygnus.com>
+
+	* ti.h: Remove load page references until load pages are
+	reimplemented.
+	* tic54x.h: Ditto.
+
+2000-04-07  Timothy Wall  <twall@cygnus.com>
+
+	* internal.h: Fix some comments related to TI COFF (instead of tic80).
+	* ti.h: New.
+	* tic54x.h: New.
+
+Wed Apr  5 22:08:41 2000  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+	* sh.h (R_SH_LOOP_START, R_SH_LOOP_END): Define.
+
+2000-03-15  Kazu Hirata  <kazu@hxi.com>
+
+	* internal.h: Fix a typo in the comment for R_MOVL2.
+
+2000-02-28  Nick Clifton  <nickc@cygnus.com>
+
+	* mipspe.h (MIPS_PE_MAGIC): Define.
+	* sh.h (SH_PE_MAGIC): Define.
+
+2000-02-22  Nick Clifton  <nickc@cygnus.com>  DJ Delorie <dj@cygnus.com>
+
+	* sh.h: Add Windows CE definitions.
+	* arm.h: Add Windows CE definitions.
+	* mipspe.h: New file: Windows CE definitions for MIPS.
+	* pe.h: Add constants for ILF support.
+
+2000-01-05  Nick Clifton  <nickc@cygnus.com>
+
+	* pe.h: Fix formatting of comments.
+	(IMAGE_FILE_AGGRESSIVE_WS_TRIM): Define.
+	(IMAGE_FILE_LARGE_ADDRESS_AWARE): Define.
+	(IMAGE_FILE_16BIT_MACHINE): Define.
+	(IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP): Define.
+	(IMAGE_FILE_UP_SYSTEM_ONLY): Define.
+	(IMAGE_FILE_MACHINE_UNKNOWN): Define.
+	(IMAGE_FILE_MACHINE_ALPHA): Define.
+	(IMAGE_FILE_MACHINE_ALPHA64): Define.
+	(IMAGE_FILE_MACHINE_I386): Define.
+	(IMAGE_FILE_MACHINE_IA64): Define.
+	(IMAGE_FILE_MACHINE_M68K): Define.
+	(IMAGE_FILE_MACHINE_MIPS16): Define.
+	(IMAGE_FILE_MACHINE_MIPSFPU): Define.
+	(IMAGE_FILE_MACHINE_MIPSFPU16): Define.
+	(IMAGE_FILE_MACHINE_POWERPC): Define.
+	(IMAGE_FILE_MACHINE_R3000): Define.
+	(IMAGE_FILE_MACHINE_R4000): Define.
+	(IMAGE_FILE_MACHINE_R10000): Define.
+	(IMAGE_FILE_MACHINE_SH3): Define.
+	(IMAGE_FILE_MACHINE_SH4): Define.
+	(IMAGE_FILE_MACHINE_THUMB): Define.
+
+1999-09-20  Alan Modra  <alan@spri.levels.unisa.edu.au>
+
+	* internal.h: Delete bogus R_PCLONG, duplicate R_RELBYTE and
+	R_RELWORD, and rewrite some R_* as decimal.
+
+1999-09-06  Donn Terry  <donn@interix.com>
+
+	* internal.h (DTYPE): Define.
+	* pe.h (struct external_PEI_filehdr): Rename from
+	external_PE_filehdr.  Define even if COFF_IMAGE_WITH_PE is not
+	defined.
+
+1999-07-17  Nick Clifton  <nickc@cygnus.com>
+
+	* arm.h (F_SOFT_FLOAT): Rename from F_SOFTFLOAT.
+
+1999-06-21  Philip Blundell  <pb@nexus.co.uk>
+
+	* arm.h (F_SOFTFLOAT): Define.
+
+1999-07-05  Nick Clifton  <nickc@cygnus.com>
+
+	* arm.h (F_ARM_5): Define.
+
+Wed Jun  2 18:08:18 1999  Richard Henderson  <rth@cygnus.com>
+
+	* internal.h (BEOS_EXE_IMAGE_BASE, BEOS_DLL_IMAGE_BASE): New.
+
+Mon May 17 13:35:35 1999  Stan Cox  <scox@cygnus.com>
+
+	* arm.h (F_PIC, F_ARM_2, F_ARM_2a, F_ARM_3, F_ARM_3M,
+	F_ARM_4, F_ARM_4T, F_APCS26): Changed values to distinguish
+	F_ARM_2a, F_ARM_3M, F_ARM_4T.
+
+1999-05-15  Nick Clifton  <nickc@cygnus.com>
+
+	* mcore.h (IMAGE_REL_MCORE_RVA): Define.
+
+1999-04-21  Nick Clifton  <nickc@cygnus.com>
+
+	* mcore.h (GET_LINENO_LNNO): New macro.
+	(PUT_LINENO_LNNO): New macro.
+
+1999-04-08  Nick Clifton  <nickc@cygnus.com>
+
+	* mcore.h: New header file.  Defines for Motorola's MCore
+	processor.
+
+Sun Dec  6 21:36:37 1998  Mark Elbrecht  <snowball3@usa.net>
+
+	* internal.h (C_WEAKEXT): Define.
+
+Wed Jan 27 13:35:35 1999  Stan Cox  <scox@cygnus.com>
+
+	* arm.h (F_PIC_INT, F_ARM_2, F_ARM_3, F_ARM_4, F_APCS26):
+	Changed values to avoid clashing with IMAGE_FILE_* coff header
+	flag values.
+
+Wed Apr  1 16:06:15 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* internal.h: Document numbers associated with Thumb symbol
+	types.
+
+Fri Mar 27 17:16:57 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* internal.h (ISPTR, ISFCN, ISARY): Add casts to unsigned long.
+
+Mon Feb  2 17:10:38 1998  Steve Haworth  <steve@pm.cse.rmit.EDU.AU>
+
+	* tic30.h: New file.
+
+Fri Dec 12 11:49:07 1997  Fred Fish  <fnf@cygnus.com>
+
+	* tic80.h (R_MPPCR15W): New relocation type, for 15 bit PC relative
+	offsets.
+
+Tue Dec  2 10:21:40 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* arm.h (COFFARM): New define.
+
+Mon Dec  1 20:24:18 1997  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+	* sh.h (R_SH_SWITCH8): New.
+
+Sat Nov 22 15:10:14 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* internal.h (C_THUMBEXTFUNC, C_THUMBSTATFUNC): Constants to
+	define static and external functions.
+
+	* arm.h: Add bits to support PIC and APCS-FLOAT type binaries,
+	when implemented.
+
+Fri Oct  3 14:25:17 1997  Fred Fish  <fnf@cygnus.com>
+
+	* tic80.h (R_PPL16B): Make constant uppercase for consistency.
+
+Tue Jul 22 18:18:58 1997  Robert Hoehne <robert.hoehne@Mathematik.TU-Chemnitz.DE>
+
+	* go32exe.h: New file.
+
+Tue Jul  8 12:23:55 1997  Fred Fish  <fnf@cygnus.com>
+
+	* tic80.h (TIC80_TARGET_ID): Add define.
+	* internal.h (struct internal_filehdr): Add f_target_id field.
+
+Tue Jun  3 16:44:18 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* internal.h: Add storage classes for Thumb symbols
+
+Mon May 26 14:07:55 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* tic80.h (R_PPL16B): Correct value.
+
+Tue May 13 10:21:14 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* arm.h (constants):   Added new flag bits F_APCS_26 and
+	F_APCS_SET for the f_flags field of the filehdr structure.  Added new
+	flags: F_APCS26, F_ARM_2, F_ARM_3, F_ARM_7, F_ARM_7T to store
+	information in the flags field of the internal_f structure used by BFD
+	routines.
+
+Sat May  3 08:24:59 1997  Fred Fish  <fnf@cygnus.com>
+
+	* internal.h (C_UEXT, C_STATLAB, C_EXTLAB, C_SYSTEM):
+	New storage classes for TIc80.
+
+Fri Apr 18 11:52:55 1997  Niklas Hallqvist  <niklas@appli.se>
+
+	* alpha.h (ALPHA_ECOFF_BADMAG): Recognize *BSD/alpha magic too.
+	(ALPHA_R_LITERALSLEAZY): Define.
+	* ecoff.h (ALPHA_MAGIC_BSD): Define.
+
+Wed Jan 29 11:31:51 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* i960.h (R_IPR13, R_ALIGN): Define.
+
+Mon Jan 27 13:34:30 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* internal.h (R_IPRMED, R_OPTCALL, R_OPTCALLX): Move definitions
+	from here...
+	* i960.h (R_IPRMED, R_OPTCALL, R_OPTCALLX): ...to here.
+
+Wed Jan 22 20:10:47 1997  Fred Fish  <fnf@cygnus.com>
+
+	* tic80.h (TIC80MAGIC): Renamed to TIC80_AOUTHDR_MAGIC.
+
+Fri Dec 27 22:05:45 1996  Fred Fish  <fnf@cygnus.com>
+
+	* tic80.h: New file for TIc80 support.
+
+Thu Dec 19 16:18:11 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* arm.h (_LIT): Define.
+
+Fri Jun 28 12:54:38 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* pe.h (FILHSZ): Define.
+
+Wed Jun 26 16:24:26 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* All files: Define FILHSZ, AOUTSZ, AOUTHDRSZ, SCNHSZ, SYMESZ,
+	AUXESZ, LINESZ, RELSZ as numeric constants rather than uses of
+	sizeof.  Define AOUTHDRSZ in all files.
+	* pe.h (AOUTSZ): Define by adding to AOUTHDRSZ.
+
+Fri Jun 21 11:17:46 1996  Richard Henderson  <rth@tamu.edu>
+
+	* alpha.h: Add declarations for relocation types added for Alpha
+	OSF/1 3.0.
+
+Tue Jun 18 16:04:29 1996  Jeffrey A. Law  <law@rtl.cygnus.com>
+
+	* h8300.h (H8300SMAGIC): Define.
+	(H8300SBADMAG): Define.
+
+Mon Jun 10 11:53:28 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* internal.h (R_BCC_INV, R_JMP_DEL): New relocations for
+	relaxing in the H8/300 series.
+
+Thu May 16 15:49:22 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* sh.h (R_SH_CODE, R_SH_DATA, R_SH_LABEL): Define.
+
+Tue May  7 00:36:39 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* internal.h (R_JMPL2): Renamed from R_JMPL_B8 to be
+	consistent with other similar relocs.
+
+	* internal.h (H8/300 specific relocs): Add comments better
+	explaining what each reloc is used for.
+	(R_MOV16B1, R_MOV16B2): Renamed from R_MOVB1 and R_MOVB2.
+	(R_MOV24B1, R_MOV24B2): Renamed from R_MOVLB1 and R_MOVLB2.
+	(R_MOVL1, R_MOVL2): New relocs.
+
+Fri May  3 13:01:12 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* internal.h (R_PCRWORD_B): Define for the h8300 relaxing
+	linker.
+
+Wed May  1 19:21:03 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* internal.h (SCNNMLEN): Define.
+	(struct internal_scnhdr): Use SCNNMLEN for s_name field.
+
+Fri Mar 29 13:41:25 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* pe.h: Define IMAGE_COMDAT codes.
+
+Wed Mar 27 17:29:42 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* arm.h (union external_auxent): Add x_checksum, x_associated, and
+	x_comdat fields to x_scn struct.
+	* i386.h (union external_auxent): Likewise.
+	* powerpc.h (union external_auxent): Likewise.
+	* internal.h (union internal_auxent): Likewise.
+
+Thu Mar 21 16:25:57 1996  David Mosberger-Tang  <davidm@azstarnet.com>
+
+	* ecoff.h (struct ecoff_find_line): Add caching fields.
+
+Thu Mar 14 15:22:44 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* internal.h (R_MEM_INDIRECT): New reloc for the h8300.
+
+Fri Feb  9 10:44:11 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* aux-coff.h: Rename from aux.h, to avoid problems on hapless DOS
+	systems which think that aux is a com port.
+
+Mon Feb  5 18:35:00 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* i960.h (F_I960HX): Define.
+
+Wed Jan 31 13:11:54 1996  Richard Henderson  <rth@tamu.edu>
+
+	* aux.h: New file.
+	* internal.h, m68k.h: Protect against multiple inclusion.
+
+Wed Nov 22 13:48:39 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ecoff.h (_RCONST, STYP_RCONST, RELOC_SECTION_RCONST): Define.
+	(NUM_RELOC_SECTIONS): Update.
+	* symconst.h (scRConst): Define.
+
+Tue Nov 14 18:54:29 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* internal.h (C_NT_WEAK): Define.
+
+Thu Nov  9 14:08:30 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* rs6000.h (STYP_OVRFLO): Define.
+
+Tue Nov  7 14:38:45 1995  Kim Knuttila  <krk@cygnus.com>
+
+	* powerpc.h (IMAGE_NT_OPTIONAL_HDR_MAGIC): Added define.
+	* pe.h: Added defines for file level flags
+
+Mon Nov  6 17:28:01 1995  Harry Dolan  <dolan@ssd.intel.com>
+
+	* i860.h: New file, based on i386.h.
+
+Wed Nov  1 15:25:18 1995  Manfred Hollstein KS/EF4A 60/1F/110 #40283  <manfred@lts.sel.alcatel.de>
+
+	* m68k.h (PAGEMAGICEXECSWAPPED): Define.
+	(PAGEMAGICPEXECSWAPPED): Define.
+	(PAGEMAGICPEXECTSHLIB): Define.
+	(PAGEMAGICPEXECPAGED): Define.
+	(_COMMENT): DEFINE.
+	* m88k.h (_COMMENT): Define.
+
+Wed Oct 18 18:36:19 1995  Geoffrey Noer  <noer@cygnus.com>
+
+	* sym.h: #if 0'd out runtime_pdr struct because it chokes
+	Visual C++ and there aren't any references to it elsewhere in gdb.
+
+Mon Oct 16 11:12:24 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* rs6000.h (SMALL_AOUTSZ): Define.
+
+	* internal.h (XMC_TD): Define.
+
+Tue Oct 10 18:41:03 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* internal.h (struct internal_aouthdr): Add o_cputype field.
+	* rs6000.h (AOUTHDR): Rename o_resv1 to o_cputype.
+
+Mon Oct  9 14:45:46 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* rs6000.h (AOUTHDR): Add o_maxdata field.  Add comments.
+	(_PAD, _LOADER): Define.
+	(STYP_LOADER): Define.
+	* internal.h (struct internal_aouthdr): Add o_maxdata field.
+
+Thu Oct  5 10:02:57 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ecoff.h: Define section name macros and STYP macros for various
+	Alpha sections: .got, .hash, .dynsym, .dynstr, .rel.dyn, .conflic,
+	.comment, .liblist, .dynamic.
+
+Wed Oct  4 10:56:35 1995  Kim Knuttila  <krk@cygnus.com>
+
+	* pe.h: Moved DOSMAGIC and NT_SIGNATURE defines here
+	* powerpc.h: removed DOSMAGIC, NT_SIGNATURE, and DEFAULT_* defines
+	Also removed other unused defines (various MAGIC ones)
+	* i386.h: removed DOSMAGIC, NT_SIGNATURE, and DEFAULT_* defines
+	* arm.h: removed DOSMAGIC, NT_SIGNATURE, and DEFAULT_* defines
+	* apollo.h: removed unused DEFAULT_* defines
+	* alpha.h: removed unused DEFAULT_* defines
+	* h8500.h: removed unused DEFAULT_* defines
+	* h8300.h: removed unused DEFAULT_* defines
+	* i960.h: removed unused DEFAULT_* defines
+	* m88k.h: removed unused DEFAULT_* defines
+	* we32k.h: removed unused DEFAULT_* defines
+	* rs6000.h: removed unused DEFAULT_* defines
+	* mips.h: removed unused DEFAULT_* defines
+	* m68k.h: removed unused DEFAULT_* defines
+	* z8k.h: removed unused DEFAULT_* defines
+	* w65.h: removed unused DEFAULT_* defines
+	* sparc.h: removed unused DEFAULT_* defines
+	* sh.h: removed unused DEFAULT_* defines
+
+Fri Sep 29 08:40:08 1995  Kim Knuttila  <krk@cygnus.com>
+
+	* powerpc.h: Reformatted to GNU coding conventions.
+
+Wed Sep 27 06:50:50 1995  Kim Knuttila  <krk@nellie>
+
+	* pe.h: added defines for more section characteristics
+	* powerpc.h (new file): base coff definitions for ppc PE
+
+Tue Sep 12 12:08:20 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* internal.h (struct internal_syment): Change n_numaux field from
+	char to unsigned char.
+
+Fri Sep  1 15:39:36 1995  Kazumoto Kojima  <kkojima@info.kanagawa-u.ac.jp>
+
+	* mips.h (struct rpdr_ext): Define.
+
+Thu Aug 31 16:51:50 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* internal.h (internal_aouthdr, internal_filehdr):
+	don't indirect the pe stuff.
+
+Tue Aug 29 14:16:07 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* i386.h (NT_DEF_RESERVE, NT_DEF_COMMIT): Make the same
+	as 'the other' compiler.
+	* internal.h (NT_IMAGE_BASE): Deleted.
+	(NT_EXE_IMAGE_BASE, NT_DLL_IMAGE_BASE): New.
+	(PE_DEF_SECTION_ALIGNMENT, PE_DEF_FILE_ALIGNMENT): New.
+	(R_IMAGEBASE): New.
+
+Mon Aug 21 18:12:19 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* internal.h: (internal_filehdr): Moved PE stuff into
+	internal_extra_pe_filehdr.
+	(internal_aouthdr): Moved PE stuff into
+	interanl_extra_pe_aouthdr.
+
+Mon Jul 24 14:05:39 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* internal.h: Move R_SH_* relocs from here...
+	* sh.h: ...to here.
+	(R_SH_SWITCH16, R_SH_SWITCH32): Define.
+	(R_SH_USES, R_SH_COUNT, R_SH_ALIGN): Define.
+
+Thu Jun 29 00:04:25 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* internal.h (NT_DEF_RESERVE, NT_DEF_COMMIT): Increase a lot.
+
+Tue May 16 15:08:20 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* internal.h (NT_subsystem, NT_stack_heap): Delete
+
+Tue May 16 15:08:20 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* internal.h (NT_subsystem, NT_stack_heap): Now extern.
+
+Sat May 13 10:14:08 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* pe.h: New file.
+	* i386.h (NT_SECTION_ALIGNMENT, NT_FILE_ALIGNMENT,
+	NT_DEF_RESERVE, NT_DEF_COMMIT): New.
+	* internal.h (internal_filehdr):  New fields for PE.
+	(IMAGE_DATA_DIRECTORY): New.
+	(internal_aouthdr): New fields for PE.
+
+Tue Feb 14 17:59:37 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ecoff.h (struct ecoff_fdrtab_entry): Define.
+	(struct ecoff_find_line): Define.
+
+Sat Feb  4 14:38:03 1995  David Mosberger-Tang  <davidm@piston.cs.arizona.edu>
+
+	* sym.h (struct pdr): field "prof" added.
+
+	* alpha.h (PDR_BITS1_PROF_*): added, macros for PDR_BITS*_RESERVED_*
+	updated accordingly.
+
+Sun Jan 15 18:38:33 1995  Steve Chamberlain  <sac@splat>
+
+	* w65.h: New file.
+
+Wed Nov 23 22:43:38 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
+
+	* sh.h (SH_ARCH_MAGIC_BIG, SH_ARCH_MAGIC_LITTLE): New.
+	(SHBADMAG): Changed to suit.
+
+Tue Jul 26 17:46:08 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* i960.h (F_I960JX): New macro.
+
+Wed Jul  6 00:48:57 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* alpha.h:  Add definitions for alpha file header flags, encoding
+	the object type of the file.
+
+Mon Jun 20 13:47:01 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* ecoff.h (ecoff_swap_tir_in): Remove declaration.
+	(ecoff_swap_tir_out): Likewise.
+	(ecoff_swap_rndx_in, ecoff_swap_rndx_out): Likewise.
+	(struct ecoff_debug_swap): Add new fields: swap_tir_in,
+	swap_rndx_in, swap_tir_out, swap_rndx_out, read_debug_info.
+
+Sun Jun 12 03:51:52 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* symconst.h:  Pick up SGI define for stIndirect.
+
+Fri Apr 22 13:05:28 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.h (REGINFO): Don't define.
+	(struct ecoff_reginfo): Don't define.
+
+	* sh.h (SH_ARCH_MAGIC): Rename from SHMAGIC.  SHMAGIC is used by
+	several targets to mean a shared library.
+	(SHBADMAG): Corresponding change.
+
+Thu Apr 14 13:00:53 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* mips.h (RELOC_BITS3_TYPE_BIG): Changed from 0x1e to 0x3e.
+	(RELOC_BITS3_TYPEHI_LITTLE): Define.
+	(RELOC_BITS3_TYPEHI_SH_LITTLE): Define.
+	(MIPS_R_PCREL16): Change value from 8 to 12 to match Irix 4.
+	(MIPS_R_RELHI): Define.
+	(MIPS_R_RELLO): Define.
+	(MIPS_R_SWITCH): Change value from 9 to 22.
+
+Thu Apr  7 14:19:35 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* mips.h (MIPS_R_SWITCH): Define.
+
+Thu Mar 31 19:28:33 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* internal.h (internal_aouthdr): Added comments for Apollo fields.
+
+Thu Mar 31 16:28:02 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.h (STYP_ECOFF_LIB): Define as used on Irix 4.
+
+Fri Mar 25 17:16:55 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.h (struct ecoff_debug_info): Add adjust field.
+	(struct ecoff_value_adjust): Define.
+
+Tue Mar 22 13:22:47 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* mips.h (MIPS_R_PCREL16): Define.
+
+Sat Feb 26 10:26:38 1994  Ian Lance Taylor  (ian@cygnus.com)
+
+	* ecoff.h: Add casts to avoid warnings from SVR4 cc.
+
+Mon Feb 21 09:48:46 1994  Ian Lance Taylor  (ian@lisa.cygnus.com)
+
+	* sym.h (struct runtime_pdr): Make field adr bfd_vma, not unsigned
+	long.
+	(SYMR): Make field value bfd_vma, not long.
+
+Fri Feb  4 23:35:53 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* rs6000.h (STYP_DEBUG): Define.
+
+Wed Feb  2 14:31:37 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* internal.h (union internal_auxent): Change x_csect.x_scnlen into
+	a union of a long and a pointer to a symbol.  XCOFF sometimes uses
+	this field as a symbol index.
+
+Mon Jan 10 23:54:25 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.h (ecoff_debug_info): Remove fields line_end,
+	external_dnr_end, external_pdr_end, external_sym_end,
+	external_opt_end, external_aux_end, ss_end, external_fdr_end.
+	Replace ifdbase with ifdmap.
+
+Wed Jan  5 17:05:36 1994  Ken Raeburn  (raeburn@deneb.cygnus.com)
+
+	* ecoff.h (STYP_EXTENDESC, STYP_COMMENT, STYP_XDATA, STYP_PDATA):
+	Define.
+
+Wed Jan  5 16:58:24 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.h (NUM_RELOC_SECTIONS): Define.
+
+Tue Dec 21 09:24:56 1993  Ken Raeburn  (raeburn@rtl.cygnus.com)
+
+	* sparc.h (struct external_reloc): Rename field r_addend to
+	r_offset.
+
+Sat Dec 11 16:12:32 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* internal.h (R_DISP7, R_SH_IMM16): New reloc types.
+
+Tue Nov 23 14:23:19 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.h (struct ecoff_debug_swap): Added *_end fields for all
+	the symbolic information pointers.
+
+	* sym.h: Named the EXTR structure ecoff_extr.
+
+Fri Nov 19 08:21:18 1993  Ken Raeburn  (raeburn@rover.cygnus.com)
+
+	* sparc.h (RELSZ): Use correct size.
+
+Wed Nov 17 17:18:16 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* mips.h (struct ecoff_debug_info): Define.
+
+Tue Nov  2 17:56:57 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.h (struct ecoff_debug_swap): Define.
+
+Thu Oct 28 17:07:50 1993  Stan Shebs  (shebs@rtl.cygnus.com)
+
+	* i386.h (I386LYNXMAGIC): Rename to LYNXCOFFMAGIC.
+	* m68k.h (LYNXCOFFMAGIC): Define.
+	* sparc.h: New file.
+
+Tue Oct 19 15:34:50 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* alpha.h (external_aouthdr): Split four byte padding field into
+	two byte bldrev field and two byte padding field.
+
+	* ecoff.h (_LITA, _PDATA, _XDATA, STYP_LITA): Defined.
+
+Wed Oct 13 15:52:34 1993  Ken Raeburn  (raeburn@cygnus.com)
+
+	Sun Oct 10 17:27:10 1993  Troy Rollo (troy@cbme.unsw.edu.au)
+
+	* internal.h: Added o_sri, o_inlib and o_vid for Apollos as well
+	as R_DIR16.
+
+	* apollo.h: New file
+
+Mon Oct 11 17:16:48 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.h (REGINFO, struct ecoff_reginfo): Define.
+
+Tue Oct  5 10:52:53 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* rs6000.h: Change non-ASCII characters in comment to octal
+	escapes.
+
+Tue Sep 28 03:27:04 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* ecoff.h (_FINI, STYP_ECOFF_FINI):  Add to support .fini section.
+
+Fri Sep 24 11:53:53 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* mips.h (BADMAG): Recognize MIPS_MAGIC_LITTLE3 and MIPS_MAGIC_BIG3.
+	* ecoff.h: Define MIPS_MAGIC_LITTLE3 and MIPS_MAGIC_BIG3.
+
+Thu Sep 23 21:07:14 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* mips.h (BADMAG): Recognize MIPS_MAGIC_LITTLE2 and MIPS_MAGIC_BIG2.
+	* ecoff.h: Define MIPS_MAGIC_LITTLE2 and MIPS_MAGIC_BIG2.
+
+Thu Sep 16 20:27:21 1993  Jim Kingdon  (kingdon@cirdan.cygnus.com)
+
+	* sym.h, symconst.h: Add comment stating these files are not part
+	of GDB, GAS, etc.  In 1991, when we asked rms whether we could
+	include these files in GDB (although they are copyrighted by
+	someone besides the FSF), he said it was OK if they were not
+	considered part of GDB.
+
+Fri Sep 10 17:40:35 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.h (AUX_PUT_ANY): Cast val argument to bfd_vma.
+
+	* alpha.c (external_aouthdr): Need four bytes of padding between
+	vstamp and tsize.
+
+Tue Sep  7 14:20:43 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.h (AUX_GET_ANY, AUX_PUT_ANY): Changed to reflect further
+	change in bfd swapping routine names.
+
+Tue Sep  7 10:15:17 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* ecoff.h (AUX_GET_ANY): Change name of _do_getb32 to reflect bfd
+	changes.
+
+Fri Aug 13 14:30:32 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* ecoff.h (RELOC_SECTION_NONE): Define.
+
+Thu Aug 12 11:24:42 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* alpha.h (struct external_reloc): Add r_symndx field.
+	(RELSZ): Correct.
+	(RELOC_BITS*): Correct.
+	(ALPHA_R_*): Define.
+	* ecoff.h (RELOC_SECTION_{XDATA,PDATA,FINI,LITA,ABS}): Define.
+	(r_extern): Undefine.
+	* internal.h (struct internal_reloc): Make r_vaddr bfd_vma rather
+	than long.  Add r_extern field.
+
+	* alpha.h (PDR_BITS*): Define.
+	* sym.h (PDR): Give correct names to new fields.
+
+	* ecoff.h: Moved MIPS reloc definitions from here...
+	* mips.h: to here.
+
+Mon Aug  2 16:37:14 1993  Stu Grossman  (grossman at cygnus.com)
+
+	* i386.h:  Add Lynx magic number.
+
+Tue Aug  3 11:17:53 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* alpha.h: Corrected external symbolic debugging structures to
+	match actual usage.
+	* internal.h (internal_filehdr, internal_aouthdr,
+	internal_scnhdr): Changed type of some fields to bfd_vma so they
+	can hold 64 bits.
+	* sym.h (HDRR, FDR, PDR, EXTR): Likewise.
+	(PDR): Added new fields found on Alpha.
+	* symconst.h (magicSym2): Define; new value found on Alpha.
+
+	* ecoff.h: New file.
+	* alpha.h, mips.h: Moved common information into ecoff.h.  Moved
+	external structure definitions in from ecoff-ext.h.
+	* ecoff-ext.h: Removed; information now in alpha.h and mips.h.
+
+Sun Jul 18 21:43:59 1993  Jim Kingdon  (kingdon@rtl.cygnus.com)
+
+	* i386.h: Recognize I386PTXMAGIC.
+
+Fri Jul 16 09:54:35 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* mips.h (MIPS_AOUT_{OZ}MAGIC): Renamed from {OZ}MAGIC.
+
+Thu Jul 15 12:23:55 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* m88k.h (union external_auxent): Move x_fcn back inside x_fcnary.
+	({GET,PUT}_FCN_{LNNOPTR,ENDNDX}): Adjust accordingly.
+
+Sun Jul 11 18:00:18 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* m68k.h: Define MC68KBCSMAGIC.
+
+Thu Jun 10 11:46:28 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* mips.h (_INIT, STYP_MIPS_INIT): Define (used on Irix4).
+	(STYP_OTHER_LOAD): Define as STYP_MIPS_INIT.
+
+Wed Jun  9 15:09:09 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* mips.h (OMAGIC): Define.
+
+Tue Jun  8 12:16:03 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
+
+	 Support for H8/300-H
+	* h8300.h: New magic number.
+	* internal.h: New relocations.
+
+Mon Apr 26 18:04:47 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* internal.h, sh.h: Support for SH.
+
+Sat Apr 24 21:34:59 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* a29k.h: Define _LIT.
+
+Fri Apr 23 18:41:23 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* alpha.h: New file.
+
+Thu Apr  8 12:36:34 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* internal.h (C_SHADOW, C_VERSION): Copied in from m88k.h.
+	* m88k.h, i386.h, we32k.h: Don't define all the storage classes;
+	they're already in internal.h.
+
+Wed Apr  7 11:51:24 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* internal.h: Change n_sclass to unsigned char.
+	Change C_EFCN to 0xff, change RS/6000 dbx symbols
+	to no longer be signed.
+
+Fri Mar 19 14:52:56 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* internal.h: Add H8/500 reloc types.
+
+Wed Mar 17 09:46:03 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* ecoff-ext.h (AUX_PUT_ANY): Don't use void values in branches of
+	conditional expression.
+
+Thu Mar  4 14:12:06 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* ecoff-ext.h (AUX_GET_*): Rewrote to use new macro AUX_GET_ANY.
+	(AUX_PUT_*): New macros corresponding to the AUX_GET macros.
+	(ecoff_swap_tir_out): Added prototype.
+
+	* mips.h (N_BTMASK, N_TMASK, N_BTSHFT, N_TSHIFT): Define; these
+	are needed to interpret gcc debugging output.
+
+Tue Feb  9 07:43:27 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* we32k.h (BTYPE, ISPTR, ISFCN, ISARY, DECREF): Removed
+	more definitions duplicated in internal.h.
+
+Wed Feb  3 09:18:24 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* mips.h (RELOC_BITS3_TYPE_*): Correct for big endian machines.
+
+Mon Jan 25 11:35:51 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* internal.h (internal_aouthdr): Added additional fields used only
+	by MIPS ECOFF.
+
+Thu Jan 21 10:28:38 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* mips.h (AOUTHDR): Added additional fields used by ECOFF.
+
+Tue Jan 19 12:21:19 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* i386.h, we32k.h (N_*, T_*, DT_*): Removed still more definitions
+	duplicated in internal.h.
+
+	* mips.h (RELOC_SECTION_*, ECOFF_R_*): Defined constants for ECOFF
+	relocs.
+
+Fri Jan 15 18:17:00 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff-ext.h: Added prototypes for new ECOFF swapping functions.
+	(opt_ext): New structure.
+	* mips.h (ZMAGIC): Defined to be 0413.
+	(_LIB): Defined to be ".lib"
+	(external_reloc): MIPS ECOFF relocs are only 8 bytes.  Added
+	macros to aid in swapping.
+
+Fri Jan  8 16:19:26 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff-ext.h: Added prototypes for ECOFF swapping functions.
+	* internal.h (internal_scnhdr): Always provide s_align field, not
+	just on i960.
+	(internal_reloc): Always provide r_size field, not just on
+	RS/6000.
+	* mips.h (_RDATA, _SDATA, _SBSS, _LIT4, _LIT8, STYP_RDATA,
+	STYP_SDATA, STYP_SBSS, STYP_LIT4, STYP_LIT8): Defined.
+	(CODE_MASK, MIPS_IS_STAB, MIPS_MARK_STAB, MIPS_UNMARK_STAB,
+	STABS_SYMBOL): Moved in from gdb/mipsread.c.
+
+Wed Jan  6 14:01:46 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* i386.h, we32k.h: removed STYP_* defines, since they duplicated
+	those in internal.h.
+
+Tue Dec 29 15:40:07 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* i386.h: define I386AIXMAGIC for Danbury AIX PS/2 compiler.
+
+Sat Dec 12 16:07:57 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* i386.h: don't define BTYPE, ISPTR, ISFCN, ISARY, DECREF: they
+	are defined in internal.h.
+
+Thu Nov 12 09:52:01 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* internal.h: (internal_reloc): r_offset is now a long.
+	* z8k.h: slight comment enhancement
+
+Wed Sep 30 07:46:08 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* internal.h: changed z8k reloc types
+
+Fri Aug 28 10:16:31 1992  Brendan Kehoe  (brendan@cygnus.com)
+
+	* we32k.h: new file
+
+Thu Aug 27 13:00:01 1992  Brendan Kehoe  (brendan@cygnus.com)
+
+	* symconst.h: comment out cruft at the end of #endif
+
+Tue Aug 25 15:06:49 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* internal.h: added #define for STYP_LIT, removed from a29k and
+	h8300.
+
+	* z8k.h: added z8000 support
+
+Thu Jul 16 16:32:00 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* internal.h: added R_RELLONG_NEG reloc type
+
+Fri Jun 12 20:11:04 1992  John Gilmore  (gnu at cygnus.com)
+
+	* symconst.h:  Fix unterminated comment.
+
+Wed Jun 10 07:57:49 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* i386.h: a.out magic numbers from
+	mohring@informatik.tu-muenchen.de
+
+Mon Jun  8 20:13:33 1992  John Gilmore  (gnu at cygnus.com)
+
+	* ecoff-ext.h, mips.h:  Use unsigned chars everywhere.
+	(Suggested by Antti Miettinen.)
+
+Tue Apr 14 15:18:44 1992  John Gilmore  (gnu at cygnus.com)
+
+	* sym.h:  Add comments.
+	* symconst.h:  Merge with Fred's changes.
+
+Tue Apr 14 14:30:05 1992  Fred Fish  (fnf@cygnus.com)
+
+	* symconst.h:  Pick up SGI defines for stStruct, stUnion, stEnum,
+	langCplusplus, and langCplusplusV2.
+
+Thu Apr  2 19:47:43 1992  John Gilmore  (gnu at cygnus.com)
+
+	* sym.h, symconst.h:  MIPS has provided redistributable versions
+	of these files.  Thanks!
+	* ecoff-ext.h:  Add weakext bit to match new sym.h.
+
+Fri Mar  6 00:10:46 1992  John Gilmore  (gnu at cygnus.com)
+
+	* ecoff-ext.h:  Add relative file descriptors.
+
+Thu Feb 27 11:53:04 1992  John Gilmore  (gnu at cygnus.com)
+
+	* ecoff-ext.h:  New file for external (in-file) form of ecoff
+	symbol structures.
+
+Thu Feb  6 11:33:32 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* h8300.h: made the external_lineno l_lnno field 4 bytes wide.
+	andded GET/PUT_LINENO_LNNO macros
+
+Sat Nov 30 20:38:35 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* a29k.h, h8300.h, i386.h, i960.h, internal.h, m68k.h, m88k.h,
+	mips.h, rs6000.h: Move from above coff-<foo>.h.
+
+
+Local Variables:
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/alpha.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/alpha.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/alpha.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/alpha.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,386 @@
+/* ECOFF support on Alpha machines.
+   coff/ecoff.h must be included before this file.
+
+   Copyright 2001, 2005, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+   
+/********************** FILE HEADER **********************/
+
+struct external_filehdr
+{
+  unsigned char f_magic[2];	/* magic number			*/
+  unsigned char f_nscns[2];	/* number of sections		*/
+  unsigned char f_timdat[4];	/* time & date stamp		*/
+  unsigned char f_symptr[8];	/* file pointer to symtab	*/
+  unsigned char f_nsyms[4];	/* number of symtab entries	*/
+  unsigned char f_opthdr[2];	/* sizeof(optional hdr)		*/
+  unsigned char f_flags[2];	/* flags			*/
+};
+
+/* Magic numbers are defined in coff/ecoff.h.  */
+#define ALPHA_ECOFF_BADMAG(x) \
+  ((x).f_magic != ALPHA_MAGIC && (x).f_magic != ALPHA_MAGIC_BSD)
+
+#define ALPHA_ECOFF_COMPRESSEDMAG(x) \
+  ((x).f_magic == ALPHA_MAGIC_COMPRESSED)
+
+/* The object type is encoded in the f_flags.  */
+#define F_ALPHA_OBJECT_TYPE_MASK	0x3000
+#define F_ALPHA_NO_SHARED		0x1000
+#define F_ALPHA_SHARABLE		0x2000
+#define F_ALPHA_CALL_SHARED		0x3000
+
+#define	FILHDR	struct external_filehdr
+#define	FILHSZ	24
+
+/********************** AOUT "OPTIONAL HEADER" **********************/
+
+typedef struct external_aouthdr
+{
+  unsigned char magic[2];	/* type of file				*/
+  unsigned char	vstamp[2];	/* version stamp			*/
+  unsigned char bldrev[2];	/* ?? */
+  unsigned char padding[2];	/* pad to quadword boundary		*/
+  unsigned char	tsize[8];	/* text size in bytes			*/
+  unsigned char	dsize[8];	/* initialized data "  "		*/
+  unsigned char	bsize[8];	/* uninitialized data "   "		*/
+  unsigned char	entry[8];	/* entry pt.				*/
+  unsigned char text_start[8];	/* base of text used for this file */
+  unsigned char data_start[8];	/* base of data used for this file */
+  unsigned char bss_start[8];	/* base of bss used for this file */
+  unsigned char gprmask[4];	/* bitmask of general registers used */
+  unsigned char fprmask[4];	/* bitmask of floating point registers used */
+  unsigned char gp_value[8];	/* value for gp register */
+} AOUTHDR;
+
+/* compute size of a header */
+
+#define AOUTSZ 80
+#define AOUTHDRSZ 80
+
+/********************** SECTION HEADER **********************/
+
+struct external_scnhdr
+{
+  unsigned char	s_name[8];	/* section name			*/
+  unsigned char	s_paddr[8];	/* physical address, aliased s_nlib */
+  unsigned char	s_vaddr[8];	/* virtual address		*/
+  unsigned char	s_size[8];	/* section size			*/
+  unsigned char	s_scnptr[8];	/* file ptr to raw data for section */
+  unsigned char	s_relptr[8];	/* file ptr to relocation	*/
+  unsigned char	s_lnnoptr[8];	/* file ptr to line numbers	*/
+  unsigned char	s_nreloc[2];	/* number of relocation entries	*/
+  unsigned char	s_nlnno[2];	/* number of line number entries*/
+  unsigned char	s_flags[4];	/* flags			*/
+};
+
+#define	SCNHDR	struct external_scnhdr
+#define	SCNHSZ	64
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+struct external_reloc 
+{
+  unsigned char r_vaddr[8];
+  unsigned char r_symndx[4];
+  unsigned char r_bits[4];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 16
+
+/* Constants to unpack the r_bits field.  The Alpha seems to always be
+   little endian, so I haven't bothered to define big endian variants
+   of these.  */
+
+#define RELOC_BITS0_TYPE_LITTLE			0xff
+#define RELOC_BITS0_TYPE_SH_LITTLE		0
+
+#define RELOC_BITS1_EXTERN_LITTLE		0x01
+
+#define RELOC_BITS1_OFFSET_LITTLE		0x7e
+#define RELOC_BITS1_OFFSET_SH_LITTLE		1
+
+#define RELOC_BITS1_RESERVED_LITTLE		0x80
+#define RELOC_BITS1_RESERVED_SH_LITTLE		7
+#define RELOC_BITS2_RESERVED_LITTLE		0xff
+#define RELOC_BITS2_RESERVED_SH_LEFT_LITTLE	1
+#define RELOC_BITS3_RESERVED_LITTLE		0x03
+#define RELOC_BITS3_RESERVED_SH_LEFT_LITTLE	9
+
+#define RELOC_BITS3_SIZE_LITTLE			0xfc
+#define RELOC_BITS3_SIZE_SH_LITTLE		2
+
+/* The r_type field in a reloc is one of the following values.  */
+#define ALPHA_R_IGNORE		0
+#define ALPHA_R_REFLONG		1
+#define ALPHA_R_REFQUAD		2
+#define ALPHA_R_GPREL32		3
+#define ALPHA_R_LITERAL		4
+#define ALPHA_R_LITUSE		5
+#define ALPHA_R_GPDISP		6
+#define ALPHA_R_BRADDR		7
+#define ALPHA_R_HINT		8
+#define ALPHA_R_SREL16		9
+#define ALPHA_R_SREL32	       10
+#define ALPHA_R_SREL64	       11
+#define ALPHA_R_OP_PUSH	       12
+#define ALPHA_R_OP_STORE       13
+#define ALPHA_R_OP_PSUB	       14
+#define ALPHA_R_OP_PRSHIFT     15
+#define ALPHA_R_GPVALUE	       16
+#define ALPHA_R_GPRELHIGH      17
+#define ALPHA_R_GPRELLOW       18
+#define ALPHA_R_IMMED          19
+
+/* Overloaded reloc value used by Net- and OpenBSD.  */
+#define ALPHA_R_LITERALSLEAZY  17
+
+/* With ALPHA_R_LITUSE, the r_size field is one of the following values.  */
+#define ALPHA_R_LU_BASE         1
+#define ALPHA_R_LU_BYTOFF       2
+#define ALPHA_R_LU_JSR          3
+
+/* With ALPHA_R_IMMED, the r_size field is one of the following values.  */
+#define ALPHA_R_IMMED_GP_16     1
+#define ALPHA_R_IMMED_GP_HI32   2
+#define ALPHA_R_IMMED_SCN_HI32  3
+#define ALPHA_R_IMMED_BR_HI32   4
+#define ALPHA_R_IMMED_LO32      5
+
+/********************** SYMBOLIC INFORMATION **********************/
+
+/* Written by John Gilmore.  */
+
+/* ECOFF uses COFF-like section structures, but its own symbol format.
+   This file defines the symbol format in fields whose size and alignment
+   will not vary on different host systems.  */
+
+/* File header as a set of bytes */
+
+struct hdr_ext
+{
+	unsigned char 	h_magic[2];
+	unsigned char	h_vstamp[2];
+	unsigned char	h_ilineMax[4];
+	unsigned char	h_idnMax[4];
+	unsigned char	h_ipdMax[4];
+	unsigned char	h_isymMax[4];
+	unsigned char	h_ioptMax[4];
+	unsigned char	h_iauxMax[4];
+	unsigned char	h_issMax[4];
+	unsigned char	h_issExtMax[4];
+	unsigned char	h_ifdMax[4];
+	unsigned char	h_crfd[4];
+	unsigned char	h_iextMax[4];
+	unsigned char	h_cbLine[8];
+	unsigned char	h_cbLineOffset[8];
+	unsigned char	h_cbDnOffset[8];
+	unsigned char	h_cbPdOffset[8];
+	unsigned char	h_cbSymOffset[8];
+	unsigned char	h_cbOptOffset[8];
+	unsigned char	h_cbAuxOffset[8];
+	unsigned char	h_cbSsOffset[8];
+	unsigned char	h_cbSsExtOffset[8];
+	unsigned char	h_cbFdOffset[8];
+	unsigned char	h_cbRfdOffset[8];
+	unsigned char	h_cbExtOffset[8];
+};
+
+/* File descriptor external record */
+
+struct fdr_ext
+{
+	unsigned char	f_adr[8];
+	unsigned char	f_cbLineOffset[8];
+	unsigned char	f_cbLine[8];
+	unsigned char	f_cbSs[8];
+	unsigned char	f_rss[4];
+	unsigned char	f_issBase[4];
+	unsigned char	f_isymBase[4];
+	unsigned char	f_csym[4];
+	unsigned char	f_ilineBase[4];
+	unsigned char	f_cline[4];
+	unsigned char	f_ioptBase[4];
+	unsigned char	f_copt[4];
+	unsigned char	f_ipdFirst[4];
+	unsigned char	f_cpd[4];
+	unsigned char	f_iauxBase[4];
+	unsigned char	f_caux[4];
+	unsigned char	f_rfdBase[4];
+	unsigned char	f_crfd[4];
+	unsigned char	f_bits1[1];
+	unsigned char	f_bits2[3];
+	unsigned char	f_padding[4];
+};
+
+#define	FDR_BITS1_LANG_BIG		0xF8
+#define	FDR_BITS1_LANG_SH_BIG		3
+#define	FDR_BITS1_LANG_LITTLE		0x1F
+#define	FDR_BITS1_LANG_SH_LITTLE	0
+
+#define	FDR_BITS1_FMERGE_BIG		0x04
+#define	FDR_BITS1_FMERGE_LITTLE		0x20
+
+#define	FDR_BITS1_FREADIN_BIG		0x02
+#define	FDR_BITS1_FREADIN_LITTLE	0x40
+
+#define	FDR_BITS1_FBIGENDIAN_BIG	0x01
+#define	FDR_BITS1_FBIGENDIAN_LITTLE	0x80
+
+#define	FDR_BITS2_GLEVEL_BIG		0xC0
+#define	FDR_BITS2_GLEVEL_SH_BIG		6
+#define	FDR_BITS2_GLEVEL_LITTLE		0x03
+#define	FDR_BITS2_GLEVEL_SH_LITTLE	0
+
+/* We ignore the `reserved' field in bits2. */
+
+/* Procedure descriptor external record */
+
+struct pdr_ext {
+	unsigned char	p_adr[8];
+	unsigned char	p_cbLineOffset[8];
+	unsigned char	p_isym[4];
+	unsigned char	p_iline[4];
+	unsigned char	p_regmask[4];
+	unsigned char	p_regoffset[4];
+	unsigned char	p_iopt[4];
+	unsigned char	p_fregmask[4];
+	unsigned char	p_fregoffset[4];
+	unsigned char	p_frameoffset[4];
+	unsigned char	p_lnLow[4];
+	unsigned char	p_lnHigh[4];
+	unsigned char	p_gp_prologue[1];
+	unsigned char	p_bits1[1];
+	unsigned char	p_bits2[1];
+	unsigned char	p_localoff[1];
+	unsigned char	p_framereg[2];
+	unsigned char	p_pcreg[2];
+};
+
+#define PDR_BITS1_GP_USED_BIG		0x80
+#define PDR_BITS1_REG_FRAME_BIG		0x40
+#define PDR_BITS1_PROF_BIG		0x20
+#define PDR_BITS1_RESERVED_BIG		0x1f
+#define PDR_BITS1_RESERVED_SH_LEFT_BIG	8
+#define PDR_BITS2_RESERVED_BIG		0xff
+#define PDR_BITS2_RESERVED_SH_BIG	0
+
+#define PDR_BITS1_GP_USED_LITTLE	0x01
+#define PDR_BITS1_REG_FRAME_LITTLE	0x02
+#define PDR_BITS1_PROF_LITTLE		0x04
+#define PDR_BITS1_RESERVED_LITTLE	0xf8
+#define PDR_BITS1_RESERVED_SH_LITTLE	3
+#define PDR_BITS2_RESERVED_LITTLE	0xff
+#define PDR_BITS2_RESERVED_SH_LEFT_LITTLE 5
+
+/* Line numbers */
+
+struct line_ext {
+	unsigned char	l_line[4];
+};
+
+/* Symbol external record */
+
+struct sym_ext {
+	unsigned char	s_value[8];
+	unsigned char	s_iss[4];
+	unsigned char	s_bits1[1];
+	unsigned char	s_bits2[1];
+	unsigned char	s_bits3[1];
+	unsigned char	s_bits4[1];
+};
+
+#define	SYM_BITS1_ST_BIG		0xFC
+#define	SYM_BITS1_ST_SH_BIG		2
+#define	SYM_BITS1_ST_LITTLE		0x3F
+#define	SYM_BITS1_ST_SH_LITTLE		0
+
+#define	SYM_BITS1_SC_BIG		0x03
+#define	SYM_BITS1_SC_SH_LEFT_BIG	3
+#define	SYM_BITS1_SC_LITTLE		0xC0
+#define	SYM_BITS1_SC_SH_LITTLE		6
+
+#define	SYM_BITS2_SC_BIG		0xE0
+#define	SYM_BITS2_SC_SH_BIG		5
+#define	SYM_BITS2_SC_LITTLE		0x07
+#define	SYM_BITS2_SC_SH_LEFT_LITTLE	2
+
+#define	SYM_BITS2_RESERVED_BIG		0x10
+#define	SYM_BITS2_RESERVED_LITTLE	0x08
+
+#define	SYM_BITS2_INDEX_BIG		0x0F
+#define	SYM_BITS2_INDEX_SH_LEFT_BIG	16
+#define	SYM_BITS2_INDEX_LITTLE		0xF0
+#define	SYM_BITS2_INDEX_SH_LITTLE	4
+
+#define	SYM_BITS3_INDEX_SH_LEFT_BIG	8
+#define	SYM_BITS3_INDEX_SH_LEFT_LITTLE	4
+
+#define	SYM_BITS4_INDEX_SH_LEFT_BIG	0
+#define	SYM_BITS4_INDEX_SH_LEFT_LITTLE	12
+
+/* External symbol external record */
+
+struct ext_ext {
+	struct	sym_ext es_asym;
+	unsigned char	es_bits1[1];
+	unsigned char	es_bits2[3];
+	unsigned char	es_ifd[4];
+};
+
+#define	EXT_BITS1_JMPTBL_BIG		0x80
+#define	EXT_BITS1_JMPTBL_LITTLE		0x01
+
+#define	EXT_BITS1_COBOL_MAIN_BIG	0x40
+#define	EXT_BITS1_COBOL_MAIN_LITTLE	0x02
+
+#define	EXT_BITS1_WEAKEXT_BIG		0x20
+#define	EXT_BITS1_WEAKEXT_LITTLE	0x04
+
+/* Dense numbers external record */
+
+struct dnr_ext {
+	unsigned char	d_rfd[4];
+	unsigned char	d_index[4];
+};
+
+/* Relative file descriptor */
+
+struct rfd_ext {
+  unsigned char	rfd[4];
+};
+
+/* Optimizer symbol external record */
+
+struct opt_ext {
+  unsigned char o_bits1[1];
+  unsigned char o_bits2[1];
+  unsigned char o_bits3[1];
+  unsigned char o_bits4[1];
+  struct rndx_ext o_rndx;
+  unsigned char o_offset[4];
+};
+
+#define OPT_BITS2_VALUE_SH_LEFT_BIG	16
+#define OPT_BITS2_VALUE_SH_LEFT_LITTLE	0
+
+#define OPT_BITS3_VALUE_SH_LEFT_BIG	8
+#define OPT_BITS3_VALUE_SH_LEFT_LITTLE	8
+
+#define OPT_BITS4_VALUE_SH_LEFT_BIG	0
+#define OPT_BITS4_VALUE_SH_LEFT_LITTLE	16
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/apollo.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/apollo.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/apollo.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/apollo.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,125 @@
+/* coff information for Apollo M68K
+
+   Copyright 2001, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define DO_NOT_DEFINE_AOUTHDR
+#define L_LNNO_SIZE 2
+#include "coff/external.h"
+
+/* Motorola 68000/68008/68010/68020 */
+#define	MC68MAGIC	0520
+#define MC68KWRMAGIC	0520	/* writeable text segments */
+#define	MC68TVMAGIC	0521
+#define MC68KROMAGIC	0521	/* readonly shareable text segments */
+#define MC68KPGMAGIC	0522	/* demand paged text segments */
+#define	M68MAGIC	0210
+#define	M68TVMAGIC	0211
+
+/* Apollo 68000-based machines have a different magic number. This comes
+ * from /usr/include/apollo/filehdr.h
+ */
+#define APOLLOM68KMAGIC 0627
+
+#define OMAGIC M68MAGIC
+#define M68KBADMAG(x) (((x).f_magic!=MC68MAGIC) && ((x).f_magic!=MC68KWRMAGIC) && ((x).f_magic!=MC68TVMAGIC) && \
+  ((x).f_magic!=MC68KROMAGIC) && ((x).f_magic!=MC68KPGMAGIC) && ((x).f_magic!=M68MAGIC) && ((x).f_magic!=M68TVMAGIC)  && \
+  ((x).f_magic!=APOLLOM68KMAGIC) )
+
+/********************** AOUT "OPTIONAL HEADER" **********************/
+
+typedef struct 
+{
+  char 	magic[2];		/* type of file				*/
+  char	vstamp[2];		/* version stamp			*/
+  char	tsize[4];		/* text size in bytes, padded to FW bdry*/
+  char	dsize[4];		/* initialized data "  "		*/
+  char	bsize[4];		/* uninitialized data "   "		*/
+  char	entry[4];		/* entry pt.				*/
+  char 	text_start[4];		/* base of text used for this file */
+  char 	data_start[4];		/* base of data used for this file */
+  char	o_sri[4];		/* Apollo specific - .sri data pointer */
+  char  o_inlib[4];		/* Apollo specific - .inlib data pointer */
+  char	vid[8];			/* Apollo specific - 64 bit version ID */
+}
+AOUTHDR;
+
+#define	APOLLO_COFF_VERSION_NUMBER 1 /* the value of the aouthdr magic */
+#define	AOUTHDRSZ 44
+#define AOUTSZ 44
+
+/* Apollo allowa for larger section names by allowing
+   them to be in the string table.  */
+
+/* If s_zeores is all zeroes, s_offset gives the real
+   location of the name in the string table.  */
+
+#define	s_zeroes section_name.s_name
+#define	s_offset (section_name.s_name+4)
+
+/* More names of "special" sections.  */
+#define _TV	".tv"
+#define _INIT	".init"
+#define _FINI	".fini"
+#define	_LINES	".lines"
+#define	_BLOCKS	".blocks"
+#define _SRI    ".sri"                  /* Static Resource Information (systype,
+ et al.) */
+#define _MIR    ".mir"                  /* Module Information Records  */
+#define _APTV   ".aptv"                 /* Apollo-style transfer vectors. */
+#define _INLIB  ".inlib"                /* Shared Library information */
+#define _RWDI   ".rwdi"         /* Read/write data initialization directives for
+ compressed sections */
+#define _UNWIND ".unwind"               /* Stack unwind information */
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_type[2];
+#ifdef M68K_COFF_OFFSET
+  char r_offset[4];
+#endif
+
+};
+
+#define RELOC struct external_reloc
+
+#ifdef M68K_COFF_OFFSET
+#define RELSZ 14
+#else
+#define RELSZ 10
+#endif
+
+/* Apollo specific STYP flags */
+
+#define STYP_RELOCATED_NOT_LOADED 0x00010000	/* Section is relocated normally during linking, but need
+                                            	   not be loaded during program execution */
+#define STYP_DEBUG              0x00020000	/* debug section */
+#define STYP_OVERLAY		0x00040000	/* Section is overlayed */
+#define STYP_INSTRUCTION    	0x00200000	/* Section contains executable code */
+
+#define STYP_ZERO		0x00800000	/* Section is initialized to zero */
+#define STYP_INSTALLED		0x02000000	/* Section should be installable in KGT */
+#define STYP_LOOK_INSTALLED	0x04000000	/* Look for section in KGT */
+#define STYP_SECALIGN1		0x08000000	/* Specially aligned section */
+#define STYP_SECALIGN2		0x10000000	/*      "       "       "    */
+#define STYP_COMPRESSED		0x20000000	/* No section data per se (s_scnptr = 0), but there are
+						   initialization directives for it in .rwdi section
+						   (used in conjunction with STYP_BSS) */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/arm.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/arm.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/arm.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/arm.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,128 @@
+/* ARM COFF support for BFD.
+   Copyright 1998, 1999, 2000, 2002, 2003, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#define COFFARM 1
+
+#define L_LNNO_SIZE 2
+#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
+#include "coff/external.h"
+
+/* Bits for f_flags:
+ 	F_RELFLG	relocation info stripped from file
+ 	F_EXEC		file is executable (no unresolved external references)
+ 	F_LNNO		line numbers stripped from file
+ 	F_LSYMS		local symbols stripped from file
+        F_INTERWORK     file supports switching between ARM and Thumb instruction sets
+        F_INTERWORK_SET the F_INTERWORK bit is valid
+ 	F_APCS_FLOAT	code passes float arguments in float registers
+ 	F_PIC		code is reentrant/position-independent
+ 	F_AR32WR	file has byte ordering of an AR32WR machine (e.g. vax)
+ 	F_APCS_26	file uses 26 bit ARM Procedure Calling Standard
+ 	F_APCS_SET	the F_APCS_26, F_APCS_FLOAT and F_PIC bits have been initialised
+ 	F_SOFT_FLOAT	code does not use floating point instructions.  */
+
+#define F_RELFLG	(0x0001)
+#define F_EXEC		(0x0002)
+#define F_LNNO		(0x0004)
+#define F_LSYMS		(0x0008)
+#define F_INTERWORK	(0x0010)
+#define F_INTERWORK_SET	(0x0020)
+#define F_APCS_FLOAT	(0x0040)
+#undef  F_AR16WR
+#define F_PIC		(0x0080)
+#define	F_AR32WR	(0x0100)
+#define F_APCS_26	(0x0400)
+#define F_APCS_SET	(0x0800)
+#define F_SOFT_FLOAT	(0x2000)
+#define F_VFP_FLOAT	(0x4000)
+
+/* Bits stored in flags field of the internal_f structure */
+
+#define F_INTERWORK	(0x0010)
+#define F_APCS_FLOAT	(0x0040)
+#define F_PIC		(0x0080)
+#define F_APCS26	(0x1000)
+#define F_ARM_ARCHITECTURE_MASK (0x4000+0x0800+0x0400)
+#define F_ARM_2		(0x0400)
+#define F_ARM_2a	(0x0800)
+#define F_ARM_3		(0x0c00)
+#define F_ARM_3M	(0x4000)
+#define F_ARM_4		(0x4400)
+#define F_ARM_4T	(0x4800)
+#define F_ARM_5		(0x4c00)
+
+/*
+  ARMMAGIC ought to encoded the procesor type,
+  but it is too late to change it now, instead
+  the flags field of the internal_f structure
+  is used as shown above.
+ 
+  XXX - NC 5/6/97.  */
+
+#define	ARMMAGIC	0xa00  /* I just made this up */
+
+#define ARMBADMAG(x) (((x).f_magic != ARMMAGIC))
+
+#define	ARMPEMAGIC	0x1c0
+#define	THUMBPEMAGIC	0x1c2
+
+#undef  ARMBADMAG
+#define ARMBADMAG(x) (((x).f_magic != ARMMAGIC) && ((x).f_magic != ARMPEMAGIC) && ((x).f_magic != THUMBPEMAGIC))
+
+#define OMAGIC          0404    /* object files, eg as output */
+#define ZMAGIC          0413    /* demand load format, eg normal ld output */
+#define STMAGIC		0401	/* target shlib */
+#define SHMAGIC		0443	/* host   shlib */
+
+/* define some NT default values */
+/*  #define NT_IMAGE_BASE        0x400000 moved to internal.h */
+#define NT_SECTION_ALIGNMENT 0x1000
+#define NT_FILE_ALIGNMENT    0x200  
+#define NT_DEF_RESERVE       0x100000
+#define NT_DEF_COMMIT        0x1000
+
+/* We use the .rdata section to hold read only data.  */
+#define _LIT	".rdata"
+
+/********************** RELOCATION DIRECTIVES **********************/
+#ifdef ARM_WINCE
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_type[2];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 10
+
+#else
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_type[2];
+  char r_offset[4];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 14
+#endif
+
+#define ARM_NOTE_SECTION ".note"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/aux-coff.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/aux-coff.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/aux-coff.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/aux-coff.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,49 @@
+/* Modifications of internal.h and m68k.h needed by A/UX
+
+   Copyright 2001, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.
+   
+   Suggested by Ian Lance Taylor <ian@cygnus.com> */
+
+#ifndef GNU_COFF_AUX_H
+#define GNU_COFF_AUX_H 1
+
+#include "coff/internal.h"
+#include "coff/m68k.h"
+
+/* Section contains 64-byte padded pathnames of shared libraries */
+#undef STYP_LIB
+#define STYP_LIB 0x200
+
+/* Section contains shared library initialization code */
+#undef STYP_INIT
+#define STYP_INIT 0x400
+
+/* Section contains .ident information */
+#undef STYP_IDENT
+#define STYP_IDENT 0x800
+
+/* Section types used by bfd and gas not defined (directly) by A/UX */
+#undef STYP_OVER
+#define STYP_OVER 0
+#undef STYP_INFO
+#define STYP_INFO STYP_IDENT
+
+/* Traditional name of the section tagged with STYP_LIB */
+#define _LIB ".lib"
+
+#endif /* GNU_COFF_AUX_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/ecoff.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/ecoff.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/ecoff.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/ecoff.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,411 @@
+/* Generic ECOFF support.
+   This does not include symbol information, found in sym.h and
+   symconst.h.
+
+   Copyright 2001, 2002, 2003, 2004, 2005, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef ECOFF_H
+#define ECOFF_H
+
+/* Mips magic numbers used in filehdr.  MIPS_MAGIC_LITTLE is used on
+   little endian machines.  MIPS_MAGIC_BIG is used on big endian
+   machines.  Where is MIPS_MAGIC_1 from?  */
+#define MIPS_MAGIC_1 0x0180
+#define MIPS_MAGIC_LITTLE 0x0162
+#define MIPS_MAGIC_BIG 0x0160
+
+/* These are the magic numbers used for MIPS code compiled at ISA
+   level 2.  */
+#define MIPS_MAGIC_LITTLE2 0x0166
+#define MIPS_MAGIC_BIG2 0x0163
+
+/* These are the magic numbers used for MIPS code compiled at ISA
+   level 3.  */
+#define MIPS_MAGIC_LITTLE3 0x142
+#define MIPS_MAGIC_BIG3 0x140
+
+/* Alpha magic numbers used in filehdr.  */
+#define ALPHA_MAGIC 0x183
+#define ALPHA_MAGIC_BSD 0x185
+/* A compressed version of an ALPHA_MAGIC file created by DEC's tools.  */
+#define ALPHA_MAGIC_COMPRESSED 0x188
+
+/* Magic numbers used in a.out header.  */
+#define ECOFF_AOUT_OMAGIC 0407	/* not demand paged (ld -N).  */
+#define ECOFF_AOUT_ZMAGIC 0413	/* demand load format, eg normal ld output */
+
+/* Names of special sections.  */
+#define _TEXT   ".text"
+#define _DATA   ".data"
+#define _BSS    ".bss"
+#define _RDATA	".rdata"
+#define _SDATA	".sdata"
+#define _SBSS	".sbss"
+#define _LITA	".lita"
+#define _LIT4	".lit4"
+#define _LIT8	".lit8"
+#define _LIB	".lib"
+#define _INIT	".init"
+#define _FINI	".fini"
+#define _PDATA	".pdata"
+#define _XDATA	".xdata"
+#define _GOT	".got"
+#define _HASH	".hash"
+#define _DYNSYM	".dynsym"
+#define _DYNSTR	".dynstr"
+#define _RELDYN	".rel.dyn"
+#define _CONFLIC ".conflic"
+#define _COMMENT ".comment"
+#define _LIBLIST ".liblist"
+#define _DYNAMIC ".dynamic"
+#define _RCONST	".rconst"
+
+/* ECOFF uses some additional section flags.  */
+#define STYP_RDATA	     0x100
+#define STYP_SDATA	     0x200
+#define STYP_SBSS	     0x400
+#define STYP_GOT	    0x1000
+#define STYP_DYNAMIC	    0x2000
+#define STYP_DYNSYM	    0x4000
+#define STYP_RELDYN	    0x8000
+#define STYP_DYNSTR	   0x10000
+#define STYP_HASH	   0x20000
+#define STYP_LIBLIST	   0x40000
+#define STYP_CONFLIC	  0x100000
+#define STYP_ECOFF_FINI	 0x1000000
+#define STYP_EXTENDESC	 0x2000000 /* 0x02FFF000 bits => scn type, rest clr */
+#define STYP_LITA	 0x4000000
+#define STYP_LIT8	 0x8000000
+#define STYP_LIT4	0x10000000
+#define STYP_ECOFF_LIB	0x40000000
+#define STYP_ECOFF_INIT 0x80000000
+#define STYP_OTHER_LOAD (STYP_ECOFF_INIT | STYP_ECOFF_FINI)
+
+/* extended section types */
+#define STYP_COMMENT	 0x2100000
+#define STYP_RCONST	 0x2200000
+#define STYP_XDATA	 0x2400000
+#define STYP_PDATA	 0x2800000
+
+/* The linker needs a section to hold small common variables while
+   linking.  There is no convenient way to create it when the linker
+   needs it, so we always create one for each BFD.  We then avoid
+   writing it out.  */
+#define SCOMMON ".scommon"
+
+/* If the extern bit in a reloc is 1, then r_symndx is an index into
+   the external symbol table.  If the extern bit is 0, then r_symndx
+   indicates a section, and is one of the following values.  */
+#define RELOC_SECTION_NONE	0
+#define RELOC_SECTION_TEXT	1
+#define RELOC_SECTION_RDATA	2
+#define RELOC_SECTION_DATA	3
+#define RELOC_SECTION_SDATA	4
+#define RELOC_SECTION_SBSS	5
+#define RELOC_SECTION_BSS	6
+#define RELOC_SECTION_INIT	7
+#define RELOC_SECTION_LIT8	8
+#define RELOC_SECTION_LIT4	9
+#define RELOC_SECTION_XDATA    10
+#define RELOC_SECTION_PDATA    11
+#define RELOC_SECTION_FINI     12
+#define RELOC_SECTION_LITA     13
+#define RELOC_SECTION_ABS      14
+#define RELOC_SECTION_RCONST   15
+
+#define NUM_RELOC_SECTIONS     16
+
+/********************** STABS **********************/
+
+/* gcc uses mips-tfile to output type information in special stabs
+   entries.  These must match the corresponding definition in
+   gcc/config/mips.h.  At some point, these should probably go into a
+   shared include file, but currently gcc and gdb do not share any
+   directories. */
+#define CODE_MASK 0x8F300
+#define ECOFF_IS_STAB(sym) (((sym)->index & 0xFFF00) == CODE_MASK)
+#define ECOFF_MARK_STAB(code) ((code)+CODE_MASK)
+#define ECOFF_UNMARK_STAB(code) ((code)-CODE_MASK)
+#define STABS_SYMBOL "@stabs"
+
+/********************** COFF **********************/
+
+/* gcc also uses mips-tfile to output COFF debugging information.
+   These are the values it uses when outputting the .type directive.
+   These should also be in a shared include file.  */
+#define N_BTMASK	(017)
+#define N_TMASK		(060)
+#define N_BTSHFT	(4)
+#define N_TSHIFT	(2)
+
+/********************** AUX **********************/
+
+/* The auxiliary type information is the same on all known ECOFF
+   targets.  I can't see any reason that it would ever change, so I am
+   going to gamble and define the external structures here, in the
+   target independent ECOFF header file.  The internal forms are
+   defined in coff/sym.h, which was originally donated by MIPS
+   Computer Systems.  */
+
+/* Type information external record */
+
+struct tir_ext {
+	unsigned char	t_bits1[1];
+	unsigned char	t_tq45[1];
+	unsigned char	t_tq01[1];
+	unsigned char	t_tq23[1];
+};
+
+#define	TIR_BITS1_FBITFIELD_BIG		((unsigned int) 0x80)
+#define	TIR_BITS1_FBITFIELD_LITTLE	((unsigned int) 0x01)
+
+#define	TIR_BITS1_CONTINUED_BIG		((unsigned int) 0x40)
+#define	TIR_BITS1_CONTINUED_LITTLE	((unsigned int) 0x02)
+
+#define	TIR_BITS1_BT_BIG		((unsigned int) 0x3F)
+#define	TIR_BITS1_BT_SH_BIG		0
+#define	TIR_BITS1_BT_LITTLE		((unsigned int) 0xFC)
+#define	TIR_BITS1_BT_SH_LITTLE		2
+
+#define	TIR_BITS_TQ4_BIG		((unsigned int) 0xF0)
+#define	TIR_BITS_TQ4_SH_BIG		4
+#define	TIR_BITS_TQ5_BIG		((unsigned int) 0x0F)
+#define	TIR_BITS_TQ5_SH_BIG		0
+#define	TIR_BITS_TQ4_LITTLE		((unsigned int) 0x0F)
+#define	TIR_BITS_TQ4_SH_LITTLE		0
+#define	TIR_BITS_TQ5_LITTLE		((unsigned int) 0xF0)
+#define	TIR_BITS_TQ5_SH_LITTLE		4
+
+#define	TIR_BITS_TQ0_BIG		((unsigned int) 0xF0)
+#define	TIR_BITS_TQ0_SH_BIG		4
+#define	TIR_BITS_TQ1_BIG		((unsigned int) 0x0F)
+#define	TIR_BITS_TQ1_SH_BIG		0
+#define	TIR_BITS_TQ0_LITTLE		((unsigned int) 0x0F)
+#define	TIR_BITS_TQ0_SH_LITTLE		0
+#define	TIR_BITS_TQ1_LITTLE		((unsigned int) 0xF0)
+#define	TIR_BITS_TQ1_SH_LITTLE		4
+
+#define	TIR_BITS_TQ2_BIG		((unsigned int) 0xF0)
+#define	TIR_BITS_TQ2_SH_BIG		4
+#define	TIR_BITS_TQ3_BIG		((unsigned int) 0x0F)
+#define	TIR_BITS_TQ3_SH_BIG		0
+#define	TIR_BITS_TQ2_LITTLE		((unsigned int) 0x0F)
+#define	TIR_BITS_TQ2_SH_LITTLE		0
+#define	TIR_BITS_TQ3_LITTLE		((unsigned int) 0xF0)
+#define	TIR_BITS_TQ3_SH_LITTLE		4
+
+/* Relative symbol external record */
+
+struct rndx_ext {
+	unsigned char	r_bits[4];
+};
+
+#define	RNDX_BITS0_RFD_SH_LEFT_BIG	4
+#define	RNDX_BITS1_RFD_BIG		((unsigned int) 0xF0)
+#define	RNDX_BITS1_RFD_SH_BIG		4
+
+#define	RNDX_BITS0_RFD_SH_LEFT_LITTLE	0
+#define	RNDX_BITS1_RFD_LITTLE		((unsigned int) 0x0F)
+#define	RNDX_BITS1_RFD_SH_LEFT_LITTLE	8
+
+#define	RNDX_BITS1_INDEX_BIG		((unsigned int) 0x0F)
+#define	RNDX_BITS1_INDEX_SH_LEFT_BIG	16
+#define	RNDX_BITS2_INDEX_SH_LEFT_BIG	8
+#define	RNDX_BITS3_INDEX_SH_LEFT_BIG	0
+
+#define	RNDX_BITS1_INDEX_LITTLE		((unsigned int) 0xF0)
+#define	RNDX_BITS1_INDEX_SH_LITTLE	4
+#define	RNDX_BITS2_INDEX_SH_LEFT_LITTLE	4
+#define	RNDX_BITS3_INDEX_SH_LEFT_LITTLE	12
+
+/* Auxiliary symbol information external record */
+
+union aux_ext {
+	struct tir_ext	a_ti;
+	struct rndx_ext	a_rndx;
+	unsigned char	a_dnLow[4];
+	unsigned char	a_dnHigh[4];
+	unsigned char	a_isym[4];
+	unsigned char	a_iss[4];
+	unsigned char	a_width[4];
+	unsigned char	a_count[4];
+};
+
+#define AUX_GET_ANY(bigend, ax, field) \
+  ((bigend) ? bfd_getb32 ((ax)->field) : bfd_getl32 ((ax)->field))
+
+#define	AUX_GET_DNLOW(bigend, ax)	AUX_GET_ANY ((bigend), (ax), a_dnLow)
+#define	AUX_GET_DNHIGH(bigend, ax)	AUX_GET_ANY ((bigend), (ax), a_dnHigh)
+#define	AUX_GET_ISYM(bigend, ax)	AUX_GET_ANY ((bigend), (ax), a_isym)
+#define AUX_GET_ISS(bigend, ax)		AUX_GET_ANY ((bigend), (ax), a_iss)
+#define AUX_GET_WIDTH(bigend, ax)	AUX_GET_ANY ((bigend), (ax), a_width)
+#define AUX_GET_COUNT(bigend, ax)	AUX_GET_ANY ((bigend), (ax), a_count)
+
+#define AUX_PUT_ANY(bigend, val, ax, field) \
+  ((bigend) \
+   ? (bfd_putb32 ((bfd_vma) (val), (ax)->field), 0) \
+   : (bfd_putl32 ((bfd_vma) (val), (ax)->field), 0))
+
+#define AUX_PUT_DNLOW(bigend, val, ax) \
+  AUX_PUT_ANY ((bigend), (val), (ax), a_dnLow)
+#define AUX_PUT_DNHIGH(bigend, val, ax) \
+  AUX_PUT_ANY ((bigend), (val), (ax), a_dnHigh)
+#define AUX_PUT_ISYM(bigend, val, ax) \
+  AUX_PUT_ANY ((bigend), (val), (ax), a_isym)
+#define AUX_PUT_ISS(bigend, val, ax) \
+  AUX_PUT_ANY ((bigend), (val), (ax), a_iss)
+#define AUX_PUT_WIDTH(bigend, val, ax) \
+  AUX_PUT_ANY ((bigend), (val), (ax), a_width)
+#define AUX_PUT_COUNT(bigend, val, ax) \
+  AUX_PUT_ANY ((bigend), (val), (ax), a_count)
+
+/********************** SYMBOLS **********************/
+
+/* For efficiency, gdb deals directly with the unswapped symbolic
+   information (that way it only takes the time to swap information
+   that it really needs to read).  gdb originally retrieved the
+   information directly from the BFD backend information, but that
+   strategy, besides being sort of ugly, does not work for MIPS ELF,
+   which also uses ECOFF debugging information.  This structure holds
+   pointers to the (mostly) unswapped symbolic information.  */
+
+struct ecoff_debug_info
+{
+  /* The swapped ECOFF symbolic header.  */
+  HDRR symbolic_header;
+
+  /* Pointers to the unswapped symbolic information.  Note that the
+     pointers to external structures point to different sorts of
+     information on different ECOFF targets.  The ecoff_debug_swap
+     structure provides the sizes of the structures and the functions
+     needed to swap the information in and out.  These pointers are
+     all pointers to arrays, not single structures.  They will be NULL
+     if there are no instances of the relevant structure.  These
+     fields are also used by the assembler to output ECOFF debugging
+     information.  */
+  unsigned char *line;
+  void *external_dnr;	/* struct dnr_ext */
+  void *external_pdr;	/* struct pdr_ext */
+  void *external_sym;	/* struct sym_ext */
+  void *external_opt;	/* struct opt_ext */
+  union aux_ext *external_aux;
+  char *ss;
+  char *ssext;
+  void *external_fdr;	/* struct fdr_ext */
+  void *external_rfd;	/* struct rfd_ext */
+  void *external_ext;	/* struct ext_ext */
+
+  /* These fields are used when linking.  They may disappear at some
+     point.  */
+  char *ssext_end;
+  void *external_ext_end;
+
+  /* When linking, this field holds a mapping from the input FDR
+     numbers to the output numbers, and is used when writing out the
+     external symbols.  It is NULL if no mapping is required.  */
+  RFDT *ifdmap;
+
+  /* The swapped FDR information.  Currently this is never NULL, but
+     code using this structure should probably double-check in case
+     this changes in the future.  This is a pointer to an array, not a
+     single structure.  */
+  FDR *fdr;
+};
+
+/* These structures are used by the ECOFF find_nearest_line function.  */
+
+struct ecoff_fdrtab_entry
+{
+  /* Base address in .text of this FDR.  */
+  bfd_vma base_addr;
+  FDR *fdr;
+};
+
+struct ecoff_find_line
+{
+  /* Allocated memory to hold function and file names.  */
+  char *find_buffer;
+
+  /* FDR table, sorted by address: */
+  long fdrtab_len;
+  struct ecoff_fdrtab_entry *fdrtab;
+
+  /* Cache entry for most recently found line information.  The sect
+     field is NULL if this cache does not contain valid information.  */
+  struct
+    {
+      asection *sect;
+      bfd_vma start;
+      bfd_vma stop;
+      const char *filename;
+      const char *functionname;
+      unsigned int line_num;
+    } cache;
+};
+
+/********************** SWAPPING **********************/
+
+/* The generic ECOFF code needs to be able to swap debugging
+   information in and out in the specific format used by a particular
+   ECOFF implementation.  This structure provides the information
+   needed to do this.  */
+
+struct ecoff_debug_swap
+{
+  /* Symbol table magic number.  */
+  int sym_magic;
+  /* Alignment of debugging information.  E.g., 4.  */
+  bfd_size_type debug_align;
+  /* Sizes of external symbolic information.  */
+  bfd_size_type external_hdr_size;
+  bfd_size_type external_dnr_size;
+  bfd_size_type external_pdr_size;
+  bfd_size_type external_sym_size;
+  bfd_size_type external_opt_size;
+  bfd_size_type external_fdr_size;
+  bfd_size_type external_rfd_size;
+  bfd_size_type external_ext_size;
+  /* Functions to swap in external symbolic data.  */
+  void (*swap_hdr_in) (bfd *, void *, HDRR *);
+  void (*swap_dnr_in) (bfd *, void *, DNR *);
+  void (*swap_pdr_in) (bfd *, void *, PDR *);
+  void (*swap_sym_in) (bfd *, void *, SYMR *);
+  void (*swap_opt_in) (bfd *, void *, OPTR *);
+  void (*swap_fdr_in) (bfd *, void *, FDR *);
+  void (*swap_rfd_in) (bfd *, void *, RFDT *);
+  void (*swap_ext_in) (bfd *, void *, EXTR *);
+  void (*swap_tir_in) (int, const struct tir_ext *, TIR *);
+  void (*swap_rndx_in) (int, const struct rndx_ext *, RNDXR *);
+  /* Functions to swap out external symbolic data.  */
+  void (*swap_hdr_out) (bfd *, const HDRR *, void *);
+  void (*swap_dnr_out) (bfd *, const DNR *, void *);
+  void (*swap_pdr_out) (bfd *, const PDR *, void *);
+  void (*swap_sym_out) (bfd *, const SYMR *, void *);
+  void (*swap_opt_out) (bfd *, const OPTR *, void *);
+  void (*swap_fdr_out) (bfd *, const FDR *, void *);
+  void (*swap_rfd_out) (bfd *, const RFDT *, void *);
+  void (*swap_ext_out) (bfd *, const EXTR *, void *);
+  void (*swap_tir_out) (int, const TIR *, struct tir_ext *);
+  void (*swap_rndx_out) (int, const RNDXR *, struct rndx_ext *);
+  /* Function to read symbol data and set up pointers in
+     ecoff_debug_info structure.  The section argument is used for
+     ELF, not straight ECOFF.  */
+  bfd_boolean (*read_debug_info) (bfd *, asection *, struct ecoff_debug_info *);
+};
+
+#endif /* ! defined (ECOFF_H) */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/external.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/external.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/external.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/external.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,269 @@
+/* external.h  -- External COFF structures
+   
+   Copyright 2001, 2006, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef COFF_EXTERNAL_H
+#define COFF_EXTERNAL_H
+
+#ifndef DO_NOT_DEFINE_FILHDR
+/********************** FILE HEADER **********************/
+
+struct external_filehdr
+  {
+    char f_magic[2];	/* magic number			*/
+    char f_nscns[2];	/* number of sections		*/
+    char f_timdat[4];	/* time & date stamp		*/
+    char f_symptr[4];	/* file pointer to symtab	*/
+    char f_nsyms[4];	/* number of symtab entries	*/
+    char f_opthdr[2];	/* sizeof(optional hdr)		*/
+    char f_flags[2];	/* flags			*/
+  };
+
+#define	FILHDR	struct external_filehdr
+#define	FILHSZ	20
+#endif
+
+#ifndef DO_NOT_DEFINE_AOUTHDR
+/********************** AOUT "OPTIONAL HEADER" **********************/
+
+typedef struct external_aouthdr
+  {
+    char magic[2];	/* type of file				*/
+    char vstamp[2];	/* version stamp			*/
+    char tsize[4];	/* text size in bytes, padded to FW bdry*/
+    char dsize[4];	/* initialized data "  "		*/
+    char bsize[4];	/* uninitialized data "   "		*/
+    char entry[4];	/* entry pt.				*/
+    char text_start[4];	/* base of text used for this file 	*/
+    char data_start[4];	/* base of data used for this file 	*/
+  } ATTRIBUTE_PACKED
+AOUTHDR;
+
+#define AOUTHDRSZ 28
+#define AOUTSZ 28
+
+typedef struct external_aouthdr64
+{
+  char magic[2];	/* Type of file.			*/
+  char vstamp[2];	/* Version stamp.			*/
+  char tsize[4];	/* Text size in bytes, padded to FW bdry*/
+  char dsize[4];	/* Initialized data "  ".		*/
+  char bsize[4];	/* Uninitialized data "   ".		*/
+  char entry[4];	/* Entry pt.				*/
+  char text_start[4];	/* Base of text used for this file. 	*/
+}
+AOUTHDR64;
+#define AOUTHDRSZ64	24
+
+#endif /* not DO_NOT_DEFINE_AOUTHDR */
+
+#ifndef DO_NOT_DEFINE_SCNHDR
+/********************** SECTION HEADER **********************/
+
+struct external_scnhdr
+  {
+    char s_name[8];	/* section name				*/
+    char s_paddr[4];	/* physical address, aliased s_nlib 	*/
+    char s_vaddr[4];	/* virtual address			*/
+    char s_size[4];	/* section size				*/
+    char s_scnptr[4];	/* file ptr to raw data for section 	*/
+    char s_relptr[4];	/* file ptr to relocation		*/
+    char s_lnnoptr[4];	/* file ptr to line numbers		*/
+    char s_nreloc[2];	/* number of relocation entries		*/
+    char s_nlnno[2];	/* number of line number entries	*/
+    char s_flags[4];	/* flags				*/
+  };
+
+#define	SCNHDR	struct external_scnhdr
+#define	SCNHSZ	40
+
+/* Names of "special" sections.  */
+
+#define _TEXT	 ".text"
+#define _DATA	 ".data"
+#define _BSS	 ".bss"
+#define _COMMENT ".comment"
+#define _LIB     ".lib"
+#endif /* not DO_NOT_DEFINE_SCNHDR */
+
+#ifndef DO_NOT_DEFINE_LINENO
+
+/********************** LINE NUMBERS **********************/
+
+#ifndef L_LNNO_SIZE
+#error  L_LNNO_SIZE needs to be defined
+#endif
+
+/* 1 line number entry for every "breakpointable" source line in a section.
+   Line numbers are grouped on a per function basis; first entry in a function
+   grouping will have l_lnno = 0 and in place of physical address will be the
+   symbol table index of the function name.  */
+struct external_lineno
+{
+  union
+  {
+    char l_symndx[4];	/* function name symbol index, iff l_lnno == 0*/
+    char l_paddr[4];	/* (physical) address of line number	*/
+  } l_addr;
+
+  char l_lnno[L_LNNO_SIZE];	/* line number		*/
+};
+
+#define	LINENO	struct external_lineno
+#define	LINESZ	(4 + L_LNNO_SIZE)
+
+#if L_LNNO_SIZE == 4
+#define GET_LINENO_LNNO(abfd, ext)      H_GET_32 (abfd,      (ext->l_lnno))
+#define PUT_LINENO_LNNO(abfd, val, ext) H_PUT_32 (abfd, val, (ext->l_lnno))
+#endif
+#if L_LNNO_SIZE == 2
+#define GET_LINENO_LNNO(abfd, ext)      H_GET_16 (abfd,      (ext->l_lnno))
+#define PUT_LINENO_LNNO(abfd, val, ext) H_PUT_16 (abfd, val, (ext->l_lnno))
+#endif
+
+#endif /* not DO_NOT_DEFINE_LINENO */
+
+#ifndef DO_NOT_DEFINE_SYMENT
+/********************** SYMBOLS **********************/
+
+#define E_SYMNMLEN	8	/* # characters in a symbol name	*/
+#ifndef E_FILNMLEN
+#define E_FILNMLEN	14
+#endif
+#define E_DIMNUM	4	/* # array dimensions in auxiliary entry */
+
+struct external_syment 
+{
+  union
+  {
+    char e_name[E_SYMNMLEN];
+
+    struct
+    {
+      char e_zeroes[4];
+      char e_offset[4];
+    } e;
+  } e;
+
+  char e_value[4];
+  char e_scnum[2];
+  char e_type[2];
+  char e_sclass[1];
+  char e_numaux[1];
+} ATTRIBUTE_PACKED ;
+
+#define	SYMENT	struct external_syment
+#define	SYMESZ	18	
+
+#ifndef N_BTMASK
+#define N_BTMASK	0xf
+#endif
+
+#ifndef N_TMASK
+#define N_TMASK		0x30
+#endif
+
+#ifndef N_BTSHFT
+#define N_BTSHFT	4
+#endif
+
+#ifndef N_TSHIFT
+#define N_TSHIFT	2
+#endif
+
+#endif /* not DO_NOT_DEFINE_SYMENT */
+
+#ifndef DO_NOT_DEFINE_AUXENT
+
+union external_auxent
+{
+  struct
+  {
+    char x_tagndx[4];		/* str, un, or enum tag indx */
+    
+    union
+    {
+      struct
+      {
+	char  x_lnno[2]; /* declaration line number */
+	char  x_size[2]; /* str/union/array size */
+      } x_lnsz;
+      
+      char x_fsize[4];	/* size of function */
+      
+    } x_misc;
+    
+    union
+    {
+      struct 		/* if ISFCN, tag, or .bb */
+      {
+	char x_lnnoptr[4];	/* ptr to fcn line # */
+	char x_endndx[4];	/* entry ndx past block end */
+      } x_fcn;
+      
+      struct 		/* if ISARY, up to 4 dimen. */
+      {
+	char x_dimen[E_DIMNUM][2];
+      } x_ary;
+      
+    } x_fcnary;
+    
+    char x_tvndx[2];	/* tv index */
+    
+  } x_sym;
+  
+  union
+  {
+    char x_fname[E_FILNMLEN];
+    
+    struct
+    {
+      char x_zeroes[4];
+      char x_offset[4];
+    } x_n;
+    
+  } x_file;
+  
+  struct
+  {
+    char x_scnlen[4];	/* section length */
+    char x_nreloc[2];	/* # relocation entries */
+    char x_nlinno[2];	/* # line numbers */
+#ifdef INCLUDE_COMDAT_FIELDS_IN_AUXENT
+    char x_checksum[4];		   /* section COMDAT checksum	      */
+    char x_associated[2];	   /* COMDAT associated section index */
+    char x_comdat[1];		   /* COMDAT selection number	      */
+#endif    
+  } x_scn;
+  
+  struct
+  {
+    char x_tvfill[4];	/* tv fill value */
+    char x_tvlen[2];	/* length of .tv */
+    char x_tvran[2][2];	/* tv range */
+  } x_tv;		/* info about .tv section (in auxent of symbol .tv)) */
+} ATTRIBUTE_PACKED ;
+
+#define	AUXENT	union external_auxent
+#define	AUXESZ	18
+
+#define _ETEXT	"etext"
+
+#endif /* not DO_NOT_DEFINE_AUXENT */
+
+#endif /* COFF_EXTERNAL_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/go32exe.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/go32exe.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/go32exe.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/go32exe.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,36 @@
+/* COFF information for PC running go32.
+
+   Copyright 2001, 2005, 2009, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+struct external_filehdr_go32_exe
+  {
+    char stub[GO32_STUBSIZE]; /* the stub to load the image */
+			/* the standard COFF header     */
+    char f_magic[2];	/* magic number			*/
+    char f_nscns[2];	/* number of sections		*/
+    char f_timdat[4];	/* time & date stamp		*/
+    char f_symptr[4];	/* file pointer to symtab	*/
+    char f_nsyms[4];	/* number of symtab entries	*/
+    char f_opthdr[2];	/* sizeof(optional hdr)		*/
+    char f_flags[2];	/* flags			*/
+  };
+
+#undef FILHDR
+#define	FILHDR	struct external_filehdr_go32_exe
+#undef FILHSZ
+#define	FILHSZ	GO32_STUBSIZE+20
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/h8300.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/h8300.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/h8300.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/h8300.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,55 @@
+/* coff information for Renesas H8/300 and H8/300-H
+
+   Copyright 2001, 2003, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define L_LNNO_SIZE 4
+#include "coff/external.h"
+
+#define	H8300MAGIC	0x8300
+#define	H8300HMAGIC	0x8301
+#define	H8300SMAGIC	0x8302
+#define	H8300HNMAGIC	0x8303
+#define	H8300SNMAGIC	0x8304
+
+#define H8300BADMAG(x)   (((x).f_magic != H8300MAGIC))
+#define H8300HBADMAG(x)  (((x).f_magic != H8300HMAGIC))
+#define H8300SBADMAG(x)  (((x).f_magic != H8300SMAGIC))
+#define H8300HNBADMAG(x) (((x).f_magic != H8300HNMAGIC))
+#define H8300SNBADMAG(x) (((x).f_magic != H8300SNMAGIC))
+
+/* Relocation directives.  */
+
+/* The external reloc has an offset field, because some of the reloc
+   types on the h8 don't have room in the instruction for the entire
+   offset - eg the strange jump and high page addressing modes.  */
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_offset[4];
+  char r_type[2];
+  char r_stuff[2];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 16
+
+
+
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/h8500.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/h8500.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/h8500.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/h8500.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,47 @@
+/* coff information for Renesas H8/500
+   
+   Copyright 2001, 2003, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define L_LNNO_SIZE 4
+#include "coff/external.h"
+
+#define	H8500MAGIC	0x8500
+
+#define H8500BADMAG(x) ((0xffff && ((x).f_magic) != H8500MAGIC))
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+/* The external reloc has an offset field, because some of the reloc
+   types on the h8 don't have room in the instruction for the entire
+   offset - eg the strange jump and high page addressing modes.  */
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_offset[4];
+  char r_type[2];
+  char r_stuff[2];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 16
+
+
+
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/i386.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/i386.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/i386.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/i386.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,74 @@
+/* coff information for Intel 386/486.
+   
+   Copyright 2001, 2009, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define L_LNNO_SIZE 2
+#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
+#include "coff/external.h"
+
+#define COFF_PAGE_SIZE	0x1000
+
+/* Bits for f_flags:
+ 	F_RELFLG	Relocation info stripped from file
+ 	F_EXEC		File is executable (no unresolved external references)
+ 	F_LNNO		Line numbers stripped from file
+ 	F_LSYMS		Local symbols stripped from file
+ 	F_AR32WR	File has byte ordering of an AR32WR machine (e.g. vax).  */
+
+#define F_RELFLG	(0x0001)
+#define F_EXEC		(0x0002)
+#define F_LNNO		(0x0004)
+#define F_LSYMS		(0x0008)
+
+#define	I386MAGIC	0x14c
+#define I386PTXMAGIC	0x154
+#define I386AIXMAGIC	0x175
+
+/* This is Lynx's all-platform magic number for executables.  */
+
+#define LYNXCOFFMAGIC	0415
+
+#define I386BADMAG(x) (  ((x).f_magic != I386MAGIC) \
+		       && (x).f_magic != I386AIXMAGIC \
+		       && (x).f_magic != I386PTXMAGIC \
+		       && (x).f_magic != LYNXCOFFMAGIC)
+
+#define OMAGIC          0404    /* Object files, eg as output.  */
+#define ZMAGIC          0413    /* Demand load format, eg normal ld output.  */
+#define STMAGIC		0401	/* Target shlib.  */
+#define SHMAGIC		0443	/* Host shlib.  */
+
+/* Define some NT default values.  */
+/*  #define NT_IMAGE_BASE        0x400000 moved to internal.h */
+#define NT_SECTION_ALIGNMENT 0x1000
+#define NT_FILE_ALIGNMENT    0x200
+#define NT_DEF_RESERVE       0x100000
+#define NT_DEF_COMMIT        0x1000
+
+/* Relocation directives.  */
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_type[2];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 10
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/i860.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/i860.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/i860.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/i860.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,87 @@
+/* COFF information for the Intel i860.
+   
+   Copyright 2001, 2003, 2010, 2011 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file was hacked from i386.h   [dolan@ssd.intel.com] */
+
+#define L_LNNO_SIZE 2
+#include "coff/external.h"
+
+/* Bits for f_flags:
+ 	F_RELFLG	relocation info stripped from file
+ 	F_EXEC		file is executable (no unresolved external references)
+ 	F_LNNO		line numbers stripped from file
+ 	F_LSYMS		local symbols stripped from file
+ 	F_AR32WR	file has byte ordering of an AR32WR machine (e.g. vax).  */
+
+#define F_RELFLG	(0x0001)
+#define F_EXEC		(0x0002)
+#define F_LNNO		(0x0004)
+#define F_LSYMS		(0x0008)
+
+#define	I860MAGIC	0x14d
+
+#define I860BADMAG(x)   ((x).f_magic != I860MAGIC)
+
+#undef AOUTSZ
+#define AOUTSZ 36
+
+/* FIXME: What are the a.out magic numbers?  */
+
+#define _ETEXT	"etext"
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_type[2];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 10
+
+/* The relocation directory entry types.
+     PAIR   : The low half that follows relates to the preceding HIGH[ADJ].
+     HIGH   : The high half of a 32-bit constant.
+     LOWn   : The low half, insn bits 15..(n-1), 2^n-byte aligned. 
+     SPLITn : The low half, insn bits 20..16 and 10..(n-1), 2^n-byte aligned. 
+     HIGHADJ: Similar to HIGH, but with adjustment.
+     BRADDR : 26-bit branch displacement.
+
+   Note: The Intel assembler manual lists LOW4 as one of the
+   relocation types, but it appears to be useless for the i860.
+   We will recognize it anyway, just in case it actually appears in
+   any object files.  */
+
+enum {
+  COFF860_R_PAIR	= 0x1c,
+  COFF860_R_HIGH	= 0x1e,
+  COFF860_R_LOW0	= 0x1f,
+  COFF860_R_LOW1	= 0x20,
+  COFF860_R_LOW2	= 0x21,
+  COFF860_R_LOW3	= 0x22,
+  COFF860_R_LOW4	= 0x23,
+  COFF860_R_SPLIT0	= 0x24,
+  COFF860_R_SPLIT1	= 0x25,
+  COFF860_R_SPLIT2	= 0x26,
+  COFF860_R_HIGHADJ	= 0x27,
+  COFF860_R_BRADDR	= 0x28
+};
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/i960.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/i960.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/i960.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/i960.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,320 @@
+/* coff information for 80960.  Origins: Intel corp, natch.
+   
+   Copyright 2001, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* NOTE: Tagentries (cf TAGBITS) are no longer used by the 960 */
+
+/********************** FILE HEADER **********************/
+
+struct external_filehdr
+{
+  char f_magic[2];	/* magic number			*/
+  char f_nscns[2];	/* number of sections		*/
+  char f_timdat[4];	/* time & date stamp		*/
+  char f_symptr[4];	/* file pointer to symtab	*/
+  char f_nsyms[4];	/* number of symtab entries	*/
+  char f_opthdr[2];	/* sizeof(optional hdr)		*/
+  char f_flags[2];	/* flags			*/
+};
+
+#define OMAGIC      (0407)	/* old impure format. data immediately
+                                   follows text. both sections are rw. */
+#define NMAGIC      (0410)	/* split i&d, read-only text */
+
+/*
+*	Intel 80960 (I960) processor flags.
+*	F_I960TYPE == mask for processor type field. 
+*/
+
+#define	F_I960TYPE	(0xf000)
+#define	F_I960CORE	(0x1000)
+#define	F_I960KB	(0x2000)
+#define	F_I960SB	(0x2000)
+#define	F_I960MC	(0x3000)
+#define	F_I960XA	(0x4000)
+#define	F_I960CA	(0x5000)
+#define	F_I960KA	(0x6000)
+#define	F_I960SA	(0x6000)
+#define F_I960JX	(0x7000)
+#define F_I960HX	(0x8000)
+
+
+/** i80960 Magic Numbers
+*/
+
+#define I960ROMAGIC	(0x160)	/* read-only text segments */
+#define I960RWMAGIC	(0x161)	/* read-write text segments */
+
+#define I960BADMAG(x) (((x).f_magic!=I960ROMAGIC) && ((x).f_magic!=I960RWMAGIC))
+
+#define	FILHDR	struct external_filehdr
+#define	FILHSZ	20
+
+/********************** AOUT "OPTIONAL HEADER" **********************/
+
+typedef struct
+{
+  unsigned long	phys_addr;
+  unsigned long	bitarray;
+} TAGBITS;
+
+typedef struct 
+{
+  char 	magic[2];		/* type of file				*/
+  char	vstamp[2];		/* version stamp			*/
+  char	tsize[4];		/* text size in bytes, padded to FW bdry*/
+  char	dsize[4];		/* initialized data "  "		*/
+  char	bsize[4];		/* uninitialized data "   "		*/
+  char	entry[4];		/* entry pt.				*/
+  char 	text_start[4];		/* base of text used for this file */
+  char 	data_start[4];		/* base of data used for this file */
+  char	tagentries[4];		/* number of tag entries to follow */
+}
+AOUTHDR;
+
+/* return a pointer to the tag bits array */
+
+#define TAGPTR(aout) ((TAGBITS *) (&(aout.tagentries)+1))
+
+/* compute size of a header */
+
+/*#define AOUTSZ(aout) (sizeof(AOUTHDR)+(aout.tagentries*sizeof(TAGBITS)))*/
+#define AOUTSZ 32
+#define AOUTHDRSZ 32
+
+
+/********************** SECTION HEADER **********************/
+
+struct external_scnhdr
+{
+  char		s_name[8];	/* section name			*/
+  char		s_paddr[4];	/* physical address, aliased s_nlib */
+  char		s_vaddr[4];	/* virtual address		*/
+  char		s_size[4];	/* section size			*/
+  char		s_scnptr[4];	/* file ptr to raw data for section */
+  char		s_relptr[4];	/* file ptr to relocation	*/
+  char		s_lnnoptr[4];	/* file ptr to line numbers	*/
+  char		s_nreloc[2];	/* number of relocation entries	*/
+  char		s_nlnno[2];	/* number of line number entries*/
+  char		s_flags[4];	/* flags			*/
+  char 		s_align[4];	/* section alignment		*/
+};
+
+
+#define	SCNHDR	struct external_scnhdr
+#define	SCNHSZ	44
+
+/*
+ * names of "special" sections
+ */
+#define _TEXT   ".text"
+#define _DATA   ".data"
+#define _BSS    ".bss"
+
+/********************** LINE NUMBERS **********************/
+
+/* 1 line number entry for every "breakpointable" source line in a section.
+ * Line numbers are grouped on a per function basis; first entry in a function
+ * grouping will have l_lnno = 0 and in place of physical address will be the
+ * symbol table index of the function name.
+ */
+struct external_lineno
+{
+  union
+  {
+    char l_symndx[4];	/* function name symbol index, iff l_lnno == 0*/
+    char l_paddr[4];	/* (physical) address of line number	*/
+  } l_addr;
+
+  char l_lnno[2];		/* line number		*/
+  char padding[2];	/* force alignment	*/
+};
+
+
+#define	LINENO	struct external_lineno
+#define	LINESZ	8
+
+/********************** SYMBOLS **********************/
+
+#define E_SYMNMLEN	8	/* # characters in a symbol name	*/
+#define E_FILNMLEN	14	/* # characters in a file name		*/
+#define E_DIMNUM	4	/* # array dimensions in auxiliary entry */
+
+struct external_syment 
+{
+  union
+  {
+    char e_name[E_SYMNMLEN];
+
+    struct
+    {
+      char e_zeroes[4];
+      char e_offset[4];
+    } e;
+  } e;
+
+  char e_value[4];
+  char e_scnum[2];
+  char e_flags[2];
+  char e_type[4];
+  char e_sclass[1];
+  char e_numaux[1];
+  char pad2[2];
+};
+
+#define N_BTMASK	(0x1f)
+#define N_TMASK		(0x60)
+#define N_BTSHFT	(5)
+#define N_TSHIFT	(2)
+  
+union external_auxent
+{
+  struct
+  {
+    char x_tagndx[4];	/* str, un, or enum tag indx */
+
+    union
+    {
+      struct
+      {
+	char  x_lnno[2]; /* declaration line number */
+	char  x_size[2]; /* str/union/array size */
+      } x_lnsz;
+
+      char x_fsize[4];	/* size of function */
+
+    } x_misc;
+
+    union
+    {
+      struct 		/* if ISFCN, tag, or .bb */
+      {
+	char x_lnnoptr[4];	/* ptr to fcn line # */
+	char x_endndx[4];	/* entry ndx past block end */
+      } x_fcn;
+
+      struct 		/* if ISARY, up to 4 dimen. */
+      {
+	char x_dimen[E_DIMNUM][2];
+      } x_ary;
+
+    } x_fcnary;
+
+    char x_tvndx[2];		/* tv index */
+
+  } x_sym;
+
+  union
+  {
+    char x_fname[E_FILNMLEN];
+
+    struct
+    {
+      char x_zeroes[4];
+      char x_offset[4];
+    } x_n;
+
+  } x_file;
+
+  struct
+  {
+    char x_scnlen[4];			/* section length */
+    char x_nreloc[2];	/* # relocation entries */
+    char x_nlinno[2];	/* # line numbers */
+
+  } x_scn;
+
+  struct
+  {
+    char x_tvfill[4];	/* tv fill value */
+    char x_tvlen[2];	/* length of .tv */
+    char x_tvran[2][2];	/* tv range */
+
+  } x_tv;		/* info about .tv section (in auxent of symbol .tv)) */
+
+  /******************************************
+   *  I960-specific *2nd* aux. entry formats
+   ******************************************/
+  struct
+  {
+    /* This is a very old typo that keeps getting propagated. */
+#define x_stdindx x_stindx
+    char x_stindx[4];	/* sys. table entry */
+  } x_sc;	/* system call entry */
+
+  struct
+  {
+    char x_balntry[4]; /* BAL entry point */
+  } x_bal; /* BAL-callable function */
+
+  struct
+  {
+    char x_timestamp[4];	        /* time stamp */
+    char 	x_idstring[20];	        /* producer identity string */
+
+  } x_ident;	                        /* Producer ident info */
+};
+
+#define	SYMENT	struct external_syment
+#define	SYMESZ	24
+#define	AUXENT	union external_auxent
+#define	AUXESZ	24
+
+#	define _ETEXT	"_etext"
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_type[2];
+  char pad[2];
+};
+
+/* r_type values for the i960.  */
+
+/* The i960 uses R_RELLONG, which is defined in internal.h as 0x11.
+   It is an absolute 32 bit relocation.  */
+
+#define R_IPRMED 	(0x19)	/* 24-bit ip-relative relocation */
+#define R_OPTCALL	(0x1b)	/* 32-bit optimizable call (leafproc/sysproc) */
+#define R_OPTCALLX	(0x1c)	/* 64-bit optimizable call (leafproc/sysproc) */
+
+/* The following relocation types are defined use by relaxing linkers,
+   which convert 32 bit calls (which require a 64 bit instruction)
+   into 24 bit calls (which require a 32 bit instruction) when
+   possible.  It will be possible whenever the target of the call is
+   within a 24 bit range of the call instruction.
+
+   It is always safe to ignore these relocations.  They only serve to
+   mark points which the relaxing linker will have to consider.  The
+   assembler must ensure that the correct code is generated even if
+   the relocations are ignored.  In particular, this means that the
+   R_IPR13 relocation may not appear with an external symbol.  */
+
+#define R_IPR13		(0x1d)	/* 13 bit ip-relative branch */
+#define R_ALIGN		(0x1e)  /* alignment marker.  This has no
+				   associated symbol.  Instead, the
+				   r_symndx field indicates the
+				   require alignment at this point in
+				   the file.  It must be a power of 2.  */
+
+#define RELOC struct external_reloc
+#define RELSZ 12
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/ia64.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/ia64.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/ia64.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/ia64.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,89 @@
+/* coff information for HP/Intel IA-64.
+   
+   Copyright 2000, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define DO_NOT_DEFINE_AOUTHDR
+#define L_LNNO_SIZE 2
+#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
+#include "coff/external.h"
+
+#define IA64MAGIC	0x200
+
+#define IA64BADMAG(x)	(((x).f_magic != IA64MAGIC))
+
+/* Bits for f_flags:
+ *	F_RELFLG	relocation info stripped from file
+ *	F_EXEC		file is executable (no unresolved external references)
+ *	F_LNNO		line numbers stripped from file
+ *	F_LSYMS		local symbols stripped from file
+ *	F_AR32WR	file has byte ordering of an AR32WR machine (e.g. vax)
+ */
+
+#define F_RELFLG	(0x0001)
+#define F_EXEC		(0x0002)
+#define F_LNNO		(0x0004)
+#define F_LSYMS		(0x0008)
+
+/********************** AOUT "OPTIONAL HEADER" **********************/
+typedef struct 
+{
+  char 	magic[2];		/* type of file				*/
+  char	vstamp[2];		/* version stamp			*/
+  char	tsize[4];		/* text size in bytes, padded to FW bdry*/
+  char	dsize[4];		/* initialized data "  "		*/
+  char	bsize[4];		/* uninitialized data "   "		*/
+  char	entry[4];		/* entry pt.				*/
+  char 	text_start[4];		/* base of text used for this file	*/
+#ifndef BFD64
+  char 	data_start[4];		/* base of data used for this file	*/
+#endif
+}
+AOUTHDR;
+
+#define PE32MAGIC	0x10b	/* 32-bit image */
+#define PE32PMAGIC	0x20b	/* 32-bit image inside 64-bit address space */
+
+#define PE32PBADMAG(x) (((x).f_magic != PE32PMAGIC))
+
+#define AOUTSZ		108
+#define AOUTHDRSZ	108
+
+#define OMAGIC          0404    /* object files, eg as output */
+#define ZMAGIC          0413    /* demand load format, eg normal ld output */
+#define STMAGIC		0401	/* target shlib */
+#define SHMAGIC		0443	/* host   shlib */
+
+/* define some NT default values */
+/*  #define NT_IMAGE_BASE        0x400000 moved to internal.h */
+#define NT_SECTION_ALIGNMENT 0x1000
+#define NT_FILE_ALIGNMENT    0x200
+#define NT_DEF_RESERVE       0x100000
+#define NT_DEF_COMMIT        0x1000
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_type[2];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 10
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/internal.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/internal.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/internal.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/internal.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,828 @@
+/* Internal format of COFF object file data structures, for GNU BFD.
+   This file is part of BFD, the Binary File Descriptor library.
+   
+   Copyright 1999, 2000, 2001, 2002, 2003, 2004. 2005, 2006, 2007, 2009,
+   2010  Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef GNU_COFF_INTERNAL_H
+#define GNU_COFF_INTERNAL_H 1
+
+/* First, make "signed char" work, even on old compilers. */
+#ifndef signed
+#ifndef __STDC__
+#define	signed			/**/
+#endif
+#endif
+
+/********************** FILE HEADER **********************/
+
+/* extra stuff in a PE header. */
+
+struct internal_extra_pe_filehdr
+{
+  /* DOS header data follows for PE stuff */
+  unsigned short e_magic;	/* Magic number, 0x5a4d */
+  unsigned short e_cblp;	/* Bytes on last page of file, 0x90 */
+  unsigned short e_cp;		/* Pages in file, 0x3 */
+  unsigned short e_crlc;	/* Relocations, 0x0 */
+  unsigned short e_cparhdr;	/* Size of header in paragraphs, 0x4 */
+  unsigned short e_minalloc;	/* Minimum extra paragraphs needed, 0x0 */
+  unsigned short e_maxalloc;	/* Maximum extra paragraphs needed, 0xFFFF */
+  unsigned short e_ss;		/* Initial (relative) SS value, 0x0 */
+  unsigned short e_sp;		/* Initial SP value, 0xb8 */
+  unsigned short e_csum;	/* Checksum, 0x0 */
+  unsigned short e_ip;		/* Initial IP value, 0x0 */
+  unsigned short e_cs;		/* Initial (relative) CS value, 0x0 */
+  unsigned short e_lfarlc;	/* File address of relocation table, 0x40 */
+  unsigned short e_ovno;	/* Overlay number, 0x0 */
+  unsigned short e_res[4];	/* Reserved words, all 0x0 */
+  unsigned short e_oemid;	/* OEM identifier (for e_oeminfo), 0x0 */
+  unsigned short e_oeminfo;	/* OEM information; e_oemid specific, 0x0 */
+  unsigned short e_res2[10];	/* Reserved words, all 0x0 */
+  bfd_vma  e_lfanew;		/* File address of new exe header, 0x80 */
+  unsigned long dos_message[16]; /* text which always follows dos header */
+  bfd_vma  nt_signature;   	/* required NT signature, 0x4550 */ 
+};
+
+#define GO32_STUBSIZE 2048
+
+struct internal_filehdr
+{
+  struct internal_extra_pe_filehdr pe;
+
+  /* coff-stgo32 EXE stub header before BFD tdata has been allocated.
+     Its data is kept in INTERNAL_FILEHDR.GO32STUB afterwards.
+     
+     F_GO32STUB is set iff go32stub contains a valid data.  Artifical headers
+     created in BFD have no pre-set go32stub.  */
+  char go32stub[GO32_STUBSIZE];
+
+  /* Standard coff internal info.  */
+  unsigned short f_magic;	/* magic number			*/
+  unsigned short f_nscns;	/* number of sections		*/
+  long f_timdat;		/* time & date stamp		*/
+  bfd_vma f_symptr;		/* file pointer to symtab	*/
+  long f_nsyms;			/* number of symtab entries	*/
+  unsigned short f_opthdr;	/* sizeof(optional hdr)		*/
+  unsigned short f_flags;	/* flags			*/
+  unsigned short f_target_id;	/* (TI COFF specific)		*/
+};
+
+
+/* Bits for f_flags:
+ 	F_RELFLG	relocation info stripped from file
+ 	F_EXEC		file is executable (no unresolved external references)
+ 	F_LNNO		line numbers stripped from file
+ 	F_LSYMS		local symbols stripped from file
+ 	F_AR16WR	file is 16-bit little-endian
+ 	F_AR32WR	file is 32-bit little-endian
+ 	F_AR32W		file is 32-bit big-endian
+ 	F_DYNLOAD	rs/6000 aix: dynamically loadable w/imports & exports
+ 	F_SHROBJ	rs/6000 aix: file is a shared object
+	F_DLL           PE format DLL
+	F_GO32STUB      Field go32stub contains valid data.  */
+
+#define	F_RELFLG	(0x0001)
+#define	F_EXEC		(0x0002)
+#define	F_LNNO		(0x0004)
+#define	F_LSYMS		(0x0008)
+#define	F_AR16WR	(0x0080)
+#define	F_AR32WR	(0x0100)
+#define	F_AR32W     	(0x0200)
+#define	F_DYNLOAD	(0x1000)
+#define	F_SHROBJ	(0x2000)
+#define F_DLL           (0x2000)
+#define F_GO32STUB      (0x4000)
+
+/* Extra structure which is used in the optional header.  */
+typedef struct _IMAGE_DATA_DIRECTORY 
+{
+  bfd_vma VirtualAddress;
+  long    Size;
+}  IMAGE_DATA_DIRECTORY;
+#define PE_EXPORT_TABLE			0
+#define PE_IMPORT_TABLE			1
+#define PE_RESOURCE_TABLE		2
+#define PE_EXCEPTION_TABLE		3
+#define PE_CERTIFICATE_TABLE		4
+#define PE_BASE_RELOCATION_TABLE	5
+#define PE_DEBUG_DATA			6
+#define PE_ARCHITECTURE			7
+#define PE_GLOBAL_PTR			8
+#define PE_TLS_TABLE			9
+#define PE_LOAD_CONFIG_TABLE		10
+#define PE_BOUND_IMPORT_TABLE		11
+#define PE_IMPORT_ADDRESS_TABLE		12
+#define PE_DELAY_IMPORT_DESCRIPTOR	13
+#define PE_CLR_RUNTIME_HEADER		14
+/* DataDirectory[15] is currently reserved, so no define. */
+#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES  16
+
+/* Default image base for NT.  */
+#define NT_EXE_IMAGE_BASE 0x400000
+#define NT_DLL_IMAGE_BASE 0x10000000
+
+/* Default image base for BeOS. */
+#define BEOS_EXE_IMAGE_BASE 0x80000000
+#define BEOS_DLL_IMAGE_BASE 0x10000000
+
+/* Extra stuff in a PE aouthdr */
+
+#define PE_DEF_SECTION_ALIGNMENT 0x1000
+#ifndef PE_DEF_FILE_ALIGNMENT
+# define PE_DEF_FILE_ALIGNMENT 0x200
+#endif
+
+struct internal_extra_pe_aouthdr 
+{
+  /* FIXME: The following entries are in AOUTHDR.  But they aren't
+     available internally in bfd.  We add them here so that objdump
+     can dump them.  */
+  /* The state of the image file  */
+  short Magic;
+  /* Linker major version number */
+  char MajorLinkerVersion;
+  /* Linker minor version number  */
+  char MinorLinkerVersion;	
+  /* Total size of all code sections  */
+  long SizeOfCode;
+  /* Total size of all initialized data sections  */
+  long SizeOfInitializedData;
+  /* Total size of all uninitialized data sections  */
+  long SizeOfUninitializedData;
+  /* Address of entry point relative to image base.  */
+  bfd_vma AddressOfEntryPoint;
+  /* Address of the first code section relative to image base.  */
+  bfd_vma BaseOfCode;
+  /* Address of the first data section relative to image base.  */
+  bfd_vma BaseOfData;
+ 
+  /* PE stuff  */
+  bfd_vma ImageBase;		/* address of specific location in memory that
+				   file is located, NT default 0x10000 */
+
+  bfd_vma SectionAlignment;	/* section alignment default 0x1000 */
+  bfd_vma FileAlignment;	/* file alignment default 0x200 */
+  short   MajorOperatingSystemVersion; /* minimum version of the operating */
+  short   MinorOperatingSystemVersion; /* system req'd for exe, default to 1*/
+  short   MajorImageVersion;	/* user defineable field to store version of */
+  short   MinorImageVersion;	/* exe or dll being created, default to 0 */ 
+  short   MajorSubsystemVersion; /* minimum subsystem version required to */
+  short   MinorSubsystemVersion; /* run exe; default to 3.1 */
+  long    Reserved1;		/* seems to be 0 */
+  long    SizeOfImage;		/* size of memory to allocate for prog */
+  long    SizeOfHeaders;	/* size of PE header and section table */
+  long    CheckSum;		/* set to 0 */
+  short   Subsystem;	
+
+  /* type of subsystem exe uses for user interface,
+     possible values:
+     1 - NATIVE   Doesn't require a subsystem
+     2 - WINDOWS_GUI runs in Windows GUI subsystem
+     3 - WINDOWS_CUI runs in Windows char sub. (console app)
+     5 - OS2_CUI runs in OS/2 character subsystem
+     7 - POSIX_CUI runs in Posix character subsystem */
+  unsigned short DllCharacteristics; /* flags for DLL init  */
+  bfd_vma SizeOfStackReserve;	/* amount of memory to reserve  */
+  bfd_vma SizeOfStackCommit;	/* amount of memory initially committed for 
+				   initial thread's stack, default is 0x1000 */
+  bfd_vma SizeOfHeapReserve;	/* amount of virtual memory to reserve and */
+  bfd_vma SizeOfHeapCommit;	/* commit, don't know what to defaut it to */
+  long    LoaderFlags;		/* can probably set to 0 */
+  long    NumberOfRvaAndSizes;	/* number of entries in next entry, 16 */
+  IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
+};
+
+/********************** AOUT "OPTIONAL HEADER" **********************/
+struct internal_aouthdr
+{
+  short magic;			/* type of file				*/
+  short vstamp;			/* version stamp			*/
+  bfd_vma tsize;		/* text size in bytes, padded to FW bdry*/
+  bfd_vma dsize;		/* initialized data "  "		*/
+  bfd_vma bsize;		/* uninitialized data "   "		*/
+  bfd_vma entry;		/* entry pt.				*/
+  bfd_vma text_start;		/* base of text used for this file */
+  bfd_vma data_start;		/* base of data used for this file */
+
+  /* i960 stuff */
+  unsigned long tagentries;	/* number of tag entries to follow */
+
+  /* RS/6000 stuff */
+  bfd_vma o_toc;		/* address of TOC			*/
+  short o_snentry;		/* section number for entry point */
+  short o_sntext;		/* section number for text	*/
+  short o_sndata;		/* section number for data	*/
+  short o_sntoc;		/* section number for toc	*/
+  short o_snloader;		/* section number for loader section */
+  short o_snbss;		/* section number for bss	*/
+  short o_algntext;		/* max alignment for text	*/
+  short o_algndata;		/* max alignment for data	*/
+  short o_modtype;		/* Module type field, 1R,RE,RO	*/
+  short o_cputype;		/* Encoded CPU type		*/
+  bfd_vma o_maxstack;	/* max stack size allowed.	*/
+  bfd_vma o_maxdata;	/* max data size allowed.	*/
+
+  /* ECOFF stuff */
+  bfd_vma bss_start;		/* Base of bss section.		*/
+  bfd_vma gp_value;		/* GP register value.		*/
+  unsigned long gprmask;	/* General registers used.	*/
+  unsigned long cprmask[4];	/* Coprocessor registers used.	*/
+  unsigned long fprmask;	/* Floating pointer registers used.  */
+
+  /* Apollo stuff */
+  long o_inlib;			/* inlib data */
+  long o_sri;			/* Static Resource Information */
+  long vid[2];			/* Version id */
+
+  struct internal_extra_pe_aouthdr pe;
+};
+
+/********************** STORAGE CLASSES **********************/
+
+/* This used to be defined as -1, but now n_sclass is unsigned.  */
+#define C_EFCN		0xff	/* physical end of function	*/
+#define C_NULL		0
+#define C_AUTO		1	/* automatic variable		*/
+#define C_EXT		2	/* external symbol		*/
+#define C_STAT		3	/* static			*/
+#define C_REG		4	/* register variable		*/
+#define C_EXTDEF	5	/* external definition		*/
+#define C_LABEL		6	/* label			*/
+#define C_ULABEL	7	/* undefined label		*/
+#define C_MOS		8	/* member of structure		*/
+#define C_ARG		9	/* function argument		*/
+#define C_STRTAG	10	/* structure tag		*/
+#define C_MOU		11	/* member of union		*/
+#define C_UNTAG		12	/* union tag			*/
+#define C_TPDEF		13	/* type definition		*/
+#define C_USTATIC	14	/* undefined static		*/
+#define C_ENTAG		15	/* enumeration tag		*/
+#define C_MOE		16	/* member of enumeration	*/
+#define C_REGPARM	17	/* register parameter		*/
+#define C_FIELD		18	/* bit field			*/
+#define C_AUTOARG	19	/* auto argument		*/
+#define C_LASTENT	20	/* dummy entry (end of block)	*/
+#define C_BLOCK		100	/* ".bb" or ".eb"		*/
+#define C_FCN		101	/* ".bf" or ".ef"		*/
+#define C_EOS		102	/* end of structure		*/
+#define C_FILE		103	/* file name			*/
+#define C_LINE		104	/* line # reformatted as symbol table entry */
+#define C_ALIAS	 	105	/* duplicate tag		*/
+#define C_HIDDEN	106	/* ext symbol in dmert public lib */
+#define C_WEAKEXT	127	/* weak symbol -- GNU extension.  */
+
+/* New storage classes for TI COFF */
+#define C_UEXT		19	/* Tentative external definition */
+#define C_STATLAB	20	/* Static load time label */
+#define C_EXTLAB	21	/* External load time label */
+#define C_SYSTEM	23	/* System Wide variable */
+
+/* New storage classes for WINDOWS_NT   */
+#define C_SECTION       104     /* section name */
+#define C_NT_WEAK	105	/* weak external */
+
+ /* New storage classes for 80960 */
+
+/* C_LEAFPROC is obsolete.  Use C_LEAFEXT or C_LEAFSTAT */
+#define C_LEAFPROC	108	/* Leaf procedure, "call" via BAL */
+
+#define C_SCALL		107	/* Procedure reachable via system call */
+#define C_LEAFEXT       108	/* External leaf */
+#define C_LEAFSTAT      113	/* Static leaf */
+#define C_OPTVAR	109	/* Optimized variable		*/
+#define C_DEFINE	110	/* Preprocessor #define		*/
+#define C_PRAGMA	111	/* Advice to compiler or linker	*/
+#define C_SEGMENT	112	/* 80960 segment name		*/
+
+  /* Storage classes for m88k */
+#define C_SHADOW        107     /* shadow symbol                */
+#define C_VERSION       108     /* coff version symbol          */
+
+ /* New storage classes for RS/6000 */
+#define C_HIDEXT        107	/* Un-named external symbol */
+#define C_BINCL         108	/* Marks beginning of include file */
+#define C_EINCL         109	/* Marks ending of include file */
+#define C_AIX_WEAKEXT   111	/* AIX definition of C_WEAKEXT.  */
+
+#define C_NULL_VALUE	0x00de1e00    /* Value for a C_NULL deleted entry.  */
+
+#if defined _AIX52 || defined AIX_WEAK_SUPPORT
+#undef C_WEAKEXT
+#define C_WEAKEXT       C_AIX_WEAKEXT
+#endif
+
+ /* storage classes for stab symbols for RS/6000 */
+#define C_GSYM          (0x80)
+#define C_LSYM          (0x81)
+#define C_PSYM          (0x82)
+#define C_RSYM          (0x83)
+#define C_RPSYM         (0x84)
+#define C_STSYM         (0x85)
+#define C_TCSYM         (0x86)
+#define C_BCOMM         (0x87)
+#define C_ECOML         (0x88)
+#define C_ECOMM         (0x89)
+#define C_DECL          (0x8c)
+#define C_ENTRY         (0x8d)
+#define C_FUN           (0x8e)
+#define C_BSTAT         (0x8f)
+#define C_ESTAT         (0x90)
+
+/* Storage classes for Thumb symbols */
+#define C_THUMBEXT      (128 + C_EXT)		/* 130 */
+#define C_THUMBSTAT     (128 + C_STAT)		/* 131 */
+#define C_THUMBLABEL    (128 + C_LABEL)		/* 134 */
+#define C_THUMBEXTFUNC  (C_THUMBEXT  + 20)	/* 150 */
+#define C_THUMBSTATFUNC (C_THUMBSTAT + 20)	/* 151 */
+
+/* True if XCOFF symbols of class CLASS have auxillary csect information.  */
+#define CSECT_SYM_P(CLASS) \
+  ((CLASS) == C_EXT || (CLASS) == C_AIX_WEAKEXT || (CLASS) == C_HIDEXT)
+
+/********************** SECTION HEADER **********************/
+
+#define SCNNMLEN (8)
+
+struct internal_scnhdr
+{
+  char s_name[SCNNMLEN];	/* section name			*/
+
+  /* Physical address, aliased s_nlib.
+     In the pei format, this field is the virtual section size
+     (the size of the section after being loaded int memory),
+     NOT the physical address.  */
+  bfd_vma s_paddr;
+
+  bfd_vma s_vaddr;		/* virtual address		*/
+  bfd_vma s_size;		/* section size			*/
+  bfd_vma s_scnptr;		/* file ptr to raw data for section */
+  bfd_vma s_relptr;		/* file ptr to relocation	*/
+  bfd_vma s_lnnoptr;		/* file ptr to line numbers	*/
+  unsigned long s_nreloc;	/* number of relocation entries	*/
+  unsigned long s_nlnno;	/* number of line number entries*/
+  long s_flags;			/* flags			*/
+  long s_align;			/* used on I960			*/
+  unsigned char s_page;         /* TI COFF load page            */
+};
+
+/* s_flags "type".  */
+#define STYP_REG	 (0x0000)	/* "regular": allocated, relocated, loaded */
+#define STYP_DSECT	 (0x0001)	/* "dummy":  relocated only*/
+#define STYP_NOLOAD	 (0x0002)	/* "noload": allocated, relocated, not loaded */
+#define STYP_GROUP	 (0x0004)	/* "grouped": formed of input sections */
+#define STYP_PAD	 (0x0008)	/* "padding": not allocated, not relocated, loaded */
+#define STYP_COPY	 (0x0010)	/* "copy": for decision function used by field update;  not allocated, not relocated,
+									     loaded; reloc & lineno entries processed normally */
+#define STYP_TEXT	 (0x0020)	/* section contains text only */
+#define S_SHRSEG	 (0x0020)	/* In 3b Update files (output of ogen), sections which appear in SHARED segments of the Pfile
+									     will have the S_SHRSEG flag set by ogen, to inform dufr that updating 1 copy of the proc. will
+									     update all process invocations. */
+#define STYP_DATA	 (0x0040)	/* section contains data only */
+#define STYP_BSS	 (0x0080)	/* section contains bss only */
+#define S_NEWFCN	 (0x0100)	/* In a minimal file or an update file, a new function (as compared with a replaced function) */
+#define STYP_INFO	 (0x0200)	/* comment: not allocated not relocated, not loaded */
+#define STYP_OVER	 (0x0400)	/* overlay: relocated not allocated or loaded */
+#define STYP_LIB	 (0x0800)	/* for .lib: same as INFO */
+#define STYP_MERGE	 (0x2000)	/* merge section -- combines with text, data or bss sections only */
+#define STYP_REVERSE_PAD (0x4000)	/* section will be padded with no-op instructions
+					   wherever padding is necessary and there is a
+					   word of contiguous bytes beginning on a word
+					   boundary. */
+
+#define STYP_LIT	0x8020	/* Literal data (like STYP_TEXT) */
+
+
+/********************** LINE NUMBERS **********************/
+
+/* 1 line number entry for every "breakpointable" source line in a section.
+   Line numbers are grouped on a per function basis; first entry in a function
+   grouping will have l_lnno = 0 and in place of physical address will be the
+   symbol table index of the function name.  */
+
+struct internal_lineno
+{
+  union
+  {
+    bfd_signed_vma l_symndx;		/* function name symbol index, iff l_lnno == 0*/
+    bfd_signed_vma l_paddr;		/* (physical) address of line number	*/
+  }     l_addr;
+  unsigned long l_lnno;		/* line number		*/
+};
+
+/********************** SYMBOLS **********************/
+
+#define SYMNMLEN	8	/* # characters in a symbol name	*/
+#define FILNMLEN	14	/* # characters in a file name		*/
+#define DIMNUM		4	/* # array dimensions in auxiliary entry */
+
+struct internal_syment
+{
+  union
+  {
+    char _n_name[SYMNMLEN];	/* old COFF version		*/
+    struct
+    {
+      bfd_hostptr_t _n_zeroes;	/* new == 0			*/
+      bfd_hostptr_t _n_offset;	/* offset into string table	*/
+    }      _n_n;
+    char *_n_nptr[2];		/* allows for overlaying	*/
+  }     _n;
+  bfd_vma n_value;		/* value of symbol		*/
+  short n_scnum;		/* section number		*/
+  unsigned short n_flags;	/* copy of flags from filhdr	*/
+  unsigned short n_type;	/* type and derived type	*/
+  unsigned char n_sclass;	/* storage class		*/
+  unsigned char n_numaux;	/* number of aux. entries	*/
+};
+
+#define n_name		_n._n_name
+#define n_zeroes	_n._n_n._n_zeroes
+#define n_offset	_n._n_n._n_offset
+
+/* Relocatable symbols have number of the section in which they are defined,
+   or one of the following:  */
+
+#define N_UNDEF	((short)0)	/* undefined symbol */
+#define N_ABS	((short)-1)	/* value of symbol is absolute */
+#define N_DEBUG	((short)-2)	/* debugging symbol -- value is meaningless */
+#define N_TV	((short)-3)	/* indicates symbol needs preload transfer vector */
+#define P_TV	((short)-4)	/* indicates symbol needs postload transfer vector*/
+
+/* Type of a symbol, in low N bits of the word.  */
+
+#define T_NULL		0
+#define T_VOID		1	/* function argument (only used by compiler) */
+#define T_CHAR		2	/* character		*/
+#define T_SHORT		3	/* short integer	*/
+#define T_INT		4	/* integer		*/
+#define T_LONG		5	/* long integer		*/
+#define T_FLOAT		6	/* floating point	*/
+#define T_DOUBLE	7	/* double word		*/
+#define T_STRUCT	8	/* structure 		*/
+#define T_UNION		9	/* union 		*/
+#define T_ENUM		10	/* enumeration 		*/
+#define T_MOE		11	/* member of enumeration*/
+#define T_UCHAR		12	/* unsigned character	*/
+#define T_USHORT	13	/* unsigned short	*/
+#define T_UINT		14	/* unsigned integer	*/
+#define T_ULONG		15	/* unsigned long	*/
+#define T_LNGDBL	16	/* long double		*/
+
+/* Derived types, in n_type.  */
+
+#define DT_NON		(0)	/* no derived type */
+#define DT_PTR		(1)	/* pointer */
+#define DT_FCN		(2)	/* function */
+#define DT_ARY		(3)	/* array */
+
+#define BTYPE(x)	((x) & N_BTMASK)
+#define DTYPE(x)	(((x) & N_TMASK) >> N_BTSHFT)
+
+#define ISPTR(x) \
+  (((unsigned long) (x) & N_TMASK) == ((unsigned long) DT_PTR << N_BTSHFT))
+#define ISFCN(x) \
+  (((unsigned long) (x) & N_TMASK) == ((unsigned long) DT_FCN << N_BTSHFT))
+#define ISARY(x) \
+  (((unsigned long) (x) & N_TMASK) == ((unsigned long) DT_ARY << N_BTSHFT))
+#define ISTAG(x) \
+  ((x) == C_STRTAG || (x) == C_UNTAG || (x) == C_ENTAG)
+#define DECREF(x) \
+  ((((x) >> N_TSHIFT) & ~ N_BTMASK) | ((x) & N_BTMASK))
+
+union internal_auxent
+{
+  struct
+  {
+
+    union
+    {
+      long l;			/* str, un, or enum tag indx */
+      struct coff_ptr_struct *p;
+    }     x_tagndx;
+
+    union
+    {
+      struct
+      {
+	unsigned short x_lnno;	/* declaration line number */
+	unsigned short x_size;	/* str/union/array size */
+      }      x_lnsz;
+      long x_fsize;		/* size of function */
+    }     x_misc;
+
+    union
+    {
+      struct
+      {				/* if ISFCN, tag, or .bb */
+	bfd_signed_vma x_lnnoptr;		/* ptr to fcn line # */
+	union
+	{			/* entry ndx past block end */
+	  long l;
+	  struct coff_ptr_struct *p;
+	}     x_endndx;
+      }      x_fcn;
+
+      struct
+      {				/* if ISARY, up to 4 dimen. */
+	unsigned short x_dimen[DIMNUM];
+      }      x_ary;
+    }     x_fcnary;
+
+    unsigned short x_tvndx;	/* tv index */
+  }      x_sym;
+
+  union
+  {
+    char x_fname[FILNMLEN];
+    struct
+    {
+      long x_zeroes;
+      long x_offset;
+    }      x_n;
+  }     x_file;
+
+  struct
+  {
+    long x_scnlen;		/* section length */
+    unsigned short x_nreloc;	/* # relocation entries */
+    unsigned short x_nlinno;	/* # line numbers */
+    unsigned long x_checksum;	/* section COMDAT checksum for PE */
+    unsigned short x_associated; /* COMDAT associated section index for PE */
+    unsigned char x_comdat;	/* COMDAT selection number for PE */
+  }      x_scn;
+
+  struct
+  {
+    long x_tvfill;		/* tv fill value */
+    unsigned short x_tvlen;	/* length of .tv */
+    unsigned short x_tvran[2];	/* tv range */
+  }      x_tv;			/* info about .tv section (in auxent of symbol .tv)) */
+
+  /******************************************
+   * RS/6000-specific auxent - last auxent for every external symbol
+   ******************************************/
+  struct
+  {
+    union
+      {				/* csect length or enclosing csect */
+	bfd_signed_vma l;
+	struct coff_ptr_struct *p;
+      } x_scnlen;
+    long x_parmhash;		/* parm type hash index */
+    unsigned short x_snhash;	/* sect num with parm hash */
+    unsigned char x_smtyp;	/* symbol align and type */
+    /* 0-4 - Log 2 of alignment */
+    /* 5-7 - symbol type */
+    unsigned char x_smclas;	/* storage mapping class */
+    long x_stab;		/* dbx stab info index */
+    unsigned short x_snstab;	/* sect num with dbx stab */
+  }      x_csect;		/* csect definition information */
+
+/* x_smtyp values:  */
+
+#define	SMTYP_ALIGN(x)	((x) >> 3)	/* log2 of alignment */
+#define	SMTYP_SMTYP(x)	((x) & 0x7)	/* symbol type */
+/* Symbol type values:  */
+#define	XTY_ER	0		/* External reference */
+#define	XTY_SD	1		/* Csect definition */
+#define	XTY_LD	2		/* Label definition */
+#define XTY_CM	3		/* .BSS */
+#define	XTY_EM	4		/* Error message */
+#define	XTY_US	5		/* "Reserved for internal use" */
+
+/* x_smclas values:  */
+
+#define	XMC_PR	0		/* Read-only program code */
+#define	XMC_RO	1		/* Read-only constant */
+#define	XMC_DB	2		/* Read-only debug dictionary table */
+#define	XMC_TC	3		/* Read-write general TOC entry */
+#define	XMC_UA	4		/* Read-write unclassified */
+#define	XMC_RW	5		/* Read-write data */
+#define	XMC_GL	6		/* Read-only global linkage */
+#define	XMC_XO	7		/* Read-only extended operation */
+#define	XMC_SV	8		/* Read-only supervisor call */
+#define	XMC_BS	9		/* Read-write BSS */
+#define	XMC_DS	10		/* Read-write descriptor csect */
+#define	XMC_UC	11		/* Read-write unnamed Fortran common */
+#define	XMC_TI	12		/* Read-only traceback index csect */
+#define	XMC_TB	13		/* Read-only traceback table csect */
+/* 		14	??? */
+#define	XMC_TC0	15		/* Read-write TOC anchor */
+#define XMC_TD	16		/* Read-write data in TOC */
+
+  /******************************************
+   *  I960-specific *2nd* aux. entry formats
+   ******************************************/
+  struct
+  {
+    /* This is a very old typo that keeps getting propagated. */
+#define x_stdindx x_stindx
+    long x_stindx;		/* sys. table entry */
+  }      x_sc;			/* system call entry */
+
+  struct
+  {
+    unsigned long x_balntry;	/* BAL entry point */
+  }      x_bal;			/* BAL-callable function */
+
+  struct
+  {
+    unsigned long x_timestamp;	/* time stamp */
+    char x_idstring[20];	/* producer identity string */
+  }      x_ident;		/* Producer ident info */
+
+};
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+struct internal_reloc
+{
+  bfd_vma r_vaddr;		/* Virtual address of reference */
+  long r_symndx;		/* Index into symbol table	*/
+  unsigned short r_type;	/* Relocation type		*/
+  unsigned char r_size;		/* Used by RS/6000 and ECOFF	*/
+  unsigned char r_extern;	/* Used by ECOFF		*/
+  unsigned long r_offset;	/* Used by Alpha ECOFF, SPARC, others */
+};
+
+/* X86-64 relocations.  */
+#define R_AMD64_ABS 		 0 /* Reference is absolute, no relocation is necessary.  */
+#define R_AMD64_DIR64		 1 /* 64-bit address (VA).  */
+#define R_AMD64_DIR32		 2 /* 32-bit address (VA) R_DIR32.  */
+#define R_AMD64_IMAGEBASE	 3 /* 32-bit absolute ref w/o base R_IMAGEBASE.  */
+#define R_AMD64_PCRLONG		 4 /* 32-bit relative address from byte following reloc R_PCRLONG.  */
+#define R_AMD64_PCRLONG_1	 5 /* 32-bit relative address from byte distance 1 from reloc.  */
+#define R_AMD64_PCRLONG_2	 6 /* 32-bit relative address from byte distance 2 from reloc.  */
+#define R_AMD64_PCRLONG_3	 7 /* 32-bit relative address from byte distance 3 from reloc.  */
+#define R_AMD64_PCRLONG_4	 8 /* 32-bit relative address from byte distance 4 from reloc.  */
+#define R_AMD64_PCRLONG_5	 9 /* 32-bit relative address from byte distance 5 from reloc.  */
+#define R_AMD64_SECTION		10 /* Section index.  */
+#define R_AMD64_SECREL		11 /* 32 bit offset from base of section containing target R_SECREL.  */
+#define R_AMD64_SECREL7		12 /* 7 bit unsigned offset from base of section containing target.  */
+#define R_AMD64_TOKEN		13 /* 32 bit metadata token.  */
+#define R_AMD64_PCRQUAD		14 /* Pseude PC64 relocation - Note: not specified by MS/AMD but need for gas pc-relative 64bit wide relocation generated by ELF.  */
+
+/* i386 Relocations.  */
+
+#define R_DIR16 	 1
+#define R_REL24          5
+#define R_DIR32 	 6
+#define R_IMAGEBASE	 7
+#define R_SECREL32	11
+#define R_RELBYTE	15
+#define R_RELWORD	16
+#define R_RELLONG	17
+#define R_PCRBYTE	18
+#define R_PCRWORD	19
+#define R_PCRLONG	20
+#define R_PCR24         21
+#define R_IPRSHORT	24
+#define R_IPRLONG	26
+#define R_GETSEG	29
+#define R_GETPA 	30
+#define R_TAGWORD	31
+#define R_JUMPTARG	32	/* strange 29k 00xx00xx reloc */
+#define R_PARTLS16      32
+#define R_PARTMS8       33
+
+#define R_PCR16L       128
+#define R_PCR26L       129
+#define R_VRT16        130
+#define R_HVRT16       131
+#define R_LVRT16       132
+#define R_VRT32        133
+
+
+/* This reloc identifies mov.b instructions with a 16bit absolute
+   address.  The linker tries to turn insns with this reloc into
+   an absolute 8-bit address.  */
+#define R_MOV16B1    	0x41
+
+/* This reloc identifies mov.b instructions which had a 16bit
+   absolute address which have been shortened into a 8-bit
+   absolute address.  */
+#define R_MOV16B2 	0x42
+
+/* This reloc identifies jmp insns with a 16bit target address;
+   the linker tries to turn these insns into bra insns with
+   an 8bit pc-relative target.  */
+#define R_JMP1     	0x43
+
+/* This reloc identifies a bra with an 8-bit pc-relative
+   target that was formerly a jmp insn with a 16bit target.  */
+#define R_JMP2 		0x44
+
+/* ??? */
+#define R_RELLONG_NEG  	0x45
+
+/* This reloc identifies jmp insns with a 24bit target address;
+   the linker tries to turn these insns into bra insns with
+   an 8bit pc-relative target.  */
+#define R_JMPL1     	0x46
+
+/* This reloc identifies a bra with an 8-bit pc-relative
+   target that was formerly a jmp insn with a 24bit target.  */
+#define R_JMPL2		0x47
+
+/* This reloc identifies mov.b instructions with a 24bit absolute
+   address.  The linker tries to turn insns with this reloc into
+   an absolute 8-bit address.  */
+
+#define R_MOV24B1    	0x48
+
+/* This reloc identifies mov.b instructions which had a 24bit
+   absolute address which have been shortened into a 8-bit
+   absolute address.  */
+#define R_MOV24B2 	0x49
+
+/* An h8300 memory indirect jump/call.  Forces the address of the jump/call
+   target into the function vector (in page zero), and the address of the
+   vector entry to be placed in the jump/call instruction.  */
+#define R_MEM_INDIRECT	0x4a
+
+/* This reloc identifies a 16bit pc-relative branch target which was
+   shortened into an 8bit pc-relative branch target.  */
+#define R_PCRWORD_B	0x4b
+
+/* This reloc identifies mov.[wl] instructions with a 32/24 bit
+   absolute address; the linker may turn this into a mov.[wl]
+   insn with a 16bit absolute address.  */
+#define R_MOVL1    	0x4c
+
+/* This reloc identifies mov.[wl] insns which formerly had
+   a 32/24bit absolute address and now have a 16bit absolute address.  */
+#define R_MOVL2 	0x4d
+
+/* This reloc identifies a bCC:8 which will have it's condition
+   inverted and its target redirected to the target of the branch
+   in the following insn.  */
+#define R_BCC_INV	0x4e
+
+/* This reloc identifies a jmp instruction that has been deleted.  */
+#define R_JMP_DEL	0x4f
+
+/* Z8k modes */
+#define R_IMM16   0x01		/* 16 bit abs */
+#define R_JR	  0x02		/* jr  8 bit disp */
+#define R_IMM4L   0x23		/* low nibble */
+#define R_IMM8    0x22		/* 8 bit abs */
+#define R_IMM32   R_RELLONG	/* 32 bit abs */
+#define R_CALL    R_DA		/* Absolute address which could be a callr */
+#define R_JP	  R_DA		/* Absolute address which could be a jp */
+#define R_REL16   0x04		/* 16 bit PC rel */
+#define R_CALLR	  0x05		/* callr 12 bit disp */
+#define R_SEG     0x10		/* set if in segmented mode */
+#define R_IMM4H   0x24		/* high nibble */
+#define R_DISP7   0x25          /* djnz displacement */
+
+/* Z80 modes */
+#define R_OFF8    0x32		/* 8 bit signed abs, for (i[xy]+d) */
+#define R_IMM24   0x33          /* 24 bit abs */
+/* R_JR, R_IMM8, R_IMM16, R_IMM32 - as for Z8k */
+
+/* H8500 modes */
+
+#define R_H8500_IMM8  	1		/*  8 bit immediate 	*/
+#define R_H8500_IMM16 	2		/* 16 bit immediate	*/
+#define R_H8500_PCREL8 	3		/*  8 bit pcrel 	*/
+#define R_H8500_PCREL16 4		/* 16 bit pcrel 	*/
+#define R_H8500_HIGH8  	5		/* high 8 bits of 24 bit address */
+#define R_H8500_LOW16 	7		/* low 16 bits of 24 bit immediate */
+#define R_H8500_IMM24	6		/* 24 bit immediate */
+#define R_H8500_IMM32   8               /* 32 bit immediate */
+#define R_H8500_HIGH16  9		/* high 16 bits of 32 bit immediate */
+
+/* W65 modes */
+
+#define R_W65_ABS8	1  /* addr & 0xff 		*/
+#define R_W65_ABS16	2  /* addr & 0xffff 		*/
+#define R_W65_ABS24	3  /* addr & 0xffffff 		*/
+
+#define R_W65_ABS8S8    4  /* (addr >> 8) & 0xff 	*/
+#define R_W65_ABS8S16   5  /* (addr >> 16) & 0xff 	*/
+
+#define R_W65_ABS16S8   6  /* (addr >> 8) & 0ffff 	*/
+#define R_W65_ABS16S16  7  /* (addr >> 16) & 0ffff 	*/
+
+#define R_W65_PCR8	8
+#define R_W65_PCR16	9
+
+#define R_W65_DP       10  /* direct page 8 bits only   */
+
+#endif /* GNU_COFF_INTERNAL_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/m68k.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/m68k.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/m68k.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/m68k.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,82 @@
+/* coff information for M68K
+   
+   Copyright 2001, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef GNU_COFF_M68K_H
+#define GNU_COFF_M68K_H 1
+
+#define L_LNNO_SIZE 2
+#include "coff/external.h"
+
+/* Motorola 68000/68008/68010/68020 */
+#define	MC68MAGIC	0520
+#define MC68KWRMAGIC	0520	/* writeable text segments */
+#define	MC68TVMAGIC	0521
+#define MC68KROMAGIC	0521	/* readonly shareable text segments */
+#define MC68KPGMAGIC	0522	/* demand paged text segments */
+#define	M68MAGIC	0210
+#define	M68TVMAGIC	0211
+
+/* This is the magic of the Bull dpx/2 */
+#define MC68KBCSMAGIC	0526
+
+/* This is Lynx's all-platform magic number for executables. */
+
+#define LYNXCOFFMAGIC	0415
+
+#define OMAGIC M68MAGIC
+
+/* This intentionally does not include MC68KBCSMAGIC; it only includes
+   magic numbers which imply that names do not have underscores.  */
+#define M68KBADMAG(x) (((x).f_magic != MC68MAGIC) \
+                    && ((x).f_magic != MC68KWRMAGIC) \
+                    && ((x).f_magic != MC68TVMAGIC) \
+                    && ((x).f_magic != MC68KROMAGIC) \
+                    && ((x).f_magic != MC68KPGMAGIC) \
+                    && ((x).f_magic != M68MAGIC) \
+                    && ((x).f_magic != M68TVMAGIC) \
+                    && ((x).f_magic != LYNXCOFFMAGIC))
+
+/* Magic numbers for the a.out header.  */
+
+#define PAGEMAGICEXECSWAPPED  0407 /* executable (swapped) */
+#define PAGEMAGICPEXECSWAPPED 0410 /* pure executable (swapped) */
+#define PAGEMAGICPEXECTSHLIB  0443 /* pure executable (target shared library) */
+#define PAGEMAGICPEXECPAGED   0413 /* pure executable (paged) */
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_type[2];
+#ifdef M68K_COFF_OFFSET
+  char r_offset[4];
+#endif
+};
+
+#define RELOC struct external_reloc
+
+#ifdef M68K_COFF_OFFSET
+#define RELSZ 14
+#else
+#define RELSZ 10
+#endif
+
+#endif /* GNU_COFF_M68K_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/m88k.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/m88k.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/m88k.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/m88k.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,197 @@
+/* coff information for 88k bcs
+   
+   Copyright 2001, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define DO_NOT_DEFINE_SCNHDR
+#define L_LNNO_SIZE 4
+#define DO_NOT_DEFINE_SYMENT
+#define DO_NOT_DEFINE_AUXENT
+#include "coff/external.h"
+
+#define MC88MAGIC  0540           /* 88k BCS executable */
+#define MC88DMAGIC 0541           /* DG/UX executable   */
+#define MC88OMAGIC 0555	          /* Object file        */
+
+#define MC88BADMAG(x) (((x).f_magic != MC88MAGIC) \
+                    && ((x).f_magic != MC88DMAGIC) \
+                    && ((x).f_magic != MC88OMAGIC))
+
+#define PAGEMAGIC3   0414 /* Split i&d, zero mapped */
+#define PAGEMAGICBCS 0413
+
+/********************** SECTION HEADER **********************/
+
+struct external_scnhdr 
+{
+  char		s_name[8];	/* section name			*/
+  char		s_paddr[4];	/* physical address, aliased s_nlib */
+  char		s_vaddr[4];	/* virtual address		*/
+  char		s_size[4];	/* section size			*/
+  char		s_scnptr[4];	/* file ptr to raw data for section */
+  char		s_relptr[4];	/* file ptr to relocation	*/
+  char		s_lnnoptr[4];	/* file ptr to line numbers	*/
+  char		s_nreloc[4];	/* number of relocation entries	*/
+  char		s_nlnno[4];	/* number of line number entries*/
+  char		s_flags[4];	/* flags			*/
+};
+
+#define	SCNHDR	struct external_scnhdr
+#define	SCNHSZ	44
+
+/* Names of "special" sections.  */
+#define _TEXT   ".text"
+#define _DATA   ".data"
+#define _BSS    ".bss"
+#define _COMMENT ".comment"
+
+
+/********************** SYMBOLS **********************/
+
+#define E_SYMNMLEN	8	/* # characters in a symbol name	*/
+#define E_FILNMLEN	14	/* # characters in a file name		*/
+#define E_DIMNUM	4	/* # array dimensions in auxiliary entry */
+
+struct external_syment 
+{
+  union
+  {
+    char e_name[E_SYMNMLEN];
+
+    struct
+    {
+      char e_zeroes[4];
+      char e_offset[4];
+    } e;
+
+  } e;
+
+  char e_value[4];
+  char e_scnum[2];
+  char e_type[2];
+  char e_sclass[1];
+  char e_numaux[1];
+  char pad2[2];
+};
+
+#define N_BTMASK	017
+#define N_TMASK		060
+#define N_BTSHFT	4
+#define N_TSHIFT	2
+
+/* Note that this isn't the same shape as other coffs */
+union external_auxent
+{
+  struct
+  {
+    char x_tagndx[4];		/* str, un, or enum tag indx */
+    /* 4 */
+    
+    union
+    {
+      char x_fsize[4];		/* size of function */
+
+      struct
+      {
+	char  x_lnno[4];	/* declaration line number */
+	char  x_size[4];	/* str/union/array size */
+      } x_lnsz;
+
+    } x_misc;
+    
+    /* 12 */
+    union
+    {
+      struct 			/* if ISFCN, tag, or .bb */
+      {
+	char x_lnnoptr[4];	/* ptr to fcn line # */
+	char x_endndx[4];		/* entry ndx past block end */
+      } x_fcn;
+
+      struct 			/* if ISARY, up to 4 dimen. */
+      {
+	char x_dimen[E_DIMNUM][2];
+      } x_ary;
+
+    } x_fcnary;
+    /* 20 */
+    
+  } x_sym;
+  
+  union
+  {
+    char x_fname[E_FILNMLEN];
+
+    struct
+    {
+      char x_zeroes[4];
+      char x_offset[4];
+    } x_n;
+
+  } x_file;
+  
+  struct
+  {
+    char x_scnlen[4];		/* section length */
+    char x_nreloc[4];		/* # relocation entries */
+    char x_nlinno[4];		/* # line numbers */
+  } x_scn;
+  
+  struct
+  {
+    char x_tvfill[4];		/* tv fill value */
+    char x_tvlen[2];		/* length of .tv */
+    char x_tvran[2][2];		/* tv range */
+  } x_tv;			/* info about .tv section (in auxent of symbol .tv)) */
+};
+
+#define GET_LNSZ_SIZE(abfd, ext) \
+  H_GET_32 (abfd, ext->x_sym.x_misc.x_lnsz.x_size)
+#define GET_LNSZ_LNNO(abfd, ext) \
+  H_GET_32 (abfd, ext->x_sym.x_misc.x_lnsz.x_lnno)
+#define PUT_LNSZ_LNNO(abfd, in, ext) \
+  H_PUT_32 (abfd, in, ext->x_sym.x_misc.x_lnsz.x_lnno)
+#define PUT_LNSZ_SIZE(abfd, in, ext) \
+  H_PUT_32 (abfd, in, ext->x_sym.x_misc.x_lnsz.x_size)
+#define GET_SCN_NRELOC(abfd, ext) \
+  H_GET_32 (abfd, ext->x_scn.x_nreloc)
+#define GET_SCN_NLINNO(abfd, ext) \
+  H_GET_32 (abfd, ext->x_scn.x_nlinno)
+#define PUT_SCN_NRELOC(abfd, in, ext) \
+  H_PUT_32 (abfd, in, ext->x_scn.x_nreloc)
+#define PUT_SCN_NLINNO(abfd, in, ext) \
+  H_PUT_32 (abfd,in, ext->x_scn.x_nlinno)
+
+#define	SYMENT	struct external_syment
+#define	SYMESZ	20
+#define	AUXENT	union external_auxent
+#define	AUXESZ	20
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_type[2];
+  char r_offset[2];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ  12
+
+#define NO_TVNDX
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/mcore.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/mcore.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/mcore.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/mcore.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,72 @@
+/* Motorola MCore support for BFD.
+   Copyright 1999, 2000, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file holds definitions specific to the MCore COFF/PE ABI. */
+
+#ifndef _COFF_MORE_H
+#define _COFF_MORE_H
+
+#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
+#define L_LNNO_SIZE 2
+#include "coff/external.h"
+
+#define	MCOREMAGIC	0xb00  /* I just made this up */ 
+
+#define MCOREBADMAG(x) (((x).f_magic != MCOREMAGIC))
+
+#define E_DIMNUM	4	/* # array dimensions in auxiliary entry */
+
+#define IMAGE_REL_MCORE_ABSOLUTE          	0x0000
+#define IMAGE_REL_MCORE_ADDR32            	0x0001
+#define IMAGE_REL_MCORE_PCREL_IMM8BY4		0x0002
+#define IMAGE_REL_MCORE_PCREL_IMM11BY2		0x0003
+#define IMAGE_REL_MCORE_PCREL_IMM4BY2		0x0004
+#define IMAGE_REL_MCORE_PCREL_32		0x0005
+#define IMAGE_REL_MCORE_PCREL_JSR_IMM11BY2	0x0006
+#define IMAGE_REL_MCORE_RVA			0x0007
+
+#define PEMCORE
+
+#define OMAGIC          0404    /* object files, eg as output */
+#define ZMAGIC          0413    /* demand load format, eg normal ld output */
+#define STMAGIC		0401	/* target shlib */
+#define SHMAGIC		0443	/* host   shlib */
+
+/* From winnt.h */
+#define IMAGE_NT_OPTIONAL_HDR_MAGIC        0x10b
+
+/* Define some NT default values. */
+#define NT_SECTION_ALIGNMENT 0x1000
+#define NT_FILE_ALIGNMENT    0x200  
+#define NT_DEF_RESERVE       0x100000
+#define NT_DEF_COMMIT        0x1000
+
+struct external_reloc
+{
+  char r_vaddr  [4];
+  char r_symndx [4];
+  char r_type   [2];
+  char r_offset [4];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 14
+
+#endif /* __COFF_MCORE_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/mips.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/mips.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/mips.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/mips.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,344 @@
+/* ECOFF support on MIPS machines.
+   coff/ecoff.h must be included before this file.
+   
+   Copyright 1999, 2004, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define DO_NOT_DEFINE_AOUTHDR
+#define L_LNNO_SIZE 4
+#include "coff/external.h"
+
+/* Magic numbers are defined in coff/ecoff.h.  */
+#define MIPS_ECOFF_BADMAG(x) (((x).f_magic!=MIPS_MAGIC_1) && \
+			      ((x).f_magic!=MIPS_MAGIC_LITTLE) &&\
+			      ((x).f_magic!=MIPS_MAGIC_BIG) && \
+			      ((x).f_magic!=MIPS_MAGIC_LITTLE2) && \
+			      ((x).f_magic!=MIPS_MAGIC_BIG2) && \
+			      ((x).f_magic!=MIPS_MAGIC_LITTLE3) && \
+			      ((x).f_magic!=MIPS_MAGIC_BIG3))
+
+
+/********************** AOUT "OPTIONAL HEADER" **********************/
+
+typedef struct external_aouthdr
+{
+  unsigned char magic[2];	/* type of file				*/
+  unsigned char	vstamp[2];	/* version stamp			*/
+  unsigned char	tsize[4];	/* text size in bytes, padded to FW bdry*/
+  unsigned char	dsize[4];	/* initialized data "  "		*/
+  unsigned char	bsize[4];	/* uninitialized data "   "		*/
+  unsigned char	entry[4];	/* entry pt.				*/
+  unsigned char text_start[4];	/* base of text used for this file */
+  unsigned char data_start[4];	/* base of data used for this file */
+  unsigned char bss_start[4];	/* base of bss used for this file */
+  unsigned char gprmask[4];	/* ?? */
+  unsigned char cprmask[4][4];	/* ?? */
+  unsigned char gp_value[4];	/* value for gp register */
+} AOUTHDR;
+
+/* compute size of a header */
+
+#define AOUTSZ 56
+#define AOUTHDRSZ 56
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+struct external_reloc
+  {
+    unsigned char r_vaddr[4];
+    unsigned char r_bits[4];
+  };
+
+#define RELOC struct external_reloc
+#define RELSZ 8
+
+/* MIPS ECOFF uses a packed 8 byte format for relocs.  These constants
+   are used to unpack the r_bits field.  */
+
+#define RELOC_BITS0_SYMNDX_SH_LEFT_BIG		16
+#define RELOC_BITS0_SYMNDX_SH_LEFT_LITTLE	0
+
+#define RELOC_BITS1_SYMNDX_SH_LEFT_BIG		8
+#define RELOC_BITS1_SYMNDX_SH_LEFT_LITTLE	8
+
+#define RELOC_BITS2_SYMNDX_SH_LEFT_BIG		0
+#define RELOC_BITS2_SYMNDX_SH_LEFT_LITTLE	16
+
+/* Originally, ECOFF used four bits for the reloc type and had three
+   reserved bits.  Irix 4 added another bit for the reloc type, which
+   was easy because it was big endian and one of the spare bits became
+   the new most significant bit.  To make this also work for little
+   endian ECOFF, we need to wrap one of the reserved bits around to
+   become the most significant bit of the reloc type.  */
+#define RELOC_BITS3_TYPE_BIG			0x3E
+#define RELOC_BITS3_TYPE_SH_BIG			1
+#define RELOC_BITS3_TYPE_LITTLE			0x78
+#define RELOC_BITS3_TYPE_SH_LITTLE		3
+#define RELOC_BITS3_TYPEHI_LITTLE		0x04
+#define RELOC_BITS3_TYPEHI_SH_LITTLE		2
+
+#define RELOC_BITS3_EXTERN_BIG			0x01
+#define RELOC_BITS3_EXTERN_LITTLE		0x80
+
+/* The r_type field in a reloc is one of the following values.  I
+   don't know if any other values can appear.  These seem to be all
+   that occur in the Ultrix 4.2 libraries.  */
+#define MIPS_R_IGNORE	0
+#define MIPS_R_REFHALF	1
+#define MIPS_R_REFWORD	2
+#define MIPS_R_JMPADDR	3
+#define MIPS_R_REFHI	4
+#define MIPS_R_REFLO	5
+#define MIPS_R_GPREL	6
+#define MIPS_R_LITERAL	7
+
+/* FIXME: This relocation is used (internally only) to represent branches
+   when assembling.  It should never appear in output files, and  
+   be removed.  (It used to be used for embedded-PIC support.)  */
+#define MIPS_R_PCREL16	12
+
+/********************** STABS **********************/
+
+#define MIPS_IS_STAB ECOFF_IS_STAB
+#define MIPS_MARK_STAB ECOFF_MARK_STAB
+#define MIPS_UNMARK_STAB ECOFF_UNMARK_STAB
+
+/********************** SYMBOLIC INFORMATION **********************/
+
+/* Written by John Gilmore.  */
+
+/* ECOFF uses COFF-like section structures, but its own symbol format.
+   This file defines the symbol format in fields whose size and alignment
+   will not vary on different host systems.  */
+
+/* File header as a set of bytes */
+
+struct hdr_ext
+{
+	unsigned char 	h_magic[2];
+	unsigned char	h_vstamp[2];
+	unsigned char	h_ilineMax[4];
+	unsigned char	h_cbLine[4];
+	unsigned char	h_cbLineOffset[4];
+	unsigned char	h_idnMax[4];
+	unsigned char	h_cbDnOffset[4];
+	unsigned char	h_ipdMax[4];
+	unsigned char	h_cbPdOffset[4];
+	unsigned char	h_isymMax[4];
+	unsigned char	h_cbSymOffset[4];
+	unsigned char	h_ioptMax[4];
+	unsigned char	h_cbOptOffset[4];
+	unsigned char	h_iauxMax[4];
+	unsigned char	h_cbAuxOffset[4];
+	unsigned char	h_issMax[4];
+	unsigned char	h_cbSsOffset[4];
+	unsigned char	h_issExtMax[4];
+	unsigned char	h_cbSsExtOffset[4];
+	unsigned char	h_ifdMax[4];
+	unsigned char	h_cbFdOffset[4];
+	unsigned char	h_crfd[4];
+	unsigned char	h_cbRfdOffset[4];
+	unsigned char	h_iextMax[4];
+	unsigned char	h_cbExtOffset[4];
+};
+
+/* File descriptor external record */
+
+struct fdr_ext
+{
+	unsigned char	f_adr[4];
+	unsigned char	f_rss[4];
+	unsigned char	f_issBase[4];
+	unsigned char	f_cbSs[4];
+	unsigned char	f_isymBase[4];
+	unsigned char	f_csym[4];
+	unsigned char	f_ilineBase[4];
+	unsigned char	f_cline[4];
+	unsigned char	f_ioptBase[4];
+	unsigned char	f_copt[4];
+	unsigned char	f_ipdFirst[2];
+	unsigned char	f_cpd[2];
+	unsigned char	f_iauxBase[4];
+	unsigned char	f_caux[4];
+	unsigned char	f_rfdBase[4];
+	unsigned char	f_crfd[4];
+	unsigned char	f_bits1[1];
+	unsigned char	f_bits2[3];
+	unsigned char	f_cbLineOffset[4];
+	unsigned char	f_cbLine[4];
+};
+
+#define	FDR_BITS1_LANG_BIG		0xF8
+#define	FDR_BITS1_LANG_SH_BIG		3
+#define	FDR_BITS1_LANG_LITTLE		0x1F
+#define	FDR_BITS1_LANG_SH_LITTLE	0
+
+#define	FDR_BITS1_FMERGE_BIG		0x04
+#define	FDR_BITS1_FMERGE_LITTLE		0x20
+
+#define	FDR_BITS1_FREADIN_BIG		0x02
+#define	FDR_BITS1_FREADIN_LITTLE	0x40
+
+#define	FDR_BITS1_FBIGENDIAN_BIG	0x01
+#define	FDR_BITS1_FBIGENDIAN_LITTLE	0x80
+
+#define	FDR_BITS2_GLEVEL_BIG		0xC0
+#define	FDR_BITS2_GLEVEL_SH_BIG		6
+#define	FDR_BITS2_GLEVEL_LITTLE		0x03
+#define	FDR_BITS2_GLEVEL_SH_LITTLE	0
+
+/* We ignore the `reserved' field in bits2. */
+
+/* Procedure descriptor external record */
+
+struct pdr_ext
+{
+	unsigned char	p_adr[4];
+	unsigned char	p_isym[4];
+	unsigned char	p_iline[4];
+	unsigned char	p_regmask[4];
+	unsigned char	p_regoffset[4];
+	unsigned char	p_iopt[4];
+	unsigned char	p_fregmask[4];
+	unsigned char	p_fregoffset[4];
+	unsigned char	p_frameoffset[4];
+	unsigned char	p_framereg[2];
+	unsigned char	p_pcreg[2];
+	unsigned char	p_lnLow[4];
+	unsigned char	p_lnHigh[4];
+	unsigned char	p_cbLineOffset[4];
+};
+
+/* Runtime procedure table */
+
+struct rpdr_ext
+{
+	unsigned char	p_adr[4];
+	unsigned char	p_regmask[4];
+	unsigned char	p_regoffset[4];
+	unsigned char	p_fregmask[4];
+	unsigned char	p_fregoffset[4];
+	unsigned char	p_frameoffset[4];
+	unsigned char	p_framereg[2];
+	unsigned char	p_pcreg[2];
+	unsigned char	p_irpss[4];
+	unsigned char	p_reserved[4];
+	unsigned char	p_exception_info[4];
+};
+
+/* Line numbers */
+
+struct line_ext
+{
+	unsigned char	l_line[4];
+};
+
+/* Symbol external record */
+
+struct sym_ext
+{
+	unsigned char	s_iss[4];
+	unsigned char	s_value[4];
+	unsigned char	s_bits1[1];
+	unsigned char	s_bits2[1];
+	unsigned char	s_bits3[1];
+	unsigned char	s_bits4[1];
+};
+
+#define	SYM_BITS1_ST_BIG		0xFC
+#define	SYM_BITS1_ST_SH_BIG		2
+#define	SYM_BITS1_ST_LITTLE		0x3F
+#define	SYM_BITS1_ST_SH_LITTLE		0
+
+#define	SYM_BITS1_SC_BIG		0x03
+#define	SYM_BITS1_SC_SH_LEFT_BIG	3
+#define	SYM_BITS1_SC_LITTLE		0xC0
+#define	SYM_BITS1_SC_SH_LITTLE		6
+
+#define	SYM_BITS2_SC_BIG		0xE0
+#define	SYM_BITS2_SC_SH_BIG		5
+#define	SYM_BITS2_SC_LITTLE		0x07
+#define	SYM_BITS2_SC_SH_LEFT_LITTLE	2
+
+#define	SYM_BITS2_RESERVED_BIG		0x10
+#define	SYM_BITS2_RESERVED_LITTLE	0x08
+
+#define	SYM_BITS2_INDEX_BIG		0x0F
+#define	SYM_BITS2_INDEX_SH_LEFT_BIG	16
+#define	SYM_BITS2_INDEX_LITTLE		0xF0
+#define	SYM_BITS2_INDEX_SH_LITTLE	4
+
+#define	SYM_BITS3_INDEX_SH_LEFT_BIG	8
+#define	SYM_BITS3_INDEX_SH_LEFT_LITTLE	4
+
+#define	SYM_BITS4_INDEX_SH_LEFT_BIG	0
+#define	SYM_BITS4_INDEX_SH_LEFT_LITTLE	12
+
+/* External symbol external record */
+
+struct ext_ext
+{
+	unsigned char	es_bits1[1];
+	unsigned char	es_bits2[1];
+	unsigned char	es_ifd[2];
+	struct	sym_ext es_asym;
+};
+
+#define	EXT_BITS1_JMPTBL_BIG		0x80
+#define	EXT_BITS1_JMPTBL_LITTLE		0x01
+
+#define	EXT_BITS1_COBOL_MAIN_BIG	0x40
+#define	EXT_BITS1_COBOL_MAIN_LITTLE	0x02
+
+#define	EXT_BITS1_WEAKEXT_BIG		0x20
+#define	EXT_BITS1_WEAKEXT_LITTLE	0x04
+
+/* Dense numbers external record */
+
+struct dnr_ext
+{
+	unsigned char	d_rfd[4];
+	unsigned char	d_index[4];
+};
+
+/* Relative file descriptor */
+
+struct rfd_ext
+{
+  unsigned char	rfd[4];
+};
+
+/* Optimizer symbol external record */
+
+struct opt_ext
+{
+  unsigned char o_bits1[1];
+  unsigned char o_bits2[1];
+  unsigned char o_bits3[1];
+  unsigned char o_bits4[1];
+  struct rndx_ext o_rndx;
+  unsigned char o_offset[4];
+};
+
+#define OPT_BITS2_VALUE_SH_LEFT_BIG	16
+#define OPT_BITS2_VALUE_SH_LEFT_LITTLE	0
+
+#define OPT_BITS3_VALUE_SH_LEFT_BIG	8
+#define OPT_BITS3_VALUE_SH_LEFT_LITTLE	8
+
+#define OPT_BITS4_VALUE_SH_LEFT_BIG	0
+#define OPT_BITS4_VALUE_SH_LEFT_LITTLE	16
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/mipspe.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/mipspe.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/mipspe.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/mipspe.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,67 @@
+/* coff information for Windows CE with MIPS VR4111
+   
+   Copyright 2000, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define L_LNNO_SIZE 2
+#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
+#include "coff/external.h"
+
+#define MIPS_ARCH_MAGIC_WINCE	0x0166  /* Windows CE - little endian */
+#define MIPS_PE_MAGIC		0x010b
+
+#define MIPSBADMAG(x) ((x).f_magic != MIPS_ARCH_MAGIC_WINCE)
+
+/* define some NT default values */
+/*  #define NT_IMAGE_BASE        0x400000 moved to internal.h */
+#define NT_SECTION_ALIGNMENT 0x1000
+#define NT_FILE_ALIGNMENT    0x200
+#define NT_DEF_RESERVE       0x100000
+#define NT_DEF_COMMIT        0x1000
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+/* The external reloc has an offset field, because some of the reloc
+   types on the h8 don't have room in the instruction for the entire
+   offset - eg the strange jump and high page addressing modes.  */
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_type[2];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 10
+
+/* MIPS PE relocation types. */
+
+#define	MIPS_R_ABSOLUTE	0 /* ignored */
+#define	MIPS_R_REFHALF	1
+#define	MIPS_R_REFWORD	2
+#define	MIPS_R_JMPADDR	3
+#define	MIPS_R_REFHI	4 /* PAIR follows */
+#define	MIPS_R_REFLO	5
+#define	MIPS_R_GPREL	6
+#define	MIPS_R_LITERAL	7 /* same as GPREL */
+#define	MIPS_R_SECTION	10
+#define	MIPS_R_SECREL	11
+#define	MIPS_R_SECRELLO	12
+#define	MIPS_R_SECRELHI	13 /* PAIR follows */
+#define	MIPS_R_RVA	34 /* 0x22 */
+#define	MIPS_R_PAIR	37 /* 0x25 - symndx is really a signed 16-bit addend */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/or32.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/or32.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/or32.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/or32.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,288 @@
+/* COFF specification for OpenRISC 1000.
+   Copyright (C) 1993-2000, 2002, 2010 Free Software Foundation, Inc.
+   Contributed by David Wood @ New York University.
+   Modified by Johan Rydberg, <johan.rydberg@netinsight.se>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef OR32
+# define OR32
+#endif
+
+/* File Header and related definitions.  */
+struct external_filehdr
+{
+  char f_magic[2];	/* magic number		    */
+  char f_nscns[2];	/* number of sections	    */
+  char f_timdat[4];     /* time & date stamp	    */
+  char f_symptr[4];     /* file pointer to symtab   */
+  char f_nsyms[4];	/* number of symtab entries */
+  char f_opthdr[2];     /* sizeof(optional hdr)	    */
+  char f_flags[2];	/* flags		    */
+};
+
+#define FILHDR  struct external_filehdr
+#define FILHSZ	20
+
+/* Magic numbers for OpenRISC 1000. As it is know we use the
+   numbers for Am29000.
+
+   (AT&T will assign the "real" magic number).  */
+#define SIPFBOMAGIC     0572    /* Am29000 (Byte 0 is MSB).  */
+#define SIPRBOMAGIC     0573    /* Am29000 (Byte 0 is LSB).  */
+
+#define OR32_MAGIC_BIG 		SIPFBOMAGIC	
+#define OR32_MAGIC_LITTLE	SIPRBOMAGIC	
+#define OR32BADMAG(x)     (((x).f_magic!=OR32_MAGIC_BIG) && \
+			                      ((x).f_magic!=OR32_MAGIC_LITTLE))
+
+#define OMAGIC OR32_MAGIC_BIG
+
+/* Optional (a.out) header.  */
+typedef	struct external_aouthdr 
+{
+  char  magic[2];         /* type of file                     */
+  char  vstamp[2];	  /* version stamp                    */
+  char  tsize[4];	  /* text size in bytes, padded to FW bdry */
+  char  dsize[4];	  /* initialized data "  "            */
+  char  bsize[4];	  /* uninitialized data "   "         */
+  char  entry[4];	  /* entry pt.                        */
+  char  text_start[4];	  /* base of text used for this file  */
+  char  data_start[4];	  /* base of data used for this file  */
+} AOUTHDR;
+
+#define AOUTSZ      28
+#define AOUTHDRSZ   28
+
+/* aouthdr magic numbers.  */
+#define NMAGIC    0410	  /* separate i/d executable.  */
+#define SHMAGIC   0406	  /* NYU/Ultra3 shared data executable 
+                             (writable text).  */
+
+#define _ETEXT   	"_etext"
+
+/* Section header and related definitions.  */
+struct external_scnhdr 
+{
+  char	    s_name[8];      /* section name                   */
+  char	    s_paddr[4];     /* physical address, aliased s_nlib */
+  char	    s_vaddr[4];     /* virtual address                */
+  char	    s_size[4];      /* section size                   */
+  char	    s_scnptr[4];    /* file ptr to raw data for section */
+  char	    s_relptr[4];    /* file ptr to relocation         */
+  char	    s_lnnoptr[4];   /* file ptr to line numbers       */
+  char	    s_nreloc[2];    /* number of relocation entries   */
+  char	    s_nlnno[2];     /* number of line number entries  */
+  char	    s_flags[4];     /* flags                          */
+};
+
+#define	SCNHDR	struct external_scnhdr
+#define	SCNHSZ	40
+
+/* Names of "special" sections:  */
+#define _TEXT   ".text"
+#define _DATA   ".data"
+#define _BSS    ".bss"
+#define _LIT    ".lit"
+
+/* Section types - with additional section type for global 
+   registers which will be relocatable for the OpenRISC 1000.
+
+   In instances where it is necessary for a linker to produce an
+   output file which contains text or data not based at virtual
+   address 0, e.g. for a ROM, then the linker should accept
+   address base information as command input and use PAD sections
+   to skip over unused addresses.  */
+#define	STYP_BSSREG 0x1200	/* Global register area (like STYP_INFO) */
+#define STYP_ENVIR  0x2200	/* Environment (like STYP_INFO) */
+#define STYP_ABS    0x4000	/* Absolute (allocated, not reloc, loaded) */
+
+/* Relocation information declaration and related definitions:  */
+struct external_reloc
+{
+  char r_vaddr[4];    /* (virtual) address of reference */
+  char r_symndx[4];   /* index into symbol table */
+  char r_type[2];     /* relocation type */
+};
+
+#define	RELOC		struct external_reloc
+#define	RELSZ		10		/* sizeof (RELOC) */ 
+
+/* Relocation types for the OpenRISC 1000: */
+
+#define	R_ABS     0     /* reference is absolute */
+#define	R_IREL    030	/* instruction relative (jmp/call) */
+#define	R_IABS    031	/* instruction absolute (jmp/call) */
+#define	R_ILOHALF 032	/* instruction low half  (const)  */
+#define	R_IHIHALF 033	/* instruction high half (consth) part 1 */
+#define	R_IHCONST 034	/* instruction high half (consth) part 2 */
+                        /* constant offset of R_IHIHALF relocation */
+#define	R_BYTE    035	/* relocatable byte value */
+#define R_HWORD   036	/* relocatable halfword value */
+#define R_WORD    037	/* relocatable word value */
+
+#define	R_IGLBLRC 040	/* instruction global register RC */
+#define	R_IGLBLRA 041	/* instruction global register RA */
+#define	R_IGLBLRB 042	/* instruction global register RB */
+ 
+/*
+  NOTE:
+  All the "I" forms refer to 29000 instruction formats.  The linker is 
+  expected to know how the numeric information is split and/or aligned
+  within the instruction word(s).  R_BYTE works for instructions, too.
+
+  If the parameter to a CONSTH instruction is a relocatable type, two 
+  relocation records are written.  The first has an r_type of R_IHIHALF 
+  (33 octal) and a normal r_vaddr and r_symndx.  The second relocation 
+  record has an r_type of R_IHCONST (34 octal), a normal r_vaddr (which 
+  is redundant), and an r_symndx containing the 32-bit constant offset 
+  to the relocation instead of the actual symbol table index.  This 
+  second record is always written, even if the constant offset is zero.
+  The constant fields of the instruction are set to zero.  */
+
+/* Line number entry declaration and related definitions:  */
+struct external_lineno 
+{
+  union
+  {
+    char l_symndx[4];  /* function name symbol index, iff l_lnno == 0*/
+    char l_paddr[4];   /* (physical) address of line number    */
+  }
+  l_addr;
+
+  char l_lnno[2];      /* line number	  */
+};
+
+#define	LINENO		struct external_lineno
+#define	LINESZ		6		  /* sizeof (LINENO) */
+
+/* Symbol entry declaration and related definitions:  */
+#define	E_SYMNMLEN	8	  /* Number of characters in a symbol name */
+
+struct external_syment
+{
+  union
+  {
+    char e_name[E_SYMNMLEN];
+    struct
+    {
+      char e_zeroes[4];
+      char e_offset[4];
+    }
+    e;
+  }
+  e;
+
+  char e_value[4];
+  char e_scnum[2];
+  char e_type[2];
+  char e_sclass[1];
+  char e_numaux[1];
+};
+
+#define	SYMENT	struct external_syment
+#define	SYMESZ 	18
+
+/* Storage class definitions - new classes for global registers:  */
+#define C_GLBLREG	19		/* global register */
+#define C_EXTREG	20		/* external global register */
+#define	C_DEFREG	21		/* ext. def. of global register */
+
+/* Derived symbol mask/shifts:  */
+#define N_BTMASK	(0xf)
+#define N_BTSHFT	(4)
+#define N_TMASK		(0x30)
+#define N_TSHIFT	(2)
+
+/* Auxiliary symbol table entry declaration and related 
+   definitions.  */
+#define E_FILNMLEN  14  /* # characters in a file name	  */
+#define E_DIMNUM    4   /* # array dimensions in auxiliary entry */
+
+union external_auxent
+{
+  struct
+  {
+    char x_tagndx[4];       /* str, un, or enum tag indx */
+    union
+    {
+      struct
+      {
+	char  x_lnno[2];    /* declaration line number */
+        char  x_size[2];    /* str/union/array size */
+      }
+      x_lnsz;
+
+      char x_fsize[4];      /* size of function */
+    }
+    x_misc;
+
+    union
+    {
+      struct 		          /* if ISFCN, tag, or .bb */
+      {
+	char x_lnnoptr[4];  /* ptr to fcn line # */
+        char x_endndx[4];   /* entry ndx past block end */
+      }
+      x_fcn;
+
+      struct   	          /* if ISARY, up to 4 dimen. */
+      {
+	char x_dimen[E_DIMNUM][2];
+      }
+      x_ary;
+    }
+    x_fcnary;
+
+    char x_tvndx[2];        /* tv index */
+  }
+  x_sym;
+
+  union
+  {
+    char x_fname[E_FILNMLEN];
+
+    struct
+    {
+      char x_zeroes[4];
+      char x_offset[4];
+    }
+    x_n;
+  }
+  x_file;
+
+  struct
+  {
+    char x_scnlen[4];       /* section length */
+    char x_nreloc[2];       /* # relocation entries */
+    char x_nlinno[2];       /* # line numbers */
+  }
+  x_scn;
+
+  struct
+  {
+    char x_tvfill[4];       /* tv fill value */
+    char x_tvlen[2];        /* length of .tv */
+    char x_tvran[2][2];     /* tv range */
+  }
+  x_tv;                   /* info about .tv section 
+			     (in auxent of symbol .tv)) */
+};
+
+#define	AUXENT		union external_auxent
+#define	AUXESZ		18	
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/pe.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/pe.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/pe.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/pe.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,512 @@
+/* pe.h  -  PE COFF header information 
+
+   Copyright 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2009, 2010
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+#ifndef _PE_H
+#define _PE_H
+
+/* NT specific file attributes.  */
+#define IMAGE_FILE_RELOCS_STRIPPED           0x0001
+#define IMAGE_FILE_EXECUTABLE_IMAGE          0x0002
+#define IMAGE_FILE_LINE_NUMS_STRIPPED        0x0004
+#define IMAGE_FILE_LOCAL_SYMS_STRIPPED       0x0008
+#define IMAGE_FILE_AGGRESSIVE_WS_TRIM        0x0010
+#define IMAGE_FILE_LARGE_ADDRESS_AWARE       0x0020
+#define IMAGE_FILE_16BIT_MACHINE             0x0040
+#define IMAGE_FILE_BYTES_REVERSED_LO         0x0080
+#define IMAGE_FILE_32BIT_MACHINE             0x0100
+#define IMAGE_FILE_DEBUG_STRIPPED            0x0200
+#define IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP   0x0400
+#define IMAGE_FILE_NET_RUN_FROM_SWAP         0x0800
+#define IMAGE_FILE_SYSTEM                    0x1000
+#define IMAGE_FILE_DLL                       0x2000
+#define IMAGE_FILE_UP_SYSTEM_ONLY            0x4000
+#define IMAGE_FILE_BYTES_REVERSED_HI         0x8000
+
+/* DllCharacteristics flag bits.  The inconsistent naming may seem
+   odd, but that is how they are defined in the PE specification.  */
+#define IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE          0x0040
+#define IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY       0x0080
+#define IMAGE_DLL_CHARACTERISTICS_NX_COMPAT             0x0100
+#define IMAGE_DLLCHARACTERISTICS_NO_ISOLATION           0x0200
+#define IMAGE_DLLCHARACTERISTICS_NO_SEH                 0x0400
+#define IMAGE_DLLCHARACTERISTICS_NO_BIND                0x0800
+#define IMAGE_DLLCHARACTERISTICS_WDM_DRIVER             0x2000
+#define IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE  0x8000
+
+/* Additional flags to be set for section headers to allow the NT loader to
+   read and write to the section data (to replace the addresses of data in
+   dlls for one thing); also to execute the section in .text's case.  */
+#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000
+#define IMAGE_SCN_MEM_EXECUTE     0x20000000
+#define IMAGE_SCN_MEM_READ        0x40000000
+#define IMAGE_SCN_MEM_WRITE       0x80000000
+
+/* Section characteristics added for ppc-nt.  */
+
+#define IMAGE_SCN_TYPE_NO_PAD                0x00000008  /* Reserved. */
+
+#define IMAGE_SCN_CNT_CODE                   0x00000020  /* Section contains code. */
+#define IMAGE_SCN_CNT_INITIALIZED_DATA       0x00000040  /* Section contains initialized data. */
+#define IMAGE_SCN_CNT_UNINITIALIZED_DATA     0x00000080  /* Section contains uninitialized data. */
+
+#define IMAGE_SCN_LNK_OTHER                  0x00000100  /* Reserved. */
+#define IMAGE_SCN_LNK_INFO                   0x00000200  /* Section contains comments or some other type of information. */
+#define IMAGE_SCN_LNK_REMOVE                 0x00000800  /* Section contents will not become part of image. */
+#define IMAGE_SCN_LNK_COMDAT                 0x00001000  /* Section contents comdat. */
+
+#define IMAGE_SCN_MEM_FARDATA                0x00008000
+
+#define IMAGE_SCN_MEM_PURGEABLE              0x00020000
+#define IMAGE_SCN_MEM_16BIT                  0x00020000
+#define IMAGE_SCN_MEM_LOCKED                 0x00040000
+#define IMAGE_SCN_MEM_PRELOAD                0x00080000
+
+/* Bit position in the s_flags field where the alignment values start. */
+#define IMAGE_SCN_ALIGN_POWER_BIT_POS	     20
+#define IMAGE_SCN_ALIGN_POWER_BIT_MASK	     0x00f00000
+#define IMAGE_SCN_ALIGN_POWER_NUM(val)	     \
+  (((val) >> IMAGE_SCN_ALIGN_POWER_BIT_POS) - 1)
+#define IMAGE_SCN_ALIGN_POWER_CONST(val)     \
+  (((val) + 1) << IMAGE_SCN_ALIGN_POWER_BIT_POS)
+
+#define IMAGE_SCN_ALIGN_1BYTES		     IMAGE_SCN_ALIGN_POWER_CONST (0)
+#define IMAGE_SCN_ALIGN_2BYTES		     IMAGE_SCN_ALIGN_POWER_CONST (1)
+#define IMAGE_SCN_ALIGN_4BYTES		     IMAGE_SCN_ALIGN_POWER_CONST (2)
+#define IMAGE_SCN_ALIGN_8BYTES		     IMAGE_SCN_ALIGN_POWER_CONST (3)
+/* Default alignment if no others are specified. */
+#define IMAGE_SCN_ALIGN_16BYTES		     IMAGE_SCN_ALIGN_POWER_CONST (4)
+#define IMAGE_SCN_ALIGN_32BYTES		     IMAGE_SCN_ALIGN_POWER_CONST (5)
+#define IMAGE_SCN_ALIGN_64BYTES		     IMAGE_SCN_ALIGN_POWER_CONST (6)
+#define IMAGE_SCN_ALIGN_128BYTES	     IMAGE_SCN_ALIGN_POWER_CONST (7)
+#define IMAGE_SCN_ALIGN_256BYTES	     IMAGE_SCN_ALIGN_POWER_CONST (8)
+#define IMAGE_SCN_ALIGN_512BYTES	     IMAGE_SCN_ALIGN_POWER_CONST (9)
+#define IMAGE_SCN_ALIGN_1024BYTES	     IMAGE_SCN_ALIGN_POWER_CONST (10)
+#define IMAGE_SCN_ALIGN_2048BYTES	     IMAGE_SCN_ALIGN_POWER_CONST (11)
+#define IMAGE_SCN_ALIGN_4096BYTES	     IMAGE_SCN_ALIGN_POWER_CONST (12)
+#define IMAGE_SCN_ALIGN_8192BYTES	     IMAGE_SCN_ALIGN_POWER_CONST (13)
+
+/* Encode alignment power into IMAGE_SCN_ALIGN bits of s_flags */
+#define COFF_ENCODE_ALIGNMENT(SECTION, ALIGNMENT_POWER) \
+  ((SECTION).s_flags |= IMAGE_SCN_ALIGN_POWER_CONST ((ALIGNMENT_POWER)))
+
+#define IMAGE_SCN_LNK_NRELOC_OVFL            0x01000000  /* Section contains extended relocations. */
+#define IMAGE_SCN_MEM_NOT_CACHED             0x04000000  /* Section is not cachable.               */
+#define IMAGE_SCN_MEM_NOT_PAGED              0x08000000  /* Section is not pageable.               */
+#define IMAGE_SCN_MEM_SHARED                 0x10000000  /* Section is shareable.                  */
+
+/* COMDAT selection codes.  */
+
+#define IMAGE_COMDAT_SELECT_NODUPLICATES     (1) /* Warn if duplicates.  */
+#define IMAGE_COMDAT_SELECT_ANY		     (2) /* No warning.  */
+#define IMAGE_COMDAT_SELECT_SAME_SIZE	     (3) /* Warn if different size.  */
+#define IMAGE_COMDAT_SELECT_EXACT_MATCH	     (4) /* Warn if different.  */
+#define IMAGE_COMDAT_SELECT_ASSOCIATIVE	     (5) /* Base on other section.  */
+
+/* Machine numbers.  */
+
+#define IMAGE_FILE_MACHINE_UNKNOWN           0x0000
+#define IMAGE_FILE_MACHINE_ALPHA             0x0184
+#define IMAGE_FILE_MACHINE_ALPHA64           0x0284
+#define IMAGE_FILE_MACHINE_AM33              0x01d3
+#define IMAGE_FILE_MACHINE_AMD64             0x8664
+#define IMAGE_FILE_MACHINE_ARM               0x01c0
+#define IMAGE_FILE_MACHINE_AXP64             IMAGE_FILE_MACHINE_ALPHA64
+#define IMAGE_FILE_MACHINE_CEE               0xc0ee
+#define IMAGE_FILE_MACHINE_CEF               0x0cef
+#define IMAGE_FILE_MACHINE_EBC               0x0ebc
+#define IMAGE_FILE_MACHINE_I386              0x014c
+#define IMAGE_FILE_MACHINE_IA64              0x0200
+#define IMAGE_FILE_MACHINE_M32R              0x9041
+#define IMAGE_FILE_MACHINE_M68K              0x0268
+#define IMAGE_FILE_MACHINE_MIPS16            0x0266
+#define IMAGE_FILE_MACHINE_MIPSFPU           0x0366
+#define IMAGE_FILE_MACHINE_MIPSFPU16         0x0466
+#define IMAGE_FILE_MACHINE_POWERPC           0x01f0
+#define IMAGE_FILE_MACHINE_POWERPCFP         0x01f1
+#define IMAGE_FILE_MACHINE_R10000            0x0168
+#define IMAGE_FILE_MACHINE_R3000             0x0162
+#define IMAGE_FILE_MACHINE_R4000             0x0166
+#define IMAGE_FILE_MACHINE_SH3               0x01a2
+#define IMAGE_FILE_MACHINE_SH3DSP            0x01a3
+#define IMAGE_FILE_MACHINE_SH3E              0x01a4
+#define IMAGE_FILE_MACHINE_SH4               0x01a6
+#define IMAGE_FILE_MACHINE_SH5               0x01a8
+#define IMAGE_FILE_MACHINE_THUMB             0x01c2
+#define IMAGE_FILE_MACHINE_TRICORE           0x0520
+#define IMAGE_FILE_MACHINE_WCEMIPSV2         0x0169
+#define IMAGE_FILE_MACHINE_AMD64             0x8664
+
+#define IMAGE_SUBSYSTEM_UNKNOWN			 0
+#define IMAGE_SUBSYSTEM_NATIVE			 1
+#define IMAGE_SUBSYSTEM_WINDOWS_GUI		 2
+#define IMAGE_SUBSYSTEM_WINDOWS_CUI		 3
+#define IMAGE_SUBSYSTEM_POSIX_CUI		 7
+#define IMAGE_SUBSYSTEM_WINDOWS_CE_GUI		 9
+#define IMAGE_SUBSYSTEM_EFI_APPLICATION		10
+#define IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER	11
+#define IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER	12
+#define IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER	13
+#define IMAGE_SUBSYSTEM_XBOX			14
+  
+/* Magic values that are true for all dos/nt implementations.  */
+#define DOSMAGIC       0x5a4d  
+#define NT_SIGNATURE   0x00004550
+
+/* NT allows long filenames, we want to accommodate this.
+   This may break some of the bfd functions.  */
+#undef  FILNMLEN
+#define FILNMLEN	18	/* # characters in a file name.  */
+
+struct external_PEI_DOS_hdr
+{
+  /* DOS header fields - always at offset zero in the EXE file.  */
+  char e_magic[2];		/* Magic number, 0x5a4d.  */
+  char e_cblp[2];		/* Bytes on last page of file, 0x90.  */
+  char e_cp[2];			/* Pages in file, 0x3.  */
+  char e_crlc[2];		/* Relocations, 0x0.  */
+  char e_cparhdr[2];		/* Size of header in paragraphs, 0x4.  */
+  char e_minalloc[2];		/* Minimum extra paragraphs needed, 0x0.  */
+  char e_maxalloc[2];		/* Maximum extra paragraphs needed, 0xFFFF.  */
+  char e_ss[2];			/* Initial (relative) SS value, 0x0.  */
+  char e_sp[2];			/* Initial SP value, 0xb8.  */
+  char e_csum[2];		/* Checksum, 0x0.  */
+  char e_ip[2];			/* Initial IP value, 0x0.  */
+  char e_cs[2];			/* Initial (relative) CS value, 0x0.  */
+  char e_lfarlc[2];		/* File address of relocation table, 0x40.  */
+  char e_ovno[2];		/* Overlay number, 0x0.  */
+  char e_res[4][2];		/* Reserved words, all 0x0.  */
+  char e_oemid[2];		/* OEM identifier (for e_oeminfo), 0x0.  */
+  char e_oeminfo[2];		/* OEM information; e_oemid specific, 0x0.  */
+  char e_res2[10][2];		/* Reserved words, all 0x0.  */
+  char e_lfanew[4];		/* File address of new exe header, usually 0x80.  */
+  char dos_message[16][4];	/* Other stuff, always follow DOS header.  */
+};
+
+struct external_PEI_IMAGE_hdr
+{
+  char nt_signature[4];		/* required NT signature, 0x4550.  */
+
+  /* From standard header.  */
+  char f_magic[2];		/* Magic number.		*/
+  char f_nscns[2];		/* Number of sections.		*/
+  char f_timdat[4];		/* Time & date stamp.		*/
+  char f_symptr[4];		/* File pointer to symtab.	*/
+  char f_nsyms[4];		/* Number of symtab entries.	*/
+  char f_opthdr[2];		/* Sizeof(optional hdr).	*/
+  char f_flags[2];		/* Flags.			*/
+};
+
+struct external_PEI_filehdr
+{
+  /* DOS header fields - always at offset zero in the EXE file.  */
+  char e_magic[2];		/* Magic number, 0x5a4d.  */
+  char e_cblp[2];		/* Bytes on last page of file, 0x90.  */
+  char e_cp[2];			/* Pages in file, 0x3.  */
+  char e_crlc[2];		/* Relocations, 0x0.  */
+  char e_cparhdr[2];		/* Size of header in paragraphs, 0x4.  */
+  char e_minalloc[2];		/* Minimum extra paragraphs needed, 0x0.  */
+  char e_maxalloc[2];		/* Maximum extra paragraphs needed, 0xFFFF.  */
+  char e_ss[2];			/* Initial (relative) SS value, 0x0.  */
+  char e_sp[2];			/* Initial SP value, 0xb8.  */
+  char e_csum[2];		/* Checksum, 0x0.  */
+  char e_ip[2];			/* Initial IP value, 0x0.  */
+  char e_cs[2];			/* Initial (relative) CS value, 0x0.  */
+  char e_lfarlc[2];		/* File address of relocation table, 0x40.  */
+  char e_ovno[2];		/* Overlay number, 0x0.  */
+  char e_res[4][2];		/* Reserved words, all 0x0.  */
+  char e_oemid[2];		/* OEM identifier (for e_oeminfo), 0x0.  */
+  char e_oeminfo[2];		/* OEM information; e_oemid specific, 0x0.  */
+  char e_res2[10][2];		/* Reserved words, all 0x0.  */
+  char e_lfanew[4];		/* File address of new exe header, usually 0x80.  */
+  char dos_message[16][4];	/* Other stuff, always follow DOS header.  */
+
+  /* Note: additional bytes may be inserted before the signature.  Use
+   the e_lfanew field to find the actual location of the NT signature.  */
+
+  char nt_signature[4];		/* required NT signature, 0x4550.  */
+
+  /* From standard header.  */
+  char f_magic[2];		/* Magic number.		*/
+  char f_nscns[2];		/* Number of sections.		*/
+  char f_timdat[4];		/* Time & date stamp.		*/
+  char f_symptr[4];		/* File pointer to symtab.	*/
+  char f_nsyms[4];		/* Number of symtab entries.	*/
+  char f_opthdr[2];		/* Sizeof(optional hdr).	*/
+  char f_flags[2];		/* Flags.			*/
+};
+
+#ifdef COFF_IMAGE_WITH_PE
+
+/* The filehdr is only weird in images.  */
+
+#undef  FILHDR
+#define FILHDR struct external_PEI_filehdr
+#undef  FILHSZ
+#define FILHSZ 152
+
+#endif /* COFF_IMAGE_WITH_PE */
+
+/* 32-bit PE a.out header: */
+
+typedef struct 
+{
+  AOUTHDR standard;
+
+  /* NT extra fields; see internal.h for descriptions.  */
+  char  ImageBase[4];
+  char  SectionAlignment[4];
+  char  FileAlignment[4];
+  char  MajorOperatingSystemVersion[2];
+  char  MinorOperatingSystemVersion[2];
+  char  MajorImageVersion[2];
+  char  MinorImageVersion[2];
+  char  MajorSubsystemVersion[2];
+  char  MinorSubsystemVersion[2];
+  char  Reserved1[4];
+  char  SizeOfImage[4];
+  char  SizeOfHeaders[4];
+  char  CheckSum[4];
+  char  Subsystem[2];
+  char  DllCharacteristics[2];
+  char  SizeOfStackReserve[4];
+  char  SizeOfStackCommit[4];
+  char  SizeOfHeapReserve[4];
+  char  SizeOfHeapCommit[4];
+  char  LoaderFlags[4];
+  char  NumberOfRvaAndSizes[4];
+  /* IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];  */
+  char  DataDirectory[16][2][4]; /* 16 entries, 2 elements/entry, 4 chars.  */
+} PEAOUTHDR;
+
+#undef AOUTSZ
+#define AOUTSZ (AOUTHDRSZ + 196)
+
+/* Like PEAOUTHDR, except that the "standard" member has no BaseOfData
+   (aka data_start) member and that some of the members are 8 instead
+   of just 4 bytes long.  */
+typedef struct 
+{
+#ifdef AOUTHDRSZ64
+  AOUTHDR64 standard;
+#else
+  AOUTHDR standard;
+#endif
+  /* NT extra fields; see internal.h for descriptions.  */
+  char  ImageBase[8];
+  char  SectionAlignment[4];
+  char  FileAlignment[4];
+  char  MajorOperatingSystemVersion[2];
+  char  MinorOperatingSystemVersion[2];
+  char  MajorImageVersion[2];
+  char  MinorImageVersion[2];
+  char  MajorSubsystemVersion[2];
+  char  MinorSubsystemVersion[2];
+  char  Reserved1[4];
+  char  SizeOfImage[4];
+  char  SizeOfHeaders[4];
+  char  CheckSum[4];
+  char  Subsystem[2];
+  char  DllCharacteristics[2];
+  char  SizeOfStackReserve[8];
+  char  SizeOfStackCommit[8];
+  char  SizeOfHeapReserve[8];
+  char  SizeOfHeapCommit[8];
+  char  LoaderFlags[4];
+  char  NumberOfRvaAndSizes[4];
+  /* IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];  */
+  char  DataDirectory[16][2][4]; /* 16 entries, 2 elements/entry, 4 chars.  */
+} PEPAOUTHDR;
+
+#ifdef AOUTHDRSZ64
+#define PEPAOUTSZ	(AOUTHDRSZ64 + 196 + 5 * 4) /* = 240 */
+#else
+#define PEPAOUTSZ	240
+#endif
+  
+#undef  E_FILNMLEN
+#define E_FILNMLEN	18	/* # characters in a file name.  */
+
+/* Import Tyoes fot ILF format object files..  */
+#define IMPORT_CODE	0
+#define IMPORT_DATA	1
+#define IMPORT_CONST	2
+
+/* Import Name Tyoes for ILF format object files.  */
+#define IMPORT_ORDINAL		0
+#define IMPORT_NAME		1
+#define IMPORT_NAME_NOPREFIX	2
+#define IMPORT_NAME_UNDECORATE	3
+
+/* Weak external characteristics.  */
+#define IMAGE_WEAK_EXTERN_SEARCH_NOLIBRARY	1
+#define IMAGE_WEAK_EXTERN_SEARCH_LIBRARY	2
+#define IMAGE_WEAK_EXTERN_SEARCH_ALIAS		3
+
+/* .pdata/.xdata defines and structures for x64 PE+ for exception handling.  */
+
+/* .pdata in exception directory.  */
+
+struct pex64_runtime_function
+{
+  bfd_vma rva_BeginAddress;
+  bfd_vma rva_EndAddress;
+  bfd_vma rva_UnwindData;
+  unsigned int isChained : 1;
+};
+
+struct external_pex64_runtime_function
+{
+  bfd_byte rva_BeginAddress[4];
+  bfd_byte rva_EndAddress[4];
+  bfd_byte rva_UnwindData[4];
+};
+
+/* If the lowest significant bit is set for rva_UnwindData RVA, it
+   means that the unified RVA points to another pex64_runtime_function
+   that this entry shares the unwind_info block with.  */
+#define PEX64_IS_RUNTIME_FUNCTION_CHAINED(PTR_RTF) \
+  (((PTR_RTF)->rva_UnwindData & 1) != 0)
+#define PEX64_GET_UNWINDDATA_UNIFIED_RVA(PTR_RTF) \
+  ((PTR_RTF)->rva_UnwindData & ~1)
+
+/* The unwind codes.  */
+#define UWOP_PUSH_NONVOL      0
+#define UWOP_ALLOC_LARGE      1
+#define UWOP_ALLOC_SMALL      2
+#define UWOP_SET_FPREG	      3
+#define UWOP_SAVE_NONVOL      4
+#define UWOP_SAVE_NONVOL_FAR  5
+#define UWOP_SAVE_XMM	      6
+#define UWOP_SAVE_XMM_FAR     7
+#define UWOP_SAVE_XMM128      8
+#define UWOP_SAVE_XMM128_FAR  9
+#define UWOP_PUSH_MACHFRAME   10
+
+struct pex64_unwind_code
+{
+  bfd_vma prologue_offset;
+  /* Contains Frame offset, or frame allocation size.  */
+  bfd_vma frame_addr;
+  unsigned int uwop_code : 4;
+  /* xmm, mm, or standard register from 0 - 15.  */
+  unsigned int reg : 4;
+  /* Used for UWOP_PUSH_MACHFRAME to indicate optional errorcode stack
+     argument.  */
+  unsigned int has_errorcode : 1;
+};
+
+struct external_pex64_unwind_code
+{
+  bfd_byte dta[2];
+};
+
+#define PEX64_UNWCODE_CODE(VAL)	((VAL) & 0xf)
+#define PEX64_UNWCODE_INFO(VAL) (((VAL) >> 4) & 0xf)
+
+/* The unwind info.  */
+#define UNW_FLAG_NHANDLER     0
+#define UNW_FLAG_EHANDLER     1
+#define UNW_FLAG_UHANDLER     2
+#define UNW_FLAG_FHANDLER     3
+#define UNW_FLAG_CHAININFO    4
+
+#define UNW_FLAG_MASK	      0x1f
+
+struct pex64_unwind_info
+{
+  bfd_vma SizeOfBlock;
+  bfd_byte Version; /* Values from 0 up to 7 are possible.  */
+  bfd_byte Flags; /* Values from 0 up to 31 are possible.  */
+  bfd_vma SizeOfPrologue;
+  bfd_vma CountOfCodes; /* Amount of pex64_unwind_code elements.  */
+  /* 0 = CFA, 1..15 are index of integer registers.  */
+  unsigned int FrameRegister : 4;
+  bfd_vma FrameOffset;
+  bfd_vma sizeofUnwindCodes;
+  bfd_byte *rawUnwindCodes;
+  /* Valid for UNW_FLAG_EHANDLER and UNW_FLAG_UHANDLER.  */
+  bfd_vma CountOfScopes;
+  bfd_byte *rawScopeEntries;
+  bfd_vma rva_ExceptionHandler; /* UNW_EHANDLER.  */
+  bfd_vma rva_TerminationHandler; /* UNW_FLAG_UHANDLER.  */
+  bfd_vma rva_FrameHandler; /* UNW_FLAG_FHANDLER.  */
+  bfd_vma FrameHandlerArgument; /* UNW_FLAG_FHANDLER.  */
+  bfd_vma rva_FunctionEntry; /* UNW_FLAG_CHAININFO.  */
+};
+
+struct external_pex64_unwind_info
+{
+  bfd_byte Version_Flags;
+  bfd_byte SizeOfPrologue;
+  bfd_byte CountOfCodes;
+  bfd_byte FrameRegisterOffset;
+  /* external_pex64_unwind_code array.  */
+  /* bfd_byte handler[4];  */
+  /* Optional language specific data.  */
+};
+
+struct external_pex64_scope
+{
+  bfd_vma Count;
+};
+
+struct pex64_scope
+{
+  bfd_byte Count[4];
+};
+
+struct pex64_scope_entry
+{
+  bfd_vma rva_BeginAddress;
+  bfd_vma rva_EndAddress;
+  bfd_vma rva_HandlerAddress;
+  bfd_vma rva_JumpAddress;
+};
+#define PEX64_SCOPE_ENTRY_SIZE	16
+
+struct external_pex64_scope_entry
+{
+  bfd_byte rva_BeginAddress[4];
+  bfd_byte rva_EndAddress[4];
+  bfd_byte rva_HandlerAddress[4];
+  bfd_byte rva_JumpAddress[4];
+};
+
+#define PEX64_UWI_VERSION(VAL)	((VAL) & 7)
+#define PEX64_UWI_FLAGS(VAL)	(((VAL) >> 3) & 0x1f)
+#define PEX64_UWI_FRAMEREG(VAL)	((VAL) & 0xf)
+#define PEX64_UWI_FRAMEOFF(VAL)	(((VAL) >> 4) & 0xf)
+#define PEX64_UWI_SIZEOF_UWCODE_ARRAY(VAL) \
+  ((((VAL) + 1) & ~1) * 2)
+
+#define PEX64_OFFSET_TO_UNWIND_CODE 0x4
+
+#define PEX64_OFFSET_TO_HANDLER_RVA (COUNTOFUNWINDCODES) \
+  (PEX64_OFFSET_TO_UNWIND_CODE + \
+   PEX64_UWI_SIZEOF_UWCODE_ARRAY(COUNTOFUNWINDCODES))
+
+#define PEX64_OFFSET_TO_SCOPE_COUNT(COUNTOFUNWINDCODES) \
+  (PEX64_OFFSET_TO_HANDLER_RVA(COUNTOFUNWINDCODES) + 4)
+
+#define PEX64_SCOPE_ENTRY(COUNTOFUNWINDCODES, IDX) \
+  (PEX64_OFFSET_TO_SCOPE_COUNT(COUNTOFUNWINDCODES) + \
+   PEX64_SCOPE_ENTRY_SIZE * (IDX))
+
+#endif /* _PE_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/powerpc.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/powerpc.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/powerpc.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/powerpc.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,59 @@
+/* Basic coff information for the PowerPC
+   Based on coff/rs6000.h, coff/i386.h and others.
+   
+   Copyright 2001, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.
+ 
+   Initial release: Kim Knuttila (krk@cygnus.com)  */
+#define L_LNNO_SIZE 2
+#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
+#include "coff/external.h"
+
+/* Bits for f_flags:
+ 	F_RELFLG	relocation info stripped from file
+ 	F_EXEC		file is executable (no unresolved external references)
+ 	F_LNNO		line numbers stripped from file
+ 	F_LSYMS		local symbols stripped from file
+ 	F_AR32WR	file has byte ordering of an AR32WR machine (e.g. vax).  */
+
+#define F_RELFLG	(0x0001)
+#define F_EXEC		(0x0002)
+#define F_LNNO		(0x0004)
+#define F_LSYMS		(0x0008)
+
+/* extra NT defines */
+#define PPCMAGIC       0760         /* peeked on aa PowerPC Windows NT box */
+#define DOSMAGIC       0x5a4d       /* from arm.h, i386.h */
+#define NT_SIGNATURE   0x00004550   /* from arm.h, i386.h */
+
+/* from winnt.h */
+#define IMAGE_NT_OPTIONAL_HDR_MAGIC        0x10b
+
+#define PPCBADMAG(x) ((x).f_magic != PPCMAGIC) 
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_type[2];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 10
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/rs6000.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/rs6000.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/rs6000.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/rs6000.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,293 @@
+/* IBM RS/6000 "XCOFF" file definitions for BFD.
+   Copyright (C) 1990, 1991, 2001, 2010 Free Software Foundation, Inc.
+   Written by Mimi Phuong-Thao Vo of IBM
+   and John Gilmore of Cygnus Support.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/********************** FILE HEADER **********************/
+
+struct external_filehdr {
+	char f_magic[2];	/* magic number			*/
+	char f_nscns[2];	/* number of sections		*/
+	char f_timdat[4];	/* time & date stamp		*/
+	char f_symptr[4];	/* file pointer to symtab	*/
+	char f_nsyms[4];	/* number of symtab entries	*/
+	char f_opthdr[2];	/* sizeof(optional hdr)		*/
+	char f_flags[2];	/* flags			*/
+};
+
+        /* IBM RS/6000 */
+#define U802WRMAGIC     0730    /* writeable text segments **chh**      */
+#define U802ROMAGIC     0735    /* readonly sharable text segments      */
+#define U802TOCMAGIC    0737    /* readonly text segments and TOC       */
+
+#define BADMAG(x)	\
+	((x).f_magic != U802ROMAGIC && (x).f_magic != U802WRMAGIC && \
+	 (x).f_magic != U802TOCMAGIC)
+
+#define	FILHDR	struct external_filehdr
+#define	FILHSZ	20
+
+
+/********************** AOUT "OPTIONAL HEADER" **********************/
+
+
+typedef struct 
+{
+  unsigned char	magic[2];	/* type of file			*/
+  unsigned char	vstamp[2];	/* version stamp		*/
+  unsigned char	tsize[4];	/* text size in bytes, padded to FW bdry */
+  unsigned char	dsize[4];	/* initialized data "  "	*/
+  unsigned char	bsize[4];	/* uninitialized data "   "	*/
+  unsigned char	entry[4];	/* entry pt.			*/
+  unsigned char	text_start[4];	/* base of text used for this file */
+  unsigned char	data_start[4];	/* base of data used for this file */
+  unsigned char	o_toc[4];	/* address of TOC */
+  unsigned char	o_snentry[2];	/* section number of entry point */
+  unsigned char	o_sntext[2];	/* section number of .text section */
+  unsigned char	o_sndata[2];	/* section number of .data section */
+  unsigned char	o_sntoc[2];	/* section number of TOC */
+  unsigned char	o_snloader[2];	/* section number of .loader section */
+  unsigned char	o_snbss[2];	/* section number of .bss section */
+  unsigned char	o_algntext[2];	/* .text alignment */
+  unsigned char	o_algndata[2];	/* .data alignment */
+  unsigned char	o_modtype[2];	/* module type (??) */
+  unsigned char o_cputype[2];	/* cpu type */
+  unsigned char	o_maxstack[4];	/* max stack size (??) */
+  unsigned char o_maxdata[4];	/* max data size (??) */
+  unsigned char	o_resv2[12];	/* reserved */
+}
+AOUTHDR;
+
+#define AOUTSZ 72
+#define SMALL_AOUTSZ (28)
+#define AOUTHDRSZ 72
+
+/********************** SECTION HEADER **********************/
+
+
+struct external_scnhdr {
+	char		s_name[8];	/* section name			*/
+	char		s_paddr[4];	/* physical address, aliased s_nlib */
+	char		s_vaddr[4];	/* virtual address		*/
+	char		s_size[4];	/* section size			*/
+	char		s_scnptr[4];	/* file ptr to raw data for section */
+	char		s_relptr[4];	/* file ptr to relocation	*/
+	char		s_lnnoptr[4];	/* file ptr to line numbers	*/
+	char		s_nreloc[2];	/* number of relocation entries	*/
+	char		s_nlnno[2];	/* number of line number entries*/
+	char		s_flags[4];	/* flags			*/
+};
+
+#define	SCNHDR	struct external_scnhdr
+#define	SCNHSZ	40
+
+/********************** LINE NUMBERS **********************/
+
+/* 1 line number entry for every "breakpointable" source line in a section.
+ * Line numbers are grouped on a per function basis; first entry in a function
+ * grouping will have l_lnno = 0 and in place of physical address will be the
+ * symbol table index of the function name.
+ */
+struct external_lineno {
+	union {
+		char l_symndx[4];	/* function name symbol index, iff l_lnno == 0*/
+		char l_paddr[4];	/* (physical) address of line number	*/
+	} l_addr;
+	char l_lnno[2];	/* line number		*/
+};
+
+
+#define	LINENO	struct external_lineno
+#define	LINESZ	6
+
+
+/********************** SYMBOLS **********************/
+
+#define E_SYMNMLEN	8	/* # characters in a symbol name	*/
+#define E_FILNMLEN	14	/* # characters in a file name		*/
+#define E_DIMNUM	4	/* # array dimensions in auxiliary entry */
+
+struct external_syment 
+{
+  union {
+    char e_name[E_SYMNMLEN];
+    struct {
+      char e_zeroes[4];
+      char e_offset[4];
+    } e;
+  } e;
+  char e_value[4];
+  char e_scnum[2];
+  char e_type[2];
+  char e_sclass[1];
+  char e_numaux[1];
+};
+
+
+
+#define N_BTMASK	(017)
+#define N_TMASK		(060)
+#define N_BTSHFT	(4)
+#define N_TSHIFT	(2)
+  
+
+union external_auxent {
+	struct {
+		char x_tagndx[4];	/* str, un, or enum tag indx */
+		union {
+			struct {
+			    char  x_lnno[2]; /* declaration line number */
+			    char  x_size[2]; /* str/union/array size */
+			} x_lnsz;
+			char x_fsize[4];	/* size of function */
+		} x_misc;
+		union {
+			struct {		/* if ISFCN, tag, or .bb */
+			    char x_lnnoptr[4];	/* ptr to fcn line # */
+			    char x_endndx[4];	/* entry ndx past block end */
+			} x_fcn;
+			struct {		/* if ISARY, up to 4 dimen. */
+			    char x_dimen[E_DIMNUM][2];
+			} x_ary;
+		} x_fcnary;
+		char x_tvndx[2];		/* tv index */
+	} x_sym;
+
+        struct {
+                union {
+                        char x_fname[E_FILNMLEN];
+                        struct {
+                                char x_zeroes[4];
+                                char x_offset[4];
+                        } x_n;
+                } x_n;
+                char x_ftype[1];
+        } x_file;
+
+	struct {
+		char x_scnlen[4];			/* section length */
+		char x_nreloc[2];	/* # relocation entries */
+		char x_nlinno[2];	/* # line numbers */
+	} x_scn;
+
+        struct {
+		char x_tvfill[4];	/* tv fill value */
+		char x_tvlen[2];	/* length of .tv */
+		char x_tvran[2][2];	/* tv range */
+	} x_tv;		/* info about .tv section (in auxent of symbol .tv)) */
+
+	struct {
+		unsigned char x_scnlen[4];
+		unsigned char x_parmhash[4];
+		unsigned char x_snhash[2];
+		unsigned char x_smtyp[1];
+		unsigned char x_smclas[1];
+		unsigned char x_stab[4];
+		unsigned char x_snstab[2];
+	} x_csect;
+
+};
+
+#define	SYMENT	struct external_syment
+#define	SYMESZ	18	
+#define	AUXENT	union external_auxent
+#define	AUXESZ	18
+#define DBXMASK 0x80		/* for dbx storage mask */
+#define SYMNAME_IN_DEBUG(symptr) ((symptr)->n_sclass & DBXMASK)
+
+
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+
+struct external_reloc {
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_size[1];
+  char r_type[1];
+};
+
+
+#define RELOC struct external_reloc
+#define RELSZ 10
+
+#define DEFAULT_DATA_SECTION_ALIGNMENT 4
+#define DEFAULT_BSS_SECTION_ALIGNMENT 4
+#define DEFAULT_TEXT_SECTION_ALIGNMENT 4
+/* For new sections we havn't heard of before */
+#define DEFAULT_SECTION_ALIGNMENT 4
+
+/* The ldhdr structure.  This appears at the start of the .loader
+   section.  */
+
+struct external_ldhdr
+{
+  bfd_byte l_version[4];
+  bfd_byte l_nsyms[4];
+  bfd_byte l_nreloc[4];
+  bfd_byte l_istlen[4];
+  bfd_byte l_nimpid[4];
+  bfd_byte l_impoff[4];
+  bfd_byte l_stlen[4];
+  bfd_byte l_stoff[4];
+};
+
+#define LDHDRSZ (8 * 4)
+
+struct external_ldsym
+{
+  union
+    {
+      bfd_byte _l_name[E_SYMNMLEN];
+      struct
+	{
+	  bfd_byte _l_zeroes[4];
+	  bfd_byte _l_offset[4];
+	} _l_l;
+    } _l;
+  bfd_byte l_value[4];
+  bfd_byte l_scnum[2];
+  bfd_byte l_smtype[1];
+  bfd_byte l_smclas[1];
+  bfd_byte l_ifile[4];
+  bfd_byte l_parm[4];
+};
+
+#define LDSYMSZ (8 + 3 * 4 + 2 + 2)
+
+struct external_ldrel
+{
+  bfd_byte l_vaddr[4];
+  bfd_byte l_symndx[4];
+  bfd_byte l_rtype[2];
+  bfd_byte l_rsecnm[2];
+};
+
+#define LDRELSZ (2 * 4 + 2 * 2)
+
+struct external_exceptab
+{
+  union {
+    bfd_byte e_symndx[4];
+    bfd_byte e_paddr[4];
+  } e_addr;
+  bfd_byte e_lang[1];
+  bfd_byte e_reason[1];
+};
+
+#define EXCEPTSZ (4 + 2)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/rs6k64.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/rs6k64.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/rs6k64.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/rs6k64.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,275 @@
+/* IBM RS/6000 "XCOFF64" file definitions for BFD.
+   Copyright (C) 2000, 2001, 2002, 2010 Free Software Foundation, Inc.  
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/********************** FILE HEADER **********************/
+
+struct external_filehdr
+{
+  char f_magic[2];	/* magic number			*/
+  char f_nscns[2];	/* number of sections		*/
+  char f_timdat[4];	/* time & date stamp		*/
+  char f_symptr[8];	/* file pointer to symtab 	*/
+  char f_opthdr[2];	/* sizeof(optional hdr)		*/
+  char f_flags[2];	/* flags			*/
+  char f_nsyms[4];	/* number of symtab entries	*/
+};
+
+/* IBM RS/6000.  */
+#define U803XTOCMAGIC 0757	/* Aix 4.3 64-bit XCOFF */
+#define	U64_TOCMAGIC  0767	/* AIX 5+ 64-bit XCOFF */
+#define BADMAG(x) ((x).f_magic != U803XTOCMAGIC && (x).f_magic != U64_TOCMAGIC)
+
+#define	FILHDR	struct external_filehdr
+#define	FILHSZ	24
+
+/********************** AOUT "OPTIONAL HEADER" **********************/
+
+typedef struct 
+{
+  unsigned char	magic[2];		/* type of file			*/
+  unsigned char	vstamp[2];		/* version stamp		*/
+  unsigned char	o_debugger[4];		/* reserved 			*/
+  unsigned char	text_start[8];		/* base of text used for this file */
+  unsigned char	data_start[8];		/* base of data used for this file */
+  unsigned char	o_toc[8];		/* address of TOC */
+  unsigned char	o_snentry[2];		/* section number of entry point */
+  unsigned char	o_sntext[2];		/* section number of .text section */
+  unsigned char	o_sndata[2];		/* section number of .data section */
+  unsigned char	o_sntoc[2];		/* section number of TOC */
+  unsigned char	o_snloader[2];		/* section number of .loader section */
+  unsigned char	o_snbss[2];		/* section number of .bss section */
+  unsigned char	o_algntext[2];		/* .text alignment */
+  unsigned char	o_algndata[2];		/* .data alignment */
+  unsigned char	o_modtype[2];		/* module type (??) */
+  unsigned char o_cputype[2];		/* cpu type */
+  unsigned char	o_resv2[4];		/* reserved 			*/
+  unsigned char	tsize[8];		/* text size bytes, padded to FW bdry */
+  unsigned char	dsize[8];		/* initialized data "  "	*/
+  unsigned char	bsize[8];		/* uninitialized data "   "	*/
+  unsigned char	entry[8];		/* entry pt.			*/
+  unsigned char	o_maxstack[8];		/* max stack size (??) 		*/
+  unsigned char o_maxdata[8];		/* max data size (??) 		*/
+  unsigned char	o_resv3[16];		/* reserved 			*/
+}
+AOUTHDR;
+
+#define AOUTSZ 120
+#define SMALL_AOUTSZ (0)
+#define AOUTHDRSZ 72
+
+/********************** SECTION HEADER **********************/
+
+struct external_scnhdr
+{
+  char	s_name[8];	/* section name			*/
+  char	s_paddr[8];	/* physical address, aliased s_nlib */
+  char	s_vaddr[8];	/* virtual address		*/
+  char	s_size[8];	/* section size			*/
+  char	s_scnptr[8];	/* file ptr to raw data for section */
+  char	s_relptr[8];	/* file ptr to relocation	*/
+  char	s_lnnoptr[8];	/* file ptr to line numbers	*/
+  char	s_nreloc[4];	/* number of relocation entries	*/
+  char	s_nlnno[4];	/* number of line number entries*/
+  char	s_flags[4];	/* flags			*/
+  char  s_pad[4];	/* padding */  
+};
+
+#define	SCNHDR	struct external_scnhdr
+
+#define	SCNHSZ	72
+
+/********************** LINE NUMBERS **********************/
+
+/* 1 line number entry for every "breakpointable" source line in a section.
+   Line numbers are grouped on a per function basis; first entry in a function
+   grouping will have l_lnno = 0 and in place of physical address will be the
+   symbol table index of the function name.  */
+
+struct external_lineno
+{
+  union
+  {
+    char l_symndx[4];	/* function name symbol index, iff l_lnno == 0*/
+    char l_paddr[8];	/* (physical) address of line number	*/
+  } l_addr;
+
+  char l_lnno[4];	/* line number		*/
+};
+
+#define	LINENO	struct external_lineno
+
+#define	LINESZ	12
+
+/********************** SYMBOLS **********************/
+
+#define E_SYMNMLEN	8	/* # characters in a symbol name	*/
+#define E_FILNMLEN	14	/* # characters in a file name		*/
+#define E_DIMNUM	4	/* # array dimensions in auxiliary entry */
+
+struct external_syment 
+{
+  char e_value[8];
+  char e_offset[4];
+  char e_scnum[2];
+  char e_type[2];
+  char e_sclass[1];
+  char e_numaux[1];
+};
+
+#define N_BTMASK	(017)
+#define N_TMASK		(060)
+#define N_BTSHFT	(4)
+#define N_TSHIFT	(2)
+
+union external_auxent
+{
+    struct {
+    	union {
+	    struct {
+		char x_lnno[4]; 	/* declaration line number */
+		char x_size[2]; 	/* str/union/array size */
+	    } x_lnsz;
+	    struct {
+		char x_lnnoptr[8];/* ptr to fcn line */
+		char x_fsize[4];	 /* size of function */
+		char x_endndx[4];	 /* entry ndx past block end */
+	    } x_fcn;
+ 	} x_fcnary;
+    } x_sym;
+         
+    struct {
+        union {
+            char x_fname[E_FILNMLEN];
+            struct {
+	        char x_zeroes[4];
+                char x_offset[4];
+	        char x_pad[6];
+            } x_n;
+        } x_n;
+        unsigned char x_ftype[1];
+        unsigned char x_resv[2];
+    } x_file;
+
+    struct {
+	char x_exptr[8];
+	char x_fsize[4];
+	char x_endndx[4];
+	char x_pad[1];
+    } x_except;
+
+    struct {
+	    unsigned char x_scnlen_lo[4];
+	    unsigned char x_parmhash[4];
+	    unsigned char x_snhash[2];
+	    unsigned char x_smtyp[1];
+	    unsigned char x_smclas[1];
+	    unsigned char x_scnlen_hi[4];
+	    unsigned char x_pad[1];
+    } x_csect;	
+
+    struct {
+	char x_pad[17];
+	char x_auxtype[1];
+    } x_auxtype;
+};
+
+#define	SYMENT	struct external_syment
+#define	SYMESZ	18	
+#define	AUXENT	union external_auxent
+#define	AUXESZ	18
+#define DBXMASK 0x80		/* for dbx storage mask */
+#define SYMNAME_IN_DEBUG(symptr) ((symptr)->n_sclass & DBXMASK)
+
+/* Values for auxtype field in XCOFF64, taken from AIX 4.3 sym.h.  */
+#define _AUX_EXCEPT     255
+#define _AUX_FCN        254
+#define _AUX_SYM        253
+#define _AUX_FILE       252
+#define _AUX_CSECT      251
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+struct external_reloc
+{
+  char r_vaddr[8];
+  char r_symndx[4];
+  char r_size[1];
+  char r_type[1];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 14
+
+#define DEFAULT_DATA_SECTION_ALIGNMENT 4
+#define DEFAULT_BSS_SECTION_ALIGNMENT 4
+#define DEFAULT_TEXT_SECTION_ALIGNMENT 4
+/* For new sections we havn't heard of before */
+#define DEFAULT_SECTION_ALIGNMENT 4
+
+/* The ldhdr structure.  This appears at the start of the .loader
+   section.  */
+
+struct external_ldhdr
+{
+  bfd_byte l_version[4];
+  bfd_byte l_nsyms[4];
+  bfd_byte l_nreloc[4];
+  bfd_byte l_istlen[4];
+  bfd_byte l_nimpid[4];
+  bfd_byte l_stlen[4];
+  bfd_byte l_impoff[8];
+  bfd_byte l_stoff[8];
+  bfd_byte l_symoff[8];
+  bfd_byte l_rldoff[8];
+};
+#define LDHDRSZ (56)
+
+struct external_ldsym
+{
+  bfd_byte l_value[8];
+  bfd_byte l_offset[4];
+  bfd_byte l_scnum[2];
+  bfd_byte l_smtype[1];
+  bfd_byte l_smclas[1];
+  bfd_byte l_ifile[4];
+  bfd_byte l_parm[4];
+};
+
+#define LDSYMSZ (24)
+
+struct external_ldrel
+{
+  bfd_byte l_vaddr[8];
+  bfd_byte l_rtype[2];
+  bfd_byte l_rsecnm[2];
+  bfd_byte l_symndx[4];
+};
+
+#define LDRELSZ (16)
+
+struct external_exceptab
+{
+  union {
+    bfd_byte e_symndx[4];
+    bfd_byte e_paddr[8];
+  } e_addr;
+  bfd_byte e_lang[1];
+  bfd_byte e_reason[1];
+};
+
+#define EXCEPTSZ (10)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/sh.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/sh.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/sh.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/sh.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,148 @@
+/* coff information for Renesas SH
+   
+   Copyright 2000, 2003, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifdef COFF_WITH_PE
+#define L_LNNO_SIZE 2
+#else
+#define L_LNNO_SIZE 4
+#endif
+#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
+#include "coff/external.h"
+
+#define	SH_ARCH_MAGIC_BIG	0x0500
+#define	SH_ARCH_MAGIC_LITTLE	0x0550  /* Little endian SH */
+#define SH_ARCH_MAGIC_WINCE	0x01a2  /* Windows CE - little endian */
+#define SH_PE_MAGIC		0x010b
+
+#define SHBADMAG(x) \
+ (((x).f_magic != SH_ARCH_MAGIC_BIG) && \
+  ((x).f_magic != SH_ARCH_MAGIC_WINCE) && \
+  ((x).f_magic != SH_ARCH_MAGIC_LITTLE))
+
+/* Define some NT default values.  */
+/*  #define NT_IMAGE_BASE        0x400000 moved to internal.h */
+#define NT_SECTION_ALIGNMENT 0x1000
+#define NT_FILE_ALIGNMENT    0x200
+#define NT_DEF_RESERVE       0x100000
+#define NT_DEF_COMMIT        0x1000
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+/* The external reloc has an offset field, because some of the reloc
+   types on the h8 don't have room in the instruction for the entire
+   offset - eg the strange jump and high page addressing modes.  */
+
+#ifndef COFF_WITH_PE
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_offset[4];
+  char r_type[2];
+  char r_stuff[2];
+};
+#else
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_type[2];
+};
+#endif
+
+#define RELOC struct external_reloc
+#ifdef COFF_WITH_PE
+#define RELSZ 10
+#else
+#define RELSZ 16
+#endif
+
+/* SH relocation types.  Not all of these are actually used.  */
+
+#define R_SH_UNUSED	0		/* only used internally */
+#define R_SH_IMM32CE	2		/* 32 bit immediate for WinCE */
+#define R_SH_PCREL8 	3		/*  8 bit pcrel 	*/
+#define R_SH_PCREL16 	4		/* 16 bit pcrel 	*/
+#define R_SH_HIGH8  	5		/* high 8 bits of 24 bit address */
+#define R_SH_LOW16 	7		/* low 16 bits of 24 bit immediate */
+#define R_SH_IMM24	6		/* 24 bit immediate */
+#define R_SH_PCDISP8BY4	9  		/* PC rel 8 bits *4 +ve */
+#define R_SH_PCDISP8BY2	10  		/* PC rel 8 bits *2 +ve */
+#define R_SH_PCDISP8    11  		/* 8 bit branch */
+#define R_SH_PCDISP     12  		/* 12 bit branch */
+#define R_SH_IMM32      14    		/* 32 bit immediate */
+#define R_SH_IMM8   	16		/* 8 bit immediate */
+#define R_SH_IMAGEBASE	16		/* Windows CE */
+#define R_SH_IMM8BY2    17		/* 8 bit immediate *2 */
+#define R_SH_IMM8BY4    18		/* 8 bit immediate *4 */
+#define R_SH_IMM4   	19		/* 4 bit immediate */
+#define R_SH_IMM4BY2    20		/* 4 bit immediate *2 */
+#define R_SH_IMM4BY4    21		/* 4 bit immediate *4 */
+#define R_SH_PCRELIMM8BY2   22		/* PC rel 8 bits *2 unsigned */
+#define R_SH_PCRELIMM8BY4   23		/* PC rel 8 bits *4 unsigned */
+#define R_SH_IMM16      24    		/* 16 bit immediate */
+
+/* The switch table reloc types are used for relaxing.  They are
+   generated for expressions such as
+     .word L1 - L2
+   The r_offset field holds the difference between the reloc address
+   and L2.  */
+#define R_SH_SWITCH8	33		/* 8 bit switch table entry */
+#define R_SH_SWITCH16	25		/* 16 bit switch table entry */
+#define R_SH_SWITCH32	26		/* 32 bit switch table entry */
+
+/* The USES reloc type is used for relaxing.  The compiler will
+   generate .uses pseudo-ops when it finds a function call which it
+   can relax.  The r_offset field of the USES reloc holds the PC
+   relative offset to the instruction which loads the register used in
+   the function call.  */
+#define R_SH_USES	27		/* .uses pseudo-op */
+
+/* The COUNT reloc type is used for relaxing.  The assembler will
+   generate COUNT relocs for addresses referred to by the register
+   loads associated with USES relocs.  The r_offset field of the COUNT
+   reloc holds the number of times the address is referenced in the
+   object file.  */
+#define R_SH_COUNT	28		/* Count of constant pool uses */
+
+/* The ALIGN reloc type is used for relaxing.  The r_offset field is
+   the power of two to which subsequent portions of the object file
+   must be aligned.  */
+#define R_SH_ALIGN	29		/* .align pseudo-op */
+
+/* The CODE and DATA reloc types are used for aligning load and store
+   instructions.  The assembler will generate a CODE reloc before a
+   block of instructions.  It will generate a DATA reloc before data.
+   A section should be processed assuming it contains data, unless a
+   CODE reloc is seen.  The only relevant pieces of information in the
+   CODE and DATA relocs are the section and the address.  The symbol
+   and offset are meaningless.  */
+#define R_SH_CODE	30		/* start of code */
+#define R_SH_DATA	31		/* start of data */
+
+/* The LABEL reloc type is used for aligning load and store
+   instructions.  The assembler will generate a LABEL reloc for each
+   label within a block of instructions.  This permits the linker to
+   avoid swapping instructions which are the targets of branches.  */
+#define R_SH_LABEL	32		/* label */
+
+/* NB: R_SH_SWITCH8 is 33 */
+
+#define R_SH_LOOP_START	34
+#define R_SH_LOOP_END	35
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/sparc.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/sparc.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/sparc.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/sparc.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,156 @@
+/* coff information for Sparc.
+   
+   Copyright 2001, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file is an amalgamation of several standard include files that
+   define coff format, such as filehdr.h, aouthdr.h, and so forth.  In
+   addition, all datatypes have been translated into character arrays of
+   (presumed) equivalent size.  This is necessary so that this file can
+   be used with different systems while still yielding the same results.  */
+
+#define L_LNNO_SIZE 2
+#define DO_NOT_DEFINE_SYMENT
+#define DO_NOT_DEFINE_AUXENT
+#include "coff/external.h"
+
+#define F_RELFLG	(0x0001)	/* relocation info stripped */
+#define F_EXEC		(0x0002)	/* file is executable */
+#define F_LNNO		(0x0004)	/* line numbers stripped */
+#define F_LSYMS		(0x0008)	/* local symbols stripped */
+
+#define SPARCMAGIC	(0540)
+
+/* This is Lynx's all-platform magic number for executables. */
+
+#define LYNXCOFFMAGIC	(0415)
+
+#define OMAGIC          0404    /* object files, eg as output */
+#define ZMAGIC          0413    /* demand load format, eg normal ld output */
+#define STMAGIC		0401	/* target shlib */
+#define SHMAGIC		0443	/* host   shlib */
+
+/* More names of "special" sections. */
+
+#define _TV	".tv"
+#define _INIT	".init"
+#define _FINI	".fini"
+
+/********************** SYMBOLS **********************/
+
+#define E_SYMNMLEN	(8)	/* # characters in a symbol name	*/
+#define E_FILNMLEN	(14)	/* # characters in a file name		*/
+#define E_DIMNUM	(4)	/* # array dimensions in auxiliary entry */
+
+struct external_syment 
+{
+  union {
+    char e_name[E_SYMNMLEN];
+    struct {
+      char e_zeroes[4];
+      char e_offset[4];
+    } e;
+#if 0 /* of doubtful value */
+    char e_nptr[2][4];
+    struct {
+      char e_leading_zero[1];
+      char e_dbx_type[1];
+      char e_dbx_desc[2];
+    } e_dbx;
+#endif
+  } e;
+
+  char e_value[4];
+  char e_scnum[2];
+  char e_type[2];
+  char e_sclass[1];
+  char e_numaux[1];
+  char padding[2];
+};
+
+#define N_BTMASK	(0xf)
+#define N_TMASK		(0x30)
+#define N_BTSHFT	(4)
+#define N_TSHIFT	(2)
+  
+union external_auxent
+{
+  struct {
+    char x_tagndx[4];		/* str, un, or enum tag indx */
+    union {
+      struct {
+	char  x_lnno[2];	/* declaration line number */
+	char  x_size[2];	/* str/union/array size */
+      } x_lnsz;
+      char x_fsize[4];		/* size of function */
+    } x_misc;
+    union {
+      struct {			/* if ISFCN, tag, or .bb */
+	char x_lnnoptr[4];	/* ptr to fcn line # */
+	char x_endndx[4];	/* entry ndx past block end */
+      } x_fcn;
+      struct {		/* if ISARY, up to 4 dimen. */
+	char x_dimen[E_DIMNUM][2];
+      } x_ary;
+    } x_fcnary;
+    char x_tvndx[2];		/* tv index */
+  } x_sym;
+  
+  union {
+    char x_fname[E_FILNMLEN];
+    struct {
+      char x_zeroes[4];
+      char x_offset[4];
+    } x_n;
+  } x_file;
+  
+  struct {
+    char x_scnlen[4];		/* section length */
+    char x_nreloc[2];		/* # relocation entries */
+    char x_nlinno[2];		/* # line numbers */
+  } x_scn;
+  
+  struct {
+    char x_tvfill[4];		/* tv fill value */
+    char x_tvlen[2];		/* length of .tv */
+    char x_tvran[2][2];		/* tv range */
+  } x_tv;			/* .tv section info (in auxent of sym .tv)) */
+
+  char x_fill[20];		/* forces to 20-byte size */
+};
+
+#define	SYMENT	struct external_syment
+#define	SYMESZ	20	
+#define	AUXENT	union external_auxent
+#define	AUXESZ	20
+
+#define _ETEXT	"etext"
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_type[2];
+  char r_spare[2];
+  char r_offset[4];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 16
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/sym.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/sym.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/sym.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/sym.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,484 @@
+/* Declarations of internal format of MIPS ECOFF symbols.
+   Originally contributed by MIPS Computer Systems and Third Eye Software.
+   Changes contributed by Cygnus Support are in the public domain.  
+
+   This file is just aggregated with the files that make up the GNU
+   release; it is not considered part of GAS, GDB, or other GNU
+   programs.  */
+
+/*
+ * |-----------------------------------------------------------|
+ * | Copyright (c) 1992, 1991, 1990 MIPS Computer Systems, Inc.|
+ * | MIPS Computer Systems, Inc. grants reproduction and use   |
+ * | rights to all parties, PROVIDED that this comment is      |
+ * | maintained in the copy.                                   |
+ * |-----------------------------------------------------------|
+ */
+#ifndef _SYM_H
+#define _SYM_H
+
+/* (C) Copyright 1984 by Third Eye Software, Inc.
+ *
+ * Third Eye Software, Inc. grants reproduction and use rights to
+ * all parties, PROVIDED that this comment is maintained in the copy.
+ *
+ * Third Eye makes no claims about the applicability of this
+ * symbol table to a particular use.
+ */
+
+/* 
+ * This file contains the definition of the Third Eye Symbol Table.
+ *
+ * Symbols are assumed to be in 'encounter order' - i.e. the order that
+ * the things they represent were encountered by the compiler/assembler/loader.
+ * EXCEPT for globals!	These are assumed to be bunched together,
+ * probably right after the last 'normal' symbol.  Globals ARE sorted
+ * in ascending order.
+ *
+ * -----------------------------------------------------------------------
+ * A brief word about Third Eye naming/use conventions:
+ *
+ * All arrays and index's are 0 based.
+ * All "ifooMax" values are the highest legal value PLUS ONE. This makes
+ * them good for allocating arrays, etc. All checks are "ifoo < ifooMax".
+ *
+ * "isym"	Index into the SYMbol table.
+ * "ipd"	Index into the Procedure Descriptor array.
+ * "ifd"	Index into the File Descriptor array.
+ * "iss"	Index into String Space.
+ * "cb"		Count of Bytes.
+ * "rgPd"	array whose domain is "0..ipdMax-1" and RanGe is PDR.
+ * "rgFd"	array whose domain is "0..ifdMax-1" and RanGe is FDR.
+ */
+
+
+/* 
+ * Symbolic Header (HDR) structure.
+ * As long as all the pointers are set correctly,
+ * we don't care WHAT order the various sections come out in!
+ *
+ * A file produced solely for the use of CDB will probably NOT have
+ * any instructions or data areas in it, as these are available
+ * in the original.
+ */
+
+typedef struct {
+	short	magic;		/* to verify validity of the table */
+	short	vstamp;		/* version stamp */
+	long	ilineMax;	/* number of line number entries */
+	bfd_vma	cbLine;		/* number of bytes for line number entries */
+	bfd_vma	cbLineOffset;	/* offset to start of line number entries*/
+	long	idnMax;		/* max index into dense number table */
+	bfd_vma	cbDnOffset;	/* offset to start dense number table */
+	long	ipdMax;		/* number of procedures */
+	bfd_vma	cbPdOffset;	/* offset to procedure descriptor table */
+	long	isymMax;	/* number of local symbols */
+	bfd_vma	cbSymOffset;	/* offset to start of local symbols*/
+	long	ioptMax;	/* max index into optimization symbol entries */
+	bfd_vma	cbOptOffset;	/* offset to optimization symbol entries */
+	long	iauxMax;	/* number of auxillary symbol entries */
+	bfd_vma	cbAuxOffset;	/* offset to start of auxillary symbol entries*/
+	long	issMax;		/* max index into local strings */
+	bfd_vma	cbSsOffset;	/* offset to start of local strings */
+	long	issExtMax;	/* max index into external strings */
+	bfd_vma	cbSsExtOffset;	/* offset to start of external strings */
+	long	ifdMax;		/* number of file descriptor entries */
+	bfd_vma	cbFdOffset;	/* offset to file descriptor table */
+	long	crfd;		/* number of relative file descriptor entries */
+	bfd_vma	cbRfdOffset;	/* offset to relative file descriptor table */
+	long	iextMax;	/* max index into external symbols */
+	bfd_vma	cbExtOffset;	/* offset to start of external symbol entries*/
+	/* If you add machine dependent fields, add them here */
+	} HDRR, *pHDRR; 
+#define cbHDRR sizeof(HDRR)
+#define hdrNil ((pHDRR)0)
+
+/*
+ * The FDR and PDR structures speed mapping of address <-> name.
+ * They are sorted in ascending memory order and are kept in
+ * memory by CDB at runtime.
+ */
+
+/* 
+ * File Descriptor
+ *
+ * There is one of these for EVERY FILE, whether compiled with
+ * full debugging symbols or not.  The name of a file should be
+ * the path name given to the compiler.	 This allows the user
+ * to simply specify the names of the directories where the COMPILES
+ * were done, and we will be able to find their files.
+ * A field whose comment starts with "R - " indicates that it will be
+ * setup at runtime.
+ */
+typedef struct fdr {
+	bfd_vma	adr;		/* memory address of beginning of file */
+	long	rss;		/* file name (of source, if known) */
+	long	issBase;	/* file's string space */
+	bfd_vma	cbSs;		/* number of bytes in the ss */
+	long	isymBase;	/* beginning of symbols */
+	long	csym;		/* count file's of symbols */
+	long	ilineBase;	/* file's line symbols */
+	long	cline;		/* count of file's line symbols */
+	long	ioptBase;	/* file's optimization entries */
+	long	copt;		/* count of file's optimization entries */
+	unsigned short ipdFirst;/* start of procedures for this file */
+	short	cpd;		/* count of procedures for this file */
+	long	iauxBase;	/* file's auxiliary entries */
+	long	caux;		/* count of file's auxiliary entries */
+	long	rfdBase;	/* index into the file indirect table */
+	long	crfd;		/* count file indirect entries */
+	unsigned lang: 5;	/* language for this file */
+	unsigned fMerge : 1;	/* whether this file can be merged */
+	unsigned fReadin : 1;	/* true if it was read in (not just created) */
+	unsigned fBigendian : 1;/* if set, was compiled on big endian machine */
+				/*	aux's will be in compile host's sex */
+	unsigned glevel : 2;	/* level this file was compiled with */
+	unsigned reserved : 22;  /* reserved for future use */
+	bfd_vma	cbLineOffset;	/* byte offset from header for this file ln's */
+	bfd_vma	cbLine;		/* size of lines for this file */
+	} FDR, *pFDR;
+#define cbFDR sizeof(FDR)
+#define fdNil ((pFDR)0)
+#define ifdNil -1
+#define ifdTemp 0
+#define ilnNil -1
+
+
+/* 
+ * Procedure Descriptor
+ *
+ * There is one of these for EVERY TEXT LABEL.
+ * If a procedure is in a file with full symbols, then isym
+ * will point to the PROC symbols, else it will point to the
+ * global symbol for the label.
+ */
+
+typedef struct pdr {
+	bfd_vma	adr;		/* memory address of start of procedure */
+	long	isym;		/* start of local symbol entries */
+	long	iline;		/* start of line number entries*/
+	long	regmask;	/* save register mask */
+	long	regoffset;	/* save register offset */
+	long	iopt;		/* start of optimization symbol entries*/
+	long	fregmask;	/* save floating point register mask */
+	long	fregoffset;	/* save floating point register offset */
+	long	frameoffset;	/* frame size */
+	short	framereg;	/* frame pointer register */
+	short	pcreg;		/* offset or reg of return pc */
+	long	lnLow;		/* lowest line in the procedure */
+	long	lnHigh;		/* highest line in the procedure */
+	bfd_vma	cbLineOffset;	/* byte offset for this procedure from the fd base */
+	/* These fields are new for 64 bit ECOFF.  */
+	unsigned gp_prologue : 8; /* byte size of GP prologue */
+	unsigned gp_used : 1;	/* true if the procedure uses GP */
+	unsigned reg_frame : 1;	/* true if register frame procedure */
+	unsigned prof : 1;	/* true if compiled with -pg */
+	unsigned reserved : 13;	/* reserved: must be zero */
+	unsigned localoff : 8;	/* offset of local variables from vfp */
+	} PDR, *pPDR;
+#define cbPDR sizeof(PDR)
+#define pdNil ((pPDR) 0)
+#define ipdNil	-1
+
+/*
+ * The structure of the runtime procedure descriptor created by the loader
+ * for use by the static exception system.
+ */
+/*
+ * If 0'd out because exception_info chokes Visual C++ and because there
+ * don't seem to be any references to this structure elsewhere in gdb.
+ */
+#if 0
+typedef struct runtime_pdr {
+	bfd_vma	adr;		/* memory address of start of procedure */
+	long	regmask;	/* save register mask */
+	long	regoffset;	/* save register offset */
+	long	fregmask;	/* save floating point register mask */
+	long	fregoffset;	/* save floating point register offset */
+	long	frameoffset;	/* frame size */
+	short	framereg;	/* frame pointer register */
+	short	pcreg;		/* offset or reg of return pc */
+	long	irpss;		/* index into the runtime string table */
+	long	reserved;
+	struct exception_info *exception_info;/* pointer to exception array */
+} RPDR, *pRPDR;
+#define cbRPDR sizeof(RPDR)
+#define rpdNil ((pRPDR) 0)
+#endif
+
+/*
+ * Line Numbers
+ *
+ * Line Numbers are segregated from the normal symbols because they
+ * are [1] smaller , [2] are of no interest to your
+ * average loader, and [3] are never needed in the middle of normal
+ * scanning and therefore slow things down.
+ *
+ * By definition, the first LINER for any given procedure will have
+ * the first line of a procedure and represent the first address.
+ */
+
+typedef	long LINER, *pLINER;
+#define lineNil ((pLINER)0)
+#define cbLINER sizeof(LINER)
+#define ilineNil	-1
+
+
+
+/*
+ * The Symbol Structure		(GFW, to those who Know!)
+ */
+
+typedef struct {
+	long	iss;		/* index into String Space of name */
+	bfd_vma	value;		/* value of symbol */
+	unsigned st : 6;	/* symbol type */
+	unsigned sc  : 5;	/* storage class - text, data, etc */
+	unsigned reserved : 1;	/* reserved */
+	unsigned index : 20;	/* index into sym/aux table */
+	} SYMR, *pSYMR;
+#define symNil ((pSYMR)0)
+#define cbSYMR sizeof(SYMR)
+#define isymNil -1
+#define indexNil 0xfffff
+#define issNil -1
+#define issNull 0
+
+
+/* The following converts a memory resident string to an iss.
+ * This hack is recognized in SbFIss, in sym.c of the debugger.
+ */
+#define IssFSb(sb) (0x80000000 | ((unsigned long)(sb)))
+
+/* E X T E R N A L   S Y M B O L  R E C O R D
+ *
+ *	Same as the SYMR except it contains file context to determine where
+ *	the index is.
+ */
+typedef struct ecoff_extr {
+	unsigned jmptbl:1;	/* symbol is a jump table entry for shlibs */
+	unsigned cobol_main:1;	/* symbol is a cobol main procedure */
+	unsigned weakext:1;	/* symbol is weak external */
+	unsigned reserved:13;	/* reserved for future use */
+	int	ifd;		/* where the iss and index fields point into */
+	SYMR	asym;		/* symbol for the external */
+	} EXTR, *pEXTR;
+#define extNil ((pEXTR)0)
+#define cbEXTR sizeof(EXTR)
+
+
+/* A U X I L L A R Y   T Y P E	 I N F O R M A T I O N */
+
+/*
+ * Type Information Record
+ */
+typedef struct {
+	unsigned fBitfield : 1; /* set if bit width is specified */
+	unsigned continued : 1; /* indicates additional TQ info in next AUX */
+	unsigned bt  : 6;	/* basic type */
+	unsigned tq4 : 4;
+	unsigned tq5 : 4;
+	/* ---- 16 bit boundary ---- */
+	unsigned tq0 : 4;
+	unsigned tq1 : 4;	/* 6 type qualifiers - tqPtr, etc. */
+	unsigned tq2 : 4;
+	unsigned tq3 : 4;
+	} TIR, *pTIR;
+#define cbTIR sizeof(TIR)
+#define tiNil ((pTIR)0)
+#define itqMax 6
+
+/*
+ * Relative symbol record
+ *
+ * If the rfd field is 4095, the index field indexes into the global symbol
+ *	table.
+ */
+
+typedef struct {
+	unsigned	rfd : 12;    /* index into the file indirect table */
+	unsigned	index : 20; /* index int sym/aux/iss tables */
+	} RNDXR, *pRNDXR;
+#define cbRNDXR sizeof(RNDXR)
+#define rndxNil ((pRNDXR)0)
+
+/* dense numbers or sometimes called block numbers are stored in this type,
+ *	a rfd of 0xffffffff is an index into the global table.
+ */
+typedef struct {
+	unsigned long	rfd;    /* index into the file table */
+	unsigned long	index; 	/* index int sym/aux/iss tables */
+	} DNR, *pDNR;
+#define cbDNR sizeof(DNR)
+#define dnNil ((pDNR)0)
+
+
+
+/*
+ * Auxillary information occurs only if needed.
+ * It ALWAYS occurs in this order when present.
+
+	    isymMac		used by stProc only
+	    TIR			type info
+	    TIR			additional TQ info (if first TIR was not enough)
+	    rndx		if (bt == btStruct,btUnion,btEnum,btSet,btRange,
+				    btTypedef):
+				    rsym.index == iaux for btSet or btRange
+				    else rsym.index == isym
+	    dimLow		btRange, btSet
+	    dimMac		btRange, btSet
+	    rndx0		As many as there are tq arrays
+	    dimLow0
+	    dimHigh0
+	    ...
+	    rndxMax-1
+	    dimLowMax-1
+	    dimHighMax-1
+	    width in bits	if (bit field), width in bits.
+ */
+#define cAuxMax (6 + (idimMax*3))
+
+/* a union of all possible info in the AUX universe */
+typedef union {
+	TIR	ti;		/* type information record */
+	RNDXR	rndx;		/* relative index into symbol table */
+	long	dnLow;		/* low dimension */
+	long	dnHigh;		/* high dimension */
+	long	isym;		/* symbol table index (end of proc) */
+	long	iss;		/* index into string space (not used) */
+	long	width;		/* width for non-default sized struc fields */
+	long	count;		/* count of ranges for variant arm */
+	} AUXU, *pAUXU;
+#define cbAUXU sizeof(AUXU)
+#define auxNil ((pAUXU)0)
+#define iauxNil -1
+
+
+/*
+ * Optimization symbols
+ *
+ * Optimization symbols contain some overlap information with the normal
+ * symbol table. In particular, the proc information
+ * is somewhat redundant but necessary to easily find the other information
+ * present. 
+ *
+ * All of the offsets are relative to the beginning of the last otProc
+ */
+
+typedef struct {
+	unsigned ot: 8;		/* optimization type */
+	unsigned value: 24;	/* address where we are moving it to */
+	RNDXR	rndx;		/* points to a symbol or opt entry */
+	unsigned long	offset;	/* relative offset this occured */
+	} OPTR, *pOPTR;
+#define optNil	((pOPTR) 0)
+#define cbOPTR sizeof(OPTR)
+#define ioptNil -1
+
+/*
+ * File Indirect
+ *
+ * When a symbol is referenced across files the following procedure is used:
+ *	1) use the file index to get the File indirect entry.
+ *	2) use the file indirect entry to get the File descriptor.
+ *	3) add the sym index to the base of that file's sym table
+ *
+ */
+
+typedef long RFDT, *pRFDT;
+#define cbRFDT sizeof(RFDT)
+#define rfdNil	-1
+
+/*
+ * The file indirect table in the mips loader is known as an array of FITs.
+ * This is done to keep the code in the loader readable in the area where
+ * these tables are merged.  Note this is only a name change.
+ */
+typedef long FIT, *pFIT;
+#define cbFIT	sizeof(FIT)
+#define ifiNil	-1
+#define fiNil	((pFIT) 0)
+
+#ifdef _LANGUAGE_PASCAL
+#define ifdNil -1
+#define ilnNil -1
+#define ipdNil -1
+#define ilineNil -1
+#define isymNil -1
+#define indexNil 16#fffff
+#define issNil -1
+#define issNull 0
+#define itqMax 6
+#define iauxNil -1
+#define ioptNil -1
+#define rfdNil -1
+#define ifiNil -1
+#endif	/* _LANGUAGE_PASCAL */
+
+
+/* Dense numbers
+ *
+ * Rather than use file index, symbol index pairs to represent symbols
+ *	and globals, we use dense number so that they can be easily embeded
+ *	in intermediate code and the programs that process them can
+ *	use direct access tabls instead of hash table (which would be
+ *	necesary otherwise because of the sparse name space caused by
+ *	file index, symbol index pairs. Dense number are represented
+ *	by RNDXRs.
+ */
+
+/*
+ * The following table defines the meaning of each SYM field as
+ * a function of the "st". (scD/B == scData OR scBss)
+ *
+ * Note: the value "isymMac" is used by symbols that have the concept
+ * of enclosing a block of related information.	 This value is the
+ * isym of the first symbol AFTER the end associated with the primary
+ * symbol. For example if a procedure was at isym==90 and had an
+ * isymMac==155, the associated end would be at isym==154, and the
+ * symbol at 155 would probably (although not necessarily) be the
+ * symbol for the next procedure.  This allows rapid skipping over
+ * internal information of various sorts. "stEnd"s ALWAYS have the
+ * isym of the primary symbol that started the block.
+ * 
+
+ST		SC	VALUE		INDEX
+--------	------	--------	------
+stFile		scText	address		isymMac
+stLabel		scText	address		---
+stGlobal	scD/B	address		iaux
+stStatic	scD/B	address		iaux
+stParam		scAbs	offset		iaux
+stLocal		scAbs	offset		iaux
+stProc		scText	address		iaux	(isymMac is first AUX)
+stStaticProc	scText	address		iaux	(isymMac is first AUX)
+
+stMember	scNil	ordinal		---	(if member of enum)
+	(mipsread thinks the case below has a bit, not byte, offset.)
+stMember	scNil	byte offset	iaux	(if member of struct/union)
+stMember	scBits	bit offset	iaux	(bit field spec)
+
+stBlock		scText	address		isymMac (text block)
+	(the code seems to think that rather than scNil, we see scInfo for
+	 the two cases below.)
+stBlock		scNil	cb		isymMac (struct/union member define)
+stBlock		scNil	cMembers	isymMac (enum member define)
+
+	(New types added by SGI to simplify things:)
+stStruct	scInfo	cb		isymMac (struct type define)
+stUnion		scInfo	cb		isymMac (union  type define)
+stEnum		scInfo	cMembers	isymMac (enum   type define)
+
+stEnd		scText	address		isymStart
+stEnd		scNil	-------		isymStart (struct/union/enum)
+
+stTypedef	scNil	-------		iaux
+stRegReloc	sc???	value		old register number
+stForward	sc???	new address	isym to original symbol
+
+stConstant	scInfo	value		--- (scalar)
+stConstant	scInfo	iss		--- (complex, e.g. string)
+
+ *
+ */
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/symconst.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/symconst.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/symconst.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/symconst.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,184 @@
+/* Declarations of constants for internal format of MIPS ECOFF symbols.
+   Originally contributed by MIPS Computer Systems and Third Eye Software.
+   Changes contributed by Cygnus Support are in the public domain.
+
+   This file is just aggregated with the files that make up the GNU
+   release; it is not considered part of GAS, GDB, or other GNU
+   programs.  */
+
+/*
+ * |-----------------------------------------------------------|
+ * | Copyright (c) 1992, 1991, 1990 MIPS Computer Systems, Inc.|
+ * | MIPS Computer Systems, Inc. grants reproduction and use   |
+ * | rights to all parties, PROVIDED that this comment is      |
+ * | maintained in the copy.                                   |
+ * |-----------------------------------------------------------|
+ */
+
+/* (C) Copyright 1984 by Third Eye Software, Inc.
+ *
+ * Third Eye Software, Inc. grants reproduction and use rights to
+ * all parties, PROVIDED that this comment is maintained in the copy.
+ *
+ * Third Eye makes no claims about the applicability of this
+ * symbol table to a particular use.
+ */
+
+/* glevels for field in FDR */
+#define GLEVEL_0	2
+#define GLEVEL_1	1
+#define GLEVEL_2	0	/* for upward compat reasons. */
+#define GLEVEL_3	3
+
+/* magic number fo symheader */
+#define magicSym	0x7009
+/* The Alpha uses this value instead, for some reason.  */
+#define magicSym2	0x1992
+
+/* Language codes */
+#define langC		0	
+#define langPascal	1
+#define langFortran	2
+#define	langAssembler	3	/* one Assembley inst might map to many mach */
+#define langMachine	4
+#define langNil		5
+#define langAda		6
+#define langPl1		7
+#define langCobol	8
+#define langStdc	9	/* FIXME: Collides with SGI langCplusplus */
+#define langCplusplus	9	/* FIXME: Collides with langStdc */
+#define langCplusplusV2	10	/* SGI addition */
+#define langMax		11	/* maximum allowed 32 -- 5 bits */
+
+/* The following are value definitions for the fields in the SYMR */
+
+/*
+ * Storage Classes
+ */
+
+#define scNil		0
+#define scText		1	/* text symbol */
+#define scData		2	/* initialized data symbol */
+#define scBss		3	/* un-initialized data symbol */
+#define scRegister	4	/* value of symbol is register number */
+#define scAbs		5	/* value of symbol is absolute */
+#define scUndefined	6	/* who knows? */
+#define scCdbLocal	7	/* variable's value is IN se->va.?? */
+#define scBits		8	/* this is a bit field */
+#define scCdbSystem	9	/* variable's value is IN CDB's address space */
+#define scDbx		9	/* overlap dbx internal use */
+#define scRegImage	10	/* register value saved on stack */
+#define scInfo		11	/* symbol contains debugger information */
+#define scUserStruct	12	/* address in struct user for current process */
+#define scSData		13	/* load time only small data */
+#define scSBss		14	/* load time only small common */
+#define scRData		15	/* load time only read only data */
+#define scVar		16	/* Var parameter (fortran,pascal) */
+#define scCommon	17	/* common variable */
+#define scSCommon	18	/* small common */
+#define scVarRegister	19	/* Var parameter in a register */
+#define scVariant	20	/* Variant record */
+#define scSUndefined	21	/* small undefined(external) data */
+#define scInit		22	/* .init section symbol */
+#define scBasedVar	23	/* Fortran or PL/1 ptr based var */ 
+#define scXData         24      /* exception handling data */
+#define scPData         25      /* Procedure section */
+#define scFini          26      /* .fini section */
+#define scRConst	27	/* .rconst section */
+#define scMax		32
+
+
+/*
+ *   Symbol Types
+ */
+
+#define stNil		0	/* Nuthin' special */
+#define stGlobal	1	/* external symbol */
+#define stStatic	2	/* static */
+#define stParam		3	/* procedure argument */
+#define stLocal		4	/* local variable */
+#define stLabel		5	/* label */
+#define stProc		6	/*     "      "	 Procedure */
+#define stBlock		7	/* beginnning of block */
+#define stEnd		8	/* end (of anything) */
+#define stMember	9	/* member (of anything	- struct/union/enum */
+#define stTypedef	10	/* type definition */
+#define stFile		11	/* file name */
+#define stRegReloc	12	/* register relocation */
+#define stForward	13	/* forwarding address */
+#define stStaticProc	14	/* load time only static procs */
+#define stConstant	15	/* const */
+#define stStaParam	16	/* Fortran static parameters */
+    /* These new symbol types have been recently added to SGI machines. */
+#define stStruct	26	/* Beginning of block defining a struct type */
+#define stUnion		27	/* Beginning of block defining a union type */
+#define stEnum		28	/* Beginning of block defining an enum type */
+#define stIndirect	34	/* Indirect type specification */
+    /* Pseudo-symbols - internal to debugger */
+#define stStr		60	/* string */
+#define stNumber	61	/* pure number (ie. 4 NOR 2+2) */
+#define stExpr		62	/* 2+2 vs. 4 */
+#define stType		63	/* post-coersion SER */
+#define stMax		64
+
+/* definitions for fields in TIR */
+
+/* type qualifiers for ti.tq0 -> ti.(itqMax-1) */
+#define tqNil	0	/* bt is what you see */
+#define tqPtr	1	/* pointer */
+#define tqProc	2	/* procedure */
+#define tqArray 3	/* duh */
+#define tqFar	4	/* longer addressing - 8086/8 land */
+#define tqVol	5	/* volatile */
+#define tqConst 6	/* const */
+#define tqMax	8
+
+/* basic types as seen in ti.bt */
+#define btNil		0	/* undefined (also, enum members) */
+#define btAdr		1	/* address - integer same size as pointer */
+#define btChar		2	/* character */
+#define btUChar		3	/* unsigned character */
+#define btShort		4	/* short */
+#define btUShort	5	/* unsigned short */
+#define btInt		6	/* int */
+#define btUInt		7	/* unsigned int */
+#define btLong		8	/* long */
+#define btULong		9	/* unsigned long */
+#define btFloat		10	/* float (real) */
+#define btDouble	11	/* Double (real) */
+#define btStruct	12	/* Structure (Record) */
+#define btUnion		13	/* Union (variant) */
+#define btEnum		14	/* Enumerated */
+#define btTypedef	15	/* defined via a typedef, isymRef points */
+#define btRange		16	/* subrange of int */
+#define btSet		17	/* pascal sets */
+#define btComplex	18	/* fortran complex */
+#define btDComplex	19	/* fortran double complex */
+#define btIndirect	20	/* forward or unnamed typedef */
+#define btFixedDec	21	/* Fixed Decimal */
+#define btFloatDec	22	/* Float Decimal */
+#define btString	23	/* Varying Length Character String */
+#define btBit		24	/* Aligned Bit String */
+#define btPicture	25	/* Picture */
+#define btVoid		26	/* void */
+#define btLongLong	27	/* long long */
+#define btULongLong	28	/* unsigned long long */
+#define btLong64	30	/* long (64-bit) */
+#define btULong64	31	/* unsigned long (64-bit) */
+#define btLongLong64	32	/* long long (64-bit) */
+#define btULongLong64	33	/* unsigned long long (64-bit) */
+#define btAdr64		34	/* address (64-bit) */
+#define btInt64		35	/* int (64-bit) */
+#define btUInt64	36	/* unsigned int (64-bit) */
+#define btMax		64
+
+#if (_MFG == _MIPS)
+/* optimization type codes */
+#define otNil		0
+#define otReg		1	/* move var to reg */
+#define otBlock		2	/* begin basic block */
+#define	otProc		3	/* procedure */
+#define otInline	4	/* inline procedure */
+#define otEnd		5	/* whatever you started */
+#define otMax		6	/* KEEP UP TO DATE */
+#endif /* (_MFG == _MIPS) */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/ti.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/ti.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/ti.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/ti.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,558 @@
+/* COFF information for TI COFF support.  Definitions in this file should be
+   customized in a target-specific file, and then this file included (see
+   tic54x.h for an example).
+   
+   Copyright 2000, 2001, 2002, 2003, 2005, 2008, 2009, 2010
+   Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef COFF_TI_H
+#define COFF_TI_H
+
+/* Note "coff/external.h is not used because TI adds extra fields to the structures.  */
+
+/********************** FILE HEADER **********************/
+
+struct external_filehdr
+  {
+    char f_magic[2];	/* magic number			*/
+    char f_nscns[2];	/* number of sections		*/
+    char f_timdat[4];	/* time & date stamp		*/
+    char f_symptr[4];	/* file pointer to symtab	*/
+    char f_nsyms[4];	/* number of symtab entries	*/
+    char f_opthdr[2];	/* sizeof(optional hdr)		*/
+    char f_flags[2];	/* flags			*/
+    char f_target_id[2];    /* magic no. (TI COFF-specific) */
+  };
+
+/* COFF0 has magic number in f_magic, and omits f_target_id from the file
+   header; for later versions, f_magic is 0xC1 for COFF1 and 0xC2 for COFF2
+   and the target-specific magic number is found in f_target_id */ 
+
+#define TICOFF0MAGIC    TI_TARGET_ID
+#define TICOFF1MAGIC    0x00C1
+#define TICOFF2MAGIC    0x00C2
+#define TICOFF_AOUT_MAGIC    0x0108 /* magic number in optional header */
+#define TICOFF          1 /* customize coffcode.h */
+
+/* The target_id field changes depending on the particular CPU target */
+/* for COFF0, the target id appeared in f_magic, where COFFX magic is now */
+#ifndef TI_TARGET_ID
+#error "TI_TARGET_ID needs to be defined for your CPU"
+#endif
+
+/* Which bfd_arch to use... */
+#ifndef TICOFF_TARGET_ARCH
+#error "TICOFF_TARGET_ARCH needs to be defined for your CPU"
+#endif
+
+#ifndef TICOFF_TARGET_MACHINE_GET
+#define TICOFF_TARGET_MACHINE_GET(FLAGS) 0
+#endif
+
+#ifndef TICOFF_TARGET_MACHINE_SET
+#define TICOFF_TARGET_MACHINE_SET(FLAGSP, MACHINE)
+#endif
+
+/* Default to COFF2 for file output */
+#ifndef TICOFF_DEFAULT_MAGIC
+#define TICOFF_DEFAULT_MAGIC TICOFF2MAGIC
+#endif
+
+/* This value is made available in the rare case where a bfd is unavailable */
+#ifndef OCTETS_PER_BYTE_POWER
+#error "OCTETS_PER_BYTE_POWER not defined for this CPU"
+#else
+#define OCTETS_PER_BYTE (1<<OCTETS_PER_BYTE_POWER)
+#endif
+
+/* default alignment is on a byte (not octet!) boundary */
+#ifndef COFF_DEFAULT_SECTION_ALIGNMENT_POWER
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER 0
+#endif
+
+/* TI COFF encodes the section alignment in the section header flags */
+#define COFF_ALIGN_IN_SECTION_HEADER 1
+#define COFF_ALIGN_IN_S_FLAGS 1
+/* requires a power-of-two argument */
+#define COFF_ENCODE_ALIGNMENT(S,X) ((S).s_flags |= (((unsigned)(X)&0xF)<<8))
+/* result is a power of two */
+#define COFF_DECODE_ALIGNMENT(X) (((X)>>8)&0xF)
+
+#define COFF0_P(ABFD) (bfd_coff_filhsz(ABFD) == FILHSZ_V0)
+#define COFF2_P(ABFD) (bfd_coff_scnhsz(ABFD) != SCNHSZ_V01)
+
+#define COFF0_BADMAG(x) ((x).f_magic != TICOFF0MAGIC)
+#define COFF1_BADMAG(x) ((x).f_magic != TICOFF1MAGIC || (x).f_target_id != TI_TARGET_ID)
+#define COFF2_BADMAG(x) ((x).f_magic != TICOFF2MAGIC || (x).f_target_id != TI_TARGET_ID)
+
+/* we need to read/write an extra field in the coff file header */
+#ifndef COFF_ADJUST_FILEHDR_IN_POST
+#define COFF_ADJUST_FILEHDR_IN_POST(abfd, src, dst) \
+  do									\
+    {									\
+      if (!COFF0_P (abfd))						\
+	((struct internal_filehdr *)(dst))->f_target_id =		\
+	  H_GET_16 (abfd, ((FILHDR *)(src))->f_target_id);		\
+    }									\
+  while (0)
+#endif
+
+#ifndef COFF_ADJUST_FILEHDR_OUT_POST
+#define COFF_ADJUST_FILEHDR_OUT_POST(abfd, src, dst) \
+  do									 \
+    {									 \
+      if (!COFF0_P (abfd))						 \
+	H_PUT_16 (abfd, ((struct internal_filehdr *)(src))->f_target_id, \
+		 ((FILHDR *)(dst))->f_target_id);			 \
+    }									 \
+  while (0)
+#endif
+
+#define	FILHDR	struct external_filehdr
+#define	FILHSZ	22
+#define FILHSZ_V0 20                /* COFF0 omits target_id field */
+
+/* File header flags */
+#define	F_RELFLG	(0x0001)
+#define	F_EXEC		(0x0002)
+#define	F_LNNO		(0x0004)
+#define F_VERS          (0x0010) /* TMS320C4x code */
+/* F_LSYMS needs to be redefined in your source file */
+#define	F_LSYMS_TICOFF	(0x0010) /* normal COFF is 0x8 */
+
+#define F_10            0x00    /* file built for TMS320C1x devices */
+#define F_20            0x10    /* file built for TMS320C2x devices */
+#define F_25            0x20    /* file built for TMS320C2x/C5x devices */
+#define F_LENDIAN       0x0100  /* 16 bits/word, LSB first */
+#define F_SYMMERGE      0x1000  /* duplicate symbols were removed */
+
+/********************** OPTIONAL HEADER **********************/
+
+
+typedef struct 
+{
+  char 	magic[2];		/* type of file (0x108) 		*/
+  char	vstamp[2];		/* version stamp			*/
+  char	tsize[4];		/* text size in bytes, padded to FW bdry*/
+  char	dsize[4];		/* initialized data "  "		*/
+  char	bsize[4];		/* uninitialized data "   "		*/
+  char	entry[4];		/* entry pt.				*/
+  char 	text_start[4];		/* base of text used for this file */
+  char 	data_start[4];		/* base of data used for this file */
+}
+AOUTHDR;
+
+
+#define AOUTHDRSZ 28
+#define AOUTSZ 28
+
+
+/********************** SECTION HEADER **********************/
+/* COFF0, COFF1 */
+struct external_scnhdr_v01 {
+	char		s_name[8];	/* section name			*/
+	char		s_paddr[4];	/* physical address, aliased s_nlib */
+	char		s_vaddr[4];	/* virtual address		*/
+	char		s_size[4];	/* section size (in WORDS)      */
+	char		s_scnptr[4];	/* file ptr to raw data for section */
+	char		s_relptr[4];	/* file ptr to relocation	*/
+	char		s_lnnoptr[4];	/* file ptr to line numbers	*/
+	char		s_nreloc[2];	/* number of relocation entries	*/
+	char		s_nlnno[2];	/* number of line number entries*/
+	char		s_flags[2];	/* flags			*/
+        char            s_reserved[1];  /* reserved                     */ 
+        char            s_page[1];      /* section page number (LOAD)   */
+};
+
+/* COFF2 */
+struct external_scnhdr {
+	char		s_name[8];	/* section name			*/
+	char		s_paddr[4];	/* physical address, aliased s_nlib */
+	char		s_vaddr[4];	/* virtual address		*/
+	char		s_size[4];	/* section size (in WORDS)      */
+	char		s_scnptr[4];	/* file ptr to raw data for section */
+	char		s_relptr[4];	/* file ptr to relocation	*/
+	char		s_lnnoptr[4];	/* file ptr to line numbers	*/
+	char		s_nreloc[4];	/* number of relocation entries	*/
+	char		s_nlnno[4];	/* number of line number entries*/
+	char		s_flags[4];	/* flags			*/
+        char            s_reserved[2];  /* reserved                     */ 
+        char            s_page[2];      /* section page number (LOAD)   */
+};
+
+/*
+ * Special section flags
+ */
+
+/* TI COFF defines these flags; 
+   STYP_CLINK: the section should be excluded from the final
+   linker output if there are no references found to any symbol in the section
+   STYP_BLOCK: the section should be blocked, i.e. if the section would cross
+   a page boundary, it is started at a page boundary instead.
+   TI COFF puts the section alignment power of two in the section flags
+   e.g. 2**N is alignment, flags |= (N & 0xF) << 8
+*/ 
+#define STYP_CLINK      (0x4000)
+#define STYP_BLOCK      (0x1000)
+#define STYP_ALIGN      (0x0F00) /* TI COFF stores section alignment here */
+
+#define	SCNHDR_V01 struct external_scnhdr_v01
+#define SCNHDR struct external_scnhdr
+#define	SCNHSZ_V01 40                  /* for v0 and v1 */
+#define SCNHSZ 48
+
+/* COFF2 changes the offsets and sizes of these fields 
+   Assume we're dealing with the COFF2 scnhdr structure, and adjust
+   accordingly.  Note: The GNU C versions of some of these macros
+   are necessary in order to avoid compile time warnings triggered
+   gcc's array bounds checking.  The PUT_SCNHDR_PAGE macro also has
+   the advantage on not evaluating LOC twice.  */
+
+#define GET_SCNHDR_NRELOC(ABFD, LOC) \
+  (COFF2_P (ABFD) ? H_GET_32 (ABFD, LOC) : H_GET_16 (ABFD, LOC))
+#define PUT_SCNHDR_NRELOC(ABFD, VAL, LOC) \
+  (COFF2_P (ABFD) ? H_PUT_32 (ABFD, VAL, LOC) : H_PUT_16 (ABFD, VAL, LOC))
+#ifdef __GNUC__
+#define GET_SCNHDR_NLNNO(ABFD, LOC) \
+  ({ \
+    int nlnno;		\
+    char * ptr = (LOC); \
+    if (COFF2_P (ABFD)) \
+      nlnno = H_GET_32 (ABFD, ptr); \
+    else \
+      nlnno = H_GET_16 (ABFD, ptr - 2); \
+    nlnno; \
+  })
+#define PUT_SCNHDR_NLNNO(ABFD, VAL, LOC) \
+  do \
+    { \
+      char * ptr = (LOC); \
+      if (COFF2_P (ABFD)) \
+	H_PUT_32 (ABFD, VAL, ptr); \
+      else \
+	H_PUT_16 (ABFD, VAL, ptr - 2); \
+    } \
+  while (0)
+#define GET_SCNHDR_FLAGS(ABFD, LOC) \
+  ({ \
+    int flags; \
+    char * ptr = (LOC); \
+    if (COFF2_P (ABFD)) \
+      flags = H_GET_32 (ABFD, ptr); \
+    else \
+      flags = H_GET_16 (ABFD, ptr - 4); \
+    flags; \
+  })
+#define PUT_SCNHDR_FLAGS(ABFD, VAL, LOC) \
+  do \
+    { \
+      char * ptr = (LOC); \
+      if (COFF2_P (ABFD)) \
+	H_PUT_32 (ABFD, VAL, ptr); \
+      else \
+	H_PUT_16 (ABFD, VAL, ptr - 4); \
+    } \
+  while (0)
+#define GET_SCNHDR_PAGE(ABFD, LOC) \
+  ({ \
+    unsigned page; \
+    char * ptr = (LOC); \
+    if (COFF2_P (ABFD)) \
+      page = H_GET_16 (ABFD, ptr); \
+    else \
+      page = (unsigned) H_GET_8 (ABFD, ptr - 7); \
+    page; \
+  })
+/* On output, make sure that the "reserved" field is zero.  */
+#define PUT_SCNHDR_PAGE(ABFD, VAL, LOC) \
+  do \
+    { \
+      char * ptr = (LOC); \
+      if (COFF2_P (ABFD)) \
+	H_PUT_16 (ABFD, VAL, ptr); \
+      else \
+	{ \
+	  H_PUT_8 (ABFD, VAL, ptr - 7); \
+	  H_PUT_8 (ABFD, 0, ptr - 8); \
+	} \
+    } \
+  while (0)
+#else
+#define GET_SCNHDR_NLNNO(ABFD, LOC) \
+  (COFF2_P (ABFD) ? H_GET_32 (ABFD, LOC) : H_GET_16 (ABFD, (LOC) - 2))
+#define PUT_SCNHDR_NLNNO(ABFD, VAL, LOC) \
+  (COFF2_P (ABFD) ? H_PUT_32 (ABFD, VAL, LOC) : H_PUT_16 (ABFD, VAL, (LOC) - 2))
+#define GET_SCNHDR_FLAGS(ABFD, LOC) \
+  (COFF2_P (ABFD) ? H_GET_32 (ABFD, LOC) : H_GET_16 (ABFD, (LOC) - 4))
+#define PUT_SCNHDR_FLAGS(ABFD, VAL, LOC) \
+  (COFF2_P (ABFD) ? H_PUT_32 (ABFD, VAL, LOC) : H_PUT_16 (ABFD, VAL, (LOC) - 4))
+#define GET_SCNHDR_PAGE(ABFD, LOC) \
+  (COFF2_P (ABFD) ? H_GET_16 (ABFD, LOC) : (unsigned) H_GET_8 (ABFD, (LOC) - 7))
+/* On output, make sure that the "reserved" field is zero.  */
+#define PUT_SCNHDR_PAGE(ABFD, VAL, LOC) \
+  (COFF2_P (ABFD) \
+   ? H_PUT_16 (ABFD, VAL, LOC) \
+   : H_PUT_8 (ABFD, VAL, (LOC) - 7), H_PUT_8 (ABFD, 0, (LOC) - 8))
+#endif
+
+
+/* TI COFF stores section size as number of bytes (address units, not octets),
+   so adjust to be number of octets, which is what BFD expects */ 
+#define GET_SCNHDR_SIZE(ABFD, SZP) \
+  (H_GET_32 (ABFD, SZP) * bfd_octets_per_byte (ABFD))
+#define PUT_SCNHDR_SIZE(ABFD, SZ, SZP) \
+  H_PUT_32 (ABFD, (SZ) / bfd_octets_per_byte (ABFD), SZP)
+
+#define COFF_ADJUST_SCNHDR_IN_POST(ABFD, EXT, INT) \
+  do									\
+    {									\
+      ((struct internal_scnhdr *)(INT))->s_page =			\
+	GET_SCNHDR_PAGE (ABFD, ((SCNHDR *)(EXT))->s_page);		\
+    }									\
+   while (0)
+
+/* The entire scnhdr may not be assigned.
+   Ensure that everything is initialized.  */
+#define COFF_ADJUST_SCNHDR_OUT_PRE(ABFD, INT, EXT)	\
+  do							\
+    {							\
+      memset((EXT), 0, sizeof (SCNHDR));		\
+    }							\
+  while (0)
+
+/* The line number and reloc overflow checking in coff_swap_scnhdr_out in
+   coffswap.h doesn't use PUT_X for s_nlnno and s_nreloc.
+   Due to different sized v0/v1/v2 section headers, we have to re-write these
+   fields.
+ */
+#define COFF_ADJUST_SCNHDR_OUT_POST(ABFD, INT, EXT) \
+  do									   \
+    {									   \
+      PUT_SCNHDR_NLNNO (ABFD, ((struct internal_scnhdr *)(INT))->s_nlnno,  \
+			((SCNHDR *)(EXT))->s_nlnno);			   \
+      PUT_SCNHDR_NRELOC (ABFD, ((struct internal_scnhdr *)(INT))->s_nreloc,\
+			 ((SCNHDR *)(EXT))->s_nreloc);			   \
+      PUT_SCNHDR_FLAGS (ABFD, ((struct internal_scnhdr *)(INT))->s_flags,  \
+			((SCNHDR *)(EXT))->s_flags);			   \
+      PUT_SCNHDR_PAGE (ABFD, ((struct internal_scnhdr *)(INT))->s_page,    \
+		       ((SCNHDR *)(EXT))->s_page);			   \
+    }									   \
+   while (0)
+
+/*
+ * names of "special" sections
+ */
+#define _TEXT	".text"
+#define _DATA	".data"
+#define _BSS	".bss"
+#define _CINIT  ".cinit"            /* initialized C data */
+#define _SCONST  ".const"           /* constants */
+#define _SWITCH ".switch"           /* switch tables */
+#define _STACK  ".stack"            /* C stack */
+#define _SYSMEM ".sysmem"           /* used for malloc et al. syscalls */
+
+/********************** LINE NUMBERS **********************/
+
+/* 1 line number entry for every "breakpointable" source line in a section.
+ * Line numbers are grouped on a per function basis; first entry in a function
+ * grouping will have l_lnno = 0 and in place of physical address will be the
+ * symbol table index of the function name.
+ */
+struct external_lineno {
+  union {
+    char l_symndx[4];	/* function name symbol index, iff l_lnno == 0*/
+    char l_paddr[4];	/* (physical) address of line number	*/
+  } l_addr;
+  char l_lnno[2];	/* line number		*/
+};
+
+#define	LINENO	struct external_lineno
+#define	LINESZ	6
+
+
+/********************** SYMBOLS **********************/
+
+/* NOTE: this is what a local label looks like in assembly source; what it
+   looks like in COFF output is undefined */
+#define TICOFF_LOCAL_LABEL_P(NAME) \
+((NAME[0] == '$' && NAME[1] >= '0' && NAME[1] <= '9' && NAME[2] == '\0') \
+ || NAME[strlen(NAME)-1] == '?')
+
+#define E_SYMNMLEN	8	/* # characters in a symbol name	*/
+#define E_FILNMLEN	14	/* # characters in a file name		*/
+#define E_DIMNUM	4	/* # array dimensions in auxiliary entry */
+
+struct external_syment 
+{
+  union {
+    char e_name[E_SYMNMLEN];
+    struct {
+      char e_zeroes[4];
+      char e_offset[4];
+    } e;
+  } e;
+  char e_value[4];
+  char e_scnum[2];
+  char e_type[2];
+  char e_sclass[1];
+  char e_numaux[1];
+};
+
+
+#define N_BTMASK	(017)
+#define N_TMASK		(060)
+#define N_BTSHFT	(4)
+#define N_TSHIFT	(2)
+  
+
+union external_auxent {
+  struct {
+	char x_tagndx[4];	/* str, un, or enum tag indx */
+	union {
+	  struct {
+		char  x_lnno[2]; /* declaration line number */
+		char  x_size[2]; /* str/union/array size */
+	  } x_lnsz;
+	  char x_fsize[4];	/* size of function */
+	} x_misc;
+	union {
+	  struct {		/* if ISFCN, tag, or .bb */
+		char x_lnnoptr[4];	/* ptr to fcn line # */
+		char x_endndx[4];	/* entry ndx past block end */
+	  } x_fcn;
+	  struct {		/* if ISARY, up to 4 dimen. */
+		char x_dimen[E_DIMNUM][2];
+	  } x_ary;
+	} x_fcnary;
+	char x_tvndx[2];		/* tv index */
+  } x_sym;
+  
+  union {
+	char x_fname[E_FILNMLEN];
+	struct {
+	  char x_zeroes[4];
+	  char x_offset[4];
+	} x_n;
+  } x_file;
+  
+  struct {
+	char x_scnlen[4];			/* section length */
+	char x_nreloc[2];	/* # relocation entries */
+	char x_nlinno[2];	/* # line numbers */
+  } x_scn;
+  
+  struct {
+	char x_tvfill[4];	/* tv fill value */
+	char x_tvlen[2];	/* length of .tv */
+	char x_tvran[2][2];	/* tv range */
+  } x_tv;		/* info about .tv section (in auxent of symbol .tv)) */
+  
+
+};
+
+#define	SYMENT	struct external_syment
+#define	SYMESZ	18	
+#define	AUXENT	union external_auxent
+#define	AUXESZ	18
+
+/* section lengths are in target bytes (not host bytes) */
+#define GET_SCN_SCNLEN(ABFD, EXT) \
+  (H_GET_32 (ABFD, (EXT)->x_scn.x_scnlen) * bfd_octets_per_byte (ABFD))
+#define PUT_SCN_SCNLEN(ABFD, INT, EXT) \
+  H_PUT_32 (ABFD, (INT) / bfd_octets_per_byte (ABFD), (EXT)->x_scn.x_scnlen)
+
+/* lnsz size is in bits in COFF file, in bytes in BFD */
+#define GET_LNSZ_SIZE(abfd, ext) \
+ (H_GET_16 (abfd, ext->x_sym.x_misc.x_lnsz.x_size) / (in_class != C_FIELD ? 8 : 1))
+
+#define PUT_LNSZ_SIZE(abfd, in, ext) \
+  H_PUT_16 (abfd, ((in_class != C_FIELD) ? (in) * 8 : (in)), \
+	   ext->x_sym.x_misc.x_lnsz.x_size)
+ 
+/* TI COFF stores offsets for MOS and MOU in bits; BFD expects bytes 
+   Also put the load page flag of the section into the symbol value if it's an
+   address.  */
+#ifndef NEEDS_PAGE
+#define NEEDS_PAGE(X) 0
+#define PAGE_MASK 0
+#endif
+#define COFF_ADJUST_SYM_IN_POST(ABFD, EXT, INT) \
+  do									\
+    {									\
+      struct internal_syment *dst = (struct internal_syment *)(INT);	\
+      if (dst->n_sclass == C_MOS || dst->n_sclass == C_MOU)		\
+	dst->n_value /= 8;						\
+      else if (NEEDS_PAGE (dst->n_sclass)) {                            \
+        asection *scn = coff_section_from_bfd_index (abfd, dst->n_scnum); \
+        dst->n_value |= (scn->lma & PAGE_MASK);                         \
+      }									\
+    }									\
+   while (0)
+
+#define COFF_ADJUST_SYM_OUT_POST(ABFD, INT, EXT) \
+  do									\
+    {									\
+       struct internal_syment *src = (struct internal_syment *)(INT);	\
+       SYMENT *dst = (SYMENT *)(EXT);					\
+       if (src->n_sclass == C_MOU || src->n_sclass == C_MOS)		\
+	 H_PUT_32 (abfd, src->n_value * 8, dst->e_value);		\
+       else if (NEEDS_PAGE (src->n_sclass)) {                           \
+         H_PUT_32 (abfd, src->n_value &= ~PAGE_MASK, dst->e_value);     \
+       }								\
+    }									\
+   while (0)
+
+/* Detect section-relative absolute symbols so they get flagged with a sym
+   index of -1.
+*/
+#define SECTION_RELATIVE_ABSOLUTE_SYMBOL_P(RELOC, SECT) \
+  ((*(RELOC)->sym_ptr_ptr)->section->output_section == (SECT) \
+   && (RELOC)->howto->name[0] == 'A')
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+struct external_reloc_v0
+{
+  char r_vaddr[4];
+  char r_symndx[2];
+  char r_reserved[2];
+  char r_type[2];
+};
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_reserved[2]; /* extended pmad byte for COFF2 */
+  char r_type[2];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ_V0 10                 /* FIXME -- coffcode.h needs fixing */
+#define RELSZ 12                    /* for COFF1/2 */
+
+/* various relocation types.  */
+#define R_ABS     0x0000            /* no relocation */
+#define R_REL13   0x002A            /* 13-bit direct reference (???) */
+#define R_PARTLS7 0x0028            /* 7 LSBs of an address */
+#define R_PARTMS9 0x0029            /* 9MSBs of an address */
+#define R_EXTWORD 0x002B            /* 23-bit direct reference */
+#define R_EXTWORD16 0x002C          /* 16-bit direct reference to 23-bit addr*/
+#define R_EXTWORDMS7 0x002D         /* upper 7 bits of 23-bit address */
+
+#endif /* COFF_TI_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/tic30.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/tic30.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/tic30.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/tic30.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,51 @@
+/* coff information for Texas Instruments TMS320C3X
+   
+   Copyright 2001, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define L_LNNO_SIZE 4
+#include "coff/external.h"
+
+#define	TIC30MAGIC	0xC000
+
+#define TIC30BADMAG(x) (((x).f_magic != TIC30MAGIC))
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+/* The external reloc has an offset field, because some of the reloc
+   types on the z8k don't have room in the instruction for the entire
+   offset - eg with segments */
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_offset[4];
+  char r_type[2];
+  char r_stuff[2];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 16
+
+/* TMS320C30 relocation types.  */
+
+#define R_TIC30_ABS16 0x100  /* 16 bit absolute. */
+#define R_TIC30_ABS24 0x101  /* 24 bit absolute. */
+#define R_TIC30_ABS32 0x102  /* 32 bit absolute. */
+#define R_TIC30_LDP   0x103  /* LDP bits 23-16 to 7-0. */
+#define R_TIC30_PC16  0x104  /* 16 bit pc relative. */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/tic4x.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/tic4x.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/tic4x.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/tic4x.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,47 @@
+/* TI COFF information for Texas Instruments TMS320C4X/C3X.
+   This file customizes the settings in coff/ti.h. 
+   
+   Copyright 2002, 2003, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef COFF_TIC4X_H
+#define COFF_TIC4X_H
+
+#define TIC4X_TARGET_ID 	0x0093
+/* Octets per byte, as a power of two.  */
+#define TI_TARGET_ID 		TIC4X_TARGET_ID
+#define OCTETS_PER_BYTE_POWER 	2 
+/* Add to howto to get absolute/sect-relative version.  */
+#define HOWTO_BANK 		6		
+#define TICOFF_TARGET_ARCH 	bfd_arch_tic4x
+/* We use COFF2.  */
+#define TICOFF_DEFAULT_MAGIC 	TICOFF2MAGIC 
+
+#define TICOFF_TARGET_MACHINE_GET(FLAGS) \
+  (((FLAGS) & F_VERS) ? bfd_mach_tic4x : bfd_mach_tic3x)
+
+#define TICOFF_TARGET_MACHINE_SET(FLAGSP, MACHINE)	\
+  do							\
+    {							\
+      if ((MACHINE) == bfd_mach_tic4x)			\
+        *(FLAGSP) |= F_VERS;				\
+    }							\
+  while (0)
+
+#include "coff/ti.h"
+
+#endif /* COFF_TIC4X_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/tic54x.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/tic54x.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/tic54x.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/tic54x.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,60 @@
+/* TI COFF information for Texas Instruments TMS320C54X.
+   This file customizes the settings in coff/ti.h. 
+   
+   Copyright 2000, 2001, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef COFF_TIC54X_H
+#define COFF_TIC54X_H
+
+#define TIC54X_TARGET_ID 0x98
+#define TIC54XALGMAGIC  0x009B  /* c54x algebraic assembler output */
+#define TIC5X_TARGET_ID  0x92
+#define TI_TARGET_ID TIC54X_TARGET_ID
+#define OCTETS_PER_BYTE_POWER 1 /* octets per byte, as a power of two */
+#define HOWTO_BANK 6 /* add to howto to get absolute/sect-relative version */
+#define TICOFF_TARGET_ARCH bfd_arch_tic54x
+#define TICOFF_DEFAULT_MAGIC TICOFF1MAGIC /* we use COFF1 for compatibility */
+
+/* Page macros
+
+   The first GDB port requires flags in its remote memory access commands to
+   distinguish between data/prog space.  Hopefully we can make this go away
+   eventually.  Stuff the page in the upper bits of a 32-bit address, since
+   the c5x family only uses 16 or 23 bits.
+
+   c2x, c5x and most c54x devices have 16-bit addresses, but the c548 has
+   23-bit program addresses.  Make sure the page flags don't interfere.
+   These flags are used by GDB to identify the destination page for
+   addresses. 
+*/
+
+/* Recognized load pages (by common convention).  */
+#define PG_PROG         0x0         /* PROG page */
+#define PG_DATA         0x1         /* DATA page */
+#define PG_IO           0x2         /* I/O page */
+
+/** Indicate whether the given storage class requires a page flag.  */
+#define NEEDS_PAGE(X) ((X)==C_EXT)
+#define PAGE_MASK       0xFF000000
+#define ADDR_MASK       0x00FFFFFF
+#define PG_TO_FLAG(p)   (((unsigned long)(p) & 0xFF) << 24)
+#define FLAG_TO_PG(f)   (((f) >> 24) & 0xFF)
+
+#include "coff/ti.h"
+
+#endif /* COFF_TIC54X_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/tic80.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/tic80.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/tic80.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/tic80.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,123 @@
+/* coff information for TI TMS320C80 (MVP)
+   
+   Copyright 2001, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define DO_NOT_DEFINE_FILHDR
+#define DO_NOT_DEFINE_SCNHDR
+#define L_LNNO_SIZE 2
+#include "coff/external.h"
+
+/********************** FILE HEADER **********************/
+
+struct external_filehdr
+  {
+    char f_magic[2];	/* magic number			*/
+    char f_nscns[2];	/* number of sections		*/
+    char f_timdat[4];	/* time & date stamp		*/
+    char f_symptr[4];	/* file pointer to symtab	*/
+    char f_nsyms[4];	/* number of symtab entries	*/
+    char f_opthdr[2];	/* sizeof(optional hdr)		*/
+    char f_flags[2];	/* flags			*/
+    char f_target_id[2];/* target id (TIc80 specific)	*/
+};
+
+#define	TIC80_ARCH_MAGIC	0x0C1	/* Goes in the file header magic number field */
+#define TIC80_TARGET_ID		0x95	/* Goes in the target id field */
+
+#define TIC80BADMAG(x) ((x).f_magic != TIC80_ARCH_MAGIC)
+
+#define	FILHDR	struct external_filehdr
+#define	FILHSZ	22
+
+#define TIC80_AOUTHDR_MAGIC	0x108	/* Goes in the optional file header magic number field */
+
+/********************** SECTION HEADER **********************/
+
+struct external_scnhdr
+{
+	char		s_name[8];	/* section name			*/
+	char		s_paddr[4];	/* physical address, aliased s_nlib */
+	char		s_vaddr[4];	/* virtual address		*/
+	char		s_size[4];	/* section size			*/
+	char		s_scnptr[4];	/* file ptr to raw data for section */
+	char		s_relptr[4];	/* file ptr to relocation	*/
+	char		s_lnnoptr[4];	/* file ptr to line numbers	*/
+	char		s_nreloc[2];	/* number of relocation entries	*/
+	char		s_nlnno[2];	/* number of line number entries*/
+	char		s_flags[2];	/* flags			*/
+	char		s_reserved[1];	/* reserved (TIc80 specific)	*/
+	char		s_mempage[1];	/* memory page number (TIc80)	*/
+};
+
+/* Names of "special" sections.  */
+#define _TEXT	".text"
+#define _DATA	".data"
+#define _BSS	".bss"
+#define _CINIT	".cinit"
+#define _CONST	".const"
+#define _SWITCH	".switch"
+#define _STACK	".stack"
+#define _SYSMEM	".sysmem"
+
+#define	SCNHDR	struct external_scnhdr
+#define	SCNHSZ	40
+  
+/* FIXME - need to correlate external_auxent with
+   TIc80 Code Generation Tools User's Guide, CG:A-25 */
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+/* The external reloc has an offset field, because some of the reloc
+   types on the h8 don't have room in the instruction for the entire
+   offset - eg the strange jump and high page addressing modes.  */
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_reserved[2];
+  char r_type[2];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 12
+
+/* TIc80 relocation types. */
+
+#define R_ABS		0x00		/* Absolute address - no relocation */
+#define R_RELLONGX	0x11		/* PP: 32 bits, direct */
+#define R_PPBASE	0x34		/* PP: Global base address type */
+#define R_PPLBASE	0x35		/* PP: Local base address type */
+#define R_PP15		0x38		/* PP: Global 15 bit offset */
+#define R_PP15W		0x39		/* PP: Global 15 bit offset divided by 4 */
+#define R_PP15H		0x3A		/* PP: Global 15 bit offset divided by 2 */
+#define R_PP16B		0x3B		/* PP: Global 16 bit offset for bytes */
+#define R_PPL15		0x3C		/* PP: Local 15 bit offset */
+#define R_PPL15W	0x3D		/* PP: Local 15 bit offset divided by 4 */
+#define R_PPL15H	0x3E		/* PP: Local 15 bit offset divided by 2 */
+#define R_PPL16B	0x3F		/* PP: Local 16 bit offset for bytes */
+#define R_PPN15		0x40		/* PP: Global 15 bit negative offset */
+#define R_PPN15W	0x41		/* PP: Global 15 bit negative offset divided by 4 */
+#define R_PPN15H	0x42		/* PP: Global 15 bit negative offset divided by 2 */
+#define R_PPN16B	0x43		/* PP: Global 16 bit negative byte offset */
+#define R_PPLN15	0x44		/* PP: Local 15 bit negative offset */
+#define R_PPLN15W	0x45		/* PP: Local 15 bit negative offset divided by 4 */
+#define R_PPLN15H	0x46		/* PP: Local 15 bit negative offset divided by 2 */
+#define R_PPLN16B	0x47		/* PP: Local 16 bit negative byte offset */
+#define R_MPPCR15W	0x4E		/* MP: 15 bit PC-relative divided by 4 */
+#define R_MPPCR		0x4F		/* MP: 32 bit PC-relative divided by 4 */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/w65.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/w65.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/w65.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/w65.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,47 @@
+/* coff information for WDC 65816
+   
+   Copyright 2001, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define L_LNNO_SIZE 4
+#include "coff/external.h"
+
+#define	W65MAGIC	0x6500
+
+#define W65BADMAG(x) (((x).f_magic != W65MAGIC))
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+/* The external reloc has an offset field, because some of the reloc
+   types on the w65 don't have room in the instruction for the entire
+   offset - eg the strange jump and high page addressing modes */
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_offset[4];
+  char r_type[2];
+  char r_stuff[2];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 16
+
+
+
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/we32k.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/we32k.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/we32k.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/we32k.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,62 @@
+/* coff information for we32k
+   
+   Copyright 2001, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define L_LNNO_SIZE 2
+#include "coff/external.h"
+
+/* Bits for f_flags:
+ 	F_RELFLG	relocation info stripped from file
+ 	F_EXEC		file is executable (no unresolved external references)
+ 	F_LNNO		line numbers stripped from file
+ 	F_LSYMS		local symbols stripped from file
+ 	F_AR32WR	file has byte ordering of an AR32WR machine (e.g. vax).  */
+
+#define F_RELFLG	(0x0001)
+#define F_EXEC		(0x0002)
+#define F_LNNO		(0x0004)
+#define F_LSYMS		(0x0008)
+#define	F_BM32B		(0020000)
+#define	F_BM32MAU	(0040000)
+
+#define	WE32KMAGIC	0x170	/* we32k sans transfer vector */
+#define FBOMAGIC	0x170	/* we32k sans transfer vector */
+#define MTVMAGIC	0x171	/* we32k with transfer vector */
+#define RBOMAGIC	0x172	/* reserved */
+#define WE32KBADMAG(x) (   ((x).f_magic != WE32KMAGIC) \
+			&& ((x).f_magic != FBOMAGIC) \
+			&& ((x).f_magic != RBOMAGIC) \
+			&& ((x).f_magic != MTVMAGIC))
+
+/* More names of "special" sections.  */
+#define _TV	".tv"
+#define _INIT	".init"
+#define _FINI	".fini"
+
+/********************** RELOCATION DIRECTIVES **********************/
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_type[2];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 10
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/x86_64.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/x86_64.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/x86_64.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/x86_64.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,57 @@
+/* COFF information for AMD 64.
+   Copyright 2006, 2009, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.
+   
+   Written by Kai Tietz, OneVision Software GmbH&CoKg.  */
+
+#define L_LNNO_SIZE 2
+#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
+
+#include "coff/external.h"
+
+#define COFF_PAGE_SIZE	0x1000
+
+#define AMD64MAGIC	0x8664
+
+#define AMD64BADMAG(x)	((x).f_magic != AMD64MAGIC)
+#define IMAGE_NT_OPTIONAL_HDR64_MAGIC      0x20b
+
+#define OMAGIC          0404    /* Object files, eg as output.  */
+#define ZMAGIC          IMAGE_NT_OPTIONAL_HDR64_MAGIC    /* Demand load format, eg normal ld output 0x10b.  */
+#define STMAGIC		0401	/* Target shlib.  */
+#define SHMAGIC		0443	/* Host   shlib.  */
+
+/* Define some NT default values.  */
+/*  #define NT_IMAGE_BASE        0x400000 moved to internal.h.  */
+#define NT_SECTION_ALIGNMENT 0x1000
+#define NT_FILE_ALIGNMENT    0x200
+#define NT_DEF_RESERVE       0x100000
+#define NT_DEF_COMMIT        0x1000
+
+/* Relocation directives.  */
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_type[2];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 10
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/xcoff.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/xcoff.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/xcoff.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/xcoff.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,643 @@
+/* Internal format of XCOFF object file data structures for BFD.
+
+   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005,
+   2009, 2010  Free Software Foundation, Inc.
+   Written by Ian Lance Taylor <ian@cygnus.com>, Cygnus Support.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _INTERNAL_XCOFF_H
+#define _INTERNAL_XCOFF_H
+
+/* XCOFF specific f_flags.  */
+
+/* File was profiled with fdpr.  */
+#define F_FDPR_PROF 0x0010
+
+/* File was reordered with fdpr.  */
+#define F_FDPR_OPTI 0x0020
+
+/* File use very large program support.  */
+#define F_DSA       0x0040
+
+/* One aux header specifying medium page sizes is non-zero.  */
+#define F_VARPG     0x0100
+
+/* Read/write sections are non-executable.  */
+#define F_NONEXEC   0x8000
+
+/* Linker */
+
+/* Names of "special" sections.  */
+#define _TEXT	".text"
+#define _DATA	".data"
+#define _BSS	".bss"
+#define _PAD	".pad"
+#define _LOADER	".loader"
+#define _EXCEPT ".except"
+#define _TYPCHK ".typchk"
+
+/* XCOFF uses special .dwXXX sections with the type STYP_DWARF.  */
+#define STYP_DWARF  0x0010
+
+/* High-order 16-bits dwarf subtypes.  */
+#define SSUBTYP_DWINFO  0x10000
+#define SSUBTYP_DWLINE  0x20000
+#define SSUBTYP_DWPBNMS 0x30000
+#define SSUBTYP_DWPBTYP 0x40000
+#define SSUBTYP_DWARNGE 0x50000
+#define SSUBTYP_DWABREV 0x60000
+#define SSUBTYP_DWSTR   0x70000
+#define SSUBTYP_DWRNGES 0x80000
+
+/* XCOFF uses a special .loader section with type STYP_LOADER.  */
+#define STYP_LOADER 0x1000
+
+/* Specifies an exception section.  A section of this type provides 
+   information to identify the reason that a trap or ececptin occured within 
+   and executable object program */
+#define STYP_EXCEPT 0x0100
+
+/* Specifies an initialized thread-local data section.  */
+#define STYP_TDATA  0x0400
+
+/* Specifies an uninitialized thread-local data section.  */
+#define STYP_TBSS   0x0800
+
+/* XCOFF uses a special .debug section with type STYP_DEBUG.  */
+#define STYP_DEBUG  0x2000
+
+/* Specifies a type check section.  A section of this type contains parameter 
+   argument type check strings used by the AIX binder.  */
+#define STYP_TYPCHK 0x4000
+
+/* XCOFF handles line number or relocation overflow by creating
+   another section header with STYP_OVRFLO set.  */
+#define STYP_OVRFLO 0x8000
+
+#define	RS6K_AOUTHDR_OMAGIC 0x0107 /* old: text & data writeable */
+#define	RS6K_AOUTHDR_NMAGIC 0x0108 /* new: text r/o, data r/w */
+#define	RS6K_AOUTHDR_ZMAGIC 0x010B /* paged: text r/o, both page-aligned */
+
+/* XCOFF relocation types.  
+   The relocations are described in the function  
+   xcoff[64]_ppc_relocate_section in coff64-rs6000.c and coff-rs6000.c  */
+
+#define R_POS   (0x00)
+#define R_NEG   (0x01)
+#define R_REL   (0x02)
+#define R_TOC   (0x03)
+#define R_RTB   (0x04)
+#define R_GL    (0x05)
+#define R_TCL   (0x06)
+#define R_BA    (0x08)
+#define R_BR    (0x0a)
+#define R_RL    (0x0c)
+#define R_RLA   (0x0d)
+#define R_REF   (0x0f)
+#define R_TRL   (0x12)
+#define R_TRLA  (0x13)
+#define R_RRTBI (0x14)
+#define R_RRTBA (0x15)
+#define R_CAI   (0x16)
+#define R_CREL  (0x17)
+#define R_RBA   (0x18)
+#define R_RBAC  (0x19)
+#define R_RBR   (0x1a)
+#define R_RBRC  (0x1b)
+#define R_TLS   (0x20)
+#define R_TLS_IE (0x21)
+#define R_TLS_LD (0x22)
+#define R_TLS_LE (0x23)
+#define R_TLSM  (0x24)
+#define R_TLSML (0x25)
+#define R_TOCU  (0x30)
+#define R_TOCL  (0x31)
+
+/* Storage class #defines, from /usr/include/storclass.h that are not already 
+   defined in internal.h */
+
+/* Comment string in .info section */
+#define	C_INFO		110	
+
+/* Dwarf symbol.  */
+#define C_DWARF		112
+
+/* Auxillary Symbol Entries  */
+
+/* x_smtyp values:  */
+#define	SMTYP_ALIGN(x)	((x) >> 3)	/* log2 of alignment */
+#define	SMTYP_SMTYP(x)	((x) & 0x7)	/* symbol type */
+/* Symbol type values:  */
+#define	XTY_ER	0		/* External reference */
+#define	XTY_SD	1		/* Csect definition */
+#define	XTY_LD	2		/* Label definition */
+#define XTY_CM	3		/* .BSS */
+#define	XTY_EM	4		/* Error message */
+#define	XTY_US	5		/* "Reserved for internal use" */
+
+/* x_smclas values:  */
+#define	XMC_PR	0		/* Read-only program code */
+#define	XMC_RO	1		/* Read-only constant */
+#define	XMC_DB	2		/* Read-only debug dictionary table */
+#define	XMC_TC	3		/* Read-write general TOC entry */
+#define	XMC_UA	4		/* Read-write unclassified */
+#define	XMC_RW	5		/* Read-write data */
+#define	XMC_GL	6		/* Read-only global linkage */
+#define	XMC_XO	7		/* Read-only extended operation */
+#define	XMC_SV	8		/* Read-only supervisor call */
+#define	XMC_BS	9		/* Read-write BSS */
+#define	XMC_DS	10		/* Read-write descriptor csect */
+#define	XMC_UC	11		/* Read-write unnamed Fortran common */
+#define	XMC_TI	12		/* Read-only traceback index csect */
+#define	XMC_TB	13		/* Read-only traceback table csect */
+/* 		14	??? */
+#define	XMC_TC0	15		/* Read-write TOC anchor */
+#define XMC_TD	16		/* Read-write data in TOC */
+#define	XMC_SV64   17		/* Read-only 64 bit supervisor call */
+#define	XMC_SV3264 18		/* Read-only 32 or 64 bit supervisor call */
+
+/* The ldhdr structure.  This appears at the start of the .loader
+   section.  */
+
+struct internal_ldhdr
+{
+  /* The version number: 
+     1 : 32 bit
+     2 : 64 bit */
+  unsigned long l_version;
+
+  /* The number of symbol table entries.  */
+  bfd_size_type l_nsyms;
+
+  /* The number of relocation table entries.  */
+  bfd_size_type l_nreloc;
+
+  /* The length of the import file string table.  */
+  bfd_size_type l_istlen;
+
+  /* The number of import files.  */
+  bfd_size_type l_nimpid;
+
+  /* The offset from the start of the .loader section to the first
+     entry in the import file table.  */
+  bfd_size_type l_impoff;
+
+  /* The length of the string table.  */
+  bfd_size_type l_stlen;
+
+  /* The offset from the start of the .loader section to the first
+     entry in the string table.  */
+  bfd_size_type l_stoff;
+
+  /* The offset to start of the symbol table, only in XCOFF64 */
+  bfd_vma l_symoff;
+
+  /* The offset to the start of the relocation table, only in XCOFF64 */
+  bfd_vma l_rldoff;
+};
+
+/* The ldsym structure.  This is used to represent a symbol in the
+   .loader section.  */
+
+struct internal_ldsym
+{
+  union
+  {
+    /* The symbol name if <= SYMNMLEN characters.  */
+    char _l_name[SYMNMLEN];
+    struct
+    {
+      /* Zero if the symbol name is more than SYMNMLEN characters.  */
+	long _l_zeroes;
+      
+      /* The offset in the string table if the symbol name is more
+	 than SYMNMLEN characters.  */
+      long _l_offset;
+    } 
+    _l_l;
+  }
+  _l;
+
+  /* The symbol value.  */
+  bfd_vma l_value;
+
+  /* The symbol section number.  */
+  short l_scnum;
+
+  /* The symbol type and flags.  */
+  char l_smtype;
+
+  /* The symbol storage class.  */
+  char l_smclas;
+
+  /* The import file ID.  */
+  bfd_size_type l_ifile;
+
+  /* Offset to the parameter type check string.  */
+  bfd_size_type l_parm;
+};
+
+/* These flags are for the l_smtype field (the lower three bits are an
+   XTY_* value).  */
+
+/* Imported symbol.  */
+#define L_IMPORT (0x40)
+/* Entry point.  */
+#define L_ENTRY (0x20)
+/* Exported symbol.  */
+#define L_EXPORT (0x10)
+/* Weak symbol.  */
+#define L_WEAK (0x08)
+
+/* The ldrel structure.  This is used to represent a reloc in the
+   .loader section.  */
+
+struct internal_ldrel
+{
+  /* The reloc address.  */
+  bfd_vma l_vaddr;
+
+  /* The symbol table index in the .loader section symbol table.  */
+  bfd_size_type l_symndx;
+
+  /* The relocation type and size.  */
+  short l_rtype;
+
+  /* The section number this relocation applies to.  */
+  short l_rsecnm;
+};
+
+/* An entry in the XCOFF linker hash table.  */
+struct xcoff_link_hash_entry
+{
+  struct bfd_link_hash_entry root;
+
+  /* Symbol index in output file.  Set to -1 initially.  Set to -2 if
+     there is a reloc against this symbol.  */
+  long indx;
+
+  /* If we have created a TOC entry for this symbol, this is the .tc
+     section which holds it.  */
+  asection *toc_section;
+
+  union
+  {
+    /* If we have created a TOC entry (the XCOFF_SET_TOC flag is
+       set), this is the offset in toc_section.  */
+    bfd_vma toc_offset;
+    
+    /* If the TOC entry comes from an input file, this is set to the
+       symbol index of the C_HIDEXT XMC_TC or XMC_TD symbol.  */
+    long toc_indx;
+  } 
+  u;
+
+  /* If this symbol is a function entry point which is called, this
+     field holds a pointer to the function descriptor.  If this symbol
+     is a function descriptor, this field holds a pointer to the
+     function entry point.  */
+  struct xcoff_link_hash_entry *descriptor;
+
+  /* The .loader symbol table entry, if there is one.  */
+  struct internal_ldsym *ldsym;
+
+  /* If XCOFF_BUILT_LDSYM is set, this is the .loader symbol table
+     index.  If XCOFF_BUILD_LDSYM is clear, and XCOFF_IMPORT is set,
+     this is the l_ifile value.  */
+  long ldindx;
+
+  /* Some linker flags.  */
+  unsigned long flags;
+
+  /* The storage mapping class.  */
+  unsigned char smclas;
+};
+
+/*  Flags for xcoff_link_hash_entry.  */
+
+/* Symbol is referenced by a regular object. */
+#define XCOFF_REF_REGULAR      0x00000001
+/* Symbol is defined by a regular object. */
+#define XCOFF_DEF_REGULAR      0x00000002
+/* Symbol is defined by a dynamic object. */
+#define XCOFF_DEF_DYNAMIC      0x00000004
+/* Symbol is used in a reloc being copied into the .loader section.  */
+#define XCOFF_LDREL            0x00000008
+/* Symbol is the entry point.  */
+#define XCOFF_ENTRY            0x00000010
+/* Symbol is for a function and is the target of a relocation.
+   The relocation may or may not be a branch-type relocation.  */
+#define XCOFF_CALLED           0x00000020
+/* Symbol needs the TOC entry filled in.  */
+#define XCOFF_SET_TOC          0x00000040
+/* Symbol is implicitly or explicitly imported.  */
+#define XCOFF_IMPORT           0x00000080
+/* Symbol is explicitly exported.  */
+#define XCOFF_EXPORT           0x00000100
+/* Symbol has been processed by xcoff_build_ldsyms.  */
+#define XCOFF_BUILT_LDSYM      0x00000200
+/* Symbol is mentioned by a section which was not garbage collected. */
+#define XCOFF_MARK             0x00000400
+/* Symbol size is recorded in size_list list from hash table.  */
+#define XCOFF_HAS_SIZE         0x00000800
+/* Symbol is a function descriptor.  */
+#define XCOFF_DESCRIPTOR       0x00001000
+/* Multiple definitions have been for the symbol. */
+#define XCOFF_MULTIPLY_DEFINED 0x00002000
+/* Symbol is the __rtinit symbol.  */
+#define XCOFF_RTINIT           0x00004000
+/* Symbol is an imported 32 bit syscall.  */
+#define XCOFF_SYSCALL32        0x00008000
+/* Symbol is an imported 64 bit syscall.  */
+#define XCOFF_SYSCALL64        0x00010000 
+/* Symbol was not explicitly defined by the time it was marked.  */
+#define XCOFF_WAS_UNDEFINED    0x00020000
+/* We have assigned an output XCOFF entry to this symbol.  */
+#define XCOFF_ALLOCATED	       0x00040000
+
+/* The XCOFF linker hash table.  */
+
+#define XCOFF_NUMBER_OF_SPECIAL_SECTIONS 6
+#define XCOFF_SPECIAL_SECTION_TEXT       0
+#define XCOFF_SPECIAL_SECTION_ETEXT      1 
+#define XCOFF_SPECIAL_SECTION_DATA       2
+#define XCOFF_SPECIAL_SECTION_EDATA      3
+#define XCOFF_SPECIAL_SECTION_END        4
+#define XCOFF_SPECIAL_SECTION_END2       5
+
+/* These flags indicate which of -bexpall and -bexpfull are in effect.  */
+#define XCOFF_EXPALL 1
+#define XCOFF_EXPFULL 2
+
+/* This structure is used to pass information through
+   xcoff_link_hash_traverse.  */
+
+struct xcoff_loader_info
+{
+  /* Set if a problem occurred.  */
+  bfd_boolean failed;
+
+  /* Output BFD.  */
+  bfd *output_bfd;
+
+  /* Link information structure.  */
+  struct bfd_link_info *info;
+
+  /* A mask of XCOFF_EXPALL and XCOFF_EXPFULL flags.  */
+  unsigned int auto_export_flags;
+
+  /* Number of ldsym structures.  */
+  size_t ldsym_count;
+
+  /* Size of string table.  */
+  size_t string_size;
+
+  /* String table.  */
+  char *strings;
+
+  /* Allocated size of string table.  */
+  size_t string_alc;
+};
+
+/* In case we're on a 32-bit machine, construct a 64-bit "-1" value
+   from smaller values.  Start with zero, widen, *then* decrement.  */
+#define MINUS_ONE       (((bfd_vma) 0) - 1)
+
+/* __rtinit, from /usr/include/rtinit.h.  */
+struct __rtinit 
+{
+  /* Pointer to runtime linker.     
+     XXX: Is the parameter really void?  */
+  int	(*rtl) (void);	
+
+  /* Offset to array of init functions, 0 if none. */
+  int	init_offset;
+
+  /* Offset to array of fini functions, 0 if none. */		   
+  int	fini_offset;		
+
+  /* Size of __RTINIT_DESCRIPTOR. This value should be used instead of 
+     sizeof(__RTINIT_DESCRIPTOR). */
+  int	__rtinit_descriptor_size; 
+};
+
+#define RTINIT_DESCRIPTOR_SIZE (12)
+
+struct __rtinit_descriptor 
+{
+  /* Init/fini function. */
+  int	f;
+
+  /* Offset, relative to the start of the __rtinit symbol, to name of the 
+     function. */
+
+  int	name_offset;	
+
+  /* Flags */			   
+  unsigned char	flags;	
+};
+
+/* Archive */
+
+#define XCOFFARMAG    "<aiaff>\012"
+#define XCOFFARMAGBIG "<bigaf>\012"
+#define SXCOFFARMAG   8
+
+/* The size of the ascii archive elements */
+#define XCOFFARMAG_ELEMENT_SIZE 12
+#define XCOFFARMAGBIG_ELEMENT_SIZE 20
+
+/* This terminates an XCOFF archive member name.  */
+
+#define XCOFFARFMAG "`\012"
+#define SXCOFFARFMAG 2
+
+/* XCOFF archives start with this (printable) structure.  */
+
+struct xcoff_ar_file_hdr
+{
+  /* Magic string.  */
+  char magic[SXCOFFARMAG];
+
+  /* Offset of the member table (decimal ASCII string).  */
+  char memoff[XCOFFARMAG_ELEMENT_SIZE];
+
+  /* Offset of the global symbol table (decimal ASCII string).  */
+  char symoff[XCOFFARMAG_ELEMENT_SIZE];
+
+  /* Offset of the first member in the archive (decimal ASCII string).  */
+  char firstmemoff[XCOFFARMAG_ELEMENT_SIZE];
+
+  /* Offset of the last member in the archive (decimal ASCII string).  */
+  char lastmemoff[XCOFFARMAG_ELEMENT_SIZE];
+
+  /* Offset of the first member on the free list (decimal ASCII
+     string).  */
+  char freeoff[XCOFFARMAG_ELEMENT_SIZE];
+};
+
+#define SIZEOF_AR_FILE_HDR (SXCOFFARMAG + 5 * XCOFFARMAG_ELEMENT_SIZE)
+
+/* This is the equivalent data structure for the big archive format.  */
+
+struct xcoff_ar_file_hdr_big
+{
+  /* Magic string.  */
+  char magic[SXCOFFARMAG];
+
+  /* Offset of the member table (decimal ASCII string).  */
+  char memoff[XCOFFARMAGBIG_ELEMENT_SIZE];
+
+  /* Offset of the global symbol table for 32-bit objects (decimal ASCII
+     string).  */
+  char symoff[XCOFFARMAGBIG_ELEMENT_SIZE];
+
+  /* Offset of the global symbol table for 64-bit objects (decimal ASCII
+     string).  */
+  char symoff64[XCOFFARMAGBIG_ELEMENT_SIZE];
+
+  /* Offset of the first member in the archive (decimal ASCII string).  */
+  char firstmemoff[XCOFFARMAGBIG_ELEMENT_SIZE];
+
+  /* Offset of the last member in the archive (decimal ASCII string).  */
+  char lastmemoff[XCOFFARMAGBIG_ELEMENT_SIZE];
+
+  /* Offset of the first member on the free list (decimal ASCII
+     string).  */
+  char freeoff[XCOFFARMAGBIG_ELEMENT_SIZE];
+};
+
+#define SIZEOF_AR_FILE_HDR_BIG (SXCOFFARMAG + 6 * XCOFFARMAGBIG_ELEMENT_SIZE)
+
+/* Each XCOFF archive member starts with this (printable) structure.  */
+
+struct xcoff_ar_hdr
+{
+  /* File size not including the header (decimal ASCII string).  */
+  char size[XCOFFARMAG_ELEMENT_SIZE];
+
+  /* File offset of next archive member (decimal ASCII string).  */
+  char nextoff[XCOFFARMAG_ELEMENT_SIZE];
+
+  /* File offset of previous archive member (decimal ASCII string).  */
+  char prevoff[XCOFFARMAG_ELEMENT_SIZE];
+
+  /* File mtime (decimal ASCII string).  */
+  char date[12];
+
+  /* File UID (decimal ASCII string).  */
+  char uid[12];
+
+  /* File GID (decimal ASCII string).  */
+  char gid[12];
+
+  /* File mode (octal ASCII string).  */
+  char mode[12];
+
+  /* Length of file name (decimal ASCII string).  */
+  char namlen[4];
+
+  /* This structure is followed by the file name.  The length of the
+     name is given in the namlen field.  If the length of the name is
+     odd, the name is followed by a null byte.  The name and optional
+     null byte are followed by XCOFFARFMAG, which is not included in
+     namlen.  The contents of the archive member follow; the number of
+     bytes is given in the size field.  */
+};
+
+#define SIZEOF_AR_HDR (3 * XCOFFARMAG_ELEMENT_SIZE + 4 * 12 + 4)
+
+/* The equivalent for the big archive format.  */
+
+struct xcoff_ar_hdr_big
+{
+  /* File size not including the header (decimal ASCII string).  */
+  char size[XCOFFARMAGBIG_ELEMENT_SIZE];
+
+  /* File offset of next archive member (decimal ASCII string).  */
+  char nextoff[XCOFFARMAGBIG_ELEMENT_SIZE];
+
+  /* File offset of previous archive member (decimal ASCII string).  */
+  char prevoff[XCOFFARMAGBIG_ELEMENT_SIZE];
+
+  /* File mtime (decimal ASCII string).  */
+  char date[12];
+
+  /* File UID (decimal ASCII string).  */
+  char uid[12];
+
+  /* File GID (decimal ASCII string).  */
+  char gid[12];
+
+  /* File mode (octal ASCII string).  */
+  char mode[12];
+
+  /* Length of file name (decimal ASCII string).  */
+  char namlen[4];
+
+  /* This structure is followed by the file name.  The length of the
+     name is given in the namlen field.  If the length of the name is
+     odd, the name is followed by a null byte.  The name and optional
+     null byte are followed by XCOFFARFMAG, which is not included in
+     namlen.  The contents of the archive member follow; the number of
+     bytes is given in the size field.  */
+};
+
+#define SIZEOF_AR_HDR_BIG (3 * XCOFFARMAGBIG_ELEMENT_SIZE + 4 * 12 + 4)
+
+/* We often have to distinguish between the old and big file format.
+   Make it a bit cleaner.  We can use `xcoff_ardata' here because the
+   `hdr' member has the same size and position in both formats.  
+   <bigaf> is the default format, return TRUE even when xcoff_ardata is 
+   NULL. */
+#ifndef SMALL_ARCHIVE
+/* Creates big archives by default */
+#define xcoff_big_format_p(abfd) \
+  ((NULL != bfd_ardata (abfd) && NULL == xcoff_ardata (abfd)) || \
+   ((NULL != bfd_ardata (abfd)) && \
+    (NULL != xcoff_ardata (abfd)) && \
+    (xcoff_ardata (abfd)->magic[1] == 'b')))
+#else
+/* Creates small archives by default. */
+#define xcoff_big_format_p(abfd) \
+  (((NULL != bfd_ardata (abfd)) && \
+    (NULL != xcoff_ardata (abfd)) && \
+    (xcoff_ardata (abfd)->magic[1] == 'b')))
+#endif
+
+/* We store a copy of the xcoff_ar_file_hdr in the tdata field of the
+   artdata structure.  Similar for the big archive.  */
+#define xcoff_ardata(abfd) \
+  ((struct xcoff_ar_file_hdr *) bfd_ardata (abfd)->tdata)
+#define xcoff_ardata_big(abfd) \
+  ((struct xcoff_ar_file_hdr_big *) bfd_ardata (abfd)->tdata)
+
+/* We store a copy of the xcoff_ar_hdr in the arelt_data field of an
+   archive element.  Similar for the big archive.  */
+#define arch_eltdata(bfd) ((struct areltdata *) ((bfd)->arelt_data))
+#define arch_xhdr(bfd) \
+  ((struct xcoff_ar_hdr *) arch_eltdata (bfd)->arch_header)
+#define arch_xhdr_big(bfd) \
+  ((struct xcoff_ar_hdr_big *) arch_eltdata (bfd)->arch_header)
+
+/* True if symbols of class CLASS are external.  */
+#define EXTERN_SYM_P(CLASS) \
+  ((CLASS) == C_EXT || (CLASS) == C_AIX_WEAKEXT)
+
+#endif /* _INTERNAL_XCOFF_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/z80.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/z80.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/z80.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/z80.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,60 @@
+/* coff information for Zilog Z80
+   Copyright 2005, 2010 Free Software Foundation, Inc.
+   Contributed by Arnold Metselaar <arnold_m@operamail.com>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#define L_LNNO_SIZE 4
+#include "coff/external.h"
+
+/* z80 backend does not use dots in section names.  */
+#undef  _TEXT
+#define _TEXT "text"
+#undef  _DATA
+#define _DATA "data"
+#undef  _BSS
+#define _BSS "bss"
+
+/* Type of cpu is stored in flags.  */
+#define F_MACHMASK 0xF000
+
+/* Z80 COFF encodes the section alignment in the section header flags */
+#define COFF_ALIGN_IN_SECTION_HEADER 1
+#define COFF_ALIGN_IN_S_FLAGS 1
+#define F_ALGNMASK 0x0F00
+/* requires a power-of-two argument */
+#define COFF_ENCODE_ALIGNMENT(S,X) ((S).s_flags |= (((unsigned)(X)&0xF)<<8))
+/* result is a power of two */
+#define COFF_DECODE_ALIGNMENT(X) (((X)>>8)&0xF)
+
+#define	Z80MAGIC   0x805A
+
+#define Z80BADMAG(x) (((x).f_magic != Z80MAGIC))
+
+/* Relocation directives.  */
+
+/* This format actually has more bits than we need.  */
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_offset[4];
+  char r_type[2];
+  char r_stuff[2];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 16
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/z8k.h sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/z8k.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/coff/z8k.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/coff/z8k.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,49 @@
+/* coff information for Zilog Z800N
+   
+   Copyright 2001, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define L_LNNO_SIZE 4
+#include "coff/external.h"
+
+/* Type of cpu is stored in flags */
+#define F_Z8001    0x1000
+#define F_Z8002    0x2000
+#define F_MACHMASK 0xf000
+
+#define	Z8KMAGIC   0x8000
+
+#define Z8KBADMAG(x) (((x).f_magic != Z8KMAGIC))
+  
+/********************** RELOCATION DIRECTIVES **********************/
+
+/* The external reloc has an offset field, because some of the reloc
+   types on the z8k don't have room in the instruction for the entire
+   offset - eg with segments.  */
+
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_offset[4];
+  char r_type[2];
+  char r_stuff[2];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 16
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/demangle.h sdcc-3.2.0+dfsg/support/sdbinutils/include/demangle.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/demangle.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/demangle.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,644 @@
+/* Defs for interface to demanglers.
+   Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002,
+   2003, 2004, 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License
+   as published by the Free Software Foundation; either version 2, or
+   (at your option) any later version.
+
+   In addition to the permissions in the GNU Library General Public
+   License, the Free Software Foundation gives you unlimited
+   permission to link the compiled version of this file into
+   combinations with other programs, and to distribute those
+   combinations without any restriction coming from the use of this
+   file.  (The Library Public License restrictions do apply in other
+   respects; for example, they cover modification of the file, and
+   distribution when not linked into a combined executable.)
+
+   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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+
+#if !defined (DEMANGLE_H)
+#define DEMANGLE_H
+
+#include "libiberty.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* Options passed to cplus_demangle (in 2nd parameter). */
+
+#define DMGL_NO_OPTS	 0		/* For readability... */
+#define DMGL_PARAMS	 (1 << 0)	/* Include function args */
+#define DMGL_ANSI	 (1 << 1)	/* Include const, volatile, etc */
+#define DMGL_JAVA	 (1 << 2)	/* Demangle as Java rather than C++. */
+#define DMGL_VERBOSE	 (1 << 3)	/* Include implementation details.  */
+#define DMGL_TYPES	 (1 << 4)	/* Also try to demangle type encodings.  */
+#define DMGL_RET_POSTFIX (1 << 5)       /* Print function return types (when
+					   present) after function signature.
+					   It applies only to the toplevel
+					   function type.  */
+#define DMGL_RET_DROP	 (1 << 6)       /* Suppress printing function return
+					   types, even if present.  It applies
+					   only to the toplevel function type.
+					   */
+
+#define DMGL_AUTO	 (1 << 8)
+#define DMGL_GNU	 (1 << 9)
+#define DMGL_LUCID	 (1 << 10)
+#define DMGL_ARM	 (1 << 11)
+#define DMGL_HP 	 (1 << 12)       /* For the HP aCC compiler;
+                                            same as ARM except for
+                                            template arguments, etc. */
+#define DMGL_EDG	 (1 << 13)
+#define DMGL_GNU_V3	 (1 << 14)
+#define DMGL_GNAT	 (1 << 15)
+
+/* If none of these are set, use 'current_demangling_style' as the default. */
+#define DMGL_STYLE_MASK (DMGL_AUTO|DMGL_GNU|DMGL_LUCID|DMGL_ARM|DMGL_HP|DMGL_EDG|DMGL_GNU_V3|DMGL_JAVA|DMGL_GNAT)
+
+/* Enumeration of possible demangling styles.
+
+   Lucid and ARM styles are still kept logically distinct, even though
+   they now both behave identically.  The resulting style is actual the
+   union of both.  I.E. either style recognizes both "__pt__" and "__rf__"
+   for operator "->", even though the first is lucid style and the second
+   is ARM style. (FIXME?) */
+
+extern enum demangling_styles
+{
+  no_demangling = -1,
+  unknown_demangling = 0,
+  auto_demangling = DMGL_AUTO,
+  gnu_demangling = DMGL_GNU,
+  lucid_demangling = DMGL_LUCID,
+  arm_demangling = DMGL_ARM,
+  hp_demangling = DMGL_HP,
+  edg_demangling = DMGL_EDG,
+  gnu_v3_demangling = DMGL_GNU_V3,
+  java_demangling = DMGL_JAVA,
+  gnat_demangling = DMGL_GNAT
+} current_demangling_style;
+
+/* Define string names for the various demangling styles. */
+
+#define NO_DEMANGLING_STYLE_STRING            "none"
+#define AUTO_DEMANGLING_STYLE_STRING	      "auto"
+#define GNU_DEMANGLING_STYLE_STRING    	      "gnu"
+#define LUCID_DEMANGLING_STYLE_STRING	      "lucid"
+#define ARM_DEMANGLING_STYLE_STRING	      "arm"
+#define HP_DEMANGLING_STYLE_STRING	      "hp"
+#define EDG_DEMANGLING_STYLE_STRING	      "edg"
+#define GNU_V3_DEMANGLING_STYLE_STRING        "gnu-v3"
+#define JAVA_DEMANGLING_STYLE_STRING          "java"
+#define GNAT_DEMANGLING_STYLE_STRING          "gnat"
+
+/* Some macros to test what demangling style is active. */
+
+#define CURRENT_DEMANGLING_STYLE current_demangling_style
+#define AUTO_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_AUTO)
+#define GNU_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_GNU)
+#define LUCID_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_LUCID)
+#define ARM_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_ARM)
+#define HP_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_HP)
+#define EDG_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_EDG)
+#define GNU_V3_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_GNU_V3)
+#define JAVA_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_JAVA)
+#define GNAT_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_GNAT)
+
+/* Provide information about the available demangle styles. This code is
+   pulled from gdb into libiberty because it is useful to binutils also.  */
+
+extern const struct demangler_engine
+{
+  const char *const demangling_style_name;
+  const enum demangling_styles demangling_style;
+  const char *const demangling_style_doc;
+} libiberty_demanglers[];
+
+extern char *
+cplus_demangle (const char *mangled, int options);
+
+extern int
+cplus_demangle_opname (const char *opname, char *result, int options);
+
+extern const char *
+cplus_mangle_opname (const char *opname, int options);
+
+/* Note: This sets global state.  FIXME if you care about multi-threading. */
+
+extern void
+set_cplus_marker_for_demangling (int ch);
+
+extern enum demangling_styles 
+cplus_demangle_set_style (enum demangling_styles style);
+
+extern enum demangling_styles 
+cplus_demangle_name_to_style (const char *name);
+
+/* Callback typedef for allocation-less demangler interfaces. */
+typedef void (*demangle_callbackref) (const char *, size_t, void *);
+
+/* V3 ABI demangling entry points, defined in cp-demangle.c.  Callback
+   variants return non-zero on success, zero on error.  char* variants
+   return a string allocated by malloc on success, NULL on error.  */
+extern int
+cplus_demangle_v3_callback (const char *mangled, int options,
+                            demangle_callbackref callback, void *opaque);
+
+extern char*
+cplus_demangle_v3 (const char *mangled, int options);
+
+extern int
+java_demangle_v3_callback (const char *mangled,
+                           demangle_callbackref callback, void *opaque);
+
+extern char*
+java_demangle_v3 (const char *mangled);
+
+char *
+ada_demangle (const char *mangled, int options);
+
+enum gnu_v3_ctor_kinds {
+  gnu_v3_complete_object_ctor = 1,
+  gnu_v3_base_object_ctor,
+  gnu_v3_complete_object_allocating_ctor
+};
+
+/* Return non-zero iff NAME is the mangled form of a constructor name
+   in the G++ V3 ABI demangling style.  Specifically, return an `enum
+   gnu_v3_ctor_kinds' value indicating what kind of constructor
+   it is.  */
+extern enum gnu_v3_ctor_kinds
+	is_gnu_v3_mangled_ctor (const char *name);
+
+
+enum gnu_v3_dtor_kinds {
+  gnu_v3_deleting_dtor = 1,
+  gnu_v3_complete_object_dtor,
+  gnu_v3_base_object_dtor
+};
+
+/* Return non-zero iff NAME is the mangled form of a destructor name
+   in the G++ V3 ABI demangling style.  Specifically, return an `enum
+   gnu_v3_dtor_kinds' value, indicating what kind of destructor
+   it is.  */
+extern enum gnu_v3_dtor_kinds
+	is_gnu_v3_mangled_dtor (const char *name);
+
+/* The V3 demangler works in two passes.  The first pass builds a tree
+   representation of the mangled name, and the second pass turns the
+   tree representation into a demangled string.  Here we define an
+   interface to permit a caller to build their own tree
+   representation, which they can pass to the demangler to get a
+   demangled string.  This can be used to canonicalize user input into
+   something which the demangler might output.  It could also be used
+   by other demanglers in the future.  */
+
+/* These are the component types which may be found in the tree.  Many
+   component types have one or two subtrees, referred to as left and
+   right (a component type with only one subtree puts it in the left
+   subtree).  */
+
+enum demangle_component_type
+{
+  /* A name, with a length and a pointer to a string.  */
+  DEMANGLE_COMPONENT_NAME,
+  /* A qualified name.  The left subtree is a class or namespace or
+     some such thing, and the right subtree is a name qualified by
+     that class.  */
+  DEMANGLE_COMPONENT_QUAL_NAME,
+  /* A local name.  The left subtree describes a function, and the
+     right subtree is a name which is local to that function.  */
+  DEMANGLE_COMPONENT_LOCAL_NAME,
+  /* A typed name.  The left subtree is a name, and the right subtree
+     describes that name as a function.  */
+  DEMANGLE_COMPONENT_TYPED_NAME,
+  /* A template.  The left subtree is a template name, and the right
+     subtree is a template argument list.  */
+  DEMANGLE_COMPONENT_TEMPLATE,
+  /* A template parameter.  This holds a number, which is the template
+     parameter index.  */
+  DEMANGLE_COMPONENT_TEMPLATE_PARAM,
+  /* A function parameter.  This holds a number, which is the index.  */
+  DEMANGLE_COMPONENT_FUNCTION_PARAM,
+  /* A constructor.  This holds a name and the kind of
+     constructor.  */
+  DEMANGLE_COMPONENT_CTOR,
+  /* A destructor.  This holds a name and the kind of destructor.  */
+  DEMANGLE_COMPONENT_DTOR,
+  /* A vtable.  This has one subtree, the type for which this is a
+     vtable.  */
+  DEMANGLE_COMPONENT_VTABLE,
+  /* A VTT structure.  This has one subtree, the type for which this
+     is a VTT.  */
+  DEMANGLE_COMPONENT_VTT,
+  /* A construction vtable.  The left subtree is the type for which
+     this is a vtable, and the right subtree is the derived type for
+     which this vtable is built.  */
+  DEMANGLE_COMPONENT_CONSTRUCTION_VTABLE,
+  /* A typeinfo structure.  This has one subtree, the type for which
+     this is the tpeinfo structure.  */
+  DEMANGLE_COMPONENT_TYPEINFO,
+  /* A typeinfo name.  This has one subtree, the type for which this
+     is the typeinfo name.  */
+  DEMANGLE_COMPONENT_TYPEINFO_NAME,
+  /* A typeinfo function.  This has one subtree, the type for which
+     this is the tpyeinfo function.  */
+  DEMANGLE_COMPONENT_TYPEINFO_FN,
+  /* A thunk.  This has one subtree, the name for which this is a
+     thunk.  */
+  DEMANGLE_COMPONENT_THUNK,
+  /* A virtual thunk.  This has one subtree, the name for which this
+     is a virtual thunk.  */
+  DEMANGLE_COMPONENT_VIRTUAL_THUNK,
+  /* A covariant thunk.  This has one subtree, the name for which this
+     is a covariant thunk.  */
+  DEMANGLE_COMPONENT_COVARIANT_THUNK,
+  /* A Java class.  This has one subtree, the type.  */
+  DEMANGLE_COMPONENT_JAVA_CLASS,
+  /* A guard variable.  This has one subtree, the name for which this
+     is a guard variable.  */
+  DEMANGLE_COMPONENT_GUARD,
+  /* A reference temporary.  This has one subtree, the name for which
+     this is a temporary.  */
+  DEMANGLE_COMPONENT_REFTEMP,
+  /* A hidden alias.  This has one subtree, the encoding for which it
+     is providing alternative linkage.  */
+  DEMANGLE_COMPONENT_HIDDEN_ALIAS,
+  /* A standard substitution.  This holds the name of the
+     substitution.  */
+  DEMANGLE_COMPONENT_SUB_STD,
+  /* The restrict qualifier.  The one subtree is the type which is
+     being qualified.  */
+  DEMANGLE_COMPONENT_RESTRICT,
+  /* The volatile qualifier.  The one subtree is the type which is
+     being qualified.  */
+  DEMANGLE_COMPONENT_VOLATILE,
+  /* The const qualifier.  The one subtree is the type which is being
+     qualified.  */
+  DEMANGLE_COMPONENT_CONST,
+  /* The restrict qualifier modifying a member function.  The one
+     subtree is the type which is being qualified.  */
+  DEMANGLE_COMPONENT_RESTRICT_THIS,
+  /* The volatile qualifier modifying a member function.  The one
+     subtree is the type which is being qualified.  */
+  DEMANGLE_COMPONENT_VOLATILE_THIS,
+  /* The const qualifier modifying a member function.  The one subtree
+     is the type which is being qualified.  */
+  DEMANGLE_COMPONENT_CONST_THIS,
+  /* A vendor qualifier.  The left subtree is the type which is being
+     qualified, and the right subtree is the name of the
+     qualifier.  */
+  DEMANGLE_COMPONENT_VENDOR_TYPE_QUAL,
+  /* A pointer.  The one subtree is the type which is being pointed
+     to.  */
+  DEMANGLE_COMPONENT_POINTER,
+  /* A reference.  The one subtree is the type which is being
+     referenced.  */
+  DEMANGLE_COMPONENT_REFERENCE,
+  /* C++0x: An rvalue reference.  The one subtree is the type which is
+     being referenced.  */
+  DEMANGLE_COMPONENT_RVALUE_REFERENCE,
+  /* A complex type.  The one subtree is the base type.  */
+  DEMANGLE_COMPONENT_COMPLEX,
+  /* An imaginary type.  The one subtree is the base type.  */
+  DEMANGLE_COMPONENT_IMAGINARY,
+  /* A builtin type.  This holds the builtin type information.  */
+  DEMANGLE_COMPONENT_BUILTIN_TYPE,
+  /* A vendor's builtin type.  This holds the name of the type.  */
+  DEMANGLE_COMPONENT_VENDOR_TYPE,
+  /* A function type.  The left subtree is the return type.  The right
+     subtree is a list of ARGLIST nodes.  Either or both may be
+     NULL.  */
+  DEMANGLE_COMPONENT_FUNCTION_TYPE,
+  /* An array type.  The left subtree is the dimension, which may be
+     NULL, or a string (represented as DEMANGLE_COMPONENT_NAME), or an
+     expression.  The right subtree is the element type.  */
+  DEMANGLE_COMPONENT_ARRAY_TYPE,
+  /* A pointer to member type.  The left subtree is the class type,
+     and the right subtree is the member type.  CV-qualifiers appear
+     on the latter.  */
+  DEMANGLE_COMPONENT_PTRMEM_TYPE,
+  /* A fixed-point type.  */
+  DEMANGLE_COMPONENT_FIXED_TYPE,
+  /* A vector type.  The left subtree is the number of elements,
+     the right subtree is the element type.  */
+  DEMANGLE_COMPONENT_VECTOR_TYPE,
+  /* An argument list.  The left subtree is the current argument, and
+     the right subtree is either NULL or another ARGLIST node.  */
+  DEMANGLE_COMPONENT_ARGLIST,
+  /* A template argument list.  The left subtree is the current
+     template argument, and the right subtree is either NULL or
+     another TEMPLATE_ARGLIST node.  */
+  DEMANGLE_COMPONENT_TEMPLATE_ARGLIST,
+  /* An operator.  This holds information about a standard
+     operator.  */
+  DEMANGLE_COMPONENT_OPERATOR,
+  /* An extended operator.  This holds the number of arguments, and
+     the name of the extended operator.  */
+  DEMANGLE_COMPONENT_EXTENDED_OPERATOR,
+  /* A typecast, represented as a unary operator.  The one subtree is
+     the type to which the argument should be cast.  */
+  DEMANGLE_COMPONENT_CAST,
+  /* A unary expression.  The left subtree is the operator, and the
+     right subtree is the single argument.  */
+  DEMANGLE_COMPONENT_UNARY,
+  /* A binary expression.  The left subtree is the operator, and the
+     right subtree is a BINARY_ARGS.  */
+  DEMANGLE_COMPONENT_BINARY,
+  /* Arguments to a binary expression.  The left subtree is the first
+     argument, and the right subtree is the second argument.  */
+  DEMANGLE_COMPONENT_BINARY_ARGS,
+  /* A trinary expression.  The left subtree is the operator, and the
+     right subtree is a TRINARY_ARG1.  */
+  DEMANGLE_COMPONENT_TRINARY,
+  /* Arguments to a trinary expression.  The left subtree is the first
+     argument, and the right subtree is a TRINARY_ARG2.  */
+  DEMANGLE_COMPONENT_TRINARY_ARG1,
+  /* More arguments to a trinary expression.  The left subtree is the
+     second argument, and the right subtree is the third argument.  */
+  DEMANGLE_COMPONENT_TRINARY_ARG2,
+  /* A literal.  The left subtree is the type, and the right subtree
+     is the value, represented as a DEMANGLE_COMPONENT_NAME.  */
+  DEMANGLE_COMPONENT_LITERAL,
+  /* A negative literal.  Like LITERAL, but the value is negated.
+     This is a minor hack: the NAME used for LITERAL points directly
+     to the mangled string, but since negative numbers are mangled
+     using 'n' instead of '-', we want a way to indicate a negative
+     number which involves neither modifying the mangled string nor
+     allocating a new copy of the literal in memory.  */
+  DEMANGLE_COMPONENT_LITERAL_NEG,
+  /* A libgcj compiled resource.  The left subtree is the name of the
+     resource.  */
+  DEMANGLE_COMPONENT_JAVA_RESOURCE,
+  /* A name formed by the concatenation of two parts.  The left
+     subtree is the first part and the right subtree the second.  */
+  DEMANGLE_COMPONENT_COMPOUND_NAME,
+  /* A name formed by a single character.  */
+  DEMANGLE_COMPONENT_CHARACTER,
+  /* A number.  */
+  DEMANGLE_COMPONENT_NUMBER,
+  /* A decltype type.  */
+  DEMANGLE_COMPONENT_DECLTYPE,
+  /* Global constructors keyed to name.  */
+  DEMANGLE_COMPONENT_GLOBAL_CONSTRUCTORS,
+  /* Global destructors keyed to name.  */
+  DEMANGLE_COMPONENT_GLOBAL_DESTRUCTORS,
+  /* A lambda closure type.  */
+  DEMANGLE_COMPONENT_LAMBDA,
+  /* A default argument scope.  */
+  DEMANGLE_COMPONENT_DEFAULT_ARG,
+  /* An unnamed type.  */
+  DEMANGLE_COMPONENT_UNNAMED_TYPE,
+  /* A pack expansion.  */
+  DEMANGLE_COMPONENT_PACK_EXPANSION
+};
+
+/* Types which are only used internally.  */
+
+struct demangle_operator_info;
+struct demangle_builtin_type_info;
+
+/* A node in the tree representation is an instance of a struct
+   demangle_component.  Note that the field names of the struct are
+   not well protected against macros defined by the file including
+   this one.  We can fix this if it ever becomes a problem.  */
+
+struct demangle_component
+{
+  /* The type of this component.  */
+  enum demangle_component_type type;
+
+  union
+  {
+    /* For DEMANGLE_COMPONENT_NAME.  */
+    struct
+    {
+      /* A pointer to the name (which need not NULL terminated) and
+	 its length.  */
+      const char *s;
+      int len;
+    } s_name;
+
+    /* For DEMANGLE_COMPONENT_OPERATOR.  */
+    struct
+    {
+      /* Operator.  */
+      const struct demangle_operator_info *op;
+    } s_operator;
+
+    /* For DEMANGLE_COMPONENT_EXTENDED_OPERATOR.  */
+    struct
+    {
+      /* Number of arguments.  */
+      int args;
+      /* Name.  */
+      struct demangle_component *name;
+    } s_extended_operator;
+
+    /* For DEMANGLE_COMPONENT_FIXED_TYPE.  */
+    struct
+    {
+      /* The length, indicated by a C integer type name.  */
+      struct demangle_component *length;
+      /* _Accum or _Fract?  */
+      short accum;
+      /* Saturating or not?  */
+      short sat;
+    } s_fixed;
+
+    /* For DEMANGLE_COMPONENT_CTOR.  */
+    struct
+    {
+      /* Kind of constructor.  */
+      enum gnu_v3_ctor_kinds kind;
+      /* Name.  */
+      struct demangle_component *name;
+    } s_ctor;
+
+    /* For DEMANGLE_COMPONENT_DTOR.  */
+    struct
+    {
+      /* Kind of destructor.  */
+      enum gnu_v3_dtor_kinds kind;
+      /* Name.  */
+      struct demangle_component *name;
+    } s_dtor;
+
+    /* For DEMANGLE_COMPONENT_BUILTIN_TYPE.  */
+    struct
+    {
+      /* Builtin type.  */
+      const struct demangle_builtin_type_info *type;
+    } s_builtin;
+
+    /* For DEMANGLE_COMPONENT_SUB_STD.  */
+    struct
+    {
+      /* Standard substitution string.  */
+      const char* string;
+      /* Length of string.  */
+      int len;
+    } s_string;
+
+    /* For DEMANGLE_COMPONENT_*_PARAM.  */
+    struct
+    {
+      /* Parameter index.  */
+      long number;
+    } s_number;
+
+    /* For DEMANGLE_COMPONENT_CHARACTER.  */
+    struct
+    {
+      int character;
+    } s_character;
+
+    /* For other types.  */
+    struct
+    {
+      /* Left (or only) subtree.  */
+      struct demangle_component *left;
+      /* Right subtree.  */
+      struct demangle_component *right;
+    } s_binary;
+
+    struct
+    {
+      /* subtree, same place as d_left.  */
+      struct demangle_component *sub;
+      /* integer.  */
+      int num;
+    } s_unary_num;
+
+  } u;
+};
+
+/* People building mangled trees are expected to allocate instances of
+   struct demangle_component themselves.  They can then call one of
+   the following functions to fill them in.  */
+
+/* Fill in most component types with a left subtree and a right
+   subtree.  Returns non-zero on success, zero on failure, such as an
+   unrecognized or inappropriate component type.  */
+
+extern int
+cplus_demangle_fill_component (struct demangle_component *fill,
+                               enum demangle_component_type,
+                               struct demangle_component *left,
+                               struct demangle_component *right);
+
+/* Fill in a DEMANGLE_COMPONENT_NAME.  Returns non-zero on success,
+   zero for bad arguments.  */
+
+extern int
+cplus_demangle_fill_name (struct demangle_component *fill,
+                          const char *, int);
+
+/* Fill in a DEMANGLE_COMPONENT_BUILTIN_TYPE, using the name of the
+   builtin type (e.g., "int", etc.).  Returns non-zero on success,
+   zero if the type is not recognized.  */
+
+extern int
+cplus_demangle_fill_builtin_type (struct demangle_component *fill,
+                                  const char *type_name);
+
+/* Fill in a DEMANGLE_COMPONENT_OPERATOR, using the name of the
+   operator and the number of arguments which it takes (the latter is
+   used to disambiguate operators which can be both binary and unary,
+   such as '-').  Returns non-zero on success, zero if the operator is
+   not recognized.  */
+
+extern int
+cplus_demangle_fill_operator (struct demangle_component *fill,
+                              const char *opname, int args);
+
+/* Fill in a DEMANGLE_COMPONENT_EXTENDED_OPERATOR, providing the
+   number of arguments and the name.  Returns non-zero on success,
+   zero for bad arguments.  */
+
+extern int
+cplus_demangle_fill_extended_operator (struct demangle_component *fill,
+                                       int numargs,
+                                       struct demangle_component *nm);
+
+/* Fill in a DEMANGLE_COMPONENT_CTOR.  Returns non-zero on success,
+   zero for bad arguments.  */
+
+extern int
+cplus_demangle_fill_ctor (struct demangle_component *fill,
+                          enum gnu_v3_ctor_kinds kind,
+                          struct demangle_component *name);
+
+/* Fill in a DEMANGLE_COMPONENT_DTOR.  Returns non-zero on success,
+   zero for bad arguments.  */
+
+extern int
+cplus_demangle_fill_dtor (struct demangle_component *fill,
+                          enum gnu_v3_dtor_kinds kind,
+                          struct demangle_component *name);
+
+/* This function translates a mangled name into a struct
+   demangle_component tree.  The first argument is the mangled name.
+   The second argument is DMGL_* options.  This returns a pointer to a
+   tree on success, or NULL on failure.  On success, the third
+   argument is set to a block of memory allocated by malloc.  This
+   block should be passed to free when the tree is no longer
+   needed.  */
+
+extern struct demangle_component *
+cplus_demangle_v3_components (const char *mangled, int options, void **mem);
+
+/* This function takes a struct demangle_component tree and returns
+   the corresponding demangled string.  The first argument is DMGL_*
+   options.  The second is the tree to demangle.  The third is a guess
+   at the length of the demangled string, used to initially allocate
+   the return buffer.  The fourth is a pointer to a size_t.  On
+   success, this function returns a buffer allocated by malloc(), and
+   sets the size_t pointed to by the fourth argument to the size of
+   the allocated buffer (not the length of the returned string).  On
+   failure, this function returns NULL, and sets the size_t pointed to
+   by the fourth argument to 0 for an invalid tree, or to 1 for a
+   memory allocation error.  */
+
+extern char *
+cplus_demangle_print (int options,
+                      const struct demangle_component *tree,
+                      int estimated_length,
+                      size_t *p_allocated_size);
+
+/* This function takes a struct demangle_component tree and passes back
+   a demangled string in one or more calls to a callback function.
+   The first argument is DMGL_* options.  The second is the tree to
+   demangle.  The third is a pointer to a callback function; on each call
+   this receives an element of the demangled string, its length, and an
+   opaque value.  The fourth is the opaque value passed to the callback.
+   The callback is called once or more to return the full demangled
+   string.  The demangled element string is always nul-terminated, though
+   its length is also provided for convenience.  In contrast to
+   cplus_demangle_print(), this function does not allocate heap memory
+   to grow output strings (except perhaps where alloca() is implemented
+   by malloc()), and so is normally safe for use where the heap has been
+   corrupted.  On success, this function returns 1; on failure, 0.  */
+
+extern int
+cplus_demangle_print_callback (int options,
+                               const struct demangle_component *tree,
+                               demangle_callbackref callback, void *opaque);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif	/* DEMANGLE_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/dwarf2.h sdcc-3.2.0+dfsg/support/sdbinutils/include/dwarf2.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/dwarf2.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/dwarf2.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,922 @@
+/* Declarations and definitions of codes relating to the DWARF2 and
+   DWARF3 symbolic debugging information formats.
+   Copyright (C) 1992, 1993, 1995, 1996, 1997, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   Written by Gary Funck (gary@intrepid.com) The Ada Joint Program
+   Office (AJPO), Florida State University and Silicon Graphics Inc.
+   provided support for this effort -- June 21, 1995.
+
+   Derived from the DWARF 1 implementation written by Ron Guilmette
+   (rfg@netcom.com), November 1990.
+
+   This file is part of GCC.
+
+   GCC is free software; you can redistribute it and/or modify it under
+   the terms of the GNU General Public License as published by the Free
+   Software Foundation; either version 3, or (at your option) any later
+   version.
+
+   GCC 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.
+
+   Under Section 7 of GPL version 3, you are granted additional
+   permissions described in the GCC Runtime Library Exception, version
+   3.1, as published by the Free Software Foundation.
+
+   You should have received a copy of the GNU General Public License and
+   a copy of the GCC Runtime Library Exception along with this program;
+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+/* This file is derived from the DWARF specification (a public document)
+   Revision 2.0.0 (July 27, 1993) developed by the UNIX International
+   Programming Languages Special Interest Group (UI/PLSIG) and distributed
+   by UNIX International.  Copies of this specification are available from
+   UNIX International, 20 Waterview Boulevard, Parsippany, NJ, 07054.
+
+   This file also now contains definitions from the DWARF 3 specification
+   published Dec 20, 2005, available from: http://dwarf.freestandards.org.  */
+
+/* This file is shared between GCC and GDB, and should not contain
+   prototypes.  */
+
+#ifndef _DWARF2_H
+#define _DWARF2_H
+
+/* Tag names and codes.  */
+enum dwarf_tag
+  {
+    DW_TAG_padding = 0x00,
+    DW_TAG_array_type = 0x01,
+    DW_TAG_class_type = 0x02,
+    DW_TAG_entry_point = 0x03,
+    DW_TAG_enumeration_type = 0x04,
+    DW_TAG_formal_parameter = 0x05,
+    DW_TAG_imported_declaration = 0x08,
+    DW_TAG_label = 0x0a,
+    DW_TAG_lexical_block = 0x0b,
+    DW_TAG_member = 0x0d,
+    DW_TAG_pointer_type = 0x0f,
+    DW_TAG_reference_type = 0x10,
+    DW_TAG_compile_unit = 0x11,
+    DW_TAG_string_type = 0x12,
+    DW_TAG_structure_type = 0x13,
+    DW_TAG_subroutine_type = 0x15,
+    DW_TAG_typedef = 0x16,
+    DW_TAG_union_type = 0x17,
+    DW_TAG_unspecified_parameters = 0x18,
+    DW_TAG_variant = 0x19,
+    DW_TAG_common_block = 0x1a,
+    DW_TAG_common_inclusion = 0x1b,
+    DW_TAG_inheritance = 0x1c,
+    DW_TAG_inlined_subroutine = 0x1d,
+    DW_TAG_module = 0x1e,
+    DW_TAG_ptr_to_member_type = 0x1f,
+    DW_TAG_set_type = 0x20,
+    DW_TAG_subrange_type = 0x21,
+    DW_TAG_with_stmt = 0x22,
+    DW_TAG_access_declaration = 0x23,
+    DW_TAG_base_type = 0x24,
+    DW_TAG_catch_block = 0x25,
+    DW_TAG_const_type = 0x26,
+    DW_TAG_constant = 0x27,
+    DW_TAG_enumerator = 0x28,
+    DW_TAG_file_type = 0x29,
+    DW_TAG_friend = 0x2a,
+    DW_TAG_namelist = 0x2b,
+    DW_TAG_namelist_item = 0x2c,
+    DW_TAG_packed_type = 0x2d,
+    DW_TAG_subprogram = 0x2e,
+    DW_TAG_template_type_param = 0x2f,
+    DW_TAG_template_value_param = 0x30,
+    DW_TAG_thrown_type = 0x31,
+    DW_TAG_try_block = 0x32,
+    DW_TAG_variant_part = 0x33,
+    DW_TAG_variable = 0x34,
+    DW_TAG_volatile_type = 0x35,
+    /* DWARF 3.  */
+    DW_TAG_dwarf_procedure = 0x36,
+    DW_TAG_restrict_type = 0x37,
+    DW_TAG_interface_type = 0x38,
+    DW_TAG_namespace = 0x39,
+    DW_TAG_imported_module = 0x3a,
+    DW_TAG_unspecified_type = 0x3b,
+    DW_TAG_partial_unit = 0x3c,
+    DW_TAG_imported_unit = 0x3d,
+    DW_TAG_condition = 0x3f,
+    DW_TAG_shared_type = 0x40,
+    /* DWARF 4.  */
+    DW_TAG_type_unit = 0x41,
+    DW_TAG_rvalue_reference_type = 0x42,
+    DW_TAG_template_alias = 0x43,
+
+    DW_TAG_lo_user = 0x4080,
+    DW_TAG_hi_user = 0xffff,
+
+    /* SGI/MIPS Extensions.  */
+    DW_TAG_MIPS_loop = 0x4081,
+
+    /* HP extensions.  See: ftp://ftp.hp.com/pub/lang/tools/WDB/wdb-4.0.tar.gz .  */
+    DW_TAG_HP_array_descriptor = 0x4090,
+    DW_TAG_HP_Bliss_field      = 0x4091,
+    DW_TAG_HP_Bliss_field_set  = 0x4092,
+
+    /* GNU extensions.  */
+    DW_TAG_format_label = 0x4101,	/* For FORTRAN 77 and Fortran 90.  */
+    DW_TAG_function_template = 0x4102,	/* For C++.  */
+    DW_TAG_class_template = 0x4103,	/* For C++.  */
+    DW_TAG_GNU_BINCL = 0x4104,
+    DW_TAG_GNU_EINCL = 0x4105,
+    /* Template template parameter.
+       See http://gcc.gnu.org/wiki/TemplateParmsDwarf .  */
+    DW_TAG_GNU_template_template_param = 0x4106,
+
+    /* Template parameter pack extension, specified at
+       http://wiki.dwarfstd.org/index.php?title=C%2B%2B0x:_Variadic_templates
+       The values of these two TAGS are in the DW_TAG_GNU_* space until the tags
+       are properly part of DWARF 5.  */
+    DW_TAG_GNU_template_parameter_pack = 0x4107,
+    DW_TAG_GNU_formal_parameter_pack = 0x4108,
+    /* The GNU call site extension, specified at
+       http://www.dwarfstd.org/ShowIssue.php?issue=100909.2&type=open .
+       The values of these two TAGS are in the DW_TAG_GNU_* space until the tags
+       are properly part of DWARF 5.  */
+    DW_TAG_GNU_call_site = 0x4109,
+    DW_TAG_GNU_call_site_parameter = 0x410a,
+    /* Extensions for UPC.  See: http://upc.gwu.edu/~upc.  */
+    DW_TAG_upc_shared_type = 0x8765,
+    DW_TAG_upc_strict_type = 0x8766,
+    DW_TAG_upc_relaxed_type = 0x8767,
+    /* PGI (STMicroelectronics) extensions.  No documentation available.  */
+    DW_TAG_PGI_kanji_type      = 0xA000,
+    DW_TAG_PGI_interface_block = 0xA020
+  };
+
+/* Flag that tells whether entry has a child or not.  */
+#define DW_children_no   0
+#define	DW_children_yes  1
+
+/* Form names and codes.  */
+enum dwarf_form
+  {
+    DW_FORM_addr = 0x01,
+    DW_FORM_block2 = 0x03,
+    DW_FORM_block4 = 0x04,
+    DW_FORM_data2 = 0x05,
+    DW_FORM_data4 = 0x06,
+    DW_FORM_data8 = 0x07,
+    DW_FORM_string = 0x08,
+    DW_FORM_block = 0x09,
+    DW_FORM_block1 = 0x0a,
+    DW_FORM_data1 = 0x0b,
+    DW_FORM_flag = 0x0c,
+    DW_FORM_sdata = 0x0d,
+    DW_FORM_strp = 0x0e,
+    DW_FORM_udata = 0x0f,
+    DW_FORM_ref_addr = 0x10,
+    DW_FORM_ref1 = 0x11,
+    DW_FORM_ref2 = 0x12,
+    DW_FORM_ref4 = 0x13,
+    DW_FORM_ref8 = 0x14,
+    DW_FORM_ref_udata = 0x15,
+    DW_FORM_indirect = 0x16,
+    /* DWARF 4.  */
+    DW_FORM_sec_offset = 0x17,
+    DW_FORM_exprloc = 0x18,
+    DW_FORM_flag_present = 0x19,
+    DW_FORM_ref_sig8 = 0x20
+  };
+
+/* Attribute names and codes.  */
+enum dwarf_attribute
+  {
+    DW_AT_sibling = 0x01,
+    DW_AT_location = 0x02,
+    DW_AT_name = 0x03,
+    DW_AT_ordering = 0x09,
+    DW_AT_subscr_data = 0x0a,
+    DW_AT_byte_size = 0x0b,
+    DW_AT_bit_offset = 0x0c,
+    DW_AT_bit_size = 0x0d,
+    DW_AT_element_list = 0x0f,
+    DW_AT_stmt_list = 0x10,
+    DW_AT_low_pc = 0x11,
+    DW_AT_high_pc = 0x12,
+    DW_AT_language = 0x13,
+    DW_AT_member = 0x14,
+    DW_AT_discr = 0x15,
+    DW_AT_discr_value = 0x16,
+    DW_AT_visibility = 0x17,
+    DW_AT_import = 0x18,
+    DW_AT_string_length = 0x19,
+    DW_AT_common_reference = 0x1a,
+    DW_AT_comp_dir = 0x1b,
+    DW_AT_const_value = 0x1c,
+    DW_AT_containing_type = 0x1d,
+    DW_AT_default_value = 0x1e,
+    DW_AT_inline = 0x20,
+    DW_AT_is_optional = 0x21,
+    DW_AT_lower_bound = 0x22,
+    DW_AT_producer = 0x25,
+    DW_AT_prototyped = 0x27,
+    DW_AT_return_addr = 0x2a,
+    DW_AT_start_scope = 0x2c,
+    DW_AT_bit_stride = 0x2e,
+#define DW_AT_stride_size   DW_AT_bit_stride  /* Note: The use of DW_AT_stride_size is deprecated.  */
+    DW_AT_upper_bound = 0x2f,
+    DW_AT_abstract_origin = 0x31,
+    DW_AT_accessibility = 0x32,
+    DW_AT_address_class = 0x33,
+    DW_AT_artificial = 0x34,
+    DW_AT_base_types = 0x35,
+    DW_AT_calling_convention = 0x36,
+    DW_AT_count = 0x37,
+    DW_AT_data_member_location = 0x38,
+    DW_AT_decl_column = 0x39,
+    DW_AT_decl_file = 0x3a,
+    DW_AT_decl_line = 0x3b,
+    DW_AT_declaration = 0x3c,
+    DW_AT_discr_list = 0x3d,
+    DW_AT_encoding = 0x3e,
+    DW_AT_external = 0x3f,
+    DW_AT_frame_base = 0x40,
+    DW_AT_friend = 0x41,
+    DW_AT_identifier_case = 0x42,
+    DW_AT_macro_info = 0x43,
+    DW_AT_namelist_items = 0x44,
+    DW_AT_priority = 0x45,
+    DW_AT_segment = 0x46,
+    DW_AT_specification = 0x47,
+    DW_AT_static_link = 0x48,
+    DW_AT_type = 0x49,
+    DW_AT_use_location = 0x4a,
+    DW_AT_variable_parameter = 0x4b,
+    DW_AT_virtuality = 0x4c,
+    DW_AT_vtable_elem_location = 0x4d,
+    /* DWARF 3 values.  */
+    DW_AT_allocated     = 0x4e,
+    DW_AT_associated    = 0x4f,
+    DW_AT_data_location = 0x50,
+    DW_AT_byte_stride   = 0x51,
+#define DW_AT_stride   DW_AT_byte_stride  /* Note: The use of DW_AT_stride is deprecated.  */
+    DW_AT_entry_pc      = 0x52,
+    DW_AT_use_UTF8      = 0x53,
+    DW_AT_extension     = 0x54,
+    DW_AT_ranges        = 0x55,
+    DW_AT_trampoline    = 0x56,
+    DW_AT_call_column   = 0x57,
+    DW_AT_call_file     = 0x58,
+    DW_AT_call_line     = 0x59,
+    DW_AT_description   = 0x5a,
+    DW_AT_binary_scale  = 0x5b,
+    DW_AT_decimal_scale = 0x5c,
+    DW_AT_small         = 0x5d,
+    DW_AT_decimal_sign  = 0x5e,
+    DW_AT_digit_count   = 0x5f,
+    DW_AT_picture_string = 0x60,
+    DW_AT_mutable       = 0x61,
+    DW_AT_threads_scaled = 0x62,
+    DW_AT_explicit      = 0x63,
+    DW_AT_object_pointer = 0x64,
+    DW_AT_endianity     = 0x65,
+    DW_AT_elemental     = 0x66,
+    DW_AT_pure          = 0x67,
+    DW_AT_recursive     = 0x68,
+    /* DWARF 4.  */
+    DW_AT_signature       = 0x69,
+    DW_AT_main_subprogram = 0x6a,
+    DW_AT_data_bit_offset = 0x6b,
+    DW_AT_const_expr      = 0x6c,
+    DW_AT_enum_class      = 0x6d,
+    DW_AT_linkage_name    = 0x6e,
+
+    DW_AT_lo_user = 0x2000,	/* Implementation-defined range start.  */
+    DW_AT_hi_user = 0x3fff,	/* Implementation-defined range end.  */
+
+    /* SGI/MIPS extensions.  */
+    DW_AT_MIPS_fde = 0x2001,
+    DW_AT_MIPS_loop_begin = 0x2002,
+    DW_AT_MIPS_tail_loop_begin = 0x2003,
+    DW_AT_MIPS_epilog_begin = 0x2004,
+    DW_AT_MIPS_loop_unroll_factor = 0x2005,
+    DW_AT_MIPS_software_pipeline_depth = 0x2006,
+    DW_AT_MIPS_linkage_name = 0x2007,
+    DW_AT_MIPS_stride = 0x2008,
+    DW_AT_MIPS_abstract_name = 0x2009,
+    DW_AT_MIPS_clone_origin = 0x200a,
+    DW_AT_MIPS_has_inlines = 0x200b,
+    /* HP extensions.  */
+    DW_AT_HP_block_index         = 0x2000,
+    DW_AT_HP_unmodifiable        = 0x2001, /* Same as DW_AT_MIPS_fde.  */
+    DW_AT_HP_prologue            = 0x2005, /* Same as DW_AT_MIPS_loop_unroll.  */
+    DW_AT_HP_epilogue            = 0x2008, /* Same as DW_AT_MIPS_stride.  */
+    DW_AT_HP_actuals_stmt_list   = 0x2010,
+    DW_AT_HP_proc_per_section    = 0x2011,
+    DW_AT_HP_raw_data_ptr        = 0x2012,
+    DW_AT_HP_pass_by_reference   = 0x2013,
+    DW_AT_HP_opt_level           = 0x2014,
+    DW_AT_HP_prof_version_id     = 0x2015,
+    DW_AT_HP_opt_flags           = 0x2016,
+    DW_AT_HP_cold_region_low_pc  = 0x2017,
+    DW_AT_HP_cold_region_high_pc = 0x2018,
+    DW_AT_HP_all_variables_modifiable = 0x2019,
+    DW_AT_HP_linkage_name        = 0x201a,
+    DW_AT_HP_prof_flags          = 0x201b,  /* In comp unit of procs_info for -g.  */
+    DW_AT_HP_unit_name           = 0x201f,
+    DW_AT_HP_unit_size           = 0x2020,
+    DW_AT_HP_widened_byte_size   = 0x2021,
+    DW_AT_HP_definition_points   = 0x2022,
+    DW_AT_HP_default_location    = 0x2023,
+    DW_AT_HP_is_result_param     = 0x2029,
+
+    /* GNU extensions.  */
+    DW_AT_sf_names   = 0x2101,
+    DW_AT_src_info   = 0x2102,
+    DW_AT_mac_info   = 0x2103,
+    DW_AT_src_coords = 0x2104,
+    DW_AT_body_begin = 0x2105,
+    DW_AT_body_end   = 0x2106,
+    DW_AT_GNU_vector = 0x2107,
+    /* Thread-safety annotations.
+       See http://gcc.gnu.org/wiki/ThreadSafetyAnnotation .  */
+    DW_AT_GNU_guarded_by    = 0x2108,
+    DW_AT_GNU_pt_guarded_by = 0x2109,
+    DW_AT_GNU_guarded       = 0x210a,
+    DW_AT_GNU_pt_guarded    = 0x210b,
+    DW_AT_GNU_locks_excluded = 0x210c,
+    DW_AT_GNU_exclusive_locks_required = 0x210d,
+    DW_AT_GNU_shared_locks_required = 0x210e,
+    /* One-definition rule violation detection.
+       See http://gcc.gnu.org/wiki/DwarfSeparateTypeInfo .  */
+    DW_AT_GNU_odr_signature = 0x210f,
+    /* Template template argument name.
+       See http://gcc.gnu.org/wiki/TemplateParmsDwarf .  */
+    DW_AT_GNU_template_name = 0x2110,
+    /* The GNU call site extension.
+       See http://www.dwarfstd.org/ShowIssue.php?issue=100909.2&type=open .  */
+    DW_AT_GNU_call_site_value = 0x2111,
+    DW_AT_GNU_call_site_data_value = 0x2112,
+    DW_AT_GNU_call_site_target = 0x2113,
+    DW_AT_GNU_call_site_target_clobbered = 0x2114,
+    DW_AT_GNU_tail_call = 0x2115,
+    DW_AT_GNU_all_tail_call_sites = 0x2116,
+    DW_AT_GNU_all_call_sites = 0x2117,
+    DW_AT_GNU_all_source_call_sites = 0x2118,
+    /* Section offset into .debug_macro section.  */
+    DW_AT_GNU_macros = 0x2119,
+    /* VMS extensions.  */
+    DW_AT_VMS_rtnbeg_pd_address = 0x2201,
+    /* GNAT extensions.  */
+    /* GNAT descriptive type.
+       See http://gcc.gnu.org/wiki/DW_AT_GNAT_descriptive_type .  */
+    DW_AT_use_GNAT_descriptive_type = 0x2301,
+    DW_AT_GNAT_descriptive_type	= 0x2302,
+    /* UPC extension.  */
+    DW_AT_upc_threads_scaled = 0x3210,
+    /* PGI (STMicroelectronics) extensions.  */
+    DW_AT_PGI_lbase    = 0x3a00,
+    DW_AT_PGI_soffset  = 0x3a01,
+    DW_AT_PGI_lstride  = 0x3a02
+  };
+
+/* Location atom names and codes.  */
+enum dwarf_location_atom
+  {
+    DW_OP_addr = 0x03,
+    DW_OP_deref = 0x06,
+    DW_OP_const1u = 0x08,
+    DW_OP_const1s = 0x09,
+    DW_OP_const2u = 0x0a,
+    DW_OP_const2s = 0x0b,
+    DW_OP_const4u = 0x0c,
+    DW_OP_const4s = 0x0d,
+    DW_OP_const8u = 0x0e,
+    DW_OP_const8s = 0x0f,
+    DW_OP_constu = 0x10,
+    DW_OP_consts = 0x11,
+    DW_OP_dup = 0x12,
+    DW_OP_drop = 0x13,
+    DW_OP_over = 0x14,
+    DW_OP_pick = 0x15,
+    DW_OP_swap = 0x16,
+    DW_OP_rot = 0x17,
+    DW_OP_xderef = 0x18,
+    DW_OP_abs = 0x19,
+    DW_OP_and = 0x1a,
+    DW_OP_div = 0x1b,
+    DW_OP_minus = 0x1c,
+    DW_OP_mod = 0x1d,
+    DW_OP_mul = 0x1e,
+    DW_OP_neg = 0x1f,
+    DW_OP_not = 0x20,
+    DW_OP_or = 0x21,
+    DW_OP_plus = 0x22,
+    DW_OP_plus_uconst = 0x23,
+    DW_OP_shl = 0x24,
+    DW_OP_shr = 0x25,
+    DW_OP_shra = 0x26,
+    DW_OP_xor = 0x27,
+    DW_OP_bra = 0x28,
+    DW_OP_eq = 0x29,
+    DW_OP_ge = 0x2a,
+    DW_OP_gt = 0x2b,
+    DW_OP_le = 0x2c,
+    DW_OP_lt = 0x2d,
+    DW_OP_ne = 0x2e,
+    DW_OP_skip = 0x2f,
+    DW_OP_lit0 = 0x30,
+    DW_OP_lit1 = 0x31,
+    DW_OP_lit2 = 0x32,
+    DW_OP_lit3 = 0x33,
+    DW_OP_lit4 = 0x34,
+    DW_OP_lit5 = 0x35,
+    DW_OP_lit6 = 0x36,
+    DW_OP_lit7 = 0x37,
+    DW_OP_lit8 = 0x38,
+    DW_OP_lit9 = 0x39,
+    DW_OP_lit10 = 0x3a,
+    DW_OP_lit11 = 0x3b,
+    DW_OP_lit12 = 0x3c,
+    DW_OP_lit13 = 0x3d,
+    DW_OP_lit14 = 0x3e,
+    DW_OP_lit15 = 0x3f,
+    DW_OP_lit16 = 0x40,
+    DW_OP_lit17 = 0x41,
+    DW_OP_lit18 = 0x42,
+    DW_OP_lit19 = 0x43,
+    DW_OP_lit20 = 0x44,
+    DW_OP_lit21 = 0x45,
+    DW_OP_lit22 = 0x46,
+    DW_OP_lit23 = 0x47,
+    DW_OP_lit24 = 0x48,
+    DW_OP_lit25 = 0x49,
+    DW_OP_lit26 = 0x4a,
+    DW_OP_lit27 = 0x4b,
+    DW_OP_lit28 = 0x4c,
+    DW_OP_lit29 = 0x4d,
+    DW_OP_lit30 = 0x4e,
+    DW_OP_lit31 = 0x4f,
+    DW_OP_reg0 = 0x50,
+    DW_OP_reg1 = 0x51,
+    DW_OP_reg2 = 0x52,
+    DW_OP_reg3 = 0x53,
+    DW_OP_reg4 = 0x54,
+    DW_OP_reg5 = 0x55,
+    DW_OP_reg6 = 0x56,
+    DW_OP_reg7 = 0x57,
+    DW_OP_reg8 = 0x58,
+    DW_OP_reg9 = 0x59,
+    DW_OP_reg10 = 0x5a,
+    DW_OP_reg11 = 0x5b,
+    DW_OP_reg12 = 0x5c,
+    DW_OP_reg13 = 0x5d,
+    DW_OP_reg14 = 0x5e,
+    DW_OP_reg15 = 0x5f,
+    DW_OP_reg16 = 0x60,
+    DW_OP_reg17 = 0x61,
+    DW_OP_reg18 = 0x62,
+    DW_OP_reg19 = 0x63,
+    DW_OP_reg20 = 0x64,
+    DW_OP_reg21 = 0x65,
+    DW_OP_reg22 = 0x66,
+    DW_OP_reg23 = 0x67,
+    DW_OP_reg24 = 0x68,
+    DW_OP_reg25 = 0x69,
+    DW_OP_reg26 = 0x6a,
+    DW_OP_reg27 = 0x6b,
+    DW_OP_reg28 = 0x6c,
+    DW_OP_reg29 = 0x6d,
+    DW_OP_reg30 = 0x6e,
+    DW_OP_reg31 = 0x6f,
+    DW_OP_breg0 = 0x70,
+    DW_OP_breg1 = 0x71,
+    DW_OP_breg2 = 0x72,
+    DW_OP_breg3 = 0x73,
+    DW_OP_breg4 = 0x74,
+    DW_OP_breg5 = 0x75,
+    DW_OP_breg6 = 0x76,
+    DW_OP_breg7 = 0x77,
+    DW_OP_breg8 = 0x78,
+    DW_OP_breg9 = 0x79,
+    DW_OP_breg10 = 0x7a,
+    DW_OP_breg11 = 0x7b,
+    DW_OP_breg12 = 0x7c,
+    DW_OP_breg13 = 0x7d,
+    DW_OP_breg14 = 0x7e,
+    DW_OP_breg15 = 0x7f,
+    DW_OP_breg16 = 0x80,
+    DW_OP_breg17 = 0x81,
+    DW_OP_breg18 = 0x82,
+    DW_OP_breg19 = 0x83,
+    DW_OP_breg20 = 0x84,
+    DW_OP_breg21 = 0x85,
+    DW_OP_breg22 = 0x86,
+    DW_OP_breg23 = 0x87,
+    DW_OP_breg24 = 0x88,
+    DW_OP_breg25 = 0x89,
+    DW_OP_breg26 = 0x8a,
+    DW_OP_breg27 = 0x8b,
+    DW_OP_breg28 = 0x8c,
+    DW_OP_breg29 = 0x8d,
+    DW_OP_breg30 = 0x8e,
+    DW_OP_breg31 = 0x8f,
+    DW_OP_regx = 0x90,
+    DW_OP_fbreg = 0x91,
+    DW_OP_bregx = 0x92,
+    DW_OP_piece = 0x93,
+    DW_OP_deref_size = 0x94,
+    DW_OP_xderef_size = 0x95,
+    DW_OP_nop = 0x96,
+    /* DWARF 3 extensions.  */
+    DW_OP_push_object_address = 0x97,
+    DW_OP_call2 = 0x98,
+    DW_OP_call4 = 0x99,
+    DW_OP_call_ref = 0x9a,
+    DW_OP_form_tls_address = 0x9b,
+    DW_OP_call_frame_cfa = 0x9c,
+    DW_OP_bit_piece = 0x9d,
+
+    /* DWARF 4 extensions.  */
+    DW_OP_implicit_value = 0x9e,
+    DW_OP_stack_value = 0x9f,
+
+    DW_OP_lo_user = 0xe0,	/* Implementation-defined range start.  */
+    DW_OP_hi_user = 0xff,	/* Implementation-defined range end.  */
+
+    /* GNU extensions.  */
+    DW_OP_GNU_push_tls_address = 0xe0,
+    /* The following is for marking variables that are uninitialized.  */
+    DW_OP_GNU_uninit     = 0xf0,
+    DW_OP_GNU_encoded_addr = 0xf1,
+    /* The GNU implicit pointer extension.
+       See http://www.dwarfstd.org/ShowIssue.php?issue=100831.1&type=open .  */
+    DW_OP_GNU_implicit_pointer = 0xf2,
+    /* The GNU entry value extension.
+       See http://www.dwarfstd.org/ShowIssue.php?issue=100909.1&type=open .  */
+    DW_OP_GNU_entry_value = 0xf3,
+    /* The GNU typed stack extension.
+       See http://www.dwarfstd.org/doc/040408.1.html .  */
+    DW_OP_GNU_const_type = 0xf4,
+    DW_OP_GNU_regval_type = 0xf5,
+    DW_OP_GNU_deref_type = 0xf6,
+    DW_OP_GNU_convert = 0xf7,
+    DW_OP_GNU_reinterpret = 0xf9,
+    /* The GNU parameter ref extension.  */
+    DW_OP_GNU_parameter_ref = 0xfa,
+    /* HP extensions.  */
+    DW_OP_HP_unknown     = 0xe0, /* Ouch, the same as GNU_push_tls_address.  */
+    DW_OP_HP_is_value    = 0xe1,
+    DW_OP_HP_fltconst4   = 0xe2,
+    DW_OP_HP_fltconst8   = 0xe3,
+    DW_OP_HP_mod_range   = 0xe4,
+    DW_OP_HP_unmod_range = 0xe5,
+    DW_OP_HP_tls         = 0xe6,
+    /* PGI (STMicroelectronics) extensions.  */
+    DW_OP_PGI_omp_thread_num = 0xf8
+  };
+
+/* Type encodings.  */
+enum dwarf_type
+  {
+    DW_ATE_void = 0x0,
+    DW_ATE_address = 0x1,
+    DW_ATE_boolean = 0x2,
+    DW_ATE_complex_float = 0x3,
+    DW_ATE_float = 0x4,
+    DW_ATE_signed = 0x5,
+    DW_ATE_signed_char = 0x6,
+    DW_ATE_unsigned = 0x7,
+    DW_ATE_unsigned_char = 0x8,
+    /* DWARF 3.  */
+    DW_ATE_imaginary_float = 0x9,
+    DW_ATE_packed_decimal = 0xa,
+    DW_ATE_numeric_string = 0xb,
+    DW_ATE_edited = 0xc,
+    DW_ATE_signed_fixed = 0xd,
+    DW_ATE_unsigned_fixed = 0xe,
+    DW_ATE_decimal_float = 0xf,
+    /* DWARF 4.  */
+    DW_ATE_UTF = 0x10,
+
+    DW_ATE_lo_user = 0x80,
+    DW_ATE_hi_user = 0xff,
+
+    /* HP extensions.  */
+    DW_ATE_HP_float80             = 0x80, /* Floating-point (80 bit).  */
+    DW_ATE_HP_complex_float80     = 0x81, /* Complex floating-point (80 bit).  */
+    DW_ATE_HP_float128            = 0x82, /* Floating-point (128 bit).  */
+    DW_ATE_HP_complex_float128    = 0x83, /* Complex fp (128 bit).  */
+    DW_ATE_HP_floathpintel        = 0x84, /* Floating-point (82 bit IA64).  */
+    DW_ATE_HP_imaginary_float80   = 0x85,
+    DW_ATE_HP_imaginary_float128  = 0x86,
+    DW_ATE_HP_VAX_float           = 0x88, /* F or G floating.  */
+    DW_ATE_HP_VAX_float_d         = 0x89, /* D floating.  */
+    DW_ATE_HP_packed_decimal      = 0x8a, /* Cobol.  */
+    DW_ATE_HP_zoned_decimal       = 0x8b, /* Cobol.  */
+    DW_ATE_HP_edited              = 0x8c, /* Cobol.  */
+    DW_ATE_HP_signed_fixed        = 0x8d, /* Cobol.  */
+    DW_ATE_HP_unsigned_fixed      = 0x8e, /* Cobol.  */
+    DW_ATE_HP_VAX_complex_float   = 0x8f, /* F or G floating complex.  */
+    DW_ATE_HP_VAX_complex_float_d = 0x90  /* D floating complex.  */
+  };
+
+/* Decimal sign encodings.  */
+enum dwarf_decimal_sign_encoding
+  {
+    /* DWARF 3.  */
+    DW_DS_unsigned = 0x01,
+    DW_DS_leading_overpunch = 0x02,
+    DW_DS_trailing_overpunch = 0x03,
+    DW_DS_leading_separate = 0x04,
+    DW_DS_trailing_separate = 0x05
+  };
+
+/* Endianity encodings.  */
+enum dwarf_endianity_encoding
+  {
+    /* DWARF 3.  */
+    DW_END_default = 0x00,
+    DW_END_big = 0x01,
+    DW_END_little = 0x02,
+
+    DW_END_lo_user = 0x40,
+    DW_END_hi_user = 0xff
+  };
+
+/* Array ordering names and codes.  */
+enum dwarf_array_dim_ordering
+  {
+    DW_ORD_row_major = 0,
+    DW_ORD_col_major = 1
+  };
+
+/* Access attribute.  */
+enum dwarf_access_attribute
+  {
+    DW_ACCESS_public = 1,
+    DW_ACCESS_protected = 2,
+    DW_ACCESS_private = 3
+  };
+
+/* Visibility.  */
+enum dwarf_visibility_attribute
+  {
+    DW_VIS_local = 1,
+    DW_VIS_exported = 2,
+    DW_VIS_qualified = 3
+  };
+
+/* Virtuality.  */
+enum dwarf_virtuality_attribute
+  {
+    DW_VIRTUALITY_none = 0,
+    DW_VIRTUALITY_virtual = 1,
+    DW_VIRTUALITY_pure_virtual = 2
+  };
+
+/* Case sensitivity.  */
+enum dwarf_id_case
+  {
+    DW_ID_case_sensitive = 0,
+    DW_ID_up_case = 1,
+    DW_ID_down_case = 2,
+    DW_ID_case_insensitive = 3
+  };
+
+/* Calling convention.  */
+enum dwarf_calling_convention
+  {
+    DW_CC_normal = 0x1,
+    DW_CC_program = 0x2,
+    DW_CC_nocall = 0x3,
+
+    DW_CC_lo_user = 0x40,
+    DW_CC_hi_user = 0xff,
+
+    DW_CC_GNU_renesas_sh = 0x40,
+    DW_CC_GNU_borland_fastcall_i386 = 0x41,
+
+    /* This DW_CC_ value is not currently generated by any toolchain.  It is
+       used internally to GDB to indicate OpenCL C functions that have been
+       compiled with the IBM XL C for OpenCL compiler and use a non-platform
+       calling convention for passing OpenCL C vector types.  This value may
+       be changed freely as long as it does not conflict with any other DW_CC_
+       value defined here.  */
+    DW_CC_GDB_IBM_OpenCL = 0xff
+  };
+
+/* Inline attribute.  */
+enum dwarf_inline_attribute
+  {
+    DW_INL_not_inlined = 0,
+    DW_INL_inlined = 1,
+    DW_INL_declared_not_inlined = 2,
+    DW_INL_declared_inlined = 3
+  };
+
+/* Discriminant lists.  */
+enum dwarf_discrim_list
+  {
+    DW_DSC_label = 0,
+    DW_DSC_range = 1
+  };
+
+/* Line number opcodes.  */
+enum dwarf_line_number_ops
+  {
+    DW_LNS_extended_op = 0,
+    DW_LNS_copy = 1,
+    DW_LNS_advance_pc = 2,
+    DW_LNS_advance_line = 3,
+    DW_LNS_set_file = 4,
+    DW_LNS_set_column = 5,
+    DW_LNS_negate_stmt = 6,
+    DW_LNS_set_basic_block = 7,
+    DW_LNS_const_add_pc = 8,
+    DW_LNS_fixed_advance_pc = 9,
+    /* DWARF 3.  */
+    DW_LNS_set_prologue_end = 10,
+    DW_LNS_set_epilogue_begin = 11,
+    DW_LNS_set_isa = 12
+  };
+
+/* Line number extended opcodes.  */
+enum dwarf_line_number_x_ops
+  {
+    DW_LNE_end_sequence = 1,
+    DW_LNE_set_address = 2,
+    DW_LNE_define_file = 3,
+    DW_LNE_set_discriminator = 4,
+    /* HP extensions.  */
+    DW_LNE_HP_negate_is_UV_update      = 0x11,
+    DW_LNE_HP_push_context             = 0x12,
+    DW_LNE_HP_pop_context              = 0x13,
+    DW_LNE_HP_set_file_line_column     = 0x14,
+    DW_LNE_HP_set_routine_name         = 0x15,
+    DW_LNE_HP_set_sequence             = 0x16,
+    DW_LNE_HP_negate_post_semantics    = 0x17,
+    DW_LNE_HP_negate_function_exit     = 0x18,
+    DW_LNE_HP_negate_front_end_logical = 0x19,
+    DW_LNE_HP_define_proc              = 0x20,
+    DW_LNE_HP_source_file_correlation  = 0x80,
+
+    DW_LNE_lo_user = 0x80,
+    DW_LNE_hi_user = 0xff
+  };
+
+/* Sub-opcodes for DW_LNE_HP_source_file_correlation.  */
+enum dwarf_line_number_hp_sfc_ops
+  {
+    DW_LNE_HP_SFC_formfeed = 1,
+    DW_LNE_HP_SFC_set_listing_line = 2,
+    DW_LNE_HP_SFC_associate = 3
+  };
+
+/* Call frame information.  */
+enum dwarf_call_frame_info
+  {
+    DW_CFA_advance_loc = 0x40,
+    DW_CFA_offset = 0x80,
+    DW_CFA_restore = 0xc0,
+    DW_CFA_nop = 0x00,
+    DW_CFA_set_loc = 0x01,
+    DW_CFA_advance_loc1 = 0x02,
+    DW_CFA_advance_loc2 = 0x03,
+    DW_CFA_advance_loc4 = 0x04,
+    DW_CFA_offset_extended = 0x05,
+    DW_CFA_restore_extended = 0x06,
+    DW_CFA_undefined = 0x07,
+    DW_CFA_same_value = 0x08,
+    DW_CFA_register = 0x09,
+    DW_CFA_remember_state = 0x0a,
+    DW_CFA_restore_state = 0x0b,
+    DW_CFA_def_cfa = 0x0c,
+    DW_CFA_def_cfa_register = 0x0d,
+    DW_CFA_def_cfa_offset = 0x0e,
+    /* DWARF 3.  */
+    DW_CFA_def_cfa_expression = 0x0f,
+    DW_CFA_expression = 0x10,
+    DW_CFA_offset_extended_sf = 0x11,
+    DW_CFA_def_cfa_sf = 0x12,
+    DW_CFA_def_cfa_offset_sf = 0x13,
+    DW_CFA_val_offset = 0x14,
+    DW_CFA_val_offset_sf = 0x15,
+    DW_CFA_val_expression = 0x16,
+
+    DW_CFA_lo_user = 0x1c,
+    DW_CFA_hi_user = 0x3f,
+
+    /* SGI/MIPS specific.  */
+    DW_CFA_MIPS_advance_loc8 = 0x1d,
+    /* GNU extensions.  */
+    DW_CFA_GNU_window_save = 0x2d,
+    DW_CFA_GNU_args_size = 0x2e,
+    DW_CFA_GNU_negative_offset_extended = 0x2f
+  };
+
+#define DW_CIE_ID	  0xffffffff
+#define DW64_CIE_ID	  0xffffffffffffffffULL
+#define DW_CIE_VERSION	  1
+
+#define DW_CFA_extended   0
+
+#define DW_CHILDREN_no		     0x00
+#define DW_CHILDREN_yes		     0x01
+
+#define DW_ADDR_none		0
+
+/* Source language names and codes.  */
+enum dwarf_source_language
+  {
+    DW_LANG_C89 = 0x0001,
+    DW_LANG_C = 0x0002,
+    DW_LANG_Ada83 = 0x0003,
+    DW_LANG_C_plus_plus = 0x0004,
+    DW_LANG_Cobol74 = 0x0005,
+    DW_LANG_Cobol85 = 0x0006,
+    DW_LANG_Fortran77 = 0x0007,
+    DW_LANG_Fortran90 = 0x0008,
+    DW_LANG_Pascal83 = 0x0009,
+    DW_LANG_Modula2 = 0x000a,
+    /* DWARF 3.  */
+    DW_LANG_Java = 0x000b,
+    DW_LANG_C99 = 0x000c,
+    DW_LANG_Ada95 = 0x000d,
+    DW_LANG_Fortran95 = 0x000e,
+    DW_LANG_PLI = 0x000f,
+    DW_LANG_ObjC = 0x0010,
+    DW_LANG_ObjC_plus_plus = 0x0011,
+    DW_LANG_UPC = 0x0012,
+    DW_LANG_D = 0x0013,
+    /* DWARF 4.  */
+    DW_LANG_Python = 0x0014,
+    /* DWARF 5.  */
+    DW_LANG_Go = 0x0016,
+
+    DW_LANG_lo_user = 0x8000,	/* Implementation-defined range start.  */
+    DW_LANG_hi_user = 0xffff,	/* Implementation-defined range start.  */
+
+    /* MIPS.  */
+    DW_LANG_Mips_Assembler = 0x8001,
+    /* UPC.  */
+    DW_LANG_Upc = 0x8765,
+    /* HP extensions.  */
+    DW_LANG_HP_Bliss     = 0x8003,
+    DW_LANG_HP_Basic91   = 0x8004,
+    DW_LANG_HP_Pascal91  = 0x8005,
+    DW_LANG_HP_IMacro    = 0x8006,
+    DW_LANG_HP_Assembler = 0x8007
+  };
+
+/* Names and codes for macro information.  */
+enum dwarf_macinfo_record_type
+  {
+    DW_MACINFO_define = 1,
+    DW_MACINFO_undef = 2,
+    DW_MACINFO_start_file = 3,
+    DW_MACINFO_end_file = 4,
+    DW_MACINFO_vendor_ext = 255
+  };
+
+/* Names and codes for new style macro information.  */
+enum dwarf_macro_record_type
+  {
+    DW_MACRO_GNU_define = 1,
+    DW_MACRO_GNU_undef = 2,
+    DW_MACRO_GNU_start_file = 3,
+    DW_MACRO_GNU_end_file = 4,
+    DW_MACRO_GNU_define_indirect = 5,
+    DW_MACRO_GNU_undef_indirect = 6,
+    DW_MACRO_GNU_transparent_include = 7,
+    DW_MACRO_GNU_lo_user = 0xe0,
+    DW_MACRO_GNU_hi_user = 0xff
+  };
+
+/* @@@ For use with GNU frame unwind information.  */
+
+#define DW_EH_PE_absptr		0x00
+#define DW_EH_PE_omit		0xff
+
+#define DW_EH_PE_uleb128	0x01
+#define DW_EH_PE_udata2		0x02
+#define DW_EH_PE_udata4		0x03
+#define DW_EH_PE_udata8		0x04
+#define DW_EH_PE_sleb128	0x09
+#define DW_EH_PE_sdata2		0x0A
+#define DW_EH_PE_sdata4		0x0B
+#define DW_EH_PE_sdata8		0x0C
+#define DW_EH_PE_signed		0x08
+
+#define DW_EH_PE_pcrel		0x10
+#define DW_EH_PE_textrel	0x20
+#define DW_EH_PE_datarel	0x30
+#define DW_EH_PE_funcrel	0x40
+#define DW_EH_PE_aligned	0x50
+
+#define DW_EH_PE_indirect	0x80
+
+#endif /* _DWARF2_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/dyn-string.h sdcc-3.2.0+dfsg/support/sdbinutils/include/dyn-string.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/dyn-string.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/dyn-string.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,73 @@
+/* An abstract string datatype.
+   Copyright (C) 1998, 1999, 2000, 2002, 2004, 2005, 2009
+   Free Software Foundation, Inc.
+   Contributed by Mark Mitchell (mark@markmitchell.com).
+
+This file is part of GCC.
+   
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GCC 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 GCC; see the file COPYING.  If not, write to
+the Free Software Foundation, 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#ifndef DYN_STRING_H
+#define DYN_STRING_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct dyn_string
+{
+  int allocated;	/* The amount of space allocated for the string.  */
+  int length;		/* The actual length of the string.  */
+  char *s;		/* The string itself, NUL-terminated.  */
+}* dyn_string_t;
+
+/* The length STR, in bytes, not including the terminating NUL.  */
+#define dyn_string_length(STR)                                          \
+  ((STR)->length)
+
+/* The NTBS in which the contents of STR are stored.  */
+#define dyn_string_buf(STR)                                             \
+  ((STR)->s)
+
+/* Compare DS1 to DS2 with strcmp.  */
+#define dyn_string_compare(DS1, DS2)                                    \
+  (strcmp ((DS1)->s, (DS2)->s))
+
+
+extern int dyn_string_init (struct dyn_string *, int);
+extern dyn_string_t dyn_string_new (int);
+extern void dyn_string_delete (dyn_string_t);
+extern char *dyn_string_release (dyn_string_t);
+extern dyn_string_t dyn_string_resize (dyn_string_t, int);
+extern void dyn_string_clear (dyn_string_t);
+extern int dyn_string_copy (dyn_string_t, dyn_string_t);
+extern int dyn_string_copy_cstr (dyn_string_t, const char *);
+extern int dyn_string_prepend (dyn_string_t, dyn_string_t);
+extern int dyn_string_prepend_cstr (dyn_string_t, const char *);
+extern int dyn_string_insert (dyn_string_t, int, dyn_string_t);
+extern int dyn_string_insert_cstr (dyn_string_t, int, const char *);
+extern int dyn_string_insert_char (dyn_string_t, int, int);
+extern int dyn_string_append (dyn_string_t, dyn_string_t);
+extern int dyn_string_append_cstr (dyn_string_t, const char *);
+extern int dyn_string_append_char (dyn_string_t, int);
+extern int dyn_string_substring (dyn_string_t,  dyn_string_t, int, int);
+extern int dyn_string_eq (dyn_string_t, dyn_string_t);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !defined (DYN_STRING_H) */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/ChangeLog sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/ChangeLog
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/ChangeLog	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/ChangeLog	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1530 @@
+2011-10-25  Alan Modra  <amodra@gmail.com>
+
+	Apply mainline patches
+	2011-10-10  Alan Modra  <amodra@gmail.com>
+	* ppc64.h (R_PPC64_TOCSAVE): Add.
+
+2011-09-21  David S. Miller  <davem@davemloft.net>
+
+	* sparc.h (Tag_GNU_Sparc_HWCAPS): New object attribute.
+	(ELF_SPARC_HWCAP_*): New HWCAPS bitmask values.
+
+2011-08-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/13082
+	* x86-64.h (R_X86_64_RELATIVE64): New.
+
+2011-07-24  Chao-ying Fu  <fu@mips.com>
+            Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* mips.h (R_MICROMIPS_min): New relocations.
+	(R_MICROMIPS_26_S1): Likewise.
+	(R_MICROMIPS_HI16, R_MICROMIPS_LO16): Likewise.
+	(R_MICROMIPS_GPREL16, R_MICROMIPS_LITERAL): Likewise.
+	(R_MICROMIPS_GOT16, R_MICROMIPS_PC7_S1): Likewise.
+	(R_MICROMIPS_PC10_S1, R_MICROMIPS_PC16_S1): Likewise.
+	(R_MICROMIPS_CALL16, R_MICROMIPS_GOT_DISP): Likewise.
+	(R_MICROMIPS_GOT_PAGE, R_MICROMIPS_GOT_OFST): Likewise.
+	(R_MICROMIPS_GOT_HI16, R_MICROMIPS_GOT_LO16): Likewise.
+	(R_MICROMIPS_SUB, R_MICROMIPS_HIGHER): Likewise.
+	(R_MICROMIPS_HIGHEST, R_MICROMIPS_CALL_HI16): Likewise.
+	(R_MICROMIPS_CALL_LO16, R_MICROMIPS_SCN_DISP): Likewise.
+	(R_MICROMIPS_JALR, R_MICROMIPS_HI0_LO16): Likewise.
+	(R_MICROMIPS_TLS_GD, R_MICROMIPS_TLS_LDM): Likewise.
+	(R_MICROMIPS_TLS_DTPREL_HI, R_MICROMIPS_TLS_DTPREL_LO): Likewise.
+	(R_MICROMIPS_TLS_GOTTPREL): Likewise.
+	(R_MICROMIPS_TLS_TPREL_HI16): Likewise.
+	(R_MICROMIPS_TLS_TPREL_LO16): Likewise.
+	(R_MICROMIPS_GPREL7_S2, R_MICROMIPS_PC23_S2): Likewise.
+	(R_MICROMIPS_max): Likewise.
+	(EF_MIPS_ARCH_ASE_MICROMIPS): New macro.
+	(STO_MIPS_ISA, STO_MIPS_FLAGS): Likewise.
+	(ELF_ST_IS_MIPS_PLT, ELF_ST_SET_MIPS_PLT): Likewise.
+	(STO_MICROMIPS): Likewise.
+	(ELF_ST_IS_MICROMIPS, ELF_ST_SET_MICROMIPS): Likewise.
+	(ELF_ST_IS_COMPRESSED): Likewise.
+	(STO_MIPS_PLT, STO_MIPS_PIC): Rework.
+	(ELF_ST_IS_MIPS_PIC, ELF_ST_SET_MIPS_PIC): Likewise.
+	(STO_MIPS16, ELF_ST_IS_MIPS16, ELF_ST_SET_MIPS16): Likewise.
+
+2011-07-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* common.h (EM_K1OM): New.
+
+2011-07-03  Samuel Thibault  <samuel.thibault@gnu.org>
+	    Thomas Schwinge  <thomas@schwinge.name>
+
+	PR binutils/12913
+	* common.h (ELFOSABI_GNU): Define, replaces...
+	(ELFOSABI_LINUX): ... this, kept as an alias.
+	(ELFOSABI_HURD): Remove.
+
+2011-06-15  Ulrich Weigand  <ulrich.weigand@linaro.org>
+
+	* common.h (NT_ARM_VFP): Define.
+
+2011-06-13  Walter Lee  <walt@tilera.com>
+
+	* common.h: Add EM_TILEGX.
+	* tilegx.h: New file.
+	* tilepro.h: New file.
+
+2011-06-09  Tristan Gingold  <gingold@adacore.com>
+
+	* ia64.h (Elf64_External_VMS_ORIG_DYN_Note): New struct.
+
+2011-06-02  Nick Clifton  <nickc@redhat.com>
+
+	* common.h: Fix spelling mistake in comment.
+	* reloc-macros.h: Likewise.
+
+2011-05-31  Paul Brook  <paul@codesourcery.com>
+
+	* arm.h (arm_st_branch_type): Add ST_BRANCH_UNKNOWN.
+
+2011-04-15  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+	* common.h (NT_STAPSDT): New define.
+
+2011-03-31  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* tic6x.h (R_C6000_JUMP_SPLOT, R_C6000_EHTYPE,
+	R_C6000_PCR_H16, R_C6000_PCR_L16): New relocs.
+	(SHN_TIC6X_SCOMMON): Define.
+
+2011-03-31  Tristan Gingold  <gingold@adacore.com>
+
+	* ia64.h (Elf64_External_VMS_Note): New struct.
+	(NT_VMS_MHD, NT_VMS_LNM, NT_VMS_SRC, NT_VMS_TITLE, NT_VMS_EIDC)
+	(NT_VMS_FPMODE, NT_VMS_LINKTIME, NT_VMS_IMGNAM, NT_VMS_IMGID)
+	(NT_VMS_LINKID, NT_VMS_IMGBID, NT_VMS_GSTNAM, NT_VMS_ORIG_DYN)
+	(NT_VMS_PATCHTIME) New macros.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* arm.h (R_ARM_IRELATIVE): New relocation.
+
+2011-03-14  Richard Sandiford  <richard.sandiford@linaro.org>
+
+	* internal.h (elf_internal_sym): Add st_target_internal.
+	* arm.h (arm_st_branch_type): New enum.
+	(ARM_SYM_BRANCH_TYPE): New macro.
+
+2011-03-10  Nick Clifton  <nickc@redhat.com>
+
+	* common.h (EM_V850): V850s now supplied by Renesas.
+
+2011-02-25  Alan Modra  <amodra@gmail.com>
+
+	PR 12516
+	* internal.h (ELF_SECTION_IN_SEGMENT_1): Don't match zero size
+	sections at start or end of PT_DYNAMIC.
+
+2011-01-10  Nathan Sidwell  <nathan@codesourcery.com>
+	    Glauber de Oliveira Costa  <glommer@gmail.com>
+
+	* arm.h (R_ARM_TLS_DESC, R_ARM_TLS_GOTDESC, R_ARM_TLS_CALL,
+	R_ARM_TLS_DESCSEQ, T_ARM_THM_TLS_CALL, R_ARM_THM_TLS_DESCSEQ): New
+	relocations.
+
+2010-11-16  Jie Zhang  <jie.zhang@analog.com>
+
+	* bfin.h (EF_BFIN_CODE_IN_L1): Define.
+	(EF_BFIN_DATA_IN_L1): Define.
+
+2010-11-11  Mingming Sun  <mingm.sun@gmail.com>
+
+	* mips.h (E_MIPS_MACH_LS3A): Defined.
+
+2010-11-02  Joseph Myers  <joseph@codesourcery.com>
+
+	* tic6x-attrs.h (Tag_ABI_wchar_t, Tag_ABI_stack_align_needed,
+	Tag_ABI_stack_align_preserved, Tag_ABI_PID, Tag_ABI_PIC,
+	Tag_ABI_array_object_alignment,
+	Tag_ABI_array_object_align_expected, Tag_ABI_conformance): Define.
+
+2010-10-29  Joseph Myers  <joseph@codesourcery.com>
+
+	* tic6x-attrs.h (Tag_ABI_compatibility): Define.
+
+2010-10-29  Bernd Schmidt  <bernds@codesourcery.com>
+            Joseph Myers  <joseph@codesourcery.com>
+
+	* tic6x-attrs.h (Tag_ABI_DSBT): New.
+
+2010-10-21  Joseph Myers  <joseph@codesourcery.com>
+
+	* tic6x-attrs.h (Tag_C6XABI_Tag_CPU_arch): Change to Tag_ISA,
+	value 4.
+	* tic6x.h (Values for Tag_C6XABI_Tag_CPU_arch): Rename for
+	attribute renaming.
+
+2010-07-23  Naveen.H.S  <naveen.S@kpitcummins.com>
+	    Ina Pandit  <ina.pandit@kpitcummins.com>
+
+	* v850.h: Add support for V850E2 and V850E2V3.
+	(v850_reloc_type): Update the newly added relocations
+
+2010-07-20  Alan Modra  <amodra@gmail.com>
+
+	* internal.h (ELF_TBSS_SPECIAL): New macro, extracted from..
+	(ELF_SECTION_SIZE): ..here.
+	(ELF_SECTION_IN_SEGMENT_1): Add "strict" arg.
+	(ELF_SECTION_IN_SEGMENT_STRICT): New macro.
+
+2010-06-25  Alan Modra  <amodra@gmail.com>
+
+	* ppc64.h (R_PPC64_LO_DS_OPT): Define.
+
+2010-06-15  Joseph Myers  <joseph@codesourcery.com>
+
+	* tic6x-attrs.h: New.
+	* tic6x.h: Include elf/tic6x-attrs.h for attribute table.
+	(C6XABI_Tag_CPU_arch_none, C6XABI_Tag_CPU_arch_C62X,
+	C6XABI_Tag_CPU_arch_C67X, C6XABI_Tag_CPU_arch_C67XP,
+	C6XABI_Tag_CPU_arch_C64X, C6XABI_Tag_CPU_arch_C64XP,
+	C6XABI_Tag_CPU_arch_C674X): Define.
+
+2010-06-11  Tristan Gingold  <gingold@adacore.com>
+
+	* ia64.h (EF_IA_64_VMS_COMCOD, EF_IA_64_VMS_COMCOD_SUCCESS)
+	(EF_IA_64_VMS_COMCOD_WARNING, EF_IA_64_VMS_COMCOD_ERROR)
+	(EF_IA_64_VMS_COMCOD_ABORT, EF_IA_64_VMS_LINKAGES): Define.
+	(VMS_LF_CALL_DEBUG, VMS_LF_NOP0BUFS, VMS_LF_P0IMAGE)
+	(VMS_LF_MKTHREADS, VMS_LF_UPCALLS, VMS_LF_IMGSTA)
+	(VMS_LF_INITIALIZE, VMS_LF_MAIN, VMS_LF_EXE_INIT)
+	(VMS_LF_TBK_IN_IMG, VMS_LF_DBG_IN_IMG, VMS_LF_TBK_IN_DSF)
+	(VMS_LF_DBG_IN_DSF, VMS_LF_SIGNATURES, VMS_LF_REL_SEG_OFF): Define.
+	(VMS_STO_VISIBILITY, VMS_ST_VISIBILITY, VMS_STO_FUNC_TYPE)
+	(VMS_ST_FUNC_TYPE, VMS_SFT_CODE_ADDR, VMS_SFT_SYMV_IDX)
+	(VMS_SFT_FD, VMS_SFT_RESERVE, VMS_STO_LINKAGE, VMS_ST_LINKAGE)
+	(VMS_STL_IGNORE, VMS_STL_RESERVE, VMS_STL_STD, VMS_STL_LNK): Define.
+	(Elf64_External_VMS_IMAGE_FIXUP): New declaration.
+	(Elf64_External_VMS_IMAGE_RELA): Ditto.
+	(R_IA64_VMS_DIR8, R_IA64_VMS_DIR16LSB, R_IA64_VMS_CALL_SIGNATURE)
+	(R_IA64_VMS_EXECLET_FUNC, R_IA64_VMS_EXECLET_DATA, R_IA64_VMS_FIX8)
+	(R_IA64_VMS_FIX16, R_IA64_VMS_FIX32, R_IA64_VMS_FIX64)
+	(R_IA64_VMS_FIXFD, R_IA64_VMS_ACC_LOAD, R_IA64_VMS_ACC_ADD)
+	(R_IA64_VMS_ACC_SUB, R_IA64_VMS_ACC_MUL, R_IA64_VMS_ACC_DIV)
+	(R_IA64_VMS_ACC_AND, R_IA64_VMS_ACC_IOR, R_IA64_VMS_ACC_EOR)
+	(R_IA64_VMS_ACC_ASH, R_IA64_VMS_ACC_STO8, R_IA64_VMS_ACC_STO16LSH)
+	(R_IA64_VMS_ACC_STO32LSH, R_IA64_VMS_ACC_STO64LSH): New.
+
+2010-05-25  Daniel Jacobowitz  <dan@codesourcery.com>
+	    Joseph Myers  <joseph@codesourcery.com>
+	    Andrew Stubbs  <ams@codesourcery.com>
+
+	* sh.h (EF_SH_PIC, EF_SH_FDPIC): Define.
+	(R_SH_FIRST_INVALID_RELOC_6, R_SH_LAST_INVALID_RELOC_6): New.  Adjust
+	other invalid ranges.
+	(R_SH_GOT20, R_SH_GOTOFF20, R_SH_GOTFUNCDESC, R_SH_GOTFUNCDESC20)
+	(R_SH_GOTOFFFUNCDESC, R_SH_GOTOFFFUNCDESC20, R_SH_FUNCDESC)
+	(R_SH_FUNCDESC_VALUE): New.
+
+2010-05-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gas/11600
+	* common.h (SHF_EXCLUDE): New.
+
+	* i370.h (SHF_EXCLUDE): Removed.
+	* or32.h (SHF_EXCLUDE): Likewise.
+	* ppc.h (SHF_EXCLUDE): Likewise.
+	* sparc.h (SHF_EXCLUDE): Likewise.
+
+2010-04-23  Alan Modra  <amodra@gmail.com>
+
+	* internal.h (ELF_SECTION_SIZE): Protect macro args with parentheses.
+	Invert logic to clarify test for .tbss.
+	(ELF_IS_SECTION_IN_SEGMENT): Rename to..
+	(ELF_SECTION_IN_SEGMENT_1): ..this.  Add check_vma param.  Protect
+	macro args with parentheses.
+	(ELF_SECTION_IN_SEGMENT): Define.
+	(ELF_IS_SECTION_IN_SEGMENT_FILE): Delete.
+	(ELF_IS_SECTION_IN_SEGMENT_MEMORY): Delete.
+
+2010-04-15  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+	* arm.h (Tag_FP_arch, Tag_ABI_align_needed, Tag_ABI_align_preserved,
+	Tag_FP_HP_extension): Add new ABI attribute tags.
+
+2010-04-15  Nick Clifton  <nickc@redhat.com>
+
+	* alpha.h: Update copyright notice to use GPLv3.
+	* arc.h: Likewise.
+	* arm.h: Likewise.
+	* avr.h: Likewise.
+	* bfin.h: Likewise.
+	* common.h: Likewise.
+	* cr16.h: Likewise.
+	* cr16c.h: Likewise.
+	* cris.h: Likewise.
+	* crx.h: Likewise.
+	* d10v.h: Likewise.
+	* d30v.h: Likewise.
+	* dlx.h: Likewise.
+	* dwarf.h: Likewise.
+	* external.h: Likewise.
+	* fr30.h: Likewise.
+	* frv.h: Likewise.
+	* h8.h: Likewise.
+	* hppa.h: Likewise.
+	* i370.h: Likewise.
+	* i386.h: Likewise.
+	* i860.h: Likewise.
+	* i960.h: Likewise.
+	* ia64.h: Likewise.
+	* internal.h: Likewise.
+	* ip2k.h: Likewise.
+	* iq2000.h: Likewise.
+	* lm32.h: Likewise.
+	* m32c.h: Likewise.
+	* m32r.h: Likewise.
+	* m68hc11.h: Likewise.
+	* m68k.h: Likewise.
+	* mcore.h: Likewise.
+	* mep.h: Likewise.
+	* microblaze.h: Likewise.
+	* mips.h: Likewise.
+	* mmix.h: Likewise.
+	* mn10200.h: Likewise.
+	* moxie.h: Likewise.
+	* msp430.h: Likewise.
+	* mt.h: Likewise.
+	* openrisc.h: Likewise.
+	* or32.h: Likewise.
+	* pj.h: Likewise.
+	* ppc.h: Likewise.
+	* ppc64.h: Likewise.
+	* reloc-macros.h: Likewise.
+	* rx.h: Likewise.
+	* s390.h: Likewise.
+	* sh.h: Likewise.
+	* sparc.h: Likewise.
+	* spu.h: Likewise.
+	* v850.h: Likewise.
+	* vax.h: Likewise.
+	* vxworks.h: Likewise.
+	* x86-64.h: Likewise.
+	* xc16x.h: Likewise.
+	* xstormy16.h: Likewise.
+	* xtensa.h: Likewise.
+
+2010-04-08  David Stubbs  <stubbs@icerasemi.com>
+
+	* internal.h (ELF_IS_SECTION_IN_SEGMENT): PT_PHDR program headers
+	cannot contain any sections.
+
+2010-03-25  Joseph Myers  <joseph@codesourcery.com>
+
+	* common.h (ELFOSABI_C6000_ELFABI, ELFOSABI_C6000_LINUX): Define.
+	* tic6x.h: New.
+
+2010-03-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* common.h (VER_FLG_*): Document.
+	(VER_FLG_INFO): Define.
+
+2010-02-23  Andrew Zabolotny  <anpaza@mail.ru>
+
+	PR binutils/11297
+	* avr.h: (R_AVR_8): New relocation number.
+
+2010-02-18  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+	* arm.h (Tag_MPextension_use): Renumber.
+	(Tag_DIV_use): Add.
+	(Tag_MPextension_use_legacy): Likewise.
+
+2010-02-09  Michael Holzheu  <holzheu@de.ibm.com>
+
+	* common.h (NT_S390_TIMER, NT_S390_TODCMP, NT_S390_TODPREG,
+	NT_S390_CTRS and NT_S390_PREFIX): Define.
+
+2010-02-08  David S. Miller  <davem@davemloft.net>
+
+	* sparc.h (R_SPARC_JMP_IREL, R_SPARC_IRELATIVE): Define.
+
+2010-02-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* common.h (NT_386_XSTATE): New.
+
+2010-01-21  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* s390.h (EF_S390_HIGH_GPRS): Added macro definition.
+
+2010-01-19  Daisuke Hatayama  <d.hatayama@jp.fujitsu.com>
+
+	* common.h (PN_XNUM): Define.
+
+2009-12-18  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* common.h (NT_S390_HIGH_GPRS): Define.
+
+2009-12-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* ppc.h (R_PPC_RELAX32, R_PPC_RELAX32PC, R_PPC_RELAX32_PLT,
+	R_PPC_RELAX32PC_PLT): Delete.
+	(R_PPC_RELAX, R_PPC_RELAX_PLT, R_PPC_RELAX_PLTREL24): Define.
+
+2009-11-28  Joseph Myers  <joseph@codesourcery.com>
+
+	* common.h (ELFOSABI_FENIXOS, EM_TI_C6000, EM_TI_C2000,
+	EM_TI_C5500, EM_CUDA): Define.
+	(EM_res140, EM_res141, EM_res142): Remove.
+
+2009-11-17  Paul Brook  <paul@codesourcery.com>
+	Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* arm.h (TAG_CPU_ARCH_V7E_M): Define.
+
+2009-09-29  DJ Delorie  <dj@redhat.com>
+
+	* rx.h: New file.
+
+2009-09-21  Alan Modra  <amodra@bigpond.net.au>
+
+	* ppc.h (DT_PPC_TLSOPT): Define.
+	* ppc64.h (DT_PPC64_TLSOPT): Define.
+
+2009-08-10  Daniel Gutson  <dgutson@codesourcery.com>
+
+	* arm.h: (SHT_ARM_DEBUGOVERLAY): New define.
+	(SHT_ARM_OVERLAYSECTION): New define.
+
+2006-08-09  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	From Mike Frysinger <michael.frysinger@analog.com>
+	* bfin.h (R_BFIN_UNUSED, R_BFIN_PCREL5M2, R_BFIN_UNUSED1,
+	R_BFIN_PCREL10, R_BFIN_PCREL12_JUMP, R_BFIN_RIMM16,
+	R_BFIN_LUIMM16, R_BFIN_HUIMM16, R_BFIN_PCREL12_JUMP_S,
+	R_BFIN_PCREL24_JUMP_X, R_BFIN_PCREL24, R_BFIN_UNUSEDB,
+	R_BFIN_UNUSEDC, R_BFIN_PCREL24_JUMP_L, R_BFIN_PCREL24_CALL_X,
+	R_BFIN_VAR_EQ_SYMB, R_BFIN_BYTE_DATA, R_BFIN_BYTE2_DATA,
+	R_BFIN_BYTE4_DATA, R_BFIN_PCREL11, R_BFIN_PUSH, R_BFIN_CONST,
+	R_BFIN_ADD, R_BFIN_SUB, R_BFIN_MULT, R_BFIN_DIV, R_BFIN_MOD,
+	R_BFIN_LSHIFT, R_BFIN_RSHIFT, R_BFIN_AND, R_BFIN_OR, R_BFIN_XOR,
+	R_BFIN_LAND, R_BFIN_LOR, R_BFIN_LEN, R_BFIN_NEG, R_BFIN_COMP,
+	R_BFIN_PAGE, R_BFIN_HWPAGE, R_BFIN_ADDR, R_BFIN_PLTPLC,
+	R_BFIN_GOT, R_BFIN_MAX): Renamed from R_unused0, R_pcrel5ms,
+	R_unused1, R_pcrel10, R_pcrel12_jump, R_rimm16, R_luimm16,
+	R_huimm16, R_pcrel12_jump_s, R_pcrel24_jump_x, R_pcrel24,
+	R_unusedb, R_unusedc, R_pcrel24_jump_l, R_pcrel24_call_x,
+	R_var_eq_symb, R_byte_data, R_byte2_data, R_byte4_data, R_pcrel11,
+	R_push, R_const, R_add, R_sub, R_mult, R_div, R_mod, R_lshift,
+	R_rshift, R_and, R_or, R_xor, R_land, R_lor, R_len, R_neg, R_comp,
+	R_page, R_hwpage, R_addr, R_pltpc, R_got.
+
+2009-08-09  Michael Eager <eager@eagercon.com>
+
+	* elf/common.h: Define EM_resnnn reserved values. Add EM_AVR32,
+	EM_STM8, EM_TILE64, EM_TILEPRO.  Change EM_MICROBLAZE.
+
+2009-08-06  Michael Eager <eager@eagercon.com>
+
+	* elf/common.h: Define EM_MICROBLAZE & EM_MICROBLAZE_OLD.
+	* elf/microblaze.h: New reloc definitions.
+
+2009-07-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* ppc64.h: Add R_PPC64_JMP_IREL, R_PPC64_REL16, R_PPC64_REL16_LO,
+	R_PPC64_REL16_HI, R_PPC64_REL16_HA.
+
+2009-07-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* common.h (EM_L1OM): New.
+
+2009-07-24  Trevor Smigiel  <Trevor_Smigiel@playstation.sony.com>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* spu.h (R_SPU_ADD_PIC): New.
+
+2009-07-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* common.h (STB_GNU_UNIQUE): Define.
+
+2009-07-10  Tom Tromey  <tromey@redhat.com>
+
+	* dwarf2.h: Move to `..'.
+
+2009-07-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* dwarf2.h: Just include ../dwarf2.h.
+
+2009-07-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* ppc.h (R_PPC_IRELATIVE): Add.
+	(R_PPC_RELAX32, R_PPC_RELAX32PC,
+	R_PPC_RELAX32_PLT, R_PPC_RELAX32PC_PLT): Renumber.
+	* ppc64.h (R_PPC64_IRELATIVE): Add.
+
+2009-07-03  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf2.h (enum dwarf_location_atom): Add DW_OP_implicit_value
+	and DW_OP_stack_value.
+
+2009-06-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* ppc.h (R_PPC_RELAX*): Define as enum.
+
+2009-06-11  Anthony Green  <green@moxielogic.org>
+
+	* moxie.h (R_MOXIE_PCREL10): New.
+
+2009-06-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/10205
+	* i386.h (R_386_IRELATIVE): New.
+	* x86-64.h (R_X86_64_IRELATIVE): Likewise.
+
+2009-05-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* common.h: Update comments for dynamic tag ranges.
+
+2009-04-30  DJ Delorie  <dj@redhat.com>
+
+	* mep.h (EF_MEP_COP_*): New.
+	(EF_MEP_ALL_FLAGS): Add them.
+
+2009-04-30  Nick Clifton  <nickc@redhat.com>
+
+	* common.h (STT_GNU_IFUNC): Define.
+
+2009-04-24  Cary Coutant  <ccoutant@google.com>
+
+	 * dwarf2.h (DW_LNE_set_discriminator): New enum value.
+
+2009-04-15  Anthony Green  <green@moxielogic.com>
+
+	* common.h (EM_MOXIE): Define.
+	* moxie.h: New file.
+
+2009-04-07  DJ Delorie  <dj@redhat.com>
+
+	* mep.h (EF_MEP_CPU_C5): New.
+
+2009-04-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* common.h (EM_INTEL178): Removed.
+	(EM_INTEL179): Likewise.
+	(EM_ETPU): New.
+	(EM_SLE9X): Likewise.
+	(EM_INTEL181): Likewise.
+	(EM_INTEL182): Likewise.
+
+2009-03-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* common.h (EM_INTEL178): New.
+	(EM_INTEL179): Likewise.
+	(EM_INTEL180): Likewise.
+
+2009-03-20  Mikolaj Zalewski  <mikolajz@google.com>
+
+	* common.h (SHT_GNU_INCREMENTAL_INPUTS): Define.
+
+2009-03-14  Mark Kettenis  <kettenis@gnu.org>
+
+	* common.h (NT_OPENBSD_PROCINFO, NT_OPENBSD_AUXV)
+	(NT_OPENBSD_REGS, NT_OPENBSD_FPREGS, NT_OPENBSD_XFPREGS)
+	(NT_OPENBSD_WCOOKIE): New defines.
+
+2009-03-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* common.h (AT_RANDOM): Define.
+
+2009-03-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* ppc.h (R_PPC_TLSGD, R_PPC_TLSLD): Add new relocs.
+	* ppc64.h (R_PPC64_TLSGD, R_PPC64_TLSLD): Add new relocs.
+
+2009-03-02  Qinwei  <qinwei@sunnorth.com.cn>
+
+	* score.h (RELOC_NUMBER): Add R_SCORE_IMM32.
+	* common.h (EM_SCORE_OLD): Define.
+
+2009-02-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* common.h (STB_LOPROC): Replace Application-specific with
+	Processor-specific in comments.
+	(STB_HIPROC): Likewise.
+	(STT_LOPROC): Likewise.
+	(STT_HIPROC): Likewise.
+
+2009-02-03  Sandip Matte  <sandip@rmicorp.com>
+
+	* mips.h (E_MIPS_MACH_XLR): Define.
+
+2009-02-03  Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+	* m68k.h: Map TLS relocations to numbers.
+
+2009-01-15  Andrew Stubbs  <ams@codesourcery.com>
+	    Julian Brown   <julian@codesourcery.com>
+
+	* arm.h (TAG_CPU_ARCH_V6_M, TAG_CPU_ARCH_V6S_M): New defines.
+	(MAX_TAG_CPU_ARCH, TAG_CPU_ARCH_V4T_PLUS_V6_M): New defines.
+	(Tag_NEON_arch): Rename to Tag_Advanced_SIMD_arch to match ARM ABI
+	version 2.07.
+	(Tag_undefined39, Tag_nodefaults): New enum values.
+	(Tag_also_compatible_with, Tag_T2EE_use): Likewise.
+	(Tag_conformance, Tag_Virtualization_use): Likewise.
+	(Tag_undefined69, Tag_MPextension_use): Likewise.
+
+2009-01-15  Douglas B Rupp  <rupp@gnat.com>
+
+	* ia64.h (SHT_IA_64_VMS_DISPLAY_NAME_INFO, EF_IA_64_ARCHVER_1):
+	New macros. Minor reformatting.
+
+2008-12-23  Jon Beniston <jon@beniston.com>
+
+	* lm32.h: New file.
+
+2008-12-23  Nick Clifton  <nickc@redhat.com>
+
+	* commmon.h (STT_IFUNC): Delete.
+
+2008-12-20  Hans-Peter Nilsson  <hp@axis.com>
+
+	* cris.h (R_CRIS_32_IE): New relocation.
+
+2008-12-03  Nick Clifton  <nickc@redhat.com>
+
+	* common.h (STT_IFUNC): Define.
+
+2008-11-27  M R Swami Reddy <MR.Swami.Reddy@nsc.com>
+
+	* cr16.h (R_CR16_GOT_REGREL20, R_CR16_GOTC_REGREL20 and
+	R_CR16_GLOB_DAT): New relocations.
+
+2008-11-25  Hans-Peter Nilsson  <hp@axis.com>
+
+	* cris.h (R_CRIS_32_TPREL): Correct comment.
+	(R_CRIS_DTPMOD): Open up for use elsewhere than the fourth GOT entry.
+
+2008-11-18  Catherine Moore  <clm@codesourcery.com>
+
+	* arm.h (Tag_ABI_FP_16bit_format): Define.
+
+2008-11-14  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* internal.h (struct elf_segment_map): Add header_size field.
+
+2008-10-13  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* common.h (AT_BASE_PLATFORM, AT_EXECFN): Define.
+
+2008-10-10  Nathan Froyd  <froydnj@codesourcery.com>
+
+	* ppc.h: Add Tag_GNU_Power_ABI_Struct_Return.
+
+2008-10-04  Hans-Peter Nilsson  <hp@axis.com>
+
+	* cris.h (R_CRIS_32_GOT_GD, R_CRIS_16_GOT_GD, R_CRIS_32_GD)
+	(R_CRIS_DTP, R_CRIS_32_DTPREL, R_CRIS_16_DTPREL, R_CRIS_DTPMOD)
+	(R_CRIS_32_GOT_TPREL, R_CRIS_16_GOT_TPREL, R_CRIS_32_TPREL)
+	(R_CRIS_16_TPREL): New relocations.
+
+2008-08-20  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa.h (R_XTENSA_TLSDESC_FN, R_XTENSA_TLSDESC_ARG)
+	(R_XTENSA_TLS_DTPOFF, R_XTENSA_TLS_TPOFF, R_XTENSA_TLS_FUNC)
+	(R_XTENSA_TLS_ARG, R_XTENSA_TLS_CALL): New.
+
+2008-08-08  Richard Sandiford  <rdsandiford@googlemail.com>
+	    Daniel Jacobowitz  <dan@codesourcery.com>
+	    Catherine Moore  <clm@codesourcery.com>
+	    Mark Shinwell  <shinwell@codesourcery.com>
+
+	* mips.h (STO_MIPS_PLT, ELF_ST_IS_MIPS_PLT, ELF_ST_SET_MIPS_PLT)
+	(STO_MIPS_PIC, DT_MIPS_PLTGOT, DT_MIPS_RWPLT): New macros.
+
+2008-08-04  Markus Weiss  <weissms@aros.org>
+
+	* common.h (ELFOSABI_AROS): Update comment.
+
+2008-07-26  Michael Eager <eager@eagercon.com>
+
+	* ppc.h: Add description of single-precision.
+
+2008-07-21  Luis Machado  <luisgpm@br.ibm.com>
+
+	* common.h: Define NT_PPC_VSX.
+
+2008-07-10  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* mips.h (ELF_ST_IS_MIPS16, ELF_ST_SET_MIPS16): New macros.
+
+2008-06-18  M R Swami Reddy <MR.Swami.Reddy@nsc.com>
+
+	* common.h (EM_CR16): Correct value.
+	(EM_CR16): Rename to EM_CR16_OLD.
+
+2008-06-12  DJ Delorie  <dj@redhat.com>
+
+	* common.h (EM_M32C_NEW): Rename to EM_M32C.
+	(EM_M32C): Rename to EM_M32C_OLD.
+
+2008-06-12  Joseph Myers  <joseph@codesourcery.com>
+
+	* common.h: Update e_machine table.
+
+2008-06-09  Takashi Yoshii  <yoshii.takashi@renesas.com>
+
+	* sh.h (EF_SH_BFD_TABLE): Set bfd_mach_sh for EF_SH_UNKNOWN.
+
+2008-06-09  Joseph Myers  <joseph@codesourcery.com>
+
+	* common.h: Change registry@caldera.com to registry@sco.com.
+
+2008-05-21  Nick Clifton  <nickc@redhat.com>
+
+	* reloc-macros.h: Add a comment about the use of the
+	END_RELOC_NUMBERS symbol as a sentinel value.
+
+2008-05-15  Christophe Lyon  <christophe.lyon@st.com>
+
+	* arm.h (END_RELOC_NUMBERS): Provide a maximum value.
+
+2008-04-16  David S. Miller  <davem@davemloft.net>
+
+	* elf/sparc.h (R_SPARC_GOTDATA_HIX22,
+	R_SPARC_GOTDATA_LOX10, R_SPARC_GOTDATA_OP_HIX22,
+	R_SPARC_GOTDATA_OP_LOX10, R_SPARC_GOTDATA_OP,
+	R_SPARC_H34, R_SPARC_SIZE32, R_SPARC_SIZE64): New relocs.
+
+2008-03-24  Ian Lance Taylor  <iant@google.com>
+
+	* common.h (NT_GNU_GOLD_VERSION): Define.
+
+2008-03-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* internal.h (Elf_Internal_Shdr): Change sh_link and sh_info from
+	unsigned long to unsigned int.  Change sh_addralign to bfd_vma.
+	Order struct as for external version.
+
+2008-03-12  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 5900
+	* common.h (SHN_BAD): Delete.
+	(SHN_LORESERVE .. SHN_HIRESERVE): Move to..
+	* external.h: ..here.
+	* internal.h (SHN_LORESERVE, SHN_HIRESERVE): Define.
+	(SHN_LOPROC, SHN_HIPROC, SHN_LOOS, SHN_HIOS): Define.
+	(SHN_ABS, SHN_COMMON, SHN_XINDEX, SHN_BAD): Define.
+
+2008-03-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* cr16c.h (SHN_CR16C_FCOMMON): Define using SHN_LORESERVE.
+	(SHN_CR16C_NCOMMON): Likewise.
+	* hppa.h (SHN_PARISC_ANSI_COMMON): Likewise.
+	(SHN_PARISC_HUGE_COMMON): Likewise.
+	* ia64.h (SHN_IA_64_ANSI_COMMON): Likewise.
+	(SHN_IA_64_VMS_SYMVEC): Define using SHN_LOOS.
+	* m32r.h (SHN_M32R_SCOMMON): Define using SHN_LORESERVE.
+	* mips.h (SHN_MIPS_ACOMMON, SHN_MIPS_TEXT): Likewise.
+	(SHN_MIPS_DATA, SHN_MIPS_SCOMMON, SHN_MIPS_SUNDEFINED): Likewise.
+	* score.h (SHN_SCORE_TEXT, SHN_SCORE_DATA): Likewise.
+	(SHN_SCORE_SCOMMON): Likewise.
+	* sparc.h (SHN_BEFORE, SHN_AFTER): Likewise.
+	* v850.h (SHN_V850_SCOMMON, SHN_V850_TCOMMON): Likewise.
+	(SHN_V850_ZCOMMON): Likewise.
+	* x86-64.h (SHN_X86_64_LCOMMON): Likewise.
+
+2008-03-03  Pallavi Tambay  <pallavi.tambay@amd.com>
+
+	* dwarf2.h: (enum dwarf_location_atom): Add new DW_OP:
+	DW_OP_PGI_omp_thread_num.
+
+2008-02-04  Adam Nemet  <anemet@caviumnetworks.com>
+
+	* mips.h: Update copyright.
+	(E_MIPS_MACH_OCTEON): New macro.
+
+2008-01-30  Tristan Gingold  <gingold@adacore.com>
+
+	Add OpenVMS extensions.
+	* ia64.h (SHF_IA_64_VMS_GLOBAL, SHF_IA_64_VMS_OVERLAID)
+	(SHF_IA_64_VMS_SHARED, SHF_IA_64_VMS_VECTOR)
+	(SHF_IA_64_VMS_ALLOC_64BIT, SHF_IA_64_VMS_PROTECTED)
+	(SHT_IA_64_VMS_TRACE, SHT_IA_64_VMS_TIE_SIGNATURES)
+	(SHT_IA_64_VMS_DEBUG, SHT_IA_64_VMS_DEBUG_STR)
+	(SHT_IA_64_VMS_LINKAGES, SHT_IA_64_VMS_SYMBOL_VECTOR)
+	(SHT_IA_64_VMS_FIXUP, DT_IA_64_VMS_SUBTYPE)
+	(DT_IA_64_VMS_IMGIOCNT, DT_IA_64_VMS_LNKFLAGS)
+	(DT_IA_64_VMS_VIR_MEM_BLK_SIZ, DT_IA_64_VMS_IDENT)
+	(DT_IA_64_VMS_NEEDED_IDENT, DT_IA_64_VMS_IMG_RELA_CNT)
+	(DT_IA_64_VMS_SEG_RELA_CNT, DT_IA_64_VMS_FIXUP_RELA_CNT)
+	(DT_IA_64_VMS_FIXUP_NEEDED, DT_IA_64_VMS_SYMVEC_CNT)
+	(DT_IA_64_VMS_XLATED, DT_IA_64_VMS_STACKSIZE)
+	(DT_IA_64_VMS_UNWINDSZ, DT_IA_64_VMS_UNWIND_CODSEG)
+	(DT_IA_64_VMS_UNWIND_INFOSEG, DT_IA_64_VMS_LINKTIME)
+	(DT_IA_64_VMS_SEG_NO, DT_IA_64_VMS_SYMVEC_OFFSET)
+	(DT_IA_64_VMS_SYMVEC_SEG, DT_IA_64_VMS_UNWIND_OFFSET)
+	(DT_IA_64_VMS_UNWIND_SEG, DT_IA_64_VMS_STRTAB_OFFSET)
+	(DT_IA_64_VMS_SYSVER_OFFSET, DT_IA_64_VMS_IMG_RELA_OFF)
+	(DT_IA_64_VMS_SEG_RELA_OFF, DT_IA_64_VMS_FIXUP_RELA_OFF)
+	(DT_IA_64_VMS_PLTGOT_OFFSET, DT_IA_64_VMS_PLTGOT_SEG)
+	(DT_IA_64_VMS_FPMODE, SHN_IA_64_VMS_SYMVEC): Define
+
+2008-01-16  Mark Kettenis  <kettenis@gnu.org>
+
+	* common.h (AT_SUN_AUXFLAGS): Define.
+
+2007-12-11  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* dwarf2.h (DW_AT_hi_user): Correct value.
+
+2007-12-07  Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa.h (R_XTENSA_32_PCREL): New.
+
+2007-11-29  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* mips.h (E_MIPS_MACH_LS2E): New.
+	(E_MIPS_MACH_LS2F): New.
+
+2007-11-28  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* internal.h (ELF_IS_SECTION_IN_SEGMENT): Adjust to cope with
+	segments at the end of memory.
+
+2007-11-17  Thiemo Seufer  <ths@mips.com>
+
+	* mips.h (Tag_GNU_MIPS_ABI_FP): Mention -mips32r2 -mfp64 variant
+	in comment.
+
+2007-11-16  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf2.h: Mention the location of the DWARF3 spec on the web.
+	(DW_AT_stride_size): Rename to DW_AT_bit_stride.
+	(DW_AT_stride): Rename to DW_AT_byte_stride.
+
+2007-11-08  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* vxworks.h: New.
+
+2007-10-30  Nick Clifton  <nickc@redhat.com>
+
+	* mn10300.h (R_MN10300_ALIGN): Define.
+
+2007-10-25  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* ppc.h (Tag_GNU_Power_ABI_Vector): New.
+
+2007-10-19  Nick Clifton  <nickc@redhat.com>
+
+	* mn10300.h: Add R_MN10300_SYM_DIFF reloc.
+
+2007-10-18  Roland McGrath  <roland@redhat.com>
+
+	* common.h (NT_PPC_VMX): New macro.
+
+2007-10-01  M R Swami Reddy <MR.Swami.Reddy@nsc.com>
+
+	* cr16.h: Updated with new relocaction macros.
+
+2007-09-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/3281
+	PR binutils/5037
+	* internal.h (elf_segment_map): Add p_size and p_size_valid.
+	(ELF_IS_SECTION_IN_SEGMENT): Allow SHF_TLS sections in
+	PT_GNU_RELRO segments.
+
+2007-09-11  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* m68k.h (EF_M68K_CF_ISA_C_NODIV): New.
+
+2007-08-25  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* common.h (NT_SPU): Define.
+
+2007-08-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* common.h: Revert last change.
+
+2007-08-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* common.h (PT_GNU_STACK): Renamed to ...
+	(PT_GNU_ATTR): This.
+	(PT_GNU_STACK): New.  Make an alias of PT_GNU_ATTR.
+
+2007-07-09  Roland McGrath  <roland@redhat.com>
+
+	* common.h (NT_GNU_HWCAP, NT_GNU_BUILD_ID): New macros.
+
+2007-06-29  Joseph Myers  <joseph@codesourcery.com>
+
+	* ppc.h (Tag_GNU_Power_ABI_FP): Define.
+
+2007-06-29  Joseph Myers  <joseph@codesourcery.com>
+
+	* mips.h (Tag_GNU_MIPS_ABI_FP): Define.
+
+2007-06-29  Joseph Myers  <joseph@codesourcery.com>
+
+	* arm.h (elf32_arm_add_eabi_attr_int,
+	elf32_arm_add_eabi_attr_string, elf32_arm_add_eabi_attr_compat,
+	elf32_arm_get_eabi_attr_int, elf32_arm_set_eabi_attr_contents,
+	elf32_arm_eabi_attr_size, Tag_NULL, Tag_File, Tag_Section,
+	Tag_Symbol, Tag_compatibility): Remove.
+	* common.h (SHT_GNU_ATTRIBUTES): Define.
+
+2007-06-29  M R Swami Reddy  <MR.Swami.Reddy@nsc.com>
+
+	* common.h (EM_CR16): New entry for CR16 cpu.
+	* cr16.h: New file.
+
+2007-06-11  Sterling Augustine  <sterling@tensilica.com>
+	    Bob Wilson  <bob.wilson@acm.org>
+
+	* xtensa.h (XTENSA_PROP_INSN_NO_TRANSFORM): Renamed to...
+	(XTENSA_PROP_NO_TRANSFORM): ...this.
+
+2007-05-18  Caroline Tice  <ctice@apple.com>
+
+	* dwarf2.h: (enum dwarf_location_atom): Add new DW_OP,
+	DW_OP_GNU_uninit.
+
+2007-05-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* spu.h (R_SPU_ADDR16X): Define.
+	(R_SPU_PPU32, R_SPU_PPU64): Renumber.
+
+2007-05-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* spu.h (R_SPU_PPU32, R_SPU_PPU64): Define.
+
+2007-05-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* internal.h (ELF_IS_SECTION_IN_SEGMENT): Check both file offset
+	and vma for appropriate sections.
+
+2007-04-26  Jan Beulich  <jbeulich@novell.com>
+
+	* common.h (DT_ENCODING): Correct value (back to spec mandated
+	value).
+
+2007-03-08  Alan Modra  <amodra@bigpond.net.au>
+
+	* v850.h (V850_OTHER_TDA_BYTE): Delete.
+	(V850_OTHER_SDA, V850_OTHER_ZDA, V850_OTHER_TDA): Assign bits
+	that don't clash with visibility bits.
+
+2007-03-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* common.h (ELF_ST_VISIBILITY): Comment typo fix.
+
+2007-02-05  Dave Brolley  <brolley@redhat.com>
+	    Richard Sandiford  <rsandifo@redhat.com>
+	    Richard Henderson  <rth@redhat.com>
+	    DJ Delorie  <dj@redhat.com>
+	    Ben Elliston  <bje@redhat.com>
+
+	* mep.h: New file.
+	* common.h (EM_CYGNUS_MEP): Define.
+
+2007-02-15  Dave Brolley  <brolley@redhat.com>
+
+	From Graydon Hoare  <graydon@redhat.com>:
+	* common.h (STT_RELC, STT_SRELC, R_RELC): New macros.
+
+2007-01-08  Kazu Hirata  <kazu@codesourcery.com>
+
+	* m68k.h (EF_M68K_FIDO): New.
+	(EF_M68K_ARCH_MASK): OR EF_M68K_FIDO.
+	(EF_M68K_CPU32_FIDO_A, EF_M68K_CPU32_MASK): Remove.
+
+2006-12-25  Kazu Hirata  <kazu@codesourcery.com>
+
+	* m68k.h (EF_M68K_CPU32_FIDO_A, EF_M68K_CPU32_MASK): New.
+
+2006-12-19  Kazu Hirata  <kazu@codesourcery.com>
+
+	* m68k.h (EF_M68K_ARCH_MASK): New.
+
+2006-12-19  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* internal.h (struct elf_segment_map): Add p_vaddr_offset field.
+
+2006-12-07  Kazu Hirata  <kazu@codesourcery.com>
+
+	* m68k.h (EF_M68K_ISA_MASK, EF_M68K_ISA_A_NODIV,
+	EF_M68K_ISA_A, EF_M68K_ISA_A_PLUS, EF_M68K_ISA_B_NOUSP,
+	EF_M68K_ISA_B, EF_M68K_ISA_C, EF_M68K_MAC_MASK, EF_M68K_MAC,
+	EF_M68K_EMAC, EF_M68K_EMAC_B, EF_M68K_FLOAT): Rename to
+	EF_M68K_CF_ISA_MASK, EF_M68K_CF_ISA_A_NODIV, EF_M68K_CF_ISA_A,
+	EF_M68K_CF_ISA_A_PLUS, EF_M68K_CF_ISA_B_NOUSP,
+	EF_M68K_CF_ISA_B, EF_M68K_CF_ISA_C, EF_M68K_CF_MAC_MASK,
+	EF_M68K_CF_MAC, EF_M68K_CF_EMAC, EF_M68K_CF_EMAC_B,
+	EF_M68K_CF_FLOAT, respectively.
+
+2006-12-05  Michael Tautschnig  <tautschn@model.in.tum.de>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* external.h (struct Elf_External_Versym): Use ATTRIBUTE_PACKED.
+
+2006-10-28  Richard Sandiford  <richard@codesourcery.com>
+
+	* mips.h (R_MIPS_GLOB_DAT): Define
+	(R_MIPS_max): Bump by 1.
+
+2006-10-25  Trevor Smigiel  <Trevor_Smigiel@playstation.sony.com>
+	    Yukishige Shibata  <shibata@rd.scei.sony.co.jp>
+	    Nobuhisa Fujinami  <fnami@rd.scei.sony.co.jp>
+	    Takeaki Fukuoka  <fukuoka@rd.scei.sony.co.jp>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* common.h (EM_SPU): Define.
+	* spu.h: New file.
+
+2006-10-19  Mei Ligang  <ligang@sunnorth.com.cn>
+
+	* score.h (EF_SCORE_PIC): Redefine EF_SCORE_PIC as 0x80000000.
+	(EF_SCORE_FIXDEP): Redefine EF_SCORE_FIXDEP as 0x40000000.
+	(EF_SCORE_HASENTRY): Delete.
+
+2006-10-17  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* arm.h: Define TAG_CPU_ARCH_* constants.
+
+2006-09-17  Mei Ligang  <ligang@sunnorth.com.cn>
+
+	* score.h: New file.
+	* common.h: Add Score machine number.
+
+2006-07-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* common.h (SHT_GNU_HASH, DT_GNU_HASH): Define.
+
+2006-05-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* internal.h (ELF_SECTION_SIZE): New.
+	(ELF_IS_SECTION_IN_SEGMENT): Likewise.
+	(ELF_IS_SECTION_IN_SEGMENT_FILE): Updated.
+	(ELF_IS_SECTION_IN_SEGMENT_MEMORY): Likewise.
+
+2006-05-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* internal.h (struct elf_segment_map): Add p_align and p_align_valid.
+
+2006-05-24  Carlos O'Donell  <carlos@systemhalted.org>
+	    Randolph Chung  <randolph@tausq.org>
+	* hppa.h (R_PARISC_TLS_GD21L, R_PARISC_TLS_GD14R, R_PARISC_TLS_GDCALL,
+	R_PARISC_TLS_LDM21L, R_PARISC_TLS_LDM14R, R_PARISC_TLS_LDMCALL,
+	R_PARISC_TLS_LDO21L, R_PARISC_TLS_LDO14R, R_PARISC_TLS_DTPMOD32,
+	R_PARISC_TLS_DTPMOD64, R_PARISC_TLS_DTPOFF32, R_PARISC_TLS_DTPOFF64):
+	New TLS relocs.
+	(R_PARISC_TLS_LE21L, R_PARISC_TLS_LE14R, R_PARISC_TLS_IE21L,
+	R_PARISC_TLS_IE14R, R_PARISC_TLS_TPREL32, R_PARISC_TLS_TPREL64):
+	Define TLS relocs using existing equivalents.
+
+2006-05-24  Bjoern Haase  <bjoern.m.haase@web.de>
+
+	* avr.h: Add E_AVR_MACH_AVR6, R_AVR_LO8_LDI_GS and R_AVR_HI8_LDI_GS.
+
+2006-03-25  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	* bfin.h (R_BFIN_GOT17M4, R_BFIN_GOTHI, R_BFIN_GOTLO,
+	R_BFIN_FUNCDESC, R_BFIN_FUNCDESC_GOT17M4,  R_BFIN_FUNCDESC_GOTHI,
+	R_BFIN_FUNCDESC_GOTLO, R_BFIN_FUNCDESC_VALUE,
+	R_BFIN_FUNCDESC_GOTOFF17M4, R_BFIN_FUNCDESC_GOTOFFHI,
+	R_BFIN_FUNCDESC_GOTOFFLO, R_BFIN_GOTOFF17M4, R_BFIN_GOTOFFHI,
+	R_BFIN_GOTOFFLO): New relocs.
+	(EF_BFIN_PIC, EF_BFIN_FDPIC, EF_BFIN_PIC_FLAGS): New macros.
+
+2006-03-23  Michael Matz  <matz@suse.de>
+
+	* x86-64.h: Add the new relocations with their official
+	numbers.
+
+2006-03-22  Richard Sandiford  <richard@codesourcery.com>
+	    Daniel Jacobowitz  <dan@codesourcery.com>
+	    Phil Edwards  <phil@codesourcery.com>
+	    Zack Weinberg  <zack@codesourcery.com>
+	    Mark Mitchell  <mark@codesourcery.com>
+	    Nathan Sidwell  <nathan@codesourcery.com>
+
+	* mips.h (R_MIPS_COPY, R_MIPS_JUMP_SLOT): New relocs.
+
+2006-03-19  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* hppa.h (SHF_HP_TLS, SHF_HP_NEAR_SHARED, SHF_HP_FAR_SHARED,
+	SHF_HP_COMDAT, SHF_HP_CONST, SHN_TLS_COMMON, SHN_NS_COMMON,
+	SHN_NS_UNDEF, SHN_FS_UNDEF, SHN_HP_EXTERN, SHN_HP_EXTHINT,
+	SHN_HP_UNDEF_BIND_IMM, SHT_HP_OVLBITS, SHT_HP_DLKM, SHT_HP_COMDAT,
+	SHT_HP_OBJDICT, SHT_HP_ANNOT, STB_HP_ALIAS): Define.
+
+2006-03-10  Paul Brook  <paul@codesourcery.com>
+
+	* arm.h (EF_ARM_EABI_VER5): Define.
+
+2006-03-06  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* m68k.h (EF_M68K_ISA_MASK, EF_M68K_ISA_A,
+	EF_M68K_ISA_A_PLUS, EF_M68K_ISA_B, EF_M68K_ISA_C): Adjust.
+	(EF_M68K_ISA_A_NODIV, EF_M68K_ISA_B_NOUSP): New.
+	(EF_M68K_HW_DIV, EF_M68K_USP): Remove.
+	(EF_M68K_MAC, EF_M68K_EMAC, EF_M68K_FLOAT): Adjust.
+	(EF_M68K_EMAC_B): New.
+
+2006-03-03  Bjoern Haase  <bjoern.m.haase@web.de>
+
+	* avr.h (R_AVR_MS8_LDI,R_AVR_MS8_LDI_NEG): Add.
+	(EF_AVR_LINKRELAX_PREPARED): Add.
+
+2006-03-02  Ben Elliston  <bje@au.ibm.com>
+
+	Import from the GCC tree:
+	2006-03-01  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf2.h (DW_TAG_condition, DW_TAG_shared_type): New constants
+	from DWARF 3.
+	(DW_AT_description, DW_AT_binary_scale, DW_AT_decimal_scale,
+	DW_AT_small, DW_AT_decimal_sign, DW_AT_digit_count,
+	DW_AT_picture_string, DW_AT_mutable, DW_AT_threads_scaled,
+	DW_AT_explicit, DW_AT_object_pointer, DW_AT_endianity,
+	DW_AT_elemental, DW_AT_pure, DW_AT_recursive): New.
+	(DW_OP_form_tls_address, DW_OP_call_frame_cfa, DW_OP_bit_piece): New.
+	(DW_ATE_packed_decimal, DW_ATE_numeric_string, DW_ATE_edited,
+	DW_ATE_signed_fixed, DW_ATE_unsigned_fixed): New.
+	(DW_DS_unsigned, DW_DS_leading_overpunch, DW_DS_trailing_overpunch,
+	DW_DS_leading_separate, DW_DS_trailing_separate): New.
+	(DW_END_default, DW_END_big, DW_END_little): New.
+	(DW_END_lo_user, DW_END_hi_user): Define.
+	(DW_LNE_lo_user, DW_LNE_hi_user): Define.
+	(DW_CFA_val_offset, DW_CFA_val_offset_sf, DW_CFA_val_expression): New.
+	(DW_LANG_PLI, DW_LANG_ObjC, DW_LANG_ObjC_plus_plus, DW_LANG_UPC,
+	DW_LANG_D): New.
+
+2006-02-06  Steve Ellcey  <sje@cup.hp.com>
+
+	* ia64.h (SHF_IA_64_HP_TLS): New.
+
+2006-02-24  DJ Delorie  <dj@redhat.com>
+
+	* m32c.h: Add relax relocs.
+
+2006-02-17  Shrirang Khisti  <shrirangk@kpitcummins.com>
+            Anil Paranjape   <anilp1@kpitcummins.com>
+            Shilin Shakti    <shilins@kpitcummins.com>
+
+	* common.h (EM_XC16X): New entry for xc16x cpu.
+	Sort other EM_* numbers into numerical order.
+	* xc16x.h: New file.
+
+2006-02-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/2258
+	* internal.h (ELF_IS_SECTION_IN_SEGMENT_FILE): New.
+	(ELF_IS_SECTION_IN_SEGMENT_MEMORY): Likewise.
+
+2006-02-07  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
+	(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
+	(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
+	EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
+	EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
+
+2006-02-06  Steve Ellcey  <sje@cup.hp.com>
+
+	* ia64.h (SHF_IA_64_HP_TLS): New.
+
+2006-01-18  Alexandre Oliva  <aoliva@redhat.com>
+
+	Introduce TLS descriptors for i386 and x86_64.
+	* common.h (DT_TLSDESC_GOT, DT_TLSDESC_PLT): New.
+	* i386.h (R_386_TLS_GOTDESC, R_386_TLS_DESC_CALL, R_386_TLS_DESC):
+	New.
+	* x86-64.h (R_X86_64_GOTPC32_TLSDESC, R_X86_64_TLSDESC_CALL,
+	R_X86_64_TLSDESC): New.
+
+2006-01-09  Mike Frysinger  <vapier@gentoo.org>:
+
+	* common.h (EM_ALTERA_NIOS2, EM_NIOS32) Define.
+
+2005-12-16  Nathan Sidwell  <nathan@codesourcery.com>
+
+	Second part of ms1 to mt renaming.
+	* common.h (EM_MT): Renamed.
+	* mt.h: Rename relocs, cpu & other defines.
+
+2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* mt.h: Renamed from ms1.h
+
+2005-12-12  Paul Brook  <paul@codesourcery.com>
+
+	* arm.h (elf32_arm_get_eabi_attr_int): Add prototype.
+
+2005-11-11  Nick Clifton  <nickc@redhat.com>
+
+	PR 1150
+	* mips.h (STO_OPTIONAL): Define.
+	(ELF_MIPS_IS_OPTIONAL): Define.
+
+2005-11-07  Nathan Sidwell  <nathan@codesourcery.com>
+
+	Add ms2.
+	* ms1.h (EF_MS1_CPU_MS2): New.
+
+2005-11-06  John David Anglin  <dave.anglin@nrc-crnc.gc.ca>
+
+	* hppa.h (R_PARISC_DIR64WR, R_PARISC_DIR64DR): Remove relocs.
+
+2005-09-30  Catherine Moore  <clm@cm00re.com>
+
+	* bfin.h: New file.
+	* common.h (EM_BLACKFIN): Define.
+
+2005-10-08  Paul Brook  <paul@codesourcery.com>
+
+	* arm.h: Add prototypes for BFD object attribute routines.
+
+2005-09-09  Richard Earnshaw  <richard.earnshaw@arm.com>
+
+	* arm.h (SHT_ARM_PREEMPTMAP, SHT_ARM_ATTRIBUTES): New defines.
+
+2005-08-09  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* hppa.h (SHT_PARISC_DLKM, SHF_PARISC_WEAKORDER, PT_PARISC_WEAKORDER):
+	New defines.
+
+2005-08-04  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* hppa.h (PF_HP_CODE, PF_HP_MODIFY, PF_HP_LAZYSWAP): Revise defines.
+	(PF_HP_CODE_DEPR, PF_HP_MODIFY_DEPR, PF_HP_LAZYSWAP_DEPR): New
+	deprecated defines.
+	(DT_HP_EPLTREL, DT_HP_EPLTRELSZ, DT_HP_FILTERED, DT_HP_FILTER_TLS,
+	DT_HP_COMPAT_FILTERED, DT_HP_LAZYLOAD, DT_HP_BIND_NOW_COUNT, DT_PLT,
+	DT_PLT_SIZE, DT_DLT, DT_DLT_SIZE, DT_HP_BIND_DEPTH_FIRST, DT_HP_GST,
+	DT_HP_SHLIB_FIXED, DT_HP_MERGE_SHLIB_SEG, DT_HP_NODELETE, DT_HP_GROUP,
+	DT_HP_PROTECT_LINKAGE_TABLE, PT_HP_OPT_ANNOT, PT_HP_HSL_ANNOT,
+	PT_HP_STACK, PT_HP_CORE_UTSNAME, NT_HP_COMPILER, NT_HP_COPYRIGHT,
+	NT_HP_VERSION, NT_HP_SRCFILE_INFO, NT_HP_LINKER, NT_HP_INSTRUMENTED,
+	NT_HP_UX_OPTIONS): Define.
+
+2005-07-25  DJ Delorie  <dj@redhat.com>
+
+	* m32c.h: Add R_M32C_8, R_M32C_LO16, R_M32C_HI8, and R_M32C_HI16.
+
+2005-07-25  Jan Hubicka  <jh@suse.cz>
+
+	* x86-64.h (SHN_X86_64_LCOMMON): New.
+	(SHF_X86_64_LARGE): New.
+
+2005-07-20  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
+
+	* m32r.h (R_M32R_REL32): Added.
+
+2005-07-18  Ben Elliston  <bje@au.ibm.com>
+
+	* dwarf2.h (enum dwarf_type): Remove DW_AT_GNU_decimal_float.
+	Replace with DW_ATE_decimal_float (now in DWARF 3).
+
+2005-07-14  Jim Blandy  <jimb@redhat.com>
+
+	Add support for Renesas M32C and M16C.
+	* common.h (EM_M32C): New machine number.
+	* m32c.h: New file.
+
+2005-06-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* external.h (GRP_ENTRY_SIZE): Define.
+
+2005-06-17  Jan Beulich  <jbeulich@novell.com>
+
+	* x86-64.h (elf_x86_64_reloc_type): Adjust comment for
+	R_X86_64_GOTPCREL. Add R_X86_64_PC64, R_X86_64_GOTOFF64, and
+	R_X86_64_GOTPC32.
+
+2005-06-07  Aldy Hernandez  <aldyh@redhat.com>
+	    Michael Snyder  <msnyder@redhat.com>
+	    Stan Cox  <scox@redhat.com>
+
+	* common.h (EM_MS1): Define.
+
+	* ms1.h: New file.
+
+2005-05-31  Richard Henderson  <rth@redhat.com>
+
+	* alpha.h (LITUSE_ALPHA_JSRDIRECT): New.
+
+2005-05-29  Richard Henderson  <rth@redhat.com>
+
+	* alpha.h (DT_ALPHA_PLTRO): New.
+
+2005-05-19  Ben Elliston  <bje@au.ibm.com>
+
+	* dwarf2.h (enum dwarf_type): Assign DW_ATE_GNU_decimal_float from
+	the user-defined encoding space pending inclusion in the standard.
+
+2005-05-18  Zack Weinberg  <zack@codesourcery.com>
+
+	* arm.h: Make all #ifndef OLD_ARM_ABI blocks
+	unconditional, delete all #ifdef OLD_ARM_ABI blocks.
+
+2005-05-17  Zack Weinberg  <zack@codesourcery.com>
+
+	* arm.h: Import complete list of official relocation names
+	and numbers from AAELF.  Define FAKE_RELOCs for old names.
+	Remove a few old names no longer used anywhere.
+
+2005-05-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* ppc.h (DT_PPC_GOT): Rename from DT_PPC_GLINK.
+
+2005-05-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* ppc.h (R_PPC_RELAX32, R_PPC_RELAX32PC, R_PPC_RELAX32_PLT,
+	R_PPC_RELAX32PC_PLT) Adjust.
+	(R_PPC_REL16, R_PPC_REL16_LO, R_PPC_REL16_HI, R_PPC_REL16_HA): Define.
+	(DT_PPC_GLINK): Define.
+
+2005-05-10  Nick Clifton  <nickc@redhat.com>
+
+	* Update the address and phone number of the FSF organization in
+	the GPL notices in the following files:
+	alpha.h, arc.h, arm.h, avr.h, common.h, cr16c.h, cris.h, crx.h,
+	d10v.h, d30v.h, dlx.h, dwarf.h, dwarf2.h, external.h, fr30.h,
+	frv.h, h8.h, hppa.h, i370.h, i386.h, i860.h, i960.h, ia64.h,
+	internal.h, ip2k.h, iq2000.h, m32r.h, m68hc11.h, m68k.h, mcore.h,
+	mips.h, mmix.h, mn10200.h, mn10300.h, msp430.h, openrisc.h,
+	or32.h, pj.h, ppc.h, ppc64.h, reloc-macros.h, s390.h, sh.h,
+	sparc.h, v850.h,  vax.h, x86-64.h, xstormy16.h,	xtensa.h
+
+2005-04-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	Moved from ../ChangeLog
+
+	2004-10-27  Richard Earnshaw  <rearnsha@arm.com>
+	* arm.h: Add R_ARM_CALL and R_ARM_JUMP32.
+
+	2004-10-12  Paul Brook  <paul@codesourcery.com>
+	* arm.h (EF_ARM_EABI_VER4): Define.
+
+	2004-10-08  Daniel Jacobowitz  <dan@debian.org>
+
+	* common.h (PT_SUNW_EH_FRAME): Define.
+	* x86-64.h (SHT_X86_64_UNWIND): Define.
+
+	2004-10-07  Bob Wilson  <bob.wilson@acm.org>
+	* xtensa.h (R_XTENSA_DIFF8, R_XTENSA_DIFF16, R_XTENSA_DIFF32,
+	R_XTENSA_SLOT*_OP, R_XTENSA_SLOT*_ALT): New relocations.
+	(XTENSA_PROP_SEC_NAME): Define.
+	(property_table_entry): Add flags field.
+	(XTENSA_PROP_*, GET_XTENSA_PROP_*, SET_XTENSA_PROP_*): Define.
+
+	2004-09-17  Paul Brook  <paul@codesourcery.com>
+	* arm.h: Remove R_ARM_STKCHK and R_ARM_THM_STKCHK.
+	Add R_ARM_TARGET2, R_ARM_PREL31, R_ARM_GOT_ABS, R_ARM_GOT_PREL,
+	R_ARM_GOT_BREL12, R_ARM_GOTOFF12 and R_ARM_GOTRELAX.
+
+	2004-09-13  Paul Brook  <paul@codesourcery.com>
+	* arm.h: Rename RELABS to TARGET1.
+
+	2004-05-11  Jakub Jelinek  <jakub@redhat.com>
+	* common.h (PT_GNU_EH_FRAME, PT_GNU_STACK): Add comments.
+	(PT_GNU_RELRO): Define.
+
+2005-03-29  Daniel Jacobowitz  <dan@codesourcery.com>
+	    Phil Blundell  <philb@gnu.org>
+
+	* arm.h: Add TLS relocations.
+
+2005-03-23  Ben Elliston  <bje@au.ibm.com>
+
+	* dwarf.h: Merge with GCC's dwarf.h.
+
+2005-03-18  C Jaipraash  <cjaiprakash@noida.hcltech.com>
+
+	* m68k.h (EF_CFV4E): Define.
+
+2005-03-17  Paul Brook <paul@codesourcery.com>
+	    Dan Jacobowitz <dan@codesourcery.com>
+	    Mark Mitchell  <mark@codesourcery.com>
+
+	* arm.h (PT_ARM_EXIDX): Define.
+
+2005-03-02  Daniel Jacobowitz  <dan@codesourcery.com>
+	    Joseph Myers  <joseph@codesourcery.com>
+
+	* mips.h: Define MIPS TLS relocations.
+
+2005-02-15  Nigel Stephens  <nigel@mips.com>
+	    Maciej W. Rozycki  <macro@mips.com>
+
+	* mips.h (R_MIPS16_GOT16): New reloc code.
+	(R_MIPS16_CALL16): Likewise.
+	(R_MIPS16_HI16): Likewise.
+	(R_MIPS16_LO16): Likewise.
+	(R_MIPS16_min): New fake reloc code.
+	(R_MIPS16_max): Likewise.
+
+2005-02-11  Maciej W. Rozycki  <macro@mips.com>
+
+	* mips.h (R_MIPS_max): Use FAKE_RELOC to define.
+
+2005-01-25  Alexandre Oliva  <aoliva@redhat.com>
+
+	2004-12-10  Alexandre Oliva  <aoliva@redhat.com>
+	* frv.h: Add R_FRV_TLSMOFF.
+	2004-11-10  Alexandre Oliva  <aoliva@redhat.com>
+	* frv.h: Add TLS relocations.
+
+2005-01-17  Nick Clifton  <nickc@redhat.com>
+
+	* sh.h (EF_SH2A_SH4_NOFPU, EF_SH2A_SH3_NOFPU, EF_SH2A_SH4,
+	EF_SH2A_SH3E): New flags.
+	(EF_SH_BFD_TABLE): Add these new flags to the table.
+
+2005-01-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* ppc.h (R_PPC_RELAX32_PLT, R_PPC_RELAX32PC_PLT): Define.
+	(R_PPC_RELAX32, R_PPC_RELAX32PC): Adjust value.
+
+2004-12-22  Klaus Rudolph  <lts-rudolph@gmx.de>
+
+	* avr.h (R_AVR_LDI, R_AVR_6, R_AVR_6_ADIW): New relocs.
+
+2004-12-16  Richard Sandiford  <rsandifo@redhat.com>
+
+	* v850.h (R_V850_LO16_SPLIT_OFFSET): New reloc.
+
+2004-12-09  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* mips.h (E_MIPS_MACH_9000): Define.
+
+2004-11-04  Hans-Peter Nilsson  <hp@axis.com>
+
+	* cris.h (EF_CRIS_VARIANT_MASK, EF_CRIS_VARIANT_ANY_V0_V10)
+	(EF_CRIS_VARIANT_V32, EF_CRIS_VARIANT_COMMON_V10_V32): New
+	macros.
+
+2004-10-06  Eric Christopher  <echristo@redhat.com>
+
+	* dwarf2.h: Sync with gcc dwarf2.h. Fix typo.
+
+2004-10-01  Paul Brook  <paul@codesourcery.com>
+
+	* arm.h (SHT_ARM_EXIDX): Define.
+	(ELF_STRING_ARM_unwind, ELF_STRING_ARM_unwind,
+	ELF_STRING_ARM_unwind_once, ELF_STRING_ARM_unwind_info_once):
+	Define.
+
+2004-08-25  Dmitry Diky  <diwil@spec.ru>
+
+	* msp430.h: Add new relocs.
+
+2004-08-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* i386.h (R_386_USED_BY_INTEL_200): New.
+
+2004-07-29  Alexandre Oliva  <aoliva@redhat.com>
+
+	Introduce SH2a support.
+	2004-02-18  Corinna Vinschen  <vinschen@redhat.com>
+	* sh.h (EF_SH2A_NOFPU): New.
+	2003-12-01  Michael Snyder  <msnyder@redhat.com>
+	* sh.h (EF_SH2A): New.
+
+2004-07-27  Tomer Levi  <Tomer.Levi@nsc.com>
+
+	* crx.h: Add BFD_RELOC_CRX_SWITCH8, BFD_RELOC_CRX_SWITCH16,
+	BFD_RELOC_CRX_SWITCH32.
+
+2004-07-06  Tomer Levi  <Tomer.Levi@nsc.com>
+
+	* common.h (EM_CRX): Define.
+	* crx.h: New file.
+
+2004-06-25  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
+
+	* m32r.h: Add defintions of R_M32R_GOTOFF_HI_ULO,
+	R_M32R_GOTOFF_HI_SLO and R_M32R_GOTOFF_LO.
+
+2004-06-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* common.h (ELF64_R_INFO): Warning fix.
+
+2004-06-14  Chris Demetriou  <cgd@broadcom.com>
+
+	* mips.h (R_MIPS_PC32): Add back (undoing removal on 2004-04-24),
+	with an updated comment.
+
+2004-05-28  Andrew Stubbs <andrew.stubbs@superh.com>
+
+	* sh.h (EF_SH_HAS_DSP): Remove.
+	(EF_SH_HAS_FP): Remove.
+	(EF_SH_MERGE_MACH): Remove.
+	(EF_SH4_NOFPU): Convert to decimal.
+	(EF_SH4A_NOFPU): Likewise.
+	(EF_SH4_NOMMU_NOFPU): Likewise.
+	(EF_SH3_NOMMU): Add new macro.
+	(EF_SH_BFD_TABLE): Likewise.
+	(sh_find_elf_flags): Add prototype.
+	(sh_elf_get_flags_from_mach): Likewise.
+
+2004-04-24  Chris Demetriou  <cgd@broadcom.com>
+
+	* mips.h (R_MIPS_PC32, R_MIPS_PC64, R_MIPS_GNU_REL_LO16)
+	(R_MIPS_GNU_REL_HI16): Remove.
+	(R_MIPS_GNU_REL16_S2): Update comment.
+
+2004-30-30  Galit Heller  <Galit.Heller@nsc.com>
+	    Tomer Levi  <Tomer.Levi@nsc.com>
+
+	* common.h (EM_CR): Define.
+	* cr16c.h: New file.
+
+2004-03-23  Paul Brook  <paul@codesourcery.com>
+
+	* arm.h (EF_ERM_BE8, EF_ARM_LE8, EF_ARM_EABI_VER3): Add.
+
+2003-03-03  Andrew Stubbs  <andrew.stubbs@superh.com>
+
+	* sh.h: Add EF_SH4_NOMMU_NOFPU.
+
+2004-03-01  Richard Sandiford  <rsandifo@redhat.com>
+
+	* frv.h (EF_FRV_CPU_FR405, EF_FRV_CPU_FR450): Define.
+
+2004-01-28  Roland McGrath  <roland@redhat.com>
+
+	* common.h (AT_SECURE): New macro.
+
+2004-01-21  Roland McGrath  <roland@redhat.com>
+
+	* common.h (AT_SUN_UID, AT_SUN_RUID, AT_SUN_GID): New macros.
+	(AT_SUN_RGID, AT_SUN_LDELF, AT_SUN_LDSHDR, AT_SUN_LDNAME,
+	AT_SUN_LPAGESZ, AT_SUN_PLATFORM, AT_SUN_HWCAP, AT_SUN_IFLUSH,
+	AT_SUN_CPU, AT_SUN_EMUL_ENTRY, AT_SUN_EMUL_EXECFD,
+	AT_SUN_EXECNAME) AT_SUN_MMU, AT_SUN_LDDATA): Likewise.
+
+2004-01-17  Mark Kettenis  <kettenis@gnu.org>
+
+	* common.h (NT_OPENBSD_IDENT): Define.
+
+2004-01-06  Alexandre Oliva  <aoliva@redhat.com>
+
+	2003-09-18  Alexandre Oliva  <aoliva@redhat.com>
+	* frv.h (EF_FRV_FDPIC): New macro.
+	(EF_FRV_PIC_FLAGS): Adjust.
+	2003-08-08  Alexandre Oliva  <aoliva@redhat.com>
+	* frv.h (R_FRV_FUNCDESC_VALUE, R_FRV_FUNCDESC_GOTOFF12,
+	R_FRV_FUNCDESC_GOTOFFLO, R_FRV_FUNCDESC_GOTOFFHI, R_FRV_GOTOFF12,
+	R_FRV_GOTOFFLO, R_FRV_GOTOFFHI): New.
+	2003-08-04  Alexandre Oliva  <aoliva@redhat.com>
+	* frv.h (R_FRV_GOT12, R_FRV_GOTHI, R_FRV_GOTLO, R_FRV_FUNCDESC,
+	R_FRV_FUNCDESC_GOT12, R_FRV_FUNCDESC_GOTHI, R_FRV_FUNCDESC_GOTLO):
+	New.
+
+
+For older changes see ChangeLog-9103
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/ChangeLog-9103 sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/ChangeLog-9103
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/ChangeLog-9103	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/ChangeLog-9103	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1948 @@
+2005-04-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	Moved from ../ChangeLog
+
+	2003-10-14  Bob Wilson  <bob.wilson@acm.org>
+	* xtensa.h: Formatting.  Fix comments about property section
+	names for linkonce sections.
+
+	2003-05-23  Jakub Jelinek  <jakub@redhat.com>
+	* common.h (PT_GNU_STACK): Define.
+
+	2003-01-25  Jakub Jelinek  <jakub@redhat.com>
+	* sparc.h: Add TLS relocs.  Move R_SPARC_REV32 to 252.
+
+	2002-09-26  Jakub Jelinek  <jakub@redhat.com>
+	* x86-64.h: Add TLS relocs.
+
+	2002-09-19  Jakub Jelinek  <jakub@redhat.com>
+	* i386.h (R_386_TLS_TPOFF, R_386_TLS_IE, R_386_TLS_GOTIE):
+	Define.
+
+	2002-07-10  Jakub Jelinek  <jakub@redhat.com>
+	* common.h (SHT_GNU_LIBLIST, DT_GNU_PRELINKED,
+	DT_GNU_CONFLICT*, DT_GNU_LIBLIST*): Define.
+
+	2002-05-31  Michal Ludvig  <mludvig@suse.cz>
+	* dwarf2.h (DW_CFA_low_user, DW_CFA_high_user): Renamed
+	to DW_CFA_lo_user, DW_CFA_hi_user respectively.
+
+	2002-05-23  Jakub Jelinek  <jakub@redhat.com>
+	* common.h (PT_TLS, SHF_TLS, STT_TLS, DF_STATIC_TLS): Define.
+	* ia64.h (R_IA64_LTOFF_TPREL22): Renamed from R_IA64_LTOFF_TP22.
+	* i386.h: Add TLS relocs.
+
+2003-12-19  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
+
+	* m32r.h : Added m32r-linux and PIC support.  Add new ABI that
+	uses RELA.
+	(R_M32R_16_RELA, R_M32R_32_RELA, R_M32R_24_RELA,
+	R_M32R_10_PCREL_RELA, R_M32R_18_PCREL_RELA,
+	R_M32R_26_PCREL_RELA, R_M32R_HI16_ULO_RELA,
+	R_M32R_HI16_SLO_RELA, R_M32R_LO16_RELA,
+	R_M32R_SDA16_RELA, R_M32R_RELA_GNU_VTINHERIT,
+	R_M32R_RELA_GNU_VTENTRY, R_M32R_GOT24,
+	R_M32R_26_PLTREL, R_M32R_COPY, R_M32R_GLOB_DAT,
+	R_M32R_JMP_SLOT, R_M32R_RELATIVE, R_M32R_GOTOFF,
+	R_M32R_GOTPC24, R_M32R_GOT16_HI_ULO,
+	R_M32R_GOT16_HI_SLO, R_M32R_GOT16_LO,
+	R_M32R_GOTPC_HI_ULO, R_M32R_GOTPC_HI_SLO,
+	R_M32R_GOTPC_LO): New relocs.
+
+2003-12-06  Alan Modra  <amodra@bigpond.net.au>
+
+	From Jan Beulich <JBeulich@novell.com>
+	* common.h (DT_HIOS): Correct value.
+
+2003-12-03   Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
+
+	* m32r.h: Add new machine type m32r2 and instruction modes.
+
+2003-11-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* ppc.h (R_PPC_RELAX32PC): Define.
+
+2003-10-22  Alexandre Oliva  <aoliva@redhat.com>,
+	    Michael Snyder  <msnyder@redhat.com>
+
+	* sh.h (EF_SH4A, EF_SH4AL_DSP, EF_SH4_NOFPU, EF_SH4A_NOFPU): New.
+	(EF_SH_MERGE_MACH): Combine them.
+
+2003-10-18  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* mmix.h (R_MMIX_PUSHJ_STUBBABLE): New reloc number.
+	(_bfd_mmix_before_linker_allocation): Rename from
+	_bfd_mmix_prepare_linker_allocated_gregs.
+	(_bfd_mmix_after_linker_allocation): Rename from
+	_bfd_mmix_finalize_linker_allocated_gregs.
+
+2003-10-06  Dave Brolley  <brolley@redhat.com>
+
+	* frv.h (EF_FRV_CPU_FR550): New macro.
+
+2003-09-30  Chris Demetriou  <cgd@broadcom.com>
+
+	* mips.h (E_MIPS_ARCH_64R2): New define.
+
+2003-09-23  DJ Delorie  <dj@redhat.com>
+
+	* sh.h (R_SH_SWITCH8, R_SH_GNU_VTINHERIT, R_SH_GNU_VTENTRY,
+	R_SH_LOOP_START,R_SH_LOOP_END): Move to "reserved" spaces.
+	(R_SH_DIR16, R_SH_DIR8, R_SH_DIR8UL, R_SH_DIR8UW, R_SH_DIR8U,
+	R_SH_DIR8SW, R_SH_DIR8S, R_SH_DIR4UL, R_SH_DIR4UW, R_SH_DIR4U,
+	R_SH_PSHA, R_SH_PSHL): New.
+
+2003-09-11  James Cownie <jcownie@etnus.com>
+
+	* dwarf2.h: Add HP dwarf extensions from their hacked gdb
+	header files (ftp://ftp.hp.com/pub/lang/tools/WDB/wdb-4.0.tar.gz).
+
+2003-09-04  Nick Clifton  <nickc@redhat.com>
+
+	* v850.h (E_V850E1_ARCH): Define.
+
+2003-08-21  James Cownie <jcownie@etnus.com>
+
+	* dwarf2.h: Add PGI dwarf extensions.
+
+2003-08-08 Dmitry Diky <diwil@mail.ru>
+
+	* msp430.h: Add xW42 and xE42 parts. Sort MPU list according to
+	gcc order.
+
+2003-08-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* reloc-macros.h (START_RELOC_NUMBERS) : Remove PARAMS macro.  Use
+	C90 function definition.  Formatting.
+	(RELOC_NUMBER): Remove !__STDC__ code.
+
+2003-07-28  Eric Christopher  <echristo@redhat.com>
+
+	* ppc.h (R_PPC_RELAX32): New. Fake relocation.
+
+2003-07-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* v850.h (SHF_V850_GPREL): New.
+	(SHF_V850_EPREL): Likewise.
+	(SHF_V850_R0REL): Likewise.
+
+2003-07-09  Alexandre Oliva  <aoliva@redhat.com>
+
+	2001-05-16  Alexandre Oliva  <aoliva@redhat.com>
+	* mn10300.h: Introduce GOTPC16, GOTOFF24, GOTOFF16 and
+	PLT16, and rename GOTPC to GOTPC32 and GOTOFF to GOTOFF32.
+	Renumbered all relocs.
+	2001-04-12  Alexandre Oliva  <aoliva@redhat.com>
+	* mn10300.h (R_MN10300_GOTPC, R_MN10300_GOTOFF,
+	R_MN10300_PLT32, R_MN10300_GOT32, R_MN10300_GOT24,
+	R_MN10300_GOT16, R_MN10300_COPY, R_MN10300_GLOB_DAT,
+	R_MN10300_JMP_SLOT, R_MN10300_RELATIVE): New relocs.
+
+2003-07-09  Alexandre Oliva  <aoliva@redhat.com>
+
+	2000-04-01  Alexandre Oliva  <aoliva@cygnus.com>
+	* mn10300.h (E_MN10300_MACH_AM33_2): Renamed from
+	E_MN10300_MACH_AM332.
+	2000-03-31  Alexandre Oliva  <aoliva@cygnus.com>
+	* mn10300.h (E_MN10300_MACH_AM332): Defined.
+
+2003-07-01  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* s390.h (elf_s390_reloc_type): Add long displacement relocations
+	R_390_20, R_390_GOT20, R_390_GOTPLT20 and R_390_TLS_GOTIE20.
+
+2003-06-29  Andreas Jaeger  <aj@suse.de>
+
+	* mmix.h: Convert to ISO C90 prototypes.
+	* mips.h: Likewise.
+
+2003-06-13  Robert Millan <zeratul2@wanadoo.es>
+
+	* common.h (GNU_ABI_TAG_NETBSD): New tag.
+	(GNU_ABI_TAG_FREEBSD): New tag.
+
+2003-06-10  Richard Sandiford  <rsandifo@redhat.com>
+
+	* h8.h (E_H8_MACH_H8300SXN): New flag.
+
+2003-06-03  Nick Clifton  <nickc@redhat.com>
+
+	* v850.h (R_V850_32): Rename to R_V850_ABS32.
+	Add R_V850_REL32.
+
+2003-05-15  Roland McGrath  <roland@redhat.com>
+
+	* common.h (NT_AUXV, AT_*): New macros.
+	* external.h (Elf32_External_Auxv, Elf64_External_Auxv): New types.
+	* internal.h (Elf_Internal_Auxv): New type.
+
+2003-05-14  Michael Snyder  <msnyder@redhat.com>
+	From  Bernd Schmidt  <bernds@redhat.com>
+	* h8.h (E_H8_MACH_H8300SX): New.
+
+2003-04-24 Dhananjay Deshpande <dhananjayd@kpitcummins.com>
+
+	* h8.h (E_H8_MACH_H8300HN, E_H8_MACH_H8300SN): New
+
+2003-04-23  J"orn Rennecke <joern.rennecke@superh.com>
+
+	* common.h (EM_SH): Amend comment to refer to SuperH.
+
+2003-04-22  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
+
+	* common.h: Replace references to Mitsubishi M32R with
+	references to Renesas M32R.
+
+2003-04-15  Rohit Kumar Srivastava <rohits@kpitcummins.com>
+
+	* common.h: Replace occurrances of 'Hitachi' with 'Renesas'.
+
+2003-04-01  Bob Wilson  <bob.wilson@acm.org>
+
+	* common.h (EM_XTENSA_OLD): Define.
+	* xtensa.h: New file.
+
+2003-04-01  Nick Clifton  <nickc@redhat.com>
+
+	* arm.h (ARM_NOTE_SECTION): Include .gnu in the string.
+
+2003-03-25  Stan Cox   <scox@redhat.com>
+	    Nick Clifton  <nickc@redhat.com>
+
+	Contribute support for Intel's iWMMXt chip - an	ARM variant:
+
+	* arm.h (ARM_NOTE_SECTION): Define.
+
+2003-03-03  J"orn Rennecke <joern.rennecke@superh.com>
+
+	* sh.h (EF_SH_MERGE_MACH): Make sure SH2E & SH3/SH3E merge to SH3E,
+	and SH2E & SH4 merge to SH4, not SH2E.
+
+2003-02-21  Ian Wienand  <ianw@gelato.unsw.edu.au>
+
+	* ia64.h (SHT_IA_64_LOPSREG, SHT_IA_64_HIPSREG,
+	SHT_IA_64_PRIORITY_INIT): Define.
+
+2003-02-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* ppc64.h (IS_PPC64_TLS_RELOC): Rename from IS_TLS_RELOC.
+
+	* ppc.h: Replace DTPMOD64, TPREL64, DTPREL64 with DTPMOD32 etc.
+	(IS_PPC_TLS_RELOC): Define.
+
+2003-02-10  Nick Clifton  <nickc@redhat.com>
+
+	* arm.h (EF_ARM_MAVERICK_FLOAT): Define.
+
+2003-02-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* ppc.h: Add TLS relocs.  Format.
+	* ppc64.h: Likewise.
+
+2003-01-27  Alexandre Oliva  <aoliva@redhat.com>
+
+	* mips.h (EF_MIPS_XGOT): Define.
+
+2003-01-24  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* s390.h: Add s390 TLS relocations.
+
+2003-01-23  Nick Clifton  <nickc@redhat.com>
+
+	* Add sh2e support:
+
+	2002-04-02  Alexandre Oliva  <aoliva@redhat.com>
+
+		* sh.h (EF_SH_MERGE_MACH): Handle SH2E.
+
+	2002-04-02  Elena Zannoni  <ezannoni@redhat.com>
+
+		* sh.h (EF_SH2E): New.
+
+2003-01-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* sh.h: Split out various bits to bfd/elf32-sh64.h.
+
+2003-01-20  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* s390.h: Rename R_390_GOTOFF to R_390_GOTOFF32. Add new gotoff,
+	gotplt and pltoff relocations.
+
+2003-01-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* common.h: Formatting, typo fixes.
+	(DT_ENCODING): Correct value.
+
+2003-01-17  Fabio Alemagna  <falemagn@aros.org>
+
+	* common.h (ELFOSABI_AROS): Define.
+	(ELFOSABI_OPENVMS): Likewise.
+	(ELFOSABI_NSK): Likewise.
+
+2003-01-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* ppc.h: Split out ppc64 definitions to..
+	* pcc64.h: ..here.  New file.
+	(R_PPC64_REL30): Rename from R_PPC64_ADDR30.
+
+2003-01-13 Dmitry Diky <diwil@mail.ru>
+
+	* elf/common.h (EM_MSP430): Change e_machine value to officially
+	assigned.
+
+2003-01-02  Ben Elliston  <bje@redhat.com>
+
+	* common.h (EM_IQ2000): Define.
+	* iq2000.h: New file.
+
+2002-12-30  Chris Demetriou  <cgd@broadcom.com>
+
+	* mips.h (E_MIPS_ARCH_32R2): New define.
+
+2002-12-24    Dmitry Diky <diwil@mail.ru>
+
+	* common.h: Define msp430 machine numbers.
+	* msp430.h: New file.  Define msp430 relocs.
+
+2002-12-20  DJ Delorie  <dj@redhat.com>
+
+	* xstormy16.h: Add XSTORMY16_12.
+
+2002-12-16  Andrew MacLeod  <amacleod@redhat.com>
+
+	* xstormy16.h (START_RELOC_NUMBERS) Add relocation numbers
+	for R_XSTORMY16_LO16 and R_XSTORMY16_HI16.
+
+2002-12-10  James Cownie <jcownie@etnus.com>
+
+	* dwarf2.h (DW_TAG_upc_shared_type, DW_TAG_upc_strict_type,
+	DW_TAG_upc_relaxed_type, DW_AT_upc_threads_scaled, DW_LANG_Upc):
+	Define.
+
+2002-12-01  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* m68hc11.h (EF_M68HC12_MACH, EF_M68HCS12_MACH): Define.
+	(EF_M68HC11_MACH_MASK, EF_M68HC11_MACH): Define.
+	(EF_M68HC11_MERGE_MACH, EF_M68HC11_CAN_MERGE_MACH): Define.
+
+2002-11-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* mmix.h: Replace boolean with bfd_boolean.
+	* sh.h: Likewise.
+
+2002-11-28  Alan Modra  <amodra@bigpond.net.au>
+
+	* internal.h (elf32_internal_ehdr, Elf32_Internal_Ehdr,
+	elf64_internal_ehdr, Elf64_Internal_Ehdr, elf32_internal_phdr,
+	Elf32_Internal_Phdr, elf64_internal_phdr, Elf64_Internal_Phdr,
+	elf32_internal_shdr, Elf32_Internal_Shdr, elf64_internal_shdr,
+	Elf64_Internal_Shdr, elf32_internal_sym, elf64_internal_sym,
+	Elf32_Internal_Sym, Elf64_Internal_Sym, Elf32_Internal_Note,
+	elf32_internal_note, elf32_internal_rel, Elf32_Internal_Rel,
+	elf64_internal_rel, Elf64_Internal_Rel, elf32_internal_rela,
+	elf64_internal_rela, Elf32_Internal_Rela, Elf64_Internal_Rela,
+	elf32_internal_dyn, elf64_internal_dyn, Elf32_Internal_Dyn,
+	Elf64_Internal_Dyn, elf32_internal_verdef, elf64_internal_verdef,
+	elf32_internal_verdaux, elf64_internal_verdaux, elf32_internal_verneed,
+	elf64_internal_verneed, elf32_internal_vernaux, elf64_internal_vernaux,
+	elf32_internal_versym, elf64_internal_versym, Elf32_Internal_Verdef,
+	Elf64_Internal_Verdef, Elf32_Internal_Verdaux, Elf64_Internal_Verdaux,
+	Elf32_Internal_Verneed, Elf64_Internal_Verneed, Elf32_Internal_Vernaux,
+	Elf64_Internal_Vernaux, Elf32_Internal_Versym, Elf64_Internal_Versym,
+	Elf32_Internal_Syminfo, Elf64_Internal_Syminfo): Delete.
+	(Elf_Internal_Rel): Delete.
+
+2002-10-11  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* sh.h: Add SH TLS relocs.
+
+2002-09-30  Gavin Romig-Koch  <gavin@redhat.com>
+	    Ken Raeburn  <raeburn@cygnus.com>
+	    Aldy Hernandez  <aldyh@redhat.com>
+	    Eric Christopher  <echristo@redhat.com>
+	    Richard Sandiford  <rsandifo@redhat.com>
+
+	* mips.h (E_MIPS_MACH_4120, E_MIPS_MACH_5400, E_MIPS_MACH_5500): New.
+
+2002-09-12  Roland McGrath  <roland@redhat.com>
+
+	* dwarf2.h: Updates from GCC version of thie file:
+	(enum dwarf_location_atom): DW_OP_calli -> DW_OP_call_ref.
+	Add DW_OP_GNU_push_tls_address.
+	(DW_OP_lo_user): Change to 0xe0.
+
+2002-08-28  Catherine Moore  <clm@redhat.com>
+
+	* v850.h (R_V850_LONGCALL, R_V850_ALIGN,
+	R_V850_LONGJUMP): New relocations.
+
+2002-08-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* i370.h: Define relocs using reloc-macros.h.
+
+2002-08-13  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* m68hc11.h (E_M68HC12_BANKS, E_M68HC11_I32, E_M68HC11_F64,
+	EF_M68HC11_ABI): Define for ABI specification.
+	(STO_M68HC12_FAR, STO_M68HC12_INTERRUPT): Symbol flags for
+	linker and debugger.
+	(R_M68HC11_24, R_M68HC11_LO16, R_M68HC11_PAGE): New relocs.
+	(R_M68HC11_RL_JUMP, R_M68HC11_RL_GROUP): New reloc for linker
+	relaxation.
+
+2002-07-15  Denis Chertykov  <denisc@overta.ru>
+	    Frank Ch. Eigler  <fche@redhat.com>
+	    Ben Elliston  <bje@redhat.com>
+	    Alan Lehotsky  <alehotsky@cygnus.com>
+	    John Healy  <jhealy@redhat.com>
+	    Graham Stott  <grahams@redhat.com>
+	    Jeff Johnston  <jjohnstn@redhat.com>
+
+	* common.h (EM_IP2K): New macro.
+	(EM_IP2K_OLD): New macro.
+	* ip2k.h: New file.
+
+2002-07-01  Matt Thomas  <matt@3am-software.com>
+
+	* vax.h: Rename EF_* to EF_VAX_*.
+
+2002-06-18  Dave Brolley  <brolley@redhat.com>
+
+	From Catherine Moore, Michael Meissner, Dave Brolley:
+	* common.h (EM_CYGNUS_FRV): New macro.
+	* frv.h: New file.
+
+2002-06-06  Lars Brinkhoff  <lars@nocrew.org>
+
+	* common.h: Change registry@sco.com to registry@caldera.com.
+	(EM_PDP10, EM_PDP11): Define.
+
+2002-06-04  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* sh.h (_bfd_sh64_crange_qsort_cmpb, _bfd_sh64_crange_qsort_cmpl)
+	(_bfd_sh64_crange_bsearch_cmpb, _bfd_sh64_crange_bsearch_cmpl): New
+	prototypes.
+
+2002-06-01  Richard Henderson  <rth@redhat.com>
+
+	* alpha.h (LITUSE_ALPHA_ADDR, LITUSE_ALPHA_BASE, LITUSE_ALPHA_BYTOFF,
+	LITUSE_ALPHA_JSR, LITUSE_ALPHA_TLSGD, LITUSE_ALPHA_TLSLDM): New.
+
+2002-05-30  Richard Henderson  <rth@redhat.com>
+
+	* alpha.h (R_ALPHA_TLSGD, R_ALPHA_TLSLDM, R_ALPHA_DTPMOD64,
+	R_ALPHA_GOTDTPREL, R_ALPHA_DTPREL64, R_ALPHA_DTPRELHI,
+	R_ALPHA_DTPRELLO, R_ALPHA_DTPREL16, R_ALPHA_GOTTPREL, R_ALPHA_TPREL64,
+	R_ALPHA_TPRELHI, R_ALPHA_TPRELLO, R_ALPHA_TPREL16): New.
+
+2002-05-29  Matt Thomas  <matt@3am-software.com>
+
+	* vax.h: New file
+
+2002-05-28  Kuang Hwa Lin <kuang@sbcglobal.net>
+
+	* common.h (EM_DLX): Define.
+	* dlx.h: New file.
+
+2002-05-08  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* common.h (NT_GNU_ABI_TAG): Define.
+	(GNU_ABI_TAG_LINUX): Define.
+	(GNU_ABI_TAG_HURD): Define.
+	(GNU_ABI_TAG_SOLARIS): Define.
+	(NT_NETBSD_IDENT): Define.
+	(NT_FREEBSD_ABI_TAG): Define.
+
+2002-04-24  Elena Zannoni  <ezannoni@redhat.com>
+
+	* dwarf2.h: Add DW_AT_GNU_vector.
+
+2002-02-13  Matt Fredette  <fredette@netbsd.org>
+
+	* m68k.h (EF_M68000): Define.
+
+2002-02-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* ppc.h (DT_PPC64_OPD, DT_PPC64_OPDSZ): Define.
+
+2002-02-09  Richard Henderson  <rth@redhat.com>
+
+	* alpha.h (R_ALPHA_BRSGP): New.
+
+2002-02-08  Alexandre Oliva  <aoliva@redhat.com>
+
+	Contribute sh64-elf.
+	2002-01-23  Alexandre Oliva  <aoliva@redhat.com>
+	* sh.h (R_SH_GOTPLT32, R_SH_GOT_LOW16, R_SH_GOT_MEDLOW16,
+	R_SH_GOT_MEDHI16, R_SH_GOT_HI16, R_SH_GOTPLT_LOW16,
+	R_SH_GOTPLT_MEDLOW16, R_SH_GOTPLT_MEDHI16, R_SH_GOTPLT_HI16,
+	R_SH_PLT_LOW16, R_SH_PLT_MEDLOW16, R_SH_PLT_MEDHI16,
+	R_SH_PLT_HI16, R_SH_GOTOFF_LOW16, R_SH_GOTOFF_MEDLOW16,
+	R_SH_GOTOFF_MEDHI16, R_SH_GOTOFF_HI16, R_SH_GOTPC_LOW16,
+	R_SH_GOTPC_MEDLOW16, R_SH_GOTPC_MEDHI16, R_SH_GOTPC_HI16,
+	R_SH_GOT10BY4, R_SH_GOTPLT10BY4, R_SH_GOT10BY8,
+	R_SH_GOTPLT10BY8, R_SH_COPY64, R_SH_GLOB_DAT64, R_SH_JMP_SLOT64,
+	R_SH_RELATIVE64): New relocs.
+	(R_SH_FIRST_INVALID_RELOC_4): Adjust.
+	2001-05-16  Alexandre Oliva  <aoliva@redhat.com>
+	* sh.h: Renumbered and renamed some SH5 relocations to match
+	official numbers and names; moved unmaching ones to the range
+	0xf2-0xff.
+	2001-01-06  Hans-Peter Nilsson  <hpn@cygnus.com>
+	* sh.h (sh64_get_contents_type): Declare.
+	(sh64_address_is_shmedia): Likewise.
+	2000-12-30  Hans-Peter Nilsson  <hpn@cygnus.com>
+	* sh.h (sh64_elf_crange): New type.
+	(struct sh64_section_data): New.
+	(sh64_elf_section_data): New macro.
+	(EF_SH5): Rename back from EF_SH64.
+	2000-12-18  Hans-Peter Nilsson  <hpn@cygnus.com>
+	* sh.h (SHF_SH5_ISA32_MIXED, SHT_SH5_CR_SORTED,
+	SH64_CRANGES_SECTION_NAME, SH64_CRANGE_SIZE,
+	SH64_CRANGE_CR_ADDR_OFFSET, SH64_CRANGE_CR_SIZE_OFFSET,
+	SH64_CRANGE_CR_TYPE_OFFSET): New macros.
+	2000-12-12  Hans-Peter Nilsson  <hpn@cygnus.com>
+	* sh.h (EF_SH64): Don't define EF_SH64_ABI64.
+	2000-11-27  Hans-Peter Nilsson  <hpn@cygnus.com>
+	* sh.h (EF_SH64_32BIT_ABI, EF_SH64_64BIT_ABI): Delete.
+	(EF_SH64_ABI64): New.
+	2000-11-23  Hans-Peter Nilsson  <hpn@cygnus.com>
+	* sh.h (EF_SH64): Rename from EF_SH5.
+	(EF_SH64_32BIT_ABI): New.
+	(EF_SH64_64BIT_ABI): New.
+	(R_SH_PT_16, R_SH_SHMEDIA_CODE
+	R_SH_IMMU5, R_SH_IMMS6, R_SH_IMMU6, R_SH_IMMS10, R_SH_IMMS10BY2,
+	R_SH_IMMS10BY4, R_SH_IMMS10BY8, R_SH_IMMS16, R_SH_IMMU16,
+	R_SH_IMM_LOW16, R_SH_IMM_LOW16_PCREL, R_SH_IMM_MEDLOW16,
+	R_SH_IMM_MEDLOW16_PCREL, R_SH_IMM_MEDHI16, R_SH_IMM_MEDHI16_PCREL,
+	R_SH_IMM_HI16, R_SH_IMM_HI16_PCREL, R_SH_64, R_SH_64_PCREL): New
+	relocs.
+	2000-09-01  Ben Elliston  <bje@redhat.com>
+	* sh.h (EF_SH5): Define.
+
+2002-02-01  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* mmix.h: Tweak comments.
+	(MMIX_LD_ALLOCATED_REG_CONTENTS_SECTION_NAME): New.
+	[BFD_ARCH_SIZE] (_bfd_mmix_prepare_linker_allocated_gregs,
+	_bfd_mmix_finalize_linker_allocated_gregs,
+	_bfd_mmix_check_all_relocs): Provide prototypes.
+
+2002-01-31  Ivan Guzvinec  <ivang@opencores.org>
+
+	* or32.h: New file.
+	* common.h: Add support for or32 targets.
+
+2002-01-28  Jason Merrill  <jason@redhat.com>
+
+	* dwarf2.h: Sync with gcc version.
+
+2002-01-16  Alan Modra  <amodra@bigpond.net.au>
+
+	* ppc.h (DT_PPC64_GLINK): Define.
+
+2002-01-15  Richard Earnshaw  <rearnsha@arm.com>
+
+	* arm.h (F_VFP_FLOAT, EF_ARM_VFP_FLOAT): Define.
+
+2002-01-09  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* common.h: Update copyright years.
+	(NT_NETBSDCORE_PROCINFO): Define.
+	(NT_NETBSDCORE_FIRSTMACH): Define.
+
+2002-01-06  Steve Ellcey  <sje@cup.hp.com>
+
+	* ia64.h (ELF_STRING_ia64_unwind_hdr): New Macro for HP-UX.
+	(SHT_IA_64_HP_OPT_ANOT): Ditto
+	(PT_IA_64_HP_OPT_ANOT): Ditto
+	(PT_IA_64_HP_HSL_ANOT): Ditto
+	(PT_IA_64_HP_STACK): Ditto
+	(SHN_IA_64_ANSI_COMMON): Ditto
+
+2001-12-17  Alan Modra  <amodra@bigpond.net.au>
+
+	* external.h (Elf_External_Sym_Shndx): Declare.
+	* internal.h (struct elf_internal_sym <st_shndx>): Make it an
+	unsigned int.
+	* common.h (SHN_BAD): Define.
+
+2001-12-13  Jakub Jelinek  <jakub@redhat.com>
+
+	* common.h (PT_GNU_EH_FRAME): Define.
+
+2001-12-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* common.h (SHN_XINDEX): Comment typo fix.
+	* internal.h (Elf_Internal_Ehdr): Change existing "unsigned short"
+	size, count and index fields to "unsigned int".
+
+2001-12-07  Geoffrey Keating  <geoffk@redhat.com>
+	    Richard Henderson  <rth@redhat.com>
+
+	* common.h (EM_XSTORMY16): Define.
+	* xstormy16.h: New file.
+
+2001-11-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* common.h (NT_ARCH): Define.  Remove incorrect comment.
+
+2001-11-11  Geoffrey Keating  <geoffk@redhat.com>
+
+	* dwarf2.h (dwarf_line_number_ops): Add DWARF 3 opcodes.
+
+2001-10-30  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* mmix.h: New file.
+
+2001-10-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* internal.h: White space changes to keep lines under 80 chars.
+
+2001-10-16  Jeff Holcomb  <jeffh@redhat.com>
+
+	* internal.h (elf_internal_shdr): Make contents a unsigned char *.
+
+2001-09-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* internal.h (elf_internal_rela): Make r_addend a bfd_vma.
+
+2001-09-13  Alexandre Oliva  <aoliva@redhat.com>
+
+	* common.h (EM_OPENRISC_OLD): Renamed the old EM_OPENRISC entry.
+
+2001-09-12  Alexandre Oliva  <aoliva@redhat.com>
+
+	* common.h (EM_AVR_OLD): Renamed from...
+	(EM_AVR): this, redefined as in the current ELF standard.
+	(EM_PJ_OLD): Renamed from...
+	(EM_PJ): this, redefined as in the current ELF standard.
+	(EM_R30, EM_D10V, EM_D30V, EM_V850, EM_M32R, EM_MN10300,
+	EM_MN10200, EM_OPENRISC, EM_ARC_A5, EM_XTENSA): Defined as in
+	the current ELF standard.
+	(EM_CYGNUS_ARC): Removed, unused for a long time.
+
+2001-09-04  Richard Henderson  <rth@redhat.com>
+
+	* alpha.h (R_ALPHA_OP*, R_ALPHA_IMMED*, R_ALPHA_GPVALUE): Remove.
+	(R_ALPHA_GPREL16): Rename from R_ALPHA_IMMED_GP_16.
+
+2001-08-30  Eric Christopher  <echristo@redhat.com>
+
+	* mips.h: Remove E_MIPS_MACH_MIPS32_4K.
+
+2001-08-29  Jeff Law <law@redhat.com>
+
+	* h8.h (EF_H8_MACH): New mask for encoded machine type.
+	(E_H8_MACH_H8300, E_H8_MACH_H8300H, E_H8_MACH_H8300S): New
+	machine types.
+
+2001-08-26  J"orn Rennecke <amylaar@redhat.com>
+
+	* h8.h: New file.
+
+2001-08-27  Staffan Ulfberg  <staffanu@swox.se>
+
+	* ppc.h: Add relocs from the 64-bit PowerPC ELF ABI revision 1.2.
+
+2001-06-30  Daniel Berlin  <dan@cgsoftware.com>
+
+	* dwarf2.h: Remerge with gcc version,
+	including all new DWARF 2.1 extensions.
+
+2001-06-29  James Cownie <jcownie@etnus.com>
+
+	* dwarf2.h: Add DWARF 2.1 attribues.
+
+2001-06-15  Per Bothner  <per@bothner.com>
+
+	* dwarf2.h:  Partial merge with gcc version.
+	(enum dwarf_descrim_list):  Fix typo -> dwarf_discrim_list.
+	(DW_LANG_Java):  Use value from dwarf 2.1 draft (also used in gcc).
+
+2001-05-15  Ralf Baechle  <ralf@gnu.org>
+
+	* common.h: Remove definition of EM_MIPS_RS4_BE.  The constant was
+	never in active use and is used otherwise by the ABI.
+
+2001-05-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* ia64.h (ELF_STRING_ia64_unwind_once): Define.
+	(ELF_STRING_ia64_unwind_info_once): Define.
+
+2001-05-07  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* external.h: Fix typo.
+	* mips.h: Add/Extend many comments with reference to the MIPS ELF64
+	spec v. 2.4, available at e.g.
+	ftp://oss.sgi.com/pub/linux/mips/doc/ABI/ELF64.ps.
+	(EF_MIPS_UCODE): Define.
+	(EF_MIPS_OPTIONS_FIRST): Define.
+	(EF_MIPS_ARCH_ASE): Define.
+	(EF_MIPS_ARCH_ASE_MDMX): Define.
+	(EF_MIPS_ARCH_ASE_M16): Define.
+	(SHF_MIPS_ADDR): Renamed SHF_MIPS_ADDR32.
+	(SHF_MIPS_STRING): Renamed SHF_MIPS_ADDR64.
+	(SHF_MIPS_NODUPES): Define.
+	(ELF64_MIPS_R_SSYM): New MIPS ELF 64 relocation info access macro.
+	(ELF64_MIPS_R_TYPE3): Likewise.
+	(ELF64_MIPS_R_TYPE2): Likewise.
+	(ELF64_MIPS_R_TYPE): Likewise.
+	(OHW_R10KLDL): Define.
+
+2001-04-24  Todd Fries  <todd@fries.net>
+
+	* sparc.h: Fix typo.
+
+2001-04-20  Johan Rydberg  <jrydberg@opencores.org>
+
+	* openrisc.h: New file.
+	* common.h (EM_OPENRISC): New constant.
+
+2001-04-23  Bo Thorsen  <bo@suse.de>
+
+	* x86-64.h: Add vtable support.
+
+2001-03-23  Nick Clifton  <nickc@redhat.com>
+
+	* mips.h: Remove extraneous whitespace.
+
+2001-03-22  Hans-Peter Nilsson  <hp@axis.com>
+
+	* cris.h: Add leading comment about PC-relative location.
+	(R_CRIS_COPY, R_CRIS_GLOB_DAT, R_CRIS_JUMP_SLOT, R_CRIS_RELATIVE,
+	R_CRIS_16_GOT, R_CRIS_32_GOT, R_CRIS_16_GOTPLT, R_CRIS_32_GOTPLT,
+	R_CRIS_32_GOTREL, R_CRIS_32_PLT_GOTREL, R_CRIS_32_PLT_PCREL):
+	New relocs.
+
+2001-02-27  Philip Blundell  <pb@futuretv.com>
+
+	* arm.h: Add new definitions from ARM document SWS ESPC 0003 B-01.
+	(EF_PIC, et al.): Rename to EF_ARM_xx.
+
+2001-02-09  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* common.h: Add linux target for S/390.
+	* s390.h: New file.
+
+2001-01-11  Peter Targett  <peter.targett@arccores.com>
+
+	* arc.h (E_ARC_MACH_ARC5, E_ARC_MACH_ARC6, E_ARC_MACH_ARC7,
+	E_ARC_MACH_ARC8): New definitions for cpu types.
+
+	* common.h (EM_ARC): Change comment.
+
+2000-12-12  Nick Clifton  <nickc@redhat.com>
+
+	* mips.h: Fix formatting.
+
+2000-12-11  Jeffrey A Law  (law@cygnus.com)
+
+	* hppa.h (DT_HP_*): Define relative to OLD_DT_LOOS for hpux
+	compatibility.
+
+2000-10-16  Chris Demetriou  <cgd@sibyte.com>
+
+	* mips.h (E_MIPS_ARCH_32): New constant.
+	(E_MIPS_MACH_MIPS32, E_MIPS_MACH_MIPS32_4K): Replace the
+	former with the latter.
+
+	* mips.h (E_MIPS_ARCH_5, E_MIPS_ARCH_64): New definitions.
+
+	* mips.h (E_MIPS_MACH_SB1): New constant.
+
+2000-11-30  Jan Hubicka  <jh@suse.cz>
+
+	* common.h (EM_X86_64): New macro.
+	* x86-64.h: New file.
+
+2000-11-27  Hans-Peter Nilsson  <hp@axis.com>
+
+	* common.h (e_machine numbers): Clarify comments to describe how
+	EM_* constants are assigned.  Move EM_PJ from official section to
+	ad-hoc section.
+	(EM_CRIS): Correct comment to match official description.
+	(EM_MMIX): Ditto.
+
+2000-11-22  Nick Clifton  <nickc@redhat.com>
+
+	* common.h (EM_JAVELIN): New machine number.
+	(EM_FIREPATH): New machine number.
+	(EM_ZSP): New machine number.
+	(EM_MMIX): New machine number.
+	(EM_HUANY): New machine number.
+	(EM_PRISM): New machine number.
+	(SHT_GROUP): New section type.
+	(SHT_SYMTAB_SHNDX): New section type.
+	(SHF_GROUP): New section flag.
+	(SHN_XINDEX): New section index.
+	(GRP_COMDAT): New section group flag.
+
+2000-11-20  H.J. Lu  <hjl@gnu.org>
+
+	* common.h (ELFOSABI_MONTEREY): Renamed to ...
+	(ELFOSABI_AIX): This.
+
+2000-11-16  Richard Henderson  <rth@redhat.com>
+
+	Update relocations per August psABI docs.
+	* ia64.h (R_IA64_SEGBASE): Remove.
+	(R_IA64_LTV*): Renumber to 0x74 to 0x77.
+	(R_IA64_EPLTMSB, R_IA64_EPLTLSB): Remove.
+	(R_IA64_TPREL14, R_IA64_TPREL64I): New.
+	(R_IA64_DTPMOD*): New.
+	(R_IA64_DTPREL*): New.
+
+2000-09-29  Hans-Peter Nilsson  <hp@axis.com>
+
+	* cris.h (EF_CRIS_UNDERSCORE): New.
+
+2000-09-27  Alan Modra  <alan@linuxcare.com.au>
+
+	* hppa.h (R_PARISC_DIR14F): Add.
+
+2000-09-14  Alexandre Oliva  <aoliva@redhat.com>
+
+	* sh.h (R_SH_GOT32, R_SH_PLT32, R_SH_COPY, R_SH_GLOB_DAT,
+	R_SH_JMP_SLOT, R_SH_RELATIVE, R_SH_GOTOFF, R_SH_GOTPC): Change
+	numbers to the range from 160 to 167.
+	(R_SH_FIRST_INVALID_RELOC): Adjust.
+	(R_SH_FIRST_INVALID_RELOC_2, R_SH_LAST_INVALID_RELOC_2):
+	New relocs to fill in the gap.
+
+2000-09-13  Anders Norlander  <anorland@acc.umu.se>
+
+	* mips.h (E_MIPS_MACH_4K): New define.
+
+2000-09-05  Alan Modra  <alan@linuxcare.com.au>
+
+	* hppa.h: Fix a comment.
+	(R_PARISC_PCREL12F): Define.
+	(R_PARISC_GNU_VTENTRY): Define.
+	(R_PARISC_GNU_VTINHERIT): Define.
+
+2000-09-01  Alexandre Oliva  <aoliva@redhat.com>
+
+	* sh.h (R_SH_GOT32, R_SH_PLT32, R_SH_COPY, R_SH_GLOB_DAT,
+	R_SH_JMP_SLOT, R_SH_RELATIVE, R_SH_GOTOFF, R_SH_GOTPC): New relocs.
+	(R_SH_FIRST_INVALID_RELOC): Adjust.
+
+2000-08-14  Jim Wilson  <wilson@cygnus.com>
+
+	* ia64.h (EF_IA_64_REDUCEDFP, EF_IA_64_CONS_GP,
+	EF_IA_64_NOFUNCDESC_CONS_GP, EF_IA_64_ABSOLUTE): Define.
+
+2000-08-07  Nick Clifton  <nickc@cygnus.com>
+
+	* ppc.h: Remove spurious CYGNUS LOCAL comments.
+	* v850.h: Likewise.
+
+2000-07-22  Jason Eckhardt  <jle@cygnus.com>
+
+	* i860.h: New file.
+	(elf_i860_reloc_type): Defined ELF32 i860 relocations.
+
+2000-07-20  Hans-Peter Nilsson  <hp@axis.com>
+
+	common.h (EM_CRIS): New machine number.
+	cris.h: New file.
+
+2000-07-19  H.J. Lu  <hjl@gnu.org>
+
+	* common.h (DF_1_NODEFLIB): Renamed from DF_1_NODEPLIB.
+
+2000-07-19  H.J. Lu  <hjl@gnu.org>
+
+	* common.h (DT_CHECKSUM): Set to 0x6ffffdf8.
+	(DTF_1_CONFEXP): It is 0x00000002 as suspected.
+
+2000-07-19  H.J. Lu  <hjl@gnu.org>
+
+	* common.h (DT_FEATURE): Renamed from DT_FEATURE_1.
+	(DT_CONFIG): New. From Solaris 8.
+	(DT_DEPAUDIT): Likewise.
+	(DT_AUDIT): Likewise.
+	(DT_PLTPAD): Likewise.
+	(DT_MOVETAB): Likewise.
+	(DF_1_NODEPLIB): Likewise.
+	(DF_1_NODUMP): Likewise.
+	(DF_1_CONLFAT): Likewise.
+	(DT_CHECKSUM): Likewise. FIXME. Check the value on Solaris 8.
+	(DTF_1_CONFEXP): Likewise.
+
+2000-07-18  H.J. Lu  <hjl@gnu.org>
+
+	* common.h (DT_FLAGS_1): Renamed from DT_1_FLAGS.
+
+2000-07-12  Alan Modra  <alan@linuxcare.com.au>
+
+	* internal.h (struct elf_internal_sym): Update comment for st_other.
+
+2000-07-10  Alan Modra  <alan@linuxcare.com.au>
+
+	* hppa.h: Add comments to all the relocs.
+
+2000-06-26  Marek Michalkiewicz  <marekm@linux.org.pl>
+
+	* avr.h (E_AVR_MACH_AVR5): Define.
+
+2000-06-18  Stephane Carrez  <stcarrez@worldnet.fr>
+
+	* m68hc11.h: New file, definitions for the Motorola 68hc11.
+
+2000-06-06  Alan Modra  <alan@linuxcare.com.au>
+
+	* reloc-macros.h (START_RELOC_NUMBERS): Don't define initial dummy
+	-1 valued enum.
+	(RELOC_NUMBER, FAKE_RELOC, EMPTY_RELOC): Append rather than
+	prepend comma.
+	(END_RELOC_NUMBERS): Give macro an arg to define as last enum.
+
+	* alpha.h (R_ALPHA_max): Define via END_RELOC_NUMBERS rather than
+	with EMPTY_RELOC.
+	* arc.h (R_ARC_max): Likewise.
+	* avr.h (R_AVR_max): Likewise.
+	* fr30.h (R_FR30_max): Likewise.
+	* hppa.h (R_PARISC_UNIMPLEMENTED): Likewise.
+	* i960.h (R_960_max): Likewise.
+	* m32r.h (R_M32R_max): Likewise.
+	* m68k.h (R_68K_max): Likewise.
+	* mcore.h (R_MCORE_max): Likewise.
+	* mn10300.h (R_MN10300_MAX): Likewise.
+	* pj.h (R_PJ_max): Likewise.
+	* ppc.h (R_PPC_max): Likewise.
+	* sh.h (R_SH_max): Likewise.
+	* sparc.h (R_SPARC_max): Likewise.
+	* v850.h (R_V850_max): Likewise.
+
+	* arm.h (R_ARM_max): Define via END_RELOC_NUMBERS.
+	* d10v.h (R_D10V_max): Likewise.
+	* d30v.h (R_D30V_max): Likewise.
+	* ia64.h (R_IA64_max): Likewise.
+	* mips.h (R_MIPS_maxext): Likewise.
+	* mn10200.h (R_MN10200_max): Likewise.
+
+	* i386.h (R_386_max): Remove old RELOC_NUMBER definition, and
+	define via END_RELOC_NUMBERS.
+
+2000-06-03  Alan Modra  <alan@linuxcare.com.au>
+
+	* reloc-macros.h (START_RELOC_NUMBERS): Fix name clash for
+	!__STDC__ case.
+	(RELOC_NUMBER): Use ansi stringify if ALMOST_STDC defined.
+
+2000-05-22  Richard Henderson  <rth@cygnus.com>
+
+	* ia64.h (R_IA64_PCREL60B, R_IA64_PCREL21BI): New.
+	(R_IA64_PCREL22, R_IA64_PCREL64I): New.
+
+2000-05-02  H.J. Lu  <hjl@gnu.org>
+
+	* common.h (ELFOSABI_NONE): Renamed from ELFOSABI_SYSV.
+	(ELFOSABI_MODESTO): Defined.
+	(ELFOSABI_OPENBSD): Likewise.
+
+2000-04-21  Richard Henderson  <rth@cygnus.com>
+	    David Mosberger  <davidm@hpl.hp.com>
+
+	* ia64.h: New file.
+
+2000-04-14  H.J. Lu  <hjl@gnu.org>
+
+	* common.h (ELFOSABI_TRUE64): Renamed to ELFOSABI_TRU64.
+
+2000-04-14  H.J. Lu  <hjl@gnu.org>
+
+	* common.h (ELFOSABI_NETBSD): Defined.
+	(ELFOSABI_HURD): Likewise.
+	(ELFOSABI_SOLARIS): Likewise.
+	(ELFOSABI_MONTEREY): Likewise.
+	(ELFOSABI_IRIX): Likewise.
+	(ELFOSABI_FREEBSD): Likewise.
+	(ELFOSABI_TRUE64): Likewise.
+
+2000-04-07  Nick Clifton  <nickc@cygnus.com>
+
+	* arm-oabi.h: Delete.
+	* arm.h: Merge in definitions of old reloc numbers from
+	arm-oabi.h.
+
+2000-04-06  Nick Clifton  <nickc@cygnus.com>
+
+	* arm.h (EF_ARM_SYMSARESORTED): Define.
+	(EF_ARM_EABIMASK): Define.
+	(EF_ARM_EABI_VERSION): Define.
+	(EF_ARM_EABI_UNKNOWN): Define.
+	(EF_ARM_EABI_VER1): Define.
+	(PF_ARM_PI): Define.
+	(PF_ARM_ABS): Define.
+
+2000-04-05  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+	* sh.h (R_SH_LOOP_START, R_SH_LOOP_END): New RELOC_NUMBERs.
+
+2000-03-27  Denis Chertykov  <denisc@overta.ru>
+
+	* avr.h: New file.  AVR ELF support for BFD.
+	* common.h: Add AVR magic number.
+
+2000-03-10  Geoffrey Keating  <geoffk@cygnus.com>
+
+	* mips.h: Add R_MIPS_GNU_REL_HI16, R_MIPS_GNU_REL_LO16,
+	R_MIPS_GNU_REL16_S2, R_MIPS_PC64 and R_MIPS_PC32 relocation
+	numbers.
+
+2000-02-23  Linas Vepstas <linas@linas.org>
+
+	* i370.h: New file.
+
+2000-02-22  Nick Clifton  <nickc@cygnus.com>
+
+	* common.h (ELF_ST_OTHER): Remove definition.
+	(ELF32_ST_OTHER): Remove definition.
+	(ELF64_ST_OTHER): Remove definition.
+
+2000-02-22  H.J. Lu  <hjl@gnu.org>
+
+	* common.h (ELFOSABI_LINUX): Define.
+
+2000-02-17  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+	* sh.h: (EF_SH_MACH_MASK, EF_SH_UNKNOWN, EF_SH1, EF_SH2): New macros.
+	(EF_SH3, EF_SH_HAS_DSP, EF_SH_DSP, EF_SH3_DSP): Likewise.
+	(EF_SH_HAS_FP, EF_SH3E, EF_SH4, EF_SH_MERGE_MACH): Likewise.
+
+2000-02-03  H.J. Lu  <hjl@gnu.org>
+
+	* arm-oabi.h: Duplicate changes made to arm.h on Jan. 27,
+	2000 by Thomas de Lellis  <tdel@windriver.com>.
+
+2000-01-27  Thomas de Lellis  <tdel@windriver.com>
+
+	* arm.h (STT_ARM_TFUNC): Define in terms of STT_LOPROC.
+	(STT_ARM_16BIT): New flag.  Denotes a label that was defined in
+	Thumb block but was does not identify a function.
+
+2000-01-20  Nick Clifton  <nickc@cygnus.com>
+
+	* common.h (EM_MCORE): Fix spelling of Motorola.
+	* mcore.h (EM_MCORE): Fix spelling of Motorola.
+
+2000-01-13  Nick Clifton  <nickc@cygnus.com>
+
+	* common.h (EM_S370): Change comment - this is now the IBM
+	System/370.
+	(EM_IA_64): Change comment - this is now the IA-64.
+
+2000-01-11  Nick Clifton  <nickc@cygnus.com>
+
+	* common.h (DT_ENCODING): Fix definition of this value.
+	(DT_LOOS): Fix definition of this value.
+	(DT_HIOS): Fix definition of this value.
+	(OLD_DT_LOOS): Value of DT_LOOS before Oct 4, 1999 draft
+	of ELF spec changed it.
+	(OLD_DT_HIOS): Value of DT_HIOS before Oct 4, 1999 draft
+	of ELF spec changed it.
+
+2000-01-10  Egor Duda  <deo@logos-m.ru>
+
+	* common.h (NT_WIN32PSTATUS): Define.  (cygwin elf core dumps).
+
+1999-12-28  Nick Clifton  <nickc@cygnus.com>
+
+	* mips.h (STO_*): Redefine in terms of STV_* values now in
+	common.h.
+
+1999-12-27  Nick Clifton  <nickc@cygnus.com>
+
+	* common.h: Upgrade to match Oct4, 1999 Draft ELF ABI Spec.
+	(EM_MIPS_RS3_LE): New machine number.
+	(EM_RCE): New machine number.
+	(EM_MMA): New machine number.
+	(EM_PCP): New machine number.
+	(EM_NCPU): New machine number.
+	(EM_NDR1): New machine number.
+	(EM_STARCORE): New machine number.
+	(EM_ME16): New machine number.
+	(EM_ST100): New machine number.
+	(EM_TINYJ): New machine number.
+	(EM_FX66): New machine number.
+	(EM_ST9PLUS): New machine number.
+	(EM_ST7): New machine number.
+	(EM_68HC16): New machine number.
+	(EM_68HC11): New machine number.
+	(EM_68HC08): New machine number.
+	(EM_68HC05): New machine number.
+	(EM_SVX): New machine number.
+	(EM_VAX): New machine number.
+	(PF_MASKOS): Change value.
+	(SHT_INIT_ARRAY): New value for sh_type field.
+	(SHT_FINI_ARRAY): New value for sh_type field.
+	(SHT_PREINIT_ARRAY): New value for sh_type field.
+	(SHT_HIUSER): Change value.
+	(SHF_MERGE): New valye for sh_flags field.
+	(SHF_STRINGS): New valye for sh_flags field.
+	(SHF_INFO_LINK): New valye for sh_flags field.
+	(SHF_OS_NONCONFORMING): New valye for sh_flags field.
+	(SHF_MASKOS): Change value.
+	(ELF_ST_VISIBILITY): New macro.
+	(ELF_ST_OTHER): New macro.
+	(STT_COMMON): New symbol type.
+	(STV_DEFAULT): Value for symbol visibility.
+	(STV_INTERNAL): Value for symbol visibility.
+	(STV_HIDDEN): Value for symbol visibility.
+	(STV_PROTECTED): Value for symbol visibility.
+	(DT_RUNPATH): New dynamic section tag.
+	(DT_FLAGS): New dynamic section tag.
+	(DT_ENCODING): New dynamic section tag.
+	(DT_PREINIT_ARRAY): New dynamic section tag.
+	(DT_PREINIT_ARRAYSZ): New dynamic section tag.
+	(DT_LOPROC): New dynamic section tag index.
+	(DT_HIPROC): New dynamic section tag index.
+	(DF_ORIGIN): Value for dynamic section flag.
+	(DF_SYMBOLIC): Value for dynamic section flag.
+	(DF_TEXTREL): Value for dynamic section flag.
+	(DF_BIND_NOW): Value for dynamic section flag.
+
+1999-12-09  Fred Fish  <fnf@cygnus.com>
+
+	* i960.h (reloc-macros.h):  Include using relative dir elf/.
+	* i386.h (reloc-macros.h):  Include using relative dir elf/.
+	* hppa.h (reloc-macros.h):  Include using relative dir elf/.
+
+1999-12-07  Jim Blandy  <jimb@cygnus.com>
+
+	* common.h (NT_PRXFPREG): New definition.
+
+Wed Dec  1 03:02:15 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* mn10300.h (E_MN10300_MACH_AM33): Define.
+
+Mon Oct 11 22:42:37 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* hppa.h (PF_HP_PAGE_SIZE): Define.
+	(PF_HP_FAR_SHARED, PF_HP_NEAR_SHARED, PF_HP_CODE): Likewise.
+	(PF_HP_MODIFY, PF_HP_LAZYSWAP, PF_HP_SBP): Likewise.
+
+Mon Oct  4 17:42:38 1999  Doug Evans  <devans@canuck.cygnus.com>
+
+	* m32r.h (E_M32RX_ARCH): Define.
+
+1999-09-15  Ulrich Drepper  <drepper@cygnus.com>
+
+	* hppa.h: Add DT_HP_GST_SIZE, DT_HP_GST_VERSION, and DT_HP_GST_HASHVAL.
+
+1999-09-04  Steve Chamberlain  <sac@pobox.com>
+
+	* pj.h: New file.
+	* common.h (EM_PJ): Define.
+
+1999-09-02  Ulrich Drepper  <drepper@cygnus.com>
+
+	* hppa.h: Add HPUX specific symbol type definitions.
+
+	* hppa.h: Add HPUX specific dynamic and program header table
+	specific definitions.
+
+1999-08-31  Scott Bambrough <scottb@netwinder.org>
+
+	* common.h (NT_TASKSTRUCT): Define.
+
+1999-07-16  Jakub Jelinek  <jj@ultra.linux.cz>
+
+	* sparc.h (EF_SPARC_SUN_US3): Define in Cheetah extensions
+	flag (as per SCD2.4.1).
+
+1999-07-16  Jakub Jelinek  <jj@ultra.linux.cz>
+
+	* sparc.h (ELF64_R_TYPE_DATA): Only use ELF64_R_TYPE bits, not
+	ELF64_R_SYM bits.
+
+1999-06-21  Philip Blundell  <pb@nexus.co.uk>
+
+	* arm.h (EF_SOFT_FLOAT, F_SOFT_FLOAT): Define.
+
+1999-07-13  Andreas Schwab  <schwab@suse.de>
+
+	* m68k.h (EF_CPU32): Move definition inside multiple inclusion
+	guard.
+
+1999-07-08  Richard Henderson  <rth@cygnus.com>
+
+	* sparc.h (ELF64_R_TYPE_DATA): Sign extend the value.
+	(ELF64_R_TYPE_INFO): Mask out all but low 24 bits of data.
+	(DT_SPARC_PLTFMT): Delete.
+	Based on a patch from Jakub Jelinek.
+
+Mon Jun 21 16:36:02 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* hppa.h (elf_hppa_reloc_type): Renamed from elf32_hppa_reloc_type.
+
+1999-06-10  Jakub Jelinek  <jj@ultra.linux.cz>
+
+	* sparc.h (R_SPARC_max_std): Define.
+
+Wed Jun  9 15:16:34 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* hppa.h: Update with various changes from newest PA ELF
+	specifications.
+
+1999-06-03  Ian Lance Taylor  <ian@zembu.com>
+
+	* common.h (EM_PPC64): Define.
+
+1999-06-02  Stu Grossman  <grossman@babylon-5.cygnus.com>
+
+	* dwarf.h: Add LANG_JAVA.
+	* dwarf2.h: Add DW_LANG_Java.
+
+1999-05-29  Nick Clifton  <nickc@cygnus.com>
+
+	* common.h (ELFOSABI_ARM): Define.
+
+1999-05-28  Nick Clifton  <nickc@cygnus.com>
+
+	* reloc-macros.h: Update comment.
+
+1999-05-28  Ian Lance Taylor  <ian@zembu.com>
+
+	* i960.h: New file.
+
+1999-05-16  Nick Clifton  <nickc@cygnus.com>
+
+	* mcore.h (R_MCORE_COPY): Define.
+	(R_MCORE_GLOB_DAT): Define.
+	(R_MCORE_JUMP_SLOT): Define.
+
+1999-05-15  Nick Clifton  <nickc@cygnus.com>
+
+	* mcore.h (R_MCORE_RELATIVE): Define.
+
+1999-05-05  Catherine Moore  <clm@cygnus.com>
+
+	* m68k.h (EF_CPU32): Define.
+
+1999-04-21  Nick Clifton  <nickc@cygnus.com>
+
+	* reloc-macros.h (START_RELOC_NUMBERS): Prepend an underscore to
+	fake reloc entry name (if possible), in order to avoid conflicts
+	with typedefs of the same name.
+
+1999-04-16  Gavin Romig-Koch  <gavin@cygnus.com>
+
+	* mips.h (EF_MIPS_32BITMODE): New.
+
+1999-04-08  Nick Clifton  <nickc@cygnus.com>
+
+	* mcore.h: New header file.  Defines for Motorola's MCore
+	processor.
+
+1999-04-08  Nick Clifton  <nickc@cygnus.com>
+
+	* common.h: Add new constants defined in: "System V Application
+	Binary Interface - DRAFT - April 29, 1998" found at the web site:
+	http://www.sco.com/developer/gabi/contents.html
+
+	(EM_MMA): Removed.  Replaced with EM_MCORE as Motorolla own this
+	value.
+
+1999-03-31  Nick Clifton  <nickc@cygnus.com>
+
+	* reloc-macros.h: Fixed to not generate an enum with a trailing
+	comma.
+
+1999-03-16  Gavin Romig-Koch  <gavin@cygnus.com>
+
+	* mips.h (E_MIPS_MACH_5000): New.
+
+1999-03-10  Ulrich Drepper  <drepper@cygnus.com>
+
+	* common.h: Add definitions for a few more Solaris ELF extensions.
+
+Thu Feb 18 18:58:26 1999  Ian Lance Taylor  <ian@cygnus.com>
+
+	* external.h: Only use attribute if __GNUC__ is defined.
+
+1999-02-17  Nick Clifton  <nickc@cygnus.com>
+
+	Patch submitted by: Scott Bambrough <scottb@corelcomputer.com>
+
+	* external.h: struct Elf_External_Versym must be packed on
+	ARM.  Code uses sizeof(Elf_External_Versym) and assumes it is
+	equal to sizeof(char[2]).  Reported by Jim Pick <jim@jimpick.com>
+
+1999-02-02  Nick Clifton  <nickc@cygnus.com>
+
+	* dwarf2.h (DWARF2_External_ARange): New structure.
+	(DWARF2_Internal_ARange): New structure.
+
+Mon Feb  1 11:33:56 1999  Catherine Moore  <clm@cygnus.com>
+
+	* arm.h:  Renumber relocs to conform to standard.
+	(EF_NEW_ABI):  Define.
+	(EF_OLD_ABI):  Define.
+	* arm-oabi.h:  New file.
+
+1999-01-28  Nick Clifton  <nickc@cygnus.com>
+
+	* fr30.h: Add R_FR30_GNU_VT{INHERIT,ENTRY} relocs.
+
+1999-01-27  Nick Clifton  <nickc@cygnus.com>
+
+	* dwarf2.h: Add typedefs for structures found in dwarf2 sections.
+
+1998-12-16  Gavin Romig-Koch  <gavin@cygnus.com>
+
+	* mips.h (E_MIPS_MACH_4111): New.
+
+1998-12-15  Gavin Romig-Koch  <gavin@cygnus.com>
+
+	* mips.h (EF_MIPS_ABI,E_MIPS_ABI_O32,E_MIPS_ABI_O64,
+	E_MIPS_ABI_EABI32,E_MIPS_ABI_EABI64):
+
+1998-12-03  Nick Clifton  <nickc@cygnus.com>
+
+	* fr30.h: Add R_FR30_48 reloc.
+
+1998-12-02  Ulrich Drepper  <drepper@cygnus.com>
+
+	* mips.h: Add external data type for conflict section.
+
+	* mips.h: Add more LL_* options from Irix 6.5.
+
+	* mips.h: Add R_MIPS_JALR and adjust R_MIPS_max appropriately.
+
+Mon Nov 30 15:25:58 1998  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+	* sh.h (elf_sh_reloc_type): Add R_SH_FIRST_INVALID_RELOC,
+	R_SH_LAST_INVALID_RELOC, R_SH_SWITCH8 and R_SH_max.
+
+Tue Nov 10 15:12:28 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* common.h (EM_CYGNUS_FR30): Reduce to a 16 bit value.
+
+Tue Nov 10 15:17:28 1998  Catherine Moore  <clm@cygnus.com>
+
+	* d10v.h:  Add vtable relocs.
+
+Wed Nov  4 15:56:50 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* common.h (EM_CYGNUS_FR30): New machine number.
+
+	* fr30.h: New file: Definitions for the FR30.
+
+Fri Oct 30 11:54:15 1998  Catherine Moore  <clm@cygnus.com>
+
+	From Philip Blundell <pb@nexus.co.uk>:
+	* arm.h (R_ARM_COPY, et al.): New relocs, used by Linux for PIC.
+	(EF_ALIGN8): New flag.
+
+Tue Oct 20 11:19:50 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* common.h (NT_LWPSTATUS): Close comment accidentally left open.
+
+Mon Oct 19 20:24:11 1998  Catherine Moore  <clm@cygnus.com>
+
+	* sh.h:  Add vtable relocs.
+
+Mon Oct 19 01:44:42 1998  Felix Lee  <flee@cygnus.com>
+
+	* common.h (NT_PSTATUS, NT_FPREGS, NT_PSINFO,
+	NT_LWPSTATUS,NT_LWPSINFO): added.
+	* internal.h (Elf_Internal_Note): new structure members.
+
+Fri Oct 16 14:11:25 1998  Catherine Moore  <clm@cygnus.com>
+
+	* m32r.h:  Add vtable relocs.
+
+Tue Oct  6 09:22:22 1998  Catherine Moore  <clm@cygnus.com>
+
+	* sparc.h:  Add vtable relocs.
+
+Mon Oct  5 09:39:22 1998  Catherine Moore  <clm@cygnus.com>
+
+	* v850.h:  Add vtable relocs.
+
+Sun Oct  4 21:17:51 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* i386.h (R_386_max): Change from 252 to 24.
+
+Mon Sep 21 12:24:44 1998  Catherine Moore  <clm@cygnus.com>
+
+	* i386.h:  Change vtable reloc numbers.
+
+Sun Sep 20 00:54:22 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* m68k.h: Add vtable relocs and R_68K_max.
+
+Tue Sep 15 09:56:49 CDT 1998  Catherine Moore  <clm@cygnus.com>
+
+	* arm.h:  Add vtable relocs.
+
+Mon Aug 31 11:25:27 1998  Catherine Moore  <clm@cygnus.com>
+
+	* arm.h:  Define STT_ARM_TFUNC.  Remove ST_THUMB_xxxx
+	definitions.
+
+Sat Aug 29 22:25:51 1998  Richard Henderson  <rth@cygnus.com>
+
+	* i386.h: Add vtable relocs.
+
+1998-08-25 16:42  Ulrich Drepper  <drepper@cygnus.com>
+
+	* common.h: Add SYMINFO_* macros to access Elf*_Syminfo information.
+
+	* external.h: Add Elf_External_Syminfo definition.
+
+	* internal.h: Add Elf_Internal_Syminfo, Elf32_Internal_Syminfo,
+	and Elf64_Syminfo definitions.
+
+Sun Aug  9 20:26:49 CDT 1998  Catherine Moore  <clm@cygnus.com>
+
+	* arm.h:  Add ST_THUMB definitions.
+
+Wed Aug  5 15:52:35 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* arm.h: Add ELF header flags to specify compile time optins:
+	EF_INTERWORK: New flag.
+	EF_APCS_26: New flag.
+	EF_APCS_FLOAT: New flag.
+	EF_PIC: New flag.
+
+1998-07-31 21:28  Ulrich Drepper  <drepper@cygnus.com>
+
+	* mips.h: Add missing RHF_* constants.
+
+Fri Jul 31 10:01:40 1998 Catherine Moore  <clm@cygnus.com>
+
+	* arm.h: Add R_ARM_THM_PC9 relocation.
+
+1998-07-30 16:25  Ulrich Drepper  <drepper@cygnus.com>
+
+	* common.h: Add new DT_* entries and there flag macros from Solaris.
+
+Tue Jul 28 18:14:07 1998  Stan Cox  <scox@equinox.cygnus.com>
+
+	* sparc.h: (R_SPARC_REV32): Added for little endian data e.g. sparc 86x.
+
+Fri Jul 24 11:22:06 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* mn10300.h: Add R_MN10300_24 relocation.
+
+1998-07-24  Ulrich Drepper  <drepper@cygnus.com>
+
+	* mips.h: Add MIPS64 relocation names and values.
+
+Wed Jul 22 19:29:00 Catherine Moore  <clm@cygnus.com>
+
+	* arm.h: Rename relocations.
+
+1998-07-22  Ulrich Drepper  <drepper@cygnus.com>
+
+	* ppc.h: Define enum as elf_ppc_reloc_type.
+
+Wed Jul 22 16:22:11 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* reloc-macros.h: New file.  Provides relocation macros:
+	START_RELOC_NUMBERS, RELOC_NUMBER, FAKE_RELOC, EMPTY_RELOC and
+	END_RELOC_NUMBERS used by other elf header files.
+
+	* alpha.h: Use reloc-macros.h.
+	* arc.h: Use reloc-macros.h.
+	* arm.h: Use reloc-macros.h.
+	* d10v.h: Use reloc-macros.h.
+	* d30v.h: Use reloc-macros.h.
+	* hppa.h: Use reloc-macros.h.
+	* i386.h: Use reloc-macros.h.
+	* m32r.h: Use reloc-macros.h.
+	* m68k.h: Use reloc-macros.h.
+	* mips.h: Use reloc-macros.h.
+	* mn10200.h: Use reloc-macros.h.
+	* mn10300.h: Use reloc-macros.h.
+	* ppc.h: Use reloc-macros.h.
+	* sh.h: Use reloc-macros.h.
+	* sparc.h: Use reloc-macros.h.
+	* v850.h: Use reloc-macros.h.
+
+1998-07-22 13:07  Ulrich Drepper  <drepper@cygnus.com>
+
+	* mn10300.h: Rewrite relocation definition using macros.
+	* mips.h: Likewise.
+	* ppc.h: Likewise.
+	* alpha.h: Likewise.
+	* arm.h: Likewise.
+	* d10v.h: Likewise.
+	* d30v.h: Likewise.
+	* m32r.h: Likewise.
+	* m68k.h: Likewise.
+	* mn10200.h: Likewise.
+	* sh.h: Likewise.
+	* sparc.h: Likewise.
+
+1998-07-21 13:07  Ulrich Drepper  <drepper@cygnus.com>
+
+	* arm.h: New file.
+	* d10v.h: New file.
+	* d30v.h: New file.
+	* i386.h: New file.
+	* m68k.h: New file.
+	* mn10200.h: New file.
+	* sh.h: New file.
+
+	* mips.h: Add R_MIPS_* and SHT_MIPS_* entries.
+
+	* mn10300.h: Add R_MN10300_* entries.
+
+	* ppc.h: Add R_PPC_* entries.
+
+1998-07-20 07:11  Ulrich Drepper  <drepper@cygnus.com>
+
+	* mips.h: Add ODK_*, OEX_*, OPAD_*, OHW_*, and OGP_* constants.
+	Define Elf32_External_Lib.
+
+1998-07-19 15:24  Ulrich Drepper  <drepper@cygnus.com>
+
+	* mips.h (PT_MIPS_OPTIONS): New symbol.
+	Add lots of DT_MIPS_* symbols.
+
+Fri Jun 26 10:46:35 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* mn10300.h: New file.
+
+Thu Jun 18 19:27:56 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* common.h (EM_960, EM_V800, EM_FR20, EM_RH32, EM_MMA,
+	EM_OLD_ALPHA): Add these constants.
+
+Thu Jun 11 17:59:01 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* common.h (EM_486, EM_S370): Add these constants.
+
+Tue Jun  9 09:35:29 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* common.h (EM_ARM): Add this constant.
+
+Wed May  6 09:45:30 1998  Gavin Koch  <gavin@cygnus.com>
+
+	* mips.h (EF_MIPS_MACH,E_MIPS_MACH_*): Added.
+
+Sat Apr 25 18:35:06 1998  Richard Henderson  <rth@cygnus.com>
+
+	* alpha.h (STO_ALPHA_NOPV, STO_ALPHA_STD_GPLOAD): New.
+
+Wed Apr 15 15:42:45 1998  Richard Henderson  <rth@cygnus.com>
+
+	* common.h (EM_SPARC64): Move and rename to EM_OLD_SPARCV9.
+	(EM_SPARCV9): New.  This is the official ABI name and number.
+
+Sat Feb 28 17:04:41 1998  Richard Henderson  <rth@cygnus.com>
+
+	* alpha.h (EF_ALPHA_32BIT, EF_ALPHA_CANRELAX): New.
+
+Mon Dec 15 15:07:49 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* m32r.h (EF_M32R_ARCH, E_M32R_ARCH): New flags to
+	specify machine architecture.
+
+Fri Dec  5 11:20:08 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* v850.h: New constants: SHN_V850_SCOMMON, SHN_V850_TCOMMON,
+	SHN_V850_ZCOMMON, SHT_V850_SCOMMON, SHT_V850_TCOMMON,
+	SHT_V850_ZCOMMON to handle v850 common sections.
+	enum reloc_type renamed to v850_reloc_type to avoid name
+	conflict.
+
+Thu Oct 23 13:55:24 1997  Richard Henderson  <rth@cygnus.com>
+
+	* sparc.h (enum elf_sparc_reloc_type): Add UA64 & UA16.
+
+Thu Oct 23 00:42:04 1997  Richard Henderson  <rth@dot.cygnus.com>
+
+	* sparc.h (DT_SPARC_REGISTER): New macro.
+	(DT_SPARC_PLTFMT): In support of old sparc64-linux .plts; will
+	go away soon.
+
+Tue Sep 30 13:26:58 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* sparc.h (EF_SPARC_HAL_R1, EF_SPARC_EXT_MASK): New macros.
+	(EF_SPARCV9_{MM,TSO,PSO,RMO}): New macros.
+	(SHN_BEFORE,SHN_AFTER): New macros.
+	(SHF_EXCLUDE,SHF_ORDERED): New macros.
+	(STT_REGISTER): New macro.
+	(R_SPARC_GLOB_JMP): Deleted, but slot reserved.
+	(R_SPARC_{DISP64,PLT64,HIX22,LOX10}): New relocations.
+	(R_SPARC_{H44,M44,L44,REGISTER}): New relocations.
+	(ELF64_R_TYPE_{DATA,ID,INFO}): New macros.
+
+Wed Sep 17 16:41:42 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* v850.h: Add R_V850_CALLT_6_7_OFFSET and R_V850_CALLT_16_16_OFFSET.
+
+Tue Sep 16 14:16:17 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* v850.h (reloc_type): Add R_V850_TDA_16_16_OFFSET.
+
+Wed Sep  3 15:11:14 1997  Richard Henderson  <rth@cygnus.com>
+
+	* mips.h: Correct typo in comment.
+
+Wed Sep  3 11:25:57 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* v850.h (reloc_type): Remove R_V850_16_PCREL.
+
+Tue Sep  2 17:41:05 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* common.h: Remove magic number for V850E.
+	* common.h: Remove magic number for V850EA.
+	* v850.h: Add new flags for e_flags field in elf header.
+
+Mon Aug 25 16:06:47 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* common.h (EM_CYGNUS_V850E): backend magic number for v850e.
+	* common.h (EM_CYGNUS_V850EA): backend magic number for v850ea.
+
+Mon Aug 18 11:05:23 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* v850.h (reloc_type): Add 16 bit PC relative relocation.
+
+Fri Aug 15 05:10:09 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* arc.h (enum reloc): Move here from elf32-arc.c.
+
+Fri Aug  8 17:05:29 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* arc.h: New file.
+	* common.h (EM_CYGNUS_ARC): Define.
+
+Mon Jun 16 14:46:12 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* internal.h (Elf_Internal_Ehdr): Change e_phoff and e_shoff from
+	bfd_signed_vma to bfd_size_type, as they are not signed.
+
+Wed Mar  5 15:35:26 1997  Doug Evans  <dje@seba.cygnus.com>
+
+	* m32r.h (SHF_M32R_CAN_RELAX): Define.
+
+Mon Feb 24 17:49:01 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* external.h: Dump the 32/64 bit specific forms of the version
+	structures, and just define them as size independent.
+
+	* common.h (VERSYM_HIDDEN, VERSYM_VERSION): Define.
+
+Fri Feb 21 13:00:34 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* m32r.h (enum reloc_type): Add R_M32R_SDA16.
+	(SHN_M32R_SCOMMON): Define.
+
+Wed Feb 19 15:35:31 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	From Eric Youngdale <eric@andante.jic.com>:
+	* external.h, internal.h, common.h: Added new structures and
+	definitions for ELF versions.
+
+Tue Feb 18 17:40:36 1997  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* common.h (EM_CYGNUS_D30V): Define.
+
+Mon Jan 27 11:54:44 1997  Doug Evans  <dje@seba.cygnus.com>
+
+	* m32r.h (enum reloc_type): Add R_M32R_HI16_[SU]LO,R_M32R_LO16.
+
+Fri Jan  3 11:32:51 1997  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* v850.h (V850_OTHER_{TDA_BYTE,ERROR}): New bits for the st_other
+	field.
+	(SHN_V850_*): Remove v850 specific section indexes, which are not
+	needed.
+	(enum reloc_type): Move the v850 relocations here from
+	elf32-v850.c
+
+Thu Jan  2 19:30:23 1997  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* v850.h: New file, provide V850 specific definitions.
+
+Tue Dec 31 14:44:32 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* common.h (DT_AUXILIARY): Define.
+	(DT_FILTER): Define.
+
+Wed Dec  4 05:03:37 1996  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* dwarf2.h: Update.
+
+Tue Nov 26 10:44:47 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* mips.h (STO_MIPS16): Define.
+
+Tue Nov 12 15:45:42 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* d10v.h: Remove empty file.
+
+Tue Oct  8 11:31:24 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* mips.h (EF_MIPS_ABI2): Define.
+
+Thu Oct  3 10:01:40 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* common.h: Break mn10x00 support into mn10200 and mn10300.
+
+Wed Oct  2 21:26:43 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* common.h (EM_CYGNUS_MN10x00): Define.
+
+Mon Sep 23 09:18:04 1996  Doug Evans  <dje@seba.cygnus.com>
+
+	* m32r.h: New file.
+
+Fri Aug 30 17:06:21 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* common.h (EM_SH): Define.
+
+Tue Aug 20 14:47:54 1996  J.T. Conklin  <jtc@hippo.cygnus.com>
+
+	* common.h (EM_CYGNUS_V850): Define.
+
+Mon Aug 19 10:59:10 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* common.h (EM_CYGNUS_M32R): Define.
+
+Mon Jul 22 18:59:55 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* mips.h (SHT_MIPS_IFACE, SHT_MIPS_CONTENT): Define.
+	(SHT_MIPS_SYMBOL_LIB): Define.
+	(SHF_MIPS_MERGE, SHF_MIPS_ADDR32, SHF_MIPS_ADDR64): Define.
+	(SHF_MIPS_NOSTRIP, SHF_MIPS_LOCAL, SHF_MIPS_NAMES): Define.
+
+Thu Jul 18 19:12:15 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* dwarf2.h: New file.
+
+Jul 18 13:20:39 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* common.h (EM_CYGNUS_D10V): Define.
+	* d10v.h: New file.
+
+Fri Jun 21 12:33:24 1996  Richard Henderson  <rth@tamu.edu>
+
+	* alpha.h: New file.
+	* common.h (EM_ALPHA): Define.
+
+Fri May 31 17:28:05 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* mips.h (Elf_External_Options, Elf_Internal_Options): Define.
+	(bfd_mips_elf_swap_options_in): Declare.
+	(bfd_mips_elf_swap_options_out): Declare.
+	(ODK_*): Define.
+	(Elf64_External_RegInfo, Elf64_Internal_RegInfo): Define.
+	(bfd_mips_elf64_swap_reginfo_in): Declare.
+	(bfd_mips_elf64_swap_reginfo_out): Declare.
+
+Thu May 30 12:35:57 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* mips.h (E_MIPS_ARCH_4): Define.
+
+Wed May 29 15:35:33 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* mips.h (Elf64_Mips_External_Rel): Define.
+	(Elf64_Mips_Internal_Rel): Define.
+	(Elf64_Mips_External_Rela, Elf64_Mips_Internal_Rela): Define.
+	(RSS_*): Define.
+
+Mon Apr 22 18:26:30 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* sparc.h (R_SPARC_[56]): Always define.
+
+Mon Feb 19 01:55:56 1996  Doug Evans  <dje@charmed.cygnus.com>
+
+	* sparc.h (R_SPARC_{PLT32,HIPLT22,LOPLT10,PCPLT32,PCPLT22,
+	PCPLT10,5,6}): Don't define ifdef SPARC64_OLD_RELOCS.
+
+Tue Feb  6 11:33:58 1996  Doug Evans  <dje@charmed.cygnus.com>
+
+	* sparc.h (enum sparc_elf_reloc_type): Define.
+
+Wed Jan 17 09:09:16 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* common.h: Define EM_SPARC32PLUS.
+	* sparc.h: New file.
+
+Thu Jan 11 16:27:34 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* ppc.h (SHF_EXCLUDE, SHT_ORDERED): New fields from the abi.
+
+Thu Nov 30 16:47:18 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* internal.h (struct elf_segment_map): Add includes_filehdr and
+	includes_phdrs fields.
+
+Tue Nov 28 16:58:10 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* internal.h (struct elf_segment_map): Define.
+
+Tue Oct 31 15:19:36 1995  Fred Fish  <fnf@cygnus.com>
+
+	* common.h, dwarf.h, external.h, hppa.h, internal.h,
+	mips.h, ppc.h:  Protect against multiple inclusions.
+
+Thu Sep 21 13:51:58 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* ppc.h (EF_PPC_RELOCATABLE_LIB): Add new flag bit.
+
+Fri Sep  1 15:32:17 1995  Kazumoto Kojima  <kkojima@info.kanagawa-u.ac.jp>
+
+	* mips.h: Add some definitions used on Irix 5.
+
+Tue Jun 20 10:18:28 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* hppa.h (CPU_PA_RISC1_0): Protect from redefinitions.
+	(CPU_PA_RISC1_1): Likewise.
+
+Wed Mar  8 18:14:37 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* ppc.h: New file for PowerPC support.
+
+Tue Feb 14 13:59:13 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* common.h (EM_PPC): Use offical value of 20, not 17.
+	(EM_PPC_OLD): Define this to be the old value of EM_PPC.
+
+Tue Jan 24 09:40:59 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* common.h (EM_PPC): New macro, PowerPC machine id.
+
+Tue Jan 17 10:51:38 1995  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* mips.h (SHT_MIPS_MSYM, SHT_MIPS_DWARF, SHT_MIPS_EVENTS): Define.
+
+Mon Oct 17 13:43:59 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* internal.h (Elf_Internal_Shdr): Remove rawdata and size fields.
+	Add bfd_section field.
+
+Tue May 24 16:11:50 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* mips.h (Elf32_External_gptab): Define.
+
+Mon May 16 13:22:04 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* common.h (EM_HPPA): Delete.
+	(EM_PARISC): Add.
+	* hppa.h: New file.
+
+Mon May  9 13:27:03 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* common.h (SHN_LORESERVE): Rename from SHN_LORESERV.
+	(ELF32_R_TYPE, ELF32_R_INFO): Don't rely on size of unsigned char.
+	(ELF64_R_TYPE): Don't rely on size of unsigned long.
+
+Mon Apr 25 15:53:09 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* internal.h (Elf_Internal_Shdr): Use PTR, not void *.
+
+Fri Mar 11 00:34:59 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* mips.h (SHN_MIPS_TEXT, SHN_MIPS_DATA):  Define.
+
+Sat Mar  5 14:08:54 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* internal.h:  Remove Elf32_*, Elf64_* typedefs.  These names
+	cause conflicts with system headers, e.g. link.h in gdb/solib.c.
+	Combine 32- and 64-bit versions of *_Internal_Dyn.
+	* common.h:  Replace uses of Elf64_Word, Elf64_Xword typedefs
+	by their expansion.
+	* mips.h:  Replace uses of Elf32_Word, Elf32_Sword, Elf32_Addr
+	typedefs by their expansion. Add DT_MIPS_RLD_MAP definition.
+
+Fri Feb 18 10:39:54 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* common.h (EM_CYGNUS_POWERPC): Define.  This may be temporary,
+	depending upon how quickly I can find a real PowerPC ABI.
+
+Mon Feb  7 08:27:13 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* internal.h: Change HOST_64_BIT to BFD_HOST_64_BIT.
+
+Wed Feb  2 14:12:18 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* common.h: Add comments regarding value of EM_HPPA and how to
+	pick an unofficial value.
+
+Wed Nov 17 17:14:26 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* mips.h (SHT_MIPS_OPTIONS): Define.
+
+Mon Nov  8 17:57:00 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* mips.h: Added some more MIPS ABI macro definitions.
+
+Wed Nov  3 22:07:17 1993  Ken Raeburn  (raeburn@rtl.cygnus.com)
+
+	* common.h (EM_MIPS_RS4_BE): New macro.
+
+Tue Oct 12 07:28:18 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* mips.h: New file.  MIPS ABI specific information.
+
+Mon Jun 21 13:13:43 1993  Ken Raeburn  (raeburn@poseidon.cygnus.com)
+
+	* internal.h: Combined 32- and 64-bit versions of all structures
+	except *_Internal_Dyn.  This will simply the assembler interface,
+	and some bfd code.
+
+Tue May 25 02:00:16 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+	* external.h, internal.h, common.h: Added 64-bit versions of some
+	structures and macros.  Renamed old versions to put "32" in the
+	name.  Some are unchanged.
+
+Thu Apr 29 12:12:20 1993  Ken Raeburn  (raeburn@deneb.cygnus.com)
+
+	* common.h (EM_HPPA, NT_VERSION, STN_UNDEF, DT_*): New macros.
+	* external.h (Elf_External_Dyn): New type.
+
+	* internal.h (Elf_Intenral_Shdr): New field `size'.
+	(Elf_Internal_Dyn): New type.
+
+Tue Apr 20 16:03:45 1993  Fred Fish  (fnf@cygnus.com)
+
+	* dwarf.h (LANG_CHILL):  Change value to one randomly picked in
+	the user defined range, to reduce probability of collisions.
+
+Sun Nov 15 09:34:02 1992  Fred Fish  (fnf@cygnus.com)
+
+	* dwarf.h (AT_src_coords):  Whitespace change only.
+	* dwarf.h (AT_body_begin, AT_body_end, LANG_MODULA2):
+	Add from latest gcc.
+	* dwarf.h (LANG_CHILL):  Add as GNU extension.
+
+Sat Aug  1 13:46:53 1992  Fred Fish  (fnf@cygnus.com)
+
+	* dwarf.h:  Replace with current version from gcc distribution.
+
+Fri Jun 19 19:05:09 1992  John Gilmore  (gnu at cygnus.com)
+
+	* internal.h:  Add real struct tags to all the Type_Defs, so they
+	can be used in prototypes where the Type_Defs are not known.
+
+Fri Apr  3 20:58:58 1992  Mark Eichin  (eichin at cygnus.com)
+
+	* common.h: added ELF_R_{SYM,TYPE,INFO} for handling relocation
+	info
+	added EM_MIPS, and corrected value of EM_860 based on System V ABI
+	manual.
+
+	* external.h: added Elf_External_{Rel,Rela}.
+
+	* internal.h: added Elf_Internal_{Rel,Rela}.
+	added rawdata to Elf_Internal_Shdr.
+
+Sat Nov 30 20:43:59 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+	* common.h, dwarf.h, external.h, internal.h, ChangeLog; moved from
+	../elf-<foo>
+
+
+Local Variables:
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/alpha.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/alpha.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/alpha.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/alpha.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,131 @@
+/* ALPHA ELF support for BFD.
+   Copyright 1996, 1998, 2000, 2001, 2002, 2010 Free Software Foundation, Inc.
+
+   By Eric Youngdale, <eric@aib.com>.  No processor supplement available
+   for this platform.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file holds definitions specific to the ALPHA ELF ABI.  Note
+   that most of this is not actually implemented by BFD.  */
+
+#ifndef _ELF_ALPHA_H
+#define _ELF_ALPHA_H
+
+/* Processor specific flags for the ELF header e_flags field.  */
+
+/* All addresses must be below 2GB.  */
+#define EF_ALPHA_32BIT		0x00000001
+
+/* All relocations needed for relaxation with code movement are present.  */
+#define EF_ALPHA_CANRELAX	0x00000002
+
+/* Processor specific section flags.  */
+
+/* This section must be in the global data area.  */
+#define SHF_ALPHA_GPREL		0x10000000
+
+/* Section contains some sort of debugging information.  The exact
+   format is unspecified.  It's probably ECOFF symbols.  */
+#define SHT_ALPHA_DEBUG		0x70000001
+
+/* Section contains register usage information.  */
+#define SHT_ALPHA_REGINFO	0x70000002
+
+/* A section of type SHT_MIPS_REGINFO contains the following
+   structure.  */
+typedef struct
+{
+  /* Mask of general purpose registers used.  */
+  unsigned long ri_gprmask;
+  /* Mask of co-processor registers used.  */
+  unsigned long ri_cprmask[4];
+  /* GP register value for this object file.  */
+  long ri_gp_value;
+} Elf64_RegInfo;
+
+/* Special values for the st_other field in the symbol table.  */
+
+#define STO_ALPHA_NOPV		0x80
+#define STO_ALPHA_STD_GPLOAD	0x88
+
+/* Special values for Elf64_Dyn tag.  */
+#define DT_ALPHA_PLTRO		DT_LOPROC
+
+#include "elf/reloc-macros.h"
+
+/* Alpha relocs.  */
+START_RELOC_NUMBERS (elf_alpha_reloc_type)
+  RELOC_NUMBER (R_ALPHA_NONE, 0)	/* No reloc */
+  RELOC_NUMBER (R_ALPHA_REFLONG, 1)	/* Direct 32 bit */
+  RELOC_NUMBER (R_ALPHA_REFQUAD, 2)	/* Direct 64 bit */
+  RELOC_NUMBER (R_ALPHA_GPREL32, 3)	/* GP relative 32 bit */
+  RELOC_NUMBER (R_ALPHA_LITERAL, 4)	/* GP relative 16 bit w/optimization */
+  RELOC_NUMBER (R_ALPHA_LITUSE, 5)	/* Optimization hint for LITERAL */
+  RELOC_NUMBER (R_ALPHA_GPDISP, 6)	/* Add displacement to GP */
+  RELOC_NUMBER (R_ALPHA_BRADDR, 7)	/* PC+4 relative 23 bit shifted */
+  RELOC_NUMBER (R_ALPHA_HINT, 8)	/* PC+4 relative 16 bit shifted */
+  RELOC_NUMBER (R_ALPHA_SREL16, 9)	/* PC relative 16 bit */
+  RELOC_NUMBER (R_ALPHA_SREL32, 10)	/* PC relative 32 bit */
+  RELOC_NUMBER (R_ALPHA_SREL64, 11)	/* PC relative 64 bit */
+
+  /* Skip 12 - 16; deprecated ECOFF relocs.  */
+
+  RELOC_NUMBER (R_ALPHA_GPRELHIGH, 17)	/* GP relative 32 bit, high 16 bits */
+  RELOC_NUMBER (R_ALPHA_GPRELLOW, 18)	/* GP relative 32 bit, low 16 bits */
+  RELOC_NUMBER (R_ALPHA_GPREL16, 19)	/* GP relative 16 bit */
+
+  /* Skip 20 - 23; deprecated ECOFF relocs.  */
+
+  /* These relocations are specific to shared libraries.  */
+  RELOC_NUMBER (R_ALPHA_COPY, 24)	/* Copy symbol at runtime */
+  RELOC_NUMBER (R_ALPHA_GLOB_DAT, 25)	/* Create GOT entry */
+  RELOC_NUMBER (R_ALPHA_JMP_SLOT, 26)	/* Create PLT entry */
+  RELOC_NUMBER (R_ALPHA_RELATIVE, 27)	/* Adjust by program base */
+
+  /* Like BRADDR, but assert that the source and target object file
+     share the same GP value, and adjust the target address for 
+     STO_ALPHA_STD_GPLOAD.  */
+  RELOC_NUMBER (R_ALPHA_BRSGP, 28)
+
+  /* Thread-Local Storage.  */
+  RELOC_NUMBER (R_ALPHA_TLSGD, 29)
+  RELOC_NUMBER (R_ALPHA_TLSLDM, 30)
+  RELOC_NUMBER (R_ALPHA_DTPMOD64, 31)
+  RELOC_NUMBER (R_ALPHA_GOTDTPREL, 32)
+  RELOC_NUMBER (R_ALPHA_DTPREL64, 33)
+  RELOC_NUMBER (R_ALPHA_DTPRELHI, 34)
+  RELOC_NUMBER (R_ALPHA_DTPRELLO, 35)
+  RELOC_NUMBER (R_ALPHA_DTPREL16, 36)
+  RELOC_NUMBER (R_ALPHA_GOTTPREL, 37)
+  RELOC_NUMBER (R_ALPHA_TPREL64, 38)
+  RELOC_NUMBER (R_ALPHA_TPRELHI, 39)
+  RELOC_NUMBER (R_ALPHA_TPRELLO, 40)
+  RELOC_NUMBER (R_ALPHA_TPREL16, 41)
+
+END_RELOC_NUMBERS (R_ALPHA_max)
+
+#define LITUSE_ALPHA_ADDR	0
+#define LITUSE_ALPHA_BASE	1
+#define LITUSE_ALPHA_BYTOFF	2
+#define LITUSE_ALPHA_JSR	3
+#define LITUSE_ALPHA_TLSGD	4
+#define LITUSE_ALPHA_TLSLDM	5
+#define LITUSE_ALPHA_JSRDIRECT	6
+
+#endif /* _ELF_ALPHA_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/arc.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/arc.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/arc.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/arc.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,57 @@
+/* ARC ELF support for BFD.
+   Copyright 1995, 1997, 1998, 2000, 2001, 2010 Free Software Foundation, Inc.
+   Contributed by Doug Evans, (dje@cygnus.com)
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file holds definitions specific to the ARC ELF ABI.  */
+
+#ifndef _ELF_ARC_H
+#define _ELF_ARC_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+
+START_RELOC_NUMBERS (elf_arc_reloc_type)
+  RELOC_NUMBER (R_ARC_NONE, 0)
+  RELOC_NUMBER (R_ARC_32, 1)
+  RELOC_NUMBER (R_ARC_B26, 2)
+  RELOC_NUMBER (R_ARC_B22_PCREL, 3)
+END_RELOC_NUMBERS (R_ARC_max)
+
+/* Processor specific flags for the ELF header e_flags field.  */
+
+/* Four bit ARC machine type field.  */
+
+#define EF_ARC_MACH 0x0000000f
+
+/* Various CPU types.  */
+
+#define E_ARC_MACH_ARC5 0
+#define E_ARC_MACH_ARC6 1	
+#define E_ARC_MACH_ARC7 2
+#define E_ARC_MACH_ARC8 3
+
+/* Leave bits 0xf0 alone in case we ever have more than 16 cpu types.  */
+
+/* File contains position independent code.  */
+
+#define EF_ARC_PIC 0x00000100
+
+#endif /* _ELF_ARC_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/arm.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/arm.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/arm.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/arm.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,338 @@
+/* ARM ELF support for BFD.
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2009, 2010
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_ARM_H
+#define _ELF_ARM_H
+
+#include "elf/reloc-macros.h"
+
+/* Processor specific flags for the ELF header e_flags field.  */
+#define EF_ARM_RELEXEC     0x01
+#define EF_ARM_HASENTRY    0x02
+#define EF_ARM_INTERWORK   0x04
+#define EF_ARM_APCS_26     0x08
+#define EF_ARM_APCS_FLOAT  0x10
+#define EF_ARM_PIC         0x20
+#define EF_ARM_ALIGN8	   0x40		/* 8-bit structure alignment is in use.  */
+#define EF_ARM_NEW_ABI     0x80
+#define EF_ARM_OLD_ABI     0x100
+#define EF_ARM_SOFT_FLOAT  0x200
+#define EF_ARM_VFP_FLOAT   0x400
+#define EF_ARM_MAVERICK_FLOAT 0x800
+
+/* Frame unwind information */
+#define PT_ARM_EXIDX (PT_LOPROC + 1)
+
+/* Other constants defined in the ARM ELF spec. version B-01.  */
+#define EF_ARM_SYMSARESORTED 0x04	/* NB conflicts with EF_INTERWORK.  */
+#define EF_ARM_DYNSYMSUSESEGIDX 0x08	/* NB conflicts with EF_APCS26.  */
+#define EF_ARM_MAPSYMSFIRST 0x10	/* NB conflicts with EF_APCS_FLOAT.  */
+#define EF_ARM_EABIMASK      0xFF000000
+
+/* Constants defined in AAELF.  */
+#define EF_ARM_BE8	    0x00800000
+#define EF_ARM_LE8	    0x00400000
+
+#define EF_ARM_EABI_VERSION(flags) ((flags) & EF_ARM_EABIMASK)
+#define EF_ARM_EABI_UNKNOWN  0x00000000
+#define EF_ARM_EABI_VER1     0x01000000
+#define EF_ARM_EABI_VER2     0x02000000
+#define EF_ARM_EABI_VER3     0x03000000
+#define EF_ARM_EABI_VER4     0x04000000
+#define EF_ARM_EABI_VER5     0x05000000
+
+/* Local aliases for some flags to match names used by COFF port.  */
+#define F_INTERWORK	   EF_ARM_INTERWORK
+#define F_APCS26	   EF_ARM_APCS_26
+#define F_APCS_FLOAT	   EF_ARM_APCS_FLOAT
+#define F_PIC              EF_ARM_PIC
+#define F_SOFT_FLOAT	   EF_ARM_SOFT_FLOAT
+#define F_VFP_FLOAT	   EF_ARM_VFP_FLOAT
+
+/* Additional symbol types for Thumb.  */
+#define STT_ARM_TFUNC      STT_LOPROC   /* A Thumb function.  */
+#define STT_ARM_16BIT      STT_HIPROC   /* A Thumb label.  */
+
+/* Additional section types.  */
+#define SHT_ARM_EXIDX	       0x70000001	/* Section holds ARM unwind info.  */
+#define SHT_ARM_PREEMPTMAP     0x70000002	/* Section pre-emption details.  */
+#define SHT_ARM_ATTRIBUTES     0x70000003	/* Section holds attributes.  */
+#define SHT_ARM_DEBUGOVERLAY   0x70000004	/* Section holds overlay debug info.  */
+#define SHT_ARM_OVERLAYSECTION 0x70000005	/* Section holds GDB and overlay integration info.  */
+
+/* ARM-specific values for sh_flags.  */
+#define SHF_ENTRYSECT      0x10000000   /* Section contains an entry point.  */
+#define SHF_COMDEF         0x80000000   /* Section may be multiply defined in the input to a link step.  */
+
+/* ARM-specific program header flags.  */
+#define PF_ARM_SB          0x10000000   /* Segment contains the location addressed by the static base.  */
+#define PF_ARM_PI          0x20000000   /* Segment is position-independent.  */
+#define PF_ARM_ABS         0x40000000   /* Segment must be loaded at its base address.  */
+
+/* Values for the Tag_CPU_arch EABI attribute.  */
+#define TAG_CPU_ARCH_PRE_V4	0
+#define TAG_CPU_ARCH_V4		1
+#define TAG_CPU_ARCH_V4T	2
+#define TAG_CPU_ARCH_V5T	3
+#define TAG_CPU_ARCH_V5TE	4
+#define TAG_CPU_ARCH_V5TEJ	5
+#define TAG_CPU_ARCH_V6		6
+#define TAG_CPU_ARCH_V6KZ	7
+#define TAG_CPU_ARCH_V6T2	8
+#define TAG_CPU_ARCH_V6K	9
+#define TAG_CPU_ARCH_V7		10
+#define TAG_CPU_ARCH_V6_M	11
+#define TAG_CPU_ARCH_V6S_M	12
+#define TAG_CPU_ARCH_V7E_M	13
+#define MAX_TAG_CPU_ARCH	13
+/* Pseudo-architecture to allow objects to be compatible with the subset of
+   armv4t and armv6-m.  This value should never be stored in object files.  */
+#define TAG_CPU_ARCH_V4T_PLUS_V6_M (MAX_TAG_CPU_ARCH + 1)
+
+/* Relocation types.  */
+
+START_RELOC_NUMBERS (elf_arm_reloc_type)
+/* AAELF official names and numbers.  */
+  RELOC_NUMBER (R_ARM_NONE,            	  0)
+  RELOC_NUMBER (R_ARM_PC24,            	  1)   /* deprecated */
+  RELOC_NUMBER (R_ARM_ABS32,           	  2)
+  RELOC_NUMBER (R_ARM_REL32,           	  3)
+  RELOC_NUMBER (R_ARM_LDR_PC_G0,       	  4)
+  RELOC_NUMBER (R_ARM_ABS16,           	  5)
+  RELOC_NUMBER (R_ARM_ABS12,           	  6)
+  RELOC_NUMBER (R_ARM_THM_ABS5,        	  7)
+  RELOC_NUMBER (R_ARM_ABS8,            	  8)
+  RELOC_NUMBER (R_ARM_SBREL32,         	  9)
+  RELOC_NUMBER (R_ARM_THM_CALL,        	 10)
+  RELOC_NUMBER (R_ARM_THM_PC8,         	 11)
+  RELOC_NUMBER (R_ARM_BREL_ADJ,	       	 12)
+  RELOC_NUMBER (R_ARM_TLS_DESC,          13)
+  RELOC_NUMBER (R_ARM_THM_SWI8,        	 14)   /* obsolete */
+  RELOC_NUMBER (R_ARM_XPC25,           	 15)   /* obsolete */
+  RELOC_NUMBER (R_ARM_THM_XPC22,       	 16)   /* obsolete */
+  RELOC_NUMBER (R_ARM_TLS_DTPMOD32,    	 17)
+  RELOC_NUMBER (R_ARM_TLS_DTPOFF32,    	 18)
+  RELOC_NUMBER (R_ARM_TLS_TPOFF32,     	 19)
+  RELOC_NUMBER (R_ARM_COPY,            	 20)   /* Copy symbol at runtime.  */
+  RELOC_NUMBER (R_ARM_GLOB_DAT,        	 21)   /* Create GOT entry.  */
+  RELOC_NUMBER (R_ARM_JUMP_SLOT,       	 22)   /* Create PLT entry.  */
+  RELOC_NUMBER (R_ARM_RELATIVE,        	 23)   /* Adjust by program base.  */
+  RELOC_NUMBER (R_ARM_GOTOFF32,        	 24)   /* 32 bit offset to GOT.  */
+  RELOC_NUMBER (R_ARM_BASE_PREL,       	 25)   /* 32 bit PC relative offset to GOT.  */
+  RELOC_NUMBER (R_ARM_GOT_BREL,        	 26)   /* 32 bit GOT entry.  */
+  RELOC_NUMBER (R_ARM_PLT32,           	 27)   /* deprecated - 32 bit PLT address.  */
+  RELOC_NUMBER (R_ARM_CALL,            	 28)
+  RELOC_NUMBER (R_ARM_JUMP24,          	 29)
+  RELOC_NUMBER (R_ARM_THM_JUMP24,      	 30)
+  RELOC_NUMBER (R_ARM_BASE_ABS,        	 31)
+  RELOC_NUMBER (R_ARM_ALU_PCREL7_0,    	 32)   /* obsolete */
+  RELOC_NUMBER (R_ARM_ALU_PCREL15_8,   	 33)   /* obsolete */
+  RELOC_NUMBER (R_ARM_ALU_PCREL23_15,  	 34)   /* obsolete */
+  RELOC_NUMBER (R_ARM_LDR_SBREL_11_0,  	 35)   /* deprecated, should have _NC suffix */
+  RELOC_NUMBER (R_ARM_ALU_SBREL_19_12, 	 36)   /* deprecated, should have _NC suffix */
+  RELOC_NUMBER (R_ARM_ALU_SBREL_27_20, 	 37)   /* deprecated, should have _CK suffix */
+  RELOC_NUMBER (R_ARM_TARGET1,         	 38)
+  RELOC_NUMBER (R_ARM_SBREL31,         	 39)   /* deprecated */
+  RELOC_NUMBER (R_ARM_V4BX,            	 40)
+  RELOC_NUMBER (R_ARM_TARGET2,	       	 41)
+  RELOC_NUMBER (R_ARM_PREL31,	       	 42)
+  RELOC_NUMBER (R_ARM_MOVW_ABS_NC,     	 43)
+  RELOC_NUMBER (R_ARM_MOVT_ABS,        	 44)
+  RELOC_NUMBER (R_ARM_MOVW_PREL_NC,    	 45)
+  RELOC_NUMBER (R_ARM_MOVT_PREL,       	 46)
+  RELOC_NUMBER (R_ARM_THM_MOVW_ABS_NC, 	 47)
+  RELOC_NUMBER (R_ARM_THM_MOVT_ABS,    	 48)
+  RELOC_NUMBER (R_ARM_THM_MOVW_PREL_NC,	 49)
+  RELOC_NUMBER (R_ARM_THM_MOVT_PREL,   	 50)
+  RELOC_NUMBER (R_ARM_THM_JUMP19,      	 51)
+  RELOC_NUMBER (R_ARM_THM_JUMP6,       	 52)
+  RELOC_NUMBER (R_ARM_THM_ALU_PREL_11_0, 53)
+  RELOC_NUMBER (R_ARM_THM_PC12,        	 54)
+  RELOC_NUMBER (R_ARM_ABS32_NOI,       	 55)
+  RELOC_NUMBER (R_ARM_REL32_NOI,       	 56)
+  RELOC_NUMBER (R_ARM_ALU_PC_G0_NC,      57)
+  RELOC_NUMBER (R_ARM_ALU_PC_G0,         58)
+  RELOC_NUMBER (R_ARM_ALU_PC_G1_NC,      59)
+  RELOC_NUMBER (R_ARM_ALU_PC_G1,         60)
+  RELOC_NUMBER (R_ARM_ALU_PC_G2,         61)
+  RELOC_NUMBER (R_ARM_LDR_PC_G1,         62)
+  RELOC_NUMBER (R_ARM_LDR_PC_G2,         63)
+  RELOC_NUMBER (R_ARM_LDRS_PC_G0,        64)
+  RELOC_NUMBER (R_ARM_LDRS_PC_G1,        65)
+  RELOC_NUMBER (R_ARM_LDRS_PC_G2,        66)
+  RELOC_NUMBER (R_ARM_LDC_PC_G0,         67)
+  RELOC_NUMBER (R_ARM_LDC_PC_G1,         68)
+  RELOC_NUMBER (R_ARM_LDC_PC_G2,         69)
+  RELOC_NUMBER (R_ARM_ALU_SB_G0_NC,      70)
+  RELOC_NUMBER (R_ARM_ALU_SB_G0,         71)
+  RELOC_NUMBER (R_ARM_ALU_SB_G1_NC,      72)
+  RELOC_NUMBER (R_ARM_ALU_SB_G1,         73)
+  RELOC_NUMBER (R_ARM_ALU_SB_G2,         74)
+  RELOC_NUMBER (R_ARM_LDR_SB_G0,         75)
+  RELOC_NUMBER (R_ARM_LDR_SB_G1,         76)
+  RELOC_NUMBER (R_ARM_LDR_SB_G2,         77)
+  RELOC_NUMBER (R_ARM_LDRS_SB_G0,        78)
+  RELOC_NUMBER (R_ARM_LDRS_SB_G1,        79)
+  RELOC_NUMBER (R_ARM_LDRS_SB_G2,        80)
+  RELOC_NUMBER (R_ARM_LDC_SB_G0,         81)
+  RELOC_NUMBER (R_ARM_LDC_SB_G1,         82)
+  RELOC_NUMBER (R_ARM_LDC_SB_G2,         83)
+  RELOC_NUMBER (R_ARM_MOVW_BREL_NC,    	 84)
+  RELOC_NUMBER (R_ARM_MOVT_BREL,       	 85)
+  RELOC_NUMBER (R_ARM_MOVW_BREL,       	 86)
+  RELOC_NUMBER (R_ARM_THM_MOVW_BREL_NC,	 87)
+  RELOC_NUMBER (R_ARM_THM_MOVT_BREL,   	 88)
+  RELOC_NUMBER (R_ARM_THM_MOVW_BREL,   	 89)
+  RELOC_NUMBER (R_ARM_TLS_GOTDESC,       90)
+  RELOC_NUMBER (R_ARM_TLS_CALL,          91)
+  RELOC_NUMBER (R_ARM_TLS_DESCSEQ,       92)
+  RELOC_NUMBER (R_ARM_THM_TLS_CALL,      93)
+  RELOC_NUMBER (R_ARM_PLT32_ABS,       	 94)
+  RELOC_NUMBER (R_ARM_GOT_ABS,	       	 95)
+  RELOC_NUMBER (R_ARM_GOT_PREL,	       	 96)
+  RELOC_NUMBER (R_ARM_GOT_BREL12,      	 97)
+  RELOC_NUMBER (R_ARM_GOTOFF12,	       	 98)
+  RELOC_NUMBER (R_ARM_GOTRELAX,	       	 99)
+  RELOC_NUMBER (R_ARM_GNU_VTENTRY,    	100)   /* deprecated - old C++ abi */
+  RELOC_NUMBER (R_ARM_GNU_VTINHERIT,  	101)   /* deprecated - old C++ abi */
+  RELOC_NUMBER (R_ARM_THM_JUMP11,     	102)
+  RELOC_NUMBER (R_ARM_THM_JUMP8,      	103)
+  RELOC_NUMBER (R_ARM_TLS_GD32,	      	104)
+  RELOC_NUMBER (R_ARM_TLS_LDM32,      	105)
+  RELOC_NUMBER (R_ARM_TLS_LDO32,      	106)
+  RELOC_NUMBER (R_ARM_TLS_IE32,       	107)
+  RELOC_NUMBER (R_ARM_TLS_LE32,	      	108)
+  RELOC_NUMBER (R_ARM_TLS_LDO12,      	109)
+  RELOC_NUMBER (R_ARM_TLS_LE12,	      	110)
+  RELOC_NUMBER (R_ARM_TLS_IE12GP,     	111)
+  /* 112 - 127 private range */
+  RELOC_NUMBER (R_ARM_ME_TOO,	        128)   /* obsolete */
+  RELOC_NUMBER (R_ARM_THM_TLS_DESCSEQ  ,129)
+
+  RELOC_NUMBER (R_ARM_IRELATIVE,      	160)
+
+  /* Extensions?  R=read-only?  */
+  RELOC_NUMBER (R_ARM_RXPC25,         	249)
+  RELOC_NUMBER (R_ARM_RSBREL32,       	250)
+  RELOC_NUMBER (R_ARM_THM_RPC22,      	251)
+  RELOC_NUMBER (R_ARM_RREL32,         	252)
+  RELOC_NUMBER (R_ARM_RABS32,         	253)
+  RELOC_NUMBER (R_ARM_RPC24,          	254)
+  RELOC_NUMBER (R_ARM_RBASE,          	255)
+
+  /* Unofficial names for some of the relocs.  */
+  FAKE_RELOC (R_ARM_GOTOFF,             R_ARM_GOTOFF32)   /* 32 bit offset to GOT.  */
+  FAKE_RELOC (R_ARM_THM_PC22,           R_ARM_THM_CALL)
+  FAKE_RELOC (R_ARM_THM_PC11,           R_ARM_THM_JUMP11)
+  FAKE_RELOC (R_ARM_THM_PC9,            R_ARM_THM_JUMP8)
+
+  /* Relocs with both a different name, and (apparently) different meaning in
+     GNU usage.  */
+  FAKE_RELOC (R_ARM_GOTPC,              R_ARM_BASE_PREL)  /* 32 bit PC relative offset to GOT.  */
+  FAKE_RELOC (R_ARM_GOT32,              R_ARM_GOT_BREL)   /* 32 bit GOT entry.  */
+  FAKE_RELOC (R_ARM_ROSEGREL32,         R_ARM_SBREL31)    /* ??? */
+  FAKE_RELOC (R_ARM_AMP_VCALL9,         R_ARM_BREL_ADJ)   /* Thumb-something.  Not used.  */
+
+END_RELOC_NUMBERS (R_ARM_max = 256)
+
+#ifdef BFD_ARCH_SIZE
+/* EABI object attributes.  */
+
+enum
+{
+  /* 0-3 are generic.  */
+  Tag_CPU_raw_name = 4,
+  Tag_CPU_name,
+  Tag_CPU_arch,
+  Tag_CPU_arch_profile,
+  Tag_ARM_ISA_use,
+  Tag_THUMB_ISA_use,
+  Tag_FP_arch,
+  Tag_WMMX_arch,
+  Tag_Advanced_SIMD_arch,
+  Tag_PCS_config,
+  Tag_ABI_PCS_R9_use,
+  Tag_ABI_PCS_RW_data,
+  Tag_ABI_PCS_RO_data,
+  Tag_ABI_PCS_GOT_use,
+  Tag_ABI_PCS_wchar_t,
+  Tag_ABI_FP_rounding,
+  Tag_ABI_FP_denormal,
+  Tag_ABI_FP_exceptions,
+  Tag_ABI_FP_user_exceptions,
+  Tag_ABI_FP_number_model,
+  Tag_ABI_align_needed,
+  Tag_ABI_align_preserved,
+  Tag_ABI_enum_size,
+  Tag_ABI_HardFP_use,
+  Tag_ABI_VFP_args,
+  Tag_ABI_WMMX_args,
+  Tag_ABI_optimization_goals,
+  Tag_ABI_FP_optimization_goals,
+  /* 32 is generic (Tag_compatibility).  */
+  Tag_undefined33 = 33,
+  Tag_CPU_unaligned_access,
+  Tag_undefined35,
+  Tag_FP_HP_extension,
+  Tag_undefined37,
+  Tag_ABI_FP_16bit_format,
+  Tag_undefined39,
+  Tag_undefined40,
+  Tag_undefined41,
+  Tag_MPextension_use,
+  Tag_undefined_43,
+  Tag_DIV_use,
+  Tag_nodefaults = 64,
+  Tag_also_compatible_with,
+  Tag_T2EE_use,
+  Tag_conformance,
+  Tag_Virtualization_use,
+  Tag_undefined69,
+  Tag_MPextension_use_legacy,
+
+  /* The following tags are legacy names for other tags.  */
+  Tag_VFP_arch = Tag_FP_arch,
+  Tag_ABI_align8_needed = Tag_ABI_align_needed,
+  Tag_ABI_align8_preserved = Tag_ABI_align_preserved,
+  Tag_VFP_HP_extension = Tag_FP_HP_extension
+};
+
+#endif
+
+/* The name of the note section used to identify arm variants.  */
+#define ARM_NOTE_SECTION ".note.gnu.arm.ident"
+
+/* Special section names.  */
+#define ELF_STRING_ARM_unwind           ".ARM.exidx"
+#define ELF_STRING_ARM_unwind_info      ".ARM.extab"
+#define ELF_STRING_ARM_unwind_once      ".gnu.linkonce.armexidx."
+#define ELF_STRING_ARM_unwind_info_once ".gnu.linkonce.armextab."
+
+enum arm_st_branch_type {
+  ST_BRANCH_TO_ARM,
+  ST_BRANCH_TO_THUMB,
+  ST_BRANCH_LONG,
+  ST_BRANCH_UNKNOWN
+};
+
+#define ARM_SYM_BRANCH_TYPE(SYM) \
+  ((enum arm_st_branch_type) (SYM)->st_target_internal)
+
+#endif /* _ELF_ARM_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/avr.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/avr.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/avr.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/avr.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,82 @@
+/* AVR ELF support for BFD.
+   Copyright 1999, 2000, 2004, 2006, 2010  Free Software Foundation, Inc.
+   Contributed by Denis Chertykov <denisc@overta.ru>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_AVR_H
+#define _ELF_AVR_H
+
+#include "elf/reloc-macros.h"
+
+/* Processor specific flags for the ELF header e_flags field.  */
+#define EF_AVR_MACH 0x7F
+
+/* If bit #7 is set, it is assumed that the elf file uses local symbols
+   as reference for the relocations so that linker relaxation is possible.  */
+#define EF_AVR_LINKRELAX_PREPARED 0x80
+
+#define E_AVR_MACH_AVR1 1
+#define E_AVR_MACH_AVR2 2
+#define E_AVR_MACH_AVR25 25
+#define E_AVR_MACH_AVR3 3
+#define E_AVR_MACH_AVR31 31
+#define E_AVR_MACH_AVR35 35
+#define E_AVR_MACH_AVR4 4
+#define E_AVR_MACH_AVR5 5
+#define E_AVR_MACH_AVR51 51
+#define E_AVR_MACH_AVR6 6 
+#define E_AVR_MACH_XMEGA1 101
+#define E_AVR_MACH_XMEGA2 102
+#define E_AVR_MACH_XMEGA3 103
+#define E_AVR_MACH_XMEGA4 104
+#define E_AVR_MACH_XMEGA5 105
+#define E_AVR_MACH_XMEGA6 106
+#define E_AVR_MACH_XMEGA7 107
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_avr_reloc_type)
+     RELOC_NUMBER (R_AVR_NONE,			0)
+     RELOC_NUMBER (R_AVR_32,			1)
+     RELOC_NUMBER (R_AVR_7_PCREL,		2)
+     RELOC_NUMBER (R_AVR_13_PCREL,		3)
+     RELOC_NUMBER (R_AVR_16, 			4)
+     RELOC_NUMBER (R_AVR_16_PM, 		5)
+     RELOC_NUMBER (R_AVR_LO8_LDI,		6)
+     RELOC_NUMBER (R_AVR_HI8_LDI,		7)
+     RELOC_NUMBER (R_AVR_HH8_LDI,		8)
+     RELOC_NUMBER (R_AVR_LO8_LDI_NEG,		9)
+     RELOC_NUMBER (R_AVR_HI8_LDI_NEG,	       10)
+     RELOC_NUMBER (R_AVR_HH8_LDI_NEG,	       11)
+     RELOC_NUMBER (R_AVR_LO8_LDI_PM,	       12)
+     RELOC_NUMBER (R_AVR_HI8_LDI_PM,	       13)
+     RELOC_NUMBER (R_AVR_HH8_LDI_PM,	       14)
+     RELOC_NUMBER (R_AVR_LO8_LDI_PM_NEG,       15)
+     RELOC_NUMBER (R_AVR_HI8_LDI_PM_NEG,       16)
+     RELOC_NUMBER (R_AVR_HH8_LDI_PM_NEG,       17)
+     RELOC_NUMBER (R_AVR_CALL,		       18)
+     RELOC_NUMBER (R_AVR_LDI,                  19)
+     RELOC_NUMBER (R_AVR_6,                    20)
+     RELOC_NUMBER (R_AVR_6_ADIW,               21)
+     RELOC_NUMBER (R_AVR_MS8_LDI,              22)
+     RELOC_NUMBER (R_AVR_MS8_LDI_NEG,          23)
+     RELOC_NUMBER (R_AVR_LO8_LDI_GS,	       24)
+     RELOC_NUMBER (R_AVR_HI8_LDI_GS,	       25)
+     RELOC_NUMBER (R_AVR_8, 		       26)
+END_RELOC_NUMBERS (R_AVR_max)
+
+#endif /* _ELF_AVR_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/bfin.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/bfin.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/bfin.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/bfin.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,95 @@
+/* Blackfin ELF support for BFD.
+   Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_BFIN_H
+#define _ELF_BFIN_H
+
+#include "elf/reloc-macros.h"
+
+START_RELOC_NUMBERS (elf_bfin_reloc_type)
+  RELOC_NUMBER (R_BFIN_UNUSED0, 0x00)          /* relocation type 0 is not defined */
+  RELOC_NUMBER (R_BFIN_PCREL5M2, 0x01)         /* LSETUP part a */
+  RELOC_NUMBER (R_BFIN_UNUSED1, 0x02)          /* relocation type 2 is not defined */
+  RELOC_NUMBER (R_BFIN_PCREL10, 0x03)          /* type 3, 0x00) if cc jump <target> */
+  RELOC_NUMBER (R_BFIN_PCREL12_JUMP, 0x04)     /* type 4, 0x00) jump <target> */
+  RELOC_NUMBER (R_BFIN_RIMM16, 0x05)           /* type 0x5, 0x00) rN = <target> */
+  RELOC_NUMBER (R_BFIN_LUIMM16, 0x06)          /* # 0x6, 0x00) preg.l=<target> Load imm 16 to lower half */
+  RELOC_NUMBER (R_BFIN_HUIMM16, 0x07)          /* # 0x7, 0x00) preg.h=<target> Load imm 16 to upper half */
+  RELOC_NUMBER (R_BFIN_PCREL12_JUMP_S, 0x08)   /* # 0x8 jump.s <target> */
+  RELOC_NUMBER (R_BFIN_PCREL24_JUMP_X, 0x09)   /* # 0x9 jump.x <target> */
+  RELOC_NUMBER (R_BFIN_PCREL24, 0x0a)          /* # 0xa call <target> , 0x00) not expandable */
+  RELOC_NUMBER (R_BFIN_UNUSEDB, 0x0b)          /* # 0xb not generated */
+  RELOC_NUMBER (R_BFIN_UNUSEDC, 0x0c)          /* # 0xc  not used */
+  RELOC_NUMBER (R_BFIN_PCREL24_JUMP_L, 0x0d)   /* 0xd jump.l <target> */
+  RELOC_NUMBER (R_BFIN_PCREL24_CALL_X, 0x0e)   /* 0xE, 0x00) call.x <target> if <target> is above 24 bit limit call through P1 */
+  RELOC_NUMBER (R_BFIN_VAR_EQ_SYMB, 0x0f)      /* 0xf, 0x00) linker should treat it same as 0x12 */
+  RELOC_NUMBER (R_BFIN_BYTE_DATA, 0x10)        /* 0x10, 0x00) .byte var = symbol */
+  RELOC_NUMBER (R_BFIN_BYTE2_DATA, 0x11)       /* 0x11, 0x00) .byte2 var = symbol */
+  RELOC_NUMBER (R_BFIN_BYTE4_DATA, 0x12)       /* 0x12, 0x00) .byte4 var = symbol and .var var=symbol */
+  RELOC_NUMBER (R_BFIN_PCREL11, 0x13)          /* 0x13, 0x00) lsetup part b */
+  RELOC_NUMBER (R_BFIN_GOT17M4, 0x14)
+  RELOC_NUMBER (R_BFIN_GOTHI, 0x15)
+  RELOC_NUMBER (R_BFIN_GOTLO, 0x16)
+  RELOC_NUMBER (R_BFIN_FUNCDESC, 0x17)
+  RELOC_NUMBER (R_BFIN_FUNCDESC_GOT17M4, 0x18)
+  RELOC_NUMBER (R_BFIN_FUNCDESC_GOTHI, 0x19)
+  RELOC_NUMBER (R_BFIN_FUNCDESC_GOTLO, 0x1a)
+  RELOC_NUMBER (R_BFIN_FUNCDESC_VALUE, 0x1b)
+  RELOC_NUMBER (R_BFIN_FUNCDESC_GOTOFF17M4, 0x1c)
+  RELOC_NUMBER (R_BFIN_FUNCDESC_GOTOFFHI, 0x1d)
+  RELOC_NUMBER (R_BFIN_FUNCDESC_GOTOFFLO, 0x1e)
+  RELOC_NUMBER (R_BFIN_GOTOFF17M4, 0x1f)
+  RELOC_NUMBER (R_BFIN_GOTOFFHI, 0x20)
+  RELOC_NUMBER (R_BFIN_GOTOFFLO, 0x21)
+
+  RELOC_NUMBER (R_BFIN_PUSH, 0xE0)
+  RELOC_NUMBER (R_BFIN_CONST, 0xE1)
+  RELOC_NUMBER (R_BFIN_ADD, 0xE2)
+  RELOC_NUMBER (R_BFIN_SUB, 0xE3)
+  RELOC_NUMBER (R_BFIN_MULT, 0xE4)
+  RELOC_NUMBER (R_BFIN_DIV, 0xE5)
+  RELOC_NUMBER (R_BFIN_MOD, 0xE6)
+  RELOC_NUMBER (R_BFIN_LSHIFT, 0xE7)
+  RELOC_NUMBER (R_BFIN_RSHIFT, 0xE8)
+  RELOC_NUMBER (R_BFIN_AND, 0xE9)
+  RELOC_NUMBER (R_BFIN_OR, 0xEA)
+  RELOC_NUMBER (R_BFIN_XOR, 0xEB)
+  RELOC_NUMBER (R_BFIN_LAND, 0xEC)
+  RELOC_NUMBER (R_BFIN_LOR, 0xED)
+  RELOC_NUMBER (R_BFIN_LEN, 0xEE)
+  RELOC_NUMBER (R_BFIN_NEG, 0xEF)
+  RELOC_NUMBER (R_BFIN_COMP, 0xF0)
+  RELOC_NUMBER (R_BFIN_PAGE, 0xF1)
+  RELOC_NUMBER (R_BFIN_HWPAGE, 0xF2)
+  RELOC_NUMBER (R_BFIN_ADDR, 0xF3)
+  RELOC_NUMBER (R_BFIN_PLTPC, 0x40)         /* PLT gnu only relocation */
+  RELOC_NUMBER (R_BFIN_GOT, 0x41)           /* GOT gnu only relocation */
+  RELOC_NUMBER (R_BFIN_GNU_VTINHERIT, 0x42) /* C++, gnu only */
+  RELOC_NUMBER (R_BFIN_GNU_VTENTRY, 0x43) /* C++, gnu only */
+END_RELOC_NUMBERS (R_BFIN_max)
+
+/* Processor specific flags for the ELF header e_flags field.  */
+#define EF_BFIN_PIC		0x00000001	/* -fpic */
+#define EF_BFIN_FDPIC		0x00000002      /* -mfdpic */
+
+#define EF_BFIN_CODE_IN_L1	0x00000010	/* --code-in-l1 */
+#define EF_BFIN_DATA_IN_L1	0x00000020	/* --data-in-l1 */
+
+#define	EF_BFIN_PIC_FLAGS	(EF_BFIN_PIC | EF_BFIN_FDPIC)
+#endif /* _ELF_BFIN_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/common.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/common.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/common.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/common.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,951 @@
+/* ELF support for BFD.
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+
+   Written by Fred Fish @ Cygnus Support, from information published
+   in "UNIX System V Release 4, Programmers Guide: ANSI C and
+   Programming Support Tools".
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file is part of ELF support for BFD, and contains the portions
+   that are common to both the internal and external representations.
+   For example, ELFMAG0 is the byte 0x7F in both the internal (in-memory)
+   and external (in-file) representations.  */
+
+#ifndef _ELF_COMMON_H
+#define _ELF_COMMON_H
+
+/* Fields in e_ident[].  */
+
+#define EI_MAG0		0	/* File identification byte 0 index */
+#define ELFMAG0		   0x7F	/* Magic number byte 0 */
+
+#define EI_MAG1		1	/* File identification byte 1 index */
+#define ELFMAG1		    'E'	/* Magic number byte 1 */
+
+#define EI_MAG2		2	/* File identification byte 2 index */
+#define ELFMAG2		    'L'	/* Magic number byte 2 */
+
+#define EI_MAG3		3	/* File identification byte 3 index */
+#define ELFMAG3		    'F'	/* Magic number byte 3 */
+
+#define EI_CLASS	4	/* File class */
+#define ELFCLASSNONE	      0	/* Invalid class */
+#define ELFCLASS32	      1	/* 32-bit objects */
+#define ELFCLASS64	      2	/* 64-bit objects */
+
+#define EI_DATA		5	/* Data encoding */
+#define ELFDATANONE	      0	/* Invalid data encoding */
+#define ELFDATA2LSB	      1	/* 2's complement, little endian */
+#define ELFDATA2MSB	      2	/* 2's complement, big endian */
+
+#define EI_VERSION	6	/* File version */
+
+#define EI_OSABI	7	/* Operating System/ABI indication */
+#define ELFOSABI_NONE	      0	/* UNIX System V ABI */
+#define ELFOSABI_HPUX	      1	/* HP-UX operating system */
+#define ELFOSABI_NETBSD	      2	/* NetBSD */
+#define ELFOSABI_GNU	      3	/* GNU */
+#define ELFOSABI_LINUX	      3	/* Alias for ELFOSABI_GNU */
+#define ELFOSABI_SOLARIS      6	/* Solaris */
+#define ELFOSABI_AIX	      7	/* AIX */
+#define ELFOSABI_IRIX	      8	/* IRIX */
+#define ELFOSABI_FREEBSD      9	/* FreeBSD */
+#define ELFOSABI_TRU64	     10	/* TRU64 UNIX */
+#define ELFOSABI_MODESTO     11	/* Novell Modesto */
+#define ELFOSABI_OPENBSD     12	/* OpenBSD */
+#define ELFOSABI_OPENVMS     13	/* OpenVMS */
+#define ELFOSABI_NSK	     14	/* Hewlett-Packard Non-Stop Kernel */
+#define ELFOSABI_AROS	     15	/* AROS */
+#define ELFOSABI_FENIXOS     16 /* FenixOS */
+#define ELFOSABI_C6000_ELFABI 64 /* Bare-metal TMS320C6000 */
+#define ELFOSABI_C6000_LINUX 65 /* Linux TMS320C6000 */
+#define ELFOSABI_ARM	     97	/* ARM */
+#define ELFOSABI_STANDALONE 255	/* Standalone (embedded) application */
+
+#define EI_ABIVERSION	8	/* ABI version */
+
+#define EI_PAD		9	/* Start of padding bytes */
+
+
+/* Values for e_type, which identifies the object file type.  */
+
+#define ET_NONE		0	/* No file type */
+#define ET_REL		1	/* Relocatable file */
+#define ET_EXEC		2	/* Executable file */
+#define ET_DYN		3	/* Shared object file */
+#define ET_CORE		4	/* Core file */
+#define ET_LOOS		0xFE00	/* Operating system-specific */
+#define ET_HIOS		0xFEFF	/* Operating system-specific */
+#define ET_LOPROC	0xFF00	/* Processor-specific */
+#define ET_HIPROC	0xFFFF	/* Processor-specific */
+
+/* Values for e_machine, which identifies the architecture.  These numbers
+   are officially assigned by registry@sco.com.  See below for a list of
+   ad-hoc numbers used during initial development.  */
+
+#define EM_NONE		  0	/* No machine */
+#define EM_M32		  1	/* AT&T WE 32100 */
+#define EM_SPARC	  2	/* SUN SPARC */
+#define EM_386		  3	/* Intel 80386 */
+#define EM_68K		  4	/* Motorola m68k family */
+#define EM_88K		  5	/* Motorola m88k family */
+#define EM_486		  6	/* Intel 80486 *//* Reserved for future use */
+#define EM_860		  7	/* Intel 80860 */
+#define EM_MIPS		  8	/* MIPS R3000 (officially, big-endian only) */
+#define EM_S370		  9	/* IBM System/370 */
+#define EM_MIPS_RS3_LE	 10	/* MIPS R3000 little-endian (Oct 4 1999 Draft) Deprecated */
+#define EM_res011	 11	/* Reserved */
+#define EM_res012	 12	/* Reserved */
+#define EM_res013	 13	/* Reserved */
+#define EM_res014	 14	/* Reserved */
+#define EM_PARISC	 15	/* HPPA */
+#define EM_res016	 16	/* Reserved */
+#define EM_VPP550	 17	/* Fujitsu VPP500 */
+#define EM_SPARC32PLUS	 18	/* Sun's "v8plus" */
+#define EM_960		 19	/* Intel 80960 */
+#define EM_PPC		 20	/* PowerPC */
+#define EM_PPC64	 21	/* 64-bit PowerPC */
+#define EM_S390		 22	/* IBM S/390 */
+#define EM_SPU		 23	/* Sony/Toshiba/IBM SPU */
+#define EM_res024	 24	/* Reserved */
+#define EM_res025	 25	/* Reserved */
+#define EM_res026	 26	/* Reserved */
+#define EM_res027	 27	/* Reserved */
+#define EM_res028	 28	/* Reserved */
+#define EM_res029	 29	/* Reserved */
+#define EM_res030	 30	/* Reserved */
+#define EM_res031	 31	/* Reserved */
+#define EM_res032	 32	/* Reserved */
+#define EM_res033	 33	/* Reserved */
+#define EM_res034	 34	/* Reserved */
+#define EM_res035	 35	/* Reserved */
+#define EM_V800		 36	/* NEC V800 series */
+#define EM_FR20		 37	/* Fujitsu FR20 */
+#define EM_RH32		 38	/* TRW RH32 */
+#define EM_MCORE	 39	/* Motorola M*Core */ /* May also be taken by Fujitsu MMA */
+#define EM_RCE		 39	/* Old name for MCore */
+#define EM_ARM		 40	/* ARM */
+#define EM_OLD_ALPHA	 41	/* Digital Alpha */
+#define EM_SH		 42	/* Renesas (formerly Hitachi) / SuperH SH */
+#define EM_SPARCV9	 43	/* SPARC v9 64-bit */
+#define EM_TRICORE	 44	/* Siemens Tricore embedded processor */
+#define EM_ARC		 45	/* ARC Cores */
+#define EM_H8_300	 46	/* Renesas (formerly Hitachi) H8/300 */
+#define EM_H8_300H	 47	/* Renesas (formerly Hitachi) H8/300H */
+#define EM_H8S		 48	/* Renesas (formerly Hitachi) H8S */
+#define EM_H8_500	 49	/* Renesas (formerly Hitachi) H8/500 */
+#define EM_IA_64	 50	/* Intel IA-64 Processor */
+#define EM_MIPS_X	 51	/* Stanford MIPS-X */
+#define EM_COLDFIRE	 52	/* Motorola Coldfire */
+#define EM_68HC12	 53	/* Motorola M68HC12 */
+#define EM_MMA		 54	/* Fujitsu Multimedia Accelerator */
+#define EM_PCP		 55	/* Siemens PCP */
+#define EM_NCPU		 56	/* Sony nCPU embedded RISC processor */
+#define EM_NDR1		 57	/* Denso NDR1 microprocessor */
+#define EM_STARCORE	 58	/* Motorola Star*Core processor */
+#define EM_ME16		 59	/* Toyota ME16 processor */
+#define EM_ST100	 60	/* STMicroelectronics ST100 processor */
+#define EM_TINYJ	 61	/* Advanced Logic Corp. TinyJ embedded processor */
+#define EM_X86_64	 62	/* Advanced Micro Devices X86-64 processor */
+#define EM_PDSP		 63	/* Sony DSP Processor */
+#define EM_PDP10	 64	/* Digital Equipment Corp. PDP-10 */
+#define EM_PDP11	 65	/* Digital Equipment Corp. PDP-11 */
+#define EM_FX66		 66	/* Siemens FX66 microcontroller */
+#define EM_ST9PLUS	 67	/* STMicroelectronics ST9+ 8/16 bit microcontroller */
+#define EM_ST7		 68	/* STMicroelectronics ST7 8-bit microcontroller */
+#define EM_68HC16	 69	/* Motorola MC68HC16 Microcontroller */
+#define EM_68HC11	 70	/* Motorola MC68HC11 Microcontroller */
+#define EM_68HC08	 71	/* Motorola MC68HC08 Microcontroller */
+#define EM_68HC05	 72	/* Motorola MC68HC05 Microcontroller */
+#define EM_SVX		 73	/* Silicon Graphics SVx */
+#define EM_ST19		 74	/* STMicroelectronics ST19 8-bit cpu */
+#define EM_VAX		 75	/* Digital VAX */
+#define EM_CRIS		 76	/* Axis Communications 32-bit embedded processor */
+#define EM_JAVELIN	 77	/* Infineon Technologies 32-bit embedded cpu */
+#define EM_FIREPATH	 78	/* Element 14 64-bit DSP processor */
+#define EM_ZSP		 79	/* LSI Logic's 16-bit DSP processor */
+#define EM_MMIX		 80	/* Donald Knuth's educational 64-bit processor */
+#define EM_HUANY	 81	/* Harvard's machine-independent format */
+#define EM_PRISM	 82	/* SiTera Prism */
+#define EM_AVR		 83	/* Atmel AVR 8-bit microcontroller */
+#define EM_FR30		 84	/* Fujitsu FR30 */
+#define EM_D10V		 85	/* Mitsubishi D10V */
+#define EM_D30V		 86	/* Mitsubishi D30V */
+#define EM_V850		 87	/* Renesas V850 (formerly NEC V850) */
+#define EM_M32R		 88	/* Renesas M32R (formerly Mitsubishi M32R) */
+#define EM_MN10300	 89	/* Matsushita MN10300 */
+#define EM_MN10200	 90	/* Matsushita MN10200 */
+#define EM_PJ		 91	/* picoJava */
+#define EM_OPENRISC	 92	/* OpenRISC 32-bit embedded processor */
+#define EM_ARC_A5	 93	/* ARC Cores Tangent-A5 */
+#define EM_XTENSA	 94	/* Tensilica Xtensa Architecture */
+#define EM_VIDEOCORE	 95	/* Alphamosaic VideoCore processor */
+#define EM_TMM_GPP	 96	/* Thompson Multimedia General Purpose Processor */
+#define EM_NS32K	 97	/* National Semiconductor 32000 series */
+#define EM_TPC		 98	/* Tenor Network TPC processor */
+#define EM_SNP1K	 99	/* Trebia SNP 1000 processor */
+#define EM_ST200	100	/* STMicroelectronics ST200 microcontroller */
+#define EM_IP2K		101	/* Ubicom IP2022 micro controller */
+#define EM_MAX		102	/* MAX Processor */
+#define EM_CR		103	/* National Semiconductor CompactRISC */
+#define EM_F2MC16	104	/* Fujitsu F2MC16 */
+#define EM_MSP430	105	/* TI msp430 micro controller */
+#define EM_BLACKFIN	106	/* ADI Blackfin */
+#define EM_SE_C33	107	/* S1C33 Family of Seiko Epson processors */
+#define EM_SEP		108	/* Sharp embedded microprocessor */
+#define EM_ARCA		109	/* Arca RISC Microprocessor */
+#define EM_UNICORE	110	/* Microprocessor series from PKU-Unity Ltd. and MPRC of Peking University */
+#define EM_EXCESS	111	/* eXcess: 16/32/64-bit configurable embedded CPU */
+#define EM_DXP		112	/* Icera Semiconductor Inc. Deep Execution Processor */
+#define EM_ALTERA_NIOS2	113	/* Altera Nios II soft-core processor */
+#define EM_CRX		114	/* National Semiconductor CRX */
+#define EM_XGATE	115	/* Motorola XGATE embedded processor */
+#define EM_C166		116	/* Infineon C16x/XC16x processor */
+#define EM_M16C		117	/* Renesas M16C series microprocessors */
+#define EM_DSPIC30F	118	/* Microchip Technology dsPIC30F Digital Signal Controller */
+#define EM_CE		119	/* Freescale Communication Engine RISC core */
+#define EM_M32C		120	/* Renesas M32C series microprocessors */
+#define EM_res121	121	/* Reserved */
+#define EM_res122	122	/* Reserved */
+#define EM_res123	123	/* Reserved */
+#define EM_res124	124	/* Reserved */
+#define EM_res125	125	/* Reserved */
+#define EM_res126	126	/* Reserved */
+#define EM_res127	127	/* Reserved */
+#define EM_res128	128	/* Reserved */
+#define EM_res129	129	/* Reserved */
+#define EM_res130	130	/* Reserved */
+#define EM_TSK3000	131	/* Altium TSK3000 core */
+#define EM_RS08		132	/* Freescale RS08 embedded processor */
+#define EM_res133	133	/* Reserved */
+#define EM_ECOG2	134	/* Cyan Technology eCOG2 microprocessor */
+#define EM_SCORE	135	/* Sunplus Score */
+#define EM_SCORE7	135	/* Sunplus S+core7 RISC processor */
+#define EM_DSP24	136	/* New Japan Radio (NJR) 24-bit DSP Processor */
+#define EM_VIDEOCORE3	137	/* Broadcom VideoCore III processor */
+#define EM_LATTICEMICO32 138	/* RISC processor for Lattice FPGA architecture */
+#define EM_SE_C17	139	/* Seiko Epson C17 family */
+#define EM_TI_C6000	140	/* Texas Instruments TMS320C6000 DSP family */
+#define EM_TI_C2000	141	/* Texas Instruments TMS320C2000 DSP family */
+#define EM_TI_C5500	142	/* Texas Instruments TMS320C55x DSP family */
+#define EM_res143	143	/* Reserved */
+#define EM_res144	144	/* Reserved */
+#define EM_res145	145	/* Reserved */
+#define EM_res146	146	/* Reserved */
+#define EM_res147	147	/* Reserved */
+#define EM_res148	148	/* Reserved */
+#define EM_res149	149	/* Reserved */
+#define EM_res150	150	/* Reserved */
+#define EM_res151	151	/* Reserved */
+#define EM_res152	152	/* Reserved */
+#define EM_res153	153	/* Reserved */
+#define EM_res154	154	/* Reserved */
+#define EM_res155	155	/* Reserved */
+#define EM_res156	156	/* Reserved */
+#define EM_res157	157	/* Reserved */
+#define EM_res158	158	/* Reserved */
+#define EM_res159	159	/* Reserved */
+#define EM_MMDSP_PLUS	160	/* STMicroelectronics 64bit VLIW Data Signal Processor */
+#define EM_CYPRESS_M8C	161	/* Cypress M8C microprocessor */
+#define EM_R32C		162	/* Renesas R32C series microprocessors */
+#define EM_TRIMEDIA	163	/* NXP Semiconductors TriMedia architecture family */
+#define EM_QDSP6	164	/* QUALCOMM DSP6 Processor */
+#define EM_8051		165	/* Intel 8051 and variants */
+#define EM_STXP7X	166	/* STMicroelectronics STxP7x family */
+#define EM_NDS32	167	/* Andes Technology compact code size embedded RISC processor family */
+#define EM_ECOG1	168	/* Cyan Technology eCOG1X family */
+#define EM_ECOG1X	168	/* Cyan Technology eCOG1X family */
+#define EM_MAXQ30	169	/* Dallas Semiconductor MAXQ30 Core Micro-controllers */
+#define EM_XIMO16	170	/* New Japan Radio (NJR) 16-bit DSP Processor */
+#define EM_MANIK	171	/* M2000 Reconfigurable RISC Microprocessor */
+#define EM_CRAYNV2	172	/* Cray Inc. NV2 vector architecture */
+#define EM_RX		173	/* Renesas RX family */
+#define EM_METAG	174	/* Imagination Technologies META processor architecture */
+#define EM_MCST_ELBRUS	175	/* MCST Elbrus general purpose hardware architecture */
+#define EM_ECOG16	176	/* Cyan Technology eCOG16 family */
+#define EM_CR16		177	/* National Semiconductor CompactRISC 16-bit processor */
+#define EM_ETPU		178	/* Freescale Extended Time Processing Unit */
+#define EM_SLE9X	179	/* Infineon Technologies SLE9X core */
+#define EM_L1OM		180	/* Intel L1OM */
+#define EM_K1OM		181	/* Intel K1OM */
+#define EM_INTEL182	182	/* Reserved by Intel */
+#define EM_res183	183	/* Reserved by ARM */
+#define EM_res184	184	/* Reserved by ARM */
+#define EM_AVR32	185	/* Atmel Corporation 32-bit microprocessor family */
+#define EM_STM8	186	/* STMicroeletronics STM8 8-bit microcontroller */
+#define EM_TILE64	187	/* Tilera TILE64 multicore architecture family */
+#define EM_TILEPRO	188	/* Tilera TILEPro multicore architecture family */
+#define EM_MICROBLAZE	189	/* Xilinx MicroBlaze 32-bit RISC soft processor core */
+#define EM_CUDA		190	/* NVIDIA CUDA architecture */
+#define EM_TILEGX	191	/* Tilera TILE-Gx multicore architecture family */
+
+/* If it is necessary to assign new unofficial EM_* values, please pick large
+   random numbers (0x8523, 0xa7f2, etc.) to minimize the chances of collision
+   with official or non-GNU unofficial values.
+
+   NOTE: Do not just increment the most recent number by one.
+   Somebody else somewhere will do exactly the same thing, and you
+   will have a collision.  Instead, pick a random number.
+
+   Normally, each entity or maintainer responsible for a machine with an
+   unofficial e_machine number should eventually ask registry@sco.com for
+   an officially blessed number to be added to the list above.	*/
+
+/* Old version of Sparc v9, from before the ABI;
+   This should be removed shortly.  */
+#define EM_OLD_SPARCV9		11
+
+/* Old version of PowerPC, this should be removed shortly. */
+#define EM_PPC_OLD		17
+
+/* picoJava */
+#define EM_PJ_OLD		99
+
+/* Old, unofficial value for National Semiconductor CompactRISC - CR16 */
+#define EM_CR16_OLD		115
+
+/* AVR magic number.  Written in the absense of an ABI.  */
+#define EM_AVR_OLD		0x1057
+
+/* MSP430 magic number.  Written in the absense of everything.  */
+#define EM_MSP430_OLD		0x1059
+
+/* Morpho MT.   Written in the absense of an ABI.  */
+#define EM_MT			0x2530
+
+/* FR30 magic number - no EABI available.  */
+#define EM_CYGNUS_FR30		0x3330
+
+/* OpenRISC magic number.  Written in the absense of an ABI.  */
+#define EM_OPENRISC_OLD		0x3426
+
+/* DLX magic number.  Written in the absense of an ABI.  */
+#define EM_DLX			0x5aa5
+
+/* FRV magic number - no EABI available??.  */
+#define EM_CYGNUS_FRV		0x5441
+
+/* Infineon Technologies 16-bit microcontroller with C166-V2 core.  */
+#define EM_XC16X		0x4688
+
+/* D10V backend magic number.  Written in the absence of an ABI.  */
+#define EM_CYGNUS_D10V		0x7650
+
+/* D30V backend magic number.  Written in the absence of an ABI.  */
+#define EM_CYGNUS_D30V		0x7676
+
+/* Ubicom IP2xxx;   Written in the absense of an ABI.  */
+#define EM_IP2K_OLD		0x8217
+
+/* (Deprecated) Temporary number for the OpenRISC processor.  */
+#define EM_OR32			0x8472
+
+/* Cygnus PowerPC ELF backend.  Written in the absence of an ABI.  */
+#define EM_CYGNUS_POWERPC	0x9025
+
+/* Alpha backend magic number.  Written in the absence of an ABI.  */
+#define EM_ALPHA		0x9026
+
+/* Cygnus M32R ELF backend.  Written in the absence of an ABI.  */
+#define EM_CYGNUS_M32R		0x9041
+
+/* V850 backend magic number.  Written in the absense of an ABI.  */
+#define EM_CYGNUS_V850		0x9080
+
+/* old S/390 backend magic number. Written in the absence of an ABI.  */
+#define EM_S390_OLD		0xa390
+
+/* Old, unofficial value for Xtensa.  */
+#define EM_XTENSA_OLD		0xabc7
+
+#define EM_XSTORMY16		0xad45
+
+/* mn10200 and mn10300 backend magic numbers.
+   Written in the absense of an ABI.  */
+#define EM_CYGNUS_MN10300	0xbeef
+#define EM_CYGNUS_MN10200	0xdead
+
+/* Renesas M32C and M16C.  */
+#define EM_M32C_OLD		0xFEB0
+
+/* Vitesse IQ2000.  */
+#define EM_IQ2000		0xFEBA
+
+/* NIOS magic number - no EABI available.  */
+#define EM_NIOS32		0xFEBB
+
+#define EM_CYGNUS_MEP		0xF00D  /* Toshiba MeP */
+
+#define EM_MOXIE                0xFEED  /* Moxie */
+
+/* Old Sunplus S+core7 backend magic number. Written in the absence of an ABI.  */
+#define EM_SCORE_OLD            95
+
+#define EM_MICROBLAZE_OLD	0xbaab	/* Old MicroBlaze */
+
+/* See the above comment before you add a new EM_* value here.  */
+
+/* Values for e_version.  */
+
+#define EV_NONE		0		/* Invalid ELF version */
+#define EV_CURRENT	1		/* Current version */
+
+/* Value for e_phnum. */
+#define PN_XNUM		0xffff		/* Extended numbering */
+
+/* Values for program header, p_type field.  */
+
+#define PT_NULL		0		/* Program header table entry unused */
+#define PT_LOAD		1		/* Loadable program segment */
+#define PT_DYNAMIC	2		/* Dynamic linking information */
+#define PT_INTERP	3		/* Program interpreter */
+#define PT_NOTE		4		/* Auxiliary information */
+#define PT_SHLIB	5		/* Reserved, unspecified semantics */
+#define PT_PHDR		6		/* Entry for header table itself */
+#define PT_TLS		7		/* Thread local storage segment */
+#define PT_LOOS		0x60000000	/* OS-specific */
+#define PT_HIOS		0x6fffffff	/* OS-specific */
+#define PT_LOPROC	0x70000000	/* Processor-specific */
+#define PT_HIPROC	0x7FFFFFFF	/* Processor-specific */
+
+#define PT_GNU_EH_FRAME	(PT_LOOS + 0x474e550) /* Frame unwind information */
+#define PT_SUNW_EH_FRAME PT_GNU_EH_FRAME      /* Solaris uses the same value */
+#define PT_GNU_STACK	(PT_LOOS + 0x474e551) /* Stack flags */
+#define PT_GNU_RELRO	(PT_LOOS + 0x474e552) /* Read-only after relocation */
+
+/* Program segment permissions, in program header p_flags field.  */
+
+#define PF_X		(1 << 0)	/* Segment is executable */
+#define PF_W		(1 << 1)	/* Segment is writable */
+#define PF_R		(1 << 2)	/* Segment is readable */
+/* #define PF_MASKOS	0x0F000000    *//* OS-specific reserved bits */
+#define PF_MASKOS	0x0FF00000	/* New value, Oct 4, 1999 Draft */
+#define PF_MASKPROC	0xF0000000	/* Processor-specific reserved bits */
+
+/* Values for section header, sh_type field.  */
+
+#define SHT_NULL	0		/* Section header table entry unused */
+#define SHT_PROGBITS	1		/* Program specific (private) data */
+#define SHT_SYMTAB	2		/* Link editing symbol table */
+#define SHT_STRTAB	3		/* A string table */
+#define SHT_RELA	4		/* Relocation entries with addends */
+#define SHT_HASH	5		/* A symbol hash table */
+#define SHT_DYNAMIC	6		/* Information for dynamic linking */
+#define SHT_NOTE	7		/* Information that marks file */
+#define SHT_NOBITS	8		/* Section occupies no space in file */
+#define SHT_REL		9		/* Relocation entries, no addends */
+#define SHT_SHLIB	10		/* Reserved, unspecified semantics */
+#define SHT_DYNSYM	11		/* Dynamic linking symbol table */
+
+#define SHT_INIT_ARRAY	  14		/* Array of ptrs to init functions */
+#define SHT_FINI_ARRAY	  15		/* Array of ptrs to finish functions */
+#define SHT_PREINIT_ARRAY 16		/* Array of ptrs to pre-init funcs */
+#define SHT_GROUP	  17		/* Section contains a section group */
+#define SHT_SYMTAB_SHNDX  18		/* Indicies for SHN_XINDEX entries */
+
+#define SHT_LOOS	0x60000000	/* First of OS specific semantics */
+#define SHT_HIOS	0x6fffffff	/* Last of OS specific semantics */
+
+#define SHT_GNU_INCREMENTAL_INPUTS 0x6fff4700   /* incremental build data */
+#define SHT_GNU_ATTRIBUTES 0x6ffffff5	/* Object attributes */
+#define SHT_GNU_HASH	0x6ffffff6	/* GNU style symbol hash table */
+#define SHT_GNU_LIBLIST	0x6ffffff7	/* List of prelink dependencies */
+
+/* The next three section types are defined by Solaris, and are named
+   SHT_SUNW*.  We use them in GNU code, so we also define SHT_GNU*
+   versions.  */
+#define SHT_SUNW_verdef	0x6ffffffd	/* Versions defined by file */
+#define SHT_SUNW_verneed 0x6ffffffe	/* Versions needed by file */
+#define SHT_SUNW_versym	0x6fffffff	/* Symbol versions */
+
+#define SHT_GNU_verdef	SHT_SUNW_verdef
+#define SHT_GNU_verneed	SHT_SUNW_verneed
+#define SHT_GNU_versym	SHT_SUNW_versym
+
+#define SHT_LOPROC	0x70000000	/* Processor-specific semantics, lo */
+#define SHT_HIPROC	0x7FFFFFFF	/* Processor-specific semantics, hi */
+#define SHT_LOUSER	0x80000000	/* Application-specific semantics */
+/* #define SHT_HIUSER	0x8FFFFFFF    *//* Application-specific semantics */
+#define SHT_HIUSER	0xFFFFFFFF	/* New value, defined in Oct 4, 1999 Draft */
+
+/* Values for section header, sh_flags field.  */
+
+#define SHF_WRITE	(1 << 0)	/* Writable data during execution */
+#define SHF_ALLOC	(1 << 1)	/* Occupies memory during execution */
+#define SHF_EXECINSTR	(1 << 2)	/* Executable machine instructions */
+#define SHF_MERGE	(1 << 4)	/* Data in this section can be merged */
+#define SHF_STRINGS	(1 << 5)	/* Contains null terminated character strings */
+#define SHF_INFO_LINK	(1 << 6)	/* sh_info holds section header table index */
+#define SHF_LINK_ORDER	(1 << 7)	/* Preserve section ordering when linking */
+#define SHF_OS_NONCONFORMING (1 << 8)	/* OS specific processing required */
+#define SHF_GROUP	(1 << 9)	/* Member of a section group */
+#define SHF_TLS		(1 << 10)	/* Thread local storage section */
+
+/* #define SHF_MASKOS	0x0F000000    *//* OS-specific semantics */
+#define SHF_MASKOS	0x0FF00000	/* New value, Oct 4, 1999 Draft */
+#define SHF_MASKPROC	0xF0000000	/* Processor-specific semantics */
+
+/* This used to be implemented as a processor specific section flag.
+   We just make it generic.  */
+#define SHF_EXCLUDE	0x80000000	/* Link editor is to exclude
+					   this section from executable
+					   and shared library that it
+					   builds when those objects
+					   are not to be further
+					   relocated.  */
+
+/* Values of note segment descriptor types for core files.  */
+
+#define NT_PRSTATUS	1		/* Contains copy of prstatus struct */
+#define NT_FPREGSET	2		/* Contains copy of fpregset struct */
+#define NT_PRPSINFO	3		/* Contains copy of prpsinfo struct */
+#define NT_TASKSTRUCT	4		/* Contains copy of task struct */
+#define NT_AUXV		6		/* Contains copy of Elfxx_auxv_t */
+#define NT_PRXFPREG	0x46e62b7f	/* Contains a user_xfpregs_struct; */
+					/*   note name must be "LINUX".  */
+#define NT_PPC_VMX	0x100		/* PowerPC Altivec/VMX registers */
+					/*   note name must be "LINUX".  */
+#define NT_PPC_VSX	0x102		/* PowerPC VSX registers */
+					/*   note name must be "LINUX".  */
+#define NT_X86_XSTATE	0x202		/* x86 XSAVE extended state */
+					/*   note name must be "LINUX".  */
+#define NT_S390_HIGH_GPRS 0x300		/* S/390 upper halves of GPRs  */
+					/*   note name must be "LINUX".  */
+#define NT_S390_TIMER	0x301		/* S390 timer */
+					/*   note name must be "LINUX".  */
+#define NT_S390_TODCMP	0x302		/* S390 TOD clock comparator */
+					/*   note name must be "LINUX".  */
+#define NT_S390_TODPREG	0x303		/* S390 TOD programmable register */
+					/*   note name must be "LINUX".  */
+#define NT_S390_CTRS	0x304		/* S390 control registers */
+					/*   note name must be "LINUX".  */
+#define NT_S390_PREFIX	0x305		/* S390 prefix register */
+					/*   note name must be "LINUX".  */
+#define NT_ARM_VFP	0x400		/* ARM VFP registers */
+					/*   note name must be "LINUX".  */
+
+/* Note segments for core files on dir-style procfs systems.  */
+
+#define NT_PSTATUS	10		/* Has a struct pstatus */
+#define NT_FPREGS	12		/* Has a struct fpregset */
+#define NT_PSINFO	13		/* Has a struct psinfo */
+#define NT_LWPSTATUS	16		/* Has a struct lwpstatus_t */
+#define NT_LWPSINFO	17		/* Has a struct lwpsinfo_t */
+#define NT_WIN32PSTATUS	18		/* Has a struct win32_pstatus */
+
+/* Note segment for SystemTap probes.  */
+#define NT_STAPSDT	3
+
+/* Note segments for core files on NetBSD systems.  Note name
+   must start with "NetBSD-CORE".  */
+
+#define NT_NETBSDCORE_PROCINFO	1	/* Has a struct procinfo */
+#define NT_NETBSDCORE_FIRSTMACH	32	/* start of machdep note types */
+
+
+/* Note segments for core files on OpenBSD systems.  Note name is
+   "OpenBSD".  */
+
+#define NT_OPENBSD_PROCINFO	10
+#define NT_OPENBSD_AUXV		11
+#define NT_OPENBSD_REGS		20
+#define NT_OPENBSD_FPREGS	21
+#define NT_OPENBSD_XFPREGS	22
+#define NT_OPENBSD_WCOOKIE	23
+
+
+/* Note segments for core files on SPU systems.  Note name
+   must start with "SPU/".  */
+
+#define NT_SPU		1
+
+/* Values of note segment descriptor types for object files.  */
+
+#define NT_VERSION	1		/* Contains a version string.  */
+#define NT_ARCH		2		/* Contains an architecture string.  */
+
+/* Values for notes in non-core files using name "GNU".  */
+
+#define NT_GNU_ABI_TAG		1
+#define NT_GNU_HWCAP		2	/* Used by ld.so and kernel vDSO.  */
+#define NT_GNU_BUILD_ID		3	/* Generated by ld --build-id.  */
+#define NT_GNU_GOLD_VERSION	4	/* Generated by gold.  */
+
+/* Values used in GNU .note.ABI-tag notes (NT_GNU_ABI_TAG).  */
+#define GNU_ABI_TAG_LINUX	0
+#define GNU_ABI_TAG_HURD	1
+#define GNU_ABI_TAG_SOLARIS	2
+#define GNU_ABI_TAG_FREEBSD	3
+#define GNU_ABI_TAG_NETBSD	4
+
+/* Values for NetBSD .note.netbsd.ident notes.  Note name is "NetBSD".  */
+
+#define NT_NETBSD_IDENT		1
+
+/* Values for OpenBSD .note.openbsd.ident notes.  Note name is "OpenBSD".  */
+
+#define NT_OPENBSD_IDENT	1
+
+/* Values for FreeBSD .note.ABI-tag notes.  Note name is "FreeBSD".  */
+
+#define NT_FREEBSD_ABI_TAG	1
+
+/* These three macros disassemble and assemble a symbol table st_info field,
+   which contains the symbol binding and symbol type.  The STB_ and STT_
+   defines identify the binding and type.  */
+
+#define ELF_ST_BIND(val)		(((unsigned int)(val)) >> 4)
+#define ELF_ST_TYPE(val)		((val) & 0xF)
+#define ELF_ST_INFO(bind,type)		(((bind) << 4) + ((type) & 0xF))
+
+/* The 64bit and 32bit versions of these macros are identical, but
+   the ELF spec defines them, so here they are.  */
+#define ELF32_ST_BIND  ELF_ST_BIND
+#define ELF32_ST_TYPE  ELF_ST_TYPE
+#define ELF32_ST_INFO  ELF_ST_INFO
+#define ELF64_ST_BIND  ELF_ST_BIND
+#define ELF64_ST_TYPE  ELF_ST_TYPE
+#define ELF64_ST_INFO  ELF_ST_INFO
+
+/* This macro disassembles and assembles a symbol's visibility into
+   the st_other field.  The STV_ defines specify the actual visibility.  */
+
+#define ELF_ST_VISIBILITY(v)		((v) & 0x3)
+/* The remaining bits in the st_other field are not currently used.
+   They should be set to zero.  */
+
+#define ELF32_ST_VISIBILITY  ELF_ST_VISIBILITY
+#define ELF64_ST_VISIBILITY  ELF_ST_VISIBILITY
+
+
+#define STN_UNDEF	0		/* Undefined symbol index */
+
+#define STB_LOCAL	0		/* Symbol not visible outside obj */
+#define STB_GLOBAL	1		/* Symbol visible outside obj */
+#define STB_WEAK	2		/* Like globals, lower precedence */
+#define STB_LOOS	10		/* OS-specific semantics */
+#define STB_GNU_UNIQUE	10		/* Symbol is unique in namespace */
+#define STB_HIOS	12		/* OS-specific semantics */
+#define STB_LOPROC	13		/* Processor-specific semantics */
+#define STB_HIPROC	15		/* Processor-specific semantics */
+
+#define STT_NOTYPE	0		/* Symbol type is unspecified */
+#define STT_OBJECT	1		/* Symbol is a data object */
+#define STT_FUNC	2		/* Symbol is a code object */
+#define STT_SECTION	3		/* Symbol associated with a section */
+#define STT_FILE	4		/* Symbol gives a file name */
+#define STT_COMMON	5		/* An uninitialised common block */
+#define STT_TLS		6		/* Thread local data object */
+#define STT_RELC	8		/* Complex relocation expression */
+#define STT_SRELC	9		/* Signed Complex relocation expression */
+#define STT_LOOS	10		/* OS-specific semantics */
+#define STT_GNU_IFUNC	10		/* Symbol is an indirect code object */
+#define STT_HIOS	12		/* OS-specific semantics */
+#define STT_LOPROC	13		/* Processor-specific semantics */
+#define STT_HIPROC	15		/* Processor-specific semantics */
+
+/* The following constants control how a symbol may be accessed once it has
+   become part of an executable or shared library.  */
+
+#define STV_DEFAULT	0		/* Visibility is specified by binding type */
+#define STV_INTERNAL	1		/* OS specific version of STV_HIDDEN */
+#define STV_HIDDEN	2		/* Can only be seen inside currect component */
+#define STV_PROTECTED	3		/* Treat as STB_LOCAL inside current component */
+
+/* Relocation info handling macros.  */
+
+#define ELF32_R_SYM(i)		((i) >> 8)
+#define ELF32_R_TYPE(i)		((i) & 0xff)
+#define ELF32_R_INFO(s,t)	(((s) << 8) + ((t) & 0xff))
+
+#define ELF64_R_SYM(i)		((i) >> 32)
+#define ELF64_R_TYPE(i)		((i) & 0xffffffff)
+#define ELF64_R_INFO(s,t)	(((bfd_vma) (s) << 31 << 1) + (bfd_vma) (t))
+
+/* Dynamic section tags.  */
+
+#define DT_NULL		0
+#define DT_NEEDED	1
+#define DT_PLTRELSZ	2
+#define DT_PLTGOT	3
+#define DT_HASH		4
+#define DT_STRTAB	5
+#define DT_SYMTAB	6
+#define DT_RELA		7
+#define DT_RELASZ	8
+#define DT_RELAENT	9
+#define DT_STRSZ	10
+#define DT_SYMENT	11
+#define DT_INIT		12
+#define DT_FINI		13
+#define DT_SONAME	14
+#define DT_RPATH	15
+#define DT_SYMBOLIC	16
+#define DT_REL		17
+#define DT_RELSZ	18
+#define DT_RELENT	19
+#define DT_PLTREL	20
+#define DT_DEBUG	21
+#define DT_TEXTREL	22
+#define DT_JMPREL	23
+#define DT_BIND_NOW	24
+#define DT_INIT_ARRAY	25
+#define DT_FINI_ARRAY	26
+#define DT_INIT_ARRAYSZ 27
+#define DT_FINI_ARRAYSZ 28
+#define DT_RUNPATH	29
+#define DT_FLAGS	30
+#define DT_ENCODING	32
+#define DT_PREINIT_ARRAY   32
+#define DT_PREINIT_ARRAYSZ 33
+
+/* Note, the Oct 4, 1999 draft of the ELF ABI changed the values
+   for DT_LOOS and DT_HIOS.  Some implementations however, use
+   values outside of the new range (see below).	 */
+#define OLD_DT_LOOS	0x60000000
+#define DT_LOOS		0x6000000d
+#define DT_HIOS		0x6ffff000
+#define OLD_DT_HIOS	0x6fffffff
+
+#define DT_LOPROC	0x70000000
+#define DT_HIPROC	0x7fffffff
+
+/* The next 2 dynamic tag ranges, integer value range (DT_VALRNGLO to
+   DT_VALRNGHI) and virtual address range (DT_ADDRRNGLO to DT_ADDRRNGHI),
+   are used on Solaris.  We support them everywhere.  Note these values
+   lie outside of the (new) range for OS specific values.  This is a
+   deliberate special case and we maintain it for backwards compatability.
+ */
+#define DT_VALRNGLO	0x6ffffd00
+#define DT_GNU_PRELINKED 0x6ffffdf5
+#define DT_GNU_CONFLICTSZ 0x6ffffdf6
+#define DT_GNU_LIBLISTSZ 0x6ffffdf7
+#define DT_CHECKSUM	0x6ffffdf8
+#define DT_PLTPADSZ	0x6ffffdf9
+#define DT_MOVEENT	0x6ffffdfa
+#define DT_MOVESZ	0x6ffffdfb
+#define DT_FEATURE	0x6ffffdfc
+#define DT_POSFLAG_1	0x6ffffdfd
+#define DT_SYMINSZ	0x6ffffdfe
+#define DT_SYMINENT	0x6ffffdff
+#define DT_VALRNGHI	0x6ffffdff
+
+#define DT_ADDRRNGLO	0x6ffffe00
+#define DT_GNU_HASH	0x6ffffef5
+#define DT_TLSDESC_PLT	0x6ffffef6
+#define DT_TLSDESC_GOT	0x6ffffef7
+#define DT_GNU_CONFLICT	0x6ffffef8
+#define DT_GNU_LIBLIST	0x6ffffef9
+#define DT_CONFIG	0x6ffffefa
+#define DT_DEPAUDIT	0x6ffffefb
+#define DT_AUDIT	0x6ffffefc
+#define DT_PLTPAD	0x6ffffefd
+#define DT_MOVETAB	0x6ffffefe
+#define DT_SYMINFO	0x6ffffeff
+#define DT_ADDRRNGHI	0x6ffffeff
+
+#define DT_RELACOUNT	0x6ffffff9
+#define DT_RELCOUNT	0x6ffffffa
+#define DT_FLAGS_1	0x6ffffffb
+#define DT_VERDEF	0x6ffffffc
+#define DT_VERDEFNUM	0x6ffffffd
+#define DT_VERNEED	0x6ffffffe
+#define DT_VERNEEDNUM	0x6fffffff
+
+/* This tag is a GNU extension to the Solaris version scheme.  */
+#define DT_VERSYM	0x6ffffff0
+
+#define DT_LOPROC	0x70000000
+#define DT_HIPROC	0x7fffffff
+
+/* These section tags are used on Solaris.  We support them
+   everywhere, and hope they do not conflict.  */
+
+#define DT_AUXILIARY	0x7ffffffd
+#define DT_USED		0x7ffffffe
+#define DT_FILTER	0x7fffffff
+
+
+/* Values used in DT_FEATURE .dynamic entry.  */
+#define DTF_1_PARINIT	0x00000001
+/* From
+
+   http://docs.sun.com:80/ab2/coll.45.13/LLM/@Ab2PageView/21165?Ab2Lang=C&Ab2Enc=iso-8859-1
+
+   DTF_1_CONFEXP is the same as DTF_1_PARINIT. It is a typo. The value
+   defined here is the same as the one in <sys/link.h> on Solaris 8.  */
+#define DTF_1_CONFEXP	0x00000002
+
+/* Flag values used in the DT_POSFLAG_1 .dynamic entry.	 */
+#define DF_P1_LAZYLOAD	0x00000001
+#define DF_P1_GROUPPERM	0x00000002
+
+/* Flag value in in the DT_FLAGS_1 .dynamic entry.  */
+#define DF_1_NOW	0x00000001
+#define DF_1_GLOBAL	0x00000002
+#define DF_1_GROUP	0x00000004
+#define DF_1_NODELETE	0x00000008
+#define DF_1_LOADFLTR	0x00000010
+#define DF_1_INITFIRST	0x00000020
+#define DF_1_NOOPEN	0x00000040
+#define DF_1_ORIGIN	0x00000080
+#define DF_1_DIRECT	0x00000100
+#define DF_1_TRANS	0x00000200
+#define DF_1_INTERPOSE	0x00000400
+#define DF_1_NODEFLIB	0x00000800
+#define DF_1_NODUMP	0x00001000
+#define DF_1_CONLFAT	0x00002000
+
+/* Flag values for the DT_FLAGS entry.	*/
+#define DF_ORIGIN	(1 << 0)
+#define DF_SYMBOLIC	(1 << 1)
+#define DF_TEXTREL	(1 << 2)
+#define DF_BIND_NOW	(1 << 3)
+#define DF_STATIC_TLS	(1 << 4)
+
+/* These constants are used for the version number of a Elf32_Verdef
+   structure.  */
+
+#define VER_DEF_NONE		0
+#define VER_DEF_CURRENT		1
+
+/* These constants appear in the vd_flags field of a Elf32_Verdef
+   structure.
+
+   Cf. the Solaris Linker and Libraries Guide, Ch. 7, Object File Format,
+   Versioning Sections, for a description:
+
+   http://docs.sun.com/app/docs/doc/819-0690/chapter6-93046?l=en&a=view  */
+
+#define VER_FLG_BASE		0x1
+#define VER_FLG_WEAK		0x2
+#define VER_FLG_INFO		0x4
+
+/* These special constants can be found in an Elf32_Versym field.  */
+
+#define VER_NDX_LOCAL		0
+#define VER_NDX_GLOBAL		1
+
+/* These constants are used for the version number of a Elf32_Verneed
+   structure.  */
+
+#define VER_NEED_NONE		0
+#define VER_NEED_CURRENT	1
+
+/* This flag appears in a Versym structure.  It means that the symbol
+   is hidden, and is only visible with an explicit version number.
+   This is a GNU extension.  */
+
+#define VERSYM_HIDDEN		0x8000
+
+/* This is the mask for the rest of the Versym information.  */
+
+#define VERSYM_VERSION		0x7fff
+
+/* This is a special token which appears as part of a symbol name.  It
+   indictes that the rest of the name is actually the name of a
+   version node, and is not part of the actual name.  This is a GNU
+   extension.  For example, the symbol name `stat@ver2' is taken to
+   mean the symbol `stat' in version `ver2'.  */
+
+#define ELF_VER_CHR	'@'
+
+/* Possible values for si_boundto.  */
+
+#define SYMINFO_BT_SELF		0xffff	/* Symbol bound to self */
+#define SYMINFO_BT_PARENT	0xfffe	/* Symbol bound to parent */
+#define SYMINFO_BT_LOWRESERVE	0xff00	/* Beginning of reserved entries */
+
+/* Possible bitmasks for si_flags.  */
+
+#define SYMINFO_FLG_DIRECT	0x0001	/* Direct bound symbol */
+#define SYMINFO_FLG_PASSTHRU	0x0002	/* Pass-thru symbol for translator */
+#define SYMINFO_FLG_COPY	0x0004	/* Symbol is a copy-reloc */
+#define SYMINFO_FLG_LAZYLOAD	0x0008	/* Symbol bound to object to be lazy loaded */
+
+/* Syminfo version values.  */
+
+#define SYMINFO_NONE		0
+#define SYMINFO_CURRENT		1
+#define SYMINFO_NUM		2
+
+/* Section Group Flags.	 */
+
+#define GRP_COMDAT		0x1	/* A COMDAT group */
+
+/* Auxv a_type values.  */
+
+#define AT_NULL		0		/* End of vector */
+#define AT_IGNORE	1		/* Entry should be ignored */
+#define AT_EXECFD	2		/* File descriptor of program */
+#define AT_PHDR		3		/* Program headers for program */
+#define AT_PHENT	4		/* Size of program header entry */
+#define AT_PHNUM	5		/* Number of program headers */
+#define AT_PAGESZ	6		/* System page size */
+#define AT_BASE		7		/* Base address of interpreter */
+#define AT_FLAGS	8		/* Flags */
+#define AT_ENTRY	9		/* Entry point of program */
+#define AT_NOTELF	10		/* Program is not ELF */
+#define AT_UID		11		/* Real uid */
+#define AT_EUID		12		/* Effective uid */
+#define AT_GID		13		/* Real gid */
+#define AT_EGID		14		/* Effective gid */
+#define AT_CLKTCK	17		/* Frequency of times() */
+#define AT_PLATFORM	15		/* String identifying platform.  */
+#define AT_HWCAP	16		/* Machine dependent hints about
+					   processor capabilities.  */
+#define AT_FPUCW	18		/* Used FPU control word.  */
+#define AT_DCACHEBSIZE	19		/* Data cache block size.  */
+#define AT_ICACHEBSIZE	20		/* Instruction cache block size.  */
+#define AT_UCACHEBSIZE	21		/* Unified cache block size.  */
+#define AT_IGNOREPPC	22		/* Entry should be ignored */
+#define	AT_SECURE	23		/* Boolean, was exec setuid-like?  */
+#define AT_BASE_PLATFORM 24		/* String identifying real platform,
+					   may differ from AT_PLATFORM.  */
+#define AT_RANDOM	25		/* Address of 16 random bytes.  */
+#define AT_EXECFN	31		/* Filename of executable.  */
+/* Pointer to the global system page used for system calls and other
+   nice things.  */
+#define AT_SYSINFO	32
+#define AT_SYSINFO_EHDR	33 /* Pointer to ELF header of system-supplied DSO.  */
+
+#define AT_SUN_UID      2000    /* Effective user ID.  */
+#define AT_SUN_RUID     2001    /* Real user ID.  */
+#define AT_SUN_GID      2002    /* Effective group ID.  */
+#define AT_SUN_RGID     2003    /* Real group ID.  */
+#define AT_SUN_LDELF    2004    /* Dynamic linker's ELF header.  */
+#define AT_SUN_LDSHDR   2005    /* Dynamic linker's section headers.  */
+#define AT_SUN_LDNAME   2006    /* String giving name of dynamic linker.  */
+#define AT_SUN_LPAGESZ  2007    /* Large pagesize.   */
+#define AT_SUN_PLATFORM 2008    /* Platform name string.  */
+#define AT_SUN_HWCAP    2009	/* Machine dependent hints about
+				   processor capabilities.  */
+#define AT_SUN_IFLUSH   2010    /* Should flush icache? */
+#define AT_SUN_CPU      2011    /* CPU name string.  */
+#define AT_SUN_EMUL_ENTRY 2012	/* COFF entry point address.  */
+#define AT_SUN_EMUL_EXECFD 2013	/* COFF executable file descriptor.  */
+#define AT_SUN_EXECNAME 2014    /* Canonicalized file name given to execve.  */
+#define AT_SUN_MMU      2015    /* String for name of MMU module.   */
+#define AT_SUN_LDDATA   2016    /* Dynamic linker's data segment address.  */
+#define AT_SUN_AUXFLAGS	2017	/* AF_SUN_ flags passed from the kernel.  */
+
+
+#endif /* _ELF_COMMON_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/cr16.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/cr16.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/cr16.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/cr16.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,62 @@
+/* CR16 ELF support for BFD.
+   Copyright 2007, 2010 Free Software Foundation, Inc.
+   Contributed by M R Swami Reddy.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_CR16_H
+#define _ELF_CR16_H
+
+#include "elf/reloc-macros.h"
+
+/* Creating indices for reloc_map_index array.  */
+START_RELOC_NUMBERS(elf_cr16_reloc_type)
+  RELOC_NUMBER (R_CR16_NONE,           0)
+  RELOC_NUMBER (R_CR16_NUM8,           1)
+  RELOC_NUMBER (R_CR16_NUM16,          2)
+  RELOC_NUMBER (R_CR16_NUM32,          3)
+  RELOC_NUMBER (R_CR16_NUM32a,         4)
+  RELOC_NUMBER (R_CR16_REGREL4,        5)
+  RELOC_NUMBER (R_CR16_REGREL4a,       6)
+  RELOC_NUMBER (R_CR16_REGREL14,       7)
+  RELOC_NUMBER (R_CR16_REGREL14a,      8)
+  RELOC_NUMBER (R_CR16_REGREL16,       9)
+  RELOC_NUMBER (R_CR16_REGREL20,       10)
+  RELOC_NUMBER (R_CR16_REGREL20a,      11)
+  RELOC_NUMBER (R_CR16_ABS20,          12)
+  RELOC_NUMBER (R_CR16_ABS24,          13)
+  RELOC_NUMBER (R_CR16_IMM4,           14)
+  RELOC_NUMBER (R_CR16_IMM8,           15)
+  RELOC_NUMBER (R_CR16_IMM16,          16)
+  RELOC_NUMBER (R_CR16_IMM20,          17)
+  RELOC_NUMBER (R_CR16_IMM24,          18)
+  RELOC_NUMBER (R_CR16_IMM32,          19)
+  RELOC_NUMBER (R_CR16_IMM32a,         20)
+  RELOC_NUMBER (R_CR16_DISP4,          21)
+  RELOC_NUMBER (R_CR16_DISP8,          22)
+  RELOC_NUMBER (R_CR16_DISP16,         23)
+  RELOC_NUMBER (R_CR16_DISP24,         24)
+  RELOC_NUMBER (R_CR16_DISP24a,        25)
+  RELOC_NUMBER (R_CR16_SWITCH8,        26)
+  RELOC_NUMBER (R_CR16_SWITCH16,       27)
+  RELOC_NUMBER (R_CR16_SWITCH32,       28)
+  RELOC_NUMBER (R_CR16_GOT_REGREL20,   29)
+  RELOC_NUMBER (R_CR16_GOTC_REGREL20,  30)
+  RELOC_NUMBER (R_CR16_GLOB_DAT,       31)
+END_RELOC_NUMBERS(R_CR16_MAX)
+        
+#endif /* _ELF_CR16_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/cr16c.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/cr16c.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/cr16c.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/cr16c.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,258 @@
+/* CR16C ELF support for BFD.
+   Copyright 2004, 2008, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_CR16C_H
+#define _ELF_CR16C_H
+
+#include "bfd.h"
+#include "elf/reloc-macros.h"
+
+/* Creating indices for reloc_map_index array.  */
+START_RELOC_NUMBERS (elf_cr16c_reloc_type)
+     RELOC_NUMBER (RINDEX_16C_NUM08,		0)
+     RELOC_NUMBER (RINDEX_16C_NUM08_C,		1)
+     RELOC_NUMBER (RINDEX_16C_NUM16,		2)
+     RELOC_NUMBER (RINDEX_16C_NUM16_C,		3)
+     RELOC_NUMBER (RINDEX_16C_NUM32,		4)
+     RELOC_NUMBER (RINDEX_16C_NUM32_C,		5)
+     RELOC_NUMBER (RINDEX_16C_DISP04,		6)
+     RELOC_NUMBER (RINDEX_16C_DISP04_C,		7)
+     RELOC_NUMBER (RINDEX_16C_DISP08,		8)
+     RELOC_NUMBER (RINDEX_16C_DISP08_C,		9)
+     RELOC_NUMBER (RINDEX_16C_DISP16,		10)
+     RELOC_NUMBER (RINDEX_16C_DISP16_C,		11)
+     RELOC_NUMBER (RINDEX_16C_DISP24,		12)
+     RELOC_NUMBER (RINDEX_16C_DISP24_C,		13)
+     RELOC_NUMBER (RINDEX_16C_DISP24a,		14)
+     RELOC_NUMBER (RINDEX_16C_DISP24a_C,	15)
+     RELOC_NUMBER (RINDEX_16C_REG04,		16)
+     RELOC_NUMBER (RINDEX_16C_REG04_C,		17)
+     RELOC_NUMBER (RINDEX_16C_REG04a,		18)
+     RELOC_NUMBER (RINDEX_16C_REG04a_C,		19)
+     RELOC_NUMBER (RINDEX_16C_REG14,		20)
+     RELOC_NUMBER (RINDEX_16C_REG14_C,		21)
+     RELOC_NUMBER (RINDEX_16C_REG16,		22)
+     RELOC_NUMBER (RINDEX_16C_REG16_C,		23)
+     RELOC_NUMBER (RINDEX_16C_REG20,		24)
+     RELOC_NUMBER (RINDEX_16C_REG20_C,		25)
+     RELOC_NUMBER (RINDEX_16C_ABS20,		26)
+     RELOC_NUMBER (RINDEX_16C_ABS20_C,		27)
+     RELOC_NUMBER (RINDEX_16C_ABS24,		28)
+     RELOC_NUMBER (RINDEX_16C_ABS24_C,		29)
+     RELOC_NUMBER (RINDEX_16C_IMM04,		30)
+     RELOC_NUMBER (RINDEX_16C_IMM04_C,		31)
+     RELOC_NUMBER (RINDEX_16C_IMM16,		32)
+     RELOC_NUMBER (RINDEX_16C_IMM16_C,		33)
+     RELOC_NUMBER (RINDEX_16C_IMM20,		34)
+     RELOC_NUMBER (RINDEX_16C_IMM20_C,		35)
+     RELOC_NUMBER (RINDEX_16C_IMM24,		36)
+     RELOC_NUMBER (RINDEX_16C_IMM24_C,		37)
+     RELOC_NUMBER (RINDEX_16C_IMM32,		38)
+     RELOC_NUMBER (RINDEX_16C_IMM32_C,		39)
+END_RELOC_NUMBERS (RINDEX_16C_MAX)
+
+/* CR16C Relocation Types ('cr_reloc_type' entry in the reloc_map structure).
+   The relocation constant name is determined as follows :
+
+   R_16C_<format><size>[_C]
+
+   Where :
+
+     <format> is one of the following:
+	NUM  - R_NUMBER mnemonic,
+	DISP - R_16C_DISPL mnemonic,
+	REG  - R_16C_REGREL mnemonic,
+	ABS  - R_16C_ABS mnemonic,
+	IMM  - R_16C_IMMED mnemonic,
+     <size> stands for R_S_16C_<size> 
+     _C means 'code label' and is only added when R_ADDRTYPE subfield 
+     is of type R_CODE_ADDR.  */
+   
+/* The table below shows what the hex digits in the definition of the
+   relocation type constants correspond to.
+   ------------------------------------------------------------------
+	R_SIZESP	R_FORMAT	R_RELTO	      R_ADDRTYPE
+   ------------------------------------------------------------------  */
+/*	R_S_16C_08	R_NUMBER 	R_ABS 	      R_ADDRESS */
+#define R_16C_NUM08	0X0001
+
+/*	R_S_16C_08	R_NUMBER 	R_ABS 	      R_CODE_ADDR */
+#define R_16C_NUM08_C	0X0006
+
+/*	R_S_16C_16	R_NUMBER 	R_ABS 	      R_ADDRESS */
+#define R_16C_NUM16	0X1001
+
+/*	R_S_16C_16	R_NUMBER 	R_ABS 	      R_CODE_ADDR */
+#define R_16C_NUM16_C 	0X1006
+
+/*      R_S_16C_32      R_NUMBER	R_ABS	      R_ADDRESS */
+#define R_16C_NUM32     0X2001
+
+/*      R_S_16C_32      R_NUMBER	R_ABS	      R_CODE_ADDR */
+#define R_16C_NUM32_C   0X2006
+
+/*	R_S_16C_04	R_16C_DISPL 	R_PCREL	      R_ADDRESS */
+#define R_16C_DISP04	0X5411
+
+/*	R_S_16C_04	R_16C_DISPL 	R_PCREL	      R_CODE_ADDR */
+#define R_16C_DISP04_C	0X5416
+
+/*	R_S_16C_08	R_16C_DISPL 	R_PCREL	      R_ADDRESS */
+#define R_16C_DISP08	0X0411
+
+/*	R_S_16C_08	R_16C_DISPL 	R_PCREL	      R_CODE_ADDR */
+#define R_16C_DISP08_C	0X0416
+
+/*	R_S_16C_16	R_16C_DISPL 	R_PCREL	      R_ADDRESS */
+#define R_16C_DISP16	0X1411
+
+/*	R_S_16C_16	R_16C_DISPL 	R_PCREL	      R_CODE_ADDR */
+#define R_16C_DISP16_C	0X1416
+
+/*	R_S_16C_24	R_16C_DISPL 	R_PCREL	      R_ADDRESS */
+#define R_16C_DISP24	0X7411
+
+/*	R_S_16C_24	R_16C_DISPL 	R_PCREL	      R_CODE_ADDR */
+#define R_16C_DISP24_C	0X7416
+
+/*	R_S_16C_24a	R_16C_DISPL 	R_PCREL	      R_ADDRESS */
+#define R_16C_DISP24a	0X6411
+
+/*	R_S_16C_24a	R_16C_DISPL 	R_PCREL	      R_CODE_ADDR */
+#define R_16C_DISP24a_C	0X6416
+
+/*	R_S_16C_04	R_16C_REGREL 	R_ABS 	      R_ADDRESS */
+#define R_16C_REG04	0X5201
+
+/*	R_S_16C_04	R_16C_REGREL 	R_ABS 	      R_CODE_ADDR */
+#define R_16C_REG04_C	0X5206
+
+/*	R_S_16C_04_a	R_16C_REGREL 	R_ABS 	      R_ADDRESS */
+#define R_16C_REG04a	0X4201
+
+/*	R_S_16C_04_a	R_16C_REGREL 	R_ABS 	      R_CODE_ADDR */
+#define R_16C_REG04a_C	0X4206
+
+/*	R_S_16C_14	R_16C_REGREL 	R_ABS 	      R_ADDRESS */
+#define R_16C_REG14	0X3201
+
+/*	R_S_16C_14	R_16C_REGREL 	R_ABS 	      R_CODE_ADDR */
+#define R_16C_REG14_C	0X3206
+
+/*	R_S_16C_16	R_16C_REGREL 	R_ABS 	      R_ADDRESS */
+#define R_16C_REG16	0X1201
+
+/*	R_S_16C_16	R_16C_REGREL 	R_ABS 	      R_CODE_ADDR */
+#define R_16C_REG16_C	0X1206
+
+/*	R_S_16C_20	R_16C_REGREL 	R_ABS 	      R_ADDRESS */
+#define R_16C_REG20	0X8201
+
+/*	R_S_16C_20	R_16C_REGREL 	R_ABS 	      R_CODE_ADDR */
+#define R_16C_REG20_C	0X8206
+
+/*      R_S_16C_20      R_16C_ABS	R_ABS	      R_ADDRESS */
+#define R_16C_ABS20     0X8101
+
+/*      R_S_16C_20      R_16C_ABS	R_ABS	      R_CODE_ADDR */
+#define R_16C_ABS20_C   0X8106
+
+/*      R_S_16C_24      R_16C_ABS	R_ABS	      R_ADDRESS */
+#define R_16C_ABS24     0X7101
+
+/*      R_S_16C_24      R_16C_ABS	R_ABS	      R_CODE_ADDR */
+#define R_16C_ABS24_C   0X7106
+
+/*      R_S_16C_04      R_16C_IMMED	R_ABS	      R_ADDRESS */
+#define R_16C_IMM04     0X5301
+
+/*      R_S_16C_04      R_16C_IMMED	R_ABS	      R_CODE_ADDR */
+#define R_16C_IMM04_C   0X5306
+
+/*      R_S_16C_16      R_16C_IMMED	R_ABS	      R_ADDRESS */
+#define R_16C_IMM16     0X1301
+
+/*      R_S_16C_16      R_16C_IMMED	R_ABS	      R_CODE_ADDR */
+#define R_16C_IMM16_C   0X1306
+
+/*      R_S_16C_20      R_16C_IMMED	R_ABS	      R_ADDRESS */
+#define R_16C_IMM20     0X8301
+
+/*      R_S_16C_20      R_16C_IMMED	R_ABS	      R_CODE_ADDR */
+#define R_16C_IMM20_C   0X8306
+
+/*      R_S_16C_24      R_16C_IMMED	R_ABS	      R_ADDRESS */
+#define R_16C_IMM24     0X7301
+
+/*      R_S_16C_24      R_16C_IMMED	R_ABS	      R_CODE_ADDR */
+#define R_16C_IMM24_C   0X7306
+
+/*      R_S_16C_32      R_16C_IMMED	R_ABS	      R_ADDRESS */
+#define R_16C_IMM32     0X2301
+
+/*      R_S_16C_32      R_16C_IMMED	R_ABS	      R_CODE_ADDR */
+#define R_16C_IMM32_C   0X2306
+
+
+/* Relocation item type.  */
+#define   R_ADDRTYPE	 0x000f
+#define   R_ADDRESS      0x0001    /* Take address of symbol.  */
+#define   R_CODE_ADDR    0x0006    /* Take address of symbol divided by 2.  */
+
+/* Relocation action.  */
+#define   R_RELTO        0x00f0
+#define   R_ABS          0x0000    /* Keep symbol's address as such.  */
+#define   R_PCREL        0x0010    /* Subtract the pc address of hole.  */
+
+/* Relocation item data format.  */
+#define   R_FORMAT       0x0f00
+#define   R_NUMBER       0x0000    /* Retain as two's complement value.  */
+#define   R_16C_DISPL    0x0400    /* CR16C displacement type.  */
+#define   R_16C_ABS      0x0100    /* CR16C absolute type.  */
+#define   R_16C_REGREL   0x0200    /* CR16C register-relative type.  */
+#define   R_16C_IMMED    0x0300    /* CR16C immediate type.  */
+
+/* Relocation item size. */
+#define   R_SIZESP       0xf000
+#define   R_S_16C_04     0x5000
+#define   R_S_16C_04_a   0x4000
+#define   R_S_16C_08	 0x0000
+#define   R_S_16C_14     0x3000
+#define   R_S_16C_16	 0x1000
+#define   R_S_16C_20     0x8000
+#define   R_S_16C_24_a   0x6000
+#define   R_S_16C_24	 0x7000
+#define   R_S_16C_32     0x2000
+
+
+/* Processor specific section indices.  These sections do not actually
+   exist.  Symbols with a st_shndx field corresponding to one of these
+   values have a special meaning.  */
+
+/* Far common symbol.  */
+#define SHN_CR16C_FCOMMON	SHN_LORESERVE
+#define SHN_CR16C_NCOMMON	(SHN_LORESERVE + 1)
+
+typedef struct reloc_map
+{
+  unsigned short            cr_reloc_type;  /* CR relocation type.  */
+  bfd_reloc_code_real_type  bfd_reloc_enum; /* BFD relocation enum.  */
+} RELOC_MAP;
+
+#endif /* _ELF_CR16C_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/cris.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/cris.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/cris.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/cris.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,193 @@
+/* CRIS ELF support for BFD.
+   Copyright 2000, 2001, 2004, 2010  Free Software Foundation, Inc.
+   Contributed by Axis Communications AB, Lund, Sweden.
+   Written by Hans-Peter Nilsson.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_CRIS_H
+#define _ELF_CRIS_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_cris_reloc_type)
+  RELOC_NUMBER (R_CRIS_NONE,		0)
+  RELOC_NUMBER (R_CRIS_8,		1)
+  RELOC_NUMBER (R_CRIS_16,		2)
+  RELOC_NUMBER (R_CRIS_32,		3)
+
+  /* The "PC" position is the location right after the relocation.  */
+  RELOC_NUMBER (R_CRIS_8_PCREL,		4)
+  RELOC_NUMBER (R_CRIS_16_PCREL,	5)
+  RELOC_NUMBER (R_CRIS_32_PCREL,	6)
+
+  RELOC_NUMBER (R_CRIS_GNU_VTINHERIT,	7)
+  RELOC_NUMBER (R_CRIS_GNU_VTENTRY,	8)
+
+  /* Copy contents at dynlinking.  Generated by the linker.
+     The BFD equivalent is BFD_RELOC_CRIS_COPY.  */
+  RELOC_NUMBER (R_CRIS_COPY, 9)
+
+  /* Create GOT entry.  Generated by the linker.
+     The BFD equivalent is BFD_RELOC_CRIS_GLOB_DAT.  */
+  RELOC_NUMBER (R_CRIS_GLOB_DAT, 10)
+
+  /* Create PLT entry.  Generated by the linker.
+     The BFD equivalent is BFD_RELOC_CRIS_JUMP_SLOT.  */
+  RELOC_NUMBER (R_CRIS_JUMP_SLOT, 11)
+
+  /* Adjust by program base.  Generated by the linker.
+     The BFD equivalent is BFD_RELOC_CRIS_RELATIVE.  */
+  RELOC_NUMBER (R_CRIS_RELATIVE, 12)
+
+  /* A 16-bit offset to entry in GOT and request to create GOT entry for
+     that symbol.
+     The BFD equivalent is BFD_RELOC_CRIS_16_GOT.  */
+  RELOC_NUMBER (R_CRIS_16_GOT, 13)
+
+  /* A 32-bit offset to entry in GOT and request to create GOT entry for
+     that symbol.
+     The BFD equivalent is BFD_RELOC_CRIS_32_GOT.  */
+  RELOC_NUMBER (R_CRIS_32_GOT, 14)
+
+  /* A 16-bit offset to entry in PLT part of GOT and request to create PLT
+     entry for that symbol.
+     The BFD equivalent is BFD_RELOC_CRIS_16_GOTPLT.  */
+  RELOC_NUMBER (R_CRIS_16_GOTPLT, 15)
+
+  /* A 32-bit offset to entry in PLT part of GOT and request to create PLT
+     entry for that symbol.
+     The BFD equivalent is BFD_RELOC_CRIS_32_GOTPLT.  */
+  RELOC_NUMBER (R_CRIS_32_GOTPLT, 16)
+
+  /* A 32-bit offset from GOT to (local) symbol: no GOT entry should be
+     necessary.
+     The BFD equivalent is BFD_RELOC_CRIS_32_GOTREL.  */
+  RELOC_NUMBER (R_CRIS_32_GOTREL, 17)
+
+  /* A 32-bit offset from GOT to entry for this symbol in PLT and request
+     to create PLT entry for symbol.
+     The BFD equivalent is BFD_RELOC_CRIS_32_GOTREL.  */
+  RELOC_NUMBER (R_CRIS_32_PLT_GOTREL, 18)
+
+  /* A 32-bit offset from location after this relocation (addend specifies
+     offset) to entry for this symbol in PLT and request to create PLT
+     entry for symbol.
+     The BFD equivalent is BFD_RELOC_CRIS_32_PLT_PCREL.  */
+  RELOC_NUMBER (R_CRIS_32_PLT_PCREL, 19)
+
+  /* An assembler-generated-only relocation, instructing the linker to
+     reserve two GOT slots, carrying the R_CRIS_DTP relocation for the
+     symbol (pointing to the first slot, the relocation fills in
+     both).  The value is a 32-bit-value, relative to the start of the
+     GOT.  Assembly syntax: "sym:GDGOTREL".  */
+  RELOC_NUMBER (R_CRIS_32_GOT_GD, 20)
+
+  /* Similar to R_CRIS_32_GOT_GD, but the value is a 16-bit unsigned
+     number, limiting access to 65536/4 global symbols per module (or
+     65536/8 thread variables; loosely speaking G*4+T*8 < 65536, where
+     T is the number of thread variables and G is the number of other
+     external global variables and functions).  Assembly syntax:
+     "sym:GDGOTREL16".  */
+  RELOC_NUMBER (R_CRIS_16_GOT_GD, 21)
+
+  /* Similar to R_CRIS_32_GOT_GD, but the value is the absolute
+     address of the GOT entry.  Disallowed in DSOs created with
+     -shared.  Assembly syntax: "sym:GD".  */
+  RELOC_NUMBER (R_CRIS_32_GD, 22)
+
+  /* A linker-generated-only relocation, instructing the dynamic
+     linker to fill in the module ID and module-relative-TLS-block
+     offset of the symbol in question, used for GOT entries.  Note
+     that this relocation instructs to fill in two 32-bit values.  */
+  RELOC_NUMBER (R_CRIS_DTP, 23)
+
+  /* An assembler-generated-only relocation, instructing the linker to
+     reserve the first two GOT slots, and attach the R_CRIS_DTPMOD
+     relocation(*) for the module to the first slot, the second
+     containing zero.  The value is 32 bits, the offset from the start
+     of the TLS block of the module to the thread-local symbol
+     mentioned in the relocation.  This relocation must only be applied
+     to module-local symbols.  Assembly syntax: "expr:DTPREL".  */
+  RELOC_NUMBER (R_CRIS_32_DTPREL, 24)
+
+  /* Similar to R_CRIS_32_DTPREL, but the value is a 16-bit signed
+     number, limiting the size of thread-variables of the DSO to 32768
+     bytes.  (Note: matches both model 1 and 2 and allows use of addo.w
+     as the instruction where this relocation is used.)  Assembly
+     syntax: "expr:DTPREL16".  */
+  RELOC_NUMBER (R_CRIS_16_DTPREL, 25)
+
+  /* An assembler-generated-only relocation, instructing the linker to
+     reserve a GOT slot and attach the R_CRIS_32_TPREL relocation for
+     the symbol in question.  The value is 32 bits, which is the
+     GOT-relative offset of the slot.  Assembly syntax:
+     "sym:TPOFFGOT".  */
+  RELOC_NUMBER (R_CRIS_32_GOT_TPREL, 26)
+
+  /* Similar to R_CRIS_32_TPREL, but the value is a 16-bit positive
+     number, limiting the number of thread- and global variables of
+     the DSO to 32768/4.  Assembly syntax: "sym:TPOFFGOT16".  */
+  RELOC_NUMBER (R_CRIS_16_GOT_TPREL, 27)
+
+  /* An assembler- and linker-generated relocation, instructing to
+     resolve the symbol in question yielding the TLS offset of the
+     thread variable, relative to the global TLS block.  Not allowed
+     as input when generating a DSO.  Assembly syntax:
+     "expr:TPOFF".  */
+  RELOC_NUMBER (R_CRIS_32_TPREL, 28)
+
+  /* Similar to R_CRIS_32_TPREL, but only applicable to executables
+     compiled with -msmall-tls. Not allowed in a DSO. The value is a
+     16-bit signed number, limiting the size of thread-variables of
+     the executable to 32768 bytes. (Note: being signed makes it match
+     both model 1 and 2 and allows use of addo.w as the instruction
+     where this relocation is applied.)  Assembly syntax:
+     "expr:TPOFF16".  */
+  RELOC_NUMBER (R_CRIS_16_TPREL, 29)
+
+  /* A linker-generated-only relocation, instructing the dynamic
+     linker to fill in the current module ID, used for GOT entries
+     (usually the fourth one).  */
+  RELOC_NUMBER (R_CRIS_DTPMOD, 30)
+
+  /* Similar to R_CRIS_32_GOT_TPREL, but the value is the absolute
+     address of the GOT entry.  Disallowed in DSOs created with
+     -shared.  Assembly syntax: "sym:IE".  */
+  RELOC_NUMBER (R_CRIS_32_IE, 31)
+
+  /* No other relocs must be visible outside the assembler.  */
+
+END_RELOC_NUMBERS (R_CRIS_max)
+
+/* User symbols in this file have a leading underscore.  */
+#define EF_CRIS_UNDERSCORE		0x00000001
+
+/* This is a mask for different incompatible machine variants.  */
+#define EF_CRIS_VARIANT_MASK		0x0000000e
+
+/* Variant 0; may contain v0..10 object.  */
+#define EF_CRIS_VARIANT_ANY_V0_V10	0x00000000
+
+/* Variant 1; contains v32 object.  */
+#define EF_CRIS_VARIANT_V32		0x00000002
+
+/* Variant 2; contains object compatible with v32 and v10.  */
+#define EF_CRIS_VARIANT_COMMON_V10_V32	0x00000004
+
+#endif /* _ELF_CRIS_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/crx.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/crx.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/crx.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/crx.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,53 @@
+/* CRX ELF support for BFD.
+   Copyright 2004, 2010 Free Software Foundation, Inc.
+   Contributed by Tomer Levi, NSC, Israel.
+   Originally written for GAS 2.12 by Tomer Levi, NSC, Israel.
+   Updates, BFDizing, GNUifying and ELF support by Tomer Levi.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_CRX_H
+#define _ELF_CRX_H
+
+#include "elf/reloc-macros.h"
+
+/* Creating indices for reloc_map_index array.  */
+START_RELOC_NUMBERS(elf_crx_reloc_type)
+  RELOC_NUMBER (R_CRX_NONE,           0)
+  RELOC_NUMBER (R_CRX_REL4,           1)
+  RELOC_NUMBER (R_CRX_REL8,           2)
+  RELOC_NUMBER (R_CRX_REL8_CMP,       3)
+  RELOC_NUMBER (R_CRX_REL16,          4)
+  RELOC_NUMBER (R_CRX_REL24,          5)
+  RELOC_NUMBER (R_CRX_REL32,          6)
+  RELOC_NUMBER (R_CRX_REGREL12,       7)
+  RELOC_NUMBER (R_CRX_REGREL22,       8)
+  RELOC_NUMBER (R_CRX_REGREL28,       9)
+  RELOC_NUMBER (R_CRX_REGREL32,       10)
+  RELOC_NUMBER (R_CRX_ABS16,          11)
+  RELOC_NUMBER (R_CRX_ABS32,          12)
+  RELOC_NUMBER (R_CRX_NUM8,	      13)
+  RELOC_NUMBER (R_CRX_NUM16,          14)
+  RELOC_NUMBER (R_CRX_NUM32,          15)
+  RELOC_NUMBER (R_CRX_IMM16,	      16)
+  RELOC_NUMBER (R_CRX_IMM32,	      17)
+  RELOC_NUMBER (R_CRX_SWITCH8,	      18)
+  RELOC_NUMBER (R_CRX_SWITCH16,	      19)
+  RELOC_NUMBER (R_CRX_SWITCH32,	      20)
+END_RELOC_NUMBERS(R_CRX_MAX)
+	
+#endif /* _ELF_CRX_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/d10v.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/d10v.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/d10v.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/d10v.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,38 @@
+/* d10v ELF support for BFD.
+   Copyright 1998, 2000, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_D10V_H
+#define _ELF_D10V_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocation types.  */
+START_RELOC_NUMBERS (elf_d10v_reloc_type)
+  RELOC_NUMBER (R_D10V_NONE, 0)
+  RELOC_NUMBER (R_D10V_10_PCREL_R, 1)
+  RELOC_NUMBER (R_D10V_10_PCREL_L, 2)
+  RELOC_NUMBER (R_D10V_16, 3)
+  RELOC_NUMBER (R_D10V_18, 4)
+  RELOC_NUMBER (R_D10V_18_PCREL, 5)
+  RELOC_NUMBER (R_D10V_32, 6)
+  RELOC_NUMBER (R_D10V_GNU_VTINHERIT, 7)
+  RELOC_NUMBER (R_D10V_GNU_VTENTRY, 8)
+END_RELOC_NUMBERS (R_D10V_max)
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/d30v.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/d30v.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/d30v.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/d30v.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,42 @@
+/* d30v ELF support for BFD.
+   Copyright 1998, 2000, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_D30V_H
+#define _ELF_D30V_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_d30v_reloc_type)
+  RELOC_NUMBER (R_D30V_NONE, 0)
+  RELOC_NUMBER (R_D30V_6, 1)
+  RELOC_NUMBER (R_D30V_9_PCREL, 2)
+  RELOC_NUMBER (R_D30V_9_PCREL_R, 3)
+  RELOC_NUMBER (R_D30V_15, 4)
+  RELOC_NUMBER (R_D30V_15_PCREL, 5)
+  RELOC_NUMBER (R_D30V_15_PCREL_R, 6)
+  RELOC_NUMBER (R_D30V_21, 7)
+  RELOC_NUMBER (R_D30V_21_PCREL, 8)
+  RELOC_NUMBER (R_D30V_21_PCREL_R, 9)
+  RELOC_NUMBER (R_D30V_32, 10)
+  RELOC_NUMBER (R_D30V_32_PCREL, 11)
+  RELOC_NUMBER (R_D30V_32_NORMAL, 12)
+END_RELOC_NUMBERS (R_D30V_max)
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/dlx.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/dlx.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/dlx.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/dlx.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,53 @@
+/* DLX support for BFD.
+   Copyright 2002, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_DLX_H
+#define _ELF_DLX_H
+
+#include "elf/reloc-macros.h"
+
+#if 0
+START_RELOC_NUMBERS (elf_dlx_reloc_type)
+     RELOC_NUMBER (R_DLX_NONE,            0)
+     RELOC_NUMBER (R_DLX_RELOC_16,        1)
+     RELOC_NUMBER (R_DLX_RELOC_26,        2)
+     RELOC_NUMBER (R_DLX_RELOC_32,        3)
+     RELOC_NUMBER (R_DLX_GNU_VTINHERIT,   4)
+     RELOC_NUMBER (R_DLX_GNU_VTENTRY,     5)
+     RELOC_NUMBER (R_DLX_RELOC_16_HI,     6)
+     RELOC_NUMBER (R_DLX_RELOC_16_LO,     7)
+     RELOC_NUMBER (R_DLX_RELOC_16_PCREL,  8)
+     RELOC_NUMBER (R_DLX_RELOC_26_PCREL,  9)
+END_RELOC_NUMBERS (R_DLX_max)
+#else
+START_RELOC_NUMBERS (elf_dlx_reloc_type)
+     RELOC_NUMBER (R_DLX_NONE,            0)
+     RELOC_NUMBER (R_DLX_RELOC_8,         1)
+     RELOC_NUMBER (R_DLX_RELOC_16,        2)
+     RELOC_NUMBER (R_DLX_RELOC_32,        3)
+     RELOC_NUMBER (R_DLX_GNU_VTINHERIT,   4)
+     RELOC_NUMBER (R_DLX_GNU_VTENTRY,     5)
+     RELOC_NUMBER (R_DLX_RELOC_16_HI,     6)
+     RELOC_NUMBER (R_DLX_RELOC_16_LO,     7)
+     RELOC_NUMBER (R_DLX_RELOC_16_PCREL,  8)
+     RELOC_NUMBER (R_DLX_RELOC_26_PCREL,  9)
+END_RELOC_NUMBERS (R_DLX_max)
+#endif /* 0 */
+
+#endif /* _ELF_DLX_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/dwarf.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/dwarf.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/dwarf.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/dwarf.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,323 @@
+/* Declarations and definitions of codes relating to the DWARF symbolic
+   debugging information format.
+
+   Written by Ron Guilmette (rfg@netcom.com)
+
+   Copyright 1992, 1993, 1995, 1999, 2005, 2010 Free Software Foundation, Inc.
+
+   This file is part of both GCC and the BFD library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GCC; see the file COPYING3.  If not, write to the Free
+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+/* This file is derived from the DWARF specification (a public document)
+   Revision 1.0.1 (April 8, 1992) developed by the UNIX International
+   Programming Languages Special Interest Group (UI/PLSIG) and distributed
+   by UNIX International.  Copies of this specification are available from
+   UNIX International, 20 Waterview Boulevard, Parsippany, NJ, 07054.  */
+
+#ifndef _ELF_DWARF_H
+#define _ELF_DWARF_H
+
+/* Tag names and codes.  */
+
+enum dwarf_tag {
+    TAG_padding			= 0x0000,
+    TAG_array_type		= 0x0001,
+    TAG_class_type		= 0x0002,
+    TAG_entry_point		= 0x0003,
+    TAG_enumeration_type	= 0x0004,
+    TAG_formal_parameter	= 0x0005,
+    TAG_global_subroutine	= 0x0006,
+    TAG_global_variable		= 0x0007,
+    				/* 0x0008 -- reserved */
+				/* 0x0009 -- reserved */
+    TAG_label			= 0x000a,
+    TAG_lexical_block		= 0x000b,
+    TAG_local_variable		= 0x000c,
+    TAG_member			= 0x000d,
+				/* 0x000e -- reserved */
+    TAG_pointer_type		= 0x000f,
+    TAG_reference_type		= 0x0010,
+    TAG_compile_unit		= 0x0011,
+    TAG_string_type		= 0x0012,
+    TAG_structure_type		= 0x0013,
+    TAG_subroutine		= 0x0014,
+    TAG_subroutine_type		= 0x0015,
+    TAG_typedef			= 0x0016,
+    TAG_union_type		= 0x0017,
+    TAG_unspecified_parameters	= 0x0018,
+    TAG_variant			= 0x0019,
+    TAG_common_block		= 0x001a,
+    TAG_common_inclusion	= 0x001b,
+    TAG_inheritance		= 0x001c,
+    TAG_inlined_subroutine	= 0x001d,
+    TAG_module			= 0x001e,
+    TAG_ptr_to_member_type	= 0x001f,
+    TAG_set_type		= 0x0020,
+    TAG_subrange_type		= 0x0021,
+    TAG_with_stmt		= 0x0022,
+
+    /* GNU extensions */
+
+    TAG_format_label		= 0x8000,  /* for FORTRAN 77 and Fortran 90 */
+    TAG_namelist		= 0x8001,  /* For Fortran 90 */
+    TAG_function_template	= 0x8002,  /* for C++ */
+    TAG_class_template		= 0x8003   /* for C++ */
+};
+
+#define TAG_lo_user	0x8000  /* implementation-defined range start */
+#define TAG_hi_user	0xffff  /* implementation-defined range end */
+#define TAG_source_file TAG_compile_unit  /* for backward compatibility */
+
+/* Form names and codes.  */
+
+enum dwarf_form {
+    FORM_ADDR	= 0x1,
+    FORM_REF	= 0x2,
+    FORM_BLOCK2	= 0x3,
+    FORM_BLOCK4	= 0x4,
+    FORM_DATA2	= 0x5,
+    FORM_DATA4	= 0x6,
+    FORM_DATA8	= 0x7,
+    FORM_STRING	= 0x8
+};
+
+/* Attribute names and codes.  */
+
+enum dwarf_attribute {
+    AT_sibling			= (0x0010|FORM_REF),
+    AT_location			= (0x0020|FORM_BLOCK2),
+    AT_name			= (0x0030|FORM_STRING),
+    AT_fund_type		= (0x0050|FORM_DATA2),
+    AT_mod_fund_type		= (0x0060|FORM_BLOCK2),
+    AT_user_def_type		= (0x0070|FORM_REF),
+    AT_mod_u_d_type		= (0x0080|FORM_BLOCK2),
+    AT_ordering			= (0x0090|FORM_DATA2),
+    AT_subscr_data		= (0x00a0|FORM_BLOCK2),
+    AT_byte_size		= (0x00b0|FORM_DATA4),
+    AT_bit_offset		= (0x00c0|FORM_DATA2),
+    AT_bit_size			= (0x00d0|FORM_DATA4),
+				/* (0x00e0|FORM_xxxx) -- reserved */
+    AT_element_list		= (0x00f0|FORM_BLOCK4),
+    AT_stmt_list		= (0x0100|FORM_DATA4),
+    AT_low_pc			= (0x0110|FORM_ADDR),
+    AT_high_pc			= (0x0120|FORM_ADDR),
+    AT_language			= (0x0130|FORM_DATA4),
+    AT_member			= (0x0140|FORM_REF),
+    AT_discr			= (0x0150|FORM_REF),
+    AT_discr_value		= (0x0160|FORM_BLOCK2),
+				/* (0x0170|FORM_xxxx) -- reserved */
+				/* (0x0180|FORM_xxxx) -- reserved */
+    AT_string_length		= (0x0190|FORM_BLOCK2),
+    AT_common_reference		= (0x01a0|FORM_REF),
+    AT_comp_dir			= (0x01b0|FORM_STRING),
+        AT_const_value_string	= (0x01c0|FORM_STRING),
+        AT_const_value_data2	= (0x01c0|FORM_DATA2),
+        AT_const_value_data4	= (0x01c0|FORM_DATA4),
+        AT_const_value_data8	= (0x01c0|FORM_DATA8),
+        AT_const_value_block2	= (0x01c0|FORM_BLOCK2),
+        AT_const_value_block4	= (0x01c0|FORM_BLOCK4),
+    AT_containing_type		= (0x01d0|FORM_REF),
+        AT_default_value_addr	= (0x01e0|FORM_ADDR),
+        AT_default_value_data2	= (0x01e0|FORM_DATA2),
+        AT_default_value_data4	= (0x01e0|FORM_DATA4),
+        AT_default_value_data8	= (0x01e0|FORM_DATA8),
+        AT_default_value_string	= (0x01e0|FORM_STRING),
+    AT_friends			= (0x01f0|FORM_BLOCK2),
+    AT_inline			= (0x0200|FORM_STRING),
+    AT_is_optional		= (0x0210|FORM_STRING),
+        AT_lower_bound_ref	= (0x0220|FORM_REF),
+        AT_lower_bound_data2	= (0x0220|FORM_DATA2),
+        AT_lower_bound_data4	= (0x0220|FORM_DATA4),
+        AT_lower_bound_data8	= (0x0220|FORM_DATA8),
+    AT_private			= (0x0240|FORM_STRING),
+    AT_producer			= (0x0250|FORM_STRING),
+    AT_program			= (0x0230|FORM_STRING),
+    AT_protected		= (0x0260|FORM_STRING),
+    AT_prototyped		= (0x0270|FORM_STRING),
+    AT_public			= (0x0280|FORM_STRING),
+    AT_pure_virtual		= (0x0290|FORM_STRING),
+    AT_return_addr		= (0x02a0|FORM_BLOCK2),
+    AT_abstract_origin		= (0x02b0|FORM_REF),
+    AT_start_scope		= (0x02c0|FORM_DATA4),
+    AT_stride_size		= (0x02e0|FORM_DATA4),
+        AT_upper_bound_ref	= (0x02f0|FORM_REF),
+        AT_upper_bound_data2	= (0x02f0|FORM_DATA2),
+        AT_upper_bound_data4	= (0x02f0|FORM_DATA4),
+        AT_upper_bound_data8	= (0x02f0|FORM_DATA8),
+    AT_virtual			= (0x0300|FORM_STRING),
+
+    /* GNU extensions.  */
+
+    AT_sf_names			= (0x8000|FORM_DATA4),
+    AT_src_info			= (0x8010|FORM_DATA4),
+    AT_mac_info			= (0x8020|FORM_DATA4),
+    AT_src_coords		= (0x8030|FORM_DATA4),
+    AT_body_begin		= (0x8040|FORM_ADDR),
+    AT_body_end			= (0x8050|FORM_ADDR)
+};
+
+#define AT_lo_user	0x2000	/* implementation-defined range start */
+#define AT_hi_user	0x3ff0	/* implementation-defined range end */
+
+/* Location atom names and codes.  */
+
+enum dwarf_location_atom {
+    OP_REG	= 0x01,
+    OP_BASEREG	= 0x02,
+    OP_ADDR	= 0x03,
+    OP_CONST	= 0x04,
+    OP_DEREF2	= 0x05,
+    OP_DEREF4	= 0x06,
+    OP_ADD	= 0x07,
+
+    /* GNU extensions.  */
+
+    OP_MULT	= 0x80
+};
+
+#define OP_LO_USER	0x80  /* implementation-defined range start */
+#define OP_HI_USER	0xff  /* implementation-defined range end */
+
+/* Fundamental type names and codes.  */
+
+enum dwarf_fundamental_type {
+    FT_char		= 0x0001,
+    FT_signed_char	= 0x0002,
+    FT_unsigned_char	= 0x0003,
+    FT_short		= 0x0004,
+    FT_signed_short	= 0x0005,
+    FT_unsigned_short	= 0x0006,
+    FT_integer		= 0x0007,
+    FT_signed_integer	= 0x0008,
+    FT_unsigned_integer	= 0x0009,
+    FT_long		= 0x000a,
+    FT_signed_long	= 0x000b,
+    FT_unsigned_long	= 0x000c,
+    FT_pointer		= 0x000d,  /* an alias for (void *) */
+    FT_float		= 0x000e,
+    FT_dbl_prec_float	= 0x000f,
+    FT_ext_prec_float	= 0x0010,  /* breaks "classic" svr4 SDB */
+    FT_complex		= 0x0011,  /* breaks "classic" svr4 SDB */
+    FT_dbl_prec_complex	= 0x0012,  /* breaks "classic" svr4 SDB */
+			/* 0x0013 -- reserved */
+    FT_void		= 0x0014,
+    FT_boolean		= 0x0015,  /* breaks "classic" svr4 SDB */
+    FT_ext_prec_complex	= 0x0016,  /* breaks "classic" svr4 SDB */
+    FT_label		= 0x0017,
+  
+    /* GNU extensions
+       The low order byte must indicate the size (in bytes) for the type.
+       All of these types will probably break "classic" svr4 SDB.  */
+
+    FT_long_long	= 0x8008,
+    FT_signed_long_long	= 0x8108,
+    FT_unsigned_long_long = 0x8208,
+
+    FT_int8		= 0x9001,
+    FT_signed_int8	= 0x9101,
+    FT_unsigned_int8	= 0x9201,
+    FT_int16		= 0x9302,
+    FT_signed_int16	= 0x9402,
+    FT_unsigned_int16	= 0x9502,
+    FT_int32		= 0x9604,
+    FT_signed_int32	= 0x9704,
+    FT_unsigned_int32	= 0x9804,
+    FT_int64		= 0x9908,
+    FT_signed_int64	= 0x9a08,
+    FT_unsigned_int64	= 0x9b08,
+    FT_int128		= 0x9c10,
+    FT_signed_int128	= 0x9d10,
+    FT_unsigned_int128	= 0x9e10,
+
+    FT_real32		= 0xa004,
+    FT_real64		= 0xa108,
+    FT_real96		= 0xa20c,
+    FT_real128		= 0xa310
+};
+
+#define FT_lo_user	0x8000  /* implementation-defined range start */
+#define FT_hi_user	0xffff  /* implementation defined range end */
+
+/* Type modifier names and codes.  */
+
+enum dwarf_type_modifier {
+    MOD_pointer_to	= 0x01,
+    MOD_reference_to	= 0x02,
+    MOD_const		= 0x03,
+    MOD_volatile	= 0x04
+};
+
+#define MOD_lo_user	0x80  /* implementation-defined range start */
+#define MOD_hi_user	0xff  /* implementation-defined range end */
+
+/* Array ordering names and codes.  */
+
+enum dwarf_array_dim_ordering {
+    ORD_row_major	= 0,
+    ORD_col_major	= 1
+};
+
+/* Array subscript format names and codes.  */
+
+enum dwarf_subscr_data_formats {
+    FMT_FT_C_C	= 0x0,
+    FMT_FT_C_X	= 0x1,
+    FMT_FT_X_C	= 0x2,
+    FMT_FT_X_X	= 0x3,
+    FMT_UT_C_C	= 0x4,
+    FMT_UT_C_X	= 0x5,
+    FMT_UT_X_C	= 0x6,
+    FMT_UT_X_X	= 0x7,
+    FMT_ET	= 0x8
+};
+
+/* Derived from above for ease of use.  */
+
+#define FMT_CODE(_FUNDAMENTAL_TYPE_P, _LB_CONST_P, _UB_CONST_P) \
+ (((_FUNDAMENTAL_TYPE_P) ? 0 : 4)	\
+  | ((_LB_CONST_P) ? 0 : 2)		\
+  | ((_UB_CONST_P) ? 0 : 1))
+
+/* Source language names and codes.  */
+
+enum dwarf_source_language {
+    LANG_C89		= 0x00000001,
+    LANG_C		= 0x00000002,
+    LANG_ADA83		= 0x00000003,
+    LANG_C_PLUS_PLUS	= 0x00000004,
+    LANG_COBOL74	= 0x00000005,
+    LANG_COBOL85	= 0x00000006,
+    LANG_FORTRAN77	= 0x00000007,
+    LANG_FORTRAN90	= 0x00000008,
+    LANG_PASCAL83	= 0x00000009,
+    LANG_MODULA2	= 0x0000000a,
+    LANG_JAVA		= 0x0000000b
+};
+
+#define LANG_lo_user	0x00008000  /* implementation-defined range start */
+#define LANG_hi_user	0x0000ffff  /* implementation-defined range end */
+
+/* Names and codes for GNU "macinfo" extension.  */
+
+enum dwarf_macinfo_record_type {
+    MACINFO_start	= 's',
+    MACINFO_resume	= 'r',
+    MACINFO_define	= 'd',
+    MACINFO_undef	= 'u'
+};
+
+#endif /* _ELF_DWARF_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/external.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/external.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/external.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/external.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,288 @@
+/* ELF support for BFD.
+   Copyright 1991, 1992, 1993, 1995, 1997, 1998, 1999, 2001, 2003, 2005,
+   2008, 2010 Free Software Foundation, Inc.
+
+   Written by Fred Fish @ Cygnus Support, from information published
+   in "UNIX System V Release 4, Programmers Guide: ANSI C and
+   Programming Support Tools".
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file is part of ELF support for BFD, and contains the portions
+   that describe how ELF is represented externally by the BFD library.
+   I.E. it describes the in-file representation of ELF.  It requires
+   the elf/common.h file which contains the portions that are common to
+   both the internal and external representations.  */
+
+/* The 64-bit stuff is kind of random.  Perhaps someone will publish a
+   spec someday.  */
+
+#ifndef _ELF_EXTERNAL_H
+#define _ELF_EXTERNAL_H
+
+/* Special section indices, which may show up in st_shndx fields, among
+   other places.  */
+
+#define SHN_LORESERVE	0xFF00		/* Begin range of reserved indices */
+#define SHN_LOPROC	0xFF00		/* Begin range of appl-specific */
+#define SHN_HIPROC	0xFF1F		/* End range of appl-specific */
+#define SHN_LOOS	0xFF20		/* OS specific semantics, lo */
+#define SHN_HIOS	0xFF3F		/* OS specific semantics, hi */
+#define SHN_ABS		0xFFF1		/* Associated symbol is absolute */
+#define SHN_COMMON	0xFFF2		/* Associated symbol is in common */
+#define SHN_XINDEX	0xFFFF		/* Section index is held elsewhere */
+#define SHN_HIRESERVE	0xFFFF		/* End range of reserved indices */
+
+/* ELF Header (32-bit implementations) */
+
+typedef struct {
+  unsigned char	e_ident[16];		/* ELF "magic number" */
+  unsigned char	e_type[2];		/* Identifies object file type */
+  unsigned char	e_machine[2];		/* Specifies required architecture */
+  unsigned char	e_version[4];		/* Identifies object file version */
+  unsigned char	e_entry[4];		/* Entry point virtual address */
+  unsigned char	e_phoff[4];		/* Program header table file offset */
+  unsigned char	e_shoff[4];		/* Section header table file offset */
+  unsigned char	e_flags[4];		/* Processor-specific flags */
+  unsigned char	e_ehsize[2];		/* ELF header size in bytes */
+  unsigned char	e_phentsize[2];		/* Program header table entry size */
+  unsigned char	e_phnum[2];		/* Program header table entry count */
+  unsigned char	e_shentsize[2];		/* Section header table entry size */
+  unsigned char	e_shnum[2];		/* Section header table entry count */
+  unsigned char	e_shstrndx[2];		/* Section header string table index */
+} Elf32_External_Ehdr;
+
+typedef struct {
+  unsigned char	e_ident[16];		/* ELF "magic number" */
+  unsigned char	e_type[2];		/* Identifies object file type */
+  unsigned char	e_machine[2];		/* Specifies required architecture */
+  unsigned char	e_version[4];		/* Identifies object file version */
+  unsigned char	e_entry[8];		/* Entry point virtual address */
+  unsigned char	e_phoff[8];		/* Program header table file offset */
+  unsigned char	e_shoff[8];		/* Section header table file offset */
+  unsigned char	e_flags[4];		/* Processor-specific flags */
+  unsigned char	e_ehsize[2];		/* ELF header size in bytes */
+  unsigned char	e_phentsize[2];		/* Program header table entry size */
+  unsigned char	e_phnum[2];		/* Program header table entry count */
+  unsigned char	e_shentsize[2];		/* Section header table entry size */
+  unsigned char	e_shnum[2];		/* Section header table entry count */
+  unsigned char	e_shstrndx[2];		/* Section header string table index */
+} Elf64_External_Ehdr;
+
+/* Program header */
+
+typedef struct {
+  unsigned char	p_type[4];		/* Identifies program segment type */
+  unsigned char	p_offset[4];		/* Segment file offset */
+  unsigned char	p_vaddr[4];		/* Segment virtual address */
+  unsigned char	p_paddr[4];		/* Segment physical address */
+  unsigned char	p_filesz[4];		/* Segment size in file */
+  unsigned char	p_memsz[4];		/* Segment size in memory */
+  unsigned char	p_flags[4];		/* Segment flags */
+  unsigned char	p_align[4];		/* Segment alignment, file & memory */
+} Elf32_External_Phdr;
+
+typedef struct {
+  unsigned char	p_type[4];		/* Identifies program segment type */
+  unsigned char	p_flags[4];		/* Segment flags */
+  unsigned char	p_offset[8];		/* Segment file offset */
+  unsigned char	p_vaddr[8];		/* Segment virtual address */
+  unsigned char	p_paddr[8];		/* Segment physical address */
+  unsigned char	p_filesz[8];		/* Segment size in file */
+  unsigned char	p_memsz[8];		/* Segment size in memory */
+  unsigned char	p_align[8];		/* Segment alignment, file & memory */
+} Elf64_External_Phdr;
+
+/* Section header */
+
+typedef struct {
+  unsigned char	sh_name[4];		/* Section name, index in string tbl */
+  unsigned char	sh_type[4];		/* Type of section */
+  unsigned char	sh_flags[4];		/* Miscellaneous section attributes */
+  unsigned char	sh_addr[4];		/* Section virtual addr at execution */
+  unsigned char	sh_offset[4];		/* Section file offset */
+  unsigned char	sh_size[4];		/* Size of section in bytes */
+  unsigned char	sh_link[4];		/* Index of another section */
+  unsigned char	sh_info[4];		/* Additional section information */
+  unsigned char	sh_addralign[4];	/* Section alignment */
+  unsigned char	sh_entsize[4];		/* Entry size if section holds table */
+} Elf32_External_Shdr;
+
+typedef struct {
+  unsigned char	sh_name[4];		/* Section name, index in string tbl */
+  unsigned char	sh_type[4];		/* Type of section */
+  unsigned char	sh_flags[8];		/* Miscellaneous section attributes */
+  unsigned char	sh_addr[8];		/* Section virtual addr at execution */
+  unsigned char	sh_offset[8];		/* Section file offset */
+  unsigned char	sh_size[8];		/* Size of section in bytes */
+  unsigned char	sh_link[4];		/* Index of another section */
+  unsigned char	sh_info[4];		/* Additional section information */
+  unsigned char	sh_addralign[8];	/* Section alignment */
+  unsigned char	sh_entsize[8];		/* Entry size if section holds table */
+} Elf64_External_Shdr;
+
+/* Symbol table entry */
+
+typedef struct {
+  unsigned char	st_name[4];		/* Symbol name, index in string tbl */
+  unsigned char	st_value[4];		/* Value of the symbol */
+  unsigned char	st_size[4];		/* Associated symbol size */
+  unsigned char	st_info[1];		/* Type and binding attributes */
+  unsigned char	st_other[1];		/* No defined meaning, 0 */
+  unsigned char	st_shndx[2];		/* Associated section index */
+} Elf32_External_Sym;
+
+typedef struct {
+  unsigned char	st_name[4];		/* Symbol name, index in string tbl */
+  unsigned char	st_info[1];		/* Type and binding attributes */
+  unsigned char	st_other[1];		/* No defined meaning, 0 */
+  unsigned char	st_shndx[2];		/* Associated section index */
+  unsigned char	st_value[8];		/* Value of the symbol */
+  unsigned char	st_size[8];		/* Associated symbol size */
+} Elf64_External_Sym;
+
+typedef struct {
+  unsigned char est_shndx[4];		/* Section index */
+} Elf_External_Sym_Shndx;
+
+/* Note segments */
+
+typedef struct {
+  unsigned char	namesz[4];		/* Size of entry's owner string */
+  unsigned char	descsz[4];		/* Size of the note descriptor */
+  unsigned char	type[4];		/* Interpretation of the descriptor */
+  char		name[1];		/* Start of the name+desc data */
+} Elf_External_Note;
+
+/* Relocation Entries */
+typedef struct {
+  unsigned char r_offset[4];	/* Location at which to apply the action */
+  unsigned char	r_info[4];	/* index and type of relocation */
+} Elf32_External_Rel;
+
+typedef struct {
+  unsigned char r_offset[4];	/* Location at which to apply the action */
+  unsigned char	r_info[4];	/* index and type of relocation */
+  unsigned char	r_addend[4];	/* Constant addend used to compute value */
+} Elf32_External_Rela;
+
+typedef struct {
+  unsigned char r_offset[8];	/* Location at which to apply the action */
+  unsigned char	r_info[8];	/* index and type of relocation */
+} Elf64_External_Rel;
+
+typedef struct {
+  unsigned char r_offset[8];	/* Location at which to apply the action */
+  unsigned char	r_info[8];	/* index and type of relocation */
+  unsigned char	r_addend[8];	/* Constant addend used to compute value */
+} Elf64_External_Rela;
+
+/* dynamic section structure */
+
+typedef struct {
+  unsigned char	d_tag[4];		/* entry tag value */
+  union {
+    unsigned char	d_val[4];
+    unsigned char	d_ptr[4];
+  } d_un;
+} Elf32_External_Dyn;
+
+typedef struct {
+  unsigned char	d_tag[8];		/* entry tag value */
+  union {
+    unsigned char	d_val[8];
+    unsigned char	d_ptr[8];
+  } d_un;
+} Elf64_External_Dyn;
+
+/* The version structures are currently size independent.  They are
+   named without a 32 or 64.  If that ever changes, these structures
+   will need to be renamed.  */
+
+/* This structure appears in a SHT_GNU_verdef section.  */
+
+typedef struct {
+  unsigned char		vd_version[2];
+  unsigned char		vd_flags[2];
+  unsigned char		vd_ndx[2];
+  unsigned char		vd_cnt[2];
+  unsigned char		vd_hash[4];
+  unsigned char		vd_aux[4];
+  unsigned char		vd_next[4];
+} Elf_External_Verdef;
+
+/* This structure appears in a SHT_GNU_verdef section.  */
+
+typedef struct {
+  unsigned char		vda_name[4];
+  unsigned char		vda_next[4];
+} Elf_External_Verdaux;
+
+/* This structure appears in a SHT_GNU_verneed section.  */
+
+typedef struct {
+  unsigned char		vn_version[2];
+  unsigned char		vn_cnt[2];
+  unsigned char		vn_file[4];
+  unsigned char		vn_aux[4];
+  unsigned char		vn_next[4];
+} Elf_External_Verneed;
+
+/* This structure appears in a SHT_GNU_verneed section.  */
+
+typedef struct {
+  unsigned char		vna_hash[4];
+  unsigned char		vna_flags[2];
+  unsigned char		vna_other[2];
+  unsigned char		vna_name[4];
+  unsigned char		vna_next[4];
+} Elf_External_Vernaux;
+
+/* This structure appears in a SHT_GNU_versym section.  This is not a
+   standard ELF structure; ELF just uses Elf32_Half.  */
+
+typedef struct {
+  unsigned char		vs_vers[2];
+} ATTRIBUTE_PACKED  Elf_External_Versym;
+
+/* Structure for syminfo section.  */
+typedef struct
+{
+  unsigned char		si_boundto[2];
+  unsigned char		si_flags[2];
+} Elf_External_Syminfo;
+
+
+/* This structure appears on the stack and in NT_AUXV core file notes.  */
+typedef struct
+{
+  unsigned char		a_type[4];
+  unsigned char		a_val[4];
+} Elf32_External_Auxv;
+
+typedef struct
+{
+  unsigned char		a_type[8];
+  unsigned char		a_val[8];
+} Elf64_External_Auxv;
+
+/* Size of SHT_GROUP section entry.  */
+
+#define GRP_ENTRY_SIZE		4
+
+#endif /* _ELF_EXTERNAL_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/fr30.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/fr30.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/fr30.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/fr30.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,42 @@
+/* FR30 ELF support for BFD.
+   Copyright 1998, 1999, 2000, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_FR30_H
+#define _ELF_FR30_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_fr30_reloc_type)
+  RELOC_NUMBER (R_FR30_NONE, 0)
+  RELOC_NUMBER (R_FR30_8, 1)
+  RELOC_NUMBER (R_FR30_20, 2)
+  RELOC_NUMBER (R_FR30_32, 3)
+  RELOC_NUMBER (R_FR30_48, 4)
+  RELOC_NUMBER (R_FR30_6_IN_4, 5)
+  RELOC_NUMBER (R_FR30_8_IN_8, 6)
+  RELOC_NUMBER (R_FR30_9_IN_8, 7)
+  RELOC_NUMBER (R_FR30_10_IN_8, 8)
+  RELOC_NUMBER (R_FR30_9_PCREL, 9)
+  RELOC_NUMBER (R_FR30_12_PCREL, 10)
+  RELOC_NUMBER (R_FR30_GNU_VTINHERIT, 11)
+  RELOC_NUMBER (R_FR30_GNU_VTENTRY, 12)
+END_RELOC_NUMBERS (R_FR30_max)
+
+#endif /* _ELF_FR30_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/frv.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/frv.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/frv.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/frv.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,130 @@
+/* FRV ELF support for BFD.
+   Copyright (C) 2002, 2003, 2004, 2005, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_FRV_H
+#define _ELF_FRV_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_frv_reloc_type)
+  RELOC_NUMBER (R_FRV_NONE, 0)
+  RELOC_NUMBER (R_FRV_32, 1)
+  RELOC_NUMBER (R_FRV_LABEL16, 2)
+  RELOC_NUMBER (R_FRV_LABEL24, 3)
+  RELOC_NUMBER (R_FRV_LO16, 4)
+  RELOC_NUMBER (R_FRV_HI16, 5)
+  RELOC_NUMBER (R_FRV_GPREL12, 6)
+  RELOC_NUMBER (R_FRV_GPRELU12, 7)
+  RELOC_NUMBER (R_FRV_GPREL32, 8)
+  RELOC_NUMBER (R_FRV_GPRELHI, 9)
+  RELOC_NUMBER (R_FRV_GPRELLO, 10)
+  RELOC_NUMBER (R_FRV_GOT12, 11)
+  RELOC_NUMBER (R_FRV_GOTHI, 12)
+  RELOC_NUMBER (R_FRV_GOTLO, 13)
+  RELOC_NUMBER (R_FRV_FUNCDESC, 14)
+  RELOC_NUMBER (R_FRV_FUNCDESC_GOT12, 15)
+  RELOC_NUMBER (R_FRV_FUNCDESC_GOTHI, 16)
+  RELOC_NUMBER (R_FRV_FUNCDESC_GOTLO, 17)
+  RELOC_NUMBER (R_FRV_FUNCDESC_VALUE, 18)
+  RELOC_NUMBER (R_FRV_FUNCDESC_GOTOFF12, 19)
+  RELOC_NUMBER (R_FRV_FUNCDESC_GOTOFFHI, 20)
+  RELOC_NUMBER (R_FRV_FUNCDESC_GOTOFFLO, 21)
+  RELOC_NUMBER (R_FRV_GOTOFF12, 22)
+  RELOC_NUMBER (R_FRV_GOTOFFHI, 23)
+  RELOC_NUMBER (R_FRV_GOTOFFLO, 24)
+  RELOC_NUMBER (R_FRV_GETTLSOFF, 25)
+  RELOC_NUMBER (R_FRV_TLSDESC_VALUE, 26)
+  RELOC_NUMBER (R_FRV_GOTTLSDESC12, 27)
+  RELOC_NUMBER (R_FRV_GOTTLSDESCHI, 28)
+  RELOC_NUMBER (R_FRV_GOTTLSDESCLO, 29)
+  RELOC_NUMBER (R_FRV_TLSMOFF12, 30)
+  RELOC_NUMBER (R_FRV_TLSMOFFHI, 31)
+  RELOC_NUMBER (R_FRV_TLSMOFFLO, 32)
+  RELOC_NUMBER (R_FRV_GOTTLSOFF12, 33)
+  RELOC_NUMBER (R_FRV_GOTTLSOFFHI, 34)
+  RELOC_NUMBER (R_FRV_GOTTLSOFFLO, 35)
+  RELOC_NUMBER (R_FRV_TLSOFF, 36)
+  RELOC_NUMBER (R_FRV_TLSDESC_RELAX, 37)
+  RELOC_NUMBER (R_FRV_GETTLSOFF_RELAX, 38)
+  RELOC_NUMBER (R_FRV_TLSOFF_RELAX, 39)
+  RELOC_NUMBER (R_FRV_TLSMOFF, 40)
+  RELOC_NUMBER (R_FRV_GNU_VTINHERIT, 200)
+  RELOC_NUMBER (R_FRV_GNU_VTENTRY, 201)
+END_RELOC_NUMBERS(R_FRV_max)
+
+/* Processor specific flags for the ELF header e_flags field.  */
+						/* gpr support */
+#define EF_FRV_GPR_MASK		0x00000003	/* mask for # of gprs */
+#define EF_FRV_GPR_32		0x00000001	/* -mgpr-32 */
+#define EF_FRV_GPR_64		0x00000002	/* -mgpr-64 */
+
+						/* fpr support */
+#define EF_FRV_FPR_MASK		0x0000000c	/* mask for # of fprs */
+#define EF_FRV_FPR_32		0x00000004	/* -mfpr-32 */
+#define EF_FRV_FPR_64		0x00000008	/* -mfpr-64 */
+#define EF_FRV_FPR_NONE		0x0000000c	/* -msoft-float */
+
+						/* double word support */
+#define EF_FRV_DWORD_MASK	0x00000030	/* mask for dword support */
+#define EF_FRV_DWORD_YES	0x00000010	/* use double word insns */
+#define EF_FRV_DWORD_NO		0x00000020	/* don't use double word insn*/
+
+#define EF_FRV_DOUBLE		0x00000040	/* -mdouble */
+#define EF_FRV_MEDIA		0x00000080	/* -mmedia */
+
+#define EF_FRV_PIC		0x00000100	/* -fpic */
+#define EF_FRV_NON_PIC_RELOCS	0x00000200	/* used non pic safe relocs */
+
+#define EF_FRV_MULADD		0x00000400	/* -mmuladd */
+#define EF_FRV_BIGPIC		0x00000800	/* -fPIC */
+#define	EF_FRV_LIBPIC		0x00001000	/* -mlibrary-pic */
+#define EF_FRV_G0		0x00002000	/* -G 0, no small data ptr */
+#define EF_FRV_NOPACK		0x00004000	/* -mnopack */
+#define EF_FRV_FDPIC		0x00008000      /* -mfdpic */
+
+#define	EF_FRV_CPU_MASK		0xff000000	/* specific cpu bits */
+#define EF_FRV_CPU_GENERIC	0x00000000	/* generic FRV */
+#define EF_FRV_CPU_FR500	0x01000000	/* FRV500 */
+#define EF_FRV_CPU_FR300	0x02000000	/* FRV300 */
+#define EF_FRV_CPU_SIMPLE	0x03000000	/* SIMPLE */
+#define EF_FRV_CPU_TOMCAT	0x04000000	/* Tomcat, FR500 prototype */
+#define EF_FRV_CPU_FR400	0x05000000	/* FRV400 */
+#define EF_FRV_CPU_FR550	0x06000000	/* FRV550 */
+#define EF_FRV_CPU_FR405	0x07000000
+#define EF_FRV_CPU_FR450	0x08000000
+
+						/* Mask of PIC related bits */
+#define	EF_FRV_PIC_FLAGS	(EF_FRV_PIC | EF_FRV_LIBPIC | EF_FRV_BIGPIC \
+				 | EF_FRV_FDPIC)
+
+						/* Mask of all flags */
+#define EF_FRV_ALL_FLAGS	(EF_FRV_GPR_MASK | \
+				 EF_FRV_FPR_MASK | \
+				 EF_FRV_DWORD_MASK | \
+				 EF_FRV_DOUBLE | \
+				 EF_FRV_MEDIA | \
+				 EF_FRV_PIC_FLAGS | \
+				 EF_FRV_NON_PIC_RELOCS | \
+				 EF_FRV_MULADD | \
+				 EF_FRV_G0 | \
+				 EF_FRV_NOPACK | \
+				 EF_FRV_CPU_MASK)
+
+#endif /* _ELF_FRV_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/h8.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/h8.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/h8.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/h8.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,100 @@
+/* H8300/h8500 ELF support for BFD.
+   Copyright 2001, 2003, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_H8_H
+#define _ELF_H8_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+/* Relocations 59..63 are GNU extensions.  */
+START_RELOC_NUMBERS (elf_h8_reloc_type)
+  RELOC_NUMBER (R_H8_NONE, 0)
+  RELOC_NUMBER (R_H8_DIR32, 1)
+  RELOC_NUMBER (R_H8_DIR32_28, 2)
+  RELOC_NUMBER (R_H8_DIR32_24, 3)
+  RELOC_NUMBER (R_H8_DIR32_16, 4)
+  RELOC_NUMBER (R_H8_DIR32U, 6)
+  RELOC_NUMBER (R_H8_DIR32U_28, 7)
+  RELOC_NUMBER (R_H8_DIR32U_24, 8)
+  RELOC_NUMBER (R_H8_DIR32U_20, 9)
+  RELOC_NUMBER (R_H8_DIR32U_16, 10)
+  RELOC_NUMBER (R_H8_DIR24, 11)
+  RELOC_NUMBER (R_H8_DIR24_20, 12)
+  RELOC_NUMBER (R_H8_DIR24_16, 13)
+  RELOC_NUMBER (R_H8_DIR24U, 14)
+  RELOC_NUMBER (R_H8_DIR24U_20, 15)
+  RELOC_NUMBER (R_H8_DIR24U_16, 16)
+  RELOC_NUMBER (R_H8_DIR16, 17)
+  RELOC_NUMBER (R_H8_DIR16U, 18)
+  RELOC_NUMBER (R_H8_DIR16S_32, 19)
+  RELOC_NUMBER (R_H8_DIR16S_28, 20)
+  RELOC_NUMBER (R_H8_DIR16S_24, 21)
+  RELOC_NUMBER (R_H8_DIR16S_20, 22)
+  RELOC_NUMBER (R_H8_DIR16S, 23)
+  RELOC_NUMBER (R_H8_DIR8, 24)
+  RELOC_NUMBER (R_H8_DIR8U, 25)
+  RELOC_NUMBER (R_H8_DIR8Z_32, 26)
+  RELOC_NUMBER (R_H8_DIR8Z_28, 27)
+  RELOC_NUMBER (R_H8_DIR8Z_24, 28)
+  RELOC_NUMBER (R_H8_DIR8Z_20, 29)
+  RELOC_NUMBER (R_H8_DIR8Z_16, 30)
+  RELOC_NUMBER (R_H8_PCREL16, 31)
+  RELOC_NUMBER (R_H8_PCREL8, 32)
+  RELOC_NUMBER (R_H8_BPOS, 33)
+  FAKE_RELOC (R_H8_FIRST_INVALID_DIR_RELOC, 34)
+  FAKE_RELOC (R_H8_LAST_INVALID_DIR_RELOC, 58)
+  RELOC_NUMBER (R_H8_DIR16A8, 59)
+  RELOC_NUMBER (R_H8_DIR16R8, 60)
+  RELOC_NUMBER (R_H8_DIR24A8, 61)
+  RELOC_NUMBER (R_H8_DIR24R8, 62)
+  RELOC_NUMBER (R_H8_DIR32A16, 63)
+  RELOC_NUMBER (R_H8_ABS32, 65)
+  RELOC_NUMBER (R_H8_ABS32A16, 127)
+  RELOC_NUMBER (R_H8_SYM, 128)
+  RELOC_NUMBER (R_H8_OPneg, 129)
+  RELOC_NUMBER (R_H8_OPadd, 130)
+  RELOC_NUMBER (R_H8_OPsub, 131)
+  RELOC_NUMBER (R_H8_OPmul, 132)
+  RELOC_NUMBER (R_H8_OPdiv, 133)
+  RELOC_NUMBER (R_H8_OPshla, 134)
+  RELOC_NUMBER (R_H8_OPshra, 135)
+  RELOC_NUMBER (R_H8_OPsctsize, 136)
+  RELOC_NUMBER (R_H8_OPhword, 137)
+  RELOC_NUMBER (R_H8_OPlword, 138)
+  RELOC_NUMBER (R_H8_OPhigh, 139)
+  RELOC_NUMBER (R_H8_OPlow, 140)
+  RELOC_NUMBER (R_H8_OPscttop, 141)
+END_RELOC_NUMBERS (R_H8_max)
+
+/* Machine variant if we know it.  This field was invented at Cygnus,
+   but it is hoped that other vendors will adopt it.  If some standard
+   is developed, this code should be changed to follow it. */
+
+#define EF_H8_MACH		0x00FF0000
+
+#define E_H8_MACH_H8300		0x00800000
+#define E_H8_MACH_H8300H	0x00810000
+#define E_H8_MACH_H8300S	0x00820000
+#define E_H8_MACH_H8300HN	0x00830000
+#define E_H8_MACH_H8300SN	0x00840000
+#define E_H8_MACH_H8300SX	0x00850000
+#define E_H8_MACH_H8300SXN	0x00860000
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/hppa.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/hppa.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/hppa.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/hppa.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,635 @@
+/* HPPA ELF support for BFD.
+   Copyright 1993, 1994, 1995, 1998, 1999, 2000, 2005, 2006, 2008, 2010
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file holds definitions specific to the HPPA ELF ABI.  Note
+   that most of this is not actually implemented by BFD.  */
+
+#ifndef _ELF_HPPA_H
+#define _ELF_HPPA_H
+
+/* Processor specific flags for the ELF header e_flags field.  */
+
+/* Trap null address dereferences.  */
+#define EF_PARISC_TRAPNIL	0x00010000
+
+/* .PARISC.archext section is present.  */
+#define EF_PARISC_EXT		0x00020000
+
+/* Program expects little-endian mode.  */
+#define EF_PARISC_LSB		0x00040000
+
+/* Program expects wide mode.  */
+#define EF_PARISC_WIDE		0x00080000
+
+/* Do not allow kernel-assisted branch prediction.  */
+#define EF_PARISC_NO_KABP	0x00100000
+
+/* Allow lazy swap for dynamically allocated program segments.  */
+#define EF_PARISC_LAZYSWAP	0x00400000
+
+/* Architecture version */
+#define EF_PARISC_ARCH		0x0000ffff
+
+#define EFA_PARISC_1_0			0x020b
+#define EFA_PARISC_1_1			0x0210
+#define EFA_PARISC_2_0			0x0214
+
+/* Special section indices.  */
+/* A symbol that has been declared as a tentative definition in an ANSI C
+   compilation.  */
+#define SHN_PARISC_ANSI_COMMON 	SHN_LORESERVE
+
+/* A symbol that has been declared as a common block using the
+   huge memory model.  */
+#define SHN_PARISC_HUGE_COMMON	(SHN_LORESERVE + 1)
+
+/* Processor specific section types.  */
+
+/* Section contains product specific extension bits.  */
+#define SHT_PARISC_EXT		0x70000000
+
+/* Section contains unwind table entries.  */
+#define SHT_PARISC_UNWIND	0x70000001
+
+/* Section contains debug information for optimized code.  */
+#define SHT_PARISC_DOC		0x70000002
+
+/* Section contains code annotations.  */
+#define SHT_PARISC_ANNOT	0x70000003
+
+/* DLKM special section.  */
+#define SHT_PARISC_DLKM		0x70000004
+
+/* These are strictly for compatibility with the older elf32-hppa
+   implementation.  Hopefully we can eliminate them in the future.  */
+/* Optional section holding argument location/relocation info.  */
+#define SHT_PARISC_SYMEXTN    SHT_LOPROC + 8
+
+/* Option section for linker stubs.  */
+#define SHT_PARISC_STUBS      SHT_LOPROC + 9
+
+/* Processor specific section flags.  */
+
+/* Section contains code compiled for static branch prediction.  */
+#define SHF_PARISC_SBP		0x80000000
+
+/* Section should be allocated from from GP.  */
+#define SHF_PARISC_HUGE		0x40000000
+
+/* Section should go near GP.  */
+#define SHF_PARISC_SHORT	0x20000000
+
+/* Section is weak ordered.  */
+#define SHF_PARISC_WEAKORDER	0x10000000
+
+/* Identifies the entry point of a millicode routine.  */
+#define STT_PARISC_MILLI	13
+
+/* ELF/HPPA relocation types */
+
+/* Note: PA-ELF is defined to use only RELA relocations.  */
+#include "elf/reloc-macros.h"
+
+START_RELOC_NUMBERS (elf_hppa_reloc_type)
+RELOC_NUMBER (R_PARISC_NONE,	         0) /* No reloc */
+
+/*		Data / Inst. Format	   Relocation Expression	  */
+
+RELOC_NUMBER (R_PARISC_DIR32,	   	 1)
+/*		32-bit word            	   symbol + addend    		  */
+
+RELOC_NUMBER (R_PARISC_DIR21L,	   	 2)
+/*		long immediate (7)	   LR(symbol, addend) 		  */
+
+RELOC_NUMBER (R_PARISC_DIR17R,	   	 3)
+/*		branch external (19)	   RR(symbol, addend) 		  */
+
+RELOC_NUMBER (R_PARISC_DIR17F,	   	 4)
+/*		branch external (19)	   symbol + addend    		  */
+
+RELOC_NUMBER (R_PARISC_DIR14R,	   	 6)
+/*		load/store (1)		   RR(symbol, addend) 		  */
+
+RELOC_NUMBER (R_PARISC_DIR14F,	   	 7)
+/*		load/store (1)		   symbol, addend 		  */
+
+/* PC-relative relocation types
+   Typically used for calls.
+   Note PCREL17C and PCREL17F differ only in overflow handling.
+   PCREL17C never reports a relocation error.
+
+   When supporting argument relocations, function calls must be
+   accompanied by parameter relocation information.  This information is
+   carried in the ten high-order bits of the addend field.  The remaining
+   22 bits of of the addend field are sign-extended to form the Addend.
+
+   Note the code to build argument relocations depends on the
+   addend being zero.  A consequence of this limitation is GAS
+   can not perform relocation reductions for function symbols.  */
+
+RELOC_NUMBER (R_PARISC_PCREL12F,  	 8)
+/*		op & branch (17)	   symbol - PC - 8 + addend    	  */
+
+RELOC_NUMBER (R_PARISC_PCREL32,   	 9)
+/*		32-bit word		   symbol - PC - 8 + addend    	  */
+
+RELOC_NUMBER (R_PARISC_PCREL21L,  	10)
+/*		long immediate (7)	   L(symbol - PC - 8 + addend) 	  */
+
+RELOC_NUMBER (R_PARISC_PCREL17R,  	11)
+/*		branch external (19)	   R(symbol - PC - 8 + addend) 	  */
+
+RELOC_NUMBER (R_PARISC_PCREL17F,  	12)
+/*		branch (20)		   symbol - PC - 8 + addend    	  */
+
+RELOC_NUMBER (R_PARISC_PCREL17C,  	13)
+/*		branch (20)		   symbol - PC - 8 + addend    	  */
+
+RELOC_NUMBER (R_PARISC_PCREL14R,  	14)
+/*		load/store (1)		   R(symbol - PC - 8 + addend) 	  */
+
+RELOC_NUMBER (R_PARISC_PCREL14F,  	15)
+/*		load/store (1)             symbol - PC - 8 + addend    	  */
+
+
+/* DP-relative relocation types.  */
+RELOC_NUMBER (R_PARISC_DPREL21L,  	18)
+/*		long immediate (7)         LR(symbol - GP, addend)  	  */
+
+RELOC_NUMBER (R_PARISC_DPREL14WR, 	19)
+/*		load/store mod. comp. (2)  RR(symbol - GP, addend)  	  */
+
+RELOC_NUMBER (R_PARISC_DPREL14DR, 	20)
+/*		load/store doubleword (3)  RR(symbol - GP, addend)  	  */
+
+RELOC_NUMBER (R_PARISC_DPREL14R,  	22)
+/*		load/store (1)             RR(symbol - GP, addend)  	  */
+
+RELOC_NUMBER (R_PARISC_DPREL14F,  	23)
+/*		load/store (1)             symbol - GP + addend     	  */
+
+
+/* Data linkage table (DLT) relocation types
+
+   SOM DLT_REL fixup requests are used to for static data references
+   from position-independent code within shared libraries.  They are
+   similar to the GOT relocation types in some SVR4 implementations.  */
+
+RELOC_NUMBER (R_PARISC_DLTREL21L,     	26)
+/*		long immediate (7)         LR(symbol - GP, addend) 	  */
+
+RELOC_NUMBER (R_PARISC_DLTREL14R,     	30)
+/*		load/store (1)             RR(symbol - GP, addend) 	  */
+
+RELOC_NUMBER (R_PARISC_DLTREL14F,     	31)
+/*		load/store (1)             symbol - GP + addend    	  */
+
+
+/* DLT indirect relocation types  */
+RELOC_NUMBER (R_PARISC_DLTIND21L,     	34)
+/*		long immediate (7)         L(ltoff(symbol + addend)) 	  */
+
+RELOC_NUMBER (R_PARISC_DLTIND14R,     	38)
+/*		load/store (1)             R(ltoff(symbol + addend)) 	  */
+
+RELOC_NUMBER (R_PARISC_DLTIND14F,     	39)
+/*		load/store (1)             ltoff(symbol + addend)    	  */
+
+
+/* Base relative relocation types.  Ugh.  These imply lots of state */
+RELOC_NUMBER (R_PARISC_SETBASE,       	40)
+/*		none                       no reloc; base := sym     	  */
+
+RELOC_NUMBER (R_PARISC_SECREL32,      	41)
+/*		32-bit word                symbol - SECT + addend    	  */
+
+RELOC_NUMBER (R_PARISC_BASEREL21L,    	42)
+/*		long immediate (7)         LR(symbol - base, addend) 	  */
+
+RELOC_NUMBER (R_PARISC_BASEREL17R,    	43)
+/*		branch external (19)       RR(symbol - base, addend) 	  */
+
+RELOC_NUMBER (R_PARISC_BASEREL17F,    	44)
+/*		branch external (19)       symbol - base + addend    	  */
+
+RELOC_NUMBER (R_PARISC_BASEREL14R,    	46)
+/*		load/store (1)             RR(symbol - base, addend) 	  */
+
+RELOC_NUMBER (R_PARISC_BASEREL14F,    	47)
+/*		load/store (1)             symbol - base, addend     	  */
+
+
+/* Segment relative relocation types.  */
+RELOC_NUMBER (R_PARISC_SEGBASE,       	48)
+/*		none                       no relocation; SB := sym  	  */
+
+RELOC_NUMBER (R_PARISC_SEGREL32,      	49)
+/*		32-bit word                symbol - SB + addend 	  */
+  
+
+/* Offsets from the PLT.  */  
+RELOC_NUMBER (R_PARISC_PLTOFF21L,     	50)
+/*		long immediate (7)         LR(pltoff(symbol), addend) 	  */
+
+RELOC_NUMBER (R_PARISC_PLTOFF14R,     	54)
+/*		load/store (1)             RR(pltoff(symbol), addend) 	  */
+
+RELOC_NUMBER (R_PARISC_PLTOFF14F,     	55)
+/*		load/store (1)             pltoff(symbol) + addend    	  */
+
+
+RELOC_NUMBER (R_PARISC_LTOFF_FPTR32,  	57)
+/*		32-bit word                ltoff(fptr(symbol+addend))     */
+
+RELOC_NUMBER (R_PARISC_LTOFF_FPTR21L, 	58)
+/*		long immediate (7)         L(ltoff(fptr(symbol+addend)))  */
+
+RELOC_NUMBER (R_PARISC_LTOFF_FPTR14R, 	62)
+/*		load/store (1)             R(ltoff(fptr(symbol+addend)))  */
+
+
+RELOC_NUMBER (R_PARISC_FPTR64,        	64)
+/*		64-bit doubleword          fptr(symbol+addend) 		  */
+
+
+/* Plabel relocation types.  */	 
+RELOC_NUMBER (R_PARISC_PLABEL32,      	65)
+/*		32-bit word	  	   fptr(symbol) 		  */
+
+RELOC_NUMBER (R_PARISC_PLABEL21L,     	66)
+/*		long immediate (7)         L(fptr(symbol))		  */
+
+RELOC_NUMBER (R_PARISC_PLABEL14R,     	70)
+/*		load/store (1)             R(fptr(symbol))		  */
+
+  
+/* PCREL relocations.  */  
+RELOC_NUMBER (R_PARISC_PCREL64,       	72)
+/*		64-bit doubleword          symbol - PC - 8 + addend       */
+
+RELOC_NUMBER (R_PARISC_PCREL22C,      	73)
+/*		branch & link (21)         symbol - PC - 8 + addend       */
+
+RELOC_NUMBER (R_PARISC_PCREL22F,      	74)
+/*		branch & link (21)         symbol - PC - 8 + addend       */
+
+RELOC_NUMBER (R_PARISC_PCREL14WR,     	75)
+/*		load/store mod. comp. (2)  R(symbol - PC - 8 + addend)    */
+
+RELOC_NUMBER (R_PARISC_PCREL14DR,     	76)
+/*		load/store doubleword (3)  R(symbol - PC - 8 + addend)    */
+
+RELOC_NUMBER (R_PARISC_PCREL16F,      	77)
+/*		load/store (1)             symbol - PC - 8 + addend       */
+
+RELOC_NUMBER (R_PARISC_PCREL16WF,     	78)
+/*		load/store mod. comp. (2)  symbol - PC - 8 + addend       */
+
+RELOC_NUMBER (R_PARISC_PCREL16DF,     	79)
+/*		load/store doubleword (3)  symbol - PC - 8 + addend       */
+
+
+RELOC_NUMBER (R_PARISC_DIR64,         	80)
+/*		64-bit doubleword          symbol + addend    		  */
+
+RELOC_NUMBER (R_PARISC_DIR14WR,       	83)
+/*		load/store mod. comp. (2)  RR(symbol, addend) 		  */
+
+RELOC_NUMBER (R_PARISC_DIR14DR,       	84)
+/*		load/store doubleword (3)  RR(symbol, addend) 		  */
+
+RELOC_NUMBER (R_PARISC_DIR16F,        	85)
+/*		load/store (1)             symbol + addend    		  */
+
+RELOC_NUMBER (R_PARISC_DIR16WF,       	86)
+/*		load/store mod. comp. (2)  symbol + addend    		  */
+
+RELOC_NUMBER (R_PARISC_DIR16DF,       	87)
+/*		load/store doubleword (3)  symbol + addend    		  */
+  
+RELOC_NUMBER (R_PARISC_GPREL64,       	88)
+/*		64-bit doubleword          symbol - GP + addend 	  */
+  
+RELOC_NUMBER (R_PARISC_DLTREL14WR,    	91)
+/*		load/store mod. comp. (2)  RR(symbol - GP, addend) 	  */
+
+RELOC_NUMBER (R_PARISC_DLTREL14DR,    	92)
+/*		load/store doubleword (3)  RR(symbol - GP, addend) 	  */
+
+RELOC_NUMBER (R_PARISC_GPREL16F,      	93)
+/*		load/store (1)             symbol - GP + addend    	  */
+
+RELOC_NUMBER (R_PARISC_GPREL16WF,     	94)
+/*		load/store mod. comp. (2)  symbol - GP + addend    	  */
+
+RELOC_NUMBER (R_PARISC_GPREL16DF,     	95)
+/*		load/store doubleword (3)  symbol - GP + addend    	  */
+
+
+RELOC_NUMBER (R_PARISC_LTOFF64,      	96)
+/*		64-bit doubleword          ltoff(symbol + addend)    	  */
+
+RELOC_NUMBER (R_PARISC_DLTIND14WR,   	99)
+/*		load/store mod. comp. (2)  R(ltoff(symbol + addend)) 	  */
+
+RELOC_NUMBER (R_PARISC_DLTIND14DR,     100)
+/*		load/store doubleword (3)  R(ltoff(symbol + addend)) 	  */
+
+RELOC_NUMBER (R_PARISC_LTOFF16F,       101)
+/*		load/store (1)             ltoff(symbol + addend)    	  */
+
+RELOC_NUMBER (R_PARISC_LTOFF16WF,      102)
+/*		load/store mod. comp. (2)  ltoff(symbol + addend)    	  */
+
+RELOC_NUMBER (R_PARISC_LTOFF16DF,      103)
+/*		load/store doubleword (3)  ltoff(symbol + addend)    	  */
+
+
+RELOC_NUMBER (R_PARISC_SECREL64,       104)
+/*		64-bit doubleword          symbol - SECT + addend 	  */
+
+RELOC_NUMBER (R_PARISC_BASEREL14WR,    107)
+/*		load/store mod. comp. (2)  RR(symbol - base, addend) 	  */
+
+RELOC_NUMBER (R_PARISC_BASEREL14DR,    108)
+/*		load/store doubleword (3)  RR(symbol - base, addend) 	  */
+
+
+RELOC_NUMBER (R_PARISC_SEGREL64,       112)
+/*		64-bit doubleword          symbol - SB + addend 	  */
+  
+RELOC_NUMBER (R_PARISC_PLTOFF14WR,     115)
+/*		load/store mod. comp. (2)  RR(pltoff(symbol), addend) 	  */
+
+RELOC_NUMBER (R_PARISC_PLTOFF14DR,     116)    
+/*		load/store doubleword (3)  RR(pltoff(symbol), addend) 	  */
+
+RELOC_NUMBER (R_PARISC_PLTOFF16F,      117)    
+/*		load/store (1)             pltoff(symbol) + addend    	  */
+
+RELOC_NUMBER (R_PARISC_PLTOFF16WF,     118)    
+/*		load/store mod. comp. (2)  pltoff(symbol) + addend    	  */
+
+RELOC_NUMBER (R_PARISC_PLTOFF16DF,     119)    
+/*		load/store doubleword (3)  pltoff(symbol) + addend    	  */
+
+
+RELOC_NUMBER (R_PARISC_LTOFF_FPTR64,   120)
+/*		64-bit doubleword          ltoff(fptr(symbol+addend))     */
+
+RELOC_NUMBER (R_PARISC_LTOFF_FPTR14WR, 123)
+/*		load/store mod. comp. (2)  R(ltoff(fptr(symbol+addend)))  */
+
+RELOC_NUMBER (R_PARISC_LTOFF_FPTR14DR, 124)
+/*		load/store doubleword (3)  R(ltoff(fptr(symbol+addend)))  */
+
+RELOC_NUMBER (R_PARISC_LTOFF_FPTR16F,  125)
+/*		load/store (1)             ltoff(fptr(symbol+addend))     */
+
+RELOC_NUMBER (R_PARISC_LTOFF_FPTR16WF, 126)
+/*		load/store mod. comp. (2)  ltoff(fptr(symbol+addend))     */
+
+RELOC_NUMBER (R_PARISC_LTOFF_FPTR16DF, 127)
+/*		load/store doubleword (3)  ltoff(fptr(symbol+addend))     */
+
+
+RELOC_NUMBER (R_PARISC_COPY, 	       128)
+/*		data                       Dynamic relocations only 	  */
+
+RELOC_NUMBER (R_PARISC_IPLT, 	       129)
+/*		plt                                                 	  */
+
+RELOC_NUMBER (R_PARISC_EPLT, 	       130)
+/*		plt                                                 	  */
+
+
+RELOC_NUMBER (R_PARISC_TPREL32,        153)
+/*		32-bit word                symbol - TP + addend    	  */
+
+RELOC_NUMBER (R_PARISC_TPREL21L,       154)
+/*		long immediate (7)         LR(symbol - TP, addend) 	  */
+
+RELOC_NUMBER (R_PARISC_TPREL14R,       158)
+/*		load/store (1)             RR(symbol - TP, addend) 	  */
+
+
+RELOC_NUMBER (R_PARISC_LTOFF_TP21L,    162)
+/*		long immediate (7)         L(ltoff(symbol - TP + addend)) */
+
+RELOC_NUMBER (R_PARISC_LTOFF_TP14R,    166)
+/*		load/store (1)             R(ltoff(symbol - TP + addend)) */
+
+RELOC_NUMBER (R_PARISC_LTOFF_TP14F,    167)
+/*		load/store (1)             ltoff(symbol - TP + addend)    */
+
+
+RELOC_NUMBER (R_PARISC_TPREL64,        216)
+/*		64-bit word                symbol - TP + addend        	  */
+
+RELOC_NUMBER (R_PARISC_TPREL14WR,      219)    	  
+/*		load/store mod. comp. (2)  RR(symbol - TP, addend)     	  */
+
+RELOC_NUMBER (R_PARISC_TPREL14DR,      220)    	  
+/*		load/store doubleword (3)  RR(symbol - TP, addend)     	  */
+
+RELOC_NUMBER (R_PARISC_TPREL16F,       221)    	  
+/*		load/store (1)             symbol - TP + addend        	  */
+
+RELOC_NUMBER (R_PARISC_TPREL16WF,      222)    	  
+/*		load/store mod. comp. (2)  symbol - TP + addend        	  */
+
+RELOC_NUMBER (R_PARISC_TPREL16DF,      223)    	  
+/*		load/store doubleword (3)  symbol - TP + addend        	  */
+
+
+RELOC_NUMBER (R_PARISC_LTOFF_TP64,     224)
+/*		64-bit doubleword          ltoff(symbol - TP + addend)    */
+
+RELOC_NUMBER (R_PARISC_LTOFF_TP14WR,   227)
+/*		load/store mod. comp. (2)  R(ltoff(symbol - TP + addend)) */
+
+RELOC_NUMBER (R_PARISC_LTOFF_TP14DR,   228)
+/*		load/store doubleword (3)  R(ltoff(symbol - TP + addend)) */
+
+RELOC_NUMBER (R_PARISC_LTOFF_TP16F,    229)
+/*		load/store (1)             ltoff(symbol - TP + addend)    */
+
+RELOC_NUMBER (R_PARISC_LTOFF_TP16WF,   230)
+/*		load/store mod. comp. (2)  ltoff(symbol - TP + addend)    */
+
+RELOC_NUMBER (R_PARISC_LTOFF_TP16DF,   231)
+/*		load/store doubleword (3)  ltoff(symbol - TP + addend)    */
+
+RELOC_NUMBER (R_PARISC_GNU_VTENTRY,    232)
+RELOC_NUMBER (R_PARISC_GNU_VTINHERIT,  233)
+
+RELOC_NUMBER (R_PARISC_TLS_GD21L,      234)
+RELOC_NUMBER (R_PARISC_TLS_GD14R,      235)
+RELOC_NUMBER (R_PARISC_TLS_GDCALL,     236)
+RELOC_NUMBER (R_PARISC_TLS_LDM21L,     237)
+RELOC_NUMBER (R_PARISC_TLS_LDM14R,     238)
+RELOC_NUMBER (R_PARISC_TLS_LDMCALL,    239)
+RELOC_NUMBER (R_PARISC_TLS_LDO21L,     240)
+RELOC_NUMBER (R_PARISC_TLS_LDO14R,     241)
+RELOC_NUMBER (R_PARISC_TLS_DTPMOD32,   242)
+RELOC_NUMBER (R_PARISC_TLS_DTPMOD64,   243)
+RELOC_NUMBER (R_PARISC_TLS_DTPOFF32,   244)
+RELOC_NUMBER (R_PARISC_TLS_DTPOFF64,   245)
+
+END_RELOC_NUMBERS (R_PARISC_UNIMPLEMENTED)
+
+#define R_PARISC_TLS_LE21L     R_PARISC_TPREL21L
+#define R_PARISC_TLS_LE14R     R_PARISC_TPREL14R
+#define R_PARISC_TLS_IE21L     R_PARISC_LTOFF_TP21L
+#define R_PARISC_TLS_IE14R     R_PARISC_LTOFF_TP14R
+#define R_PARISC_TLS_TPREL32   R_PARISC_TPREL32
+#define R_PARISC_TLS_TPREL64   R_PARISC_TPREL64
+
+#ifndef RELOC_MACROS_GEN_FUNC
+typedef enum elf_hppa_reloc_type elf_hppa_reloc_type;
+#endif
+
+#define PT_PARISC_ARCHEXT	0x70000000
+#define PT_PARISC_UNWIND	0x70000001
+#define PT_PARISC_WEAKORDER	0x70000002
+
+/* Flag bits in sh_flags of ElfXX_Shdr.  */
+#define SHF_HP_TLS              0x01000000
+#define SHF_HP_NEAR_SHARED      0x02000000
+#define SHF_HP_FAR_SHARED       0x04000000
+#define SHF_HP_COMDAT           0x08000000
+#define SHF_HP_CONST            0x00800000
+
+/* Reserved section header indices.  */
+#define SHN_TLS_COMMON          (SHN_LOOS + 0x0)
+#define SHN_NS_COMMON           (SHN_LOOS + 0x1)
+#define SHN_FS_COMMON           (SHN_LOOS + 0x2)
+#define SHN_NS_UNDEF            (SHN_LOOS + 0x3)
+#define SHN_FS_UNDEF            (SHN_LOOS + 0x4)
+#define SHN_HP_EXTERN           (SHN_LOOS + 0x5)
+#define SHN_HP_EXTHINT          (SHN_LOOS + 0x6)
+#define SHN_HP_UNDEF_BIND_IMM   (SHN_LOOS + 0x7)
+
+/* Values of sh_type in ElfXX_Shdr.  */
+#define SHT_HP_OVLBITS  (SHT_LOOS + 0x0)
+#define SHT_HP_DLKM     (SHT_LOOS + 0x1)
+#define SHT_HP_COMDAT   (SHT_LOOS + 0x2)
+#define SHT_HP_OBJDICT  (SHT_LOOS + 0x3)
+#define SHT_HP_ANNOT    (SHT_LOOS + 0x4)
+
+/* Flag bits in p_flags of ElfXX_Phdr.  */
+#define PF_HP_CODE		0x00040000
+#define PF_HP_MODIFY		0x00080000
+#define PF_HP_PAGE_SIZE		0x00100000
+#define PF_HP_FAR_SHARED	0x00200000
+#define PF_HP_NEAR_SHARED	0x00400000
+#define PF_HP_LAZYSWAP		0x00800000
+#define PF_HP_CODE_DEPR		0x01000000
+#define PF_HP_MODIFY_DEPR	0x02000000
+#define PF_HP_LAZYSWAP_DEPR	0x04000000
+#define PF_PARISC_SBP		0x08000000
+#define PF_HP_SBP		0x08000000
+
+
+/* Processor specific dynamic array tags.  */
+
+/* Arggh.  HP's tools define these symbols based on the
+   old value of DT_LOOS.  So we must do the same to be
+   compatible.  */
+#define DT_HP_LOAD_MAP		(OLD_DT_LOOS + 0x0)
+#define DT_HP_DLD_FLAGS		(OLD_DT_LOOS + 0x1)
+#define DT_HP_DLD_HOOK		(OLD_DT_LOOS + 0x2)
+#define DT_HP_UX10_INIT		(OLD_DT_LOOS + 0x3)
+#define DT_HP_UX10_INITSZ	(OLD_DT_LOOS + 0x4)
+#define DT_HP_PREINIT		(OLD_DT_LOOS + 0x5)
+#define DT_HP_PREINITSZ		(OLD_DT_LOOS + 0x6)
+#define DT_HP_NEEDED		(OLD_DT_LOOS + 0x7)
+#define DT_HP_TIME_STAMP	(OLD_DT_LOOS + 0x8)
+#define DT_HP_CHECKSUM		(OLD_DT_LOOS + 0x9)
+#define DT_HP_GST_SIZE		(OLD_DT_LOOS + 0xa)
+#define DT_HP_GST_VERSION	(OLD_DT_LOOS + 0xb)
+#define DT_HP_GST_HASHVAL	(OLD_DT_LOOS + 0xc)
+#define DT_HP_EPLTREL		(OLD_DT_LOOS + 0xd)
+#define DT_HP_EPLTRELSZ		(OLD_DT_LOOS + 0xe)
+#define DT_HP_FILTERED		(OLD_DT_LOOS + 0xf)
+#define DT_HP_FILTER_TLS	(OLD_DT_LOOS + 0x10)
+#define DT_HP_COMPAT_FILTERED	(OLD_DT_LOOS + 0x11)
+#define DT_HP_LAZYLOAD		(OLD_DT_LOOS + 0x12)
+#define DT_HP_BIND_NOW_COUNT	(OLD_DT_LOOS + 0x13)
+#define DT_PLT			(OLD_DT_LOOS + 0x14)
+#define DT_PLT_SIZE		(OLD_DT_LOOS + 0x15)
+#define DT_DLT			(OLD_DT_LOOS + 0x16)
+#define DT_DLT_SIZE		(OLD_DT_LOOS + 0x17)
+
+/* Values for DT_HP_DLD_FLAGS.  */
+#define DT_HP_DEBUG_PRIVATE		0x00001 /* Map text private */
+#define DT_HP_DEBUG_CALLBACK		0x00002 /* Callback */
+#define DT_HP_DEBUG_CALLBACK_BOR	0x00004 /* BOR callback */
+#define DT_HP_NO_ENVVAR			0x00008 /* No env var */
+#define DT_HP_BIND_NOW			0x00010 /* Bind now */
+#define DT_HP_BIND_NONFATAL		0x00020 /* Bind non-fatal */
+#define DT_HP_BIND_VERBOSE		0x00040 /* Bind verbose */
+#define DT_HP_BIND_RESTRICTED		0x00080 /* Bind restricted */
+#define DT_HP_BIND_SYMBOLIC		0x00100 /* Bind symbolic */
+#define DT_HP_RPATH_FIRST		0x00200 /* RPATH first */
+#define DT_HP_BIND_DEPTH_FIRST		0x00400 /* Bind depth-first */
+#define DT_HP_GST			0x00800 /* Dld global sym table */
+#define DT_HP_SHLIB_FIXED		0x01000 /* shared vtable support */
+#define DT_HP_MERGE_SHLIB_SEG		0x02000 /* merge shlib data segs */
+#define DT_HP_NODELETE			0x04000 /* never unload */
+#define DT_HP_GROUP			0x08000 /* bind only within group */
+#define DT_HP_PROTECT_LINKAGE_TABLE	0x10000 /* protected linkage table */
+
+/* Program header extensions.  */
+#define PT_HP_TLS		(PT_LOOS + 0x0)
+#define PT_HP_CORE_NONE		(PT_LOOS + 0x1)
+#define PT_HP_CORE_VERSION	(PT_LOOS + 0x2)
+#define PT_HP_CORE_KERNEL	(PT_LOOS + 0x3)
+#define PT_HP_CORE_COMM		(PT_LOOS + 0x4)
+#define PT_HP_CORE_PROC		(PT_LOOS + 0x5)
+#define PT_HP_CORE_LOADABLE	(PT_LOOS + 0x6)
+#define PT_HP_CORE_STACK	(PT_LOOS + 0x7)
+#define PT_HP_CORE_SHM		(PT_LOOS + 0x8)
+#define PT_HP_CORE_MMF		(PT_LOOS + 0x9)
+#define PT_HP_PARALLEL		(PT_LOOS + 0x10)
+#define PT_HP_FASTBIND		(PT_LOOS + 0x11)
+#define PT_HP_OPT_ANNOT		(PT_LOOS + 0x12)
+#define PT_HP_HSL_ANNOT		(PT_LOOS + 0x13)
+#define PT_HP_STACK		(PT_LOOS + 0x14)
+#define PT_HP_CORE_UTSNAME	(PT_LOOS + 0x15)
+
+/* Binding information.  */
+#define STB_HP_ALIAS		(STB_LOOS + 0x0)
+
+/* Additional symbol types.  */
+#define STT_HP_OPAQUE		(STT_LOOS + 0x1)
+#define STT_HP_STUB		(STT_LOOS + 0x2)
+
+/* Note types.  */
+#define NT_HP_COMPILER		1
+#define NT_HP_COPYRIGHT		2
+#define NT_HP_VERSION		3
+#define NT_HP_SRCFILE_INFO	4
+#define NT_HP_LINKER		5
+#define NT_HP_INSTRUMENTED	6
+#define NT_HP_UX_OPTIONS	7
+
+#endif /* _ELF_HPPA_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/i370.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/i370.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/i370.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/i370.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,61 @@
+/* i370 ELF support for BFD.
+   Copyright 2000, 2002, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file holds definitions specific to the i370 ELF ABI.  Note
+   that most of this is not actually implemented by BFD.  */
+
+#ifndef _ELF_I370_H
+#define _ELF_I370_H
+
+#include "elf/reloc-macros.h"
+
+/* Processor specific section headers, sh_type field */
+
+#define SHT_ORDERED		SHT_HIPROC	/* Link editor is to sort the \
+						   entries in this section \
+						   based on the address \
+						   specified in the associated \
+						   symbol table entry.  */
+
+#define	EF_I370_RELOCATABLE	0x00010000	/* i370 -mrelocatable flag */
+#define	EF_I370_RELOCATABLE_LIB	0x00008000	/* i370 -mrelocatable-lib flag */
+
+/* i370 relocations
+   Note that there is really just one relocation that we currently
+   support (and only one that we seem to need, at the moment), and
+   that is the 31-bit address relocation.  Note that the 370/390
+   only supports a 31-bit (2GB) address space.  */
+
+START_RELOC_NUMBERS (i370_reloc_type)
+  RELOC_NUMBER (R_I370_NONE,      0)
+  RELOC_NUMBER (R_I370_ADDR31,    1)
+  RELOC_NUMBER (R_I370_ADDR32,    2)
+  RELOC_NUMBER (R_I370_ADDR16,    3) 
+  RELOC_NUMBER (R_I370_REL31,     4)
+  RELOC_NUMBER (R_I370_REL32,     5)  
+  RELOC_NUMBER (R_I370_ADDR12,    6)
+  RELOC_NUMBER (R_I370_REL12,     7)
+  RELOC_NUMBER (R_I370_ADDR8,     8)
+  RELOC_NUMBER (R_I370_REL8,      9)
+  RELOC_NUMBER (R_I370_COPY,     10)
+  RELOC_NUMBER (R_I370_RELATIVE, 11)
+END_RELOC_NUMBERS (R_I370_max)
+
+#endif /* _ELF_I370_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/i386.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/i386.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/i386.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/i386.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,79 @@
+/* ix86 ELF support for BFD.
+   Copyright 1998, 1999, 2000, 2002, 2004, 2005, 2006, 2009, 2010
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_I386_H
+#define _ELF_I386_H
+
+#include "elf/reloc-macros.h"
+
+START_RELOC_NUMBERS (elf_i386_reloc_type)
+     RELOC_NUMBER (R_386_NONE,      0)	/* No reloc */
+     RELOC_NUMBER (R_386_32,        1)	/* Direct 32 bit  */
+     RELOC_NUMBER (R_386_PC32,      2)	/* PC relative 32 bit */
+     RELOC_NUMBER (R_386_GOT32,     3)	/* 32 bit GOT entry */
+     RELOC_NUMBER (R_386_PLT32,	    4)	/* 32 bit PLT address */
+     RELOC_NUMBER (R_386_COPY,	    5)	/* Copy symbol at runtime */
+     RELOC_NUMBER (R_386_GLOB_DAT,  6)	/* Create GOT entry */
+     RELOC_NUMBER (R_386_JUMP_SLOT, 7)	/* Create PLT entry */
+     RELOC_NUMBER (R_386_RELATIVE,  8)	/* Adjust by program base */
+     RELOC_NUMBER (R_386_GOTOFF,    9)	/* 32 bit offset to GOT */
+     RELOC_NUMBER (R_386_GOTPC,    10)	/* 32 bit PC relative offset to GOT */
+     RELOC_NUMBER (R_386_32PLT,    11)	/* Used by Sun */
+     FAKE_RELOC   (FIRST_INVALID_RELOC, 12)
+     FAKE_RELOC   (LAST_INVALID_RELOC,  13)
+     RELOC_NUMBER (R_386_TLS_TPOFF,14)
+     RELOC_NUMBER (R_386_TLS_IE,   15)
+     RELOC_NUMBER (R_386_TLS_GOTIE,16)
+     RELOC_NUMBER (R_386_TLS_LE,   17)
+     RELOC_NUMBER (R_386_TLS_GD,   18)
+     RELOC_NUMBER (R_386_TLS_LDM,  19)
+     RELOC_NUMBER (R_386_16,       20)
+     RELOC_NUMBER (R_386_PC16,     21)
+     RELOC_NUMBER (R_386_8,	   22)
+     RELOC_NUMBER (R_386_PC8,      23)
+     RELOC_NUMBER (R_386_TLS_GD_32,    24)
+     RELOC_NUMBER (R_386_TLS_GD_PUSH,  25)
+     RELOC_NUMBER (R_386_TLS_GD_CALL,  26)
+     RELOC_NUMBER (R_386_TLS_GD_POP,   27)
+     RELOC_NUMBER (R_386_TLS_LDM_32,   28)
+     RELOC_NUMBER (R_386_TLS_LDM_PUSH, 29)
+     RELOC_NUMBER (R_386_TLS_LDM_CALL, 30)
+     RELOC_NUMBER (R_386_TLS_LDM_POP,  31)
+     RELOC_NUMBER (R_386_TLS_LDO_32,   32)
+     RELOC_NUMBER (R_386_TLS_IE_32,    33)
+     RELOC_NUMBER (R_386_TLS_LE_32,    34)
+     RELOC_NUMBER (R_386_TLS_DTPMOD32, 35)
+     RELOC_NUMBER (R_386_TLS_DTPOFF32, 36)
+     RELOC_NUMBER (R_386_TLS_TPOFF32,  37)
+/* 38 */
+     RELOC_NUMBER (R_386_TLS_GOTDESC,  39)
+     RELOC_NUMBER (R_386_TLS_DESC_CALL,40)
+     RELOC_NUMBER (R_386_TLS_DESC,     41)
+     RELOC_NUMBER (R_386_IRELATIVE,    42) /* Adjust indirectly by program base */
+
+     /* Used by Intel.  */
+     RELOC_NUMBER (R_386_USED_BY_INTEL_200, 200)
+
+     /* These are GNU extensions to enable C++ vtable garbage collection.  */
+     RELOC_NUMBER (R_386_GNU_VTINHERIT, 250)
+     RELOC_NUMBER (R_386_GNU_VTENTRY, 251)
+END_RELOC_NUMBERS (R_386_max)
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/i860.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/i860.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/i860.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/i860.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,66 @@
+/* i860 ELF support for BFD.
+   Copyright 2000, 2010 Free Software Foundation, Inc.
+
+   Contributed by Jason Eckhardt <jle@cygnus.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_I860_H
+#define _ELF_I860_H
+
+/* Note: i860 ELF is defined to use only RELA relocations.  */
+
+#include "elf/reloc-macros.h"
+
+START_RELOC_NUMBERS (elf_i860_reloc_type)
+     RELOC_NUMBER (R_860_NONE,      0x00)	/* No reloc */
+     RELOC_NUMBER (R_860_32,        0x01)	/* S+A  */
+     RELOC_NUMBER (R_860_COPY,	    0x02)	/* No calculation */
+     RELOC_NUMBER (R_860_GLOB_DAT,  0x03)	/* S, Create GOT entry */
+     RELOC_NUMBER (R_860_JUMP_SLOT, 0x04)	/* S+A, Create PLT entry */
+     RELOC_NUMBER (R_860_RELATIVE,  0x05)	/* B+A, Adj by program base */
+     RELOC_NUMBER (R_860_PC26,      0x30)	/* (S+A-P) >> 2 */ 
+     RELOC_NUMBER (R_860_PLT26,	    0x31)	/* (L+A-P) >> 2 */
+     RELOC_NUMBER (R_860_PC16,      0x32)	/* (S+A-P) >> 2 */
+     RELOC_NUMBER (R_860_LOW0,      0x40)	/* S+A */
+     RELOC_NUMBER (R_860_SPLIT0,    0x42)	/* S+A */       
+     RELOC_NUMBER (R_860_LOW1,      0x44)	/* S+A */
+     RELOC_NUMBER (R_860_SPLIT1,    0x46)	/* S+A */
+     RELOC_NUMBER (R_860_LOW2,      0x48)	/* S+A */
+     RELOC_NUMBER (R_860_SPLIT2,    0x4A)	/* S+A */
+     RELOC_NUMBER (R_860_LOW3,      0x4C)	/* S+A */
+     RELOC_NUMBER (R_860_LOGOT0,    0x50)	/* G */
+     RELOC_NUMBER (R_860_SPGOT0,    0x52)	/* G */
+     RELOC_NUMBER (R_860_LOGOT1,    0x54)	/* G */
+     RELOC_NUMBER (R_860_SPGOT1,    0x56)	/* G */
+     RELOC_NUMBER (R_860_LOGOTOFF0, 0x60)	/* O */
+     RELOC_NUMBER (R_860_SPGOTOFF0, 0x62)	/* O */
+     RELOC_NUMBER (R_860_LOGOTOFF1, 0x64)	/* O */
+     RELOC_NUMBER (R_860_SPGOTOFF1, 0x66)	/* O */
+     RELOC_NUMBER (R_860_LOGOTOFF2, 0x68)	/* O */
+     RELOC_NUMBER (R_860_LOGOTOFF3, 0x6C)	/* O */
+     RELOC_NUMBER (R_860_LOPC,      0x70)	/* (S+A-P) >> 2 */
+     RELOC_NUMBER (R_860_HIGHADJ,   0x80)	/* hiadj(S+A) */
+     RELOC_NUMBER (R_860_HAGOT,     0x90)	/* hiadj(G) */
+     RELOC_NUMBER (R_860_HAGOTOFF,  0xA0)	/* hiadj(O) */
+     RELOC_NUMBER (R_860_HAPC,      0xB0)	/* hiadj((S+A-P) >> 2) */
+     RELOC_NUMBER (R_860_HIGH,      0xC0)	/* (S+A) >> 16 */
+     RELOC_NUMBER (R_860_HIGOT,     0xD0)	/* G >> 16 */
+     RELOC_NUMBER (R_860_HIGOTOFF,  0xE0)	/* O */
+END_RELOC_NUMBERS (R_860_max)
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/i960.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/i960.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/i960.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/i960.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,37 @@
+/* Intel 960 ELF support for BFD.
+   Copyright 1999, 2000, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_I960_H
+#define _ELF_I960_H
+
+#include "elf/reloc-macros.h"
+
+
+START_RELOC_NUMBERS (elf_i960_reloc_type)
+     RELOC_NUMBER (R_960_NONE,	    0)
+     RELOC_NUMBER (R_960_12,	    1)
+     RELOC_NUMBER (R_960_32,	    2)
+     RELOC_NUMBER (R_960_IP24,	    3)
+     RELOC_NUMBER (R_960_SUB,	    4)
+     RELOC_NUMBER (R_960_OPTCALL,   5)
+     RELOC_NUMBER (R_960_OPTCALLX,  6)
+     RELOC_NUMBER (R_960_OPTCALLXA, 7)
+END_RELOC_NUMBERS (R_960_max)
+
+#endif /* _ELF_I960_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/ia64.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/ia64.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/ia64.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/ia64.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,412 @@
+/* IA-64 ELF support for BFD.
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2008, 2009, 2010
+   Free Software Foundation, Inc.
+   Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _ELF_IA64_H
+#define _ELF_IA64_H
+
+/* Bits in the e_flags field of the Elf64_Ehdr:  */
+
+#define EF_IA_64_MASKOS	   0x0000000f	/* OS-specific flags.  */
+#define EF_IA_64_ARCH	   0xff000000	/* Arch. version mask.  */
+#define EF_IA_64_ARCHVER_1 (1 << 24)    /* Arch. version level 1 compat.  */
+
+/* ??? These four definitions are not part of the SVR4 ABI.
+   They were present in David's initial code drop, so it is probable
+   that they are used by HP/UX.  */
+#define EF_IA_64_TRAPNIL (1 << 0)	/* Trap NIL pointer dereferences.  */
+#define EF_IA_64_EXT	 (1 << 2)	/* Program uses arch. extensions.  */
+#define EF_IA_64_BE	 (1 << 3)	/* PSR BE bit set (big-endian).  */
+#define EFA_IA_64_EAS2_3 0x23000000	/* IA64 EAS 2.3.  */
+
+#define EF_IA_64_ABI64		    (1 << 4) /* 64-bit ABI.  */
+/* Not used yet.  */
+#define EF_IA_64_REDUCEDFP	    (1 << 5) /* Only FP6-FP11 used.  */
+#define EF_IA_64_CONS_GP	    (1 << 6) /* gp as program wide constant.  */
+#define EF_IA_64_NOFUNCDESC_CONS_GP (1 << 7) /* And no function descriptors.  */
+/* Not used yet.  */
+#define EF_IA_64_ABSOLUTE	    (1 << 8) /* Load at absolute addresses.  */
+
+/* OpenVMS speficic.  */
+#define EF_IA_64_VMS_COMCOD	    0x03   /* Completion code.  */
+#define EF_IA_64_VMS_COMCOD_SUCCESS 0
+#define EF_IA_64_VMS_COMCOD_WARNING 1
+#define EF_IA_64_VMS_COMCOD_ERROR   2
+#define EF_IA_64_VMS_COMCOD_ABORT   3
+#define EF_IA_64_VMS_LINKAGES	    0x04   /* Contains VMS linkages info.  */
+
+#define ELF_STRING_ia64_archext		".IA_64.archext"
+#define ELF_STRING_ia64_pltoff		".IA_64.pltoff"
+#define ELF_STRING_ia64_unwind		".IA_64.unwind"
+#define ELF_STRING_ia64_unwind_info	".IA_64.unwind_info"
+#define ELF_STRING_ia64_unwind_once	".gnu.linkonce.ia64unw."
+#define ELF_STRING_ia64_unwind_info_once ".gnu.linkonce.ia64unwi."
+/* .IA_64.unwind_hdr is only used by HP-UX.  */
+#define ELF_STRING_ia64_unwind_hdr	".IA_64.unwind_hdr"
+
+/* Bits in the sh_flags field of Elf64_Shdr:  */
+
+#define SHF_IA_64_SHORT		  0x10000000	/* Section near gp.  */
+#define SHF_IA_64_NORECOV	  0x20000000	/* Spec insns w/o recovery.  */
+
+#define SHF_IA_64_HP_TLS	  0x01000000	/* HP specific TLS flag.  */
+
+#define SHF_IA_64_VMS_GLOBAL      0x0100000000ULL /* Global for clustering.  */
+#define SHF_IA_64_VMS_OVERLAID    0x0200000000ULL /* To be overlaid.  */
+#define SHF_IA_64_VMS_SHARED      0x0400000000ULL /* Shared btw processes.  */
+#define SHF_IA_64_VMS_VECTOR      0x0800000000ULL /* Priv change mode vect.  */
+#define SHF_IA_64_VMS_ALLOC_64BIT 0x1000000000ULL /* Allocate beyond 2GB.  */
+#define SHF_IA_64_VMS_PROTECTED   0x2000000000ULL /* Export from sharable.  */
+
+/* Possible values for sh_type in Elf64_Shdr: */
+
+#define SHT_IA_64_EXT		(SHT_LOPROC + 0)	/* Extension bits.  */
+#define SHT_IA_64_UNWIND	(SHT_LOPROC + 1)	/* Unwind bits.  */
+#define SHT_IA_64_LOPSREG	(SHT_LOPROC + 0x8000000)
+/* ABI says (SHT_LOPROC + 0xfffffff) but I think it's a typo -- this makes sense.  */
+#define SHT_IA_64_HIPSREG	(SHT_LOPROC + 0x8ffffff)
+#define SHT_IA_64_PRIORITY_INIT (SHT_LOPROC + 0x9000000)
+
+/* SHT_IA_64_HP_OPT_ANOT is only generated by HPUX compilers for its
+   optimization annotation section.  GCC does not generate it but we
+   want readelf to know what they are.  Do not use two capital Ns in
+   annotate or sed will turn it into 32 or 64 during the build.  */
+#define SHT_IA_64_HP_OPT_ANOT	0x60000004
+
+/* OpenVMS section types.  */
+/* The section contains PC-to-source correlation information for use by the
+   VMS RTL's traceback facility.  */
+#define SHT_IA_64_VMS_TRACE             0x60000000
+/* The section contains routine signature information for use by the
+   translated image executive.  */
+#define SHT_IA_64_VMS_TIE_SIGNATURES    0x60000001
+/* The section contains dwarf-3 information.  */
+#define SHT_IA_64_VMS_DEBUG             0x60000002
+/* The section contains the dwarf-3 string table.  */
+#define SHT_IA_64_VMS_DEBUG_STR         0x60000003
+/* The section contains linkage information to perform consistency checking
+   accross object modules.  */
+#define SHT_IA_64_VMS_LINKAGES          0x60000004
+/* The section allows the symbol vector in an image to be location through
+   the section table.  */
+#define SHT_IA_64_VMS_SYMBOL_VECTOR     0x60000005
+/* The section contains inter-image fixups.  */
+#define SHT_IA_64_VMS_FIXUP             0x60000006
+/* The section contains unmangled name info.  */
+#define SHT_IA_64_VMS_DISPLAY_NAME_INFO 0x60000007
+
+/* Bits in the p_flags field of Elf64_Phdr:  */
+
+#define PF_IA_64_NORECOV	0x80000000
+
+/* Possible values for p_type in Elf64_Phdr:  */
+
+#define PT_IA_64_ARCHEXT	(PT_LOPROC + 0)	/* Arch extension bits,  */
+#define PT_IA_64_UNWIND 	(PT_LOPROC + 1)	/* IA64 unwind bits.  */
+
+/* HP-UX specific values for p_type in Elf64_Phdr.
+   These values are currently just used to make
+   readelf more usable on HP-UX.  */
+
+#define PT_IA_64_HP_OPT_ANOT	(PT_LOOS + 0x12)
+#define PT_IA_64_HP_HSL_ANOT	(PT_LOOS + 0x13)
+#define PT_IA_64_HP_STACK	(PT_LOOS + 0x14)
+
+/* Possible values for d_tag in Elf64_Dyn:  */
+
+#define DT_IA_64_PLT_RESERVE	(DT_LOPROC + 0)
+
+/* VMS specific values for d_tag in Elf64_Dyn:  */
+
+#define DT_IA_64_VMS_SUBTYPE         (DT_LOOS + 0)
+#define DT_IA_64_VMS_IMGIOCNT        (DT_LOOS + 2)
+#define DT_IA_64_VMS_LNKFLAGS        (DT_LOOS + 8)
+#define DT_IA_64_VMS_VIR_MEM_BLK_SIZ (DT_LOOS + 10)
+#define DT_IA_64_VMS_IDENT           (DT_LOOS + 12)
+#define DT_IA_64_VMS_NEEDED_IDENT    (DT_LOOS + 16)
+#define DT_IA_64_VMS_IMG_RELA_CNT    (DT_LOOS + 18)
+#define DT_IA_64_VMS_SEG_RELA_CNT    (DT_LOOS + 20)
+#define DT_IA_64_VMS_FIXUP_RELA_CNT  (DT_LOOS + 22)
+#define DT_IA_64_VMS_FIXUP_NEEDED    (DT_LOOS + 24)
+#define DT_IA_64_VMS_SYMVEC_CNT      (DT_LOOS + 26)
+#define DT_IA_64_VMS_XLATED          (DT_LOOS + 30)
+#define DT_IA_64_VMS_STACKSIZE       (DT_LOOS + 32)
+#define DT_IA_64_VMS_UNWINDSZ        (DT_LOOS + 34)
+#define DT_IA_64_VMS_UNWIND_CODSEG   (DT_LOOS + 36)
+#define DT_IA_64_VMS_UNWIND_INFOSEG  (DT_LOOS + 38)
+#define DT_IA_64_VMS_LINKTIME        (DT_LOOS + 40)
+#define DT_IA_64_VMS_SEG_NO          (DT_LOOS + 42)
+#define DT_IA_64_VMS_SYMVEC_OFFSET   (DT_LOOS + 44)
+#define DT_IA_64_VMS_SYMVEC_SEG      (DT_LOOS + 46)
+#define DT_IA_64_VMS_UNWIND_OFFSET   (DT_LOOS + 48)
+#define DT_IA_64_VMS_UNWIND_SEG      (DT_LOOS + 50)
+#define DT_IA_64_VMS_STRTAB_OFFSET   (DT_LOOS + 52)
+#define DT_IA_64_VMS_SYSVER_OFFSET   (DT_LOOS + 54)
+#define DT_IA_64_VMS_IMG_RELA_OFF    (DT_LOOS + 56)
+#define DT_IA_64_VMS_SEG_RELA_OFF    (DT_LOOS + 58)
+#define DT_IA_64_VMS_FIXUP_RELA_OFF  (DT_LOOS + 60)
+#define DT_IA_64_VMS_PLTGOT_OFFSET   (DT_LOOS + 62)
+#define DT_IA_64_VMS_PLTGOT_SEG      (DT_LOOS + 64)
+#define DT_IA_64_VMS_FPMODE          (DT_LOOS + 66)
+
+/* Values for DT_IA_64_LNKFLAGS.  */
+#define VMS_LF_CALL_DEBUG	0x0001	/* Activate and call the debugger.  */
+#define VMS_LF_NOP0BUFS		0x0002	/* RMS use of P0 for i/o disabled.  */
+#define VMS_LF_P0IMAGE		0x0004	/* Image in P0 space only.  */
+#define VMS_LF_MKTHREADS	0x0008	/* Multiple kernel threads enabled.  */
+#define VMS_LF_UPCALLS		0x0010	/* Upcalls enabled.  */
+#define VMS_LF_IMGSTA		0x0020	/* Use SYS$IMGSTA.  */
+#define VMS_LF_INITIALIZE	0x0040	/* Image uses tfradr2.  */
+#define VMS_LF_MAIN		0x0080	/* Image uses tfradr3.  */
+#define VMS_LF_EXE_INIT		0x0200	/* Image uses tfradr4.  */
+#define VMS_LF_TBK_IN_IMG	0x0400	/* Traceback records in image.  */
+#define VMS_LF_DBG_IN_IMG	0x0800	/* Debug records in image.  */
+#define VMS_LF_TBK_IN_DSF	0x1000	/* Traceback records in DSF.  */
+#define VMS_LF_DBG_IN_DSF	0x2000	/* Debug records in DSF.  */
+#define VMS_LF_SIGNATURES	0x4000	/* Signatures present.  */
+#define VMS_LF_REL_SEG_OFF	0x8000	/* Maintain relative pos of seg.  */
+
+/* This section only used by HP-UX, The HP linker gives weak symbols
+   precedence over regular common symbols.  We want common to override
+   weak.  Using this common instead of SHN_COMMON does that.  */
+#define SHN_IA_64_ANSI_COMMON SHN_LORESERVE
+
+/* This section is only used by OpenVMS.  Symbol is defined in the symbol
+   vector (only possible for image files).  */
+#define SHN_IA_64_VMS_SYMVEC SHN_LOOS
+
+/* OpenVMS IA64-specific symbol attributes.  */
+#define VMS_STO_VISIBILITY 3	  /* Alias of the standard field.  */
+#define VMS_ST_VISIBILITY(o) ((o) & VMS_STO_VISIBILITY)
+#define VMS_STO_FUNC_TYPE  0x30	  /* Function type.  */
+#define VMS_ST_FUNC_TYPE(o)  (((o) & VMS_STO_FUNC_TYPE) >> 4)
+# define VMS_SFT_CODE_ADDR 0	  /* Symbol value is a code address.  */
+# define VMS_SFT_SYMV_IDX  1	  /* Symbol value is a symbol vector index.  */
+# define VMS_SFT_FD	   2	  /* Symbol value is a function descriptor.  */
+# define VMS_SFT_RESERVE   3	  /* Reserved.  */
+#define VMS_STO_LINKAGE    0xc0
+#define VMS_ST_LINKAGE(o)  (((o) & VMS_STO_LINKAGE) >> 6)
+# define VMS_STL_IGNORE	   0	  /* No associated linkage.  */
+# define VMS_STL_RESERVE   1
+# define VMS_STL_STD	   2	  /* Standard linkage with return value.  */
+# define VMS_STL_LNK	   3	  /* Explicit represented in .vms_linkages.  */
+
+/* OpenVMS specific fixup and relocation structures.  */
+
+typedef struct
+{
+  unsigned char fixup_offset[8];
+  unsigned char type[4];
+  unsigned char fixup_seg[4];
+  unsigned char addend[8];
+  unsigned char symvec_index[4];
+  unsigned char data_type[4];
+} Elf64_External_VMS_IMAGE_FIXUP;
+
+typedef struct
+{
+  unsigned char rela_offset[8];
+  unsigned char type[4];
+  unsigned char rela_seg[4];
+  unsigned char addend[8];
+  unsigned char sym_offset[8];
+  unsigned char sym_seg[4];
+  unsigned char fill_1[4];
+} Elf64_External_VMS_IMAGE_RELA;
+
+/* Note segments.  VMS is special as it uses 64-bit entries.  */
+
+typedef struct {
+  unsigned char	namesz[8];		/* Size of entry's owner string */
+  unsigned char	descsz[8];		/* Size of the note descriptor */
+  unsigned char	type[8];		/* Interpretation of the descriptor */
+  char		name[1];		/* Start of the name+desc data */
+} Elf64_External_VMS_Note;
+
+#define NT_VMS_MHD         1 /* Object module name, version, and date/time.  */
+#define NT_VMS_LNM         2 /* Language processor name.  */
+#define NT_VMS_SRC         3 /* Source files.  */
+#define NT_VMS_TITLE       4 /* Title text.  */
+#define NT_VMS_EIDC        5 /* Entity ident consistency check.  */
+#define NT_VMS_FPMODE      6 /* Whole program floating-point mode.  */
+#define NT_VMS_LINKTIME  101 /* Date/time image was linked.  */
+#define NT_VMS_IMGNAM    102 /* Image name string.  */
+#define NT_VMS_IMGID     103 /* Image ident string.  */
+#define NT_VMS_LINKID    104 /* Linker ident string.  */
+#define NT_VMS_IMGBID    105 /* Image build ident string.  */
+#define NT_VMS_GSTNAM    106 /* Global Symbol Table Name.  */
+#define NT_VMS_ORIG_DYN  107 /* Original setting of dynamic data.  */
+#define NT_VMS_PATCHTIME 108 /* Date/time of last patch.  */
+
+/* Corresponding data for NT_VMS_ORIG_DYM.  */
+
+typedef struct  {
+  unsigned char major_id[4];		/* Should be 1.  */
+  unsigned char minor_id[4];		/* Should be 3.  */
+  unsigned char manipulation_date[8];	/* Original NT_VMS_LNKTIME.  */
+  unsigned char link_flags[8];		/* Original NT_VMS_LNKFLAGS.  */
+  unsigned char elf_flags[4];		/* Original ehdr flags.  */
+  unsigned char _pad[4];
+  unsigned char imgid[1];		/* Original NT_VMS_IMGID.  */
+} Elf64_External_VMS_ORIG_DYN_Note;
+
+/* IA64-specific relocation types: */
+
+/* Relocs apply to specific instructions within a bundle.  The least
+   significant 2 bits of the address indicate which instruction in the
+   bundle the reloc refers to (0=first slot, 1=second slow, 2=third
+   slot, 3=undefined) and the remaining bits give the address of the
+   bundle (16 byte aligned).
+
+   The top 5 bits of the reloc code specifies the expression type, the
+   low 3 bits the format of the data word being relocated.  */
+
+#include "elf/reloc-macros.h"
+
+START_RELOC_NUMBERS (elf_ia64_reloc_type)
+  RELOC_NUMBER (R_IA64_NONE, 0x00)	/* none */
+
+  RELOC_NUMBER (R_IA64_IMM14, 0x21)	/* symbol + addend, add imm14 */
+  RELOC_NUMBER (R_IA64_IMM22, 0x22)	/* symbol + addend, add imm22 */
+  RELOC_NUMBER (R_IA64_IMM64, 0x23)	/* symbol + addend, mov imm64 */
+  RELOC_NUMBER (R_IA64_DIR32MSB, 0x24)	/* symbol + addend, data4 MSB */
+  RELOC_NUMBER (R_IA64_DIR32LSB, 0x25)	/* symbol + addend, data4 LSB */
+  RELOC_NUMBER (R_IA64_DIR64MSB, 0x26)	/* symbol + addend, data8 MSB */
+  RELOC_NUMBER (R_IA64_DIR64LSB, 0x27)	/* symbol + addend, data8 LSB */
+
+  RELOC_NUMBER (R_IA64_GPREL22, 0x2a)	/* @gprel(sym+add), add imm22 */
+  RELOC_NUMBER (R_IA64_GPREL64I, 0x2b)	/* @gprel(sym+add), mov imm64 */
+  RELOC_NUMBER (R_IA64_GPREL32MSB, 0x2c) /* @gprel(sym+add), data4 MSB */
+  RELOC_NUMBER (R_IA64_GPREL32LSB, 0x2d) /* @gprel(sym+add), data4 LSB */
+  RELOC_NUMBER (R_IA64_GPREL64MSB, 0x2e) /* @gprel(sym+add), data8 MSB */
+  RELOC_NUMBER (R_IA64_GPREL64LSB, 0x2f) /* @gprel(sym+add), data8 LSB */
+
+  RELOC_NUMBER (R_IA64_LTOFF22, 0x32)	/* @ltoff(sym+add), add imm22 */
+  RELOC_NUMBER (R_IA64_LTOFF64I, 0x33)	/* @ltoff(sym+add), mov imm64 */
+
+  RELOC_NUMBER (R_IA64_PLTOFF22, 0x3a)	/* @pltoff(sym+add), add imm22 */
+  RELOC_NUMBER (R_IA64_PLTOFF64I, 0x3b)	/* @pltoff(sym+add), mov imm64 */
+  RELOC_NUMBER (R_IA64_PLTOFF64MSB, 0x3e) /* @pltoff(sym+add), data8 MSB */
+  RELOC_NUMBER (R_IA64_PLTOFF64LSB, 0x3f) /* @pltoff(sym+add), data8 LSB */
+
+  RELOC_NUMBER (R_IA64_FPTR64I, 0x43)	/* @fptr(sym+add), mov imm64 */
+  RELOC_NUMBER (R_IA64_FPTR32MSB, 0x44)	/* @fptr(sym+add), data4 MSB */
+  RELOC_NUMBER (R_IA64_FPTR32LSB, 0x45)	/* @fptr(sym+add), data4 LSB */
+  RELOC_NUMBER (R_IA64_FPTR64MSB, 0x46)	/* @fptr(sym+add), data8 MSB */
+  RELOC_NUMBER (R_IA64_FPTR64LSB, 0x47)	/* @fptr(sym+add), data8 LSB */
+
+  RELOC_NUMBER (R_IA64_PCREL60B, 0x48)	/* @pcrel(sym+add), brl */
+  RELOC_NUMBER (R_IA64_PCREL21B, 0x49)	/* @pcrel(sym+add), ptb, call */
+  RELOC_NUMBER (R_IA64_PCREL21M, 0x4a)	/* @pcrel(sym+add), chk.s */
+  RELOC_NUMBER (R_IA64_PCREL21F, 0x4b)	/* @pcrel(sym+add), fchkf */
+  RELOC_NUMBER (R_IA64_PCREL32MSB, 0x4c) /* @pcrel(sym+add), data4 MSB */
+  RELOC_NUMBER (R_IA64_PCREL32LSB, 0x4d) /* @pcrel(sym+add), data4 LSB */
+  RELOC_NUMBER (R_IA64_PCREL64MSB, 0x4e) /* @pcrel(sym+add), data8 MSB */
+  RELOC_NUMBER (R_IA64_PCREL64LSB, 0x4f) /* @pcrel(sym+add), data8 LSB */
+
+  RELOC_NUMBER (R_IA64_LTOFF_FPTR22, 0x52) /* @ltoff(@fptr(s+a)), imm22 */
+  RELOC_NUMBER (R_IA64_LTOFF_FPTR64I, 0x53) /* @ltoff(@fptr(s+a)), imm64 */
+  RELOC_NUMBER (R_IA64_LTOFF_FPTR32MSB, 0x54) /* @ltoff(@fptr(s+a)), 4 MSB */
+  RELOC_NUMBER (R_IA64_LTOFF_FPTR32LSB, 0x55) /* @ltoff(@fptr(s+a)), 4 LSB */
+  RELOC_NUMBER (R_IA64_LTOFF_FPTR64MSB, 0x56) /* @ltoff(@fptr(s+a)), 8 MSB */
+  RELOC_NUMBER (R_IA64_LTOFF_FPTR64LSB, 0x57) /* @ltoff(@fptr(s+a)), 8 LSB */
+
+  RELOC_NUMBER (R_IA64_SEGREL32MSB, 0x5c) /* @segrel(sym+add), data4 MSB */
+  RELOC_NUMBER (R_IA64_SEGREL32LSB, 0x5d) /* @segrel(sym+add), data4 LSB */
+  RELOC_NUMBER (R_IA64_SEGREL64MSB, 0x5e) /* @segrel(sym+add), data8 MSB */
+  RELOC_NUMBER (R_IA64_SEGREL64LSB, 0x5f) /* @segrel(sym+add), data8 LSB */
+
+  RELOC_NUMBER (R_IA64_SECREL32MSB, 0x64) /* @secrel(sym+add), data4 MSB */
+  RELOC_NUMBER (R_IA64_SECREL32LSB, 0x65) /* @secrel(sym+add), data4 LSB */
+  RELOC_NUMBER (R_IA64_SECREL64MSB, 0x66) /* @secrel(sym+add), data8 MSB */
+  RELOC_NUMBER (R_IA64_SECREL64LSB, 0x67) /* @secrel(sym+add), data8 LSB */
+
+  RELOC_NUMBER (R_IA64_REL32MSB, 0x6c)	/* data 4 + REL */
+  RELOC_NUMBER (R_IA64_REL32LSB, 0x6d)	/* data 4 + REL */
+  RELOC_NUMBER (R_IA64_REL64MSB, 0x6e)	/* data 8 + REL */
+  RELOC_NUMBER (R_IA64_REL64LSB, 0x6f)	/* data 8 + REL */
+
+  RELOC_NUMBER (R_IA64_LTV32MSB, 0x74)	/* symbol + addend, data4 MSB */
+  RELOC_NUMBER (R_IA64_LTV32LSB, 0x75)	/* symbol + addend, data4 LSB */
+  RELOC_NUMBER (R_IA64_LTV64MSB, 0x76)	/* symbol + addend, data8 MSB */
+  RELOC_NUMBER (R_IA64_LTV64LSB, 0x77)	/* symbol + addend, data8 LSB */
+
+  RELOC_NUMBER (R_IA64_PCREL21BI, 0x79)	/* @pcrel(sym+add), ptb, call */
+  RELOC_NUMBER (R_IA64_PCREL22, 0x7a)	/* @pcrel(sym+add), imm22 */
+  RELOC_NUMBER (R_IA64_PCREL64I, 0x7b)	/* @pcrel(sym+add), imm64 */
+
+  RELOC_NUMBER (R_IA64_IPLTMSB, 0x80)	/* dynamic reloc, imported PLT, MSB */
+  RELOC_NUMBER (R_IA64_IPLTLSB, 0x81)	/* dynamic reloc, imported PLT, LSB */
+  RELOC_NUMBER (R_IA64_COPY, 0x84)	/* dynamic reloc, data copy */
+  RELOC_NUMBER (R_IA64_LTOFF22X, 0x86)  /* LTOFF22, relaxable.  */
+  RELOC_NUMBER (R_IA64_LDXMOV, 0x87)	/* Use of LTOFF22X.  */
+
+  RELOC_NUMBER (R_IA64_TPREL14, 0x91)	 /* @tprel(sym+add), add imm14 */
+  RELOC_NUMBER (R_IA64_TPREL22, 0x92)	 /* @tprel(sym+add), add imm22 */
+  RELOC_NUMBER (R_IA64_TPREL64I, 0x93)	 /* @tprel(sym+add), add imm64 */
+  RELOC_NUMBER (R_IA64_TPREL64MSB, 0x96) /* @tprel(sym+add), data8 MSB */
+  RELOC_NUMBER (R_IA64_TPREL64LSB, 0x97) /* @tprel(sym+add), data8 LSB */
+
+  RELOC_NUMBER (R_IA64_LTOFF_TPREL22, 0x9a) /* @ltoff(@tprel(s+a)), add imm22 */
+
+  RELOC_NUMBER (R_IA64_DTPMOD64MSB, 0xa6) /* @dtpmod(sym+add), data8 MSB */
+  RELOC_NUMBER (R_IA64_DTPMOD64LSB, 0xa7) /* @dtpmod(sym+add), data8 LSB */
+  RELOC_NUMBER (R_IA64_LTOFF_DTPMOD22, 0xaa) /* @ltoff(@dtpmod(s+a)), imm22 */
+
+  RELOC_NUMBER (R_IA64_DTPREL14, 0xb1)    /* @dtprel(sym+add), imm14 */
+  RELOC_NUMBER (R_IA64_DTPREL22, 0xb2)    /* @dtprel(sym+add), imm22 */
+  RELOC_NUMBER (R_IA64_DTPREL64I, 0xb3)   /* @dtprel(sym+add), imm64 */
+  RELOC_NUMBER (R_IA64_DTPREL32MSB, 0xb4) /* @dtprel(sym+add), data4 MSB */
+  RELOC_NUMBER (R_IA64_DTPREL32LSB, 0xb5) /* @dtprel(sym+add), data4 LSB */
+  RELOC_NUMBER (R_IA64_DTPREL64MSB, 0xb6) /* @dtprel(sym+add), data8 MSB */
+  RELOC_NUMBER (R_IA64_DTPREL64LSB, 0xb7) /* @dtprel(sym+add), data8 LSB */
+
+  RELOC_NUMBER (R_IA64_LTOFF_DTPREL22, 0xba) /* @ltoff(@dtprel(s+a)), imm22 */
+
+  FAKE_RELOC (R_IA64_MAX_RELOC_CODE, 0xba)
+
+  /* OpenVMS specific relocs.  */
+  RELOC_NUMBER (R_IA64_VMS_DIR8, 0x70000000)		/* S + A */
+  RELOC_NUMBER (R_IA64_VMS_DIR16LSB, 0x70000001)	/* S + A */
+  RELOC_NUMBER (R_IA64_VMS_CALL_SIGNATURE, 0x70000002)
+  RELOC_NUMBER (R_IA64_VMS_EXECLET_FUNC, 0x70000003)
+  RELOC_NUMBER (R_IA64_VMS_EXECLET_DATA, 0x70000004)
+  RELOC_NUMBER (R_IA64_VMS_FIX8, 0x70000005)		/* S + A */
+  RELOC_NUMBER (R_IA64_VMS_FIX16, 0x70000006)		/* S + A */
+  RELOC_NUMBER (R_IA64_VMS_FIX32, 0x70000007)		/* S + A */
+  RELOC_NUMBER (R_IA64_VMS_FIX64, 0x70000008)		/* S + A */
+  RELOC_NUMBER (R_IA64_VMS_FIXFD, 0x70000009)
+  RELOC_NUMBER (R_IA64_VMS_ACC_LOAD, 0x7000000a)	/* ACC = S + A */
+  RELOC_NUMBER (R_IA64_VMS_ACC_ADD, 0x7000000b)		/* ACC += S + A */
+  RELOC_NUMBER (R_IA64_VMS_ACC_SUB, 0x7000000c)		/* ACC -= S + A */
+  RELOC_NUMBER (R_IA64_VMS_ACC_MUL, 0x7000000d)		/* ACC *= S + A */
+  RELOC_NUMBER (R_IA64_VMS_ACC_DIV, 0x7000000e)		/* ACC /= S + A */
+  RELOC_NUMBER (R_IA64_VMS_ACC_AND, 0x7000000f)		/* ACC &= S + A */
+  RELOC_NUMBER (R_IA64_VMS_ACC_IOR, 0x70000010)		/* ACC |= S + A */
+  RELOC_NUMBER (R_IA64_VMS_ACC_EOR, 0x70000011)		/* ACC ^= S + A */
+  RELOC_NUMBER (R_IA64_VMS_ACC_ASH, 0x70000012)		/* ACC >>= S + A */
+  RELOC_NUMBER (R_IA64_VMS_ACC_STO8, 0x70000014)	/* ACC */
+  RELOC_NUMBER (R_IA64_VMS_ACC_STO16LSH, 0x70000015)	/* ACC */
+  RELOC_NUMBER (R_IA64_VMS_ACC_STO32LSH, 0x70000016)	/* ACC */
+  RELOC_NUMBER (R_IA64_VMS_ACC_STO64LSH, 0x70000017)	/* ACC */
+END_RELOC_NUMBERS (R_IA64_max)
+
+#endif /* _ELF_IA64_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/internal.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/internal.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/internal.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/internal.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,360 @@
+/* ELF support for BFD.
+   Copyright 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000, 2001, 2002,
+   2003, 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc.
+
+   Written by Fred Fish @ Cygnus Support, from information published
+   in "UNIX System V Release 4, Programmers Guide: ANSI C and
+   Programming Support Tools".
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file is part of ELF support for BFD, and contains the portions
+   that describe how ELF is represented internally in the BFD library.
+   I.E. it describes the in-memory representation of ELF.  It requires
+   the elf-common.h file which contains the portions that are common to
+   both the internal and external representations.  */
+
+/* NOTE that these structures are not kept in the same order as they appear
+   in the object file.  In some cases they've been reordered for more optimal
+   packing under various circumstances.  */
+
+#ifndef _ELF_INTERNAL_H
+#define _ELF_INTERNAL_H
+
+/* Special section indices, which may show up in st_shndx fields, among
+   other places.  */
+
+#undef SHN_UNDEF
+#undef SHN_LORESERVE
+#undef SHN_LOPROC
+#undef SHN_HIPROC
+#undef SHN_LOOS
+#undef SHN_HIOS
+#undef SHN_ABS
+#undef SHN_COMMON
+#undef SHN_XINDEX
+#undef SHN_HIRESERVE
+#define SHN_UNDEF	0		/* Undefined section reference */
+#define SHN_LORESERVE	(-0x100u)	/* Begin range of reserved indices */
+#define SHN_LOPROC	(-0x100u)	/* Begin range of appl-specific */
+#define SHN_HIPROC	(-0xE1u)	/* End range of appl-specific */
+#define SHN_LOOS	(-0xE0u)	/* OS specific semantics, lo */
+#define SHN_HIOS	(-0xC1u)	/* OS specific semantics, hi */
+#define SHN_ABS		(-0xFu)		/* Associated symbol is absolute */
+#define SHN_COMMON	(-0xEu)		/* Associated symbol is in common */
+#define SHN_XINDEX	(-0x1u)		/* Section index is held elsewhere */
+#define SHN_HIRESERVE	(-0x1u)		/* End range of reserved indices */
+#define SHN_BAD		(-0x101u)	/* Used internally by bfd */
+
+/* ELF Header */
+
+#define EI_NIDENT	16		/* Size of e_ident[] */
+
+typedef struct elf_internal_ehdr {
+  unsigned char		e_ident[EI_NIDENT]; /* ELF "magic number" */
+  bfd_vma		e_entry;	/* Entry point virtual address */
+  bfd_size_type		e_phoff;	/* Program header table file offset */
+  bfd_size_type		e_shoff;	/* Section header table file offset */
+  unsigned long		e_version;	/* Identifies object file version */
+  unsigned long		e_flags;	/* Processor-specific flags */
+  unsigned short	e_type;		/* Identifies object file type */
+  unsigned short	e_machine;	/* Specifies required architecture */
+  unsigned int		e_ehsize;	/* ELF header size in bytes */
+  unsigned int		e_phentsize;	/* Program header table entry size */
+  unsigned int		e_phnum;	/* Program header table entry count */
+  unsigned int		e_shentsize;	/* Section header table entry size */
+  unsigned int		e_shnum;	/* Section header table entry count */
+  unsigned int		e_shstrndx;	/* Section header string table index */
+} Elf_Internal_Ehdr;
+
+/* Program header */
+
+struct elf_internal_phdr {
+  unsigned long	p_type;			/* Identifies program segment type */
+  unsigned long	p_flags;		/* Segment flags */
+  bfd_vma	p_offset;		/* Segment file offset */
+  bfd_vma	p_vaddr;		/* Segment virtual address */
+  bfd_vma	p_paddr;		/* Segment physical address */
+  bfd_vma	p_filesz;		/* Segment size in file */
+  bfd_vma	p_memsz;		/* Segment size in memory */
+  bfd_vma	p_align;		/* Segment alignment, file & memory */
+};
+
+typedef struct elf_internal_phdr Elf_Internal_Phdr;
+
+/* Section header */
+
+typedef struct elf_internal_shdr {
+  unsigned int	sh_name;		/* Section name, index in string tbl */
+  unsigned int	sh_type;		/* Type of section */
+  bfd_vma	sh_flags;		/* Miscellaneous section attributes */
+  bfd_vma	sh_addr;		/* Section virtual addr at execution */
+  file_ptr	sh_offset;		/* Section file offset */
+  bfd_size_type	sh_size;		/* Size of section in bytes */
+  unsigned int	sh_link;		/* Index of another section */
+  unsigned int	sh_info;		/* Additional section information */
+  bfd_vma	sh_addralign;		/* Section alignment */
+  bfd_size_type	sh_entsize;		/* Entry size if section holds table */
+
+  /* The internal rep also has some cached info associated with it. */
+  asection *	bfd_section;		/* Associated BFD section.  */
+  unsigned char *contents;		/* Section contents.  */
+} Elf_Internal_Shdr;
+
+/* Symbol table entry */
+
+struct elf_internal_sym {
+  bfd_vma	st_value;		/* Value of the symbol */
+  bfd_vma	st_size;		/* Associated symbol size */
+  unsigned long	st_name;		/* Symbol name, index in string tbl */
+  unsigned char	st_info;		/* Type and binding attributes */
+  unsigned char	st_other;		/* Visibilty, and target specific */
+  unsigned char st_target_internal;	/* Internal-only information */
+  unsigned int  st_shndx;		/* Associated section index */
+};
+
+typedef struct elf_internal_sym Elf_Internal_Sym;
+
+/* Note segments */
+
+typedef struct elf_internal_note {
+  unsigned long	namesz;			/* Size of entry's owner string */
+  unsigned long	descsz;			/* Size of the note descriptor */
+  unsigned long	type;			/* Interpretation of the descriptor */
+  char *	namedata;		/* Start of the name+desc data */
+  char *	descdata;		/* Start of the desc data */
+  bfd_vma	descpos;		/* File offset of the descdata */
+} Elf_Internal_Note;
+
+/* Relocation Entries */
+
+typedef struct elf_internal_rela {
+  bfd_vma	r_offset;	/* Location at which to apply the action */
+  bfd_vma	r_info;		/* Index and Type of relocation */
+  bfd_vma	r_addend;	/* Constant addend used to compute value */
+} Elf_Internal_Rela;
+
+/* dynamic section structure */
+
+typedef struct elf_internal_dyn {
+  /* This needs to support 64-bit values in elf64.  */
+  bfd_vma d_tag;		/* entry tag value */
+  union {
+    /* This needs to support 64-bit values in elf64.  */
+    bfd_vma	d_val;
+    bfd_vma	d_ptr;
+  } d_un;
+} Elf_Internal_Dyn;
+
+/* This structure appears in a SHT_GNU_verdef section.  */
+
+typedef struct elf_internal_verdef {
+  unsigned short vd_version;	/* Version number of structure.  */
+  unsigned short vd_flags;	/* Flags (VER_FLG_*).  */
+  unsigned short vd_ndx;	/* Version index.  */
+  unsigned short vd_cnt;	/* Number of verdaux entries.  */
+  unsigned long	 vd_hash;	/* Hash of name.  */
+  unsigned long	 vd_aux;	/* Offset to verdaux entries.  */
+  unsigned long	 vd_next;	/* Offset to next verdef.  */
+
+  /* These fields are set up when BFD reads in the structure.  FIXME:
+     It would be cleaner to store these in a different structure.  */
+  bfd			      *vd_bfd;		/* BFD.  */
+  const char		      *vd_nodename;	/* Version name.  */
+  struct elf_internal_verdef  *vd_nextdef;	/* vd_next as pointer.  */
+  struct elf_internal_verdaux *vd_auxptr;	/* vd_aux as pointer.  */
+  unsigned int		       vd_exp_refno;	/* Used by the linker.  */
+} Elf_Internal_Verdef;
+
+/* This structure appears in a SHT_GNU_verdef section.  */
+
+typedef struct elf_internal_verdaux {
+  unsigned long vda_name;	/* String table offset of name.  */
+  unsigned long vda_next;	/* Offset to next verdaux.  */
+
+  /* These fields are set up when BFD reads in the structure.  FIXME:
+     It would be cleaner to store these in a different structure.  */
+  const char *vda_nodename;			/* vda_name as pointer.  */
+  struct elf_internal_verdaux *vda_nextptr;	/* vda_next as pointer.  */
+} Elf_Internal_Verdaux;
+
+/* This structure appears in a SHT_GNU_verneed section.  */
+
+typedef struct elf_internal_verneed {
+  unsigned short vn_version;	/* Version number of structure.  */
+  unsigned short vn_cnt;	/* Number of vernaux entries.  */
+  unsigned long	 vn_file;	/* String table offset of library name.  */
+  unsigned long	 vn_aux;	/* Offset to vernaux entries.  */
+  unsigned long	 vn_next;	/* Offset to next verneed.  */
+
+  /* These fields are set up when BFD reads in the structure.  FIXME:
+     It would be cleaner to store these in a different structure.  */
+  bfd			      *vn_bfd;		/* BFD.  */
+  const char                  *vn_filename;	/* vn_file as pointer.  */
+  struct elf_internal_vernaux *vn_auxptr;	/* vn_aux as pointer.  */
+  struct elf_internal_verneed *vn_nextref;	/* vn_nextref as pointer.  */
+} Elf_Internal_Verneed;
+
+/* This structure appears in a SHT_GNU_verneed section.  */
+
+typedef struct elf_internal_vernaux {
+  unsigned long	 vna_hash;	/* Hash of dependency name.  */
+  unsigned short vna_flags;	/* Flags (VER_FLG_*).  */
+  unsigned short vna_other;	/* Unused.  */
+  unsigned long	 vna_name;	/* String table offset to version name.  */
+  unsigned long	 vna_next;	/* Offset to next vernaux.  */
+
+  /* These fields are set up when BFD reads in the structure.  FIXME:
+     It would be cleaner to store these in a different structure.  */
+  const char                  *vna_nodename;	/* vna_name as pointer.  */
+  struct elf_internal_vernaux *vna_nextptr;	/* vna_next as pointer.  */
+} Elf_Internal_Vernaux;
+
+/* This structure appears in a SHT_GNU_versym section.  This is not a
+   standard ELF structure; ELF just uses Elf32_Half.  */
+
+typedef struct elf_internal_versym {
+  unsigned short vs_vers;
+} Elf_Internal_Versym;
+
+/* Structure for syminfo section.  */
+typedef struct
+{
+  unsigned short int 	si_boundto;
+  unsigned short int	si_flags;
+} Elf_Internal_Syminfo;
+
+/* This structure appears on the stack and in NT_AUXV core file notes.  */
+typedef struct
+{
+  bfd_vma a_type;
+  bfd_vma a_val;
+} Elf_Internal_Auxv;
+
+
+/* This structure is used to describe how sections should be assigned
+   to program segments.  */
+
+struct elf_segment_map
+{
+  /* Next program segment.  */
+  struct elf_segment_map *next;
+  /* Program segment type.  */
+  unsigned long p_type;
+  /* Program segment flags.  */
+  unsigned long p_flags;
+  /* Program segment physical address.  */
+  bfd_vma p_paddr;
+  /* Program segment virtual address offset from section vma.  */
+  bfd_vma p_vaddr_offset;
+  /* Program segment alignment.  */
+  bfd_vma p_align;
+  /* Segment size in file and memory */
+  bfd_vma p_size;
+  /* Required size of filehdr + phdrs, if non-zero */
+  bfd_vma header_size;
+  /* Whether the p_flags field is valid; if not, the flags are based
+     on the section flags.  */
+  unsigned int p_flags_valid : 1;
+  /* Whether the p_paddr field is valid; if not, the physical address
+     is based on the section lma values.  */
+  unsigned int p_paddr_valid : 1;
+  /* Whether the p_align field is valid; if not, PT_LOAD segment
+     alignment is based on the default maximum page size.  */
+  unsigned int p_align_valid : 1;
+  /* Whether the p_size field is valid; if not, the size are based
+     on the section sizes.  */
+  unsigned int p_size_valid : 1;
+  /* Whether this segment includes the file header.  */
+  unsigned int includes_filehdr : 1;
+  /* Whether this segment includes the program headers.  */
+  unsigned int includes_phdrs : 1;
+  /* Number of sections (may be 0).  */
+  unsigned int count;
+  /* Sections.  Actual number of elements is in count field.  */
+  asection *sections[1];
+};
+
+/* .tbss is special.  It doesn't contribute memory space to normal
+   segments and it doesn't take file space in normal segments.  */
+#define ELF_TBSS_SPECIAL(sec_hdr, segment)			\
+  (((sec_hdr)->sh_flags & SHF_TLS) != 0				\
+   && (sec_hdr)->sh_type == SHT_NOBITS				\
+   && (segment)->p_type != PT_TLS)
+
+#define ELF_SECTION_SIZE(sec_hdr, segment)			\
+  (ELF_TBSS_SPECIAL(sec_hdr, segment) ? 0 : (sec_hdr)->sh_size)
+
+/* Decide if the section SEC_HDR is in SEGMENT.  If CHECK_VMA, then
+   VMAs are checked for alloc sections.  If STRICT, then a zero size
+   section won't match at the end of a segment, unless the segment
+   is also zero size.  Regardless of STRICT and CHECK_VMA, zero size
+   sections won't match at the start or end of PT_DYNAMIC, unless
+   PT_DYNAMIC is itself zero sized.  */
+#define ELF_SECTION_IN_SEGMENT_1(sec_hdr, segment, check_vma, strict)	\
+  ((/* Only PT_LOAD, PT_GNU_RELRO and PT_TLS segments can contain	\
+       SHF_TLS sections.  */						\
+    ((((sec_hdr)->sh_flags & SHF_TLS) != 0)				\
+     && ((segment)->p_type == PT_TLS					\
+	 || (segment)->p_type == PT_GNU_RELRO				\
+	 || (segment)->p_type == PT_LOAD))				\
+    /* PT_TLS segment contains only SHF_TLS sections, PT_PHDR no	\
+       sections at all.  */						\
+    || (((sec_hdr)->sh_flags & SHF_TLS) == 0				\
+	&& (segment)->p_type != PT_TLS					\
+	&& (segment)->p_type != PT_PHDR))				\
+   /* Any section besides one of type SHT_NOBITS must have file		\
+      offsets within the segment.  */					\
+   && ((sec_hdr)->sh_type == SHT_NOBITS					\
+       || ((bfd_vma) (sec_hdr)->sh_offset >= (segment)->p_offset	\
+	   && (!(strict)						\
+	       || ((sec_hdr)->sh_offset - (segment)->p_offset		\
+		   <= (segment)->p_filesz - 1))				\
+	   && (((sec_hdr)->sh_offset - (segment)->p_offset		\
+		+ ELF_SECTION_SIZE(sec_hdr, segment))			\
+	       <= (segment)->p_filesz)))				\
+   /* SHF_ALLOC sections must have VMAs within the segment.  */		\
+   && (!(check_vma)							\
+       || ((sec_hdr)->sh_flags & SHF_ALLOC) == 0			\
+       || ((sec_hdr)->sh_addr >= (segment)->p_vaddr			\
+	   && (!(strict)						\
+	       || ((sec_hdr)->sh_addr - (segment)->p_vaddr		\
+		   <= (segment)->p_memsz - 1))				\
+	   && (((sec_hdr)->sh_addr - (segment)->p_vaddr			\
+		+ ELF_SECTION_SIZE(sec_hdr, segment))			\
+	       <= (segment)->p_memsz)))					\
+   /* No zero size sections at start or end of PT_DYNAMIC.  */		\
+   && ((segment)->p_type != PT_DYNAMIC					\
+       || (sec_hdr)->sh_size != 0					\
+       || (segment)->p_memsz == 0					\
+       || (((sec_hdr)->sh_type == SHT_NOBITS				\
+	    || ((bfd_vma) (sec_hdr)->sh_offset > (segment)->p_offset	\
+	        && ((sec_hdr)->sh_offset - (segment)->p_offset		\
+		    < (segment)->p_filesz)))				\
+	   && (((sec_hdr)->sh_flags & SHF_ALLOC) == 0			\
+	       || ((sec_hdr)->sh_addr > (segment)->p_vaddr		\
+		   && ((sec_hdr)->sh_addr - (segment)->p_vaddr		\
+		       < (segment)->p_memsz))))))
+
+#define ELF_SECTION_IN_SEGMENT(sec_hdr, segment)			\
+  (ELF_SECTION_IN_SEGMENT_1 (sec_hdr, segment, 1, 0))
+
+#define ELF_SECTION_IN_SEGMENT_STRICT(sec_hdr, segment)			\
+  (ELF_SECTION_IN_SEGMENT_1 (sec_hdr, segment, 1, 1))
+
+#endif /* _ELF_INTERNAL_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/ip2k.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/ip2k.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/ip2k.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/ip2k.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,62 @@
+/* IP2xxx ELF support for BFD.
+   Copyright (C) 2000, 2002, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_IP2K_H
+#define _ELF_IP2K_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_ip2k_reloc_type)
+  RELOC_NUMBER (R_IP2K_NONE, 0)
+  RELOC_NUMBER (R_IP2K_16, 1)
+  RELOC_NUMBER (R_IP2K_32, 2)
+  RELOC_NUMBER (R_IP2K_FR9, 3)
+  RELOC_NUMBER (R_IP2K_BANK, 4)
+  RELOC_NUMBER (R_IP2K_ADDR16CJP, 5)
+  RELOC_NUMBER (R_IP2K_PAGE3, 6)
+  RELOC_NUMBER (R_IP2K_LO8DATA, 7)
+  RELOC_NUMBER (R_IP2K_HI8DATA, 8)
+  RELOC_NUMBER (R_IP2K_LO8INSN, 9)
+  RELOC_NUMBER (R_IP2K_HI8INSN, 10)
+  RELOC_NUMBER (R_IP2K_PC_SKIP, 11)
+  RELOC_NUMBER (R_IP2K_TEXT, 12)
+  RELOC_NUMBER (R_IP2K_FR_OFFSET, 13)
+  RELOC_NUMBER (R_IP2K_EX8DATA, 14)
+END_RELOC_NUMBERS(R_IP2K_max)
+
+
+/* Define the data & instruction memory discriminator.  In a linked
+   executable, an symbol should be deemed to point to an instruction
+   if ((address & IP2K_INSN_MASK) == IP2K_INSN_VALUE), and similarly
+   for the data space.  See also `ld/emulparams/elf32ip2k.sh'.  */
+/* ??? Consider extending the _MASK values to include all the
+   intermediate bits that must be zero due to the limited physical
+   memory size on the IP2K.  */
+
+#define IP2K_DATA_MASK   0xff000000
+#define IP2K_DATA_VALUE  0x01000000
+#define IP2K_INSN_MASK   0xff000000
+#define IP2K_INSN_VALUE  0x02000000
+
+/* The location of the memory mapped hardware stack.  */
+#define IP2K_STACK_VALUE 0x0f000000
+#define IP2K_STACK_SIZE  0x20
+
+#endif /* _ELF_IP2K_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/iq2000.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/iq2000.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/iq2000.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/iq2000.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,58 @@
+/* IQ2000 ELF support for BFD.
+   Copyright (C) 2002, 2003, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_IQ2000_H
+#define _ELF_IQ2000_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_iq2000_reloc_type)
+  RELOC_NUMBER (R_IQ2000_NONE, 0)
+  RELOC_NUMBER (R_IQ2000_16, 1)
+  RELOC_NUMBER (R_IQ2000_32, 2)
+  RELOC_NUMBER (R_IQ2000_26, 3)
+  RELOC_NUMBER (R_IQ2000_PC16, 4)
+  RELOC_NUMBER (R_IQ2000_HI16, 5)
+  RELOC_NUMBER (R_IQ2000_LO16, 6)
+  RELOC_NUMBER (R_IQ2000_OFFSET_16, 7)
+  RELOC_NUMBER (R_IQ2000_OFFSET_21, 8)
+  RELOC_NUMBER (R_IQ2000_UHI16, 9)
+  RELOC_NUMBER (R_IQ2000_32_DEBUG, 10)
+  RELOC_NUMBER (R_IQ2000_GNU_VTINHERIT, 200)
+  RELOC_NUMBER (R_IQ2000_GNU_VTENTRY, 201)
+END_RELOC_NUMBERS(R_IQ2000_max)
+
+#define EF_IQ2000_CPU_IQ2000	0x00000001      /* default */
+#define EF_IQ2000_CPU_IQ10      0x00000002      /* IQ10 */
+#define EF_IQ2000_CPU_MASK	0x00000003	/* specific cpu bits */
+#define EF_IQ2000_ALL_FLAGS	(EF_IQ2000_CPU_MASK)
+
+/* Define the data & instruction memory discriminator.  In a linked
+   executable, an symbol should be deemed to point to an instruction
+   if ((address & IQ2000_INSN_MASK) == IQ2000_INSN_VALUE), and similarly
+   for the data space.  */
+
+#define IQ2000_DATA_MASK   0x80000000
+#define IQ2000_DATA_VALUE  0x00000000
+#define IQ2000_INSN_MASK   0x80000000
+#define IQ2000_INSN_VALUE  0x80000000
+
+
+#endif /* _ELF_IQ2000_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/lm32.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/lm32.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/lm32.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/lm32.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,56 @@
+/* Lattice Mico32 ELF support for BFD.
+   Copyright 2008, 2010   Free Software Foundation, Inc.
+   Contributed by Jon Beniston <jon@beniston.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_LM32_H
+#define _ELF_LM32_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_lm32_reloc_type)
+     RELOC_NUMBER (R_LM32_NONE,                      0)
+     RELOC_NUMBER (R_LM32_8,                         1)
+     RELOC_NUMBER (R_LM32_16,                        2)
+     RELOC_NUMBER (R_LM32_32,                        3)
+     RELOC_NUMBER (R_LM32_HI16,                      4)
+     RELOC_NUMBER (R_LM32_LO16,                      5)
+     RELOC_NUMBER (R_LM32_GPREL16,                   6)
+     RELOC_NUMBER (R_LM32_CALL,                      7)
+     RELOC_NUMBER (R_LM32_BRANCH,                    8)
+     RELOC_NUMBER (R_LM32_GNU_VTINHERIT,             9)
+     RELOC_NUMBER (R_LM32_GNU_VTENTRY,               10)
+     RELOC_NUMBER (R_LM32_16_GOT,                    11)
+     RELOC_NUMBER (R_LM32_GOTOFF_HI16,               12)
+     RELOC_NUMBER (R_LM32_GOTOFF_LO16,               13)
+     RELOC_NUMBER (R_LM32_COPY,                      14)
+     RELOC_NUMBER (R_LM32_GLOB_DAT,                  15)
+     RELOC_NUMBER (R_LM32_JMP_SLOT,                  16)
+     RELOC_NUMBER (R_LM32_RELATIVE,                  17)
+END_RELOC_NUMBERS (R_LM32_max)
+
+/* Processor specific flags for the ELF header e_flags field.  */
+
+#define EF_LM32_MACH                 0x00000001
+
+/* Various CPU types.  */
+
+#define E_LM32_MACH                  0x1
+
+#endif /* _ELF_LM32_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/m32c.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/m32c.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/m32c.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/m32c.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,67 @@
+/* M32C ELF support for BFD.
+   Copyright (C) 2004, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_M32C_H
+#define _ELF_M32C_H
+
+#include "elf/reloc-macros.h"
+
+  /* Relocations.  */
+  START_RELOC_NUMBERS (elf_m32c_reloc_type)
+     RELOC_NUMBER (R_M32C_NONE, 0)
+     RELOC_NUMBER (R_M32C_16, 1)
+     RELOC_NUMBER (R_M32C_24, 2)
+     RELOC_NUMBER (R_M32C_32, 3)
+     RELOC_NUMBER (R_M32C_8_PCREL, 4)
+     RELOC_NUMBER (R_M32C_16_PCREL, 5)
+
+    /* 8 bit unsigned address, used for dsp8[a0] etc */
+     RELOC_NUMBER (R_M32C_8, 6)
+    /* Bits 0..15 of an address, for SMOVF's A0, A1A0, etc. */
+     RELOC_NUMBER (R_M32C_LO16, 7)
+    /* Bits 16..23 of an address, for SMOVF's R1H etc. */
+     RELOC_NUMBER (R_M32C_HI8, 8)
+    /* Bits 16..31 of an address, for LDE's A1A0 etc. */
+     RELOC_NUMBER (R_M32C_HI16, 9)
+
+    /* These are relocs we need when relaxing.  */
+    /* Marks various jump opcodes.  */
+     RELOC_NUMBER (R_M32C_RL_JUMP, 10)
+    /* Marks standard one-address form.  */
+     RELOC_NUMBER (R_M32C_RL_1ADDR, 11)
+    /* Marks standard two-address form.  */
+     RELOC_NUMBER (R_M32C_RL_2ADDR, 12)
+
+     END_RELOC_NUMBERS (R_M32C_max)
+
+#define EF_M32C_CPU_M16C	0x00000075      /* default */
+#define EF_M32C_CPU_M32C        0x00000078      /* m32c */
+#define EF_M32C_CPU_MASK	0x0000007F	/* specific cpu bits */
+#define EF_M32C_ALL_FLAGS	(EF_M32C_CPU_MASK)
+
+/* Define the data & instruction memory discriminator.  In a linked
+   executable, an symbol should be deemed to point to an instruction
+   if ((address & M16C_INSN_MASK) == M16C_INSN_VALUE), and similarly
+   for the data space.  See also `ld/emulparams/elf32m32c.sh'.  */
+#define M32C_DATA_MASK   0xffc00000
+#define M32C_DATA_VALUE  0x00000000
+#define M32C_INSN_MASK   0xffc00000
+#define M32C_INSN_VALUE  0x00400000
+
+#endif /* _ELF_M32C_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/m32r.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/m32r.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/m32r.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/m32r.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,123 @@
+/* M32R ELF support for BFD.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2003, 2004, 2008, 2010
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_M32R_H
+#define _ELF_M32R_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_m32r_reloc_type)
+  RELOC_NUMBER (R_M32R_NONE, 0)
+  /* REL relocations */
+  RELOC_NUMBER (R_M32R_16, 1)		 /* For backwards compatibility. */
+  RELOC_NUMBER (R_M32R_32, 2)		 /* For backwards compatibility. */
+  RELOC_NUMBER (R_M32R_24, 3)		 /* For backwards compatibility. */
+  RELOC_NUMBER (R_M32R_10_PCREL, 4)	 /* For backwards compatibility. */
+  RELOC_NUMBER (R_M32R_18_PCREL, 5)	 /* For backwards compatibility. */
+  RELOC_NUMBER (R_M32R_26_PCREL, 6)	 /* For backwards compatibility. */
+  RELOC_NUMBER (R_M32R_HI16_ULO, 7)	 /* For backwards compatibility. */
+  RELOC_NUMBER (R_M32R_HI16_SLO, 8)	 /* For backwards compatibility. */
+  RELOC_NUMBER (R_M32R_LO16, 9)		 /* For backwards compatibility. */
+  RELOC_NUMBER (R_M32R_SDA16, 10)	 /* For backwards compatibility. */
+  RELOC_NUMBER (R_M32R_GNU_VTINHERIT, 11)/* For backwards compatibility. */
+  RELOC_NUMBER (R_M32R_GNU_VTENTRY, 12)	 /* For backwards compatibility. */
+
+  /* RELA relocations */
+  RELOC_NUMBER (R_M32R_16_RELA, 33)
+  RELOC_NUMBER (R_M32R_32_RELA, 34)
+  RELOC_NUMBER (R_M32R_24_RELA, 35)
+  RELOC_NUMBER (R_M32R_10_PCREL_RELA, 36)
+  RELOC_NUMBER (R_M32R_18_PCREL_RELA, 37)
+  RELOC_NUMBER (R_M32R_26_PCREL_RELA, 38)
+  RELOC_NUMBER (R_M32R_HI16_ULO_RELA, 39)
+  RELOC_NUMBER (R_M32R_HI16_SLO_RELA, 40)
+  RELOC_NUMBER (R_M32R_LO16_RELA, 41)
+  RELOC_NUMBER (R_M32R_SDA16_RELA, 42)
+  RELOC_NUMBER (R_M32R_RELA_GNU_VTINHERIT, 43)
+  RELOC_NUMBER (R_M32R_RELA_GNU_VTENTRY, 44)
+
+  RELOC_NUMBER (R_M32R_REL32, 45)
+                                                                                
+  RELOC_NUMBER (R_M32R_GOT24, 48)
+  RELOC_NUMBER (R_M32R_26_PLTREL, 49)
+  RELOC_NUMBER (R_M32R_COPY, 50)
+  RELOC_NUMBER (R_M32R_GLOB_DAT, 51)
+  RELOC_NUMBER (R_M32R_JMP_SLOT, 52)
+  RELOC_NUMBER (R_M32R_RELATIVE, 53)
+  RELOC_NUMBER (R_M32R_GOTOFF, 54)
+  RELOC_NUMBER (R_M32R_GOTPC24, 55)
+  RELOC_NUMBER (R_M32R_GOT16_HI_ULO, 56)
+  RELOC_NUMBER (R_M32R_GOT16_HI_SLO, 57)
+  RELOC_NUMBER (R_M32R_GOT16_LO, 58)
+  RELOC_NUMBER (R_M32R_GOTPC_HI_ULO, 59)
+  RELOC_NUMBER (R_M32R_GOTPC_HI_SLO, 60)
+  RELOC_NUMBER (R_M32R_GOTPC_LO, 61)
+  RELOC_NUMBER (R_M32R_GOTOFF_HI_ULO, 62)
+  RELOC_NUMBER (R_M32R_GOTOFF_HI_SLO, 63)
+  RELOC_NUMBER (R_M32R_GOTOFF_LO, 64)
+
+END_RELOC_NUMBERS (R_M32R_max)
+
+/* Processor specific section indices.  These sections do not actually
+   exist.  Symbols with a st_shndx field corresponding to one of these
+   values have a special meaning.  */
+
+/* Small common symbol.  */
+#define SHN_M32R_SCOMMON	SHN_LORESERVE
+
+/* Processor specific section flags.  */
+
+/* This section contains sufficient relocs to be relaxed.
+   When relaxing, even relocs of branch instructions the assembler could
+   complete must be present because relaxing may cause the branch target to
+   move.  */
+#define SHF_M32R_CAN_RELAX	0x10000000
+
+/* Processor specific flags for the ELF header e_flags field.  */
+
+/* Two bit m32r architecture field.  */
+#define EF_M32R_ARCH		0x30000000
+
+/* m32r code.  */
+#define E_M32R_ARCH		0x00000000
+/* m32rx code.  */
+#define E_M32RX_ARCH            0x10000000
+/* m32r2 code.  */
+#define E_M32R2_ARCH            0x20000000
+
+/* 12 bit m32r new instructions field.  */
+#define EF_M32R_INST            0x0FFF0000
+/* Parallel instructions.  */
+#define E_M32R_HAS_PARALLEL     0x00010000
+/* Hidden instructions for m32rx:
+   jc, jnc, macwhi-a, macwlo-a, mulwhi-a, mulwlo-a, sth+, shb+, sat, pcmpbz,
+   sc, snc.  */
+#define E_M32R_HAS_HIDDEN_INST  0x00020000
+/* New bit instructions:
+   clrpsw, setpsw, bset, bclr, btst.  */
+#define E_M32R_HAS_BIT_INST     0x00040000
+/* Floating point instructions.  */
+#define E_M32R_HAS_FLOAT_INST   0x00080000
+
+/* 4 bit m32r ignore to check field.  */
+#define EF_M32R_IGNORE          0x0000000F
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/m68hc11.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/m68hc11.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/m68hc11.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/m68hc11.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,95 @@
+/* m68hc11 & m68hc12 ELF support for BFD.
+   Copyright 1999, 2000, 2001, 2002, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_M68HC11_H
+#define _ELF_M68HC11_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocation types.  */
+START_RELOC_NUMBERS (elf_m68hc11_reloc_type)
+  RELOC_NUMBER (R_M68HC11_NONE, 0)
+  RELOC_NUMBER (R_M68HC11_8, 1)
+  RELOC_NUMBER (R_M68HC11_HI8, 2)
+  RELOC_NUMBER (R_M68HC11_LO8, 3)
+  RELOC_NUMBER (R_M68HC11_PCREL_8, 4)
+  RELOC_NUMBER (R_M68HC11_16, 5)
+  RELOC_NUMBER (R_M68HC11_32, 6)
+  RELOC_NUMBER (R_M68HC11_3B, 7)
+  RELOC_NUMBER (R_M68HC11_PCREL_16, 8)
+
+     /* These are GNU extensions to enable C++ vtable garbage collection.  */
+  RELOC_NUMBER (R_M68HC11_GNU_VTINHERIT, 9)
+  RELOC_NUMBER (R_M68HC11_GNU_VTENTRY, 10)
+
+  RELOC_NUMBER (R_M68HC11_24, 11)
+  RELOC_NUMBER (R_M68HC11_LO16, 12)
+  RELOC_NUMBER (R_M68HC11_PAGE, 13)
+
+     /* GNU extension for linker relaxation.
+        Mark beginning of a jump instruction (any form).  */
+  RELOC_NUMBER (R_M68HC11_RL_JUMP, 20)
+
+     /* Mark beginning of Gcc relaxation group instruction.  */
+  RELOC_NUMBER (R_M68HC11_RL_GROUP, 21)
+END_RELOC_NUMBERS (R_M68HC11_max)
+
+/* Processor specific flags for the ELF header e_flags field.  */
+
+/* ABI identification.  */
+#define EF_M68HC11_ABI  0x00000000F
+
+/* Integers are 32-bit long.  */
+#define E_M68HC11_I32   0x000000001
+
+/* Doubles are 64-bit long.  */
+#define E_M68HC11_F64   0x000000002
+
+/* Uses 68HC12 memory banks.  */
+#define E_M68HC12_BANKS 0x000000004
+
+#define EF_M68HC11_MACH_MASK 0xF0
+#define EF_M68HC11_GENERIC   0x00 /* Generic 68HC12/backward compatibility.  */
+#define EF_M68HC12_MACH      0x10 /* 68HC12 microcontroller.  */
+#define EF_M68HCS12_MACH     0x20 /* 68HCS12 microcontroller.  */
+#define EF_M68HC11_MACH(mach) ((mach) & EF_M68HC11_MACH_MASK)
+
+/* True if we can merge machines.  A generic HC12 can work on any proc
+   but once we have specific code, merge is not possible.  */
+#define EF_M68HC11_CAN_MERGE_MACH(mach1, mach2) \
+  ((EF_M68HC11_MACH (mach1) == EF_M68HC11_MACH (mach2)) \
+   || (EF_M68HC11_MACH (mach1) == EF_M68HC11_GENERIC) \
+   || (EF_M68HC11_MACH (mach2) == EF_M68HC11_GENERIC))
+
+#define EF_M68HC11_MERGE_MACH(mach1, mach2) \
+  (((EF_M68HC11_MACH (mach1) == EF_M68HC11_MACH (mach2)) \
+    || (EF_M68HC11_MACH (mach1) == EF_M68HC11_GENERIC)) ? \
+      EF_M68HC11_MACH (mach2) : EF_M68HC11_MACH (mach1))
+
+
+/* Special values for the st_other field in the symbol table.  These
+   are used for 68HC12 to identify far functions (must be called with
+   'call' and returns with 'rtc').  */
+#define STO_M68HC12_FAR 0x80
+
+/* Identify interrupt handlers.  This is used by the debugger to
+   correctly compute the stack frame.  */
+#define STO_M68HC12_INTERRUPT 0x40
+     
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/m68k.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/m68k.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/m68k.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/m68k.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,102 @@
+/* MC68k ELF support for BFD.
+   Copyright 1998, 1999, 2000, 2002, 2005, 2006, 2007, 2009, 2010
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_M68K_H
+#define _ELF_M68K_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocation types.  */
+START_RELOC_NUMBERS (elf_m68k_reloc_type)
+  RELOC_NUMBER (R_68K_NONE, 0)		/* No reloc */
+  RELOC_NUMBER (R_68K_32, 1)		/* Direct 32 bit  */
+  RELOC_NUMBER (R_68K_16, 2)		/* Direct 16 bit  */
+  RELOC_NUMBER (R_68K_8, 3)		/* Direct 8 bit  */
+  RELOC_NUMBER (R_68K_PC32, 4)		/* PC relative 32 bit */
+  RELOC_NUMBER (R_68K_PC16, 5)		/* PC relative 16 bit */
+  RELOC_NUMBER (R_68K_PC8, 6)		/* PC relative 8 bit */
+  RELOC_NUMBER (R_68K_GOT32, 7)		/* 32 bit PC relative GOT entry */
+  RELOC_NUMBER (R_68K_GOT16, 8)		/* 16 bit PC relative GOT entry */
+  RELOC_NUMBER (R_68K_GOT8, 9)		/* 8 bit PC relative GOT entry */
+  RELOC_NUMBER (R_68K_GOT32O, 10)	/* 32 bit GOT offset */
+  RELOC_NUMBER (R_68K_GOT16O, 11)	/* 16 bit GOT offset */
+  RELOC_NUMBER (R_68K_GOT8O, 12)	/* 8 bit GOT offset */
+  RELOC_NUMBER (R_68K_PLT32, 13)	/* 32 bit PC relative PLT address */
+  RELOC_NUMBER (R_68K_PLT16, 14)	/* 16 bit PC relative PLT address */
+  RELOC_NUMBER (R_68K_PLT8, 15)		/* 8 bit PC relative PLT address */
+  RELOC_NUMBER (R_68K_PLT32O, 16)	/* 32 bit PLT offset */
+  RELOC_NUMBER (R_68K_PLT16O, 17)	/* 16 bit PLT offset */
+  RELOC_NUMBER (R_68K_PLT8O, 18)	/* 8 bit PLT offset */
+  RELOC_NUMBER (R_68K_COPY, 19)		/* Copy symbol at runtime */
+  RELOC_NUMBER (R_68K_GLOB_DAT, 20)	/* Create GOT entry */
+  RELOC_NUMBER (R_68K_JMP_SLOT, 21)	/* Create PLT entry */
+  RELOC_NUMBER (R_68K_RELATIVE, 22)	/* Adjust by program base */
+  /* These are GNU extensions to enable C++ vtable garbage collection.  */
+  RELOC_NUMBER (R_68K_GNU_VTINHERIT, 23)
+  RELOC_NUMBER (R_68K_GNU_VTENTRY, 24)
+  /* TLS static relocations.  */
+  RELOC_NUMBER (R_68K_TLS_GD32, 25)
+  RELOC_NUMBER (R_68K_TLS_GD16, 26)
+  RELOC_NUMBER (R_68K_TLS_GD8, 27)
+  RELOC_NUMBER (R_68K_TLS_LDM32, 28)
+  RELOC_NUMBER (R_68K_TLS_LDM16, 29)
+  RELOC_NUMBER (R_68K_TLS_LDM8, 30)
+  RELOC_NUMBER (R_68K_TLS_LDO32, 31)
+  RELOC_NUMBER (R_68K_TLS_LDO16, 32)
+  RELOC_NUMBER (R_68K_TLS_LDO8, 33)
+  RELOC_NUMBER (R_68K_TLS_IE32, 34)
+  RELOC_NUMBER (R_68K_TLS_IE16, 35)
+  RELOC_NUMBER (R_68K_TLS_IE8, 36)
+  RELOC_NUMBER (R_68K_TLS_LE32, 37)
+  RELOC_NUMBER (R_68K_TLS_LE16, 38)
+  RELOC_NUMBER (R_68K_TLS_LE8, 39)
+  RELOC_NUMBER (R_68K_TLS_DTPMOD32, 40)
+  RELOC_NUMBER (R_68K_TLS_DTPREL32, 41)
+  RELOC_NUMBER (R_68K_TLS_TPREL32, 42)
+END_RELOC_NUMBERS (R_68K_max)
+
+/* We use the top 24 bits to encode information about the
+   architecture variant.  */
+#define EF_M68K_CPU32    0x00810000
+#define EF_M68K_M68000   0x01000000
+#define EF_M68K_CFV4E    0x00008000
+#define EF_M68K_FIDO     0x02000000
+#define EF_M68K_ARCH_MASK						\
+  (EF_M68K_M68000 | EF_M68K_CPU32 | EF_M68K_CFV4E | EF_M68K_FIDO)
+
+/* We use the bottom 8 bits to encode information about the
+   coldfire variant.  If we use any of these bits, the top 24 bits are
+   either 0 or EF_M68K_CFV4E.  */
+#define EF_M68K_CF_ISA_MASK	0x0F  /* Which ISA */
+#define EF_M68K_CF_ISA_A_NODIV	0x01  /* ISA A except for div */
+#define EF_M68K_CF_ISA_A	0x02
+#define EF_M68K_CF_ISA_A_PLUS	0x03
+#define EF_M68K_CF_ISA_B_NOUSP	0x04  /* ISA_B except for USP */
+#define EF_M68K_CF_ISA_B	0x05
+#define EF_M68K_CF_ISA_C	0x06
+#define EF_M68K_CF_ISA_C_NODIV	0x07  /* ISA C except for div */
+#define EF_M68K_CF_MAC_MASK	0x30 
+#define EF_M68K_CF_MAC		0x10  /* MAC */
+#define EF_M68K_CF_EMAC		0x20  /* EMAC */
+#define EF_M68K_CF_EMAC_B	0x30  /* EMAC_B */
+#define EF_M68K_CF_FLOAT	0x40  /* Has float insns */
+#define EF_M68K_CF_MASK		0xFF
+     
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/mcore.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/mcore.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/mcore.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/mcore.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,47 @@
+/* Motorola MCore support for BFD.
+   Copyright 1995, 1999, 2000, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file holds definitions specific to the MCore ELF ABI.  */
+#ifndef _ELF_MORE_H
+#define _ELF_MORE_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_mcore_reloc_type)
+  RELOC_NUMBER (R_MCORE_NONE, 0)
+  RELOC_NUMBER (R_MCORE_ADDR32, 1)
+  RELOC_NUMBER (R_MCORE_PCRELIMM8BY4, 2)
+  RELOC_NUMBER (R_MCORE_PCRELIMM11BY2, 3)
+  RELOC_NUMBER (R_MCORE_PCRELIMM4BY2, 4)
+  RELOC_NUMBER (R_MCORE_PCREL32, 5)
+  RELOC_NUMBER (R_MCORE_PCRELJSR_IMM11BY2, 6)
+  RELOC_NUMBER (R_MCORE_GNU_VTINHERIT, 7)
+  RELOC_NUMBER (R_MCORE_GNU_VTENTRY, 8)
+  RELOC_NUMBER (R_MCORE_RELATIVE, 9)
+  RELOC_NUMBER (R_MCORE_COPY, 10)
+  RELOC_NUMBER (R_MCORE_GLOB_DAT, 11)
+  RELOC_NUMBER (R_MCORE_JUMP_SLOT, 12)
+END_RELOC_NUMBERS (R_MCORE_max)
+
+/* Section Attributes.  */
+#define SHF_MCORE_NOREAD	0x80000000
+
+#endif /* _ELF_MCORE_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/mep.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/mep.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/mep.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/mep.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,95 @@
+/* Toshiba MeP ELF support for BFD.
+   Copyright (C) 2001, 2004, 2005, 2007, 2009, 2010
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_MEP_H
+#define _ELF_MEP_H
+
+/* Bits in the sh_flags field of Elf32_Shdr:  */
+
+#define SHF_MEP_VLIW		0x10000000	/* contains vliw code */
+
+/* This bit is reserved by BFD for processor specific stuff.  Name
+   it properly so that we can easily stay consistent elsewhere.  */
+#define SEC_MEP_VLIW		SEC_TIC54X_BLOCK
+
+#include "elf/reloc-macros.h"
+
+/* Note: The comments in this file are used by bfd/mep-relocs.pl to
+   build parts of bfd/elf32-mep.c.  */
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_mep_reloc_type)
+
+  /* These two must appear first so that they are not processed by bfd/mep-relocs.pl.  */
+  RELOC_NUMBER (R_MEP_NONE, 0)
+  RELOC_NUMBER (R_RELC, 1)
+
+  RELOC_NUMBER (R_MEP_8, 2)		/* 7654 3210                               U */
+  RELOC_NUMBER (R_MEP_16, 3)		/* fedc ba98 7654 3210                     U */
+  RELOC_NUMBER (R_MEP_32, 4)		/* vuts rqpo nmlk jihg fedc ba98 7654 3210 U */
+
+  RELOC_NUMBER (R_MEP_PCREL8A2, 5)	/* ---- ---- 7654 321-                     S PC-REL */
+  RELOC_NUMBER (R_MEP_PCREL12A2, 6)	/* ---- ba98 7654 321-                     S PC-REL */
+  RELOC_NUMBER (R_MEP_PCREL17A2, 7)	/* ---- ---- ---- ---- gfed cba9 8765 4321 S PC-REL */
+  RELOC_NUMBER (R_MEP_PCREL24A2, 8)	/* ---- -765 4321 ---- nmlk jihg fedc ba98 S PC-REL */
+  RELOC_NUMBER (R_MEP_PCABS24A2, 9)	/* ---- -765 4321 ---- nmlk jihg fedc ba98 U */
+
+  RELOC_NUMBER (R_MEP_LOW16, 10)	/* ---- ---- ---- ---- fedc ba98 7654 3210 U no-overflow */
+  RELOC_NUMBER (R_MEP_HI16U, 11)	/* ---- ---- ---- ---- vuts rqpo nmlk jihg U no-overflow */
+  RELOC_NUMBER (R_MEP_HI16S, 12)	/* ---- ---- ---- ---- vuts rqpo nmlk jihg S no-overflow */
+  RELOC_NUMBER (R_MEP_GPREL, 13)	/* ---- ---- ---- ---- fedc ba98 7654 3210 S GP-REL*/
+  RELOC_NUMBER (R_MEP_TPREL, 14)	/* ---- ---- ---- ---- fedc ba98 7654 3210 S TP-REL*/
+
+  RELOC_NUMBER (R_MEP_TPREL7, 15)	/* ---- ---- -654 3210                     U TP-REL */
+  RELOC_NUMBER (R_MEP_TPREL7A2, 16)	/* ---- ---- -654 321-                     U TP-REL */
+  RELOC_NUMBER (R_MEP_TPREL7A4, 17)	/* ---- ---- -654 32--                     U TP-REL */
+
+  RELOC_NUMBER (R_MEP_UIMM24, 18)	/* ---- ---- 7654 3210 nmlk jihg fedc ba98 U */
+  RELOC_NUMBER (R_MEP_ADDR24A4, 19)	/* ---- ---- 7654 32-- nmlk jihg fedc ba98 U */
+
+  RELOC_NUMBER (R_MEP_GNU_VTINHERIT, 20) /* ---- ---- ---- ----                     U no-overflow */
+  RELOC_NUMBER (R_MEP_GNU_VTENTRY, 21)   /* ---- ---- ---- ----                     U no-overflow */
+
+END_RELOC_NUMBERS(R_MEP_max)
+
+#define	EF_MEP_CPU_MASK		0xff000000	/* specific cpu bits */
+#define EF_MEP_CPU_MEP          0x00000000	/* generic MEP */
+#define EF_MEP_CPU_C2   	0x01000000	/* MEP c2 */
+#define EF_MEP_CPU_C3   	0x02000000	/* MEP c3 */
+#define EF_MEP_CPU_C4   	0x04000000	/* MEP c4 */
+/* 5..7 are reseved */
+#define EF_MEP_CPU_C5   	0x08000000	/* MEP c5 */
+#define EF_MEP_CPU_H1   	0x10000000	/* MEP h1 */
+
+#define EF_MEP_COP_MASK		0x00ff0000
+#define EF_MEP_COP_NONE		0x00000000
+#define EF_MEP_COP_AVC		0x00010000
+#define EF_MEP_COP_AVC2		0x00020000
+#define EF_MEP_COP_FMAX		0x00030000
+/* 4..5 are reserved.  */
+#define EF_MEP_COP_IVC2		0x00060000
+
+#define EF_MEP_LIBRARY		0x00000100	/* Built as a library */
+
+#define EF_MEP_INDEX_MASK       0x000000ff      /* Configuration index */
+
+#define EF_MEP_ALL_FLAGS	0xffff01ff
+
+#endif /* _ELF_MEP_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/microblaze.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/microblaze.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/microblaze.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/microblaze.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,63 @@
+/* Xilinx MicroBlaze support for BFD.
+ 
+   Copyright 2009, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 
+   02110-1301, USA.  */
+
+/* This file holds definitions specific to the MICROBLAZE ELF ABI.  */
+
+#ifndef _ELF_MICROBLAZE_H
+#define _ELF_MICROBLAZE_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_microblaze_reloc_type)
+  RELOC_NUMBER (R_MICROBLAZE_NONE, 0)
+  RELOC_NUMBER (R_MICROBLAZE_32, 1)
+  RELOC_NUMBER (R_MICROBLAZE_32_PCREL, 2)
+  RELOC_NUMBER (R_MICROBLAZE_64_PCREL, 3)
+  RELOC_NUMBER (R_MICROBLAZE_32_PCREL_LO, 4)
+  RELOC_NUMBER (R_MICROBLAZE_64, 5)
+  RELOC_NUMBER (R_MICROBLAZE_32_LO, 6)
+  RELOC_NUMBER (R_MICROBLAZE_SRO32, 7)
+  RELOC_NUMBER (R_MICROBLAZE_SRW32, 8)
+  RELOC_NUMBER (R_MICROBLAZE_64_NONE, 9)
+  RELOC_NUMBER (R_MICROBLAZE_32_SYM_OP_SYM, 10)
+  RELOC_NUMBER (R_MICROBLAZE_GNU_VTINHERIT, 11)
+  RELOC_NUMBER (R_MICROBLAZE_GNU_VTENTRY, 12)
+  RELOC_NUMBER (R_MICROBLAZE_GOTPC_64, 13)  /* PC-relative GOT offset.  */
+  RELOC_NUMBER (R_MICROBLAZE_GOT_64, 14)    /* GOT entry offset.  */
+  RELOC_NUMBER (R_MICROBLAZE_PLT_64, 15)    /* PLT offset (PC-relative).  */
+  RELOC_NUMBER (R_MICROBLAZE_REL, 16)       /* Adjust by program base.  */
+  RELOC_NUMBER (R_MICROBLAZE_JUMP_SLOT, 17) /* Create PLT entry.  */
+  RELOC_NUMBER (R_MICROBLAZE_GLOB_DAT, 18)  /* Create GOT entry.  */
+  RELOC_NUMBER (R_MICROBLAZE_GOTOFF_64, 19) /* Offset relative to GOT.  */
+  RELOC_NUMBER (R_MICROBLAZE_GOTOFF_32, 20) /* Offset relative to GOT.  */
+  RELOC_NUMBER (R_MICROBLAZE_COPY, 21)      /* Runtime copy.  */
+   
+END_RELOC_NUMBERS (R_MICROBLAZE_max)
+
+/* Global base address names.  */
+#define RO_SDA_ANCHOR_NAME "_SDA2_BASE_"
+#define RW_SDA_ANCHOR_NAME "_SDA_BASE_"
+
+/* Section Attributes.  */
+#define SHF_MICROBLAZE_NOREAD	0x80000000
+
+#endif /* _ELF_MICROBLAZE_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/mips.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/mips.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/mips.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/mips.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1119 @@
+/* MIPS ELF support for BFD.
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2008, 2009, 2010
+   Free Software Foundation, Inc.
+
+   By Ian Lance Taylor, Cygnus Support, <ian@cygnus.com>, from
+   information in the System V Application Binary Interface, MIPS
+   Processor Supplement.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file holds definitions specific to the MIPS ELF ABI.  Note
+   that most of this is not actually implemented by BFD.  */
+
+#ifndef _ELF_MIPS_H
+#define _ELF_MIPS_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocation types.  */
+START_RELOC_NUMBERS (elf_mips_reloc_type)
+  RELOC_NUMBER (R_MIPS_NONE, 0)
+  RELOC_NUMBER (R_MIPS_16, 1)
+  RELOC_NUMBER (R_MIPS_32, 2)		/* In Elf 64: alias R_MIPS_ADD */
+  RELOC_NUMBER (R_MIPS_REL32, 3)	/* In Elf 64: alias R_MIPS_REL */
+  RELOC_NUMBER (R_MIPS_26, 4)
+  RELOC_NUMBER (R_MIPS_HI16, 5)
+  RELOC_NUMBER (R_MIPS_LO16, 6)
+  RELOC_NUMBER (R_MIPS_GPREL16, 7)	/* In Elf 64: alias R_MIPS_GPREL */
+  RELOC_NUMBER (R_MIPS_LITERAL, 8)
+  RELOC_NUMBER (R_MIPS_GOT16, 9)	/* In Elf 64: alias R_MIPS_GOT */
+  RELOC_NUMBER (R_MIPS_PC16, 10)
+  RELOC_NUMBER (R_MIPS_CALL16, 11)	/* In Elf 64: alias R_MIPS_CALL */
+  RELOC_NUMBER (R_MIPS_GPREL32, 12)
+  /* The remaining relocs are defined on Irix, although they are not
+     in the MIPS ELF ABI.  */
+  RELOC_NUMBER (R_MIPS_UNUSED1, 13)
+  RELOC_NUMBER (R_MIPS_UNUSED2, 14)
+  RELOC_NUMBER (R_MIPS_UNUSED3, 15)
+  RELOC_NUMBER (R_MIPS_SHIFT5, 16)
+  RELOC_NUMBER (R_MIPS_SHIFT6, 17)
+  RELOC_NUMBER (R_MIPS_64, 18)
+  RELOC_NUMBER (R_MIPS_GOT_DISP, 19)
+  RELOC_NUMBER (R_MIPS_GOT_PAGE, 20)
+  RELOC_NUMBER (R_MIPS_GOT_OFST, 21)
+  RELOC_NUMBER (R_MIPS_GOT_HI16, 22)
+  RELOC_NUMBER (R_MIPS_GOT_LO16, 23)
+  RELOC_NUMBER (R_MIPS_SUB, 24)
+  RELOC_NUMBER (R_MIPS_INSERT_A, 25)
+  RELOC_NUMBER (R_MIPS_INSERT_B, 26)
+  RELOC_NUMBER (R_MIPS_DELETE, 27)
+  RELOC_NUMBER (R_MIPS_HIGHER, 28)
+  RELOC_NUMBER (R_MIPS_HIGHEST, 29)
+  RELOC_NUMBER (R_MIPS_CALL_HI16, 30)
+  RELOC_NUMBER (R_MIPS_CALL_LO16, 31)
+  RELOC_NUMBER (R_MIPS_SCN_DISP, 32)
+  RELOC_NUMBER (R_MIPS_REL16, 33)
+  RELOC_NUMBER (R_MIPS_ADD_IMMEDIATE, 34)
+  RELOC_NUMBER (R_MIPS_PJUMP, 35)
+  RELOC_NUMBER (R_MIPS_RELGOT, 36)
+  RELOC_NUMBER (R_MIPS_JALR, 37)
+  /* TLS relocations.  */
+  RELOC_NUMBER (R_MIPS_TLS_DTPMOD32, 38)
+  RELOC_NUMBER (R_MIPS_TLS_DTPREL32, 39)
+  RELOC_NUMBER (R_MIPS_TLS_DTPMOD64, 40)
+  RELOC_NUMBER (R_MIPS_TLS_DTPREL64, 41)
+  RELOC_NUMBER (R_MIPS_TLS_GD, 42)
+  RELOC_NUMBER (R_MIPS_TLS_LDM, 43)
+  RELOC_NUMBER (R_MIPS_TLS_DTPREL_HI16, 44)
+  RELOC_NUMBER (R_MIPS_TLS_DTPREL_LO16, 45)
+  RELOC_NUMBER (R_MIPS_TLS_GOTTPREL, 46)
+  RELOC_NUMBER (R_MIPS_TLS_TPREL32, 47)
+  RELOC_NUMBER (R_MIPS_TLS_TPREL64, 48)
+  RELOC_NUMBER (R_MIPS_TLS_TPREL_HI16, 49)
+  RELOC_NUMBER (R_MIPS_TLS_TPREL_LO16, 50)
+  RELOC_NUMBER (R_MIPS_GLOB_DAT, 51)
+  FAKE_RELOC (R_MIPS_max, 52)
+  /* These relocs are used for the mips16.  */
+  FAKE_RELOC (R_MIPS16_min, 100)
+  RELOC_NUMBER (R_MIPS16_26, 100)
+  RELOC_NUMBER (R_MIPS16_GPREL, 101)
+  RELOC_NUMBER (R_MIPS16_GOT16, 102)
+  RELOC_NUMBER (R_MIPS16_CALL16, 103)
+  RELOC_NUMBER (R_MIPS16_HI16, 104)
+  RELOC_NUMBER (R_MIPS16_LO16, 105)
+  FAKE_RELOC (R_MIPS16_max, 106)
+  /* These relocations are specific to VxWorks.  */
+  RELOC_NUMBER (R_MIPS_COPY, 126)
+  RELOC_NUMBER (R_MIPS_JUMP_SLOT, 127)
+
+  /* These relocations are specific to microMIPS.  */
+  FAKE_RELOC (R_MICROMIPS_min, 130)
+  RELOC_NUMBER (R_MICROMIPS_26_S1, 133)
+  RELOC_NUMBER (R_MICROMIPS_HI16, 134)
+  RELOC_NUMBER (R_MICROMIPS_LO16, 135)
+  RELOC_NUMBER (R_MICROMIPS_GPREL16, 136)	/* In Elf 64:
+						   alias R_MICROMIPS_GPREL */
+  RELOC_NUMBER (R_MICROMIPS_LITERAL, 137)
+  RELOC_NUMBER (R_MICROMIPS_GOT16, 138)		/* In Elf 64:
+						   alias R_MICROMIPS_GOT */
+  RELOC_NUMBER (R_MICROMIPS_PC7_S1, 139)
+  RELOC_NUMBER (R_MICROMIPS_PC10_S1, 140)
+  RELOC_NUMBER (R_MICROMIPS_PC16_S1, 141)
+  RELOC_NUMBER (R_MICROMIPS_CALL16, 142)	/* In Elf 64:
+						   alias R_MICROMIPS_CALL */
+  RELOC_NUMBER (R_MICROMIPS_GOT_DISP, 145)
+  RELOC_NUMBER (R_MICROMIPS_GOT_PAGE, 146)
+  RELOC_NUMBER (R_MICROMIPS_GOT_OFST, 147)
+  RELOC_NUMBER (R_MICROMIPS_GOT_HI16, 148)
+  RELOC_NUMBER (R_MICROMIPS_GOT_LO16, 149)
+  RELOC_NUMBER (R_MICROMIPS_SUB, 150)
+  RELOC_NUMBER (R_MICROMIPS_HIGHER, 151)
+  RELOC_NUMBER (R_MICROMIPS_HIGHEST, 152)
+  RELOC_NUMBER (R_MICROMIPS_CALL_HI16, 153)
+  RELOC_NUMBER (R_MICROMIPS_CALL_LO16, 154)
+  RELOC_NUMBER (R_MICROMIPS_SCN_DISP, 155)
+  RELOC_NUMBER (R_MICROMIPS_JALR, 156)
+  RELOC_NUMBER (R_MICROMIPS_HI0_LO16, 157)
+  /* TLS relocations.  */
+  RELOC_NUMBER (R_MICROMIPS_TLS_GD, 162)
+  RELOC_NUMBER (R_MICROMIPS_TLS_LDM, 163)
+  RELOC_NUMBER (R_MICROMIPS_TLS_DTPREL_HI16, 164)
+  RELOC_NUMBER (R_MICROMIPS_TLS_DTPREL_LO16, 165)
+  RELOC_NUMBER (R_MICROMIPS_TLS_GOTTPREL, 166)
+  RELOC_NUMBER (R_MICROMIPS_TLS_TPREL_HI16, 169)
+  RELOC_NUMBER (R_MICROMIPS_TLS_TPREL_LO16, 170)
+  /* microMIPS GP- and PC-relative relocations. */
+  RELOC_NUMBER (R_MICROMIPS_GPREL7_S2, 172)
+  RELOC_NUMBER (R_MICROMIPS_PC23_S2, 173)
+  FAKE_RELOC (R_MICROMIPS_max, 174)
+
+  /* This was a GNU extension used by embedded-PIC.  It was co-opted by
+     mips-linux for exception-handling data.  It is no longer used, but
+     should continue to be supported by the linker for backward
+     compatibility.  (GCC stopped using it in May, 2004.)  */
+  RELOC_NUMBER (R_MIPS_PC32, 248)
+  /* FIXME: this relocation is used internally by gas.  */
+  RELOC_NUMBER (R_MIPS_GNU_REL16_S2, 250)
+  /* These are GNU extensions to enable C++ vtable garbage collection.  */
+  RELOC_NUMBER (R_MIPS_GNU_VTINHERIT, 253)
+  RELOC_NUMBER (R_MIPS_GNU_VTENTRY, 254)
+END_RELOC_NUMBERS (R_MIPS_maxext)
+
+/* Processor specific flags for the ELF header e_flags field.  */
+
+/* At least one .noreorder directive appears in the source.  */
+#define EF_MIPS_NOREORDER	0x00000001
+
+/* File contains position independent code.  */
+#define EF_MIPS_PIC		0x00000002
+
+/* Code in file uses the standard calling sequence for calling
+   position independent code.  */
+#define EF_MIPS_CPIC		0x00000004
+
+/* ???  Unknown flag, set in IRIX 6's BSDdup2.o in libbsd.a.  */
+#define EF_MIPS_XGOT		0x00000008
+
+/* Code in file uses UCODE (obsolete) */
+#define EF_MIPS_UCODE		0x00000010
+
+/* Code in file uses new ABI (-n32 on Irix 6).  */
+#define EF_MIPS_ABI2		0x00000020
+
+/* Process the .MIPS.options section first by ld */
+#define EF_MIPS_OPTIONS_FIRST	0x00000080
+
+/* Architectural Extensions used by this file */
+#define EF_MIPS_ARCH_ASE	0x0f000000
+
+/* Use MDMX multimedia extensions */
+#define EF_MIPS_ARCH_ASE_MDMX	0x08000000
+
+/* Use MIPS-16 ISA extensions */
+#define EF_MIPS_ARCH_ASE_M16	0x04000000
+
+/* Use MICROMIPS ISA extensions.  */
+#define EF_MIPS_ARCH_ASE_MICROMIPS	0x02000000
+
+/* Indicates code compiled for a 64-bit machine in 32-bit mode.
+   (regs are 32-bits wide.) */
+#define EF_MIPS_32BITMODE       0x00000100
+
+/* Four bit MIPS architecture field.  */
+#define EF_MIPS_ARCH		0xf0000000
+
+/* -mips1 code.  */
+#define E_MIPS_ARCH_1		0x00000000
+
+/* -mips2 code.  */
+#define E_MIPS_ARCH_2		0x10000000
+
+/* -mips3 code.  */
+#define E_MIPS_ARCH_3		0x20000000
+
+/* -mips4 code.  */
+#define E_MIPS_ARCH_4		0x30000000
+
+/* -mips5 code.  */
+#define E_MIPS_ARCH_5           0x40000000
+
+/* -mips32 code.  */
+#define E_MIPS_ARCH_32          0x50000000
+
+/* -mips64 code.  */
+#define E_MIPS_ARCH_64          0x60000000
+
+/* -mips32r2 code.  */
+#define E_MIPS_ARCH_32R2        0x70000000
+
+/* -mips64r2 code.  */
+#define E_MIPS_ARCH_64R2        0x80000000
+
+/* The ABI of the file.  Also see EF_MIPS_ABI2 above. */
+#define EF_MIPS_ABI		0x0000F000
+
+/* The original o32 abi. */
+#define E_MIPS_ABI_O32          0x00001000
+
+/* O32 extended to work on 64 bit architectures */
+#define E_MIPS_ABI_O64          0x00002000
+
+/* EABI in 32 bit mode */
+#define E_MIPS_ABI_EABI32       0x00003000
+
+/* EABI in 64 bit mode */
+#define E_MIPS_ABI_EABI64       0x00004000
+
+
+/* Machine variant if we know it.  This field was invented at Cygnus,
+   but it is hoped that other vendors will adopt it.  If some standard
+   is developed, this code should be changed to follow it. */
+
+#define EF_MIPS_MACH		0x00FF0000
+
+/* Cygnus is choosing values between 80 and 9F;
+   00 - 7F should be left for a future standard;
+   the rest are open. */
+
+#define E_MIPS_MACH_3900	0x00810000
+#define E_MIPS_MACH_4010	0x00820000
+#define E_MIPS_MACH_4100	0x00830000
+#define E_MIPS_MACH_4650	0x00850000
+#define E_MIPS_MACH_4120	0x00870000
+#define E_MIPS_MACH_4111	0x00880000
+#define E_MIPS_MACH_SB1         0x008a0000
+#define E_MIPS_MACH_OCTEON	0x008b0000
+#define E_MIPS_MACH_XLR     	0x008c0000
+#define E_MIPS_MACH_OCTEON2	0x008d0000
+#define E_MIPS_MACH_5400	0x00910000
+#define E_MIPS_MACH_5500	0x00980000
+#define E_MIPS_MACH_9000	0x00990000
+#define E_MIPS_MACH_LS2E        0x00A00000
+#define E_MIPS_MACH_LS2F        0x00A10000
+#define E_MIPS_MACH_LS3A        0x00A20000
+
+/* Processor specific section indices.  These sections do not actually
+   exist.  Symbols with a st_shndx field corresponding to one of these
+   values have a special meaning.  */
+
+/* Defined and allocated common symbol.  Value is virtual address.  If
+   relocated, alignment must be preserved.  */
+#define SHN_MIPS_ACOMMON	SHN_LORESERVE
+
+/* Defined and allocated text symbol.  Value is virtual address.
+   Occur in the dynamic symbol table of Alpha OSF/1 and Irix 5 executables.  */
+#define SHN_MIPS_TEXT		(SHN_LORESERVE + 1)
+
+/* Defined and allocated data symbol.  Value is virtual address.
+   Occur in the dynamic symbol table of Alpha OSF/1 and Irix 5 executables.  */
+#define SHN_MIPS_DATA		(SHN_LORESERVE + 2)
+
+/* Small common symbol.  */
+#define SHN_MIPS_SCOMMON	(SHN_LORESERVE + 3)
+
+/* Small undefined symbol.  */
+#define SHN_MIPS_SUNDEFINED	(SHN_LORESERVE + 4)
+
+/* Processor specific section types.  */
+
+/* Section contains the set of dynamic shared objects used when
+   statically linking.  */
+#define SHT_MIPS_LIBLIST	0x70000000
+
+/* I'm not sure what this is, but it's used on Irix 5.  */
+#define SHT_MIPS_MSYM		0x70000001
+
+/* Section contains list of symbols whose definitions conflict with
+   symbols defined in shared objects.  */
+#define SHT_MIPS_CONFLICT	0x70000002
+
+/* Section contains the global pointer table.  */
+#define SHT_MIPS_GPTAB		0x70000003
+
+/* Section contains microcode information.  The exact format is
+   unspecified.  */
+#define SHT_MIPS_UCODE		0x70000004
+
+/* Section contains some sort of debugging information.  The exact
+   format is unspecified.  It's probably ECOFF symbols.  */
+#define SHT_MIPS_DEBUG		0x70000005
+
+/* Section contains register usage information.  */
+#define SHT_MIPS_REGINFO	0x70000006
+
+/* ??? */
+#define SHT_MIPS_PACKAGE	0x70000007
+
+/* ??? */
+#define SHT_MIPS_PACKSYM	0x70000008
+
+/* ??? */
+#define SHT_MIPS_RELD		0x70000009
+
+/* Section contains interface information.  */
+#define SHT_MIPS_IFACE		0x7000000b
+
+/* Section contains description of contents of another section.  */
+#define SHT_MIPS_CONTENT	0x7000000c
+
+/* Section contains miscellaneous options.  */
+#define SHT_MIPS_OPTIONS	0x7000000d
+
+/* ??? */
+#define SHT_MIPS_SHDR		0x70000010
+
+/* ??? */
+#define SHT_MIPS_FDESC		0x70000011
+
+/* ??? */
+#define SHT_MIPS_EXTSYM		0x70000012
+
+/* ??? */
+#define SHT_MIPS_DENSE		0x70000013
+
+/* ??? */
+#define SHT_MIPS_PDESC		0x70000014
+
+/* ??? */
+#define SHT_MIPS_LOCSYM		0x70000015
+
+/* ??? */
+#define SHT_MIPS_AUXSYM		0x70000016
+
+/* ??? */
+#define SHT_MIPS_OPTSYM		0x70000017
+
+/* ??? */
+#define SHT_MIPS_LOCSTR		0x70000018
+
+/* ??? */
+#define SHT_MIPS_LINE		0x70000019
+
+/* ??? */
+#define SHT_MIPS_RFDESC		0x7000001a
+
+/* Delta C++: symbol table */
+#define SHT_MIPS_DELTASYM	0x7000001b
+
+/* Delta C++: instance table */
+#define SHT_MIPS_DELTAINST	0x7000001c
+
+/* Delta C++: class table */
+#define SHT_MIPS_DELTACLASS	0x7000001d
+
+/* DWARF debugging section.  */
+#define SHT_MIPS_DWARF		0x7000001e
+
+/* Delta C++: declarations */
+#define SHT_MIPS_DELTADECL	0x7000001f
+
+/* List of libraries the binary depends on.  Includes a time stamp, version
+   number.  */
+#define SHT_MIPS_SYMBOL_LIB	0x70000020
+
+/* Events section.  */
+#define SHT_MIPS_EVENTS		0x70000021
+
+/* ??? */
+#define SHT_MIPS_TRANSLATE	0x70000022
+
+/* Special pixie sections */
+#define SHT_MIPS_PIXIE		0x70000023
+
+/* Address translation table (for debug info) */
+#define SHT_MIPS_XLATE		0x70000024
+
+/* SGI internal address translation table (for debug info) */
+#define SHT_MIPS_XLATE_DEBUG	0x70000025
+
+/* Intermediate code */
+#define SHT_MIPS_WHIRL		0x70000026
+
+/* C++ exception handling region info */
+#define SHT_MIPS_EH_REGION	0x70000027
+
+/* Obsolete address translation table (for debug info) */
+#define SHT_MIPS_XLATE_OLD	0x70000028
+
+/* Runtime procedure descriptor table exception information (ucode) ??? */
+#define SHT_MIPS_PDR_EXCEPTION	0x70000029
+
+
+/* A section of type SHT_MIPS_LIBLIST contains an array of the
+   following structure.  The sh_link field is the section index of the
+   string table.  The sh_info field is the number of entries in the
+   section.  */
+typedef struct
+{
+  /* String table index for name of shared object.  */
+  unsigned long l_name;
+  /* Time stamp.  */
+  unsigned long l_time_stamp;
+  /* Checksum of symbol names and common sizes.  */
+  unsigned long l_checksum;
+  /* String table index for version.  */
+  unsigned long l_version;
+  /* Flags.  */
+  unsigned long l_flags;
+} Elf32_Lib;
+
+/* The external version of Elf32_Lib.  */
+typedef struct
+{
+  unsigned char l_name[4];
+  unsigned char l_time_stamp[4];
+  unsigned char l_checksum[4];
+  unsigned char l_version[4];
+  unsigned char l_flags[4];
+} Elf32_External_Lib;
+
+/* The l_flags field of an Elf32_Lib structure may contain the
+   following flags.  */
+
+/* Require an exact match at runtime.  */
+#define LL_EXACT_MATCH		0x00000001
+
+/* Ignore version incompatibilities at runtime.  */
+#define LL_IGNORE_INT_VER	0x00000002
+
+/* Require matching minor version number.  */
+#define LL_REQUIRE_MINOR	0x00000004
+
+/* ??? */
+#define LL_EXPORTS		0x00000008
+
+/* Delay loading of this library until really needed.  */
+#define LL_DELAY_LOAD		0x00000010
+
+/* ??? Delta C++ stuff ??? */
+#define LL_DELTA		0x00000020
+
+
+/* A section of type SHT_MIPS_CONFLICT is an array of indices into the
+   .dynsym section.  Each element has the following type.  */
+typedef unsigned long Elf32_Conflict;
+typedef unsigned char Elf32_External_Conflict[4];
+
+typedef unsigned long Elf64_Conflict;
+typedef unsigned char Elf64_External_Conflict[8];
+
+/* A section of type SHT_MIPS_GPTAB contains information about how
+   much GP space would be required for different -G arguments.  This
+   information is only used so that the linker can provide informative
+   suggestions as to the best -G value to use.  The sh_info field is
+   the index of the section for which this information applies.  The
+   contents of the section are an array of the following union.  The
+   first element uses the gt_header field.  The remaining elements use
+   the gt_entry field.  */
+typedef union
+{
+  struct
+    {
+      /* -G value actually used for this object file.  */
+      unsigned long gt_current_g_value;
+      /* Unused.  */
+      unsigned long gt_unused;
+    } gt_header;
+  struct
+    {
+      /* If this -G argument has been used...  */
+      unsigned long gt_g_value;
+      /* ...this many GP section bytes would be required.  */
+      unsigned long gt_bytes;
+    } gt_entry;
+} Elf32_gptab;
+
+/* The external version of Elf32_gptab.  */
+
+typedef union
+{
+  struct
+    {
+      unsigned char gt_current_g_value[4];
+      unsigned char gt_unused[4];
+    } gt_header;
+  struct
+    {
+      unsigned char gt_g_value[4];
+      unsigned char gt_bytes[4];
+    } gt_entry;
+} Elf32_External_gptab;
+
+/* A section of type SHT_MIPS_REGINFO contains the following
+   structure.  */
+typedef struct
+{
+  /* Mask of general purpose registers used.  */
+  unsigned long ri_gprmask;
+  /* Mask of co-processor registers used.  */
+  unsigned long ri_cprmask[4];
+  /* GP register value for this object file.  */
+  long ri_gp_value;
+} Elf32_RegInfo;
+
+/* The external version of the Elf_RegInfo structure.  */
+typedef struct
+{
+  unsigned char ri_gprmask[4];
+  unsigned char ri_cprmask[4][4];
+  unsigned char ri_gp_value[4];
+} Elf32_External_RegInfo;
+
+/* MIPS ELF .reginfo swapping routines.  */
+extern void bfd_mips_elf32_swap_reginfo_in
+  (bfd *, const Elf32_External_RegInfo *, Elf32_RegInfo *);
+extern void bfd_mips_elf32_swap_reginfo_out
+  (bfd *, const Elf32_RegInfo *, Elf32_External_RegInfo *);
+
+/* Processor specific section flags.  */
+
+/* This section must be in the global data area.  */
+#define SHF_MIPS_GPREL		0x10000000
+
+/* This section should be merged.  */
+#define SHF_MIPS_MERGE		0x20000000
+
+/* This section contains address data of size implied by section
+   element size.  */
+#define SHF_MIPS_ADDR		0x40000000
+
+/* This section contains string data.  */
+#define SHF_MIPS_STRING		0x80000000
+
+/* This section may not be stripped.  */
+#define SHF_MIPS_NOSTRIP	0x08000000
+
+/* This section is local to threads.  */
+#define SHF_MIPS_LOCAL		0x04000000
+
+/* Linker should generate implicit weak names for this section.  */
+#define SHF_MIPS_NAMES		0x02000000
+
+/* Section contais text/data which may be replicated in other sections.
+   Linker should retain only one copy.  */
+#define SHF_MIPS_NODUPES	0x01000000
+
+/* Processor specific program header types.  */
+
+/* Register usage information.  Identifies one .reginfo section.  */
+#define PT_MIPS_REGINFO		0x70000000
+
+/* Runtime procedure table.  */
+#define PT_MIPS_RTPROC		0x70000001
+
+/* .MIPS.options section.  */
+#define PT_MIPS_OPTIONS		0x70000002
+
+/* Processor specific dynamic array tags.  */
+
+/* 32 bit version number for runtime linker interface.  */
+#define DT_MIPS_RLD_VERSION	0x70000001
+
+/* Time stamp.  */
+#define DT_MIPS_TIME_STAMP	0x70000002
+
+/* Checksum of external strings and common sizes.  */
+#define DT_MIPS_ICHECKSUM	0x70000003
+
+/* Index of version string in string table.  */
+#define DT_MIPS_IVERSION	0x70000004
+
+/* 32 bits of flags.  */
+#define DT_MIPS_FLAGS		0x70000005
+
+/* Base address of the segment.  */
+#define DT_MIPS_BASE_ADDRESS	0x70000006
+
+/* ??? */
+#define DT_MIPS_MSYM		0x70000007
+
+/* Address of .conflict section.  */
+#define DT_MIPS_CONFLICT	0x70000008
+
+/* Address of .liblist section.  */
+#define DT_MIPS_LIBLIST		0x70000009
+
+/* Number of local global offset table entries.  */
+#define DT_MIPS_LOCAL_GOTNO	0x7000000a
+
+/* Number of entries in the .conflict section.  */
+#define DT_MIPS_CONFLICTNO	0x7000000b
+
+/* Number of entries in the .liblist section.  */
+#define DT_MIPS_LIBLISTNO	0x70000010
+
+/* Number of entries in the .dynsym section.  */
+#define DT_MIPS_SYMTABNO	0x70000011
+
+/* Index of first external dynamic symbol not referenced locally.  */
+#define DT_MIPS_UNREFEXTNO	0x70000012
+
+/* Index of first dynamic symbol in global offset table.  */
+#define DT_MIPS_GOTSYM		0x70000013
+
+/* Number of page table entries in global offset table.  */
+#define DT_MIPS_HIPAGENO	0x70000014
+
+/* Address of run time loader map, used for debugging.  */
+#define DT_MIPS_RLD_MAP		0x70000016
+
+/* Delta C++ class definition.  */
+#define DT_MIPS_DELTA_CLASS	0x70000017
+
+/* Number of entries in DT_MIPS_DELTA_CLASS.  */
+#define DT_MIPS_DELTA_CLASS_NO	0x70000018
+
+/* Delta C++ class instances.  */
+#define DT_MIPS_DELTA_INSTANCE	0x70000019
+
+/* Number of entries in DT_MIPS_DELTA_INSTANCE.  */
+#define DT_MIPS_DELTA_INSTANCE_NO	0x7000001a
+
+/* Delta relocations.  */
+#define DT_MIPS_DELTA_RELOC	0x7000001b
+
+/* Number of entries in DT_MIPS_DELTA_RELOC.  */
+#define DT_MIPS_DELTA_RELOC_NO	0x7000001c
+
+/* Delta symbols that Delta relocations refer to.  */
+#define DT_MIPS_DELTA_SYM	0x7000001d
+
+/* Number of entries in DT_MIPS_DELTA_SYM.  */
+#define DT_MIPS_DELTA_SYM_NO	0x7000001e
+
+/* Delta symbols that hold class declarations.  */
+#define DT_MIPS_DELTA_CLASSSYM	0x70000020
+
+/* Number of entries in DT_MIPS_DELTA_CLASSSYM.  */
+#define DT_MIPS_DELTA_CLASSSYM_NO	0x70000021
+
+/* Flags indicating information about C++ flavor.  */
+#define DT_MIPS_CXX_FLAGS	0x70000022
+
+/* Pixie information (???).  */
+#define DT_MIPS_PIXIE_INIT	0x70000023
+
+/* Address of .MIPS.symlib */
+#define DT_MIPS_SYMBOL_LIB	0x70000024
+
+/* The GOT index of the first PTE for a segment */
+#define DT_MIPS_LOCALPAGE_GOTIDX	0x70000025
+
+/* The GOT index of the first PTE for a local symbol */
+#define DT_MIPS_LOCAL_GOTIDX	0x70000026
+
+/* The GOT index of the first PTE for a hidden symbol */
+#define DT_MIPS_HIDDEN_GOTIDX	0x70000027
+
+/* The GOT index of the first PTE for a protected symbol */
+#define DT_MIPS_PROTECTED_GOTIDX	0x70000028
+
+/* Address of `.MIPS.options'.  */
+#define DT_MIPS_OPTIONS		0x70000029
+
+/* Address of `.interface'.  */
+#define DT_MIPS_INTERFACE	0x7000002a
+
+/* ??? */
+#define DT_MIPS_DYNSTR_ALIGN	0x7000002b
+
+/* Size of the .interface section.  */
+#define DT_MIPS_INTERFACE_SIZE	0x7000002c
+
+/* Size of rld_text_resolve function stored in the GOT.  */
+#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR	0x7000002d
+
+/* Default suffix of DSO to be added by rld on dlopen() calls.  */
+#define DT_MIPS_PERF_SUFFIX	0x7000002e
+
+/* Size of compact relocation section (O32).  */
+#define DT_MIPS_COMPACT_SIZE	0x7000002f
+
+/* GP value for auxiliary GOTs.  */
+#define DT_MIPS_GP_VALUE	0x70000030
+
+/* Address of auxiliary .dynamic.  */
+#define DT_MIPS_AUX_DYNAMIC	0x70000031
+
+/* Address of the base of the PLTGOT.  */
+#define DT_MIPS_PLTGOT         0x70000032
+
+/* Points to the base of a writable PLT.  */
+#define DT_MIPS_RWPLT          0x70000034
+
+/* Flags which may appear in a DT_MIPS_FLAGS entry.  */
+
+/* No flags.  */
+#define RHF_NONE		0x00000000
+
+/* Uses shortcut pointers.  */
+#define RHF_QUICKSTART		0x00000001
+
+/* Hash size is not a power of two.  */
+#define RHF_NOTPOT		0x00000002
+
+/* Ignore LD_LIBRARY_PATH.  */
+#define RHS_NO_LIBRARY_REPLACEMENT 0x00000004
+
+/* DSO address may not be relocated. */
+#define RHF_NO_MOVE		0x00000008
+
+/* SGI specific features. */
+#define RHF_SGI_ONLY		0x00000010
+
+/* Guarantee that .init will finish executing before any non-init
+   code in DSO is called. */
+#define RHF_GUARANTEE_INIT	   0x00000020
+
+/* Contains Delta C++ code. */
+#define RHF_DELTA_C_PLUS_PLUS	   0x00000040
+
+/* Guarantee that .init will start executing before any non-init
+   code in DSO is called. */
+#define RHF_GUARANTEE_START_INIT   0x00000080
+
+/* Generated by pixie. */
+#define RHF_PIXIE		   0x00000100
+
+/* Delay-load DSO by default. */
+#define RHF_DEFAULT_DELAY_LOAD	   0x00000200
+
+/* Object may be requickstarted */
+#define RHF_REQUICKSTART	   0x00000400
+
+/* Object has been requickstarted */
+#define RHF_REQUICKSTARTED	   0x00000800
+
+/* Generated by cord. */
+#define RHF_CORD		   0x00001000
+
+/* Object contains no unresolved undef symbols. */
+#define RHF_NO_UNRES_UNDEF	   0x00002000
+
+/* Symbol table is in a safe order. */
+#define RHF_RLD_ORDER_SAFE	   0x00004000
+
+/* Special values for the st_other field in the symbol table.  These
+   are used in an Irix 5 dynamic symbol table.  */
+
+#define STO_DEFAULT		STV_DEFAULT
+#define STO_INTERNAL		STV_INTERNAL
+#define STO_HIDDEN		STV_HIDDEN
+#define STO_PROTECTED		STV_PROTECTED
+
+/* Two topmost bits denote the MIPS ISA for .text symbols:
+   + 00 -- standard MIPS code,
+   + 10 -- microMIPS code,
+   + 11 -- MIPS16 code; requires the following two bits to be set too.
+   Note that one of the MIPS16 bits overlaps with STO_MIPS_PIC.  See below
+   for details.  */
+#define STO_MIPS_ISA		(3 << 6)
+
+/* The mask spanning the rest of MIPS psABI flags.  At most one is expected
+   to be set except for STO_MIPS16.  */
+#define STO_MIPS_FLAGS		(~(STO_MIPS_ISA | ELF_ST_VISIBILITY (-1)))
+
+/* The MIPS psABI was updated in 2008 with support for PLTs and copy
+   relocs.  There are therefore two types of nonzero SHN_UNDEF functions:
+   PLT entries and traditional MIPS lazy binding stubs.  We mark the former
+   with STO_MIPS_PLT to distinguish them from the latter.  */
+#define STO_MIPS_PLT		0x8
+#define ELF_ST_IS_MIPS_PLT(other) (((other) & STO_MIPS_FLAGS) == STO_MIPS_PLT)
+#define ELF_ST_SET_MIPS_PLT(other) (((other) & ~STO_MIPS_FLAGS) | STO_MIPS_PLT)
+
+/* This value is used to mark PIC functions in an object that mixes
+   PIC and non-PIC.  Note that this bit overlaps with STO_MIPS16,
+   although MIPS16 symbols are never considered to be MIPS_PIC.  */
+#define STO_MIPS_PIC		0x20
+#define ELF_ST_IS_MIPS_PIC(other) (((other) & STO_MIPS_FLAGS) == STO_MIPS_PIC)
+#define ELF_ST_SET_MIPS_PIC(other) (((other) & ~STO_MIPS_FLAGS) | STO_MIPS_PIC)
+
+/* This value is used for a mips16 .text symbol.  */
+#define STO_MIPS16		0xf0
+#define ELF_ST_IS_MIPS16(other) (((other) & STO_MIPS16) == STO_MIPS16)
+#define ELF_ST_SET_MIPS16(other) ((other) | STO_MIPS16)
+
+/* This value is used for a microMIPS .text symbol.  To distinguish from
+   STO_MIPS16, we set top two bits to be 10 to denote STO_MICROMIPS.  The
+   mask is STO_MIPS_ISA.  */
+#define STO_MICROMIPS		(2 << 6)
+#define ELF_ST_IS_MICROMIPS(other) (((other) & STO_MIPS_ISA) == STO_MICROMIPS)
+#define ELF_ST_SET_MICROMIPS(other) (((other) & ~STO_MIPS_ISA) | STO_MICROMIPS)
+
+/* Whether code compression (either of the MIPS16 or the microMIPS ASEs)
+   has been indicated for a .text symbol.  */
+#define ELF_ST_IS_COMPRESSED(other) \
+  (ELF_ST_IS_MIPS16 (other) || ELF_ST_IS_MICROMIPS (other))
+
+/* This bit is used on Irix to indicate a symbol whose definition
+   is optional - if, at final link time, it cannot be found, no
+   error message should be produced.  */
+#define STO_OPTIONAL		(1 << 2)
+/* A macro to examine the STO_OPTIONAL bit.  */
+#define ELF_MIPS_IS_OPTIONAL(other)	((other) & STO_OPTIONAL)
+
+/* The 64-bit MIPS ELF ABI uses an unusual reloc format.  Each
+   relocation entry specifies up to three actual relocations, all at
+   the same address.  The first relocation which required a symbol
+   uses the symbol in the r_sym field.  The second relocation which
+   requires a symbol uses the symbol in the r_ssym field.  If all
+   three relocations require a symbol, the third one uses a zero
+   value.  */
+
+/* An entry in a 64 bit SHT_REL section.  */
+
+typedef struct
+{
+  /* Address of relocation.  */
+  unsigned char r_offset[8];
+  /* Symbol index.  */
+  unsigned char r_sym[4];
+  /* Special symbol.  */
+  unsigned char r_ssym[1];
+  /* Third relocation.  */
+  unsigned char r_type3[1];
+  /* Second relocation.  */
+  unsigned char r_type2[1];
+  /* First relocation.  */
+  unsigned char r_type[1];
+} Elf64_Mips_External_Rel;
+
+typedef struct
+{
+  /* Address of relocation.  */
+  bfd_vma r_offset;
+  /* Symbol index.  */
+  unsigned long r_sym;
+  /* Special symbol.  */
+  unsigned char r_ssym;
+  /* Third relocation.  */
+  unsigned char r_type3;
+  /* Second relocation.  */
+  unsigned char r_type2;
+  /* First relocation.  */
+  unsigned char r_type;
+} Elf64_Mips_Internal_Rel;
+
+/* An entry in a 64 bit SHT_RELA section.  */
+
+typedef struct
+{
+  /* Address of relocation.  */
+  unsigned char r_offset[8];
+  /* Symbol index.  */
+  unsigned char r_sym[4];
+  /* Special symbol.  */
+  unsigned char r_ssym[1];
+  /* Third relocation.  */
+  unsigned char r_type3[1];
+  /* Second relocation.  */
+  unsigned char r_type2[1];
+  /* First relocation.  */
+  unsigned char r_type[1];
+  /* Addend.  */
+  unsigned char r_addend[8];
+} Elf64_Mips_External_Rela;
+
+typedef struct
+{
+  /* Address of relocation.  */
+  bfd_vma r_offset;
+  /* Symbol index.  */
+  unsigned long r_sym;
+  /* Special symbol.  */
+  unsigned char r_ssym;
+  /* Third relocation.  */
+  unsigned char r_type3;
+  /* Second relocation.  */
+  unsigned char r_type2;
+  /* First relocation.  */
+  unsigned char r_type;
+  /* Addend.  */
+  bfd_signed_vma r_addend;
+} Elf64_Mips_Internal_Rela;
+
+/* MIPS ELF 64 relocation info access macros.  */
+#define ELF64_MIPS_R_SSYM(i) (((i) >> 24) & 0xff)
+#define ELF64_MIPS_R_TYPE3(i) (((i) >> 16) & 0xff)
+#define ELF64_MIPS_R_TYPE2(i) (((i) >> 8) & 0xff)
+#define ELF64_MIPS_R_TYPE(i) ((i) & 0xff)
+
+/* Values found in the r_ssym field of a relocation entry.  */
+
+/* No relocation.  */
+#define RSS_UNDEF	0
+
+/* Value of GP.  */
+#define RSS_GP		1
+
+/* Value of GP in object being relocated.  */
+#define RSS_GP0		2
+
+/* Address of location being relocated.  */
+#define RSS_LOC		3
+
+/* A SHT_MIPS_OPTIONS section contains a series of options, each of
+   which starts with this header.  */
+
+typedef struct
+{
+  /* Type of option.  */
+  unsigned char kind[1];
+  /* Size of option descriptor, including header.  */
+  unsigned char size[1];
+  /* Section index of affected section, or 0 for global option.  */
+  unsigned char section[2];
+  /* Information specific to this kind of option.  */
+  unsigned char info[4];
+} Elf_External_Options;
+
+typedef struct
+{
+  /* Type of option.  */
+  unsigned char kind;
+  /* Size of option descriptor, including header.  */
+  unsigned char size;
+  /* Section index of affected section, or 0 for global option.  */
+  unsigned short section;
+  /* Information specific to this kind of option.  */
+  unsigned long info;
+} Elf_Internal_Options;
+
+/* MIPS ELF option header swapping routines.  */
+extern void bfd_mips_elf_swap_options_in
+  (bfd *, const Elf_External_Options *, Elf_Internal_Options *);
+extern void bfd_mips_elf_swap_options_out
+  (bfd *, const Elf_Internal_Options *, Elf_External_Options *);
+
+/* Values which may appear in the kind field of an Elf_Options
+   structure.  */
+
+/* Undefined.  */
+#define ODK_NULL	0
+
+/* Register usage and GP value.  */
+#define ODK_REGINFO	1
+
+/* Exception processing information.  */
+#define ODK_EXCEPTIONS	2
+
+/* Section padding information.  */
+#define ODK_PAD		3
+
+/* Hardware workarounds performed.  */
+#define ODK_HWPATCH	4
+
+/* Fill value used by the linker.  */
+#define ODK_FILL	5
+
+/* Reserved space for desktop tools.  */
+#define ODK_TAGS	6
+
+/* Hardware workarounds, AND bits when merging.  */
+#define ODK_HWAND	7
+
+/* Hardware workarounds, OR bits when merging.  */
+#define ODK_HWOR	8
+
+/* GP group to use for text/data sections.  */
+#define ODK_GP_GROUP	9
+
+/* ID information.  */
+#define ODK_IDENT	10
+
+/* In the 32 bit ABI, an ODK_REGINFO option is just a Elf32_RegInfo
+   structure.  In the 64 bit ABI, it is the following structure.  The
+   info field of the options header is not used.  */
+
+typedef struct
+{
+  /* Mask of general purpose registers used.  */
+  unsigned char ri_gprmask[4];
+  /* Padding.  */
+  unsigned char ri_pad[4];
+  /* Mask of co-processor registers used.  */
+  unsigned char ri_cprmask[4][4];
+  /* GP register value for this object file.  */
+  unsigned char ri_gp_value[8];
+} Elf64_External_RegInfo;
+
+typedef struct
+{
+  /* Mask of general purpose registers used.  */
+  unsigned long ri_gprmask;
+  /* Padding.  */
+  unsigned long ri_pad;
+  /* Mask of co-processor registers used.  */
+  unsigned long ri_cprmask[4];
+  /* GP register value for this object file.  */
+  bfd_vma ri_gp_value;
+} Elf64_Internal_RegInfo;
+
+typedef struct
+{
+  /* The hash value computed from the name of the corresponding
+     dynamic symbol.  */
+  unsigned char ms_hash_value[4];
+  /* Contains both the dynamic relocation index and the symbol flags
+     field.  The macros ELF32_MS_REL_INDEX and ELF32_MS_FLAGS are used
+     to access the individual values.  The dynamic relocation index
+     identifies the first entry in the .rel.dyn section that
+     references the dynamic symbol corresponding to this msym entry.
+     If the index is 0, no dynamic relocations are associated with the
+     symbol.  The symbol flags field is reserved for future use.  */
+  unsigned char ms_info[4];
+} Elf32_External_Msym;
+
+typedef struct
+{
+  /* The hash value computed from the name of the corresponding
+     dynamic symbol.  */
+  unsigned long ms_hash_value;
+  /* Contains both the dynamic relocation index and the symbol flags
+     field.  The macros ELF32_MS_REL_INDEX and ELF32_MS_FLAGS are used
+     to access the individual values.  The dynamic relocation index
+     identifies the first entry in the .rel.dyn section that
+     references the dynamic symbol corresponding to this msym entry.
+     If the index is 0, no dynamic relocations are associated with the
+     symbol.  The symbol flags field is reserved for future use.  */
+  unsigned long ms_info;
+} Elf32_Internal_Msym;
+
+#define ELF32_MS_REL_INDEX(i) ((i) >> 8)
+#define ELF32_MS_FLAGS(i)     (i) & 0xff)
+#define ELF32_MS_INFO(r, f)   (((r) << 8) + ((f) & 0xff))
+
+/* MIPS ELF reginfo swapping routines.  */
+extern void bfd_mips_elf64_swap_reginfo_in
+  (bfd *, const Elf64_External_RegInfo *, Elf64_Internal_RegInfo *);
+extern void bfd_mips_elf64_swap_reginfo_out
+  (bfd *, const Elf64_Internal_RegInfo *, Elf64_External_RegInfo *);
+
+/* Masks for the info work of an ODK_EXCEPTIONS descriptor.  */
+#define OEX_FPU_MIN	0x1f	/* FPEs which must be enabled.  */
+#define OEX_FPU_MAX	0x1f00	/* FPEs which may be enabled.  */
+#define OEX_PAGE0	0x10000	/* Page zero must be mapped.  */
+#define OEX_SMM		0x20000	/* Force sequential memory mode.  */
+#define OEX_FPDBUG	0x40000	/* Force precise floating-point
+				   exceptions (debug mode).  */
+#define OEX_DISMISS	0x80000	/* Dismiss invalid address faults.  */
+
+/* Masks of the FP exceptions for OEX_FPU_MIN and OEX_FPU_MAX.  */
+#define OEX_FPU_INVAL	0x10	/* Invalid operation exception.  */
+#define OEX_FPU_DIV0	0x08	/* Division by zero exception.  */
+#define OEX_FPU_OFLO	0x04	/* Overflow exception.  */
+#define OEX_FPU_UFLO	0x02	/* Underflow exception.  */
+#define OEX_FPU_INEX	0x01	/* Inexact exception.  */
+
+/* Masks for the info word of an ODK_PAD descriptor.  */
+#define OPAD_PREFIX	0x01
+#define OPAD_POSTFIX	0x02
+#define OPAD_SYMBOL	0x04
+
+/* Masks for the info word of an ODK_HWPATCH descriptor.  */
+#define OHW_R4KEOP	0x00000001	/* R4000 end-of-page patch.  */
+#define OHW_R8KPFETCH	0x00000002	/* May need R8000 prefetch patch.  */
+#define OHW_R5KEOP	0x00000004	/* R5000 end-of-page patch.  */
+#define OHW_R5KCVTL	0x00000008	/* R5000 cvt.[ds].l bug
+					   (clean == 1).  */
+#define OHW_R10KLDL	0x00000010	/* Needs R10K misaligned
+					   load patch. */
+
+/* Masks for the info word of an ODK_IDENT/ODK_GP_GROUP descriptor.  */
+#define OGP_GROUP	0x0000ffff	/* GP group number.  */
+#define OGP_SELF	0xffff0000	/* Self-contained GP groups.  */
+
+/* Masks for the info word of an ODK_HWAND/ODK_HWOR descriptor.  */
+#define OHWA0_R4KEOP_CHECKED	0x00000001
+#define OHWA0_R4KEOP_CLEAN	0x00000002
+
+
+/* Object attribute tags.  */
+enum
+{
+  /* 0-3 are generic.  */
+  Tag_GNU_MIPS_ABI_FP = 4, /* Value 1 for hard-float -mdouble-float, 2
+			      for hard-float -msingle-float, 3 for
+			      soft-float, 4 for -mips32r2 -mfp64; 0 for
+			      not tagged or not using any ABIs affected
+			      by the differences.  */
+};
+
+#endif /* _ELF_MIPS_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/mmix.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/mmix.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/mmix.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/mmix.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,173 @@
+/* MMIX support for BFD.
+   Copyright 2001, 2002, 2003, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file holds definitions specific to the MMIX ELF ABI.  */
+
+#ifndef ELF_MMIX_H
+#define ELF_MMIX_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  See the reloc table in bfd/elf64-mmix.c for details.  */
+START_RELOC_NUMBERS (elf_mmix_reloc_type)
+  RELOC_NUMBER (R_MMIX_NONE, 0)
+
+  /* Standard absolute relocations.  */
+  RELOC_NUMBER (R_MMIX_8, 1)
+  RELOC_NUMBER (R_MMIX_16, 2)
+  RELOC_NUMBER (R_MMIX_24, 3)
+  RELOC_NUMBER (R_MMIX_32, 4)
+  RELOC_NUMBER (R_MMIX_64, 5)
+
+  /* Standard relative relocations.  */
+  RELOC_NUMBER (R_MMIX_PC_8, 6)
+  RELOC_NUMBER (R_MMIX_PC_16, 7)
+  RELOC_NUMBER (R_MMIX_PC_24, 8)
+  RELOC_NUMBER (R_MMIX_PC_32, 9)
+  RELOC_NUMBER (R_MMIX_PC_64, 10)
+
+  /* GNU extensions for C++ vtables.  */
+  RELOC_NUMBER (R_MMIX_GNU_VTINHERIT, 11)
+  RELOC_NUMBER (R_MMIX_GNU_VTENTRY, 12)
+
+  /* A GETA instruction.  */
+  RELOC_NUMBER (R_MMIX_GETA, 13)
+  RELOC_NUMBER (R_MMIX_GETA_1, 14)
+  RELOC_NUMBER (R_MMIX_GETA_2, 15)
+  RELOC_NUMBER (R_MMIX_GETA_3, 16)
+
+  /* A conditional branch instruction.  */
+  RELOC_NUMBER (R_MMIX_CBRANCH, 17)
+  RELOC_NUMBER (R_MMIX_CBRANCH_J, 18)
+  RELOC_NUMBER (R_MMIX_CBRANCH_1, 19)
+  RELOC_NUMBER (R_MMIX_CBRANCH_2, 20)
+  RELOC_NUMBER (R_MMIX_CBRANCH_3, 21)
+
+  /* A PUSHJ instruction.  */
+  RELOC_NUMBER (R_MMIX_PUSHJ, 22)
+  RELOC_NUMBER (R_MMIX_PUSHJ_1, 23)
+  RELOC_NUMBER (R_MMIX_PUSHJ_2, 24)
+  RELOC_NUMBER (R_MMIX_PUSHJ_3, 25)
+
+  /* A JMP instruction.  */
+  RELOC_NUMBER (R_MMIX_JMP, 26)
+  RELOC_NUMBER (R_MMIX_JMP_1, 27)
+  RELOC_NUMBER (R_MMIX_JMP_2, 28)
+  RELOC_NUMBER (R_MMIX_JMP_3, 29)
+
+  /* A relative address such as in a GETA or a branch.  */
+  RELOC_NUMBER (R_MMIX_ADDR19, 30)
+
+  /* A relative address such as in a JMP (only).  */
+  RELOC_NUMBER (R_MMIX_ADDR27, 31)
+
+  /* A general register or a number 0..255.  */
+  RELOC_NUMBER (R_MMIX_REG_OR_BYTE, 32)
+
+  /* A general register. */
+  RELOC_NUMBER (R_MMIX_REG, 33)
+
+  /* A global register and an offset, the global register (allocated at
+     link time) contents plus the offset made equivalent to the relocation
+     expression at link time.  The relocation must point at the Y field of
+     an instruction.  */
+  RELOC_NUMBER (R_MMIX_BASE_PLUS_OFFSET, 34)
+
+  /* A LOCAL assertion.  */
+  RELOC_NUMBER (R_MMIX_LOCAL, 35)
+
+  /* A PUSHJ instruction, generating a stub if it does not reach.  */
+  RELOC_NUMBER (R_MMIX_PUSHJ_STUBBABLE, 36)
+END_RELOC_NUMBERS (R_MMIX_max)
+
+
+/* Section Attributes.  */
+/* A section containing necessary information for relaxation.  */
+#define SHF_MMIX_CANRELAX	0x80000000
+
+/* Symbol attributes.  */
+/* A symbol with this section-index is a register.  */
+#define SHN_REGISTER	SHN_LOPROC
+
+/* This section holds contents for each initialized register, at VMA
+   regno*8.  A symbol relative to this section will be transformed to an
+   absolute symbol with the value corresponding to the register number at
+   final link time.  A symbol with a value outside the inclusive range
+   32*8 .. 254*8 is an error.  It is highly recommended to only use an
+   upper bound of 253*8 or lower as specified in the (currently
+   unspecified) ABI.  */
+#define MMIX_REG_CONTENTS_SECTION_NAME ".MMIX.reg_contents"
+
+/* At link time, a section by this name is created, expected to be
+   included in MMIX_REG_CONTENTS_SECTION_NAME in the output.  */
+#define MMIX_LD_ALLOCATED_REG_CONTENTS_SECTION_NAME \
+ ".MMIX.reg_contents.linker_allocated"
+
+/* This is a faked section holding symbols with SHN_REGISTER.  Don't
+   confuse it with MMIX_REG_CONTENTS_SECTION_NAME; this one has no
+   contents, just values.  It is an error for a value in this section to
+   be outside the range 32..255 and it must never become an actual section
+   in an object file.  */
+#define MMIX_REG_SECTION_NAME "*REG*"
+
+/* Appended with a number N=0..65535, this is a representation of the
+   mmixal "BSPEC N" ... "ESPEC" directive pair; the contents go into an
+   ELF section by name ".MMIX.spec_data.N".  */
+#define MMIX_OTHER_SPEC_SECTION_PREFIX ".MMIX.spec_data."
+
+/* A section SECNAME is noted to start at "__.MMIX.start.SECNAME" by the
+   presence of this symbol.  Currently only implemented for ".text"
+   through the symbol "__.MMIX.start..text".  */
+#define MMIX_LOC_SECTION_START_SYMBOL_PREFIX "__.MMIX.start."
+
+/* This symbol is always a function.  */
+#define MMIX_START_SYMBOL_NAME "Main"
+
+
+/* We smuggle in a few MMO specifics here.  We don't make a specific MMO
+   file, since we can't reasonably support MMO without ELF; we have to
+   include this file anyway.  */
+
+#define MMO_TEXT_SECTION_NAME ".text"
+#define MMO_DATA_SECTION_NAME ".data"
+
+/* A definition for the flags we put in spec data in files.  A copy of our
+   own of some flags to keep immune to BFD flag changes.  See section.c of
+   2001-07-18 for flag documentation.  */
+#define MMO_SEC_ALLOC      0x001
+#define MMO_SEC_LOAD       0x002
+#define MMO_SEC_RELOC      0x004
+#define MMO_SEC_READONLY   0x010
+#define MMO_SEC_CODE       0x020
+#define MMO_SEC_DATA       0x040
+#define MMO_SEC_NEVER_LOAD 0x400
+#define MMO_SEC_IS_COMMON 0x8000
+#define MMO_SEC_DEBUGGING 0x10000
+
+#ifdef BFD_ARCH_SIZE
+extern bfd_boolean _bfd_mmix_before_linker_allocation
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_mmix_after_linker_allocation
+  (bfd *, struct bfd_link_info *);
+extern bfd_boolean _bfd_mmix_check_all_relocs
+  (bfd *, struct bfd_link_info *);
+#endif
+
+#endif /* ELF_MMIX_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/mn10200.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/mn10200.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/mn10200.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/mn10200.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,40 @@
+/* MN10200 ELF support for BFD.
+   Copyright 1998, 2000, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file holds definitions specific to the MN10200 ELF ABI.  */
+
+#ifndef _ELF_MN10200_H
+#define _ELF_MN10200_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_mn10200_reloc_type)
+  RELOC_NUMBER (R_MN10200_NONE, 0)
+  RELOC_NUMBER (R_MN10200_32, 1)
+  RELOC_NUMBER (R_MN10200_16, 2)
+  RELOC_NUMBER (R_MN10200_8, 3)
+  RELOC_NUMBER (R_MN10200_24, 4)
+  RELOC_NUMBER (R_MN10200_PCREL8, 5)
+  RELOC_NUMBER (R_MN10200_PCREL16, 6)
+  RELOC_NUMBER (R_MN10200_PCREL24, 7)
+END_RELOC_NUMBERS (R_MN10200_max)
+
+#endif /* _ELF_MN10200_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/mn10300.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/mn10300.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/mn10300.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/mn10300.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,71 @@
+/* MN10300 ELF support for BFD.
+   Copyright 1998, 1999, 2000, 2003, 2007 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file holds definitions specific to the MN10300 ELF ABI.  */
+
+#ifndef _ELF_MN10300_H
+#define _ELF_MN10300_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_mn10300_reloc_type)
+  RELOC_NUMBER (R_MN10300_NONE, 0)
+  RELOC_NUMBER (R_MN10300_32, 1)
+  RELOC_NUMBER (R_MN10300_16, 2)
+  RELOC_NUMBER (R_MN10300_8, 3)
+  RELOC_NUMBER (R_MN10300_PCREL32, 4)
+  RELOC_NUMBER (R_MN10300_PCREL16, 5)
+  RELOC_NUMBER (R_MN10300_PCREL8, 6)
+  RELOC_NUMBER (R_MN10300_GNU_VTINHERIT, 7)
+  RELOC_NUMBER (R_MN10300_GNU_VTENTRY, 8)
+  RELOC_NUMBER (R_MN10300_24, 9)
+  RELOC_NUMBER (R_MN10300_GOTPC32, 10)
+  RELOC_NUMBER (R_MN10300_GOTPC16, 11)
+  RELOC_NUMBER (R_MN10300_GOTOFF32, 12)
+  RELOC_NUMBER (R_MN10300_GOTOFF24, 13)
+  RELOC_NUMBER (R_MN10300_GOTOFF16, 14)
+  RELOC_NUMBER (R_MN10300_PLT32, 15)
+  RELOC_NUMBER (R_MN10300_PLT16, 16)
+  RELOC_NUMBER (R_MN10300_GOT32, 17)
+  RELOC_NUMBER (R_MN10300_GOT24, 18)
+  RELOC_NUMBER (R_MN10300_GOT16, 19)
+  RELOC_NUMBER (R_MN10300_COPY, 20)
+  RELOC_NUMBER (R_MN10300_GLOB_DAT, 21)
+  RELOC_NUMBER (R_MN10300_JMP_SLOT, 22)
+  RELOC_NUMBER (R_MN10300_RELATIVE, 23)
+  RELOC_NUMBER (R_MN10300_SYM_DIFF, 33)
+  RELOC_NUMBER (R_MN10300_ALIGN, 34)
+END_RELOC_NUMBERS (R_MN10300_MAX)
+
+/* Machine variant if we know it.  This field was invented at Cygnus,
+   but it is hoped that other vendors will adopt it.  If some standard
+   is developed, this code should be changed to follow it.  */
+
+#define EF_MN10300_MACH		0x00FF0000
+
+/* Cygnus is choosing values between 80 and 9F;
+   00 - 7F should be left for a future standard;
+   the rest are open.  */
+
+#define E_MN10300_MACH_MN10300	0x00810000
+#define E_MN10300_MACH_AM33	0x00820000
+#define E_MN10300_MACH_AM33_2   0x00830000
+#endif /* _ELF_MN10300_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/moxie.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/moxie.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/moxie.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/moxie.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,32 @@
+/* moxie ELF support for BFD.
+   Copyright 2009, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_MOXIE_H
+#define _ELF_MOXIE_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocation types.  */
+START_RELOC_NUMBERS (elf_moxie_reloc_type)
+  RELOC_NUMBER (R_MOXIE_NONE, 0)
+  RELOC_NUMBER (R_MOXIE_32, 1)
+  RELOC_NUMBER (R_MOXIE_PCREL10, 2)
+END_RELOC_NUMBERS (R_MOXIE_max)
+
+#endif /* _ELF_MOXIE_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/msp430.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/msp430.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/msp430.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/msp430.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,58 @@
+/* MSP430 ELF support for BFD.
+   Copyright (C) 2002, 2003, 2004, 2010 Free Software Foundation, Inc.
+   Contributed by Dmitry Diky <diwil@mail.ru>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_MSP430_H
+#define _ELF_MSP430_H
+
+#include "elf/reloc-macros.h"
+
+/* Processor specific flags for the ELF header e_flags field.  */
+#define EF_MSP430_MACH 		0xff
+
+#define E_MSP430_MACH_MSP430x11  11
+#define E_MSP430_MACH_MSP430x11x1  110
+#define E_MSP430_MACH_MSP430x12  12
+#define E_MSP430_MACH_MSP430x13  13
+#define E_MSP430_MACH_MSP430x14  14
+#define E_MSP430_MACH_MSP430x15  15
+#define E_MSP430_MACH_MSP430x16  16
+#define E_MSP430_MACH_MSP430x31  31
+#define E_MSP430_MACH_MSP430x32  32
+#define E_MSP430_MACH_MSP430x33  33
+#define E_MSP430_MACH_MSP430x41  41
+#define E_MSP430_MACH_MSP430x42  42
+#define E_MSP430_MACH_MSP430x43  43
+#define E_MSP430_MACH_MSP430x44  44
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_msp430_reloc_type)
+     RELOC_NUMBER (R_MSP430_NONE,		0)
+     RELOC_NUMBER (R_MSP430_32,			1)
+     RELOC_NUMBER (R_MSP430_10_PCREL,		2)
+     RELOC_NUMBER (R_MSP430_16, 		3)
+     RELOC_NUMBER (R_MSP430_16_PCREL, 		4)
+     RELOC_NUMBER (R_MSP430_16_BYTE, 		5)
+     RELOC_NUMBER (R_MSP430_16_PCREL_BYTE, 	6)
+     RELOC_NUMBER (R_MSP430_2X_PCREL,		7)
+     RELOC_NUMBER (R_MSP430_RL_PCREL,		8)
+
+END_RELOC_NUMBERS (R_MSP430_max)
+
+#endif /* _ELF_MSP430_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/mt.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/mt.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/mt.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/mt.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,46 @@
+/* MS1  ELF support for BFD.
+   Copyright (C) 2000, 2005, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_MT_H
+#define _ELF_MT_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_mt_reloc_type)
+  RELOC_NUMBER (R_MT_NONE, 0)
+  RELOC_NUMBER (R_MT_16, 1)
+  RELOC_NUMBER (R_MT_32, 2)
+  RELOC_NUMBER (R_MT_32_PCREL, 3)
+  RELOC_NUMBER (R_MT_PC16, 4)
+  RELOC_NUMBER (R_MT_HI16, 5)
+  RELOC_NUMBER (R_MT_LO16, 6)
+END_RELOC_NUMBERS(R_MT_max)
+
+#define EF_MT_CPU_MRISC		0x00000001	/* default */
+#define EF_MT_CPU_MRISC2	0x00000002	/* MRISC2 */
+#define EF_MT_CPU_MS2		0x00000003      /* MS2 */
+#define EF_MT_CPU_MASK		0x00000003	/* specific cpu bits */
+#define EF_MT_ALL_FLAGS		(EF_MT_CPU_MASK)
+
+/* The location of the memory mapped hardware stack.  */
+#define MT_STACK_VALUE 0x0f000000
+#define MT_STACK_SIZE  0x20
+
+#endif /* _ELF_MT_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/openrisc.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/openrisc.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/openrisc.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/openrisc.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,39 @@
+/* OpenRISC ELF support for BFD.
+   Copyright 2001, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_OPENRISC_H
+#define _ELF_OPENRISC_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_openrisc_reloc_type)
+  RELOC_NUMBER (R_OPENRISC_NONE, 0)
+  RELOC_NUMBER (R_OPENRISC_INSN_REL_26, 1)
+  RELOC_NUMBER (R_OPENRISC_INSN_ABS_26, 2)
+  RELOC_NUMBER (R_OPENRISC_LO_16_IN_INSN, 3)
+  RELOC_NUMBER (R_OPENRISC_HI_16_IN_INSN, 4)
+  RELOC_NUMBER (R_OPENRISC_8, 5)
+  RELOC_NUMBER (R_OPENRISC_16, 6)
+  RELOC_NUMBER (R_OPENRISC_32, 7)
+  RELOC_NUMBER (R_OPENRISC_GNU_VTINHERIT, 8)
+  RELOC_NUMBER (R_OPENRISC_GNU_VTENTRY, 9)
+END_RELOC_NUMBERS (R_OPENRISC_max)
+
+#endif /* _ELF_OPENRISC_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/or32.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/or32.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/or32.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/or32.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,56 @@
+/* OR1K ELF support for BFD. Derived from ppc.h.
+   Copyright (C) 2002, 2010 Free Software Foundation, Inc.
+   Contributed by Ivan Guzvinec  <ivang@opencores.org>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _ELF_OR1K_H
+#define _ELF_OR1K_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_or32_reloc_type)
+  RELOC_NUMBER (R_OR32_NONE, 0)
+  RELOC_NUMBER (R_OR32_32, 1)
+  RELOC_NUMBER (R_OR32_16, 2)
+  RELOC_NUMBER (R_OR32_8, 3)
+  RELOC_NUMBER (R_OR32_CONST, 4)
+  RELOC_NUMBER (R_OR32_CONSTH, 5)
+  RELOC_NUMBER (R_OR32_JUMPTARG, 6)
+  RELOC_NUMBER (R_OR32_GNU_VTENTRY, 7)
+  RELOC_NUMBER (R_OR32_GNU_VTINHERIT, 8)
+END_RELOC_NUMBERS (R_OR32_max)
+
+/* Four bit OR32 machine type field.  */
+#define EF_OR32_MACH             0x0000000f
+
+/* Various CPU types.  */
+#define E_OR32_MACH_BASE         0x00000000
+#define E_OR32_MACH_UNUSED1      0x00000001
+#define E_OR32_MACH_UNUSED2      0x00000002
+#define E_OR32_MACH_UNUSED4      0x00000003
+
+/* Processor specific section headers, sh_type field */
+#define SHT_ORDERED		SHT_HIPROC	/* Link editor is to sort the \
+						   entries in this section \
+						   based on the address \
+						   specified in the associated \
+						   symbol table entry.  */
+
+#endif /* _ELF_OR1K_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/pj.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/pj.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/pj.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/pj.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,44 @@
+/* picoJava ELF support for BFD.
+   Copyright 1999, 2000, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_PJ_H
+#define _ELF_PJ_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+
+START_RELOC_NUMBERS (elf_pj_reloc_type)
+  RELOC_NUMBER (R_PJ_NONE, 0)
+  RELOC_NUMBER (R_PJ_DATA_DIR32, 1)
+  RELOC_NUMBER (R_PJ_CODE_REL32, 2)
+  RELOC_NUMBER (R_PJ_CODE_REL16, 3) 
+  RELOC_NUMBER (R_PJ_CODE_DIR32, 6)
+  RELOC_NUMBER (R_PJ_CODE_DIR16, 7)  
+  RELOC_NUMBER (R_PJ_CODE_LO16, 13)
+  RELOC_NUMBER (R_PJ_CODE_HI16, 14)
+  RELOC_NUMBER (R_PJ_GNU_VTINHERIT, 15)
+  RELOC_NUMBER (R_PJ_GNU_VTENTRY, 16)
+END_RELOC_NUMBERS (R_PJ_max)
+
+#define EF_PICOJAVA_ARCH     0x0000000f
+#define EF_PICOJAVA_NEWCALLS 0x00000010
+#define EF_PICOJAVA_GNUCALLS 0x00000020  /* The (currently) non standard GNU calling convention */
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/ppc.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/ppc.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/ppc.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/ppc.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,202 @@
+/* PPC ELF support for BFD.
+   Copyright 1995, 1996, 1998, 2000, 2001, 2002, 2003, 2005, 2007, 2008,
+   2009, 2010 Free Software Foundation, Inc.
+
+   By Michael Meissner, Cygnus Support, <meissner@cygnus.com>,
+   from information in the System V Application Binary Interface,
+   PowerPC Processor Supplement and the PowerPC Embedded Application
+   Binary Interface (eabi).
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file holds definitions specific to the PPC ELF ABI.  Note
+   that most of this is not actually implemented by BFD.  */
+
+#ifndef _ELF_PPC_H
+#define _ELF_PPC_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_ppc_reloc_type)
+  RELOC_NUMBER (R_PPC_NONE,		  0)
+  RELOC_NUMBER (R_PPC_ADDR32,		  1)
+  RELOC_NUMBER (R_PPC_ADDR24,		  2)
+  RELOC_NUMBER (R_PPC_ADDR16,		  3)
+  RELOC_NUMBER (R_PPC_ADDR16_LO,	  4)
+  RELOC_NUMBER (R_PPC_ADDR16_HI,	  5)
+  RELOC_NUMBER (R_PPC_ADDR16_HA,	  6)
+  RELOC_NUMBER (R_PPC_ADDR14,		  7)
+  RELOC_NUMBER (R_PPC_ADDR14_BRTAKEN,	  8)
+  RELOC_NUMBER (R_PPC_ADDR14_BRNTAKEN,	  9)
+  RELOC_NUMBER (R_PPC_REL24,		 10)
+  RELOC_NUMBER (R_PPC_REL14,		 11)
+  RELOC_NUMBER (R_PPC_REL14_BRTAKEN,	 12)
+  RELOC_NUMBER (R_PPC_REL14_BRNTAKEN,	 13)
+  RELOC_NUMBER (R_PPC_GOT16,		 14)
+  RELOC_NUMBER (R_PPC_GOT16_LO,		 15)
+  RELOC_NUMBER (R_PPC_GOT16_HI,		 16)
+  RELOC_NUMBER (R_PPC_GOT16_HA,		 17)
+  RELOC_NUMBER (R_PPC_PLTREL24,		 18)
+  RELOC_NUMBER (R_PPC_COPY,		 19)
+  RELOC_NUMBER (R_PPC_GLOB_DAT,		 20)
+  RELOC_NUMBER (R_PPC_JMP_SLOT,		 21)
+  RELOC_NUMBER (R_PPC_RELATIVE,		 22)
+  RELOC_NUMBER (R_PPC_LOCAL24PC,	 23)
+  RELOC_NUMBER (R_PPC_UADDR32,		 24)
+  RELOC_NUMBER (R_PPC_UADDR16,		 25)
+  RELOC_NUMBER (R_PPC_REL32,		 26)
+  RELOC_NUMBER (R_PPC_PLT32,		 27)
+  RELOC_NUMBER (R_PPC_PLTREL32,		 28)
+  RELOC_NUMBER (R_PPC_PLT16_LO,		 29)
+  RELOC_NUMBER (R_PPC_PLT16_HI,		 30)
+  RELOC_NUMBER (R_PPC_PLT16_HA,		 31)
+  RELOC_NUMBER (R_PPC_SDAREL16,		 32)
+  RELOC_NUMBER (R_PPC_SECTOFF,		 33)
+  RELOC_NUMBER (R_PPC_SECTOFF_LO,	 34)
+  RELOC_NUMBER (R_PPC_SECTOFF_HI,	 35)
+  RELOC_NUMBER (R_PPC_SECTOFF_HA,	 36)
+  RELOC_NUMBER (R_PPC_ADDR30,		 37)
+
+#ifndef RELOC_MACROS_GEN_FUNC
+/* Fake relocations for branch stubs, only used internally by ld.  */
+  RELOC_NUMBER (R_PPC_RELAX,		 48)
+  RELOC_NUMBER (R_PPC_RELAX_PLT,	 49)
+  RELOC_NUMBER (R_PPC_RELAX_PLTREL24,	 50)
+#endif
+
+  /* Relocs added to support TLS.  */
+  RELOC_NUMBER (R_PPC_TLS,		 67)
+  RELOC_NUMBER (R_PPC_DTPMOD32,		 68)
+  RELOC_NUMBER (R_PPC_TPREL16,		 69)
+  RELOC_NUMBER (R_PPC_TPREL16_LO,	 70)
+  RELOC_NUMBER (R_PPC_TPREL16_HI,	 71)
+  RELOC_NUMBER (R_PPC_TPREL16_HA,	 72)
+  RELOC_NUMBER (R_PPC_TPREL32,		 73)
+  RELOC_NUMBER (R_PPC_DTPREL16,		 74)
+  RELOC_NUMBER (R_PPC_DTPREL16_LO,	 75)
+  RELOC_NUMBER (R_PPC_DTPREL16_HI,	 76)
+  RELOC_NUMBER (R_PPC_DTPREL16_HA,	 77)
+  RELOC_NUMBER (R_PPC_DTPREL32,		 78)
+  RELOC_NUMBER (R_PPC_GOT_TLSGD16,	 79)
+  RELOC_NUMBER (R_PPC_GOT_TLSGD16_LO,	 80)
+  RELOC_NUMBER (R_PPC_GOT_TLSGD16_HI,	 81)
+  RELOC_NUMBER (R_PPC_GOT_TLSGD16_HA,	 82)
+  RELOC_NUMBER (R_PPC_GOT_TLSLD16,	 83)
+  RELOC_NUMBER (R_PPC_GOT_TLSLD16_LO,	 84)
+  RELOC_NUMBER (R_PPC_GOT_TLSLD16_HI,	 85)
+  RELOC_NUMBER (R_PPC_GOT_TLSLD16_HA,	 86)
+  RELOC_NUMBER (R_PPC_GOT_TPREL16,	 87)
+  RELOC_NUMBER (R_PPC_GOT_TPREL16_LO,	 88)
+  RELOC_NUMBER (R_PPC_GOT_TPREL16_HI,	 89)
+  RELOC_NUMBER (R_PPC_GOT_TPREL16_HA,	 90)
+  RELOC_NUMBER (R_PPC_GOT_DTPREL16,	 91)
+  RELOC_NUMBER (R_PPC_GOT_DTPREL16_LO,	 92)
+  RELOC_NUMBER (R_PPC_GOT_DTPREL16_HI,	 93)
+  RELOC_NUMBER (R_PPC_GOT_DTPREL16_HA,	 94)
+  RELOC_NUMBER (R_PPC_TLSGD,		 95)
+  RELOC_NUMBER (R_PPC_TLSLD,		 96)
+
+/* The remaining relocs are from the Embedded ELF ABI, and are not
+   in the SVR4 ELF ABI.  */
+  RELOC_NUMBER (R_PPC_EMB_NADDR32,	101)
+  RELOC_NUMBER (R_PPC_EMB_NADDR16,	102)
+  RELOC_NUMBER (R_PPC_EMB_NADDR16_LO,	103)
+  RELOC_NUMBER (R_PPC_EMB_NADDR16_HI,	104)
+  RELOC_NUMBER (R_PPC_EMB_NADDR16_HA,	105)
+  RELOC_NUMBER (R_PPC_EMB_SDAI16,	106)
+  RELOC_NUMBER (R_PPC_EMB_SDA2I16,	107)
+  RELOC_NUMBER (R_PPC_EMB_SDA2REL,	108)
+  RELOC_NUMBER (R_PPC_EMB_SDA21,	109)
+  RELOC_NUMBER (R_PPC_EMB_MRKREF,	110)
+  RELOC_NUMBER (R_PPC_EMB_RELSEC16,	111)
+  RELOC_NUMBER (R_PPC_EMB_RELST_LO,	112)
+  RELOC_NUMBER (R_PPC_EMB_RELST_HI,	113)
+  RELOC_NUMBER (R_PPC_EMB_RELST_HA,	114)
+  RELOC_NUMBER (R_PPC_EMB_BIT_FLD,	115)
+  RELOC_NUMBER (R_PPC_EMB_RELSDA,	116)
+
+/* Support STT_GNU_IFUNC plt calls.  */
+  RELOC_NUMBER (R_PPC_IRELATIVE,	248)
+
+/* These are GNU extensions used in PIC code sequences.  */
+  RELOC_NUMBER (R_PPC_REL16,		249)
+  RELOC_NUMBER (R_PPC_REL16_LO,		250)
+  RELOC_NUMBER (R_PPC_REL16_HI,		251)
+  RELOC_NUMBER (R_PPC_REL16_HA,		252)
+
+/* These are GNU extensions to enable C++ vtable garbage collection.  */
+  RELOC_NUMBER (R_PPC_GNU_VTINHERIT,	253)
+  RELOC_NUMBER (R_PPC_GNU_VTENTRY,	254)
+
+/* This is a phony reloc to handle any old fashioned TOC16 references
+   that may still be in object files.  */
+  RELOC_NUMBER (R_PPC_TOC16,		255)
+
+END_RELOC_NUMBERS (R_PPC_max)
+
+#define IS_PPC_TLS_RELOC(R) \
+  ((R) >= R_PPC_TLS && (R) <= R_PPC_GOT_DTPREL16_HA)
+
+/* Specify the value of _GLOBAL_OFFSET_TABLE_.  */
+#define DT_PPC_GOT		(DT_LOPROC)
+
+/* Specify that tls descriptors should be optimized.  */
+#define DT_PPC_TLSOPT		(DT_LOPROC + 1)
+
+/* Processor specific flags for the ELF header e_flags field.  */
+
+#define	EF_PPC_EMB		0x80000000	/* PowerPC embedded flag.  */
+
+#define	EF_PPC_RELOCATABLE	0x00010000	/* PowerPC -mrelocatable flag.  */
+#define	EF_PPC_RELOCATABLE_LIB	0x00008000	/* PowerPC -mrelocatable-lib flag.  */
+
+/* This bit is reserved by BFD for processor specific stuff.  Name
+   it properly so that we can easily stay consistent elsewhere.  */
+#define SEC_PPC_VLE		SEC_TIC54X_BLOCK
+
+/* Processor specific section headers, sh_type field.  */
+
+#define SHT_ORDERED		SHT_HIPROC	/* Link editor is to sort the \
+						   entries in this section \
+						   based on the address \
+						   specified in the associated \
+						   symbol table entry.  */
+
+/* Object attribute tags.  */
+enum
+{
+  /* 0-3 are generic.  */
+  Tag_GNU_Power_ABI_FP = 4, /* Value 1 for hard-float, 2 for
+			       soft-float, 3 for single=precision 
+			       hard-float; 0 for not tagged or not
+			       using any ABIs affected by the
+			       differences.  */
+
+  /* Value 1 for general purpose registers only, 2 for AltiVec
+     registers, 3 for SPE registers; 0 for not tagged or not using any
+     ABIs affected by the differences.  */
+  Tag_GNU_Power_ABI_Vector = 8,
+
+  /* Value 1 for ABIs using r3/r4 for returning structures <= 8 bytes,
+     2 for ABIs using memory; 0 for not tagged or not using any ABIs
+     affected by the differences.  */
+  Tag_GNU_Power_ABI_Struct_Return = 12
+};
+
+#endif /* _ELF_PPC_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/ppc64.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/ppc64.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/ppc64.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/ppc64.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,177 @@
+/* PPC64 ELF support for BFD.
+   Copyright 2003, 2005, 2009, 2010, 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _ELF_PPC64_H
+#define _ELF_PPC64_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_ppc64_reloc_type)
+  RELOC_NUMBER (R_PPC64_NONE,		     0)
+  RELOC_NUMBER (R_PPC64_ADDR32,		     1)
+  RELOC_NUMBER (R_PPC64_ADDR24,		     2)
+  RELOC_NUMBER (R_PPC64_ADDR16,		     3)
+  RELOC_NUMBER (R_PPC64_ADDR16_LO,	     4)
+  RELOC_NUMBER (R_PPC64_ADDR16_HI,	     5)
+  RELOC_NUMBER (R_PPC64_ADDR16_HA,	     6)
+  RELOC_NUMBER (R_PPC64_ADDR14,		     7)
+  RELOC_NUMBER (R_PPC64_ADDR14_BRTAKEN,	     8)
+  RELOC_NUMBER (R_PPC64_ADDR14_BRNTAKEN,     9)
+  RELOC_NUMBER (R_PPC64_REL24,		    10)
+  RELOC_NUMBER (R_PPC64_REL14,		    11)
+  RELOC_NUMBER (R_PPC64_REL14_BRTAKEN,	    12)
+  RELOC_NUMBER (R_PPC64_REL14_BRNTAKEN,	    13)
+  RELOC_NUMBER (R_PPC64_GOT16,		    14)
+  RELOC_NUMBER (R_PPC64_GOT16_LO,	    15)
+  RELOC_NUMBER (R_PPC64_GOT16_HI,	    16)
+  RELOC_NUMBER (R_PPC64_GOT16_HA,	    17)
+  /* 18 unused.  32-bit reloc is R_PPC_PLTREL24.  */
+  RELOC_NUMBER (R_PPC64_COPY,		    19)
+  RELOC_NUMBER (R_PPC64_GLOB_DAT,	    20)
+  RELOC_NUMBER (R_PPC64_JMP_SLOT,	    21)
+  RELOC_NUMBER (R_PPC64_RELATIVE,	    22)
+  /* 23 unused.  32-bit reloc is R_PPC_LOCAL24PC.  */
+  RELOC_NUMBER (R_PPC64_UADDR32,	    24)
+  RELOC_NUMBER (R_PPC64_UADDR16,	    25)
+  RELOC_NUMBER (R_PPC64_REL32,		    26)
+  RELOC_NUMBER (R_PPC64_PLT32,		    27)
+  RELOC_NUMBER (R_PPC64_PLTREL32,	    28)
+  RELOC_NUMBER (R_PPC64_PLT16_LO,	    29)
+  RELOC_NUMBER (R_PPC64_PLT16_HI,	    30)
+  RELOC_NUMBER (R_PPC64_PLT16_HA,	    31)
+  /* 32 unused.  32-bit reloc is R_PPC_SDAREL16.  */
+  RELOC_NUMBER (R_PPC64_SECTOFF,	    33)
+  RELOC_NUMBER (R_PPC64_SECTOFF_LO,	    34)
+  RELOC_NUMBER (R_PPC64_SECTOFF_HI,	    35)
+  RELOC_NUMBER (R_PPC64_SECTOFF_HA,	    36)
+  RELOC_NUMBER (R_PPC64_REL30,		    37)
+  RELOC_NUMBER (R_PPC64_ADDR64,		    38)
+  RELOC_NUMBER (R_PPC64_ADDR16_HIGHER,	    39)
+  RELOC_NUMBER (R_PPC64_ADDR16_HIGHERA,	    40)
+  RELOC_NUMBER (R_PPC64_ADDR16_HIGHEST,	    41)
+  RELOC_NUMBER (R_PPC64_ADDR16_HIGHESTA,    42)
+  RELOC_NUMBER (R_PPC64_UADDR64,	    43)
+  RELOC_NUMBER (R_PPC64_REL64,		    44)
+  RELOC_NUMBER (R_PPC64_PLT64,		    45)
+  RELOC_NUMBER (R_PPC64_PLTREL64,	    46)
+  RELOC_NUMBER (R_PPC64_TOC16,		    47)
+  RELOC_NUMBER (R_PPC64_TOC16_LO,	    48)
+  RELOC_NUMBER (R_PPC64_TOC16_HI,	    49)
+  RELOC_NUMBER (R_PPC64_TOC16_HA,	    50)
+  RELOC_NUMBER (R_PPC64_TOC,		    51)
+  RELOC_NUMBER (R_PPC64_PLTGOT16,	    52)
+  RELOC_NUMBER (R_PPC64_PLTGOT16_LO,	    53)
+  RELOC_NUMBER (R_PPC64_PLTGOT16_HI,	    54)
+  RELOC_NUMBER (R_PPC64_PLTGOT16_HA,	    55)
+
+  /* The following relocs were added in the 64-bit PowerPC ELF ABI
+     revision 1.2. */
+  RELOC_NUMBER (R_PPC64_ADDR16_DS,	    56)
+  RELOC_NUMBER (R_PPC64_ADDR16_LO_DS,	    57)
+  RELOC_NUMBER (R_PPC64_GOT16_DS,	    58)
+  RELOC_NUMBER (R_PPC64_GOT16_LO_DS,	    59)
+  RELOC_NUMBER (R_PPC64_PLT16_LO_DS,	    60)
+  RELOC_NUMBER (R_PPC64_SECTOFF_DS,	    61)
+  RELOC_NUMBER (R_PPC64_SECTOFF_LO_DS,	    62)
+  RELOC_NUMBER (R_PPC64_TOC16_DS,	    63)
+  RELOC_NUMBER (R_PPC64_TOC16_LO_DS,	    64)
+  RELOC_NUMBER (R_PPC64_PLTGOT16_DS,	    65)
+  RELOC_NUMBER (R_PPC64_PLTGOT16_LO_DS,	    66)
+
+  /* Relocs added to support TLS.  PowerPC64 ELF ABI revision 1.5.  */
+  RELOC_NUMBER (R_PPC64_TLS,		    67)
+  RELOC_NUMBER (R_PPC64_DTPMOD64,	    68)
+  RELOC_NUMBER (R_PPC64_TPREL16,	    69)
+  RELOC_NUMBER (R_PPC64_TPREL16_LO,	    70)
+  RELOC_NUMBER (R_PPC64_TPREL16_HI,	    71)
+  RELOC_NUMBER (R_PPC64_TPREL16_HA,	    72)
+  RELOC_NUMBER (R_PPC64_TPREL64,	    73)
+  RELOC_NUMBER (R_PPC64_DTPREL16,	    74)
+  RELOC_NUMBER (R_PPC64_DTPREL16_LO,	    75)
+  RELOC_NUMBER (R_PPC64_DTPREL16_HI,	    76)
+  RELOC_NUMBER (R_PPC64_DTPREL16_HA,	    77)
+  RELOC_NUMBER (R_PPC64_DTPREL64,	    78)
+  RELOC_NUMBER (R_PPC64_GOT_TLSGD16,	    79)
+  RELOC_NUMBER (R_PPC64_GOT_TLSGD16_LO,	    80)
+  RELOC_NUMBER (R_PPC64_GOT_TLSGD16_HI,	    81)
+  RELOC_NUMBER (R_PPC64_GOT_TLSGD16_HA,	    82)
+  RELOC_NUMBER (R_PPC64_GOT_TLSLD16,	    83)
+  RELOC_NUMBER (R_PPC64_GOT_TLSLD16_LO,	    84)
+  RELOC_NUMBER (R_PPC64_GOT_TLSLD16_HI,	    85)
+  RELOC_NUMBER (R_PPC64_GOT_TLSLD16_HA,	    86)
+  RELOC_NUMBER (R_PPC64_GOT_TPREL16_DS,	    87)
+  RELOC_NUMBER (R_PPC64_GOT_TPREL16_LO_DS,  88)
+  RELOC_NUMBER (R_PPC64_GOT_TPREL16_HI,	    89)
+  RELOC_NUMBER (R_PPC64_GOT_TPREL16_HA,	    90)
+  RELOC_NUMBER (R_PPC64_GOT_DTPREL16_DS,    91)
+  RELOC_NUMBER (R_PPC64_GOT_DTPREL16_LO_DS, 92)
+  RELOC_NUMBER (R_PPC64_GOT_DTPREL16_HI,    93)
+  RELOC_NUMBER (R_PPC64_GOT_DTPREL16_HA,    94)
+  RELOC_NUMBER (R_PPC64_TPREL16_DS,	    95)
+  RELOC_NUMBER (R_PPC64_TPREL16_LO_DS,	    96)
+  RELOC_NUMBER (R_PPC64_TPREL16_HIGHER,	    97)
+  RELOC_NUMBER (R_PPC64_TPREL16_HIGHERA,    98)
+  RELOC_NUMBER (R_PPC64_TPREL16_HIGHEST,    99)
+  RELOC_NUMBER (R_PPC64_TPREL16_HIGHESTA,  100)
+  RELOC_NUMBER (R_PPC64_DTPREL16_DS,	   101)
+  RELOC_NUMBER (R_PPC64_DTPREL16_LO_DS,	   102)
+  RELOC_NUMBER (R_PPC64_DTPREL16_HIGHER,   103)
+  RELOC_NUMBER (R_PPC64_DTPREL16_HIGHERA,  104)
+  RELOC_NUMBER (R_PPC64_DTPREL16_HIGHEST,  105)
+  RELOC_NUMBER (R_PPC64_DTPREL16_HIGHESTA, 106)
+  RELOC_NUMBER (R_PPC64_TLSGD,		   107)
+  RELOC_NUMBER (R_PPC64_TLSLD,		   108)
+  RELOC_NUMBER (R_PPC64_TOCSAVE,	   109)
+
+#ifndef RELOC_MACROS_GEN_FUNC
+/* Fake relocation only used internally by ld.  */
+  RELOC_NUMBER (R_PPC64_LO_DS_OPT,	   128)
+#endif
+/* Support STT_GNU_IFUNC plt calls.  */
+  RELOC_NUMBER (R_PPC64_JMP_IREL,	   247)
+  RELOC_NUMBER (R_PPC64_IRELATIVE,	   248)
+
+/* These are GNU extensions used in PIC code sequences.  */
+  RELOC_NUMBER (R_PPC64_REL16,		   249)
+  RELOC_NUMBER (R_PPC64_REL16_LO,	   250)
+  RELOC_NUMBER (R_PPC64_REL16_HI,	   251)
+  RELOC_NUMBER (R_PPC64_REL16_HA,	   252)
+
+  /* These are GNU extensions to enable C++ vtable garbage collection.  */
+  RELOC_NUMBER (R_PPC64_GNU_VTINHERIT,	   253)
+  RELOC_NUMBER (R_PPC64_GNU_VTENTRY,	   254)
+
+END_RELOC_NUMBERS (R_PPC64_max)
+
+#define IS_PPC64_TLS_RELOC(R) \
+  ((R) >= R_PPC64_TLS && (R) <= R_PPC64_DTPREL16_HIGHESTA)
+
+/* Specify the start of the .glink section.  */
+#define DT_PPC64_GLINK		DT_LOPROC
+
+/* Specify the start and size of the .opd section.  */
+#define DT_PPC64_OPD		(DT_LOPROC + 1)
+#define DT_PPC64_OPDSZ		(DT_LOPROC + 2)
+
+/* Specify that tls descriptors should be optimized.  */
+#define DT_PPC64_TLSOPT		(DT_LOPROC + 3)
+
+#endif /* _ELF_PPC64_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/reloc-macros.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/reloc-macros.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/reloc-macros.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/reloc-macros.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,129 @@
+/* Generic relocation support for BFD.
+   Copyright 1998, 1999, 2000, 2003, 2010, 2011  Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* These macros are used by the various *.h target specific header
+   files to either generate an enum containing all the known relocations
+   for that target, or if RELOC_MACROS_GEN_FUNC is defined, a recognition
+   function is generated instead.  (This is used by binutils/readelf.c)
+
+   Given a header file like this:
+
+   	START_RELOC_NUMBERS (foo)
+   	    RELOC_NUMBER (R_foo_NONE,    0)
+   	    RELOC_NUMBER (R_foo_32,      1)
+   	    EMPTY_RELOC  (R_foo_good)
+   	    FAKE_RELOC   (R_foo_illegal, 9)
+   	END_RELOC_NUMBERS (R_foo_count)
+
+   Then the following will be produced by default (ie if
+   RELOC_MACROS_GEN_FUNC is *not* defined).
+
+   	enum foo
+	{
+   	  R_foo_NONE = 0,
+   	  R_foo_32 = 1,
+	  R_foo_good,
+   	  R_foo_illegal = 9,
+   	  R_foo_count
+   	};
+
+   Note: The value of the symbol defined in the END_RELOC_NUMBERS
+   macro (R_foo_count in the case of the example above) will be
+   set to the value of the whichever *_RELOC macro precedes it plus
+   one.  Therefore if you intend to use the symbol as a sentinel for
+   the highest valid macro value you should make sure that the
+   preceding *_RELOC macro is the highest valid number.  ie a
+   declaration like this:
+
+   	START_RELOC_NUMBERS (foo)
+   	    RELOC_NUMBER (R_foo_NONE,    0)
+   	    RELOC_NUMBER (R_foo_32,      1)
+   	    FAKE_RELOC   (R_foo_illegal, 9)
+   	    FAKE_RELOC   (R_foo_synonym, 0)
+   	END_RELOC_NUMBERS (R_foo_count)
+
+   will result in R_foo_count having a value of 1 (R_foo_synonym + 1)
+   rather than 10 or 2 as might be expected.
+
+   Alternatively you can assign a value to END_RELOC_NUMBERS symbol
+   explicitly, like this:
+
+   	START_RELOC_NUMBERS (foo)
+   	    RELOC_NUMBER (R_foo_NONE,    0)
+   	    RELOC_NUMBER (R_foo_32,      1)
+   	    FAKE_RELOC   (R_foo_illegal, 9)
+   	    FAKE_RELOC   (R_foo_synonym, 0)
+   	END_RELOC_NUMBERS (R_foo_count = 2)
+
+   If RELOC_MACROS_GEN_FUNC *is* defined, then instead the
+   following function will be generated:
+
+   	static const char *foo (unsigned long rtype);
+   	static const char *
+   	foo (unsigned long rtype)
+   	{
+   	   switch (rtype)
+   	   {
+   	   case 0: return "R_foo_NONE";
+   	   case 1: return "R_foo_32";
+   	   default: return NULL;
+   	   }
+   	}
+   */
+
+#ifndef _RELOC_MACROS_H
+#define _RELOC_MACROS_H
+
+#ifdef RELOC_MACROS_GEN_FUNC
+
+/* This function takes the relocation number and returns the
+   string version name of the name of that relocation.  If
+   the relocation is not recognised, NULL is returned.  */
+
+#define START_RELOC_NUMBERS(name)   				\
+static const char *name (unsigned long rtype);			\
+static const char *						\
+name (unsigned long rtype)					\
+{								\
+  switch (rtype)						\
+    {
+
+#define RELOC_NUMBER(name, number) \
+    case number: return #name;
+
+#define FAKE_RELOC(name, number)
+#define EMPTY_RELOC(name)
+
+#define END_RELOC_NUMBERS(name)	\
+    default: return NULL;	\
+    }				\
+}
+
+
+#else /* Default to generating enum.  */
+
+#define START_RELOC_NUMBERS(name)   enum name {
+#define RELOC_NUMBER(name, number)  name = number,
+#define FAKE_RELOC(name, number)    name = number,
+#define EMPTY_RELOC(name)           name,
+#define END_RELOC_NUMBERS(name)     name };
+
+#endif
+
+#endif /* _RELOC_MACROS_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/rx.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/rx.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/rx.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/rx.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,134 @@
+/* RX ELF support for BFD.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_RX_H
+#define _ELF_RX_H
+
+#include "elf/reloc-macros.h"
+
+/* Note that there are a few internal relocation types used by the
+   linker to do link-time relaxation.  If you update this file, please
+   check elf32-rx.c to see if any of the internal relocations need to
+   be, er, relocated.  */
+
+/* Preliminary relocations.  */
+START_RELOC_NUMBERS (elf_rx_reloc_type)
+
+  RELOC_NUMBER (R_RX_NONE,         0x00)
+  /* These are for data, and are bi-endian.  */
+  RELOC_NUMBER (R_RX_DIR32,        0x01) /* Was: R_RX_32.  */
+  RELOC_NUMBER (R_RX_DIR24S,       0x02) /* Was: R_RX_24.  */
+  RELOC_NUMBER (R_RX_DIR16,        0x03)
+  RELOC_NUMBER (R_RX_DIR16U,       0x04) /* Was: R_RX_16_UNS.  */
+  RELOC_NUMBER (R_RX_DIR16S,       0x05) /* Was: R_RX_16.  */
+  RELOC_NUMBER (R_RX_DIR8,         0x06)
+  RELOC_NUMBER (R_RX_DIR8U,        0x07) /* Was: R_RX_8_UNS.  */
+  RELOC_NUMBER (R_RX_DIR8S,        0x08) /* Was: R_RX_8.  */
+
+  /* Signed pc-relative values.  */
+  RELOC_NUMBER (R_RX_DIR24S_PCREL, 0x09) /* Was: R_RX_24_PCREL.  */
+  RELOC_NUMBER (R_RX_DIR16S_PCREL, 0x0a) /* Was: R_RX_16_PCREL.  */
+  RELOC_NUMBER (R_RX_DIR8S_PCREL,  0x0b) /* Was: R_RX_8_PCREL.  */
+
+  /* These are for fields in the instructions.  */
+  RELOC_NUMBER (R_RX_DIR16UL,      0x0c)
+  RELOC_NUMBER (R_RX_DIR16UW,      0x0d)
+  RELOC_NUMBER (R_RX_DIR8UL,       0x0e)
+  RELOC_NUMBER (R_RX_DIR8UW,       0x0f)
+  RELOC_NUMBER (R_RX_DIR32_REV,    0x10)
+  RELOC_NUMBER (R_RX_DIR16_REV,    0x11)
+  RELOC_NUMBER (R_RX_DIR3U_PCREL,  0x12)
+
+  /* These are extensions added by Red Hat.  */
+  RELOC_NUMBER (R_RX_RH_3_PCREL,   0x20) /* Like R_RX_DIR8S_PCREL but only 3-bits.  */
+  RELOC_NUMBER (R_RX_RH_16_OP,     0x21) /* Like R_RX_DIR16 but for opcodes - always big endian.  */
+  RELOC_NUMBER (R_RX_RH_24_OP,     0x22) /* Like R_RX_DIR24S but for opcodes - always big endian.  */
+  RELOC_NUMBER (R_RX_RH_32_OP,     0x23) /* Like R_RX_DIR32 but for opcodes - always big endian.  */
+  RELOC_NUMBER (R_RX_RH_24_UNS,    0x24) /* Like R_RX_DIR24S but for unsigned values.  */
+  RELOC_NUMBER (R_RX_RH_8_NEG,     0x25) /* Like R_RX_DIR8 but -x is stored.  */
+  RELOC_NUMBER (R_RX_RH_16_NEG,    0x26) /* Like R_RX_DIR16 but -x is stored.  */
+  RELOC_NUMBER (R_RX_RH_24_NEG,    0x27) /* Like R_RX_DIR24S but -x is stored.  */
+  RELOC_NUMBER (R_RX_RH_32_NEG,    0x28) /* Like R_RX_DIR32 but -x is stored.  */
+  RELOC_NUMBER (R_RX_RH_DIFF,      0x29) /* Subtract from a previous relocation.  */
+  RELOC_NUMBER (R_RX_RH_GPRELB,    0x2a) /* Byte value, relative to __gp.  */
+  RELOC_NUMBER (R_RX_RH_GPRELW,    0x2b) /* Word value, relative to __gp.  */
+  RELOC_NUMBER (R_RX_RH_GPRELL,    0x2c) /* Long value, relative to __gp.  */
+  RELOC_NUMBER (R_RX_RH_RELAX,     0x2d) /* Marks opcodes suitable for linker relaxation.  */
+
+  /* These are for complex relocs.  */
+  RELOC_NUMBER (R_RX_ABS32,        0x41)
+  RELOC_NUMBER (R_RX_ABS24S,       0x42)
+  RELOC_NUMBER (R_RX_ABS16,        0x43)
+  RELOC_NUMBER (R_RX_ABS16U,       0x44)
+  RELOC_NUMBER (R_RX_ABS16S,       0x45)
+  RELOC_NUMBER (R_RX_ABS8,         0x46)
+  RELOC_NUMBER (R_RX_ABS8U,        0x47)
+  RELOC_NUMBER (R_RX_ABS8S,        0x48)
+  RELOC_NUMBER (R_RX_ABS24S_PCREL, 0x49)
+  RELOC_NUMBER (R_RX_ABS16S_PCREL, 0x4a)
+  RELOC_NUMBER (R_RX_ABS8S_PCREL,  0x4b)
+  RELOC_NUMBER (R_RX_ABS16UL,      0x4c)
+  RELOC_NUMBER (R_RX_ABS16UW,      0x4d)
+  RELOC_NUMBER (R_RX_ABS8UL,       0x4e)
+  RELOC_NUMBER (R_RX_ABS8UW,       0x4f)
+  RELOC_NUMBER (R_RX_ABS32_REV,    0x50)
+  RELOC_NUMBER (R_RX_ABS16_REV,    0x51)
+
+  RELOC_NUMBER (R_RX_SYM,          0x80)
+  RELOC_NUMBER (R_RX_OPneg,        0x81)
+  RELOC_NUMBER (R_RX_OPadd,        0x82)
+  RELOC_NUMBER (R_RX_OPsub,        0x83)
+  RELOC_NUMBER (R_RX_OPmul,        0x84)
+  RELOC_NUMBER (R_RX_OPdiv,        0x85)
+  RELOC_NUMBER (R_RX_OPshla,       0x86)
+  RELOC_NUMBER (R_RX_OPshra,       0x87)
+  RELOC_NUMBER (R_RX_OPsctsize,    0x88)
+  RELOC_NUMBER (R_RX_OPscttop,     0x8d)
+  RELOC_NUMBER (R_RX_OPand,        0x90)
+  RELOC_NUMBER (R_RX_OPor,         0x91)
+  RELOC_NUMBER (R_RX_OPxor,        0x92)
+  RELOC_NUMBER (R_RX_OPnot,        0x93)
+  RELOC_NUMBER (R_RX_OPmod,        0x94)
+  RELOC_NUMBER (R_RX_OPromtop,     0x95)
+  RELOC_NUMBER (R_RX_OPramtop,     0x96)
+
+END_RELOC_NUMBERS (R_RX_max)
+
+#define EF_RX_CPU_RX	0x00000079      /* FIXME: correct value?  */
+#define EF_RX_CPU_MASK	0x0000007F	/* specific cpu bits.  */
+#define EF_RX_ALL_FLAGS	(EF_RX_CPU_MASK)
+
+/* Values for the e_flags field in the ELF header.  */
+#define E_FLAG_RX_64BIT_DOUBLES		(1 << 0)
+#define E_FLAG_RX_DSP			(1 << 1) /* Defined in the RX CPU Object file specification, but not explained.  */
+
+/* These define the addend field of R_RX_RH_RELAX relocations.  */
+#define	RX_RELAXA_IMM6	0x00000010	/* Imm8/16/24/32 at bit offset 6.  */
+#define	RX_RELAXA_IMM12	0x00000020	/* Imm8/16/24/32 at bit offset 12.  */
+#define	RX_RELAXA_DSP4	0x00000040	/* Dsp0/8/16 at bit offset 4.  */
+#define	RX_RELAXA_DSP6	0x00000080	/* Dsp0/8/16 at bit offset 6.  */
+#define	RX_RELAXA_DSP14	0x00000100	/* Dsp0/8/16 at bit offset 14.  */
+#define	RX_RELAXA_BRA	0x00000200	/* Any type of branch (must be decoded).  */
+#define RX_RELAXA_RNUM	0x0000000f	/* Number of associated relocations.  */
+/* These mark the place where alignment is requested, and the place where the filler bytes end.  */
+#define	RX_RELAXA_ALIGN	0x10000000	/* Start alignment; the remaining bits are the alignment value.  */
+#define	RX_RELAXA_ELIGN	0x20000000	/* End alignment; the remaining bits are the alignment value.  */
+#define	RX_RELAXA_ANUM	0x00ffffff	/* Alignment amount, in bytes (i.e. .balign).  */
+
+#endif /* _ELF_RX_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/s390.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/s390.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/s390.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/s390.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,129 @@
+/* 390 ELF support for BFD.
+   Copyright 2000, 2001, 2003, 2010 Free Software Foundation, Inc.
+   Contributed by Carl B. Pedersen and Martin Schwidefsky.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#ifndef _ELF_390_H
+#define _ELF_390_H
+
+/* Processor specific flags for the ELF header e_flags field.  */
+
+/* Symbol types.  */
+
+#define STACK_REG		15		/* Global Stack reg */
+#define BACKL_REG		14		/* Global Backlink reg */
+#define BASE_REG		13		/* Global Base reg */
+#define GOT_REG 		12		/* Holds addr of GOT */
+
+#include "elf/reloc-macros.h"
+
+/* Processor specific flags for the ELF header e_flags field.  */
+
+#define EF_S390_HIGH_GPRS        0x00000001
+
+/* Relocation types.  */
+
+START_RELOC_NUMBERS (elf_s390_reloc_type)
+    RELOC_NUMBER (R_390_NONE, 0)	/* No reloc.  */
+    RELOC_NUMBER (R_390_8, 1)		/* Direct 8 bit.  */
+    RELOC_NUMBER (R_390_12, 2)		/* Direct 12 bit.  */
+    RELOC_NUMBER (R_390_16, 3)		/* Direct 16 bit.  */
+    RELOC_NUMBER (R_390_32, 4)		/* Direct 32 bit.  */
+    RELOC_NUMBER (R_390_PC32, 5)	/* PC relative 32 bit.  */
+    RELOC_NUMBER (R_390_GOT12, 6)	/* 12 bit GOT offset.  */
+    RELOC_NUMBER (R_390_GOT32, 7)	/* 32 bit GOT offset.  */
+    RELOC_NUMBER (R_390_PLT32, 8)	/* 32 bit PC relative PLT address.  */
+    RELOC_NUMBER (R_390_COPY, 9)	/* Copy symbol at runtime.  */
+    RELOC_NUMBER (R_390_GLOB_DAT, 10)	/* Create GOT entry.  */
+    RELOC_NUMBER (R_390_JMP_SLOT, 11)	/* Create PLT entry.  */
+    RELOC_NUMBER (R_390_RELATIVE, 12)	/* Adjust by program base.  */
+    RELOC_NUMBER (R_390_GOTOFF32, 13)	/* 32 bit offset to GOT.  */
+    RELOC_NUMBER (R_390_GOTPC, 14)	/* 32 bit PC relative offset to GOT.  */
+    RELOC_NUMBER (R_390_GOT16, 15)	/* 16 bit GOT offset.  */
+    RELOC_NUMBER (R_390_PC16, 16)	/* PC relative 16 bit.  */
+    RELOC_NUMBER (R_390_PC16DBL, 17)	/* PC relative 16 bit shifted by 1.  */
+    RELOC_NUMBER (R_390_PLT16DBL, 18)	/* 16 bit PC rel. PLT shifted by 1.  */
+    RELOC_NUMBER (R_390_PC32DBL, 19)	/* PC relative 32 bit shifted by 1.  */
+    RELOC_NUMBER (R_390_PLT32DBL, 20)	/* 32 bit PC rel. PLT shifted by 1.  */
+    RELOC_NUMBER (R_390_GOTPCDBL, 21)	/* 32 bit PC rel. GOT shifted by 1.  */
+    RELOC_NUMBER (R_390_64, 22)		/* Direct 64 bit.  */
+    RELOC_NUMBER (R_390_PC64, 23)	/* PC relative 64 bit.  */
+    RELOC_NUMBER (R_390_GOT64, 24)	/* 64 bit GOT offset.  */
+    RELOC_NUMBER (R_390_PLT64, 25)	/* 64 bit PC relative PLT address.  */
+    RELOC_NUMBER (R_390_GOTENT, 26)	/* 32 bit PC rel. to GOT entry >> 1. */
+    RELOC_NUMBER (R_390_GOTOFF16, 27)   /* 16 bit offset to GOT. */
+    RELOC_NUMBER (R_390_GOTOFF64, 28)   /* 64 bit offset to GOT. */
+    RELOC_NUMBER (R_390_GOTPLT12, 29)   /* 12 bit offset to jump slot.  */
+    RELOC_NUMBER (R_390_GOTPLT16, 30)   /* 16 bit offset to jump slot.  */
+    RELOC_NUMBER (R_390_GOTPLT32, 31)   /* 32 bit offset to jump slot.  */
+    RELOC_NUMBER (R_390_GOTPLT64, 32)   /* 64 bit offset to jump slot.  */
+    RELOC_NUMBER (R_390_GOTPLTENT, 33)  /* 32 bit rel. offset to jump slot.  */
+    RELOC_NUMBER (R_390_PLTOFF16, 34)   /* 16 bit offset from GOT to PLT. */
+    RELOC_NUMBER (R_390_PLTOFF32, 35)   /* 32 bit offset from GOT to PLT. */
+    RELOC_NUMBER (R_390_PLTOFF64, 36)   /* 16 bit offset from GOT to PLT. */
+    RELOC_NUMBER (R_390_TLS_LOAD, 37)	/* Tag for load insn in TLS code. */
+    RELOC_NUMBER (R_390_TLS_GDCALL, 38)	/* Tag for function call in general
+					   dynamic TLS code.  */
+    RELOC_NUMBER (R_390_TLS_LDCALL, 39)	/* Tag for function call in local
+					   dynamic TLS code.  */
+    RELOC_NUMBER (R_390_TLS_GD32, 40)	/* Direct 32 bit for general dynamic
+					   thread local data.  */
+    RELOC_NUMBER (R_390_TLS_GD64, 41)	/* Direct 64 bit for general dynamic
+					   thread local data.  */
+    RELOC_NUMBER (R_390_TLS_GOTIE12, 42)/* 12 bit GOT offset for static TLS
+					   block offset.  */
+    RELOC_NUMBER (R_390_TLS_GOTIE32, 43)/* 32 bit GOT offset for static TLS
+					   block offset.  */
+    RELOC_NUMBER (R_390_TLS_GOTIE64, 44)/* 64 bit GOT offset for static TLS
+					   block offset.  */
+    RELOC_NUMBER (R_390_TLS_LDM32, 45)	/* Direct 32 bit for local dynamic
+					   thread local data in LD code.  */
+    RELOC_NUMBER (R_390_TLS_LDM64, 46)	/* Direct 64 bit for local dynamic
+					   thread local data in LD code.  */
+    RELOC_NUMBER (R_390_TLS_IE32, 47)	/* 32 bit address of GOT entry for
+					   negated static TLS block offset.  */
+    RELOC_NUMBER (R_390_TLS_IE64, 48)	/* 64 bit address of GOT entry for
+					   negated static TLS block offset.  */
+    RELOC_NUMBER (R_390_TLS_IEENT, 49)	/* 32 bit rel. offset to GOT entry for
+					   negated static TLS block offset.  */
+    RELOC_NUMBER (R_390_TLS_LE32, 50)	/* 32 bit negated offset relative to
+					   static TLS block.  */
+    RELOC_NUMBER (R_390_TLS_LE64, 51)	/* 64 bit negated offset relative to
+					   static TLS block.  */
+    RELOC_NUMBER (R_390_TLS_LDO32, 52)	/* 32 bit offset relative to TLS
+					   block.  */
+    RELOC_NUMBER (R_390_TLS_LDO64, 53)	/* 64 bit offset relative to TLS
+					   block.  */
+    RELOC_NUMBER (R_390_TLS_DTPMOD, 54)	/* ID of module containing symbol.  */
+    RELOC_NUMBER (R_390_TLS_DTPOFF, 55)	/* Offset in TLS block.  */
+    RELOC_NUMBER (R_390_TLS_TPOFF, 56)	/* Negate offset in static TLS
+					   block.  */
+    RELOC_NUMBER (R_390_20, 57)		/* Direct 20 bit.  */
+    RELOC_NUMBER (R_390_GOT20, 58)	/* 20 bit GOT offset.  */
+    RELOC_NUMBER (R_390_GOTPLT20, 59)	/* 20 bit offset to jump slot.  */
+    RELOC_NUMBER (R_390_TLS_GOTIE20, 60)/* 20 bit GOT offset for statis TLS
+					   block offset.  */
+    /* These are GNU extensions to enable C++ vtable garbage collection.  */
+    RELOC_NUMBER (R_390_GNU_VTINHERIT, 250)
+    RELOC_NUMBER (R_390_GNU_VTENTRY, 251)
+END_RELOC_NUMBERS (R_390_max)
+
+#endif /* _ELF_390_H */
+
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/score.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/score.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/score.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/score.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,130 @@
+/* Score ELF support for BFD.
+   Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+   Contributed by 
+   Brain.lin (brain.lin@sunplusct.com)
+   Mei Ligang (ligang@sunnorth.com.cn)
+   Pei-Lin Tsai (pltsai@sunplus.com)
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_SCORE_H
+#define _ELF_SCORE_H
+
+#include "elf/reloc-macros.h"
+
+#define SCORE_SIMULATOR_ACTIVE  1
+#define OPC_PTMASK              0xc0000000      /* Parity-bit Mask.  */
+#define OPC16_PTMASK		0x00008000
+/* The parity-bit denotes.  */
+#define OPC_32                  0xc0000000      /* Denotes 32b instruction, (default).  */
+#define OPC_16                  0x00000000      /* Denotes 16b instruction.  */
+#define OPC_PE                  0x8000          /* Denotes parallel-execution instructions.  */
+#define GP_DISP_LABEL           "_gp_disp"
+
+/* Processor specific flags for the ELF header e_flags field:  */
+#define EF_SCORE_MACH           0xffff0000      
+#define EF_OMIT_PIC_FIXDD       0x0fff0000      
+#define E_SCORE_MACH_SCORE3     0x00030000
+#define E_SCORE_MACH_SCORE7     0x00070000
+
+/* File contains position independent code.  */
+#define EF_SCORE_PIC            0x80000000
+
+/* Fix data dependency.  */
+#define EF_SCORE_FIXDEP         0x40000000 
+
+/* Defined and allocated common symbol.  Value is virtual address.  If
+   relocated, alignment must be preserved.  */
+#define SHN_SCORE_TEXT		(SHN_LORESERVE + 1)
+#define SHN_SCORE_DATA		(SHN_LORESERVE + 2)
+/* Small common symbol.  */
+#define SHN_SCORE_SCOMMON	(SHN_LORESERVE + 3)
+
+/* Processor specific section flags.  */
+
+/* This section must be in the global data area.  */
+#define SHF_SCORE_GPREL		0x10000000
+
+/* This section should be merged.  */
+#define SHF_SCORE_MERGE		0x20000000
+
+/* This section contains address data of size implied by section
+   element size.  */
+#define SHF_SCORE_ADDR		0x40000000
+
+/* This section contains string data.  */
+#define SHF_SCORE_STRING		0x80000000
+
+/* This section may not be stripped.  */
+#define SHF_SCORE_NOSTRIP	0x08000000
+
+/* This section is local to threads.  */
+#define SHF_SCORE_LOCAL		0x04000000
+
+/* Linker should generate implicit weak names for this section.  */
+#define SHF_SCORE_NAMES		0x02000000
+
+/* Section contais text/data which may be replicated in other sections.
+   Linker should retain only one copy.  */
+#define SHF_SCORE_NODUPES	0x01000000
+
+/* Processor specific dynamic array tags.  */
+
+/* Base address of the segment.  */
+#define DT_SCORE_BASE_ADDRESS	0x70000001
+/* Number of local global offset table entries.  */
+#define DT_SCORE_LOCAL_GOTNO	0x70000002
+/* Number of entries in the .dynsym section.  */
+#define DT_SCORE_SYMTABNO	0x70000003
+/* Index of first dynamic symbol in global offset table.  */
+#define DT_SCORE_GOTSYM		0x70000004
+/* Index of first external dynamic symbol not referenced locally.  */
+#define DT_SCORE_UNREFEXTNO	0x70000005
+/* Number of page table entries in global offset table.  */
+#define DT_SCORE_HIPAGENO	0x70000006
+
+
+/* Processor specific section types.  */
+
+
+/* Relocation types.  */
+START_RELOC_NUMBERS (elf_score_reloc_type)
+  RELOC_NUMBER (R_SCORE_NONE,           0)
+  RELOC_NUMBER (R_SCORE_HI16,           1)   
+  RELOC_NUMBER (R_SCORE_LO16,           2)   
+  RELOC_NUMBER (R_SCORE_BCMP,           3)
+  RELOC_NUMBER (R_SCORE_24,             4)   
+  RELOC_NUMBER (R_SCORE_PC19,           5)  
+  RELOC_NUMBER (R_SCORE16_11,           6)   
+  RELOC_NUMBER (R_SCORE16_PC8,          7)  
+  RELOC_NUMBER (R_SCORE_ABS32,          8)
+  RELOC_NUMBER (R_SCORE_ABS16,          9)
+  RELOC_NUMBER (R_SCORE_DUMMY2,         10)
+  RELOC_NUMBER (R_SCORE_GP15,           11)
+  RELOC_NUMBER (R_SCORE_GNU_VTINHERIT,  12)
+  RELOC_NUMBER (R_SCORE_GNU_VTENTRY,    13)
+  RELOC_NUMBER (R_SCORE_GOT15,          14)
+  RELOC_NUMBER (R_SCORE_GOT_LO16,       15)
+  RELOC_NUMBER (R_SCORE_CALL15,         16)
+  RELOC_NUMBER (R_SCORE_GPREL32,        17)
+  RELOC_NUMBER (R_SCORE_REL32,          18)
+  RELOC_NUMBER (R_SCORE_DUMMY_HI16,     19)
+  RELOC_NUMBER (R_SCORE_IMM30,          20)
+  RELOC_NUMBER (R_SCORE_IMM32,          21)
+END_RELOC_NUMBERS (R_SCORE_max)
+
+#endif /* _ELF_SCORE_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/sh.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/sh.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/sh.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/sh.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,250 @@
+/* SH ELF support for BFD.
+   Copyright 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2010
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_SH_H
+#define _ELF_SH_H
+
+/* Processor specific flags for the ELF header e_flags field.  */
+
+#define EF_SH_MACH_MASK	0x1f
+#define EF_SH_UNKNOWN	   0 /* For backwards compatibility.  */
+#define EF_SH1		   1
+#define EF_SH2		   2
+#define EF_SH3		   3
+#define EF_SH_DSP	   4
+#define EF_SH3_DSP	   5
+#define EF_SH4AL_DSP	   6
+#define EF_SH3E		   8
+#define EF_SH4		   9
+#define EF_SH2E            11
+#define EF_SH4A		   12
+#define EF_SH2A            13
+
+#define EF_SH4_NOFPU	   16
+#define EF_SH4A_NOFPU	   17
+#define EF_SH4_NOMMU_NOFPU 18
+#define EF_SH2A_NOFPU      19
+#define EF_SH3_NOMMU       20
+
+#define EF_SH2A_SH4_NOFPU  21
+#define EF_SH2A_SH3_NOFPU  22
+#define EF_SH2A_SH4        23
+#define EF_SH2A_SH3E       24
+
+/* This one can only mix in objects from other EF_SH5 objects.  */
+#define EF_SH5		  10
+
+/* Define the mapping from ELF to bfd mach numbers.
+   bfd_mach_* are defined in bfd_in2.h (generated from
+   archures.c).  */
+#define EF_SH_BFD_TABLE \
+/* EF_SH_UNKNOWN	*/ bfd_mach_sh		, \
+/* EF_SH1		*/ bfd_mach_sh		, \
+/* EF_SH2		*/ bfd_mach_sh2		, \
+/* EF_SH3		*/ bfd_mach_sh3		, \
+/* EF_SH_DSP		*/ bfd_mach_sh_dsp	, \
+/* EF_SH3_DSP		*/ bfd_mach_sh3_dsp	, \
+/* EF_SHAL_DSP		*/ bfd_mach_sh4al_dsp	, \
+/* 7			*/ 0, \
+/* EF_SH3E		*/ bfd_mach_sh3e	, \
+/* EF_SH4		*/ bfd_mach_sh4		, \
+/* EF_SH5		*/ 0, \
+/* EF_SH2E		*/ bfd_mach_sh2e	, \
+/* EF_SH4A		*/ bfd_mach_sh4a	, \
+/* EF_SH2A		*/ bfd_mach_sh2a        , \
+/* 14, 15		*/ 0, 0, \
+/* EF_SH4_NOFPU		*/ bfd_mach_sh4_nofpu	, \
+/* EF_SH4A_NOFPU	*/ bfd_mach_sh4a_nofpu	, \
+/* EF_SH4_NOMMU_NOFPU	*/ bfd_mach_sh4_nommu_nofpu, \
+/* EF_SH2A_NOFPU	*/ bfd_mach_sh2a_nofpu  , \
+/* EF_SH3_NOMMU		*/ bfd_mach_sh3_nommu   , \
+/* EF_SH2A_SH4_NOFPU    */ bfd_mach_sh2a_nofpu_or_sh4_nommu_nofpu, \
+/* EF_SH2A_SH3_NOFPU    */ bfd_mach_sh2a_nofpu_or_sh3_nommu, \
+/* EF_SH2A_SH4          */ bfd_mach_sh2a_or_sh4 , \
+/* EF_SH2A_SH3E         */ bfd_mach_sh2a_or_sh3e
+
+/* Convert arch_sh* into EF_SH*.  */
+int sh_find_elf_flags (unsigned int arch_set);
+
+/* Convert bfd_mach_* into EF_SH*.  */
+int sh_elf_get_flags_from_mach (unsigned long mach);
+
+/* Other e_flags bits.  */
+
+#define EF_SH_PIC		0x100	/* Segments of an FDPIC binary may
+					   be relocated independently.  */
+#define EF_SH_FDPIC		0x8000	/* Uses the FDPIC ABI.  */
+
+/* Flags for the st_other symbol field.
+   Keep away from the STV_ visibility flags (bit 0..1).  */
+
+/* A reference to this symbol should by default add 1.  */
+#define STO_SH5_ISA32 (1 << 2)
+
+/* Section contains only SHmedia code (no SHcompact code).  */
+#define SHF_SH5_ISA32		0x40000000
+
+/* Section contains both SHmedia and SHcompact code, and possibly also
+   constants.  */
+#define SHF_SH5_ISA32_MIXED	0x20000000
+
+/* If applied to a .cranges section, marks that the section is sorted by
+   increasing cr_addr values.  */
+#define SHT_SH5_CR_SORTED 0x80000001
+
+/* Symbol should be handled as DataLabel (attached to global SHN_UNDEF
+   symbols).  */
+#define STT_DATALABEL STT_LOPROC
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+/* Relocations 10-32 and 128-255 are GNU extensions.
+   25..32 and 10 are used for relaxation.  */
+START_RELOC_NUMBERS (elf_sh_reloc_type)
+  RELOC_NUMBER (R_SH_NONE, 0)
+  RELOC_NUMBER (R_SH_DIR32, 1)
+  RELOC_NUMBER (R_SH_REL32, 2)
+  RELOC_NUMBER (R_SH_DIR8WPN, 3)
+  RELOC_NUMBER (R_SH_IND12W, 4)
+  RELOC_NUMBER (R_SH_DIR8WPL, 5)
+  RELOC_NUMBER (R_SH_DIR8WPZ, 6)
+  RELOC_NUMBER (R_SH_DIR8BP, 7)
+  RELOC_NUMBER (R_SH_DIR8W, 8)
+  RELOC_NUMBER (R_SH_DIR8L, 9)
+
+  RELOC_NUMBER (R_SH_LOOP_START, 10)
+  RELOC_NUMBER (R_SH_LOOP_END, 11)
+
+  FAKE_RELOC (R_SH_FIRST_INVALID_RELOC, 12)
+  FAKE_RELOC (R_SH_LAST_INVALID_RELOC, 21)
+
+  RELOC_NUMBER (R_SH_GNU_VTINHERIT, 22)
+  RELOC_NUMBER (R_SH_GNU_VTENTRY, 23)
+  RELOC_NUMBER (R_SH_SWITCH8, 24)
+  RELOC_NUMBER (R_SH_SWITCH16, 25)
+  RELOC_NUMBER (R_SH_SWITCH32, 26)
+  RELOC_NUMBER (R_SH_USES, 27)
+  RELOC_NUMBER (R_SH_COUNT, 28)
+  RELOC_NUMBER (R_SH_ALIGN, 29)
+  RELOC_NUMBER (R_SH_CODE, 30)
+  RELOC_NUMBER (R_SH_DATA, 31)
+  RELOC_NUMBER (R_SH_LABEL, 32)
+
+  RELOC_NUMBER (R_SH_DIR16, 33)
+  RELOC_NUMBER (R_SH_DIR8, 34)
+  RELOC_NUMBER (R_SH_DIR8UL, 35)
+  RELOC_NUMBER (R_SH_DIR8UW, 36)
+  RELOC_NUMBER (R_SH_DIR8U, 37)
+  RELOC_NUMBER (R_SH_DIR8SW, 38)
+  RELOC_NUMBER (R_SH_DIR8S, 39)
+  RELOC_NUMBER (R_SH_DIR4UL, 40)
+  RELOC_NUMBER (R_SH_DIR4UW, 41)
+  RELOC_NUMBER (R_SH_DIR4U, 42)
+  RELOC_NUMBER (R_SH_PSHA, 43)
+  RELOC_NUMBER (R_SH_PSHL, 44)
+  RELOC_NUMBER (R_SH_DIR5U, 45)
+  RELOC_NUMBER (R_SH_DIR6U, 46)
+  RELOC_NUMBER (R_SH_DIR6S, 47)
+  RELOC_NUMBER (R_SH_DIR10S, 48)
+  RELOC_NUMBER (R_SH_DIR10SW, 49)
+  RELOC_NUMBER (R_SH_DIR10SL, 50)
+  RELOC_NUMBER (R_SH_DIR10SQ, 51)
+  FAKE_RELOC (R_SH_FIRST_INVALID_RELOC_2, 52)
+  FAKE_RELOC (R_SH_LAST_INVALID_RELOC_2, 52)
+  RELOC_NUMBER (R_SH_DIR16S, 53)
+  FAKE_RELOC (R_SH_FIRST_INVALID_RELOC_3, 54)
+  FAKE_RELOC (R_SH_LAST_INVALID_RELOC_3, 143)
+  RELOC_NUMBER (R_SH_TLS_GD_32, 144)
+  RELOC_NUMBER (R_SH_TLS_LD_32, 145)
+  RELOC_NUMBER (R_SH_TLS_LDO_32, 146)
+  RELOC_NUMBER (R_SH_TLS_IE_32, 147)
+  RELOC_NUMBER (R_SH_TLS_LE_32, 148)
+  RELOC_NUMBER (R_SH_TLS_DTPMOD32, 149)
+  RELOC_NUMBER (R_SH_TLS_DTPOFF32, 150)
+  RELOC_NUMBER (R_SH_TLS_TPOFF32, 151)
+  FAKE_RELOC (R_SH_FIRST_INVALID_RELOC_4, 152)
+  FAKE_RELOC (R_SH_LAST_INVALID_RELOC_4, 159)
+  RELOC_NUMBER (R_SH_GOT32, 160)
+  RELOC_NUMBER (R_SH_PLT32, 161)
+  RELOC_NUMBER (R_SH_COPY, 162)
+  RELOC_NUMBER (R_SH_GLOB_DAT, 163)
+  RELOC_NUMBER (R_SH_JMP_SLOT, 164)
+  RELOC_NUMBER (R_SH_RELATIVE, 165)
+  RELOC_NUMBER (R_SH_GOTOFF, 166)
+  RELOC_NUMBER (R_SH_GOTPC, 167)
+  RELOC_NUMBER (R_SH_GOTPLT32, 168)
+  RELOC_NUMBER (R_SH_GOT_LOW16, 169)
+  RELOC_NUMBER (R_SH_GOT_MEDLOW16, 170)
+  RELOC_NUMBER (R_SH_GOT_MEDHI16, 171)
+  RELOC_NUMBER (R_SH_GOT_HI16, 172)
+  RELOC_NUMBER (R_SH_GOTPLT_LOW16, 173)
+  RELOC_NUMBER (R_SH_GOTPLT_MEDLOW16, 174)
+  RELOC_NUMBER (R_SH_GOTPLT_MEDHI16, 175)
+  RELOC_NUMBER (R_SH_GOTPLT_HI16, 176)
+  RELOC_NUMBER (R_SH_PLT_LOW16, 177)
+  RELOC_NUMBER (R_SH_PLT_MEDLOW16, 178)
+  RELOC_NUMBER (R_SH_PLT_MEDHI16, 179)
+  RELOC_NUMBER (R_SH_PLT_HI16, 180)
+  RELOC_NUMBER (R_SH_GOTOFF_LOW16, 181)
+  RELOC_NUMBER (R_SH_GOTOFF_MEDLOW16, 182)
+  RELOC_NUMBER (R_SH_GOTOFF_MEDHI16, 183)
+  RELOC_NUMBER (R_SH_GOTOFF_HI16, 184)
+  RELOC_NUMBER (R_SH_GOTPC_LOW16, 185)
+  RELOC_NUMBER (R_SH_GOTPC_MEDLOW16, 186)
+  RELOC_NUMBER (R_SH_GOTPC_MEDHI16, 187)
+  RELOC_NUMBER (R_SH_GOTPC_HI16, 188)
+  RELOC_NUMBER (R_SH_GOT10BY4, 189)
+  RELOC_NUMBER (R_SH_GOTPLT10BY4, 190)
+  RELOC_NUMBER (R_SH_GOT10BY8, 191)
+  RELOC_NUMBER (R_SH_GOTPLT10BY8, 192)
+  RELOC_NUMBER (R_SH_COPY64, 193)
+  RELOC_NUMBER (R_SH_GLOB_DAT64, 194)
+  RELOC_NUMBER (R_SH_JMP_SLOT64, 195)
+  RELOC_NUMBER (R_SH_RELATIVE64, 196)
+  FAKE_RELOC (R_SH_FIRST_INVALID_RELOC_5, 197)
+  FAKE_RELOC (R_SH_LAST_INVALID_RELOC_5, 200)
+  RELOC_NUMBER (R_SH_GOT20, 201)
+  RELOC_NUMBER (R_SH_GOTOFF20, 202)
+  RELOC_NUMBER (R_SH_GOTFUNCDESC, 203)
+  RELOC_NUMBER (R_SH_GOTFUNCDESC20, 204)
+  RELOC_NUMBER (R_SH_GOTOFFFUNCDESC, 205)
+  RELOC_NUMBER (R_SH_GOTOFFFUNCDESC20, 206)
+  RELOC_NUMBER (R_SH_FUNCDESC, 207)
+  RELOC_NUMBER (R_SH_FUNCDESC_VALUE, 208)
+  FAKE_RELOC (R_SH_FIRST_INVALID_RELOC_6, 209)
+  FAKE_RELOC (R_SH_LAST_INVALID_RELOC_6, 241)
+  RELOC_NUMBER (R_SH_SHMEDIA_CODE, 242)
+  RELOC_NUMBER (R_SH_PT_16, 243)
+  RELOC_NUMBER (R_SH_IMMS16, 244)
+  RELOC_NUMBER (R_SH_IMMU16, 245)
+  RELOC_NUMBER (R_SH_IMM_LOW16, 246)
+  RELOC_NUMBER (R_SH_IMM_LOW16_PCREL, 247)
+  RELOC_NUMBER (R_SH_IMM_MEDLOW16, 248)
+  RELOC_NUMBER (R_SH_IMM_MEDLOW16_PCREL, 249)
+  RELOC_NUMBER (R_SH_IMM_MEDHI16, 250)
+  RELOC_NUMBER (R_SH_IMM_MEDHI16_PCREL, 251)
+  RELOC_NUMBER (R_SH_IMM_HI16, 252)
+  RELOC_NUMBER (R_SH_IMM_HI16_PCREL, 253)
+  RELOC_NUMBER (R_SH_64, 254)
+  RELOC_NUMBER (R_SH_64_PCREL, 255)
+END_RELOC_NUMBERS (R_SH_max)
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/sparc.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/sparc.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/sparc.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/sparc.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,216 @@
+/* SPARC ELF support for BFD.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2008, 2010,
+   2011
+   Free Software Foundation, Inc.
+   By Doug Evans, Cygnus Support, <dje@cygnus.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _ELF_SPARC_H
+#define _ELF_SPARC_H
+
+/* Processor specific flags for the ELF header e_flags field.  */
+
+/* These are defined by Sun.  */
+
+#define EF_SPARC_32PLUS_MASK	0xffff00	/* bits indicating V8+ type */
+#define EF_SPARC_32PLUS		0x000100	/* generic V8+ features */
+#define EF_SPARC_SUN_US1	0x000200	/* Sun UltraSPARC1 extensions */
+#define EF_SPARC_HAL_R1		0x000400	/* HAL R1 extensions */
+#define EF_SPARC_SUN_US3	0x000800	/* Sun UltraSPARCIII extensions */
+
+#define EF_SPARC_LEDATA         0x800000	/* little endian data */
+
+/* This name is used in the V9 ABI.  */
+#define EF_SPARC_EXT_MASK	0xffff00	/* reserved for vendor extensions */
+
+/* V9 memory models */
+#define EF_SPARCV9_MM		0x3		/* memory model mask */
+#define EF_SPARCV9_TSO		0x0		/* total store ordering */
+#define EF_SPARCV9_PSO		0x1		/* partial store ordering */
+#define EF_SPARCV9_RMO		0x2		/* relaxed store ordering */
+
+/* Section indices.  */
+
+#define SHN_BEFORE	SHN_LORESERVE		/* Used with SHF_ORDERED and...  */
+#define SHN_AFTER	(SHN_LORESERVE + 1)	/* SHF_LINK_ORDER section flags. */
+
+/* Section flags.  */
+
+#define SHF_ORDERED		0x40000000	/* treat sh_link,sh_info specially */
+
+/* Symbol types.  */
+
+#define STT_REGISTER		13		/* global reg reserved to app. */
+
+#include "elf/reloc-macros.h"
+
+/* Relocation types.  */
+START_RELOC_NUMBERS (elf_sparc_reloc_type)
+  RELOC_NUMBER (R_SPARC_NONE, 0)
+  RELOC_NUMBER (R_SPARC_8, 1)
+  RELOC_NUMBER (R_SPARC_16, 2)
+  RELOC_NUMBER (R_SPARC_32, 3)
+  RELOC_NUMBER (R_SPARC_DISP8, 4)
+  RELOC_NUMBER (R_SPARC_DISP16, 5)
+  RELOC_NUMBER (R_SPARC_DISP32, 6)
+  RELOC_NUMBER (R_SPARC_WDISP30, 7)
+  RELOC_NUMBER (R_SPARC_WDISP22, 8)
+  RELOC_NUMBER (R_SPARC_HI22, 9)
+  RELOC_NUMBER (R_SPARC_22, 10)
+  RELOC_NUMBER (R_SPARC_13, 11)
+  RELOC_NUMBER (R_SPARC_LO10, 12)
+  RELOC_NUMBER (R_SPARC_GOT10, 13)
+  RELOC_NUMBER (R_SPARC_GOT13, 14)
+  RELOC_NUMBER (R_SPARC_GOT22, 15)
+  RELOC_NUMBER (R_SPARC_PC10, 16)
+  RELOC_NUMBER (R_SPARC_PC22, 17)
+  RELOC_NUMBER (R_SPARC_WPLT30, 18)
+  RELOC_NUMBER (R_SPARC_COPY, 19)
+  RELOC_NUMBER (R_SPARC_GLOB_DAT, 20)
+  RELOC_NUMBER (R_SPARC_JMP_SLOT, 21)
+  RELOC_NUMBER (R_SPARC_RELATIVE, 22)
+  RELOC_NUMBER (R_SPARC_UA32, 23)
+
+  /* ??? These 6 relocs are new but not currently used.  For binary
+     compatibility in the sparc64-elf toolchain, we leave them out.
+     A non-binary upward compatible change is expected for sparc64-elf.  */
+#ifndef SPARC64_OLD_RELOCS
+  /* ??? New relocs on the UltraSPARC.  Not sure what they're for yet.  */
+  RELOC_NUMBER (R_SPARC_PLT32, 24)
+  RELOC_NUMBER (R_SPARC_HIPLT22, 25)
+  RELOC_NUMBER (R_SPARC_LOPLT10, 26)
+  RELOC_NUMBER (R_SPARC_PCPLT32, 27)
+  RELOC_NUMBER (R_SPARC_PCPLT22, 28)
+  RELOC_NUMBER (R_SPARC_PCPLT10, 29)
+#endif
+
+  /* v9 relocs */
+  RELOC_NUMBER (R_SPARC_10, 30)
+  RELOC_NUMBER (R_SPARC_11, 31)
+  RELOC_NUMBER (R_SPARC_64, 32)
+  RELOC_NUMBER (R_SPARC_OLO10, 33)
+  RELOC_NUMBER (R_SPARC_HH22, 34)
+  RELOC_NUMBER (R_SPARC_HM10, 35)
+  RELOC_NUMBER (R_SPARC_LM22, 36)
+  RELOC_NUMBER (R_SPARC_PC_HH22, 37)
+  RELOC_NUMBER (R_SPARC_PC_HM10, 38)
+  RELOC_NUMBER (R_SPARC_PC_LM22, 39)
+  RELOC_NUMBER (R_SPARC_WDISP16, 40)
+  RELOC_NUMBER (R_SPARC_WDISP19, 41)
+  RELOC_NUMBER (R_SPARC_UNUSED_42, 42)
+  RELOC_NUMBER (R_SPARC_7, 43)
+  RELOC_NUMBER (R_SPARC_5, 44)
+  RELOC_NUMBER (R_SPARC_6, 45)
+  RELOC_NUMBER (R_SPARC_DISP64, 46)
+  RELOC_NUMBER (R_SPARC_PLT64, 47)
+  RELOC_NUMBER (R_SPARC_HIX22, 48)
+  RELOC_NUMBER (R_SPARC_LOX10, 49)
+  RELOC_NUMBER (R_SPARC_H44, 50)
+  RELOC_NUMBER (R_SPARC_M44, 51)
+  RELOC_NUMBER (R_SPARC_L44, 52)
+  RELOC_NUMBER (R_SPARC_REGISTER, 53)
+  RELOC_NUMBER (R_SPARC_UA64, 54)
+  RELOC_NUMBER (R_SPARC_UA16, 55)
+
+  RELOC_NUMBER (R_SPARC_TLS_GD_HI22, 56)
+  RELOC_NUMBER (R_SPARC_TLS_GD_LO10, 57)
+  RELOC_NUMBER (R_SPARC_TLS_GD_ADD, 58)
+  RELOC_NUMBER (R_SPARC_TLS_GD_CALL, 59)
+  RELOC_NUMBER (R_SPARC_TLS_LDM_HI22, 60)
+  RELOC_NUMBER (R_SPARC_TLS_LDM_LO10, 61)
+  RELOC_NUMBER (R_SPARC_TLS_LDM_ADD, 62)
+  RELOC_NUMBER (R_SPARC_TLS_LDM_CALL, 63)
+  RELOC_NUMBER (R_SPARC_TLS_LDO_HIX22, 64)
+  RELOC_NUMBER (R_SPARC_TLS_LDO_LOX10, 65)
+  RELOC_NUMBER (R_SPARC_TLS_LDO_ADD, 66)
+  RELOC_NUMBER (R_SPARC_TLS_IE_HI22, 67)
+  RELOC_NUMBER (R_SPARC_TLS_IE_LO10, 68)
+  RELOC_NUMBER (R_SPARC_TLS_IE_LD, 69)
+  RELOC_NUMBER (R_SPARC_TLS_IE_LDX, 70)
+  RELOC_NUMBER (R_SPARC_TLS_IE_ADD, 71)
+  RELOC_NUMBER (R_SPARC_TLS_LE_HIX22, 72)
+  RELOC_NUMBER (R_SPARC_TLS_LE_LOX10, 73)
+  RELOC_NUMBER (R_SPARC_TLS_DTPMOD32, 74)
+  RELOC_NUMBER (R_SPARC_TLS_DTPMOD64, 75)
+  RELOC_NUMBER (R_SPARC_TLS_DTPOFF32, 76)
+  RELOC_NUMBER (R_SPARC_TLS_DTPOFF64, 77)
+  RELOC_NUMBER (R_SPARC_TLS_TPOFF32, 78)
+  RELOC_NUMBER (R_SPARC_TLS_TPOFF64, 79)
+
+  RELOC_NUMBER (R_SPARC_GOTDATA_HIX22, 80)
+  RELOC_NUMBER (R_SPARC_GOTDATA_LOX10, 81)
+  RELOC_NUMBER (R_SPARC_GOTDATA_OP_HIX22, 82)
+  RELOC_NUMBER (R_SPARC_GOTDATA_OP_LOX10, 83)
+  RELOC_NUMBER (R_SPARC_GOTDATA_OP, 84)
+
+  RELOC_NUMBER (R_SPARC_H34, 85)
+  RELOC_NUMBER (R_SPARC_SIZE32, 86)
+  RELOC_NUMBER (R_SPARC_SIZE64, 87)
+  
+  EMPTY_RELOC  (R_SPARC_max_std)
+
+  RELOC_NUMBER (R_SPARC_JMP_IREL, 248)
+  RELOC_NUMBER (R_SPARC_IRELATIVE, 249)
+  RELOC_NUMBER (R_SPARC_GNU_VTINHERIT, 250)
+  RELOC_NUMBER (R_SPARC_GNU_VTENTRY, 251)
+  RELOC_NUMBER (R_SPARC_REV32, 252)
+
+END_RELOC_NUMBERS (R_SPARC_max)
+
+/* Relocation macros.  */
+
+#define ELF64_R_TYPE_DATA(info) \
+  (((bfd_signed_vma)(ELF64_R_TYPE(info) >> 8) ^ 0x800000) - 0x800000)
+#define ELF64_R_TYPE_ID(info) \
+  ((info) & 0xff)
+#define ELF64_R_TYPE_INFO(data, type) \
+  (((bfd_vma) ((data) & 0xffffff) << 8) | (bfd_vma) (type))
+
+/* Values for Elf64_Dyn.d_tag.  */
+
+#define DT_SPARC_REGISTER	0x70000001
+
+/* Object attribute tags.  */
+enum
+{
+  /* 0-3 are generic.  */
+  Tag_GNU_Sparc_HWCAPS = 4,
+};
+
+/* These values match the AV_SPARC_* hwcap bits defined under Solaris.  */
+#define ELF_SPARC_HWCAP_MUL32	0x00000001 /* umul/umulcc/smul/smulcc insns */
+#define ELF_SPARC_HWCAP_DIV32	0x00000002 /* udiv/udivcc/sdiv/sdivcc insns */
+#define ELF_SPARC_HWCAP_FSMULD	0x00000004 /* 'fsmuld' insn */
+#define ELF_SPARC_HWCAP_V8PLUS	0x00000008 /* v9 insns available to 32bit */
+#define ELF_SPARC_HWCAP_POPC	0x00000010 /* 'popc' insn */
+#define ELF_SPARC_HWCAP_VIS	0x00000020 /* VIS insns */
+#define ELF_SPARC_HWCAP_VIS2	0x00000040 /* VIS2 insns */
+#define ELF_SPARC_HWCAP_ASI_BLK_INIT	\
+				0x00000080 /* block init ASIs */
+#define ELF_SPARC_HWCAP_FMAF	0x00000100 /* fused multiply-add */
+#define ELF_SPARC_HWCAP_VIS3	0x00000400 /* VIS3 insns */
+#define ELF_SPARC_HWCAP_HPC	0x00000800 /* HPC insns */
+#define ELF_SPARC_HWCAP_RANDOM	0x00001000 /* 'random' insn */
+#define ELF_SPARC_HWCAP_TRANS	0x00002000 /* transaction insns */
+#define ELF_SPARC_HWCAP_FJFMAU	0x00004000 /* unfused multiply-add */
+#define ELF_SPARC_HWCAP_IMA	0x00008000 /* integer multiply-add */
+#define ELF_SPARC_HWCAP_ASI_CACHE_SPARING \
+				0x00010000 /* cache sparing ASIs */
+
+#endif /* _ELF_SPARC_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/spu.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/spu.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/spu.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/spu.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,61 @@
+/* SPU ELF support for BFD.
+
+   Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_SPU_H
+#define _ELF_SPU_H
+
+#include "elf/reloc-macros.h"
+
+/* elf32-spu.c depends on these being consecutive. */
+START_RELOC_NUMBERS (elf_spu_reloc_type)
+     RELOC_NUMBER (R_SPU_NONE,		 0)
+     RELOC_NUMBER (R_SPU_ADDR10,	 1)
+     RELOC_NUMBER (R_SPU_ADDR16,	 2)
+     RELOC_NUMBER (R_SPU_ADDR16_HI,	 3)
+     RELOC_NUMBER (R_SPU_ADDR16_LO,	 4)
+     RELOC_NUMBER (R_SPU_ADDR18,	 5)
+     RELOC_NUMBER (R_SPU_ADDR32,	 6)
+     RELOC_NUMBER (R_SPU_REL16,		 7)
+     RELOC_NUMBER (R_SPU_ADDR7,		 8)
+     RELOC_NUMBER (R_SPU_REL9,		 9)
+     RELOC_NUMBER (R_SPU_REL9I,		10)
+     RELOC_NUMBER (R_SPU_ADDR10I,	11)
+     RELOC_NUMBER (R_SPU_ADDR16I,	12)
+     RELOC_NUMBER (R_SPU_REL32,		13)
+     RELOC_NUMBER (R_SPU_ADDR16X,	14)
+     RELOC_NUMBER (R_SPU_PPU32,		15)
+     RELOC_NUMBER (R_SPU_PPU64,		16)
+     RELOC_NUMBER (R_SPU_ADD_PIC,	17)
+END_RELOC_NUMBERS (R_SPU_max)
+
+/* Program header extensions */
+
+/* Mark a PT_LOAD segment as containing an overlay which should not
+   initially be loaded.  */
+#define PF_OVERLAY		(1 << 27)
+
+/* SPU Dynamic Object Information.  */
+#define PT_SPU_INFO             0x70000000
+
+/* SPU plugin information */
+#define SPU_PLUGIN_NAME         "SPUNAME"
+#define SPU_PTNOTE_SPUNAME	".note.spu_name"
+
+#endif /* _ELF_SPU_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/tic6x-attrs.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/tic6x-attrs.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/tic6x-attrs.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/tic6x-attrs.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,35 @@
+/* TI C6X ELF attributes.
+   Copyright 2010
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* Define the TAG macro before including this file; it takes a tag
+   name and value.  */
+
+TAG(Tag_ISA, 4)
+TAG(Tag_ABI_wchar_t, 6)
+TAG(Tag_ABI_stack_align_needed, 8)
+TAG(Tag_ABI_stack_align_preserved, 10)
+TAG(Tag_ABI_DSBT, 12)
+TAG(Tag_ABI_PID, 14)
+TAG(Tag_ABI_PIC, 16)
+TAG(Tag_ABI_array_object_alignment, 18)
+TAG(Tag_ABI_array_object_align_expected, 20)
+TAG(Tag_ABI_compatibility, 32)
+TAG(Tag_ABI_conformance, 67)
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/tic6x.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/tic6x.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/tic6x.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/tic6x.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,167 @@
+/* TI C6X ELF support for BFD.
+   Copyright 2010, 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _ELF_TIC6X_H
+#define _ELF_TIC6X_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocation types.  */
+START_RELOC_NUMBERS (elf_tic6x_reloc_type)
+  RELOC_NUMBER (R_C6000_NONE, 0)
+  RELOC_NUMBER (R_C6000_ABS32, 1)
+  RELOC_NUMBER (R_C6000_ABS16, 2)
+  RELOC_NUMBER (R_C6000_ABS8, 3)
+  RELOC_NUMBER (R_C6000_PCR_S21, 4)
+  RELOC_NUMBER (R_C6000_PCR_S12, 5)
+  RELOC_NUMBER (R_C6000_PCR_S10, 6)
+  RELOC_NUMBER (R_C6000_PCR_S7, 7)
+  RELOC_NUMBER (R_C6000_ABS_S16, 8)
+  RELOC_NUMBER (R_C6000_ABS_L16, 9)
+  RELOC_NUMBER (R_C6000_ABS_H16, 10)
+  RELOC_NUMBER (R_C6000_SBR_U15_B, 11)
+  RELOC_NUMBER (R_C6000_SBR_U15_H, 12)
+  RELOC_NUMBER (R_C6000_SBR_U15_W, 13)
+  RELOC_NUMBER (R_C6000_SBR_S16, 14)
+  RELOC_NUMBER (R_C6000_SBR_L16_B, 15)
+  RELOC_NUMBER (R_C6000_SBR_L16_H, 16)
+  RELOC_NUMBER (R_C6000_SBR_L16_W, 17)
+  RELOC_NUMBER (R_C6000_SBR_H16_B, 18)
+  RELOC_NUMBER (R_C6000_SBR_H16_H, 19)
+  RELOC_NUMBER (R_C6000_SBR_H16_W, 20)
+  RELOC_NUMBER (R_C6000_SBR_GOT_U15_W, 21)
+  RELOC_NUMBER (R_C6000_SBR_GOT_L16_W, 22)
+  RELOC_NUMBER (R_C6000_SBR_GOT_H16_W, 23)
+  RELOC_NUMBER (R_C6000_DSBT_INDEX, 24)
+  RELOC_NUMBER (R_C6000_PREL31, 25)
+  RELOC_NUMBER (R_C6000_COPY, 26)
+  RELOC_NUMBER (R_C6000_JUMP_SLOT, 27)
+  RELOC_NUMBER (R_C6000_EHTYPE, 28)
+  RELOC_NUMBER (R_C6000_PCR_H16, 29)
+  RELOC_NUMBER (R_C6000_PCR_L16, 30)
+  RELOC_NUMBER (R_C6000_ALIGN, 253)
+  RELOC_NUMBER (R_C6000_FPHEAD, 254)
+  RELOC_NUMBER (R_C6000_NOCMP, 255)
+END_RELOC_NUMBERS (R_TIC6X_max)
+
+/* Processor-specific flags.  */
+
+/* File contains static relocation information.  */
+#define EF_C6000_REL		0x1
+
+/* Processor-specific section types.  */
+
+/* Unwind function table for stack unwinding.  */
+#define SHT_C6000_UNWIND	0x70000001
+
+/* DLL dynamic linking pre-emption map.  */
+#define SHT_C6000_PREEMPTMAP	0x70000002
+
+/* Object file compatibility attributes.  */
+#define SHT_C6000_ATTRIBUTES	0x70000003
+
+/* Intermediate code for link-time optimization.  */
+#define SHT_TI_ICODE		0x7F000000
+
+/* Symbolic cross reference information.  */
+#define SHT_TI_XREF		0x7F000001
+
+/* Reserved.  */
+#define SHT_TI_HANDLER		0x7F000002
+
+/* Compressed data for initializing C variables.  */
+#define SHT_TI_INITINFO		0x7F000003
+
+/* Extended program header attributes.  */
+#define SHT_TI_PHATTRS		0x7F000004
+
+/* Processor specific section indices.  These sections do not actually
+   exist.  Symbols with a st_shndx field corresponding to one of these
+   values have a special meaning.  */
+
+/* Small data area common symbol.  */
+#define SHN_TIC6X_SCOMMON	SHN_LORESERVE
+
+/* Processor-specific segment types.  */
+
+/* Extended Segment Attributes.  */
+#define PT_C6000_PHATTR		0x70000000
+
+/* Processor-specific dynamic tags.  */
+
+/* Undocumented.  */
+#define DT_C6000_GSYM_OFFSET	0x6000000D
+
+/* Undocumented.  */
+#define DT_C6000_GSTR_OFFSET	0x6000000F
+
+/* Statically linked base address of data segment.  */
+#define DT_C6000_DSBT_BASE	0x70000000
+
+/* Number of entries in this module's DSBT.  */
+#define DT_C6000_DSBT_SIZE	0x70000001
+
+/* Undocumented.  */
+#define DT_C6000_PREEMPTMAP	0x70000002
+
+/* The hard-coded DSBT index for this module, if any.  */
+#define DT_C6000_DSBT_INDEX	0x70000003
+
+/* Extended program header attributes.  */
+
+/* Terminate a segment.  */
+#define PHA_NULL		0x0
+
+/* Segment's address bound to the final address.  */
+#define PHA_BOUND		0x1
+
+/* Segment cannot be further relocated.  */
+#define PHA_READONLY		0x2
+
+/* Build attributes.  */
+enum
+  {
+#define TAG(tag, value) tag = value,
+#include "elf/tic6x-attrs.h"
+#undef TAG
+    Tag_C6XABI_last
+  };
+
+/* Values for Tag_ISA.  GNU-specific names; the ABI does not specify
+   names for these values.  */
+enum
+  {
+    C6XABI_Tag_ISA_none = 0,
+    C6XABI_Tag_ISA_C62X = 1,
+    C6XABI_Tag_ISA_C67X = 3,
+    C6XABI_Tag_ISA_C67XP = 4,
+    C6XABI_Tag_ISA_C64X = 6,
+    C6XABI_Tag_ISA_C64XP = 7,
+    C6XABI_Tag_ISA_C674X = 8
+  };
+
+/* Special section names.  */
+#define ELF_STRING_C6000_unwind           ".c6xabi.exidx"
+#define ELF_STRING_C6000_unwind_info      ".c6xabi.extab"
+#define ELF_STRING_C6000_unwind_once      ".gnu.linkonce.c6xabi.exidx."
+#define ELF_STRING_C6000_unwind_info_once ".gnu.linkonce.c6xabi.extab."
+
+#endif /* _ELF_TIC6X_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/tilegx.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/tilegx.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/tilegx.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/tilegx.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,162 @@
+/* TILE-Gx ELF support for BFD.
+   Copyright 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _ELF_TILEGX_H
+#define _ELF_TILEGX_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_tilegx_reloc_type)
+  RELOC_NUMBER (R_TILEGX_NONE,              0)
+
+  /* Standard relocations */
+  RELOC_NUMBER (R_TILEGX_64,                1)
+  RELOC_NUMBER (R_TILEGX_32,                2)
+  RELOC_NUMBER (R_TILEGX_16,                3)
+  RELOC_NUMBER (R_TILEGX_8,                 4)
+  RELOC_NUMBER (R_TILEGX_64_PCREL,          5)
+  RELOC_NUMBER (R_TILEGX_32_PCREL,          6)
+  RELOC_NUMBER (R_TILEGX_16_PCREL,          7)
+  RELOC_NUMBER (R_TILEGX_8_PCREL,           8)
+
+  /* Custom relocations */
+
+  RELOC_NUMBER (R_TILEGX_HW0,               9)
+  RELOC_NUMBER (R_TILEGX_HW1,               10)
+  RELOC_NUMBER (R_TILEGX_HW2,               11)
+  RELOC_NUMBER (R_TILEGX_HW3,               12)
+  RELOC_NUMBER (R_TILEGX_HW0_LAST,          13)
+  RELOC_NUMBER (R_TILEGX_HW1_LAST,          14)
+  RELOC_NUMBER (R_TILEGX_HW2_LAST,          15)
+
+  RELOC_NUMBER (R_TILEGX_COPY,              16)
+  RELOC_NUMBER (R_TILEGX_GLOB_DAT,          17)
+  RELOC_NUMBER (R_TILEGX_JMP_SLOT,          18)
+  RELOC_NUMBER (R_TILEGX_RELATIVE,          19)
+
+  /* Branch/jump offsets */
+  RELOC_NUMBER (R_TILEGX_BROFF_X1,          20)
+  RELOC_NUMBER (R_TILEGX_JUMPOFF_X1,        21)
+  RELOC_NUMBER (R_TILEGX_JUMPOFF_X1_PLT,    22)
+
+  /* Immediate operands. */
+  RELOC_NUMBER (R_TILEGX_IMM8_X0,           23)
+  RELOC_NUMBER (R_TILEGX_IMM8_Y0,           24)
+  RELOC_NUMBER (R_TILEGX_IMM8_X1,           25)
+  RELOC_NUMBER (R_TILEGX_IMM8_Y1,           26)
+  RELOC_NUMBER (R_TILEGX_DEST_IMM8_X1,      27)
+  RELOC_NUMBER (R_TILEGX_MT_IMM14_X1,       28)
+  RELOC_NUMBER (R_TILEGX_MF_IMM14_X1,       29)
+  RELOC_NUMBER (R_TILEGX_MMSTART_X0,        30)
+  RELOC_NUMBER (R_TILEGX_MMEND_X0,          31)
+  RELOC_NUMBER (R_TILEGX_SHAMT_X0,          32)
+  RELOC_NUMBER (R_TILEGX_SHAMT_X1,          33)
+  RELOC_NUMBER (R_TILEGX_SHAMT_Y0,          34)
+  RELOC_NUMBER (R_TILEGX_SHAMT_Y1,          35)
+
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW0,       36)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW0,       37)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW1,       38)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW1,       39)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW2,       40)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW2,       41)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW3,       42)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW3,       43)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW0_LAST,  44)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW0_LAST,  45)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW1_LAST,  46)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW1_LAST,  47)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW2_LAST,  48)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW2_LAST,  49)
+
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW0_PCREL,        50)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW0_PCREL,        51)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW1_PCREL,        52)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW1_PCREL,        53)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW2_PCREL,        54)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW2_PCREL,        55)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW3_PCREL,        56)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW3_PCREL,        57)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW0_LAST_PCREL,   58)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW0_LAST_PCREL,   59)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW1_LAST_PCREL,   60)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW1_LAST_PCREL,   61)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW2_LAST_PCREL,   62)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW2_LAST_PCREL,   63)
+
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW0_GOT,          64)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW0_GOT,          65)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW1_GOT,          66)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW1_GOT,          67)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW2_GOT,          68)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW2_GOT,          69)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW3_GOT,          70)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW3_GOT,          71)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW0_LAST_GOT,     72)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW0_LAST_GOT,     73)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW1_LAST_GOT,     74)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW1_LAST_GOT,     75)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW2_LAST_GOT,     76)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW2_LAST_GOT,     77)
+
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW0_TLS_GD,       78)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW0_TLS_GD,       79)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW1_TLS_GD,       80)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW1_TLS_GD,       81)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW2_TLS_GD,       82)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW2_TLS_GD,       83)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW3_TLS_GD,       84)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW3_TLS_GD,       85)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD,  86)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD,  87)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD,  88)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD,  89)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD,  90)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD,  91)
+
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW0_TLS_IE,       92)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW0_TLS_IE,       93)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW1_TLS_IE,       94)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW1_TLS_IE,       95)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW2_TLS_IE,       96)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW2_TLS_IE,       97)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW3_TLS_IE,       98)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW3_TLS_IE,       99)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE, 100)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE, 101)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE, 102)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE, 103)
+  RELOC_NUMBER (R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE, 104)
+  RELOC_NUMBER (R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE, 105)
+
+  RELOC_NUMBER (R_TILEGX_TLS_DTPMOD64,             106)
+  RELOC_NUMBER (R_TILEGX_TLS_DTPOFF64,             107)
+  RELOC_NUMBER (R_TILEGX_TLS_TPOFF64,              108)
+  RELOC_NUMBER (R_TILEGX_TLS_DTPMOD32,             109)
+  RELOC_NUMBER (R_TILEGX_TLS_DTPOFF32,             110)
+  RELOC_NUMBER (R_TILEGX_TLS_TPOFF32,              111)
+
+/* These are GNU extensions to enable C++ vtable garbage collection.  */
+  RELOC_NUMBER (R_TILEGX_GNU_VTINHERIT, 128)
+  RELOC_NUMBER (R_TILEGX_GNU_VTENTRY, 129)
+END_RELOC_NUMBERS (R_TILEGX_max)
+
+#endif /* _ELF_TILEGX_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/tilepro.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/tilepro.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/tilepro.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/tilepro.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,128 @@
+/* TILEPro ELF support for BFD.
+   Copyright 2011 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _ELF_TILEPRO_H
+#define _ELF_TILEPRO_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_tilepro_reloc_type)
+  RELOC_NUMBER (R_TILEPRO_NONE,        0)
+
+  /* Standard relocations */
+  RELOC_NUMBER (R_TILEPRO_32,                  1)
+  RELOC_NUMBER (R_TILEPRO_16,                  2)
+  RELOC_NUMBER (R_TILEPRO_8,                   3)
+  RELOC_NUMBER (R_TILEPRO_32_PCREL,            4)
+  RELOC_NUMBER (R_TILEPRO_16_PCREL,            5)
+  RELOC_NUMBER (R_TILEPRO_8_PCREL,             6)
+
+  RELOC_NUMBER (R_TILEPRO_LO16,                7)
+  RELOC_NUMBER (R_TILEPRO_HI16,                8)
+  RELOC_NUMBER (R_TILEPRO_HA16,                9)
+
+  RELOC_NUMBER (R_TILEPRO_COPY,               10)
+  RELOC_NUMBER (R_TILEPRO_GLOB_DAT,           11)
+  RELOC_NUMBER (R_TILEPRO_JMP_SLOT,           12)
+  RELOC_NUMBER (R_TILEPRO_RELATIVE,           13)
+
+  /* Branch/jump offsets */
+  RELOC_NUMBER (R_TILEPRO_BROFF_X1,           14)
+  RELOC_NUMBER (R_TILEPRO_JOFFLONG_X1,        15)
+  RELOC_NUMBER (R_TILEPRO_JOFFLONG_X1_PLT,    16)
+
+  /* Immediate operands. */
+  RELOC_NUMBER (R_TILEPRO_IMM8_X0,            17)
+  RELOC_NUMBER (R_TILEPRO_IMM8_Y0,            18)
+  RELOC_NUMBER (R_TILEPRO_IMM8_X1,            19)
+  RELOC_NUMBER (R_TILEPRO_IMM8_Y1,            20)
+  RELOC_NUMBER (R_TILEPRO_MT_IMM15_X1,        21)
+  RELOC_NUMBER (R_TILEPRO_MF_IMM15_X1,        22)
+
+  RELOC_NUMBER (R_TILEPRO_IMM16_X0,           23)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X1,           24)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X0_LO,        25)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X1_LO,        26)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X0_HI,        27)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X1_HI,        28)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X0_HA,        29)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X1_HA,        30)
+
+  RELOC_NUMBER (R_TILEPRO_IMM16_X0_PCREL,     31)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X1_PCREL,     32)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X0_LO_PCREL,  33)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X1_LO_PCREL,  34)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X0_HI_PCREL,  35)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X1_HI_PCREL,  36)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X0_HA_PCREL,  37)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X1_HA_PCREL,  38)
+
+  RELOC_NUMBER (R_TILEPRO_IMM16_X0_GOT,       39)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X1_GOT,       40)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X0_GOT_LO,    41)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X1_GOT_LO,    42)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X0_GOT_HI,    43)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X1_GOT_HI,    44)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X0_GOT_HA,    45)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X1_GOT_HA,    46)
+
+  RELOC_NUMBER (R_TILEPRO_MMSTART_X0,         47)
+  RELOC_NUMBER (R_TILEPRO_MMEND_X0,           48)
+  RELOC_NUMBER (R_TILEPRO_MMSTART_X1,         49)
+  RELOC_NUMBER (R_TILEPRO_MMEND_X1,           50)
+
+  RELOC_NUMBER (R_TILEPRO_SHAMT_X0,           51)
+  RELOC_NUMBER (R_TILEPRO_SHAMT_X1,           52)
+  RELOC_NUMBER (R_TILEPRO_SHAMT_Y0,           53)
+  RELOC_NUMBER (R_TILEPRO_SHAMT_Y1,           54)
+
+  RELOC_NUMBER (R_TILEPRO_DEST_IMM8_X1,       55)
+
+  /* Relocs 56-65 are currently not defined.  */
+
+  RELOC_NUMBER (R_TILEPRO_IMM16_X0_TLS_GD,    66)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X1_TLS_GD,    67)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X0_TLS_GD_LO, 68)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X1_TLS_GD_LO, 69)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X0_TLS_GD_HI, 70)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X1_TLS_GD_HI, 71)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X0_TLS_GD_HA, 72)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X1_TLS_GD_HA, 73)
+
+  RELOC_NUMBER (R_TILEPRO_IMM16_X0_TLS_IE,    74)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X1_TLS_IE,    75)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X0_TLS_IE_LO, 76)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X1_TLS_IE_LO, 77)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X0_TLS_IE_HI, 78)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X1_TLS_IE_HI, 79)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X0_TLS_IE_HA, 80)
+  RELOC_NUMBER (R_TILEPRO_IMM16_X1_TLS_IE_HA, 81)
+
+  RELOC_NUMBER (R_TILEPRO_TLS_DTPMOD32,       82)
+  RELOC_NUMBER (R_TILEPRO_TLS_DTPOFF32,       83)
+  RELOC_NUMBER (R_TILEPRO_TLS_TPOFF32,        84)
+
+/* These are GNU extensions to enable C++ vtable garbage collection.  */
+  RELOC_NUMBER (R_TILEPRO_GNU_VTINHERIT, 128)
+  RELOC_NUMBER (R_TILEPRO_GNU_VTENTRY, 129)
+END_RELOC_NUMBERS (R_TILEPRO_max)
+
+#endif /* _ELF_TILEPRO_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/v850.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/v850.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/v850.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/v850.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,151 @@
+/* V850 ELF support for BFD.
+   Copyright 1997, 1998, 2000, 2002, 2003, 2004, 2007, 2008, 2010
+   Free Software Foundation, Inc.
+   Created by Michael Meissner, Cygnus Support <meissner@cygnus.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* This file holds definitions specific to the MIPS ELF ABI.  Note
+   that most of this is not actually implemented by BFD.  */
+
+#ifndef _ELF_V850_H
+#define _ELF_V850_H
+
+/* Processor specific flags for the ELF header e_flags field.  */
+
+/* Four bit V850 architecture field.  */
+#define EF_V850_ARCH		0xf0000000
+
+/* v850 code.  */
+#define E_V850_ARCH		0x00000000
+
+/* v850e code.  */
+#define E_V850E_ARCH		0x10000000
+
+/* v850e1 code.  */
+#define E_V850E1_ARCH		0x20000000
+
+/* v850e2 code.  */
+#define E_V850E2_ARCH		0x30000000
+
+/* v850e2v3 code.  */
+#define E_V850E2V3_ARCH		0x40000000
+
+/* Flags for the st_other field.  */
+#define V850_OTHER_SDA		0x10	/* Symbol had SDA relocations.  */
+#define V850_OTHER_ZDA		0x20	/* Symbol had ZDA relocations.  */
+#define V850_OTHER_TDA		0x40	/* Symbol had TDA relocations.  */
+#define V850_OTHER_ERROR	0x80	/* Symbol had an error reported.  */
+
+/* V850 relocations.  */
+#include "elf/reloc-macros.h"
+
+START_RELOC_NUMBERS (v850_reloc_type)
+     RELOC_NUMBER (R_V850_NONE, 0)
+     RELOC_NUMBER (R_V850_9_PCREL, 1)
+     RELOC_NUMBER (R_V850_22_PCREL, 2)
+     RELOC_NUMBER (R_V850_HI16_S, 3)
+     RELOC_NUMBER (R_V850_HI16, 4)
+     RELOC_NUMBER (R_V850_LO16, 5)
+     RELOC_NUMBER (R_V850_ABS32, 6)
+     RELOC_NUMBER (R_V850_16, 7)
+     RELOC_NUMBER (R_V850_8, 8)
+     RELOC_NUMBER( R_V850_SDA_16_16_OFFSET, 9)		/* For ld.b, st.b, set1, clr1, not1, tst1, movea, movhi */
+     RELOC_NUMBER( R_V850_SDA_15_16_OFFSET, 10)		/* For ld.w, ld.h, ld.hu, st.w, st.h */
+     RELOC_NUMBER( R_V850_ZDA_16_16_OFFSET, 11)		/* For ld.b, st.b, set1, clr1, not1, tst1, movea, movhi */
+     RELOC_NUMBER( R_V850_ZDA_15_16_OFFSET, 12)		/* For ld.w, ld.h, ld.hu, st.w, st.h */
+     RELOC_NUMBER( R_V850_TDA_6_8_OFFSET, 13)		/* For sst.w, sld.w */
+     RELOC_NUMBER( R_V850_TDA_7_8_OFFSET, 14)		/* For sst.h, sld.h */
+     RELOC_NUMBER( R_V850_TDA_7_7_OFFSET, 15)		/* For sst.b, sld.b */
+     RELOC_NUMBER( R_V850_TDA_16_16_OFFSET, 16)		/* For set1, clr1, not1, tst1, movea, movhi */
+     RELOC_NUMBER( R_V850_TDA_4_5_OFFSET, 17)		/* For sld.hu */
+     RELOC_NUMBER( R_V850_TDA_4_4_OFFSET, 18)		/* For sld.bu */
+     RELOC_NUMBER( R_V850_SDA_16_16_SPLIT_OFFSET, 19)	/* For ld.bu */
+     RELOC_NUMBER( R_V850_ZDA_16_16_SPLIT_OFFSET, 20)	/* For ld.bu */
+     RELOC_NUMBER( R_V850_CALLT_6_7_OFFSET, 21)		/* For callt */
+     RELOC_NUMBER( R_V850_CALLT_16_16_OFFSET, 22)	/* For callt */
+     RELOC_NUMBER (R_V850_GNU_VTINHERIT, 23)
+     RELOC_NUMBER (R_V850_GNU_VTENTRY, 24)
+     RELOC_NUMBER (R_V850_LONGCALL, 25)
+     RELOC_NUMBER (R_V850_LONGJUMP, 26)
+     RELOC_NUMBER (R_V850_ALIGN, 27)
+     RELOC_NUMBER (R_V850_REL32, 28)
+     RELOC_NUMBER (R_V850_LO16_SPLIT_OFFSET, 29)	/* For ld.bu */
+     RELOC_NUMBER (R_V850_16_PCREL, 30)      		/* For loop */
+     RELOC_NUMBER (R_V850_17_PCREL, 31)      		/* For br */
+     RELOC_NUMBER (R_V850_23, 32)			/* For 23bit ld.[w,h,hu,b,bu],st.[w,h,b] */
+     RELOC_NUMBER (R_V850_32_PCREL, 33)      		/* For jr32, jarl32 */
+     RELOC_NUMBER (R_V850_32_ABS, 34)      		/* For jmp32 */
+     RELOC_NUMBER (R_V850_16_SPLIT_OFFSET, 35)      	/* For ld.bu */
+     RELOC_NUMBER (R_V850_16_S1, 36)      		/* For ld.w, ld.h st.w st.h */
+     RELOC_NUMBER (R_V850_LO16_S1, 37)      		/* For ld.w, ld.h st.w st.h */
+     RELOC_NUMBER (R_V850_CALLT_15_16_OFFSET, 38)	/* For ld.w, ld.h, ld.hu, st.w, st.h */
+     RELOC_NUMBER (R_V850_32_GOTPCREL, 39)		/* GLOBAL_OFFSET_TABLE from pc */
+     RELOC_NUMBER (R_V850_16_GOT, 40)      		/* GOT ENTRY from gp */
+     RELOC_NUMBER (R_V850_32_GOT, 41)      		
+     RELOC_NUMBER (R_V850_22_PLT, 42)			/* For jr */
+     RELOC_NUMBER (R_V850_32_PLT, 43)			/* For jr32 */
+     RELOC_NUMBER (R_V850_COPY, 44)      		
+     RELOC_NUMBER (R_V850_GLOB_DAT, 45)      		
+     RELOC_NUMBER (R_V850_JMP_SLOT, 46)      		
+     RELOC_NUMBER (R_V850_RELATIVE, 47)      		
+     RELOC_NUMBER (R_V850_16_GOTOFF, 48)      		/* From gp */
+     RELOC_NUMBER (R_V850_32_GOTOFF, 49)      		
+     RELOC_NUMBER (R_V850_CODE, 50)      		
+     RELOC_NUMBER (R_V850_DATA, 51)      		/* For loop */
+
+END_RELOC_NUMBERS (R_V850_max)
+
+
+/* Processor specific section indices.  These sections do not actually
+   exist.  Symbols with a st_shndx field corresponding to one of these
+   values have a special meaning.  */
+
+/* Small data area common symbol.  */
+#define SHN_V850_SCOMMON	SHN_LORESERVE
+
+/* Tiny data area common symbol.  */
+#define SHN_V850_TCOMMON	(SHN_LORESERVE + 1)
+
+/* Zero data area common symbol.  */
+#define SHN_V850_ZCOMMON	(SHN_LORESERVE + 2)
+
+
+/* Processor specific section types.  */
+
+/* Section contains the .scommon data.  */
+#define SHT_V850_SCOMMON	0x70000000
+
+/* Section contains the .scommon data.  */
+#define SHT_V850_TCOMMON	0x70000001
+
+/* Section contains the .scommon data.  */
+#define SHT_V850_ZCOMMON	0x70000002
+
+/* Processor specific section flags.  */
+
+/* This section must be in the small data area (pointed to by GP).  */
+#define SHF_V850_GPREL		0x10000000
+
+/* This section must be in the tiny data area (pointed to by EP).  */
+#define SHF_V850_EPREL		0x20000000
+
+/* This section must be in the zero data area (pointed to by R0).  */
+#define SHF_V850_R0REL		0x40000000
+
+#endif /* _ELF_V850_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/vax.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/vax.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/vax.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/vax.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,51 @@
+/* VAX ELF support for BFD.
+   Copyright (C) 2002, 2010 Free Software Foundation, Inc.
+   Contributed by Matt Thomas <matt@3am-software.com>.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_VAX_H
+#define _ELF_VAX_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocation types.  */
+START_RELOC_NUMBERS (elf_vax_reloc_type)
+  RELOC_NUMBER (R_VAX_NONE, 0)		/* No reloc */
+  RELOC_NUMBER (R_VAX_32, 1)		/* Direct 32 bit  */
+  RELOC_NUMBER (R_VAX_16, 2)		/* Direct 16 bit  */
+  RELOC_NUMBER (R_VAX_8, 3)		/* Direct 8 bit  */
+  RELOC_NUMBER (R_VAX_PC32, 4)		/* PC relative 32 bit */
+  RELOC_NUMBER (R_VAX_PC16, 5)		/* PC relative 16 bit */
+  RELOC_NUMBER (R_VAX_PC8, 6)		/* PC relative 8 bit */
+  RELOC_NUMBER (R_VAX_GOT32, 7)		/* 32 bit PC relative GOT entry */
+  RELOC_NUMBER (R_VAX_PLT32, 13)	/* 32 bit PC relative PLT address */
+  RELOC_NUMBER (R_VAX_COPY, 19)		/* Copy symbol at runtime */
+  RELOC_NUMBER (R_VAX_GLOB_DAT, 20)	/* Create GOT entry */
+  RELOC_NUMBER (R_VAX_JMP_SLOT, 21)	/* Create PLT entry */
+  RELOC_NUMBER (R_VAX_RELATIVE, 22)	/* Adjust by program base */
+  /* These are GNU extensions to enable C++ vtable garbage collection.  */
+  RELOC_NUMBER (R_VAX_GNU_VTINHERIT, 23)
+  RELOC_NUMBER (R_VAX_GNU_VTENTRY, 24)
+END_RELOC_NUMBERS (R_VAX_max)   
+
+/* Processor specific flags for the ELF header e_flags field.  */
+#define EF_VAX_NONPIC		0x0001	/* Object contains non-PIC code */
+#define EF_VAX_DFLOAT		0x0100	/* Object contains D-Float insn.  */
+#define EF_VAX_GFLOAT		0x0200	/* Object contains G-Float insn.  */
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/vxworks.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/vxworks.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/vxworks.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/vxworks.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,33 @@
+/* VxWorks ELF support for BFD.
+   Copyright 2007, 2010
+   Free Software Foundation, Inc.
+
+   Contributed by Nathan Sidwell <nathan@codesourcery.com>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _ELF_VXWORKS_H
+#define _ELF_VXWORKS_H
+
+#define DT_VX_WRS_TLS_DATA_START 0x60000010
+#define DT_VX_WRS_TLS_DATA_SIZE  0x60000011
+#define DT_VX_WRS_TLS_DATA_ALIGN 0x60000015
+#define DT_VX_WRS_TLS_VARS_START 0x60000012
+#define DT_VX_WRS_TLS_VARS_SIZE  0x60000013
+  
+#endif /* _ELF_VXWORKS_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/x86-64.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/x86-64.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/x86-64.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/x86-64.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,89 @@
+/* x86_64 ELF support for BFD.
+   Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2008, 2009, 2010
+   Free Software Foundation, Inc.
+   Contributed by Jan Hubicka <jh@suse.cz>
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_X86_64_H
+#define _ELF_X86_64_H
+
+#include "elf/reloc-macros.h"
+
+START_RELOC_NUMBERS (elf_x86_64_reloc_type)
+     RELOC_NUMBER (R_X86_64_NONE,     0)      /* No reloc */
+     RELOC_NUMBER (R_X86_64_64,       1)      /* Direct 64 bit  */
+     RELOC_NUMBER (R_X86_64_PC32,     2)      /* PC relative 32 bit signed */
+     RELOC_NUMBER (R_X86_64_GOT32,    3)      /* 32 bit GOT entry */
+     RELOC_NUMBER (R_X86_64_PLT32,    4)      /* 32 bit PLT address */
+     RELOC_NUMBER (R_X86_64_COPY,     5)      /* Copy symbol at runtime */
+     RELOC_NUMBER (R_X86_64_GLOB_DAT, 6)      /* Create GOT entry */
+     RELOC_NUMBER (R_X86_64_JUMP_SLOT,7)      /* Create PLT entry */
+     RELOC_NUMBER (R_X86_64_RELATIVE, 8)      /* Adjust by program base */
+     RELOC_NUMBER (R_X86_64_GOTPCREL, 9)      /* 32 bit signed pc relative
+                                                 offset to GOT entry */
+     RELOC_NUMBER (R_X86_64_32,       10)     /* Direct 32 bit zero extended */
+     RELOC_NUMBER (R_X86_64_32S,      11)     /* Direct 32 bit sign extended */
+     RELOC_NUMBER (R_X86_64_16,       12)     /* Direct 16 bit zero extended */
+     RELOC_NUMBER (R_X86_64_PC16,     13)     /* 16 bit sign extended pc relative*/
+     RELOC_NUMBER (R_X86_64_8,        14)     /* Direct 8 bit sign extended */
+     RELOC_NUMBER (R_X86_64_PC8,      15)     /* 8 bit sign extended pc relative*/
+     RELOC_NUMBER (R_X86_64_DTPMOD64, 16)     /* ID of module containing symbol */
+     RELOC_NUMBER (R_X86_64_DTPOFF64, 17)     /* Offset in TLS block */
+     RELOC_NUMBER (R_X86_64_TPOFF64,  18)     /* Offset in initial TLS block */
+     RELOC_NUMBER (R_X86_64_TLSGD,    19)     /* PC relative offset to GD GOT block */
+     RELOC_NUMBER (R_X86_64_TLSLD,    20)     /* PC relative offset to LD GOT block */
+     RELOC_NUMBER (R_X86_64_DTPOFF32, 21)     /* Offset in TLS block */
+     RELOC_NUMBER (R_X86_64_GOTTPOFF, 22)     /* PC relative offset to IE GOT entry */
+     RELOC_NUMBER (R_X86_64_TPOFF32,  23)     /* Offset in initial TLS block */
+     RELOC_NUMBER (R_X86_64_PC64,     24)     /* PC relative 64 bit */
+     RELOC_NUMBER (R_X86_64_GOTOFF64, 25)     /* 64 bit offset to GOT */
+     RELOC_NUMBER (R_X86_64_GOTPC32,  26)     /* 32 bit signed pc relative
+                                                 offset to GOT */
+     RELOC_NUMBER (R_X86_64_GOT64,    27)     /* 64 bit GOT entry offset */
+     RELOC_NUMBER (R_X86_64_GOTPCREL64, 28)   /* 64 bit signed pc relative
+     						 offset to GOT entry */
+     RELOC_NUMBER (R_X86_64_GOTPC64,  29)     /* 64 bit signed pc relative
+     						 offset to GOT */
+     RELOC_NUMBER (R_X86_64_GOTPLT64, 30)     /* like GOT64, but indicates
+     						 that PLT entry is needed */
+     RELOC_NUMBER (R_X86_64_PLTOFF64, 31)     /* 64 bit GOT relative offset
+     						 to PLT entry */
+     /* 32 .. 33 */
+     RELOC_NUMBER (R_X86_64_GOTPC32_TLSDESC, 34)
+					      /* 32 bit signed pc relative
+						 offset to TLS descriptor
+						 in the GOT.  */
+     RELOC_NUMBER (R_X86_64_TLSDESC_CALL, 35) /* Relaxable call through TLS
+						 descriptor.  */
+     RELOC_NUMBER (R_X86_64_TLSDESC, 36)      /* 2x64-bit TLS descriptor.  */
+     RELOC_NUMBER (R_X86_64_IRELATIVE, 37)    /* Adjust indirectly by program base */
+     RELOC_NUMBER (R_X86_64_RELATIVE64, 38)   /* 64bit adjust by program base */
+     RELOC_NUMBER (R_X86_64_GNU_VTINHERIT, 250)       /* GNU C++ hack  */
+     RELOC_NUMBER (R_X86_64_GNU_VTENTRY, 251)         /* GNU C++ hack  */
+END_RELOC_NUMBERS (R_X86_64_max)
+
+/* Processor specific section types.  */
+
+#define SHT_X86_64_UNWIND	0x70000001	/* unwind information */
+
+/* Like SHN_COMMON but the symbol will be allocated in the .lbss
+   section.  */
+#define SHN_X86_64_LCOMMON 	(SHN_LORESERVE + 2)
+
+#define SHF_X86_64_LARGE	0x10000000
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/xc16x.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/xc16x.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/xc16x.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/xc16x.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,40 @@
+/* Infineon XC16X ELF support for BFD.
+   Copyright 2006, 2010 Free Software Foundation, Inc.
+   Contributed by KPIT Cummins Infosystems 
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_XC16X_H
+#define _ELF_XC16X_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_xc16x_reloc_type)
+  RELOC_NUMBER (R_XC16X_NONE, 0)
+  RELOC_NUMBER (R_XC16X_ABS_8, 1)
+  RELOC_NUMBER (R_XC16X_ABS_16, 2)
+  RELOC_NUMBER (R_XC16X_ABS_32, 3)
+  RELOC_NUMBER (R_XC16X_8_PCREL, 4)
+  RELOC_NUMBER (R_XC16X_PAG, 5)
+  RELOC_NUMBER (R_XC16X_POF, 6)
+  RELOC_NUMBER (R_XC16X_SEG, 7)
+  RELOC_NUMBER (R_XC16X_SOF, 8)
+
+END_RELOC_NUMBERS (R_XC16X_max)
+
+#endif /* _ELF_XC16X_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/xstormy16.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/xstormy16.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/xstormy16.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/xstormy16.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,57 @@
+/* XSTORMY16 ELF support for BFD.
+   Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _ELF_XSTORMY16_H
+#define _ELF_XSTORMY16_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_xstormy16_reloc_type)
+  RELOC_NUMBER (R_XSTORMY16_NONE, 0)
+
+  RELOC_NUMBER (R_XSTORMY16_32, 1)
+  RELOC_NUMBER (R_XSTORMY16_16, 2)
+  RELOC_NUMBER (R_XSTORMY16_8, 3)
+  RELOC_NUMBER (R_XSTORMY16_PC32, 4)
+  RELOC_NUMBER (R_XSTORMY16_PC16, 5)
+  RELOC_NUMBER (R_XSTORMY16_PC8, 6)
+
+  RELOC_NUMBER (R_XSTORMY16_REL_12, 7)
+  RELOC_NUMBER (R_XSTORMY16_24, 8)
+  RELOC_NUMBER (R_XSTORMY16_FPTR16, 9)
+
+  RELOC_NUMBER (R_XSTORMY16_LO16, 10)
+  RELOC_NUMBER (R_XSTORMY16_HI16, 11)
+  RELOC_NUMBER (R_XSTORMY16_12, 12)
+
+  RELOC_NUMBER (R_XSTORMY16_GNU_VTINHERIT, 128)
+  RELOC_NUMBER (R_XSTORMY16_GNU_VTENTRY, 129)
+END_RELOC_NUMBERS (R_XSTORMY16_max)
+
+/* Define the data & instruction memory discriminator.  In a linked
+   executable, an symbol should be deemed to point to an instruction
+   if ((address & XSTORMY16_INSN_MASK) == XSTORMY16_INSN_VALUE), and similarly
+   for the data space.  See also `ld/emulparams/elf32xstormy16.sh'.  */
+#define XSTORMY16_DATA_MASK   0xffc00000
+#define XSTORMY16_DATA_VALUE  0x00000000
+#define XSTORMY16_INSN_MASK   0xffc00000
+#define XSTORMY16_INSN_VALUE  0x00400000
+
+#endif /* _ELF_XSTORMY16_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/xtensa.h sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/xtensa.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/elf/xtensa.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/elf/xtensa.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,208 @@
+/* Xtensa ELF support for BFD.
+   Copyright 2003, 2004, 2007, 2008, 2010 Free Software Foundation, Inc.
+   Contributed by Bob Wilson (bwilson@tensilica.com) at Tensilica.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+/* This file holds definitions specific to the Xtensa ELF ABI.  */
+
+#ifndef _ELF_XTENSA_H
+#define _ELF_XTENSA_H
+
+#include "elf/reloc-macros.h"
+
+/* Relocations.  */
+START_RELOC_NUMBERS (elf_xtensa_reloc_type)
+     RELOC_NUMBER (R_XTENSA_NONE, 0)
+     RELOC_NUMBER (R_XTENSA_32, 1)
+     RELOC_NUMBER (R_XTENSA_RTLD, 2)
+     RELOC_NUMBER (R_XTENSA_GLOB_DAT, 3)
+     RELOC_NUMBER (R_XTENSA_JMP_SLOT, 4)
+     RELOC_NUMBER (R_XTENSA_RELATIVE, 5)
+     RELOC_NUMBER (R_XTENSA_PLT, 6)
+     RELOC_NUMBER (R_XTENSA_OP0, 8)
+     RELOC_NUMBER (R_XTENSA_OP1, 9)
+     RELOC_NUMBER (R_XTENSA_OP2, 10) 
+     RELOC_NUMBER (R_XTENSA_ASM_EXPAND, 11)
+     RELOC_NUMBER (R_XTENSA_ASM_SIMPLIFY, 12)
+     RELOC_NUMBER (R_XTENSA_32_PCREL, 14)
+     RELOC_NUMBER (R_XTENSA_GNU_VTINHERIT, 15)
+     RELOC_NUMBER (R_XTENSA_GNU_VTENTRY, 16)
+     RELOC_NUMBER (R_XTENSA_DIFF8, 17)
+     RELOC_NUMBER (R_XTENSA_DIFF16, 18)
+     RELOC_NUMBER (R_XTENSA_DIFF32, 19)
+     RELOC_NUMBER (R_XTENSA_SLOT0_OP, 20)
+     RELOC_NUMBER (R_XTENSA_SLOT1_OP, 21)
+     RELOC_NUMBER (R_XTENSA_SLOT2_OP, 22)
+     RELOC_NUMBER (R_XTENSA_SLOT3_OP, 23)
+     RELOC_NUMBER (R_XTENSA_SLOT4_OP, 24)
+     RELOC_NUMBER (R_XTENSA_SLOT5_OP, 25)
+     RELOC_NUMBER (R_XTENSA_SLOT6_OP, 26)
+     RELOC_NUMBER (R_XTENSA_SLOT7_OP, 27)
+     RELOC_NUMBER (R_XTENSA_SLOT8_OP, 28)
+     RELOC_NUMBER (R_XTENSA_SLOT9_OP, 29)
+     RELOC_NUMBER (R_XTENSA_SLOT10_OP, 30)
+     RELOC_NUMBER (R_XTENSA_SLOT11_OP, 31)
+     RELOC_NUMBER (R_XTENSA_SLOT12_OP, 32)
+     RELOC_NUMBER (R_XTENSA_SLOT13_OP, 33)
+     RELOC_NUMBER (R_XTENSA_SLOT14_OP, 34)
+     RELOC_NUMBER (R_XTENSA_SLOT0_ALT, 35)
+     RELOC_NUMBER (R_XTENSA_SLOT1_ALT, 36)
+     RELOC_NUMBER (R_XTENSA_SLOT2_ALT, 37)
+     RELOC_NUMBER (R_XTENSA_SLOT3_ALT, 38)
+     RELOC_NUMBER (R_XTENSA_SLOT4_ALT, 39)
+     RELOC_NUMBER (R_XTENSA_SLOT5_ALT, 40)
+     RELOC_NUMBER (R_XTENSA_SLOT6_ALT, 41)
+     RELOC_NUMBER (R_XTENSA_SLOT7_ALT, 42)
+     RELOC_NUMBER (R_XTENSA_SLOT8_ALT, 43)
+     RELOC_NUMBER (R_XTENSA_SLOT9_ALT, 44)
+     RELOC_NUMBER (R_XTENSA_SLOT10_ALT, 45)
+     RELOC_NUMBER (R_XTENSA_SLOT11_ALT, 46)
+     RELOC_NUMBER (R_XTENSA_SLOT12_ALT, 47)
+     RELOC_NUMBER (R_XTENSA_SLOT13_ALT, 48)
+     RELOC_NUMBER (R_XTENSA_SLOT14_ALT, 49)
+     RELOC_NUMBER (R_XTENSA_TLSDESC_FN, 50)
+     RELOC_NUMBER (R_XTENSA_TLSDESC_ARG, 51)
+     RELOC_NUMBER (R_XTENSA_TLS_DTPOFF, 52)
+     RELOC_NUMBER (R_XTENSA_TLS_TPOFF, 53)
+     RELOC_NUMBER (R_XTENSA_TLS_FUNC, 54)
+     RELOC_NUMBER (R_XTENSA_TLS_ARG, 55)
+     RELOC_NUMBER (R_XTENSA_TLS_CALL, 56)
+END_RELOC_NUMBERS (R_XTENSA_max)
+
+/* Processor-specific flags for the ELF header e_flags field.  */
+
+/* Four-bit Xtensa machine type field.  */
+#define EF_XTENSA_MACH			0x0000000f
+
+/* Various CPU types.  */
+#define E_XTENSA_MACH			0x00000000
+
+/* Leave bits 0xf0 alone in case we ever have more than 16 cpu types.
+   Highly unlikely, but what the heck.  */
+
+#define EF_XTENSA_XT_INSN		0x00000100
+#define EF_XTENSA_XT_LIT		0x00000200
+
+
+/* Processor-specific dynamic array tags.  */
+
+/* Offset of the table that records the GOT location(s).  */
+#define DT_XTENSA_GOT_LOC_OFF		0x70000000
+
+/* Number of entries in the GOT location table.  */
+#define DT_XTENSA_GOT_LOC_SZ		0x70000001
+
+
+/* Definitions for instruction and literal property tables.  The
+   tables for ".gnu.linkonce.*" sections are placed in the following
+   sections:
+
+   instruction tables:	.gnu.linkonce.x.*
+   literal tables:	.gnu.linkonce.p.*
+*/
+
+#define XTENSA_INSN_SEC_NAME ".xt.insn"
+#define XTENSA_LIT_SEC_NAME  ".xt.lit"
+#define XTENSA_PROP_SEC_NAME ".xt.prop"
+
+typedef struct property_table_entry_t
+{
+  bfd_vma address;
+  bfd_vma size;
+  flagword flags;
+} property_table_entry;
+
+/* Flags in the property tables to specify whether blocks of memory are
+   literals, instructions, data, or unreachable.  For instructions,
+   blocks that begin loop targets and branch targets are designated.
+   Blocks that do not allow density instructions, instruction reordering
+   or transformation are also specified.  Finally, for branch targets,
+   branch target alignment priority is included.  Alignment of the next
+   block is specified in the current block and the size of the current
+   block does not include any fill required to align to the next
+   block.  */
+   
+#define XTENSA_PROP_LITERAL		0x00000001
+#define XTENSA_PROP_INSN		0x00000002
+#define XTENSA_PROP_DATA		0x00000004
+#define XTENSA_PROP_UNREACHABLE		0x00000008
+/* Instruction-only properties at beginning of code. */
+#define XTENSA_PROP_INSN_LOOP_TARGET	0x00000010
+#define XTENSA_PROP_INSN_BRANCH_TARGET	0x00000020
+/* Instruction-only properties about code. */
+#define XTENSA_PROP_INSN_NO_DENSITY	0x00000040
+#define XTENSA_PROP_INSN_NO_REORDER	0x00000080
+/* Historically, NO_TRANSFORM was a property of instructions, 
+   but it should apply to literals under certain circumstances.  */
+#define XTENSA_PROP_NO_TRANSFORM	0x00000100
+
+/*  Branch target alignment information.  This transmits information
+    to the linker optimization about the priority of aligning a
+    particular block for branch target alignment: None, low priority,
+    high priority, or required.  These only need to be checked in
+    instruction blocks marked as XTENSA_PROP_INSN_BRANCH_TARGET.
+    Common usage is:
+
+    switch (GET_XTENSA_PROP_BT_ALIGN(flags))
+    case XTENSA_PROP_BT_ALIGN_NONE:
+    case XTENSA_PROP_BT_ALIGN_LOW:
+    case XTENSA_PROP_BT_ALIGN_HIGH:
+    case XTENSA_PROP_BT_ALIGN_REQUIRE:
+*/
+#define XTENSA_PROP_BT_ALIGN_MASK       0x00000600
+
+/* No branch target alignment.  */
+#define XTENSA_PROP_BT_ALIGN_NONE       0x0
+/* Low priority branch target alignment.  */
+#define XTENSA_PROP_BT_ALIGN_LOW        0x1
+/* High priority branch target alignment. */
+#define XTENSA_PROP_BT_ALIGN_HIGH       0x2
+/* Required branch target alignment.  */
+#define XTENSA_PROP_BT_ALIGN_REQUIRE    0x3
+
+#define GET_XTENSA_PROP_BT_ALIGN(flag) \
+  (((unsigned)((flag) & (XTENSA_PROP_BT_ALIGN_MASK))) >> 9)
+#define SET_XTENSA_PROP_BT_ALIGN(flag, align) \
+  (((flag) & (~XTENSA_PROP_BT_ALIGN_MASK)) | \
+    (((align) << 9) & XTENSA_PROP_BT_ALIGN_MASK))
+
+/* Alignment is specified in the block BEFORE the one that needs
+   alignment.  Up to 5 bits.  Use GET_XTENSA_PROP_ALIGNMENT(flags) to
+   get the required alignment specified as a power of 2.  Use
+   SET_XTENSA_PROP_ALIGNMENT(flags, pow2) to set the required
+   alignment.  Be careful of side effects since the SET will evaluate
+   flags twice.  Also, note that the SIZE of a block in the property
+   table does not include the alignment size, so the alignment fill
+   must be calculated to determine if two blocks are contiguous.
+   TEXT_ALIGN is not currently implemented but is a placeholder for a
+   possible future implementation.  */
+
+#define XTENSA_PROP_ALIGN		0x00000800
+
+#define XTENSA_PROP_ALIGNMENT_MASK      0x0001f000
+
+#define GET_XTENSA_PROP_ALIGNMENT(flag) \
+  (((unsigned)((flag) & (XTENSA_PROP_ALIGNMENT_MASK))) >> 12)
+#define SET_XTENSA_PROP_ALIGNMENT(flag, align) \
+  (((flag) & (~XTENSA_PROP_ALIGNMENT_MASK)) | \
+    (((align) << 12) & XTENSA_PROP_ALIGNMENT_MASK))
+
+#define XTENSA_PROP_INSN_ABSLIT        0x00020000
+
+#endif /* _ELF_XTENSA_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/fibheap.h sdcc-3.2.0+dfsg/support/sdbinutils/include/fibheap.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/fibheap.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/fibheap.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,95 @@
+/* A Fibonacci heap datatype.
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009
+   Free Software Foundation, Inc.
+   Contributed by Daniel Berlin (dan@cgsoftware.com).
+
+This file is part of GCC.
+   
+GCC is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GCC 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 GCC; see the file COPYING.  If not, write to
+the Free Software Foundation, 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/* Fibonacci heaps are somewhat complex, but, there's an article in
+   DDJ that explains them pretty well:
+
+   http://www.ddj.com/articles/1997/9701/9701o/9701o.htm?topic=algoritms
+
+   Introduction to algorithms by Corman and Rivest also goes over them.
+
+   The original paper that introduced them is "Fibonacci heaps and their
+   uses in improved network optimization algorithms" by Tarjan and
+   Fredman (JACM 34(3), July 1987).
+
+   Amortized and real worst case time for operations:
+
+   ExtractMin: O(lg n) amortized. O(n) worst case.
+   DecreaseKey: O(1) amortized.  O(lg n) worst case. 
+   Insert: O(2) amortized. O(1) actual.  
+   Union: O(1) amortized. O(1) actual.  */
+
+#ifndef _FIBHEAP_H_
+#define _FIBHEAP_H_
+
+#include "ansidecl.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef long fibheapkey_t;
+
+typedef struct fibheap
+{
+  size_t nodes;
+  struct fibnode *min;
+  struct fibnode *root;
+} *fibheap_t;
+
+typedef struct fibnode
+{
+  struct fibnode *parent;
+  struct fibnode *child;
+  struct fibnode *left;
+  struct fibnode *right;
+  fibheapkey_t key;
+  void *data;
+#if defined (__GNUC__) && (!defined (SIZEOF_INT) || SIZEOF_INT < 4)
+  __extension__ unsigned long int degree : 31;
+  __extension__ unsigned long int mark : 1;
+#else
+  unsigned int degree : 31;
+  unsigned int mark : 1;
+#endif
+} *fibnode_t;
+
+extern fibheap_t fibheap_new (void);
+extern fibnode_t fibheap_insert (fibheap_t, fibheapkey_t, void *);
+extern int fibheap_empty (fibheap_t);
+extern fibheapkey_t fibheap_min_key (fibheap_t);
+extern fibheapkey_t fibheap_replace_key (fibheap_t, fibnode_t,
+                                         fibheapkey_t);
+extern void *fibheap_replace_key_data (fibheap_t, fibnode_t,
+                                       fibheapkey_t, void *);
+extern void *fibheap_extract_min (fibheap_t);
+extern void *fibheap_min (fibheap_t);
+extern void *fibheap_replace_data (fibheap_t, fibnode_t, void *);
+extern void *fibheap_delete_node (fibheap_t, fibnode_t);
+extern void fibheap_delete (fibheap_t);
+extern fibheap_t fibheap_union (fibheap_t, fibheap_t);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _FIBHEAP_H_ */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/filenames.h sdcc-3.2.0+dfsg/support/sdbinutils/include/filenames.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/filenames.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/filenames.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,91 @@
+/* Macros for taking apart, interpreting and processing file names.
+
+   These are here because some non-Posix (a.k.a. DOSish) systems have
+   drive letter brain-damage at the beginning of an absolute file name,
+   use forward- and back-slash in path names interchangeably, and
+   some of them have case-insensitive file names.
+
+   Copyright 2000, 2001, 2007, 2010 Free Software Foundation, Inc.
+
+This file is part of BFD, the Binary File Descriptor library.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef FILENAMES_H
+#define FILENAMES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(__MSDOS__) || defined(_WIN32) || defined(__OS2__) || defined (__CYGWIN__)
+#  ifndef HAVE_DOS_BASED_FILE_SYSTEM
+#    define HAVE_DOS_BASED_FILE_SYSTEM 1
+#  endif
+#  ifndef HAVE_CASE_INSENSITIVE_FILE_SYSTEM
+#    define HAVE_CASE_INSENSITIVE_FILE_SYSTEM 1
+#  endif
+#  define HAS_DRIVE_SPEC(f) HAS_DOS_DRIVE_SPEC (f)
+#  define IS_DIR_SEPARATOR(c) IS_DOS_DIR_SEPARATOR (c)
+#  define IS_ABSOLUTE_PATH(f) IS_DOS_ABSOLUTE_PATH (f)
+#else /* not DOSish */
+#  if defined(__APPLE__)
+#    ifndef HAVE_CASE_INSENSITIVE_FILE_SYSTEM
+#      define HAVE_CASE_INSENSITIVE_FILE_SYSTEM 1
+#    endif
+#  endif /* __APPLE__ */
+#  define HAS_DRIVE_SPEC(f) (0)
+#  define IS_DIR_SEPARATOR(c) IS_UNIX_DIR_SEPARATOR (c)
+#  define IS_ABSOLUTE_PATH(f) IS_UNIX_ABSOLUTE_PATH (f)
+#endif
+
+#define IS_DIR_SEPARATOR_1(dos_based, c)				\
+  (((c) == '/')								\
+   || (((c) == '\\') && (dos_based)))
+
+#define HAS_DRIVE_SPEC_1(dos_based, f)			\
+  ((f)[0] && ((f)[1] == ':') && (dos_based))
+
+/* Remove the drive spec from F, assuming HAS_DRIVE_SPEC (f).
+   The result is a pointer to the remainder of F.  */
+#define STRIP_DRIVE_SPEC(f)	((f) + 2)
+
+#define IS_DOS_DIR_SEPARATOR(c) IS_DIR_SEPARATOR_1 (1, c)
+#define IS_DOS_ABSOLUTE_PATH(f) IS_ABSOLUTE_PATH_1 (1, f)
+#define HAS_DOS_DRIVE_SPEC(f) HAS_DRIVE_SPEC_1 (1, f)
+
+#define IS_UNIX_DIR_SEPARATOR(c) IS_DIR_SEPARATOR_1 (0, c)
+#define IS_UNIX_ABSOLUTE_PATH(f) IS_ABSOLUTE_PATH_1 (0, f)
+
+/* Note that when DOS_BASED is true, IS_ABSOLUTE_PATH accepts d:foo as
+   well, although it is only semi-absolute.  This is because the users
+   of IS_ABSOLUTE_PATH want to know whether to prepend the current
+   working directory to a file name, which should not be done with a
+   name like d:foo.  */
+#define IS_ABSOLUTE_PATH_1(dos_based, f)		 \
+  (IS_DIR_SEPARATOR_1 (dos_based, (f)[0])		 \
+   || HAS_DRIVE_SPEC_1 (dos_based, f))
+
+extern int filename_cmp (const char *s1, const char *s2);
+#define FILENAME_CMP(s1, s2)	filename_cmp(s1, s2)
+
+extern int filename_ncmp (const char *s1, const char *s2,
+			  size_t n);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FILENAMES_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/floatformat.h sdcc-3.2.0+dfsg/support/sdbinutils/include/floatformat.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/floatformat.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/floatformat.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,151 @@
+/* IEEE floating point support declarations, for GDB, the GNU Debugger.
+   Copyright 1991, 1994, 1995, 1997, 2000, 2003, 2005, 2010
+   Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#if !defined (FLOATFORMAT_H)
+#define FLOATFORMAT_H 1
+
+#include "ansidecl.h"
+
+/* A floatformat consists of a sign bit, an exponent and a mantissa.  Once the
+   bytes are concatenated according to the byteorder flag, then each of those
+   fields is contiguous.  We number the bits with 0 being the most significant
+   (i.e. BITS_BIG_ENDIAN type numbering), and specify which bits each field
+   contains with the *_start and *_len fields.  */
+
+/* What is the order of the bytes?  */
+
+enum floatformat_byteorders {
+  /* Standard little endian byte order.
+     EX: 1.2345678e10 => 00 00 80 c5 e0 fe 06 42 */
+  floatformat_little,
+
+  /* Standard big endian byte order.
+     EX: 1.2345678e10 => 42 06 fe e0 c5 80 00 00 */
+  floatformat_big,
+
+  /* Little endian byte order but big endian word order.
+     EX: 1.2345678e10 => e0 fe 06 42 00 00 80 c5 */
+  floatformat_littlebyte_bigword,
+
+  /* VAX byte order.  Little endian byte order with 16-bit words.  The
+     following example is an illustration of the byte order only; VAX
+     doesn't have a fully IEEE compliant floating-point format.
+     EX: 1.2345678e10 => 80 c5 00 00 06 42 e0 fe */
+  floatformat_vax
+};
+
+enum floatformat_intbit { floatformat_intbit_yes, floatformat_intbit_no };
+
+struct floatformat
+{
+  enum floatformat_byteorders byteorder;
+  unsigned int totalsize;	/* Total size of number in bits */
+
+  /* Sign bit is always one bit long.  1 means negative, 0 means positive.  */
+  unsigned int sign_start;
+
+  unsigned int exp_start;
+  unsigned int exp_len;
+  /* Bias added to a "true" exponent to form the biased exponent.  It
+     is intentionally signed as, otherwize, -exp_bias can turn into a
+     very large number (e.g., given the exp_bias of 0x3fff and a 64
+     bit long, the equation (long)(1 - exp_bias) evaluates to
+     4294950914) instead of -16382).  */
+  int exp_bias;
+  /* Exponent value which indicates NaN.  This is the actual value stored in
+     the float, not adjusted by the exp_bias.  This usually consists of all
+     one bits.  */
+  unsigned int exp_nan;
+
+  unsigned int man_start;
+  unsigned int man_len;
+
+  /* Is the integer bit explicit or implicit?  */
+  enum floatformat_intbit intbit;
+
+  /* Internal name for debugging. */
+  const char *name;
+
+  /* Validator method.  */
+  int (*is_valid) (const struct floatformat *fmt, const void *from);
+
+  /* Is the format actually the sum of two smaller floating point
+     formats (IBM long double, as described in
+     gcc/config/rs6000/darwin-ldouble-format)?  If so, this is the
+     smaller format in question, and the fields sign_start through
+     intbit describe the first half.  If not, this is NULL.  */
+  const struct floatformat *split_half;
+};
+
+/* floatformats for IEEE single and double, big and little endian.  */
+
+extern const struct floatformat floatformat_ieee_half_big;
+extern const struct floatformat floatformat_ieee_half_little;
+extern const struct floatformat floatformat_ieee_single_big;
+extern const struct floatformat floatformat_ieee_single_little;
+extern const struct floatformat floatformat_ieee_double_big;
+extern const struct floatformat floatformat_ieee_double_little;
+
+/* floatformat for ARM IEEE double, little endian bytes and big endian words */
+
+extern const struct floatformat floatformat_ieee_double_littlebyte_bigword;
+
+/* floatformats for VAX.  */
+
+extern const struct floatformat floatformat_vax_f;
+extern const struct floatformat floatformat_vax_d;
+extern const struct floatformat floatformat_vax_g;
+
+/* floatformats for various extendeds.  */
+
+extern const struct floatformat floatformat_i387_ext;
+extern const struct floatformat floatformat_m68881_ext;
+extern const struct floatformat floatformat_i960_ext;
+extern const struct floatformat floatformat_m88110_ext;
+extern const struct floatformat floatformat_m88110_harris_ext;
+extern const struct floatformat floatformat_arm_ext_big;
+extern const struct floatformat floatformat_arm_ext_littlebyte_bigword;
+/* IA-64 Floating Point register spilt into memory.  */
+extern const struct floatformat floatformat_ia64_spill_big;
+extern const struct floatformat floatformat_ia64_spill_little;
+extern const struct floatformat floatformat_ia64_quad_big;
+extern const struct floatformat floatformat_ia64_quad_little;
+/* IBM long double (double+double).  */
+extern const struct floatformat floatformat_ibm_long_double;
+
+/* Convert from FMT to a double.
+   FROM is the address of the extended float.
+   Store the double in *TO.  */
+
+extern void
+floatformat_to_double (const struct floatformat *, const void *, double *);
+
+/* The converse: convert the double *FROM to FMT
+   and store where TO points.  */
+
+extern void
+floatformat_from_double (const struct floatformat *, const double *, void *);
+
+/* Return non-zero iff the data at FROM is a valid number in format FMT.  */
+
+extern int
+floatformat_is_valid (const struct floatformat *fmt, const void *from);
+
+#endif	/* defined (FLOATFORMAT_H) */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/fnmatch.h sdcc-3.2.0+dfsg/support/sdbinutils/include/fnmatch.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/fnmatch.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/fnmatch.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,70 @@
+/* Copyright 1991, 1992, 1993, 1996 Free Software Foundation, Inc.
+
+NOTE: The canonical source of this file is maintained with the GNU C Library.
+Bugs can be reported to bug-glibc@prep.ai.mit.edu.
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#ifndef	_FNMATCH_H
+
+#define	_FNMATCH_H	1
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#if defined (__cplusplus) || (defined (__STDC__) && __STDC__)
+#undef	__P
+#define	__P(args)	args
+#else /* Not C++ or ANSI C.  */
+#undef	__P
+#define	__P(args)	()
+/* We can get away without defining `const' here only because in this file
+   it is used only inside the prototype for `fnmatch', which is elided in
+   non-ANSI C where `const' is problematical.  */
+#endif /* C++ or ANSI C.  */
+
+
+/* We #undef these before defining them because some losing systems
+   (HP-UX A.08.07 for example) define these in <unistd.h>.  */
+#undef	FNM_PATHNAME
+#undef	FNM_NOESCAPE
+#undef	FNM_PERIOD
+
+/* Bits set in the FLAGS argument to `fnmatch'.  */
+#define	FNM_PATHNAME	(1 << 0) /* No wildcard can ever match `/'.  */
+#define	FNM_NOESCAPE	(1 << 1) /* Backslashes don't quote special chars.  */
+#define	FNM_PERIOD	(1 << 2) /* Leading `.' is matched only explicitly.  */
+
+#if !defined (_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 2 || defined (_GNU_SOURCE)
+#define	FNM_FILE_NAME	FNM_PATHNAME /* Preferred GNU name.  */
+#define	FNM_LEADING_DIR	(1 << 3) /* Ignore `/...' after a match.  */
+#define	FNM_CASEFOLD	(1 << 4) /* Compare without regard to case.  */
+#endif
+
+/* Value returned by `fnmatch' if STRING does not match PATTERN.  */
+#define	FNM_NOMATCH	1
+
+/* Match STRING against the filename pattern PATTERN,
+   returning zero if it matches, FNM_NOMATCH if not.  */
+extern int fnmatch __P ((const char *__pattern, const char *__string,
+			 int __flags));
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif /* fnmatch.h */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/fopen-bin.h sdcc-3.2.0+dfsg/support/sdbinutils/include/fopen-bin.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/fopen-bin.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/fopen-bin.h	2012-02-11 19:42:15.000000000 +0000
@@ -0,0 +1,27 @@
+/* Macros for the 'type' part of an fopen, freopen or fdopen. 
+
+	<Read|Write>[Update]<Binary file|text file>
+
+   This version is for "binary" systems, where text and binary files are
+   different.  An example is Mess-Dose.  Many Unix systems could also
+   cope with a "b" in the string, indicating binary files, but some reject this
+   (and thereby don't conform to ANSI C, but what else is new?).
+
+   This file is designed for inclusion by host-dependent .h files.  No
+   user application should include it directly, since that would make
+   the application unable to be configured for both "same" and "binary"
+   variant systems.  */
+
+#define FOPEN_RB	"rb"
+#define FOPEN_WB 	"wb"
+#define FOPEN_AB 	"ab"
+#define FOPEN_RUB 	"r+b"
+#define FOPEN_WUB 	"w+b"
+#define FOPEN_AUB 	"a+b"
+
+#define FOPEN_RT	"r"
+#define FOPEN_WT 	"w"
+#define FOPEN_AT 	"a"
+#define FOPEN_RUT 	"r+"
+#define FOPEN_WUT 	"w+"
+#define FOPEN_AUT 	"a+"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/fopen-same.h sdcc-3.2.0+dfsg/support/sdbinutils/include/fopen-same.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/fopen-same.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/fopen-same.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,27 @@
+/* Macros for the 'type' part of an fopen, freopen or fdopen. 
+
+	<Read|Write>[Update]<Binary file|text file>
+
+   This version is for "same" systems, where text and binary files are
+   the same.  An example is Unix.  Many Unix systems could also add a
+   "b" to the string, indicating binary files, but some reject this
+   (and thereby don't conform to ANSI C, but what else is new?).
+
+   This file is designed for inclusion by host-dependent .h files.  No
+   user application should include it directly, since that would make
+   the application unable to be configured for both "same" and "binary"
+   variant systems.  */
+
+#define FOPEN_RB	"r"
+#define FOPEN_WB 	"w"
+#define FOPEN_AB 	"a"
+#define FOPEN_RUB 	"r+"
+#define FOPEN_WUB 	"w+"
+#define FOPEN_AUB 	"a+"
+
+#define FOPEN_RT	"r"
+#define FOPEN_WT 	"w"
+#define FOPEN_AT 	"a"
+#define FOPEN_RUT 	"r+"
+#define FOPEN_WUT 	"w+"
+#define FOPEN_AUT 	"a+"
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/getopt.h sdcc-3.2.0+dfsg/support/sdbinutils/include/getopt.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/getopt.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/getopt.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,144 @@
+/* Declarations for getopt.
+   Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 2000,
+   2002 Free Software Foundation, Inc.
+
+   NOTE: The canonical source of this file is maintained with the GNU C Library.
+   Bugs can be reported to bug-glibc@gnu.org.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+#ifndef _GETOPT_H
+#define _GETOPT_H 1
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when `ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
+
+extern char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to `getopt'.
+
+   On entry to `getopt', zero means this is the first call; initialize.
+
+   When `getopt' returns -1, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, `optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+extern int optind;
+
+/* Callers store zero here to inhibit the error message `getopt' prints
+   for unrecognized options.  */
+
+extern int opterr;
+
+/* Set to an option character which was unrecognized.  */
+
+extern int optopt;
+
+/* Describe the long-named options requested by the application.
+   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
+   of `struct option' terminated by an element containing a name which is
+   zero.
+
+   The field `has_arg' is:
+   no_argument		(or 0) if the option does not take an argument,
+   required_argument	(or 1) if the option requires an argument,
+   optional_argument 	(or 2) if the option takes an optional argument.
+
+   If the field `flag' is not NULL, it points to a variable that is set
+   to the value given in the field `val' when the option is found, but
+   left unchanged if the option is not found.
+
+   To have a long-named option do something other than set an `int' to
+   a compiled-in constant, such as set a value from `optarg', set the
+   option's `flag' field to zero and its `val' field to a nonzero
+   value (the equivalent single-letter option character, if there is
+   one).  For long options that have a zero `flag' field, `getopt'
+   returns the contents of the `val' field.  */
+
+struct option
+{
+#if defined (__STDC__) && __STDC__
+  const char *name;
+#else
+  char *name;
+#endif
+  /* has_arg can't be an enum because some compilers complain about
+     type mismatches in all the code that assumes it is an int.  */
+  int has_arg;
+  int *flag;
+  int val;
+};
+
+/* Names for the values of the `has_arg' field of `struct option'.  */
+
+#define	no_argument		0
+#define required_argument	1
+#define optional_argument	2
+
+#if defined (__STDC__) && __STDC__
+/* HAVE_DECL_* is a three-state macro: undefined, 0 or 1.  If it is
+   undefined, we haven't run the autoconf check so provide the
+   declaration without arguments.  If it is 0, we checked and failed
+   to find the declaration so provide a fully prototyped one.  If it
+   is 1, we found it so don't provide any declaration at all.  */
+#if !HAVE_DECL_GETOPT
+#if defined (__GNU_LIBRARY__) || defined (HAVE_DECL_GETOPT)
+/* Many other libraries have conflicting prototypes for getopt, with
+   differences in the consts, in unistd.h.  To avoid compilation
+   errors, only prototype getopt for the GNU C library.  */
+extern int getopt (int argc, char *const *argv, const char *shortopts);
+#else
+#ifndef __cplusplus
+extern int getopt ();
+#endif /* __cplusplus */
+#endif
+#endif /* !HAVE_DECL_GETOPT */
+
+extern int getopt_long (int argc, char *const *argv, const char *shortopts,
+		        const struct option *longopts, int *longind);
+extern int getopt_long_only (int argc, char *const *argv,
+			     const char *shortopts,
+		             const struct option *longopts, int *longind);
+
+/* Internal only.  Users should not call this directly.  */
+extern int _getopt_internal (int argc, char *const *argv,
+			     const char *shortopts,
+		             const struct option *longopts, int *longind,
+			     int long_only);
+#else /* not __STDC__ */
+extern int getopt ();
+extern int getopt_long ();
+extern int getopt_long_only ();
+
+extern int _getopt_internal ();
+#endif /* __STDC__ */
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif /* getopt.h */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/hashtab.h sdcc-3.2.0+dfsg/support/sdbinutils/include/hashtab.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/hashtab.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/hashtab.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,209 @@
+/* An expandable hash tables datatype.  
+   Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2009, 2010
+   Free Software Foundation, Inc.
+   Contributed by Vladimir Makarov (vmakarov@cygnus.com).
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* This package implements basic hash table functionality.  It is possible
+   to search for an entry, create an entry and destroy an entry.
+
+   Elements in the table are generic pointers.
+
+   The size of the table is not fixed; if the occupancy of the table
+   grows too high the hash table will be expanded.
+
+   The abstract data implementation is based on generalized Algorithm D
+   from Knuth's book "The art of computer programming".  Hash table is
+   expanded by creation of new hash table and transferring elements from
+   the old table to the new table.  */
+
+#ifndef __HASHTAB_H__
+#define __HASHTAB_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include "ansidecl.h"
+
+#ifndef GTY
+#define GTY(X)
+#endif
+
+/* The type for a hash code.  */
+typedef unsigned int hashval_t;
+
+/* Callback function pointer types.  */
+
+/* Calculate hash of a table entry.  */
+typedef hashval_t (*htab_hash) (const void *);
+
+/* Compare a table entry with a possible entry.  The entry already in
+   the table always comes first, so the second element can be of a
+   different type (but in this case htab_find and htab_find_slot
+   cannot be used; instead the variants that accept a hash value
+   must be used).  */
+typedef int (*htab_eq) (const void *, const void *);
+
+/* Cleanup function called whenever a live element is removed from
+   the hash table.  */
+typedef void (*htab_del) (void *);
+  
+/* Function called by htab_traverse for each live element.  The first
+   arg is the slot of the element (which can be passed to htab_clear_slot
+   if desired), the second arg is the auxiliary pointer handed to
+   htab_traverse.  Return 1 to continue scan, 0 to stop.  */
+typedef int (*htab_trav) (void **, void *);
+
+/* Memory-allocation function, with the same functionality as calloc().
+   Iff it returns NULL, the hash table implementation will pass an error
+   code back to the user, so if your code doesn't handle errors,
+   best if you use xcalloc instead.  */
+typedef void *(*htab_alloc) (size_t, size_t);
+
+/* We also need a free() routine.  */
+typedef void (*htab_free) (void *);
+
+/* Memory allocation and deallocation; variants which take an extra
+   argument.  */
+typedef void *(*htab_alloc_with_arg) (void *, size_t, size_t);
+typedef void (*htab_free_with_arg) (void *, void *);
+
+/* This macro defines reserved value for empty table entry.  */
+
+#define HTAB_EMPTY_ENTRY    ((PTR) 0)
+
+/* This macro defines reserved value for table entry which contained
+   a deleted element. */
+
+#define HTAB_DELETED_ENTRY  ((PTR) 1)
+
+/* Hash tables are of the following type.  The structure
+   (implementation) of this type is not needed for using the hash
+   tables.  All work with hash table should be executed only through
+   functions mentioned below.  The size of this structure is subject to
+   change.  */
+
+struct GTY(()) htab {
+  /* Pointer to hash function.  */
+  htab_hash hash_f;
+
+  /* Pointer to comparison function.  */
+  htab_eq eq_f;
+
+  /* Pointer to cleanup function.  */
+  htab_del del_f;
+
+  /* Table itself.  */
+  void ** GTY ((use_param, length ("%h.size"))) entries;
+
+  /* Current size (in entries) of the hash table.  */
+  size_t size;
+
+  /* Current number of elements including also deleted elements.  */
+  size_t n_elements;
+
+  /* Current number of deleted elements in the table.  */
+  size_t n_deleted;
+
+  /* The following member is used for debugging. Its value is number
+     of all calls of `htab_find_slot' for the hash table. */
+  unsigned int searches;
+
+  /* The following member is used for debugging.  Its value is number
+     of collisions fixed for time of work with the hash table. */
+  unsigned int collisions;
+
+  /* Pointers to allocate/free functions.  */
+  htab_alloc alloc_f;
+  htab_free free_f;
+
+  /* Alternate allocate/free functions, which take an extra argument.  */
+  void * GTY((skip)) alloc_arg;
+  htab_alloc_with_arg alloc_with_arg_f;
+  htab_free_with_arg free_with_arg_f;
+
+  /* Current size (in entries) of the hash table, as an index into the
+     table of primes.  */
+  unsigned int size_prime_index;
+};
+
+typedef struct htab *htab_t;
+
+/* An enum saying whether we insert into the hash table or not.  */
+enum insert_option {NO_INSERT, INSERT};
+
+/* The prototypes of the package functions. */
+
+extern htab_t	htab_create_alloc  (size_t, htab_hash,
+                                    htab_eq, htab_del,
+                                    htab_alloc, htab_free);
+
+extern htab_t	htab_create_alloc_ex (size_t, htab_hash,
+                                      htab_eq, htab_del,
+                                      void *, htab_alloc_with_arg,
+                                      htab_free_with_arg);
+
+extern htab_t  htab_create_typed_alloc (size_t, htab_hash, htab_eq, htab_del,
+					htab_alloc, htab_alloc, htab_free);
+
+/* Backward-compatibility functions.  */
+extern htab_t htab_create (size_t, htab_hash, htab_eq, htab_del);
+extern htab_t htab_try_create (size_t, htab_hash, htab_eq, htab_del);
+
+extern void	htab_set_functions_ex (htab_t, htab_hash,
+                                       htab_eq, htab_del,
+                                       void *, htab_alloc_with_arg,
+                                       htab_free_with_arg);
+
+extern void	htab_delete (htab_t);
+extern void	htab_empty (htab_t);
+
+extern void *	htab_find (htab_t, const void *);
+extern void **	htab_find_slot (htab_t, const void *, enum insert_option);
+extern void *	htab_find_with_hash (htab_t, const void *, hashval_t);
+extern void **	htab_find_slot_with_hash (htab_t, const void *,
+					  hashval_t, enum insert_option);
+extern void	htab_clear_slot	(htab_t, void **);
+extern void	htab_remove_elt	(htab_t, void *);
+extern void	htab_remove_elt_with_hash (htab_t, void *, hashval_t);
+
+extern void	htab_traverse (htab_t, htab_trav, void *);
+extern void	htab_traverse_noresize (htab_t, htab_trav, void *);
+
+extern size_t	htab_size (htab_t);
+extern size_t	htab_elements (htab_t);
+extern double	htab_collisions	(htab_t);
+
+/* A hash function for pointers.  */
+extern htab_hash htab_hash_pointer;
+
+/* An equality function for pointers.  */
+extern htab_eq htab_eq_pointer;
+
+/* A hash function for null-terminated strings.  */
+extern hashval_t htab_hash_string (const void *);
+
+/* An iterative hash function for arbitrary data.  */
+extern hashval_t iterative_hash (const void *, size_t, hashval_t);
+/* Shorthand for hashing something with an intrinsic size.  */
+#define iterative_hash_object(OB,INIT) iterative_hash (&OB, sizeof (OB), INIT)
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __HASHTAB_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/libiberty.h sdcc-3.2.0+dfsg/support/sdbinutils/include/libiberty.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/libiberty.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/libiberty.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,682 @@
+/* Function declarations for libiberty.
+
+   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   
+   Note - certain prototypes declared in this header file are for
+   functions whoes implementation copyright does not belong to the
+   FSF.  Those prototypes are present in this file for reference
+   purposes only and their presence in this file should not construed
+   as an indication of ownership by the FSF of the implementation of
+   those functions in any way or form whatsoever.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.
+   
+   Written by Cygnus Support, 1994.
+
+   The libiberty library provides a number of functions which are
+   missing on some operating systems.  We do not declare those here,
+   to avoid conflicts with the system header files on operating
+   systems that do support those functions.  In this file we only
+   declare those functions which are specific to libiberty.  */
+
+#ifndef LIBIBERTY_H
+#define LIBIBERTY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "ansidecl.h"
+
+/* Get a definition for size_t.  */
+#include <stddef.h>
+/* Get a definition for va_list.  */
+#include <stdarg.h>
+
+#include <stdio.h>
+
+/* If the OS supports it, ensure that the supplied stream is setup to
+   avoid any multi-threaded locking.  Otherwise leave the FILE pointer
+   unchanged.  If the stream is NULL do nothing.  */
+
+extern void unlock_stream (FILE *);
+
+/* If the OS supports it, ensure that the standard I/O streams, stdin,
+   stdout and stderr are setup to avoid any multi-threaded locking.
+   Otherwise do nothing.  */
+
+extern void unlock_std_streams (void);
+
+/* Open and return a FILE pointer.  If the OS supports it, ensure that
+   the stream is setup to avoid any multi-threaded locking.  Otherwise
+   return the FILE pointer unchanged.  */
+
+extern FILE *fopen_unlocked (const char *, const char *);
+extern FILE *fdopen_unlocked (int, const char *);
+extern FILE *freopen_unlocked (const char *, const char *, FILE *);
+
+/* Build an argument vector from a string.  Allocates memory using
+   malloc.  Use freeargv to free the vector.  */
+
+extern char **buildargv (const char *) ATTRIBUTE_MALLOC;
+
+/* Free a vector returned by buildargv.  */
+
+extern void freeargv (char **);
+
+/* Duplicate an argument vector. Allocates memory using malloc.  Use
+   freeargv to free the vector.  */
+
+extern char **dupargv (char **) ATTRIBUTE_MALLOC;
+
+/* Expand "@file" arguments in argv.  */
+
+extern void expandargv PARAMS ((int *, char ***));
+
+/* Write argv to an @-file, inserting necessary quoting.  */
+
+extern int writeargv PARAMS ((char **, FILE *));
+
+/* Return the last component of a path name.  Note that we can't use a
+   prototype here because the parameter is declared inconsistently
+   across different systems, sometimes as "char *" and sometimes as
+   "const char *" */
+
+/* HAVE_DECL_* is a three-state macro: undefined, 0 or 1.  If it is
+   undefined, we haven't run the autoconf check so provide the
+   declaration without arguments.  If it is 0, we checked and failed
+   to find the declaration so provide a fully prototyped one.  If it
+   is 1, we found it so don't provide any declaration at all.  */
+#if !HAVE_DECL_BASENAME
+#if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined(__NetBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (__MINGW32__) || defined (HAVE_DECL_BASENAME)
+extern char *basename (const char *);
+#else
+/* Do not allow basename to be used if there is no prototype seen.  We
+   either need to use the above prototype or have one from
+   autoconf which would result in HAVE_DECL_BASENAME being set.  */
+#define basename basename_cannot_be_used_without_a_prototype
+#endif
+#endif
+
+/* A well-defined basename () that is always compiled in.  */
+
+extern const char *lbasename (const char *);
+
+/* Same, but assumes DOS semantics (drive name, backslash is also a
+   dir separator) regardless of host.  */
+
+extern const char *dos_lbasename (const char *);
+
+/* Same, but assumes Unix semantics (absolute paths always start with
+   a slash, only forward slash is accepted as dir separator)
+   regardless of host.  */
+
+extern const char *unix_lbasename (const char *);
+
+/* A well-defined realpath () that is always compiled in.  */
+
+extern char *lrealpath (const char *);
+
+/* Concatenate an arbitrary number of strings.  You must pass NULL as
+   the last argument of this function, to terminate the list of
+   strings.  Allocates memory using xmalloc.  */
+
+extern char *concat (const char *, ...) ATTRIBUTE_MALLOC ATTRIBUTE_SENTINEL;
+
+/* Concatenate an arbitrary number of strings.  You must pass NULL as
+   the last argument of this function, to terminate the list of
+   strings.  Allocates memory using xmalloc.  The first argument is
+   not one of the strings to be concatenated, but if not NULL is a
+   pointer to be freed after the new string is created, similar to the
+   way xrealloc works.  */
+
+extern char *reconcat (char *, const char *, ...) ATTRIBUTE_MALLOC ATTRIBUTE_SENTINEL;
+
+/* Determine the length of concatenating an arbitrary number of
+   strings.  You must pass NULL as the last argument of this function,
+   to terminate the list of strings.  */
+
+extern unsigned long concat_length (const char *, ...) ATTRIBUTE_SENTINEL;
+
+/* Concatenate an arbitrary number of strings into a SUPPLIED area of
+   memory.  You must pass NULL as the last argument of this function,
+   to terminate the list of strings.  The supplied memory is assumed
+   to be large enough.  */
+
+extern char *concat_copy (char *, const char *, ...) ATTRIBUTE_SENTINEL;
+
+/* Concatenate an arbitrary number of strings into a GLOBAL area of
+   memory.  You must pass NULL as the last argument of this function,
+   to terminate the list of strings.  The supplied memory is assumed
+   to be large enough.  */
+
+extern char *concat_copy2 (const char *, ...) ATTRIBUTE_SENTINEL;
+
+/* This is the global area used by concat_copy2.  */
+
+extern char *libiberty_concat_ptr;
+
+/* Concatenate an arbitrary number of strings.  You must pass NULL as
+   the last argument of this function, to terminate the list of
+   strings.  Allocates memory using alloca.  The arguments are
+   evaluated twice!  */
+#define ACONCAT(ACONCAT_PARAMS) \
+  (libiberty_concat_ptr = (char *) alloca (concat_length ACONCAT_PARAMS + 1), \
+   concat_copy2 ACONCAT_PARAMS)
+
+/* Check whether two file descriptors refer to the same file.  */
+
+extern int fdmatch (int fd1, int fd2);
+
+/* Return the position of the first bit set in the argument.  */
+/* Prototypes vary from system to system, so we only provide a
+   prototype on systems where we know that we need it.  */
+#if defined (HAVE_DECL_FFS) && !HAVE_DECL_FFS
+extern int ffs(int);
+#endif
+
+/* Get the working directory.  The result is cached, so don't call
+   chdir() between calls to getpwd().  */
+
+extern char * getpwd (void);
+
+/* Get the current time.  */
+/* Prototypes vary from system to system, so we only provide a
+   prototype on systems where we know that we need it.  */
+#ifdef __MINGW32__
+/* Forward declaration to avoid #include <sys/time.h>.   */
+struct timeval;
+extern int gettimeofday (struct timeval *, void *); 
+#endif
+
+/* Get the amount of time the process has run, in microseconds.  */
+
+extern long get_run_time (void);
+
+/* Generate a relocated path to some installation directory.  Allocates
+   return value using malloc.  */
+
+extern char *make_relative_prefix (const char *, const char *,
+                                   const char *) ATTRIBUTE_MALLOC;
+
+/* Generate a relocated path to some installation directory without
+   attempting to follow any soft links.  Allocates
+   return value using malloc.  */
+
+extern char *make_relative_prefix_ignore_links (const char *, const char *,
+						const char *) ATTRIBUTE_MALLOC;
+
+/* Choose a temporary directory to use for scratch files.  */
+
+extern char *choose_temp_base (void) ATTRIBUTE_MALLOC;
+
+/* Return a temporary file name or NULL if unable to create one.  */
+
+extern char *make_temp_file (const char *) ATTRIBUTE_MALLOC;
+
+/* Remove a link to a file unless it is special. */
+
+extern int unlink_if_ordinary (const char *);
+
+/* Allocate memory filled with spaces.  Allocates using malloc.  */
+
+extern const char *spaces (int count);
+
+/* Return the maximum error number for which strerror will return a
+   string.  */
+
+extern int errno_max (void);
+
+/* Return the name of an errno value (e.g., strerrno (EINVAL) returns
+   "EINVAL").  */
+
+extern const char *strerrno (int);
+
+/* Given the name of an errno value, return the value.  */
+
+extern int strtoerrno (const char *);
+
+/* ANSI's strerror(), but more robust.  */
+
+extern char *xstrerror (int);
+
+/* Return the maximum signal number for which strsignal will return a
+   string.  */
+
+extern int signo_max (void);
+
+/* Return a signal message string for a signal number
+   (e.g., strsignal (SIGHUP) returns something like "Hangup").  */
+/* This is commented out as it can conflict with one in system headers.
+   We still document its existence though.  */
+
+/*extern const char *strsignal (int);*/
+
+/* Return the name of a signal number (e.g., strsigno (SIGHUP) returns
+   "SIGHUP").  */
+
+extern const char *strsigno (int);
+
+/* Given the name of a signal, return its number.  */
+
+extern int strtosigno (const char *);
+
+/* Register a function to be run by xexit.  Returns 0 on success.  */
+
+extern int xatexit (void (*fn) (void));
+
+/* Exit, calling all the functions registered with xatexit.  */
+
+extern void xexit (int status) ATTRIBUTE_NORETURN;
+
+/* Set the program name used by xmalloc.  */
+
+extern void xmalloc_set_program_name (const char *);
+
+/* Report an allocation failure.  */
+extern void xmalloc_failed (size_t) ATTRIBUTE_NORETURN;
+
+/* Allocate memory without fail.  If malloc fails, this will print a
+   message to stderr (using the name set by xmalloc_set_program_name,
+   if any) and then call xexit.  */
+
+extern void *xmalloc (size_t) ATTRIBUTE_MALLOC;
+
+/* Reallocate memory without fail.  This works like xmalloc.  Note,
+   realloc type functions are not suitable for attribute malloc since
+   they may return the same address across multiple calls. */
+
+extern void *xrealloc (void *, size_t);
+
+/* Allocate memory without fail and set it to zero.  This works like
+   xmalloc.  */
+
+extern void *xcalloc (size_t, size_t) ATTRIBUTE_MALLOC;
+
+/* Copy a string into a memory buffer without fail.  */
+
+extern char *xstrdup (const char *) ATTRIBUTE_MALLOC;
+
+/* Copy at most N characters from string into a buffer without fail.  */
+
+extern char *xstrndup (const char *, size_t) ATTRIBUTE_MALLOC;
+
+/* Copy an existing memory buffer to a new memory buffer without fail.  */
+
+extern void *xmemdup (const void *, size_t, size_t) ATTRIBUTE_MALLOC;
+
+/* Physical memory routines.  Return values are in BYTES.  */
+extern double physmem_total (void);
+extern double physmem_available (void);
+
+/* Compute the 32-bit CRC of a block of memory.  */
+extern unsigned int xcrc32 (const unsigned char *, int, unsigned int);
+
+/* These macros provide a K&R/C89/C++-friendly way of allocating structures
+   with nice encapsulation.  The XDELETE*() macros are technically
+   superfluous, but provided here for symmetry.  Using them consistently
+   makes it easier to update client code to use different allocators such
+   as new/delete and new[]/delete[].  */
+
+/* Scalar allocators.  */
+
+#define XALLOCA(T)		((T *) alloca (sizeof (T)))
+#define XNEW(T)			((T *) xmalloc (sizeof (T)))
+#define XCNEW(T)		((T *) xcalloc (1, sizeof (T)))
+#define XDUP(T, P)		((T *) xmemdup ((P), sizeof (T), sizeof (T)))
+#define XDELETE(P)		free ((void*) (P))
+
+/* Array allocators.  */
+
+#define XALLOCAVEC(T, N)	((T *) alloca (sizeof (T) * (N)))
+#define XNEWVEC(T, N)		((T *) xmalloc (sizeof (T) * (N)))
+#define XCNEWVEC(T, N)		((T *) xcalloc ((N), sizeof (T)))
+#define XDUPVEC(T, P, N)	((T *) xmemdup ((P), sizeof (T) * (N), sizeof (T) * (N)))
+#define XRESIZEVEC(T, P, N)	((T *) xrealloc ((void *) (P), sizeof (T) * (N)))
+#define XDELETEVEC(P)		free ((void*) (P))
+
+/* Allocators for variable-sized structures and raw buffers.  */
+
+#define XALLOCAVAR(T, S)	((T *) alloca ((S)))
+#define XNEWVAR(T, S)		((T *) xmalloc ((S)))
+#define XCNEWVAR(T, S)		((T *) xcalloc (1, (S)))
+#define XDUPVAR(T, P, S1, S2)	((T *) xmemdup ((P), (S1), (S2)))
+#define XRESIZEVAR(T, P, S)	((T *) xrealloc ((P), (S)))
+
+/* Type-safe obstack allocator.  */
+
+#define XOBNEW(O, T)		((T *) obstack_alloc ((O), sizeof (T)))
+#define XOBNEWVEC(O, T, N)	((T *) obstack_alloc ((O), sizeof (T) * (N)))
+#define XOBNEWVAR(O, T, S)	((T *) obstack_alloc ((O), (S)))
+#define XOBFINISH(O, T)         ((T) obstack_finish ((O)))
+
+/* hex character manipulation routines */
+
+#define _hex_array_size 256
+#define _hex_bad	99
+extern const unsigned char _hex_value[_hex_array_size];
+extern void hex_init (void);
+#define hex_p(c)	(hex_value (c) != _hex_bad)
+/* If you change this, note well: Some code relies on side effects in
+   the argument being performed exactly once.  */
+#define hex_value(c)	((unsigned int) _hex_value[(unsigned char) (c)])
+
+/* Flags for pex_init.  These are bits to be or'ed together.  */
+
+/* Record subprocess times, if possible.  */
+#define PEX_RECORD_TIMES	0x1
+
+/* Use pipes for communication between processes, if possible.  */
+#define PEX_USE_PIPES		0x2
+
+/* Save files used for communication between processes.  */
+#define PEX_SAVE_TEMPS		0x4
+
+/* Prepare to execute one or more programs, with standard output of
+   each program fed to standard input of the next.
+   FLAGS	As above.
+   PNAME	The name of the program to report in error messages.
+   TEMPBASE	A base name to use for temporary files; may be NULL to
+   		use a random name.
+   Returns NULL on error.  */
+
+extern struct pex_obj *pex_init (int flags, const char *pname,
+				 const char *tempbase);
+
+/* Flags for pex_run.  These are bits to be or'ed together.  */
+
+/* Last program in pipeline.  Standard output of program goes to
+   OUTNAME, or, if OUTNAME is NULL, to standard output of caller.  Do
+   not set this if you want to call pex_read_output.  After this is
+   set, pex_run may no longer be called with the same struct
+   pex_obj.  */
+#define PEX_LAST		0x1
+
+/* Search for program in executable search path.  */
+#define PEX_SEARCH		0x2
+
+/* OUTNAME is a suffix.  */
+#define PEX_SUFFIX		0x4
+
+/* Send program's standard error to standard output.  */
+#define PEX_STDERR_TO_STDOUT	0x8
+
+/* Input file should be opened in binary mode.  This flag is ignored
+   on Unix.  */
+#define PEX_BINARY_INPUT	0x10
+
+/* Output file should be opened in binary mode.  This flag is ignored
+   on Unix.  For proper behaviour PEX_BINARY_INPUT and
+   PEX_BINARY_OUTPUT have to match appropriately--i.e., a call using
+   PEX_BINARY_OUTPUT should be followed by a call using
+   PEX_BINARY_INPUT.  */
+#define PEX_BINARY_OUTPUT	0x20
+
+/* Capture stderr to a pipe.  The output can be read by
+   calling pex_read_err and reading from the returned
+   FILE object.  This flag may be specified only for
+   the last program in a pipeline.  
+
+   This flag is supported only on Unix and Windows.  */
+#define PEX_STDERR_TO_PIPE	0x40
+
+/* Capture stderr in binary mode.  This flag is ignored
+   on Unix.  */
+#define PEX_BINARY_ERROR	0x80
+
+
+/* Execute one program.  Returns NULL on success.  On error returns an
+   error string (typically just the name of a system call); the error
+   string is statically allocated.
+
+   OBJ		Returned by pex_init.
+
+   FLAGS	As above.
+
+   EXECUTABLE	The program to execute.
+
+   ARGV		NULL terminated array of arguments to pass to the program.
+
+   OUTNAME	Sets the output file name as follows:
+
+		PEX_SUFFIX set (OUTNAME may not be NULL):
+		  TEMPBASE parameter to pex_init not NULL:
+		    Output file name is the concatenation of TEMPBASE
+		    and OUTNAME.
+		  TEMPBASE is NULL:
+		    Output file name is a random file name ending in
+		    OUTNAME.
+		PEX_SUFFIX not set:
+		  OUTNAME not NULL:
+		    Output file name is OUTNAME.
+		  OUTNAME NULL, TEMPBASE not NULL:
+		    Output file name is randomly chosen using
+		    TEMPBASE.
+		  OUTNAME NULL, TEMPBASE NULL:
+		    Output file name is randomly chosen.
+
+		If PEX_LAST is not set, the output file name is the
+   		name to use for a temporary file holding stdout, if
+   		any (there will not be a file if PEX_USE_PIPES is set
+   		and the system supports pipes).  If a file is used, it
+   		will be removed when no longer needed unless
+   		PEX_SAVE_TEMPS is set.
+
+		If PEX_LAST is set, and OUTNAME is not NULL, standard
+   		output is written to the output file name.  The file
+   		will not be removed.  If PEX_LAST and PEX_SUFFIX are
+   		both set, TEMPBASE may not be NULL.
+
+   ERRNAME	If not NULL, this is the name of a file to which
+		standard error is written.  If NULL, standard error of
+		the program is standard error of the caller.
+
+   ERR		On an error return, *ERR is set to an errno value, or
+   		to 0 if there is no relevant errno.
+*/
+
+extern const char *pex_run (struct pex_obj *obj, int flags,
+			    const char *executable, char * const *argv,
+			    const char *outname, const char *errname,
+			    int *err);
+
+/* As for pex_run (), but takes an extra parameter to enable the
+   environment for the child process to be specified.
+
+   ENV		The environment for the child process, specified as
+		an array of character pointers.  Each element of the
+		array should point to a string of the form VAR=VALUE,
+                with the exception of the last element which must be
+                a null pointer.
+*/
+
+extern const char *pex_run_in_environment (struct pex_obj *obj, int flags,
+			                   const char *executable,
+                                           char * const *argv,
+                                           char * const *env,
+              	          		   const char *outname,
+					   const char *errname, int *err);
+
+/* Return a stream for a temporary file to pass to the first program
+   in the pipeline as input.  The file name is chosen as for pex_run.
+   pex_run closes the file automatically; don't close it yourself.  */
+
+extern FILE *pex_input_file (struct pex_obj *obj, int flags,
+                             const char *in_name);
+
+/* Return a stream for a pipe connected to the standard input of the
+   first program in the pipeline.  You must have passed
+   `PEX_USE_PIPES' to `pex_init'.  Close the returned stream
+   yourself.  */
+
+extern FILE *pex_input_pipe (struct pex_obj *obj, int binary);
+
+/* Read the standard output of the last program to be executed.
+   pex_run can not be called after this.  BINARY should be non-zero if
+   the file should be opened in binary mode; this is ignored on Unix.
+   Returns NULL on error.  Don't call fclose on the returned FILE; it
+   will be closed by pex_free.  */
+
+extern FILE *pex_read_output (struct pex_obj *, int binary);
+
+/* Read the standard error of the last program to be executed.
+   pex_run can not be called after this.  BINARY should be non-zero if
+   the file should be opened in binary mode; this is ignored on Unix.
+   Returns NULL on error.  Don't call fclose on the returned FILE; it
+   will be closed by pex_free.  */
+
+extern FILE *pex_read_err (struct pex_obj *, int binary);
+
+/* Return exit status of all programs in VECTOR.  COUNT indicates the
+   size of VECTOR.  The status codes in the vector are in the order of
+   the calls to pex_run.  Returns 0 on error, 1 on success.  */
+
+extern int pex_get_status (struct pex_obj *, int count, int *vector);
+
+/* Return times of all programs in VECTOR.  COUNT indicates the size
+   of VECTOR.  struct pex_time is really just struct timeval, but that
+   is not portable to all systems.  Returns 0 on error, 1 on
+   success.  */
+
+struct pex_time
+{
+  unsigned long user_seconds;
+  unsigned long user_microseconds;
+  unsigned long system_seconds;
+  unsigned long system_microseconds;
+};
+
+extern int pex_get_times (struct pex_obj *, int count,
+			  struct pex_time *vector);
+
+/* Clean up a pex_obj.  If you have not called pex_get_times or
+   pex_get_status, this will try to kill the subprocesses.  */
+
+extern void pex_free (struct pex_obj *);
+
+/* Just execute one program.  Return value is as for pex_run.
+   FLAGS	Combination of PEX_SEARCH and PEX_STDERR_TO_STDOUT.
+   EXECUTABLE	As for pex_run.
+   ARGV		As for pex_run.
+   PNAME	As for pex_init.
+   OUTNAME	As for pex_run when PEX_LAST is set.
+   ERRNAME	As for pex_run.
+   STATUS	Set to exit status on success.
+   ERR		As for pex_run.
+*/
+
+extern const char *pex_one (int flags, const char *executable,
+			    char * const *argv, const char *pname,
+			    const char *outname, const char *errname,
+			    int *status, int *err);
+
+/* pexecute and pwait are the old pexecute interface, still here for
+   backward compatibility.  Don't use these for new code.  Instead,
+   use pex_init/pex_run/pex_get_status/pex_free, or pex_one.  */
+
+/* Definitions used by the pexecute routine.  */
+
+#define PEXECUTE_FIRST   1
+#define PEXECUTE_LAST    2
+#define PEXECUTE_ONE     (PEXECUTE_FIRST + PEXECUTE_LAST)
+#define PEXECUTE_SEARCH  4
+#define PEXECUTE_VERBOSE 8
+
+/* Execute a program.  */
+
+extern int pexecute (const char *, char * const *, const char *,
+                     const char *, char **, char **, int);
+
+/* Wait for pexecute to finish.  */
+
+extern int pwait (int, int *, int);
+
+#if !HAVE_DECL_ASPRINTF
+/* Like sprintf but provides a pointer to malloc'd storage, which must
+   be freed by the caller.  */
+
+extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
+#endif
+
+#if !HAVE_DECL_VASPRINTF
+/* Like vsprintf but provides a pointer to malloc'd storage, which
+   must be freed by the caller.  */
+
+extern int vasprintf (char **, const char *, va_list) ATTRIBUTE_PRINTF(2,0);
+#endif
+
+#if defined(HAVE_DECL_SNPRINTF) && !HAVE_DECL_SNPRINTF
+/* Like sprintf but prints at most N characters.  */
+extern int snprintf (char *, size_t, const char *, ...) ATTRIBUTE_PRINTF_3;
+#endif
+
+#if defined(HAVE_DECL_VSNPRINTF) && !HAVE_DECL_VSNPRINTF
+/* Like vsprintf but prints at most N characters.  */
+extern int vsnprintf (char *, size_t, const char *, va_list) ATTRIBUTE_PRINTF(3,0);
+#endif
+
+#if defined(HAVE_DECL_STRVERSCMP) && !HAVE_DECL_STRVERSCMP
+/* Compare version strings.  */
+extern int strverscmp (const char *, const char *);
+#endif
+
+/* Set the title of a process */
+extern void setproctitle (const char *name, ...);
+
+/* Increase stack limit if possible.  */
+extern void stack_limit_increase (unsigned long);
+
+#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
+
+/* Drastically simplified alloca configurator.  If we're using GCC,
+   we use __builtin_alloca; otherwise we use the C alloca.  The C
+   alloca is always available.  You can override GCC by defining
+   USE_C_ALLOCA yourself.  The canonical autoconf macro C_ALLOCA is
+   also set/unset as it is often used to indicate whether code needs
+   to call alloca(0).  */
+extern void *C_alloca (size_t) ATTRIBUTE_MALLOC;
+#undef alloca
+#if GCC_VERSION >= 2000 && !defined USE_C_ALLOCA
+# define alloca(x) __builtin_alloca(x)
+# undef C_ALLOCA
+# define ASTRDUP(X) \
+  (__extension__ ({ const char *const libiberty_optr = (X); \
+   const unsigned long libiberty_len = strlen (libiberty_optr) + 1; \
+   char *const libiberty_nptr = (char *const) alloca (libiberty_len); \
+   (char *) memcpy (libiberty_nptr, libiberty_optr, libiberty_len); }))
+#else
+# define alloca(x) C_alloca(x)
+# undef USE_C_ALLOCA
+# define USE_C_ALLOCA 1
+# undef C_ALLOCA
+# define C_ALLOCA 1
+extern const char *libiberty_optr;
+extern char *libiberty_nptr;
+extern unsigned long libiberty_len;
+# define ASTRDUP(X) \
+  (libiberty_optr = (X), \
+   libiberty_len = strlen (libiberty_optr) + 1, \
+   libiberty_nptr = (char *) alloca (libiberty_len), \
+   (char *) memcpy (libiberty_nptr, libiberty_optr, libiberty_len))
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* ! defined (LIBIBERTY_H) */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/mach-o/ChangeLog sdcc-3.2.0+dfsg/support/sdbinutils/include/mach-o/ChangeLog
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/mach-o/ChangeLog	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/mach-o/ChangeLog	2012-02-12 06:45:42.000000000 +0000
@@ -0,0 +1,19 @@
+2011-08-08  Tristan Gingold  <gingold@adacore.com>
+
+	* loader.h (bfd_mach_o_load_command_type): Add
+	BFD_MACH_O_LC_LOAD_UPWARD_DYLIB, BFD_MACH_O_LC_VERSION_MIN_MACOSX,
+	BFD_MACH_O_LC_VERSION_MIN_IPHONEOS, BFD_MACH_O_LC_FUNCTION_STARTS,
+	and BFD_MACH_O_LC_DYLD_ENVIRONMENT.
+	* external.h (mach_o_version_min_command_external): New structure.
+
+2011-08-08  Tristan Gingold  <gingold@adacore.com>
+
+	* loader.h: Reorder declarations.
+	* x86-64.h: New file.
+	* external.h: New file.
+	* reloc.h: New file.
+
+2011-07-06  Tristan Gingold  <gingold@adacore.com>
+
+	* loader.h: New file.
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/mach-o/external.h sdcc-3.2.0+dfsg/support/sdbinutils/include/mach-o/external.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/mach-o/external.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/mach-o/external.h	2012-02-12 06:45:42.000000000 +0000
@@ -0,0 +1,273 @@
+/* Mach-O support for BFD.
+   Copyright 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _MACH_O_EXTERNAL_H
+#define _MACH_O_EXTERNAL_H
+
+struct mach_o_header_external
+{
+  unsigned char magic[4];	/* Magic number.  */
+  unsigned char cputype[4];	/* CPU that this object is for.  */
+  unsigned char cpusubtype[4];	/* CPU subtype.  */
+  unsigned char filetype[4];	/* Type of file.  */
+  unsigned char ncmds[4];	/* Number of load commands.  */
+  unsigned char sizeofcmds[4];	/* Total size of load commands.  */
+  unsigned char flags[4];	/* Flags.  */
+  unsigned char reserved[4];	/* Reserved (on 64-bit version only).  */
+};
+
+#define BFD_MACH_O_HEADER_SIZE 28
+#define BFD_MACH_O_HEADER_64_SIZE 32
+
+/* 32-bit section header.  */
+
+struct mach_o_section_32_external
+{
+  unsigned char sectname[16];   /* Section name.  */
+  unsigned char segname[16];    /* Segment that the section belongs to.  */
+  unsigned char addr[4];        /* Address of this section in memory.  */
+  unsigned char size[4];        /* Size in bytes of this section.  */
+  unsigned char offset[4];      /* File offset of this section.  */
+  unsigned char align[4];       /* log2 of this section's alignment.  */
+  unsigned char reloff[4];      /* File offset of this section's relocs.  */
+  unsigned char nreloc[4];      /* Number of relocs for this section.  */
+  unsigned char flags[4];       /* Section flags/attributes.  */
+  unsigned char reserved1[4];
+  unsigned char reserved2[4];
+};
+#define BFD_MACH_O_SECTION_SIZE 68
+
+/* 64-bit section header.  */
+
+struct mach_o_section_64_external
+{
+  unsigned char sectname[16];   /* Section name.  */
+  unsigned char segname[16];    /* Segment that the section belongs to.  */
+  unsigned char addr[8];        /* Address of this section in memory.  */
+  unsigned char size[8];        /* Size in bytes of this section.  */
+  unsigned char offset[4];      /* File offset of this section.  */
+  unsigned char align[4];       /* log2 of this section's alignment.  */
+  unsigned char reloff[4];      /* File offset of this section's relocs.  */
+  unsigned char nreloc[4];      /* Number of relocs for this section.  */
+  unsigned char flags[4];       /* Section flags/attributes.  */
+  unsigned char reserved1[4];
+  unsigned char reserved2[4];
+  unsigned char reserved3[4];
+};
+#define BFD_MACH_O_SECTION_64_SIZE 80
+
+struct mach_o_load_command_external
+{
+  unsigned char cmd[4];         /* The type of load command.  */
+  unsigned char cmdsize[4];     /* Size in bytes of entire command.  */
+};
+#define BFD_MACH_O_LC_SIZE 8
+
+struct mach_o_segment_command_32_external
+{
+  unsigned char segname[16];    /* Name of this segment.  */
+  unsigned char vmaddr[4];      /* Virtual memory address of this segment.  */
+  unsigned char vmsize[4];      /* Size there, in bytes.  */
+  unsigned char fileoff[4];     /* Offset in bytes of the data to be mapped.  */
+  unsigned char filesize[4];    /* Size in bytes on disk.  */
+  unsigned char maxprot[4];     /* Maximum permitted vm protection.  */
+  unsigned char initprot[4];    /* Initial vm protection.  */
+  unsigned char nsects[4];      /* Number of sections in this segment.  */
+  unsigned char flags[4];       /* Flags that affect the loading.  */
+};
+#define BFD_MACH_O_LC_SEGMENT_SIZE 56 /* Include the header.  */
+
+struct mach_o_segment_command_64_external
+{
+  unsigned char segname[16];    /* Name of this segment.  */
+  unsigned char vmaddr[8];      /* Virtual memory address of this segment.  */
+  unsigned char vmsize[8];      /* Size there, in bytes.  */
+  unsigned char fileoff[8];     /* Offset in bytes of the data to be mapped.  */
+  unsigned char filesize[8];    /* Size in bytes on disk.  */
+  unsigned char maxprot[4];     /* Maximum permitted vm protection.  */
+  unsigned char initprot[4];    /* Initial vm protection.  */
+  unsigned char nsects[4];      /* Number of sections in this segment.  */
+  unsigned char flags[4];       /* Flags that affect the loading.  */
+};
+#define BFD_MACH_O_LC_SEGMENT_64_SIZE 72 /* Include the header.  */
+
+struct mach_o_reloc_info_external
+{
+  unsigned char r_address[4];
+  unsigned char r_symbolnum[4];
+};
+#define BFD_MACH_O_RELENT_SIZE 8
+
+struct mach_o_symtab_command_external
+{
+  unsigned char symoff[4];
+  unsigned char nsyms[4];
+  unsigned char stroff[4];
+  unsigned char strsize[4];
+};
+
+struct mach_o_nlist_external
+{
+  unsigned char n_strx[4];
+  unsigned char n_type[1];
+  unsigned char n_sect[1];
+  unsigned char n_desc[2];
+  unsigned char n_value[4];
+};
+#define BFD_MACH_O_NLIST_SIZE 12
+
+struct mach_o_nlist_64_external
+{
+  unsigned char n_strx[4];
+  unsigned char n_type[1];
+  unsigned char n_sect[1];
+  unsigned char n_desc[2];
+  unsigned char n_value[8];
+};
+#define BFD_MACH_O_NLIST_64_SIZE 16
+
+struct mach_o_thread_command_external
+{
+  unsigned char flavour[4];
+  unsigned char count[4];
+};
+
+/* For commands that just have a string or a path.  */
+struct mach_o_str_command_external
+{
+  unsigned char str[4];
+};
+
+struct mach_o_dylib_command_external
+{
+  unsigned char name[4];
+  unsigned char timestamp[4];
+  unsigned char current_version[4];
+  unsigned char compatibility_version[4];
+};
+
+struct mach_o_dysymtab_command_external
+{
+  unsigned char ilocalsym[4];	/* Index of.  */
+  unsigned char nlocalsym[4];	/* Number of.  */
+  unsigned char iextdefsym[4];
+  unsigned char nextdefsym[4];
+  unsigned char iundefsym[4];
+  unsigned char nundefsym[4];
+  unsigned char tocoff[4];
+  unsigned char ntoc[4];
+  unsigned char modtaboff[4];
+  unsigned char nmodtab[4];
+  unsigned char extrefsymoff[4];
+  unsigned char nextrefsyms[4];
+  unsigned char indirectsymoff[4];
+  unsigned char nindirectsyms[4];
+  unsigned char extreloff[4];
+  unsigned char nextrel[4];
+  unsigned char locreloff[4];
+  unsigned char nlocrel[4];
+};
+
+struct mach_o_dylib_module_external
+{
+  unsigned char module_name[4];
+  unsigned char iextdefsym[4];
+  unsigned char nextdefsym[4];
+  unsigned char irefsym[4];
+  unsigned char nrefsym[4];
+  unsigned char ilocalsym[4];
+  unsigned char nlocalsym[4];
+  unsigned char iextrel[4];
+  unsigned char nextrel[4];
+  unsigned char iinit_iterm[4];
+  unsigned char ninit_nterm[4];
+  unsigned char objc_module_info_addr[4];
+  unsigned char objc_module_info_size[4];
+};
+#define BFD_MACH_O_DYLIB_MODULE_SIZE 52
+
+struct mach_o_dylib_module_64_external
+{
+  unsigned char module_name[4];
+  unsigned char iextdefsym[4];
+  unsigned char nextdefsym[4];
+  unsigned char irefsym[4];
+  unsigned char nrefsym[4];
+  unsigned char ilocalsym[4];
+  unsigned char nlocalsym[4];
+  unsigned char iextrel[4];
+  unsigned char nextrel[4];
+  unsigned char iinit_iterm[4];
+  unsigned char ninit_nterm[4];
+  unsigned char objc_module_info_size[4];
+  unsigned char objc_module_info_addr[8];
+};
+#define BFD_MACH_O_DYLIB_MODULE_64_SIZE 56
+
+struct mach_o_dylib_table_of_contents_external
+{
+  unsigned char symbol_index[4];
+  unsigned char module_index[4];
+};
+#define BFD_MACH_O_TABLE_OF_CONTENT_SIZE 8
+
+struct mach_o_linkedit_data_command_external
+{
+  unsigned char dataoff[4];
+  unsigned char datasize[4];
+};
+
+struct mach_o_dyld_info_command_external
+{
+  unsigned char rebase_off[4];
+  unsigned char rebase_size[4];
+  unsigned char bind_off[4];
+  unsigned char bind_size[4];
+  unsigned char weak_bind_off[4];
+  unsigned char weak_bind_size[4];
+  unsigned char lazy_bind_off[4];
+  unsigned char lazy_bind_size[4];
+  unsigned char export_off[4];
+  unsigned char export_size[4];
+};
+
+struct mach_o_version_min_command_external
+{
+  unsigned char version[4];
+  unsigned char reserved[4];
+};
+
+struct mach_o_fat_header_external
+{
+  unsigned char magic[4];
+  unsigned char nfat_arch[4];	/* Number of components.  */
+};
+
+struct mach_o_fat_arch_external
+{
+  unsigned char cputype[4];
+  unsigned char cpusubtype[4];
+  unsigned char offset[4];	/* File offset of the member.  */
+  unsigned char size[4];	/* Size of the member.  */
+  unsigned char align[4];	/* Power of 2.  */
+};
+
+#endif /* _MACH_O_EXTERNAL_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/mach-o/loader.h sdcc-3.2.0+dfsg/support/sdbinutils/include/mach-o/loader.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/mach-o/loader.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/mach-o/loader.h	2012-02-12 06:45:42.000000000 +0000
@@ -0,0 +1,345 @@
+/* Mach-O support for BFD.
+   Copyright 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _MACH_O_LOADER_H
+#define _MACH_O_LOADER_H
+
+/* Constants for header. */
+
+typedef enum bfd_mach_o_mach_header_magic
+{
+  BFD_MACH_O_MH_MAGIC    = 0xfeedface,
+  BFD_MACH_O_MH_CIGAM    = 0xcefaedfe,
+  BFD_MACH_O_MH_MAGIC_64 = 0xfeedfacf,
+  BFD_MACH_O_MH_CIGAM_64 = 0xcffaedfe
+}
+bfd_mach_o_mach_header_magic;
+
+#define BFD_MACH_O_CPU_IS64BIT 0x1000000
+
+typedef enum bfd_mach_o_cpu_type
+{
+  BFD_MACH_O_CPU_TYPE_VAX = 1,
+  BFD_MACH_O_CPU_TYPE_MC680x0 = 6,
+  BFD_MACH_O_CPU_TYPE_I386 = 7,
+  BFD_MACH_O_CPU_TYPE_MIPS = 8,
+  BFD_MACH_O_CPU_TYPE_MC98000 = 10,
+  BFD_MACH_O_CPU_TYPE_HPPA = 11,
+  BFD_MACH_O_CPU_TYPE_ARM = 12,
+  BFD_MACH_O_CPU_TYPE_MC88000 = 13,
+  BFD_MACH_O_CPU_TYPE_SPARC = 14,
+  BFD_MACH_O_CPU_TYPE_I860 = 15,
+  BFD_MACH_O_CPU_TYPE_ALPHA = 16,
+  BFD_MACH_O_CPU_TYPE_POWERPC = 18,
+  BFD_MACH_O_CPU_TYPE_POWERPC_64 = (BFD_MACH_O_CPU_TYPE_POWERPC | BFD_MACH_O_CPU_IS64BIT),
+  BFD_MACH_O_CPU_TYPE_X86_64 = (BFD_MACH_O_CPU_TYPE_I386 | BFD_MACH_O_CPU_IS64BIT)
+}
+bfd_mach_o_cpu_type;
+
+typedef enum bfd_mach_o_cpu_subtype
+{
+  BFD_MACH_O_CPU_SUBTYPE_X86_ALL = 3
+}
+bfd_mach_o_cpu_subtype;
+
+typedef enum bfd_mach_o_filetype
+{
+  BFD_MACH_O_MH_OBJECT      = 0x01,
+  BFD_MACH_O_MH_EXECUTE     = 0x02,
+  BFD_MACH_O_MH_FVMLIB      = 0x03,
+  BFD_MACH_O_MH_CORE        = 0x04,
+  BFD_MACH_O_MH_PRELOAD     = 0x05,
+  BFD_MACH_O_MH_DYLIB       = 0x06,
+  BFD_MACH_O_MH_DYLINKER    = 0x07,
+  BFD_MACH_O_MH_BUNDLE      = 0x08,
+  BFD_MACH_O_MH_DYLIB_STUB  = 0x09,
+  BFD_MACH_O_MH_DSYM        = 0x0a,
+  BFD_MACH_O_MH_KEXT_BUNDLE = 0x0b
+}
+bfd_mach_o_filetype;
+
+typedef enum bfd_mach_o_header_flags
+{
+  BFD_MACH_O_MH_NOUNDEFS		= 0x0000001,
+  BFD_MACH_O_MH_INCRLINK		= 0x0000002,
+  BFD_MACH_O_MH_DYLDLINK		= 0x0000004,
+  BFD_MACH_O_MH_BINDATLOAD		= 0x0000008,
+  BFD_MACH_O_MH_PREBOUND		= 0x0000010,
+  BFD_MACH_O_MH_SPLIT_SEGS		= 0x0000020,
+  BFD_MACH_O_MH_LAZY_INIT		= 0x0000040,
+  BFD_MACH_O_MH_TWOLEVEL		= 0x0000080,
+  BFD_MACH_O_MH_FORCE_FLAT		= 0x0000100,
+  BFD_MACH_O_MH_NOMULTIDEFS		= 0x0000200,
+  BFD_MACH_O_MH_NOFIXPREBINDING		= 0x0000400,
+  BFD_MACH_O_MH_PREBINDABLE		= 0x0000800,
+  BFD_MACH_O_MH_ALLMODSBOUND		= 0x0001000,
+  BFD_MACH_O_MH_SUBSECTIONS_VIA_SYMBOLS = 0x0002000,
+  BFD_MACH_O_MH_CANONICAL		= 0x0004000,
+  BFD_MACH_O_MH_WEAK_DEFINES		= 0x0008000,
+  BFD_MACH_O_MH_BINDS_TO_WEAK		= 0x0010000,
+  BFD_MACH_O_MH_ALLOW_STACK_EXECUTION	= 0x0020000,
+  BFD_MACH_O_MH_ROOT_SAFE		= 0x0040000,
+  BFD_MACH_O_MH_SETUID_SAFE		= 0x0080000,
+  BFD_MACH_O_MH_NO_REEXPORTED_DYLIBS	= 0x0100000,
+  BFD_MACH_O_MH_PIE			= 0x0200000,
+  BFD_MACH_O_MH_DEAD_STRIPPABLE_DYLIB   = 0x0400000,
+  BFD_MACH_O_MH_HAS_TLV_DESCRIPTORS     = 0x0800000,
+  BFD_MACH_O_MH_NO_HEAP_EXECUTION       = 0x1000000
+}
+bfd_mach_o_header_flags;
+
+/* Load command constants.  */
+#define BFD_MACH_O_LC_REQ_DYLD 0x80000000
+
+typedef enum bfd_mach_o_load_command_type
+{
+  BFD_MACH_O_LC_SEGMENT = 0x1,		/* File segment to be mapped.  */
+  BFD_MACH_O_LC_SYMTAB = 0x2,		/* Link-edit stab symbol table info (obsolete).  */
+  BFD_MACH_O_LC_SYMSEG = 0x3,		/* Link-edit gdb symbol table info.  */
+  BFD_MACH_O_LC_THREAD = 0x4,		/* Thread.  */
+  BFD_MACH_O_LC_UNIXTHREAD = 0x5,	/* UNIX thread (includes a stack).  */
+  BFD_MACH_O_LC_LOADFVMLIB = 0x6,	/* Load a fixed VM shared library.  */
+  BFD_MACH_O_LC_IDFVMLIB = 0x7,		/* Fixed VM shared library id.  */
+  BFD_MACH_O_LC_IDENT = 0x8,		/* Object identification information (obsolete).  */
+  BFD_MACH_O_LC_FVMFILE = 0x9,		/* Fixed VM file inclusion.  */
+  BFD_MACH_O_LC_PREPAGE = 0xa,		/* Prepage command (internal use).  */
+  BFD_MACH_O_LC_DYSYMTAB = 0xb,		/* Dynamic link-edit symbol table info.  */
+  BFD_MACH_O_LC_LOAD_DYLIB = 0xc,	/* Load a dynamically linked shared library.  */
+  BFD_MACH_O_LC_ID_DYLIB = 0xd,		/* Dynamically linked shared lib identification.  */
+  BFD_MACH_O_LC_LOAD_DYLINKER = 0xe,	/* Load a dynamic linker.  */
+  BFD_MACH_O_LC_ID_DYLINKER = 0xf,	/* Dynamic linker identification.  */
+  BFD_MACH_O_LC_PREBOUND_DYLIB = 0x10,	/* Modules prebound for a dynamically.  */
+  BFD_MACH_O_LC_ROUTINES = 0x11,	/* Image routines.  */
+  BFD_MACH_O_LC_SUB_FRAMEWORK = 0x12,	/* Sub framework.  */
+  BFD_MACH_O_LC_SUB_UMBRELLA = 0x13,	/* Sub umbrella.  */
+  BFD_MACH_O_LC_SUB_CLIENT = 0x14,	/* Sub client.  */
+  BFD_MACH_O_LC_SUB_LIBRARY = 0x15,   	/* Sub library.  */
+  BFD_MACH_O_LC_TWOLEVEL_HINTS = 0x16,	/* Two-level namespace lookup hints.  */
+  BFD_MACH_O_LC_PREBIND_CKSUM = 0x17, 	/* Prebind checksum.  */
+  /* Load a dynamically linked shared library that is allowed to be
+       missing (weak).  */
+  BFD_MACH_O_LC_LOAD_WEAK_DYLIB = 0x18,
+  BFD_MACH_O_LC_SEGMENT_64 = 0x19,	/* 64-bit segment of this file to be 
+                                           mapped.  */
+  BFD_MACH_O_LC_ROUTINES_64 = 0x1a,     /* Address of the dyld init routine 
+                                           in a dylib.  */
+  BFD_MACH_O_LC_UUID = 0x1b,            /* 128-bit UUID of the executable.  */
+  BFD_MACH_O_LC_RPATH = 0x1c,		/* Run path addiions.  */
+  BFD_MACH_O_LC_CODE_SIGNATURE = 0x1d,	/* Local of code signature.  */
+  BFD_MACH_O_LC_SEGMENT_SPLIT_INFO = 0x1e, /* Local of info to split seg.  */
+  BFD_MACH_O_LC_REEXPORT_DYLIB = 0x1f,  /* Load and re-export lib.  */
+  BFD_MACH_O_LC_LAZY_LOAD_DYLIB = 0x20, /* Delay load of lib until use.  */
+  BFD_MACH_O_LC_ENCRYPTION_INFO = 0x21, /* Encrypted segment info.  */
+  BFD_MACH_O_LC_DYLD_INFO = 0x22,	/* Compressed dyld information.  */
+  BFD_MACH_O_LC_LOAD_UPWARD_DYLIB = 0x23, /* Load upward dylib.  */
+  BFD_MACH_O_LC_VERSION_MIN_MACOSX = 0x24,   /* Minimal MacOSX version.  */
+  BFD_MACH_O_LC_VERSION_MIN_IPHONEOS = 0x25, /* Minimal IOS version.  */
+  BFD_MACH_O_LC_FUNCTION_STARTS = 0x26,  /* Compressed table of func start.  */
+  BFD_MACH_O_LC_DYLD_ENVIRONMENT = 0x27  /* Env variable string for dyld.  */
+}
+bfd_mach_o_load_command_type;
+
+/* Section constants.  */
+/* Constants for the type of a section.  */
+
+typedef enum bfd_mach_o_section_type
+{
+  /* Regular section.  */
+  BFD_MACH_O_S_REGULAR = 0x0,
+
+  /* Zero fill on demand section.  */
+  BFD_MACH_O_S_ZEROFILL = 0x1,
+
+  /* Section with only literal C strings.  */
+  BFD_MACH_O_S_CSTRING_LITERALS = 0x2,
+
+  /* Section with only 4 byte literals.  */
+  BFD_MACH_O_S_4BYTE_LITERALS = 0x3,
+
+  /* Section with only 8 byte literals.  */
+  BFD_MACH_O_S_8BYTE_LITERALS = 0x4,
+
+  /* Section with only pointers to literals.  */
+  BFD_MACH_O_S_LITERAL_POINTERS = 0x5,
+
+  /* For the two types of symbol pointers sections and the symbol stubs
+     section they have indirect symbol table entries.  For each of the
+     entries in the section the indirect symbol table entries, in
+     corresponding order in the indirect symbol table, start at the index
+     stored in the reserved1 field of the section structure.  Since the
+     indirect symbol table entries correspond to the entries in the
+     section the number of indirect symbol table entries is inferred from
+     the size of the section divided by the size of the entries in the
+     section.  For symbol pointers sections the size of the entries in
+     the section is 4 bytes and for symbol stubs sections the byte size
+     of the stubs is stored in the reserved2 field of the section
+     structure.  */
+
+  /* Section with only non-lazy symbol pointers.  */
+  BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS = 0x6,
+
+  /* Section with only lazy symbol pointers.  */
+  BFD_MACH_O_S_LAZY_SYMBOL_POINTERS = 0x7,
+
+  /* Section with only symbol stubs, byte size of stub in the reserved2
+     field.  */
+  BFD_MACH_O_S_SYMBOL_STUBS = 0x8,
+
+  /* Section with only function pointers for initialization.  */
+  BFD_MACH_O_S_MOD_INIT_FUNC_POINTERS = 0x9,
+
+  /* Section with only function pointers for termination.  */
+  BFD_MACH_O_S_MOD_FINI_FUNC_POINTERS = 0xa,
+
+  /* Section contains symbols that are coalesced by the linkers.  */
+  BFD_MACH_O_S_COALESCED = 0xb,
+
+  /* Zero fill on demand section (possibly larger than 4 GB).  */
+  BFD_MACH_O_S_GB_ZEROFILL = 0xc,
+
+  /* Section with only pairs of function pointers for interposing.  */
+  BFD_MACH_O_S_INTERPOSING = 0xd,
+
+  /* Section with only 16 byte literals.  */
+  BFD_MACH_O_S_16BYTE_LITERALS = 0xe,
+
+  /* Section contains DTrace Object Format.  */
+  BFD_MACH_O_S_DTRACE_DOF = 0xf,
+
+  /* Section with only lazy symbol pointers to lazy loaded dylibs.  */
+  BFD_MACH_O_S_LAZY_DYLIB_SYMBOL_POINTERS = 0x10
+}
+bfd_mach_o_section_type;
+
+/* The flags field of a section structure is separated into two parts a section
+   type and section attributes.  The section types are mutually exclusive (it
+   can only have one type) but the section attributes are not (it may have more
+   than one attribute).  */
+
+#define BFD_MACH_O_SECTION_TYPE_MASK        0x000000ff
+
+/* Constants for the section attributes part of the flags field of a section
+   structure.  */
+#define BFD_MACH_O_SECTION_ATTRIBUTES_MASK  0xffffff00
+/* System setable attributes.  */
+#define BFD_MACH_O_SECTION_ATTRIBUTES_SYS   0x00ffff00
+/* User attributes.  */   
+#define BFD_MACH_O_SECTION_ATTRIBUTES_USR   0xff000000
+
+typedef enum bfd_mach_o_section_attribute
+{
+  /* Section has local relocation entries.  */
+  BFD_MACH_O_S_ATTR_LOC_RELOC         = 0x00000100,
+
+  /* Section has external relocation entries.  */  
+  BFD_MACH_O_S_ATTR_EXT_RELOC         = 0x00000200,
+
+  /* Section contains some machine instructions.  */
+  BFD_MACH_O_S_ATTR_SOME_INSTRUCTIONS = 0x00000400,
+
+  /* A debug section.  */
+  BFD_MACH_O_S_ATTR_DEBUG             = 0x02000000,
+
+  /* Used with i386 stubs.  */
+  BFD_MACH_O_S_SELF_MODIFYING_CODE    = 0x04000000,
+  
+  /* Blocks are live if they reference live blocks.  */
+  BFD_MACH_O_S_ATTR_LIVE_SUPPORT      = 0x08000000,
+
+  /* No dead stripping.  */
+  BFD_MACH_O_S_ATTR_NO_DEAD_STRIP     = 0x10000000,
+
+  /* Section symbols can be stripped in files with MH_DYLDLINK flag.  */
+  BFD_MACH_O_S_ATTR_STRIP_STATIC_SYMS = 0x20000000,
+
+  /* Section contains coalesced symbols that are not to be in the TOC of an
+     archive.  */
+  BFD_MACH_O_S_ATTR_NO_TOC            = 0x40000000,
+
+  /* Section contains only true machine instructions.  */
+  BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS = 0x80000000
+}
+bfd_mach_o_section_attribute;
+
+/* Symbol constants.  */
+
+/* Symbol n_type values.  */
+#define BFD_MACH_O_N_STAB  0xe0	/* If any of these bits set, a symbolic debugging entry.  */
+#define BFD_MACH_O_N_PEXT  0x10	/* Private external symbol bit.  */
+#define BFD_MACH_O_N_TYPE  0x0e	/* Mask for the type bits.  */
+#define BFD_MACH_O_N_EXT   0x01	/* External symbol bit, set for external symbols.  */
+#define BFD_MACH_O_N_UNDF  0x00	/* Undefined, n_sect == NO_SECT.  */
+#define BFD_MACH_O_N_ABS   0x02	/* Absolute, n_sect == NO_SECT.  */
+#define BFD_MACH_O_N_INDR  0x0a	/* Indirect.  */
+#define BFD_MACH_O_N_PBUD  0x0c /* Prebound undefined (defined in a dylib).  */
+#define BFD_MACH_O_N_SECT  0x0e	/* Defined in section number n_sect.  */
+
+#define BFD_MACH_O_NO_SECT 0	/* Symbol not in any section of the image.  */
+
+/* Symbol n_desc reference flags.  */
+#define BFD_MACH_O_REFERENCE_MASK 				0x0f
+#define BFD_MACH_O_REFERENCE_FLAG_UNDEFINED_NON_LAZY		0x00
+#define BFD_MACH_O_REFERENCE_FLAG_UNDEFINED_LAZY		0x01
+#define BFD_MACH_O_REFERENCE_FLAG_DEFINED			0x02
+#define BFD_MACH_O_REFERENCE_FLAG_PRIVATE_DEFINED		0x03
+#define BFD_MACH_O_REFERENCE_FLAG_PRIVATE_UNDEFINED_NON_LAZY	0x04
+#define BFD_MACH_O_REFERENCE_FLAG_PRIVATE_UNDEFINED_LAZY	0x05
+
+#define BFD_MACH_O_REFERENCED_DYNAMICALLY			0x10
+#define BFD_MACH_O_N_DESC_DISCARDED				0x20
+#define BFD_MACH_O_N_NO_DEAD_STRIP				0x20
+#define BFD_MACH_O_N_WEAK_REF					0x40
+#define BFD_MACH_O_N_WEAK_DEF					0x80
+
+/* Thread constants.  */
+
+typedef enum bfd_mach_o_ppc_thread_flavour
+{
+  BFD_MACH_O_PPC_THREAD_STATE      = 1,
+  BFD_MACH_O_PPC_FLOAT_STATE       = 2,
+  BFD_MACH_O_PPC_EXCEPTION_STATE   = 3,
+  BFD_MACH_O_PPC_VECTOR_STATE      = 4,
+  BFD_MACH_O_PPC_THREAD_STATE64    = 5,
+  BFD_MACH_O_PPC_EXCEPTION_STATE64 = 6,
+  BFD_MACH_O_PPC_THREAD_STATE_NONE = 7
+}
+bfd_mach_o_ppc_thread_flavour;
+
+/* Defined in <mach/i386/thread_status.h> */
+typedef enum bfd_mach_o_i386_thread_flavour
+{
+  BFD_MACH_O_x86_THREAD_STATE32    = 1,
+  BFD_MACH_O_x86_FLOAT_STATE32     = 2,
+  BFD_MACH_O_x86_EXCEPTION_STATE32 = 3,
+  BFD_MACH_O_x86_THREAD_STATE64    = 4,
+  BFD_MACH_O_x86_FLOAT_STATE64     = 5,
+  BFD_MACH_O_x86_EXCEPTION_STATE64 = 6,
+  BFD_MACH_O_x86_THREAD_STATE      = 7,
+  BFD_MACH_O_x86_FLOAT_STATE       = 8,
+  BFD_MACH_O_x86_EXCEPTION_STATE   = 9,
+  BFD_MACH_O_x86_DEBUG_STATE32     = 10,
+  BFD_MACH_O_x86_DEBUG_STATE64     = 11,
+  BFD_MACH_O_x86_DEBUG_STATE       = 12,
+  BFD_MACH_O_x86_THREAD_STATE_NONE = 13
+}
+bfd_mach_o_i386_thread_flavour;
+
+#endif /* _MACH_O_LOADER_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/mach-o/reloc.h sdcc-3.2.0+dfsg/support/sdbinutils/include/mach-o/reloc.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/mach-o/reloc.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/mach-o/reloc.h	2012-02-12 06:45:42.000000000 +0000
@@ -0,0 +1,53 @@
+/* Mach-O support for BFD.
+   Copyright 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _MACH_O_RELOC_H
+#define _MACH_O_RELOC_H
+
+/* Fields for a normal (non-scattered) entry.  */
+#define BFD_MACH_O_R_PCREL		0x01000000
+#define BFD_MACH_O_GET_R_LENGTH(s)	(((s) >> 25) & 0x3)
+#define BFD_MACH_O_R_EXTERN		0x08000000
+#define BFD_MACH_O_GET_R_TYPE(s)	(((s) >> 28) & 0x0f)
+#define BFD_MACH_O_GET_R_SYMBOLNUM(s)	((s) & 0x00ffffff)
+#define BFD_MACH_O_SET_R_LENGTH(l)	(((l) & 0x3) << 25)
+#define BFD_MACH_O_SET_R_TYPE(t)	(((t) & 0xf) << 28)
+#define BFD_MACH_O_SET_R_SYMBOLNUM(s)	((s) & 0x00ffffff)
+
+/* Fields for a scattered entry.  */
+#define BFD_MACH_O_SR_SCATTERED		0x80000000
+#define BFD_MACH_O_SR_PCREL		0x40000000
+#define BFD_MACH_O_GET_SR_LENGTH(s)	(((s) >> 28) & 0x3)
+#define BFD_MACH_O_GET_SR_TYPE(s)	(((s) >> 24) & 0x0f)
+#define BFD_MACH_O_GET_SR_ADDRESS(s)	((s) & 0x00ffffff)
+#define BFD_MACH_O_SET_SR_LENGTH(l)	(((l) & 0x3) << 28)
+#define BFD_MACH_O_SET_SR_TYPE(t)	(((t) & 0xf) << 24)
+#define BFD_MACH_O_SET_SR_ADDRESS(s)	((s) & 0x00ffffff)
+
+/* Generic relocation types (used by i386).  */
+#define BFD_MACH_O_GENERIC_RELOC_VANILLA 	0
+#define BFD_MACH_O_GENERIC_RELOC_PAIR	 	1
+#define BFD_MACH_O_GENERIC_RELOC_SECTDIFF	2
+#define BFD_MACH_O_GENERIC_RELOC_PB_LA_PTR	3
+#define BFD_MACH_O_GENERIC_RELOC_LOCAL_SECTDIFF	4
+#define BFD_MACH_O_GENERIC_RELOC_TLV		5
+
+#endif /* _MACH_O_RELOC_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/mach-o/x86-64.h sdcc-3.2.0+dfsg/support/sdbinutils/include/mach-o/x86-64.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/mach-o/x86-64.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/mach-o/x86-64.h	2012-02-12 06:45:42.000000000 +0000
@@ -0,0 +1,37 @@
+/* Mach-O support for BFD.
+   Copyright 2011
+   Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#ifndef _MACH_O_X86_64_H
+#define _MACH_O_X86_64_H
+
+/* X86-64 relocations.  */
+#define BFD_MACH_O_X86_64_RELOC_UNSIGNED   0 /* Absolute addresses.  */
+#define BFD_MACH_O_X86_64_RELOC_SIGNED     1 /* 32-bit disp.  */
+#define BFD_MACH_O_X86_64_RELOC_BRANCH     2 /* 32-bit pcrel disp.  */
+#define BFD_MACH_O_X86_64_RELOC_GOT_LOAD   3 /* Movq load of a GOT entry.  */
+#define BFD_MACH_O_X86_64_RELOC_GOT        4 /* GOT reference.  */
+#define BFD_MACH_O_X86_64_RELOC_SUBTRACTOR 5 /* Symbol difference.  */
+#define BFD_MACH_O_X86_64_RELOC_SIGNED_1   6 /* 32-bit signed disp -1.  */
+#define BFD_MACH_O_X86_64_RELOC_SIGNED_2   7 /* 32-bit signed disp -2.  */
+#define BFD_MACH_O_X86_64_RELOC_SIGNED_4   8 /* 32-bit signed disp -4.  */
+#define BFD_MACH_O_X86_64_RELOC_TLV	   9 /* Thread local variables.  */
+
+#endif /* _MACH_O_X86_64_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/md5.h sdcc-3.2.0+dfsg/support/sdbinutils/include/md5.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/md5.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/md5.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,149 @@
+/* md5.h - Declaration of functions and data types used for MD5 sum
+   computing library functions.
+   Copyright 1995, 1996, 2000 Free Software Foundation, Inc.
+   NOTE: The canonical source of this file is maintained with the GNU C
+   Library.  Bugs can be reported to bug-glibc@prep.ai.mit.edu.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _MD5_H
+#define _MD5_H 1
+
+#include <stdio.h>
+
+#if defined HAVE_LIMITS_H || _LIBC
+# include <limits.h>
+#endif
+
+#include "ansidecl.h"
+
+/* The following contortions are an attempt to use the C preprocessor
+   to determine an unsigned integral type that is 32 bits wide.  An
+   alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
+   doing that would require that the configure script compile and *run*
+   the resulting executable.  Locally running cross-compiled executables
+   is usually not possible.  */
+
+#ifdef _LIBC
+# include <sys/types.h>
+typedef u_int32_t md5_uint32;
+typedef uintptr_t md5_uintptr;
+#else
+#  define INT_MAX_32_BITS 2147483647
+
+/* If UINT_MAX isn't defined, assume it's a 32-bit type.
+   This should be valid for all systems GNU cares about because
+   that doesn't include 16-bit systems, and only modern systems
+   (that certainly have <limits.h>) have 64+-bit integral types.  */
+
+# ifndef INT_MAX
+#  define INT_MAX INT_MAX_32_BITS
+# endif
+
+# if INT_MAX == INT_MAX_32_BITS
+   typedef unsigned int md5_uint32;
+# else
+#  if SHRT_MAX == INT_MAX_32_BITS
+    typedef unsigned short md5_uint32;
+#  else
+#   if LONG_MAX == INT_MAX_32_BITS
+     typedef unsigned long md5_uint32;
+#   else
+     /* The following line is intended to evoke an error.
+        Using #error is not portable enough.  */
+     "Cannot determine unsigned 32-bit data type."
+#   endif
+#  endif
+# endif
+/* We have to make a guess about the integer type equivalent in size
+   to pointers which should always be correct.  */
+typedef unsigned long int md5_uintptr;
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Structure to save state of computation between the single steps.  */
+struct md5_ctx
+{
+  md5_uint32 A;
+  md5_uint32 B;
+  md5_uint32 C;
+  md5_uint32 D;
+
+  md5_uint32 total[2];
+  md5_uint32 buflen;
+  char buffer[128] ATTRIBUTE_ALIGNED_ALIGNOF(md5_uint32);
+};
+
+/*
+ * The following three functions are build up the low level used in
+ * the functions `md5_stream' and `md5_buffer'.
+ */
+
+/* Initialize structure containing state of computation.
+   (RFC 1321, 3.3: Step 3)  */
+extern void md5_init_ctx (struct md5_ctx *ctx);
+
+/* Starting with the result of former calls of this function (or the
+   initialization function update the context for the next LEN bytes
+   starting at BUFFER.
+   It is necessary that LEN is a multiple of 64!!! */
+extern void md5_process_block (const void *buffer, size_t len,
+                               struct md5_ctx *ctx);
+
+/* Starting with the result of former calls of this function (or the
+   initialization function update the context for the next LEN bytes
+   starting at BUFFER.
+   It is NOT required that LEN is a multiple of 64.  */
+extern void md5_process_bytes (const void *buffer, size_t len,
+                               struct md5_ctx *ctx);
+
+/* Process the remaining bytes in the buffer and put result from CTX
+   in first 16 bytes following RESBUF.  The result is always in little
+   endian byte order, so that a byte-wise output yields to the wanted
+   ASCII representation of the message digest.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32 bits value.  */
+extern void *md5_finish_ctx (struct md5_ctx *ctx, void *resbuf);
+
+
+/* Put result from CTX in first 16 bytes following RESBUF.  The result is
+   always in little endian byte order, so that a byte-wise output yields
+   to the wanted ASCII representation of the message digest.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32 bits value.  */
+extern void *md5_read_ctx (const struct md5_ctx *ctx, void *resbuf);
+
+
+/* Compute MD5 message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 16 bytes
+   beginning at RESBLOCK.  */
+extern int md5_stream (FILE *stream, void *resblock);
+
+/* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
+   result is always in little endian byte order, so that a byte-wise
+   output yields to the wanted ASCII representation of the message
+   digest.  */
+extern void *md5_buffer (const char *buffer, size_t len, void *resblock);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/objalloc.h sdcc-3.2.0+dfsg/support/sdbinutils/include/objalloc.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/objalloc.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/objalloc.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,115 @@
+/* objalloc.h -- routines to allocate memory for objects
+   Copyright 1997, 2001 Free Software Foundation, Inc.
+   Written by Ian Lance Taylor, Cygnus Solutions.
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#ifndef OBJALLOC_H
+#define OBJALLOC_H
+
+#include "ansidecl.h"
+
+/* These routines allocate space for an object.  The assumption is
+   that the object will want to allocate space as it goes along, but
+   will never want to free any particular block.  There is a function
+   to free a block, which also frees all more recently allocated
+   blocks.  There is also a function to free all the allocated space.
+
+   This is essentially a specialization of obstacks.  The main
+   difference is that a block may not be allocated a bit at a time.
+   Another difference is that these routines are always built on top
+   of malloc, and always pass an malloc failure back to the caller,
+   unlike more recent versions of obstacks.  */
+
+/* This is what an objalloc structure looks like.  Callers should not
+   refer to these fields, nor should they allocate these structure
+   themselves.  Instead, they should only create them via
+   objalloc_init, and only access them via the functions and macros
+   listed below.  The structure is only defined here so that we can
+   access it via macros.  */
+
+struct objalloc
+{
+  char *current_ptr;
+  unsigned int current_space;
+  void *chunks;
+};
+
+/* Work out the required alignment.  */
+
+struct objalloc_align { char x; double d; };
+
+#if defined (__STDC__) && __STDC__
+#ifndef offsetof
+#include <stddef.h>
+#endif
+#endif
+#ifndef offsetof
+#define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
+#endif
+#define OBJALLOC_ALIGN offsetof (struct objalloc_align, d)
+
+/* Create an objalloc structure.  Returns NULL if malloc fails.  */
+
+extern struct objalloc *objalloc_create (void);
+
+/* Allocate space from an objalloc structure.  Returns NULL if malloc
+   fails.  */
+
+extern void *_objalloc_alloc (struct objalloc *, unsigned long);
+
+/* The macro version of objalloc_alloc.  We only define this if using
+   gcc, because otherwise we would have to evaluate the arguments
+   multiple times, or use a temporary field as obstack.h does.  */
+
+#if defined (__GNUC__) && defined (__STDC__) && __STDC__
+
+/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
+   does not implement __extension__.  But that compiler doesn't define
+   __GNUC_MINOR__.  */
+#if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__)
+#define __extension__
+#endif
+
+#define objalloc_alloc(o, l)						\
+  __extension__								\
+  ({ struct objalloc *__o = (o);					\
+     unsigned long __len = (l);						\
+     if (__len == 0)							\
+       __len = 1;							\
+     __len = (__len + OBJALLOC_ALIGN - 1) &~ (OBJALLOC_ALIGN - 1);	\
+     (__len <= __o->current_space					\
+      ? (__o->current_ptr += __len,					\
+	 __o->current_space -= __len,					\
+	 (void *) (__o->current_ptr - __len))				\
+      : _objalloc_alloc (__o, __len)); })
+
+#else /* ! __GNUC__ */
+
+#define objalloc_alloc(o, l) _objalloc_alloc ((o), (l))
+
+#endif /* ! __GNUC__ */
+
+/* Free an entire objalloc structure.  */
+
+extern void objalloc_free (struct objalloc *);
+
+/* Free a block allocated by objalloc_alloc.  This also frees all more
+   recently allocated blocks.  */
+
+extern void objalloc_free_block (struct objalloc *, void *);
+
+#endif /* OBJALLOC_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/obstack.h sdcc-3.2.0+dfsg/support/sdbinutils/include/obstack.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/obstack.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/obstack.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,545 @@
+/* obstack.h - object stack macros
+   Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998,
+   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+   Free Software Foundation, Inc.
+
+
+   NOTE: The canonical source of this file is maintained with the GNU C Library.
+   Bugs can be reported to bug-glibc@gnu.org.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+/* Summary:
+
+All the apparent functions defined here are macros. The idea
+is that you would use these pre-tested macros to solve a
+very specific set of problems, and they would run fast.
+Caution: no side-effects in arguments please!! They may be
+evaluated MANY times!!
+
+These macros operate a stack of objects.  Each object starts life
+small, and may grow to maturity.  (Consider building a word syllable
+by syllable.)  An object can move while it is growing.  Once it has
+been "finished" it never changes address again.  So the "top of the
+stack" is typically an immature growing object, while the rest of the
+stack is of mature, fixed size and fixed address objects.
+
+These routines grab large chunks of memory, using a function you
+supply, called `obstack_chunk_alloc'.  On occasion, they free chunks,
+by calling `obstack_chunk_free'.  You must define them and declare
+them before using any obstack macros.
+
+Each independent stack is represented by a `struct obstack'.
+Each of the obstack macros expects a pointer to such a structure
+as the first argument.
+
+One motivation for this package is the problem of growing char strings
+in symbol tables.  Unless you are "fascist pig with a read-only mind"
+--Gosper's immortal quote from HAKMEM item 154, out of context--you
+would not like to put any arbitrary upper limit on the length of your
+symbols.
+
+In practice this often means you will build many short symbols and a
+few long symbols.  At the time you are reading a symbol you don't know
+how long it is.  One traditional method is to read a symbol into a
+buffer, realloc()ating the buffer every time you try to read a symbol
+that is longer than the buffer.  This is beaut, but you still will
+want to copy the symbol from the buffer to a more permanent
+symbol-table entry say about half the time.
+
+With obstacks, you can work differently.  Use one obstack for all symbol
+names.  As you read a symbol, grow the name in the obstack gradually.
+When the name is complete, finalize it.  Then, if the symbol exists already,
+free the newly read name.
+
+The way we do this is to take a large chunk, allocating memory from
+low addresses.  When you want to build a symbol in the chunk you just
+add chars above the current "high water mark" in the chunk.  When you
+have finished adding chars, because you got to the end of the symbol,
+you know how long the chars are, and you can create a new object.
+Mostly the chars will not burst over the highest address of the chunk,
+because you would typically expect a chunk to be (say) 100 times as
+long as an average object.
+
+In case that isn't clear, when we have enough chars to make up
+the object, THEY ARE ALREADY CONTIGUOUS IN THE CHUNK (guaranteed)
+so we just point to it where it lies.  No moving of chars is
+needed and this is the second win: potentially long strings need
+never be explicitly shuffled. Once an object is formed, it does not
+change its address during its lifetime.
+
+When the chars burst over a chunk boundary, we allocate a larger
+chunk, and then copy the partly formed object from the end of the old
+chunk to the beginning of the new larger chunk.  We then carry on
+accreting characters to the end of the object as we normally would.
+
+A special macro is provided to add a single char at a time to a
+growing object.  This allows the use of register variables, which
+break the ordinary 'growth' macro.
+
+Summary:
+	We allocate large chunks.
+	We carve out one object at a time from the current chunk.
+	Once carved, an object never moves.
+	We are free to append data of any size to the currently
+	  growing object.
+	Exactly one object is growing in an obstack at any one time.
+	You can run one obstack per control block.
+	You may have as many control blocks as you dare.
+	Because of the way we do it, you can `unwind' an obstack
+	  back to a previous state. (You may remove objects much
+	  as you would with a stack.)
+*/
+
+
+/* Don't do the contents of this file more than once.  */
+
+#ifndef _OBSTACK_H
+#define _OBSTACK_H 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* We use subtraction of (char *) 0 instead of casting to int
+   because on word-addressable machines a simple cast to int
+   may ignore the byte-within-word field of the pointer.  */
+
+#ifndef __PTR_TO_INT
+# define __PTR_TO_INT(P) ((P) - (char *) 0)
+#endif
+
+#ifndef __INT_TO_PTR
+# define __INT_TO_PTR(P) ((P) + (char *) 0)
+#endif
+
+/* We need the type of the resulting object.  If __PTRDIFF_TYPE__ is
+   defined, as with GNU C, use that; that way we don't pollute the
+   namespace with <stddef.h>'s symbols.  Otherwise, if <stddef.h> is
+   available, include it and use ptrdiff_t.  In traditional C, long is
+   the best that we can do.  */
+
+#ifdef __PTRDIFF_TYPE__
+# define PTR_INT_TYPE __PTRDIFF_TYPE__
+#else
+# ifdef HAVE_STDDEF_H
+#  include <stddef.h>
+#  define PTR_INT_TYPE ptrdiff_t
+# else
+#  define PTR_INT_TYPE long
+# endif
+#endif
+
+#if defined _LIBC || defined HAVE_STRING_H
+# include <string.h>
+# define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N))
+#else
+# ifdef memcpy
+#  define _obstack_memcpy(To, From, N) memcpy ((To), (char *)(From), (N))
+# else
+#  define _obstack_memcpy(To, From, N) bcopy ((char *)(From), (To), (N))
+# endif
+#endif
+
+struct _obstack_chunk		/* Lives at front of each chunk. */
+{
+  char  *limit;			/* 1 past end of this chunk */
+  struct _obstack_chunk *prev;	/* address of prior chunk or NULL */
+  char	contents[4];		/* objects begin here */
+};
+
+struct obstack		/* control current object in current chunk */
+{
+  long	chunk_size;		/* preferred size to allocate chunks in */
+  struct _obstack_chunk *chunk;	/* address of current struct obstack_chunk */
+  char	*object_base;		/* address of object we are building */
+  char	*next_free;		/* where to add next char to current object */
+  char	*chunk_limit;		/* address of char after current chunk */
+  PTR_INT_TYPE temp;		/* Temporary for some macros.  */
+  int   alignment_mask;		/* Mask of alignment for each object. */
+  /* These prototypes vary based on `use_extra_arg', and we use
+     casts to the prototypeless function type in all assignments,
+     but having prototypes here quiets -Wstrict-prototypes.  */
+  struct _obstack_chunk *(*chunkfun) (void *, long);
+  void (*freefun) (void *, struct _obstack_chunk *);
+  void *extra_arg;		/* first arg for chunk alloc/dealloc funcs */
+  unsigned use_extra_arg:1;	/* chunk alloc/dealloc funcs take extra arg */
+  unsigned maybe_empty_object:1;/* There is a possibility that the current
+				   chunk contains a zero-length object.  This
+				   prevents freeing the chunk if we allocate
+				   a bigger chunk to replace it. */
+  unsigned alloc_failed:1;	/* No longer used, as we now call the failed
+				   handler on error, but retained for binary
+				   compatibility.  */
+};
+
+/* Declare the external functions we use; they are in obstack.c.  */
+
+extern void _obstack_newchunk (struct obstack *, int);
+extern void _obstack_free (struct obstack *, void *);
+extern int _obstack_begin (struct obstack *, int, int,
+			    void *(*) (long), void (*) (void *));
+extern int _obstack_begin_1 (struct obstack *, int, int,
+			     void *(*) (void *, long),
+			     void (*) (void *, void *), void *);
+extern int _obstack_memory_used (struct obstack *);
+
+/* Do the function-declarations after the structs
+   but before defining the macros.  */
+
+void obstack_init (struct obstack *obstack);
+
+void * obstack_alloc (struct obstack *obstack, int size);
+
+void * obstack_copy (struct obstack *obstack, void *address, int size);
+void * obstack_copy0 (struct obstack *obstack, void *address, int size);
+
+void obstack_free (struct obstack *obstack, void *block);
+
+void obstack_blank (struct obstack *obstack, int size);
+
+void obstack_grow (struct obstack *obstack, void *data, int size);
+void obstack_grow0 (struct obstack *obstack, void *data, int size);
+
+void obstack_1grow (struct obstack *obstack, int data_char);
+void obstack_ptr_grow (struct obstack *obstack, void *data);
+void obstack_int_grow (struct obstack *obstack, int data);
+
+void * obstack_finish (struct obstack *obstack);
+
+int obstack_object_size (struct obstack *obstack);
+
+int obstack_room (struct obstack *obstack);
+void obstack_make_room (struct obstack *obstack, int size);
+void obstack_1grow_fast (struct obstack *obstack, int data_char);
+void obstack_ptr_grow_fast (struct obstack *obstack, void *data);
+void obstack_int_grow_fast (struct obstack *obstack, int data);
+void obstack_blank_fast (struct obstack *obstack, int size);
+
+void * obstack_base (struct obstack *obstack);
+void * obstack_next_free (struct obstack *obstack);
+int obstack_alignment_mask (struct obstack *obstack);
+int obstack_chunk_size (struct obstack *obstack);
+int obstack_memory_used (struct obstack *obstack);
+
+/* Error handler called when `obstack_chunk_alloc' failed to allocate
+   more memory.  This can be set to a user defined function.  The
+   default action is to print a message and abort.  */
+extern void (*obstack_alloc_failed_handler) (void);
+
+/* Exit value used when `print_and_abort' is used.  */
+extern int obstack_exit_failure;
+
+/* Pointer to beginning of object being allocated or to be allocated next.
+   Note that this might not be the final address of the object
+   because a new chunk might be needed to hold the final size.  */
+
+#define obstack_base(h) ((h)->object_base)
+
+/* Size for allocating ordinary chunks.  */
+
+#define obstack_chunk_size(h) ((h)->chunk_size)
+
+/* Pointer to next byte not yet allocated in current chunk.  */
+
+#define obstack_next_free(h)	((h)->next_free)
+
+/* Mask specifying low bits that should be clear in address of an object.  */
+
+#define obstack_alignment_mask(h) ((h)->alignment_mask)
+
+/* To prevent prototype warnings provide complete argument list in
+   standard C version.  */
+# define obstack_init(h) \
+  _obstack_begin ((h), 0, 0, \
+		  (void *(*) (long)) obstack_chunk_alloc, (void (*) (void *)) obstack_chunk_free)
+
+# define obstack_begin(h, size) \
+  _obstack_begin ((h), (size), 0, \
+		  (void *(*) (long)) obstack_chunk_alloc, (void (*) (void *)) obstack_chunk_free)
+
+# define obstack_specify_allocation(h, size, alignment, chunkfun, freefun) \
+  _obstack_begin ((h), (size), (alignment), \
+		    (void *(*) (long)) (chunkfun), (void (*) (void *)) (freefun))
+
+# define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
+  _obstack_begin_1 ((h), (size), (alignment), \
+		    (void *(*) (void *, long)) (chunkfun), \
+		    (void (*) (void *, void *)) (freefun), (arg))
+
+# define obstack_chunkfun(h, newchunkfun) \
+  ((h) -> chunkfun = (struct _obstack_chunk *(*)(void *, long)) (newchunkfun))
+
+# define obstack_freefun(h, newfreefun) \
+  ((h) -> freefun = (void (*)(void *, struct _obstack_chunk *)) (newfreefun))
+
+#define obstack_1grow_fast(h,achar) (*((h)->next_free)++ = (achar))
+
+#define obstack_blank_fast(h,n) ((h)->next_free += (n))
+
+#define obstack_memory_used(h) _obstack_memory_used (h)
+
+#if defined __GNUC__ && defined __STDC__ && __STDC__
+/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
+   does not implement __extension__.  But that compiler doesn't define
+   __GNUC_MINOR__.  */
+# if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__)
+#  define __extension__
+# endif
+
+/* For GNU C, if not -traditional,
+   we can define these macros to compute all args only once
+   without using a global variable.
+   Also, we can avoid using the `temp' slot, to make faster code.  */
+
+# define obstack_object_size(OBSTACK)					\
+  __extension__								\
+  ({ struct obstack *__o = (OBSTACK);					\
+     (unsigned) (__o->next_free - __o->object_base); })
+
+# define obstack_room(OBSTACK)						\
+  __extension__								\
+  ({ struct obstack *__o = (OBSTACK);					\
+     (unsigned) (__o->chunk_limit - __o->next_free); })
+
+# define obstack_make_room(OBSTACK,length)				\
+__extension__								\
+({ struct obstack *__o = (OBSTACK);					\
+   int __len = (length);						\
+   if (__o->chunk_limit - __o->next_free < __len)			\
+     _obstack_newchunk (__o, __len);					\
+   (void) 0; })
+
+# define obstack_empty_p(OBSTACK)					\
+  __extension__								\
+  ({ struct obstack *__o = (OBSTACK);					\
+     (__o->chunk->prev == 0 && __o->next_free - __o->chunk->contents == 0); })
+
+# define obstack_grow(OBSTACK,where,length)				\
+__extension__								\
+({ struct obstack *__o = (OBSTACK);					\
+   int __len = (length);						\
+   if (__o->next_free + __len > __o->chunk_limit)			\
+     _obstack_newchunk (__o, __len);					\
+   _obstack_memcpy (__o->next_free, (where), __len);			\
+   __o->next_free += __len;						\
+   (void) 0; })
+
+# define obstack_grow0(OBSTACK,where,length)				\
+__extension__								\
+({ struct obstack *__o = (OBSTACK);					\
+   int __len = (length);						\
+   if (__o->next_free + __len + 1 > __o->chunk_limit)			\
+     _obstack_newchunk (__o, __len + 1);				\
+   _obstack_memcpy (__o->next_free, (where), __len);			\
+   __o->next_free += __len;						\
+   *(__o->next_free)++ = 0;						\
+   (void) 0; })
+
+# define obstack_1grow(OBSTACK,datum)					\
+__extension__								\
+({ struct obstack *__o = (OBSTACK);					\
+   if (__o->next_free + 1 > __o->chunk_limit)				\
+     _obstack_newchunk (__o, 1);					\
+   obstack_1grow_fast (__o, datum);					\
+   (void) 0; })
+
+/* These assume that the obstack alignment is good enough for pointers or ints,
+   and that the data added so far to the current object
+   shares that much alignment.  */
+
+# define obstack_ptr_grow(OBSTACK,datum)				\
+__extension__								\
+({ struct obstack *__o = (OBSTACK);					\
+   if (__o->next_free + sizeof (void *) > __o->chunk_limit)		\
+     _obstack_newchunk (__o, sizeof (void *));				\
+   obstack_ptr_grow_fast (__o, datum); })
+
+# define obstack_int_grow(OBSTACK,datum)				\
+__extension__								\
+({ struct obstack *__o = (OBSTACK);					\
+   if (__o->next_free + sizeof (int) > __o->chunk_limit)		\
+     _obstack_newchunk (__o, sizeof (int));				\
+   obstack_int_grow_fast (__o, datum); })
+
+# define obstack_ptr_grow_fast(OBSTACK,aptr)				\
+__extension__								\
+({ struct obstack *__o1 = (OBSTACK);					\
+   *(const void **) __o1->next_free = (aptr);				\
+   __o1->next_free += sizeof (const void *);				\
+   (void) 0; })
+
+# define obstack_int_grow_fast(OBSTACK,aint)				\
+__extension__								\
+({ struct obstack *__o1 = (OBSTACK);					\
+   *(int *) __o1->next_free = (aint);					\
+   __o1->next_free += sizeof (int);					\
+   (void) 0; })
+
+# define obstack_blank(OBSTACK,length)					\
+__extension__								\
+({ struct obstack *__o = (OBSTACK);					\
+   int __len = (length);						\
+   if (__o->chunk_limit - __o->next_free < __len)			\
+     _obstack_newchunk (__o, __len);					\
+   obstack_blank_fast (__o, __len);					\
+   (void) 0; })
+
+# define obstack_alloc(OBSTACK,length)					\
+__extension__								\
+({ struct obstack *__h = (OBSTACK);					\
+   obstack_blank (__h, (length));					\
+   obstack_finish (__h); })
+
+# define obstack_copy(OBSTACK,where,length)				\
+__extension__								\
+({ struct obstack *__h = (OBSTACK);					\
+   obstack_grow (__h, (where), (length));				\
+   obstack_finish (__h); })
+
+# define obstack_copy0(OBSTACK,where,length)				\
+__extension__								\
+({ struct obstack *__h = (OBSTACK);					\
+   obstack_grow0 (__h, (where), (length));				\
+   obstack_finish (__h); })
+
+/* The local variable is named __o1 to avoid a name conflict
+   when obstack_blank is called.  */
+# define obstack_finish(OBSTACK)  					\
+__extension__								\
+({ struct obstack *__o1 = (OBSTACK);					\
+   void *value;								\
+   value = (void *) __o1->object_base;					\
+   if (__o1->next_free == value)					\
+     __o1->maybe_empty_object = 1;					\
+   __o1->next_free							\
+     = __INT_TO_PTR ((__PTR_TO_INT (__o1->next_free)+__o1->alignment_mask)\
+		     & ~ (__o1->alignment_mask));			\
+   if (__o1->next_free - (char *)__o1->chunk				\
+       > __o1->chunk_limit - (char *)__o1->chunk)			\
+     __o1->next_free = __o1->chunk_limit;				\
+   __o1->object_base = __o1->next_free;					\
+   value; })
+
+# define obstack_free(OBSTACK, OBJ)					\
+__extension__								\
+({ struct obstack *__o = (OBSTACK);					\
+   void *__obj = (void *) (OBJ);					\
+   if (__obj > (void *)__o->chunk && __obj < (void *)__o->chunk_limit)  \
+     __o->next_free = __o->object_base = (char *) __obj;		\
+   else (obstack_free) (__o, __obj); })
+
+#else /* not __GNUC__ or not __STDC__ */
+
+# define obstack_object_size(h) \
+ (unsigned) ((h)->next_free - (h)->object_base)
+
+# define obstack_room(h)		\
+ (unsigned) ((h)->chunk_limit - (h)->next_free)
+
+# define obstack_empty_p(h) \
+ ((h)->chunk->prev == 0 && (h)->next_free - (h)->chunk->contents == 0)
+
+/* Note that the call to _obstack_newchunk is enclosed in (..., 0)
+   so that we can avoid having void expressions
+   in the arms of the conditional expression.
+   Casting the third operand to void was tried before,
+   but some compilers won't accept it.  */
+
+# define obstack_make_room(h,length)					\
+( (h)->temp = (length),							\
+  (((h)->next_free + (h)->temp > (h)->chunk_limit)			\
+   ? (_obstack_newchunk ((h), (h)->temp), 0) : 0))
+
+# define obstack_grow(h,where,length)					\
+( (h)->temp = (length),							\
+  (((h)->next_free + (h)->temp > (h)->chunk_limit)			\
+   ? (_obstack_newchunk ((h), (h)->temp), 0) : 0),			\
+  _obstack_memcpy ((h)->next_free, (where), (h)->temp),			\
+  (h)->next_free += (h)->temp)
+
+# define obstack_grow0(h,where,length)					\
+( (h)->temp = (length),							\
+  (((h)->next_free + (h)->temp + 1 > (h)->chunk_limit)			\
+   ? (_obstack_newchunk ((h), (h)->temp + 1), 0) : 0),			\
+  _obstack_memcpy ((h)->next_free, (where), (h)->temp),			\
+  (h)->next_free += (h)->temp,						\
+  *((h)->next_free)++ = 0)
+
+# define obstack_1grow(h,datum)						\
+( (((h)->next_free + 1 > (h)->chunk_limit)				\
+   ? (_obstack_newchunk ((h), 1), 0) : 0),				\
+  obstack_1grow_fast (h, datum))
+
+# define obstack_ptr_grow(h,datum)					\
+( (((h)->next_free + sizeof (char *) > (h)->chunk_limit)		\
+   ? (_obstack_newchunk ((h), sizeof (char *)), 0) : 0),		\
+  obstack_ptr_grow_fast (h, datum))
+
+# define obstack_int_grow(h,datum)					\
+( (((h)->next_free + sizeof (int) > (h)->chunk_limit)			\
+   ? (_obstack_newchunk ((h), sizeof (int)), 0) : 0),			\
+  obstack_int_grow_fast (h, datum))
+
+# define obstack_ptr_grow_fast(h,aptr)					\
+  (((const void **) ((h)->next_free += sizeof (void *)))[-1] = (aptr))
+
+# define obstack_int_grow_fast(h,aint)					\
+  (((int *) ((h)->next_free += sizeof (int)))[-1] = (aptr))
+
+# define obstack_blank(h,length)					\
+( (h)->temp = (length),							\
+  (((h)->chunk_limit - (h)->next_free < (h)->temp)			\
+   ? (_obstack_newchunk ((h), (h)->temp), 0) : 0),			\
+  obstack_blank_fast (h, (h)->temp))
+
+# define obstack_alloc(h,length)					\
+ (obstack_blank ((h), (length)), obstack_finish ((h)))
+
+# define obstack_copy(h,where,length)					\
+ (obstack_grow ((h), (where), (length)), obstack_finish ((h)))
+
+# define obstack_copy0(h,where,length)					\
+ (obstack_grow0 ((h), (where), (length)), obstack_finish ((h)))
+
+# define obstack_finish(h)  						\
+( ((h)->next_free == (h)->object_base					\
+   ? (((h)->maybe_empty_object = 1), 0)					\
+   : 0),								\
+  (h)->temp = __PTR_TO_INT ((h)->object_base),				\
+  (h)->next_free							\
+    = __INT_TO_PTR ((__PTR_TO_INT ((h)->next_free)+(h)->alignment_mask)	\
+		    & ~ ((h)->alignment_mask)),				\
+  (((h)->next_free - (char *) (h)->chunk				\
+    > (h)->chunk_limit - (char *) (h)->chunk)				\
+   ? ((h)->next_free = (h)->chunk_limit) : 0),				\
+  (h)->object_base = (h)->next_free,					\
+  (void *) __INT_TO_PTR ((h)->temp))
+
+# define obstack_free(h,obj)						\
+( (h)->temp = (char *) (obj) - (char *) (h)->chunk,			\
+  (((h)->temp > 0 && (h)->temp < (h)->chunk_limit - (char *) (h)->chunk)\
+   ? (int) ((h)->next_free = (h)->object_base				\
+	    = (h)->temp + (char *) (h)->chunk)				\
+   : (((obstack_free) ((h), (h)->temp + (char *) (h)->chunk), 0), 0)))
+
+#endif /* not __GNUC__ or not __STDC__ */
+
+#ifdef __cplusplus
+}	/* C++ */
+#endif
+
+#endif /* obstack.h */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/opcode/sparc.h sdcc-3.2.0+dfsg/support/sdbinutils/include/opcode/sparc.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/opcode/sparc.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/opcode/sparc.h	2012-02-16 07:35:16.000000000 +0000
@@ -0,0 +1,258 @@
+/* Definitions for opcode table for the sparc.
+   Copyright 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000, 2002,
+   2003, 2005, 2010, 2011 Free Software Foundation, Inc.
+
+   This file is part of GAS, the GNU Assembler, GDB, the GNU debugger, and
+   the GNU Binutils.
+
+   GAS/GDB is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   GAS/GDB 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 GAS or GDB; see the file COPYING3.  If not, write to
+   the Free Software Foundation, 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+#include "ansidecl.h"
+
+/* The SPARC opcode table (and other related data) is defined in
+   the opcodes library in sparc-opc.c.  If you change anything here, make
+   sure you fix up that file, and vice versa.  */
+
+ /* FIXME-someday: perhaps the ,a's and such should be embedded in the
+    instruction's name rather than the args.  This would make gas faster, pinsn
+    slower, but would mess up some macros a bit.  xoxorich. */
+
+/* List of instruction sets variations.
+   These values are such that each element is either a superset of a
+   preceding each one or they conflict in which case SPARC_OPCODE_CONFLICT_P
+   returns non-zero.
+   The values are indices into `sparc_opcode_archs' defined in sparc-opc.c.
+   Don't change this without updating sparc-opc.c.  */
+
+enum sparc_opcode_arch_val
+{
+  SPARC_OPCODE_ARCH_V6 = 0,
+  SPARC_OPCODE_ARCH_V7,
+  SPARC_OPCODE_ARCH_V8,
+  SPARC_OPCODE_ARCH_SPARCLET,
+  SPARC_OPCODE_ARCH_SPARCLITE,
+  /* V9 variants must appear last.  */
+  SPARC_OPCODE_ARCH_V9,
+  SPARC_OPCODE_ARCH_V9A, /* V9 with ultrasparc additions.  */
+  SPARC_OPCODE_ARCH_V9B, /* V9 with ultrasparc and cheetah additions.  */
+  SPARC_OPCODE_ARCH_BAD  /* Error return from sparc_opcode_lookup_arch.  */
+};
+
+/* The highest architecture in the table.  */
+#define SPARC_OPCODE_ARCH_MAX (SPARC_OPCODE_ARCH_BAD - 1)
+
+/* Given an enum sparc_opcode_arch_val, return the bitmask to use in
+   insn encoding/decoding.  */
+#define SPARC_OPCODE_ARCH_MASK(arch) (1 << (arch))
+
+/* Given a valid sparc_opcode_arch_val, return non-zero if it's v9.  */
+#define SPARC_OPCODE_ARCH_V9_P(arch) ((arch) >= SPARC_OPCODE_ARCH_V9)
+
+/* Table of cpu variants.  */
+
+typedef struct sparc_opcode_arch
+{
+  const char *name;
+  /* Mask of sparc_opcode_arch_val's supported.
+     EG: For v7 this would be
+     (SPARC_OPCODE_ARCH_MASK (..._V6) | SPARC_OPCODE_ARCH_MASK (..._V7)).
+     These are short's because sparc_opcode.architecture is.  */
+  short supported;
+} sparc_opcode_arch;
+
+extern const struct sparc_opcode_arch sparc_opcode_archs[];
+
+/* Given architecture name, look up it's sparc_opcode_arch_val value.  */
+extern enum sparc_opcode_arch_val sparc_opcode_lookup_arch (const char *);
+
+/* Return the bitmask of supported architectures for ARCH.  */
+#define SPARC_OPCODE_SUPPORTED(ARCH) (sparc_opcode_archs[ARCH].supported)
+
+/* Non-zero if ARCH1 conflicts with ARCH2.
+   IE: ARCH1 as a supported bit set that ARCH2 doesn't, and vice versa.  */
+#define SPARC_OPCODE_CONFLICT_P(ARCH1, ARCH2) \
+ (((SPARC_OPCODE_SUPPORTED (ARCH1) & SPARC_OPCODE_SUPPORTED (ARCH2)) \
+   != SPARC_OPCODE_SUPPORTED (ARCH1)) \
+  && ((SPARC_OPCODE_SUPPORTED (ARCH1) & SPARC_OPCODE_SUPPORTED (ARCH2)) \
+     != SPARC_OPCODE_SUPPORTED (ARCH2)))
+
+/* Structure of an opcode table entry.  */
+
+typedef struct sparc_opcode
+{
+  const char *name;
+  unsigned long match;	/* Bits that must be set.  */
+  unsigned long lose;	/* Bits that must not be set.  */
+  const char *args;
+  /* This was called "delayed" in versions before the flags.  */
+  unsigned int flags;
+  short architecture;	/* Bitmask of sparc_opcode_arch_val's.  */
+} sparc_opcode;
+
+/* FIXME: Add F_ANACHRONISTIC flag for v9.  */
+#define	F_DELAYED	0x00000001 /* Delayed branch.  */
+#define	F_ALIAS		0x00000002 /* Alias for a "real" instruction.  */
+#define	F_UNBR		0x00000004 /* Unconditional branch.  */
+#define	F_CONDBR	0x00000008 /* Conditional branch.  */
+#define	F_JSR		0x00000010 /* Subroutine call.  */
+#define F_FLOAT		0x00000020 /* Floating point instruction (not a branch).  */
+#define F_FBR		0x00000040 /* Floating point branch.  */
+#define F_MUL32		0x00000100 /* umul/umulcc/smul/smulcc insns */
+#define F_DIV32		0x00000200 /* udiv/udivcc/sdiv/sdivcc insns */
+#define F_FSMULD	0x00000400 /* 'fsmuld' insn */
+#define F_V8PLUS	0x00000800 /* v9 insns available to 32bit */
+#define F_POPC		0x00001000 /* 'popc' insn */
+#define F_VIS		0x00002000 /* VIS insns */
+#define F_VIS2		0x00004000 /* VIS2 insns */
+#define F_ASI_BLK_INIT	0x00008000 /* block init ASIs */
+#define F_FMAF		0x00010000 /* fused multiply-add */
+#define F_VIS3		0x00020000 /* VIS3 insns */
+#define F_HPC		0x00040000 /* HPC insns */
+#define F_RANDOM	0x00080000 /* 'random' insn */
+#define F_TRANS		0x00100000 /* transaction insns */
+#define F_FJFMAU	0x00200000 /* unfused multiply-add */
+#define F_IMA		0x00400000 /* integer multiply-add */
+#define F_ASI_CACHE_SPARING \
+			0x00800000 /* cache sparing ASIs */
+
+#define F_HWCAP_MASK	0x00ffff00
+
+/* All sparc opcodes are 32 bits, except for the `set' instruction (really a
+   macro), which is 64 bits. It is handled as a special case.
+
+   The match component is a mask saying which bits must match a particular
+   opcode in order for an instruction to be an instance of that opcode.
+
+   The args component is a string containing one character for each operand of the
+   instruction.
+
+   Kinds of operands:
+	#	Number used by optimizer.	It is ignored.
+	1	rs1 register.
+	2	rs2 register.
+	d	rd register.
+	e	frs1 floating point register.
+	v	frs1 floating point register (double/even).
+	V	frs1 floating point register (quad/multiple of 4).
+	f	frs2 floating point register.
+	B	frs2 floating point register (double/even).
+	R	frs2 floating point register (quad/multiple of 4).
+	4	frs3 floating point register.
+	5	frs3 floating point register (doube/even).
+	g	frsd floating point register.
+	H	frsd floating point register (double/even).
+	J	frsd floating point register (quad/multiple of 4).
+	b	crs1 coprocessor register
+	c	crs2 coprocessor register
+	D	crsd coprocessor register
+	m	alternate space register (asr) in rd
+	M	alternate space register (asr) in rs1
+	h	22 high bits.
+	X	5 bit unsigned immediate
+	Y	6 bit unsigned immediate
+	3	SIAM mode (3 bits). (v9b)
+	K	MEMBAR mask (7 bits). (v9)
+	j	10 bit Immediate. (v9)
+	I	11 bit Immediate. (v9)
+	i	13 bit Immediate.
+	n	22 bit immediate.
+	k	2+14 bit PC relative immediate. (v9)
+	G	19 bit PC relative immediate. (v9)
+	l	22 bit PC relative immediate.
+	L	30 bit PC relative immediate.
+	a	Annul.	The annul bit is set.
+	A	Alternate address space. Stored as 8 bits.
+	C	Coprocessor state register.
+	F	floating point state register.
+	p	Processor state register.
+	N	Branch predict clear ",pn" (v9)
+	T	Branch predict set ",pt" (v9)
+	z	%icc. (v9)
+	Z	%xcc. (v9)
+	q	Floating point queue.
+	r	Single register that is both rs1 and rd.
+	O	Single register that is both rs2 and rd.
+	Q	Coprocessor queue.
+	S	Special case.
+	t	Trap base register.
+	w	Window invalid mask register.
+	y	Y register.
+	u	sparclet coprocessor registers in rd position
+	U	sparclet coprocessor registers in rs1 position
+	E	%ccr. (v9)
+	s	%fprs. (v9)
+	P	%pc.  (v9)
+	W	%tick.	(v9)
+	o	%asi. (v9)
+	6	%fcc0. (v9)
+	7	%fcc1. (v9)
+	8	%fcc2. (v9)
+	9	%fcc3. (v9)
+	!	Privileged Register in rd (v9)
+	?	Privileged Register in rs1 (v9)
+	*	Prefetch function constant. (v9)
+	x	OPF field (v9 impdep).
+	0	32/64 bit immediate for set or setx (v9) insns
+	_	Ancillary state register in rd (v9a)
+	/	Ancillary state register in rs1 (v9a)
+	(	entire floating point state register (%efsr).  */
+
+#define OP2(x)		(((x) & 0x7) << 22)  /* Op2 field of format2 insns.  */
+#define OP3(x)		(((x) & 0x3f) << 19) /* Op3 field of format3 insns.  */
+#define OP(x)		((unsigned) ((x) & 0x3) << 30) /* Op field of all insns.  */
+#define OPF(x)		(((x) & 0x1ff) << 5) /* Opf field of float insns.  */
+#define OPF_LOW5(x)	OPF ((x) & 0x1f)     /* V9.  */
+#define OPF_LOW4(x)	OPF ((x) & 0xf)      /* V9.  */
+#define F3F(x, y, z)	(OP (x) | OP3 (y) | OPF (z)) /* Format3 float insns.  */
+#define F3I(x)		(((x) & 0x1) << 13)  /* Immediate field of format 3 insns.  */
+#define F2(x, y)	(OP (x) | OP2(y))    /* Format 2 insns.  */
+#define F3(x, y, z)	(OP (x) | OP3(y) | F3I(z)) /* Format3 insns.  */
+#define F1(x)		(OP (x))
+#define DISP30(x)	((x) & 0x3fffffff)
+#define ASI(x)		(((x) & 0xff) << 5)  /* Asi field of format3 insns.  */
+#define RS2(x)		((x) & 0x1f)         /* Rs2 field.  */
+#define SIMM13(x)	((x) & 0x1fff)       /* Simm13 field.  */
+#define RD(x)		(((x) & 0x1f) << 25) /* Destination register field.  */
+#define RS1(x)		(((x) & 0x1f) << 14) /* Rs1 field.  */
+#define RS3(x)		(((x) & 0x1f) << 9)  /* Rs3 field.  */
+#define ASI_RS2(x)	(SIMM13 (x))
+#define MEMBAR(x)	((x) & 0x7f)
+#define SLCPOP(x)	(((x) & 0x7f) << 6)  /* Sparclet cpop.  */
+
+#define ANNUL	(1 << 29)
+#define BPRED	(1 << 19)	/* V9.  */
+#define	IMMED	F3I (1)
+#define RD_G0	RD (~0)
+#define	RS1_G0	RS1 (~0)
+#define	RS2_G0	RS2 (~0)
+
+extern const struct sparc_opcode sparc_opcodes[];
+extern const int sparc_num_opcodes;
+
+extern int sparc_encode_asi (const char *);
+extern const char *sparc_decode_asi (int);
+extern int sparc_encode_membar (const char *);
+extern const char *sparc_decode_membar (int);
+extern int sparc_encode_prefetch (const char *);
+extern const char *sparc_decode_prefetch (int);
+extern int sparc_encode_sparclet_cpreg (const char *);
+extern const char *sparc_decode_sparclet_cpreg (int);
+
+/* Local Variables:
+   fill-column: 131
+   comment-column: 0
+   End: */
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/partition.h sdcc-3.2.0+dfsg/support/sdbinutils/include/partition.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/partition.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/partition.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,82 @@
+/* List implementation of a partition of consecutive integers.
+   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+   Contributed by CodeSourcery, LLC.
+
+   This file is part of GCC.
+
+   GCC is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   GCC 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 GCC; see the file COPYING.  If not, write to
+   the Free Software Foundation, 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* This package implements a partition of consecutive integers.  The
+   elements are partitioned into classes.  Each class is represented
+   by one of its elements, the canonical element, which is chosen
+   arbitrarily from elements in the class.  The principal operations
+   on a partition are FIND, which takes an element, determines its
+   class, and returns the canonical element for that class, and UNION,
+   which unites the two classes that contain two given elements into a
+   single class.
+
+   The list implementation used here provides constant-time finds.  By
+   storing the size of each class with the class's canonical element,
+   it is able to perform unions over all the classes in the partition
+   in O (N log N) time.  */
+
+#ifndef _PARTITION_H
+#define _PARTITION_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include "ansidecl.h"
+#include <stdio.h>
+
+struct partition_elem
+{
+  /* The canonical element that represents the class containing this
+     element.  */
+  int class_element;
+  /* The next element in this class.  Elements in each class form a
+     circular list.  */
+  struct partition_elem* next;
+  /* The number of elements in this class.  Valid only if this is the
+     canonical element for its class.  */
+  unsigned class_count;
+};
+
+typedef struct partition_def 
+{
+  /* The number of elements in this partition.  */
+  int num_elements;
+  /* The elements in the partition.  */
+  struct partition_elem elements[1];
+} *partition;
+
+extern partition partition_new (int);
+extern void partition_delete (partition);
+extern int partition_union (partition, int, int);
+extern void partition_print (partition,	FILE*);
+
+/* Returns the canonical element corresponding to the class containing
+   ELEMENT__ in PARTITION__.  */
+
+#define partition_find(partition__, element__) \
+    ((partition__)->elements[(element__)].class_element)
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* _PARTITION_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/progress.h sdcc-3.2.0+dfsg/support/sdbinutils/include/progress.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/progress.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/progress.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,38 @@
+/* Default definitions for progress macros.
+   Copyright 1994, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+/* The default definitions below are intended to be replaced by real
+   definitions, if building the tools for an interactive programming
+   environment.  */
+
+#ifndef _PROGRESS_H
+#define _PROGRESS_H
+
+#ifndef START_PROGRESS
+#define START_PROGRESS(STR,N)
+#endif
+
+#ifndef PROGRESS
+#define PROGRESS(X)
+#endif
+
+#ifndef END_PROGRESS
+#define END_PROGRESS(STR)
+#endif
+
+#endif /* _PROGRESS_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/safe-ctype.h sdcc-3.2.0+dfsg/support/sdbinutils/include/safe-ctype.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/safe-ctype.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/safe-ctype.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,150 @@
+/* <ctype.h> replacement macros.
+
+   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Contributed by Zack Weinberg <zackw@stanford.edu>.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/* This is a compatible replacement of the standard C library's <ctype.h>
+   with the following properties:
+
+   - Implements all isxxx() macros required by C99.
+   - Also implements some character classes useful when
+     parsing C-like languages.
+   - Does not change behavior depending on the current locale.
+   - Behaves properly for all values in the range of a signed or
+     unsigned char.
+
+   To avoid conflicts, this header defines the isxxx functions in upper
+   case, e.g. ISALPHA not isalpha.  */
+
+#ifndef SAFE_CTYPE_H
+#define SAFE_CTYPE_H
+
+/* Determine host character set.  */
+#define HOST_CHARSET_UNKNOWN 0
+#define HOST_CHARSET_ASCII   1
+#define HOST_CHARSET_EBCDIC  2
+
+#if  '\n' == 0x0A && ' ' == 0x20 && '0' == 0x30 \
+   && 'A' == 0x41 && 'a' == 0x61 && '!' == 0x21
+#  define HOST_CHARSET HOST_CHARSET_ASCII
+#else
+# if '\n' == 0x15 && ' ' == 0x40 && '0' == 0xF0 \
+   && 'A' == 0xC1 && 'a' == 0x81 && '!' == 0x5A
+#  define HOST_CHARSET HOST_CHARSET_EBCDIC
+# else
+#  define HOST_CHARSET HOST_CHARSET_UNKNOWN
+# endif
+#endif
+
+/* Categories.  */
+
+enum {
+  /* In C99 */
+  _sch_isblank  = 0x0001,	/* space \t */
+  _sch_iscntrl  = 0x0002,	/* nonprinting characters */
+  _sch_isdigit  = 0x0004,	/* 0-9 */
+  _sch_islower  = 0x0008,	/* a-z */
+  _sch_isprint  = 0x0010,	/* any printing character including ' ' */
+  _sch_ispunct  = 0x0020,	/* all punctuation */
+  _sch_isspace  = 0x0040,	/* space \t \n \r \f \v */
+  _sch_isupper  = 0x0080,	/* A-Z */
+  _sch_isxdigit = 0x0100,	/* 0-9A-Fa-f */
+
+  /* Extra categories useful to cpplib.  */
+  _sch_isidst	= 0x0200,	/* A-Za-z_ */
+  _sch_isvsp    = 0x0400,	/* \n \r */
+  _sch_isnvsp   = 0x0800,	/* space \t \f \v \0 */
+
+  /* Combinations of the above.  */
+  _sch_isalpha  = _sch_isupper|_sch_islower,	/* A-Za-z */
+  _sch_isalnum  = _sch_isalpha|_sch_isdigit,	/* A-Za-z0-9 */
+  _sch_isidnum  = _sch_isidst|_sch_isdigit,	/* A-Za-z0-9_ */
+  _sch_isgraph  = _sch_isalnum|_sch_ispunct,	/* isprint and not space */
+  _sch_iscppsp  = _sch_isvsp|_sch_isnvsp,	/* isspace + \0 */
+  _sch_isbasic  = _sch_isprint|_sch_iscppsp     /* basic charset of ISO C
+						   (plus ` and @)  */
+};
+
+/* Character classification.  */
+extern const unsigned short _sch_istable[256];
+
+#define _sch_test(c, bit) (_sch_istable[(c) & 0xff] & (unsigned short)(bit))
+
+#define ISALPHA(c)  _sch_test(c, _sch_isalpha)
+#define ISALNUM(c)  _sch_test(c, _sch_isalnum)
+#define ISBLANK(c)  _sch_test(c, _sch_isblank)
+#define ISCNTRL(c)  _sch_test(c, _sch_iscntrl)
+#define ISDIGIT(c)  _sch_test(c, _sch_isdigit)
+#define ISGRAPH(c)  _sch_test(c, _sch_isgraph)
+#define ISLOWER(c)  _sch_test(c, _sch_islower)
+#define ISPRINT(c)  _sch_test(c, _sch_isprint)
+#define ISPUNCT(c)  _sch_test(c, _sch_ispunct)
+#define ISSPACE(c)  _sch_test(c, _sch_isspace)
+#define ISUPPER(c)  _sch_test(c, _sch_isupper)
+#define ISXDIGIT(c) _sch_test(c, _sch_isxdigit)
+
+#define ISIDNUM(c)	_sch_test(c, _sch_isidnum)
+#define ISIDST(c)	_sch_test(c, _sch_isidst)
+#define IS_ISOBASIC(c)	_sch_test(c, _sch_isbasic)
+#define IS_VSPACE(c)	_sch_test(c, _sch_isvsp)
+#define IS_NVSPACE(c)	_sch_test(c, _sch_isnvsp)
+#define IS_SPACE_OR_NUL(c)	_sch_test(c, _sch_iscppsp)
+
+/* Character transformation.  */
+extern const unsigned char  _sch_toupper[256];
+extern const unsigned char  _sch_tolower[256];
+#define TOUPPER(c) _sch_toupper[(c) & 0xff]
+#define TOLOWER(c) _sch_tolower[(c) & 0xff]
+
+/* Prevent the users of safe-ctype.h from accidently using the routines
+   from ctype.h.  Initially, the approach was to produce an error when
+   detecting that ctype.h has been included.  But this was causing
+   trouble as ctype.h might get indirectly included as a result of
+   including another system header (for instance gnulib's stdint.h).
+   So we include ctype.h here and then immediately redefine its macros.  */
+
+#include <ctype.h>
+#undef isalpha
+#define isalpha(c) do_not_use_isalpha_with_safe_ctype
+#undef isalnum
+#define isalnum(c) do_not_use_isalnum_with_safe_ctype
+#undef iscntrl
+#define iscntrl(c) do_not_use_iscntrl_with_safe_ctype
+#undef isdigit
+#define isdigit(c) do_not_use_isdigit_with_safe_ctype
+#undef isgraph
+#define isgraph(c) do_not_use_isgraph_with_safe_ctype
+#undef islower
+#define islower(c) do_not_use_islower_with_safe_ctype
+#undef isprint
+#define isprint(c) do_not_use_isprint_with_safe_ctype
+#undef ispunct
+#define ispunct(c) do_not_use_ispunct_with_safe_ctype
+#undef isspace
+#define isspace(c) do_not_use_isspace_with_safe_ctype
+#undef isupper
+#define isupper(c) do_not_use_isupper_with_safe_ctype
+#undef isxdigit
+#define isxdigit(c) do_not_use_isxdigit_with_safe_ctype
+#undef toupper
+#define toupper(c) do_not_use_toupper_with_safe_ctype
+#undef tolower
+#define tolower(c) do_not_use_tolower_with_safe_ctype
+
+#endif /* SAFE_CTYPE_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/sha1.h sdcc-3.2.0+dfsg/support/sdbinutils/include/sha1.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/sha1.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/sha1.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,141 @@
+/* Declarations of functions and data types used for SHA1 sum
+   library functions.
+   Copyright (C) 2000, 2001, 2003, 2005, 2006, 2008, 2010
+   Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 3, or (at your option) any
+   later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef SHA1_H
+# define SHA1_H 1
+
+#include <stdio.h>
+
+#if defined HAVE_LIMITS_H || _LIBC
+# include <limits.h>
+#endif
+
+#include "ansidecl.h"
+
+/* The following contortions are an attempt to use the C preprocessor
+   to determine an unsigned integral type that is 32 bits wide.  An
+   alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
+   doing that would require that the configure script compile and *run*
+   the resulting executable.  Locally running cross-compiled executables
+   is usually not possible.  */
+
+#ifdef _LIBC
+# include <sys/types.h>
+typedef u_int32_t sha1_uint32;
+typedef uintptr_t sha1_uintptr;
+#else
+#  define INT_MAX_32_BITS 2147483647
+
+/* If UINT_MAX isn't defined, assume it's a 32-bit type.
+   This should be valid for all systems GNU cares about because
+   that doesn't include 16-bit systems, and only modern systems
+   (that certainly have <limits.h>) have 64+-bit integral types.  */
+
+# ifndef INT_MAX
+#  define INT_MAX INT_MAX_32_BITS
+# endif
+
+# if INT_MAX == INT_MAX_32_BITS
+   typedef unsigned int sha1_uint32;
+# else
+#  if SHRT_MAX == INT_MAX_32_BITS
+    typedef unsigned short sha1_uint32;
+#  else
+#   if LONG_MAX == INT_MAX_32_BITS
+     typedef unsigned long sha1_uint32;
+#   else
+     /* The following line is intended to evoke an error.
+        Using #error is not portable enough.  */
+     "Cannot determine unsigned 32-bit data type."
+#   endif
+#  endif
+# endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Structure to save state of computation between the single steps.  */
+struct sha1_ctx
+{
+  sha1_uint32 A;
+  sha1_uint32 B;
+  sha1_uint32 C;
+  sha1_uint32 D;
+  sha1_uint32 E;
+
+  sha1_uint32 total[2];
+  sha1_uint32 buflen;
+  sha1_uint32 buffer[32];
+};
+
+
+/* Initialize structure containing state of computation. */
+extern void sha1_init_ctx (struct sha1_ctx *ctx);
+
+/* Starting with the result of former calls of this function (or the
+   initialization function update the context for the next LEN bytes
+   starting at BUFFER.
+   It is necessary that LEN is a multiple of 64!!! */
+extern void sha1_process_block (const void *buffer, size_t len,
+				struct sha1_ctx *ctx);
+
+/* Starting with the result of former calls of this function (or the
+   initialization function update the context for the next LEN bytes
+   starting at BUFFER.
+   It is NOT required that LEN is a multiple of 64.  */
+extern void sha1_process_bytes (const void *buffer, size_t len,
+				struct sha1_ctx *ctx);
+
+/* Process the remaining bytes in the buffer and put result from CTX
+   in first 20 bytes following RESBUF.  The result is always in little
+   endian byte order, so that a byte-wise output yields to the wanted
+   ASCII representation of the message digest.
+
+   IMPORTANT: On some systems it is required that RESBUF be correctly
+   aligned for a 32 bits value.  */
+extern void *sha1_finish_ctx (struct sha1_ctx *ctx, void *resbuf);
+
+
+/* Put result from CTX in first 20 bytes following RESBUF.  The result is
+   always in little endian byte order, so that a byte-wise output yields
+   to the wanted ASCII representation of the message digest.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32 bits value.  */
+extern void *sha1_read_ctx (const struct sha1_ctx *ctx, void *resbuf);
+
+
+/* Compute SHA1 message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 20 bytes
+   beginning at RESBLOCK.  */
+extern int sha1_stream (FILE *stream, void *resblock);
+
+/* Compute SHA1 message digest for LEN bytes beginning at BUFFER.  The
+   result is always in little endian byte order, so that a byte-wise
+   output yields to the wanted ASCII representation of the message
+   digest.  */
+extern void *sha1_buffer (const char *buffer, size_t len, void *resblock);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/simple-object.h sdcc-3.2.0+dfsg/support/sdbinutils/include/simple-object.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/simple-object.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/simple-object.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,204 @@
+/* simple-object.h -- simple routines to read and write object files
+   Copyright 2010 Free Software Foundation, Inc.
+   Written by Ian Lance Taylor, Google.
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#ifndef SIMPLE_OBJECT_H
+#define SIMPLE_OBJECT_H
+
+#include <stddef.h>
+#include <sys/types.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* This header file provides four types with associated functions.
+   They are used to read and write object files.  This is a minimal
+   interface, intended to support the needs of gcc without bringing in
+   all the power and complexity of BFD.  */
+
+/* The type simple_object_read * is used to read an existing object
+   file.  */
+
+typedef struct simple_object_read_struct simple_object_read;
+
+/* Create an simple_object_read given DESCRIPTOR, an open file
+   descriptor, and OFFSET, an offset within the file.  The offset is
+   for use with archives, and should be 0 for an ordinary object file.
+   The descriptor must remain open until done with the returned
+   simple_object_read.  SEGMENT_NAME is used on Mach-O and is required
+   on that platform: it means to only look at sections within the
+   segment with that name.  It is ignored for other object file
+   formats.  On error, this function returns NULL, and sets *ERRMSG to
+   an error string and sets *ERR to an errno value or 0 if there is no
+   relevant errno.  */
+
+extern simple_object_read *
+simple_object_start_read (int descriptor, off_t offset,
+			  const char *segment_name, const char **errmsg,
+			  int *err);
+
+/* Call PFN for each section in SIMPLE_OBJECT, passing it the section
+   name, offset within the file of the section contents, and length of
+   the section contents.  The offset within the file is relative to
+   the offset passed to simple_object_start_read.  The DATA argument
+   to simple_object_find_sections is passed on to PFN.  If PFN returns
+   0, the loop is stopped and simple_object_find_sections returns.  If
+   PFN returns non-zero, the loop continues.  On success this returns
+   NULL.  On error it returns an error string, and sets *ERR to an
+   errno value or 0 if there is no relevant errno.  */
+
+extern const char *
+simple_object_find_sections (simple_object_read *simple_object,
+			     int (*pfn) (void *data, const char *,
+					 off_t offset, off_t length),
+			     void *data,
+			     int *err);
+
+/* Look for the section NAME in SIMPLE_OBJECT.  This returns
+   information for the first section NAME in SIMPLE_OBJECT.  Note that
+   calling this multiple times is inefficient; use
+   simple_object_find_sections instead.
+
+   If found, return 1 and set *OFFSET to the offset in the file of the
+   section contents and set *LENGTH to the length of the section
+   contents.  *OFFSET will be relative to the offset passed to
+   simple_object_start_read.
+
+   If the section is not found, and no error occurs, return 0 and set
+   *ERRMSG to NULL.
+
+   If an error occurs, return 0, set *ERRMSG to an error message, and
+   set *ERR to an errno value or 0 if there is no relevant errno.  */
+
+extern int
+simple_object_find_section (simple_object_read *simple_object,
+			    const char *name, off_t *offset, off_t *length,
+			    const char **errmsg, int *err);
+
+/* Release all resources associated with SIMPLE_OBJECT.  This does not
+   close the file descriptor.  */
+
+extern void
+simple_object_release_read (simple_object_read *);
+
+/* The type simple_object_attributes holds the attributes of an object
+   file that matter for creating a file or ensuring that two files are
+   compatible.  This is a set of magic numbers.  */
+
+typedef struct simple_object_attributes_struct simple_object_attributes;
+
+/* Fetch the attributes of SIMPLE_OBJECT.  This information will
+   persist until simple_object_attributes_release is called, even if
+   SIMPLE_OBJECT is closed.  On error this returns NULL, sets *ERRMSG
+   to an error message, and sets *ERR to an errno value or 0 if there
+   isn't one.  */
+
+extern simple_object_attributes *
+simple_object_fetch_attributes (simple_object_read *simple_object,
+				const char **errmsg, int *err);
+
+/* Merge the FROM attributes into TO.  If two objects with these
+   attributes could be linked together without error, returns NULL.
+   Otherwise, returns an error message, and sets *ERR to an errno
+   value or 0 if there isn't one.  */
+
+extern const char *
+simple_object_attributes_merge (simple_object_attributes *to,
+				simple_object_attributes *from,
+				int *err);
+
+/* Release all resources associated with ATTRS.  */
+
+extern void
+simple_object_release_attributes (simple_object_attributes *attrs);
+
+/* The type simple_object_write is used to create a new object file.  */
+
+typedef struct simple_object_write_struct simple_object_write;
+
+/* Start creating a new object file which is like ATTRS.  You must
+   fetch attribute information from an existing object file before you
+   can create a new one.  There is currently no support for creating
+   an object file de novo.  The segment name is only used on Mach-O,
+   where it is required.  It means that all sections are created
+   within that segment.  It is ignored for other object file formats.
+   On error this function returns NULL, sets *ERRMSG to an error
+   message, and sets *ERR to an errno value or 0 if there isn't
+   one.  */
+
+extern simple_object_write *
+simple_object_start_write (simple_object_attributes *attrs,
+			   const char *segment_name,
+			   const char **errmsg, int *err);
+
+/* The type simple_object_write_section is a handle for a section
+   which is being written.  */
+
+typedef struct simple_object_write_section_struct simple_object_write_section;
+
+/* Add a section to SIMPLE_OBJECT.  NAME is the name of the new
+   section.  ALIGN is the required alignment expressed as the number
+   of required low-order 0 bits (e.g., 2 for alignment to a 32-bit
+   boundary).  The section is created as containing data, readable,
+   not writable, not executable, not loaded at runtime.  On error this
+   returns NULL, sets *ERRMSG to an error message, and sets *ERR to an
+   errno value or 0 if there isn't one.  */
+
+extern simple_object_write_section *
+simple_object_write_create_section (simple_object_write *simple_object,
+				    const char *name, unsigned int align,
+				    const char **errmsg, int *err);
+
+/* Add data BUFFER/SIZE to SECTION in SIMPLE_OBJECT.  If COPY is
+   non-zero, the data will be copied into memory if necessary.  If
+   COPY is zero, BUFFER must persist until SIMPLE_OBJECT is released.
+   On success this returns NULL.  On error this returns an error
+   message, and sets *ERR to an errno value or 0 if there isn't
+   one.  */
+
+extern const char *
+simple_object_write_add_data (simple_object_write *simple_object,
+			      simple_object_write_section *section,
+			      const void *buffer, size_t size,
+			      int copy, int *err);
+
+/* Write the complete object file to DESCRIPTOR, an open file
+   descriptor.  This returns NULL on success.  On error this returns
+   an error message, and sets *ERR to an errno value or 0 if there
+   isn't one.  */
+
+extern const char *
+simple_object_write_to_file (simple_object_write *simple_object,
+			     int descriptor, int *err);
+
+/* Release all resources associated with SIMPLE_OBJECT, including any
+   simple_object_write_section's that may have been created.  */
+
+extern void
+simple_object_release_write (simple_object_write *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/sort.h sdcc-3.2.0+dfsg/support/sdbinutils/include/sort.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/sort.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/sort.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,48 @@
+/* Sorting algorithms.
+   Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+   Contributed by Mark Mitchell <mark@codesourcery.com>.
+
+This file is part of GCC.
+   
+GCC is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GCC 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 GCC; see the file COPYING.  If not, write to
+the Free Software Foundation, 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#ifndef SORT_H
+#define SORT_H
+
+#include <sys/types.h> /* For size_t */
+#ifdef __STDC__
+#include <stddef.h>
+#endif	/* __STDC__ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include "ansidecl.h"
+
+/* Sort an array of pointers.  */
+
+extern void sort_pointers (size_t, void **, void **);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* SORT_H */
+
+
+   
+   
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/splay-tree.h sdcc-3.2.0+dfsg/support/sdbinutils/include/splay-tree.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/splay-tree.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/splay-tree.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,168 @@
+/* A splay-tree datatype.  
+   Copyright 1998, 1999, 2000, 2002, 2005, 2007, 2009, 2010
+   Free Software Foundation, Inc.
+   Contributed by Mark Mitchell (mark@markmitchell.com).
+
+   This file is part of GCC.
+   
+   GCC is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   GCC 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 GCC; see the file COPYING.  If not, write to
+   the Free Software Foundation, 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* For an easily readable description of splay-trees, see:
+
+     Lewis, Harry R. and Denenberg, Larry.  Data Structures and Their
+     Algorithms.  Harper-Collins, Inc.  1991.  
+
+   The major feature of splay trees is that all basic tree operations
+   are amortized O(log n) time for a tree with n nodes.  */
+
+#ifndef _SPLAY_TREE_H
+#define _SPLAY_TREE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include "ansidecl.h"
+
+#ifndef _WIN64
+  typedef unsigned long int libi_uhostptr_t;
+  typedef long int libi_shostptr_t;
+#else
+#ifdef __GNUC__
+  __extension__
+#endif
+  typedef unsigned long long libi_uhostptr_t;
+#ifdef __GNUC__
+  __extension__
+#endif
+  typedef long long libi_shostptr_t;
+#endif
+
+#ifndef GTY
+#define GTY(X)
+#endif
+
+/* Use typedefs for the key and data types to facilitate changing
+   these types, if necessary.  These types should be sufficiently wide
+   that any pointer or scalar can be cast to these types, and then
+   cast back, without loss of precision.  */
+typedef libi_uhostptr_t splay_tree_key;
+typedef libi_uhostptr_t splay_tree_value;
+
+/* Forward declaration for a node in the tree.  */
+typedef struct splay_tree_node_s *splay_tree_node;
+
+/* The type of a function which compares two splay-tree keys.  The
+   function should return values as for qsort.  */
+typedef int (*splay_tree_compare_fn) (splay_tree_key, splay_tree_key);
+
+/* The type of a function used to deallocate any resources associated
+   with the key.  */
+typedef void (*splay_tree_delete_key_fn) (splay_tree_key);
+
+/* The type of a function used to deallocate any resources associated
+   with the value.  */
+typedef void (*splay_tree_delete_value_fn) (splay_tree_value);
+
+/* The type of a function used to iterate over the tree.  */
+typedef int (*splay_tree_foreach_fn) (splay_tree_node, void*);
+
+/* The type of a function used to allocate memory for tree root and
+   node structures.  The first argument is the number of bytes needed;
+   the second is a data pointer the splay tree functions pass through
+   to the allocator.  This function must never return zero.  */
+typedef void *(*splay_tree_allocate_fn) (int, void *);
+
+/* The type of a function used to free memory allocated using the
+   corresponding splay_tree_allocate_fn.  The first argument is the
+   memory to be freed; the latter is a data pointer the splay tree
+   functions pass through to the freer.  */
+typedef void (*splay_tree_deallocate_fn) (void *, void *);
+
+/* The nodes in the splay tree.  */
+struct GTY(()) splay_tree_node_s {
+  /* The key.  */
+  splay_tree_key GTY ((use_param1)) key;
+
+  /* The value.  */
+  splay_tree_value GTY ((use_param2)) value;
+
+  /* The left and right children, respectively.  */
+  splay_tree_node GTY ((use_params)) left;
+  splay_tree_node GTY ((use_params)) right;
+};
+
+/* The splay tree itself.  */
+struct GTY(()) splay_tree_s {
+  /* The root of the tree.  */
+  splay_tree_node GTY ((use_params)) root;
+
+  /* The comparision function.  */
+  splay_tree_compare_fn comp;
+
+  /* The deallocate-key function.  NULL if no cleanup is necessary.  */
+  splay_tree_delete_key_fn delete_key;
+
+  /* The deallocate-value function.  NULL if no cleanup is necessary.  */
+  splay_tree_delete_value_fn delete_value;
+
+  /* Node allocate function.  Takes allocate_data as a parameter. */
+  splay_tree_allocate_fn allocate;
+
+  /* Free function for nodes and trees.  Takes allocate_data as a parameter.  */
+  splay_tree_deallocate_fn deallocate;
+
+  /* Parameter for allocate/free functions.  */
+  void * GTY((skip)) allocate_data;
+};
+
+typedef struct splay_tree_s *splay_tree;
+
+extern splay_tree splay_tree_new (splay_tree_compare_fn,
+				  splay_tree_delete_key_fn,
+				  splay_tree_delete_value_fn);
+extern splay_tree splay_tree_new_with_allocator (splay_tree_compare_fn,
+						 splay_tree_delete_key_fn,
+						 splay_tree_delete_value_fn,
+						 splay_tree_allocate_fn,
+						 splay_tree_deallocate_fn,
+						 void *);
+extern splay_tree splay_tree_new_typed_alloc (splay_tree_compare_fn,
+					      splay_tree_delete_key_fn,
+					      splay_tree_delete_value_fn,
+					      splay_tree_allocate_fn,
+					      splay_tree_allocate_fn,
+					      splay_tree_deallocate_fn,
+					      void *);
+extern void splay_tree_delete (splay_tree);
+extern splay_tree_node splay_tree_insert (splay_tree,
+					  splay_tree_key,
+					  splay_tree_value);
+extern void splay_tree_remove	(splay_tree, splay_tree_key);
+extern splay_tree_node splay_tree_lookup (splay_tree, splay_tree_key);
+extern splay_tree_node splay_tree_predecessor (splay_tree, splay_tree_key);
+extern splay_tree_node splay_tree_successor (splay_tree, splay_tree_key);
+extern splay_tree_node splay_tree_max (splay_tree);
+extern splay_tree_node splay_tree_min (splay_tree);
+extern int splay_tree_foreach (splay_tree, splay_tree_foreach_fn, void*);
+extern int splay_tree_compare_ints (splay_tree_key, splay_tree_key);
+extern int splay_tree_compare_pointers (splay_tree_key,	splay_tree_key);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* _SPLAY_TREE_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/symcat.h sdcc-3.2.0+dfsg/support/sdbinutils/include/symcat.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/symcat.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/symcat.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,55 @@
+/* Symbol concatenation utilities.
+
+   Copyright (C) 1998, 2000, 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+ 
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef SYM_CAT_H
+#define SYM_CAT_H
+
+#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
+#define CONCAT2(a,b)	 a##b
+#define CONCAT3(a,b,c)	 a##b##c
+#define CONCAT4(a,b,c,d) a##b##c##d
+#define CONCAT5(a,b,c,d,e) a##b##c##d##e
+#define CONCAT6(a,b,c,d,e,f) a##b##c##d##e##f
+#define STRINGX(s) #s
+#else
+/* Note one should never pass extra whitespace to the CONCATn macros,
+   e.g. CONCAT2(foo, bar) because traditonal C will keep the space between
+   the two labels instead of concatenating them.  Instead, make sure to
+   write CONCAT2(foo,bar).  */
+#define CONCAT2(a,b)	 a/**/b
+#define CONCAT3(a,b,c)	 a/**/b/**/c
+#define CONCAT4(a,b,c,d) a/**/b/**/c/**/d
+#define CONCAT5(a,b,c,d,e) a/**/b/**/c/**/d/**/e
+#define CONCAT6(a,b,c,d,e,f) a/**/b/**/c/**/d/**/e/**/f
+#define STRINGX(s) "s"
+#endif
+
+#define XCONCAT2(a,b)     CONCAT2(a,b)
+#define XCONCAT3(a,b,c)   CONCAT3(a,b,c)
+#define XCONCAT4(a,b,c,d) CONCAT4(a,b,c,d)
+#define XCONCAT5(a,b,c,d,e) CONCAT5(a,b,c,d,e)
+#define XCONCAT6(a,b,c,d,e,f) CONCAT6(a,b,c,d,e,f)
+
+/* Note the layer of indirection here is typically used to allow
+   stringification of the expansion of macros.  I.e. "#define foo
+   bar", "XSTRING(foo)", to yield "bar".  Be aware that this only
+   works for __STDC__, not for traditional C which will still resolve
+   to "foo".  */
+#define XSTRING(s) STRINGX(s) 
+
+#endif /* SYM_CAT_H */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/xregex.h sdcc-3.2.0+dfsg/support/sdbinutils/include/xregex.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/xregex.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/xregex.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,29 @@
+/* This file redefines all regex external names before including
+   a renamed copy of glibc's regex.h.  */
+
+#ifndef _XREGEX_H
+#define _XREGEX_H 1
+
+#  define regfree xregfree 
+#  define regexec xregexec
+#  define regcomp xregcomp
+#  define regerror xregerror
+#  define regoff_t xregoff_t
+#  define re_set_registers xre_set_registers
+#  define re_match_2 xre_match_2
+#  define re_match xre_match
+#  define re_search xre_search
+#  define re_compile_pattern xre_compile_pattern
+#  define re_set_syntax xre_set_syntax
+#  define re_search_2 xre_search_2
+#  define re_compile_fastmap xre_compile_fastmap
+#  define re_syntax_options xre_syntax_options
+#  define re_max_failures xre_max_failures
+
+#  define _REGEX_RE_COMP
+#  define re_comp xre_comp
+#  define re_exec xre_exec
+
+#include "xregex2.h"
+
+#endif /* xregex.h */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/include/xregex2.h sdcc-3.2.0+dfsg/support/sdbinutils/include/xregex2.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/include/xregex2.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/include/xregex2.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,565 @@
+/* Definitions for data structures and routines for the regular
+   expression library, version 0.12.
+
+   Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993, 1995, 1996, 1997,
+   1998, 2000, 2005 Free Software Foundation, Inc.
+
+   This file is part of the GNU C Library.  Its master source is NOT part of
+   the C library, however.  The master source lives in /gd/gnu/lib.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301 USA.  */
+
+#ifndef _REGEX_H
+#define _REGEX_H 1
+
+/* Allow the use in C++ code.  */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* POSIX says that <sys/types.h> must be included (by the caller) before
+   <regex.h>.  */
+
+#if !defined _POSIX_C_SOURCE && !defined _POSIX_SOURCE && defined VMS
+/* VMS doesn't have `size_t' in <sys/types.h>, even though POSIX says it
+   should be there.  */
+# include <stddef.h>
+#endif
+
+/* The following two types have to be signed and unsigned integer type
+   wide enough to hold a value of a pointer.  For most ANSI compilers
+   ptrdiff_t and size_t should be likely OK.  Still size of these two
+   types is 2 for Microsoft C.  Ugh... */
+typedef long int s_reg_t;
+typedef unsigned long int active_reg_t;
+
+/* The following bits are used to determine the regexp syntax we
+   recognize.  The set/not-set meanings are chosen so that Emacs syntax
+   remains the value 0.  The bits are given in alphabetical order, and
+   the definitions shifted by one from the previous bit; thus, when we
+   add or remove a bit, only one other definition need change.  */
+typedef unsigned long int reg_syntax_t;
+
+/* If this bit is not set, then \ inside a bracket expression is literal.
+   If set, then such a \ quotes the following character.  */
+#define RE_BACKSLASH_ESCAPE_IN_LISTS ((unsigned long int) 1)
+
+/* If this bit is not set, then + and ? are operators, and \+ and \? are
+     literals.
+   If set, then \+ and \? are operators and + and ? are literals.  */
+#define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1)
+
+/* If this bit is set, then character classes are supported.  They are:
+     [:alpha:], [:upper:], [:lower:],  [:digit:], [:alnum:], [:xdigit:],
+     [:space:], [:print:], [:punct:], [:graph:], and [:cntrl:].
+   If not set, then character classes are not supported.  */
+#define RE_CHAR_CLASSES (RE_BK_PLUS_QM << 1)
+
+/* If this bit is set, then ^ and $ are always anchors (outside bracket
+     expressions, of course).
+   If this bit is not set, then it depends:
+        ^  is an anchor if it is at the beginning of a regular
+           expression or after an open-group or an alternation operator;
+        $  is an anchor if it is at the end of a regular expression, or
+           before a close-group or an alternation operator.
+
+   This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because
+   POSIX draft 11.2 says that * etc. in leading positions is undefined.
+   We already implemented a previous draft which made those constructs
+   invalid, though, so we haven't changed the code back.  */
+#define RE_CONTEXT_INDEP_ANCHORS (RE_CHAR_CLASSES << 1)
+
+/* If this bit is set, then special characters are always special
+     regardless of where they are in the pattern.
+   If this bit is not set, then special characters are special only in
+     some contexts; otherwise they are ordinary.  Specifically,
+     * + ? and intervals are only special when not after the beginning,
+     open-group, or alternation operator.  */
+#define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1)
+
+/* If this bit is set, then *, +, ?, and { cannot be first in an re or
+     immediately after an alternation or begin-group operator.  */
+#define RE_CONTEXT_INVALID_OPS (RE_CONTEXT_INDEP_OPS << 1)
+
+/* If this bit is set, then . matches newline.
+   If not set, then it doesn't.  */
+#define RE_DOT_NEWLINE (RE_CONTEXT_INVALID_OPS << 1)
+
+/* If this bit is set, then . doesn't match NUL.
+   If not set, then it does.  */
+#define RE_DOT_NOT_NULL (RE_DOT_NEWLINE << 1)
+
+/* If this bit is set, nonmatching lists [^...] do not match newline.
+   If not set, they do.  */
+#define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1)
+
+/* If this bit is set, either \{...\} or {...} defines an
+     interval, depending on RE_NO_BK_BRACES.
+   If not set, \{, \}, {, and } are literals.  */
+#define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1)
+
+/* If this bit is set, +, ? and | aren't recognized as operators.
+   If not set, they are.  */
+#define RE_LIMITED_OPS (RE_INTERVALS << 1)
+
+/* If this bit is set, newline is an alternation operator.
+   If not set, newline is literal.  */
+#define RE_NEWLINE_ALT (RE_LIMITED_OPS << 1)
+
+/* If this bit is set, then `{...}' defines an interval, and \{ and \}
+     are literals.
+  If not set, then `\{...\}' defines an interval.  */
+#define RE_NO_BK_BRACES (RE_NEWLINE_ALT << 1)
+
+/* If this bit is set, (...) defines a group, and \( and \) are literals.
+   If not set, \(...\) defines a group, and ( and ) are literals.  */
+#define RE_NO_BK_PARENS (RE_NO_BK_BRACES << 1)
+
+/* If this bit is set, then \<digit> matches <digit>.
+   If not set, then \<digit> is a back-reference.  */
+#define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1)
+
+/* If this bit is set, then | is an alternation operator, and \| is literal.
+   If not set, then \| is an alternation operator, and | is literal.  */
+#define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1)
+
+/* If this bit is set, then an ending range point collating higher
+     than the starting range point, as in [z-a], is invalid.
+   If not set, then when ending range point collates higher than the
+     starting range point, the range is ignored.  */
+#define RE_NO_EMPTY_RANGES (RE_NO_BK_VBAR << 1)
+
+/* If this bit is set, then an unmatched ) is ordinary.
+   If not set, then an unmatched ) is invalid.  */
+#define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1)
+
+/* If this bit is set, succeed as soon as we match the whole pattern,
+   without further backtracking.  */
+#define RE_NO_POSIX_BACKTRACKING (RE_UNMATCHED_RIGHT_PAREN_ORD << 1)
+
+/* If this bit is set, do not process the GNU regex operators.
+   If not set, then the GNU regex operators are recognized. */
+#define RE_NO_GNU_OPS (RE_NO_POSIX_BACKTRACKING << 1)
+
+/* If this bit is set, turn on internal regex debugging.
+   If not set, and debugging was on, turn it off.
+   This only works if regex.c is compiled -DDEBUG.
+   We define this bit always, so that all that's needed to turn on
+   debugging is to recompile regex.c; the calling code can always have
+   this bit set, and it won't affect anything in the normal case. */
+#define RE_DEBUG (RE_NO_GNU_OPS << 1)
+
+/* If this bit is set, a syntactically invalid interval is treated as
+   a string of ordinary characters.  For example, the ERE 'a{1' is
+   treated as 'a\{1'.  */
+#define RE_INVALID_INTERVAL_ORD (RE_DEBUG << 1)
+
+/* This global variable defines the particular regexp syntax to use (for
+   some interfaces).  When a regexp is compiled, the syntax used is
+   stored in the pattern buffer, so changing this does not affect
+   already-compiled regexps.  */
+extern reg_syntax_t re_syntax_options;
+
+/* Define combinations of the above bits for the standard possibilities.
+   (The [[[ comments delimit what gets put into the Texinfo file, so
+   don't delete them!)  */
+/* [[[begin syntaxes]]] */
+#define RE_SYNTAX_EMACS 0
+
+#define RE_SYNTAX_AWK							\
+  (RE_BACKSLASH_ESCAPE_IN_LISTS   | RE_DOT_NOT_NULL			\
+   | RE_NO_BK_PARENS              | RE_NO_BK_REFS			\
+   | RE_NO_BK_VBAR                | RE_NO_EMPTY_RANGES			\
+   | RE_DOT_NEWLINE		  | RE_CONTEXT_INDEP_ANCHORS		\
+   | RE_UNMATCHED_RIGHT_PAREN_ORD | RE_NO_GNU_OPS)
+
+#define RE_SYNTAX_GNU_AWK						\
+  ((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DEBUG)	\
+   & ~(RE_DOT_NOT_NULL | RE_INTERVALS | RE_CONTEXT_INDEP_OPS))
+
+#define RE_SYNTAX_POSIX_AWK 						\
+  (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS		\
+   | RE_INTERVALS	    | RE_NO_GNU_OPS)
+
+#define RE_SYNTAX_GREP							\
+  (RE_BK_PLUS_QM              | RE_CHAR_CLASSES				\
+   | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS				\
+   | RE_NEWLINE_ALT)
+
+#define RE_SYNTAX_EGREP							\
+  (RE_CHAR_CLASSES        | RE_CONTEXT_INDEP_ANCHORS			\
+   | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE			\
+   | RE_NEWLINE_ALT       | RE_NO_BK_PARENS				\
+   | RE_NO_BK_VBAR)
+
+#define RE_SYNTAX_POSIX_EGREP						\
+  (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES			\
+   | RE_INVALID_INTERVAL_ORD)
+
+/* P1003.2/D11.2, section 4.20.7.1, lines 5078ff.  */
+#define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC
+
+#define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC
+
+/* Syntax bits common to both basic and extended POSIX regex syntax.  */
+#define _RE_SYNTAX_POSIX_COMMON						\
+  (RE_CHAR_CLASSES | RE_DOT_NEWLINE      | RE_DOT_NOT_NULL		\
+   | RE_INTERVALS  | RE_NO_EMPTY_RANGES)
+
+#define RE_SYNTAX_POSIX_BASIC						\
+  (_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM)
+
+/* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes
+   RE_LIMITED_OPS, i.e., \? \+ \| are not recognized.  Actually, this
+   isn't minimal, since other operators, such as \`, aren't disabled.  */
+#define RE_SYNTAX_POSIX_MINIMAL_BASIC					\
+  (_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS)
+
+#define RE_SYNTAX_POSIX_EXTENDED					\
+  (_RE_SYNTAX_POSIX_COMMON  | RE_CONTEXT_INDEP_ANCHORS			\
+   | RE_CONTEXT_INDEP_OPS   | RE_NO_BK_BRACES				\
+   | RE_NO_BK_PARENS        | RE_NO_BK_VBAR				\
+   | RE_CONTEXT_INVALID_OPS | RE_UNMATCHED_RIGHT_PAREN_ORD)
+
+/* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INDEP_OPS is
+   removed and RE_NO_BK_REFS is added.  */
+#define RE_SYNTAX_POSIX_MINIMAL_EXTENDED				\
+  (_RE_SYNTAX_POSIX_COMMON  | RE_CONTEXT_INDEP_ANCHORS			\
+   | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES				\
+   | RE_NO_BK_PARENS        | RE_NO_BK_REFS				\
+   | RE_NO_BK_VBAR	    | RE_UNMATCHED_RIGHT_PAREN_ORD)
+/* [[[end syntaxes]]] */
+
+/* Maximum number of duplicates an interval can allow.  Some systems
+   (erroneously) define this in other header files, but we want our
+   value, so remove any previous define.  */
+#ifdef RE_DUP_MAX
+# undef RE_DUP_MAX
+#endif
+/* If sizeof(int) == 2, then ((1 << 15) - 1) overflows.  */
+#define RE_DUP_MAX (0x7fff)
+
+
+/* POSIX `cflags' bits (i.e., information for `regcomp').  */
+
+/* If this bit is set, then use extended regular expression syntax.
+   If not set, then use basic regular expression syntax.  */
+#define REG_EXTENDED 1
+
+/* If this bit is set, then ignore case when matching.
+   If not set, then case is significant.  */
+#define REG_ICASE (REG_EXTENDED << 1)
+
+/* If this bit is set, then anchors do not match at newline
+     characters in the string.
+   If not set, then anchors do match at newlines.  */
+#define REG_NEWLINE (REG_ICASE << 1)
+
+/* If this bit is set, then report only success or fail in regexec.
+   If not set, then returns differ between not matching and errors.  */
+#define REG_NOSUB (REG_NEWLINE << 1)
+
+
+/* POSIX `eflags' bits (i.e., information for regexec).  */
+
+/* If this bit is set, then the beginning-of-line operator doesn't match
+     the beginning of the string (presumably because it's not the
+     beginning of a line).
+   If not set, then the beginning-of-line operator does match the
+     beginning of the string.  */
+#define REG_NOTBOL 1
+
+/* Like REG_NOTBOL, except for the end-of-line.  */
+#define REG_NOTEOL (1 << 1)
+
+
+/* If any error codes are removed, changed, or added, update the
+   `re_error_msg' table in regex.c.  */
+typedef enum
+{
+#ifdef _XOPEN_SOURCE
+  REG_ENOSYS = -1,	/* This will never happen for this implementation.  */
+#endif
+
+  REG_NOERROR = 0,	/* Success.  */
+  REG_NOMATCH,		/* Didn't find a match (for regexec).  */
+
+  /* POSIX regcomp return error codes.  (In the order listed in the
+     standard.)  */
+  REG_BADPAT,		/* Invalid pattern.  */
+  REG_ECOLLATE,		/* Not implemented.  */
+  REG_ECTYPE,		/* Invalid character class name.  */
+  REG_EESCAPE,		/* Trailing backslash.  */
+  REG_ESUBREG,		/* Invalid back reference.  */
+  REG_EBRACK,		/* Unmatched left bracket.  */
+  REG_EPAREN,		/* Parenthesis imbalance.  */
+  REG_EBRACE,		/* Unmatched \{.  */
+  REG_BADBR,		/* Invalid contents of \{\}.  */
+  REG_ERANGE,		/* Invalid range end.  */
+  REG_ESPACE,		/* Ran out of memory.  */
+  REG_BADRPT,		/* No preceding re for repetition op.  */
+
+  /* Error codes we've added.  */
+  REG_EEND,		/* Premature end.  */
+  REG_ESIZE,		/* Compiled pattern bigger than 2^16 bytes.  */
+  REG_ERPAREN		/* Unmatched ) or \); not returned from regcomp.  */
+} reg_errcode_t;
+
+/* This data structure represents a compiled pattern.  Before calling
+   the pattern compiler, the fields `buffer', `allocated', `fastmap',
+   `translate', and `no_sub' can be set.  After the pattern has been
+   compiled, the `re_nsub' field is available.  All other fields are
+   private to the regex routines.  */
+
+#ifndef RE_TRANSLATE_TYPE
+# define RE_TRANSLATE_TYPE char *
+#endif
+
+struct re_pattern_buffer
+{
+/* [[[begin pattern_buffer]]] */
+	/* Space that holds the compiled pattern.  It is declared as
+          `unsigned char *' because its elements are
+           sometimes used as array indexes.  */
+  unsigned char *buffer;
+
+	/* Number of bytes to which `buffer' points.  */
+  unsigned long int allocated;
+
+	/* Number of bytes actually used in `buffer'.  */
+  unsigned long int used;
+
+        /* Syntax setting with which the pattern was compiled.  */
+  reg_syntax_t syntax;
+
+        /* Pointer to a fastmap, if any, otherwise zero.  re_search uses
+           the fastmap, if there is one, to skip over impossible
+           starting points for matches.  */
+  char *fastmap;
+
+        /* Either a translate table to apply to all characters before
+           comparing them, or zero for no translation.  The translation
+           is applied to a pattern when it is compiled and to a string
+           when it is matched.  */
+  RE_TRANSLATE_TYPE translate;
+
+	/* Number of subexpressions found by the compiler.  */
+  size_t re_nsub;
+
+        /* Zero if this pattern cannot match the empty string, one else.
+           Well, in truth it's used only in `re_search_2', to see
+           whether or not we should use the fastmap, so we don't set
+           this absolutely perfectly; see `re_compile_fastmap' (the
+           `duplicate' case).  */
+  unsigned can_be_null : 1;
+
+        /* If REGS_UNALLOCATED, allocate space in the `regs' structure
+             for `max (RE_NREGS, re_nsub + 1)' groups.
+           If REGS_REALLOCATE, reallocate space if necessary.
+           If REGS_FIXED, use what's there.  */
+#define REGS_UNALLOCATED 0
+#define REGS_REALLOCATE 1
+#define REGS_FIXED 2
+  unsigned regs_allocated : 2;
+
+        /* Set to zero when `regex_compile' compiles a pattern; set to one
+           by `re_compile_fastmap' if it updates the fastmap.  */
+  unsigned fastmap_accurate : 1;
+
+        /* If set, `re_match_2' does not return information about
+           subexpressions.  */
+  unsigned no_sub : 1;
+
+        /* If set, a beginning-of-line anchor doesn't match at the
+           beginning of the string.  */
+  unsigned not_bol : 1;
+
+        /* Similarly for an end-of-line anchor.  */
+  unsigned not_eol : 1;
+
+        /* If true, an anchor at a newline matches.  */
+  unsigned newline_anchor : 1;
+
+/* [[[end pattern_buffer]]] */
+};
+
+typedef struct re_pattern_buffer regex_t;
+
+/* Type for byte offsets within the string.  POSIX mandates this.  */
+typedef int regoff_t;
+
+
+/* This is the structure we store register match data in.  See
+   regex.texinfo for a full description of what registers match.  */
+struct re_registers
+{
+  unsigned num_regs;
+  regoff_t *start;
+  regoff_t *end;
+};
+
+
+/* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer,
+   `re_match_2' returns information about at least this many registers
+   the first time a `regs' structure is passed.  */
+#ifndef RE_NREGS
+# define RE_NREGS 30
+#endif
+
+
+/* POSIX specification for registers.  Aside from the different names than
+   `re_registers', POSIX uses an array of structures, instead of a
+   structure of arrays.  */
+typedef struct
+{
+  regoff_t rm_so;  /* Byte offset from string's start to substring's start.  */
+  regoff_t rm_eo;  /* Byte offset from string's start to substring's end.  */
+} regmatch_t;
+
+/* Declarations for routines.  */
+
+/* To avoid duplicating every routine declaration -- once with a
+   prototype (if we are ANSI), and once without (if we aren't) -- we
+   use the following macro to declare argument types.  This
+   unfortunately clutters up the declarations a bit, but I think it's
+   worth it.  */
+
+/* Sets the current default syntax to SYNTAX, and return the old syntax.
+   You can also simply assign to the `re_syntax_options' variable.  */
+extern reg_syntax_t re_set_syntax (reg_syntax_t syntax);
+
+/* Compile the regular expression PATTERN, with length LENGTH
+   and syntax given by the global `re_syntax_options', into the buffer
+   BUFFER.  Return NULL if successful, and an error string if not.  */
+extern const char *re_compile_pattern (const char *pattern, size_t length,
+                                       struct re_pattern_buffer *buffer);
+
+
+/* Compile a fastmap for the compiled pattern in BUFFER; used to
+   accelerate searches.  Return 0 if successful and -2 if was an
+   internal error.  */
+extern int re_compile_fastmap (struct re_pattern_buffer *buffer);
+
+
+/* Search in the string STRING (with length LENGTH) for the pattern
+   compiled into BUFFER.  Start searching at position START, for RANGE
+   characters.  Return the starting position of the match, -1 for no
+   match, or -2 for an internal error.  Also return register
+   information in REGS (if REGS and BUFFER->no_sub are nonzero).  */
+extern int re_search (struct re_pattern_buffer *buffer, const char *string,
+                      int length, int start, int range,
+                      struct re_registers *regs);
+
+
+/* Like `re_search', but search in the concatenation of STRING1 and
+   STRING2.  Also, stop searching at index START + STOP.  */
+extern int re_search_2 (struct re_pattern_buffer *buffer, const char *string1,
+                        int length1, const char *string2, int length2,
+                        int start, int range, struct re_registers *regs,
+                        int stop);
+
+
+/* Like `re_search', but return how many characters in STRING the regexp
+   in BUFFER matched, starting at position START.  */
+extern int re_match (struct re_pattern_buffer *buffer, const char *string,
+                     int length, int start, struct re_registers *regs);
+
+
+/* Relates to `re_match' as `re_search_2' relates to `re_search'.  */
+extern int re_match_2 (struct re_pattern_buffer *buffer, const char *string1,
+                       int length1, const char *string2, int length2,
+                       int start, struct re_registers *regs, int stop);
+
+
+/* Set REGS to hold NUM_REGS registers, storing them in STARTS and
+   ENDS.  Subsequent matches using BUFFER and REGS will use this memory
+   for recording register information.  STARTS and ENDS must be
+   allocated with malloc, and must each be at least `NUM_REGS * sizeof
+   (regoff_t)' bytes long.
+
+   If NUM_REGS == 0, then subsequent matches should allocate their own
+   register data.
+
+   Unless this function is called, the first search or match using
+   PATTERN_BUFFER will allocate its own register data, without
+   freeing the old data.  */
+extern void re_set_registers (struct re_pattern_buffer *buffer,
+                              struct re_registers *regs,
+                              unsigned num_regs, regoff_t *starts,
+                              regoff_t *ends);
+
+#if defined _REGEX_RE_COMP || defined _LIBC
+# ifndef _CRAY
+/* 4.2 bsd compatibility.  */
+extern char *re_comp (const char *);
+extern int re_exec (const char *);
+# endif
+#endif
+
+/* GCC 2.95 and later have "__restrict"; C99 compilers have
+   "restrict", and "configure" may have defined "restrict".  */
+#ifndef __restrict
+# if ! (2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__))
+#  if defined restrict || 199901L <= __STDC_VERSION__
+#   define __restrict restrict
+#  else
+#   define __restrict
+#  endif
+# endif
+#endif
+
+/* GCC 3.1 and later support declaring arrays as non-overlapping
+   using the syntax array_name[restrict]  */
+#ifndef __restrict_arr
+# if ! (3 < __GNUC__ || (3 == __GNUC__ && 1 <= __GNUC_MINOR__)) || defined (__GNUG__)
+#  define __restrict_arr
+# else
+#  define __restrict_arr __restrict
+# endif
+#endif
+
+/* POSIX compatibility.  */
+extern int regcomp (regex_t *__restrict __preg,
+                    const char *__restrict __pattern,
+                    int __cflags);
+
+#if (__GNUC__)
+__extension__
+#endif
+extern int regexec (const regex_t *__restrict __preg,
+                    const char *__restrict __string, size_t __nmatch,
+                    regmatch_t __pmatch[__restrict_arr],
+                    int __eflags);
+
+extern size_t regerror (int __errcode, const regex_t *__preg,
+                        char *__errbuf, size_t __errbuf_size);
+
+extern void regfree (regex_t *__preg);
+
+
+#ifdef __cplusplus
+}
+#endif	/* C++ */
+
+#endif /* regex.h */
+
+/*
+Local variables:
+make-backup-files: t
+version-control: t
+trim-versions-without-asking: nil
+End:
+*/
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/install-sh sdcc-3.2.0+dfsg/support/sdbinutils/install-sh
--- sdcc-3.1.0+dfsg/support/sdbinutils/install-sh	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/install-sh	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,520 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2009-04-28.21; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+no_target_directory=
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+	shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
+
+    -o) chowncmd="$chownprog $2"
+	shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t) dst_arg=$2
+	shift;;
+
+    -T) no_target_directory=true;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --)	shift
+	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dst_arg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst;;
+    esac
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dst_arg: Is a directory" >&2
+	exit 1
+      fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix='/';;
+	-*) prefix='./';;
+	*)  prefix='';;
+      esac
+
+      eval "$initialize_posix_glob"
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
+      shift
+      $posix_glob set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/COPYING.LIB sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/COPYING.LIB
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/COPYING.LIB	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/COPYING.LIB	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/ChangeLog sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/ChangeLog
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/ChangeLog	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/ChangeLog	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,8485 @@
+2011-08-22  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* aclocal.m4: Include ../config/picflag.m4.
+	* configure.ac (GCC_PICFLAG): Call it.
+	(enable_shared): Clear PICFLAG unless shared.
+	* configure: Regenerate.
+
+2011-08-12  Steve Ellcey  <sje@cup.hp.com>
+
+	* md5.c (md5_read_ctx): Handle mis-aligned resbuf pointer.
+
+2011-08-06  Uros Bizjak  <ubizjak@gmail.com>
+
+	* testsuite/test-expandargv.c (writeout_test): Check result of fwrite.
+
+2011-08-01  Jason Merrill  <jason@redhat.com>
+
+	PR c++/49932
+	* cp-demangle.c (d_prefix): Handle decltype.
+	* testsuite/demangle-expected: Test it.
+
+2011-07-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* testsuite/demangle-expected: Remove an extra line.
+
+2011-07-26  Ian Lance Taylor  <iant@google.com>
+
+	* cp-demangle.c (d_print_init): Initialize pack_index field.
+	(d_print_comp): Check for NULL template argument.
+	* testsuite/demangle-expected: Add test case.
+
+2011-07-22  Gerald Pfeifer  <gerald@pfeifer.com>
+
+	PR target/49817
+	* stack-limit.c: Include <stdint.h>.
+
+2011-07-22  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/49756
+	* stack-limit.c: New file.
+	* Makefile.in: Regenerate deps.
+	(CFILES): Add stack-limit.c.
+	(REQUIRED_OFILES): Add ./stack-limit.$(objext).
+	* configure.ac (checkfuncs): Add getrlimit and setrlimit.
+	(AC_CHECK_FUNCS): Likewise.
+	* configure: Regenerated.
+	* config.in: Regenerated.
+
+2011-07-04  Jason Merrill  <jason@redhat.com>
+
+	* cp-demangle.c (d_expression): Handle 'this'.
+	(d_print_comp) [DEMANGLE_COMPONENT_FUNCTION_PARAM]: Likewise.
+
+2011-07-01  Joel Brobecker  <brobecker@adacore.com>
+
+	* filename_cmp.c (filename_cmp, filename_ncmp): Add handling of
+	HAVE_CASE_INSENSITIVE_FILE_SYSTEM.
+
+2011-07-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	PR debug/49408
+	* cp-demangle.c (d_print_comp): Suppress argument list for function
+	references by the '&' unary operator.  Keep also already processed
+	variant without the argument list.  Suppress argument list types for
+	function call used in an expression.
+	* testsuite/demangle-expected: Fix excessive argument list types in
+	`test for typed function in decltype'.  New testcase for no argument
+	list types printed.  3 new testcases for function references by the
+	'&' unary operator..
+
+2011-06-20  Jason Merrill  <jason@redhat.com>
+
+	PR c++/37089
+	* cp-demangle.c (d_print_comp): Handle reference smashing.
+	* testsuite/demangle-expected: Test it.
+
+2011-06-13  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* cp-demangle.c (d_print_comp) <DEMANGLE_COMPONENT_FUNCTION_TYPE>:
+	Suppress d_print_mod for DMGL_RET_POSTFIX.
+	* testsuite/demangle-expected: New testcases for --ret-postfix.
+
+2011-06-13  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* cp-demangle.c (d_print_comp) <DEMANGLE_COMPONENT_FUNCTION_TYPE>: Do
+	not pass DMGL_RET_POSTFIX or DMGL_RET_DROP.  Support DMGL_RET_DROP.
+	* testsuite/demangle-expected: New testcases for --ret-drop.
+	* testsuite/test-demangle.c: Document --ret-drop in a comment.
+	(main): New variable ret_drop, fill it, call cplus_demangle with it.
+
+2011-06-13  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* cp-demangle.c (struct d_print_info): Remove field options.
+	(d_print_init): Remove parameter options.
+	(cplus_demangle_print_callback): Update all the callers.
+	(d_print_comp, d_print_mod_list, d_print_mod, d_print_function_type)
+	(d_print_array_type, d_print_expr_op, d_print_cast, d_print_subexpr):
+	Add parameter options, update all the callers.
+
+2011-04-20  Jim Meyering  <meyering@redhat.com>
+
+	* cp-demint.c (cplus_demangle_v3_components): Remove useless
+	if-before-free.
+	* cplus-dem.c (squangle_mop_up): Likewise.
+	(delete_non_B_K_work_stuff): Likewise.
+	* pex-common.c (pex_free): Likewise.
+	* pex-msdos.c (pex_msdos_cleanup): Likewise.
+	* pex-win32.c (mingw_rootify, msys_rootify): Likewise.
+	(win32_spawn): Likewise.
+	* regex.c (FREE_VAR, weak_alias): Likewise.
+	* spaces.c (spaces): Likewise.
+
+2011-04-10  Jim Meyering  <meyering@redhat.com>
+
+	Avoid memory overrun in a test leading to potential double-free.
+	* testsuite/test-expandargv.c (writeout_test): Fix off-by-one error:
+	i.e., do copy the trailing NUL byte.
+
+2011-03-31  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms (OBJS): Add filename_cmp.obj
+
+2011-02-28  Kai Tietz  <kai.tietz@onevision.com>
+
+	* filename_cmp.c (filename_ncmp): New function.
+	* functions.texi: Regenerated.
+
+2011-02-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* splay-tree.c: Escape wrapping newlines in texinfo markup
+	with '@', to fix function declaration output rendering.
+	* gather-docs: Relax and improve macro name matching to actually
+	match all current names and to allow input line wrapping.
+	* bsearch.c, concat.c, crc32.c, fnmatch.txh, fopen_unlocked.c,
+	hashtab.c, insque.c, make-relative-prefix.c, memchr.c, memcmp.c,
+	memcpy.c, memmem.c, memmove.c, mempcpy.c, memset.c,
+	pexecute.txh, random.c, setenv.c, setproctitle.c,
+	simple-object.txh, snprintf.c, stpncpy.c, strncmp.c, strtod.c,
+	strtol.c, vasprintf.c, vprintf.c, vsnprintf.c, xmemdup.c:
+	Wrap long texinfo input lines.
+	* functions.texi: Regenerate.
+
+2011-01-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* .gitignore: New file.
+
+2010-12-08  Doug Evans  <dje@google.com>
+
+	* splay-tree.c (splay_tree_foreach_helper): Remove arg `sp',
+	all callers updated.  Rewrite to be non-recursive.
+
+2010-11-29  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* setproctitle.c [HAVE_SYS_PRCTL_H]: Include <sys/types.h>.
+
+2010-11-20  Anthony Green  <green@moxielogic.com>
+
+	* configure.ac: Turn PR_SET_NAME link test into a test for
+	sys/prctl.h.
+	* configure, config.in: Rebuilt.
+	* setproctitle.c: Test for HAVE_SYS_PRCTL_H.
+	(setproctitle) Test for PR_SET_NAME definition.
+
+2010-11-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	PR other/46202
+	* Makefile.in (install-strip): New phony target.
+	(install): Also mark as phony.
+
+2010-11-16  Ian Lance Taylor  <iant@google.com>
+
+	* simple-object.c (simple_object_attributes_merge): Rename from
+	simple_object_attributes_compare.  Call merge field.
+	* simple-object-common.h (struct simple_object_functions): Rename
+	attributes_compare field to attribute_merge.
+	* simple-object-elf.c (EM_SPARC): Define.
+	(EM_SPARC32PLUS): Define.
+	(simple_object_elf_attributes_merge): Renamed from
+	simple_object_elf_attributes_compare.  Permit EM_SPARC and
+	EM_SPARC32PLUS objects to be merged.
+	(simple_object_elf_functions): Update function name.
+	* simple-object-coff.c (simple_object_coff_attributes_merge):
+	Rename from simple_object_coff_attributes_compare.
+	(simple_object_coff_functions): Update function name.
+	* simple-object-mach-o.c (simple_object_mach_o_attributes_merge):
+	Renamed from simple_object_mach_o_attributes_compare.
+	(simple_object_mach_o_functions): Update function name.
+
+2010-11-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR other/42670
+	PR binutils/11137
+	* cp-demangle.c (d_make_demangle_mangled_name): New.
+	(d_demangle_callback): Use it on DCT_GLOBAL_XTORS.
+
+	* testsuite/demangle-expected: Updated.
+
+2010-11-14  Kai Tietz  <kai.tietz@onevision.com>
+
+	* simple-object-coff.c (simple_object_coff_read_strtab): Fix reading
+	offset.
+
+2010-11-12  Ian Lance Taylor  <iant@google.com>
+
+	PR other/46332
+	* cp-demangle.c (d_print_function_type): Don't print parentheses
+	if there are no modifiers to print.
+	* testsuite/demangle-expected: Tweak one test case, add another.
+
+2010-11-04  Richard Henderson  <rth@redhat.com>
+
+	* configure.ac (AC_CHECK_HEADERS): Add process.h.
+	(checkfuncs): Add dup3, spawnve, spawnvpe; sort the list.
+	(AC_CHECK_FUNCS): Add dup3, spawnve, spawnvpe.
+	* configure, config.in: Rebuild.
+	* pex-unix.c [HAVE_SPAWNVE] (pex_unix_exec_child): New function.
+	[HAVE_SPAWNVE] (save_and_install_fd, restore_fd): New functions.
+
+2010-11-02  Ian Lance Taylor  <iant@google.com>
+	    Dave Korn  <dave.korn.cygwin@gmail.com>
+	    Iain Sandoe  <iains@gcc.gnu.org>
+
+	* simple-object.c: New file.
+	* simple-object-common.h: New file.
+	* simple-object-elf.c: New file.
+	* simple-object-mach-o.c: New file.
+	* simple-object-coff.c: New file.
+	* simple-object.txh: New file.
+	* configure.ac: Add AC_TYPE_SSIZE_T.
+	* Makefile.in: Rebuild dependencies.
+	(CFILES): Add simple-object.c, simple-object-coff,
+	simple-object-elf.c, and simple-object-mach-o.c.
+	(REQUIRED_OFILES): Add corresponding object files.
+	* configure: Rebuild.
+	* config.in: Rebuild.
+	* functions.texi: Rebuild.
+
+2010-10-29  Ian Lance Taylor  <iant@google.com>
+
+	* setproctitle.c: Add space after function name in @deftypefn
+	comment.
+	* functions.texi: Rebuild.
+
+2010-10-26  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* aclocal.m4 (AC_LANG_FUNC_LINK_TRY(C)): Delete.
+	* configure: Regenerate.
+
+2010-10-07  Andi Kleen <ak@linux.intel.com>
+
+	* configure: Regenerate.
+	* configure.ac: Turn PR_SET_NAME check into link check.
+
+2010-10-06  Andi Kleen <ak@linux.intel.com>
+
+	* Makefile.in (CFILES): Add setproctitle.
+	(CONFIGURED_OFILES): Add setproctitle.
+	(setproctitle): Add rule.
+	* config.in: Regenerate.
+	* configure: Regenerate.
+	* configure.ac: Add checks for prctl PR_SET_NAME and setproctitle.
+	* setproctitle.c: Add file.
+	* functions.texi: Regenerate.
+
+2010-09-22 Tristan Gingold  <gingold@adacore.com>
+
+	* cplus-dem.c (ada_demangle): Add comments.
+	Handle stream and controlled type operations.
+	Decoding of some uppercase letters moved before separators.
+	* testsuite/demangle-expected: Add tests.
+
+2010-09-10  James Lyon  <jameslyon0@googlemail.com>
+
+	http://sourceware.org/bugzilla/show_bug.cgi?id=11572
+	* cp-demangle.c (d_find_pack): Add case for
+	DEMANGLE_COMPONENT_LAMBDA.
+	* testsuite/demangle-expected: Add regression test.
+
+2010-09-08  Tristan Gingold  <gingold@adacore.com>
+
+	PR 44001
+	* maint-tool (missing): Fix pattern for object file.
+	(deps): Use $(objext) for object extension.
+	* Makefile.in (objext): New variable.
+	Replace all occurences of .o with .$(objext)
+	Regenerate with maint-deps
+	* configure.ac (pexecute): Set to the basename.
+	* configure: Regenerate.
+
+2010-08-20  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* pex-common.c (pex_read_err): Set stderr_pipe to -1 if a
+	corresponding stream has been opened.
+	(pex_free): Close pipe file descriptors corresponding to child's
+	stdout and stderr before waiting.
+
+2010-08-13  Nick Clifton  <nickc@redhat.com>
+
+	* argv.c (expandargv): Limit the number of times that response
+	files are opened in order to prevent infinite recursion.
+
+2010-07-21  Pascal Obry  <obry@adacore.com>
+
+	* make-temp-file.c (choose_tmpdir): Append a dot to P_tmpdir if needed.
+
+2010-07-06  Ken Werner  <ken.werner@de.ibm.com>
+
+	* floatformat.c (floatformat_ieee_half_big): New variable.
+	(floatformat_ieee_half_little): Likewise.
+
+2010-06-14  Gerald Pfeifer  <gerald@pfeifer.com>
+
+	* libiberty.texi: Remove reference to GCC 3 and 2001 (thrice).
+	Update copyright years.
+	Move to GFDL 1.3.
+
+2010-06-10  Jakub Jelinek  <jakub@redhat.com>
+
+	PR other/43838
+	* cp-demangle.c (struct d_print_info): Add flush_count field.
+	(d_print_init): Initialize it to 0.
+	(d_print_flush): Increment it.
+	(d_print_comp): If needed flush before appending ", ".  Only
+	decrement dpi->len if no flushes happened during the recursive
+	call.
+	* testsuite/demangle-expected: Add a test for this.
+
+2010-06-08  Laurynas Biveinis  <laurynas.biveinis@gmail.com>
+
+	* splay-tree.c: Update copyright years.
+	(splay_tree_new_typed_alloc): New.
+	(splay_tree_new_with_allocator): Use it.
+
+	* hashtab.c: Update copyright years.
+	(htab_create_typed_alloc): New.
+	(htab_create_alloc): Use it.
+
+	* functions.texi: Regenerate.
+
+2010-06-03  Joern Rennecke <joern.rennecke@embecosm.com>
+	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	PR bootstrap/42798
+	* configure.ac: Check for declaration of 'basename(char *)'.
+	* configure: Regenerate.
+
+2010-05-26  Kai Tietz  <kai.tietz@onevision.com>
+
+	* testsuite/demangle-expected: Add tests for __int128
+	and unsigned __int128 types.
+
+2010-05-06  Magnus Fromreide  <magfr@lysator.liu.se>
+	    Jason Merrill  <jason@redhat.com>
+
+	* cp-demangle.c (cplus_demangle_builtin_types): Add nullptr.
+	(cplus_demangle_type): Handle nullptr.
+	* testsuite/demangle-expected: Test it.
+
+2010-04-23  Pedro Alves  <pedro@codesourcery.com>
+
+	* lbasename.c (lbasename): Split into ...
+	(unix_lbasename, dos_basename): ... these.
+	(lbasename): ... and reimplement on top of them.
+	* Makefile.in (lbasename.o): Add dependency on
+	$(INCDIR)/filenames.h.
+
+2010-04-07  Jakub Jelinek  <jakub@redhat.com>
+
+	* regex.c (byte_re_match_2_internal): Avoid set but not used
+	warning.
+
+2010-03-22  Jason Merrill  <jason@redhat.com>
+
+	* cp-demangle.c (d_print_mod): Use () rather than [] for vectors.
+
+2010-03-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.in (all): Do not use exec.
+
+2010-02-04  Tom Tromey  <tromey@redhat.com>
+
+	* testsuite/demangle-expected: Add missing --format=gnu-v3.
+
+2010-02-03  Jason Merrill  <jason@redhat.com>
+
+	* cp-demangle.c (d_expression): Handle dependent operator name.
+
+	PR c++/12909
+	* cp-demangle.c (d_number_component, d_vector_type): New.
+	(cplus_demangle_type, d_print_comp, d_print_mod): Handle vectors.
+
+2010-01-25  Ian Lance Taylor  <iant@google.com>
+
+	* cp-demangle.c (cplus_demangle_type): Check for invalid type
+	after "DF".
+	* testsuite/demangle-expected: Add test.
+
+2010-01-20  Jason Merrill  <jason@redhat.com>
+
+	PR c++/42338
+	* cp-demangle.c (d_print_comp): Fix array index printing.
+
+2010-01-11  Tristan Gingold  <gingold@adacore.com>
+
+	* cplus-dem.c (ada_demangle): Remove prototype.
+	(grow_vect): Removed.
+	(ada_demangle): Rewritten.
+	(cplus_demangle): Fix indentation.
+	* testsuite/demangle-expected: Add tests for Ada.
+
+2010-01-09  Ian Lance Taylor  <iant@google.com>
+
+	PR other/42230
+	* cp-demangle.c (d_demangle): Return dgs.alc on success.
+
+2010-01-04  Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+
+	PR target/42316
+	* configure.ac (PICFLAG): Use -fPIC on SH hosts.
+	* configure: Regenerate.
+
+2009-12-07  Doug Evans  <dje@google.com>
+
+	* pex-unix.c (pex_unix_exec_child): Save/restore environ.
+
+2009-11-26  Ben Elliston  <bje@au.ibm.com>
+
+	* configure.ac (AC_CHECK_FUNCS): Sort into alphabetic order.
+	* configure: Regenerate.
+
+2009-11-25  Ben Elliston  <bje@au.ibm.com>
+
+	* functions.texi: Rebuild.
+
+2009-11-25  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
+	    Ben Elliston  <bje@au.ibm.com>
+
+	* README: Mention changes to Makefile.in and functions.texi.
+	* gather-docs: Mention 'make stamp-functions' in the header.
+
+2009-11-23  Ben Elliston  <bje@au.ibm.com>
+	    Ian Lance Taylor  <iant@google.com>
+
+	* pex-unix.c (pex_child_error): Improve warning avoidance by
+	checking the results of write(3) and exiting with -2 if any write
+	returns a negative value.
+
+2009-11-22  Steve Ward  <planet36@gmail.com>
+
+	* dyn-string.c (dyn_string_append_char): Fix typo in comment.
+
+2009-11-20  Ben Elliston  <bje@au.ibm.com>
+
+	* pex-unix.c (pex_child_error): Define writeerr macro to avoid
+	unused result warnings from write(3) calls.  Undefine writeerr
+	after all uses.
+
+2009-10-08  Daniel Gutson  <dgutson@codesourcery.com>
+	Daniel Jacobowitz  <dan@codesourcery.com>
+	Pedro Alves  <pedro@codesourcery.com>
+
+	libiberty/
+	* argv.c (consume_whitespace): New function.
+	(only_whitespace): New function.
+	(buildargv): Always use ISSPACE by calling consume_whitespace.
+	(expandargv): Skip empty files.  Do not stop at the first empty
+	argument (calling only_whitespace)..
+	* testsuite/test-expandargv.c: (test_data): Test empty lines
+	and empty arguments.
+	(run_tests): Fix false positives due to shorter arguments.
+
+2009-09-30  Martin Thuresson  <martint@google.com>
+
+	* regex.c (byte_re_match_2_internal): Split declaration and
+	assignment to avoid -Wc++-compat warning due to goto.
+
+2009-09-29  Jason Merrill  <jason@redhat.com>
+
+	* Makefile.in: Enable demangle target.
+	* cp-demangle.c (d_lambda, d_unnamed_type, d_make_default_arg): New.
+	(d_name, d_prefix, d_unqualified_name, d_local_name): Handle lambdas.
+	(d_parmlist): Factor out from d_bare_function_type.
+	(d_compact_number): Factor out from d_template_param and d_expression.
+	(d_append_num): Factor out from d_print_comp.
+	(d_print_comp, d_print_mod_list): Handle lambdas.
+	* testsuite/demangle-expected: Add lambda tests.
+
+2009-09-23  Matthew Gingell  <gingell@adacore.com>
+
+	* cplus-dem.c (ada_demangle): Ensure demangled is freed.
+
+2009-09-22  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* choose-temp.c: Include unistd.h for mingw targets.
+
+2009-09-16  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* hashtab.c [HAVE_INTTYPES_H]: Include <inttypes.h>.
+
+2009-09-15  Tristan Gingold  <gingold@adacore.com>
+
+	* config.h-vms (intptr_t): Define to compile hashtab.c
+
+2009-09-04  Ozkan Sezer  <sezeroz@gmail.com>
+
+	PR target/39065
+	* configure.ac: Replace AC_CHECK_TYPE() for intptr_t and uintptr_t
+	with AC_TYPE_INTPTR_T and AC_TYPE_UINTPTR_T.
+	* config.in: Regenerated.
+	* configure: Regenerated.
+
+2009-09-03  Ozkan Sezer  <sezeroz@gmail.com>
+
+	PR target/39065
+	* configure.ac: Also check for intptr_t.
+	* config.h.in: Regenerated.
+	* configure: Regenerated.
+	* hashtab.c (hash_pointer): Cast the pointer argument to intptr_t
+	instead of of long.
+
+2009-09-02  Tristan Gingold  <gingold@adacore.com>
+
+	* vmsbuild.com: Removed as unused and superceeded by makefile.vms.
+	* makefile.vms: Ported to Itanium VMS.  Remove useless targets and
+	dependencies.  Remove unused FORMAT variable.
+	* configure.com: New file to create build.com DCL script for
+	Itanium VMS or Alpha VMS.
+
+2009-08-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure.ac (AC_PREREQ): Bump to 2.64.
+
+2009-08-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	 PR ld/10536
+	 * Makefile.in (install-html-recursive): Removed.
+
+2009-08-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* config.in: Regenerate.
+	* configure: Regenerate.
+
+2009-07-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.in (AUTOCONF, configure_deps): New variables.
+	($(srcdir)/configure): New rule, active only in maintainer mode.
+
+2009-07-29  Douglas B Rupp  <rupp@gnat.com>
+
+	* make-temp-file.c (choose_tmpdir): Try standard temp logical on VMS.
+
+2009-07-27  Douglas B Rupp  <rupp@gnat.com>
+
+	* pex-unix.c (vfork): Remove VMS specific definition (get from header
+	file instead).
+	(to_ptr32): New function.
+	(pex_unix_exec_child): Use it.
+
+2009-07-24  Ian Lance Taylor  <iant@google.com>
+
+	PR bootstrap/40854
+	* crc32.c (xcrc32): Rename from crc32.
+
+2009-07-24  Ian Lance Taylor  <iant@google.com>
+
+	* crc32.c: New file.
+	* Makefile.in: Rebuild dependencies.
+	(CFILES): Add crc32.c.
+	(REQUIRED_OFILES): Add ./crc32.o.
+	* functions.texi: Rebuild.
+
+2009-07-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* cp-demangle.c (d_print_comp <DEMANGLE_COMPONENT_GLOBAL_CONSTRUCTORS>)
+	(d_print_comp <DEMANGLE_COMPONENT_GLOBAL_DESTRUCTORS): New.
+	(d_make_comp <DEMANGLE_COMPONENT_GLOBAL_CONSTRUCTORS>)
+	(d_make_comp <DEMANGLE_COMPONENT_GLOBAL_DESTRUCTORS): New.
+	(d_demangle_callback): The variable type is now declared as enum.
+	Replace parser of _GLOBAL_ symbols by a d_make_comp call.
+
+2009-06-21  Jakub Jelinek  <jakub@redhat.com>
+
+	* hashtab.c (htab_traverse): Don't call htab_expand for
+	nearly empty hashtabs with sizes 7, 13 or 31.
+
+2009-06-16  Nick Clifton  <nickc@redhat.com>
+
+	PR 10197
+	* testsuite/test-demangle.c: Rename getline to get_line to avoid
+	conflicts with system function of the same name.
+
+2009-05-30  Eli Zaretskii  <eliz@gnu.org>
+
+	* snprintf.c: Doc fix.
+
+	* vsnprintf.c: Doc fix.
+
+2009-05-29  Kai Tietz  <kai.tietz@onevision.com>
+
+	* pex-win32.c (pex_win32_fdopenr): Set INHERIT to false.
+
+2009-05-29  Michael Matz  <matz@suse.de>
+
+	* fibheap.c (fibheap_replace_key_data): Make sure we don't early
+	out when forcing the minimum.
+	(fibheap_delete_node): Assert that we managed to force the minimum.
+
+2009-05-25  Tristan Gingold  <gingold@adacore.com>
+
+	* config.h-vms: Rewritten.  Define configure macros.
+	Use DEC-C builtin alloca.
+
+	* makefile.vms (OBJS): Update list.
+	(OPT): New variable.
+	(CFLAGS): Update compilation flags.
+	(libiberty.olb): Do not depend on alloca-conf.h anymore.
+
+2009-05-19  Ian Lance Taylor  <iant@google.com>
+	    Ben Elliston  <bje@au.ibm.com>
+
+	* cp-demangle.c (cplus_demangle_fill_ctor): Fix logic bug.
+	(cplus_demangle_fill_dtor): Likewise.
+
+2009-05-17  Julian Brown  <julian@codesourcery.com>
+
+	* pex-win32.c (pex_win32_exec_child): Fix logic to avoid closing
+	standard handles (stdin, stdout, stderr) in parent.
+
+2009-04-29  Julian Brown  <julian@codesourcery.com>
+
+	* pex-win32.c (pex_win32_pipe): Add _O_NOINHERIT.
+	(pex_win32_exec_child): Ensure each process has only one handle open
+	on pipe endpoints. Close standard input after creating child for
+	symmetry with standard output/standard error.
+
+2009-04-25  Eli Zaretskii  <eliz@gnu.org>
+
+	* Makefile.in (needed-list): Target removed (not used in GCC
+	3.0 and later).  All references deleted.
+	(mostlyclean): Remove references to needed.awk and needed2.awk.
+
+2009-04-14  Eli Zaretskii  <eliz@gnu.org>
+
+	* configure.ac  (setobjs, msdosdjgpp): Move a-priori setting of
+	existing and required library functions to with_target_subdir
+	section, so that the native build does detect them at configure
+	time.
+	* configure: Regenerated.
+
+2009-04-13  Ozkan Sezer  <sezeroz@gmail.com>
+
+	PR target/39397
+	* pex-common.h (struct pex_obj): Store pid values as pid_t,
+	not as long (members *children and (*wait))
+	* pex-common.c (pex_run_in_environment): Likewise.
+	* pex-win32.c (pex_win32_wait): Return pid_t and properly check
+	returned pid value.
+	* pex-djgpp.c (pex_djgpp_wait): Return pid_t.
+	* pex-msdos.c (pex_msdos_wait): Likewise.
+
+2009-04-07  Arnaud Patard <apatard@mandriva.com>
+
+	* libiberty/configure.ac: Fix Linux/MIPS matching rule.
+	* libiberty/configure: Regenerate.
+
+2009-03-27  Ian Lance Taylor  <iant@google.com>
+
+	* memmem.c: New file, from gnulib.
+	* configure.ac: Add memmem to list of functions provided if they
+	are not available on the host.
+	* Makefile.in: Rebuild dependencies.
+	(CFILES): Add memmem.c.
+	(CONFIGURED_OFILES): Add memmem.o.
+	* configure, config.in, functions.texi: Rebuild.
+
+2009-03-23  Jason Merrill  <jason@redhat.com>
+
+	* cp-demangle.c (d_expression): Handle pack expansion.
+	(d_find_pack): Handle DEMANGLE_COMPONENT_FUNCTION_PARAM.
+	(d_print_subexpr): Don't wrap function parms in ().
+	(d_print_comp) [DEMANGLE_COMPONENT_PACK_EXPANSION]: Handle
+	not finding a pack.
+
+2009-03-17  Jason Merrill  <jason@redhat.com>
+
+	* cp-demangle.c (d_make_function_param): new fn.
+	(cplus_demangle_mangled_name): Work around abi v2 bug.
+	(d_expr_primary): Likewise.
+	(cplus_demangle_operators): Add alignof ops.
+	(d_expression): Handle function parameters and conversions
+	with other than 1 operand.
+	(d_print_comp): Handle function parameters.  Fix bug with
+	function used in type of function.
+	* testsuite/demangle-expected: Update tests.
+
+2009-02-21  Mark Mitchell  <mark@codesourcery.com>
+
+	* make-temp-file.c (<windows.h>): Include on Windows.
+	(choose_tmpdir): On Windows, use GetTempPath.
+
+2009-01-18  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* configure.ac (funcs, vars, checkfuncs):  Don't munge on Cygwin,
+	as it no longer shares libiberty object files.
+	* configure:  Regenerated.
+
+2009-01-07  Jason Merrill  <jason@redhat.com>
+
+	* cp-demangle.c (d_expression): Remove mangling for zero-op casts.
+
+2009-01-06  Ben Elliston  <bje@au.ibm.com>
+
+	* cp-demangle.c (cplus_demangle_type): Return NULL if the
+	character following a 'D' cannot be recognised.
+
+2008-12-18  Jason Merrill  <jason@redhat.com>
+
+	PR c++/38561
+	* cp-demangle.c (d_expression, d_print_comp): Revert
+	cast changes.
+
+2008-12-17  Jason Merrill  <jason@redhat.com>
+
+	* cp-demangle.c (d_expression): Handle rvalue stubs too.
+	[DEMANGLE_COMPONENT_CAST]: Update mangling.
+	(d_print_comp): Avoid extra ", " with empty template argument packs.
+	Remove handling for obsolete T() mangling.
+
+2008-12-10  Jason Merrill  <jason@redhat.com>
+
+	* cp-demangle.c (cplus_demangle_type): Support fixed-point types.
+	(d_print_comp, d_dump): Likewise.
+
+2008-10-22  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.in (CPPFLAGS): Define.
+	(FLAGS_TO_PASS, COMPILE.c): Add CPPFLAGS.
+
+2008-10-15  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/37137
+	* Makefile.in (LIBCFLAGS): Remove.
+	(FLAGS_TO_PASS): Don't mention it.
+	(COMPILE.c, MULTIOSDIR): Replace it with CFLAGS.
+
+2008-10-08  David Edelsohn  <edelsohn@gnu.org>
+
+	* xstrdup.c: Include <sys/types.h> after "config.h"
+
+2008-10-07  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* configure.ac: Call AC_SYS_LARGEFILE.
+	* config.in: Regenerated.
+	* configure: Likewise.
+
+2008-10-06  Jason Merrill  <jason@redhat.com>
+
+	* cp-demangle.c (struct d_print_info): Add pack_index.
+	(d_dump): Add DEMANGLE_COMPONENT_PACK_EXPANSION.
+	(d_make_comp): Likewise.  DEMANGLE_COMPONENT_ARGLIST and
+	DEMANGLE_COMPONENT_TEMPLATE_ARGLIST can have two null args.
+	(cplus_demangle_builtin_types): Add char16/32_t.
+	(cplus_demangle_type): Recognize them.
+	(d_template_args): Handle empty argument packs.
+	(d_template_arg): Handle argument packs.
+	(d_expression): Handle dependent name.
+	(d_index_template_argument): New fn.
+	(d_lookup_template_argument): New fn.
+	(d_find_pack, d_pack_length): New fn.
+	(d_print_subexpr): Split out...
+	(d_print_comp): ...from here.  Use d_*_template_argument.
+	Handle empty arg lists.  Support pack expansions.
+	* cp-demangle.h (D_BUILTIN_TYPE_COUNT): Increase to 32.
+
+2008-09-09  Jason Merrill  <jason@redhat.com>
+
+	* cp-demangle.c (d_dump): Handle DEMANGLE_COMPONENT_DECLTYPE.
+	(d_make_comp): Likewise.
+	(cplus_demangle_type): Handle decltype and DFP types.
+	(cplus_demangle_operators): Call operator takes 2 args.
+	(cplus_demangle_builtin_types): Add DFP types.
+	(d_exprlist): New fn.
+	(d_expression): Handle parm placeholders, T() and calls.
+	(d_print_comp): Handle decltype, T() and calls.
+	* testsuite/demangle-expected: Test the above.
+
+2008-08-07  Aaron W. LaFramboise  <aaronavay62@aaronwl.com>
+
+	* pex-win32.c (argv_to_argc): New function.
+	(spawn_script): Duplicate argv before calling win32_spawn.
+
+2008-07-31  Jakub Jelinek  <jakub@redhat.com>
+
+	* mkstemps.c (mkstemps): Keep looping even for EISDIR.
+
+2008-07-31  Denys Vlasenko  <dvlasenk@redhat.com>
+
+	* mkstemps.c (mkstemps): If open failed with errno other than
+	EEXIST, return immediately.
+	* make-temp-file.c: Include errno.h.
+	(make_temp_file): If mkstemps failed, print an error message
+	before aborting.
+
+2008-07-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* maint-tool (deps): Output config.h instead of stamp-h.
+	* Makefile.in: Rebuild deps.
+	(maintainer-clean-subdir): Depend on stamp-h rather than config.h.
+	Reverts 2007-07-11 change.
+
+2008-06-19  Eric Blake  <ebb9@byu.net>
+
+	Adjust strsignal to POSIX 200x prototype.
+	* strsignal.c (strsignal): Remove const.
+
+2008-06-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure: Regenerate.
+
+2008-06-15  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* libiberty.texi: Expand TABs, drop indentation outside examples.
+	* obstacks.texi: Likewise.
+
+2008-04-21  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* libiberty/configure.ac: use -fPIC on Linux/MIPS hosts.
+	* libiberty/configure: Regenerate.
+
+2008-04-18  Kris Van Hees <kris.van.hees@oracle.com>
+
+	* testsuite/demangle-expected: Added tests for char16_t and char32_t.
+
+2008-04-18  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/35457
+	* aclocal.m4: Add override.m4.
+	* configure: Regenerate.
+
+2008-03-31  Ian Lance Taylor  <iant@google.com>
+
+	* cp-demangle.c (d_substitution): Correct overflow check to avoid
+	-fstrict-overflow optimizations.
+
+2008-03-27  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.ac (frags): Don't set, use frag instead.
+	(PICFLAG): Set here and substitute.
+	* Makefile.in (PICFLAG): Substitute from autoconf.
+	* configure: Regenerate.
+
+2008-03-24  Ian Lance Taylor  <iant@google.com>
+
+	* sha1.c: New file, from gnulib.
+	* Makefile.in: Rebuild dependencies.
+	(CFILES): Add sha1.c.
+	(REQUIRED_OFILES): Add sha1.o.
+
+2008-03-24  Doug Evans  <dje@google.com>
+
+	* make-relative-prefix.c (make_relative_prefix_1): Handle NULL
+	return from strdup.
+
+2008-03-12  Seongbae Park <seongbae.park@gmail.com>
+
+	* cplus-dem.c (malloc, realloc): Use void * instead of char *
+	as return type.
+
+2008-03-11  Nick Clifton  <nickc@redhat.com>
+
+	* md5.c (md5_process_bytes): Do not assume that memcpy will
+	provide a return value.
+
+2008-02-19  Ben Elliston  <bje@au.ibm.com>
+
+	PR other/12618
+	* testsuite/Makefile.in (mostlyclean): Remove any core file.
+
+2008-01-26  David Daney  <ddaney@avtrex.com>
+
+	* cp-demangle.c (d_dump): Handle DEMANGLE_COMPONENT_JAVA_RESOURCE,
+	DEMANGLE_COMPONENT_COMPOUND_NAME, and
+	DEMANGLE_COMPONENT_CHARACTER cases.
+	(d_make_comp): Handle DEMANGLE_COMPONENT_COMPOUND_NAME and
+	DEMANGLE_COMPONENT_JAVA_RESOURCE cases.
+	(d_make_character): New function.
+	(d_java_resource): Same.
+	(d_special_name): Handle "Gr" case.
+	(d_print_comp): Handle DEMANGLE_COMPONENT_JAVA_RESOURCE,
+	DEMANGLE_COMPONENT_COMPOUND_NAME, and
+	DEMANGLE_COMPONENT_CHARACTER cases.
+	* testsuite/demangle-expected: Add test for java resource name
+	mangling.
+
+2008-01-23  Thiago Jung Bauermann  <bauerman@br.ibm.com>
+
+	* cplus-dem.c (demangle_function_name): Changed to return value
+	indicating if a name was correctly demangled.
+	(iterate_demangle_function): Use demangle_function_name return
+	value.
+
+2008-01-19  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
+
+	PR other/33768
+	* splay-tree.c (rotate_left): Fix minor typo in comment.
+	(rotate_right): Likewise.
+
+2007-11-12  Joseph Myers  <joseph@codesourcery.com>
+
+	* floatformat.c (floatformat_ibm_long_double_is_valid): Fix
+	compiler warnings.
+	(floatformat_ibm_long_double): Use
+	floatformat_ibm_long_double_is_valid.
+
+2007-11-07  Joseph Myers  <joseph@codesourcery.com>
+	    Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* floatformat.c (mant_bits_set): New.
+	(floatformat_to_double): Use it.  Note no special handling of
+	split formats.
+	(floatformat_from_double): Note no special handing of split
+	formats.
+	(floatformat_ibm_long_double_is_valid,
+	floatformat_ibm_long_double): New.
+	(floatformat_ieee_single_big, floatformat_ieee_single_little,
+	floatformat_ieee_double_big, floatformat_ieee_double_little,
+	floatformat_ieee_double_littlebyte_bigword, floatformat_vax_f,
+	floatformat_vax_d, floatformat_vax_g, floatformat_i387_ext,
+	floatformat_m68881_ext, floatformat_i960_ext,
+	floatformat_m88110_ext, floatformat_m88110_harris_ext,
+	floatformat_arm_ext_big, floatformat_arm_ext_littlebyte_bigword,
+	floatformat_ia64_spill_big, floatformat_ia64_spill_little,
+	floatformat_ia64_quad_big, floatformat_ia64_quad_little): Update
+	for addition of split_half field.
+
+2007-09-06  Tom Tromey  <tromey@redhat.com>
+
+	* pexecute.txh (pex_free): Document process killing.
+
+2007-08-31  Douglas Gregor  <doug.gregor@gmail.com>
+
+	* cp-demangle.c (d_dump): Handle
+	DEMANGLE_COMPONENT_RVALUE_REFERENCE.
+	(d_make_comp): Ditto.
+	(cplus_demangle_type): Ditto.
+	(d_print_comp): Ditto.
+	(d_print_mod): Ditto.
+	(d_print_function_type): Ditto.
+
+2007-08-24  Kai Tietz  <kai.tietz@onevision.com>
+
+	* pex-common.h: (pex_funcs): Retyped wait and exec_child to pid_t.
+	* pex-djgpp.c: Likewise.
+	* pex-msdos.c: Likewise.
+	* pex-unix.c: Likewise.
+	* pex-win32.c: Likewise.
+
+2007-08-17  Michael Snyder  <msnyder@access-company.com>
+
+	* make-relative-prefix.c (make_relative_prefix_1): Resource leaks.
+
+2007-08-03  Michael Snyder  <msnyder@access-company.com>
+
+	* make-relative-prefix.c (make_relative_prefix_1): Fix resource
+	leak.
+
+2007-07-31  Michael Snyder  <msnyder@access-company.com>
+
+	* cp-demangle.c (d_print_comp): Guard against null.
+
+2007-07-25  Ben Elliston  <bje@au.ibm.com>
+
+	* Makefile.in (CFILES): Remove ternary.c.
+	(REQUIRED_OFILES): Remove ./ternary.o.
+	(INSTALLED_HEADERS): Remove ternary.h.
+	(ternary.o): Remove.
+	* ternary.c: Remove.
+
+2007-07-23  DJ Delorie  <dj@redhat.com>
+
+	* argv.c (writeargv): Fix typo in inline documentation.
+	* functions.texi: Regenerate.
+
+2007-07-17  DJ Delorie  <dj@redhat.com>
+
+	* configure.ac (target_header_dir, msdosdjgpp): Remove duplicate
+	gettimeofday entry.
+	* configure: Likewise.
+
+2007-07-11  Alexandre Oliva  <aoliva@redhat.com>
+
+	* maint-tool (deps): Output stamp-h instead of config.h.
+	* Makefile.in: Rebuild deps.
+	(maintainer-clean-subdir): Depend on stamp-h rather than config.h.
+
+2007-07-02  Simon Baldwin <simonb@google.com>
+
+	* argv.c (writeargv): Removed declaration of unused variable.
+
+2007-06-14  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.ac: Use ACX_PROG_CC_ALMOST_PEDANTIC too.
+	* configure: Regenerate.
+
+2007-06-14  Paolo Bonzini  <bonzini@gnu.org>
+
+	* aclocal.m4: Include config/warnings.m4.
+	* configure.ac: Use ACX_PROG_CC_WARNING_OPTS.
+	* configure: Regenerate.
+
+2007-06-07  Geoffrey Keating  <geoffk@apple.com>
+
+	* configure.ac: Non-default multilibs can be cross compilations.
+	* configure: Regenerate
+
+2007-05-07  Nathan Froyd  <froydnj@codesourcery.com>
+
+	* argv.c (writeargv): New function.
+
+2007-05-05  Geoffrey Keating  <geoffk@apple.com>
+
+	* cp-demangle.c (d_name): Detect local-source-name.
+	(d_prefix): Likewise.
+	(d_unqualified_name): Implement local-source-name.
+
+2007-05-03  Joel Brobecker  <brobecker@adacore.com>
+
+	* filename_cmp.c: Replace include of ctype.h by include of
+	safe-ctype.h.
+	(filename_cmp): Use TOLOWER instead of tolower for conversions
+	that are locale-independent.
+	* Makefile.in (filename_cmp.o): Add dependency on safe-ctype.h.
+
+2007-04-11  Thomas Neumann  tneumann@users.sourceforge.net
+
+	* argv.c: Use ANSI C declarations.
+	* make-relative-prefix.c: Likewise.
+
+2007-04-06  Joel Brobecker  <brobecker@adacore.com>
+
+	* filename_cmp.c (filename_cmp): Improve documentation.
+
+2007-04-02  Andreas Schwab  <schwab@suse.de>
+
+	* filename_cmp.c: Include "config.h".
+
+2007-03-29  Joel Brobecker  <brobecker@adacore.com>
+
+	* filename_cmp.c: New file.
+	* Makefile.in (CFILES): Add filename_cmp.c.
+	(REQUIRED_OFILES): Add filename_cmp.o
+	(filename_cmp.o): New rule.
+	* functions.texi: Regenerate.
+
+2007-03-15  Geoffrey Keating  <geoffk@apple.com>
+
+	* cp-demangle.c (d_encoding): Exit early on error.
+	(d_pointer_to_member_type): Exit early if cplus_demangle_type
+	returns NULL.
+	(cplus_demangle_type): Likewise.
+	* testsuite/demangle-expected: New testcase.
+
+2007-03-01  Brooks Moses  <brooks.moses@codesourcery.com>
+
+	* Makefile.in: Add install-pdf target as copied from
+	automake v1.10 rules.
+	* testsuite/Makefile.in: Add dummy install-pdf target.
+
+2007-03-01  Peter Breitenlohner  <peb@mppmu.mpg.de>
+	    Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	PR other/16513
+	* Makefile.in: Install library under $(MULTIOSDIR), not $(MULTISUBDIR).
+	Install headers in multilib independent location.
+
+2007-02-26  DJ Delorie  <dj@redhat.com>
+
+	* configure.ac: add djgpp-specific results, so we don't have to
+	link during a cross compilation.
+	* configure: Regenerated.
+
+2007-01-31  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* hex.c: Fix typo.
+	* choose-temp.c: Likewise.
+	* functions.texi: Regenerate.
+
+2007-01-31  Vladimir Prus  <vladimir@codesourcery.com>
+
+	* pex-common.h (struct pex_obj): New fields
+	stderr_pipe and read_err.
+	* pex-common.c (pex_init_common): Initialize
+	stderr_pipe.
+	(pex_run_in_environment): Add error checking
+	for PEX_STDERR_TO_PIPE.  Create a pipe
+	for stderr if necessary.
+	(pex_read_err): New.
+	(pex_free): Close read_err.
+	* pexecute.txh: Document changes.
+	* functions.texi: Regenerated.
+
+2007-01-31  Ben Elliston  <bje@au.ibm.com>
+
+	* strsignal.c (psignal): Change type of signo to int.
+	* functions.texi: Regenerate.
+
+2007-01-29  Simon Baldwin <simonb@google.com>
+
+	* cp-demangle.h (cplus_demangle_operators): External definition
+	suppressed if not building for libstdc++.
+	* cp-demangle.c (__gcclibcxx_demangle_callback): Augmented interface
+	to demangling, provides a malloc-less version of __cxa_demangle.
+	(cplus_demangle_print_callback): Public callback version of
+	cplus_demangle_print.
+	(struct d_growable_string): New growable string structure.
+	(d_growable_string_init): New function, provides support for
+	growable strings separate from print info.
+	(d_growable_string_resize): Likewise.
+	(d_growable_string_append_buffer): Likewise.
+	(d_growable_string_callback_adapter):): Likewise.
+	(d_print_init): New print info initialization function.
+	(d_print_error): Macro replace by inline function.
+	(d_print_saw_error): Likewise.
+	(d_append_char): Likewise.
+	(d_append_buffer): Likewise.
+	(d_append_string): New inline function, replaces the
+	d_append_string_constant macro.
+	(d_flush_buffer): New function, flushes buffer to callback.
+	(d_demangle_callback, is_ctor_or_dtor): Malloc-based fallback
+	for unsupported dynamic arrays replaced by alloca().
+	(d_demangle): Return string length estimating removed.
+	(d_dump): Moved error case handling from call site into function.
+	(d_print_resize): Function removed.
+	(d_print_append_char): Likewise.
+	(d_print_append_buffer): Likewise.
+	(d_print_error): Likewise.
+	(d_print_comp): Added special case handling for Java arrays.
+	(java_demangle_v3): Removed string post-processing for Java arrays,
+	now replaced by special case handling in d_print_comp.
+	(cplus_demangle_v3_callback): Augmented interface to demangling,
+	provides a malloc-less version of cplus_demangle_v3.
+	(java_demangle_v3_callback): Augmented interface to demangling,
+	provides a malloc-less version of java_demangle_v3.
+
+2007-01-12  Ben Elliston  <bje@au.ibm.com>
+
+	* pex-unix.c (writeerr): Cast write result to void.
+
+	* choose-temp.c (choose_temp_base): Check the result of the call
+	to mktemp rather than testing the length of the modified string.
+
+2006-12-20  Geoffrey Keating  <geoffk@apple.com>
+
+	* cp-demangle.h: Add comment explaining what to do to avoid
+	overrunning string.
+	(d_check_char): New.
+	(d_next_char): Don't advance past trailing '\0'.
+	* cp-demangle.c (cplus_demangle_mangled_name): Use d_check_char.
+	(d_nested_name): Likewise.
+	(d_special_name): Likewise.
+	(d_call_offset): Likewise.
+	(d_function_type): Likewise.
+	(d_array_type): Likewise.
+	(d_pointer_to_member_type): Likewise.
+	(d_template_param): Likewise.
+	(d_template_args): Likewise.
+	(d_template_arg): Likewise.
+	(d_expr_primary): Likewise.
+	(d_local_name): Likewise.
+	(d_substitution): Likewise.
+	(d_ctor_dtor_name): Use d_advance rather than d_next_char.
+	* testsuite/test-demangle.c: Include sys/mman.h.
+	(MAP_ANONYMOUS): Define.
+	(protect_end): New.
+	(main): Use protect_end.
+	* testsuite/demangle-expected: Add testcases for overrunning
+	the end of the string.
+
+2006-11-30  Andrew Stubbs  <andrew.stubbs@st.com>
+	    J"orn Rennecke <joern.rennecke@st.com>
+
+	PR driver/29931
+	* make-relative-prefix.c (make_relative_prefix_1): New function,
+	broken out of make_relative_prefix.  Make link resolution dependent
+	on new parameter.
+	(make_relative_prefix): Use make_relative_prefix_1.
+	(make_relative_prefix_ignore_links): New function.
+
+2006-11-08  Vladimir Prus  <vladimir@codesourcery.com>
+
+	* pex-win32.c (no_suffixes): Remove.
+	(std_suffixes): Add "" as first element.
+	(find_executable): Remove detection of already-present
+	extension. Try all suffixes in std_suffixes.
+
+2006-11-07  Julian Brown  <julian@codesourcery.com>
+
+	* floatformat.c (get_field): Fix segfault with little-endian word
+	order on 64-bit hosts.
+	(put_field): Likewise.
+	(min): Move definition.
+
+2006-10-26  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	pex-win32.c (argv_to_cmdline): Replace xmalloc with XNEWVEC.
+	(find_executable): Likewise.
+	(win32_spawn): Cast alloca return to (char**).
+	Replace malloc with XNEWVEC.
+	bcopy.c (bcopy): Add explict casts in assignments.
+
+2006-10-25  Ben Elliston  <bje@au.ibm.com>
+
+	* pexecute.txh: Wrap pexecute's "flag" argument with @var {..}.
+
+2006-10-10  Brooks Moses  <bmoses@stanford.edu>
+
+	* Makefile.in: Added "pdf", "libiberty.pdf" target support.
+	* testsuite/Makefile.in: Added empty "pdf" target.
+
+2006-09-22  Ian Lance Taylor  <ian@airs.com>
+
+	PR other/29176
+	* cp-demangle.c (d_substitution): Check for overflow when
+	computing substitution index.
+
+2006-08-30  Corinna Vinschen  <corinna@vinschen.de>
+
+	* configure.ac: Add case for Mingw as host.
+	* configure: Regenerate.
+
+2006-08-27  Ian Lance Taylor  <ian@airs.com>
+
+	PR driver/27622
+	* pex-common.h (struct pex_funcs): Add toclose parameter to
+	exec_child field.
+	* pex-common.c (pex_run_in_environment): Pass toclose to
+	exec_child.
+	* pex-djgpp.c (pex_djgpp_exec_child): Add toclose parameter.
+	* pex-unix.c (pex_unix_exec_child): Likewise.
+	* pex-msdos.c (pex_msdos_exec_child): Likewise.
+	* pex-win32.c (pex_win32_exec_child): Likewise.
+
+	PR other/28797
+	* cp-demangle.c (d_pointer_to_member_type): Do add a substitution
+	for a qualified member which is not a function.
+	* testsuite/demangle-expected: Add test case.
+
+2006-07-27  Jan Hubicka  <jh@suse.cz>
+
+	PR rtl-optimization/28071
+	* hashtab.c (htab_empty): Clear out n_deleted/n_elements;
+	downsize the hashtable.
+
+2006-07-04  Peter O'Gorman  <peter@pogma.com>
+
+	* Makefile.in: chmod 644 before ranlib during install.
+
+2006-06-02  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* pex-unix.c (pex_unix_exec_child): Insert cast when assigning
+	to environ.
+
+2006-06-01  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* pex-common.c: New function pex_run_in_environment.
+	* pex-common.h: Add environment parameter to exec_child.
+	* pex-msdos.c: Add environment parameter to pex_msdos_exec_child.
+	* pex-djgpp.c: Add environment parameter to pex_djgpp_exec_child.
+	(pex_djgpp_exec_child): Pass environment to child process.
+	* pex-unix.c: Add environment parameter to pex_unix_exec_child.
+	(pex_unix_exec_child): Pass environment to child process.
+	* pex-win32.c: Add environment parameter to pex_win32_exec_child.
+	New function env_compare for comparing VAR=VALUE pairs.
+	(win32_spawn): Assemble environment block and pass to CreateProcess.
+	(spawn_script): Pass environment through to win32_spawn.
+	(pex_win32_exec_child): Pass environment through to spawn_script and
+	win32_spawn.
+	* functions.texi: Regenerate.
+	* pexecute.txh: Document pex_run_in_environment.
+
+2006-05-28  Mark Shinwell  <shinwell@codesourcery.com>
+
+	* mkstemps.c: Open temporary files in binary mode.
+
+2006-05-12  Anton Blanchard  <anton@samba.org>
+
+	* cplus-dem.c (demangle_fund_type): Ensure buf is large enough to
+	hold "int%u_t".
+
+2006-04-24  Julian Brown  <julian@codesourcery.com>
+
+	* floatformat.c (floatformat_to_double): Fix (biased) exponent=0 case.
+
+2006-03-29  Jim Blandy  <jimb@codesourcery.com>
+
+	* pex-common.c (pex_input_file, pex_input_pipe): New functions.
+	(pex_init_common): Initialize obj->input_file.
+	(pex_run): Close any file opened by pex_input_file.
+	* pexecute.txh (pex_input_file, pex_input_pipe): New docs.
+	* pex-common.h (struct pex_obj): New field input_file.
+	(struct pex_funcs): New function ptr fdopenw.
+	* pex-unix.c (pex_unix_fdopenw): New function.
+	(funcs): List it as our fdopenw function.
+	* pex-win32.c (pex_win32_fdopenw): New function.
+	(funcs): List it as our fdopenw function.
+	* pex-djgpp.c (funcs): Leave fdopenw null.
+	* pex-msdos (funcs): Same.
+	* functions.texi: Regenerated.
+
+2006-04-10  Jim Blandy  <jimb@codesourcery.com>
+
+	* pex-common.c (temp_file): New function, containing guts of
+	pex-style temporary file name generation.
+	(pex_run): Use it.
+
+2006-04-06  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* Makefile.in: Add install-html, install-html-am, and
+	install-html-recursive targets. Define mkdir_p and
+	NORMAL_INSTALL.
+	* configure.ac: AC_SUBST datarootdir, docdir, htmldir.
+	* configure: Regenerate.
+	* testsuite/Makefile.in: Add install-html and html targets.
+
+2006-03-31  Mark Mitchell  <mark@codesourcery.com>
+
+	* pex-win32.c (<errno.h>): Include.
+	(fix_argv): Remove.
+	(argv_to_cmdline): New function.
+	(std_suffixes): New variable.
+	(no_suffixes): Likewise.
+	(find_executable): New function.
+	(win32_spawn): Likewise.
+	(spawn_script): Use win32_spawn instead of _spawnv[p].
+	(pex_win32_exec_child): Replace MSVCRT calls with Win32 API calls.
+	(pex_win32_wait): Likewise.
+
+2006-03-24  Jim Blandy  <jimb@codesourcery.com>
+
+	* pex-common.c (pex_run): Simplify output name handling.
+
+2006-03-12  Jim Blandy  <jimb@red-bean.com>
+
+	* pex-common.h (struct pex_obj): Doc fixes.
+
+2006-03-11  Jim Blandy  <jimb@red-bean.com>
+
+	* functions.texi: Regenerate.
+
+2006-02-21  Ben Elliston  <bje@au.ibm.com>
+
+	* pexecute.c (pwait): Syntax fix for previous change.
+
+2006-02-17  Uttam Pawar  <uttamp@us.ibm.com>
+
+	* pexecute.c (pwait): Free vector pointer.
+	* partition.c (partition_print): Free class_elements pointer.
+
+2006-02-11  Roger Sayle  <roger@eyesopen.com>
+	    R. Scott Bailey  <scott.bailey@eds.com>
+	    Bill Northcott  <w.northcott@unsw.edu.au>
+
+	PR bootstrap/16787
+	* floatformat.c: Include <float.h> where available.
+	(NAN): Use value of DBL_QNAN if defined, and NAN isn't.
+
+2006-01-29  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* configure.ac: Add -Wc++-compat to ac_libibety_warn_cflags where
+	supported.
+	* configure: Regenerated.
+
+2006-01-20  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* testsuite/Makefile.in: Add test-expandargv test.
+	* testsuite/test-expandargv.c: New test.
+	* argv.c (expandargv): Check for errors with ferror,
+	rather than just by looking at return value from fread.
+
+2005-12-17  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* floatformat.c (floatformat_i387_ext_is_valid): Use explicit cast
+	to convert from "from".
+	(floatformat_to_double): Likewise.
+	(floatformat_from_double): Use explicit cast to convert from "to".
+
+2005-12-10  Terry Laurenzo  <tlaurenzo@gmail.com>
+
+	PR java/9861
+	* cp-demangle.c (d_bare_function_type): Recognize new 'J' qualifer
+	and include return type when found.
+	(d_print_comp)[DEMANGLE_COMPONENT_FUNCTION_TYPE]: Add
+	conditional logic to change printing order of return type.when
+	the DMGL_RET_POSTFIX option is present.
+	(java_demangle_v3): Add DMGL_RET_POSTFIX option to d_demangle
+	call.
+	* testsuite/test-demangle.c (main): Recognize option --ret-postfix
+	* testsuite/demangle-expected: Test cases to verify extended encoding.
+	Updated comment to document --ret-postfix option.
+
+2005-11-06  Richard Guenther  <rguenther@suse.de>
+
+	* splay-tree.c (rotate_left): New function.
+	(rotate_right): Likewise.
+	(splay_tree_splay_helper): Remove.
+	(splay_tree_splay): Re-implement.
+
+2005-10-31  Mark Kettenis  <kettenis@gnu.org>
+
+	* floatformat.c (floatformat_vax_aingle, floatformat_vax_double):
+	New variables.
+
+2005-10-07  Mark Mitchell  <mark@codesourcery.com>
+
+	* at-file.texi: Fix typo.
+
+2005-10-03  Mark Mitchell  <mark@codesourcery.com>
+
+	* at-file.texi: New file.
+
+2005-09-27  Mark Mitchell  <mark@codesourcery.com>
+
+	* argv.c (expandargv): Do not use xmalloc_failed.
+
+2005-09-26  Mark Mitchell  <mark@codesourcery.com>
+
+	* argv.c (safe-ctype.h): Include it.
+	(ISBLANK): Remove.
+	(stdio.h): Include.
+	(buildargv): Use ISSPACE instead of ISBLANK.
+	(expandargv): New function.
+	* Makefile.in: Regenerated.
+
+2005-09-14  Christopher Faylor  <cgf@timesys.com>
+
+	* pex-win32.c: Include "windows.h".
+	(backslashify): New function.
+	(fix_argv): Use backslashify to convert path to windows format.
+	Allocate one more place in new argv for potential executable from '#!'
+	parsing.
+	(tack_on_executable): New function.  Conditional on USE_MINGW_MSYS
+	(openkey): Ditto.
+	(mingw_rootify): Ditto.
+	(msys_rootify): Ditto.
+	(spawn_script): New function.
+	(pex_win32_exec_child): Save translated argv in newargv.  Pass to
+	spawn_script if spawnv* fails.
+	(main): New function.  Conditional on MAIN.  Useful for testing.
+
+2005-08-17  Mark Kettenis  <kettenis@gnu.org>
+
+	* floatformat.c (floatformat_always_valid): Change type of last
+	argument to `void *'.
+	(floatformat_i387_ext_is_valid): Likewise.
+	(floatformat_to_double): Change type of second argument to `const
+	void *'.
+	(floatformat_from_double): Change type of last argument to `void
+	*'.
+	(floatformat_is_valid): Change type of last argument to `const
+	void *'.
+	(ieee_test): Remove redundant casts.
+
+2005-08-17  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* strverscmp.c: Update FSF address.
+	* testsuite/Makefile.in: Likewise.
+	* testsuite/test-demangle.c: Likewise.
+	* testsuite/test-pexecute.c: Likewise.
+
+2005-07-23  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* getopt.c: Include ansidecl.h before system headers.
+
+2005-07-22  Ben Elliston  <bje@gnu.org>
+
+	* getopt.c: Include "ansidecl.h".
+	(_getopt_initialize): Mark argc and argv parameters as unused.
+
+2005-07-22  Ben Elliston  <bje@gnu.org>
+
+	* regex.c (regcomp): Change type of `i' from unsigned to int.
+
+2005-07-22  Ben Elliston  <bje@gnu.org>
+
+	Recover patch lost in the sourceware repository:
+	2005-07-09  Ben Elliston  <bje@au.ibm.com>
+	* memcpy.c: Remove ANSI_PROTOTYPES conditional code.
+	* memmove.c: Likewise.
+	* objalloc.c: Likewise.
+
+2005-07-22  Ben Elliston  <bje@gnu.org>
+
+	* configure.ac: Check for a getopt(3) declaration.
+	* configure, config.in: Regenerate.
+
+2005-07-15  Ben Elliston  <bje@au.ibm.com>
+
+	* regex.c (TRANSLATE): Cast rhs of ternary expression to char.
+
+2005-07-12  Ben Elliston  <bje@au.ibm.com>
+
+	* floatformat.c (floatformat_to_double): Add a comment about a
+	potential source of warnings when compiling this file.
+
+2005-07-12  Ben Elliston  <bje@au.ibm.com>
+
+	* pexecute.c (pexecute): Cast string litrals to char *.
+	* regex.c (re_comp): Cast a call to gettext() to char *.
+
+2005-07-07  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* config.table: Delete file.  Move former contents into ...
+	* configure.ac: ... here and escape any brackets for m4.
+	* Makefile.in (config.status): Remove dependency on config.table.
+	* configure: Regenerate.
+
+2005-07-07  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* config.in: Regenerate for 6/20 change.
+
+2005-07-03  Steve Ellcey  <sje@cup.hp.com>
+
+	PR other/13906
+	* md5.c (md5_process_bytes): Check alignment.
+
+2005-07-01  Ian Lance Taylor  <ian@airs.com>
+
+	PR other/22268
+	* cp-demangle.c (d_expr_primary): Don't run off the end of the
+	string while looking for the end of a literal value.
+	* testsuite/demangle-expected: Add test case.
+
+2005-06-30  Daniel Berlin  <dberlin@dberlin.org>
+
+	* hashtab.c (EMPTY_ENTRY): Moved and renamed.
+	(DELETED_ENTRY): Ditto.
+
+2005-06-20  Geoffrey Keating  <geoffk@apple.com>
+
+	* strverscmp.c: New.
+	* Makefile.in (CFILES): Add strverscmp.c.
+	(CONFIGURED_OFILES): Add strverscmp.o.
+	(strverscmp.o): New rule.
+	(stamp-functions): Add $(srcdir) to files in source directory.
+	* configure.ac (funcs): Add strverscmp.
+	(AC_CHECK_FUNCS): Add strverscmp.
+	* configure: Regenerate.
+	* functions.texi: Regenerate.
+
+2005-05-28  Eli Zaretskii  <eliz@gnu.org>
+
+	* configure.ac: Add snprintf and vsnprintf to AC_CHEK_DECLS.
+	* config.in, configure: Regenerate.
+
+2005-05-25  Richard Henderson  <rth@redhat.com>
+
+	* cp-demangle.c (d_dump): Handle DEMANGLE_COMPONENT_HIDDEN_ALIAS.
+	(d_make_comp, d_print_comp): Likewise.
+	(d_special_name): Generate one.
+	* testsuite/demangle-expected: Add a hidden alias test.
+
+2005-05-24  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* configure.ac: Check declarations for calloc(), getenv(),
+	malloc(), realloc() and sbrk().
+	* config.in: Regenerate.
+	* configure: Likewise.
+
+	* alloca.c (C_alloca): Change "new" to "new_storage".  Use XNEWVEC
+	instead of xmalloc.
+	* choose-temp.c (choose_temp_base): Use XNEWVEC instea od xmalloc.
+	* concat.c (liiberty_concat_ptr): Surround definition with an
+	extern "C" block, if __cplusplus.
+	(concat): Use XNEWVEC instead of xmalloc.
+	(reconcat): Likewise.
+	* cp-demangle.c (struct d_print_template): Rename member
+	"template" to "template_decl".  Adjust use throughout the file.
+	(d_print_resize): Properly cast return value of realloc().
+	(cplus_demangle_print): Same for malloc().
+	(d_demangle): Likewise.
+	* cp-demint.c (cplus_demangle_fill_builtin_type): Rename parameter
+	"typename" to "type_name".
+	* cplus-dem.c (grow_vect): Use XRESIZEVEC instead of xrealloc().
+	(work_stuff_copy_to_from): Use XNEWVEC insteand of xmalloc().
+	(demangle_template_value_parm): Likewise.
+	(demangle_template): Likewise.
+	(recursively_demangle): Likewise.
+	(do_hpacc_template_literal): Likewise.
+	(do_arg): Likewise.
+	(remember_type): Likewise.
+	(remember_Ktype): Likewise.
+	(register_Btype): Likewise.
+	(string_need): Use XRESIZEVEC instead of xrealloc().
+	* dyn-string.c (dyn_string_init): Use XNEWVEC.
+	(dyn_string_new): Use XNEW.
+	(dyn_string_resize): Use XRESIZEVEC.
+	* fnmatch.c (fnmatch): Rename local variable "not" to "negate".
+	* getopt.c (getenv): Declare only if !__cplusplus and !getenv.
+	Otherwise include <stdlib.h>.
+	(exchange): Cast return value of malloc().
+	* hashtab.c (htab_size): Define as both macro and non-inline
+	function.
+	(htab_elements): Likewise.
+	* getpwd.c (getpwd): Use XNEWVEC.
+	(htab_create_alloc_ex): Use C90 prototype-style.
+	* lrealpath.c (lrealpath): Appropriately cast return value of
+	malloc().
+	* make-relative-prefix.c (save_string): Likewise.
+	* make-temp-file.c (try_dir): Rename from "try".  Adjust use in
+	the file.
+	(choose_tmpdir): Use XNEWVEC.
+	* mkstemps.c (mkstemps): Rename parameter "template" to "pattern".
+	* pex-common.c (pex_init_common): Use XNEW.
+	(pex_add_remove): Use XRESIZEVEC.
+	(pex_run): Likewise.
+	(pex_get_status_and_time): Likewise.
+	* pex-djgpp.c (pex_djgpp_exec_child): Likewise.
+	* pex-msdos.c (pex_init): Use XNEW.
+	(pex_msdos_exec_child): Likewise.
+	(pex_msdos_exec_child): Use XRESIZEVEC.
+	* pex-unix.c (pex_wait): Use XNEW.
+	* pex-win32.c (fix_argv): Use XNEWVEC.
+	* pexecute.c (pwait): Likewise.
+	* setenv.c (setenv): Properly cast return value of malloc().
+	* sigsetmask.c (sigsetmask): Rename local variables "old" and
+	"new" to "old_sig" and "new_sig".
+	* sort.c (main): Use XNEWVEC.
+	* spaces.c (spaces): Cast return value of malloc().
+	* strndup.c (strndup): Likewise.
+	* ternary.c (ternary_insert): Use XNEW.
+	* xmalloc.c (malloc, realloc, calloc, sbrk): Surround declaration
+	with an extern "C" block if __cplusplus.
+	* xstrdup.c (xstrdup): Cast return value of memcpy().
+	* xstrerror.c (strerror): Enclose declaration in an extern "C"
+	block if __cplusplus.
+	* xstrndup.c (xstrndup): Use XNEW. Cast return value of memcpy().
+
+2005-05-16  Andreas Jaeger  <aj@suse.de>
+
+	* getpwd.c: Remove unneeded prototype getcwd and move getwd so
+	that it's only declared if needed.
+
+	* getopt1.c: Change order of includes so that __GNU_LIBRARY__ is
+	defined.
+
+2005-05-15  Andreas Jaeger  <aj@suse.de>
+
+	* functions.texi: Regenerated.
+
+2005-05-15  Eli Zaretskii  <eliz@gnu.org>
+
+	* pexecute.txh: Enclose multi-word data types in @deftypefn in
+	braces.  Minor wording fixes.  Use --- for em-dash.  Use
+	@enumerate in enumerated lists.
+
+	* fopen_unlocked.c: Enclose multi-word data types in @deftypefn in
+	braces.
+
+2005-05-11  Eli Zaretskii  <eliz@gnu.org>
+
+	* pex-djgpp.c: Include string.h, fcntl.h, unistd.h, and
+	sys/stat.h.
+	(pex_init): Fix last argument to pex_init_common.
+	(pex_djgpp_exec_child): Remove leading underscore from _open,
+	_dup, _dup2, _close, and _spawnv/_spawnvp.  Replace `program',
+	which is undeclared, with `executable', which was unused.  Remove
+	unused variable `e'.  Fix casting of last arg to spawnv/spawnvp.
+	(pex_djgpp_wait): Declare arguments with ATTRIBUTE_UNUSED.
+
+2005-05-11  Paul Brook  <paul@codesourcery.com>
+
+	* Makefile.in: Regenerate dependencies.
+
+2005-05-10  Nick Clifton  <nickc@redhat.com>
+
+	* Update the address and phone number of the FSF organization in
+	the GPL notices in the following files:
+	COPYING.LIB, Makefile.in, _doprnt.c, argv.c, asprintf.c,
+	choose-temp.c, clock.c, concat.c, copying-lib.texi, cp-demangle.c,
+	cp-demangle.h, cp-demint.c, cplus-dem.c, dyn-string.c, fdmatch.c,
+	fibheap.c, floatformat.c, fnmatch.c, fopen_unlocked.c,
+	gather-docs, getopt.c, getopt1.c, getruntime.c, hashtab.c, hex.c,
+	lbasename.c, lrealpath.c, maint-tool, make-relative-prefix.c,
+	make-temp-file.c, md5.c, mempcpy.c, mkstemps.c, objalloc.c,
+	obstack.c, partition.c, pex-common.c, pex-common.h, pex-djgpp.c,
+	pex-msdos.c, pex-one.c, pex-unix.c, pex-win32.c, pexecute.c,
+	physmem.c, putenv.c, regex.c, safe-ctype.c, setenv.c, snprintf.c,
+	sort.c, spaces.c, splay-tree.c, stpcpy.c, stpncpy.c, strndup.c,
+	strtod.c, ternary.c, unlink-if-ordinary.c, vasprintf.c,
+	vsnprintf.c, vsprintf.c, xexit.c, xmalloc.c, xstrndup.c
+
+2005-05-06  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* aclocal.m4 (AC_DEFINE_NOAUTOHEADER): Remove.
+	* configure.ac: Replace any AC_DEFINE_NOAUTOHEADER with AC_DEFINE.
+	* configure: Regenerate.
+
+2005-05-06  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* configure.ac: Use AC_C_BIGENDIAN instead of AC_C_BIGENDIAN_CROSS.
+	Use AC_CHECK_SIZEOF instead of AC_COMPILE_CHECK_SIZEOF.
+	* aclocal.m4: Don't include accross.m4.
+	* configure, config.in: Regenerate.
+
+2005-04-25  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* fopen_unlocked.c (unlock_std_streams): New.
+
+	* functions.texi: Regenerate.
+
+2005-04-16  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* fopen_unlocked.c (unlock_stream): New.
+	Consolidate unlocking code into a helper function.
+
+	* functions.texi: Regenerate.
+
+2005-04-13  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* asprintf.c: Include config.h.
+	* basename.c: Likewise.
+	* fdmatch.c: Likewise.
+	* hex.c: Likewise.
+	* lbasename.c: Likewise.
+	* spaces.c: Likewise.
+	* xatexit.c:Likewise.
+	* configure.ac:  Do check declarations for basename, ffs, asprintf
+	and vasprintf for real.
+	* configure: Regenerate.
+
+2005-04-13  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* argv.c (dupargv): Allocate space of argv[argc], not
+	sizeof(char *) of that amount.  Cast result to char *.
+
+2005-04-12  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* regex.c (wcs_re_match_2_internal, byte_re_match_2_internal):
+	Replace not with negate.
+
+2005-04-12  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* configure.ac: Check declarations for basename, ffs, asprintf,
+	vasprintf.
+	* configure: Regenerate.
+	* config.in: Likewise.
+
+2005-04-11  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* Makefile.in (CFILES): Add fopen_unlocked.c.
+	(REQUIRED_OFILES): Add ./fopen_unlocked.o.
+	Regenerate dependencies.
+
+	* configure.ac: Check for stdio_ext.h and __fsetlocking.
+
+	* fopen_unlocked.c: New file.
+
+	* functions.texi, configure, config.in: Regenerate.
+
+2005-04-04  Ian Lance Taylor  <ian@airs.com>
+
+	* testsuite/test-pexecute.c (TEST_PEX_RUN): Move variable
+	declaration before statement.
+
+2005-04-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* bcmp.c: Fix warnings and implement using memcmp.
+	* bcopy.c: Fix warnings.
+	* bzero.c: Fix warnings and implement using memset.
+
+	* configure.ac (ac_libiberty_warn_cflags): Add -Wwrite-strings
+	-Wstrict-prototypes.
+	* configure, config.in: Regenerate.
+
+	* bsearch.c, index.c, rindex.c, strstr.c, strtol.c, waitpid.c: Fix
+	warnings and reconcile interfaces with relevant standards.
+
+2005-04-02  Ian Lance Taylor  <ian@airs.com>
+
+	* cp-demangle.c: Update copyright.
+
+2005-03-31  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* gettimeofday.c: Add "Supplemental" to @deftypefn.
+	* functions.texi: Regenerate.
+
+2005-03-28  Ian Lance Taylor  <ian@airs.com>
+
+	* pex-common.c: New file.
+	* pex-one.c: New file.
+	* pexecute.c: New file.
+	* pex-common.h: Include <stdio.h>.
+	(struct pex_obj): Define.
+	(struct pex_funcs): Define.
+	(pex_init_common): Declare.
+	* pex-unix.c: Rewrite.
+	* pex-win32.c: Rewrite.
+	* pex-djgpp.c: Rewrite.
+	* pex-msdos.c: Rewrite.
+	* testsuite/text-pexecute.c: New file.
+	* pexecute.txh: Rewrite.
+	* configure.ac: Check for wait3 and wait4.  Set CHECK to
+	really-check rather than check-cplus-dem.
+	* functions.texi: Rebuild.
+	* Makefile.in: Rebuild dependencies.
+	(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
+	(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
+	* testsuite/Makefile.in (really-check): New target.
+	(check-pexecute, test-pexecute): New targets.
+	* configure: Rebuild.
+
+2005-03-28  Mark Kettenis  <kettenis@gnu.org>
+
+	* unlink-if-ordinary.c: Include <sys/types.h>.
+
+2005-03-27  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	Convert libiberty to use ISO C prototype style 7/n.
+	* regex.c (PARAMS): Remove definition.
+	(PREFIX): Unconditionaly define using ISO C ## operator.
+	(init_syntax_once, extract_number, extract_number_and_incr,
+	print_fastmap, print_partial_compiled_pattern,
+	print_compiled_pattern, print_double_string, printchar,
+	convert_mbs_to_wcs, re_set_syntax, regex_grow_registers,
+	regex_compile, store_op1, store_op2, insert_op1, insert_op2,
+	at_begline_loc_p, at_endline_p, group_in_compile_stack,
+	insert_space, wcs_compile_range, byte_compile_range,
+	truncate_wchar, re_compile_fastmap, re_compile_fastmap,
+	re_set_registers, re_search, re_search_2, re_search_3, re_match,
+	re_match_2, count_mbs_length, wcs_re_match_2_internal,
+	byte_re_match_2_internal, group_match_null_string_p,
+	alt_match_null_string_p, common_op_match_null_string_p,
+	bcmp_translate, re_compile_pattern, re_comp, re_exec, regcomp,
+	regexec, regerror, regfree): Use ISO C prototype style.
+	* partition.c: (elem_compare): Likewise.
+	* cp-demangle.c (print_usage): Likewise.
+
+2005-03-27  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	Convert libiberty to use ISO C prototype style 5/n.
+	* random.c (srandom, initstate, setstate, random): Use ISO C
+	prototypes.
+	* putenv.c (putenv): Likewise.
+	* physmem.c (physmem_available, physmem_total, main): Likewise.
+	* pex-win32.c (fix_argv, pexecute, pwait): Likewise.
+	* pex-unix.c (pexecute, pwait): Likewise.
+	* pex-msdos.c (pexecute, pwait): Likewise.
+	* pex-djgpp.c (pexecute, pwait): Likewise.
+	* partition.c (partition_new, partition_delete, partition_union)
+	(elem_compare, partition_print): Likewise.
+	* obstack.c (_obstack_begin, _obstack_begin_1, _obstack_newchunk,
+	_obstack_allocated_p, _obstack_free, obstack_free,
+	_obstack_memory_used, print_and_abort, obstack_next_free,
+	obstack_object_size, obstack_base): Likewise.  Remove codes
+	predicated on !defined(__STDC__).
+	* objalloc.c (objalloc_create, _objalloc_alloc, objalloc_free,
+	objalloc_free_block): Use ISO C prototypes.
+	* mkstemps.c (mkstemps): Likewise.
+	* memset.c (memset): Likewise.
+	* mempcpy.c (mempcpy): Likewise.
+	* rename.c (rename): Likewise.
+	* rindex.c (rindex): Likewise.
+	* setenv.c (setenv, unsetenv): Likewise.
+	* sigsetmask.c (sigsetmask): Likewise.
+	* snprintf.c (snprintf): Likewise.
+	* sort.c (sort_pointers, xmalloc): Likewise.
+	* spaces.c (spaces): Likewise.
+	* splay-tree.c (splay_tree_delete_helper,
+	splay_tree_splay_helper, splay_tree_splay,
+	splay_tree_foreach_helper, splay_tree_xmalloc_allocate,
+	splay_tree_new, splay_tree_xmalloc_allocate,
+	splay_tree_new_with_allocator, splay_tree_delete,
+	splay_tree_insert, splay_tree_remove, splay_tree_lookup,
+	splay_tree_max, splay_tree_min, splay_tree_predecessor,
+	splay_tree_successor, splay_tree_foreach,
+	splay_tree_compare_ints, splay_tree_compare_pointers): Likewise.
+	* stpcpy.c (stpcpy): Likewise.
+	* stpncpy.c (stpncpy): Likewise.
+	* strcasecmp.c (strcasecmp): Likewise.
+	* strchr.c (strchr): Likewise.
+	* strdup.c (strdup): Likewise.
+
+2005-03-27  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	Convert libiberty to use ISO C prototype style 6/n.
+	* strerror.c (init_error_tables, errno_max, strerror, strerrno,
+	strtoerrno, main): Use ISO C prototype style.
+	* strncasecmp.c (strncasecmp): Likewise.
+	* strncmp.c (strncmp): Likewise.
+	* strndup.c (strndup): Likewise.
+	* strrchr.c (strrchr): Likewise.
+	* strsignal.c (init_signal_tables, signo_max, strsignal,
+	strsigno, strtosigno, psignal, main): Likewise.
+	* strstr.c (strstr): Likewise.
+	* strtod.c (strtod, atof): Likewise.
+	* strtol.c (strtol): Likewise.
+	* strtoul.c (strtoul): Likewise.
+	* ternary.c (ternary_insert, ternary_cleanup, ternary_search,
+	ternary_recursivesearch): Likewise.
+	* tmpnam.c (tmpnam): Likewise.
+	* unlink-if-ordinary.c (unlink_if_ordinary): Likewise.
+	* vasprintf.c (int_vasprintf, vasprintf, checkit, main): Likewise.
+	* vfork.c (vfork): Likewise.
+	* vfprintf.c (vfprintf): Likewise.
+	* vprintf.c (vprintf): Likewise.
+	* vsnprintf.c (vsnprintf, checkit, main): Likewise.
+	* vsprintf.c (vsprintf): Likewise.
+	* waitpid.c (waitpid): Likewise.
+	* xatexit.c (xatexit, xatexit_cleanup): Likewise.
+	* xexit.c (xexit): Likewise.
+	* xmalloc.c (xmalloc_set_program_name, xmalloc_failed, xmalloc,
+	xcalloc, xrealloc): Likewise.
+	* xmemdup.c (xmemdup): Likewise.
+	* xstrdup.c (xstrdup): Likewise.
+	* xstrerror.c (xstrerror): Likewise.
+	* xstrndup.c (xstrndup): Likewise.
+
+2005-03-27  Andreas Jaeger  <aj@suse.de>
+
+	* configure.ac (ac_c_preproc_warn_flag): Remove -Wtraditional
+	flags.
+	* configure: Regenerated.
+
+2005-03-27  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* getopt1.c (getopt_long_only): Fix thinko.
+
+2005-03-27  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	Convert libiberty to use ISO C prototype style 4/n.
+	* hashtab.c (higher_prime_index, hash_pointer, eq_pointer,
+	htab_size, htab_elements, htab_mod_1, htab_mod, htab_mod_m2,
+	htab_create_alloc, htab_set_functions_ex, htab_create,
+	htab_try_create, htab_delete, htab_empty,
+	find_empty_slot_for_expand, htab_expand, htab_find_with_hash,
+	htab_find, htab_find_slot_with_hash, htab_find_slot,
+	htab_remove_elt, htab_remove_elt_with_hash, htab_clear_slot,
+	htab_traverse_noresize, htab_traverse, htab_collisions,
+	htab_hash_string, iterative_hash): Use ISO C prototype.
+	* hex.c (hex_init): Likewise.
+	* index.c (index): Likewise.
+	* insque.c (insque, remque): Likewise.
+	* lbasename.c (lbasename): Likewise.
+	* lrealpath.c (lrealpath): Likewise.
+	* make-relative-prefix.c (save_string, split_directories,
+	free_split_directories, make_relative_prefix): Likewise.
+	* make-temp-file.c (try, choose_tmpdir, make_temp_file): Likewise.
+	* md5.c (md5_init_ctx, md5_read_ctx, md5_finish_ctx, md5_stream,
+	md5_buffer, md5_process_bytes, md5_process_block): Likewise.
+	* memchr.c (memchr): Likewise.
+	* memcpy.c (memcpy): Likewise.
+	* memmove.c (memmove): Likewise.
+	* gettimeofday.c (gettimeofday): Likewise.
+	* getruntime.c (get_run_time): Likewise.
+	* getpwd.c (getpwd, getpwd): Likewise.
+	* getpagesize.c (getpagesize): Likewise.
+	* getopt1.c (getopt_long, getopt_long_only, main): Likewise.
+	* getopt.c (my_index, exchange, _getopt_initialize,
+	_getopt_internal, getopt, main): Likewise.
+	* getcwd.c (getcwd): Likewise.
+	* fnmatch.c (fnmatch): Likewise.
+	* floatformat.c (floatformat_always_valid,
+	floatformat_i387_ext_is_valid, get_field, floatformat_to_double,
+	put_field, floatformat_from_double, floatformat_is_valid,
+	ieee_test, main): Likewise.
+	* fibheap.c (fibheap_new, fibnode_new, fibheap_compare,
+	fibheap_comp_data, fibheap_insert, fibheap_min, fibheap_min_key,
+	fibheap_union, fibheap_extract_min, fibheap_replace_key_data,
+	fibheap_replace_key, fibheap_replace_data, fibheap_delete_node,
+	fibheap_delete, fibheap_empty, fibheap_extr_min_node,
+	fibheap_ins_root, fibheap_rem_root, fibheap_consolidate,
+	fibheap_link, fibheap_cut, fibheap_cascading_cut,
+	fibnode_insert_after, fibnode_remove): Likewise.
+	* ffs.c (ffs): Likewise.
+	* fdmatch.c (fdmatch): Likewise.
+	* dyn-string.c (dyn_string_init, dyn_string_new,
+	dyn_string_delete, dyn_string_release, dyn_string_resize,
+	dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
+	dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
+	dyn_string_insert_cstr, dyn_string_insert_char,
+	dyn_string_append, dyn_string_append_cstr,
+	dyn_string_append_char, dyn_string_substring, dyn_string_eq):
+	Likewise.
+
+2005-03-27  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	Convert libiberty to use ISO C prototype style 3/n.
+	* cplus-dem.c (set_cplus_marker_for_demangling, consume_count,
+	consume_count_with_underscores, code_for_qualifier,
+	qualifier_string, demangle_qualifier, cplus_demangle_opname,
+	cplus_mangle_opname, cplus_demangle_set_style,
+	cplus_demangle_name_to_style, cplus_demangle, grow_vect,
+	ada_demangle, internal_cplus_demangle, squangle_mop_up,
+	work_stuff_copy_to_from, delete_non_B_K_work_stuff,
+	delete_work_stuff, mop_up, demangle_signature,
+	demangle_method_args, demangle_template_template_parm,
+	demangle_expression, demangle_integral_value,
+	demangle_real_value, demangle_template_value_parm,
+	demangle_template, arm_pt, demangle_arm_hp_template,
+	demangle_class_name, demangle_class, iterate_demangle_function,
+	demangle_prefix, gnu_special, recursively_demangle, arm_special,
+	demangle_qualified, get_count, do_type, demangle_fund_type,
+	do_hpacc_template_const_value, do_hpacc_template_literal,
+	snarf_numeric_literal, do_arg, remember_type, remember_Ktype,
+	register_Btype, remember_Btype, forget_B_and_K_types,
+	forget_types, demangle_args, demangle_nested_args,
+	demangle_function_name, string_need, string_delete, string_init,
+	string_clear, string_empty, string_append, string_appends,
+	string_appendn, string_prepend, string_prepends, string_prependn,
+	string_append_template_idx): Use ISO C prootype style.
+	* cp-demint.c (cplus_demangle_fill_component,
+	cplus_demangle_fill_builtin_type, cplus_demangle_fill_operator,
+	cplus_demangle_v3_components): Likewise.
+
+2005-03-26  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	Convert libiberty to use ISO C prototype style 2/n.
+	* cp-demangle.h: Remove uses of PARAMS.
+	* cp-demangle.c: Likewise.
+	(d_dump, cplus_demangle_fill_name,
+	cplus_demangle_fill_extended_operator, cplus_demangle_fill_ctor,
+	cplus_demangle_fill_dtor, d_make_empty, d_make_comp, d_make_name,
+	d_make_builtin_type, d_make_operator, d_make_extended_operator,
+	d_make_ctor, d_make_dtor, d_make_template_param, d_make_sub,
+	cplus_demangle_mangled_name, has_return_type,
+	is_ctor_dtor_or_conversion, d_encoding, d_name, d_nested_name,
+	d_prefix, d_unqualified_name, d_source_name, d_number,
+	d_identifier, d_operator_name, d_special_name, d_call_offset,
+	d_ctor_dtor_name, cplus_demangle_type, d_cv_qualifiers,
+	d_function_type, d_bare_function_type, d_class_enum_type,
+	d_array_type, d_pointer_to_member_type, d_template_param,
+	d_template_args, d_template_arg, d_expression, d_expr_primary,
+	d_local_name, d_discriminator, d_add_substitution,
+	d_substitution, d_print_resize, d_print_append_char,
+	d_print_append_buffer, d_print_error, cplus_demangle_print,
+	d_print_comp, d_print_java_identifier, d_print_mod_list,
+	d_print_mod, d_print_function_type, d_print_array_type,
+	d_print_expr_op, d_print_cast, cplus_demangle_init_info,
+	d_demangle, __cxa_demangle, cplus_demangle_v3, java_demangle_v3,
+	is_ctor_or_dtor, is_gnu_v3_mangled_ctor, is_gnu_v3_mangled_dtor,
+	print_usage, main):
+
+2005-03-26  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	Convert libiberty to ISO C prototype style 1/n.
+	* _doprnt.c: Remove conditional #include <varargs.h> on
+	ANSI_PROTOTYPES as the latter is always assumed.
+	(_doprnt, checkit, main): Use ISO C prototype.
+	* alloca.c (find_stack_direction, C_alloca): Use ISO C prototype.
+	* argv.c: Remove conditional #includes on ANSI_PROTOTYPES.
+	(dupargv, freeargv, buildargv, main): Use ISO C prototype.
+	* atexit.c (atexit): Likewise
+	* asprintf.c: Remove conditional include on ANSI_PROTOTYPES.
+	(asprintf): Use ISO C prototype.
+	* basename.c (basename): Likewise
+	* bcmp.c (bcmp): Likewise.
+	* bcopy.c (bcopy): Likewise.
+	* bzero.c (bzero): Likewise.
+	* bsearch.c (bsearch): Likewise.  Improve const-correctness.
+	* choose-temp.c (choose_temp_base): Likewise.
+	* calloc.c: Remove conditional #include on ANSI_PROTOTYPES.
+	(calloc): Use ISO C prototype.
+	* clock.c (clock): Likewise.
+	* concat.c: Remove conditional #include on ANSI_PROTOTYPES.
+	(vconcat_length, vconcat_copy, concat_length, concat_copy,
+	concat_copy2, concat, reconcat, main): Use ISO C prototype.
+	* copysign.c (copysign): Likewise.
+
+2005-03-24  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* Makefile.in (CFILES): Add strndup.c and xstrndup.c.
+	(REQUIRED_OFILES): Add xstrndup.o.
+	(CONFIGURED_OFILES): Add strndup.o.
+	Regenerate dependencies.
+
+	* configure.ac (funcs, AC_CHECK_FUNCS): Add strndup.
+
+	* strndup.c, xstrndup.c: New.
+
+	* config.in, configure, functions.texi: Regenerate.
+
+2005-03-24  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* xmemdup.c, xstrdup.c: Expose the tail call.
+
+2005-03-09  Mark Mitchell  <mark@codesourcery.com>
+
+	* configure.ac (funcs): Add gettimeofday.
+	* configure: Regenerated.
+	* gettimeofday.c: New file.
+	* Makefile.in (CFILES): Add gettimeofday.
+	(CONFIGURED_OFILES): Add gettimeofday.o.
+	(./gettimeofday.o): New rule.
+
+2005-03-09  Ian Lance Taylor  <ian@airs.com>
+
+	* pex-os2.c: Remove.
+	* configure.ac: Remove *-*-os2-emx* case when setting pexecute.
+	* Makefile.in (CFILES): Remove pex-os2.c.
+	(CONFIGURED_OFILES): Remove pex-os2.o.
+	(pex-os2.o): Remove target.
+	* configure: Rebuild.
+
+2005-03-07  Ian Lance Taylor  <ian@airs.com>
+
+	* mpw-config.in: Remove.
+	* mpw-make.sed: Remove.
+	* mpw.c: Remove.
+	* Makefile.in (CFILES): Remove pex-mpw.c.
+	(CONFIGURED_OFILES): Remove pex-mpw.o.
+	(mpw.o, pex-mpw.o): Remove targets.
+	* maint-tool (undoc): Remove reference to mpw.c.
+
+2005-03-06  DJ Delorie  <dj@redhat.com>
+
+	* configure.ac (target_header_dir): vfork is a stub under djgpp.
+	* configure: Regenerated.
+
+2005-03-01  Jan Beulich  <jbeulich@novell.com>
+
+	* Makefile.in (CFILES): Add unlink-if-ordinary.c
+	(REQUIRED_OFILES): Add unlink-if-ordinary.o.
+	Add dependencies and rule for unlink-if-ordinary.o.
+	* unlink-if-ordinary.c: New.
+
+2005-03-01  Ben Elliston  <bje@au.ibm.com>
+
+	* hashtab.c (htab_find_slot_with_hash): Make function
+	documentation clearer.
+
+2005-02-13  Jason Merrill  <jason@redhat.com>
+
+	* cp-demangle.c (__cxa_demangle): Change resolution of ambiguous
+	arguments.
+
+2005-01-11  Tobias Schl"uter  <tobias.schlueter@physik.uni-muenchen.de>
+
+	* hex.c (hex_value): Group 'unsigned int' together to get correct
+	markup.
+	* functions.texi: Regenerated.
+
+2004-12-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.in: Undo to 2004-12-17.
+	* aclocal.m4: Likewise.
+	* config.table: Likewise.
+	* configure.ac: Likewise.
+	* maint-tool: Likewise.
+	* configure: Likewise.
+
+2004-12-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR bootstrap/19072
+	* Makefile.in (enable_shared): New substitute.
+	(LTTARGETLIB): New.
+	(PREFIXTARGETLIB): New.
+	(LTTESTLIB): New.
+	(PREFIXTESTLIB): New.
+	(CCLD): New.
+	(LINK): New.
+	($(TARGETLIB)): Use $(LINK) to create libraries and create
+	targets by hand.
+	($(TESTLIB)): Likewise.
+	(mostlyclean): Don't remove .libs. Remove the libtool object
+	directory.
+
+	* config.table (enable_shared): Removed.
+
+	* configure.ac (enable_static): Set to yes.
+	(AC_PROG_LIBTOOL): Removed.
+	(AM_DISABLE_SHARED): Uncommented.
+	(AM_PROG_LIBTOOL): Likewise.
+	(LIBOBJS): Add `./' to avoid VPATH.
+	(LTLIBOBJS): Likewise.
+	(enable_shared): Substitute.
+	* configure: Regenerated.
+
+2004-12-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.in (top_builddir): Set to `.'.
+	(OUTPUT_OPTION): Removed.
+	(LIBTOOL): New.
+	(LTLIBOBJS): New.
+	(EXTRA_LTOFILES): New.
+	(FLAGS_TO_PASS): Add EXTRA_LTOFILES.
+	(all): Remove stamp-picdir.
+	(LTCOMPILE): New.
+	(.c.lo): New rule.
+	(REQUIRED_LTOFILES): New.
+	(CONFIGURED_LTOFILES): New.
+	($(TARGETLIB)): Check .libs for PIC object files. Depend on
+	$(REQUIRED_LTOFILES) $(EXTRA_LTOFILES) $(LTLIBOBJS).
+	(stamp-picdir): Completely removed.
+	(maint-missing): Pass $(REQUIRED_LTOFILES)
+	$(CONFIGURED_LTOFILES) instead of (REQUIRED_OFILES)
+	$(CONFIGURED_OFILES)
+	(maint-buildall): Depend on $(REQUIRED_LTOFILES)
+	$(CONFIGURED_LTOFILES).
+	(mostlyclean): Also remove *.lo .libs.
+	Run "make maint-deps".
+
+	* aclocal.m4: Include ../libtool.m4.
+
+	* config.table: Don't check --enable-shared.
+
+	* configure.ac (AC_PROG_LIBTOOL): Add.
+	(AC_PROG_CC_C_O): Removed.
+	(OUTPUT_OPTION): Removed.
+	(NO_MINUS_C_MINUS_O): Removed.
+	(ltpexecute): New substitute.
+	(LIBOBJS): Cleanup.
+	* configure: Regenerated.
+
+	* maint-tool: Updated for .lo/libtool.
+
+2004-12-11  Ben Elliston  <bje@au.ibm.com>
+
+	* configure.ac: Invoke AC_CHECK_SIZEOF for sizeof (int).
+	* configure: Regenerate.
+	* config.in: Likewise.
+
+2004-12-07  DJ Delorie  <dj@redhat.com>
+
+	* splay-tree.c (splay_tree_delete_helper): Redesign the logic so
+	that recursion (and thus large stack space) is not needed.
+
+2004-11-29  Matt Kraai  <kraai@alumni.cmu.edu>
+
+	* pex-unix.c: Fix the spelling of longjmp.
+
+2004-11-23  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	PR other/18623
+	* cp-demangle.c (d_call_offset): Remove useless local variables
+	offset and virtual_offset.
+	* cplus-dem.c (ada_demangle): Remove useless local variable
+	at_start_name.
+	(demangle_template): Remove useless local variable start.
+
+2004-11-19  Roger Sayle  <roger@eyesopen.com>
+
+	* objalloc.c, strsignal.c, xstrerror.c: Include "config.h" before
+	"ansidecl.h" to avoid redeclaration errors with native compilers.
+	* regex.c: Protect config.h from multiple inclusion.
+
+2004-11-12  Mike Stump  <mrs@apple.com>
+
+	* Makefile.in (libiberty.html): Fix html generation.
+
+2004-09-08  Adam Nemet  <anemet@lnxw.com>
+
+	* vasprintf.c: Accept __va_copy in addition to va_copy.
+
+2004-09-03  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure: Regenerate.
+
+2004-09-02  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.ac: Do not enable multilibs for build-side libiberty.
+
+2004-06-29  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* lrealpath.c (lrealpath): Add _WIN32 support.
+
+2004-06-28  Zack Weinberg  <zack@codesourcery.com>
+
+	* cp-demangle.h: Declare cplus_demangle_operators,
+	cplus_demangle_builtin_types, cplus_demangle_mangled_name, and
+	cplus_demangle_type as static if IN_GLIBCPP_V3.
+
+2004-06-28  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	PR other/16240
+	* cp-demangle.c (d_expr_primary): Check for a failure return from
+	cplus_demangle_type.
+	* testsuite/demangle-expected: Add test case.
+
+2004-05-31  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* pex-win32.c (fix_argv): Expand comment.
+
+2004-05-25  Daniel Jacobowitz  <drow@false.org>
+
+	* Makefile.in: Add .NOEXPORT.
+
+2004-04-29  Douglas B Rupp  <rupp@gnat.com>
+
+	* mkstemps.c (mkstemps) [VMS]: Remove special open option. Update
+	copyright.
+
+2004-04-26  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+	* configure.ac (UNSIGNED_64BIT_TYPE): Unquote the definition.
+	* configure: Regenerate.
+
+2004-04-22  Richard Henderson  <rth@redhat.com>
+
+	* hashtab.c: Include limits.h, stdint.h, ansidecl.h.
+	(CHAR_BIT): Provide default.
+	(struct prime_ent, prime_tab): New.
+	(higher_prime_index): Rename from higher_prime_number, return index.
+	(htab_mod_1): New.
+	(htab_mod, htab_mod_m2): Use it.
+	(htab_create_alloc, htab_create_alloc_ex): Store prime index.
+	(htab_expand): Likewise.
+	* configure.ac: Check for stdint.h.
+	(UNSIGNED_64BIT_TYPE): New define and checks to fill it in.
+	* config.in, configure: Rebuild.
+
+2004-04-13  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* strerror.c: Include config.h, and redefine sys_nerr and
+	sys_errlist, before including ansidecl.h and libiberty.h.
+
+2004-04-13  Jeff Law  <law@redhat.com>
+
+	* hashtab.c (htab_remove_elt_with_hash): New function.
+	(htab_remove_elt): Implement in terms of htab_remove_elt_with_hash.
+
+2004-03-31  Richard Henderson  <rth@redhat.com>
+
+	* hashtab.c (htab_size): Move to top of file; mark inline.
+	(htab_elements): Likewise.
+	(htab_mod, htab_mod_m2): New.
+	(htab_delete): Refactor htab->size and htab->entries.
+	(htab_empty): Likewise.
+	(find_empty_slot_for_expand): Use htab_size, htab_mod, htab_mod_m2.
+	(htab_find_with_hash, htab_find_slot_with_hash): Likewise.
+	(htab_clear_slot): Use htab_size, htab_elements.
+	(htab_traverse_noresize, htab_traverse): Likewise.
+
+2004-03-17  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* pex-unix.c (pexecute): Use vfork instead of fork, with
+	appropriate changes to make this safe.
+	* pex-common.h (STDERR_FILE_NO): Define.
+
+	* Makefile.in: Clean up REQUIRED_OFILES and CONFIGURED_OFILES for
+	an 80 column screen.  Run maint-deps.
+
+2004-03-09  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* configure.ac: Bump version to 2.59.  Apply suggested autoupdates.
+	* acconfig.h: Delete redundant file.
+	* config.in: Regenerate.
+	* configure: Regenerate.
+
+2004-03-09  Hans-Peter Nilsson  <hp@axis.com>
+
+	* configure: Regenerate for config/accross.m4 correction.
+
+2004-03-07  Andreas Jaeger  <aj@suse.de>
+
+	* testsuite/test-demangle.c: Include <string.h> and <stdlib.h> for
+	prototypes.
+	(main): Initialize style.
+
+2004-02-24  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* cp-demangle.h (enum d_builtin_type_print): Add D_PRINT_UNSIGNED,
+	D_PRINT_UNSIGNED_LONG, D_PRINT_LONG_LONG,
+	D_PRINT_UNSIGNED_LONG_LONG, D_PRINT_FLOAT.
+	* cp-demangle.c (cplus_demangle_builtin_types): Change char and
+	short types to D_PRINT_DEFAULT.  Change other integer types to use
+	new D_PRINT_* values where appropriate.  Change float types to
+	D_PRINT_FLOAT.
+	(d_print_comp) [LITERAL, LITERAL_NEG]: Handle new D_PRINT_*
+	values.
+	* testsuite/demangle-expected: Adjust two test cases.
+
+	* cp-demangle.c (d_print_function_type): Print a space before the
+	parenthesis around the function type in more cases.
+	* testsuite/demangle-expected: Adjust one test case.
+
+	* cp-demangle.c (d_print_comp) [UNARY]: Don't emit extra
+	parentheses around a cast.
+	* testsuite/demangle-expected: Adjust two test cases to match new
+	output.
+
+	* cp-demangle.c (__cxa_demangle): Pass DMGL_PARAMS to d_demangle.
+
+	* cp-demangle.c (d_print_comp) [RESTRICT, VOLATILE, CONST]: Don't
+	push more than one of the same CV-qualifier on the top of the
+	stack.
+	(d_print_comp) [ARRAY_TYPE]: If the array itself is CV-qualified,
+	move the CV-qualifiers to apply to the element type instead.
+	(d_print_array_type): When checking the modifiers, keep looking
+	past ones which have been printed already.
+	* testsuite/demangle-expected: Add three test cases.
+
+2004-02-23  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* cp-demangle.c (__cxa_demangle): Adjust last patch to handle
+	empty string correctly.
+
+	* cp-demangle.c (__cxa_demangle): It is not an error if status is
+	not NULL.  It is an error if the mangled name is the same as a
+	built-in type name.
+	(main): If IN_GLIBCPP_V3 is defined, test __cxa_demangle rather
+	than cplus_demangle_v3.
+
+	* dyn-string.c: Remove test of IN_LIBGCC2 and IN_GLIBCPP_V3 and
+	the associated #define of RETURN_ON_ALLOCATION_FAILURE.
+
+2004-02-16  Matt Kraai  <kraai@alumni.cmu.edu>
+
+	* regex.c: Include <ansidecl.h>.
+	(regcomp): Cast i to int.
+	(regerror): Add ATTRIBUTE_UNUSED to parameter preg.
+
+2004-01-25  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* configure.ac: Add m4_pattern_allow(LIBOBJS).
+	* configure: Regenerate.
+
+2004-01-22  DJ Delorie  <dj@redhat.com>
+
+	* Makefile.in: Convert to ./ throughout.  Rebuild dependencies
+	with explicit build rules.
+	(VPATH): Remove.
+	(.c.o): Poison.
+	* configure.ac (pexecute, LIBOBJS): Add ./ .
+	* maint-tool: Build dependencies with explicit rules.
+
+2004-01-15  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* strdup.c (strdup): Constify the argument.
+
+2004-01-14  Loren J. Rittle  <ljrittle@acm.org>
+
+	* Makefile.in (distclean): Remove config.cache.
+
+2004-01-13  Daniel Jacobowitz  <drow@mvista.com>
+
+	* cp-demangle.c (d_make_comp): DEMANGLE_COMPONENT_CONSTRUCTION_VTABLE
+	takes two parameters.
+	* cp-demint.c (cplus_demangle_fill_component): Likewise.
+
+2004-01-12  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* cp-demangle.c: Include "cp-demangle.h".  If IN_GLIBCPP_V3 is
+	defined, rename some functions which are to become static via
+	#define.
+	(CP_STATIC_IF_GLIBCPP_V3): Define.
+	(struct d_operator_info): Move definition to cp-demangle.h, and
+	rename to demangle_operator_info.  Change all uses.
+	(enum d_builtin_type_print): Move definition to cp-demangle.h.
+	(struct d_builtin_type_info): Move definition to cp-demangle.h,
+	and rename to demangle_builtin_type_info.  Change all uses.
+	(enum d_comp_type): Move definition to include/demangle.h, and
+	rename to demangle_component_type, and change all enums to start
+	with DEMANGLE_COMPONENT_ instead of D_.  Change all uses.
+	(struct d_comp): Move definition to include/demangle.h, and rename
+	to demangle_component.  Change all uses.
+	(struct d_info): Move definition to cp-demangle.h.
+	(cplus_demangle_fill_name): New function.
+	(cplus_demangle_fill_extended_operator): New function.
+	(cplus_demangle_fill_ctor): New function.
+	(cplus_demangle_fill_dtor): New function.
+	(d_make_empty): Remove type parameter.  Change all callers.
+	(d_make_name): Use cplus_demangle_fill_name.
+	(d_make_extended_operator): Use
+	cplus_demangle_fill_extended_operator.
+	(d_make_ctor): Use cplus_demangle_fill_ctor.
+	(d_make_dtor): Use cplus_demangle_fill_dtor.
+	(cplus_demangle_mangled_name): Rename from d_mangled_name.  Make
+	non-static by default.  Change all callers.
+	(cplus_demangle_operators): Rename from d_operators.  Change all
+	uses.  Make non-static by default.  Add sentinel at end of array.
+	(d_operator_name): Adjust initialization of high for new sentinel
+	in cplus_demangle_operators.
+	(cplus_demangle_builtin_types): Rename from d_builtin_types.
+	Change all uses.  Make non-static by default.  Change initializer
+	to use D_BUILTIN_TYPE_COUNT instead of magic number 26.
+	(cplus_demangle_type): Rename from d_type.  Make non-static by
+	default.  Change all callers.
+	(cplus_demangle_init_info): Rename from d_init_info.  Make
+	non-static by default.  Change all callers.
+	* cp-demangle.h: New file.
+	* cp-demint.c: New file.
+	* Makefile.in: Rebuild dependencies.
+	(CFILES): Add cp-demint.c.
+	(REQUIRED_OFILES): Add cp-demint.o.
+
+2004-01-09  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* configure.in:  Rename file to ...
+	* configure.ac:  ... this.
+	* Makefile.in: Update a comment for above change.
+	* README: Likewise.
+	* config.in: Regenerate.
+
+2004-01-02  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* cp-demangle.c (d_encoding): When DMGL_PARAMS is not set, strip
+	CV-qualifiers from D_COMP_LOCAL_NAME right subtree.
+	* cplus-dem.c (demangle_arm_hp_template): Set DMGL_PARAMS when
+	demangling template parameters.
+	* testsuite/test-demangle.c (fail): New static function.
+	(main): Support new options in input file: --no-params,
+	--is-v3-ctor, and --is-v3-dtor.
+	* testsuite/demangle-expected: Add --no-params to most tests, and
+	add the correct result when parameters are not demangled.  Add
+	some simple tests for V3 constructor/destructor recognition.
+
+2003-12-25  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* cp-demangle.c (is_ctor_or_dtor): Fix error in last change.
+
+2003-12-22  Daniel Jacobowitz  <drow@mvista.com>
+
+	PR debug/13272
+	* Makefile.in (lbasename.o): Depend on filenames.h.
+	* lbasename.c: Include "filenames.h" instead of defining
+	its macros locally.
+
+2003-12-22  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* cp-demangle.c (CP_DYNAMIC_ARRAYS): Define if compiler supports
+	dynamic arrays.
+	(struct d_operator_info): Add len field.
+	(struct d_builtin_type_info): Add len and java_len fields.
+	(struct d_standard_sub_info): Add simple_len, full_len, and
+	set_last_name_len fields.
+	(struct d_comp): Add len field to s_string.
+	(struct d_info): Add send, did_subs, and expansion fields.
+	(d_append_string_constant): Define.
+	(d_append_string): Remove.  Change all users to use
+	d_append_string_constant or d_append_buffer instead.
+	(d_make_sub): Add len parameter.  Change all callers.
+	(d_name): Increase expansion when substituting std::.
+	(d_unqualified_name): Increase expansion for an operator.
+	(d_number): Don't use multiplication for negative numbers.
+	(d_identifier): Make sure there are enough characters in the
+	string for the specified length.  Adjust expansion for an
+	anonymous namespace.
+	(d_operators): Initialize len field.
+	(d_special_name, d_ctor_dtor_name): Increase expansion.
+	(d_builtin_types): Initialize len and java_len fields.
+	(d_type): Increase expansion for a builtin type.
+	(d_cv_qualifiers): Increase expansion for each qualifier.
+	(d_bare_function_type): Decrease expansion when removing single
+	void parameter.
+	(d_template_param): Increment did_subs.
+	(d_expression): Increase expansion for an operator.
+	(d_expr_primary): Decrease expansion for a type we will print
+	specially.
+	(standard_subs): Initialize new fields.
+	(d_substitution): Increment did_subs when doing a normal
+	substitution.  Increase expansion for a special substitution.
+	(d_print): Add estimate parameter.  Change all callers.
+	(d_print_comp) [D_COMP_NAME]: Handle C++ case inline.
+	(d_print_comp) [D_COMP_BINARY]: Use length to avoid strcmp call.
+	(d_print_java_identifier): Rename from d_print_identifier.  Handle
+	only Java case.  Change caller.
+	(d_init_info): Change return type to void.  Change all callers.
+	Initialize send, did_subs, and expansion fields.  Do not
+	initialize comps and subs fields.
+	(d_demangle): Ifdef CP_DYNAMIC_ARRAYS, allocate comps and subs
+	arrays on stack.  Make an estimate of the length of the demangled
+	name.  Ifdef CP_DEMANGLE_DEBUG, print estimation failures.
+	(is_ctor_or_dtor): Ifdef CP_DYNAMIC_ARRAYS, allocate comps and
+	subs arrays on stack.
+
+2003-12-20  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* cp-demangle.c (d_identifier): In Java mode, skip an optional '$'
+	after the identifier.
+	* testsuite/demangle-expected: Add test case.
+
+2003-12-19  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	Fix for PR c++/13447:
+	* cp-demangle.c (enum d_comp_type): Add D_COMP_LOCAL_NAME.
+	(d_dump, d_make_comp): Handle D_COMP_LOCAL_NAME.
+	(is_ctor_dtor_or_conversion): Handle D_COMP_LOCAL_NAME like
+	D_COMP_QUAL_NAME.
+	(is_ctor_or_dtor): Likewise.
+	(d_local_name): Use D_COMP_LOCAL_NAME rather than
+	D_COMP_QUAL_NAME.
+	(d_print_comp) [D_COMP_LOCAL_NAME]: New.
+	(d_prinT_comp) [D_COMP_TYPED_NAME]: If the left tree is
+	D_COMP_LOCAL_NAME, pull any qualifiers off its right subtree.
+	(d_print_mod_list): Handle D_COMP_LOCAL_NAME.
+	* testsuite/demangle-expected: Add two test cases.
+
+	* cp-demangle.c (d_print_function_type): Clear the global modifier
+	list when printing the modifiers, not just when printing the
+	function parameters.
+	* testsuite/demangle-expected: Add two test cases.
+
+2003-12-15  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* cp-demangle.c (d_print_function_type): Print the function
+	parameters with no modifiers.
+	* testsuite/demangle-expected: Add test case.
+
+	* cp-demangle.c (d_demangle): If DMGL_PARAMS is not set, don't
+	expect that we've read the entire string.
+	(is_ctor_or_dtor): Don't expect that we've read the entire
+	string--reverse patch of 2003-11-29.
+
+2003-12-15  Brendan Kehoe  <brendan@zen.org>
+
+	* libiberty/Makefile.in (floatformat.o): Add dependency on
+	config.h to accompany change of 2003-12-03.
+
+2003-12-15  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	Fix handling of constructor/destructor of standard substitution:
+	* cp-demangle.c (struct d_standard_sub_info): Define.
+	(d_substitution): Add prefix argument.  Change all callers.
+	Rework handling of standard substitutions to print full name when
+	qualifying a constructor/destructor, or when DMGL_VERBOSE is set.
+	* testsuite/demangle-expected: Add test case.
+
+	Fix handling of negative literal constants:
+	* cp-demangle.c (enum d_comp_type): Add D_COMP_LITERAL_NEG.
+	(d_dump, d_make_comp): Handle D_COMP_LITERAL_NEG.
+	(d_expr_primary): Use D_COMP_LITERAL_NEG for a negative number.
+	(d_print_comp): Handle D_COMP_LITERAL_NEG.
+	* testsuite/demangle-expected: Add test case.
+
+2003-12-04  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* cp-demangle.c (IS_UPPER, IS_LOWER): Define.
+	(d_last_char): Define new macro.
+	(d_make_name): Reject an empty name.
+	(d_prefix, d_unqualified_name, d_type): Use new IS_* macros.
+	(d_substitution, d_print_identifier): Likewise.
+	(d_print_comp) [D_COMP_OPERATOR]: Likewise.
+	(d_print_comp) [D_COMP_TEMPLATE]: Use new d_last_char macro.
+	(d_print_mod) Use new d_last_char macro.
+	(d_print_cast): Use new d_last_char macro.
+	(is_ctor_or_dtor): Don't leak memory.
+
+	Fix handling of member function modifiers:
+	* cp-demangle.c (enum d_comp_type): Add D_COMP_RESTRICT_THIS,
+	D_COMP_VOLATILE_THIS, and D_COMP_CONST_THIS.
+	(d_dump): Dump new d_comp_type values.
+	(d_make_comp): Accept new d_comp_type values.
+	(has_return_type): Only accept _THIS variants of qualifiers.
+	(d_encoding): Without DMGL_PARAMS, only remove _THIS variants of
+	qualifiers.
+	(d_cv_qualifiers): Add member_fn parameter.  Change all callers.
+	(d_print_comp) [D_COMP_TYPED_NAME]: Rather than removing
+	qualifiers and printing them at the end, add _THIS qualifiers to
+	the modifier list.
+	(d_print_comp) [D_COMP_*_THIS]: New cases.
+	(d_print_comp) [D_COMP_PTRMEM_TYPE]: Remove special handling of
+	qualifiers.
+	(d_print_mod_list): Add suffix parameter.  Change all callers.
+	Keep walking the list even if the current modifier has been
+	printed.
+	(d_print_mod): Handle new _THIS qualifiers.
+	(d_print_function_type): Handle new _THIS qualifiers when deciding
+	whether to print a parenthesis.  Put a space before the
+	parenthesis in some cases.  Call d_print_mod_list again at the
+	end, passing suffix as 1.
+	(is_ctor_or_dtor): Look for new _THIS qualifiers.
+	* testsuite/demangle-expected: Add test case.
+
+	Fix for PR gcc/13304:
+	* cp-demangle.c (d_print_comp) [D_COMP_TEMPLATE]: If the character
+	before the '<' is itself a '<', insert a space.
+	(d_print_cast): Likewise.
+	* testsuite/demangle-expected: Add test case.
+
+	Fix for PR gcc/13244:
+	* cp-demangle.c (d_print_comp) [D_COMP_BINARY]: Wrap an expression
+	which uses the '>' operator in an extra layer of parens.
+	* testsuite/demangle-expected: Add test case.
+
+2003-12-03  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* floatformat.c: Include "config.h" and <string.h> if available.
+	(INFINITY, NAN): Define if not defined by <math.h>.
+	(floatformat_to_double): Handle NaN, infinity, and denormalized
+	numbers.
+	(floatformat_from_double): Likewise.
+	(ieee_test): In debugging code, use little endian rather than big
+	endian.  Correct tests to handle NaN and to check correct sign of
+	zero.  Omit m68k extended test.
+	(main): Add more debugging cases.
+
+2003-11-29  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* cp-demangle.c (d_demangle): Only return success if we consumed
+	the entire demangled string.
+	(is_ctor_or_dtor): Likewise.
+
+	* testsuite/demangle-expected: Revert one part of 2003-06-26 patch
+	to restore expected result of EDG test case to original expected
+	result.
+
+2003-11-26  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* cp-demangle.c (struct d_print_mod): Add templates field.
+	(d_make_builtin_type): Check for NULL type.
+	(d_make_extended_operator): Check for NULL name.
+	(d_make_ctor, d_make_dtor): Likewise.
+	(d_mangled_name): Add top_level parameter.  Change all callers.
+	(d_encoding): If DMGL_PARAMS is not set, strip off initial
+	CV-qualifiers.
+	(d_type): Check some return values we rely on.
+	(d_bare_function_type, d_array_type): Likewise.
+	(d_pointer_to_member_type, d_template_args): Likewise.
+	(d_add_substitution): Fail if argument is NULL.
+	(d_print_resize): Check whether buf is NULL.
+	(d_print_comp): Save current templates list with each modifier.
+	Don't pass the modifier list down when printing a template.
+	(d_print_cast): Don't pass the modifier list down when printing a
+	template.
+	(d_print_mod_list): Temporarily set templates list while printing
+	a modifier.
+	(d_print_mod): Check that buf is not NULL before using it.
+	(d_print_function_type): Print parens if there is no modifier.
+	(d_init_info): Permit as many substitutions as there are
+	characters in the mangled name.
+	* testsuite/demangle-expected: Add two new test cases.
+
+2003-11-25  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* cp-demangle.c (java_demangle_v3): Pass DMGL_PARAMS to
+	d_demangle.
+
+2003-11-22  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* cp-demangle.c (d_encoding): Add top_level parameter.  Change all
+	callers.
+	(print_usage): Display new -p option.
+	(long_options): Add --no-params.
+	(main): Accept and handle -p.
+
+2003-11-21  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* cp-demangle.c (has_return_type): Skip qualifiers when checking
+	whether we have a template.
+	* testsuite/demangle-expected: Add four new tests.
+
+2003-11-20  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* testsuite/demangle-expected: Minor changes to match output of
+	new demangler: adjust whitespace in four tests, and change order
+	of qualifiers in one test.
+
+	* cp-demangle.c: Complete rewrite.
+
+2003-11-19  Mark Mitchell  <mark@codesourcery.com>
+
+	* cp-demangle.c (demangle_type): Correct thinko in substitution
+	processing.
+
+2003-11-18  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* cp-demangle.c (demangle_operator_name): Remove space before
+	"sizeof".
+	(demangle_type_ptr): Put qualifiers in the right place.  Handle
+	qualifiers in pointer to member specially.
+	(demangle_type): Handle qualifiers for pointer or reference
+	specially.  Handle function type.
+	(demangle_local_name): Save and restore caret around demangling of
+	initial encoding.
+
+	* testsuite/test-demangle.c (main): Don't pass DMGL_VERBOSE to
+	cplus_demangle.
+
+	* testsuite/Makefile.in (test-demangle): Depend upon libiberty.a.
+
+2003-10-31  Andreas Jaeger  <aj@suse.de>
+
+	* floatformat.c (floatformat_always_valid): Add unused attribute.
+
+2003-10-30  Josef Zlomek  <zlomekj@suse.cz>
+
+	Jan Hubicka <jh@suse.cz>
+	* vasprintf.c (int_vasprintf): Pass va_list by value.
+	Use va_copy for copying va_list.
+	(vasprintf): Pass va_list by value.
+
+2003-10-30  Josef Zlomek  <zlomekj@suse.cz>
+
+	* hashtab.c (htab_find_slot_with_hash): Decrease n_deleted
+	instead of increasing n_elements when inserting to deleted slot.
+
+2003-10-20  J. Brobecker  <brobecker@gnat.com>
+
+	* cplus-dem.c (demangle_template): Register a new Btype only
+	when needed.
+	* testsuite/demangle-expected: Add a new test.
+
+2003-10-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* testsuite/demangle-expected: Update the expected output of
+	_GLOBAL__I__Z2fnv.
+
+2003-10-02  Daniel Jacobowitz  <drow@mvista.com>
+
+	* strerror.c: Revert last change.  Declare static sys_nerr
+	and sys_errlist using different names.
+
+2003-10-01  Daniel Jacobowitz  <drow@mvista.com>
+
+	* strerror.c: Don't provide or reference sys_errlist if
+	strerror is available.
+
+2003-10-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.in: Check if $MAKEINFO is missing.
+	* configure: Regenerated.
+
+2003-09-24  Daniel Jacobowitz  <drow@mvista.com>
+
+	* configure.in: Use AC_PROG_CPP_WERROR.
+	* configure: Regenerated.
+
+2003-09-22  Andrew Cagney  <cagney@redhat.com>
+
+	* floatformat.c (floatformat_i387_ext_is_valid): New function.
+	(floatformat_always_valid): New function.
+	(floatformat_i387_ext): Initialize new "is_valid" field to
+	"floatformat_i387_ext_is_valid".
+	(floatformat_ieee_single_little): Initialize "is_valid" field to
+	floatformat_always_valid.
+	(floatformat_ieee_double_big): Ditto.
+	(floatformat_ieee_double_little): Ditto.
+	(floatformat_ieee_double_little): Ditto.
+	(floatformat_ieee_double_littlebyte_bigword): Ditto.
+	(floatformat_i960_ext): Ditto.
+	(floatformat_m88110_ext): Ditto.
+	(floatformat_m88110_harris_ext): Ditto.
+	(floatformat_arm_ext_big): Ditto.
+	(floatformat_arm_ext_littlebyte_bigword): Ditto.
+	(floatformat_ia64_spill_big): Ditto.
+	(floatformat_ia64_spill_little): Ditto.
+	(floatformat_ia64_quad_big): Ditto.
+	(floatformat_ia64_quad_little): Ditto.
+	(floatformat_ia64_quad_little): Ditto.
+	(floatformat_is_valid): Call "is_valid".
+
+2003-09-15  Andrew Cagney  <cagney@redhat.com>
+
+	* floatformat.c (get_field): Make "data" constant.
+	(floatformat_is_valid, floatformat_to_double): Make "from"
+	constant, fix casts.
+	(floatformat_from_double): Make "from" constant.
+
+2003-09-15  Daniel Jacobowitz  <drow@mvista.com>
+
+	* floatformat.c (floatformat_is_valid): New function.
+	(get_field, put_field): Correct comments.
+
+2003-09-06  Josef Zlomek  <zlomekj@suse.cz>
+
+	* fibheap.c (fibheap_replace_key_data): Change type of OKEY to
+	FIBHEAPKEY_T.
+
+2003-09-02  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR bootstrap/12100
+	* aclocal.m4 (AC_LANG_FUNC_LINK_TRY): Define.
+	* configure: Rebuilt.
+
+2003-08-27  Daniel Jacobowitz  <drow@mvista.com>
+
+	* aclocal.m4: Include acx.m4 and no-executables.m4.
+	(libiberty_AC_FUNC_STRNCMP): Use AC_LIBOBJ.
+	(LIB_AC_PROG_CC): Remove.
+	* configure.in: Update AC_PREREQ to 2.57.  Use GCC_NO_EXECUTABLES.
+	Use AC_PROG_CC and set ac_libiberty_warn_cflags instead of using
+	LIB_AC_PROG_CC.  Use AC_LIBOBJ.  Call AC_ISC_POSIX later, only if
+	performing link tests.
+	* configure: Regenerated.
+
+2003-08-12  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* cp-demangle.c: Clarify what package(s) this is part of.
+
+2003-07-05  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* pex-win32.c (pexecute): Mark parameters this_pname and
+	temp_base as unused. Remove unused variables retries,
+	sleep_interval. Initialize org_stdin, org_stdout.
+	(pwait): Mark parameter flags as unused.
+
+2003-07-02  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* pex-win32.c (fix_argv): Ensure that the executable pathname
+	uses Win32 backslashes.
+	(pexecute): Cast away constness when assigning *errmsg_arg.
+
+2003-06-26  H.J. Lu <hongjiu.lu@intel.com>
+
+	* testsuite/demangle-expected: Add more GNU V3 testcases.
+
+2003-06-22  Zack Weinberg  <zack@codesourcery.com>
+
+	* safe-ctype.c: Use HOST_CHARSET_ASCII and HOST_CHARSET_EBCDIC,
+	not HC_ASCII and HC_EBCDIC.
+	Add documentation in form expected by gather-docs.
+	* hex.c: Use HOST_CHARSET, not hand-coded check of character set.
+	* Makefile.in, functions.texi: Regenerate.
+
+2003-06-21  Zack Weinberg  <zack@codesourcery.com>
+
+	* safe-ctype.c: Separate out EOF==-1 check.  Use HOST_CHARSET
+	for charset determination.
+
+2003-06-19  Dara Hazeghi  <dhazeghi@yahoo.com>
+
+	* configure.in: Add check for malloc.h needed by
+	m68k for function free().
+	* configure: Regenerated.
+	* config.in: Add HAVE_MALLOC_H.
+	* hashtab.c: include malloc.h were available for
+	free().
+
+2003-06-09  Albert Chin-A-Young  <china@thewrittenword.com>
+
+	PR bootstrap/10974
+	* physmem.c: Update comment.
+	* configure.in: Modify test for _system_configuration for older
+	AIX systems.
+
+	* config.in, configure: Regenerated.
+
+2003-06-05  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR other/10810
+	* test-demangle.c (getline): Fix fence-post error.
+
+2003-06-03  Nick Clifton  <nickc@redhat.com>
+
+	* asprintf.c: Change comment to note that -1 is returned upon
+	error.
+	* vasprintf.c: Likewise.
+	(vasprintf): Return -1 upon error.
+	* functions.texi: Document changes to asprintf and vasprintf.
+
+2003-05-19  Kelley Cook  <kelleycook@wideopenwest.com>
+
+	* config.table: Accept i[345867]86 variant.
+
+2003-05-15  Jim Blandy  <jimb@redhat.com>
+
+	* hex.c (_hex_value): Make this unsigned.
+	(hex_value): Update documentation for new return type.  hex_value
+	now expands to an unsigned int expression, to avoid unexpected
+	sign extension when we store it in a bfd_vma, which is larger than
+	int on some platforms.
+	* functions.texi: Regenerated.
+
+2003-05-07  Josef Zlomek  <zlomekj@suse.cz>
+
+	* splay-tree.c (splay_tree_predecessor): Fix comment.
+	(splay_tree_successor): Fix comment.
+
+2003-05-07  Jason Merrill  <jason@redhat.com>
+
+	* hashtab.c (iterative_hash): New fn.
+	* configure.in: Add AC_C_BIGENDIAN_CROSS.
+	* aclocal.m4: Include accross.m4.
+	* configure, config.in: Regenerate.
+
+2003-05-04  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.in (AC_CHECK_FUNCS): Don't make multiple calls.
+	* configure: Regenerate.
+
+2003-05-03  Carlo Wood  <carlo@alinoe.com>
+
+	* cp-demangle.c: Fix typo in "char_traints" string-literal.
+
+2003-04-22  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* vsnprintf.c (vsnprintf): Don't pad string with extra nulls.
+	(main): Test that we don't write too much data.
+
+2003-04-16  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.in (funcs, AC_CHECK_FUNCS): Add snprintf and
+	vsnprintf.
+	* snprintf.c, vsnprintf.c: New files.
+	* Makefile.in (CFILES): Add snprintf.c and vsnprintf.c.
+	(CONFIGURED_OFILES): Add snprintf.o and vsnprintf.o.
+	Regenerate dependencies.
+
+	* functions.texi, configure, config.in: Regenerated.
+
+2003-04-15  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* mempcpy.c, stpcpy.c, stpncpy.c: New files.
+	* configure.in (funcs, AC_CHECK_FUNCS): Add mempcpy, stpcpy
+	and stpncpy.
+	* Makefile.in (CFILES): Add mempcpy.c, stpcpy.c and stpncpy.c.
+	(CONFIGURED_OFILES): Add mempcpy.o, stpcpy.o and stpncpy.o.
+	Regenerate dependencies.
+
+	* functions.texi, configure, config.in: Regenerated.
+
+2003-04-15  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* argv.c: Fix comments.
+	* calloc.c: Don't unnecessarily include "libiberty.h".
+	(bzero): Add prototype.
+	* floatformat.c: Include "ansidecl.h", rely on ANSI_PROTOTYPES.
+	* getcwd.c (getcwd): Use standard definition to avoid conflicts
+	with system headers.
+	* hashtab.c (htab_traverse): Delete unused variables.
+	* rename.c: Include "ansidecl.h".
+	(rename): Use standard definition to avoid conflicts with system
+	headers.
+	* strsignal.c: Rely on ANSI_PROTOTYPES.
+	* strstr.c: Check GNUC >= 2, not GNUC == 2.
+	* vfprintf.c: Include "ansidecl.h", rely on ANSI_PROTOTYPES.
+	* vprintf.c: Include "ansidecl.h" earlier, rely on
+	ANSI_PROTOTYPES.
+	* vsprintf.c: Include "ansidecl.h" earlier, rely on
+	ANSI_PROTOTYPES and possibly include <stdarg.h>.
+
+	* Makefile.in: Regenerate dependencies.
+
+2003-04-15  DJ Delorie  <dj@redhat.com>
+
+	* maint-tool (deps): Scan for headers in $srcdir also.
+
+2003-04-15  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	PR target/10338
+	PR bootstrap/10198
+	PR bootstrap/10140
+	* getopt.c (exchange, _getopt_initialize): Use mempcpy not
+	__mempcpy.
+	* regex.c (regerror): Likewise.
+
+2003-04-14  Roger Sayle  <roger@eyesopen.com>
+
+	* argv.c: Use ANSI_PROTOTYPES instead of __STDC__.
+	* memchr.c: Likewise.
+	* strcasecmp.c: Likewise.
+	* strncasecmp.c: Likewise.
+	* strncmp.c: Likewise.
+	* xatexit.c: Likewise.
+	* xmalloc.c: Likewise.
+
+	* copysign.c: Use traditional function declaration instead of DEFUN.
+	* sigsetmask.c: Likewise.
+
+	* memcmp.c: Both of the above, ANSI_PROTOTYPES and DEFUN.
+	* memset.c: Likewise.
+
+	* memcpy.c: ANSI_PROTOTYPES, DEFUN and prototype bcopy.
+	* memmove.c: Likewise.
+
+2003-04-14  Roger Sayle  <roger@eyesopen.com>
+
+	* strdup.c (strdup): Tweak implementation to use memcpy.
+
+2003-04-14  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.in (HAVE_UINTPTR_T): Always define.
+	* configure: Regenerated.
+
+2003-03-23  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.in (MULTIOSDIR): New macro.  Use $(CC) $(LIBCFLAGS)
+	instead of $$CC alone.
+	(install_to_tooldir): Use it.
+
+2003-17-03  Jan Hubicka  <jh@suse.cz>
+
+	* hashtab.c (htab_traverse_noresize): Break out from ...
+	* hashtab.c (htab_traverse): ... here.
+
+2003-12-03  Jan Hubicka  <jh@suse.cz>
+
+	* hashtab.c (htab_expand): Fix warning.
+
+	* hashtab.c (htab_expand): Compute the size of hashtable based
+	on the number of elements actually used.
+	(htab_traverse):  Call htab_expand when table is too empty.
+
+2003-03-11  Carlo Wood  <carlo@gnu.org>
+
+	* cplus-dem.c (demangle_integral_value): Correction to reflect
+	patch of 2002-01-10 in order to also make negative multi-digits
+	without leading underscore work.
+
+2003-03-03  Mark Mitchell  <mark@codesourcery.com>
+
+	* cplus-dem.c: Add license exception to copyright notice.
+
+2003-02-27  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* physmem.c: Formatting changes from upstream.
+
+2003-02-24  Danny Smith  <dannysmith@users.source.forge.net>
+
+	* physmem.c (physmem_total): Add _WIN32 support.
+	(physmem_available): Likewise.
+
+2003-02-24  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* physmem.c (physmem_total) [HAVE_GETSYSINFO]: Test for
+	GSI_PHYSMEM.
+	(physmem_available) [HAVE_TABLE]: Test for TBL_VMSTATS.
+
+2003-02-22  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.in: Check for sys/systemcfg.h and
+	_system_configuration.
+	* physmem.c: Add support for AIX.  Tweek formatting as per
+	upstream coreutils beta.
+
+2003-02-22  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+	    Richard Earnshaw  <rearnsha@arm.com>
+	    Geoffrey Keating  <geoffk@apple.com>
+
+	* configure.in: Check for sys/sysctl.h and sysctl.
+	* physmem.c: Add support for *bsd and darwin.
+	* Makefile.in: Generate depedency for physmem.o.
+
+2003-02-21  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* physmem.c (physmem_total) [HAVE_GETSYSINFO]: Use getsysinfo on
+	Tru64 UNIX.
+	(physmem_available) [HAVE_TABLE && HAVE_SYS_TABLE_H]: Use table on
+	Tru64 UNIX.
+
+	* configure.in (AC_CHECK_HEADERS): Check for sys/sysinfo.h,
+	machine/hal_sysinfo.h, sys/table.h.
+	(checkfuncs, AC_CHECKFUNCS): Check for getsysinfo, table.
+	* configure, config.in: Regenerate.
+
+2003-02-21  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.in: Check for sys/sysmp.h and sysmp.
+	* physmem.c: Pull upstream copy, add support for irix6.
+
+	* config.in, configure: Regenerated.
+
+2003-02-21  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* physmem.c (physmem_total, physmem_available): De-ANSI-fy.
+	* configure.in (AC_CHECK_FUNCS): Add pstat_getstatic and
+	pstat_getdynamic.
+
+2003-02-20  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* Makefile.in (CFILES): Add physmem.c.
+	(REQUIRED_OFILES): Add physmem.o.
+	* configure.in: Check for sys/pstat.h.
+	(checkfuncs): Add pstat_getstatic and pstat_getdynamic.
+	* physmem.c: New file, copied from textutils.
+
+	* config.in, configure: Regenerated.
+
+2003-02-20  Daniel Jacobowitz  <drow@mvista.com>
+
+	* Makefile.in (CFILES): Add lrealpath.c.
+	(REQUIRED_OFILES): Add lrealpath.o.
+	(lrealpath.o): Add rule.
+	* aclocal.m4 (libiberty_NEED_DECLARATION): Add.
+	* configure.in: Add realpath and canonicalize_file_name to
+	checkfuncs and AC_CHECK_FUNCS.  Use libiberty_NEED_DECLARATION
+	for canonicalize_file_name.
+	* lrealpath.c: New file.
+	* make-relative-prefix.c: Update documentation.
+	(make_relative_prefix): Simplify.  Use lbasename and lrealpath.
+	* config.in: Regenerated.
+	* configure: Regenerated.
+	* functions.texi: Regenerated.
+
+2003-02-20  jmc  <jmc@prioris.mini.pw.edu.pl>
+
+	* cplus_dem.c: Fix typo: intializes -> initializes.
+
+2003-02-20  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in: Propagate ORIGINAL_LD_FOR_MULTILIBS to
+	config.status.
+	* configure: Rebuilt.
+
+2003-02-13  Daniel Jacobowitz  <drow@mvista.com>
+
+	Fix PR c++/7612.
+	* cplus-dem.c (demangle_signature): Call string_delete.
+	Remove extra string_init.
+	(demangle_arm_hp_template): Call string_delete instead of
+	string_clear.  Add missing string_delete call.
+	(demangle_qualified): Add missing string_delete call.
+	(do_type): Remove unused variable btype.  Add missing string_delete
+	call.  Call string_delete instead of string_clear.
+	(demangle_fund_type): Move variable btype inside of the switch
+	statement.  Add missing string_delete call.
+	(do_arg): Call string_delete instead of string_clear.  Remove extra
+	string_init.
+	(demangle_nested_args): Free work->previous_argument.
+
+2003-02-12  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* acconfig.h: New file.  Add uintptr_t.
+	* config.in: Regenerated.
+
+2003-02-04  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* libiberty.texi: Update to GFDL 1.2.
+
+2003-01-30  Christian Cornelssen  <ccorn@cs.tu-berlin.de>
+
+	* Makefile.in (libiberty_topdir): New subst.
+	(mkinstalldirs): Redefine in terms of the above.
+	* configure.in: AC_SUBST it.
+	* configure: Regenerate.
+
+2003-01-28  Christian Cornelssen  <ccorn@cs.tu-berlin.de>
+
+	* Makefile.in (all-subdir, check-subdir, installcheck-subdir)
+	(info-subdir, install-info-subdir, clean-info-subdir)
+	(dvi-subdir, install-subdir, etags-subdir, mostlyclean-subdir)
+	(clean-subdir, distclean-subdir, maintainer-clean-subdir):
+	Pass $(FLAGS_TO_PASS).
+
+2003-01-27  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.in (install_to_tooldir): Instead of $(MULTISUBDIR), use
+	/`$$CC -print-multi-os-directory`.
+
+2003-01-26  Daniel Jacobowitz  <drow@mvista.com>
+
+	* hashtab.c (htab_create_alloc_ex): New function.
+	(hatab_set_functions_ex): New function.
+	(htab_delete, htab_expand): Support alternate allocation functions.
+
+2003-01-24  Christopher Faylor  <cgf@redhat.com>
+
+	* configure.in: Remove special pex-cygwin consideration.
+	* configure: Regenerate.
+	* pex-cygwin.c: Remove.
+	* Makefile.in: Remove pex-cygwin.[co] lines.
+
+2003-01-24  Zack Weinberg  <zack@codesourcery.com>
+
+	* Makefile.in (CFILES): Add pex-*.c.
+	(REQUIRED_OFILES): Change pexecute.o to @pexecute@
+	(CONFIGURED_OFILES): Add pex-*.o.
+	(TEXIFILES): Add pexecute.txh.
+	(pexecute.o): Delete rule.
+	(pex-cygwin.o, pex-djgpp.o, pex-mpw.o, pex-msdos.o, pex-os2.o,
+	pex-unix.o, pex-win32.o): New rules.
+	* configure.in: Change AC_INIT argument to xmalloc.c.
+	Compute appropriate pexecute implementation and substitute it
+	as @pexecute@.
+
+	* pexecute.c: Split up into...
+	* pex-cygwin.c, pex-djgpp.c, pex-mpw.c, pex-msdos.c, pex-os2.c,
+	pex-unix.c, pex-win32.c, pex-common.h, pexecute.txh: ... these
+	new files.
+
+	* functions.texi: Regenerate.
+	* configure: Regenerate.
+
+2003-01-20  Josef Zlomek  <zlomekj@suse.cz>
+
+	* hashtab.c (htab_expand): Fix allocation of new entries.
+
+2003-01-09  Christian Cornelssen  <ccorn@cs.tu-berlin.de>
+
+	* Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR.
+
+	* Makefile.in (install_to_libdir, install_to_tooldir): Add a
+	mkinstalldirs command.
+
+2002-12-04  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* make-relative-prefix.c (HAVE_HOST_EXECUTABLE_SUFFIX):
+	Define for hosts with HOST_EXECUTABLE_SUFFIX.
+
+2002-11-24  Nick Clifton  <nickc@redhat.com>
+
+	* make-relative-prefix.c (make_relative_prefix): Ensure return
+	string is empty before using strcat to construct it.
+
+2002-11-22  Daniel Jacobowitz  <drow@mvista.com>
+
+	* Makefile.in: Add make-relative-prefix.c.
+	* make-relative-prefix.c: New file.
+	* functions.texi: Rebuilt.
+
+2002-11-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* md5.c (md5_process_block): Avoid `function-like macro "F{G,H,I}" must be
+	used with arguments in traditional C' warnings.
+
+2002-10-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* config.table: Use mh-s390pic for s390x too.
+
+2002-10-06  Andreas Jaeger  <aj@suse.de>
+
+	* libiberty/cplus-dem.c (ada_demangle): Get rid of unneeded
+	variable and of strict-aliasing warning.
+	(grow_vect): Use char as first parameter.
+
+2002-09-22  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* Makefile.in (all): Fix multilib parallel build.
+
+2002-09-19  John David Anglin  <dave@hiuly1.hia.nrc.ca>
+
+	* cp-demangle.c (demangling_new): Cast 0 to enum.
+	(demangle_char): Cast return of strdup to char *.
+	(is_gnu_v3_mangled_ctor): Cast 0 to enum.
+	(is_gnu_v3_mangled_dtor): Likewise.
+	* cplus-dem.c (grow_vect): Cast return of xrealloc to void *.
+	(work_stuff_copy_to_from): Cast return of xmalloc to char **.
+	* fibheap.c (fibnode_new): Cast return of xcalloc to fibnode_t.
+	* md5.c (md5_process_bytes): Cast results back to const void *.
+	(md5_process_block): Add cast to const md5_uint32 *.
+	* regex.c (re_compile_fastmap): Cast enum to UCHAR_T.
+	* safe-ctype.c (L, XL, U, XU, D, P, _, C, Z, M, V, T, S): Add cast to
+	unsigned short.
+	* splay-tree.c (splay_tree_xmalloc_allocate): Cast return of xmalloc
+	to void *.
+	* vasprintf.c (int_vasprintf): Cast return of malloc to char *.
+
+2002-09-19  Nick Clifton  <nickc@redhat.com>
+
+	* README: Update email addresses for bugs and patches.
+
+2002-09-10  Mike Stump  <mrs@apple.com>
+
+	* splay-tree.c (splay_tree_successor): Fix comments.
+
+2002-09-11  Zack Weinberg  <zack@codesourcery.com>
+
+	* cplus-dem.c: Code under #ifdef MAIN moved to gcc/cp/cxxfilt.c.
+	* testsuite/Makefile.in: Adjust for test-demangle.
+	* testsuite/regress-demangle: Deleted.
+	* testsuite/test-demangle.c: New file.
+	* testsuite/demangle-expected: Change \$ to $ throughout, now that
+	this file is not being read by a shell script.
+
+2002-09-05  Roger Sayle  <roger@eyesopen.com>
+
+	* regex.c: Only use "#pragma alloca" on AIX when not using gcc.
+
+2002-08-07  DJ Delorie  <dj@redhat.com>
+
+	* regex.c (re_error_msgid): Just use a simple array of strings.
+	(re_compile_pattern): Compensate.
+	(re_comp): Likewise.
+	(re_comp): Likewise.
+	(regerror): Likewise.
+
+2002-07-29  Neil Booth  <neil@daikokuya.co.uk>
+
+	* cplus-dem.c (PREPEND_BLANK): Remove.
+
+2002-07-10  Jason Merrill  <jason@redhat.com>
+
+	* cp-demangle.c (demangle_identifier): Support extended Unicode
+	characters.
+
+2002-07-08  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* cp-demangle.c (demangle_v3_with_details): Wrap in
+	!defined IN_GLIBCPP_V3.
+
+2002-07-01  Mark Mitchell  <mark@codesourcery.com>
+
+	* cp-demangle.c (demangle_operator_name): Add type_arg parameter.
+	Set it for the "st" operator.
+	(demangle_expression): Handle expressions with types as arguments.
+
+2002-06-30  Douglas Rupp  <rupp@gnat.com>
+
+	* configure.in (OUTPUT_OPTION,NO_MINUS_C_MINUS_O): Configure.
+	* Makefile.in (OUTPUT_OPTION): Use.
+
+2002-06-22  Peter Breitenlohner <peb@mppmu.mpg.de>
+
+	* Makefile.in (install_to_libdir): Add $(DESTDIR).
+	(install_to_tooldir): Likewise.
+
+2002-06-17  Douglas Rupp  <rupp@gnat.com>
+
+	* lbasename.c: Add 2002 to copyright.
+	(IS_DIR_SEPARATOR): Remove VMS junk.
+
+2002-06-05  Geoffrey Keating  <geoffk@redhat.com>
+
+	* hashtab.c (htab_create): New stub function for backward
+	compatibility.
+	(htab_try_create): Likewise.
+
+2002-06-03  Geoffrey Keating  <geoffk@redhat.com>
+
+	* hashtab.c (htab_create): Delete.
+	(htab_try_create): Delete.
+	(htab_create_alloc): New.
+	(htab_delete): Support user-specified memory allocation.
+	(htab_expand): Likewise.
+
+2002-05-22  Roman Lechtchinsky  <rl@cs.tu-berlin.de>
+
+	* configure.in: Fix typo in the code checking for sys_errlist.
+	* configure: Regenerated.
+
+2002-05-13  Andreas Schwab  <schwab@suse.de>
+
+	* config.table: Use mh-x86pic also for x86-64.
+
+2002-05-08  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (ORIGINAL_LD_FOR_MULTILIBS): Preserve LD at
+	script entry, and set LD to it when configuring multilibs.
+	* configure: Rebuilt.
+
+2002-05-07  Mark Mitchell  <mark@codesourcery.com>
+
+	* configure.in (AC_TYPE_PID_T): Use it.
+	* configure: Regenerated.
+	* getruntime.c: Include <sys/types.h>.
+	* waitpid.c: Likewise.  Use pid_t, not int, as the type of "pid".
+
+2002-04-09  Richard Henderson  <rth@redhat.com>
+
+	* hashtab.c (higher_prime_number): Use 7 as minimum.
+	(find_empty_slot_for_expand): Don't compute hash2 unless needed.
+	(htab_find_slot_with_hash): Likewise.
+
+2002-04-01  Phil Edwards  <pme@gcc.gnu.org>
+
+	* cp-demangle.c (__cxa_demangle):  Also protect with IN_GLIBCPP_V3.
+	(is_gnu_v3_mangled_ctor, is_gnu_v3_mangled_ctor):  Conditionally
+	not compile if IN_GLIBCPP_V3 defined.
+	* dyn-string.c:  Also allow IN_GLIBCPP_V3 to change allocation scheme.
+
+2002-03-30  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
+
+	* cp-demangle.c (java_demangle_v3): Don't try to release "demangled"
+	if it is NULL.
+
+2002-03-27  DJ Delorie  <dj@redhat.com>
+
+	* hex.c: Add documentation.
+	(_hex_value): Provide non-ASCII empty table.
+	(hex_init): Initialize the non-ASCII table.
+	* functions.texi: Regenerate.
+
+2002-03-27  Mark Mitchell  <mark@codesourcery.com>
+
+	* dyn-string.c: Add libgcc exception to copyright notice.
+
+2002-03-26  H.J. Lu  (hjl@gnu.org)
+
+	* config.table: Support --with-build-subdir.
+	* configure.in: Likewise.
+	* configure: Rebuild.
+
+2002-03-18  Stuart Griffith  <Stuart_Griffith@credence.com>
+
+	* strtod.c (strtod): Increment 8 chars, not 7, when `infinity'
+	seen.
+
+2002-03-12  Mark Mitchell  <mark@codesourcery.com>
+
+	* cp-demangle.c: Add libgcc exception to cp-demangle.c copyright
+	notice.
+
+2002-03-11  Douglas B Rupp  <rupp@gnat.com>
+
+	* xatexit.c [VMS]: Include stdlib.h and unixlib.h.
+
+2002-03-06  Jim Blandy  <jimb@redhat.com>
+
+	* splay-tree.c (splay_tree_xmalloc_allocate,
+	splay_tree_xmalloc_deallocate): Use K&R-style definitions, not
+	prototyped definitions.  Mark `data' arguments as unused.
+
+2002-03-06  Andrew Cagney  <ac131313@redhat.com>
+
+	* floatformat.c (floatformat_arm_ext_big): Delete definition.
+
+2002-03-04  Phil Edwards  <pme@gcc.gnu.org>
+
+	* configure.in:  Add --enable-install-libiberty option.
+	* Makefile.in (INSTALLED_HEADERS):  New variable.
+	(install_to_libdir):  Possibly also copy headers.
+	* configure:  Regenerated.
+
+2002-03-04  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+	* xmalloc.c (xmalloc_fail): Clarify error message further.
+
+2002-03-03  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+	* xmalloc.c (xmalloc_fail): Clarify error message.
+
+2002-02-22  Jim Blandy  <jimb@redhat.com>
+
+	* splay-tree.c (splay_tree_xmalloc_allocate,
+	splay_tree_xmalloc_deallocate): New functions.
+	(splay_tree_new): Call splay_tree_new_with_allocator, passing the
+	above functions and a dummy data pointer.
+	(splay_tree_new_with_allocator): New function.
+	(splay_tree_delete_helper, splay_tree_delete, splay_tree_insert,
+	splay_tree_remove): Use the splay tree's allocation and
+	deallocation functions.
+
+2002-02-19  Scott Snyder  <snyder@fnal.gov>
+
+	* testsuite/demangle-expected: Add test case for infinite loop in
+	demangler.
+	* cplus-dem.c (demangle_arm_hp_template): Stop trying to demangle
+	if do_type() doesn't make any progress --- prevents an infinite
+	loop.
+
+2002-02-18  Carlo Wood  <carlo@gnu.org>
+
+	PR c++/5390
+	* cplus-dem.c (demangle_integral_value): Accept multi-digit
+	numbers that do not start with an underscore; This is needed
+	for integer template parameters. This doesn't break anything
+	because multi-digit numbers are never followed by a digit.
+	* testsuite/demangle-expected: Corrected all mangled test
+	cases with multi-digit template parameters: g++ 2.95.x does
+	not generate underscores around these parameters.
+
+2002-02-05  Jason Merrill  <jason@redhat.com>
+
+	* cplus-dem.c (flags): Add DMGL_VERBOSE
+	(cplus_demangle_v3_p): Remove.
+	(demangle_it): Add DMGL_TYPES to passed flags.
+	* cp-demangle.c (cplus_demangle_v3_all): Remove.
+	(cplus_demangle_v3_type): Remove.
+	(cplus_demangle_v3): Add options parm.
+
+2002-02-02  H.J. Lu  (hjl@gnu.org)
+
+	* cp-demangle.c (cp_demangle_type): Do not protect with
+	IN_LIBGCC2.
+	(cplus_demangle_v3_all): New.
+	(cplus_demangle_v3): Call cplus_demangle_v3_all.
+	(cplus_demangle_v3_type): Call cplus_demangle_v3_all.
+
+	* cplus-dem.c (cplus_demangle_v3_p): New function pointer.
+	Initialized to cplus_demangle_v3.
+	(cplus_demangle_with_style): Call cplus_demangle_v3_p instead
+	of cplus_demangle_v3.
+	(main): Set cplus_demangle_v3_p to cplus_demangle_v3_type for
+	command line symbol.
+
+	* testsuite/regress-demangle: Pass the mangled name at the
+	command line.
+
+2002-02-01  H.J. Lu  <hjl@gnu.org>
+
+	* cp-demangle.c (cp_demangle_type): Call demangling_new with
+	DMGL_GNU_V3.
+
+2002-01-31  Phil Edwards  <pme@gcc.gnu.org>
+
+	* cp-demangle.c:  Revert yesterday's change.
+
+2002-01-31  Adam Megacz  <adam@xwt.org>
+
+	* gcc/libiberty/configure.in: Treat mingw the same as cywin
+	wrt HAVE_SYS_ERRLIST.
+
+2002-01-30  Phil Edwards  <pme@gcc.gnu.org>
+
+	* cp-demangle.c (cp_demangle_type):  Do not protect with IN_LIBGCC2.
+	(cplus_demangle_v3):  Mimic __cxa_demangle and fall back on
+	cp_demangle_type.
+	* testsuite/demangle-expected:  New gnu-v3 test.
+
+2002-01-22  Momchil Velikov  <velco@fadata.bg>
+
+	* configure.in (variable detection): Use arrays of unspecified
+	size instead of plain integers.
+
+2002-01-18  DJ Delorie  <dj@redhat.com>
+
+	* Makefile.in (TESTLIB): New.  This library is for future
+	testsuites.
+	(CFILES, REQUIRED_OFILES, CONFIGURED_OFILES): Re-alphabetize,
+	break down by letter.
+	(REQUIRED_OFILES): List long-to-compile files first.
+	(maint-deps): New, target for updating dependencies.
+	(dependencies): Update.
+	* maint-tool: Add dependency-generating option.
+	* configure.in: Check for _doprnt even if we're not providing it.
+	* configure: Regenerate.
+
+	* _doprnt.c: Modifications to allow compiling on any platform.
+	* copysign.c: Likewise.
+	* putenv.c: Likewise.
+	* setenv.c: Likewise.
+	* vsprintf.c: Likewise.
+
+2002-01-15  Douglas B Rupp  <rupp@gnat.com>
+
+	* mkstemps.c (mkstemps): On VMS, open temp file with option
+	that causes it to be deleted when closed.
+
+2002-01-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* cp-demangle.c (long_options): Const-ify.
+	* cplus-dem.c (long_options): Likewise.
+
+	* cplus-dem.c (mystrstr): Delete.  All callers changed to use
+	strstr instead.
+
+2001-12-31  Ira Ruben	<ira@apple.com>
+
+	* aclocal.m4 (libiberty_AC_FUNC_STRNCMP): Use anon mmap as 2nd try.
+	* configure: Regenerated.
+
+2001-12-24  Douglas B. Rupp  <rupp@gnat.com>
+
+	* configure.in (uintptr_t): Use AC_CHECK_TYPE.
+	* configure: Regenerated.
+
+2001-12-12  Craig Rodrigues  <rodrigc@gcc.gnu.org>
+
+	PR other/2719
+	* cplus-dem.c (consume_count): Treat negative count as an error.
+	* testsuite/demangle-expected: Added testcase.
+
+Tue Dec 11 07:08:57 2001  Douglas B. Rupp  <rupp@gnat.com>
+
+	* configure.in: Hardcode that vfork works on VMS host.
+	* configure: Regenerated.
+
+2001-12-06  Richard Henderson  <rth@redhat.com>
+
+	* cplus-dem.c (libiberty_demanglers): Add no_demangling case.
+	(cplus_demangle): Support no_demangling.
+
+2001-11-27  Zack Weinberg  <zack@codesourcery.com>
+
+	* _doprnt.c: Moved here from gcc/doprint.c.  Adjust to build
+	in libiberty context.  Fix typo in leading comment.
+	* configure.in: Fix various AC_DEFINEs so autoheader works.
+	If any of vprintf, vsprintf, vfprintf is missing from libc,
+	then AC_REPLACE_FUNCS(_doprnt).
+
+2001-11-26  DJ Delorie  <dj@redhat.com>
+	    Daniel Jacobowitz  <drow@mvista.com>
+
+	* Makefile.in (stamp-h): Depend on Makefile for proper
+	serialization.
+	(*-subdir): Depend on config.h for proper serialization.
+
+2001-11-26  DJ Delorie  <dj@redhat.com>
+
+	* configure.in: Check for alloca.h (for regex.c and putenv.c).
+	* configure: Regenerate.
+	* config.h: Add HAVE_ALLOCA_H.
+
+2001-11-16  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* regex.c: Check defined(__STDC__) || defined(ALMOST_STDC) ||
+	defined(HAVE_STRINGIZE) to determine whether ISO CPP token pasting
+	is available.
+
+Thu Nov 15 11:06:25 2001  Jeffrey A Law  (law@cygnus.com)
+
+	* config.in (HAVE_UINTPTR_T): Provide autoconf stub.
+	* configure.in (HAVE_UINTPTR_T): Test for system defining
+	uintptr_t and define HAVE_UINTPTR_T appropriately.
+	* regex.c (uintptr_t): Do not provide a definition if the
+	system provided one.
+
+	* regex.c (PREFIX): Provide an alternate definition for
+	non-ANSI/ISO compilers.
+	(ARG_PREFIX): Likewise.
+
+2001-11-12  Jim Meyering  <meyering@lucent.com>
+
+	* obstack.c (_): Honor the setting of ENABLE_NLS.  Otherwise,
+	this code would end up calling gettext even in packages built
+	with --disable-nls.
+	* getopt.c (_): Likewise.
+	* regex.c (_): Likewise.
+
+2001-11-03  Alan Modra  <amodra@bigpond.net.au>
+
+	* configure.in: Cope with missing makeinfo.
+	* configure: Regenerate.
+
+2001-10-22  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* hex.c (hex_init): Provide empty stub.
+
+	* hex.c (hex_init): Delete.
+	(_hex_value): Const-ify and initialize at compile-time.
+
+2001-10-19  H.J. Lu <hjl@gnu.org>
+
+	* Makefile.in ($(TARGETLIB)): Also generate pic/$(TARGETLIB) if
+	necessary.
+
+2001-10-17  DJ Delorie  <dj@redhat.com>
+
+	* argv.c, asprintf.c, choose-temp.c, concat.c, cplus-dem.c,
+	ffs.c, fnmatch.txh, getruntime.c, make-temp-file.c,
+	mkstemps.c, pexecute.c, random.c, strsignal.c, vasprintf.c:
+	Improve manual formatting.
+	* functions.texi: Regenerate.
+
+2001-10-15  DJ Delorie  <dj@redhat.com>
+
+	* Makefile.in (TEXIFILES): Add fnmatch.txh.
+	(maint-undoc): New.
+	maint-tool: Add "undoc" tool.
+	* alloca.c, argv.c, asprintf.c, choose-temp.c, concat.c,
+	fdmatch.c, ffs.c, getruntime.c, insque.c, lbasename.c,
+	make-temp-file.c, mkstemps.c, pexecute.c, random.c, spaces.c,
+	strerror.s, strsignal.c, strtol.c, vasprintf.c: Add or update
+	documentation.
+	* fnmatch.txh: New.
+	* functions.texi: Regenerate.
+
+2001-10-10  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* bcmp.c, setenv.c: Use "nonzero" instead of "non-zero".
+	* strtod.c: Use "ISO C" instead of "ANSI C".
+	* functions.texi: Regenerate.
+
+2001-10-07  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* alloca.c, clock.c, getcwd.c, getpagesize.c, getpwd.c, index.c,
+	libiberty.texi, memchr.c, putenv.c, rindex.c, strchr.c, strdup.c,
+	strerror.c, strrchr.c, strstr.c, strtod.c, tmpnam.c, vfork.c,
+	xatexit.c, xmalloc.c, xstrerror.c: Improve manual formatting.  Fix
+	spelling.  Give names to function arguments in documentation.  Use
+	(void) prototypes in documentation.
+	* functions.texi: Regenerate.
+
+2001-10-07  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* argv.c (buildargv, tests, main): Const-ify.
+	* cp-demangle.c (operator_code): Likewise.
+	* cplus-dem.c (optable, libiberty_demanglers,
+	cplus_demangle_set_style, cplus_demangle_name_to_style,
+	print_demangler_list): Likewise.
+	* hashtab.c (higher_prime_number): Likewise.
+	* strcasecmp.c (charmap): Likewise.
+	* strerror.c (error_info, strerror, main): Likewise.
+	* strncasecmp.c (charmap): Likewise.
+	* strsignal.c (signal_info): Likewise.
+
+2001-09-29  DJ Delorie  <dj@redhat.com>
+
+	* configure: Regenerate.
+
+2001-09-28  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* concat.c: Include stdlib.h.
+
+2001-09-27  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* libiberty.texi: (Top level): Add syncodeindex pg.  Add
+	@dircategory and @direntry directives.  Add @finalout.
+	(many nodes): Lose the next,prev,up pointers on the @nide line.
+	(Using, Supplemental Functions, Replacement Functions): Fix
+	markup.
+	(Functions): Move around, to allow makeinfo to build the manual
+	without next,prev,up pointers in thye node lines.
+	(Licenses): Fix typos.
+
+	* index.c, rindex.c, strchr.c, strerror.c, strrchr.c, strstr.c,
+	strtol.c, xatexit.c, xexit.c, xmalloc.c: Fix spelling and markup.
+	* functions.texi: Regenerate.
+
+	* copying-lib.texi: Lose the next,prev,up pointers on the @node
+	line.
+
+2001-09-27  DJ Delorie  <dj@redhat.com>
+
+	* configure.in: Don't use in-tree texinfo, because libiberty must
+	be built before it.  Check for makeinfo version 4 or higher.
+	* functions.texi: Regenerate.
+
+2001-09-20  DJ Delorie  <dj@redhat.com>
+	    Phil Edwards  <pedwards@disaster.jaj.com>
+
+	* configure.in (MAKEINFO, PERL): Detect these.
+	(--enable-maintainer-mode): Add.
+	* configure: Regenerate.
+	* Makefile.in (MAKEINFO, PERL): Define.
+	(libiberty.info, libiberty.dvi, libiberty.html): New.
+	(CFILES): Add bsearch.c.
+	(CONFIGURED_OFILES): New, list of objects configure might add.
+	(maint-missing, maint-buildall): New, for maintainers only.
+	(clean, mostlyclean): Add info/dvi/html files.
+	* libiberty.texi, copying-lib.texi, obstacks.texi, functions.texi: New.
+	* gather-docs: New, for maintainers.
+	* maint-tool: New, for maintainers.
+	* alloca.c, atexit.c, basename.c, bcmp.c, bcopy.c, bsearch.c,
+	bzero.c, calloc.c, clock.c, configure.in, configure, getcwd.c,
+	getpagesize.c, getpwd.c, index.c, memchr.c, memcmp.c, memcpy.c,
+	memmove.c, memset.c, putenv.c, rename.c, rindex.c, setenv.c,
+	sigsetmask.c, strcasecmp.c, strchr.c, strdup.c, strerror.c,
+	strncasecmp.c, strncmp.c, strrchr.c, strstr.c, strtod.c, strtol.c,
+	tmpnam.c, vfork.c, vprintf.c, waitpid.c, xatexit.c, xexit.c,
+	xmalloc.c, xmemdup.c, xstrdup.c, xstrerror.c: Add or update
+	documentation.
+
+2001-09-25  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* concat.c (reconcat): Fix for traditional C.
+
+2001-09-24  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* concat.c (reconcat): New function.
+
+2001-09-17  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* concat.c (vconcat_length, vconcat_copy, concat_length,
+	concat_copy, concat_copy2): New functions.
+	(concat): Use vconcat_length/vconcat_copy.
+
+	* alloca.c (libiberty_optr, libiberty_nptr, libiberty_len):
+	Define.
+
+2001-09-04  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* asprintf.c: Don't define USE_STDARG.  Use VPARAMS, VA_OPEN,
+	VA_FIXEDARG & VA_CLOSE.
+
+	* vasprintf.c: Check HAVE_STRING_H when including string.h.
+	(checkit): Delete redundant prototype.  Add ATTRIBUTE_PRINTF_1.
+	Use VA_OPEN, VA_FIXEDARG & VA_CLOSE.  Free allocated string.
+
+2001-08-27  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* concat.c (concat): Use VPARAMS, VA_OPEN, VA_FIXEDARG & VA_CLOSE.
+
+2001-08-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* regex.c (truncate_wchar): Use wcrtomb not wctomb.
+
+2001-08-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* posix/regex.c [_LIBC] (convert_mbs_to_wcs): Use __mbrtowc
+	instead of mbrtowc.
+	[_LIBC]: Use __iswctype instead of iswctype, __wcslen instead of
+	wcslen, and __wcscoll instead of wcscoll.
+
+2001-08-22  Matt Kraai  <kraai@alumni.carnegiemellon.edu>
+
+	* fibheap.c (fibheap_init, fibnode_init): Remove.
+	(fibheap_new, fibnode_new): Use xcalloc to allocate and
+	initialize memory.
+	(fibheap_insert): Remove check for node allocation failure.
+
+2001-08-21  Richard Henderson  <rth@redhat.com>
+
+	* Makefile.in (fibheap.o): Depend on config.h.
+	* fibheap.c: Tidy formatting.  Use config.h.` Rearrange some
+	functions for inlining.
+
+Tue Aug 21 12:35:04 2001  Christopher Faylor <cgf@cygnus.com>
+
+	* configure.in: Need to set HAVE_SYS_ERRLIST and HAVE_SYS_NERR whenever
+	hosting on cygwin.
+	* configure: Regenerate.
+
+2001-08-20  Andrew Cagney  <ac131313@redhat.com>
+
+	* floatformat.c (floatformat_m88110_ext): Remove #ifdef
+	HARRIS_FLOAT_FORMAT.
+	(floatformat_ia64_spill_little, floatformat_ia64_quad_little)
+	(floatformat_ia64_spill_big, floatformat_ia64_quad_big)
+	(floatformat_arm_ext_big, floatformat_arm_ext_littlebyte_bigword)
+	(floatformat_m88110_harris_ext): New float formats.
+
+2001-08-20  Daniel Berlin  <dan@cgsoftware.com>
+
+	* fibheap.c: New file. Fibonacci heap.
+
+	* Makefile.in (CFILES): Add fibheap.c.
+	(REQUIRED_OFILES): Add fibheap.o.
+	(fibheap.o): Add dependencies for fibheap.o.
+
+2001-08-17  Christopher Faylor <cgf@cygnus.com>
+
+	* configure.in: Always set HAVE_SYS_ERRLIST when targetting cygwin.
+	* configure: Regenerate.
+
+2001-08-16  Richard Henderson  <rth@redhat.com>
+
+	* hashtab.c (htab_hash_string): New.
+
+2001-08-13  Andrew Cagney  <ac131313@redhat.com>
+
+	* floatformat.c (floatformat_ieee_double_littlebyte_bigword): Fix
+	name.
+
+2001-08-12  Isamu Hasegawa  <isamu@yamato.ibm.com>
+
+	* regex.c (wcs_regex_compile): Use appropriate string
+	to compare with collating element.
+	Fix the padding for the alignment.
+
+2001-08-10  Andrew Cagney  <ac131313@redhat.com>
+
+	* lbasename.c (lbasename): Change function definition to return a
+	const char pointer.
+
+2001-08-07  Jason Merrill  <jason_merrill@redhat.com>
+
+	* cp-demangle.c (demangle_special_name): "GR" -> "reference temporary
+	for".
+
+2001-08-03  Richard Henderson  <rth@redhat.com>
+
+	* Makefile.in (concat.o): Depend on config.h.
+
+2001-07-30  Andreas Jaeger  <aj@suse.de>
+
+	* concat.c: Include "config.h".
+
+2001-07-30  Andreas Jaeger  <aj@suse.de>
+
+	* regex.c: Declare wcs functions only if compiling with
+	MBS_SUPPORT.
+	Don't use #elif for traditional C.
+
+2001-07-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* regex.c: Revamp memory allocation for WCHAR functions to
+	not use too much stack.
+
+2001-07-30  Andreas Jaeger  <aj@suse.de>
+
+	* regex.c: Declare wcs functions only if compiling with
+	MBS_SUPPORT.
+	Don't use #elif for traditional C.
+
+2001-07-25  Daniel Jacobowitz  <drow@mvista.com>
+
+	* Makefile.in (regex.o): Add dependency on config.h.
+
+2001-07-18  Andreas Schwab  <schwab@suse.de>
+
+	* regex.c (WORDCHAR_P) [WCHAR]: Also return true for the
+	underscore character.
+
+2001-07-18  Ulrich Drepper  <drepper@redhat.com>
+
+	* regex.c: Limit string length printed in debug messages to 100
+	chars.
+
+2001-07-18  Andreas Jaeger  <aj@suse.de>
+
+	* regex.c: Place under LGPL version 2.1.
+
+2001-07-10  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* Makefile.in: Add support for regex code.
+	* regex.c: New file.
+
+2001-07-05  Mark Klein  <mklein@dis.com>
+
+	* Makefile.in: Add ffs.c dependency.
+	* configure.in: Add ffs.c.
+	* ffs.c: New file.
+
+2001-06-18  Richard Henderson  <rth@redhat.com>
+
+	* concat.c: Include <sys/types.h>.
+
+2001-06-11  Loren J. Rittle  <ljrittle@acm.org>
+
+	bootstrap/3106
+	* strerror.c (sys_nerr): Hide the OS header version.
+	* strsignal.c (sys_nsig): Likewise.
+
+2001-06-10  Richard Henderson  <rth@redhat.com>
+
+	* concat.c: Include string.h.  Fix int vs size_t usage.
+	Simplify the iteration loops.  Use memcpy.
+
+2001-05-16  Matt Kraai  <kraai@alumni.carnegiemellon.edu>
+
+	* partition.c: Fix misspelling of `implementation'.
+
+2001-05-09  Thiemo Seufer  <seufer@csv.ica.uni-stuttgart.de>
+
+	* md5.c (md5_init_ctx): Declare constants as unsigned.
+	(md5_process_block): Likewise.
+
+2001-05-07  Zack Weinberg  <zackw@stanford.edu>
+
+	* cp-demangle.c (demangle_v3_with_details,
+	is_gnu_v3_mangled_ctor, is_gnu_v3_mangled_dtor): Use K+R style
+	function definition.
+	* ternary.c: Use K+R style function definitions.  Use PTR, not
+	void *.  Make arguments constant where possible.
+
+2001-05-07  Mark Mitchell  <mark@codesourcery.com>
+
+	* splay-tree.h (splay_tree_max): New function.
+	(splay_tree_min): Likewise.
+
+2001-04-15  Daniel Berlin  <dan@cgsoftware.com>
+
+	* ternary.c: New file - Ternary search tree implementation.
+
+	* Makefile.in: Add ternary.o, and ternary.c dependencies.
+
+2001-04-03  Zack Weinberg  <zackw@stanford.edu>
+
+	* make-temp-file.c (try): Inline.
+
+2001-02-28  Richard Henderson  <rth@redhat.com>
+
+	* Makefile.in (make-temp-file.o): Depend on config.h.
+
+2001-03-27  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* memchr.c (memchr): Adjust condition to avoid infinite loop.
+
+2001-03-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* cp-demangle.c (demangle_discriminator): `_0' is discriminator #1,
+	`_' not followed by a digit is invalid.
+
+2001-03-22  Jim Blandy  <jimb@redhat.com>
+
+	* cp-demangle.c (string_list_delete): Use dyn_string_delete
+	instead of free, to free the contents as well as the string
+	structure.
+
+2001-03-21  Zack Weinberg  <zackw@stanford.edu>
+
+	* make-temp-file.c: Always default DIR_SEPARATOR to '/'.
+	Don't default P_tmpdir to anything.  Try /var/tmp before
+	/usr/tmp.
+
+2001-03-20  Zack Weinberg  <zackw@stanford.edu>
+
+	* choose-temp.c: Split off make_temp_file, and the code
+	duplicated between it and choose_temp_base, into...
+	* make-temp-file.c: ... here; new file.
+
+	* Makefile.in (CFILES): Add make-temp-file.c.
+	(REQUIRED_OFILES): Add make-temp-file.o.
+
+2001-03-20  Jim Blandy  <jimb@redhat.com>
+
+	* cp-demangle.c (struct demangling_def): New fields:
+	is_constructor and is_destructor.
+	(demangling_new): Initialize them.
+	(demangle_ctor_dtor_name): Set them, if we detect a constructor
+	or destructor.
+	(demangle_v3_with_details, is_gnu_v3_mangled_ctor,
+	is_gnu_v3_mangled_dtor): New functions.
+
+2001-03-20  Jason Merrill  <jason@redhat.com>
+
+	* cplus-dem.c (main): Skip initial $.
+
+2001-03-15  Michael Meissner  <meissner@redhat.com>
+
+	* hashtab.c (higher_prime_number): Silence warning that 4294967291
+	might be a signed integer under pre-ISO C systems.
+
+2001-03-10  Neil Booth  <neil@daikokuya.demon.co.uk>
+	    John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* libiberty/lbasename.c: New file.
+	* libiberty/Makefile.in: Update for lbasename.
+
+2001-03-06  Zack Weinberg  <zackw@stanford.edu>
+
+	* aclocal.m4 (libiberty_AC_FUNC_C_ALLOCA): New.
+	* configure.in: Replace all alloca logic with a simple use of
+	the above new macro.
+	* config.table: Kill *-*-beos* entry.
+	* config/mh-beos: Delete.
+	* configure, config.in: Regenerate.
+
+	* Makefile.in (ALLOCA, HFILES): Kill.
+	(REQUIRED_OFILES): Add alloca.o.
+	(alloca.o): Depend on libiberty.h.
+	(argv.o): Don't depend on alloca-conf.h.
+	* alloca-conf.h: Delete.
+	* alloca.c: Include libiberty.h.  Kill all #ifdef emacs
+	blocks.  Provide the C alloca unconditionally.  Use PTR where
+	appropriate.  Make i00afunc static.
+	* argv.c: Don't include alloca-conf.h.
+
+2001-03-04  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* cplus-dem.c (main): Cast enum style to int.
+
+2001-02-16  Loren J. Rittle  <ljrittle@acm.org>
+
+	* cplus-dem.c (main): Initialize style.
+
+2001-02-02  Phil Edwards  <pme@sources.redhat.com>
+
+	* COPYING.LIB:  Update to LGPL 2.1 from the FSF.
+
+2001-01-31  Bryce McKinlay  <bryce@albatross.co.nz>
+
+	Add support for Java demangling under the v3 ABI:
+	* cp-demangle.c (NAMESPACE_SEPARATOR): New define.
+	(struct demangling_def): Add `style' field.
+	(demangling_new): New parameter `style'. Set it in demangling_t.
+	(demangle_prefix): Use NAMESPACE_SEPARATOR.
+	(demangle_type_ptr): Don't emit pointer symbol if doing Java output.
+	(cp_demangle): New parameter `style'. Pass it to demangling_new().
+	(main): Call cp_demangle with extra parameter.
+	(java_demangle_v3): New function.
+	(java_builtin_type_names): New. Table of primitive type names used
+	for Java demangling.
+	(demangle_builtin_type): Look up in java_builtin_type_names if doing
+	Java output.
+	* cplus-dem.c (cplus_demangle): Use java_demangle_v3 to do Java
+	demangling.
+	(long_options): Remove obsolete `java' option.
+	(main): Remove explicit handling of `java' option. Instead, pass style
+	parameter in cplus_demangle flags as gdb does.
+	* testsuite/demangle.expected: Add some Java test cases.
+
+2000-12-29  DJ Delorie  <dj@redhat.com>
+
+	* fnmatch.c: Make the note about the origins of this file more
+	accurate, at least until we can sync with glibc.
+	* getopt.c: Ditto.
+	* getopt1.c: Ditto.
+	* md5.c: Ditto.
+	* obstack.c: Ditto.
+
+2000-12-26  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* bsearch.c: New file.
+	* configure.in (funcs): Add bsearch.
+	(AC_CHECK_FUNCS): Likewise.
+	* configure, config.in: Regenerate.
+
+2000-12-13  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* safe-ctype.c: #include "ansidecl.h".
+	* strtod.c: Likewise.
+
+2000-12-13  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* strtoul.c: Include safe-ctype.h, not ctype.h.
+
+2000-12-07  Zack Weinberg  <zack@wolery.stanford.edu>
+
+	* safe-ctype.c: New file.
+	* Makefile.in (CFILES): Add safe-ctype.c.
+	(REQUIRED_OFILES): Add safe-ctype.o.
+
+	* argv.c: Define ISBLANK and use it, not isspace.
+	* basename.c, cplus-dem.c, fnmatch.c, pexecute.c, strtod.c,
+	strtol.c, strtoul.c: Include safe-ctype.h, not ctype.h.  Use
+	uppercase ctype macros.  Don't test ISUPPER(c)/ISLOWER(c)
+	before calling TOLOWER(c)/TOUPPER(c).
+
+2000-12-07  Mike Stump  <mrs@wrs.com>
+
+	* Makefile.in (distclean): When cleaning, remove testsuite.
+
+2000-12-05  Jason Merrill  <jason@redhat.com>
+
+	* cp-demangle.c (cplus_demangle_v3): Check that it's a v3 mangled
+	name before allocating the dyn_string.
+
+2000-12-04  Jason Merrill  <jason@redhat.com>
+
+	* cp-demangle.c: s/new_abi/v3/.
+	* cplus-dem.c: Likewise.
+	(current_demangling_style): Now auto_demangling.
+	(cplus_demangle): Try v3 demangling if AUTO_DEMANGLING.
+	(main): Use standard symbol chars for auto_demangling.
+
+2000-11-26  Mark Mitchell  <mark@codesourcery.com>
+
+	* hashtab.c (higher_prime_number): Use a table, rather than a
+	seive, to find the next prime.
+
+2000-11-22  H.J. Lu  <hjl@gnu.org>
+
+	* cplus-dem.c (main): Handle gnat_demangling.
+
+2000-11-22  Zack Weinberg  <zack@wolery.stanford.edu>
+
+	* aclocal.m4 (LIB_AC_PROG_CC): Moved here from configure.in.
+	(AC_DEFINE_NOAUTOHEADER): New - work around bug in autoheader.
+	* configure.in: Call AC_C_INLINE and AC_C_CONST.  Use three
+	argument form of AC_DEFINE in dummy definitions block.  Use
+	AC_DEFINE_NOAUTOHEADER for real definitions of things defined
+	in dummy block.  Preload cache variables instead of bypassing
+	tests, where possible.
+	* acconfig.h: Removed.
+
+	* xmalloc.c (xmalloc_failed): New function, does error
+	reporting on failed allocation.
+	(xmalloc, xcalloc, xrealloc): Use it.
+
+2000-11-21  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* cplus-dem.c (cplus_demangle): Fix formatting.
+	(grow_vect): Ditto.
+	(ada_demangle): Ditto.
+	(internal_cplus_demangle): Ditto.
+	(mop_up): Ditto.
+
+2000-11-21  H.J. Lu  <hjl@gnu.org>
+
+	* cplus-dem.c (main): Handle java_demangling.
+
+2000-11-19  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* cplus-dem.c (grow_vect): Prototype.
+	(ada_demangle): Cast the arg of ctype macros to unsigned char.
+
+2000-11-15  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* cplus-dem.c (ada_demangle): Add back ATTRIBUTE_UNUSED for
+	parameter `option'.
+
+2000-11-15  Kenneth Block  <kenneth.block@compaq.com>
+
+	* cplus-dem.c: Eliminate use of DEFUN, it is obsolete and cannot
+	be used in GCC.
+
+2000-11-15  Kenneth Block  <kenneth.block@compaq.com>
+
+	* cplus-dem.c: Add gnat demangler.  Add java to demangle style
+	list.
+
+2000-11-04  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* hashtab.c (htab_expand): Change to return int.  Use calloc or
+	xcalloc depending on htab->return_allocation_failure.  Return zero
+	if calloc fails.
+	(htab_create): Update comment to cover memory allocation.
+	(htab_try_create): New.
+	(htab_find_slot_with_hash): Return NULL if htab_expand fails.
+	Update comment to cover this.
+
+2000-11-03  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* hashtab.c: Change void * to PTR where necessary.
+	(htab_create, htab_expand): Correct formatting of comment before
+	function.
+
+2000-10-22  Alex Samuel  <samuel@codesourcery.com>
+
+	* cp-demangle.c (string_list_def): Add caret_position and comments.
+	(result_caret_pos): New macro.
+	(result_append_string): Rename to...
+	(result_add_string): ... this, and insert at caret position.
+	Rename throughout.
+	(result_append): Rename to...
+	(result_add): ... this, and insert at caret position.  Rename
+	throughout.
+	(result_append_char): Rename to...
+	(result_add_char): ... this, and insert at caret position.  Rename
+	throughout.
+	(result_append_space): Remove.
+	(string_list_new): Initialize caret position.
+	(result_add_separated_char): Use caret position.
+	(result_get_caret): New funtion.
+	(result_set_caret): Likewise.
+	(result_shift_caret): Likewise.
+	(result_previous_char_is_space): Likewise.
+	(substitution_start): Use caret position.
+	(substitution_add): Likewise.
+	(demangling_new): Initialize caret position.
+	(demangle_encoding): Use caret position.
+	(demanglin_nested_name): Put CV qualifiers after name.
+	(demangle_type_ptr): Use switch statement.  Handle pointers to
+	arrays.  Don't use result_append_space.  Use caret position.
+	(demangle_type): Emit CV qualifiers after underlying type.  Adjust
+	call to demangle_array_type.
+	(demangle_array_type): Add parameter to handle pointers to arrays.
+
+2000-10-01  Mark Mitchell  <mark@codesourcery.com>
+
+	* splay-tree.c (splay_tree_insert): Fix formatting.
+
+2000-09-16  Mark Mitchell  <mark@codesourcery.com>
+
+	* splay-tree.c (splay_tree_predecessor): Fix typo in comment.
+
+2000-09-14  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* splay-tree.c: #include <stdio.h>.
+
+2000-09-14  Hans-Peter Nilsson  <hp@axis.com>
+
+	* testsuite/demangle-expected: Add two tests for anonymous
+	namespaces.
+	* cplus-dem.c (gnu_special): Handle anonymous namespaces.
+
+2000-09-10  Mark Mitchell  <mark@codesourcery.com>
+
+	* splay-tree.c (splay_tree_predecessor): New function.
+	(splay_tree_successor): Likewise.
+
+2000-09-10  Hans-Peter Nilsson  <hp@axis.com>
+
+	* testsuite/demangle-expected: Add four tests for type_info
+	mangling.
+	* cplus-dem.c (gnu_special): Use do_type, not demangle_fund_type,
+	for a non-template non-qualified type_info function or node.
+
+2000-09-08  Alex Samuel  <samuel@codesourcery.com>
+
+	* cp-demangle.c: Fix copyright banner.
+
+2000-09-07  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* md5.c: #include "ansidecl.h".
+
+2000-09-06  Alex Samuel  <samuel@codesourcery.com>
+
+	* cp-demangle.c (status_allocation_failed): Rearrange whitespace.
+	(demangle_type): Handle substitution candidates correctly in the
+	face of special substitutions.
+
+2000-09-05  Alex Samuel  <samuel@codesourcery.com>
+
+	* cp-demangle.c (demangle_encoding): Rename variable.
+	(demangle_name): Rename parameter.  Handle return type
+	suppression.
+	(demangle_nested_name): Rename parameter.
+	(demangle_prefix): Likewise.  Change return type suppression.
+	(demangle_unqualified_name): Add parameter.  Flag constructors and
+	conversion operators.
+	(demangle_special_name): Fix comment.
+	(demangle_type): Rename variable.
+	(demangle_bare_function_type): Check for missing return type and
+	parameter.
+	(demangle_class_enum_type): Rename parameter.
+	(demangle_discriminator): Fix misspelling in comment.
+
+2000-08-31  DJ Delorie  <dj@redhat.com>
+
+	* configure.in (Cygwin): special case cygwin only when we're
+	building cygwin, not when we're hosting cygwin.
+
+2000-09-04  Alex Samuel  <samuel@codesourcery.com>
+
+	* cp-demangle.c (demangle_template_arg): Eat an `E' after an
+	<expression>.
+
+2000-09-04  Alex Samuel  <samuel@codesourcery.com>
+
+	* cp-demangle.c (demangle_type_ptr): Increment position past
+	pointer and reference characters.
+
+2000-09-04  Alex Samuel  <samuel@codesourcery.com>
+
+	* cp-demangle.c (demangle_nv_offset): New function.
+	(demangle_v_offset): Likewise.
+	(demangle_call_offset): Likewise.
+	(demangle_special_name): Update thunk demangling to comply with
+	ABI changes.
+
+2000-09-03  Alex Samuel  <samuel@codesourcery.com>
+
+	* cp-demangle.c (ANONYMOUS_NAMESPACE_PREFIX): New macro.
+	(substitution_def): Remove template_parm_number.
+	(NOT_TEMPLATE_PARM): Remove.
+	(result_insert_string): New macro.
+	(result_insert): Likewise.
+	(result_insert_char): Likewise.
+	(substitution_add): Remove last parameter.  Don't store template
+	parm number.
+	(BFT_NO_RETURN_TYPE): Define as NULL.
+	(demangle_encoding): Adjust call to demangle_bare_function_type.
+	(demangle_name): Adjust substitution.  Adjust call to
+	substitution_add.
+	(demangle_prefix): Adjust call to substitution_add.
+	(demangle_identifier): Handle anonymous namespaces.
+	(demangle_operator_name): Change demangling of vendor-extended
+	operator to match ABI changes.
+	(demangle_type_ptr): Change parameters.  Make recursive.  Handle
+	substitutions here.
+	(demangle_type): Adjust calls to demangle_template_param,
+	substitution_add, and demangle_type_ptr.  Fix substitution of
+	templated types.
+	(demangle_function_type): Change parameter to a pointer.
+	(demangle_bare_function_type): Likewise.  Adjust insertion point.
+	(demangle_template_param): Remove last parameter.
+	(demangle_expr_primary): Remove unused variable.  Adjust call to
+	demangle_template_param.
+	(is_mangled_char): Accept `$' and `.'.
+	* cplus-dem.c (gnu_new_abi_symbol_characters): Add '$' and '.'.
+	* dyn-string.c (dyn_string_insert_char): New function.
+
+2000-08-31  Hans-Peter Nilsson  <hp@axis.com>
+
+	* testsuite/demangle-expected: Add nine tests for
+	underscore-after-number followed by five tests for name-signature
+	delimiter.
+
+2000-08-28  Richard Henderson  <rth@cygnus.com>
+
+	* Makefile.in (md5.o): Depend on config.h.
+
+2000-08-28  Jason Merrill  <jason@redhat.com>
+
+	* Makefile.in (REQUIRED_OFILES): Add md5.o.
+	(CFILES): Add md5.c.
+	* md5.c: New file.
+
+2000-08-27  Alex Samuel  <samuel@codesourcery.com>
+
+	* cp-demangle.c (demangle_name): Initialize template_p in local
+	name case.  Don't re-add substitutions as candidates.
+	(demangle_nested_name): Use <unqualified-name>.
+	(demangle_prefix): Likewise.  Don't add template names as
+	substitution candidates twice, or re-add a substitution or the
+	last prefix component.
+	(demangle_local_name): Adjust output format.
+
+2000-08-25  Alex Samuel  <samuel@codesourcery.com>
+
+	* cp-demangle.c (result_add_separated_char): Change parameter to
+	int.
+	(substitution_add): Don't check for duplicates.  Check if
+	previously allocated size is zero.
+	(demangle_name): Remove duplicate check for std substitution.
+	Clear template flag appropriately.
+	(demangle_prefix): Remove argument to demangle_substitution.
+	Don't check that template flag is already set.
+	(demangle_operator_name): Add pt operator.
+	(demangle_type): Don't treat r as built-in type.  Remove argument
+	to demangle_substitution.  Fix substitution candidate mechanics.
+	Handle <template-template-parm>s.  Improve comments.
+	(demangle_template_param): Don't handle template arg lists here.
+	(demangle_substitution): Remove parameter.
+	(print_usage): Remove extra fprintf option.
+
+2000-08-24  Greg McGary  <greg@mcgary.org>
+
+	* libiberty/random.c (end_ptr): Revert previous change.
+
+2000-08-24  Greg McGary  <greg@mcgary.org>
+
+	* libiberty/cplus-dem.c (cplus_demangle_opname, cplus_mangle_opname,
+	demangle_expression, demangle_function_name): Use ARRAY_SIZE.
+	* libiberty/random.c (end_ptr): Likewise.
+
+2000-08-23  Alex Samuel  <samuel@codesourcery.com>
+
+	* cp-demangle.c (result_close_template_list): Remove function.
+	(result_add_separated_char): New function.
+	(result_open_template_list): New macro.
+	(result_close_template_list): Likewise.
+	(demangle_prefix): Don't set template_p if the
+	prefix ends with a ctor name.
+	(demangle_type_ptr): Remove duplicate RETURN_IF_ERROR.
+	(demangle_type): Check for template args after substitution.
+	(demangle_template_args): Use result_open_template_list.
+
+2000-08-02  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* pexecute.c:  Don't use vfork.  Initialize 'pid' before retry loop.
+
+2000-07-26  Dave Pitts  <dpitts@cozx.com>
+
+	* config/mh-openedition.h: Added -DLE370 definition.
+
+2000-07-26 Mark Elbrecht <snowball3@bigfoot.com>
+
+	* pexecute.c (pexecute) [__MSDOS__]: Change __GO32__ to
+	__DJGPP__. Use P_WAIT instead of constant in the spawnv* call.
+	Cast program to 'char *' in errmsg_arg assignment.
+	(PWAIT_ERROR): Define.
+	(pwait): Use PWAIT_ERROR.  Adjust DJGPP's status code to conform
+	to DJGPP's WIF* macros.
+
+2000-07-27  RodneyBrown  <RodneyBrown@pmsc.com>
+	    Jeff Law <law@cygnus.com>
+
+	* getcwd.c: Include string.h, stdlib.h for prototypes
+
+	* Makefile.in (rename.o, waitpid.o): Depend on config.h
+	* rename.c: Include config.h, unistd.h
+	* waitpid.c: Include config.h, sys/wait.h
+
+2000-07-24  Hans-Peter Nilsson  <hp@axis.com>
+
+	* cplus-dem.c (work_stuff_copy_to_from): New.
+	(delete_non_B_K_work_stuff): New.
+	(delete_work_stuff): New.
+	(mop_up): Break out work_stuff partly destruction to
+	delete_non_B_K_work_stuff.
+	(iterate_demangle_function): New.
+	(demangle_prefix): Call iterate_demangle_function instead of
+	demangle_function_name.  Leave handling of name-signature
+	__-delimiters to iterate_demangle_function.
+	(demangle_integral_value): Strip an optional
+	following underscore cautiously.  Handle negative numbers.
+
+2000-07-24  Daniel Berlin <dberlin@redhat.com>
+
+	* cplus-dem.c (demangle_signature): Change if (GNU_DEMANGLING) to
+	if (AUTO_DEMANGLING || GNU_DEMANGLING)
+
+2000-07-21  Alex Samuel  <samuel@codesourcery.com>
+
+	* cp-demangle.c (demangle_ctor_dtor_name): Remove not-in-charge
+	allocating ctor mangling.
+	(demangle_array_type): Handle empty and non-constant array length.
+
+2000-07-23  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+	    Jeff Law <law@cygnus.com>
+
+	* configure.in (AC_CHECK_HEADERS): Add time.h.
+	(AC_HEADER_TIME): Add check.
+	* configure, config.in: Regenerate.
+	* getruntime.c: Portably #include <sys/time.h> and/or <time.h>.
+
+	* configure.in (AC_CHECK_HEADERS): Add limits.h.
+	* configure, config.in: Regenerate.
+	* sort.c: Portably #include <limits.h> and/or <sys/param.h>.
+	* strtol.c, strtoul.c: #include "config.h". Portably #include
+	<limits.h> and/or <sys/param.h>.
+	* Makefile.in (strtol.o, strtoul.o): Update dependencies.
+
+	* aclocal.m4 (libiberty_AC_DECLARE_ERRNO): New macro.
+	* configure.in (libiberty_AC_DECLARE_ERRNO): Add check.
+	* configure, config.in: Regenerate.
+	* pexecute.c, strtol.c, strtoul.c: Declare errno if necessary.
+
+	* cp-demangle.c, mkstemps.c: #include <sys/types.h>.
+
+2000-07-21  Mike Stump  <mrs@wrs.com>
+
+	* Makefile.in (xexit.o): Add dependency for config.h in xexit.c.
+	* (vasprintf.o): Add dependency for config.h in vasprintf.c.
+
+2000-07-21  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* cp-demangle.c (cp_demangle_type): Wrap in IN_LIBGCC2.
+
+	* setenv.c (setenv): Initialize variable `ep'.
+
+	* sigsetmask.c (abort): Prototype.
+
+	* vasprintf.c: Include config.h.  Check ANSI_PROTOTYPES, not
+	__STDC__ for stdarg.h include.
+	(int_vasprintf): Prototype.
+	(checkit): Prototype.  Use VPARAMS/ANSI_PROTOTYPES/VA_START in
+	definition.  Cast `global_total_width' in comparison.
+	(main): Prototype.  Return a value.
+
+	* vfork.c (fork): Prototype.
+
+	* xexit.c: Include config.h.
+
+2000-07-20  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* cplus-dem.c (demangle_fund_type): Make 'dec' an unsigned int,
+	and print it with %u.
+
+2000-07-17  Hans-Peter Nilsson  <hp@axis.com>
+
+	* testsuite/regress-demangle (failed test): Show result and
+	expected output.
+
+2000-07-07  Andrew Haley  <aph@cygnus.com>
+
+	* cplus-dem.c (main): fflush() after emitting last char before
+	waiting for input.
+
+2000-06-28  Alex Samuel  <samuel@codesourcery.com>
+
+	* cp-demangle.c (demangle_encoding): Accept no substitutions.
+	(demangle_name): Handle <substitution> followed by
+	<unqualified-template-name>.
+	(demangle_type): Follow special substitutions with
+	<class-enum-type>
+	(demangle_subtitution): Set template_p for special substitutions.
+	(main): Fix typos.
+
+2000-06-27  Alex Samuel  <samuel@codesourcery.com>
+
+	* cp-demangle.c (demangle_special_name): Swap base and derived
+	class when demangling construction vtables.
+
+2000-06-21  Alex Samuel  <samuel@codesourcery.com>
+
+	* cp-demangle.c: Don't include ctype.h.
+	(IS_DIGIT): New macro.
+	(IS_ALPHA): Likewise.  Use IS_DIGIT and IS_ALPHA throughout
+	instead of isdigit and isalpanum.
+	(demangling_def): Make name and next const pointers.
+	(STATUS_ALLOCATION_FAILED): New status code.
+	(dyn_string_append_space): Handle failure in
+	dyn_string_append_char.
+	(int_to_dyn_string): Likewise.  Change return value to status_t.
+	(string_list_new): Handle failure of dyn_string_init.
+	(result_close_template_list): Change return type to status_t.
+	Handle failure in dyn_string_append.
+	(result_push): Change return value to status_t.  Handle failure in
+	string_list_new.  Handle failure of result_push throughout.
+	(substitution_add): Change return value to status_t.  Handle
+	dyn_string failures.  Handle failure of substitution_add
+	throughout.
+	(template_arg_list_new): Return NULL on allocation failure.
+	(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
+	Handle error result throughout.
+	(result_append): Likewise.
+	(result_append_char): Likewise.
+	(result_append_space): Likewise.
+	(demangling_new): Make argument a const pointer.  Handle
+	allocation failures.
+	(demangle_template_args): Handle failure in template_arg_list_new
+	and result_close_template_list.
+	(demangle_discriminator): Return if int_to_dyn_string fails.
+	(cp_demangle): Likewise.
+	(cp_demangle_type): New function.
+	(cplus_demangle_new_abi): Don't call dyn_string_delete.  Abort on
+	memory allocation failure.
+	(main): Likewise.
+	* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
+	IN_LIBGCC2.
+	(dyn_string_init): Change return value to int.  Handle
+	RETURN_ON_ALLOCATION_FAILURE case.
+	(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
+	(dyn_string_release): Delete the dyn_string.
+	(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
+	(dyn_string_copy): Change return type to int.
+	(dyn_string_copy_cstr): Likewise.
+	(dyn_string_prepend): Likewise.
+	(dyn_string_prepend_cstr): Likewise.
+	(dyn_string_insert): Likewise.
+	(dyn_string_insert_cstr): Likewise.
+	(dyn_string_append): Likewise.
+	(dyn_string_append_cstr): Likewise.
+	(dyn_string_append_char): Likewise.
+	(dyn_string_substring): Likewise.
+
+2000-06-09  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* cp-demangle.c (demangle_operator_name): Add spaces before
+	names beginning with a letter: delete, delete[], new, new[],
+	sizeof.
+	(demangle_special_name): Handle TF <type> and TJ <type>.
+
+Thu Jun  8 18:52:24 2000  Philippe De Muyter  <phdm@macqel.be>
+
+	* cp-demangle.c (template_arg_list_new): Revert previous PARAMS patch.
+
+Thu Jun  8 09:25:54 2000  Philippe De Muyter  <phdm@macqel.be>
+
+	* cp-demangle.c (stdio.h): File included unconditionaly.
+	(template_arg_list_new): Parameter list is PARAMS ((void)), not ().
+	* dyn-string.c (stdio.h): File included.
+	* partition.c (partition_print): No `&' needed to take the address of
+	a function.
+
+2000-06-07  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.in (ac_libiberty_warn_cflags): Add -pedantic.
+
+	* choose-temp.c (try, choose_temp_base, make_temp_file): Constify.
+
+	* cp-demangle.c (demangle_char): Change parameter from char to int.
+	(demangle_expression, demangle_expr_primary): Remove extra
+	semi-colon in prototype.
+
+	* dyn-string.c (dyn_string_append_char): Change parameter from
+	char to int.
+
+	* memcmp.c (memcmp): Constify.
+
+	* mkstemps.c (gcc_uint64_t): Mark GNUC `long long' case with
+	__extension__.
+
+	* partition.c (elem_compare): Prototype.  Don't cast away
+	const-ness.
+
+	* setenv.c (setenv): Use braces to avoid ambiguous `else'.
+
+2000-06-07  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* Makefile.in (cp-demangle.o): Depend on $(INCDIR)/demangle.h.
+
+	* cp-demangle.c: Include demangle.h.
+	(template_arg_list_new): DeANSIfy.
+	(cp_demangle): Make static and add prototype.
+	(operator_code, operators): Constify.
+	(demangle_operator_name): Likewise for variables `p1', `p2' and `p'.
+
+2000-06-05  Alex Samuel  <samuel@codesourcery.com>
+
+	* cp-demangle.c (demangle_prefix): Cast argument to isdigit to
+	unsigned char.
+	(demangle_unqualified_name): Likewise.
+	(demangle_number_literally): Likewise.
+	(demangle_type): Likewise.
+	(demangle_substitution): Likewise.
+	(is_mangled_char): Likewise, for isalnum.
+
+2000-06-04  Alex Samuel  <samuel@codesourcery.com>
+
+	* Makefile.in (CFILES): Add cp-demangle.c and dyn-string.c.
+	(REQUIRED_OFILES): Add cp-demangle.o and dyn-string.o.
+	(cp-demangle.o): New dependency.
+	(dyn-string.o): Likewise.
+
+	* dyn-string.c: Move here from gcc/dyn-string.c.  Add new functions.
+
+	* cplus-dem.c (libiberty_demanglers): Add initializer for new-ABI
+	demangler.
+	(cplus_demangle): Call cplus_demangle_new_abi if in new-ABI
+	demangling mode.
+	(gnu_new_abi_symbol_characters): New function.
+	(main): Use gnu_new_abi_symbol_characters.  * cp-demangle.c: New
+	file.
+	* cp-demangle.c: New file.
+
+Tue May 30 16:45:25 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* floatformat.c: Add name to each floatformat field.
+
+Tue May 30 15:07:52 2000  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (objalloc.o): Depend on config.h
+
+2000-05-29  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* hashtab.c, partition.c, sort.c, xmemdup.c: Include string.h
+	if HAVE_STRING_H.
+	* pexecute.c, xexit.c: Include stdlib.h if HAVE_STDLIB_H.
+	* objalloc.c: Include config.h.  Include stdlib.h and don't
+	declare malloc or free if HAVE_STDLIB_H.
+	* strerror.c, strsignal.c: Include stdlib.h if HAVE_STDLIB_H,
+	else declare malloc without prototype.  Include string.h if
+	HAVE_STRING_H, else declare memset without prototype.  Don't
+	include stddef.h.
+
+2000-05-23  Mike Stump  <mrs@wrs.com>
+
+	* Makefile.in (xmalloc.o): Add dependency for config.h, fixes make
+	-j3.
+
+2000-05-18  J. David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* xmalloc.c: Include config.h for HAVE_SBRK definition.
+
+2000-05-16  Horst von Brand <vonbrand@sleipnir.valparaiso.cl>
+
+	* hashtab.c (hash_pointer): Delete low-order bits which are
+	probably zero, also eliminate a warning on alpha.
+
+2000-05-15  David Edelsohn  <edelsohn@gnu.org>
+
+	* Makefile.in: Change "pic" to depend on $(PICFLAG), not
+	on $(enable_shared).
+
+2000-05-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* config.table: Use mh-sparcpic for sparc*-*-*.
+
+2000-05-08  Nick Clifton  <nickc@cygnus.com>
+
+	* Makefile.in (CFILES): Add strncmp.c.
+	(NEEDED): Add strncmp.
+
+2000-05-04  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* cplus-dem.c (cplus_demangle_opname, demangle_function_name):
+	Cast the arguments to `islower' to `unsigned char'.
+	(print_demangler_list): Prototype.
+
+Thu May  4 17:14:41 2000  Philippe De Muyter  <phdm@macqel.be>
+
+	* sort.c (UCHAR_MAX): Provide fallback definition.
+
+2000-04-29  Alexandre Oliva  <aoliva@cygnus.com>
+
+	* Makefile.in (maintainer-clean-subdir): Fix handling of empty
+	SUBDIRS.
+
+2000-04-28  Kenneth Block  <block@zk3.dec.com>
+	    Jason Merrill  <jason@casey.cygnus.com>
+
+	* cplus-dem.c (libiberty_demanglers): New table for demangle styles.
+	(cplus_demangle_set_style): New function for setting style.
+	(cplus_demangle_name_to_style): New function to translate name.
+
+2000-04-27  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* aclocal.m4: New file with new test libiberty_AC_FUNC_STRNCMP.
+
+	* configure.in (AC_CHECK_HEADERS): Add sys/mman.h fcntl.h.
+	(libiberty_AC_FUNC_STRNCMP): Invoke.
+
+	* strncmp.c: New file.
+
+Thu Apr 27 16:58:43 MET DST 2000  Jan Hubicka  <jh@suse.cz>
+
+	* hashtab.c (htab_expand): Add prototype.
+	(find_empty_slot_for_expand): Likewise.
+
+2000-04-24  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* hashtab.c (hash_pointer, eq_pointer): Make definition static to
+	match prototype.
+	(htab_expand): Cast the return value of xcalloc.
+
+2000-04-24  Mark Mitchell  <mark@codesourcery.com>
+
+	* hashtab.c (hash_pointer): New function.
+	(eq_pointer): Likewise.
+	(htab_hash_pointer): New variable.
+	(htab_eq_pointer): Likewise.
+
+2000-04-23  Mark Mitchell  <mark@codesourcery.com>
+
+	* sort.c (sort_pointers): Fix endianness bugs.
+
+	* sort.c: New file.
+	* Makefile.in (CFILES): Add sort.c
+	(REQUIRED_OFILES): Add sort.o.
+	(sort.o): New target.
+
+2000-04-21  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+	* Makefile.in (*-subdir): Revamp slightly to avoid losing on
+	4.3BSD systems.
+
+Tue Apr 18 16:23:31 2000  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
+
+	* hashtab.c: Various minor cleanups.
+	(htab_find_slot_with_hash): INSERT is now enum insert_option.
+	(htab_find_slot): Likewise.
+
+2000-04-16  Dave Pitts  <dpitts@cozx.com>
+
+	* cplus-dem.c (cplus_demangle_opname): Changed to use islower.
+
+2000-04-05  Richard Henderson  <rth@cygnus.com>
+
+	* splay-tree.c (splay_tree_remove): New.
+
+2000-03-30  Mark Mitchell  <mark@codesourcery.com>
+
+	* hashtab.c (find_empty_slot_for_expand): Use hashval_t for hash
+	codes.
+	(htab_find_with_hash): Likewise.
+	(htab_find_slot_with_hash): Likewise.
+
+2000-03-29  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* hashtab.c (htab_find_with_hash): Avoid calculating hash2
+	unless it will be used.  Rearrange loop for better
+	optimization.
+	(higher_prime_number): Add static prototype.
+
+Thu Mar 16 01:33:58 2000  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (partition.o): Depend on config.h
+
+2000-03-14  Bernd Schmidt  <bernds@cygnus.co.uk>
+
+	* hashtab.c (find_empty_slot_for_expand): New function.
+	(htab_expand): Use it instead of htab_find_slot.
+	(htab_find_with_hash): Renamed from htab_find; now accepts extra
+	argument HASH.
+	(htab_find_slot_with_hash): Likewise for htab_find_slot.
+	(htab_find): New wrapper function.
+	(htab_find_slot): Likewise.
+	(htab_traverse): Pass slot, not entry, to called function.
+
+2000-03-09  Alex Samuel  <samuel@codesourcery.com>
+
+	* Makefile.in (CFILES): Add partition.c.
+	(REQUIRED_OFILES): Add partition.o.
+	(partition.o): New rule.
+	* partition.c: New file.
+
+2000-03-09  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* hashtab.c (htab_create): Set del_f.
+	(htab_delete, htab_empty, htab_remove_elt, htab_clear_slot):
+	Use it.
+
+2000-03-08  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* hashtab.c: Remove debugging variables (all_searches,
+	all_collisions, all_expansions). Delete
+	all_hash_table_collisions.
+	(create_hash_table, delete_hash_table, empty_hash_table,
+	find_hash_table_entry, remove_element_from_hash_table_entry,
+	clear_hash_table_slot, traverse_hash_table, hash_table_size,
+	hash_table_elements_number, hash_table_collisions): Rename to:
+	htab_create, htab_delete, htab_empty, htab_find_slot,
+	htab_remove_elt, htab_clear_slot, htab_traverse, htab_size,
+	htab_elements, htab_collisions.
+	(htab_find): New function, handles common case where you don't
+	plan to add or delete an entry.
+	(htab_expand): Don't create a whole new table, just a new
+	entry vector.
+	(htab_find_slot): Simplify logic.
+
+1999-08-03  Ian Lance Taylor  <ian@zembu.com>
+
+	* floatformat.c: Add casts to avoid signed/unsigned warnings.
+	* pexecute.c: Add ATTRIBUTE_UNUSED as needed on Unix.
+
+	* Makefile.in (install_to_libdir): Change $(TARGETLIB).n to
+	$(TARGETLIB)n so it works on MSDOS.
+	(install_to_tooldir): Likewise.
+
+1999-07-21  Ian Lance Taylor  <ian@zembu.com>
+
+	From Mark Elbrecht:
+	* makefile.dos: Remove; obsolete.
+	* configure.bat: Remove; obsolete.
+
+1999-07-11  Ian Lance Taylor  <ian@zembu.com>
+
+	* splay-tree.c (splay_tree_insert): Add initialization to avoid
+	warning.
+
+2000-01-04  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* pexecute.c: Conditionally include string.h.
+	(fix_argv): Handle embedded whitespace in args for Mingw32.
+
+2000-01-04  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.in (ac_libiberty_warn_cflags): Turn on warnings if
+	we're using gcc.
+
+	* Makefile.in (COMPILE.c): Add @ac_libiberty_warn_cflags@
+
+1999-12-27  Geoff Keating  <geoffk@cygnus.com>
+
+	* vasprintf.c (int_vasprintf): Don't re-read the format character
+	as this mishandles strings like '%%s'.
+
+1999-12-05  Mark Mitchell  <mark@codesourcery.com>
+
+	* splay-tree.c (splay_tree_new): Use struct splay_tree_node_s
+	rather than struct splay_tree_node.
+	(splay_tree_insert): Use struct splay_tree_s rather than struct
+	splay_tree.
+
+Sun Nov 28 00:59:39 1999  Philippe De Muyter  <phdm@macqel.be>
+
+	* hashtab.c (sys/types.h): File included.
+
+1999-11-22  Jason Merrill  <jason@casey.cygnus.com>
+
+	* strtoul.c, strtol.c, random.c: Remove advertising clause from
+	BSD license, pursuant with
+
+	  ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
+
+Wed Nov 10 09:42:39 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* hashtab.c: Include stdio.h.
+
+Mon Nov  8 09:23:41 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* hashtab.c (traverse_hash_table): Protect prototype with PARAMS.
+
+Tue Nov  2 03:23:13 1999  Philippe De Muyter  <phdm@macqel.be>
+
+	* xstrdup (sys/types.h): Include this file.
+
+1999-10-28  Nathan Sidwell  <nathan@acm.org>
+
+	* Makefile.in (SUBDIRS): New macro.
+	(mostlyclean, clean, distclean, maintainer-clean): Adjust to
+	avoid multiple subdirectory cleaning.
+	(*-subdir): Use SUBDIRS.
+
+1999-10-25  Jim Kingdon  <http://developer.redhat.com/>
+
+	* cplus-dem.c: Move declarations of standard_symbol_characters and
+	hp_symbol_characters inside #ifdef MAIN to avoid compiler
+	warnings.
+
+1999-10-23 08:51 -0700  Zack Weinberg  <zack@bitmover.com>
+
+	* hashtab.c (find_hash_table_entry): When returning a
+	DELETED_ENTRY slot, change it to EMPTY_ENTRY first.
+	(clear_hash_table_slot): New function which deletes an entry
+	by its position in the table, not its value.
+	(traverse_hash_table): New function which calls a hook
+	function for every live entry in the table.
+
+1999-10-19  Mark Mitchell  <mark@codesourcery.com>
+
+	* cplus-dem.c (INTBUF_SIZE): New macro.
+	(string_append_template_idx): New function.
+	(demangle_expression): Likewise.
+	(demangle_integral_value): Use it.
+	(demangle_real_value): New function, split out from ...
+	(demangle_template_value_parm): ... here.  Use
+	string_append_template_idx.  Use demangle_real_value.
+	(demangle_template): Use string_append_template_idx.
+	(demangle_qualified): Use consume_count_with_underscores.
+	(get_count): Tweak formatting.
+	(do_type): Use string_append_template_idx.
+
+1999-10-18  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* calloc.c: Add a public domain notice.
+
+Mon Oct 18 02:30:47 1999  Philippe De Muyter  <phdm@macqel.be>
+
+	* setenv.c (sys/types.h, stdio.h): Include those files unconditionaly.
+
+Fri Oct 15 01:47:51 1999  Vladimir Makarov  <vmakarov@loony.cygnus.com>
+
+	* Makefile.in (CFILES): Add hashtab.c
+	(REQUIRED_OFILES): Add hashtab.o
+	(hashtab.o): Add dependencies.
+	* hashtab.c: New file
+
+Wed Oct 13 01:16:47 1999  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* basename.c (DIR_SEPARATOR): New macro.
+	(DIR_SEPARATOR_2): Likewise.
+	(HAVE_DOS_BASED_FILESYSTEM): Likewise.
+	(IS_DIR_SEPARATOR): Likewise.
+	(main): Handle MSDOS style pathname.
+
+1999-10-11  Mark Mitchell  <mark@codesourcery.com>
+
+	* cplus-dem.c (do_type): Handle pointer to member types whose
+	enclosing classes have namespace scope.
+
+Sun Oct 10 01:23:50 1999  Marc Espie <espie@cvs.openbsd.org>
+
+	* config.table:  Provide a backup shell for executing move-if-change.
+
+1999-10-02  Mark Mitchell  <mark@codesourcery.com>
+
+	* xmalloc.c (xmalloc): Fix spelling error.
+	(xcalloc, xrealloc): Likewise.
+
+1999-10-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* cplus-dem.c (fancy_abort, demangle_integral_value,
+	demangle_arm_hp_template, recursively_demangle,
+	standard_symbol_characters, hp_symbol_characters, main): Add prototype.
+	(program_name, program_version, fatal): Constify a char*.
+	(usage, fatal): Mark with ATTRIBUTE_NORETURN.
+	(main): Call return, not exit.
+
+1999-09-25  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* choose-temp.c: Remove obsolete comment about gcc.
+	(make_temp_file): Constify a char*.
+
+Wed Sep  8 20:03:28 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* xmemdup.c: Include sys/types.h.
+
+1999-09-07  Jeff Garzik  <jgarzik@pobox.com>
+
+	* xmemdup.c: New xmemdup function.
+	* Makefile.in, makefile.vms, vmsbuild.com:  Use xmemdup.[co].
+
+Tue Sep  7 23:32:18 1999  Linas Vepstas  <linas@linas.org>
+
+	* config.table: Add openedition target.
+	* config/mh-openedition: New file.
+
+Thu Sep  2 01:36:12 1999  Marc Espie <espie@cvs.openbsd.org>
+
+	* pexecute.c (pexecute):  Fill in temp_base when needed.
+
+1999-08-31  Richard Henderson  <rth@cygnus.com>
+
+	* getpwd.c: Check HAVE_GETCWD before defining it away.
+
+1999-08-30  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* Makefile.in (CFILES): Add calloc.c and getpwd.c.
+	(REQUIRED_OFILES): Add getpwd.o.
+	(getpwd.o): Add target.
+
+	* configure.in (AC_PREREQ): Bump to 2.13.
+	(AC_CHECK_HEADERS): Add check for <sys/stat.h>.
+
+	* getpwd.c: New file, moved here from gcc.
+
+1999-08-25  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* cplus-dem.c (gnu_special): Cast a `size_t' to `long' when
+	comparing against a signed quantity.
+	(arm_special): Likewise.
+	(demangle_fund_type): Likewise.
+	(do_hpacc_template_const_value): Mark parameter `work' with
+	ATTRIBUTE_UNUSED.
+	(main): Constify variable `valid_symbols'.
+
+Tue Aug 24 02:50:45 1999  Philippe De Muyter  <phdm@macqel.be>
+
+	* strtoul.c (strtoul): Add parentheses around && within ||.
+
+Fri Aug  6 23:32:29 1999  Daniel Jacobowitz <drow@drow.them.org>
+
+	* Makefile.in (FLAGS_TO_PASS): Include prefix, exec_prefix,
+	libdir, libsubdir and tooldir.
+
+1999-08-01  Mark Mitchell  <mark@codesourcery.com>
+
+	* splay-tree.c (splay_tree_insert): Return the new node.
+
+1999-07-14  Richard Henderson  <rth@cygnus.com>
+
+	* argv.c: Include stdlib.h and string.h instead of
+	prototyping directly.
+	* choose-temp.c: Conditionally include string.h.
+
+1999-07-12  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* Makefile.in (NEEDED): Add bcmp, bcopy, bzero.
+
+1999-07-11  Ian Lance Taylor  <ian@zembu.com>
+
+	* splay-tree.c (splay_tree_insert): Add initialization to avoid
+	warning.
+
+1999-07-07  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* Makefile.in (needed-list): Only include stuff we actually need
+	for libstdc++.
+
+1999-06-21  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* configure.in (checkfuncs): Add gettimeofday.
+	* config.in, configure: Regenerated.
+
+Mon Jun 21 05:56:01 1999  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* configure.in (*-*-uwin*): UWIN has sys_{errlist,nerr} even if
+	the test fails.
+	* configure: Regenerate.
+
+1999-06-10  Mike Stump  <mrs@wrs.com>
+
+	* Makefile.in (setenv.o): Add config.h dep for setenv.o to fix
+	parallel builds.
+
+1999-05-28  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* putenv.c: Include ansidecl.h to define `const'.
+	* setenv.c: Likewise.
+
+Wed May 26 03:58:20 1999  "Melissa O'Neill" <oneill@cs.sfu.ca>
+
+	* Makefile.in (CFILES): Add putenv.c and setenv.c.
+	* configure.in (funcs): Add putenv and setenv.
+	(AC_CHECK_FUNCS): Check for putenv and setenv.
+	* configure: Rebuilt.
+	* putenv.c setenv.c: New files.
+
+	* getcwd.c (getcwd): If pathname is NULL, then obtain SIZE
+	bytes of space using malloc.
+
+Mon May 17 01:42:34 1999  Stu Grossman  <grossman@babylon-5.cygnus.com>
+
+	* cplus-dem.c (demangle_fund_type (near 'I' case)): Don't advance
+	the *mangled pointer beyond the end of the string.  Clean up code to
+	match prevailing coding style.
+
+1999-05-13  Michael Hayes  <m.hayes@elec.canterbury.ac.nz>
+
+	* tmpnam.c (L_tmpnam): Fix typo.
+
+Thu May 13 01:14:46 1999 Marc Espie <espie@cvs.openbsd.org>
+
+	* cplus-dem.c (standard_symbol_characters): Renamed from
+	standard_symbol_alphabet.  No longer modify TABLE.
+	(hp_symbol_characters): Renamed from hp_symbol_alphabet.  No longer
+	modify TABLE.
+	(main): Corresponding changes.  Use strchr to determine if a
+	character is valid.
+
+1999-05-11  Jim Blandy  <jimb@zwingli.cygnus.com>
+
+	* cplus-dem.c (main): Use table lookup to distinguish identifier
+	characters from non-identifier characters.
+	(standard_symbol_alphabet, hp_symbol_alphabet): New functions.
+
+Thu May  6 20:34:42 1999  Fred Fish  <fnf@be.com>
+
+	* configure.in (sys/resource.h): Add to AC_CHECK_HEADERS list.
+	* getruntime.c: Only attempt to include sys/resource.h and
+	use getrusage if both HAVE_GETRUSAGE and HAVE_SYS_RESOURCE_H
+	are defined.
+
+Mon Apr 26 01:36:06 1999  Donn Terry (donn@interix.com)
+
+	* configure.in (alloca detection): Handle alloca directly for interix.
+	* configure: Rebuilt.
+
+Sun Apr 25 01:18:21 1999  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* choose-temp.c (DIR_SEPARATOR): Use '\\' only for native windows32.
+
+1999-04-20  Jim Blandy  <jimb@zwingli.cygnus.com>
+
+	Fix from Dale Hawkins:
+	* cplus-dem.c (mop_up): Set typevec_size to zero, so it'll be
+	reallocated properly if we use it again.
+
+	* cplus-dem.c (demangle_fund_type): Check for buffer overrun.  Be
+	stricter about syntax.  Always null-terminate string.
+
+Thu Apr 15 23:00:55 1999  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* configure.in (checkfuncs): Check for sbrk.
+	* config.in: Rebuilt.
+	* configure: Likewise.
+	* xmalloc.c: Use HAVE_SBRK instead of the host specific definitions.
+
+1999-04-12  Jim Blandy  <jimb@zwingli.cygnus.com>
+
+	Fix from Marcus Daniels:
+	* cplus-dem.c (demangle_fund_type): Don't run off the end of the
+	identifier looking for another underscore.
+
+Sun Apr 11 23:20:59 1999  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* pexecute.c: Change all references to __UWIN__ to _UWIN.
+	* xmalloc.c: Likewise.
+	(xcalloc): UWIN has sbrk.
+	(xrealloc): Fix guard macro.
+
+1999-04-11  Richard Henderson  <rth@cygnus.com>
+
+	* alloca-conf.h (alloca) [C_ALLOCA]: Don't use Gcc builtin
+	or <alloca.h>.
+	* clock.c (GNU_HZ): New definition.
+	(clock): Use it.
+	* getruntime.c: Likewise.
+
+	* config.table: Use mh-beos.
+	* config/mh-beos: New file.
+
+1999-04-11  Mark Mitchell  <mark@codesourcery.com>
+
+	* cplus-dem.c (demangle_template_value_parm): Handle
+	pointers-to-members.
+	(do_type): Handle template parameters as qualifiers.
+
+1999-04-01  Jim Blandy  <jimb@zwingli.cygnus.com>
+
+	* cplus-dem.c: Attempt to handle overflows in counts with some
+	semblance of grace.
+	(consume_count): Detect overflows.  Return -1 to indicate errors,
+	instead of zero.
+	(demangle_template_value_parm, demangle_template): Handle change
+	to consume_count's return convention.
+
+1999-04-05  Tom Tromey  <tromey@cygnus.com>
+
+	* testsuite/regress-demangle: New file.
+	* testsuite/demangle-expected: New file.
+
+	* Makefile.in (all, check, installcheck, info, install-info,
+	clean-info, dvi, install, etags, tags, mostlyclean, clean,
+	distclean, maintainer-clean, realclean): Depend on corresponding
+	`-subdir' target.
+	(all-subdir check-subdir installcheck-subdir info-subdir
+	install-info-subdir clean-info-subdir dvi-subdir
+	install-info-subdir etags-subdir mostlyclean-subdir clean-subdir
+	distclean-subdir maintainer-clean-subdir): New target.
+	* testsuite/Makefile.in: New file.
+	* configure: Rebuilt.
+	* configure.in: Create testsuite/Makefile.
+
+1999-04-02  Mark Mitchell  <mark@codesourcery.com>
+
+	* splay-tree.h (splay_tree_compare_pointers): Define.
+
+1999-03-30  Mark Mitchell  <mark@codesourcery.com>
+
+	* splay-tree.c (splay_tree_compare_ints): Define.
+
+1999-03-30  Tom Tromey  <tromey@cygnus.com>
+
+	* cplus-dem.c (consume_count): If `count' wraps, return 0 and
+	don't advance input pointer.
+	(demangle_class_name): If consume_count didn't find a count, do
+	nothing.  Don't bother with `strlen' sanity check; consume_count
+	does it for us.
+
+1999-03-16  Stan Shebs  <shebs@andros.cygnus.com>
+
+	From Art Haas  <ahaas@neosoft.com>:
+	* cplus-dem.c (demangle_prefix): Don't grab all the '__' strings
+	when doing arm or hp style.
+	(demangle_nested_args): Decr forgetting_types field when done.
+
+Thu Mar 11 01:22:58 1999  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* pexecute.c (__CYGWIN32__): Rename to
+	(__CYGWIN__): this.
+	* xmalloc.c: Likewise.
+
+	Changes to support i386-pc-uwin.
+	* configure.in (*-*-uwin*): Workaround for vfork bug.
+	* configure: Regenerate.
+	* pexecute.c (pexecute): Be like standard Unix.
+	(pwait): Likewise.
+	* xmalloc.c (first_break): Define.
+	(xmalloc_set_program_name): Use.
+	(xmalloc): Use.
+
+Thu Mar 11 01:07:55 1999  Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
+
+	* config.table: Cleanup and add mh-*pic handling for alpha, arm, powerpc
+
+Sun Feb 28 22:30:44 1999  Geoffrey Noer  <noer@cygnus.com>
+
+	* config.table: Check cygwin*, not cygwin32*.
+
+Tue Feb  9 16:39:01 1999  Dave Brolley  <brolley@cygnus.com>
+
+	* Makefile.in: Change mkstemp -> mkstemps.
+
+Tue Feb  9 01:12:27 1999  Marc Espie <Marc.Espie@liafa.jussieu.fr>
+
+	* Makefile.in (REQUIRED_OFILES): remove mkstemp.o
+	* configure.in (funcs): Check for and conditionally add mkstemps to
+	the list of functions libiberty will provide.
+	* configure: Rebuilt.
+
+Wed Feb  3 00:01:15 1999  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* clock.c (HZ): Define in terms of (ISO C) CLOCKS_PER_SEC on
+	platforms that don't have HZ.
+	* getruntime.c (HZ): Likewise.
+
+Sat Jan 30 13:28:04 1999  Richard Henderson  <rth@cygnus.com>
+
+	* Makefile.in (xstrdup.o): Depend on config.h.
+
+Wed Jan 13 07:26:44 1999  H.J. Lu  (hjl@gnu.org)
+
+	* cplus-dem.c (mop_up): Set work->previous_argument to NULL after
+	freeing it.
+
+Wed Jan 13 14:16:36 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* xstrdup.c (xstrdup): Switch from strcpy to memcpy for speed.
+
+Tue Jan  5 15:58:29 1999  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
+
+	* Makefile.in (CFILES): fix typo, splay-tree.c instead of
+	splay-tree.o.
+
+1999-01-04  Jason Molenda  (jsm@bugshack.cygnus.com)
+
+	* configure.in: Require autoconf 2.12.1 or higher.
+
+1998-12-30  Michael Meissner  <meissner@cygnus.com>
+
+	* random.c (NULL): Don't redefine NULL if it is already defined.
+
+Tue Dec 22 09:43:35 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* argv.c (buildargv): Cast the result of alloca in assignment.
+
+	* choose-temp.c: Include stdlib.h.
+
+	* cplus-dem.c (demangle_arm_pt): Remove unused prototype.
+	(snarf_numeric_literal): Constify first parameter.
+	(code_for_qualifier): Avoid a gcc extension, make the parameter an
+	int, not a char.
+	(demangle_qualifier): Likewise.
+	(demangle_signature): Cast the argument of a ctype function to
+	unsigned char.
+	(arm_pt): Add parens around assignment used as truth value.
+	(demangle_arm_hp_template): Constify variable `args'.
+	(do_hpacc_template_const_value): Cast the argument of a ctype
+	function to unsigned char.
+	(do_hpacc_template_literal): Remove unused variable `i'.
+	(snarf_numeric_literal): Constify parameter `args'.
+	Cast the argument of a ctype function to unsigned char.
+
+	* floatformat.c (floatformat_to_double): Add explicit braces to
+	avoid ambiguous `else'.
+
+	* fnmatch.c (fnmatch): Change type of variables `c', `c1',
+	`cstart' and `cend' to unsigned char.  Cast the argument of macro
+	`FOLD', which uses ctype functions, to unsigned char.
+
+	* objalloc.c (free): Add prototype.
+
+Sun Dec 20 16:03:46 1998  Hans-Peter Nilsson  <hp@axis.se>
+
+	* Makefile.in (CFILES): Fix typo: splay-tree.c, not splay-tree.o
+
+Fri Dec 18 17:50:18 1998  David Taylor  <taylor@texas.cygnus.com>
+
+	* cplus-dem.c (demangle_arm_pt): remove declaration -- function
+	doesn't exist.
+	(do_hpacc_template_literal): remove unused variable `i'.
+
+Fri Dec 18 16:11:43 EST 1998  Andrew MacLeod  <amacleod@cygnus.com>
+
+	* cplus-dem.c (demangle_fund_type): Process CV and u codes before
+	bumping the pointer we read from. Also prepend these codes,
+	as we do in other places.
+
+1998-12-18  Nick Clifton  <nickc@cygnus.com>
+
+	* cplus-dem.c (demangle_arm_hp_template): Make variable 'args' be
+	'const char *' in order to match its usage when calling siblings.
+	(snarf_numeric_literal): Make first arg 'const char **' in order
+	to match usage.
+
+Mon Dec 14 09:55:50 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* choose-temp.c: Don't check IN_GCC anymore.
+
+	* floatformat.c (floatformat_from_double): Use `const', not `CONST'.
+	* memchr.c (memchr): Likewise.
+	* memcpy.c (memcpy): Likewise.
+	* memmove.c (memmove): Likewise.
+
+	* mkstemp.c: Don't check IN_GCC anymore.
+	* pexecute.c: Likewise.
+	* splay-tree.c: Likewise.
+
+	* strchr.c (strchr): Use `const', not `CONST'.
+	* strrchr.c (strrchr): Likewise.
+	* strtol.c (strtol): Likewise.
+	* strtoul.c (strtoul): Likewise.
+
+Fri Dec  4 13:51:04 1998  David Taylor   <taylor@texas.cygnus.com>
+			  Elena Zannoni  <ezannoni@cygnus.com>
+			  Stan Shebs     <shebs@cygnus.com>
+			  Edith Epstein  <eepstein@cygnus.com>
+			  Andres MacLeod <amacleod@cygnus.com>
+			  Satish Pai	 <pai@apollo.hp.com>
+
+	* HP aCC demangling support.
+	* cplus-dem.c
+	(main): Remove default to HP style demangling, set to EDG
+	demangling correctly when -edg specified; set the demangling style
+	when user specifies 'edg'. Set strip_underscore to
+	prepends_underscore, if not HPUXHPPA.  Set
+	current_demangling_style to hp_demangling if HPUXHPPA.  Set
+	current demangling style correctly if the switch is hp.  Read
+	label correctly also in the HP style case.
+	(work_stuff): add temp_start field; add field for volatile member
+	function.
+	(arm_pt): handle ARM_DEMANGLING and EDG_DEMANGLING styles; HP
+	style for this case is the same as ARM.
+	(demangle_args): handle EDG_DEMANGLING style; support HP style.
+	(demangle_arm_hp_template): new function. (It was
+	demangle_arm_pt.); check and set value of temp_start field in
+	multiple places. Also, when ceching for end of template args,
+	check to see if at end of static member of template class.
+	(demangle_class): new local variable : save_class_name_end Don't
+	include template args in string defining class.
+	(demangle_class_name): use demangel_arm_hp_template.
+	(demangle_function_name): handle case where demangling style is
+	HP_DEMANGLING and currently point at an 'X' in the mangled name.
+	Handle EDG_DEMANGLING style.  Handle constructor and destructor
+	ops for HP style.
+	(demangle_prefix): handle EDG_DEMANGLING and ARM_DEMANGLING
+	styles.  global destructor and constructor for HP style are same
+	as for ARM style. Same for local variables.
+	(demangle_qualified): handle EDG_DEMANGLING style.
+	(demangle_signature): add case for volatile member function.  For
+	cases '1' - '9' : initialize the temp_start field to -1 and handle
+	the EDG_DEMANGLING style.  for case 'F' : handle EDG_DEMANGLING
+	and AUTO_DEMANGLING styles.  If expecting a function and managed
+	to demangle the funct args, then handle the LUCID_DEMANGLING,
+	ARM_DEMANGLING, and EDG_DEMANGLING styles.  Add case for local
+	class name after "Lnnn_ in HP style case. HP style too needs to
+	forget types.  _nnn is OK for HP style, so don't report failure.
+	(do_hpacc_template_const_value): new function. Handle template's
+	value param for HP/aCC.
+	(do_hpacc_template_literal): new function.  Handle a template's
+	literal parameter for HP aCC.
+	(recursively_demangle): new function
+	(snarf_numeric_literal): new function.
+	(usage): add 'edg' to the list of demangling styles; add hp switch
+	to message.
+
+Sat Nov 28 17:25:22 1998  Christopher Faylor <cgf@cygnus.com>
+
+	* pexecute.c: Remove obsolete ifdefed cygwin code.
+
+Fri Nov 27 13:26:06 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* choose-temp.c: Always include libiberty.h.  Avoid redundancies.
+	* cplus-dem.c: Likewise.  Conform to libiberty.h.
+	* pexecute.c: Likewise.
+	* splay-tree.c: Likewise.
+
+1998-11-25  Mike Stump  <mrs@wrs.com>
+
+	* Makefile.in (splay-tree.o): Add config.h dependency.
+
+Mon Nov 23 16:59:49 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	*  configure.in: Use AC_PREREQ(2.12.1).
+
+1998-11-16  Benjamin Kosnik  <bkoz@haight.constant.com>
+
+	* cplus-dem.c (demangle_fund_type): Add demangling for C9x types.
+
+Thu Nov 19 22:15:50 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* mpw.c (mpw_access): Add missing parens.
+
+Thu Nov 19 12:59:21 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.in: Call AC_HEADER_SYS_WAIT.
+
+	* pexecute.c: Include sys/wait.h when !IN_GCC.
+
+Thu Nov 19 14:38:20 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* pexecute.c: revert back to checking old Cygwin
+	preprocessor symbol until some time has passed.
+
+Wed Nov 18 08:52:26 1998  Christopher Faylor <cgf@cygnus.com>
+
+	* pexecute.c: Reorganize WIN32 case to accomodate Cygwin
+	since it will now support similar constructs.
+
+Fri Nov 13 19:18:05 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.in: Check for calloc.
+
+	* calloc.c: New	file.
+
+	* xmalloc.c (xcalloc): New function.
+
+Fri Nov 13 08:51:46 EST 1998  Andrew MacLeod  <amacleod@cygnus.com>
+
+	*cplus-dem.c (demangle_prefix): Use the last "__"
+	in the mangled name when looking for the signature. This allows
+	template names to begin with "__".
+
+1998-11-08  Mark Mitchell  <mark@markmitchell.com>
+
+	* cplus-dem.c (type_kind_t): Add tk_reference.
+	(demangle_template_value_parm): Handle it.
+	(do_type): Use it for references, instead of tk_pointer.
+
+	* cplus-dem.c (demangle_template_value_parm): Use cplus_demangle,
+	not internal_cplus_demangle.
+
+Sat Nov  7 16:02:10 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* choose-temp.c: Don't include gansidecl.h.
+	* mkstemp.c: Likewise.
+	* pexecute.c: Likewise.
+
+Mon Nov  2 15:05:33 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* configure.in: detect cygwin* instead of cygwin32*
+	* configure: regenerate
+
+Mon Nov  2 10:22:01 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* pexecute.c: Check HAVE_CONFIG_H, not IN_GCC, when determining
+	whether to include config.h.  Possibly include unistd.h in the
+	!IN_GCC case.  Define VFORK_STRING as a printable function call
+	for error messages (either "vfork" or "fork".)  If HAVE_VFORK_H is
+	defined, include vfork.h.  If VMS is defined, define vfork()
+	appropriately.  Remove vfork check on USG, we're using autoconf.
+	(pexecute): Set `errmsg_fmt' to VFORK_STRING instead of checking
+	locally what string to use.
+
+1998-10-26  Mark Mitchell  <mark@markmitchell.com>
+
+	* splay-tree.c: Tweak include directives to make sure declarations of
+	xmalloc and free are available.
+
+1998-10-25  Mark Mitchell  <mark@markmitchell.com>
+
+	* cplus-dem.c (gnu_special): Fix handling of virtual tables in
+	anonymous namespaces.
+
+1998-10-23  Mark Mitchell  <mark@markmitchell.com>
+
+	* cplus-dem.c (work_stuff): Replace const_type and volatile_type
+	with type_quals.
+	(TYPE_UNQUALIFIED): New macro.
+	(TYPE_QUAL_CONST): Likewise.
+	(TYPE_QUAL_VOLATILE): Likewise.
+	(TYPE_QUAL_RESTRICT): Likewise.
+	(code_for_qualifier): New function.
+	(qualifier_string): Likewise.
+	(demangle_qualifier): Likewise.
+	(internal_cplus_demangle): Use them.
+	(demangle_signature): Likewise.
+	(demangle_template_value_parm): Likewise.
+	(do_type): Likewise.
+	(demangle_fund_type)): Likewise.
+
+Thu Oct 22 19:58:43 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* splay-tree.c (splay_tree_foreach_helper): Make definition static
+	to match prototype.
+
+1998-10-21  Mark Mitchell  <mark@markmitchell.com>
+
+	* splay-tree.c: New file.
+	* Makefile.in (CFILES): Add it.
+	(REQUIRED_OFILES): Likewise.
+	(splay-tree.o): Add dependencies.
+
+Tue Oct 20 12:29:02 1998  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* cplus-dem.c (demangle_qualified): Fix off-by-one when checking
+	range of 'K' index.
+
+Thu Oct 15 18:51:12 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* choose-temp.c: Prototype mkstemps() when IN_GCC.
+
+	* cplus-dem.c (consume_count): Cast argument of ctype macro to
+	`unsigned char'.
+	(cplus_demangle_opname): Cast the result of `strlen' to (int) when
+	comparing against one.
+	(cplus_mangle_opname): Likewise.
+	(demangle_integral_value): Cast argument of ctype macro to
+	`unsigned char'.
+	(demangle_template_value_parm): Likewise.
+	(demangle_template): Initialize variable `bindex'.  Cast the
+	result of `strlen' to (int) when comparing against one.  Remove
+	unused variable `start_of_value_parm'.
+	(demangle_class_name): Cast the result of `strlen' to (int) when
+	comparing against one.
+	(demangle_prefix): Cast argument of ctype macro to `unsigned char'.
+	(gnu_special): Likewise.  Cast the result of `strlen' to (int)
+	when comparing against one.
+	(demangle_qualified): Cast argument of ctype macro to `unsigned char'.
+	(get_count): Likewise.
+	(do_type): Likewise.  Cast the result of `strlen' to (int) when
+	comparing against one.
+	(demangle_fund_type): Cast argument of ctype macro to `unsigned char'.
+	(demangle_function_name): Cast the result of `strlen' to (int)
+	when comparing against one.
+
+	* mkstemp.c (mkstemps): Cast variable `len' to (int) when
+	comparing against one.
+
+Tue Oct 13 23:51:51 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* mkstemp.c: Check HAVE_SYS_TIME_H before including sys/time.h
+	* configure.in (AC_CHECK_HEADERS): Check for sys/time.h too.
+	* config.in, configure: Rebuilt.
+
+	* getopt.c: Check HAVE_STRINGS_H before including strings.h.
+	* configure.in (AC_CHECK_HEADERS): Check for strings.h too.
+	* config.in, configure: Rebuilt.
+
+Mon Oct 12 19:15:59 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* configure.in: in comment, call AC_EXEEXT instead of AM_EXEEXT
+
+Sun Oct 11 17:36:06 1998  Michael Tiemann  <tiemann@holodeck.cygnus.com>
+
+	* Makefile.in (cplus-dem.o, obstack.o): Depend upon config.h.
+
+Thu Oct  8 23:42:08 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* Merge egcs & devo libiberty.
+
+1998-09-08  Martin von Löwis  <loewis@informatik.hu-berlin.de>
+
+	* cplus-dem.c (demangle_arm_pt): Demangle anonymous namespaces.
+
+Mon Sep  7 23:29:01 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* mkstemp.c: Include config.h even when not IN_GCC.  Wrap header
+	inclusions inside HAVE_*_H macros.  Include ansidecl.h when not
+	IN_GCC.
+
+	* vasprintf.c: Include stdarg.h/varargs.h first.
+
+	* vprintf.c: Likewise.
+
+Sat Sep  5 03:24:49 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* pexecute.c: Updates from gcc.  Copy in gcc has been removed.  This
+	is the canonical copy.  Define ISSPACE if !IN_GCC.
+	* alloca.c, vfprintf.c, choose-temp.c, mkstemp.c, getopt.c: Similarly.
+	* getopt1.c, obstack.c: Similarly.
+	* Makefile.in: Build mkstemp.o
+
+Tue Sep  1 23:12:47 1998  Christopher Faylor <cgf@cygnus.com>
+
+	* configure.in: Include asprintf in list of functions known not
+	to be in newlib.
+	* configure: Rebuild.
+
+Wed Aug 19 14:05:01 1998  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* cplus-dem.c (work_stuff): Add dllimported.
+	(demangled_prefix): Mark symbols imported from PE DLL.
+	(internal_cplus_demangled): Handle.
+
+1998-08-17  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* cplus-dem.c (do_type): Fix simple array handling.  If we fail,
+	stay failed.
+
+Mon Aug 17 10:40:34 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* cplus-dem.c: Include config.h if it exists.  Also, only
+	prototype malloc/realloc if we can't get stdlib.h.
+
+Sat Aug 15 16:15:01 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Switch back to checking --with-target-subdir when
+	deciding whether to check for newlib, undoing part of July 15
+	change.
+	* configure: Rebuild.
+
+Thu Aug 13 16:47:38 1998  Mark Mitchell  <mark@markmitchell.com>
+
+	* cplus-dem.c (type_kind_t): New type.
+	(demangle_template_value_parm): Add type_kind_t parameter.  Rely
+	on this paramter, rather than demangling the type again.
+	(demangle_integral_value): Pass tk_integral.
+	(demangle_template_: Pass the value returned from do_type.
+	(do_type): Return a type_kind_t.  Pass tk_integral to
+	demangle_template_value_parm for array bounds.
+	(demangle_fund_type): Likewise.
+
+	Also incorporate from GCC version:
+
+	Tue Jul 21 13:28:19 1998  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* cplus-dem.c (do_type): Use demangle_template_value_parm for arrays.
+
+Thu Aug 13 16:47:38 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* cplus-dem.c (demangle_nested_args): Make function definition
+	static to match the prototype.
+
+Tue Jul 28 11:33:09 1998  Mark Mitchell  <mark@markmitchell.com>
+
+	* cplus-dem.c (type_kind_t): New type.
+	(demangle_template_value_parm): Add type_kind_t parameter.  Rely
+	on this paramter, rather than demangling the type again.
+	(demangle_integral_value): Pass tk_integral.
+	(demangle_template_: Pass the value returned from do_type.
+	(do_type): Return a type_kind_t.  Pass tk_integral to
+	demangle_template_value_parm for array bounds.
+	(demangle_fund_type): Likewise.
+
+	Also incorporate from GCC version:
+
+	Tue Jul 21 13:28:19 1998  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* cplus-dem.c (do_type): Use demangle_template_value_parm for arrays.
+
+Mon Jul 27 12:16:08 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (ALLOCA): New variable.
+	($(TARGETLIB)): Add $(ALLOCA) to library.
+	(needed-list): Add $(ALLOCA).
+	($(ALLOCA)): Depend upon stamp-picdir.
+
+Sun Jul 19 08:23:17 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* cplus-dem.c (demangle_nested_args): Make function definition
+	static to match the prototype.
+
+Wed Jul 15 00:12:58 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Check --with-cross-host rather than
+	--with-target-subdir when deciding whether build uses a cross
+	compiler, and when deciding where to install the library.
+	* configure: Rebuild.
+
+Sun Jul 12 01:27:05 1998  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* cplus-dem.c (demangle_nested_args): Return a value.
+
+Sat Jul 11 16:19:48 1998  Mark Mitchell  <mark@markmitchell.com>
+
+	* cplus-dem.c (string): Move definition before work_stuff.
+	(work_stuff): Add volatile_type, forgetting_types,
+	previous_argument, and nrepeats fields.
+	(SCOPE_STRING): New macro.
+	(demangle_template): Add `remember' parameter.  Add comment.
+	Register the `B' code type here, if remembering.  Tidy.  Fix crash
+	on NULL tmpl_argvec.  Be consistent with use of tname/trawname.
+	(demangle_nested_args): New function.
+	(internal_cplus_demangle): Handle volatile-qualified member
+	functions.
+	(mop_up): Delete the previous_argument string if present.
+	(demangle_signature): Tidy.  Handle volatile-qualified member
+	functions.  Handle back-references using the `B' code.  Use extra
+	parameter to demangle_template and SCOPE_STRING where appropriate.
+	(demangle_template_value_parm): Fix thinko; 'B' is not an integral
+	code.
+	(demangle_class): Use SCOPE_STRING.
+	(gnu_special): Pass additional argument to demangle_template.
+	Use SCOPE_STRING.
+	(demangle_qualified): Save qualified types for later
+	back-references.  Handle constructors and destructors for template
+	types correctly.
+	(do_type): Tidy.  Use SCOPE_STRING.  Pass extra argument to
+	demangle_template.  Use demangled_nested_args.  Don't remember
+	qualified types here; that's now done in demangle_qualified.
+	Similarly for templates.
+	(do_arg): Improve commment.  Handle 'n' repeat code.
+	(remember_type): Check forgetting_types.
+	(demangle_args): Deal with 'n' repeat codes.  Tidy.
+
+Thu Jul  2 16:26:24 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.table: Only use mh-fbsd21 on *-*-freebsd2.2.[012], not on
+	*-*-freebsd2.2.*.  From Dmitrij Tejblum <tejblum@arc.hq.cti.ru>.
+
+Mon Jun 15 16:29:01 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in (setobjs): Correct quoting error in cygwin32 case.
+	From Chris Faylor <cgf@cygnus.com>.
+
+Mon Jun  1 13:47:55 1998  Jason Molenda  (crash@bugshack.cygnus.com)
+
+	* obstack.c: Update to latest FSF version.
+
+Mon Jun  1 14:17:36 1998  Mike Stump  <mrs@wrs.com>
+
+	* Makefile.in: Add a dependency on stamp-picdir for the
+	objects, so that we can do a parallel build.
+
+Sat May 30 22:17:13 1998  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* configure.in (checkfuncs): Add missing "'".
+
+Fri May 29 12:40:41 1998  Jason Molenda  (crash@bugshack.cygnus.com)
+
+	* obstack.c (_obstack_memory_used):  Elide this function if we're
+	on a system with GNU libc.
+
+Tue May 26 18:28:43 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (distclean): Remove config.log.
+
+Tue May 26 15:01:52 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* Makefile.in (distclean): Don't remove alloca-conf.h.
+
+Fri May 22 01:38:07 1998  Hans-Peter Nilsson  <hp@axis.se>
+
+	* cplus-dem.c (MBUF_SIZE): Bumped from 512 to 32767.
+
+1998-05-21  Mark Mitchell  <mmitchell@usa.net>
+
+	* cplus-dem.c (do_type): Handle volatile qualification.
+
+1998-05-21  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* configure.in: Check for unistd.h as well.
+	* configure: Rebuild.
+	* config.in: Rebuild.
+	* getpagesize.c (GNU_OUR_PAGESIZE): Use sysconf only if _SC_PAGESIZE
+	is defined in unistd.h. Reformat conditional block for easier reading.
+
+	* config.table (shared): Default to no if ${enable_shared}
+	is unset or empty; this logic is used by the toplevel
+	configure scripts, too.
+
+Sat May 16 14:01:26 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* config.table: Add line to set enable_shared in the Makefile
+	as needed.
+
+Wed May 13 14:24:38 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* cplus-dem.c (squangle_mop_up): Change return type to void.
+	(internal_cplus_demangle): Remove unused parameter `options'.
+	All callers changed.
+	(cplus_demangle_opname): Remove function wide variable `int i' and
+	replace with `size_t i' at each location where it is used.
+	(cplus_mangle_opname): change type of `i' from int to size_t.
+
+Wed May 13 13:39:38 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* alloca-conf.h: Include config.h.  Check HAVE_ALLOCA_H rather
+	than sparc or sun.
+	* Makefile.in (argv.o): Depend upon config.h and alloca-conf.h.
+
+Fri May  8 00:23:51 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Set libiberty_topdir correctly when srcdir is
+	"." and with_target_subdir is not set.
+	* configure: Rebuild.
+
+Thu May  7 13:01:44 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Add *-*-mingw32* case.
+	* configure: Rebuild.
+
+Wed May  6 11:33:51 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.table: Never use a PIC file for *-*-cygwin32*.
+
+	* Makefile.in (config.status): Depend upon config.table.
+
+	* configure.in: On a cygwin32 host, always compile random, and
+	don't test for sys_siglist, strsignal, or psignal.
+	* configure: Rebuild.
+
+	* clock.c: Check HAVE_SYS_PARAM_H rather than NO_SYS_PARAM_H.
+	* getcwd.c: Likewise.
+	* getpagesize.c: Likewise.
+	* getruntime.c: Likewise.
+
+Tue May  5 18:08:32 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	Use autoconf tests rather than the old dummy.c test:
+	* configure.in: Add AC_ARG_WITH calls for --with-target-subdir and
+	--with-newlib.  Add AC_CONFIG_HEADER.  Use AC_REPLACE_FUNCS for
+	most functions.  Add special cases to handle newlib and VxWorks.
+	Remove target_makefile_frag.  Create stamp-h in AC_OUTPUT if
+	CONFIG_HEADERS is set.  Only call config-ml.in in AC_OUTPUT if
+	CONFIG_FILES is set; set ac_file before calling it.
+	* config.table (arm-*-riscix*, *-*-cygwin32): Remove.
+	(*-*-hpux*, *-*-hiux*, *-*-irix4*, *-*-solaris2*): Remove.
+	(*-*-sysv4*, *-*-go32, *-*-vxworks5*, *-*-vxworks): Remove
+	(i[3456]-*-mingw32*): Remove.
+	* Makefile.in (ERRORS_CC, CONFIG_H, NEEDED_LIST): Remove.
+	(LIBOBJS): New variable.
+	(HOST_OFILES, DO_ALSO, STAGESTUFF): Remove.
+	(all): Depend upon needed-list.  Don't check RULE1.
+	(@target_makefile_frag@): Remove.
+	(COMPILE.c): Include @DEFS@.
+	(HFILES): Add alloca-conf.h.
+	(REQUIRED_OFILES): Remove basename.o.
+	($(TARGETLIB)): New target.
+	(stamp-needed, lneeded-list, needed.awk, stamp-config): Remove.
+	(lconfig.h, needed2.awk, dummy.o, errors): Remove.
+	(needed-list, config.h): Rewrite.
+	(RULE1, $(RULE1), RULE2, $(RULE2)): Remove.
+	(.always.): Remove.
+	(Makefile): Set CONFIG_FILES and CONFIG_HEADERS.
+	(stamp-h): New target.
+	(atexit.o, clock.o, getcwd.o, getpagesize.o): New targets.
+	(basename.o): Don't depend upon config.h.
+	(getruntime.o): Depend upon config.h.
+	* atexit.c: Include config.h.  Check HAVE_ON_EXIT rather than
+	NEED_on_exit.
+	* basename.c: Don't include config.h.  Don't check NEED_basename.
+	* clock.c: Include config.h.
+	* getcwd.c: Likewise.
+	* getpagesize.c: Likewise.
+	* getruntime.c: Likewise.  Fix checks which set HAVE_GETRUSAGE and
+	HAVE_TIMES.
+	* strerror.c: Change uses of NEED_sys_errlist to
+	HAVE_SYS_ERRLIST.  Likewise for NEED_strerror and HAVE_STRERROR.
+	* strsignal.c: Likewise for NEED_sys_siglist and HAVE_SYS_SIGLIST,
+	and for NEED_strsignal and HAVE_STRSIGNAL and for NEED_psignal and
+	HAVE_PSIGNAL.
+	* acconfig.h: New file.
+	* dummy.c: Remove.
+	* functions.def: Remove.
+	* config/mh-cxux7 (HDEFINES): Remove -DHAVE_SYSCONF.
+	* config/mh-windows (HDEFINES): Remove.
+	* config/mh-cygwin32: Remove.
+	* config/mh-go32: Remove.
+	* config/mh-irix4: Remove.
+	* config/mh-riscix: Remove.
+	* config/mh-sysv4: Remove.
+	* config/mt-mingw32: Remove.
+	* config/mt-vxworks5: Remove.
+	* config.in: New file, generated using autoheader.
+	* configure: Rebuild.
+
+Mon May  4 13:00:28 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Rewrite to use autoconf.
+	* configure: Generate using autoconf.
+	* config/mh-a68bsd: Remove.
+	* config/mh-apollo68: Remove.
+	* config/mh-hpbsd: Remove.
+	* config/mh-ncr3000: Remove.
+	* config/mh-sysv: Remove.
+	* config/mh-aix (RANLIB, INSTALL): Don't define.
+	* config/mh-cxux7 (RANLIB, INSTALL): Don't define.
+	* config/mh-irix4 (CC, RANLIB, INSTALL): Don't define.
+	* config/mh-sysv4 (RANLIB, INSTALL): Don't define.
+	* config.table: Change config_shell to CONFIG_SHELL, and use
+	libiberty_topdir to find move-if-change.
+	(m68k-apollo-bsd*, m68k-apollo-sysv*): Remove.
+	(i[3456]86-ncr-sysv4*, *-*-dgux*, hppa*-hp-bsd*): Remove.
+	(*-*-irix*, *-*-m88kbcs*, *-*-sysv*): Remove.
+	* Makefile.in (srcdir): Set to @srcdir@.
+	(VPATH): Likewise.
+	(prefix, exec_prefix, bindir, libdir): Set to autoconf variables.
+	(SHELL, INSTALL, INSTALL_PROGRAM, INSTALL_DATA): Likewise.
+	(CC, CFLAGS, RANLIB)): Likewise.
+	(datadir, man*dir, infodir, includedir, MAKEINFO): Remove.
+	(target_makefile_frag, host_makefile_frag): Add substitutions.
+	(INSTALL_DEST): Set to @INSTALL_DEST@.
+	(Makefile): Depend upon config.status.  Don't depend upon
+	$(host_makefile_frag) or $(target_makefile_frag).
+	(config.status): New target.
+
+Sun May  3 17:58:49 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config/mt-sunos4: Remove.  Should be handled by --with-headers
+	and --with-libraries options at top level.
+	* config.table: Never use mt-sunos4.
+
+	* alloca-conf.h: New file, combining alloca-norm.h and
+	alloca-botch.h.
+	* alloca-norm.h: Remove.
+	* alloca-botch.h: Remove.
+	* configure.in: Set shell variables files and links to empty.
+	* config.table: Don't set shell variable files.
+	* configure.bat: Don't create alloca-conf.h.
+	* makefile.vms: Likewise.
+	* mpw-config.in: Likewise.
+	* vmsbuild.com: Likewise.
+
+Fri May  1 11:41:42 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in ($(HOST_OFILES) $(REQUIRED_OFILES)): Remove old
+	target depending upon config.h.
+	(alloca.o): Add target depending upon config.h
+	(basename.o, choose-temp.o, fnmatch.o): Likewise.
+	(getopt.o, getopt1.o, pexecute.o, strerror.o): Likewise.
+	(strsignal.o, xstrerror.o): Likewise.
+
+Fri May  1 04:26:25 1998  Peter Schauer <pes@regent.e-technik.tu-muenchen.de>
+
+	* cplus-dem.c (cplus_demangle_opname):  Initialize work.
+
+Mon Apr 27 15:53:30 EDT 1998 Andrew MacLeod <amacleod@cygnus.com>
+
+	* cplus-dem.c (demangle_qualified): Replace missing else.
+
+Sun Apr 26 15:38:50 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* cplus-dem.c (gnu_special): Fix off-by-one bug when checking the
+	length in the name of a virtual table.
+
+Wed Apr 22 10:53:49 EDT 1998 Andrew MacLeod  <amacleod@cygnus.com>
+
+	* cplus-dem.c (struct work stuff): Add field for B and K mangle codes.
+	(cplus_demangle_opname): Call mop_up_squangle.
+	(cplus_demangle): Initialize squangle info, then call
+	internal_cplus_demangle. (Most code moved there as well)
+	(internal_cplus_demangle): New function, performs most of what use
+	to be done in cplus_demangle, but is only called with this file.
+	(squangle_mop_up): New function to clean up B and K code data.
+	(mop_up): set pointers to NULL after freeing.
+	(demangle_signature, demangle_template, demangle_class): Add
+	switch elements to handle K and B codes.
+	(demangle_prefix, gnu_special, demangle_qualified): Add
+	code to handle K and B codes.
+	(do_type, demangle_fund_type): Handle B and K codes.
+	(remember_Ktype): New function to store K info.
+	(register_Btype, remember_Btype): New functions for B codes.
+	(forget_B_and_K_types): New function to destroy B and K info.
+
+Fri Apr 10 01:49:10 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* COPYING.LIB, choose-temp.c, cplus-dem.c: Sync with egcs & gcc.
+
+Thu Mar  5 09:23:28 1998  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* config.table: Make locating frag files failsafe even for the
+	special case if configuring and building in srcdir.
+
+Mon Feb 23 14:33:15 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* choose-temp.c: Fix handling of sys/file.h to work in libiberty.
+
+Sun Feb 22 18:03:23 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* choose-temp.c: Sync with copy in gcc.
+
+Thu Feb 12 16:29:49 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* getopt.c: Update to latest FSF version.
+	* getopt1.c: Likewise.
+
+Tue Feb 10 16:58:33 1998  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* cplus-dem.c (gnu_special): Don't get confused by .<digits>
+	strings that are not actually lengths.
+
+Fri Feb  6 01:35:17 1998  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* Makefile.in (FLAGS_TO_PASS): Don't pass PICFLAG.
+	(.c.o): Check value of enable_shared, not PICFLAG.
+	(stamp-picdir): Dito.
+
+Thu Feb  5 18:48:56 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* config/mh-cygwin32: remove vasprintf.o from EXTRA_OFILES
+	since it gets built automatically
+
+Sun Feb  1 02:52:32 1998  Mike Stump  <mrs@wrs.com>
+
+	* config.table (vxworks configs): Default to VxWorks 5.x, as that is
+	the currently shipping OS.
+
+Tue Jan 27 16:08:20 1998  Pat Rankin  <rankin@eql.caltech.edu>
+
+	* vmsbuild.com [REQUIRE_OFILES]: Synchronized with Makefile.in:
+	Add fnmatch.o and objalloc.o; remove vasprintf.o.
+	[config.h]: Define NEED_strsignal.
+
+Mon Jan 19 12:20:01 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* functions.def: Correct argument types for strerror and
+	strsignal.  Reported by Alex Gutman <agutman@emc.com>.
+
+Sun Jan 18 15:57:28 1998  Michael Snyder  <msnyder@cleaver.cygnus.com>
+
+	* vasprintf.c (int_vasprintf): Increase buffer size for float/double
+	values.
+
+Sat Jan 17 22:28:38 1998  Mumit Khan  <khan@xraylith.wisc.edu>
+			  J.J. VanderHeijden <J.J.vanderHeijden@student.utwente.nl>
+
+	Add mingw32 support.
+	* pexecute.c (pexecute): New function for mingw32. Supports pipes.
+	(pwait): New function for mingw32.
+
+	* config.table (i[3456]86-*-mingw32*): Support for i386-mingw32.
+	* config/mt-mingw32: New file.
+	* xmalloc.c (first_break): Not used for mingw32.
+	(xmalloc_set_program_name): Don't use sbrk on mingw32.
+	(xmalloc): Likewise.
+	(xrealloc): Likewise.
+
+Sat Jan 17 22:28:05 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* choose-temp.c: Sync with gcc version.
+
+Tue Jan 13 18:34:39 1998  Jim Wilson  <wilson@cygnus.com>
+
+	* Makefile.in (install_to_libdir, install_to_tooldir): Add MULTISUBDIR
+	to all filenames in libdir and tooldir.
+	(distclean): Do MULTICLEAN before deleting Makefile.
+	(stamp-needed, stamp-config): Add MULTISRCTOP to
+	pathname for move-if-change.
+
+Thu Dec  4 17:25:19 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* strsignal.c (sys_nsig): Try NSIG and _NSIG.
+
+Wed Nov 19 13:37:06 1997  Michael Meissner  <meissner@cygnus.com>
+
+	* alloca-norm.h (alloca, GCC case): Don't redefine alloca if it
+	was already defined previously.
+
+Mon Nov 10 12:48:03 1997  Philippe De Muyter  <phdm@macqel.be>
+
+	* Makefile.in (INSTALL): Use ../install-sh, not install.
+
+Tue Oct 28 23:41:15 1997  Judy Goldberg  <jodyg@idt.net>
+
+	* Makefile.in (CFILES): Add pexecute.c.
+
+Wed Oct 15 19:13:48 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* asprintf.c: Consistently use either stdarg or varargs.
+
+Tue Oct 14 12:01:00 1997  Mark Mitchell  <mmitchell@usa.net>
+
+	* cplus-dem.c (demangle_signature): Don't look for return types on
+	constructors.  Handle member template constructors.
+
+Fri Oct  3 17:53:30 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* README: Fix configuration instructions.
+
+Mon Sep 29 12:28:41 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* pexecute.c: Update to current version from /gd/gnu/lib:
+
+	Mon Sep 29 12:27:59 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* pexecute.c: Use spawn if __CYGWIN32__.
+
+	1997-08-08  Paul Eggert  <eggert@twinsun.com>
+
+	* pexecute.c: Include "config.h" first, as per autoconf manual.
+
+	Fri Jun 27 15:20:29 1997  Scott Christley <scottc@net-community.com>
+
+	* pexecute.c (fix_argv): New function.
+	(pexecute): Win32 but not Cygwin32 needs its arguments fixed.
+	Add underscore to cwait function call.
+
+Sun Sep 28 12:00:52 1997  Mark Mitchell  <mmitchell@usa.net>
+
+	* cplus-dem.c (demangle_template): Add new parameter.  Handle new
+	template-function mangling.
+	(consume_count_with_underscores): New function.
+	(demangle_signature): Handle new name-mangling scheme.
+
+Wed Sep 24 00:31:59 1997  Felix Lee  <flee@yin.cygnus.com>
+
+	* asprintf.c: stdarg.h when ALMOST_STDC
+	* config/mh-windows (EXTRA_OFILES): add asprintf.o and
+	strncasecmp.o.
+
+Thu Aug 28 14:27:15 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* vasprintf.c (vasprintf): Allow for _BSD_VA_LIST_.
+
+	* config.table: Add case for FreeBSD 2.1 and 2.2, needs mh-fbsd21.
+
+	* config/mh-fbsd21 (EXTRA_OFILES): Force vasprintf.o
+
+Wed Sep 10 12:43:10 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* cplus-dem.c (demangle_fund_type): Change "complex" to "__complex".
+
+Fri Sep  5 16:34:42 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* asprintf.c (asprintf): New file.
+	* Makefile.in (CFILES): Add asprintf.c
+	* functions.def: Ditto.
+
+Thu Aug 28 18:53:34 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* argv.c (dupargv): New function, duplicate an argument vector.
+
+Tue Aug 19 20:28:45 1997  Geoffrey Noer  <noer@cygnus.com>
+
+	* config/mh-cygwin32: also build random.o
+
+Tue Aug 19 17:10:56 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* cplus-dem.c: Add 'extern' to prepends_underscore.
+
+Wed Jul 30 11:42:19 1997  Per Bothner  <bothner@cygnus.com>
+
+	* cplus-dem.c: Various changes to produce Java output when passed
+	DMGL_JAVA.  Thus "::" becomes "." and "JArray<Foo>" becomes "Foo[]".
+	(main): Support --java and -j flags to set DMGL_JAVA.
+
+Tue Jul 22 19:05:23 1997  Robert Hoehne <robert.hoehne@Mathematik.TU-Chemnitz.DE>
+
+	* config/mh-go32 (CC, AR, RANLIB): Don't define.
+
+Tue Jul 22 17:49:54 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (REQUIRED_OFILES): Add pexecute.o.
+	(pexecute.o): New target.
+
+	* Makefile.in (stamp-needed): New target, replacing needed-list.
+	(needed-list): Just depend upon stamp-needed.
+	(stamp-config): New target, replacing config.h.
+	(config.h): Just depend upon stamp-config.
+	(mostlyclean): Remove stamp-*.
+
+Thu Jun 12 11:00:18 1997  Angela Marie Thomas (angela@cygnus.com)
+
+	* Makefile.in (FLAGS_TO_PASS): pass INSTALL, INSTALL_PROGRAM and
+	INSTALL_DATA for multilibbed installs
+
+Tue Jun  3 13:21:05 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	Tue Dec 10 09:44:57 1996  Paul Eggert  <eggert@twinsun.com>
+
+	* choose-temp.c (choose_temp_base): Don't dump core if TMPDIR is empty.
+
+	* choose-temp.c (try): Insist that temp dir be searchable.
+
+	Wed Oct 23 17:36:39 1996  Doug Rupp  (rupp@gnat.com)
+
+	* choose-temp.c (choose_temp_base): On VMS, use proper syntax
+	for current directory.
+
+	Sat Feb 15 19:03:48 1997  Geoffrey Noer  (noer@cygnus.com)
+
+	* pexecute.c: Remove special cases for cygwin32.
+	(pwait): Remove local definition of `pid'.
+
+	Tue Nov 12 18:26:15 1996  Doug Rupp  (rupp@gnat.com)
+
+	* pexecute.c (vfork): Supply new definition for VMS.
+	(pwait): Use waitpid instead of wait for VMS.
+
+Tue May 20 14:02:20 1997  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+	* cplus-dem.c (do_type): Handle `J'.
+	(demangle_fund_type): Print "complex" for it.
+
+Wed Apr 30 12:15:45 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* configure.in: Don't turn on multilib here.
+
+Mon Apr 28 19:04:31 1997  Michael Snyder  <msnyder@cleaver.cygnus.com>
+
+	* obstack.c: move _obstack_memory_used outside of ifdef.  Cannot be
+	elided; needed by gdb and not present in libc.
+
+Thu Apr 24 19:33:47 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (clean): Remove tmpmulti.out.
+
+Tue Apr 22 10:25:15 1997  Fred Fish  <fnf@cygnus.com>
+
+	* floatformat.c (floatformat_ieee_double_littlebyte_bigword):
+	Add new floatformat, mainly for ARM doubles.
+
+Mon Apr 14 12:11:16 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.table: Use ${config_shell} with ${moveifchange}.  From
+	Thomas Graichen <graichen@rzpd.de>.
+
+Fri Apr  4 03:09:24 1997  Ulrich Drepper  <drepper@cygnus.com>
+
+	* configure.in: Enable multilibing by default.
+	Update multilib template to read config-ml.in.
+
+Tue Apr  1 16:26:39 1997  Klaus Kaempf  <kkaempf@progis.de>
+
+	* makefile.vms: Add objalloc.
+
+Mon Mar 31 23:57:51 1997  H.J. Lu  <hjl@gnu.ai.mit.edu>
+
+	* cplus-dem.c (demangle_it): Add prototype declaration.
+	(usage, fatal): Likewise.
+
+	* xexit.c (_xexit_cleanup): Add prototype.
+
+	* strerror.c (init_error_tables): Declare.
+
+Fri Mar 28 11:43:20 1997  H.J. Lu  <hjl@lucon.org>
+
+	* functions.def: Add DEF of vasprintf, and DEFFUNC of strsignal.
+	* strsignal.c: Only define strsignal if NEED_strsignal.
+	* Makefile.in (REQUIRED_OFILES): Remove vasprintf.o.
+	* configure.in: Add NEED_strsignal to xconfig.h.  Add vasprintf.o
+	to xneeded-list.
+	* config/mh-cygwin32 (HDEFINES): Add -DNEED_strsignal.
+	(EXTRA_OFILES): Define to vasprintf.o.
+	* config/mh-windows (HDEFINES): Add -DNEED_strsignal.
+	(EXTRA_OFILES): Add vasprintf.o.
+	* config/mt-vxworks5 (vxconfig.h): Define NEED_strsignal.
+	(vxneeded-list): Add vasprintf.o.
+
+Thu Mar 20 17:02:09 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objalloc.c: Include <stdio.h>.
+
+Mon Mar 17 19:23:11 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* objalloc.c: New file.
+	* Makefile.in (CFILES): Add objalloc.c
+	(REQUIRED_OFILES): Add objalloc.o.
+	(objalloc.o): New target.
+
+Sat Mar 15 18:49:41 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* obstack.c: Update to current FSF version.
+
+Fri Mar 14 14:18:47 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cplus-dem.c: Add prototypes for all static functions.
+	(mystrstr): Make static.  Make arguments and result const.
+	(cplus_match): Remove; not used.
+
+Tue Mar 11 14:20:31 1997  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+	* cplus-dem.c (gnu_special): Call demangled_fund_type for other
+	__t* symbols.
+
+Tue Mar 11 15:41:21 1997  H.J. Lu  <hjl@lucon.org>
+
+	* spaces.c: Declare malloc and free properly.
+	* strsignal.c (init_signal_tables): Add prototype.
+	* xatexit.c (_xexit_cleanup): Add parameter declarations.
+
+Wed Feb 19 15:43:24 1997  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+	* Makefile.in (lneeded-list): If alloca.o is needed, xexit.o is
+	also required because of xmalloc.o.
+
+Fri Feb 14 13:43:38 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* strsignal.c: Unconditionally redefine sys_siglist around the
+	inclusion of the system header files.
+
+Thu Feb 13 22:01:04 1997  Klaus Kaempf  <kkaempf@progis.de>
+
+	* makefile.vms: Remove 8 bit characters.  Update to latest
+	gcc release.
+
+Tue Feb  4 11:52:19 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* strsignal.c: Use NEED_sys_siglist instead of
+	LOSING_SYS_SIGLIST.
+	* config.table: Don't use mh-lynxos.
+	* config/mh-lynxos: Remove.
+
+Thu Jan 16 14:51:03 1997  Bob Manson  <manson@charmed.cygnus.com>
+
+	* cplus-dem.c: Fix indenting; make identical to the copy
+	in GCC.
+	(do_type, case 'M'): Check for a template as well as a class.
+
+Thu Dec 19 13:51:33 1996  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+	* config/mt-vxworks5 (vxneeded-list): Remove sigsetmask.o, since
+	vxworks 5.[0-3] all have sigsetmask in them; the one provided by
+	libiberty is incorrect, as well.
+
+Mon Dec  2 15:03:42 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* alloca.c (alloca): When compiled with an ANSI/ISO compiler,
+	alloca takes a size_t argument, not just unsigned.
+
+Mon Nov 18 15:42:08 1996  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* cplus-dem.c: Note that this file also lives in GCC.
+
+Mon Nov 18 15:19:00 1996  Dawn Perchik  <dawn@critters.cygnus.com>
+
+	* alloca.c: Remove include of libiberty.h for hpux.
+	* argv.c:  Replace defs from libiberty.h.
+	* spaces.c: Put back externs from removed from libiberty.h.
+	* vasprintf.c: Remove include of libiberty.h for hpux.
+
+Mon Nov 18 14:08:00 1996  Dawn Perchik  <dawn@critters.cygnus.com>
+
+	* cplus-dem.c: Checking in again; last checkin filed due to sticky tag.
+
+Wed Nov 13 08:22:00 1996  Dawn Perchik  <dawn@critters.cygnus.com>
+
+	* cplus-dem.c: Revert last two commits due to conflicts with
+	hpux system headers.
+
+Wed Nov 13 08:22:00 1996  Dawn Perchik  <dawn@critters.cygnus.com>
+
+	* alloca.c, argv.c, spaces.c, strcasecmp.c, vasprintf.c, vprintf.c:
+	Revert last commit due to conflicts with hpux system headers.
+
+Wed Nov 13 10:36:50 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* cplus-dem.c (x{m,re}alloc): Make declarations compatibile with
+	libiberty.h when compiled with a standard compiler.
+
+Tue Nov 12 16:31:00 1996  Dawn Perchik  <dawn@critters.cygnus.com>
+
+	* alloca.c: Include libiberty.h for definition of xmalloc.
+	Don't redefine NULL.
+	* argv.c: Move prototypes to libiberty.h.
+	* cplus-dem.c: Include libiberty.h for definition of xmalloc.
+	Don't redefine NULL.
+	Use casts to eliminate compiler warnings.
+	* spaces.c: Remove prototypes for malloc and free which are
+	already in libibrty.h.
+	* strcasecmp.c: Use casts to eliminate compiler warnings.
+	* vasprintf.c: Include libiberty.h for definition of malloc.
+	Don't redefine NULL.
+	* vprintf.c: Include stdarg.h if __STDC__.
+
+Fri Oct 11 15:42:12 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* config/mh-windows:  Add strcasecmp.o to EXTRA_OFILES.
+
+Fri Oct 11 11:16:31 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw.c (mpwify_filename): Rewrite to simplify, and to handle
+	upward components correctly.
+
+Tue Oct  8 08:55:34 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* config.table, config/mh-windows:  Add support for building under
+	MSVC (the Microsoft build environment).
+
+Mon Oct  7 10:50:27 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* fnmatch.c: Undef const if not __STDC__.
+
+Thu Oct  3 13:46:39 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* fnmatch.c: New file.
+	* Makefile.in (CFILES): Add fnmatch.c.
+	(REQUIRED_OFILES): Add fnmatch.o.
+	(fnmatch.o): New target.
+
+Wed Sep 18 14:49:13 1996  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* cplus-dem.c (demangle_template): Fix handling of address args.
+	(gnu_special): Handle type_info stuff.
+
+Fri Sep 13 17:52:55 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw.c (DebugPI): Make settable from the env var DEBUG_PATHNAMES.
+	(mpwify_filename): Handle "::/" case.
+
+Thu Sep 12 13:30:40 1996  Geoffrey Noer  <noer@cygnus.com>
+
+	* config/mh-cygwin32: new file (need -DNEED_basename and
+		-DNEED_sys_siglist for native NT rebuilding)
+	* config.table (*-*-cygwin32): new entry
+	* choose-temp.c: bring in sync with gcc (revert Aug 17 change)
+
+Thu Aug 29 16:48:45 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* config.table (i[345]86-*-*): Recognize i686 for pentium pro.
+
+Tue Aug 27 13:47:58 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* pexecute.c (pexecute) [MPW]: Remove old bogus code that
+	messed with arguments that included a '/', add escape chars
+	to double quotes, remove const decl from arg that Mac
+	compilers don't seem to like.
+
+Sat Aug 17 04:44:27 1996  Geoffrey Noer  <noer@cygnus.com>
+
+	* pexecute.c: Update test for win32 (&& ! cygwin32).
+	* choose-temp.c: fix WIN32 preprocessor defines
+
+Thu Aug 15 12:26:48 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-make.sed: Add @DASH_C_FLAG@ and @SEGMENT_FLAG({Default})@
+	to editing of default makefile rule.
+
+Sun Aug 11 21:03:27 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* alloca-norm.h:  Include <malloc.h> if _WIN32.
+	* argv.c:  Include non-prototyped decls for malloc and string
+	functions if ! _WIN32 or if __GNUC__.
+
+Thu Aug  8 12:42:40 1996  Klaus Kaempf  <kkaempf@progis.de>
+
+	* config.h-vms: New file.
+	* makefile.vms: Use it.
+
+Wed Aug  7 17:16:12 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* getopt.c (_getopt_internal):  If argc is 0, just return (before
+	we reference *argv and segfault).
+
+Mon Aug  5 01:29:08 1996  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* Makefile.in (distclean): Add multilib.out.
+
+Thu Jul 18 17:40:55 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* alloca-norm.h: Change #ifdef sparc to #if defined (sparc) &&
+	defined (sun).  From Andrew Gierth <ANDREWG@microlise.co.uk>.
+
+Mon Jul  1 13:40:44 1996  Ken Raeburn  <raeburn@cygnus.com>
+
+	Tue May 28 15:29:03 1996  Pat Rankin  <rankin@eql.caltech.edu>
+
+	* vmsbuild.com (REQUIRD_OFILES): Add choose-temp.o and xstrdup.o.
+
+	Thu Jan 25 18:20:04 1996  Pat Rankin  <rankin@eql.caltech.edu>
+
+	* vmsbuild.com: Changes to handle DEFFUNC(on_exit).
+	(do_ofiles): Allow nonexistent source file in pass 3.
+	(chk_deffunc): New routine.
+
+Tue Jun 25 19:24:43 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* pexecute.c (PEXECUTE_VERBOSE): Define.
+	(MPW pexecute): Check flags & PEXECUTE_VERBOSE instead of verbose_flag.
+
+Tue Jun 25 23:11:48 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
+
+	* Makefile.in (docdir): Removed.
+
+Tue Jun 25 23:01:07 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
+
+	* Makefile.in (oldincludedir): Removed.
+
+Tue Jun 25 22:50:07 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
+
+	* Makefile.in (datadir): Set to $(prefix)/share.
+
+Thu Jun 20 21:17:52 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cplus-dem.c (demangle_arm_pt): Reindent.  Avoid endless loop by
+	checking for errors from do_type.
+
+Tue Jun 18 14:36:19 1996  Klaus Kaempf  <kkaempf@progis.de>
+
+	* makefile.vms: New file.
+	* xmalloc.c: If VMS, include <stdlib.h> and <unixlib.h> rather
+	than declaring malloc, realloc, and sbrk.
+
+Mon Jun 10 13:17:17 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* pexecute.c: New file.
+
+Wed Jun  5 16:57:45 1996  Richard Henderson  <rth@tamu.edu>
+
+	* xmalloc.c: Declare sbrk.
+
+Sat May  4 05:08:45 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* alloca-norm.h:  Add SPARCworks cc compatible __builtin_alloca
+	declaration.
+
+Mon Apr 22 18:41:49 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xstrerror.c: Include <stdio.h>.
+
+Sun Apr 21 11:55:12 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* Makefile.in (CFILES): Add atexit.c.
+
+Sun Apr 21 09:50:09 1996  Stephen L Moshier  (moshier@world.std.com)
+
+	* choose-temp.c: Include sys/types.h before sys/file.h for sco3.2v5.
+
+Wed Apr 17 11:17:55 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* choose-temp.c: Don't #include sys/file.h ifdef NO_SYS_FILE_H.
+	#include <stdio.h>
+	* config/mt-vxworks5 (HDEFINES): Define NO_SYS_FILE_H.
+
+Tue Apr 16 11:27:16 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (lneeded-list): If alloca.o is needed, so is xmalloc.o.
+	Reverts Feb 8, 1995 change.
+
+Mon Apr 15 12:53:26 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* choose-temp.c: New file.
+	* Makefile.in (CFILES): Add choose-temp.c.
+	(REQUIRED_OFILES): Add choose-temp.o.
+
+Sat Apr 13 14:19:30 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* floatformat.c (floatformat_to_double):  Don't bias exponent when
+	handling zero's, denorms or NaNs.
+
+Thu Apr 11 13:36:56 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* floatformat.c (floatformat_to_double):  Fix bugs with handling
+	numbers with fractions < 32 bits.
+
+Mon Apr  8 14:48:34 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.table: Permit --enable-shared to specify a list of
+	directories.
+
+Tue Mar 19 22:02:07 1996  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* cplus-dem.c (demangle_template): Fix for non-mangled pointer
+	arguments.
+
+Fri Mar  8 17:24:18 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: If srcdir is `.' and with_target_subdir is not
+	`.', then set MULTISRCTOP before calling config-ml.in.
+
+Thu Mar  7 13:37:10 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw.c (mpw_open): Add debugging output option.
+
+Wed Mar  6 17:36:03 1996  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* cplus-dem.c (demangle_template): Fix for address-of-extern arguments.
+
+Tue Feb 27 12:00:50 1996  Raymond Jou  <rjou@mexican.cygnus.com>
+
+	* mpw.c (mpwify_filename): Change 6 to 5 in
+	strncmp (unixname, "/tmp/", 5).
+
+Tue Feb 20 10:55:53 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cplus-dem.c (demangle_template): Initialize is_bool.  Correctly
+	handle 0 as a pointer value parameter.
+
+Mon Feb  5 16:41:44 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (all): Depend upon required-list.
+	(required-list): New target.
+	(clean): Remove required-list.
+
+Wed Jan 31 10:19:41 1996  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* win32.c: Deleted.
+	* config.table (i386-*-win32): Deleted.
+	* config/mh-i386win32: Deleted.
+
+Thu Jan 18 11:34:17 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cplus-dem.c (cplus_demangle_opname): Change opname parameter to
+	const char *.
+	(cplus_mangle_opname): Change return type and opname parameter to
+	const char *.  Don't cast return value.
+
+Tue Jan 16 12:13:11 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw.c: Include Timer.h, in order to get m68k Microseconds trap
+	definition.
+
+Wed Jan  3 13:15:04 1996  Fred Fish  <fnf@cygnus.com>
+
+	* obstack.c: Update copyright to 1996.
+	(_obstack_memory_used): Define new function.  Called via
+	obstack_memory_used macro.
+
+Thu Dec 28 11:39:40 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* xstrdup.c: New file.
+	* Makefile.in (CFILES): Add xstrdup.c.
+	(REQUIRED_OFILES): Add xstrdup.o.
+	(xstrdup.o): New target.
+
+Mon Dec 11 18:18:52 1995  Mike Stump  <mrs@cygnus.com>
+
+	* atexit.c: New stub to provide atexit on systems that have
+	on_exit, like SunOS 4.1.x systems.
+	* functions.def (on_exit, atexit): Ditto.
+
+Mon Dec 11 15:42:14 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw.c (mpw_abort): Remove decl.
+	(mpw_access): Move debugging printf.
+
+Sat Dec  2 01:25:23 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.table: Consistently use ${host} rather than ${xhost} or
+	${target}.
+	* configure.in: Don't bother to set ${xhost} before calling
+	config.table.
+
+Tue Nov 28 14:16:57 1995  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+	* Makefile.in (.c.o): Use test instead of the left bracket, to
+	avoid problems with some versions of make.
+
+Tue Nov 28 11:45:17 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-make.sed: Fix INCDIR edit to work with Nov 14 change.
+
+Tue Nov 21 11:26:34 1995  Fred Fish  <fnf@rtl.cygnus.com>
+
+	* config/mh-hpux: Remove.  It was only used to define EXTRA_OFILES,
+	which was set to just alloca.o, which is now automatically marked
+	as needed by the autoconfiguration process.
+
+Tue Nov 21 14:15:06 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.table: Check ${with_cross_host} rather than comparing
+	${host} and ${target}.
+
+Thu Nov 16 14:34:42 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: If with_target_subdir is empty, set xhost to
+	${host} rather than ${target} before calling config.table.
+
+Tue Nov 14 01:38:30 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* Makefile.in (MULTITOP): Deleted.
+	(MULTISRCTOP, MULTIBUILDTOP): New.
+	(FLAGS_TO_PASS): Delete INCDIR.
+	(INCDIR): Add $(MULTISRCTOP).
+	(install_to_libdir): Add $(MULTISUBDIR).  Call $(MULTIDO).
+	* configure.in: Delete call to cfg-ml-com.in.  Call config-ml.in
+	instead of cfg-ml-pos.in.
+	(cross-compile check): Change to test for with_target_subdir.
+	(EXTRA_LINKS): Delete.
+
+Sun Nov 12 12:13:04 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-make.sed: Add getpagesize.c.o to needed-list.
+	* mpw.c [USE_MW_HEADERS]: Conditionalize compiling of
+	functions that are supplied by Metrowerks libraries.
+	(fstat): Clean up descriptor->pointer conversion code.
+	(InstallConsole, etc): Empty definitions, for when linking
+	with SIOUX.
+
+Sun Nov  5 19:25:27 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* Makefile.in (FLAGS_TO_PASS):  Also pass PICFLAGS.
+	(.c.o):  Stylistic change.
+
+Thu Nov  2 12:06:29 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* strtol.c, strtoul.c: Don't include <stdlib.h>.  From
+	phdm@info.ucl.ac.be (Philippe De Muyter).
+
+Wed Nov  1 11:59:36 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Correct sed call.
+
+Mon Oct 30 13:03:45 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* configure.in:  Clean up / simplify for native.
+
+	* configure.in:  Merge in stuff from ../xiberty/configure.in.
+	* Makefile.in (CC):  Add definition (so it can be overrridden
+	by ../configure).
+
+Tue Oct 24 17:57:27 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-make.sed: Leave strerror.c.o in standard list of functions.
+	* mpw.c (R_OK, ENOENT, EACCESS, ENOSYS): Remove.
+	(link): Remove useless definition with error return.
+	(last_microseconds, warn_if_spin_delay, record_for_spin_delay):
+	Use UnsignedWide type for microsecond counts.
+
+Thu Oct 19 10:52:07 1995  Michael Meissner  <meissner@wogglebug.tiac.net>
+
+	* memcmp.c (memcmp): Argument types are const void *, not void
+	*const.
+
+	* strncasecmp.c (strncasecmp): Include ansidecl.h/stdarg.h, not
+	sys/types.h.
+	* strcasecmp.c (strcasecmp): Ditto.
+
+Tue Oct 10 11:03:24 1995  Fred Fish  <fnf@cygnus.com>
+
+	* Makefile.in (BISON):  Remove macro.
+
+Tue Sep 26 15:06:46 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* Makefile.in (HFILES): Add default empty definition.
+	* mpw-config.in (config.h): Only update if changed.
+	* mpw-make.in: Remove.
+	* mpw-make.sed: New file, edits Makefile.in into MPW makefile.
+	* mpw.c: Remove semi-clone of strerror code.
+	(sys_nerr, sys_errlist): Define here.
+	(Microseconds): Only define as A-line trap if m68k Mac.
+
+Wed Sep 20 12:53:32 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (maintainer-clean): New synonym for distclean.
+
+Mon Aug 28 19:47:52 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* config.table:  For host, generalize rs6000-ibm-aix*
+	to *-ibm-aix* so we also include powerpc.
+
+Tue Aug 22 03:18:05 1995  Ken Raeburn  <raeburn@kr-laptop.cygnus.com>
+
+	Fri Jun 16 18:35:40 1995  Pat Rankin  (rankin@eql.caltech.edu)
+
+	* xstrerror.c: New file.
+	* Makefile.in, vmsbuild.com: Compile it.
+
+Mon Jul 31 12:16:32 1995  steve chamberlain  <sac@slash.cygnus.com>
+
+	* config.table (i386-*-win32): New.
+
+Fri Jul 21 11:35:52 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+	* Makefile.in (MULTITOP): New variable.
+	(MULTIDIRS, MULTISUBDIR, MULTIDO, MULTICLEAN): Likewise.
+	(all): Add multilib support.
+	(install_to_tooldir, *clean): Likewise.
+
+Mon Jul 10 11:47:27 1995  Ken Raeburn  <raeburn@cygnus.com>
+
+	* makefile.dos (OBJS): Add hex.o.  From DJ Delorie.
+
+Fri Jun 30 17:28:59 1995  Pat Rankin  (rankin@eql.caltech.edu)
+
+	* vmsbuild.com:  create "new-lib.olb", build libiberty under that
+	name, and then make it become "liberty.olb" when done, so that an
+	incomplete build attempt never leaves behind something which looks
+	like a complete library.
+
+Thu Jun 29 00:22:02 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* config/mh-i386pe: New file for PE hosts.
+	* config.table: Understand PE hosts.
+
+Wed Jun 28 19:13:23 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* cplus-dem.c: Update from gcc.
+
+	* argv.c, dummy.c: If __STDC__, #include "alloca-conf.h" after
+	<stddef.h>.
+	* alloca-norm.h: If __STDC__, declare alloca with its parameter.
+
+Thu Jun 22 18:57:47 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-make.in (ALL_CFLAGS): Define NEED_basename.
+	* mpw.c: Only test DebugPI once whenever printing debug info.
+	(mpwify_filename): If filename is /tmp/foo, change it into :_foo,
+	also fix to not write on input filename buffer.
+	(mpw_access): Use stat() instead of open(), works for directories
+	as well as files.
+
+Mon Jun 19 00:33:22 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* Makefile.in: Massage broken shells that require 'else true'.
+
+Sat Jun 17 23:21:58 1995  Fred Fish  <fnf@cygnus.com>
+
+	* alloca-norm.h: Declare alloca as type "PTR" to match functions.def.
+	Declare __builtin_alloca in the sparc case, as argv.c did.
+	* argv.c: Replace inline version of alloca-norm.h at start of file with
+	a #include of alloca-conf.h.  Precede it with an include of ansidecl.h
+	because alloca-norm.h needs to declare alloca as "PTR".
+
+Mon Jun 12 14:24:26 1995  Steve Chamberlain  <sac@slash.cygnus.com>
+
+	* win32.c: New file.
+
+Fri Jun  9 15:16:14 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* dummy.c: #include "alloca-conf.h".
+
+Wed Jun  7 11:46:23 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* Makefile.in (mostlyclean): Remove stamp-picdir.
+	(clean): Don't.
+
+Mon Jun  5 18:46:06 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* config.table (frags): Use toplevel pic frags.
+
+	* Makefile.in (PICFLAG): New macro.
+	(all): Depend on stamp-picdir.
+	(needed-list): Ditto.
+	(.c.o): Also build pic object.
+	(stamp-picdir): New rule.
+	(mostlyclean): Remove pic.
+	(clean): Remove stamp-picdir.
+
+Fri Mar 24 16:55:48 1995  Pat Rankin  (rankin@eql.caltech.edu)
+
+	* vmsbuild.com (config.h): Add `#define NEED_basename'.
+
+Tue May 23 10:12:46 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* clock.c, getopt.c, strtod.c, vsprintf.c:  Change from using LGPL
+	to libio-style copyright.
+	* getpagesize.c:  Remove FSF copyright.
+
+Sat May 20 12:30:23 1995  Ken Raeburn  <raeburn@kr-laptop.cygnus.com>
+
+	Added improved VMS support from Pat Rankin:
+
+	Fri Mar 17 18:40:36 1995  Pat Rankin  (rankin@eql.caltech.edu)
+
+	* vmsbuild.com:  new file.
+
+	* getpagesize.c (getpagesize):  implement for VMS;
+	* strerror.c (strerror, strerrno, strtoerrno):  add rudimentary
+	support for EVMSERR.
+
+Thu May 18 17:01:42 1995  Ken Raeburn  <raeburn@kr-laptop.cygnus.com>
+
+	Wed May 10 14:28:16 1995 Richard Earnshaw (rearnsha@armltd.co.uk)
+
+	* floatformat.c (floatformat_arm_ext): Define.
+
+Tue May 16 13:30:59 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* basename.c, bcmp.c, getcwd.c, insque.c, rename.c, sigsetmask.c,
+	strerror.c, strsignal.c:  Remove FSF copyright.
+	* sigsetmask.c: #include <sys/types.h> - seems to be needed by ISC.
+
+Mon May 15 19:53:17 1995  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* bcopy.c, bzero.c, memcmp.c, memcpy.c, memset.c, strchr.c,
+	strrchr.c, strstr.c, vfork.c:  Remove FSF Copyright, because this
+	might contaminate libstdc++ with the LGPL.  (OK'd by RMS 11 Oct 94.)
+	* strchr.c, strrchr.c:  Add cast to suppress const warning.
+
+Thu May  4 14:36:42 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* cplus-dem.c: Use const instead of CONST.  Don't include
+	ansidecl.h directly.
+
+Wed Apr 19 01:30:27 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* cplus-dem.c: Don't include libiberty.h.  Do declare xmalloc and
+	xrealloc.
+	(-DMAIN): Don't rely on an externally-defined version number;
+	instead, require the version number to be defined as a
+	preprocessor macro.  Handle the RS/6000 leading dot.  Define
+	xmalloc, xrealloc and fatal.  Don't strip a leading underscore
+	if we couldn't demangle the word.
+
+Tue Apr  4 13:03:51 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	(Old mpw.c change descriptions retained for informational value.)
+	* mpw.c (warning_threshold): Default to .4 sec.
+	(overflow_count, current_progress): New globals.
+	(warn_if_spin_delay): Include current progress type,
+	such as program name, in message.
+	(mpw_start_progress): Set current_progress variable from arg.
+	(mpw_end_progress): Report spin delays by power-of-two-size
+	buckets instead of constant-size buckets.
+
+	* mpw.c: Clean up formatting, types, returns, etc.
+	(ENOSYS): Define.
+	(mpw_fread, mpw_fwrite): Define.
+	(sleep): Define correctly.
+
+	* mpw.c: New code to implement cursor spinning support.
+	(umask): New function.
+	(mpw_fopen, mpw_fseek, stat, fstat): Call PROGRESS.
+
+	* mpw.c (mpw_basename, mpw_mixed_basename): New functions, find
+	basenames for MPW and MPW/Unix filenames.
+	(mpw_special_init): New function, calls Macsbug if desired.
+
+	* mpw.c: Add GPL notice.
+	(mpwify_filename): Add more transformations.
+	(mpw_fopen): Call mpwify_filename on file names.
+	(rename): Remove.
+	(chdir, getcwd): Add simple definitions.
+
+	* mpw.c: Random cleanups, remove unused code bits.
+	Added copy of strerror.c for gcc's use.
+	(stat, fstat, _stat): New versions based on Guido van Rossum code.
+
+	* mpw.c (mpw_fseek): Make it work correctly when doing SEEK_CUR.
+
+	* mpw.c (stat): Remove hack definition, get from sys/stat.h.
+	(fork, vfork, etc): Print error messages if called.
+	(getrusage, sbrk, environ, isatty, link, utime, mkdir, rmdir,
+	rename, chown): Define.
+
+	* mpw-config.in: New file, MPW version of configure.in.
+	* mpw-make.in: New file, MPW version of Makefile.in.
+	* mpw.c: New file, MPW compatibility routines.
+
+Fri Mar 24 14:10:30 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* basename.c: Include config.h before checking for NEED_basename.
+
+Thu Mar 23 19:09:54 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* functions.def: Add DEFFUNC for basename.
+
+	* basename.c: Only define basename if NEED_basename.
+
+Thu Mar 16 13:36:05 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* config.table: Fix --enable-shared logic for native builds.
+
+Mon Mar 13 11:05:11 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* cplus-dem.c (demangle_template): Demangle bool literals properly.
+
+Mon Mar  6 23:57:28 1995  Stu Grossman  (grossman@cygnus.com)
+
+	* strtol.c strtoul.c:  Replace these with less buggy versions from
+	NetBSD.  (strtoul in particular couldn't handle base 16.)
+
+Wed Mar  1 15:59:01 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config/mt-vxworks5 (HDEFINES): Define NO_SYS_PARAM_H.
+
+	* clock.c: If NO_SYS_PARAM_H is defined, don't include
+	<sys/param.h>.
+	* getcwd.c, getpagesize.c, getruntime.c: Likewise.
+
+Fri Feb 17 15:40:55 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* getruntime.c (get_run_time): Don't assume that CLOCKS_PER_SEC is
+	a number; ANSI appears to permit any expression, including a
+	function call.
+
+	* config.table (*-*-vxworks5*): Use mt-vxworks5 when configuring
+	xiberty.
+	* config/mt-vxworks5: New file.
+
+Thu Feb  9 14:19:45 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* basename.c (basename): Change argument to be const.
+
+Wed Feb  8 18:06:52 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* Makefile.in (lneeded-list): Don't worry about xmalloc.
+
+Sun Jan 15 00:40:36 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* Makefile.in (distclean): Delete xhost-mkfrag.
+
+Thu Jan 12 16:54:18 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
+
+	* Makefile.in (lneeded-list): If alloca.o is needed, so is xmalloc.o.
+
+Wed Jan 11 22:39:56 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* hex.c: New file.
+	* Makefile.in (REQUIRED_OFILES, CFILES): List it.
+	(hex.o): Add dependencies.
+
+	* cplus-dem.c (demangle_prefix): For GNU style constructor and
+	destructor names, try demangling the remainder of the string.
+
+Wed Dec 28 00:49:15 1994  Ian Lance Taylor  <ian@tweedledumb.cygnus.com>
+
+	* vasprintf.c (int_vasprintf): New static function.
+	(vasprintf): Use int_vasprintf.  Removes assumption that va_list
+	is assignment compatible.
+
+Sat Nov  5 19:29:12 1994  Jason Merrill  (jason@phydeaux.cygnus.com)
+
+	* Makefile.in (LIBCFLAGS): New variable.
+	(FLAGS_TO_PASS): Pass it.
+	(.c.o): Use it.
+
+Thu Nov  3 19:09:47 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
+
+	* getopt.c, getopt1.c: Do compile these functions under Linux,
+	since many native versions are based on glibc but are buggy.
+
+Mon Oct 24 15:16:46 1994  Per Bothner  <bothner@kalessin.cygnus.com>
+
+	* vasprintf.c:  Make 'format' arg be const, to avoid a mismatch
+	with prototype in GNU libc.  Support stdarg.h as well as varargs.h.
+
+Tue Oct 11 17:48:27 1994  Jason Merrill  (jason@phydeaux.cygnus.com)
+
+	* Makefile.in (REQUIRED_OFILES): Add vasprintf.o.
+	* functions.def: Remove vasprintf.
+
+Wed Sep 14 17:04:55 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* xmalloc.c (first_break): New static variable.
+	(xmalloc_set_program_name): Record sbrk (0) in first_break.
+	(xmalloc): If memory allocation fails, try to report how much
+	memory was allocated by the program up to this point.
+	(xrealloc): Likewise.
+
+Sun Sep 04 17:58:10 1994  Richard Earnshaw (rwe@pegasus.esprit.ec.org)
+
+	* Makefile.in (ERRORS_CC): New variable, defaulted to $(CC).  Use it
+	when linking dummy.
+	* config.table: Add host RISCiX Makefile frag.
+	* config/mh-riscix: New file.
+
+Thu Aug 25 17:29:44 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* Makefile.in (FLAGS_TO_PASS): Define.
+	($(RULE1)): Use $(FLAGS_TO_PASS).
+
+Wed Aug 24 17:08:47 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* vasprintf.c: Include <string.h>.
+	(vasprintf): Add casts to void for va_arg to avoid gcc warnings.
+	* xatexit.c: Declare malloc.
+
+Fri Aug 19 15:29:12 1994  Kung Hsu  (kung@mexican.cygnus.com)
+
+	* cplus-dem.c (demangle_args): Fix a bug in previous patch (the
+	one below).
+
+Thu Aug 18 14:37:14 1994  Kung Hsu  (kung@mexican.cygnus.com)
+
+	* cplus-dem.c (demangle args): Handle ARM repeat encoding where
+	the type index is greater than 9.
+
+Wed Aug 17 16:13:49 1994  Kung Hsu  (kung@mexican.cygnus.com)
+
+	* cplus-dem.c (demangle_qualified): accept optional '_' between
+	qualified name. This is baecause the template name may end with
+	numeric and can mixed up with the length of next qualified name.
+
+Wed Aug  3 05:52:14 1994  D. V. Henkel-Wallace  (gumby@cygnus.com)
+
+	* config/mt-sunos4: Use our standard location for cross-includes
+	and cross-libs when the target is also a "host" environment (ie no
+	newlib; includes and such don't belong to us).  This is specific
+	to the Cygnus Support environment.
+
+Tue Aug  2 15:25:12 1994  Kung Hsu  (kung@mexican.cygnus.com)
+
+	* cplus-dem.c (demangle_template): demangle as xxx<'Q'> not
+	xxx<ch=81>.
+
+Mon Aug  1 17:02:48 1994  Kung Hsu  (kung@mexican.cygnus.com)
+
+	* cplus-dem.c (main): flush stdout to make pipe work.
+
+Sat Jul 16 12:56:32 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* config.table (*-*-cxux7*):  Recognize.
+	* floatformat.c (floatformat_m88110_ext) [HARRIS_FLOAT_FORMAT]:
+	Harris-specific float format.
+	* config/mh-cxux7: New file.
+
+Wed Jun 29 00:26:17 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* cplus-dem.c (demangle_template):  Make sure that the result of
+	consume_count doesn't index beyond the end of the string.
+
+Mon Jun 20 23:54:37 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* cplus-dem.c (gnu_special):  Handle vtable mangling of gcc-2.4.5 and
+	earlier. Improve test for new vtable mangling. Change output back
+	to `virtual table'.
+
+Mon Jun 20 11:37:30 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* obstack.c: Always compile this code, even if using the GNU
+	library.  Avoids problems with relatively recent binary
+	incompatibility.
+
+Thu Jun 16 17:54:01 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* cplus-dem.c: Include libiberty.h.
+	(xmalloc, xrealloc, free): Don't declare.
+	(strstr): Don't declare parameters.
+	(xmalloc, xrealloc): Don't define.
+	(long_options): Add no-strip-underscores.
+	(main): Call xmalloc_set_program_name.  Pass n in short options to
+	getopt_long.  Handle option 'n' to not strip underscores.
+	(usage): Mention -n and --no-strip-underscores.
+
+Sun Jun 12 01:37:09 1994  Jason Merrill  (jason@deneb.cygnus.com)
+
+	* cplus-dem.c (demangle_template): Separate consecutive >'s with a
+	space.
+	(gnu_special): Demangle template and qualified names in a vtable name.
+
+Fri May 27 12:27:52 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	From gas-2.3 and binutils-2.4 net releases:
+
+	Wed May 11 22:32:00 1994  DJ Delorie (dj@ctron.com)
+
+	* makefile.dos: [new] Makefile for dos/go32
+	* configure.bat: update for latest files
+	* msdos.c: remove some functions now in libc.a
+
+Fri May 20 18:53:32 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* cplus-dem.c (gnu_special):  Recognize thunks, as well as
+	the new naming style for vtables (when -fvtable-thunks).
+
+Wed May 18 13:34:06 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* Makefile.in (XTRAFLAGS): Don't define.
+	(.c.o, dummy.o): Don't use XTRAFLAGS.
+	($(RULE1)): Don't pass XTRAFLAGS down in recursive call.
+
+Fri May 13 16:02:12 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* vasprintf.c: New file.
+	* Makefile.in, functions.def: Add it.
+
+Fri May 13 16:20:28 1994  Jason Merrill  (jason@deneb.cygnus.com)
+
+	* cplus-dem.c (demangle_fund_type): Grok bool.
+
+Fri May  6 14:44:21 1994  Steve Chamberlain  (sac@cygnus.com)
+
+	* config.table: Add go32
+	* config/mh-go32: New template.
+
+Fri May  6 11:01:59 1994  D. V. Henkel-Wallace  (gumby@rtl.cygnus.com)
+
+	* config.table, config/mt-sunos4: config for when sun4 is cross target.
+
+Mon Apr 11 00:54:33 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* getopt.c [not __GNU_LIBRARY__] [__GCC__] [not __STDC__]:
+	Declare strlen to return int.  Don't include stddef.h.
+
+Fri Apr  1 00:38:17 1994  Jim Wilson  (wilson@mole.gnu.ai.mit.edu)
+
+	* getopt.c: Delete use of IN_GCC to control whether
+	stddef.h or gstddef.h is included.
+
+Thu Apr 14 14:00:56 1994  Kung Hsu  (kung@mexican.cygnus.com)
+
+	* cplus-dem.c (demangle_signature): Fix a bug in template function
+	type numbering.
+
+Wed Apr 13 17:23:03 1994  Kung Hsu  (kung@mexican.cygnus.com)
+
+	* cplus-dem.c (demangle_signature): Fix template function with arm
+	style argument type number, Tn.
+
+Wed Apr 13 17:11:15 1994  Jason Merrill  (jason@deneb.cygnus.com)
+
+	* cplus-dem.c (optable): Add new[] and delete[].
+
+Fri Apr  8 11:21:42 1994  Jim Kingdon  (kingdon@deneb.cygnus.com)
+
+	* argv.c (buildargv): Don't produce empty argument just because
+	there is trailing whitespace.
+
+Wed Apr  6 11:42:14 1994  Kung Hsu  (kung@mexican.cygnus.com)
+
+	* cplus-dem.c (demangle_template): fix 'Q' qualified name bug.
+	Handle 'p' same as 'P'.
+	* cplus-dem.c (do_type): Handle 'p' same as 'P'.
+
+Sat Mar 26 12:00:13 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* floatformat.c (get_field, put_field):  Fix off by one error in
+	little endian case.
+
+Thu Mar 24 10:40:19 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* floatformat.c (floatformat_from_double): Pass unsigned char *,
+	not char *, to put_field.
+
+Fri Mar 18 12:34:33 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* memmove.c:  Re-wrote;  placed in public domain.
+
+Wed Mar 16 10:33:07 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* cplus-dem.c (demangle_prefix): If ARM demangling, don't treat
+	__Q* as a constructor.
+
+Mon Mar 14 12:26:02 1994  Ian Lance Taylor  (ian@cygnus.com)
+
+	* ieee-float.c: Removed; no longer used.
+	* Makefile.in: Changed accordingly.
+
+Mon Mar  7 12:28:17 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* floatformat.c (get_field): Removed unused local variable i.
+	(put_field): Removed unused local variable i.
+
+Sun Feb 27 21:50:11 1994  Jim Kingdon  (kingdon@deneb.cygnus.com)
+
+	* floatformat.c: New file, intended to replace ieee-float.c.
+	* Makefile.in: Change accordingly.
+
+Thu Feb 24 11:51:12 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+	* getopt.c: Remove #ifdef GETOPT_COMPAT and #if 0 code.
+	 (_getopt_initialize): New function, broken out of _getopt_internal.
+	 (_getopt_internal):
+	 If long_only and the ARGV-element has the form "-f", where f is
+	 a valid short option, don't consider it an abbreviated form of
+	 a long option that starts with f.  Otherwise there would be no
+	 way to give the -f short option.
+
+Thu Feb 10 14:44:16 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* getopt.c [not __GNU_LIBRARY__] [__GNUC__] [not IN_GCC]:
+	Test just __STDC__, not emacs.
+
+Wed Feb  9 00:14:00 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* getopt.c [not __GNU_LIBRARY__] [__GNUC__] [not IN_GCC]
+	[emacs] [not __STDC__]: Don't include stddef.h.  Don't declare strlen.
+
+Fri Dec 24 19:43:00 1993  Noah Friedman  (friedman@nutrimat.gnu.ai.mit.edu)
+
+	* getopt.c (_NO_PROTO): Define before config.h is included.
+
+Mon Sep 20 15:59:03 1993  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
+
+	* getopt.c, getopt1.c [emacs || CONFIG_BROKETS]: Include
+	<config.h> only under these, else "config.h".
+
+Thu Aug 12 18:16:49 1993  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
+
+	* getopt.c, getopt1.c [HAVE_CONFIG_H]: Include
+	<config.h> instead of "config.h".
+
+Sun Feb 20 17:17:01 1994  Ian Lance Taylor  (ian@lisa.cygnus.com)
+
+	* concat.c: Check ANSI_PROTOTYPES rather than __STDC__ to decide
+	whether to use prototypes or not.
+	* strerror.c (const): Never undefine; let ansidecl.h handle it.
+	* strsignal.c (const): Likewise.
+
+Thu Feb 17 13:27:35 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* xatexit.c (_xexit_cleanup): Declare as extern; don't initialize.
+	Merging common and initialized variables need not be supported by
+	ANSI C compilers.
+	(xatexit): Initialize _xexit_cleanup if not already set.
+	* xexit.c: Comment fix.
+
+Wed Feb 16 01:15:36 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* xmalloc.c: Don't declare xexit; it's declared in libiberty.h.
+	(xrealloc): If oldmem is NULL, allocate with malloc, rather than
+	assuming that realloc works correctly.
+
+Tue Feb 15 09:26:16 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* concat.c, ieee-float.c:  Replace inclusion of <string.h>
+	with explicit function declarations, as recommended by Ian Taylor.
+
+Sat Feb 12 10:31:11 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
+
+	* xmalloc.c (xmalloc, xrealloc): Use PTR and size_t throughout.
+	(malloc, realloc): Declare.
+
+Thu Feb 10 17:08:19 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* argv.c, basename.c: Include ansidecl.h and libiberty.h.
+	* concat.c, fdmatch.c, getruntime.c, spaces.c: Likewise.
+	* strerror.c, strsignal.c, xatexit.c, xexit.c: Likewise.
+	* xmalloc.c: Likewise.
+	* concat.c: Don't declare xmalloc.  If __STDC__, use <stdarg.h>
+	macros, not <varargs.h> macros.
+	* spaces.c (spaces): Make return type const.  Don't crash if
+	malloc returns NULL.
+	* strerror.c (struct error_info): Make name and msg fields const.
+	(error_names): Make const.
+	(strerrno): Make const.
+	(strtoerrno): Make argument const.
+	* strsignal.c (struct signal_info): Make name and msg fields
+	const.
+	(signal_names, sys_siglist): Make const.
+	(strsignal, strsigno): Make const.
+	(strtosigno): Make argument const.
+	* xatexit.c: Declare parameter types.
+	* xmalloc.c (name): Make const.
+	(xmalloc_set_program_name): Make argument const.
+	* Makefile.in (INCDIR): Define.
+	(.c.o): Use $(INCDIR).
+	(dummy.o): Likewise.
+	(argv.o, basename.o): New targets; depend on libiberty.h.
+	(concat.o, fdmatch.o, getruntime.o, spaces.o): Likewise.
+	(strerror.o, strsignal.o, xatexit.o, xexit.o): Likewise.
+	(xmalloc.o): Likewise.
+	(cplus-dem.o): New target; depend on demangle.h.
+	(getopt.o, getopt1.o): New targets; depend on getopt.h.
+	(ieee-float.o): New target; depend on ieee-float.h.
+	(obstack.o): New target; depend on obstack.h.
+
+Tue Feb  8 05:29:08 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	Handle obstack_chunk_alloc returning NULL.  This allows
+	obstacks to be used by libraries, without forcing them
+	to call exit or longjmp.
+	* obstack.c (_obstack_begin, _obstack_begin_1, _obstack_newchunk):
+	If CALL_CHUNKFUN returns NULL, set alloc_failed, else clear it.
+	(_obstack_begin, _obstack_begin_1): Return 1 if successful, 0 if not.
+
+Tue Feb  8 00:32:28 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* concat.c, ieee-float.c:  Include <string.h>.
+
+Sun Feb  6 21:28:46 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* xmalloc.c (xmalloc_set_program_name): New function.
+	(xmalloc, xrealloc): Include the name in the error message, if set.
+
+	* Replace atexit.c with xatexit.c.
+	* Makefile.in (CFILES), functions.def: Change references.
+
+Sat Feb  5 14:02:32 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* getruntime.c (get_run_time): Use getrusage or times if
+	HAVE_GETRUSAGE or HAVE_TIMES are defined.
+
+Fri Feb  4 15:49:38 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* atexit.c: New file.
+	* Makefile.in (CFILES), functions.def: Add it.
+	* xexit.c: New file.
+	* Makefile.in (CFILES, REQUIRED_OFILES): Add it.
+	* xmalloc.c (xmalloc, xrealloc): Call xexit instead of exit.
+	Change request for 0 bytes into request for 1 byte.
+
+Wed Feb  2 11:36:49 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* xmalloc.c (xmalloc, xrealloc): Print size using %lu, and cast to
+	unsigned long, to avoid warnings.
+
+Fri Jan 28 17:49:06 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* dummy.c: Don't include time.h ever; always define clock_t as
+	"unsigned long".  Until gcc/fixincludes ensures that clock_t
+	exists, __STDC__ isn't a sufficient test.  And if clock() doesn't
+	exist, clock_t probably doesn't either.
+
+Mon Jan 24 11:52:31 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* clock.c, getruntime.c: New files.
+	* Makefile.in: Add to file lists.
+	* functions.def (clock): Add to list.
+	* dummy.c (time.h): Add if __STDC__.
+	(clock_t): #define as "unsigned long" if not __STDC__.
+
+Tue Jan 11 11:27:44 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* strtod.c: Declare atof.  From edler@jan.ultra.nyu.edu (Jan
+	Edler).
+
+Tue Dec 28 14:17:30 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* Makefile.in (errors): Use CFLAGS as well as LDFLAGS when
+	linking.
+
+Fri Dec 17 12:26:07 1993  Kung Hsu  (kung@cirdan.cygnus.com)
+
+	* cplus-dem.c (demangle_arm_pt): New function.  Common code
+	for ARM template demangling.
+	* cplus-dem.c (demangle_class_name): Use demangle_arm_pt.
+	* cplus-dem.c (demangle_prefix): Likewise.
+
+Tue Nov 30 15:47:48 1993  Jason Merrill  (jason@deneb.cygnus.com)
+
+	* cplus-dem.c (cplus_demangle_opname): Add CONST to please gcc.
+
+Sat Nov 27 11:05:50 1993  Fred Fish  (fnf@cygnus.com)
+
+	Merge changes from tom@basil.icce.rug.nl (Tom R.Hageman)
+	* strerror.c, strsignal.c:  As a small space optimization, don't
+	include messages when they aren't actually used.
+
+	Merge changes from takefive.co.at!joe (Josef Leherbauer)
+	* cplus-dem.c (demangle_prefix, demangle_function_name,
+	cplus_demangle_opname):  Fixes for systems where cplus_marker
+	is something other than '$'.
+
+Fri Nov 26 13:51:11 1993  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* waitpid.c:  Simple-minded approcimation to waitpid
+	using vanilla wait.
+	* functions.def, Makefile.in:  Update accordingly,
+
+Thu Nov 18 18:01:15 1993  Kung Hsu  (kung@cirdan.cygnus.com)
+
+	* cplus-dem.c(demangle_template): fix bug template instantiation
+	with value of user defined type.
+
+Wed Nov 17 18:30:21 1993  Kung Hsu  (kung@cirdan.cygnus.com)
+
+	* cplus-dem.c(cplus_demangle_opname): add the subject new function
+	to support unified search of operator in class.
+
+Wed Nov 10 09:47:22 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	gcc -Wall lint:
+	* strtoul.c (strtoul): use "(digit = *s) != '\0'" not just
+	"digit = *s" as condition in while loop.
+
+Tue Nov  9 15:52:22 1993  Mark Eichin  (eichin@cygnus.com)
+
+	* Makefile.in: pass SHELL to recursive make
+
+Thu Nov  4 12:09:26 1993  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* vfprintf.c, vprintf.c, vsprintf.c:  Make format arg
+	be (const char*), for ANSI (and gcc w/fixproto) consistency.
+
+Thu Nov  4 08:29:04 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config.table: Make *-*-hiux* use mh-hpux.
+
+Fri Oct 22 07:53:15 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* config.table: Add * to end of all OS names.
+
+Tue Oct 19 17:12:01 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* Makefile.in (lneeded-list): ensure that object file names are
+	  not duplicated, as multiple instances of the same object file in
+	  a library causes problems on some machines
+
+Mon Oct 18 21:59:28 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* strcasecmp.c, strncasecmp.c: Change u_char to unsigned char.
+
+Fri Oct 15 22:17:11 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* strncasecmp.c: new file, implements strncasecmp
+	* strcasecmp.c: new file, implement strcasecmp
+
+	* Makefile.in (CFILES): list these two new source files
+
+	* functions.def: add strcasecmp and strncasecmp entries
+
+Fri Oct 15 14:53:05 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* strtoul.c (strtoul), strtol.c (strtol): Handle overflow
+	according to ANSI C.
+
+Thu Oct 14 16:34:19 1993  Kung Hsu  (kung@cirdan.cygnus.com)
+
+	* cplus-dem.c: add support of ARM global constructor/destructor,
+	and 'G' for passing record or union in parameter.
+
+Wed Oct 13 13:36:19 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* Makefile.in: Fix comment to clarify that stuff in REQUIRED_OFILES
+	should not be in functions.def.
+
+Wed Oct 13 13:13:38 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* functions.def: Removed xmalloc.  Stuff in REQUIRED_OFILES should
+	not be in functions.def.
+
+Mon Oct  4 18:26:39 1993  Kung Hsu  (kung@cirdan.cygnus.com)
+
+	* cplus-dem.c: change globl constructor/destructor to proper name
+
+Tue Sep 28 18:11:07 1993  Kung Hsu  (kung@cirdan.cygnus.com)
+
+	* cplus-dem.c: fix bug in constructor/destructor
+
+Tue Sep 28 16:20:49 1993  Kung Hsu  (kung@cirdan.cygnus.com)
+
+	* cplus-dem.c: support both old and new _vt$... vtbl mangled names
+
+Fri Sep 24 19:07:16 1993  Jason Merrill  (jason@deneb.cygnus.com)
+
+	* cplus-dem.c: Fix demangle_template prototype
+
+Fri Sep 24 17:32:55 1993  Kung Hsu  (kung@cirdan.cygnus.com)
+
+	* cplus-dem.c: fix template demangling
+	* cplus-dem.c: fix const type demangling
+	* cplus-dem.c: fix constructor/destructor, virtual table,
+	qualifier, global constructor/destructor demangling
+
+Wed Sep  1 23:13:11 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* strsignal.c, strerror.c: Use fully-bracketed initializer to
+	keep gcc -Wall happy.
+
+Fri Aug 27 10:30:09 1993  Jason Merrill  (jason@deneb.cygnus.com)
+
+	* cplus-dem.c (do_type): Add CONSTS to make gcc happy with last
+	patch.
+
+Fri Aug 27 11:24:54 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	Patch from Paul Flinders:
+	* cplus-dem.c (do_type): Deal with arrays.
+
+Tue Aug 24 14:23:50 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* cplus-dem.c (demangle_qualified: Deal with GNU format for more
+	than 9 classes.
+
+Wed Aug 18 19:50:29 1993  Jason Merrill  (jason@deneb.cygnus.com)
+
+	* Makefile.in (dummy.o): Redirect to /dev/null to avoid "variable
+	not initialized" warnings under HP/UX
+
+Sun Aug 15 20:42:40 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* strerror.c: Move include of stdio.h after sys_errlist #define.
+	Also remove NULL definition (stdio.h always defines NULL, so it
+	never did anything but clutter up the code).
+
+Sat Aug 14 14:21:49 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* Makefile.in, functions.def: handle xmalloc.c
+
+	* xmalloc.c: provide xmalloc and xrealloc functions
+
+Thu Aug 12 17:38:57 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* cplus-dem.c: Fix a comment.
+
+Sat Aug  7 13:56:35 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* getopt1.c: Declare const the way getopt.c does.
+
+Fri Aug  6 17:03:13 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* obstack.c, alloca.c: Update from FSF.
+	* getopt.c, getopt1.c: Update to current FSF version, which
+	doesn't use alloca.
+
+Tue Jul 27 14:03:57 1993  Brendan Kehoe  (brendan@lisa.cygnus.com)
+
+	* Makefile.in (demangle): Add the target with a message saying
+	where demangle went.
+
+Mon Jul 26 15:49:54 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* Makefile.in: Remove obsolete `demangle' target.
+
+Thu Jul 22 08:31:01 1993  Fred Fish  (fnf@deneb.cygnus.com)
+
+	* cplus-dem.c (arm_special):  Apply patch from arg@lucid.com to
+	avoid infinite loop on vtbl symbols with disambiguating "junk"
+	tacked on the end.
+
+Mon Jul 19 14:10:37 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* strsignal.c: work around some systems losing definitions of
+	sys_siglist
+
+	* config/mh-lynxos: this system has a losing definition of
+	sys_siglist
+
+	* config.table: use mh-lynxos for *-*-lynxos
+
+Mon Jul 19 17:08:52 1993  Ken Raeburn  (raeburn@rtl.cygnus.com)
+
+	* config.table: Add support for HPPA BSD hosts.
+
+	* config/mh-hpbsd: New file.
+
+Mon Jul 12 18:00:40 1993  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in (TAGS): make work when srcdir != objdir.
+
+Sun Jun 27 15:35:31 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+	* cplus-dem.c (main): Add long options, including --help and
+	--version.
+	(usage): New function from code in main.
+
+Tue Jun 22 11:37:38 1993  Per Bothner  (bothner@deneb.cygnus.com)
+
+	* config.table:  New shell scipt, sourced by both ./configure,in
+	and ../xiberty/configure.in, to avoid maintainance lossages.
+	* configure.in and ../xiberty/configure.in:  Use config.table.
+
+	* configure.in: Don't use mh-aix for AIX 3.2, only for 3.1.
+	* configure.in: Map *-*-irix* (except irix4) to mh-sysv.
+	* ../xiberty/configure.in:  Update from ./configure.in.
+
+Tue Jun 15 17:05:31 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: remove parentdir support
+
+Wed May 26 12:59:09 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* cplus-dem.c (xrealloc):  Match definition with prototype.
+
+Tue May 25 14:27:51 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* cplus-dem.c (demangle_prefix):  Demangle cfront
+	local variables as an extension to ARM demangling.
+
+Fri May 21 09:53:57 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* ieee-float.c: Don't require pointers to double to be aligned.
+
+Tue May 18 17:12:10 1993  Fred Fish  (fnf@cygnus.com)
+
+	(merge changes from dlong@cse.ucsc.edu)
+	* cplus-dem.c (consume_count):  Simplify.
+	* cplus-dem.c (arm_pt, demangle_class_name):  New functions.
+	* cplus-dem.c (various):  Calls to arm_pt, demangle_class_name.
+
+	* cplus-dem.c (xmalloc, xrealloc, strstr):  Make extern decls into
+	full prototypes.
+	* cplus-dem.c (free):  Add prototype.
+	* cplus-dem.c (optable):  Fully bracketize initializer.
+
+Fri May 14 17:13:05 1993  Per Bothner  (bothner@cygnus.com)
+
+	* cplus-dem.c:  Whether initial underscores are stripped
+	depends on the external variable prepends_underscore
+	(which is generated by the binutils Makefile).
+
+Fri May 14 07:32:20 1993  Ken Raeburn  (raeburn@deneb.cygnus.com)
+
+	* cplus-dem.c (mop_up, arm_special): Remove some unused variables.
+
+Tue May  4 20:31:59 1993  Fred Fish  (fnf@cygnus.com)
+
+	* cplus-dem.c (consume_count):  Return zero if arg does not
+	start with digit, and don't consume any input.
+
+Tue May  4 08:10:28 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* Makefile.in (demangle): Use ${srcdir} not $^.
+
+	* strtod.c: New file, needed at least for BSD 4.3.
+
+Sun May  2 11:30:42 1993  Fred Fish  (fnf@cygnus.com)
+
+	* strsignal.c (sys_siglist):  For ANSI compilations, type is
+	"const char *const".  Also remove conditionalization on __STDC__
+	since const is defined away for non-ANSI.
+
+Wed Apr 28 19:29:55 1993  Ken Raeburn  (raeburn@deneb.cygnus.com)
+
+	* configure.in: Recognize *-*-hpux.
+	* config/mh-hpux: New file.
+
+Tue Apr 27 15:22:19 1993  Per Bothner  (bothner@cygnus.com)
+
+	* tmpnam.c:  Added ANSI tmpnam() function.
+	* functions.def, Makefile.in:  Update accordingly.
+
+Tue Apr 27 13:38:38 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* cplus-dem.c (demangle_function_name): Get the demangling of
+	stop__1A right.
+
+Fri Apr 16 23:48:24 1993  Jim Kingdon  (kingdon at calvin)
+
+	* cplus-dem.c: Declare strstr return type.
+
+Fri Mar 26 12:01:26 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+	* strsignal.c: Add some AIX signals.
+
+Thu Mar 25 15:17:23 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (MAKEOVERRIDES): Define to be empty.
+
+Wed Mar 24 01:59:25 1993  david d `zoo' zuhn  (zoo at poseidon.cygnus.com)
+
+	* Makefile.in: add installcheck & dvi targets
+
+Thu Mar 18 14:05:44 1993  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* ieee-float.c:  New file, moved from ../gdb (since it is
+	needed by ../opcode/m68k-dis.c).
+
+Tue Mar  2 17:47:31 1993  Fred Fish  (fnf@cygnus.com)
+
+	* cplus-dem.c:  Replace all references to cfront with ARM.
+
+Fri Feb 26 00:17:07 1993  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* cplus-dem.c:  Fix main program (when compiled with -DMAIN)
+	to be more useful as a filter.
+
+Sat Feb 20 21:41:39 1993  Brendan Kehoe  (brendan@lisa.cygnus.com)
+
+	* Makefile.in (install_to_libdir, install_to_tooldir): Go into the
+	destination directory before running $(RANLIB), in case that
+	program tries to create a file in the current directory as part of
+	its work.
+
+Thu Feb 18 23:00:19 1993  John Gilmore  (gnu@cygnus.com)
+
+	* strsignal.c (sys_siglist):  Remove yet another *%^&%&$# "const"
+	because BSD 4.4 lacks one.  Isn't this fun?
+
+Thu Feb 18 11:24:25 1993  Fred Fish  (fnf@cygnus.com)
+
+	* cplus-dem.c (demangle_signature):  Set func_done after
+	demangling a template.
+	* cplus-dem.c (demangle_template):  Fix several small bugs
+	in demangling GNU style templates.
+	* cplus-dem.c (demangle_prefix):  Fix for templates in GNU
+	style constructors.
+	* cplus-dem.c (gnu_special):  Fix for templates in GNU style
+	static data members.
+
+Tue Feb 16 17:28:35 1993  Fred Fish  (fnf@cygnus.com)
+
+	* cplus-dem.c (demangle_signature):  Modify to include type
+	modifiers like static and const in remembered types.
+
+Thu Feb 11 22:20:47 1993  Fred Fish  (fnf@cygnus.com)
+
+	* cplus-dem.c (demangled_qualified):  Add new parameter that tells
+	whether to prepend or append the qualifiers.
+	* cplus-dem.c (string_prepends):  Used now, remove #if 0.
+	* cplus-dem.c (demangle_signature):  Call demangle_qualified
+	with prepending.
+	* cplus-dem.c (gnu_special):  Recognize static data members that
+	use qualified names.
+	* cplus-dem.c (demangle_qualified):  Accumulate qualifiers in a
+	temporary buffer and the prepend or append them to the result,
+	as specified by the new "append" flag.
+	* cplus-dem.c (do_type):  Call demangled_qualified with
+	appending.
+
+Mon Dec 28 10:47:19 1992  Ken Raeburn  (raeburn@cygnus.com)
+
+	* strsignal.c (signal_table): Now const.
+	(init_signal_tables): Variable eip now points to const.
+
+	* strerror.c (error_table): Now const.
+	(init_error_tables): Variable eip now points to const.
+
+Tue Dec 15 15:36:50 1992  Per Bothner  (bothner@cygnus.com)
+
+	* memchr.c (memchr):  New (ANSI standard) function.
+	* Makefile.in, functions.def:  Added memchr.
+	* Makefile.in (AR_FLAGS): Use rc instad of non-standard cq.
+
+Wed Dec  2 22:49:10 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* getopt.c: remove use of USG around <alloca.h>, which never meant
+	anything anyway
+
+	* config/mh-{aix,apollo68,ncr3000,sysv,sysv4}: removed definitions
+	of USG and USGr4
+
+Thu Nov 19 03:09:33 1992  Brendan Kehoe  (brendan@lisa.cygnus.com)
+
+	* cplus-dem.c (demangle_fund_type): Recognize `w', a wide character;
+	it's now a type according to the ANSI X3J16 working paper; output
+	"wchar_t" for it.
+	(demangle_template): Accept `w' as an integral type.
+	(xmalloc, xrealloc): Use `char *', not `PTR'.  Cast calls to their
+	counterparts malloc and realloc to `char *'.
+	(main): Exit with a 0 status.
+	* Makefile.in (demangle): Don't expect the user to define
+	DEMANGLE, instead force to be cplus-dem.c.  Look in $(srcdir)/../include
+	for demangle.h.  Pass it any HDEFINES or XTRAFLAGS.
+
+Wed Nov 18 18:56:20 1992  John Gilmore  (gnu@cygnus.com)
+
+	* Makefile.in (AR_FLAGS):  Avoid verbosity.
+	* config/mh-sysv4:  Remove AR_FLAGS override, use INSTALL=cp,
+	replace USGr4 with HAVE_SYSCONF.
+	* config/mh-solaris:  Remove; mh-sysv4 works now.
+	* getpagesize.c:  Replace USGr4 with HAVE_SYSCONF.
+	* configure.in:  Simplify host matching table, remove separate
+	solaris config file.
+
+Sun Nov 15 09:35:16 1992  Fred Fish  (fnf@cygnus.com)
+
+	* configure.in (i[34]86-*-solaris2*):  Add, use mh-sysv4.
+
+Tue Nov  3 21:27:03 1992  Brendan Kehoe  (brendan@cygnus.com)
+
+	* cplus-dem.c (xmalloc, xrealloc): Add decls.
+	(remember_type): Don't cast xmalloc.
+	(string_need): Likewise; don't cast xrealloc either.
+
+Fri Oct 23 08:52:01 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in, functions.defs, rename.c: added simple
+	implementation of rename, since some binutils programs use it.
+
+Thu Oct 15 15:18:22 1992  Per Bothner  (bothner@cygnus.com)
+
+	* strsignal.c:  Add appropriate 'const' to sys_siglist
+	extern declaration (if __STDC__).  (Needed for Linux.)
+	* strsignal.c (strsignal): Add cast to remove const-ness.
+
+Fri Oct  9 03:22:55 1992  John Gilmore  (gnu@cygnus.com)
+
+	* Makefile.in (needed.awk, needed2.awk):  Remove erroneous \'s
+	before "'s, diagnosed by BSD 4.4 awk.
+
+Thu Oct  8 15:25:12 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in: create config.h and needed-list through $(CONFIG_H)
+	and $(NEEDED_LIST), to give some hooks for xiberty.
+
+Thu Oct  1 23:31:42 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* configure.in: use cpu-vendor-triple instead of nested cases
+
+Wed Sep 30 11:26:59 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Makefile.in, argv.c, basename.c, bcmp.c, bcopy.c, bzero.c,
+	concat.c, cplus-dem.c, fdmatch.c, getcwd.c, getopt.c, getopt1.c,
+	getpagesize.c, insque.c, memcmp.c, memcpy.c, memmove.c, memset.c,
+	obstack.c, sigsetmask.c, spaces.c, strchr.c, strerror.c,
+	strrchr.c, strsignal.c, strstr.c, vfork.c, vsprintf.c:
+	Convert from using GPL to LGPL.
+
+Sat Sep 26 04:01:30 1992  John Gilmore  (gnu@cygnus.com)
+
+	* Makefile.in (errors):  Leave dummy.o and dummy around so that
+	we can see how the needed list was generated (it's sometimes wrong).
+	(mostlyclean):  Remove them.
+
+Mon Sep 21 14:50:42 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* getcwd.c: supply a default if MAXPATHLEN is not defined.
+
+	* config/mh-irix4: set EXTRA_OFILES to alloca.o, from WRS.
+
+Wed Sep  9 12:41:48 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in: Use XTRAFLAGS when compiling, so that xiberty works
+	when cross-compiling.
+
+Thu Sep  3 13:29:39 1992  K. Richard Pixley  (rich@sendai.cygnus.com)
+
+	* cplus-dem.c: (demangle_prefix): reduction in strength of strstr
+	  as a time optimization.
+
+	* cplus-dem.c (cplus_demangle): remove strpbrk test.  Appears to
+	  be more expensive than simply demangling.
+
+	* cplus-dem.c (cplus_match): new function.
+
+Tue Sep  1 15:24:04 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* cplus-dem.c:  #include <stdio.h>, to define NULL.
+	Define current_demangling_style.
+
+Sun Aug 30 17:58:19 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* cplus-dem.c:  New file, moved from ../gdb.
+	* cplus-dem.c (set_cplus_marker_for_demangling):  New exported
+	function, to avoid compiling in target-dependency for CPLUS_MARKER.
+	* cplus-dem.c (cplus_demangle):  Allow demangling style option
+	to be passed as a parameter, but using the global variable
+	current_demangling_style as a default.
+	* Makefile.in:  Update for cplus-dem.c
+
+Sat Aug 29 10:44:09 1992  Fred Fish  (fnf@cygnus.com)
+
+	* obstack.c:  Merge in comment changes from FSF version.  Now
+	matches the FSF version exactly.
+
+Fri Aug 28 18:39:08 1992  John Gilmore  (gnu@cygnus.com)
+
+	* obstack.c (CALL_FREEFUN):  Can't use ?: with void values (at
+	least on losing DECstations!); use if-then-else instead.
+
+Wed Aug 19 14:40:34 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in: always create installation directories.
+
+Mon Aug 10 17:33:40 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: clean up definition of CFILES, more comments
+
+Sat Aug  8 23:10:59 1992  Fred Fish  (fnf@cygnus.com)
+
+	* getopt.c (my_index):  Make first arg const to match strchr,
+	which it sometimes is remapped to.
+
+Sat Aug  1 13:48:50 1992  Fred Fish  (fnf@cygnus.com)
+
+	* obstack.c (DEFAULT_ALIGNMENT):  Update to match FSF version.
+	* obstack.c (_obstack_begin):  Initialize use_extra_arg.
+	* obstack.c (_obstack_begin_1):  New, from FSF version.
+
+Mon Jul 20 21:07:58 1992  Fred Fish  (fnf@cygnus.com)
+
+	* obstack.c (CALL_CHECKFUN, CALL_FREEFUN):  Use use_extra_arg and
+	extra_arg.
+	* obstack.c (_obstack_begin):  Remove area_id and flags arguments
+	(previously added for mmalloc support, interface has changed).
+	Also convert flags usage to use use_extra_arg and maybe_empty_object.
+
+Fri Jul 10 00:41:53 1992  Fred Fish  (fnf@cygnus.com)
+
+	* argv.c:  Move expandargv inline and eliminate static variables.
+	Rewrite to always allocate in powers of two.  Fix to return an
+	argv with a single null string arg if passed a null string.
+
+Fri Jul  3 20:27:29 1992  Fred Fish  (fnf@cygnus.com)
+
+	* random.c, sigsetmask.c, strerror.c, strsignal.c:  Remove
+	"(void)" casts from function calls where the return value is
+	ignored, in accordance with GNU coding standards.
+
+Mon Jun 29 10:54:19 1992  Fred Fish  (fnf at cygnus.com)
+
+	* bcopy.c, strerror.c, strsignal.c:  Lint.
+
+Thu Jun 25 09:18:41 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* getopt.c: merge changes from make.
+
+Thu Jun 25 04:43:22 1992  John Gilmore  (gnu at cygnus.com)
+
+	* alloca.c:  Incorporate fixes from gdb/alloca.c.
+	FIXME:  Eventually move gdb's alloca configuration files here,
+	and remove gdb/alloca.c and its Makefile.in support.
+
+Tue Jun 23 21:56:30 1992  Fred Fish  (fnf@cygnus.com)
+
+	* dummy.c:  Define NOTHING to /*nothing*/, change return type
+	of main to int and return zero.
+	* functions.def:  Supply NOTHING as the fourth arg to macros
+	that don't have an explicit arg, to satisfy picky preprocessors.
+
+Wed Jun 17 18:13:58 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Makefile.in:  Clean up *clean rules, as per standards.texi.
+
+Tue Jun 16 16:11:59 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* getopt.c, getopt1.c: merged largely gratuitous, mostly
+	  whitespace diffs from other prep distributions.
+
+Mon Jun 15 12:25:46 1992  Fred Fish  (fnf@cygnus.com)
+
+	* config/mh-ncr3000 (INSTALL):  Don't use /usr/ucb/install,
+	it is broken on ncr 3000's.
+
+Mon Jun 15 01:03:26 1992  John Gilmore  (gnu at cygnus.com)
+
+	* sigsetmask.c:  Rewrite.  Old one was very confused about its
+	arguments and result.  New one can't do much, but at least knows
+	what it can't do, and it's good enough for GDB's use.
+
+Sun Jun 14 15:17:40 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* functions.def:  Use proper prototype for strtoul.
+
+Fri Jun 12 19:22:40 1992  John Gilmore  (gnu at cygnus.com)
+
+	* Makefile.in:  Add random.c.
+	* config/mh-*:  Use "true" rather than "echo >/dev/null" for ranlib.
+	* configure.in:  update solaris2 config.
+
+Wed Jun 10 16:31:29 1992  Fred Fish  (fnf@cygnus.com)
+
+	* random.c:  Add for random() and srandom().
+	* functions.def:  Add random
+
+Tue Jun  9 17:27:18 1992  Fred Fish  (fnf@cygnus.com)
+
+	* config/{mh-ncr3000, mh-sysv4}:  Add definition for INSTALL
+	using /usr/ucb/install.
+
+Mon Jun  1 13:20:17 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* strerror.c:  Kludge to guard against a conflict with
+	possible declaration of sys_errlist in errno.h.
+
+Sun May 31 15:07:47 1992  Mark Eichin  (eichin at cygnus.com)
+
+	* configure.in, config/mh-solaris: add solaris2 config support.
+
+Fri May 29 17:23:23 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* sigsetmask.c:  #ifdef out sigsetmask if SIG_SETMASK
+	is not defined (should be defined in signal.h, says Posix.).
+
+Mon May 18 17:35:04 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* getopt.c: merged changes from make-3.62.11.
+
+Fri May  8 14:53:07 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* getopt.c: merged changes from bison-1.18.
+
+Tue May  5 11:51:40 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* Makefile.in:  Don't have $(EXTRA_OFILES) depend on config.h,
+	since that introduces a circular dependency.
+	($(EXTRA_OFILES) are used to build config.h.)
+
+	* strtoul.c:  Fixes to handle non-decimal bases better.
+
+Wed Apr 22 09:27:51 1992  Fred Fish  (fnf@cygnus.com)
+
+	* config/mh-ncr3000:  Replace MINUS_G with CFLAGS.
+	* Makefile.dos:  Finish MINUS_G eradication.
+	* Makefile.in (CFILES):  Add strsignal.c.
+	* Makefile.in (REQUIRED_OFILES):  Add strerror.o strsignal.o
+	* Makefile.in (needed-list):  Split creation of errors file to
+	separate make target.
+	* Makefile.in (config.h, needed2.awk, errors):  New targets.
+	* Makefile.in (clean):  Split to multiple lines, add needed2.awk
+	and config.h.
+	* dummy.c (DEFFUNC, DEFVAR):  Add defines and undefs.
+	* functions.def (strerror):  Remove from optional list.
+	* functions.def (sys_nerr, sys_errlist, sys_siglist):  DEFVAR's
+	* functions.def (strerror, psignal):  DEFFUNC's
+	* strerror.c:  Rewrite from scratch to use sys_errlist only if
+	available, add errno_max(), add strerrno(), add strtoerrno(),
+	add test driver.
+	* strsignal.c:  New file, signal equivalent to strerror.c.
+	Uses sys_siglist if available, defines signo_max(), strsignal(),
+	strsigno(), strtosigno(), psignal(), and test driver.
+
+Mon Apr 20 20:49:32 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in: do not print recursion line.
+
+	* Makefile.in: allow CFLAGS to be passed in from command line.
+	  Removed MINUS_G.  Default CFLAGS to -g.
+
+Mon Apr 20 12:57:46 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* config/mh-aix:  New.  EXTRA_OFILES lists copysign.o,
+	so libg++ users don't have to be inconvenienced by a
+	libc.a bug (libc.a needs copysign, but doesn't define it!).
+	* configure.in:  Use config/mh-aix.
+	* strtoul.c:  Handle '-' as required by ANSI.
+	Clean up radix handling.
+	* strstr.c:  Fix buggy algorithm.
+	* Makefile.in:  Change so that ${EXTRA_OFILES} is
+	appended to needed-list (which is used by libg++).
+
+Fri Apr 10 22:51:41 1992  Fred Fish  (fnf@cygnus.com)
+
+	* configure.in:  Recognize new ncr3000 config.
+	* config/mh-ncr3000:  New config file.
+
+Wed Apr  1 23:31:43 1992  John Gilmore  (gnu at cygnus.com)
+
+	* argv.c, dummy.c:  Lint.
+
+Tue Mar 31 18:46:44 1992  Fred Fish  (fnf@cygnus.com)
+
+	* config/mh-sysv4:  New config file.
+	* configure.in (host_makefile_frag):  Set to config/mh-sysv4 for
+	host_os == sysv4.
+	* getpagesize.c:  For SVR4, use sysconf(_SC_PAGESIZE) to get
+	pagesize.
+
+Sun Mar 29 12:26:42 1992  John Gilmore  (gnu at cygnus.com)
+
+	* getopt.c:  Lint.
+
+Fri Mar 27 08:32:55 1992  Fred Fish  (fnf@cygnus.com)
+
+	* functions.def (alloca):  Fix return type and args to avoid
+	type clash with gcc's builtin alloca.
+
+Tue Mar 24 23:33:42 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* configure.in, config/mh-irix4: irix4 support.
+
+	* Makefile.in, functions.def, alloca.c: added alloca.
+
+Tue Mar 24 17:34:46 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* obstack.c (CALL_FREEFUN):  Make it compile on DECstations.
+
+Thu Mar 19 13:57:42 1992  Fred Fish  (fnf@cygnus.com)
+
+	* argv.c:  Fix various external function definitions to be
+	correct in an ANSI compilation environment.
+
+Sat Mar 14 17:28:17 1992  Fred Fish  (fnf@cygnus.com)
+
+	* obstack.c:  Changes to support calling mmalloc functions,
+	which take an additional argument over malloc functions.
+
+Fri Mar  6 22:01:10 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* added check target.
+
+Thu Feb 27 22:19:39 1992  Per Bothner  (bothner@cygnus.com)
+
+	* argv.c:  #include alloca-conf.h (needed by AIX).
+
+Wed Feb 26 18:04:40 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in, configure.in: removed traces of namesubdir,
+	  -subdirs, $(subdir), $(unsubdir), some rcs triggers.  Forced
+	  copyrights to '92, changed some from Cygnus to FSF.
+
+Sat Feb 22 01:09:21 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* argv.c:  Check in Fred's version which fixes problems with
+	alloca().
+
+Fri Feb  7 21:46:08 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* makefile.dos:  Remove NUL to keep patch from failing.
+
+Thu Jan 30 22:48:41 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* getopt.c (_getopt_internal):  Fix usage of enum has_arg.
+
+Mon Jan 20 18:53:23 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* getopt.c, getopt1.c, ../include/getopt.h:  Get latest versions.
+
+Sat Jan 18 16:53:01 1992  Fred Fish  (fnf at cygnus.com)
+
+	* argv.c:  New file to build and destroy standard argument
+	vectors from a command string.
+
+	* Makefile.in:  Add argv.c and argv.o to appropriate macros.
+
+Fri Dec 20 12:12:57 1991  Fred Fish  (fnf at cygnus.com)
+
+	* configure.in:  Change svr4 references to sysv4.
+
+	* rindex.c:  Declare return type of externally used function
+	strrchr().
+
+Thu Dec 19 18:35:03 1991  John Gilmore  (gnu at cygnus.com)
+
+	* Makefile.in:  Remove "***" in normal output, since Make produces
+	this on errors, and it's convenient to search for.
+
+Tue Dec 17 23:21:30 1991  Per Bothner  (bothner at cygnus.com)
+
+	* memcmp.c, memcpy.c, memmove.c, memset.c, strchr.c, strrchr.c:
+	New ANSI functions.  The old non-ANSI functions (such as bcopy)
+	should be avoided.
+	* bcopy.c:  Fix to correctly handle overlapping regions.
+	* index.c, rindex.c:  Re-write in terms of strchr() and strrchr().
+	* functions.def:  Add the new functions.
+	* functions.def:  Add 4th parameter to DEF macro,
+	an ansidecl.h-style prototype.
+	* dummy.c:  Use expanded DEF macro to create a dummy function
+	call, with correct parameter types.  (This avoids some
+	complaints from gcc about predefined builtins.)
+
+	Move the functionality of config/mh-default into Makefile.in.
+	This avoid duplication, and simplifies things slightly.
+	* Makefile.in:  Tweak so we don't need config/mh-default.
+	* README:  Update.
+	* configure.in:  No longer need config/mh-default.
+	* config/mh-default:  Deleted.
+	* config/mh-sysv:  Remove lines copied from old mh-default.
+
+Tue Dec 17 05:46:46 1991  John Gilmore  (gnu at cygnus.com)
+
+	* fdmatch.c (fdmatch):  Don't compare st_rdev, which is for
+	'mknod' device numbers.
+
+Mon Dec 16 12:25:34 1991  Fred Fish  (fnf at cygnus.com)
+
+	* fdmatch.c, Makefile.in:  Add new function that takes two
+	open file descriptors and returns nonzero if they refer to
+	the same file, zero otherwise.  (used in gdb)
+
+Wed Dec 11 17:40:39 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
+	From DJ:
+	* msdos.c: stub functions for dos.
+	* makefile.dos, configdj.bat: new.
+	* getopt.c: Don't include alloca-conf.h in a GO32 world.
+
+
+Tue Dec 10 04:14:49 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* Makefile.in: infodir belongs in datadir.
+
+Fri Dec  6 23:26:45 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* Makefile.in: remove spaces following hyphens because bsd make
+	  can't cope.  added standards.text support.  install using
+	  INSTALL_DATA.
+
+	* configure.in: remove commontargets as it is no longer a
+	  recognized hook.
+
+Thu Dec  5 22:46:46 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* Makefile.in: idestdir and ddestdir go away.  Added copyrights
+	  and shift gpl to v2.  Added ChangeLog if it didn't exist. docdir
+	  and mandir now keyed off datadir by default.
+
+Fri Nov 22 19:15:29 1991  John Gilmore  (gnu at cygnus.com)
+
+	* Makefile.in:  find-needed.awk does not fit in 14 chars.
+
+	* Makefile.in:  Suppress error checking when compiling the test
+	program, because Ultrix make/sh aborts there due to a bug.
+
+Fri Nov 22 12:23:17 1991  Per Bothner  (bothner at cygnus.com)
+
+	* Makefile.in:  Re-did how EXTRA_OFILES is used to be more useful.
+	* README:  Explained how the auto-configuration works,
+	and how to add new files and/or configurations.
+
+Fri Nov 22 09:45:23 1991  John Gilmore  (gnu at cygnus.com)
+
+	* strtoul.c:  Avoid defining ULONG_MAX if already defined;
+	cast a const char * to char * for pedants.
+
+	* getopt.c:  Only define "const" after local include files get to,
+	and only if they haven't defined it.
+
+Thu Nov 21 16:58:53 1991  John Gilmore  (gnu at cygnus.com)
+
+	* getcwd.c (remove getwd.c): GNU code should call getcwd().  We
+	emulate it with getwd() if available.  This avoids callers having
+	to find a MAXPATHLEN or PATH_MAX value from somewhere.
+	* Makefile.in, functions.def:  getwd->getcwd.
+	* configure.in:  Use generic case for every system.
+	* config/mh-{delta88,mach,rs6000,svr4}:  Remove.
+	* config/mh-sysv:  Use default handling, just add -DUSG.
+
+Thu Nov 14 10:58:05 1991  Per Bothner  (bothner at cygnus.com)
+
+	* Makefile.in, config/mh-default: Re-do make magic
+	so that for the default ("automatic") mode we only
+	compile the files we actually need.  Do this using
+	a recursive make:  The top-level generates the list
+	of needed files (loosely, the ones missing in libc),
+	and then passes that list to the recursive make.
+	* config/mh-mach:  Remove obsolete STRERROR-{C,O} macros.
+
+Tue Nov 12 19:10:57 1991  John Gilmore  (gnu at cygnus.com)
+
+	RS/6000 host support (grumble).
+
+	* configure.in:  Build alloca-conf.h file from alloca-norm.h
+	(everything else) or alloca-botch.h (rs/6000).
+	* Makefile.in:  Include . on the include path.
+	* getopt.c:  Use alloca-conf.h.
+	* alloca-norm.h:  How to declare alloca on reasonable machines.
+	* alloca-botch.h: How to declare alloca on braindead machines.
+
+Tue Nov 12 09:21:48 1991  Fred Fish  (fnf at cygnus.com)
+
+	* concat.c :  New file, like concat() in gdb but can take a
+	variable number of arguments rather than fixed at 3 args.  For
+	now, client applications must supply an xmalloc(), which is a
+	front end function to malloc() that deals with out-of-memory
+	conditions.
+
+	* Makefile.in:  Add concat.c and concat.o to appropriate macros.
+
+Sat Nov  9 13:29:59 1991  Fred Fish  (fnf at cygnus.com)
+
+	* config/mh-svr4:  Add sigsetmask to list of required functions.
+
+Sun Nov  3 11:57:56 1991  Per Bothner  (bothner at cygnus.com)
+
+	* vsprintf.c:  New file.
+	* functions.def, Makefile.in:  Add vsprintf.
+
+Sun Oct 27 16:31:22 1991  John Gilmore  (gnu at cygnus.com)
+
+	* configure.in, config/mh-rs6000:  Add rs/6000 host support.
+	* Makefile.in:  Compile with debug info.
+
+Fri Oct 25 17:01:12 1991  Per Bothner  (bothner at cygnus.com)
+
+	* Makefile.in, configure.in, and new files: dummy.c, functions.def,
+	config/mf-default:  Added a default configuration mode,
+	which includes into libiberty.a functions that are "missing" in libc.
+	* strdup.c, vprintf.c, vfprintf.c: New files.
+
+Thu Oct 24 02:29:26 1991  Fred Fish  (fnf at cygnus.com)
+
+	* config/hmake-svr4: New file.
+
+	* config/hmake-sysv: Add HOST_CFILES and HOST_OFILES.
+
+	* basename.c, bcmp.c, bcopy.c, bzero.c, getpagesize.c getwd.c,
+	index.c, insque.c, rindex.c, spaces.c, strstr.c, vfork.c: New
+	files containing either portable C versions or emulations using
+	native library calls.
+
+	* strerror.c:  Add copyright, internal documentation, etc.
+
+	* strtol.c:  Replace hardwired hex constants with some more
+	portable macros.  Remove illegal (according to gcc) cast.
+
+	* strtoul.c: Replace hardwired hex constant with more portable
+	macro.
+
+	* Makefile.in: Move TARGETLIB and CFLAGS where makefile fragments
+	can override them.  Add new source and object file names to CFILES
+	and OFILES respectively.
+
+	* configure.in: Add support for SVR4 makefile fragments.
+
+Tue Oct 22 19:00:23 1991  Steve Chamberlain  (steve at cygnus.com)
+
+	* Makefile.in: Move RANLIB, AR and AR_FLAGS to where they can be
+	over-ridden by config/hmake-*
+	* configure.in: added m88kcvs to sysv list
+
+Fri Oct  4 01:29:08 1991  John Gilmore  (gnu at cygnus.com)
+
+	* Makefile.in:  Most hosts need strerror, but one or two don't,
+	and they override these definitions in the host-dependent makefile
+	fragment.
+	* config/hmake-mach:  The odd man out on strerror -- it's supplied.
+	* strerror.c:  New file.
+
+	* strtol.c, strtoul.c:  Add strtol to libiberty, since Mach lacks
+	it and bfd uses it.
+	* configure.in, Makefile.in, config/hmake-mach:  Only configure
+	strtol & strotoul in on Mach.
+
+Tue Sep  3 06:36:23 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	* obstack.c:  Merge with latest FSF version.
+
+
+Local Variables:
+version-control: never
+End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/Makefile.in sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/Makefile.in
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/Makefile.in	2012-06-05 13:45:27.000000000 +0000
@@ -0,0 +1,1349 @@
+# Makefile for the libiberty library.
+# Originally written by K. Richard Pixley <rich@cygnus.com>.
+#
+# Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+# Free Software Foundation
+#
+# This file is part of the libiberty library.
+# Libiberty is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# Libiberty 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
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with libiberty; see the file COPYING.LIB.  If not,
+# write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+libiberty_topdir = @libiberty_topdir@
+srcdir = @srcdir@
+
+prefix = @prefix@
+
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+libdir = @libdir@
+includedir = @includedir@
+target_header_dir = @target_header_dir@
+objext = @OBJEXT@
+
+SHELL = @SHELL@
+
+# Multilib support variables.
+MULTISRCTOP =
+MULTIBUILDTOP =
+MULTIDIRS =
+MULTISUBDIR =
+MULTIDO = true
+MULTICLEAN = true
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+mkinstalldirs = $(SHELL) $(libiberty_topdir)/mkinstalldirs
+
+# Some compilers can't handle cc -c blah.c -o foo/blah.o.
+OUTPUT_OPTION = @OUTPUT_OPTION@
+
+AR = @AR@
+AR_FLAGS = rc
+
+CC = @CC@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+RANLIB = @RANLIB@
+MAKEINFO = @MAKEINFO@
+PERL = @PERL@
+
+PICFLAG = @PICFLAG@
+
+MAKEOVERRIDES =
+
+TARGETLIB = ./libiberty.a
+TESTLIB = ./testlib.a
+
+LIBOBJS = @LIBOBJS@
+
+# A configuration can specify extra .o files that should be included,
+# even if they are in libc. (Perhaps the libc version is buggy.)
+EXTRA_OFILES = 
+
+# Flags to pass to a recursive make.
+FLAGS_TO_PASS = \
+	"AR=$(AR)" \
+	"AR_FLAGS=$(AR_FLAGS)" \
+	"CC=$(CC)" \
+	"CFLAGS=$(CFLAGS)" \
+	"CPPFLAGS=$(CPPFLAGS)" \
+	"DESTDIR=$(DESTDIR)" \
+	"EXTRA_OFILES=$(EXTRA_OFILES)" \
+	"HDEFINES=$(HDEFINES)" \
+	"INSTALL=$(INSTALL)" \
+	"INSTALL_DATA=$(INSTALL_DATA)" \
+	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+	"LDFLAGS=$(LDFLAGS)" \
+	"LOADLIBES=$(LOADLIBES)" \
+	"RANLIB=$(RANLIB)" \
+	"SHELL=$(SHELL)" \
+	"prefix=$(prefix)" \
+	"exec_prefix=$(exec_prefix)" \
+	"libdir=$(libdir)" \
+	"libsubdir=$(libsubdir)" \
+	"tooldir=$(tooldir)"
+
+# Subdirectories to recurse into. We need to override this during cleaning
+####SUBDIRS = testsuite
+SUBDIRS =
+
+# FIXME: add @BUILD_INFO@ once we're sure it works for everyone.
+all: stamp-picdir $(TARGETLIB) required-list all-subdir
+	@: $(MAKE) ; $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all
+
+.PHONY: check installcheck
+check: check-subdir
+installcheck: installcheck-subdir
+
+####@host_makefile_frag@
+
+INCDIR=$(srcdir)/$(MULTISRCTOP)../include
+
+COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -I. -I$(INCDIR) $(HDEFINES) @ac_libiberty_warn_cflags@
+
+# Just to make sure we don't use a built-in rule with VPATH
+.c.$(objext):
+	false
+
+# NOTE: If you add new files to the library, add them to this list
+# (alphabetical), and add them to REQUIRED_OFILES, or
+# CONFIGURED_OFILES and funcs in configure.ac.  Also run "make maint-deps"
+# to build the new rules.
+####CFILES = alloca.c argv.c asprintf.c atexit.c				\
+####	basename.c bcmp.c bcopy.c bsearch.c bzero.c			\
+####	calloc.c choose-temp.c clock.c concat.c cp-demangle.c		\
+####	 cp-demint.c cplus-dem.c crc32.c				\
+####	dyn-string.c							\
+####	fdmatch.c ffs.c fibheap.c filename_cmp.c floatformat.c		\
+####	fnmatch.c fopen_unlocked.c					\
+####	getcwd.c getopt.c getopt1.c getpagesize.c getpwd.c getruntime.c	\
+####         gettimeofday.c                                                 \
+####	hashtab.c hex.c							\
+####	index.c insque.c						\
+####	lbasename.c							\
+####	lrealpath.c							\
+####	make-relative-prefix.c						\
+####	make-temp-file.c md5.c memchr.c memcmp.c memcpy.c memmem.c	\
+####	 memmove.c mempcpy.c memset.c mkstemps.c			\
+####	objalloc.c obstack.c						\
+####	partition.c pexecute.c						\
+####	 pex-common.c pex-djgpp.c pex-msdos.c pex-one.c			\
+####	 pex-unix.c pex-win32.c						\
+####         physmem.c putenv.c						\
+####	random.c regex.c rename.c rindex.c				\
+####	safe-ctype.c setenv.c setproctitle.c sha1.c sigsetmask.c        \
+####	 simple-object.c simple-object-coff.c simple-object-elf.c	\
+####	 simple-object-mach-o.c						\
+####         snprintf.c sort.c						\
+####	 spaces.c splay-tree.c stack-limit.c stpcpy.c stpncpy.c		\
+####	 strcasecmp.c strchr.c strdup.c strerror.c strncasecmp.c	\
+####	 strncmp.c strrchr.c strsignal.c strstr.c strtod.c strtol.c	\
+####	 strtoul.c strndup.c strverscmp.c				\
+####	tmpnam.c							\
+####	unlink-if-ordinary.c						\
+####	vasprintf.c vfork.c vfprintf.c vprintf.c vsnprintf.c vsprintf.c	\
+####	waitpid.c							\
+####	xatexit.c xexit.c xmalloc.c xmemdup.c xstrdup.c xstrerror.c	\
+####	 xstrndup.c
+
+#### Excluded pex-common.c, pex-djgpp.c, pex-msdos.c, pex-one.c,
+#### pex-unix.c, pex-win32.c since pex-unix.c doesn't compole on cygwim
+#### mingw and they are not needed by sdbinutils
+CFILES = alloca.c argv.c asprintf.c atexit.c				\
+	basename.c bcmp.c bcopy.c bsearch.c bzero.c			\
+	calloc.c choose-temp.c clock.c concat.c cp-demangle.c		\
+	 cp-demint.c cplus-dem.c crc32.c				\
+	dyn-string.c							\
+	fdmatch.c ffs.c fibheap.c filename_cmp.c floatformat.c		\
+	fnmatch.c fopen_unlocked.c					\
+	getcwd.c getopt.c getopt1.c getpagesize.c getpwd.c getruntime.c	\
+         gettimeofday.c                                                 \
+	hashtab.c hex.c							\
+	index.c insque.c						\
+	lbasename.c							\
+	lrealpath.c							\
+	make-relative-prefix.c						\
+	make-temp-file.c md5.c memchr.c memcmp.c memcpy.c memmem.c	\
+	 memmove.c mempcpy.c memset.c mkstemps.c			\
+	objalloc.c obstack.c						\
+	partition.c							\
+         physmem.c putenv.c						\
+	random.c regex.c rename.c rindex.c				\
+	safe-ctype.c setenv.c setproctitle.c sha1.c sigsetmask.c        \
+	 simple-object.c simple-object-coff.c simple-object-elf.c	\
+	 simple-object-mach-o.c						\
+         snprintf.c sort.c						\
+	 spaces.c splay-tree.c stack-limit.c stpcpy.c stpncpy.c		\
+	 strcasecmp.c strchr.c strdup.c strerror.c strncasecmp.c	\
+	 strncmp.c strrchr.c strsignal.c strstr.c strtod.c strtol.c	\
+	 strtoul.c strndup.c strverscmp.c				\
+	tmpnam.c							\
+	unlink-if-ordinary.c						\
+	vasprintf.c vfork.c vfprintf.c vprintf.c vsnprintf.c vsprintf.c	\
+	waitpid.c							\
+	xatexit.c xexit.c xmalloc.c xmemdup.c xstrdup.c xstrerror.c	\
+	 xstrndup.c
+
+# These are always included in the library.  The first four are listed
+# first and by compile time to optimize parallel builds.
+####REQUIRED_OFILES =							\
+####	./regex.$(objext) ./cplus-dem.$(objext) ./cp-demangle.$(objext) \
+####	./md5.$(objext) ./sha1.$(objext) ./alloca.$(objext)		\
+####	./argv.$(objext)						\
+####	./choose-temp.$(objext) ./concat.$(objext)			\
+####	./cp-demint.$(objext) ./crc32.$(objext) ./dyn-string.$(objext)	\
+####	./fdmatch.$(objext) ./fibheap.$(objext)				\
+####	./filename_cmp.$(objext) ./floatformat.$(objext)		\
+####	./fnmatch.$(objext) ./fopen_unlocked.$(objext)			\
+####	./getopt.$(objext) ./getopt1.$(objext) ./getpwd.$(objext)	\
+####	./getruntime.$(objext) ./hashtab.$(objext) ./hex.$(objext)	\
+####	./lbasename.$(objext) ./lrealpath.$(objext)			\
+####	./make-relative-prefix.$(objext) ./make-temp-file.$(objext)	\
+####	./objalloc.$(objext)						\
+####	./obstack.$(objext)						\
+####	./partition.$(objext) ./pexecute.$(objext) ./physmem.$(objext)	\
+####	./pex-common.$(objext) ./pex-one.$(objext)			\
+####	./@pexecute@.$(objext)						\
+####	./safe-ctype.$(objext)						\
+####	./simple-object.$(objext) ./simple-object-coff.$(objext)	\
+####	./simple-object-elf.$(objext) ./simple-object-mach-o.$(objext)	\
+####	./sort.$(objext) ./spaces.$(objext)				\
+####	./splay-tree.$(objext) ./stack-limit.$(objext)			\
+####	./strerror.$(objext)						\
+####	./strsignal.$(objext) ./unlink-if-ordinary.$(objext)		\
+####	./xatexit.$(objext) ./xexit.$(objext) ./xmalloc.$(objext)	\
+####	./xmemdup.$(objext) ./xstrdup.$(objext) ./xstrerror.$(objext)	\
+####	./xstrndup.$(objext)
+
+#### Excluded ./pexecute.$(objext), ./pex-common.$(objext),
+#### ./pex-one.$(objext) and ./@pexecute@.$(objext) since pex-unix.c
+#### doesn't compole on cygwim mingw and they are not needed by sdbinutils
+REQUIRED_OFILES =							\
+	./regex.$(objext) ./cplus-dem.$(objext) ./cp-demangle.$(objext) \
+	./md5.$(objext) ./sha1.$(objext) ./alloca.$(objext)		\
+	./argv.$(objext)						\
+	./choose-temp.$(objext) ./concat.$(objext)			\
+	./cp-demint.$(objext) ./crc32.$(objext) ./dyn-string.$(objext)	\
+	./fdmatch.$(objext) ./fibheap.$(objext)				\
+	./filename_cmp.$(objext) ./floatformat.$(objext)		\
+	./fnmatch.$(objext) ./fopen_unlocked.$(objext)			\
+	./getopt.$(objext) ./getopt1.$(objext) ./getpwd.$(objext)	\
+	./getruntime.$(objext) ./hashtab.$(objext) ./hex.$(objext)	\
+	./lbasename.$(objext) ./lrealpath.$(objext)			\
+	./make-relative-prefix.$(objext) ./make-temp-file.$(objext)	\
+	./objalloc.$(objext)						\
+	./obstack.$(objext)						\
+	./partition.$(objext) ./physmem.$(objext)			\
+	./safe-ctype.$(objext)						\
+	./simple-object.$(objext) ./simple-object-coff.$(objext)	\
+	./simple-object-elf.$(objext) ./simple-object-mach-o.$(objext)	\
+	./sort.$(objext) ./spaces.$(objext)				\
+	./splay-tree.$(objext) ./stack-limit.$(objext)			\
+	./strerror.$(objext)						\
+	./strsignal.$(objext) ./unlink-if-ordinary.$(objext)		\
+	./xatexit.$(objext) ./xexit.$(objext) ./xmalloc.$(objext)	\
+	./xmemdup.$(objext) ./xstrdup.$(objext) ./xstrerror.$(objext)	\
+	./xstrndup.$(objext)
+
+# These are all the objects that configure may add to the library via
+# $funcs or EXTRA_OFILES.  This list exists here only for "make
+# maint-missing" and "make check".
+####CONFIGURED_OFILES = ./asprintf.$(objext) ./atexit.$(objext)		\
+####	./basename.$(objext) ./bcmp.$(objext) ./bcopy.$(objext)		\
+####	./bsearch.$(objext) ./bzero.$(objext)				\
+####	./calloc.$(objext) ./clock.$(objext) ./copysign.$(objext)	\
+####	./_doprnt.$(objext)						\
+####	 ./ffs.$(objext)						\
+####	./getcwd.$(objext) ./getpagesize.$(objext)			\
+####	 ./gettimeofday.$(objext)					\
+####	./index.$(objext) ./insque.$(objext)				\
+####	./memchr.$(objext) ./memcmp.$(objext) ./memcpy.$(objext) 	\
+####	./memmem.$(objext) ./memmove.$(objext)				\
+####	 ./mempcpy.$(objext) ./memset.$(objext) ./mkstemps.$(objext)	\
+####	./pex-djgpp.$(objext) ./pex-msdos.$(objext)			\
+####	 ./pex-unix.$(objext) ./pex-win32.$(objext)			\
+####	 ./putenv.$(objext)						\
+####	./random.$(objext) ./rename.$(objext) ./rindex.$(objext)	\
+####	./setenv.$(objext) 						\
+####	 ./setproctitle.$(objext)					\
+####	 ./sigsetmask.$(objext) ./snprintf.$(objext)			\
+####	 ./stpcpy.$(objext) ./stpncpy.$(objext) ./strcasecmp.$(objext)	\
+####	 ./strchr.$(objext) ./strdup.$(objext) ./strncasecmp.$(objext)	\
+####	 ./strncmp.$(objext) ./strndup.$(objext) ./strrchr.$(objext)	\
+####	 ./strstr.$(objext) ./strtod.$(objext) ./strtol.$(objext)	\
+####	 ./strtoul.$(objext) ./strverscmp.$(objext)			\
+####	./tmpnam.$(objext)						\
+####	./vasprintf.$(objext) ./vfork.$(objext) ./vfprintf.$(objext)	\
+####	 ./vprintf.$(objext) ./vsnprintf.$(objext) ./vsprintf.$(objext)	\
+####	./waitpid.$(objext)
+
+#### Excluded ./pex-djgpp.$(objext), ./pex-msdos.$(objext),
+#### ./pex-unix.$(objext) and ./pex-win32.$(objext) since pex-unix.c
+#### doesn't compole on cygwim mingw and they are not needed by sdbinutils
+CONFIGURED_OFILES = ./asprintf.$(objext) ./atexit.$(objext)		\
+	./basename.$(objext) ./bcmp.$(objext) ./bcopy.$(objext)		\
+	./bsearch.$(objext) ./bzero.$(objext)				\
+	./calloc.$(objext) ./clock.$(objext) ./copysign.$(objext)	\
+	./_doprnt.$(objext)						\
+	 ./ffs.$(objext)						\
+	./getcwd.$(objext) ./getpagesize.$(objext)			\
+	 ./gettimeofday.$(objext)					\
+	./index.$(objext) ./insque.$(objext)				\
+	./memchr.$(objext) ./memcmp.$(objext) ./memcpy.$(objext) 	\
+	./memmem.$(objext) ./memmove.$(objext)				\
+	 ./mempcpy.$(objext) ./memset.$(objext) ./mkstemps.$(objext)	\
+	 ./putenv.$(objext)						\
+	./random.$(objext) ./rename.$(objext) ./rindex.$(objext)	\
+	./setenv.$(objext) 						\
+	 ./setproctitle.$(objext)					\
+	 ./sigsetmask.$(objext) ./snprintf.$(objext)			\
+	 ./stpcpy.$(objext) ./stpncpy.$(objext) ./strcasecmp.$(objext)	\
+	 ./strchr.$(objext) ./strdup.$(objext) ./strncasecmp.$(objext)	\
+	 ./strncmp.$(objext) ./strndup.$(objext) ./strrchr.$(objext)	\
+	 ./strstr.$(objext) ./strtod.$(objext) ./strtol.$(objext)	\
+	 ./strtoul.$(objext) ./strverscmp.$(objext)			\
+	./tmpnam.$(objext)						\
+	./vasprintf.$(objext) ./vfork.$(objext) ./vfprintf.$(objext)	\
+	 ./vprintf.$(objext) ./vsnprintf.$(objext) ./vsprintf.$(objext)	\
+	./waitpid.$(objext)
+
+# These files are installed if the library has been configured to do so.
+INSTALLED_HEADERS =                                                     \
+	$(INCDIR)/ansidecl.h                                            \
+	$(INCDIR)/demangle.h                                            \
+	$(INCDIR)/dyn-string.h                                          \
+	$(INCDIR)/fibheap.h                                             \
+	$(INCDIR)/floatformat.h                                         \
+	$(INCDIR)/hashtab.h                                             \
+	$(INCDIR)/libiberty.h                                           \
+	$(INCDIR)/objalloc.h                                            \
+	$(INCDIR)/partition.h                                           \
+	$(INCDIR)/safe-ctype.h                                          \
+	$(INCDIR)/sort.h                                                \
+	$(INCDIR)/splay-tree.h
+
+$(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
+	-rm -f $(TARGETLIB) pic/$(TARGETLIB)
+	$(AR) $(AR_FLAGS) $(TARGETLIB) \
+	  $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
+	$(RANLIB) $(TARGETLIB)
+	if [ x"$(PICFLAG)" != x ]; then \
+	  cd pic; \
+	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
+	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
+	  $(RANLIB) $(TARGETLIB); \
+	  cd ..; \
+	else true; fi
+
+$(TESTLIB): $(REQUIRED_OFILES) $(CONFIGURED_OFILES)
+	-rm -f $(TESTLIB)
+	$(AR) $(AR_FLAGS) $(TESTLIB) \
+	  $(REQUIRED_OFILES) $(CONFIGURED_OFILES)
+	$(RANLIB) $(TESTLIB)
+
+info: libiberty.info info-subdir
+install-info: install-info-subdir
+clean-info: clean-info-subdir
+dvi: libiberty.dvi dvi-subdir
+
+LIBIBERTY_PDFFILES = libiberty.pdf
+
+pdf: $(LIBIBERTY_PDFFILES) pdf-subdir
+
+.PHONY: install-pdf
+
+pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+
+install-pdf: $(LIBIBERTY_PDFFILES)
+	@$(NORMAL_INSTALL)
+	test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)"
+	@list='$(LIBIBERTY_PDFFILES)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(pdf__strip_dir) \
+	  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+	done
+
+# html, install-html targets
+HTMLS = libiberty.html
+
+html: $(HTMLS)
+
+.PHONY: install-html install-html-am
+
+NORMAL_INSTALL = :
+mkdir_p = mkdir -p --
+
+html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+
+install-html: install-html-am
+
+install-html-am: $(HTMLS)
+	@$(NORMAL_INSTALL)
+	test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
+	@list='$(HTMLS)'; for p in $$list; do \
+	  if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \
+	  f=$(html__strip_dir) \
+	  if test -d "$$d$$p"; then \
+	    echo " $(mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \
+	    $(mkdir_p) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
+	    echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+	    $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
+	  else \
+	    echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
+	    $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
+	  fi; \
+	done
+
+TEXISRC = \
+	$(srcdir)/libiberty.texi \
+	$(srcdir)/copying-lib.texi \
+	$(srcdir)/obstacks.texi \
+	$(srcdir)/functions.texi
+
+# Additional files that have texi snippets that need to be collected
+# and sorted.  Some are here because the sources are imported from
+# elsewhere.  Others represent headers in ../include.
+TEXIFILES = fnmatch.txh pexecute.txh simple-object.txh
+
+libiberty.info : $(srcdir)/libiberty.texi $(TEXISRC)
+	$(MAKEINFO) -I$(srcdir) $(srcdir)/libiberty.texi
+
+libiberty.dvi : $(srcdir)/libiberty.texi $(TEXISRC)
+	texi2dvi $(srcdir)/libiberty.texi
+
+libiberty.pdf : $(srcdir)/libiberty.texi $(TEXISRC)
+	texi2pdf $(srcdir)/libiberty.texi
+
+libiberty.html : $(srcdir)/libiberty.texi $(TEXISRC)
+	$(MAKEINFO) --no-split --html -I$(srcdir) -o $@ $<
+
+@MAINT@$(srcdir)/functions.texi : stamp-functions
+@MAINT@	@true
+
+@MAINT@stamp-functions : $(CFILES:%=$(srcdir)/%) $(TEXIFILES:%=$(srcdir)/%) $(srcdir)/gather-docs Makefile
+@MAINT@@HAVE_PERL@	$(PERL) $(srcdir)/gather-docs $(srcdir) $(srcdir)/functions.texi $(CFILES) $(TEXIFILES)
+@MAINT@	echo stamp > stamp-functions
+
+INSTALL_DEST = @INSTALL_DEST@
+install: install_to_$(INSTALL_DEST) install-subdir
+install-strip: install
+
+.PHONY: install install-strip
+
+# This is tricky.  Even though CC in the Makefile contains
+# multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
+# default multilib, so we have to take CFLAGS into account as well,
+# since it will be passed the multilib flags.
+MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
+install_to_libdir: all
+	${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
+	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n
+	( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
+	mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)
+	if test -n "${target_header_dir}"; then \
+	  case "${target_header_dir}" in \
+	    /*)    thd=${target_header_dir};; \
+	    *)     thd=${includedir}/${target_header_dir};; \
+	  esac; \
+	  ${mkinstalldirs} $(DESTDIR)$${thd}; \
+	  for h in ${INSTALLED_HEADERS}; do \
+	    ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \
+	  done; \
+	fi
+	@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
+
+install_to_tooldir: all
+	${mkinstalldirs} $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)
+	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n
+	( cd $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n; $(RANLIB) $(TARGETLIB)n )
+	mv -f $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)
+	@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
+
+# required-list was used when building a shared bfd/opcodes/libiberty
+# library.  I don't know if it used by anything currently.
+required-list: Makefile
+	echo $(REQUIRED_OFILES) > required-list
+
+stamp-picdir:
+	if [ x"$(PICFLAG)" != x ] && [ ! -d pic ]; then \
+	  mkdir pic; \
+	else true; fi
+	touch stamp-picdir
+
+.PHONY: all etags tags ls clean stage1 stage2
+
+etags tags: TAGS etags-subdir
+
+TAGS: $(CFILES)
+	etags `for i in $(CFILES); do echo $(srcdir)/$$i ; done`
+
+# The standalone demangler (c++filt) has been moved to binutils.
+# But make this target work anyway for demangler hacking.
+demangle: $(ALL) $(srcdir)/cp-demangle.c
+	@echo "The standalone demangler, now named c++filt, is now"
+	@echo "a part of binutils."
+	$(CC) @DEFS@ $(CFLAGS) $(CPPFLAGS) -I. -I$(INCDIR) $(HDEFINES) \
+	  $(srcdir)/cp-demangle.c -DSTANDALONE_DEMANGLER $(TARGETLIB) -o $@
+
+ls:
+	@echo Makefile $(CFILES)
+
+# Various targets for maintainers.
+
+maint-missing :
+	@$(PERL) $(srcdir)/maint-tool -s $(srcdir) missing $(CFILES) $(REQUIRED_OFILES) $(CONFIGURED_OFILES)
+
+maint-buildall : $(REQUIRED_OFILES) $(CONFIGURED_OFILES)
+	@true
+
+maint-undoc : $(srcdir)/functions.texi
+	@$(PERL) $(srcdir)/maint-tool -s $(srcdir) undoc
+
+maint-deps :
+	@$(PERL) $(srcdir)/maint-tool -s $(srcdir) deps $(INCDIR)
+
+# Need to deal with profiled libraries, too.
+
+# Cleaning has to be done carefully to ensure that we don't clean our SUBDIRS
+# multiple times, hence our explicit recursion with an empty SUBDIRS.
+mostlyclean: mostlyclean-subdir
+	-rm -rf *.$(objext) pic core errs \#* *.E a.out
+	-rm -f errors dummy config.h stamp-*
+	-rm -f $(CONFIG_H) stamp-picdir
+	-rm -f libiberty.aux libiberty.cp libiberty.cps libiberty.fn libiberty.ky
+	-rm -f libiberty.log libiberty.tmp libiberty.tps libiberty.pg
+	-rm -f libiberty.pgs libiberty.toc libiberty.tp libiberty.tpl libiberty.vr
+	-rm -f libtexi.stamp
+	@$(MULTICLEAN) multi-clean DO=mostlyclean
+clean: clean-subdir
+	$(MAKE) SUBDIRS="" mostlyclean
+	-rm -f *.a required-list tmpmulti.out
+	-rm -f libiberty.dvi libiberty.pdf libiberty.info* libiberty.html
+	@$(MULTICLEAN) multi-clean DO=clean
+distclean: distclean-subdir
+	$(MAKE) SUBDIRS="" clean
+	@$(MULTICLEAN) multi-clean DO=distclean
+####	-rm -f *~ Makefile config.cache config.status xhost-mkfrag TAGS multilib.out
+	-rm -f *~ Makefile config.cache config.status TAGS multilib.out
+	-rm -f config.log
+####	-rmdir testsuite 2>/dev/null
+maintainer-clean realclean: maintainer-clean-subdir
+	$(MAKE) SUBDIRS="" distclean
+
+force:
+
+Makefile: $(srcdir)/Makefile.in config.status
+	CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
+
+# Depending on Makefile makes sure that config.status has been re-run
+# if needed.  This prevents problems with parallel builds.
+config.h: stamp-h ; @true
+stamp-h: $(srcdir)/config.in config.status Makefile
+	CONFIG_FILES= CONFIG_HEADERS=config.h:$(srcdir)/config.in $(SHELL) ./config.status
+
+config.status: $(srcdir)/configure
+	$(SHELL) ./config.status --recheck
+
+AUTOCONF = autoconf
+configure_deps = $(srcdir)/aclocal.m4 \
+	$(srcdir)/../config/acx.m4 \
+	$(srcdir)/../config/no-executables.m4 \
+	$(srcdir)/../config/override.m4 \
+	$(srcdir)/../config/warnings.m4 \
+
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(configure_deps)
+	cd $(srcdir) && $(AUTOCONF)
+
+# Depending on config.h makes sure that config.status has been re-run
+# if needed.  This prevents problems with parallel builds, in case
+# subdirectories need to run config.status also.
+all-subdir check-subdir installcheck-subdir info-subdir	\
+install-info-subdir clean-info-subdir dvi-subdir pdf-subdir install-subdir	\
+etags-subdir mostlyclean-subdir clean-subdir distclean-subdir \
+maintainer-clean-subdir: config.h
+	@subdirs='$(SUBDIRS)'; \
+	target=`echo $@ | sed -e 's/-subdir//'`; \
+	for dir in $$subdirs ; do \
+	  cd $$dir && $(MAKE) $(FLAGS_TO_PASS) $$target; \
+	done
+
+$(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS): stamp-picdir
+$(CONFIGURED_OFILES): stamp-picdir
+
+# Don't export variables to the environment, in order to not confuse
+# configure.
+.NOEXPORT:
+
+# The dependencies in the remainder of this file are automatically
+# generated by "make maint-deps".  Manual edits will be lost.
+
+./_doprnt.$(objext): $(srcdir)/_doprnt.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/safe-ctype.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/_doprnt.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/_doprnt.c $(OUTPUT_OPTION)
+
+./alloca.$(objext): $(srcdir)/alloca.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/alloca.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/alloca.c $(OUTPUT_OPTION)
+
+./argv.$(objext): $(srcdir)/argv.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/argv.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/argv.c $(OUTPUT_OPTION)
+
+./asprintf.$(objext): $(srcdir)/asprintf.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/asprintf.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/asprintf.c $(OUTPUT_OPTION)
+
+./atexit.$(objext): $(srcdir)/atexit.c config.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/atexit.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/atexit.c $(OUTPUT_OPTION)
+
+./basename.$(objext): $(srcdir)/basename.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/basename.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/basename.c $(OUTPUT_OPTION)
+
+./bcmp.$(objext): $(srcdir)/bcmp.c
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/bcmp.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/bcmp.c $(OUTPUT_OPTION)
+
+./bcopy.$(objext): $(srcdir)/bcopy.c
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/bcopy.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/bcopy.c $(OUTPUT_OPTION)
+
+./bsearch.$(objext): $(srcdir)/bsearch.c config.h $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/bsearch.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/bsearch.c $(OUTPUT_OPTION)
+
+./bzero.$(objext): $(srcdir)/bzero.c
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/bzero.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/bzero.c $(OUTPUT_OPTION)
+
+./calloc.$(objext): $(srcdir)/calloc.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/calloc.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/calloc.c $(OUTPUT_OPTION)
+
+./choose-temp.$(objext): $(srcdir)/choose-temp.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/choose-temp.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/choose-temp.c $(OUTPUT_OPTION)
+
+./clock.$(objext): $(srcdir)/clock.c config.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/clock.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/clock.c $(OUTPUT_OPTION)
+
+./concat.$(objext): $(srcdir)/concat.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/concat.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/concat.c $(OUTPUT_OPTION)
+
+./copysign.$(objext): $(srcdir)/copysign.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/copysign.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/copysign.c $(OUTPUT_OPTION)
+
+./cp-demangle.$(objext): $(srcdir)/cp-demangle.c config.h $(INCDIR)/ansidecl.h \
+	$(srcdir)/cp-demangle.h $(INCDIR)/demangle.h \
+	$(INCDIR)/dyn-string.h $(INCDIR)/getopt.h $(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/cp-demangle.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/cp-demangle.c $(OUTPUT_OPTION)
+
+./cp-demint.$(objext): $(srcdir)/cp-demint.c config.h $(INCDIR)/ansidecl.h \
+	$(srcdir)/cp-demangle.h $(INCDIR)/demangle.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/cp-demint.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/cp-demint.c $(OUTPUT_OPTION)
+
+./cplus-dem.$(objext): $(srcdir)/cplus-dem.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
+	$(INCDIR)/safe-ctype.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/cplus-dem.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/cplus-dem.c $(OUTPUT_OPTION)
+
+./crc32.$(objext): $(srcdir)/crc32.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/crc32.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/crc32.c $(OUTPUT_OPTION)
+
+./dyn-string.$(objext): $(srcdir)/dyn-string.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/dyn-string.h $(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/dyn-string.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/dyn-string.c $(OUTPUT_OPTION)
+
+./fdmatch.$(objext): $(srcdir)/fdmatch.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/fdmatch.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/fdmatch.c $(OUTPUT_OPTION)
+
+./ffs.$(objext): $(srcdir)/ffs.c
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/ffs.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/ffs.c $(OUTPUT_OPTION)
+
+./fibheap.$(objext): $(srcdir)/fibheap.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/fibheap.h $(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/fibheap.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/fibheap.c $(OUTPUT_OPTION)
+
+./filename_cmp.$(objext): $(srcdir)/filename_cmp.c config.h $(INCDIR)/filenames.h \
+	$(INCDIR)/safe-ctype.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/filename_cmp.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/filename_cmp.c $(OUTPUT_OPTION)
+
+./floatformat.$(objext): $(srcdir)/floatformat.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/floatformat.h $(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/floatformat.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/floatformat.c $(OUTPUT_OPTION)
+
+./fnmatch.$(objext): $(srcdir)/fnmatch.c config.h $(INCDIR)/fnmatch.h \
+	$(INCDIR)/safe-ctype.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/fnmatch.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/fnmatch.c $(OUTPUT_OPTION)
+
+./fopen_unlocked.$(objext): $(srcdir)/fopen_unlocked.c config.h \
+	$(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/fopen_unlocked.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/fopen_unlocked.c $(OUTPUT_OPTION)
+
+./getcwd.$(objext): $(srcdir)/getcwd.c config.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/getcwd.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/getcwd.c $(OUTPUT_OPTION)
+
+./getopt.$(objext): $(srcdir)/getopt.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/getopt.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/getopt.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/getopt.c $(OUTPUT_OPTION)
+
+./getopt1.$(objext): $(srcdir)/getopt1.c config.h $(INCDIR)/getopt.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/getopt1.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/getopt1.c $(OUTPUT_OPTION)
+
+./getpagesize.$(objext): $(srcdir)/getpagesize.c config.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/getpagesize.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/getpagesize.c $(OUTPUT_OPTION)
+
+./getpwd.$(objext): $(srcdir)/getpwd.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/getpwd.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/getpwd.c $(OUTPUT_OPTION)
+
+./getruntime.$(objext): $(srcdir)/getruntime.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/getruntime.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/getruntime.c $(OUTPUT_OPTION)
+
+./gettimeofday.$(objext): $(srcdir)/gettimeofday.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/gettimeofday.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/gettimeofday.c $(OUTPUT_OPTION)
+
+./hashtab.$(objext): $(srcdir)/hashtab.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/hashtab.h $(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/hashtab.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/hashtab.c $(OUTPUT_OPTION)
+
+./hex.$(objext): $(srcdir)/hex.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/hex.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/hex.c $(OUTPUT_OPTION)
+
+./index.$(objext): $(srcdir)/index.c
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/index.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/index.c $(OUTPUT_OPTION)
+
+./insque.$(objext): $(srcdir)/insque.c
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/insque.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/insque.c $(OUTPUT_OPTION)
+
+./lbasename.$(objext): $(srcdir)/lbasename.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/filenames.h $(INCDIR)/libiberty.h \
+	$(INCDIR)/safe-ctype.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/lbasename.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/lbasename.c $(OUTPUT_OPTION)
+
+./lrealpath.$(objext): $(srcdir)/lrealpath.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/lrealpath.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/lrealpath.c $(OUTPUT_OPTION)
+
+./make-relative-prefix.$(objext): $(srcdir)/make-relative-prefix.c config.h \
+	$(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/make-relative-prefix.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/make-relative-prefix.c $(OUTPUT_OPTION)
+
+./make-temp-file.$(objext): $(srcdir)/make-temp-file.c config.h \
+	$(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/make-temp-file.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/make-temp-file.c $(OUTPUT_OPTION)
+
+./md5.$(objext): $(srcdir)/md5.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/md5.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/md5.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/md5.c $(OUTPUT_OPTION)
+
+./memchr.$(objext): $(srcdir)/memchr.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/memchr.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/memchr.c $(OUTPUT_OPTION)
+
+./memcmp.$(objext): $(srcdir)/memcmp.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/memcmp.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/memcmp.c $(OUTPUT_OPTION)
+
+./memcpy.$(objext): $(srcdir)/memcpy.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/memcpy.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/memcpy.c $(OUTPUT_OPTION)
+
+./memmem.$(objext): $(srcdir)/memmem.c config.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/memmem.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/memmem.c $(OUTPUT_OPTION)
+
+./memmove.$(objext): $(srcdir)/memmove.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/memmove.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/memmove.c $(OUTPUT_OPTION)
+
+./mempcpy.$(objext): $(srcdir)/mempcpy.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/mempcpy.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/mempcpy.c $(OUTPUT_OPTION)
+
+./memset.$(objext): $(srcdir)/memset.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/memset.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/memset.c $(OUTPUT_OPTION)
+
+./mkstemps.$(objext): $(srcdir)/mkstemps.c config.h $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/mkstemps.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/mkstemps.c $(OUTPUT_OPTION)
+
+./msdos.$(objext): $(srcdir)/msdos.c
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/msdos.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/msdos.c $(OUTPUT_OPTION)
+
+./objalloc.$(objext): $(srcdir)/objalloc.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/objalloc.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/objalloc.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/objalloc.c $(OUTPUT_OPTION)
+
+./obstack.$(objext): $(srcdir)/obstack.c config.h $(INCDIR)/obstack.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/obstack.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/obstack.c $(OUTPUT_OPTION)
+
+./partition.$(objext): $(srcdir)/partition.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h $(INCDIR)/partition.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/partition.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/partition.c $(OUTPUT_OPTION)
+
+####./pex-common.$(objext): $(srcdir)/pex-common.c config.h $(INCDIR)/ansidecl.h \
+####	$(INCDIR)/libiberty.h $(srcdir)/pex-common.h
+####	if [ x"$(PICFLAG)" != x ]; then \
+####	  $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-common.c -o pic/$@; \
+####	else true; fi
+####	$(COMPILE.c) $(srcdir)/pex-common.c $(OUTPUT_OPTION)
+
+####./pex-djgpp.$(objext): $(srcdir)/pex-djgpp.c config.h $(INCDIR)/ansidecl.h \
+####	$(INCDIR)/libiberty.h $(srcdir)/pex-common.h
+####	if [ x"$(PICFLAG)" != x ]; then \
+####	  $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-djgpp.c -o pic/$@; \
+####	else true; fi
+####	$(COMPILE.c) $(srcdir)/pex-djgpp.c $(OUTPUT_OPTION)
+
+####./pex-msdos.$(objext): $(srcdir)/pex-msdos.c config.h $(INCDIR)/ansidecl.h \
+####	$(INCDIR)/libiberty.h $(srcdir)/pex-common.h \
+####	$(INCDIR)/safe-ctype.h
+####	if [ x"$(PICFLAG)" != x ]; then \
+####	  $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-msdos.c -o pic/$@; \
+####	else true; fi
+####	$(COMPILE.c) $(srcdir)/pex-msdos.c $(OUTPUT_OPTION)
+
+####./pex-one.$(objext): $(srcdir)/pex-one.c config.h $(INCDIR)/ansidecl.h \
+####	$(INCDIR)/libiberty.h
+####	if [ x"$(PICFLAG)" != x ]; then \
+####	  $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-one.c -o pic/$@; \
+####	else true; fi
+####	$(COMPILE.c) $(srcdir)/pex-one.c $(OUTPUT_OPTION)
+
+####./pex-unix.$(objext): $(srcdir)/pex-unix.c config.h $(INCDIR)/ansidecl.h \
+####	$(INCDIR)/libiberty.h $(srcdir)/pex-common.h
+####	if [ x"$(PICFLAG)" != x ]; then \
+####	  $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-unix.c -o pic/$@; \
+####	else true; fi
+####	$(COMPILE.c) $(srcdir)/pex-unix.c $(OUTPUT_OPTION)
+
+####./pex-win32.$(objext): $(srcdir)/pex-win32.c config.h $(INCDIR)/ansidecl.h \
+####	$(INCDIR)/libiberty.h $(srcdir)/pex-common.h
+####	if [ x"$(PICFLAG)" != x ]; then \
+####	  $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-win32.c -o pic/$@; \
+####	else true; fi
+####	$(COMPILE.c) $(srcdir)/pex-win32.c $(OUTPUT_OPTION)
+
+####./pexecute.$(objext): $(srcdir)/pexecute.c config.h $(INCDIR)/ansidecl.h \
+####	$(INCDIR)/libiberty.h
+####	if [ x"$(PICFLAG)" != x ]; then \
+####	  $(COMPILE.c) $(PICFLAG) $(srcdir)/pexecute.c -o pic/$@; \
+####	else true; fi
+####	$(COMPILE.c) $(srcdir)/pexecute.c $(OUTPUT_OPTION)
+
+./physmem.$(objext): $(srcdir)/physmem.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/physmem.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/physmem.c $(OUTPUT_OPTION)
+
+./putenv.$(objext): $(srcdir)/putenv.c config.h $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/putenv.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/putenv.c $(OUTPUT_OPTION)
+
+./random.$(objext): $(srcdir)/random.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/random.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/random.c $(OUTPUT_OPTION)
+
+./regex.$(objext): $(srcdir)/regex.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/xregex.h $(INCDIR)/xregex2.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/regex.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/regex.c $(OUTPUT_OPTION)
+
+./rename.$(objext): $(srcdir)/rename.c config.h $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/rename.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/rename.c $(OUTPUT_OPTION)
+
+./rindex.$(objext): $(srcdir)/rindex.c
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/rindex.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/rindex.c $(OUTPUT_OPTION)
+
+./safe-ctype.$(objext): $(srcdir)/safe-ctype.c $(INCDIR)/ansidecl.h \
+	$(INCDIR)/safe-ctype.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/safe-ctype.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/safe-ctype.c $(OUTPUT_OPTION)
+
+./setenv.$(objext): $(srcdir)/setenv.c config.h $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/setenv.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/setenv.c $(OUTPUT_OPTION)
+
+./setproctitle.$(objext): $(srcdir)/setproctitle.c config.h $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/setproctitle.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/setproctitle.c $(OUTPUT_OPTION)
+
+./sha1.$(objext): $(srcdir)/sha1.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/sha1.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/sha1.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/sha1.c $(OUTPUT_OPTION)
+
+./sigsetmask.$(objext): $(srcdir)/sigsetmask.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/sigsetmask.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/sigsetmask.c $(OUTPUT_OPTION)
+
+./simple-object-coff.$(objext): $(srcdir)/simple-object-coff.c config.h \
+	$(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+	$(srcdir)/simple-object-common.h $(INCDIR)/simple-object.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/simple-object-coff.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/simple-object-coff.c $(OUTPUT_OPTION)
+
+./simple-object-elf.$(objext): $(srcdir)/simple-object-elf.c config.h \
+	$(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+	$(srcdir)/simple-object-common.h $(INCDIR)/simple-object.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/simple-object-elf.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/simple-object-elf.c $(OUTPUT_OPTION)
+
+./simple-object-mach-o.$(objext): $(srcdir)/simple-object-mach-o.c config.h \
+	$(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+	$(srcdir)/simple-object-common.h $(INCDIR)/simple-object.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/simple-object-mach-o.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/simple-object-mach-o.c $(OUTPUT_OPTION)
+
+./simple-object.$(objext): $(srcdir)/simple-object.c config.h \
+	$(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+	$(srcdir)/simple-object-common.h $(INCDIR)/simple-object.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/simple-object.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/simple-object.c $(OUTPUT_OPTION)
+
+./snprintf.$(objext): $(srcdir)/snprintf.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/snprintf.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/snprintf.c $(OUTPUT_OPTION)
+
+./sort.$(objext): $(srcdir)/sort.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h $(INCDIR)/sort.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/sort.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/sort.c $(OUTPUT_OPTION)
+
+./spaces.$(objext): $(srcdir)/spaces.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/spaces.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/spaces.c $(OUTPUT_OPTION)
+
+./splay-tree.$(objext): $(srcdir)/splay-tree.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h $(INCDIR)/splay-tree.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/splay-tree.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/splay-tree.c $(OUTPUT_OPTION)
+
+./stack-limit.$(objext): $(srcdir)/stack-limit.c config.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/stack-limit.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/stack-limit.c $(OUTPUT_OPTION)
+
+./stpcpy.$(objext): $(srcdir)/stpcpy.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/stpcpy.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/stpcpy.c $(OUTPUT_OPTION)
+
+./stpncpy.$(objext): $(srcdir)/stpncpy.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/stpncpy.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/stpncpy.c $(OUTPUT_OPTION)
+
+./strcasecmp.$(objext): $(srcdir)/strcasecmp.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strcasecmp.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/strcasecmp.c $(OUTPUT_OPTION)
+
+./strchr.$(objext): $(srcdir)/strchr.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strchr.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/strchr.c $(OUTPUT_OPTION)
+
+./strdup.$(objext): $(srcdir)/strdup.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strdup.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/strdup.c $(OUTPUT_OPTION)
+
+./strerror.$(objext): $(srcdir)/strerror.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strerror.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/strerror.c $(OUTPUT_OPTION)
+
+./strncasecmp.$(objext): $(srcdir)/strncasecmp.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strncasecmp.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/strncasecmp.c $(OUTPUT_OPTION)
+
+./strncmp.$(objext): $(srcdir)/strncmp.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strncmp.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/strncmp.c $(OUTPUT_OPTION)
+
+./strndup.$(objext): $(srcdir)/strndup.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strndup.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/strndup.c $(OUTPUT_OPTION)
+
+./strrchr.$(objext): $(srcdir)/strrchr.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strrchr.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/strrchr.c $(OUTPUT_OPTION)
+
+./strsignal.$(objext): $(srcdir)/strsignal.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strsignal.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/strsignal.c $(OUTPUT_OPTION)
+
+./strstr.$(objext): $(srcdir)/strstr.c
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strstr.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/strstr.c $(OUTPUT_OPTION)
+
+./strtod.$(objext): $(srcdir)/strtod.c $(INCDIR)/ansidecl.h \
+	$(INCDIR)/safe-ctype.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strtod.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/strtod.c $(OUTPUT_OPTION)
+
+./strtol.$(objext): $(srcdir)/strtol.c config.h $(INCDIR)/safe-ctype.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strtol.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/strtol.c $(OUTPUT_OPTION)
+
+./strtoul.$(objext): $(srcdir)/strtoul.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/safe-ctype.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strtoul.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/strtoul.c $(OUTPUT_OPTION)
+
+./strverscmp.$(objext): $(srcdir)/strverscmp.c $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/strverscmp.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/strverscmp.c $(OUTPUT_OPTION)
+
+./tmpnam.$(objext): $(srcdir)/tmpnam.c
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/tmpnam.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/tmpnam.c $(OUTPUT_OPTION)
+
+./unlink-if-ordinary.$(objext): $(srcdir)/unlink-if-ordinary.c config.h \
+	$(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/unlink-if-ordinary.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/unlink-if-ordinary.c $(OUTPUT_OPTION)
+
+./vasprintf.$(objext): $(srcdir)/vasprintf.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/vasprintf.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/vasprintf.c $(OUTPUT_OPTION)
+
+./vfork.$(objext): $(srcdir)/vfork.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/vfork.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/vfork.c $(OUTPUT_OPTION)
+
+./vfprintf.$(objext): $(srcdir)/vfprintf.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/vfprintf.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/vfprintf.c $(OUTPUT_OPTION)
+
+./vprintf.$(objext): $(srcdir)/vprintf.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/vprintf.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/vprintf.c $(OUTPUT_OPTION)
+
+./vsnprintf.$(objext): $(srcdir)/vsnprintf.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/vsnprintf.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/vsnprintf.c $(OUTPUT_OPTION)
+
+./vsprintf.$(objext): $(srcdir)/vsprintf.c $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/vsprintf.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/vsprintf.c $(OUTPUT_OPTION)
+
+./waitpid.$(objext): $(srcdir)/waitpid.c config.h $(INCDIR)/ansidecl.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/waitpid.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/waitpid.c $(OUTPUT_OPTION)
+
+./xatexit.$(objext): $(srcdir)/xatexit.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/xatexit.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/xatexit.c $(OUTPUT_OPTION)
+
+./xexit.$(objext): $(srcdir)/xexit.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/xexit.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/xexit.c $(OUTPUT_OPTION)
+
+./xmalloc.$(objext): $(srcdir)/xmalloc.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/xmalloc.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/xmalloc.c $(OUTPUT_OPTION)
+
+./xmemdup.$(objext): $(srcdir)/xmemdup.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/xmemdup.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/xmemdup.c $(OUTPUT_OPTION)
+
+./xstrdup.$(objext): $(srcdir)/xstrdup.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/xstrdup.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/xstrdup.c $(OUTPUT_OPTION)
+
+./xstrerror.$(objext): $(srcdir)/xstrerror.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/xstrerror.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/xstrerror.c $(OUTPUT_OPTION)
+
+./xstrndup.$(objext): $(srcdir)/xstrndup.c config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
+	if [ x"$(PICFLAG)" != x ]; then \
+	  $(COMPILE.c) $(PICFLAG) $(srcdir)/xstrndup.c -o pic/$@; \
+	else true; fi
+	$(COMPILE.c) $(srcdir)/xstrndup.c $(OUTPUT_OPTION)
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/README sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/README
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/README	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/README	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,72 @@
+This directory contains the -liberty library of free software.
+It is a collection of subroutines used by various GNU programs.
+Current members include:
+
+	getopt -- get options from command line
+	obstack -- stacks of arbitrarily-sized objects
+	strerror -- error message strings corresponding to errno
+	strtol -- string-to-long conversion
+	strtoul -- string-to-unsigned-long conversion
+
+We expect many of the GNU subroutines that are floating around to
+eventually arrive here.
+
+The library must be configured from the top source directory.  Don't
+try to run configure in this directory.  Follow the configuration
+instructions in ../README.
+
+Please report bugs to "gcc-bugs@gcc.gnu.org" and send fixes to
+"gcc-patches@gcc.gnu.org".  Thank you.
+
+ADDING A NEW FILE
+=================
+
+There are two sets of files:  Those that are "required" will be
+included in the library for all configurations, while those
+that are "optional" will be included in the library only if "needed."
+
+To add a new required file, edit Makefile.in to add the source file
+name to CFILES and the object file to REQUIRED_OFILES.
+
+To add a new optional file, it must provide a single function, and the
+name of the function must be the same as the name of the file.
+
+    * Add the source file name to CFILES in Makefile.in and the object
+      file to CONFIGURED_OFILES.
+
+    * Add the function to name to the funcs shell variable in
+      configure.ac.
+
+    * Add the function to the AC_CHECK_FUNCS lists just after the
+      setting of the funcs shell variable.  These AC_CHECK_FUNCS calls
+      are never executed; they are there to make autoheader work
+      better.
+
+    * Consider the special cases of building libiberty; as of this
+      writing, the special cases are newlib and VxWorks.  If a
+      particular special case provides the function, you do not need
+      to do anything.  If it does not provide the function, add the
+      object file to LIBOBJS, and add the function name to the case
+      controlling whether to define HAVE_func.
+
+Finally, in the build directory of libiberty, configure with
+"--enable-maintainer-mode", run "make maint-deps" to update
+Makefile.in, and run 'make stamp-functions' to regenerate
+functions.texi.
+
+The optional file you've added (e.g. getcwd.c) should compile and work
+on all hosts where it is needed.  It does not have to work or even
+compile on hosts where it is not needed.
+
+ADDING A NEW CONFIGURATION
+==========================
+
+On most hosts you should be able to use the scheme for automatically
+figuring out which files are needed.  In that case, you probably
+don't need a special Makefile stub for that configuration.
+
+If the fully automatic scheme doesn't work, you may be able to get
+by with defining EXTRA_OFILES in your Makefile stub.  This is
+a list of object file names that should be treated as required
+for this configuration - they will be included in libiberty.a,
+regardless of whatever might be in the C library.
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/_doprnt.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/_doprnt.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/_doprnt.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/_doprnt.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,296 @@
+/* Provide a version of _doprnt in terms of fprintf.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002   Free Software Foundation, Inc.
+   Contributed by Kaveh Ghazi  (ghazi@caip.rutgers.edu)  3/29/98
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include "config.h"
+#include "ansidecl.h"
+#include "safe-ctype.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#undef _doprnt
+
+#ifdef HAVE__DOPRNT
+#define TEST
+#endif
+
+#ifdef TEST /* Make sure to use the internal one.  */
+#define _doprnt my_doprnt
+#endif
+
+#define COPY_VA_INT \
+  do { \
+	 const int value = abs (va_arg (ap, int)); \
+	 char buf[32]; \
+	 ptr++; /* Go past the asterisk.  */ \
+	 *sptr = '\0'; /* NULL terminate sptr.  */ \
+	 sprintf(buf, "%d", value); \
+	 strcat(sptr, buf); \
+	 while (*sptr) sptr++; \
+     } while (0)
+
+#define PRINT_CHAR(CHAR) \
+  do { \
+	 putc(CHAR, stream); \
+	 ptr++; \
+	 total_printed++; \
+	 continue; \
+     } while (0)
+
+#define PRINT_TYPE(TYPE) \
+  do { \
+	int result; \
+	TYPE value = va_arg (ap, TYPE); \
+	*sptr++ = *ptr++; /* Copy the type specifier.  */ \
+	*sptr = '\0'; /* NULL terminate sptr.  */ \
+	result = fprintf(stream, specifier, value); \
+	if (result == -1) \
+	  return -1; \
+	else \
+	  { \
+	    total_printed += result; \
+	    continue; \
+	  } \
+      } while (0)
+
+int
+_doprnt (const char *format, va_list ap, FILE *stream)
+{
+  const char * ptr = format;
+  char specifier[128];
+  int total_printed = 0;
+  
+  while (*ptr != '\0')
+    {
+      if (*ptr != '%') /* While we have regular characters, print them.  */
+	PRINT_CHAR(*ptr);
+      else /* We got a format specifier! */
+	{
+	  char * sptr = specifier;
+	  int wide_width = 0, short_width = 0;
+	  
+	  *sptr++ = *ptr++; /* Copy the % and move forward.  */
+
+	  while (strchr ("-+ #0", *ptr)) /* Move past flags.  */
+	    *sptr++ = *ptr++;
+
+	  if (*ptr == '*')
+	    COPY_VA_INT;
+	  else
+	    while (ISDIGIT(*ptr)) /* Handle explicit numeric value.  */
+	      *sptr++ = *ptr++;
+	  
+	  if (*ptr == '.')
+	    {
+	      *sptr++ = *ptr++; /* Copy and go past the period.  */
+	      if (*ptr == '*')
+		COPY_VA_INT;
+	      else
+		while (ISDIGIT(*ptr)) /* Handle explicit numeric value.  */
+		  *sptr++ = *ptr++;
+	    }
+	  while (strchr ("hlL", *ptr))
+	    {
+	      switch (*ptr)
+		{
+		case 'h':
+		  short_width = 1;
+		  break;
+		case 'l':
+		  wide_width++;
+		  break;
+		case 'L':
+		  wide_width = 2;
+		  break;
+		default:
+		  abort();
+		}
+	      *sptr++ = *ptr++;
+	    }
+
+	  switch (*ptr)
+	    {
+	    case 'd':
+	    case 'i':
+	    case 'o':
+	    case 'u':
+	    case 'x':
+	    case 'X':
+	    case 'c':
+	      {
+		/* Short values are promoted to int, so just copy it
+                   as an int and trust the C library printf to cast it
+                   to the right width.  */
+		if (short_width)
+		  PRINT_TYPE(int);
+		else
+		  {
+		    switch (wide_width)
+		      {
+		      case 0:
+			PRINT_TYPE(int);
+			break;
+		      case 1:
+			PRINT_TYPE(long);
+			break;
+		      case 2:
+		      default:
+#if defined(__GNUC__) || defined(HAVE_LONG_LONG)
+			PRINT_TYPE(long long);
+#else
+			PRINT_TYPE(long); /* Fake it and hope for the best.  */
+#endif
+			break;
+		      } /* End of switch (wide_width) */
+		  } /* End of else statement */
+	      } /* End of integer case */
+	      break;
+	    case 'f':
+	    case 'e':
+	    case 'E':
+	    case 'g':
+	    case 'G':
+	      {
+		if (wide_width == 0)
+		  PRINT_TYPE(double);
+		else
+		  {
+#if defined(__GNUC__) || defined(HAVE_LONG_DOUBLE)
+		    PRINT_TYPE(long double);
+#else
+		    PRINT_TYPE(double); /* Fake it and hope for the best.  */
+#endif
+		  }
+	      }
+	      break;
+	    case 's':
+	      PRINT_TYPE(char *);
+	      break;
+	    case 'p':
+	      PRINT_TYPE(void *);
+	      break;
+	    case '%':
+	      PRINT_CHAR('%');
+	      break;
+	    default:
+	      abort();
+	    } /* End of switch (*ptr) */
+	} /* End of else statement */
+    }
+
+  return total_printed;
+}
+
+#ifdef TEST
+
+#include <math.h>
+#ifndef M_PI
+#define M_PI (3.1415926535897932385)
+#endif
+
+#define RESULT(x) do \
+{ \
+    int i = (x); \
+    printf ("printed %d characters\n", i); \
+    fflush(stdin); \
+} while (0)
+
+static int checkit (const char * format, ...) ATTRIBUTE_PRINTF_1;
+
+static int
+checkit (const char* format, ...)
+{
+  int result;
+  VA_OPEN (args, format);
+  VA_FIXEDARG (args, char *, format);
+
+  result = _doprnt (format, args, stdout);
+  VA_CLOSE (args);
+
+  return result;
+}
+
+int
+main (void)
+{
+  RESULT(checkit ("<%d>\n", 0x12345678));
+  RESULT(printf ("<%d>\n", 0x12345678));
+
+  RESULT(checkit ("<%200d>\n", 5));
+  RESULT(printf ("<%200d>\n", 5));
+
+  RESULT(checkit ("<%.300d>\n", 6));
+  RESULT(printf ("<%.300d>\n", 6));
+
+  RESULT(checkit ("<%100.150d>\n", 7));
+  RESULT(printf ("<%100.150d>\n", 7));
+
+  RESULT(checkit ("<%s>\n",
+		  "jjjjjjjjjiiiiiiiiiiiiiiioooooooooooooooooppppppppppppaa\n\
+777777777777777777333333333333366666666666622222222222777777777777733333"));
+  RESULT(printf ("<%s>\n",
+		 "jjjjjjjjjiiiiiiiiiiiiiiioooooooooooooooooppppppppppppaa\n\
+777777777777777777333333333333366666666666622222222222777777777777733333"));
+
+  RESULT(checkit ("<%f><%0+#f>%s%d%s>\n",
+		  1.0, 1.0, "foo", 77, "asdjffffffffffffffiiiiiiiiiiixxxxx"));
+  RESULT(printf ("<%f><%0+#f>%s%d%s>\n",
+		 1.0, 1.0, "foo", 77, "asdjffffffffffffffiiiiiiiiiiixxxxx"));
+
+  RESULT(checkit ("<%4f><%.4f><%%><%4.4f>\n", M_PI, M_PI, M_PI));
+  RESULT(printf ("<%4f><%.4f><%%><%4.4f>\n", M_PI, M_PI, M_PI));
+
+  RESULT(checkit ("<%*f><%.*f><%%><%*.*f>\n", 3, M_PI, 3, M_PI, 3, 3, M_PI));
+  RESULT(printf ("<%*f><%.*f><%%><%*.*f>\n", 3, M_PI, 3, M_PI, 3, 3, M_PI));
+
+  RESULT(checkit ("<%d><%i><%o><%u><%x><%X><%c>\n",
+		  75, 75, 75, 75, 75, 75, 75));
+  RESULT(printf ("<%d><%i><%o><%u><%x><%X><%c>\n",
+		 75, 75, 75, 75, 75, 75, 75));
+
+  RESULT(checkit ("<%d><%i><%o><%u><%x><%X><%c>\n",
+		  75, 75, 75, 75, 75, 75, 75));
+  RESULT(printf ("<%d><%i><%o><%u><%x><%X><%c>\n",
+		 75, 75, 75, 75, 75, 75, 75));
+
+  RESULT(checkit ("Testing (hd) short: <%d><%ld><%hd><%hd><%d>\n", 123, (long)234, 345, 123456789, 456));
+  RESULT(printf ("Testing (hd) short: <%d><%ld><%hd><%hd><%d>\n", 123, (long)234, 345, 123456789, 456));
+
+#if defined(__GNUC__) || defined (HAVE_LONG_LONG)
+  RESULT(checkit ("Testing (lld) long long: <%d><%lld><%d>\n", 123, 234234234234234234LL, 345));
+  RESULT(printf ("Testing (lld) long long: <%d><%lld><%d>\n", 123, 234234234234234234LL, 345));
+  RESULT(checkit ("Testing (Ld) long long: <%d><%Ld><%d>\n", 123, 234234234234234234LL, 345));
+  RESULT(printf ("Testing (Ld) long long: <%d><%Ld><%d>\n", 123, 234234234234234234LL, 345));
+#endif
+
+#if defined(__GNUC__) || defined (HAVE_LONG_DOUBLE)
+  RESULT(checkit ("Testing (Lf) long double: <%.20f><%.20Lf><%0+#.20f>\n",
+		  1.23456, 1.234567890123456789L, 1.23456));
+  RESULT(printf ("Testing (Lf) long double: <%.20f><%.20Lf><%0+#.20f>\n",
+		 1.23456, 1.234567890123456789L, 1.23456));
+#endif
+
+  return 0;
+}
+#endif /* TEST */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/aclocal.m4 sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/aclocal.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/aclocal.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/aclocal.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,175 @@
+sinclude(../config/acx.m4)
+sinclude(../config/no-executables.m4)
+sinclude(../config/override.m4)
+sinclude(../config/picflag.m4)
+sinclude(../config/warnings.m4)
+
+dnl See whether strncmp reads past the end of its string parameters.
+dnl On some versions of SunOS4 at least, strncmp reads a word at a time
+dnl but erroneously reads past the end of strings.  This can cause
+dnl a SEGV in some cases.
+AC_DEFUN(libiberty_AC_FUNC_STRNCMP,
+[AC_REQUIRE([AC_FUNC_MMAP])
+AC_CACHE_CHECK([for working strncmp], ac_cv_func_strncmp_works,
+[AC_TRY_RUN([
+/* Test by Jim Wilson and Kaveh Ghazi.
+   Check whether strncmp reads past the end of its string parameters. */
+#include <sys/types.h>
+
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+#ifdef HAVE_SYS_MMAN_H
+#include <sys/mman.h>
+#endif
+
+#ifndef MAP_ANON
+#ifdef MAP_ANONYMOUS
+#define MAP_ANON MAP_ANONYMOUS
+#else
+#define MAP_ANON MAP_FILE
+#endif
+#endif
+
+#ifndef MAP_FILE
+#define MAP_FILE 0
+#endif
+#ifndef O_RDONLY
+#define O_RDONLY 0
+#endif
+
+#define MAP_LEN 0x10000
+
+main ()
+{
+#if defined(HAVE_MMAP) || defined(HAVE_MMAP_ANYWHERE)
+  char *p;
+  int dev_zero;
+
+  dev_zero = open ("/dev/zero", O_RDONLY);
+  if (dev_zero < 0)
+    exit (1);
+  
+  p = (char *) mmap (0, MAP_LEN, PROT_READ|PROT_WRITE,
+		     MAP_ANON|MAP_PRIVATE, dev_zero, 0);
+  if (p == (char *)-1)
+    p = (char *) mmap (0, MAP_LEN, PROT_READ|PROT_WRITE,
+		       MAP_ANON|MAP_PRIVATE, -1, 0);
+  if (p == (char *)-1)
+    exit (2);
+  else
+    {
+      char *string = "__si_type_info";
+      char *q = (char *) p + MAP_LEN - strlen (string) - 2;
+      char *r = (char *) p + 0xe;
+
+      strcpy (q, string);
+      strcpy (r, string);
+      strncmp (r, q, 14);
+    }
+#endif /* HAVE_MMAP || HAVE_MMAP_ANYWHERE */
+  exit (0);
+}
+], ac_cv_func_strncmp_works=yes, ac_cv_func_strncmp_works=no,
+  ac_cv_func_strncmp_works=no)
+rm -f core core.* *.core])
+if test $ac_cv_func_strncmp_works = no ; then
+  AC_LIBOBJ([strncmp])
+fi
+])
+
+dnl See if errno must be declared even when <errno.h> is included.
+AC_DEFUN(libiberty_AC_DECLARE_ERRNO,
+[AC_CACHE_CHECK(whether errno must be declared, libiberty_cv_declare_errno,
+[AC_TRY_COMPILE(
+[#include <errno.h>],
+[int x = errno;],
+libiberty_cv_declare_errno=no,
+libiberty_cv_declare_errno=yes)])
+if test $libiberty_cv_declare_errno = yes
+then AC_DEFINE(NEED_DECLARATION_ERRNO, 1,
+  [Define if errno must be declared even when <errno.h> is included.])
+fi
+])
+
+dnl See whether we need a declaration for a function.
+AC_DEFUN(libiberty_NEED_DECLARATION,
+[AC_MSG_CHECKING([whether $1 must be declared])
+AC_CACHE_VAL(libiberty_cv_decl_needed_$1,
+[AC_TRY_COMPILE([
+#include "confdefs.h"
+#include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif],
+[char *(*pfn) = (char *(*)) $1],
+libiberty_cv_decl_needed_$1=no, libiberty_cv_decl_needed_$1=yes)])
+AC_MSG_RESULT($libiberty_cv_decl_needed_$1)
+if test $libiberty_cv_decl_needed_$1 = yes; then
+  AC_DEFINE([NEED_DECLARATION_]translit($1, [a-z], [A-Z]), 1,
+            [Define if $1 is not declared in system header files.])
+fi
+])dnl
+
+# We always want a C version of alloca() compiled into libiberty,
+# because native-compiler support for the real alloca is so !@#$%
+# unreliable that GCC has decided to use it only when being compiled
+# by GCC.  This is the part of AC_FUNC_ALLOCA that calculates the
+# information alloca.c needs.
+AC_DEFUN(libiberty_AC_FUNC_C_ALLOCA,
+[AC_CACHE_CHECK(whether alloca needs Cray hooks, ac_cv_os_cray,
+[AC_EGREP_CPP(webecray,
+[#if defined(CRAY) && ! defined(CRAY2)
+webecray
+#else
+wenotbecray
+#endif
+], ac_cv_os_cray=yes, ac_cv_os_cray=no)])
+if test $ac_cv_os_cray = yes; then
+  for ac_func in _getb67 GETB67 getb67; do
+    AC_CHECK_FUNC($ac_func, 
+      [AC_DEFINE_UNQUOTED(CRAY_STACKSEG_END, $ac_func, 
+  [Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP
+   systems. This function is required for alloca.c support on those
+   systems.])  break])
+  done
+fi
+
+AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
+[AC_TRY_RUN([find_stack_direction ()
+{
+  static char *addr = 0;
+  auto char dummy;
+  if (addr == 0)
+    {
+      addr = &dummy;
+      return find_stack_direction ();
+    }
+  else
+    return (&dummy > addr) ? 1 : -1;
+}
+main ()
+{
+  exit (find_stack_direction() < 0);
+}], 
+  ac_cv_c_stack_direction=1,
+  ac_cv_c_stack_direction=-1,
+  ac_cv_c_stack_direction=0)])
+AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction,
+  [Define if you know the direction of stack growth for your system;
+   otherwise it will be automatically deduced at run-time.
+        STACK_DIRECTION > 0 => grows toward higher addresses
+        STACK_DIRECTION < 0 => grows toward lower addresses
+        STACK_DIRECTION = 0 => direction of growth unknown])
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/alloca.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/alloca.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/alloca.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/alloca.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,483 @@
+/* alloca.c -- allocate automatically reclaimed memory
+   (Mostly) portable public-domain implementation -- D A Gwyn
+
+   This implementation of the PWB library alloca function,
+   which is used to allocate space off the run-time stack so
+   that it is automatically reclaimed upon procedure exit,
+   was inspired by discussions with J. Q. Johnson of Cornell.
+   J.Otto Tennant <jot@cray.com> contributed the Cray support.
+
+   There are some preprocessor constants that can
+   be defined when compiling for your specific system, for
+   improved efficiency; however, the defaults should be okay.
+
+   The general concept of this implementation is to keep
+   track of all alloca-allocated blocks, and reclaim any
+   that are found to be deeper in the stack than the current
+   invocation.  This heuristic does not reclaim storage as
+   soon as it becomes invalid, but it will do so eventually.
+
+   As a special case, alloca(0) reclaims storage without
+   allocating any.  It is a good idea to use alloca(0) in
+   your main control loop, etc. to force garbage collection.  */
+
+/*
+
+@deftypefn Replacement void* alloca (size_t @var{size})
+
+This function allocates memory which will be automatically reclaimed
+after the procedure exits.  The @libib{} implementation does not free
+the memory immediately but will do so eventually during subsequent
+calls to this function.  Memory is allocated using @code{xmalloc} under
+normal circumstances.
+
+The header file @file{alloca-conf.h} can be used in conjunction with the
+GNU Autoconf test @code{AC_FUNC_ALLOCA} to test for and properly make
+available this function.  The @code{AC_FUNC_ALLOCA} test requires that
+client code use a block of preprocessor code to be safe (see the Autoconf
+manual for more); this header incorporates that logic and more, including
+the possibility of a GCC built-in function.
+
+@end deftypefn
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <libiberty.h>
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+/* These variables are used by the ASTRDUP implementation that relies
+   on C_alloca.  */
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+const char *libiberty_optr;
+char *libiberty_nptr;
+unsigned long libiberty_len;
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+/* If your stack is a linked list of frames, you have to
+   provide an "address metric" ADDRESS_FUNCTION macro.  */
+
+#if defined (CRAY) && defined (CRAY_STACKSEG_END)
+static long i00afunc ();
+#define ADDRESS_FUNCTION(arg) (char *) i00afunc (&(arg))
+#else
+#define ADDRESS_FUNCTION(arg) &(arg)
+#endif
+
+#ifndef NULL
+#define	NULL	0
+#endif
+
+/* Define STACK_DIRECTION if you know the direction of stack
+   growth for your system; otherwise it will be automatically
+   deduced at run-time.
+
+   STACK_DIRECTION > 0 => grows toward higher addresses
+   STACK_DIRECTION < 0 => grows toward lower addresses
+   STACK_DIRECTION = 0 => direction of growth unknown  */
+
+#ifndef STACK_DIRECTION
+#define	STACK_DIRECTION	0	/* Direction unknown.  */
+#endif
+
+#if STACK_DIRECTION != 0
+
+#define	STACK_DIR	STACK_DIRECTION	/* Known at compile-time.  */
+
+#else /* STACK_DIRECTION == 0; need run-time code.  */
+
+static int stack_dir;		/* 1 or -1 once known.  */
+#define	STACK_DIR	stack_dir
+
+static void
+find_stack_direction (void)
+{
+  static char *addr = NULL;	/* Address of first `dummy', once known.  */
+  auto char dummy;		/* To get stack address.  */
+
+  if (addr == NULL)
+    {				/* Initial entry.  */
+      addr = ADDRESS_FUNCTION (dummy);
+
+      find_stack_direction ();	/* Recurse once.  */
+    }
+  else
+    {
+      /* Second entry.  */
+      if (ADDRESS_FUNCTION (dummy) > addr)
+	stack_dir = 1;		/* Stack grew upward.  */
+      else
+	stack_dir = -1;		/* Stack grew downward.  */
+    }
+}
+
+#endif /* STACK_DIRECTION == 0 */
+
+/* An "alloca header" is used to:
+   (a) chain together all alloca'ed blocks;
+   (b) keep track of stack depth.
+
+   It is very important that sizeof(header) agree with malloc
+   alignment chunk size.  The following default should work okay.  */
+
+#ifndef	ALIGN_SIZE
+#define	ALIGN_SIZE	sizeof(double)
+#endif
+
+typedef union hdr
+{
+  char align[ALIGN_SIZE];	/* To force sizeof(header).  */
+  struct
+    {
+      union hdr *next;		/* For chaining headers.  */
+      char *deep;		/* For stack depth measure.  */
+    } h;
+} header;
+
+static header *last_alloca_header = NULL;	/* -> last alloca header.  */
+
+/* Return a pointer to at least SIZE bytes of storage,
+   which will be automatically reclaimed upon exit from
+   the procedure that called alloca.  Originally, this space
+   was supposed to be taken from the current stack frame of the
+   caller, but that method cannot be made to work for some
+   implementations of C, for example under Gould's UTX/32.  */
+
+/* @undocumented C_alloca */
+
+PTR
+C_alloca (size_t size)
+{
+  auto char probe;		/* Probes stack depth: */
+  register char *depth = ADDRESS_FUNCTION (probe);
+
+#if STACK_DIRECTION == 0
+  if (STACK_DIR == 0)		/* Unknown growth direction.  */
+    find_stack_direction ();
+#endif
+
+  /* Reclaim garbage, defined as all alloca'd storage that
+     was allocated from deeper in the stack than currently.  */
+
+  {
+    register header *hp;	/* Traverses linked list.  */
+
+    for (hp = last_alloca_header; hp != NULL;)
+      if ((STACK_DIR > 0 && hp->h.deep > depth)
+	  || (STACK_DIR < 0 && hp->h.deep < depth))
+	{
+	  register header *np = hp->h.next;
+
+	  free ((PTR) hp);	/* Collect garbage.  */
+
+	  hp = np;		/* -> next header.  */
+	}
+      else
+	break;			/* Rest are not deeper.  */
+
+    last_alloca_header = hp;	/* -> last valid storage.  */
+  }
+
+  if (size == 0)
+    return NULL;		/* No allocation required.  */
+
+  /* Allocate combined header + user data storage.  */
+
+  {
+    register void *new_storage = XNEWVEC (char, sizeof (header) + size);
+    /* Address of header.  */
+
+    if (new_storage == 0)
+      abort();
+
+    ((header *) new_storage)->h.next = last_alloca_header;
+    ((header *) new_storage)->h.deep = depth;
+
+    last_alloca_header = (header *) new_storage;
+
+    /* User storage begins just after header.  */
+
+    return (PTR) ((char *) new_storage + sizeof (header));
+  }
+}
+
+#if defined (CRAY) && defined (CRAY_STACKSEG_END)
+
+#ifdef DEBUG_I00AFUNC
+#include <stdio.h>
+#endif
+
+#ifndef CRAY_STACK
+#define CRAY_STACK
+#ifndef CRAY2
+/* Stack structures for CRAY-1, CRAY X-MP, and CRAY Y-MP */
+struct stack_control_header
+  {
+    long shgrow:32;		/* Number of times stack has grown.  */
+    long shaseg:32;		/* Size of increments to stack.  */
+    long shhwm:32;		/* High water mark of stack.  */
+    long shsize:32;		/* Current size of stack (all segments).  */
+  };
+
+/* The stack segment linkage control information occurs at
+   the high-address end of a stack segment.  (The stack
+   grows from low addresses to high addresses.)  The initial
+   part of the stack segment linkage control information is
+   0200 (octal) words.  This provides for register storage
+   for the routine which overflows the stack.  */
+
+struct stack_segment_linkage
+  {
+    long ss[0200];		/* 0200 overflow words.  */
+    long sssize:32;		/* Number of words in this segment.  */
+    long ssbase:32;		/* Offset to stack base.  */
+    long:32;
+    long sspseg:32;		/* Offset to linkage control of previous
+				   segment of stack.  */
+    long:32;
+    long sstcpt:32;		/* Pointer to task common address block.  */
+    long sscsnm;		/* Private control structure number for
+				   microtasking.  */
+    long ssusr1;		/* Reserved for user.  */
+    long ssusr2;		/* Reserved for user.  */
+    long sstpid;		/* Process ID for pid based multi-tasking.  */
+    long ssgvup;		/* Pointer to multitasking thread giveup.  */
+    long sscray[7];		/* Reserved for Cray Research.  */
+    long ssa0;
+    long ssa1;
+    long ssa2;
+    long ssa3;
+    long ssa4;
+    long ssa5;
+    long ssa6;
+    long ssa7;
+    long sss0;
+    long sss1;
+    long sss2;
+    long sss3;
+    long sss4;
+    long sss5;
+    long sss6;
+    long sss7;
+  };
+
+#else /* CRAY2 */
+/* The following structure defines the vector of words
+   returned by the STKSTAT library routine.  */
+struct stk_stat
+  {
+    long now;			/* Current total stack size.  */
+    long maxc;			/* Amount of contiguous space which would
+				   be required to satisfy the maximum
+				   stack demand to date.  */
+    long high_water;		/* Stack high-water mark.  */
+    long overflows;		/* Number of stack overflow ($STKOFEN) calls.  */
+    long hits;			/* Number of internal buffer hits.  */
+    long extends;		/* Number of block extensions.  */
+    long stko_mallocs;		/* Block allocations by $STKOFEN.  */
+    long underflows;		/* Number of stack underflow calls ($STKRETN).  */
+    long stko_free;		/* Number of deallocations by $STKRETN.  */
+    long stkm_free;		/* Number of deallocations by $STKMRET.  */
+    long segments;		/* Current number of stack segments.  */
+    long maxs;			/* Maximum number of stack segments so far.  */
+    long pad_size;		/* Stack pad size.  */
+    long current_address;	/* Current stack segment address.  */
+    long current_size;		/* Current stack segment size.  This
+				   number is actually corrupted by STKSTAT to
+				   include the fifteen word trailer area.  */
+    long initial_address;	/* Address of initial segment.  */
+    long initial_size;		/* Size of initial segment.  */
+  };
+
+/* The following structure describes the data structure which trails
+   any stack segment.  I think that the description in 'asdef' is
+   out of date.  I only describe the parts that I am sure about.  */
+
+struct stk_trailer
+  {
+    long this_address;		/* Address of this block.  */
+    long this_size;		/* Size of this block (does not include
+				   this trailer).  */
+    long unknown2;
+    long unknown3;
+    long link;			/* Address of trailer block of previous
+				   segment.  */
+    long unknown5;
+    long unknown6;
+    long unknown7;
+    long unknown8;
+    long unknown9;
+    long unknown10;
+    long unknown11;
+    long unknown12;
+    long unknown13;
+    long unknown14;
+  };
+
+#endif /* CRAY2 */
+#endif /* not CRAY_STACK */
+
+#ifdef CRAY2
+/* Determine a "stack measure" for an arbitrary ADDRESS.
+   I doubt that "lint" will like this much.  */
+
+static long
+i00afunc (long *address)
+{
+  struct stk_stat status;
+  struct stk_trailer *trailer;
+  long *block, size;
+  long result = 0;
+
+  /* We want to iterate through all of the segments.  The first
+     step is to get the stack status structure.  We could do this
+     more quickly and more directly, perhaps, by referencing the
+     $LM00 common block, but I know that this works.  */
+
+  STKSTAT (&status);
+
+  /* Set up the iteration.  */
+
+  trailer = (struct stk_trailer *) (status.current_address
+				    + status.current_size
+				    - 15);
+
+  /* There must be at least one stack segment.  Therefore it is
+     a fatal error if "trailer" is null.  */
+
+  if (trailer == 0)
+    abort ();
+
+  /* Discard segments that do not contain our argument address.  */
+
+  while (trailer != 0)
+    {
+      block = (long *) trailer->this_address;
+      size = trailer->this_size;
+      if (block == 0 || size == 0)
+	abort ();
+      trailer = (struct stk_trailer *) trailer->link;
+      if ((block <= address) && (address < (block + size)))
+	break;
+    }
+
+  /* Set the result to the offset in this segment and add the sizes
+     of all predecessor segments.  */
+
+  result = address - block;
+
+  if (trailer == 0)
+    {
+      return result;
+    }
+
+  do
+    {
+      if (trailer->this_size <= 0)
+	abort ();
+      result += trailer->this_size;
+      trailer = (struct stk_trailer *) trailer->link;
+    }
+  while (trailer != 0);
+
+  /* We are done.  Note that if you present a bogus address (one
+     not in any segment), you will get a different number back, formed
+     from subtracting the address of the first block.  This is probably
+     not what you want.  */
+
+  return (result);
+}
+
+#else /* not CRAY2 */
+/* Stack address function for a CRAY-1, CRAY X-MP, or CRAY Y-MP.
+   Determine the number of the cell within the stack,
+   given the address of the cell.  The purpose of this
+   routine is to linearize, in some sense, stack addresses
+   for alloca.  */
+
+static long
+i00afunc (long address)
+{
+  long stkl = 0;
+
+  long size, pseg, this_segment, stack;
+  long result = 0;
+
+  struct stack_segment_linkage *ssptr;
+
+  /* Register B67 contains the address of the end of the
+     current stack segment.  If you (as a subprogram) store
+     your registers on the stack and find that you are past
+     the contents of B67, you have overflowed the segment.
+
+     B67 also points to the stack segment linkage control
+     area, which is what we are really interested in.  */
+
+  stkl = CRAY_STACKSEG_END ();
+  ssptr = (struct stack_segment_linkage *) stkl;
+
+  /* If one subtracts 'size' from the end of the segment,
+     one has the address of the first word of the segment.
+
+     If this is not the first segment, 'pseg' will be
+     nonzero.  */
+
+  pseg = ssptr->sspseg;
+  size = ssptr->sssize;
+
+  this_segment = stkl - size;
+
+  /* It is possible that calling this routine itself caused
+     a stack overflow.  Discard stack segments which do not
+     contain the target address.  */
+
+  while (!(this_segment <= address && address <= stkl))
+    {
+#ifdef DEBUG_I00AFUNC
+      fprintf (stderr, "%011o %011o %011o\n", this_segment, address, stkl);
+#endif
+      if (pseg == 0)
+	break;
+      stkl = stkl - pseg;
+      ssptr = (struct stack_segment_linkage *) stkl;
+      size = ssptr->sssize;
+      pseg = ssptr->sspseg;
+      this_segment = stkl - size;
+    }
+
+  result = address - this_segment;
+
+  /* If you subtract pseg from the current end of the stack,
+     you get the address of the previous stack segment's end.
+     This seems a little convoluted to me, but I'll bet you save
+     a cycle somewhere.  */
+
+  while (pseg != 0)
+    {
+#ifdef DEBUG_I00AFUNC
+      fprintf (stderr, "%011o %011o\n", pseg, size);
+#endif
+      stkl = stkl - pseg;
+      ssptr = (struct stack_segment_linkage *) stkl;
+      size = ssptr->sssize;
+      pseg = ssptr->sspseg;
+      result += size;
+    }
+  return (result);
+}
+
+#endif /* not CRAY2 */
+#endif /* CRAY */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/argv.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/argv.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/argv.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/argv.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,544 @@
+/* Create and destroy argument vectors (argv's)
+   Copyright (C) 1992, 2001, 2010 Free Software Foundation, Inc.
+   Written by Fred Fish @ Cygnus Support
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+
+/*  Create and destroy argument vectors.  An argument vector is simply an
+    array of string pointers, terminated by a NULL pointer. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "ansidecl.h"
+#include "libiberty.h"
+#include "safe-ctype.h"
+
+/*  Routines imported from standard C runtime libraries. */
+
+#include <stddef.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+#ifndef EOS
+#define EOS '\0'
+#endif
+
+#define INITIAL_MAXARGC 8	/* Number of args + NULL in initial argv */
+
+
+/*
+
+@deftypefn Extension char** dupargv (char **@var{vector})
+
+Duplicate an argument vector.  Simply scans through @var{vector},
+duplicating each argument until the terminating @code{NULL} is found.
+Returns a pointer to the argument vector if successful.  Returns
+@code{NULL} if there is insufficient memory to complete building the
+argument vector.
+
+@end deftypefn
+
+*/
+
+char **
+dupargv (char **argv)
+{
+  int argc;
+  char **copy;
+  
+  if (argv == NULL)
+    return NULL;
+  
+  /* the vector */
+  for (argc = 0; argv[argc] != NULL; argc++);
+  copy = (char **) malloc ((argc + 1) * sizeof (char *));
+  if (copy == NULL)
+    return NULL;
+  
+  /* the strings */
+  for (argc = 0; argv[argc] != NULL; argc++)
+    {
+      int len = strlen (argv[argc]);
+      copy[argc] = (char *) malloc (len + 1);
+      if (copy[argc] == NULL)
+	{
+	  freeargv (copy);
+	  return NULL;
+	}
+      strcpy (copy[argc], argv[argc]);
+    }
+  copy[argc] = NULL;
+  return copy;
+}
+
+/*
+
+@deftypefn Extension void freeargv (char **@var{vector})
+
+Free an argument vector that was built using @code{buildargv}.  Simply
+scans through @var{vector}, freeing the memory for each argument until
+the terminating @code{NULL} is found, and then frees @var{vector}
+itself.
+
+@end deftypefn
+
+*/
+
+void freeargv (char **vector)
+{
+  register char **scan;
+
+  if (vector != NULL)
+    {
+      for (scan = vector; *scan != NULL; scan++)
+	{
+	  free (*scan);
+	}
+      free (vector);
+    }
+}
+
+static void
+consume_whitespace (const char **input)
+{
+  while (ISSPACE (**input))
+    {
+      (*input)++;
+    }
+}
+
+static int
+only_whitespace (const char* input)
+{
+  while (*input != EOS && ISSPACE (*input))
+    input++;
+
+  return (*input == EOS);
+}
+
+/*
+
+@deftypefn Extension char** buildargv (char *@var{sp})
+
+Given a pointer to a string, parse the string extracting fields
+separated by whitespace and optionally enclosed within either single
+or double quotes (which are stripped off), and build a vector of
+pointers to copies of the string for each field.  The input string
+remains unchanged.  The last element of the vector is followed by a
+@code{NULL} element.
+
+All of the memory for the pointer array and copies of the string
+is obtained from @code{malloc}.  All of the memory can be returned to the
+system with the single function call @code{freeargv}, which takes the
+returned result of @code{buildargv}, as it's argument.
+
+Returns a pointer to the argument vector if successful.  Returns
+@code{NULL} if @var{sp} is @code{NULL} or if there is insufficient
+memory to complete building the argument vector.
+
+If the input is a null string (as opposed to a @code{NULL} pointer),
+then buildarg returns an argument vector that has one arg, a null
+string.
+
+@end deftypefn
+
+The memory for the argv array is dynamically expanded as necessary.
+
+In order to provide a working buffer for extracting arguments into,
+with appropriate stripping of quotes and translation of backslash
+sequences, we allocate a working buffer at least as long as the input
+string.  This ensures that we always have enough space in which to
+work, since the extracted arg is never larger than the input string.
+
+The argument vector is always kept terminated with a @code{NULL} arg
+pointer, so it can be passed to @code{freeargv} at any time, or
+returned, as appropriate.
+
+*/
+
+char **buildargv (const char *input)
+{
+  char *arg;
+  char *copybuf;
+  int squote = 0;
+  int dquote = 0;
+  int bsquote = 0;
+  int argc = 0;
+  int maxargc = 0;
+  char **argv = NULL;
+  char **nargv;
+
+  if (input != NULL)
+    {
+      copybuf = (char *) alloca (strlen (input) + 1);
+      /* Is a do{}while to always execute the loop once.  Always return an
+	 argv, even for null strings.  See NOTES above, test case below. */
+      do
+	{
+	  /* Pick off argv[argc] */
+	  consume_whitespace (&input);
+
+	  if ((maxargc == 0) || (argc >= (maxargc - 1)))
+	    {
+	      /* argv needs initialization, or expansion */
+	      if (argv == NULL)
+		{
+		  maxargc = INITIAL_MAXARGC;
+		  nargv = (char **) malloc (maxargc * sizeof (char *));
+		}
+	      else
+		{
+		  maxargc *= 2;
+		  nargv = (char **) realloc (argv, maxargc * sizeof (char *));
+		}
+	      if (nargv == NULL)
+		{
+		  if (argv != NULL)
+		    {
+		      freeargv (argv);
+		      argv = NULL;
+		    }
+		  break;
+		}
+	      argv = nargv;
+	      argv[argc] = NULL;
+	    }
+	  /* Begin scanning arg */
+	  arg = copybuf;
+	  while (*input != EOS)
+	    {
+	      if (ISSPACE (*input) && !squote && !dquote && !bsquote)
+		{
+		  break;
+		}
+	      else
+		{
+		  if (bsquote)
+		    {
+		      bsquote = 0;
+		      *arg++ = *input;
+		    }
+		  else if (*input == '\\')
+		    {
+		      bsquote = 1;
+		    }
+		  else if (squote)
+		    {
+		      if (*input == '\'')
+			{
+			  squote = 0;
+			}
+		      else
+			{
+			  *arg++ = *input;
+			}
+		    }
+		  else if (dquote)
+		    {
+		      if (*input == '"')
+			{
+			  dquote = 0;
+			}
+		      else
+			{
+			  *arg++ = *input;
+			}
+		    }
+		  else
+		    {
+		      if (*input == '\'')
+			{
+			  squote = 1;
+			}
+		      else if (*input == '"')
+			{
+			  dquote = 1;
+			}
+		      else
+			{
+			  *arg++ = *input;
+			}
+		    }
+		  input++;
+		}
+	    }
+	  *arg = EOS;
+	  argv[argc] = strdup (copybuf);
+	  if (argv[argc] == NULL)
+	    {
+	      freeargv (argv);
+	      argv = NULL;
+	      break;
+	    }
+	  argc++;
+	  argv[argc] = NULL;
+
+	  consume_whitespace (&input);
+	}
+      while (*input != EOS);
+    }
+  return (argv);
+}
+
+/*
+
+@deftypefn Extension int writeargv (const char **@var{argv}, FILE *@var{file})
+
+Write each member of ARGV, handling all necessary quoting, to the file
+named by FILE, separated by whitespace.  Return 0 on success, non-zero
+if an error occurred while writing to FILE.
+
+@end deftypefn
+
+*/
+
+int
+writeargv (char **argv, FILE *f)
+{
+  int status = 0;
+
+  if (f == NULL)
+    return 1;
+
+  while (*argv != NULL)
+    {
+      const char *arg = *argv;
+
+      while (*arg != EOS)
+        {
+          char c = *arg;
+
+          if (ISSPACE(c) || c == '\\' || c == '\'' || c == '"')
+            if (EOF == fputc ('\\', f))
+              {
+                status = 1;
+                goto done;
+              }
+
+          if (EOF == fputc (c, f))
+            {
+              status = 1;
+              goto done;
+            }
+          arg++;
+        }
+
+      if (EOF == fputc ('\n', f))
+        {
+          status = 1;
+          goto done;
+        }
+      argv++;
+    }
+
+ done:
+  return status;
+}
+
+/*
+
+@deftypefn Extension void expandargv (int *@var{argcp}, char ***@var{argvp})
+
+The @var{argcp} and @code{argvp} arguments are pointers to the usual
+@code{argc} and @code{argv} arguments to @code{main}.  This function
+looks for arguments that begin with the character @samp{@@}.  Any such
+arguments are interpreted as ``response files''.  The contents of the
+response file are interpreted as additional command line options.  In
+particular, the file is separated into whitespace-separated strings;
+each such string is taken as a command-line option.  The new options
+are inserted in place of the option naming the response file, and
+@code{*argcp} and @code{*argvp} will be updated.  If the value of
+@code{*argvp} is modified by this function, then the new value has
+been dynamically allocated and can be deallocated by the caller with
+@code{freeargv}.  However, most callers will simply call
+@code{expandargv} near the beginning of @code{main} and allow the
+operating system to free the memory when the program exits.
+
+@end deftypefn
+
+*/
+
+void
+expandargv (int *argcp, char ***argvp)
+{
+  /* The argument we are currently processing.  */
+  int i = 0;
+  /* Non-zero if ***argvp has been dynamically allocated.  */
+  int argv_dynamic = 0;
+  /* Limit the number of response files that we parse in order
+     to prevent infinite recursion.  */
+  unsigned int iteration_limit = 2000;
+  /* Loop over the arguments, handling response files.  We always skip
+     ARGVP[0], as that is the name of the program being run.  */
+  while (++i < *argcp)
+    {
+      /* The name of the response file.  */
+      const char *filename;
+      /* The response file.  */
+      FILE *f;
+      /* An upper bound on the number of characters in the response
+	 file.  */
+      long pos;
+      /* The number of characters in the response file, when actually
+	 read.  */
+      size_t len;
+      /* A dynamically allocated buffer used to hold options read from a
+	 response file.  */
+      char *buffer;
+      /* Dynamically allocated storage for the options read from the
+	 response file.  */
+      char **file_argv;
+      /* The number of options read from the response file, if any.  */
+      size_t file_argc;
+      /* We are only interested in options of the form "@file".  */
+      filename = (*argvp)[i];
+      if (filename[0] != '@')
+	continue;
+      /* If we have iterated too many times then stop.  */
+      if (-- iteration_limit == 0)
+	{
+	  fprintf (stderr, "%s: error: too many @-files encountered\n", (*argvp)[0]);
+	  xexit (1);
+	}
+      /* Read the contents of the file.  */
+      f = fopen (++filename, "r");
+      if (!f)
+	continue;
+      if (fseek (f, 0L, SEEK_END) == -1)
+	goto error;
+      pos = ftell (f);
+      if (pos == -1)
+	goto error;
+      if (fseek (f, 0L, SEEK_SET) == -1)
+	goto error;
+      buffer = (char *) xmalloc (pos * sizeof (char) + 1);
+      len = fread (buffer, sizeof (char), pos, f);
+      if (len != (size_t) pos
+	  /* On Windows, fread may return a value smaller than POS,
+	     due to CR/LF->CR translation when reading text files.
+	     That does not in-and-of itself indicate failure.  */
+	  && ferror (f))
+	goto error;
+      /* Add a NUL terminator.  */
+      buffer[len] = '\0';
+      /* If the file is empty or contains only whitespace, buildargv would
+	 return a single empty argument.  In this context we want no arguments,
+	 instead.  */
+      if (only_whitespace (buffer))
+	{
+	  file_argv = (char **) xmalloc (sizeof (char *));
+	  file_argv[0] = NULL;
+	}
+      else
+	/* Parse the string.  */
+	file_argv = buildargv (buffer);
+      /* If *ARGVP is not already dynamically allocated, copy it.  */
+      if (!argv_dynamic)
+	{
+	  *argvp = dupargv (*argvp);
+	  if (!*argvp)
+	    {
+	      fputs ("\nout of memory\n", stderr);
+	      xexit (1);
+	    }
+	}
+      /* Count the number of arguments.  */
+      file_argc = 0;
+      while (file_argv[file_argc])
+	++file_argc;
+      /* Now, insert FILE_ARGV into ARGV.  The "+1" below handles the
+	 NULL terminator at the end of ARGV.  */ 
+      *argvp = ((char **) 
+		xrealloc (*argvp, 
+			  (*argcp + file_argc + 1) * sizeof (char *)));
+      memmove (*argvp + i + file_argc, *argvp + i + 1, 
+	       (*argcp - i) * sizeof (char *));
+      memcpy (*argvp + i, file_argv, file_argc * sizeof (char *));
+      /* The original option has been replaced by all the new
+	 options.  */
+      *argcp += file_argc - 1;
+      /* Free up memory allocated to process the response file.  We do
+	 not use freeargv because the individual options in FILE_ARGV
+	 are now in the main ARGV.  */
+      free (file_argv);
+      free (buffer);
+      /* Rescan all of the arguments just read to support response
+	 files that include other response files.  */
+      --i;
+    error:
+      /* We're all done with the file now.  */
+      fclose (f);
+    }
+}
+
+#ifdef MAIN
+
+/* Simple little test driver. */
+
+static const char *const tests[] =
+{
+  "a simple command line",
+  "arg 'foo' is single quoted",
+  "arg \"bar\" is double quoted",
+  "arg \"foo bar\" has embedded whitespace",
+  "arg 'Jack said \\'hi\\'' has single quotes",
+  "arg 'Jack said \\\"hi\\\"' has double quotes",
+  "a b c d e f g h i j k l m n o p q r s t u v w x y z 1 2 3 4 5 6 7 8 9",
+  
+  /* This should be expanded into only one argument.  */
+  "trailing-whitespace ",
+
+  "",
+  NULL
+};
+
+int
+main (void)
+{
+  char **argv;
+  const char *const *test;
+  char **targs;
+
+  for (test = tests; *test != NULL; test++)
+    {
+      printf ("buildargv(\"%s\")\n", *test);
+      if ((argv = buildargv (*test)) == NULL)
+	{
+	  printf ("failed!\n\n");
+	}
+      else
+	{
+	  for (targs = argv; *targs != NULL; targs++)
+	    {
+	      printf ("\t\"%s\"\n", *targs);
+	    }
+	  printf ("\n");
+	}
+      freeargv (argv);
+    }
+
+  return 0;
+}
+
+#endif	/* MAIN */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/asprintf.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/asprintf.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/asprintf.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/asprintf.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,56 @@
+/* Like sprintf but provides a pointer to malloc'd storage, which must
+   be freed by the caller.
+   Copyright (C) 1997, 2003 Free Software Foundation, Inc.
+   Contributed by Cygnus Solutions.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "ansidecl.h"
+#include "libiberty.h"
+
+#include <stdarg.h>
+
+/*
+
+@deftypefn Extension int asprintf (char **@var{resptr}, const char *@var{format}, ...)
+
+Like @code{sprintf}, but instead of passing a pointer to a buffer, you
+pass a pointer to a pointer.  This function will compute the size of
+the buffer needed, allocate memory with @code{malloc}, and store a
+pointer to the allocated memory in @code{*@var{resptr}}.  The value
+returned is the same as @code{sprintf} would return.  If memory could
+not be allocated, minus one is returned and @code{NULL} is stored in
+@code{*@var{resptr}}.
+
+@end deftypefn
+
+*/
+
+int
+asprintf (char **buf, const char *fmt, ...)
+{
+  int status;
+  VA_OPEN (ap, fmt);
+  VA_FIXEDARG (ap, char **, buf);
+  VA_FIXEDARG (ap, const char *, fmt);
+  status = vasprintf (buf, fmt, ap);
+  VA_CLOSE (ap);
+  return status;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/at-file.texi sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/at-file.texi
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/at-file.texi	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/at-file.texi	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,15 @@
+@c This file is designed to be included in manuals that use 
+@c expandargv.
+
+@item @@@var{file}
+Read command-line options from @var{file}.  The options read are
+inserted in place of the original @@@var{file} option.  If @var{file}
+does not exist, or cannot be read, then the option will be treated
+literally, and not removed.  
+
+Options in @var{file} are separated by whitespace.  A whitespace
+character may be included in an option by surrounding the entire
+option in either single or double quotes.  Any character (including a
+backslash) may be included by prefixing the character to be included
+with a backslash.  The @var{file} may itself contain additional
+@@@var{file} options; any such options will be processed recursively.
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/atexit.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/atexit.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/atexit.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/atexit.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,27 @@
+/* Wrapper to implement ANSI C's atexit using SunOS's on_exit. */
+/* This function is in the public domain.  --Mike Stump. */
+
+/*
+
+@deftypefn Supplemental int atexit (void (*@var{f})())
+
+Causes function @var{f} to be called at exit.  Returns 0.
+
+@end deftypefn
+
+*/
+
+#include "config.h"
+
+#ifdef HAVE_ON_EXIT
+
+int
+atexit(void (*f)(void))
+{
+  /* If the system doesn't provide a definition for atexit, use on_exit
+     if the system provides that.  */
+  on_exit (f, 0);
+  return 0;
+}
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/basename.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/basename.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/basename.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/basename.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,62 @@
+/* Return the basename of a pathname.
+   This file is in the public domain. */
+
+/*
+
+@deftypefn Supplemental char* basename (const char *@var{name})
+
+Returns a pointer to the last component of pathname @var{name}.
+Behavior is undefined if the pathname ends in a directory separator.
+
+@end deftypefn
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "ansidecl.h"
+#include "libiberty.h"
+#include "safe-ctype.h"
+
+#ifndef DIR_SEPARATOR
+#define DIR_SEPARATOR '/'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+  defined (__OS2__)
+#define HAVE_DOS_BASED_FILE_SYSTEM
+#ifndef DIR_SEPARATOR_2 
+#define DIR_SEPARATOR_2 '\\'
+#endif
+#endif
+
+/* Define IS_DIR_SEPARATOR.  */
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+char *
+basename (const char *name)
+{
+  const char *base;
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (ISALPHA (name[0]) && name[1] == ':') 
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    {
+      if (IS_DIR_SEPARATOR (*name))
+	{
+	  base = name + 1;
+	}
+    }
+  return (char *) base;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/bcmp.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/bcmp.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/bcmp.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/bcmp.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,27 @@
+/* bcmp
+   This function is in the public domain.  */
+
+/*
+
+@deftypefn Supplemental int bcmp (char *@var{x}, char *@var{y}, int @var{count})
+
+Compares the first @var{count} bytes of two areas of memory.  Returns
+zero if they are the same, nonzero otherwise.  Returns zero if
+@var{count} is zero.  A nonzero result only indicates a difference,
+it does not indicate any sorting order (say, by having a positive
+result mean @var{x} sorts before @var{y}).
+
+@end deftypefn
+
+*/
+
+#include <stddef.h>
+
+extern int memcmp(const void *, const void *, size_t);
+
+int
+bcmp (const void *s1, const void *s2, size_t count)
+{
+  return memcmp (s1, s2, count);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/bcopy.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/bcopy.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/bcopy.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/bcopy.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,31 @@
+/* bcopy -- copy memory regions of arbitary length
+
+@deftypefn Supplemental void bcopy (char *@var{in}, char *@var{out}, int @var{length})
+
+Copies @var{length} bytes from memory region @var{in} to region
+@var{out}.  The use of @code{bcopy} is deprecated in new programs.
+
+@end deftypefn
+
+*/
+
+#include <stddef.h>
+
+void
+bcopy (const void *src, void *dest, size_t len)
+{
+  if (dest < src)
+    {
+      const char *firsts = (const char *) src;
+      char *firstd = (char *) dest;
+      while (len--)
+	*firstd++ = *firsts++;
+    }
+  else
+    {
+      const char *lasts = (const char *)src + (len-1);
+      char *lastd = (char *)dest + (len-1);
+      while (len--)
+        *lastd-- = *lasts--;
+    }
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/bsearch.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/bsearch.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/bsearch.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/bsearch.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 1990 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. [rescinded 22 July 1999]
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+
+@deftypefn Supplemental void* bsearch (const void *@var{key}, @
+  const void *@var{base}, size_t @var{nmemb}, size_t @var{size}, @
+  int (*@var{compar})(const void *, const void *))
+
+Performs a search over an array of @var{nmemb} elements pointed to by
+@var{base} for a member that matches the object pointed to by @var{key}.
+The size of each member is specified by @var{size}.  The array contents
+should be sorted in ascending order according to the @var{compar}
+comparison function.  This routine should take two arguments pointing to
+the @var{key} and to an array member, in that order, and should return an
+integer less than, equal to, or greater than zero if the @var{key} object
+is respectively less than, matching, or greater than the array member.
+
+@end deftypefn
+
+*/
+
+#include "config.h"
+#include "ansidecl.h"
+#include <sys/types.h>		/* size_t */
+#include <stdio.h>
+
+/*
+ * Perform a binary search.
+ *
+ * The code below is a bit sneaky.  After a comparison fails, we
+ * divide the work in half by moving either left or right. If lim
+ * is odd, moving left simply involves halving lim: e.g., when lim
+ * is 5 we look at item 2, so we change lim to 2 so that we will
+ * look at items 0 & 1.  If lim is even, the same applies.  If lim
+ * is odd, moving right again involes halving lim, this time moving
+ * the base up one item past p: e.g., when lim is 5 we change base
+ * to item 3 and make lim 2 so that we will look at items 3 and 4.
+ * If lim is even, however, we have to shrink it by one before
+ * halving: e.g., when lim is 4, we still looked at item 2, so we
+ * have to make lim 3, then halve, obtaining 1, so that we will only
+ * look at item 3.
+ */
+void *
+bsearch (register const void *key, const void *base0,
+         size_t nmemb, register size_t size,
+         register int (*compar)(const void *, const void *))
+{
+	register const char *base = (const char *) base0;
+	register int lim, cmp;
+	register const void *p;
+
+	for (lim = nmemb; lim != 0; lim >>= 1) {
+		p = base + (lim >> 1) * size;
+		cmp = (*compar)(key, p);
+		if (cmp == 0)
+			return (void *)p;
+		if (cmp > 0) {	/* key > p: move right */
+			base = (const char *)p + size;
+			lim--;
+		} /* else move left */
+	}
+	return (NULL);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/bzero.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/bzero.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/bzero.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/bzero.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,23 @@
+/* Portable version of bzero for systems without it.
+   This function is in the public domain.  */
+
+/*
+
+@deftypefn Supplemental void bzero (char *@var{mem}, int @var{count})
+
+Zeros @var{count} bytes starting at @var{mem}.  Use of this function
+is deprecated in favor of @code{memset}.
+
+@end deftypefn
+
+*/
+
+#include <stddef.h>
+
+extern void *memset(void *, int, size_t);
+
+void
+bzero (void *to, size_t count)
+{
+  memset (to, 0, count);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/calloc.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/calloc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/calloc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/calloc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,34 @@
+/* calloc -- allocate memory which has been initialized to zero.
+   This function is in the public domain. */
+
+/*
+
+@deftypefn Supplemental void* calloc (size_t @var{nelem}, size_t @var{elsize})
+
+Uses @code{malloc} to allocate storage for @var{nelem} objects of
+@var{elsize} bytes each, then zeros the memory.
+
+@end deftypefn
+
+*/
+ 
+#include "ansidecl.h"
+#include <stddef.h>
+
+/* For systems with larger pointers than ints, this must be declared.  */
+PTR malloc (size_t);
+void bzero (PTR, size_t);
+
+PTR
+calloc (size_t nelem, size_t elsize)
+{
+  register PTR ptr;  
+
+  if (nelem == 0 || elsize == 0)
+    nelem = elsize = 1;
+  
+  ptr = malloc (nelem * elsize);
+  if (ptr) bzero (ptr, nelem * elsize);
+  
+  return ptr;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/choose-temp.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/choose-temp.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/choose-temp.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/choose-temp.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,75 @@
+/* Utility to pick a temporary filename prefix.
+   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If not,
+write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>	/* May get P_tmpdir.  */
+#include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#include "libiberty.h"
+extern char *choose_tmpdir (void);
+
+/* Name of temporary file.
+   mktemp requires 6 trailing X's.  */
+#define TEMP_FILE "ccXXXXXX"
+#define TEMP_FILE_LEN (sizeof(TEMP_FILE) - 1)
+
+/*
+
+@deftypefn Extension char* choose_temp_base (void)
+
+Return a prefix for temporary file names or @code{NULL} if unable to
+find one.  The current directory is chosen if all else fails so the
+program is exited if a temporary directory can't be found (@code{mktemp}
+fails).  The buffer for the result is obtained with @code{xmalloc}.
+
+This function is provided for backwards compatibility only.  Its use is
+not recommended.
+
+@end deftypefn
+
+*/
+
+char *
+choose_temp_base (void)
+{
+  const char *base = choose_tmpdir ();
+  char *temp_filename;
+  int len;
+
+  len = strlen (base);
+  temp_filename = XNEWVEC (char, len + TEMP_FILE_LEN + 1);
+  strcpy (temp_filename, base);
+  strcpy (temp_filename + len, TEMP_FILE);
+
+  if (mktemp (temp_filename) == 0)
+    abort ();
+  return temp_filename;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/clock.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/clock.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/clock.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/clock.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,103 @@
+/* ANSI-compatible clock function.
+   Copyright (C) 1994, 1995, 1999 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.  This library is free
+software; you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This library 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 GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+
+As a special exception, if you link this library with files
+compiled with a GNU compiler to produce an executable, this does not cause
+the resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why
+the executable file might be covered by the GNU General Public License. */
+
+/*
+
+@deftypefn Supplemental long clock (void)
+
+Returns an approximation of the CPU time used by the process as a
+@code{clock_t}; divide this number by @samp{CLOCKS_PER_SEC} to get the
+number of seconds used.
+
+@end deftypefn
+
+*/
+
+#include "config.h"
+
+#ifdef HAVE_GETRUSAGE
+#include <sys/time.h>
+#include <sys/resource.h>
+#endif
+
+#ifdef HAVE_TIMES
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#include <sys/times.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef _SC_CLK_TCK
+#define GNU_HZ  sysconf(_SC_CLK_TCK)
+#else
+#ifdef HZ
+#define GNU_HZ  HZ
+#else
+#ifdef CLOCKS_PER_SEC
+#define GNU_HZ  CLOCKS_PER_SEC
+#endif
+#endif
+#endif
+
+/* FIXME: should be able to declare as clock_t. */
+
+long
+clock (void)
+{
+#ifdef HAVE_GETRUSAGE
+  struct rusage rusage;
+
+  getrusage (0, &rusage);
+  return (rusage.ru_utime.tv_sec * 1000000 + rusage.ru_utime.tv_usec
+	  + rusage.ru_stime.tv_sec * 1000000 + rusage.ru_stime.tv_usec);
+#else
+#ifdef HAVE_TIMES
+  struct tms tms;
+
+  times (&tms);
+  return (tms.tms_utime + tms.tms_stime) * (1000000 / GNU_HZ);
+#else
+#ifdef VMS
+  struct
+    {
+      int proc_user_time;
+      int proc_system_time;
+      int child_user_time;
+      int child_system_time;
+    } vms_times;
+
+  times (&vms_times);
+  return (vms_times.proc_user_time + vms_times.proc_system_time) * 10000;
+#else
+  /* A fallback, if nothing else available. */
+  return 0;
+#endif /* VMS */
+#endif /* HAVE_TIMES */
+#endif /* HAVE_GETRUSAGE */
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/concat.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/concat.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/concat.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/concat.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,234 @@
+/* Concatenate variable number of strings.
+   Copyright (C) 1991, 1994, 2001, 2011 Free Software Foundation, Inc.
+   Written by Fred Fish @ Cygnus Support
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+
+/*
+
+@deftypefn Extension char* concat (const char *@var{s1}, const char *@var{s2}, @
+  @dots{}, @code{NULL})
+
+Concatenate zero or more of strings and return the result in freshly
+@code{xmalloc}ed memory.  Returns @code{NULL} if insufficient memory is
+available.  The argument list is terminated by the first @code{NULL}
+pointer encountered.  Pointers to empty strings are ignored.
+
+@end deftypefn
+
+NOTES
+
+	This function uses xmalloc() which is expected to be a front end
+	function to malloc() that deals with low memory situations.  In
+	typical use, if malloc() returns NULL then xmalloc() diverts to an
+	error handler routine which never returns, and thus xmalloc will
+	never return a NULL pointer.  If the client application wishes to
+	deal with low memory situations itself, it should supply an xmalloc
+	that just directly invokes malloc and blindly returns whatever
+	malloc returns.
+
+*/
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "ansidecl.h"
+#include "libiberty.h"
+#include <sys/types.h>		/* size_t */
+
+#include <stdarg.h>
+
+# if HAVE_STRING_H
+#  include <string.h>
+# else
+#  if HAVE_STRINGS_H
+#   include <strings.h>
+#  endif
+# endif
+
+#if HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+static inline unsigned long vconcat_length (const char *, va_list);
+static inline unsigned long
+vconcat_length (const char *first, va_list args)
+{
+  unsigned long length = 0;
+  const char *arg;
+
+  for (arg = first; arg ; arg = va_arg (args, const char *))
+    length += strlen (arg);
+
+  return length;
+}
+
+static inline char *
+vconcat_copy (char *dst, const char *first, va_list args)
+{
+  char *end = dst;
+  const char *arg;
+
+  for (arg = first; arg ; arg = va_arg (args, const char *))
+    {
+      unsigned long length = strlen (arg);
+      memcpy (end, arg, length);
+      end += length;
+    }
+  *end = '\000';
+
+  return dst;
+}
+
+/* @undocumented concat_length */
+
+unsigned long
+concat_length (const char *first, ...)
+{
+  unsigned long length;
+
+  VA_OPEN (args, first);
+  VA_FIXEDARG (args, const char *, first);
+  length = vconcat_length (first, args);
+  VA_CLOSE (args);
+
+  return length;
+}
+
+/* @undocumented concat_copy */
+
+char *
+concat_copy (char *dst, const char *first, ...)
+{
+  char *save_dst;
+
+  VA_OPEN (args, first);
+  VA_FIXEDARG (args, char *, dst);
+  VA_FIXEDARG (args, const char *, first);
+  vconcat_copy (dst, first, args);
+  save_dst = dst; /* With K&R C, dst goes out of scope here.  */
+  VA_CLOSE (args);
+
+  return save_dst;
+}
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+char *libiberty_concat_ptr;
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+/* @undocumented concat_copy2 */
+
+char *
+concat_copy2 (const char *first, ...)
+{
+  VA_OPEN (args, first);
+  VA_FIXEDARG (args, const char *, first);
+  vconcat_copy (libiberty_concat_ptr, first, args);
+  VA_CLOSE (args);
+
+  return libiberty_concat_ptr;
+}
+
+char *
+concat (const char *first, ...)
+{
+  char *newstr;
+
+  /* First compute the size of the result and get sufficient memory.  */
+  VA_OPEN (args, first);
+  VA_FIXEDARG (args, const char *, first);
+  newstr = XNEWVEC (char, vconcat_length (first, args) + 1);
+  VA_CLOSE (args);
+
+  /* Now copy the individual pieces to the result string. */
+  VA_OPEN (args, first);
+  VA_FIXEDARG (args, const char *, first);
+  vconcat_copy (newstr, first, args);
+  VA_CLOSE (args);
+
+  return newstr;
+}
+
+/*
+
+@deftypefn Extension char* reconcat (char *@var{optr}, const char *@var{s1}, @
+  @dots{}, @code{NULL})
+
+Same as @code{concat}, except that if @var{optr} is not @code{NULL} it
+is freed after the string is created.  This is intended to be useful
+when you're extending an existing string or building up a string in a
+loop:
+
+@example
+  str = reconcat (str, "pre-", str, NULL);
+@end example
+
+@end deftypefn
+
+*/
+
+char *
+reconcat (char *optr, const char *first, ...)
+{
+  char *newstr;
+
+  /* First compute the size of the result and get sufficient memory.  */
+  VA_OPEN (args, first);
+  VA_FIXEDARG (args, char *, optr);
+  VA_FIXEDARG (args, const char *, first);
+  newstr = XNEWVEC (char, vconcat_length (first, args) + 1);
+  VA_CLOSE (args);
+
+  /* Now copy the individual pieces to the result string. */
+  VA_OPEN (args, first);
+  VA_FIXEDARG (args, char *, optr);
+  VA_FIXEDARG (args, const char *, first);
+  vconcat_copy (newstr, first, args);
+  if (optr) /* Done before VA_CLOSE so optr stays in scope for K&R C.  */
+    free (optr);
+  VA_CLOSE (args);
+
+  return newstr;
+}
+
+#ifdef MAIN
+#define NULLP (char *)0
+
+/* Simple little test driver. */
+
+#include <stdio.h>
+
+int
+main (void)
+{
+  printf ("\"\" = \"%s\"\n", concat (NULLP));
+  printf ("\"a\" = \"%s\"\n", concat ("a", NULLP));
+  printf ("\"ab\" = \"%s\"\n", concat ("a", "b", NULLP));
+  printf ("\"abc\" = \"%s\"\n", concat ("a", "b", "c", NULLP));
+  printf ("\"abcd\" = \"%s\"\n", concat ("ab", "cd", NULLP));
+  printf ("\"abcde\" = \"%s\"\n", concat ("ab", "c", "de", NULLP));
+  printf ("\"abcdef\" = \"%s\"\n", concat ("", "a", "", "bcd", "ef", NULLP));
+  return 0;
+}
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/config.h-vms sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/config.h-vms
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/config.h-vms	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/config.h-vms	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,14 @@
+/* This is -*- C -*-  */
+#define HAVE_STDLIB_H 1
+#define HAVE_UNISTD_H 1
+#define HAVE_STRING_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TIME_H 1
+
+/* intptr_t is defined in inttypes.h!  */
+#define intptr_t __int64
+
+/* Cheat: use vms builtin alloca.  */
+#ifdef __DECC
+#define C_alloca(x) __ALLOCA(x)
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/config.in sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/config.in
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/config.in	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/config.in	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,496 @@
+/* config.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
+/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
+   This function is required for alloca.c support on those systems. */
+#undef CRAY_STACKSEG_END
+
+/* Define to 1 if you have the <alloca.h> header file. */
+#undef HAVE_ALLOCA_H
+
+/* Define to 1 if you have the `asprintf' function. */
+#undef HAVE_ASPRINTF
+
+/* Define to 1 if you have the `atexit' function. */
+#undef HAVE_ATEXIT
+
+/* Define to 1 if you have the `basename' function. */
+#undef HAVE_BASENAME
+
+/* Define to 1 if you have the `bcmp' function. */
+#undef HAVE_BCMP
+
+/* Define to 1 if you have the `bcopy' function. */
+#undef HAVE_BCOPY
+
+/* Define to 1 if you have the `bsearch' function. */
+#undef HAVE_BSEARCH
+
+/* Define to 1 if you have the `bzero' function. */
+#undef HAVE_BZERO
+
+/* Define to 1 if you have the `calloc' function. */
+#undef HAVE_CALLOC
+
+/* Define to 1 if you have the `canonicalize_file_name' function. */
+#undef HAVE_CANONICALIZE_FILE_NAME
+
+/* Define to 1 if you have the `clock' function. */
+#undef HAVE_CLOCK
+
+/* Define to 1 if you have the declaration of `asprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL_ASPRINTF
+
+/* Define to 1 if you have the declaration of `basename(char *)', and to 0 if
+   you don't. */
+#undef HAVE_DECL_BASENAME
+
+/* Define to 1 if you have the declaration of `calloc', and to 0 if you don't.
+   */
+#undef HAVE_DECL_CALLOC
+
+/* Define to 1 if you have the declaration of `ffs', and to 0 if you don't. */
+#undef HAVE_DECL_FFS
+
+/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
+   */
+#undef HAVE_DECL_GETENV
+
+/* Define to 1 if you have the declaration of `getopt', and to 0 if you don't.
+   */
+#undef HAVE_DECL_GETOPT
+
+/* Define to 1 if you have the declaration of `malloc', and to 0 if you don't.
+   */
+#undef HAVE_DECL_MALLOC
+
+/* Define to 1 if you have the declaration of `realloc', and to 0 if you
+   don't. */
+#undef HAVE_DECL_REALLOC
+
+/* Define to 1 if you have the declaration of `sbrk', and to 0 if you don't.
+   */
+#undef HAVE_DECL_SBRK
+
+/* Define to 1 if you have the declaration of `snprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL_SNPRINTF
+
+/* Define to 1 if you have the declaration of `strverscmp', and to 0 if you
+   don't. */
+#undef HAVE_DECL_STRVERSCMP
+
+/* Define to 1 if you have the declaration of `vasprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL_VASPRINTF
+
+/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL_VSNPRINTF
+
+/* Define to 1 if you have the `dup3' function. */
+#undef HAVE_DUP3
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define to 1 if you have the `ffs' function. */
+#undef HAVE_FFS
+
+/* Define to 1 if you have the `fork' function. */
+#undef HAVE_FORK
+
+/* Define to 1 if you have the `getcwd' function. */
+#undef HAVE_GETCWD
+
+/* Define to 1 if you have the `getpagesize' function. */
+#undef HAVE_GETPAGESIZE
+
+/* Define to 1 if you have the `getrlimit' function. */
+#undef HAVE_GETRLIMIT
+
+/* Define to 1 if you have the `getrusage' function. */
+#undef HAVE_GETRUSAGE
+
+/* Define to 1 if you have the `getsysinfo' function. */
+#undef HAVE_GETSYSINFO
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#undef HAVE_GETTIMEOFDAY
+
+/* Define to 1 if you have the `index' function. */
+#undef HAVE_INDEX
+
+/* Define to 1 if you have the `insque' function. */
+#undef HAVE_INSQUE
+
+/* Define to 1 if the system has the type `intptr_t'. */
+#undef HAVE_INTPTR_T
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
+/* Define to 1 if you have the <machine/hal_sysinfo.h> header file. */
+#undef HAVE_MACHINE_HAL_SYSINFO_H
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
+
+/* Define to 1 if you have the `memchr' function. */
+#undef HAVE_MEMCHR
+
+/* Define to 1 if you have the `memcmp' function. */
+#undef HAVE_MEMCMP
+
+/* Define to 1 if you have the `memcpy' function. */
+#undef HAVE_MEMCPY
+
+/* Define to 1 if you have the `memmem' function. */
+#undef HAVE_MEMMEM
+
+/* Define to 1 if you have the `memmove' function. */
+#undef HAVE_MEMMOVE
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `memset' function. */
+#undef HAVE_MEMSET
+
+/* Define to 1 if you have the `mkstemps' function. */
+#undef HAVE_MKSTEMPS
+
+/* Define to 1 if you have a working `mmap' system call. */
+#undef HAVE_MMAP
+
+/* Define to 1 if you have the `on_exit' function. */
+#undef HAVE_ON_EXIT
+
+/* Define to 1 if you have the <process.h> header file. */
+#undef HAVE_PROCESS_H
+
+/* Define to 1 if you have the `psignal' function. */
+#undef HAVE_PSIGNAL
+
+/* Define to 1 if you have the `pstat_getdynamic' function. */
+#undef HAVE_PSTAT_GETDYNAMIC
+
+/* Define to 1 if you have the `pstat_getstatic' function. */
+#undef HAVE_PSTAT_GETSTATIC
+
+/* Define to 1 if you have the `putenv' function. */
+#undef HAVE_PUTENV
+
+/* Define to 1 if you have the `random' function. */
+#undef HAVE_RANDOM
+
+/* Define to 1 if you have the `realpath' function. */
+#undef HAVE_REALPATH
+
+/* Define to 1 if you have the `rename' function. */
+#undef HAVE_RENAME
+
+/* Define to 1 if you have the `rindex' function. */
+#undef HAVE_RINDEX
+
+/* Define to 1 if you have the `sbrk' function. */
+#undef HAVE_SBRK
+
+/* Define to 1 if you have the `setenv' function. */
+#undef HAVE_SETENV
+
+/* Define to 1 if you have the `setproctitle' function. */
+#undef HAVE_SETPROCTITLE
+
+/* Define to 1 if you have the `setrlimit' function. */
+#undef HAVE_SETRLIMIT
+
+/* Define to 1 if you have the `sigsetmask' function. */
+#undef HAVE_SIGSETMASK
+
+/* Define to 1 if you have the `snprintf' function. */
+#undef HAVE_SNPRINTF
+
+/* Define to 1 if you have the `spawnve' function. */
+#undef HAVE_SPAWNVE
+
+/* Define to 1 if you have the `spawnvpe' function. */
+#undef HAVE_SPAWNVPE
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdio_ext.h> header file. */
+#undef HAVE_STDIO_EXT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `stpcpy' function. */
+#undef HAVE_STPCPY
+
+/* Define to 1 if you have the `stpncpy' function. */
+#undef HAVE_STPNCPY
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
+
+/* Define to 1 if you have the `strchr' function. */
+#undef HAVE_STRCHR
+
+/* Define to 1 if you have the `strdup' function. */
+#undef HAVE_STRDUP
+
+/* Define to 1 if you have the `strerror' function. */
+#undef HAVE_STRERROR
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strncasecmp' function. */
+#undef HAVE_STRNCASECMP
+
+/* Define to 1 if you have the `strndup' function. */
+#undef HAVE_STRNDUP
+
+/* Define to 1 if you have the `strrchr' function. */
+#undef HAVE_STRRCHR
+
+/* Define to 1 if you have the `strsignal' function. */
+#undef HAVE_STRSIGNAL
+
+/* Define to 1 if you have the `strstr' function. */
+#undef HAVE_STRSTR
+
+/* Define to 1 if you have the `strtod' function. */
+#undef HAVE_STRTOD
+
+/* Define to 1 if you have the `strtol' function. */
+#undef HAVE_STRTOL
+
+/* Define to 1 if you have the `strtoul' function. */
+#undef HAVE_STRTOUL
+
+/* Define to 1 if you have the `strverscmp' function. */
+#undef HAVE_STRVERSCMP
+
+/* Define to 1 if you have the `sysconf' function. */
+#undef HAVE_SYSCONF
+
+/* Define to 1 if you have the `sysctl' function. */
+#undef HAVE_SYSCTL
+
+/* Define to 1 if you have the `sysmp' function. */
+#undef HAVE_SYSMP
+
+/* Define if you have the sys_errlist variable. */
+#undef HAVE_SYS_ERRLIST
+
+/* Define to 1 if you have the <sys/file.h> header file. */
+#undef HAVE_SYS_FILE_H
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#undef HAVE_SYS_MMAN_H
+
+/* Define if you have the sys_nerr variable. */
+#undef HAVE_SYS_NERR
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define to 1 if you have the <sys/prctl.h> header file. */
+#undef HAVE_SYS_PRCTL_H
+
+/* Define to 1 if you have the <sys/pstat.h> header file. */
+#undef HAVE_SYS_PSTAT_H
+
+/* Define to 1 if you have the <sys/resource.h> header file. */
+#undef HAVE_SYS_RESOURCE_H
+
+/* Define if you have the sys_siglist variable. */
+#undef HAVE_SYS_SIGLIST
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/sysctl.h> header file. */
+#undef HAVE_SYS_SYSCTL_H
+
+/* Define to 1 if you have the <sys/sysinfo.h> header file. */
+#undef HAVE_SYS_SYSINFO_H
+
+/* Define to 1 if you have the <sys/sysmp.h> header file. */
+#undef HAVE_SYS_SYSMP_H
+
+/* Define to 1 if you have the <sys/systemcfg.h> header file. */
+#undef HAVE_SYS_SYSTEMCFG_H
+
+/* Define to 1 if you have the <sys/table.h> header file. */
+#undef HAVE_SYS_TABLE_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#undef HAVE_SYS_WAIT_H
+
+/* Define to 1 if you have the `table' function. */
+#undef HAVE_TABLE
+
+/* Define to 1 if you have the `times' function. */
+#undef HAVE_TIMES
+
+/* Define to 1 if you have the <time.h> header file. */
+#undef HAVE_TIME_H
+
+/* Define to 1 if you have the `tmpnam' function. */
+#undef HAVE_TMPNAM
+
+/* Define if you have the \`uintptr_t' type. */
+#undef HAVE_UINTPTR_T
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `vasprintf' function. */
+#undef HAVE_VASPRINTF
+
+/* Define to 1 if you have the `vfork' function. */
+#undef HAVE_VFORK
+
+/* Define to 1 if you have the <vfork.h> header file. */
+#undef HAVE_VFORK_H
+
+/* Define to 1 if you have the `vfprintf' function. */
+#undef HAVE_VFPRINTF
+
+/* Define to 1 if you have the `vprintf' function. */
+#undef HAVE_VPRINTF
+
+/* Define to 1 if you have the `vsprintf' function. */
+#undef HAVE_VSPRINTF
+
+/* Define to 1 if you have the `wait3' function. */
+#undef HAVE_WAIT3
+
+/* Define to 1 if you have the `wait4' function. */
+#undef HAVE_WAIT4
+
+/* Define to 1 if you have the `waitpid' function. */
+#undef HAVE_WAITPID
+
+/* Define to 1 if `fork' works. */
+#undef HAVE_WORKING_FORK
+
+/* Define to 1 if `vfork' works. */
+#undef HAVE_WORKING_VFORK
+
+/* Define to 1 if you have the `_doprnt' function. */
+#undef HAVE__DOPRNT
+
+/* Define if you have the _system_configuration variable. */
+#undef HAVE__SYSTEM_CONFIGURATION
+
+/* Define to 1 if you have the `__fsetlocking' function. */
+#undef HAVE___FSETLOCKING
+
+/* Define if canonicalize_file_name is not declared in system header files. */
+#undef NEED_DECLARATION_CANONICALIZE_FILE_NAME
+
+/* Define if errno must be declared even when <errno.h> is included. */
+#undef NEED_DECLARATION_ERRNO
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* The size of `int', as computed by sizeof. */
+#undef SIZEOF_INT
+
+/* Define if you know the direction of stack growth for your system; otherwise
+   it will be automatically deduced at run-time. STACK_DIRECTION > 0 => grows
+   toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses
+   STACK_DIRECTION = 0 => direction of growth unknown */
+#undef STACK_DIRECTION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
+
+/* Define to an unsigned 64-bit type available in the compiler. */
+#undef UNSIGNED_64BIT_TYPE
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#undef inline
+#endif
+
+/* Define to the type of a signed integer type wide enough to hold a pointer,
+   if such a type exists, and if the system does not define it. */
+#undef intptr_t
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef pid_t
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef ssize_t
+
+/* Define to the type of an unsigned integer type wide enough to hold a
+   pointer, if such a type exists, and if the system does not define it. */
+#undef uintptr_t
+
+/* Define as `fork' if `vfork' does not work. */
+#undef vfork
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/configure sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/configure
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/configure	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/configure	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,8228 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.64.
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# Foundation, Inc.
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 7<&0 </dev/null 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
+PACKAGE_URL=
+
+ac_unique_file="xmalloc.c"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='LTLIBOBJS
+INSTALL_DEST
+pexecute
+target_header_dir
+CHECK
+LIBOBJS
+PICFLAG
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+EGREP
+GREP
+OUTPUT_OPTION
+NO_MINUS_C_MINUS_O
+ac_libiberty_warn_cflags
+CPP
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+RANLIB
+AR
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+HAVE_PERL
+PERL
+BUILD_INFO
+MAKEINFO
+NOTMAINT
+MAINT
+libiberty_topdir
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+with_target_subdir
+with_build_subdir
+with_cross_host
+with_newlib
+enable_maintainer_mode
+enable_multilib
+enable_largefile
+enable_install_libiberty
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures this package to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-maintainer-mode
+                          enable make rules and dependencies not useful
+                          (and sometimes confusing) to the casual installer
+  --enable-multilib       build many library versions (default)
+  --disable-largefile     omit support for large files
+  --enable-install-libiberty       Install headers for end users
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-target-subdir=SUBDIR      Configuring in a subdirectory for target
+  --with-build-subdir=SUBDIR       Configuring in a subdirectory for build
+  --with-cross-host=HOST           Configuring with a cross compiler
+  --with-newlib                    Configuring with newlib
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to the package provider.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+configure
+generated by GNU Autoconf 2.64
+
+Copyright (C) 2009 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_preproc LINENO HEADER VAR
+# ----------------------------------------------
+# Tests whether HEADER is present, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_preproc ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f conftest.err conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_preproc
+
+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+# --------------------------------------------
+# Tries to find the compile-time value of EXPR in a program that includes
+# INCLUDES, setting VAR accordingly. Returns whether the value could be
+# computed
+ac_fn_c_compute_int ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if test "$cross_compiling" = yes; then
+    # Depending upon the size, compute the lo and hi bounds.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid; break
+else
+  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) < 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=$ac_mid; break
+else
+  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  ac_lo= ac_hi=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid
+else
+  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in #((
+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+'') ac_retval=1 ;;
+esac
+  else
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (($2) < 0)
+    {
+      long int i = longval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+else
+  ac_retval=1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f conftest.val
+
+  fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_compute_int
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_type
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test x$gcc_no_link = xyes; then
+  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
+fi
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR
+# ------------------------------------
+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_decl
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by $as_me, which was
+generated by GNU Autoconf 2.64.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    cat <<\_ASBOX
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+_ASBOX
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    cat <<\_ASBOX
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+_ASBOX
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      cat <<\_ASBOX
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
+_ASBOX
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      cat <<\_ASBOX
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+_ASBOX
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  ac_site_file1=$CONFIG_SITE
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special
+  # files actually), so we avoid doing that.
+  if test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+
+
+# This works around the fact that libtool configuration may change LD
+# for this particular configuration, but some shells, instead of
+# keeping the changes in LD private, export them just because LD is
+# exported.  We don't use libtool yet, but some day we might, so...
+ORIGINAL_LD_FOR_MULTILIBS=$LD
+
+
+# Check whether --with-target-subdir was given.
+if test "${with_target_subdir+set}" = set; then :
+  withval=$with_target_subdir;
+fi
+
+
+# Check whether --with-build-subdir was given.
+if test "${with_build_subdir+set}" = set; then :
+  withval=$with_build_subdir;
+fi
+
+
+# Check whether --with-cross-host was given.
+if test "${with_cross_host+set}" = set; then :
+  withval=$with_cross_host;
+fi
+
+
+# Check whether --with-newlib was given.
+if test "${with_newlib+set}" = set; then :
+  withval=$with_newlib;
+fi
+
+
+if test "${srcdir}" = "."; then
+  if test -n "${with_build_subdir}"; then
+    libiberty_topdir="${srcdir}/../.."
+    with_target_subdir=
+  elif test -z "${with_target_subdir}"; then
+    libiberty_topdir="${srcdir}/.."
+  else
+    if test "${with_target_subdir}" != "."; then
+      libiberty_topdir="${srcdir}/${with_multisrctop}../.."
+    else
+      libiberty_topdir="${srcdir}/${with_multisrctop}.."
+    fi
+  fi
+else
+  libiberty_topdir="${srcdir}/.."
+fi
+
+ac_aux_dir=
+for ac_dir in $libiberty_topdir "$srcdir"/$libiberty_topdir; do
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error "cannot find install-sh, install.sh, or shtool in $libiberty_topdir \"$srcdir\"/$libiberty_topdir" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+    # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then :
+  enableval=$enable_maintainer_mode; maintainer_mode=$enableval
+else
+  maintainer_mode=no
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $maintainer_mode" >&5
+$as_echo "$maintainer_mode" >&6; }
+
+if test "$maintainer_mode" = "yes"; then
+  MAINT=''
+  NOTMAINT='#'
+else
+  MAINT='#'
+  NOTMAINT=''
+fi
+
+# Do we have a single-tree copy of texinfo?  Even if we do, we can't
+# rely on it - libiberty is built before texinfo.
+# Extract the first word of "makeinfo", so it can be a program name with args.
+set dummy makeinfo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_MAKEINFO+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MAKEINFO"; then
+  ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_MAKEINFO="makeinfo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MAKEINFO=$ac_cv_prog_MAKEINFO
+if test -n "$MAKEINFO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKEINFO" >&5
+$as_echo "$MAKEINFO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test "x$MAKEINFO" = "x"; then
+    MAKEINFO="@echo makeinfo missing; true"
+    BUILD_INFO=
+else
+    BUILD_INFO=info
+    case "$MAKEINFO" in
+      */missing\ makeinfo*)
+	BUILD_INFO=
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+*** Makeinfo is missing. Info documentation will not be built." >&5
+$as_echo "$as_me: WARNING:
+*** Makeinfo is missing. Info documentation will not be built." >&2;}
+        ;;
+      *)
+	case x"`$MAKEINFO --version | grep 'GNU texinfo'`" in
+	  x*\ [1-3].* )
+	    MAKEINFO="@echo $MAKEINFO is too old, 4.0 or newer required; true"
+	    BUILD_INFO=
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+*** Makeinfo is too old. Info documentation will not be built." >&5
+$as_echo "$as_me: WARNING:
+*** Makeinfo is too old. Info documentation will not be built." >&2;}
+	  ;;
+	esac
+	;;
+    esac
+fi
+
+
+
+# Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_PERL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$PERL"; then
+  ac_cv_prog_PERL="$PERL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_PERL="perl"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+PERL=$ac_cv_prog_PERL
+if test -n "$PERL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
+$as_echo "$PERL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test x"$PERL" = x""; then
+  HAVE_PERL='#'
+else
+  HAVE_PERL=''
+fi
+
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AR"; then
+  ac_ct_AR=$AR
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_AR="ar"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AR" = x; then
+    AR=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+else
+  AR="$ac_cv_prog_AR"
+fi
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+
+# Add --enable-multilib to configure.
+# Default to --enable-multilib
+# Check whether --enable-multilib was given.
+if test "${enable_multilib+set}" = set; then :
+  enableval=$enable_multilib; case "$enableval" in
+  yes) multilib=yes ;;
+  no)  multilib=no ;;
+  *)   as_fn_error "bad value $enableval for multilib option" "$LINENO" 5 ;;
+ esac
+else
+  multilib=yes
+fi
+
+
+# Even if the default multilib is not a cross compilation,
+# it may be that some of the other multilibs are.
+if test $cross_compiling = no && test $multilib = yes \
+   && test "x${with_multisubdir}" != x ; then
+   cross_compiling=maybe
+fi
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    rm -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+# FIXME: Cleanup?
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  gcc_no_link=no
+else
+  gcc_no_link=yes
+fi
+if test x$gcc_no_link = xyes; then
+  # Setting cross_compile will disable run tests; it will
+  # also disable AC_CHECK_FILE but that's generally
+  # correct if we can't link.
+  cross_compiling=yes
+  EXEEXT=
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+if test -z "$ac_file"; then :
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
+fi
+ac_exeext=$ac_cv_exeext
+
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+  if { ac_try='./$ac_file'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+ac_clean_files=$ac_clean_files_save
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
+fi
+rm -f conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if test "${ac_cv_objext+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+  enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if test "${ac_cv_sys_largefile_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+	 # IRIX 6.2 and later do not support large files by default,
+	 # so use the C compiler's -n32 option if that helps.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+	 if ac_fn_c_try_compile "$LINENO"; then :
+  break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 CC="$CC -n32"
+	 if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_largefile_CC=' -n32'; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=64; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_file_offset_bits=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  if test $ac_cv_sys_file_offset_bits = unknown; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if test "${ac_cv_sys_large_files+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_large_files=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  fi
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_c_preproc_warn_flag=yes
+
+ac_libiberty_warn_cflags=
+save_CFLAGS="$CFLAGS"
+for option in -W -Wall -Wwrite-strings -Wc++-compat \
+			  -Wstrict-prototypes; do
+  as_acx_Woption=`$as_echo "acx_cv_prog_cc_warning_$option" | $as_tr_sh`
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $option" >&5
+$as_echo_n "checking whether $CC supports $option... " >&6; }
+if { as_var=$as_acx_Woption; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  CFLAGS="$option"
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_acx_Woption=yes"
+else
+  eval "$as_acx_Woption=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+eval ac_res=\$$as_acx_Woption
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  if test `eval 'as_val=${'$as_acx_Woption'};$as_echo "$as_val"'` = yes; then :
+  ac_libiberty_warn_cflags="$ac_libiberty_warn_cflags${ac_libiberty_warn_cflags:+ }$option"
+fi
+  done
+CFLAGS="$save_CFLAGS"
+
+if test "$GCC" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -pedantic " >&5
+$as_echo_n "checking whether $CC supports -pedantic ... " >&6; }
+if test "${acx_cv_prog_cc_pedantic_+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_CFLAGS="$CFLAGS"
+CFLAGS="-pedantic "
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  acx_cv_prog_cc_pedantic_=yes
+else
+  acx_cv_prog_cc_pedantic_=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+CFLAGS="$save_CFLAGS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_prog_cc_pedantic_" >&5
+$as_echo "$acx_cv_prog_cc_pedantic_" >&6; }
+if test $acx_cv_prog_cc_pedantic_ = yes; then :
+  ac_libiberty_warn_cflags="$ac_libiberty_warn_cflags${ac_libiberty_warn_cflags:+ }-pedantic "
+fi
+
+fi
+
+
+if test "x$CC" != xcc; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
+fi
+set dummy $CC; ac_cc=`$as_echo "$2" |
+		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+# Make sure it works both with $CC and with simple cc.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+rm -f conftest2.*
+if { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } &&
+   test -f conftest2.$ac_objext && { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; };
+then
+  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+  if test "x$CC" != xcc; then
+    # Test first that cc exists at all.
+    if { ac_try='cc -c conftest.$ac_ext >&5'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+      rm -f conftest2.*
+      if { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } &&
+	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; };
+      then
+	# cc works too.
+	:
+      else
+	# cc exists but doesn't like -o.
+	eval ac_cv_prog_cc_${ac_cc}_c_o=no
+      fi
+    fi
+  fi
+else
+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f core conftest*
+
+fi
+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
+
+fi
+
+# autoconf is lame and doesn't give us any substitution variable for this.
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = no"; then
+  NO_MINUS_C_MINUS_O=yes
+else
+  OUTPUT_OPTION='-o $@'
+fi
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if test "${ac_cv_c_const+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+/* FIXME: Include the comments suggested by Paul. */
+#ifndef __cplusplus
+  /* Ultrix mips cc rejects this.  */
+  typedef int charset[2];
+  const charset cs;
+  /* SunOS 4.1.1 cc rejects this.  */
+  char const *const *pcpcc;
+  char **ppc;
+  /* NEC SVR4.0.2 mips cc rejects this.  */
+  struct point {int x, y;};
+  static struct point const zero = {0,0};
+  /* AIX XL C 1.02.0.0 rejects this.
+     It does not let you subtract one const X* pointer from another in
+     an arm of an if-expression whose if-part is not a constant
+     expression */
+  const char *g = "string";
+  pcpcc = &g + (g ? g-g : 0);
+  /* HPUX 7.0 cc rejects these. */
+  ++pcpcc;
+  ppc = (char**) pcpcc;
+  pcpcc = (char const *const *) ppc;
+  { /* SCO 3.2v4 cc rejects this.  */
+    char *t;
+    char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+    *t++ = 0;
+    if (s) return 0;
+  }
+  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+    int x[] = {25, 17};
+    const int *foo = &x[0];
+    ++foo;
+  }
+  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+    typedef const int *iptr;
+    iptr p = 0;
+    ++p;
+  }
+  { /* AIX XL C 1.02.0.0 rejects this saying
+       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+    struct s { int j; const int *ap[3]; };
+    struct s *b; b->j = 5;
+  }
+  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+    const int foo = 10;
+    if (!foo) return 0;
+  }
+  return !cs[0] && !zero.x;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_const=yes
+else
+  ac_cv_c_const=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
+if test $ac_cv_c_const = no; then
+
+$as_echo "#define const /**/" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if test "${ac_cv_c_inline+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __cplusplus
+typedef int foo_t;
+static $ac_kw foo_t static_foo () {return 0; }
+$ac_kw foo_t foo () {return 0; }
+#endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_inline=$ac_kw
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  test "$ac_cv_c_inline" != no && break
+done
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
+
+case $ac_cv_c_inline in
+  inline | yes) ;;
+  *)
+    case $ac_cv_c_inline in
+      no) ac_val=;;
+      *) ac_val=$ac_cv_c_inline;;
+    esac
+    cat >>confdefs.h <<_ACEOF
+#ifndef __cplusplus
+#define inline $ac_val
+#endif
+_ACEOF
+    ;;
+esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_preproc "$LINENO" "$ac_header" "$as_ac_Header"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if test "${ac_cv_c_bigendian+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+	# Check for potential -arch flags.  It is not universal unless
+	# there are at least two -arch flags with different values.
+	ac_arch=
+	ac_prev=
+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+	 if test -n "$ac_prev"; then
+	   case $ac_word in
+	     i?86 | x86_64 | ppc | ppc64)
+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+		 ac_arch=$ac_word
+	       else
+		 ac_cv_c_bigendian=universal
+		 break
+	       fi
+	       ;;
+	   esac
+	   ac_prev=
+	 elif test "x$ac_word" = "x-arch"; then
+	   ac_prev=arch
+	 fi
+       done
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+	     #include <sys/param.h>
+
+int
+main ()
+{
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+		#include <sys/param.h>
+
+int
+main ()
+{
+#if BYTE_ORDER != BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then :
+  # Try to guess by grepping values from an object file.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_c_bigendian=no
+else
+  ac_cv_c_bigendian=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+;; #(
+   no)
+      ;; #(
+   universal)
+
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
+     ;; #(
+   *)
+     as_fn_error "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
+
+
+
+
+ac_config_headers="$ac_config_headers config.h:config.in"
+
+
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
+# Don't build the shared library for build.
+if [ -n "${with_build_subdir}" ]; then
+  enable_shared=no
+fi
+
+####frag=
+####case "${host}" in
+####  rs6000-ibm-aix3.1 | rs6000-ibm-aix)
+####                        frag=mh-aix ;;
+####  *-*-cxux7*)		frag=mh-cxux7 ;;
+####  *-*-freebsd2.1.*)	frag=mh-fbsd21 ;;
+####  *-*-freebsd2.2.[[012]])	frag=mh-fbsd21 ;;
+####  i370-*-opened*)       frag=mh-openedition ;;
+####  i[[34567]]86-*-windows*)	frag=mh-windows ;;
+####esac
+
+####if [[ -n "${frag}" ]]; then
+####  frag=${libiberty_topdir}/libiberty/config/$frag
+####fi
+
+
+
+
+
+case "${host}" in
+    # PIC is the default on some targets or must not be used.
+    *-*-darwin*)
+	# PIC is the default on this platform
+	# Common symbols not allowed in MH_DYLIB files
+	PICFLAG=-fno-common
+	;;
+    alpha*-dec-osf5*)
+	# PIC is the default.
+	;;
+    hppa*64*-*-hpux*)
+	# PIC is the default for 64-bit PA HP-UX.
+	;;
+    i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
+	;;
+    i[34567]86-*-interix3*)
+	# Interix 3.x gcc -fpic/-fPIC options generate broken code.
+	# Instead, we relocate shared libraries at runtime.
+	;;
+    i[34567]86-*-nto-qnx*)
+	# QNX uses GNU C++, but need to define -shared option too, otherwise
+	# it will coredump.
+	PICFLAG='-fPIC -shared'
+	;;
+    i[34567]86-pc-msdosdjgpp*)
+	# DJGPP does not support shared libraries at all.
+	;;
+    ia64*-*-hpux*)
+	# On IA64 HP-UX, PIC is the default but the pic flag
+	# sets the default TLS model and affects inlining.
+	PICFLAG=-fPIC
+	;;
+    mips-sgi-irix6*)
+	# PIC is the default.
+	;;
+    rs6000-ibm-aix* | powerpc-ibm-aix*)
+	# All AIX code is PIC.
+	;;
+
+    # Some targets support both -fPIC and -fpic, but prefer the latter.
+    # FIXME: Why?
+    i[34567]86-*-* | x86_64-*-*)
+	PICFLAG=-fpic
+	;;
+    m68k-*-*)
+	PICFLAG=-fpic
+	;;
+    s390*-*-*)
+	PICFLAG=-fpic
+	;;
+    # FIXME: Override -fPIC default in libgcc only?
+    sh-*-linux* | sh[2346lbe]*-*-linux*)
+	PICFLAG=-fpic
+	;;
+    # FIXME: Simplify to sh*-*-netbsd*?
+    sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
+      sh64-*-netbsd* | sh64l*-*-netbsd*)
+	PICFLAG=-fpic
+	;;
+    # Default to -fPIC unless specified otherwise.
+    *)
+	PICFLAG=-fPIC
+	;;
+esac
+
+# If the user explicitly uses -fpic/-fPIC, keep that.
+case "${CFLAGS}" in
+    *-fpic*)
+	PICFLAG=-fpic
+	;;
+    *-fPIC*)
+	PICFLAG=-fPIC
+	;;
+esac
+
+
+# If they didn't specify --enable-shared, don't generate shared libs.
+case "${enable_shared}" in
+  yes) shared=yes ;;
+  no) shared=no ;;
+  "") shared=no ;;
+  *) shared=yes ;;
+esac
+if [ "${shared}" != "yes" ]; then
+  PICFLAG=
+fi
+
+
+####echo "# Warning: this fragment is automatically generated" > temp-frag
+
+####if [[ -n "${frag}" ]] && [[ -f "${frag}" ]]; then
+####  echo "Appending ${frag} to xhost-mkfrag"
+####  echo "# Following fragment copied from ${frag}" >> temp-frag
+####  cat ${frag} >> temp-frag
+####fi
+
+##### record if we want to build shared libs.
+####if [[ "${shared}" = "yes" ]]; then
+####  echo enable_shared = yes >> temp-frag
+####else
+####  echo enable_shared = no >> temp-frag
+####fi
+
+####frag=xhost-mkfrag
+####${CONFIG_SHELL-/bin/sh} ${libiberty_topdir}/move-if-change temp-frag xhost-mkfrag
+
+####host_makefile_frag=${frag}
+####AC_SUBST_FILE(host_makefile_frag)
+
+# It's OK to check for header files.  Although the compiler may not be
+# able to link anything, it had better be able to at least compile
+# something.
+for ac_header in sys/file.h sys/param.h limits.h stdlib.h malloc.h string.h unistd.h strings.h sys/time.h time.h sys/resource.h sys/stat.h sys/mman.h fcntl.h alloca.h sys/pstat.h sys/sysmp.h sys/sysinfo.h machine/hal_sysinfo.h sys/table.h sys/sysctl.h sys/systemcfg.h stdint.h stdio_ext.h process.h sys/prctl.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_preproc "$LINENO" "$ac_header" "$as_ac_Header"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
+$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
+if test "${ac_cv_header_sys_wait_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/wait.h>
+#ifndef WEXITSTATUS
+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
+#endif
+#ifndef WIFEXITED
+# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+#endif
+
+int
+main ()
+{
+  int s;
+  wait (&s);
+  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_sys_wait_h=yes
+else
+  ac_cv_header_sys_wait_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
+$as_echo "$ac_cv_header_sys_wait_h" >&6; }
+if test $ac_cv_header_sys_wait_h = yes; then
+
+$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+if test "${ac_cv_header_time+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
+
+int
+main ()
+{
+if ((struct tm *) 0)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_time=yes
+else
+  ac_cv_header_time=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
+$as_echo "$ac_cv_header_time" >&6; }
+if test $ac_cv_header_time = yes; then
+
+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether errno must be declared" >&5
+$as_echo_n "checking whether errno must be declared... " >&6; }
+if test "${libiberty_cv_declare_errno+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <errno.h>
+int
+main ()
+{
+int x = errno;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  libiberty_cv_declare_errno=no
+else
+  libiberty_cv_declare_errno=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libiberty_cv_declare_errno" >&5
+$as_echo "$libiberty_cv_declare_errno" >&6; }
+if test $libiberty_cv_declare_errno = yes
+then
+$as_echo "#define NEED_DECLARATION_ERRNO 1" >>confdefs.h
+
+fi
+
+
+# Determine the size of an int for struct fibnode.
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
+if test "${ac_cv_sizeof_int+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (int)
+See \`config.log' for more details." "$LINENO" 5; }; }
+   else
+     ac_cv_sizeof_int=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+$as_echo "$ac_cv_sizeof_int" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+_ACEOF
+
+
+
+# Look for a 64-bit type.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a 64-bit type" >&5
+$as_echo_n "checking for a 64-bit type... " >&6; }
+if test "${liberty_cv_uint64+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+int
+main ()
+{
+extern uint64_t foo;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  liberty_cv_uint64=uint64_t
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#ifndef CHAR_BIT
+#define CHAR_BIT 8
+#endif
+int
+main ()
+{
+extern char foo[sizeof(long) * CHAR_BIT >= 64 ? 1 : -1];
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  liberty_cv_uint64="unsigned long"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#ifndef CHAR_BIT
+#define CHAR_BIT 8
+#endif
+int
+main ()
+{
+extern char foo[sizeof(long long) * CHAR_BIT >= 64 ? 1 : -1];
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  liberty_cv_uint64="unsigned long long"
+else
+  liberty_cv_uint64=none
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $liberty_cv_uint64" >&5
+$as_echo "$liberty_cv_uint64" >&6; }
+if test "$liberty_cv_uint64" != none; then
+
+cat >>confdefs.h <<_ACEOF
+#define UNSIGNED_64BIT_TYPE $liberty_cv_uint64
+_ACEOF
+
+fi
+
+
+  ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
+if test "x$ac_cv_type_intptr_t" = x""yes; then :
+
+$as_echo "#define HAVE_INTPTR_T 1" >>confdefs.h
+
+else
+  for ac_type in 'int' 'long int' 'long long int'; do
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define intptr_t $ac_type
+_ACEOF
+
+	  ac_type=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       test -z "$ac_type" && break
+     done
+fi
+
+
+
+  ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default"
+if test "x$ac_cv_type_uintptr_t" = x""yes; then :
+
+$as_echo "#define HAVE_UINTPTR_T 1" >>confdefs.h
+
+else
+  for ac_type in 'unsigned int' 'unsigned long int' \
+	'unsigned long long int'; do
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define uintptr_t $ac_type
+_ACEOF
+
+	  ac_type=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       test -z "$ac_type" && break
+     done
+fi
+
+
+ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
+if test "x$ac_cv_type_ssize_t" = x""yes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define ssize_t int
+_ACEOF
+
+fi
+
+
+# Given the above check, we always have uintptr_t or a fallback
+# definition.  So define HAVE_UINTPTR_T in case any imported code
+# relies on it.
+
+$as_echo "#define HAVE_UINTPTR_T 1" >>confdefs.h
+
+
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = x""yes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define pid_t int
+_ACEOF
+
+fi
+
+
+# This is the list of functions which libiberty will provide if they
+# are not available on the host.
+
+funcs="asprintf"
+funcs="$funcs atexit"
+funcs="$funcs basename"
+funcs="$funcs bcmp"
+funcs="$funcs bcopy"
+funcs="$funcs bsearch"
+funcs="$funcs bzero"
+funcs="$funcs calloc"
+funcs="$funcs clock"
+funcs="$funcs ffs"
+funcs="$funcs getcwd"
+funcs="$funcs getpagesize"
+funcs="$funcs gettimeofday"
+funcs="$funcs index"
+funcs="$funcs insque"
+funcs="$funcs memchr"
+funcs="$funcs memcmp"
+funcs="$funcs memcpy"
+funcs="$funcs memmem"
+funcs="$funcs memmove"
+funcs="$funcs mempcpy"
+funcs="$funcs memset"
+funcs="$funcs mkstemps"
+funcs="$funcs putenv"
+funcs="$funcs random"
+funcs="$funcs rename"
+funcs="$funcs rindex"
+funcs="$funcs setenv"
+funcs="$funcs snprintf"
+funcs="$funcs sigsetmask"
+funcs="$funcs stpcpy"
+funcs="$funcs stpncpy"
+funcs="$funcs strcasecmp"
+funcs="$funcs strchr"
+funcs="$funcs strdup"
+funcs="$funcs strncasecmp"
+funcs="$funcs strndup"
+funcs="$funcs strrchr"
+funcs="$funcs strstr"
+funcs="$funcs strtod"
+funcs="$funcs strtol"
+funcs="$funcs strtoul"
+funcs="$funcs strverscmp"
+funcs="$funcs tmpnam"
+funcs="$funcs vasprintf"
+funcs="$funcs vfprintf"
+funcs="$funcs vprintf"
+funcs="$funcs vsnprintf"
+funcs="$funcs vsprintf"
+funcs="$funcs waitpid"
+funcs="$funcs setproctitle"
+
+# Also in the old function.def file: alloca, vfork, getopt.
+
+vars="sys_errlist sys_nerr sys_siglist"
+
+checkfuncs="__fsetlocking canonicalize_file_name dup3 getrlimit getrusage \
+ getsysinfo gettimeofday on_exit psignal pstat_getdynamic pstat_getstatic \
+ realpath setrlimit sbrk spawnve spawnvpe strerror strsignal sysconf sysctl \
+ sysmp table times wait3 wait4"
+
+# These are neither executed nor required, but they help keep
+# autoheader happy without adding a bunch of text to acconfig.h.
+if test "x" = "y"; then
+  for ac_func in asprintf atexit \
+    basename bcmp bcopy bsearch bzero \
+    calloc canonicalize_file_name clock \
+    dup3 \
+    ffs __fsetlocking \
+    getcwd getpagesize getrlimit getrusage getsysinfo gettimeofday \
+    index insque \
+    memchr memcmp memcpy memmem memmove memset mkstemps \
+    on_exit \
+    psignal pstat_getdynamic pstat_getstatic putenv \
+    random realpath rename rindex \
+    sbrk setenv setproctitle setrlimit sigsetmask snprintf spawnve spawnvpe \
+     stpcpy stpncpy strcasecmp strchr strdup \
+     strerror strncasecmp strndup strrchr strsignal strstr strtod strtol \
+     strtoul strverscmp sysconf sysctl sysmp \
+    table times tmpnam \
+    vasprintf vfprintf vprintf vsprintf \
+    wait3 wait4 waitpid
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+  ac_fn_c_check_decl "$LINENO" "basename(char *)" "ac_cv_have_decl_basename_char_p_" "$ac_includes_default"
+if test "x$ac_cv_have_decl_basename_char_p_" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_BASENAME $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "ffs" "ac_cv_have_decl_ffs" "$ac_includes_default"
+if test "x$ac_cv_have_decl_ffs" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FFS $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "asprintf" "ac_cv_have_decl_asprintf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_asprintf" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ASPRINTF $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_vasprintf" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_VASPRINTF $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_snprintf" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_SNPRINTF $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_VSNPRINTF $ac_have_decl
+_ACEOF
+
+
+$as_echo "#define HAVE_SYS_ERRLIST 1" >>confdefs.h
+
+
+$as_echo "#define HAVE_SYS_NERR 1" >>confdefs.h
+
+
+$as_echo "#define HAVE_SYS_SIGLIST 1" >>confdefs.h
+
+fi
+
+# For each of these functions, if the host does not provide the
+# function we want to put FN.o in LIBOBJS, and if the host does
+# provide the function, we want to define HAVE_FN in config.h.
+
+setobjs=
+CHECK=
+target_header_dir=
+if test -n "${with_target_subdir}"; then
+
+  # We are being configured as a target library.  AC_REPLACE_FUNCS
+  # may not work correctly, because the compiler may not be able to
+  # link executables.  Note that we may still be being configured
+  # native.
+
+  # If we are being configured for newlib, we know which functions
+  # newlib provide and which ones we will be expected to provide.
+
+  if test "x${with_newlib}" = "xyes"; then
+    case " $LIBOBJS " in
+  *" asprintf.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS asprintf.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" basename.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS basename.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" insque.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS insque.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" random.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS random.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" strdup.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strdup.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" vasprintf.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS vasprintf.$ac_objext"
+ ;;
+esac
+
+
+    for f in $funcs; do
+      case "$f" in
+	asprintf | basename | insque | random | strdup | vasprintf)
+	  ;;
+	*)
+	  n=HAVE_`echo $f | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+	  cat >>confdefs.h <<_ACEOF
+#define $n 1
+_ACEOF
+
+	  ;;
+      esac
+    done
+
+    # newlib doesnt provide any of the variables in $vars, so we
+    # dont have to check them here.
+
+    # Of the functions in $checkfuncs, newlib only has strerror.
+    $as_echo "#define HAVE_STRERROR 1" >>confdefs.h
+
+
+    setobjs=yes
+
+  fi
+
+  # If we are being configured for Mingw, we know which functions
+  # Mingw provides and which ones we will be expected to provide.
+
+  case "${host}" in
+  *-*-mingw*)
+    case " $LIBOBJS " in
+  *" asprintf.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS asprintf.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" basename.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS basename.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" bcmp.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS bcmp.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" bcopy.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS bcopy.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" bzero.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS bzero.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" clock.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS clock.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" ffs.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS ffs.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" getpagesize.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS getpagesize.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" index.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS index.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" insque.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS insque.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" mempcpy.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS mempcpy.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" mkstemps.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS mkstemps.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" random.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS random.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" rindex.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS rindex.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" sigsetmask.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS sigsetmask.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" stpcpy.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS stpcpy.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" stpncpy.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS stpncpy.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" strndup.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strndup.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" strverscmp.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strverscmp.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" vasprintf.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS vasprintf.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" waitpid.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS waitpid.$ac_objext"
+ ;;
+esac
+
+
+    for f in $funcs; do
+      case "$f" in
+	asprintf | basename | bcmp | bcopy | bzero | clock | ffs | getpagesize | index | insque | mempcpy | mkstemps | random | rindex | sigsetmask | stpcpy | stpncpy | strdup | strndup | strverscmp | vasprintf | waitpid)
+	  ;;
+	*)
+	  n=HAVE_`echo $f | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+	  cat >>confdefs.h <<_ACEOF
+#define $n 1
+_ACEOF
+
+	  ;;
+      esac
+    done
+
+    # Mingw doesnt provide any of the variables in $vars, so we
+    # dont have to check them here.
+
+    # Of the functions in $checkfuncs, Mingw only has strerror.
+    $as_echo "#define HAVE_STRERROR 1" >>confdefs.h
+
+
+    setobjs=yes
+    ;;
+
+  *-*-msdosdjgpp)
+    case " $LIBOBJS " in
+  *" vasprintf.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS vasprintf.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" vsnprintf.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS vsnprintf.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" snprintf.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS snprintf.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" asprintf.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS asprintf.$ac_objext"
+ ;;
+esac
+
+
+    for f in atexit basename bcmp bcopy bsearch bzero calloc clock ffs \
+             getcwd getpagesize getrusage gettimeofday \
+             index insque memchr memcmp memcpy memmove memset psignal \
+             putenv random rename rindex sbrk setenv stpcpy strcasecmp \
+             strchr strdup strerror strncasecmp strrchr strstr strtod \
+             strtol strtoul sysconf times tmpnam vfprintf vprintf \
+             vsprintf waitpid
+    do
+      n=HAVE_`echo $f | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+      cat >>confdefs.h <<_ACEOF
+#define $n 1
+_ACEOF
+
+    done
+
+
+    setobjs=yes
+    ;;
+
+  esac
+
+  # We may wish to install the target headers somewhere.
+  # Check whether --enable-install-libiberty was given.
+if test "${enable_install_libiberty+set}" = set; then :
+  enableval=$enable_install_libiberty; enable_install_libiberty=$enableval
+else
+  enable_install_libiberty=no
+fi
+
+  # Option parsed, now set things appropriately.
+  case x"$enable_install_libiberty" in
+    xyes|x)
+      target_header_dir=libiberty
+      ;;
+    xno)
+      target_header_dir=
+      ;;
+    *)
+      # This could be sanity-checked in various ways...
+      target_header_dir="${enable_install_libiberty}"
+      ;;
+  esac
+
+
+else
+
+   # Not a target library, so we set things up to run the test suite.
+   CHECK=really-check
+
+fi
+
+
+
+
+case "${host}" in
+  *-*-cygwin* | *-*-mingw*)
+    $as_echo "#define HAVE_SYS_ERRLIST 1" >>confdefs.h
+
+    $as_echo "#define HAVE_SYS_NERR 1" >>confdefs.h
+
+    ;;
+esac
+
+if test -z "${setobjs}"; then
+  case "${host}" in
+
+  *-*-vxworks*)
+    # Handle VxWorks configuration specially, since on VxWorks the
+    # libraries are actually on the target board, not in the file
+    # system.
+    case " $LIBOBJS " in
+  *" basename.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS basename.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" getpagesize.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS getpagesize.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" insque.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS insque.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" random.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS random.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" strcasecmp.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" strncasecmp.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strncasecmp.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" strdup.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strdup.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" vfork.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS vfork.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" waitpid.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS waitpid.$ac_objext"
+ ;;
+esac
+
+    case " $LIBOBJS " in
+  *" vasprintf.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS vasprintf.$ac_objext"
+ ;;
+esac
+
+    for f in $funcs; do
+      case "$f" in
+	basename | getpagesize | insque | random | strcasecmp)
+	  ;;
+	strncasecmp | strdup | vfork | waitpid | vasprintf)
+	  ;;
+	*)
+	  n=HAVE_`echo $f | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+	  cat >>confdefs.h <<_ACEOF
+#define $n 1
+_ACEOF
+
+	  ;;
+      esac
+    done
+
+    # VxWorks doesn't provide any of the variables in $vars, so we
+    # don't have to check them here.
+
+    # Of the functions in $checkfuncs, VxWorks only has strerror.
+    $as_echo "#define HAVE_STRERROR 1" >>confdefs.h
+
+
+    setobjs=yes
+    ;;
+
+  esac
+fi
+
+if test -z "${setobjs}"; then
+
+  case "${host}" in
+
+  *-*-mingw32*)
+    # Under mingw32, sys_nerr and sys_errlist exist, but they are
+    # macros, so the test below won't find them.
+    libiberty_cv_var_sys_nerr=yes
+    libiberty_cv_var_sys_errlist=yes
+    ;;
+
+  *-*-msdosdjgpp*)
+    # vfork and fork are stubs.
+    ac_cv_func_vfork_works=no
+    ;;
+
+  *-*-uwin*)
+    # Under some versions of uwin, vfork is notoriously buggy and the test
+    # can hang configure; on other versions, vfork exists just as a stub.
+    # FIXME: This should be removed once vfork in uwin's runtime is fixed.
+    ac_cv_func_vfork_works=no
+    # Under uwin 2.0+, sys_nerr and sys_errlist exist, but they are
+    # macros (actually, these are imported from a DLL, but the end effect
+    # is the same), so the test below won't find them.
+    libiberty_cv_var_sys_nerr=yes
+    libiberty_cv_var_sys_errlist=yes
+    ;;
+
+  *-*-*vms*)
+    # Under VMS, vfork works very different than on Unix. The standard test
+    # won't work, and it isn't easily adaptable. It makes more sense to
+    # just force it.
+    ac_cv_func_vfork_works=yes
+    ;;
+
+  esac
+
+  # We haven't set the list of objects yet.  Use the standard autoconf
+  # tests.  This will only work if the compiler works.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
+$as_echo_n "checking for library containing strerror... " >&6; }
+if test "${ac_cv_search_strerror+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char strerror ();
+int
+main ()
+{
+return strerror ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' cposix; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if test x$gcc_no_link = xyes; then
+  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
+fi
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_strerror=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_strerror+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_strerror+set}" = set; then :
+
+else
+  ac_cv_search_strerror=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
+$as_echo "$ac_cv_search_strerror" >&6; }
+ac_res=$ac_cv_search_strerror
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+  for ac_func in $funcs
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+else
+  case " $LIBOBJS " in
+  *" $ac_func.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
+ ;;
+esac
+
+fi
+done
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether alloca needs Cray hooks" >&5
+$as_echo_n "checking whether alloca needs Cray hooks... " >&6; }
+if test "${ac_cv_os_cray+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if defined(CRAY) && ! defined(CRAY2)
+webecray
+#else
+wenotbecray
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "webecray" >/dev/null 2>&1; then :
+  ac_cv_os_cray=yes
+else
+  ac_cv_os_cray=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
+if test $ac_cv_os_cray = yes; then
+  for ac_func in _getb67 GETB67 getb67; do
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define CRAY_STACKSEG_END $ac_func
+_ACEOF
+  break
+fi
+
+  done
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if test "${ac_cv_c_stack_direction+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_c_stack_direction=0
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+find_stack_direction ()
+{
+  static char *addr = 0;
+  auto char dummy;
+  if (addr == 0)
+    {
+      addr = &dummy;
+      return find_stack_direction ();
+    }
+  else
+    return (&dummy > addr) ? 1 : -1;
+}
+main ()
+{
+  exit (find_stack_direction() < 0);
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_c_stack_direction=1
+else
+  ac_cv_c_stack_direction=-1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define STACK_DIRECTION $ac_cv_c_stack_direction
+_ACEOF
+
+
+  for ac_header in vfork.h
+do :
+  ac_fn_c_check_header_preproc "$LINENO" "vfork.h" "ac_cv_header_vfork_h"
+if test "x$ac_cv_header_vfork_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_VFORK_H 1
+_ACEOF
+
+fi
+done
+
+for ac_func in fork vfork
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+if test "x$ac_cv_func_fork" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
+$as_echo_n "checking for working fork... " >&6; }
+if test "${ac_cv_func_fork_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_fork_works=cross
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+	  /* By Ruediger Kuhlmann. */
+	  return fork () < 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_fork_works=yes
+else
+  ac_cv_func_fork_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5
+$as_echo "$ac_cv_func_fork_works" >&6; }
+
+else
+  ac_cv_func_fork_works=$ac_cv_func_fork
+fi
+if test "x$ac_cv_func_fork_works" = xcross; then
+  case $host in
+    *-*-amigaos* | *-*-msdosdjgpp*)
+      # Override, as these systems have only a dummy fork() stub
+      ac_cv_func_fork_works=no
+      ;;
+    *)
+      ac_cv_func_fork_works=yes
+      ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
+$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
+fi
+ac_cv_func_vfork_works=$ac_cv_func_vfork
+if test "x$ac_cv_func_vfork" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
+$as_echo_n "checking for working vfork... " >&6; }
+if test "${ac_cv_func_vfork_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_vfork_works=cross
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Thanks to Paul Eggert for this test.  */
+$ac_includes_default
+#include <sys/wait.h>
+#ifdef HAVE_VFORK_H
+# include <vfork.h>
+#endif
+/* On some sparc systems, changes by the child to local and incoming
+   argument registers are propagated back to the parent.  The compiler
+   is told about this with #include <vfork.h>, but some compilers
+   (e.g. gcc -O) don't grok <vfork.h>.  Test for this by using a
+   static variable whose address is put into a register that is
+   clobbered by the vfork.  */
+static void
+#ifdef __cplusplus
+sparc_address_test (int arg)
+# else
+sparc_address_test (arg) int arg;
+#endif
+{
+  static pid_t child;
+  if (!child) {
+    child = vfork ();
+    if (child < 0) {
+      perror ("vfork");
+      _exit(2);
+    }
+    if (!child) {
+      arg = getpid();
+      write(-1, "", 0);
+      _exit (arg);
+    }
+  }
+}
+
+int
+main ()
+{
+  pid_t parent = getpid ();
+  pid_t child;
+
+  sparc_address_test (0);
+
+  child = vfork ();
+
+  if (child == 0) {
+    /* Here is another test for sparc vfork register problems.  This
+       test uses lots of local variables, at least as many local
+       variables as main has allocated so far including compiler
+       temporaries.  4 locals are enough for gcc 1.40.3 on a Solaris
+       4.1.3 sparc, but we use 8 to be safe.  A buggy compiler should
+       reuse the register of parent for one of the local variables,
+       since it will think that parent can't possibly be used any more
+       in this routine.  Assigning to the local variable will thus
+       munge parent in the parent process.  */
+    pid_t
+      p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(),
+      p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid();
+    /* Convince the compiler that p..p7 are live; otherwise, it might
+       use the same hardware register for all 8 local variables.  */
+    if (p != p1 || p != p2 || p != p3 || p != p4
+	|| p != p5 || p != p6 || p != p7)
+      _exit(1);
+
+    /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent
+       from child file descriptors.  If the child closes a descriptor
+       before it execs or exits, this munges the parent's descriptor
+       as well.  Test for this by closing stdout in the child.  */
+    _exit(close(fileno(stdout)) != 0);
+  } else {
+    int status;
+    struct stat st;
+
+    while (wait(&status) != child)
+      ;
+    return (
+	 /* Was there some problem with vforking?  */
+	 child < 0
+
+	 /* Did the child fail?  (This shouldn't happen.)  */
+	 || status
+
+	 /* Did the vfork/compiler bug occur?  */
+	 || parent != getpid()
+
+	 /* Did the file descriptor bug occur?  */
+	 || fstat(fileno(stdout), &st) != 0
+	 );
+  }
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_vfork_works=yes
+else
+  ac_cv_func_vfork_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5
+$as_echo "$ac_cv_func_vfork_works" >&6; }
+
+fi;
+if test "x$ac_cv_func_fork_works" = xcross; then
+  ac_cv_func_vfork_works=$ac_cv_func_vfork
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
+$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
+fi
+
+if test "x$ac_cv_func_vfork_works" = xyes; then
+
+$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h
+
+else
+
+$as_echo "#define vfork fork" >>confdefs.h
+
+fi
+if test "x$ac_cv_func_fork_works" = xyes; then
+
+$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
+
+fi
+
+  if test $ac_cv_func_vfork_works = no; then
+    case " $LIBOBJS " in
+  *" vfork.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS vfork.$ac_objext"
+ ;;
+esac
+
+  fi
+  # We only need _doprnt if we might use it to implement v*printf.
+  if test $ac_cv_func_vprintf != yes \
+     || test $ac_cv_func_vfprintf != yes \
+     || test $ac_cv_func_vsprintf != yes; then
+    for ac_func in _doprnt
+do :
+  ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
+if test "x$ac_cv_func__doprnt" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE__DOPRNT 1
+_ACEOF
+
+else
+  case " $LIBOBJS " in
+  *" $ac_func.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
+ ;;
+esac
+
+fi
+done
+
+
+  else
+    for ac_func in _doprnt
+do :
+  ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
+if test "x$ac_cv_func__doprnt" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE__DOPRNT 1
+_ACEOF
+
+fi
+done
+
+  fi
+
+  for v in $vars; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $v" >&5
+$as_echo_n "checking for $v... " >&6; }
+    if { as_var=libiberty_cv_var_$v; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test x$gcc_no_link = xyes; then
+  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
+fi
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int *p;
+int
+main ()
+{
+extern int $v []; p = $v;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "libiberty_cv_var_$v=yes"
+else
+  eval "libiberty_cv_var_$v=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+
+    if eval "test \"`echo '$libiberty_cv_var_'$v`\" = yes"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      n=HAVE_`echo $v | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+      cat >>confdefs.h <<_ACEOF
+#define $n 1
+_ACEOF
+
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+  done
+
+  # special check for _system_configuration because AIX <4.3.2 do not
+  # contain the `physmem' member.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for external symbol _system_configuration" >&5
+$as_echo_n "checking for external symbol _system_configuration... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/systemcfg.h>
+int
+main ()
+{
+double x = _system_configuration.physmem;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE__SYSTEM_CONFIGURATION 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+  for ac_func in $checkfuncs
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+  ac_fn_c_check_decl "$LINENO" "basename(char *)" "ac_cv_have_decl_basename_char_p_" "$ac_includes_default"
+if test "x$ac_cv_have_decl_basename_char_p_" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_BASENAME $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "ffs" "ac_cv_have_decl_ffs" "$ac_includes_default"
+if test "x$ac_cv_have_decl_ffs" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FFS $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "asprintf" "ac_cv_have_decl_asprintf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_asprintf" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ASPRINTF $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_vasprintf" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_VASPRINTF $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_snprintf" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_SNPRINTF $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_VSNPRINTF $ac_have_decl
+_ACEOF
+
+  ac_fn_c_check_decl "$LINENO" "calloc" "ac_cv_have_decl_calloc" "$ac_includes_default"
+if test "x$ac_cv_have_decl_calloc" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_CALLOC $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getenv" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETENV $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "getopt" "ac_cv_have_decl_getopt" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getopt" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETOPT $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "malloc" "ac_cv_have_decl_malloc" "$ac_includes_default"
+if test "x$ac_cv_have_decl_malloc" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_MALLOC $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "realloc" "ac_cv_have_decl_realloc" "$ac_includes_default"
+if test "x$ac_cv_have_decl_realloc" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_REALLOC $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "sbrk" "ac_cv_have_decl_sbrk" "$ac_includes_default"
+if test "x$ac_cv_have_decl_sbrk" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_SBRK $ac_have_decl
+_ACEOF
+
+  ac_fn_c_check_decl "$LINENO" "strverscmp" "ac_cv_have_decl_strverscmp" "$ac_includes_default"
+if test "x$ac_cv_have_decl_strverscmp" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRVERSCMP $ac_have_decl
+_ACEOF
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether canonicalize_file_name must be declared" >&5
+$as_echo_n "checking whether canonicalize_file_name must be declared... " >&6; }
+if test "${libiberty_cv_decl_needed_canonicalize_file_name+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include "confdefs.h"
+#include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+int
+main ()
+{
+char *(*pfn) = (char *(*)) canonicalize_file_name
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  libiberty_cv_decl_needed_canonicalize_file_name=no
+else
+  libiberty_cv_decl_needed_canonicalize_file_name=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libiberty_cv_decl_needed_canonicalize_file_name" >&5
+$as_echo "$libiberty_cv_decl_needed_canonicalize_file_name" >&6; }
+if test $libiberty_cv_decl_needed_canonicalize_file_name = yes; then
+
+$as_echo "#define NEED_DECLARATION_CANONICALIZE_FILE_NAME 1" >>confdefs.h
+
+fi
+
+fi
+
+# Figure out which version of pexecute to use.
+case "${host}" in
+     *-*-mingw* | *-*-winnt*)	pexecute=pex-win32  ;;
+     *-*-msdosdjgpp*)		pexecute=pex-djgpp  ;;
+     *-*-msdos*)		pexecute=pex-msdos  ;;
+     *)				pexecute=pex-unix   ;;
+esac
+
+
+if test x$gcc_no_link = xyes; then
+  if test "x${ac_cv_func_mmap_fixed_mapped+set}" != xset; then
+    ac_cv_func_mmap_fixed_mapped=no
+  fi
+fi
+if test "x${ac_cv_func_mmap_fixed_mapped}" != xno; then
+  for ac_header in stdlib.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_preproc "$LINENO" "$ac_header" "$as_ac_Header"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+for ac_func in getpagesize
+do :
+  ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
+if test "x$ac_cv_func_getpagesize" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETPAGESIZE 1
+_ACEOF
+
+fi
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
+$as_echo_n "checking for working mmap... " >&6; }
+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_mmap_fixed_mapped=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+/* malloc might have been renamed as rpl_malloc. */
+#undef malloc
+
+/* Thanks to Mike Haertel and Jim Avera for this test.
+   Here is a matrix of mmap possibilities:
+	mmap private not fixed
+	mmap private fixed at somewhere currently unmapped
+	mmap private fixed at somewhere already mapped
+	mmap shared not fixed
+	mmap shared fixed at somewhere currently unmapped
+	mmap shared fixed at somewhere already mapped
+   For private mappings, we should verify that changes cannot be read()
+   back from the file, nor mmap's back from the file at a different
+   address.  (There have been systems where private was not correctly
+   implemented like the infamous i386 svr4.0, and systems where the
+   VM page cache was not coherent with the file system buffer cache
+   like early versions of FreeBSD and possibly contemporary NetBSD.)
+   For shared mappings, we should conversely verify that changes get
+   propagated back to all the places they're supposed to be.
+
+   Grep wants private fixed already mapped.
+   The main things grep needs to know about mmap are:
+   * does it exist and is it safe to write into the mmap'd area
+   * how to use it (BSD variants)  */
+
+#include <fcntl.h>
+#include <sys/mman.h>
+
+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
+char *malloc ();
+#endif
+
+/* This mess was copied from the GNU getpagesize.h.  */
+#ifndef HAVE_GETPAGESIZE
+/* Assume that all systems that can run configure have sys/param.h.  */
+# ifndef HAVE_SYS_PARAM_H
+#  define HAVE_SYS_PARAM_H 1
+# endif
+
+# ifdef _SC_PAGESIZE
+#  define getpagesize() sysconf(_SC_PAGESIZE)
+# else /* no _SC_PAGESIZE */
+#  ifdef HAVE_SYS_PARAM_H
+#   include <sys/param.h>
+#   ifdef EXEC_PAGESIZE
+#    define getpagesize() EXEC_PAGESIZE
+#   else /* no EXEC_PAGESIZE */
+#    ifdef NBPG
+#     define getpagesize() NBPG * CLSIZE
+#     ifndef CLSIZE
+#      define CLSIZE 1
+#     endif /* no CLSIZE */
+#    else /* no NBPG */
+#     ifdef NBPC
+#      define getpagesize() NBPC
+#     else /* no NBPC */
+#      ifdef PAGESIZE
+#       define getpagesize() PAGESIZE
+#      endif /* PAGESIZE */
+#     endif /* no NBPC */
+#    endif /* no NBPG */
+#   endif /* no EXEC_PAGESIZE */
+#  else /* no HAVE_SYS_PARAM_H */
+#   define getpagesize() 8192	/* punt totally */
+#  endif /* no HAVE_SYS_PARAM_H */
+# endif /* no _SC_PAGESIZE */
+
+#endif /* no HAVE_GETPAGESIZE */
+
+int
+main ()
+{
+  char *data, *data2, *data3;
+  int i, pagesize;
+  int fd;
+
+  pagesize = getpagesize ();
+
+  /* First, make a file with some known garbage in it. */
+  data = (char *) malloc (pagesize);
+  if (!data)
+    return 1;
+  for (i = 0; i < pagesize; ++i)
+    *(data + i) = rand ();
+  umask (0);
+  fd = creat ("conftest.mmap", 0600);
+  if (fd < 0)
+    return 1;
+  if (write (fd, data, pagesize) != pagesize)
+    return 1;
+  close (fd);
+
+  /* Next, try to mmap the file at a fixed address which already has
+     something else allocated at it.  If we can, also make sure that
+     we see the same garbage.  */
+  fd = open ("conftest.mmap", O_RDWR);
+  if (fd < 0)
+    return 1;
+  data2 = (char *) malloc (2 * pagesize);
+  if (!data2)
+    return 1;
+  data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
+  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
+		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
+    return 1;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data + i) != *(data2 + i))
+      return 1;
+
+  /* Finally, make sure that changes to the mapped area do not
+     percolate back to the file as seen by read().  (This is a bug on
+     some variants of i386 svr4.0.)  */
+  for (i = 0; i < pagesize; ++i)
+    *(data2 + i) = *(data2 + i) + 1;
+  data3 = (char *) malloc (pagesize);
+  if (!data3)
+    return 1;
+  if (read (fd, data3, pagesize) != pagesize)
+    return 1;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data + i) != *(data3 + i))
+      return 1;
+  close (fd);
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_mmap_fixed_mapped=yes
+else
+  ac_cv_func_mmap_fixed_mapped=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
+$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
+if test $ac_cv_func_mmap_fixed_mapped = yes; then
+
+$as_echo "#define HAVE_MMAP 1" >>confdefs.h
+
+fi
+rm -f conftest.mmap
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strncmp" >&5
+$as_echo_n "checking for working strncmp... " >&6; }
+if test "${ac_cv_func_strncmp_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_strncmp_works=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Test by Jim Wilson and Kaveh Ghazi.
+   Check whether strncmp reads past the end of its string parameters. */
+#include <sys/types.h>
+
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+#ifdef HAVE_SYS_MMAN_H
+#include <sys/mman.h>
+#endif
+
+#ifndef MAP_ANON
+#ifdef MAP_ANONYMOUS
+#define MAP_ANON MAP_ANONYMOUS
+#else
+#define MAP_ANON MAP_FILE
+#endif
+#endif
+
+#ifndef MAP_FILE
+#define MAP_FILE 0
+#endif
+#ifndef O_RDONLY
+#define O_RDONLY 0
+#endif
+
+#define MAP_LEN 0x10000
+
+main ()
+{
+#if defined(HAVE_MMAP) || defined(HAVE_MMAP_ANYWHERE)
+  char *p;
+  int dev_zero;
+
+  dev_zero = open ("/dev/zero", O_RDONLY);
+  if (dev_zero < 0)
+    exit (1);
+
+  p = (char *) mmap (0, MAP_LEN, PROT_READ|PROT_WRITE,
+		     MAP_ANON|MAP_PRIVATE, dev_zero, 0);
+  if (p == (char *)-1)
+    p = (char *) mmap (0, MAP_LEN, PROT_READ|PROT_WRITE,
+		       MAP_ANON|MAP_PRIVATE, -1, 0);
+  if (p == (char *)-1)
+    exit (2);
+  else
+    {
+      char *string = "__si_type_info";
+      char *q = (char *) p + MAP_LEN - strlen (string) - 2;
+      char *r = (char *) p + 0xe;
+
+      strcpy (q, string);
+      strcpy (r, string);
+      strncmp (r, q, 14);
+    }
+#endif /* HAVE_MMAP || HAVE_MMAP_ANYWHERE */
+  exit (0);
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_strncmp_works=yes
+else
+  ac_cv_func_strncmp_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+rm -f core core.* *.core
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strncmp_works" >&5
+$as_echo "$ac_cv_func_strncmp_works" >&6; }
+if test $ac_cv_func_strncmp_works = no ; then
+  case " $LIBOBJS " in
+  *" strncmp.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strncmp.$ac_objext"
+ ;;
+esac
+
+fi
+
+
+# Install a library built with a cross compiler in $(tooldir) rather
+# than $(libdir).
+if test -z "${with_cross_host}"; then
+  INSTALL_DEST=libdir
+else
+  INSTALL_DEST=tooldir
+fi
+
+
+
+L=""
+for l in x $LIBOBJS; do
+  case $l in
+    x) ;;
+    *) L="$L ./$l" ;;
+  esac
+done
+LIBOBJS="$L"
+
+
+
+
+
+# We need multilib support, but only if configuring for the target.
+####AC_CONFIG_FILES([Makefile testsuite/Makefile])
+ac_config_files="$ac_config_files Makefile"
+
+ac_config_commands="$ac_config_commands default"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    test "x$cache_file" != "x/dev/null" &&
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+    cat confcache >$cache_file
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+
+
+: ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by $as_me, which was
+generated by GNU Autoconf 2.64.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to the package provider."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_version="\\
+config.status
+configured by $0, generated by GNU Autoconf 2.64,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright (C) 2009 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+srcdir=${srcdir}
+host=${host}
+target=${target}
+with_target_subdir=${with_target_subdir}
+with_multisubdir=${with_multisubdir}
+ac_configure_args="--enable-multilib ${ac_configure_args}"
+CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
+libiberty_topdir=${libiberty_topdir}
+
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp=
+  trap 'exit_status=$?
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&2;}
+
+  rm -f "$tmp/stdin"
+  case $ac_file in
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error "could not create -" "$LINENO" 5
+  fi
+ ;;
+
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "default":C) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
+if test -n "$CONFIG_FILES"; then
+  if test -n "${with_target_subdir}"; then
+    # FIXME: We shouldn't need to set ac_file
+    ac_file=Makefile
+    LD="${ORIGINAL_LD_FOR_MULTILIBS}"
+    . ${libiberty_topdir}/config-ml.in
+  fi
+fi ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit $?
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/configure.ac sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/configure.ac
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/configure.ac	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/configure.ac	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,718 @@
+dnl Process this file with autoconf to produce a configure script
+
+AC_PREREQ(2.64)
+AC_INIT
+AC_CONFIG_SRCDIR([xmalloc.c])
+
+# This works around the fact that libtool configuration may change LD
+# for this particular configuration, but some shells, instead of
+# keeping the changes in LD private, export them just because LD is
+# exported.  We don't use libtool yet, but some day we might, so...
+ORIGINAL_LD_FOR_MULTILIBS=$LD
+
+dnl We use these options to decide which functions to include.
+AC_ARG_WITH(target-subdir,
+[  --with-target-subdir=SUBDIR      Configuring in a subdirectory for target])
+AC_ARG_WITH(build-subdir,
+[  --with-build-subdir=SUBDIR       Configuring in a subdirectory for build])
+AC_ARG_WITH(cross-host,
+[  --with-cross-host=HOST           Configuring with a cross compiler])
+AC_ARG_WITH(newlib,
+[  --with-newlib                    Configuring with newlib])
+
+if test "${srcdir}" = "."; then
+  if test -n "${with_build_subdir}"; then
+    libiberty_topdir="${srcdir}/../.."
+    with_target_subdir=
+  elif test -z "${with_target_subdir}"; then
+    libiberty_topdir="${srcdir}/.."
+  else
+    if test "${with_target_subdir}" != "."; then
+      libiberty_topdir="${srcdir}/${with_multisrctop}../.."
+    else
+      libiberty_topdir="${srcdir}/${with_multisrctop}.."
+    fi
+  fi
+else
+  libiberty_topdir="${srcdir}/.."
+fi
+AC_SUBST(libiberty_topdir)
+AC_CONFIG_AUX_DIR($libiberty_topdir)
+
+dnl Very limited version of automake's enable-maintainer-mode
+
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode is disabled by default
+  AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode
+                          enable make rules and dependencies not useful
+                          (and sometimes confusing) to the casual installer],
+      maintainer_mode=$enableval,
+      maintainer_mode=no)
+
+AC_MSG_RESULT($maintainer_mode)
+
+if test "$maintainer_mode" = "yes"; then
+  MAINT=''
+  NOTMAINT='#'
+else
+  MAINT='#'
+  NOTMAINT=''
+fi
+AC_SUBST(MAINT)dnl
+AC_SUBST(NOTMAINT)dnl
+
+# Do we have a single-tree copy of texinfo?  Even if we do, we can't
+# rely on it - libiberty is built before texinfo.
+AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, )
+if test "x$MAKEINFO" = "x"; then
+    MAKEINFO="@echo makeinfo missing; true"
+    BUILD_INFO=
+else
+    BUILD_INFO=info
+    case "$MAKEINFO" in
+      */missing\ makeinfo*)
+	BUILD_INFO=
+	AC_MSG_WARN([
+*** Makeinfo is missing. Info documentation will not be built.])
+        ;;
+      *)
+	case x"`$MAKEINFO --version | grep 'GNU texinfo'`" in
+	  x*\ [[1-3]].* )
+	    MAKEINFO="@echo $MAKEINFO is too old, 4.0 or newer required; true"
+	    BUILD_INFO=
+	    AC_MSG_WARN([
+*** Makeinfo is too old. Info documentation will not be built.])
+	  ;;
+	esac
+	;;
+    esac
+fi
+AC_SUBST(MAKEINFO)
+AC_SUBST(BUILD_INFO)
+
+AC_CHECK_PROG(PERL, perl, perl, )
+if test x"$PERL" = x""; then
+  HAVE_PERL='#'
+else
+  HAVE_PERL=''
+fi
+AC_SUBST(HAVE_PERL)
+
+AC_CANONICAL_HOST
+
+dnl When we start using automake:
+dnl AM_INIT_AUTOMAKE(libiberty, 1.0)
+
+dnl These must be called before AM_PROG_LIBTOOL, because it may want
+dnl to call AC_CHECK_PROG.
+AC_CHECK_TOOL(AR, ar)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+
+dnl When switching to automake, replace the following with AM_ENABLE_MULTILIB.
+# Add --enable-multilib to configure.
+# Default to --enable-multilib
+AC_ARG_ENABLE(multilib,
+[  --enable-multilib       build many library versions (default)],
+[case "$enableval" in
+  yes) multilib=yes ;;
+  no)  multilib=no ;;
+  *)   AC_MSG_ERROR([bad value $enableval for multilib option]) ;;
+ esac],
+	      [multilib=yes])
+
+# Even if the default multilib is not a cross compilation,
+# it may be that some of the other multilibs are.
+if test $cross_compiling = no && test $multilib = yes \
+   && test "x${with_multisubdir}" != x ; then
+   cross_compiling=maybe
+fi
+
+GCC_NO_EXECUTABLES
+AC_PROG_CC
+AC_SYS_LARGEFILE
+AC_PROG_CPP_WERROR
+
+ACX_PROG_CC_WARNING_OPTS([-W -Wall -Wwrite-strings -Wc++-compat \
+			  -Wstrict-prototypes], [ac_libiberty_warn_cflags])
+ACX_PROG_CC_WARNING_ALMOST_PEDANTIC([], [ac_libiberty_warn_cflags])
+
+AC_PROG_CC_C_O
+# autoconf is lame and doesn't give us any substitution variable for this.
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = no"; then
+  NO_MINUS_C_MINUS_O=yes
+else
+  OUTPUT_OPTION='-o $@'
+fi
+AC_SUBST(NO_MINUS_C_MINUS_O)
+AC_SUBST(OUTPUT_OPTION)
+
+AC_C_CONST
+AC_C_INLINE
+AC_C_BIGENDIAN
+
+dnl When we start using libtool:
+dnl Default to a non shared library.  This may be overridden by the
+dnl configure option --enable-shared.
+dnl AM_DISABLE_SHARED
+
+dnl When we start using libtool:
+dnl AM_PROG_LIBTOOL
+
+dnl When we start using automake:
+dnl AM_CONFIG_HEADER(config.h:config.in)
+AC_CONFIG_HEADER(config.h:config.in)
+
+dnl When we start using automake:
+dnl AM_MAINTAINER_MODE
+dnl AC_EXEEXT
+
+dnl When we start using automake:
+dnl AM_PROG_INSTALL
+AC_PROG_INSTALL
+
+# Don't build the shared library for build.
+if [[ -n "${with_build_subdir}" ]]; then
+  enable_shared=no
+fi
+
+####frag=
+####case "${host}" in
+####  rs6000-ibm-aix3.1 | rs6000-ibm-aix)
+####                        frag=mh-aix ;;
+####  *-*-cxux7*)		frag=mh-cxux7 ;;
+####  *-*-freebsd2.1.*)	frag=mh-fbsd21 ;;
+####  *-*-freebsd2.2.[[012]])	frag=mh-fbsd21 ;;
+####  i370-*-opened*)       frag=mh-openedition ;;
+####  i[[34567]]86-*-windows*)	frag=mh-windows ;;
+####esac
+
+####if [[ -n "${frag}" ]]; then
+####  frag=${libiberty_topdir}/libiberty/config/$frag
+####fi
+
+GCC_PICFLAG
+
+# If they didn't specify --enable-shared, don't generate shared libs.
+case "${enable_shared}" in
+  yes) shared=yes ;;
+  no) shared=no ;;
+  "") shared=no ;;
+  *) shared=yes ;;
+esac
+if [[ "${shared}" != "yes" ]]; then
+  PICFLAG=
+fi
+AC_SUBST(PICFLAG)
+
+####echo "# Warning: this fragment is automatically generated" > temp-frag
+
+####if [[ -n "${frag}" ]] && [[ -f "${frag}" ]]; then
+####  echo "Appending ${frag} to xhost-mkfrag"
+####  echo "# Following fragment copied from ${frag}" >> temp-frag
+####  cat ${frag} >> temp-frag
+####fi
+
+##### record if we want to build shared libs.
+####if [[ "${shared}" = "yes" ]]; then
+####  echo enable_shared = yes >> temp-frag
+####else
+####  echo enable_shared = no >> temp-frag
+####fi
+
+####frag=xhost-mkfrag
+####${CONFIG_SHELL-/bin/sh} ${libiberty_topdir}/move-if-change temp-frag xhost-mkfrag
+
+####host_makefile_frag=${frag}
+####AC_SUBST_FILE(host_makefile_frag)
+
+# It's OK to check for header files.  Although the compiler may not be
+# able to link anything, it had better be able to at least compile
+# something.
+AC_CHECK_HEADERS(sys/file.h sys/param.h limits.h stdlib.h malloc.h string.h unistd.h strings.h sys/time.h time.h sys/resource.h sys/stat.h sys/mman.h fcntl.h alloca.h sys/pstat.h sys/sysmp.h sys/sysinfo.h machine/hal_sysinfo.h sys/table.h sys/sysctl.h sys/systemcfg.h stdint.h stdio_ext.h process.h sys/prctl.h)
+AC_HEADER_SYS_WAIT
+AC_HEADER_TIME
+
+libiberty_AC_DECLARE_ERRNO
+
+# Determine the size of an int for struct fibnode.
+AC_CHECK_SIZEOF([int])
+
+# Look for a 64-bit type.
+AC_MSG_CHECKING([for a 64-bit type])
+AC_CACHE_VAL(liberty_cv_uint64,
+[AC_TRY_COMPILE(
+[#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif],
+[extern uint64_t foo;],
+liberty_cv_uint64=uint64_t,
+[AC_TRY_COMPILE(
+[#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#ifndef CHAR_BIT
+#define CHAR_BIT 8
+#endif],
+[extern char foo[sizeof(long) * CHAR_BIT >= 64 ? 1 : -1];],
+liberty_cv_uint64="unsigned long",
+[AC_TRY_COMPILE(
+[#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#ifndef CHAR_BIT
+#define CHAR_BIT 8
+#endif],
+[extern char foo[sizeof(long long) * CHAR_BIT >= 64 ? 1 : -1];],
+liberty_cv_uint64="unsigned long long", liberty_cv_uint64=none)])])])
+AC_MSG_RESULT($liberty_cv_uint64)
+if test "$liberty_cv_uint64" != none; then
+  AC_DEFINE_UNQUOTED(UNSIGNED_64BIT_TYPE, $liberty_cv_uint64,
+                     [Define to an unsigned 64-bit type available in the compiler.])
+fi
+
+AC_TYPE_INTPTR_T
+AC_TYPE_UINTPTR_T
+AC_TYPE_SSIZE_T
+
+# Given the above check, we always have uintptr_t or a fallback
+# definition.  So define HAVE_UINTPTR_T in case any imported code
+# relies on it.
+AC_DEFINE(HAVE_UINTPTR_T, 1, [Define if you have the \`uintptr_t' type.])
+
+AC_TYPE_PID_T
+
+# This is the list of functions which libiberty will provide if they
+# are not available on the host.
+
+funcs="asprintf"
+funcs="$funcs atexit"
+funcs="$funcs basename"
+funcs="$funcs bcmp"
+funcs="$funcs bcopy"
+funcs="$funcs bsearch"
+funcs="$funcs bzero"
+funcs="$funcs calloc"
+funcs="$funcs clock"
+funcs="$funcs ffs"
+funcs="$funcs getcwd"
+funcs="$funcs getpagesize"
+funcs="$funcs gettimeofday"
+funcs="$funcs index"
+funcs="$funcs insque"
+funcs="$funcs memchr"
+funcs="$funcs memcmp"
+funcs="$funcs memcpy"
+funcs="$funcs memmem"
+funcs="$funcs memmove"
+funcs="$funcs mempcpy"
+funcs="$funcs memset"
+funcs="$funcs mkstemps"
+funcs="$funcs putenv"
+funcs="$funcs random"
+funcs="$funcs rename"
+funcs="$funcs rindex"
+funcs="$funcs setenv"
+funcs="$funcs snprintf"
+funcs="$funcs sigsetmask"
+funcs="$funcs stpcpy"
+funcs="$funcs stpncpy"
+funcs="$funcs strcasecmp"
+funcs="$funcs strchr"
+funcs="$funcs strdup"
+funcs="$funcs strncasecmp"
+funcs="$funcs strndup"
+funcs="$funcs strrchr"
+funcs="$funcs strstr"
+funcs="$funcs strtod"
+funcs="$funcs strtol"
+funcs="$funcs strtoul"
+funcs="$funcs strverscmp"
+funcs="$funcs tmpnam"
+funcs="$funcs vasprintf"
+funcs="$funcs vfprintf"
+funcs="$funcs vprintf"
+funcs="$funcs vsnprintf"
+funcs="$funcs vsprintf"
+funcs="$funcs waitpid"
+funcs="$funcs setproctitle"
+
+# Also in the old function.def file: alloca, vfork, getopt.
+
+vars="sys_errlist sys_nerr sys_siglist"
+
+checkfuncs="__fsetlocking canonicalize_file_name dup3 getrlimit getrusage \
+ getsysinfo gettimeofday on_exit psignal pstat_getdynamic pstat_getstatic \
+ realpath setrlimit sbrk spawnve spawnvpe strerror strsignal sysconf sysctl \
+ sysmp table times wait3 wait4"
+
+# These are neither executed nor required, but they help keep
+# autoheader happy without adding a bunch of text to acconfig.h.
+if test "x" = "y"; then
+  AC_CHECK_FUNCS(asprintf atexit \
+    basename bcmp bcopy bsearch bzero \
+    calloc canonicalize_file_name clock \
+    dup3 \
+    ffs __fsetlocking \
+    getcwd getpagesize getrlimit getrusage getsysinfo gettimeofday \
+    index insque \
+    memchr memcmp memcpy memmem memmove memset mkstemps \
+    on_exit \
+    psignal pstat_getdynamic pstat_getstatic putenv \
+    random realpath rename rindex \
+    sbrk setenv setproctitle setrlimit sigsetmask snprintf spawnve spawnvpe \
+     stpcpy stpncpy strcasecmp strchr strdup \
+     strerror strncasecmp strndup strrchr strsignal strstr strtod strtol \
+     strtoul strverscmp sysconf sysctl sysmp \
+    table times tmpnam \
+    vasprintf vfprintf vprintf vsprintf \
+    wait3 wait4 waitpid)
+  AC_CHECK_DECLS([basename(char *), ffs, asprintf, vasprintf, snprintf, vsnprintf])
+  AC_DEFINE(HAVE_SYS_ERRLIST, 1, [Define if you have the sys_errlist variable.])
+  AC_DEFINE(HAVE_SYS_NERR,    1, [Define if you have the sys_nerr variable.])
+  AC_DEFINE(HAVE_SYS_SIGLIST, 1, [Define if you have the sys_siglist variable.])
+fi
+
+# For each of these functions, if the host does not provide the
+# function we want to put FN.o in LIBOBJS, and if the host does
+# provide the function, we want to define HAVE_FN in config.h.
+
+setobjs=
+CHECK=
+target_header_dir=
+if test -n "${with_target_subdir}"; then
+
+  # We are being configured as a target library.  AC_REPLACE_FUNCS
+  # may not work correctly, because the compiler may not be able to
+  # link executables.  Note that we may still be being configured
+  # native.
+
+  # If we are being configured for newlib, we know which functions
+  # newlib provide and which ones we will be expected to provide.
+
+  if test "x${with_newlib}" = "xyes"; then
+    AC_LIBOBJ([asprintf])
+    AC_LIBOBJ([basename])
+    AC_LIBOBJ([insque])
+    AC_LIBOBJ([random])
+    AC_LIBOBJ([strdup])
+    AC_LIBOBJ([vasprintf])
+
+    for f in $funcs; do
+      case "$f" in
+	asprintf | basename | insque | random | strdup | vasprintf)
+	  ;;
+	*)
+	  n=HAVE_`echo $f | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+	  AC_DEFINE_UNQUOTED($n)
+	  ;;
+      esac
+    done
+
+    # newlib doesnt provide any of the variables in $vars, so we
+    # dont have to check them here.
+
+    # Of the functions in $checkfuncs, newlib only has strerror.
+    AC_DEFINE(HAVE_STRERROR)
+
+    setobjs=yes
+
+  fi
+
+  # If we are being configured for Mingw, we know which functions
+  # Mingw provides and which ones we will be expected to provide.
+
+  case "${host}" in
+  *-*-mingw*)
+    AC_LIBOBJ([asprintf])
+    AC_LIBOBJ([basename])
+    AC_LIBOBJ([bcmp])
+    AC_LIBOBJ([bcopy])
+    AC_LIBOBJ([bzero])
+    AC_LIBOBJ([clock])
+    AC_LIBOBJ([ffs])
+    AC_LIBOBJ([getpagesize])
+    AC_LIBOBJ([index])
+    AC_LIBOBJ([insque])
+    AC_LIBOBJ([mempcpy])
+    AC_LIBOBJ([mkstemps])
+    AC_LIBOBJ([random])
+    AC_LIBOBJ([rindex])
+    AC_LIBOBJ([sigsetmask])
+    AC_LIBOBJ([stpcpy])
+    AC_LIBOBJ([stpncpy])
+    AC_LIBOBJ([strndup])
+    AC_LIBOBJ([strverscmp])
+    AC_LIBOBJ([vasprintf])
+    AC_LIBOBJ([waitpid])
+
+    for f in $funcs; do
+      case "$f" in
+	asprintf | basename | bcmp | bcopy | bzero | clock | ffs | getpagesize | index | insque | mempcpy | mkstemps | random | rindex | sigsetmask | stpcpy | stpncpy | strdup | strndup | strverscmp | vasprintf | waitpid)
+	  ;;
+	*)
+	  n=HAVE_`echo $f | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+	  AC_DEFINE_UNQUOTED($n)
+	  ;;
+      esac
+    done
+
+    # Mingw doesnt provide any of the variables in $vars, so we
+    # dont have to check them here.
+
+    # Of the functions in $checkfuncs, Mingw only has strerror.
+    AC_DEFINE(HAVE_STRERROR)
+
+    setobjs=yes
+    ;;
+
+  *-*-msdosdjgpp)
+    AC_LIBOBJ([vasprintf])
+    AC_LIBOBJ([vsnprintf])
+    AC_LIBOBJ([snprintf])
+    AC_LIBOBJ([asprintf])
+
+    for f in atexit basename bcmp bcopy bsearch bzero calloc clock ffs \
+             getcwd getpagesize getrusage gettimeofday \
+             index insque memchr memcmp memcpy memmove memset psignal \
+             putenv random rename rindex sbrk setenv stpcpy strcasecmp \
+             strchr strdup strerror strncasecmp strrchr strstr strtod \
+             strtol strtoul sysconf times tmpnam vfprintf vprintf \
+             vsprintf waitpid
+    do
+      n=HAVE_`echo $f | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+      AC_DEFINE_UNQUOTED($n)
+    done
+
+
+    setobjs=yes
+    ;;
+
+  esac
+
+  # We may wish to install the target headers somewhere.
+  AC_ARG_ENABLE(install-libiberty,
+  [  --enable-install-libiberty       Install headers for end users],
+  enable_install_libiberty=$enableval,
+  enable_install_libiberty=no)dnl
+  
+  # Option parsed, now set things appropriately.
+  case x"$enable_install_libiberty" in
+    xyes|x)
+      target_header_dir=libiberty
+      ;;
+    xno)   
+      target_header_dir=
+      ;;
+    *) 
+      # This could be sanity-checked in various ways...
+      target_header_dir="${enable_install_libiberty}"
+      ;;
+  esac
+
+
+else
+
+   # Not a target library, so we set things up to run the test suite.
+   CHECK=really-check
+
+fi
+
+AC_SUBST(CHECK)
+AC_SUBST(target_header_dir)
+
+case "${host}" in
+  *-*-cygwin* | *-*-mingw*)
+    AC_DEFINE(HAVE_SYS_ERRLIST)
+    AC_DEFINE(HAVE_SYS_NERR)
+    ;;
+esac
+
+if test -z "${setobjs}"; then
+  case "${host}" in
+
+  *-*-vxworks*)
+    # Handle VxWorks configuration specially, since on VxWorks the
+    # libraries are actually on the target board, not in the file
+    # system.
+    AC_LIBOBJ([basename])
+    AC_LIBOBJ([getpagesize])
+    AC_LIBOBJ([insque])
+    AC_LIBOBJ([random])
+    AC_LIBOBJ([strcasecmp])
+    AC_LIBOBJ([strncasecmp])
+    AC_LIBOBJ([strdup])
+    AC_LIBOBJ([vfork])
+    AC_LIBOBJ([waitpid])
+    AC_LIBOBJ([vasprintf])
+    for f in $funcs; do
+      case "$f" in
+	basename | getpagesize | insque | random | strcasecmp)
+	  ;;
+	strncasecmp | strdup | vfork | waitpid | vasprintf)
+	  ;;
+	*)
+	  n=HAVE_`echo $f | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+	  AC_DEFINE_UNQUOTED($n)
+	  ;;
+      esac
+    done
+
+    # VxWorks doesn't provide any of the variables in $vars, so we
+    # don't have to check them here.
+
+    # Of the functions in $checkfuncs, VxWorks only has strerror.
+    AC_DEFINE(HAVE_STRERROR)
+
+    setobjs=yes
+    ;;
+
+  esac
+fi
+
+if test -z "${setobjs}"; then
+
+  case "${host}" in
+
+  *-*-mingw32*)
+    # Under mingw32, sys_nerr and sys_errlist exist, but they are
+    # macros, so the test below won't find them.
+    libiberty_cv_var_sys_nerr=yes
+    libiberty_cv_var_sys_errlist=yes
+    ;;
+
+  *-*-msdosdjgpp*)
+    # vfork and fork are stubs.
+    ac_cv_func_vfork_works=no
+    ;;
+
+  *-*-uwin*)
+    # Under some versions of uwin, vfork is notoriously buggy and the test 
+    # can hang configure; on other versions, vfork exists just as a stub.
+    # FIXME: This should be removed once vfork in uwin's runtime is fixed.
+    ac_cv_func_vfork_works=no
+    # Under uwin 2.0+, sys_nerr and sys_errlist exist, but they are
+    # macros (actually, these are imported from a DLL, but the end effect 
+    # is the same), so the test below won't find them.
+    libiberty_cv_var_sys_nerr=yes
+    libiberty_cv_var_sys_errlist=yes
+    ;;
+
+  *-*-*vms*)
+    # Under VMS, vfork works very different than on Unix. The standard test 
+    # won't work, and it isn't easily adaptable. It makes more sense to
+    # just force it.
+    ac_cv_func_vfork_works=yes
+    ;;
+
+  esac
+
+  # We haven't set the list of objects yet.  Use the standard autoconf
+  # tests.  This will only work if the compiler works.
+  AC_ISC_POSIX
+  AC_REPLACE_FUNCS($funcs)
+  libiberty_AC_FUNC_C_ALLOCA
+  AC_FUNC_FORK
+  if test $ac_cv_func_vfork_works = no; then
+    AC_LIBOBJ([vfork])
+  fi
+  # We only need _doprnt if we might use it to implement v*printf.
+  if test $ac_cv_func_vprintf != yes \
+     || test $ac_cv_func_vfprintf != yes \
+     || test $ac_cv_func_vsprintf != yes; then
+    AC_REPLACE_FUNCS(_doprnt)
+  else
+    AC_CHECK_FUNCS(_doprnt)
+  fi
+
+  for v in $vars; do
+    AC_MSG_CHECKING([for $v])
+    AC_CACHE_VAL(libiberty_cv_var_$v,
+      [AC_LINK_IFELSE([AC_LANG_PROGRAM([[int *p;]],[[extern int $v []; p = $v;]])],
+		      [eval "libiberty_cv_var_$v=yes"],
+		      [eval "libiberty_cv_var_$v=no"])])
+    if eval "test \"`echo '$libiberty_cv_var_'$v`\" = yes"; then
+      AC_MSG_RESULT(yes)
+      n=HAVE_`echo $v | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+      AC_DEFINE_UNQUOTED($n)
+    else
+      AC_MSG_RESULT(no)
+    fi
+  done
+
+  # special check for _system_configuration because AIX <4.3.2 do not
+  # contain the `physmem' member.
+  AC_MSG_CHECKING([for external symbol _system_configuration])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/systemcfg.h>]],
+			[[double x = _system_configuration.physmem;]])],
+    [AC_MSG_RESULT([yes])
+    AC_DEFINE(HAVE__SYSTEM_CONFIGURATION, 1,
+	      [Define if you have the _system_configuration variable.])],
+    [AC_MSG_RESULT([no])])
+
+  AC_CHECK_FUNCS($checkfuncs)
+  AC_CHECK_DECLS([basename(char *), ffs, asprintf, vasprintf, snprintf, vsnprintf])
+  AC_CHECK_DECLS([calloc, getenv, getopt, malloc, realloc, sbrk])
+  AC_CHECK_DECLS([strverscmp])
+  libiberty_NEED_DECLARATION(canonicalize_file_name)
+fi
+
+# Figure out which version of pexecute to use.
+case "${host}" in
+     *-*-mingw* | *-*-winnt*)	pexecute=pex-win32  ;;
+     *-*-msdosdjgpp*)		pexecute=pex-djgpp  ;;
+     *-*-msdos*)		pexecute=pex-msdos  ;;
+     *)				pexecute=pex-unix   ;;
+esac
+AC_SUBST(pexecute)
+
+libiberty_AC_FUNC_STRNCMP
+
+# Install a library built with a cross compiler in $(tooldir) rather
+# than $(libdir).
+if test -z "${with_cross_host}"; then
+  INSTALL_DEST=libdir
+else
+  INSTALL_DEST=tooldir
+fi
+AC_SUBST(INSTALL_DEST)
+
+m4_pattern_allow(LIBOBJS)
+L=""
+for l in x $LIBOBJS; do
+  case $l in
+    x) ;;
+    *) L="$L ./$l" ;;
+  esac
+done
+LIBOBJS="$L"
+
+dnl Required by html and install-html
+AC_SUBST(datarootdir)
+AC_SUBST(docdir)
+AC_SUBST(htmldir)
+
+# We need multilib support, but only if configuring for the target.
+####AC_CONFIG_FILES([Makefile testsuite/Makefile])
+AC_CONFIG_FILES([Makefile])
+AC_CONFIG_COMMANDS([default],
+  [[test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
+if test -n "$CONFIG_FILES"; then
+  if test -n "${with_target_subdir}"; then
+    # FIXME: We shouldn't need to set ac_file
+    ac_file=Makefile
+    LD="${ORIGINAL_LD_FOR_MULTILIBS}"
+    . ${libiberty_topdir}/config-ml.in
+  fi
+fi]],
+[[srcdir=${srcdir}
+host=${host}
+target=${target}
+with_target_subdir=${with_target_subdir}
+with_multisubdir=${with_multisubdir}
+ac_configure_args="--enable-multilib ${ac_configure_args}"
+CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
+libiberty_topdir=${libiberty_topdir}
+]])
+AC_OUTPUT
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/configure.com sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/configure.com
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/configure.com	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/configure.com	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,38 @@
+$!
+$! This file configures the libiberty library for use with openVMS.
+$!
+$! We do not use the configure script, since we do not have /bin/sh
+$! to execute it.
+$!
+$! Written by Tristan Gingold (gingold@adacore.com)
+$!
+$!
+$!
+$ copy config.h-vms config.h
+$!
+$ write sys$output "Generate libiberty build.com"
+$!
+$ create build.com
+$DECK
+$ FILES="getopt,obstack,xexit,xmalloc,hex,getopt1,cplus-dem,cp-demangle,"+-
+    "cp-demint,asprintf,vasprintf,mkstemps,concat,getruntime,getpagesize,"+-
+    "getpwd,xstrerror,xmemdup,xstrdup,xatexit,choose-temp,fnmatch,objalloc,"+-
+    "safe-ctype,hashtab,lbasename,argv,lrealpath,make-temp-file,"+-
+    "stpcpy,unlink-if-ordinary"
+$ OPT="/noopt/debug/warnings=disable=(missingreturn)"
+$ CFLAGS=OPT + "/include=([],[-.include])/name=(as_is,shortened)" +-
+ "/define=(HAVE_CONFIG_H=1)" +-
+ "/prefix=(all,exc=(""getopt"",""optarg"",""optopt"",""optind"",""opterr""))"
+$ write sys$output "CFLAGS=",CFLAGS
+$ NUM = 0
+$ LOOP:
+$   F = F$ELEMENT(NUM,",",FILES)
+$   IF F.EQS."," THEN GOTO END
+$   write sys$output "Compiling ", F, ".c"
+$   cc 'CFLAGS 'F.c
+$   NUM = NUM + 1
+$   GOTO LOOP
+$ END:
+$ purge
+$ lib/create libiberty 'FILES
+$EOD
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/copying-lib.texi sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/copying-lib.texi
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/copying-lib.texi	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/copying-lib.texi	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,565 @@
+@node Library Copying
+@appendixsec GNU LESSER GENERAL PUBLIC LICENSE
+
+@cindex LGPL, Lesser General Public License
+@center Version 2.1, February 1999
+
+@display
+Copyright @copyright{} 1991, 1999 Free Software Foundation, Inc.
+51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+as the successor of the GNU Library Public License, version 2, hence the
+version number 2.1.]
+@end display
+
+@appendixsubsec Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software---to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software---typically libraries---of the Free
+Software Foundation and other authors who decide to use it.  You can use
+it too, but we suggest you first think carefully about whether this
+license or the ordinary General Public License is the better strategy to
+use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of it
+in new free programs; and that you are informed that you can do these
+things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the @dfn{Lesser} General Public License because it
+does @emph{Less} to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+``work based on the library'' and a ``work that uses the library''.  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+@iftex
+@appendixsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+@end iftex
+@ifinfo
+@center GNU LESSER GENERAL PUBLIC LICENSE
+@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+@end ifinfo
+
+@enumerate 0
+@item
+This License Agreement applies to any software library or other program
+which contains a notice placed by the copyright holder or other
+authorized party saying it may be distributed under the terms of this
+Lesser General Public License (also called ``this License'').  Each
+licensee is addressed as ``you''.
+
+  A ``library'' means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The ``Library'', below, refers to any such software library or work
+which has been distributed under these terms.  A ``work based on the
+Library'' means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term ``modification''.)
+
+  ``Source code'' for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+@item
+You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+@item
+You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+@enumerate a
+@item
+The modified work must itself be a software library.
+
+@item
+You must cause the files modified to carry prominent notices
+stating that you changed the files and the date of any change.
+
+@item
+You must cause the whole of the work to be licensed at no
+charge to all third parties under the terms of this License.
+
+@item
+If a facility in the modified Library refers to a function or a
+table of data to be supplied by an application program that uses
+the facility, other than as an argument passed when the facility
+is invoked, then you must make a good faith effort to ensure that,
+in the event an application does not supply such function or
+table, the facility still operates, and performs whatever part of
+its purpose remains meaningful.
+
+(For example, a function in a library to compute square roots has
+a purpose that is entirely well-defined independent of the
+application.  Therefore, Subsection 2d requires that any
+application-supplied function or table used by this function must
+be optional: if the application does not supply it, the square
+root function must still compute square roots.)
+@end enumerate
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+@item
+You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+@item
+You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+@item
+A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a ``work that uses the Library''.  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a ``work that uses the Library'' with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a ``work that uses the
+library''.  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a ``work that uses the Library'' uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+@item
+As an exception to the Sections above, you may also combine or
+link a ``work that uses the Library'' with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+@enumerate a
+@item
+Accompany the work with the complete corresponding
+machine-readable source code for the Library including whatever
+changes were used in the work (which must be distributed under
+Sections 1 and 2 above); and, if the work is an executable linked
+with the Library, with the complete machine-readable ``work that
+uses the Library'', as object code and/or source code, so that the
+user can modify the Library and then relink to produce a modified
+executable containing the modified Library.  (It is understood
+that the user who changes the contents of definitions files in the
+Library will not necessarily be able to recompile the application
+to use the modified definitions.)
+
+@item
+Use a suitable shared library mechanism for linking with the Library.  A
+suitable mechanism is one that (1) uses at run time a copy of the
+library already present on the user's computer system, rather than
+copying library functions into the executable, and (2) will operate
+properly with a modified version of the library, if the user installs
+one, as long as the modified version is interface-compatible with the
+version that the work was made with.
+
+@item
+Accompany the work with a written offer, valid for at
+least three years, to give the same user the materials
+specified in Subsection 6a, above, for a charge no more
+than the cost of performing this distribution.
+
+@item
+If distribution of the work is made by offering access to copy
+from a designated place, offer equivalent access to copy the above
+specified materials from the same place.
+
+@item
+Verify that the user has already received a copy of these
+materials or that you have already sent this user a copy.
+@end enumerate
+
+  For an executable, the required form of the ``work that uses the
+Library'' must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies the
+executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+@item
+You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+@enumerate a
+@item
+Accompany the combined library with a copy of the same work
+based on the Library, uncombined with any other library
+facilities.  This must be distributed under the terms of the
+Sections above.
+
+@item
+Give prominent notice with the combined library of the fact
+that part of it is a work based on the Library, and explaining
+where to find the accompanying uncombined form of the same work.
+@end enumerate
+
+@item
+You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+@item
+You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+@item
+Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+@item
+If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+@item
+If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+@item
+The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+``any later version'', you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+@item
+If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+@iftex
+@heading NO WARRANTY
+@end iftex
+@ifinfo
+@center NO WARRANTY
+@end ifinfo
+
+@item
+BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY ``AS IS'' WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+@item
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+@end enumerate
+
+@iftex
+@heading END OF TERMS AND CONDITIONS
+@end iftex
+@ifinfo
+@center END OF TERMS AND CONDITIONS
+@end ifinfo
+
+@page
+@appendixsubsec How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+``copyright'' line and a pointer to where the full notice is found.
+
+@smallexample
+@var{one line to give the library's name and an idea of what it does.}
+Copyright (C) @var{year}  @var{name of author}
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.
+
+This library 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
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+USA.
+@end smallexample
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a ``copyright disclaimer'' for the library, if
+necessary.  Here is a sample; alter the names:
+
+@smallexample
+Yoyodyne, Inc., hereby disclaims all copyright interest in the library
+`Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+@var{signature of Ty Coon}, 1 April 1990
+Ty Coon, President of Vice
+@end smallexample
+
+That's all there is to it!
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/copysign.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/copysign.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/copysign.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/copysign.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,154 @@
+#include <ansidecl.h>
+
+#ifdef __IEEE_BIG_ENDIAN
+
+typedef union 
+{
+  double value;
+  struct 
+  {
+    unsigned int sign : 1;
+    unsigned int exponent: 11;
+    unsigned int fraction0:4;
+    unsigned int fraction1:16;
+    unsigned int fraction2:16;
+    unsigned int fraction3:16;
+    
+  } number;
+  struct 
+  {
+    unsigned int sign : 1;
+    unsigned int exponent: 11;
+    unsigned int quiet:1;
+    unsigned int function0:3;
+    unsigned int function1:16;
+    unsigned int function2:16;
+    unsigned int function3:16;
+  } nan;
+  struct 
+  {
+    unsigned long msw;
+    unsigned long lsw;
+  } parts;
+    long aslong[2];
+} __ieee_double_shape_type;
+
+#endif
+
+#ifdef __IEEE_LITTLE_ENDIAN
+
+typedef union 
+{
+  double value;
+  struct 
+  {
+#ifdef __SMALL_BITFIELDS
+    unsigned int fraction3:16;
+    unsigned int fraction2:16;
+    unsigned int fraction1:16;
+    unsigned int fraction0: 4;
+#else
+    unsigned int fraction1:32;
+    unsigned int fraction0:20;
+#endif
+    unsigned int exponent :11;
+    unsigned int sign     : 1;
+  } number;
+  struct 
+  {
+#ifdef __SMALL_BITFIELDS
+    unsigned int function3:16;
+    unsigned int function2:16;
+    unsigned int function1:16;
+    unsigned int function0:3;
+#else
+    unsigned int function1:32;
+    unsigned int function0:19;
+#endif
+    unsigned int quiet:1;
+    unsigned int exponent: 11;
+    unsigned int sign : 1;
+  } nan;
+  struct 
+  {
+    unsigned long lsw;
+    unsigned long msw;
+  } parts;
+
+  long aslong[2];
+
+} __ieee_double_shape_type;
+
+#endif
+
+#ifdef __IEEE_BIG_ENDIAN
+typedef union
+{
+  float value;
+  struct 
+  {
+    unsigned int sign : 1;
+    unsigned int exponent: 8;
+    unsigned int fraction0: 7;
+    unsigned int fraction1: 16;
+  } number;
+  struct 
+  {
+    unsigned int sign:1;
+    unsigned int exponent:8;
+    unsigned int quiet:1;
+    unsigned int function0:6;
+    unsigned int function1:16;
+  } nan;
+  long p1;
+  
+} __ieee_float_shape_type;
+#endif
+
+#ifdef __IEEE_LITTLE_ENDIAN
+typedef union
+{
+  float value;
+  struct 
+  {
+    unsigned int fraction0: 7;
+    unsigned int fraction1: 16;
+    unsigned int exponent: 8;
+    unsigned int sign : 1;
+  } number;
+  struct 
+  {
+    unsigned int function1:16;
+    unsigned int function0:6;
+    unsigned int quiet:1;
+    unsigned int exponent:8;
+    unsigned int sign:1;
+  } nan;
+  long p1;
+  
+} __ieee_float_shape_type;
+#endif
+
+#if defined(__IEEE_BIG_ENDIAN) || defined(__IEEE_LITTLE_ENDIAN)
+
+double
+copysign (double x, double y)
+{
+  __ieee_double_shape_type a,b;
+  b.value = y;  
+  a.value = x;
+  a.number.sign =b.number.sign;
+  return a.value;
+}
+
+#else
+
+double
+copysign (double x, double y)
+{
+  if ((x < 0 && y > 0) || (x > 0 && y < 0))
+    return -x;
+  return x;
+}
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/cp-demangle.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/cp-demangle.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/cp-demangle.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/cp-demangle.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,5470 @@
+/* Demangler for g++ V3 ABI.
+   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
+   Written by Ian Lance Taylor <ian@wasabisystems.com>.
+
+   This file is part of the libiberty library, which is part of GCC.
+
+   This file is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   In addition to the permissions in the GNU General Public License, the
+   Free Software Foundation gives you unlimited permission to link the
+   compiled version of this file into combinations with other programs,
+   and to distribute those combinations without any restriction coming
+   from the use of this file.  (The General Public License restrictions
+   do apply in other respects; for example, they cover modification of
+   the file, and distribution when not linked into a combined
+   executable.)
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. 
+*/
+
+/* This code implements a demangler for the g++ V3 ABI.  The ABI is
+   described on this web page:
+       http://www.codesourcery.com/cxx-abi/abi.html#mangling
+
+   This code was written while looking at the demangler written by
+   Alex Samuel <samuel@codesourcery.com>.
+
+   This code first pulls the mangled name apart into a list of
+   components, and then walks the list generating the demangled
+   name.
+
+   This file will normally define the following functions, q.v.:
+      char *cplus_demangle_v3(const char *mangled, int options)
+      char *java_demangle_v3(const char *mangled)
+      int cplus_demangle_v3_callback(const char *mangled, int options,
+                                     demangle_callbackref callback)
+      int java_demangle_v3_callback(const char *mangled,
+                                    demangle_callbackref callback)
+      enum gnu_v3_ctor_kinds is_gnu_v3_mangled_ctor (const char *name)
+      enum gnu_v3_dtor_kinds is_gnu_v3_mangled_dtor (const char *name)
+
+   Also, the interface to the component list is public, and defined in
+   demangle.h.  The interface consists of these types, which are
+   defined in demangle.h:
+      enum demangle_component_type
+      struct demangle_component
+      demangle_callbackref
+   and these functions defined in this file:
+      cplus_demangle_fill_name
+      cplus_demangle_fill_extended_operator
+      cplus_demangle_fill_ctor
+      cplus_demangle_fill_dtor
+      cplus_demangle_print
+      cplus_demangle_print_callback
+   and other functions defined in the file cp-demint.c.
+
+   This file also defines some other functions and variables which are
+   only to be used by the file cp-demint.c.
+
+   Preprocessor macros you can define while compiling this file:
+
+   IN_LIBGCC2
+      If defined, this file defines the following functions, q.v.:
+         char *__cxa_demangle (const char *mangled, char *buf, size_t *len,
+                               int *status)
+         int __gcclibcxx_demangle_callback (const char *,
+                                            void (*)
+                                              (const char *, size_t, void *),
+                                            void *)
+      instead of cplus_demangle_v3[_callback]() and
+      java_demangle_v3[_callback]().
+
+   IN_GLIBCPP_V3
+      If defined, this file defines only __cxa_demangle() and
+      __gcclibcxx_demangle_callback(), and no other publically visible
+      functions or variables.
+
+   STANDALONE_DEMANGLER
+      If defined, this file defines a main() function which demangles
+      any arguments, or, if none, demangles stdin.
+
+   CP_DEMANGLE_DEBUG
+      If defined, turns on debugging mode, which prints information on
+      stdout about the mangled string.  This is not generally useful.
+*/
+
+#if defined (_AIX) && !defined (__GNUC__)
+ #pragma alloca
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#else
+# ifndef alloca
+#  ifdef __GNUC__
+#   define alloca __builtin_alloca
+#  else
+extern char *alloca ();
+#  endif /* __GNUC__ */
+# endif /* alloca */
+#endif /* HAVE_ALLOCA_H */
+
+#include "ansidecl.h"
+#include "libiberty.h"
+#include "demangle.h"
+#include "cp-demangle.h"
+
+/* If IN_GLIBCPP_V3 is defined, some functions are made static.  We
+   also rename them via #define to avoid compiler errors when the
+   static definition conflicts with the extern declaration in a header
+   file.  */
+#ifdef IN_GLIBCPP_V3
+
+#define CP_STATIC_IF_GLIBCPP_V3 static
+
+#define cplus_demangle_fill_name d_fill_name
+static int d_fill_name (struct demangle_component *, const char *, int);
+
+#define cplus_demangle_fill_extended_operator d_fill_extended_operator
+static int
+d_fill_extended_operator (struct demangle_component *, int,
+                          struct demangle_component *);
+
+#define cplus_demangle_fill_ctor d_fill_ctor
+static int
+d_fill_ctor (struct demangle_component *, enum gnu_v3_ctor_kinds,
+             struct demangle_component *);
+
+#define cplus_demangle_fill_dtor d_fill_dtor
+static int
+d_fill_dtor (struct demangle_component *, enum gnu_v3_dtor_kinds,
+             struct demangle_component *);
+
+#define cplus_demangle_mangled_name d_mangled_name
+static struct demangle_component *d_mangled_name (struct d_info *, int);
+
+#define cplus_demangle_type d_type
+static struct demangle_component *d_type (struct d_info *);
+
+#define cplus_demangle_print d_print
+static char *d_print (int, const struct demangle_component *, int, size_t *);
+
+#define cplus_demangle_print_callback d_print_callback
+static int d_print_callback (int, const struct demangle_component *,
+                             demangle_callbackref, void *);
+
+#define cplus_demangle_init_info d_init_info
+static void d_init_info (const char *, int, size_t, struct d_info *);
+
+#else /* ! defined(IN_GLIBCPP_V3) */
+#define CP_STATIC_IF_GLIBCPP_V3
+#endif /* ! defined(IN_GLIBCPP_V3) */
+
+/* See if the compiler supports dynamic arrays.  */
+
+#ifdef __GNUC__
+#define CP_DYNAMIC_ARRAYS
+#else
+#ifdef __STDC__
+#ifdef __STDC_VERSION__
+#if __STDC_VERSION__ >= 199901L
+#define CP_DYNAMIC_ARRAYS
+#endif /* __STDC__VERSION >= 199901L */
+#endif /* defined (__STDC_VERSION__) */
+#endif /* defined (__STDC__) */
+#endif /* ! defined (__GNUC__) */
+
+/* We avoid pulling in the ctype tables, to prevent pulling in
+   additional unresolved symbols when this code is used in a library.
+   FIXME: Is this really a valid reason?  This comes from the original
+   V3 demangler code.
+
+   As of this writing this file has the following undefined references
+   when compiled with -DIN_GLIBCPP_V3: realloc, free, memcpy, strcpy,
+   strcat, strlen.  */
+
+#define IS_DIGIT(c) ((c) >= '0' && (c) <= '9')
+#define IS_UPPER(c) ((c) >= 'A' && (c) <= 'Z')
+#define IS_LOWER(c) ((c) >= 'a' && (c) <= 'z')
+
+/* The prefix prepended by GCC to an identifier represnting the
+   anonymous namespace.  */
+#define ANONYMOUS_NAMESPACE_PREFIX "_GLOBAL_"
+#define ANONYMOUS_NAMESPACE_PREFIX_LEN \
+  (sizeof (ANONYMOUS_NAMESPACE_PREFIX) - 1)
+
+/* Information we keep for the standard substitutions.  */
+
+struct d_standard_sub_info
+{
+  /* The code for this substitution.  */
+  char code;
+  /* The simple string it expands to.  */
+  const char *simple_expansion;
+  /* The length of the simple expansion.  */
+  int simple_len;
+  /* The results of a full, verbose, expansion.  This is used when
+     qualifying a constructor/destructor, or when in verbose mode.  */
+  const char *full_expansion;
+  /* The length of the full expansion.  */
+  int full_len;
+  /* What to set the last_name field of d_info to; NULL if we should
+     not set it.  This is only relevant when qualifying a
+     constructor/destructor.  */
+  const char *set_last_name;
+  /* The length of set_last_name.  */
+  int set_last_name_len;
+};
+
+/* Accessors for subtrees of struct demangle_component.  */
+
+#define d_left(dc) ((dc)->u.s_binary.left)
+#define d_right(dc) ((dc)->u.s_binary.right)
+
+/* A list of templates.  This is used while printing.  */
+
+struct d_print_template
+{
+  /* Next template on the list.  */
+  struct d_print_template *next;
+  /* This template.  */
+  const struct demangle_component *template_decl;
+};
+
+/* A list of type modifiers.  This is used while printing.  */
+
+struct d_print_mod
+{
+  /* Next modifier on the list.  These are in the reverse of the order
+     in which they appeared in the mangled string.  */
+  struct d_print_mod *next;
+  /* The modifier.  */
+  const struct demangle_component *mod;
+  /* Whether this modifier was printed.  */
+  int printed;
+  /* The list of templates which applies to this modifier.  */
+  struct d_print_template *templates;
+};
+
+/* We use these structures to hold information during printing.  */
+
+struct d_growable_string
+{
+  /* Buffer holding the result.  */
+  char *buf;
+  /* Current length of data in buffer.  */
+  size_t len;
+  /* Allocated size of buffer.  */
+  size_t alc;
+  /* Set to 1 if we had a memory allocation failure.  */
+  int allocation_failure;
+};
+
+enum { D_PRINT_BUFFER_LENGTH = 256 };
+struct d_print_info
+{
+  /* Fixed-length allocated buffer for demangled data, flushed to the
+     callback with a NUL termination once full.  */
+  char buf[D_PRINT_BUFFER_LENGTH];
+  /* Current length of data in buffer.  */
+  size_t len;
+  /* The last character printed, saved individually so that it survives
+     any buffer flush.  */
+  char last_char;
+  /* Callback function to handle demangled buffer flush.  */
+  demangle_callbackref callback;
+  /* Opaque callback argument.  */
+  void *opaque;
+  /* The current list of templates, if any.  */
+  struct d_print_template *templates;
+  /* The current list of modifiers (e.g., pointer, reference, etc.),
+     if any.  */
+  struct d_print_mod *modifiers;
+  /* Set to 1 if we saw a demangling error.  */
+  int demangle_failure;
+  /* The current index into any template argument packs we are using
+     for printing.  */
+  int pack_index;
+  /* Number of d_print_flush calls so far.  */
+  unsigned long int flush_count;
+};
+
+#ifdef CP_DEMANGLE_DEBUG
+static void d_dump (struct demangle_component *, int);
+#endif
+
+static struct demangle_component *
+d_make_empty (struct d_info *);
+
+static struct demangle_component *
+d_make_comp (struct d_info *, enum demangle_component_type,
+             struct demangle_component *,
+             struct demangle_component *);
+
+static struct demangle_component *
+d_make_name (struct d_info *, const char *, int);
+
+static struct demangle_component *
+d_make_demangle_mangled_name (struct d_info *, const char *);
+
+static struct demangle_component *
+d_make_builtin_type (struct d_info *,
+                     const struct demangle_builtin_type_info *);
+
+static struct demangle_component *
+d_make_operator (struct d_info *,
+                 const struct demangle_operator_info *);
+
+static struct demangle_component *
+d_make_extended_operator (struct d_info *, int,
+                          struct demangle_component *);
+
+static struct demangle_component *
+d_make_ctor (struct d_info *, enum gnu_v3_ctor_kinds,
+             struct demangle_component *);
+
+static struct demangle_component *
+d_make_dtor (struct d_info *, enum gnu_v3_dtor_kinds,
+             struct demangle_component *);
+
+static struct demangle_component *
+d_make_template_param (struct d_info *, long);
+
+static struct demangle_component *
+d_make_sub (struct d_info *, const char *, int);
+
+static int
+has_return_type (struct demangle_component *);
+
+static int
+is_ctor_dtor_or_conversion (struct demangle_component *);
+
+static struct demangle_component *d_encoding (struct d_info *, int);
+
+static struct demangle_component *d_name (struct d_info *);
+
+static struct demangle_component *d_nested_name (struct d_info *);
+
+static struct demangle_component *d_prefix (struct d_info *);
+
+static struct demangle_component *d_unqualified_name (struct d_info *);
+
+static struct demangle_component *d_source_name (struct d_info *);
+
+static long d_number (struct d_info *);
+
+static struct demangle_component *d_identifier (struct d_info *, int);
+
+static struct demangle_component *d_operator_name (struct d_info *);
+
+static struct demangle_component *d_special_name (struct d_info *);
+
+static int d_call_offset (struct d_info *, int);
+
+static struct demangle_component *d_ctor_dtor_name (struct d_info *);
+
+static struct demangle_component **
+d_cv_qualifiers (struct d_info *, struct demangle_component **, int);
+
+static struct demangle_component *
+d_function_type (struct d_info *);
+
+static struct demangle_component *
+d_bare_function_type (struct d_info *, int);
+
+static struct demangle_component *
+d_class_enum_type (struct d_info *);
+
+static struct demangle_component *d_array_type (struct d_info *);
+
+static struct demangle_component *d_vector_type (struct d_info *);
+
+static struct demangle_component *
+d_pointer_to_member_type (struct d_info *);
+
+static struct demangle_component *
+d_template_param (struct d_info *);
+
+static struct demangle_component *d_template_args (struct d_info *);
+
+static struct demangle_component *
+d_template_arg (struct d_info *);
+
+static struct demangle_component *d_expression (struct d_info *);
+
+static struct demangle_component *d_expr_primary (struct d_info *);
+
+static struct demangle_component *d_local_name (struct d_info *);
+
+static int d_discriminator (struct d_info *);
+
+static struct demangle_component *d_lambda (struct d_info *);
+
+static struct demangle_component *d_unnamed_type (struct d_info *);
+
+static int
+d_add_substitution (struct d_info *, struct demangle_component *);
+
+static struct demangle_component *d_substitution (struct d_info *, int);
+
+static void d_growable_string_init (struct d_growable_string *, size_t);
+
+static inline void
+d_growable_string_resize (struct d_growable_string *, size_t);
+
+static inline void
+d_growable_string_append_buffer (struct d_growable_string *,
+                                 const char *, size_t);
+static void
+d_growable_string_callback_adapter (const char *, size_t, void *);
+
+static void
+d_print_init (struct d_print_info *, demangle_callbackref, void *);
+
+static inline void d_print_error (struct d_print_info *);
+
+static inline int d_print_saw_error (struct d_print_info *);
+
+static inline void d_print_flush (struct d_print_info *);
+
+static inline void d_append_char (struct d_print_info *, char);
+
+static inline void d_append_buffer (struct d_print_info *,
+                                    const char *, size_t);
+
+static inline void d_append_string (struct d_print_info *, const char *);
+
+static inline char d_last_char (struct d_print_info *);
+
+static void
+d_print_comp (struct d_print_info *, int, const struct demangle_component *);
+
+static void
+d_print_java_identifier (struct d_print_info *, const char *, int);
+
+static void
+d_print_mod_list (struct d_print_info *, int, struct d_print_mod *, int);
+
+static void
+d_print_mod (struct d_print_info *, int, const struct demangle_component *);
+
+static void
+d_print_function_type (struct d_print_info *, int,
+                       const struct demangle_component *,
+                       struct d_print_mod *);
+
+static void
+d_print_array_type (struct d_print_info *, int,
+                    const struct demangle_component *,
+                    struct d_print_mod *);
+
+static void
+d_print_expr_op (struct d_print_info *, int, const struct demangle_component *);
+
+static void
+d_print_cast (struct d_print_info *, int, const struct demangle_component *);
+
+static int d_demangle_callback (const char *, int,
+                                demangle_callbackref, void *);
+static char *d_demangle (const char *, int, size_t *);
+
+#ifdef CP_DEMANGLE_DEBUG
+
+static void
+d_dump (struct demangle_component *dc, int indent)
+{
+  int i;
+
+  if (dc == NULL)
+    {
+      if (indent == 0)
+        printf ("failed demangling\n");
+      return;
+    }
+
+  for (i = 0; i < indent; ++i)
+    putchar (' ');
+
+  switch (dc->type)
+    {
+    case DEMANGLE_COMPONENT_NAME:
+      printf ("name '%.*s'\n", dc->u.s_name.len, dc->u.s_name.s);
+      return;
+    case DEMANGLE_COMPONENT_TEMPLATE_PARAM:
+      printf ("template parameter %ld\n", dc->u.s_number.number);
+      return;
+    case DEMANGLE_COMPONENT_CTOR:
+      printf ("constructor %d\n", (int) dc->u.s_ctor.kind);
+      d_dump (dc->u.s_ctor.name, indent + 2);
+      return;
+    case DEMANGLE_COMPONENT_DTOR:
+      printf ("destructor %d\n", (int) dc->u.s_dtor.kind);
+      d_dump (dc->u.s_dtor.name, indent + 2);
+      return;
+    case DEMANGLE_COMPONENT_SUB_STD:
+      printf ("standard substitution %s\n", dc->u.s_string.string);
+      return;
+    case DEMANGLE_COMPONENT_BUILTIN_TYPE:
+      printf ("builtin type %s\n", dc->u.s_builtin.type->name);
+      return;
+    case DEMANGLE_COMPONENT_OPERATOR:
+      printf ("operator %s\n", dc->u.s_operator.op->name);
+      return;
+    case DEMANGLE_COMPONENT_EXTENDED_OPERATOR:
+      printf ("extended operator with %d args\n",
+	      dc->u.s_extended_operator.args);
+      d_dump (dc->u.s_extended_operator.name, indent + 2);
+      return;
+
+    case DEMANGLE_COMPONENT_QUAL_NAME:
+      printf ("qualified name\n");
+      break;
+    case DEMANGLE_COMPONENT_LOCAL_NAME:
+      printf ("local name\n");
+      break;
+    case DEMANGLE_COMPONENT_TYPED_NAME:
+      printf ("typed name\n");
+      break;
+    case DEMANGLE_COMPONENT_TEMPLATE:
+      printf ("template\n");
+      break;
+    case DEMANGLE_COMPONENT_VTABLE:
+      printf ("vtable\n");
+      break;
+    case DEMANGLE_COMPONENT_VTT:
+      printf ("VTT\n");
+      break;
+    case DEMANGLE_COMPONENT_CONSTRUCTION_VTABLE:
+      printf ("construction vtable\n");
+      break;
+    case DEMANGLE_COMPONENT_TYPEINFO:
+      printf ("typeinfo\n");
+      break;
+    case DEMANGLE_COMPONENT_TYPEINFO_NAME:
+      printf ("typeinfo name\n");
+      break;
+    case DEMANGLE_COMPONENT_TYPEINFO_FN:
+      printf ("typeinfo function\n");
+      break;
+    case DEMANGLE_COMPONENT_THUNK:
+      printf ("thunk\n");
+      break;
+    case DEMANGLE_COMPONENT_VIRTUAL_THUNK:
+      printf ("virtual thunk\n");
+      break;
+    case DEMANGLE_COMPONENT_COVARIANT_THUNK:
+      printf ("covariant thunk\n");
+      break;
+    case DEMANGLE_COMPONENT_JAVA_CLASS:
+      printf ("java class\n");
+      break;
+    case DEMANGLE_COMPONENT_GUARD:
+      printf ("guard\n");
+      break;
+    case DEMANGLE_COMPONENT_REFTEMP:
+      printf ("reference temporary\n");
+      break;
+    case DEMANGLE_COMPONENT_HIDDEN_ALIAS:
+      printf ("hidden alias\n");
+      break;
+    case DEMANGLE_COMPONENT_RESTRICT:
+      printf ("restrict\n");
+      break;
+    case DEMANGLE_COMPONENT_VOLATILE:
+      printf ("volatile\n");
+      break;
+    case DEMANGLE_COMPONENT_CONST:
+      printf ("const\n");
+      break;
+    case DEMANGLE_COMPONENT_RESTRICT_THIS:
+      printf ("restrict this\n");
+      break;
+    case DEMANGLE_COMPONENT_VOLATILE_THIS:
+      printf ("volatile this\n");
+      break;
+    case DEMANGLE_COMPONENT_CONST_THIS:
+      printf ("const this\n");
+      break;
+    case DEMANGLE_COMPONENT_VENDOR_TYPE_QUAL:
+      printf ("vendor type qualifier\n");
+      break;
+    case DEMANGLE_COMPONENT_POINTER:
+      printf ("pointer\n");
+      break;
+    case DEMANGLE_COMPONENT_REFERENCE:
+      printf ("reference\n");
+      break;
+    case DEMANGLE_COMPONENT_RVALUE_REFERENCE:
+      printf ("rvalue reference\n");
+      break;
+    case DEMANGLE_COMPONENT_COMPLEX:
+      printf ("complex\n");
+      break;
+    case DEMANGLE_COMPONENT_IMAGINARY:
+      printf ("imaginary\n");
+      break;
+    case DEMANGLE_COMPONENT_VENDOR_TYPE:
+      printf ("vendor type\n");
+      break;
+    case DEMANGLE_COMPONENT_FUNCTION_TYPE:
+      printf ("function type\n");
+      break;
+    case DEMANGLE_COMPONENT_ARRAY_TYPE:
+      printf ("array type\n");
+      break;
+    case DEMANGLE_COMPONENT_PTRMEM_TYPE:
+      printf ("pointer to member type\n");
+      break;
+    case DEMANGLE_COMPONENT_FIXED_TYPE:
+      printf ("fixed-point type\n");
+      break;
+    case DEMANGLE_COMPONENT_ARGLIST:
+      printf ("argument list\n");
+      break;
+    case DEMANGLE_COMPONENT_TEMPLATE_ARGLIST:
+      printf ("template argument list\n");
+      break;
+    case DEMANGLE_COMPONENT_CAST:
+      printf ("cast\n");
+      break;
+    case DEMANGLE_COMPONENT_UNARY:
+      printf ("unary operator\n");
+      break;
+    case DEMANGLE_COMPONENT_BINARY:
+      printf ("binary operator\n");
+      break;
+    case DEMANGLE_COMPONENT_BINARY_ARGS:
+      printf ("binary operator arguments\n");
+      break;
+    case DEMANGLE_COMPONENT_TRINARY:
+      printf ("trinary operator\n");
+      break;
+    case DEMANGLE_COMPONENT_TRINARY_ARG1:
+      printf ("trinary operator arguments 1\n");
+      break;
+    case DEMANGLE_COMPONENT_TRINARY_ARG2:
+      printf ("trinary operator arguments 1\n");
+      break;
+    case DEMANGLE_COMPONENT_LITERAL:
+      printf ("literal\n");
+      break;
+    case DEMANGLE_COMPONENT_LITERAL_NEG:
+      printf ("negative literal\n");
+      break;
+    case DEMANGLE_COMPONENT_JAVA_RESOURCE:
+      printf ("java resource\n");
+      break;
+    case DEMANGLE_COMPONENT_COMPOUND_NAME:
+      printf ("compound name\n");
+      break;
+    case DEMANGLE_COMPONENT_CHARACTER:
+      printf ("character '%c'\n",  dc->u.s_character.character);
+      return;
+    case DEMANGLE_COMPONENT_DECLTYPE:
+      printf ("decltype\n");
+      break;
+    case DEMANGLE_COMPONENT_PACK_EXPANSION:
+      printf ("pack expansion\n");
+      break;
+    }
+
+  d_dump (d_left (dc), indent + 2);
+  d_dump (d_right (dc), indent + 2);
+}
+
+#endif /* CP_DEMANGLE_DEBUG */
+
+/* Fill in a DEMANGLE_COMPONENT_NAME.  */
+
+CP_STATIC_IF_GLIBCPP_V3
+int
+cplus_demangle_fill_name (struct demangle_component *p, const char *s, int len)
+{
+  if (p == NULL || s == NULL || len == 0)
+    return 0;
+  p->type = DEMANGLE_COMPONENT_NAME;
+  p->u.s_name.s = s;
+  p->u.s_name.len = len;
+  return 1;
+}
+
+/* Fill in a DEMANGLE_COMPONENT_EXTENDED_OPERATOR.  */
+
+CP_STATIC_IF_GLIBCPP_V3
+int
+cplus_demangle_fill_extended_operator (struct demangle_component *p, int args,
+                                       struct demangle_component *name)
+{
+  if (p == NULL || args < 0 || name == NULL)
+    return 0;
+  p->type = DEMANGLE_COMPONENT_EXTENDED_OPERATOR;
+  p->u.s_extended_operator.args = args;
+  p->u.s_extended_operator.name = name;
+  return 1;
+}
+
+/* Fill in a DEMANGLE_COMPONENT_CTOR.  */
+
+CP_STATIC_IF_GLIBCPP_V3
+int
+cplus_demangle_fill_ctor (struct demangle_component *p,
+                          enum gnu_v3_ctor_kinds kind,
+                          struct demangle_component *name)
+{
+  if (p == NULL
+      || name == NULL
+      || (int) kind < gnu_v3_complete_object_ctor
+      || (int) kind > gnu_v3_complete_object_allocating_ctor)
+    return 0;
+  p->type = DEMANGLE_COMPONENT_CTOR;
+  p->u.s_ctor.kind = kind;
+  p->u.s_ctor.name = name;
+  return 1;
+}
+
+/* Fill in a DEMANGLE_COMPONENT_DTOR.  */
+
+CP_STATIC_IF_GLIBCPP_V3
+int
+cplus_demangle_fill_dtor (struct demangle_component *p,
+                          enum gnu_v3_dtor_kinds kind,
+                          struct demangle_component *name)
+{
+  if (p == NULL
+      || name == NULL
+      || (int) kind < gnu_v3_deleting_dtor
+      || (int) kind > gnu_v3_base_object_dtor)
+    return 0;
+  p->type = DEMANGLE_COMPONENT_DTOR;
+  p->u.s_dtor.kind = kind;
+  p->u.s_dtor.name = name;
+  return 1;
+}
+
+/* Add a new component.  */
+
+static struct demangle_component *
+d_make_empty (struct d_info *di)
+{
+  struct demangle_component *p;
+
+  if (di->next_comp >= di->num_comps)
+    return NULL;
+  p = &di->comps[di->next_comp];
+  ++di->next_comp;
+  return p;
+}
+
+/* Add a new generic component.  */
+
+static struct demangle_component *
+d_make_comp (struct d_info *di, enum demangle_component_type type,
+             struct demangle_component *left,
+             struct demangle_component *right)
+{
+  struct demangle_component *p;
+
+  /* We check for errors here.  A typical error would be a NULL return
+     from a subroutine.  We catch those here, and return NULL
+     upward.  */
+  switch (type)
+    {
+      /* These types require two parameters.  */
+    case DEMANGLE_COMPONENT_QUAL_NAME:
+    case DEMANGLE_COMPONENT_LOCAL_NAME:
+    case DEMANGLE_COMPONENT_TYPED_NAME:
+    case DEMANGLE_COMPONENT_TEMPLATE:
+    case DEMANGLE_COMPONENT_CONSTRUCTION_VTABLE:
+    case DEMANGLE_COMPONENT_VENDOR_TYPE_QUAL:
+    case DEMANGLE_COMPONENT_PTRMEM_TYPE:
+    case DEMANGLE_COMPONENT_UNARY:
+    case DEMANGLE_COMPONENT_BINARY:
+    case DEMANGLE_COMPONENT_BINARY_ARGS:
+    case DEMANGLE_COMPONENT_TRINARY:
+    case DEMANGLE_COMPONENT_TRINARY_ARG1:
+    case DEMANGLE_COMPONENT_TRINARY_ARG2:
+    case DEMANGLE_COMPONENT_LITERAL:
+    case DEMANGLE_COMPONENT_LITERAL_NEG:
+    case DEMANGLE_COMPONENT_COMPOUND_NAME:
+    case DEMANGLE_COMPONENT_VECTOR_TYPE:
+      if (left == NULL || right == NULL)
+	return NULL;
+      break;
+
+      /* These types only require one parameter.  */
+    case DEMANGLE_COMPONENT_VTABLE:
+    case DEMANGLE_COMPONENT_VTT:
+    case DEMANGLE_COMPONENT_TYPEINFO:
+    case DEMANGLE_COMPONENT_TYPEINFO_NAME:
+    case DEMANGLE_COMPONENT_TYPEINFO_FN:
+    case DEMANGLE_COMPONENT_THUNK:
+    case DEMANGLE_COMPONENT_VIRTUAL_THUNK:
+    case DEMANGLE_COMPONENT_COVARIANT_THUNK:
+    case DEMANGLE_COMPONENT_JAVA_CLASS:
+    case DEMANGLE_COMPONENT_GUARD:
+    case DEMANGLE_COMPONENT_REFTEMP:
+    case DEMANGLE_COMPONENT_HIDDEN_ALIAS:
+    case DEMANGLE_COMPONENT_POINTER:
+    case DEMANGLE_COMPONENT_REFERENCE:
+    case DEMANGLE_COMPONENT_RVALUE_REFERENCE:
+    case DEMANGLE_COMPONENT_COMPLEX:
+    case DEMANGLE_COMPONENT_IMAGINARY:
+    case DEMANGLE_COMPONENT_VENDOR_TYPE:
+    case DEMANGLE_COMPONENT_CAST:
+    case DEMANGLE_COMPONENT_JAVA_RESOURCE:
+    case DEMANGLE_COMPONENT_DECLTYPE:
+    case DEMANGLE_COMPONENT_PACK_EXPANSION:
+    case DEMANGLE_COMPONENT_GLOBAL_CONSTRUCTORS:
+    case DEMANGLE_COMPONENT_GLOBAL_DESTRUCTORS:
+      if (left == NULL)
+	return NULL;
+      break;
+
+      /* This needs a right parameter, but the left parameter can be
+	 empty.  */
+    case DEMANGLE_COMPONENT_ARRAY_TYPE:
+      if (right == NULL)
+	return NULL;
+      break;
+
+      /* These are allowed to have no parameters--in some cases they
+	 will be filled in later.  */
+    case DEMANGLE_COMPONENT_FUNCTION_TYPE:
+    case DEMANGLE_COMPONENT_RESTRICT:
+    case DEMANGLE_COMPONENT_VOLATILE:
+    case DEMANGLE_COMPONENT_CONST:
+    case DEMANGLE_COMPONENT_RESTRICT_THIS:
+    case DEMANGLE_COMPONENT_VOLATILE_THIS:
+    case DEMANGLE_COMPONENT_CONST_THIS:
+    case DEMANGLE_COMPONENT_ARGLIST:
+    case DEMANGLE_COMPONENT_TEMPLATE_ARGLIST:
+      break;
+
+      /* Other types should not be seen here.  */
+    default:
+      return NULL;
+    }
+
+  p = d_make_empty (di);
+  if (p != NULL)
+    {
+      p->type = type;
+      p->u.s_binary.left = left;
+      p->u.s_binary.right = right;
+    }
+  return p;
+}
+
+/* Add a new demangle mangled name component.  */
+
+static struct demangle_component *
+d_make_demangle_mangled_name (struct d_info *di, const char *s)
+{
+  if (d_peek_char (di) != '_' || d_peek_next_char (di) != 'Z')
+    return d_make_name (di, s, strlen (s));
+  d_advance (di, 2);
+  return d_encoding (di, 0);
+}
+
+/* Add a new name component.  */
+
+static struct demangle_component *
+d_make_name (struct d_info *di, const char *s, int len)
+{
+  struct demangle_component *p;
+
+  p = d_make_empty (di);
+  if (! cplus_demangle_fill_name (p, s, len))
+    return NULL;
+  return p;
+}
+
+/* Add a new builtin type component.  */
+
+static struct demangle_component *
+d_make_builtin_type (struct d_info *di,
+                     const struct demangle_builtin_type_info *type)
+{
+  struct demangle_component *p;
+
+  if (type == NULL)
+    return NULL;
+  p = d_make_empty (di);
+  if (p != NULL)
+    {
+      p->type = DEMANGLE_COMPONENT_BUILTIN_TYPE;
+      p->u.s_builtin.type = type;
+    }
+  return p;
+}
+
+/* Add a new operator component.  */
+
+static struct demangle_component *
+d_make_operator (struct d_info *di, const struct demangle_operator_info *op)
+{
+  struct demangle_component *p;
+
+  p = d_make_empty (di);
+  if (p != NULL)
+    {
+      p->type = DEMANGLE_COMPONENT_OPERATOR;
+      p->u.s_operator.op = op;
+    }
+  return p;
+}
+
+/* Add a new extended operator component.  */
+
+static struct demangle_component *
+d_make_extended_operator (struct d_info *di, int args,
+                          struct demangle_component *name)
+{
+  struct demangle_component *p;
+
+  p = d_make_empty (di);
+  if (! cplus_demangle_fill_extended_operator (p, args, name))
+    return NULL;
+  return p;
+}
+
+static struct demangle_component *
+d_make_default_arg (struct d_info *di, int num,
+		    struct demangle_component *sub)
+{
+  struct demangle_component *p = d_make_empty (di);
+  if (p)
+    {
+      p->type = DEMANGLE_COMPONENT_DEFAULT_ARG;
+      p->u.s_unary_num.num = num;
+      p->u.s_unary_num.sub = sub;
+    }
+  return p;
+}
+
+/* Add a new constructor component.  */
+
+static struct demangle_component *
+d_make_ctor (struct d_info *di, enum gnu_v3_ctor_kinds kind,
+             struct demangle_component *name)
+{
+  struct demangle_component *p;
+
+  p = d_make_empty (di);
+  if (! cplus_demangle_fill_ctor (p, kind, name))
+    return NULL;
+  return p;
+}
+
+/* Add a new destructor component.  */
+
+static struct demangle_component *
+d_make_dtor (struct d_info *di, enum gnu_v3_dtor_kinds kind,
+             struct demangle_component *name)
+{
+  struct demangle_component *p;
+
+  p = d_make_empty (di);
+  if (! cplus_demangle_fill_dtor (p, kind, name))
+    return NULL;
+  return p;
+}
+
+/* Add a new template parameter.  */
+
+static struct demangle_component *
+d_make_template_param (struct d_info *di, long i)
+{
+  struct demangle_component *p;
+
+  p = d_make_empty (di);
+  if (p != NULL)
+    {
+      p->type = DEMANGLE_COMPONENT_TEMPLATE_PARAM;
+      p->u.s_number.number = i;
+    }
+  return p;
+}
+
+/* Add a new function parameter.  */
+
+static struct demangle_component *
+d_make_function_param (struct d_info *di, long i)
+{
+  struct demangle_component *p;
+
+  p = d_make_empty (di);
+  if (p != NULL)
+    {
+      p->type = DEMANGLE_COMPONENT_FUNCTION_PARAM;
+      p->u.s_number.number = i;
+    }
+  return p;
+}
+
+/* Add a new standard substitution component.  */
+
+static struct demangle_component *
+d_make_sub (struct d_info *di, const char *name, int len)
+{
+  struct demangle_component *p;
+
+  p = d_make_empty (di);
+  if (p != NULL)
+    {
+      p->type = DEMANGLE_COMPONENT_SUB_STD;
+      p->u.s_string.string = name;
+      p->u.s_string.len = len;
+    }
+  return p;
+}
+
+/* <mangled-name> ::= _Z <encoding>
+
+   TOP_LEVEL is non-zero when called at the top level.  */
+
+CP_STATIC_IF_GLIBCPP_V3
+struct demangle_component *
+cplus_demangle_mangled_name (struct d_info *di, int top_level)
+{
+  if (! d_check_char (di, '_')
+      /* Allow missing _ if not at toplevel to work around a
+	 bug in G++ abi-version=2 mangling; see the comment in
+	 write_template_arg.  */
+      && top_level)
+    return NULL;
+  if (! d_check_char (di, 'Z'))
+    return NULL;
+  return d_encoding (di, top_level);
+}
+
+/* Return whether a function should have a return type.  The argument
+   is the function name, which may be qualified in various ways.  The
+   rules are that template functions have return types with some
+   exceptions, function types which are not part of a function name
+   mangling have return types with some exceptions, and non-template
+   function names do not have return types.  The exceptions are that
+   constructors, destructors, and conversion operators do not have
+   return types.  */
+
+static int
+has_return_type (struct demangle_component *dc)
+{
+  if (dc == NULL)
+    return 0;
+  switch (dc->type)
+    {
+    default:
+      return 0;
+    case DEMANGLE_COMPONENT_TEMPLATE:
+      return ! is_ctor_dtor_or_conversion (d_left (dc));
+    case DEMANGLE_COMPONENT_RESTRICT_THIS:
+    case DEMANGLE_COMPONENT_VOLATILE_THIS:
+    case DEMANGLE_COMPONENT_CONST_THIS:
+      return has_return_type (d_left (dc));
+    }
+}
+
+/* Return whether a name is a constructor, a destructor, or a
+   conversion operator.  */
+
+static int
+is_ctor_dtor_or_conversion (struct demangle_component *dc)
+{
+  if (dc == NULL)
+    return 0;
+  switch (dc->type)
+    {
+    default:
+      return 0;
+    case DEMANGLE_COMPONENT_QUAL_NAME:
+    case DEMANGLE_COMPONENT_LOCAL_NAME:
+      return is_ctor_dtor_or_conversion (d_right (dc));
+    case DEMANGLE_COMPONENT_CTOR:
+    case DEMANGLE_COMPONENT_DTOR:
+    case DEMANGLE_COMPONENT_CAST:
+      return 1;
+    }
+}
+
+/* <encoding> ::= <(function) name> <bare-function-type>
+              ::= <(data) name>
+              ::= <special-name>
+
+   TOP_LEVEL is non-zero when called at the top level, in which case
+   if DMGL_PARAMS is not set we do not demangle the function
+   parameters.  We only set this at the top level, because otherwise
+   we would not correctly demangle names in local scopes.  */
+
+static struct demangle_component *
+d_encoding (struct d_info *di, int top_level)
+{
+  char peek = d_peek_char (di);
+
+  if (peek == 'G' || peek == 'T')
+    return d_special_name (di);
+  else
+    {
+      struct demangle_component *dc;
+
+      dc = d_name (di);
+
+      if (dc != NULL && top_level && (di->options & DMGL_PARAMS) == 0)
+	{
+	  /* Strip off any initial CV-qualifiers, as they really apply
+	     to the `this' parameter, and they were not output by the
+	     v2 demangler without DMGL_PARAMS.  */
+	  while (dc->type == DEMANGLE_COMPONENT_RESTRICT_THIS
+		 || dc->type == DEMANGLE_COMPONENT_VOLATILE_THIS
+		 || dc->type == DEMANGLE_COMPONENT_CONST_THIS)
+	    dc = d_left (dc);
+
+	  /* If the top level is a DEMANGLE_COMPONENT_LOCAL_NAME, then
+	     there may be CV-qualifiers on its right argument which
+	     really apply here; this happens when parsing a class
+	     which is local to a function.  */
+	  if (dc->type == DEMANGLE_COMPONENT_LOCAL_NAME)
+	    {
+	      struct demangle_component *dcr;
+
+	      dcr = d_right (dc);
+	      while (dcr->type == DEMANGLE_COMPONENT_RESTRICT_THIS
+		     || dcr->type == DEMANGLE_COMPONENT_VOLATILE_THIS
+		     || dcr->type == DEMANGLE_COMPONENT_CONST_THIS)
+		dcr = d_left (dcr);
+	      dc->u.s_binary.right = dcr;
+	    }
+
+	  return dc;
+	}
+
+      peek = d_peek_char (di);
+      if (dc == NULL || peek == '\0' || peek == 'E')
+	return dc;
+      return d_make_comp (di, DEMANGLE_COMPONENT_TYPED_NAME, dc,
+			  d_bare_function_type (di, has_return_type (dc)));
+    }
+}
+
+/* <name> ::= <nested-name>
+          ::= <unscoped-name>
+          ::= <unscoped-template-name> <template-args>
+          ::= <local-name>
+
+   <unscoped-name> ::= <unqualified-name>
+                   ::= St <unqualified-name>
+
+   <unscoped-template-name> ::= <unscoped-name>
+                            ::= <substitution>
+*/
+
+static struct demangle_component *
+d_name (struct d_info *di)
+{
+  char peek = d_peek_char (di);
+  struct demangle_component *dc;
+
+  switch (peek)
+    {
+    case 'N':
+      return d_nested_name (di);
+
+    case 'Z':
+      return d_local_name (di);
+
+    case 'L':
+    case 'U':
+      return d_unqualified_name (di);
+
+    case 'S':
+      {
+	int subst;
+
+	if (d_peek_next_char (di) != 't')
+	  {
+	    dc = d_substitution (di, 0);
+	    subst = 1;
+	  }
+	else
+	  {
+	    d_advance (di, 2);
+	    dc = d_make_comp (di, DEMANGLE_COMPONENT_QUAL_NAME,
+			      d_make_name (di, "std", 3),
+			      d_unqualified_name (di));
+	    di->expansion += 3;
+	    subst = 0;
+	  }
+
+	if (d_peek_char (di) != 'I')
+	  {
+	    /* The grammar does not permit this case to occur if we
+	       called d_substitution() above (i.e., subst == 1).  We
+	       don't bother to check.  */
+	  }
+	else
+	  {
+	    /* This is <template-args>, which means that we just saw
+	       <unscoped-template-name>, which is a substitution
+	       candidate if we didn't just get it from a
+	       substitution.  */
+	    if (! subst)
+	      {
+		if (! d_add_substitution (di, dc))
+		  return NULL;
+	      }
+	    dc = d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE, dc,
+			      d_template_args (di));
+	  }
+
+	return dc;
+      }
+
+    default:
+      dc = d_unqualified_name (di);
+      if (d_peek_char (di) == 'I')
+	{
+	  /* This is <template-args>, which means that we just saw
+	     <unscoped-template-name>, which is a substitution
+	     candidate.  */
+	  if (! d_add_substitution (di, dc))
+	    return NULL;
+	  dc = d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE, dc,
+			    d_template_args (di));
+	}
+      return dc;
+    }
+}
+
+/* <nested-name> ::= N [<CV-qualifiers>] <prefix> <unqualified-name> E
+                 ::= N [<CV-qualifiers>] <template-prefix> <template-args> E
+*/
+
+static struct demangle_component *
+d_nested_name (struct d_info *di)
+{
+  struct demangle_component *ret;
+  struct demangle_component **pret;
+
+  if (! d_check_char (di, 'N'))
+    return NULL;
+
+  pret = d_cv_qualifiers (di, &ret, 1);
+  if (pret == NULL)
+    return NULL;
+
+  *pret = d_prefix (di);
+  if (*pret == NULL)
+    return NULL;
+
+  if (! d_check_char (di, 'E'))
+    return NULL;
+
+  return ret;
+}
+
+/* <prefix> ::= <prefix> <unqualified-name>
+            ::= <template-prefix> <template-args>
+            ::= <template-param>
+            ::= <decltype>
+            ::=
+            ::= <substitution>
+
+   <template-prefix> ::= <prefix> <(template) unqualified-name>
+                     ::= <template-param>
+                     ::= <substitution>
+*/
+
+static struct demangle_component *
+d_prefix (struct d_info *di)
+{
+  struct demangle_component *ret = NULL;
+
+  while (1)
+    {
+      char peek;
+      enum demangle_component_type comb_type;
+      struct demangle_component *dc;
+
+      peek = d_peek_char (di);
+      if (peek == '\0')
+	return NULL;
+
+      /* The older code accepts a <local-name> here, but I don't see
+	 that in the grammar.  The older code does not accept a
+	 <template-param> here.  */
+
+      comb_type = DEMANGLE_COMPONENT_QUAL_NAME;
+      if (peek == 'D')
+	{
+	  char peek2 = d_peek_next_char (di);
+	  if (peek2 == 'T' || peek2 == 't')
+	    /* Decltype.  */
+	    dc = cplus_demangle_type (di);
+	  else
+	    /* Destructor name.  */
+	    dc = d_unqualified_name (di);
+	}
+      else if (IS_DIGIT (peek)
+	  || IS_LOWER (peek)
+	  || peek == 'C'
+	  || peek == 'U'
+	  || peek == 'L')
+	dc = d_unqualified_name (di);
+      else if (peek == 'S')
+	dc = d_substitution (di, 1);
+      else if (peek == 'I')
+	{
+	  if (ret == NULL)
+	    return NULL;
+	  comb_type = DEMANGLE_COMPONENT_TEMPLATE;
+	  dc = d_template_args (di);
+	}
+      else if (peek == 'T')
+	dc = d_template_param (di);
+      else if (peek == 'E')
+	return ret;
+      else if (peek == 'M')
+	{
+	  /* Initializer scope for a lambda.  We don't need to represent
+	     this; the normal code will just treat the variable as a type
+	     scope, which gives appropriate output.  */
+	  if (ret == NULL)
+	    return NULL;
+	  d_advance (di, 1);
+	  continue;
+	}
+      else
+	return NULL;
+
+      if (ret == NULL)
+	ret = dc;
+      else
+	ret = d_make_comp (di, comb_type, ret, dc);
+
+      if (peek != 'S' && d_peek_char (di) != 'E')
+	{
+	  if (! d_add_substitution (di, ret))
+	    return NULL;
+	}
+    }
+}
+
+/* <unqualified-name> ::= <operator-name>
+                      ::= <ctor-dtor-name>
+                      ::= <source-name>
+		      ::= <local-source-name> 
+
+    <local-source-name>	::= L <source-name> <discriminator>
+*/
+
+static struct demangle_component *
+d_unqualified_name (struct d_info *di)
+{
+  char peek;
+
+  peek = d_peek_char (di);
+  if (IS_DIGIT (peek))
+    return d_source_name (di);
+  else if (IS_LOWER (peek))
+    {
+      struct demangle_component *ret;
+
+      ret = d_operator_name (di);
+      if (ret != NULL && ret->type == DEMANGLE_COMPONENT_OPERATOR)
+	di->expansion += sizeof "operator" + ret->u.s_operator.op->len - 2;
+      return ret;
+    }
+  else if (peek == 'C' || peek == 'D')
+    return d_ctor_dtor_name (di);
+  else if (peek == 'L')
+    {
+      struct demangle_component * ret;
+
+      d_advance (di, 1);
+
+      ret = d_source_name (di);
+      if (ret == NULL)
+	return NULL;
+      if (! d_discriminator (di))
+	return NULL;
+      return ret;
+    }
+  else if (peek == 'U')
+    {
+      switch (d_peek_next_char (di))
+	{
+	case 'l':
+	  return d_lambda (di);
+	case 't':
+	  return d_unnamed_type (di);
+	default:
+	  return NULL;
+	}
+    }
+  else
+    return NULL;
+}
+
+/* <source-name> ::= <(positive length) number> <identifier>  */
+
+static struct demangle_component *
+d_source_name (struct d_info *di)
+{
+  long len;
+  struct demangle_component *ret;
+
+  len = d_number (di);
+  if (len <= 0)
+    return NULL;
+  ret = d_identifier (di, len);
+  di->last_name = ret;
+  return ret;
+}
+
+/* number ::= [n] <(non-negative decimal integer)>  */
+
+static long
+d_number (struct d_info *di)
+{
+  int negative;
+  char peek;
+  long ret;
+
+  negative = 0;
+  peek = d_peek_char (di);
+  if (peek == 'n')
+    {
+      negative = 1;
+      d_advance (di, 1);
+      peek = d_peek_char (di);
+    }
+
+  ret = 0;
+  while (1)
+    {
+      if (! IS_DIGIT (peek))
+	{
+	  if (negative)
+	    ret = - ret;
+	  return ret;
+	}
+      ret = ret * 10 + peek - '0';
+      d_advance (di, 1);
+      peek = d_peek_char (di);
+    }
+}
+
+/* Like d_number, but returns a demangle_component.  */
+
+static struct demangle_component *
+d_number_component (struct d_info *di)
+{
+  struct demangle_component *ret = d_make_empty (di);
+  if (ret)
+    {
+      ret->type = DEMANGLE_COMPONENT_NUMBER;
+      ret->u.s_number.number = d_number (di);
+    }
+  return ret;
+}
+
+/* identifier ::= <(unqualified source code identifier)>  */
+
+static struct demangle_component *
+d_identifier (struct d_info *di, int len)
+{
+  const char *name;
+
+  name = d_str (di);
+
+  if (di->send - name < len)
+    return NULL;
+
+  d_advance (di, len);
+
+  /* A Java mangled name may have a trailing '$' if it is a C++
+     keyword.  This '$' is not included in the length count.  We just
+     ignore the '$'.  */
+  if ((di->options & DMGL_JAVA) != 0
+      && d_peek_char (di) == '$')
+    d_advance (di, 1);
+
+  /* Look for something which looks like a gcc encoding of an
+     anonymous namespace, and replace it with a more user friendly
+     name.  */
+  if (len >= (int) ANONYMOUS_NAMESPACE_PREFIX_LEN + 2
+      && memcmp (name, ANONYMOUS_NAMESPACE_PREFIX,
+		 ANONYMOUS_NAMESPACE_PREFIX_LEN) == 0)
+    {
+      const char *s;
+
+      s = name + ANONYMOUS_NAMESPACE_PREFIX_LEN;
+      if ((*s == '.' || *s == '_' || *s == '$')
+	  && s[1] == 'N')
+	{
+	  di->expansion -= len - sizeof "(anonymous namespace)";
+	  return d_make_name (di, "(anonymous namespace)",
+			      sizeof "(anonymous namespace)" - 1);
+	}
+    }
+
+  return d_make_name (di, name, len);
+}
+
+/* operator_name ::= many different two character encodings.
+                 ::= cv <type>
+                 ::= v <digit> <source-name>
+*/
+
+#define NL(s) s, (sizeof s) - 1
+
+CP_STATIC_IF_GLIBCPP_V3
+const struct demangle_operator_info cplus_demangle_operators[] =
+{
+  { "aN", NL ("&="),        2 },
+  { "aS", NL ("="),         2 },
+  { "aa", NL ("&&"),        2 },
+  { "ad", NL ("&"),         1 },
+  { "an", NL ("&"),         2 },
+  { "cl", NL ("()"),        2 },
+  { "cm", NL (","),         2 },
+  { "co", NL ("~"),         1 },
+  { "dV", NL ("/="),        2 },
+  { "da", NL ("delete[]"),  1 },
+  { "de", NL ("*"),         1 },
+  { "dl", NL ("delete"),    1 },
+  { "dt", NL ("."),         2 },
+  { "dv", NL ("/"),         2 },
+  { "eO", NL ("^="),        2 },
+  { "eo", NL ("^"),         2 },
+  { "eq", NL ("=="),        2 },
+  { "ge", NL (">="),        2 },
+  { "gt", NL (">"),         2 },
+  { "ix", NL ("[]"),        2 },
+  { "lS", NL ("<<="),       2 },
+  { "le", NL ("<="),        2 },
+  { "ls", NL ("<<"),        2 },
+  { "lt", NL ("<"),         2 },
+  { "mI", NL ("-="),        2 },
+  { "mL", NL ("*="),        2 },
+  { "mi", NL ("-"),         2 },
+  { "ml", NL ("*"),         2 },
+  { "mm", NL ("--"),        1 },
+  { "na", NL ("new[]"),     1 },
+  { "ne", NL ("!="),        2 },
+  { "ng", NL ("-"),         1 },
+  { "nt", NL ("!"),         1 },
+  { "nw", NL ("new"),       1 },
+  { "oR", NL ("|="),        2 },
+  { "oo", NL ("||"),        2 },
+  { "or", NL ("|"),         2 },
+  { "pL", NL ("+="),        2 },
+  { "pl", NL ("+"),         2 },
+  { "pm", NL ("->*"),       2 },
+  { "pp", NL ("++"),        1 },
+  { "ps", NL ("+"),         1 },
+  { "pt", NL ("->"),        2 },
+  { "qu", NL ("?"),         3 },
+  { "rM", NL ("%="),        2 },
+  { "rS", NL (">>="),       2 },
+  { "rm", NL ("%"),         2 },
+  { "rs", NL (">>"),        2 },
+  { "st", NL ("sizeof "),   1 },
+  { "sz", NL ("sizeof "),   1 },
+  { "at", NL ("alignof "),   1 },
+  { "az", NL ("alignof "),   1 },
+  { NULL, NULL, 0,          0 }
+};
+
+static struct demangle_component *
+d_operator_name (struct d_info *di)
+{
+  char c1;
+  char c2;
+
+  c1 = d_next_char (di);
+  c2 = d_next_char (di);
+  if (c1 == 'v' && IS_DIGIT (c2))
+    return d_make_extended_operator (di, c2 - '0', d_source_name (di));
+  else if (c1 == 'c' && c2 == 'v')
+    return d_make_comp (di, DEMANGLE_COMPONENT_CAST,
+			cplus_demangle_type (di), NULL);
+  else
+    {
+      /* LOW is the inclusive lower bound.  */
+      int low = 0;
+      /* HIGH is the exclusive upper bound.  We subtract one to ignore
+	 the sentinel at the end of the array.  */
+      int high = ((sizeof (cplus_demangle_operators)
+		   / sizeof (cplus_demangle_operators[0]))
+		  - 1);
+
+      while (1)
+	{
+	  int i;
+	  const struct demangle_operator_info *p;
+
+	  i = low + (high - low) / 2;
+	  p = cplus_demangle_operators + i;
+
+	  if (c1 == p->code[0] && c2 == p->code[1])
+	    return d_make_operator (di, p);
+
+	  if (c1 < p->code[0] || (c1 == p->code[0] && c2 < p->code[1]))
+	    high = i;
+	  else
+	    low = i + 1;
+	  if (low == high)
+	    return NULL;
+	}
+    }
+}
+
+static struct demangle_component *
+d_make_character (struct d_info *di, int c)
+{
+  struct demangle_component *p;
+  p = d_make_empty (di);
+  if (p != NULL)
+    {
+      p->type = DEMANGLE_COMPONENT_CHARACTER;
+      p->u.s_character.character = c;
+    }
+  return p;
+}
+
+static struct demangle_component *
+d_java_resource (struct d_info *di)
+{
+  struct demangle_component *p = NULL;
+  struct demangle_component *next = NULL;
+  long len, i;
+  char c;
+  const char *str;
+
+  len = d_number (di);
+  if (len <= 1)
+    return NULL;
+
+  /* Eat the leading '_'.  */
+  if (d_next_char (di) != '_')
+    return NULL;
+  len--;
+
+  str = d_str (di);
+  i = 0;
+
+  while (len > 0)
+    {
+      c = str[i];
+      if (!c)
+	return NULL;
+
+      /* Each chunk is either a '$' escape...  */
+      if (c == '$')
+	{
+	  i++;
+	  switch (str[i++])
+	    {
+	    case 'S':
+	      c = '/';
+	      break;
+	    case '_':
+	      c = '.';
+	      break;
+	    case '$':
+	      c = '$';
+	      break;
+	    default:
+	      return NULL;
+	    }
+	  next = d_make_character (di, c);
+	  d_advance (di, i);
+	  str = d_str (di);
+	  len -= i;
+	  i = 0;
+	  if (next == NULL)
+	    return NULL;
+	}
+      /* ... or a sequence of characters.  */
+      else
+	{
+	  while (i < len && str[i] && str[i] != '$')
+	    i++;
+
+	  next = d_make_name (di, str, i);
+	  d_advance (di, i);
+	  str = d_str (di);
+	  len -= i;
+	  i = 0;
+	  if (next == NULL)
+	    return NULL;
+	}
+
+      if (p == NULL)
+	p = next;
+      else
+	{
+	  p = d_make_comp (di, DEMANGLE_COMPONENT_COMPOUND_NAME, p, next);
+	  if (p == NULL)
+	    return NULL;
+	}
+    }
+
+  p = d_make_comp (di, DEMANGLE_COMPONENT_JAVA_RESOURCE, p, NULL);
+
+  return p;
+}
+
+/* <special-name> ::= TV <type>
+                  ::= TT <type>
+                  ::= TI <type>
+                  ::= TS <type>
+                  ::= GV <(object) name>
+                  ::= T <call-offset> <(base) encoding>
+                  ::= Tc <call-offset> <call-offset> <(base) encoding>
+   Also g++ extensions:
+                  ::= TC <type> <(offset) number> _ <(base) type>
+                  ::= TF <type>
+                  ::= TJ <type>
+                  ::= GR <name>
+		  ::= GA <encoding>
+		  ::= Gr <resource name>
+*/
+
+static struct demangle_component *
+d_special_name (struct d_info *di)
+{
+  di->expansion += 20;
+  if (d_check_char (di, 'T'))
+    {
+      switch (d_next_char (di))
+	{
+	case 'V':
+	  di->expansion -= 5;
+	  return d_make_comp (di, DEMANGLE_COMPONENT_VTABLE,
+			      cplus_demangle_type (di), NULL);
+	case 'T':
+	  di->expansion -= 10;
+	  return d_make_comp (di, DEMANGLE_COMPONENT_VTT,
+			      cplus_demangle_type (di), NULL);
+	case 'I':
+	  return d_make_comp (di, DEMANGLE_COMPONENT_TYPEINFO,
+			      cplus_demangle_type (di), NULL);
+	case 'S':
+	  return d_make_comp (di, DEMANGLE_COMPONENT_TYPEINFO_NAME,
+			      cplus_demangle_type (di), NULL);
+
+	case 'h':
+	  if (! d_call_offset (di, 'h'))
+	    return NULL;
+	  return d_make_comp (di, DEMANGLE_COMPONENT_THUNK,
+			      d_encoding (di, 0), NULL);
+
+	case 'v':
+	  if (! d_call_offset (di, 'v'))
+	    return NULL;
+	  return d_make_comp (di, DEMANGLE_COMPONENT_VIRTUAL_THUNK,
+			      d_encoding (di, 0), NULL);
+
+	case 'c':
+	  if (! d_call_offset (di, '\0'))
+	    return NULL;
+	  if (! d_call_offset (di, '\0'))
+	    return NULL;
+	  return d_make_comp (di, DEMANGLE_COMPONENT_COVARIANT_THUNK,
+			      d_encoding (di, 0), NULL);
+
+	case 'C':
+	  {
+	    struct demangle_component *derived_type;
+	    long offset;
+	    struct demangle_component *base_type;
+
+	    derived_type = cplus_demangle_type (di);
+	    offset = d_number (di);
+	    if (offset < 0)
+	      return NULL;
+	    if (! d_check_char (di, '_'))
+	      return NULL;
+	    base_type = cplus_demangle_type (di);
+	    /* We don't display the offset.  FIXME: We should display
+	       it in verbose mode.  */
+	    di->expansion += 5;
+	    return d_make_comp (di, DEMANGLE_COMPONENT_CONSTRUCTION_VTABLE,
+				base_type, derived_type);
+	  }
+
+	case 'F':
+	  return d_make_comp (di, DEMANGLE_COMPONENT_TYPEINFO_FN,
+			      cplus_demangle_type (di), NULL);
+	case 'J':
+	  return d_make_comp (di, DEMANGLE_COMPONENT_JAVA_CLASS,
+			      cplus_demangle_type (di), NULL);
+
+	default:
+	  return NULL;
+	}
+    }
+  else if (d_check_char (di, 'G'))
+    {
+      switch (d_next_char (di))
+	{
+	case 'V':
+	  return d_make_comp (di, DEMANGLE_COMPONENT_GUARD, d_name (di), NULL);
+
+	case 'R':
+	  return d_make_comp (di, DEMANGLE_COMPONENT_REFTEMP, d_name (di),
+			      NULL);
+
+	case 'A':
+	  return d_make_comp (di, DEMANGLE_COMPONENT_HIDDEN_ALIAS,
+			      d_encoding (di, 0), NULL);
+
+	case 'r':
+	  return d_java_resource (di);
+
+	default:
+	  return NULL;
+	}
+    }
+  else
+    return NULL;
+}
+
+/* <call-offset> ::= h <nv-offset> _
+                 ::= v <v-offset> _
+
+   <nv-offset> ::= <(offset) number>
+
+   <v-offset> ::= <(offset) number> _ <(virtual offset) number>
+
+   The C parameter, if not '\0', is a character we just read which is
+   the start of the <call-offset>.
+
+   We don't display the offset information anywhere.  FIXME: We should
+   display it in verbose mode.  */
+
+static int
+d_call_offset (struct d_info *di, int c)
+{
+  if (c == '\0')
+    c = d_next_char (di);
+
+  if (c == 'h')
+    d_number (di);
+  else if (c == 'v')
+    {
+      d_number (di);
+      if (! d_check_char (di, '_'))
+	return 0;
+      d_number (di);
+    }
+  else
+    return 0;
+
+  if (! d_check_char (di, '_'))
+    return 0;
+
+  return 1;
+}
+
+/* <ctor-dtor-name> ::= C1
+                    ::= C2
+                    ::= C3
+                    ::= D0
+                    ::= D1
+                    ::= D2
+*/
+
+static struct demangle_component *
+d_ctor_dtor_name (struct d_info *di)
+{
+  if (di->last_name != NULL)
+    {
+      if (di->last_name->type == DEMANGLE_COMPONENT_NAME)
+	di->expansion += di->last_name->u.s_name.len;
+      else if (di->last_name->type == DEMANGLE_COMPONENT_SUB_STD)
+	di->expansion += di->last_name->u.s_string.len;
+    }
+  switch (d_peek_char (di))
+    {
+    case 'C':
+      {
+	enum gnu_v3_ctor_kinds kind;
+
+	switch (d_peek_next_char (di))
+	  {
+	  case '1':
+	    kind = gnu_v3_complete_object_ctor;
+	    break;
+	  case '2':
+	    kind = gnu_v3_base_object_ctor;
+	    break;
+	  case '3':
+	    kind = gnu_v3_complete_object_allocating_ctor;
+	    break;
+	  default:
+	    return NULL;
+	  }
+	d_advance (di, 2);
+	return d_make_ctor (di, kind, di->last_name);
+      }
+
+    case 'D':
+      {
+	enum gnu_v3_dtor_kinds kind;
+
+	switch (d_peek_next_char (di))
+	  {
+	  case '0':
+	    kind = gnu_v3_deleting_dtor;
+	    break;
+	  case '1':
+	    kind = gnu_v3_complete_object_dtor;
+	    break;
+	  case '2':
+	    kind = gnu_v3_base_object_dtor;
+	    break;
+	  default:
+	    return NULL;
+	  }
+	d_advance (di, 2);
+	return d_make_dtor (di, kind, di->last_name);
+      }
+
+    default:
+      return NULL;
+    }
+}
+
+/* <type> ::= <builtin-type>
+          ::= <function-type>
+          ::= <class-enum-type>
+          ::= <array-type>
+          ::= <pointer-to-member-type>
+          ::= <template-param>
+          ::= <template-template-param> <template-args>
+          ::= <substitution>
+          ::= <CV-qualifiers> <type>
+          ::= P <type>
+          ::= R <type>
+          ::= O <type> (C++0x)
+          ::= C <type>
+          ::= G <type>
+          ::= U <source-name> <type>
+
+   <builtin-type> ::= various one letter codes
+                  ::= u <source-name>
+*/
+
+CP_STATIC_IF_GLIBCPP_V3
+const struct demangle_builtin_type_info
+cplus_demangle_builtin_types[D_BUILTIN_TYPE_COUNT] =
+{
+  /* a */ { NL ("signed char"),	NL ("signed char"),	D_PRINT_DEFAULT },
+  /* b */ { NL ("bool"),	NL ("boolean"),		D_PRINT_BOOL },
+  /* c */ { NL ("char"),	NL ("byte"),		D_PRINT_DEFAULT },
+  /* d */ { NL ("double"),	NL ("double"),		D_PRINT_FLOAT },
+  /* e */ { NL ("long double"),	NL ("long double"),	D_PRINT_FLOAT },
+  /* f */ { NL ("float"),	NL ("float"),		D_PRINT_FLOAT },
+  /* g */ { NL ("__float128"),	NL ("__float128"),	D_PRINT_FLOAT },
+  /* h */ { NL ("unsigned char"), NL ("unsigned char"),	D_PRINT_DEFAULT },
+  /* i */ { NL ("int"),		NL ("int"),		D_PRINT_INT },
+  /* j */ { NL ("unsigned int"), NL ("unsigned"),	D_PRINT_UNSIGNED },
+  /* k */ { NULL, 0,		NULL, 0,		D_PRINT_DEFAULT },
+  /* l */ { NL ("long"),	NL ("long"),		D_PRINT_LONG },
+  /* m */ { NL ("unsigned long"), NL ("unsigned long"),	D_PRINT_UNSIGNED_LONG },
+  /* n */ { NL ("__int128"),	NL ("__int128"),	D_PRINT_DEFAULT },
+  /* o */ { NL ("unsigned __int128"), NL ("unsigned __int128"),
+	    D_PRINT_DEFAULT },
+  /* p */ { NULL, 0,		NULL, 0,		D_PRINT_DEFAULT },
+  /* q */ { NULL, 0,		NULL, 0,		D_PRINT_DEFAULT },
+  /* r */ { NULL, 0,		NULL, 0,		D_PRINT_DEFAULT },
+  /* s */ { NL ("short"),	NL ("short"),		D_PRINT_DEFAULT },
+  /* t */ { NL ("unsigned short"), NL ("unsigned short"), D_PRINT_DEFAULT },
+  /* u */ { NULL, 0,		NULL, 0,		D_PRINT_DEFAULT },
+  /* v */ { NL ("void"),	NL ("void"),		D_PRINT_VOID },
+  /* w */ { NL ("wchar_t"),	NL ("char"),		D_PRINT_DEFAULT },
+  /* x */ { NL ("long long"),	NL ("long"),		D_PRINT_LONG_LONG },
+  /* y */ { NL ("unsigned long long"), NL ("unsigned long long"),
+	    D_PRINT_UNSIGNED_LONG_LONG },
+  /* z */ { NL ("..."),		NL ("..."),		D_PRINT_DEFAULT },
+  /* 26 */ { NL ("decimal32"),	NL ("decimal32"),	D_PRINT_DEFAULT },
+  /* 27 */ { NL ("decimal64"),	NL ("decimal64"),	D_PRINT_DEFAULT },
+  /* 28 */ { NL ("decimal128"),	NL ("decimal128"),	D_PRINT_DEFAULT },
+  /* 29 */ { NL ("half"),	NL ("half"),		D_PRINT_FLOAT },
+  /* 30 */ { NL ("char16_t"),	NL ("char16_t"),	D_PRINT_DEFAULT },
+  /* 31 */ { NL ("char32_t"),	NL ("char32_t"),	D_PRINT_DEFAULT },
+  /* 32 */ { NL ("decltype(nullptr)"),	NL ("decltype(nullptr)"),
+	     D_PRINT_DEFAULT },
+};
+
+CP_STATIC_IF_GLIBCPP_V3
+struct demangle_component *
+cplus_demangle_type (struct d_info *di)
+{
+  char peek;
+  struct demangle_component *ret;
+  int can_subst;
+
+  /* The ABI specifies that when CV-qualifiers are used, the base type
+     is substitutable, and the fully qualified type is substitutable,
+     but the base type with a strict subset of the CV-qualifiers is
+     not substitutable.  The natural recursive implementation of the
+     CV-qualifiers would cause subsets to be substitutable, so instead
+     we pull them all off now.
+
+     FIXME: The ABI says that order-insensitive vendor qualifiers
+     should be handled in the same way, but we have no way to tell
+     which vendor qualifiers are order-insensitive and which are
+     order-sensitive.  So we just assume that they are all
+     order-sensitive.  g++ 3.4 supports only one vendor qualifier,
+     __vector, and it treats it as order-sensitive when mangling
+     names.  */
+
+  peek = d_peek_char (di);
+  if (peek == 'r' || peek == 'V' || peek == 'K')
+    {
+      struct demangle_component **pret;
+
+      pret = d_cv_qualifiers (di, &ret, 0);
+      if (pret == NULL)
+	return NULL;
+      *pret = cplus_demangle_type (di);
+      if (! *pret || ! d_add_substitution (di, ret))
+	return NULL;
+      return ret;
+    }
+
+  can_subst = 1;
+
+  switch (peek)
+    {
+    case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'g':
+    case 'h': case 'i': case 'j':           case 'l': case 'm': case 'n':
+    case 'o':                               case 's': case 't':
+    case 'v': case 'w': case 'x': case 'y': case 'z':
+      ret = d_make_builtin_type (di,
+				 &cplus_demangle_builtin_types[peek - 'a']);
+      di->expansion += ret->u.s_builtin.type->len;
+      can_subst = 0;
+      d_advance (di, 1);
+      break;
+
+    case 'u':
+      d_advance (di, 1);
+      ret = d_make_comp (di, DEMANGLE_COMPONENT_VENDOR_TYPE,
+			 d_source_name (di), NULL);
+      break;
+
+    case 'F':
+      ret = d_function_type (di);
+      break;
+
+    case '0': case '1': case '2': case '3': case '4':
+    case '5': case '6': case '7': case '8': case '9':
+    case 'N':
+    case 'Z':
+      ret = d_class_enum_type (di);
+      break;
+
+    case 'A':
+      ret = d_array_type (di);
+      break;
+
+    case 'M':
+      ret = d_pointer_to_member_type (di);
+      break;
+
+    case 'T':
+      ret = d_template_param (di);
+      if (d_peek_char (di) == 'I')
+	{
+	  /* This is <template-template-param> <template-args>.  The
+	     <template-template-param> part is a substitution
+	     candidate.  */
+	  if (! d_add_substitution (di, ret))
+	    return NULL;
+	  ret = d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE, ret,
+			     d_template_args (di));
+	}
+      break;
+
+    case 'S':
+      /* If this is a special substitution, then it is the start of
+	 <class-enum-type>.  */
+      {
+	char peek_next;
+
+	peek_next = d_peek_next_char (di);
+	if (IS_DIGIT (peek_next)
+	    || peek_next == '_'
+	    || IS_UPPER (peek_next))
+	  {
+	    ret = d_substitution (di, 0);
+	    /* The substituted name may have been a template name and
+	       may be followed by tepmlate args.  */
+	    if (d_peek_char (di) == 'I')
+	      ret = d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE, ret,
+				 d_template_args (di));
+	    else
+	      can_subst = 0;
+	  }
+	else
+	  {
+	    ret = d_class_enum_type (di);
+	    /* If the substitution was a complete type, then it is not
+	       a new substitution candidate.  However, if the
+	       substitution was followed by template arguments, then
+	       the whole thing is a substitution candidate.  */
+	    if (ret != NULL && ret->type == DEMANGLE_COMPONENT_SUB_STD)
+	      can_subst = 0;
+	  }
+      }
+      break;
+
+    case 'O':
+      d_advance (di, 1);
+      ret = d_make_comp (di, DEMANGLE_COMPONENT_RVALUE_REFERENCE,
+                         cplus_demangle_type (di), NULL);
+      break;
+
+    case 'P':
+      d_advance (di, 1);
+      ret = d_make_comp (di, DEMANGLE_COMPONENT_POINTER,
+			 cplus_demangle_type (di), NULL);
+      break;
+
+    case 'R':
+      d_advance (di, 1);
+      ret = d_make_comp (di, DEMANGLE_COMPONENT_REFERENCE,
+                         cplus_demangle_type (di), NULL);
+      break;
+
+    case 'C':
+      d_advance (di, 1);
+      ret = d_make_comp (di, DEMANGLE_COMPONENT_COMPLEX,
+			 cplus_demangle_type (di), NULL);
+      break;
+
+    case 'G':
+      d_advance (di, 1);
+      ret = d_make_comp (di, DEMANGLE_COMPONENT_IMAGINARY,
+			 cplus_demangle_type (di), NULL);
+      break;
+
+    case 'U':
+      d_advance (di, 1);
+      ret = d_source_name (di);
+      ret = d_make_comp (di, DEMANGLE_COMPONENT_VENDOR_TYPE_QUAL,
+			 cplus_demangle_type (di), ret);
+      break;
+
+    case 'D':
+      can_subst = 0;
+      d_advance (di, 1);
+      peek = d_next_char (di);
+      switch (peek)
+	{
+	case 'T':
+	case 't':
+	  /* decltype (expression) */
+	  ret = d_make_comp (di, DEMANGLE_COMPONENT_DECLTYPE,
+			     d_expression (di), NULL);
+	  if (ret && d_next_char (di) != 'E')
+	    ret = NULL;
+	  break;
+	  
+	case 'p':
+	  /* Pack expansion.  */
+	  ret = d_make_comp (di, DEMANGLE_COMPONENT_PACK_EXPANSION,
+			     cplus_demangle_type (di), NULL);
+	  break;
+	  
+	case 'f':
+	  /* 32-bit decimal floating point */
+	  ret = d_make_builtin_type (di, &cplus_demangle_builtin_types[26]);
+	  di->expansion += ret->u.s_builtin.type->len;
+	  break;
+	case 'd':
+	  /* 64-bit DFP */
+	  ret = d_make_builtin_type (di, &cplus_demangle_builtin_types[27]);
+	  di->expansion += ret->u.s_builtin.type->len;
+	  break;
+	case 'e':
+	  /* 128-bit DFP */
+	  ret = d_make_builtin_type (di, &cplus_demangle_builtin_types[28]);
+	  di->expansion += ret->u.s_builtin.type->len;
+	  break;
+	case 'h':
+	  /* 16-bit half-precision FP */
+	  ret = d_make_builtin_type (di, &cplus_demangle_builtin_types[29]);
+	  di->expansion += ret->u.s_builtin.type->len;
+	  break;
+	case 's':
+	  /* char16_t */
+	  ret = d_make_builtin_type (di, &cplus_demangle_builtin_types[30]);
+	  di->expansion += ret->u.s_builtin.type->len;
+	  break;
+	case 'i':
+	  /* char32_t */
+	  ret = d_make_builtin_type (di, &cplus_demangle_builtin_types[31]);
+	  di->expansion += ret->u.s_builtin.type->len;
+	  break;
+
+	case 'F':
+	  /* Fixed point types. DF<int bits><length><fract bits><sat>  */
+	  ret = d_make_empty (di);
+	  ret->type = DEMANGLE_COMPONENT_FIXED_TYPE;
+	  if ((ret->u.s_fixed.accum = IS_DIGIT (d_peek_char (di))))
+	    /* For demangling we don't care about the bits.  */
+	    d_number (di);
+	  ret->u.s_fixed.length = cplus_demangle_type (di);
+	  if (ret->u.s_fixed.length == NULL)
+	    return NULL;
+	  d_number (di);
+	  peek = d_next_char (di);
+	  ret->u.s_fixed.sat = (peek == 's');
+	  break;
+
+	case 'v':
+	  ret = d_vector_type (di);
+	  break;
+
+        case 'n':
+          /* decltype(nullptr) */
+	  ret = d_make_builtin_type (di, &cplus_demangle_builtin_types[32]);
+	  di->expansion += ret->u.s_builtin.type->len;
+	  break;
+
+	default:
+	  return NULL;
+	}
+      break;
+
+    default:
+      return NULL;
+    }
+
+  if (can_subst)
+    {
+      if (! d_add_substitution (di, ret))
+	return NULL;
+    }
+
+  return ret;
+}
+
+/* <CV-qualifiers> ::= [r] [V] [K]  */
+
+static struct demangle_component **
+d_cv_qualifiers (struct d_info *di,
+                 struct demangle_component **pret, int member_fn)
+{
+  char peek;
+
+  peek = d_peek_char (di);
+  while (peek == 'r' || peek == 'V' || peek == 'K')
+    {
+      enum demangle_component_type t;
+
+      d_advance (di, 1);
+      if (peek == 'r')
+	{
+	  t = (member_fn
+	       ? DEMANGLE_COMPONENT_RESTRICT_THIS
+	       : DEMANGLE_COMPONENT_RESTRICT);
+	  di->expansion += sizeof "restrict";
+	}
+      else if (peek == 'V')
+	{
+	  t = (member_fn
+	       ? DEMANGLE_COMPONENT_VOLATILE_THIS
+	       : DEMANGLE_COMPONENT_VOLATILE);
+	  di->expansion += sizeof "volatile";
+	}
+      else
+	{
+	  t = (member_fn
+	       ? DEMANGLE_COMPONENT_CONST_THIS
+	       : DEMANGLE_COMPONENT_CONST);
+	  di->expansion += sizeof "const";
+	}
+
+      *pret = d_make_comp (di, t, NULL, NULL);
+      if (*pret == NULL)
+	return NULL;
+      pret = &d_left (*pret);
+
+      peek = d_peek_char (di);
+    }
+
+  return pret;
+}
+
+/* <function-type> ::= F [Y] <bare-function-type> E  */
+
+static struct demangle_component *
+d_function_type (struct d_info *di)
+{
+  struct demangle_component *ret;
+
+  if (! d_check_char (di, 'F'))
+    return NULL;
+  if (d_peek_char (di) == 'Y')
+    {
+      /* Function has C linkage.  We don't print this information.
+	 FIXME: We should print it in verbose mode.  */
+      d_advance (di, 1);
+    }
+  ret = d_bare_function_type (di, 1);
+  if (! d_check_char (di, 'E'))
+    return NULL;
+  return ret;
+}
+
+/* <type>+ */
+
+static struct demangle_component *
+d_parmlist (struct d_info *di)
+{
+  struct demangle_component *tl;
+  struct demangle_component **ptl;
+
+  tl = NULL;
+  ptl = &tl;
+  while (1)
+    {
+      struct demangle_component *type;
+
+      char peek = d_peek_char (di);
+      if (peek == '\0' || peek == 'E')
+	break;
+      type = cplus_demangle_type (di);
+      if (type == NULL)
+	return NULL;
+      *ptl = d_make_comp (di, DEMANGLE_COMPONENT_ARGLIST, type, NULL);
+      if (*ptl == NULL)
+	return NULL;
+      ptl = &d_right (*ptl);
+    }
+
+  /* There should be at least one parameter type besides the optional
+     return type.  A function which takes no arguments will have a
+     single parameter type void.  */
+  if (tl == NULL)
+    return NULL;
+
+  /* If we have a single parameter type void, omit it.  */
+  if (d_right (tl) == NULL
+      && d_left (tl)->type == DEMANGLE_COMPONENT_BUILTIN_TYPE
+      && d_left (tl)->u.s_builtin.type->print == D_PRINT_VOID)
+    {
+      di->expansion -= d_left (tl)->u.s_builtin.type->len;
+      d_left (tl) = NULL;
+    }
+
+  return tl;
+}
+
+/* <bare-function-type> ::= [J]<type>+  */
+
+static struct demangle_component *
+d_bare_function_type (struct d_info *di, int has_return_type)
+{
+  struct demangle_component *return_type;
+  struct demangle_component *tl;
+  char peek;
+
+  /* Detect special qualifier indicating that the first argument
+     is the return type.  */
+  peek = d_peek_char (di);
+  if (peek == 'J')
+    {
+      d_advance (di, 1);
+      has_return_type = 1;
+    }
+
+  if (has_return_type)
+    {
+      return_type = cplus_demangle_type (di);
+      if (return_type == NULL)
+	return NULL;
+    }
+  else
+    return_type = NULL;
+
+  tl = d_parmlist (di);
+  if (tl == NULL)
+    return NULL;
+
+  return d_make_comp (di, DEMANGLE_COMPONENT_FUNCTION_TYPE,
+		      return_type, tl);
+}
+
+/* <class-enum-type> ::= <name>  */
+
+static struct demangle_component *
+d_class_enum_type (struct d_info *di)
+{
+  return d_name (di);
+}
+
+/* <array-type> ::= A <(positive dimension) number> _ <(element) type>
+                ::= A [<(dimension) expression>] _ <(element) type>
+*/
+
+static struct demangle_component *
+d_array_type (struct d_info *di)
+{
+  char peek;
+  struct demangle_component *dim;
+
+  if (! d_check_char (di, 'A'))
+    return NULL;
+
+  peek = d_peek_char (di);
+  if (peek == '_')
+    dim = NULL;
+  else if (IS_DIGIT (peek))
+    {
+      const char *s;
+
+      s = d_str (di);
+      do
+	{
+	  d_advance (di, 1);
+	  peek = d_peek_char (di);
+	}
+      while (IS_DIGIT (peek));
+      dim = d_make_name (di, s, d_str (di) - s);
+      if (dim == NULL)
+	return NULL;
+    }
+  else
+    {
+      dim = d_expression (di);
+      if (dim == NULL)
+	return NULL;
+    }
+
+  if (! d_check_char (di, '_'))
+    return NULL;
+
+  return d_make_comp (di, DEMANGLE_COMPONENT_ARRAY_TYPE, dim,
+		      cplus_demangle_type (di));
+}
+
+/* <vector-type> ::= Dv <number> _ <type>
+                 ::= Dv _ <expression> _ <type> */
+
+static struct demangle_component *
+d_vector_type (struct d_info *di)
+{
+  char peek;
+  struct demangle_component *dim;
+
+  peek = d_peek_char (di);
+  if (peek == '_')
+    {
+      d_advance (di, 1);
+      dim = d_expression (di);
+    }
+  else
+    dim = d_number_component (di);
+
+  if (dim == NULL)
+    return NULL;
+
+  if (! d_check_char (di, '_'))
+    return NULL;
+
+  return d_make_comp (di, DEMANGLE_COMPONENT_VECTOR_TYPE, dim,
+		      cplus_demangle_type (di));
+}
+
+/* <pointer-to-member-type> ::= M <(class) type> <(member) type>  */
+
+static struct demangle_component *
+d_pointer_to_member_type (struct d_info *di)
+{
+  struct demangle_component *cl;
+  struct demangle_component *mem;
+  struct demangle_component **pmem;
+
+  if (! d_check_char (di, 'M'))
+    return NULL;
+
+  cl = cplus_demangle_type (di);
+
+  /* The ABI specifies that any type can be a substitution source, and
+     that M is followed by two types, and that when a CV-qualified
+     type is seen both the base type and the CV-qualified types are
+     substitution sources.  The ABI also specifies that for a pointer
+     to a CV-qualified member function, the qualifiers are attached to
+     the second type.  Given the grammar, a plain reading of the ABI
+     suggests that both the CV-qualified member function and the
+     non-qualified member function are substitution sources.  However,
+     g++ does not work that way.  g++ treats only the CV-qualified
+     member function as a substitution source.  FIXME.  So to work
+     with g++, we need to pull off the CV-qualifiers here, in order to
+     avoid calling add_substitution() in cplus_demangle_type().  But
+     for a CV-qualified member which is not a function, g++ does
+     follow the ABI, so we need to handle that case here by calling
+     d_add_substitution ourselves.  */
+
+  pmem = d_cv_qualifiers (di, &mem, 1);
+  if (pmem == NULL)
+    return NULL;
+  *pmem = cplus_demangle_type (di);
+  if (*pmem == NULL)
+    return NULL;
+
+  if (pmem != &mem && (*pmem)->type != DEMANGLE_COMPONENT_FUNCTION_TYPE)
+    {
+      if (! d_add_substitution (di, mem))
+	return NULL;
+    }
+
+  return d_make_comp (di, DEMANGLE_COMPONENT_PTRMEM_TYPE, cl, mem);
+}
+
+/* <non-negative number> _ */
+
+static long
+d_compact_number (struct d_info *di)
+{
+  long num;
+  if (d_peek_char (di) == '_')
+    num = 0;
+  else if (d_peek_char (di) == 'n')
+    return -1;
+  else
+    num = d_number (di) + 1;
+
+  if (! d_check_char (di, '_'))
+    return -1;
+  return num;
+}
+
+/* <template-param> ::= T_
+                    ::= T <(parameter-2 non-negative) number> _
+*/
+
+static struct demangle_component *
+d_template_param (struct d_info *di)
+{
+  long param;
+
+  if (! d_check_char (di, 'T'))
+    return NULL;
+
+  param = d_compact_number (di);
+  if (param < 0)
+    return NULL;
+
+  ++di->did_subs;
+
+  return d_make_template_param (di, param);
+}
+
+/* <template-args> ::= I <template-arg>+ E  */
+
+static struct demangle_component *
+d_template_args (struct d_info *di)
+{
+  struct demangle_component *hold_last_name;
+  struct demangle_component *al;
+  struct demangle_component **pal;
+
+  /* Preserve the last name we saw--don't let the template arguments
+     clobber it, as that would give us the wrong name for a subsequent
+     constructor or destructor.  */
+  hold_last_name = di->last_name;
+
+  if (! d_check_char (di, 'I'))
+    return NULL;
+
+  if (d_peek_char (di) == 'E')
+    {
+      /* An argument pack can be empty.  */
+      d_advance (di, 1);
+      return d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE_ARGLIST, NULL, NULL);
+    }
+
+  al = NULL;
+  pal = &al;
+  while (1)
+    {
+      struct demangle_component *a;
+
+      a = d_template_arg (di);
+      if (a == NULL)
+	return NULL;
+
+      *pal = d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE_ARGLIST, a, NULL);
+      if (*pal == NULL)
+	return NULL;
+      pal = &d_right (*pal);
+
+      if (d_peek_char (di) == 'E')
+	{
+	  d_advance (di, 1);
+	  break;
+	}
+    }
+
+  di->last_name = hold_last_name;
+
+  return al;
+}
+
+/* <template-arg> ::= <type>
+                  ::= X <expression> E
+                  ::= <expr-primary>
+*/
+
+static struct demangle_component *
+d_template_arg (struct d_info *di)
+{
+  struct demangle_component *ret;
+
+  switch (d_peek_char (di))
+    {
+    case 'X':
+      d_advance (di, 1);
+      ret = d_expression (di);
+      if (! d_check_char (di, 'E'))
+	return NULL;
+      return ret;
+
+    case 'L':
+      return d_expr_primary (di);
+
+    case 'I':
+      /* An argument pack.  */
+      return d_template_args (di);
+
+    default:
+      return cplus_demangle_type (di);
+    }
+}
+
+/* Subroutine of <expression> ::= cl <expression>+ E */
+
+static struct demangle_component *
+d_exprlist (struct d_info *di)
+{
+  struct demangle_component *list = NULL;
+  struct demangle_component **p = &list;
+
+  if (d_peek_char (di) == 'E')
+    {
+      d_advance (di, 1);
+      return d_make_comp (di, DEMANGLE_COMPONENT_ARGLIST, NULL, NULL);
+    }
+
+  while (1)
+    {
+      struct demangle_component *arg = d_expression (di);
+      if (arg == NULL)
+	return NULL;
+
+      *p = d_make_comp (di, DEMANGLE_COMPONENT_ARGLIST, arg, NULL);
+      if (*p == NULL)
+	return NULL;
+      p = &d_right (*p);
+
+      if (d_peek_char (di) == 'E')
+	{
+	  d_advance (di, 1);
+	  break;
+	}
+    }
+
+  return list;
+}
+
+/* <expression> ::= <(unary) operator-name> <expression>
+                ::= <(binary) operator-name> <expression> <expression>
+                ::= <(trinary) operator-name> <expression> <expression> <expression>
+		::= cl <expression>+ E
+                ::= st <type>
+                ::= <template-param>
+                ::= sr <type> <unqualified-name>
+                ::= sr <type> <unqualified-name> <template-args>
+                ::= <expr-primary>
+*/
+
+static struct demangle_component *
+d_expression (struct d_info *di)
+{
+  char peek;
+
+  peek = d_peek_char (di);
+  if (peek == 'L')
+    return d_expr_primary (di);
+  else if (peek == 'T')
+    return d_template_param (di);
+  else if (peek == 's' && d_peek_next_char (di) == 'r')
+    {
+      struct demangle_component *type;
+      struct demangle_component *name;
+
+      d_advance (di, 2);
+      type = cplus_demangle_type (di);
+      name = d_unqualified_name (di);
+      if (d_peek_char (di) != 'I')
+	return d_make_comp (di, DEMANGLE_COMPONENT_QUAL_NAME, type, name);
+      else
+	return d_make_comp (di, DEMANGLE_COMPONENT_QUAL_NAME, type,
+			    d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE, name,
+					 d_template_args (di)));
+    }
+  else if (peek == 's' && d_peek_next_char (di) == 'p')
+    {
+      d_advance (di, 2);
+      return d_make_comp (di, DEMANGLE_COMPONENT_PACK_EXPANSION,
+			  d_expression (di), NULL);
+    }
+  else if (peek == 'f' && d_peek_next_char (di) == 'p')
+    {
+      /* Function parameter used in a late-specified return type.  */
+      int index;
+      d_advance (di, 2);
+      if (d_peek_char (di) == 'T')
+	{
+	  /* 'this' parameter.  */
+	  d_advance (di, 1);
+	  index = 0;
+	}
+      else
+	{
+	  index = d_compact_number (di) + 1;
+	  if (index == 0)
+	    return NULL;
+	}
+      return d_make_function_param (di, index);
+    }
+  else if (IS_DIGIT (peek)
+	   || (peek == 'o' && d_peek_next_char (di) == 'n'))
+    {
+      /* We can get an unqualified name as an expression in the case of
+         a dependent function call, i.e. decltype(f(t)).  */
+      struct demangle_component *name;
+
+      if (peek == 'o')
+	/* operator-function-id, i.e. operator+(t).  */
+	d_advance (di, 2);
+
+      name = d_unqualified_name (di);
+      if (name == NULL)
+	return NULL;
+      if (d_peek_char (di) == 'I')
+	return d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE, name,
+			    d_template_args (di));
+      else
+	return name;
+    }
+  else
+    {
+      struct demangle_component *op;
+      int args;
+
+      op = d_operator_name (di);
+      if (op == NULL)
+	return NULL;
+
+      if (op->type == DEMANGLE_COMPONENT_OPERATOR)
+	di->expansion += op->u.s_operator.op->len - 2;
+
+      if (op->type == DEMANGLE_COMPONENT_OPERATOR
+	  && strcmp (op->u.s_operator.op->code, "st") == 0)
+	return d_make_comp (di, DEMANGLE_COMPONENT_UNARY, op,
+			    cplus_demangle_type (di));
+
+      switch (op->type)
+	{
+	default:
+	  return NULL;
+	case DEMANGLE_COMPONENT_OPERATOR:
+	  args = op->u.s_operator.op->args;
+	  break;
+	case DEMANGLE_COMPONENT_EXTENDED_OPERATOR:
+	  args = op->u.s_extended_operator.args;
+	  break;
+	case DEMANGLE_COMPONENT_CAST:
+	  args = 1;
+	  break;
+	}
+
+      switch (args)
+	{
+	case 1:
+	  {
+	    struct demangle_component *operand;
+	    if (op->type == DEMANGLE_COMPONENT_CAST
+		&& d_check_char (di, '_'))
+	      operand = d_exprlist (di);
+	    else
+	      operand = d_expression (di);
+	    return d_make_comp (di, DEMANGLE_COMPONENT_UNARY, op,
+				operand);
+	  }
+	case 2:
+	  {
+	    struct demangle_component *left;
+	    struct demangle_component *right;
+	    const char *code = op->u.s_operator.op->code;
+
+	    left = d_expression (di);
+	    if (!strcmp (code, "cl"))
+	      right = d_exprlist (di);
+	    else if (!strcmp (code, "dt") || !strcmp (code, "pt"))
+	      {
+		right = d_unqualified_name (di);
+		if (d_peek_char (di) == 'I')
+		  right = d_make_comp (di, DEMANGLE_COMPONENT_TEMPLATE,
+				       right, d_template_args (di));
+	      }
+	    else
+	      right = d_expression (di);
+
+	    return d_make_comp (di, DEMANGLE_COMPONENT_BINARY, op,
+				d_make_comp (di,
+					     DEMANGLE_COMPONENT_BINARY_ARGS,
+					     left, right));
+	  }
+	case 3:
+	  {
+	    struct demangle_component *first;
+	    struct demangle_component *second;
+
+	    first = d_expression (di);
+	    second = d_expression (di);
+	    return d_make_comp (di, DEMANGLE_COMPONENT_TRINARY, op,
+				d_make_comp (di,
+					     DEMANGLE_COMPONENT_TRINARY_ARG1,
+					     first,
+					     d_make_comp (di,
+							  DEMANGLE_COMPONENT_TRINARY_ARG2,
+							  second,
+							  d_expression (di))));
+	  }
+	default:
+	  return NULL;
+	}
+    }
+}
+
+/* <expr-primary> ::= L <type> <(value) number> E
+                  ::= L <type> <(value) float> E
+                  ::= L <mangled-name> E
+*/
+
+static struct demangle_component *
+d_expr_primary (struct d_info *di)
+{
+  struct demangle_component *ret;
+
+  if (! d_check_char (di, 'L'))
+    return NULL;
+  if (d_peek_char (di) == '_'
+      /* Workaround for G++ bug; see comment in write_template_arg.  */
+      || d_peek_char (di) == 'Z')
+    ret = cplus_demangle_mangled_name (di, 0);
+  else
+    {
+      struct demangle_component *type;
+      enum demangle_component_type t;
+      const char *s;
+
+      type = cplus_demangle_type (di);
+      if (type == NULL)
+	return NULL;
+
+      /* If we have a type we know how to print, we aren't going to
+	 print the type name itself.  */
+      if (type->type == DEMANGLE_COMPONENT_BUILTIN_TYPE
+	  && type->u.s_builtin.type->print != D_PRINT_DEFAULT)
+	di->expansion -= type->u.s_builtin.type->len;
+
+      /* Rather than try to interpret the literal value, we just
+	 collect it as a string.  Note that it's possible to have a
+	 floating point literal here.  The ABI specifies that the
+	 format of such literals is machine independent.  That's fine,
+	 but what's not fine is that versions of g++ up to 3.2 with
+	 -fabi-version=1 used upper case letters in the hex constant,
+	 and dumped out gcc's internal representation.  That makes it
+	 hard to tell where the constant ends, and hard to dump the
+	 constant in any readable form anyhow.  We don't attempt to
+	 handle these cases.  */
+
+      t = DEMANGLE_COMPONENT_LITERAL;
+      if (d_peek_char (di) == 'n')
+	{
+	  t = DEMANGLE_COMPONENT_LITERAL_NEG;
+	  d_advance (di, 1);
+	}
+      s = d_str (di);
+      while (d_peek_char (di) != 'E')
+	{
+	  if (d_peek_char (di) == '\0')
+	    return NULL;
+	  d_advance (di, 1);
+	}
+      ret = d_make_comp (di, t, type, d_make_name (di, s, d_str (di) - s));
+    }
+  if (! d_check_char (di, 'E'))
+    return NULL;
+  return ret;
+}
+
+/* <local-name> ::= Z <(function) encoding> E <(entity) name> [<discriminator>]
+                ::= Z <(function) encoding> E s [<discriminator>]
+*/
+
+static struct demangle_component *
+d_local_name (struct d_info *di)
+{
+  struct demangle_component *function;
+
+  if (! d_check_char (di, 'Z'))
+    return NULL;
+
+  function = d_encoding (di, 0);
+
+  if (! d_check_char (di, 'E'))
+    return NULL;
+
+  if (d_peek_char (di) == 's')
+    {
+      d_advance (di, 1);
+      if (! d_discriminator (di))
+	return NULL;
+      return d_make_comp (di, DEMANGLE_COMPONENT_LOCAL_NAME, function,
+			  d_make_name (di, "string literal",
+				       sizeof "string literal" - 1));
+    }
+  else
+    {
+      struct demangle_component *name;
+      int num = -1;
+
+      if (d_peek_char (di) == 'd')
+	{
+	  /* Default argument scope: d <number> _.  */
+	  d_advance (di, 1);
+	  num = d_compact_number (di);
+	  if (num < 0)
+	    return NULL;
+	}
+
+      name = d_name (di);
+      if (name)
+	switch (name->type)
+	  {
+	    /* Lambdas and unnamed types have internal discriminators.  */
+	  case DEMANGLE_COMPONENT_LAMBDA:
+	  case DEMANGLE_COMPONENT_UNNAMED_TYPE:
+	    break;
+	  default:
+	    if (! d_discriminator (di))
+	      return NULL;
+	  }
+      if (num >= 0)
+	name = d_make_default_arg (di, num, name);
+      return d_make_comp (di, DEMANGLE_COMPONENT_LOCAL_NAME, function, name);
+    }
+}
+
+/* <discriminator> ::= _ <(non-negative) number>
+
+   We demangle the discriminator, but we don't print it out.  FIXME:
+   We should print it out in verbose mode.  */
+
+static int
+d_discriminator (struct d_info *di)
+{
+  long discrim;
+
+  if (d_peek_char (di) != '_')
+    return 1;
+  d_advance (di, 1);
+  discrim = d_number (di);
+  if (discrim < 0)
+    return 0;
+  return 1;
+}
+
+/* <closure-type-name> ::= Ul <lambda-sig> E [ <nonnegative number> ] _ */
+
+static struct demangle_component *
+d_lambda (struct d_info *di)
+{
+  struct demangle_component *tl;
+  struct demangle_component *ret;
+  int num;
+
+  if (! d_check_char (di, 'U'))
+    return NULL;
+  if (! d_check_char (di, 'l'))
+    return NULL;
+
+  tl = d_parmlist (di);
+  if (tl == NULL)
+    return NULL;
+
+  if (! d_check_char (di, 'E'))
+    return NULL;
+
+  num = d_compact_number (di);
+  if (num < 0)
+    return NULL;
+
+  ret = d_make_empty (di);
+  if (ret)
+    {
+      ret->type = DEMANGLE_COMPONENT_LAMBDA;
+      ret->u.s_unary_num.sub = tl;
+      ret->u.s_unary_num.num = num;
+    }
+
+  if (! d_add_substitution (di, ret))
+    return NULL;
+
+  return ret;
+}
+
+/* <unnamed-type-name> ::= Ut [ <nonnegative number> ] _ */
+
+static struct demangle_component *
+d_unnamed_type (struct d_info *di)
+{
+  struct demangle_component *ret;
+  long num;
+
+  if (! d_check_char (di, 'U'))
+    return NULL;
+  if (! d_check_char (di, 't'))
+    return NULL;
+
+  num = d_compact_number (di);
+  if (num < 0)
+    return NULL;
+
+  ret = d_make_empty (di);
+  if (ret)
+    {
+      ret->type = DEMANGLE_COMPONENT_UNNAMED_TYPE;
+      ret->u.s_number.number = num;
+    }
+
+  if (! d_add_substitution (di, ret))
+    return NULL;
+
+  return ret;
+}
+
+/* Add a new substitution.  */
+
+static int
+d_add_substitution (struct d_info *di, struct demangle_component *dc)
+{
+  if (dc == NULL)
+    return 0;
+  if (di->next_sub >= di->num_subs)
+    return 0;
+  di->subs[di->next_sub] = dc;
+  ++di->next_sub;
+  return 1;
+}
+
+/* <substitution> ::= S <seq-id> _
+                  ::= S_
+                  ::= St
+                  ::= Sa
+                  ::= Sb
+                  ::= Ss
+                  ::= Si
+                  ::= So
+                  ::= Sd
+
+   If PREFIX is non-zero, then this type is being used as a prefix in
+   a qualified name.  In this case, for the standard substitutions, we
+   need to check whether we are being used as a prefix for a
+   constructor or destructor, and return a full template name.
+   Otherwise we will get something like std::iostream::~iostream()
+   which does not correspond particularly well to any function which
+   actually appears in the source.
+*/
+
+static const struct d_standard_sub_info standard_subs[] =
+{
+  { 't', NL ("std"),
+    NL ("std"),
+    NULL, 0 },
+  { 'a', NL ("std::allocator"),
+    NL ("std::allocator"),
+    NL ("allocator") },
+  { 'b', NL ("std::basic_string"),
+    NL ("std::basic_string"),
+    NL ("basic_string") },
+  { 's', NL ("std::string"),
+    NL ("std::basic_string<char, std::char_traits<char>, std::allocator<char> >"),
+    NL ("basic_string") },
+  { 'i', NL ("std::istream"),
+    NL ("std::basic_istream<char, std::char_traits<char> >"),
+    NL ("basic_istream") },
+  { 'o', NL ("std::ostream"),
+    NL ("std::basic_ostream<char, std::char_traits<char> >"),
+    NL ("basic_ostream") },
+  { 'd', NL ("std::iostream"),
+    NL ("std::basic_iostream<char, std::char_traits<char> >"),
+    NL ("basic_iostream") }
+};
+
+static struct demangle_component *
+d_substitution (struct d_info *di, int prefix)
+{
+  char c;
+
+  if (! d_check_char (di, 'S'))
+    return NULL;
+
+  c = d_next_char (di);
+  if (c == '_' || IS_DIGIT (c) || IS_UPPER (c))
+    {
+      unsigned int id;
+
+      id = 0;
+      if (c != '_')
+	{
+	  do
+	    {
+	      unsigned int new_id;
+
+	      if (IS_DIGIT (c))
+		new_id = id * 36 + c - '0';
+	      else if (IS_UPPER (c))
+		new_id = id * 36 + c - 'A' + 10;
+	      else
+		return NULL;
+	      if (new_id < id)
+		return NULL;
+	      id = new_id;
+	      c = d_next_char (di);
+	    }
+	  while (c != '_');
+
+	  ++id;
+	}
+
+      if (id >= (unsigned int) di->next_sub)
+	return NULL;
+
+      ++di->did_subs;
+
+      return di->subs[id];
+    }
+  else
+    {
+      int verbose;
+      const struct d_standard_sub_info *p;
+      const struct d_standard_sub_info *pend;
+
+      verbose = (di->options & DMGL_VERBOSE) != 0;
+      if (! verbose && prefix)
+	{
+	  char peek;
+
+	  peek = d_peek_char (di);
+	  if (peek == 'C' || peek == 'D')
+	    verbose = 1;
+	}
+
+      pend = (&standard_subs[0]
+	      + sizeof standard_subs / sizeof standard_subs[0]);
+      for (p = &standard_subs[0]; p < pend; ++p)
+	{
+	  if (c == p->code)
+	    {
+	      const char *s;
+	      int len;
+
+	      if (p->set_last_name != NULL)
+		di->last_name = d_make_sub (di, p->set_last_name,
+					    p->set_last_name_len);
+	      if (verbose)
+		{
+		  s = p->full_expansion;
+		  len = p->full_len;
+		}
+	      else
+		{
+		  s = p->simple_expansion;
+		  len = p->simple_len;
+		}
+	      di->expansion += len;
+	      return d_make_sub (di, s, len);
+	    }
+	}
+
+      return NULL;
+    }
+}
+
+/* Initialize a growable string.  */
+
+static void
+d_growable_string_init (struct d_growable_string *dgs, size_t estimate)
+{
+  dgs->buf = NULL;
+  dgs->len = 0;
+  dgs->alc = 0;
+  dgs->allocation_failure = 0;
+
+  if (estimate > 0)
+    d_growable_string_resize (dgs, estimate);
+}
+
+/* Grow a growable string to a given size.  */
+
+static inline void
+d_growable_string_resize (struct d_growable_string *dgs, size_t need)
+{
+  size_t newalc;
+  char *newbuf;
+
+  if (dgs->allocation_failure)
+    return;
+
+  /* Start allocation at two bytes to avoid any possibility of confusion
+     with the special value of 1 used as a return in *palc to indicate
+     allocation failures.  */
+  newalc = dgs->alc > 0 ? dgs->alc : 2;
+  while (newalc < need)
+    newalc <<= 1;
+
+  newbuf = (char *) realloc (dgs->buf, newalc);
+  if (newbuf == NULL)
+    {
+      free (dgs->buf);
+      dgs->buf = NULL;
+      dgs->len = 0;
+      dgs->alc = 0;
+      dgs->allocation_failure = 1;
+      return;
+    }
+  dgs->buf = newbuf;
+  dgs->alc = newalc;
+}
+
+/* Append a buffer to a growable string.  */
+
+static inline void
+d_growable_string_append_buffer (struct d_growable_string *dgs,
+                                 const char *s, size_t l)
+{
+  size_t need;
+
+  need = dgs->len + l + 1;
+  if (need > dgs->alc)
+    d_growable_string_resize (dgs, need);
+
+  if (dgs->allocation_failure)
+    return;
+
+  memcpy (dgs->buf + dgs->len, s, l);
+  dgs->buf[dgs->len + l] = '\0';
+  dgs->len += l;
+}
+
+/* Bridge growable strings to the callback mechanism.  */
+
+static void
+d_growable_string_callback_adapter (const char *s, size_t l, void *opaque)
+{
+  struct d_growable_string *dgs = (struct d_growable_string*) opaque;
+
+  d_growable_string_append_buffer (dgs, s, l);
+}
+
+/* Initialize a print information structure.  */
+
+static void
+d_print_init (struct d_print_info *dpi, demangle_callbackref callback,
+	      void *opaque)
+{
+  dpi->len = 0;
+  dpi->last_char = '\0';
+  dpi->templates = NULL;
+  dpi->modifiers = NULL;
+  dpi->pack_index = 0;
+  dpi->flush_count = 0;
+
+  dpi->callback = callback;
+  dpi->opaque = opaque;
+
+  dpi->demangle_failure = 0;
+}
+
+/* Indicate that an error occurred during printing, and test for error.  */
+
+static inline void
+d_print_error (struct d_print_info *dpi)
+{
+  dpi->demangle_failure = 1;
+}
+
+static inline int
+d_print_saw_error (struct d_print_info *dpi)
+{
+  return dpi->demangle_failure != 0;
+}
+
+/* Flush buffered characters to the callback.  */
+
+static inline void
+d_print_flush (struct d_print_info *dpi)
+{
+  dpi->buf[dpi->len] = '\0';
+  dpi->callback (dpi->buf, dpi->len, dpi->opaque);
+  dpi->len = 0;
+  dpi->flush_count++;
+}
+
+/* Append characters and buffers for printing.  */
+
+static inline void
+d_append_char (struct d_print_info *dpi, char c)
+{
+  if (dpi->len == sizeof (dpi->buf) - 1)
+    d_print_flush (dpi);
+
+  dpi->buf[dpi->len++] = c;
+  dpi->last_char = c;
+}
+
+static inline void
+d_append_buffer (struct d_print_info *dpi, const char *s, size_t l)
+{
+  size_t i;
+
+  for (i = 0; i < l; i++)
+    d_append_char (dpi, s[i]);
+}
+
+static inline void
+d_append_string (struct d_print_info *dpi, const char *s)
+{
+  d_append_buffer (dpi, s, strlen (s));
+}
+
+static inline void
+d_append_num (struct d_print_info *dpi, long l)
+{
+  char buf[25];
+  sprintf (buf,"%ld", l);
+  d_append_string (dpi, buf);
+}
+
+static inline char
+d_last_char (struct d_print_info *dpi)
+{
+  return dpi->last_char;
+}
+
+/* Turn components into a human readable string.  OPTIONS is the
+   options bits passed to the demangler.  DC is the tree to print.
+   CALLBACK is a function to call to flush demangled string segments
+   as they fill the intermediate buffer, and OPAQUE is a generalized
+   callback argument.  On success, this returns 1.  On failure,
+   it returns 0, indicating a bad parse.  It does not use heap
+   memory to build an output string, so cannot encounter memory
+   allocation failure.  */
+
+CP_STATIC_IF_GLIBCPP_V3
+int
+cplus_demangle_print_callback (int options,
+                               const struct demangle_component *dc,
+                               demangle_callbackref callback, void *opaque)
+{
+  struct d_print_info dpi;
+
+  d_print_init (&dpi, callback, opaque);
+
+  d_print_comp (&dpi, options, dc);
+
+  d_print_flush (&dpi);
+
+  return ! d_print_saw_error (&dpi);
+}
+
+/* Turn components into a human readable string.  OPTIONS is the
+   options bits passed to the demangler.  DC is the tree to print.
+   ESTIMATE is a guess at the length of the result.  This returns a
+   string allocated by malloc, or NULL on error.  On success, this
+   sets *PALC to the size of the allocated buffer.  On failure, this
+   sets *PALC to 0 for a bad parse, or to 1 for a memory allocation
+   failure.  */
+
+CP_STATIC_IF_GLIBCPP_V3
+char *
+cplus_demangle_print (int options, const struct demangle_component *dc,
+                      int estimate, size_t *palc)
+{
+  struct d_growable_string dgs;
+
+  d_growable_string_init (&dgs, estimate);
+
+  if (! cplus_demangle_print_callback (options, dc,
+                                       d_growable_string_callback_adapter,
+                                       &dgs))
+    {
+      free (dgs.buf);
+      *palc = 0;
+      return NULL;
+    }
+
+  *palc = dgs.allocation_failure ? 1 : dgs.alc;
+  return dgs.buf;
+}
+
+/* Returns the I'th element of the template arglist ARGS, or NULL on
+   failure.  */
+
+static struct demangle_component *
+d_index_template_argument (struct demangle_component *args, int i)
+{
+  struct demangle_component *a;
+
+  for (a = args;
+       a != NULL;
+       a = d_right (a))
+    {
+      if (a->type != DEMANGLE_COMPONENT_TEMPLATE_ARGLIST)
+	return NULL;
+      if (i <= 0)
+	break;
+      --i;
+    }
+  if (i != 0 || a == NULL)
+    return NULL;
+
+  return d_left (a);
+}
+
+/* Returns the template argument from the current context indicated by DC,
+   which is a DEMANGLE_COMPONENT_TEMPLATE_PARAM, or NULL.  */
+
+static struct demangle_component *
+d_lookup_template_argument (struct d_print_info *dpi,
+			    const struct demangle_component *dc)
+{
+  if (dpi->templates == NULL)
+    {
+      d_print_error (dpi);
+      return NULL;
+    }
+	
+  return d_index_template_argument
+    (d_right (dpi->templates->template_decl),
+     dc->u.s_number.number);
+}
+
+/* Returns a template argument pack used in DC (any will do), or NULL.  */
+
+static struct demangle_component *
+d_find_pack (struct d_print_info *dpi,
+	     const struct demangle_component *dc)
+{
+  struct demangle_component *a;
+  if (dc == NULL)
+    return NULL;
+
+  switch (dc->type)
+    {
+    case DEMANGLE_COMPONENT_TEMPLATE_PARAM:
+      a = d_lookup_template_argument (dpi, dc);
+      if (a && a->type == DEMANGLE_COMPONENT_TEMPLATE_ARGLIST)
+	return a;
+      return NULL;
+
+    case DEMANGLE_COMPONENT_PACK_EXPANSION:
+      return NULL;
+      
+    case DEMANGLE_COMPONENT_LAMBDA:
+    case DEMANGLE_COMPONENT_NAME:
+    case DEMANGLE_COMPONENT_OPERATOR:
+    case DEMANGLE_COMPONENT_BUILTIN_TYPE:
+    case DEMANGLE_COMPONENT_SUB_STD:
+    case DEMANGLE_COMPONENT_CHARACTER:
+    case DEMANGLE_COMPONENT_FUNCTION_PARAM:
+      return NULL;
+
+    case DEMANGLE_COMPONENT_EXTENDED_OPERATOR:
+      return d_find_pack (dpi, dc->u.s_extended_operator.name);
+    case DEMANGLE_COMPONENT_CTOR:
+      return d_find_pack (dpi, dc->u.s_ctor.name);
+    case DEMANGLE_COMPONENT_DTOR:
+      return d_find_pack (dpi, dc->u.s_dtor.name);
+
+    default:
+      a = d_find_pack (dpi, d_left (dc));
+      if (a)
+	return a;
+      return d_find_pack (dpi, d_right (dc));
+    }
+}
+
+/* Returns the length of the template argument pack DC.  */
+
+static int
+d_pack_length (const struct demangle_component *dc)
+{
+  int count = 0;
+  while (dc && dc->type == DEMANGLE_COMPONENT_TEMPLATE_ARGLIST
+	 && d_left (dc) != NULL)
+    {
+      ++count;
+      dc = d_right (dc);
+    }
+  return count;
+}
+
+/* DC is a component of a mangled expression.  Print it, wrapped in parens
+   if needed.  */
+
+static void
+d_print_subexpr (struct d_print_info *dpi, int options,
+		 const struct demangle_component *dc)
+{
+  int simple = 0;
+  if (dc->type == DEMANGLE_COMPONENT_NAME
+      || dc->type == DEMANGLE_COMPONENT_FUNCTION_PARAM)
+    simple = 1;
+  if (!simple)
+    d_append_char (dpi, '(');
+  d_print_comp (dpi, options, dc);
+  if (!simple)
+    d_append_char (dpi, ')');
+}
+
+/* Subroutine to handle components.  */
+
+static void
+d_print_comp (struct d_print_info *dpi, int options,
+              const struct demangle_component *dc)
+{
+  /* Magic variable to let reference smashing skip over the next modifier
+     without needing to modify *dc.  */
+  const struct demangle_component *mod_inner = NULL;
+
+  if (dc == NULL)
+    {
+      d_print_error (dpi);
+      return;
+    }
+  if (d_print_saw_error (dpi))
+    return;
+
+  switch (dc->type)
+    {
+    case DEMANGLE_COMPONENT_NAME:
+      if ((options & DMGL_JAVA) == 0)
+	d_append_buffer (dpi, dc->u.s_name.s, dc->u.s_name.len);
+      else
+	d_print_java_identifier (dpi, dc->u.s_name.s, dc->u.s_name.len);
+      return;
+
+    case DEMANGLE_COMPONENT_QUAL_NAME:
+    case DEMANGLE_COMPONENT_LOCAL_NAME:
+      d_print_comp (dpi, options, d_left (dc));
+      if ((options & DMGL_JAVA) == 0)
+	d_append_string (dpi, "::");
+      else
+	d_append_char (dpi, '.');
+      d_print_comp (dpi, options, d_right (dc));
+      return;
+
+    case DEMANGLE_COMPONENT_TYPED_NAME:
+      {
+	struct d_print_mod *hold_modifiers;
+	struct demangle_component *typed_name;
+	struct d_print_mod adpm[4];
+	unsigned int i;
+	struct d_print_template dpt;
+
+	/* Pass the name down to the type so that it can be printed in
+	   the right place for the type.  We also have to pass down
+	   any CV-qualifiers, which apply to the this parameter.  */
+	hold_modifiers = dpi->modifiers;
+	dpi->modifiers = 0;
+	i = 0;
+	typed_name = d_left (dc);
+	while (typed_name != NULL)
+	  {
+	    if (i >= sizeof adpm / sizeof adpm[0])
+	      {
+		d_print_error (dpi);
+		return;
+	      }
+
+	    adpm[i].next = dpi->modifiers;
+	    dpi->modifiers = &adpm[i];
+	    adpm[i].mod = typed_name;
+	    adpm[i].printed = 0;
+	    adpm[i].templates = dpi->templates;
+	    ++i;
+
+	    if (typed_name->type != DEMANGLE_COMPONENT_RESTRICT_THIS
+		&& typed_name->type != DEMANGLE_COMPONENT_VOLATILE_THIS
+		&& typed_name->type != DEMANGLE_COMPONENT_CONST_THIS)
+	      break;
+
+	    typed_name = d_left (typed_name);
+	  }
+
+	if (typed_name == NULL)
+	  {
+	    d_print_error (dpi);
+	    return;
+	  }
+
+	/* If typed_name is a template, then it applies to the
+	   function type as well.  */
+	if (typed_name->type == DEMANGLE_COMPONENT_TEMPLATE)
+	  {
+	    dpt.next = dpi->templates;
+	    dpi->templates = &dpt;
+	    dpt.template_decl = typed_name;
+	  }
+
+	/* If typed_name is a DEMANGLE_COMPONENT_LOCAL_NAME, then
+	   there may be CV-qualifiers on its right argument which
+	   really apply here; this happens when parsing a class which
+	   is local to a function.  */
+	if (typed_name->type == DEMANGLE_COMPONENT_LOCAL_NAME)
+	  {
+	    struct demangle_component *local_name;
+
+	    local_name = d_right (typed_name);
+	    if (local_name->type == DEMANGLE_COMPONENT_DEFAULT_ARG)
+	      local_name = local_name->u.s_unary_num.sub;
+	    while (local_name->type == DEMANGLE_COMPONENT_RESTRICT_THIS
+		   || local_name->type == DEMANGLE_COMPONENT_VOLATILE_THIS
+		   || local_name->type == DEMANGLE_COMPONENT_CONST_THIS)
+	      {
+		if (i >= sizeof adpm / sizeof adpm[0])
+		  {
+		    d_print_error (dpi);
+		    return;
+		  }
+
+		adpm[i] = adpm[i - 1];
+		adpm[i].next = &adpm[i - 1];
+		dpi->modifiers = &adpm[i];
+
+		adpm[i - 1].mod = local_name;
+		adpm[i - 1].printed = 0;
+		adpm[i - 1].templates = dpi->templates;
+		++i;
+
+		local_name = d_left (local_name);
+	      }
+	  }
+
+	d_print_comp (dpi, options, d_right (dc));
+
+	if (typed_name->type == DEMANGLE_COMPONENT_TEMPLATE)
+	  dpi->templates = dpt.next;
+
+	/* If the modifiers didn't get printed by the type, print them
+	   now.  */
+	while (i > 0)
+	  {
+	    --i;
+	    if (! adpm[i].printed)
+	      {
+		d_append_char (dpi, ' ');
+		d_print_mod (dpi, options, adpm[i].mod);
+	      }
+	  }
+
+	dpi->modifiers = hold_modifiers;
+
+	return;
+      }
+
+    case DEMANGLE_COMPONENT_TEMPLATE:
+      {
+	struct d_print_mod *hold_dpm;
+	struct demangle_component *dcl;
+
+	/* Don't push modifiers into a template definition.  Doing so
+	   could give the wrong definition for a template argument.
+	   Instead, treat the template essentially as a name.  */
+
+	hold_dpm = dpi->modifiers;
+	dpi->modifiers = NULL;
+
+        dcl = d_left (dc);
+
+        if ((options & DMGL_JAVA) != 0
+            && dcl->type == DEMANGLE_COMPONENT_NAME
+            && dcl->u.s_name.len == 6
+            && strncmp (dcl->u.s_name.s, "JArray", 6) == 0)
+          {
+            /* Special-case Java arrays, so that JArray<TYPE> appears
+               instead as TYPE[].  */
+
+            d_print_comp (dpi, options, d_right (dc));
+            d_append_string (dpi, "[]");
+          }
+        else
+          {
+	    d_print_comp (dpi, options, dcl);
+	    if (d_last_char (dpi) == '<')
+	      d_append_char (dpi, ' ');
+	    d_append_char (dpi, '<');
+	    d_print_comp (dpi, options, d_right (dc));
+	    /* Avoid generating two consecutive '>' characters, to avoid
+	       the C++ syntactic ambiguity.  */
+	    if (d_last_char (dpi) == '>')
+	      d_append_char (dpi, ' ');
+	    d_append_char (dpi, '>');
+          }
+
+	dpi->modifiers = hold_dpm;
+
+	return;
+      }
+
+    case DEMANGLE_COMPONENT_TEMPLATE_PARAM:
+      {
+	struct d_print_template *hold_dpt;
+	struct demangle_component *a = d_lookup_template_argument (dpi, dc);
+
+	if (a && a->type == DEMANGLE_COMPONENT_TEMPLATE_ARGLIST)
+	  a = d_index_template_argument (a, dpi->pack_index);
+
+	if (a == NULL)
+	  {
+	    d_print_error (dpi);
+	    return;
+	  }
+
+	/* While processing this parameter, we need to pop the list of
+	   templates.  This is because the template parameter may
+	   itself be a reference to a parameter of an outer
+	   template.  */
+
+	hold_dpt = dpi->templates;
+	dpi->templates = hold_dpt->next;
+
+	d_print_comp (dpi, options, a);
+
+	dpi->templates = hold_dpt;
+
+	return;
+      }
+
+    case DEMANGLE_COMPONENT_CTOR:
+      d_print_comp (dpi, options, dc->u.s_ctor.name);
+      return;
+
+    case DEMANGLE_COMPONENT_DTOR:
+      d_append_char (dpi, '~');
+      d_print_comp (dpi, options, dc->u.s_dtor.name);
+      return;
+
+    case DEMANGLE_COMPONENT_VTABLE:
+      d_append_string (dpi, "vtable for ");
+      d_print_comp (dpi, options, d_left (dc));
+      return;
+
+    case DEMANGLE_COMPONENT_VTT:
+      d_append_string (dpi, "VTT for ");
+      d_print_comp (dpi, options, d_left (dc));
+      return;
+
+    case DEMANGLE_COMPONENT_CONSTRUCTION_VTABLE:
+      d_append_string (dpi, "construction vtable for ");
+      d_print_comp (dpi, options, d_left (dc));
+      d_append_string (dpi, "-in-");
+      d_print_comp (dpi, options, d_right (dc));
+      return;
+
+    case DEMANGLE_COMPONENT_TYPEINFO:
+      d_append_string (dpi, "typeinfo for ");
+      d_print_comp (dpi, options, d_left (dc));
+      return;
+
+    case DEMANGLE_COMPONENT_TYPEINFO_NAME:
+      d_append_string (dpi, "typeinfo name for ");
+      d_print_comp (dpi, options, d_left (dc));
+      return;
+
+    case DEMANGLE_COMPONENT_TYPEINFO_FN:
+      d_append_string (dpi, "typeinfo fn for ");
+      d_print_comp (dpi, options, d_left (dc));
+      return;
+
+    case DEMANGLE_COMPONENT_THUNK:
+      d_append_string (dpi, "non-virtual thunk to ");
+      d_print_comp (dpi, options, d_left (dc));
+      return;
+
+    case DEMANGLE_COMPONENT_VIRTUAL_THUNK:
+      d_append_string (dpi, "virtual thunk to ");
+      d_print_comp (dpi, options, d_left (dc));
+      return;
+
+    case DEMANGLE_COMPONENT_COVARIANT_THUNK:
+      d_append_string (dpi, "covariant return thunk to ");
+      d_print_comp (dpi, options, d_left (dc));
+      return;
+
+    case DEMANGLE_COMPONENT_JAVA_CLASS:
+      d_append_string (dpi, "java Class for ");
+      d_print_comp (dpi, options, d_left (dc));
+      return;
+
+    case DEMANGLE_COMPONENT_GUARD:
+      d_append_string (dpi, "guard variable for ");
+      d_print_comp (dpi, options, d_left (dc));
+      return;
+
+    case DEMANGLE_COMPONENT_REFTEMP:
+      d_append_string (dpi, "reference temporary for ");
+      d_print_comp (dpi, options, d_left (dc));
+      return;
+
+    case DEMANGLE_COMPONENT_HIDDEN_ALIAS:
+      d_append_string (dpi, "hidden alias for ");
+      d_print_comp (dpi, options, d_left (dc));
+      return;
+
+    case DEMANGLE_COMPONENT_SUB_STD:
+      d_append_buffer (dpi, dc->u.s_string.string, dc->u.s_string.len);
+      return;
+
+    case DEMANGLE_COMPONENT_RESTRICT:
+    case DEMANGLE_COMPONENT_VOLATILE:
+    case DEMANGLE_COMPONENT_CONST:
+      {
+	struct d_print_mod *pdpm;
+
+	/* When printing arrays, it's possible to have cases where the
+	   same CV-qualifier gets pushed on the stack multiple times.
+	   We only need to print it once.  */
+
+	for (pdpm = dpi->modifiers; pdpm != NULL; pdpm = pdpm->next)
+	  {
+	    if (! pdpm->printed)
+	      {
+		if (pdpm->mod->type != DEMANGLE_COMPONENT_RESTRICT
+		    && pdpm->mod->type != DEMANGLE_COMPONENT_VOLATILE
+		    && pdpm->mod->type != DEMANGLE_COMPONENT_CONST)
+		  break;
+		if (pdpm->mod->type == dc->type)
+		  {
+		    d_print_comp (dpi, options, d_left (dc));
+		    return;
+		  }
+	      }
+	  }
+      }
+      goto modifier;
+
+    case DEMANGLE_COMPONENT_REFERENCE:
+    case DEMANGLE_COMPONENT_RVALUE_REFERENCE:
+      {
+	/* Handle reference smashing: & + && = &.  */
+	const struct demangle_component *sub = d_left (dc);
+	if (sub->type == DEMANGLE_COMPONENT_TEMPLATE_PARAM)
+	  {
+	    struct demangle_component *a = d_lookup_template_argument (dpi, sub);
+	    if (a && a->type == DEMANGLE_COMPONENT_TEMPLATE_ARGLIST)
+	      a = d_index_template_argument (a, dpi->pack_index);
+
+	    if (a == NULL)
+	      {
+		d_print_error (dpi);
+		return;
+	      }
+
+	    sub = a;
+	  }
+
+	if (sub->type == DEMANGLE_COMPONENT_REFERENCE
+	    || sub->type == dc->type)
+	  dc = sub;
+	else if (sub->type == DEMANGLE_COMPONENT_RVALUE_REFERENCE)
+	  mod_inner = d_left (sub);
+      }
+      /* Fall through.  */
+
+    case DEMANGLE_COMPONENT_RESTRICT_THIS:
+    case DEMANGLE_COMPONENT_VOLATILE_THIS:
+    case DEMANGLE_COMPONENT_CONST_THIS:
+    case DEMANGLE_COMPONENT_VENDOR_TYPE_QUAL:
+    case DEMANGLE_COMPONENT_POINTER:
+    case DEMANGLE_COMPONENT_COMPLEX:
+    case DEMANGLE_COMPONENT_IMAGINARY:
+    modifier:
+      {
+	/* We keep a list of modifiers on the stack.  */
+	struct d_print_mod dpm;
+
+	dpm.next = dpi->modifiers;
+	dpi->modifiers = &dpm;
+	dpm.mod = dc;
+	dpm.printed = 0;
+	dpm.templates = dpi->templates;
+
+	if (!mod_inner)
+	  mod_inner = d_left (dc);
+
+	d_print_comp (dpi, options, mod_inner);
+
+	/* If the modifier didn't get printed by the type, print it
+	   now.  */
+	if (! dpm.printed)
+	  d_print_mod (dpi, options, dc);
+
+	dpi->modifiers = dpm.next;
+
+	return;
+      }
+
+    case DEMANGLE_COMPONENT_BUILTIN_TYPE:
+      if ((options & DMGL_JAVA) == 0)
+	d_append_buffer (dpi, dc->u.s_builtin.type->name,
+			 dc->u.s_builtin.type->len);
+      else
+	d_append_buffer (dpi, dc->u.s_builtin.type->java_name,
+			 dc->u.s_builtin.type->java_len);
+      return;
+
+    case DEMANGLE_COMPONENT_VENDOR_TYPE:
+      d_print_comp (dpi, options, d_left (dc));
+      return;
+
+    case DEMANGLE_COMPONENT_FUNCTION_TYPE:
+      {
+	if ((options & DMGL_RET_POSTFIX) != 0)
+	  d_print_function_type (dpi,
+				 options & ~(DMGL_RET_POSTFIX | DMGL_RET_DROP),
+				 dc, dpi->modifiers);
+
+	/* Print return type if present */
+	if (d_left (dc) != NULL && (options & DMGL_RET_POSTFIX) != 0)
+	  d_print_comp (dpi, options & ~(DMGL_RET_POSTFIX | DMGL_RET_DROP),
+			d_left (dc));
+	else if (d_left (dc) != NULL && (options & DMGL_RET_DROP) == 0)
+	  {
+	    struct d_print_mod dpm;
+
+	    /* We must pass this type down as a modifier in order to
+	       print it in the right location.  */
+	    dpm.next = dpi->modifiers;
+	    dpi->modifiers = &dpm;
+	    dpm.mod = dc;
+	    dpm.printed = 0;
+	    dpm.templates = dpi->templates;
+
+	    d_print_comp (dpi, options & ~(DMGL_RET_POSTFIX | DMGL_RET_DROP),
+			  d_left (dc));
+
+	    dpi->modifiers = dpm.next;
+
+	    if (dpm.printed)
+	      return;
+
+	    /* In standard prefix notation, there is a space between the
+	       return type and the function signature.  */
+	    if ((options & DMGL_RET_POSTFIX) == 0)
+	      d_append_char (dpi, ' ');
+	  }
+
+	if ((options & DMGL_RET_POSTFIX) == 0)
+	  d_print_function_type (dpi,
+				 options & ~(DMGL_RET_POSTFIX | DMGL_RET_DROP),
+				 dc, dpi->modifiers);
+
+	return;
+      }
+
+    case DEMANGLE_COMPONENT_ARRAY_TYPE:
+      {
+	struct d_print_mod *hold_modifiers;
+	struct d_print_mod adpm[4];
+	unsigned int i;
+	struct d_print_mod *pdpm;
+
+	/* We must pass this type down as a modifier in order to print
+	   multi-dimensional arrays correctly.  If the array itself is
+	   CV-qualified, we act as though the element type were
+	   CV-qualified.  We do this by copying the modifiers down
+	   rather than fiddling pointers, so that we don't wind up
+	   with a d_print_mod higher on the stack pointing into our
+	   stack frame after we return.  */
+
+	hold_modifiers = dpi->modifiers;
+
+	adpm[0].next = hold_modifiers;
+	dpi->modifiers = &adpm[0];
+	adpm[0].mod = dc;
+	adpm[0].printed = 0;
+	adpm[0].templates = dpi->templates;
+
+	i = 1;
+	pdpm = hold_modifiers;
+	while (pdpm != NULL
+	       && (pdpm->mod->type == DEMANGLE_COMPONENT_RESTRICT
+		   || pdpm->mod->type == DEMANGLE_COMPONENT_VOLATILE
+		   || pdpm->mod->type == DEMANGLE_COMPONENT_CONST))
+	  {
+	    if (! pdpm->printed)
+	      {
+		if (i >= sizeof adpm / sizeof adpm[0])
+		  {
+		    d_print_error (dpi);
+		    return;
+		  }
+
+		adpm[i] = *pdpm;
+		adpm[i].next = dpi->modifiers;
+		dpi->modifiers = &adpm[i];
+		pdpm->printed = 1;
+		++i;
+	      }
+
+	    pdpm = pdpm->next;
+	  }
+
+	d_print_comp (dpi, options, d_right (dc));
+
+	dpi->modifiers = hold_modifiers;
+
+	if (adpm[0].printed)
+	  return;
+
+	while (i > 1)
+	  {
+	    --i;
+	    d_print_mod (dpi, options, adpm[i].mod);
+	  }
+
+	d_print_array_type (dpi, options, dc, dpi->modifiers);
+
+	return;
+      }
+
+    case DEMANGLE_COMPONENT_PTRMEM_TYPE:
+    case DEMANGLE_COMPONENT_VECTOR_TYPE:
+      {
+	struct d_print_mod dpm;
+
+	dpm.next = dpi->modifiers;
+	dpi->modifiers = &dpm;
+	dpm.mod = dc;
+	dpm.printed = 0;
+	dpm.templates = dpi->templates;
+
+	d_print_comp (dpi, options, d_right (dc));
+
+	/* If the modifier didn't get printed by the type, print it
+	   now.  */
+	if (! dpm.printed)
+	  d_print_mod (dpi, options, dc);
+
+	dpi->modifiers = dpm.next;
+
+	return;
+      }
+
+    case DEMANGLE_COMPONENT_FIXED_TYPE:
+      if (dc->u.s_fixed.sat)
+	d_append_string (dpi, "_Sat ");
+      /* Don't print "int _Accum".  */
+      if (dc->u.s_fixed.length->u.s_builtin.type
+	  != &cplus_demangle_builtin_types['i'-'a'])
+	{
+	  d_print_comp (dpi, options, dc->u.s_fixed.length);
+	  d_append_char (dpi, ' ');
+	}
+      if (dc->u.s_fixed.accum)
+	d_append_string (dpi, "_Accum");
+      else
+	d_append_string (dpi, "_Fract");
+      return;
+
+    case DEMANGLE_COMPONENT_ARGLIST:
+    case DEMANGLE_COMPONENT_TEMPLATE_ARGLIST:
+      if (d_left (dc) != NULL)
+	d_print_comp (dpi, options, d_left (dc));
+      if (d_right (dc) != NULL)
+	{
+	  size_t len;
+	  unsigned long int flush_count;
+	  /* Make sure ", " isn't flushed by d_append_string, otherwise
+	     dpi->len -= 2 wouldn't work.  */
+	  if (dpi->len >= sizeof (dpi->buf) - 2)
+	    d_print_flush (dpi);
+	  d_append_string (dpi, ", ");
+	  len = dpi->len;
+	  flush_count = dpi->flush_count;
+	  d_print_comp (dpi, options, d_right (dc));
+	  /* If that didn't print anything (which can happen with empty
+	     template argument packs), remove the comma and space.  */
+	  if (dpi->flush_count == flush_count && dpi->len == len)
+	    dpi->len -= 2;
+	}
+      return;
+
+    case DEMANGLE_COMPONENT_OPERATOR:
+      {
+	char c;
+
+	d_append_string (dpi, "operator");
+	c = dc->u.s_operator.op->name[0];
+	if (IS_LOWER (c))
+	  d_append_char (dpi, ' ');
+	d_append_buffer (dpi, dc->u.s_operator.op->name,
+			 dc->u.s_operator.op->len);
+	return;
+      }
+
+    case DEMANGLE_COMPONENT_EXTENDED_OPERATOR:
+      d_append_string (dpi, "operator ");
+      d_print_comp (dpi, options, dc->u.s_extended_operator.name);
+      return;
+
+    case DEMANGLE_COMPONENT_CAST:
+      d_append_string (dpi, "operator ");
+      d_print_cast (dpi, options, dc);
+      return;
+
+    case DEMANGLE_COMPONENT_UNARY:
+      if (d_left (dc)->type == DEMANGLE_COMPONENT_OPERATOR
+	  && d_left (dc)->u.s_operator.op->len == 1
+	  && d_left (dc)->u.s_operator.op->name[0] == '&'
+	  && d_right (dc)->type == DEMANGLE_COMPONENT_TYPED_NAME
+	  && d_left (d_right (dc))->type == DEMANGLE_COMPONENT_QUAL_NAME
+	  && d_right (d_right (dc))->type == DEMANGLE_COMPONENT_FUNCTION_TYPE)
+	{
+	  /* Address of a function (therefore in an expression context) must
+	     have its argument list suppressed.
+
+	     unary operator ... dc
+	       operator & ... d_left (dc)
+	       typed name ... d_right (dc)
+		 qualified name ... d_left (d_right (dc))
+		   <names>
+		 function type ... d_right (d_right (dc))
+		   argument list
+		     <arguments>  */
+
+	  d_print_expr_op (dpi, options, d_left (dc));
+	  d_print_comp (dpi, options, d_left (d_right (dc)));
+	  return;
+	}
+      else if (d_left (dc)->type == DEMANGLE_COMPONENT_OPERATOR
+	       && d_left (dc)->u.s_operator.op->len == 1
+	       && d_left (dc)->u.s_operator.op->name[0] == '&'
+	       && d_right (dc)->type == DEMANGLE_COMPONENT_QUAL_NAME)
+	{
+	  /* Keep also already processed variant without the argument list.
+
+	     unary operator ... dc
+	       operator & ... d_left (dc)
+	       qualified name ... d_right (dc)
+		 <names>  */
+
+	  d_print_expr_op (dpi, options, d_left (dc));
+	  d_print_comp (dpi, options, d_right (dc));
+	  return;
+	}
+      else if (d_left (dc)->type != DEMANGLE_COMPONENT_CAST)
+	d_print_expr_op (dpi, options, d_left (dc));
+      else
+	{
+	  d_append_char (dpi, '(');
+	  d_print_cast (dpi, options, d_left (dc));
+	  d_append_char (dpi, ')');
+	}
+      d_print_subexpr (dpi, options, d_right (dc));
+      return;
+
+    case DEMANGLE_COMPONENT_BINARY:
+      if (d_right (dc)->type != DEMANGLE_COMPONENT_BINARY_ARGS)
+	{
+	  d_print_error (dpi);
+	  return;
+	}
+
+      /* We wrap an expression which uses the greater-than operator in
+	 an extra layer of parens so that it does not get confused
+	 with the '>' which ends the template parameters.  */
+      if (d_left (dc)->type == DEMANGLE_COMPONENT_OPERATOR
+	  && d_left (dc)->u.s_operator.op->len == 1
+	  && d_left (dc)->u.s_operator.op->name[0] == '>')
+	d_append_char (dpi, '(');
+
+      if (strcmp (d_left (dc)->u.s_operator.op->code, "cl") == 0
+          && d_left (d_right (dc))->type == DEMANGLE_COMPONENT_TYPED_NAME)
+	{
+	  /* Function call used in an expression should not have printed types
+	     of the function arguments.  Values of the function arguments still
+	     get printed below.  */
+
+	  const struct demangle_component *func = d_left (d_right (dc));
+
+	  if (d_right (func)->type != DEMANGLE_COMPONENT_FUNCTION_TYPE)
+	    d_print_error (dpi);
+	  d_print_subexpr (dpi, options, d_left (func));
+	}
+      else
+	d_print_subexpr (dpi, options, d_left (d_right (dc)));
+      if (strcmp (d_left (dc)->u.s_operator.op->code, "ix") == 0)
+	{
+	  d_append_char (dpi, '[');
+	  d_print_comp (dpi, options, d_right (d_right (dc)));
+	  d_append_char (dpi, ']');
+	}
+      else
+	{
+	  if (strcmp (d_left (dc)->u.s_operator.op->code, "cl") != 0)
+	    d_print_expr_op (dpi, options, d_left (dc));
+	  d_print_subexpr (dpi, options, d_right (d_right (dc)));
+	}
+
+      if (d_left (dc)->type == DEMANGLE_COMPONENT_OPERATOR
+	  && d_left (dc)->u.s_operator.op->len == 1
+	  && d_left (dc)->u.s_operator.op->name[0] == '>')
+	d_append_char (dpi, ')');
+
+      return;
+
+    case DEMANGLE_COMPONENT_BINARY_ARGS:
+      /* We should only see this as part of DEMANGLE_COMPONENT_BINARY.  */
+      d_print_error (dpi);
+      return;
+
+    case DEMANGLE_COMPONENT_TRINARY:
+      if (d_right (dc)->type != DEMANGLE_COMPONENT_TRINARY_ARG1
+	  || d_right (d_right (dc))->type != DEMANGLE_COMPONENT_TRINARY_ARG2)
+	{
+	  d_print_error (dpi);
+	  return;
+	}
+      d_print_subexpr (dpi, options, d_left (d_right (dc)));
+      d_print_expr_op (dpi, options, d_left (dc));
+      d_print_subexpr (dpi, options, d_left (d_right (d_right (dc))));
+      d_append_string (dpi, " : ");
+      d_print_subexpr (dpi, options, d_right (d_right (d_right (dc))));
+      return;
+
+    case DEMANGLE_COMPONENT_TRINARY_ARG1:
+    case DEMANGLE_COMPONENT_TRINARY_ARG2:
+      /* We should only see these are part of DEMANGLE_COMPONENT_TRINARY.  */
+      d_print_error (dpi);
+      return;
+
+    case DEMANGLE_COMPONENT_LITERAL:
+    case DEMANGLE_COMPONENT_LITERAL_NEG:
+      {
+	enum d_builtin_type_print tp;
+
+	/* For some builtin types, produce simpler output.  */
+	tp = D_PRINT_DEFAULT;
+	if (d_left (dc)->type == DEMANGLE_COMPONENT_BUILTIN_TYPE)
+	  {
+	    tp = d_left (dc)->u.s_builtin.type->print;
+	    switch (tp)
+	      {
+	      case D_PRINT_INT:
+	      case D_PRINT_UNSIGNED:
+	      case D_PRINT_LONG:
+	      case D_PRINT_UNSIGNED_LONG:
+	      case D_PRINT_LONG_LONG:
+	      case D_PRINT_UNSIGNED_LONG_LONG:
+		if (d_right (dc)->type == DEMANGLE_COMPONENT_NAME)
+		  {
+		    if (dc->type == DEMANGLE_COMPONENT_LITERAL_NEG)
+		      d_append_char (dpi, '-');
+		    d_print_comp (dpi, options, d_right (dc));
+		    switch (tp)
+		      {
+		      default:
+			break;
+		      case D_PRINT_UNSIGNED:
+			d_append_char (dpi, 'u');
+			break;
+		      case D_PRINT_LONG:
+			d_append_char (dpi, 'l');
+			break;
+		      case D_PRINT_UNSIGNED_LONG:
+			d_append_string (dpi, "ul");
+			break;
+		      case D_PRINT_LONG_LONG:
+			d_append_string (dpi, "ll");
+			break;
+		      case D_PRINT_UNSIGNED_LONG_LONG:
+			d_append_string (dpi, "ull");
+			break;
+		      }
+		    return;
+		  }
+		break;
+
+	      case D_PRINT_BOOL:
+		if (d_right (dc)->type == DEMANGLE_COMPONENT_NAME
+		    && d_right (dc)->u.s_name.len == 1
+		    && dc->type == DEMANGLE_COMPONENT_LITERAL)
+		  {
+		    switch (d_right (dc)->u.s_name.s[0])
+		      {
+		      case '0':
+			d_append_string (dpi, "false");
+			return;
+		      case '1':
+			d_append_string (dpi, "true");
+			return;
+		      default:
+			break;
+		      }
+		  }
+		break;
+
+	      default:
+		break;
+	      }
+	  }
+
+	d_append_char (dpi, '(');
+	d_print_comp (dpi, options, d_left (dc));
+	d_append_char (dpi, ')');
+	if (dc->type == DEMANGLE_COMPONENT_LITERAL_NEG)
+	  d_append_char (dpi, '-');
+	if (tp == D_PRINT_FLOAT)
+	  d_append_char (dpi, '[');
+	d_print_comp (dpi, options, d_right (dc));
+	if (tp == D_PRINT_FLOAT)
+	  d_append_char (dpi, ']');
+      }
+      return;
+
+    case DEMANGLE_COMPONENT_NUMBER:
+      d_append_num (dpi, dc->u.s_number.number);
+      return;
+
+    case DEMANGLE_COMPONENT_JAVA_RESOURCE:
+      d_append_string (dpi, "java resource ");
+      d_print_comp (dpi, options, d_left (dc));
+      return;
+
+    case DEMANGLE_COMPONENT_COMPOUND_NAME:
+      d_print_comp (dpi, options, d_left (dc));
+      d_print_comp (dpi, options, d_right (dc));
+      return;
+
+    case DEMANGLE_COMPONENT_CHARACTER:
+      d_append_char (dpi, dc->u.s_character.character);
+      return;
+
+    case DEMANGLE_COMPONENT_DECLTYPE:
+      d_append_string (dpi, "decltype (");
+      d_print_comp (dpi, options, d_left (dc));
+      d_append_char (dpi, ')');
+      return;
+
+    case DEMANGLE_COMPONENT_PACK_EXPANSION:
+      {
+	int len;
+	int i;
+	struct demangle_component *a = d_find_pack (dpi, d_left (dc));
+	if (a == NULL)
+	  {
+	    /* d_find_pack won't find anything if the only packs involved
+	       in this expansion are function parameter packs; in that
+	       case, just print the pattern and "...".  */
+	    d_print_subexpr (dpi, options, d_left (dc));
+	    d_append_string (dpi, "...");
+	    return;
+	  }
+
+	len = d_pack_length (a);
+	dc = d_left (dc);
+	for (i = 0; i < len; ++i)
+	  {
+	    dpi->pack_index = i;
+	    d_print_comp (dpi, options, dc);
+	    if (i < len-1)
+	      d_append_string (dpi, ", ");
+	  }
+      }
+      return;
+
+    case DEMANGLE_COMPONENT_FUNCTION_PARAM:
+      {
+	long num = dc->u.s_number.number;
+	if (num == 0)
+	  d_append_string (dpi, "this");
+	else
+	  {
+	    d_append_string (dpi, "{parm#");
+	    d_append_num (dpi, num);
+	    d_append_char (dpi, '}');
+	  }
+      }
+      return;
+
+    case DEMANGLE_COMPONENT_GLOBAL_CONSTRUCTORS:
+      d_append_string (dpi, "global constructors keyed to ");
+      d_print_comp (dpi, options, dc->u.s_binary.left);
+      return;
+
+    case DEMANGLE_COMPONENT_GLOBAL_DESTRUCTORS:
+      d_append_string (dpi, "global destructors keyed to ");
+      d_print_comp (dpi, options, dc->u.s_binary.left);
+      return;
+
+    case DEMANGLE_COMPONENT_LAMBDA:
+      d_append_string (dpi, "{lambda(");
+      d_print_comp (dpi, options, dc->u.s_unary_num.sub);
+      d_append_string (dpi, ")#");
+      d_append_num (dpi, dc->u.s_unary_num.num + 1);
+      d_append_char (dpi, '}');
+      return;
+
+    case DEMANGLE_COMPONENT_UNNAMED_TYPE:
+      d_append_string (dpi, "{unnamed type#");
+      d_append_num (dpi, dc->u.s_number.number + 1);
+      d_append_char (dpi, '}');
+      return;
+
+    default:
+      d_print_error (dpi);
+      return;
+    }
+}
+
+/* Print a Java dentifier.  For Java we try to handle encoded extended
+   Unicode characters.  The C++ ABI doesn't mention Unicode encoding,
+   so we don't it for C++.  Characters are encoded as
+   __U<hex-char>+_.  */
+
+static void
+d_print_java_identifier (struct d_print_info *dpi, const char *name, int len)
+{
+  const char *p;
+  const char *end;
+
+  end = name + len;
+  for (p = name; p < end; ++p)
+    {
+      if (end - p > 3
+	  && p[0] == '_'
+	  && p[1] == '_'
+	  && p[2] == 'U')
+	{
+	  unsigned long c;
+	  const char *q;
+
+	  c = 0;
+	  for (q = p + 3; q < end; ++q)
+	    {
+	      int dig;
+
+	      if (IS_DIGIT (*q))
+		dig = *q - '0';
+	      else if (*q >= 'A' && *q <= 'F')
+		dig = *q - 'A' + 10;
+	      else if (*q >= 'a' && *q <= 'f')
+		dig = *q - 'a' + 10;
+	      else
+		break;
+
+	      c = c * 16 + dig;
+	    }
+	  /* If the Unicode character is larger than 256, we don't try
+	     to deal with it here.  FIXME.  */
+	  if (q < end && *q == '_' && c < 256)
+	    {
+	      d_append_char (dpi, c);
+	      p = q;
+	      continue;
+	    }
+	}
+
+      d_append_char (dpi, *p);
+    }
+}
+
+/* Print a list of modifiers.  SUFFIX is 1 if we are printing
+   qualifiers on this after printing a function.  */
+
+static void
+d_print_mod_list (struct d_print_info *dpi, int options,
+                  struct d_print_mod *mods, int suffix)
+{
+  struct d_print_template *hold_dpt;
+
+  if (mods == NULL || d_print_saw_error (dpi))
+    return;
+
+  if (mods->printed
+      || (! suffix
+	  && (mods->mod->type == DEMANGLE_COMPONENT_RESTRICT_THIS
+	      || mods->mod->type == DEMANGLE_COMPONENT_VOLATILE_THIS
+	      || mods->mod->type == DEMANGLE_COMPONENT_CONST_THIS)))
+    {
+      d_print_mod_list (dpi, options, mods->next, suffix);
+      return;
+    }
+
+  mods->printed = 1;
+
+  hold_dpt = dpi->templates;
+  dpi->templates = mods->templates;
+
+  if (mods->mod->type == DEMANGLE_COMPONENT_FUNCTION_TYPE)
+    {
+      d_print_function_type (dpi, options, mods->mod, mods->next);
+      dpi->templates = hold_dpt;
+      return;
+    }
+  else if (mods->mod->type == DEMANGLE_COMPONENT_ARRAY_TYPE)
+    {
+      d_print_array_type (dpi, options, mods->mod, mods->next);
+      dpi->templates = hold_dpt;
+      return;
+    }
+  else if (mods->mod->type == DEMANGLE_COMPONENT_LOCAL_NAME)
+    {
+      struct d_print_mod *hold_modifiers;
+      struct demangle_component *dc;
+
+      /* When this is on the modifier stack, we have pulled any
+	 qualifiers off the right argument already.  Otherwise, we
+	 print it as usual, but don't let the left argument see any
+	 modifiers.  */
+
+      hold_modifiers = dpi->modifiers;
+      dpi->modifiers = NULL;
+      d_print_comp (dpi, options, d_left (mods->mod));
+      dpi->modifiers = hold_modifiers;
+
+      if ((options & DMGL_JAVA) == 0)
+	d_append_string (dpi, "::");
+      else
+	d_append_char (dpi, '.');
+
+      dc = d_right (mods->mod);
+
+      if (dc->type == DEMANGLE_COMPONENT_DEFAULT_ARG)
+	{
+	  d_append_string (dpi, "{default arg#");
+	  d_append_num (dpi, dc->u.s_unary_num.num + 1);
+	  d_append_string (dpi, "}::");
+	  dc = dc->u.s_unary_num.sub;
+	}
+
+      while (dc->type == DEMANGLE_COMPONENT_RESTRICT_THIS
+	     || dc->type == DEMANGLE_COMPONENT_VOLATILE_THIS
+	     || dc->type == DEMANGLE_COMPONENT_CONST_THIS)
+	dc = d_left (dc);
+
+      d_print_comp (dpi, options, dc);
+
+      dpi->templates = hold_dpt;
+      return;
+    }
+
+  d_print_mod (dpi, options, mods->mod);
+
+  dpi->templates = hold_dpt;
+
+  d_print_mod_list (dpi, options, mods->next, suffix);
+}
+
+/* Print a modifier.  */
+
+static void
+d_print_mod (struct d_print_info *dpi, int options,
+             const struct demangle_component *mod)
+{
+  switch (mod->type)
+    {
+    case DEMANGLE_COMPONENT_RESTRICT:
+    case DEMANGLE_COMPONENT_RESTRICT_THIS:
+      d_append_string (dpi, " restrict");
+      return;
+    case DEMANGLE_COMPONENT_VOLATILE:
+    case DEMANGLE_COMPONENT_VOLATILE_THIS:
+      d_append_string (dpi, " volatile");
+      return;
+    case DEMANGLE_COMPONENT_CONST:
+    case DEMANGLE_COMPONENT_CONST_THIS:
+      d_append_string (dpi, " const");
+      return;
+    case DEMANGLE_COMPONENT_VENDOR_TYPE_QUAL:
+      d_append_char (dpi, ' ');
+      d_print_comp (dpi, options, d_right (mod));
+      return;
+    case DEMANGLE_COMPONENT_POINTER:
+      /* There is no pointer symbol in Java.  */
+      if ((options & DMGL_JAVA) == 0)
+	d_append_char (dpi, '*');
+      return;
+    case DEMANGLE_COMPONENT_REFERENCE:
+      d_append_char (dpi, '&');
+      return;
+    case DEMANGLE_COMPONENT_RVALUE_REFERENCE:
+      d_append_string (dpi, "&&");
+      return;
+    case DEMANGLE_COMPONENT_COMPLEX:
+      d_append_string (dpi, "complex ");
+      return;
+    case DEMANGLE_COMPONENT_IMAGINARY:
+      d_append_string (dpi, "imaginary ");
+      return;
+    case DEMANGLE_COMPONENT_PTRMEM_TYPE:
+      if (d_last_char (dpi) != '(')
+	d_append_char (dpi, ' ');
+      d_print_comp (dpi, options, d_left (mod));
+      d_append_string (dpi, "::*");
+      return;
+    case DEMANGLE_COMPONENT_TYPED_NAME:
+      d_print_comp (dpi, options, d_left (mod));
+      return;
+    case DEMANGLE_COMPONENT_VECTOR_TYPE:
+      d_append_string (dpi, " __vector(");
+      d_print_comp (dpi, options, d_left (mod));
+      d_append_char (dpi, ')');
+      return;
+
+    default:
+      /* Otherwise, we have something that won't go back on the
+	 modifier stack, so we can just print it.  */
+      d_print_comp (dpi, options, mod);
+      return;
+    }
+}
+
+/* Print a function type, except for the return type.  */
+
+static void
+d_print_function_type (struct d_print_info *dpi, int options,
+                       const struct demangle_component *dc,
+                       struct d_print_mod *mods)
+{
+  int need_paren;
+  int need_space;
+  struct d_print_mod *p;
+  struct d_print_mod *hold_modifiers;
+
+  need_paren = 0;
+  need_space = 0;
+  for (p = mods; p != NULL; p = p->next)
+    {
+      if (p->printed)
+	break;
+
+      switch (p->mod->type)
+	{
+	case DEMANGLE_COMPONENT_POINTER:
+	case DEMANGLE_COMPONENT_REFERENCE:
+	case DEMANGLE_COMPONENT_RVALUE_REFERENCE:
+	  need_paren = 1;
+	  break;
+	case DEMANGLE_COMPONENT_RESTRICT:
+	case DEMANGLE_COMPONENT_VOLATILE:
+	case DEMANGLE_COMPONENT_CONST:
+	case DEMANGLE_COMPONENT_VENDOR_TYPE_QUAL:
+	case DEMANGLE_COMPONENT_COMPLEX:
+	case DEMANGLE_COMPONENT_IMAGINARY:
+	case DEMANGLE_COMPONENT_PTRMEM_TYPE:
+	  need_space = 1;
+	  need_paren = 1;
+	  break;
+	case DEMANGLE_COMPONENT_RESTRICT_THIS:
+	case DEMANGLE_COMPONENT_VOLATILE_THIS:
+	case DEMANGLE_COMPONENT_CONST_THIS:
+	  break;
+	default:
+	  break;
+	}
+      if (need_paren)
+	break;
+    }
+
+  if (need_paren)
+    {
+      if (! need_space)
+	{
+	  if (d_last_char (dpi) != '('
+	      && d_last_char (dpi) != '*')
+	    need_space = 1;
+	}
+      if (need_space && d_last_char (dpi) != ' ')
+	d_append_char (dpi, ' ');
+      d_append_char (dpi, '(');
+    }
+
+  hold_modifiers = dpi->modifiers;
+  dpi->modifiers = NULL;
+
+  d_print_mod_list (dpi, options, mods, 0);
+
+  if (need_paren)
+    d_append_char (dpi, ')');
+
+  d_append_char (dpi, '(');
+
+  if (d_right (dc) != NULL)
+    d_print_comp (dpi, options, d_right (dc));
+
+  d_append_char (dpi, ')');
+
+  d_print_mod_list (dpi, options, mods, 1);
+
+  dpi->modifiers = hold_modifiers;
+}
+
+/* Print an array type, except for the element type.  */
+
+static void
+d_print_array_type (struct d_print_info *dpi, int options,
+                    const struct demangle_component *dc,
+                    struct d_print_mod *mods)
+{
+  int need_space;
+
+  need_space = 1;
+  if (mods != NULL)
+    {
+      int need_paren;
+      struct d_print_mod *p;
+
+      need_paren = 0;
+      for (p = mods; p != NULL; p = p->next)
+	{
+	  if (! p->printed)
+	    {
+	      if (p->mod->type == DEMANGLE_COMPONENT_ARRAY_TYPE)
+		{
+		  need_space = 0;
+		  break;
+		}
+	      else
+		{
+		  need_paren = 1;
+		  need_space = 1;
+		  break;
+		}
+	    }
+	}
+
+      if (need_paren)
+	d_append_string (dpi, " (");
+
+      d_print_mod_list (dpi, options, mods, 0);
+
+      if (need_paren)
+	d_append_char (dpi, ')');
+    }
+
+  if (need_space)
+    d_append_char (dpi, ' ');
+
+  d_append_char (dpi, '[');
+
+  if (d_left (dc) != NULL)
+    d_print_comp (dpi, options, d_left (dc));
+
+  d_append_char (dpi, ']');
+}
+
+/* Print an operator in an expression.  */
+
+static void
+d_print_expr_op (struct d_print_info *dpi, int options,
+                 const struct demangle_component *dc)
+{
+  if (dc->type == DEMANGLE_COMPONENT_OPERATOR)
+    d_append_buffer (dpi, dc->u.s_operator.op->name,
+		     dc->u.s_operator.op->len);
+  else
+    d_print_comp (dpi, options, dc);
+}
+
+/* Print a cast.  */
+
+static void
+d_print_cast (struct d_print_info *dpi, int options,
+              const struct demangle_component *dc)
+{
+  if (d_left (dc)->type != DEMANGLE_COMPONENT_TEMPLATE)
+    d_print_comp (dpi, options, d_left (dc));
+  else
+    {
+      struct d_print_mod *hold_dpm;
+      struct d_print_template dpt;
+
+      /* It appears that for a templated cast operator, we need to put
+	 the template parameters in scope for the operator name, but
+	 not for the parameters.  The effect is that we need to handle
+	 the template printing here.  */
+
+      hold_dpm = dpi->modifiers;
+      dpi->modifiers = NULL;
+
+      dpt.next = dpi->templates;
+      dpi->templates = &dpt;
+      dpt.template_decl = d_left (dc);
+
+      d_print_comp (dpi, options, d_left (d_left (dc)));
+
+      dpi->templates = dpt.next;
+
+      if (d_last_char (dpi) == '<')
+	d_append_char (dpi, ' ');
+      d_append_char (dpi, '<');
+      d_print_comp (dpi, options, d_right (d_left (dc)));
+      /* Avoid generating two consecutive '>' characters, to avoid
+	 the C++ syntactic ambiguity.  */
+      if (d_last_char (dpi) == '>')
+	d_append_char (dpi, ' ');
+      d_append_char (dpi, '>');
+
+      dpi->modifiers = hold_dpm;
+    }
+}
+
+/* Initialize the information structure we use to pass around
+   information.  */
+
+CP_STATIC_IF_GLIBCPP_V3
+void
+cplus_demangle_init_info (const char *mangled, int options, size_t len,
+                          struct d_info *di)
+{
+  di->s = mangled;
+  di->send = mangled + len;
+  di->options = options;
+
+  di->n = mangled;
+
+  /* We can not need more components than twice the number of chars in
+     the mangled string.  Most components correspond directly to
+     chars, but the ARGLIST types are exceptions.  */
+  di->num_comps = 2 * len;
+  di->next_comp = 0;
+
+  /* Similarly, we can not need more substitutions than there are
+     chars in the mangled string.  */
+  di->num_subs = len;
+  di->next_sub = 0;
+  di->did_subs = 0;
+
+  di->last_name = NULL;
+
+  di->expansion = 0;
+}
+
+/* Internal implementation for the demangler.  If MANGLED is a g++ v3 ABI
+   mangled name, return strings in repeated callback giving the demangled
+   name.  OPTIONS is the usual libiberty demangler options.  On success,
+   this returns 1.  On failure, returns 0.  */
+
+static int
+d_demangle_callback (const char *mangled, int options,
+                     demangle_callbackref callback, void *opaque)
+{
+  enum
+    {
+      DCT_TYPE,
+      DCT_MANGLED,
+      DCT_GLOBAL_CTORS,
+      DCT_GLOBAL_DTORS
+    }
+  type;
+  struct d_info di;
+  struct demangle_component *dc;
+  int status;
+
+  if (mangled[0] == '_' && mangled[1] == 'Z')
+    type = DCT_MANGLED;
+  else if (strncmp (mangled, "_GLOBAL_", 8) == 0
+	   && (mangled[8] == '.' || mangled[8] == '_' || mangled[8] == '$')
+	   && (mangled[9] == 'D' || mangled[9] == 'I')
+	   && mangled[10] == '_')
+    type = mangled[9] == 'I' ? DCT_GLOBAL_CTORS : DCT_GLOBAL_DTORS;
+  else
+    {
+      if ((options & DMGL_TYPES) == 0)
+	return 0;
+      type = DCT_TYPE;
+    }
+
+  cplus_demangle_init_info (mangled, options, strlen (mangled), &di);
+
+  {
+#ifdef CP_DYNAMIC_ARRAYS
+    __extension__ struct demangle_component comps[di.num_comps];
+    __extension__ struct demangle_component *subs[di.num_subs];
+
+    di.comps = comps;
+    di.subs = subs;
+#else
+    di.comps = alloca (di.num_comps * sizeof (*di.comps));
+    di.subs = alloca (di.num_subs * sizeof (*di.subs));
+#endif
+
+    switch (type)
+      {
+      case DCT_TYPE:
+	dc = cplus_demangle_type (&di);
+	break;
+      case DCT_MANGLED:
+	dc = cplus_demangle_mangled_name (&di, 1);
+	break;
+      case DCT_GLOBAL_CTORS:
+      case DCT_GLOBAL_DTORS:
+	d_advance (&di, 11);
+	dc = d_make_comp (&di,
+			  (type == DCT_GLOBAL_CTORS
+			   ? DEMANGLE_COMPONENT_GLOBAL_CONSTRUCTORS
+			   : DEMANGLE_COMPONENT_GLOBAL_DESTRUCTORS),
+			  d_make_demangle_mangled_name (&di, d_str (&di)),
+			  NULL);
+	d_advance (&di, strlen (d_str (&di)));
+	break;
+      }
+
+    /* If DMGL_PARAMS is set, then if we didn't consume the entire
+       mangled string, then we didn't successfully demangle it.  If
+       DMGL_PARAMS is not set, we didn't look at the trailing
+       parameters.  */
+    if (((options & DMGL_PARAMS) != 0) && d_peek_char (&di) != '\0')
+      dc = NULL;
+
+#ifdef CP_DEMANGLE_DEBUG
+    d_dump (dc, 0);
+#endif
+
+    status = (dc != NULL)
+             ? cplus_demangle_print_callback (options, dc, callback, opaque)
+             : 0;
+  }
+
+  return status;
+}
+
+/* Entry point for the demangler.  If MANGLED is a g++ v3 ABI mangled
+   name, return a buffer allocated with malloc holding the demangled
+   name.  OPTIONS is the usual libiberty demangler options.  On
+   success, this sets *PALC to the allocated size of the returned
+   buffer.  On failure, this sets *PALC to 0 for a bad name, or 1 for
+   a memory allocation failure, and returns NULL.  */
+
+static char *
+d_demangle (const char *mangled, int options, size_t *palc)
+{
+  struct d_growable_string dgs;
+  int status;
+
+  d_growable_string_init (&dgs, 0);
+
+  status = d_demangle_callback (mangled, options,
+                                d_growable_string_callback_adapter, &dgs);
+  if (status == 0)
+    {
+      free (dgs.buf);
+      *palc = 0;
+      return NULL;
+    }
+
+  *palc = dgs.allocation_failure ? 1 : dgs.alc;
+  return dgs.buf;
+}
+
+#if defined(IN_LIBGCC2) || defined(IN_GLIBCPP_V3)
+
+extern char *__cxa_demangle (const char *, char *, size_t *, int *);
+
+/* ia64 ABI-mandated entry point in the C++ runtime library for
+   performing demangling.  MANGLED_NAME is a NUL-terminated character
+   string containing the name to be demangled.
+
+   OUTPUT_BUFFER is a region of memory, allocated with malloc, of
+   *LENGTH bytes, into which the demangled name is stored.  If
+   OUTPUT_BUFFER is not long enough, it is expanded using realloc.
+   OUTPUT_BUFFER may instead be NULL; in that case, the demangled name
+   is placed in a region of memory allocated with malloc.
+
+   If LENGTH is non-NULL, the length of the buffer containing the
+   demangled name, is placed in *LENGTH.
+
+   The return value is a pointer to the start of the NUL-terminated
+   demangled name, or NULL if the demangling fails.  The caller is
+   responsible for deallocating this memory using free.
+
+   *STATUS is set to one of the following values:
+      0: The demangling operation succeeded.
+     -1: A memory allocation failure occurred.
+     -2: MANGLED_NAME is not a valid name under the C++ ABI mangling rules.
+     -3: One of the arguments is invalid.
+
+   The demangling is performed using the C++ ABI mangling rules, with
+   GNU extensions.  */
+
+char *
+__cxa_demangle (const char *mangled_name, char *output_buffer,
+                size_t *length, int *status)
+{
+  char *demangled;
+  size_t alc;
+
+  if (mangled_name == NULL)
+    {
+      if (status != NULL)
+	*status = -3;
+      return NULL;
+    }
+
+  if (output_buffer != NULL && length == NULL)
+    {
+      if (status != NULL)
+	*status = -3;
+      return NULL;
+    }
+
+  demangled = d_demangle (mangled_name, DMGL_PARAMS | DMGL_TYPES, &alc);
+
+  if (demangled == NULL)
+    {
+      if (status != NULL)
+	{
+	  if (alc == 1)
+	    *status = -1;
+	  else
+	    *status = -2;
+	}
+      return NULL;
+    }
+
+  if (output_buffer == NULL)
+    {
+      if (length != NULL)
+	*length = alc;
+    }
+  else
+    {
+      if (strlen (demangled) < *length)
+	{
+	  strcpy (output_buffer, demangled);
+	  free (demangled);
+	  demangled = output_buffer;
+	}
+      else
+	{
+	  free (output_buffer);
+	  *length = alc;
+	}
+    }
+
+  if (status != NULL)
+    *status = 0;
+
+  return demangled;
+}
+
+extern int __gcclibcxx_demangle_callback (const char *,
+                                          void (*)
+                                            (const char *, size_t, void *),
+                                          void *);
+
+/* Alternative, allocationless entry point in the C++ runtime library
+   for performing demangling.  MANGLED_NAME is a NUL-terminated character
+   string containing the name to be demangled.
+
+   CALLBACK is a callback function, called with demangled string
+   segments as demangling progresses; it is called at least once,
+   but may be called more than once.  OPAQUE is a generalized pointer
+   used as a callback argument.
+
+   The return code is one of the following values, equivalent to
+   the STATUS values of __cxa_demangle() (excluding -1, since this
+   function performs no memory allocations):
+      0: The demangling operation succeeded.
+     -2: MANGLED_NAME is not a valid name under the C++ ABI mangling rules.
+     -3: One of the arguments is invalid.
+
+   The demangling is performed using the C++ ABI mangling rules, with
+   GNU extensions.  */
+
+int
+__gcclibcxx_demangle_callback (const char *mangled_name,
+                               void (*callback) (const char *, size_t, void *),
+                               void *opaque)
+{
+  int status;
+
+  if (mangled_name == NULL || callback == NULL)
+    return -3;
+
+  status = d_demangle_callback (mangled_name, DMGL_PARAMS | DMGL_TYPES,
+                                callback, opaque);
+  if (status == 0)
+    return -2;
+
+  return 0;
+}
+
+#else /* ! (IN_LIBGCC2 || IN_GLIBCPP_V3) */
+
+/* Entry point for libiberty demangler.  If MANGLED is a g++ v3 ABI
+   mangled name, return a buffer allocated with malloc holding the
+   demangled name.  Otherwise, return NULL.  */
+
+char *
+cplus_demangle_v3 (const char *mangled, int options)
+{
+  size_t alc;
+
+  return d_demangle (mangled, options, &alc);
+}
+
+int
+cplus_demangle_v3_callback (const char *mangled, int options,
+                            demangle_callbackref callback, void *opaque)
+{
+  return d_demangle_callback (mangled, options, callback, opaque);
+}
+
+/* Demangle a Java symbol.  Java uses a subset of the V3 ABI C++ mangling 
+   conventions, but the output formatting is a little different.
+   This instructs the C++ demangler not to emit pointer characters ("*"), to
+   use Java's namespace separator symbol ("." instead of "::"), and to output
+   JArray<TYPE> as TYPE[].  */
+
+char *
+java_demangle_v3 (const char *mangled)
+{
+  size_t alc;
+
+  return d_demangle (mangled, DMGL_JAVA | DMGL_PARAMS | DMGL_RET_POSTFIX, &alc);
+}
+
+int
+java_demangle_v3_callback (const char *mangled,
+                           demangle_callbackref callback, void *opaque)
+{
+  return d_demangle_callback (mangled,
+                              DMGL_JAVA | DMGL_PARAMS | DMGL_RET_POSTFIX,
+                              callback, opaque);
+}
+
+#endif /* IN_LIBGCC2 || IN_GLIBCPP_V3 */
+
+#ifndef IN_GLIBCPP_V3
+
+/* Demangle a string in order to find out whether it is a constructor
+   or destructor.  Return non-zero on success.  Set *CTOR_KIND and
+   *DTOR_KIND appropriately.  */
+
+static int
+is_ctor_or_dtor (const char *mangled,
+                 enum gnu_v3_ctor_kinds *ctor_kind,
+                 enum gnu_v3_dtor_kinds *dtor_kind)
+{
+  struct d_info di;
+  struct demangle_component *dc;
+  int ret;
+
+  *ctor_kind = (enum gnu_v3_ctor_kinds) 0;
+  *dtor_kind = (enum gnu_v3_dtor_kinds) 0;
+
+  cplus_demangle_init_info (mangled, DMGL_GNU_V3, strlen (mangled), &di);
+
+  {
+#ifdef CP_DYNAMIC_ARRAYS
+    __extension__ struct demangle_component comps[di.num_comps];
+    __extension__ struct demangle_component *subs[di.num_subs];
+
+    di.comps = comps;
+    di.subs = subs;
+#else
+    di.comps = alloca (di.num_comps * sizeof (*di.comps));
+    di.subs = alloca (di.num_subs * sizeof (*di.subs));
+#endif
+
+    dc = cplus_demangle_mangled_name (&di, 1);
+
+    /* Note that because we did not pass DMGL_PARAMS, we don't expect
+       to demangle the entire string.  */
+
+    ret = 0;
+    while (dc != NULL)
+      {
+	switch (dc->type)
+	  {
+	  default:
+	    dc = NULL;
+	    break;
+	  case DEMANGLE_COMPONENT_TYPED_NAME:
+	  case DEMANGLE_COMPONENT_TEMPLATE:
+	  case DEMANGLE_COMPONENT_RESTRICT_THIS:
+	  case DEMANGLE_COMPONENT_VOLATILE_THIS:
+	  case DEMANGLE_COMPONENT_CONST_THIS:
+	    dc = d_left (dc);
+	    break;
+	  case DEMANGLE_COMPONENT_QUAL_NAME:
+	  case DEMANGLE_COMPONENT_LOCAL_NAME:
+	    dc = d_right (dc);
+	    break;
+	  case DEMANGLE_COMPONENT_CTOR:
+	    *ctor_kind = dc->u.s_ctor.kind;
+	    ret = 1;
+	    dc = NULL;
+	    break;
+	  case DEMANGLE_COMPONENT_DTOR:
+	    *dtor_kind = dc->u.s_dtor.kind;
+	    ret = 1;
+	    dc = NULL;
+	    break;
+	  }
+      }
+  }
+
+  return ret;
+}
+
+/* Return whether NAME is the mangled form of a g++ V3 ABI constructor
+   name.  A non-zero return indicates the type of constructor.  */
+
+enum gnu_v3_ctor_kinds
+is_gnu_v3_mangled_ctor (const char *name)
+{
+  enum gnu_v3_ctor_kinds ctor_kind;
+  enum gnu_v3_dtor_kinds dtor_kind;
+
+  if (! is_ctor_or_dtor (name, &ctor_kind, &dtor_kind))
+    return (enum gnu_v3_ctor_kinds) 0;
+  return ctor_kind;
+}
+
+
+/* Return whether NAME is the mangled form of a g++ V3 ABI destructor
+   name.  A non-zero return indicates the type of destructor.  */
+
+enum gnu_v3_dtor_kinds
+is_gnu_v3_mangled_dtor (const char *name)
+{
+  enum gnu_v3_ctor_kinds ctor_kind;
+  enum gnu_v3_dtor_kinds dtor_kind;
+
+  if (! is_ctor_or_dtor (name, &ctor_kind, &dtor_kind))
+    return (enum gnu_v3_dtor_kinds) 0;
+  return dtor_kind;
+}
+
+#endif /* IN_GLIBCPP_V3 */
+
+#ifdef STANDALONE_DEMANGLER
+
+#include "getopt.h"
+#include "dyn-string.h"
+
+static void print_usage (FILE* fp, int exit_value);
+
+#define IS_ALPHA(CHAR)                                                  \
+  (((CHAR) >= 'a' && (CHAR) <= 'z')                                     \
+   || ((CHAR) >= 'A' && (CHAR) <= 'Z'))
+
+/* Non-zero if CHAR is a character than can occur in a mangled name.  */
+#define is_mangled_char(CHAR)                                           \
+  (IS_ALPHA (CHAR) || IS_DIGIT (CHAR)                                   \
+   || (CHAR) == '_' || (CHAR) == '.' || (CHAR) == '$')
+
+/* The name of this program, as invoked.  */
+const char* program_name;
+
+/* Prints usage summary to FP and then exits with EXIT_VALUE.  */
+
+static void
+print_usage (FILE* fp, int exit_value)
+{
+  fprintf (fp, "Usage: %s [options] [names ...]\n", program_name);
+  fprintf (fp, "Options:\n");
+  fprintf (fp, "  -h,--help       Display this message.\n");
+  fprintf (fp, "  -p,--no-params  Don't display function parameters\n");
+  fprintf (fp, "  -v,--verbose    Produce verbose demanglings.\n");
+  fprintf (fp, "If names are provided, they are demangled.  Otherwise filters standard input.\n");
+
+  exit (exit_value);
+}
+
+/* Option specification for getopt_long.  */
+static const struct option long_options[] = 
+{
+  { "help",	 no_argument, NULL, 'h' },
+  { "no-params", no_argument, NULL, 'p' },
+  { "verbose",   no_argument, NULL, 'v' },
+  { NULL,        no_argument, NULL, 0   },
+};
+
+/* Main entry for a demangling filter executable.  It will demangle
+   its command line arguments, if any.  If none are provided, it will
+   filter stdin to stdout, replacing any recognized mangled C++ names
+   with their demangled equivalents.  */
+
+int
+main (int argc, char *argv[])
+{
+  int i;
+  int opt_char;
+  int options = DMGL_PARAMS | DMGL_ANSI | DMGL_TYPES;
+
+  /* Use the program name of this program, as invoked.  */
+  program_name = argv[0];
+
+  /* Parse options.  */
+  do 
+    {
+      opt_char = getopt_long (argc, argv, "hpv", long_options, NULL);
+      switch (opt_char)
+	{
+	case '?':  /* Unrecognized option.  */
+	  print_usage (stderr, 1);
+	  break;
+
+	case 'h':
+	  print_usage (stdout, 0);
+	  break;
+
+	case 'p':
+	  options &= ~ DMGL_PARAMS;
+	  break;
+
+	case 'v':
+	  options |= DMGL_VERBOSE;
+	  break;
+	}
+    }
+  while (opt_char != -1);
+
+  if (optind == argc) 
+    /* No command line arguments were provided.  Filter stdin.  */
+    {
+      dyn_string_t mangled = dyn_string_new (3);
+      char *s;
+
+      /* Read all of input.  */
+      while (!feof (stdin))
+	{
+	  char c;
+
+	  /* Pile characters into mangled until we hit one that can't
+	     occur in a mangled name.  */
+	  c = getchar ();
+	  while (!feof (stdin) && is_mangled_char (c))
+	    {
+	      dyn_string_append_char (mangled, c);
+	      if (feof (stdin))
+		break;
+	      c = getchar ();
+	    }
+
+	  if (dyn_string_length (mangled) > 0)
+	    {
+#ifdef IN_GLIBCPP_V3
+	      s = __cxa_demangle (dyn_string_buf (mangled), NULL, NULL, NULL);
+#else
+	      s = cplus_demangle_v3 (dyn_string_buf (mangled), options);
+#endif
+
+	      if (s != NULL)
+		{
+		  fputs (s, stdout);
+		  free (s);
+		}
+	      else
+		{
+		  /* It might not have been a mangled name.  Print the
+		     original text.  */
+		  fputs (dyn_string_buf (mangled), stdout);
+		}
+
+	      dyn_string_clear (mangled);
+	    }
+
+	  /* If we haven't hit EOF yet, we've read one character that
+	     can't occur in a mangled name, so print it out.  */
+	  if (!feof (stdin))
+	    putchar (c);
+	}
+
+      dyn_string_delete (mangled);
+    }
+  else
+    /* Demangle command line arguments.  */
+    {
+      /* Loop over command line arguments.  */
+      for (i = optind; i < argc; ++i)
+	{
+	  char *s;
+#ifdef IN_GLIBCPP_V3
+	  int status;
+#endif
+
+	  /* Attempt to demangle.  */
+#ifdef IN_GLIBCPP_V3
+	  s = __cxa_demangle (argv[i], NULL, NULL, &status);
+#else
+	  s = cplus_demangle_v3 (argv[i], options);
+#endif
+
+	  /* If it worked, print the demangled name.  */
+	  if (s != NULL)
+	    {
+	      printf ("%s\n", s);
+	      free (s);
+	    }
+	  else
+	    {
+#ifdef IN_GLIBCPP_V3
+	      fprintf (stderr, "Failed: %s (status %d)\n", argv[i], status);
+#else
+	      fprintf (stderr, "Failed: %s\n", argv[i]);
+#endif
+	    }
+	}
+    }
+
+  return 0;
+}
+
+#endif /* STANDALONE_DEMANGLER */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/cp-demangle.h sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/cp-demangle.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/cp-demangle.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/cp-demangle.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,169 @@
+/* Internal demangler interface for g++ V3 ABI.
+   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2010
+   Free Software Foundation, Inc.
+   Written by Ian Lance Taylor <ian@wasabisystems.com>.
+
+   This file is part of the libiberty library, which is part of GCC.
+
+   This file is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   In addition to the permissions in the GNU General Public License, the
+   Free Software Foundation gives you unlimited permission to link the
+   compiled version of this file into combinations with other programs,
+   and to distribute those combinations without any restriction coming
+   from the use of this file.  (The General Public License restrictions
+   do apply in other respects; for example, they cover modification of
+   the file, and distribution when not linked into a combined
+   executable.)
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. 
+*/
+
+/* This file provides some definitions shared by cp-demangle.c and
+   cp-demint.c.  It should not be included by any other files.  */
+
+/* Information we keep for operators.  */
+
+struct demangle_operator_info
+{
+  /* Mangled name.  */
+  const char *code;
+  /* Real name.  */
+  const char *name;
+  /* Length of real name.  */
+  int len;
+  /* Number of arguments.  */
+  int args;
+};
+
+/* How to print the value of a builtin type.  */
+
+enum d_builtin_type_print
+{
+  /* Print as (type)val.  */
+  D_PRINT_DEFAULT,
+  /* Print as integer.  */
+  D_PRINT_INT,
+  /* Print as unsigned integer, with trailing "u".  */
+  D_PRINT_UNSIGNED,
+  /* Print as long, with trailing "l".  */
+  D_PRINT_LONG,
+  /* Print as unsigned long, with trailing "ul".  */
+  D_PRINT_UNSIGNED_LONG,
+  /* Print as long long, with trailing "ll".  */
+  D_PRINT_LONG_LONG,
+  /* Print as unsigned long long, with trailing "ull".  */
+  D_PRINT_UNSIGNED_LONG_LONG,
+  /* Print as bool.  */
+  D_PRINT_BOOL,
+  /* Print as float--put value in square brackets.  */
+  D_PRINT_FLOAT,
+  /* Print in usual way, but here to detect void.  */
+  D_PRINT_VOID
+};
+
+/* Information we keep for a builtin type.  */
+
+struct demangle_builtin_type_info
+{
+  /* Type name.  */
+  const char *name;
+  /* Length of type name.  */
+  int len;
+  /* Type name when using Java.  */
+  const char *java_name;
+  /* Length of java name.  */
+  int java_len;
+  /* How to print a value of this type.  */
+  enum d_builtin_type_print print;
+};
+
+/* The information structure we pass around.  */
+
+struct d_info
+{
+  /* The string we are demangling.  */
+  const char *s;
+  /* The end of the string we are demangling.  */
+  const char *send;
+  /* The options passed to the demangler.  */
+  int options;
+  /* The next character in the string to consider.  */
+  const char *n;
+  /* The array of components.  */
+  struct demangle_component *comps;
+  /* The index of the next available component.  */
+  int next_comp;
+  /* The number of available component structures.  */
+  int num_comps;
+  /* The array of substitutions.  */
+  struct demangle_component **subs;
+  /* The index of the next substitution.  */
+  int next_sub;
+  /* The number of available entries in the subs array.  */
+  int num_subs;
+  /* The number of substitutions which we actually made from the subs
+     array, plus the number of template parameter references we
+     saw.  */
+  int did_subs;
+  /* The last name we saw, for constructors and destructors.  */
+  struct demangle_component *last_name;
+  /* A running total of the length of large expansions from the
+     mangled name to the demangled name, such as standard
+     substitutions and builtin types.  */
+  int expansion;
+};
+
+/* To avoid running past the ending '\0', don't:
+   - call d_peek_next_char if d_peek_char returned '\0'
+   - call d_advance with an 'i' that is too large
+   - call d_check_char(di, '\0')
+   Everything else is safe.  */
+#define d_peek_char(di) (*((di)->n))
+#define d_peek_next_char(di) ((di)->n[1])
+#define d_advance(di, i) ((di)->n += (i))
+#define d_check_char(di, c) (d_peek_char(di) == c ? ((di)->n++, 1) : 0)
+#define d_next_char(di) (d_peek_char(di) == '\0' ? '\0' : *((di)->n++))
+#define d_str(di) ((di)->n)
+
+/* Functions and arrays in cp-demangle.c which are referenced by
+   functions in cp-demint.c.  */
+#ifdef IN_GLIBCPP_V3
+#define CP_STATIC_IF_GLIBCPP_V3 static
+#else
+#define CP_STATIC_IF_GLIBCPP_V3 extern
+#endif
+
+#ifndef IN_GLIBCPP_V3
+extern const struct demangle_operator_info cplus_demangle_operators[];
+#endif
+
+#define D_BUILTIN_TYPE_COUNT (33)
+
+CP_STATIC_IF_GLIBCPP_V3
+const struct demangle_builtin_type_info
+cplus_demangle_builtin_types[D_BUILTIN_TYPE_COUNT];
+
+CP_STATIC_IF_GLIBCPP_V3
+struct demangle_component *
+cplus_demangle_mangled_name (struct d_info *, int);
+
+CP_STATIC_IF_GLIBCPP_V3
+struct demangle_component *
+cplus_demangle_type (struct d_info *);
+
+extern void
+cplus_demangle_init_info (const char *, int, size_t, struct d_info *);
+
+/* cp-demangle.c needs to define this a little differently */
+#undef CP_STATIC_IF_GLIBCPP_V3
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/cp-demint.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/cp-demint.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/cp-demint.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/cp-demint.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,232 @@
+/* Demangler component interface functions.
+   Copyright (C) 2004 Free Software Foundation, Inc.
+   Written by Ian Lance Taylor <ian@wasabisystems.com>.
+
+   This file is part of the libiberty library, which is part of GCC.
+
+   This file is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   In addition to the permissions in the GNU General Public License, the
+   Free Software Foundation gives you unlimited permission to link the
+   compiled version of this file into combinations with other programs,
+   and to distribute those combinations without any restriction coming
+   from the use of this file.  (The General Public License restrictions
+   do apply in other respects; for example, they cover modification of
+   the file, and distribution when not linked into a combined
+   executable.)
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. 
+*/
+
+/* This file implements a few interface functions which are provided
+   for use with struct demangle_component trees.  These functions are
+   declared in demangle.h.  These functions are closely tied to the
+   demangler code in cp-demangle.c, and other interface functions can
+   be found in that file.  We put these functions in a separate file
+   because they are not needed by the demangler, and so we avoid
+   having them pulled in by programs which only need the
+   demangler.  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#include "ansidecl.h"
+#include "libiberty.h"
+#include "demangle.h"
+#include "cp-demangle.h"
+
+/* Fill in most component types.  */
+
+int
+cplus_demangle_fill_component (struct demangle_component *p,
+                               enum demangle_component_type type,
+                               struct demangle_component *left,
+                                struct demangle_component *right)
+{
+  if (p == NULL)
+    return 0;
+  switch (type)
+    {
+    case DEMANGLE_COMPONENT_QUAL_NAME:
+    case DEMANGLE_COMPONENT_LOCAL_NAME:
+    case DEMANGLE_COMPONENT_TYPED_NAME:
+    case DEMANGLE_COMPONENT_TEMPLATE:
+    case DEMANGLE_COMPONENT_CONSTRUCTION_VTABLE:
+    case DEMANGLE_COMPONENT_VENDOR_TYPE_QUAL:
+    case DEMANGLE_COMPONENT_FUNCTION_TYPE:
+    case DEMANGLE_COMPONENT_ARRAY_TYPE:
+    case DEMANGLE_COMPONENT_PTRMEM_TYPE:
+    case DEMANGLE_COMPONENT_ARGLIST:
+    case DEMANGLE_COMPONENT_TEMPLATE_ARGLIST:
+    case DEMANGLE_COMPONENT_UNARY:
+    case DEMANGLE_COMPONENT_BINARY:
+    case DEMANGLE_COMPONENT_BINARY_ARGS:
+    case DEMANGLE_COMPONENT_TRINARY:
+    case DEMANGLE_COMPONENT_TRINARY_ARG1:
+    case DEMANGLE_COMPONENT_TRINARY_ARG2:
+    case DEMANGLE_COMPONENT_LITERAL:
+    case DEMANGLE_COMPONENT_LITERAL_NEG:
+      break;
+
+      /* These component types only have one subtree.  */
+    case DEMANGLE_COMPONENT_VTABLE:
+    case DEMANGLE_COMPONENT_VTT:
+    case DEMANGLE_COMPONENT_TYPEINFO:
+    case DEMANGLE_COMPONENT_TYPEINFO_NAME:
+    case DEMANGLE_COMPONENT_TYPEINFO_FN:
+    case DEMANGLE_COMPONENT_THUNK:
+    case DEMANGLE_COMPONENT_VIRTUAL_THUNK:
+    case DEMANGLE_COMPONENT_COVARIANT_THUNK:
+    case DEMANGLE_COMPONENT_JAVA_CLASS:
+    case DEMANGLE_COMPONENT_GUARD:
+    case DEMANGLE_COMPONENT_REFTEMP:
+    case DEMANGLE_COMPONENT_RESTRICT:
+    case DEMANGLE_COMPONENT_VOLATILE:
+    case DEMANGLE_COMPONENT_CONST:
+    case DEMANGLE_COMPONENT_RESTRICT_THIS:
+    case DEMANGLE_COMPONENT_VOLATILE_THIS:
+    case DEMANGLE_COMPONENT_CONST_THIS:
+    case DEMANGLE_COMPONENT_POINTER:
+    case DEMANGLE_COMPONENT_REFERENCE:
+    case DEMANGLE_COMPONENT_COMPLEX:
+    case DEMANGLE_COMPONENT_IMAGINARY:
+    case DEMANGLE_COMPONENT_VENDOR_TYPE:
+    case DEMANGLE_COMPONENT_CAST:
+      if (right != NULL)
+	return 0;
+      break;
+
+    default:
+      /* Other types do not use subtrees.  */
+      return 0;
+    }
+
+  p->type = type;
+  p->u.s_binary.left = left;
+  p->u.s_binary.right = right;
+
+  return 1;
+}
+
+/* Fill in a DEMANGLE_COMPONENT_BUILTIN_TYPE.  */
+
+int
+cplus_demangle_fill_builtin_type (struct demangle_component *p,
+                                  const char *type_name)
+{
+  int len;
+  unsigned int i;
+
+  if (p == NULL || type_name == NULL)
+    return 0;
+  len = strlen (type_name);
+  for (i = 0; i < D_BUILTIN_TYPE_COUNT; ++i)
+    {
+      if (len == cplus_demangle_builtin_types[i].len
+	  && strcmp (type_name, cplus_demangle_builtin_types[i].name) == 0)
+	{
+	  p->type = DEMANGLE_COMPONENT_BUILTIN_TYPE;
+	  p->u.s_builtin.type = &cplus_demangle_builtin_types[i];
+	  return 1;
+	}
+    }
+  return 0;
+}
+
+/* Fill in a DEMANGLE_COMPONENT_OPERATOR.  */
+
+int
+cplus_demangle_fill_operator (struct demangle_component *p,
+                              const char *opname, int args)
+{
+  int len;
+  unsigned int i;
+
+  if (p == NULL || opname == NULL)
+    return 0;
+  len = strlen (opname);
+  for (i = 0; cplus_demangle_operators[i].name != NULL; ++i)
+    {
+      if (len == cplus_demangle_operators[i].len
+	  && args == cplus_demangle_operators[i].args
+	  && strcmp (opname, cplus_demangle_operators[i].name) == 0)
+	{
+	  p->type = DEMANGLE_COMPONENT_OPERATOR;
+	  p->u.s_operator.op = &cplus_demangle_operators[i];
+	  return 1;
+	}
+    }
+  return 0;
+}
+
+/* Translate a mangled name into components.  */
+
+struct demangle_component *
+cplus_demangle_v3_components (const char *mangled, int options, void **mem)
+{
+  size_t len;
+  int type;
+  struct d_info di;
+  struct demangle_component *dc;
+
+  len = strlen (mangled);
+
+  if (mangled[0] == '_' && mangled[1] == 'Z')
+    type = 0;
+  else
+    {
+      if ((options & DMGL_TYPES) == 0)
+	return NULL;
+      type = 1;
+    }
+
+  cplus_demangle_init_info (mangled, options, len, &di);
+
+  di.comps = ((struct demangle_component *)
+	      malloc (di.num_comps * sizeof (struct demangle_component)));
+  di.subs = ((struct demangle_component **)
+	     malloc (di.num_subs * sizeof (struct demangle_component *)));
+  if (di.comps == NULL || di.subs == NULL)
+    {
+      free (di.comps);
+      free (di.subs);
+      return NULL;
+    }
+
+  if (! type)
+    dc = cplus_demangle_mangled_name (&di, 1);
+  else
+    dc = cplus_demangle_type (&di);
+
+  /* If DMGL_PARAMS is set, then if we didn't consume the entire
+     mangled string, then we didn't successfully demangle it.  */
+  if ((options & DMGL_PARAMS) != 0 && d_peek_char (&di) != '\0')
+    dc = NULL;
+
+  free (di.subs);
+
+  if (dc != NULL)
+    *mem = di.comps;
+  else
+    free (di.comps);
+
+  return dc;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/cplus-dem.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/cplus-dem.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/cplus-dem.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/cplus-dem.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,4862 @@
+/* Demangler for GNU C++
+   Copyright 1989, 1991, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004, 2010 Free Software Foundation, Inc.
+   Written by James Clark (jjc@jclark.uucp)
+   Rewritten by Fred Fish (fnf@cygnus.com) for ARM and Lucid demangling
+   Modified by Satish Pai (pai@apollo.hp.com) for HP demangling
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+In addition to the permissions in the GNU Library General Public
+License, the Free Software Foundation gives you unlimited permission
+to link the compiled version of this file into combinations with other
+programs, and to distribute those combinations without any restriction
+coming from the use of this file.  (The Library Public License
+restrictions do apply in other respects; for example, they cover
+modification of the file, and distribution when not linked into a
+combined executable.)
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/* This file exports two functions; cplus_mangle_opname and cplus_demangle.
+
+   This file imports xmalloc and xrealloc, which are like malloc and
+   realloc except that they generate a fatal error if there is no
+   available memory.  */
+
+/* This file lives in both GCC and libiberty.  When making changes, please
+   try not to break either.  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "safe-ctype.h"
+
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#else
+void * malloc ();
+void * realloc ();
+#endif
+
+#include <demangle.h>
+#undef CURRENT_DEMANGLING_STYLE
+#define CURRENT_DEMANGLING_STYLE work->options
+
+#include "libiberty.h"
+
+#define min(X,Y) (((X) < (Y)) ? (X) : (Y))
+
+/* A value at least one greater than the maximum number of characters
+   that will be output when using the `%d' format with `printf'.  */
+#define INTBUF_SIZE 32
+
+extern void fancy_abort (void) ATTRIBUTE_NORETURN;
+
+/* In order to allow a single demangler executable to demangle strings
+   using various common values of CPLUS_MARKER, as well as any specific
+   one set at compile time, we maintain a string containing all the
+   commonly used ones, and check to see if the marker we are looking for
+   is in that string.  CPLUS_MARKER is usually '$' on systems where the
+   assembler can deal with that.  Where the assembler can't, it's usually
+   '.' (but on many systems '.' is used for other things).  We put the
+   current defined CPLUS_MARKER first (which defaults to '$'), followed
+   by the next most common value, followed by an explicit '$' in case
+   the value of CPLUS_MARKER is not '$'.
+
+   We could avoid this if we could just get g++ to tell us what the actual
+   cplus marker character is as part of the debug information, perhaps by
+   ensuring that it is the character that terminates the gcc<n>_compiled
+   marker symbol (FIXME).  */
+
+#if !defined (CPLUS_MARKER)
+#define CPLUS_MARKER '$'
+#endif
+
+enum demangling_styles current_demangling_style = auto_demangling;
+
+static char cplus_markers[] = { CPLUS_MARKER, '.', '$', '\0' };
+
+static char char_str[2] = { '\000', '\000' };
+
+void
+set_cplus_marker_for_demangling (int ch)
+{
+  cplus_markers[0] = ch;
+}
+
+typedef struct string		/* Beware: these aren't required to be */
+{				/*  '\0' terminated.  */
+  char *b;			/* pointer to start of string */
+  char *p;			/* pointer after last character */
+  char *e;			/* pointer after end of allocated space */
+} string;
+
+/* Stuff that is shared between sub-routines.
+   Using a shared structure allows cplus_demangle to be reentrant.  */
+
+struct work_stuff
+{
+  int options;
+  char **typevec;
+  char **ktypevec;
+  char **btypevec;
+  int numk;
+  int numb;
+  int ksize;
+  int bsize;
+  int ntypes;
+  int typevec_size;
+  int constructor;
+  int destructor;
+  int static_type;	/* A static member function */
+  int temp_start;       /* index in demangled to start of template args */
+  int type_quals;       /* The type qualifiers.  */
+  int dllimported;	/* Symbol imported from a PE DLL */
+  char **tmpl_argvec;   /* Template function arguments. */
+  int ntmpl_args;       /* The number of template function arguments. */
+  int forgetting_types; /* Nonzero if we are not remembering the types
+			   we see.  */
+  string* previous_argument; /* The last function argument demangled.  */
+  int nrepeats;         /* The number of times to repeat the previous
+			   argument.  */
+};
+
+#define PRINT_ANSI_QUALIFIERS (work -> options & DMGL_ANSI)
+#define PRINT_ARG_TYPES       (work -> options & DMGL_PARAMS)
+
+static const struct optable
+{
+  const char *const in;
+  const char *const out;
+  const int flags;
+} optable[] = {
+  {"nw",	  " new",	DMGL_ANSI},	/* new (1.92,	 ansi) */
+  {"dl",	  " delete",	DMGL_ANSI},	/* new (1.92,	 ansi) */
+  {"new",	  " new",	0},		/* old (1.91,	 and 1.x) */
+  {"delete",	  " delete",	0},		/* old (1.91,	 and 1.x) */
+  {"vn",	  " new []",	DMGL_ANSI},	/* GNU, pending ansi */
+  {"vd",	  " delete []",	DMGL_ANSI},	/* GNU, pending ansi */
+  {"as",	  "=",		DMGL_ANSI},	/* ansi */
+  {"ne",	  "!=",		DMGL_ANSI},	/* old, ansi */
+  {"eq",	  "==",		DMGL_ANSI},	/* old,	ansi */
+  {"ge",	  ">=",		DMGL_ANSI},	/* old,	ansi */
+  {"gt",	  ">",		DMGL_ANSI},	/* old,	ansi */
+  {"le",	  "<=",		DMGL_ANSI},	/* old,	ansi */
+  {"lt",	  "<",		DMGL_ANSI},	/* old,	ansi */
+  {"plus",	  "+",		0},		/* old */
+  {"pl",	  "+",		DMGL_ANSI},	/* ansi */
+  {"apl",	  "+=",		DMGL_ANSI},	/* ansi */
+  {"minus",	  "-",		0},		/* old */
+  {"mi",	  "-",		DMGL_ANSI},	/* ansi */
+  {"ami",	  "-=",		DMGL_ANSI},	/* ansi */
+  {"mult",	  "*",		0},		/* old */
+  {"ml",	  "*",		DMGL_ANSI},	/* ansi */
+  {"amu",	  "*=",		DMGL_ANSI},	/* ansi (ARM/Lucid) */
+  {"aml",	  "*=",		DMGL_ANSI},	/* ansi (GNU/g++) */
+  {"convert",	  "+",		0},		/* old (unary +) */
+  {"negate",	  "-",		0},		/* old (unary -) */
+  {"trunc_mod",	  "%",		0},		/* old */
+  {"md",	  "%",		DMGL_ANSI},	/* ansi */
+  {"amd",	  "%=",		DMGL_ANSI},	/* ansi */
+  {"trunc_div",	  "/",		0},		/* old */
+  {"dv",	  "/",		DMGL_ANSI},	/* ansi */
+  {"adv",	  "/=",		DMGL_ANSI},	/* ansi */
+  {"truth_andif", "&&",		0},		/* old */
+  {"aa",	  "&&",		DMGL_ANSI},	/* ansi */
+  {"truth_orif",  "||",		0},		/* old */
+  {"oo",	  "||",		DMGL_ANSI},	/* ansi */
+  {"truth_not",	  "!",		0},		/* old */
+  {"nt",	  "!",		DMGL_ANSI},	/* ansi */
+  {"postincrement","++",	0},		/* old */
+  {"pp",	  "++",		DMGL_ANSI},	/* ansi */
+  {"postdecrement","--",	0},		/* old */
+  {"mm",	  "--",		DMGL_ANSI},	/* ansi */
+  {"bit_ior",	  "|",		0},		/* old */
+  {"or",	  "|",		DMGL_ANSI},	/* ansi */
+  {"aor",	  "|=",		DMGL_ANSI},	/* ansi */
+  {"bit_xor",	  "^",		0},		/* old */
+  {"er",	  "^",		DMGL_ANSI},	/* ansi */
+  {"aer",	  "^=",		DMGL_ANSI},	/* ansi */
+  {"bit_and",	  "&",		0},		/* old */
+  {"ad",	  "&",		DMGL_ANSI},	/* ansi */
+  {"aad",	  "&=",		DMGL_ANSI},	/* ansi */
+  {"bit_not",	  "~",		0},		/* old */
+  {"co",	  "~",		DMGL_ANSI},	/* ansi */
+  {"call",	  "()",		0},		/* old */
+  {"cl",	  "()",		DMGL_ANSI},	/* ansi */
+  {"alshift",	  "<<",		0},		/* old */
+  {"ls",	  "<<",		DMGL_ANSI},	/* ansi */
+  {"als",	  "<<=",	DMGL_ANSI},	/* ansi */
+  {"arshift",	  ">>",		0},		/* old */
+  {"rs",	  ">>",		DMGL_ANSI},	/* ansi */
+  {"ars",	  ">>=",	DMGL_ANSI},	/* ansi */
+  {"component",	  "->",		0},		/* old */
+  {"pt",	  "->",		DMGL_ANSI},	/* ansi; Lucid C++ form */
+  {"rf",	  "->",		DMGL_ANSI},	/* ansi; ARM/GNU form */
+  {"indirect",	  "*",		0},		/* old */
+  {"method_call",  "->()",	0},		/* old */
+  {"addr",	  "&",		0},		/* old (unary &) */
+  {"array",	  "[]",		0},		/* old */
+  {"vc",	  "[]",		DMGL_ANSI},	/* ansi */
+  {"compound",	  ", ",		0},		/* old */
+  {"cm",	  ", ",		DMGL_ANSI},	/* ansi */
+  {"cond",	  "?:",		0},		/* old */
+  {"cn",	  "?:",		DMGL_ANSI},	/* pseudo-ansi */
+  {"max",	  ">?",		0},		/* old */
+  {"mx",	  ">?",		DMGL_ANSI},	/* pseudo-ansi */
+  {"min",	  "<?",		0},		/* old */
+  {"mn",	  "<?",		DMGL_ANSI},	/* pseudo-ansi */
+  {"nop",	  "",		0},		/* old (for operator=) */
+  {"rm",	  "->*",	DMGL_ANSI},	/* ansi */
+  {"sz",          "sizeof ",    DMGL_ANSI}      /* pseudo-ansi */
+};
+
+/* These values are used to indicate the various type varieties.
+   They are all non-zero so that they can be used as `success'
+   values.  */
+typedef enum type_kind_t
+{
+  tk_none,
+  tk_pointer,
+  tk_reference,
+  tk_integral,
+  tk_bool,
+  tk_char,
+  tk_real
+} type_kind_t;
+
+const struct demangler_engine libiberty_demanglers[] =
+{
+  {
+    NO_DEMANGLING_STYLE_STRING,
+    no_demangling,
+    "Demangling disabled"
+  }
+  ,
+  {
+    AUTO_DEMANGLING_STYLE_STRING,
+      auto_demangling,
+      "Automatic selection based on executable"
+  }
+  ,
+  {
+    GNU_DEMANGLING_STYLE_STRING,
+      gnu_demangling,
+      "GNU (g++) style demangling"
+  }
+  ,
+  {
+    LUCID_DEMANGLING_STYLE_STRING,
+      lucid_demangling,
+      "Lucid (lcc) style demangling"
+  }
+  ,
+  {
+    ARM_DEMANGLING_STYLE_STRING,
+      arm_demangling,
+      "ARM style demangling"
+  }
+  ,
+  {
+    HP_DEMANGLING_STYLE_STRING,
+      hp_demangling,
+      "HP (aCC) style demangling"
+  }
+  ,
+  {
+    EDG_DEMANGLING_STYLE_STRING,
+      edg_demangling,
+      "EDG style demangling"
+  }
+  ,
+  {
+    GNU_V3_DEMANGLING_STYLE_STRING,
+    gnu_v3_demangling,
+    "GNU (g++) V3 ABI-style demangling"
+  }
+  ,
+  {
+    JAVA_DEMANGLING_STYLE_STRING,
+    java_demangling,
+    "Java style demangling"
+  }
+  ,
+  {
+    GNAT_DEMANGLING_STYLE_STRING,
+    gnat_demangling,
+    "GNAT style demangling"
+  }
+  ,
+  {
+    NULL, unknown_demangling, NULL
+  }
+};
+
+#define STRING_EMPTY(str)	((str) -> b == (str) -> p)
+#define APPEND_BLANK(str)	{if (!STRING_EMPTY(str)) \
+    string_append(str, " ");}
+#define LEN_STRING(str)         ( (STRING_EMPTY(str))?0:((str)->p - (str)->b))
+
+/* The scope separator appropriate for the language being demangled.  */
+
+#define SCOPE_STRING(work) ((work->options & DMGL_JAVA) ? "." : "::")
+
+#define ARM_VTABLE_STRING "__vtbl__"	/* Lucid/ARM virtual table prefix */
+#define ARM_VTABLE_STRLEN 8		/* strlen (ARM_VTABLE_STRING) */
+
+/* Prototypes for local functions */
+
+static void delete_work_stuff (struct work_stuff *);
+
+static void delete_non_B_K_work_stuff (struct work_stuff *);
+
+static char *mop_up (struct work_stuff *, string *, int);
+
+static void squangle_mop_up (struct work_stuff *);
+
+static void work_stuff_copy_to_from (struct work_stuff *, struct work_stuff *);
+
+#if 0
+static int
+demangle_method_args (struct work_stuff *, const char **, string *);
+#endif
+
+static char *
+internal_cplus_demangle (struct work_stuff *, const char *);
+
+static int
+demangle_template_template_parm (struct work_stuff *work,
+                                 const char **, string *);
+
+static int
+demangle_template (struct work_stuff *work, const char **, string *,
+                   string *, int, int);
+
+static int
+arm_pt (struct work_stuff *, const char *, int, const char **,
+        const char **);
+
+static int
+demangle_class_name (struct work_stuff *, const char **, string *);
+
+static int
+demangle_qualified (struct work_stuff *, const char **, string *,
+                    int, int);
+
+static int demangle_class (struct work_stuff *, const char **, string *);
+
+static int demangle_fund_type (struct work_stuff *, const char **, string *);
+
+static int demangle_signature (struct work_stuff *, const char **, string *);
+
+static int demangle_prefix (struct work_stuff *, const char **, string *);
+
+static int gnu_special (struct work_stuff *, const char **, string *);
+
+static int arm_special (const char **, string *);
+
+static void string_need (string *, int);
+
+static void string_delete (string *);
+
+static void
+string_init (string *);
+
+static void string_clear (string *);
+
+#if 0
+static int string_empty (string *);
+#endif
+
+static void string_append (string *, const char *);
+
+static void string_appends (string *, string *);
+
+static void string_appendn (string *, const char *, int);
+
+static void string_prepend (string *, const char *);
+
+static void string_prependn (string *, const char *, int);
+
+static void string_append_template_idx (string *, int);
+
+static int get_count (const char **, int *);
+
+static int consume_count (const char **);
+
+static int consume_count_with_underscores (const char**);
+
+static int demangle_args (struct work_stuff *, const char **, string *);
+
+static int demangle_nested_args (struct work_stuff*, const char**, string*);
+
+static int do_type (struct work_stuff *, const char **, string *);
+
+static int do_arg (struct work_stuff *, const char **, string *);
+
+static int
+demangle_function_name (struct work_stuff *, const char **, string *,
+                        const char *);
+
+static int
+iterate_demangle_function (struct work_stuff *,
+                           const char **, string *, const char *);
+
+static void remember_type (struct work_stuff *, const char *, int);
+
+static void remember_Btype (struct work_stuff *, const char *, int, int);
+
+static int register_Btype (struct work_stuff *);
+
+static void remember_Ktype (struct work_stuff *, const char *, int);
+
+static void forget_types (struct work_stuff *);
+
+static void forget_B_and_K_types (struct work_stuff *);
+
+static void string_prepends (string *, string *);
+
+static int
+demangle_template_value_parm (struct work_stuff*, const char**,
+                              string*, type_kind_t);
+
+static int
+do_hpacc_template_const_value (struct work_stuff *, const char **, string *);
+
+static int
+do_hpacc_template_literal (struct work_stuff *, const char **, string *);
+
+static int snarf_numeric_literal (const char **, string *);
+
+/* There is a TYPE_QUAL value for each type qualifier.  They can be
+   combined by bitwise-or to form the complete set of qualifiers for a
+   type.  */
+
+#define TYPE_UNQUALIFIED   0x0
+#define TYPE_QUAL_CONST    0x1
+#define TYPE_QUAL_VOLATILE 0x2
+#define TYPE_QUAL_RESTRICT 0x4
+
+static int code_for_qualifier (int);
+
+static const char* qualifier_string (int);
+
+static const char* demangle_qualifier (int);
+
+static int demangle_expression (struct work_stuff *, const char **, string *, 
+                                type_kind_t);
+
+static int
+demangle_integral_value (struct work_stuff *, const char **, string *);
+
+static int
+demangle_real_value (struct work_stuff *, const char **, string *);
+
+static void
+demangle_arm_hp_template (struct work_stuff *, const char **, int, string *);
+
+static void
+recursively_demangle (struct work_stuff *, const char **, string *, int);
+
+/* Translate count to integer, consuming tokens in the process.
+   Conversion terminates on the first non-digit character.
+
+   Trying to consume something that isn't a count results in no
+   consumption of input and a return of -1.
+
+   Overflow consumes the rest of the digits, and returns -1.  */
+
+static int
+consume_count (const char **type)
+{
+  int count = 0;
+
+  if (! ISDIGIT ((unsigned char)**type))
+    return -1;
+
+  while (ISDIGIT ((unsigned char)**type))
+    {
+      count *= 10;
+
+      /* Check for overflow.
+	 We assume that count is represented using two's-complement;
+	 no power of two is divisible by ten, so if an overflow occurs
+	 when multiplying by ten, the result will not be a multiple of
+	 ten.  */
+      if ((count % 10) != 0)
+	{
+	  while (ISDIGIT ((unsigned char) **type))
+	    (*type)++;
+	  return -1;
+	}
+
+      count += **type - '0';
+      (*type)++;
+    }
+
+  if (count < 0)
+    count = -1;
+
+  return (count);
+}
+
+
+/* Like consume_count, but for counts that are preceded and followed
+   by '_' if they are greater than 10.  Also, -1 is returned for
+   failure, since 0 can be a valid value.  */
+
+static int
+consume_count_with_underscores (const char **mangled)
+{
+  int idx;
+
+  if (**mangled == '_')
+    {
+      (*mangled)++;
+      if (!ISDIGIT ((unsigned char)**mangled))
+	return -1;
+
+      idx = consume_count (mangled);
+      if (**mangled != '_')
+	/* The trailing underscore was missing. */
+	return -1;
+
+      (*mangled)++;
+    }
+  else
+    {
+      if (**mangled < '0' || **mangled > '9')
+	return -1;
+
+      idx = **mangled - '0';
+      (*mangled)++;
+    }
+
+  return idx;
+}
+
+/* C is the code for a type-qualifier.  Return the TYPE_QUAL
+   corresponding to this qualifier.  */
+
+static int
+code_for_qualifier (int c)
+{
+  switch (c)
+    {
+    case 'C':
+      return TYPE_QUAL_CONST;
+
+    case 'V':
+      return TYPE_QUAL_VOLATILE;
+
+    case 'u':
+      return TYPE_QUAL_RESTRICT;
+
+    default:
+      break;
+    }
+
+  /* C was an invalid qualifier.  */
+  abort ();
+}
+
+/* Return the string corresponding to the qualifiers given by
+   TYPE_QUALS.  */
+
+static const char*
+qualifier_string (int type_quals)
+{
+  switch (type_quals)
+    {
+    case TYPE_UNQUALIFIED:
+      return "";
+
+    case TYPE_QUAL_CONST:
+      return "const";
+
+    case TYPE_QUAL_VOLATILE:
+      return "volatile";
+
+    case TYPE_QUAL_RESTRICT:
+      return "__restrict";
+
+    case TYPE_QUAL_CONST | TYPE_QUAL_VOLATILE:
+      return "const volatile";
+
+    case TYPE_QUAL_CONST | TYPE_QUAL_RESTRICT:
+      return "const __restrict";
+
+    case TYPE_QUAL_VOLATILE | TYPE_QUAL_RESTRICT:
+      return "volatile __restrict";
+
+    case TYPE_QUAL_CONST | TYPE_QUAL_VOLATILE | TYPE_QUAL_RESTRICT:
+      return "const volatile __restrict";
+
+    default:
+      break;
+    }
+
+  /* TYPE_QUALS was an invalid qualifier set.  */
+  abort ();
+}
+
+/* C is the code for a type-qualifier.  Return the string
+   corresponding to this qualifier.  This function should only be
+   called with a valid qualifier code.  */
+
+static const char*
+demangle_qualifier (int c)
+{
+  return qualifier_string (code_for_qualifier (c));
+}
+
+int
+cplus_demangle_opname (const char *opname, char *result, int options)
+{
+  int len, len1, ret;
+  string type;
+  struct work_stuff work[1];
+  const char *tem;
+
+  len = strlen(opname);
+  result[0] = '\0';
+  ret = 0;
+  memset ((char *) work, 0, sizeof (work));
+  work->options = options;
+
+  if (opname[0] == '_' && opname[1] == '_'
+      && opname[2] == 'o' && opname[3] == 'p')
+    {
+      /* ANSI.  */
+      /* type conversion operator.  */
+      tem = opname + 4;
+      if (do_type (work, &tem, &type))
+	{
+	  strcat (result, "operator ");
+	  strncat (result, type.b, type.p - type.b);
+	  string_delete (&type);
+	  ret = 1;
+	}
+    }
+  else if (opname[0] == '_' && opname[1] == '_'
+	   && ISLOWER((unsigned char)opname[2])
+	   && ISLOWER((unsigned char)opname[3]))
+    {
+      if (opname[4] == '\0')
+	{
+	  /* Operator.  */
+	  size_t i;
+	  for (i = 0; i < ARRAY_SIZE (optable); i++)
+	    {
+	      if (strlen (optable[i].in) == 2
+		  && memcmp (optable[i].in, opname + 2, 2) == 0)
+		{
+		  strcat (result, "operator");
+		  strcat (result, optable[i].out);
+		  ret = 1;
+		  break;
+		}
+	    }
+	}
+      else
+	{
+	  if (opname[2] == 'a' && opname[5] == '\0')
+	    {
+	      /* Assignment.  */
+	      size_t i;
+	      for (i = 0; i < ARRAY_SIZE (optable); i++)
+		{
+		  if (strlen (optable[i].in) == 3
+		      && memcmp (optable[i].in, opname + 2, 3) == 0)
+		    {
+		      strcat (result, "operator");
+		      strcat (result, optable[i].out);
+		      ret = 1;
+		      break;
+		    }
+		}
+	    }
+	}
+    }
+  else if (len >= 3
+	   && opname[0] == 'o'
+	   && opname[1] == 'p'
+	   && strchr (cplus_markers, opname[2]) != NULL)
+    {
+      /* see if it's an assignment expression */
+      if (len >= 10 /* op$assign_ */
+	  && memcmp (opname + 3, "assign_", 7) == 0)
+	{
+	  size_t i;
+	  for (i = 0; i < ARRAY_SIZE (optable); i++)
+	    {
+	      len1 = len - 10;
+	      if ((int) strlen (optable[i].in) == len1
+		  && memcmp (optable[i].in, opname + 10, len1) == 0)
+		{
+		  strcat (result, "operator");
+		  strcat (result, optable[i].out);
+		  strcat (result, "=");
+		  ret = 1;
+		  break;
+		}
+	    }
+	}
+      else
+	{
+	  size_t i;
+	  for (i = 0; i < ARRAY_SIZE (optable); i++)
+	    {
+	      len1 = len - 3;
+	      if ((int) strlen (optable[i].in) == len1
+		  && memcmp (optable[i].in, opname + 3, len1) == 0)
+		{
+		  strcat (result, "operator");
+		  strcat (result, optable[i].out);
+		  ret = 1;
+		  break;
+		}
+	    }
+	}
+    }
+  else if (len >= 5 && memcmp (opname, "type", 4) == 0
+	   && strchr (cplus_markers, opname[4]) != NULL)
+    {
+      /* type conversion operator */
+      tem = opname + 5;
+      if (do_type (work, &tem, &type))
+	{
+	  strcat (result, "operator ");
+	  strncat (result, type.b, type.p - type.b);
+	  string_delete (&type);
+	  ret = 1;
+	}
+    }
+  squangle_mop_up (work);
+  return ret;
+
+}
+
+/* Takes operator name as e.g. "++" and returns mangled
+   operator name (e.g. "postincrement_expr"), or NULL if not found.
+
+   If OPTIONS & DMGL_ANSI == 1, return the ANSI name;
+   if OPTIONS & DMGL_ANSI == 0, return the old GNU name.  */
+
+const char *
+cplus_mangle_opname (const char *opname, int options)
+{
+  size_t i;
+  int len;
+
+  len = strlen (opname);
+  for (i = 0; i < ARRAY_SIZE (optable); i++)
+    {
+      if ((int) strlen (optable[i].out) == len
+	  && (options & DMGL_ANSI) == (optable[i].flags & DMGL_ANSI)
+	  && memcmp (optable[i].out, opname, len) == 0)
+	return optable[i].in;
+    }
+  return (0);
+}
+
+/* Add a routine to set the demangling style to be sure it is valid and
+   allow for any demangler initialization that maybe necessary. */
+
+enum demangling_styles
+cplus_demangle_set_style (enum demangling_styles style)
+{
+  const struct demangler_engine *demangler = libiberty_demanglers; 
+
+  for (; demangler->demangling_style != unknown_demangling; ++demangler)
+    if (style == demangler->demangling_style)
+      {
+	current_demangling_style = style;
+	return current_demangling_style;
+      }
+
+  return unknown_demangling;
+}
+
+/* Do string name to style translation */
+
+enum demangling_styles
+cplus_demangle_name_to_style (const char *name)
+{
+  const struct demangler_engine *demangler = libiberty_demanglers; 
+
+  for (; demangler->demangling_style != unknown_demangling; ++demangler)
+    if (strcmp (name, demangler->demangling_style_name) == 0)
+      return demangler->demangling_style;
+
+  return unknown_demangling;
+}
+
+/* char *cplus_demangle (const char *mangled, int options)
+
+   If MANGLED is a mangled function name produced by GNU C++, then
+   a pointer to a @code{malloc}ed string giving a C++ representation
+   of the name will be returned; otherwise NULL will be returned.
+   It is the caller's responsibility to free the string which
+   is returned.
+
+   The OPTIONS arg may contain one or more of the following bits:
+
+   	DMGL_ANSI	ANSI qualifiers such as `const' and `void' are
+			included.
+	DMGL_PARAMS	Function parameters are included.
+
+   For example,
+
+   cplus_demangle ("foo__1Ai", DMGL_PARAMS)		=> "A::foo(int)"
+   cplus_demangle ("foo__1Ai", DMGL_PARAMS | DMGL_ANSI)	=> "A::foo(int)"
+   cplus_demangle ("foo__1Ai", 0)			=> "A::foo"
+
+   cplus_demangle ("foo__1Afe", DMGL_PARAMS)		=> "A::foo(float,...)"
+   cplus_demangle ("foo__1Afe", DMGL_PARAMS | DMGL_ANSI)=> "A::foo(float,...)"
+   cplus_demangle ("foo__1Afe", 0)			=> "A::foo"
+
+   Note that any leading underscores, or other such characters prepended by
+   the compilation system, are presumed to have already been stripped from
+   MANGLED.  */
+
+char *
+cplus_demangle (const char *mangled, int options)
+{
+  char *ret;
+  struct work_stuff work[1];
+
+  if (current_demangling_style == no_demangling)
+    return xstrdup (mangled);
+
+  memset ((char *) work, 0, sizeof (work));
+  work->options = options;
+  if ((work->options & DMGL_STYLE_MASK) == 0)
+    work->options |= (int) current_demangling_style & DMGL_STYLE_MASK;
+
+  /* The V3 ABI demangling is implemented elsewhere.  */
+  if (GNU_V3_DEMANGLING || AUTO_DEMANGLING)
+    {
+      ret = cplus_demangle_v3 (mangled, work->options);
+      if (ret || GNU_V3_DEMANGLING)
+	return ret;
+    }
+
+  if (JAVA_DEMANGLING)
+    {
+      ret = java_demangle_v3 (mangled);
+      if (ret)
+        return ret;
+    }
+
+  if (GNAT_DEMANGLING)
+    return ada_demangle (mangled, options);
+
+  ret = internal_cplus_demangle (work, mangled);
+  squangle_mop_up (work);
+  return (ret);
+}
+
+/* Demangle ada names.  The encoding is documented in gcc/ada/exp_dbug.ads.  */
+
+char *
+ada_demangle (const char *mangled, int option ATTRIBUTE_UNUSED)
+{
+  int len0;
+  const char* p;
+  char *d;
+  char *demangled;
+  
+  /* Discard leading _ada_, which is used for library level subprograms.  */
+  if (strncmp (mangled, "_ada_", 5) == 0)
+    mangled += 5;
+
+  /* All ada unit names are lower-case.  */
+  if (!ISLOWER (mangled[0]))
+    goto unknown;
+
+  /* Most of the demangling will trivially remove chars.  Operator names
+     may add one char but because they are always preceeded by '__' which is
+     replaced by '.', they eventually never expand the size.
+     A few special names such as '___elabs' add a few chars (at most 7), but
+     they occur only once.  */
+  len0 = strlen (mangled) + 7 + 1;
+  demangled = XNEWVEC (char, len0);
+  
+  d = demangled;
+  p = mangled;
+  while (1)
+    {
+      /* An entity names is expected.  */
+      if (ISLOWER (*p))
+        {
+          /* An identifier, which is always lower case.  */
+          do
+            *d++ = *p++;
+          while (ISLOWER(*p) || ISDIGIT (*p)
+                 || (p[0] == '_' && (ISLOWER (p[1]) || ISDIGIT (p[1]))));
+        }
+      else if (p[0] == 'O')
+        {
+          /* An operator name.  */
+          static const char * const operators[][2] =
+            {{"Oabs", "abs"},  {"Oand", "and"},    {"Omod", "mod"},
+             {"Onot", "not"},  {"Oor", "or"},      {"Orem", "rem"},
+             {"Oxor", "xor"},  {"Oeq", "="},       {"One", "/="},
+             {"Olt", "<"},     {"Ole", "<="},      {"Ogt", ">"},
+             {"Oge", ">="},    {"Oadd", "+"},      {"Osubtract", "-"},
+             {"Oconcat", "&"}, {"Omultiply", "*"}, {"Odivide", "/"},
+             {"Oexpon", "**"}, {NULL, NULL}};
+          int k;
+
+          for (k = 0; operators[k][0] != NULL; k++)
+            {
+              size_t slen = strlen (operators[k][0]);
+              if (strncmp (p, operators[k][0], slen) == 0)
+                {
+                  p += slen;
+                  slen = strlen (operators[k][1]);
+                  *d++ = '"';
+                  memcpy (d, operators[k][1], slen);
+                  d += slen;
+                  *d++ = '"';
+                  break;
+                }
+            }
+          /* Operator not found.  */
+          if (operators[k][0] == NULL)
+            goto unknown;
+        }
+      else
+        {
+          /* Not a GNAT encoding.  */
+          goto unknown;
+        }
+
+      /* The name can be directly followed by some uppercase letters.  */
+      if (p[0] == 'T' && p[1] == 'K')
+        {
+          /* Task stuff.  */
+          if (p[2] == 'B' && p[3] == 0)
+            {
+              /* Subprogram for task body.  */
+              break;
+            }
+          else if (p[2] == '_' && p[3] == '_')
+            {
+              /* Inner declarations in a task.  */
+              p += 4;
+              *d++ = '.';
+              continue;
+            }
+          else
+            goto unknown;
+        }
+      if (p[0] == 'E' && p[1] == 0)
+        {
+          /* Exception name.  */
+          goto unknown;
+        }
+      if ((p[0] == 'P' || p[0] == 'N') && p[1] == 0)
+        {
+          /* Protected type subprogram.  */
+          break;
+        }
+      if ((*p == 'N' || *p == 'S') && p[1] == 0)
+        {
+          /* Enumerated type name table.  */
+          goto unknown;
+        }
+      if (p[0] == 'X')
+        {
+          /* Body nested.  */
+          p++;
+          while (p[0] == 'n' || p[0] == 'b')
+            p++;
+        }
+      if (p[0] == 'S' && p[1] != 0 && (p[2] == '_' || p[2] == 0))
+        {
+          /* Stream operations.  */
+          const char *name;
+          switch (p[1])
+            {
+            case 'R':
+              name = "'Read";
+              break;
+            case 'W':
+              name = "'Write";
+              break;
+            case 'I':
+              name = "'Input";
+              break;
+            case 'O':
+              name = "'Output";
+              break;
+            default:
+              goto unknown;
+            }
+          p += 2;
+          strcpy (d, name);
+          d += strlen (name);
+        }
+      else if (p[0] == 'D')
+        {
+          /* Controlled type operation.  */
+          const char *name;
+          switch (p[1])
+            {
+            case 'F':
+              name = ".Finalize";
+              break;
+            case 'A':
+              name = ".Adjust";
+              break;
+            default:
+              goto unknown;
+            }
+          strcpy (d, name);
+          d += strlen (name);
+          break;
+        }
+
+      if (p[0] == '_')
+        {
+          /* Separator.  */
+          if (p[1] == '_')
+            {
+              /* Standard separator.  Handled first.  */
+              p += 2;
+
+              if (ISDIGIT (*p))
+                {
+                  /* Overloading number.  */
+                  do
+                    p++;
+                  while (ISDIGIT (*p) || (p[0] == '_' && ISDIGIT (p[1])));
+                  if (*p == 'X')
+                    {
+                      p++;
+                      while (p[0] == 'n' || p[0] == 'b')
+                        p++;
+                    }
+                }
+              else if (p[0] == '_' && p[1] != '_')
+                {
+                  /* Special names.  */
+                  static const char * const special[][2] = {
+                    { "_elabb", "'Elab_Body" },
+                    { "_elabs", "'Elab_Spec" },
+                    { "_size", "'Size" },
+                    { "_alignment", "'Alignment" },
+                    { "_assign", ".\":=\"" },
+                    { NULL, NULL }
+                  };
+                  int k;
+
+                  for (k = 0; special[k][0] != NULL; k++)
+                    {
+                      size_t slen = strlen (special[k][0]);
+                      if (strncmp (p, special[k][0], slen) == 0)
+                        {
+                          p += slen;
+                          slen = strlen (special[k][1]);
+                          memcpy (d, special[k][1], slen);
+                          d += slen;
+                          break;
+                        }
+                    }
+                  if (special[k][0] != NULL)
+                    break;
+                  else
+                    goto unknown;
+                }
+              else
+                {
+                  *d++ = '.';
+                  continue;
+                }
+            }
+          else if (p[1] == 'B' || p[1] == 'E')
+            {
+              /* Entry Body or barrier Evaluation.  */
+              p += 2;
+              while (ISDIGIT (*p))
+                p++;
+              if (p[0] == 's' && p[1] == 0)
+                break;
+              else
+                goto unknown;
+            }
+          else
+            goto unknown;
+        }
+
+      if (p[0] == '.' && ISDIGIT (p[1]))
+        {
+          /* Nested subprogram.  */
+          p += 2;
+          while (ISDIGIT (*p))
+            p++;
+        }
+      if (*p == 0)
+        {
+          /* End of mangled name.  */
+          break;
+        }
+      else
+        goto unknown;
+    }
+  *d = 0;
+  return demangled;
+
+ unknown:
+  len0 = strlen (mangled);
+  demangled = XNEWVEC (char, len0 + 3);
+
+  if (mangled[0] == '<')
+     strcpy (demangled, mangled);
+  else
+    sprintf (demangled, "<%s>", mangled);
+
+  return demangled;
+}
+
+/* This function performs most of what cplus_demangle use to do, but
+   to be able to demangle a name with a B, K or n code, we need to
+   have a longer term memory of what types have been seen. The original
+   now initializes and cleans up the squangle code info, while internal
+   calls go directly to this routine to avoid resetting that info. */
+
+static char *
+internal_cplus_demangle (struct work_stuff *work, const char *mangled)
+{
+
+  string decl;
+  int success = 0;
+  char *demangled = NULL;
+  int s1, s2, s3, s4;
+  s1 = work->constructor;
+  s2 = work->destructor;
+  s3 = work->static_type;
+  s4 = work->type_quals;
+  work->constructor = work->destructor = 0;
+  work->type_quals = TYPE_UNQUALIFIED;
+  work->dllimported = 0;
+
+  if ((mangled != NULL) && (*mangled != '\0'))
+    {
+      string_init (&decl);
+
+      /* First check to see if gnu style demangling is active and if the
+	 string to be demangled contains a CPLUS_MARKER.  If so, attempt to
+	 recognize one of the gnu special forms rather than looking for a
+	 standard prefix.  In particular, don't worry about whether there
+	 is a "__" string in the mangled string.  Consider "_$_5__foo" for
+	 example.  */
+
+      if ((AUTO_DEMANGLING || GNU_DEMANGLING))
+	{
+	  success = gnu_special (work, &mangled, &decl);
+	}
+      if (!success)
+	{
+	  success = demangle_prefix (work, &mangled, &decl);
+	}
+      if (success && (*mangled != '\0'))
+	{
+	  success = demangle_signature (work, &mangled, &decl);
+	}
+      if (work->constructor == 2)
+        {
+          string_prepend (&decl, "global constructors keyed to ");
+          work->constructor = 0;
+        }
+      else if (work->destructor == 2)
+        {
+          string_prepend (&decl, "global destructors keyed to ");
+          work->destructor = 0;
+        }
+      else if (work->dllimported == 1)
+        {
+          string_prepend (&decl, "import stub for ");
+          work->dllimported = 0;
+        }
+      demangled = mop_up (work, &decl, success);
+    }
+  work->constructor = s1;
+  work->destructor = s2;
+  work->static_type = s3;
+  work->type_quals = s4;
+  return demangled;
+}
+
+
+/* Clear out and squangling related storage */
+static void
+squangle_mop_up (struct work_stuff *work)
+{
+  /* clean up the B and K type mangling types. */
+  forget_B_and_K_types (work);
+  if (work -> btypevec != NULL)
+    {
+      free ((char *) work -> btypevec);
+    }
+  if (work -> ktypevec != NULL)
+    {
+      free ((char *) work -> ktypevec);
+    }
+}
+
+
+/* Copy the work state and storage.  */
+
+static void
+work_stuff_copy_to_from (struct work_stuff *to, struct work_stuff *from)
+{
+  int i;
+
+  delete_work_stuff (to);
+
+  /* Shallow-copy scalars.  */
+  memcpy (to, from, sizeof (*to));
+
+  /* Deep-copy dynamic storage.  */
+  if (from->typevec_size)
+    to->typevec = XNEWVEC (char *, from->typevec_size);
+
+  for (i = 0; i < from->ntypes; i++)
+    {
+      int len = strlen (from->typevec[i]) + 1;
+
+      to->typevec[i] = XNEWVEC (char, len);
+      memcpy (to->typevec[i], from->typevec[i], len);
+    }
+
+  if (from->ksize)
+    to->ktypevec = XNEWVEC (char *, from->ksize);
+
+  for (i = 0; i < from->numk; i++)
+    {
+      int len = strlen (from->ktypevec[i]) + 1;
+
+      to->ktypevec[i] = XNEWVEC (char, len);
+      memcpy (to->ktypevec[i], from->ktypevec[i], len);
+    }
+
+  if (from->bsize)
+    to->btypevec = XNEWVEC (char *, from->bsize);
+
+  for (i = 0; i < from->numb; i++)
+    {
+      int len = strlen (from->btypevec[i]) + 1;
+
+      to->btypevec[i] = XNEWVEC (char , len);
+      memcpy (to->btypevec[i], from->btypevec[i], len);
+    }
+
+  if (from->ntmpl_args)
+    to->tmpl_argvec = XNEWVEC (char *, from->ntmpl_args);
+
+  for (i = 0; i < from->ntmpl_args; i++)
+    {
+      int len = strlen (from->tmpl_argvec[i]) + 1;
+
+      to->tmpl_argvec[i] = XNEWVEC (char, len);
+      memcpy (to->tmpl_argvec[i], from->tmpl_argvec[i], len);
+    }
+
+  if (from->previous_argument)
+    {
+      to->previous_argument = XNEW (string);
+      string_init (to->previous_argument);
+      string_appends (to->previous_argument, from->previous_argument);
+    }
+}
+
+
+/* Delete dynamic stuff in work_stuff that is not to be re-used.  */
+
+static void
+delete_non_B_K_work_stuff (struct work_stuff *work)
+{
+  /* Discard the remembered types, if any.  */
+
+  forget_types (work);
+  if (work -> typevec != NULL)
+    {
+      free ((char *) work -> typevec);
+      work -> typevec = NULL;
+      work -> typevec_size = 0;
+    }
+  if (work->tmpl_argvec)
+    {
+      int i;
+
+      for (i = 0; i < work->ntmpl_args; i++)
+	free ((char*) work->tmpl_argvec[i]);
+
+      free ((char*) work->tmpl_argvec);
+      work->tmpl_argvec = NULL;
+    }
+  if (work->previous_argument)
+    {
+      string_delete (work->previous_argument);
+      free ((char*) work->previous_argument);
+      work->previous_argument = NULL;
+    }
+}
+
+
+/* Delete all dynamic storage in work_stuff.  */
+static void
+delete_work_stuff (struct work_stuff *work)
+{
+  delete_non_B_K_work_stuff (work);
+  squangle_mop_up (work);
+}
+
+
+/* Clear out any mangled storage */
+
+static char *
+mop_up (struct work_stuff *work, string *declp, int success)
+{
+  char *demangled = NULL;
+
+  delete_non_B_K_work_stuff (work);
+
+  /* If demangling was successful, ensure that the demangled string is null
+     terminated and return it.  Otherwise, free the demangling decl.  */
+
+  if (!success)
+    {
+      string_delete (declp);
+    }
+  else
+    {
+      string_appendn (declp, "", 1);
+      demangled = declp->b;
+    }
+  return (demangled);
+}
+
+/*
+
+LOCAL FUNCTION
+
+	demangle_signature -- demangle the signature part of a mangled name
+
+SYNOPSIS
+
+	static int
+	demangle_signature (struct work_stuff *work, const char **mangled,
+			    string *declp);
+
+DESCRIPTION
+
+	Consume and demangle the signature portion of the mangled name.
+
+	DECLP is the string where demangled output is being built.  At
+	entry it contains the demangled root name from the mangled name
+	prefix.  I.E. either a demangled operator name or the root function
+	name.  In some special cases, it may contain nothing.
+
+	*MANGLED points to the current unconsumed location in the mangled
+	name.  As tokens are consumed and demangling is performed, the
+	pointer is updated to continuously point at the next token to
+	be consumed.
+
+	Demangling GNU style mangled names is nasty because there is no
+	explicit token that marks the start of the outermost function
+	argument list.  */
+
+static int
+demangle_signature (struct work_stuff *work,
+                    const char **mangled, string *declp)
+{
+  int success = 1;
+  int func_done = 0;
+  int expect_func = 0;
+  int expect_return_type = 0;
+  const char *oldmangled = NULL;
+  string trawname;
+  string tname;
+
+  while (success && (**mangled != '\0'))
+    {
+      switch (**mangled)
+	{
+	case 'Q':
+	  oldmangled = *mangled;
+	  success = demangle_qualified (work, mangled, declp, 1, 0);
+	  if (success)
+	    remember_type (work, oldmangled, *mangled - oldmangled);
+	  if (AUTO_DEMANGLING || GNU_DEMANGLING)
+	    expect_func = 1;
+	  oldmangled = NULL;
+	  break;
+
+        case 'K':
+	  oldmangled = *mangled;
+	  success = demangle_qualified (work, mangled, declp, 1, 0);
+	  if (AUTO_DEMANGLING || GNU_DEMANGLING)
+	    {
+	      expect_func = 1;
+	    }
+	  oldmangled = NULL;
+	  break;
+
+	case 'S':
+	  /* Static member function */
+	  if (oldmangled == NULL)
+	    {
+	      oldmangled = *mangled;
+	    }
+	  (*mangled)++;
+	  work -> static_type = 1;
+	  break;
+
+	case 'C':
+	case 'V':
+	case 'u':
+	  work->type_quals |= code_for_qualifier (**mangled);
+
+	  /* a qualified member function */
+	  if (oldmangled == NULL)
+	    oldmangled = *mangled;
+	  (*mangled)++;
+	  break;
+
+	case 'L':
+	  /* Local class name follows after "Lnnn_" */
+	  if (HP_DEMANGLING)
+	    {
+	      while (**mangled && (**mangled != '_'))
+		(*mangled)++;
+	      if (!**mangled)
+		success = 0;
+	      else
+		(*mangled)++;
+	    }
+	  else
+	    success = 0;
+	  break;
+
+	case '0': case '1': case '2': case '3': case '4':
+	case '5': case '6': case '7': case '8': case '9':
+	  if (oldmangled == NULL)
+	    {
+	      oldmangled = *mangled;
+	    }
+          work->temp_start = -1; /* uppermost call to demangle_class */
+	  success = demangle_class (work, mangled, declp);
+	  if (success)
+	    {
+	      remember_type (work, oldmangled, *mangled - oldmangled);
+	    }
+	  if (AUTO_DEMANGLING || GNU_DEMANGLING || EDG_DEMANGLING)
+	    {
+              /* EDG and others will have the "F", so we let the loop cycle
+                 if we are looking at one. */
+              if (**mangled != 'F')
+                 expect_func = 1;
+	    }
+	  oldmangled = NULL;
+	  break;
+
+	case 'B':
+	  {
+	    string s;
+	    success = do_type (work, mangled, &s);
+	    if (success)
+	      {
+		string_append (&s, SCOPE_STRING (work));
+		string_prepends (declp, &s);
+		string_delete (&s);
+	      }
+	    oldmangled = NULL;
+	    expect_func = 1;
+	  }
+	  break;
+
+	case 'F':
+	  /* Function */
+	  /* ARM/HP style demangling includes a specific 'F' character after
+	     the class name.  For GNU style, it is just implied.  So we can
+	     safely just consume any 'F' at this point and be compatible
+	     with either style.  */
+
+	  oldmangled = NULL;
+	  func_done = 1;
+	  (*mangled)++;
+
+	  /* For lucid/ARM/HP style we have to forget any types we might
+	     have remembered up to this point, since they were not argument
+	     types.  GNU style considers all types seen as available for
+	     back references.  See comment in demangle_args() */
+
+	  if (LUCID_DEMANGLING || ARM_DEMANGLING || HP_DEMANGLING || EDG_DEMANGLING)
+	    {
+	      forget_types (work);
+	    }
+	  success = demangle_args (work, mangled, declp);
+	  /* After picking off the function args, we expect to either
+	     find the function return type (preceded by an '_') or the
+	     end of the string. */
+	  if (success && (AUTO_DEMANGLING || EDG_DEMANGLING) && **mangled == '_')
+	    {
+	      ++(*mangled);
+              /* At this level, we do not care about the return type. */
+              success = do_type (work, mangled, &tname);
+              string_delete (&tname);
+            }
+
+	  break;
+
+	case 't':
+	  /* G++ Template */
+	  string_init(&trawname);
+	  string_init(&tname);
+	  if (oldmangled == NULL)
+	    {
+	      oldmangled = *mangled;
+	    }
+	  success = demangle_template (work, mangled, &tname,
+				       &trawname, 1, 1);
+	  if (success)
+	    {
+	      remember_type (work, oldmangled, *mangled - oldmangled);
+	    }
+	  string_append (&tname, SCOPE_STRING (work));
+
+	  string_prepends(declp, &tname);
+	  if (work -> destructor & 1)
+	    {
+	      string_prepend (&trawname, "~");
+	      string_appends (declp, &trawname);
+	      work->destructor -= 1;
+	    }
+	  if ((work->constructor & 1) || (work->destructor & 1))
+	    {
+	      string_appends (declp, &trawname);
+	      work->constructor -= 1;
+	    }
+	  string_delete(&trawname);
+	  string_delete(&tname);
+	  oldmangled = NULL;
+	  expect_func = 1;
+	  break;
+
+	case '_':
+	  if ((AUTO_DEMANGLING || GNU_DEMANGLING) && expect_return_type)
+	    {
+	      /* Read the return type. */
+	      string return_type;
+
+	      (*mangled)++;
+	      success = do_type (work, mangled, &return_type);
+	      APPEND_BLANK (&return_type);
+
+	      string_prepends (declp, &return_type);
+	      string_delete (&return_type);
+	      break;
+	    }
+	  else
+	    /* At the outermost level, we cannot have a return type specified,
+	       so if we run into another '_' at this point we are dealing with
+	       a mangled name that is either bogus, or has been mangled by
+	       some algorithm we don't know how to deal with.  So just
+	       reject the entire demangling.  */
+            /* However, "_nnn" is an expected suffix for alternate entry point
+               numbered nnn for a function, with HP aCC, so skip over that
+               without reporting failure. pai/1997-09-04 */
+            if (HP_DEMANGLING)
+              {
+                (*mangled)++;
+                while (**mangled && ISDIGIT ((unsigned char)**mangled))
+                  (*mangled)++;
+              }
+            else
+	      success = 0;
+	  break;
+
+	case 'H':
+	  if (AUTO_DEMANGLING || GNU_DEMANGLING)
+	    {
+	      /* A G++ template function.  Read the template arguments. */
+	      success = demangle_template (work, mangled, declp, 0, 0,
+					   0);
+	      if (!(work->constructor & 1))
+		expect_return_type = 1;
+	      (*mangled)++;
+	      break;
+	    }
+	  else
+	    /* fall through */
+	    {;}
+
+	default:
+	  if (AUTO_DEMANGLING || GNU_DEMANGLING)
+	    {
+	      /* Assume we have stumbled onto the first outermost function
+		 argument token, and start processing args.  */
+	      func_done = 1;
+	      success = demangle_args (work, mangled, declp);
+	    }
+	  else
+	    {
+	      /* Non-GNU demanglers use a specific token to mark the start
+		 of the outermost function argument tokens.  Typically 'F',
+		 for ARM/HP-demangling, for example.  So if we find something
+		 we are not prepared for, it must be an error.  */
+	      success = 0;
+	    }
+	  break;
+	}
+      /*
+	if (AUTO_DEMANGLING || GNU_DEMANGLING)
+	*/
+      {
+	if (success && expect_func)
+	  {
+	    func_done = 1;
+              if (LUCID_DEMANGLING || ARM_DEMANGLING || EDG_DEMANGLING)
+                {
+                  forget_types (work);
+                }
+	    success = demangle_args (work, mangled, declp);
+	    /* Since template include the mangling of their return types,
+	       we must set expect_func to 0 so that we don't try do
+	       demangle more arguments the next time we get here.  */
+	    expect_func = 0;
+	  }
+      }
+    }
+  if (success && !func_done)
+    {
+      if (AUTO_DEMANGLING || GNU_DEMANGLING)
+	{
+	  /* With GNU style demangling, bar__3foo is 'foo::bar(void)', and
+	     bar__3fooi is 'foo::bar(int)'.  We get here when we find the
+	     first case, and need to ensure that the '(void)' gets added to
+	     the current declp.  Note that with ARM/HP, the first case
+	     represents the name of a static data member 'foo::bar',
+	     which is in the current declp, so we leave it alone.  */
+	  success = demangle_args (work, mangled, declp);
+	}
+    }
+  if (success && PRINT_ARG_TYPES)
+    {
+      if (work->static_type)
+	string_append (declp, " static");
+      if (work->type_quals != TYPE_UNQUALIFIED)
+	{
+	  APPEND_BLANK (declp);
+	  string_append (declp, qualifier_string (work->type_quals));
+	}
+    }
+
+  return (success);
+}
+
+#if 0
+
+static int
+demangle_method_args (struct work_stuff *work, const char **mangled,
+                      string *declp)
+{
+  int success = 0;
+
+  if (work -> static_type)
+    {
+      string_append (declp, *mangled + 1);
+      *mangled += strlen (*mangled);
+      success = 1;
+    }
+  else
+    {
+      success = demangle_args (work, mangled, declp);
+    }
+  return (success);
+}
+
+#endif
+
+static int
+demangle_template_template_parm (struct work_stuff *work,
+                                 const char **mangled, string *tname)
+{
+  int i;
+  int r;
+  int need_comma = 0;
+  int success = 1;
+  string temp;
+
+  string_append (tname, "template <");
+  /* get size of template parameter list */
+  if (get_count (mangled, &r))
+    {
+      for (i = 0; i < r; i++)
+	{
+	  if (need_comma)
+	    {
+	      string_append (tname, ", ");
+	    }
+
+	    /* Z for type parameters */
+	    if (**mangled == 'Z')
+	      {
+		(*mangled)++;
+		string_append (tname, "class");
+	      }
+	      /* z for template parameters */
+	    else if (**mangled == 'z')
+	      {
+		(*mangled)++;
+		success =
+		  demangle_template_template_parm (work, mangled, tname);
+		if (!success)
+		  {
+		    break;
+		  }
+	      }
+	    else
+	      {
+		/* temp is initialized in do_type */
+		success = do_type (work, mangled, &temp);
+		if (success)
+		  {
+		    string_appends (tname, &temp);
+		  }
+		string_delete(&temp);
+		if (!success)
+		  {
+		    break;
+		  }
+	      }
+	  need_comma = 1;
+	}
+
+    }
+  if (tname->p[-1] == '>')
+    string_append (tname, " ");
+  string_append (tname, "> class");
+  return (success);
+}
+
+static int
+demangle_expression (struct work_stuff *work, const char **mangled,
+                     string *s, type_kind_t tk)
+{
+  int need_operator = 0;
+  int success;
+
+  success = 1;
+  string_appendn (s, "(", 1);
+  (*mangled)++;
+  while (success && **mangled != 'W' && **mangled != '\0')
+    {
+      if (need_operator)
+	{
+	  size_t i;
+	  size_t len;
+
+	  success = 0;
+
+	  len = strlen (*mangled);
+
+	  for (i = 0; i < ARRAY_SIZE (optable); ++i)
+	    {
+	      size_t l = strlen (optable[i].in);
+
+	      if (l <= len
+		  && memcmp (optable[i].in, *mangled, l) == 0)
+		{
+		  string_appendn (s, " ", 1);
+		  string_append (s, optable[i].out);
+		  string_appendn (s, " ", 1);
+		  success = 1;
+		  (*mangled) += l;
+		  break;
+		}
+	    }
+
+	  if (!success)
+	    break;
+	}
+      else
+	need_operator = 1;
+
+      success = demangle_template_value_parm (work, mangled, s, tk);
+    }
+
+  if (**mangled != 'W')
+    success = 0;
+  else
+    {
+      string_appendn (s, ")", 1);
+      (*mangled)++;
+    }
+
+  return success;
+}
+
+static int
+demangle_integral_value (struct work_stuff *work,
+                         const char **mangled, string *s)
+{
+  int success;
+
+  if (**mangled == 'E')
+    success = demangle_expression (work, mangled, s, tk_integral);
+  else if (**mangled == 'Q' || **mangled == 'K')
+    success = demangle_qualified (work, mangled, s, 0, 1);
+  else
+    {
+      int value;
+
+      /* By default, we let the number decide whether we shall consume an
+	 underscore.  */
+      int multidigit_without_leading_underscore = 0;
+      int leave_following_underscore = 0;
+
+      success = 0;
+
+      if (**mangled == '_')
+        {
+	  if (mangled[0][1] == 'm')
+	    {
+	      /* Since consume_count_with_underscores does not handle the
+		 `m'-prefix we must do it here, using consume_count and
+		 adjusting underscores: we have to consume the underscore
+		 matching the prepended one.  */
+	      multidigit_without_leading_underscore = 1;
+	      string_appendn (s, "-", 1);
+	      (*mangled) += 2;
+	    }
+	  else
+	    {
+	      /* Do not consume a following underscore;
+	         consume_count_with_underscores will consume what
+	         should be consumed.  */
+	      leave_following_underscore = 1;
+	    }
+	}
+      else
+	{
+	  /* Negative numbers are indicated with a leading `m'.  */
+	  if (**mangled == 'm')
+	  {
+	    string_appendn (s, "-", 1);
+	    (*mangled)++;
+	  }
+	  /* Since consume_count_with_underscores does not handle
+	     multi-digit numbers that do not start with an underscore,
+	     and this number can be an integer template parameter,
+	     we have to call consume_count. */
+	  multidigit_without_leading_underscore = 1;
+	  /* These multi-digit numbers never end on an underscore,
+	     so if there is one then don't eat it. */
+	  leave_following_underscore = 1;
+	}
+
+      /* We must call consume_count if we expect to remove a trailing
+	 underscore, since consume_count_with_underscores expects
+	 the leading underscore (that we consumed) if it is to handle
+	 multi-digit numbers.  */
+      if (multidigit_without_leading_underscore)
+	value = consume_count (mangled);
+      else
+	value = consume_count_with_underscores (mangled);
+
+      if (value != -1)
+	{
+	  char buf[INTBUF_SIZE];
+	  sprintf (buf, "%d", value);
+	  string_append (s, buf);
+
+	  /* Numbers not otherwise delimited, might have an underscore
+	     appended as a delimeter, which we should skip.
+
+	     ??? This used to always remove a following underscore, which
+	     is wrong.  If other (arbitrary) cases are followed by an
+	     underscore, we need to do something more radical.  */
+
+	  if ((value > 9 || multidigit_without_leading_underscore)
+	      && ! leave_following_underscore
+	      && **mangled == '_')
+	    (*mangled)++;
+
+	  /* All is well.  */
+	  success = 1;
+	}
+      }
+
+  return success;
+}
+
+/* Demangle the real value in MANGLED.  */
+
+static int
+demangle_real_value (struct work_stuff *work,
+                     const char **mangled, string *s)
+{
+  if (**mangled == 'E')
+    return demangle_expression (work, mangled, s, tk_real);
+
+  if (**mangled == 'm')
+    {
+      string_appendn (s, "-", 1);
+      (*mangled)++;
+    }
+  while (ISDIGIT ((unsigned char)**mangled))
+    {
+      string_appendn (s, *mangled, 1);
+      (*mangled)++;
+    }
+  if (**mangled == '.') /* fraction */
+    {
+      string_appendn (s, ".", 1);
+      (*mangled)++;
+      while (ISDIGIT ((unsigned char)**mangled))
+	{
+	  string_appendn (s, *mangled, 1);
+	  (*mangled)++;
+	}
+    }
+  if (**mangled == 'e') /* exponent */
+    {
+      string_appendn (s, "e", 1);
+      (*mangled)++;
+      while (ISDIGIT ((unsigned char)**mangled))
+	{
+	  string_appendn (s, *mangled, 1);
+	  (*mangled)++;
+	}
+    }
+
+  return 1;
+}
+
+static int
+demangle_template_value_parm (struct work_stuff *work, const char **mangled,
+                              string *s, type_kind_t tk)
+{
+  int success = 1;
+
+  if (**mangled == 'Y')
+    {
+      /* The next argument is a template parameter. */
+      int idx;
+
+      (*mangled)++;
+      idx = consume_count_with_underscores (mangled);
+      if (idx == -1
+	  || (work->tmpl_argvec && idx >= work->ntmpl_args)
+	  || consume_count_with_underscores (mangled) == -1)
+	return -1;
+      if (work->tmpl_argvec)
+	string_append (s, work->tmpl_argvec[idx]);
+      else
+	string_append_template_idx (s, idx);
+    }
+  else if (tk == tk_integral)
+    success = demangle_integral_value (work, mangled, s);
+  else if (tk == tk_char)
+    {
+      char tmp[2];
+      int val;
+      if (**mangled == 'm')
+	{
+	  string_appendn (s, "-", 1);
+	  (*mangled)++;
+	}
+      string_appendn (s, "'", 1);
+      val = consume_count(mangled);
+      if (val <= 0)
+	success = 0;
+      else
+	{
+	  tmp[0] = (char)val;
+	  tmp[1] = '\0';
+	  string_appendn (s, &tmp[0], 1);
+	  string_appendn (s, "'", 1);
+	}
+    }
+  else if (tk == tk_bool)
+    {
+      int val = consume_count (mangled);
+      if (val == 0)
+	string_appendn (s, "false", 5);
+      else if (val == 1)
+	string_appendn (s, "true", 4);
+      else
+	success = 0;
+    }
+  else if (tk == tk_real)
+    success = demangle_real_value (work, mangled, s);
+  else if (tk == tk_pointer || tk == tk_reference)
+    {
+      if (**mangled == 'Q')
+	success = demangle_qualified (work, mangled, s,
+				      /*isfuncname=*/0, 
+				      /*append=*/1);
+      else
+	{
+	  int symbol_len  = consume_count (mangled);
+	  if (symbol_len == -1)
+	    return -1;
+	  if (symbol_len == 0)
+	    string_appendn (s, "0", 1);
+	  else
+	    {
+	      char *p = XNEWVEC (char, symbol_len + 1), *q;
+	      strncpy (p, *mangled, symbol_len);
+	      p [symbol_len] = '\0';
+	      /* We use cplus_demangle here, rather than
+		 internal_cplus_demangle, because the name of the entity
+		 mangled here does not make use of any of the squangling
+		 or type-code information we have built up thus far; it is
+		 mangled independently.  */
+	      q = cplus_demangle (p, work->options);
+	      if (tk == tk_pointer)
+		string_appendn (s, "&", 1);
+	      /* FIXME: Pointer-to-member constants should get a
+		 qualifying class name here.  */
+	      if (q)
+		{
+		  string_append (s, q);
+		  free (q);
+		}
+	      else
+		string_append (s, p);
+	      free (p);
+	    }
+	  *mangled += symbol_len;
+	}
+    }
+
+  return success;
+}
+
+/* Demangle the template name in MANGLED.  The full name of the
+   template (e.g., S<int>) is placed in TNAME.  The name without the
+   template parameters (e.g. S) is placed in TRAWNAME if TRAWNAME is
+   non-NULL.  If IS_TYPE is nonzero, this template is a type template,
+   not a function template.  If both IS_TYPE and REMEMBER are nonzero,
+   the template is remembered in the list of back-referenceable
+   types.  */
+
+static int
+demangle_template (struct work_stuff *work, const char **mangled,
+                   string *tname, string *trawname,
+                   int is_type, int remember)
+{
+  int i;
+  int r;
+  int need_comma = 0;
+  int success = 0;
+  int is_java_array = 0;
+  string temp;
+
+  (*mangled)++;
+  if (is_type)
+    {
+      /* get template name */
+      if (**mangled == 'z')
+	{
+	  int idx;
+	  (*mangled)++;
+	  (*mangled)++;
+
+	  idx = consume_count_with_underscores (mangled);
+	  if (idx == -1
+	      || (work->tmpl_argvec && idx >= work->ntmpl_args)
+	      || consume_count_with_underscores (mangled) == -1)
+	    return (0);
+
+	  if (work->tmpl_argvec)
+	    {
+	      string_append (tname, work->tmpl_argvec[idx]);
+	      if (trawname)
+		string_append (trawname, work->tmpl_argvec[idx]);
+	    }
+	  else
+	    {
+	      string_append_template_idx (tname, idx);
+	      if (trawname)
+		string_append_template_idx (trawname, idx);
+	    }
+	}
+      else
+	{
+	  if ((r = consume_count (mangled)) <= 0
+	      || (int) strlen (*mangled) < r)
+	    {
+	      return (0);
+	    }
+	  is_java_array = (work -> options & DMGL_JAVA)
+	    && strncmp (*mangled, "JArray1Z", 8) == 0;
+	  if (! is_java_array)
+	    {
+	      string_appendn (tname, *mangled, r);
+	    }
+	  if (trawname)
+	    string_appendn (trawname, *mangled, r);
+	  *mangled += r;
+	}
+    }
+  if (!is_java_array)
+    string_append (tname, "<");
+  /* get size of template parameter list */
+  if (!get_count (mangled, &r))
+    {
+      return (0);
+    }
+  if (!is_type)
+    {
+      /* Create an array for saving the template argument values. */
+      work->tmpl_argvec = XNEWVEC (char *, r);
+      work->ntmpl_args = r;
+      for (i = 0; i < r; i++)
+	work->tmpl_argvec[i] = 0;
+    }
+  for (i = 0; i < r; i++)
+    {
+      if (need_comma)
+	{
+	  string_append (tname, ", ");
+	}
+      /* Z for type parameters */
+      if (**mangled == 'Z')
+	{
+	  (*mangled)++;
+	  /* temp is initialized in do_type */
+	  success = do_type (work, mangled, &temp);
+	  if (success)
+	    {
+	      string_appends (tname, &temp);
+
+	      if (!is_type)
+		{
+		  /* Save the template argument. */
+		  int len = temp.p - temp.b;
+		  work->tmpl_argvec[i] = XNEWVEC (char, len + 1);
+		  memcpy (work->tmpl_argvec[i], temp.b, len);
+		  work->tmpl_argvec[i][len] = '\0';
+		}
+	    }
+	  string_delete(&temp);
+	  if (!success)
+	    {
+	      break;
+	    }
+	}
+      /* z for template parameters */
+      else if (**mangled == 'z')
+	{
+	  int r2;
+	  (*mangled)++;
+	  success = demangle_template_template_parm (work, mangled, tname);
+
+	  if (success
+	      && (r2 = consume_count (mangled)) > 0
+	      && (int) strlen (*mangled) >= r2)
+	    {
+	      string_append (tname, " ");
+	      string_appendn (tname, *mangled, r2);
+	      if (!is_type)
+		{
+		  /* Save the template argument. */
+		  int len = r2;
+		  work->tmpl_argvec[i] = XNEWVEC (char, len + 1);
+		  memcpy (work->tmpl_argvec[i], *mangled, len);
+		  work->tmpl_argvec[i][len] = '\0';
+		}
+	      *mangled += r2;
+	    }
+	  if (!success)
+	    {
+	      break;
+	    }
+	}
+      else
+	{
+	  string  param;
+	  string* s;
+
+	  /* otherwise, value parameter */
+
+	  /* temp is initialized in do_type */
+	  success = do_type (work, mangled, &temp);
+	  string_delete(&temp);
+	  if (!success)
+	    break;
+
+	  if (!is_type)
+	    {
+	      s = &param;
+	      string_init (s);
+	    }
+	  else
+	    s = tname;
+
+	  success = demangle_template_value_parm (work, mangled, s,
+						  (type_kind_t) success);
+
+	  if (!success)
+	    {
+	      if (!is_type)
+		string_delete (s);
+	      success = 0;
+	      break;
+	    }
+
+	  if (!is_type)
+	    {
+	      int len = s->p - s->b;
+	      work->tmpl_argvec[i] = XNEWVEC (char, len + 1);
+	      memcpy (work->tmpl_argvec[i], s->b, len);
+	      work->tmpl_argvec[i][len] = '\0';
+
+	      string_appends (tname, s);
+	      string_delete (s);
+	    }
+	}
+      need_comma = 1;
+    }
+  if (is_java_array)
+    {
+      string_append (tname, "[]");
+    }
+  else
+    {
+      if (tname->p[-1] == '>')
+	string_append (tname, " ");
+      string_append (tname, ">");
+    }
+
+  if (is_type && remember)
+    {
+      const int bindex = register_Btype (work);
+      remember_Btype (work, tname->b, LEN_STRING (tname), bindex);
+    }
+
+  /*
+    if (work -> static_type)
+    {
+    string_append (declp, *mangled + 1);
+    *mangled += strlen (*mangled);
+    success = 1;
+    }
+    else
+    {
+    success = demangle_args (work, mangled, declp);
+    }
+    }
+    */
+  return (success);
+}
+
+static int
+arm_pt (struct work_stuff *work, const char *mangled,
+        int n, const char **anchor, const char **args)
+{
+  /* Check if ARM template with "__pt__" in it ("parameterized type") */
+  /* Allow HP also here, because HP's cfront compiler follows ARM to some extent */
+  if ((ARM_DEMANGLING || HP_DEMANGLING) && (*anchor = strstr (mangled, "__pt__")))
+    {
+      int len;
+      *args = *anchor + 6;
+      len = consume_count (args);
+      if (len == -1)
+	return 0;
+      if (*args + len == mangled + n && **args == '_')
+	{
+	  ++*args;
+	  return 1;
+	}
+    }
+  if (AUTO_DEMANGLING || EDG_DEMANGLING)
+    {
+      if ((*anchor = strstr (mangled, "__tm__"))
+          || (*anchor = strstr (mangled, "__ps__"))
+          || (*anchor = strstr (mangled, "__pt__")))
+        {
+          int len;
+          *args = *anchor + 6;
+          len = consume_count (args);
+	  if (len == -1)
+	    return 0;
+          if (*args + len == mangled + n && **args == '_')
+            {
+              ++*args;
+              return 1;
+            }
+        }
+      else if ((*anchor = strstr (mangled, "__S")))
+        {
+ 	  int len;
+ 	  *args = *anchor + 3;
+ 	  len = consume_count (args);
+	  if (len == -1)
+	    return 0;
+ 	  if (*args + len == mangled + n && **args == '_')
+            {
+              ++*args;
+ 	      return 1;
+            }
+        }
+    }
+
+  return 0;
+}
+
+static void
+demangle_arm_hp_template (struct work_stuff *work, const char **mangled,
+                          int n, string *declp)
+{
+  const char *p;
+  const char *args;
+  const char *e = *mangled + n;
+  string arg;
+
+  /* Check for HP aCC template spec: classXt1t2 where t1, t2 are
+     template args */
+  if (HP_DEMANGLING && ((*mangled)[n] == 'X'))
+    {
+      char *start_spec_args = NULL;
+      int hold_options;
+
+      /* First check for and omit template specialization pseudo-arguments,
+         such as in "Spec<#1,#1.*>" */
+      start_spec_args = strchr (*mangled, '<');
+      if (start_spec_args && (start_spec_args - *mangled < n))
+        string_appendn (declp, *mangled, start_spec_args - *mangled);
+      else
+        string_appendn (declp, *mangled, n);
+      (*mangled) += n + 1;
+      string_init (&arg);
+      if (work->temp_start == -1) /* non-recursive call */
+        work->temp_start = declp->p - declp->b;
+
+      /* We want to unconditionally demangle parameter types in
+	 template parameters.  */
+      hold_options = work->options;
+      work->options |= DMGL_PARAMS;
+
+      string_append (declp, "<");
+      while (1)
+        {
+          string_delete (&arg);
+          switch (**mangled)
+            {
+              case 'T':
+                /* 'T' signals a type parameter */
+                (*mangled)++;
+                if (!do_type (work, mangled, &arg))
+                  goto hpacc_template_args_done;
+                break;
+
+              case 'U':
+              case 'S':
+                /* 'U' or 'S' signals an integral value */
+                if (!do_hpacc_template_const_value (work, mangled, &arg))
+                  goto hpacc_template_args_done;
+                break;
+
+              case 'A':
+                /* 'A' signals a named constant expression (literal) */
+                if (!do_hpacc_template_literal (work, mangled, &arg))
+                  goto hpacc_template_args_done;
+                break;
+
+              default:
+                /* Today, 1997-09-03, we have only the above types
+                   of template parameters */
+                /* FIXME: maybe this should fail and return null */
+                goto hpacc_template_args_done;
+            }
+          string_appends (declp, &arg);
+         /* Check if we're at the end of template args.
+             0 if at end of static member of template class,
+             _ if done with template args for a function */
+          if ((**mangled == '\000') || (**mangled == '_'))
+            break;
+          else
+            string_append (declp, ",");
+        }
+    hpacc_template_args_done:
+      string_append (declp, ">");
+      string_delete (&arg);
+      if (**mangled == '_')
+        (*mangled)++;
+      work->options = hold_options;
+      return;
+    }
+  /* ARM template? (Also handles HP cfront extensions) */
+  else if (arm_pt (work, *mangled, n, &p, &args))
+    {
+      int hold_options;
+      string type_str;
+
+      string_init (&arg);
+      string_appendn (declp, *mangled, p - *mangled);
+      if (work->temp_start == -1)  /* non-recursive call */
+	work->temp_start = declp->p - declp->b;
+
+      /* We want to unconditionally demangle parameter types in
+	 template parameters.  */
+      hold_options = work->options;
+      work->options |= DMGL_PARAMS;
+
+      string_append (declp, "<");
+      /* should do error checking here */
+      while (args < e) {
+	string_delete (&arg);
+
+	/* Check for type or literal here */
+	switch (*args)
+	  {
+	    /* HP cfront extensions to ARM for template args */
+	    /* spec: Xt1Lv1 where t1 is a type, v1 is a literal value */
+	    /* FIXME: We handle only numeric literals for HP cfront */
+          case 'X':
+            /* A typed constant value follows */
+            args++;
+            if (!do_type (work, &args, &type_str))
+	      goto cfront_template_args_done;
+            string_append (&arg, "(");
+            string_appends (&arg, &type_str);
+            string_delete (&type_str);
+            string_append (&arg, ")");
+            if (*args != 'L')
+              goto cfront_template_args_done;
+            args++;
+            /* Now snarf a literal value following 'L' */
+            if (!snarf_numeric_literal (&args, &arg))
+	      goto cfront_template_args_done;
+            break;
+
+          case 'L':
+            /* Snarf a literal following 'L' */
+            args++;
+            if (!snarf_numeric_literal (&args, &arg))
+	      goto cfront_template_args_done;
+            break;
+          default:
+            /* Not handling other HP cfront stuff */
+            {
+              const char* old_args = args;
+              if (!do_type (work, &args, &arg))
+                goto cfront_template_args_done;
+
+              /* Fail if we didn't make any progress: prevent infinite loop. */
+              if (args == old_args)
+		{
+		  work->options = hold_options;
+		  return;
+		}
+            }
+	  }
+	string_appends (declp, &arg);
+	string_append (declp, ",");
+      }
+    cfront_template_args_done:
+      string_delete (&arg);
+      if (args >= e)
+	--declp->p; /* remove extra comma */
+      string_append (declp, ">");
+      work->options = hold_options;
+    }
+  else if (n>10 && strncmp (*mangled, "_GLOBAL_", 8) == 0
+	   && (*mangled)[9] == 'N'
+	   && (*mangled)[8] == (*mangled)[10]
+	   && strchr (cplus_markers, (*mangled)[8]))
+    {
+      /* A member of the anonymous namespace.  */
+      string_append (declp, "{anonymous}");
+    }
+  else
+    {
+      if (work->temp_start == -1) /* non-recursive call only */
+	work->temp_start = 0;     /* disable in recursive calls */
+      string_appendn (declp, *mangled, n);
+    }
+  *mangled += n;
+}
+
+/* Extract a class name, possibly a template with arguments, from the
+   mangled string; qualifiers, local class indicators, etc. have
+   already been dealt with */
+
+static int
+demangle_class_name (struct work_stuff *work, const char **mangled,
+                     string *declp)
+{
+  int n;
+  int success = 0;
+
+  n = consume_count (mangled);
+  if (n == -1)
+    return 0;
+  if ((int) strlen (*mangled) >= n)
+    {
+      demangle_arm_hp_template (work, mangled, n, declp);
+      success = 1;
+    }
+
+  return (success);
+}
+
+/*
+
+LOCAL FUNCTION
+
+	demangle_class -- demangle a mangled class sequence
+
+SYNOPSIS
+
+	static int
+	demangle_class (struct work_stuff *work, const char **mangled,
+			strint *declp)
+
+DESCRIPTION
+
+	DECLP points to the buffer into which demangling is being done.
+
+	*MANGLED points to the current token to be demangled.  On input,
+	it points to a mangled class (I.E. "3foo", "13verylongclass", etc.)
+	On exit, it points to the next token after the mangled class on
+	success, or the first unconsumed token on failure.
+
+	If the CONSTRUCTOR or DESTRUCTOR flags are set in WORK, then
+	we are demangling a constructor or destructor.  In this case
+	we prepend "class::class" or "class::~class" to DECLP.
+
+	Otherwise, we prepend "class::" to the current DECLP.
+
+	Reset the constructor/destructor flags once they have been
+	"consumed".  This allows demangle_class to be called later during
+	the same demangling, to do normal class demangling.
+
+	Returns 1 if demangling is successful, 0 otherwise.
+
+*/
+
+static int
+demangle_class (struct work_stuff *work, const char **mangled, string *declp)
+{
+  int success = 0;
+  int btype;
+  string class_name;
+  char *save_class_name_end = 0;
+
+  string_init (&class_name);
+  btype = register_Btype (work);
+  if (demangle_class_name (work, mangled, &class_name))
+    {
+      save_class_name_end = class_name.p;
+      if ((work->constructor & 1) || (work->destructor & 1))
+	{
+          /* adjust so we don't include template args */
+          if (work->temp_start && (work->temp_start != -1))
+            {
+              class_name.p = class_name.b + work->temp_start;
+            }
+	  string_prepends (declp, &class_name);
+	  if (work -> destructor & 1)
+	    {
+	      string_prepend (declp, "~");
+              work -> destructor -= 1;
+	    }
+	  else
+	    {
+	      work -> constructor -= 1;
+	    }
+	}
+      class_name.p = save_class_name_end;
+      remember_Ktype (work, class_name.b, LEN_STRING(&class_name));
+      remember_Btype (work, class_name.b, LEN_STRING(&class_name), btype);
+      string_prepend (declp, SCOPE_STRING (work));
+      string_prepends (declp, &class_name);
+      success = 1;
+    }
+  string_delete (&class_name);
+  return (success);
+}
+
+
+/* Called when there's a "__" in the mangled name, with `scan' pointing to
+   the rightmost guess.
+
+   Find the correct "__"-sequence where the function name ends and the
+   signature starts, which is ambiguous with GNU mangling.
+   Call demangle_signature here, so we can make sure we found the right
+   one; *mangled will be consumed so caller will not make further calls to
+   demangle_signature.  */
+
+static int
+iterate_demangle_function (struct work_stuff *work, const char **mangled,
+                           string *declp, const char *scan)
+{
+  const char *mangle_init = *mangled;
+  int success = 0;
+  string decl_init;
+  struct work_stuff work_init;
+
+  if (*(scan + 2) == '\0')
+    return 0;
+
+  /* Do not iterate for some demangling modes, or if there's only one
+     "__"-sequence.  This is the normal case.  */
+  if (ARM_DEMANGLING || LUCID_DEMANGLING || HP_DEMANGLING || EDG_DEMANGLING
+      || strstr (scan + 2, "__") == NULL)
+    return demangle_function_name (work, mangled, declp, scan);
+
+  /* Save state so we can restart if the guess at the correct "__" was
+     wrong.  */
+  string_init (&decl_init);
+  string_appends (&decl_init, declp);
+  memset (&work_init, 0, sizeof work_init);
+  work_stuff_copy_to_from (&work_init, work);
+
+  /* Iterate over occurrences of __, allowing names and types to have a
+     "__" sequence in them.  We must start with the first (not the last)
+     occurrence, since "__" most often occur between independent mangled
+     parts, hence starting at the last occurence inside a signature
+     might get us a "successful" demangling of the signature.  */
+
+  while (scan[2])
+    {
+      if (demangle_function_name (work, mangled, declp, scan))
+	{
+	  success = demangle_signature (work, mangled, declp);
+	  if (success)
+	    break;
+	}
+
+      /* Reset demangle state for the next round.  */
+      *mangled = mangle_init;
+      string_clear (declp);
+      string_appends (declp, &decl_init);
+      work_stuff_copy_to_from (work, &work_init);
+
+      /* Leave this underscore-sequence.  */
+      scan += 2;
+
+      /* Scan for the next "__" sequence.  */
+      while (*scan && (scan[0] != '_' || scan[1] != '_'))
+	scan++;
+
+      /* Move to last "__" in this sequence.  */
+      while (*scan && *scan == '_')
+	scan++;
+      scan -= 2;
+    }
+
+  /* Delete saved state.  */
+  delete_work_stuff (&work_init);
+  string_delete (&decl_init);
+
+  return success;
+}
+
+/*
+
+LOCAL FUNCTION
+
+	demangle_prefix -- consume the mangled name prefix and find signature
+
+SYNOPSIS
+
+	static int
+	demangle_prefix (struct work_stuff *work, const char **mangled,
+			 string *declp);
+
+DESCRIPTION
+
+	Consume and demangle the prefix of the mangled name.
+	While processing the function name root, arrange to call
+	demangle_signature if the root is ambiguous.
+
+	DECLP points to the string buffer into which demangled output is
+	placed.  On entry, the buffer is empty.  On exit it contains
+	the root function name, the demangled operator name, or in some
+	special cases either nothing or the completely demangled result.
+
+	MANGLED points to the current pointer into the mangled name.  As each
+	token of the mangled name is consumed, it is updated.  Upon entry
+	the current mangled name pointer points to the first character of
+	the mangled name.  Upon exit, it should point to the first character
+	of the signature if demangling was successful, or to the first
+	unconsumed character if demangling of the prefix was unsuccessful.
+
+	Returns 1 on success, 0 otherwise.
+ */
+
+static int
+demangle_prefix (struct work_stuff *work, const char **mangled,
+                 string *declp)
+{
+  int success = 1;
+  const char *scan;
+  int i;
+
+  if (strlen(*mangled) > 6
+      && (strncmp(*mangled, "_imp__", 6) == 0
+          || strncmp(*mangled, "__imp_", 6) == 0))
+    {
+      /* it's a symbol imported from a PE dynamic library. Check for both
+         new style prefix _imp__ and legacy __imp_ used by older versions
+	 of dlltool. */
+      (*mangled) += 6;
+      work->dllimported = 1;
+    }
+  else if (strlen(*mangled) >= 11 && strncmp(*mangled, "_GLOBAL_", 8) == 0)
+    {
+      char *marker = strchr (cplus_markers, (*mangled)[8]);
+      if (marker != NULL && *marker == (*mangled)[10])
+	{
+	  if ((*mangled)[9] == 'D')
+	    {
+	      /* it's a GNU global destructor to be executed at program exit */
+	      (*mangled) += 11;
+	      work->destructor = 2;
+	      if (gnu_special (work, mangled, declp))
+		return success;
+	    }
+	  else if ((*mangled)[9] == 'I')
+	    {
+	      /* it's a GNU global constructor to be executed at program init */
+	      (*mangled) += 11;
+	      work->constructor = 2;
+	      if (gnu_special (work, mangled, declp))
+		return success;
+	    }
+	}
+    }
+  else if ((ARM_DEMANGLING || HP_DEMANGLING || EDG_DEMANGLING) && strncmp(*mangled, "__std__", 7) == 0)
+    {
+      /* it's a ARM global destructor to be executed at program exit */
+      (*mangled) += 7;
+      work->destructor = 2;
+    }
+  else if ((ARM_DEMANGLING || HP_DEMANGLING || EDG_DEMANGLING) && strncmp(*mangled, "__sti__", 7) == 0)
+    {
+      /* it's a ARM global constructor to be executed at program initial */
+      (*mangled) += 7;
+      work->constructor = 2;
+    }
+
+  /*  This block of code is a reduction in strength time optimization
+      of:
+      scan = strstr (*mangled, "__"); */
+
+  {
+    scan = *mangled;
+
+    do {
+      scan = strchr (scan, '_');
+    } while (scan != NULL && *++scan != '_');
+
+    if (scan != NULL) --scan;
+  }
+
+  if (scan != NULL)
+    {
+      /* We found a sequence of two or more '_', ensure that we start at
+	 the last pair in the sequence.  */
+      i = strspn (scan, "_");
+      if (i > 2)
+	{
+	  scan += (i - 2);
+	}
+    }
+
+  if (scan == NULL)
+    {
+      success = 0;
+    }
+  else if (work -> static_type)
+    {
+      if (!ISDIGIT ((unsigned char)scan[0]) && (scan[0] != 't'))
+	{
+	  success = 0;
+	}
+    }
+  else if ((scan == *mangled)
+	   && (ISDIGIT ((unsigned char)scan[2]) || (scan[2] == 'Q')
+	       || (scan[2] == 't') || (scan[2] == 'K') || (scan[2] == 'H')))
+    {
+      /* The ARM says nothing about the mangling of local variables.
+	 But cfront mangles local variables by prepending __<nesting_level>
+	 to them. As an extension to ARM demangling we handle this case.  */
+      if ((LUCID_DEMANGLING || ARM_DEMANGLING || HP_DEMANGLING)
+	  && ISDIGIT ((unsigned char)scan[2]))
+	{
+	  *mangled = scan + 2;
+	  consume_count (mangled);
+	  string_append (declp, *mangled);
+	  *mangled += strlen (*mangled);
+	  success = 1;
+	}
+      else
+	{
+	  /* A GNU style constructor starts with __[0-9Qt].  But cfront uses
+	     names like __Q2_3foo3bar for nested type names.  So don't accept
+	     this style of constructor for cfront demangling.  A GNU
+	     style member-template constructor starts with 'H'. */
+	  if (!(LUCID_DEMANGLING || ARM_DEMANGLING || HP_DEMANGLING || EDG_DEMANGLING))
+	    work -> constructor += 1;
+	  *mangled = scan + 2;
+	}
+    }
+  else if (ARM_DEMANGLING && scan[2] == 'p' && scan[3] == 't')
+    {
+      /* Cfront-style parameterized type.  Handled later as a signature. */
+      success = 1;
+
+      /* ARM template? */
+      demangle_arm_hp_template (work, mangled, strlen (*mangled), declp);
+    }
+  else if (EDG_DEMANGLING && ((scan[2] == 't' && scan[3] == 'm')
+                              || (scan[2] == 'p' && scan[3] == 's')
+                              || (scan[2] == 'p' && scan[3] == 't')))
+    {
+      /* EDG-style parameterized type.  Handled later as a signature. */
+      success = 1;
+
+      /* EDG template? */
+      demangle_arm_hp_template (work, mangled, strlen (*mangled), declp);
+    }
+  else if ((scan == *mangled) && !ISDIGIT ((unsigned char)scan[2])
+	   && (scan[2] != 't'))
+    {
+      /* Mangled name starts with "__".  Skip over any leading '_' characters,
+	 then find the next "__" that separates the prefix from the signature.
+	 */
+      if (!(ARM_DEMANGLING || LUCID_DEMANGLING || HP_DEMANGLING || EDG_DEMANGLING)
+	  || (arm_special (mangled, declp) == 0))
+	{
+	  while (*scan == '_')
+	    {
+	      scan++;
+	    }
+	  if ((scan = strstr (scan, "__")) == NULL || (*(scan + 2) == '\0'))
+	    {
+	      /* No separator (I.E. "__not_mangled"), or empty signature
+		 (I.E. "__not_mangled_either__") */
+	      success = 0;
+	    }
+	  else
+	    return iterate_demangle_function (work, mangled, declp, scan);
+	}
+    }
+  else if (*(scan + 2) != '\0')
+    {
+      /* Mangled name does not start with "__" but does have one somewhere
+	 in there with non empty stuff after it.  Looks like a global
+	 function name.  Iterate over all "__":s until the right
+	 one is found.  */
+      return iterate_demangle_function (work, mangled, declp, scan);
+    }
+  else
+    {
+      /* Doesn't look like a mangled name */
+      success = 0;
+    }
+
+  if (!success && (work->constructor == 2 || work->destructor == 2))
+    {
+      string_append (declp, *mangled);
+      *mangled += strlen (*mangled);
+      success = 1;
+    }
+  return (success);
+}
+
+/*
+
+LOCAL FUNCTION
+
+	gnu_special -- special handling of gnu mangled strings
+
+SYNOPSIS
+
+	static int
+	gnu_special (struct work_stuff *work, const char **mangled,
+		     string *declp);
+
+
+DESCRIPTION
+
+	Process some special GNU style mangling forms that don't fit
+	the normal pattern.  For example:
+
+		_$_3foo		(destructor for class foo)
+		_vt$foo		(foo virtual table)
+		_vt$foo$bar	(foo::bar virtual table)
+		__vt_foo	(foo virtual table, new style with thunks)
+		_3foo$varname	(static data member)
+		_Q22rs2tu$vw	(static data member)
+		__t6vector1Zii	(constructor with template)
+		__thunk_4__$_7ostream (virtual function thunk)
+ */
+
+static int
+gnu_special (struct work_stuff *work, const char **mangled, string *declp)
+{
+  int n;
+  int success = 1;
+  const char *p;
+
+  if ((*mangled)[0] == '_'
+      && strchr (cplus_markers, (*mangled)[1]) != NULL
+      && (*mangled)[2] == '_')
+    {
+      /* Found a GNU style destructor, get past "_<CPLUS_MARKER>_" */
+      (*mangled) += 3;
+      work -> destructor += 1;
+    }
+  else if ((*mangled)[0] == '_'
+	   && (((*mangled)[1] == '_'
+		&& (*mangled)[2] == 'v'
+		&& (*mangled)[3] == 't'
+		&& (*mangled)[4] == '_')
+	       || ((*mangled)[1] == 'v'
+		   && (*mangled)[2] == 't'
+		   && strchr (cplus_markers, (*mangled)[3]) != NULL)))
+    {
+      /* Found a GNU style virtual table, get past "_vt<CPLUS_MARKER>"
+         and create the decl.  Note that we consume the entire mangled
+	 input string, which means that demangle_signature has no work
+	 to do.  */
+      if ((*mangled)[2] == 'v')
+	(*mangled) += 5; /* New style, with thunks: "__vt_" */
+      else
+	(*mangled) += 4; /* Old style, no thunks: "_vt<CPLUS_MARKER>" */
+      while (**mangled != '\0')
+	{
+	  switch (**mangled)
+	    {
+	    case 'Q':
+	    case 'K':
+	      success = demangle_qualified (work, mangled, declp, 0, 1);
+	      break;
+	    case 't':
+	      success = demangle_template (work, mangled, declp, 0, 1,
+					   1);
+	      break;
+	    default:
+	      if (ISDIGIT((unsigned char)*mangled[0]))
+		{
+		  n = consume_count(mangled);
+		  /* We may be seeing a too-large size, or else a
+		     ".<digits>" indicating a static local symbol.  In
+		     any case, declare victory and move on; *don't* try
+		     to use n to allocate.  */
+		  if (n > (int) strlen (*mangled))
+		    {
+		      success = 1;
+		      break;
+		    }
+		}
+	      else
+		{
+		  n = strcspn (*mangled, cplus_markers);
+		}
+	      string_appendn (declp, *mangled, n);
+	      (*mangled) += n;
+	    }
+
+	  p = strpbrk (*mangled, cplus_markers);
+	  if (success && ((p == NULL) || (p == *mangled)))
+	    {
+	      if (p != NULL)
+		{
+		  string_append (declp, SCOPE_STRING (work));
+		  (*mangled)++;
+		}
+	    }
+	  else
+	    {
+	      success = 0;
+	      break;
+	    }
+	}
+      if (success)
+	string_append (declp, " virtual table");
+    }
+  else if ((*mangled)[0] == '_'
+	   && (strchr("0123456789Qt", (*mangled)[1]) != NULL)
+	   && (p = strpbrk (*mangled, cplus_markers)) != NULL)
+    {
+      /* static data member, "_3foo$varname" for example */
+      (*mangled)++;
+      switch (**mangled)
+	{
+	case 'Q':
+	case 'K':
+	  success = demangle_qualified (work, mangled, declp, 0, 1);
+	  break;
+	case 't':
+	  success = demangle_template (work, mangled, declp, 0, 1, 1);
+	  break;
+	default:
+	  n = consume_count (mangled);
+	  if (n < 0 || n > (long) strlen (*mangled))
+	    {
+	      success = 0;
+	      break;
+	    }
+
+	  if (n > 10 && strncmp (*mangled, "_GLOBAL_", 8) == 0
+	      && (*mangled)[9] == 'N'
+	      && (*mangled)[8] == (*mangled)[10]
+	      && strchr (cplus_markers, (*mangled)[8]))
+	    {
+	      /* A member of the anonymous namespace.  There's information
+		 about what identifier or filename it was keyed to, but
+		 it's just there to make the mangled name unique; we just
+		 step over it.  */
+	      string_append (declp, "{anonymous}");
+	      (*mangled) += n;
+
+	      /* Now p points to the marker before the N, so we need to
+		 update it to the first marker after what we consumed.  */
+	      p = strpbrk (*mangled, cplus_markers);
+	      break;
+	    }
+
+	  string_appendn (declp, *mangled, n);
+	  (*mangled) += n;
+	}
+      if (success && (p == *mangled))
+	{
+	  /* Consumed everything up to the cplus_marker, append the
+	     variable name.  */
+	  (*mangled)++;
+	  string_append (declp, SCOPE_STRING (work));
+	  n = strlen (*mangled);
+	  string_appendn (declp, *mangled, n);
+	  (*mangled) += n;
+	}
+      else
+	{
+	  success = 0;
+	}
+    }
+  else if (strncmp (*mangled, "__thunk_", 8) == 0)
+    {
+      int delta;
+
+      (*mangled) += 8;
+      delta = consume_count (mangled);
+      if (delta == -1)
+	success = 0;
+      else
+	{
+	  char *method = internal_cplus_demangle (work, ++*mangled);
+
+	  if (method)
+	    {
+	      char buf[50];
+	      sprintf (buf, "virtual function thunk (delta:%d) for ", -delta);
+	      string_append (declp, buf);
+	      string_append (declp, method);
+	      free (method);
+	      n = strlen (*mangled);
+	      (*mangled) += n;
+	    }
+	  else
+	    {
+	      success = 0;
+	    }
+	}
+    }
+  else if (strncmp (*mangled, "__t", 3) == 0
+	   && ((*mangled)[3] == 'i' || (*mangled)[3] == 'f'))
+    {
+      p = (*mangled)[3] == 'i' ? " type_info node" : " type_info function";
+      (*mangled) += 4;
+      switch (**mangled)
+	{
+	case 'Q':
+	case 'K':
+	  success = demangle_qualified (work, mangled, declp, 0, 1);
+	  break;
+	case 't':
+	  success = demangle_template (work, mangled, declp, 0, 1, 1);
+	  break;
+	default:
+	  success = do_type (work, mangled, declp);
+	  break;
+	}
+      if (success && **mangled != '\0')
+	success = 0;
+      if (success)
+	string_append (declp, p);
+    }
+  else
+    {
+      success = 0;
+    }
+  return (success);
+}
+
+static void
+recursively_demangle(struct work_stuff *work, const char **mangled,
+                     string *result, int namelength)
+{
+  char * recurse = (char *)NULL;
+  char * recurse_dem = (char *)NULL;
+
+  recurse = XNEWVEC (char, namelength + 1);
+  memcpy (recurse, *mangled, namelength);
+  recurse[namelength] = '\000';
+
+  recurse_dem = cplus_demangle (recurse, work->options);
+
+  if (recurse_dem)
+    {
+      string_append (result, recurse_dem);
+      free (recurse_dem);
+    }
+  else
+    {
+      string_appendn (result, *mangled, namelength);
+    }
+  free (recurse);
+  *mangled += namelength;
+}
+
+/*
+
+LOCAL FUNCTION
+
+	arm_special -- special handling of ARM/lucid mangled strings
+
+SYNOPSIS
+
+	static int
+	arm_special (const char **mangled,
+		     string *declp);
+
+
+DESCRIPTION
+
+	Process some special ARM style mangling forms that don't fit
+	the normal pattern.  For example:
+
+		__vtbl__3foo		(foo virtual table)
+		__vtbl__3foo__3bar	(bar::foo virtual table)
+
+ */
+
+static int
+arm_special (const char **mangled, string *declp)
+{
+  int n;
+  int success = 1;
+  const char *scan;
+
+  if (strncmp (*mangled, ARM_VTABLE_STRING, ARM_VTABLE_STRLEN) == 0)
+    {
+      /* Found a ARM style virtual table, get past ARM_VTABLE_STRING
+         and create the decl.  Note that we consume the entire mangled
+	 input string, which means that demangle_signature has no work
+	 to do.  */
+      scan = *mangled + ARM_VTABLE_STRLEN;
+      while (*scan != '\0')        /* first check it can be demangled */
+        {
+          n = consume_count (&scan);
+          if (n == -1)
+	    {
+	      return (0);           /* no good */
+	    }
+          scan += n;
+          if (scan[0] == '_' && scan[1] == '_')
+	    {
+	      scan += 2;
+	    }
+        }
+      (*mangled) += ARM_VTABLE_STRLEN;
+      while (**mangled != '\0')
+	{
+	  n = consume_count (mangled);
+          if (n == -1
+	      || n > (long) strlen (*mangled))
+	    return 0;
+	  string_prependn (declp, *mangled, n);
+	  (*mangled) += n;
+	  if ((*mangled)[0] == '_' && (*mangled)[1] == '_')
+	    {
+	      string_prepend (declp, "::");
+	      (*mangled) += 2;
+	    }
+	}
+      string_append (declp, " virtual table");
+    }
+  else
+    {
+      success = 0;
+    }
+  return (success);
+}
+
+/*
+
+LOCAL FUNCTION
+
+	demangle_qualified -- demangle 'Q' qualified name strings
+
+SYNOPSIS
+
+	static int
+	demangle_qualified (struct work_stuff *, const char *mangled,
+			    string *result, int isfuncname, int append);
+
+DESCRIPTION
+
+	Demangle a qualified name, such as "Q25Outer5Inner" which is
+	the mangled form of "Outer::Inner".  The demangled output is
+	prepended or appended to the result string according to the
+	state of the append flag.
+
+	If isfuncname is nonzero, then the qualified name we are building
+	is going to be used as a member function name, so if it is a
+	constructor or destructor function, append an appropriate
+	constructor or destructor name.  I.E. for the above example,
+	the result for use as a constructor is "Outer::Inner::Inner"
+	and the result for use as a destructor is "Outer::Inner::~Inner".
+
+BUGS
+
+	Numeric conversion is ASCII dependent (FIXME).
+
+ */
+
+static int
+demangle_qualified (struct work_stuff *work, const char **mangled,
+                    string *result, int isfuncname, int append)
+{
+  int qualifiers = 0;
+  int success = 1;
+  char num[2];
+  string temp;
+  string last_name;
+  int bindex = register_Btype (work);
+
+  /* We only make use of ISFUNCNAME if the entity is a constructor or
+     destructor.  */
+  isfuncname = (isfuncname
+		&& ((work->constructor & 1) || (work->destructor & 1)));
+
+  string_init (&temp);
+  string_init (&last_name);
+
+  if ((*mangled)[0] == 'K')
+    {
+    /* Squangling qualified name reuse */
+      int idx;
+      (*mangled)++;
+      idx = consume_count_with_underscores (mangled);
+      if (idx == -1 || idx >= work -> numk)
+        success = 0;
+      else
+        string_append (&temp, work -> ktypevec[idx]);
+    }
+  else
+    switch ((*mangled)[1])
+    {
+    case '_':
+      /* GNU mangled name with more than 9 classes.  The count is preceded
+	 by an underscore (to distinguish it from the <= 9 case) and followed
+	 by an underscore.  */
+      (*mangled)++;
+      qualifiers = consume_count_with_underscores (mangled);
+      if (qualifiers == -1)
+	success = 0;
+      break;
+
+    case '1':
+    case '2':
+    case '3':
+    case '4':
+    case '5':
+    case '6':
+    case '7':
+    case '8':
+    case '9':
+      /* The count is in a single digit.  */
+      num[0] = (*mangled)[1];
+      num[1] = '\0';
+      qualifiers = atoi (num);
+
+      /* If there is an underscore after the digit, skip it.  This is
+	 said to be for ARM-qualified names, but the ARM makes no
+	 mention of such an underscore.  Perhaps cfront uses one.  */
+      if ((*mangled)[2] == '_')
+	{
+	  (*mangled)++;
+	}
+      (*mangled) += 2;
+      break;
+
+    case '0':
+    default:
+      success = 0;
+    }
+
+  if (!success)
+    return success;
+
+  /* Pick off the names and collect them in the temp buffer in the order
+     in which they are found, separated by '::'.  */
+
+  while (qualifiers-- > 0)
+    {
+      int remember_K = 1;
+      string_clear (&last_name);
+
+      if (*mangled[0] == '_')
+	(*mangled)++;
+
+      if (*mangled[0] == 't')
+	{
+	  /* Here we always append to TEMP since we will want to use
+	     the template name without the template parameters as a
+	     constructor or destructor name.  The appropriate
+	     (parameter-less) value is returned by demangle_template
+	     in LAST_NAME.  We do not remember the template type here,
+	     in order to match the G++ mangling algorithm.  */
+	  success = demangle_template(work, mangled, &temp,
+				      &last_name, 1, 0);
+	  if (!success)
+	    break;
+	}
+      else if (*mangled[0] == 'K')
+	{
+          int idx;
+          (*mangled)++;
+          idx = consume_count_with_underscores (mangled);
+          if (idx == -1 || idx >= work->numk)
+            success = 0;
+          else
+            string_append (&temp, work->ktypevec[idx]);
+          remember_K = 0;
+
+	  if (!success) break;
+	}
+      else
+	{
+	  if (EDG_DEMANGLING)
+            {
+	      int namelength;
+ 	      /* Now recursively demangle the qualifier
+ 	       * This is necessary to deal with templates in
+ 	       * mangling styles like EDG */
+	      namelength = consume_count (mangled);
+	      if (namelength == -1)
+		{
+		  success = 0;
+		  break;
+		}
+ 	      recursively_demangle(work, mangled, &temp, namelength);
+            }
+          else
+            {
+              string_delete (&last_name);
+              success = do_type (work, mangled, &last_name);
+              if (!success)
+                break;
+              string_appends (&temp, &last_name);
+            }
+	}
+
+      if (remember_K)
+	remember_Ktype (work, temp.b, LEN_STRING (&temp));
+
+      if (qualifiers > 0)
+	string_append (&temp, SCOPE_STRING (work));
+    }
+
+  remember_Btype (work, temp.b, LEN_STRING (&temp), bindex);
+
+  /* If we are using the result as a function name, we need to append
+     the appropriate '::' separated constructor or destructor name.
+     We do this here because this is the most convenient place, where
+     we already have a pointer to the name and the length of the name.  */
+
+  if (isfuncname)
+    {
+      string_append (&temp, SCOPE_STRING (work));
+      if (work -> destructor & 1)
+	string_append (&temp, "~");
+      string_appends (&temp, &last_name);
+    }
+
+  /* Now either prepend the temp buffer to the result, or append it,
+     depending upon the state of the append flag.  */
+
+  if (append)
+    string_appends (result, &temp);
+  else
+    {
+      if (!STRING_EMPTY (result))
+	string_append (&temp, SCOPE_STRING (work));
+      string_prepends (result, &temp);
+    }
+
+  string_delete (&last_name);
+  string_delete (&temp);
+  return (success);
+}
+
+/*
+
+LOCAL FUNCTION
+
+	get_count -- convert an ascii count to integer, consuming tokens
+
+SYNOPSIS
+
+	static int
+	get_count (const char **type, int *count)
+
+DESCRIPTION
+
+	Assume that *type points at a count in a mangled name; set
+	*count to its value, and set *type to the next character after
+	the count.  There are some weird rules in effect here.
+
+	If *type does not point at a string of digits, return zero.
+
+	If *type points at a string of digits followed by an
+	underscore, set *count to their value as an integer, advance
+	*type to point *after the underscore, and return 1.
+
+	If *type points at a string of digits not followed by an
+	underscore, consume only the first digit.  Set *count to its
+	value as an integer, leave *type pointing after that digit,
+	and return 1.
+
+        The excuse for this odd behavior: in the ARM and HP demangling
+        styles, a type can be followed by a repeat count of the form
+        `Nxy', where:
+
+        `x' is a single digit specifying how many additional copies
+            of the type to append to the argument list, and
+
+        `y' is one or more digits, specifying the zero-based index of
+            the first repeated argument in the list.  Yes, as you're
+            unmangling the name you can figure this out yourself, but
+            it's there anyway.
+
+        So, for example, in `bar__3fooFPiN51', the first argument is a
+        pointer to an integer (`Pi'), and then the next five arguments
+        are the same (`N5'), and the first repeat is the function's
+        second argument (`1').
+*/
+
+static int
+get_count (const char **type, int *count)
+{
+  const char *p;
+  int n;
+
+  if (!ISDIGIT ((unsigned char)**type))
+    return (0);
+  else
+    {
+      *count = **type - '0';
+      (*type)++;
+      if (ISDIGIT ((unsigned char)**type))
+	{
+	  p = *type;
+	  n = *count;
+	  do
+	    {
+	      n *= 10;
+	      n += *p - '0';
+	      p++;
+	    }
+	  while (ISDIGIT ((unsigned char)*p));
+	  if (*p == '_')
+	    {
+	      *type = p + 1;
+	      *count = n;
+	    }
+	}
+    }
+  return (1);
+}
+
+/* RESULT will be initialised here; it will be freed on failure.  The
+   value returned is really a type_kind_t.  */
+
+static int
+do_type (struct work_stuff *work, const char **mangled, string *result)
+{
+  int n;
+  int done;
+  int success;
+  string decl;
+  const char *remembered_type;
+  int type_quals;
+  type_kind_t tk = tk_none;
+
+  string_init (&decl);
+  string_init (result);
+
+  done = 0;
+  success = 1;
+  while (success && !done)
+    {
+      int member;
+      switch (**mangled)
+	{
+
+	  /* A pointer type */
+	case 'P':
+	case 'p':
+	  (*mangled)++;
+	  if (! (work -> options & DMGL_JAVA))
+	    string_prepend (&decl, "*");
+	  if (tk == tk_none)
+	    tk = tk_pointer;
+	  break;
+
+	  /* A reference type */
+	case 'R':
+	  (*mangled)++;
+	  string_prepend (&decl, "&");
+	  if (tk == tk_none)
+	    tk = tk_reference;
+	  break;
+
+	  /* An array */
+	case 'A':
+	  {
+	    ++(*mangled);
+	    if (!STRING_EMPTY (&decl)
+		&& (decl.b[0] == '*' || decl.b[0] == '&'))
+	      {
+		string_prepend (&decl, "(");
+		string_append (&decl, ")");
+	      }
+	    string_append (&decl, "[");
+	    if (**mangled != '_')
+	      success = demangle_template_value_parm (work, mangled, &decl,
+						      tk_integral);
+	    if (**mangled == '_')
+	      ++(*mangled);
+	    string_append (&decl, "]");
+	    break;
+	  }
+
+	/* A back reference to a previously seen type */
+	case 'T':
+	  (*mangled)++;
+	  if (!get_count (mangled, &n) || n >= work -> ntypes)
+	    {
+	      success = 0;
+	    }
+	  else
+	    {
+	      remembered_type = work -> typevec[n];
+	      mangled = &remembered_type;
+	    }
+	  break;
+
+	  /* A function */
+	case 'F':
+	  (*mangled)++;
+	    if (!STRING_EMPTY (&decl)
+		&& (decl.b[0] == '*' || decl.b[0] == '&'))
+	    {
+	      string_prepend (&decl, "(");
+	      string_append (&decl, ")");
+	    }
+	  /* After picking off the function args, we expect to either find the
+	     function return type (preceded by an '_') or the end of the
+	     string.  */
+	  if (!demangle_nested_args (work, mangled, &decl)
+	      || (**mangled != '_' && **mangled != '\0'))
+	    {
+	      success = 0;
+	      break;
+	    }
+	  if (success && (**mangled == '_'))
+	    (*mangled)++;
+	  break;
+
+	case 'M':
+	case 'O':
+	  {
+	    type_quals = TYPE_UNQUALIFIED;
+
+	    member = **mangled == 'M';
+	    (*mangled)++;
+
+	    string_append (&decl, ")");
+
+	    /* We don't need to prepend `::' for a qualified name;
+	       demangle_qualified will do that for us.  */
+	    if (**mangled != 'Q')
+	      string_prepend (&decl, SCOPE_STRING (work));
+
+	    if (ISDIGIT ((unsigned char)**mangled))
+	      {
+		n = consume_count (mangled);
+		if (n == -1
+		    || (int) strlen (*mangled) < n)
+		  {
+		    success = 0;
+		    break;
+		  }
+		string_prependn (&decl, *mangled, n);
+		*mangled += n;
+	      }
+	    else if (**mangled == 'X' || **mangled == 'Y')
+	      {
+		string temp;
+		do_type (work, mangled, &temp);
+		string_prepends (&decl, &temp);
+		string_delete (&temp);
+	      }
+	    else if (**mangled == 't')
+	      {
+		string temp;
+		string_init (&temp);
+		success = demangle_template (work, mangled, &temp,
+					     NULL, 1, 1);
+		if (success)
+		  {
+		    string_prependn (&decl, temp.b, temp.p - temp.b);
+		    string_delete (&temp);
+		  }
+		else
+		  break;
+	      }
+	    else if (**mangled == 'Q')
+	      {
+		success = demangle_qualified (work, mangled, &decl,
+					      /*isfuncnam=*/0, 
+					      /*append=*/0);
+		if (!success)
+		  break;
+	      }
+	    else
+	      {
+		success = 0;
+		break;
+	      }
+
+	    string_prepend (&decl, "(");
+	    if (member)
+	      {
+		switch (**mangled)
+		  {
+		  case 'C':
+		  case 'V':
+		  case 'u':
+		    type_quals |= code_for_qualifier (**mangled);
+		    (*mangled)++;
+		    break;
+
+		  default:
+		    break;
+		  }
+
+		if (*(*mangled)++ != 'F')
+		  {
+		    success = 0;
+		    break;
+		  }
+	      }
+	    if ((member && !demangle_nested_args (work, mangled, &decl))
+		|| **mangled != '_')
+	      {
+		success = 0;
+		break;
+	      }
+	    (*mangled)++;
+	    if (! PRINT_ANSI_QUALIFIERS)
+	      {
+		break;
+	      }
+	    if (type_quals != TYPE_UNQUALIFIED)
+	      {
+		APPEND_BLANK (&decl);
+		string_append (&decl, qualifier_string (type_quals));
+	      }
+	    break;
+	  }
+        case 'G':
+	  (*mangled)++;
+	  break;
+
+	case 'C':
+	case 'V':
+	case 'u':
+	  if (PRINT_ANSI_QUALIFIERS)
+	    {
+	      if (!STRING_EMPTY (&decl))
+		string_prepend (&decl, " ");
+
+	      string_prepend (&decl, demangle_qualifier (**mangled));
+	    }
+	  (*mangled)++;
+	  break;
+	  /*
+	    }
+	    */
+
+	  /* fall through */
+	default:
+	  done = 1;
+	  break;
+	}
+    }
+
+  if (success) switch (**mangled)
+    {
+      /* A qualified name, such as "Outer::Inner".  */
+    case 'Q':
+    case 'K':
+      {
+        success = demangle_qualified (work, mangled, result, 0, 1);
+        break;
+      }
+
+    /* A back reference to a previously seen squangled type */
+    case 'B':
+      (*mangled)++;
+      if (!get_count (mangled, &n) || n >= work -> numb)
+	success = 0;
+      else
+	string_append (result, work->btypevec[n]);
+      break;
+
+    case 'X':
+    case 'Y':
+      /* A template parm.  We substitute the corresponding argument. */
+      {
+	int idx;
+
+	(*mangled)++;
+	idx = consume_count_with_underscores (mangled);
+
+	if (idx == -1
+	    || (work->tmpl_argvec && idx >= work->ntmpl_args)
+	    || consume_count_with_underscores (mangled) == -1)
+	  {
+	    success = 0;
+	    break;
+	  }
+
+	if (work->tmpl_argvec)
+	  string_append (result, work->tmpl_argvec[idx]);
+	else
+	  string_append_template_idx (result, idx);
+
+	success = 1;
+      }
+    break;
+
+    default:
+      success = demangle_fund_type (work, mangled, result);
+      if (tk == tk_none)
+	tk = (type_kind_t) success;
+      break;
+    }
+
+  if (success)
+    {
+      if (!STRING_EMPTY (&decl))
+	{
+	  string_append (result, " ");
+	  string_appends (result, &decl);
+	}
+    }
+  else
+    string_delete (result);
+  string_delete (&decl);
+
+  if (success)
+    /* Assume an integral type, if we're not sure.  */
+    return (int) ((tk == tk_none) ? tk_integral : tk);
+  else
+    return 0;
+}
+
+/* Given a pointer to a type string that represents a fundamental type
+   argument (int, long, unsigned int, etc) in TYPE, a pointer to the
+   string in which the demangled output is being built in RESULT, and
+   the WORK structure, decode the types and add them to the result.
+
+   For example:
+
+   	"Ci"	=>	"const int"
+	"Sl"	=>	"signed long"
+	"CUs"	=>	"const unsigned short"
+
+   The value returned is really a type_kind_t.  */
+
+static int
+demangle_fund_type (struct work_stuff *work,
+                    const char **mangled, string *result)
+{
+  int done = 0;
+  int success = 1;
+  char buf[INTBUF_SIZE + 5 /* 'int%u_t' */];
+  unsigned int dec = 0;
+  type_kind_t tk = tk_integral;
+
+  /* First pick off any type qualifiers.  There can be more than one.  */
+
+  while (!done)
+    {
+      switch (**mangled)
+	{
+	case 'C':
+	case 'V':
+	case 'u':
+	  if (PRINT_ANSI_QUALIFIERS)
+	    {
+              if (!STRING_EMPTY (result))
+                string_prepend (result, " ");
+	      string_prepend (result, demangle_qualifier (**mangled));
+	    }
+	  (*mangled)++;
+	  break;
+	case 'U':
+	  (*mangled)++;
+	  APPEND_BLANK (result);
+	  string_append (result, "unsigned");
+	  break;
+	case 'S': /* signed char only */
+	  (*mangled)++;
+	  APPEND_BLANK (result);
+	  string_append (result, "signed");
+	  break;
+	case 'J':
+	  (*mangled)++;
+	  APPEND_BLANK (result);
+	  string_append (result, "__complex");
+	  break;
+	default:
+	  done = 1;
+	  break;
+	}
+    }
+
+  /* Now pick off the fundamental type.  There can be only one.  */
+
+  switch (**mangled)
+    {
+    case '\0':
+    case '_':
+      break;
+    case 'v':
+      (*mangled)++;
+      APPEND_BLANK (result);
+      string_append (result, "void");
+      break;
+    case 'x':
+      (*mangled)++;
+      APPEND_BLANK (result);
+      string_append (result, "long long");
+      break;
+    case 'l':
+      (*mangled)++;
+      APPEND_BLANK (result);
+      string_append (result, "long");
+      break;
+    case 'i':
+      (*mangled)++;
+      APPEND_BLANK (result);
+      string_append (result, "int");
+      break;
+    case 's':
+      (*mangled)++;
+      APPEND_BLANK (result);
+      string_append (result, "short");
+      break;
+    case 'b':
+      (*mangled)++;
+      APPEND_BLANK (result);
+      string_append (result, "bool");
+      tk = tk_bool;
+      break;
+    case 'c':
+      (*mangled)++;
+      APPEND_BLANK (result);
+      string_append (result, "char");
+      tk = tk_char;
+      break;
+    case 'w':
+      (*mangled)++;
+      APPEND_BLANK (result);
+      string_append (result, "wchar_t");
+      tk = tk_char;
+      break;
+    case 'r':
+      (*mangled)++;
+      APPEND_BLANK (result);
+      string_append (result, "long double");
+      tk = tk_real;
+      break;
+    case 'd':
+      (*mangled)++;
+      APPEND_BLANK (result);
+      string_append (result, "double");
+      tk = tk_real;
+      break;
+    case 'f':
+      (*mangled)++;
+      APPEND_BLANK (result);
+      string_append (result, "float");
+      tk = tk_real;
+      break;
+    case 'G':
+      (*mangled)++;
+      if (!ISDIGIT ((unsigned char)**mangled))
+	{
+	  success = 0;
+	  break;
+	}
+    case 'I':
+      (*mangled)++;
+      if (**mangled == '_')
+	{
+	  int i;
+	  (*mangled)++;
+	  for (i = 0;
+	       i < (long) sizeof (buf) - 1 && **mangled && **mangled != '_';
+	       (*mangled)++, i++)
+	    buf[i] = **mangled;
+	  if (**mangled != '_')
+	    {
+	      success = 0;
+	      break;
+	    }
+	  buf[i] = '\0';
+	  (*mangled)++;
+	}
+      else
+	{
+	  strncpy (buf, *mangled, 2);
+	  buf[2] = '\0';
+	  *mangled += min (strlen (*mangled), 2);
+	}
+      sscanf (buf, "%x", &dec);
+      sprintf (buf, "int%u_t", dec);
+      APPEND_BLANK (result);
+      string_append (result, buf);
+      break;
+
+      /* fall through */
+      /* An explicit type, such as "6mytype" or "7integer" */
+    case '0':
+    case '1':
+    case '2':
+    case '3':
+    case '4':
+    case '5':
+    case '6':
+    case '7':
+    case '8':
+    case '9':
+      {
+        int bindex = register_Btype (work);
+        string btype;
+        string_init (&btype);
+        if (demangle_class_name (work, mangled, &btype)) {
+          remember_Btype (work, btype.b, LEN_STRING (&btype), bindex);
+          APPEND_BLANK (result);
+          string_appends (result, &btype);
+        }
+        else
+          success = 0;
+        string_delete (&btype);
+        break;
+      }
+    case 't':
+      {
+        string btype;
+        string_init (&btype);
+        success = demangle_template (work, mangled, &btype, 0, 1, 1);
+        string_appends (result, &btype);
+        string_delete (&btype);
+        break;
+      }
+    default:
+      success = 0;
+      break;
+    }
+
+  return success ? ((int) tk) : 0;
+}
+
+
+/* Handle a template's value parameter for HP aCC (extension from ARM)
+   **mangled points to 'S' or 'U' */
+
+static int
+do_hpacc_template_const_value (struct work_stuff *work ATTRIBUTE_UNUSED,
+                               const char **mangled, string *result)
+{
+  int unsigned_const;
+
+  if (**mangled != 'U' && **mangled != 'S')
+    return 0;
+
+  unsigned_const = (**mangled == 'U');
+
+  (*mangled)++;
+
+  switch (**mangled)
+    {
+      case 'N':
+        string_append (result, "-");
+        /* fall through */
+      case 'P':
+        (*mangled)++;
+        break;
+      case 'M':
+        /* special case for -2^31 */
+        string_append (result, "-2147483648");
+        (*mangled)++;
+        return 1;
+      default:
+        return 0;
+    }
+
+  /* We have to be looking at an integer now */
+  if (!(ISDIGIT ((unsigned char)**mangled)))
+    return 0;
+
+  /* We only deal with integral values for template
+     parameters -- so it's OK to look only for digits */
+  while (ISDIGIT ((unsigned char)**mangled))
+    {
+      char_str[0] = **mangled;
+      string_append (result, char_str);
+      (*mangled)++;
+    }
+
+  if (unsigned_const)
+    string_append (result, "U");
+
+  /* FIXME? Some day we may have 64-bit (or larger :-) ) constants
+     with L or LL suffixes. pai/1997-09-03 */
+
+  return 1; /* success */
+}
+
+/* Handle a template's literal parameter for HP aCC (extension from ARM)
+   **mangled is pointing to the 'A' */
+
+static int
+do_hpacc_template_literal (struct work_stuff *work, const char **mangled,
+                           string *result)
+{
+  int literal_len = 0;
+  char * recurse;
+  char * recurse_dem;
+
+  if (**mangled != 'A')
+    return 0;
+
+  (*mangled)++;
+
+  literal_len = consume_count (mangled);
+
+  if (literal_len <= 0)
+    return 0;
+
+  /* Literal parameters are names of arrays, functions, etc.  and the
+     canonical representation uses the address operator */
+  string_append (result, "&");
+
+  /* Now recursively demangle the literal name */
+  recurse = XNEWVEC (char, literal_len + 1);
+  memcpy (recurse, *mangled, literal_len);
+  recurse[literal_len] = '\000';
+
+  recurse_dem = cplus_demangle (recurse, work->options);
+
+  if (recurse_dem)
+    {
+      string_append (result, recurse_dem);
+      free (recurse_dem);
+    }
+  else
+    {
+      string_appendn (result, *mangled, literal_len);
+    }
+  (*mangled) += literal_len;
+  free (recurse);
+
+  return 1;
+}
+
+static int
+snarf_numeric_literal (const char **args, string *arg)
+{
+  if (**args == '-')
+    {
+      char_str[0] = '-';
+      string_append (arg, char_str);
+      (*args)++;
+    }
+  else if (**args == '+')
+    (*args)++;
+
+  if (!ISDIGIT ((unsigned char)**args))
+    return 0;
+
+  while (ISDIGIT ((unsigned char)**args))
+    {
+      char_str[0] = **args;
+      string_append (arg, char_str);
+      (*args)++;
+    }
+
+  return 1;
+}
+
+/* Demangle the next argument, given by MANGLED into RESULT, which
+   *should be an uninitialized* string.  It will be initialized here,
+   and free'd should anything go wrong.  */
+
+static int
+do_arg (struct work_stuff *work, const char **mangled, string *result)
+{
+  /* Remember where we started so that we can record the type, for
+     non-squangling type remembering.  */
+  const char *start = *mangled;
+
+  string_init (result);
+
+  if (work->nrepeats > 0)
+    {
+      --work->nrepeats;
+
+      if (work->previous_argument == 0)
+	return 0;
+
+      /* We want to reissue the previous type in this argument list.  */
+      string_appends (result, work->previous_argument);
+      return 1;
+    }
+
+  if (**mangled == 'n')
+    {
+      /* A squangling-style repeat.  */
+      (*mangled)++;
+      work->nrepeats = consume_count(mangled);
+
+      if (work->nrepeats <= 0)
+	/* This was not a repeat count after all.  */
+	return 0;
+
+      if (work->nrepeats > 9)
+	{
+	  if (**mangled != '_')
+	    /* The repeat count should be followed by an '_' in this
+	       case.  */
+	    return 0;
+	  else
+	    (*mangled)++;
+	}
+
+      /* Now, the repeat is all set up.  */
+      return do_arg (work, mangled, result);
+    }
+
+  /* Save the result in WORK->previous_argument so that we can find it
+     if it's repeated.  Note that saving START is not good enough: we
+     do not want to add additional types to the back-referenceable
+     type vector when processing a repeated type.  */
+  if (work->previous_argument)
+    string_delete (work->previous_argument);
+  else
+    work->previous_argument = XNEW (string);
+
+  if (!do_type (work, mangled, work->previous_argument))
+    return 0;
+
+  string_appends (result, work->previous_argument);
+
+  remember_type (work, start, *mangled - start);
+  return 1;
+}
+
+static void
+remember_type (struct work_stuff *work, const char *start, int len)
+{
+  char *tem;
+
+  if (work->forgetting_types)
+    return;
+
+  if (work -> ntypes >= work -> typevec_size)
+    {
+      if (work -> typevec_size == 0)
+	{
+	  work -> typevec_size = 3;
+	  work -> typevec = XNEWVEC (char *, work->typevec_size);
+	}
+      else
+	{
+	  work -> typevec_size *= 2;
+	  work -> typevec
+	    = XRESIZEVEC (char *, work->typevec, work->typevec_size);
+	}
+    }
+  tem = XNEWVEC (char, len + 1);
+  memcpy (tem, start, len);
+  tem[len] = '\0';
+  work -> typevec[work -> ntypes++] = tem;
+}
+
+
+/* Remember a K type class qualifier. */
+static void
+remember_Ktype (struct work_stuff *work, const char *start, int len)
+{
+  char *tem;
+
+  if (work -> numk >= work -> ksize)
+    {
+      if (work -> ksize == 0)
+	{
+	  work -> ksize = 5;
+	  work -> ktypevec = XNEWVEC (char *, work->ksize);
+	}
+      else
+	{
+	  work -> ksize *= 2;
+	  work -> ktypevec
+	    = XRESIZEVEC (char *, work->ktypevec, work->ksize);
+	}
+    }
+  tem = XNEWVEC (char, len + 1);
+  memcpy (tem, start, len);
+  tem[len] = '\0';
+  work -> ktypevec[work -> numk++] = tem;
+}
+
+/* Register a B code, and get an index for it. B codes are registered
+   as they are seen, rather than as they are completed, so map<temp<char> >
+   registers map<temp<char> > as B0, and temp<char> as B1 */
+
+static int
+register_Btype (struct work_stuff *work)
+{
+  int ret;
+
+  if (work -> numb >= work -> bsize)
+    {
+      if (work -> bsize == 0)
+	{
+	  work -> bsize = 5;
+	  work -> btypevec = XNEWVEC (char *, work->bsize);
+	}
+      else
+	{
+	  work -> bsize *= 2;
+	  work -> btypevec
+	    = XRESIZEVEC (char *, work->btypevec, work->bsize);
+	}
+    }
+  ret = work -> numb++;
+  work -> btypevec[ret] = NULL;
+  return(ret);
+}
+
+/* Store a value into a previously registered B code type. */
+
+static void
+remember_Btype (struct work_stuff *work, const char *start,
+                int len, int index)
+{
+  char *tem;
+
+  tem = XNEWVEC (char, len + 1);
+  memcpy (tem, start, len);
+  tem[len] = '\0';
+  work -> btypevec[index] = tem;
+}
+
+/* Lose all the info related to B and K type codes. */
+static void
+forget_B_and_K_types (struct work_stuff *work)
+{
+  int i;
+
+  while (work -> numk > 0)
+    {
+      i = --(work -> numk);
+      if (work -> ktypevec[i] != NULL)
+	{
+	  free (work -> ktypevec[i]);
+	  work -> ktypevec[i] = NULL;
+	}
+    }
+
+  while (work -> numb > 0)
+    {
+      i = --(work -> numb);
+      if (work -> btypevec[i] != NULL)
+	{
+	  free (work -> btypevec[i]);
+	  work -> btypevec[i] = NULL;
+	}
+    }
+}
+/* Forget the remembered types, but not the type vector itself.  */
+
+static void
+forget_types (struct work_stuff *work)
+{
+  int i;
+
+  while (work -> ntypes > 0)
+    {
+      i = --(work -> ntypes);
+      if (work -> typevec[i] != NULL)
+	{
+	  free (work -> typevec[i]);
+	  work -> typevec[i] = NULL;
+	}
+    }
+}
+
+/* Process the argument list part of the signature, after any class spec
+   has been consumed, as well as the first 'F' character (if any).  For
+   example:
+
+   "__als__3fooRT0"		=>	process "RT0"
+   "complexfunc5__FPFPc_PFl_i"	=>	process "PFPc_PFl_i"
+
+   DECLP must be already initialised, usually non-empty.  It won't be freed
+   on failure.
+
+   Note that g++ differs significantly from ARM and lucid style mangling
+   with regards to references to previously seen types.  For example, given
+   the source fragment:
+
+     class foo {
+       public:
+       foo::foo (int, foo &ia, int, foo &ib, int, foo &ic);
+     };
+
+     foo::foo (int, foo &ia, int, foo &ib, int, foo &ic) { ia = ib = ic; }
+     void foo (int, foo &ia, int, foo &ib, int, foo &ic) { ia = ib = ic; }
+
+   g++ produces the names:
+
+     __3fooiRT0iT2iT2
+     foo__FiR3fooiT1iT1
+
+   while lcc (and presumably other ARM style compilers as well) produces:
+
+     foo__FiR3fooT1T2T1T2
+     __ct__3fooFiR3fooT1T2T1T2
+
+   Note that g++ bases its type numbers starting at zero and counts all
+   previously seen types, while lucid/ARM bases its type numbers starting
+   at one and only considers types after it has seen the 'F' character
+   indicating the start of the function args.  For lucid/ARM style, we
+   account for this difference by discarding any previously seen types when
+   we see the 'F' character, and subtracting one from the type number
+   reference.
+
+ */
+
+static int
+demangle_args (struct work_stuff *work, const char **mangled,
+               string *declp)
+{
+  string arg;
+  int need_comma = 0;
+  int r;
+  int t;
+  const char *tem;
+  char temptype;
+
+  if (PRINT_ARG_TYPES)
+    {
+      string_append (declp, "(");
+      if (**mangled == '\0')
+	{
+	  string_append (declp, "void");
+	}
+    }
+
+  while ((**mangled != '_' && **mangled != '\0' && **mangled != 'e')
+	 || work->nrepeats > 0)
+    {
+      if ((**mangled == 'N') || (**mangled == 'T'))
+	{
+	  temptype = *(*mangled)++;
+
+	  if (temptype == 'N')
+	    {
+	      if (!get_count (mangled, &r))
+		{
+		  return (0);
+		}
+	    }
+	  else
+	    {
+	      r = 1;
+	    }
+          if ((HP_DEMANGLING || ARM_DEMANGLING || EDG_DEMANGLING) && work -> ntypes >= 10)
+            {
+              /* If we have 10 or more types we might have more than a 1 digit
+                 index so we'll have to consume the whole count here. This
+                 will lose if the next thing is a type name preceded by a
+                 count but it's impossible to demangle that case properly
+                 anyway. Eg if we already have 12 types is T12Pc "(..., type1,
+                 Pc, ...)"  or "(..., type12, char *, ...)" */
+              if ((t = consume_count(mangled)) <= 0)
+                {
+                  return (0);
+                }
+            }
+          else
+	    {
+	      if (!get_count (mangled, &t))
+	    	{
+	          return (0);
+	    	}
+	    }
+	  if (LUCID_DEMANGLING || ARM_DEMANGLING || HP_DEMANGLING || EDG_DEMANGLING)
+	    {
+	      t--;
+	    }
+	  /* Validate the type index.  Protect against illegal indices from
+	     malformed type strings.  */
+	  if ((t < 0) || (t >= work -> ntypes))
+	    {
+	      return (0);
+	    }
+	  while (work->nrepeats > 0 || --r >= 0)
+	    {
+	      tem = work -> typevec[t];
+	      if (need_comma && PRINT_ARG_TYPES)
+		{
+		  string_append (declp, ", ");
+		}
+	      if (!do_arg (work, &tem, &arg))
+		{
+		  return (0);
+		}
+	      if (PRINT_ARG_TYPES)
+		{
+		  string_appends (declp, &arg);
+		}
+	      string_delete (&arg);
+	      need_comma = 1;
+	    }
+	}
+      else
+	{
+	  if (need_comma && PRINT_ARG_TYPES)
+	    string_append (declp, ", ");
+	  if (!do_arg (work, mangled, &arg))
+	    return (0);
+	  if (PRINT_ARG_TYPES)
+	    string_appends (declp, &arg);
+	  string_delete (&arg);
+	  need_comma = 1;
+	}
+    }
+
+  if (**mangled == 'e')
+    {
+      (*mangled)++;
+      if (PRINT_ARG_TYPES)
+	{
+	  if (need_comma)
+	    {
+	      string_append (declp, ",");
+	    }
+	  string_append (declp, "...");
+	}
+    }
+
+  if (PRINT_ARG_TYPES)
+    {
+      string_append (declp, ")");
+    }
+  return (1);
+}
+
+/* Like demangle_args, but for demangling the argument lists of function
+   and method pointers or references, not top-level declarations.  */
+
+static int
+demangle_nested_args (struct work_stuff *work, const char **mangled,
+                      string *declp)
+{
+  string* saved_previous_argument;
+  int result;
+  int saved_nrepeats;
+
+  /* The G++ name-mangling algorithm does not remember types on nested
+     argument lists, unless -fsquangling is used, and in that case the
+     type vector updated by remember_type is not used.  So, we turn
+     off remembering of types here.  */
+  ++work->forgetting_types;
+
+  /* For the repeat codes used with -fsquangling, we must keep track of
+     the last argument.  */
+  saved_previous_argument = work->previous_argument;
+  saved_nrepeats = work->nrepeats;
+  work->previous_argument = 0;
+  work->nrepeats = 0;
+
+  /* Actually demangle the arguments.  */
+  result = demangle_args (work, mangled, declp);
+
+  /* Restore the previous_argument field.  */
+  if (work->previous_argument)
+    {
+      string_delete (work->previous_argument);
+      free ((char *) work->previous_argument);
+    }
+  work->previous_argument = saved_previous_argument;
+  --work->forgetting_types;
+  work->nrepeats = saved_nrepeats;
+
+  return result;
+}
+
+/* Returns 1 if a valid function name was found or 0 otherwise.  */
+
+static int 
+demangle_function_name (struct work_stuff *work, const char **mangled,
+                        string *declp, const char *scan)
+{
+  size_t i;
+  string type;
+  const char *tem;
+
+  string_appendn (declp, (*mangled), scan - (*mangled));
+  string_need (declp, 1);
+  *(declp -> p) = '\0';
+
+  /* Consume the function name, including the "__" separating the name
+     from the signature.  We are guaranteed that SCAN points to the
+     separator.  */
+
+  (*mangled) = scan + 2;
+  /* We may be looking at an instantiation of a template function:
+     foo__Xt1t2_Ft3t4, where t1, t2, ... are template arguments and a
+     following _F marks the start of the function arguments.  Handle
+     the template arguments first. */
+
+  if (HP_DEMANGLING && (**mangled == 'X'))
+    {
+      demangle_arm_hp_template (work, mangled, 0, declp);
+      /* This leaves MANGLED pointing to the 'F' marking func args */
+    }
+
+  if (LUCID_DEMANGLING || ARM_DEMANGLING || HP_DEMANGLING || EDG_DEMANGLING)
+    {
+
+      /* See if we have an ARM style constructor or destructor operator.
+	 If so, then just record it, clear the decl, and return.
+	 We can't build the actual constructor/destructor decl until later,
+	 when we recover the class name from the signature.  */
+
+      if (strcmp (declp -> b, "__ct") == 0)
+	{
+	  work -> constructor += 1;
+	  string_clear (declp);
+	  return 1;
+	}
+      else if (strcmp (declp -> b, "__dt") == 0)
+	{
+	  work -> destructor += 1;
+	  string_clear (declp);
+	  return 1;
+	}
+    }
+
+  if (declp->p - declp->b >= 3
+      && declp->b[0] == 'o'
+      && declp->b[1] == 'p'
+      && strchr (cplus_markers, declp->b[2]) != NULL)
+    {
+      /* see if it's an assignment expression */
+      if (declp->p - declp->b >= 10 /* op$assign_ */
+	  && memcmp (declp->b + 3, "assign_", 7) == 0)
+	{
+	  for (i = 0; i < ARRAY_SIZE (optable); i++)
+	    {
+	      int len = declp->p - declp->b - 10;
+	      if ((int) strlen (optable[i].in) == len
+		  && memcmp (optable[i].in, declp->b + 10, len) == 0)
+		{
+		  string_clear (declp);
+		  string_append (declp, "operator");
+		  string_append (declp, optable[i].out);
+		  string_append (declp, "=");
+		  break;
+		}
+	    }
+	}
+      else
+	{
+	  for (i = 0; i < ARRAY_SIZE (optable); i++)
+	    {
+	      int len = declp->p - declp->b - 3;
+	      if ((int) strlen (optable[i].in) == len
+		  && memcmp (optable[i].in, declp->b + 3, len) == 0)
+		{
+		  string_clear (declp);
+		  string_append (declp, "operator");
+		  string_append (declp, optable[i].out);
+		  break;
+		}
+	    }
+	}
+    }
+  else if (declp->p - declp->b >= 5 && memcmp (declp->b, "type", 4) == 0
+	   && strchr (cplus_markers, declp->b[4]) != NULL)
+    {
+      /* type conversion operator */
+      tem = declp->b + 5;
+      if (do_type (work, &tem, &type))
+	{
+	  string_clear (declp);
+	  string_append (declp, "operator ");
+	  string_appends (declp, &type);
+	  string_delete (&type);
+	}
+    }
+  else if (declp->b[0] == '_' && declp->b[1] == '_'
+	   && declp->b[2] == 'o' && declp->b[3] == 'p')
+    {
+      /* ANSI.  */
+      /* type conversion operator.  */
+      tem = declp->b + 4;
+      if (do_type (work, &tem, &type))
+	{
+	  string_clear (declp);
+	  string_append (declp, "operator ");
+	  string_appends (declp, &type);
+	  string_delete (&type);
+	}
+    }
+  else if (declp->b[0] == '_' && declp->b[1] == '_'
+	   && ISLOWER((unsigned char)declp->b[2])
+	   && ISLOWER((unsigned char)declp->b[3]))
+    {
+      if (declp->b[4] == '\0')
+	{
+	  /* Operator.  */
+	  for (i = 0; i < ARRAY_SIZE (optable); i++)
+	    {
+	      if (strlen (optable[i].in) == 2
+		  && memcmp (optable[i].in, declp->b + 2, 2) == 0)
+		{
+		  string_clear (declp);
+		  string_append (declp, "operator");
+		  string_append (declp, optable[i].out);
+		  break;
+		}
+	    }
+	}
+      else
+	{
+	  if (declp->b[2] == 'a' && declp->b[5] == '\0')
+	    {
+	      /* Assignment.  */
+	      for (i = 0; i < ARRAY_SIZE (optable); i++)
+		{
+		  if (strlen (optable[i].in) == 3
+		      && memcmp (optable[i].in, declp->b + 2, 3) == 0)
+		    {
+		      string_clear (declp);
+		      string_append (declp, "operator");
+		      string_append (declp, optable[i].out);
+		      break;
+		    }
+		}
+	    }
+	}
+    }
+
+  /* If a function name was obtained but it's not valid, we were not
+     successful.  */
+  if (LEN_STRING (declp) == 1 && declp->b[0] == '.')
+    return 0;
+  else
+    return 1;
+}
+
+/* a mini string-handling package */
+
+static void
+string_need (string *s, int n)
+{
+  int tem;
+
+  if (s->b == NULL)
+    {
+      if (n < 32)
+	{
+	  n = 32;
+	}
+      s->p = s->b = XNEWVEC (char, n);
+      s->e = s->b + n;
+    }
+  else if (s->e - s->p < n)
+    {
+      tem = s->p - s->b;
+      n += tem;
+      n *= 2;
+      s->b = XRESIZEVEC (char, s->b, n);
+      s->p = s->b + tem;
+      s->e = s->b + n;
+    }
+}
+
+static void
+string_delete (string *s)
+{
+  if (s->b != NULL)
+    {
+      free (s->b);
+      s->b = s->e = s->p = NULL;
+    }
+}
+
+static void
+string_init (string *s)
+{
+  s->b = s->p = s->e = NULL;
+}
+
+static void
+string_clear (string *s)
+{
+  s->p = s->b;
+}
+
+#if 0
+
+static int
+string_empty (string *s)
+{
+  return (s->b == s->p);
+}
+
+#endif
+
+static void
+string_append (string *p, const char *s)
+{
+  int n;
+  if (s == NULL || *s == '\0')
+    return;
+  n = strlen (s);
+  string_need (p, n);
+  memcpy (p->p, s, n);
+  p->p += n;
+}
+
+static void
+string_appends (string *p, string *s)
+{
+  int n;
+
+  if (s->b != s->p)
+    {
+      n = s->p - s->b;
+      string_need (p, n);
+      memcpy (p->p, s->b, n);
+      p->p += n;
+    }
+}
+
+static void
+string_appendn (string *p, const char *s, int n)
+{
+  if (n != 0)
+    {
+      string_need (p, n);
+      memcpy (p->p, s, n);
+      p->p += n;
+    }
+}
+
+static void
+string_prepend (string *p, const char *s)
+{
+  if (s != NULL && *s != '\0')
+    {
+      string_prependn (p, s, strlen (s));
+    }
+}
+
+static void
+string_prepends (string *p, string *s)
+{
+  if (s->b != s->p)
+    {
+      string_prependn (p, s->b, s->p - s->b);
+    }
+}
+
+static void
+string_prependn (string *p, const char *s, int n)
+{
+  char *q;
+
+  if (n != 0)
+    {
+      string_need (p, n);
+      for (q = p->p - 1; q >= p->b; q--)
+	{
+	  q[n] = q[0];
+	}
+      memcpy (p->b, s, n);
+      p->p += n;
+    }
+}
+
+static void
+string_append_template_idx (string *s, int idx)
+{
+  char buf[INTBUF_SIZE + 1 /* 'T' */];
+  sprintf(buf, "T%d", idx);
+  string_append (s, buf);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/crc32.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/crc32.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/crc32.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/crc32.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,181 @@
+/* crc32.c
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+
+   This file is part of the libiberty library.
+
+   This file is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   In addition to the permissions in the GNU General Public License, the
+   Free Software Foundation gives you unlimited permission to link the
+   compiled version of this file into combinations with other programs,
+   and to distribute those combinations without any restriction coming
+   from the use of this file.  (The General Public License restrictions
+   do apply in other respects; for example, they cover modification of
+   the file, and distribution when not linked into a combined
+   executable.)
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "libiberty.h"
+
+/* This table was generated by the following program.  This matches
+   what gdb does.
+
+   #include <stdio.h>
+
+   int
+   main ()
+   {
+     int i, j;
+     unsigned int c;
+     int table[256];
+
+     for (i = 0; i < 256; i++)
+       {
+	 for (c = i << 24, j = 8; j > 0; --j)
+	   c = c & 0x80000000 ? (c << 1) ^ 0x04c11db7 : (c << 1);
+	 table[i] = c;
+       }
+
+     printf ("static const unsigned int crc32_table[] =\n{\n");
+     for (i = 0; i < 256; i += 4)
+       {
+	 printf ("  0x%08x, 0x%08x, 0x%08x, 0x%08x",
+		 table[i + 0], table[i + 1], table[i + 2], table[i + 3]);
+	 if (i + 4 < 256)
+	   putchar (',');
+	 putchar ('\n');
+       }
+     printf ("};\n");
+     return 0;
+   }
+
+   For more information on CRC, see, e.g.,
+   http://www.ross.net/crc/download/crc_v3.txt.  */
+
+static const unsigned int crc32_table[] =
+{
+  0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9,
+  0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005,
+  0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
+  0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd,
+  0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9,
+  0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
+  0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011,
+  0x791d4014, 0x7ddc5da3, 0x709f7b7a, 0x745e66cd,
+  0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
+  0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5,
+  0xbe2b5b58, 0xbaea46ef, 0xb7a96036, 0xb3687d81,
+  0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
+  0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49,
+  0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95,
+  0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1,
+  0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d,
+  0x34867077, 0x30476dc0, 0x3d044b19, 0x39c556ae,
+  0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
+  0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16,
+  0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca,
+  0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde,
+  0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02,
+  0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1, 0x53dc6066,
+  0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
+  0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e,
+  0xbfa1b04b, 0xbb60adfc, 0xb6238b25, 0xb2e29692,
+  0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6,
+  0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a,
+  0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e,
+  0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
+  0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686,
+  0xd5b88683, 0xd1799b34, 0xdc3abded, 0xd8fba05a,
+  0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637,
+  0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb,
+  0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f,
+  0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
+  0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47,
+  0x36194d42, 0x32d850f5, 0x3f9b762c, 0x3b5a6b9b,
+  0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
+  0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623,
+  0xf12f560e, 0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7,
+  0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
+  0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f,
+  0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3,
+  0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
+  0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b,
+  0x9b3660c6, 0x9ff77d71, 0x92b45ba8, 0x9675461f,
+  0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
+  0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640,
+  0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c,
+  0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
+  0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24,
+  0x119b4be9, 0x155a565e, 0x18197087, 0x1cd86d30,
+  0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
+  0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088,
+  0x2497d08d, 0x2056cd3a, 0x2d15ebe3, 0x29d4f654,
+  0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
+  0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c,
+  0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18,
+  0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
+  0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0,
+  0x9abc8bd5, 0x9e7d9662, 0x933eb0bb, 0x97ffad0c,
+  0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
+  0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
+};
+
+/*
+
+@deftypefn Extension {unsigned int} crc32 (const unsigned char *@var{buf}, @
+  int @var{len}, unsigned int @var{init})
+
+Compute the 32-bit CRC of @var{buf} which has length @var{len}.  The
+starting value is @var{init}; this may be used to compute the CRC of
+data split across multiple buffers by passing the return value of each
+call as the @var{init} parameter of the next.
+
+This is intended to match the CRC used by the @command{gdb} remote
+protocol for the @samp{qCRC} command.  In order to get the same
+results as gdb for a block of data, you must pass the first CRC
+parameter as @code{0xffffffff}.
+
+This CRC can be specified as:
+
+  Width  : 32
+  Poly   : 0x04c11db7
+  Init   : parameter, typically 0xffffffff
+  RefIn  : false
+  RefOut : false
+  XorOut : 0
+
+This differs from the "standard" CRC-32 algorithm in that the values
+are not reflected, and there is no final XOR value.  These differences
+make it easy to compose the values of multiple blocks.
+
+@end deftypefn
+
+*/
+
+unsigned int
+xcrc32 (const unsigned char *buf, int len, unsigned int init)
+{
+  unsigned int crc = init;
+  while (len--)
+    {
+      crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ *buf) & 255];
+      buf++;
+    }
+  return crc;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/dyn-string.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/dyn-string.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/dyn-string.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/dyn-string.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,397 @@
+/* An abstract string datatype.
+   Copyright (C) 1998, 1999, 2000, 2002, 2004 Free Software Foundation, Inc.
+   Contributed by Mark Mitchell (mark@markmitchell.com).
+
+This file is part of GNU CC.
+   
+GNU CC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+In addition to the permissions in the GNU General Public License, the
+Free Software Foundation gives you unlimited permission to link the
+compiled version of this file into combinations with other programs,
+and to distribute those combinations without any restriction coming
+from the use of this file.  (The General Public License restrictions
+do apply in other respects; for example, they cover modification of
+the file, and distribution when not linked into a combined
+executable.)
+
+GNU CC 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 GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#include "libiberty.h"
+#include "dyn-string.h"
+
+/* Performs in-place initialization of a dyn_string struct.  This
+   function can be used with a dyn_string struct on the stack or
+   embedded in another object.  The contents of of the string itself
+   are still dynamically allocated.  The string initially is capable
+   of holding at least SPACE characeters, including the terminating
+   NUL.  If SPACE is 0, it will silently be increated to 1.  
+
+   If RETURN_ON_ALLOCATION_FAILURE is defined and memory allocation
+   fails, returns 0.  Otherwise returns 1.  */
+
+int
+dyn_string_init (struct dyn_string *ds_struct_ptr, int space)
+{
+  /* We need at least one byte in which to store the terminating NUL.  */
+  if (space == 0)
+    space = 1;
+
+#ifdef RETURN_ON_ALLOCATION_FAILURE
+  ds_struct_ptr->s = (char *) malloc (space);
+  if (ds_struct_ptr->s == NULL)
+    return 0;
+#else
+  ds_struct_ptr->s = XNEWVEC (char, space);
+#endif
+  ds_struct_ptr->allocated = space;
+  ds_struct_ptr->length = 0;
+  ds_struct_ptr->s[0] = '\0';
+
+  return 1;
+}
+
+/* Create a new dynamic string capable of holding at least SPACE
+   characters, including the terminating NUL.  If SPACE is 0, it will
+   be silently increased to 1.  If RETURN_ON_ALLOCATION_FAILURE is
+   defined and memory allocation fails, returns NULL.  Otherwise
+   returns the newly allocated string.  */
+
+dyn_string_t 
+dyn_string_new (int space)
+{
+  dyn_string_t result;
+#ifdef RETURN_ON_ALLOCATION_FAILURE
+  result = (dyn_string_t) malloc (sizeof (struct dyn_string));
+  if (result == NULL)
+    return NULL;
+  if (!dyn_string_init (result, space))
+    {
+      free (result);
+      return NULL;
+    }
+#else
+  result = XNEW (struct dyn_string);
+  dyn_string_init (result, space);
+#endif
+  return result;
+}
+
+/* Free the memory used by DS.  */
+
+void 
+dyn_string_delete (dyn_string_t ds)
+{
+  free (ds->s);
+  free (ds);
+}
+
+/* Returns the contents of DS in a buffer allocated with malloc.  It
+   is the caller's responsibility to deallocate the buffer using free.
+   DS is then set to the empty string.  Deletes DS itself.  */
+
+char*
+dyn_string_release (dyn_string_t ds)
+{
+  /* Store the old buffer.  */
+  char* result = ds->s;
+  /* The buffer is no longer owned by DS.  */
+  ds->s = NULL;
+  /* Delete DS.  */
+  free (ds);
+  /* Return the old buffer.  */
+  return result;
+}
+
+/* Increase the capacity of DS so it can hold at least SPACE
+   characters, plus the terminating NUL.  This function will not (at
+   present) reduce the capacity of DS.  Returns DS on success. 
+
+   If RETURN_ON_ALLOCATION_FAILURE is defined and a memory allocation
+   operation fails, deletes DS and returns NULL.  */
+
+dyn_string_t 
+dyn_string_resize (dyn_string_t ds, int space)
+{
+  int new_allocated = ds->allocated;
+
+  /* Increase SPACE to hold the NUL termination.  */
+  ++space;
+
+  /* Increase allocation by factors of two.  */
+  while (space > new_allocated)
+    new_allocated *= 2;
+    
+  if (new_allocated != ds->allocated)
+    {
+      ds->allocated = new_allocated;
+      /* We actually need more space.  */
+#ifdef RETURN_ON_ALLOCATION_FAILURE
+      ds->s = (char *) realloc (ds->s, ds->allocated);
+      if (ds->s == NULL)
+	{
+	  free (ds);
+	  return NULL;
+	}
+#else
+      ds->s = XRESIZEVEC (char, ds->s, ds->allocated);
+#endif
+    }
+
+  return ds;
+}
+
+/* Sets the contents of DS to the empty string.  */
+
+void
+dyn_string_clear (dyn_string_t ds)
+{
+  /* A dyn_string always has room for at least the NUL terminator.  */
+  ds->s[0] = '\0';
+  ds->length = 0;
+}
+
+/* Makes the contents of DEST the same as the contents of SRC.  DEST
+   and SRC must be distinct.  Returns 1 on success.  On failure, if
+   RETURN_ON_ALLOCATION_FAILURE, deletes DEST and returns 0.  */
+
+int
+dyn_string_copy (dyn_string_t dest, dyn_string_t src)
+{
+  if (dest == src)
+    abort ();
+
+  /* Make room in DEST.  */
+  if (dyn_string_resize (dest, src->length) == NULL)
+    return 0;
+  /* Copy DEST into SRC.  */
+  strcpy (dest->s, src->s);
+  /* Update the size of DEST.  */
+  dest->length = src->length;
+  return 1;
+}
+
+/* Copies SRC, a NUL-terminated string, into DEST.  Returns 1 on
+   success.  On failure, if RETURN_ON_ALLOCATION_FAILURE, deletes DEST
+   and returns 0.  */
+
+int
+dyn_string_copy_cstr (dyn_string_t dest, const char *src)
+{
+  int length = strlen (src);
+  /* Make room in DEST.  */
+  if (dyn_string_resize (dest, length) == NULL)
+    return 0;
+  /* Copy DEST into SRC.  */
+  strcpy (dest->s, src);
+  /* Update the size of DEST.  */
+  dest->length = length;
+  return 1;
+}
+
+/* Inserts SRC at the beginning of DEST.  DEST is expanded as
+   necessary.  SRC and DEST must be distinct.  Returns 1 on success.
+   On failure, if RETURN_ON_ALLOCATION_FAILURE, deletes DEST and
+   returns 0.  */
+
+int
+dyn_string_prepend (dyn_string_t dest, dyn_string_t src)
+{
+  return dyn_string_insert (dest, 0, src);
+}
+
+/* Inserts SRC, a NUL-terminated string, at the beginning of DEST.
+   DEST is expanded as necessary.  Returns 1 on success.  On failure,
+   if RETURN_ON_ALLOCATION_FAILURE, deletes DEST and returns 0. */
+
+int
+dyn_string_prepend_cstr (dyn_string_t dest, const char *src)
+{
+  return dyn_string_insert_cstr (dest, 0, src);
+}
+
+/* Inserts SRC into DEST starting at position POS.  DEST is expanded
+   as necessary.  SRC and DEST must be distinct.  Returns 1 on
+   success.  On failure, if RETURN_ON_ALLOCATION_FAILURE, deletes DEST
+   and returns 0.  */
+
+int
+dyn_string_insert (dyn_string_t dest, int pos, dyn_string_t src)
+{
+  int i;
+
+  if (src == dest)
+    abort ();
+
+  if (dyn_string_resize (dest, dest->length + src->length) == NULL)
+    return 0;
+  /* Make room for the insertion.  Be sure to copy the NUL.  */
+  for (i = dest->length; i >= pos; --i)
+    dest->s[i + src->length] = dest->s[i];
+  /* Splice in the new stuff.  */
+  strncpy (dest->s + pos, src->s, src->length);
+  /* Compute the new length.  */
+  dest->length += src->length;
+  return 1;
+}
+
+/* Inserts SRC, a NUL-terminated string, into DEST starting at
+   position POS.  DEST is expanded as necessary.  Returns 1 on
+   success.  On failure, RETURN_ON_ALLOCATION_FAILURE, deletes DEST
+   and returns 0.  */
+
+int
+dyn_string_insert_cstr (dyn_string_t dest, int pos, const char *src)
+{
+  int i;
+  int length = strlen (src);
+
+  if (dyn_string_resize (dest, dest->length + length) == NULL)
+    return 0;
+  /* Make room for the insertion.  Be sure to copy the NUL.  */
+  for (i = dest->length; i >= pos; --i)
+    dest->s[i + length] = dest->s[i];
+  /* Splice in the new stuff.  */
+  strncpy (dest->s + pos, src, length);
+  /* Compute the new length.  */
+  dest->length += length;
+  return 1;
+}
+
+/* Inserts character C into DEST starting at position POS.  DEST is
+   expanded as necessary.  Returns 1 on success.  On failure,
+   RETURN_ON_ALLOCATION_FAILURE, deletes DEST and returns 0.  */
+
+int
+dyn_string_insert_char (dyn_string_t dest, int pos, int c)
+{
+  int i;
+
+  if (dyn_string_resize (dest, dest->length + 1) == NULL)
+    return 0;
+  /* Make room for the insertion.  Be sure to copy the NUL.  */
+  for (i = dest->length; i >= pos; --i)
+    dest->s[i + 1] = dest->s[i];
+  /* Add the new character.  */
+  dest->s[pos] = c;
+  /* Compute the new length.  */
+  ++dest->length;
+  return 1;
+}
+     
+/* Append S to DS, resizing DS if necessary.  Returns 1 on success.
+   On failure, if RETURN_ON_ALLOCATION_FAILURE, deletes DEST and
+   returns 0.  */
+
+int
+dyn_string_append (dyn_string_t dest, dyn_string_t s)
+{
+  if (dyn_string_resize (dest, dest->length + s->length) == 0)
+    return 0;
+  strcpy (dest->s + dest->length, s->s);
+  dest->length += s->length;
+  return 1;
+}
+
+/* Append the NUL-terminated string S to DS, resizing DS if necessary.
+   Returns 1 on success.  On failure, if RETURN_ON_ALLOCATION_FAILURE,
+   deletes DEST and returns 0.  */
+
+int
+dyn_string_append_cstr (dyn_string_t dest, const char *s)
+{
+  int len = strlen (s);
+
+  /* The new length is the old length plus the size of our string, plus
+     one for the null at the end.  */
+  if (dyn_string_resize (dest, dest->length + len) == NULL)
+    return 0;
+  strcpy (dest->s + dest->length, s);
+  dest->length += len;
+  return 1;
+}
+
+/* Appends C to the end of DEST.  Returns 1 on success.  On failure,
+   if RETURN_ON_ALLOCATION_FAILURE, deletes DEST and returns 0.  */
+
+int
+dyn_string_append_char (dyn_string_t dest, int c)
+{
+  /* Make room for the extra character.  */
+  if (dyn_string_resize (dest, dest->length + 1) == NULL)
+    return 0;
+  /* Append the character; it will overwrite the old NUL.  */
+  dest->s[dest->length] = c;
+  /* Add a new NUL at the end.  */
+  dest->s[dest->length + 1] = '\0';
+  /* Update the length.  */
+  ++(dest->length);
+  return 1;
+}
+
+/* Sets the contents of DEST to the substring of SRC starting at START
+   and ending before END.  START must be less than or equal to END,
+   and both must be between zero and the length of SRC, inclusive.
+   Returns 1 on success.  On failure, if RETURN_ON_ALLOCATION_FAILURE,
+   deletes DEST and returns 0.  */
+
+int
+dyn_string_substring (dyn_string_t dest, dyn_string_t src,
+                      int start, int end)
+{
+  int i;
+  int length = end - start;
+
+  if (start > end || start > src->length || end > src->length)
+    abort ();
+
+  /* Make room for the substring.  */
+  if (dyn_string_resize (dest, length) == NULL)
+    return 0;
+  /* Copy the characters in the substring,  */
+  for (i = length; --i >= 0; )
+    dest->s[i] = src->s[start + i];
+  /* NUL-terimate the result.  */
+  dest->s[length] = '\0';
+  /* Record the length of the substring.  */
+  dest->length = length;
+
+  return 1;
+}
+
+/* Returns non-zero if DS1 and DS2 have the same contents.  */
+
+int
+dyn_string_eq (dyn_string_t ds1, dyn_string_t ds2)
+{
+  /* If DS1 and DS2 have different lengths, they must not be the same.  */
+  if (ds1->length != ds2->length)
+    return 0;
+  else
+    return !strcmp (ds1->s, ds2->s);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/fdmatch.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/fdmatch.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/fdmatch.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/fdmatch.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,68 @@
+/* Compare two open file descriptors to see if they refer to the same file.
+   Copyright (C) 1991 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+
+/*
+
+@deftypefn Extension int fdmatch (int @var{fd1}, int @var{fd2})
+
+Check to see if two open file descriptors refer to the same file.
+This is useful, for example, when we have an open file descriptor for
+an unnamed file, and the name of a file that we believe to correspond
+to that fd.  This can happen when we are exec'd with an already open
+file (@code{stdout} for example) or from the SVR4 @file{/proc} calls
+that return open file descriptors for mapped address spaces.  All we
+have to do is open the file by name and check the two file descriptors
+for a match, which is done by comparing major and minor device numbers
+and inode numbers.
+
+@end deftypefn
+
+BUGS
+
+	(FIXME: does this work for networks?)
+	It works for NFS, which assigns a device number to each mount.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "ansidecl.h"
+#include "libiberty.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+
+int fdmatch (int fd1, int fd2)
+{
+  struct stat sbuf1;
+  struct stat sbuf2;
+
+  if ((fstat (fd1, &sbuf1) == 0) &&
+      (fstat (fd2, &sbuf2) == 0) &&
+      (sbuf1.st_dev == sbuf2.st_dev) &&
+      (sbuf1.st_ino == sbuf2.st_ino))
+    {
+      return (1);
+    }
+  else
+    {
+      return (0);
+    }
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/ffs.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/ffs.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/ffs.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/ffs.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,26 @@
+/* ffs -- Find the first bit set in the parameter
+
+@deftypefn Supplemental int ffs (int @var{valu})
+
+Find the first (least significant) bit set in @var{valu}.  Bits are
+numbered from right to left, starting with bit 1 (corresponding to the
+value 1).  If @var{valu} is zero, zero is returned.
+
+@end deftypefn
+
+*/
+
+int
+ffs (register int valu)
+{
+  register int bit;
+
+  if (valu == 0)
+    return 0;
+
+  for (bit = 1; !(valu & 1); bit++)
+  	valu >>= 1;
+
+  return bit;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/fibheap.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/fibheap.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/fibheap.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/fibheap.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,486 @@
+/* A Fibonacci heap datatype.
+   Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Contributed by Daniel Berlin (dan@cgsoftware.com).
+   
+This file is part of GNU CC.
+   
+GNU CC is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU CC 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 GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include "libiberty.h"
+#include "fibheap.h"
+
+
+#define FIBHEAPKEY_MIN	LONG_MIN
+
+static void fibheap_ins_root (fibheap_t, fibnode_t);
+static void fibheap_rem_root (fibheap_t, fibnode_t);
+static void fibheap_consolidate (fibheap_t);
+static void fibheap_link (fibheap_t, fibnode_t, fibnode_t);
+static void fibheap_cut (fibheap_t, fibnode_t, fibnode_t);
+static void fibheap_cascading_cut (fibheap_t, fibnode_t);
+static fibnode_t fibheap_extr_min_node (fibheap_t);
+static int fibheap_compare (fibheap_t, fibnode_t, fibnode_t);
+static int fibheap_comp_data (fibheap_t, fibheapkey_t, void *, fibnode_t);
+static fibnode_t fibnode_new (void);
+static void fibnode_insert_after (fibnode_t, fibnode_t);
+#define fibnode_insert_before(a, b) fibnode_insert_after (a->left, b)
+static fibnode_t fibnode_remove (fibnode_t);
+
+
+/* Create a new fibonacci heap.  */
+fibheap_t
+fibheap_new (void)
+{
+  return (fibheap_t) xcalloc (1, sizeof (struct fibheap));
+}
+
+/* Create a new fibonacci heap node.  */
+static fibnode_t
+fibnode_new (void)
+{
+  fibnode_t node;
+
+  node = (fibnode_t) xcalloc (1, sizeof *node);
+  node->left = node;
+  node->right = node;
+
+  return node;
+}
+
+static inline int
+fibheap_compare (fibheap_t heap ATTRIBUTE_UNUSED, fibnode_t a, fibnode_t b)
+{
+  if (a->key < b->key)
+    return -1;
+  if (a->key > b->key)
+    return 1;
+  return 0;
+}
+
+static inline int
+fibheap_comp_data (fibheap_t heap, fibheapkey_t key, void *data, fibnode_t b)
+{
+  struct fibnode a;
+
+  a.key = key;
+  a.data = data;
+
+  return fibheap_compare (heap, &a, b);
+}
+
+/* Insert DATA, with priority KEY, into HEAP.  */
+fibnode_t
+fibheap_insert (fibheap_t heap, fibheapkey_t key, void *data)
+{
+  fibnode_t node;
+
+  /* Create the new node.  */
+  node = fibnode_new ();
+
+  /* Set the node's data.  */
+  node->data = data;
+  node->key = key;
+
+  /* Insert it into the root list.  */
+  fibheap_ins_root (heap, node);
+
+  /* If their was no minimum, or this key is less than the min,
+     it's the new min.  */
+  if (heap->min == NULL || node->key < heap->min->key)
+    heap->min = node;
+
+  heap->nodes++;
+
+  return node;
+}
+
+/* Return the data of the minimum node (if we know it).  */
+void *
+fibheap_min (fibheap_t heap)
+{
+  /* If there is no min, we can't easily return it.  */
+  if (heap->min == NULL)
+    return NULL;
+  return heap->min->data;
+}
+
+/* Return the key of the minimum node (if we know it).  */
+fibheapkey_t
+fibheap_min_key (fibheap_t heap)
+{
+  /* If there is no min, we can't easily return it.  */
+  if (heap->min == NULL)
+    return 0;
+  return heap->min->key;
+}
+
+/* Union HEAPA and HEAPB into a new heap.  */
+fibheap_t
+fibheap_union (fibheap_t heapa, fibheap_t heapb)
+{
+  fibnode_t a_root, b_root, temp;
+
+  /* If one of the heaps is empty, the union is just the other heap.  */
+  if ((a_root = heapa->root) == NULL)
+    {
+      free (heapa);
+      return heapb;
+    }
+  if ((b_root = heapb->root) == NULL)
+    {
+      free (heapb);
+      return heapa;
+    }
+
+  /* Merge them to the next nodes on the opposite chain.  */
+  a_root->left->right = b_root;
+  b_root->left->right = a_root;
+  temp = a_root->left;
+  a_root->left = b_root->left;
+  b_root->left = temp;
+  heapa->nodes += heapb->nodes;
+
+  /* And set the new minimum, if it's changed.  */
+  if (fibheap_compare (heapa, heapb->min, heapa->min) < 0)
+    heapa->min = heapb->min;
+
+  free (heapb);
+  return heapa;
+}
+
+/* Extract the data of the minimum node from HEAP.  */
+void *
+fibheap_extract_min (fibheap_t heap)
+{
+  fibnode_t z;
+  void *ret = NULL;
+
+  /* If we don't have a min set, it means we have no nodes.  */
+  if (heap->min != NULL)
+    {
+      /* Otherwise, extract the min node, free the node, and return the
+         node's data.  */
+      z = fibheap_extr_min_node (heap);
+      ret = z->data;
+      free (z);
+    }
+
+  return ret;
+}
+
+/* Replace both the KEY and the DATA associated with NODE.  */
+void *
+fibheap_replace_key_data (fibheap_t heap, fibnode_t node,
+                          fibheapkey_t key, void *data)
+{
+  void *odata;
+  fibheapkey_t okey;
+  fibnode_t y;
+
+  /* If we wanted to, we could actually do a real increase by redeleting and
+     inserting. However, this would require O (log n) time. So just bail out
+     for now.  */
+  if (fibheap_comp_data (heap, key, data, node) > 0)
+    return NULL;
+
+  odata = node->data;
+  okey = node->key;
+  node->data = data;
+  node->key = key;
+  y = node->parent;
+
+  /* Short-circuit if the key is the same, as we then don't have to
+     do anything.  Except if we're trying to force the new node to
+     be the new minimum for delete.  */
+  if (okey == key && okey != FIBHEAPKEY_MIN)
+    return odata;
+
+  /* These two compares are specifically <= 0 to make sure that in the case
+     of equality, a node we replaced the data on, becomes the new min.  This
+     is needed so that delete's call to extractmin gets the right node.  */
+  if (y != NULL && fibheap_compare (heap, node, y) <= 0)
+    {
+      fibheap_cut (heap, node, y);
+      fibheap_cascading_cut (heap, y);
+    }
+
+  if (fibheap_compare (heap, node, heap->min) <= 0)
+    heap->min = node;
+
+  return odata;
+}
+
+/* Replace the DATA associated with NODE.  */
+void *
+fibheap_replace_data (fibheap_t heap, fibnode_t node, void *data)
+{
+  return fibheap_replace_key_data (heap, node, node->key, data);
+}
+
+/* Replace the KEY associated with NODE.  */
+fibheapkey_t
+fibheap_replace_key (fibheap_t heap, fibnode_t node, fibheapkey_t key)
+{
+  int okey = node->key;
+  fibheap_replace_key_data (heap, node, key, node->data);
+  return okey;
+}
+
+/* Delete NODE from HEAP.  */
+void *
+fibheap_delete_node (fibheap_t heap, fibnode_t node)
+{
+  void *ret = node->data;
+
+  /* To perform delete, we just make it the min key, and extract.  */
+  fibheap_replace_key (heap, node, FIBHEAPKEY_MIN);
+  if (node != heap->min)
+    {
+      fprintf (stderr, "Can't force minimum on fibheap.\n");
+      abort ();
+    }
+  fibheap_extract_min (heap);
+
+  return ret;
+}
+
+/* Delete HEAP.  */
+void
+fibheap_delete (fibheap_t heap)
+{
+  while (heap->min != NULL)
+    free (fibheap_extr_min_node (heap));
+
+  free (heap);
+}
+
+/* Determine if HEAP is empty.  */
+int
+fibheap_empty (fibheap_t heap)
+{
+  return heap->nodes == 0;
+}
+
+/* Extract the minimum node of the heap.  */
+static fibnode_t
+fibheap_extr_min_node (fibheap_t heap)
+{
+  fibnode_t ret = heap->min;
+  fibnode_t x, y, orig;
+
+  /* Attach the child list of the minimum node to the root list of the heap.
+     If there is no child list, we don't do squat.  */
+  for (x = ret->child, orig = NULL; x != orig && x != NULL; x = y)
+    {
+      if (orig == NULL)
+	orig = x;
+      y = x->right;
+      x->parent = NULL;
+      fibheap_ins_root (heap, x);
+    }
+
+  /* Remove the old root.  */
+  fibheap_rem_root (heap, ret);
+  heap->nodes--;
+
+  /* If we are left with no nodes, then the min is NULL.  */
+  if (heap->nodes == 0)
+    heap->min = NULL;
+  else
+    {
+      /* Otherwise, consolidate to find new minimum, as well as do the reorg
+         work that needs to be done.  */
+      heap->min = ret->right;
+      fibheap_consolidate (heap);
+    }
+
+  return ret;
+}
+
+/* Insert NODE into the root list of HEAP.  */
+static void
+fibheap_ins_root (fibheap_t heap, fibnode_t node)
+{
+  /* If the heap is currently empty, the new node becomes the singleton
+     circular root list.  */
+  if (heap->root == NULL)
+    {
+      heap->root = node;
+      node->left = node;
+      node->right = node;
+      return;
+    }
+
+  /* Otherwise, insert it in the circular root list between the root
+     and it's right node.  */
+  fibnode_insert_after (heap->root, node);
+}
+
+/* Remove NODE from the rootlist of HEAP.  */
+static void
+fibheap_rem_root (fibheap_t heap, fibnode_t node)
+{
+  if (node->left == node)
+    heap->root = NULL;
+  else
+    heap->root = fibnode_remove (node);
+}
+
+/* Consolidate the heap.  */
+static void
+fibheap_consolidate (fibheap_t heap)
+{
+  fibnode_t a[1 + 8 * sizeof (long)];
+  fibnode_t w;
+  fibnode_t y;
+  fibnode_t x;
+  int i;
+  int d;
+  int D;
+
+  D = 1 + 8 * sizeof (long);
+
+  memset (a, 0, sizeof (fibnode_t) * D);
+
+  while ((w = heap->root) != NULL)
+    {
+      x = w;
+      fibheap_rem_root (heap, w);
+      d = x->degree;
+      while (a[d] != NULL)
+	{
+	  y = a[d];
+	  if (fibheap_compare (heap, x, y) > 0)
+	    {
+	      fibnode_t temp;
+	      temp = x;
+	      x = y;
+	      y = temp;
+	    }
+	  fibheap_link (heap, y, x);
+	  a[d] = NULL;
+	  d++;
+	}
+      a[d] = x;
+    }
+  heap->min = NULL;
+  for (i = 0; i < D; i++)
+    if (a[i] != NULL)
+      {
+	fibheap_ins_root (heap, a[i]);
+	if (heap->min == NULL || fibheap_compare (heap, a[i], heap->min) < 0)
+	  heap->min = a[i];
+      }
+}
+
+/* Make NODE a child of PARENT.  */
+static void
+fibheap_link (fibheap_t heap ATTRIBUTE_UNUSED,
+              fibnode_t node, fibnode_t parent)
+{
+  if (parent->child == NULL)
+    parent->child = node;
+  else
+    fibnode_insert_before (parent->child, node);
+  node->parent = parent;
+  parent->degree++;
+  node->mark = 0;
+}
+
+/* Remove NODE from PARENT's child list.  */
+static void
+fibheap_cut (fibheap_t heap, fibnode_t node, fibnode_t parent)
+{
+  fibnode_remove (node);
+  parent->degree--;
+  fibheap_ins_root (heap, node);
+  node->parent = NULL;
+  node->mark = 0;
+}
+
+static void
+fibheap_cascading_cut (fibheap_t heap, fibnode_t y)
+{
+  fibnode_t z;
+
+  while ((z = y->parent) != NULL)
+    {
+      if (y->mark == 0)
+	{
+	  y->mark = 1;
+	  return;
+	}
+      else
+	{
+	  fibheap_cut (heap, y, z);
+	  y = z;
+	}
+    }
+}
+
+static void
+fibnode_insert_after (fibnode_t a, fibnode_t b)
+{
+  if (a == a->right)
+    {
+      a->right = b;
+      a->left = b;
+      b->right = a;
+      b->left = a;
+    }
+  else
+    {
+      b->right = a->right;
+      a->right->left = b;
+      a->right = b;
+      b->left = a;
+    }
+}
+
+static fibnode_t
+fibnode_remove (fibnode_t node)
+{
+  fibnode_t ret;
+
+  if (node == node->left)
+    ret = NULL;
+  else
+    ret = node->left;
+
+  if (node->parent != NULL && node->parent->child == node)
+    node->parent->child = ret;
+
+  node->right->left = node->left;
+  node->left->right = node->right;
+
+  node->parent = NULL;
+  node->left = node;
+  node->right = node;
+
+  return ret;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/filename_cmp.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/filename_cmp.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/filename_cmp.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/filename_cmp.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,143 @@
+/* File name comparison routine.
+
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#include "filenames.h"
+#include "safe-ctype.h"
+
+/*
+
+@deftypefn Extension int filename_cmp (const char *@var{s1}, const char *@var{s2})
+
+Return zero if the two file names @var{s1} and @var{s2} are equivalent.
+If not equivalent, the returned value is similar to what @code{strcmp}
+would return.  In other words, it returns a negative value if @var{s1}
+is less than @var{s2}, or a positive value if @var{s2} is greater than
+@var{s2}.
+
+This function does not normalize file names.  As a result, this function
+will treat filenames that are spelled differently as different even in
+the case when the two filenames point to the same underlying file.
+However, it does handle the fact that on DOS-like file systems, forward
+and backward slashes are equal.
+
+@end deftypefn
+
+*/
+
+int
+filename_cmp (const char *s1, const char *s2)
+{
+#if !defined(HAVE_DOS_BASED_FILE_SYSTEM) \
+    && !defined(HAVE_CASE_INSENSITIVE_FILE_SYSTEM)
+  return strcmp(s1, s2);
+#else
+  for (;;)
+    {
+      int c1 = *s1;
+      int c2 = *s2;
+
+#if defined (HAVE_CASE_INSENSITIVE_FILE_SYSTEM)
+      c1 = TOLOWER (c1);
+      c2 = TOLOWER (c2);
+#endif
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+      /* On DOS-based file systems, the '/' and the '\' are equivalent.  */
+      if (c1 == '/')
+        c1 = '\\';
+      if (c2 == '/')
+        c2 = '\\';
+#endif
+
+      if (c1 != c2)
+        return (c1 - c2);
+
+      if (c1 == '\0')
+        return 0;
+
+      s1++;
+      s2++;
+    }
+#endif
+}
+
+/*
+
+@deftypefn Extension int filename_ncmp (const char *@var{s1}, const char *@var{s2}, size_t @var{n})
+
+Return zero if the two file names @var{s1} and @var{s2} are equivalent
+in range @var{n}.
+If not equivalent, the returned value is similar to what @code{strncmp}
+would return.  In other words, it returns a negative value if @var{s1}
+is less than @var{s2}, or a positive value if @var{s2} is greater than
+@var{s2}.
+
+This function does not normalize file names.  As a result, this function
+will treat filenames that are spelled differently as different even in
+the case when the two filenames point to the same underlying file.
+However, it does handle the fact that on DOS-like file systems, forward
+and backward slashes are equal.
+
+@end deftypefn
+
+*/
+
+int
+filename_ncmp (const char *s1, const char *s2, size_t n)
+{
+#if !defined(HAVE_DOS_BASED_FILE_SYSTEM) \
+    && !defined(HAVE_CASE_INSENSITIVE_FILE_SYSTEM)
+  return strncmp(s1, s2, n);
+#else
+  if (!n)
+    return 0;
+  for (; n > 0; --n)
+  {
+      int c1 = *s1;
+      int c2 = *s2;
+
+#if defined (HAVE_CASE_INSENSITIVE_FILE_SYSTEM)
+      c1 = TOLOWER (c1);
+      c2 = TOLOWER (c2);
+#endif
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+      /* On DOS-based file systems, the '/' and the '\' are equivalent.  */
+      if (c1 == '/')
+        c1 = '\\';
+      if (c2 == '/')
+        c2 = '\\';
+#endif
+
+      if (c1 == '\0' || c1 != c2)
+        return (c1 - c2);
+
+      s1++;
+      s2++;
+  }
+  return 0;
+#endif
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/floatformat.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/floatformat.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/floatformat.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/floatformat.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,775 @@
+/* IEEE floating point support routines, for GDB, the GNU Debugger.
+   Copyright 1991, 1994, 1999, 2000, 2003, 2005, 2006, 2010
+   Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* This is needed to pick up the NAN macro on some systems.  */
+#define _GNU_SOURCE
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <math.h>
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+/* On some platforms, <float.h> provides DBL_QNAN.  */
+#ifdef STDC_HEADERS
+#include <float.h>
+#endif
+
+#include "ansidecl.h"
+#include "libiberty.h"
+#include "floatformat.h"
+
+#ifndef INFINITY
+#ifdef HUGE_VAL
+#define INFINITY HUGE_VAL
+#else
+#define INFINITY (1.0 / 0.0)
+#endif
+#endif
+
+#ifndef NAN
+#ifdef DBL_QNAN
+#define NAN DBL_QNAN
+#else
+#define NAN (0.0 / 0.0)
+#endif
+#endif
+
+static int mant_bits_set (const struct floatformat *, const unsigned char *);
+static unsigned long get_field (const unsigned char *,
+                                enum floatformat_byteorders,
+                                unsigned int,
+                                unsigned int,
+                                unsigned int);
+static int floatformat_always_valid (const struct floatformat *fmt,
+                                     const void *from);
+
+static int
+floatformat_always_valid (const struct floatformat *fmt ATTRIBUTE_UNUSED,
+                          const void *from ATTRIBUTE_UNUSED)
+{
+  return 1;
+}
+
+/* The odds that CHAR_BIT will be anything but 8 are low enough that I'm not
+   going to bother with trying to muck around with whether it is defined in
+   a system header, what we do if not, etc.  */
+#define FLOATFORMAT_CHAR_BIT 8
+
+/* floatformats for IEEE half, single and double, big and little endian.  */
+const struct floatformat floatformat_ieee_half_big =
+{
+  floatformat_big, 16, 0, 1, 5, 15, 31, 6, 10,
+  floatformat_intbit_no,
+  "floatformat_ieee_half_big",
+  floatformat_always_valid,
+  NULL
+};
+const struct floatformat floatformat_ieee_half_little =
+{
+  floatformat_little, 16, 0, 1, 5, 15, 31, 6, 10,
+  floatformat_intbit_no,
+  "floatformat_ieee_half_little",
+  floatformat_always_valid,
+  NULL
+};
+const struct floatformat floatformat_ieee_single_big =
+{
+  floatformat_big, 32, 0, 1, 8, 127, 255, 9, 23,
+  floatformat_intbit_no,
+  "floatformat_ieee_single_big",
+  floatformat_always_valid,
+  NULL
+};
+const struct floatformat floatformat_ieee_single_little =
+{
+  floatformat_little, 32, 0, 1, 8, 127, 255, 9, 23,
+  floatformat_intbit_no,
+  "floatformat_ieee_single_little",
+  floatformat_always_valid,
+  NULL
+};
+const struct floatformat floatformat_ieee_double_big =
+{
+  floatformat_big, 64, 0, 1, 11, 1023, 2047, 12, 52,
+  floatformat_intbit_no,
+  "floatformat_ieee_double_big",
+  floatformat_always_valid,
+  NULL
+};
+const struct floatformat floatformat_ieee_double_little =
+{
+  floatformat_little, 64, 0, 1, 11, 1023, 2047, 12, 52,
+  floatformat_intbit_no,
+  "floatformat_ieee_double_little",
+  floatformat_always_valid,
+  NULL
+};
+
+/* floatformat for IEEE double, little endian byte order, with big endian word
+   ordering, as on the ARM.  */
+
+const struct floatformat floatformat_ieee_double_littlebyte_bigword =
+{
+  floatformat_littlebyte_bigword, 64, 0, 1, 11, 1023, 2047, 12, 52,
+  floatformat_intbit_no,
+  "floatformat_ieee_double_littlebyte_bigword",
+  floatformat_always_valid,
+  NULL
+};
+
+/* floatformat for VAX.  Not quite IEEE, but close enough.  */
+
+const struct floatformat floatformat_vax_f =
+{
+  floatformat_vax, 32, 0, 1, 8, 129, 0, 9, 23,
+  floatformat_intbit_no,
+  "floatformat_vax_f",
+  floatformat_always_valid,
+  NULL
+};
+const struct floatformat floatformat_vax_d =
+{
+  floatformat_vax, 64, 0, 1, 8, 129, 0, 9, 55,
+  floatformat_intbit_no,
+  "floatformat_vax_d",
+  floatformat_always_valid,
+  NULL
+};
+const struct floatformat floatformat_vax_g =
+{
+  floatformat_vax, 64, 0, 1, 11, 1025, 0, 12, 52,
+  floatformat_intbit_no,
+  "floatformat_vax_g",
+  floatformat_always_valid,
+  NULL
+};
+
+static int floatformat_i387_ext_is_valid (const struct floatformat *fmt,
+					  const void *from);
+
+static int
+floatformat_i387_ext_is_valid (const struct floatformat *fmt, const void *from)
+{
+  /* In the i387 double-extended format, if the exponent is all ones,
+     then the integer bit must be set.  If the exponent is neither 0
+     nor ~0, the intbit must also be set.  Only if the exponent is
+     zero can it be zero, and then it must be zero.  */
+  unsigned long exponent, int_bit;
+  const unsigned char *ufrom = (const unsigned char *) from;
+
+  exponent = get_field (ufrom, fmt->byteorder, fmt->totalsize,
+			fmt->exp_start, fmt->exp_len);
+  int_bit = get_field (ufrom, fmt->byteorder, fmt->totalsize,
+		       fmt->man_start, 1);
+
+  if ((exponent == 0) != (int_bit == 0))
+    return 0;
+  else
+    return 1;
+}
+
+const struct floatformat floatformat_i387_ext =
+{
+  floatformat_little, 80, 0, 1, 15, 0x3fff, 0x7fff, 16, 64,
+  floatformat_intbit_yes,
+  "floatformat_i387_ext",
+  floatformat_i387_ext_is_valid,
+  NULL
+};
+const struct floatformat floatformat_m68881_ext =
+{
+  /* Note that the bits from 16 to 31 are unused.  */
+  floatformat_big, 96, 0, 1, 15, 0x3fff, 0x7fff, 32, 64,
+  floatformat_intbit_yes,
+  "floatformat_m68881_ext",
+  floatformat_always_valid,
+  NULL
+};
+const struct floatformat floatformat_i960_ext =
+{
+  /* Note that the bits from 0 to 15 are unused.  */
+  floatformat_little, 96, 16, 17, 15, 0x3fff, 0x7fff, 32, 64,
+  floatformat_intbit_yes,
+  "floatformat_i960_ext",
+  floatformat_always_valid,
+  NULL
+};
+const struct floatformat floatformat_m88110_ext =
+{
+  floatformat_big, 80, 0, 1, 15, 0x3fff, 0x7fff, 16, 64,
+  floatformat_intbit_yes,
+  "floatformat_m88110_ext",
+  floatformat_always_valid,
+  NULL
+};
+const struct floatformat floatformat_m88110_harris_ext =
+{
+  /* Harris uses raw format 128 bytes long, but the number is just an ieee
+     double, and the last 64 bits are wasted. */
+  floatformat_big,128, 0, 1, 11,  0x3ff,  0x7ff, 12, 52,
+  floatformat_intbit_no,
+  "floatformat_m88110_ext_harris",
+  floatformat_always_valid,
+  NULL
+};
+const struct floatformat floatformat_arm_ext_big =
+{
+  /* Bits 1 to 16 are unused.  */
+  floatformat_big, 96, 0, 17, 15, 0x3fff, 0x7fff, 32, 64,
+  floatformat_intbit_yes,
+  "floatformat_arm_ext_big",
+  floatformat_always_valid,
+  NULL
+};
+const struct floatformat floatformat_arm_ext_littlebyte_bigword =
+{
+  /* Bits 1 to 16 are unused.  */
+  floatformat_littlebyte_bigword, 96, 0, 17, 15, 0x3fff, 0x7fff, 32, 64,
+  floatformat_intbit_yes,
+  "floatformat_arm_ext_littlebyte_bigword",
+  floatformat_always_valid,
+  NULL
+};
+const struct floatformat floatformat_ia64_spill_big =
+{
+  floatformat_big, 128, 0, 1, 17, 65535, 0x1ffff, 18, 64,
+  floatformat_intbit_yes,
+  "floatformat_ia64_spill_big",
+  floatformat_always_valid,
+  NULL
+};
+const struct floatformat floatformat_ia64_spill_little =
+{
+  floatformat_little, 128, 0, 1, 17, 65535, 0x1ffff, 18, 64,
+  floatformat_intbit_yes,
+  "floatformat_ia64_spill_little",
+  floatformat_always_valid,
+  NULL
+};
+const struct floatformat floatformat_ia64_quad_big =
+{
+  floatformat_big, 128, 0, 1, 15, 16383, 0x7fff, 16, 112,
+  floatformat_intbit_no,
+  "floatformat_ia64_quad_big",
+  floatformat_always_valid,
+  NULL
+};
+const struct floatformat floatformat_ia64_quad_little =
+{
+  floatformat_little, 128, 0, 1, 15, 16383, 0x7fff, 16, 112,
+  floatformat_intbit_no,
+  "floatformat_ia64_quad_little",
+  floatformat_always_valid,
+  NULL
+};
+
+static int
+floatformat_ibm_long_double_is_valid (const struct floatformat *fmt,
+				      const void *from)
+{
+  const unsigned char *ufrom = (const unsigned char *) from;
+  const struct floatformat *hfmt = fmt->split_half;
+  long top_exp, bot_exp;
+  int top_nan = 0;
+
+  top_exp = get_field (ufrom, hfmt->byteorder, hfmt->totalsize,
+		       hfmt->exp_start, hfmt->exp_len);
+  bot_exp = get_field (ufrom + 8, hfmt->byteorder, hfmt->totalsize,
+		       hfmt->exp_start, hfmt->exp_len);
+
+  if ((unsigned long) top_exp == hfmt->exp_nan)
+    top_nan = mant_bits_set (hfmt, ufrom);
+
+  /* A NaN is valid with any low part.  */
+  if (top_nan)
+    return 1;
+
+  /* An infinity, zero or denormal requires low part 0 (positive or
+     negative).  */
+  if ((unsigned long) top_exp == hfmt->exp_nan || top_exp == 0)
+    {
+      if (bot_exp != 0)
+	return 0;
+
+      return !mant_bits_set (hfmt, ufrom + 8);
+    }
+
+  /* The top part is now a finite normal value.  The long double value
+     is the sum of the two parts, and the top part must equal the
+     result of rounding the long double value to nearest double.  Thus
+     the bottom part must be <= 0.5ulp of the top part in absolute
+     value, and if it is < 0.5ulp then the long double is definitely
+     valid.  */
+  if (bot_exp < top_exp - 53)
+    return 1;
+  if (bot_exp > top_exp - 53 && bot_exp != 0)
+    return 0;
+  if (bot_exp == 0)
+    {
+      /* The bottom part is 0 or denormal.  Determine which, and if
+	 denormal the first two set bits.  */
+      int first_bit = -1, second_bit = -1, cur_bit;
+      for (cur_bit = 0; (unsigned int) cur_bit < hfmt->man_len; cur_bit++)
+	if (get_field (ufrom + 8, hfmt->byteorder, hfmt->totalsize,
+		       hfmt->man_start + cur_bit, 1))
+	  {
+	    if (first_bit == -1)
+	      first_bit = cur_bit;
+	    else
+	      {
+		second_bit = cur_bit;
+		break;
+	      }
+	  }
+      /* Bottom part 0 is OK.  */
+      if (first_bit == -1)
+	return 1;
+      /* The real exponent of the bottom part is -first_bit.  */
+      if (-first_bit < top_exp - 53)
+	return 1;
+      if (-first_bit > top_exp - 53)
+	return 0;
+      /* The bottom part is at least 0.5ulp of the top part.  For this
+	 to be OK, the bottom part must be exactly 0.5ulp (i.e. no
+	 more bits set) and the top part must have last bit 0.  */
+      if (second_bit != -1)
+	return 0;
+      return !get_field (ufrom, hfmt->byteorder, hfmt->totalsize,
+			 hfmt->man_start + hfmt->man_len - 1, 1);
+    }
+  else
+    {
+      /* The bottom part is at least 0.5ulp of the top part.  For this
+	 to be OK, it must be exactly 0.5ulp (i.e. no explicit bits
+	 set) and the top part must have last bit 0.  */
+      if (get_field (ufrom, hfmt->byteorder, hfmt->totalsize,
+		     hfmt->man_start + hfmt->man_len - 1, 1))
+	return 0;
+      return !mant_bits_set (hfmt, ufrom + 8);
+    }
+}
+
+const struct floatformat floatformat_ibm_long_double =
+{
+  floatformat_big, 128, 0, 1, 11, 1023, 2047, 12, 52,
+  floatformat_intbit_no,
+  "floatformat_ibm_long_double",
+  floatformat_ibm_long_double_is_valid,
+  &floatformat_ieee_double_big
+};
+
+
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+/* Return 1 if any bits are explicitly set in the mantissa of UFROM,
+   format FMT, 0 otherwise.  */
+static int
+mant_bits_set (const struct floatformat *fmt, const unsigned char *ufrom)
+{
+  unsigned int mant_bits, mant_off;
+  int mant_bits_left;
+
+  mant_off = fmt->man_start;
+  mant_bits_left = fmt->man_len;
+  while (mant_bits_left > 0)
+    {
+      mant_bits = min (mant_bits_left, 32);
+
+      if (get_field (ufrom, fmt->byteorder, fmt->totalsize,
+		     mant_off, mant_bits) != 0)
+	return 1;
+
+      mant_off += mant_bits;
+      mant_bits_left -= mant_bits;
+    }
+  return 0;
+}
+
+/* Extract a field which starts at START and is LEN bits long.  DATA and
+   TOTAL_LEN are the thing we are extracting it from, in byteorder ORDER.  */
+static unsigned long
+get_field (const unsigned char *data, enum floatformat_byteorders order,
+           unsigned int total_len, unsigned int start, unsigned int len)
+{
+  unsigned long result = 0;
+  unsigned int cur_byte;
+  int lo_bit, hi_bit, cur_bitshift = 0;
+  int nextbyte = (order == floatformat_little) ? 1 : -1;
+
+  /* Start is in big-endian bit order!  Fix that first.  */
+  start = total_len - (start + len);
+
+  /* Start at the least significant part of the field.  */
+  if (order == floatformat_little)
+    cur_byte = start / FLOATFORMAT_CHAR_BIT;
+  else
+    cur_byte = (total_len - start - 1) / FLOATFORMAT_CHAR_BIT;
+
+  lo_bit = start % FLOATFORMAT_CHAR_BIT;
+  hi_bit = min (lo_bit + len, FLOATFORMAT_CHAR_BIT);
+  
+  do
+    {
+      unsigned int shifted = *(data + cur_byte) >> lo_bit;
+      unsigned int bits = hi_bit - lo_bit;
+      unsigned int mask = (1 << bits) - 1;
+      result |= (shifted & mask) << cur_bitshift;
+      len -= bits;
+      cur_bitshift += bits;
+      cur_byte += nextbyte;
+      lo_bit = 0;
+      hi_bit = min (len, FLOATFORMAT_CHAR_BIT);
+    }
+  while (len != 0);
+
+  return result;
+}
+  
+/* Convert from FMT to a double.
+   FROM is the address of the extended float.
+   Store the double in *TO.  */
+
+void
+floatformat_to_double (const struct floatformat *fmt,
+                       const void *from, double *to)
+{
+  const unsigned char *ufrom = (const unsigned char *) from;
+  double dto;
+  long exponent;
+  unsigned long mant;
+  unsigned int mant_bits, mant_off;
+  int mant_bits_left;
+  int special_exponent;		/* It's a NaN, denorm or zero */
+
+  /* Split values are not handled specially, since the top half has
+     the correctly rounded double value (in the only supported case of
+     split values).  */
+
+  exponent = get_field (ufrom, fmt->byteorder, fmt->totalsize,
+			fmt->exp_start, fmt->exp_len);
+
+  /* If the exponent indicates a NaN, we don't have information to
+     decide what to do.  So we handle it like IEEE, except that we
+     don't try to preserve the type of NaN.  FIXME.  */
+  if ((unsigned long) exponent == fmt->exp_nan)
+    {
+      int nan = mant_bits_set (fmt, ufrom);
+
+      /* On certain systems (such as GNU/Linux), the use of the
+	 INFINITY macro below may generate a warning that can not be
+	 silenced due to a bug in GCC (PR preprocessor/11931).  The
+	 preprocessor fails to recognise the __extension__ keyword in
+	 conjunction with the GNU/C99 extension for hexadecimal
+	 floating point constants and will issue a warning when
+	 compiling with -pedantic.  */
+      if (nan)
+	dto = NAN;
+      else
+	dto = INFINITY;
+
+      if (get_field (ufrom, fmt->byteorder, fmt->totalsize, fmt->sign_start, 1))
+	dto = -dto;
+
+      *to = dto;
+
+      return;
+    }
+
+  mant_bits_left = fmt->man_len;
+  mant_off = fmt->man_start;
+  dto = 0.0;
+
+  special_exponent = exponent == 0 || (unsigned long) exponent == fmt->exp_nan;
+
+  /* Don't bias zero's, denorms or NaNs.  */
+  if (!special_exponent)
+    exponent -= fmt->exp_bias;
+
+  /* Build the result algebraically.  Might go infinite, underflow, etc;
+     who cares. */
+
+  /* If this format uses a hidden bit, explicitly add it in now.  Otherwise,
+     increment the exponent by one to account for the integer bit.  */
+
+  if (!special_exponent)
+    {
+      if (fmt->intbit == floatformat_intbit_no)
+	dto = ldexp (1.0, exponent);
+      else
+	exponent++;
+    }
+
+  while (mant_bits_left > 0)
+    {
+      mant_bits = min (mant_bits_left, 32);
+
+      mant = get_field (ufrom, fmt->byteorder, fmt->totalsize,
+			 mant_off, mant_bits);
+
+      /* Handle denormalized numbers.  FIXME: What should we do for
+	 non-IEEE formats?  */
+      if (special_exponent && exponent == 0 && mant != 0)
+	dto += ldexp ((double)mant,
+		      (- fmt->exp_bias
+		       - mant_bits
+		       - (mant_off - fmt->man_start)
+		       + 1));
+      else
+	dto += ldexp ((double)mant, exponent - mant_bits);
+      if (exponent != 0)
+	exponent -= mant_bits;
+      mant_off += mant_bits;
+      mant_bits_left -= mant_bits;
+    }
+
+  /* Negate it if negative.  */
+  if (get_field (ufrom, fmt->byteorder, fmt->totalsize, fmt->sign_start, 1))
+    dto = -dto;
+  *to = dto;
+}
+
+static void put_field (unsigned char *, enum floatformat_byteorders,
+                       unsigned int,
+                       unsigned int,
+                       unsigned int,
+                       unsigned long);
+
+/* Set a field which starts at START and is LEN bits long.  DATA and
+   TOTAL_LEN are the thing we are extracting it from, in byteorder ORDER.  */
+static void
+put_field (unsigned char *data, enum floatformat_byteorders order,
+           unsigned int total_len, unsigned int start, unsigned int len,
+           unsigned long stuff_to_put)
+{
+  unsigned int cur_byte;
+  int lo_bit, hi_bit;
+  int nextbyte = (order == floatformat_little) ? 1 : -1;
+
+  /* Start is in big-endian bit order!  Fix that first.  */
+  start = total_len - (start + len);
+
+  /* Start at the least significant part of the field.  */
+  if (order == floatformat_little)
+    cur_byte = start / FLOATFORMAT_CHAR_BIT;
+  else
+    cur_byte = (total_len - start - 1) / FLOATFORMAT_CHAR_BIT;
+
+  lo_bit = start % FLOATFORMAT_CHAR_BIT;
+  hi_bit = min (lo_bit + len, FLOATFORMAT_CHAR_BIT);
+  
+  do
+    {
+      unsigned char *byte_ptr = data + cur_byte;
+      unsigned int bits = hi_bit - lo_bit;
+      unsigned int mask = ((1 << bits) - 1) << lo_bit;
+      *byte_ptr = (*byte_ptr & ~mask) | ((stuff_to_put << lo_bit) & mask);
+      stuff_to_put >>= bits;
+      len -= bits;
+      cur_byte += nextbyte;
+      lo_bit = 0;
+      hi_bit = min (len, FLOATFORMAT_CHAR_BIT);
+    }
+  while (len != 0);
+}
+
+/* The converse: convert the double *FROM to an extended float
+   and store where TO points.  Neither FROM nor TO have any alignment
+   restrictions.  */
+
+void
+floatformat_from_double (const struct floatformat *fmt,
+                         const double *from, void *to)
+{
+  double dfrom;
+  int exponent;
+  double mant;
+  unsigned int mant_bits, mant_off;
+  int mant_bits_left;
+  unsigned char *uto = (unsigned char *) to;
+
+  dfrom = *from;
+  memset (uto, 0, fmt->totalsize / FLOATFORMAT_CHAR_BIT);
+
+  /* Split values are not handled specially, since a bottom half of
+     zero is correct for any value representable as double (in the
+     only supported case of split values).  */
+
+  /* If negative, set the sign bit.  */
+  if (dfrom < 0)
+    {
+      put_field (uto, fmt->byteorder, fmt->totalsize, fmt->sign_start, 1, 1);
+      dfrom = -dfrom;
+    }
+
+  if (dfrom == 0)
+    {
+      /* 0.0.  */
+      return;
+    }
+
+  if (dfrom != dfrom)
+    {
+      /* NaN.  */
+      put_field (uto, fmt->byteorder, fmt->totalsize, fmt->exp_start,
+		 fmt->exp_len, fmt->exp_nan);
+      /* Be sure it's not infinity, but NaN value is irrelevant.  */
+      put_field (uto, fmt->byteorder, fmt->totalsize, fmt->man_start,
+		 32, 1);
+      return;
+    }
+
+  if (dfrom + dfrom == dfrom)
+    {
+      /* This can only happen for an infinite value (or zero, which we
+	 already handled above).  */
+      put_field (uto, fmt->byteorder, fmt->totalsize, fmt->exp_start,
+		 fmt->exp_len, fmt->exp_nan);
+      return;
+    }
+
+  mant = frexp (dfrom, &exponent);
+  if (exponent + fmt->exp_bias - 1 > 0)
+    put_field (uto, fmt->byteorder, fmt->totalsize, fmt->exp_start,
+	       fmt->exp_len, exponent + fmt->exp_bias - 1);
+  else
+    {
+      /* Handle a denormalized number.  FIXME: What should we do for
+	 non-IEEE formats?  */
+      put_field (uto, fmt->byteorder, fmt->totalsize, fmt->exp_start,
+		 fmt->exp_len, 0);
+      mant = ldexp (mant, exponent + fmt->exp_bias - 1);
+    }
+
+  mant_bits_left = fmt->man_len;
+  mant_off = fmt->man_start;
+  while (mant_bits_left > 0)
+    {
+      unsigned long mant_long;
+      mant_bits = mant_bits_left < 32 ? mant_bits_left : 32;
+
+      mant *= 4294967296.0;
+      mant_long = (unsigned long)mant;
+      mant -= mant_long;
+
+      /* If the integer bit is implicit, and we are not creating a
+	 denormalized number, then we need to discard it.  */
+      if ((unsigned int) mant_bits_left == fmt->man_len
+	  && fmt->intbit == floatformat_intbit_no
+	  && exponent + fmt->exp_bias - 1 > 0)
+	{
+	  mant_long &= 0x7fffffff;
+	  mant_bits -= 1;
+	}
+      else if (mant_bits < 32)
+	{
+	  /* The bits we want are in the most significant MANT_BITS bits of
+	     mant_long.  Move them to the least significant.  */
+	  mant_long >>= 32 - mant_bits;
+	}
+
+      put_field (uto, fmt->byteorder, fmt->totalsize,
+		 mant_off, mant_bits, mant_long);
+      mant_off += mant_bits;
+      mant_bits_left -= mant_bits;
+    }
+}
+
+/* Return non-zero iff the data at FROM is a valid number in format FMT.  */
+
+int
+floatformat_is_valid (const struct floatformat *fmt, const void *from)
+{
+  return fmt->is_valid (fmt, from);
+}
+
+
+#ifdef IEEE_DEBUG
+
+#include <stdio.h>
+
+/* This is to be run on a host which uses IEEE floating point.  */
+
+void
+ieee_test (double n)
+{
+  double result;
+
+  floatformat_to_double (&floatformat_ieee_double_little, &n, &result);
+  if ((n != result && (! isnan (n) || ! isnan (result)))
+      || (n < 0 && result >= 0)
+      || (n >= 0 && result < 0))
+    printf ("Differ(to): %.20g -> %.20g\n", n, result);
+
+  floatformat_from_double (&floatformat_ieee_double_little, &n, &result);
+  if ((n != result && (! isnan (n) || ! isnan (result)))
+      || (n < 0 && result >= 0)
+      || (n >= 0 && result < 0))
+    printf ("Differ(from): %.20g -> %.20g\n", n, result);
+
+#if 0
+  {
+    char exten[16];
+
+    floatformat_from_double (&floatformat_m68881_ext, &n, exten);
+    floatformat_to_double (&floatformat_m68881_ext, exten, &result);
+    if (n != result)
+      printf ("Differ(to+from): %.20g -> %.20g\n", n, result);
+  }
+#endif
+
+#if IEEE_DEBUG > 1
+  /* This is to be run on a host which uses 68881 format.  */
+  {
+    long double ex = *(long double *)exten;
+    if (ex != n)
+      printf ("Differ(from vs. extended): %.20g\n", n);
+  }
+#endif
+}
+
+int
+main (void)
+{
+  ieee_test (0.0);
+  ieee_test (0.5);
+  ieee_test (256.0);
+  ieee_test (0.12345);
+  ieee_test (234235.78907234);
+  ieee_test (-512.0);
+  ieee_test (-0.004321);
+  ieee_test (1.2E-70);
+  ieee_test (1.2E-316);
+  ieee_test (4.9406564584124654E-324);
+  ieee_test (- 4.9406564584124654E-324);
+  ieee_test (- 0.0);
+  ieee_test (- INFINITY);
+  ieee_test (- NAN);
+  ieee_test (INFINITY);
+  ieee_test (NAN);
+  return 0;
+}
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/fnmatch.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/fnmatch.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/fnmatch.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/fnmatch.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,220 @@
+/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
+
+NOTE: This source is derived from an old version taken from the GNU C
+Library (glibc).
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
+   (which it would do because it found this file in $srcdir).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+/* This code to undef const added in libiberty.  */
+#ifndef __STDC__
+/* This is a separate conditional since some stdc systems
+   reject `defined (const)'.  */
+#ifndef const
+#define const
+#endif
+#endif
+
+#include <errno.h>
+#include <fnmatch.h>
+#include <safe-ctype.h>
+
+/* Comment out all this code if we are using the GNU C Library, and are not
+   actually compiling the library itself.  This code is part of the GNU C
+   Library, but also included in many other GNU distributions.  Compiling
+   and linking in this code is a waste when using the GNU C library
+   (especially if it is a shared library).  Rather than having every GNU
+   program understand `configure --with-gnu-libc' and omit the object files,
+   it is simpler to just do this in the source for each such file.  */
+
+#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
+
+
+#if !defined(__GNU_LIBRARY__) && !defined(STDC_HEADERS)
+extern int errno;
+#endif
+
+/* Match STRING against the filename pattern PATTERN, returning zero if
+   it matches, nonzero if not.  */
+int
+fnmatch (const char *pattern, const char *string, int flags)
+{
+  register const char *p = pattern, *n = string;
+  register unsigned char c;
+
+#define FOLD(c)	((flags & FNM_CASEFOLD) ? TOLOWER (c) : (c))
+
+  while ((c = *p++) != '\0')
+    {
+      c = FOLD (c);
+
+      switch (c)
+	{
+	case '?':
+	  if (*n == '\0')
+	    return FNM_NOMATCH;
+	  else if ((flags & FNM_FILE_NAME) && *n == '/')
+	    return FNM_NOMATCH;
+	  else if ((flags & FNM_PERIOD) && *n == '.' &&
+		   (n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/')))
+	    return FNM_NOMATCH;
+	  break;
+
+	case '\\':
+	  if (!(flags & FNM_NOESCAPE))
+	    {
+	      c = *p++;
+	      c = FOLD (c);
+	    }
+	  if (FOLD ((unsigned char)*n) != c)
+	    return FNM_NOMATCH;
+	  break;
+
+	case '*':
+	  if ((flags & FNM_PERIOD) && *n == '.' &&
+	      (n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/')))
+	    return FNM_NOMATCH;
+
+	  for (c = *p++; c == '?' || c == '*'; c = *p++, ++n)
+	    if (((flags & FNM_FILE_NAME) && *n == '/') ||
+		(c == '?' && *n == '\0'))
+	      return FNM_NOMATCH;
+
+	  if (c == '\0')
+	    return 0;
+
+	  {
+	    unsigned char c1 = (!(flags & FNM_NOESCAPE) && c == '\\') ? *p : c;
+	    c1 = FOLD (c1);
+	    for (--p; *n != '\0'; ++n)
+	      if ((c == '[' || FOLD ((unsigned char)*n) == c1) &&
+		  fnmatch (p, n, flags & ~FNM_PERIOD) == 0)
+		return 0;
+	    return FNM_NOMATCH;
+	  }
+
+	case '[':
+	  {
+	    /* Nonzero if the sense of the character class is inverted.  */
+	    register int negate;
+
+	    if (*n == '\0')
+	      return FNM_NOMATCH;
+
+	    if ((flags & FNM_PERIOD) && *n == '.' &&
+		(n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/')))
+	      return FNM_NOMATCH;
+
+	    negate = (*p == '!' || *p == '^');
+	    if (negate)
+	      ++p;
+
+	    c = *p++;
+	    for (;;)
+	      {
+		register unsigned char cstart = c, cend = c;
+
+		if (!(flags & FNM_NOESCAPE) && c == '\\')
+		  cstart = cend = *p++;
+
+		cstart = cend = FOLD (cstart);
+
+		if (c == '\0')
+		  /* [ (unterminated) loses.  */
+		  return FNM_NOMATCH;
+
+		c = *p++;
+		c = FOLD (c);
+
+		if ((flags & FNM_FILE_NAME) && c == '/')
+		  /* [/] can never match.  */
+		  return FNM_NOMATCH;
+
+		if (c == '-' && *p != ']')
+		  {
+		    cend = *p++;
+		    if (!(flags & FNM_NOESCAPE) && cend == '\\')
+		      cend = *p++;
+		    if (cend == '\0')
+		      return FNM_NOMATCH;
+		    cend = FOLD (cend);
+
+		    c = *p++;
+		  }
+
+		if (FOLD ((unsigned char)*n) >= cstart
+		    && FOLD ((unsigned char)*n) <= cend)
+		  goto matched;
+
+		if (c == ']')
+		  break;
+	      }
+	    if (!negate)
+	      return FNM_NOMATCH;
+	    break;
+
+	  matched:;
+	    /* Skip the rest of the [...] that already matched.  */
+	    while (c != ']')
+	      {
+		if (c == '\0')
+		  /* [... (unterminated) loses.  */
+		  return FNM_NOMATCH;
+
+		c = *p++;
+		if (!(flags & FNM_NOESCAPE) && c == '\\')
+		  /* XXX 1003.2d11 is unclear if this is right.  */
+		  ++p;
+	      }
+	    if (negate)
+	      return FNM_NOMATCH;
+	  }
+	  break;
+
+	default:
+	  if (c != FOLD ((unsigned char)*n))
+	    return FNM_NOMATCH;
+	}
+
+      ++n;
+    }
+
+  if (*n == '\0')
+    return 0;
+
+  if ((flags & FNM_LEADING_DIR) && *n == '/')
+    /* The FNM_LEADING_DIR flag says that "foo*" matches "foobar/frobozz".  */
+    return 0;
+
+  return FNM_NOMATCH;
+}
+
+#endif	/* _LIBC or not __GNU_LIBRARY__.  */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/fnmatch.txh sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/fnmatch.txh
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/fnmatch.txh	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/fnmatch.txh	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,49 @@
+@deftypefn Replacement int fnmatch (const char *@var{pattern}, @
+  const char *@var{string}, int @var{flags})
+
+Matches @var{string} against @var{pattern}, returning zero if it
+matches, @code{FNM_NOMATCH} if not.  @var{pattern} may contain the
+wildcards @code{?} to match any one character, @code{*} to match any
+zero or more characters, or a set of alternate characters in square
+brackets, like @samp{[a-gt8]}, which match one character (@code{a}
+through @code{g}, or @code{t}, or @code{8}, in this example) if that one
+character is in the set.  A set may be inverted (i.e., match anything
+except what's in the set) by giving @code{^} or @code{!} as the first
+character in the set.  To include those characters in the set, list them
+as anything other than the first character of the set.  To include a
+dash in the set, list it last in the set.  A backslash character makes
+the following character not special, so for example you could match
+against a literal asterisk with @samp{\*}.  To match a literal
+backslash, use @samp{\\}.
+
+@code{flags} controls various aspects of the matching process, and is a
+boolean OR of zero or more of the following values (defined in
+@code{<fnmatch.h>}):
+
+@table @code
+
+@item FNM_PATHNAME
+@itemx FNM_FILE_NAME
+@var{string} is assumed to be a path name.  No wildcard will ever match
+@code{/}.
+
+@item FNM_NOESCAPE
+Do not interpret backslashes as quoting the following special character.
+
+@item FNM_PERIOD
+A leading period (at the beginning of @var{string}, or if
+@code{FNM_PATHNAME} after a slash) is not matched by @code{*} or
+@code{?} but must be matched explicitly.
+
+@item FNM_LEADING_DIR
+Means that @var{string} also matches @var{pattern} if some initial part
+of @var{string} matches, and is followed by @code{/} and zero or more
+characters.  For example, @samp{foo*} would match either @samp{foobar}
+or @samp{foobar/grill}.
+
+@item FNM_CASEFOLD
+Ignores case when performing the comparison.
+
+@end table
+
+@end deftypefn
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/fopen_unlocked.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/fopen_unlocked.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/fopen_unlocked.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/fopen_unlocked.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,129 @@
+/* Implement fopen_unlocked and related functions.
+   Copyright (C) 2005, 2011 Free Software Foundation, Inc.
+   Written by Kaveh R. Ghazi <ghazi@caip.rutgers.edu>.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/*
+
+@deftypefn Extension void unlock_stream (FILE * @var{stream})
+
+If the OS supports it, ensure that the supplied stream is setup to
+avoid any multi-threaded locking.  Otherwise leave the @code{FILE}
+pointer unchanged.  If the @var{stream} is @code{NULL} do nothing.
+
+@end deftypefn
+
+@deftypefn Extension void unlock_std_streams (void)
+
+If the OS supports it, ensure that the standard I/O streams,
+@code{stdin}, @code{stdout} and @code{stderr} are setup to avoid any
+multi-threaded locking.  Otherwise do nothing.
+
+@end deftypefn
+
+@deftypefn Extension {FILE *} fopen_unlocked (const char *@var{path}, @
+  const char * @var{mode})
+
+Opens and returns a @code{FILE} pointer via @code{fopen}.  If the
+operating system supports it, ensure that the stream is setup to avoid
+any multi-threaded locking.  Otherwise return the @code{FILE} pointer
+unchanged.
+
+@end deftypefn
+
+@deftypefn Extension {FILE *} fdopen_unlocked (int @var{fildes}, @
+  const char * @var{mode})
+
+Opens and returns a @code{FILE} pointer via @code{fdopen}.  If the
+operating system supports it, ensure that the stream is setup to avoid
+any multi-threaded locking.  Otherwise return the @code{FILE} pointer
+unchanged.
+
+@end deftypefn
+
+@deftypefn Extension {FILE *} freopen_unlocked (const char * @var{path}, @
+  const char * @var{mode}, FILE * @var{stream})
+
+Opens and returns a @code{FILE} pointer via @code{freopen}.  If the
+operating system supports it, ensure that the stream is setup to avoid
+any multi-threaded locking.  Otherwise return the @code{FILE} pointer
+unchanged.
+
+@end deftypefn
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <stdio.h>
+#ifdef HAVE_STDIO_EXT_H
+#include <stdio_ext.h>
+#endif
+
+#include "libiberty.h"
+
+/* This is an inline helper function to consolidate attempts to unlock
+   a stream.  */
+
+static inline void
+unlock_1 (FILE *const fp ATTRIBUTE_UNUSED)
+{
+#if defined(HAVE___FSETLOCKING) && defined(FSETLOCKING_BYCALLER)
+  if (fp)
+    __fsetlocking (fp, FSETLOCKING_BYCALLER);
+#endif
+}
+
+void
+unlock_stream (FILE *fp)
+{
+  unlock_1 (fp);
+}
+
+void
+unlock_std_streams (void)
+{
+  unlock_1 (stdin);
+  unlock_1 (stdout);
+  unlock_1 (stderr);
+}
+
+FILE *
+fopen_unlocked (const char *path, const char *mode)		
+{
+  FILE *const fp = fopen (path, mode);
+  unlock_1 (fp);
+  return fp;
+}
+
+FILE *
+fdopen_unlocked (int fildes, const char *mode)
+{
+  FILE *const fp = fdopen (fildes, mode);
+  unlock_1 (fp);
+  return fp;
+}
+
+FILE *
+freopen_unlocked (const char *path, const char *mode, FILE *stream)
+{
+  FILE *const fp = freopen (path, mode, stream);
+  unlock_1 (fp);
+  return fp;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/functions.texi sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/functions.texi
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/functions.texi	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/functions.texi	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1940 @@
+@c Automatically generated from *.c and others (the comments before
+@c each entry tell you which file and where in that file).  DO NOT EDIT!
+@c Edit the *.c files, configure with --enable-maintainer-mode,
+@c run 'make stamp-functions' and gather-docs will build a new copy.
+
+@c alloca.c:26
+@deftypefn Replacement void* alloca (size_t @var{size})
+
+This function allocates memory which will be automatically reclaimed
+after the procedure exits.  The @libib{} implementation does not free
+the memory immediately but will do so eventually during subsequent
+calls to this function.  Memory is allocated using @code{xmalloc} under
+normal circumstances.
+
+The header file @file{alloca-conf.h} can be used in conjunction with the
+GNU Autoconf test @code{AC_FUNC_ALLOCA} to test for and properly make
+available this function.  The @code{AC_FUNC_ALLOCA} test requires that
+client code use a block of preprocessor code to be safe (see the Autoconf
+manual for more); this header incorporates that logic and more, including
+the possibility of a GCC built-in function.
+
+@end deftypefn
+
+@c asprintf.c:32
+@deftypefn Extension int asprintf (char **@var{resptr}, const char *@var{format}, ...)
+
+Like @code{sprintf}, but instead of passing a pointer to a buffer, you
+pass a pointer to a pointer.  This function will compute the size of
+the buffer needed, allocate memory with @code{malloc}, and store a
+pointer to the allocated memory in @code{*@var{resptr}}.  The value
+returned is the same as @code{sprintf} would return.  If memory could
+not be allocated, minus one is returned and @code{NULL} is stored in
+@code{*@var{resptr}}.
+
+@end deftypefn
+
+@c atexit.c:6
+@deftypefn Supplemental int atexit (void (*@var{f})())
+
+Causes function @var{f} to be called at exit.  Returns 0.
+
+@end deftypefn
+
+@c basename.c:6
+@deftypefn Supplemental char* basename (const char *@var{name})
+
+Returns a pointer to the last component of pathname @var{name}.
+Behavior is undefined if the pathname ends in a directory separator.
+
+@end deftypefn
+
+@c bcmp.c:6
+@deftypefn Supplemental int bcmp (char *@var{x}, char *@var{y}, int @var{count})
+
+Compares the first @var{count} bytes of two areas of memory.  Returns
+zero if they are the same, nonzero otherwise.  Returns zero if
+@var{count} is zero.  A nonzero result only indicates a difference,
+it does not indicate any sorting order (say, by having a positive
+result mean @var{x} sorts before @var{y}).
+
+@end deftypefn
+
+@c bcopy.c:3
+@deftypefn Supplemental void bcopy (char *@var{in}, char *@var{out}, int @var{length})
+
+Copies @var{length} bytes from memory region @var{in} to region
+@var{out}.  The use of @code{bcopy} is deprecated in new programs.
+
+@end deftypefn
+
+@c bsearch.c:33
+@deftypefn Supplemental void* bsearch (const void *@var{key}, @
+  const void *@var{base}, size_t @var{nmemb}, size_t @var{size}, @
+  int (*@var{compar})(const void *, const void *))
+
+Performs a search over an array of @var{nmemb} elements pointed to by
+@var{base} for a member that matches the object pointed to by @var{key}.
+The size of each member is specified by @var{size}.  The array contents
+should be sorted in ascending order according to the @var{compar}
+comparison function.  This routine should take two arguments pointing to
+the @var{key} and to an array member, in that order, and should return an
+integer less than, equal to, or greater than zero if the @var{key} object
+is respectively less than, matching, or greater than the array member.
+
+@end deftypefn
+
+@c argv.c:142
+@deftypefn Extension char** buildargv (char *@var{sp})
+
+Given a pointer to a string, parse the string extracting fields
+separated by whitespace and optionally enclosed within either single
+or double quotes (which are stripped off), and build a vector of
+pointers to copies of the string for each field.  The input string
+remains unchanged.  The last element of the vector is followed by a
+@code{NULL} element.
+
+All of the memory for the pointer array and copies of the string
+is obtained from @code{malloc}.  All of the memory can be returned to the
+system with the single function call @code{freeargv}, which takes the
+returned result of @code{buildargv}, as it's argument.
+
+Returns a pointer to the argument vector if successful.  Returns
+@code{NULL} if @var{sp} is @code{NULL} or if there is insufficient
+memory to complete building the argument vector.
+
+If the input is a null string (as opposed to a @code{NULL} pointer),
+then buildarg returns an argument vector that has one arg, a null
+string.
+
+@end deftypefn
+
+@c bzero.c:6
+@deftypefn Supplemental void bzero (char *@var{mem}, int @var{count})
+
+Zeros @var{count} bytes starting at @var{mem}.  Use of this function
+is deprecated in favor of @code{memset}.
+
+@end deftypefn
+
+@c calloc.c:6
+@deftypefn Supplemental void* calloc (size_t @var{nelem}, size_t @var{elsize})
+
+Uses @code{malloc} to allocate storage for @var{nelem} objects of
+@var{elsize} bytes each, then zeros the memory.
+
+@end deftypefn
+
+@c choose-temp.c:46
+@deftypefn Extension char* choose_temp_base (void)
+
+Return a prefix for temporary file names or @code{NULL} if unable to
+find one.  The current directory is chosen if all else fails so the
+program is exited if a temporary directory can't be found (@code{mktemp}
+fails).  The buffer for the result is obtained with @code{xmalloc}.
+
+This function is provided for backwards compatibility only.  Its use is
+not recommended.
+
+@end deftypefn
+
+@c make-temp-file.c:96
+@deftypefn Replacement char* choose_tmpdir ()
+
+Returns a pointer to a directory path suitable for creating temporary
+files in.
+
+@end deftypefn
+
+@c clock.c:27
+@deftypefn Supplemental long clock (void)
+
+Returns an approximation of the CPU time used by the process as a
+@code{clock_t}; divide this number by @samp{CLOCKS_PER_SEC} to get the
+number of seconds used.
+
+@end deftypefn
+
+@c concat.c:24
+@deftypefn Extension char* concat (const char *@var{s1}, const char *@var{s2}, @
+  @dots{}, @code{NULL})
+
+Concatenate zero or more of strings and return the result in freshly
+@code{xmalloc}ed memory.  Returns @code{NULL} if insufficient memory is
+available.  The argument list is terminated by the first @code{NULL}
+pointer encountered.  Pointers to empty strings are ignored.
+
+@end deftypefn
+
+@c crc32.c:141
+@deftypefn Extension {unsigned int} crc32 (const unsigned char *@var{buf}, @
+  int @var{len}, unsigned int @var{init})
+
+Compute the 32-bit CRC of @var{buf} which has length @var{len}.  The
+starting value is @var{init}; this may be used to compute the CRC of
+data split across multiple buffers by passing the return value of each
+call as the @var{init} parameter of the next.
+
+This is intended to match the CRC used by the @command{gdb} remote
+protocol for the @samp{qCRC} command.  In order to get the same
+results as gdb for a block of data, you must pass the first CRC
+parameter as @code{0xffffffff}.
+
+This CRC can be specified as:
+
+  Width  : 32
+  Poly   : 0x04c11db7
+  Init   : parameter, typically 0xffffffff
+  RefIn  : false
+  RefOut : false
+  XorOut : 0
+
+This differs from the "standard" CRC-32 algorithm in that the values
+are not reflected, and there is no final XOR value.  These differences
+make it easy to compose the values of multiple blocks.
+
+@end deftypefn
+
+@c argv.c:52
+@deftypefn Extension char** dupargv (char **@var{vector})
+
+Duplicate an argument vector.  Simply scans through @var{vector},
+duplicating each argument until the terminating @code{NULL} is found.
+Returns a pointer to the argument vector if successful.  Returns
+@code{NULL} if there is insufficient memory to complete building the
+argument vector.
+
+@end deftypefn
+
+@c strerror.c:567
+@deftypefn Extension int errno_max (void)
+
+Returns the maximum @code{errno} value for which a corresponding
+symbolic name or message is available.  Note that in the case where we
+use the @code{sys_errlist} supplied by the system, it is possible for
+there to be more symbolic names than messages, or vice versa.  In
+fact, the manual page for @code{perror(3C)} explicitly warns that one
+should check the size of the table (@code{sys_nerr}) before indexing
+it, since new error codes may be added to the system before they are
+added to the table.  Thus @code{sys_nerr} might be smaller than value
+implied by the largest @code{errno} value defined in @code{<errno.h>}.
+
+We return the maximum value that can be used to obtain a meaningful
+symbolic name or message.
+
+@end deftypefn
+
+@c argv.c:361
+@deftypefn Extension void expandargv (int *@var{argcp}, char ***@var{argvp})
+
+The @var{argcp} and @code{argvp} arguments are pointers to the usual
+@code{argc} and @code{argv} arguments to @code{main}.  This function
+looks for arguments that begin with the character @samp{@@}.  Any such
+arguments are interpreted as ``response files''.  The contents of the
+response file are interpreted as additional command line options.  In
+particular, the file is separated into whitespace-separated strings;
+each such string is taken as a command-line option.  The new options
+are inserted in place of the option naming the response file, and
+@code{*argcp} and @code{*argvp} will be updated.  If the value of
+@code{*argvp} is modified by this function, then the new value has
+been dynamically allocated and can be deallocated by the caller with
+@code{freeargv}.  However, most callers will simply call
+@code{expandargv} near the beginning of @code{main} and allow the
+operating system to free the memory when the program exits.
+
+@end deftypefn
+
+@c fdmatch.c:23
+@deftypefn Extension int fdmatch (int @var{fd1}, int @var{fd2})
+
+Check to see if two open file descriptors refer to the same file.
+This is useful, for example, when we have an open file descriptor for
+an unnamed file, and the name of a file that we believe to correspond
+to that fd.  This can happen when we are exec'd with an already open
+file (@code{stdout} for example) or from the SVR4 @file{/proc} calls
+that return open file descriptors for mapped address spaces.  All we
+have to do is open the file by name and check the two file descriptors
+for a match, which is done by comparing major and minor device numbers
+and inode numbers.
+
+@end deftypefn
+
+@c fopen_unlocked.c:49
+@deftypefn Extension {FILE *} fdopen_unlocked (int @var{fildes}, @
+  const char * @var{mode})
+
+Opens and returns a @code{FILE} pointer via @code{fdopen}.  If the
+operating system supports it, ensure that the stream is setup to avoid
+any multi-threaded locking.  Otherwise return the @code{FILE} pointer
+unchanged.
+
+@end deftypefn
+
+@c ffs.c:3
+@deftypefn Supplemental int ffs (int @var{valu})
+
+Find the first (least significant) bit set in @var{valu}.  Bits are
+numbered from right to left, starting with bit 1 (corresponding to the
+value 1).  If @var{valu} is zero, zero is returned.
+
+@end deftypefn
+
+@c filename_cmp.c:32
+@deftypefn Extension int filename_cmp (const char *@var{s1}, const char *@var{s2})
+
+Return zero if the two file names @var{s1} and @var{s2} are equivalent.
+If not equivalent, the returned value is similar to what @code{strcmp}
+would return.  In other words, it returns a negative value if @var{s1}
+is less than @var{s2}, or a positive value if @var{s2} is greater than
+@var{s2}.
+
+This function does not normalize file names.  As a result, this function
+will treat filenames that are spelled differently as different even in
+the case when the two filenames point to the same underlying file.
+However, it does handle the fact that on DOS-like file systems, forward
+and backward slashes are equal.
+
+@end deftypefn
+
+@c filename_cmp.c:81
+@deftypefn Extension int filename_ncmp (const char *@var{s1}, const char *@var{s2}, size_t @var{n})
+
+Return zero if the two file names @var{s1} and @var{s2} are equivalent
+in range @var{n}.
+If not equivalent, the returned value is similar to what @code{strncmp}
+would return.  In other words, it returns a negative value if @var{s1}
+is less than @var{s2}, or a positive value if @var{s2} is greater than
+@var{s2}.
+
+This function does not normalize file names.  As a result, this function
+will treat filenames that are spelled differently as different even in
+the case when the two filenames point to the same underlying file.
+However, it does handle the fact that on DOS-like file systems, forward
+and backward slashes are equal.
+
+@end deftypefn
+
+@c fnmatch.txh:1
+@deftypefn Replacement int fnmatch (const char *@var{pattern}, @
+  const char *@var{string}, int @var{flags})
+
+Matches @var{string} against @var{pattern}, returning zero if it
+matches, @code{FNM_NOMATCH} if not.  @var{pattern} may contain the
+wildcards @code{?} to match any one character, @code{*} to match any
+zero or more characters, or a set of alternate characters in square
+brackets, like @samp{[a-gt8]}, which match one character (@code{a}
+through @code{g}, or @code{t}, or @code{8}, in this example) if that one
+character is in the set.  A set may be inverted (i.e., match anything
+except what's in the set) by giving @code{^} or @code{!} as the first
+character in the set.  To include those characters in the set, list them
+as anything other than the first character of the set.  To include a
+dash in the set, list it last in the set.  A backslash character makes
+the following character not special, so for example you could match
+against a literal asterisk with @samp{\*}.  To match a literal
+backslash, use @samp{\\}.
+
+@code{flags} controls various aspects of the matching process, and is a
+boolean OR of zero or more of the following values (defined in
+@code{<fnmatch.h>}):
+
+@table @code
+
+@item FNM_PATHNAME
+@itemx FNM_FILE_NAME
+@var{string} is assumed to be a path name.  No wildcard will ever match
+@code{/}.
+
+@item FNM_NOESCAPE
+Do not interpret backslashes as quoting the following special character.
+
+@item FNM_PERIOD
+A leading period (at the beginning of @var{string}, or if
+@code{FNM_PATHNAME} after a slash) is not matched by @code{*} or
+@code{?} but must be matched explicitly.
+
+@item FNM_LEADING_DIR
+Means that @var{string} also matches @var{pattern} if some initial part
+of @var{string} matches, and is followed by @code{/} and zero or more
+characters.  For example, @samp{foo*} would match either @samp{foobar}
+or @samp{foobar/grill}.
+
+@item FNM_CASEFOLD
+Ignores case when performing the comparison.
+
+@end table
+
+@end deftypefn
+
+@c fopen_unlocked.c:39
+@deftypefn Extension {FILE *} fopen_unlocked (const char *@var{path}, @
+  const char * @var{mode})
+
+Opens and returns a @code{FILE} pointer via @code{fopen}.  If the
+operating system supports it, ensure that the stream is setup to avoid
+any multi-threaded locking.  Otherwise return the @code{FILE} pointer
+unchanged.
+
+@end deftypefn
+
+@c argv.c:97
+@deftypefn Extension void freeargv (char **@var{vector})
+
+Free an argument vector that was built using @code{buildargv}.  Simply
+scans through @var{vector}, freeing the memory for each argument until
+the terminating @code{NULL} is found, and then frees @var{vector}
+itself.
+
+@end deftypefn
+
+@c fopen_unlocked.c:59
+@deftypefn Extension {FILE *} freopen_unlocked (const char * @var{path}, @
+  const char * @var{mode}, FILE * @var{stream})
+
+Opens and returns a @code{FILE} pointer via @code{freopen}.  If the
+operating system supports it, ensure that the stream is setup to avoid
+any multi-threaded locking.  Otherwise return the @code{FILE} pointer
+unchanged.
+
+@end deftypefn
+
+@c getruntime.c:82
+@deftypefn Replacement long get_run_time (void)
+
+Returns the time used so far, in microseconds.  If possible, this is
+the time used by this process, else it is the elapsed time since the
+process started.
+
+@end deftypefn
+
+@c getcwd.c:6
+@deftypefn Supplemental char* getcwd (char *@var{pathname}, int @var{len})
+
+Copy the absolute pathname for the current working directory into
+@var{pathname}, which is assumed to point to a buffer of at least
+@var{len} bytes, and return a pointer to the buffer.  If the current
+directory's path doesn't fit in @var{len} characters, the result is
+@code{NULL} and @code{errno} is set.  If @var{pathname} is a null pointer,
+@code{getcwd} will obtain @var{len} bytes of space using
+@code{malloc}.
+
+@end deftypefn
+
+@c getpagesize.c:5
+@deftypefn Supplemental int getpagesize (void)
+
+Returns the number of bytes in a page of memory.  This is the
+granularity of many of the system memory management routines.  No
+guarantee is made as to whether or not it is the same as the basic
+memory management hardware page size.
+
+@end deftypefn
+
+@c getpwd.c:5
+@deftypefn Supplemental char* getpwd (void)
+
+Returns the current working directory.  This implementation caches the
+result on the assumption that the process will not call @code{chdir}
+between calls to @code{getpwd}.
+
+@end deftypefn
+
+@c gettimeofday.c:12
+@deftypefn Supplemental int gettimeofday (struct timeval *@var{tp}, void *@var{tz})
+
+Writes the current time to @var{tp}.  This implementation requires
+that @var{tz} be NULL.  Returns 0 on success, -1 on failure.
+
+@end deftypefn
+
+@c hex.c:33
+@deftypefn Extension void hex_init (void)
+
+Initializes the array mapping the current character set to
+corresponding hex values.  This function must be called before any
+call to @code{hex_p} or @code{hex_value}.  If you fail to call it, a
+default ASCII-based table will normally be used on ASCII systems.
+
+@end deftypefn
+
+@c hex.c:42
+@deftypefn Extension int hex_p (int @var{c})
+
+Evaluates to non-zero if the given character is a valid hex character,
+or zero if it is not.  Note that the value you pass will be cast to
+@code{unsigned char} within the macro.
+
+@end deftypefn
+
+@c hex.c:50
+@deftypefn Extension {unsigned int} hex_value (int @var{c})
+
+Returns the numeric equivalent of the given character when interpreted
+as a hexadecimal digit.  The result is undefined if you pass an
+invalid hex digit.  Note that the value you pass will be cast to
+@code{unsigned char} within the macro.
+
+The @code{hex_value} macro returns @code{unsigned int}, rather than
+signed @code{int}, to make it easier to use in parsing addresses from
+hex dump files: a signed @code{int} would be sign-extended when
+converted to a wider unsigned type --- like @code{bfd_vma}, on some
+systems.
+
+@end deftypefn
+
+@c safe-ctype.c:25
+@defvr Extension HOST_CHARSET
+This macro indicates the basic character set and encoding used by the
+host: more precisely, the encoding used for character constants in
+preprocessor @samp{#if} statements (the C "execution character set").
+It is defined by @file{safe-ctype.h}, and will be an integer constant
+with one of the following values:
+
+@ftable @code
+@item HOST_CHARSET_UNKNOWN
+The host character set is unknown - that is, not one of the next two
+possibilities.
+
+@item HOST_CHARSET_ASCII
+The host character set is ASCII.
+
+@item HOST_CHARSET_EBCDIC
+The host character set is some variant of EBCDIC.  (Only one of the
+nineteen EBCDIC varying characters is tested; exercise caution.)
+@end ftable
+@end defvr
+
+@c hashtab.c:336
+@deftypefn Supplemental htab_t htab_create_typed_alloc (size_t @var{size}, @
+htab_hash @var{hash_f}, htab_eq @var{eq_f}, htab_del @var{del_f}, @
+htab_alloc @var{alloc_tab_f}, htab_alloc @var{alloc_f}, @
+htab_free @var{free_f})
+
+This function creates a hash table that uses two different allocators
+@var{alloc_tab_f} and @var{alloc_f} to use for allocating the table itself
+and its entries respectively.  This is useful when variables of different
+types need to be allocated with different allocators.
+
+The created hash table is slightly larger than @var{size} and it is
+initially empty (all the hash table entries are @code{HTAB_EMPTY_ENTRY}).
+The function returns the created hash table, or @code{NULL} if memory
+allocation fails.
+
+@end deftypefn
+
+@c index.c:5
+@deftypefn Supplemental char* index (char *@var{s}, int @var{c})
+
+Returns a pointer to the first occurrence of the character @var{c} in
+the string @var{s}, or @code{NULL} if not found.  The use of @code{index} is
+deprecated in new programs in favor of @code{strchr}.
+
+@end deftypefn
+
+@c insque.c:6
+@deftypefn Supplemental void insque (struct qelem *@var{elem}, @
+  struct qelem *@var{pred})
+@deftypefnx Supplemental void remque (struct qelem *@var{elem})
+
+Routines to manipulate queues built from doubly linked lists.  The
+@code{insque} routine inserts @var{elem} in the queue immediately
+after @var{pred}.  The @code{remque} routine removes @var{elem} from
+its containing queue.  These routines expect to be passed pointers to
+structures which have as their first members a forward pointer and a
+back pointer, like this prototype (although no prototype is provided):
+
+@example
+struct qelem @{
+  struct qelem *q_forw;
+  struct qelem *q_back;
+  char q_data[];
+@};
+@end example
+
+@end deftypefn
+
+@c safe-ctype.c:46
+@deffn  Extension ISALPHA  (@var{c})
+@deffnx Extension ISALNUM  (@var{c})
+@deffnx Extension ISBLANK  (@var{c})
+@deffnx Extension ISCNTRL  (@var{c})
+@deffnx Extension ISDIGIT  (@var{c})
+@deffnx Extension ISGRAPH  (@var{c})
+@deffnx Extension ISLOWER  (@var{c})
+@deffnx Extension ISPRINT  (@var{c})
+@deffnx Extension ISPUNCT  (@var{c})
+@deffnx Extension ISSPACE  (@var{c})
+@deffnx Extension ISUPPER  (@var{c})
+@deffnx Extension ISXDIGIT (@var{c})
+
+These twelve macros are defined by @file{safe-ctype.h}.  Each has the
+same meaning as the corresponding macro (with name in lowercase)
+defined by the standard header @file{ctype.h}.  For example,
+@code{ISALPHA} returns true for alphabetic characters and false for
+others.  However, there are two differences between these macros and
+those provided by @file{ctype.h}:
+
+@itemize @bullet
+@item These macros are guaranteed to have well-defined behavior for all 
+values representable by @code{signed char} and @code{unsigned char}, and
+for @code{EOF}.
+
+@item These macros ignore the current locale; they are true for these
+fixed sets of characters:
+@multitable {@code{XDIGIT}} {yada yada yada yada yada yada yada yada}
+@item @code{ALPHA}  @tab @kbd{A-Za-z}
+@item @code{ALNUM}  @tab @kbd{A-Za-z0-9}
+@item @code{BLANK}  @tab @kbd{space tab}
+@item @code{CNTRL}  @tab @code{!PRINT}
+@item @code{DIGIT}  @tab @kbd{0-9}
+@item @code{GRAPH}  @tab @code{ALNUM || PUNCT}
+@item @code{LOWER}  @tab @kbd{a-z}
+@item @code{PRINT}  @tab @code{GRAPH ||} @kbd{space}
+@item @code{PUNCT}  @tab @kbd{`~!@@#$%^&*()_-=+[@{]@}\|;:'",<.>/?}
+@item @code{SPACE}  @tab @kbd{space tab \n \r \f \v}
+@item @code{UPPER}  @tab @kbd{A-Z}
+@item @code{XDIGIT} @tab @kbd{0-9A-Fa-f}
+@end multitable
+
+Note that, if the host character set is ASCII or a superset thereof,
+all these macros will return false for all values of @code{char} outside
+the range of 7-bit ASCII.  In particular, both ISPRINT and ISCNTRL return
+false for characters with numeric values from 128 to 255.
+@end itemize
+@end deffn
+
+@c safe-ctype.c:95
+@deffn  Extension ISIDNUM         (@var{c})
+@deffnx Extension ISIDST          (@var{c})
+@deffnx Extension IS_VSPACE       (@var{c})
+@deffnx Extension IS_NVSPACE      (@var{c})
+@deffnx Extension IS_SPACE_OR_NUL (@var{c})
+@deffnx Extension IS_ISOBASIC     (@var{c})
+These six macros are defined by @file{safe-ctype.h} and provide
+additional character classes which are useful when doing lexical
+analysis of C or similar languages.  They are true for the following
+sets of characters:
+
+@multitable {@code{SPACE_OR_NUL}} {yada yada yada yada yada yada yada yada}
+@item @code{IDNUM}        @tab @kbd{A-Za-z0-9_}
+@item @code{IDST}         @tab @kbd{A-Za-z_}
+@item @code{VSPACE}       @tab @kbd{\r \n}
+@item @code{NVSPACE}      @tab @kbd{space tab \f \v \0}
+@item @code{SPACE_OR_NUL} @tab @code{VSPACE || NVSPACE}
+@item @code{ISOBASIC}     @tab @code{VSPACE || NVSPACE || PRINT}
+@end multitable
+@end deffn
+
+@c lbasename.c:23
+@deftypefn Replacement {const char*} lbasename (const char *@var{name})
+
+Given a pointer to a string containing a typical pathname
+(@samp{/usr/src/cmd/ls/ls.c} for example), returns a pointer to the
+last component of the pathname (@samp{ls.c} in this case).  The
+returned pointer is guaranteed to lie within the original
+string.  This latter fact is not true of many vendor C
+libraries, which return special strings or modify the passed
+strings for particular input.
+
+In particular, the empty string returns the same empty string,
+and a path ending in @code{/} returns the empty string after it.
+
+@end deftypefn
+
+@c lrealpath.c:25
+@deftypefn Replacement {const char*} lrealpath (const char *@var{name})
+
+Given a pointer to a string containing a pathname, returns a canonical
+version of the filename.  Symlinks will be resolved, and ``.'' and ``..''
+components will be simplified.  The returned value will be allocated using
+@code{malloc}, or @code{NULL} will be returned on a memory allocation error.
+
+@end deftypefn
+
+@c make-relative-prefix.c:24
+@deftypefn Extension {const char*} make_relative_prefix (const char *@var{progname}, @
+  const char *@var{bin_prefix}, const char *@var{prefix})
+
+Given three paths @var{progname}, @var{bin_prefix}, @var{prefix},
+return the path that is in the same position relative to
+@var{progname}'s directory as @var{prefix} is relative to
+@var{bin_prefix}.  That is, a string starting with the directory
+portion of @var{progname}, followed by a relative pathname of the
+difference between @var{bin_prefix} and @var{prefix}.
+
+If @var{progname} does not contain any directory separators,
+@code{make_relative_prefix} will search @env{PATH} to find a program
+named @var{progname}.  Also, if @var{progname} is a symbolic link,
+the symbolic link will be resolved.
+
+For example, if @var{bin_prefix} is @code{/alpha/beta/gamma/gcc/delta},
+@var{prefix} is @code{/alpha/beta/gamma/omega/}, and @var{progname} is
+@code{/red/green/blue/gcc}, then this function will return
+@code{/red/green/blue/../../omega/}.
+
+The return value is normally allocated via @code{malloc}.  If no
+relative prefix can be found, return @code{NULL}.
+
+@end deftypefn
+
+@c make-temp-file.c:174
+@deftypefn Replacement char* make_temp_file (const char *@var{suffix})
+
+Return a temporary file name (as a string) or @code{NULL} if unable to
+create one.  @var{suffix} is a suffix to append to the file name.  The
+string is @code{malloc}ed, and the temporary file has been created.
+
+@end deftypefn
+
+@c memchr.c:3
+@deftypefn Supplemental void* memchr (const void *@var{s}, int @var{c}, @
+  size_t @var{n})
+
+This function searches memory starting at @code{*@var{s}} for the
+character @var{c}.  The search only ends with the first occurrence of
+@var{c}, or after @var{length} characters; in particular, a null
+character does not terminate the search.  If the character @var{c} is
+found within @var{length} characters of @code{*@var{s}}, a pointer
+to the character is returned.  If @var{c} is not found, then @code{NULL} is
+returned.
+
+@end deftypefn
+
+@c memcmp.c:6
+@deftypefn Supplemental int memcmp (const void *@var{x}, const void *@var{y}, @
+  size_t @var{count})
+
+Compares the first @var{count} bytes of two areas of memory.  Returns
+zero if they are the same, a value less than zero if @var{x} is
+lexically less than @var{y}, or a value greater than zero if @var{x}
+is lexically greater than @var{y}.  Note that lexical order is determined
+as if comparing unsigned char arrays.
+
+@end deftypefn
+
+@c memcpy.c:6
+@deftypefn Supplemental void* memcpy (void *@var{out}, const void *@var{in}, @
+  size_t @var{length})
+
+Copies @var{length} bytes from memory region @var{in} to region
+@var{out}.  Returns a pointer to @var{out}.
+
+@end deftypefn
+
+@c memmem.c:20
+@deftypefn Supplemental void* memmem (const void *@var{haystack}, @
+  size_t @var{haystack_len} const void *@var{needle}, size_t @var{needle_len})
+
+Returns a pointer to the first occurrence of @var{needle} (length
+@var{needle_len}) in @var{haystack} (length @var{haystack_len}).
+Returns @code{NULL} if not found.
+
+@end deftypefn
+
+@c memmove.c:6
+@deftypefn Supplemental void* memmove (void *@var{from}, const void *@var{to}, @
+  size_t @var{count})
+
+Copies @var{count} bytes from memory area @var{from} to memory area
+@var{to}, returning a pointer to @var{to}.
+
+@end deftypefn
+
+@c mempcpy.c:23
+@deftypefn Supplemental void* mempcpy (void *@var{out}, const void *@var{in}, @
+  size_t @var{length})
+
+Copies @var{length} bytes from memory region @var{in} to region
+@var{out}.  Returns a pointer to @var{out} + @var{length}.
+
+@end deftypefn
+
+@c memset.c:6
+@deftypefn Supplemental void* memset (void *@var{s}, int @var{c}, @
+  size_t @var{count})
+
+Sets the first @var{count} bytes of @var{s} to the constant byte
+@var{c}, returning a pointer to @var{s}.
+
+@end deftypefn
+
+@c mkstemps.c:58
+@deftypefn Replacement int mkstemps (char *@var{pattern}, int @var{suffix_len})
+
+Generate a unique temporary file name from @var{pattern}.
+@var{pattern} has the form:
+
+@example
+   @var{path}/ccXXXXXX@var{suffix}
+@end example
+
+@var{suffix_len} tells us how long @var{suffix} is (it can be zero
+length).  The last six characters of @var{pattern} before @var{suffix}
+must be @samp{XXXXXX}; they are replaced with a string that makes the
+filename unique.  Returns a file descriptor open on the file for
+reading and writing.
+
+@end deftypefn
+
+@c pexecute.txh:278
+@deftypefn Extension void pex_free (struct pex_obj @var{obj})
+
+Clean up and free all data associated with @var{obj}.  If you have not
+yet called @code{pex_get_times} or @code{pex_get_status}, this will
+try to kill the subprocesses.
+
+@end deftypefn
+
+@c pexecute.txh:251
+@deftypefn Extension int pex_get_status (struct pex_obj *@var{obj}, @
+  int @var{count}, int *@var{vector})
+
+Returns the exit status of all programs run using @var{obj}.
+@var{count} is the number of results expected.  The results will be
+placed into @var{vector}.  The results are in the order of the calls
+to @code{pex_run}.  Returns 0 on error, 1 on success.
+
+@end deftypefn
+
+@c pexecute.txh:261
+@deftypefn Extension int pex_get_times (struct pex_obj *@var{obj}, @
+  int @var{count}, struct pex_time *@var{vector})
+
+Returns the process execution times of all programs run using
+@var{obj}.  @var{count} is the number of results expected.  The
+results will be placed into @var{vector}.  The results are in the
+order of the calls to @code{pex_run}.  Returns 0 on error, 1 on
+success.
+
+@code{struct pex_time} has the following fields of the type
+@code{unsigned long}: @code{user_seconds},
+@code{user_microseconds}, @code{system_seconds},
+@code{system_microseconds}.  On systems which do not support reporting
+process times, all the fields will be set to @code{0}.
+
+@end deftypefn
+
+@c pexecute.txh:2
+@deftypefn Extension {struct pex_obj *} pex_init (int @var{flags}, @
+  const char *@var{pname}, const char *@var{tempbase})
+
+Prepare to execute one or more programs, with standard output of each
+program fed to standard input of the next.  This is a system
+independent interface to execute a pipeline.
+
+@var{flags} is a bitwise combination of the following:
+
+@table @code
+
+@vindex PEX_RECORD_TIMES
+@item PEX_RECORD_TIMES
+Record subprocess times if possible.
+
+@vindex PEX_USE_PIPES
+@item PEX_USE_PIPES
+Use pipes for communication between processes, if possible.
+
+@vindex PEX_SAVE_TEMPS
+@item PEX_SAVE_TEMPS
+Don't delete temporary files used for communication between
+processes.
+
+@end table
+
+@var{pname} is the name of program to be executed, used in error
+messages.  @var{tempbase} is a base name to use for any required
+temporary files; it may be @code{NULL} to use a randomly chosen name.
+
+@end deftypefn
+
+@c pexecute.txh:161
+@deftypefn Extension {FILE *} pex_input_file (struct pex_obj *@var{obj}, @
+  int @var{flags}, const char *@var{in_name})
+
+Return a stream for a temporary file to pass to the first program in
+the pipeline as input.
+
+The name of the input file is chosen according to the same rules
+@code{pex_run} uses to choose output file names, based on
+@var{in_name}, @var{obj} and the @code{PEX_SUFFIX} bit in @var{flags}.
+
+Don't call @code{fclose} on the returned stream; the first call to
+@code{pex_run} closes it automatically.
+
+If @var{flags} includes @code{PEX_BINARY_OUTPUT}, open the stream in
+binary mode; otherwise, open it in the default mode.  Including
+@code{PEX_BINARY_OUTPUT} in @var{flags} has no effect on Unix.
+@end deftypefn
+
+@c pexecute.txh:179
+@deftypefn Extension {FILE *} pex_input_pipe (struct pex_obj *@var{obj}, @
+  int @var{binary})
+
+Return a stream @var{fp} for a pipe connected to the standard input of
+the first program in the pipeline; @var{fp} is opened for writing.
+You must have passed @code{PEX_USE_PIPES} to the @code{pex_init} call
+that returned @var{obj}.
+
+You must close @var{fp} using @code{fclose} yourself when you have
+finished writing data to the pipeline.
+
+The file descriptor underlying @var{fp} is marked not to be inherited
+by child processes.
+
+On systems that do not support pipes, this function returns
+@code{NULL}, and sets @code{errno} to @code{EINVAL}.  If you would
+like to write code that is portable to all systems the @code{pex}
+functions support, consider using @code{pex_input_file} instead.
+
+There are two opportunities for deadlock using
+@code{pex_input_pipe}:
+
+@itemize @bullet
+@item
+Most systems' pipes can buffer only a fixed amount of data; a process
+that writes to a full pipe blocks.  Thus, if you write to @file{fp}
+before starting the first process, you run the risk of blocking when
+there is no child process yet to read the data and allow you to
+continue.  @code{pex_input_pipe} makes no promises about the
+size of the pipe's buffer, so if you need to write any data at all
+before starting the first process in the pipeline, consider using
+@code{pex_input_file} instead.
+
+@item
+Using @code{pex_input_pipe} and @code{pex_read_output} together
+may also cause deadlock.  If the output pipe fills up, so that each
+program in the pipeline is waiting for the next to read more data, and
+you fill the input pipe by writing more data to @var{fp}, then there
+is no way to make progress: the only process that could read data from
+the output pipe is you, but you are blocked on the input pipe.
+
+@end itemize
+
+@end deftypefn
+
+@c pexecute.txh:286
+@deftypefn Extension {const char *} pex_one (int @var{flags}, @
+  const char *@var{executable}, char * const *@var{argv}, @
+  const char *@var{pname}, const char *@var{outname}, const char *@var{errname}, @
+  int *@var{status}, int *@var{err})
+
+An interface to permit the easy execution of a
+single program.  The return value and most of the parameters are as
+for a call to @code{pex_run}.  @var{flags} is restricted to a
+combination of @code{PEX_SEARCH}, @code{PEX_STDERR_TO_STDOUT}, and
+@code{PEX_BINARY_OUTPUT}.  @var{outname} is interpreted as if
+@code{PEX_LAST} were set.  On a successful return, @code{*@var{status}} will
+be set to the exit status of the program.
+
+@end deftypefn
+
+@c pexecute.txh:237
+@deftypefn Extension {FILE *} pex_read_err (struct pex_obj *@var{obj}, @
+  int @var{binary})
+
+Returns a @code{FILE} pointer which may be used to read the standard
+error of the last program in the pipeline.  When this is used,
+@code{PEX_LAST} should not be used in a call to @code{pex_run}.  After
+this is called, @code{pex_run} may no longer be called with the same
+@var{obj}.  @var{binary} should be non-zero if the file should be
+opened in binary mode.  Don't call @code{fclose} on the returned file;
+it will be closed by @code{pex_free}.
+
+@end deftypefn
+
+@c pexecute.txh:224
+@deftypefn Extension {FILE *} pex_read_output (struct pex_obj *@var{obj}, @
+  int @var{binary})
+
+Returns a @code{FILE} pointer which may be used to read the standard
+output of the last program in the pipeline.  When this is used,
+@code{PEX_LAST} should not be used in a call to @code{pex_run}.  After
+this is called, @code{pex_run} may no longer be called with the same
+@var{obj}.  @var{binary} should be non-zero if the file should be
+opened in binary mode.  Don't call @code{fclose} on the returned file;
+it will be closed by @code{pex_free}.
+
+@end deftypefn
+
+@c pexecute.txh:34
+@deftypefn Extension {const char *} pex_run (struct pex_obj *@var{obj}, @
+  int @var{flags}, const char *@var{executable}, char * const *@var{argv}, @
+  const char *@var{outname}, const char *@var{errname}, int *@var{err})
+
+Execute one program in a pipeline.  On success this returns
+@code{NULL}.  On failure it returns an error message, a statically
+allocated string.
+
+@var{obj} is returned by a previous call to @code{pex_init}.
+
+@var{flags} is a bitwise combination of the following:
+
+@table @code
+
+@vindex PEX_LAST
+@item PEX_LAST
+This must be set on the last program in the pipeline.  In particular,
+it should be set when executing a single program.  The standard output
+of the program will be sent to @var{outname}, or, if @var{outname} is
+@code{NULL}, to the standard output of the calling program.  Do @emph{not}
+set this bit if you want to call @code{pex_read_output}
+(described below).  After a call to @code{pex_run} with this bit set,
+@var{pex_run} may no longer be called with the same @var{obj}.
+
+@vindex PEX_SEARCH
+@item PEX_SEARCH
+Search for the program using the user's executable search path.
+
+@vindex PEX_SUFFIX
+@item PEX_SUFFIX
+@var{outname} is a suffix.  See the description of @var{outname},
+below.
+
+@vindex PEX_STDERR_TO_STDOUT
+@item PEX_STDERR_TO_STDOUT
+Send the program's standard error to standard output, if possible.
+
+@vindex PEX_BINARY_INPUT
+@vindex PEX_BINARY_OUTPUT
+@vindex PEX_BINARY_ERROR
+@item PEX_BINARY_INPUT
+@itemx PEX_BINARY_OUTPUT
+@itemx PEX_BINARY_ERROR
+The standard input (output or error) of the program should be read (written) in
+binary mode rather than text mode.  These flags are ignored on systems
+which do not distinguish binary mode and text mode, such as Unix.  For
+proper behavior these flags should match appropriately---a call to
+@code{pex_run} using @code{PEX_BINARY_OUTPUT} should be followed by a
+call using @code{PEX_BINARY_INPUT}.
+
+@vindex PEX_STDERR_TO_PIPE
+@item PEX_STDERR_TO_PIPE
+Send the program's standard error to a pipe, if possible.  This flag
+cannot be specified together with @code{PEX_STDERR_TO_STDOUT}.  This
+flag can be specified only on the last program in pipeline.
+
+@end table
+
+@var{executable} is the program to execute.  @var{argv} is the set of
+arguments to pass to the program; normally @code{@var{argv}[0]} will
+be a copy of @var{executable}.
+
+@var{outname} is used to set the name of the file to use for standard
+output.  There are two cases in which no output file will be used:
+
+@enumerate
+@item
+if @code{PEX_LAST} is not set in @var{flags}, and @code{PEX_USE_PIPES}
+was set in the call to @code{pex_init}, and the system supports pipes
+
+@item
+if @code{PEX_LAST} is set in @var{flags}, and @var{outname} is
+@code{NULL}
+@end enumerate
+
+@noindent
+Otherwise the code will use a file to hold standard
+output.  If @code{PEX_LAST} is not set, this file is considered to be
+a temporary file, and it will be removed when no longer needed, unless
+@code{PEX_SAVE_TEMPS} was set in the call to @code{pex_init}.
+
+There are two cases to consider when setting the name of the file to
+hold standard output.
+
+@enumerate
+@item
+@code{PEX_SUFFIX} is set in @var{flags}.  In this case
+@var{outname} may not be @code{NULL}.  If the @var{tempbase} parameter
+to @code{pex_init} was not @code{NULL}, then the output file name is
+the concatenation of @var{tempbase} and @var{outname}.  If
+@var{tempbase} was @code{NULL}, then the output file name is a random
+file name ending in @var{outname}.
+
+@item
+@code{PEX_SUFFIX} was not set in @var{flags}.  In this
+case, if @var{outname} is not @code{NULL}, it is used as the output
+file name.  If @var{outname} is @code{NULL}, and @var{tempbase} was
+not NULL, the output file name is randomly chosen using
+@var{tempbase}.  Otherwise the output file name is chosen completely
+at random.
+@end enumerate
+
+@var{errname} is the file name to use for standard error output.  If
+it is @code{NULL}, standard error is the same as the caller's.
+Otherwise, standard error is written to the named file.
+
+On an error return, the code sets @code{*@var{err}} to an @code{errno}
+value, or to 0 if there is no relevant @code{errno}.
+
+@end deftypefn
+
+@c pexecute.txh:145
+@deftypefn Extension {const char *} pex_run_in_environment (struct pex_obj *@var{obj}, @
+  int @var{flags}, const char *@var{executable}, char * const *@var{argv}, @
+  char * const *@var{env}, int @var{env_size}, const char *@var{outname}, @
+  const char *@var{errname}, int *@var{err})
+
+Execute one program in a pipeline, permitting the environment for the
+program to be specified.  Behaviour and parameters not listed below are
+as for @code{pex_run}.
+
+@var{env} is the environment for the child process, specified as an array of
+character pointers.  Each element of the array should point to a string of the
+form @code{VAR=VALUE}, with the exception of the last element that must be
+@code{NULL}.
+
+@end deftypefn
+
+@c pexecute.txh:301
+@deftypefn Extension int pexecute (const char *@var{program}, @
+  char * const *@var{argv}, const char *@var{this_pname}, @
+  const char *@var{temp_base}, char **@var{errmsg_fmt}, @
+  char **@var{errmsg_arg}, int @var{flags})
+
+This is the old interface to execute one or more programs.  It is
+still supported for compatibility purposes, but is no longer
+documented.
+
+@end deftypefn
+
+@c strsignal.c:541
+@deftypefn Supplemental void psignal (int @var{signo}, char *@var{message})
+
+Print @var{message} to the standard error, followed by a colon,
+followed by the description of the signal specified by @var{signo},
+followed by a newline.
+
+@end deftypefn
+
+@c putenv.c:21
+@deftypefn Supplemental int putenv (const char *@var{string})
+
+Uses @code{setenv} or @code{unsetenv} to put @var{string} into
+the environment or remove it.  If @var{string} is of the form
+@samp{name=value} the string is added; if no @samp{=} is present the
+name is unset/removed.
+
+@end deftypefn
+
+@c pexecute.txh:312
+@deftypefn Extension int pwait (int @var{pid}, int *@var{status}, int @var{flags})
+
+Another part of the old execution interface.
+
+@end deftypefn
+
+@c random.c:39
+@deftypefn Supplement {long int} random (void)
+@deftypefnx Supplement void srandom (unsigned int @var{seed})
+@deftypefnx Supplement void* initstate (unsigned int @var{seed}, @
+  void *@var{arg_state}, unsigned long @var{n})
+@deftypefnx Supplement void* setstate (void *@var{arg_state})
+
+Random number functions.  @code{random} returns a random number in the
+range 0 to @code{LONG_MAX}.  @code{srandom} initializes the random
+number generator to some starting point determined by @var{seed}
+(else, the values returned by @code{random} are always the same for each
+run of the program).  @code{initstate} and @code{setstate} allow fine-grained
+control over the state of the random number generator.
+
+@end deftypefn
+
+@c concat.c:174
+@deftypefn Extension char* reconcat (char *@var{optr}, const char *@var{s1}, @
+  @dots{}, @code{NULL})
+
+Same as @code{concat}, except that if @var{optr} is not @code{NULL} it
+is freed after the string is created.  This is intended to be useful
+when you're extending an existing string or building up a string in a
+loop:
+
+@example
+  str = reconcat (str, "pre-", str, NULL);
+@end example
+
+@end deftypefn
+
+@c rename.c:6
+@deftypefn Supplemental int rename (const char *@var{old}, const char *@var{new})
+
+Renames a file from @var{old} to @var{new}.  If @var{new} already
+exists, it is removed.
+
+@end deftypefn
+
+@c rindex.c:5
+@deftypefn Supplemental char* rindex (const char *@var{s}, int @var{c})
+
+Returns a pointer to the last occurrence of the character @var{c} in
+the string @var{s}, or @code{NULL} if not found.  The use of @code{rindex} is
+deprecated in new programs in favor of @code{strrchr}.
+
+@end deftypefn
+
+@c setenv.c:23
+@deftypefn Supplemental int setenv (const char *@var{name}, @
+  const char *@var{value}, int @var{overwrite})
+@deftypefnx Supplemental void unsetenv (const char *@var{name})
+
+@code{setenv} adds @var{name} to the environment with value
+@var{value}.  If the name was already present in the environment,
+the new value will be stored only if @var{overwrite} is nonzero.
+The companion @code{unsetenv} function removes @var{name} from the
+environment.  This implementation is not safe for multithreaded code.
+
+@end deftypefn
+
+@c setproctitle.c:31
+@deftypefn Supplemental void setproctitle (const char *@var{fmt}, ...)
+
+Set the title of a process to @var{fmt}. va args not supported for now,
+but defined for compatibility with BSD. 
+
+@end deftypefn
+
+@c strsignal.c:348
+@deftypefn Extension int signo_max (void)
+
+Returns the maximum signal value for which a corresponding symbolic
+name or message is available.  Note that in the case where we use the
+@code{sys_siglist} supplied by the system, it is possible for there to
+be more symbolic names than messages, or vice versa.  In fact, the
+manual page for @code{psignal(3b)} explicitly warns that one should
+check the size of the table (@code{NSIG}) before indexing it, since
+new signal codes may be added to the system before they are added to
+the table.  Thus @code{NSIG} might be smaller than value implied by
+the largest signo value defined in @code{<signal.h>}.
+
+We return the maximum value that can be used to obtain a meaningful
+symbolic name or message.
+
+@end deftypefn
+
+@c sigsetmask.c:8
+@deftypefn Supplemental int sigsetmask (int @var{set})
+
+Sets the signal mask to the one provided in @var{set} and returns
+the old mask (which, for libiberty's implementation, will always
+be the value @code{1}).
+
+@end deftypefn
+
+@c simple-object.txh:96
+@deftypefn Extension {const char *} simple_object_attributes_compare @
+  (simple_object_attributes *@var{attrs1}, simple_object_attributes *@var{attrs2}, @
+   int *@var{err})
+
+Compare @var{attrs1} and @var{attrs2}.  If they could be linked
+together without error, return @code{NULL}.  Otherwise, return an
+error message and set @code{*@var{err}} to an errno value or @code{0}
+if there is no relevant errno.
+
+@end deftypefn
+
+@c simple-object.txh:81
+@deftypefn Extension {simple_object_attributes *} simple_object_fetch_attributes @
+  (simple_object_read *@var{simple_object}, const char **@var{errmsg}, int *@var{err})
+
+Fetch the attributes of @var{simple_object}.  The attributes are
+internal information such as the format of the object file, or the
+architecture it was compiled for.  This information will persist until
+@code{simple_object_attributes_release} is called, even if
+@var{simple_object} itself is released.
+
+On error this returns @code{NULL}, sets @code{*@var{errmsg}} to an
+error message, and sets @code{*@var{err}} to an errno value or
+@code{0} if there is no relevant errno.
+
+@end deftypefn
+
+@c simple-object.txh:49
+@deftypefn Extension {int} simple_object_find_section @
+  (simple_object_read *@var{simple_object} off_t *@var{offset}, @
+  off_t *@var{length}, const char **@var{errmsg}, int *@var{err})
+
+Look for the section @var{name} in @var{simple_object}.  This returns
+information for the first section with that name.
+
+If found, return 1 and set @code{*@var{offset}} to the offset in the
+file of the section contents and set @code{*@var{length}} to the
+length of the section contents.  The value in @code{*@var{offset}}
+will be relative to the offset passed to
+@code{simple_object_open_read}.
+
+If the section is not found, and no error occurs,
+@code{simple_object_find_section} returns @code{0} and set
+@code{*@var{errmsg}} to @code{NULL}.
+
+If an error occurs, @code{simple_object_find_section} returns
+@code{0}, sets @code{*@var{errmsg}} to an error message, and sets
+@code{*@var{err}} to an errno value or @code{0} if there is no
+relevant errno.
+
+@end deftypefn
+
+@c simple-object.txh:27
+@deftypefn Extension {const char *} simple_object_find_sections @
+  (simple_object_read *@var{simple_object}, int (*@var{pfn}) (void *@var{data}, @
+  const char *@var{name}, off_t @var{offset}, off_t @var{length}), @
+  void *@var{data}, int *@var{err})
+
+This function calls @var{pfn} for each section in @var{simple_object}.
+It calls @var{pfn} with the section name, the offset within the file
+of the section contents, and the length of the section contents.  The
+offset within the file is relative to the offset passed to
+@code{simple_object_open_read}.  The @var{data} argument to this
+function is passed along to @var{pfn}.
+
+If @var{pfn} returns @code{0}, the loop over the sections stops and
+@code{simple_object_find_sections} returns.  If @var{pfn} returns some
+other value, the loop continues.
+
+On success @code{simple_object_find_sections} returns.  On error it
+returns an error string, and sets @code{*@var{err}} to an errno value
+or @code{0} if there is no relevant errno.
+
+@end deftypefn
+
+@c simple-object.txh:2
+@deftypefn Extension {simple_object_read *} simple_object_open_read @
+  (int @var{descriptor}, off_t @var{offset}, const char *{segment_name}, @
+  const char **@var{errmsg}, int *@var{err})
+
+Opens an object file for reading.  Creates and returns an
+@code{simple_object_read} pointer which may be passed to other
+functions to extract data from the object file.
+
+@var{descriptor} holds a file descriptor which permits reading.
+
+@var{offset} is the offset into the file; this will be @code{0} in the
+normal case, but may be a different value when reading an object file
+in an archive file.
+
+@var{segment_name} is only used with the Mach-O file format used on
+Darwin aka Mac OS X.  It is required on that platform, and means to
+only look at sections within the segment with that name.  The
+parameter is ignored on other systems.
+
+If an error occurs, this functions returns @code{NULL} and sets
+@code{*@var{errmsg}} to an error string and sets @code{*@var{err}} to
+an errno value or @code{0} if there is no relevant errno.
+
+@end deftypefn
+
+@c simple-object.txh:107
+@deftypefn Extension {void} simple_object_release_attributes @
+  (simple_object_attributes *@var{attrs})
+
+Release all resources associated with @var{attrs}.
+
+@end deftypefn
+
+@c simple-object.txh:73
+@deftypefn Extension {void} simple_object_release_read @
+  (simple_object_read *@var{simple_object})
+
+Release all resources associated with @var{simple_object}.  This does
+not close the file descriptor.
+
+@end deftypefn
+
+@c simple-object.txh:184
+@deftypefn Extension {void} simple_object_release_write @
+  (simple_object_write *@var{simple_object})
+
+Release all resources associated with @var{simple_object}.
+
+@end deftypefn
+
+@c simple-object.txh:114
+@deftypefn Extension {simple_object_write *} simple_object_start_write @
+  (simple_object_attributes @var{attrs}, const char *@var{segment_name}, @
+  const char **@var{errmsg}, int *@var{err})
+
+Start creating a new object file using the object file format
+described in @var{attrs}.  You must fetch attribute information from
+an existing object file before you can create a new one.  There is
+currently no support for creating an object file de novo.
+
+@var{segment_name} is only used with Mach-O as found on Darwin aka Mac
+OS X.  The parameter is required on that target.  It means that all
+sections are created within the named segment.  It is ignored for
+other object file formats.
+
+On error @code{simple_object_start_write} returns @code{NULL}, sets
+@code{*@var{ERRMSG}} to an error message, and sets @code{*@var{err}}
+to an errno value or @code{0} if there is no relevant errno.
+
+@end deftypefn
+
+@c simple-object.txh:153
+@deftypefn Extension {const char *} simple_object_write_add_data @
+  (simple_object_write *@var{simple_object}, @
+  simple_object_write_section *@var{section}, const void *@var{buffer}, @
+  size_t @var{size}, int @var{copy}, int *@var{err})
+
+Add data @var{buffer}/@var{size} to @var{section} in
+@var{simple_object}.  If @var{copy} is non-zero, the data will be
+copied into memory if necessary.  If @var{copy} is zero, @var{buffer}
+must persist until @code{simple_object_write_to_file} is called.  is
+released.
+
+On success this returns @code{NULL}.  On error this returns an error
+message, and sets @code{*@var{err}} to an errno value or 0 if there is
+no relevant erro.
+
+@end deftypefn
+
+@c simple-object.txh:134
+@deftypefn Extension {simple_object_write_section *} simple_object_write_create_section @
+  (simple_object_write *@var{simple_object}, const char *@var{name}, @
+  unsigned int @var{align}, const char **@var{errmsg}, int *@var{err})
+
+Add a section to @var{simple_object}.  @var{name} is the name of the
+new section.  @var{align} is the required alignment expressed as the
+number of required low-order 0 bits (e.g., 2 for alignment to a 32-bit
+boundary).
+
+The section is created as containing data, readable, not writable, not
+executable, not loaded at runtime.  The section is not written to the
+file until @code{simple_object_write_to_file} is called.
+
+On error this returns @code{NULL}, sets @code{*@var{errmsg}} to an
+error message, and sets @code{*@var{err}} to an errno value or
+@code{0} if there is no relevant errno.
+
+@end deftypefn
+
+@c simple-object.txh:170
+@deftypefn Extension {const char *} simple_object_write_to_file @
+  (simple_object_write *@var{simple_object}, int @var{descriptor}, int *@var{err})
+
+Write the complete object file to @var{descriptor}, an open file
+descriptor.  This writes out all the data accumulated by calls to
+@code{simple_object_write_create_section} and
+@var{simple_object_write_add_data}.
+
+This returns @code{NULL} on success.  On error this returns an error
+message and sets @code{*@var{err}} to an errno value or @code{0} if
+there is no relevant errno.
+
+@end deftypefn
+
+@c snprintf.c:28
+@deftypefn Supplemental int snprintf (char *@var{buf}, size_t @var{n}, @
+  const char *@var{format}, ...)
+
+This function is similar to @code{sprintf}, but it will write to
+@var{buf} at most @code{@var{n}-1} bytes of text, followed by a
+terminating null byte, for a total of @var{n} bytes.
+On error the return value is -1, otherwise it returns the number of
+bytes, not including the terminating null byte, that would have been
+written had @var{n} been sufficiently large, regardless of the actual
+value of @var{n}.  Note some pre-C99 system libraries do not implement
+this correctly so users cannot generally rely on the return value if
+the system version of this function is used.
+
+@end deftypefn
+
+@c spaces.c:22
+@deftypefn Extension char* spaces (int @var{count})
+
+Returns a pointer to a memory region filled with the specified
+number of spaces and null terminated.  The returned pointer is
+valid until at least the next call.
+
+@end deftypefn
+
+@c splay-tree.c:303
+@deftypefn Supplemental splay_tree splay_tree_new_with_typed_alloc @
+(splay_tree_compare_fn @var{compare_fn}, @
+splay_tree_delete_key_fn @var{delete_key_fn}, @
+splay_tree_delete_value_fn @var{delete_value_fn}, @
+splay_tree_allocate_fn @var{tree_allocate_fn}, @
+splay_tree_allocate_fn @var{node_allocate_fn}, @
+splay_tree_deallocate_fn @var{deallocate_fn}, @
+void * @var{allocate_data})
+
+This function creates a splay tree that uses two different allocators
+@var{tree_allocate_fn} and @var{node_allocate_fn} to use for allocating the
+tree itself and its nodes respectively.  This is useful when variables of
+different types need to be allocated with different allocators.
+
+The splay tree will use @var{compare_fn} to compare nodes,
+@var{delete_key_fn} to deallocate keys, and @var{delete_value_fn} to
+deallocate values.
+
+@end deftypefn
+
+@c stpcpy.c:23
+@deftypefn Supplemental char* stpcpy (char *@var{dst}, const char *@var{src})
+
+Copies the string @var{src} into @var{dst}.  Returns a pointer to
+@var{dst} + strlen(@var{src}).
+
+@end deftypefn
+
+@c stpncpy.c:23
+@deftypefn Supplemental char* stpncpy (char *@var{dst}, const char *@var{src}, @
+  size_t @var{len})
+
+Copies the string @var{src} into @var{dst}, copying exactly @var{len}
+and padding with zeros if necessary.  If @var{len} < strlen(@var{src})
+then return @var{dst} + @var{len}, otherwise returns @var{dst} +
+strlen(@var{src}).
+
+@end deftypefn
+
+@c strcasecmp.c:15
+@deftypefn Supplemental int strcasecmp (const char *@var{s1}, const char *@var{s2})
+
+A case-insensitive @code{strcmp}.
+
+@end deftypefn
+
+@c strchr.c:6
+@deftypefn Supplemental char* strchr (const char *@var{s}, int @var{c})
+
+Returns a pointer to the first occurrence of the character @var{c} in
+the string @var{s}, or @code{NULL} if not found.  If @var{c} is itself the
+null character, the results are undefined.
+
+@end deftypefn
+
+@c strdup.c:3
+@deftypefn Supplemental char* strdup (const char *@var{s})
+
+Returns a pointer to a copy of @var{s} in memory obtained from
+@code{malloc}, or @code{NULL} if insufficient memory was available.
+
+@end deftypefn
+
+@c strerror.c:670
+@deftypefn Replacement {const char*} strerrno (int @var{errnum})
+
+Given an error number returned from a system call (typically returned
+in @code{errno}), returns a pointer to a string containing the
+symbolic name of that error number, as found in @code{<errno.h>}.
+
+If the supplied error number is within the valid range of indices for
+symbolic names, but no name is available for the particular error
+number, then returns the string @samp{Error @var{num}}, where @var{num}
+is the error number.
+
+If the supplied error number is not within the range of valid
+indices, then returns @code{NULL}.
+
+The contents of the location pointed to are only guaranteed to be
+valid until the next call to @code{strerrno}.
+
+@end deftypefn
+
+@c strerror.c:603
+@deftypefn Supplemental char* strerror (int @var{errnoval})
+
+Maps an @code{errno} number to an error message string, the contents
+of which are implementation defined.  On systems which have the
+external variables @code{sys_nerr} and @code{sys_errlist}, these
+strings will be the same as the ones used by @code{perror}.
+
+If the supplied error number is within the valid range of indices for
+the @code{sys_errlist}, but no message is available for the particular
+error number, then returns the string @samp{Error @var{num}}, where
+@var{num} is the error number.
+
+If the supplied error number is not a valid index into
+@code{sys_errlist}, returns @code{NULL}.
+
+The returned string is only guaranteed to be valid only until the
+next call to @code{strerror}.
+
+@end deftypefn
+
+@c strncasecmp.c:15
+@deftypefn Supplemental int strncasecmp (const char *@var{s1}, const char *@var{s2})
+
+A case-insensitive @code{strncmp}.
+
+@end deftypefn
+
+@c strncmp.c:6
+@deftypefn Supplemental int strncmp (const char *@var{s1}, @
+  const char *@var{s2}, size_t @var{n})
+
+Compares the first @var{n} bytes of two strings, returning a value as
+@code{strcmp}.
+
+@end deftypefn
+
+@c strndup.c:23
+@deftypefn Extension char* strndup (const char *@var{s}, size_t @var{n})
+
+Returns a pointer to a copy of @var{s} with at most @var{n} characters
+in memory obtained from @code{malloc}, or @code{NULL} if insufficient
+memory was available.  The result is always NUL terminated.
+
+@end deftypefn
+
+@c strrchr.c:6
+@deftypefn Supplemental char* strrchr (const char *@var{s}, int @var{c})
+
+Returns a pointer to the last occurrence of the character @var{c} in
+the string @var{s}, or @code{NULL} if not found.  If @var{c} is itself the
+null character, the results are undefined.
+
+@end deftypefn
+
+@c strsignal.c:383
+@deftypefn Supplemental {const char *} strsignal (int @var{signo})
+
+Maps an signal number to an signal message string, the contents of
+which are implementation defined.  On systems which have the external
+variable @code{sys_siglist}, these strings will be the same as the
+ones used by @code{psignal()}.
+
+If the supplied signal number is within the valid range of indices for
+the @code{sys_siglist}, but no message is available for the particular
+signal number, then returns the string @samp{Signal @var{num}}, where
+@var{num} is the signal number.
+
+If the supplied signal number is not a valid index into
+@code{sys_siglist}, returns @code{NULL}.
+
+The returned string is only guaranteed to be valid only until the next
+call to @code{strsignal}.
+
+@end deftypefn
+
+@c strsignal.c:448
+@deftypefn Extension {const char*} strsigno (int @var{signo})
+
+Given an signal number, returns a pointer to a string containing the
+symbolic name of that signal number, as found in @code{<signal.h>}.
+
+If the supplied signal number is within the valid range of indices for
+symbolic names, but no name is available for the particular signal
+number, then returns the string @samp{Signal @var{num}}, where
+@var{num} is the signal number.
+
+If the supplied signal number is not within the range of valid
+indices, then returns @code{NULL}.
+
+The contents of the location pointed to are only guaranteed to be
+valid until the next call to @code{strsigno}.
+
+@end deftypefn
+
+@c strstr.c:6
+@deftypefn Supplemental char* strstr (const char *@var{string}, const char *@var{sub})
+
+This function searches for the substring @var{sub} in the string
+@var{string}, not including the terminating null characters.  A pointer
+to the first occurrence of @var{sub} is returned, or @code{NULL} if the
+substring is absent.  If @var{sub} points to a string with zero
+length, the function returns @var{string}.
+
+@end deftypefn
+
+@c strtod.c:27
+@deftypefn Supplemental double strtod (const char *@var{string}, @
+  char **@var{endptr})
+
+This ISO C function converts the initial portion of @var{string} to a
+@code{double}.  If @var{endptr} is not @code{NULL}, a pointer to the
+character after the last character used in the conversion is stored in
+the location referenced by @var{endptr}.  If no conversion is
+performed, zero is returned and the value of @var{string} is stored in
+the location referenced by @var{endptr}.
+
+@end deftypefn
+
+@c strerror.c:729
+@deftypefn Extension int strtoerrno (const char *@var{name})
+
+Given the symbolic name of a error number (e.g., @code{EACCES}), map it
+to an errno value.  If no translation is found, returns 0.
+
+@end deftypefn
+
+@c strtol.c:33
+@deftypefn Supplemental {long int} strtol (const char *@var{string}, @
+  char **@var{endptr}, int @var{base})
+@deftypefnx Supplemental {unsigned long int} strtoul (const char *@var{string}, @
+  char **@var{endptr}, int @var{base})
+
+The @code{strtol} function converts the string in @var{string} to a
+long integer value according to the given @var{base}, which must be
+between 2 and 36 inclusive, or be the special value 0.  If @var{base}
+is 0, @code{strtol} will look for the prefixes @code{0} and @code{0x}
+to indicate bases 8 and 16, respectively, else default to base 10.
+When the base is 16 (either explicitly or implicitly), a prefix of
+@code{0x} is allowed.  The handling of @var{endptr} is as that of
+@code{strtod} above.  The @code{strtoul} function is the same, except
+that the converted value is unsigned.
+
+@end deftypefn
+
+@c strsignal.c:502
+@deftypefn Extension int strtosigno (const char *@var{name})
+
+Given the symbolic name of a signal, map it to a signal number.  If no
+translation is found, returns 0.
+
+@end deftypefn
+
+@c strverscmp.c:25
+@deftypefun int strverscmp (const char *@var{s1}, const char *@var{s2})
+The @code{strverscmp} function compares the string @var{s1} against
+@var{s2}, considering them as holding indices/version numbers.  Return
+value follows the same conventions as found in the @code{strverscmp}
+function.  In fact, if @var{s1} and @var{s2} contain no digits,
+@code{strverscmp} behaves like @code{strcmp}.
+
+Basically, we compare strings normally (character by character), until
+we find a digit in each string - then we enter a special comparison
+mode, where each sequence of digits is taken as a whole.  If we reach the
+end of these two parts without noticing a difference, we return to the
+standard comparison mode.  There are two types of numeric parts:
+"integral" and "fractional" (those  begin with a '0'). The types
+of the numeric parts affect the way we sort them:
+
+@itemize @bullet
+@item
+integral/integral: we compare values as you would expect.
+
+@item
+fractional/integral: the fractional part is less than the integral one.
+Again, no surprise.
+
+@item
+fractional/fractional: the things become a bit more complex.
+If the common prefix contains only leading zeroes, the longest part is less
+than the other one; else the comparison behaves normally.
+@end itemize
+
+@smallexample
+strverscmp ("no digit", "no digit")
+    @result{} 0    // @r{same behavior as strcmp.}
+strverscmp ("item#99", "item#100")
+    @result{} <0   // @r{same prefix, but 99 < 100.}
+strverscmp ("alpha1", "alpha001")
+    @result{} >0   // @r{fractional part inferior to integral one.}
+strverscmp ("part1_f012", "part1_f01")
+    @result{} >0   // @r{two fractional parts.}
+strverscmp ("foo.009", "foo.0")
+    @result{} <0   // @r{idem, but with leading zeroes only.}
+@end smallexample
+
+This function is especially useful when dealing with filename sorting,
+because filenames frequently hold indices/version numbers.
+@end deftypefun
+
+@c tmpnam.c:3
+@deftypefn Supplemental char* tmpnam (char *@var{s})
+
+This function attempts to create a name for a temporary file, which
+will be a valid file name yet not exist when @code{tmpnam} checks for
+it.  @var{s} must point to a buffer of at least @code{L_tmpnam} bytes,
+or be @code{NULL}.  Use of this function creates a security risk, and it must
+not be used in new projects.  Use @code{mkstemp} instead.
+
+@end deftypefn
+
+@c unlink-if-ordinary.c:27
+@deftypefn Supplemental int unlink_if_ordinary (const char*)
+
+Unlinks the named file, unless it is special (e.g. a device file).
+Returns 0 when the file was unlinked, a negative value (and errno set) when
+there was an error deleting the file, and a positive value if no attempt
+was made to unlink the file because it is special.
+
+@end deftypefn
+
+@c fopen_unlocked.c:31
+@deftypefn Extension void unlock_std_streams (void)
+
+If the OS supports it, ensure that the standard I/O streams,
+@code{stdin}, @code{stdout} and @code{stderr} are setup to avoid any
+multi-threaded locking.  Otherwise do nothing.
+
+@end deftypefn
+
+@c fopen_unlocked.c:23
+@deftypefn Extension void unlock_stream (FILE * @var{stream})
+
+If the OS supports it, ensure that the supplied stream is setup to
+avoid any multi-threaded locking.  Otherwise leave the @code{FILE}
+pointer unchanged.  If the @var{stream} is @code{NULL} do nothing.
+
+@end deftypefn
+
+@c vasprintf.c:47
+@deftypefn Extension int vasprintf (char **@var{resptr}, @
+  const char *@var{format}, va_list @var{args})
+
+Like @code{vsprintf}, but instead of passing a pointer to a buffer,
+you pass a pointer to a pointer.  This function will compute the size
+of the buffer needed, allocate memory with @code{malloc}, and store a
+pointer to the allocated memory in @code{*@var{resptr}}.  The value
+returned is the same as @code{vsprintf} would return.  If memory could
+not be allocated, minus one is returned and @code{NULL} is stored in
+@code{*@var{resptr}}.
+
+@end deftypefn
+
+@c vfork.c:6
+@deftypefn Supplemental int vfork (void)
+
+Emulates @code{vfork} by calling @code{fork} and returning its value.
+
+@end deftypefn
+
+@c vprintf.c:3
+@deftypefn Supplemental int vprintf (const char *@var{format}, va_list @var{ap})
+@deftypefnx Supplemental int vfprintf (FILE *@var{stream}, @
+  const char *@var{format}, va_list @var{ap})
+@deftypefnx Supplemental int vsprintf (char *@var{str}, @
+  const char *@var{format}, va_list @var{ap})
+
+These functions are the same as @code{printf}, @code{fprintf}, and
+@code{sprintf}, respectively, except that they are called with a
+@code{va_list} instead of a variable number of arguments.  Note that
+they do not call @code{va_end}; this is the application's
+responsibility.  In @libib{} they are implemented in terms of the
+nonstandard but common function @code{_doprnt}.
+
+@end deftypefn
+
+@c vsnprintf.c:28
+@deftypefn Supplemental int vsnprintf (char *@var{buf}, size_t @var{n}, @
+  const char *@var{format}, va_list @var{ap})
+
+This function is similar to @code{vsprintf}, but it will write to
+@var{buf} at most @code{@var{n}-1} bytes of text, followed by a
+terminating null byte, for a total of @var{n} bytes.  On error the
+return value is -1, otherwise it returns the number of characters that
+would have been printed had @var{n} been sufficiently large,
+regardless of the actual value of @var{n}.  Note some pre-C99 system
+libraries do not implement this correctly so users cannot generally
+rely on the return value if the system version of this function is
+used.
+
+@end deftypefn
+
+@c waitpid.c:3
+@deftypefn Supplemental int waitpid (int @var{pid}, int *@var{status}, int)
+
+This is a wrapper around the @code{wait} function.  Any ``special''
+values of @var{pid} depend on your implementation of @code{wait}, as
+does the return value.  The third argument is unused in @libib{}.
+
+@end deftypefn
+
+@c argv.c:306
+@deftypefn Extension int writeargv (const char **@var{argv}, FILE *@var{file})
+
+Write each member of ARGV, handling all necessary quoting, to the file
+named by FILE, separated by whitespace.  Return 0 on success, non-zero
+if an error occurred while writing to FILE.
+
+@end deftypefn
+
+@c xatexit.c:11
+@deftypefun int xatexit (void (*@var{fn}) (void))
+
+Behaves as the standard @code{atexit} function, but with no limit on
+the number of registered functions.  Returns 0 on success, or @minus{}1 on
+failure.  If you use @code{xatexit} to register functions, you must use
+@code{xexit} to terminate your program.
+
+@end deftypefun
+
+@c xmalloc.c:38
+@deftypefn Replacement void* xcalloc (size_t @var{nelem}, size_t @var{elsize})
+
+Allocate memory without fail, and set it to zero.  This routine functions
+like @code{calloc}, but will behave the same as @code{xmalloc} if memory
+cannot be found.
+
+@end deftypefn
+
+@c xexit.c:22
+@deftypefn Replacement void xexit (int @var{code})
+
+Terminates the program.  If any functions have been registered with
+the @code{xatexit} replacement function, they will be called first.
+Termination is handled via the system's normal @code{exit} call.
+
+@end deftypefn
+
+@c xmalloc.c:22
+@deftypefn Replacement void* xmalloc (size_t)
+
+Allocate memory without fail.  If @code{malloc} fails, this will print
+a message to @code{stderr} (using the name set by
+@code{xmalloc_set_program_name},
+if any) and then call @code{xexit}.  Note that it is therefore safe for
+a program to contain @code{#define malloc xmalloc} in its source.
+
+@end deftypefn
+
+@c xmalloc.c:53
+@deftypefn Replacement void xmalloc_failed (size_t)
+
+This function is not meant to be called by client code, and is listed
+here for completeness only.  If any of the allocation routines fail, this
+function will be called to print an error message and terminate execution.
+
+@end deftypefn
+
+@c xmalloc.c:46
+@deftypefn Replacement void xmalloc_set_program_name (const char *@var{name})
+
+You can use this to set the name of the program used by
+@code{xmalloc_failed} when printing a failure message.
+
+@end deftypefn
+
+@c xmemdup.c:7
+@deftypefn Replacement void* xmemdup (void *@var{input}, @
+  size_t @var{copy_size}, size_t @var{alloc_size})
+
+Duplicates a region of memory without fail.  First, @var{alloc_size} bytes
+are allocated, then @var{copy_size} bytes from @var{input} are copied into
+it, and the new memory is returned.  If fewer bytes are copied than were
+allocated, the remaining memory is zeroed.
+
+@end deftypefn
+
+@c xmalloc.c:32
+@deftypefn Replacement void* xrealloc (void *@var{ptr}, size_t @var{size})
+Reallocate memory without fail.  This routine functions like @code{realloc},
+but will behave the same as @code{xmalloc} if memory cannot be found.
+
+@end deftypefn
+
+@c xstrdup.c:7
+@deftypefn Replacement char* xstrdup (const char *@var{s})
+
+Duplicates a character string without fail, using @code{xmalloc} to
+obtain memory.
+
+@end deftypefn
+
+@c xstrerror.c:7
+@deftypefn Replacement char* xstrerror (int @var{errnum})
+
+Behaves exactly like the standard @code{strerror} function, but
+will never return a @code{NULL} pointer.
+
+@end deftypefn
+
+@c xstrndup.c:23
+@deftypefn Replacement char* xstrndup (const char *@var{s}, size_t @var{n})
+
+Returns a pointer to a copy of @var{s} with at most @var{n} characters
+without fail, using @code{xmalloc} to obtain memory.  The result is
+always NUL terminated.
+
+@end deftypefn
+
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/gather-docs sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/gather-docs
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/gather-docs	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/gather-docs	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,128 @@
+#!/usr/bin/perl
+# -*- perl -*-
+
+#   Copyright (C) 2001, 2009, 2011
+#   Free Software Foundation
+#
+# This file is part of the libiberty library.
+# Libiberty is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# Libiberty 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
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with libiberty; see the file COPYING.LIB.  If not,
+# write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+# Boston, MA 02110-1301, USA.
+#
+# Originally written by DJ Delorie <dj@redhat.com>
+
+
+
+# This program looks for texinfo snippets in source files and other
+# files, and builds per-category files with entries sorted in
+# alphabetical order.
+
+# The syntax it looks for is lines starting with '@def' in *.c and
+# other files (see TEXIFILES in Makefile.in).  Entries are terminated
+# at the next @def* (which begins a new entry) or, for C files, a line
+# that begins with '*/' without leading spaces (this assumes that the
+# texinfo snippet is within a C-style /* */ comment).
+
+# 
+
+
+
+if ($ARGV[0] eq "-v") {
+    $verbose = 1;
+    shift;
+}
+
+$srcdir = shift;
+$outfile = shift;
+
+if ($outfile !~ /\S/ || ! -f "$srcdir/Makefile.in" ) {
+    print STDERR "Usage: gather-docs [-v] srcdir outfile.txi [files with snippets in them ...]\n";
+    exit 1;
+}
+
+$errors = 0;
+
+for $in (@ARGV) {
+
+    if (!open(IN, "$srcdir/$in")) {
+	print STDERR "Cannot open $srcdir/$in for reading: $!\n";
+	$errors ++;
+
+    } else {
+	$first = 1;
+	$pertinent = 0;
+	$man_mode = 0;
+	$line = 0;
+
+	while (<IN>) {
+	    $line ++;
+	    $pertinent = 1 if /^\@def[a-z]*[a-wyz] /;
+	    $pertinent = 0 if /^\*\//;
+	    next unless $pertinent;
+
+	    if (/^\@def[a-z]*[a-wyz] /) {
+		
+		($name) = m/[^\(]* ([^\( \t\r\n\@]+) *(\(|\@?$)/;
+		$name =~ s/[	 ]*\@?$//;
+		$key = $name;
+		$key =~ tr/A-Z/a-z/;
+		$key =~ s/[^a-z0-9]+/ /g;
+		$name{$key} = $node;
+		$lines{$key} = '';
+		$src_file{$key} = $in;
+		$src_line{$key} = $line;
+		print "\nReading $in :" if $verbose && $first;
+		$first = 0;
+		print " $name" if $verbose;
+		$node_lines{$key} .= $_;
+
+	    } else {
+		$node_lines{$key} .= $_;
+	    }
+
+	    $pertinent = 0 if /^\@end def/;
+	}
+	close (IN);
+    }
+}
+
+print "\n" if $verbose;
+exit $errors if $errors;
+
+if (!open (OUT, "> $outfile")) {
+    print STDERR "Cannot open $outfile for writing: $!\n";
+    $errors ++;
+    next;
+}
+print "Writing $outfile\n" if $verbose;
+
+print OUT "\@c Automatically generated from *.c and others (the comments before\n";
+print OUT "\@c each entry tell you which file and where in that file).  DO NOT EDIT!\n";
+print OUT "\@c Edit the *.c files, configure with --enable-maintainer-mode,\n";
+print OUT "\@c run 'make stamp-functions' and gather-docs will build a new copy.\n\n";
+
+for $key (sort keys %name) {
+    print OUT "\@c $src_file{$key}:$src_line{$key}\n";
+    print OUT $node_lines{$key};
+    print OUT "\n";
+}
+
+if (! print OUT "\n") {
+    print STDERR "Disk full writing $srcdir/$cat.texi\n";
+    $errors ++;
+}
+
+close (OUT);
+
+exit $errors;
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/getcwd.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/getcwd.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/getcwd.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/getcwd.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,62 @@
+/* Emulate getcwd using getwd.
+   This function is in the public domain. */
+
+/*
+
+@deftypefn Supplemental char* getcwd (char *@var{pathname}, int @var{len})
+
+Copy the absolute pathname for the current working directory into
+@var{pathname}, which is assumed to point to a buffer of at least
+@var{len} bytes, and return a pointer to the buffer.  If the current
+directory's path doesn't fit in @var{len} characters, the result is
+@code{NULL} and @code{errno} is set.  If @var{pathname} is a null pointer,
+@code{getcwd} will obtain @var{len} bytes of space using
+@code{malloc}.
+
+@end deftypefn
+
+*/
+
+#include "config.h"
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#include <errno.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+extern char *getwd ();
+extern int errno;
+
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 1024
+#endif
+
+char *
+getcwd (char *buf, size_t len)
+{
+  char ourbuf[MAXPATHLEN];
+  char *result;
+
+  result = getwd (ourbuf);
+  if (result) {
+    if (strlen (ourbuf) >= len) {
+      errno = ERANGE;
+      return 0;
+    }
+    if (!buf) {
+       buf = (char*)malloc(len);
+       if (!buf) {
+           errno = ENOMEM;
+	   return 0;
+       }
+    }
+    strcpy (buf, ourbuf);
+  }
+  return buf;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/getopt.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/getopt.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/getopt.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/getopt.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1052 @@
+/* Getopt for GNU.
+   NOTE: getopt is now part of the C library, so if you don't know what
+   "Keep this file name-space clean" means, talk to drepper@gnu.org
+   before changing it!
+
+   Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+   1996, 1997, 1998, 2005 Free Software Foundation, Inc.
+
+   NOTE: This source is derived from an old version taken from the GNU C
+   Library (glibc).
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
+   Ditto for AIX 3.2 and <stdlib.h>.  */
+#ifndef _NO_PROTO
+# define _NO_PROTO
+#endif
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if !defined __STDC__ || !__STDC__
+/* This is a separate conditional since some stdc systems
+   reject `defined (const)'.  */
+# ifndef const
+#  define const
+# endif
+#endif
+
+#include "ansidecl.h"
+#include <stdio.h>
+
+/* Comment out all this code if we are using the GNU C Library, and are not
+   actually compiling the library itself.  This code is part of the GNU C
+   Library, but also included in many other GNU distributions.  Compiling
+   and linking in this code is a waste when using the GNU C library
+   (especially if it is a shared library).  Rather than having every GNU
+   program understand `configure --with-gnu-libc' and omit the object files,
+   it is simpler to just do this in the source for each such file.  */
+
+#define GETOPT_INTERFACE_VERSION 2
+#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
+# include <gnu-versions.h>
+# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
+#  define ELIDE_CODE
+# endif
+#endif
+
+#ifndef ELIDE_CODE
+
+
+/* This needs to come after some library #include
+   to get __GNU_LIBRARY__ defined.  */
+#ifdef	__GNU_LIBRARY__
+/* Don't include stdlib.h for non-GNU C libraries because some of them
+   contain conflicting prototypes for getopt.  */
+# include <stdlib.h>
+# include <unistd.h>
+#endif	/* GNU C library.  */
+
+#ifdef VMS
+# include <unixlib.h>
+# if HAVE_STRING_H - 0
+#  include <string.h>
+# endif
+#endif
+
+#ifndef _
+/* This is for other GNU distributions with internationalized messages.
+   When compiling libc, the _ macro is predefined.  */
+# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
+#  include <libintl.h>
+#  define _(msgid)	gettext (msgid)
+# else
+#  define _(msgid)	(msgid)
+# endif
+#endif
+
+/* This version of `getopt' appears to the caller like standard Unix `getopt'
+   but it behaves differently for the user, since it allows the user
+   to intersperse the options with the other arguments.
+
+   As `getopt' works, it permutes the elements of ARGV so that,
+   when it is done, all the options precede everything else.  Thus
+   all application programs are extended to handle flexible argument order.
+
+   Setting the environment variable POSIXLY_CORRECT disables permutation.
+   Then the behavior is completely standard.
+
+   GNU application programs can use a third alternative mode in which
+   they can distinguish the relative order of options and other arguments.  */
+
+#include "getopt.h"
+
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when `ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
+
+char *optarg = NULL;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to `getopt'.
+
+   On entry to `getopt', zero means this is the first call; initialize.
+
+   When `getopt' returns -1, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, `optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+/* 1003.2 says this must be 1 before any call.  */
+int optind = 1;
+
+/* Formerly, initialization of getopt depended on optind==0, which
+   causes problems with re-calling getopt as programs generally don't
+   know that. */
+
+int __getopt_initialized = 0;
+
+/* The next char to be scanned in the option-element
+   in which the last option character we returned was found.
+   This allows us to pick up the scan where we left off.
+
+   If this is zero, or a null string, it means resume the scan
+   by advancing to the next ARGV-element.  */
+
+static char *nextchar;
+
+/* Callers store zero here to inhibit the error message
+   for unrecognized options.  */
+
+int opterr = 1;
+
+/* Set to an option character which was unrecognized.
+   This must be initialized on some systems to avoid linking in the
+   system's own getopt implementation.  */
+
+int optopt = '?';
+
+/* Describe how to deal with options that follow non-option ARGV-elements.
+
+   If the caller did not specify anything,
+   the default is REQUIRE_ORDER if the environment variable
+   POSIXLY_CORRECT is defined, PERMUTE otherwise.
+
+   REQUIRE_ORDER means don't recognize them as options;
+   stop option processing when the first non-option is seen.
+   This is what Unix does.
+   This mode of operation is selected by either setting the environment
+   variable POSIXLY_CORRECT, or using `+' as the first character
+   of the list of option characters.
+
+   PERMUTE is the default.  We permute the contents of ARGV as we scan,
+   so that eventually all the non-options are at the end.  This allows options
+   to be given in any order, even with programs that were not written to
+   expect this.
+
+   RETURN_IN_ORDER is an option available to programs that were written
+   to expect options and other ARGV-elements in any order and that care about
+   the ordering of the two.  We describe each non-option ARGV-element
+   as if it were the argument of an option with character code 1.
+   Using `-' as the first character of the list of option characters
+   selects this mode of operation.
+
+   The special argument `--' forces an end of option-scanning regardless
+   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
+   `--' can cause `getopt' to return -1 with `optind' != ARGC.  */
+
+static enum
+{
+  REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
+} ordering;
+
+/* Value of POSIXLY_CORRECT environment variable.  */
+static char *posixly_correct;
+
+#ifdef	__GNU_LIBRARY__
+/* We want to avoid inclusion of string.h with non-GNU libraries
+   because there are many ways it can cause trouble.
+   On some systems, it contains special magic macros that don't work
+   in GCC.  */
+# include <string.h>
+# define my_index	strchr
+#else
+
+# if HAVE_STRING_H
+#  include <string.h>
+# else
+#  if HAVE_STRINGS_H
+#   include <strings.h>
+#  endif
+# endif
+
+/* Avoid depending on library functions or files
+   whose names are inconsistent.  */
+
+#if HAVE_STDLIB_H && HAVE_DECL_GETENV
+#  include <stdlib.h>
+#elif !defined(getenv)
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+extern char *getenv (const char *);
+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */
+#endif
+
+static char *
+my_index (const char *str, int chr)
+{
+  while (*str)
+    {
+      if (*str == chr)
+	return (char *) str;
+      str++;
+    }
+  return 0;
+}
+
+/* If using GCC, we can safely declare strlen this way.
+   If not using GCC, it is ok not to declare it.  */
+#ifdef __GNUC__
+/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
+   That was relevant to code that was here before.  */
+# if (!defined __STDC__ || !__STDC__) && !defined strlen
+/* gcc with -traditional declares the built-in strlen to return int,
+   and has done so at least since version 2.4.5. -- rms.  */
+extern int strlen (const char *);
+# endif /* not __STDC__ */
+#endif /* __GNUC__ */
+
+#endif /* not __GNU_LIBRARY__ */
+
+/* Handle permutation of arguments.  */
+
+/* Describe the part of ARGV that contains non-options that have
+   been skipped.  `first_nonopt' is the index in ARGV of the first of them;
+   `last_nonopt' is the index after the last of them.  */
+
+static int first_nonopt;
+static int last_nonopt;
+
+#ifdef _LIBC
+/* Bash 2.0 gives us an environment variable containing flags
+   indicating ARGV elements that should not be considered arguments.  */
+
+/* Defined in getopt_init.c  */
+extern char *__getopt_nonoption_flags;
+
+static int nonoption_flags_max_len;
+static int nonoption_flags_len;
+
+static int original_argc;
+static char *const *original_argv;
+
+/* Make sure the environment variable bash 2.0 puts in the environment
+   is valid for the getopt call we must make sure that the ARGV passed
+   to getopt is that one passed to the process.  */
+static void
+__attribute__ ((unused))
+store_args_and_env (int argc, char *const *argv)
+{
+  /* XXX This is no good solution.  We should rather copy the args so
+     that we can compare them later.  But we must not use malloc(3).  */
+  original_argc = argc;
+  original_argv = argv;
+}
+# ifdef text_set_element
+text_set_element (__libc_subinit, store_args_and_env);
+# endif /* text_set_element */
+
+# define SWAP_FLAGS(ch1, ch2) \
+  if (nonoption_flags_len > 0)						      \
+    {									      \
+      char __tmp = __getopt_nonoption_flags[ch1];			      \
+      __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2];	      \
+      __getopt_nonoption_flags[ch2] = __tmp;				      \
+    }
+#else	/* !_LIBC */
+# define SWAP_FLAGS(ch1, ch2)
+#endif	/* _LIBC */
+
+/* Exchange two adjacent subsequences of ARGV.
+   One subsequence is elements [first_nonopt,last_nonopt)
+   which contains all the non-options that have been skipped so far.
+   The other is elements [last_nonopt,optind), which contains all
+   the options processed since those non-options were skipped.
+
+   `first_nonopt' and `last_nonopt' are relocated so that they describe
+   the new indices of the non-options in ARGV after they are moved.  */
+
+#if defined __STDC__ && __STDC__
+static void exchange (char **);
+#endif
+
+static void
+exchange (char **argv)
+{
+  int bottom = first_nonopt;
+  int middle = last_nonopt;
+  int top = optind;
+  char *tem;
+
+  /* Exchange the shorter segment with the far end of the longer segment.
+     That puts the shorter segment into the right place.
+     It leaves the longer segment in the right place overall,
+     but it consists of two parts that need to be swapped next.  */
+
+#ifdef _LIBC
+  /* First make sure the handling of the `__getopt_nonoption_flags'
+     string can work normally.  Our top argument must be in the range
+     of the string.  */
+  if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len)
+    {
+      /* We must extend the array.  The user plays games with us and
+	 presents new arguments.  */
+      char *new_str = (char *) malloc (top + 1);
+      if (new_str == NULL)
+	nonoption_flags_len = nonoption_flags_max_len = 0;
+      else
+	{
+	  memset (mempcpy (new_str, __getopt_nonoption_flags,
+			   nonoption_flags_max_len),
+		  '\0', top + 1 - nonoption_flags_max_len);
+	  nonoption_flags_max_len = top + 1;
+	  __getopt_nonoption_flags = new_str;
+	}
+    }
+#endif
+
+  while (top > middle && middle > bottom)
+    {
+      if (top - middle > middle - bottom)
+	{
+	  /* Bottom segment is the short one.  */
+	  int len = middle - bottom;
+	  register int i;
+
+	  /* Swap it with the top part of the top segment.  */
+	  for (i = 0; i < len; i++)
+	    {
+	      tem = argv[bottom + i];
+	      argv[bottom + i] = argv[top - (middle - bottom) + i];
+	      argv[top - (middle - bottom) + i] = tem;
+	      SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
+	    }
+	  /* Exclude the moved bottom segment from further swapping.  */
+	  top -= len;
+	}
+      else
+	{
+	  /* Top segment is the short one.  */
+	  int len = top - middle;
+	  register int i;
+
+	  /* Swap it with the bottom part of the bottom segment.  */
+	  for (i = 0; i < len; i++)
+	    {
+	      tem = argv[bottom + i];
+	      argv[bottom + i] = argv[middle + i];
+	      argv[middle + i] = tem;
+	      SWAP_FLAGS (bottom + i, middle + i);
+	    }
+	  /* Exclude the moved top segment from further swapping.  */
+	  bottom += len;
+	}
+    }
+
+  /* Update records for the slots the non-options now occupy.  */
+
+  first_nonopt += (optind - last_nonopt);
+  last_nonopt = optind;
+}
+
+/* Initialize the internal data when the first call is made.  */
+
+#if defined __STDC__ && __STDC__
+static const char *_getopt_initialize (int, char *const *, const char *);
+#endif
+static const char *
+_getopt_initialize (int argc ATTRIBUTE_UNUSED,
+		    char *const *argv ATTRIBUTE_UNUSED,
+		    const char *optstring)
+{
+  /* Start processing options with ARGV-element 1 (since ARGV-element 0
+     is the program name); the sequence of previously skipped
+     non-option ARGV-elements is empty.  */
+
+  first_nonopt = last_nonopt = optind;
+
+  nextchar = NULL;
+
+  posixly_correct = getenv ("POSIXLY_CORRECT");
+
+  /* Determine how to handle the ordering of options and nonoptions.  */
+
+  if (optstring[0] == '-')
+    {
+      ordering = RETURN_IN_ORDER;
+      ++optstring;
+    }
+  else if (optstring[0] == '+')
+    {
+      ordering = REQUIRE_ORDER;
+      ++optstring;
+    }
+  else if (posixly_correct != NULL)
+    ordering = REQUIRE_ORDER;
+  else
+    ordering = PERMUTE;
+
+#ifdef _LIBC
+  if (posixly_correct == NULL
+      && argc == original_argc && argv == original_argv)
+    {
+      if (nonoption_flags_max_len == 0)
+	{
+	  if (__getopt_nonoption_flags == NULL
+	      || __getopt_nonoption_flags[0] == '\0')
+	    nonoption_flags_max_len = -1;
+	  else
+	    {
+	      const char *orig_str = __getopt_nonoption_flags;
+	      int len = nonoption_flags_max_len = strlen (orig_str);
+	      if (nonoption_flags_max_len < argc)
+		nonoption_flags_max_len = argc;
+	      __getopt_nonoption_flags =
+		(char *) malloc (nonoption_flags_max_len);
+	      if (__getopt_nonoption_flags == NULL)
+		nonoption_flags_max_len = -1;
+	      else
+		memset (mempcpy (__getopt_nonoption_flags, orig_str, len),
+			'\0', nonoption_flags_max_len - len);
+	    }
+	}
+      nonoption_flags_len = nonoption_flags_max_len;
+    }
+  else
+    nonoption_flags_len = 0;
+#endif
+
+  return optstring;
+}
+
+/* Scan elements of ARGV (whose length is ARGC) for option characters
+   given in OPTSTRING.
+
+   If an element of ARGV starts with '-', and is not exactly "-" or "--",
+   then it is an option element.  The characters of this element
+   (aside from the initial '-') are option characters.  If `getopt'
+   is called repeatedly, it returns successively each of the option characters
+   from each of the option elements.
+
+   If `getopt' finds another option character, it returns that character,
+   updating `optind' and `nextchar' so that the next call to `getopt' can
+   resume the scan with the following option character or ARGV-element.
+
+   If there are no more option characters, `getopt' returns -1.
+   Then `optind' is the index in ARGV of the first ARGV-element
+   that is not an option.  (The ARGV-elements have been permuted
+   so that those that are not options now come last.)
+
+   OPTSTRING is a string containing the legitimate option characters.
+   If an option character is seen that is not listed in OPTSTRING,
+   return '?' after printing an error message.  If you set `opterr' to
+   zero, the error message is suppressed but we still return '?'.
+
+   If a char in OPTSTRING is followed by a colon, that means it wants an arg,
+   so the following text in the same ARGV-element, or the text of the following
+   ARGV-element, is returned in `optarg'.  Two colons mean an option that
+   wants an optional arg; if there is text in the current ARGV-element,
+   it is returned in `optarg', otherwise `optarg' is set to zero.
+
+   If OPTSTRING starts with `-' or `+', it requests different methods of
+   handling the non-option ARGV-elements.
+   See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
+
+   Long-named options begin with `--' instead of `-'.
+   Their names may be abbreviated as long as the abbreviation is unique
+   or is an exact match for some defined option.  If they have an
+   argument, it follows the option name in the same ARGV-element, separated
+   from the option name by a `=', or else the in next ARGV-element.
+   When `getopt' finds a long-named option, it returns 0 if that option's
+   `flag' field is nonzero, the value of the option's `val' field
+   if the `flag' field is zero.
+
+   The elements of ARGV aren't really const, because we permute them.
+   But we pretend they're const in the prototype to be compatible
+   with other systems.
+
+   LONGOPTS is a vector of `struct option' terminated by an
+   element containing a name which is zero.
+
+   LONGIND returns the index in LONGOPT of the long-named option found.
+   It is only valid when a long-named option has been found by the most
+   recent call.
+
+   If LONG_ONLY is nonzero, '-' as well as '--' can introduce
+   long-named options.  */
+
+int
+_getopt_internal (int argc, char *const *argv, const char *optstring,
+                  const struct option *longopts,
+                  int *longind, int long_only)
+{
+  optarg = NULL;
+
+  if (optind == 0 || !__getopt_initialized)
+    {
+      if (optind == 0)
+	optind = 1;	/* Don't scan ARGV[0], the program name.  */
+      optstring = _getopt_initialize (argc, argv, optstring);
+      __getopt_initialized = 1;
+    }
+
+  /* Test whether ARGV[optind] points to a non-option argument.
+     Either it does not have option syntax, or there is an environment flag
+     from the shell indicating it is not an option.  The later information
+     is only used when the used in the GNU libc.  */
+#ifdef _LIBC
+# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'	      \
+		      || (optind < nonoption_flags_len			      \
+			  && __getopt_nonoption_flags[optind] == '1'))
+#else
+# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
+#endif
+
+  if (nextchar == NULL || *nextchar == '\0')
+    {
+      /* Advance to the next ARGV-element.  */
+
+      /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
+	 moved back by the user (who may also have changed the arguments).  */
+      if (last_nonopt > optind)
+	last_nonopt = optind;
+      if (first_nonopt > optind)
+	first_nonopt = optind;
+
+      if (ordering == PERMUTE)
+	{
+	  /* If we have just processed some options following some non-options,
+	     exchange them so that the options come first.  */
+
+	  if (first_nonopt != last_nonopt && last_nonopt != optind)
+	    exchange ((char **) argv);
+	  else if (last_nonopt != optind)
+	    first_nonopt = optind;
+
+	  /* Skip any additional non-options
+	     and extend the range of non-options previously skipped.  */
+
+	  while (optind < argc && NONOPTION_P)
+	    optind++;
+	  last_nonopt = optind;
+	}
+
+      /* The special ARGV-element `--' means premature end of options.
+	 Skip it like a null option,
+	 then exchange with previous non-options as if it were an option,
+	 then skip everything else like a non-option.  */
+
+      if (optind != argc && !strcmp (argv[optind], "--"))
+	{
+	  optind++;
+
+	  if (first_nonopt != last_nonopt && last_nonopt != optind)
+	    exchange ((char **) argv);
+	  else if (first_nonopt == last_nonopt)
+	    first_nonopt = optind;
+	  last_nonopt = argc;
+
+	  optind = argc;
+	}
+
+      /* If we have done all the ARGV-elements, stop the scan
+	 and back over any non-options that we skipped and permuted.  */
+
+      if (optind == argc)
+	{
+	  /* Set the next-arg-index to point at the non-options
+	     that we previously skipped, so the caller will digest them.  */
+	  if (first_nonopt != last_nonopt)
+	    optind = first_nonopt;
+	  return -1;
+	}
+
+      /* If we have come to a non-option and did not permute it,
+	 either stop the scan or describe it to the caller and pass it by.  */
+
+      if (NONOPTION_P)
+	{
+	  if (ordering == REQUIRE_ORDER)
+	    return -1;
+	  optarg = argv[optind++];
+	  return 1;
+	}
+
+      /* We have found another option-ARGV-element.
+	 Skip the initial punctuation.  */
+
+      nextchar = (argv[optind] + 1
+		  + (longopts != NULL && argv[optind][1] == '-'));
+    }
+
+  /* Decode the current option-ARGV-element.  */
+
+  /* Check whether the ARGV-element is a long option.
+
+     If long_only and the ARGV-element has the form "-f", where f is
+     a valid short option, don't consider it an abbreviated form of
+     a long option that starts with f.  Otherwise there would be no
+     way to give the -f short option.
+
+     On the other hand, if there's a long option "fubar" and
+     the ARGV-element is "-fu", do consider that an abbreviation of
+     the long option, just like "--fu", and not "-f" with arg "u".
+
+     This distinction seems to be the most useful approach.  */
+
+  if (longopts != NULL
+      && (argv[optind][1] == '-'
+	  || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1])))))
+    {
+      char *nameend;
+      const struct option *p;
+      const struct option *pfound = NULL;
+      int exact = 0;
+      int ambig = 0;
+      int indfound = -1;
+      int option_index;
+
+      for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
+	/* Do nothing.  */ ;
+
+      /* Test all long options for either exact match
+	 or abbreviated matches.  */
+      for (p = longopts, option_index = 0; p->name; p++, option_index++)
+	if (!strncmp (p->name, nextchar, nameend - nextchar))
+	  {
+	    if ((unsigned int) (nameend - nextchar)
+		== (unsigned int) strlen (p->name))
+	      {
+		/* Exact match found.  */
+		pfound = p;
+		indfound = option_index;
+		exact = 1;
+		break;
+	      }
+	    else if (pfound == NULL)
+	      {
+		/* First nonexact match found.  */
+		pfound = p;
+		indfound = option_index;
+	      }
+	    else
+	      /* Second or later nonexact match found.  */
+	      ambig = 1;
+	  }
+
+      if (ambig && !exact)
+	{
+	  if (opterr)
+	    fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
+		     argv[0], argv[optind]);
+	  nextchar += strlen (nextchar);
+	  optind++;
+	  optopt = 0;
+	  return '?';
+	}
+
+      if (pfound != NULL)
+	{
+	  option_index = indfound;
+	  optind++;
+	  if (*nameend)
+	    {
+	      /* Don't test has_arg with >, because some C compilers don't
+		 allow it to be used on enums.  */
+	      if (pfound->has_arg)
+		optarg = nameend + 1;
+	      else
+		{
+		  if (opterr)
+		    {
+		      if (argv[optind - 1][1] == '-')
+			/* --option */
+			fprintf (stderr,
+				 _("%s: option `--%s' doesn't allow an argument\n"),
+				 argv[0], pfound->name);
+		      else
+			/* +option or -option */
+			fprintf (stderr,
+				 _("%s: option `%c%s' doesn't allow an argument\n"),
+				 argv[0], argv[optind - 1][0], pfound->name);
+
+		      nextchar += strlen (nextchar);
+
+		      optopt = pfound->val;
+		      return '?';
+		    }
+		}
+	    }
+	  else if (pfound->has_arg == 1)
+	    {
+	      if (optind < argc)
+		optarg = argv[optind++];
+	      else
+		{
+		  if (opterr)
+		    fprintf (stderr,
+			   _("%s: option `%s' requires an argument\n"),
+			   argv[0], argv[optind - 1]);
+		  nextchar += strlen (nextchar);
+		  optopt = pfound->val;
+		  return optstring[0] == ':' ? ':' : '?';
+		}
+	    }
+	  nextchar += strlen (nextchar);
+	  if (longind != NULL)
+	    *longind = option_index;
+	  if (pfound->flag)
+	    {
+	      *(pfound->flag) = pfound->val;
+	      return 0;
+	    }
+	  return pfound->val;
+	}
+
+      /* Can't find it as a long option.  If this is not getopt_long_only,
+	 or the option starts with '--' or is not a valid short
+	 option, then it's an error.
+	 Otherwise interpret it as a short option.  */
+      if (!long_only || argv[optind][1] == '-'
+	  || my_index (optstring, *nextchar) == NULL)
+	{
+	  if (opterr)
+	    {
+	      if (argv[optind][1] == '-')
+		/* --option */
+		fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
+			 argv[0], nextchar);
+	      else
+		/* +option or -option */
+		fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
+			 argv[0], argv[optind][0], nextchar);
+	    }
+	  nextchar = (char *) "";
+	  optind++;
+	  optopt = 0;
+	  return '?';
+	}
+    }
+
+  /* Look at and handle the next short option-character.  */
+
+  {
+    char c = *nextchar++;
+    char *temp = my_index (optstring, c);
+
+    /* Increment `optind' when we start to process its last character.  */
+    if (*nextchar == '\0')
+      ++optind;
+
+    if (temp == NULL || c == ':')
+      {
+	if (opterr)
+	  {
+	    if (posixly_correct)
+	      /* 1003.2 specifies the format of this message.  */
+	      fprintf (stderr, _("%s: illegal option -- %c\n"),
+		       argv[0], c);
+	    else
+	      fprintf (stderr, _("%s: invalid option -- %c\n"),
+		       argv[0], c);
+	  }
+	optopt = c;
+	return '?';
+      }
+    /* Convenience. Treat POSIX -W foo same as long option --foo */
+    if (temp[0] == 'W' && temp[1] == ';')
+      {
+	char *nameend;
+	const struct option *p;
+	const struct option *pfound = NULL;
+	int exact = 0;
+	int ambig = 0;
+	int indfound = 0;
+	int option_index;
+
+	/* This is an option that requires an argument.  */
+	if (*nextchar != '\0')
+	  {
+	    optarg = nextchar;
+	    /* If we end this ARGV-element by taking the rest as an arg,
+	       we must advance to the next element now.  */
+	    optind++;
+	  }
+	else if (optind == argc)
+	  {
+	    if (opterr)
+	      {
+		/* 1003.2 specifies the format of this message.  */
+		fprintf (stderr, _("%s: option requires an argument -- %c\n"),
+			 argv[0], c);
+	      }
+	    optopt = c;
+	    if (optstring[0] == ':')
+	      c = ':';
+	    else
+	      c = '?';
+	    return c;
+	  }
+	else
+	  /* We already incremented `optind' once;
+	     increment it again when taking next ARGV-elt as argument.  */
+	  optarg = argv[optind++];
+
+	/* optarg is now the argument, see if it's in the
+	   table of longopts.  */
+
+	for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++)
+	  /* Do nothing.  */ ;
+
+	/* Test all long options for either exact match
+	   or abbreviated matches.  */
+	for (p = longopts, option_index = 0; p->name; p++, option_index++)
+	  if (!strncmp (p->name, nextchar, nameend - nextchar))
+	    {
+	      if ((unsigned int) (nameend - nextchar) == strlen (p->name))
+		{
+		  /* Exact match found.  */
+		  pfound = p;
+		  indfound = option_index;
+		  exact = 1;
+		  break;
+		}
+	      else if (pfound == NULL)
+		{
+		  /* First nonexact match found.  */
+		  pfound = p;
+		  indfound = option_index;
+		}
+	      else
+		/* Second or later nonexact match found.  */
+		ambig = 1;
+	    }
+	if (ambig && !exact)
+	  {
+	    if (opterr)
+	      fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
+		       argv[0], argv[optind]);
+	    nextchar += strlen (nextchar);
+	    optind++;
+	    return '?';
+	  }
+	if (pfound != NULL)
+	  {
+	    option_index = indfound;
+	    if (*nameend)
+	      {
+		/* Don't test has_arg with >, because some C compilers don't
+		   allow it to be used on enums.  */
+		if (pfound->has_arg)
+		  optarg = nameend + 1;
+		else
+		  {
+		    if (opterr)
+		      fprintf (stderr, _("\
+%s: option `-W %s' doesn't allow an argument\n"),
+			       argv[0], pfound->name);
+
+		    nextchar += strlen (nextchar);
+		    return '?';
+		  }
+	      }
+	    else if (pfound->has_arg == 1)
+	      {
+		if (optind < argc)
+		  optarg = argv[optind++];
+		else
+		  {
+		    if (opterr)
+		      fprintf (stderr,
+			       _("%s: option `%s' requires an argument\n"),
+			       argv[0], argv[optind - 1]);
+		    nextchar += strlen (nextchar);
+		    return optstring[0] == ':' ? ':' : '?';
+		  }
+	      }
+	    nextchar += strlen (nextchar);
+	    if (longind != NULL)
+	      *longind = option_index;
+	    if (pfound->flag)
+	      {
+		*(pfound->flag) = pfound->val;
+		return 0;
+	      }
+	    return pfound->val;
+	  }
+	  nextchar = NULL;
+	  return 'W';	/* Let the application handle it.   */
+      }
+    if (temp[1] == ':')
+      {
+	if (temp[2] == ':')
+	  {
+	    /* This is an option that accepts an argument optionally.  */
+	    if (*nextchar != '\0')
+	      {
+		optarg = nextchar;
+		optind++;
+	      }
+	    else
+	      optarg = NULL;
+	    nextchar = NULL;
+	  }
+	else
+	  {
+	    /* This is an option that requires an argument.  */
+	    if (*nextchar != '\0')
+	      {
+		optarg = nextchar;
+		/* If we end this ARGV-element by taking the rest as an arg,
+		   we must advance to the next element now.  */
+		optind++;
+	      }
+	    else if (optind == argc)
+	      {
+		if (opterr)
+		  {
+		    /* 1003.2 specifies the format of this message.  */
+		    fprintf (stderr,
+			   _("%s: option requires an argument -- %c\n"),
+			   argv[0], c);
+		  }
+		optopt = c;
+		if (optstring[0] == ':')
+		  c = ':';
+		else
+		  c = '?';
+	      }
+	    else
+	      /* We already incremented `optind' once;
+		 increment it again when taking next ARGV-elt as argument.  */
+	      optarg = argv[optind++];
+	    nextchar = NULL;
+	  }
+      }
+    return c;
+  }
+}
+
+int
+getopt (int argc, char *const *argv, const char *optstring)
+{
+  return _getopt_internal (argc, argv, optstring,
+			   (const struct option *) 0,
+			   (int *) 0,
+			   0);
+}
+
+#endif	/* Not ELIDE_CODE.  */
+
+#ifdef TEST
+
+/* Compile with -DTEST to make an executable for use in testing
+   the above definition of `getopt'.  */
+
+int
+main (int argc, char **argv)
+{
+  int c;
+  int digit_optind = 0;
+
+  while (1)
+    {
+      int this_option_optind = optind ? optind : 1;
+
+      c = getopt (argc, argv, "abc:d:0123456789");
+      if (c == -1)
+	break;
+
+      switch (c)
+	{
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+	  if (digit_optind != 0 && digit_optind != this_option_optind)
+	    printf ("digits occur in two different argv-elements.\n");
+	  digit_optind = this_option_optind;
+	  printf ("option %c\n", c);
+	  break;
+
+	case 'a':
+	  printf ("option a\n");
+	  break;
+
+	case 'b':
+	  printf ("option b\n");
+	  break;
+
+	case 'c':
+	  printf ("option c with value `%s'\n", optarg);
+	  break;
+
+	case '?':
+	  break;
+
+	default:
+	  printf ("?? getopt returned character code 0%o ??\n", c);
+	}
+    }
+
+  if (optind < argc)
+    {
+      printf ("non-option ARGV-elements: ");
+      while (optind < argc)
+	printf ("%s ", argv[optind++]);
+      printf ("\n");
+    }
+
+  exit (0);
+}
+
+#endif /* TEST */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/getopt1.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/getopt1.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/getopt1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/getopt1.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,180 @@
+/* getopt_long and getopt_long_only entry points for GNU getopt.
+   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2005
+     Free Software Foundation, Inc.
+
+   NOTE: This source is derived from an old version taken from the GNU C
+   Library (glibc).
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#if !defined __STDC__ || !__STDC__
+/* This is a separate conditional since some stdc systems
+   reject `defined (const)'.  */
+#ifndef const
+#define const
+#endif
+#endif
+
+#include <stdio.h>
+
+#include "getopt.h"
+
+/* Comment out all this code if we are using the GNU C Library, and are not
+   actually compiling the library itself.  This code is part of the GNU C
+   Library, but also included in many other GNU distributions.  Compiling
+   and linking in this code is a waste when using the GNU C library
+   (especially if it is a shared library).  Rather than having every GNU
+   program understand `configure --with-gnu-libc' and omit the object files,
+   it is simpler to just do this in the source for each such file.  */
+
+#define GETOPT_INTERFACE_VERSION 2
+#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
+#include <gnu-versions.h>
+#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
+#define ELIDE_CODE
+#endif
+#endif
+
+#ifndef ELIDE_CODE
+
+
+/* This needs to come after some library #include
+   to get __GNU_LIBRARY__ defined.  */
+#ifdef __GNU_LIBRARY__
+#include <stdlib.h>
+#endif
+
+#ifndef	NULL
+#define NULL 0
+#endif
+
+int
+getopt_long (int argc,  char *const *argv,  const char *options,
+             const struct option *long_options, int *opt_index)
+{
+  return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
+}
+
+/* Like getopt_long, but '-' as well as '--' can indicate a long option.
+   If an option that starts with '-' (not '--') doesn't match a long option,
+   but does match a short option, it is parsed as a short option
+   instead.  */
+
+int
+getopt_long_only (int argc, char *const *argv, const char *options,
+                  const struct option *long_options, int *opt_index)
+{
+  return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
+}
+
+
+#endif	/* Not ELIDE_CODE.  */
+
+#ifdef TEST
+
+#include <stdio.h>
+
+int
+main (int argc, char **argv)
+{
+  int c;
+  int digit_optind = 0;
+
+  while (1)
+    {
+      int this_option_optind = optind ? optind : 1;
+      int option_index = 0;
+      static struct option long_options[] =
+      {
+	{"add", 1, 0, 0},
+	{"append", 0, 0, 0},
+	{"delete", 1, 0, 0},
+	{"verbose", 0, 0, 0},
+	{"create", 0, 0, 0},
+	{"file", 1, 0, 0},
+	{0, 0, 0, 0}
+      };
+
+      c = getopt_long (argc, argv, "abc:d:0123456789",
+		       long_options, &option_index);
+      if (c == -1)
+	break;
+
+      switch (c)
+	{
+	case 0:
+	  printf ("option %s", long_options[option_index].name);
+	  if (optarg)
+	    printf (" with arg %s", optarg);
+	  printf ("\n");
+	  break;
+
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+	  if (digit_optind != 0 && digit_optind != this_option_optind)
+	    printf ("digits occur in two different argv-elements.\n");
+	  digit_optind = this_option_optind;
+	  printf ("option %c\n", c);
+	  break;
+
+	case 'a':
+	  printf ("option a\n");
+	  break;
+
+	case 'b':
+	  printf ("option b\n");
+	  break;
+
+	case 'c':
+	  printf ("option c with value `%s'\n", optarg);
+	  break;
+
+	case 'd':
+	  printf ("option d with value `%s'\n", optarg);
+	  break;
+
+	case '?':
+	  break;
+
+	default:
+	  printf ("?? getopt returned character code 0%o ??\n", c);
+	}
+    }
+
+  if (optind < argc)
+    {
+      printf ("non-option ARGV-elements: ");
+      while (optind < argc)
+	printf ("%s ", argv[optind++]);
+      printf ("\n");
+    }
+
+  exit (0);
+}
+
+#endif /* TEST */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/getpagesize.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/getpagesize.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/getpagesize.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/getpagesize.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,90 @@
+/* Emulation of getpagesize() for systems that need it. */
+
+/*
+
+@deftypefn Supplemental int getpagesize (void)
+
+Returns the number of bytes in a page of memory.  This is the
+granularity of many of the system memory management routines.  No
+guarantee is made as to whether or not it is the same as the basic
+memory management hardware page size.
+
+@end deftypefn
+
+BUGS
+
+	Is intended as a reasonable replacement for systems where this
+	is not provided as a system call.  The value of 4096 may or may
+	not be correct for the systems where it is returned as the default
+	value.
+
+*/
+
+#ifndef VMS
+
+#include "config.h"
+
+#include <sys/types.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#undef GNU_OUR_PAGESIZE
+#if defined (HAVE_SYSCONF) && defined (HAVE_UNISTD_H)
+#include <unistd.h>
+#ifdef _SC_PAGESIZE
+#define GNU_OUR_PAGESIZE sysconf(_SC_PAGESIZE)
+#endif
+#endif
+
+#ifndef GNU_OUR_PAGESIZE
+# ifdef	PAGESIZE
+#  define	GNU_OUR_PAGESIZE PAGESIZE
+# else	/* no PAGESIZE */
+#  ifdef	EXEC_PAGESIZE
+#   define	GNU_OUR_PAGESIZE EXEC_PAGESIZE
+#  else	/* no EXEC_PAGESIZE */
+#   ifdef	NBPG
+#    define	GNU_OUR_PAGESIZE (NBPG * CLSIZE)
+#    ifndef	CLSIZE
+#     define	CLSIZE 1
+#    endif	/* CLSIZE */
+#   else	/* no NBPG */
+#    ifdef	NBPC
+#     define	GNU_OUR_PAGESIZE NBPC
+#    else	/* no NBPC */
+#     define	GNU_OUR_PAGESIZE 4096	/* Just punt and use reasonable value */
+#    endif /* NBPC */
+#   endif /* NBPG */
+#  endif /* EXEC_PAGESIZE */
+# endif /* PAGESIZE */
+#endif /* GNU_OUR_PAGESIZE */
+
+int
+getpagesize (void)
+{
+  return (GNU_OUR_PAGESIZE);
+}
+
+#else /* VMS */
+
+#if 0	/* older distributions of gcc-vms are missing <syidef.h> */
+#include <syidef.h>
+#endif
+#ifndef SYI$_PAGE_SIZE	/* VMS V5.4 and earlier didn't have this yet */
+#define SYI$_PAGE_SIZE 4452
+#endif
+extern unsigned long lib$getsyi(const unsigned short *,...);
+
+int getpagesize (void)
+{
+  long pagsiz = 0L;
+  unsigned short itmcod = SYI$_PAGE_SIZE;
+
+  (void) lib$getsyi (&itmcod, (void *) &pagsiz);
+  if (pagsiz == 0L)
+    pagsiz = 512L;	/* VAX default */
+  return (int) pagsiz;
+}
+
+#endif /* VMS */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/getpwd.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/getpwd.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/getpwd.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/getpwd.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,128 @@
+/* getpwd.c - get the working directory */
+
+/*
+
+@deftypefn Supplemental char* getpwd (void)
+
+Returns the current working directory.  This implementation caches the
+result on the assumption that the process will not call @code{chdir}
+between calls to @code{getpwd}.
+
+@end deftypefn
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/types.h>
+
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#if HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
+#include "libiberty.h"
+
+/* Virtually every UN*X system now in common use (except for pre-4.3-tahoe
+   BSD systems) now provides getcwd as called for by POSIX.  Allow for
+   the few exceptions to the general rule here.  */
+
+#if !defined(HAVE_GETCWD) && defined(HAVE_GETWD)
+/* Prototype in case the system headers doesn't provide it. */
+extern char *getwd ();
+#define getcwd(buf,len) getwd(buf)
+#endif
+
+#ifdef MAXPATHLEN
+#define GUESSPATHLEN (MAXPATHLEN + 1)
+#else
+#define GUESSPATHLEN 100
+#endif
+
+#if !(defined (VMS) || (defined(_WIN32) && !defined(__CYGWIN__)))
+
+/* Get the working directory.  Use the PWD environment variable if it's
+   set correctly, since this is faster and gives more uniform answers
+   to the user.  Yield the working directory if successful; otherwise,
+   yield 0 and set errno.  */
+
+char *
+getpwd (void)
+{
+  static char *pwd;
+  static int failure_errno;
+
+  char *p = pwd;
+  size_t s;
+  struct stat dotstat, pwdstat;
+
+  if (!p && !(errno = failure_errno))
+    {
+      if (! ((p = getenv ("PWD")) != 0
+	     && *p == '/'
+	     && stat (p, &pwdstat) == 0
+	     && stat (".", &dotstat) == 0
+	     && dotstat.st_ino == pwdstat.st_ino
+	     && dotstat.st_dev == pwdstat.st_dev))
+
+	/* The shortcut didn't work.  Try the slow, ``sure'' way.  */
+	for (s = GUESSPATHLEN;  !getcwd (p = XNEWVEC (char, s), s);  s *= 2)
+	  {
+	    int e = errno;
+	    free (p);
+#ifdef ERANGE
+	    if (e != ERANGE)
+#endif
+	      {
+		errno = failure_errno = e;
+		p = 0;
+		break;
+	      }
+	  }
+
+      /* Cache the result.  This assumes that the program does
+	 not invoke chdir between calls to getpwd.  */
+      pwd = p;
+    }
+  return p;
+}
+
+#else	/* VMS || _WIN32 && !__CYGWIN__ */
+
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 255
+#endif
+
+char *
+getpwd (void)
+{
+  static char *pwd = 0;
+
+  if (!pwd)
+    pwd = getcwd (XNEWVEC (char, MAXPATHLEN + 1), MAXPATHLEN + 1
+#ifdef VMS
+		  , 0
+#endif
+		  );
+  return pwd;
+}
+
+#endif	/* VMS || _WIN32 && !__CYGWIN__ */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/getruntime.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/getruntime.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/getruntime.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/getruntime.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,116 @@
+/* Return time used so far, in microseconds.
+   Copyright (C) 1994, 1999, 2002 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#include "config.h"
+
+#include "ansidecl.h"
+#include "libiberty.h"
+
+/* On some systems (such as WindISS), you must include <sys/types.h>
+   to get the definition of "time_t" before you include <time.h>.  */
+#include <sys/types.h>
+
+/* There are several ways to get elapsed execution time; unfortunately no
+   single way is available for all host systems, nor are there reliable
+   ways to find out which way is correct for a given host. */
+
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  ifdef HAVE_TIME_H
+#   include <time.h>
+#  endif
+# endif
+#endif
+
+#if defined (HAVE_GETRUSAGE) && defined (HAVE_SYS_RESOURCE_H)
+#include <sys/resource.h>
+#endif
+
+#ifdef HAVE_TIMES
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#include <sys/times.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+/* This is a fallback; if wrong, it will likely make obviously wrong
+   results. */
+
+#ifndef CLOCKS_PER_SEC
+#define CLOCKS_PER_SEC 1
+#endif
+
+#ifdef _SC_CLK_TCK
+#define GNU_HZ  sysconf(_SC_CLK_TCK)
+#else
+#ifdef HZ
+#define GNU_HZ  HZ
+#else
+#ifdef CLOCKS_PER_SEC
+#define GNU_HZ  CLOCKS_PER_SEC
+#endif
+#endif
+#endif
+
+/*
+
+@deftypefn Replacement long get_run_time (void)
+
+Returns the time used so far, in microseconds.  If possible, this is
+the time used by this process, else it is the elapsed time since the
+process started.
+
+@end deftypefn
+
+*/
+
+long
+get_run_time (void)
+{
+#if defined (HAVE_GETRUSAGE) && defined (HAVE_SYS_RESOURCE_H)
+  struct rusage rusage;
+
+  getrusage (0, &rusage);
+  return (rusage.ru_utime.tv_sec * 1000000 + rusage.ru_utime.tv_usec
+	  + rusage.ru_stime.tv_sec * 1000000 + rusage.ru_stime.tv_usec);
+#else /* ! HAVE_GETRUSAGE */
+#ifdef HAVE_TIMES
+  struct tms tms;
+
+  times (&tms);
+  return (tms.tms_utime + tms.tms_stime) * (1000000 / GNU_HZ);
+#else /* ! HAVE_TIMES */
+  /* Fall back on clock and hope it's correctly implemented. */
+  const long clocks_per_sec = CLOCKS_PER_SEC;
+  if (clocks_per_sec <= 1000000)
+    return clock () * (1000000 / clocks_per_sec);
+  else
+    return clock () / clocks_per_sec;
+#endif  /* HAVE_TIMES */
+#endif  /* HAVE_GETRUSAGE */
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/gettimeofday.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/gettimeofday.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/gettimeofday.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/gettimeofday.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,30 @@
+#include "config.h"
+#include "libiberty.h"
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+/* 
+
+@deftypefn Supplemental int gettimeofday (struct timeval *@var{tp}, void *@var{tz})
+
+Writes the current time to @var{tp}.  This implementation requires
+that @var{tz} be NULL.  Returns 0 on success, -1 on failure.
+
+@end deftypefn
+
+*/ 
+
+int
+gettimeofday (struct timeval *tp, void *tz)
+{
+  if (tz)
+    abort ();
+  tp->tv_usec = 0;
+  if (time (&tp->tv_sec) == (time_t) -1)
+    return -1;
+  return 0;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/hashtab.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/hashtab.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/hashtab.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/hashtab.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,990 @@
+/* An expandable hash tables datatype.  
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2009, 2010
+   Free Software Foundation, Inc.
+   Contributed by Vladimir Makarov (vmakarov@cygnus.com).
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/* This package implements basic hash table functionality.  It is possible
+   to search for an entry, create an entry and destroy an entry.
+
+   Elements in the table are generic pointers.
+
+   The size of the table is not fixed; if the occupancy of the table
+   grows too high the hash table will be expanded.
+
+   The abstract data implementation is based on generalized Algorithm D
+   from Knuth's book "The art of computer programming".  Hash table is
+   expanded by creation of new hash table and transferring elements from
+   the old table to the new table. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/types.h>
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#include <stdio.h>
+
+#include "libiberty.h"
+#include "ansidecl.h"
+#include "hashtab.h"
+
+#ifndef CHAR_BIT
+#define CHAR_BIT 8
+#endif
+
+static unsigned int higher_prime_index (unsigned long);
+static hashval_t htab_mod_1 (hashval_t, hashval_t, hashval_t, int);
+static hashval_t htab_mod (hashval_t, htab_t);
+static hashval_t htab_mod_m2 (hashval_t, htab_t);
+static hashval_t hash_pointer (const void *);
+static int eq_pointer (const void *, const void *);
+static int htab_expand (htab_t);
+static PTR *find_empty_slot_for_expand (htab_t, hashval_t);
+
+/* At some point, we could make these be NULL, and modify the
+   hash-table routines to handle NULL specially; that would avoid
+   function-call overhead for the common case of hashing pointers.  */
+htab_hash htab_hash_pointer = hash_pointer;
+htab_eq htab_eq_pointer = eq_pointer;
+
+/* Table of primes and multiplicative inverses.
+
+   Note that these are not minimally reduced inverses.  Unlike when generating
+   code to divide by a constant, we want to be able to use the same algorithm
+   all the time.  All of these inverses (are implied to) have bit 32 set.
+
+   For the record, here's the function that computed the table; it's a 
+   vastly simplified version of the function of the same name from gcc.  */
+
+#if 0
+unsigned int
+ceil_log2 (unsigned int x)
+{
+  int i;
+  for (i = 31; i >= 0 ; --i)
+    if (x > (1u << i))
+      return i+1;
+  abort ();
+}
+
+unsigned int
+choose_multiplier (unsigned int d, unsigned int *mlp, unsigned char *shiftp)
+{
+  unsigned long long mhigh;
+  double nx;
+  int lgup, post_shift;
+  int pow, pow2;
+  int n = 32, precision = 32;
+
+  lgup = ceil_log2 (d);
+  pow = n + lgup;
+  pow2 = n + lgup - precision;
+
+  nx = ldexp (1.0, pow) + ldexp (1.0, pow2);
+  mhigh = nx / d;
+
+  *shiftp = lgup - 1;
+  *mlp = mhigh;
+  return mhigh >> 32;
+}
+#endif
+
+struct prime_ent
+{
+  hashval_t prime;
+  hashval_t inv;
+  hashval_t inv_m2;	/* inverse of prime-2 */
+  hashval_t shift;
+};
+
+static struct prime_ent const prime_tab[] = {
+  {          7, 0x24924925, 0x9999999b, 2 },
+  {         13, 0x3b13b13c, 0x745d1747, 3 },
+  {         31, 0x08421085, 0x1a7b9612, 4 },
+  {         61, 0x0c9714fc, 0x15b1e5f8, 5 },
+  {        127, 0x02040811, 0x0624dd30, 6 },
+  {        251, 0x05197f7e, 0x073260a5, 7 },
+  {        509, 0x01824366, 0x02864fc8, 8 },
+  {       1021, 0x00c0906d, 0x014191f7, 9 },
+  {       2039, 0x0121456f, 0x0161e69e, 10 },
+  {       4093, 0x00300902, 0x00501908, 11 },
+  {       8191, 0x00080041, 0x00180241, 12 },
+  {      16381, 0x000c0091, 0x00140191, 13 },
+  {      32749, 0x002605a5, 0x002a06e6, 14 },
+  {      65521, 0x000f00e2, 0x00110122, 15 },
+  {     131071, 0x00008001, 0x00018003, 16 },
+  {     262139, 0x00014002, 0x0001c004, 17 },
+  {     524287, 0x00002001, 0x00006001, 18 },
+  {    1048573, 0x00003001, 0x00005001, 19 },
+  {    2097143, 0x00004801, 0x00005801, 20 },
+  {    4194301, 0x00000c01, 0x00001401, 21 },
+  {    8388593, 0x00001e01, 0x00002201, 22 },
+  {   16777213, 0x00000301, 0x00000501, 23 },
+  {   33554393, 0x00001381, 0x00001481, 24 },
+  {   67108859, 0x00000141, 0x000001c1, 25 },
+  {  134217689, 0x000004e1, 0x00000521, 26 },
+  {  268435399, 0x00000391, 0x000003b1, 27 },
+  {  536870909, 0x00000019, 0x00000029, 28 },
+  { 1073741789, 0x0000008d, 0x00000095, 29 },
+  { 2147483647, 0x00000003, 0x00000007, 30 },
+  /* Avoid "decimal constant so large it is unsigned" for 4294967291.  */
+  { 0xfffffffb, 0x00000006, 0x00000008, 31 }
+};
+
+/* The following function returns an index into the above table of the
+   nearest prime number which is greater than N, and near a power of two. */
+
+static unsigned int
+higher_prime_index (unsigned long n)
+{
+  unsigned int low = 0;
+  unsigned int high = sizeof(prime_tab) / sizeof(prime_tab[0]);
+
+  while (low != high)
+    {
+      unsigned int mid = low + (high - low) / 2;
+      if (n > prime_tab[mid].prime)
+	low = mid + 1;
+      else
+	high = mid;
+    }
+
+  /* If we've run out of primes, abort.  */
+  if (n > prime_tab[low].prime)
+    {
+      fprintf (stderr, "Cannot find prime bigger than %lu\n", n);
+      abort ();
+    }
+
+  return low;
+}
+
+/* Returns a hash code for P.  */
+
+static hashval_t
+hash_pointer (const PTR p)
+{
+  return (hashval_t) ((intptr_t)p >> 3);
+}
+
+/* Returns non-zero if P1 and P2 are equal.  */
+
+static int
+eq_pointer (const PTR p1, const PTR p2)
+{
+  return p1 == p2;
+}
+
+
+/* The parens around the function names in the next two definitions
+   are essential in order to prevent macro expansions of the name.
+   The bodies, however, are expanded as expected, so they are not
+   recursive definitions.  */
+
+/* Return the current size of given hash table.  */
+
+#define htab_size(htab)  ((htab)->size)
+
+size_t
+(htab_size) (htab_t htab)
+{
+  return htab_size (htab);
+}
+
+/* Return the current number of elements in given hash table. */
+
+#define htab_elements(htab)  ((htab)->n_elements - (htab)->n_deleted)
+
+size_t
+(htab_elements) (htab_t htab)
+{
+  return htab_elements (htab);
+}
+
+/* Return X % Y.  */
+
+static inline hashval_t
+htab_mod_1 (hashval_t x, hashval_t y, hashval_t inv, int shift)
+{
+  /* The multiplicative inverses computed above are for 32-bit types, and
+     requires that we be able to compute a highpart multiply.  */
+#ifdef UNSIGNED_64BIT_TYPE
+  __extension__ typedef UNSIGNED_64BIT_TYPE ull;
+  if (sizeof (hashval_t) * CHAR_BIT <= 32)
+    {
+      hashval_t t1, t2, t3, t4, q, r;
+
+      t1 = ((ull)x * inv) >> 32;
+      t2 = x - t1;
+      t3 = t2 >> 1;
+      t4 = t1 + t3;
+      q  = t4 >> shift;
+      r  = x - (q * y);
+
+      return r;
+    }
+#endif
+
+  /* Otherwise just use the native division routines.  */
+  return x % y;
+}
+
+/* Compute the primary hash for HASH given HTAB's current size.  */
+
+static inline hashval_t
+htab_mod (hashval_t hash, htab_t htab)
+{
+  const struct prime_ent *p = &prime_tab[htab->size_prime_index];
+  return htab_mod_1 (hash, p->prime, p->inv, p->shift);
+}
+
+/* Compute the secondary hash for HASH given HTAB's current size.  */
+
+static inline hashval_t
+htab_mod_m2 (hashval_t hash, htab_t htab)
+{
+  const struct prime_ent *p = &prime_tab[htab->size_prime_index];
+  return 1 + htab_mod_1 (hash, p->prime - 2, p->inv_m2, p->shift);
+}
+
+/* This function creates table with length slightly longer than given
+   source length.  Created hash table is initiated as empty (all the
+   hash table entries are HTAB_EMPTY_ENTRY).  The function returns the
+   created hash table, or NULL if memory allocation fails.  */
+
+htab_t
+htab_create_alloc (size_t size, htab_hash hash_f, htab_eq eq_f,
+                   htab_del del_f, htab_alloc alloc_f, htab_free free_f)
+{
+  return htab_create_typed_alloc (size, hash_f, eq_f, del_f, alloc_f, alloc_f,
+				  free_f);
+}
+
+/* As above, but uses the variants of ALLOC_F and FREE_F which accept
+   an extra argument.  */
+
+htab_t
+htab_create_alloc_ex (size_t size, htab_hash hash_f, htab_eq eq_f,
+		      htab_del del_f, void *alloc_arg,
+		      htab_alloc_with_arg alloc_f,
+		      htab_free_with_arg free_f)
+{
+  htab_t result;
+  unsigned int size_prime_index;
+
+  size_prime_index = higher_prime_index (size);
+  size = prime_tab[size_prime_index].prime;
+
+  result = (htab_t) (*alloc_f) (alloc_arg, 1, sizeof (struct htab));
+  if (result == NULL)
+    return NULL;
+  result->entries = (PTR *) (*alloc_f) (alloc_arg, size, sizeof (PTR));
+  if (result->entries == NULL)
+    {
+      if (free_f != NULL)
+	(*free_f) (alloc_arg, result);
+      return NULL;
+    }
+  result->size = size;
+  result->size_prime_index = size_prime_index;
+  result->hash_f = hash_f;
+  result->eq_f = eq_f;
+  result->del_f = del_f;
+  result->alloc_arg = alloc_arg;
+  result->alloc_with_arg_f = alloc_f;
+  result->free_with_arg_f = free_f;
+  return result;
+}
+
+/*
+
+@deftypefn Supplemental htab_t htab_create_typed_alloc (size_t @var{size}, @
+htab_hash @var{hash_f}, htab_eq @var{eq_f}, htab_del @var{del_f}, @
+htab_alloc @var{alloc_tab_f}, htab_alloc @var{alloc_f}, @
+htab_free @var{free_f})
+
+This function creates a hash table that uses two different allocators
+@var{alloc_tab_f} and @var{alloc_f} to use for allocating the table itself
+and its entries respectively.  This is useful when variables of different
+types need to be allocated with different allocators.
+
+The created hash table is slightly larger than @var{size} and it is
+initially empty (all the hash table entries are @code{HTAB_EMPTY_ENTRY}).
+The function returns the created hash table, or @code{NULL} if memory
+allocation fails.
+
+@end deftypefn
+
+*/
+
+htab_t
+htab_create_typed_alloc (size_t size, htab_hash hash_f, htab_eq eq_f,
+			 htab_del del_f, htab_alloc alloc_tab_f,
+			 htab_alloc alloc_f, htab_free free_f)
+{
+  htab_t result;
+  unsigned int size_prime_index;
+
+  size_prime_index = higher_prime_index (size);
+  size = prime_tab[size_prime_index].prime;
+
+  result = (htab_t) (*alloc_tab_f) (1, sizeof (struct htab));
+  if (result == NULL)
+    return NULL;
+  result->entries = (PTR *) (*alloc_f) (size, sizeof (PTR));
+  if (result->entries == NULL)
+    {
+      if (free_f != NULL)
+	(*free_f) (result);
+      return NULL;
+    }
+  result->size = size;
+  result->size_prime_index = size_prime_index;
+  result->hash_f = hash_f;
+  result->eq_f = eq_f;
+  result->del_f = del_f;
+  result->alloc_f = alloc_f;
+  result->free_f = free_f;
+  return result;
+}
+
+
+/* Update the function pointers and allocation parameter in the htab_t.  */
+
+void
+htab_set_functions_ex (htab_t htab, htab_hash hash_f, htab_eq eq_f,
+                       htab_del del_f, PTR alloc_arg,
+                       htab_alloc_with_arg alloc_f, htab_free_with_arg free_f)
+{
+  htab->hash_f = hash_f;
+  htab->eq_f = eq_f;
+  htab->del_f = del_f;
+  htab->alloc_arg = alloc_arg;
+  htab->alloc_with_arg_f = alloc_f;
+  htab->free_with_arg_f = free_f;
+}
+
+/* These functions exist solely for backward compatibility.  */
+
+#undef htab_create
+htab_t
+htab_create (size_t size, htab_hash hash_f, htab_eq eq_f, htab_del del_f)
+{
+  return htab_create_alloc (size, hash_f, eq_f, del_f, xcalloc, free);
+}
+
+htab_t
+htab_try_create (size_t size, htab_hash hash_f, htab_eq eq_f, htab_del del_f)
+{
+  return htab_create_alloc (size, hash_f, eq_f, del_f, calloc, free);
+}
+
+/* This function frees all memory allocated for given hash table.
+   Naturally the hash table must already exist. */
+
+void
+htab_delete (htab_t htab)
+{
+  size_t size = htab_size (htab);
+  PTR *entries = htab->entries;
+  int i;
+
+  if (htab->del_f)
+    for (i = size - 1; i >= 0; i--)
+      if (entries[i] != HTAB_EMPTY_ENTRY && entries[i] != HTAB_DELETED_ENTRY)
+	(*htab->del_f) (entries[i]);
+
+  if (htab->free_f != NULL)
+    {
+      (*htab->free_f) (entries);
+      (*htab->free_f) (htab);
+    }
+  else if (htab->free_with_arg_f != NULL)
+    {
+      (*htab->free_with_arg_f) (htab->alloc_arg, entries);
+      (*htab->free_with_arg_f) (htab->alloc_arg, htab);
+    }
+}
+
+/* This function clears all entries in the given hash table.  */
+
+void
+htab_empty (htab_t htab)
+{
+  size_t size = htab_size (htab);
+  PTR *entries = htab->entries;
+  int i;
+
+  if (htab->del_f)
+    for (i = size - 1; i >= 0; i--)
+      if (entries[i] != HTAB_EMPTY_ENTRY && entries[i] != HTAB_DELETED_ENTRY)
+	(*htab->del_f) (entries[i]);
+
+  /* Instead of clearing megabyte, downsize the table.  */
+  if (size > 1024*1024 / sizeof (PTR))
+    {
+      int nindex = higher_prime_index (1024 / sizeof (PTR));
+      int nsize = prime_tab[nindex].prime;
+
+      if (htab->free_f != NULL)
+	(*htab->free_f) (htab->entries);
+      else if (htab->free_with_arg_f != NULL)
+	(*htab->free_with_arg_f) (htab->alloc_arg, htab->entries);
+      if (htab->alloc_with_arg_f != NULL)
+	htab->entries = (PTR *) (*htab->alloc_with_arg_f) (htab->alloc_arg, nsize,
+						           sizeof (PTR *));
+      else
+	htab->entries = (PTR *) (*htab->alloc_f) (nsize, sizeof (PTR *));
+     htab->size = nsize;
+     htab->size_prime_index = nindex;
+    }
+  else
+    memset (entries, 0, size * sizeof (PTR));
+  htab->n_deleted = 0;
+  htab->n_elements = 0;
+}
+
+/* Similar to htab_find_slot, but without several unwanted side effects:
+    - Does not call htab->eq_f when it finds an existing entry.
+    - Does not change the count of elements/searches/collisions in the
+      hash table.
+   This function also assumes there are no deleted entries in the table.
+   HASH is the hash value for the element to be inserted.  */
+
+static PTR *
+find_empty_slot_for_expand (htab_t htab, hashval_t hash)
+{
+  hashval_t index = htab_mod (hash, htab);
+  size_t size = htab_size (htab);
+  PTR *slot = htab->entries + index;
+  hashval_t hash2;
+
+  if (*slot == HTAB_EMPTY_ENTRY)
+    return slot;
+  else if (*slot == HTAB_DELETED_ENTRY)
+    abort ();
+
+  hash2 = htab_mod_m2 (hash, htab);
+  for (;;)
+    {
+      index += hash2;
+      if (index >= size)
+	index -= size;
+
+      slot = htab->entries + index;
+      if (*slot == HTAB_EMPTY_ENTRY)
+	return slot;
+      else if (*slot == HTAB_DELETED_ENTRY)
+	abort ();
+    }
+}
+
+/* The following function changes size of memory allocated for the
+   entries and repeatedly inserts the table elements.  The occupancy
+   of the table after the call will be about 50%.  Naturally the hash
+   table must already exist.  Remember also that the place of the
+   table entries is changed.  If memory allocation failures are allowed,
+   this function will return zero, indicating that the table could not be
+   expanded.  If all goes well, it will return a non-zero value.  */
+
+static int
+htab_expand (htab_t htab)
+{
+  PTR *oentries;
+  PTR *olimit;
+  PTR *p;
+  PTR *nentries;
+  size_t nsize, osize, elts;
+  unsigned int oindex, nindex;
+
+  oentries = htab->entries;
+  oindex = htab->size_prime_index;
+  osize = htab->size;
+  olimit = oentries + osize;
+  elts = htab_elements (htab);
+
+  /* Resize only when table after removal of unused elements is either
+     too full or too empty.  */
+  if (elts * 2 > osize || (elts * 8 < osize && osize > 32))
+    {
+      nindex = higher_prime_index (elts * 2);
+      nsize = prime_tab[nindex].prime;
+    }
+  else
+    {
+      nindex = oindex;
+      nsize = osize;
+    }
+
+  if (htab->alloc_with_arg_f != NULL)
+    nentries = (PTR *) (*htab->alloc_with_arg_f) (htab->alloc_arg, nsize,
+						  sizeof (PTR *));
+  else
+    nentries = (PTR *) (*htab->alloc_f) (nsize, sizeof (PTR *));
+  if (nentries == NULL)
+    return 0;
+  htab->entries = nentries;
+  htab->size = nsize;
+  htab->size_prime_index = nindex;
+  htab->n_elements -= htab->n_deleted;
+  htab->n_deleted = 0;
+
+  p = oentries;
+  do
+    {
+      PTR x = *p;
+
+      if (x != HTAB_EMPTY_ENTRY && x != HTAB_DELETED_ENTRY)
+	{
+	  PTR *q = find_empty_slot_for_expand (htab, (*htab->hash_f) (x));
+
+	  *q = x;
+	}
+
+      p++;
+    }
+  while (p < olimit);
+
+  if (htab->free_f != NULL)
+    (*htab->free_f) (oentries);
+  else if (htab->free_with_arg_f != NULL)
+    (*htab->free_with_arg_f) (htab->alloc_arg, oentries);
+  return 1;
+}
+
+/* This function searches for a hash table entry equal to the given
+   element.  It cannot be used to insert or delete an element.  */
+
+PTR
+htab_find_with_hash (htab_t htab, const PTR element, hashval_t hash)
+{
+  hashval_t index, hash2;
+  size_t size;
+  PTR entry;
+
+  htab->searches++;
+  size = htab_size (htab);
+  index = htab_mod (hash, htab);
+
+  entry = htab->entries[index];
+  if (entry == HTAB_EMPTY_ENTRY
+      || (entry != HTAB_DELETED_ENTRY && (*htab->eq_f) (entry, element)))
+    return entry;
+
+  hash2 = htab_mod_m2 (hash, htab);
+  for (;;)
+    {
+      htab->collisions++;
+      index += hash2;
+      if (index >= size)
+	index -= size;
+
+      entry = htab->entries[index];
+      if (entry == HTAB_EMPTY_ENTRY
+	  || (entry != HTAB_DELETED_ENTRY && (*htab->eq_f) (entry, element)))
+	return entry;
+    }
+}
+
+/* Like htab_find_slot_with_hash, but compute the hash value from the
+   element.  */
+
+PTR
+htab_find (htab_t htab, const PTR element)
+{
+  return htab_find_with_hash (htab, element, (*htab->hash_f) (element));
+}
+
+/* This function searches for a hash table slot containing an entry
+   equal to the given element.  To delete an entry, call this with
+   insert=NO_INSERT, then call htab_clear_slot on the slot returned
+   (possibly after doing some checks).  To insert an entry, call this
+   with insert=INSERT, then write the value you want into the returned
+   slot.  When inserting an entry, NULL may be returned if memory
+   allocation fails.  */
+
+PTR *
+htab_find_slot_with_hash (htab_t htab, const PTR element,
+                          hashval_t hash, enum insert_option insert)
+{
+  PTR *first_deleted_slot;
+  hashval_t index, hash2;
+  size_t size;
+  PTR entry;
+
+  size = htab_size (htab);
+  if (insert == INSERT && size * 3 <= htab->n_elements * 4)
+    {
+      if (htab_expand (htab) == 0)
+	return NULL;
+      size = htab_size (htab);
+    }
+
+  index = htab_mod (hash, htab);
+
+  htab->searches++;
+  first_deleted_slot = NULL;
+
+  entry = htab->entries[index];
+  if (entry == HTAB_EMPTY_ENTRY)
+    goto empty_entry;
+  else if (entry == HTAB_DELETED_ENTRY)
+    first_deleted_slot = &htab->entries[index];
+  else if ((*htab->eq_f) (entry, element))
+    return &htab->entries[index];
+      
+  hash2 = htab_mod_m2 (hash, htab);
+  for (;;)
+    {
+      htab->collisions++;
+      index += hash2;
+      if (index >= size)
+	index -= size;
+      
+      entry = htab->entries[index];
+      if (entry == HTAB_EMPTY_ENTRY)
+	goto empty_entry;
+      else if (entry == HTAB_DELETED_ENTRY)
+	{
+	  if (!first_deleted_slot)
+	    first_deleted_slot = &htab->entries[index];
+	}
+      else if ((*htab->eq_f) (entry, element))
+	return &htab->entries[index];
+    }
+
+ empty_entry:
+  if (insert == NO_INSERT)
+    return NULL;
+
+  if (first_deleted_slot)
+    {
+      htab->n_deleted--;
+      *first_deleted_slot = HTAB_EMPTY_ENTRY;
+      return first_deleted_slot;
+    }
+
+  htab->n_elements++;
+  return &htab->entries[index];
+}
+
+/* Like htab_find_slot_with_hash, but compute the hash value from the
+   element.  */
+
+PTR *
+htab_find_slot (htab_t htab, const PTR element, enum insert_option insert)
+{
+  return htab_find_slot_with_hash (htab, element, (*htab->hash_f) (element),
+				   insert);
+}
+
+/* This function deletes an element with the given value from hash
+   table (the hash is computed from the element).  If there is no matching
+   element in the hash table, this function does nothing.  */
+
+void
+htab_remove_elt (htab_t htab, PTR element)
+{
+  htab_remove_elt_with_hash (htab, element, (*htab->hash_f) (element));
+}
+
+
+/* This function deletes an element with the given value from hash
+   table.  If there is no matching element in the hash table, this
+   function does nothing.  */
+
+void
+htab_remove_elt_with_hash (htab_t htab, PTR element, hashval_t hash)
+{
+  PTR *slot;
+
+  slot = htab_find_slot_with_hash (htab, element, hash, NO_INSERT);
+  if (*slot == HTAB_EMPTY_ENTRY)
+    return;
+
+  if (htab->del_f)
+    (*htab->del_f) (*slot);
+
+  *slot = HTAB_DELETED_ENTRY;
+  htab->n_deleted++;
+}
+
+/* This function clears a specified slot in a hash table.  It is
+   useful when you've already done the lookup and don't want to do it
+   again.  */
+
+void
+htab_clear_slot (htab_t htab, PTR *slot)
+{
+  if (slot < htab->entries || slot >= htab->entries + htab_size (htab)
+      || *slot == HTAB_EMPTY_ENTRY || *slot == HTAB_DELETED_ENTRY)
+    abort ();
+
+  if (htab->del_f)
+    (*htab->del_f) (*slot);
+
+  *slot = HTAB_DELETED_ENTRY;
+  htab->n_deleted++;
+}
+
+/* This function scans over the entire hash table calling
+   CALLBACK for each live entry.  If CALLBACK returns false,
+   the iteration stops.  INFO is passed as CALLBACK's second
+   argument.  */
+
+void
+htab_traverse_noresize (htab_t htab, htab_trav callback, PTR info)
+{
+  PTR *slot;
+  PTR *limit;
+  
+  slot = htab->entries;
+  limit = slot + htab_size (htab);
+
+  do
+    {
+      PTR x = *slot;
+
+      if (x != HTAB_EMPTY_ENTRY && x != HTAB_DELETED_ENTRY)
+	if (!(*callback) (slot, info))
+	  break;
+    }
+  while (++slot < limit);
+}
+
+/* Like htab_traverse_noresize, but does resize the table when it is
+   too empty to improve effectivity of subsequent calls.  */
+
+void
+htab_traverse (htab_t htab, htab_trav callback, PTR info)
+{
+  size_t size = htab_size (htab);
+  if (htab_elements (htab) * 8 < size && size > 32)
+    htab_expand (htab);
+
+  htab_traverse_noresize (htab, callback, info);
+}
+
+/* Return the fraction of fixed collisions during all work with given
+   hash table. */
+
+double
+htab_collisions (htab_t htab)
+{
+  if (htab->searches == 0)
+    return 0.0;
+
+  return (double) htab->collisions / (double) htab->searches;
+}
+
+/* Hash P as a null-terminated string.
+
+   Copied from gcc/hashtable.c.  Zack had the following to say with respect
+   to applicability, though note that unlike hashtable.c, this hash table
+   implementation re-hashes rather than chain buckets.
+
+   http://gcc.gnu.org/ml/gcc-patches/2001-08/msg01021.html
+   From: Zack Weinberg <zackw@panix.com>
+   Date: Fri, 17 Aug 2001 02:15:56 -0400
+
+   I got it by extracting all the identifiers from all the source code
+   I had lying around in mid-1999, and testing many recurrences of
+   the form "H_n = H_{n-1} * K + c_n * L + M" where K, L, M were either
+   prime numbers or the appropriate identity.  This was the best one.
+   I don't remember exactly what constituted "best", except I was
+   looking at bucket-length distributions mostly.
+   
+   So it should be very good at hashing identifiers, but might not be
+   as good at arbitrary strings.
+   
+   I'll add that it thoroughly trounces the hash functions recommended
+   for this use at http://burtleburtle.net/bob/hash/index.html, both
+   on speed and bucket distribution.  I haven't tried it against the
+   function they just started using for Perl's hashes.  */
+
+hashval_t
+htab_hash_string (const PTR p)
+{
+  const unsigned char *str = (const unsigned char *) p;
+  hashval_t r = 0;
+  unsigned char c;
+
+  while ((c = *str++) != 0)
+    r = r * 67 + c - 113;
+
+  return r;
+}
+
+/* DERIVED FROM:
+--------------------------------------------------------------------
+lookup2.c, by Bob Jenkins, December 1996, Public Domain.
+hash(), hash2(), hash3, and mix() are externally useful functions.
+Routines to test the hash are included if SELF_TEST is defined.
+You can use this free for any purpose.  It has no warranty.
+--------------------------------------------------------------------
+*/
+
+/*
+--------------------------------------------------------------------
+mix -- mix 3 32-bit values reversibly.
+For every delta with one or two bit set, and the deltas of all three
+  high bits or all three low bits, whether the original value of a,b,c
+  is almost all zero or is uniformly distributed,
+* If mix() is run forward or backward, at least 32 bits in a,b,c
+  have at least 1/4 probability of changing.
+* If mix() is run forward, every bit of c will change between 1/3 and
+  2/3 of the time.  (Well, 22/100 and 78/100 for some 2-bit deltas.)
+mix() was built out of 36 single-cycle latency instructions in a 
+  structure that could supported 2x parallelism, like so:
+      a -= b; 
+      a -= c; x = (c>>13);
+      b -= c; a ^= x;
+      b -= a; x = (a<<8);
+      c -= a; b ^= x;
+      c -= b; x = (b>>13);
+      ...
+  Unfortunately, superscalar Pentiums and Sparcs can't take advantage 
+  of that parallelism.  They've also turned some of those single-cycle
+  latency instructions into multi-cycle latency instructions.  Still,
+  this is the fastest good hash I could find.  There were about 2^^68
+  to choose from.  I only looked at a billion or so.
+--------------------------------------------------------------------
+*/
+/* same, but slower, works on systems that might have 8 byte hashval_t's */
+#define mix(a,b,c) \
+{ \
+  a -= b; a -= c; a ^= (c>>13); \
+  b -= c; b -= a; b ^= (a<< 8); \
+  c -= a; c -= b; c ^= ((b&0xffffffff)>>13); \
+  a -= b; a -= c; a ^= ((c&0xffffffff)>>12); \
+  b -= c; b -= a; b = (b ^ (a<<16)) & 0xffffffff; \
+  c -= a; c -= b; c = (c ^ (b>> 5)) & 0xffffffff; \
+  a -= b; a -= c; a = (a ^ (c>> 3)) & 0xffffffff; \
+  b -= c; b -= a; b = (b ^ (a<<10)) & 0xffffffff; \
+  c -= a; c -= b; c = (c ^ (b>>15)) & 0xffffffff; \
+}
+
+/*
+--------------------------------------------------------------------
+hash() -- hash a variable-length key into a 32-bit value
+  k     : the key (the unaligned variable-length array of bytes)
+  len   : the length of the key, counting by bytes
+  level : can be any 4-byte value
+Returns a 32-bit value.  Every bit of the key affects every bit of
+the return value.  Every 1-bit and 2-bit delta achieves avalanche.
+About 36+6len instructions.
+
+The best hash table sizes are powers of 2.  There is no need to do
+mod a prime (mod is sooo slow!).  If you need less than 32 bits,
+use a bitmask.  For example, if you need only 10 bits, do
+  h = (h & hashmask(10));
+In which case, the hash table should have hashsize(10) elements.
+
+If you are hashing n strings (ub1 **)k, do it like this:
+  for (i=0, h=0; i<n; ++i) h = hash( k[i], len[i], h);
+
+By Bob Jenkins, 1996.  bob_jenkins@burtleburtle.net.  You may use this
+code any way you wish, private, educational, or commercial.  It's free.
+
+See http://burtleburtle.net/bob/hash/evahash.html
+Use for hash table lookup, or anything where one collision in 2^32 is
+acceptable.  Do NOT use for cryptographic purposes.
+--------------------------------------------------------------------
+*/
+
+hashval_t
+iterative_hash (const PTR k_in /* the key */,
+                register size_t  length /* the length of the key */,
+                register hashval_t initval /* the previous hash, or
+                                              an arbitrary value */)
+{
+  register const unsigned char *k = (const unsigned char *)k_in;
+  register hashval_t a,b,c,len;
+
+  /* Set up the internal state */
+  len = length;
+  a = b = 0x9e3779b9;  /* the golden ratio; an arbitrary value */
+  c = initval;           /* the previous hash value */
+
+  /*---------------------------------------- handle most of the key */
+#ifndef WORDS_BIGENDIAN
+  /* On a little-endian machine, if the data is 4-byte aligned we can hash
+     by word for better speed.  This gives nondeterministic results on
+     big-endian machines.  */
+  if (sizeof (hashval_t) == 4 && (((size_t)k)&3) == 0)
+    while (len >= 12)    /* aligned */
+      {
+	a += *(hashval_t *)(k+0);
+	b += *(hashval_t *)(k+4);
+	c += *(hashval_t *)(k+8);
+	mix(a,b,c);
+	k += 12; len -= 12;
+      }
+  else /* unaligned */
+#endif
+    while (len >= 12)
+      {
+	a += (k[0] +((hashval_t)k[1]<<8) +((hashval_t)k[2]<<16) +((hashval_t)k[3]<<24));
+	b += (k[4] +((hashval_t)k[5]<<8) +((hashval_t)k[6]<<16) +((hashval_t)k[7]<<24));
+	c += (k[8] +((hashval_t)k[9]<<8) +((hashval_t)k[10]<<16)+((hashval_t)k[11]<<24));
+	mix(a,b,c);
+	k += 12; len -= 12;
+      }
+
+  /*------------------------------------- handle the last 11 bytes */
+  c += length;
+  switch(len)              /* all the case statements fall through */
+    {
+    case 11: c+=((hashval_t)k[10]<<24);
+    case 10: c+=((hashval_t)k[9]<<16);
+    case 9 : c+=((hashval_t)k[8]<<8);
+      /* the first byte of c is reserved for the length */
+    case 8 : b+=((hashval_t)k[7]<<24);
+    case 7 : b+=((hashval_t)k[6]<<16);
+    case 6 : b+=((hashval_t)k[5]<<8);
+    case 5 : b+=k[4];
+    case 4 : a+=((hashval_t)k[3]<<24);
+    case 3 : a+=((hashval_t)k[2]<<16);
+    case 2 : a+=((hashval_t)k[1]<<8);
+    case 1 : a+=k[0];
+      /* case 0: nothing left to add */
+    }
+  mix(a,b,c);
+  /*-------------------------------------------- report the result */
+  return c;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/hex.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/hex.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/hex.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/hex.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,192 @@
+/* Hex character manipulation support.
+   Copyright (C) 1995, 2001 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#include <stdio.h>  /* for EOF */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "libiberty.h"
+#include "safe-ctype.h" /* for HOST_CHARSET_ASCII */
+
+#if EOF != -1
+ #error "hex.c requires EOF == -1"
+#endif
+
+/*
+
+@deftypefn Extension void hex_init (void)
+
+Initializes the array mapping the current character set to
+corresponding hex values.  This function must be called before any
+call to @code{hex_p} or @code{hex_value}.  If you fail to call it, a
+default ASCII-based table will normally be used on ASCII systems.
+
+@end deftypefn
+
+@deftypefn Extension int hex_p (int @var{c})
+
+Evaluates to non-zero if the given character is a valid hex character,
+or zero if it is not.  Note that the value you pass will be cast to
+@code{unsigned char} within the macro.
+
+@end deftypefn
+
+@deftypefn Extension {unsigned int} hex_value (int @var{c})
+
+Returns the numeric equivalent of the given character when interpreted
+as a hexadecimal digit.  The result is undefined if you pass an
+invalid hex digit.  Note that the value you pass will be cast to
+@code{unsigned char} within the macro.
+
+The @code{hex_value} macro returns @code{unsigned int}, rather than
+signed @code{int}, to make it easier to use in parsing addresses from
+hex dump files: a signed @code{int} would be sign-extended when
+converted to a wider unsigned type --- like @code{bfd_vma}, on some
+systems.
+
+@end deftypefn
+
+@undocumented _hex_array_size
+@undocumented _hex_bad
+@undocumented _hex_value
+
+*/
+
+
+/* Are we ASCII? */
+#if HOST_CHARSET == HOST_CHARSET_ASCII
+
+const unsigned char _hex_value[_hex_array_size] =
+{
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* NUL SOH STX ETX */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* EOT ENQ ACK BEL */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* BS  HT  LF  VT  */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* FF  CR  SO  SI  */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* DLE DC1 DC2 DC3 */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* DC4 NAK SYN ETB */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* CAN EM  SUB ESC */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* FS  GS  RS  US  */
+
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* SP  !   "   #   */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* $   %   &   '   */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* (   )   *   +   */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* ,   -   .   /   */
+  0,        1,        2,        3,          /* 0   1   2   3   */
+  4,        5,        6,        7,          /* 4   5   6   7   */
+  8,        9,        _hex_bad, _hex_bad,   /* 8   9   :   ;   */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* <   =   >   ?   */
+
+  _hex_bad, 10,       11,       12,         /* @   A   B   C   */
+  13,       14,       15,       _hex_bad,   /* D   E   F   G   */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* H   I   J   K   */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* L   M   N   O   */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* P   Q   R   S   */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* T   U   V   W   */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* X   Y   Z   [   */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* \   ]   ^   _   */
+
+  _hex_bad, 10,       11,       12,         /* `   a   b   c   */
+  13,       14,       15,       _hex_bad,   /* d   e   f   g   */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* h   i   j   k   */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* l   m   n   o   */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* p   q   r   s   */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* t   u   v   w   */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* x   y   z   {   */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,   /* |   }   ~   DEL */
+
+  /* The high half of unsigned char, all values are _hex_bad.  */
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+  _hex_bad, _hex_bad, _hex_bad, _hex_bad,
+};
+#define HEX_TABLE_INITIALIZED
+
+#else
+
+unsigned char _hex_value[_hex_array_size];
+
+#endif /* not ASCII */
+
+void
+hex_init (void)
+{
+#ifndef HEX_TABLE_INITIALIZED
+  int i;
+
+  for (i=0; i<_hex_array_size; i++)
+    {
+      switch (i)
+	{
+	case '0': _hex_value[i] = 0; break;
+	case '1': _hex_value[i] = 1; break;
+	case '2': _hex_value[i] = 2; break;
+	case '3': _hex_value[i] = 3; break;
+	case '4': _hex_value[i] = 4; break;
+	case '5': _hex_value[i] = 5; break;
+	case '6': _hex_value[i] = 6; break;
+	case '7': _hex_value[i] = 7; break;
+	case '8': _hex_value[i] = 8; break;
+	case '9': _hex_value[i] = 9; break;
+
+	case 'a': case 'A': _hex_value[i] = 10; break;
+	case 'b': case 'B': _hex_value[i] = 11; break;
+	case 'c': case 'C': _hex_value[i] = 12; break;
+	case 'd': case 'D': _hex_value[i] = 13; break;
+	case 'e': case 'E': _hex_value[i] = 14; break;
+	case 'f': case 'F': _hex_value[i] = 15; break;
+
+	default:
+	  _hex_value[i] = _hex_bad;
+	  break;
+	}
+    }
+#endif
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/index.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/index.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/index.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/index.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,21 @@
+/* Stub implementation of (obsolete) index(). */
+
+/*
+
+@deftypefn Supplemental char* index (char *@var{s}, int @var{c})
+
+Returns a pointer to the first occurrence of the character @var{c} in
+the string @var{s}, or @code{NULL} if not found.  The use of @code{index} is
+deprecated in new programs in favor of @code{strchr}.
+
+@end deftypefn
+
+*/
+
+extern char * strchr(const char *, int);
+
+char *
+index (const char *s, int c)
+{
+  return strchr (s, c);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/insque.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/insque.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/insque.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/insque.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,51 @@
+/* insque(3C) routines
+   This file is in the public domain.  */
+
+/*
+
+@deftypefn Supplemental void insque (struct qelem *@var{elem}, @
+  struct qelem *@var{pred})
+@deftypefnx Supplemental void remque (struct qelem *@var{elem})
+
+Routines to manipulate queues built from doubly linked lists.  The
+@code{insque} routine inserts @var{elem} in the queue immediately
+after @var{pred}.  The @code{remque} routine removes @var{elem} from
+its containing queue.  These routines expect to be passed pointers to
+structures which have as their first members a forward pointer and a
+back pointer, like this prototype (although no prototype is provided):
+
+@example
+struct qelem @{
+  struct qelem *q_forw;
+  struct qelem *q_back;
+  char q_data[];
+@};
+@end example
+
+@end deftypefn
+
+*/
+
+
+struct qelem {
+  struct qelem *q_forw;
+  struct qelem *q_back;
+};
+
+
+void
+insque (struct qelem *elem, struct qelem *pred)
+{
+  elem -> q_forw = pred -> q_forw;
+  pred -> q_forw -> q_back = elem;
+  elem -> q_back = pred;
+  pred -> q_forw = elem;
+}
+
+
+void
+remque (struct qelem *elem)
+{
+  elem -> q_forw -> q_back = elem -> q_back;
+  elem -> q_back -> q_forw = elem -> q_forw;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/lbasename.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/lbasename.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/lbasename.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/lbasename.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,84 @@
+/* Libiberty basename.  Like basename, but is not overridden by the
+   system C library.
+   Copyright (C) 2001, 2002, 2010 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/*
+
+@deftypefn Replacement {const char*} lbasename (const char *@var{name})
+
+Given a pointer to a string containing a typical pathname
+(@samp{/usr/src/cmd/ls/ls.c} for example), returns a pointer to the
+last component of the pathname (@samp{ls.c} in this case).  The
+returned pointer is guaranteed to lie within the original
+string.  This latter fact is not true of many vendor C
+libraries, which return special strings or modify the passed
+strings for particular input.
+
+In particular, the empty string returns the same empty string,
+and a path ending in @code{/} returns the empty string after it.
+
+@end deftypefn
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "ansidecl.h"
+#include "libiberty.h"
+#include "safe-ctype.h"
+#include "filenames.h"
+
+const char *
+unix_lbasename (const char *name)
+{
+  const char *base;
+
+  for (base = name; *name; name++)
+    if (IS_UNIX_DIR_SEPARATOR (*name))
+      base = name + 1;
+
+  return base;
+}
+
+const char *
+dos_lbasename (const char *name)
+{
+  const char *base;
+
+  /* Skip over a possible disk name.  */
+  if (ISALPHA (name[0]) && name[1] == ':') 
+    name += 2;
+
+  for (base = name; *name; name++)
+    if (IS_DOS_DIR_SEPARATOR (*name))
+      base = name + 1;
+
+  return base;
+}
+
+const char *
+lbasename (const char *name)
+{
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  return dos_lbasename (name);
+#else
+  return unix_lbasename (name);
+#endif
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/libiberty.texi sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/libiberty.texi
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/libiberty.texi	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/libiberty.texi	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,318 @@
+\input texinfo  @c -*-texinfo-*-
+@c %**start of header
+@setfilename libiberty.info
+@settitle @sc{gnu} libiberty
+@c %**end of header
+
+@syncodeindex fn cp
+@syncodeindex vr cp
+@syncodeindex pg cp
+
+@finalout
+@c %**end of header
+
+@dircategory GNU libraries
+@direntry
+* Libiberty: (libiberty).          Library of utility functions which
+                                   are missing or broken on some systems.
+@end direntry
+
+@macro libib
+@code{libiberty}
+@end macro
+
+@ifinfo
+This manual describes the GNU @libib library of utility subroutines.
+
+Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+2009, 2010 Free Software Foundation, Inc.
+
+      Permission is granted to copy, distribute and/or modify this document
+      under the terms of the GNU Free Documentation License, Version 1.3
+      or any later version published by the Free Software Foundation;
+      with no Invariant Sections, with no Front-Cover Texts, and with no
+      Back-Cover Texts.  A copy of the license is included in the
+      section entitled ``GNU Free Documentation License''.
+
+@ignore
+Permission is granted to process this file through TeX and print the
+results, provided the printed document carries a copying permission
+notice identical to this one except for the removal of this paragraph
+(this paragraph not being relevant to the printed manual).
+
+@end ignore
+@end ifinfo
+
+
+@titlepage
+@title @sc{gnu} libiberty
+@author Phil Edwards et al.
+@page
+
+
+@vskip 0pt plus 1filll
+Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+2009, 2010 Free Software Foundation, Inc.
+
+      Permission is granted to copy, distribute and/or modify this document
+      under the terms of the GNU Free Documentation License, Version 1.3
+      or any later version published by the Free Software Foundation;
+      with no Invariant Sections, with no Front-Cover Texts, and with no
+      Back-Cover Texts.  A copy of the license is included in the
+      section entitled ``GNU Free Documentation License''.
+
+@end titlepage
+@contents
+@page
+
+@ifnottex
+@node    Top,Using,,
+@top     Introduction
+
+The @libib{} library is a collection of subroutines used by various
+GNU programs.  It is available under the Library General Public
+License; for more information, see @ref{Library Copying}.
+
+@end ifnottex
+
+@menu
+* Using::              How to use libiberty in your code.
+
+* Overview::           Overview of available function groups.
+
+* Functions::          Available functions, macros, and global variables.
+
+* Obstacks::           Object Stacks.
+
+* Licenses::           The various licenses under which libiberty sources are
+                       distributed.
+
+* Index::              Index of functions and categories.
+@end menu
+
+@node Using
+@chapter Using
+@cindex using libiberty
+@cindex libiberty usage
+@cindex how to use
+
+@c THIS SECTION IS CRAP AND NEEDS REWRITING BADLY.
+
+To date, @libib{} is generally not installed on its own.  It has evolved
+over years but does not have its own version number nor release schedule.
+
+Possibly the easiest way to use @libib{} in your projects is to drop the
+@libib{} code into your project's sources, and to build the library along
+with your own sources; the library would then be linked in at the end.  This
+prevents any possible version mismatches with other copies of libiberty
+elsewhere on the system.
+
+Passing @option{--enable-install-libiberty} to the @command{configure}
+script when building @libib{} causes the header files and archive library
+to be installed when @kbd{make install} is run.  This option also takes
+an (optional) argument to specify the installation location, in the same
+manner as @option{--prefix}.
+
+For your own projects, an approach which offers stability and flexibility
+is to include @libib{} with your code, but allow the end user to optionally
+choose to use a previously-installed version instead.  In this way the
+user may choose (for example) to install @libib{} as part of GCC, and use
+that version for all software built with that compiler.  (This approach
+has proven useful with software using the GNU @code{readline} library.)
+
+Making use of @libib{} code usually requires that you include one or more
+header files from the @libib{} distribution.  (They will be named as
+necessary in the function descriptions.)  At link time, you will need to
+add @option{-liberty} to your link command invocation.
+
+
+@node Overview
+@chapter Overview
+
+Functions contained in @libib{} can be divided into three general categories.
+
+
+@menu
+* Supplemental Functions::       Providing functions which don't exist
+                                 on older operating systems.
+
+* Replacement Functions::        These functions are sometimes buggy or
+                                 unpredictable on some operating systems.
+
+* Extensions::                   Functions which provide useful extensions
+                                 or safety wrappers around existing code.
+@end menu
+
+@node Supplemental Functions
+@section Supplemental Functions
+@cindex supplemental functions
+@cindex functions, supplemental
+@cindex functions, missing
+
+Certain operating systems do not provide functions which have since
+become standardized, or at least common.  For example, the Single
+Unix Specification Version 2 requires that the @code{basename}
+function be provided, but an OS which predates that specification
+might not have this function.  This should not prevent well-written
+code from running on such a system.
+
+Similarly, some functions exist only among a particular ``flavor''
+or ``family'' of operating systems.  As an example, the @code{bzero}
+function is often not present on systems outside the BSD-derived
+family of systems.
+
+Many such functions are provided in @libib{}.  They are quickly
+listed here with little description, as systems which lack them
+become less and less common.  Each function @var{foo} is implemented
+in @file{@var{foo}.c} but not declared in any @libib{} header file; more
+comments and caveats for each function's implementation are often
+available in the source file.  Generally, the function can simply
+be declared as @code{extern}.
+
+
+
+@node Replacement Functions
+@section Replacement Functions
+@cindex replacement functions
+@cindex functions, replacement
+
+Some functions have extremely limited implementations on different
+platforms.  Other functions are tedious to use correctly; for example,
+proper use of @code{malloc} calls for the return value to be checked and
+appropriate action taken if memory has been exhausted.  A group of
+``replacement functions'' is available in @libib{} to address these issues
+for some of the most commonly used subroutines.
+
+All of these functions are declared in the @file{libiberty.h} header
+file.  Many of the implementations will use preprocessor macros set by
+GNU Autoconf, if you decide to make use of that program.  Some of these
+functions may call one another.
+
+
+@menu
+* Memory Allocation::            Testing and handling failed memory
+                                   requests automatically.
+* Exit Handlers::                Calling routines on program exit.
+* Error Reporting::              Mapping errno and signal numbers to
+                                   more useful string formats.
+@end menu
+
+@node Memory Allocation
+@subsection Memory Allocation
+@cindex memory allocation
+
+The functions beginning with the letter @samp{x} are wrappers around
+standard functions; the functions provided by the system environment
+are called and their results checked before the results are passed back
+to client code.  If the standard functions fail, these wrappers will
+terminate the program.  Thus, these versions can be used with impunity.
+
+
+@node Exit Handlers
+@subsection Exit Handlers
+@cindex exit handlers
+
+The existence and implementation of the @code{atexit} routine varies
+amongst the flavors of Unix.  @libib{} provides an unvarying dependable
+implementation via @code{xatexit} and @code{xexit}.
+
+
+@node Error Reporting
+@subsection Error Reporting
+@cindex error reporting
+
+These are a set of routines to facilitate programming with the system
+@code{errno} interface.  The @libib{} source file @file{strerror.c}
+contains a good deal of documentation for these functions.
+
+@c signal stuff
+
+
+@node Extensions
+@section Extensions
+@cindex extensions
+@cindex functions, extension
+
+@libib{} includes additional functionality above and beyond standard
+functions, which has proven generically useful in GNU programs, such as
+obstacks and regex.  These functions are often copied from other
+projects as they gain popularity, and are included here to provide a
+central location from which to use, maintain, and distribute them.
+
+@menu
+* Obstacks::                     Stacks of arbitrary objects.
+@end menu
+
+@c This is generated from the glibc manual using a make-obstacks-texi.sh
+@c script of Phil's.  Hope it's accurate.
+@include obstacks.texi
+
+@node Functions
+@chapter Function, Variable, and Macro Listing.
+@include functions.texi
+
+@node Licenses
+@appendix Licenses
+
+@menu
+
+* Library Copying::   The GNU Library General Public License
+* BSD::               Regents of the University of California
+
+@end menu
+
+@c This takes care of Library Copying.  It is the copying-lib.texi from the
+@c GNU web site, with its @node line altered to make makeinfo shut up.
+@include copying-lib.texi
+
+@page
+@node BSD
+@appendixsec BSD
+
+Copyright @copyright{} 1990 Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+@enumerate
+
+@item
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+@item
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+@item
+[rescinded 22 July 1999]
+
+@item
+Neither the name of the University nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+@end enumerate
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+@node Index
+@unnumbered Index
+
+@printindex cp
+
+@bye
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/lrealpath.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/lrealpath.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/lrealpath.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/lrealpath.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,157 @@
+/* Libiberty realpath.  Like realpath, but more consistent behavior.
+   Based on gdb_realpath from GDB.
+
+   Copyright 2003 Free Software Foundation, Inc.
+
+   This file is part of the libiberty library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/*
+
+@deftypefn Replacement {const char*} lrealpath (const char *@var{name})
+
+Given a pointer to a string containing a pathname, returns a canonical
+version of the filename.  Symlinks will be resolved, and ``.'' and ``..''
+components will be simplified.  The returned value will be allocated using
+@code{malloc}, or @code{NULL} will be returned on a memory allocation error.
+
+@end deftypefn
+
+*/
+
+#include "config.h"
+#include "ansidecl.h"
+#include "libiberty.h"
+
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+/* On GNU libc systems the declaration is only visible with _GNU_SOURCE.  */
+#if defined(HAVE_CANONICALIZE_FILE_NAME) \
+    && defined(NEED_DECLARATION_CANONICALIZE_FILE_NAME)
+extern char *canonicalize_file_name (const char *);
+#endif
+
+#if defined(HAVE_REALPATH)
+# if defined (PATH_MAX)
+#  define REALPATH_LIMIT PATH_MAX
+# else
+#  if defined (MAXPATHLEN)
+#   define REALPATH_LIMIT MAXPATHLEN
+#  endif
+# endif
+#else
+  /* cygwin has realpath, so it won't get here.  */ 
+# if defined (_WIN32)
+#  define WIN32_LEAN_AND_MEAN
+#  include <windows.h> /* for GetFullPathName */
+# endif
+#endif
+
+char *
+lrealpath (const char *filename)
+{
+  /* Method 1: The system has a compile time upper bound on a filename
+     path.  Use that and realpath() to canonicalize the name.  This is
+     the most common case.  Note that, if there isn't a compile time
+     upper bound, you want to avoid realpath() at all costs.  */
+#if defined(REALPATH_LIMIT)
+  {
+    char buf[REALPATH_LIMIT];
+    const char *rp = realpath (filename, buf);
+    if (rp == NULL)
+      rp = filename;
+    return strdup (rp);
+  }
+#endif /* REALPATH_LIMIT */
+
+  /* Method 2: The host system (i.e., GNU) has the function
+     canonicalize_file_name() which malloc's a chunk of memory and
+     returns that, use that.  */
+#if defined(HAVE_CANONICALIZE_FILE_NAME)
+  {
+    char *rp = canonicalize_file_name (filename);
+    if (rp == NULL)
+      return strdup (filename);
+    else
+      return rp;
+  }
+#endif
+
+  /* Method 3: Now we're getting desperate!  The system doesn't have a
+     compile time buffer size and no alternative function.  Query the
+     OS, using pathconf(), for the buffer limit.  Care is needed
+     though, some systems do not limit PATH_MAX (return -1 for
+     pathconf()) making it impossible to pass a correctly sized buffer
+     to realpath() (it could always overflow).  On those systems, we
+     skip this.  */
+#if defined (HAVE_REALPATH) && defined (HAVE_UNISTD_H)
+  {
+    /* Find out the max path size.  */
+    long path_max = pathconf ("/", _PC_PATH_MAX);
+    if (path_max > 0)
+      {
+	/* PATH_MAX is bounded.  */
+	char *buf, *rp, *ret;
+	buf = (char *) malloc (path_max);
+	if (buf == NULL)
+	  return NULL;
+	rp = realpath (filename, buf);
+	ret = strdup (rp ? rp : filename);
+	free (buf);
+	return ret;
+      }
+  }
+#endif
+
+  /* The MS Windows method.  If we don't have realpath, we assume we
+     don't have symlinks and just canonicalize to a Windows absolute
+     path.  GetFullPath converts ../ and ./ in relative paths to
+     absolute paths, filling in current drive if one is not given
+     or using the current directory of a specified drive (eg, "E:foo").
+     It also converts all forward slashes to back slashes.  */
+#if defined (_WIN32)
+  {
+    char buf[MAX_PATH];
+    char* basename;
+    DWORD len = GetFullPathName (filename, MAX_PATH, buf, &basename);
+    if (len == 0 || len > MAX_PATH - 1)
+      return strdup (filename);
+    else
+      {
+	/* The file system is case-preserving but case-insensitive,
+	   Canonicalize to lowercase, using the codepage associated
+	   with the process locale.  */
+        CharLowerBuff (buf, len);
+        return strdup (buf);
+      }
+  }
+#endif
+
+  /* This system is a lost cause, just duplicate the filename.  */
+  return strdup (filename);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/maint-tool sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/maint-tool
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/maint-tool	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/maint-tool	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,296 @@
+#!/usr/bin/perl
+# -*- perl -*-
+
+#   Copyright (C) 2001, 2007, 2010
+#   Free Software Foundation
+#
+# This file is part of the libiberty library.
+# Libiberty is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# Libiberty 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
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with libiberty; see the file COPYING.LIB.  If not,
+# write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+# Boston, MA 02110-1301, USA.
+#
+# Originally written by DJ Delorie <dj@redhat.com>
+
+
+# This is a trivial script which checks the lists of C and O files in
+# the Makefile for consistency.
+
+$mode = shift;
+$srcdir = ".";
+
+if ($mode eq "-s") {
+    $srcdir = shift;
+    $mode = shift;
+}
+
+&missing() if $mode eq "missing";
+&undoc() if $mode eq "undoc";
+&deps() if $mode eq "deps";
+
+exit 0;
+
+format STDOUT =
+^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<~
+$out
+        ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<~~
+$out
+.
+
+######################################################################
+
+sub missing {
+
+    opendir(S, $srcdir);
+    while ($f = readdir S) {
+	$have{$f} = 1;
+    }
+    closedir(S);
+    opendir(S, ".");
+    while ($f = readdir S) {
+	$have{$f} = 1;
+    }
+    closedir(S);
+
+    for $a (@ARGV) {
+	$listed{$a} = 1;
+	$have{$a} = 0;
+    }
+
+    for $f (sort keys %have) {
+	next unless $have{$f};
+	if ($f =~ /\.c$/) {
+	    print "S $f\n";
+	}
+    }
+    for $f (sort keys %listed) {
+	if ($f =~ /(.*)\.c$/) {
+	    $base = $1;
+	    if (! $listed{"./$base.o"}) {
+		print "O $f\n";
+	    }
+	}
+    }
+}
+
+######################################################################
+
+sub undoc {
+
+    opendir(S, $srcdir);
+    while ($file = readdir S) {
+	if ($file =~ /\.texi$/) {
+	    open(T, "$srcdir/$file");
+	    while (<T>) {
+		if (/^\@deftype[^\(]* ([^\s\(]+) *\(/) {
+		    $documented{$1} = 1;
+		}
+	    }
+	    close(T);
+	}
+	if ($file =~ /\.c$/) {
+	    open(C, "$srcdir/$file");
+	    while (<C>) {
+		if (/\@undocumented (\S+)/) {
+		    $documented{$1} = 1;
+		}
+		if (/^static /) {
+		    if (! /[\(;]/) {
+			s/[\r\n]+$/ /;
+			$_ .= <C>;
+		    }
+		    while ($_ =~ /\([^\)]*$/) {
+			s/[\r\n]+$/ /;
+			$_ .= <C>;
+		    }
+		}
+		s/ VPARAMS([ \(])/$1/;
+		s/PREFIX\(([^\)]*)\)/byte_$1/;
+		if (/^static [^\(]* ([^\s\(]+) *\(.*\)$/) {
+		    $documented{$1} = 1;
+		}
+	    }
+	}
+    }
+    closedir(D);
+
+    # $out = join(' ', sort keys %documented);
+    # write;
+    # print "\n";
+
+    system "etags $srcdir/*.c $srcdir/../include/*.h";
+    open(TAGS, "TAGS");
+    while (<TAGS>) {
+	s/[\r\n]+$//;
+	if (/^\014$/) {
+	    $filename = <TAGS>;
+	    $filename =~ s/[\r\n]+$//;
+	    $filename =~ s/,\d+$//;
+	    $filename =~ s@.*[/\\]@@;
+	    next;
+	}
+	if ($filename =~ /\.c$/ ) {
+	    next unless /^[_a-zA-Z]/;
+	} else {
+	    next unless /^\# *define/;
+	    s/\# *define *//;
+	}
+
+	s/ VPARAMS//;
+	s/ *\177.*//;
+	s/,$//;
+	s/DEFUN\(//;
+	s/\(//;
+
+	next if /^static /;
+	next if /\s/;
+	next if /^_/;
+	next if $documented{$_};
+	next if /_H_?$/;
+
+	if ($seen_in{$_} ne $filename) {
+	    $saw{$_} ++;
+	}
+	$seen_in{$_} = $filename;
+    }
+
+    for $k (keys %saw) {
+	delete $saw{$k} if $saw{$k} > 1;
+    }
+
+    for $k (sort keys %saw) {
+	$fromfile{$seen_in{$k}} .= " " if $fromfile{$seen_in{$k}};
+	$fromfile{$seen_in{$k}} .= $k;
+    }
+
+    for $f (sort keys %fromfile) {
+	$out = "$f: $fromfile{$f}";
+	write;
+    }
+}
+
+######################################################################
+
+sub deps_for {
+    my($f) = @_;
+    my(%d);
+    open(F, $f);
+    %d = ();
+    while (<F>) {
+	if (/^#\s*include\s+["<](.*)[">]/) {
+	    $d{$1} = 1;
+	}
+    }
+    close(F);
+    return keys %d;
+}
+
+sub canonicalize {
+    my ($p) = @_;
+    0 while $p =~ s@/\./@/@g;
+    0 while $p =~ s@^\./@@g;
+    0 while $p =~ s@/[^/]+/\.\./@/@g;
+    return $p;
+}
+
+sub locals_first {
+    my ($a,$b) = @_;
+    return -1 if $a eq "config.h";
+    return  1 if $b eq "config.h";
+    return $a cmp $b;
+}
+
+sub deps {
+
+    $crule  = "\tif [ x\"\$(PICFLAG)\" != x ]; then \\\n";
+    $crule .= "\t  \$(COMPILE.c) \$(PICFLAG) \$< -o pic/\$@; \\\n";
+    $crule .= "\telse true; fi\n";
+    $crule .= "\t\$(COMPILE.c) \$< \$(OUTPUT_OPTION)\n";
+    $crule .= "\n";
+
+    $incdir = shift @ARGV;
+
+    opendir(INC, $incdir);
+    while ($f = readdir INC) {
+	next unless $f =~ /\.h$/;
+	$mine{$f} = "\$(INCDIR)/$f";
+	$deps{$f} = join(' ', &deps_for("$incdir/$f"));
+    }
+    $mine{'config.h'} = "config.h";
+
+    opendir(INC, $srcdir);
+    while ($f = readdir INC) {
+	next unless $f =~ /\.h$/;
+	$mine{$f} = "\$(srcdir)/$f";
+	$deps{$f} = join(' ', &deps_for("$srcdir/$f"));
+    }
+    $mine{'config.h'} = "config.h";
+
+    open(IN, "$srcdir/Makefile.in");
+    open(OUT, ">$srcdir/Makefile.tmp");
+    while (<IN>) {
+	last if /remainder of this file/;
+	print OUT;
+    }
+    print OUT "# The dependencies in the remainder of this file are automatically\n";
+    print OUT "# generated by \"make maint-deps\".  Manual edits will be lost.\n\n";
+
+    opendir(S, $srcdir);
+    for $f (sort readdir S) {
+	if ($f =~ /\.c$/) {
+
+	    %scanned = ();
+	    @pending = &deps_for("$srcdir/$f");
+	    while (@pending) {
+		@tmp = @pending;
+		@pending = ();
+		for $p (@tmp) {
+		    next unless $mine{$p};
+		    if (!$scanned{$p}) {
+			push(@pending, split(' ', $deps{$p}));
+			$scanned{$p} = 1;
+		    }
+		}
+	    }
+	    @deps = sort { &locals_first($a,$b) } keys %scanned;
+	    $obj = $f;
+	    $obj =~ s/\.c$/.\$(objext)/;
+	    $obj = "./$obj:";
+	    if ($#deps >= 0) {
+		print OUT "$obj \$(srcdir)/$f";
+		$len = length("$obj $f");
+		for $dt (@deps) {
+		    $d = $mine{$dt};
+		    if ($len + length($d) > 70) {
+			printf OUT " \\\n\t$d";
+			$len = 8 + length($d);
+		    } else {
+			print OUT " $d";
+			$len += length($d) + 1;
+		    }
+		}
+		print OUT "\n";
+	    } else {
+		print OUT "$obj \$(srcdir)/$f\n";
+	    }
+	    $c = $crule;
+	    $c =~ s@\$\<@\$\(srcdir\)\/$f@g;
+	    print OUT $c;
+	}
+    }
+    closedir(S);
+    close(IN);
+    close(OUT);
+
+    rename("$srcdir/Makefile.tmp", "$srcdir/Makefile.in");
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/make-relative-prefix.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/make-relative-prefix.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/make-relative-prefix.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/make-relative-prefix.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,413 @@
+/* Relative (relocatable) prefix support.
+   Copyright (C) 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+   1999, 2000, 2001, 2002, 2006 Free Software Foundation, Inc.
+
+This file is part of libiberty.
+
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+GCC 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 GCC; see the file COPYING.  If not, write to the Free
+Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+02110-1301, USA.  */
+
+/*
+
+@deftypefn Extension {const char*} make_relative_prefix (const char *@var{progname}, @
+  const char *@var{bin_prefix}, const char *@var{prefix})
+
+Given three paths @var{progname}, @var{bin_prefix}, @var{prefix},
+return the path that is in the same position relative to
+@var{progname}'s directory as @var{prefix} is relative to
+@var{bin_prefix}.  That is, a string starting with the directory
+portion of @var{progname}, followed by a relative pathname of the
+difference between @var{bin_prefix} and @var{prefix}.
+
+If @var{progname} does not contain any directory separators,
+@code{make_relative_prefix} will search @env{PATH} to find a program
+named @var{progname}.  Also, if @var{progname} is a symbolic link,
+the symbolic link will be resolved.
+
+For example, if @var{bin_prefix} is @code{/alpha/beta/gamma/gcc/delta},
+@var{prefix} is @code{/alpha/beta/gamma/omega/}, and @var{progname} is
+@code{/red/green/blue/gcc}, then this function will return
+@code{/red/green/blue/../../omega/}.
+
+The return value is normally allocated via @code{malloc}.  If no
+relative prefix can be found, return @code{NULL}.
+
+@end deftypefn
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <string.h>
+
+#include "ansidecl.h"
+#include "libiberty.h"
+
+#ifndef R_OK
+#define R_OK 4
+#define W_OK 2
+#define X_OK 1
+#endif
+
+#ifndef DIR_SEPARATOR
+#  define DIR_SEPARATOR '/'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) \
+    || defined (__DJGPP__) || defined (__OS2__)
+#  define HAVE_DOS_BASED_FILE_SYSTEM
+#  define HAVE_HOST_EXECUTABLE_SUFFIX
+#  define HOST_EXECUTABLE_SUFFIX ".exe"
+#  ifndef DIR_SEPARATOR_2 
+#    define DIR_SEPARATOR_2 '\\'
+#  endif
+#  define PATH_SEPARATOR ';'
+#else
+#  define PATH_SEPARATOR ':'
+#endif
+
+#ifndef DIR_SEPARATOR_2
+#  define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else
+#  define IS_DIR_SEPARATOR(ch) \
+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif
+
+#define DIR_UP ".."
+
+static char *save_string (const char *, int);
+static char **split_directories	(const char *, int *);
+static void free_split_directories (char **);
+
+static char *
+save_string (const char *s, int len)
+{
+  char *result = (char *) malloc (len + 1);
+
+  memcpy (result, s, len);
+  result[len] = 0;
+  return result;
+}
+
+/* Split a filename into component directories.  */
+
+static char **
+split_directories (const char *name, int *ptr_num_dirs)
+{
+  int num_dirs = 0;
+  char **dirs;
+  const char *p, *q;
+  int ch;
+
+  /* Count the number of directories.  Special case MSDOS disk names as part
+     of the initial directory.  */
+  p = name;
+#ifdef HAVE_DOS_BASED_FILE_SYSTEM
+  if (name[1] == ':' && IS_DIR_SEPARATOR (name[2]))
+    {
+      p += 3;
+      num_dirs++;
+    }
+#endif /* HAVE_DOS_BASED_FILE_SYSTEM */
+
+  while ((ch = *p++) != '\0')
+    {
+      if (IS_DIR_SEPARATOR (ch))
+	{
+	  num_dirs++;
+	  while (IS_DIR_SEPARATOR (*p))
+	    p++;
+	}
+    }
+
+  dirs = (char **) malloc (sizeof (char *) * (num_dirs + 2));
+  if (dirs == NULL)
+    return NULL;
+
+  /* Now copy the directory parts.  */
+  num_dirs = 0;
+  p = name;
+#ifdef HAVE_DOS_BASED_FILE_SYSTEM
+  if (name[1] == ':' && IS_DIR_SEPARATOR (name[2]))
+    {
+      dirs[num_dirs++] = save_string (p, 3);
+      if (dirs[num_dirs - 1] == NULL)
+	{
+	  free (dirs);
+	  return NULL;
+	}
+      p += 3;
+    }
+#endif /* HAVE_DOS_BASED_FILE_SYSTEM */
+
+  q = p;
+  while ((ch = *p++) != '\0')
+    {
+      if (IS_DIR_SEPARATOR (ch))
+	{
+	  while (IS_DIR_SEPARATOR (*p))
+	    p++;
+
+	  dirs[num_dirs++] = save_string (q, p - q);
+	  if (dirs[num_dirs - 1] == NULL)
+	    {
+	      dirs[num_dirs] = NULL;
+	      free_split_directories (dirs);
+	      return NULL;
+	    }
+	  q = p;
+	}
+    }
+
+  if (p - 1 - q > 0)
+    dirs[num_dirs++] = save_string (q, p - 1 - q);
+  dirs[num_dirs] = NULL;
+
+  if (dirs[num_dirs - 1] == NULL)
+    {
+      free_split_directories (dirs);
+      return NULL;
+    }
+
+  if (ptr_num_dirs)
+    *ptr_num_dirs = num_dirs;
+  return dirs;
+}
+
+/* Release storage held by split directories.  */
+
+static void
+free_split_directories (char **dirs)
+{
+  int i = 0;
+
+  if (dirs != NULL)
+    {
+      while (dirs[i] != NULL)
+	free (dirs[i++]);
+
+      free ((char *) dirs);
+    }
+}
+
+/* Given three strings PROGNAME, BIN_PREFIX, PREFIX, return a string that gets
+   to PREFIX starting with the directory portion of PROGNAME and a relative
+   pathname of the difference between BIN_PREFIX and PREFIX.
+
+   For example, if BIN_PREFIX is /alpha/beta/gamma/gcc/delta, PREFIX is
+   /alpha/beta/gamma/omega/, and PROGNAME is /red/green/blue/gcc, then this
+   function will return /red/green/blue/../../omega/.
+
+   If no relative prefix can be found, return NULL.  */
+
+static char *
+make_relative_prefix_1 (const char *progname, const char *bin_prefix,
+			const char *prefix, const int resolve_links)
+{
+  char **prog_dirs = NULL, **bin_dirs = NULL, **prefix_dirs = NULL;
+  int prog_num, bin_num, prefix_num;
+  int i, n, common;
+  int needed_len;
+  char *ret = NULL, *ptr, *full_progname;
+
+  if (progname == NULL || bin_prefix == NULL || prefix == NULL)
+    return NULL;
+
+  /* If there is no full pathname, try to find the program by checking in each
+     of the directories specified in the PATH environment variable.  */
+  if (lbasename (progname) == progname)
+    {
+      char *temp;
+
+      temp = getenv ("PATH");
+      if (temp)
+	{
+	  char *startp, *endp, *nstore;
+	  size_t prefixlen = strlen (temp) + 1;
+	  if (prefixlen < 2)
+	    prefixlen = 2;
+
+	  nstore = (char *) alloca (prefixlen + strlen (progname) + 1);
+
+	  startp = endp = temp;
+	  while (1)
+	    {
+	      if (*endp == PATH_SEPARATOR || *endp == 0)
+		{
+		  if (endp == startp)
+		    {
+		      nstore[0] = '.';
+		      nstore[1] = DIR_SEPARATOR;
+		      nstore[2] = '\0';
+		    }
+		  else
+		    {
+		      strncpy (nstore, startp, endp - startp);
+		      if (! IS_DIR_SEPARATOR (endp[-1]))
+			{
+			  nstore[endp - startp] = DIR_SEPARATOR;
+			  nstore[endp - startp + 1] = 0;
+			}
+		      else
+			nstore[endp - startp] = 0;
+		    }
+		  strcat (nstore, progname);
+		  if (! access (nstore, X_OK)
+#ifdef HAVE_HOST_EXECUTABLE_SUFFIX
+                      || ! access (strcat (nstore, HOST_EXECUTABLE_SUFFIX), X_OK)
+#endif
+		      )
+		    {
+		      progname = nstore;
+		      break;
+		    }
+
+		  if (*endp == 0)
+		    break;
+		  endp = startp = endp + 1;
+		}
+	      else
+		endp++;
+	    }
+	}
+    }
+
+  if (resolve_links)
+    full_progname = lrealpath (progname);
+  else
+    full_progname = strdup (progname);
+  if (full_progname == NULL)
+    return NULL;
+
+  prog_dirs = split_directories (full_progname, &prog_num);
+  free (full_progname);
+  if (prog_dirs == NULL)
+    return NULL;
+
+  bin_dirs = split_directories (bin_prefix, &bin_num);
+  if (bin_dirs == NULL)
+    goto bailout;
+
+  /* Remove the program name from comparison of directory names.  */
+  prog_num--;
+
+  /* If we are still installed in the standard location, we don't need to
+     specify relative directories.  Also, if argv[0] still doesn't contain
+     any directory specifiers after the search above, then there is not much
+     we can do.  */
+  if (prog_num == bin_num)
+    {
+      for (i = 0; i < bin_num; i++)
+	{
+	  if (strcmp (prog_dirs[i], bin_dirs[i]) != 0)
+	    break;
+	}
+
+      if (prog_num <= 0 || i == bin_num)
+	goto bailout;
+    }
+
+  prefix_dirs = split_directories (prefix, &prefix_num);
+  if (prefix_dirs == NULL)
+    goto bailout;
+
+  /* Find how many directories are in common between bin_prefix & prefix.  */
+  n = (prefix_num < bin_num) ? prefix_num : bin_num;
+  for (common = 0; common < n; common++)
+    {
+      if (strcmp (bin_dirs[common], prefix_dirs[common]) != 0)
+	break;
+    }
+
+  /* If there are no common directories, there can be no relative prefix.  */
+  if (common == 0)
+    goto bailout;
+
+  /* Two passes: first figure out the size of the result string, and
+     then construct it.  */
+  needed_len = 0;
+  for (i = 0; i < prog_num; i++)
+    needed_len += strlen (prog_dirs[i]);
+  needed_len += sizeof (DIR_UP) * (bin_num - common);
+  for (i = common; i < prefix_num; i++)
+    needed_len += strlen (prefix_dirs[i]);
+  needed_len += 1; /* Trailing NUL.  */
+
+  ret = (char *) malloc (needed_len);
+  if (ret == NULL)
+    goto bailout;
+
+  /* Build up the pathnames in argv[0].  */
+  *ret = '\0';
+  for (i = 0; i < prog_num; i++)
+    strcat (ret, prog_dirs[i]);
+
+  /* Now build up the ..'s.  */
+  ptr = ret + strlen(ret);
+  for (i = common; i < bin_num; i++)
+    {
+      strcpy (ptr, DIR_UP);
+      ptr += sizeof (DIR_UP) - 1;
+      *(ptr++) = DIR_SEPARATOR;
+    }
+  *ptr = '\0';
+
+  /* Put in directories to move over to prefix.  */
+  for (i = common; i < prefix_num; i++)
+    strcat (ret, prefix_dirs[i]);
+
+ bailout:
+  free_split_directories (prog_dirs);
+  free_split_directories (bin_dirs);
+  free_split_directories (prefix_dirs);
+
+  return ret;
+}
+
+
+/* Do the full job, including symlink resolution.
+   This path will find files installed in the same place as the
+   program even when a soft link has been made to the program
+   from somwhere else. */
+
+char *
+make_relative_prefix (const char *progname, const char *bin_prefix,
+		      const char *prefix)
+{
+  return make_relative_prefix_1 (progname, bin_prefix, prefix, 1);
+}
+
+/* Make the relative pathname without attempting to resolve any links.
+   '..' etc may also be left in the pathname.
+   This will find the files the user meant the program to find if the
+   installation is patched together with soft links. */
+
+char *
+make_relative_prefix_ignore_links (const char *progname,
+				   const char *bin_prefix,
+				   const char *prefix)
+{
+  return make_relative_prefix_1 (progname, bin_prefix, prefix, 0);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/make-temp-file.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/make-temp-file.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/make-temp-file.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/make-temp-file.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,217 @@
+/* Utility to pick a temporary filename prefix.
+   Copyright (C) 1996, 1997, 1998, 2001, 2009, 2010
+   Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If not,
+write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>	/* May get P_tmpdir.  */
+#include <sys/types.h>
+#include <errno.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_SYS_FILE_H
+#include <sys/file.h>   /* May get R_OK, etc. on some systems.  */
+#endif
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#include <windows.h>
+#endif
+
+#ifndef R_OK
+#define R_OK 4
+#define W_OK 2
+#define X_OK 1
+#endif
+
+#include "libiberty.h"
+extern int mkstemps (char *, int);
+
+/* '/' works just fine on MS-DOS based systems.  */
+#ifndef DIR_SEPARATOR
+#define DIR_SEPARATOR '/'
+#endif
+
+/* Name of temporary file.
+   mktemp requires 6 trailing X's.  */
+#define TEMP_FILE "ccXXXXXX"
+#define TEMP_FILE_LEN (sizeof(TEMP_FILE) - 1)
+
+#if !defined(_WIN32) || defined(__CYGWIN__)
+
+/* Subroutine of choose_tmpdir.
+   If BASE is non-NULL, return it.
+   Otherwise it checks if DIR is a usable directory.
+   If success, DIR is returned.
+   Otherwise NULL is returned.  */
+
+static inline const char *try_dir (const char *, const char *);
+
+static inline const char *
+try_dir (const char *dir, const char *base)
+{
+  if (base != 0)
+    return base;
+  if (dir != 0
+      && access (dir, R_OK | W_OK | X_OK) == 0)
+    return dir;
+  return 0;
+}
+
+static const char tmp[] = { DIR_SEPARATOR, 't', 'm', 'p', 0 };
+static const char usrtmp[] =
+{ DIR_SEPARATOR, 'u', 's', 'r', DIR_SEPARATOR, 't', 'm', 'p', 0 };
+static const char vartmp[] =
+{ DIR_SEPARATOR, 'v', 'a', 'r', DIR_SEPARATOR, 't', 'm', 'p', 0 };
+
+#endif
+
+static char *memoized_tmpdir;
+
+/*
+
+@deftypefn Replacement char* choose_tmpdir ()
+
+Returns a pointer to a directory path suitable for creating temporary
+files in.
+
+@end deftypefn
+
+*/
+
+char *
+choose_tmpdir (void)
+{
+  if (!memoized_tmpdir)
+    {
+#if !defined(_WIN32) || defined(__CYGWIN__)
+      const char *base = 0;
+      char *tmpdir;
+      unsigned int len;
+      
+#ifdef VMS
+      /* Try VMS standard temp logical.  */
+      base = try_dir ("/sys$scratch", base);
+#else
+      base = try_dir (getenv ("TMPDIR"), base);
+      base = try_dir (getenv ("TMP"), base);
+      base = try_dir (getenv ("TEMP"), base);
+#endif
+      
+#ifdef P_tmpdir
+      /* We really want a directory name here as if concatenated with say \dir
+	 we do not end up with a double \\ which defines an UNC path.  */
+      if (strcmp (P_tmpdir, "\\") == 0)
+	base = try_dir ("\\.", base);
+      else
+	base = try_dir (P_tmpdir, base);
+#endif
+
+      /* Try /var/tmp, /usr/tmp, then /tmp.  */
+      base = try_dir (vartmp, base);
+      base = try_dir (usrtmp, base);
+      base = try_dir (tmp, base);
+      
+      /* If all else fails, use the current directory!  */
+      if (base == 0)
+	base = ".";
+      /* Append DIR_SEPARATOR to the directory we've chosen
+	 and return it.  */
+      len = strlen (base);
+      tmpdir = XNEWVEC (char, len + 2);
+      strcpy (tmpdir, base);
+      tmpdir[len] = DIR_SEPARATOR;
+      tmpdir[len+1] = '\0';
+      memoized_tmpdir = tmpdir;
+#else /* defined(_WIN32) && !defined(__CYGWIN__) */
+      DWORD len;
+
+      /* Figure out how much space we need.  */
+      len = GetTempPath(0, NULL);
+      if (len)
+	{
+	  memoized_tmpdir = XNEWVEC (char, len);
+	  if (!GetTempPath(len, memoized_tmpdir))
+	    {
+	      XDELETEVEC (memoized_tmpdir);
+	      memoized_tmpdir = NULL;
+	    }
+	}
+      if (!memoized_tmpdir)
+	/* If all else fails, use the current directory.  */
+	memoized_tmpdir = xstrdup (".\\");
+#endif /* defined(_WIN32) && !defined(__CYGWIN__) */
+    }
+
+  return memoized_tmpdir;
+}
+
+/*
+
+@deftypefn Replacement char* make_temp_file (const char *@var{suffix})
+
+Return a temporary file name (as a string) or @code{NULL} if unable to
+create one.  @var{suffix} is a suffix to append to the file name.  The
+string is @code{malloc}ed, and the temporary file has been created.
+
+@end deftypefn
+
+*/
+
+char *
+make_temp_file (const char *suffix)
+{
+  const char *base = choose_tmpdir ();
+  char *temp_filename;
+  int base_len, suffix_len;
+  int fd;
+
+  if (suffix == 0)
+    suffix = "";
+
+  base_len = strlen (base);
+  suffix_len = strlen (suffix);
+
+  temp_filename = XNEWVEC (char, base_len
+			   + TEMP_FILE_LEN
+			   + suffix_len + 1);
+  strcpy (temp_filename, base);
+  strcpy (temp_filename + base_len, TEMP_FILE);
+  strcpy (temp_filename + base_len + TEMP_FILE_LEN, suffix);
+
+  fd = mkstemps (temp_filename, suffix_len);
+  /* Mkstemps failed.  It may be EPERM, ENOSPC etc.  */
+  if (fd == -1)
+    {
+      fprintf (stderr, "Cannot create temporary file in %s: %s\n",
+	       base, strerror (errno));
+      abort ();
+    }
+  /* We abort on failed close out of sheer paranoia.  */
+  if (close (fd))
+    abort ();
+  return temp_filename;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/makefile.vms sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/makefile.vms
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/makefile.vms	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/makefile.vms	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,35 @@
+#
+# Makefile for libiberty under openVMS
+#
+# For use with gnu-make for vms
+#
+# Created by Klaus K"ampf, kkaempf@progis.de
+#
+#
+
+OBJS=getopt.obj,obstack.obj,xexit.obj,xmalloc.obj,hex.obj,\
+    getopt1.obj,cplus-dem.obj,cp-demangle.obj,cp-demint.obj,\
+    asprintf.obj vasprintf.obj,mkstemps.obj,filename_cmp.obj,\
+    concat.obj,getruntime.obj,getpagesize.obj,getpwd.obj,xstrerror.obj,\
+    xmemdup.obj,xstrdup.obj,xatexit.obj,choose-temp.obj,fnmatch.obj,\
+    objalloc.obj,safe-ctype.obj,hashtab.obj,lbasename.obj,argv.obj,\
+    lrealpath.obj,make-temp-file.obj,stpcpy.obj,unlink-if-ordinary.obj
+
+ifeq ($(CC),gcc)
+CFLAGS=/include=([],[-.include])
+else
+# assume dec c
+OPT=/noopt/debug/warnings=disable=(missingreturn)
+CFLAGS=$(OPT)/include=([],[-.include])/name=(as_is,shortened)\
+ /define=(HAVE_CONFIG_H=1)\
+ /prefix=(all,except=("getopt","optarg","optopt","optind","opterr"))
+endif
+
+libiberty.olb: $(OBJS)
+	purge
+	lib/create libiberty *.obj
+
+clean:
+	$$ purge
+	$(RM) *.obj;
+	$(RM) libiberty.olb;
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/md5.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/md5.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/md5.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/md5.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,435 @@
+/* md5.c - Functions to compute MD5 message digest of files or memory blocks
+   according to the definition of MD5 in RFC 1321 from April 1992.
+   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+
+   NOTE: This source is derived from an old version taken from the GNU C
+   Library (glibc).
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <sys/types.h>
+
+#if STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+# include <string.h>
+#else
+# ifndef HAVE_MEMCPY
+#  define memcpy(d, s, n) bcopy ((s), (d), (n))
+# endif
+#endif
+
+#include "ansidecl.h"
+#include "md5.h"
+
+#ifdef _LIBC
+# include <endian.h>
+# if __BYTE_ORDER == __BIG_ENDIAN
+#  define WORDS_BIGENDIAN 1
+# endif
+#endif
+
+#ifdef WORDS_BIGENDIAN
+# define SWAP(n)							\
+    (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
+#else
+# define SWAP(n) (n)
+#endif
+
+
+/* This array contains the bytes used to pad the buffer to the next
+   64-byte boundary.  (RFC 1321, 3.1: Step 1)  */
+static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
+
+
+/* Initialize structure containing state of computation.
+   (RFC 1321, 3.3: Step 3)  */
+void
+md5_init_ctx (struct md5_ctx *ctx)
+{
+  ctx->A = (md5_uint32) 0x67452301;
+  ctx->B = (md5_uint32) 0xefcdab89;
+  ctx->C = (md5_uint32) 0x98badcfe;
+  ctx->D = (md5_uint32) 0x10325476;
+
+  ctx->total[0] = ctx->total[1] = 0;
+  ctx->buflen = 0;
+}
+
+/* Put result from CTX in first 16 bytes following RESBUF.  The result
+   must be in little endian byte order.
+
+   IMPORTANT: RESBUF may not be aligned as strongly as MD5_UNIT32 so we
+   put things in a local (aligned) buffer first, then memcpy into RESBUF.  */
+void *
+md5_read_ctx (const struct md5_ctx *ctx, void *resbuf)
+{
+  md5_uint32 buffer[4];
+
+  buffer[0] = SWAP (ctx->A);
+  buffer[1] = SWAP (ctx->B);
+  buffer[2] = SWAP (ctx->C);
+  buffer[3] = SWAP (ctx->D);
+
+  memcpy (resbuf, buffer, 16);
+
+  return resbuf;
+}
+
+/* Process the remaining bytes in the internal buffer and the usual
+   prolog according to the standard and write the result to RESBUF.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32 bits value.  */
+void *
+md5_finish_ctx (struct md5_ctx *ctx, void *resbuf)
+{
+  /* Take yet unprocessed bytes into account.  */
+  md5_uint32 bytes = ctx->buflen;
+  size_t pad;
+
+  /* Now count remaining bytes.  */
+  ctx->total[0] += bytes;
+  if (ctx->total[0] < bytes)
+    ++ctx->total[1];
+
+  pad = bytes >= 56 ? 64 + 56 - bytes : 56 - bytes;
+  memcpy (&ctx->buffer[bytes], fillbuf, pad);
+
+  /* Put the 64-bit file length in *bits* at the end of the buffer.  */
+  *(md5_uint32 *) &ctx->buffer[bytes + pad] = SWAP (ctx->total[0] << 3);
+  *(md5_uint32 *) &ctx->buffer[bytes + pad + 4] = SWAP ((ctx->total[1] << 3) |
+							(ctx->total[0] >> 29));
+
+  /* Process last bytes.  */
+  md5_process_block (ctx->buffer, bytes + pad + 8, ctx);
+
+  return md5_read_ctx (ctx, resbuf);
+}
+
+/* Compute MD5 message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 16 bytes
+   beginning at RESBLOCK.  */
+int
+md5_stream (FILE *stream, void *resblock)
+{
+  /* Important: BLOCKSIZE must be a multiple of 64.  */
+#define BLOCKSIZE 4096
+  struct md5_ctx ctx;
+  char buffer[BLOCKSIZE + 72];
+  size_t sum;
+
+  /* Initialize the computation context.  */
+  md5_init_ctx (&ctx);
+
+  /* Iterate over full file contents.  */
+  while (1)
+    {
+      /* We read the file in blocks of BLOCKSIZE bytes.  One call of the
+	 computation function processes the whole buffer so that with the
+	 next round of the loop another block can be read.  */
+      size_t n;
+      sum = 0;
+
+      /* Read block.  Take care for partial reads.  */
+      do
+	{
+	  n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream);
+
+	  sum += n;
+	}
+      while (sum < BLOCKSIZE && n != 0);
+      if (n == 0 && ferror (stream))
+        return 1;
+
+      /* If end of file is reached, end the loop.  */
+      if (n == 0)
+	break;
+
+      /* Process buffer with BLOCKSIZE bytes.  Note that
+			BLOCKSIZE % 64 == 0
+       */
+      md5_process_block (buffer, BLOCKSIZE, &ctx);
+    }
+
+  /* Add the last bytes if necessary.  */
+  if (sum > 0)
+    md5_process_bytes (buffer, sum, &ctx);
+
+  /* Construct result in desired memory.  */
+  md5_finish_ctx (&ctx, resblock);
+  return 0;
+}
+
+/* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
+   result is always in little endian byte order, so that a byte-wise
+   output yields to the wanted ASCII representation of the message
+   digest.  */
+void *
+md5_buffer (const char *buffer, size_t len, void *resblock)
+{
+  struct md5_ctx ctx;
+
+  /* Initialize the computation context.  */
+  md5_init_ctx (&ctx);
+
+  /* Process whole buffer but last len % 64 bytes.  */
+  md5_process_bytes (buffer, len, &ctx);
+
+  /* Put result in desired memory area.  */
+  return md5_finish_ctx (&ctx, resblock);
+}
+
+
+void
+md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
+{
+  /* When we already have some bits in our internal buffer concatenate
+     both inputs first.  */
+  if (ctx->buflen != 0)
+    {
+      size_t left_over = ctx->buflen;
+      size_t add = 128 - left_over > len ? len : 128 - left_over;
+
+      memcpy (&ctx->buffer[left_over], buffer, add);
+      ctx->buflen += add;
+
+      if (left_over + add > 64)
+	{
+	  md5_process_block (ctx->buffer, (left_over + add) & ~63, ctx);
+	  /* The regions in the following copy operation cannot overlap.  */
+	  memcpy (ctx->buffer, &ctx->buffer[(left_over + add) & ~63],
+		  (left_over + add) & 63);
+	  ctx->buflen = (left_over + add) & 63;
+	}
+
+      buffer = (const void *) ((const char *) buffer + add);
+      len -= add;
+    }
+
+  /* Process available complete blocks.  */
+  if (len > 64)
+    {
+#if !_STRING_ARCH_unaligned
+/* To check alignment gcc has an appropriate operator.  Other
+   compilers don't.  */
+# if __GNUC__ >= 2
+#  define UNALIGNED_P(p) (((md5_uintptr) p) % __alignof__ (md5_uint32) != 0)
+# else
+#  define UNALIGNED_P(p) (((md5_uintptr) p) % sizeof (md5_uint32) != 0)
+# endif
+      if (UNALIGNED_P (buffer))
+        while (len > 64)
+          {
+	    memcpy (ctx->buffer, buffer, 64);
+            md5_process_block (ctx->buffer, 64, ctx);
+            buffer = (const char *) buffer + 64;
+            len -= 64;
+          }
+      else
+#endif
+      md5_process_block (buffer, len & ~63, ctx);
+      buffer = (const void *) ((const char *) buffer + (len & ~63));
+      len &= 63;
+    }
+
+  /* Move remaining bytes in internal buffer.  */
+  if (len > 0)
+    {
+      memcpy (ctx->buffer, buffer, len);
+      ctx->buflen = len;
+    }
+}
+
+
+/* These are the four functions used in the four steps of the MD5 algorithm
+   and defined in the RFC 1321.  The first function is a little bit optimized
+   (as found in Colin Plumbs public domain implementation).  */
+/* #define FF(b, c, d) ((b & c) | (~b & d)) */
+#define FF(b, c, d) (d ^ (b & (c ^ d)))
+#define FG(b, c, d) FF (d, b, c)
+#define FH(b, c, d) (b ^ c ^ d)
+#define FI(b, c, d) (c ^ (b | ~d))
+
+/* Process LEN bytes of BUFFER, accumulating context into CTX.
+   It is assumed that LEN % 64 == 0.  */
+
+void
+md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
+{
+  md5_uint32 correct_words[16];
+  const md5_uint32 *words = (const md5_uint32 *) buffer;
+  size_t nwords = len / sizeof (md5_uint32);
+  const md5_uint32 *endp = words + nwords;
+  md5_uint32 A = ctx->A;
+  md5_uint32 B = ctx->B;
+  md5_uint32 C = ctx->C;
+  md5_uint32 D = ctx->D;
+
+  /* First increment the byte count.  RFC 1321 specifies the possible
+     length of the file up to 2^64 bits.  Here we only compute the
+     number of bytes.  Do a double word increment.  */
+  ctx->total[0] += len;
+  if (ctx->total[0] < len)
+    ++ctx->total[1];
+
+  /* Process all bytes in the buffer with 64 bytes in each round of
+     the loop.  */
+  while (words < endp)
+    {
+      md5_uint32 *cwp = correct_words;
+      md5_uint32 A_save = A;
+      md5_uint32 B_save = B;
+      md5_uint32 C_save = C;
+      md5_uint32 D_save = D;
+
+      /* First round: using the given function, the context and a constant
+	 the next context is computed.  Because the algorithms processing
+	 unit is a 32-bit word and it is determined to work on words in
+	 little endian byte order we perhaps have to change the byte order
+	 before the computation.  To reduce the work for the next steps
+	 we store the swapped words in the array CORRECT_WORDS.  */
+
+#define OP(a, b, c, d, s, T)						\
+      do								\
+        {								\
+	  a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T;		\
+	  ++words;							\
+	  CYCLIC (a, s);						\
+	  a += b;							\
+        }								\
+      while (0)
+
+      /* It is unfortunate that C does not provide an operator for
+	 cyclic rotation.  Hope the C compiler is smart enough.  */
+#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
+
+      /* Before we start, one word to the strange constants.
+	 They are defined in RFC 1321 as
+
+	 T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
+       */
+
+      /* Round 1.  */
+      OP (A, B, C, D,  7, (md5_uint32) 0xd76aa478);
+      OP (D, A, B, C, 12, (md5_uint32) 0xe8c7b756);
+      OP (C, D, A, B, 17, (md5_uint32) 0x242070db);
+      OP (B, C, D, A, 22, (md5_uint32) 0xc1bdceee);
+      OP (A, B, C, D,  7, (md5_uint32) 0xf57c0faf);
+      OP (D, A, B, C, 12, (md5_uint32) 0x4787c62a);
+      OP (C, D, A, B, 17, (md5_uint32) 0xa8304613);
+      OP (B, C, D, A, 22, (md5_uint32) 0xfd469501);
+      OP (A, B, C, D,  7, (md5_uint32) 0x698098d8);
+      OP (D, A, B, C, 12, (md5_uint32) 0x8b44f7af);
+      OP (C, D, A, B, 17, (md5_uint32) 0xffff5bb1);
+      OP (B, C, D, A, 22, (md5_uint32) 0x895cd7be);
+      OP (A, B, C, D,  7, (md5_uint32) 0x6b901122);
+      OP (D, A, B, C, 12, (md5_uint32) 0xfd987193);
+      OP (C, D, A, B, 17, (md5_uint32) 0xa679438e);
+      OP (B, C, D, A, 22, (md5_uint32) 0x49b40821);
+
+      /* For the second to fourth round we have the possibly swapped words
+	 in CORRECT_WORDS.  Redefine the macro to take an additional first
+	 argument specifying the function to use.  */
+#undef OP
+#define OP(a, b, c, d, k, s, T)						\
+      do 								\
+	{								\
+	  a += FX (b, c, d) + correct_words[k] + T;			\
+	  CYCLIC (a, s);						\
+	  a += b;							\
+	}								\
+      while (0)
+
+#define FX(b, c, d) FG (b, c, d)
+
+      /* Round 2.  */
+      OP (A, B, C, D,  1,  5, (md5_uint32) 0xf61e2562);
+      OP (D, A, B, C,  6,  9, (md5_uint32) 0xc040b340);
+      OP (C, D, A, B, 11, 14, (md5_uint32) 0x265e5a51);
+      OP (B, C, D, A,  0, 20, (md5_uint32) 0xe9b6c7aa);
+      OP (A, B, C, D,  5,  5, (md5_uint32) 0xd62f105d);
+      OP (D, A, B, C, 10,  9, (md5_uint32) 0x02441453);
+      OP (C, D, A, B, 15, 14, (md5_uint32) 0xd8a1e681);
+      OP (B, C, D, A,  4, 20, (md5_uint32) 0xe7d3fbc8);
+      OP (A, B, C, D,  9,  5, (md5_uint32) 0x21e1cde6);
+      OP (D, A, B, C, 14,  9, (md5_uint32) 0xc33707d6);
+      OP (C, D, A, B,  3, 14, (md5_uint32) 0xf4d50d87);
+      OP (B, C, D, A,  8, 20, (md5_uint32) 0x455a14ed);
+      OP (A, B, C, D, 13,  5, (md5_uint32) 0xa9e3e905);
+      OP (D, A, B, C,  2,  9, (md5_uint32) 0xfcefa3f8);
+      OP (C, D, A, B,  7, 14, (md5_uint32) 0x676f02d9);
+      OP (B, C, D, A, 12, 20, (md5_uint32) 0x8d2a4c8a);
+
+#undef FX
+#define FX(b, c, d) FH (b, c, d)
+
+      /* Round 3.  */
+      OP (A, B, C, D,  5,  4, (md5_uint32) 0xfffa3942);
+      OP (D, A, B, C,  8, 11, (md5_uint32) 0x8771f681);
+      OP (C, D, A, B, 11, 16, (md5_uint32) 0x6d9d6122);
+      OP (B, C, D, A, 14, 23, (md5_uint32) 0xfde5380c);
+      OP (A, B, C, D,  1,  4, (md5_uint32) 0xa4beea44);
+      OP (D, A, B, C,  4, 11, (md5_uint32) 0x4bdecfa9);
+      OP (C, D, A, B,  7, 16, (md5_uint32) 0xf6bb4b60);
+      OP (B, C, D, A, 10, 23, (md5_uint32) 0xbebfbc70);
+      OP (A, B, C, D, 13,  4, (md5_uint32) 0x289b7ec6);
+      OP (D, A, B, C,  0, 11, (md5_uint32) 0xeaa127fa);
+      OP (C, D, A, B,  3, 16, (md5_uint32) 0xd4ef3085);
+      OP (B, C, D, A,  6, 23, (md5_uint32) 0x04881d05);
+      OP (A, B, C, D,  9,  4, (md5_uint32) 0xd9d4d039);
+      OP (D, A, B, C, 12, 11, (md5_uint32) 0xe6db99e5);
+      OP (C, D, A, B, 15, 16, (md5_uint32) 0x1fa27cf8);
+      OP (B, C, D, A,  2, 23, (md5_uint32) 0xc4ac5665);
+
+#undef FX
+#define FX(b, c, d) FI (b, c, d)
+
+      /* Round 4.  */
+      OP (A, B, C, D,  0,  6, (md5_uint32) 0xf4292244);
+      OP (D, A, B, C,  7, 10, (md5_uint32) 0x432aff97);
+      OP (C, D, A, B, 14, 15, (md5_uint32) 0xab9423a7);
+      OP (B, C, D, A,  5, 21, (md5_uint32) 0xfc93a039);
+      OP (A, B, C, D, 12,  6, (md5_uint32) 0x655b59c3);
+      OP (D, A, B, C,  3, 10, (md5_uint32) 0x8f0ccc92);
+      OP (C, D, A, B, 10, 15, (md5_uint32) 0xffeff47d);
+      OP (B, C, D, A,  1, 21, (md5_uint32) 0x85845dd1);
+      OP (A, B, C, D,  8,  6, (md5_uint32) 0x6fa87e4f);
+      OP (D, A, B, C, 15, 10, (md5_uint32) 0xfe2ce6e0);
+      OP (C, D, A, B,  6, 15, (md5_uint32) 0xa3014314);
+      OP (B, C, D, A, 13, 21, (md5_uint32) 0x4e0811a1);
+      OP (A, B, C, D,  4,  6, (md5_uint32) 0xf7537e82);
+      OP (D, A, B, C, 11, 10, (md5_uint32) 0xbd3af235);
+      OP (C, D, A, B,  2, 15, (md5_uint32) 0x2ad7d2bb);
+      OP (B, C, D, A,  9, 21, (md5_uint32) 0xeb86d391);
+
+      /* Add the starting values of the context.  */
+      A += A_save;
+      B += B_save;
+      C += C_save;
+      D += D_save;
+    }
+
+  /* Put checksum in context given as argument.  */
+  ctx->A = A;
+  ctx->B = B;
+  ctx->C = C;
+  ctx->D = D;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/memchr.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/memchr.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/memchr.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/memchr.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+
+@deftypefn Supplemental void* memchr (const void *@var{s}, int @var{c}, @
+  size_t @var{n})
+
+This function searches memory starting at @code{*@var{s}} for the
+character @var{c}.  The search only ends with the first occurrence of
+@var{c}, or after @var{length} characters; in particular, a null
+character does not terminate the search.  If the character @var{c} is
+found within @var{length} characters of @code{*@var{s}}, a pointer
+to the character is returned.  If @var{c} is not found, then @code{NULL} is
+returned.
+
+@end deftypefn
+
+*/
+
+#include <ansidecl.h>
+#include <stddef.h>
+
+PTR
+memchr (register const PTR src_void, int c, size_t length)
+{
+  const unsigned char *src = (const unsigned char *)src_void;
+  
+  while (length-- > 0)
+  {
+    if (*src == c)
+     return (PTR)src;
+    src++;
+  }
+  return NULL;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/memcmp.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/memcmp.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/memcmp.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/memcmp.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,35 @@
+/* memcmp -- compare two memory regions.
+   This function is in the public domain.  */
+
+/*
+
+@deftypefn Supplemental int memcmp (const void *@var{x}, const void *@var{y}, @
+  size_t @var{count})
+
+Compares the first @var{count} bytes of two areas of memory.  Returns
+zero if they are the same, a value less than zero if @var{x} is
+lexically less than @var{y}, or a value greater than zero if @var{x}
+is lexically greater than @var{y}.  Note that lexical order is determined
+as if comparing unsigned char arrays.
+
+@end deftypefn
+
+*/
+
+#include <ansidecl.h>
+#include <stddef.h>
+
+int
+memcmp (const PTR str1, const PTR str2, size_t count)
+{
+  register const unsigned char *s1 = (const unsigned char*)str1;
+  register const unsigned char *s2 = (const unsigned char*)str2;
+
+  while (count-- > 0)
+    {
+      if (*s1++ != *s2++)
+	  return s1[-1] < s2[-1] ? -1 : 1;
+    }
+  return 0;
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/memcpy.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/memcpy.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/memcpy.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/memcpy.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,26 @@
+/* memcpy (the standard C function)
+   This function is in the public domain.  */
+
+/*
+
+@deftypefn Supplemental void* memcpy (void *@var{out}, const void *@var{in}, @
+  size_t @var{length})
+
+Copies @var{length} bytes from memory region @var{in} to region
+@var{out}.  Returns a pointer to @var{out}.
+
+@end deftypefn
+
+*/
+
+#include <ansidecl.h>
+#include <stddef.h>
+
+void bcopy (const void*, void*, size_t);
+
+PTR
+memcpy (PTR out, const PTR in, size_t length)
+{
+    bcopy(in, out, length);
+    return out;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/memmem.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/memmem.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/memmem.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/memmem.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,71 @@
+/* Copyright (C) 1991,92,93,94,96,97,98,2000,2004,2007,2011 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/*
+
+@deftypefn Supplemental void* memmem (const void *@var{haystack}, @
+  size_t @var{haystack_len} const void *@var{needle}, size_t @var{needle_len})
+
+Returns a pointer to the first occurrence of @var{needle} (length
+@var{needle_len}) in @var{haystack} (length @var{haystack_len}).
+Returns @code{NULL} if not found.
+
+@end deftypefn
+
+*/
+
+#ifndef _LIBC
+# include <config.h>
+#endif
+
+#include <stddef.h>
+#include <string.h>
+
+#ifndef _LIBC
+# define __builtin_expect(expr, val)   (expr)
+#endif
+
+#undef memmem
+
+/* Return the first occurrence of NEEDLE in HAYSTACK.  */
+void *
+memmem (const void *haystack, size_t haystack_len, const void *needle,
+	size_t needle_len)
+{
+  const char *begin;
+  const char *const last_possible
+    = (const char *) haystack + haystack_len - needle_len;
+
+  if (needle_len == 0)
+    /* The first occurrence of the empty string is deemed to occur at
+       the beginning of the string.  */
+    return (void *) haystack;
+
+  /* Sanity check, otherwise the loop might search through the whole
+     memory.  */
+  if (__builtin_expect (haystack_len < needle_len, 0))
+    return NULL;
+
+  for (begin = (const char *) haystack; begin <= last_possible; ++begin)
+    if (begin[0] == ((const char *) needle)[0] &&
+	!memcmp ((const void *) &begin[1],
+		 (const void *) ((const char *) needle + 1),
+		 needle_len - 1))
+      return (void *) begin;
+
+  return NULL;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/memmove.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/memmove.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/memmove.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/memmove.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,26 @@
+/* Wrapper to implement ANSI C's memmove using BSD's bcopy. */
+/* This function is in the public domain.  --Per Bothner. */
+
+/*
+
+@deftypefn Supplemental void* memmove (void *@var{from}, const void *@var{to}, @
+  size_t @var{count})
+
+Copies @var{count} bytes from memory area @var{from} to memory area
+@var{to}, returning a pointer to @var{to}.
+
+@end deftypefn
+
+*/
+
+#include <ansidecl.h>
+#include <stddef.h>
+
+void bcopy (const void*, void*, size_t);
+
+PTR
+memmove (PTR s1, const PTR s2, size_t n)
+{
+  bcopy (s2, s1, n);
+  return s1;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/mempcpy.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/mempcpy.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/mempcpy.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/mempcpy.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,42 @@
+/* Implement the mempcpy function.
+   Copyright (C) 2003, 2004, 2005, 2011 Free Software Foundation, Inc.
+   Written by Kaveh R. Ghazi <ghazi@caip.rutgers.edu>.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/*
+
+@deftypefn Supplemental void* mempcpy (void *@var{out}, const void *@var{in}, @
+  size_t @var{length})
+
+Copies @var{length} bytes from memory region @var{in} to region
+@var{out}.  Returns a pointer to @var{out} + @var{length}.
+
+@end deftypefn
+
+*/
+
+#include <ansidecl.h>
+#include <stddef.h>
+
+extern PTR memcpy (PTR, const PTR, size_t);
+
+PTR
+mempcpy (PTR dst, const PTR src, size_t len)
+{
+  return (char *) memcpy (dst, src, len) + len;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/memset.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/memset.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/memset.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/memset.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,26 @@
+/* memset
+   This implementation is in the public domain.  */
+
+/*
+
+@deftypefn Supplemental void* memset (void *@var{s}, int @var{c}, @
+  size_t @var{count})
+
+Sets the first @var{count} bytes of @var{s} to the constant byte
+@var{c}, returning a pointer to @var{s}.
+
+@end deftypefn
+
+*/
+
+#include <ansidecl.h>
+#include <stddef.h>
+
+PTR
+memset (PTR dest, register int val, register size_t len)
+{
+  register unsigned char *ptr = (unsigned char*)dest;
+  while (len-- > 0)
+    *ptr++ = val;
+  return dest;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/mkstemps.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/mkstemps.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/mkstemps.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/mkstemps.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,147 @@
+/* Copyright (C) 1991, 1992, 1996, 1998, 2004 Free Software Foundation, Inc.
+   This file is derived from mkstemp.c from the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/types.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <errno.h>
+#include <stdio.h>
+#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include "ansidecl.h"
+
+/* We need to provide a type for gcc_uint64_t.  */
+#ifdef __GNUC__
+__extension__ typedef unsigned long long gcc_uint64_t;
+#else
+typedef unsigned long gcc_uint64_t;
+#endif
+
+#ifndef TMP_MAX
+#define TMP_MAX 16384
+#endif
+
+#ifndef O_BINARY
+# define O_BINARY 0
+#endif
+
+/*
+
+@deftypefn Replacement int mkstemps (char *@var{pattern}, int @var{suffix_len})
+
+Generate a unique temporary file name from @var{pattern}.
+@var{pattern} has the form:
+
+@example
+   @var{path}/ccXXXXXX@var{suffix}
+@end example
+
+@var{suffix_len} tells us how long @var{suffix} is (it can be zero
+length).  The last six characters of @var{pattern} before @var{suffix}
+must be @samp{XXXXXX}; they are replaced with a string that makes the
+filename unique.  Returns a file descriptor open on the file for
+reading and writing.
+
+@end deftypefn
+
+*/
+
+int
+mkstemps (char *pattern, int suffix_len)
+{
+  static const char letters[]
+    = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+  static gcc_uint64_t value;
+#ifdef HAVE_GETTIMEOFDAY
+  struct timeval tv;
+#endif
+  char *XXXXXX;
+  size_t len;
+  int count;
+
+  len = strlen (pattern);
+
+  if ((int) len < 6 + suffix_len
+      || strncmp (&pattern[len - 6 - suffix_len], "XXXXXX", 6))
+    {
+      return -1;
+    }
+
+  XXXXXX = &pattern[len - 6 - suffix_len];
+
+#ifdef HAVE_GETTIMEOFDAY
+  /* Get some more or less random data.  */
+  gettimeofday (&tv, NULL);
+  value += ((gcc_uint64_t) tv.tv_usec << 16) ^ tv.tv_sec ^ getpid ();
+#else
+  value += getpid ();
+#endif
+
+  for (count = 0; count < TMP_MAX; ++count)
+    {
+      gcc_uint64_t v = value;
+      int fd;
+
+      /* Fill in the random bits.  */
+      XXXXXX[0] = letters[v % 62];
+      v /= 62;
+      XXXXXX[1] = letters[v % 62];
+      v /= 62;
+      XXXXXX[2] = letters[v % 62];
+      v /= 62;
+      XXXXXX[3] = letters[v % 62];
+      v /= 62;
+      XXXXXX[4] = letters[v % 62];
+      v /= 62;
+      XXXXXX[5] = letters[v % 62];
+
+      fd = open (pattern, O_BINARY|O_RDWR|O_CREAT|O_EXCL, 0600);
+      if (fd >= 0)
+	/* The file does not exist.  */
+	return fd;
+      if (errno != EEXIST
+#ifdef EISDIR
+	  && errno != EISDIR
+#endif
+	 )
+	/* Fatal error (EPERM, ENOSPC etc).  Doesn't make sense to loop.  */
+	break;
+
+      /* This is a random value.  It is only necessary that the next
+	 TMP_MAX values generated by adding 7777 to VALUE are different
+	 with (module 2^32).  */
+      value += 7777;
+    }
+
+  /* We return the null string if we can't find a unique file name.  */
+  pattern[0] = '\0';
+  return -1;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/msdos.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/msdos.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/msdos.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/msdos.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,15 @@
+char msg[] = "No vfork available - aborting\n";
+vfork()
+{
+  write(1, msg, sizeof(msg));
+}
+
+sigsetmask()
+{
+  /* no signals support in go32 (yet) */
+}
+
+waitpid()
+{
+  return -1;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/objalloc.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/objalloc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/objalloc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/objalloc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,291 @@
+/* objalloc.c -- routines to allocate memory for objects
+   Copyright 1997 Free Software Foundation, Inc.
+   Written by Ian Lance Taylor, Cygnus Solutions.
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#include "config.h"
+#include "ansidecl.h"
+
+#include "objalloc.h"
+
+/* Get a definition for NULL.  */
+#include <stdio.h>
+
+#if VMS
+#include <stdlib.h>
+#include <unixlib.h>
+#else
+
+/* Get a definition for size_t.  */
+#include <stddef.h>
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#else
+/* For systems with larger pointers than ints, this must be declared.  */
+extern PTR malloc (size_t);
+extern void free (PTR);
+#endif
+
+#endif
+
+/* These routines allocate space for an object.  Freeing allocated
+   space may or may not free all more recently allocated space.
+
+   We handle large and small allocation requests differently.  If we
+   don't have enough space in the current block, and the allocation
+   request is for more than 512 bytes, we simply pass it through to
+   malloc.  */
+
+/* The objalloc structure is defined in objalloc.h.  */
+
+/* This structure appears at the start of each chunk.  */
+
+struct objalloc_chunk
+{
+  /* Next chunk.  */
+  struct objalloc_chunk *next;
+  /* If this chunk contains large objects, this is the value of
+     current_ptr when this chunk was allocated.  If this chunk
+     contains small objects, this is NULL.  */
+  char *current_ptr;
+};
+
+/* The aligned size of objalloc_chunk.  */
+
+#define CHUNK_HEADER_SIZE					\
+  ((sizeof (struct objalloc_chunk) + OBJALLOC_ALIGN - 1)	\
+   &~ (OBJALLOC_ALIGN - 1))
+
+/* We ask for this much memory each time we create a chunk which is to
+   hold small objects.  */
+
+#define CHUNK_SIZE (4096 - 32)
+
+/* A request for this amount or more is just passed through to malloc.  */
+
+#define BIG_REQUEST (512)
+
+/* Create an objalloc structure.  */
+
+struct objalloc *
+objalloc_create (void)
+{
+  struct objalloc *ret;
+  struct objalloc_chunk *chunk;
+
+  ret = (struct objalloc *) malloc (sizeof *ret);
+  if (ret == NULL)
+    return NULL;
+
+  ret->chunks = (PTR) malloc (CHUNK_SIZE);
+  if (ret->chunks == NULL)
+    {
+      free (ret);
+      return NULL;
+    }
+
+  chunk = (struct objalloc_chunk *) ret->chunks;
+  chunk->next = NULL;
+  chunk->current_ptr = NULL;
+
+  ret->current_ptr = (char *) chunk + CHUNK_HEADER_SIZE;
+  ret->current_space = CHUNK_SIZE - CHUNK_HEADER_SIZE;
+
+  return ret;
+}
+
+/* Allocate space from an objalloc structure.  */
+
+PTR
+_objalloc_alloc (struct objalloc *o, unsigned long len)
+{
+  /* We avoid confusion from zero sized objects by always allocating
+     at least 1 byte.  */
+  if (len == 0)
+    len = 1;
+
+  len = (len + OBJALLOC_ALIGN - 1) &~ (OBJALLOC_ALIGN - 1);
+
+  if (len <= o->current_space)
+    {
+      o->current_ptr += len;
+      o->current_space -= len;
+      return (PTR) (o->current_ptr - len);
+    }
+
+  if (len >= BIG_REQUEST)
+    {
+      char *ret;
+      struct objalloc_chunk *chunk;
+
+      ret = (char *) malloc (CHUNK_HEADER_SIZE + len);
+      if (ret == NULL)
+	return NULL;
+
+      chunk = (struct objalloc_chunk *) ret;
+      chunk->next = (struct objalloc_chunk *) o->chunks;
+      chunk->current_ptr = o->current_ptr;
+
+      o->chunks = (PTR) chunk;
+
+      return (PTR) (ret + CHUNK_HEADER_SIZE);
+    }
+  else
+    {
+      struct objalloc_chunk *chunk;
+
+      chunk = (struct objalloc_chunk *) malloc (CHUNK_SIZE);
+      if (chunk == NULL)
+	return NULL;
+      chunk->next = (struct objalloc_chunk *) o->chunks;
+      chunk->current_ptr = NULL;
+
+      o->current_ptr = (char *) chunk + CHUNK_HEADER_SIZE;
+      o->current_space = CHUNK_SIZE - CHUNK_HEADER_SIZE;
+
+      o->chunks = (PTR) chunk;
+
+      return objalloc_alloc (o, len);
+    }
+}
+
+/* Free an entire objalloc structure.  */
+
+void
+objalloc_free (struct objalloc *o)
+{
+  struct objalloc_chunk *l;
+
+  l = (struct objalloc_chunk *) o->chunks;
+  while (l != NULL)
+    {
+      struct objalloc_chunk *next;
+
+      next = l->next;
+      free (l);
+      l = next;
+    }
+
+  free (o);
+}
+
+/* Free a block from an objalloc structure.  This also frees all more
+   recently allocated blocks.  */
+
+void
+objalloc_free_block (struct objalloc *o, PTR block)
+{
+  struct objalloc_chunk *p, *small;
+  char *b = (char *) block;
+
+  /* First set P to the chunk which contains the block we are freeing,
+     and set Q to the last small object chunk we see before P.  */
+  small = NULL;
+  for (p = (struct objalloc_chunk *) o->chunks; p != NULL; p = p->next)
+    {
+      if (p->current_ptr == NULL)
+	{
+	  if (b > (char *) p && b < (char *) p + CHUNK_SIZE)
+	    break;
+	  small = p;
+	}
+      else
+	{
+	  if (b == (char *) p + CHUNK_HEADER_SIZE)
+	    break;
+	}
+    }
+
+  /* If we can't find the chunk, the caller has made a mistake.  */
+  if (p == NULL)
+    abort ();
+
+  if (p->current_ptr == NULL)
+    {
+      struct objalloc_chunk *q;
+      struct objalloc_chunk *first;
+
+      /* The block is in a chunk containing small objects.  We can
+	 free every chunk through SMALL, because they have certainly
+	 been allocated more recently.  After SMALL, we will not see
+	 any chunks containing small objects; we can free any big
+	 chunk if the current_ptr is greater than or equal to B.  We
+	 can then reset the new current_ptr to B.  */
+
+      first = NULL;
+      q = (struct objalloc_chunk *) o->chunks;
+      while (q != p)
+	{
+	  struct objalloc_chunk *next;
+
+	  next = q->next;
+	  if (small != NULL)
+	    {
+	      if (small == q)
+		small = NULL;
+	      free (q);
+	    }
+	  else if (q->current_ptr > b)
+	    free (q);
+	  else if (first == NULL)
+	    first = q;
+
+	  q = next;
+	}
+
+      if (first == NULL)
+	first = p;
+      o->chunks = (PTR) first;
+
+      /* Now start allocating from this small block again.  */
+      o->current_ptr = b;
+      o->current_space = ((char *) p + CHUNK_SIZE) - b;
+    }
+  else
+    {
+      struct objalloc_chunk *q;
+      char *current_ptr;
+
+      /* This block is in a large chunk by itself.  We can free
+         everything on the list up to and including this block.  We
+         then start allocating from the next chunk containing small
+         objects, setting current_ptr from the value stored with the
+         large chunk we are freeing.  */
+
+      current_ptr = p->current_ptr;
+      p = p->next;
+
+      q = (struct objalloc_chunk *) o->chunks;
+      while (q != p)
+	{
+	  struct objalloc_chunk *next;
+
+	  next = q->next;
+	  free (q);
+	  q = next;
+	}
+
+      o->chunks = (PTR) p;
+
+      while (p->current_ptr != NULL)
+	p = p->next;
+
+      o->current_ptr = current_ptr;
+      o->current_space = ((char *) p + CHUNK_SIZE) - current_ptr;
+    }
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/obstack.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/obstack.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/obstack.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/obstack.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,510 @@
+/* obstack.c - subroutines used implicitly by object stack macros
+   Copyright (C) 1988,89,90,91,92,93,94,96,97 Free Software Foundation, Inc.
+
+
+   NOTE: This source is derived from an old version taken from the GNU C
+   Library (glibc).
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "obstack.h"
+
+/* NOTE BEFORE MODIFYING THIS FILE: This version number must be
+   incremented whenever callers compiled using an old obstack.h can no
+   longer properly call the functions in this obstack.c.  */
+#define OBSTACK_INTERFACE_VERSION 1
+
+/* Comment out all this code if we are using the GNU C Library, and are not
+   actually compiling the library itself, and the installed library
+   supports the same library interface we do.  This code is part of the GNU
+   C Library, but also included in many other GNU distributions.  Compiling
+   and linking in this code is a waste when using the GNU C library
+   (especially if it is a shared library).  Rather than having every GNU
+   program understand `configure --with-gnu-libc' and omit the object
+   files, it is simpler to just do this in the source for each such file.  */
+
+#include <stdio.h>		/* Random thing to get __GNU_LIBRARY__.  */
+#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
+#include <gnu-versions.h>
+#if _GNU_OBSTACK_INTERFACE_VERSION == OBSTACK_INTERFACE_VERSION
+#define ELIDE_CODE
+#endif
+#endif
+
+
+#ifndef ELIDE_CODE
+
+
+#define POINTER void *
+
+/* Determine default alignment.  */
+struct fooalign {char x; double d;};
+#define DEFAULT_ALIGNMENT  \
+  ((PTR_INT_TYPE) ((char *) &((struct fooalign *) 0)->d - (char *) 0))
+/* If malloc were really smart, it would round addresses to DEFAULT_ALIGNMENT.
+   But in fact it might be less smart and round addresses to as much as
+   DEFAULT_ROUNDING.  So we prepare for it to do that.  */
+union fooround {long x; double d;};
+#define DEFAULT_ROUNDING (sizeof (union fooround))
+
+/* When we copy a long block of data, this is the unit to do it with.
+   On some machines, copying successive ints does not work;
+   in such a case, redefine COPYING_UNIT to `long' (if that works)
+   or `char' as a last resort.  */
+#ifndef COPYING_UNIT
+#define COPYING_UNIT int
+#endif
+
+
+/* The functions allocating more room by calling `obstack_chunk_alloc'
+   jump to the handler pointed to by `obstack_alloc_failed_handler'.
+   This variable by default points to the internal function
+   `print_and_abort'.  */
+static void print_and_abort (void);
+void (*obstack_alloc_failed_handler) (void) = print_and_abort;
+
+/* Exit value used when `print_and_abort' is used.  */
+#if defined __GNU_LIBRARY__ || defined HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifndef EXIT_FAILURE
+#define EXIT_FAILURE 1
+#endif
+int obstack_exit_failure = EXIT_FAILURE;
+
+/* The non-GNU-C macros copy the obstack into this global variable
+   to avoid multiple evaluation.  */
+
+struct obstack *_obstack;
+
+/* Define a macro that either calls functions with the traditional malloc/free
+   calling interface, or calls functions with the mmalloc/mfree interface
+   (that adds an extra first argument), based on the state of use_extra_arg.
+   For free, do not use ?:, since some compilers, like the MIPS compilers,
+   do not allow (expr) ? void : void.  */
+
+#if defined (__STDC__) && __STDC__
+#define CALL_CHUNKFUN(h, size) \
+  (((h) -> use_extra_arg) \
+   ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \
+   : (*(struct _obstack_chunk *(*) (long)) (h)->chunkfun) ((size)))
+
+#define CALL_FREEFUN(h, old_chunk) \
+  do { \
+    if ((h) -> use_extra_arg) \
+      (*(h)->freefun) ((h)->extra_arg, (old_chunk)); \
+    else \
+      (*(void (*) (void *)) (h)->freefun) ((old_chunk)); \
+  } while (0)
+#else
+#define CALL_CHUNKFUN(h, size) \
+  (((h) -> use_extra_arg) \
+   ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \
+   : (*(struct _obstack_chunk *(*) ()) (h)->chunkfun) ((size)))
+
+#define CALL_FREEFUN(h, old_chunk) \
+  do { \
+    if ((h) -> use_extra_arg) \
+      (*(h)->freefun) ((h)->extra_arg, (old_chunk)); \
+    else \
+      (*(void (*) ()) (h)->freefun) ((old_chunk)); \
+  } while (0)
+#endif
+
+
+/* Initialize an obstack H for use.  Specify chunk size SIZE (0 means default).
+   Objects start on multiples of ALIGNMENT (0 means use default).
+   CHUNKFUN is the function to use to allocate chunks,
+   and FREEFUN the function to free them.
+
+   Return nonzero if successful, zero if out of memory.
+   To recover from an out of memory error,
+   free up some memory, then call this again.  */
+
+int
+_obstack_begin (struct obstack *h, int size, int alignment,
+                POINTER (*chunkfun) (long), void (*freefun) (void *))
+{
+  register struct _obstack_chunk *chunk; /* points to new chunk */
+
+  if (alignment == 0)
+    alignment = (int) DEFAULT_ALIGNMENT;
+  if (size == 0)
+    /* Default size is what GNU malloc can fit in a 4096-byte block.  */
+    {
+      /* 12 is sizeof (mhead) and 4 is EXTRA from GNU malloc.
+	 Use the values for range checking, because if range checking is off,
+	 the extra bytes won't be missed terribly, but if range checking is on
+	 and we used a larger request, a whole extra 4096 bytes would be
+	 allocated.
+
+	 These number are irrelevant to the new GNU malloc.  I suspect it is
+	 less sensitive to the size of the request.  */
+      int extra = ((((12 + DEFAULT_ROUNDING - 1) & ~(DEFAULT_ROUNDING - 1))
+		    + 4 + DEFAULT_ROUNDING - 1)
+		   & ~(DEFAULT_ROUNDING - 1));
+      size = 4096 - extra;
+    }
+
+  h->chunkfun = (struct _obstack_chunk * (*)(void *, long)) chunkfun;
+  h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun;
+  h->chunk_size = size;
+  h->alignment_mask = alignment - 1;
+  h->use_extra_arg = 0;
+
+  chunk = h->chunk = CALL_CHUNKFUN (h, h -> chunk_size);
+  if (!chunk)
+    (*obstack_alloc_failed_handler) ();
+  h->next_free = h->object_base = chunk->contents;
+  h->chunk_limit = chunk->limit
+    = (char *) chunk + h->chunk_size;
+  chunk->prev = 0;
+  /* The initial chunk now contains no empty object.  */
+  h->maybe_empty_object = 0;
+  h->alloc_failed = 0;
+  return 1;
+}
+
+int
+_obstack_begin_1 (struct obstack *h, int size, int alignment,
+                  POINTER (*chunkfun) (POINTER, long),
+                  void (*freefun) (POINTER, POINTER), POINTER arg)
+{
+  register struct _obstack_chunk *chunk; /* points to new chunk */
+
+  if (alignment == 0)
+    alignment = (int) DEFAULT_ALIGNMENT;
+  if (size == 0)
+    /* Default size is what GNU malloc can fit in a 4096-byte block.  */
+    {
+      /* 12 is sizeof (mhead) and 4 is EXTRA from GNU malloc.
+	 Use the values for range checking, because if range checking is off,
+	 the extra bytes won't be missed terribly, but if range checking is on
+	 and we used a larger request, a whole extra 4096 bytes would be
+	 allocated.
+
+	 These number are irrelevant to the new GNU malloc.  I suspect it is
+	 less sensitive to the size of the request.  */
+      int extra = ((((12 + DEFAULT_ROUNDING - 1) & ~(DEFAULT_ROUNDING - 1))
+		    + 4 + DEFAULT_ROUNDING - 1)
+		   & ~(DEFAULT_ROUNDING - 1));
+      size = 4096 - extra;
+    }
+
+  h->chunkfun = (struct _obstack_chunk * (*)(void *,long)) chunkfun;
+  h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun;
+  h->chunk_size = size;
+  h->alignment_mask = alignment - 1;
+  h->extra_arg = arg;
+  h->use_extra_arg = 1;
+
+  chunk = h->chunk = CALL_CHUNKFUN (h, h -> chunk_size);
+  if (!chunk)
+    (*obstack_alloc_failed_handler) ();
+  h->next_free = h->object_base = chunk->contents;
+  h->chunk_limit = chunk->limit
+    = (char *) chunk + h->chunk_size;
+  chunk->prev = 0;
+  /* The initial chunk now contains no empty object.  */
+  h->maybe_empty_object = 0;
+  h->alloc_failed = 0;
+  return 1;
+}
+
+/* Allocate a new current chunk for the obstack *H
+   on the assumption that LENGTH bytes need to be added
+   to the current object, or a new object of length LENGTH allocated.
+   Copies any partial object from the end of the old chunk
+   to the beginning of the new one.  */
+
+void
+_obstack_newchunk (struct obstack *h, int length)
+{
+  register struct _obstack_chunk *old_chunk = h->chunk;
+  register struct _obstack_chunk *new_chunk;
+  register long	new_size;
+  register long obj_size = h->next_free - h->object_base;
+  register long i;
+  long already;
+
+  /* Compute size for new chunk.  */
+  new_size = (obj_size + length) + (obj_size >> 3) + 100;
+  if (new_size < h->chunk_size)
+    new_size = h->chunk_size;
+
+  /* Allocate and initialize the new chunk.  */
+  new_chunk = CALL_CHUNKFUN (h, new_size);
+  if (!new_chunk)
+    (*obstack_alloc_failed_handler) ();
+  h->chunk = new_chunk;
+  new_chunk->prev = old_chunk;
+  new_chunk->limit = h->chunk_limit = (char *) new_chunk + new_size;
+
+  /* Move the existing object to the new chunk.
+     Word at a time is fast and is safe if the object
+     is sufficiently aligned.  */
+  if (h->alignment_mask + 1 >= DEFAULT_ALIGNMENT)
+    {
+      for (i = obj_size / sizeof (COPYING_UNIT) - 1;
+	   i >= 0; i--)
+	((COPYING_UNIT *)new_chunk->contents)[i]
+	  = ((COPYING_UNIT *)h->object_base)[i];
+      /* We used to copy the odd few remaining bytes as one extra COPYING_UNIT,
+	 but that can cross a page boundary on a machine
+	 which does not do strict alignment for COPYING_UNITS.  */
+      already = obj_size / sizeof (COPYING_UNIT) * sizeof (COPYING_UNIT);
+    }
+  else
+    already = 0;
+  /* Copy remaining bytes one by one.  */
+  for (i = already; i < obj_size; i++)
+    new_chunk->contents[i] = h->object_base[i];
+
+  /* If the object just copied was the only data in OLD_CHUNK,
+     free that chunk and remove it from the chain.
+     But not if that chunk might contain an empty object.  */
+  if (h->object_base == old_chunk->contents && ! h->maybe_empty_object)
+    {
+      new_chunk->prev = old_chunk->prev;
+      CALL_FREEFUN (h, old_chunk);
+    }
+
+  h->object_base = new_chunk->contents;
+  h->next_free = h->object_base + obj_size;
+  /* The new chunk certainly contains no empty object yet.  */
+  h->maybe_empty_object = 0;
+}
+
+/* Return nonzero if object OBJ has been allocated from obstack H.
+   This is here for debugging.
+   If you use it in a program, you are probably losing.  */
+
+/* Suppress -Wmissing-prototypes warning.  We don't want to declare this in
+   obstack.h because it is just for debugging.  */
+int _obstack_allocated_p (struct obstack *h, POINTER obj);
+
+int
+_obstack_allocated_p (struct obstack *h, POINTER obj)
+{
+  register struct _obstack_chunk *lp;	/* below addr of any objects in this chunk */
+  register struct _obstack_chunk *plp;	/* point to previous chunk if any */
+
+  lp = (h)->chunk;
+  /* We use >= rather than > since the object cannot be exactly at
+     the beginning of the chunk but might be an empty object exactly
+     at the end of an adjacent chunk.  */
+  while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj))
+    {
+      plp = lp->prev;
+      lp = plp;
+    }
+  return lp != 0;
+}
+
+/* Free objects in obstack H, including OBJ and everything allocate
+   more recently than OBJ.  If OBJ is zero, free everything in H.  */
+
+#undef obstack_free
+
+/* This function has two names with identical definitions.
+   This is the first one, called from non-ANSI code.  */
+
+void
+_obstack_free (struct obstack *h, POINTER obj)
+{
+  register struct _obstack_chunk *lp;	/* below addr of any objects in this chunk */
+  register struct _obstack_chunk *plp;	/* point to previous chunk if any */
+
+  lp = h->chunk;
+  /* We use >= because there cannot be an object at the beginning of a chunk.
+     But there can be an empty object at that address
+     at the end of another chunk.  */
+  while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj))
+    {
+      plp = lp->prev;
+      CALL_FREEFUN (h, lp);
+      lp = plp;
+      /* If we switch chunks, we can't tell whether the new current
+	 chunk contains an empty object, so assume that it may.  */
+      h->maybe_empty_object = 1;
+    }
+  if (lp)
+    {
+      h->object_base = h->next_free = (char *) (obj);
+      h->chunk_limit = lp->limit;
+      h->chunk = lp;
+    }
+  else if (obj != 0)
+    /* obj is not in any of the chunks! */
+    abort ();
+}
+
+/* This function is used from ANSI code.  */
+
+void
+obstack_free (struct obstack *h, POINTER obj)
+{
+  register struct _obstack_chunk *lp;	/* below addr of any objects in this chunk */
+  register struct _obstack_chunk *plp;	/* point to previous chunk if any */
+
+  lp = h->chunk;
+  /* We use >= because there cannot be an object at the beginning of a chunk.
+     But there can be an empty object at that address
+     at the end of another chunk.  */
+  while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj))
+    {
+      plp = lp->prev;
+      CALL_FREEFUN (h, lp);
+      lp = plp;
+      /* If we switch chunks, we can't tell whether the new current
+	 chunk contains an empty object, so assume that it may.  */
+      h->maybe_empty_object = 1;
+    }
+  if (lp)
+    {
+      h->object_base = h->next_free = (char *) (obj);
+      h->chunk_limit = lp->limit;
+      h->chunk = lp;
+    }
+  else if (obj != 0)
+    /* obj is not in any of the chunks! */
+    abort ();
+}
+
+int
+_obstack_memory_used (struct obstack *h)
+{
+  register struct _obstack_chunk* lp;
+  register int nbytes = 0;
+
+  for (lp = h->chunk; lp != 0; lp = lp->prev)
+    {
+      nbytes += lp->limit - (char *) lp;
+    }
+  return nbytes;
+}
+
+/* Define the error handler.  */
+#ifndef _
+# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
+#  include <libintl.h>
+#  ifndef _
+#   define _(Str) gettext (Str)
+#  endif
+# else
+#  define _(Str) (Str)
+# endif
+#endif
+
+static void
+print_and_abort (void)
+{
+  fputs (_("memory exhausted\n"), stderr);
+  exit (obstack_exit_failure);
+}
+
+#if 0
+/* These are now turned off because the applications do not use it
+   and it uses bcopy via obstack_grow, which causes trouble on sysV.  */
+
+/* Now define the functional versions of the obstack macros.
+   Define them to simply use the corresponding macros to do the job.  */
+
+/* The function names appear in parentheses in order to prevent
+   the macro-definitions of the names from being expanded there.  */
+
+POINTER (obstack_base) (struct obstack *obstack)
+{
+  return obstack_base (obstack);
+}
+
+POINTER (obstack_next_free) (struct obstack *obstack)
+{
+  return obstack_next_free (obstack);
+}
+
+int (obstack_object_size) (struct obstack *obstack)
+{
+  return obstack_object_size (obstack);
+}
+
+int (obstack_room) (struct obstack *obstack)
+{
+  return obstack_room (obstack);
+}
+
+int (obstack_make_room) (struct obstack *obstack, int length)
+{
+  return obstack_make_room (obstack, length);
+}
+
+void (obstack_grow) (struct obstack *obstack, POINTER pointer, int length)
+{
+  obstack_grow (obstack, pointer, length);
+}
+
+void (obstack_grow0) (struct obstack *obstack, POINTER pointer, int length)
+{
+  obstack_grow0 (obstack, pointer, length);
+}
+
+void (obstack_1grow) (struct obstack *obstack, int character)
+{
+  obstack_1grow (obstack, character);
+}
+
+void (obstack_blank) (struct obstack *obstack, int length)
+{
+  obstack_blank (obstack, length);
+}
+
+void (obstack_1grow_fast) (struct obstack *obstack, int character)
+{
+  obstack_1grow_fast (obstack, character);
+}
+
+void (obstack_blank_fast) (struct obstack *obstack, int length)
+{
+  obstack_blank_fast (obstack, length);
+}
+
+POINTER (obstack_finish) (struct obstack *obstack)
+{
+  return obstack_finish (obstack);
+}
+
+POINTER (obstack_alloc) (struct obstack *obstack, int length)
+{
+  return obstack_alloc (obstack, length);
+}
+
+POINTER (obstack_copy) (struct obstack *obstack, POINTER pointer, int length)
+{
+  return obstack_copy (obstack, pointer, length);
+}
+
+POINTER (obstack_copy0) (struct obstack *obstack, POINTER pointer, int length)
+{
+  return obstack_copy0 (obstack, pointer, length);
+}
+
+#endif /* 0 */
+
+#endif	/* !ELIDE_CODE */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/obstacks.texi sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/obstacks.texi
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/obstacks.texi	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/obstacks.texi	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,758 @@
+@node Obstacks,Licenses,Functions,Top
+@chapter Obstacks
+@cindex obstacks
+
+An @dfn{obstack} is a pool of memory containing a stack of objects.  You
+can create any number of separate obstacks, and then allocate objects in
+specified obstacks.  Within each obstack, the last object allocated must
+always be the first one freed, but distinct obstacks are independent of
+each other.
+
+Aside from this one constraint of order of freeing, obstacks are totally
+general: an obstack can contain any number of objects of any size.  They
+are implemented with macros, so allocation is usually very fast as long as
+the objects are usually small.  And the only space overhead per object is
+the padding needed to start each object on a suitable boundary.
+
+@menu
+* Creating Obstacks::           How to declare an obstack in your program.
+* Preparing for Obstacks::      Preparations needed before you can
+                                use obstacks.
+* Allocation in an Obstack::    Allocating objects in an obstack.
+* Freeing Obstack Objects::     Freeing objects in an obstack.
+* Obstack Functions::           The obstack functions are both
+                                functions and macros.
+* Growing Objects::             Making an object bigger by stages.
+* Extra Fast Growing::          Extra-high-efficiency (though more
+                                complicated) growing objects.
+* Status of an Obstack::        Inquiries about the status of an obstack.
+* Obstacks Data Alignment::     Controlling alignment of objects in obstacks.
+* Obstack Chunks::              How obstacks obtain and release chunks;
+                                efficiency considerations.
+* Summary of Obstacks::
+@end menu
+
+@node Creating Obstacks
+@section Creating Obstacks
+
+The utilities for manipulating obstacks are declared in the header
+file @file{obstack.h}.
+@pindex obstack.h
+
+@comment obstack.h
+@comment GNU
+@deftp {Data Type} {struct obstack}
+An obstack is represented by a data structure of type @code{struct
+obstack}.  This structure has a small fixed size; it records the status
+of the obstack and how to find the space in which objects are allocated.
+It does not contain any of the objects themselves.  You should not try
+to access the contents of the structure directly; use only the functions
+described in this chapter.
+@end deftp
+
+You can declare variables of type @code{struct obstack} and use them as
+obstacks, or you can allocate obstacks dynamically like any other kind
+of object.  Dynamic allocation of obstacks allows your program to have a
+variable number of different stacks.  (You can even allocate an
+obstack structure in another obstack, but this is rarely useful.)
+
+All the functions that work with obstacks require you to specify which
+obstack to use.  You do this with a pointer of type @code{struct obstack
+*}.  In the following, we often say ``an obstack'' when strictly
+speaking the object at hand is such a pointer.
+
+The objects in the obstack are packed into large blocks called
+@dfn{chunks}.  The @code{struct obstack} structure points to a chain of
+the chunks currently in use.
+
+The obstack library obtains a new chunk whenever you allocate an object
+that won't fit in the previous chunk.  Since the obstack library manages
+chunks automatically, you don't need to pay much attention to them, but
+you do need to supply a function which the obstack library should use to
+get a chunk.  Usually you supply a function which uses @code{malloc}
+directly or indirectly.  You must also supply a function to free a chunk.
+These matters are described in the following section.
+
+@node Preparing for Obstacks
+@section Preparing for Using Obstacks
+
+Each source file in which you plan to use the obstack functions
+must include the header file @file{obstack.h}, like this:
+
+@smallexample
+#include <obstack.h>
+@end smallexample
+
+@findex obstack_chunk_alloc
+@findex obstack_chunk_free
+Also, if the source file uses the macro @code{obstack_init}, it must
+declare or define two functions or macros that will be called by the
+obstack library.  One, @code{obstack_chunk_alloc}, is used to allocate
+the chunks of memory into which objects are packed.  The other,
+@code{obstack_chunk_free}, is used to return chunks when the objects in
+them are freed.  These macros should appear before any use of obstacks
+in the source file.
+
+Usually these are defined to use @code{malloc} via the intermediary
+@code{xmalloc} (@pxref{Unconstrained Allocation, , , libc, The GNU C Library Reference Manual}).  This is done with
+the following pair of macro definitions:
+
+@smallexample
+#define obstack_chunk_alloc xmalloc
+#define obstack_chunk_free free
+@end smallexample
+
+@noindent
+Though the memory you get using obstacks really comes from @code{malloc},
+using obstacks is faster because @code{malloc} is called less often, for
+larger blocks of memory.  @xref{Obstack Chunks}, for full details.
+
+At run time, before the program can use a @code{struct obstack} object
+as an obstack, it must initialize the obstack by calling
+@code{obstack_init}.
+
+@comment obstack.h
+@comment GNU
+@deftypefun int obstack_init (struct obstack *@var{obstack-ptr})
+Initialize obstack @var{obstack-ptr} for allocation of objects.  This
+function calls the obstack's @code{obstack_chunk_alloc} function.  If
+allocation of memory fails, the function pointed to by
+@code{obstack_alloc_failed_handler} is called.  The @code{obstack_init}
+function always returns 1 (Compatibility notice: Former versions of
+obstack returned 0 if allocation failed).
+@end deftypefun
+
+Here are two examples of how to allocate the space for an obstack and
+initialize it.  First, an obstack that is a static variable:
+
+@smallexample
+static struct obstack myobstack;
+@dots{}
+obstack_init (&myobstack);
+@end smallexample
+
+@noindent
+Second, an obstack that is itself dynamically allocated:
+
+@smallexample
+struct obstack *myobstack_ptr
+  = (struct obstack *) xmalloc (sizeof (struct obstack));
+
+obstack_init (myobstack_ptr);
+@end smallexample
+
+@comment obstack.h
+@comment GNU
+@defvar obstack_alloc_failed_handler
+The value of this variable is a pointer to a function that
+@code{obstack} uses when @code{obstack_chunk_alloc} fails to allocate
+memory.  The default action is to print a message and abort.
+You should supply a function that either calls @code{exit}
+(@pxref{Program Termination, , , libc, The GNU C Library Reference Manual}) or @code{longjmp} (@pxref{Non-Local
+Exits, , , libc, The GNU C Library Reference Manual}) and doesn't return.
+
+@smallexample
+void my_obstack_alloc_failed (void)
+@dots{}
+obstack_alloc_failed_handler = &my_obstack_alloc_failed;
+@end smallexample
+
+@end defvar
+
+@node Allocation in an Obstack
+@section Allocation in an Obstack
+@cindex allocation (obstacks)
+
+The most direct way to allocate an object in an obstack is with
+@code{obstack_alloc}, which is invoked almost like @code{malloc}.
+
+@comment obstack.h
+@comment GNU
+@deftypefun {void *} obstack_alloc (struct obstack *@var{obstack-ptr}, int @var{size})
+This allocates an uninitialized block of @var{size} bytes in an obstack
+and returns its address.  Here @var{obstack-ptr} specifies which obstack
+to allocate the block in; it is the address of the @code{struct obstack}
+object which represents the obstack.  Each obstack function or macro
+requires you to specify an @var{obstack-ptr} as the first argument.
+
+This function calls the obstack's @code{obstack_chunk_alloc} function if
+it needs to allocate a new chunk of memory; it calls
+@code{obstack_alloc_failed_handler} if allocation of memory by
+@code{obstack_chunk_alloc} failed.
+@end deftypefun
+
+For example, here is a function that allocates a copy of a string @var{str}
+in a specific obstack, which is in the variable @code{string_obstack}:
+
+@smallexample
+struct obstack string_obstack;
+
+char *
+copystring (char *string)
+@{
+  size_t len = strlen (string) + 1;
+  char *s = (char *) obstack_alloc (&string_obstack, len);
+  memcpy (s, string, len);
+  return s;
+@}
+@end smallexample
+
+To allocate a block with specified contents, use the function
+@code{obstack_copy}, declared like this:
+
+@comment obstack.h
+@comment GNU
+@deftypefun {void *} obstack_copy (struct obstack *@var{obstack-ptr}, void *@var{address}, int @var{size})
+This allocates a block and initializes it by copying @var{size}
+bytes of data starting at @var{address}.  It calls
+@code{obstack_alloc_failed_handler} if allocation of memory by
+@code{obstack_chunk_alloc} failed.
+@end deftypefun
+
+@comment obstack.h
+@comment GNU
+@deftypefun {void *} obstack_copy0 (struct obstack *@var{obstack-ptr}, void *@var{address}, int @var{size})
+Like @code{obstack_copy}, but appends an extra byte containing a null
+character.  This extra byte is not counted in the argument @var{size}.
+@end deftypefun
+
+The @code{obstack_copy0} function is convenient for copying a sequence
+of characters into an obstack as a null-terminated string.  Here is an
+example of its use:
+
+@smallexample
+char *
+obstack_savestring (char *addr, int size)
+@{
+  return obstack_copy0 (&myobstack, addr, size);
+@}
+@end smallexample
+
+@noindent
+Contrast this with the previous example of @code{savestring} using
+@code{malloc} (@pxref{Basic Allocation, , , libc, The GNU C Library Reference Manual}).
+
+@node Freeing Obstack Objects
+@section Freeing Objects in an Obstack
+@cindex freeing (obstacks)
+
+To free an object allocated in an obstack, use the function
+@code{obstack_free}.  Since the obstack is a stack of objects, freeing
+one object automatically frees all other objects allocated more recently
+in the same obstack.
+
+@comment obstack.h
+@comment GNU
+@deftypefun void obstack_free (struct obstack *@var{obstack-ptr}, void *@var{object})
+If @var{object} is a null pointer, everything allocated in the obstack
+is freed.  Otherwise, @var{object} must be the address of an object
+allocated in the obstack.  Then @var{object} is freed, along with
+everything allocated in @var{obstack} since @var{object}.
+@end deftypefun
+
+Note that if @var{object} is a null pointer, the result is an
+uninitialized obstack.  To free all memory in an obstack but leave it
+valid for further allocation, call @code{obstack_free} with the address
+of the first object allocated on the obstack:
+
+@smallexample
+obstack_free (obstack_ptr, first_object_allocated_ptr);
+@end smallexample
+
+Recall that the objects in an obstack are grouped into chunks.  When all
+the objects in a chunk become free, the obstack library automatically
+frees the chunk (@pxref{Preparing for Obstacks}).  Then other
+obstacks, or non-obstack allocation, can reuse the space of the chunk.
+
+@node Obstack Functions
+@section Obstack Functions and Macros
+@cindex macros
+
+The interfaces for using obstacks may be defined either as functions or
+as macros, depending on the compiler.  The obstack facility works with
+all C compilers, including both @w{ISO C} and traditional C, but there are
+precautions you must take if you plan to use compilers other than GNU C.
+
+If you are using an old-fashioned @w{non-ISO C} compiler, all the obstack
+``functions'' are actually defined only as macros.  You can call these
+macros like functions, but you cannot use them in any other way (for
+example, you cannot take their address).
+
+Calling the macros requires a special precaution: namely, the first
+operand (the obstack pointer) may not contain any side effects, because
+it may be computed more than once.  For example, if you write this:
+
+@smallexample
+obstack_alloc (get_obstack (), 4);
+@end smallexample
+
+@noindent
+you will find that @code{get_obstack} may be called several times.
+If you use @code{*obstack_list_ptr++} as the obstack pointer argument,
+you will get very strange results since the incrementation may occur
+several times.
+
+In @w{ISO C}, each function has both a macro definition and a function
+definition.  The function definition is used if you take the address of the
+function without calling it.  An ordinary call uses the macro definition by
+default, but you can request the function definition instead by writing the
+function name in parentheses, as shown here:
+
+@smallexample
+char *x;
+void *(*funcp) ();
+/* @r{Use the macro}.  */
+x = (char *) obstack_alloc (obptr, size);
+/* @r{Call the function}.  */
+x = (char *) (obstack_alloc) (obptr, size);
+/* @r{Take the address of the function}.  */
+funcp = obstack_alloc;
+@end smallexample
+
+@noindent
+This is the same situation that exists in @w{ISO C} for the standard library
+functions.  @xref{Macro Definitions, , , libc, The GNU C Library Reference Manual}.
+
+@strong{Warning:} When you do use the macros, you must observe the
+precaution of avoiding side effects in the first operand, even in @w{ISO C}.
+
+If you use the GNU C compiler, this precaution is not necessary, because
+various language extensions in GNU C permit defining the macros so as to
+compute each argument only once.
+
+@node Growing Objects
+@section Growing Objects
+@cindex growing objects (in obstacks)
+@cindex changing the size of a block (obstacks)
+
+Because memory in obstack chunks is used sequentially, it is possible to
+build up an object step by step, adding one or more bytes at a time to the
+end of the object.  With this technique, you do not need to know how much
+data you will put in the object until you come to the end of it.  We call
+this the technique of @dfn{growing objects}.  The special functions
+for adding data to the growing object are described in this section.
+
+You don't need to do anything special when you start to grow an object.
+Using one of the functions to add data to the object automatically
+starts it.  However, it is necessary to say explicitly when the object is
+finished.  This is done with the function @code{obstack_finish}.
+
+The actual address of the object thus built up is not known until the
+object is finished.  Until then, it always remains possible that you will
+add so much data that the object must be copied into a new chunk.
+
+While the obstack is in use for a growing object, you cannot use it for
+ordinary allocation of another object.  If you try to do so, the space
+already added to the growing object will become part of the other object.
+
+@comment obstack.h
+@comment GNU
+@deftypefun void obstack_blank (struct obstack *@var{obstack-ptr}, int @var{size})
+The most basic function for adding to a growing object is
+@code{obstack_blank}, which adds space without initializing it.
+@end deftypefun
+
+@comment obstack.h
+@comment GNU
+@deftypefun void obstack_grow (struct obstack *@var{obstack-ptr}, void *@var{data}, int @var{size})
+To add a block of initialized space, use @code{obstack_grow}, which is
+the growing-object analogue of @code{obstack_copy}.  It adds @var{size}
+bytes of data to the growing object, copying the contents from
+@var{data}.
+@end deftypefun
+
+@comment obstack.h
+@comment GNU
+@deftypefun void obstack_grow0 (struct obstack *@var{obstack-ptr}, void *@var{data}, int @var{size})
+This is the growing-object analogue of @code{obstack_copy0}.  It adds
+@var{size} bytes copied from @var{data}, followed by an additional null
+character.
+@end deftypefun
+
+@comment obstack.h
+@comment GNU
+@deftypefun void obstack_1grow (struct obstack *@var{obstack-ptr}, char @var{c})
+To add one character at a time, use the function @code{obstack_1grow}.
+It adds a single byte containing @var{c} to the growing object.
+@end deftypefun
+
+@comment obstack.h
+@comment GNU
+@deftypefun void obstack_ptr_grow (struct obstack *@var{obstack-ptr}, void *@var{data})
+Adding the value of a pointer one can use the function
+@code{obstack_ptr_grow}.  It adds @code{sizeof (void *)} bytes
+containing the value of @var{data}.
+@end deftypefun
+
+@comment obstack.h
+@comment GNU
+@deftypefun void obstack_int_grow (struct obstack *@var{obstack-ptr}, int @var{data})
+A single value of type @code{int} can be added by using the
+@code{obstack_int_grow} function.  It adds @code{sizeof (int)} bytes to
+the growing object and initializes them with the value of @var{data}.
+@end deftypefun
+
+@comment obstack.h
+@comment GNU
+@deftypefun {void *} obstack_finish (struct obstack *@var{obstack-ptr})
+When you are finished growing the object, use the function
+@code{obstack_finish} to close it off and return its final address.
+
+Once you have finished the object, the obstack is available for ordinary
+allocation or for growing another object.
+
+This function can return a null pointer under the same conditions as
+@code{obstack_alloc} (@pxref{Allocation in an Obstack}).
+@end deftypefun
+
+When you build an object by growing it, you will probably need to know
+afterward how long it became.  You need not keep track of this as you grow
+the object, because you can find out the length from the obstack just
+before finishing the object with the function @code{obstack_object_size},
+declared as follows:
+
+@comment obstack.h
+@comment GNU
+@deftypefun int obstack_object_size (struct obstack *@var{obstack-ptr})
+This function returns the current size of the growing object, in bytes.
+Remember to call this function @emph{before} finishing the object.
+After it is finished, @code{obstack_object_size} will return zero.
+@end deftypefun
+
+If you have started growing an object and wish to cancel it, you should
+finish it and then free it, like this:
+
+@smallexample
+obstack_free (obstack_ptr, obstack_finish (obstack_ptr));
+@end smallexample
+
+@noindent
+This has no effect if no object was growing.
+
+@cindex shrinking objects
+You can use @code{obstack_blank} with a negative size argument to make
+the current object smaller.  Just don't try to shrink it beyond zero
+length---there's no telling what will happen if you do that.
+
+@node Extra Fast Growing
+@section Extra Fast Growing Objects
+@cindex efficiency and obstacks
+
+The usual functions for growing objects incur overhead for checking
+whether there is room for the new growth in the current chunk.  If you
+are frequently constructing objects in small steps of growth, this
+overhead can be significant.
+
+You can reduce the overhead by using special ``fast growth''
+functions that grow the object without checking.  In order to have a
+robust program, you must do the checking yourself.  If you do this checking
+in the simplest way each time you are about to add data to the object, you
+have not saved anything, because that is what the ordinary growth
+functions do.  But if you can arrange to check less often, or check
+more efficiently, then you make the program faster.
+
+The function @code{obstack_room} returns the amount of room available
+in the current chunk.  It is declared as follows:
+
+@comment obstack.h
+@comment GNU
+@deftypefun int obstack_room (struct obstack *@var{obstack-ptr})
+This returns the number of bytes that can be added safely to the current
+growing object (or to an object about to be started) in obstack
+@var{obstack} using the fast growth functions.
+@end deftypefun
+
+While you know there is room, you can use these fast growth functions
+for adding data to a growing object:
+
+@comment obstack.h
+@comment GNU
+@deftypefun void obstack_1grow_fast (struct obstack *@var{obstack-ptr}, char @var{c})
+The function @code{obstack_1grow_fast} adds one byte containing the
+character @var{c} to the growing object in obstack @var{obstack-ptr}.
+@end deftypefun
+
+@comment obstack.h
+@comment GNU
+@deftypefun void obstack_ptr_grow_fast (struct obstack *@var{obstack-ptr}, void *@var{data})
+The function @code{obstack_ptr_grow_fast} adds @code{sizeof (void *)}
+bytes containing the value of @var{data} to the growing object in
+obstack @var{obstack-ptr}.
+@end deftypefun
+
+@comment obstack.h
+@comment GNU
+@deftypefun void obstack_int_grow_fast (struct obstack *@var{obstack-ptr}, int @var{data})
+The function @code{obstack_int_grow_fast} adds @code{sizeof (int)} bytes
+containing the value of @var{data} to the growing object in obstack
+@var{obstack-ptr}.
+@end deftypefun
+
+@comment obstack.h
+@comment GNU
+@deftypefun void obstack_blank_fast (struct obstack *@var{obstack-ptr}, int @var{size})
+The function @code{obstack_blank_fast} adds @var{size} bytes to the
+growing object in obstack @var{obstack-ptr} without initializing them.
+@end deftypefun
+
+When you check for space using @code{obstack_room} and there is not
+enough room for what you want to add, the fast growth functions
+are not safe.  In this case, simply use the corresponding ordinary
+growth function instead.  Very soon this will copy the object to a
+new chunk; then there will be lots of room available again.
+
+So, each time you use an ordinary growth function, check afterward for
+sufficient space using @code{obstack_room}.  Once the object is copied
+to a new chunk, there will be plenty of space again, so the program will
+start using the fast growth functions again.
+
+Here is an example:
+
+@smallexample
+@group
+void
+add_string (struct obstack *obstack, const char *ptr, int len)
+@{
+  while (len > 0)
+    @{
+      int room = obstack_room (obstack);
+      if (room == 0)
+        @{
+          /* @r{Not enough room. Add one character slowly,}
+             @r{which may copy to a new chunk and make room.}  */
+          obstack_1grow (obstack, *ptr++);
+          len--;
+        @}
+      else
+        @{
+          if (room > len)
+            room = len;
+          /* @r{Add fast as much as we have room for.} */
+          len -= room;
+          while (room-- > 0)
+            obstack_1grow_fast (obstack, *ptr++);
+        @}
+    @}
+@}
+@end group
+@end smallexample
+
+@node Status of an Obstack
+@section Status of an Obstack
+@cindex obstack status
+@cindex status of obstack
+
+Here are functions that provide information on the current status of
+allocation in an obstack.  You can use them to learn about an object while
+still growing it.
+
+@comment obstack.h
+@comment GNU
+@deftypefun {void *} obstack_base (struct obstack *@var{obstack-ptr})
+This function returns the tentative address of the beginning of the
+currently growing object in @var{obstack-ptr}.  If you finish the object
+immediately, it will have that address.  If you make it larger first, it
+may outgrow the current chunk---then its address will change!
+
+If no object is growing, this value says where the next object you
+allocate will start (once again assuming it fits in the current
+chunk).
+@end deftypefun
+
+@comment obstack.h
+@comment GNU
+@deftypefun {void *} obstack_next_free (struct obstack *@var{obstack-ptr})
+This function returns the address of the first free byte in the current
+chunk of obstack @var{obstack-ptr}.  This is the end of the currently
+growing object.  If no object is growing, @code{obstack_next_free}
+returns the same value as @code{obstack_base}.
+@end deftypefun
+
+@comment obstack.h
+@comment GNU
+@deftypefun int obstack_object_size (struct obstack *@var{obstack-ptr})
+This function returns the size in bytes of the currently growing object.
+This is equivalent to
+
+@smallexample
+obstack_next_free (@var{obstack-ptr}) - obstack_base (@var{obstack-ptr})
+@end smallexample
+@end deftypefun
+
+@node Obstacks Data Alignment
+@section Alignment of Data in Obstacks
+@cindex alignment (in obstacks)
+
+Each obstack has an @dfn{alignment boundary}; each object allocated in
+the obstack automatically starts on an address that is a multiple of the
+specified boundary.  By default, this boundary is 4 bytes.
+
+To access an obstack's alignment boundary, use the macro
+@code{obstack_alignment_mask}, whose function prototype looks like
+this:
+
+@comment obstack.h
+@comment GNU
+@deftypefn Macro int obstack_alignment_mask (struct obstack *@var{obstack-ptr})
+The value is a bit mask; a bit that is 1 indicates that the corresponding
+bit in the address of an object should be 0.  The mask value should be one
+less than a power of 2; the effect is that all object addresses are
+multiples of that power of 2.  The default value of the mask is 3, so that
+addresses are multiples of 4.  A mask value of 0 means an object can start
+on any multiple of 1 (that is, no alignment is required).
+
+The expansion of the macro @code{obstack_alignment_mask} is an lvalue,
+so you can alter the mask by assignment.  For example, this statement:
+
+@smallexample
+obstack_alignment_mask (obstack_ptr) = 0;
+@end smallexample
+
+@noindent
+has the effect of turning off alignment processing in the specified obstack.
+@end deftypefn
+
+Note that a change in alignment mask does not take effect until
+@emph{after} the next time an object is allocated or finished in the
+obstack.  If you are not growing an object, you can make the new
+alignment mask take effect immediately by calling @code{obstack_finish}.
+This will finish a zero-length object and then do proper alignment for
+the next object.
+
+@node Obstack Chunks
+@section Obstack Chunks
+@cindex efficiency of chunks
+@cindex chunks
+
+Obstacks work by allocating space for themselves in large chunks, and
+then parceling out space in the chunks to satisfy your requests.  Chunks
+are normally 4096 bytes long unless you specify a different chunk size.
+The chunk size includes 8 bytes of overhead that are not actually used
+for storing objects.  Regardless of the specified size, longer chunks
+will be allocated when necessary for long objects.
+
+The obstack library allocates chunks by calling the function
+@code{obstack_chunk_alloc}, which you must define.  When a chunk is no
+longer needed because you have freed all the objects in it, the obstack
+library frees the chunk by calling @code{obstack_chunk_free}, which you
+must also define.
+
+These two must be defined (as macros) or declared (as functions) in each
+source file that uses @code{obstack_init} (@pxref{Creating Obstacks}).
+Most often they are defined as macros like this:
+
+@smallexample
+#define obstack_chunk_alloc malloc
+#define obstack_chunk_free free
+@end smallexample
+
+Note that these are simple macros (no arguments).  Macro definitions with
+arguments will not work!  It is necessary that @code{obstack_chunk_alloc}
+or @code{obstack_chunk_free}, alone, expand into a function name if it is
+not itself a function name.
+
+If you allocate chunks with @code{malloc}, the chunk size should be a
+power of 2.  The default chunk size, 4096, was chosen because it is long
+enough to satisfy many typical requests on the obstack yet short enough
+not to waste too much memory in the portion of the last chunk not yet used.
+
+@comment obstack.h
+@comment GNU
+@deftypefn Macro int obstack_chunk_size (struct obstack *@var{obstack-ptr})
+This returns the chunk size of the given obstack.
+@end deftypefn
+
+Since this macro expands to an lvalue, you can specify a new chunk size by
+assigning it a new value.  Doing so does not affect the chunks already
+allocated, but will change the size of chunks allocated for that particular
+obstack in the future.  It is unlikely to be useful to make the chunk size
+smaller, but making it larger might improve efficiency if you are
+allocating many objects whose size is comparable to the chunk size.  Here
+is how to do so cleanly:
+
+@smallexample
+if (obstack_chunk_size (obstack_ptr) < @var{new-chunk-size})
+  obstack_chunk_size (obstack_ptr) = @var{new-chunk-size};
+@end smallexample
+
+@node Summary of Obstacks
+@section Summary of Obstack Functions
+
+Here is a summary of all the functions associated with obstacks.  Each
+takes the address of an obstack (@code{struct obstack *}) as its first
+argument.
+
+@table @code
+@item void obstack_init (struct obstack *@var{obstack-ptr})
+Initialize use of an obstack.  @xref{Creating Obstacks}.
+
+@item void *obstack_alloc (struct obstack *@var{obstack-ptr}, int @var{size})
+Allocate an object of @var{size} uninitialized bytes.
+@xref{Allocation in an Obstack}.
+
+@item void *obstack_copy (struct obstack *@var{obstack-ptr}, void *@var{address}, int @var{size})
+Allocate an object of @var{size} bytes, with contents copied from
+@var{address}.  @xref{Allocation in an Obstack}.
+
+@item void *obstack_copy0 (struct obstack *@var{obstack-ptr}, void *@var{address}, int @var{size})
+Allocate an object of @var{size}+1 bytes, with @var{size} of them copied
+from @var{address}, followed by a null character at the end.
+@xref{Allocation in an Obstack}.
+
+@item void obstack_free (struct obstack *@var{obstack-ptr}, void *@var{object})
+Free @var{object} (and everything allocated in the specified obstack
+more recently than @var{object}).  @xref{Freeing Obstack Objects}.
+
+@item void obstack_blank (struct obstack *@var{obstack-ptr}, int @var{size})
+Add @var{size} uninitialized bytes to a growing object.
+@xref{Growing Objects}.
+
+@item void obstack_grow (struct obstack *@var{obstack-ptr}, void *@var{address}, int @var{size})
+Add @var{size} bytes, copied from @var{address}, to a growing object.
+@xref{Growing Objects}.
+
+@item void obstack_grow0 (struct obstack *@var{obstack-ptr}, void *@var{address}, int @var{size})
+Add @var{size} bytes, copied from @var{address}, to a growing object,
+and then add another byte containing a null character.  @xref{Growing
+Objects}.
+
+@item void obstack_1grow (struct obstack *@var{obstack-ptr}, char @var{data-char})
+Add one byte containing @var{data-char} to a growing object.
+@xref{Growing Objects}.
+
+@item void *obstack_finish (struct obstack *@var{obstack-ptr})
+Finalize the object that is growing and return its permanent address.
+@xref{Growing Objects}.
+
+@item int obstack_object_size (struct obstack *@var{obstack-ptr})
+Get the current size of the currently growing object.  @xref{Growing
+Objects}.
+
+@item void obstack_blank_fast (struct obstack *@var{obstack-ptr}, int @var{size})
+Add @var{size} uninitialized bytes to a growing object without checking
+that there is enough room.  @xref{Extra Fast Growing}.
+
+@item void obstack_1grow_fast (struct obstack *@var{obstack-ptr}, char @var{data-char})
+Add one byte containing @var{data-char} to a growing object without
+checking that there is enough room.  @xref{Extra Fast Growing}.
+
+@item int obstack_room (struct obstack *@var{obstack-ptr})
+Get the amount of room now available for growing the current object.
+@xref{Extra Fast Growing}.
+
+@item int obstack_alignment_mask (struct obstack *@var{obstack-ptr})
+The mask used for aligning the beginning of an object.  This is an
+lvalue.  @xref{Obstacks Data Alignment}.
+
+@item int obstack_chunk_size (struct obstack *@var{obstack-ptr})
+The size for allocating chunks.  This is an lvalue.  @xref{Obstack Chunks}.
+
+@item void *obstack_base (struct obstack *@var{obstack-ptr})
+Tentative starting address of the currently growing object.
+@xref{Status of an Obstack}.
+
+@item void *obstack_next_free (struct obstack *@var{obstack-ptr})
+Address just after the end of the currently growing object.
+@xref{Status of an Obstack}.
+@end table
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/partition.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/partition.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/partition.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/partition.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,183 @@
+/* List implementation of a partition of consecutive integers.
+   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Contributed by CodeSourcery, LLC.
+
+   This file is part of GNU CC.
+
+   GNU CC is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   GNU CC 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 GNU CC; see the file COPYING.  If not, write to
+   the Free Software Foundation, 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#include "libiberty.h"
+#include "partition.h"
+
+static int elem_compare (const void *, const void *);
+
+/* Creates a partition of NUM_ELEMENTS elements.  Initially each
+   element is in a class by itself.  */
+
+partition
+partition_new (int num_elements)
+{
+  int e;
+  
+  partition part = (partition) 
+    xmalloc (sizeof (struct partition_def) + 
+	     (num_elements - 1) * sizeof (struct partition_elem));
+  part->num_elements = num_elements;
+  for (e = 0; e < num_elements; ++e) 
+    {
+      part->elements[e].class_element = e;
+      part->elements[e].next = &(part->elements[e]);
+      part->elements[e].class_count = 1;
+    }
+
+  return part;
+}
+
+/* Freeds a partition.  */
+
+void
+partition_delete (partition part)
+{
+  free (part);
+}
+
+/* Unites the classes containing ELEM1 and ELEM2 into a single class
+   of partition PART.  If ELEM1 and ELEM2 are already in the same
+   class, does nothing.  Returns the canonical element of the
+   resulting union class.  */
+
+int
+partition_union (partition part, int elem1, int elem2)
+{
+  struct partition_elem *elements = part->elements;
+  struct partition_elem *e1;
+  struct partition_elem *e2;
+  struct partition_elem *p;
+  struct partition_elem *old_next;
+  /* The canonical element of the resulting union class.  */
+  int class_element = elements[elem1].class_element;
+
+  /* If they're already in the same class, do nothing.  */
+  if (class_element == elements[elem2].class_element)
+    return class_element;
+
+  /* Make sure ELEM1 is in the larger class of the two.  If not, swap
+     them.  This way we always scan the shorter list.  */
+  if (elements[elem1].class_count < elements[elem2].class_count) 
+    {
+      int temp = elem1;
+      elem1 = elem2;
+      elem2 = temp;
+      class_element = elements[elem1].class_element;
+    }
+
+  e1 = &(elements[elem1]);
+  e2 = &(elements[elem2]);
+
+  /* Keep a count of the number of elements in the list.  */
+  elements[class_element].class_count 
+    += elements[e2->class_element].class_count;
+
+  /* Update the class fields in elem2's class list.  */
+  e2->class_element = class_element;
+  for (p = e2->next; p != e2; p = p->next)
+    p->class_element = class_element;
+  
+  /* Splice ELEM2's class list into ELEM1's.  These are circular
+     lists.  */
+  old_next = e1->next;
+  e1->next = e2->next;
+  e2->next = old_next;
+
+  return class_element;
+}
+
+/* Compare elements ELEM1 and ELEM2 from array of integers, given a
+   pointer to each.  Used to qsort such an array.  */
+
+static int 
+elem_compare (const void *elem1, const void *elem2)
+{
+  int e1 = * (const int *) elem1;
+  int e2 = * (const int *) elem2;
+  if (e1 < e2)
+    return -1;
+  else if (e1 > e2)
+    return 1;
+  else
+    return 0;
+}
+
+/* Prints PART to the file pointer FP.  The elements of each
+   class are sorted.  */
+
+void
+partition_print (partition part, FILE *fp)
+{
+  char *done;
+  int num_elements = part->num_elements;
+  struct partition_elem *elements = part->elements;
+  int *class_elements;
+  int e;
+
+  /* Flag the elements we've already printed.  */
+  done = (char *) xmalloc (num_elements);
+  memset (done, 0, num_elements);
+
+  /* A buffer used to sort elements in a class.  */
+  class_elements = (int *) xmalloc (num_elements * sizeof (int));
+
+  fputc ('[', fp);
+  for (e = 0; e < num_elements; ++e)
+    /* If we haven't printed this element, print its entire class.  */
+    if (! done[e]) 
+      {
+	int c = e;
+	int count = elements[elements[e].class_element].class_count;
+	int i;
+
+      /* Collect the elements in this class.  */
+	for (i = 0; i < count; ++i) {
+	  class_elements[i] = c;
+	  done[c] = 1;
+	  c = elements[c].next - elements;
+	}
+	/* Sort them.  */
+	qsort ((void *) class_elements, count, sizeof (int), elem_compare);
+	/* Print them.  */
+	fputc ('(', fp);
+	for (i = 0; i < count; ++i) 
+	  fprintf (fp, i == 0 ? "%d" : " %d", class_elements[i]);
+	fputc (')', fp);
+      }
+  fputc (']', fp);
+
+  free (class_elements);
+  free (done);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/pex-common.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/pex-common.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/pex-common.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/pex-common.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,646 @@
+/* Common code for executing a program in a sub-process.
+   Copyright (C) 2005, 2010 Free Software Foundation, Inc.
+   Written by Ian Lance Taylor <ian@airs.com>.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If not,
+write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#include "config.h"
+#include "libiberty.h"
+#include "pex-common.h"
+
+#include <stdio.h>
+#include <errno.h>
+#ifdef NEED_DECLARATION_ERRNO
+extern int errno;
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+extern int mkstemps (char *, int);
+
+/* This file contains subroutines for the program execution routines
+   (pex_init, pex_run, etc.).  This file is compiled on all
+   systems.  */
+
+static void pex_add_remove (struct pex_obj *, const char *, int);
+static int pex_get_status_and_time (struct pex_obj *, int, const char **,
+				    int *);
+
+/* Initialize a pex_obj structure.  */
+
+struct pex_obj *
+pex_init_common (int flags, const char *pname, const char *tempbase,
+		 const struct pex_funcs *funcs)
+{
+  struct pex_obj *obj;
+
+  obj = XNEW (struct pex_obj);
+  obj->flags = flags;
+  obj->pname = pname;
+  obj->tempbase = tempbase;
+  obj->next_input = STDIN_FILE_NO;
+  obj->next_input_name = NULL;
+  obj->next_input_name_allocated = 0;
+  obj->stderr_pipe = -1;
+  obj->count = 0;
+  obj->children = NULL;
+  obj->status = NULL;
+  obj->time = NULL;
+  obj->number_waited = 0;
+  obj->input_file = NULL;
+  obj->read_output = NULL;
+  obj->read_err = NULL;
+  obj->remove_count = 0;
+  obj->remove = NULL;
+  obj->funcs = funcs;
+  obj->sysdep = NULL;
+  return obj;
+}
+
+/* Add a file to be removed when we are done.  */
+
+static void
+pex_add_remove (struct pex_obj *obj, const char *name, int allocated)
+{
+  char *add;
+
+  ++obj->remove_count;
+  obj->remove = XRESIZEVEC (char *, obj->remove, obj->remove_count);
+  if (allocated)
+    add = (char *) name;
+  else
+    add = xstrdup (name);
+  obj->remove[obj->remove_count - 1] = add;
+}
+
+/* Generate a temporary file name based on OBJ, FLAGS, and NAME.
+   Return NULL if we were unable to reserve a temporary filename.
+
+   If non-NULL, the result is either allocated with malloc, or the
+   same pointer as NAME.  */
+static char *
+temp_file (struct pex_obj *obj, int flags, char *name)
+{
+  if (name == NULL)
+    {
+      if (obj->tempbase == NULL)
+        {
+          name = make_temp_file (NULL);
+        }
+      else
+        {
+          int len = strlen (obj->tempbase);
+          int out;
+
+          if (len >= 6
+              && strcmp (obj->tempbase + len - 6, "XXXXXX") == 0)
+            name = xstrdup (obj->tempbase);
+          else
+            name = concat (obj->tempbase, "XXXXXX", NULL);
+
+          out = mkstemps (name, 0);
+          if (out < 0)
+            {
+              free (name);
+              return NULL;
+            }
+
+          /* This isn't obj->funcs->close because we got the
+             descriptor from mkstemps, not from a function in
+             obj->funcs.  Calling close here is just like what
+             make_temp_file does.  */
+          close (out);
+        }
+    }
+  else if ((flags & PEX_SUFFIX) != 0)
+    {
+      if (obj->tempbase == NULL)
+        name = make_temp_file (name);
+      else
+        name = concat (obj->tempbase, name, NULL);
+    }
+
+  return name;
+}
+
+
+/* As for pex_run (), but permits the environment for the child process
+   to be specified. */
+
+const char *
+pex_run_in_environment (struct pex_obj *obj, int flags, const char *executable,
+       	                char * const * argv, char * const * env,
+                        const char *orig_outname, const char *errname,
+                  	int *err)
+{
+  const char *errmsg;
+  int in, out, errdes;
+  char *outname;
+  int outname_allocated;
+  int p[2];
+  int toclose;
+  pid_t pid;
+
+  in = -1;
+  out = -1;
+  errdes = -1;
+  outname = (char *) orig_outname;
+  outname_allocated = 0;
+
+  /* If the user called pex_input_file, close the file now.  */
+  if (obj->input_file)
+    {
+      if (fclose (obj->input_file) == EOF)
+        {
+          errmsg = "closing pipeline input file";
+          goto error_exit;
+        }
+      obj->input_file = NULL;
+    }
+
+  /* Set IN.  */
+
+  if (obj->next_input_name != NULL)
+    {
+      /* We have to make sure that the previous process has completed
+	 before we try to read the file.  */
+      if (!pex_get_status_and_time (obj, 0, &errmsg, err))
+	goto error_exit;
+
+      in = obj->funcs->open_read (obj, obj->next_input_name,
+				  (flags & PEX_BINARY_INPUT) != 0);
+      if (in < 0)
+	{
+	  *err = errno;
+	  errmsg = "open temporary file";
+	  goto error_exit;
+	}
+      if (obj->next_input_name_allocated)
+	{
+	  free (obj->next_input_name);
+	  obj->next_input_name_allocated = 0;
+	}
+      obj->next_input_name = NULL;
+    }
+  else
+    {
+      in = obj->next_input;
+      if (in < 0)
+	{
+	  *err = 0;
+	  errmsg = "pipeline already complete";
+	  goto error_exit;
+	}
+    }
+
+  /* Set OUT and OBJ->NEXT_INPUT/OBJ->NEXT_INPUT_NAME.  */
+
+  if ((flags & PEX_LAST) != 0)
+    {
+      if (outname == NULL)
+	out = STDOUT_FILE_NO;
+      else if ((flags & PEX_SUFFIX) != 0)
+	{
+	  outname = concat (obj->tempbase, outname, NULL);
+	  outname_allocated = 1;
+	}
+      obj->next_input = -1;
+    }
+  else if ((obj->flags & PEX_USE_PIPES) == 0)
+    {
+      outname = temp_file (obj, flags, outname);
+      if (! outname)
+        {
+          *err = 0;
+          errmsg = "could not create temporary file";
+          goto error_exit;
+        }
+
+      if (outname != orig_outname)
+        outname_allocated = 1;
+
+      if ((obj->flags & PEX_SAVE_TEMPS) == 0)
+	{
+	  pex_add_remove (obj, outname, outname_allocated);
+	  outname_allocated = 0;
+	}
+
+      /* Hand off ownership of outname to the next stage.  */
+      obj->next_input_name = outname;
+      obj->next_input_name_allocated = outname_allocated;
+      outname_allocated = 0;
+    }
+  else
+    {
+      if (obj->funcs->pipe (obj, p, (flags & PEX_BINARY_OUTPUT) != 0) < 0)
+	{
+	  *err = errno;
+	  errmsg = "pipe";
+	  goto error_exit;
+	}
+
+      out = p[WRITE_PORT];
+      obj->next_input = p[READ_PORT];
+    }
+
+  if (out < 0)
+    {
+      out = obj->funcs->open_write (obj, outname,
+				    (flags & PEX_BINARY_OUTPUT) != 0);
+      if (out < 0)
+	{
+	  *err = errno;
+	  errmsg = "open temporary output file";
+	  goto error_exit;
+	}
+    }
+
+  if (outname_allocated)
+    {
+      free (outname);
+      outname_allocated = 0;
+    }
+
+  /* Set ERRDES.  */
+
+  if (errname != NULL && (flags & PEX_STDERR_TO_PIPE) != 0)
+    {
+      *err = 0;
+      errmsg = "both ERRNAME and PEX_STDERR_TO_PIPE specified.";
+      goto error_exit;
+    }
+
+  if (obj->stderr_pipe != -1)
+    {
+      *err = 0;
+      errmsg = "PEX_STDERR_TO_PIPE used in the middle of pipeline";
+      goto error_exit;
+    }
+
+  if (errname == NULL)
+    {
+      if (flags & PEX_STDERR_TO_PIPE)
+	{
+	  if (obj->funcs->pipe (obj, p, (flags & PEX_BINARY_ERROR) != 0) < 0)
+	    {
+	      *err = errno;
+	      errmsg = "pipe";
+	      goto error_exit;
+	    }
+	  
+	  errdes = p[WRITE_PORT];
+	  obj->stderr_pipe = p[READ_PORT];	  
+	}
+      else
+	{
+	  errdes = STDERR_FILE_NO;
+	}
+    }
+  else
+    {
+      errdes = obj->funcs->open_write (obj, errname, 
+				       (flags & PEX_BINARY_ERROR) != 0);
+      if (errdes < 0)
+	{
+	  *err = errno;
+	  errmsg = "open error file";
+	  goto error_exit;
+	}
+    }
+
+  /* If we are using pipes, the child process has to close the next
+     input pipe.  */
+
+  if ((obj->flags & PEX_USE_PIPES) == 0)
+    toclose = -1;
+  else
+    toclose = obj->next_input;
+
+  /* Run the program.  */
+
+  pid = obj->funcs->exec_child (obj, flags, executable, argv, env,
+				in, out, errdes, toclose, &errmsg, err);
+  if (pid < 0)
+    goto error_exit;
+
+  ++obj->count;
+  obj->children = XRESIZEVEC (pid_t, obj->children, obj->count);
+  obj->children[obj->count - 1] = pid;
+
+  return NULL;
+
+ error_exit:
+  if (in >= 0 && in != STDIN_FILE_NO)
+    obj->funcs->close (obj, in);
+  if (out >= 0 && out != STDOUT_FILE_NO)
+    obj->funcs->close (obj, out);
+  if (errdes >= 0 && errdes != STDERR_FILE_NO)
+    obj->funcs->close (obj, errdes);
+  if (outname_allocated)
+    free (outname);
+  return errmsg;
+}
+
+/* Run a program.  */
+
+const char *
+pex_run (struct pex_obj *obj, int flags, const char *executable,
+       	 char * const * argv, const char *orig_outname, const char *errname,
+         int *err)
+{
+  return pex_run_in_environment (obj, flags, executable, argv, NULL,
+				 orig_outname, errname, err);
+}
+
+/* Return a FILE pointer for a temporary file to fill with input for
+   the pipeline.  */
+FILE *
+pex_input_file (struct pex_obj *obj, int flags, const char *in_name)
+{
+  char *name = (char *) in_name;
+  FILE *f;
+
+  /* This must be called before the first pipeline stage is run, and
+     there must not have been any other input selected.  */
+  if (obj->count != 0
+      || (obj->next_input >= 0 && obj->next_input != STDIN_FILE_NO)
+      || obj->next_input_name)
+    {
+      errno = EINVAL;
+      return NULL;
+    }
+
+  name = temp_file (obj, flags, name);
+  if (! name)
+    return NULL;
+
+  f = fopen (name, (flags & PEX_BINARY_OUTPUT) ? "wb" : "w");
+  if (! f)
+    {
+      free (name);
+      return NULL;
+    }
+
+  obj->input_file = f;
+  obj->next_input_name = name;
+  obj->next_input_name_allocated = (name != in_name);
+
+  return f;
+}
+
+/* Return a stream for a pipe connected to the standard input of the
+   first stage of the pipeline.  */
+FILE *
+pex_input_pipe (struct pex_obj *obj, int binary)
+{
+  int p[2];
+  FILE *f;
+
+  /* You must call pex_input_pipe before the first pex_run or pex_one.  */
+  if (obj->count > 0)
+    goto usage_error;
+
+  /* You must be using pipes.  Implementations that don't support
+     pipes clear this flag before calling pex_init_common.  */
+  if (! (obj->flags & PEX_USE_PIPES))
+    goto usage_error;
+
+  /* If we have somehow already selected other input, that's a
+     mistake.  */
+  if ((obj->next_input >= 0 && obj->next_input != STDIN_FILE_NO)
+      || obj->next_input_name)
+    goto usage_error;
+
+  if (obj->funcs->pipe (obj, p, binary != 0) < 0)
+    return NULL;
+
+  f = obj->funcs->fdopenw (obj, p[WRITE_PORT], binary != 0);
+  if (! f)
+    {
+      int saved_errno = errno;
+      obj->funcs->close (obj, p[READ_PORT]);
+      obj->funcs->close (obj, p[WRITE_PORT]);
+      errno = saved_errno;
+      return NULL;
+    }
+
+  obj->next_input = p[READ_PORT];
+
+  return f;
+
+ usage_error:
+  errno = EINVAL;
+  return NULL;
+}
+
+/* Return a FILE pointer for the output of the last program
+   executed.  */
+
+FILE *
+pex_read_output (struct pex_obj *obj, int binary)
+{
+  if (obj->next_input_name != NULL)
+    {
+      const char *errmsg;
+      int err;
+
+      /* We have to make sure that the process has completed before we
+	 try to read the file.  */
+      if (!pex_get_status_and_time (obj, 0, &errmsg, &err))
+	{
+	  errno = err;
+	  return NULL;
+	}
+
+      obj->read_output = fopen (obj->next_input_name, binary ? "rb" : "r");
+
+      if (obj->next_input_name_allocated)
+	{
+	  free (obj->next_input_name);
+	  obj->next_input_name_allocated = 0;
+	}
+      obj->next_input_name = NULL;
+    }
+  else
+    {
+      int o;
+
+      o = obj->next_input;
+      if (o < 0 || o == STDIN_FILE_NO)
+	return NULL;
+      obj->read_output = obj->funcs->fdopenr (obj, o, binary);
+      obj->next_input = -1;
+    }
+
+  return obj->read_output;
+}
+
+FILE *
+pex_read_err (struct pex_obj *obj, int binary)
+{
+  int o;
+  
+  o = obj->stderr_pipe;
+  if (o < 0 || o == STDIN_FILE_NO)
+    return NULL;
+  obj->read_err = obj->funcs->fdopenr (obj, o, binary);
+  obj->stderr_pipe = -1;
+  return obj->read_err;    
+}
+
+/* Get the exit status and, if requested, the resource time for all
+   the child processes.  Return 0 on failure, 1 on success.  */
+
+static int
+pex_get_status_and_time (struct pex_obj *obj, int done, const char **errmsg,
+			 int *err)
+{
+  int ret;
+  int i;
+
+  if (obj->number_waited == obj->count)
+    return 1;
+
+  obj->status = XRESIZEVEC (int, obj->status, obj->count);
+  if ((obj->flags & PEX_RECORD_TIMES) != 0)
+    obj->time = XRESIZEVEC (struct pex_time, obj->time, obj->count);
+
+  ret = 1;
+  for (i = obj->number_waited; i < obj->count; ++i)
+    {
+      if (obj->funcs->wait (obj, obj->children[i], &obj->status[i],
+			    obj->time == NULL ? NULL : &obj->time[i],
+			    done, errmsg, err) < 0)
+	ret = 0;
+    }
+  obj->number_waited = i;
+
+  return ret;
+}
+
+/* Get exit status of executed programs.  */
+
+int
+pex_get_status (struct pex_obj *obj, int count, int *vector)
+{
+  if (obj->status == NULL)
+    {
+      const char *errmsg;
+      int err;
+
+      if (!pex_get_status_and_time (obj, 0, &errmsg, &err))
+	return 0;
+    }
+
+  if (count > obj->count)
+    {
+      memset (vector + obj->count, 0, (count - obj->count) * sizeof (int));
+      count = obj->count;
+    }
+
+  memcpy (vector, obj->status, count * sizeof (int));
+
+  return 1;
+}
+
+/* Get process times of executed programs.  */
+
+int
+pex_get_times (struct pex_obj *obj, int count, struct pex_time *vector)
+{
+  if (obj->status == NULL)
+    {
+      const char *errmsg;
+      int err;
+
+      if (!pex_get_status_and_time (obj, 0, &errmsg, &err))
+	return 0;
+    }
+
+  if (obj->time == NULL)
+    return 0;
+
+  if (count > obj->count)
+    {
+      memset (vector + obj->count, 0,
+	      (count - obj->count) * sizeof (struct pex_time));
+      count = obj->count;
+    }
+
+  memcpy (vector, obj->time, count * sizeof (struct pex_time));
+
+  return 1;
+}
+
+/* Free a pex_obj structure.  */
+
+void
+pex_free (struct pex_obj *obj)
+{
+  /* Close pipe file descriptors corresponding to child's stdout and
+     stderr so that the child does not hang trying to output something
+     while we're waiting for it.  */
+  if (obj->next_input >= 0 && obj->next_input != STDIN_FILE_NO)
+    obj->funcs->close (obj, obj->next_input);
+  if (obj->stderr_pipe >= 0 && obj->stderr_pipe != STDIN_FILE_NO)
+    obj->funcs->close (obj, obj->stderr_pipe);
+  if (obj->read_output != NULL)
+    fclose (obj->read_output);
+  if (obj->read_err != NULL)
+    fclose (obj->read_err);
+
+  /* If the caller forgot to wait for the children, we do it here, to
+     avoid zombies.  */
+  if (obj->status == NULL)
+    {
+      const char *errmsg;
+      int err;
+
+      obj->flags &= ~ PEX_RECORD_TIMES;
+      pex_get_status_and_time (obj, 1, &errmsg, &err);
+    }
+
+  if (obj->next_input_name_allocated)
+    free (obj->next_input_name);
+  free (obj->children);
+  free (obj->status);
+  free (obj->time);
+
+  if (obj->remove_count > 0)
+    {
+      int i;
+
+      for (i = 0; i < obj->remove_count; ++i)
+	{
+	  remove (obj->remove[i]);
+	  free (obj->remove[i]);
+	}
+      free (obj->remove);
+    }
+
+  if (obj->funcs->cleanup != NULL)
+    obj->funcs->cleanup (obj);
+
+  free (obj);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/pex-common.h sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/pex-common.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/pex-common.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/pex-common.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,153 @@
+/* Utilities to execute a program in a subprocess (possibly linked by pipes
+   with other subprocesses), and wait for it.  Shared logic.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
+   Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If not,
+write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#ifndef PEX_COMMON_H
+#define PEX_COMMON_H
+
+#include "config.h"
+#include "libiberty.h"
+#include <stdio.h>
+
+/* pid_t is may defined by config.h or sys/types.h needs to be
+   included.  */
+#if !defined(pid_t) && defined(HAVE_SYS_TYPES_H)
+#include <sys/types.h>
+#endif
+
+#define install_error_msg "installation problem, cannot exec `%s'"
+
+/* stdin file number.  */
+#define STDIN_FILE_NO 0
+
+/* stdout file number.  */
+#define STDOUT_FILE_NO 1
+
+/* stderr file number.  */
+#define STDERR_FILE_NO 2
+
+/* value of `pipe': port index for reading.  */
+#define READ_PORT 0
+
+/* value of `pipe': port index for writing.  */
+#define WRITE_PORT 1
+
+/* The structure used by pex_init and friends.  */
+
+struct pex_obj
+{
+  /* Flags.  */
+  int flags;
+  /* Name of calling program, for error messages.  */
+  const char *pname;
+  /* Base name to use for temporary files.  */
+  const char *tempbase;
+  /* Pipe to use as stdin for next process.  */
+  int next_input;
+  /* File name to use as stdin for next process.  */
+  char *next_input_name;
+  /* Whether next_input_name was allocated using malloc.  */
+  int next_input_name_allocated;
+  /* If not -1, stderr pipe from the last process.  */
+  int stderr_pipe;
+  /* Number of child processes.  */
+  int count;
+  /* PIDs of child processes; array allocated using malloc.  */
+  pid_t *children;
+  /* Exit statuses of child processes; array allocated using malloc.  */
+  int *status;
+  /* Time used by child processes; array allocated using malloc.  */
+  struct pex_time *time;
+  /* Number of children we have already waited for.  */
+  int number_waited;
+  /* FILE created by pex_input_file.  */
+  FILE *input_file;
+  /* FILE created by pex_read_output.  */
+  FILE *read_output;
+  /* FILE created by pex_read_err.  */
+  FILE *read_err;
+  /* Number of temporary files to remove.  */
+  int remove_count;
+  /* List of temporary files to remove; array allocated using malloc
+     of strings allocated using malloc.  */
+  char **remove;
+  /* Pointers to system dependent functions.  */
+  const struct pex_funcs *funcs;
+  /* For use by system dependent code.  */
+  void *sysdep;
+};
+
+/* Functions passed to pex_run_common.  */
+
+struct pex_funcs
+{
+  /* Open file NAME for reading.  If BINARY is non-zero, open in
+     binary mode.  Return >= 0 on success, -1 on error.  */
+  int (*open_read) (struct pex_obj *, const char */* name */, int /* binary */);
+  /* Open file NAME for writing.  If BINARY is non-zero, open in
+     binary mode.  Return >= 0 on success, -1 on error.  */
+  int (*open_write) (struct pex_obj *, const char */* name */,
+                     int /* binary */);
+  /* Execute a child process.  FLAGS, EXECUTABLE, ARGV, ERR are from
+     pex_run.  IN, OUT, ERRDES, TOCLOSE are all descriptors, from
+     open_read, open_write, or pipe, or they are one of STDIN_FILE_NO,
+     STDOUT_FILE_NO or STDERR_FILE_NO; if IN, OUT, and ERRDES are not
+     STD*_FILE_NO, they should be closed.  If the descriptor TOCLOSE
+     is not -1, and the system supports pipes, TOCLOSE should be
+     closed in the child process.  The function should handle the
+     PEX_STDERR_TO_STDOUT flag.  Return >= 0 on success, or -1 on
+     error and set *ERRMSG and *ERR.  */
+  pid_t (*exec_child) (struct pex_obj *, int /* flags */,
+                      const char */* executable */, char * const * /* argv */,
+                      char * const * /* env */,
+                      int /* in */, int /* out */, int /* errdes */,
+		      int /* toclose */, const char **/* errmsg */,
+		      int */* err */);
+  /* Close a descriptor.  Return 0 on success, -1 on error.  */
+  int (*close) (struct pex_obj *, int);
+  /* Wait for a child to complete, returning exit status in *STATUS
+     and time in *TIME (if it is not null).  CHILD is from fork.  DONE
+     is 1 if this is called via pex_free.  ERRMSG and ERR are as in
+     fork.  Return 0 on success, -1 on error.  */
+  pid_t (*wait) (struct pex_obj *, pid_t /* child */, int * /* status */,
+               struct pex_time * /* time */, int /* done */,
+               const char ** /* errmsg */, int * /* err */);
+  /* Create a pipe (only called if PEX_USE_PIPES is set) storing two
+     descriptors in P[0] and P[1].  If BINARY is non-zero, open in
+     binary mode.  Return 0 on success, -1 on error.  */
+  int (*pipe) (struct pex_obj *, int * /* p */, int /* binary */);
+  /* Get a FILE pointer to read from a file descriptor (only called if
+     PEX_USE_PIPES is set).  If BINARY is non-zero, open in binary
+     mode.  Return pointer on success, NULL on error.  */
+  FILE * (*fdopenr) (struct pex_obj *, int /* fd */, int /* binary */);
+  /* Get a FILE pointer to write to the file descriptor FD (only
+     called if PEX_USE_PIPES is set).  If BINARY is non-zero, open in
+     binary mode.  Arrange for FD not to be inherited by the child
+     processes.  Return pointer on success, NULL on error.  */
+  FILE * (*fdopenw) (struct pex_obj *, int /* fd */, int /* binary */);
+  /* Free any system dependent data associated with OBJ.  May be
+     NULL if there is nothing to do.  */
+  void (*cleanup) (struct pex_obj *);
+};
+
+extern struct pex_obj *pex_init_common (int, const char *, const char *,
+					const struct pex_funcs *);
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/pex-djgpp.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/pex-djgpp.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/pex-djgpp.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/pex-djgpp.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,294 @@
+/* Utilities to execute a program in a subprocess (possibly linked by pipes
+   with other subprocesses), and wait for it.  DJGPP specialization.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2005
+   Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If not,
+write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#include "pex-common.h"
+
+#include <stdio.h>
+#include <errno.h>
+#ifdef NEED_DECLARATION_ERRNO
+extern int errno;
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <process.h>
+
+/* Use ECHILD if available, otherwise use EINVAL.  */
+#ifdef ECHILD
+#define PWAIT_ERROR ECHILD
+#else
+#define PWAIT_ERROR EINVAL
+#endif
+
+static int pex_djgpp_open_read (struct pex_obj *, const char *, int);
+static int pex_djgpp_open_write (struct pex_obj *, const char *, int);
+static pid_t pex_djgpp_exec_child (struct pex_obj *, int, const char *,
+				  char * const *, char * const *,
+				  int, int, int, int,
+				  const char **, int *);
+static int pex_djgpp_close (struct pex_obj *, int);
+static pid_t pex_djgpp_wait (struct pex_obj *, pid_t, int *, struct pex_time *,
+			   int, const char **, int *);
+
+/* The list of functions we pass to the common routines.  */
+
+const struct pex_funcs funcs =
+{
+  pex_djgpp_open_read,
+  pex_djgpp_open_write,
+  pex_djgpp_exec_child,
+  pex_djgpp_close,
+  pex_djgpp_wait,
+  NULL, /* pipe */
+  NULL, /* fdopenr */
+  NULL, /* fdopenw */
+  NULL  /* cleanup */
+};
+
+/* Return a newly initialized pex_obj structure.  */
+
+struct pex_obj *
+pex_init (int flags, const char *pname, const char *tempbase)
+{
+  /* DJGPP does not support pipes.  */
+  flags &= ~ PEX_USE_PIPES;
+  return pex_init_common (flags, pname, tempbase, &funcs);
+}
+
+/* Open a file for reading.  */
+
+static int
+pex_djgpp_open_read (struct pex_obj *obj ATTRIBUTE_UNUSED,
+		     const char *name, int binary)
+{
+  return open (name, O_RDONLY | (binary ? O_BINARY : O_TEXT));
+}
+
+/* Open a file for writing.  */
+
+static int
+pex_djgpp_open_write (struct pex_obj *obj ATTRIBUTE_UNUSED,
+		      const char *name, int binary)
+{
+  /* Note that we can't use O_EXCL here because gcc may have already
+     created the temporary file via make_temp_file.  */
+  return open (name,
+	       (O_WRONLY | O_CREAT | O_TRUNC
+		| (binary ? O_BINARY : O_TEXT)),
+	       S_IRUSR | S_IWUSR);
+}
+
+/* Close a file.  */
+
+static int
+pex_djgpp_close (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd)
+{
+  return close (fd);
+}
+
+/* Execute a child.  */
+
+static pid_t
+pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
+		      char * const * argv, char * const * env,
+                      int in, int out, int errdes,
+		      int toclose ATTRIBUTE_UNUSED, const char **errmsg,
+		      int *err)
+{
+  int org_in, org_out, org_errdes;
+  int status;
+  int *statuses;
+
+  org_in = -1;
+  org_out = -1;
+  org_errdes = -1;
+
+  if (in != STDIN_FILE_NO)
+    {
+      org_in = dup (STDIN_FILE_NO);
+      if (org_in < 0)
+	{
+	  *err = errno;
+	  *errmsg = "dup";
+	  return (pid_t) -1;
+	}
+      if (dup2 (in, STDIN_FILE_NO) < 0)
+	{
+	  *err = errno;
+	  *errmsg = "dup2";
+	  return (pid_t) -1;
+	}
+      if (close (in) < 0)
+	{
+	  *err = errno;
+	  *errmsg = "close";
+	  return (pid_t) -1;
+	}
+    }
+
+  if (out != STDOUT_FILE_NO)
+    {
+      org_out = dup (STDOUT_FILE_NO);
+      if (org_out < 0)
+	{
+	  *err = errno;
+	  *errmsg = "dup";
+	  return (pid_t) -1;
+	}
+      if (dup2 (out, STDOUT_FILE_NO) < 0)
+	{
+	  *err = errno;
+	  *errmsg = "dup2";
+	  return (pid_t) -1;
+	}
+      if (close (out) < 0)
+	{
+	  *err = errno;
+	  *errmsg = "close";
+	  return (pid_t) -1;
+	}
+    }
+
+  if (errdes != STDERR_FILE_NO
+      || (flags & PEX_STDERR_TO_STDOUT) != 0)
+    {
+      org_errdes = dup (STDERR_FILE_NO);
+      if (org_errdes < 0)
+	{
+	  *err = errno;
+	  *errmsg = "dup";
+	  return (pid_t) -1;
+	}
+      if (dup2 ((flags & PEX_STDERR_TO_STDOUT) != 0 ? STDOUT_FILE_NO : errdes,
+		 STDERR_FILE_NO) < 0)
+	{
+	  *err = errno;
+	  *errmsg = "dup2";
+	  return (pid_t) -1;
+	}
+      if (errdes != STDERR_FILE_NO)
+	{
+	  if (close (errdes) < 0)
+	    {
+	      *err = errno;
+	      *errmsg = "close";
+	      return (pid_t) -1;
+	    }
+	}
+    }
+
+  if (env)
+    status = (((flags & PEX_SEARCH) != 0 ? spawnvpe : spawnve)
+	      (P_WAIT, executable, argv, env));
+  else
+    status = (((flags & PEX_SEARCH) != 0 ? spawnvp : spawnv)
+  	      (P_WAIT, executable, argv));
+
+  if (status == -1)
+    {
+      *err = errno;
+      *errmsg = ((flags & PEX_SEARCH) != 0) ? "spawnvp" : "spawnv";
+    }
+
+  if (in != STDIN_FILE_NO)
+    {
+      if (dup2 (org_in, STDIN_FILE_NO) < 0)
+	{
+	  *err = errno;
+	  *errmsg = "dup2";
+	  return (pid_t) -1;
+	}
+      if (close (org_in) < 0)
+	{
+	  *err = errno;
+	  *errmsg = "close";
+	  return (pid_t) -1;
+	}
+    }
+
+  if (out != STDOUT_FILE_NO)
+    {
+      if (dup2 (org_out, STDOUT_FILE_NO) < 0)
+	{
+	  *err = errno;
+	  *errmsg = "dup2";
+	  return (pid_t) -1;
+	}
+      if (close (org_out) < 0)
+	{
+	  *err = errno;
+	  *errmsg = "close";
+	  return (pid_t) -1;
+	}
+    }
+
+  if (errdes != STDERR_FILE_NO
+      || (flags & PEX_STDERR_TO_STDOUT) != 0)
+    {
+      if (dup2 (org_errdes, STDERR_FILE_NO) < 0)
+	{
+	  *err = errno;
+	  *errmsg = "dup2";
+	  return (pid_t) -1;
+	}
+      if (close (org_errdes) < 0)
+	{
+	  *err = errno;
+	  *errmsg = "close";
+	  return (pid_t) -1;
+	}
+    }
+
+  /* Save the exit status for later.  When we are called, obj->count
+     is the number of children which have executed before this
+     one.  */
+  statuses = (int *) obj->sysdep;
+  statuses = XRESIZEVEC (int, statuses, obj->count + 1);
+  statuses[obj->count] = status;
+  obj->sysdep = (void *) statuses;
+
+  return (pid_t) obj->count;
+}
+
+/* Wait for a child process to complete.  Actually the child process
+   has already completed, and we just need to return the exit
+   status.  */
+
+static pid_t
+pex_djgpp_wait (struct pex_obj *obj, pid_t pid, int *status,
+		struct pex_time *time, int done ATTRIBUTE_UNUSED,
+		const char **errmsg ATTRIBUTE_UNUSED,
+		int *err ATTRIBUTE_UNUSED)
+{
+  int *statuses;
+
+  if (time != NULL)
+    memset (time, 0, sizeof *time);
+
+  statuses = (int *) obj->sysdep;
+  *status = statuses[pid];
+
+  return 0;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/pex-msdos.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/pex-msdos.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/pex-msdos.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/pex-msdos.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,317 @@
+/* Utilities to execute a program in a subprocess (possibly linked by pipes
+   with other subprocesses), and wait for it.  Generic MSDOS specialization.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2005
+   Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If not,
+write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#include "pex-common.h"
+
+#include <stdio.h>
+#include <errno.h>
+#ifdef NEED_DECLARATION_ERRNO
+extern int errno;
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#include "safe-ctype.h"
+#include <process.h>
+
+/* The structure we keep in obj->sysdep.  */
+
+#define PEX_MSDOS_FILE_COUNT 3
+
+#define PEX_MSDOS_FD_OFFSET 10
+
+struct pex_msdos
+{
+  /* An array of file names.  We refer to these using file descriptors
+     of 10 + array index.  */
+  const char *files[PEX_MSDOS_FILE_COUNT];
+  /* Exit statuses of programs which have been run.  */
+  int *statuses;
+};
+
+static int pex_msdos_open (struct pex_obj *, const char *, int);
+static int pex_msdos_open (struct pex_obj *, const char *, int);
+static int pex_msdos_fdindex (struct pex_msdos *, int);
+static pid_t pex_msdos_exec_child (struct pex_obj *, int, const char *,
+				  char * const *, char * const *,
+				  int, int, int, int,
+				  int, const char **, int *);
+static int pex_msdos_close (struct pex_obj *, int);
+static pid_t pex_msdos_wait (struct pex_obj *, pid_t, int *, struct pex_time *,
+			   int, const char **, int *);
+static void pex_msdos_cleanup (struct pex_obj *);
+
+/* The list of functions we pass to the common routines.  */
+
+const struct pex_funcs funcs =
+{
+  pex_msdos_open,
+  pex_msdos_open,
+  pex_msdos_exec_child,
+  pex_msdos_close,
+  pex_msdos_wait,
+  NULL, /* pipe */
+  NULL, /* fdopenr */
+  NULL, /* fdopenw */
+  pex_msdos_cleanup
+};
+
+/* Return a newly initialized pex_obj structure.  */
+
+struct pex_obj *
+pex_init (int flags, const char *pname, const char *tempbase)
+{
+  struct pex_obj *ret;
+  int i;
+
+  /* MSDOS does not support pipes.  */
+  flags &= ~ PEX_USE_PIPES;
+
+  ret = pex_init_common (flags, pname, tempbase, funcs);
+
+  ret->sysdep = XNEW (struct pex_msdos);
+  for (i = 0; i < PEX_MSDOS_FILE_COUNT; ++i)
+    ret->files[i] = NULL;
+  ret->statuses = NULL;
+
+  return ret;
+}
+
+/* Open a file.  FIXME: We ignore the binary argument, since we have
+   no way to handle it.  */
+
+static int
+pex_msdos_open (struct pex_obj *obj, const char *name,
+		int binary ATTRIBUTE_UNUSED)
+{
+  struct pex_msdos *ms;
+  int i;
+
+  ms = (struct pex_msdos *) obj->sysdep;
+
+  for (i = 0; i < PEX_MSDOS_FILE_COUNT; ++i)
+    {
+      if (ms->files[i] == NULL)
+	{
+	  ms->files[i] = xstrdup (name);
+	  return i + PEX_MSDOS_FD_OFFSET;
+	}
+    }
+
+  abort ();
+}
+
+/* Get the index into msdos->files associated with an open file
+   descriptor.  */
+
+static int
+pex_msdos_fdindex (struct pex_msdos *ms, int fd)
+{
+  fd -= PEX_MSDOS_FD_OFFSET;
+  if (fd < 0 || fd >= PEX_MSDOS_FILE_COUNT || ms->files[fd] == NULL)
+    abort ();
+  return fd;
+}
+
+
+/* Close a file.  */
+
+static int
+pex_msdos_close (struct pex_obj *obj, int fd)
+{
+  struct pex_msdos *ms;
+  int fdinex;
+
+  ms = (struct pex_msdos *) obj->sysdep;
+  fdindex = pe_msdos_fdindex (ms, fd);
+  free (ms->files[fdindex]);
+  ms->files[fdindex] = NULL;
+}
+
+/* Execute a child.  */
+
+static pid_t
+pex_msdos_exec_child (struct pex_obj *obj, int flags, const char *executable,
+		      char * const * argv, char * const * env, int in, int out,
+		      int toclose ATTRIBUTE_UNUSED,
+		      int errdes ATTRIBUTE_UNUSED, const char **errmsg,
+		      int *err)
+{
+  struct pex_msdos *ms;
+  char *temp_base;
+  int temp_base_allocated;
+  char *rf;
+  int inindex;
+  char *infile;
+  int outindex;
+  char *outfile;
+  char *scmd;
+  FILE *argfile;
+  int i;
+  int status;
+
+  ms = (struct pex_msdos *) obj->sysdep;
+
+  /* FIXME: I don't know how to redirect stderr, so we ignore ERRDES
+     and PEX_STDERR_TO_STDOUT.  */
+
+  temp_base = obj->temp_base;
+  if (temp_base != NULL)
+    temp_base_allocated = 0;
+  else
+    {
+      temp_base = choose_temp_base ();
+      temp_base_allocated = 1;
+    }
+
+  rf = concat (temp_base, ".gp", NULL);
+
+  if (temp_base_allocated)
+    free (temp_base);
+
+  if (in == STDIN_FILE_NO)
+    {
+      inindex = -1;
+      infile = "";
+    }
+  else
+    {
+      inindex = pex_msdos_fdindex (ms, in);
+      infile = ms->files[inindex];
+    }
+
+  if (out == STDOUT_FILE_NO)
+    {
+      outindex = -1;
+      outfile = "";
+    }
+  else
+    {
+      outindex = pex_msdos_fdindex (ms, out);
+      outfile = ms->files[outindex];
+    }
+
+  scmd = XNEWVEC (char, strlen (program)
+		  + ((flags & PEXECUTE_SEARCH) != 0 ? 4 : 0)
+		  + strlen (rf)
+		  + strlen (infile)
+		  + strlen (outfile)
+		  + 10);
+  sprintf (scmd, "%s%s @%s%s%s%s%s",
+	   program,
+	   (flags & PEXECUTE_SEARCH) != 0 ? ".exe" : "",
+	   rf,
+	   inindex != -1 ? " <" : "",
+	   infile,
+	   outindex != -1 ? " >" : "",
+	   outfile);
+
+  argfile = fopen (rf, "w");
+  if (argfile == NULL)
+    {
+      *err = errno;
+      free (scmd);
+      free (rf);
+      *errmsg = "cannot open temporary command file";
+      return (pid_t) -1;
+    }
+
+  for (i = 1; argv[i] != NULL; ++i)
+    {
+      char *p;
+
+      for (p = argv[i]; *p != '\0'; ++p)
+	{
+	  if (*p == '"' || *p == '\'' || *p == '\\' || ISSPACE (*p))
+	    putc ('\\', argfile);
+	  putc (*p, argfile);
+	}
+      putc ('\n', argfile);
+    }
+
+  fclose (argfile);
+
+  status = system (scmd);
+
+  if (status == -1)
+    {
+      *err = errno;
+      remove (rf);
+      free (scmd);
+      free (rf);
+      *errmsg = "system";
+      return (pid_t) -1;
+    }
+
+  remove (rf);
+  free (scmd);
+  free (rf);
+
+  /* Save the exit status for later.  When we are called, obj->count
+     is the number of children which have executed before this
+     one.  */
+  ms->statuses = XRESIZEVEC(int, ms->statuses, obj->count + 1);
+  ms->statuses[obj->count] = status;
+
+  return (pid_t) obj->count;
+}
+
+/* Wait for a child process to complete.  Actually the child process
+   has already completed, and we just need to return the exit
+   status.  */
+
+static pid_t
+pex_msdos_wait (struct pex_obj *obj, pid_t pid, int *status,
+		struct pex_time *time, int done ATTRIBUTE_UNUSED,
+		const char **errmsg ATTRIBUTE_UNUSED,
+		int *err ATTRIBUTE_UNUSED)
+{
+  struct pex_msdos *ms;
+
+  ms = (struct pex_msdos *) obj->sysdep;
+
+  if (time != NULL)
+    memset (time, 0, sizeof *time);
+
+  *status = ms->statuses[pid];
+
+  return 0;
+}
+
+/* Clean up the pex_msdos structure.  */
+
+static void
+pex_msdos_cleanup (struct pex_obj  *obj)
+{
+  struct pex_msdos *ms;
+  int i;
+
+  ms = (struct pex_msdos *) obj->sysdep;
+  for (i = 0; i < PEX_MSDOS_FILE_COUNT; ++i)
+    free (msdos->files[i]);
+  free (msdos->statuses);
+  free (msdos);
+  obj->sysdep = NULL;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/pex-one.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/pex-one.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/pex-one.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/pex-one.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,43 @@
+/* Execute a program and wait for a result.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If not,
+write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#include "config.h"
+#include "libiberty.h"
+
+const char *
+pex_one (int flags, const char *executable, char * const *argv,
+	 const char *pname, const char *outname, const char *errname,
+	 int *status, int *err)
+{
+  struct pex_obj *obj;
+  const char *errmsg;
+
+  obj = pex_init (0, pname, NULL);
+  errmsg = pex_run (obj, flags, executable, argv, outname, errname, err);
+  if (errmsg == NULL)
+    {
+      if (!pex_get_status (obj, 1, status))
+	{
+	  *err = 0;
+	  errmsg = "pex_get_status failed";
+	}
+    }
+  pex_free (obj);
+  return errmsg;  
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/pex-unix.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/pex-unix.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/pex-unix.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/pex-unix.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,788 @@
+/* Utilities to execute a program in a subprocess (possibly linked by pipes
+   with other subprocesses), and wait for it.  Generic Unix version
+   (also used for UWIN and VMS).
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2009,
+   2010 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If not,
+write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#include "config.h"
+#include "libiberty.h"
+#include "pex-common.h"
+
+#include <stdio.h>
+#include <signal.h>
+#include <errno.h>
+#ifdef NEED_DECLARATION_ERRNO
+extern int errno;
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <sys/types.h>
+
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+#ifdef HAVE_GETRUSAGE
+#include <sys/time.h>
+#include <sys/resource.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#ifdef HAVE_PROCESS_H
+#include <process.h>
+#endif
+
+#ifdef vfork /* Autoconf may define this to fork for us. */
+# define VFORK_STRING "fork"
+#else
+# define VFORK_STRING "vfork"
+#endif
+#ifdef HAVE_VFORK_H
+#include <vfork.h>
+#endif
+#if defined(VMS) && defined (__LONG_POINTERS)
+#ifndef __CHAR_PTR32
+typedef char * __char_ptr32
+__attribute__ ((mode (SI)));
+#endif
+
+typedef __char_ptr32 *__char_ptr_char_ptr32
+__attribute__ ((mode (SI)));
+
+/* Return a 32 bit pointer to an array of 32 bit pointers 
+   given a 64 bit pointer to an array of 64 bit pointers.  */
+
+static __char_ptr_char_ptr32
+to_ptr32 (char **ptr64)
+{
+  int argc;
+  __char_ptr_char_ptr32 short_argv;
+
+  for (argc=0; ptr64[argc]; argc++);
+
+  /* Reallocate argv with 32 bit pointers.  */
+  short_argv = (__char_ptr_char_ptr32) decc$malloc
+    (sizeof (__char_ptr32) * (argc + 1));
+
+  for (argc=0; ptr64[argc]; argc++)
+    short_argv[argc] = (__char_ptr32) decc$strdup (ptr64[argc]);
+
+  short_argv[argc] = (__char_ptr32) 0;
+  return short_argv;
+
+}
+#else
+#define to_ptr32(argv) argv
+#endif
+
+/* File mode to use for private and world-readable files.  */
+
+#if defined (S_IRUSR) && defined (S_IWUSR) && defined (S_IRGRP) && defined (S_IWGRP) && defined (S_IROTH) && defined (S_IWOTH)
+#define PUBLIC_MODE  \
+    (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
+#else
+#define PUBLIC_MODE 0666
+#endif
+
+/* Get the exit status of a particular process, and optionally get the
+   time that it took.  This is simple if we have wait4, slightly
+   harder if we have waitpid, and is a pain if we only have wait.  */
+
+static pid_t pex_wait (struct pex_obj *, pid_t, int *, struct pex_time *);
+
+#ifdef HAVE_WAIT4
+
+static pid_t
+pex_wait (struct pex_obj *obj ATTRIBUTE_UNUSED, pid_t pid, int *status,
+	  struct pex_time *time)
+{
+  pid_t ret;
+  struct rusage r;
+
+#ifdef HAVE_WAITPID
+  if (time == NULL)
+    return waitpid (pid, status, 0);
+#endif
+
+  ret = wait4 (pid, status, 0, &r);
+
+  if (time != NULL)
+    {
+      time->user_seconds = r.ru_utime.tv_sec;
+      time->user_microseconds= r.ru_utime.tv_usec;
+      time->system_seconds = r.ru_stime.tv_sec;
+      time->system_microseconds= r.ru_stime.tv_usec;
+    }
+
+  return ret;
+}
+
+#else /* ! defined (HAVE_WAIT4) */
+
+#ifdef HAVE_WAITPID
+
+#ifndef HAVE_GETRUSAGE
+
+static pid_t
+pex_wait (struct pex_obj *obj ATTRIBUTE_UNUSED, pid_t pid, int *status,
+	  struct pex_time *time)
+{
+  if (time != NULL)
+    memset (time, 0, sizeof (struct pex_time));
+  return waitpid (pid, status, 0);
+}
+
+#else /* defined (HAVE_GETRUSAGE) */
+
+static pid_t
+pex_wait (struct pex_obj *obj ATTRIBUTE_UNUSED, pid_t pid, int *status,
+	  struct pex_time *time)
+{
+  struct rusage r1, r2;
+  pid_t ret;
+
+  if (time == NULL)
+    return waitpid (pid, status, 0);
+
+  getrusage (RUSAGE_CHILDREN, &r1);
+
+  ret = waitpid (pid, status, 0);
+  if (ret < 0)
+    return ret;
+
+  getrusage (RUSAGE_CHILDREN, &r2);
+
+  time->user_seconds = r2.ru_utime.tv_sec - r1.ru_utime.tv_sec;
+  time->user_microseconds = r2.ru_utime.tv_usec - r1.ru_utime.tv_usec;
+  if (r2.ru_utime.tv_usec < r1.ru_utime.tv_usec)
+    {
+      --time->user_seconds;
+      time->user_microseconds += 1000000;
+    }
+
+  time->system_seconds = r2.ru_stime.tv_sec - r1.ru_stime.tv_sec;
+  time->system_microseconds = r2.ru_stime.tv_usec - r1.ru_stime.tv_usec;
+  if (r2.ru_stime.tv_usec < r1.ru_stime.tv_usec)
+    {
+      --time->system_seconds;
+      time->system_microseconds += 1000000;
+    }
+
+  return ret;
+}
+
+#endif /* defined (HAVE_GETRUSAGE) */
+
+#else /* ! defined (HAVE_WAITPID) */
+
+struct status_list
+{
+  struct status_list *next;
+  pid_t pid;
+  int status;
+  struct pex_time time;
+};
+
+static pid_t
+pex_wait (struct pex_obj *obj, pid_t pid, int *status, struct pex_time *time)
+{
+  struct status_list **pp;
+
+  for (pp = (struct status_list **) &obj->sysdep;
+       *pp != NULL;
+       pp = &(*pp)->next)
+    {
+      if ((*pp)->pid == pid)
+	{
+	  struct status_list *p;
+
+	  p = *pp;
+	  *status = p->status;
+	  if (time != NULL)
+	    *time = p->time;
+	  *pp = p->next;
+	  free (p);
+	  return pid;
+	}
+    }
+
+  while (1)
+    {
+      pid_t cpid;
+      struct status_list *psl;
+      struct pex_time pt;
+#ifdef HAVE_GETRUSAGE
+      struct rusage r1, r2;
+#endif
+
+      if (time != NULL)
+	{
+#ifdef HAVE_GETRUSAGE
+	  getrusage (RUSAGE_CHILDREN, &r1);
+#else
+	  memset (&pt, 0, sizeof (struct pex_time));
+#endif
+	}
+
+      cpid = wait (status);
+
+#ifdef HAVE_GETRUSAGE
+      if (time != NULL && cpid >= 0)
+	{
+	  getrusage (RUSAGE_CHILDREN, &r2);
+
+	  pt.user_seconds = r2.ru_utime.tv_sec - r1.ru_utime.tv_sec;
+	  pt.user_microseconds = r2.ru_utime.tv_usec - r1.ru_utime.tv_usec;
+	  if (pt.user_microseconds < 0)
+	    {
+	      --pt.user_seconds;
+	      pt.user_microseconds += 1000000;
+	    }
+
+	  pt.system_seconds = r2.ru_stime.tv_sec - r1.ru_stime.tv_sec;
+	  pt.system_microseconds = r2.ru_stime.tv_usec - r1.ru_stime.tv_usec;
+	  if (pt.system_microseconds < 0)
+	    {
+	      --pt.system_seconds;
+	      pt.system_microseconds += 1000000;
+	    }
+	}
+#endif
+
+      if (cpid < 0 || cpid == pid)
+	{
+	  if (time != NULL)
+	    *time = pt;
+	  return cpid;
+	}
+
+      psl = XNEW (struct status_list);
+      psl->pid = cpid;
+      psl->status = *status;
+      if (time != NULL)
+	psl->time = pt;
+      psl->next = (struct status_list *) obj->sysdep;
+      obj->sysdep = (void *) psl;
+    }
+}
+
+#endif /* ! defined (HAVE_WAITPID) */
+#endif /* ! defined (HAVE_WAIT4) */
+
+static void pex_child_error (struct pex_obj *, const char *, const char *, int)
+     ATTRIBUTE_NORETURN;
+static int pex_unix_open_read (struct pex_obj *, const char *, int);
+static int pex_unix_open_write (struct pex_obj *, const char *, int);
+static pid_t pex_unix_exec_child (struct pex_obj *, int, const char *,
+				 char * const *, char * const *,
+				 int, int, int, int,
+				 const char **, int *);
+static int pex_unix_close (struct pex_obj *, int);
+static int pex_unix_wait (struct pex_obj *, pid_t, int *, struct pex_time *,
+			  int, const char **, int *);
+static int pex_unix_pipe (struct pex_obj *, int *, int);
+static FILE *pex_unix_fdopenr (struct pex_obj *, int, int);
+static FILE *pex_unix_fdopenw (struct pex_obj *, int, int);
+static void pex_unix_cleanup (struct pex_obj *);
+
+/* The list of functions we pass to the common routines.  */
+
+const struct pex_funcs funcs =
+{
+  pex_unix_open_read,
+  pex_unix_open_write,
+  pex_unix_exec_child,
+  pex_unix_close,
+  pex_unix_wait,
+  pex_unix_pipe,
+  pex_unix_fdopenr,
+  pex_unix_fdopenw,
+  pex_unix_cleanup
+};
+
+/* Return a newly initialized pex_obj structure.  */
+
+struct pex_obj *
+pex_init (int flags, const char *pname, const char *tempbase)
+{
+  return pex_init_common (flags, pname, tempbase, &funcs);
+}
+
+/* Open a file for reading.  */
+
+static int
+pex_unix_open_read (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name,
+		    int binary ATTRIBUTE_UNUSED)
+{
+  return open (name, O_RDONLY);
+}
+
+/* Open a file for writing.  */
+
+static int
+pex_unix_open_write (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name,
+		     int binary ATTRIBUTE_UNUSED)
+{
+  /* Note that we can't use O_EXCL here because gcc may have already
+     created the temporary file via make_temp_file.  */
+  return open (name, O_WRONLY | O_CREAT | O_TRUNC, PUBLIC_MODE);
+}
+
+/* Close a file.  */
+
+static int
+pex_unix_close (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd)
+{
+  return close (fd);
+}
+
+/* Report an error from a child process.  We don't use stdio routines,
+   because we might be here due to a vfork call.  */
+
+static void
+pex_child_error (struct pex_obj *obj, const char *executable,
+		 const char *errmsg, int err)
+{
+  int retval = 0;
+#define writeerr(s) retval |= (write (STDERR_FILE_NO, s, strlen (s)) < 0)
+  writeerr (obj->pname);
+  writeerr (": error trying to exec '");
+  writeerr (executable);
+  writeerr ("': ");
+  writeerr (errmsg);
+  writeerr (": ");
+  writeerr (xstrerror (err));
+  writeerr ("\n");
+#undef writeerr
+  /* Exit with -2 if the error output failed, too.  */
+  _exit (retval == 0 ? -1 : -2);
+}
+
+/* Execute a child.  */
+
+extern char **environ;
+
+#if defined(HAVE_SPAWNVE) && defined(HAVE_SPAWNVPE)
+/* Implementation of pex->exec_child using the Cygwin spawn operation.  */
+
+/* Subroutine of pex_unix_exec_child.  Move OLD_FD to a new file descriptor
+   to be stored in *PNEW_FD, save the flags in *PFLAGS, and arrange for the
+   saved copy to be close-on-exec.  Move CHILD_FD into OLD_FD.  If CHILD_FD
+   is -1, OLD_FD is to be closed.  Return -1 on error.  */
+
+static int
+save_and_install_fd(int *pnew_fd, int *pflags, int old_fd, int child_fd)
+{
+  int new_fd, flags;
+
+  flags = fcntl (old_fd, F_GETFD);
+
+  /* If we could not retrieve the flags, then OLD_FD was not open.  */
+  if (flags < 0)
+    {
+      new_fd = -1, flags = 0;
+      if (child_fd >= 0 && dup2 (child_fd, old_fd) < 0)
+	return -1;
+    }
+  /* If we wish to close OLD_FD, just mark it CLOEXEC.  */
+  else if (child_fd == -1)
+    {
+      new_fd = old_fd;
+      if ((flags & FD_CLOEXEC) == 0 && fcntl (old_fd, F_SETFD, FD_CLOEXEC) < 0)
+	return -1;
+    }
+  /* Otherwise we need to save a copy of OLD_FD before installing CHILD_FD.  */
+  else
+    {
+#ifdef F_DUPFD_CLOEXEC
+      new_fd = fcntl (old_fd, F_DUPFD_CLOEXEC, 3);
+      if (new_fd < 0)
+	return -1;
+#else
+      /* Prefer F_DUPFD over dup in order to avoid getting a new fd
+	 in the range 0-2, right where a new stderr fd might get put.  */
+      new_fd = fcntl (old_fd, F_DUPFD, 3);
+      if (new_fd < 0)
+	return -1;
+      if (fcntl (new_fd, F_SETFD, FD_CLOEXEC) < 0)
+	return -1;
+#endif
+      if (dup2 (child_fd, old_fd) < 0)
+	return -1;
+    }
+
+  *pflags = flags;
+  if (pnew_fd)
+    *pnew_fd = new_fd;
+  else if (new_fd != old_fd)
+    abort ();
+
+  return 0;
+}
+
+/* Subroutine of pex_unix_exec_child.  Move SAVE_FD back to OLD_FD
+   restoring FLAGS.  If SAVE_FD < 0, OLD_FD is to be closed.  */
+
+static int
+restore_fd(int old_fd, int save_fd, int flags)
+{
+  /* For SAVE_FD < 0, all we have to do is restore the
+     "closed-ness" of the original.  */
+  if (save_fd < 0)
+    return close (old_fd);
+
+  /* For SAVE_FD == OLD_FD, all we have to do is restore the
+     original setting of the CLOEXEC flag.  */
+  if (save_fd == old_fd)
+    {
+      if (flags & FD_CLOEXEC)
+	return 0;
+      return fcntl (old_fd, F_SETFD, flags);
+    }
+
+  /* Otherwise we have to move the descriptor back, restore the flags,
+     and close the saved copy.  */
+#ifdef HAVE_DUP3
+  if (flags == FD_CLOEXEC)
+    {
+      if (dup3 (save_fd, old_fd, O_CLOEXEC) < 0)
+	return -1;
+    }
+  else
+#endif
+    {
+      if (dup2 (save_fd, old_fd) < 0)
+	return -1;
+      if (flags != 0 && fcntl (old_fd, F_SETFD, flags) < 0)
+	return -1;
+    }
+  return close (save_fd);
+}
+
+static pid_t
+pex_unix_exec_child (struct pex_obj *obj ATTRIBUTE_UNUSED,
+		     int flags, const char *executable,
+		     char * const * argv, char * const * env,
+                     int in, int out, int errdes, int toclose,
+		     const char **errmsg, int *err)
+{
+  int fl_in = 0, fl_out = 0, fl_err = 0, fl_tc = 0;
+  int save_in = -1, save_out = -1, save_err = -1;
+  int max, retries;
+  pid_t pid;
+
+  if (flags & PEX_STDERR_TO_STDOUT)
+    errdes = out;
+
+  /* We need the three standard file descriptors to be set up as for
+     the child before we perform the spawn.  The file descriptors for
+     the parent need to be moved and marked for close-on-exec.  */
+  if (in != STDIN_FILE_NO
+      && save_and_install_fd (&save_in, &fl_in, STDIN_FILE_NO, in) < 0)
+    goto error_dup2;
+  if (out != STDOUT_FILE_NO
+      && save_and_install_fd (&save_out, &fl_out, STDOUT_FILE_NO, out) < 0)
+    goto error_dup2;
+  if (errdes != STDERR_FILE_NO
+      && save_and_install_fd (&save_err, &fl_err, STDERR_FILE_NO, errdes) < 0)
+    goto error_dup2;
+  if (toclose >= 0
+      && save_and_install_fd (NULL, &fl_tc, toclose, -1) < 0)
+    goto error_dup2;
+
+  /* Now that we've moved the file descriptors for the child into place,
+     close the originals.  Be careful not to close any of the standard
+     file descriptors that we just set up.  */
+  max = -1;
+  if (errdes >= 0)
+    max = STDERR_FILE_NO;
+  else if (out >= 0)
+    max = STDOUT_FILE_NO;
+  else if (in >= 0)
+    max = STDIN_FILE_NO;
+  if (in > max)
+    close (in);
+  if (out > max)
+    close (out);
+  if (errdes > max && errdes != out)
+    close (errdes);
+
+  /* If we were not given an environment, use the global environment.  */
+  if (env == NULL)
+    env = environ;
+
+  /* Launch the program.  If we get EAGAIN (normally out of pid's), try
+     again a few times with increasing backoff times.  */
+  retries = 0;
+  while (1)
+    {
+      typedef const char * const *cc_cp;
+
+      if (flags & PEX_SEARCH)
+	pid = spawnvpe (_P_NOWAITO, executable, (cc_cp)argv, (cc_cp)env);
+      else
+	pid = spawnve (_P_NOWAITO, executable, (cc_cp)argv, (cc_cp)env);
+
+      if (pid > 0)
+	break;
+
+      *err = errno;
+      *errmsg = "spawn";
+      if (errno != EAGAIN || ++retries == 4)
+	return (pid_t) -1;
+      sleep (1 << retries);
+    }
+
+  /* Success.  Restore the parent's file descriptors that we saved above.  */
+  if (toclose >= 0
+      && restore_fd (toclose, toclose, fl_tc) < 0)
+    goto error_dup2;
+  if (in != STDIN_FILE_NO
+      && restore_fd (STDIN_FILE_NO, save_in, fl_in) < 0)
+    goto error_dup2;
+  if (out != STDOUT_FILE_NO
+      && restore_fd (STDOUT_FILE_NO, save_out, fl_out) < 0)
+    goto error_dup2;
+  if (errdes != STDERR_FILE_NO
+      && restore_fd (STDERR_FILE_NO, save_err, fl_err) < 0)
+    goto error_dup2;
+
+  return pid;
+
+ error_dup2:
+  *err = errno;
+  *errmsg = "dup2";
+  return (pid_t) -1;
+}
+
+#else
+/* Implementation of pex->exec_child using standard vfork + exec.  */
+
+static pid_t
+pex_unix_exec_child (struct pex_obj *obj, int flags, const char *executable,
+		     char * const * argv, char * const * env,
+                     int in, int out, int errdes,
+		     int toclose, const char **errmsg, int *err)
+{
+  pid_t pid;
+
+  /* We declare these to be volatile to avoid warnings from gcc about
+     them being clobbered by vfork.  */
+  volatile int sleep_interval;
+  volatile int retries;
+
+  /* We vfork and then set environ in the child before calling execvp.
+     This clobbers the parent's environ so we need to restore it.
+     It would be nice to use one of the exec* functions that takes an
+     environment as a parameter, but that may have portability issues.  */
+  char **save_environ = environ;
+
+  sleep_interval = 1;
+  pid = -1;
+  for (retries = 0; retries < 4; ++retries)
+    {
+      pid = vfork ();
+      if (pid >= 0)
+	break;
+      sleep (sleep_interval);
+      sleep_interval *= 2;
+    }
+
+  switch (pid)
+    {
+    case -1:
+      *err = errno;
+      *errmsg = VFORK_STRING;
+      return (pid_t) -1;
+
+    case 0:
+      /* Child process.  */
+      if (in != STDIN_FILE_NO)
+	{
+	  if (dup2 (in, STDIN_FILE_NO) < 0)
+	    pex_child_error (obj, executable, "dup2", errno);
+	  if (close (in) < 0)
+	    pex_child_error (obj, executable, "close", errno);
+	}
+      if (out != STDOUT_FILE_NO)
+	{
+	  if (dup2 (out, STDOUT_FILE_NO) < 0)
+	    pex_child_error (obj, executable, "dup2", errno);
+	  if (close (out) < 0)
+	    pex_child_error (obj, executable, "close", errno);
+	}
+      if (errdes != STDERR_FILE_NO)
+	{
+	  if (dup2 (errdes, STDERR_FILE_NO) < 0)
+	    pex_child_error (obj, executable, "dup2", errno);
+	  if (close (errdes) < 0)
+	    pex_child_error (obj, executable, "close", errno);
+	}
+      if (toclose >= 0)
+	{
+	  if (close (toclose) < 0)
+	    pex_child_error (obj, executable, "close", errno);
+	}
+      if ((flags & PEX_STDERR_TO_STDOUT) != 0)
+	{
+	  if (dup2 (STDOUT_FILE_NO, STDERR_FILE_NO) < 0)
+	    pex_child_error (obj, executable, "dup2", errno);
+	}
+
+      if (env)
+	{
+	  /* NOTE: In a standard vfork implementation this clobbers the
+	     parent's copy of environ "too" (in reality there's only one copy).
+	     This is ok as we restore it below.  */
+	  environ = (char**) env;
+	}
+
+      if ((flags & PEX_SEARCH) != 0)
+	{
+	  execvp (executable, to_ptr32 (argv));
+	  pex_child_error (obj, executable, "execvp", errno);
+	}
+      else
+	{
+	  execv (executable, to_ptr32 (argv));
+	  pex_child_error (obj, executable, "execv", errno);
+	}
+
+      /* NOTREACHED */
+      return (pid_t) -1;
+
+    default:
+      /* Parent process.  */
+
+      /* Restore environ.
+	 Note that the parent either doesn't run until the child execs/exits
+	 (standard vfork behaviour), or if it does run then vfork is behaving
+	 more like fork.  In either case we needn't worry about clobbering
+	 the child's copy of environ.  */
+      environ = save_environ;
+
+      if (in != STDIN_FILE_NO)
+	{
+	  if (close (in) < 0)
+	    {
+	      *err = errno;
+	      *errmsg = "close";
+	      return (pid_t) -1;
+	    }
+	}
+      if (out != STDOUT_FILE_NO)
+	{
+	  if (close (out) < 0)
+	    {
+	      *err = errno;
+	      *errmsg = "close";
+	      return (pid_t) -1;
+	    }
+	}
+      if (errdes != STDERR_FILE_NO)
+	{
+	  if (close (errdes) < 0)
+	    {
+	      *err = errno;
+	      *errmsg = "close";
+	      return (pid_t) -1;
+	    }
+	}
+
+      return pid;
+    }
+}
+#endif /* SPAWN */
+
+/* Wait for a child process to complete.  */
+
+static int
+pex_unix_wait (struct pex_obj *obj, pid_t pid, int *status,
+	       struct pex_time *time, int done, const char **errmsg,
+	       int *err)
+{
+  /* If we are cleaning up when the caller didn't retrieve process
+     status for some reason, encourage the process to go away.  */
+  if (done)
+    kill (pid, SIGTERM);
+
+  if (pex_wait (obj, pid, status, time) < 0)
+    {
+      *err = errno;
+      *errmsg = "wait";
+      return -1;
+    }
+
+  return 0;
+}
+
+/* Create a pipe.  */
+
+static int
+pex_unix_pipe (struct pex_obj *obj ATTRIBUTE_UNUSED, int *p,
+	       int binary ATTRIBUTE_UNUSED)
+{
+  return pipe (p);
+}
+
+/* Get a FILE pointer to read from a file descriptor.  */
+
+static FILE *
+pex_unix_fdopenr (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd,
+		  int binary ATTRIBUTE_UNUSED)
+{
+  return fdopen (fd, "r");
+}
+
+static FILE *
+pex_unix_fdopenw (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd,
+		  int binary ATTRIBUTE_UNUSED)
+{
+  if (fcntl (fd, F_SETFD, FD_CLOEXEC) < 0)
+    return NULL;
+  return fdopen (fd, "w");
+}
+
+static void
+pex_unix_cleanup (struct pex_obj *obj ATTRIBUTE_UNUSED)
+{
+#if !defined (HAVE_WAIT4) && !defined (HAVE_WAITPID)
+  while (obj->sysdep != NULL)
+    {
+      struct status_list *this;
+      struct status_list *next;
+
+      this = (struct status_list *) obj->sysdep;
+      next = this->next;
+      free (this);
+      obj->sysdep = (void *) next;
+    }
+#endif
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/pex-win32.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/pex-win32.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/pex-win32.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/pex-win32.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,942 @@
+/* Utilities to execute a program in a subprocess (possibly linked by pipes
+   with other subprocesses), and wait for it.  Generic Win32 specialization.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If not,
+write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#include "pex-common.h"
+
+#include <windows.h>
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
+#include <assert.h>
+#include <process.h>
+#include <io.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <ctype.h>
+
+/* mingw32 headers may not define the following.  */
+
+#ifndef _P_WAIT
+#  define _P_WAIT	0
+#  define _P_NOWAIT	1
+#  define _P_OVERLAY	2
+#  define _P_NOWAITO	3
+#  define _P_DETACH	4
+
+#  define WAIT_CHILD		0
+#  define WAIT_GRANDCHILD	1
+#endif
+
+#define MINGW_NAME "Minimalist GNU for Windows"
+#define MINGW_NAME_LEN (sizeof(MINGW_NAME) - 1)
+
+extern char *stpcpy (char *dst, const char *src);
+
+/* Ensure that the executable pathname uses Win32 backslashes. This
+   is not necessary on NT, but on W9x, forward slashes causes
+   failure of spawn* and exec* functions (and probably any function
+   that calls CreateProcess) *iff* the executable pathname (argv[0])
+   is a quoted string.  And quoting is necessary in case a pathname
+   contains embedded white space.  You can't win.  */
+static void
+backslashify (char *s)
+{
+  while ((s = strchr (s, '/')) != NULL)
+    *s = '\\';
+  return;
+}
+
+static int pex_win32_open_read (struct pex_obj *, const char *, int);
+static int pex_win32_open_write (struct pex_obj *, const char *, int);
+static pid_t pex_win32_exec_child (struct pex_obj *, int, const char *,
+				  char * const *, char * const *,
+                                  int, int, int, int,
+				  const char **, int *);
+static int pex_win32_close (struct pex_obj *, int);
+static pid_t pex_win32_wait (struct pex_obj *, pid_t, int *,
+			   struct pex_time *, int, const char **, int *);
+static int pex_win32_pipe (struct pex_obj *, int *, int);
+static FILE *pex_win32_fdopenr (struct pex_obj *, int, int);
+static FILE *pex_win32_fdopenw (struct pex_obj *, int, int);
+
+/* The list of functions we pass to the common routines.  */
+
+const struct pex_funcs funcs =
+{
+  pex_win32_open_read,
+  pex_win32_open_write,
+  pex_win32_exec_child,
+  pex_win32_close,
+  pex_win32_wait,
+  pex_win32_pipe,
+  pex_win32_fdopenr,
+  pex_win32_fdopenw,
+  NULL /* cleanup */
+};
+
+/* Return a newly initialized pex_obj structure.  */
+
+struct pex_obj *
+pex_init (int flags, const char *pname, const char *tempbase)
+{
+  return pex_init_common (flags, pname, tempbase, &funcs);
+}
+
+/* Open a file for reading.  */
+
+static int
+pex_win32_open_read (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name,
+		     int binary)
+{
+  return _open (name, _O_RDONLY | (binary ? _O_BINARY : _O_TEXT));
+}
+
+/* Open a file for writing.  */
+
+static int
+pex_win32_open_write (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name,
+		      int binary)
+{
+  /* Note that we can't use O_EXCL here because gcc may have already
+     created the temporary file via make_temp_file.  */
+  return _open (name,
+		(_O_WRONLY | _O_CREAT | _O_TRUNC
+		 | (binary ? _O_BINARY : _O_TEXT)),
+		_S_IREAD | _S_IWRITE);
+}
+
+/* Close a file.  */
+
+static int
+pex_win32_close (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd)
+{
+  return _close (fd);
+}
+
+#ifdef USE_MINGW_MSYS
+static const char *mingw_keys[] = {"SOFTWARE", "Microsoft", "Windows", "CurrentVersion", "Uninstall", NULL};
+
+/* Tack the executable on the end of a (possibly slash terminated) buffer
+   and convert everything to \. */
+static const char *
+tack_on_executable (char *buf, const char *executable)
+{
+  char *p = strchr (buf, '\0');
+  if (p > buf && (p[-1] == '\\' || p[-1] == '/'))
+    p[-1] = '\0';
+  backslashify (strcat (buf, executable));
+  return buf;
+}
+
+/* Walk down a registry hierarchy until the end.  Return the key. */
+static HKEY
+openkey (HKEY hStart, const char *keys[])
+{
+  HKEY hKey, hTmp;
+  for (hKey = hStart; *keys; keys++)
+    {
+      LONG res;
+      hTmp = hKey;
+      res = RegOpenKey (hTmp, *keys, &hKey);
+
+      if (hTmp != HKEY_LOCAL_MACHINE)
+	RegCloseKey (hTmp);
+
+      if (res != ERROR_SUCCESS)
+	return NULL;
+    }
+  return hKey;
+}
+
+/* Return the "mingw root" as derived from the mingw uninstall information. */
+static const char *
+mingw_rootify (const char *executable)
+{
+  HKEY hKey, hTmp;
+  DWORD maxlen;
+  char *namebuf, *foundbuf;
+  DWORD i;
+  LONG res;
+
+  /* Open the uninstall "directory". */
+  hKey = openkey (HKEY_LOCAL_MACHINE, mingw_keys);
+
+  /* Not found. */
+  if (!hKey)
+    return executable;
+
+  /* Need to enumerate all of the keys here looking for one the most recent
+     one for MinGW. */
+  if (RegQueryInfoKey (hKey, NULL, NULL, NULL, NULL, &maxlen, NULL, NULL,
+		       NULL, NULL, NULL, NULL) != ERROR_SUCCESS)
+    {
+      RegCloseKey (hKey);
+      return executable;
+    }
+  namebuf = XNEWVEC (char, ++maxlen);
+  foundbuf = XNEWVEC (char, maxlen);
+  foundbuf[0] = '\0';
+  if (!namebuf || !foundbuf)
+    {
+      RegCloseKey (hKey);
+      free (namebuf);
+      free (foundbuf);
+      return executable;
+    }
+
+  /* Look through all of the keys for one that begins with Minimal GNU...
+     Try to get the latest version by doing a string compare although that
+     string never really works with version number sorting. */
+  for (i = 0; RegEnumKey (hKey, i, namebuf, maxlen) == ERROR_SUCCESS; i++)
+    {
+      int match = strcasecmp (namebuf, MINGW_NAME);
+      if (match < 0)
+	continue;
+      if (match > 0 && strncasecmp (namebuf, MINGW_NAME, MINGW_NAME_LEN) > 0)
+	continue;
+      if (strcasecmp (namebuf, foundbuf) > 0)
+	strcpy (foundbuf, namebuf);
+    }
+  free (namebuf);
+
+  /* If foundbuf is empty, we didn't find anything.  Punt. */
+  if (!foundbuf[0])
+    {
+      free (foundbuf);
+      RegCloseKey (hKey);
+      return executable;
+    }
+
+  /* Open the key that we wanted */
+  res = RegOpenKey (hKey, foundbuf, &hTmp);
+  RegCloseKey (hKey);
+  free (foundbuf);
+
+  /* Don't know why this would fail, but you gotta check */
+  if (res != ERROR_SUCCESS)
+    return executable;
+
+  maxlen = 0;
+  /* Get the length of the value pointed to by InstallLocation */
+  if (RegQueryValueEx (hTmp, "InstallLocation", 0, NULL, NULL,
+		       &maxlen) != ERROR_SUCCESS || maxlen == 0)
+    {
+      RegCloseKey (hTmp);
+      return executable;
+    }
+
+  /* Allocate space for the install location */
+  foundbuf = XNEWVEC (char, maxlen + strlen (executable));
+  if (!foundbuf)
+    {
+      free (foundbuf);
+      RegCloseKey (hTmp);
+    }
+
+  /* Read the install location into the buffer */
+  res = RegQueryValueEx (hTmp, "InstallLocation", 0, NULL, (LPBYTE) foundbuf,
+			 &maxlen);
+  RegCloseKey (hTmp);
+  if (res != ERROR_SUCCESS)
+    {
+      free (foundbuf);
+      return executable;
+    }
+
+  /* Concatenate the install location and the executable, turn all slashes
+     to backslashes, and return that. */
+  return tack_on_executable (foundbuf, executable);
+}
+
+/* Read the install location of msys from it's installation file and
+   rootify the executable based on that. */
+static const char *
+msys_rootify (const char *executable)
+{
+  size_t bufsize = 64;
+  size_t execlen = strlen (executable) + 1;
+  char *buf;
+  DWORD res = 0;
+  for (;;)
+    {
+      buf = XNEWVEC (char, bufsize + execlen);
+      if (!buf)
+	break;
+      res = GetPrivateProfileString ("InstallSettings", "InstallPath", NULL,
+				     buf, bufsize, "msys.ini");
+      if (!res)
+	break;
+      if (strlen (buf) < bufsize)
+	break;
+      res = 0;
+      free (buf);
+      bufsize *= 2;
+      if (bufsize > 65536)
+	{
+	  buf = NULL;
+	  break;
+	}
+    }
+
+  if (res)
+    return tack_on_executable (buf, executable);
+
+  /* failed */
+  free (buf);
+  return executable;
+}
+#endif
+
+/* Return the number of arguments in an argv array, not including the null
+   terminating argument. */
+
+static int
+argv_to_argc (char *const *argv)
+{
+  char *const *i = argv;
+  while (*i)
+    i++;
+  return i - argv;
+}
+
+/* Return a Windows command-line from ARGV.  It is the caller's
+   responsibility to free the string returned.  */
+
+static char *
+argv_to_cmdline (char *const *argv)
+{
+  char *cmdline;
+  char *p;
+  size_t cmdline_len;
+  int i, j, k;
+
+  cmdline_len = 0;
+  for (i = 0; argv[i]; i++)
+    {
+      /* We quote every last argument.  This simplifies the problem;
+	 we need only escape embedded double-quotes and immediately
+	 preceeding backslash characters.  A sequence of backslach characters
+	 that is not follwed by a double quote character will not be
+	 escaped.  */
+      for (j = 0; argv[i][j]; j++)
+	{
+	  if (argv[i][j] == '"')
+	    {
+	      /* Escape preceeding backslashes.  */
+	      for (k = j - 1; k >= 0 && argv[i][k] == '\\'; k--)
+		cmdline_len++;
+	      /* Escape the qote character.  */
+	      cmdline_len++;
+	    }
+	}
+      /* Trailing backslashes also need to be escaped because they will be
+         followed by the terminating quote.  */
+      for (k = j - 1; k >= 0 && argv[i][k] == '\\'; k--)
+	cmdline_len++;
+      cmdline_len += j;
+      cmdline_len += 3;  /* for leading and trailing quotes and space */
+    }
+  cmdline = XNEWVEC (char, cmdline_len);
+  p = cmdline;
+  for (i = 0; argv[i]; i++)
+    {
+      *p++ = '"';
+      for (j = 0; argv[i][j]; j++)
+	{
+	  if (argv[i][j] == '"')
+	    {
+	      for (k = j - 1; k >= 0 && argv[i][k] == '\\'; k--)
+		*p++ = '\\';
+	      *p++ = '\\';
+	    }
+	  *p++ = argv[i][j];
+	}
+      for (k = j - 1; k >= 0 && argv[i][k] == '\\'; k--)
+	*p++ = '\\';
+      *p++ = '"';
+      *p++ = ' ';
+    }
+  p[-1] = '\0';
+  return cmdline;
+}
+
+/* We'll try the passed filename with all the known standard
+   extensions, and then without extension.  We try no extension
+   last so that we don't try to run some random extension-less
+   file that might be hanging around.  We try both extension
+   and no extension so that we don't need any fancy logic
+   to determine if a file has extension.  */
+static const char *const
+std_suffixes[] = {
+  ".com",
+  ".exe",
+  ".bat",
+  ".cmd",
+  "",
+  0
+};
+
+/* Returns the full path to PROGRAM.  If SEARCH is true, look for
+   PROGRAM in each directory in PATH.  */
+
+static char *
+find_executable (const char *program, BOOL search)
+{
+  char *full_executable;
+  char *e;
+  size_t fe_len;
+  const char *path = 0;
+  const char *const *ext;
+  const char *p, *q;
+  size_t proglen = strlen (program);
+  int has_slash = (strchr (program, '/') || strchr (program, '\\'));
+  HANDLE h;
+
+  if (has_slash)
+    search = FALSE;
+
+  if (search)
+    path = getenv ("PATH");
+  if (!path)
+    path = "";
+
+  fe_len = 0;
+  for (p = path; *p; p = q)
+    {
+      q = p;
+      while (*q != ';' && *q != '\0')
+	q++;
+      if ((size_t)(q - p) > fe_len)
+	fe_len = q - p;
+      if (*q == ';')
+	q++;
+    }
+  fe_len = fe_len + 1 + proglen + 5 /* space for extension */;
+  full_executable = XNEWVEC (char, fe_len);
+
+  p = path;
+  do
+    {
+      q = p;
+      while (*q != ';' && *q != '\0')
+	q++;
+
+      e = full_executable;
+      memcpy (e, p, q - p);
+      e += (q - p);
+      if (q - p)
+	*e++ = '\\';
+      strcpy (e, program);
+
+      if (*q == ';')
+	q++;
+
+      for (e = full_executable; *e; e++)
+	if (*e == '/')
+	  *e = '\\';
+
+      /* At this point, e points to the terminating NUL character for
+         full_executable.  */
+      for (ext = std_suffixes; *ext; ext++)
+	{
+	  /* Remove any current extension.  */
+	  *e = '\0';
+	  /* Add the new one.  */
+	  strcat (full_executable, *ext);
+
+	  /* Attempt to open this file.  */
+	  h = CreateFile (full_executable, GENERIC_READ,
+			  FILE_SHARE_READ | FILE_SHARE_WRITE,
+			  0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+	  if (h != INVALID_HANDLE_VALUE)
+	    goto found;
+	}
+      p = q;
+    }
+  while (*p);
+  free (full_executable);
+  return 0;
+
+ found:
+  CloseHandle (h);
+  return full_executable;
+}
+
+/* Low-level process creation function and helper.  */
+
+static int
+env_compare (const void *a_ptr, const void *b_ptr)
+{
+  const char *a;
+  const char *b;
+  unsigned char c1;
+  unsigned char c2;
+
+  a = *(const char **) a_ptr;
+  b = *(const char **) b_ptr;
+
+  /* a and b will be of the form: VAR=VALUE
+     We compare only the variable name part here using a case-insensitive
+     comparison algorithm.  It might appear that in fact strcasecmp () can
+     take the place of this whole function, and indeed it could, save for
+     the fact that it would fail in cases such as comparing A1=foo and
+     A=bar (because 1 is less than = in the ASCII character set).
+     (Environment variables containing no numbers would work in such a
+     scenario.)  */
+
+  do
+    {
+      c1 = (unsigned char) tolower (*a++);
+      c2 = (unsigned char) tolower (*b++);
+
+      if (c1 == '=')
+        c1 = '\0';
+
+      if (c2 == '=')
+        c2 = '\0';
+    }
+  while (c1 == c2 && c1 != '\0');
+
+  return c1 - c2;
+}
+
+/* Execute a Windows executable as a child process.  This will fail if the
+ * target is not actually an executable, such as if it is a shell script. */
+
+static pid_t
+win32_spawn (const char *executable,
+	     BOOL search,
+	     char *const *argv,
+             char *const *env, /* array of strings of the form: VAR=VALUE */
+	     DWORD dwCreationFlags,
+	     LPSTARTUPINFO si,
+	     LPPROCESS_INFORMATION pi)
+{
+  char *full_executable;
+  char *cmdline;
+  char **env_copy;
+  char *env_block = NULL;
+
+  full_executable = NULL;
+  cmdline = NULL;
+
+  if (env)
+    {
+      int env_size;
+
+      /* Count the number of environment bindings supplied.  */
+      for (env_size = 0; env[env_size]; env_size++)
+        continue;
+    
+      /* Assemble an environment block, if required.  This consists of
+         VAR=VALUE strings juxtaposed (with one null character between each
+         pair) and an additional null at the end.  */
+      if (env_size > 0)
+        {
+          int var;
+          int total_size = 1; /* 1 is for the final null.  */
+          char *bufptr;
+    
+          /* Windows needs the members of the block to be sorted by variable
+             name.  */
+          env_copy = (char **) alloca (sizeof (char *) * env_size);
+          memcpy (env_copy, env, sizeof (char *) * env_size);
+          qsort (env_copy, env_size, sizeof (char *), env_compare);
+    
+          for (var = 0; var < env_size; var++)
+            total_size += strlen (env[var]) + 1;
+    
+          env_block = XNEWVEC (char, total_size);
+          bufptr = env_block;
+          for (var = 0; var < env_size; var++)
+            bufptr = stpcpy (bufptr, env_copy[var]) + 1;
+    
+          *bufptr = '\0';
+        }
+    }
+
+  full_executable = find_executable (executable, search);
+  if (!full_executable)
+    goto error;
+  cmdline = argv_to_cmdline (argv);
+  if (!cmdline)
+    goto error;
+    
+  /* Create the child process.  */  
+  if (!CreateProcess (full_executable, cmdline, 
+		      /*lpProcessAttributes=*/NULL,
+		      /*lpThreadAttributes=*/NULL,
+		      /*bInheritHandles=*/TRUE,
+		      dwCreationFlags,
+		      (LPVOID) env_block,
+		      /*lpCurrentDirectory=*/NULL,
+		      si,
+		      pi))
+    {
+      free (env_block);
+
+      free (full_executable);
+
+      return (pid_t) -1;
+    }
+
+  /* Clean up.  */
+  CloseHandle (pi->hThread);
+  free (full_executable);
+  free (env_block);
+
+  return (pid_t) pi->hProcess;
+
+ error:
+  free (env_block);
+  free (cmdline);
+  free (full_executable);
+
+  return (pid_t) -1;
+}
+
+/* Spawn a script.  This simulates the Unix script execution mechanism.
+   This function is called as a fallback if win32_spawn fails. */
+
+static pid_t
+spawn_script (const char *executable, char *const *argv,
+              char* const *env,
+	      DWORD dwCreationFlags,
+	      LPSTARTUPINFO si,
+	      LPPROCESS_INFORMATION pi)
+{
+  pid_t pid = (pid_t) -1;
+  int save_errno = errno;
+  int fd = _open (executable, _O_RDONLY);
+
+  /* Try to open script, check header format, extract interpreter path,
+     and spawn script using that interpretter. */
+  if (fd >= 0)
+    {
+      char buf[MAX_PATH + 5];
+      int len = _read (fd, buf, sizeof (buf) - 1);
+      _close (fd);
+      if (len > 3)
+	{
+	  char *eol;
+	  buf[len] = '\0';
+	  eol = strchr (buf, '\n');
+	  if (eol && strncmp (buf, "#!", 2) == 0)
+	    {
+            
+	      /* Header format is OK. */
+	      char *executable1;
+              int new_argc;
+              const char **avhere;
+
+	      /* Extract interpreter path. */
+	      do
+		*eol = '\0';
+	      while (*--eol == '\r' || *eol == ' ' || *eol == '\t');
+	      for (executable1 = buf + 2; *executable1 == ' ' || *executable1 == '\t'; executable1++)
+		continue;
+	      backslashify (executable1);
+
+	      /* Duplicate argv, prepending the interpreter path. */
+	      new_argc = argv_to_argc (argv) + 1;
+	      avhere = XNEWVEC (const char *, new_argc + 1);
+	      *avhere = executable1;
+	      memcpy (avhere + 1, argv, new_argc * sizeof(*argv));
+	      argv = (char *const *)avhere;
+
+	      /* Spawn the child. */
+#ifndef USE_MINGW_MSYS
+	      executable = strrchr (executable1, '\\') + 1;
+	      if (!executable)
+		executable = executable1;
+	      pid = win32_spawn (executable, TRUE, argv, env,
+				 dwCreationFlags, si, pi);
+#else
+	      if (strchr (executable1, '\\') == NULL)
+		pid = win32_spawn (executable1, TRUE, argv, env,
+				   dwCreationFlags, si, pi);
+	      else if (executable1[0] != '\\')
+		pid = win32_spawn (executable1, FALSE, argv, env,
+				   dwCreationFlags, si, pi);
+	      else
+		{
+		  const char *newex = mingw_rootify (executable1);
+		  *avhere = newex;
+		  pid = win32_spawn (newex, FALSE, argv, env,
+				     dwCreationFlags, si, pi);
+		  if (executable1 != newex)
+		    free ((char *) newex);
+		  if (pid == (pid_t) -1)
+		    {
+		      newex = msys_rootify (executable1);
+		      if (newex != executable1)
+			{
+			  *avhere = newex;
+			  pid = win32_spawn (newex, FALSE, argv, env,
+					     dwCreationFlags, si, pi);
+			  free ((char *) newex);
+			}
+		    }
+		}
+#endif
+	      free (avhere);
+	    }
+	}
+    }
+  if (pid == (pid_t) -1)
+    errno = save_errno;
+  return pid;
+}
+
+/* Execute a child.  */
+
+static pid_t
+pex_win32_exec_child (struct pex_obj *obj ATTRIBUTE_UNUSED, int flags,
+		      const char *executable, char * const * argv,
+                      char* const* env,
+		      int in, int out, int errdes,
+		      int toclose ATTRIBUTE_UNUSED,
+		      const char **errmsg,
+		      int *err)
+{
+  pid_t pid;
+  HANDLE stdin_handle;
+  HANDLE stdout_handle;
+  HANDLE stderr_handle;
+  DWORD dwCreationFlags;
+  OSVERSIONINFO version_info;
+  STARTUPINFO si;
+  PROCESS_INFORMATION pi;
+  int orig_out, orig_in, orig_err;
+  BOOL separate_stderr = !(flags & PEX_STDERR_TO_STDOUT);
+
+  /* Ensure we have inheritable descriptors to pass to the child, and close the
+     original descriptors.  */
+  orig_in = in;
+  in = _dup (orig_in);
+  if (orig_in != STDIN_FILENO)
+    _close (orig_in);
+  
+  orig_out = out;
+  out = _dup (orig_out);
+  if (orig_out != STDOUT_FILENO)
+    _close (orig_out);
+  
+  if (separate_stderr)
+    {
+      orig_err = errdes;
+      errdes = _dup (orig_err);
+      if (orig_err != STDERR_FILENO)
+	_close (orig_err);
+    }
+
+  stdin_handle = INVALID_HANDLE_VALUE;
+  stdout_handle = INVALID_HANDLE_VALUE;
+  stderr_handle = INVALID_HANDLE_VALUE;
+
+  stdin_handle = (HANDLE) _get_osfhandle (in);
+  stdout_handle = (HANDLE) _get_osfhandle (out);
+  if (separate_stderr)
+    stderr_handle = (HANDLE) _get_osfhandle (errdes);
+  else
+    stderr_handle = stdout_handle;
+
+  /* Determine the version of Windows we are running on.  */
+  version_info.dwOSVersionInfoSize = sizeof (version_info); 
+  GetVersionEx (&version_info);
+  if (version_info.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
+    /* On Windows 95/98/ME the CREATE_NO_WINDOW flag is not
+       supported, so we cannot avoid creating a console window.  */
+    dwCreationFlags = 0;
+  else
+    {
+      HANDLE conout_handle;
+
+      /* Determine whether or not we have an associated console.  */
+      conout_handle = CreateFile("CONOUT$", 
+				 GENERIC_WRITE,
+				 FILE_SHARE_WRITE,
+				 /*lpSecurityAttributes=*/NULL,
+				 OPEN_EXISTING,
+				 FILE_ATTRIBUTE_NORMAL,
+				 /*hTemplateFile=*/NULL);
+      if (conout_handle == INVALID_HANDLE_VALUE)
+	/* There is no console associated with this process.  Since
+	   the child is a console process, the OS would normally
+	   create a new console Window for the child.  Since we'll be
+	   redirecting the child's standard streams, we do not need
+	   the console window.  */ 
+	dwCreationFlags = CREATE_NO_WINDOW;
+      else 
+	{
+	  /* There is a console associated with the process, so the OS
+	     will not create a new console.  And, if we use
+	     CREATE_NO_WINDOW in this situation, the child will have
+	     no associated console.  Therefore, if the child's
+	     standard streams are connected to the console, the output
+	     will be discarded.  */
+	  CloseHandle(conout_handle);
+	  dwCreationFlags = 0;
+	}
+    }
+
+  /* Since the child will be a console process, it will, by default,
+     connect standard input/output to its console.  However, we want
+     the child to use the handles specifically designated above.  In
+     addition, if there is no console (such as when we are running in
+     a Cygwin X window), then we must redirect the child's
+     input/output, as there is no console for the child to use.  */
+  memset (&si, 0, sizeof (si));
+  si.cb = sizeof (si);
+  si.dwFlags = STARTF_USESTDHANDLES;
+  si.hStdInput = stdin_handle;
+  si.hStdOutput = stdout_handle;
+  si.hStdError = stderr_handle;
+
+  /* Create the child process.  */  
+  pid = win32_spawn (executable, (flags & PEX_SEARCH) != 0,
+		     argv, env, dwCreationFlags, &si, &pi);
+  if (pid == (pid_t) -1)
+    pid = spawn_script (executable, argv, env, dwCreationFlags,
+                        &si, &pi);
+  if (pid == (pid_t) -1)
+    {
+      *err = ENOENT;
+      *errmsg = "CreateProcess";
+    }
+
+  /* Close the standard input, standard output and standard error handles
+     in the parent.  */ 
+
+  _close (in);
+  _close (out);
+  if (separate_stderr)
+    _close (errdes);
+
+  return pid;
+}
+
+/* Wait for a child process to complete.  MS CRTDLL doesn't return
+   enough information in status to decide if the child exited due to a
+   signal or not, rather it simply returns an integer with the exit
+   code of the child; eg., if the child exited with an abort() call
+   and didn't have a handler for SIGABRT, it simply returns with
+   status == 3.  We fix the status code to conform to the usual WIF*
+   macros.  Note that WIFSIGNALED will never be true under CRTDLL. */
+
+static pid_t
+pex_win32_wait (struct pex_obj *obj ATTRIBUTE_UNUSED, pid_t pid,
+		int *status, struct pex_time *time, int done ATTRIBUTE_UNUSED,
+		const char **errmsg, int *err)
+{
+  DWORD termstat;
+  HANDLE h;
+
+  if (time != NULL)
+    memset (time, 0, sizeof *time);
+
+  h = (HANDLE) pid;
+
+  /* FIXME: If done is non-zero, we should probably try to kill the
+     process.  */
+  if (WaitForSingleObject (h, INFINITE) != WAIT_OBJECT_0)
+    {
+      CloseHandle (h);
+      *err = ECHILD;
+      *errmsg = "WaitForSingleObject";
+      return -1;
+    }
+
+  GetExitCodeProcess (h, &termstat);
+  CloseHandle (h);
+ 
+  /* A value of 3 indicates that the child caught a signal, but not
+     which one.  Since only SIGABRT, SIGFPE and SIGINT do anything, we
+     report SIGABRT.  */
+  if (termstat == 3)
+    *status = SIGABRT;
+  else
+    *status = (termstat & 0xff) << 8;
+
+  return 0;
+}
+
+/* Create a pipe.  */
+
+static int
+pex_win32_pipe (struct pex_obj *obj ATTRIBUTE_UNUSED, int *p,
+		int binary)
+{
+  return _pipe (p, 256, (binary ? _O_BINARY : _O_TEXT) | _O_NOINHERIT);
+}
+
+/* Get a FILE pointer to read from a file descriptor.  */
+
+static FILE *
+pex_win32_fdopenr (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd,
+		   int binary)
+{
+  HANDLE h = (HANDLE) _get_osfhandle (fd);
+  if (h == INVALID_HANDLE_VALUE)
+    return NULL;
+  if (! SetHandleInformation (h, HANDLE_FLAG_INHERIT, 0))
+    return NULL;
+  return fdopen (fd, binary ? "rb" : "r");
+}
+
+static FILE *
+pex_win32_fdopenw (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd,
+		   int binary)
+{
+  HANDLE h = (HANDLE) _get_osfhandle (fd);
+  if (h == INVALID_HANDLE_VALUE)
+    return NULL;
+  if (! SetHandleInformation (h, HANDLE_FLAG_INHERIT, 0))
+    return NULL;
+  return fdopen (fd, binary ? "wb" : "w");
+}
+
+#ifdef MAIN
+#include <stdio.h>
+
+int
+main (int argc ATTRIBUTE_UNUSED, char **argv)
+{
+  char const *errmsg;
+  int err;
+  argv++;
+  printf ("%ld\n", (long) pex_win32_exec_child (NULL, PEX_SEARCH, argv[0], argv, NULL, 0, 0, 1, 2, &errmsg, &err));
+  exit (0);
+}
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/pexecute.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/pexecute.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/pexecute.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/pexecute.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,124 @@
+/* Utilities to execute a program in a subprocess (possibly linked by pipes
+   with other subprocesses), and wait for it.
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If not,
+write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/* pexecute is an old routine.  This implementation uses the newer
+   pex_init/pex_run/pex_get_status/pex_free routines.  Don't use
+   pexecute in new code.  Use the newer routines instead.  */
+
+#include "config.h"
+#include "libiberty.h"
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+/* We only permit a single pexecute chain to execute at a time.  This
+   was always true anyhow, though it wasn't documented.  */
+
+static struct pex_obj *pex;
+static int idx;
+
+int
+pexecute (const char *program, char * const *argv, const char *pname,
+	  const char *temp_base, char **errmsg_fmt, char **errmsg_arg,
+	  int flags)
+{
+  const char *errmsg;
+  int err;
+
+  if ((flags & PEXECUTE_FIRST) != 0)
+    {
+      if (pex != NULL)
+	{
+	  *errmsg_fmt = (char *) "pexecute already in progress";
+	  *errmsg_arg = NULL;
+	  return -1;
+	}
+      pex = pex_init (PEX_USE_PIPES, pname, temp_base);
+      idx = 0;
+    }
+  else
+    {
+      if (pex == NULL)
+	{
+	  *errmsg_fmt = (char *) "pexecute not in progress";
+	  *errmsg_arg = NULL;
+	  return -1;
+	}
+    }
+
+  errmsg = pex_run (pex,
+		    (((flags & PEXECUTE_LAST) != 0 ? PEX_LAST : 0)
+		     | ((flags & PEXECUTE_SEARCH) != 0 ? PEX_SEARCH : 0)),
+		    program, argv, NULL, NULL, &err);
+  if (errmsg != NULL)
+    {
+      *errmsg_fmt = (char *) errmsg;
+      *errmsg_arg = NULL;
+      return -1;
+    }
+
+  /* Instead of a PID, we just return a one-based index into the
+     status values.  We avoid zero just because the old pexecute would
+     never return it.  */
+  return ++idx;
+}
+
+int
+pwait (int pid, int *status, int flags ATTRIBUTE_UNUSED)
+{
+  /* The PID returned by pexecute is one-based.  */
+  --pid;
+
+  if (pex == NULL || pid < 0 || pid >= idx)
+    return -1;
+
+  if (pid == 0 && idx == 1)
+    {
+      if (!pex_get_status (pex, 1, status))
+	return -1;
+    }
+  else
+    {
+      int *vector;
+
+      vector = XNEWVEC (int, idx);
+      if (!pex_get_status (pex, idx, vector))
+	{
+	  free (vector);
+	  return -1;
+	}
+      *status = vector[pid];
+      free (vector);
+    }
+
+  /* Assume that we are done after the caller has retrieved the last
+     exit status.  The original implementation did not require that
+     the exit statuses be retrieved in order, but this implementation
+     does.  */
+  if (pid + 1 == idx)
+    {
+      pex_free (pex);
+      pex = NULL;
+      idx = 0;
+    }
+
+  return pid + 1;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/pexecute.txh sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/pexecute.txh
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/pexecute.txh	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/pexecute.txh	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,316 @@
+@c -*- mode: texinfo -*-
+@deftypefn Extension {struct pex_obj *} pex_init (int @var{flags}, @
+  const char *@var{pname}, const char *@var{tempbase})
+
+Prepare to execute one or more programs, with standard output of each
+program fed to standard input of the next.  This is a system
+independent interface to execute a pipeline.
+
+@var{flags} is a bitwise combination of the following:
+
+@table @code
+
+@vindex PEX_RECORD_TIMES
+@item PEX_RECORD_TIMES
+Record subprocess times if possible.
+
+@vindex PEX_USE_PIPES
+@item PEX_USE_PIPES
+Use pipes for communication between processes, if possible.
+
+@vindex PEX_SAVE_TEMPS
+@item PEX_SAVE_TEMPS
+Don't delete temporary files used for communication between
+processes.
+
+@end table
+
+@var{pname} is the name of program to be executed, used in error
+messages.  @var{tempbase} is a base name to use for any required
+temporary files; it may be @code{NULL} to use a randomly chosen name.
+
+@end deftypefn
+
+@deftypefn Extension {const char *} pex_run (struct pex_obj *@var{obj}, @
+  int @var{flags}, const char *@var{executable}, char * const *@var{argv}, @
+  const char *@var{outname}, const char *@var{errname}, int *@var{err})
+
+Execute one program in a pipeline.  On success this returns
+@code{NULL}.  On failure it returns an error message, a statically
+allocated string.
+
+@var{obj} is returned by a previous call to @code{pex_init}.
+
+@var{flags} is a bitwise combination of the following:
+
+@table @code
+
+@vindex PEX_LAST
+@item PEX_LAST
+This must be set on the last program in the pipeline.  In particular,
+it should be set when executing a single program.  The standard output
+of the program will be sent to @var{outname}, or, if @var{outname} is
+@code{NULL}, to the standard output of the calling program.  Do @emph{not}
+set this bit if you want to call @code{pex_read_output}
+(described below).  After a call to @code{pex_run} with this bit set,
+@var{pex_run} may no longer be called with the same @var{obj}.
+
+@vindex PEX_SEARCH
+@item PEX_SEARCH
+Search for the program using the user's executable search path.
+
+@vindex PEX_SUFFIX
+@item PEX_SUFFIX
+@var{outname} is a suffix.  See the description of @var{outname},
+below.
+
+@vindex PEX_STDERR_TO_STDOUT
+@item PEX_STDERR_TO_STDOUT
+Send the program's standard error to standard output, if possible.
+
+@vindex PEX_BINARY_INPUT
+@vindex PEX_BINARY_OUTPUT
+@vindex PEX_BINARY_ERROR
+@item PEX_BINARY_INPUT
+@itemx PEX_BINARY_OUTPUT
+@itemx PEX_BINARY_ERROR
+The standard input (output or error) of the program should be read (written) in
+binary mode rather than text mode.  These flags are ignored on systems
+which do not distinguish binary mode and text mode, such as Unix.  For
+proper behavior these flags should match appropriately---a call to
+@code{pex_run} using @code{PEX_BINARY_OUTPUT} should be followed by a
+call using @code{PEX_BINARY_INPUT}.
+
+@vindex PEX_STDERR_TO_PIPE
+@item PEX_STDERR_TO_PIPE
+Send the program's standard error to a pipe, if possible.  This flag
+cannot be specified together with @code{PEX_STDERR_TO_STDOUT}.  This
+flag can be specified only on the last program in pipeline.
+
+@end table
+
+@var{executable} is the program to execute.  @var{argv} is the set of
+arguments to pass to the program; normally @code{@var{argv}[0]} will
+be a copy of @var{executable}.
+
+@var{outname} is used to set the name of the file to use for standard
+output.  There are two cases in which no output file will be used:
+
+@enumerate
+@item
+if @code{PEX_LAST} is not set in @var{flags}, and @code{PEX_USE_PIPES}
+was set in the call to @code{pex_init}, and the system supports pipes
+
+@item
+if @code{PEX_LAST} is set in @var{flags}, and @var{outname} is
+@code{NULL}
+@end enumerate
+
+@noindent
+Otherwise the code will use a file to hold standard
+output.  If @code{PEX_LAST} is not set, this file is considered to be
+a temporary file, and it will be removed when no longer needed, unless
+@code{PEX_SAVE_TEMPS} was set in the call to @code{pex_init}.
+
+There are two cases to consider when setting the name of the file to
+hold standard output.
+
+@enumerate
+@item
+@code{PEX_SUFFIX} is set in @var{flags}.  In this case
+@var{outname} may not be @code{NULL}.  If the @var{tempbase} parameter
+to @code{pex_init} was not @code{NULL}, then the output file name is
+the concatenation of @var{tempbase} and @var{outname}.  If
+@var{tempbase} was @code{NULL}, then the output file name is a random
+file name ending in @var{outname}.
+
+@item
+@code{PEX_SUFFIX} was not set in @var{flags}.  In this
+case, if @var{outname} is not @code{NULL}, it is used as the output
+file name.  If @var{outname} is @code{NULL}, and @var{tempbase} was
+not NULL, the output file name is randomly chosen using
+@var{tempbase}.  Otherwise the output file name is chosen completely
+at random.
+@end enumerate
+
+@var{errname} is the file name to use for standard error output.  If
+it is @code{NULL}, standard error is the same as the caller's.
+Otherwise, standard error is written to the named file.
+
+On an error return, the code sets @code{*@var{err}} to an @code{errno}
+value, or to 0 if there is no relevant @code{errno}.
+
+@end deftypefn
+
+@deftypefn Extension {const char *} pex_run_in_environment (struct pex_obj *@var{obj}, @
+  int @var{flags}, const char *@var{executable}, char * const *@var{argv}, @
+  char * const *@var{env}, int @var{env_size}, const char *@var{outname}, @
+  const char *@var{errname}, int *@var{err})
+
+Execute one program in a pipeline, permitting the environment for the
+program to be specified.  Behaviour and parameters not listed below are
+as for @code{pex_run}.
+
+@var{env} is the environment for the child process, specified as an array of
+character pointers.  Each element of the array should point to a string of the
+form @code{VAR=VALUE}, with the exception of the last element that must be
+@code{NULL}.
+
+@end deftypefn
+
+@deftypefn Extension {FILE *} pex_input_file (struct pex_obj *@var{obj}, @
+  int @var{flags}, const char *@var{in_name})
+
+Return a stream for a temporary file to pass to the first program in
+the pipeline as input.
+
+The name of the input file is chosen according to the same rules
+@code{pex_run} uses to choose output file names, based on
+@var{in_name}, @var{obj} and the @code{PEX_SUFFIX} bit in @var{flags}.
+
+Don't call @code{fclose} on the returned stream; the first call to
+@code{pex_run} closes it automatically.
+
+If @var{flags} includes @code{PEX_BINARY_OUTPUT}, open the stream in
+binary mode; otherwise, open it in the default mode.  Including
+@code{PEX_BINARY_OUTPUT} in @var{flags} has no effect on Unix.
+@end deftypefn
+
+@deftypefn Extension {FILE *} pex_input_pipe (struct pex_obj *@var{obj}, @
+  int @var{binary})
+
+Return a stream @var{fp} for a pipe connected to the standard input of
+the first program in the pipeline; @var{fp} is opened for writing.
+You must have passed @code{PEX_USE_PIPES} to the @code{pex_init} call
+that returned @var{obj}.
+
+You must close @var{fp} using @code{fclose} yourself when you have
+finished writing data to the pipeline.
+
+The file descriptor underlying @var{fp} is marked not to be inherited
+by child processes.
+
+On systems that do not support pipes, this function returns
+@code{NULL}, and sets @code{errno} to @code{EINVAL}.  If you would
+like to write code that is portable to all systems the @code{pex}
+functions support, consider using @code{pex_input_file} instead.
+
+There are two opportunities for deadlock using
+@code{pex_input_pipe}:
+
+@itemize @bullet
+@item
+Most systems' pipes can buffer only a fixed amount of data; a process
+that writes to a full pipe blocks.  Thus, if you write to @file{fp}
+before starting the first process, you run the risk of blocking when
+there is no child process yet to read the data and allow you to
+continue.  @code{pex_input_pipe} makes no promises about the
+size of the pipe's buffer, so if you need to write any data at all
+before starting the first process in the pipeline, consider using
+@code{pex_input_file} instead.
+
+@item
+Using @code{pex_input_pipe} and @code{pex_read_output} together
+may also cause deadlock.  If the output pipe fills up, so that each
+program in the pipeline is waiting for the next to read more data, and
+you fill the input pipe by writing more data to @var{fp}, then there
+is no way to make progress: the only process that could read data from
+the output pipe is you, but you are blocked on the input pipe.
+
+@end itemize
+
+@end deftypefn
+
+@deftypefn Extension {FILE *} pex_read_output (struct pex_obj *@var{obj}, @
+  int @var{binary})
+
+Returns a @code{FILE} pointer which may be used to read the standard
+output of the last program in the pipeline.  When this is used,
+@code{PEX_LAST} should not be used in a call to @code{pex_run}.  After
+this is called, @code{pex_run} may no longer be called with the same
+@var{obj}.  @var{binary} should be non-zero if the file should be
+opened in binary mode.  Don't call @code{fclose} on the returned file;
+it will be closed by @code{pex_free}.
+
+@end deftypefn
+
+@deftypefn Extension {FILE *} pex_read_err (struct pex_obj *@var{obj}, @
+  int @var{binary})
+
+Returns a @code{FILE} pointer which may be used to read the standard
+error of the last program in the pipeline.  When this is used,
+@code{PEX_LAST} should not be used in a call to @code{pex_run}.  After
+this is called, @code{pex_run} may no longer be called with the same
+@var{obj}.  @var{binary} should be non-zero if the file should be
+opened in binary mode.  Don't call @code{fclose} on the returned file;
+it will be closed by @code{pex_free}.
+
+@end deftypefn
+
+
+@deftypefn Extension int pex_get_status (struct pex_obj *@var{obj}, @
+  int @var{count}, int *@var{vector})
+
+Returns the exit status of all programs run using @var{obj}.
+@var{count} is the number of results expected.  The results will be
+placed into @var{vector}.  The results are in the order of the calls
+to @code{pex_run}.  Returns 0 on error, 1 on success.
+
+@end deftypefn
+
+@deftypefn Extension int pex_get_times (struct pex_obj *@var{obj}, @
+  int @var{count}, struct pex_time *@var{vector})
+
+Returns the process execution times of all programs run using
+@var{obj}.  @var{count} is the number of results expected.  The
+results will be placed into @var{vector}.  The results are in the
+order of the calls to @code{pex_run}.  Returns 0 on error, 1 on
+success.
+
+@code{struct pex_time} has the following fields of the type
+@code{unsigned long}: @code{user_seconds},
+@code{user_microseconds}, @code{system_seconds},
+@code{system_microseconds}.  On systems which do not support reporting
+process times, all the fields will be set to @code{0}.
+
+@end deftypefn
+
+@deftypefn Extension void pex_free (struct pex_obj @var{obj})
+
+Clean up and free all data associated with @var{obj}.  If you have not
+yet called @code{pex_get_times} or @code{pex_get_status}, this will
+try to kill the subprocesses.
+
+@end deftypefn
+
+@deftypefn Extension {const char *} pex_one (int @var{flags}, @
+  const char *@var{executable}, char * const *@var{argv}, @
+  const char *@var{pname}, const char *@var{outname}, const char *@var{errname}, @
+  int *@var{status}, int *@var{err})
+
+An interface to permit the easy execution of a
+single program.  The return value and most of the parameters are as
+for a call to @code{pex_run}.  @var{flags} is restricted to a
+combination of @code{PEX_SEARCH}, @code{PEX_STDERR_TO_STDOUT}, and
+@code{PEX_BINARY_OUTPUT}.  @var{outname} is interpreted as if
+@code{PEX_LAST} were set.  On a successful return, @code{*@var{status}} will
+be set to the exit status of the program.
+
+@end deftypefn
+
+@deftypefn Extension int pexecute (const char *@var{program}, @
+  char * const *@var{argv}, const char *@var{this_pname}, @
+  const char *@var{temp_base}, char **@var{errmsg_fmt}, @
+  char **@var{errmsg_arg}, int @var{flags})
+
+This is the old interface to execute one or more programs.  It is
+still supported for compatibility purposes, but is no longer
+documented.
+
+@end deftypefn
+
+@deftypefn Extension int pwait (int @var{pid}, int *@var{status}, int @var{flags})
+
+Another part of the old execution interface.
+
+@end deftypefn
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/physmem.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/physmem.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/physmem.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/physmem.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,305 @@
+/* Calculate the size of physical memory.
+   Copyright 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Paul Eggert.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#if HAVE_SYS_PSTAT_H
+# include <sys/pstat.h>
+#endif
+
+#if HAVE_SYS_SYSMP_H
+# include <sys/sysmp.h>
+#endif
+
+#if HAVE_SYS_SYSINFO_H && HAVE_MACHINE_HAL_SYSINFO_H
+# include <sys/sysinfo.h>
+# include <machine/hal_sysinfo.h>
+#endif
+
+#if HAVE_SYS_TABLE_H
+# include <sys/table.h>
+#endif
+
+#include <sys/types.h>
+
+#if HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+
+#if HAVE_SYS_SYSCTL_H
+# include <sys/sysctl.h>
+#endif
+
+#if HAVE_SYS_SYSTEMCFG_H
+# include <sys/systemcfg.h>
+#endif
+
+#ifdef _WIN32
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+/*  MEMORYSTATUSEX is missing from older windows headers, so define
+    a local replacement.  */
+typedef struct
+{
+  DWORD dwLength;
+  DWORD dwMemoryLoad;
+  DWORDLONG ullTotalPhys;
+  DWORDLONG ullAvailPhys;
+  DWORDLONG ullTotalPageFile;
+  DWORDLONG ullAvailPageFile;
+  DWORDLONG ullTotalVirtual;
+  DWORDLONG ullAvailVirtual;
+  DWORDLONG ullAvailExtendedVirtual;
+} lMEMORYSTATUSEX;
+typedef WINBOOL (WINAPI *PFN_MS_EX) (lMEMORYSTATUSEX*);
+#endif
+
+#include "libiberty.h"
+
+/* Return the total amount of physical memory.  */
+double
+physmem_total (void)
+{
+#if defined _SC_PHYS_PAGES && defined _SC_PAGESIZE
+  { /* This works on linux-gnu, solaris2 and cygwin.  */
+    double pages = sysconf (_SC_PHYS_PAGES);
+    double pagesize = sysconf (_SC_PAGESIZE);
+    if (0 <= pages && 0 <= pagesize)
+      return pages * pagesize;
+  }
+#endif
+
+#if HAVE_PSTAT_GETSTATIC
+  { /* This works on hpux11.  */
+    struct pst_static pss;
+    if (0 <= pstat_getstatic (&pss, sizeof pss, 1, 0))
+      {
+	double pages = pss.physical_memory;
+	double pagesize = pss.page_size;
+	if (0 <= pages && 0 <= pagesize)
+	  return pages * pagesize;
+      }
+  }
+#endif
+
+#if HAVE_SYSMP && defined MP_SAGET && defined MPSA_RMINFO && defined _SC_PAGESIZE
+  { /* This works on irix6. */
+    struct rminfo realmem;
+    if (sysmp (MP_SAGET, MPSA_RMINFO, &realmem, sizeof realmem) == 0)
+      {
+	double pagesize = sysconf (_SC_PAGESIZE);
+	double pages = realmem.physmem;
+	if (0 <= pages && 0 <= pagesize)
+	  return pages * pagesize;
+      }
+  }
+#endif
+
+#if HAVE_GETSYSINFO && defined GSI_PHYSMEM
+  { /* This works on Tru64 UNIX V4/5.  */
+    int physmem;
+
+    if (getsysinfo (GSI_PHYSMEM, (caddr_t) &physmem, sizeof (physmem),
+		    NULL, NULL, NULL) == 1)
+      {
+	double kbytes = physmem;
+
+	if (0 <= kbytes)
+	  return kbytes * 1024.0;
+      }
+  }
+#endif
+
+#if HAVE_SYSCTL && defined HW_PHYSMEM
+  { /* This works on *bsd and darwin.  */
+    unsigned int physmem;
+    size_t len = sizeof physmem;
+    static int mib[2] = { CTL_HW, HW_PHYSMEM };
+
+    if (sysctl (mib, ARRAY_SIZE (mib), &physmem, &len, NULL, 0) == 0
+	&& len == sizeof (physmem))
+      return (double) physmem;
+  }
+#endif
+
+#if HAVE__SYSTEM_CONFIGURATION
+  /* This works on AIX 4.3.3+.  */
+  return _system_configuration.physmem;
+#endif
+
+#if defined _WIN32
+  { /* this works on windows */
+    PFN_MS_EX pfnex;
+    HMODULE h = GetModuleHandle ("kernel32.dll");
+
+    if (!h)
+      return 0.0;
+
+    /*  Use GlobalMemoryStatusEx if available.  */
+    if ((pfnex = (PFN_MS_EX) GetProcAddress (h, "GlobalMemoryStatusEx")))
+      {
+	lMEMORYSTATUSEX lms_ex;
+	lms_ex.dwLength = sizeof lms_ex;
+	if (!pfnex (&lms_ex))
+	  return 0.0;
+	return (double) lms_ex.ullTotalPhys;
+      }
+
+    /*  Fall back to GlobalMemoryStatus which is always available.
+        but returns wrong results for physical memory > 4GB.  */
+    else
+      {
+	MEMORYSTATUS ms;
+	GlobalMemoryStatus (&ms);
+	return (double) ms.dwTotalPhys;
+      }
+  }
+#endif
+
+  /* Return 0 if we can't determine the value.  */
+  return 0;
+}
+
+/* Return the amount of physical memory available.  */
+double
+physmem_available (void)
+{
+#if defined _SC_AVPHYS_PAGES && defined _SC_PAGESIZE
+  { /* This works on linux-gnu, solaris2 and cygwin.  */
+    double pages = sysconf (_SC_AVPHYS_PAGES);
+    double pagesize = sysconf (_SC_PAGESIZE);
+    if (0 <= pages && 0 <= pagesize)
+      return pages * pagesize;
+  }
+#endif
+
+#if HAVE_PSTAT_GETSTATIC && HAVE_PSTAT_GETDYNAMIC
+  { /* This works on hpux11.  */
+    struct pst_static pss;
+    struct pst_dynamic psd;
+    if (0 <= pstat_getstatic (&pss, sizeof pss, 1, 0)
+	&& 0 <= pstat_getdynamic (&psd, sizeof psd, 1, 0))
+      {
+	double pages = psd.psd_free;
+	double pagesize = pss.page_size;
+	if (0 <= pages && 0 <= pagesize)
+	  return pages * pagesize;
+      }
+  }
+#endif
+
+#if HAVE_SYSMP && defined MP_SAGET && defined MPSA_RMINFO && defined _SC_PAGESIZE
+  { /* This works on irix6. */
+    struct rminfo realmem;
+    if (sysmp (MP_SAGET, MPSA_RMINFO, &realmem, sizeof realmem) == 0)
+      {
+	double pagesize = sysconf (_SC_PAGESIZE);
+	double pages = realmem.availrmem;
+	if (0 <= pages && 0 <= pagesize)
+	  return pages * pagesize;
+      }
+  }
+#endif
+
+#if HAVE_TABLE && defined TBL_VMSTATS
+  { /* This works on Tru64 UNIX V4/5.  */
+    struct tbl_vmstats vmstats;
+
+    if (table (TBL_VMSTATS, 0, &vmstats, 1, sizeof (vmstats)) == 1)
+      {
+	double pages = vmstats.free_count;
+	double pagesize = vmstats.pagesize;
+
+	if (0 <= pages && 0 <= pagesize)
+	  return pages * pagesize;
+      }
+  }
+#endif
+
+#if HAVE_SYSCTL && defined HW_USERMEM
+  { /* This works on *bsd and darwin.  */
+    unsigned int usermem;
+    size_t len = sizeof usermem;
+    static int mib[2] = { CTL_HW, HW_USERMEM };
+
+    if (sysctl (mib, ARRAY_SIZE (mib), &usermem, &len, NULL, 0) == 0
+	&& len == sizeof (usermem))
+      return (double) usermem;
+  }
+#endif
+
+#if defined _WIN32
+  { /* this works on windows */
+    PFN_MS_EX pfnex;
+    HMODULE h = GetModuleHandle ("kernel32.dll");
+
+    if (!h)
+      return 0.0;
+
+    /*  Use GlobalMemoryStatusEx if available.  */
+    if ((pfnex = (PFN_MS_EX) GetProcAddress (h, "GlobalMemoryStatusEx")))
+      {
+	lMEMORYSTATUSEX lms_ex;
+	lms_ex.dwLength = sizeof lms_ex;
+	if (!pfnex (&lms_ex))
+	  return 0.0;
+	return (double) lms_ex.ullAvailPhys;
+      }
+
+    /*  Fall back to GlobalMemoryStatus which is always available.
+        but returns wrong results for physical memory > 4GB  */
+    else
+      {
+	MEMORYSTATUS ms;
+	GlobalMemoryStatus (&ms);
+	return (double) ms.dwAvailPhys;
+      }
+  }
+#endif
+
+  /* Guess 25% of physical memory.  */
+  return physmem_total () / 4;
+}
+
+
+#if DEBUG
+
+# include <stdio.h>
+# include <stdlib.h>
+
+int
+main (void)
+{
+  printf ("%12.f %12.f\n", physmem_total (), physmem_available ());
+  exit (0);
+}
+
+#endif /* DEBUG */
+
+/*
+Local Variables:
+compile-command: "gcc -DDEBUG -DHAVE_CONFIG_H -I.. -g -O -Wall -W physmem.c"
+End:
+*/
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/putenv.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/putenv.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/putenv.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/putenv.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,84 @@
+/* Copyright (C) 1991, 1994, 1995, 1996, 2002 Free Software Foundation, Inc.
+   This file based on putenv.c in the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/*
+
+@deftypefn Supplemental int putenv (const char *@var{string})
+
+Uses @code{setenv} or @code{unsetenv} to put @var{string} into
+the environment or remove it.  If @var{string} is of the form
+@samp{name=value} the string is added; if no @samp{=} is present the
+name is unset/removed.
+
+@end deftypefn
+
+*/
+
+#if defined (_AIX) && !defined (__GNUC__)
+ #pragma alloca
+#endif
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "ansidecl.h"
+
+#define putenv libiberty_putenv
+
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#if HAVE_STRING_H
+# include <string.h>
+#endif
+
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#else
+# ifndef alloca
+#  ifdef __GNUC__
+#   define alloca __builtin_alloca
+#  else
+extern char *alloca ();
+#  endif /* __GNUC__ */
+# endif /* alloca */
+#endif /* HAVE_ALLOCA_H */
+
+#undef putenv
+
+/* Below this point, it's verbatim code from the glibc-2.0 implementation */
+
+
+/* Put STRING, which is of the form "NAME=VALUE", in the environment.  */
+int
+putenv (const char *string)
+{
+  const char *const name_end = strchr (string, '=');
+
+  if (name_end)
+    {
+      char *name = (char *) alloca (name_end - string + 1);
+      memcpy (name, string, name_end - string);
+      name[name_end - string] = '\0';
+      return setenv (name, name_end + 1, 1);
+    }
+
+  unsetenv (string);
+  return 0;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/random.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/random.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/random.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/random.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,404 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. [rescinded 22 July 1999]
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * This is derived from the Berkeley source:
+ *	@(#)random.c	5.5 (Berkeley) 7/6/88
+ * It was reworked for the GNU C Library by Roland McGrath.
+ */
+
+/*
+
+@deftypefn Supplement {long int} random (void)
+@deftypefnx Supplement void srandom (unsigned int @var{seed})
+@deftypefnx Supplement void* initstate (unsigned int @var{seed}, @
+  void *@var{arg_state}, unsigned long @var{n})
+@deftypefnx Supplement void* setstate (void *@var{arg_state})
+
+Random number functions.  @code{random} returns a random number in the
+range 0 to @code{LONG_MAX}.  @code{srandom} initializes the random
+number generator to some starting point determined by @var{seed}
+(else, the values returned by @code{random} are always the same for each
+run of the program).  @code{initstate} and @code{setstate} allow fine-grained
+control over the state of the random number generator.
+
+@end deftypefn
+
+*/
+
+#include <errno.h>
+
+#if 0
+
+#include <ansidecl.h>
+#include <limits.h>
+#include <stddef.h>
+#include <stdlib.h>
+
+#else
+
+#define	ULONG_MAX  ((unsigned long)(~0L))     /* 0xFFFFFFFF for 32-bits */
+#define	LONG_MAX   ((long)(ULONG_MAX >> 1))   /* 0x7FFFFFFF for 32-bits*/
+
+#ifdef __STDC__
+#  define PTR void *
+#  ifndef NULL
+#    define NULL (void *) 0
+#  endif
+#else
+#  define PTR char *
+#  ifndef NULL
+#    define NULL (void *) 0
+#  endif
+#endif
+
+#endif
+
+long int random (void);
+
+/* An improved random number generation package.  In addition to the standard
+   rand()/srand() like interface, this package also has a special state info
+   interface.  The initstate() routine is called with a seed, an array of
+   bytes, and a count of how many bytes are being passed in; this array is
+   then initialized to contain information for random number generation with
+   that much state information.  Good sizes for the amount of state
+   information are 32, 64, 128, and 256 bytes.  The state can be switched by
+   calling the setstate() function with the same array as was initiallized
+   with initstate().  By default, the package runs with 128 bytes of state
+   information and generates far better random numbers than a linear
+   congruential generator.  If the amount of state information is less than
+   32 bytes, a simple linear congruential R.N.G. is used.  Internally, the
+   state information is treated as an array of longs; the zeroeth element of
+   the array is the type of R.N.G. being used (small integer); the remainder
+   of the array is the state information for the R.N.G.  Thus, 32 bytes of
+   state information will give 7 longs worth of state information, which will
+   allow a degree seven polynomial.  (Note: The zeroeth word of state
+   information also has some other information stored in it; see setstate
+   for details).  The random number generation technique is a linear feedback
+   shift register approach, employing trinomials (since there are fewer terms
+   to sum up that way).  In this approach, the least significant bit of all
+   the numbers in the state table will act as a linear feedback shift register,
+   and will have period 2^deg - 1 (where deg is the degree of the polynomial
+   being used, assuming that the polynomial is irreducible and primitive).
+   The higher order bits will have longer periods, since their values are
+   also influenced by pseudo-random carries out of the lower bits.  The
+   total period of the generator is approximately deg*(2**deg - 1); thus
+   doubling the amount of state information has a vast influence on the
+   period of the generator.  Note: The deg*(2**deg - 1) is an approximation
+   only good for large deg, when the period of the shift register is the
+   dominant factor.  With deg equal to seven, the period is actually much
+   longer than the 7*(2**7 - 1) predicted by this formula.  */
+
+
+
+/* For each of the currently supported random number generators, we have a
+   break value on the amount of state information (you need at least thi
+   bytes of state info to support this random number generator), a degree for
+   the polynomial (actually a trinomial) that the R.N.G. is based on, and
+   separation between the two lower order coefficients of the trinomial.  */
+
+/* Linear congruential.  */
+#define	TYPE_0		0
+#define	BREAK_0		8
+#define	DEG_0		0
+#define	SEP_0		0
+
+/* x**7 + x**3 + 1.  */
+#define	TYPE_1		1
+#define	BREAK_1		32
+#define	DEG_1		7
+#define	SEP_1		3
+
+/* x**15 + x + 1.  */
+#define	TYPE_2		2
+#define	BREAK_2		64
+#define	DEG_2		15
+#define	SEP_2		1
+
+/* x**31 + x**3 + 1.  */
+#define	TYPE_3		3
+#define	BREAK_3		128
+#define	DEG_3		31
+#define	SEP_3		3
+
+/* x**63 + x + 1.  */
+#define	TYPE_4		4
+#define	BREAK_4		256
+#define	DEG_4		63
+#define	SEP_4		1
+
+
+/* Array versions of the above information to make code run faster.
+   Relies on fact that TYPE_i == i.  */
+
+#define	MAX_TYPES	5	/* Max number of types above.  */
+
+static int degrees[MAX_TYPES] = { DEG_0, DEG_1, DEG_2, DEG_3, DEG_4 };
+static int seps[MAX_TYPES] = { SEP_0, SEP_1, SEP_2, SEP_3, SEP_4 };
+
+
+
+/* Initially, everything is set up as if from:
+	initstate(1, randtbl, 128);
+   Note that this initialization takes advantage of the fact that srandom
+   advances the front and rear pointers 10*rand_deg times, and hence the
+   rear pointer which starts at 0 will also end up at zero; thus the zeroeth
+   element of the state information, which contains info about the current
+   position of the rear pointer is just
+	(MAX_TYPES * (rptr - state)) + TYPE_3 == TYPE_3.  */
+
+static long int randtbl[DEG_3 + 1] =
+  { TYPE_3,
+      0x9a319039, 0x32d9c024, 0x9b663182, 0x5da1f342, 
+      0xde3b81e0, 0xdf0a6fb5, 0xf103bc02, 0x48f340fb, 
+      0x7449e56b, 0xbeb1dbb0, 0xab5c5918, 0x946554fd, 
+      0x8c2e680f, 0xeb3d799f, 0xb11ee0b7, 0x2d436b86, 
+      0xda672e2a, 0x1588ca88, 0xe369735d, 0x904f35f7, 
+      0xd7158fd6, 0x6fa6f051, 0x616e6b96, 0xac94efdc, 
+      0x36413f93, 0xc622c298, 0xf5a42ab8, 0x8a88d77b, 
+      0xf5ad9d0e, 0x8999220b, 0x27fb47b9
+    };
+
+/* FPTR and RPTR are two pointers into the state info, a front and a rear
+   pointer.  These two pointers are always rand_sep places aparts, as they
+   cycle through the state information.  (Yes, this does mean we could get
+   away with just one pointer, but the code for random is more efficient
+   this way).  The pointers are left positioned as they would be from the call:
+	initstate(1, randtbl, 128);
+   (The position of the rear pointer, rptr, is really 0 (as explained above
+   in the initialization of randtbl) because the state table pointer is set
+   to point to randtbl[1] (as explained below).)  */
+
+static long int *fptr = &randtbl[SEP_3 + 1];
+static long int *rptr = &randtbl[1];
+
+
+
+/* The following things are the pointer to the state information table,
+   the type of the current generator, the degree of the current polynomial
+   being used, and the separation between the two pointers.
+   Note that for efficiency of random, we remember the first location of
+   the state information, not the zeroeth.  Hence it is valid to access
+   state[-1], which is used to store the type of the R.N.G.
+   Also, we remember the last location, since this is more efficient than
+   indexing every time to find the address of the last element to see if
+   the front and rear pointers have wrapped.  */
+
+static long int *state = &randtbl[1];
+
+static int rand_type = TYPE_3;
+static int rand_deg = DEG_3;
+static int rand_sep = SEP_3;
+
+static long int *end_ptr = &randtbl[sizeof(randtbl) / sizeof(randtbl[0])];
+
+/* Initialize the random number generator based on the given seed.  If the
+   type is the trivial no-state-information type, just remember the seed.
+   Otherwise, initializes state[] based on the given "seed" via a linear
+   congruential generator.  Then, the pointers are set to known locations
+   that are exactly rand_sep places apart.  Lastly, it cycles the state
+   information a given number of times to get rid of any initial dependencies
+   introduced by the L.C.R.N.G.  Note that the initialization of randtbl[]
+   for default usage relies on values produced by this routine.  */
+void
+srandom (unsigned int x)
+{
+  state[0] = x;
+  if (rand_type != TYPE_0)
+    {
+      register long int i;
+      for (i = 1; i < rand_deg; ++i)
+	state[i] = (1103515145 * state[i - 1]) + 12345;
+      fptr = &state[rand_sep];
+      rptr = &state[0];
+      for (i = 0; i < 10 * rand_deg; ++i)
+	random();
+    }
+}
+
+/* Initialize the state information in the given array of N bytes for
+   future random number generation.  Based on the number of bytes we
+   are given, and the break values for the different R.N.G.'s, we choose
+   the best (largest) one we can and set things up for it.  srandom is
+   then called to initialize the state information.  Note that on return
+   from srandom, we set state[-1] to be the type multiplexed with the current
+   value of the rear pointer; this is so successive calls to initstate won't
+   lose this information and will be able to restart with setstate.
+   Note: The first thing we do is save the current state, if any, just like
+   setstate so that it doesn't matter when initstate is called.
+   Returns a pointer to the old state.  */
+PTR
+initstate (unsigned int seed, PTR arg_state, unsigned long n)
+{
+  PTR ostate = (PTR) &state[-1];
+
+  if (rand_type == TYPE_0)
+    state[-1] = rand_type;
+  else
+    state[-1] = (MAX_TYPES * (rptr - state)) + rand_type;
+  if (n < BREAK_1)
+    {
+      if (n < BREAK_0)
+	{
+	  errno = EINVAL;
+	  return NULL;
+	}
+      rand_type = TYPE_0;
+      rand_deg = DEG_0;
+      rand_sep = SEP_0;
+    }
+  else if (n < BREAK_2)
+    {
+      rand_type = TYPE_1;
+      rand_deg = DEG_1;
+      rand_sep = SEP_1;
+    }
+  else if (n < BREAK_3)
+    {
+      rand_type = TYPE_2;
+      rand_deg = DEG_2;
+      rand_sep = SEP_2;
+    }
+  else if (n < BREAK_4)
+    {
+      rand_type = TYPE_3;
+      rand_deg = DEG_3;
+      rand_sep = SEP_3;
+    }
+  else
+    {
+      rand_type = TYPE_4;
+      rand_deg = DEG_4;
+      rand_sep = SEP_4;
+    }
+
+  state = &((long int *) arg_state)[1];	/* First location.  */
+  /* Must set END_PTR before srandom.  */
+  end_ptr = &state[rand_deg];
+  srandom(seed);
+  if (rand_type == TYPE_0)
+    state[-1] = rand_type;
+  else
+    state[-1] = (MAX_TYPES * (rptr - state)) + rand_type;
+
+  return ostate;
+}
+
+/* Restore the state from the given state array.
+   Note: It is important that we also remember the locations of the pointers
+   in the current state information, and restore the locations of the pointers
+   from the old state information.  This is done by multiplexing the pointer
+   location into the zeroeth word of the state information. Note that due
+   to the order in which things are done, it is OK to call setstate with the
+   same state as the current state
+   Returns a pointer to the old state information.  */
+
+PTR
+setstate (PTR arg_state)
+{
+  register long int *new_state = (long int *) arg_state;
+  register int type = new_state[0] % MAX_TYPES;
+  register int rear = new_state[0] / MAX_TYPES;
+  PTR ostate = (PTR) &state[-1];
+
+  if (rand_type == TYPE_0)
+    state[-1] = rand_type;
+  else
+    state[-1] = (MAX_TYPES * (rptr - state)) + rand_type;
+
+  switch (type)
+    {
+    case TYPE_0:
+    case TYPE_1:
+    case TYPE_2:
+    case TYPE_3:
+    case TYPE_4:
+      rand_type = type;
+      rand_deg = degrees[type];
+      rand_sep = seps[type];
+      break;
+    default:
+      /* State info munged.  */
+      errno = EINVAL;
+      return NULL;
+    }
+
+  state = &new_state[1];
+  if (rand_type != TYPE_0)
+    {
+      rptr = &state[rear];
+      fptr = &state[(rear + rand_sep) % rand_deg];
+    }
+  /* Set end_ptr too.  */
+  end_ptr = &state[rand_deg];
+
+  return ostate;
+}
+
+/* If we are using the trivial TYPE_0 R.N.G., just do the old linear
+   congruential bit.  Otherwise, we do our fancy trinomial stuff, which is the
+   same in all ther other cases due to all the global variables that have been
+   set up.  The basic operation is to add the number at the rear pointer into
+   the one at the front pointer.  Then both pointers are advanced to the next
+   location cyclically in the table.  The value returned is the sum generated,
+   reduced to 31 bits by throwing away the "least random" low bit.
+   Note: The code takes advantage of the fact that both the front and
+   rear pointers can't wrap on the same call by not testing the rear
+   pointer if the front one has wrapped.  Returns a 31-bit random number.  */
+
+long int
+random (void)
+{
+  if (rand_type == TYPE_0)
+    {
+      state[0] = ((state[0] * 1103515245) + 12345) & LONG_MAX;
+      return state[0];
+    }
+  else
+    {
+      long int i;
+      *fptr += *rptr;
+      /* Chucking least random bit.  */
+      i = (*fptr >> 1) & LONG_MAX;
+      ++fptr;
+      if (fptr >= end_ptr)
+	{
+	  fptr = state;
+	  ++rptr;
+	}
+      else
+	{
+	  ++rptr;
+	  if (rptr >= end_ptr)
+	    rptr = state;
+	}
+      return i;
+    }
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/regex.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/regex.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/regex.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/regex.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,8202 @@
+/* Extended regular expression matching and search library,
+   version 0.12.
+   (Implements POSIX draft P1003.2/D11.2, except for some of the
+   internationalization features.)
+
+   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+   2002, 2005, 2010 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301 USA.  */
+
+/* This file has been modified for usage in libiberty.  It includes "xregex.h"
+   instead of <regex.h>.  The "xregex.h" header file renames all external
+   routines with an "x" prefix so they do not collide with the native regex
+   routines or with other components regex routines. */
+/* AIX requires this to be the first thing in the file. */
+#if defined _AIX && !defined __GNUC__ && !defined REGEX_MALLOC
+  #pragma alloca
+#endif
+
+#undef	_GNU_SOURCE
+#define _GNU_SOURCE
+
+#ifndef INSIDE_RECURSION
+# ifdef HAVE_CONFIG_H
+#  include <config.h>
+# endif
+#endif
+
+#include <ansidecl.h>
+
+#ifndef INSIDE_RECURSION
+
+# if defined STDC_HEADERS && !defined emacs
+#  include <stddef.h>
+# else
+/* We need this for `regex.h', and perhaps for the Emacs include files.  */
+#  include <sys/types.h>
+# endif
+
+# define WIDE_CHAR_SUPPORT (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC)
+
+/* For platform which support the ISO C amendement 1 functionality we
+   support user defined character classes.  */
+# if defined _LIBC || WIDE_CHAR_SUPPORT
+/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.  */
+#  include <wchar.h>
+#  include <wctype.h>
+# endif
+
+# ifdef _LIBC
+/* We have to keep the namespace clean.  */
+#  define regfree(preg) __regfree (preg)
+#  define regexec(pr, st, nm, pm, ef) __regexec (pr, st, nm, pm, ef)
+#  define regcomp(preg, pattern, cflags) __regcomp (preg, pattern, cflags)
+#  define regerror(errcode, preg, errbuf, errbuf_size) \
+	__regerror(errcode, preg, errbuf, errbuf_size)
+#  define re_set_registers(bu, re, nu, st, en) \
+	__re_set_registers (bu, re, nu, st, en)
+#  define re_match_2(bufp, string1, size1, string2, size2, pos, regs, stop) \
+	__re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop)
+#  define re_match(bufp, string, size, pos, regs) \
+	__re_match (bufp, string, size, pos, regs)
+#  define re_search(bufp, string, size, startpos, range, regs) \
+	__re_search (bufp, string, size, startpos, range, regs)
+#  define re_compile_pattern(pattern, length, bufp) \
+	__re_compile_pattern (pattern, length, bufp)
+#  define re_set_syntax(syntax) __re_set_syntax (syntax)
+#  define re_search_2(bufp, st1, s1, st2, s2, startpos, range, regs, stop) \
+	__re_search_2 (bufp, st1, s1, st2, s2, startpos, range, regs, stop)
+#  define re_compile_fastmap(bufp) __re_compile_fastmap (bufp)
+
+#  define btowc __btowc
+
+/* We are also using some library internals.  */
+#  include <locale/localeinfo.h>
+#  include <locale/elem-hash.h>
+#  include <langinfo.h>
+#  include <locale/coll-lookup.h>
+# endif
+
+/* This is for other GNU distributions with internationalized messages.  */
+# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
+#  include <libintl.h>
+#  ifdef _LIBC
+#   undef gettext
+#   define gettext(msgid) __dcgettext ("libc", msgid, LC_MESSAGES)
+#  endif
+# else
+#  define gettext(msgid) (msgid)
+# endif
+
+# ifndef gettext_noop
+/* This define is so xgettext can find the internationalizable
+   strings.  */
+#  define gettext_noop(String) String
+# endif
+
+/* The `emacs' switch turns on certain matching commands
+   that make sense only in Emacs. */
+# ifdef emacs
+
+#  include "lisp.h"
+#  include "buffer.h"
+#  include "syntax.h"
+
+# else  /* not emacs */
+
+/* If we are not linking with Emacs proper,
+   we can't use the relocating allocator
+   even if config.h says that we can.  */
+#  undef REL_ALLOC
+
+#  if defined STDC_HEADERS || defined _LIBC
+#   include <stdlib.h>
+#  else
+char *malloc ();
+char *realloc ();
+#  endif
+
+/* When used in Emacs's lib-src, we need to get bzero and bcopy somehow.
+   If nothing else has been done, use the method below.  */
+#  ifdef INHIBIT_STRING_HEADER
+#   if !(defined HAVE_BZERO && defined HAVE_BCOPY)
+#    if !defined bzero && !defined bcopy
+#     undef INHIBIT_STRING_HEADER
+#    endif
+#   endif
+#  endif
+
+/* This is the normal way of making sure we have a bcopy and a bzero.
+   This is used in most programs--a few other programs avoid this
+   by defining INHIBIT_STRING_HEADER.  */
+#  ifndef INHIBIT_STRING_HEADER
+#   if defined HAVE_STRING_H || defined STDC_HEADERS || defined _LIBC
+#    include <string.h>
+#    ifndef bzero
+#     ifndef _LIBC
+#      define bzero(s, n)	(memset (s, '\0', n), (s))
+#     else
+#      define bzero(s, n)	__bzero (s, n)
+#     endif
+#    endif
+#   else
+#    include <strings.h>
+#    ifndef memcmp
+#     define memcmp(s1, s2, n)	bcmp (s1, s2, n)
+#    endif
+#    ifndef memcpy
+#     define memcpy(d, s, n)	(bcopy (s, d, n), (d))
+#    endif
+#   endif
+#  endif
+
+/* Define the syntax stuff for \<, \>, etc.  */
+
+/* This must be nonzero for the wordchar and notwordchar pattern
+   commands in re_match_2.  */
+#  ifndef Sword
+#   define Sword 1
+#  endif
+
+#  ifdef SWITCH_ENUM_BUG
+#   define SWITCH_ENUM_CAST(x) ((int)(x))
+#  else
+#   define SWITCH_ENUM_CAST(x) (x)
+#  endif
+
+# endif /* not emacs */
+
+# if defined _LIBC || HAVE_LIMITS_H
+#  include <limits.h>
+# endif
+
+# ifndef MB_LEN_MAX
+#  define MB_LEN_MAX 1
+# endif
+
+/* Get the interface, including the syntax bits.  */
+# include "xregex.h"  /* change for libiberty */
+
+/* isalpha etc. are used for the character classes.  */
+# include <ctype.h>
+
+/* Jim Meyering writes:
+
+   "... Some ctype macros are valid only for character codes that
+   isascii says are ASCII (SGI's IRIX-4.0.5 is one such system --when
+   using /bin/cc or gcc but without giving an ansi option).  So, all
+   ctype uses should be through macros like ISPRINT...  If
+   STDC_HEADERS is defined, then autoconf has verified that the ctype
+   macros don't need to be guarded with references to isascii. ...
+   Defining isascii to 1 should let any compiler worth its salt
+   eliminate the && through constant folding."
+   Solaris defines some of these symbols so we must undefine them first.  */
+
+# undef ISASCII
+# if defined STDC_HEADERS || (!defined isascii && !defined HAVE_ISASCII)
+#  define ISASCII(c) 1
+# else
+#  define ISASCII(c) isascii(c)
+# endif
+
+# ifdef isblank
+#  define ISBLANK(c) (ISASCII (c) && isblank (c))
+# else
+#  define ISBLANK(c) ((c) == ' ' || (c) == '\t')
+# endif
+# ifdef isgraph
+#  define ISGRAPH(c) (ISASCII (c) && isgraph (c))
+# else
+#  define ISGRAPH(c) (ISASCII (c) && isprint (c) && !isspace (c))
+# endif
+
+# undef ISPRINT
+# define ISPRINT(c) (ISASCII (c) && isprint (c))
+# define ISDIGIT(c) (ISASCII (c) && isdigit (c))
+# define ISALNUM(c) (ISASCII (c) && isalnum (c))
+# define ISALPHA(c) (ISASCII (c) && isalpha (c))
+# define ISCNTRL(c) (ISASCII (c) && iscntrl (c))
+# define ISLOWER(c) (ISASCII (c) && islower (c))
+# define ISPUNCT(c) (ISASCII (c) && ispunct (c))
+# define ISSPACE(c) (ISASCII (c) && isspace (c))
+# define ISUPPER(c) (ISASCII (c) && isupper (c))
+# define ISXDIGIT(c) (ISASCII (c) && isxdigit (c))
+
+# ifdef _tolower
+#  define TOLOWER(c) _tolower(c)
+# else
+#  define TOLOWER(c) tolower(c)
+# endif
+
+# ifndef NULL
+#  define NULL (void *)0
+# endif
+
+/* We remove any previous definition of `SIGN_EXTEND_CHAR',
+   since ours (we hope) works properly with all combinations of
+   machines, compilers, `char' and `unsigned char' argument types.
+   (Per Bothner suggested the basic approach.)  */
+# undef SIGN_EXTEND_CHAR
+# if __STDC__
+#  define SIGN_EXTEND_CHAR(c) ((signed char) (c))
+# else  /* not __STDC__ */
+/* As in Harbison and Steele.  */
+#  define SIGN_EXTEND_CHAR(c) ((((unsigned char) (c)) ^ 128) - 128)
+# endif
+
+# ifndef emacs
+/* How many characters in the character set.  */
+#  define CHAR_SET_SIZE 256
+
+#  ifdef SYNTAX_TABLE
+
+extern char *re_syntax_table;
+
+#  else /* not SYNTAX_TABLE */
+
+static char re_syntax_table[CHAR_SET_SIZE];
+
+static void init_syntax_once (void);
+
+static void
+init_syntax_once (void)
+{
+   register int c;
+   static int done = 0;
+
+   if (done)
+     return;
+   bzero (re_syntax_table, sizeof re_syntax_table);
+
+   for (c = 0; c < CHAR_SET_SIZE; ++c)
+     if (ISALNUM (c))
+	re_syntax_table[c] = Sword;
+
+   re_syntax_table['_'] = Sword;
+
+   done = 1;
+}
+
+#  endif /* not SYNTAX_TABLE */
+
+#  define SYNTAX(c) re_syntax_table[(unsigned char) (c)]
+
+# endif /* emacs */
+
+/* Integer type for pointers.  */
+# if !defined _LIBC && !defined HAVE_UINTPTR_T
+typedef unsigned long int uintptr_t;
+# endif
+
+/* Should we use malloc or alloca?  If REGEX_MALLOC is not defined, we
+   use `alloca' instead of `malloc'.  This is because using malloc in
+   re_search* or re_match* could cause memory leaks when C-g is used in
+   Emacs; also, malloc is slower and causes storage fragmentation.  On
+   the other hand, malloc is more portable, and easier to debug.
+
+   Because we sometimes use alloca, some routines have to be macros,
+   not functions -- `alloca'-allocated space disappears at the end of the
+   function it is called in.  */
+
+# ifdef REGEX_MALLOC
+
+#  define REGEX_ALLOCATE malloc
+#  define REGEX_REALLOCATE(source, osize, nsize) realloc (source, nsize)
+#  define REGEX_FREE free
+
+# else /* not REGEX_MALLOC  */
+
+/* Emacs already defines alloca, sometimes.  */
+#  ifndef alloca
+
+/* Make alloca work the best possible way.  */
+#   ifdef __GNUC__
+#    define alloca __builtin_alloca
+#   else /* not __GNUC__ */
+#    if HAVE_ALLOCA_H
+#     include <alloca.h>
+#    endif /* HAVE_ALLOCA_H */
+#   endif /* not __GNUC__ */
+
+#  endif /* not alloca */
+
+#  define REGEX_ALLOCATE alloca
+
+/* Assumes a `char *destination' variable.  */
+#  define REGEX_REALLOCATE(source, osize, nsize)			\
+  (destination = (char *) alloca (nsize),				\
+   memcpy (destination, source, osize))
+
+/* No need to do anything to free, after alloca.  */
+#  define REGEX_FREE(arg) ((void)0) /* Do nothing!  But inhibit gcc warning.  */
+
+# endif /* not REGEX_MALLOC */
+
+/* Define how to allocate the failure stack.  */
+
+# if defined REL_ALLOC && defined REGEX_MALLOC
+
+#  define REGEX_ALLOCATE_STACK(size)				\
+  r_alloc (&failure_stack_ptr, (size))
+#  define REGEX_REALLOCATE_STACK(source, osize, nsize)		\
+  r_re_alloc (&failure_stack_ptr, (nsize))
+#  define REGEX_FREE_STACK(ptr)					\
+  r_alloc_free (&failure_stack_ptr)
+
+# else /* not using relocating allocator */
+
+#  ifdef REGEX_MALLOC
+
+#   define REGEX_ALLOCATE_STACK malloc
+#   define REGEX_REALLOCATE_STACK(source, osize, nsize) realloc (source, nsize)
+#   define REGEX_FREE_STACK free
+
+#  else /* not REGEX_MALLOC */
+
+#   define REGEX_ALLOCATE_STACK alloca
+
+#   define REGEX_REALLOCATE_STACK(source, osize, nsize)			\
+   REGEX_REALLOCATE (source, osize, nsize)
+/* No need to explicitly free anything.  */
+#   define REGEX_FREE_STACK(arg)
+
+#  endif /* not REGEX_MALLOC */
+# endif /* not using relocating allocator */
+
+
+/* True if `size1' is non-NULL and PTR is pointing anywhere inside
+   `string1' or just past its end.  This works if PTR is NULL, which is
+   a good thing.  */
+# define FIRST_STRING_P(ptr) 					\
+  (size1 && string1 <= (ptr) && (ptr) <= string1 + size1)
+
+/* (Re)Allocate N items of type T using malloc, or fail.  */
+# define TALLOC(n, t) ((t *) malloc ((n) * sizeof (t)))
+# define RETALLOC(addr, n, t) ((addr) = (t *) realloc (addr, (n) * sizeof (t)))
+# define RETALLOC_IF(addr, n, t) \
+  if (addr) RETALLOC((addr), (n), t); else (addr) = TALLOC ((n), t)
+# define REGEX_TALLOC(n, t) ((t *) REGEX_ALLOCATE ((n) * sizeof (t)))
+
+# define BYTEWIDTH 8 /* In bits.  */
+
+# define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
+
+# undef MAX
+# undef MIN
+# define MAX(a, b) ((a) > (b) ? (a) : (b))
+# define MIN(a, b) ((a) < (b) ? (a) : (b))
+
+typedef char boolean;
+# define false 0
+# define true 1
+
+static reg_errcode_t byte_regex_compile (const char *pattern, size_t size,
+                                         reg_syntax_t syntax,
+                                         struct re_pattern_buffer *bufp);
+
+static int byte_re_match_2_internal (struct re_pattern_buffer *bufp,
+                                     const char *string1, int size1,
+                                     const char *string2, int size2,
+                                     int pos,
+                                     struct re_registers *regs,
+                                     int stop);
+static int byte_re_search_2 (struct re_pattern_buffer *bufp,
+                             const char *string1, int size1,
+                             const char *string2, int size2,
+                             int startpos, int range,
+                             struct re_registers *regs, int stop);
+static int byte_re_compile_fastmap (struct re_pattern_buffer *bufp);
+
+#ifdef MBS_SUPPORT
+static reg_errcode_t wcs_regex_compile (const char *pattern, size_t size,
+                                        reg_syntax_t syntax,
+                                        struct re_pattern_buffer *bufp);
+
+
+static int wcs_re_match_2_internal (struct re_pattern_buffer *bufp,
+                                    const char *cstring1, int csize1,
+                                    const char *cstring2, int csize2,
+                                    int pos,
+                                    struct re_registers *regs,
+                                    int stop,
+                                    wchar_t *string1, int size1,
+                                    wchar_t *string2, int size2,
+                                    int *mbs_offset1, int *mbs_offset2);
+static int wcs_re_search_2 (struct re_pattern_buffer *bufp,
+                            const char *string1, int size1,
+                            const char *string2, int size2,
+                            int startpos, int range,
+                            struct re_registers *regs, int stop);
+static int wcs_re_compile_fastmap (struct re_pattern_buffer *bufp);
+#endif
+
+/* These are the command codes that appear in compiled regular
+   expressions.  Some opcodes are followed by argument bytes.  A
+   command code can specify any interpretation whatsoever for its
+   arguments.  Zero bytes may appear in the compiled regular expression.  */
+
+typedef enum
+{
+  no_op = 0,
+
+  /* Succeed right away--no more backtracking.  */
+  succeed,
+
+        /* Followed by one byte giving n, then by n literal bytes.  */
+  exactn,
+
+# ifdef MBS_SUPPORT
+	/* Same as exactn, but contains binary data.  */
+  exactn_bin,
+# endif
+
+        /* Matches any (more or less) character.  */
+  anychar,
+
+        /* Matches any one char belonging to specified set.  First
+           following byte is number of bitmap bytes.  Then come bytes
+           for a bitmap saying which chars are in.  Bits in each byte
+           are ordered low-bit-first.  A character is in the set if its
+           bit is 1.  A character too large to have a bit in the map is
+           automatically not in the set.  */
+        /* ifdef MBS_SUPPORT, following element is length of character
+	   classes, length of collating symbols, length of equivalence
+	   classes, length of character ranges, and length of characters.
+	   Next, character class element, collating symbols elements,
+	   equivalence class elements, range elements, and character
+	   elements follow.
+	   See regex_compile function.  */
+  charset,
+
+        /* Same parameters as charset, but match any character that is
+           not one of those specified.  */
+  charset_not,
+
+        /* Start remembering the text that is matched, for storing in a
+           register.  Followed by one byte with the register number, in
+           the range 0 to one less than the pattern buffer's re_nsub
+           field.  Then followed by one byte with the number of groups
+           inner to this one.  (This last has to be part of the
+           start_memory only because we need it in the on_failure_jump
+           of re_match_2.)  */
+  start_memory,
+
+        /* Stop remembering the text that is matched and store it in a
+           memory register.  Followed by one byte with the register
+           number, in the range 0 to one less than `re_nsub' in the
+           pattern buffer, and one byte with the number of inner groups,
+           just like `start_memory'.  (We need the number of inner
+           groups here because we don't have any easy way of finding the
+           corresponding start_memory when we're at a stop_memory.)  */
+  stop_memory,
+
+        /* Match a duplicate of something remembered. Followed by one
+           byte containing the register number.  */
+  duplicate,
+
+        /* Fail unless at beginning of line.  */
+  begline,
+
+        /* Fail unless at end of line.  */
+  endline,
+
+        /* Succeeds if at beginning of buffer (if emacs) or at beginning
+           of string to be matched (if not).  */
+  begbuf,
+
+        /* Analogously, for end of buffer/string.  */
+  endbuf,
+
+        /* Followed by two byte relative address to which to jump.  */
+  jump,
+
+	/* Same as jump, but marks the end of an alternative.  */
+  jump_past_alt,
+
+        /* Followed by two-byte relative address of place to resume at
+           in case of failure.  */
+        /* ifdef MBS_SUPPORT, the size of address is 1.  */
+  on_failure_jump,
+
+        /* Like on_failure_jump, but pushes a placeholder instead of the
+           current string position when executed.  */
+  on_failure_keep_string_jump,
+
+        /* Throw away latest failure point and then jump to following
+           two-byte relative address.  */
+        /* ifdef MBS_SUPPORT, the size of address is 1.  */
+  pop_failure_jump,
+
+        /* Change to pop_failure_jump if know won't have to backtrack to
+           match; otherwise change to jump.  This is used to jump
+           back to the beginning of a repeat.  If what follows this jump
+           clearly won't match what the repeat does, such that we can be
+           sure that there is no use backtracking out of repetitions
+           already matched, then we change it to a pop_failure_jump.
+           Followed by two-byte address.  */
+        /* ifdef MBS_SUPPORT, the size of address is 1.  */
+  maybe_pop_jump,
+
+        /* Jump to following two-byte address, and push a dummy failure
+           point. This failure point will be thrown away if an attempt
+           is made to use it for a failure.  A `+' construct makes this
+           before the first repeat.  Also used as an intermediary kind
+           of jump when compiling an alternative.  */
+        /* ifdef MBS_SUPPORT, the size of address is 1.  */
+  dummy_failure_jump,
+
+	/* Push a dummy failure point and continue.  Used at the end of
+	   alternatives.  */
+  push_dummy_failure,
+
+        /* Followed by two-byte relative address and two-byte number n.
+           After matching N times, jump to the address upon failure.  */
+        /* ifdef MBS_SUPPORT, the size of address is 1.  */
+  succeed_n,
+
+        /* Followed by two-byte relative address, and two-byte number n.
+           Jump to the address N times, then fail.  */
+        /* ifdef MBS_SUPPORT, the size of address is 1.  */
+  jump_n,
+
+        /* Set the following two-byte relative address to the
+           subsequent two-byte number.  The address *includes* the two
+           bytes of number.  */
+        /* ifdef MBS_SUPPORT, the size of address is 1.  */
+  set_number_at,
+
+  wordchar,	/* Matches any word-constituent character.  */
+  notwordchar,	/* Matches any char that is not a word-constituent.  */
+
+  wordbeg,	/* Succeeds if at word beginning.  */
+  wordend,	/* Succeeds if at word end.  */
+
+  wordbound,	/* Succeeds if at a word boundary.  */
+  notwordbound	/* Succeeds if not at a word boundary.  */
+
+# ifdef emacs
+  ,before_dot,	/* Succeeds if before point.  */
+  at_dot,	/* Succeeds if at point.  */
+  after_dot,	/* Succeeds if after point.  */
+
+	/* Matches any character whose syntax is specified.  Followed by
+           a byte which contains a syntax code, e.g., Sword.  */
+  syntaxspec,
+
+	/* Matches any character whose syntax is not that specified.  */
+  notsyntaxspec
+# endif /* emacs */
+} re_opcode_t;
+#endif /* not INSIDE_RECURSION */
+
+
+#ifdef BYTE
+# define CHAR_T char
+# define UCHAR_T unsigned char
+# define COMPILED_BUFFER_VAR bufp->buffer
+# define OFFSET_ADDRESS_SIZE 2
+# define PREFIX(name) byte_##name
+# define ARG_PREFIX(name) name
+# define PUT_CHAR(c) putchar (c)
+#else
+# ifdef WCHAR
+#  define CHAR_T wchar_t
+#  define UCHAR_T wchar_t
+#  define COMPILED_BUFFER_VAR wc_buffer
+#  define OFFSET_ADDRESS_SIZE 1 /* the size which STORE_NUMBER macro use */
+#  define CHAR_CLASS_SIZE ((__alignof__(wctype_t)+sizeof(wctype_t))/sizeof(CHAR_T)+1)
+#  define PREFIX(name) wcs_##name
+#  define ARG_PREFIX(name) c##name
+/* Should we use wide stream??  */
+#  define PUT_CHAR(c) printf ("%C", c);
+#  define TRUE 1
+#  define FALSE 0
+# else
+#  ifdef MBS_SUPPORT
+#   define WCHAR
+#   define INSIDE_RECURSION
+#   include "regex.c"
+#   undef INSIDE_RECURSION
+#  endif
+#  define BYTE
+#  define INSIDE_RECURSION
+#  include "regex.c"
+#  undef INSIDE_RECURSION
+# endif
+#endif
+
+#ifdef INSIDE_RECURSION
+/* Common operations on the compiled pattern.  */
+
+/* Store NUMBER in two contiguous bytes starting at DESTINATION.  */
+/* ifdef MBS_SUPPORT, we store NUMBER in 1 element.  */
+
+# ifdef WCHAR
+#  define STORE_NUMBER(destination, number)				\
+  do {									\
+    *(destination) = (UCHAR_T)(number);				\
+  } while (0)
+# else /* BYTE */
+#  define STORE_NUMBER(destination, number)				\
+  do {									\
+    (destination)[0] = (number) & 0377;					\
+    (destination)[1] = (number) >> 8;					\
+  } while (0)
+# endif /* WCHAR */
+
+/* Same as STORE_NUMBER, except increment DESTINATION to
+   the byte after where the number is stored.  Therefore, DESTINATION
+   must be an lvalue.  */
+/* ifdef MBS_SUPPORT, we store NUMBER in 1 element.  */
+
+# define STORE_NUMBER_AND_INCR(destination, number)			\
+  do {									\
+    STORE_NUMBER (destination, number);					\
+    (destination) += OFFSET_ADDRESS_SIZE;				\
+  } while (0)
+
+/* Put into DESTINATION a number stored in two contiguous bytes starting
+   at SOURCE.  */
+/* ifdef MBS_SUPPORT, we store NUMBER in 1 element.  */
+
+# ifdef WCHAR
+#  define EXTRACT_NUMBER(destination, source)				\
+  do {									\
+    (destination) = *(source);						\
+  } while (0)
+# else /* BYTE */
+#  define EXTRACT_NUMBER(destination, source)				\
+  do {									\
+    (destination) = *(source) & 0377;					\
+    (destination) += SIGN_EXTEND_CHAR (*((source) + 1)) << 8;		\
+  } while (0)
+# endif
+
+# ifdef DEBUG
+static void PREFIX(extract_number) (int *dest, UCHAR_T *source);
+static void
+PREFIX(extract_number) (int *dest, UCHAR_T *source)
+{
+#  ifdef WCHAR
+  *dest = *source;
+#  else /* BYTE */
+  int temp = SIGN_EXTEND_CHAR (*(source + 1));
+  *dest = *source & 0377;
+  *dest += temp << 8;
+#  endif
+}
+
+#  ifndef EXTRACT_MACROS /* To debug the macros.  */
+#   undef EXTRACT_NUMBER
+#   define EXTRACT_NUMBER(dest, src) PREFIX(extract_number) (&dest, src)
+#  endif /* not EXTRACT_MACROS */
+
+# endif /* DEBUG */
+
+/* Same as EXTRACT_NUMBER, except increment SOURCE to after the number.
+   SOURCE must be an lvalue.  */
+
+# define EXTRACT_NUMBER_AND_INCR(destination, source)			\
+  do {									\
+    EXTRACT_NUMBER (destination, source);				\
+    (source) += OFFSET_ADDRESS_SIZE; 					\
+  } while (0)
+
+# ifdef DEBUG
+static void PREFIX(extract_number_and_incr) (int *destination,
+                                             UCHAR_T **source);
+static void
+PREFIX(extract_number_and_incr) (int *destination, UCHAR_T **source)
+{
+  PREFIX(extract_number) (destination, *source);
+  *source += OFFSET_ADDRESS_SIZE;
+}
+
+#  ifndef EXTRACT_MACROS
+#   undef EXTRACT_NUMBER_AND_INCR
+#   define EXTRACT_NUMBER_AND_INCR(dest, src) \
+  PREFIX(extract_number_and_incr) (&dest, &src)
+#  endif /* not EXTRACT_MACROS */
+
+# endif /* DEBUG */
+
+
+
+/* If DEBUG is defined, Regex prints many voluminous messages about what
+   it is doing (if the variable `debug' is nonzero).  If linked with the
+   main program in `iregex.c', you can enter patterns and strings
+   interactively.  And if linked with the main program in `main.c' and
+   the other test files, you can run the already-written tests.  */
+
+# ifdef DEBUG
+
+#  ifndef DEFINED_ONCE
+
+/* We use standard I/O for debugging.  */
+#   include <stdio.h>
+
+/* It is useful to test things that ``must'' be true when debugging.  */
+#   include <assert.h>
+
+static int debug;
+
+#   define DEBUG_STATEMENT(e) e
+#   define DEBUG_PRINT1(x) if (debug) printf (x)
+#   define DEBUG_PRINT2(x1, x2) if (debug) printf (x1, x2)
+#   define DEBUG_PRINT3(x1, x2, x3) if (debug) printf (x1, x2, x3)
+#   define DEBUG_PRINT4(x1, x2, x3, x4) if (debug) printf (x1, x2, x3, x4)
+#  endif /* not DEFINED_ONCE */
+
+#  define DEBUG_PRINT_COMPILED_PATTERN(p, s, e) 			\
+  if (debug) PREFIX(print_partial_compiled_pattern) (s, e)
+#  define DEBUG_PRINT_DOUBLE_STRING(w, s1, sz1, s2, sz2)		\
+  if (debug) PREFIX(print_double_string) (w, s1, sz1, s2, sz2)
+
+
+/* Print the fastmap in human-readable form.  */
+
+#  ifndef DEFINED_ONCE
+void
+print_fastmap (char *fastmap)
+{
+  unsigned was_a_range = 0;
+  unsigned i = 0;
+
+  while (i < (1 << BYTEWIDTH))
+    {
+      if (fastmap[i++])
+	{
+	  was_a_range = 0;
+          putchar (i - 1);
+          while (i < (1 << BYTEWIDTH)  &&  fastmap[i])
+            {
+              was_a_range = 1;
+              i++;
+            }
+	  if (was_a_range)
+            {
+              printf ("-");
+              putchar (i - 1);
+            }
+        }
+    }
+  putchar ('\n');
+}
+#  endif /* not DEFINED_ONCE */
+
+
+/* Print a compiled pattern string in human-readable form, starting at
+   the START pointer into it and ending just before the pointer END.  */
+
+void
+PREFIX(print_partial_compiled_pattern) (UCHAR_T *start, UCHAR_T *end)
+{
+  int mcnt, mcnt2;
+  UCHAR_T *p1;
+  UCHAR_T *p = start;
+  UCHAR_T *pend = end;
+
+  if (start == NULL)
+    {
+      printf ("(null)\n");
+      return;
+    }
+
+  /* Loop over pattern commands.  */
+  while (p < pend)
+    {
+#  ifdef _LIBC
+      printf ("%td:\t", p - start);
+#  else
+      printf ("%ld:\t", (long int) (p - start));
+#  endif
+
+      switch ((re_opcode_t) *p++)
+	{
+        case no_op:
+          printf ("/no_op");
+          break;
+
+	case exactn:
+	  mcnt = *p++;
+          printf ("/exactn/%d", mcnt);
+          do
+	    {
+              putchar ('/');
+	      PUT_CHAR (*p++);
+            }
+          while (--mcnt);
+          break;
+
+#  ifdef MBS_SUPPORT
+	case exactn_bin:
+	  mcnt = *p++;
+	  printf ("/exactn_bin/%d", mcnt);
+          do
+	    {
+	      printf("/%lx", (long int) *p++);
+            }
+          while (--mcnt);
+          break;
+#  endif /* MBS_SUPPORT */
+
+	case start_memory:
+          mcnt = *p++;
+          printf ("/start_memory/%d/%ld", mcnt, (long int) *p++);
+          break;
+
+	case stop_memory:
+          mcnt = *p++;
+	  printf ("/stop_memory/%d/%ld", mcnt, (long int) *p++);
+          break;
+
+	case duplicate:
+	  printf ("/duplicate/%ld", (long int) *p++);
+	  break;
+
+	case anychar:
+	  printf ("/anychar");
+	  break;
+
+	case charset:
+        case charset_not:
+          {
+#  ifdef WCHAR
+	    int i, length;
+	    wchar_t *workp = p;
+	    printf ("/charset [%s",
+	            (re_opcode_t) *(workp - 1) == charset_not ? "^" : "");
+	    p += 5;
+	    length = *workp++; /* the length of char_classes */
+	    for (i=0 ; i<length ; i++)
+	      printf("[:%lx:]", (long int) *p++);
+	    length = *workp++; /* the length of collating_symbol */
+	    for (i=0 ; i<length ;)
+	      {
+		printf("[.");
+		while(*p != 0)
+		  PUT_CHAR((i++,*p++));
+		i++,p++;
+		printf(".]");
+	      }
+	    length = *workp++; /* the length of equivalence_class */
+	    for (i=0 ; i<length ;)
+	      {
+		printf("[=");
+		while(*p != 0)
+		  PUT_CHAR((i++,*p++));
+		i++,p++;
+		printf("=]");
+	      }
+	    length = *workp++; /* the length of char_range */
+	    for (i=0 ; i<length ; i++)
+	      {
+		wchar_t range_start = *p++;
+		wchar_t range_end = *p++;
+		printf("%C-%C", range_start, range_end);
+	      }
+	    length = *workp++; /* the length of char */
+	    for (i=0 ; i<length ; i++)
+	      printf("%C", *p++);
+	    putchar (']');
+#  else
+            register int c, last = -100;
+	    register int in_range = 0;
+
+	    printf ("/charset [%s",
+	            (re_opcode_t) *(p - 1) == charset_not ? "^" : "");
+
+            assert (p + *p < pend);
+
+            for (c = 0; c < 256; c++)
+	      if (c / 8 < *p
+		  && (p[1 + (c/8)] & (1 << (c % 8))))
+		{
+		  /* Are we starting a range?  */
+		  if (last + 1 == c && ! in_range)
+		    {
+		      putchar ('-');
+		      in_range = 1;
+		    }
+		  /* Have we broken a range?  */
+		  else if (last + 1 != c && in_range)
+              {
+		      putchar (last);
+		      in_range = 0;
+		    }
+
+		  if (! in_range)
+		    putchar (c);
+
+		  last = c;
+              }
+
+	    if (in_range)
+	      putchar (last);
+
+	    putchar (']');
+
+	    p += 1 + *p;
+#  endif /* WCHAR */
+	  }
+	  break;
+
+	case begline:
+	  printf ("/begline");
+          break;
+
+	case endline:
+          printf ("/endline");
+          break;
+
+	case on_failure_jump:
+          PREFIX(extract_number_and_incr) (&mcnt, &p);
+#  ifdef _LIBC
+  	  printf ("/on_failure_jump to %td", p + mcnt - start);
+#  else
+  	  printf ("/on_failure_jump to %ld", (long int) (p + mcnt - start));
+#  endif
+          break;
+
+	case on_failure_keep_string_jump:
+          PREFIX(extract_number_and_incr) (&mcnt, &p);
+#  ifdef _LIBC
+  	  printf ("/on_failure_keep_string_jump to %td", p + mcnt - start);
+#  else
+  	  printf ("/on_failure_keep_string_jump to %ld",
+		  (long int) (p + mcnt - start));
+#  endif
+          break;
+
+	case dummy_failure_jump:
+          PREFIX(extract_number_and_incr) (&mcnt, &p);
+#  ifdef _LIBC
+  	  printf ("/dummy_failure_jump to %td", p + mcnt - start);
+#  else
+  	  printf ("/dummy_failure_jump to %ld", (long int) (p + mcnt - start));
+#  endif
+          break;
+
+	case push_dummy_failure:
+          printf ("/push_dummy_failure");
+          break;
+
+        case maybe_pop_jump:
+          PREFIX(extract_number_and_incr) (&mcnt, &p);
+#  ifdef _LIBC
+  	  printf ("/maybe_pop_jump to %td", p + mcnt - start);
+#  else
+  	  printf ("/maybe_pop_jump to %ld", (long int) (p + mcnt - start));
+#  endif
+	  break;
+
+        case pop_failure_jump:
+	  PREFIX(extract_number_and_incr) (&mcnt, &p);
+#  ifdef _LIBC
+  	  printf ("/pop_failure_jump to %td", p + mcnt - start);
+#  else
+  	  printf ("/pop_failure_jump to %ld", (long int) (p + mcnt - start));
+#  endif
+	  break;
+
+        case jump_past_alt:
+	  PREFIX(extract_number_and_incr) (&mcnt, &p);
+#  ifdef _LIBC
+  	  printf ("/jump_past_alt to %td", p + mcnt - start);
+#  else
+  	  printf ("/jump_past_alt to %ld", (long int) (p + mcnt - start));
+#  endif
+	  break;
+
+        case jump:
+	  PREFIX(extract_number_and_incr) (&mcnt, &p);
+#  ifdef _LIBC
+  	  printf ("/jump to %td", p + mcnt - start);
+#  else
+  	  printf ("/jump to %ld", (long int) (p + mcnt - start));
+#  endif
+	  break;
+
+        case succeed_n:
+          PREFIX(extract_number_and_incr) (&mcnt, &p);
+	  p1 = p + mcnt;
+          PREFIX(extract_number_and_incr) (&mcnt2, &p);
+#  ifdef _LIBC
+	  printf ("/succeed_n to %td, %d times", p1 - start, mcnt2);
+#  else
+	  printf ("/succeed_n to %ld, %d times",
+		  (long int) (p1 - start), mcnt2);
+#  endif
+          break;
+
+        case jump_n:
+          PREFIX(extract_number_and_incr) (&mcnt, &p);
+	  p1 = p + mcnt;
+          PREFIX(extract_number_and_incr) (&mcnt2, &p);
+	  printf ("/jump_n to %d, %d times", p1 - start, mcnt2);
+          break;
+
+        case set_number_at:
+          PREFIX(extract_number_and_incr) (&mcnt, &p);
+	  p1 = p + mcnt;
+          PREFIX(extract_number_and_incr) (&mcnt2, &p);
+#  ifdef _LIBC
+	  printf ("/set_number_at location %td to %d", p1 - start, mcnt2);
+#  else
+	  printf ("/set_number_at location %ld to %d",
+		  (long int) (p1 - start), mcnt2);
+#  endif
+          break;
+
+        case wordbound:
+	  printf ("/wordbound");
+	  break;
+
+	case notwordbound:
+	  printf ("/notwordbound");
+          break;
+
+	case wordbeg:
+	  printf ("/wordbeg");
+	  break;
+
+	case wordend:
+	  printf ("/wordend");
+	  break;
+
+#  ifdef emacs
+	case before_dot:
+	  printf ("/before_dot");
+          break;
+
+	case at_dot:
+	  printf ("/at_dot");
+          break;
+
+	case after_dot:
+	  printf ("/after_dot");
+          break;
+
+	case syntaxspec:
+          printf ("/syntaxspec");
+	  mcnt = *p++;
+	  printf ("/%d", mcnt);
+          break;
+
+	case notsyntaxspec:
+          printf ("/notsyntaxspec");
+	  mcnt = *p++;
+	  printf ("/%d", mcnt);
+	  break;
+#  endif /* emacs */
+
+	case wordchar:
+	  printf ("/wordchar");
+          break;
+
+	case notwordchar:
+	  printf ("/notwordchar");
+          break;
+
+	case begbuf:
+	  printf ("/begbuf");
+          break;
+
+	case endbuf:
+	  printf ("/endbuf");
+          break;
+
+        default:
+          printf ("?%ld", (long int) *(p-1));
+	}
+
+      putchar ('\n');
+    }
+
+#  ifdef _LIBC
+  printf ("%td:\tend of pattern.\n", p - start);
+#  else
+  printf ("%ld:\tend of pattern.\n", (long int) (p - start));
+#  endif
+}
+
+
+void
+PREFIX(print_compiled_pattern) (struct re_pattern_buffer *bufp)
+{
+  UCHAR_T *buffer = (UCHAR_T*) bufp->buffer;
+
+  PREFIX(print_partial_compiled_pattern) (buffer, buffer
+				  + bufp->used / sizeof(UCHAR_T));
+  printf ("%ld bytes used/%ld bytes allocated.\n",
+	  bufp->used, bufp->allocated);
+
+  if (bufp->fastmap_accurate && bufp->fastmap)
+    {
+      printf ("fastmap: ");
+      print_fastmap (bufp->fastmap);
+    }
+
+#  ifdef _LIBC
+  printf ("re_nsub: %Zd\t", bufp->re_nsub);
+#  else
+  printf ("re_nsub: %ld\t", (long int) bufp->re_nsub);
+#  endif
+  printf ("regs_alloc: %d\t", bufp->regs_allocated);
+  printf ("can_be_null: %d\t", bufp->can_be_null);
+  printf ("newline_anchor: %d\n", bufp->newline_anchor);
+  printf ("no_sub: %d\t", bufp->no_sub);
+  printf ("not_bol: %d\t", bufp->not_bol);
+  printf ("not_eol: %d\t", bufp->not_eol);
+  printf ("syntax: %lx\n", bufp->syntax);
+  /* Perhaps we should print the translate table?  */
+}
+
+
+void
+PREFIX(print_double_string) (const CHAR_T *where, const CHAR_T *string1,
+                             int size1, const CHAR_T *string2, int size2)
+{
+  int this_char;
+
+  if (where == NULL)
+    printf ("(null)");
+  else
+    {
+      int cnt;
+
+      if (FIRST_STRING_P (where))
+        {
+          for (this_char = where - string1; this_char < size1; this_char++)
+	    PUT_CHAR (string1[this_char]);
+
+          where = string2;
+        }
+
+      cnt = 0;
+      for (this_char = where - string2; this_char < size2; this_char++)
+	{
+	  PUT_CHAR (string2[this_char]);
+	  if (++cnt > 100)
+	    {
+	      fputs ("...", stdout);
+	      break;
+	    }
+	}
+    }
+}
+
+#  ifndef DEFINED_ONCE
+void
+printchar (int c)
+{
+  putc (c, stderr);
+}
+#  endif
+
+# else /* not DEBUG */
+
+#  ifndef DEFINED_ONCE
+#   undef assert
+#   define assert(e)
+
+#   define DEBUG_STATEMENT(e)
+#   define DEBUG_PRINT1(x)
+#   define DEBUG_PRINT2(x1, x2)
+#   define DEBUG_PRINT3(x1, x2, x3)
+#   define DEBUG_PRINT4(x1, x2, x3, x4)
+#  endif /* not DEFINED_ONCE */
+#  define DEBUG_PRINT_COMPILED_PATTERN(p, s, e)
+#  define DEBUG_PRINT_DOUBLE_STRING(w, s1, sz1, s2, sz2)
+
+# endif /* not DEBUG */
+
+
+
+# ifdef WCHAR
+/* This  convert a multibyte string to a wide character string.
+   And write their correspondances to offset_buffer(see below)
+   and write whether each wchar_t is binary data to is_binary.
+   This assume invalid multibyte sequences as binary data.
+   We assume offset_buffer and is_binary is already allocated
+   enough space.  */
+
+static size_t convert_mbs_to_wcs (CHAR_T *dest, const unsigned char* src,
+				  size_t len, int *offset_buffer,
+				  char *is_binary);
+static size_t
+convert_mbs_to_wcs (CHAR_T *dest, const unsigned char*src, size_t len,
+                    int *offset_buffer, char *is_binary)
+     /* It hold correspondances between src(char string) and
+	dest(wchar_t string) for optimization.
+	e.g. src  = "xxxyzz"
+             dest = {'X', 'Y', 'Z'}
+	      (each "xxx", "y" and "zz" represent one multibyte character
+	       corresponding to 'X', 'Y' and 'Z'.)
+	  offset_buffer = {0, 0+3("xxx"), 0+3+1("y"), 0+3+1+2("zz")}
+	  	        = {0, 3, 4, 6}
+     */
+{
+  wchar_t *pdest = dest;
+  const unsigned char *psrc = src;
+  size_t wc_count = 0;
+
+  mbstate_t mbs;
+  int i, consumed;
+  size_t mb_remain = len;
+  size_t mb_count = 0;
+
+  /* Initialize the conversion state.  */
+  memset (&mbs, 0, sizeof (mbstate_t));
+
+  offset_buffer[0] = 0;
+  for( ; mb_remain > 0 ; ++wc_count, ++pdest, mb_remain -= consumed,
+	 psrc += consumed)
+    {
+#ifdef _LIBC
+      consumed = __mbrtowc (pdest, psrc, mb_remain, &mbs);
+#else
+      consumed = mbrtowc (pdest, psrc, mb_remain, &mbs);
+#endif
+
+      if (consumed <= 0)
+	/* failed to convert. maybe src contains binary data.
+	   So we consume 1 byte manualy.  */
+	{
+	  *pdest = *psrc;
+	  consumed = 1;
+	  is_binary[wc_count] = TRUE;
+	}
+      else
+	is_binary[wc_count] = FALSE;
+      /* In sjis encoding, we use yen sign as escape character in
+	 place of reverse solidus. So we convert 0x5c(yen sign in
+	 sjis) to not 0xa5(yen sign in UCS2) but 0x5c(reverse
+	 solidus in UCS2).  */
+      if (consumed == 1 && (int) *psrc == 0x5c && (int) *pdest == 0xa5)
+	*pdest = (wchar_t) *psrc;
+
+      offset_buffer[wc_count + 1] = mb_count += consumed;
+    }
+
+  /* Fill remain of the buffer with sentinel.  */
+  for (i = wc_count + 1 ; i <= len ; i++)
+    offset_buffer[i] = mb_count + 1;
+
+  return wc_count;
+}
+
+# endif /* WCHAR */
+
+#else /* not INSIDE_RECURSION */
+
+/* Set by `re_set_syntax' to the current regexp syntax to recognize.  Can
+   also be assigned to arbitrarily: each pattern buffer stores its own
+   syntax, so it can be changed between regex compilations.  */
+/* This has no initializer because initialized variables in Emacs
+   become read-only after dumping.  */
+reg_syntax_t re_syntax_options;
+
+
+/* Specify the precise syntax of regexps for compilation.  This provides
+   for compatibility for various utilities which historically have
+   different, incompatible syntaxes.
+
+   The argument SYNTAX is a bit mask comprised of the various bits
+   defined in regex.h.  We return the old syntax.  */
+
+reg_syntax_t
+re_set_syntax (reg_syntax_t syntax)
+{
+  reg_syntax_t ret = re_syntax_options;
+
+  re_syntax_options = syntax;
+# ifdef DEBUG
+  if (syntax & RE_DEBUG)
+    debug = 1;
+  else if (debug) /* was on but now is not */
+    debug = 0;
+# endif /* DEBUG */
+  return ret;
+}
+# ifdef _LIBC
+weak_alias (__re_set_syntax, re_set_syntax)
+# endif
+
+/* This table gives an error message for each of the error codes listed
+   in regex.h.  Obviously the order here has to be same as there.
+   POSIX doesn't require that we do anything for REG_NOERROR,
+   but why not be nice?  */
+
+static const char *re_error_msgid[] =
+  {
+    gettext_noop ("Success"),	/* REG_NOERROR */
+    gettext_noop ("No match"),	/* REG_NOMATCH */
+    gettext_noop ("Invalid regular expression"), /* REG_BADPAT */
+    gettext_noop ("Invalid collation character"), /* REG_ECOLLATE */
+    gettext_noop ("Invalid character class name"), /* REG_ECTYPE */
+    gettext_noop ("Trailing backslash"), /* REG_EESCAPE */
+    gettext_noop ("Invalid back reference"), /* REG_ESUBREG */
+    gettext_noop ("Unmatched [ or [^"),	/* REG_EBRACK */
+    gettext_noop ("Unmatched ( or \\("), /* REG_EPAREN */
+    gettext_noop ("Unmatched \\{"), /* REG_EBRACE */
+    gettext_noop ("Invalid content of \\{\\}"), /* REG_BADBR */
+    gettext_noop ("Invalid range end"),	/* REG_ERANGE */
+    gettext_noop ("Memory exhausted"), /* REG_ESPACE */
+    gettext_noop ("Invalid preceding regular expression"), /* REG_BADRPT */
+    gettext_noop ("Premature end of regular expression"), /* REG_EEND */
+    gettext_noop ("Regular expression too big"), /* REG_ESIZE */
+    gettext_noop ("Unmatched ) or \\)") /* REG_ERPAREN */
+  };
+
+#endif /* INSIDE_RECURSION */
+
+#ifndef DEFINED_ONCE
+/* Avoiding alloca during matching, to placate r_alloc.  */
+
+/* Define MATCH_MAY_ALLOCATE unless we need to make sure that the
+   searching and matching functions should not call alloca.  On some
+   systems, alloca is implemented in terms of malloc, and if we're
+   using the relocating allocator routines, then malloc could cause a
+   relocation, which might (if the strings being searched are in the
+   ralloc heap) shift the data out from underneath the regexp
+   routines.
+
+   Here's another reason to avoid allocation: Emacs
+   processes input from X in a signal handler; processing X input may
+   call malloc; if input arrives while a matching routine is calling
+   malloc, then we're scrod.  But Emacs can't just block input while
+   calling matching routines; then we don't notice interrupts when
+   they come in.  So, Emacs blocks input around all regexp calls
+   except the matching calls, which it leaves unprotected, in the
+   faith that they will not malloc.  */
+
+/* Normally, this is fine.  */
+# define MATCH_MAY_ALLOCATE
+
+/* When using GNU C, we are not REALLY using the C alloca, no matter
+   what config.h may say.  So don't take precautions for it.  */
+# ifdef __GNUC__
+#  undef C_ALLOCA
+# endif
+
+/* The match routines may not allocate if (1) they would do it with malloc
+   and (2) it's not safe for them to use malloc.
+   Note that if REL_ALLOC is defined, matching would not use malloc for the
+   failure stack, but we would still use it for the register vectors;
+   so REL_ALLOC should not affect this.  */
+# if (defined C_ALLOCA || defined REGEX_MALLOC) && defined emacs
+#  undef MATCH_MAY_ALLOCATE
+# endif
+#endif /* not DEFINED_ONCE */
+
+#ifdef INSIDE_RECURSION
+/* Failure stack declarations and macros; both re_compile_fastmap and
+   re_match_2 use a failure stack.  These have to be macros because of
+   REGEX_ALLOCATE_STACK.  */
+
+
+/* Number of failure points for which to initially allocate space
+   when matching.  If this number is exceeded, we allocate more
+   space, so it is not a hard limit.  */
+# ifndef INIT_FAILURE_ALLOC
+#  define INIT_FAILURE_ALLOC 5
+# endif
+
+/* Roughly the maximum number of failure points on the stack.  Would be
+   exactly that if always used MAX_FAILURE_ITEMS items each time we failed.
+   This is a variable only so users of regex can assign to it; we never
+   change it ourselves.  */
+
+# ifdef INT_IS_16BIT
+
+#  ifndef DEFINED_ONCE
+#   if defined MATCH_MAY_ALLOCATE
+/* 4400 was enough to cause a crash on Alpha OSF/1,
+   whose default stack limit is 2mb.  */
+long int re_max_failures = 4000;
+#   else
+long int re_max_failures = 2000;
+#   endif
+#  endif
+
+union PREFIX(fail_stack_elt)
+{
+  UCHAR_T *pointer;
+  long int integer;
+};
+
+typedef union PREFIX(fail_stack_elt) PREFIX(fail_stack_elt_t);
+
+typedef struct
+{
+  PREFIX(fail_stack_elt_t) *stack;
+  unsigned long int size;
+  unsigned long int avail;		/* Offset of next open position.  */
+} PREFIX(fail_stack_type);
+
+# else /* not INT_IS_16BIT */
+
+#  ifndef DEFINED_ONCE
+#   if defined MATCH_MAY_ALLOCATE
+/* 4400 was enough to cause a crash on Alpha OSF/1,
+   whose default stack limit is 2mb.  */
+int re_max_failures = 4000;
+#   else
+int re_max_failures = 2000;
+#   endif
+#  endif
+
+union PREFIX(fail_stack_elt)
+{
+  UCHAR_T *pointer;
+  int integer;
+};
+
+typedef union PREFIX(fail_stack_elt) PREFIX(fail_stack_elt_t);
+
+typedef struct
+{
+  PREFIX(fail_stack_elt_t) *stack;
+  unsigned size;
+  unsigned avail;			/* Offset of next open position.  */
+} PREFIX(fail_stack_type);
+
+# endif /* INT_IS_16BIT */
+
+# ifndef DEFINED_ONCE
+#  define FAIL_STACK_EMPTY()     (fail_stack.avail == 0)
+#  define FAIL_STACK_PTR_EMPTY() (fail_stack_ptr->avail == 0)
+#  define FAIL_STACK_FULL()      (fail_stack.avail == fail_stack.size)
+# endif
+
+
+/* Define macros to initialize and free the failure stack.
+   Do `return -2' if the alloc fails.  */
+
+# ifdef MATCH_MAY_ALLOCATE
+#  define INIT_FAIL_STACK()						\
+  do {									\
+    fail_stack.stack = (PREFIX(fail_stack_elt_t) *)		\
+      REGEX_ALLOCATE_STACK (INIT_FAILURE_ALLOC * sizeof (PREFIX(fail_stack_elt_t))); \
+									\
+    if (fail_stack.stack == NULL)				\
+      return -2;							\
+									\
+    fail_stack.size = INIT_FAILURE_ALLOC;			\
+    fail_stack.avail = 0;					\
+  } while (0)
+
+#  define RESET_FAIL_STACK()  REGEX_FREE_STACK (fail_stack.stack)
+# else
+#  define INIT_FAIL_STACK()						\
+  do {									\
+    fail_stack.avail = 0;					\
+  } while (0)
+
+#  define RESET_FAIL_STACK()
+# endif
+
+
+/* Double the size of FAIL_STACK, up to approximately `re_max_failures' items.
+
+   Return 1 if succeeds, and 0 if either ran out of memory
+   allocating space for it or it was already too large.
+
+   REGEX_REALLOCATE_STACK requires `destination' be declared.   */
+
+# define DOUBLE_FAIL_STACK(fail_stack)					\
+  ((fail_stack).size > (unsigned) (re_max_failures * MAX_FAILURE_ITEMS)	\
+   ? 0									\
+   : ((fail_stack).stack = (PREFIX(fail_stack_elt_t) *)			\
+        REGEX_REALLOCATE_STACK ((fail_stack).stack, 			\
+          (fail_stack).size * sizeof (PREFIX(fail_stack_elt_t)),	\
+          ((fail_stack).size << 1) * sizeof (PREFIX(fail_stack_elt_t))),\
+									\
+      (fail_stack).stack == NULL					\
+      ? 0								\
+      : ((fail_stack).size <<= 1, 					\
+         1)))
+
+
+/* Push pointer POINTER on FAIL_STACK.
+   Return 1 if was able to do so and 0 if ran out of memory allocating
+   space to do so.  */
+# define PUSH_PATTERN_OP(POINTER, FAIL_STACK)				\
+  ((FAIL_STACK_FULL ()							\
+    && !DOUBLE_FAIL_STACK (FAIL_STACK))					\
+   ? 0									\
+   : ((FAIL_STACK).stack[(FAIL_STACK).avail++].pointer = POINTER,	\
+      1))
+
+/* Push a pointer value onto the failure stack.
+   Assumes the variable `fail_stack'.  Probably should only
+   be called from within `PUSH_FAILURE_POINT'.  */
+# define PUSH_FAILURE_POINTER(item)					\
+  fail_stack.stack[fail_stack.avail++].pointer = (UCHAR_T *) (item)
+
+/* This pushes an integer-valued item onto the failure stack.
+   Assumes the variable `fail_stack'.  Probably should only
+   be called from within `PUSH_FAILURE_POINT'.  */
+# define PUSH_FAILURE_INT(item)					\
+  fail_stack.stack[fail_stack.avail++].integer = (item)
+
+/* Push a fail_stack_elt_t value onto the failure stack.
+   Assumes the variable `fail_stack'.  Probably should only
+   be called from within `PUSH_FAILURE_POINT'.  */
+# define PUSH_FAILURE_ELT(item)					\
+  fail_stack.stack[fail_stack.avail++] =  (item)
+
+/* These three POP... operations complement the three PUSH... operations.
+   All assume that `fail_stack' is nonempty.  */
+# define POP_FAILURE_POINTER() fail_stack.stack[--fail_stack.avail].pointer
+# define POP_FAILURE_INT() fail_stack.stack[--fail_stack.avail].integer
+# define POP_FAILURE_ELT() fail_stack.stack[--fail_stack.avail]
+
+/* Used to omit pushing failure point id's when we're not debugging.  */
+# ifdef DEBUG
+#  define DEBUG_PUSH PUSH_FAILURE_INT
+#  define DEBUG_POP(item_addr) *(item_addr) = POP_FAILURE_INT ()
+# else
+#  define DEBUG_PUSH(item)
+#  define DEBUG_POP(item_addr)
+# endif
+
+
+/* Push the information about the state we will need
+   if we ever fail back to it.
+
+   Requires variables fail_stack, regstart, regend, reg_info, and
+   num_regs_pushed be declared.  DOUBLE_FAIL_STACK requires `destination'
+   be declared.
+
+   Does `return FAILURE_CODE' if runs out of memory.  */
+
+# define PUSH_FAILURE_POINT(pattern_place, string_place, failure_code)	\
+  do {									\
+    char *destination;							\
+    /* Must be int, so when we don't save any registers, the arithmetic	\
+       of 0 + -1 isn't done as unsigned.  */				\
+    /* Can't be int, since there is not a shred of a guarantee that int	\
+       is wide enough to hold a value of something to which pointer can	\
+       be assigned */							\
+    active_reg_t this_reg;						\
+    									\
+    DEBUG_STATEMENT (failure_id++);					\
+    DEBUG_STATEMENT (nfailure_points_pushed++);				\
+    DEBUG_PRINT2 ("\nPUSH_FAILURE_POINT #%u:\n", failure_id);		\
+    DEBUG_PRINT2 ("  Before push, next avail: %d\n", (fail_stack).avail);\
+    DEBUG_PRINT2 ("                     size: %d\n", (fail_stack).size);\
+									\
+    DEBUG_PRINT2 ("  slots needed: %ld\n", NUM_FAILURE_ITEMS);		\
+    DEBUG_PRINT2 ("     available: %d\n", REMAINING_AVAIL_SLOTS);	\
+									\
+    /* Ensure we have enough space allocated for what we will push.  */	\
+    while (REMAINING_AVAIL_SLOTS < NUM_FAILURE_ITEMS)			\
+      {									\
+        if (!DOUBLE_FAIL_STACK (fail_stack))				\
+          return failure_code;						\
+									\
+        DEBUG_PRINT2 ("\n  Doubled stack; size now: %d\n",		\
+		       (fail_stack).size);				\
+        DEBUG_PRINT2 ("  slots available: %d\n", REMAINING_AVAIL_SLOTS);\
+      }									\
+									\
+    /* Push the info, starting with the registers.  */			\
+    DEBUG_PRINT1 ("\n");						\
+									\
+    if (1)								\
+      for (this_reg = lowest_active_reg; this_reg <= highest_active_reg; \
+	   this_reg++)							\
+	{								\
+	  DEBUG_PRINT2 ("  Pushing reg: %lu\n", this_reg);		\
+	  DEBUG_STATEMENT (num_regs_pushed++);				\
+									\
+	  DEBUG_PRINT2 ("    start: %p\n", regstart[this_reg]);		\
+	  PUSH_FAILURE_POINTER (regstart[this_reg]);			\
+									\
+	  DEBUG_PRINT2 ("    end: %p\n", regend[this_reg]);		\
+	  PUSH_FAILURE_POINTER (regend[this_reg]);			\
+									\
+	  DEBUG_PRINT2 ("    info: %p\n      ",				\
+			reg_info[this_reg].word.pointer);		\
+	  DEBUG_PRINT2 (" match_null=%d",				\
+			REG_MATCH_NULL_STRING_P (reg_info[this_reg]));	\
+	  DEBUG_PRINT2 (" active=%d", IS_ACTIVE (reg_info[this_reg]));	\
+	  DEBUG_PRINT2 (" matched_something=%d",			\
+			MATCHED_SOMETHING (reg_info[this_reg]));	\
+	  DEBUG_PRINT2 (" ever_matched=%d",				\
+			EVER_MATCHED_SOMETHING (reg_info[this_reg]));	\
+	  DEBUG_PRINT1 ("\n");						\
+	  PUSH_FAILURE_ELT (reg_info[this_reg].word);			\
+	}								\
+									\
+    DEBUG_PRINT2 ("  Pushing  low active reg: %ld\n", lowest_active_reg);\
+    PUSH_FAILURE_INT (lowest_active_reg);				\
+									\
+    DEBUG_PRINT2 ("  Pushing high active reg: %ld\n", highest_active_reg);\
+    PUSH_FAILURE_INT (highest_active_reg);				\
+									\
+    DEBUG_PRINT2 ("  Pushing pattern %p:\n", pattern_place);		\
+    DEBUG_PRINT_COMPILED_PATTERN (bufp, pattern_place, pend);		\
+    PUSH_FAILURE_POINTER (pattern_place);				\
+									\
+    DEBUG_PRINT2 ("  Pushing string %p: `", string_place);		\
+    DEBUG_PRINT_DOUBLE_STRING (string_place, string1, size1, string2,   \
+				 size2);				\
+    DEBUG_PRINT1 ("'\n");						\
+    PUSH_FAILURE_POINTER (string_place);				\
+									\
+    DEBUG_PRINT2 ("  Pushing failure id: %u\n", failure_id);		\
+    DEBUG_PUSH (failure_id);						\
+  } while (0)
+
+# ifndef DEFINED_ONCE
+/* This is the number of items that are pushed and popped on the stack
+   for each register.  */
+#  define NUM_REG_ITEMS  3
+
+/* Individual items aside from the registers.  */
+#  ifdef DEBUG
+#   define NUM_NONREG_ITEMS 5 /* Includes failure point id.  */
+#  else
+#   define NUM_NONREG_ITEMS 4
+#  endif
+
+/* We push at most this many items on the stack.  */
+/* We used to use (num_regs - 1), which is the number of registers
+   this regexp will save; but that was changed to 5
+   to avoid stack overflow for a regexp with lots of parens.  */
+#  define MAX_FAILURE_ITEMS (5 * NUM_REG_ITEMS + NUM_NONREG_ITEMS)
+
+/* We actually push this many items.  */
+#  define NUM_FAILURE_ITEMS				\
+  (((0							\
+     ? 0 : highest_active_reg - lowest_active_reg + 1)	\
+    * NUM_REG_ITEMS)					\
+   + NUM_NONREG_ITEMS)
+
+/* How many items can still be added to the stack without overflowing it.  */
+#  define REMAINING_AVAIL_SLOTS ((fail_stack).size - (fail_stack).avail)
+# endif /* not DEFINED_ONCE */
+
+
+/* Pops what PUSH_FAIL_STACK pushes.
+
+   We restore into the parameters, all of which should be lvalues:
+     STR -- the saved data position.
+     PAT -- the saved pattern position.
+     LOW_REG, HIGH_REG -- the highest and lowest active registers.
+     REGSTART, REGEND -- arrays of string positions.
+     REG_INFO -- array of information about each subexpression.
+
+   Also assumes the variables `fail_stack' and (if debugging), `bufp',
+   `pend', `string1', `size1', `string2', and `size2'.  */
+# define POP_FAILURE_POINT(str, pat, low_reg, high_reg, regstart, regend, reg_info)\
+{									\
+  DEBUG_STATEMENT (unsigned failure_id;)				\
+  active_reg_t this_reg;						\
+  const UCHAR_T *string_temp;						\
+									\
+  assert (!FAIL_STACK_EMPTY ());					\
+									\
+  /* Remove failure points and point to how many regs pushed.  */	\
+  DEBUG_PRINT1 ("POP_FAILURE_POINT:\n");				\
+  DEBUG_PRINT2 ("  Before pop, next avail: %d\n", fail_stack.avail);	\
+  DEBUG_PRINT2 ("                    size: %d\n", fail_stack.size);	\
+									\
+  assert (fail_stack.avail >= NUM_NONREG_ITEMS);			\
+									\
+  DEBUG_POP (&failure_id);						\
+  DEBUG_PRINT2 ("  Popping failure id: %u\n", failure_id);		\
+									\
+  /* If the saved string location is NULL, it came from an		\
+     on_failure_keep_string_jump opcode, and we want to throw away the	\
+     saved NULL, thus retaining our current position in the string.  */	\
+  string_temp = POP_FAILURE_POINTER ();					\
+  if (string_temp != NULL)						\
+    str = (const CHAR_T *) string_temp;					\
+									\
+  DEBUG_PRINT2 ("  Popping string %p: `", str);				\
+  DEBUG_PRINT_DOUBLE_STRING (str, string1, size1, string2, size2);	\
+  DEBUG_PRINT1 ("'\n");							\
+									\
+  pat = (UCHAR_T *) POP_FAILURE_POINTER ();				\
+  DEBUG_PRINT2 ("  Popping pattern %p:\n", pat);			\
+  DEBUG_PRINT_COMPILED_PATTERN (bufp, pat, pend);			\
+									\
+  /* Restore register info.  */						\
+  high_reg = (active_reg_t) POP_FAILURE_INT ();				\
+  DEBUG_PRINT2 ("  Popping high active reg: %ld\n", high_reg);		\
+									\
+  low_reg = (active_reg_t) POP_FAILURE_INT ();				\
+  DEBUG_PRINT2 ("  Popping  low active reg: %ld\n", low_reg);		\
+									\
+  if (1)								\
+    for (this_reg = high_reg; this_reg >= low_reg; this_reg--)		\
+      {									\
+	DEBUG_PRINT2 ("    Popping reg: %ld\n", this_reg);		\
+									\
+	reg_info[this_reg].word = POP_FAILURE_ELT ();			\
+	DEBUG_PRINT2 ("      info: %p\n",				\
+		      reg_info[this_reg].word.pointer);			\
+									\
+	regend[this_reg] = (const CHAR_T *) POP_FAILURE_POINTER ();	\
+	DEBUG_PRINT2 ("      end: %p\n", regend[this_reg]);		\
+									\
+	regstart[this_reg] = (const CHAR_T *) POP_FAILURE_POINTER ();	\
+	DEBUG_PRINT2 ("      start: %p\n", regstart[this_reg]);		\
+      }									\
+  else									\
+    {									\
+      for (this_reg = highest_active_reg; this_reg > high_reg; this_reg--) \
+	{								\
+	  reg_info[this_reg].word.integer = 0;				\
+	  regend[this_reg] = 0;						\
+	  regstart[this_reg] = 0;					\
+	}								\
+      highest_active_reg = high_reg;					\
+    }									\
+									\
+  set_regs_matched_done = 0;						\
+  DEBUG_STATEMENT (nfailure_points_popped++);				\
+} /* POP_FAILURE_POINT */
+
+/* Structure for per-register (a.k.a. per-group) information.
+   Other register information, such as the
+   starting and ending positions (which are addresses), and the list of
+   inner groups (which is a bits list) are maintained in separate
+   variables.
+
+   We are making a (strictly speaking) nonportable assumption here: that
+   the compiler will pack our bit fields into something that fits into
+   the type of `word', i.e., is something that fits into one item on the
+   failure stack.  */
+
+
+/* Declarations and macros for re_match_2.  */
+
+typedef union
+{
+  PREFIX(fail_stack_elt_t) word;
+  struct
+  {
+      /* This field is one if this group can match the empty string,
+         zero if not.  If not yet determined,  `MATCH_NULL_UNSET_VALUE'.  */
+# define MATCH_NULL_UNSET_VALUE 3
+    unsigned match_null_string_p : 2;
+    unsigned is_active : 1;
+    unsigned matched_something : 1;
+    unsigned ever_matched_something : 1;
+  } bits;
+} PREFIX(register_info_type);
+
+# ifndef DEFINED_ONCE
+#  define REG_MATCH_NULL_STRING_P(R)  ((R).bits.match_null_string_p)
+#  define IS_ACTIVE(R)  ((R).bits.is_active)
+#  define MATCHED_SOMETHING(R)  ((R).bits.matched_something)
+#  define EVER_MATCHED_SOMETHING(R)  ((R).bits.ever_matched_something)
+
+
+/* Call this when have matched a real character; it sets `matched' flags
+   for the subexpressions which we are currently inside.  Also records
+   that those subexprs have matched.  */
+#  define SET_REGS_MATCHED()						\
+  do									\
+    {									\
+      if (!set_regs_matched_done)					\
+	{								\
+	  active_reg_t r;						\
+	  set_regs_matched_done = 1;					\
+	  for (r = lowest_active_reg; r <= highest_active_reg; r++)	\
+	    {								\
+	      MATCHED_SOMETHING (reg_info[r])				\
+		= EVER_MATCHED_SOMETHING (reg_info[r])			\
+		= 1;							\
+	    }								\
+	}								\
+    }									\
+  while (0)
+# endif /* not DEFINED_ONCE */
+
+/* Registers are set to a sentinel when they haven't yet matched.  */
+static CHAR_T PREFIX(reg_unset_dummy);
+# define REG_UNSET_VALUE (&PREFIX(reg_unset_dummy))
+# define REG_UNSET(e) ((e) == REG_UNSET_VALUE)
+
+/* Subroutine declarations and macros for regex_compile.  */
+static void PREFIX(store_op1) (re_opcode_t op, UCHAR_T *loc, int arg);
+static void PREFIX(store_op2) (re_opcode_t op, UCHAR_T *loc,
+                               int arg1, int arg2);
+static void PREFIX(insert_op1) (re_opcode_t op, UCHAR_T *loc,
+                                int arg, UCHAR_T *end);
+static void PREFIX(insert_op2) (re_opcode_t op, UCHAR_T *loc,
+                                int arg1, int arg2, UCHAR_T *end);
+static boolean PREFIX(at_begline_loc_p) (const CHAR_T *pattern,
+                                         const CHAR_T *p,
+                                         reg_syntax_t syntax);
+static boolean PREFIX(at_endline_loc_p) (const CHAR_T *p,
+                                         const CHAR_T *pend,
+                                         reg_syntax_t syntax);
+# ifdef WCHAR
+static reg_errcode_t wcs_compile_range (CHAR_T range_start,
+                                        const CHAR_T **p_ptr,
+                                        const CHAR_T *pend,
+                                        char *translate,
+                                        reg_syntax_t syntax,
+                                        UCHAR_T *b,
+                                        CHAR_T *char_set);
+static void insert_space (int num, CHAR_T *loc, CHAR_T *end);
+# else /* BYTE */
+static reg_errcode_t byte_compile_range (unsigned int range_start,
+                                         const char **p_ptr,
+                                         const char *pend,
+                                         char *translate,
+                                         reg_syntax_t syntax,
+                                         unsigned char *b);
+# endif /* WCHAR */
+
+/* Fetch the next character in the uncompiled pattern---translating it
+   if necessary.  Also cast from a signed character in the constant
+   string passed to us by the user to an unsigned char that we can use
+   as an array index (in, e.g., `translate').  */
+/* ifdef MBS_SUPPORT, we translate only if character <= 0xff,
+   because it is impossible to allocate 4GB array for some encodings
+   which have 4 byte character_set like UCS4.  */
+# ifndef PATFETCH
+#  ifdef WCHAR
+#   define PATFETCH(c)							\
+  do {if (p == pend) return REG_EEND;					\
+    c = (UCHAR_T) *p++;							\
+    if (translate && (c <= 0xff)) c = (UCHAR_T) translate[c];		\
+  } while (0)
+#  else /* BYTE */
+#   define PATFETCH(c)							\
+  do {if (p == pend) return REG_EEND;					\
+    c = (unsigned char) *p++;						\
+    if (translate) c = (unsigned char) translate[c];			\
+  } while (0)
+#  endif /* WCHAR */
+# endif
+
+/* Fetch the next character in the uncompiled pattern, with no
+   translation.  */
+# define PATFETCH_RAW(c)						\
+  do {if (p == pend) return REG_EEND;					\
+    c = (UCHAR_T) *p++; 	       					\
+  } while (0)
+
+/* Go backwards one character in the pattern.  */
+# define PATUNFETCH p--
+
+
+/* If `translate' is non-null, return translate[D], else just D.  We
+   cast the subscript to translate because some data is declared as
+   `char *', to avoid warnings when a string constant is passed.  But
+   when we use a character as a subscript we must make it unsigned.  */
+/* ifdef MBS_SUPPORT, we translate only if character <= 0xff,
+   because it is impossible to allocate 4GB array for some encodings
+   which have 4 byte character_set like UCS4.  */
+
+# ifndef TRANSLATE
+#  ifdef WCHAR
+#   define TRANSLATE(d) \
+  ((translate && ((UCHAR_T) (d)) <= 0xff) \
+   ? (char) translate[(unsigned char) (d)] : (d))
+# else /* BYTE */
+#   define TRANSLATE(d) \
+  (translate ? (char) translate[(unsigned char) (d)] : (char) (d))
+#  endif /* WCHAR */
+# endif
+
+
+/* Macros for outputting the compiled pattern into `buffer'.  */
+
+/* If the buffer isn't allocated when it comes in, use this.  */
+# define INIT_BUF_SIZE  (32 * sizeof(UCHAR_T))
+
+/* Make sure we have at least N more bytes of space in buffer.  */
+# ifdef WCHAR
+#  define GET_BUFFER_SPACE(n)						\
+    while (((unsigned long)b - (unsigned long)COMPILED_BUFFER_VAR	\
+            + (n)*sizeof(CHAR_T)) > bufp->allocated)			\
+      EXTEND_BUFFER ()
+# else /* BYTE */
+#  define GET_BUFFER_SPACE(n)						\
+    while ((unsigned long) (b - bufp->buffer + (n)) > bufp->allocated)	\
+      EXTEND_BUFFER ()
+# endif /* WCHAR */
+
+/* Make sure we have one more byte of buffer space and then add C to it.  */
+# define BUF_PUSH(c)							\
+  do {									\
+    GET_BUFFER_SPACE (1);						\
+    *b++ = (UCHAR_T) (c);						\
+  } while (0)
+
+
+/* Ensure we have two more bytes of buffer space and then append C1 and C2.  */
+# define BUF_PUSH_2(c1, c2)						\
+  do {									\
+    GET_BUFFER_SPACE (2);						\
+    *b++ = (UCHAR_T) (c1);						\
+    *b++ = (UCHAR_T) (c2);						\
+  } while (0)
+
+
+/* As with BUF_PUSH_2, except for three bytes.  */
+# define BUF_PUSH_3(c1, c2, c3)						\
+  do {									\
+    GET_BUFFER_SPACE (3);						\
+    *b++ = (UCHAR_T) (c1);						\
+    *b++ = (UCHAR_T) (c2);						\
+    *b++ = (UCHAR_T) (c3);						\
+  } while (0)
+
+/* Store a jump with opcode OP at LOC to location TO.  We store a
+   relative address offset by the three bytes the jump itself occupies.  */
+# define STORE_JUMP(op, loc, to) \
+ PREFIX(store_op1) (op, loc, (int) ((to) - (loc) - (1 + OFFSET_ADDRESS_SIZE)))
+
+/* Likewise, for a two-argument jump.  */
+# define STORE_JUMP2(op, loc, to, arg) \
+  PREFIX(store_op2) (op, loc, (int) ((to) - (loc) - (1 + OFFSET_ADDRESS_SIZE)), arg)
+
+/* Like `STORE_JUMP', but for inserting.  Assume `b' is the buffer end.  */
+# define INSERT_JUMP(op, loc, to) \
+  PREFIX(insert_op1) (op, loc, (int) ((to) - (loc) - (1 + OFFSET_ADDRESS_SIZE)), b)
+
+/* Like `STORE_JUMP2', but for inserting.  Assume `b' is the buffer end.  */
+# define INSERT_JUMP2(op, loc, to, arg) \
+  PREFIX(insert_op2) (op, loc, (int) ((to) - (loc) - (1 + OFFSET_ADDRESS_SIZE)),\
+	      arg, b)
+
+/* This is not an arbitrary limit: the arguments which represent offsets
+   into the pattern are two bytes long.  So if 2^16 bytes turns out to
+   be too small, many things would have to change.  */
+/* Any other compiler which, like MSC, has allocation limit below 2^16
+   bytes will have to use approach similar to what was done below for
+   MSC and drop MAX_BUF_SIZE a bit.  Otherwise you may end up
+   reallocating to 0 bytes.  Such thing is not going to work too well.
+   You have been warned!!  */
+# ifndef DEFINED_ONCE
+#  if defined _MSC_VER  && !defined WIN32
+/* Microsoft C 16-bit versions limit malloc to approx 65512 bytes.
+   The REALLOC define eliminates a flurry of conversion warnings,
+   but is not required. */
+#   define MAX_BUF_SIZE  65500L
+#   define REALLOC(p,s) realloc ((p), (size_t) (s))
+#  else
+#   define MAX_BUF_SIZE (1L << 16)
+#   define REALLOC(p,s) realloc ((p), (s))
+#  endif
+
+/* Extend the buffer by twice its current size via realloc and
+   reset the pointers that pointed into the old block to point to the
+   correct places in the new one.  If extending the buffer results in it
+   being larger than MAX_BUF_SIZE, then flag memory exhausted.  */
+#  if __BOUNDED_POINTERS__
+#   define SET_HIGH_BOUND(P) (__ptrhigh (P) = __ptrlow (P) + bufp->allocated)
+#   define MOVE_BUFFER_POINTER(P) \
+  (__ptrlow (P) += incr, SET_HIGH_BOUND (P), __ptrvalue (P) += incr)
+#   define ELSE_EXTEND_BUFFER_HIGH_BOUND	\
+  else						\
+    {						\
+      SET_HIGH_BOUND (b);			\
+      SET_HIGH_BOUND (begalt);			\
+      if (fixup_alt_jump)			\
+	SET_HIGH_BOUND (fixup_alt_jump);	\
+      if (laststart)				\
+	SET_HIGH_BOUND (laststart);		\
+      if (pending_exact)			\
+	SET_HIGH_BOUND (pending_exact);		\
+    }
+#  else
+#   define MOVE_BUFFER_POINTER(P) (P) += incr
+#   define ELSE_EXTEND_BUFFER_HIGH_BOUND
+#  endif
+# endif /* not DEFINED_ONCE */
+
+# ifdef WCHAR
+#  define EXTEND_BUFFER()						\
+  do {									\
+    UCHAR_T *old_buffer = COMPILED_BUFFER_VAR;				\
+    int wchar_count;							\
+    if (bufp->allocated + sizeof(UCHAR_T) > MAX_BUF_SIZE)		\
+      return REG_ESIZE;							\
+    bufp->allocated <<= 1;						\
+    if (bufp->allocated > MAX_BUF_SIZE)					\
+      bufp->allocated = MAX_BUF_SIZE;					\
+    /* How many characters the new buffer can have?  */			\
+    wchar_count = bufp->allocated / sizeof(UCHAR_T);			\
+    if (wchar_count == 0) wchar_count = 1;				\
+    /* Truncate the buffer to CHAR_T align.  */			\
+    bufp->allocated = wchar_count * sizeof(UCHAR_T);			\
+    RETALLOC (COMPILED_BUFFER_VAR, wchar_count, UCHAR_T);		\
+    bufp->buffer = (char*)COMPILED_BUFFER_VAR;				\
+    if (COMPILED_BUFFER_VAR == NULL)					\
+      return REG_ESPACE;						\
+    /* If the buffer moved, move all the pointers into it.  */		\
+    if (old_buffer != COMPILED_BUFFER_VAR)				\
+      {									\
+	int incr = COMPILED_BUFFER_VAR - old_buffer;			\
+	MOVE_BUFFER_POINTER (b);					\
+	MOVE_BUFFER_POINTER (begalt);					\
+	if (fixup_alt_jump)						\
+	  MOVE_BUFFER_POINTER (fixup_alt_jump);				\
+	if (laststart)							\
+	  MOVE_BUFFER_POINTER (laststart);				\
+	if (pending_exact)						\
+	  MOVE_BUFFER_POINTER (pending_exact);				\
+      }									\
+    ELSE_EXTEND_BUFFER_HIGH_BOUND					\
+  } while (0)
+# else /* BYTE */
+#  define EXTEND_BUFFER()						\
+  do {									\
+    UCHAR_T *old_buffer = COMPILED_BUFFER_VAR;				\
+    if (bufp->allocated == MAX_BUF_SIZE)				\
+      return REG_ESIZE;							\
+    bufp->allocated <<= 1;						\
+    if (bufp->allocated > MAX_BUF_SIZE)					\
+      bufp->allocated = MAX_BUF_SIZE;					\
+    bufp->buffer = (UCHAR_T *) REALLOC (COMPILED_BUFFER_VAR,		\
+						bufp->allocated);	\
+    if (COMPILED_BUFFER_VAR == NULL)					\
+      return REG_ESPACE;						\
+    /* If the buffer moved, move all the pointers into it.  */		\
+    if (old_buffer != COMPILED_BUFFER_VAR)				\
+      {									\
+	int incr = COMPILED_BUFFER_VAR - old_buffer;			\
+	MOVE_BUFFER_POINTER (b);					\
+	MOVE_BUFFER_POINTER (begalt);					\
+	if (fixup_alt_jump)						\
+	  MOVE_BUFFER_POINTER (fixup_alt_jump);				\
+	if (laststart)							\
+	  MOVE_BUFFER_POINTER (laststart);				\
+	if (pending_exact)						\
+	  MOVE_BUFFER_POINTER (pending_exact);				\
+      }									\
+    ELSE_EXTEND_BUFFER_HIGH_BOUND					\
+  } while (0)
+# endif /* WCHAR */
+
+# ifndef DEFINED_ONCE
+/* Since we have one byte reserved for the register number argument to
+   {start,stop}_memory, the maximum number of groups we can report
+   things about is what fits in that byte.  */
+#  define MAX_REGNUM 255
+
+/* But patterns can have more than `MAX_REGNUM' registers.  We just
+   ignore the excess.  */
+typedef unsigned regnum_t;
+
+
+/* Macros for the compile stack.  */
+
+/* Since offsets can go either forwards or backwards, this type needs to
+   be able to hold values from -(MAX_BUF_SIZE - 1) to MAX_BUF_SIZE - 1.  */
+/* int may be not enough when sizeof(int) == 2.  */
+typedef long pattern_offset_t;
+
+typedef struct
+{
+  pattern_offset_t begalt_offset;
+  pattern_offset_t fixup_alt_jump;
+  pattern_offset_t inner_group_offset;
+  pattern_offset_t laststart_offset;
+  regnum_t regnum;
+} compile_stack_elt_t;
+
+
+typedef struct
+{
+  compile_stack_elt_t *stack;
+  unsigned size;
+  unsigned avail;			/* Offset of next open position.  */
+} compile_stack_type;
+
+
+#  define INIT_COMPILE_STACK_SIZE 32
+
+#  define COMPILE_STACK_EMPTY  (compile_stack.avail == 0)
+#  define COMPILE_STACK_FULL  (compile_stack.avail == compile_stack.size)
+
+/* The next available element.  */
+#  define COMPILE_STACK_TOP (compile_stack.stack[compile_stack.avail])
+
+# endif /* not DEFINED_ONCE */
+
+/* Set the bit for character C in a list.  */
+# ifndef DEFINED_ONCE
+#  define SET_LIST_BIT(c)                               \
+  (b[((unsigned char) (c)) / BYTEWIDTH]               \
+   |= 1 << (((unsigned char) c) % BYTEWIDTH))
+# endif /* DEFINED_ONCE */
+
+/* Get the next unsigned number in the uncompiled pattern.  */
+# define GET_UNSIGNED_NUMBER(num) \
+  {									\
+    while (p != pend)							\
+      {									\
+	PATFETCH (c);							\
+	if (c < '0' || c > '9')						\
+	  break;							\
+	if (num <= RE_DUP_MAX)						\
+	  {								\
+	    if (num < 0)						\
+	      num = 0;							\
+	    num = num * 10 + c - '0';					\
+	  }								\
+      }									\
+  }
+
+# ifndef DEFINED_ONCE
+#  if defined _LIBC || WIDE_CHAR_SUPPORT
+/* The GNU C library provides support for user-defined character classes
+   and the functions from ISO C amendement 1.  */
+#   ifdef CHARCLASS_NAME_MAX
+#    define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX
+#   else
+/* This shouldn't happen but some implementation might still have this
+   problem.  Use a reasonable default value.  */
+#    define CHAR_CLASS_MAX_LENGTH 256
+#   endif
+
+#   ifdef _LIBC
+#    define IS_CHAR_CLASS(string) __wctype (string)
+#   else
+#    define IS_CHAR_CLASS(string) wctype (string)
+#   endif
+#  else
+#   define CHAR_CLASS_MAX_LENGTH  6 /* Namely, `xdigit'.  */
+
+#   define IS_CHAR_CLASS(string)					\
+   (STREQ (string, "alpha") || STREQ (string, "upper")			\
+    || STREQ (string, "lower") || STREQ (string, "digit")		\
+    || STREQ (string, "alnum") || STREQ (string, "xdigit")		\
+    || STREQ (string, "space") || STREQ (string, "print")		\
+    || STREQ (string, "punct") || STREQ (string, "graph")		\
+    || STREQ (string, "cntrl") || STREQ (string, "blank"))
+#  endif
+# endif /* DEFINED_ONCE */
+
+# ifndef MATCH_MAY_ALLOCATE
+
+/* If we cannot allocate large objects within re_match_2_internal,
+   we make the fail stack and register vectors global.
+   The fail stack, we grow to the maximum size when a regexp
+   is compiled.
+   The register vectors, we adjust in size each time we
+   compile a regexp, according to the number of registers it needs.  */
+
+static PREFIX(fail_stack_type) fail_stack;
+
+/* Size with which the following vectors are currently allocated.
+   That is so we can make them bigger as needed,
+   but never make them smaller.  */
+#  ifdef DEFINED_ONCE
+static int regs_allocated_size;
+
+static const char **     regstart, **     regend;
+static const char ** old_regstart, ** old_regend;
+static const char **best_regstart, **best_regend;
+static const char **reg_dummy;
+#  endif /* DEFINED_ONCE */
+
+static PREFIX(register_info_type) *PREFIX(reg_info);
+static PREFIX(register_info_type) *PREFIX(reg_info_dummy);
+
+/* Make the register vectors big enough for NUM_REGS registers,
+   but don't make them smaller.  */
+
+static void
+PREFIX(regex_grow_registers) (int num_regs)
+{
+  if (num_regs > regs_allocated_size)
+    {
+      RETALLOC_IF (regstart,	 num_regs, const char *);
+      RETALLOC_IF (regend,	 num_regs, const char *);
+      RETALLOC_IF (old_regstart, num_regs, const char *);
+      RETALLOC_IF (old_regend,	 num_regs, const char *);
+      RETALLOC_IF (best_regstart, num_regs, const char *);
+      RETALLOC_IF (best_regend,	 num_regs, const char *);
+      RETALLOC_IF (PREFIX(reg_info), num_regs, PREFIX(register_info_type));
+      RETALLOC_IF (reg_dummy,	 num_regs, const char *);
+      RETALLOC_IF (PREFIX(reg_info_dummy), num_regs, PREFIX(register_info_type));
+
+      regs_allocated_size = num_regs;
+    }
+}
+
+# endif /* not MATCH_MAY_ALLOCATE */
+
+# ifndef DEFINED_ONCE
+static boolean group_in_compile_stack (compile_stack_type compile_stack,
+                                       regnum_t regnum);
+# endif /* not DEFINED_ONCE */
+
+/* `regex_compile' compiles PATTERN (of length SIZE) according to SYNTAX.
+   Returns one of error codes defined in `regex.h', or zero for success.
+
+   Assumes the `allocated' (and perhaps `buffer') and `translate'
+   fields are set in BUFP on entry.
+
+   If it succeeds, results are put in BUFP (if it returns an error, the
+   contents of BUFP are undefined):
+     `buffer' is the compiled pattern;
+     `syntax' is set to SYNTAX;
+     `used' is set to the length of the compiled pattern;
+     `fastmap_accurate' is zero;
+     `re_nsub' is the number of subexpressions in PATTERN;
+     `not_bol' and `not_eol' are zero;
+
+   The `fastmap' and `newline_anchor' fields are neither
+   examined nor set.  */
+
+/* Return, freeing storage we allocated.  */
+# ifdef WCHAR
+#  define FREE_STACK_RETURN(value)		\
+  return (free(pattern), free(mbs_offset), free(is_binary), free (compile_stack.stack), value)
+# else
+#  define FREE_STACK_RETURN(value)		\
+  return (free (compile_stack.stack), value)
+# endif /* WCHAR */
+
+static reg_errcode_t
+PREFIX(regex_compile) (const char *ARG_PREFIX(pattern),
+                       size_t ARG_PREFIX(size), reg_syntax_t syntax,
+                       struct re_pattern_buffer *bufp)
+{
+  /* We fetch characters from PATTERN here.  Even though PATTERN is
+     `char *' (i.e., signed), we declare these variables as unsigned, so
+     they can be reliably used as array indices.  */
+  register UCHAR_T c, c1;
+
+#ifdef WCHAR
+  /* A temporary space to keep wchar_t pattern and compiled pattern.  */
+  CHAR_T *pattern, *COMPILED_BUFFER_VAR;
+  size_t size;
+  /* offset buffer for optimization. See convert_mbs_to_wc.  */
+  int *mbs_offset = NULL;
+  /* It hold whether each wchar_t is binary data or not.  */
+  char *is_binary = NULL;
+  /* A flag whether exactn is handling binary data or not.  */
+  char is_exactn_bin = FALSE;
+#endif /* WCHAR */
+
+  /* A random temporary spot in PATTERN.  */
+  const CHAR_T *p1;
+
+  /* Points to the end of the buffer, where we should append.  */
+  register UCHAR_T *b;
+
+  /* Keeps track of unclosed groups.  */
+  compile_stack_type compile_stack;
+
+  /* Points to the current (ending) position in the pattern.  */
+#ifdef WCHAR
+  const CHAR_T *p;
+  const CHAR_T *pend;
+#else /* BYTE */
+  const CHAR_T *p = pattern;
+  const CHAR_T *pend = pattern + size;
+#endif /* WCHAR */
+
+  /* How to translate the characters in the pattern.  */
+  RE_TRANSLATE_TYPE translate = bufp->translate;
+
+  /* Address of the count-byte of the most recently inserted `exactn'
+     command.  This makes it possible to tell if a new exact-match
+     character can be added to that command or if the character requires
+     a new `exactn' command.  */
+  UCHAR_T *pending_exact = 0;
+
+  /* Address of start of the most recently finished expression.
+     This tells, e.g., postfix * where to find the start of its
+     operand.  Reset at the beginning of groups and alternatives.  */
+  UCHAR_T *laststart = 0;
+
+  /* Address of beginning of regexp, or inside of last group.  */
+  UCHAR_T *begalt;
+
+  /* Address of the place where a forward jump should go to the end of
+     the containing expression.  Each alternative of an `or' -- except the
+     last -- ends with a forward jump of this sort.  */
+  UCHAR_T *fixup_alt_jump = 0;
+
+  /* Counts open-groups as they are encountered.  Remembered for the
+     matching close-group on the compile stack, so the same register
+     number is put in the stop_memory as the start_memory.  */
+  regnum_t regnum = 0;
+
+#ifdef WCHAR
+  /* Initialize the wchar_t PATTERN and offset_buffer.  */
+  p = pend = pattern = TALLOC(csize + 1, CHAR_T);
+  mbs_offset = TALLOC(csize + 1, int);
+  is_binary = TALLOC(csize + 1, char);
+  if (pattern == NULL || mbs_offset == NULL || is_binary == NULL)
+    {
+      free(pattern);
+      free(mbs_offset);
+      free(is_binary);
+      return REG_ESPACE;
+    }
+  pattern[csize] = L'\0';	/* sentinel */
+  size = convert_mbs_to_wcs(pattern, cpattern, csize, mbs_offset, is_binary);
+  pend = p + size;
+  if (size < 0)
+    {
+      free(pattern);
+      free(mbs_offset);
+      free(is_binary);
+      return REG_BADPAT;
+    }
+#endif
+
+#ifdef DEBUG
+  DEBUG_PRINT1 ("\nCompiling pattern: ");
+  if (debug)
+    {
+      unsigned debug_count;
+
+      for (debug_count = 0; debug_count < size; debug_count++)
+        PUT_CHAR (pattern[debug_count]);
+      putchar ('\n');
+    }
+#endif /* DEBUG */
+
+  /* Initialize the compile stack.  */
+  compile_stack.stack = TALLOC (INIT_COMPILE_STACK_SIZE, compile_stack_elt_t);
+  if (compile_stack.stack == NULL)
+    {
+#ifdef WCHAR
+      free(pattern);
+      free(mbs_offset);
+      free(is_binary);
+#endif
+      return REG_ESPACE;
+    }
+
+  compile_stack.size = INIT_COMPILE_STACK_SIZE;
+  compile_stack.avail = 0;
+
+  /* Initialize the pattern buffer.  */
+  bufp->syntax = syntax;
+  bufp->fastmap_accurate = 0;
+  bufp->not_bol = bufp->not_eol = 0;
+
+  /* Set `used' to zero, so that if we return an error, the pattern
+     printer (for debugging) will think there's no pattern.  We reset it
+     at the end.  */
+  bufp->used = 0;
+
+  /* Always count groups, whether or not bufp->no_sub is set.  */
+  bufp->re_nsub = 0;
+
+#if !defined emacs && !defined SYNTAX_TABLE
+  /* Initialize the syntax table.  */
+   init_syntax_once ();
+#endif
+
+  if (bufp->allocated == 0)
+    {
+      if (bufp->buffer)
+	{ /* If zero allocated, but buffer is non-null, try to realloc
+             enough space.  This loses if buffer's address is bogus, but
+             that is the user's responsibility.  */
+#ifdef WCHAR
+	  /* Free bufp->buffer and allocate an array for wchar_t pattern
+	     buffer.  */
+          free(bufp->buffer);
+          COMPILED_BUFFER_VAR = TALLOC (INIT_BUF_SIZE/sizeof(UCHAR_T),
+					UCHAR_T);
+#else
+          RETALLOC (COMPILED_BUFFER_VAR, INIT_BUF_SIZE, UCHAR_T);
+#endif /* WCHAR */
+        }
+      else
+        { /* Caller did not allocate a buffer.  Do it for them.  */
+          COMPILED_BUFFER_VAR = TALLOC (INIT_BUF_SIZE / sizeof(UCHAR_T),
+					UCHAR_T);
+        }
+
+      if (!COMPILED_BUFFER_VAR) FREE_STACK_RETURN (REG_ESPACE);
+#ifdef WCHAR
+      bufp->buffer = (char*)COMPILED_BUFFER_VAR;
+#endif /* WCHAR */
+      bufp->allocated = INIT_BUF_SIZE;
+    }
+#ifdef WCHAR
+  else
+    COMPILED_BUFFER_VAR = (UCHAR_T*) bufp->buffer;
+#endif
+
+  begalt = b = COMPILED_BUFFER_VAR;
+
+  /* Loop through the uncompiled pattern until we're at the end.  */
+  while (p != pend)
+    {
+      PATFETCH (c);
+
+      switch (c)
+        {
+        case '^':
+          {
+            if (   /* If at start of pattern, it's an operator.  */
+                   p == pattern + 1
+                   /* If context independent, it's an operator.  */
+                || syntax & RE_CONTEXT_INDEP_ANCHORS
+                   /* Otherwise, depends on what's come before.  */
+                || PREFIX(at_begline_loc_p) (pattern, p, syntax))
+              BUF_PUSH (begline);
+            else
+              goto normal_char;
+          }
+          break;
+
+
+        case '$':
+          {
+            if (   /* If at end of pattern, it's an operator.  */
+                   p == pend
+                   /* If context independent, it's an operator.  */
+                || syntax & RE_CONTEXT_INDEP_ANCHORS
+                   /* Otherwise, depends on what's next.  */
+                || PREFIX(at_endline_loc_p) (p, pend, syntax))
+               BUF_PUSH (endline);
+             else
+               goto normal_char;
+           }
+           break;
+
+
+	case '+':
+        case '?':
+          if ((syntax & RE_BK_PLUS_QM)
+              || (syntax & RE_LIMITED_OPS))
+            goto normal_char;
+        handle_plus:
+        case '*':
+          /* If there is no previous pattern... */
+          if (!laststart)
+            {
+              if (syntax & RE_CONTEXT_INVALID_OPS)
+                FREE_STACK_RETURN (REG_BADRPT);
+              else if (!(syntax & RE_CONTEXT_INDEP_OPS))
+                goto normal_char;
+            }
+
+          {
+            /* Are we optimizing this jump?  */
+            boolean keep_string_p = false;
+
+            /* 1 means zero (many) matches is allowed.  */
+            char zero_times_ok = 0, many_times_ok = 0;
+
+            /* If there is a sequence of repetition chars, collapse it
+               down to just one (the right one).  We can't combine
+               interval operators with these because of, e.g., `a{2}*',
+               which should only match an even number of `a's.  */
+
+            for (;;)
+              {
+                zero_times_ok |= c != '+';
+                many_times_ok |= c != '?';
+
+                if (p == pend)
+                  break;
+
+                PATFETCH (c);
+
+                if (c == '*'
+                    || (!(syntax & RE_BK_PLUS_QM) && (c == '+' || c == '?')))
+                  ;
+
+                else if (syntax & RE_BK_PLUS_QM  &&  c == '\\')
+                  {
+                    if (p == pend) FREE_STACK_RETURN (REG_EESCAPE);
+
+                    PATFETCH (c1);
+                    if (!(c1 == '+' || c1 == '?'))
+                      {
+                        PATUNFETCH;
+                        PATUNFETCH;
+                        break;
+                      }
+
+                    c = c1;
+                  }
+                else
+                  {
+                    PATUNFETCH;
+                    break;
+                  }
+
+                /* If we get here, we found another repeat character.  */
+               }
+
+            /* Star, etc. applied to an empty pattern is equivalent
+               to an empty pattern.  */
+            if (!laststart)
+              break;
+
+            /* Now we know whether or not zero matches is allowed
+               and also whether or not two or more matches is allowed.  */
+            if (many_times_ok)
+              { /* More than one repetition is allowed, so put in at the
+                   end a backward relative jump from `b' to before the next
+                   jump we're going to put in below (which jumps from
+                   laststart to after this jump).
+
+                   But if we are at the `*' in the exact sequence `.*\n',
+                   insert an unconditional jump backwards to the .,
+                   instead of the beginning of the loop.  This way we only
+                   push a failure point once, instead of every time
+                   through the loop.  */
+                assert (p - 1 > pattern);
+
+                /* Allocate the space for the jump.  */
+                GET_BUFFER_SPACE (1 + OFFSET_ADDRESS_SIZE);
+
+                /* We know we are not at the first character of the pattern,
+                   because laststart was nonzero.  And we've already
+                   incremented `p', by the way, to be the character after
+                   the `*'.  Do we have to do something analogous here
+                   for null bytes, because of RE_DOT_NOT_NULL?  */
+                if (TRANSLATE (*(p - 2)) == TRANSLATE ('.')
+		    && zero_times_ok
+                    && p < pend && TRANSLATE (*p) == TRANSLATE ('\n')
+                    && !(syntax & RE_DOT_NEWLINE))
+                  { /* We have .*\n.  */
+                    STORE_JUMP (jump, b, laststart);
+                    keep_string_p = true;
+                  }
+                else
+                  /* Anything else.  */
+                  STORE_JUMP (maybe_pop_jump, b, laststart -
+			      (1 + OFFSET_ADDRESS_SIZE));
+
+                /* We've added more stuff to the buffer.  */
+                b += 1 + OFFSET_ADDRESS_SIZE;
+              }
+
+            /* On failure, jump from laststart to b + 3, which will be the
+               end of the buffer after this jump is inserted.  */
+	    /* ifdef WCHAR, 'b + 1 + OFFSET_ADDRESS_SIZE' instead of
+	       'b + 3'.  */
+            GET_BUFFER_SPACE (1 + OFFSET_ADDRESS_SIZE);
+            INSERT_JUMP (keep_string_p ? on_failure_keep_string_jump
+                                       : on_failure_jump,
+                         laststart, b + 1 + OFFSET_ADDRESS_SIZE);
+            pending_exact = 0;
+            b += 1 + OFFSET_ADDRESS_SIZE;
+
+            if (!zero_times_ok)
+              {
+                /* At least one repetition is required, so insert a
+                   `dummy_failure_jump' before the initial
+                   `on_failure_jump' instruction of the loop. This
+                   effects a skip over that instruction the first time
+                   we hit that loop.  */
+                GET_BUFFER_SPACE (1 + OFFSET_ADDRESS_SIZE);
+                INSERT_JUMP (dummy_failure_jump, laststart, laststart +
+			     2 + 2 * OFFSET_ADDRESS_SIZE);
+                b += 1 + OFFSET_ADDRESS_SIZE;
+              }
+            }
+	  break;
+
+
+	case '.':
+          laststart = b;
+          BUF_PUSH (anychar);
+          break;
+
+
+        case '[':
+          {
+            boolean had_char_class = false;
+#ifdef WCHAR
+	    CHAR_T range_start = 0xffffffff;
+#else
+	    unsigned int range_start = 0xffffffff;
+#endif
+            if (p == pend) FREE_STACK_RETURN (REG_EBRACK);
+
+#ifdef WCHAR
+	    /* We assume a charset(_not) structure as a wchar_t array.
+	       charset[0] = (re_opcode_t) charset(_not)
+               charset[1] = l (= length of char_classes)
+               charset[2] = m (= length of collating_symbols)
+               charset[3] = n (= length of equivalence_classes)
+	       charset[4] = o (= length of char_ranges)
+	       charset[5] = p (= length of chars)
+
+               charset[6] = char_class (wctype_t)
+               charset[6+CHAR_CLASS_SIZE] = char_class (wctype_t)
+                         ...
+               charset[l+5]  = char_class (wctype_t)
+
+               charset[l+6]  = collating_symbol (wchar_t)
+                            ...
+               charset[l+m+5]  = collating_symbol (wchar_t)
+					ifdef _LIBC we use the index if
+					_NL_COLLATE_SYMB_EXTRAMB instead of
+					wchar_t string.
+
+               charset[l+m+6]  = equivalence_classes (wchar_t)
+                              ...
+               charset[l+m+n+5]  = equivalence_classes (wchar_t)
+					ifdef _LIBC we use the index in
+					_NL_COLLATE_WEIGHT instead of
+					wchar_t string.
+
+	       charset[l+m+n+6] = range_start
+	       charset[l+m+n+7] = range_end
+	                       ...
+	       charset[l+m+n+2o+4] = range_start
+	       charset[l+m+n+2o+5] = range_end
+					ifdef _LIBC we use the value looked up
+					in _NL_COLLATE_COLLSEQ instead of
+					wchar_t character.
+
+	       charset[l+m+n+2o+6] = char
+	                          ...
+	       charset[l+m+n+2o+p+5] = char
+
+	     */
+
+	    /* We need at least 6 spaces: the opcode, the length of
+               char_classes, the length of collating_symbols, the length of
+               equivalence_classes, the length of char_ranges, the length of
+               chars.  */
+	    GET_BUFFER_SPACE (6);
+
+	    /* Save b as laststart. And We use laststart as the pointer
+	       to the first element of the charset here.
+	       In other words, laststart[i] indicates charset[i].  */
+            laststart = b;
+
+            /* We test `*p == '^' twice, instead of using an if
+               statement, so we only need one BUF_PUSH.  */
+            BUF_PUSH (*p == '^' ? charset_not : charset);
+            if (*p == '^')
+              p++;
+
+            /* Push the length of char_classes, the length of
+               collating_symbols, the length of equivalence_classes, the
+               length of char_ranges and the length of chars.  */
+            BUF_PUSH_3 (0, 0, 0);
+            BUF_PUSH_2 (0, 0);
+
+            /* Remember the first position in the bracket expression.  */
+            p1 = p;
+
+            /* charset_not matches newline according to a syntax bit.  */
+            if ((re_opcode_t) b[-6] == charset_not
+                && (syntax & RE_HAT_LISTS_NOT_NEWLINE))
+	      {
+		BUF_PUSH('\n');
+		laststart[5]++; /* Update the length of characters  */
+	      }
+
+            /* Read in characters and ranges, setting map bits.  */
+            for (;;)
+              {
+                if (p == pend) FREE_STACK_RETURN (REG_EBRACK);
+
+                PATFETCH (c);
+
+                /* \ might escape characters inside [...] and [^...].  */
+                if ((syntax & RE_BACKSLASH_ESCAPE_IN_LISTS) && c == '\\')
+                  {
+                    if (p == pend) FREE_STACK_RETURN (REG_EESCAPE);
+
+                    PATFETCH (c1);
+		    BUF_PUSH(c1);
+		    laststart[5]++; /* Update the length of chars  */
+		    range_start = c1;
+                    continue;
+                  }
+
+                /* Could be the end of the bracket expression.  If it's
+                   not (i.e., when the bracket expression is `[]' so
+                   far), the ']' character bit gets set way below.  */
+                if (c == ']' && p != p1 + 1)
+                  break;
+
+                /* Look ahead to see if it's a range when the last thing
+                   was a character class.  */
+                if (had_char_class && c == '-' && *p != ']')
+                  FREE_STACK_RETURN (REG_ERANGE);
+
+                /* Look ahead to see if it's a range when the last thing
+                   was a character: if this is a hyphen not at the
+                   beginning or the end of a list, then it's the range
+                   operator.  */
+                if (c == '-'
+                    && !(p - 2 >= pattern && p[-2] == '[')
+                    && !(p - 3 >= pattern && p[-3] == '[' && p[-2] == '^')
+                    && *p != ']')
+                  {
+                    reg_errcode_t ret;
+		    /* Allocate the space for range_start and range_end.  */
+		    GET_BUFFER_SPACE (2);
+		    /* Update the pointer to indicate end of buffer.  */
+                    b += 2;
+                    ret = wcs_compile_range (range_start, &p, pend, translate,
+                                         syntax, b, laststart);
+                    if (ret != REG_NOERROR) FREE_STACK_RETURN (ret);
+                    range_start = 0xffffffff;
+                  }
+                else if (p[0] == '-' && p[1] != ']')
+                  { /* This handles ranges made up of characters only.  */
+                    reg_errcode_t ret;
+
+		    /* Move past the `-'.  */
+                    PATFETCH (c1);
+		    /* Allocate the space for range_start and range_end.  */
+		    GET_BUFFER_SPACE (2);
+		    /* Update the pointer to indicate end of buffer.  */
+                    b += 2;
+                    ret = wcs_compile_range (c, &p, pend, translate, syntax, b,
+                                         laststart);
+                    if (ret != REG_NOERROR) FREE_STACK_RETURN (ret);
+		    range_start = 0xffffffff;
+                  }
+
+                /* See if we're at the beginning of a possible character
+                   class.  */
+                else if (syntax & RE_CHAR_CLASSES && c == '[' && *p == ':')
+                  { /* Leave room for the null.  */
+                    char str[CHAR_CLASS_MAX_LENGTH + 1];
+
+                    PATFETCH (c);
+                    c1 = 0;
+
+                    /* If pattern is `[[:'.  */
+                    if (p == pend) FREE_STACK_RETURN (REG_EBRACK);
+
+                    for (;;)
+                      {
+                        PATFETCH (c);
+                        if ((c == ':' && *p == ']') || p == pend)
+                          break;
+			if (c1 < CHAR_CLASS_MAX_LENGTH)
+			  str[c1++] = c;
+			else
+			  /* This is in any case an invalid class name.  */
+			  str[0] = '\0';
+                      }
+                    str[c1] = '\0';
+
+                    /* If isn't a word bracketed by `[:' and `:]':
+                       undo the ending character, the letters, and leave
+                       the leading `:' and `[' (but store them as character).  */
+                    if (c == ':' && *p == ']')
+                      {
+			wctype_t wt;
+			uintptr_t alignedp;
+
+			/* Query the character class as wctype_t.  */
+			wt = IS_CHAR_CLASS (str);
+			if (wt == 0)
+			  FREE_STACK_RETURN (REG_ECTYPE);
+
+                        /* Throw away the ] at the end of the character
+                           class.  */
+                        PATFETCH (c);
+
+                        if (p == pend) FREE_STACK_RETURN (REG_EBRACK);
+
+			/* Allocate the space for character class.  */
+                        GET_BUFFER_SPACE(CHAR_CLASS_SIZE);
+			/* Update the pointer to indicate end of buffer.  */
+                        b += CHAR_CLASS_SIZE;
+			/* Move data which follow character classes
+			    not to violate the data.  */
+                        insert_space(CHAR_CLASS_SIZE,
+				     laststart + 6 + laststart[1],
+				     b - 1);
+			alignedp = ((uintptr_t)(laststart + 6 + laststart[1])
+				    + __alignof__(wctype_t) - 1)
+			  	    & ~(uintptr_t)(__alignof__(wctype_t) - 1);
+			/* Store the character class.  */
+                        *((wctype_t*)alignedp) = wt;
+                        /* Update length of char_classes */
+                        laststart[1] += CHAR_CLASS_SIZE;
+
+                        had_char_class = true;
+                      }
+                    else
+                      {
+                        c1++;
+                        while (c1--)
+                          PATUNFETCH;
+                        BUF_PUSH ('[');
+                        BUF_PUSH (':');
+                        laststart[5] += 2; /* Update the length of characters  */
+			range_start = ':';
+                        had_char_class = false;
+                      }
+                  }
+                else if (syntax & RE_CHAR_CLASSES && c == '[' && (*p == '='
+							  || *p == '.'))
+		  {
+		    CHAR_T str[128];	/* Should be large enough.  */
+		    CHAR_T delim = *p; /* '=' or '.'  */
+# ifdef _LIBC
+		    uint32_t nrules =
+		      _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
+# endif
+		    PATFETCH (c);
+		    c1 = 0;
+
+		    /* If pattern is `[[=' or '[[.'.  */
+		    if (p == pend) FREE_STACK_RETURN (REG_EBRACK);
+
+		    for (;;)
+		      {
+			PATFETCH (c);
+			if ((c == delim && *p == ']') || p == pend)
+			  break;
+			if (c1 < sizeof (str) - 1)
+			  str[c1++] = c;
+			else
+			  /* This is in any case an invalid class name.  */
+			  str[0] = '\0';
+                      }
+		    str[c1] = '\0';
+
+		    if (c == delim && *p == ']' && str[0] != '\0')
+		      {
+                        unsigned int i, offset;
+			/* If we have no collation data we use the default
+			   collation in which each character is in a class
+			   by itself.  It also means that ASCII is the
+			   character set and therefore we cannot have character
+			   with more than one byte in the multibyte
+			   representation.  */
+
+                        /* If not defined _LIBC, we push the name and
+			   `\0' for the sake of matching performance.  */
+			int datasize = c1 + 1;
+
+# ifdef _LIBC
+			int32_t idx = 0;
+			if (nrules == 0)
+# endif
+			  {
+			    if (c1 != 1)
+			      FREE_STACK_RETURN (REG_ECOLLATE);
+			  }
+# ifdef _LIBC
+			else
+			  {
+			    const int32_t *table;
+			    const int32_t *weights;
+			    const int32_t *extra;
+			    const int32_t *indirect;
+			    wint_t *cp;
+
+			    /* This #include defines a local function!  */
+#  include <locale/weightwc.h>
+
+			    if(delim == '=')
+			      {
+				/* We push the index for equivalence class.  */
+				cp = (wint_t*)str;
+
+				table = (const int32_t *)
+				  _NL_CURRENT (LC_COLLATE,
+					       _NL_COLLATE_TABLEWC);
+				weights = (const int32_t *)
+				  _NL_CURRENT (LC_COLLATE,
+					       _NL_COLLATE_WEIGHTWC);
+				extra = (const int32_t *)
+				  _NL_CURRENT (LC_COLLATE,
+					       _NL_COLLATE_EXTRAWC);
+				indirect = (const int32_t *)
+				  _NL_CURRENT (LC_COLLATE,
+					       _NL_COLLATE_INDIRECTWC);
+
+				idx = findidx ((const wint_t**)&cp);
+				if (idx == 0 || cp < (wint_t*) str + c1)
+				  /* This is no valid character.  */
+				  FREE_STACK_RETURN (REG_ECOLLATE);
+
+				str[0] = (wchar_t)idx;
+			      }
+			    else /* delim == '.' */
+			      {
+				/* We push collation sequence value
+				   for collating symbol.  */
+				int32_t table_size;
+				const int32_t *symb_table;
+				const unsigned char *extra;
+				int32_t idx;
+				int32_t elem;
+				int32_t second;
+				int32_t hash;
+				char char_str[c1];
+
+				/* We have to convert the name to a single-byte
+				   string.  This is possible since the names
+				   consist of ASCII characters and the internal
+				   representation is UCS4.  */
+				for (i = 0; i < c1; ++i)
+				  char_str[i] = str[i];
+
+				table_size =
+				  _NL_CURRENT_WORD (LC_COLLATE,
+						    _NL_COLLATE_SYMB_HASH_SIZEMB);
+				symb_table = (const int32_t *)
+				  _NL_CURRENT (LC_COLLATE,
+					       _NL_COLLATE_SYMB_TABLEMB);
+				extra = (const unsigned char *)
+				  _NL_CURRENT (LC_COLLATE,
+					       _NL_COLLATE_SYMB_EXTRAMB);
+
+				/* Locate the character in the hashing table.  */
+				hash = elem_hash (char_str, c1);
+
+				idx = 0;
+				elem = hash % table_size;
+				second = hash % (table_size - 2);
+				while (symb_table[2 * elem] != 0)
+				  {
+				    /* First compare the hashing value.  */
+				    if (symb_table[2 * elem] == hash
+					&& c1 == extra[symb_table[2 * elem + 1]]
+					&& memcmp (char_str,
+						   &extra[symb_table[2 * elem + 1]
+							 + 1], c1) == 0)
+				      {
+					/* Yep, this is the entry.  */
+					idx = symb_table[2 * elem + 1];
+					idx += 1 + extra[idx];
+					break;
+				      }
+
+				    /* Next entry.  */
+				    elem += second;
+				  }
+
+				if (symb_table[2 * elem] != 0)
+				  {
+				    /* Compute the index of the byte sequence
+				       in the table.  */
+				    idx += 1 + extra[idx];
+				    /* Adjust for the alignment.  */
+				    idx = (idx + 3) & ~3;
+
+				    str[0] = (wchar_t) idx + 4;
+				  }
+				else if (symb_table[2 * elem] == 0 && c1 == 1)
+				  {
+				    /* No valid character.  Match it as a
+				       single byte character.  */
+				    had_char_class = false;
+				    BUF_PUSH(str[0]);
+				    /* Update the length of characters  */
+				    laststart[5]++;
+				    range_start = str[0];
+
+				    /* Throw away the ] at the end of the
+				       collating symbol.  */
+				    PATFETCH (c);
+				    /* exit from the switch block.  */
+				    continue;
+				  }
+				else
+				  FREE_STACK_RETURN (REG_ECOLLATE);
+			      }
+			    datasize = 1;
+			  }
+# endif
+                        /* Throw away the ] at the end of the equivalence
+                           class (or collating symbol).  */
+                        PATFETCH (c);
+
+			/* Allocate the space for the equivalence class
+			   (or collating symbol) (and '\0' if needed).  */
+                        GET_BUFFER_SPACE(datasize);
+			/* Update the pointer to indicate end of buffer.  */
+                        b += datasize;
+
+			if (delim == '=')
+			  { /* equivalence class  */
+			    /* Calculate the offset of char_ranges,
+			       which is next to equivalence_classes.  */
+			    offset = laststart[1] + laststart[2]
+			      + laststart[3] +6;
+			    /* Insert space.  */
+			    insert_space(datasize, laststart + offset, b - 1);
+
+			    /* Write the equivalence_class and \0.  */
+			    for (i = 0 ; i < datasize ; i++)
+			      laststart[offset + i] = str[i];
+
+			    /* Update the length of equivalence_classes.  */
+			    laststart[3] += datasize;
+			    had_char_class = true;
+			  }
+			else /* delim == '.' */
+			  { /* collating symbol  */
+			    /* Calculate the offset of the equivalence_classes,
+			       which is next to collating_symbols.  */
+			    offset = laststart[1] + laststart[2] + 6;
+			    /* Insert space and write the collationg_symbol
+			       and \0.  */
+			    insert_space(datasize, laststart + offset, b-1);
+			    for (i = 0 ; i < datasize ; i++)
+			      laststart[offset + i] = str[i];
+
+			    /* In re_match_2_internal if range_start < -1, we
+			       assume -range_start is the offset of the
+			       collating symbol which is specified as
+			       the character of the range start.  So we assign
+			       -(laststart[1] + laststart[2] + 6) to
+			       range_start.  */
+			    range_start = -(laststart[1] + laststart[2] + 6);
+			    /* Update the length of collating_symbol.  */
+			    laststart[2] += datasize;
+			    had_char_class = false;
+			  }
+		      }
+                    else
+                      {
+                        c1++;
+                        while (c1--)
+                          PATUNFETCH;
+                        BUF_PUSH ('[');
+                        BUF_PUSH (delim);
+                        laststart[5] += 2; /* Update the length of characters  */
+			range_start = delim;
+                        had_char_class = false;
+                      }
+		  }
+                else
+                  {
+                    had_char_class = false;
+		    BUF_PUSH(c);
+		    laststart[5]++;  /* Update the length of characters  */
+		    range_start = c;
+                  }
+	      }
+
+#else /* BYTE */
+            /* Ensure that we have enough space to push a charset: the
+               opcode, the length count, and the bitset; 34 bytes in all.  */
+	    GET_BUFFER_SPACE (34);
+
+            laststart = b;
+
+            /* We test `*p == '^' twice, instead of using an if
+               statement, so we only need one BUF_PUSH.  */
+            BUF_PUSH (*p == '^' ? charset_not : charset);
+            if (*p == '^')
+              p++;
+
+            /* Remember the first position in the bracket expression.  */
+            p1 = p;
+
+            /* Push the number of bytes in the bitmap.  */
+            BUF_PUSH ((1 << BYTEWIDTH) / BYTEWIDTH);
+
+            /* Clear the whole map.  */
+            bzero (b, (1 << BYTEWIDTH) / BYTEWIDTH);
+
+            /* charset_not matches newline according to a syntax bit.  */
+            if ((re_opcode_t) b[-2] == charset_not
+                && (syntax & RE_HAT_LISTS_NOT_NEWLINE))
+              SET_LIST_BIT ('\n');
+
+            /* Read in characters and ranges, setting map bits.  */
+            for (;;)
+              {
+                if (p == pend) FREE_STACK_RETURN (REG_EBRACK);
+
+                PATFETCH (c);
+
+                /* \ might escape characters inside [...] and [^...].  */
+                if ((syntax & RE_BACKSLASH_ESCAPE_IN_LISTS) && c == '\\')
+                  {
+                    if (p == pend) FREE_STACK_RETURN (REG_EESCAPE);
+
+                    PATFETCH (c1);
+                    SET_LIST_BIT (c1);
+		    range_start = c1;
+                    continue;
+                  }
+
+                /* Could be the end of the bracket expression.  If it's
+                   not (i.e., when the bracket expression is `[]' so
+                   far), the ']' character bit gets set way below.  */
+                if (c == ']' && p != p1 + 1)
+                  break;
+
+                /* Look ahead to see if it's a range when the last thing
+                   was a character class.  */
+                if (had_char_class && c == '-' && *p != ']')
+                  FREE_STACK_RETURN (REG_ERANGE);
+
+                /* Look ahead to see if it's a range when the last thing
+                   was a character: if this is a hyphen not at the
+                   beginning or the end of a list, then it's the range
+                   operator.  */
+                if (c == '-'
+                    && !(p - 2 >= pattern && p[-2] == '[')
+                    && !(p - 3 >= pattern && p[-3] == '[' && p[-2] == '^')
+                    && *p != ']')
+                  {
+                    reg_errcode_t ret
+                      = byte_compile_range (range_start, &p, pend, translate,
+					    syntax, b);
+                    if (ret != REG_NOERROR) FREE_STACK_RETURN (ret);
+		    range_start = 0xffffffff;
+                  }
+
+                else if (p[0] == '-' && p[1] != ']')
+                  { /* This handles ranges made up of characters only.  */
+                    reg_errcode_t ret;
+
+		    /* Move past the `-'.  */
+                    PATFETCH (c1);
+
+                    ret = byte_compile_range (c, &p, pend, translate, syntax, b);
+                    if (ret != REG_NOERROR) FREE_STACK_RETURN (ret);
+		    range_start = 0xffffffff;
+                  }
+
+                /* See if we're at the beginning of a possible character
+                   class.  */
+
+                else if (syntax & RE_CHAR_CLASSES && c == '[' && *p == ':')
+                  { /* Leave room for the null.  */
+                    char str[CHAR_CLASS_MAX_LENGTH + 1];
+
+                    PATFETCH (c);
+                    c1 = 0;
+
+                    /* If pattern is `[[:'.  */
+                    if (p == pend) FREE_STACK_RETURN (REG_EBRACK);
+
+                    for (;;)
+                      {
+                        PATFETCH (c);
+                        if ((c == ':' && *p == ']') || p == pend)
+                          break;
+			if (c1 < CHAR_CLASS_MAX_LENGTH)
+			  str[c1++] = c;
+			else
+			  /* This is in any case an invalid class name.  */
+			  str[0] = '\0';
+                      }
+                    str[c1] = '\0';
+
+                    /* If isn't a word bracketed by `[:' and `:]':
+                       undo the ending character, the letters, and leave
+                       the leading `:' and `[' (but set bits for them).  */
+                    if (c == ':' && *p == ']')
+                      {
+# if defined _LIBC || WIDE_CHAR_SUPPORT
+                        boolean is_lower = STREQ (str, "lower");
+                        boolean is_upper = STREQ (str, "upper");
+			wctype_t wt;
+                        int ch;
+
+			wt = IS_CHAR_CLASS (str);
+			if (wt == 0)
+			  FREE_STACK_RETURN (REG_ECTYPE);
+
+                        /* Throw away the ] at the end of the character
+                           class.  */
+                        PATFETCH (c);
+
+                        if (p == pend) FREE_STACK_RETURN (REG_EBRACK);
+
+                        for (ch = 0; ch < 1 << BYTEWIDTH; ++ch)
+			  {
+#  ifdef _LIBC
+			    if (__iswctype (__btowc (ch), wt))
+			      SET_LIST_BIT (ch);
+#  else
+			    if (iswctype (btowc (ch), wt))
+			      SET_LIST_BIT (ch);
+#  endif
+
+			    if (translate && (is_upper || is_lower)
+				&& (ISUPPER (ch) || ISLOWER (ch)))
+			      SET_LIST_BIT (ch);
+			  }
+
+                        had_char_class = true;
+# else
+                        int ch;
+                        boolean is_alnum = STREQ (str, "alnum");
+                        boolean is_alpha = STREQ (str, "alpha");
+                        boolean is_blank = STREQ (str, "blank");
+                        boolean is_cntrl = STREQ (str, "cntrl");
+                        boolean is_digit = STREQ (str, "digit");
+                        boolean is_graph = STREQ (str, "graph");
+                        boolean is_lower = STREQ (str, "lower");
+                        boolean is_print = STREQ (str, "print");
+                        boolean is_punct = STREQ (str, "punct");
+                        boolean is_space = STREQ (str, "space");
+                        boolean is_upper = STREQ (str, "upper");
+                        boolean is_xdigit = STREQ (str, "xdigit");
+
+                        if (!IS_CHAR_CLASS (str))
+			  FREE_STACK_RETURN (REG_ECTYPE);
+
+                        /* Throw away the ] at the end of the character
+                           class.  */
+                        PATFETCH (c);
+
+                        if (p == pend) FREE_STACK_RETURN (REG_EBRACK);
+
+                        for (ch = 0; ch < 1 << BYTEWIDTH; ch++)
+                          {
+			    /* This was split into 3 if's to
+			       avoid an arbitrary limit in some compiler.  */
+                            if (   (is_alnum  && ISALNUM (ch))
+                                || (is_alpha  && ISALPHA (ch))
+                                || (is_blank  && ISBLANK (ch))
+                                || (is_cntrl  && ISCNTRL (ch)))
+			      SET_LIST_BIT (ch);
+			    if (   (is_digit  && ISDIGIT (ch))
+                                || (is_graph  && ISGRAPH (ch))
+                                || (is_lower  && ISLOWER (ch))
+                                || (is_print  && ISPRINT (ch)))
+			      SET_LIST_BIT (ch);
+			    if (   (is_punct  && ISPUNCT (ch))
+                                || (is_space  && ISSPACE (ch))
+                                || (is_upper  && ISUPPER (ch))
+                                || (is_xdigit && ISXDIGIT (ch)))
+			      SET_LIST_BIT (ch);
+			    if (   translate && (is_upper || is_lower)
+				&& (ISUPPER (ch) || ISLOWER (ch)))
+			      SET_LIST_BIT (ch);
+                          }
+                        had_char_class = true;
+# endif	/* libc || wctype.h */
+                      }
+                    else
+                      {
+                        c1++;
+                        while (c1--)
+                          PATUNFETCH;
+                        SET_LIST_BIT ('[');
+                        SET_LIST_BIT (':');
+			range_start = ':';
+                        had_char_class = false;
+                      }
+                  }
+                else if (syntax & RE_CHAR_CLASSES && c == '[' && *p == '=')
+		  {
+		    unsigned char str[MB_LEN_MAX + 1];
+# ifdef _LIBC
+		    uint32_t nrules =
+		      _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
+# endif
+
+		    PATFETCH (c);
+		    c1 = 0;
+
+		    /* If pattern is `[[='.  */
+		    if (p == pend) FREE_STACK_RETURN (REG_EBRACK);
+
+		    for (;;)
+		      {
+			PATFETCH (c);
+			if ((c == '=' && *p == ']') || p == pend)
+			  break;
+			if (c1 < MB_LEN_MAX)
+			  str[c1++] = c;
+			else
+			  /* This is in any case an invalid class name.  */
+			  str[0] = '\0';
+                      }
+		    str[c1] = '\0';
+
+		    if (c == '=' && *p == ']' && str[0] != '\0')
+		      {
+			/* If we have no collation data we use the default
+			   collation in which each character is in a class
+			   by itself.  It also means that ASCII is the
+			   character set and therefore we cannot have character
+			   with more than one byte in the multibyte
+			   representation.  */
+# ifdef _LIBC
+			if (nrules == 0)
+# endif
+			  {
+			    if (c1 != 1)
+			      FREE_STACK_RETURN (REG_ECOLLATE);
+
+			    /* Throw away the ] at the end of the equivalence
+			       class.  */
+			    PATFETCH (c);
+
+			    /* Set the bit for the character.  */
+			    SET_LIST_BIT (str[0]);
+			  }
+# ifdef _LIBC
+			else
+			  {
+			    /* Try to match the byte sequence in `str' against
+			       those known to the collate implementation.
+			       First find out whether the bytes in `str' are
+			       actually from exactly one character.  */
+			    const int32_t *table;
+			    const unsigned char *weights;
+			    const unsigned char *extra;
+			    const int32_t *indirect;
+			    int32_t idx;
+			    const unsigned char *cp = str;
+			    int ch;
+
+			    /* This #include defines a local function!  */
+#  include <locale/weight.h>
+
+			    table = (const int32_t *)
+			      _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
+			    weights = (const unsigned char *)
+			      _NL_CURRENT (LC_COLLATE, _NL_COLLATE_WEIGHTMB);
+			    extra = (const unsigned char *)
+			      _NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAMB);
+			    indirect = (const int32_t *)
+			      _NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB);
+
+			    idx = findidx (&cp);
+			    if (idx == 0 || cp < str + c1)
+			      /* This is no valid character.  */
+			      FREE_STACK_RETURN (REG_ECOLLATE);
+
+			    /* Throw away the ] at the end of the equivalence
+			       class.  */
+			    PATFETCH (c);
+
+			    /* Now we have to go throught the whole table
+			       and find all characters which have the same
+			       first level weight.
+
+			       XXX Note that this is not entirely correct.
+			       we would have to match multibyte sequences
+			       but this is not possible with the current
+			       implementation.  */
+			    for (ch = 1; ch < 256; ++ch)
+			      /* XXX This test would have to be changed if we
+				 would allow matching multibyte sequences.  */
+			      if (table[ch] > 0)
+				{
+				  int32_t idx2 = table[ch];
+				  size_t len = weights[idx2];
+
+				  /* Test whether the lenghts match.  */
+				  if (weights[idx] == len)
+				    {
+				      /* They do.  New compare the bytes of
+					 the weight.  */
+				      size_t cnt = 0;
+
+				      while (cnt < len
+					     && (weights[idx + 1 + cnt]
+						 == weights[idx2 + 1 + cnt]))
+					++cnt;
+
+				      if (cnt == len)
+					/* They match.  Mark the character as
+					   acceptable.  */
+					SET_LIST_BIT (ch);
+				    }
+				}
+			  }
+# endif
+			had_char_class = true;
+		      }
+                    else
+                      {
+                        c1++;
+                        while (c1--)
+                          PATUNFETCH;
+                        SET_LIST_BIT ('[');
+                        SET_LIST_BIT ('=');
+			range_start = '=';
+                        had_char_class = false;
+                      }
+		  }
+                else if (syntax & RE_CHAR_CLASSES && c == '[' && *p == '.')
+		  {
+		    unsigned char str[128];	/* Should be large enough.  */
+# ifdef _LIBC
+		    uint32_t nrules =
+		      _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
+# endif
+
+		    PATFETCH (c);
+		    c1 = 0;
+
+		    /* If pattern is `[[.'.  */
+		    if (p == pend) FREE_STACK_RETURN (REG_EBRACK);
+
+		    for (;;)
+		      {
+			PATFETCH (c);
+			if ((c == '.' && *p == ']') || p == pend)
+			  break;
+			if (c1 < sizeof (str))
+			  str[c1++] = c;
+			else
+			  /* This is in any case an invalid class name.  */
+			  str[0] = '\0';
+                      }
+		    str[c1] = '\0';
+
+		    if (c == '.' && *p == ']' && str[0] != '\0')
+		      {
+			/* If we have no collation data we use the default
+			   collation in which each character is the name
+			   for its own class which contains only the one
+			   character.  It also means that ASCII is the
+			   character set and therefore we cannot have character
+			   with more than one byte in the multibyte
+			   representation.  */
+# ifdef _LIBC
+			if (nrules == 0)
+# endif
+			  {
+			    if (c1 != 1)
+			      FREE_STACK_RETURN (REG_ECOLLATE);
+
+			    /* Throw away the ] at the end of the equivalence
+			       class.  */
+			    PATFETCH (c);
+
+			    /* Set the bit for the character.  */
+			    SET_LIST_BIT (str[0]);
+			    range_start = ((const unsigned char *) str)[0];
+			  }
+# ifdef _LIBC
+			else
+			  {
+			    /* Try to match the byte sequence in `str' against
+			       those known to the collate implementation.
+			       First find out whether the bytes in `str' are
+			       actually from exactly one character.  */
+			    int32_t table_size;
+			    const int32_t *symb_table;
+			    const unsigned char *extra;
+			    int32_t idx;
+			    int32_t elem;
+			    int32_t second;
+			    int32_t hash;
+
+			    table_size =
+			      _NL_CURRENT_WORD (LC_COLLATE,
+						_NL_COLLATE_SYMB_HASH_SIZEMB);
+			    symb_table = (const int32_t *)
+			      _NL_CURRENT (LC_COLLATE,
+					   _NL_COLLATE_SYMB_TABLEMB);
+			    extra = (const unsigned char *)
+			      _NL_CURRENT (LC_COLLATE,
+					   _NL_COLLATE_SYMB_EXTRAMB);
+
+			    /* Locate the character in the hashing table.  */
+			    hash = elem_hash (str, c1);
+
+			    idx = 0;
+			    elem = hash % table_size;
+			    second = hash % (table_size - 2);
+			    while (symb_table[2 * elem] != 0)
+			      {
+				/* First compare the hashing value.  */
+				if (symb_table[2 * elem] == hash
+				    && c1 == extra[symb_table[2 * elem + 1]]
+				    && memcmp (str,
+					       &extra[symb_table[2 * elem + 1]
+						     + 1],
+					       c1) == 0)
+				  {
+				    /* Yep, this is the entry.  */
+				    idx = symb_table[2 * elem + 1];
+				    idx += 1 + extra[idx];
+				    break;
+				  }
+
+				/* Next entry.  */
+				elem += second;
+			      }
+
+			    if (symb_table[2 * elem] == 0)
+			      /* This is no valid character.  */
+			      FREE_STACK_RETURN (REG_ECOLLATE);
+
+			    /* Throw away the ] at the end of the equivalence
+			       class.  */
+			    PATFETCH (c);
+
+			    /* Now add the multibyte character(s) we found
+			       to the accept list.
+
+			       XXX Note that this is not entirely correct.
+			       we would have to match multibyte sequences
+			       but this is not possible with the current
+			       implementation.  Also, we have to match
+			       collating symbols, which expand to more than
+			       one file, as a whole and not allow the
+			       individual bytes.  */
+			    c1 = extra[idx++];
+			    if (c1 == 1)
+			      range_start = extra[idx];
+			    while (c1-- > 0)
+			      {
+				SET_LIST_BIT (extra[idx]);
+				++idx;
+			      }
+			  }
+# endif
+			had_char_class = false;
+		      }
+                    else
+                      {
+                        c1++;
+                        while (c1--)
+                          PATUNFETCH;
+                        SET_LIST_BIT ('[');
+                        SET_LIST_BIT ('.');
+			range_start = '.';
+                        had_char_class = false;
+                      }
+		  }
+                else
+                  {
+                    had_char_class = false;
+                    SET_LIST_BIT (c);
+		    range_start = c;
+                  }
+              }
+
+            /* Discard any (non)matching list bytes that are all 0 at the
+               end of the map.  Decrease the map-length byte too.  */
+            while ((int) b[-1] > 0 && b[b[-1] - 1] == 0)
+              b[-1]--;
+            b += b[-1];
+#endif /* WCHAR */
+          }
+          break;
+
+
+	case '(':
+          if (syntax & RE_NO_BK_PARENS)
+            goto handle_open;
+          else
+            goto normal_char;
+
+
+        case ')':
+          if (syntax & RE_NO_BK_PARENS)
+            goto handle_close;
+          else
+            goto normal_char;
+
+
+        case '\n':
+          if (syntax & RE_NEWLINE_ALT)
+            goto handle_alt;
+          else
+            goto normal_char;
+
+
+	case '|':
+          if (syntax & RE_NO_BK_VBAR)
+            goto handle_alt;
+          else
+            goto normal_char;
+
+
+        case '{':
+           if (syntax & RE_INTERVALS && syntax & RE_NO_BK_BRACES)
+             goto handle_interval;
+           else
+             goto normal_char;
+
+
+        case '\\':
+          if (p == pend) FREE_STACK_RETURN (REG_EESCAPE);
+
+          /* Do not translate the character after the \, so that we can
+             distinguish, e.g., \B from \b, even if we normally would
+             translate, e.g., B to b.  */
+          PATFETCH_RAW (c);
+
+          switch (c)
+            {
+            case '(':
+              if (syntax & RE_NO_BK_PARENS)
+                goto normal_backslash;
+
+            handle_open:
+              bufp->re_nsub++;
+              regnum++;
+
+              if (COMPILE_STACK_FULL)
+                {
+                  RETALLOC (compile_stack.stack, compile_stack.size << 1,
+                            compile_stack_elt_t);
+                  if (compile_stack.stack == NULL) return REG_ESPACE;
+
+                  compile_stack.size <<= 1;
+                }
+
+              /* These are the values to restore when we hit end of this
+                 group.  They are all relative offsets, so that if the
+                 whole pattern moves because of realloc, they will still
+                 be valid.  */
+              COMPILE_STACK_TOP.begalt_offset = begalt - COMPILED_BUFFER_VAR;
+              COMPILE_STACK_TOP.fixup_alt_jump
+                = fixup_alt_jump ? fixup_alt_jump - COMPILED_BUFFER_VAR + 1 : 0;
+              COMPILE_STACK_TOP.laststart_offset = b - COMPILED_BUFFER_VAR;
+              COMPILE_STACK_TOP.regnum = regnum;
+
+              /* We will eventually replace the 0 with the number of
+                 groups inner to this one.  But do not push a
+                 start_memory for groups beyond the last one we can
+                 represent in the compiled pattern.  */
+              if (regnum <= MAX_REGNUM)
+                {
+                  COMPILE_STACK_TOP.inner_group_offset = b
+		    - COMPILED_BUFFER_VAR + 2;
+                  BUF_PUSH_3 (start_memory, regnum, 0);
+                }
+
+              compile_stack.avail++;
+
+              fixup_alt_jump = 0;
+              laststart = 0;
+              begalt = b;
+	      /* If we've reached MAX_REGNUM groups, then this open
+		 won't actually generate any code, so we'll have to
+		 clear pending_exact explicitly.  */
+	      pending_exact = 0;
+              break;
+
+
+            case ')':
+              if (syntax & RE_NO_BK_PARENS) goto normal_backslash;
+
+              if (COMPILE_STACK_EMPTY)
+		{
+		  if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD)
+		    goto normal_backslash;
+		  else
+		    FREE_STACK_RETURN (REG_ERPAREN);
+		}
+
+            handle_close:
+              if (fixup_alt_jump)
+                { /* Push a dummy failure point at the end of the
+                     alternative for a possible future
+                     `pop_failure_jump' to pop.  See comments at
+                     `push_dummy_failure' in `re_match_2'.  */
+                  BUF_PUSH (push_dummy_failure);
+
+                  /* We allocated space for this jump when we assigned
+                     to `fixup_alt_jump', in the `handle_alt' case below.  */
+                  STORE_JUMP (jump_past_alt, fixup_alt_jump, b - 1);
+                }
+
+              /* See similar code for backslashed left paren above.  */
+              if (COMPILE_STACK_EMPTY)
+		{
+		  if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD)
+		    goto normal_char;
+		  else
+		    FREE_STACK_RETURN (REG_ERPAREN);
+		}
+
+              /* Since we just checked for an empty stack above, this
+                 ``can't happen''.  */
+              assert (compile_stack.avail != 0);
+              {
+                /* We don't just want to restore into `regnum', because
+                   later groups should continue to be numbered higher,
+                   as in `(ab)c(de)' -- the second group is #2.  */
+                regnum_t this_group_regnum;
+
+                compile_stack.avail--;
+                begalt = COMPILED_BUFFER_VAR + COMPILE_STACK_TOP.begalt_offset;
+                fixup_alt_jump
+                  = COMPILE_STACK_TOP.fixup_alt_jump
+                    ? COMPILED_BUFFER_VAR + COMPILE_STACK_TOP.fixup_alt_jump - 1
+                    : 0;
+                laststart = COMPILED_BUFFER_VAR + COMPILE_STACK_TOP.laststart_offset;
+                this_group_regnum = COMPILE_STACK_TOP.regnum;
+		/* If we've reached MAX_REGNUM groups, then this open
+		   won't actually generate any code, so we'll have to
+		   clear pending_exact explicitly.  */
+		pending_exact = 0;
+
+                /* We're at the end of the group, so now we know how many
+                   groups were inside this one.  */
+                if (this_group_regnum <= MAX_REGNUM)
+                  {
+		    UCHAR_T *inner_group_loc
+                      = COMPILED_BUFFER_VAR + COMPILE_STACK_TOP.inner_group_offset;
+
+                    *inner_group_loc = regnum - this_group_regnum;
+                    BUF_PUSH_3 (stop_memory, this_group_regnum,
+                                regnum - this_group_regnum);
+                  }
+              }
+              break;
+
+
+            case '|':					/* `\|'.  */
+              if (syntax & RE_LIMITED_OPS || syntax & RE_NO_BK_VBAR)
+                goto normal_backslash;
+            handle_alt:
+              if (syntax & RE_LIMITED_OPS)
+                goto normal_char;
+
+              /* Insert before the previous alternative a jump which
+                 jumps to this alternative if the former fails.  */
+              GET_BUFFER_SPACE (1 + OFFSET_ADDRESS_SIZE);
+              INSERT_JUMP (on_failure_jump, begalt,
+			   b + 2 + 2 * OFFSET_ADDRESS_SIZE);
+              pending_exact = 0;
+              b += 1 + OFFSET_ADDRESS_SIZE;
+
+              /* The alternative before this one has a jump after it
+                 which gets executed if it gets matched.  Adjust that
+                 jump so it will jump to this alternative's analogous
+                 jump (put in below, which in turn will jump to the next
+                 (if any) alternative's such jump, etc.).  The last such
+                 jump jumps to the correct final destination.  A picture:
+                          _____ _____
+                          |   | |   |
+                          |   v |   v
+                         a | b   | c
+
+                 If we are at `b', then fixup_alt_jump right now points to a
+                 three-byte space after `a'.  We'll put in the jump, set
+                 fixup_alt_jump to right after `b', and leave behind three
+                 bytes which we'll fill in when we get to after `c'.  */
+
+              if (fixup_alt_jump)
+                STORE_JUMP (jump_past_alt, fixup_alt_jump, b);
+
+              /* Mark and leave space for a jump after this alternative,
+                 to be filled in later either by next alternative or
+                 when know we're at the end of a series of alternatives.  */
+              fixup_alt_jump = b;
+              GET_BUFFER_SPACE (1 + OFFSET_ADDRESS_SIZE);
+              b += 1 + OFFSET_ADDRESS_SIZE;
+
+              laststart = 0;
+              begalt = b;
+              break;
+
+
+            case '{':
+              /* If \{ is a literal.  */
+              if (!(syntax & RE_INTERVALS)
+                     /* If we're at `\{' and it's not the open-interval
+                        operator.  */
+		  || (syntax & RE_NO_BK_BRACES))
+                goto normal_backslash;
+
+            handle_interval:
+              {
+                /* If got here, then the syntax allows intervals.  */
+
+                /* At least (most) this many matches must be made.  */
+                int lower_bound = -1, upper_bound = -1;
+
+		/* Place in the uncompiled pattern (i.e., just after
+		   the '{') to go back to if the interval is invalid.  */
+		const CHAR_T *beg_interval = p;
+
+                if (p == pend)
+		  goto invalid_interval;
+
+                GET_UNSIGNED_NUMBER (lower_bound);
+
+                if (c == ',')
+                  {
+                    GET_UNSIGNED_NUMBER (upper_bound);
+		    if (upper_bound < 0)
+		      upper_bound = RE_DUP_MAX;
+                  }
+                else
+                  /* Interval such as `{1}' => match exactly once. */
+                  upper_bound = lower_bound;
+
+                if (! (0 <= lower_bound && lower_bound <= upper_bound))
+		  goto invalid_interval;
+
+                if (!(syntax & RE_NO_BK_BRACES))
+                  {
+		    if (c != '\\' || p == pend)
+		      goto invalid_interval;
+                    PATFETCH (c);
+                  }
+
+                if (c != '}')
+		  goto invalid_interval;
+
+                /* If it's invalid to have no preceding re.  */
+                if (!laststart)
+                  {
+		    if (syntax & RE_CONTEXT_INVALID_OPS
+			&& !(syntax & RE_INVALID_INTERVAL_ORD))
+                      FREE_STACK_RETURN (REG_BADRPT);
+                    else if (syntax & RE_CONTEXT_INDEP_OPS)
+                      laststart = b;
+                    else
+                      goto unfetch_interval;
+                  }
+
+                /* We just parsed a valid interval.  */
+
+                if (RE_DUP_MAX < upper_bound)
+		  FREE_STACK_RETURN (REG_BADBR);
+
+                /* If the upper bound is zero, don't want to succeed at
+                   all; jump from `laststart' to `b + 3', which will be
+		   the end of the buffer after we insert the jump.  */
+		/* ifdef WCHAR, 'b + 1 + OFFSET_ADDRESS_SIZE'
+		   instead of 'b + 3'.  */
+                 if (upper_bound == 0)
+                   {
+                     GET_BUFFER_SPACE (1 + OFFSET_ADDRESS_SIZE);
+                     INSERT_JUMP (jump, laststart, b + 1
+				  + OFFSET_ADDRESS_SIZE);
+                     b += 1 + OFFSET_ADDRESS_SIZE;
+                   }
+
+                 /* Otherwise, we have a nontrivial interval.  When
+                    we're all done, the pattern will look like:
+                      set_number_at <jump count> <upper bound>
+                      set_number_at <succeed_n count> <lower bound>
+                      succeed_n <after jump addr> <succeed_n count>
+                      <body of loop>
+                      jump_n <succeed_n addr> <jump count>
+                    (The upper bound and `jump_n' are omitted if
+                    `upper_bound' is 1, though.)  */
+                 else
+                   { /* If the upper bound is > 1, we need to insert
+                        more at the end of the loop.  */
+                     unsigned nbytes = 2 + 4 * OFFSET_ADDRESS_SIZE +
+		       (upper_bound > 1) * (2 + 4 * OFFSET_ADDRESS_SIZE);
+
+                     GET_BUFFER_SPACE (nbytes);
+
+                     /* Initialize lower bound of the `succeed_n', even
+                        though it will be set during matching by its
+                        attendant `set_number_at' (inserted next),
+                        because `re_compile_fastmap' needs to know.
+                        Jump to the `jump_n' we might insert below.  */
+                     INSERT_JUMP2 (succeed_n, laststart,
+                                   b + 1 + 2 * OFFSET_ADDRESS_SIZE
+				   + (upper_bound > 1) * (1 + 2 * OFFSET_ADDRESS_SIZE)
+				   , lower_bound);
+                     b += 1 + 2 * OFFSET_ADDRESS_SIZE;
+
+                     /* Code to initialize the lower bound.  Insert
+                        before the `succeed_n'.  The `5' is the last two
+                        bytes of this `set_number_at', plus 3 bytes of
+                        the following `succeed_n'.  */
+		     /* ifdef WCHAR, The '1+2*OFFSET_ADDRESS_SIZE'
+			is the 'set_number_at', plus '1+OFFSET_ADDRESS_SIZE'
+			of the following `succeed_n'.  */
+                     PREFIX(insert_op2) (set_number_at, laststart, 1
+				 + 2 * OFFSET_ADDRESS_SIZE, lower_bound, b);
+                     b += 1 + 2 * OFFSET_ADDRESS_SIZE;
+
+                     if (upper_bound > 1)
+                       { /* More than one repetition is allowed, so
+                            append a backward jump to the `succeed_n'
+                            that starts this interval.
+
+                            When we've reached this during matching,
+                            we'll have matched the interval once, so
+                            jump back only `upper_bound - 1' times.  */
+                         STORE_JUMP2 (jump_n, b, laststart
+				      + 2 * OFFSET_ADDRESS_SIZE + 1,
+                                      upper_bound - 1);
+                         b += 1 + 2 * OFFSET_ADDRESS_SIZE;
+
+                         /* The location we want to set is the second
+                            parameter of the `jump_n'; that is `b-2' as
+                            an absolute address.  `laststart' will be
+                            the `set_number_at' we're about to insert;
+                            `laststart+3' the number to set, the source
+                            for the relative address.  But we are
+                            inserting into the middle of the pattern --
+                            so everything is getting moved up by 5.
+                            Conclusion: (b - 2) - (laststart + 3) + 5,
+                            i.e., b - laststart.
+
+                            We insert this at the beginning of the loop
+                            so that if we fail during matching, we'll
+                            reinitialize the bounds.  */
+                         PREFIX(insert_op2) (set_number_at, laststart,
+					     b - laststart,
+					     upper_bound - 1, b);
+                         b += 1 + 2 * OFFSET_ADDRESS_SIZE;
+                       }
+                   }
+                pending_exact = 0;
+		break;
+
+	      invalid_interval:
+		if (!(syntax & RE_INVALID_INTERVAL_ORD))
+		  FREE_STACK_RETURN (p == pend ? REG_EBRACE : REG_BADBR);
+	      unfetch_interval:
+		/* Match the characters as literals.  */
+		p = beg_interval;
+		c = '{';
+		if (syntax & RE_NO_BK_BRACES)
+		  goto normal_char;
+		else
+		  goto normal_backslash;
+	      }
+
+#ifdef emacs
+            /* There is no way to specify the before_dot and after_dot
+               operators.  rms says this is ok.  --karl  */
+            case '=':
+              BUF_PUSH (at_dot);
+              break;
+
+            case 's':
+              laststart = b;
+              PATFETCH (c);
+              BUF_PUSH_2 (syntaxspec, syntax_spec_code[c]);
+              break;
+
+            case 'S':
+              laststart = b;
+              PATFETCH (c);
+              BUF_PUSH_2 (notsyntaxspec, syntax_spec_code[c]);
+              break;
+#endif /* emacs */
+
+
+            case 'w':
+	      if (syntax & RE_NO_GNU_OPS)
+		goto normal_char;
+              laststart = b;
+              BUF_PUSH (wordchar);
+              break;
+
+
+            case 'W':
+	      if (syntax & RE_NO_GNU_OPS)
+		goto normal_char;
+              laststart = b;
+              BUF_PUSH (notwordchar);
+              break;
+
+
+            case '<':
+	      if (syntax & RE_NO_GNU_OPS)
+		goto normal_char;
+              BUF_PUSH (wordbeg);
+              break;
+
+            case '>':
+	      if (syntax & RE_NO_GNU_OPS)
+		goto normal_char;
+              BUF_PUSH (wordend);
+              break;
+
+            case 'b':
+	      if (syntax & RE_NO_GNU_OPS)
+		goto normal_char;
+              BUF_PUSH (wordbound);
+              break;
+
+            case 'B':
+	      if (syntax & RE_NO_GNU_OPS)
+		goto normal_char;
+              BUF_PUSH (notwordbound);
+              break;
+
+            case '`':
+	      if (syntax & RE_NO_GNU_OPS)
+		goto normal_char;
+              BUF_PUSH (begbuf);
+              break;
+
+            case '\'':
+	      if (syntax & RE_NO_GNU_OPS)
+		goto normal_char;
+              BUF_PUSH (endbuf);
+              break;
+
+            case '1': case '2': case '3': case '4': case '5':
+            case '6': case '7': case '8': case '9':
+              if (syntax & RE_NO_BK_REFS)
+                goto normal_char;
+
+              c1 = c - '0';
+
+              if (c1 > regnum)
+                FREE_STACK_RETURN (REG_ESUBREG);
+
+              /* Can't back reference to a subexpression if inside of it.  */
+              if (group_in_compile_stack (compile_stack, (regnum_t) c1))
+                goto normal_char;
+
+              laststart = b;
+              BUF_PUSH_2 (duplicate, c1);
+              break;
+
+
+            case '+':
+            case '?':
+              if (syntax & RE_BK_PLUS_QM)
+                goto handle_plus;
+              else
+                goto normal_backslash;
+
+            default:
+            normal_backslash:
+              /* You might think it would be useful for \ to mean
+                 not to translate; but if we don't translate it
+                 it will never match anything.  */
+              c = TRANSLATE (c);
+              goto normal_char;
+            }
+          break;
+
+
+	default:
+        /* Expects the character in `c'.  */
+	normal_char:
+	      /* If no exactn currently being built.  */
+          if (!pending_exact
+#ifdef WCHAR
+	      /* If last exactn handle binary(or character) and
+		 new exactn handle character(or binary).  */
+	      || is_exactn_bin != is_binary[p - 1 - pattern]
+#endif /* WCHAR */
+
+              /* If last exactn not at current position.  */
+              || pending_exact + *pending_exact + 1 != b
+
+              /* We have only one byte following the exactn for the count.  */
+	      || *pending_exact == (1 << BYTEWIDTH) - 1
+
+              /* If followed by a repetition operator.  */
+              || *p == '*' || *p == '^'
+	      || ((syntax & RE_BK_PLUS_QM)
+		  ? *p == '\\' && (p[1] == '+' || p[1] == '?')
+		  : (*p == '+' || *p == '?'))
+	      || ((syntax & RE_INTERVALS)
+                  && ((syntax & RE_NO_BK_BRACES)
+		      ? *p == '{'
+                      : (p[0] == '\\' && p[1] == '{'))))
+	    {
+	      /* Start building a new exactn.  */
+
+              laststart = b;
+
+#ifdef WCHAR
+	      /* Is this exactn binary data or character? */
+	      is_exactn_bin = is_binary[p - 1 - pattern];
+	      if (is_exactn_bin)
+		  BUF_PUSH_2 (exactn_bin, 0);
+	      else
+		  BUF_PUSH_2 (exactn, 0);
+#else
+	      BUF_PUSH_2 (exactn, 0);
+#endif /* WCHAR */
+	      pending_exact = b - 1;
+            }
+
+	  BUF_PUSH (c);
+          (*pending_exact)++;
+	  break;
+        } /* switch (c) */
+    } /* while p != pend */
+
+
+  /* Through the pattern now.  */
+
+  if (fixup_alt_jump)
+    STORE_JUMP (jump_past_alt, fixup_alt_jump, b);
+
+  if (!COMPILE_STACK_EMPTY)
+    FREE_STACK_RETURN (REG_EPAREN);
+
+  /* If we don't want backtracking, force success
+     the first time we reach the end of the compiled pattern.  */
+  if (syntax & RE_NO_POSIX_BACKTRACKING)
+    BUF_PUSH (succeed);
+
+#ifdef WCHAR
+  free (pattern);
+  free (mbs_offset);
+  free (is_binary);
+#endif
+  free (compile_stack.stack);
+
+  /* We have succeeded; set the length of the buffer.  */
+#ifdef WCHAR
+  bufp->used = (uintptr_t) b - (uintptr_t) COMPILED_BUFFER_VAR;
+#else
+  bufp->used = b - bufp->buffer;
+#endif
+
+#ifdef DEBUG
+  if (debug)
+    {
+      DEBUG_PRINT1 ("\nCompiled pattern: \n");
+      PREFIX(print_compiled_pattern) (bufp);
+    }
+#endif /* DEBUG */
+
+#ifndef MATCH_MAY_ALLOCATE
+  /* Initialize the failure stack to the largest possible stack.  This
+     isn't necessary unless we're trying to avoid calling alloca in
+     the search and match routines.  */
+  {
+    int num_regs = bufp->re_nsub + 1;
+
+    /* Since DOUBLE_FAIL_STACK refuses to double only if the current size
+       is strictly greater than re_max_failures, the largest possible stack
+       is 2 * re_max_failures failure points.  */
+    if (fail_stack.size < (2 * re_max_failures * MAX_FAILURE_ITEMS))
+      {
+	fail_stack.size = (2 * re_max_failures * MAX_FAILURE_ITEMS);
+
+# ifdef emacs
+	if (! fail_stack.stack)
+	  fail_stack.stack
+	    = (PREFIX(fail_stack_elt_t) *) xmalloc (fail_stack.size
+				    * sizeof (PREFIX(fail_stack_elt_t)));
+	else
+	  fail_stack.stack
+	    = (PREFIX(fail_stack_elt_t) *) xrealloc (fail_stack.stack,
+				     (fail_stack.size
+				      * sizeof (PREFIX(fail_stack_elt_t))));
+# else /* not emacs */
+	if (! fail_stack.stack)
+	  fail_stack.stack
+	    = (PREFIX(fail_stack_elt_t) *) malloc (fail_stack.size
+				   * sizeof (PREFIX(fail_stack_elt_t)));
+	else
+	  fail_stack.stack
+	    = (PREFIX(fail_stack_elt_t) *) realloc (fail_stack.stack,
+					    (fail_stack.size
+				     * sizeof (PREFIX(fail_stack_elt_t))));
+# endif /* not emacs */
+      }
+
+   PREFIX(regex_grow_registers) (num_regs);
+  }
+#endif /* not MATCH_MAY_ALLOCATE */
+
+  return REG_NOERROR;
+} /* regex_compile */
+
+/* Subroutines for `regex_compile'.  */
+
+/* Store OP at LOC followed by two-byte integer parameter ARG.  */
+/* ifdef WCHAR, integer parameter is 1 wchar_t.  */
+
+static void
+PREFIX(store_op1) (re_opcode_t op, UCHAR_T *loc, int arg)
+{
+  *loc = (UCHAR_T) op;
+  STORE_NUMBER (loc + 1, arg);
+}
+
+
+/* Like `store_op1', but for two two-byte parameters ARG1 and ARG2.  */
+/* ifdef WCHAR, integer parameter is 1 wchar_t.  */
+
+static void
+PREFIX(store_op2) (re_opcode_t op, UCHAR_T *loc, int arg1, int arg2)
+{
+  *loc = (UCHAR_T) op;
+  STORE_NUMBER (loc + 1, arg1);
+  STORE_NUMBER (loc + 1 + OFFSET_ADDRESS_SIZE, arg2);
+}
+
+
+/* Copy the bytes from LOC to END to open up three bytes of space at LOC
+   for OP followed by two-byte integer parameter ARG.  */
+/* ifdef WCHAR, integer parameter is 1 wchar_t.  */
+
+static void
+PREFIX(insert_op1) (re_opcode_t op, UCHAR_T *loc, int arg, UCHAR_T *end)
+{
+  register UCHAR_T *pfrom = end;
+  register UCHAR_T *pto = end + 1 + OFFSET_ADDRESS_SIZE;
+
+  while (pfrom != loc)
+    *--pto = *--pfrom;
+
+  PREFIX(store_op1) (op, loc, arg);
+}
+
+
+/* Like `insert_op1', but for two two-byte parameters ARG1 and ARG2.  */
+/* ifdef WCHAR, integer parameter is 1 wchar_t.  */
+
+static void
+PREFIX(insert_op2) (re_opcode_t op, UCHAR_T *loc, int arg1,
+                    int arg2, UCHAR_T *end)
+{
+  register UCHAR_T *pfrom = end;
+  register UCHAR_T *pto = end + 1 + 2 * OFFSET_ADDRESS_SIZE;
+
+  while (pfrom != loc)
+    *--pto = *--pfrom;
+
+  PREFIX(store_op2) (op, loc, arg1, arg2);
+}
+
+
+/* P points to just after a ^ in PATTERN.  Return true if that ^ comes
+   after an alternative or a begin-subexpression.  We assume there is at
+   least one character before the ^.  */
+
+static boolean
+PREFIX(at_begline_loc_p) (const CHAR_T *pattern, const CHAR_T *p,
+                          reg_syntax_t syntax)
+{
+  const CHAR_T *prev = p - 2;
+  boolean prev_prev_backslash = prev > pattern && prev[-1] == '\\';
+
+  return
+       /* After a subexpression?  */
+       (*prev == '(' && (syntax & RE_NO_BK_PARENS || prev_prev_backslash))
+       /* After an alternative?  */
+    || (*prev == '|' && (syntax & RE_NO_BK_VBAR || prev_prev_backslash));
+}
+
+
+/* The dual of at_begline_loc_p.  This one is for $.  We assume there is
+   at least one character after the $, i.e., `P < PEND'.  */
+
+static boolean
+PREFIX(at_endline_loc_p) (const CHAR_T *p, const CHAR_T *pend,
+                          reg_syntax_t syntax)
+{
+  const CHAR_T *next = p;
+  boolean next_backslash = *next == '\\';
+  const CHAR_T *next_next = p + 1 < pend ? p + 1 : 0;
+
+  return
+       /* Before a subexpression?  */
+       (syntax & RE_NO_BK_PARENS ? *next == ')'
+        : next_backslash && next_next && *next_next == ')')
+       /* Before an alternative?  */
+    || (syntax & RE_NO_BK_VBAR ? *next == '|'
+        : next_backslash && next_next && *next_next == '|');
+}
+
+#else /* not INSIDE_RECURSION */
+
+/* Returns true if REGNUM is in one of COMPILE_STACK's elements and
+   false if it's not.  */
+
+static boolean
+group_in_compile_stack (compile_stack_type compile_stack, regnum_t regnum)
+{
+  int this_element;
+
+  for (this_element = compile_stack.avail - 1;
+       this_element >= 0;
+       this_element--)
+    if (compile_stack.stack[this_element].regnum == regnum)
+      return true;
+
+  return false;
+}
+#endif /* not INSIDE_RECURSION */
+
+#ifdef INSIDE_RECURSION
+
+#ifdef WCHAR
+/* This insert space, which size is "num", into the pattern at "loc".
+   "end" must point the end of the allocated buffer.  */
+static void
+insert_space (int num, CHAR_T *loc, CHAR_T *end)
+{
+  register CHAR_T *pto = end;
+  register CHAR_T *pfrom = end - num;
+
+  while (pfrom >= loc)
+    *pto-- = *pfrom--;
+}
+#endif /* WCHAR */
+
+#ifdef WCHAR
+static reg_errcode_t
+wcs_compile_range (CHAR_T range_start_char, const CHAR_T **p_ptr,
+                   const CHAR_T *pend, RE_TRANSLATE_TYPE translate,
+                   reg_syntax_t syntax, CHAR_T *b, CHAR_T *char_set)
+{
+  const CHAR_T *p = *p_ptr;
+  CHAR_T range_start, range_end;
+  reg_errcode_t ret;
+# ifdef _LIBC
+  uint32_t nrules;
+  uint32_t start_val, end_val;
+# endif
+  if (p == pend)
+    return REG_ERANGE;
+
+# ifdef _LIBC
+  nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
+  if (nrules != 0)
+    {
+      const char *collseq = (const char *) _NL_CURRENT(LC_COLLATE,
+						       _NL_COLLATE_COLLSEQWC);
+      const unsigned char *extra = (const unsigned char *)
+	_NL_CURRENT (LC_COLLATE, _NL_COLLATE_SYMB_EXTRAMB);
+
+      if (range_start_char < -1)
+	{
+	  /* range_start is a collating symbol.  */
+	  int32_t *wextra;
+	  /* Retreive the index and get collation sequence value.  */
+	  wextra = (int32_t*)(extra + char_set[-range_start_char]);
+	  start_val = wextra[1 + *wextra];
+	}
+      else
+	start_val = collseq_table_lookup(collseq, TRANSLATE(range_start_char));
+
+      end_val = collseq_table_lookup (collseq, TRANSLATE (p[0]));
+
+      /* Report an error if the range is empty and the syntax prohibits
+	 this.  */
+      ret = ((syntax & RE_NO_EMPTY_RANGES)
+	     && (start_val > end_val))? REG_ERANGE : REG_NOERROR;
+
+      /* Insert space to the end of the char_ranges.  */
+      insert_space(2, b - char_set[5] - 2, b - 1);
+      *(b - char_set[5] - 2) = (wchar_t)start_val;
+      *(b - char_set[5] - 1) = (wchar_t)end_val;
+      char_set[4]++; /* ranges_index */
+    }
+  else
+# endif
+    {
+      range_start = (range_start_char >= 0)? TRANSLATE (range_start_char):
+	range_start_char;
+      range_end = TRANSLATE (p[0]);
+      /* Report an error if the range is empty and the syntax prohibits
+	 this.  */
+      ret = ((syntax & RE_NO_EMPTY_RANGES)
+	     && (range_start > range_end))? REG_ERANGE : REG_NOERROR;
+
+      /* Insert space to the end of the char_ranges.  */
+      insert_space(2, b - char_set[5] - 2, b - 1);
+      *(b - char_set[5] - 2) = range_start;
+      *(b - char_set[5] - 1) = range_end;
+      char_set[4]++; /* ranges_index */
+    }
+  /* Have to increment the pointer into the pattern string, so the
+     caller isn't still at the ending character.  */
+  (*p_ptr)++;
+
+  return ret;
+}
+#else /* BYTE */
+/* Read the ending character of a range (in a bracket expression) from the
+   uncompiled pattern *P_PTR (which ends at PEND).  We assume the
+   starting character is in `P[-2]'.  (`P[-1]' is the character `-'.)
+   Then we set the translation of all bits between the starting and
+   ending characters (inclusive) in the compiled pattern B.
+
+   Return an error code.
+
+   We use these short variable names so we can use the same macros as
+   `regex_compile' itself.  */
+
+static reg_errcode_t
+byte_compile_range (unsigned int range_start_char, const char **p_ptr,
+                    const char *pend, RE_TRANSLATE_TYPE translate,
+                    reg_syntax_t syntax, unsigned char *b)
+{
+  unsigned this_char;
+  const char *p = *p_ptr;
+  reg_errcode_t ret;
+# if _LIBC
+  const unsigned char *collseq;
+  unsigned int start_colseq;
+  unsigned int end_colseq;
+# else
+  unsigned end_char;
+# endif
+
+  if (p == pend)
+    return REG_ERANGE;
+
+  /* Have to increment the pointer into the pattern string, so the
+     caller isn't still at the ending character.  */
+  (*p_ptr)++;
+
+  /* Report an error if the range is empty and the syntax prohibits this.  */
+  ret = syntax & RE_NO_EMPTY_RANGES ? REG_ERANGE : REG_NOERROR;
+
+# if _LIBC
+  collseq = (const unsigned char *) _NL_CURRENT (LC_COLLATE,
+						 _NL_COLLATE_COLLSEQMB);
+
+  start_colseq = collseq[(unsigned char) TRANSLATE (range_start_char)];
+  end_colseq = collseq[(unsigned char) TRANSLATE (p[0])];
+  for (this_char = 0; this_char <= (unsigned char) -1; ++this_char)
+    {
+      unsigned int this_colseq = collseq[(unsigned char) TRANSLATE (this_char)];
+
+      if (start_colseq <= this_colseq && this_colseq <= end_colseq)
+	{
+	  SET_LIST_BIT (TRANSLATE (this_char));
+	  ret = REG_NOERROR;
+	}
+    }
+# else
+  /* Here we see why `this_char' has to be larger than an `unsigned
+     char' -- we would otherwise go into an infinite loop, since all
+     characters <= 0xff.  */
+  range_start_char = TRANSLATE (range_start_char);
+  /* TRANSLATE(p[0]) is casted to char (not unsigned char) in TRANSLATE,
+     and some compilers cast it to int implicitly, so following for_loop
+     may fall to (almost) infinite loop.
+     e.g. If translate[p[0]] = 0xff, end_char may equals to 0xffffffff.
+     To avoid this, we cast p[0] to unsigned int and truncate it.  */
+  end_char = ((unsigned)TRANSLATE(p[0]) & ((1 << BYTEWIDTH) - 1));
+
+  for (this_char = range_start_char; this_char <= end_char; ++this_char)
+    {
+      SET_LIST_BIT (TRANSLATE (this_char));
+      ret = REG_NOERROR;
+    }
+# endif
+
+  return ret;
+}
+#endif /* WCHAR */
+
+/* re_compile_fastmap computes a ``fastmap'' for the compiled pattern in
+   BUFP.  A fastmap records which of the (1 << BYTEWIDTH) possible
+   characters can start a string that matches the pattern.  This fastmap
+   is used by re_search to skip quickly over impossible starting points.
+
+   The caller must supply the address of a (1 << BYTEWIDTH)-byte data
+   area as BUFP->fastmap.
+
+   We set the `fastmap', `fastmap_accurate', and `can_be_null' fields in
+   the pattern buffer.
+
+   Returns 0 if we succeed, -2 if an internal error.   */
+
+#ifdef WCHAR
+/* local function for re_compile_fastmap.
+   truncate wchar_t character to char.  */
+static unsigned char truncate_wchar (CHAR_T c);
+
+static unsigned char
+truncate_wchar (CHAR_T c)
+{
+  unsigned char buf[MB_CUR_MAX];
+  mbstate_t state;
+  int retval;
+  memset (&state, '\0', sizeof (state));
+# ifdef _LIBC
+  retval = __wcrtomb (buf, c, &state);
+# else
+  retval = wcrtomb (buf, c, &state);
+# endif
+  return retval > 0 ? buf[0] : (unsigned char) c;
+}
+#endif /* WCHAR */
+
+static int
+PREFIX(re_compile_fastmap) (struct re_pattern_buffer *bufp)
+{
+  int j, k;
+#ifdef MATCH_MAY_ALLOCATE
+  PREFIX(fail_stack_type) fail_stack;
+#endif
+#ifndef REGEX_MALLOC
+  char *destination;
+#endif
+
+  register char *fastmap = bufp->fastmap;
+
+#ifdef WCHAR
+  /* We need to cast pattern to (wchar_t*), because we casted this compiled
+     pattern to (char*) in regex_compile.  */
+  UCHAR_T *pattern = (UCHAR_T*)bufp->buffer;
+  register UCHAR_T *pend = (UCHAR_T*) (bufp->buffer + bufp->used);
+#else /* BYTE */
+  UCHAR_T *pattern = bufp->buffer;
+  register UCHAR_T *pend = pattern + bufp->used;
+#endif /* WCHAR */
+  UCHAR_T *p = pattern;
+
+#ifdef REL_ALLOC
+  /* This holds the pointer to the failure stack, when
+     it is allocated relocatably.  */
+  fail_stack_elt_t *failure_stack_ptr;
+#endif
+
+  /* Assume that each path through the pattern can be null until
+     proven otherwise.  We set this false at the bottom of switch
+     statement, to which we get only if a particular path doesn't
+     match the empty string.  */
+  boolean path_can_be_null = true;
+
+  /* We aren't doing a `succeed_n' to begin with.  */
+  boolean succeed_n_p = false;
+
+  assert (fastmap != NULL && p != NULL);
+
+  INIT_FAIL_STACK ();
+  bzero (fastmap, 1 << BYTEWIDTH);  /* Assume nothing's valid.  */
+  bufp->fastmap_accurate = 1;	    /* It will be when we're done.  */
+  bufp->can_be_null = 0;
+
+  while (1)
+    {
+      if (p == pend || *p == (UCHAR_T) succeed)
+	{
+	  /* We have reached the (effective) end of pattern.  */
+	  if (!FAIL_STACK_EMPTY ())
+	    {
+	      bufp->can_be_null |= path_can_be_null;
+
+	      /* Reset for next path.  */
+	      path_can_be_null = true;
+
+	      p = fail_stack.stack[--fail_stack.avail].pointer;
+
+	      continue;
+	    }
+	  else
+	    break;
+	}
+
+      /* We should never be about to go beyond the end of the pattern.  */
+      assert (p < pend);
+
+      switch (SWITCH_ENUM_CAST ((re_opcode_t) *p++))
+	{
+
+        /* I guess the idea here is to simply not bother with a fastmap
+           if a backreference is used, since it's too hard to figure out
+           the fastmap for the corresponding group.  Setting
+           `can_be_null' stops `re_search_2' from using the fastmap, so
+           that is all we do.  */
+	case duplicate:
+	  bufp->can_be_null = 1;
+          goto done;
+
+
+      /* Following are the cases which match a character.  These end
+         with `break'.  */
+
+#ifdef WCHAR
+	case exactn:
+          fastmap[truncate_wchar(p[1])] = 1;
+	  break;
+#else /* BYTE */
+	case exactn:
+          fastmap[p[1]] = 1;
+	  break;
+#endif /* WCHAR */
+#ifdef MBS_SUPPORT
+	case exactn_bin:
+	  fastmap[p[1]] = 1;
+	  break;
+#endif
+
+#ifdef WCHAR
+        /* It is hard to distinguish fastmap from (multi byte) characters
+           which depends on current locale.  */
+        case charset:
+	case charset_not:
+	case wordchar:
+	case notwordchar:
+          bufp->can_be_null = 1;
+          goto done;
+#else /* BYTE */
+        case charset:
+          for (j = *p++ * BYTEWIDTH - 1; j >= 0; j--)
+	    if (p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH)))
+              fastmap[j] = 1;
+	  break;
+
+
+	case charset_not:
+	  /* Chars beyond end of map must be allowed.  */
+	  for (j = *p * BYTEWIDTH; j < (1 << BYTEWIDTH); j++)
+            fastmap[j] = 1;
+
+	  for (j = *p++ * BYTEWIDTH - 1; j >= 0; j--)
+	    if (!(p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH))))
+              fastmap[j] = 1;
+          break;
+
+
+	case wordchar:
+	  for (j = 0; j < (1 << BYTEWIDTH); j++)
+	    if (SYNTAX (j) == Sword)
+	      fastmap[j] = 1;
+	  break;
+
+
+	case notwordchar:
+	  for (j = 0; j < (1 << BYTEWIDTH); j++)
+	    if (SYNTAX (j) != Sword)
+	      fastmap[j] = 1;
+	  break;
+#endif /* WCHAR */
+
+        case anychar:
+	  {
+	    int fastmap_newline = fastmap['\n'];
+
+	    /* `.' matches anything ...  */
+	    for (j = 0; j < (1 << BYTEWIDTH); j++)
+	      fastmap[j] = 1;
+
+	    /* ... except perhaps newline.  */
+	    if (!(bufp->syntax & RE_DOT_NEWLINE))
+	      fastmap['\n'] = fastmap_newline;
+
+	    /* Return if we have already set `can_be_null'; if we have,
+	       then the fastmap is irrelevant.  Something's wrong here.  */
+	    else if (bufp->can_be_null)
+	      goto done;
+
+	    /* Otherwise, have to check alternative paths.  */
+	    break;
+	  }
+
+#ifdef emacs
+        case syntaxspec:
+	  k = *p++;
+	  for (j = 0; j < (1 << BYTEWIDTH); j++)
+	    if (SYNTAX (j) == (enum syntaxcode) k)
+	      fastmap[j] = 1;
+	  break;
+
+
+	case notsyntaxspec:
+	  k = *p++;
+	  for (j = 0; j < (1 << BYTEWIDTH); j++)
+	    if (SYNTAX (j) != (enum syntaxcode) k)
+	      fastmap[j] = 1;
+	  break;
+
+
+      /* All cases after this match the empty string.  These end with
+         `continue'.  */
+
+
+	case before_dot:
+	case at_dot:
+	case after_dot:
+          continue;
+#endif /* emacs */
+
+
+        case no_op:
+        case begline:
+        case endline:
+	case begbuf:
+	case endbuf:
+	case wordbound:
+	case notwordbound:
+	case wordbeg:
+	case wordend:
+        case push_dummy_failure:
+          continue;
+
+
+	case jump_n:
+        case pop_failure_jump:
+	case maybe_pop_jump:
+	case jump:
+        case jump_past_alt:
+	case dummy_failure_jump:
+          EXTRACT_NUMBER_AND_INCR (j, p);
+	  p += j;
+	  if (j > 0)
+	    continue;
+
+          /* Jump backward implies we just went through the body of a
+             loop and matched nothing.  Opcode jumped to should be
+             `on_failure_jump' or `succeed_n'.  Just treat it like an
+             ordinary jump.  For a * loop, it has pushed its failure
+             point already; if so, discard that as redundant.  */
+          if ((re_opcode_t) *p != on_failure_jump
+	      && (re_opcode_t) *p != succeed_n)
+	    continue;
+
+          p++;
+          EXTRACT_NUMBER_AND_INCR (j, p);
+          p += j;
+
+          /* If what's on the stack is where we are now, pop it.  */
+          if (!FAIL_STACK_EMPTY ()
+	      && fail_stack.stack[fail_stack.avail - 1].pointer == p)
+            fail_stack.avail--;
+
+          continue;
+
+
+        case on_failure_jump:
+        case on_failure_keep_string_jump:
+	handle_on_failure_jump:
+          EXTRACT_NUMBER_AND_INCR (j, p);
+
+          /* For some patterns, e.g., `(a?)?', `p+j' here points to the
+             end of the pattern.  We don't want to push such a point,
+             since when we restore it above, entering the switch will
+             increment `p' past the end of the pattern.  We don't need
+             to push such a point since we obviously won't find any more
+             fastmap entries beyond `pend'.  Such a pattern can match
+             the null string, though.  */
+          if (p + j < pend)
+            {
+              if (!PUSH_PATTERN_OP (p + j, fail_stack))
+		{
+		  RESET_FAIL_STACK ();
+		  return -2;
+		}
+            }
+          else
+            bufp->can_be_null = 1;
+
+          if (succeed_n_p)
+            {
+              EXTRACT_NUMBER_AND_INCR (k, p);	/* Skip the n.  */
+              succeed_n_p = false;
+	    }
+
+          continue;
+
+
+	case succeed_n:
+          /* Get to the number of times to succeed.  */
+          p += OFFSET_ADDRESS_SIZE;
+
+          /* Increment p past the n for when k != 0.  */
+          EXTRACT_NUMBER_AND_INCR (k, p);
+          if (k == 0)
+	    {
+              p -= 2 * OFFSET_ADDRESS_SIZE;
+  	      succeed_n_p = true;  /* Spaghetti code alert.  */
+              goto handle_on_failure_jump;
+            }
+          continue;
+
+
+	case set_number_at:
+          p += 2 * OFFSET_ADDRESS_SIZE;
+          continue;
+
+
+	case start_memory:
+        case stop_memory:
+	  p += 2;
+	  continue;
+
+
+	default:
+          abort (); /* We have listed all the cases.  */
+        } /* switch *p++ */
+
+      /* Getting here means we have found the possible starting
+         characters for one path of the pattern -- and that the empty
+         string does not match.  We need not follow this path further.
+         Instead, look at the next alternative (remembered on the
+         stack), or quit if no more.  The test at the top of the loop
+         does these things.  */
+      path_can_be_null = false;
+      p = pend;
+    } /* while p */
+
+  /* Set `can_be_null' for the last path (also the first path, if the
+     pattern is empty).  */
+  bufp->can_be_null |= path_can_be_null;
+
+ done:
+  RESET_FAIL_STACK ();
+  return 0;
+}
+
+#else /* not INSIDE_RECURSION */
+
+int
+re_compile_fastmap (struct re_pattern_buffer *bufp)
+{
+# ifdef MBS_SUPPORT
+  if (MB_CUR_MAX != 1)
+    return wcs_re_compile_fastmap(bufp);
+  else
+# endif
+    return byte_re_compile_fastmap(bufp);
+} /* re_compile_fastmap */
+#ifdef _LIBC
+weak_alias (__re_compile_fastmap, re_compile_fastmap)
+#endif
+
+
+/* Set REGS to hold NUM_REGS registers, storing them in STARTS and
+   ENDS.  Subsequent matches using PATTERN_BUFFER and REGS will use
+   this memory for recording register information.  STARTS and ENDS
+   must be allocated using the malloc library routine, and must each
+   be at least NUM_REGS * sizeof (regoff_t) bytes long.
+
+   If NUM_REGS == 0, then subsequent matches should allocate their own
+   register data.
+
+   Unless this function is called, the first search or match using
+   PATTERN_BUFFER will allocate its own register data, without
+   freeing the old data.  */
+
+void
+re_set_registers (struct re_pattern_buffer *bufp,
+                  struct re_registers *regs, unsigned num_regs,
+                  regoff_t *starts, regoff_t *ends)
+{
+  if (num_regs)
+    {
+      bufp->regs_allocated = REGS_REALLOCATE;
+      regs->num_regs = num_regs;
+      regs->start = starts;
+      regs->end = ends;
+    }
+  else
+    {
+      bufp->regs_allocated = REGS_UNALLOCATED;
+      regs->num_regs = 0;
+      regs->start = regs->end = (regoff_t *) 0;
+    }
+}
+#ifdef _LIBC
+weak_alias (__re_set_registers, re_set_registers)
+#endif
+
+/* Searching routines.  */
+
+/* Like re_search_2, below, but only one string is specified, and
+   doesn't let you say where to stop matching.  */
+
+int
+re_search (struct re_pattern_buffer *bufp, const char *string, int size,
+           int startpos, int range, struct re_registers *regs)
+{
+  return re_search_2 (bufp, NULL, 0, string, size, startpos, range,
+		      regs, size);
+}
+#ifdef _LIBC
+weak_alias (__re_search, re_search)
+#endif
+
+
+/* Using the compiled pattern in BUFP->buffer, first tries to match the
+   virtual concatenation of STRING1 and STRING2, starting first at index
+   STARTPOS, then at STARTPOS + 1, and so on.
+
+   STRING1 and STRING2 have length SIZE1 and SIZE2, respectively.
+
+   RANGE is how far to scan while trying to match.  RANGE = 0 means try
+   only at STARTPOS; in general, the last start tried is STARTPOS +
+   RANGE.
+
+   In REGS, return the indices of the virtual concatenation of STRING1
+   and STRING2 that matched the entire BUFP->buffer and its contained
+   subexpressions.
+
+   Do not consider matching one past the index STOP in the virtual
+   concatenation of STRING1 and STRING2.
+
+   We return either the position in the strings at which the match was
+   found, -1 if no match, or -2 if error (such as failure
+   stack overflow).  */
+
+int
+re_search_2 (struct re_pattern_buffer *bufp, const char *string1, int size1,
+             const char *string2, int size2, int startpos, int range,
+             struct re_registers *regs, int stop)
+{
+# ifdef MBS_SUPPORT
+  if (MB_CUR_MAX != 1)
+    return wcs_re_search_2 (bufp, string1, size1, string2, size2, startpos,
+			    range, regs, stop);
+  else
+# endif
+    return byte_re_search_2 (bufp, string1, size1, string2, size2, startpos,
+			     range, regs, stop);
+} /* re_search_2 */
+#ifdef _LIBC
+weak_alias (__re_search_2, re_search_2)
+#endif
+
+#endif /* not INSIDE_RECURSION */
+
+#ifdef INSIDE_RECURSION
+
+#ifdef MATCH_MAY_ALLOCATE
+# define FREE_VAR(var) if (var) REGEX_FREE (var); var = NULL
+#else
+# define FREE_VAR(var) free (var); var = NULL
+#endif
+
+#ifdef WCHAR
+# define MAX_ALLOCA_SIZE	2000
+
+# define FREE_WCS_BUFFERS() \
+  do {									      \
+    if (size1 > MAX_ALLOCA_SIZE)					      \
+      {									      \
+	free (wcs_string1);						      \
+	free (mbs_offset1);						      \
+      }									      \
+    else								      \
+      {									      \
+	FREE_VAR (wcs_string1);						      \
+	FREE_VAR (mbs_offset1);						      \
+      }									      \
+    if (size2 > MAX_ALLOCA_SIZE) 					      \
+      {									      \
+	free (wcs_string2);						      \
+	free (mbs_offset2);						      \
+      }									      \
+    else								      \
+      {									      \
+	FREE_VAR (wcs_string2);						      \
+	FREE_VAR (mbs_offset2);						      \
+      }									      \
+  } while (0)
+
+#endif
+
+
+static int
+PREFIX(re_search_2) (struct re_pattern_buffer *bufp, const char *string1,
+                     int size1, const char *string2, int size2,
+                     int startpos, int range,
+                     struct re_registers *regs, int stop)
+{
+  int val;
+  register char *fastmap = bufp->fastmap;
+  register RE_TRANSLATE_TYPE translate = bufp->translate;
+  int total_size = size1 + size2;
+  int endpos = startpos + range;
+#ifdef WCHAR
+  /* We need wchar_t* buffers correspond to cstring1, cstring2.  */
+  wchar_t *wcs_string1 = NULL, *wcs_string2 = NULL;
+  /* We need the size of wchar_t buffers correspond to csize1, csize2.  */
+  int wcs_size1 = 0, wcs_size2 = 0;
+  /* offset buffer for optimizatoin. See convert_mbs_to_wc.  */
+  int *mbs_offset1 = NULL, *mbs_offset2 = NULL;
+  /* They hold whether each wchar_t is binary data or not.  */
+  char *is_binary = NULL;
+#endif /* WCHAR */
+
+  /* Check for out-of-range STARTPOS.  */
+  if (startpos < 0 || startpos > total_size)
+    return -1;
+
+  /* Fix up RANGE if it might eventually take us outside
+     the virtual concatenation of STRING1 and STRING2.
+     Make sure we won't move STARTPOS below 0 or above TOTAL_SIZE.  */
+  if (endpos < 0)
+    range = 0 - startpos;
+  else if (endpos > total_size)
+    range = total_size - startpos;
+
+  /* If the search isn't to be a backwards one, don't waste time in a
+     search for a pattern that must be anchored.  */
+  if (bufp->used > 0 && range > 0
+      && ((re_opcode_t) bufp->buffer[0] == begbuf
+	  /* `begline' is like `begbuf' if it cannot match at newlines.  */
+	  || ((re_opcode_t) bufp->buffer[0] == begline
+	      && !bufp->newline_anchor)))
+    {
+      if (startpos > 0)
+	return -1;
+      else
+	range = 1;
+    }
+
+#ifdef emacs
+  /* In a forward search for something that starts with \=.
+     don't keep searching past point.  */
+  if (bufp->used > 0 && (re_opcode_t) bufp->buffer[0] == at_dot && range > 0)
+    {
+      range = PT - startpos;
+      if (range <= 0)
+	return -1;
+    }
+#endif /* emacs */
+
+  /* Update the fastmap now if not correct already.  */
+  if (fastmap && !bufp->fastmap_accurate)
+    if (re_compile_fastmap (bufp) == -2)
+      return -2;
+
+#ifdef WCHAR
+  /* Allocate wchar_t array for wcs_string1 and wcs_string2 and
+     fill them with converted string.  */
+  if (size1 != 0)
+    {
+      if (size1 > MAX_ALLOCA_SIZE)
+	{
+	  wcs_string1 = TALLOC (size1 + 1, CHAR_T);
+	  mbs_offset1 = TALLOC (size1 + 1, int);
+	  is_binary = TALLOC (size1 + 1, char);
+	}
+      else
+	{
+	  wcs_string1 = REGEX_TALLOC (size1 + 1, CHAR_T);
+	  mbs_offset1 = REGEX_TALLOC (size1 + 1, int);
+	  is_binary = REGEX_TALLOC (size1 + 1, char);
+	}
+      if (!wcs_string1 || !mbs_offset1 || !is_binary)
+	{
+	  if (size1 > MAX_ALLOCA_SIZE)
+	    {
+	      free (wcs_string1);
+	      free (mbs_offset1);
+	      free (is_binary);
+	    }
+	  else
+	    {
+	      FREE_VAR (wcs_string1);
+	      FREE_VAR (mbs_offset1);
+	      FREE_VAR (is_binary);
+	    }
+	  return -2;
+	}
+      wcs_size1 = convert_mbs_to_wcs(wcs_string1, string1, size1,
+				     mbs_offset1, is_binary);
+      wcs_string1[wcs_size1] = L'\0'; /* for a sentinel  */
+      if (size1 > MAX_ALLOCA_SIZE)
+	free (is_binary);
+      else
+	FREE_VAR (is_binary);
+    }
+  if (size2 != 0)
+    {
+      if (size2 > MAX_ALLOCA_SIZE)
+	{
+	  wcs_string2 = TALLOC (size2 + 1, CHAR_T);
+	  mbs_offset2 = TALLOC (size2 + 1, int);
+	  is_binary = TALLOC (size2 + 1, char);
+	}
+      else
+	{
+	  wcs_string2 = REGEX_TALLOC (size2 + 1, CHAR_T);
+	  mbs_offset2 = REGEX_TALLOC (size2 + 1, int);
+	  is_binary = REGEX_TALLOC (size2 + 1, char);
+	}
+      if (!wcs_string2 || !mbs_offset2 || !is_binary)
+	{
+	  FREE_WCS_BUFFERS ();
+	  if (size2 > MAX_ALLOCA_SIZE)
+	    free (is_binary);
+	  else
+	    FREE_VAR (is_binary);
+	  return -2;
+	}
+      wcs_size2 = convert_mbs_to_wcs(wcs_string2, string2, size2,
+				     mbs_offset2, is_binary);
+      wcs_string2[wcs_size2] = L'\0'; /* for a sentinel  */
+      if (size2 > MAX_ALLOCA_SIZE)
+	free (is_binary);
+      else
+	FREE_VAR (is_binary);
+    }
+#endif /* WCHAR */
+
+
+  /* Loop through the string, looking for a place to start matching.  */
+  for (;;)
+    {
+      /* If a fastmap is supplied, skip quickly over characters that
+         cannot be the start of a match.  If the pattern can match the
+         null string, however, we don't need to skip characters; we want
+         the first null string.  */
+      if (fastmap && startpos < total_size && !bufp->can_be_null)
+	{
+	  if (range > 0)	/* Searching forwards.  */
+	    {
+	      register const char *d;
+	      register int lim = 0;
+	      int irange = range;
+
+              if (startpos < size1 && startpos + range >= size1)
+                lim = range - (size1 - startpos);
+
+	      d = (startpos >= size1 ? string2 - size1 : string1) + startpos;
+
+              /* Written out as an if-else to avoid testing `translate'
+                 inside the loop.  */
+	      if (translate)
+                while (range > lim
+                       && !fastmap[(unsigned char)
+				   translate[(unsigned char) *d++]])
+                  range--;
+	      else
+                while (range > lim && !fastmap[(unsigned char) *d++])
+                  range--;
+
+	      startpos += irange - range;
+	    }
+	  else				/* Searching backwards.  */
+	    {
+	      register CHAR_T c = (size1 == 0 || startpos >= size1
+				      ? string2[startpos - size1]
+				      : string1[startpos]);
+
+	      if (!fastmap[(unsigned char) TRANSLATE (c)])
+		goto advance;
+	    }
+	}
+
+      /* If can't match the null string, and that's all we have left, fail.  */
+      if (range >= 0 && startpos == total_size && fastmap
+          && !bufp->can_be_null)
+       {
+#ifdef WCHAR
+         FREE_WCS_BUFFERS ();
+#endif
+         return -1;
+       }
+
+#ifdef WCHAR
+      val = wcs_re_match_2_internal (bufp, string1, size1, string2,
+				     size2, startpos, regs, stop,
+				     wcs_string1, wcs_size1,
+				     wcs_string2, wcs_size2,
+				     mbs_offset1, mbs_offset2);
+#else /* BYTE */
+      val = byte_re_match_2_internal (bufp, string1, size1, string2,
+				      size2, startpos, regs, stop);
+#endif /* BYTE */
+
+#ifndef REGEX_MALLOC
+# ifdef C_ALLOCA
+      alloca (0);
+# endif
+#endif
+
+      if (val >= 0)
+	{
+#ifdef WCHAR
+	  FREE_WCS_BUFFERS ();
+#endif
+	  return startpos;
+	}
+
+      if (val == -2)
+	{
+#ifdef WCHAR
+	  FREE_WCS_BUFFERS ();
+#endif
+	  return -2;
+	}
+
+    advance:
+      if (!range)
+        break;
+      else if (range > 0)
+        {
+          range--;
+          startpos++;
+        }
+      else
+        {
+          range++;
+          startpos--;
+        }
+    }
+#ifdef WCHAR
+  FREE_WCS_BUFFERS ();
+#endif
+  return -1;
+}
+
+#ifdef WCHAR
+/* This converts PTR, a pointer into one of the search wchar_t strings
+   `string1' and `string2' into an multibyte string offset from the
+   beginning of that string. We use mbs_offset to optimize.
+   See convert_mbs_to_wcs.  */
+# define POINTER_TO_OFFSET(ptr)						\
+  (FIRST_STRING_P (ptr)							\
+   ? ((regoff_t)(mbs_offset1 != NULL? mbs_offset1[(ptr)-string1] : 0))	\
+   : ((regoff_t)((mbs_offset2 != NULL? mbs_offset2[(ptr)-string2] : 0)	\
+		 + csize1)))
+#else /* BYTE */
+/* This converts PTR, a pointer into one of the search strings `string1'
+   and `string2' into an offset from the beginning of that string.  */
+# define POINTER_TO_OFFSET(ptr)			\
+  (FIRST_STRING_P (ptr)				\
+   ? ((regoff_t) ((ptr) - string1))		\
+   : ((regoff_t) ((ptr) - string2 + size1)))
+#endif /* WCHAR */
+
+/* Macros for dealing with the split strings in re_match_2.  */
+
+#define MATCHING_IN_FIRST_STRING  (dend == end_match_1)
+
+/* Call before fetching a character with *d.  This switches over to
+   string2 if necessary.  */
+#define PREFETCH()							\
+  while (d == dend)						    	\
+    {									\
+      /* End of string2 => fail.  */					\
+      if (dend == end_match_2) 						\
+        goto fail;							\
+      /* End of string1 => advance to string2.  */ 			\
+      d = string2;						        \
+      dend = end_match_2;						\
+    }
+
+/* Test if at very beginning or at very end of the virtual concatenation
+   of `string1' and `string2'.  If only one string, it's `string2'.  */
+#define AT_STRINGS_BEG(d) ((d) == (size1 ? string1 : string2) || !size2)
+#define AT_STRINGS_END(d) ((d) == end2)
+
+
+/* Test if D points to a character which is word-constituent.  We have
+   two special cases to check for: if past the end of string1, look at
+   the first character in string2; and if before the beginning of
+   string2, look at the last character in string1.  */
+#ifdef WCHAR
+/* Use internationalized API instead of SYNTAX.  */
+# define WORDCHAR_P(d)							\
+  (iswalnum ((wint_t)((d) == end1 ? *string2				\
+           : (d) == string2 - 1 ? *(end1 - 1) : *(d))) != 0		\
+   || ((d) == end1 ? *string2						\
+       : (d) == string2 - 1 ? *(end1 - 1) : *(d)) == L'_')
+#else /* BYTE */
+# define WORDCHAR_P(d)							\
+  (SYNTAX ((d) == end1 ? *string2					\
+           : (d) == string2 - 1 ? *(end1 - 1) : *(d))			\
+   == Sword)
+#endif /* WCHAR */
+
+/* Disabled due to a compiler bug -- see comment at case wordbound */
+#if 0
+/* Test if the character before D and the one at D differ with respect
+   to being word-constituent.  */
+#define AT_WORD_BOUNDARY(d)						\
+  (AT_STRINGS_BEG (d) || AT_STRINGS_END (d)				\
+   || WORDCHAR_P (d - 1) != WORDCHAR_P (d))
+#endif
+
+/* Free everything we malloc.  */
+#ifdef MATCH_MAY_ALLOCATE
+# ifdef WCHAR
+#  define FREE_VARIABLES()						\
+  do {									\
+    REGEX_FREE_STACK (fail_stack.stack);				\
+    FREE_VAR (regstart);						\
+    FREE_VAR (regend);							\
+    FREE_VAR (old_regstart);						\
+    FREE_VAR (old_regend);						\
+    FREE_VAR (best_regstart);						\
+    FREE_VAR (best_regend);						\
+    FREE_VAR (reg_info);						\
+    FREE_VAR (reg_dummy);						\
+    FREE_VAR (reg_info_dummy);						\
+    if (!cant_free_wcs_buf)						\
+      {									\
+        FREE_VAR (string1);						\
+        FREE_VAR (string2);						\
+        FREE_VAR (mbs_offset1);						\
+        FREE_VAR (mbs_offset2);						\
+      }									\
+  } while (0)
+# else /* BYTE */
+#  define FREE_VARIABLES()						\
+  do {									\
+    REGEX_FREE_STACK (fail_stack.stack);				\
+    FREE_VAR (regstart);						\
+    FREE_VAR (regend);							\
+    FREE_VAR (old_regstart);						\
+    FREE_VAR (old_regend);						\
+    FREE_VAR (best_regstart);						\
+    FREE_VAR (best_regend);						\
+    FREE_VAR (reg_info);						\
+    FREE_VAR (reg_dummy);						\
+    FREE_VAR (reg_info_dummy);						\
+  } while (0)
+# endif /* WCHAR */
+#else
+# ifdef WCHAR
+#  define FREE_VARIABLES()						\
+  do {									\
+    if (!cant_free_wcs_buf)						\
+      {									\
+        FREE_VAR (string1);						\
+        FREE_VAR (string2);						\
+        FREE_VAR (mbs_offset1);						\
+        FREE_VAR (mbs_offset2);						\
+      }									\
+  } while (0)
+# else /* BYTE */
+#  define FREE_VARIABLES() ((void)0) /* Do nothing!  But inhibit gcc warning. */
+# endif /* WCHAR */
+#endif /* not MATCH_MAY_ALLOCATE */
+
+/* These values must meet several constraints.  They must not be valid
+   register values; since we have a limit of 255 registers (because
+   we use only one byte in the pattern for the register number), we can
+   use numbers larger than 255.  They must differ by 1, because of
+   NUM_FAILURE_ITEMS above.  And the value for the lowest register must
+   be larger than the value for the highest register, so we do not try
+   to actually save any registers when none are active.  */
+#define NO_HIGHEST_ACTIVE_REG (1 << BYTEWIDTH)
+#define NO_LOWEST_ACTIVE_REG (NO_HIGHEST_ACTIVE_REG + 1)
+
+#else /* not INSIDE_RECURSION */
+/* Matching routines.  */
+
+#ifndef emacs   /* Emacs never uses this.  */
+/* re_match is like re_match_2 except it takes only a single string.  */
+
+int
+re_match (struct re_pattern_buffer *bufp, const char *string,
+          int size, int pos, struct re_registers *regs)
+{
+  int result;
+# ifdef MBS_SUPPORT
+  if (MB_CUR_MAX != 1)
+    result = wcs_re_match_2_internal (bufp, NULL, 0, string, size,
+				      pos, regs, size,
+				      NULL, 0, NULL, 0, NULL, NULL);
+  else
+# endif
+    result = byte_re_match_2_internal (bufp, NULL, 0, string, size,
+				  pos, regs, size);
+# ifndef REGEX_MALLOC
+#  ifdef C_ALLOCA
+  alloca (0);
+#  endif
+# endif
+  return result;
+}
+# ifdef _LIBC
+weak_alias (__re_match, re_match)
+# endif
+#endif /* not emacs */
+
+#endif /* not INSIDE_RECURSION */
+
+#ifdef INSIDE_RECURSION
+static boolean PREFIX(group_match_null_string_p) (UCHAR_T **p,
+                                                  UCHAR_T *end,
+					PREFIX(register_info_type) *reg_info);
+static boolean PREFIX(alt_match_null_string_p) (UCHAR_T *p,
+                                                UCHAR_T *end,
+					PREFIX(register_info_type) *reg_info);
+static boolean PREFIX(common_op_match_null_string_p) (UCHAR_T **p,
+                                                      UCHAR_T *end,
+					PREFIX(register_info_type) *reg_info);
+static int PREFIX(bcmp_translate) (const CHAR_T *s1, const CHAR_T *s2,
+                                   int len, char *translate);
+#else /* not INSIDE_RECURSION */
+
+/* re_match_2 matches the compiled pattern in BUFP against the
+   the (virtual) concatenation of STRING1 and STRING2 (of length SIZE1
+   and SIZE2, respectively).  We start matching at POS, and stop
+   matching at STOP.
+
+   If REGS is non-null and the `no_sub' field of BUFP is nonzero, we
+   store offsets for the substring each group matched in REGS.  See the
+   documentation for exactly how many groups we fill.
+
+   We return -1 if no match, -2 if an internal error (such as the
+   failure stack overflowing).  Otherwise, we return the length of the
+   matched substring.  */
+
+int
+re_match_2 (struct re_pattern_buffer *bufp, const char *string1, int size1,
+            const char *string2, int size2, int pos,
+            struct re_registers *regs, int stop)
+{
+  int result;
+# ifdef MBS_SUPPORT
+  if (MB_CUR_MAX != 1)
+    result = wcs_re_match_2_internal (bufp, string1, size1, string2, size2,
+				      pos, regs, stop,
+				      NULL, 0, NULL, 0, NULL, NULL);
+  else
+# endif
+    result = byte_re_match_2_internal (bufp, string1, size1, string2, size2,
+				  pos, regs, stop);
+
+#ifndef REGEX_MALLOC
+# ifdef C_ALLOCA
+  alloca (0);
+# endif
+#endif
+  return result;
+}
+#ifdef _LIBC
+weak_alias (__re_match_2, re_match_2)
+#endif
+
+#endif /* not INSIDE_RECURSION */
+
+#ifdef INSIDE_RECURSION
+
+#ifdef WCHAR
+static int count_mbs_length (int *, int);
+
+/* This check the substring (from 0, to length) of the multibyte string,
+   to which offset_buffer correspond. And count how many wchar_t_characters
+   the substring occupy. We use offset_buffer to optimization.
+   See convert_mbs_to_wcs.  */
+
+static int
+count_mbs_length(int *offset_buffer, int length)
+{
+  int upper, lower;
+
+  /* Check whether the size is valid.  */
+  if (length < 0)
+    return -1;
+
+  if (offset_buffer == NULL)
+    return 0;
+
+  /* If there are no multibyte character, offset_buffer[i] == i.
+   Optmize for this case.  */
+  if (offset_buffer[length] == length)
+    return length;
+
+  /* Set up upper with length. (because for all i, offset_buffer[i] >= i)  */
+  upper = length;
+  lower = 0;
+
+  while (true)
+    {
+      int middle = (lower + upper) / 2;
+      if (middle == lower || middle == upper)
+	break;
+      if (offset_buffer[middle] > length)
+	upper = middle;
+      else if (offset_buffer[middle] < length)
+	lower = middle;
+      else
+	return middle;
+    }
+
+  return -1;
+}
+#endif /* WCHAR */
+
+/* This is a separate function so that we can force an alloca cleanup
+   afterwards.  */
+#ifdef WCHAR
+static int
+wcs_re_match_2_internal (struct re_pattern_buffer *bufp,
+                         const char *cstring1, int csize1,
+                         const char *cstring2, int csize2,
+                         int pos,
+			 struct re_registers *regs,
+                         int stop,
+     /* string1 == string2 == NULL means string1/2, size1/2 and
+	mbs_offset1/2 need seting up in this function.  */
+     /* We need wchar_t* buffers correspond to cstring1, cstring2.  */
+                         wchar_t *string1, int size1,
+                         wchar_t *string2, int size2,
+     /* offset buffer for optimizatoin. See convert_mbs_to_wc.  */
+			 int *mbs_offset1, int *mbs_offset2)
+#else /* BYTE */
+static int
+byte_re_match_2_internal (struct re_pattern_buffer *bufp,
+                          const char *string1, int size1,
+                          const char *string2, int size2,
+                          int pos,
+			  struct re_registers *regs, int stop)
+#endif /* BYTE */
+{
+  /* General temporaries.  */
+  int mcnt;
+  UCHAR_T *p1;
+#ifdef WCHAR
+  /* They hold whether each wchar_t is binary data or not.  */
+  char *is_binary = NULL;
+  /* If true, we can't free string1/2, mbs_offset1/2.  */
+  int cant_free_wcs_buf = 1;
+#endif /* WCHAR */
+
+  /* Just past the end of the corresponding string.  */
+  const CHAR_T *end1, *end2;
+
+  /* Pointers into string1 and string2, just past the last characters in
+     each to consider matching.  */
+  const CHAR_T *end_match_1, *end_match_2;
+
+  /* Where we are in the data, and the end of the current string.  */
+  const CHAR_T *d, *dend;
+
+  /* Where we are in the pattern, and the end of the pattern.  */
+#ifdef WCHAR
+  UCHAR_T *pattern, *p;
+  register UCHAR_T *pend;
+#else /* BYTE */
+  UCHAR_T *p = bufp->buffer;
+  register UCHAR_T *pend = p + bufp->used;
+#endif /* WCHAR */
+
+  /* Mark the opcode just after a start_memory, so we can test for an
+     empty subpattern when we get to the stop_memory.  */
+  UCHAR_T *just_past_start_mem = 0;
+
+  /* We use this to map every character in the string.  */
+  RE_TRANSLATE_TYPE translate = bufp->translate;
+
+  /* Failure point stack.  Each place that can handle a failure further
+     down the line pushes a failure point on this stack.  It consists of
+     restart, regend, and reg_info for all registers corresponding to
+     the subexpressions we're currently inside, plus the number of such
+     registers, and, finally, two char *'s.  The first char * is where
+     to resume scanning the pattern; the second one is where to resume
+     scanning the strings.  If the latter is zero, the failure point is
+     a ``dummy''; if a failure happens and the failure point is a dummy,
+     it gets discarded and the next next one is tried.  */
+#ifdef MATCH_MAY_ALLOCATE /* otherwise, this is global.  */
+  PREFIX(fail_stack_type) fail_stack;
+#endif
+#ifdef DEBUG
+  static unsigned failure_id;
+  unsigned nfailure_points_pushed = 0, nfailure_points_popped = 0;
+#endif
+
+#ifdef REL_ALLOC
+  /* This holds the pointer to the failure stack, when
+     it is allocated relocatably.  */
+  fail_stack_elt_t *failure_stack_ptr;
+#endif
+
+  /* We fill all the registers internally, independent of what we
+     return, for use in backreferences.  The number here includes
+     an element for register zero.  */
+  size_t num_regs = bufp->re_nsub + 1;
+
+  /* The currently active registers.  */
+  active_reg_t lowest_active_reg = NO_LOWEST_ACTIVE_REG;
+  active_reg_t highest_active_reg = NO_HIGHEST_ACTIVE_REG;
+
+  /* Information on the contents of registers. These are pointers into
+     the input strings; they record just what was matched (on this
+     attempt) by a subexpression part of the pattern, that is, the
+     regnum-th regstart pointer points to where in the pattern we began
+     matching and the regnum-th regend points to right after where we
+     stopped matching the regnum-th subexpression.  (The zeroth register
+     keeps track of what the whole pattern matches.)  */
+#ifdef MATCH_MAY_ALLOCATE /* otherwise, these are global.  */
+  const CHAR_T **regstart, **regend;
+#endif
+
+  /* If a group that's operated upon by a repetition operator fails to
+     match anything, then the register for its start will need to be
+     restored because it will have been set to wherever in the string we
+     are when we last see its open-group operator.  Similarly for a
+     register's end.  */
+#ifdef MATCH_MAY_ALLOCATE /* otherwise, these are global.  */
+  const CHAR_T **old_regstart, **old_regend;
+#endif
+
+  /* The is_active field of reg_info helps us keep track of which (possibly
+     nested) subexpressions we are currently in. The matched_something
+     field of reg_info[reg_num] helps us tell whether or not we have
+     matched any of the pattern so far this time through the reg_num-th
+     subexpression.  These two fields get reset each time through any
+     loop their register is in.  */
+#ifdef MATCH_MAY_ALLOCATE /* otherwise, this is global.  */
+  PREFIX(register_info_type) *reg_info;
+#endif
+
+  /* The following record the register info as found in the above
+     variables when we find a match better than any we've seen before.
+     This happens as we backtrack through the failure points, which in
+     turn happens only if we have not yet matched the entire string. */
+  unsigned best_regs_set = false;
+#ifdef MATCH_MAY_ALLOCATE /* otherwise, these are global.  */
+  const CHAR_T **best_regstart, **best_regend;
+#endif
+
+  /* Logically, this is `best_regend[0]'.  But we don't want to have to
+     allocate space for that if we're not allocating space for anything
+     else (see below).  Also, we never need info about register 0 for
+     any of the other register vectors, and it seems rather a kludge to
+     treat `best_regend' differently than the rest.  So we keep track of
+     the end of the best match so far in a separate variable.  We
+     initialize this to NULL so that when we backtrack the first time
+     and need to test it, it's not garbage.  */
+  const CHAR_T *match_end = NULL;
+
+  /* This helps SET_REGS_MATCHED avoid doing redundant work.  */
+  int set_regs_matched_done = 0;
+
+  /* Used when we pop values we don't care about.  */
+#ifdef MATCH_MAY_ALLOCATE /* otherwise, these are global.  */
+  const CHAR_T **reg_dummy;
+  PREFIX(register_info_type) *reg_info_dummy;
+#endif
+
+#ifdef DEBUG
+  /* Counts the total number of registers pushed.  */
+  unsigned num_regs_pushed = 0;
+#endif
+
+  DEBUG_PRINT1 ("\n\nEntering re_match_2.\n");
+
+  INIT_FAIL_STACK ();
+
+#ifdef MATCH_MAY_ALLOCATE
+  /* Do not bother to initialize all the register variables if there are
+     no groups in the pattern, as it takes a fair amount of time.  If
+     there are groups, we include space for register 0 (the whole
+     pattern), even though we never use it, since it simplifies the
+     array indexing.  We should fix this.  */
+  if (bufp->re_nsub)
+    {
+      regstart = REGEX_TALLOC (num_regs, const CHAR_T *);
+      regend = REGEX_TALLOC (num_regs, const CHAR_T *);
+      old_regstart = REGEX_TALLOC (num_regs, const CHAR_T *);
+      old_regend = REGEX_TALLOC (num_regs, const CHAR_T *);
+      best_regstart = REGEX_TALLOC (num_regs, const CHAR_T *);
+      best_regend = REGEX_TALLOC (num_regs, const CHAR_T *);
+      reg_info = REGEX_TALLOC (num_regs, PREFIX(register_info_type));
+      reg_dummy = REGEX_TALLOC (num_regs, const CHAR_T *);
+      reg_info_dummy = REGEX_TALLOC (num_regs, PREFIX(register_info_type));
+
+      if (!(regstart && regend && old_regstart && old_regend && reg_info
+            && best_regstart && best_regend && reg_dummy && reg_info_dummy))
+        {
+          FREE_VARIABLES ();
+          return -2;
+        }
+    }
+  else
+    {
+      /* We must initialize all our variables to NULL, so that
+         `FREE_VARIABLES' doesn't try to free them.  */
+      regstart = regend = old_regstart = old_regend = best_regstart
+        = best_regend = reg_dummy = NULL;
+      reg_info = reg_info_dummy = (PREFIX(register_info_type) *) NULL;
+    }
+#endif /* MATCH_MAY_ALLOCATE */
+
+  /* The starting position is bogus.  */
+#ifdef WCHAR
+  if (pos < 0 || pos > csize1 + csize2)
+#else /* BYTE */
+  if (pos < 0 || pos > size1 + size2)
+#endif
+    {
+      FREE_VARIABLES ();
+      return -1;
+    }
+
+#ifdef WCHAR
+  /* Allocate wchar_t array for string1 and string2 and
+     fill them with converted string.  */
+  if (string1 == NULL && string2 == NULL)
+    {
+      /* We need seting up buffers here.  */
+
+      /* We must free wcs buffers in this function.  */
+      cant_free_wcs_buf = 0;
+
+      if (csize1 != 0)
+	{
+	  string1 = REGEX_TALLOC (csize1 + 1, CHAR_T);
+	  mbs_offset1 = REGEX_TALLOC (csize1 + 1, int);
+	  is_binary = REGEX_TALLOC (csize1 + 1, char);
+	  if (!string1 || !mbs_offset1 || !is_binary)
+	    {
+	      FREE_VAR (string1);
+	      FREE_VAR (mbs_offset1);
+	      FREE_VAR (is_binary);
+	      return -2;
+	    }
+	}
+      if (csize2 != 0)
+	{
+	  string2 = REGEX_TALLOC (csize2 + 1, CHAR_T);
+	  mbs_offset2 = REGEX_TALLOC (csize2 + 1, int);
+	  is_binary = REGEX_TALLOC (csize2 + 1, char);
+	  if (!string2 || !mbs_offset2 || !is_binary)
+	    {
+	      FREE_VAR (string1);
+	      FREE_VAR (mbs_offset1);
+	      FREE_VAR (string2);
+	      FREE_VAR (mbs_offset2);
+	      FREE_VAR (is_binary);
+	      return -2;
+	    }
+	  size2 = convert_mbs_to_wcs(string2, cstring2, csize2,
+				     mbs_offset2, is_binary);
+	  string2[size2] = L'\0'; /* for a sentinel  */
+	  FREE_VAR (is_binary);
+	}
+    }
+
+  /* We need to cast pattern to (wchar_t*), because we casted this compiled
+     pattern to (char*) in regex_compile.  */
+  p = pattern = (CHAR_T*)bufp->buffer;
+  pend = (CHAR_T*)(bufp->buffer + bufp->used);
+
+#endif /* WCHAR */
+
+  /* Initialize subexpression text positions to -1 to mark ones that no
+     start_memory/stop_memory has been seen for. Also initialize the
+     register information struct.  */
+  for (mcnt = 1; (unsigned) mcnt < num_regs; mcnt++)
+    {
+      regstart[mcnt] = regend[mcnt]
+        = old_regstart[mcnt] = old_regend[mcnt] = REG_UNSET_VALUE;
+
+      REG_MATCH_NULL_STRING_P (reg_info[mcnt]) = MATCH_NULL_UNSET_VALUE;
+      IS_ACTIVE (reg_info[mcnt]) = 0;
+      MATCHED_SOMETHING (reg_info[mcnt]) = 0;
+      EVER_MATCHED_SOMETHING (reg_info[mcnt]) = 0;
+    }
+
+  /* We move `string1' into `string2' if the latter's empty -- but not if
+     `string1' is null.  */
+  if (size2 == 0 && string1 != NULL)
+    {
+      string2 = string1;
+      size2 = size1;
+      string1 = 0;
+      size1 = 0;
+#ifdef WCHAR
+      mbs_offset2 = mbs_offset1;
+      csize2 = csize1;
+      mbs_offset1 = NULL;
+      csize1 = 0;
+#endif
+    }
+  end1 = string1 + size1;
+  end2 = string2 + size2;
+
+  /* Compute where to stop matching, within the two strings.  */
+#ifdef WCHAR
+  if (stop <= csize1)
+    {
+      mcnt = count_mbs_length(mbs_offset1, stop);
+      end_match_1 = string1 + mcnt;
+      end_match_2 = string2;
+    }
+  else
+    {
+      if (stop > csize1 + csize2)
+	stop = csize1 + csize2;
+      end_match_1 = end1;
+      mcnt = count_mbs_length(mbs_offset2, stop-csize1);
+      end_match_2 = string2 + mcnt;
+    }
+  if (mcnt < 0)
+    { /* count_mbs_length return error.  */
+      FREE_VARIABLES ();
+      return -1;
+    }
+#else
+  if (stop <= size1)
+    {
+      end_match_1 = string1 + stop;
+      end_match_2 = string2;
+    }
+  else
+    {
+      end_match_1 = end1;
+      end_match_2 = string2 + stop - size1;
+    }
+#endif /* WCHAR */
+
+  /* `p' scans through the pattern as `d' scans through the data.
+     `dend' is the end of the input string that `d' points within.  `d'
+     is advanced into the following input string whenever necessary, but
+     this happens before fetching; therefore, at the beginning of the
+     loop, `d' can be pointing at the end of a string, but it cannot
+     equal `string2'.  */
+#ifdef WCHAR
+  if (size1 > 0 && pos <= csize1)
+    {
+      mcnt = count_mbs_length(mbs_offset1, pos);
+      d = string1 + mcnt;
+      dend = end_match_1;
+    }
+  else
+    {
+      mcnt = count_mbs_length(mbs_offset2, pos-csize1);
+      d = string2 + mcnt;
+      dend = end_match_2;
+    }
+
+  if (mcnt < 0)
+    { /* count_mbs_length return error.  */
+      FREE_VARIABLES ();
+      return -1;
+    }
+#else
+  if (size1 > 0 && pos <= size1)
+    {
+      d = string1 + pos;
+      dend = end_match_1;
+    }
+  else
+    {
+      d = string2 + pos - size1;
+      dend = end_match_2;
+    }
+#endif /* WCHAR */
+
+  DEBUG_PRINT1 ("The compiled pattern is:\n");
+  DEBUG_PRINT_COMPILED_PATTERN (bufp, p, pend);
+  DEBUG_PRINT1 ("The string to match is: `");
+  DEBUG_PRINT_DOUBLE_STRING (d, string1, size1, string2, size2);
+  DEBUG_PRINT1 ("'\n");
+
+  /* This loops over pattern commands.  It exits by returning from the
+     function if the match is complete, or it drops through if the match
+     fails at this starting point in the input data.  */
+  for (;;)
+    {
+#ifdef _LIBC
+      DEBUG_PRINT2 ("\n%p: ", p);
+#else
+      DEBUG_PRINT2 ("\n0x%x: ", p);
+#endif
+
+      if (p == pend)
+	{ /* End of pattern means we might have succeeded.  */
+          DEBUG_PRINT1 ("end of pattern ... ");
+
+	  /* If we haven't matched the entire string, and we want the
+             longest match, try backtracking.  */
+          if (d != end_match_2)
+	    {
+	      /* 1 if this match ends in the same string (string1 or string2)
+		 as the best previous match.  */
+	      boolean same_str_p;
+
+	      /* 1 if this match is the best seen so far.  */
+	      boolean best_match_p;
+
+              same_str_p = (FIRST_STRING_P (match_end)
+                            == MATCHING_IN_FIRST_STRING);
+
+	      /* AIX compiler got confused when this was combined
+		 with the previous declaration.  */
+	      if (same_str_p)
+		best_match_p = d > match_end;
+	      else
+		best_match_p = !MATCHING_IN_FIRST_STRING;
+
+              DEBUG_PRINT1 ("backtracking.\n");
+
+              if (!FAIL_STACK_EMPTY ())
+                { /* More failure points to try.  */
+
+                  /* If exceeds best match so far, save it.  */
+                  if (!best_regs_set || best_match_p)
+                    {
+                      best_regs_set = true;
+                      match_end = d;
+
+                      DEBUG_PRINT1 ("\nSAVING match as best so far.\n");
+
+                      for (mcnt = 1; (unsigned) mcnt < num_regs; mcnt++)
+                        {
+                          best_regstart[mcnt] = regstart[mcnt];
+                          best_regend[mcnt] = regend[mcnt];
+                        }
+                    }
+                  goto fail;
+                }
+
+              /* If no failure points, don't restore garbage.  And if
+                 last match is real best match, don't restore second
+                 best one. */
+              else if (best_regs_set && !best_match_p)
+                {
+  	        restore_best_regs:
+                  /* Restore best match.  It may happen that `dend ==
+                     end_match_1' while the restored d is in string2.
+                     For example, the pattern `x.*y.*z' against the
+                     strings `x-' and `y-z-', if the two strings are
+                     not consecutive in memory.  */
+                  DEBUG_PRINT1 ("Restoring best registers.\n");
+
+                  d = match_end;
+                  dend = ((d >= string1 && d <= end1)
+		           ? end_match_1 : end_match_2);
+
+		  for (mcnt = 1; (unsigned) mcnt < num_regs; mcnt++)
+		    {
+		      regstart[mcnt] = best_regstart[mcnt];
+		      regend[mcnt] = best_regend[mcnt];
+		    }
+                }
+            } /* d != end_match_2 */
+
+	succeed_label:
+          DEBUG_PRINT1 ("Accepting match.\n");
+          /* If caller wants register contents data back, do it.  */
+          if (regs && !bufp->no_sub)
+	    {
+	      /* Have the register data arrays been allocated?  */
+              if (bufp->regs_allocated == REGS_UNALLOCATED)
+                { /* No.  So allocate them with malloc.  We need one
+                     extra element beyond `num_regs' for the `-1' marker
+                     GNU code uses.  */
+                  regs->num_regs = MAX (RE_NREGS, num_regs + 1);
+                  regs->start = TALLOC (regs->num_regs, regoff_t);
+                  regs->end = TALLOC (regs->num_regs, regoff_t);
+                  if (regs->start == NULL || regs->end == NULL)
+		    {
+		      FREE_VARIABLES ();
+		      return -2;
+		    }
+                  bufp->regs_allocated = REGS_REALLOCATE;
+                }
+              else if (bufp->regs_allocated == REGS_REALLOCATE)
+                { /* Yes.  If we need more elements than were already
+                     allocated, reallocate them.  If we need fewer, just
+                     leave it alone.  */
+                  if (regs->num_regs < num_regs + 1)
+                    {
+                      regs->num_regs = num_regs + 1;
+                      RETALLOC (regs->start, regs->num_regs, regoff_t);
+                      RETALLOC (regs->end, regs->num_regs, regoff_t);
+                      if (regs->start == NULL || regs->end == NULL)
+			{
+			  FREE_VARIABLES ();
+			  return -2;
+			}
+                    }
+                }
+              else
+		{
+		  /* These braces fend off a "empty body in an else-statement"
+		     warning under GCC when assert expands to nothing.  */
+		  assert (bufp->regs_allocated == REGS_FIXED);
+		}
+
+              /* Convert the pointer data in `regstart' and `regend' to
+                 indices.  Register zero has to be set differently,
+                 since we haven't kept track of any info for it.  */
+              if (regs->num_regs > 0)
+                {
+                  regs->start[0] = pos;
+#ifdef WCHAR
+		  if (MATCHING_IN_FIRST_STRING)
+		    regs->end[0] = mbs_offset1 != NULL ?
+					mbs_offset1[d-string1] : 0;
+		  else
+		    regs->end[0] = csize1 + (mbs_offset2 != NULL ?
+					     mbs_offset2[d-string2] : 0);
+#else
+                  regs->end[0] = (MATCHING_IN_FIRST_STRING
+				  ? ((regoff_t) (d - string1))
+			          : ((regoff_t) (d - string2 + size1)));
+#endif /* WCHAR */
+                }
+
+              /* Go through the first `min (num_regs, regs->num_regs)'
+                 registers, since that is all we initialized.  */
+	      for (mcnt = 1; (unsigned) mcnt < MIN (num_regs, regs->num_regs);
+		   mcnt++)
+		{
+                  if (REG_UNSET (regstart[mcnt]) || REG_UNSET (regend[mcnt]))
+                    regs->start[mcnt] = regs->end[mcnt] = -1;
+                  else
+                    {
+		      regs->start[mcnt]
+			= (regoff_t) POINTER_TO_OFFSET (regstart[mcnt]);
+                      regs->end[mcnt]
+			= (regoff_t) POINTER_TO_OFFSET (regend[mcnt]);
+                    }
+		}
+
+              /* If the regs structure we return has more elements than
+                 were in the pattern, set the extra elements to -1.  If
+                 we (re)allocated the registers, this is the case,
+                 because we always allocate enough to have at least one
+                 -1 at the end.  */
+              for (mcnt = num_regs; (unsigned) mcnt < regs->num_regs; mcnt++)
+                regs->start[mcnt] = regs->end[mcnt] = -1;
+	    } /* regs && !bufp->no_sub */
+
+          DEBUG_PRINT4 ("%u failure points pushed, %u popped (%u remain).\n",
+                        nfailure_points_pushed, nfailure_points_popped,
+                        nfailure_points_pushed - nfailure_points_popped);
+          DEBUG_PRINT2 ("%u registers pushed.\n", num_regs_pushed);
+
+#ifdef WCHAR
+	  if (MATCHING_IN_FIRST_STRING)
+	    mcnt = mbs_offset1 != NULL ? mbs_offset1[d-string1] : 0;
+	  else
+	    mcnt = (mbs_offset2 != NULL ? mbs_offset2[d-string2] : 0) +
+			csize1;
+          mcnt -= pos;
+#else
+          mcnt = d - pos - (MATCHING_IN_FIRST_STRING
+			    ? string1
+			    : string2 - size1);
+#endif /* WCHAR */
+
+          DEBUG_PRINT2 ("Returning %d from re_match_2.\n", mcnt);
+
+          FREE_VARIABLES ();
+          return mcnt;
+        }
+
+      /* Otherwise match next pattern command.  */
+      switch (SWITCH_ENUM_CAST ((re_opcode_t) *p++))
+	{
+        /* Ignore these.  Used to ignore the n of succeed_n's which
+           currently have n == 0.  */
+        case no_op:
+          DEBUG_PRINT1 ("EXECUTING no_op.\n");
+          break;
+
+	case succeed:
+          DEBUG_PRINT1 ("EXECUTING succeed.\n");
+	  goto succeed_label;
+
+        /* Match the next n pattern characters exactly.  The following
+           byte in the pattern defines n, and the n bytes after that
+           are the characters to match.  */
+	case exactn:
+#ifdef MBS_SUPPORT
+	case exactn_bin:
+#endif
+	  mcnt = *p++;
+          DEBUG_PRINT2 ("EXECUTING exactn %d.\n", mcnt);
+
+          /* This is written out as an if-else so we don't waste time
+             testing `translate' inside the loop.  */
+          if (translate)
+	    {
+	      do
+		{
+		  PREFETCH ();
+#ifdef WCHAR
+		  if (*d <= 0xff)
+		    {
+		      if ((UCHAR_T) translate[(unsigned char) *d++]
+			  != (UCHAR_T) *p++)
+			goto fail;
+		    }
+		  else
+		    {
+		      if (*d++ != (CHAR_T) *p++)
+			goto fail;
+		    }
+#else
+		  if ((UCHAR_T) translate[(unsigned char) *d++]
+		      != (UCHAR_T) *p++)
+                    goto fail;
+#endif /* WCHAR */
+		}
+	      while (--mcnt);
+	    }
+	  else
+	    {
+	      do
+		{
+		  PREFETCH ();
+		  if (*d++ != (CHAR_T) *p++) goto fail;
+		}
+	      while (--mcnt);
+	    }
+	  SET_REGS_MATCHED ();
+          break;
+
+
+        /* Match any character except possibly a newline or a null.  */
+	case anychar:
+          DEBUG_PRINT1 ("EXECUTING anychar.\n");
+
+          PREFETCH ();
+
+          if ((!(bufp->syntax & RE_DOT_NEWLINE) && TRANSLATE (*d) == '\n')
+              || (bufp->syntax & RE_DOT_NOT_NULL && TRANSLATE (*d) == '\000'))
+	    goto fail;
+
+          SET_REGS_MATCHED ();
+          DEBUG_PRINT2 ("  Matched `%ld'.\n", (long int) *d);
+          d++;
+	  break;
+
+
+	case charset:
+	case charset_not:
+	  {
+	    register UCHAR_T c;
+#ifdef WCHAR
+	    unsigned int i, char_class_length, coll_symbol_length,
+              equiv_class_length, ranges_length, chars_length, length;
+	    CHAR_T *workp, *workp2, *charset_top;
+#define WORK_BUFFER_SIZE 128
+            CHAR_T str_buf[WORK_BUFFER_SIZE];
+# ifdef _LIBC
+	    uint32_t nrules;
+# endif /* _LIBC */
+#endif /* WCHAR */
+	    boolean negate = (re_opcode_t) *(p - 1) == charset_not;
+
+            DEBUG_PRINT2 ("EXECUTING charset%s.\n", negate ? "_not" : "");
+	    PREFETCH ();
+	    c = TRANSLATE (*d); /* The character to match.  */
+#ifdef WCHAR
+# ifdef _LIBC
+	    nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
+# endif /* _LIBC */
+	    charset_top = p - 1;
+	    char_class_length = *p++;
+	    coll_symbol_length = *p++;
+	    equiv_class_length = *p++;
+	    ranges_length = *p++;
+	    chars_length = *p++;
+	    /* p points charset[6], so the address of the next instruction
+	       (charset[l+m+n+2o+k+p']) equals p[l+m+n+2*o+p'],
+	       where l=length of char_classes, m=length of collating_symbol,
+	       n=equivalence_class, o=length of char_range,
+	       p'=length of character.  */
+	    workp = p;
+	    /* Update p to indicate the next instruction.  */
+	    p += char_class_length + coll_symbol_length+ equiv_class_length +
+              2*ranges_length + chars_length;
+
+            /* match with char_class?  */
+	    for (i = 0; i < char_class_length ; i += CHAR_CLASS_SIZE)
+	      {
+		wctype_t wctype;
+		uintptr_t alignedp = ((uintptr_t)workp
+				      + __alignof__(wctype_t) - 1)
+		  		      & ~(uintptr_t)(__alignof__(wctype_t) - 1);
+		wctype = *((wctype_t*)alignedp);
+		workp += CHAR_CLASS_SIZE;
+# ifdef _LIBC
+		if (__iswctype((wint_t)c, wctype))
+		  goto char_set_matched;
+# else
+		if (iswctype((wint_t)c, wctype))
+		  goto char_set_matched;
+# endif
+	      }
+
+            /* match with collating_symbol?  */
+# ifdef _LIBC
+	    if (nrules != 0)
+	      {
+		const unsigned char *extra = (const unsigned char *)
+		  _NL_CURRENT (LC_COLLATE, _NL_COLLATE_SYMB_EXTRAMB);
+
+		for (workp2 = workp + coll_symbol_length ; workp < workp2 ;
+		     workp++)
+		  {
+		    int32_t *wextra;
+		    wextra = (int32_t*)(extra + *workp++);
+		    for (i = 0; i < *wextra; ++i)
+		      if (TRANSLATE(d[i]) != wextra[1 + i])
+			break;
+
+		    if (i == *wextra)
+		      {
+			/* Update d, however d will be incremented at
+			   char_set_matched:, we decrement d here.  */
+			d += i - 1;
+			goto char_set_matched;
+		      }
+		  }
+	      }
+	    else /* (nrules == 0) */
+# endif
+	      /* If we can't look up collation data, we use wcscoll
+		 instead.  */
+	      {
+		for (workp2 = workp + coll_symbol_length ; workp < workp2 ;)
+		  {
+		    const CHAR_T *backup_d = d, *backup_dend = dend;
+# ifdef _LIBC
+		    length = __wcslen (workp);
+# else
+		    length = wcslen (workp);
+# endif
+
+		    /* If wcscoll(the collating symbol, whole string) > 0,
+		       any substring of the string never match with the
+		       collating symbol.  */
+# ifdef _LIBC
+		    if (__wcscoll (workp, d) > 0)
+# else
+		    if (wcscoll (workp, d) > 0)
+# endif
+		      {
+			workp += length + 1;
+			continue;
+		      }
+
+		    /* First, we compare the collating symbol with
+		       the first character of the string.
+		       If it don't match, we add the next character to
+		       the compare buffer in turn.  */
+		    for (i = 0 ; i < WORK_BUFFER_SIZE-1 ; i++, d++)
+		      {
+			int match;
+			if (d == dend)
+			  {
+			    if (dend == end_match_2)
+			      break;
+			    d = string2;
+			    dend = end_match_2;
+			  }
+
+			/* add next character to the compare buffer.  */
+			str_buf[i] = TRANSLATE(*d);
+			str_buf[i+1] = '\0';
+
+# ifdef _LIBC
+			match = __wcscoll (workp, str_buf);
+# else
+			match = wcscoll (workp, str_buf);
+# endif
+			if (match == 0)
+			  goto char_set_matched;
+
+			if (match < 0)
+			  /* (str_buf > workp) indicate (str_buf + X > workp),
+			     because for all X (str_buf + X > str_buf).
+			     So we don't need continue this loop.  */
+			  break;
+
+			/* Otherwise(str_buf < workp),
+			   (str_buf+next_character) may equals (workp).
+			   So we continue this loop.  */
+		      }
+		    /* not matched */
+		    d = backup_d;
+		    dend = backup_dend;
+		    workp += length + 1;
+		  }
+              }
+            /* match with equivalence_class?  */
+# ifdef _LIBC
+	    if (nrules != 0)
+	      {
+                const CHAR_T *backup_d = d, *backup_dend = dend;
+		/* Try to match the equivalence class against
+		   those known to the collate implementation.  */
+		const int32_t *table;
+		const int32_t *weights;
+		const int32_t *extra;
+		const int32_t *indirect;
+		int32_t idx, idx2;
+		wint_t *cp;
+		size_t len;
+
+		/* This #include defines a local function!  */
+#  include <locale/weightwc.h>
+
+		table = (const int32_t *)
+		  _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEWC);
+		weights = (const wint_t *)
+		  _NL_CURRENT (LC_COLLATE, _NL_COLLATE_WEIGHTWC);
+		extra = (const wint_t *)
+		  _NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAWC);
+		indirect = (const int32_t *)
+		  _NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTWC);
+
+		/* Write 1 collating element to str_buf, and
+		   get its index.  */
+		idx2 = 0;
+
+		for (i = 0 ; idx2 == 0 && i < WORK_BUFFER_SIZE - 1; i++)
+		  {
+		    cp = (wint_t*)str_buf;
+		    if (d == dend)
+		      {
+			if (dend == end_match_2)
+			  break;
+			d = string2;
+			dend = end_match_2;
+		      }
+		    str_buf[i] = TRANSLATE(*(d+i));
+		    str_buf[i+1] = '\0'; /* sentinel */
+		    idx2 = findidx ((const wint_t**)&cp);
+		  }
+
+		/* Update d, however d will be incremented at
+		   char_set_matched:, we decrement d here.  */
+		d = backup_d + ((wchar_t*)cp - (wchar_t*)str_buf - 1);
+		if (d >= dend)
+		  {
+		    if (dend == end_match_2)
+			d = dend;
+		    else
+		      {
+			d = string2;
+			dend = end_match_2;
+		      }
+		  }
+
+		len = weights[idx2];
+
+		for (workp2 = workp + equiv_class_length ; workp < workp2 ;
+		     workp++)
+		  {
+		    idx = (int32_t)*workp;
+		    /* We already checked idx != 0 in regex_compile. */
+
+		    if (idx2 != 0 && len == weights[idx])
+		      {
+			int cnt = 0;
+			while (cnt < len && (weights[idx + 1 + cnt]
+					     == weights[idx2 + 1 + cnt]))
+			  ++cnt;
+
+			if (cnt == len)
+			  goto char_set_matched;
+		      }
+		  }
+		/* not matched */
+                d = backup_d;
+                dend = backup_dend;
+	      }
+	    else /* (nrules == 0) */
+# endif
+	      /* If we can't look up collation data, we use wcscoll
+		 instead.  */
+	      {
+		for (workp2 = workp + equiv_class_length ; workp < workp2 ;)
+		  {
+		    const CHAR_T *backup_d = d, *backup_dend = dend;
+# ifdef _LIBC
+		    length = __wcslen (workp);
+# else
+		    length = wcslen (workp);
+# endif
+
+		    /* If wcscoll(the collating symbol, whole string) > 0,
+		       any substring of the string never match with the
+		       collating symbol.  */
+# ifdef _LIBC
+		    if (__wcscoll (workp, d) > 0)
+# else
+		    if (wcscoll (workp, d) > 0)
+# endif
+		      {
+			workp += length + 1;
+			break;
+		      }
+
+		    /* First, we compare the equivalence class with
+		       the first character of the string.
+		       If it don't match, we add the next character to
+		       the compare buffer in turn.  */
+		    for (i = 0 ; i < WORK_BUFFER_SIZE - 1 ; i++, d++)
+		      {
+			int match;
+			if (d == dend)
+			  {
+			    if (dend == end_match_2)
+			      break;
+			    d = string2;
+			    dend = end_match_2;
+			  }
+
+			/* add next character to the compare buffer.  */
+			str_buf[i] = TRANSLATE(*d);
+			str_buf[i+1] = '\0';
+
+# ifdef _LIBC
+			match = __wcscoll (workp, str_buf);
+# else
+			match = wcscoll (workp, str_buf);
+# endif
+
+			if (match == 0)
+			  goto char_set_matched;
+
+			if (match < 0)
+			/* (str_buf > workp) indicate (str_buf + X > workp),
+			   because for all X (str_buf + X > str_buf).
+			   So we don't need continue this loop.  */
+			  break;
+
+			/* Otherwise(str_buf < workp),
+			   (str_buf+next_character) may equals (workp).
+			   So we continue this loop.  */
+		      }
+		    /* not matched */
+		    d = backup_d;
+		    dend = backup_dend;
+		    workp += length + 1;
+		  }
+	      }
+
+            /* match with char_range?  */
+# ifdef _LIBC
+	    if (nrules != 0)
+	      {
+		uint32_t collseqval;
+		const char *collseq = (const char *)
+		  _NL_CURRENT(LC_COLLATE, _NL_COLLATE_COLLSEQWC);
+
+		collseqval = collseq_table_lookup (collseq, c);
+
+		for (; workp < p - chars_length ;)
+		  {
+		    uint32_t start_val, end_val;
+
+		    /* We already compute the collation sequence value
+		       of the characters (or collating symbols).  */
+		    start_val = (uint32_t) *workp++; /* range_start */
+		    end_val = (uint32_t) *workp++; /* range_end */
+
+		    if (start_val <= collseqval && collseqval <= end_val)
+		      goto char_set_matched;
+		  }
+	      }
+	    else
+# endif
+	      {
+		/* We set range_start_char at str_buf[0], range_end_char
+		   at str_buf[4], and compared char at str_buf[2].  */
+		str_buf[1] = 0;
+		str_buf[2] = c;
+		str_buf[3] = 0;
+		str_buf[5] = 0;
+		for (; workp < p - chars_length ;)
+		  {
+		    wchar_t *range_start_char, *range_end_char;
+
+		    /* match if (range_start_char <= c <= range_end_char).  */
+
+		    /* If range_start(or end) < 0, we assume -range_start(end)
+		       is the offset of the collating symbol which is specified
+		       as the character of the range start(end).  */
+
+		    /* range_start */
+		    if (*workp < 0)
+		      range_start_char = charset_top - (*workp++);
+		    else
+		      {
+			str_buf[0] = *workp++;
+			range_start_char = str_buf;
+		      }
+
+		    /* range_end */
+		    if (*workp < 0)
+		      range_end_char = charset_top - (*workp++);
+		    else
+		      {
+			str_buf[4] = *workp++;
+			range_end_char = str_buf + 4;
+		      }
+
+# ifdef _LIBC
+		    if (__wcscoll (range_start_char, str_buf+2) <= 0
+			&& __wcscoll (str_buf+2, range_end_char) <= 0)
+# else
+		    if (wcscoll (range_start_char, str_buf+2) <= 0
+			&& wcscoll (str_buf+2, range_end_char) <= 0)
+# endif
+		      goto char_set_matched;
+		  }
+	      }
+
+            /* match with char?  */
+	    for (; workp < p ; workp++)
+	      if (c == *workp)
+		goto char_set_matched;
+
+	    negate = !negate;
+
+	  char_set_matched:
+	    if (negate) goto fail;
+#else
+            /* Cast to `unsigned' instead of `unsigned char' in case the
+               bit list is a full 32 bytes long.  */
+	    if (c < (unsigned) (*p * BYTEWIDTH)
+		&& p[1 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH)))
+	      negate = !negate;
+
+	    p += 1 + *p;
+
+	    if (!negate) goto fail;
+#undef WORK_BUFFER_SIZE
+#endif /* WCHAR */
+	    SET_REGS_MATCHED ();
+            d++;
+	    break;
+	  }
+
+
+        /* The beginning of a group is represented by start_memory.
+           The arguments are the register number in the next byte, and the
+           number of groups inner to this one in the next.  The text
+           matched within the group is recorded (in the internal
+           registers data structure) under the register number.  */
+        case start_memory:
+	  DEBUG_PRINT3 ("EXECUTING start_memory %ld (%ld):\n",
+			(long int) *p, (long int) p[1]);
+
+          /* Find out if this group can match the empty string.  */
+	  p1 = p;		/* To send to group_match_null_string_p.  */
+
+          if (REG_MATCH_NULL_STRING_P (reg_info[*p]) == MATCH_NULL_UNSET_VALUE)
+            REG_MATCH_NULL_STRING_P (reg_info[*p])
+              = PREFIX(group_match_null_string_p) (&p1, pend, reg_info);
+
+          /* Save the position in the string where we were the last time
+             we were at this open-group operator in case the group is
+             operated upon by a repetition operator, e.g., with `(a*)*b'
+             against `ab'; then we want to ignore where we are now in
+             the string in case this attempt to match fails.  */
+          old_regstart[*p] = REG_MATCH_NULL_STRING_P (reg_info[*p])
+                             ? REG_UNSET (regstart[*p]) ? d : regstart[*p]
+                             : regstart[*p];
+	  DEBUG_PRINT2 ("  old_regstart: %d\n",
+			 POINTER_TO_OFFSET (old_regstart[*p]));
+
+          regstart[*p] = d;
+	  DEBUG_PRINT2 ("  regstart: %d\n", POINTER_TO_OFFSET (regstart[*p]));
+
+          IS_ACTIVE (reg_info[*p]) = 1;
+          MATCHED_SOMETHING (reg_info[*p]) = 0;
+
+	  /* Clear this whenever we change the register activity status.  */
+	  set_regs_matched_done = 0;
+
+          /* This is the new highest active register.  */
+          highest_active_reg = *p;
+
+          /* If nothing was active before, this is the new lowest active
+             register.  */
+          if (lowest_active_reg == NO_LOWEST_ACTIVE_REG)
+            lowest_active_reg = *p;
+
+          /* Move past the register number and inner group count.  */
+          p += 2;
+	  just_past_start_mem = p;
+
+          break;
+
+
+        /* The stop_memory opcode represents the end of a group.  Its
+           arguments are the same as start_memory's: the register
+           number, and the number of inner groups.  */
+	case stop_memory:
+	  DEBUG_PRINT3 ("EXECUTING stop_memory %ld (%ld):\n",
+			(long int) *p, (long int) p[1]);
+
+          /* We need to save the string position the last time we were at
+             this close-group operator in case the group is operated
+             upon by a repetition operator, e.g., with `((a*)*(b*)*)*'
+             against `aba'; then we want to ignore where we are now in
+             the string in case this attempt to match fails.  */
+          old_regend[*p] = REG_MATCH_NULL_STRING_P (reg_info[*p])
+                           ? REG_UNSET (regend[*p]) ? d : regend[*p]
+			   : regend[*p];
+	  DEBUG_PRINT2 ("      old_regend: %d\n",
+			 POINTER_TO_OFFSET (old_regend[*p]));
+
+          regend[*p] = d;
+	  DEBUG_PRINT2 ("      regend: %d\n", POINTER_TO_OFFSET (regend[*p]));
+
+          /* This register isn't active anymore.  */
+          IS_ACTIVE (reg_info[*p]) = 0;
+
+	  /* Clear this whenever we change the register activity status.  */
+	  set_regs_matched_done = 0;
+
+          /* If this was the only register active, nothing is active
+             anymore.  */
+          if (lowest_active_reg == highest_active_reg)
+            {
+              lowest_active_reg = NO_LOWEST_ACTIVE_REG;
+              highest_active_reg = NO_HIGHEST_ACTIVE_REG;
+            }
+          else
+            { /* We must scan for the new highest active register, since
+                 it isn't necessarily one less than now: consider
+                 (a(b)c(d(e)f)g).  When group 3 ends, after the f), the
+                 new highest active register is 1.  */
+              UCHAR_T r = *p - 1;
+              while (r > 0 && !IS_ACTIVE (reg_info[r]))
+                r--;
+
+              /* If we end up at register zero, that means that we saved
+                 the registers as the result of an `on_failure_jump', not
+                 a `start_memory', and we jumped to past the innermost
+                 `stop_memory'.  For example, in ((.)*) we save
+                 registers 1 and 2 as a result of the *, but when we pop
+                 back to the second ), we are at the stop_memory 1.
+                 Thus, nothing is active.  */
+	      if (r == 0)
+                {
+                  lowest_active_reg = NO_LOWEST_ACTIVE_REG;
+                  highest_active_reg = NO_HIGHEST_ACTIVE_REG;
+                }
+              else
+                highest_active_reg = r;
+            }
+
+          /* If just failed to match something this time around with a
+             group that's operated on by a repetition operator, try to
+             force exit from the ``loop'', and restore the register
+             information for this group that we had before trying this
+             last match.  */
+          if ((!MATCHED_SOMETHING (reg_info[*p])
+               || just_past_start_mem == p - 1)
+	      && (p + 2) < pend)
+            {
+              boolean is_a_jump_n = false;
+
+              p1 = p + 2;
+              mcnt = 0;
+              switch ((re_opcode_t) *p1++)
+                {
+                  case jump_n:
+		    is_a_jump_n = true;
+                  case pop_failure_jump:
+		  case maybe_pop_jump:
+		  case jump:
+		  case dummy_failure_jump:
+                    EXTRACT_NUMBER_AND_INCR (mcnt, p1);
+		    if (is_a_jump_n)
+		      p1 += OFFSET_ADDRESS_SIZE;
+                    break;
+
+                  default:
+                    /* do nothing */ ;
+                }
+	      p1 += mcnt;
+
+              /* If the next operation is a jump backwards in the pattern
+	         to an on_failure_jump right before the start_memory
+                 corresponding to this stop_memory, exit from the loop
+                 by forcing a failure after pushing on the stack the
+                 on_failure_jump's jump in the pattern, and d.  */
+              if (mcnt < 0 && (re_opcode_t) *p1 == on_failure_jump
+                  && (re_opcode_t) p1[1+OFFSET_ADDRESS_SIZE] == start_memory
+		  && p1[2+OFFSET_ADDRESS_SIZE] == *p)
+		{
+                  /* If this group ever matched anything, then restore
+                     what its registers were before trying this last
+                     failed match, e.g., with `(a*)*b' against `ab' for
+                     regstart[1], and, e.g., with `((a*)*(b*)*)*'
+                     against `aba' for regend[3].
+
+                     Also restore the registers for inner groups for,
+                     e.g., `((a*)(b*))*' against `aba' (register 3 would
+                     otherwise get trashed).  */
+
+                  if (EVER_MATCHED_SOMETHING (reg_info[*p]))
+		    {
+		      unsigned r;
+
+                      EVER_MATCHED_SOMETHING (reg_info[*p]) = 0;
+
+		      /* Restore this and inner groups' (if any) registers.  */
+                      for (r = *p; r < (unsigned) *p + (unsigned) *(p + 1);
+			   r++)
+                        {
+                          regstart[r] = old_regstart[r];
+
+                          /* xx why this test?  */
+                          if (old_regend[r] >= regstart[r])
+                            regend[r] = old_regend[r];
+                        }
+                    }
+		  p1++;
+                  EXTRACT_NUMBER_AND_INCR (mcnt, p1);
+                  PUSH_FAILURE_POINT (p1 + mcnt, d, -2);
+
+                  goto fail;
+                }
+            }
+
+          /* Move past the register number and the inner group count.  */
+          p += 2;
+          break;
+
+
+	/* \<digit> has been turned into a `duplicate' command which is
+           followed by the numeric value of <digit> as the register number.  */
+        case duplicate:
+	  {
+	    register const CHAR_T *d2, *dend2;
+	    int regno = *p++;   /* Get which register to match against.  */
+	    DEBUG_PRINT2 ("EXECUTING duplicate %d.\n", regno);
+
+	    /* Can't back reference a group which we've never matched.  */
+            if (REG_UNSET (regstart[regno]) || REG_UNSET (regend[regno]))
+              goto fail;
+
+            /* Where in input to try to start matching.  */
+            d2 = regstart[regno];
+
+            /* Where to stop matching; if both the place to start and
+               the place to stop matching are in the same string, then
+               set to the place to stop, otherwise, for now have to use
+               the end of the first string.  */
+
+            dend2 = ((FIRST_STRING_P (regstart[regno])
+		      == FIRST_STRING_P (regend[regno]))
+		     ? regend[regno] : end_match_1);
+	    for (;;)
+	      {
+		/* If necessary, advance to next segment in register
+                   contents.  */
+		while (d2 == dend2)
+		  {
+		    if (dend2 == end_match_2) break;
+		    if (dend2 == regend[regno]) break;
+
+                    /* End of string1 => advance to string2. */
+                    d2 = string2;
+                    dend2 = regend[regno];
+		  }
+		/* At end of register contents => success */
+		if (d2 == dend2) break;
+
+		/* If necessary, advance to next segment in data.  */
+		PREFETCH ();
+
+		/* How many characters left in this segment to match.  */
+		mcnt = dend - d;
+
+		/* Want how many consecutive characters we can match in
+                   one shot, so, if necessary, adjust the count.  */
+                if (mcnt > dend2 - d2)
+		  mcnt = dend2 - d2;
+
+		/* Compare that many; failure if mismatch, else move
+                   past them.  */
+		if (translate
+                    ? PREFIX(bcmp_translate) (d, d2, mcnt, translate)
+                    : memcmp (d, d2, mcnt*sizeof(UCHAR_T)))
+		  goto fail;
+		d += mcnt, d2 += mcnt;
+
+		/* Do this because we've match some characters.  */
+		SET_REGS_MATCHED ();
+	      }
+	  }
+	  break;
+
+
+        /* begline matches the empty string at the beginning of the string
+           (unless `not_bol' is set in `bufp'), and, if
+           `newline_anchor' is set, after newlines.  */
+	case begline:
+          DEBUG_PRINT1 ("EXECUTING begline.\n");
+
+          if (AT_STRINGS_BEG (d))
+            {
+              if (!bufp->not_bol) break;
+            }
+          else if (d[-1] == '\n' && bufp->newline_anchor)
+            {
+              break;
+            }
+          /* In all other cases, we fail.  */
+          goto fail;
+
+
+        /* endline is the dual of begline.  */
+	case endline:
+          DEBUG_PRINT1 ("EXECUTING endline.\n");
+
+          if (AT_STRINGS_END (d))
+            {
+              if (!bufp->not_eol) break;
+            }
+
+          /* We have to ``prefetch'' the next character.  */
+          else if ((d == end1 ? *string2 : *d) == '\n'
+                   && bufp->newline_anchor)
+            {
+              break;
+            }
+          goto fail;
+
+
+	/* Match at the very beginning of the data.  */
+        case begbuf:
+          DEBUG_PRINT1 ("EXECUTING begbuf.\n");
+          if (AT_STRINGS_BEG (d))
+            break;
+          goto fail;
+
+
+	/* Match at the very end of the data.  */
+        case endbuf:
+          DEBUG_PRINT1 ("EXECUTING endbuf.\n");
+	  if (AT_STRINGS_END (d))
+	    break;
+          goto fail;
+
+
+        /* on_failure_keep_string_jump is used to optimize `.*\n'.  It
+           pushes NULL as the value for the string on the stack.  Then
+           `pop_failure_point' will keep the current value for the
+           string, instead of restoring it.  To see why, consider
+           matching `foo\nbar' against `.*\n'.  The .* matches the foo;
+           then the . fails against the \n.  But the next thing we want
+           to do is match the \n against the \n; if we restored the
+           string value, we would be back at the foo.
+
+           Because this is used only in specific cases, we don't need to
+           check all the things that `on_failure_jump' does, to make
+           sure the right things get saved on the stack.  Hence we don't
+           share its code.  The only reason to push anything on the
+           stack at all is that otherwise we would have to change
+           `anychar's code to do something besides goto fail in this
+           case; that seems worse than this.  */
+        case on_failure_keep_string_jump:
+          DEBUG_PRINT1 ("EXECUTING on_failure_keep_string_jump");
+
+          EXTRACT_NUMBER_AND_INCR (mcnt, p);
+#ifdef _LIBC
+          DEBUG_PRINT3 (" %d (to %p):\n", mcnt, p + mcnt);
+#else
+          DEBUG_PRINT3 (" %d (to 0x%x):\n", mcnt, p + mcnt);
+#endif
+
+          PUSH_FAILURE_POINT (p + mcnt, NULL, -2);
+          break;
+
+
+	/* Uses of on_failure_jump:
+
+           Each alternative starts with an on_failure_jump that points
+           to the beginning of the next alternative.  Each alternative
+           except the last ends with a jump that in effect jumps past
+           the rest of the alternatives.  (They really jump to the
+           ending jump of the following alternative, because tensioning
+           these jumps is a hassle.)
+
+           Repeats start with an on_failure_jump that points past both
+           the repetition text and either the following jump or
+           pop_failure_jump back to this on_failure_jump.  */
+	case on_failure_jump:
+        on_failure:
+          DEBUG_PRINT1 ("EXECUTING on_failure_jump");
+
+          EXTRACT_NUMBER_AND_INCR (mcnt, p);
+#ifdef _LIBC
+          DEBUG_PRINT3 (" %d (to %p)", mcnt, p + mcnt);
+#else
+          DEBUG_PRINT3 (" %d (to 0x%x)", mcnt, p + mcnt);
+#endif
+
+          /* If this on_failure_jump comes right before a group (i.e.,
+             the original * applied to a group), save the information
+             for that group and all inner ones, so that if we fail back
+             to this point, the group's information will be correct.
+             For example, in \(a*\)*\1, we need the preceding group,
+             and in \(zz\(a*\)b*\)\2, we need the inner group.  */
+
+          /* We can't use `p' to check ahead because we push
+             a failure point to `p + mcnt' after we do this.  */
+          p1 = p;
+
+          /* We need to skip no_op's before we look for the
+             start_memory in case this on_failure_jump is happening as
+             the result of a completed succeed_n, as in \(a\)\{1,3\}b\1
+             against aba.  */
+          while (p1 < pend && (re_opcode_t) *p1 == no_op)
+            p1++;
+
+          if (p1 < pend && (re_opcode_t) *p1 == start_memory)
+            {
+              /* We have a new highest active register now.  This will
+                 get reset at the start_memory we are about to get to,
+                 but we will have saved all the registers relevant to
+                 this repetition op, as described above.  */
+              highest_active_reg = *(p1 + 1) + *(p1 + 2);
+              if (lowest_active_reg == NO_LOWEST_ACTIVE_REG)
+                lowest_active_reg = *(p1 + 1);
+            }
+
+          DEBUG_PRINT1 (":\n");
+          PUSH_FAILURE_POINT (p + mcnt, d, -2);
+          break;
+
+
+        /* A smart repeat ends with `maybe_pop_jump'.
+	   We change it to either `pop_failure_jump' or `jump'.  */
+        case maybe_pop_jump:
+          EXTRACT_NUMBER_AND_INCR (mcnt, p);
+          DEBUG_PRINT2 ("EXECUTING maybe_pop_jump %d.\n", mcnt);
+          {
+	    register UCHAR_T *p2 = p;
+
+            /* Compare the beginning of the repeat with what in the
+               pattern follows its end. If we can establish that there
+               is nothing that they would both match, i.e., that we
+               would have to backtrack because of (as in, e.g., `a*a')
+               then we can change to pop_failure_jump, because we'll
+               never have to backtrack.
+
+               This is not true in the case of alternatives: in
+               `(a|ab)*' we do need to backtrack to the `ab' alternative
+               (e.g., if the string was `ab').  But instead of trying to
+               detect that here, the alternative has put on a dummy
+               failure point which is what we will end up popping.  */
+
+	    /* Skip over open/close-group commands.
+	       If what follows this loop is a ...+ construct,
+	       look at what begins its body, since we will have to
+	       match at least one of that.  */
+	    while (1)
+	      {
+		if (p2 + 2 < pend
+		    && ((re_opcode_t) *p2 == stop_memory
+			|| (re_opcode_t) *p2 == start_memory))
+		  p2 += 3;
+		else if (p2 + 2 + 2 * OFFSET_ADDRESS_SIZE < pend
+			 && (re_opcode_t) *p2 == dummy_failure_jump)
+		  p2 += 2 + 2 * OFFSET_ADDRESS_SIZE;
+		else
+		  break;
+	      }
+
+	    p1 = p + mcnt;
+	    /* p1[0] ... p1[2] are the `on_failure_jump' corresponding
+	       to the `maybe_finalize_jump' of this case.  Examine what
+	       follows.  */
+
+            /* If we're at the end of the pattern, we can change.  */
+            if (p2 == pend)
+	      {
+		/* Consider what happens when matching ":\(.*\)"
+		   against ":/".  I don't really understand this code
+		   yet.  */
+  	        p[-(1+OFFSET_ADDRESS_SIZE)] = (UCHAR_T)
+		  pop_failure_jump;
+                DEBUG_PRINT1
+                  ("  End of pattern: change to `pop_failure_jump'.\n");
+              }
+
+            else if ((re_opcode_t) *p2 == exactn
+#ifdef MBS_SUPPORT
+		     || (re_opcode_t) *p2 == exactn_bin
+#endif
+		     || (bufp->newline_anchor && (re_opcode_t) *p2 == endline))
+	      {
+		register UCHAR_T c
+                  = *p2 == (UCHAR_T) endline ? '\n' : p2[2];
+
+                if (((re_opcode_t) p1[1+OFFSET_ADDRESS_SIZE] == exactn
+#ifdef MBS_SUPPORT
+		     || (re_opcode_t) p1[1+OFFSET_ADDRESS_SIZE] == exactn_bin
+#endif
+		    ) && p1[3+OFFSET_ADDRESS_SIZE] != c)
+                  {
+  		    p[-(1+OFFSET_ADDRESS_SIZE)] = (UCHAR_T)
+		      pop_failure_jump;
+#ifdef WCHAR
+		      DEBUG_PRINT3 ("  %C != %C => pop_failure_jump.\n",
+				    (wint_t) c,
+				    (wint_t) p1[3+OFFSET_ADDRESS_SIZE]);
+#else
+		      DEBUG_PRINT3 ("  %c != %c => pop_failure_jump.\n",
+				    (char) c,
+				    (char) p1[3+OFFSET_ADDRESS_SIZE]);
+#endif
+                  }
+
+#ifndef WCHAR
+		else if ((re_opcode_t) p1[3] == charset
+			 || (re_opcode_t) p1[3] == charset_not)
+		  {
+		    int negate = (re_opcode_t) p1[3] == charset_not;
+
+		    if (c < (unsigned) (p1[4] * BYTEWIDTH)
+			&& p1[5 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH)))
+		      negate = !negate;
+
+                    /* `negate' is equal to 1 if c would match, which means
+                        that we can't change to pop_failure_jump.  */
+		    if (!negate)
+                      {
+  		        p[-3] = (unsigned char) pop_failure_jump;
+                        DEBUG_PRINT1 ("  No match => pop_failure_jump.\n");
+                      }
+		  }
+#endif /* not WCHAR */
+	      }
+#ifndef WCHAR
+            else if ((re_opcode_t) *p2 == charset)
+	      {
+		/* We win if the first character of the loop is not part
+                   of the charset.  */
+                if ((re_opcode_t) p1[3] == exactn
+ 		    && ! ((int) p2[1] * BYTEWIDTH > (int) p1[5]
+ 			  && (p2[2 + p1[5] / BYTEWIDTH]
+ 			      & (1 << (p1[5] % BYTEWIDTH)))))
+		  {
+		    p[-3] = (unsigned char) pop_failure_jump;
+		    DEBUG_PRINT1 ("  No match => pop_failure_jump.\n");
+                  }
+
+		else if ((re_opcode_t) p1[3] == charset_not)
+		  {
+		    int idx;
+		    /* We win if the charset_not inside the loop
+		       lists every character listed in the charset after.  */
+		    for (idx = 0; idx < (int) p2[1]; idx++)
+		      if (! (p2[2 + idx] == 0
+			     || (idx < (int) p1[4]
+				 && ((p2[2 + idx] & ~ p1[5 + idx]) == 0))))
+			break;
+
+		    if (idx == p2[1])
+                      {
+  		        p[-3] = (unsigned char) pop_failure_jump;
+                        DEBUG_PRINT1 ("  No match => pop_failure_jump.\n");
+                      }
+		  }
+		else if ((re_opcode_t) p1[3] == charset)
+		  {
+		    int idx;
+		    /* We win if the charset inside the loop
+		       has no overlap with the one after the loop.  */
+		    for (idx = 0;
+			 idx < (int) p2[1] && idx < (int) p1[4];
+			 idx++)
+		      if ((p2[2 + idx] & p1[5 + idx]) != 0)
+			break;
+
+		    if (idx == p2[1] || idx == p1[4])
+                      {
+  		        p[-3] = (unsigned char) pop_failure_jump;
+                        DEBUG_PRINT1 ("  No match => pop_failure_jump.\n");
+                      }
+		  }
+	      }
+#endif /* not WCHAR */
+	  }
+	  p -= OFFSET_ADDRESS_SIZE;	/* Point at relative address again.  */
+	  if ((re_opcode_t) p[-1] != pop_failure_jump)
+	    {
+	      p[-1] = (UCHAR_T) jump;
+              DEBUG_PRINT1 ("  Match => jump.\n");
+	      goto unconditional_jump;
+	    }
+        /* Note fall through.  */
+
+
+	/* The end of a simple repeat has a pop_failure_jump back to
+           its matching on_failure_jump, where the latter will push a
+           failure point.  The pop_failure_jump takes off failure
+           points put on by this pop_failure_jump's matching
+           on_failure_jump; we got through the pattern to here from the
+           matching on_failure_jump, so didn't fail.  */
+        case pop_failure_jump:
+          {
+            /* We need to pass separate storage for the lowest and
+               highest registers, even though we don't care about the
+               actual values.  Otherwise, we will restore only one
+               register from the stack, since lowest will == highest in
+               `pop_failure_point'.  */
+            active_reg_t dummy_low_reg, dummy_high_reg;
+            UCHAR_T *pdummy ATTRIBUTE_UNUSED = NULL;
+            const CHAR_T *sdummy ATTRIBUTE_UNUSED = NULL;
+
+            DEBUG_PRINT1 ("EXECUTING pop_failure_jump.\n");
+            POP_FAILURE_POINT (sdummy, pdummy,
+                               dummy_low_reg, dummy_high_reg,
+                               reg_dummy, reg_dummy, reg_info_dummy);
+          }
+	  /* Note fall through.  */
+
+	unconditional_jump:
+#ifdef _LIBC
+	  DEBUG_PRINT2 ("\n%p: ", p);
+#else
+	  DEBUG_PRINT2 ("\n0x%x: ", p);
+#endif
+          /* Note fall through.  */
+
+        /* Unconditionally jump (without popping any failure points).  */
+        case jump:
+	  EXTRACT_NUMBER_AND_INCR (mcnt, p);	/* Get the amount to jump.  */
+          DEBUG_PRINT2 ("EXECUTING jump %d ", mcnt);
+	  p += mcnt;				/* Do the jump.  */
+#ifdef _LIBC
+          DEBUG_PRINT2 ("(to %p).\n", p);
+#else
+          DEBUG_PRINT2 ("(to 0x%x).\n", p);
+#endif
+	  break;
+
+
+        /* We need this opcode so we can detect where alternatives end
+           in `group_match_null_string_p' et al.  */
+        case jump_past_alt:
+          DEBUG_PRINT1 ("EXECUTING jump_past_alt.\n");
+          goto unconditional_jump;
+
+
+        /* Normally, the on_failure_jump pushes a failure point, which
+           then gets popped at pop_failure_jump.  We will end up at
+           pop_failure_jump, also, and with a pattern of, say, `a+', we
+           are skipping over the on_failure_jump, so we have to push
+           something meaningless for pop_failure_jump to pop.  */
+        case dummy_failure_jump:
+          DEBUG_PRINT1 ("EXECUTING dummy_failure_jump.\n");
+          /* It doesn't matter what we push for the string here.  What
+             the code at `fail' tests is the value for the pattern.  */
+          PUSH_FAILURE_POINT (NULL, NULL, -2);
+          goto unconditional_jump;
+
+
+        /* At the end of an alternative, we need to push a dummy failure
+           point in case we are followed by a `pop_failure_jump', because
+           we don't want the failure point for the alternative to be
+           popped.  For example, matching `(a|ab)*' against `aab'
+           requires that we match the `ab' alternative.  */
+        case push_dummy_failure:
+          DEBUG_PRINT1 ("EXECUTING push_dummy_failure.\n");
+          /* See comments just above at `dummy_failure_jump' about the
+             two zeroes.  */
+          PUSH_FAILURE_POINT (NULL, NULL, -2);
+          break;
+
+        /* Have to succeed matching what follows at least n times.
+           After that, handle like `on_failure_jump'.  */
+        case succeed_n:
+          EXTRACT_NUMBER (mcnt, p + OFFSET_ADDRESS_SIZE);
+          DEBUG_PRINT2 ("EXECUTING succeed_n %d.\n", mcnt);
+
+          assert (mcnt >= 0);
+          /* Originally, this is how many times we HAVE to succeed.  */
+          if (mcnt > 0)
+            {
+               mcnt--;
+	       p += OFFSET_ADDRESS_SIZE;
+               STORE_NUMBER_AND_INCR (p, mcnt);
+#ifdef _LIBC
+               DEBUG_PRINT3 ("  Setting %p to %d.\n", p - OFFSET_ADDRESS_SIZE
+			     , mcnt);
+#else
+               DEBUG_PRINT3 ("  Setting 0x%x to %d.\n", p - OFFSET_ADDRESS_SIZE
+			     , mcnt);
+#endif
+            }
+	  else if (mcnt == 0)
+            {
+#ifdef _LIBC
+              DEBUG_PRINT2 ("  Setting two bytes from %p to no_op.\n",
+			    p + OFFSET_ADDRESS_SIZE);
+#else
+              DEBUG_PRINT2 ("  Setting two bytes from 0x%x to no_op.\n",
+			    p + OFFSET_ADDRESS_SIZE);
+#endif /* _LIBC */
+
+#ifdef WCHAR
+	      p[1] = (UCHAR_T) no_op;
+#else
+	      p[2] = (UCHAR_T) no_op;
+              p[3] = (UCHAR_T) no_op;
+#endif /* WCHAR */
+              goto on_failure;
+            }
+          break;
+
+        case jump_n:
+          EXTRACT_NUMBER (mcnt, p + OFFSET_ADDRESS_SIZE);
+          DEBUG_PRINT2 ("EXECUTING jump_n %d.\n", mcnt);
+
+          /* Originally, this is how many times we CAN jump.  */
+          if (mcnt)
+            {
+               mcnt--;
+               STORE_NUMBER (p + OFFSET_ADDRESS_SIZE, mcnt);
+
+#ifdef _LIBC
+               DEBUG_PRINT3 ("  Setting %p to %d.\n", p + OFFSET_ADDRESS_SIZE,
+			     mcnt);
+#else
+               DEBUG_PRINT3 ("  Setting 0x%x to %d.\n", p + OFFSET_ADDRESS_SIZE,
+			     mcnt);
+#endif /* _LIBC */
+	       goto unconditional_jump;
+            }
+          /* If don't have to jump any more, skip over the rest of command.  */
+	  else
+	    p += 2 * OFFSET_ADDRESS_SIZE;
+          break;
+
+	case set_number_at:
+	  {
+            DEBUG_PRINT1 ("EXECUTING set_number_at.\n");
+
+            EXTRACT_NUMBER_AND_INCR (mcnt, p);
+            p1 = p + mcnt;
+            EXTRACT_NUMBER_AND_INCR (mcnt, p);
+#ifdef _LIBC
+            DEBUG_PRINT3 ("  Setting %p to %d.\n", p1, mcnt);
+#else
+            DEBUG_PRINT3 ("  Setting 0x%x to %d.\n", p1, mcnt);
+#endif
+	    STORE_NUMBER (p1, mcnt);
+            break;
+          }
+
+#if 0
+	/* The DEC Alpha C compiler 3.x generates incorrect code for the
+	   test  WORDCHAR_P (d - 1) != WORDCHAR_P (d)  in the expansion of
+	   AT_WORD_BOUNDARY, so this code is disabled.  Expanding the
+	   macro and introducing temporary variables works around the bug.  */
+
+	case wordbound:
+	  DEBUG_PRINT1 ("EXECUTING wordbound.\n");
+	  if (AT_WORD_BOUNDARY (d))
+	    break;
+	  goto fail;
+
+	case notwordbound:
+	  DEBUG_PRINT1 ("EXECUTING notwordbound.\n");
+	  if (AT_WORD_BOUNDARY (d))
+	    goto fail;
+	  break;
+#else
+	case wordbound:
+	{
+	  boolean prevchar, thischar;
+
+	  DEBUG_PRINT1 ("EXECUTING wordbound.\n");
+	  if (AT_STRINGS_BEG (d) || AT_STRINGS_END (d))
+	    break;
+
+	  prevchar = WORDCHAR_P (d - 1);
+	  thischar = WORDCHAR_P (d);
+	  if (prevchar != thischar)
+	    break;
+	  goto fail;
+	}
+
+      case notwordbound:
+	{
+	  boolean prevchar, thischar;
+
+	  DEBUG_PRINT1 ("EXECUTING notwordbound.\n");
+	  if (AT_STRINGS_BEG (d) || AT_STRINGS_END (d))
+	    goto fail;
+
+	  prevchar = WORDCHAR_P (d - 1);
+	  thischar = WORDCHAR_P (d);
+	  if (prevchar != thischar)
+	    goto fail;
+	  break;
+	}
+#endif
+
+	case wordbeg:
+          DEBUG_PRINT1 ("EXECUTING wordbeg.\n");
+	  if (!AT_STRINGS_END (d) && WORDCHAR_P (d)
+	      && (AT_STRINGS_BEG (d) || !WORDCHAR_P (d - 1)))
+	    break;
+          goto fail;
+
+	case wordend:
+          DEBUG_PRINT1 ("EXECUTING wordend.\n");
+	  if (!AT_STRINGS_BEG (d) && WORDCHAR_P (d - 1)
+              && (AT_STRINGS_END (d) || !WORDCHAR_P (d)))
+	    break;
+          goto fail;
+
+#ifdef emacs
+  	case before_dot:
+          DEBUG_PRINT1 ("EXECUTING before_dot.\n");
+ 	  if (PTR_CHAR_POS ((unsigned char *) d) >= point)
+  	    goto fail;
+  	  break;
+
+  	case at_dot:
+          DEBUG_PRINT1 ("EXECUTING at_dot.\n");
+ 	  if (PTR_CHAR_POS ((unsigned char *) d) != point)
+  	    goto fail;
+  	  break;
+
+  	case after_dot:
+          DEBUG_PRINT1 ("EXECUTING after_dot.\n");
+          if (PTR_CHAR_POS ((unsigned char *) d) <= point)
+  	    goto fail;
+  	  break;
+
+	case syntaxspec:
+          DEBUG_PRINT2 ("EXECUTING syntaxspec %d.\n", mcnt);
+	  mcnt = *p++;
+	  goto matchsyntax;
+
+        case wordchar:
+          DEBUG_PRINT1 ("EXECUTING Emacs wordchar.\n");
+	  mcnt = (int) Sword;
+        matchsyntax:
+	  PREFETCH ();
+	  /* Can't use *d++ here; SYNTAX may be an unsafe macro.  */
+	  d++;
+	  if (SYNTAX (d[-1]) != (enum syntaxcode) mcnt)
+	    goto fail;
+          SET_REGS_MATCHED ();
+	  break;
+
+	case notsyntaxspec:
+          DEBUG_PRINT2 ("EXECUTING notsyntaxspec %d.\n", mcnt);
+	  mcnt = *p++;
+	  goto matchnotsyntax;
+
+        case notwordchar:
+          DEBUG_PRINT1 ("EXECUTING Emacs notwordchar.\n");
+	  mcnt = (int) Sword;
+        matchnotsyntax:
+	  PREFETCH ();
+	  /* Can't use *d++ here; SYNTAX may be an unsafe macro.  */
+	  d++;
+	  if (SYNTAX (d[-1]) == (enum syntaxcode) mcnt)
+	    goto fail;
+	  SET_REGS_MATCHED ();
+          break;
+
+#else /* not emacs */
+	case wordchar:
+          DEBUG_PRINT1 ("EXECUTING non-Emacs wordchar.\n");
+	  PREFETCH ();
+          if (!WORDCHAR_P (d))
+            goto fail;
+	  SET_REGS_MATCHED ();
+          d++;
+	  break;
+
+	case notwordchar:
+          DEBUG_PRINT1 ("EXECUTING non-Emacs notwordchar.\n");
+	  PREFETCH ();
+	  if (WORDCHAR_P (d))
+            goto fail;
+          SET_REGS_MATCHED ();
+          d++;
+	  break;
+#endif /* not emacs */
+
+        default:
+          abort ();
+	}
+      continue;  /* Successfully executed one pattern command; keep going.  */
+
+
+    /* We goto here if a matching operation fails. */
+    fail:
+      if (!FAIL_STACK_EMPTY ())
+	{ /* A restart point is known.  Restore to that state.  */
+          DEBUG_PRINT1 ("\nFAIL:\n");
+          POP_FAILURE_POINT (d, p,
+                             lowest_active_reg, highest_active_reg,
+                             regstart, regend, reg_info);
+
+          /* If this failure point is a dummy, try the next one.  */
+          if (!p)
+	    goto fail;
+
+          /* If we failed to the end of the pattern, don't examine *p.  */
+	  assert (p <= pend);
+          if (p < pend)
+            {
+              boolean is_a_jump_n = false;
+
+              /* If failed to a backwards jump that's part of a repetition
+                 loop, need to pop this failure point and use the next one.  */
+              switch ((re_opcode_t) *p)
+                {
+                case jump_n:
+                  is_a_jump_n = true;
+                case maybe_pop_jump:
+                case pop_failure_jump:
+                case jump:
+                  p1 = p + 1;
+                  EXTRACT_NUMBER_AND_INCR (mcnt, p1);
+                  p1 += mcnt;
+
+                  if ((is_a_jump_n && (re_opcode_t) *p1 == succeed_n)
+                      || (!is_a_jump_n
+                          && (re_opcode_t) *p1 == on_failure_jump))
+                    goto fail;
+                  break;
+                default:
+                  /* do nothing */ ;
+                }
+            }
+
+          if (d >= string1 && d <= end1)
+	    dend = end_match_1;
+        }
+      else
+        break;   /* Matching at this starting point really fails.  */
+    } /* for (;;) */
+
+  if (best_regs_set)
+    goto restore_best_regs;
+
+  FREE_VARIABLES ();
+
+  return -1;         			/* Failure to match.  */
+} /* re_match_2 */
+
+/* Subroutine definitions for re_match_2.  */
+
+
+/* We are passed P pointing to a register number after a start_memory.
+
+   Return true if the pattern up to the corresponding stop_memory can
+   match the empty string, and false otherwise.
+
+   If we find the matching stop_memory, sets P to point to one past its number.
+   Otherwise, sets P to an undefined byte less than or equal to END.
+
+   We don't handle duplicates properly (yet).  */
+
+static boolean
+PREFIX(group_match_null_string_p) (UCHAR_T **p, UCHAR_T *end,
+                                   PREFIX(register_info_type) *reg_info)
+{
+  int mcnt;
+  /* Point to after the args to the start_memory.  */
+  UCHAR_T *p1 = *p + 2;
+
+  while (p1 < end)
+    {
+      /* Skip over opcodes that can match nothing, and return true or
+	 false, as appropriate, when we get to one that can't, or to the
+         matching stop_memory.  */
+
+      switch ((re_opcode_t) *p1)
+        {
+        /* Could be either a loop or a series of alternatives.  */
+        case on_failure_jump:
+          p1++;
+          EXTRACT_NUMBER_AND_INCR (mcnt, p1);
+
+          /* If the next operation is not a jump backwards in the
+	     pattern.  */
+
+	  if (mcnt >= 0)
+	    {
+              /* Go through the on_failure_jumps of the alternatives,
+                 seeing if any of the alternatives cannot match nothing.
+                 The last alternative starts with only a jump,
+                 whereas the rest start with on_failure_jump and end
+                 with a jump, e.g., here is the pattern for `a|b|c':
+
+                 /on_failure_jump/0/6/exactn/1/a/jump_past_alt/0/6
+                 /on_failure_jump/0/6/exactn/1/b/jump_past_alt/0/3
+                 /exactn/1/c
+
+                 So, we have to first go through the first (n-1)
+                 alternatives and then deal with the last one separately.  */
+
+
+              /* Deal with the first (n-1) alternatives, which start
+                 with an on_failure_jump (see above) that jumps to right
+                 past a jump_past_alt.  */
+
+              while ((re_opcode_t) p1[mcnt-(1+OFFSET_ADDRESS_SIZE)] ==
+		     jump_past_alt)
+                {
+                  /* `mcnt' holds how many bytes long the alternative
+                     is, including the ending `jump_past_alt' and
+                     its number.  */
+
+                  if (!PREFIX(alt_match_null_string_p) (p1, p1 + mcnt -
+						(1 + OFFSET_ADDRESS_SIZE),
+						reg_info))
+                    return false;
+
+                  /* Move to right after this alternative, including the
+		     jump_past_alt.  */
+                  p1 += mcnt;
+
+                  /* Break if it's the beginning of an n-th alternative
+                     that doesn't begin with an on_failure_jump.  */
+                  if ((re_opcode_t) *p1 != on_failure_jump)
+                    break;
+
+		  /* Still have to check that it's not an n-th
+		     alternative that starts with an on_failure_jump.  */
+		  p1++;
+                  EXTRACT_NUMBER_AND_INCR (mcnt, p1);
+                  if ((re_opcode_t) p1[mcnt-(1+OFFSET_ADDRESS_SIZE)] !=
+		      jump_past_alt)
+                    {
+		      /* Get to the beginning of the n-th alternative.  */
+                      p1 -= 1 + OFFSET_ADDRESS_SIZE;
+                      break;
+                    }
+                }
+
+              /* Deal with the last alternative: go back and get number
+                 of the `jump_past_alt' just before it.  `mcnt' contains
+                 the length of the alternative.  */
+              EXTRACT_NUMBER (mcnt, p1 - OFFSET_ADDRESS_SIZE);
+
+              if (!PREFIX(alt_match_null_string_p) (p1, p1 + mcnt, reg_info))
+                return false;
+
+              p1 += mcnt;	/* Get past the n-th alternative.  */
+            } /* if mcnt > 0 */
+          break;
+
+
+        case stop_memory:
+	  assert (p1[1] == **p);
+          *p = p1 + 2;
+          return true;
+
+
+        default:
+          if (!PREFIX(common_op_match_null_string_p) (&p1, end, reg_info))
+            return false;
+        }
+    } /* while p1 < end */
+
+  return false;
+} /* group_match_null_string_p */
+
+
+/* Similar to group_match_null_string_p, but doesn't deal with alternatives:
+   It expects P to be the first byte of a single alternative and END one
+   byte past the last. The alternative can contain groups.  */
+
+static boolean
+PREFIX(alt_match_null_string_p) (UCHAR_T *p, UCHAR_T *end,
+                                 PREFIX(register_info_type) *reg_info)
+{
+  int mcnt;
+  UCHAR_T *p1 = p;
+
+  while (p1 < end)
+    {
+      /* Skip over opcodes that can match nothing, and break when we get
+         to one that can't.  */
+
+      switch ((re_opcode_t) *p1)
+        {
+	/* It's a loop.  */
+        case on_failure_jump:
+          p1++;
+          EXTRACT_NUMBER_AND_INCR (mcnt, p1);
+          p1 += mcnt;
+          break;
+
+	default:
+          if (!PREFIX(common_op_match_null_string_p) (&p1, end, reg_info))
+            return false;
+        }
+    }  /* while p1 < end */
+
+  return true;
+} /* alt_match_null_string_p */
+
+
+/* Deals with the ops common to group_match_null_string_p and
+   alt_match_null_string_p.
+
+   Sets P to one after the op and its arguments, if any.  */
+
+static boolean
+PREFIX(common_op_match_null_string_p) (UCHAR_T **p, UCHAR_T *end,
+                                       PREFIX(register_info_type) *reg_info)
+{
+  int mcnt;
+  boolean ret;
+  int reg_no;
+  UCHAR_T *p1 = *p;
+
+  switch ((re_opcode_t) *p1++)
+    {
+    case no_op:
+    case begline:
+    case endline:
+    case begbuf:
+    case endbuf:
+    case wordbeg:
+    case wordend:
+    case wordbound:
+    case notwordbound:
+#ifdef emacs
+    case before_dot:
+    case at_dot:
+    case after_dot:
+#endif
+      break;
+
+    case start_memory:
+      reg_no = *p1;
+      assert (reg_no > 0 && reg_no <= MAX_REGNUM);
+      ret = PREFIX(group_match_null_string_p) (&p1, end, reg_info);
+
+      /* Have to set this here in case we're checking a group which
+         contains a group and a back reference to it.  */
+
+      if (REG_MATCH_NULL_STRING_P (reg_info[reg_no]) == MATCH_NULL_UNSET_VALUE)
+        REG_MATCH_NULL_STRING_P (reg_info[reg_no]) = ret;
+
+      if (!ret)
+        return false;
+      break;
+
+    /* If this is an optimized succeed_n for zero times, make the jump.  */
+    case jump:
+      EXTRACT_NUMBER_AND_INCR (mcnt, p1);
+      if (mcnt >= 0)
+        p1 += mcnt;
+      else
+        return false;
+      break;
+
+    case succeed_n:
+      /* Get to the number of times to succeed.  */
+      p1 += OFFSET_ADDRESS_SIZE;
+      EXTRACT_NUMBER_AND_INCR (mcnt, p1);
+
+      if (mcnt == 0)
+        {
+          p1 -= 2 * OFFSET_ADDRESS_SIZE;
+          EXTRACT_NUMBER_AND_INCR (mcnt, p1);
+          p1 += mcnt;
+        }
+      else
+        return false;
+      break;
+
+    case duplicate:
+      if (!REG_MATCH_NULL_STRING_P (reg_info[*p1]))
+        return false;
+      break;
+
+    case set_number_at:
+      p1 += 2 * OFFSET_ADDRESS_SIZE;
+
+    default:
+      /* All other opcodes mean we cannot match the empty string.  */
+      return false;
+  }
+
+  *p = p1;
+  return true;
+} /* common_op_match_null_string_p */
+
+
+/* Return zero if TRANSLATE[S1] and TRANSLATE[S2] are identical for LEN
+   bytes; nonzero otherwise.  */
+
+static int
+PREFIX(bcmp_translate) (const CHAR_T *s1, const CHAR_T *s2, register int len,
+                        RE_TRANSLATE_TYPE translate)
+{
+  register const UCHAR_T *p1 = (const UCHAR_T *) s1;
+  register const UCHAR_T *p2 = (const UCHAR_T *) s2;
+  while (len)
+    {
+#ifdef WCHAR
+      if (((*p1<=0xff)?translate[*p1++]:*p1++)
+	  != ((*p2<=0xff)?translate[*p2++]:*p2++))
+	return 1;
+#else /* BYTE */
+      if (translate[*p1++] != translate[*p2++]) return 1;
+#endif /* WCHAR */
+      len--;
+    }
+  return 0;
+}
+
+
+#else /* not INSIDE_RECURSION */
+
+/* Entry points for GNU code.  */
+
+/* re_compile_pattern is the GNU regular expression compiler: it
+   compiles PATTERN (of length SIZE) and puts the result in BUFP.
+   Returns 0 if the pattern was valid, otherwise an error string.
+
+   Assumes the `allocated' (and perhaps `buffer') and `translate' fields
+   are set in BUFP on entry.
+
+   We call regex_compile to do the actual compilation.  */
+
+const char *
+re_compile_pattern (const char *pattern, size_t length,
+                    struct re_pattern_buffer *bufp)
+{
+  reg_errcode_t ret;
+
+  /* GNU code is written to assume at least RE_NREGS registers will be set
+     (and at least one extra will be -1).  */
+  bufp->regs_allocated = REGS_UNALLOCATED;
+
+  /* And GNU code determines whether or not to get register information
+     by passing null for the REGS argument to re_match, etc., not by
+     setting no_sub.  */
+  bufp->no_sub = 0;
+
+  /* Match anchors at newline.  */
+  bufp->newline_anchor = 1;
+
+# ifdef MBS_SUPPORT
+  if (MB_CUR_MAX != 1)
+    ret = wcs_regex_compile (pattern, length, re_syntax_options, bufp);
+  else
+# endif
+    ret = byte_regex_compile (pattern, length, re_syntax_options, bufp);
+
+  if (!ret)
+    return NULL;
+  return gettext (re_error_msgid[(int) ret]);
+}
+#ifdef _LIBC
+weak_alias (__re_compile_pattern, re_compile_pattern)
+#endif
+
+/* Entry points compatible with 4.2 BSD regex library.  We don't define
+   them unless specifically requested.  */
+
+#if defined _REGEX_RE_COMP || defined _LIBC
+
+/* BSD has one and only one pattern buffer.  */
+static struct re_pattern_buffer re_comp_buf;
+
+char *
+#ifdef _LIBC
+/* Make these definitions weak in libc, so POSIX programs can redefine
+   these names if they don't use our functions, and still use
+   regcomp/regexec below without link errors.  */
+weak_function
+#endif
+re_comp (const char *s)
+{
+  reg_errcode_t ret;
+
+  if (!s)
+    {
+      if (!re_comp_buf.buffer)
+	return (char *) gettext ("No previous regular expression");
+      return 0;
+    }
+
+  if (!re_comp_buf.buffer)
+    {
+      re_comp_buf.buffer = (unsigned char *) malloc (200);
+      if (re_comp_buf.buffer == NULL)
+        return (char *) gettext (re_error_msgid[(int) REG_ESPACE]);
+      re_comp_buf.allocated = 200;
+
+      re_comp_buf.fastmap = (char *) malloc (1 << BYTEWIDTH);
+      if (re_comp_buf.fastmap == NULL)
+	return (char *) gettext (re_error_msgid[(int) REG_ESPACE]);
+    }
+
+  /* Since `re_exec' always passes NULL for the `regs' argument, we
+     don't need to initialize the pattern buffer fields which affect it.  */
+
+  /* Match anchors at newlines.  */
+  re_comp_buf.newline_anchor = 1;
+
+# ifdef MBS_SUPPORT
+  if (MB_CUR_MAX != 1)
+    ret = wcs_regex_compile (s, strlen (s), re_syntax_options, &re_comp_buf);
+  else
+# endif
+    ret = byte_regex_compile (s, strlen (s), re_syntax_options, &re_comp_buf);
+
+  if (!ret)
+    return NULL;
+
+  /* Yes, we're discarding `const' here if !HAVE_LIBINTL.  */
+  return (char *) gettext (re_error_msgid[(int) ret]);
+}
+
+
+int
+#ifdef _LIBC
+weak_function
+#endif
+re_exec (const char *s)
+{
+  const int len = strlen (s);
+  return
+    0 <= re_search (&re_comp_buf, s, len, 0, len, (struct re_registers *) 0);
+}
+
+#endif /* _REGEX_RE_COMP */
+
+/* POSIX.2 functions.  Don't define these for Emacs.  */
+
+#ifndef emacs
+
+/* regcomp takes a regular expression as a string and compiles it.
+
+   PREG is a regex_t *.  We do not expect any fields to be initialized,
+   since POSIX says we shouldn't.  Thus, we set
+
+     `buffer' to the compiled pattern;
+     `used' to the length of the compiled pattern;
+     `syntax' to RE_SYNTAX_POSIX_EXTENDED if the
+       REG_EXTENDED bit in CFLAGS is set; otherwise, to
+       RE_SYNTAX_POSIX_BASIC;
+     `newline_anchor' to REG_NEWLINE being set in CFLAGS;
+     `fastmap' to an allocated space for the fastmap;
+     `fastmap_accurate' to zero;
+     `re_nsub' to the number of subexpressions in PATTERN.
+
+   PATTERN is the address of the pattern string.
+
+   CFLAGS is a series of bits which affect compilation.
+
+     If REG_EXTENDED is set, we use POSIX extended syntax; otherwise, we
+     use POSIX basic syntax.
+
+     If REG_NEWLINE is set, then . and [^...] don't match newline.
+     Also, regexec will try a match beginning after every newline.
+
+     If REG_ICASE is set, then we considers upper- and lowercase
+     versions of letters to be equivalent when matching.
+
+     If REG_NOSUB is set, then when PREG is passed to regexec, that
+     routine will report only success or failure, and nothing about the
+     registers.
+
+   It returns 0 if it succeeds, nonzero if it doesn't.  (See regex.h for
+   the return codes and their meanings.)  */
+
+int
+regcomp (regex_t *preg, const char *pattern, int cflags)
+{
+  reg_errcode_t ret;
+  reg_syntax_t syntax
+    = (cflags & REG_EXTENDED) ?
+      RE_SYNTAX_POSIX_EXTENDED : RE_SYNTAX_POSIX_BASIC;
+
+  /* regex_compile will allocate the space for the compiled pattern.  */
+  preg->buffer = 0;
+  preg->allocated = 0;
+  preg->used = 0;
+
+  /* Try to allocate space for the fastmap.  */
+  preg->fastmap = (char *) malloc (1 << BYTEWIDTH);
+
+  if (cflags & REG_ICASE)
+    {
+      int i;
+
+      preg->translate
+	= (RE_TRANSLATE_TYPE) malloc (CHAR_SET_SIZE
+				      * sizeof (*(RE_TRANSLATE_TYPE)0));
+      if (preg->translate == NULL)
+        return (int) REG_ESPACE;
+
+      /* Map uppercase characters to corresponding lowercase ones.  */
+      for (i = 0; i < CHAR_SET_SIZE; i++)
+        preg->translate[i] = ISUPPER (i) ? TOLOWER (i) : i;
+    }
+  else
+    preg->translate = NULL;
+
+  /* If REG_NEWLINE is set, newlines are treated differently.  */
+  if (cflags & REG_NEWLINE)
+    { /* REG_NEWLINE implies neither . nor [^...] match newline.  */
+      syntax &= ~RE_DOT_NEWLINE;
+      syntax |= RE_HAT_LISTS_NOT_NEWLINE;
+      /* It also changes the matching behavior.  */
+      preg->newline_anchor = 1;
+    }
+  else
+    preg->newline_anchor = 0;
+
+  preg->no_sub = !!(cflags & REG_NOSUB);
+
+  /* POSIX says a null character in the pattern terminates it, so we
+     can use strlen here in compiling the pattern.  */
+# ifdef MBS_SUPPORT
+  if (MB_CUR_MAX != 1)
+    ret = wcs_regex_compile (pattern, strlen (pattern), syntax, preg);
+  else
+# endif
+    ret = byte_regex_compile (pattern, strlen (pattern), syntax, preg);
+
+  /* POSIX doesn't distinguish between an unmatched open-group and an
+     unmatched close-group: both are REG_EPAREN.  */
+  if (ret == REG_ERPAREN) ret = REG_EPAREN;
+
+  if (ret == REG_NOERROR && preg->fastmap)
+    {
+      /* Compute the fastmap now, since regexec cannot modify the pattern
+	 buffer.  */
+      if (re_compile_fastmap (preg) == -2)
+	{
+	  /* Some error occurred while computing the fastmap, just forget
+	     about it.  */
+	  free (preg->fastmap);
+	  preg->fastmap = NULL;
+	}
+    }
+
+  return (int) ret;
+}
+#ifdef _LIBC
+weak_alias (__regcomp, regcomp)
+#endif
+
+
+/* regexec searches for a given pattern, specified by PREG, in the
+   string STRING.
+
+   If NMATCH is zero or REG_NOSUB was set in the cflags argument to
+   `regcomp', we ignore PMATCH.  Otherwise, we assume PMATCH has at
+   least NMATCH elements, and we set them to the offsets of the
+   corresponding matched substrings.
+
+   EFLAGS specifies `execution flags' which affect matching: if
+   REG_NOTBOL is set, then ^ does not match at the beginning of the
+   string; if REG_NOTEOL is set, then $ does not match at the end.
+
+   We return 0 if we find a match and REG_NOMATCH if not.  */
+
+int
+regexec (const regex_t *preg, const char *string, size_t nmatch,
+         regmatch_t pmatch[], int eflags)
+{
+  int ret;
+  struct re_registers regs;
+  regex_t private_preg;
+  int len = strlen (string);
+  boolean want_reg_info = !preg->no_sub && nmatch > 0;
+
+  private_preg = *preg;
+
+  private_preg.not_bol = !!(eflags & REG_NOTBOL);
+  private_preg.not_eol = !!(eflags & REG_NOTEOL);
+
+  /* The user has told us exactly how many registers to return
+     information about, via `nmatch'.  We have to pass that on to the
+     matching routines.  */
+  private_preg.regs_allocated = REGS_FIXED;
+
+  if (want_reg_info)
+    {
+      regs.num_regs = nmatch;
+      regs.start = TALLOC (nmatch * 2, regoff_t);
+      if (regs.start == NULL)
+        return (int) REG_NOMATCH;
+      regs.end = regs.start + nmatch;
+    }
+
+  /* Perform the searching operation.  */
+  ret = re_search (&private_preg, string, len,
+                   /* start: */ 0, /* range: */ len,
+                   want_reg_info ? &regs : (struct re_registers *) 0);
+
+  /* Copy the register information to the POSIX structure.  */
+  if (want_reg_info)
+    {
+      if (ret >= 0)
+        {
+          unsigned r;
+
+          for (r = 0; r < nmatch; r++)
+            {
+              pmatch[r].rm_so = regs.start[r];
+              pmatch[r].rm_eo = regs.end[r];
+            }
+        }
+
+      /* If we needed the temporary register info, free the space now.  */
+      free (regs.start);
+    }
+
+  /* We want zero return to mean success, unlike `re_search'.  */
+  return ret >= 0 ? (int) REG_NOERROR : (int) REG_NOMATCH;
+}
+#ifdef _LIBC
+weak_alias (__regexec, regexec)
+#endif
+
+
+/* Returns a message corresponding to an error code, ERRCODE, returned
+   from either regcomp or regexec.   We don't use PREG here.  */
+
+size_t
+regerror (int errcode, const regex_t *preg ATTRIBUTE_UNUSED,
+          char *errbuf, size_t errbuf_size)
+{
+  const char *msg;
+  size_t msg_size;
+
+  if (errcode < 0
+      || errcode >= (int) (sizeof (re_error_msgid)
+			   / sizeof (re_error_msgid[0])))
+    /* Only error codes returned by the rest of the code should be passed
+       to this routine.  If we are given anything else, or if other regex
+       code generates an invalid error code, then the program has a bug.
+       Dump core so we can fix it.  */
+    abort ();
+
+  msg = gettext (re_error_msgid[errcode]);
+
+  msg_size = strlen (msg) + 1; /* Includes the null.  */
+
+  if (errbuf_size != 0)
+    {
+      if (msg_size > errbuf_size)
+        {
+#if defined HAVE_MEMPCPY || defined _LIBC
+	  *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
+#else
+          memcpy (errbuf, msg, errbuf_size - 1);
+          errbuf[errbuf_size - 1] = 0;
+#endif
+        }
+      else
+        memcpy (errbuf, msg, msg_size);
+    }
+
+  return msg_size;
+}
+#ifdef _LIBC
+weak_alias (__regerror, regerror)
+#endif
+
+
+/* Free dynamically allocated space used by PREG.  */
+
+void
+regfree (regex_t *preg)
+{
+  free (preg->buffer);
+  preg->buffer = NULL;
+
+  preg->allocated = 0;
+  preg->used = 0;
+
+  free (preg->fastmap);
+  preg->fastmap = NULL;
+  preg->fastmap_accurate = 0;
+
+  free (preg->translate);
+  preg->translate = NULL;
+}
+#ifdef _LIBC
+weak_alias (__regfree, regfree)
+#endif
+
+#endif /* not emacs  */
+
+#endif /* not INSIDE_RECURSION */
+
+
+#undef STORE_NUMBER
+#undef STORE_NUMBER_AND_INCR
+#undef EXTRACT_NUMBER
+#undef EXTRACT_NUMBER_AND_INCR
+
+#undef DEBUG_PRINT_COMPILED_PATTERN
+#undef DEBUG_PRINT_DOUBLE_STRING
+
+#undef INIT_FAIL_STACK
+#undef RESET_FAIL_STACK
+#undef DOUBLE_FAIL_STACK
+#undef PUSH_PATTERN_OP
+#undef PUSH_FAILURE_POINTER
+#undef PUSH_FAILURE_INT
+#undef PUSH_FAILURE_ELT
+#undef POP_FAILURE_POINTER
+#undef POP_FAILURE_INT
+#undef POP_FAILURE_ELT
+#undef DEBUG_PUSH
+#undef DEBUG_POP
+#undef PUSH_FAILURE_POINT
+#undef POP_FAILURE_POINT
+
+#undef REG_UNSET_VALUE
+#undef REG_UNSET
+
+#undef PATFETCH
+#undef PATFETCH_RAW
+#undef PATUNFETCH
+#undef TRANSLATE
+
+#undef INIT_BUF_SIZE
+#undef GET_BUFFER_SPACE
+#undef BUF_PUSH
+#undef BUF_PUSH_2
+#undef BUF_PUSH_3
+#undef STORE_JUMP
+#undef STORE_JUMP2
+#undef INSERT_JUMP
+#undef INSERT_JUMP2
+#undef EXTEND_BUFFER
+#undef GET_UNSIGNED_NUMBER
+#undef FREE_STACK_RETURN
+
+# undef POINTER_TO_OFFSET
+# undef MATCHING_IN_FRST_STRING
+# undef PREFETCH
+# undef AT_STRINGS_BEG
+# undef AT_STRINGS_END
+# undef WORDCHAR_P
+# undef FREE_VAR
+# undef FREE_VARIABLES
+# undef NO_HIGHEST_ACTIVE_REG
+# undef NO_LOWEST_ACTIVE_REG
+
+# undef CHAR_T
+# undef UCHAR_T
+# undef COMPILED_BUFFER_VAR
+# undef OFFSET_ADDRESS_SIZE
+# undef CHAR_CLASS_SIZE
+# undef PREFIX
+# undef ARG_PREFIX
+# undef PUT_CHAR
+# undef BYTE
+# undef WCHAR
+
+# define DEFINED_ONCE
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/rename.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/rename.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/rename.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/rename.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,36 @@
+/* rename -- rename a file
+   This function is in the public domain. */
+
+/*
+
+@deftypefn Supplemental int rename (const char *@var{old}, const char *@var{new})
+
+Renames a file from @var{old} to @var{new}.  If @var{new} already
+exists, it is removed.
+
+@end deftypefn
+
+*/
+
+#include "ansidecl.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <errno.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+int
+rename (const char *zfrom, const char *zto)
+{
+  if (link (zfrom, zto) < 0)
+    {
+      if (errno != EEXIST)
+	return -1;
+      if (unlink (zto) < 0
+	  || link (zfrom, zto) < 0)
+	return -1;
+    }
+  return unlink (zfrom);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/rindex.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/rindex.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/rindex.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/rindex.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,21 @@
+/* Stub implementation of (obsolete) rindex(). */
+
+/*
+
+@deftypefn Supplemental char* rindex (const char *@var{s}, int @var{c})
+
+Returns a pointer to the last occurrence of the character @var{c} in
+the string @var{s}, or @code{NULL} if not found.  The use of @code{rindex} is
+deprecated in new programs in favor of @code{strrchr}.
+
+@end deftypefn
+
+*/
+
+extern char *strrchr (const char *, int);
+
+char *
+rindex (const char *s, int c)
+{
+  return strrchr (s, c);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/safe-ctype.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/safe-ctype.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/safe-ctype.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/safe-ctype.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,255 @@
+/* <ctype.h> replacement macros.
+
+   Copyright (C) 2000, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
+   Contributed by Zack Weinberg <zackw@stanford.edu>.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/*
+
+@defvr Extension HOST_CHARSET
+This macro indicates the basic character set and encoding used by the
+host: more precisely, the encoding used for character constants in
+preprocessor @samp{#if} statements (the C "execution character set").
+It is defined by @file{safe-ctype.h}, and will be an integer constant
+with one of the following values:
+
+@ftable @code
+@item HOST_CHARSET_UNKNOWN
+The host character set is unknown - that is, not one of the next two
+possibilities.
+
+@item HOST_CHARSET_ASCII
+The host character set is ASCII.
+
+@item HOST_CHARSET_EBCDIC
+The host character set is some variant of EBCDIC.  (Only one of the
+nineteen EBCDIC varying characters is tested; exercise caution.)
+@end ftable
+@end defvr
+
+@deffn  Extension ISALPHA  (@var{c})
+@deffnx Extension ISALNUM  (@var{c})
+@deffnx Extension ISBLANK  (@var{c})
+@deffnx Extension ISCNTRL  (@var{c})
+@deffnx Extension ISDIGIT  (@var{c})
+@deffnx Extension ISGRAPH  (@var{c})
+@deffnx Extension ISLOWER  (@var{c})
+@deffnx Extension ISPRINT  (@var{c})
+@deffnx Extension ISPUNCT  (@var{c})
+@deffnx Extension ISSPACE  (@var{c})
+@deffnx Extension ISUPPER  (@var{c})
+@deffnx Extension ISXDIGIT (@var{c})
+
+These twelve macros are defined by @file{safe-ctype.h}.  Each has the
+same meaning as the corresponding macro (with name in lowercase)
+defined by the standard header @file{ctype.h}.  For example,
+@code{ISALPHA} returns true for alphabetic characters and false for
+others.  However, there are two differences between these macros and
+those provided by @file{ctype.h}:
+
+@itemize @bullet
+@item These macros are guaranteed to have well-defined behavior for all 
+values representable by @code{signed char} and @code{unsigned char}, and
+for @code{EOF}.
+
+@item These macros ignore the current locale; they are true for these
+fixed sets of characters:
+@multitable {@code{XDIGIT}} {yada yada yada yada yada yada yada yada}
+@item @code{ALPHA}  @tab @kbd{A-Za-z}
+@item @code{ALNUM}  @tab @kbd{A-Za-z0-9}
+@item @code{BLANK}  @tab @kbd{space tab}
+@item @code{CNTRL}  @tab @code{!PRINT}
+@item @code{DIGIT}  @tab @kbd{0-9}
+@item @code{GRAPH}  @tab @code{ALNUM || PUNCT}
+@item @code{LOWER}  @tab @kbd{a-z}
+@item @code{PRINT}  @tab @code{GRAPH ||} @kbd{space}
+@item @code{PUNCT}  @tab @kbd{`~!@@#$%^&*()_-=+[@{]@}\|;:'",<.>/?}
+@item @code{SPACE}  @tab @kbd{space tab \n \r \f \v}
+@item @code{UPPER}  @tab @kbd{A-Z}
+@item @code{XDIGIT} @tab @kbd{0-9A-Fa-f}
+@end multitable
+
+Note that, if the host character set is ASCII or a superset thereof,
+all these macros will return false for all values of @code{char} outside
+the range of 7-bit ASCII.  In particular, both ISPRINT and ISCNTRL return
+false for characters with numeric values from 128 to 255.
+@end itemize
+@end deffn
+
+@deffn  Extension ISIDNUM         (@var{c})
+@deffnx Extension ISIDST          (@var{c})
+@deffnx Extension IS_VSPACE       (@var{c})
+@deffnx Extension IS_NVSPACE      (@var{c})
+@deffnx Extension IS_SPACE_OR_NUL (@var{c})
+@deffnx Extension IS_ISOBASIC     (@var{c})
+These six macros are defined by @file{safe-ctype.h} and provide
+additional character classes which are useful when doing lexical
+analysis of C or similar languages.  They are true for the following
+sets of characters:
+
+@multitable {@code{SPACE_OR_NUL}} {yada yada yada yada yada yada yada yada}
+@item @code{IDNUM}        @tab @kbd{A-Za-z0-9_}
+@item @code{IDST}         @tab @kbd{A-Za-z_}
+@item @code{VSPACE}       @tab @kbd{\r \n}
+@item @code{NVSPACE}      @tab @kbd{space tab \f \v \0}
+@item @code{SPACE_OR_NUL} @tab @code{VSPACE || NVSPACE}
+@item @code{ISOBASIC}     @tab @code{VSPACE || NVSPACE || PRINT}
+@end multitable
+@end deffn
+
+*/
+
+#include "ansidecl.h"
+#include <safe-ctype.h>
+#include <stdio.h>  /* for EOF */
+
+#if EOF != -1
+ #error "<safe-ctype.h> requires EOF == -1"
+#endif
+
+/* Shorthand */
+#define bl _sch_isblank
+#define cn _sch_iscntrl
+#define di _sch_isdigit
+#define is _sch_isidst
+#define lo _sch_islower
+#define nv _sch_isnvsp
+#define pn _sch_ispunct
+#define pr _sch_isprint
+#define sp _sch_isspace
+#define up _sch_isupper
+#define vs _sch_isvsp
+#define xd _sch_isxdigit
+
+/* Masks.  */
+#define L  (const unsigned short) (lo|is   |pr)	/* lower case letter */
+#define XL (const unsigned short) (lo|is|xd|pr)	/* lowercase hex digit */
+#define U  (const unsigned short) (up|is   |pr)	/* upper case letter */
+#define XU (const unsigned short) (up|is|xd|pr)	/* uppercase hex digit */
+#define D  (const unsigned short) (di   |xd|pr)	/* decimal digit */
+#define P  (const unsigned short) (pn      |pr)	/* punctuation */
+#define _  (const unsigned short) (pn|is   |pr)	/* underscore */
+
+#define C  (const unsigned short) (         cn)	/* control character */
+#define Z  (const unsigned short) (nv      |cn)	/* NUL */
+#define M  (const unsigned short) (nv|sp   |cn)	/* cursor movement: \f \v */
+#define V  (const unsigned short) (vs|sp   |cn)	/* vertical space: \r \n */
+#define T  (const unsigned short) (nv|sp|bl|cn)	/* tab */
+#define S  (const unsigned short) (nv|sp|bl|pr)	/* space */
+
+/* Are we ASCII? */
+#if HOST_CHARSET == HOST_CHARSET_ASCII
+
+const unsigned short _sch_istable[256] =
+{
+  Z,  C,  C,  C,   C,  C,  C,  C,   /* NUL SOH STX ETX  EOT ENQ ACK BEL */
+  C,  T,  V,  M,   M,  V,  C,  C,   /* BS  HT  LF  VT   FF  CR  SO  SI  */
+  C,  C,  C,  C,   C,  C,  C,  C,   /* DLE DC1 DC2 DC3  DC4 NAK SYN ETB */
+  C,  C,  C,  C,   C,  C,  C,  C,   /* CAN EM  SUB ESC  FS  GS  RS  US  */
+  S,  P,  P,  P,   P,  P,  P,  P,   /* SP  !   "   #    $   %   &   '   */
+  P,  P,  P,  P,   P,  P,  P,  P,   /* (   )   *   +    ,   -   .   /   */
+  D,  D,  D,  D,   D,  D,  D,  D,   /* 0   1   2   3    4   5   6   7   */
+  D,  D,  P,  P,   P,  P,  P,  P,   /* 8   9   :   ;    <   =   >   ?   */
+  P, XU, XU, XU,  XU, XU, XU,  U,   /* @   A   B   C    D   E   F   G   */
+  U,  U,  U,  U,   U,  U,  U,  U,   /* H   I   J   K    L   M   N   O   */
+  U,  U,  U,  U,   U,  U,  U,  U,   /* P   Q   R   S    T   U   V   W   */
+  U,  U,  U,  P,   P,  P,  P,  _,   /* X   Y   Z   [    \   ]   ^   _   */
+  P, XL, XL, XL,  XL, XL, XL,  L,   /* `   a   b   c    d   e   f   g   */
+  L,  L,  L,  L,   L,  L,  L,  L,   /* h   i   j   k    l   m   n   o   */
+  L,  L,  L,  L,   L,  L,  L,  L,   /* p   q   r   s    t   u   v   w   */
+  L,  L,  L,  P,   P,  P,  P,  C,   /* x   y   z   {    |   }   ~   DEL */
+
+  /* high half of unsigned char is locale-specific, so all tests are
+     false in "C" locale */
+  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,
+  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,
+  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,
+  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,
+
+  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,
+  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,
+  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,
+  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,
+};
+
+const unsigned char _sch_tolower[256] =
+{
+   0,  1,  2,  3,   4,  5,  6,  7,   8,  9, 10, 11,  12, 13, 14, 15,
+  16, 17, 18, 19,  20, 21, 22, 23,  24, 25, 26, 27,  28, 29, 30, 31,
+  32, 33, 34, 35,  36, 37, 38, 39,  40, 41, 42, 43,  44, 45, 46, 47,
+  48, 49, 50, 51,  52, 53, 54, 55,  56, 57, 58, 59,  60, 61, 62, 63,
+  64,
+
+  'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+  'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+
+  91, 92, 93, 94, 95, 96,
+
+  'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+  'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+
+ 123,124,125,126,127,
+
+ 128,129,130,131, 132,133,134,135, 136,137,138,139, 140,141,142,143,
+ 144,145,146,147, 148,149,150,151, 152,153,154,155, 156,157,158,159,
+ 160,161,162,163, 164,165,166,167, 168,169,170,171, 172,173,174,175,
+ 176,177,178,179, 180,181,182,183, 184,185,186,187, 188,189,190,191,
+
+ 192,193,194,195, 196,197,198,199, 200,201,202,203, 204,205,206,207,
+ 208,209,210,211, 212,213,214,215, 216,217,218,219, 220,221,222,223,
+ 224,225,226,227, 228,229,230,231, 232,233,234,235, 236,237,238,239,
+ 240,241,242,243, 244,245,246,247, 248,249,250,251, 252,253,254,255,
+};
+
+const unsigned char _sch_toupper[256] =
+{
+   0,  1,  2,  3,   4,  5,  6,  7,   8,  9, 10, 11,  12, 13, 14, 15,
+  16, 17, 18, 19,  20, 21, 22, 23,  24, 25, 26, 27,  28, 29, 30, 31,
+  32, 33, 34, 35,  36, 37, 38, 39,  40, 41, 42, 43,  44, 45, 46, 47,
+  48, 49, 50, 51,  52, 53, 54, 55,  56, 57, 58, 59,  60, 61, 62, 63,
+  64,
+
+  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+  'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+
+  91, 92, 93, 94, 95, 96,
+
+  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+  'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+
+ 123,124,125,126,127,
+
+ 128,129,130,131, 132,133,134,135, 136,137,138,139, 140,141,142,143,
+ 144,145,146,147, 148,149,150,151, 152,153,154,155, 156,157,158,159,
+ 160,161,162,163, 164,165,166,167, 168,169,170,171, 172,173,174,175,
+ 176,177,178,179, 180,181,182,183, 184,185,186,187, 188,189,190,191,
+
+ 192,193,194,195, 196,197,198,199, 200,201,202,203, 204,205,206,207,
+ 208,209,210,211, 212,213,214,215, 216,217,218,219, 220,221,222,223,
+ 224,225,226,227, 228,229,230,231, 232,233,234,235, 236,237,238,239,
+ 240,241,242,243, 244,245,246,247, 248,249,250,251, 252,253,254,255,
+};
+
+#else
+# if HOST_CHARSET == HOST_CHARSET_EBCDIC
+  #error "FIXME: write tables for EBCDIC"
+# else
+  #error "Unrecognized host character set"
+# endif
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/setenv.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/setenv.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/setenv.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/setenv.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,185 @@
+/* Copyright (C) 1992, 1995, 1996, 1997, 2002, 2011 Free Software Foundation,
+   Inc.
+   This file based on setenv.c in the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+
+/*
+
+@deftypefn Supplemental int setenv (const char *@var{name}, @
+  const char *@var{value}, int @var{overwrite})
+@deftypefnx Supplemental void unsetenv (const char *@var{name})
+
+@code{setenv} adds @var{name} to the environment with value
+@var{value}.  If the name was already present in the environment,
+the new value will be stored only if @var{overwrite} is nonzero.
+The companion @code{unsetenv} function removes @var{name} from the
+environment.  This implementation is not safe for multithreaded code.
+
+@end deftypefn
+
+*/
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#define setenv libiberty_setenv
+#define unsetenv libiberty_unsetenv
+
+#include "ansidecl.h"
+#include <sys/types.h> /* For `size_t' */
+#include <stdio.h>     /* For `NULL' */
+
+#include <errno.h>
+#if !defined(errno) && !defined(HAVE_ERRNO_DECL)
+extern int errno;
+#endif
+#define __set_errno(ev) ((errno) = (ev))
+
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#if HAVE_STRING_H
+# include <string.h>
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#define __environ	environ
+#ifndef HAVE_ENVIRON_DECL
+extern char **environ;
+#endif
+
+#undef setenv
+#undef unsetenv
+
+/* LOCK and UNLOCK are defined as no-ops.  This makes the libiberty
+ * implementation MT-Unsafe. */
+#define LOCK
+#define UNLOCK
+
+/* Below this point, it's verbatim code from the glibc-2.0 implementation */
+
+/* If this variable is not a null pointer we allocated the current
+   environment.  */
+static char **last_environ;
+
+
+int
+setenv (const char *name, const char *value, int replace)
+{
+  register char **ep = 0;
+  register size_t size;
+  const size_t namelen = strlen (name);
+  const size_t vallen = strlen (value) + 1;
+
+  LOCK;
+
+  size = 0;
+  if (__environ != NULL)
+    {
+      for (ep = __environ; *ep != NULL; ++ep)
+	if (!strncmp (*ep, name, namelen) && (*ep)[namelen] == '=')
+	  break;
+	else
+	  ++size;
+    }
+
+  if (__environ == NULL || *ep == NULL)
+    {
+      char **new_environ;
+      if (__environ == last_environ && __environ != NULL)
+	/* We allocated this space; we can extend it.  */
+	new_environ = (char **) realloc (last_environ,
+					 (size + 2) * sizeof (char *));
+      else
+	new_environ = (char **) malloc ((size + 2) * sizeof (char *));
+
+      if (new_environ == NULL)
+	{
+	  UNLOCK;
+	  return -1;
+	}
+
+      new_environ[size] = (char *) malloc (namelen + 1 + vallen);
+      if (new_environ[size] == NULL)
+	{
+	  free ((char *) new_environ);
+	  __set_errno (ENOMEM);
+	  UNLOCK;
+	  return -1;
+	}
+
+      if (__environ != last_environ)
+	memcpy ((char *) new_environ, (char *) __environ,
+		size * sizeof (char *));
+
+      memcpy (new_environ[size], name, namelen);
+      new_environ[size][namelen] = '=';
+      memcpy (&new_environ[size][namelen + 1], value, vallen);
+
+      new_environ[size + 1] = NULL;
+
+      last_environ = __environ = new_environ;
+    }
+  else if (replace)
+    {
+      size_t len = strlen (*ep);
+      if (len + 1 < namelen + 1 + vallen)
+	{
+	  /* The existing string is too short; malloc a new one.  */
+	  char *new_string = (char *) malloc (namelen + 1 + vallen);
+	  if (new_string == NULL)
+	    {
+	      UNLOCK;
+	      return -1;
+	    }
+	  *ep = new_string;
+	}
+      memcpy (*ep, name, namelen);
+      (*ep)[namelen] = '=';
+      memcpy (&(*ep)[namelen + 1], value, vallen);
+    }
+
+  UNLOCK;
+
+  return 0;
+}
+
+void
+unsetenv (const char *name)
+{
+  const size_t len = strlen (name);
+  char **ep;
+
+  LOCK;
+
+  for (ep = __environ; *ep; ++ep)
+    if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
+      {
+	/* Found it.  Remove this pointer by moving later ones back.  */
+	char **dp = ep;
+	do
+	  dp[0] = dp[1];
+	while (*dp++);
+	/* Continue the loop in case NAME appears again.  */
+      }
+
+  UNLOCK;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/setproctitle.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/setproctitle.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/setproctitle.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/setproctitle.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,48 @@
+/* Set the title of a process.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If not,
+write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#ifdef HAVE_SYS_PRCTL_H
+#include <sys/types.h>
+#include <sys/prctl.h>
+#endif
+#include "ansidecl.h"
+
+/*
+
+@deftypefn Supplemental void setproctitle (const char *@var{fmt}, ...)
+
+Set the title of a process to @var{fmt}. va args not supported for now,
+but defined for compatibility with BSD. 
+
+@end deftypefn
+
+*/
+
+void
+setproctitle (const char *name ATTRIBUTE_UNUSED, ...)
+{
+#ifdef PR_SET_NAME
+  /* On Linux this sets the top visible "comm", but not necessarily
+     the name visible in ps. */
+  prctl (PR_SET_NAME, name);
+#endif
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/sha1.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/sha1.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/sha1.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/sha1.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,416 @@
+/* sha1.c - Functions to compute SHA1 message digest of files or
+   memory blocks according to the NIST specification FIPS-180-1.
+
+   Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2008 Free Software
+   Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Scott G. Miller
+   Credits:
+      Robert Klep <robert@ilse.nl>  -- Expansion function fix
+*/
+
+#include <config.h>
+
+#include "sha1.h"
+
+#include <stddef.h>
+#include <string.h>
+
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
+
+#ifdef WORDS_BIGENDIAN
+# define SWAP(n) (n)
+#else
+# define SWAP(n) \
+    (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
+#endif
+
+#define BLOCKSIZE 4096
+#if BLOCKSIZE % 64 != 0
+# error "invalid BLOCKSIZE"
+#endif
+
+/* This array contains the bytes used to pad the buffer to the next
+   64-byte boundary.  (RFC 1321, 3.1: Step 1)  */
+static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
+
+
+/* Take a pointer to a 160 bit block of data (five 32 bit ints) and
+   initialize it to the start constants of the SHA1 algorithm.  This
+   must be called before using hash in the call to sha1_hash.  */
+void
+sha1_init_ctx (struct sha1_ctx *ctx)
+{
+  ctx->A = 0x67452301;
+  ctx->B = 0xefcdab89;
+  ctx->C = 0x98badcfe;
+  ctx->D = 0x10325476;
+  ctx->E = 0xc3d2e1f0;
+
+  ctx->total[0] = ctx->total[1] = 0;
+  ctx->buflen = 0;
+}
+
+/* Put result from CTX in first 20 bytes following RESBUF.  The result
+   must be in little endian byte order.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32-bit value.  */
+void *
+sha1_read_ctx (const struct sha1_ctx *ctx, void *resbuf)
+{
+  ((sha1_uint32 *) resbuf)[0] = SWAP (ctx->A);
+  ((sha1_uint32 *) resbuf)[1] = SWAP (ctx->B);
+  ((sha1_uint32 *) resbuf)[2] = SWAP (ctx->C);
+  ((sha1_uint32 *) resbuf)[3] = SWAP (ctx->D);
+  ((sha1_uint32 *) resbuf)[4] = SWAP (ctx->E);
+
+  return resbuf;
+}
+
+/* Process the remaining bytes in the internal buffer and the usual
+   prolog according to the standard and write the result to RESBUF.
+
+   IMPORTANT: On some systems it is required that RESBUF is correctly
+   aligned for a 32-bit value.  */
+void *
+sha1_finish_ctx (struct sha1_ctx *ctx, void *resbuf)
+{
+  /* Take yet unprocessed bytes into account.  */
+  sha1_uint32 bytes = ctx->buflen;
+  size_t size = (bytes < 56) ? 64 / 4 : 64 * 2 / 4;
+
+  /* Now count remaining bytes.  */
+  ctx->total[0] += bytes;
+  if (ctx->total[0] < bytes)
+    ++ctx->total[1];
+
+  /* Put the 64-bit file length in *bits* at the end of the buffer.  */
+  ctx->buffer[size - 2] = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29));
+  ctx->buffer[size - 1] = SWAP (ctx->total[0] << 3);
+
+  memcpy (&((char *) ctx->buffer)[bytes], fillbuf, (size - 2) * 4 - bytes);
+
+  /* Process last bytes.  */
+  sha1_process_block (ctx->buffer, size * 4, ctx);
+
+  return sha1_read_ctx (ctx, resbuf);
+}
+
+/* Compute SHA1 message digest for bytes read from STREAM.  The
+   resulting message digest number will be written into the 16 bytes
+   beginning at RESBLOCK.  */
+int
+sha1_stream (FILE *stream, void *resblock)
+{
+  struct sha1_ctx ctx;
+  char buffer[BLOCKSIZE + 72];
+  size_t sum;
+
+  /* Initialize the computation context.  */
+  sha1_init_ctx (&ctx);
+
+  /* Iterate over full file contents.  */
+  while (1)
+    {
+      /* We read the file in blocks of BLOCKSIZE bytes.  One call of the
+	 computation function processes the whole buffer so that with the
+	 next round of the loop another block can be read.  */
+      size_t n;
+      sum = 0;
+
+      /* Read block.  Take care for partial reads.  */
+      while (1)
+	{
+	  n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream);
+
+	  sum += n;
+
+	  if (sum == BLOCKSIZE)
+	    break;
+
+	  if (n == 0)
+	    {
+	      /* Check for the error flag IFF N == 0, so that we don't
+		 exit the loop after a partial read due to e.g., EAGAIN
+		 or EWOULDBLOCK.  */
+	      if (ferror (stream))
+		return 1;
+	      goto process_partial_block;
+	    }
+
+	  /* We've read at least one byte, so ignore errors.  But always
+	     check for EOF, since feof may be true even though N > 0.
+	     Otherwise, we could end up calling fread after EOF.  */
+	  if (feof (stream))
+	    goto process_partial_block;
+	}
+
+      /* Process buffer with BLOCKSIZE bytes.  Note that
+			BLOCKSIZE % 64 == 0
+       */
+      sha1_process_block (buffer, BLOCKSIZE, &ctx);
+    }
+
+ process_partial_block:;
+
+  /* Process any remaining bytes.  */
+  if (sum > 0)
+    sha1_process_bytes (buffer, sum, &ctx);
+
+  /* Construct result in desired memory.  */
+  sha1_finish_ctx (&ctx, resblock);
+  return 0;
+}
+
+/* Compute SHA1 message digest for LEN bytes beginning at BUFFER.  The
+   result is always in little endian byte order, so that a byte-wise
+   output yields to the wanted ASCII representation of the message
+   digest.  */
+void *
+sha1_buffer (const char *buffer, size_t len, void *resblock)
+{
+  struct sha1_ctx ctx;
+
+  /* Initialize the computation context.  */
+  sha1_init_ctx (&ctx);
+
+  /* Process whole buffer but last len % 64 bytes.  */
+  sha1_process_bytes (buffer, len, &ctx);
+
+  /* Put result in desired memory area.  */
+  return sha1_finish_ctx (&ctx, resblock);
+}
+
+void
+sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx)
+{
+  /* When we already have some bits in our internal buffer concatenate
+     both inputs first.  */
+  if (ctx->buflen != 0)
+    {
+      size_t left_over = ctx->buflen;
+      size_t add = 128 - left_over > len ? len : 128 - left_over;
+
+      memcpy (&((char *) ctx->buffer)[left_over], buffer, add);
+      ctx->buflen += add;
+
+      if (ctx->buflen > 64)
+	{
+	  sha1_process_block (ctx->buffer, ctx->buflen & ~63, ctx);
+
+	  ctx->buflen &= 63;
+	  /* The regions in the following copy operation cannot overlap.  */
+	  memcpy (ctx->buffer,
+		  &((char *) ctx->buffer)[(left_over + add) & ~63],
+		  ctx->buflen);
+	}
+
+      buffer = (const char *) buffer + add;
+      len -= add;
+    }
+
+  /* Process available complete blocks.  */
+  if (len >= 64)
+    {
+#if !_STRING_ARCH_unaligned
+# define alignof(type) offsetof (struct { char c; type x; }, x)
+# define UNALIGNED_P(p) (((size_t) p) % alignof (sha1_uint32) != 0)
+      if (UNALIGNED_P (buffer))
+	while (len > 64)
+	  {
+	    sha1_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
+	    buffer = (const char *) buffer + 64;
+	    len -= 64;
+	  }
+      else
+#endif
+	{
+	  sha1_process_block (buffer, len & ~63, ctx);
+	  buffer = (const char *) buffer + (len & ~63);
+	  len &= 63;
+	}
+    }
+
+  /* Move remaining bytes in internal buffer.  */
+  if (len > 0)
+    {
+      size_t left_over = ctx->buflen;
+
+      memcpy (&((char *) ctx->buffer)[left_over], buffer, len);
+      left_over += len;
+      if (left_over >= 64)
+	{
+	  sha1_process_block (ctx->buffer, 64, ctx);
+	  left_over -= 64;
+	  memcpy (ctx->buffer, &ctx->buffer[16], left_over);
+	}
+      ctx->buflen = left_over;
+    }
+}
+
+/* --- Code below is the primary difference between md5.c and sha1.c --- */
+
+/* SHA1 round constants */
+#define K1 0x5a827999
+#define K2 0x6ed9eba1
+#define K3 0x8f1bbcdc
+#define K4 0xca62c1d6
+
+/* Round functions.  Note that F2 is the same as F4.  */
+#define F1(B,C,D) ( D ^ ( B & ( C ^ D ) ) )
+#define F2(B,C,D) (B ^ C ^ D)
+#define F3(B,C,D) ( ( B & C ) | ( D & ( B | C ) ) )
+#define F4(B,C,D) (B ^ C ^ D)
+
+/* Process LEN bytes of BUFFER, accumulating context into CTX.
+   It is assumed that LEN % 64 == 0.
+   Most of this code comes from GnuPG's cipher/sha1.c.  */
+
+void
+sha1_process_block (const void *buffer, size_t len, struct sha1_ctx *ctx)
+{
+  const sha1_uint32 *words = (const sha1_uint32*) buffer;
+  size_t nwords = len / sizeof (sha1_uint32);
+  const sha1_uint32 *endp = words + nwords;
+  sha1_uint32 x[16];
+  sha1_uint32 a = ctx->A;
+  sha1_uint32 b = ctx->B;
+  sha1_uint32 c = ctx->C;
+  sha1_uint32 d = ctx->D;
+  sha1_uint32 e = ctx->E;
+
+  /* First increment the byte count.  RFC 1321 specifies the possible
+     length of the file up to 2^64 bits.  Here we only compute the
+     number of bytes.  Do a double word increment.  */
+  ctx->total[0] += len;
+  if (ctx->total[0] < len)
+    ++ctx->total[1];
+
+#define rol(x, n) (((x) << (n)) | ((sha1_uint32) (x) >> (32 - (n))))
+
+#define M(I) ( tm =   x[I&0x0f] ^ x[(I-14)&0x0f] \
+		    ^ x[(I-8)&0x0f] ^ x[(I-3)&0x0f] \
+	       , (x[I&0x0f] = rol(tm, 1)) )
+
+#define R(A,B,C,D,E,F,K,M)  do { E += rol( A, 5 )     \
+				      + F( B, C, D )  \
+				      + K	      \
+				      + M;	      \
+				 B = rol( B, 30 );    \
+			       } while(0)
+
+  while (words < endp)
+    {
+      sha1_uint32 tm;
+      int t;
+      for (t = 0; t < 16; t++)
+	{
+	  x[t] = SWAP (*words);
+	  words++;
+	}
+
+      R( a, b, c, d, e, F1, K1, x[ 0] );
+      R( e, a, b, c, d, F1, K1, x[ 1] );
+      R( d, e, a, b, c, F1, K1, x[ 2] );
+      R( c, d, e, a, b, F1, K1, x[ 3] );
+      R( b, c, d, e, a, F1, K1, x[ 4] );
+      R( a, b, c, d, e, F1, K1, x[ 5] );
+      R( e, a, b, c, d, F1, K1, x[ 6] );
+      R( d, e, a, b, c, F1, K1, x[ 7] );
+      R( c, d, e, a, b, F1, K1, x[ 8] );
+      R( b, c, d, e, a, F1, K1, x[ 9] );
+      R( a, b, c, d, e, F1, K1, x[10] );
+      R( e, a, b, c, d, F1, K1, x[11] );
+      R( d, e, a, b, c, F1, K1, x[12] );
+      R( c, d, e, a, b, F1, K1, x[13] );
+      R( b, c, d, e, a, F1, K1, x[14] );
+      R( a, b, c, d, e, F1, K1, x[15] );
+      R( e, a, b, c, d, F1, K1, M(16) );
+      R( d, e, a, b, c, F1, K1, M(17) );
+      R( c, d, e, a, b, F1, K1, M(18) );
+      R( b, c, d, e, a, F1, K1, M(19) );
+      R( a, b, c, d, e, F2, K2, M(20) );
+      R( e, a, b, c, d, F2, K2, M(21) );
+      R( d, e, a, b, c, F2, K2, M(22) );
+      R( c, d, e, a, b, F2, K2, M(23) );
+      R( b, c, d, e, a, F2, K2, M(24) );
+      R( a, b, c, d, e, F2, K2, M(25) );
+      R( e, a, b, c, d, F2, K2, M(26) );
+      R( d, e, a, b, c, F2, K2, M(27) );
+      R( c, d, e, a, b, F2, K2, M(28) );
+      R( b, c, d, e, a, F2, K2, M(29) );
+      R( a, b, c, d, e, F2, K2, M(30) );
+      R( e, a, b, c, d, F2, K2, M(31) );
+      R( d, e, a, b, c, F2, K2, M(32) );
+      R( c, d, e, a, b, F2, K2, M(33) );
+      R( b, c, d, e, a, F2, K2, M(34) );
+      R( a, b, c, d, e, F2, K2, M(35) );
+      R( e, a, b, c, d, F2, K2, M(36) );
+      R( d, e, a, b, c, F2, K2, M(37) );
+      R( c, d, e, a, b, F2, K2, M(38) );
+      R( b, c, d, e, a, F2, K2, M(39) );
+      R( a, b, c, d, e, F3, K3, M(40) );
+      R( e, a, b, c, d, F3, K3, M(41) );
+      R( d, e, a, b, c, F3, K3, M(42) );
+      R( c, d, e, a, b, F3, K3, M(43) );
+      R( b, c, d, e, a, F3, K3, M(44) );
+      R( a, b, c, d, e, F3, K3, M(45) );
+      R( e, a, b, c, d, F3, K3, M(46) );
+      R( d, e, a, b, c, F3, K3, M(47) );
+      R( c, d, e, a, b, F3, K3, M(48) );
+      R( b, c, d, e, a, F3, K3, M(49) );
+      R( a, b, c, d, e, F3, K3, M(50) );
+      R( e, a, b, c, d, F3, K3, M(51) );
+      R( d, e, a, b, c, F3, K3, M(52) );
+      R( c, d, e, a, b, F3, K3, M(53) );
+      R( b, c, d, e, a, F3, K3, M(54) );
+      R( a, b, c, d, e, F3, K3, M(55) );
+      R( e, a, b, c, d, F3, K3, M(56) );
+      R( d, e, a, b, c, F3, K3, M(57) );
+      R( c, d, e, a, b, F3, K3, M(58) );
+      R( b, c, d, e, a, F3, K3, M(59) );
+      R( a, b, c, d, e, F4, K4, M(60) );
+      R( e, a, b, c, d, F4, K4, M(61) );
+      R( d, e, a, b, c, F4, K4, M(62) );
+      R( c, d, e, a, b, F4, K4, M(63) );
+      R( b, c, d, e, a, F4, K4, M(64) );
+      R( a, b, c, d, e, F4, K4, M(65) );
+      R( e, a, b, c, d, F4, K4, M(66) );
+      R( d, e, a, b, c, F4, K4, M(67) );
+      R( c, d, e, a, b, F4, K4, M(68) );
+      R( b, c, d, e, a, F4, K4, M(69) );
+      R( a, b, c, d, e, F4, K4, M(70) );
+      R( e, a, b, c, d, F4, K4, M(71) );
+      R( d, e, a, b, c, F4, K4, M(72) );
+      R( c, d, e, a, b, F4, K4, M(73) );
+      R( b, c, d, e, a, F4, K4, M(74) );
+      R( a, b, c, d, e, F4, K4, M(75) );
+      R( e, a, b, c, d, F4, K4, M(76) );
+      R( d, e, a, b, c, F4, K4, M(77) );
+      R( c, d, e, a, b, F4, K4, M(78) );
+      R( b, c, d, e, a, F4, K4, M(79) );
+
+      a = ctx->A += a;
+      b = ctx->B += b;
+      c = ctx->C += c;
+      d = ctx->D += d;
+      e = ctx->E += e;
+    }
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/sigsetmask.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/sigsetmask.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/sigsetmask.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/sigsetmask.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,40 @@
+/* Version of sigsetmask.c
+   Written by Steve Chamberlain (sac@cygnus.com).
+   Contributed by Cygnus Support.
+   This file is in the public doamin. */
+
+/*
+
+@deftypefn Supplemental int sigsetmask (int @var{set})
+
+Sets the signal mask to the one provided in @var{set} and returns
+the old mask (which, for libiberty's implementation, will always
+be the value @code{1}).
+
+@end deftypefn
+
+*/
+
+#define _POSIX_SOURCE
+#include <ansidecl.h>
+/* Including <sys/types.h> seems to be needed by ISC. */
+#include <sys/types.h>
+#include <signal.h>
+
+extern void abort (void) ATTRIBUTE_NORETURN;
+
+#ifdef SIG_SETMASK
+int
+sigsetmask (int set)
+{
+    sigset_t new_sig;
+    sigset_t old_sig;
+    
+    sigemptyset (&new_sig);
+    if (set != 0) {
+      abort();	/* FIXME, we don't know how to translate old mask to new */
+    }
+    sigprocmask(SIG_SETMASK, &new_sig, &old_sig);
+    return 1;	/* FIXME, we always return 1 as old value.  */
+}
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/simple-object-coff.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/simple-object-coff.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/simple-object-coff.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/simple-object-coff.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,804 @@
+/* simple-object-coff.c -- routines to manipulate COFF object files.
+   Copyright 2010 Free Software Foundation, Inc.
+   Written by Ian Lance Taylor, Google.
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#include "config.h"
+#include "libiberty.h"
+#include "simple-object.h"
+
+#include <errno.h>
+#include <stddef.h>
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
+#include "simple-object-common.h"
+
+/* COFF structures and constants.  */
+
+/* COFF file header.  */
+
+struct external_filehdr
+{
+  unsigned char f_magic[2];	/* magic number			*/
+  unsigned char f_nscns[2];	/* number of sections		*/
+  unsigned char f_timdat[4];	/* time & date stamp		*/
+  unsigned char f_symptr[4];	/* file pointer to symtab	*/
+  unsigned char f_nsyms[4];	/* number of symtab entries	*/
+  unsigned char f_opthdr[2];	/* sizeof(optional hdr)		*/
+  unsigned char f_flags[2];	/* flags			*/
+};
+
+/* Bits for filehdr f_flags field.  */
+
+#define F_EXEC			(0x0002)
+#define IMAGE_FILE_SYSTEM	(0x1000)
+#define IMAGE_FILE_DLL		(0x2000)
+
+/* COFF section header.  */
+
+struct external_scnhdr
+{
+  unsigned char s_name[8];	/* section name				*/
+  unsigned char s_paddr[4];	/* physical address, aliased s_nlib 	*/
+  unsigned char s_vaddr[4];	/* virtual address			*/
+  unsigned char s_size[4];	/* section size				*/
+  unsigned char s_scnptr[4];	/* file ptr to raw data for section 	*/
+  unsigned char s_relptr[4];	/* file ptr to relocation		*/
+  unsigned char s_lnnoptr[4];	/* file ptr to line numbers		*/
+  unsigned char s_nreloc[2];	/* number of relocation entries		*/
+  unsigned char s_nlnno[2];	/* number of line number entries	*/
+  unsigned char s_flags[4];	/* flags				*/
+};
+
+/* The length of the s_name field in struct external_scnhdr.  */
+
+#define SCNNMLEN (8)
+
+/* Bits for scnhdr s_flags field.  This includes some bits defined
+   only for PE.  This may need to be moved into coff_magic.  */
+
+#define STYP_DATA			(1 << 6)
+#define IMAGE_SCN_MEM_DISCARDABLE	(1 << 25)
+#define IMAGE_SCN_MEM_SHARED		(1 << 28)
+#define IMAGE_SCN_MEM_READ		(1 << 30)
+
+#define IMAGE_SCN_ALIGN_POWER_BIT_POS	     20
+#define IMAGE_SCN_ALIGN_POWER_CONST(val)     \
+  (((val) + 1) << IMAGE_SCN_ALIGN_POWER_BIT_POS)
+
+/* COFF symbol table entry.  */
+
+#define E_SYMNMLEN	8	/* # characters in a symbol name	*/
+
+struct external_syment
+{
+  union
+  {
+    unsigned char e_name[E_SYMNMLEN];
+
+    struct
+    {
+      unsigned char e_zeroes[4];
+      unsigned char e_offset[4];
+    } e;
+  } e;
+
+  unsigned char e_value[4];
+  unsigned char e_scnum[2];
+  unsigned char e_type[2];
+  unsigned char e_sclass[1];
+  unsigned char e_numaux[1];
+};
+
+/* Length allowed for filename in aux sym format 4.  */
+
+#define E_FILNMLEN	18
+
+/* Omits x_sym and other unused variants.  */
+
+union external_auxent
+{
+  /* Aux sym format 4: file.  */
+  union
+  {
+    char x_fname[E_FILNMLEN];
+    struct
+    {
+      unsigned char x_zeroes[4];
+      unsigned char x_offset[4];
+    } x_n;
+  } x_file;
+  /* Aux sym format 5: section.  */
+  struct
+  {
+    unsigned char x_scnlen[4];		/* section length		*/
+    unsigned char x_nreloc[2];		/* # relocation entries		*/
+    unsigned char x_nlinno[2];		/* # line numbers		*/
+    unsigned char x_checksum[4];	/* section COMDAT checksum	*/
+    unsigned char x_associated[2];	/* COMDAT assoc section index	*/
+    unsigned char x_comdat[1];		/* COMDAT selection number	*/
+  } x_scn;
+};
+
+/* Symbol-related constants.  */
+
+#define IMAGE_SYM_DEBUG		(-2)
+#define IMAGE_SYM_TYPE_NULL	(0)
+#define IMAGE_SYM_DTYPE_NULL	(0)
+#define IMAGE_SYM_CLASS_STATIC	(3)
+#define IMAGE_SYM_CLASS_FILE	(103)
+
+#define IMAGE_SYM_TYPE \
+  ((IMAGE_SYM_DTYPE_NULL << 4) | IMAGE_SYM_TYPE_NULL)
+
+/* Private data for an simple_object_read.  */
+
+struct simple_object_coff_read
+{
+  /* Magic number.  */
+  unsigned short magic;
+  /* Whether the file is big-endian.  */
+  unsigned char is_big_endian;
+  /* Number of sections.  */
+  unsigned short nscns;
+  /* File offset of symbol table.  */
+  off_t symptr;
+  /* Number of symbol table entries.  */
+  unsigned int nsyms;
+  /* Flags.  */
+  unsigned short flags;
+  /* Offset of section headers in file.  */
+  off_t scnhdr_offset;
+};
+
+/* Private data for an simple_object_attributes.  */
+
+struct simple_object_coff_attributes
+{
+  /* Magic number.  */
+  unsigned short magic;
+  /* Whether the file is big-endian.  */
+  unsigned char is_big_endian;
+  /* Flags.  */
+  unsigned short flags;
+};
+
+/* There is no magic number which indicates a COFF file as opposed to
+   any other sort of file.  Instead, each COFF file starts with a
+   two-byte magic number which also indicates the type of the target.
+   This struct holds a magic number as well as characteristics of that
+   COFF format.  */
+
+struct coff_magic_struct
+{
+  /* Magic number.  */
+  unsigned short magic;
+  /* Whether this magic number is for a big-endian file.  */
+  unsigned char is_big_endian;
+  /* Flag bits, in the f_flags fields, which indicates that this file
+     is not a relocatable object file.  There is no flag which
+     specifically indicates a relocatable object file, it is only
+     implied by the absence of these flags.  */
+  unsigned short non_object_flags;
+};
+
+/* This is a list of the COFF magic numbers which we recognize, namely
+   the ones used on Windows.  More can be added as needed.  */
+
+static const struct coff_magic_struct coff_magic[] =
+{
+  /* i386.  */
+  { 0x14c, 0, F_EXEC | IMAGE_FILE_SYSTEM | IMAGE_FILE_DLL },
+  /* x86_64.  */
+  { 0x8664, 0, F_EXEC | IMAGE_FILE_SYSTEM | IMAGE_FILE_DLL }
+};
+
+/* See if we have a COFF file.  */
+
+static void *
+simple_object_coff_match (unsigned char header[SIMPLE_OBJECT_MATCH_HEADER_LEN],
+			  int descriptor, off_t offset,
+			  const char *segment_name ATTRIBUTE_UNUSED,
+			  const char **errmsg, int *err)
+{
+  size_t c;
+  unsigned short magic_big;
+  unsigned short magic_little;
+  unsigned short magic;
+  size_t i;
+  int is_big_endian;
+  unsigned short (*fetch_16) (const unsigned char *);
+  unsigned int (*fetch_32) (const unsigned char *);
+  unsigned char hdrbuf[sizeof (struct external_filehdr)];
+  unsigned short flags;
+  struct simple_object_coff_read *ocr;
+
+  c = sizeof (coff_magic) / sizeof (coff_magic[0]);
+  magic_big = simple_object_fetch_big_16 (header);
+  magic_little = simple_object_fetch_little_16 (header);
+  for (i = 0; i < c; ++i)
+    {
+      if (coff_magic[i].is_big_endian
+	  ? coff_magic[i].magic == magic_big
+	  : coff_magic[i].magic == magic_little)
+	break;
+    }
+  if (i >= c)
+    {
+      *errmsg = NULL;
+      *err = 0;
+      return NULL;
+    }
+  is_big_endian = coff_magic[i].is_big_endian;
+
+  magic = is_big_endian ? magic_big : magic_little;
+  fetch_16 = (is_big_endian
+	      ? simple_object_fetch_big_16
+	      : simple_object_fetch_little_16);
+  fetch_32 = (is_big_endian
+	      ? simple_object_fetch_big_32
+	      : simple_object_fetch_little_32);
+
+  if (!simple_object_internal_read (descriptor, offset, hdrbuf, sizeof hdrbuf,
+				    errmsg, err))
+    return NULL;
+
+  flags = fetch_16 (hdrbuf + offsetof (struct external_filehdr, f_flags));
+  if ((flags & coff_magic[i].non_object_flags) != 0)
+    {
+      *errmsg = "not relocatable object file";
+      *err = 0;
+      return NULL;
+    }
+
+  ocr = XNEW (struct simple_object_coff_read);
+  ocr->magic = magic;
+  ocr->is_big_endian = is_big_endian;
+  ocr->nscns = fetch_16 (hdrbuf + offsetof (struct external_filehdr, f_nscns));
+  ocr->symptr = fetch_32 (hdrbuf
+			  + offsetof (struct external_filehdr, f_symptr));
+  ocr->nsyms = fetch_32 (hdrbuf + offsetof (struct external_filehdr, f_nsyms));
+  ocr->flags = flags;
+  ocr->scnhdr_offset = (sizeof (struct external_filehdr)
+			+ fetch_16 (hdrbuf + offsetof (struct external_filehdr,
+						       f_opthdr)));
+
+  return (void *) ocr;
+}
+
+/* Read the string table in a COFF file.  */
+
+static char *
+simple_object_coff_read_strtab (simple_object_read *sobj, size_t *strtab_size,
+				const char **errmsg, int *err)
+{
+  struct simple_object_coff_read *ocr =
+    (struct simple_object_coff_read *) sobj->data;
+  off_t strtab_offset;
+  unsigned char strsizebuf[4];
+  size_t strsize;
+  char *strtab;
+
+  strtab_offset = sobj->offset + ocr->symptr
+		  + ocr->nsyms * sizeof (struct external_syment);
+  if (!simple_object_internal_read (sobj->descriptor, strtab_offset,
+				    strsizebuf, 4, errmsg, err))
+    return NULL;
+  strsize = (ocr->is_big_endian
+	     ? simple_object_fetch_big_32 (strsizebuf)
+	     : simple_object_fetch_little_32 (strsizebuf));
+  strtab = XNEWVEC (char, strsize);
+  if (!simple_object_internal_read (sobj->descriptor, strtab_offset,
+				    (unsigned char *) strtab, strsize, errmsg,
+				    err))
+    {
+      XDELETEVEC (strtab);
+      return NULL;
+    }
+  *strtab_size = strsize;
+  return strtab;
+}
+
+/* Find all sections in a COFF file.  */
+
+static const char *
+simple_object_coff_find_sections (simple_object_read *sobj,
+				  int (*pfn) (void *, const char *,
+					      off_t offset, off_t length),
+				  void *data,
+				  int *err)
+{
+  struct simple_object_coff_read *ocr =
+    (struct simple_object_coff_read *) sobj->data;
+  size_t scnhdr_size;
+  unsigned char *scnbuf;
+  const char *errmsg;
+  unsigned int (*fetch_32) (const unsigned char *);
+  unsigned int nscns;
+  char *strtab;
+  size_t strtab_size;
+  unsigned int i;
+
+  scnhdr_size = sizeof (struct external_scnhdr);
+  scnbuf = XNEWVEC (unsigned char, scnhdr_size * ocr->nscns);
+  if (!simple_object_internal_read (sobj->descriptor,
+				    sobj->offset + ocr->scnhdr_offset,
+				    scnbuf, scnhdr_size * ocr->nscns, &errmsg,
+				    err))
+    {
+      XDELETEVEC (scnbuf);
+      return errmsg;
+    }
+
+  fetch_32 = (ocr->is_big_endian
+	      ? simple_object_fetch_big_32
+	      : simple_object_fetch_little_32);
+
+  nscns = ocr->nscns;
+  strtab = NULL;
+  strtab_size = 0;
+  for (i = 0; i < nscns; ++i)
+    {
+      unsigned char *scnhdr;
+      unsigned char *scnname;
+      char namebuf[SCNNMLEN + 1];
+      char *name;
+      off_t scnptr;
+      unsigned int size;
+
+      scnhdr = scnbuf + i * scnhdr_size;
+      scnname = scnhdr + offsetof (struct external_scnhdr, s_name);
+      memcpy (namebuf, scnname, SCNNMLEN);
+      namebuf[SCNNMLEN] = '\0';
+      name = &namebuf[0];
+      if (namebuf[0] == '/')
+	{
+	  size_t strindex;
+	  char *end;
+
+	  strindex = strtol (namebuf + 1, &end, 10);
+	  if (*end == '\0')
+	    {
+	      /* The real section name is found in the string
+		 table.  */
+	      if (strtab == NULL)
+		{
+		  strtab = simple_object_coff_read_strtab (sobj,
+							   &strtab_size,
+							   &errmsg, err);
+		  if (strtab == NULL)
+		    {
+		      XDELETEVEC (scnbuf);
+		      return errmsg;
+		    }
+		}
+
+	      if (strindex < 4 || strindex >= strtab_size)
+		{
+		  XDELETEVEC (strtab);
+		  XDELETEVEC (scnbuf);
+		  *err = 0;
+		  return "section string index out of range";
+		}
+
+	      name = strtab + strindex;
+	    }
+	}
+
+      scnptr = fetch_32 (scnhdr + offsetof (struct external_scnhdr, s_scnptr));
+      size = fetch_32 (scnhdr + offsetof (struct external_scnhdr, s_size));
+
+      if (!(*pfn) (data, name, scnptr, size))
+	break;
+    }
+
+  if (strtab != NULL)
+    XDELETEVEC (strtab);
+  XDELETEVEC (scnbuf);
+
+  return NULL;
+}
+
+/* Fetch the attributes for an simple_object_read.  */
+
+static void *
+simple_object_coff_fetch_attributes (simple_object_read *sobj,
+				     const char **errmsg ATTRIBUTE_UNUSED,
+				     int *err ATTRIBUTE_UNUSED)
+{
+  struct simple_object_coff_read *ocr =
+    (struct simple_object_coff_read *) sobj->data;
+  struct simple_object_coff_attributes *ret;
+
+  ret = XNEW (struct simple_object_coff_attributes);
+  ret->magic = ocr->magic;
+  ret->is_big_endian = ocr->is_big_endian;
+  ret->flags = ocr->flags;
+  return ret;
+}
+
+/* Release the private data for an simple_object_read.  */
+
+static void
+simple_object_coff_release_read (void *data)
+{
+  XDELETE (data);
+}
+
+/* Compare two attributes structures.  */
+
+static const char *
+simple_object_coff_attributes_merge (void *todata, void *fromdata, int *err)
+{
+  struct simple_object_coff_attributes *to =
+    (struct simple_object_coff_attributes *) todata;
+  struct simple_object_coff_attributes *from =
+    (struct simple_object_coff_attributes *) fromdata;
+
+  if (to->magic != from->magic || to->is_big_endian != from->is_big_endian)
+    {
+      *err = 0;
+      return "COFF object format mismatch";
+    }
+  return NULL;
+}
+
+/* Release the private data for an attributes structure.  */
+
+static void
+simple_object_coff_release_attributes (void *data)
+{
+  XDELETE (data);
+}
+
+/* Prepare to write out a file.  */
+
+static void *
+simple_object_coff_start_write (void *attributes_data,
+				const char **errmsg ATTRIBUTE_UNUSED,
+				int *err ATTRIBUTE_UNUSED)
+{
+  struct simple_object_coff_attributes *attrs =
+    (struct simple_object_coff_attributes *) attributes_data;
+  struct simple_object_coff_attributes *ret;
+
+  /* We're just going to record the attributes, but we need to make a
+     copy because the user may delete them.  */
+  ret = XNEW (struct simple_object_coff_attributes);
+  *ret = *attrs;
+  return ret;
+}
+
+/* Write out a COFF filehdr.  */
+
+static int
+simple_object_coff_write_filehdr (simple_object_write *sobj, int descriptor,
+				  unsigned int nscns, size_t symtab_offset,
+				  unsigned int nsyms, const char **errmsg,
+				  int *err)
+{
+  struct simple_object_coff_attributes *attrs =
+    (struct simple_object_coff_attributes *) sobj->data;
+  unsigned char hdrbuf[sizeof (struct external_filehdr)];
+  unsigned char *hdr;
+  void (*set_16) (unsigned char *, unsigned short);
+  void (*set_32) (unsigned char *, unsigned int);
+
+  hdr = &hdrbuf[0];
+
+  set_16 = (attrs->is_big_endian
+	    ? simple_object_set_big_16
+	    : simple_object_set_little_16);
+  set_32 = (attrs->is_big_endian
+	    ? simple_object_set_big_32
+	    : simple_object_set_little_32);
+
+  memset (hdr, 0, sizeof (struct external_filehdr));
+
+  set_16 (hdr + offsetof (struct external_filehdr, f_magic), attrs->magic);
+  set_16 (hdr + offsetof (struct external_filehdr, f_nscns), nscns);
+  /* f_timdat left as zero.  */
+  set_32 (hdr + offsetof (struct external_filehdr, f_symptr), symtab_offset);
+  set_32 (hdr + offsetof (struct external_filehdr, f_nsyms), nsyms);
+  /* f_opthdr left as zero.  */
+  set_16 (hdr + offsetof (struct external_filehdr, f_flags), attrs->flags);
+
+  return simple_object_internal_write (descriptor, 0, hdrbuf,
+				       sizeof (struct external_filehdr),
+				       errmsg, err);
+}
+
+/* Write out a COFF section header.  */
+
+static int
+simple_object_coff_write_scnhdr (simple_object_write *sobj, int descriptor,
+				 const char *name, size_t *name_offset,
+				 off_t scnhdr_offset, size_t scnsize,
+				 off_t offset, unsigned int align,
+				 const char **errmsg, int *err)
+{
+  struct simple_object_coff_attributes *attrs =
+    (struct simple_object_coff_attributes *) sobj->data;
+  void (*set_32) (unsigned char *, unsigned int);
+  unsigned char hdrbuf[sizeof (struct external_scnhdr)];
+  unsigned char *hdr;
+  size_t namelen;
+  unsigned int flags;
+
+  set_32 = (attrs->is_big_endian
+	    ? simple_object_set_big_32
+	    : simple_object_set_little_32);
+
+  memset (hdrbuf, 0, sizeof hdrbuf);
+  hdr = &hdrbuf[0];
+
+  namelen = strlen (name);
+  if (namelen <= SCNNMLEN)
+    strncpy ((char *) hdr + offsetof (struct external_scnhdr, s_name), name,
+	     SCNNMLEN);
+  else
+    {
+      snprintf ((char *) hdr + offsetof (struct external_scnhdr, s_name),
+		SCNNMLEN, "/%lu", (unsigned long) *name_offset);
+      *name_offset += namelen + 1;
+    }
+
+  /* s_paddr left as zero.  */
+  /* s_vaddr left as zero.  */
+  set_32 (hdr + offsetof (struct external_scnhdr, s_size), scnsize);
+  set_32 (hdr + offsetof (struct external_scnhdr, s_scnptr), offset);
+  /* s_relptr left as zero.  */
+  /* s_lnnoptr left as zero.  */
+  /* s_nreloc left as zero.  */
+  /* s_nlnno left as zero.  */
+  flags = (STYP_DATA | IMAGE_SCN_MEM_DISCARDABLE | IMAGE_SCN_MEM_SHARED
+	   | IMAGE_SCN_MEM_READ);
+  /* PE can represent alignment up to 13.  */
+  if (align > 13)
+    align = 13;
+  flags |= IMAGE_SCN_ALIGN_POWER_CONST(align);
+  set_32 (hdr + offsetof (struct external_scnhdr, s_flags), flags);
+
+  return simple_object_internal_write (descriptor, scnhdr_offset, hdrbuf,
+				       sizeof (struct external_scnhdr),
+				       errmsg, err);
+}
+
+/* Write out a complete COFF file.  */
+
+static const char *
+simple_object_coff_write_to_file (simple_object_write *sobj, int descriptor,
+				  int *err)
+{
+  struct simple_object_coff_attributes *attrs =
+    (struct simple_object_coff_attributes *) sobj->data;
+  unsigned int nscns, secnum;
+  simple_object_write_section *section;
+  off_t scnhdr_offset;
+  size_t symtab_offset;
+  off_t secsym_offset;
+  unsigned int nsyms;
+  size_t offset;
+  size_t name_offset;
+  const char *errmsg;
+  unsigned char strsizebuf[4];
+  /* The interface doesn't give us access to the name of the input file
+     yet.  We want to use its basename for the FILE symbol.  This is
+     what 'gas' uses when told to assemble from stdin.  */
+  const char *source_filename = "fake";
+  size_t sflen;
+  union
+  {
+    struct external_syment sym;
+    union external_auxent aux;
+  } syms[2];
+  void (*set_16) (unsigned char *, unsigned short);
+  void (*set_32) (unsigned char *, unsigned int);
+
+  set_16 = (attrs->is_big_endian
+	    ? simple_object_set_big_16
+	    : simple_object_set_little_16);
+  set_32 = (attrs->is_big_endian
+	    ? simple_object_set_big_32
+	    : simple_object_set_little_32);
+
+  nscns = 0;
+  for (section = sobj->sections; section != NULL; section = section->next)
+    ++nscns;
+
+  scnhdr_offset = sizeof (struct external_filehdr);
+  offset = scnhdr_offset + nscns * sizeof (struct external_scnhdr);
+  name_offset = 4;
+  for (section = sobj->sections; section != NULL; section = section->next)
+    {
+      size_t mask;
+      size_t new_offset;
+      size_t scnsize;
+      struct simple_object_write_section_buffer *buffer;
+
+      mask = (1U << section->align) - 1;
+      new_offset = offset & mask;
+      new_offset &= ~ mask;
+      while (new_offset > offset)
+	{
+	  unsigned char zeroes[16];
+	  size_t write;
+
+	  memset (zeroes, 0, sizeof zeroes);
+	  write = new_offset - offset;
+	  if (write > sizeof zeroes)
+	    write = sizeof zeroes;
+	  if (!simple_object_internal_write (descriptor, offset, zeroes, write,
+					     &errmsg, err))
+	    return errmsg;
+	}
+
+      scnsize = 0;
+      for (buffer = section->buffers; buffer != NULL; buffer = buffer->next)
+	{
+	  if (!simple_object_internal_write (descriptor, offset + scnsize,
+					     ((const unsigned char *)
+					      buffer->buffer),
+					     buffer->size, &errmsg, err))
+	    return errmsg;
+	  scnsize += buffer->size;
+	}
+
+      if (!simple_object_coff_write_scnhdr (sobj, descriptor, section->name,
+					    &name_offset, scnhdr_offset,
+					    scnsize, offset, section->align,
+					    &errmsg, err))
+	return errmsg;
+
+      scnhdr_offset += sizeof (struct external_scnhdr);
+      offset += scnsize;
+    }
+
+  /* Symbol table is always half-word aligned.  */
+  offset += (offset & 1);
+  /* There is a file symbol and a section symbol per section,
+     and each of these has a single auxiliary symbol following.  */
+  nsyms = 2 * (nscns + 1);
+  symtab_offset = offset;
+  /* Advance across space reserved for symbol table to locate
+     start of string table.  */
+  offset += nsyms * sizeof (struct external_syment);
+
+  /* Write out file symbol.  */
+  memset (&syms[0], 0, sizeof (syms));
+  strcpy ((char *)&syms[0].sym.e.e_name[0], ".file");
+  set_16 (&syms[0].sym.e_scnum[0], IMAGE_SYM_DEBUG);
+  set_16 (&syms[0].sym.e_type[0], IMAGE_SYM_TYPE);
+  syms[0].sym.e_sclass[0] = IMAGE_SYM_CLASS_FILE;
+  syms[0].sym.e_numaux[0] = 1;
+  /* The name need not be nul-terminated if it fits into the x_fname field
+     directly, but must be if it has to be placed into the string table.  */
+  sflen = strlen (source_filename);
+  if (sflen <= E_FILNMLEN)
+    memcpy (&syms[1].aux.x_file.x_fname[0], source_filename, sflen);
+  else
+    {
+      set_32 (&syms[1].aux.x_file.x_n.x_offset[0], name_offset);
+      if (!simple_object_internal_write (descriptor, offset + name_offset,
+					 ((const unsigned char *)
+					  source_filename),
+					 sflen + 1, &errmsg, err))
+	return errmsg;
+      name_offset += strlen (source_filename) + 1;
+    }
+  if (!simple_object_internal_write (descriptor, symtab_offset,
+				     (const unsigned char *) &syms[0],
+				     sizeof (syms), &errmsg, err))
+    return errmsg;
+
+  /* Write the string table length, followed by the strings and section
+     symbols in step with each other.  */
+  set_32 (strsizebuf, name_offset);
+  if (!simple_object_internal_write (descriptor, offset, strsizebuf, 4,
+				     &errmsg, err))
+    return errmsg;
+
+  name_offset = 4;
+  secsym_offset = symtab_offset + sizeof (syms);
+  memset (&syms[0], 0, sizeof (syms));
+  set_16 (&syms[0].sym.e_type[0], IMAGE_SYM_TYPE);
+  syms[0].sym.e_sclass[0] = IMAGE_SYM_CLASS_STATIC;
+  syms[0].sym.e_numaux[0] = 1;
+  secnum = 1;
+
+  for (section = sobj->sections; section != NULL; section = section->next)
+    {
+      size_t namelen;
+      size_t scnsize;
+      struct simple_object_write_section_buffer *buffer;
+
+      namelen = strlen (section->name);
+      set_16 (&syms[0].sym.e_scnum[0], secnum++);
+      scnsize = 0;
+      for (buffer = section->buffers; buffer != NULL; buffer = buffer->next)
+	scnsize += buffer->size;
+      set_32 (&syms[1].aux.x_scn.x_scnlen[0], scnsize);
+      if (namelen > SCNNMLEN)
+	{
+	  set_32 (&syms[0].sym.e.e.e_zeroes[0], 0);
+	  set_32 (&syms[0].sym.e.e.e_offset[0], name_offset);
+	  if (!simple_object_internal_write (descriptor, offset + name_offset,
+					     ((const unsigned char *)
+					      section->name),
+					     namelen + 1, &errmsg, err))
+	    return errmsg;
+	  name_offset += namelen + 1;
+	}
+      else
+	{
+	  memcpy (&syms[0].sym.e.e_name[0], section->name,
+		  strlen (section->name));
+	  memset (&syms[0].sym.e.e_name[strlen (section->name)], 0,
+		  E_SYMNMLEN - strlen (section->name));
+	}
+
+      if (!simple_object_internal_write (descriptor, secsym_offset,
+					 (const unsigned char *) &syms[0],
+					 sizeof (syms), &errmsg, err))
+	return errmsg;
+      secsym_offset += sizeof (syms);
+    }
+
+  if (!simple_object_coff_write_filehdr (sobj, descriptor, nscns,
+					 symtab_offset, nsyms, &errmsg, err))
+    return errmsg;
+
+  return NULL;
+}
+
+/* Release the private data for an simple_object_write structure.  */
+
+static void
+simple_object_coff_release_write (void *data)
+{
+  XDELETE (data);
+}
+
+/* The COFF functions.  */
+
+const struct simple_object_functions simple_object_coff_functions =
+{
+  simple_object_coff_match,
+  simple_object_coff_find_sections,
+  simple_object_coff_fetch_attributes,
+  simple_object_coff_release_read,
+  simple_object_coff_attributes_merge,
+  simple_object_coff_release_attributes,
+  simple_object_coff_start_write,
+  simple_object_coff_write_to_file,
+  simple_object_coff_release_write
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/simple-object-common.h sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/simple-object-common.h
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/simple-object-common.h	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/simple-object-common.h	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,355 @@
+/* simple-object-common.h -- common structs for object file manipulation.
+   Copyright (C) 2010 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If not,
+write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/* Forward reference.  */
+struct simple_object_functions;
+
+/* An object file opened for reading.  */
+
+struct simple_object_read_struct
+{
+  /* The file descriptor.  */
+  int descriptor;
+  /* The offset within the file.  */
+  off_t offset;
+  /* The functions which do the actual work.  */
+  const struct simple_object_functions *functions;
+  /* Private data for the object file format.  */
+  void *data;
+};
+
+/* Object file attributes.  */
+
+struct simple_object_attributes_struct
+{
+  /* The functions which do the actual work.  */
+  const struct simple_object_functions *functions;
+  /* Private data for the object file format.  */
+  void *data;
+};
+
+/* An object file being created.  */
+
+struct simple_object_write_struct
+{
+  /* The functions which do the actual work.  */
+  const struct simple_object_functions *functions;
+  /* The segment_name argument from the user.  */
+  char *segment_name;
+  /* The start of the list of sections.  */
+  simple_object_write_section *sections;
+  /* The last entry in the list of sections.  */
+  simple_object_write_section *last_section;
+  /* Private data for the object file format.  */
+  void *data;
+};
+
+/* A section in an object file being created.  */
+
+struct simple_object_write_section_struct
+{
+  /* Next in the list of sections attached to an
+     simple_object_write.  */
+  simple_object_write_section *next;
+  /* The name of this section.  */
+  char *name;
+  /* The required alignment.  */
+  unsigned int align;
+  /* The first data attached to this section.  */
+  struct simple_object_write_section_buffer *buffers;
+  /* The last data attached to this section.  */
+  struct simple_object_write_section_buffer *last_buffer;
+};
+
+/* Data attached to a section.  */
+
+struct simple_object_write_section_buffer
+{
+  /* The next data for this section.  */
+  struct simple_object_write_section_buffer *next;
+  /* The size of the buffer.  */
+  size_t size;
+  /* The actual bytes.  */
+  const void *buffer;
+  /* A buffer to free, or NULL.  */
+  void *free_buffer;
+};
+
+/* The number of bytes we read from the start of the file to pass to
+   the match function.  */
+#define SIMPLE_OBJECT_MATCH_HEADER_LEN (16)
+
+/* Format-specific object file functions.  */
+
+struct simple_object_functions
+{
+  /* If this file matches these functions, return a new value for the
+     private data for an simple_object_read.  HEADER is the first 16
+     bytes of the file.  DESCRIPTOR, OFFSET, SEGMENT_NAME, ERRMSG, and
+     ERR are as for simple_object_open_read.  If this file does not
+     match, this function should return NULL with *ERRMSG set to
+     NULL.  */
+  void *(*match) (unsigned char header[SIMPLE_OBJECT_MATCH_HEADER_LEN],
+		  int descriptor, off_t offset, const char *segment_name,
+		  const char **errmsg, int *err);
+
+  /* Implement simple_object_find_sections.  */
+  const char *(*find_sections) (simple_object_read *,
+				int (*pfn) (void *, const char *,
+					    off_t offset, off_t length),
+				void *data,
+				int *err);
+
+  /* Return the private data for the attributes for SOBJ.  */
+  void *(*fetch_attributes) (simple_object_read *sobj, const char **errmsg,
+			     int *err);
+
+  /* Release the private data for an simple_object_read.  */
+  void (*release_read) (void *);
+
+  /* Merge the private data for the attributes of two files.  If they
+     could be linked together, return NULL.  Otherwise return an error
+     message.  */
+  const char *(*attributes_merge) (void *, void *, int *err);
+
+  /* Release the private data for an simple_object_attributes.  */
+  void (*release_attributes) (void *);
+
+  /* Start creating an object file.  */
+  void *(*start_write) (void *attributes_data, const char **errmsg,
+			int *err);
+
+  /* Write the complete object file.  */
+  const char *(*write_to_file) (simple_object_write *sobj, int descriptor,
+				int *err);
+
+  /* Release the private data for an simple_object_write.  */
+  void (*release_write) (void *);
+};
+
+/* The known object file formats.  */
+
+extern const struct simple_object_functions simple_object_coff_functions;
+extern const struct simple_object_functions simple_object_elf_functions;
+extern const struct simple_object_functions simple_object_mach_o_functions;
+
+/* Read SIZE bytes from DESCRIPTOR at file offset OFFSET into BUFFER.
+   Return non-zero on success.  On failure return 0 and set *ERRMSG
+   and *ERR.  */
+
+extern int
+simple_object_internal_read (int descriptor, off_t offset,
+			     unsigned char *buffer, size_t size,
+			     const char **errmsg, int *err);
+
+/* Write SIZE bytes from BUFFER to DESCRIPTOR at file offset OFFSET.
+   Return non-zero on success.  On failure return 0 and set *ERRMSG
+   and *ERR.  */
+
+extern int
+simple_object_internal_write (int descriptor, off_t offset,
+			      const unsigned char *buffer, size_t size,
+			      const char **errmsg, int *err);
+
+/* Define ulong_type as an unsigned 64-bit type if available.
+   Otherwise just make it unsigned long.  */
+
+#ifdef UNSIGNED_64BIT_TYPE
+__extension__ typedef UNSIGNED_64BIT_TYPE ulong_type;
+#else
+typedef unsigned long ulong_type;
+#endif
+
+/* Fetch a big-endian 16-bit value.  */
+
+static inline unsigned short
+simple_object_fetch_big_16 (const unsigned char *buf)
+{
+  return ((unsigned short) buf[0] << 8) | (unsigned short) buf[1];
+}
+
+/* Fetch a little-endian 16-bit value.  */
+
+static inline unsigned short
+simple_object_fetch_little_16 (const unsigned char *buf)
+{
+  return ((unsigned short) buf[1] << 8) | (unsigned short) buf[0];
+}
+
+/* Fetch a big-endian 32-bit value.  */
+
+static inline unsigned int
+simple_object_fetch_big_32 (const unsigned char *buf)
+{
+  return (((unsigned int) buf[0] << 24)
+	  | ((unsigned int) buf[1] << 16)
+	  | ((unsigned int) buf[2] << 8)
+	  | (unsigned int) buf[3]);
+}
+
+/* Fetch a little-endian 32-bit value.  */
+
+static inline unsigned int
+simple_object_fetch_little_32 (const unsigned char *buf)
+{
+  return (((unsigned int) buf[3] << 24)
+	  | ((unsigned int) buf[2] << 16)
+	  | ((unsigned int) buf[1] << 8)
+	  | (unsigned int) buf[0]);
+}
+
+/* Fetch a big-endian 32-bit value as a ulong_type.  */
+
+static inline ulong_type
+simple_object_fetch_big_32_ulong (const unsigned char *buf)
+{
+  return (ulong_type) simple_object_fetch_big_32 (buf);
+}
+
+/* Fetch a little-endian 32-bit value as a ulong_type.  */
+
+static inline ulong_type
+simple_object_fetch_little_32_ulong (const unsigned char *buf)
+{
+  return (ulong_type) simple_object_fetch_little_32 (buf);
+}
+
+#ifdef UNSIGNED_64BIT_TYPE
+
+/* Fetch a big-endian 64-bit value.  */
+
+static inline ulong_type
+simple_object_fetch_big_64 (const unsigned char *buf)
+{
+  return (((ulong_type) buf[0] << 56)
+	  | ((ulong_type) buf[1] << 48)
+	  | ((ulong_type) buf[2] << 40)
+	  | ((ulong_type) buf[3] << 32)
+	  | ((ulong_type) buf[4] << 24)
+	  | ((ulong_type) buf[5] << 16)
+	  | ((ulong_type) buf[6] << 8)
+	  | (ulong_type) buf[7]);
+}
+
+/* Fetch a little-endian 64-bit value.  */
+
+static inline ulong_type
+simple_object_fetch_little_64 (const unsigned char *buf)
+{
+  return (((ulong_type) buf[7] << 56)
+	  | ((ulong_type) buf[6] << 48)
+	  | ((ulong_type) buf[5] << 40)
+	  | ((ulong_type) buf[4] << 32)
+	  | ((ulong_type) buf[3] << 24)
+	  | ((ulong_type) buf[2] << 16)
+	  | ((ulong_type) buf[1] << 8)
+	  | (ulong_type) buf[0]);
+}
+
+#endif
+
+/* Store a big-endian 16-bit value.  */
+
+static inline void
+simple_object_set_big_16 (unsigned char *buf, unsigned short val)
+{
+  buf[0] = (val >> 8) & 0xff;
+  buf[1] = val & 0xff;
+}
+
+/* Store a little-endian 16-bit value.  */
+
+static inline void
+simple_object_set_little_16 (unsigned char *buf, unsigned short val)
+{
+  buf[1] = (val >> 8) & 0xff;
+  buf[0] = val & 0xff;
+}
+
+/* Store a big-endian 32-bit value.  */
+
+static inline void
+simple_object_set_big_32 (unsigned char *buf, unsigned int val)
+{
+  buf[0] = (val >> 24) & 0xff;
+  buf[1] = (val >> 16) & 0xff;
+  buf[2] = (val >> 8) & 0xff;
+  buf[3] = val & 0xff;
+}
+
+/* Store a little-endian 32-bit value.  */
+
+static inline void
+simple_object_set_little_32 (unsigned char *buf, unsigned int val)
+{
+  buf[3] = (val >> 24) & 0xff;
+  buf[2] = (val >> 16) & 0xff;
+  buf[1] = (val >> 8) & 0xff;
+  buf[0] = val & 0xff;
+}
+
+/* Store a big-endian 32-bit value coming in as a ulong_type.  */
+
+static inline void
+simple_object_set_big_32_ulong (unsigned char *buf, ulong_type val)
+{
+  simple_object_set_big_32 (buf, val);
+}
+
+/* Store a little-endian 32-bit value coming in as a ulong_type.  */
+
+static inline void
+simple_object_set_little_32_ulong (unsigned char *buf, ulong_type val)
+{
+  simple_object_set_little_32 (buf, val);
+}
+
+#ifdef UNSIGNED_64BIT_TYPE
+
+/* Store a big-endian 64-bit value.  */
+
+static inline void
+simple_object_set_big_64 (unsigned char *buf, ulong_type val)
+{
+  buf[0] = (val >> 56) & 0xff;
+  buf[1] = (val >> 48) & 0xff;
+  buf[2] = (val >> 40) & 0xff;
+  buf[3] = (val >> 32) & 0xff;
+  buf[4] = (val >> 24) & 0xff;
+  buf[5] = (val >> 16) & 0xff;
+  buf[6] = (val >> 8) & 0xff;
+  buf[7] = val & 0xff;
+}
+
+/* Store a little-endian 64-bit value.  */
+
+static inline void
+simple_object_set_little_64 (unsigned char *buf, ulong_type val)
+{
+  buf[7] = (val >> 56) & 0xff;
+  buf[6] = (val >> 48) & 0xff;
+  buf[5] = (val >> 40) & 0xff;
+  buf[4] = (val >> 32) & 0xff;
+  buf[3] = (val >> 24) & 0xff;
+  buf[2] = (val >> 16) & 0xff;
+  buf[1] = (val >> 8) & 0xff;
+  buf[0] = val & 0xff;
+}
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/simple-object-elf.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/simple-object-elf.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/simple-object-elf.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/simple-object-elf.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,953 @@
+/* simple-object-elf.c -- routines to manipulate ELF object files.
+   Copyright 2010 Free Software Foundation, Inc.
+   Written by Ian Lance Taylor, Google.
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#include "config.h"
+#include "libiberty.h"
+#include "simple-object.h"
+
+#include <errno.h>
+#include <stddef.h>
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
+#include "simple-object-common.h"
+
+/* ELF structures and constants.  */
+
+/* 32-bit ELF file header.  */
+
+typedef struct {
+  unsigned char	e_ident[16];		/* ELF "magic number" */
+  unsigned char	e_type[2];		/* Identifies object file type */
+  unsigned char	e_machine[2];		/* Specifies required architecture */
+  unsigned char	e_version[4];		/* Identifies object file version */
+  unsigned char	e_entry[4];		/* Entry point virtual address */
+  unsigned char	e_phoff[4];		/* Program header table file offset */
+  unsigned char	e_shoff[4];		/* Section header table file offset */
+  unsigned char	e_flags[4];		/* Processor-specific flags */
+  unsigned char	e_ehsize[2];		/* ELF header size in bytes */
+  unsigned char	e_phentsize[2];		/* Program header table entry size */
+  unsigned char	e_phnum[2];		/* Program header table entry count */
+  unsigned char	e_shentsize[2];		/* Section header table entry size */
+  unsigned char	e_shnum[2];		/* Section header table entry count */
+  unsigned char	e_shstrndx[2];		/* Section header string table index */
+} Elf32_External_Ehdr;
+
+/* 64-bit ELF file header.  */
+
+typedef struct {
+  unsigned char	e_ident[16];		/* ELF "magic number" */
+  unsigned char	e_type[2];		/* Identifies object file type */
+  unsigned char	e_machine[2];		/* Specifies required architecture */
+  unsigned char	e_version[4];		/* Identifies object file version */
+  unsigned char	e_entry[8];		/* Entry point virtual address */
+  unsigned char	e_phoff[8];		/* Program header table file offset */
+  unsigned char	e_shoff[8];		/* Section header table file offset */
+  unsigned char	e_flags[4];		/* Processor-specific flags */
+  unsigned char	e_ehsize[2];		/* ELF header size in bytes */
+  unsigned char	e_phentsize[2];		/* Program header table entry size */
+  unsigned char	e_phnum[2];		/* Program header table entry count */
+  unsigned char	e_shentsize[2];		/* Section header table entry size */
+  unsigned char	e_shnum[2];		/* Section header table entry count */
+  unsigned char	e_shstrndx[2];		/* Section header string table index */
+} Elf64_External_Ehdr;
+
+/* Indexes and values in e_ident field of Ehdr.  */
+
+#define EI_MAG0		0	/* File identification byte 0 index */
+#define ELFMAG0		   0x7F	/* Magic number byte 0 */
+
+#define EI_MAG1		1	/* File identification byte 1 index */
+#define ELFMAG1		    'E'	/* Magic number byte 1 */
+
+#define EI_MAG2		2	/* File identification byte 2 index */
+#define ELFMAG2		    'L'	/* Magic number byte 2 */
+
+#define EI_MAG3		3	/* File identification byte 3 index */
+#define ELFMAG3		    'F'	/* Magic number byte 3 */
+
+#define EI_CLASS	4	/* File class */
+#define ELFCLASSNONE	      0	/* Invalid class */
+#define ELFCLASS32	      1	/* 32-bit objects */
+#define ELFCLASS64	      2	/* 64-bit objects */
+
+#define EI_DATA		5	/* Data encoding */
+#define ELFDATANONE	      0	/* Invalid data encoding */
+#define ELFDATA2LSB	      1	/* 2's complement, little endian */
+#define ELFDATA2MSB	      2	/* 2's complement, big endian */
+
+#define EI_VERSION	6	/* File version */
+#define EV_CURRENT	1		/* Current version */
+
+#define EI_OSABI	7	/* Operating System/ABI indication */
+
+/* Values for e_type field of Ehdr.  */
+
+#define ET_REL		1	/* Relocatable file */
+
+/* Values for e_machine field of Ehdr.  */
+
+#define EM_SPARC	  2	/* SUN SPARC */
+#define EM_SPARC32PLUS	 18	/* Sun's "v8plus" */
+
+/* Special section index values.  */
+
+#define SHN_LORESERVE	0xFF00		/* Begin range of reserved indices */
+#define SHN_XINDEX	0xFFFF		/* Section index is held elsewhere */
+
+/* 32-bit ELF program header.  */
+
+typedef struct {
+  unsigned char	p_type[4];		/* Identifies program segment type */
+  unsigned char	p_offset[4];		/* Segment file offset */
+  unsigned char	p_vaddr[4];		/* Segment virtual address */
+  unsigned char	p_paddr[4];		/* Segment physical address */
+  unsigned char	p_filesz[4];		/* Segment size in file */
+  unsigned char	p_memsz[4];		/* Segment size in memory */
+  unsigned char	p_flags[4];		/* Segment flags */
+  unsigned char	p_align[4];		/* Segment alignment, file & memory */
+} Elf32_External_Phdr;
+
+/* 64-bit ELF program header.  */
+
+typedef struct {
+  unsigned char	p_type[4];		/* Identifies program segment type */
+  unsigned char	p_flags[4];		/* Segment flags */
+  unsigned char	p_offset[8];		/* Segment file offset */
+  unsigned char	p_vaddr[8];		/* Segment virtual address */
+  unsigned char	p_paddr[8];		/* Segment physical address */
+  unsigned char	p_filesz[8];		/* Segment size in file */
+  unsigned char	p_memsz[8];		/* Segment size in memory */
+  unsigned char	p_align[8];		/* Segment alignment, file & memory */
+} Elf64_External_Phdr;
+
+/* 32-bit ELF section header */
+
+typedef struct {
+  unsigned char	sh_name[4];		/* Section name, index in string tbl */
+  unsigned char	sh_type[4];		/* Type of section */
+  unsigned char	sh_flags[4];		/* Miscellaneous section attributes */
+  unsigned char	sh_addr[4];		/* Section virtual addr at execution */
+  unsigned char	sh_offset[4];		/* Section file offset */
+  unsigned char	sh_size[4];		/* Size of section in bytes */
+  unsigned char	sh_link[4];		/* Index of another section */
+  unsigned char	sh_info[4];		/* Additional section information */
+  unsigned char	sh_addralign[4];	/* Section alignment */
+  unsigned char	sh_entsize[4];		/* Entry size if section holds table */
+} Elf32_External_Shdr;
+
+/* 64-bit ELF section header.  */
+
+typedef struct {
+  unsigned char	sh_name[4];		/* Section name, index in string tbl */
+  unsigned char	sh_type[4];		/* Type of section */
+  unsigned char	sh_flags[8];		/* Miscellaneous section attributes */
+  unsigned char	sh_addr[8];		/* Section virtual addr at execution */
+  unsigned char	sh_offset[8];		/* Section file offset */
+  unsigned char	sh_size[8];		/* Size of section in bytes */
+  unsigned char	sh_link[4];		/* Index of another section */
+  unsigned char	sh_info[4];		/* Additional section information */
+  unsigned char	sh_addralign[8];	/* Section alignment */
+  unsigned char	sh_entsize[8];		/* Entry size if section holds table */
+} Elf64_External_Shdr;
+
+/* Values for sh_type field.  */
+
+#define SHT_PROGBITS	1		/* Program data */
+#define SHT_STRTAB	3		/* A string table */
+
+/* Functions to fetch and store different ELF types, depending on the
+   endianness and size.  */
+
+struct elf_type_functions
+{
+  unsigned short (*fetch_Elf_Half) (const unsigned char *);
+  unsigned int (*fetch_Elf_Word) (const unsigned char *);
+  ulong_type (*fetch_Elf_Addr) (const unsigned char *);
+  void (*set_Elf_Half) (unsigned char *, unsigned short);
+  void (*set_Elf_Word) (unsigned char *, unsigned int);
+  void (*set_Elf_Addr) (unsigned char *, ulong_type);
+};
+
+static const struct elf_type_functions elf_big_32_functions =
+{
+  simple_object_fetch_big_16,
+  simple_object_fetch_big_32,
+  simple_object_fetch_big_32_ulong,
+  simple_object_set_big_16,
+  simple_object_set_big_32,
+  simple_object_set_big_32_ulong
+};
+
+static const struct elf_type_functions elf_little_32_functions =
+{
+  simple_object_fetch_little_16,
+  simple_object_fetch_little_32,
+  simple_object_fetch_little_32_ulong,
+  simple_object_set_little_16,
+  simple_object_set_little_32,
+  simple_object_set_little_32_ulong
+};
+
+#ifdef UNSIGNED_64BIT_TYPE
+
+static const struct elf_type_functions elf_big_64_functions =
+{
+  simple_object_fetch_big_16,
+  simple_object_fetch_big_32,
+  simple_object_fetch_big_64,
+  simple_object_set_big_16,
+  simple_object_set_big_32,
+  simple_object_set_big_64
+};
+
+static const struct elf_type_functions elf_little_64_functions =
+{
+  simple_object_fetch_little_16,
+  simple_object_fetch_little_32,
+  simple_object_fetch_little_64,
+  simple_object_set_little_16,
+  simple_object_set_little_32,
+  simple_object_set_little_64
+};
+
+#endif
+
+/* Hideous macro to fetch the value of a field from an external ELF
+   struct of some sort.  TYPEFUNCS is the set of type functions.
+   BUFFER points to the external data.  STRUCTTYPE is the appropriate
+   struct type.  FIELD is a field within the struct.  TYPE is the type
+   of the field in the struct: Elf_Half, Elf_Word, or Elf_Addr.  */
+
+#define ELF_FETCH_STRUCT_FIELD(TYPEFUNCS, STRUCTTYPE, FIELD, BUFFER, TYPE) \
+  ((TYPEFUNCS)->fetch_ ## TYPE ((BUFFER) + offsetof (STRUCTTYPE, FIELD)))
+
+/* Even more hideous macro to fetch the value of FIELD from BUFFER.
+   SIZE is 32 or 64.  STRUCTTYPE is the name of the struct from
+   elf/external.h: Ehdr, Shdr, etc.  FIELD is the name of a field in
+   the struct.  TYPE is the type of the field in the struct: Elf_Half,
+   Elf_Word, or Elf_Addr.  */
+
+#define ELF_FETCH_SIZED_FIELD(TYPEFUNCS, SIZE, STRUCTTYPE, BUFFER,	\
+			      FIELD, TYPE)				\
+  ELF_FETCH_STRUCT_FIELD (TYPEFUNCS,					\
+			  Elf ## SIZE ## _External_ ## STRUCTTYPE,	\
+			  FIELD, BUFFER, TYPE)
+
+/* Like ELF_FETCH_SIZED_FIELD but taking an ELFCLASS value.  */
+
+#define ELF_FETCH_FIELD(TYPEFUNCS, CLASS, STRUCTTYPE, BUFFER,		\
+			FIELD, TYPE)					\
+  ((CLASS) == ELFCLASS32						\
+    ? ELF_FETCH_SIZED_FIELD (TYPEFUNCS, 32, STRUCTTYPE, BUFFER, FIELD,	\
+			     TYPE)					\
+    : ELF_FETCH_SIZED_FIELD (TYPEFUNCS, 64, STRUCTTYPE, BUFFER, FIELD,	\
+			     TYPE))
+
+/* Hideous macro to set the value of a field in an external ELF
+   structure to VAL.  TYPEFUNCS is the set of type functions.  BUFFER
+   points to the external data.  STRUCTTYPE is the appropriate
+   structure type.  FIELD is a field within the struct.  TYPE is the
+   type of the field in the struct: Elf_Half, Elf_Word, or
+   Elf_Addr.  */
+
+#define ELF_SET_STRUCT_FIELD(TYPEFUNCS, STRUCTTYPE, FIELD, BUFFER, TYPE, VAL) \
+  (TYPEFUNCS)->set_ ## TYPE ((BUFFER) + offsetof (STRUCTTYPE, FIELD), (VAL))
+
+/* Even more hideous macro to set the value of FIELD in BUFFER to VAL.
+   SIZE is 32 or 64.  STRUCTTYPE is the name of the struct from
+   elf/external.h: Ehdr, Shdr, etc.  FIELD is the name of a field in
+   the struct.  TYPE is the type of the field in the struct: Elf_Half,
+   Elf_Word, or Elf_Addr.  */
+
+#define ELF_SET_SIZED_FIELD(TYPEFUNCS, SIZE, STRUCTTYPE, BUFFER, FIELD, \
+			    TYPE, VAL)					\
+  ELF_SET_STRUCT_FIELD (TYPEFUNCS,					\
+			Elf ## SIZE ## _External_ ## STRUCTTYPE,	\
+			FIELD, BUFFER, TYPE, VAL)
+
+/* Like ELF_SET_SIZED_FIELD but taking an ELFCLASS value.  */
+
+#define ELF_SET_FIELD(TYPEFUNCS, CLASS, STRUCTTYPE, BUFFER, FIELD,	\
+		      TYPE, VAL)					\
+  ((CLASS) == ELFCLASS32						\
+    ? ELF_SET_SIZED_FIELD (TYPEFUNCS, 32, STRUCTTYPE, BUFFER, FIELD,	\
+			   TYPE, VAL)					\
+    : ELF_SET_SIZED_FIELD (TYPEFUNCS, 64, STRUCTTYPE, BUFFER, FIELD,	\
+			   TYPE, VAL))
+
+/* Private data for an simple_object_read.  */
+
+struct simple_object_elf_read
+{
+  /* Type functions.  */
+  const struct elf_type_functions* type_functions;
+  /* Elf data.  */
+  unsigned char ei_data;
+  /* Elf class.  */
+  unsigned char ei_class;
+  /* ELF OS ABI.  */
+  unsigned char ei_osabi;
+  /* Elf machine number.  */
+  unsigned short machine;
+  /* Processor specific flags.  */
+  unsigned int flags;
+  /* File offset of section headers.  */
+  ulong_type shoff;
+  /* Number of sections.  */
+  unsigned int shnum;
+  /* Index of string table section header.  */
+  unsigned int shstrndx;
+};
+
+/* Private data for an simple_object_attributes.  */
+
+struct simple_object_elf_attributes
+{
+  /* Type functions.  */
+  const struct elf_type_functions* type_functions;
+  /* Elf data.  */
+  unsigned char ei_data;
+  /* Elf class.  */
+  unsigned char ei_class;
+  /* ELF OS ABI.  */
+  unsigned char ei_osabi;
+  /* Elf machine number.  */
+  unsigned short machine;
+  /* Processor specific flags.  */
+  unsigned int flags;
+};
+
+/* See if we have an ELF file.  */
+
+static void *
+simple_object_elf_match (unsigned char header[SIMPLE_OBJECT_MATCH_HEADER_LEN],
+			 int descriptor, off_t offset,
+			 const char *segment_name ATTRIBUTE_UNUSED,
+			 const char **errmsg, int *err)
+{
+  unsigned char ei_data;
+  unsigned char ei_class;
+  const struct elf_type_functions *type_functions;
+  unsigned char ehdr[sizeof (Elf64_External_Ehdr)];
+  struct simple_object_elf_read *eor;
+
+  if (header[EI_MAG0] != ELFMAG0
+      || header[EI_MAG1] != ELFMAG1
+      || header[EI_MAG2] != ELFMAG2
+      || header[EI_MAG3] != ELFMAG3
+      || header[EI_VERSION] != EV_CURRENT)
+    {
+      *errmsg = NULL;
+      *err = 0;
+      return NULL;
+    }
+
+  ei_data = header[EI_DATA];
+  if (ei_data != ELFDATA2LSB && ei_data != ELFDATA2MSB)
+    {
+      *errmsg = "unknown ELF endianness";
+      *err = 0;
+      return NULL;
+    }
+
+  ei_class = header[EI_CLASS];
+  switch (ei_class)
+    {
+    case ELFCLASS32:
+      type_functions = (ei_data == ELFDATA2LSB
+			? &elf_little_32_functions
+			: &elf_big_32_functions);
+      break;
+
+    case ELFCLASS64:
+#ifndef UNSIGNED_64BIT_TYPE
+      *errmsg = "64-bit ELF objects not supported";
+      *err = 0;
+      return NULL;
+#else
+      type_functions = (ei_data == ELFDATA2LSB
+			? &elf_little_64_functions
+			: &elf_big_64_functions);
+      break;
+#endif
+
+    default:
+      *errmsg = "unrecognized ELF size";
+      *err = 0;
+      return NULL;
+    }
+
+  if (!simple_object_internal_read (descriptor, offset, ehdr, sizeof ehdr,
+				    errmsg, err))
+    return NULL;
+
+  eor = XNEW (struct simple_object_elf_read);
+  eor->type_functions = type_functions;
+  eor->ei_data = ei_data;
+  eor->ei_class = ei_class;
+  eor->ei_osabi = header[EI_OSABI];
+  eor->machine = ELF_FETCH_FIELD (type_functions, ei_class, Ehdr, ehdr,
+				  e_machine, Elf_Half);
+  eor->flags = ELF_FETCH_FIELD (type_functions, ei_class, Ehdr, ehdr,
+				e_flags, Elf_Word);
+  eor->shoff = ELF_FETCH_FIELD (type_functions, ei_class, Ehdr, ehdr,
+				e_shoff, Elf_Addr);
+  eor->shnum = ELF_FETCH_FIELD (type_functions, ei_class, Ehdr, ehdr,
+				e_shnum, Elf_Half);
+  eor->shstrndx = ELF_FETCH_FIELD (type_functions, ei_class, Ehdr, ehdr,
+				   e_shstrndx, Elf_Half);
+
+  if ((eor->shnum == 0 || eor->shstrndx == SHN_XINDEX)
+      && eor->shoff != 0)
+    {
+      unsigned char shdr[sizeof (Elf64_External_Shdr)];
+
+      /* Object file has more than 0xffff sections.  */
+
+      if (!simple_object_internal_read (descriptor, offset + eor->shoff, shdr,
+					(ei_class == ELFCLASS32
+					 ? sizeof (Elf32_External_Shdr)
+					 : sizeof (Elf64_External_Shdr)),
+					errmsg, err))
+	{
+	  XDELETE (eor);
+	  return NULL;
+	}
+
+      if (eor->shnum == 0)
+	eor->shnum = ELF_FETCH_FIELD (type_functions, ei_class, Shdr,
+				      shdr, sh_size, Elf_Addr);
+
+      if (eor->shstrndx == SHN_XINDEX)
+	{
+	  eor->shstrndx = ELF_FETCH_FIELD (type_functions, ei_class, Shdr,
+					   shdr, sh_link, Elf_Word);
+
+	  /* Versions of the GNU binutils between 2.12 and 2.18 did
+	     not handle objects with more than SHN_LORESERVE sections
+	     correctly.  All large section indexes were offset by
+	     0x100.  There is more information at
+	     http://sourceware.org/bugzilla/show_bug.cgi?id-5900 .
+	     Fortunately these object files are easy to detect, as the
+	     GNU binutils always put the section header string table
+	     near the end of the list of sections.  Thus if the
+	     section header string table index is larger than the
+	     number of sections, then we know we have to subtract
+	     0x100 to get the real section index.  */
+	  if (eor->shstrndx >= eor->shnum
+	      && eor->shstrndx >= SHN_LORESERVE + 0x100)
+	    eor->shstrndx -= 0x100;
+	}
+    }
+
+  if (eor->shstrndx >= eor->shnum)
+    {
+      *errmsg = "invalid ELF shstrndx >= shnum";
+      *err = 0;
+      XDELETE (eor);
+      return NULL;
+    }
+
+  return (void *) eor;
+}
+
+/* Find all sections in an ELF file.  */
+
+static const char *
+simple_object_elf_find_sections (simple_object_read *sobj,
+				 int (*pfn) (void *, const char *,
+					     off_t offset, off_t length),
+				 void *data,
+				 int *err)
+{
+  struct simple_object_elf_read *eor =
+    (struct simple_object_elf_read *) sobj->data;
+  const struct elf_type_functions *type_functions = eor->type_functions;
+  unsigned char ei_class = eor->ei_class;
+  size_t shdr_size;
+  unsigned int shnum;
+  unsigned char *shdrs;
+  const char *errmsg;
+  unsigned char *shstrhdr;
+  size_t name_size;
+  off_t shstroff;
+  unsigned char *names;
+  unsigned int i;
+
+  shdr_size = (ei_class == ELFCLASS32
+	       ? sizeof (Elf32_External_Shdr)
+	       : sizeof (Elf64_External_Shdr));
+
+  /* Read the section headers.  We skip section 0, which is not a
+     useful section.  */
+
+  shnum = eor->shnum;
+  shdrs = XNEWVEC (unsigned char, shdr_size * (shnum - 1));
+
+  if (!simple_object_internal_read (sobj->descriptor,
+				    sobj->offset + eor->shoff + shdr_size,
+				    shdrs,
+				    shdr_size * (shnum - 1),
+				    &errmsg, err))
+    {
+      XDELETEVEC (shdrs);
+      return errmsg;
+    }
+
+  /* Read the section names.  */
+
+  shstrhdr = shdrs + (eor->shstrndx - 1) * shdr_size;
+  name_size = ELF_FETCH_FIELD (type_functions, ei_class, Shdr,
+			       shstrhdr, sh_size, Elf_Addr);
+  shstroff = ELF_FETCH_FIELD (type_functions, ei_class, Shdr,
+			      shstrhdr, sh_offset, Elf_Addr);
+  names = XNEWVEC (unsigned char, name_size);
+  if (!simple_object_internal_read (sobj->descriptor,
+				    sobj->offset + shstroff,
+				    names, name_size, &errmsg, err))
+    {
+      XDELETEVEC (names);
+      XDELETEVEC (shdrs);
+      return errmsg;
+    }
+
+  for (i = 1; i < shnum; ++i)
+    {
+      unsigned char *shdr;
+      unsigned int sh_name;
+      const char *name;
+      off_t offset;
+      off_t length;
+
+      shdr = shdrs + (i - 1) * shdr_size;
+      sh_name = ELF_FETCH_FIELD (type_functions, ei_class, Shdr,
+				 shdr, sh_name, Elf_Word);
+      if (sh_name >= name_size)
+	{
+	  *err = 0;
+	  XDELETEVEC (names);
+	  XDELETEVEC (shdrs);
+	  return "ELF section name out of range";
+	}
+
+      name = (const char *) names + sh_name;
+      offset = ELF_FETCH_FIELD (type_functions, ei_class, Shdr,
+				shdr, sh_offset, Elf_Addr);
+      length = ELF_FETCH_FIELD (type_functions, ei_class, Shdr,
+				shdr, sh_size, Elf_Addr);
+
+      if (!(*pfn) (data, name, offset, length))
+	break;
+    }
+
+  XDELETEVEC (names);
+  XDELETEVEC (shdrs);
+
+  return NULL;
+}
+
+/* Fetch the attributes for an simple_object_read.  */
+
+static void *
+simple_object_elf_fetch_attributes (simple_object_read *sobj,
+				    const char **errmsg ATTRIBUTE_UNUSED,
+				    int *err ATTRIBUTE_UNUSED)
+{
+  struct simple_object_elf_read *eor =
+    (struct simple_object_elf_read *) sobj->data;
+  struct simple_object_elf_attributes *ret;
+
+  ret = XNEW (struct simple_object_elf_attributes);
+  ret->type_functions = eor->type_functions;
+  ret->ei_data = eor->ei_data;
+  ret->ei_class = eor->ei_class;
+  ret->ei_osabi = eor->ei_osabi;
+  ret->machine = eor->machine;
+  ret->flags = eor->flags;
+  return ret;
+}
+
+/* Release the privata data for an simple_object_read.  */
+
+static void
+simple_object_elf_release_read (void *data)
+{
+  XDELETE (data);
+}
+
+/* Compare two attributes structures.  */
+
+static const char *
+simple_object_elf_attributes_merge (void *todata, void *fromdata, int *err)
+{
+  struct simple_object_elf_attributes *to =
+    (struct simple_object_elf_attributes *) todata;
+  struct simple_object_elf_attributes *from =
+    (struct simple_object_elf_attributes *) fromdata;
+
+  if (to->ei_data != from->ei_data || to->ei_class != from->ei_class)
+    {
+      *err = 0;
+      return "ELF object format mismatch";
+    }
+
+  if (to->machine != from->machine)
+    {
+      int ok;
+
+      /* EM_SPARC and EM_SPARC32PLUS are compatible and force an
+	 output of EM_SPARC32PLUS.  */
+      ok = 0;
+      switch (to->machine)
+	{
+	case EM_SPARC:
+	  if (from->machine == EM_SPARC32PLUS)
+	    {
+	      to->machine = from->machine;
+	      ok = 1;
+	    }
+	  break;
+
+	case EM_SPARC32PLUS:
+	  if (from->machine == EM_SPARC)
+	    ok = 1;
+	  break;
+
+	default:
+	  break;
+	}
+
+      if (!ok)
+	{
+	  *err = 0;
+	  return "ELF machine number mismatch";
+	}
+    }
+
+  return NULL;
+}
+
+/* Release the private data for an attributes structure.  */
+
+static void
+simple_object_elf_release_attributes (void *data)
+{
+  XDELETE (data);
+}
+
+/* Prepare to write out a file.  */
+
+static void *
+simple_object_elf_start_write (void *attributes_data,
+			       const char **errmsg ATTRIBUTE_UNUSED,
+			       int *err ATTRIBUTE_UNUSED)
+{
+  struct simple_object_elf_attributes *attrs =
+    (struct simple_object_elf_attributes *) attributes_data;
+  struct simple_object_elf_attributes *ret;
+
+  /* We're just going to record the attributes, but we need to make a
+     copy because the user may delete them.  */
+  ret = XNEW (struct simple_object_elf_attributes);
+  *ret = *attrs;
+  return ret;
+}
+
+/* Write out an ELF ehdr.  */
+
+static int
+simple_object_elf_write_ehdr (simple_object_write *sobj, int descriptor,
+			      const char **errmsg, int *err)
+{
+  struct simple_object_elf_attributes *attrs =
+    (struct simple_object_elf_attributes *) sobj->data;
+  const struct elf_type_functions* fns;
+  unsigned char cl;
+  size_t ehdr_size;
+  unsigned char buf[sizeof (Elf64_External_Ehdr)];
+  simple_object_write_section *section;
+  unsigned int shnum;
+
+  fns = attrs->type_functions;
+  cl = attrs->ei_class;
+
+  shnum = 0;
+  for (section = sobj->sections; section != NULL; section = section->next)
+    ++shnum;
+  if (shnum > 0)
+    {
+      /* Add a section header for the dummy section and one for
+	 .shstrtab.  */
+      shnum += 2;
+    }
+
+  ehdr_size = (cl == ELFCLASS32
+	       ? sizeof (Elf32_External_Ehdr)
+	       : sizeof (Elf64_External_Ehdr));
+  memset (buf, 0, sizeof (Elf64_External_Ehdr));
+
+  buf[EI_MAG0] = ELFMAG0;
+  buf[EI_MAG1] = ELFMAG1;
+  buf[EI_MAG2] = ELFMAG2;
+  buf[EI_MAG3] = ELFMAG3;
+  buf[EI_CLASS] = cl;
+  buf[EI_DATA] = attrs->ei_data;
+  buf[EI_VERSION] = EV_CURRENT;
+  buf[EI_OSABI] = attrs->ei_osabi;
+
+  ELF_SET_FIELD (fns, cl, Ehdr, buf, e_type, Elf_Half, ET_REL);
+  ELF_SET_FIELD (fns, cl, Ehdr, buf, e_machine, Elf_Half, attrs->machine);
+  ELF_SET_FIELD (fns, cl, Ehdr, buf, e_version, Elf_Word, EV_CURRENT);
+  /* e_entry left as zero.  */
+  /* e_phoff left as zero.  */
+  ELF_SET_FIELD (fns, cl, Ehdr, buf, e_shoff, Elf_Addr, ehdr_size);
+  ELF_SET_FIELD (fns, cl, Ehdr, buf, e_flags, Elf_Word, attrs->flags);
+  ELF_SET_FIELD (fns, cl, Ehdr, buf, e_ehsize, Elf_Half, ehdr_size);
+  ELF_SET_FIELD (fns, cl, Ehdr, buf, e_phentsize, Elf_Half,
+		 (cl == ELFCLASS32
+		  ? sizeof (Elf32_External_Phdr)
+		  : sizeof (Elf64_External_Phdr)));
+  /* e_phnum left as zero.  */
+  ELF_SET_FIELD (fns, cl, Ehdr, buf, e_shentsize, Elf_Half,
+		 (cl == ELFCLASS32
+		  ? sizeof (Elf32_External_Shdr)
+		  : sizeof (Elf64_External_Shdr)));
+  ELF_SET_FIELD (fns, cl, Ehdr, buf, e_shnum, Elf_Half, shnum);
+  ELF_SET_FIELD (fns, cl, Ehdr, buf, e_shstrndx, Elf_Half,
+		 shnum == 0 ? 0 : shnum - 1);
+
+  return simple_object_internal_write (descriptor, 0, buf, ehdr_size,
+				       errmsg, err);
+}
+
+/* Write out an ELF shdr.  */
+
+static int
+simple_object_elf_write_shdr (simple_object_write *sobj, int descriptor,
+			      off_t offset, unsigned int sh_name,
+			      unsigned int sh_type, unsigned int sh_flags,
+			      unsigned int sh_offset, unsigned int sh_size,
+			      unsigned int sh_addralign, const char **errmsg,
+			      int *err)
+{
+  struct simple_object_elf_attributes *attrs =
+    (struct simple_object_elf_attributes *) sobj->data;
+  const struct elf_type_functions* fns;
+  unsigned char cl;
+  size_t shdr_size;
+  unsigned char buf[sizeof (Elf64_External_Shdr)];
+
+  fns = attrs->type_functions;
+  cl = attrs->ei_class;
+
+  shdr_size = (cl == ELFCLASS32
+	       ? sizeof (Elf32_External_Shdr)
+	       : sizeof (Elf64_External_Shdr));
+  memset (buf, 0, sizeof (Elf64_External_Shdr));
+
+  ELF_SET_FIELD (fns, cl, Shdr, buf, sh_name, Elf_Word, sh_name);
+  ELF_SET_FIELD (fns, cl, Shdr, buf, sh_type, Elf_Word, sh_type);
+  ELF_SET_FIELD (fns, cl, Shdr, buf, sh_flags, Elf_Addr, sh_flags);
+  ELF_SET_FIELD (fns, cl, Shdr, buf, sh_offset, Elf_Addr, sh_offset);
+  ELF_SET_FIELD (fns, cl, Shdr, buf, sh_size, Elf_Addr, sh_size);
+  /* sh_link left as zero.  */
+  /* sh_info left as zero.  */
+  ELF_SET_FIELD (fns, cl, Shdr, buf, sh_addralign, Elf_Addr, sh_addralign);
+  /* sh_entsize left as zero.  */
+
+  return simple_object_internal_write (descriptor, offset, buf, shdr_size,
+				       errmsg, err);
+}
+
+/* Write out a complete ELF file.
+   Ehdr
+   initial dummy Shdr
+   user-created Shdrs
+   .shstrtab Shdr
+   user-created section data
+   .shstrtab data  */
+
+static const char *
+simple_object_elf_write_to_file (simple_object_write *sobj, int descriptor,
+				 int *err)
+{
+  struct simple_object_elf_attributes *attrs =
+    (struct simple_object_elf_attributes *) sobj->data;
+  unsigned char cl;
+  size_t ehdr_size;
+  size_t shdr_size;
+  const char *errmsg;
+  simple_object_write_section *section;
+  unsigned int shnum;
+  size_t shdr_offset;
+  size_t sh_offset;
+  size_t sh_name;
+  unsigned char zero;
+
+  if (!simple_object_elf_write_ehdr (sobj, descriptor, &errmsg, err))
+    return errmsg;
+
+  cl = attrs->ei_class;
+  if (cl == ELFCLASS32)
+    {
+      ehdr_size = sizeof (Elf32_External_Ehdr);
+      shdr_size = sizeof (Elf32_External_Shdr);
+    }
+  else
+    {
+      ehdr_size = sizeof (Elf64_External_Ehdr);
+      shdr_size = sizeof (Elf64_External_Shdr);
+    }
+
+  shnum = 0;
+  for (section = sobj->sections; section != NULL; section = section->next)
+    ++shnum;
+  if (shnum == 0)
+    return NULL;
+
+  /* Add initial dummy Shdr and .shstrtab.  */
+  shnum += 2;
+
+  shdr_offset = ehdr_size;
+  sh_offset = shdr_offset + shnum * shdr_size;
+
+  if (!simple_object_elf_write_shdr (sobj, descriptor, shdr_offset,
+				     0, 0, 0, 0, 0, 0, &errmsg, err))
+    return errmsg;
+
+  shdr_offset += shdr_size;
+
+  sh_name = 1;
+  for (section = sobj->sections; section != NULL; section = section->next)
+    {
+      size_t mask;
+      size_t new_sh_offset;
+      size_t sh_size;
+      struct simple_object_write_section_buffer *buffer;
+
+      mask = (1U << section->align) - 1;
+      new_sh_offset = sh_offset + mask;
+      new_sh_offset &= ~ mask;
+      while (new_sh_offset > sh_offset)
+	{
+	  unsigned char zeroes[16];
+	  size_t write;
+
+	  memset (zeroes, 0, sizeof zeroes);
+	  write = new_sh_offset - sh_offset;
+	  if (write > sizeof zeroes)
+	    write = sizeof zeroes;
+	  if (!simple_object_internal_write (descriptor, sh_offset, zeroes,
+					     write, &errmsg, err))
+	    return errmsg;
+	  sh_offset += write;
+	}
+
+      sh_size = 0;
+      for (buffer = section->buffers; buffer != NULL; buffer = buffer->next)
+	{
+	  if (!simple_object_internal_write (descriptor, sh_offset + sh_size,
+					     ((const unsigned char *)
+					      buffer->buffer),
+					     buffer->size, &errmsg, err))
+	    return errmsg;
+	  sh_size += buffer->size;
+	}
+
+      if (!simple_object_elf_write_shdr (sobj, descriptor, shdr_offset,
+					 sh_name, SHT_PROGBITS, 0, sh_offset,
+					 sh_size, 1U << section->align,
+					 &errmsg, err))
+	return errmsg;
+
+      shdr_offset += shdr_size;
+      sh_name += strlen (section->name) + 1;
+      sh_offset += sh_size;
+    }
+
+  if (!simple_object_elf_write_shdr (sobj, descriptor, shdr_offset,
+				     sh_name, SHT_STRTAB, 0, sh_offset,
+				     sh_name + strlen (".shstrtab") + 1,
+				     1, &errmsg, err))
+    return errmsg;
+
+  /* .shstrtab has a leading zero byte.  */
+  zero = 0;
+  if (!simple_object_internal_write (descriptor, sh_offset, &zero, 1,
+				     &errmsg, err))
+    return errmsg;
+  ++sh_offset;
+
+  for (section = sobj->sections; section != NULL; section = section->next)
+    {
+      size_t len;
+
+      len = strlen (section->name) + 1;
+      if (!simple_object_internal_write (descriptor, sh_offset,
+					 (const unsigned char *) section->name,
+					 len, &errmsg, err))
+	return errmsg;
+      sh_offset += len;
+    }
+
+  if (!simple_object_internal_write (descriptor, sh_offset,
+				     (const unsigned char *) ".shstrtab",
+				     strlen (".shstrtab") + 1, &errmsg, err))
+    return errmsg;
+
+  return NULL;
+}
+
+/* Release the private data for an simple_object_write structure.  */
+
+static void
+simple_object_elf_release_write (void *data)
+{
+  XDELETE (data);
+}
+
+/* The ELF functions.  */
+
+const struct simple_object_functions simple_object_elf_functions =
+{
+  simple_object_elf_match,
+  simple_object_elf_find_sections,
+  simple_object_elf_fetch_attributes,
+  simple_object_elf_release_read,
+  simple_object_elf_attributes_merge,
+  simple_object_elf_release_attributes,
+  simple_object_elf_start_write,
+  simple_object_elf_write_to_file,
+  simple_object_elf_release_write
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/simple-object-mach-o.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/simple-object-mach-o.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/simple-object-mach-o.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/simple-object-mach-o.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,1022 @@
+/* simple-object-mach-o.c -- routines to manipulate Mach-O object files.
+   Copyright 2010 Free Software Foundation, Inc.
+   Written by Ian Lance Taylor, Google.
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#include "config.h"
+#include "libiberty.h"
+#include "simple-object.h"
+
+#include <stddef.h>
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
+#include "simple-object-common.h"
+
+/* Mach-O structures and constants.  */
+
+/* Mach-O header (32-bit version).  */
+
+struct mach_o_header_32
+{
+  unsigned char magic[4];	/* Magic number.  */
+  unsigned char cputype[4];	/* CPU that this object is for.  */
+  unsigned char cpusubtype[4];	/* CPU subtype.  */
+  unsigned char filetype[4];	/* Type of file.  */
+  unsigned char ncmds[4];	/* Number of load commands.  */
+  unsigned char sizeofcmds[4];	/* Total size of load commands.  */
+  unsigned char flags[4];	/* Flags for special featues.  */
+};
+
+/* Mach-O header (64-bit version).  */
+
+struct mach_o_header_64
+{
+  unsigned char magic[4];	/* Magic number.  */
+  unsigned char cputype[4];	/* CPU that this object is for.  */
+  unsigned char cpusubtype[4];	/* CPU subtype.  */
+  unsigned char filetype[4];	/* Type of file.  */
+  unsigned char ncmds[4];	/* Number of load commands.  */
+  unsigned char sizeofcmds[4];	/* Total size of load commands.  */
+  unsigned char flags[4];	/* Flags for special featues.  */
+  unsigned char reserved[4];	/* Reserved.  Duh.  */
+};
+
+/* For magic field in header.  */
+
+#define MACH_O_MH_MAGIC			0xfeedface
+#define MACH_O_MH_MAGIC_64		0xfeedfacf
+
+/* For filetype field in header.  */
+
+#define MACH_O_MH_OBJECT		0x01
+
+/* A Mach-O file is a list of load commands.  This is the header of a
+   load command.  */
+
+struct mach_o_load_command
+{
+  unsigned char cmd[4];		/* The type of load command.  */
+  unsigned char cmdsize[4];	/* Size in bytes of entire command.  */
+};
+
+/* For cmd field in load command.   */
+
+#define MACH_O_LC_SEGMENT		0x01
+#define MACH_O_LC_SEGMENT_64		0x19
+
+/* LC_SEGMENT load command.  */
+
+struct mach_o_segment_command_32
+{
+  unsigned char cmd[4];		/* The type of load command (LC_SEGMENT).  */
+  unsigned char cmdsize[4];	/* Size in bytes of entire command.  */
+  unsigned char segname[16];	/* Name of this segment.  */
+  unsigned char vmaddr[4];	/* Virtual memory address of this segment.  */
+  unsigned char vmsize[4];	/* Size there, in bytes.  */
+  unsigned char fileoff[4];	/* Offset in bytes of the data to be mapped.  */
+  unsigned char filesize[4];	/* Size in bytes on disk.  */
+  unsigned char maxprot[4];	/* Maximum permitted vmem protection.  */
+  unsigned char initprot[4];	/* Initial vmem protection.  */
+  unsigned char nsects[4];	/* Number of sections in this segment.  */
+  unsigned char flags[4];	/* Flags that affect the loading.  */
+};
+
+/* LC_SEGMENT_64 load command.  */
+
+struct mach_o_segment_command_64
+{
+  unsigned char cmd[4];		/* The type of load command (LC_SEGMENT_64).  */
+  unsigned char cmdsize[4];	/* Size in bytes of entire command.  */
+  unsigned char segname[16];	/* Name of this segment.  */
+  unsigned char vmaddr[8];	/* Virtual memory address of this segment.  */
+  unsigned char vmsize[8];	/* Size there, in bytes.  */
+  unsigned char fileoff[8];	/* Offset in bytes of the data to be mapped.  */
+  unsigned char filesize[8];	/* Size in bytes on disk.  */
+  unsigned char maxprot[4];	/* Maximum permitted vmem protection.  */
+  unsigned char initprot[4];	/* Initial vmem protection.  */
+  unsigned char nsects[4];	/* Number of sections in this segment.  */
+  unsigned char flags[4];	/* Flags that affect the loading.  */
+};
+
+/* 32-bit section header.  */
+
+struct mach_o_section_32
+{
+  unsigned char sectname[16];	/* Section name.  */
+  unsigned char segname[16];	/* Segment that the section belongs to.  */
+  unsigned char addr[4];	/* Address of this section in memory.  */
+  unsigned char size[4];	/* Size in bytes of this section.  */
+  unsigned char offset[4];	/* File offset of this section.  */
+  unsigned char align[4];	/* log2 of this section's alignment.  */
+  unsigned char reloff[4];	/* File offset of this section's relocs.  */
+  unsigned char nreloc[4];	/* Number of relocs for this section.  */
+  unsigned char flags[4];	/* Section flags/attributes.  */
+  unsigned char reserved1[4];
+  unsigned char reserved2[4];
+};
+
+/* 64-bit section header.  */
+
+struct mach_o_section_64
+{
+  unsigned char sectname[16];	/* Section name.  */
+  unsigned char segname[16];	/* Segment that the section belongs to.  */
+  unsigned char addr[8];	/* Address of this section in memory.  */
+  unsigned char size[8];	/* Size in bytes of this section.  */
+  unsigned char offset[4];	/* File offset of this section.  */
+  unsigned char align[4];	/* log2 of this section's alignment.  */
+  unsigned char reloff[4];	/* File offset of this section's relocs.  */
+  unsigned char nreloc[4];	/* Number of relocs for this section.  */
+  unsigned char flags[4];	/* Section flags/attributes.  */
+  unsigned char reserved1[4];
+  unsigned char reserved2[4];
+  unsigned char reserved3[4];
+};
+
+/* Flags for Mach-O sections.  */
+
+#define MACH_O_S_ATTR_DEBUG			0x02000000
+
+/* The length of a segment or section name.  */
+
+#define MACH_O_NAME_LEN (16)
+
+/* A GNU specific extension for long section names.  */
+
+#define GNU_SECTION_NAMES "__section_names"
+
+/* Private data for an simple_object_read.  */
+
+struct simple_object_mach_o_read
+{
+  /* User specified segment name.  */
+  char *segment_name;
+  /* Magic number.  */
+  unsigned int magic;
+  /* Whether this file is big-endian.  */
+  int is_big_endian;
+  /* CPU type from header.  */
+  unsigned int cputype;
+  /* CPU subtype from header.  */
+  unsigned int cpusubtype;
+  /* Number of commands, from header.  */
+  unsigned int ncmds;
+  /* Flags from header.  */
+  unsigned int flags;
+  /* Reserved field from header, only used on 64-bit.  */
+  unsigned int reserved;
+};
+
+/* Private data for an simple_object_attributes.  */
+
+struct simple_object_mach_o_attributes
+{
+  /* Magic number.  */
+  unsigned int magic;
+  /* Whether this file is big-endian.  */
+  int is_big_endian;
+  /* CPU type from header.  */
+  unsigned int cputype;
+  /* CPU subtype from header.  */
+  unsigned int cpusubtype;
+  /* Flags from header.  */
+  unsigned int flags;
+  /* Reserved field from header, only used on 64-bit.  */
+  unsigned int reserved;
+};
+
+/* See if we have a Mach-O file.  */
+
+static void *
+simple_object_mach_o_match (
+    unsigned char header[SIMPLE_OBJECT_MATCH_HEADER_LEN],
+    int descriptor,
+    off_t offset,
+    const char *segment_name,
+    const char **errmsg,
+    int *err)
+{
+  unsigned int magic;
+  int is_big_endian;
+  unsigned int (*fetch_32) (const unsigned char *);
+  unsigned int filetype;
+  struct simple_object_mach_o_read *omr;
+  unsigned char buf[sizeof (struct mach_o_header_64)];
+  unsigned char *b;
+
+  magic = simple_object_fetch_big_32 (header);
+  if (magic == MACH_O_MH_MAGIC || magic == MACH_O_MH_MAGIC_64)
+    is_big_endian = 1;
+  else
+    {
+      magic = simple_object_fetch_little_32 (header);
+      if (magic == MACH_O_MH_MAGIC || magic == MACH_O_MH_MAGIC_64)
+	is_big_endian = 0;
+      else
+	{
+	  *errmsg = NULL;
+	  *err = 0;
+	  return NULL;
+	}
+    }
+
+#ifndef UNSIGNED_64BIT_TYPE
+  if (magic == MACH_O_MH_MAGIC_64)
+    {
+      *errmsg = "64-bit Mach-O objects not supported";
+      *err = 0;
+      return NULL;
+    }
+#endif
+
+  /* We require the user to provide a segment name.  This is
+     unfortunate but I don't see any good choices here.  */
+
+  if (segment_name == NULL)
+    {
+      *errmsg = "Mach-O file found but no segment name specified";
+      *err = 0;
+      return NULL;
+    }
+
+  if (strlen (segment_name) > MACH_O_NAME_LEN)
+    {
+      *errmsg = "Mach-O segment name too long";
+      *err = 0;
+      return NULL;
+    }
+
+  /* The 32-bit and 64-bit headers are similar enough that we can use
+     the same code.  */
+
+  fetch_32 = (is_big_endian
+	      ? simple_object_fetch_big_32
+	      : simple_object_fetch_little_32);
+
+  if (!simple_object_internal_read (descriptor, offset, buf,
+				    (magic == MACH_O_MH_MAGIC
+				     ? sizeof (struct mach_o_header_32)
+				     : sizeof (struct mach_o_header_64)),
+				    errmsg, err))
+    return NULL;
+
+  b = &buf[0];
+
+  filetype = (*fetch_32) (b + offsetof (struct mach_o_header_32, filetype));
+  if (filetype != MACH_O_MH_OBJECT)
+    {
+      *errmsg = "Mach-O file is not object file";
+      *err = 0;
+      return NULL;
+    }
+
+  omr = XNEW (struct simple_object_mach_o_read);
+  omr->segment_name = xstrdup (segment_name);
+  omr->magic = magic;
+  omr->is_big_endian = is_big_endian;
+  omr->cputype = (*fetch_32) (b + offsetof (struct mach_o_header_32, cputype));
+  omr->cpusubtype = (*fetch_32) (b
+				 + offsetof (struct mach_o_header_32,
+					     cpusubtype));
+  omr->ncmds = (*fetch_32) (b + offsetof (struct mach_o_header_32, ncmds));
+  omr->flags = (*fetch_32) (b + offsetof (struct mach_o_header_32, flags));
+  if (magic == MACH_O_MH_MAGIC)
+    omr->reserved = 0;
+  else
+    omr->reserved = (*fetch_32) (b
+				 + offsetof (struct mach_o_header_64,
+					     reserved));
+
+  return (void *) omr;
+}
+
+/* Get the file offset and size from a section header.  */
+
+static void
+simple_object_mach_o_section_info (int is_big_endian, int is_32,
+				   const unsigned char *sechdr, off_t *offset,
+				   size_t *size)
+{
+  unsigned int (*fetch_32) (const unsigned char *);
+  ulong_type (*fetch_64) (const unsigned char *);
+
+  fetch_32 = (is_big_endian
+	      ? simple_object_fetch_big_32
+	      : simple_object_fetch_little_32);
+
+  fetch_64 = NULL;
+#ifdef UNSIGNED_64BIT_TYPE
+  fetch_64 = (is_big_endian
+	      ? simple_object_fetch_big_64
+	      : simple_object_fetch_little_64);
+#endif
+
+  if (is_32)
+    {
+      *offset = fetch_32 (sechdr
+			  + offsetof (struct mach_o_section_32, offset));
+      *size = fetch_32 (sechdr
+			+ offsetof (struct mach_o_section_32, size));
+    }
+  else
+    {
+      *offset = fetch_32 (sechdr
+			  + offsetof (struct mach_o_section_64, offset));
+      *size = fetch_64 (sechdr
+			+ offsetof (struct mach_o_section_64, size));
+    }
+}
+
+/* Handle a segment in a Mach-O file.  Return 1 if we should continue,
+   0 if the caller should return.  */
+
+static int
+simple_object_mach_o_segment (simple_object_read *sobj, off_t offset,
+			      const unsigned char *segbuf,
+			      int (*pfn) (void *, const char *, off_t offset,
+					  off_t length),
+			      void *data,
+			      const char **errmsg, int *err)
+{
+  struct simple_object_mach_o_read *omr =
+    (struct simple_object_mach_o_read *) sobj->data;
+  unsigned int (*fetch_32) (const unsigned char *);
+  int is_32;
+  size_t seghdrsize;
+  size_t sechdrsize;
+  size_t segname_offset;
+  size_t sectname_offset;
+  unsigned int nsects;
+  unsigned char *secdata;
+  unsigned int i;
+  unsigned int strtab_index;
+  char *strtab;
+  size_t strtab_size;
+
+  fetch_32 = (omr->is_big_endian
+	      ? simple_object_fetch_big_32
+	      : simple_object_fetch_little_32);
+
+  is_32 = omr->magic == MACH_O_MH_MAGIC;
+
+  if (is_32)
+    {
+      seghdrsize = sizeof (struct mach_o_segment_command_32);
+      sechdrsize = sizeof (struct mach_o_section_32);
+      segname_offset = offsetof (struct mach_o_section_32, segname);
+      sectname_offset = offsetof (struct mach_o_section_32, sectname);
+      nsects = (*fetch_32) (segbuf
+			    + offsetof (struct mach_o_segment_command_32,
+					nsects));
+    }
+  else
+    {
+      seghdrsize = sizeof (struct mach_o_segment_command_64);
+      sechdrsize = sizeof (struct mach_o_section_64);
+      segname_offset = offsetof (struct mach_o_section_64, segname);
+      sectname_offset = offsetof (struct mach_o_section_64, sectname);
+      nsects = (*fetch_32) (segbuf
+			    + offsetof (struct mach_o_segment_command_64,
+					nsects));
+    }
+
+  secdata = XNEWVEC (unsigned char, nsects * sechdrsize);
+  if (!simple_object_internal_read (sobj->descriptor, offset + seghdrsize,
+				    secdata, nsects * sechdrsize, errmsg, err))
+    {
+      XDELETEVEC (secdata);
+      return 0;
+    }
+
+  /* Scan for a __section_names section.  This is in effect a GNU
+     extension that permits section names longer than 16 chars.  */
+
+  for (i = 0; i < nsects; ++i)
+    {
+      size_t nameoff;
+
+      nameoff = i * sechdrsize + segname_offset;
+      if (strcmp ((char *) secdata + nameoff, omr->segment_name) != 0)
+	continue;
+      nameoff = i * sechdrsize + sectname_offset;
+      if (strcmp ((char *) secdata + nameoff, GNU_SECTION_NAMES) == 0)
+	break;
+    }
+
+  strtab_index = i;
+  if (strtab_index >= nsects)
+    {
+      strtab = NULL;
+      strtab_size = 0;
+    }
+  else
+    {
+      off_t strtab_offset;
+
+      simple_object_mach_o_section_info (omr->is_big_endian, is_32,
+					 secdata + strtab_index * sechdrsize,
+					 &strtab_offset, &strtab_size);
+      strtab = XNEWVEC (char, strtab_size);
+      if (!simple_object_internal_read (sobj->descriptor,
+					sobj->offset + strtab_offset,
+					(unsigned char *) strtab, strtab_size,
+					errmsg, err))
+	{
+	  XDELETEVEC (strtab);
+	  XDELETEVEC (secdata);
+	  return 0;
+	}
+    }
+
+  /* Process the sections.  */
+
+  for (i = 0; i < nsects; ++i)
+    {
+      const unsigned char *sechdr;
+      char namebuf[MACH_O_NAME_LEN + 1];
+      char *name;
+      off_t secoffset;
+      size_t secsize;
+
+      if (i == strtab_index)
+	continue;
+
+      sechdr = secdata + i * sechdrsize;
+
+      if (strcmp ((char *) sechdr + segname_offset, omr->segment_name) != 0)
+	continue;
+
+      memcpy (namebuf, sechdr + sectname_offset, MACH_O_NAME_LEN);
+      namebuf[MACH_O_NAME_LEN] = '\0';
+
+      name = &namebuf[0];
+      if (strtab != NULL && name[0] == '_' && name[1] == '_')
+	{
+	  unsigned long stringoffset;
+
+	  if (sscanf (name + 2, "%08lX", &stringoffset) == 1)
+	    {
+	      if (stringoffset >= strtab_size)
+		{
+		  *errmsg = "section name offset out of range";
+		  *err = 0;
+		  XDELETEVEC (strtab);
+		  XDELETEVEC (secdata);
+		  return 0;
+		}
+
+	      name = strtab + stringoffset;
+	    }
+	}
+
+      simple_object_mach_o_section_info (omr->is_big_endian, is_32, sechdr,
+					 &secoffset, &secsize);
+
+      if (!(*pfn) (data, name, secoffset, secsize))
+	{
+	  *errmsg = NULL;
+	  *err = 0;
+	  XDELETEVEC (strtab);
+	  XDELETEVEC (secdata);
+	  return 0;
+	}
+    }
+
+  XDELETEVEC (strtab);
+  XDELETEVEC (secdata);
+
+  return 1;
+}
+
+/* Find all sections in a Mach-O file.  */
+
+static const char *
+simple_object_mach_o_find_sections (simple_object_read *sobj,
+				    int (*pfn) (void *, const char *,
+						off_t offset, off_t length),
+				    void *data,
+				    int *err)
+{
+  struct simple_object_mach_o_read *omr =
+    (struct simple_object_mach_o_read *) sobj->data;
+  off_t offset;
+  size_t seghdrsize;
+  unsigned int (*fetch_32) (const unsigned char *);
+  const char *errmsg;
+  unsigned int i;
+
+  if (omr->magic == MACH_O_MH_MAGIC)
+    {
+      offset = sizeof (struct mach_o_header_32);
+      seghdrsize = sizeof (struct mach_o_segment_command_32);
+    }
+  else
+    {
+      offset = sizeof (struct mach_o_header_64);
+      seghdrsize = sizeof (struct mach_o_segment_command_64);
+    }
+
+  fetch_32 = (omr->is_big_endian
+	      ? simple_object_fetch_big_32
+	      : simple_object_fetch_little_32);
+
+  for (i = 0; i < omr->ncmds; ++i)
+    {
+      unsigned char loadbuf[sizeof (struct mach_o_load_command)];
+      unsigned int cmd;
+      unsigned int cmdsize;
+
+      if (!simple_object_internal_read (sobj->descriptor,
+					sobj->offset + offset,
+					loadbuf,
+					sizeof (struct mach_o_load_command),
+					&errmsg, err))
+	return errmsg;
+
+      cmd = (*fetch_32) (loadbuf + offsetof (struct mach_o_load_command, cmd));
+      cmdsize = (*fetch_32) (loadbuf
+			     + offsetof (struct mach_o_load_command, cmdsize));
+
+      if (cmd == MACH_O_LC_SEGMENT || cmd == MACH_O_LC_SEGMENT_64)
+	{
+	  unsigned char segbuf[sizeof (struct mach_o_segment_command_64)];
+	  int r;
+
+	  if (!simple_object_internal_read (sobj->descriptor,
+					    sobj->offset + offset,
+					    segbuf, seghdrsize, &errmsg, err))
+	    return errmsg;
+
+	  r = simple_object_mach_o_segment (sobj, offset, segbuf, pfn,
+					    data, &errmsg, err);
+	  if (!r)
+	    return errmsg;
+	}
+
+      offset += cmdsize;
+    }
+
+  return NULL;
+}
+
+/* Fetch the attributes for an simple_object_read.  */
+
+static void *
+simple_object_mach_o_fetch_attributes (simple_object_read *sobj,
+				       const char **errmsg ATTRIBUTE_UNUSED,
+				       int *err ATTRIBUTE_UNUSED)
+{
+  struct simple_object_mach_o_read *omr =
+    (struct simple_object_mach_o_read *) sobj->data;
+  struct simple_object_mach_o_attributes *ret;
+
+  ret = XNEW (struct simple_object_mach_o_attributes);
+  ret->magic = omr->magic;
+  ret->is_big_endian = omr->is_big_endian;
+  ret->cputype = omr->cputype;
+  ret->cpusubtype = omr->cpusubtype;
+  ret->flags = omr->flags;
+  ret->reserved = omr->reserved;
+  return ret;
+}
+
+/* Release the private data for an simple_object_read.  */
+
+static void
+simple_object_mach_o_release_read (void *data)
+{
+  struct simple_object_mach_o_read *omr =
+    (struct simple_object_mach_o_read *) data;
+
+  free (omr->segment_name);
+  XDELETE (omr);
+}
+
+/* Compare two attributes structures.  */
+
+static const char *
+simple_object_mach_o_attributes_merge (void *todata, void *fromdata, int *err)
+{
+  struct simple_object_mach_o_attributes *to =
+    (struct simple_object_mach_o_attributes *) todata;
+  struct simple_object_mach_o_attributes *from =
+    (struct simple_object_mach_o_attributes *) fromdata;
+
+  if (to->magic != from->magic
+      || to->is_big_endian != from->is_big_endian
+      || to->cputype != from->cputype)
+    {
+      *err = 0;
+      return "Mach-O object format mismatch";
+    }
+  return NULL;
+}
+
+/* Release the private data for an attributes structure.  */
+
+static void
+simple_object_mach_o_release_attributes (void *data)
+{
+  XDELETE (data);
+}
+
+/* Prepare to write out a file.  */
+
+static void *
+simple_object_mach_o_start_write (void *attributes_data,
+				  const char **errmsg ATTRIBUTE_UNUSED,
+				  int *err ATTRIBUTE_UNUSED)
+{
+  struct simple_object_mach_o_attributes *attrs =
+    (struct simple_object_mach_o_attributes *) attributes_data;
+  struct simple_object_mach_o_attributes *ret;
+
+  /* We're just going to record the attributes, but we need to make a
+     copy because the user may delete them.  */
+  ret = XNEW (struct simple_object_mach_o_attributes);
+  *ret = *attrs;
+  return ret;
+}
+
+/* Write out the header of a Mach-O file.  */
+
+static int
+simple_object_mach_o_write_header (simple_object_write *sobj, int descriptor,
+				   size_t nsects, const char **errmsg,
+				   int *err)
+{
+  struct simple_object_mach_o_attributes *attrs =
+    (struct simple_object_mach_o_attributes *) sobj->data;
+  void (*set_32) (unsigned char *, unsigned int);
+  unsigned char hdrbuf[sizeof (struct mach_o_header_64)];
+  unsigned char *hdr;
+  size_t wrsize;
+
+  set_32 = (attrs->is_big_endian
+	    ? simple_object_set_big_32
+	    : simple_object_set_little_32);
+
+  memset (hdrbuf, 0, sizeof hdrbuf);
+
+  /* The 32-bit and 64-bit headers start out the same.  */
+
+  hdr = &hdrbuf[0];
+  set_32 (hdr + offsetof (struct mach_o_header_32, magic), attrs->magic);
+  set_32 (hdr + offsetof (struct mach_o_header_32, cputype), attrs->cputype);
+  set_32 (hdr + offsetof (struct mach_o_header_32, cpusubtype),
+	  attrs->cpusubtype);
+  set_32 (hdr + offsetof (struct mach_o_header_32, filetype), MACH_O_MH_OBJECT);
+  set_32 (hdr + offsetof (struct mach_o_header_32, ncmds), 1);
+  set_32 (hdr + offsetof (struct mach_o_header_32, flags), attrs->flags);
+  if (attrs->magic == MACH_O_MH_MAGIC)
+    {
+      wrsize = sizeof (struct mach_o_header_32);
+      set_32 (hdr + offsetof (struct mach_o_header_32, sizeofcmds),
+	      (sizeof (struct mach_o_segment_command_32)
+	       + nsects * sizeof (struct mach_o_section_32)));
+    }
+  else
+    {
+      set_32 (hdr + offsetof (struct mach_o_header_64, sizeofcmds),
+	      (sizeof (struct mach_o_segment_command_64)
+	       + nsects * sizeof (struct mach_o_section_64)));
+      set_32 (hdr + offsetof (struct mach_o_header_64, reserved),
+	      attrs->reserved);
+      wrsize = sizeof (struct mach_o_header_64);
+    }
+
+  return simple_object_internal_write (descriptor, 0, hdrbuf, wrsize,
+				       errmsg, err);
+}
+
+/* Write a Mach-O section header.  */
+
+static int
+simple_object_mach_o_write_section_header (simple_object_write *sobj,
+					   int descriptor,
+					   size_t sechdr_offset,
+					   const char *name, size_t secaddr,
+					   size_t secsize, size_t offset,
+					   unsigned int align,
+					   const char **errmsg, int *err)
+{
+  struct simple_object_mach_o_attributes *attrs =
+    (struct simple_object_mach_o_attributes *) sobj->data;
+  void (*set_32) (unsigned char *, unsigned int);
+  unsigned char hdrbuf[sizeof (struct mach_o_section_64)];
+  unsigned char *hdr;
+  size_t sechdrsize;
+
+  set_32 = (attrs->is_big_endian
+	    ? simple_object_set_big_32
+	    : simple_object_set_little_32);
+
+  memset (hdrbuf, 0, sizeof hdrbuf);
+
+  hdr = &hdrbuf[0];
+  if (attrs->magic == MACH_O_MH_MAGIC)
+    {
+      strncpy ((char *) hdr + offsetof (struct mach_o_section_32, sectname),
+	       name, MACH_O_NAME_LEN);
+      strncpy ((char *) hdr + offsetof (struct mach_o_section_32, segname),
+	       sobj->segment_name, MACH_O_NAME_LEN);
+      set_32 (hdr + offsetof (struct mach_o_section_32, addr), secaddr);
+      set_32 (hdr + offsetof (struct mach_o_section_32, size), secsize);
+      set_32 (hdr + offsetof (struct mach_o_section_32, offset), offset);
+      set_32 (hdr + offsetof (struct mach_o_section_32, align), align);
+      /* reloff left as zero.  */
+      /* nreloc left as zero.  */
+      set_32 (hdr + offsetof (struct mach_o_section_32, flags),
+	      MACH_O_S_ATTR_DEBUG);
+      /* reserved1 left as zero.  */
+      /* reserved2 left as zero.  */
+      sechdrsize = sizeof (struct mach_o_section_32);
+    }
+  else
+    {
+#ifdef UNSIGNED_64BIT_TYPE
+      void (*set_64) (unsigned char *, ulong_type);
+
+      set_64 = (attrs->is_big_endian
+		? simple_object_set_big_64
+		: simple_object_set_little_64);
+
+      strncpy ((char *) hdr + offsetof (struct mach_o_section_64, sectname),
+	       name, MACH_O_NAME_LEN);
+      strncpy ((char *) hdr + offsetof (struct mach_o_section_64, segname),
+	       sobj->segment_name, MACH_O_NAME_LEN);
+      set_64 (hdr + offsetof (struct mach_o_section_64, addr), secaddr);
+      set_64 (hdr + offsetof (struct mach_o_section_64, size), secsize);
+      set_32 (hdr + offsetof (struct mach_o_section_64, offset), offset);
+      set_32 (hdr + offsetof (struct mach_o_section_64, align), align);
+      /* reloff left as zero.  */
+      /* nreloc left as zero.  */
+      set_32 (hdr + offsetof (struct mach_o_section_64, flags),
+	      MACH_O_S_ATTR_DEBUG);
+      /* reserved1 left as zero.  */
+      /* reserved2 left as zero.  */
+      /* reserved3 left as zero.  */
+#endif
+      sechdrsize = sizeof (struct mach_o_section_64);
+    }
+
+  return simple_object_internal_write (descriptor, sechdr_offset, hdr,
+				       sechdrsize, errmsg, err);
+}
+
+/* Write out the single segment and the sections of a Mach-O file.  */
+
+static int
+simple_object_mach_o_write_segment (simple_object_write *sobj, int descriptor,
+				    size_t nsects, const char **errmsg,
+				    int *err)
+{
+  struct simple_object_mach_o_attributes *attrs =
+    (struct simple_object_mach_o_attributes *) sobj->data;
+  void (*set_32) (unsigned char *, unsigned int);
+  size_t hdrsize;
+  size_t seghdrsize;
+  size_t sechdrsize;
+  size_t cmdsize;
+  size_t offset;
+  size_t sechdr_offset;
+  size_t secaddr;
+  unsigned int name_offset;
+  simple_object_write_section *section;
+  unsigned char hdrbuf[sizeof (struct mach_o_segment_command_64)];
+  unsigned char *hdr;
+
+  set_32 = (attrs->is_big_endian
+	    ? simple_object_set_big_32
+	    : simple_object_set_little_32);
+
+  /* Write out the sections first.  */
+
+  if (attrs->magic == MACH_O_MH_MAGIC)
+    {
+      hdrsize = sizeof (struct mach_o_header_32);
+      seghdrsize = sizeof (struct mach_o_segment_command_32);
+      sechdrsize = sizeof (struct mach_o_section_32);
+    }
+  else
+    {
+      hdrsize = sizeof (struct mach_o_header_64);
+      seghdrsize = sizeof (struct mach_o_segment_command_64);
+      sechdrsize = sizeof (struct mach_o_section_64);
+    }
+
+  sechdr_offset = hdrsize + seghdrsize;
+  cmdsize = seghdrsize + nsects * sechdrsize;
+  offset = hdrsize + cmdsize;
+  name_offset = 0;
+  secaddr = 0;
+
+  for (section = sobj->sections; section != NULL; section = section->next)
+    {
+      size_t mask;
+      size_t new_offset;
+      size_t secsize;
+      struct simple_object_write_section_buffer *buffer;
+      char namebuf[MACH_O_NAME_LEN + 1];
+
+      mask = (1U << section->align) - 1;
+      new_offset = offset + mask;
+      new_offset &= ~ mask;
+      while (new_offset > offset)
+	{
+	  unsigned char zeroes[16];
+	  size_t write;
+
+	  memset (zeroes, 0, sizeof zeroes);
+	  write = new_offset - offset;
+	  if (write > sizeof zeroes)
+	    write = sizeof zeroes;
+	  if (!simple_object_internal_write (descriptor, offset, zeroes, write,
+					     errmsg, err))
+	    return 0;
+	  offset += write;
+	}
+
+      secsize = 0;
+      for (buffer = section->buffers; buffer != NULL; buffer = buffer->next)
+	{
+	  if (!simple_object_internal_write (descriptor, offset + secsize,
+					     ((const unsigned char *)
+					      buffer->buffer),
+					     buffer->size, errmsg, err))
+	    return 0;
+	  secsize += buffer->size;
+	}
+
+      snprintf (namebuf, sizeof namebuf, "__%08X", name_offset);
+      if (!simple_object_mach_o_write_section_header (sobj, descriptor,
+						      sechdr_offset, namebuf,
+						      secaddr, secsize, offset,
+						      section->align,
+						      errmsg, err))
+	return 0;
+
+      sechdr_offset += sechdrsize;
+      offset += secsize;
+      name_offset += strlen (section->name) + 1;
+      secaddr += secsize;
+    }
+
+  /* Write out the section names.  */
+
+  if (!simple_object_mach_o_write_section_header (sobj, descriptor,
+						  sechdr_offset,
+						  GNU_SECTION_NAMES, secaddr,
+						  name_offset, offset, 0,
+						  errmsg, err))
+    return 0;
+
+  for (section = sobj->sections; section != NULL; section = section->next)
+    {
+      size_t namelen;
+
+      namelen = strlen (section->name) + 1;
+      if (!simple_object_internal_write (descriptor, offset,
+					 (const unsigned char *) section->name,
+					 namelen, errmsg, err))
+	return 0;
+      offset += namelen;
+    }
+
+  /* Write out the segment header.  */
+
+  memset (hdrbuf, 0, sizeof hdrbuf);
+
+  hdr = &hdrbuf[0];
+  if (attrs->magic == MACH_O_MH_MAGIC)
+    {
+      set_32 (hdr + offsetof (struct mach_o_segment_command_32, cmd),
+	      MACH_O_LC_SEGMENT);
+      set_32 (hdr + offsetof (struct mach_o_segment_command_32, cmdsize),
+	      cmdsize);
+      strncpy (((char *) hdr
+		+ offsetof (struct mach_o_segment_command_32, segname)),
+	       sobj->segment_name, MACH_O_NAME_LEN);
+      /* vmaddr left as zero.  */
+      /* vmsize left as zero.  */
+      set_32 (hdr + offsetof (struct mach_o_segment_command_32, fileoff),
+	      hdrsize + cmdsize);
+      set_32 (hdr + offsetof (struct mach_o_segment_command_32, filesize),
+	      offset - (hdrsize + cmdsize));
+      /* maxprot left as zero.  */
+      /* initprot left as zero.  */
+      set_32 (hdr + offsetof (struct mach_o_segment_command_32, nsects),
+	      nsects);
+      /* flags left as zero.  */
+    }
+  else
+    {
+#ifdef UNSIGNED_64BIT_TYPE
+      void (*set_64) (unsigned char *, ulong_type);
+
+      set_64 = (attrs->is_big_endian
+		? simple_object_set_big_64
+		: simple_object_set_little_64);
+
+      set_32 (hdr + offsetof (struct mach_o_segment_command_64, cmd),
+	      MACH_O_LC_SEGMENT);
+      set_32 (hdr + offsetof (struct mach_o_segment_command_64, cmdsize),
+	      cmdsize);
+      strncpy (((char *) hdr
+		+ offsetof (struct mach_o_segment_command_64, segname)),
+	       sobj->segment_name, MACH_O_NAME_LEN);
+      /* vmaddr left as zero.  */
+      /* vmsize left as zero.  */
+      set_64 (hdr + offsetof (struct mach_o_segment_command_64, fileoff),
+	      hdrsize + cmdsize);
+      set_64 (hdr + offsetof (struct mach_o_segment_command_64, filesize),
+	      offset - (hdrsize + cmdsize));
+      /* maxprot left as zero.  */
+      /* initprot left as zero.  */
+      set_32 (hdr + offsetof (struct mach_o_segment_command_64, nsects),
+	      nsects);
+      /* flags left as zero.  */
+#endif
+    }
+
+  return simple_object_internal_write (descriptor, hdrsize, hdr, seghdrsize,
+				       errmsg, err);
+}
+
+/* Write out a complete Mach-O file.  */
+
+static const char *
+simple_object_mach_o_write_to_file (simple_object_write *sobj, int descriptor,
+				    int *err)
+{
+  size_t nsects;
+  simple_object_write_section *section;
+  const char *errmsg;
+
+  /* Start at 1 for symbol_names section.  */
+  nsects = 1;
+  for (section = sobj->sections; section != NULL; section = section->next)
+    ++nsects;
+
+  if (!simple_object_mach_o_write_header (sobj, descriptor, nsects,
+					  &errmsg, err))
+    return errmsg;
+
+  if (!simple_object_mach_o_write_segment (sobj, descriptor, nsects,
+					   &errmsg, err))
+    return errmsg;
+
+  return NULL;
+}
+
+/* Release the private data for an simple_object_write structure.  */
+
+static void
+simple_object_mach_o_release_write (void *data)
+{
+  XDELETE (data);
+}
+
+/* The Mach-O functions.  */
+
+const struct simple_object_functions simple_object_mach_o_functions =
+{
+  simple_object_mach_o_match,
+  simple_object_mach_o_find_sections,
+  simple_object_mach_o_fetch_attributes,
+  simple_object_mach_o_release_read,
+  simple_object_mach_o_attributes_merge,
+  simple_object_mach_o_release_attributes,
+  simple_object_mach_o_start_write,
+  simple_object_mach_o_write_to_file,
+  simple_object_mach_o_release_write
+};
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/simple-object.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/simple-object.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/simple-object.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/simple-object.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,422 @@
+/* simple-object.c -- simple routines to read and write object files.
+   Copyright 2010 Free Software Foundation, Inc.
+   Written by Ian Lance Taylor, Google.
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#include "config.h"
+#include "libiberty.h"
+#include "simple-object.h"
+
+#include <errno.h>
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
+#ifndef SEEK_SET
+#define SEEK_SET 0
+#endif
+
+#include "simple-object-common.h"
+
+/* The known object file formats.  */
+
+static const struct simple_object_functions * const format_functions[] =
+{
+  &simple_object_elf_functions,
+  &simple_object_mach_o_functions,
+  &simple_object_coff_functions
+};
+
+/* Read data from a file using the simple_object error reporting
+   conventions.  */
+
+int
+simple_object_internal_read (int descriptor, off_t offset,
+			     unsigned char *buffer, size_t size,
+			     const char **errmsg, int *err)
+{
+  ssize_t got;
+
+  if (lseek (descriptor, offset, SEEK_SET) < 0)
+    {
+      *errmsg = "lseek";
+      *err = errno;
+      return 0;
+    }
+
+  got = read (descriptor, buffer, size);
+  if (got < 0)
+    {
+      *errmsg = "read";
+      *err = errno;
+      return 0;
+    }
+
+  if ((size_t) got < size)
+    {
+      *errmsg = "file too short";
+      *err = 0;
+      return 0;
+    }
+
+  return 1;
+}
+
+/* Write data to a file using the simple_object error reporting
+   conventions.  */
+
+int
+simple_object_internal_write (int descriptor, off_t offset,
+			      const unsigned char *buffer, size_t size,
+			      const char **errmsg, int *err)
+{
+  ssize_t wrote;
+
+  if (lseek (descriptor, offset, SEEK_SET) < 0)
+    {
+      *errmsg = "lseek";
+      *err = errno;
+      return 0;
+    }
+
+  wrote = write (descriptor, buffer, size);
+  if (wrote < 0)
+    {
+      *errmsg = "write";
+      *err = errno;
+      return 0;
+    }
+
+  if ((size_t) wrote < size)
+    {
+      *errmsg = "short write";
+      *err = 0;
+      return 0;
+    }
+
+  return 1;
+}
+
+/* Open for read.  */
+
+simple_object_read *
+simple_object_start_read (int descriptor, off_t offset,
+			  const char *segment_name, const char **errmsg,
+			  int *err)
+{
+  unsigned char header[SIMPLE_OBJECT_MATCH_HEADER_LEN];
+  size_t len, i;
+
+  if (!simple_object_internal_read (descriptor, offset, header,
+				    SIMPLE_OBJECT_MATCH_HEADER_LEN,
+				    errmsg, err))
+    return NULL;
+
+  len = sizeof (format_functions) / sizeof (format_functions[0]);
+  for (i = 0; i < len; ++i)
+    {
+      void *data;
+
+      data = format_functions[i]->match (header, descriptor, offset,
+					 segment_name, errmsg, err);
+      if (data != NULL)
+	{
+	  simple_object_read *ret;
+
+	  ret = XNEW (simple_object_read);
+	  ret->descriptor = descriptor;
+	  ret->offset = offset;
+	  ret->functions = format_functions[i];
+	  ret->data = data;
+	  return ret;
+	}
+    }
+
+  *errmsg = "file not recognized";
+  *err = 0;
+  return NULL;
+}
+
+/* Find all sections.  */
+
+const char *
+simple_object_find_sections (simple_object_read *sobj,
+			     int (*pfn) (void *, const char *, off_t, off_t),
+			     void *data,
+			     int *err)
+{
+  return sobj->functions->find_sections (sobj, pfn, data, err);
+}
+
+/* Internal data passed to find_one_section.  */
+
+struct find_one_section_data
+{
+  /* The section we are looking for.  */
+  const char *name;
+  /* Where to store the section offset.  */
+  off_t *offset;
+  /* Where to store the section length.  */
+  off_t *length;
+  /* Set if the name is found.  */
+  int found;
+};
+
+/* Internal function passed to find_sections.  */
+
+static int
+find_one_section (void *data, const char *name, off_t offset, off_t length)
+{
+  struct find_one_section_data *fosd = (struct find_one_section_data *) data;
+
+  if (strcmp (name, fosd->name) != 0)
+    return 1;
+
+  *fosd->offset = offset;
+  *fosd->length = length;
+  fosd->found = 1;
+
+  /* Stop iteration.  */
+  return 0;
+}
+
+/* Find a section.  */
+
+int
+simple_object_find_section (simple_object_read *sobj, const char *name,
+			    off_t *offset, off_t *length,
+			    const char **errmsg, int *err)
+{
+  struct find_one_section_data fosd;
+
+  fosd.name = name;
+  fosd.offset = offset;
+  fosd.length = length;
+  fosd.found = 0;
+
+  *errmsg = simple_object_find_sections (sobj, find_one_section,
+					 (void *) &fosd, err);
+  if (*errmsg != NULL)
+    return 0;
+  if (!fosd.found)
+    return 0;
+  return 1;
+}
+
+/* Fetch attributes.  */
+
+simple_object_attributes *
+simple_object_fetch_attributes (simple_object_read *sobj, const char **errmsg,
+				int *err)
+{
+  void *data;
+  simple_object_attributes *ret;
+
+  data = sobj->functions->fetch_attributes (sobj, errmsg, err);
+  if (data == NULL)
+    return NULL;
+  ret = XNEW (simple_object_attributes);
+  ret->functions = sobj->functions;
+  ret->data = data;
+  return ret;
+}
+
+/* Release an simple_object_read.  */
+
+void
+simple_object_release_read (simple_object_read *sobj)
+{
+  sobj->functions->release_read (sobj->data);
+  XDELETE (sobj);
+}
+
+/* Merge attributes.  */
+
+const char *
+simple_object_attributes_merge (simple_object_attributes *to,
+				simple_object_attributes *from,
+				int *err)
+{
+  if (to->functions != from->functions)
+    {
+      *err = 0;
+      return "different object file format";
+    }
+  return to->functions->attributes_merge (to->data, from->data, err);
+}
+
+/* Release an attributes structure.  */
+
+void
+simple_object_release_attributes (simple_object_attributes *attrs)
+{
+  attrs->functions->release_attributes (attrs->data);
+  XDELETE (attrs);
+}
+
+/* Start creating an object file.  */
+
+simple_object_write *
+simple_object_start_write (simple_object_attributes *attrs,
+			   const char *segment_name, const char **errmsg,
+			   int *err)
+{
+  void *data;
+  simple_object_write *ret;
+
+  data = attrs->functions->start_write (attrs->data, errmsg, err);
+  if (data == NULL)
+    return NULL;
+  ret = XNEW (simple_object_write);
+  ret->functions = attrs->functions;
+  ret->segment_name = xstrdup (segment_name);
+  ret->sections = NULL;
+  ret->last_section = NULL;
+  ret->data = data;
+  return ret;
+}
+
+/* Start creating a section.  */
+
+simple_object_write_section *
+simple_object_write_create_section (simple_object_write *sobj, const char *name,
+				    unsigned int align,
+				    const char **errmsg ATTRIBUTE_UNUSED,
+				    int *err ATTRIBUTE_UNUSED)
+{
+  simple_object_write_section *ret;
+
+  ret = XNEW (simple_object_write_section);
+  ret->next = NULL;
+  ret->name = xstrdup (name);
+  ret->align = align;
+  ret->buffers = NULL;
+  ret->last_buffer = NULL;
+
+  if (sobj->last_section == NULL)
+    {
+      sobj->sections = ret;
+      sobj->last_section = ret;
+    }
+  else
+    {
+      sobj->last_section->next = ret;
+      sobj->last_section = ret;
+    }
+
+  return ret;
+}
+
+/* Add data to a section.  */
+
+const char *
+simple_object_write_add_data (simple_object_write *sobj ATTRIBUTE_UNUSED,
+			      simple_object_write_section *section,
+			      const void *buffer,
+			      size_t size, int copy,
+			      int *err ATTRIBUTE_UNUSED)
+{
+  struct simple_object_write_section_buffer *wsb;
+
+  wsb = XNEW (struct simple_object_write_section_buffer);
+  wsb->next = NULL;
+  wsb->size = size;
+
+  if (!copy)
+    {
+      wsb->buffer = buffer;
+      wsb->free_buffer = NULL;
+    }
+  else
+    {
+      wsb->free_buffer = (void *) XNEWVEC (char, size);
+      memcpy (wsb->free_buffer, buffer, size);
+      wsb->buffer = wsb->free_buffer;
+    }
+
+  if (section->last_buffer == NULL)
+    {
+      section->buffers = wsb;
+      section->last_buffer = wsb;
+    }
+  else
+    {
+      section->last_buffer->next = wsb;
+      section->last_buffer = wsb;
+    }
+
+  return NULL;
+}
+
+/* Write the complete object file.  */
+
+const char *
+simple_object_write_to_file (simple_object_write *sobj, int descriptor,
+			     int *err)
+{
+  return sobj->functions->write_to_file (sobj, descriptor, err);
+}
+
+/* Release an simple_object_write.  */
+
+void
+simple_object_release_write (simple_object_write *sobj)
+{
+  simple_object_write_section *section;
+
+  free (sobj->segment_name);
+
+  section = sobj->sections;
+  while (section != NULL)
+    {
+      struct simple_object_write_section_buffer *buffer;
+      simple_object_write_section *next_section;
+
+      buffer = section->buffers;
+      while (buffer != NULL)
+	{
+	  struct simple_object_write_section_buffer *next_buffer;
+
+	  if (buffer->free_buffer != NULL)
+	    XDELETEVEC (buffer->free_buffer);
+	  next_buffer = buffer->next;
+	  XDELETE (buffer);
+	  buffer = next_buffer;
+	}
+
+      next_section = section->next;
+      free (section->name);
+      XDELETE (section);
+      section = next_section;
+    }
+
+  sobj->functions->release_write (sobj->data);
+  XDELETE (sobj);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/simple-object.txh sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/simple-object.txh
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/simple-object.txh	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/simple-object.txh	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,189 @@
+@c -*- mode: texinfo -*-
+@deftypefn Extension {simple_object_read *} simple_object_open_read @
+  (int @var{descriptor}, off_t @var{offset}, const char *{segment_name}, @
+  const char **@var{errmsg}, int *@var{err})
+
+Opens an object file for reading.  Creates and returns an
+@code{simple_object_read} pointer which may be passed to other
+functions to extract data from the object file.
+
+@var{descriptor} holds a file descriptor which permits reading.
+
+@var{offset} is the offset into the file; this will be @code{0} in the
+normal case, but may be a different value when reading an object file
+in an archive file.
+
+@var{segment_name} is only used with the Mach-O file format used on
+Darwin aka Mac OS X.  It is required on that platform, and means to
+only look at sections within the segment with that name.  The
+parameter is ignored on other systems.
+
+If an error occurs, this functions returns @code{NULL} and sets
+@code{*@var{errmsg}} to an error string and sets @code{*@var{err}} to
+an errno value or @code{0} if there is no relevant errno.
+
+@end deftypefn
+
+@deftypefn Extension {const char *} simple_object_find_sections @
+  (simple_object_read *@var{simple_object}, int (*@var{pfn}) (void *@var{data}, @
+  const char *@var{name}, off_t @var{offset}, off_t @var{length}), @
+  void *@var{data}, int *@var{err})
+
+This function calls @var{pfn} for each section in @var{simple_object}.
+It calls @var{pfn} with the section name, the offset within the file
+of the section contents, and the length of the section contents.  The
+offset within the file is relative to the offset passed to
+@code{simple_object_open_read}.  The @var{data} argument to this
+function is passed along to @var{pfn}.
+
+If @var{pfn} returns @code{0}, the loop over the sections stops and
+@code{simple_object_find_sections} returns.  If @var{pfn} returns some
+other value, the loop continues.
+
+On success @code{simple_object_find_sections} returns.  On error it
+returns an error string, and sets @code{*@var{err}} to an errno value
+or @code{0} if there is no relevant errno.
+
+@end deftypefn
+
+@deftypefn Extension {int} simple_object_find_section @
+  (simple_object_read *@var{simple_object} off_t *@var{offset}, @
+  off_t *@var{length}, const char **@var{errmsg}, int *@var{err})
+
+Look for the section @var{name} in @var{simple_object}.  This returns
+information for the first section with that name.
+
+If found, return 1 and set @code{*@var{offset}} to the offset in the
+file of the section contents and set @code{*@var{length}} to the
+length of the section contents.  The value in @code{*@var{offset}}
+will be relative to the offset passed to
+@code{simple_object_open_read}.
+
+If the section is not found, and no error occurs,
+@code{simple_object_find_section} returns @code{0} and set
+@code{*@var{errmsg}} to @code{NULL}.
+
+If an error occurs, @code{simple_object_find_section} returns
+@code{0}, sets @code{*@var{errmsg}} to an error message, and sets
+@code{*@var{err}} to an errno value or @code{0} if there is no
+relevant errno.
+
+@end deftypefn
+
+@deftypefn Extension {void} simple_object_release_read @
+  (simple_object_read *@var{simple_object})
+
+Release all resources associated with @var{simple_object}.  This does
+not close the file descriptor.
+
+@end deftypefn
+
+@deftypefn Extension {simple_object_attributes *} simple_object_fetch_attributes @
+  (simple_object_read *@var{simple_object}, const char **@var{errmsg}, int *@var{err})
+
+Fetch the attributes of @var{simple_object}.  The attributes are
+internal information such as the format of the object file, or the
+architecture it was compiled for.  This information will persist until
+@code{simple_object_attributes_release} is called, even if
+@var{simple_object} itself is released.
+
+On error this returns @code{NULL}, sets @code{*@var{errmsg}} to an
+error message, and sets @code{*@var{err}} to an errno value or
+@code{0} if there is no relevant errno.
+
+@end deftypefn
+
+@deftypefn Extension {const char *} simple_object_attributes_compare @
+  (simple_object_attributes *@var{attrs1}, simple_object_attributes *@var{attrs2}, @
+   int *@var{err})
+
+Compare @var{attrs1} and @var{attrs2}.  If they could be linked
+together without error, return @code{NULL}.  Otherwise, return an
+error message and set @code{*@var{err}} to an errno value or @code{0}
+if there is no relevant errno.
+
+@end deftypefn
+
+@deftypefn Extension {void} simple_object_release_attributes @
+  (simple_object_attributes *@var{attrs})
+
+Release all resources associated with @var{attrs}.
+
+@end deftypefn
+
+@deftypefn Extension {simple_object_write *} simple_object_start_write @
+  (simple_object_attributes @var{attrs}, const char *@var{segment_name}, @
+  const char **@var{errmsg}, int *@var{err})
+
+Start creating a new object file using the object file format
+described in @var{attrs}.  You must fetch attribute information from
+an existing object file before you can create a new one.  There is
+currently no support for creating an object file de novo.
+
+@var{segment_name} is only used with Mach-O as found on Darwin aka Mac
+OS X.  The parameter is required on that target.  It means that all
+sections are created within the named segment.  It is ignored for
+other object file formats.
+
+On error @code{simple_object_start_write} returns @code{NULL}, sets
+@code{*@var{ERRMSG}} to an error message, and sets @code{*@var{err}}
+to an errno value or @code{0} if there is no relevant errno.
+
+@end deftypefn
+
+@deftypefn Extension {simple_object_write_section *} simple_object_write_create_section @
+  (simple_object_write *@var{simple_object}, const char *@var{name}, @
+  unsigned int @var{align}, const char **@var{errmsg}, int *@var{err})
+
+Add a section to @var{simple_object}.  @var{name} is the name of the
+new section.  @var{align} is the required alignment expressed as the
+number of required low-order 0 bits (e.g., 2 for alignment to a 32-bit
+boundary).
+
+The section is created as containing data, readable, not writable, not
+executable, not loaded at runtime.  The section is not written to the
+file until @code{simple_object_write_to_file} is called.
+
+On error this returns @code{NULL}, sets @code{*@var{errmsg}} to an
+error message, and sets @code{*@var{err}} to an errno value or
+@code{0} if there is no relevant errno.
+
+@end deftypefn
+
+@deftypefn Extension {const char *} simple_object_write_add_data @
+  (simple_object_write *@var{simple_object}, @
+  simple_object_write_section *@var{section}, const void *@var{buffer}, @
+  size_t @var{size}, int @var{copy}, int *@var{err})
+
+Add data @var{buffer}/@var{size} to @var{section} in
+@var{simple_object}.  If @var{copy} is non-zero, the data will be
+copied into memory if necessary.  If @var{copy} is zero, @var{buffer}
+must persist until @code{simple_object_write_to_file} is called.  is
+released.
+
+On success this returns @code{NULL}.  On error this returns an error
+message, and sets @code{*@var{err}} to an errno value or 0 if there is
+no relevant erro.
+
+@end deftypefn
+
+@deftypefn Extension {const char *} simple_object_write_to_file @
+  (simple_object_write *@var{simple_object}, int @var{descriptor}, int *@var{err})
+
+Write the complete object file to @var{descriptor}, an open file
+descriptor.  This writes out all the data accumulated by calls to
+@code{simple_object_write_create_section} and
+@var{simple_object_write_add_data}.
+
+This returns @code{NULL} on success.  On error this returns an error
+message and sets @code{*@var{err}} to an errno value or @code{0} if
+there is no relevant errno.
+
+@end deftypefn
+
+@deftypefn Extension {void} simple_object_release_write @
+  (simple_object_write *@var{simple_object})
+
+Release all resources associated with @var{simple_object}.
+
+@end deftypefn
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/snprintf.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/snprintf.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/snprintf.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/snprintf.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,63 @@
+/* Implement the snprintf function.
+   Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+   Written by Kaveh R. Ghazi <ghazi@caip.rutgers.edu>.
+
+This file is part of the libiberty library.  This library is free
+software; you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This library 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 GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+
+As a special exception, if you link this library with files
+compiled with a GNU compiler to produce an executable, this does not cause
+the resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why
+the executable file might be covered by the GNU General Public License. */
+
+/*
+
+@deftypefn Supplemental int snprintf (char *@var{buf}, size_t @var{n}, @
+  const char *@var{format}, ...)
+
+This function is similar to @code{sprintf}, but it will write to
+@var{buf} at most @code{@var{n}-1} bytes of text, followed by a
+terminating null byte, for a total of @var{n} bytes.
+On error the return value is -1, otherwise it returns the number of
+bytes, not including the terminating null byte, that would have been
+written had @var{n} been sufficiently large, regardless of the actual
+value of @var{n}.  Note some pre-C99 system libraries do not implement
+this correctly so users cannot generally rely on the return value if
+the system version of this function is used.
+
+@end deftypefn
+
+*/
+
+#include "ansidecl.h"
+
+#include <stdarg.h>
+#include <stddef.h>
+
+int vsnprintf (char *, size_t, const char *, va_list);
+
+int
+snprintf (char *s, size_t n, const char *format, ...)
+{
+  int result;
+  VA_OPEN (ap, format);
+  VA_FIXEDARG (ap, char *, s);
+  VA_FIXEDARG (ap, size_t, n);
+  VA_FIXEDARG (ap, const char *, format);
+  result = vsnprintf (s, n, format, ap);
+  VA_CLOSE (ap);
+  return result;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/sort.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/sort.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/sort.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/sort.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,186 @@
+/* Sorting algorithms.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   Contributed by Mark Mitchell <mark@codesourcery.com>.
+
+This file is part of GNU CC.
+   
+GNU CC is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU CC 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 GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "libiberty.h"
+#include "sort.h"
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#ifndef UCHAR_MAX
+#define UCHAR_MAX ((unsigned char)(-1))
+#endif
+
+/* POINTERS and WORK are both arrays of N pointers.  When this
+   function returns POINTERS will be sorted in ascending order.  */
+
+void sort_pointers (size_t n, void **pointers, void **work)
+{
+  /* The type of a single digit.  This can be any unsigned integral
+     type.  When changing this, DIGIT_MAX should be changed as 
+     well.  */
+  typedef unsigned char digit_t;
+
+  /* The maximum value a single digit can have.  */
+#define DIGIT_MAX (UCHAR_MAX + 1)
+
+  /* The Ith entry is the number of elements in *POINTERSP that have I
+     in the digit on which we are currently sorting.  */
+  unsigned int count[DIGIT_MAX];
+  /* Nonzero if we are running on a big-endian machine.  */
+  int big_endian_p;
+  size_t i;
+  size_t j;
+
+  /* The algorithm used here is radix sort which takes time linear in
+     the number of elements in the array.  */
+
+  /* The algorithm here depends on being able to swap the two arrays
+     an even number of times.  */
+  if ((sizeof (void *) / sizeof (digit_t)) % 2 != 0)
+    abort ();
+
+  /* Figure out the endianness of the machine.  */
+  for (i = 0, j = 0; i < sizeof (size_t); ++i)
+    {
+      j *= (UCHAR_MAX + 1);
+      j += i;
+    }
+  big_endian_p = (((char *)&j)[0] == 0);
+
+  /* Move through the pointer values from least significant to most
+     significant digits.  */
+  for (i = 0; i < sizeof (void *) / sizeof (digit_t); ++i)
+    {
+      digit_t *digit;
+      digit_t *bias;
+      digit_t *top;
+      unsigned int *countp;
+      void **pointerp;
+
+      /* The offset from the start of the pointer will depend on the
+	 endianness of the machine.  */
+      if (big_endian_p)
+	j = sizeof (void *) / sizeof (digit_t) - i;
+      else
+	j = i;
+	
+      /* Now, perform a stable sort on this digit.  We use counting
+	 sort.  */
+      memset (count, 0, DIGIT_MAX * sizeof (unsigned int));
+
+      /* Compute the address of the appropriate digit in the first and
+	 one-past-the-end elements of the array.  On a little-endian
+	 machine, the least-significant digit is closest to the front.  */
+      bias = ((digit_t *) pointers) + j;
+      top = ((digit_t *) (pointers + n)) + j;
+
+      /* Count how many there are of each value.  At the end of this
+	 loop, COUNT[K] will contain the number of pointers whose Ith
+	 digit is K.  */
+      for (digit = bias; 
+	   digit < top; 
+	   digit += sizeof (void *) / sizeof (digit_t))
+	++count[*digit];
+
+      /* Now, make COUNT[K] contain the number of pointers whose Ith
+	 digit is less than or equal to K.  */
+      for (countp = count + 1; countp < count + DIGIT_MAX; ++countp)
+	*countp += countp[-1];
+
+      /* Now, drop the pointers into their correct locations.  */
+      for (pointerp = pointers + n - 1; pointerp >= pointers; --pointerp)
+	work[--count[((digit_t *) pointerp)[j]]] = *pointerp;
+
+      /* Swap WORK and POINTERS so that POINTERS contains the sorted
+	 array.  */
+      pointerp = pointers;
+      pointers = work;
+      work = pointerp;
+    }
+}
+
+/* Everything below here is a unit test for the routines in this
+   file.  */
+
+#ifdef UNIT_TEST
+
+#include <stdio.h>
+
+void *xmalloc (size_t n)
+{
+  return malloc (n);
+}
+
+int main (int argc, char **argv)
+{
+  int k;
+  int result;
+  size_t i;
+  void **pointers;
+  void **work;
+
+  if (argc > 1)
+    k = atoi (argv[1]);
+  else
+    k = 10;
+
+  pointers = XNEWVEC (void*, k);
+  work = XNEWVEC (void*, k);
+
+  for (i = 0; i < k; ++i)
+    {
+      pointers[i] = (void *) random ();
+      printf ("%x\n", pointers[i]);
+    }
+
+  sort_pointers (k, pointers, work);
+
+  printf ("\nSorted\n\n");
+
+  result = 0;
+
+  for (i = 0; i < k; ++i)
+    {
+      printf ("%x\n", pointers[i]);
+      if (i > 0 && (char*) pointers[i] < (char*) pointers[i - 1])
+	result = 1;
+    }
+
+  free (pointers);
+  free (work);
+
+  return result;
+}
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/spaces.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/spaces.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/spaces.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/spaces.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,69 @@
+/* Allocate memory region filled with spaces.
+   Copyright (C) 1991 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/*
+
+@deftypefn Extension char* spaces (int @var{count})
+
+Returns a pointer to a memory region filled with the specified
+number of spaces and null terminated.  The returned pointer is
+valid until at least the next call.
+
+@end deftypefn
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "ansidecl.h"
+#include "libiberty.h"
+
+#if VMS
+#include <stdlib.h>
+#include <unixlib.h>
+#else
+/* For systems with larger pointers than ints, these must be declared.  */
+extern PTR malloc (size_t);
+extern void free (PTR);
+#endif
+
+const char *
+spaces (int count)
+{
+  register char *t;
+  static char *buf;
+  static int maxsize;
+
+  if (count > maxsize)
+    {
+      free (buf);
+      buf = (char *) malloc (count + 1);
+      if (buf == (char *) 0)
+	return 0;
+      for (t = buf + count ; t != buf ; )
+	{
+	  *--t = ' ';
+	}
+      maxsize = count;
+      buf[count] = '\0';
+    }
+  return (const char *) (buf + maxsize - count);
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/splay-tree.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/splay-tree.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/splay-tree.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/splay-tree.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,593 @@
+/* A splay-tree datatype.  
+   Copyright (C) 1998, 1999, 2000, 2001, 2009,
+   2010, 2011 Free Software Foundation, Inc.
+   Contributed by Mark Mitchell (mark@markmitchell.com).
+
+This file is part of GNU CC.
+   
+GNU CC is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU CC 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 GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/* For an easily readable description of splay-trees, see:
+
+     Lewis, Harry R. and Denenberg, Larry.  Data Structures and Their
+     Algorithms.  Harper-Collins, Inc.  1991.  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#include <stdio.h>
+
+#include "libiberty.h"
+#include "splay-tree.h"
+
+static void splay_tree_delete_helper (splay_tree, splay_tree_node);
+static inline void rotate_left (splay_tree_node *,
+				splay_tree_node, splay_tree_node);
+static inline void rotate_right (splay_tree_node *,
+				splay_tree_node, splay_tree_node);
+static void splay_tree_splay (splay_tree, splay_tree_key);
+static int splay_tree_foreach_helper (splay_tree_node,
+                                      splay_tree_foreach_fn, void*);
+
+/* Deallocate NODE (a member of SP), and all its sub-trees.  */
+
+static void 
+splay_tree_delete_helper (splay_tree sp, splay_tree_node node)
+{
+  splay_tree_node pending = 0;
+  splay_tree_node active = 0;
+
+  if (!node)
+    return;
+
+#define KDEL(x)  if (sp->delete_key) (*sp->delete_key)(x);
+#define VDEL(x)  if (sp->delete_value) (*sp->delete_value)(x);
+
+  KDEL (node->key);
+  VDEL (node->value);
+
+  /* We use the "key" field to hold the "next" pointer.  */
+  node->key = (splay_tree_key)pending;
+  pending = (splay_tree_node)node;
+
+  /* Now, keep processing the pending list until there aren't any
+     more.  This is a little more complicated than just recursing, but
+     it doesn't toast the stack for large trees.  */
+
+  while (pending)
+    {
+      active = pending;
+      pending = 0;
+      while (active)
+	{
+	  splay_tree_node temp;
+
+	  /* active points to a node which has its key and value
+	     deallocated, we just need to process left and right.  */
+
+	  if (active->left)
+	    {
+	      KDEL (active->left->key);
+	      VDEL (active->left->value);
+	      active->left->key = (splay_tree_key)pending;
+	      pending = (splay_tree_node)(active->left);
+	    }
+	  if (active->right)
+	    {
+	      KDEL (active->right->key);
+	      VDEL (active->right->value);
+	      active->right->key = (splay_tree_key)pending;
+	      pending = (splay_tree_node)(active->right);
+	    }
+
+	  temp = active;
+	  active = (splay_tree_node)(temp->key);
+	  (*sp->deallocate) ((char*) temp, sp->allocate_data);
+	}
+    }
+#undef KDEL
+#undef VDEL
+}
+
+/* Rotate the edge joining the left child N with its parent P.  PP is the
+   grandparents' pointer to P.  */
+
+static inline void
+rotate_left (splay_tree_node *pp, splay_tree_node p, splay_tree_node n)
+{
+  splay_tree_node tmp;
+  tmp = n->right;
+  n->right = p;
+  p->left = tmp;
+  *pp = n;
+}
+
+/* Rotate the edge joining the right child N with its parent P.  PP is the
+   grandparents' pointer to P.  */
+
+static inline void
+rotate_right (splay_tree_node *pp, splay_tree_node p, splay_tree_node n)
+{
+  splay_tree_node tmp;
+  tmp = n->left;
+  n->left = p;
+  p->right = tmp;
+  *pp = n;
+}
+
+/* Bottom up splay of key.  */
+
+static void
+splay_tree_splay (splay_tree sp, splay_tree_key key)
+{
+  if (sp->root == 0)
+    return;
+
+  do {
+    int cmp1, cmp2;
+    splay_tree_node n, c;
+
+    n = sp->root;
+    cmp1 = (*sp->comp) (key, n->key);
+
+    /* Found.  */
+    if (cmp1 == 0)
+      return;
+
+    /* Left or right?  If no child, then we're done.  */
+    if (cmp1 < 0)
+      c = n->left;
+    else
+      c = n->right;
+    if (!c)
+      return;
+
+    /* Next one left or right?  If found or no child, we're done
+       after one rotation.  */
+    cmp2 = (*sp->comp) (key, c->key);
+    if (cmp2 == 0
+        || (cmp2 < 0 && !c->left)
+        || (cmp2 > 0 && !c->right))
+      {
+	if (cmp1 < 0)
+	  rotate_left (&sp->root, n, c);
+	else
+	  rotate_right (&sp->root, n, c);
+        return;
+      }
+
+    /* Now we have the four cases of double-rotation.  */
+    if (cmp1 < 0 && cmp2 < 0)
+      {
+	rotate_left (&n->left, c, c->left);
+	rotate_left (&sp->root, n, n->left);
+      }
+    else if (cmp1 > 0 && cmp2 > 0)
+      {
+	rotate_right (&n->right, c, c->right);
+	rotate_right (&sp->root, n, n->right);
+      }
+    else if (cmp1 < 0 && cmp2 > 0)
+      {
+	rotate_right (&n->left, c, c->right);
+	rotate_left (&sp->root, n, n->left);
+      }
+    else if (cmp1 > 0 && cmp2 < 0)
+      {
+	rotate_left (&n->right, c, c->left);
+	rotate_right (&sp->root, n, n->right);
+      }
+  } while (1);
+}
+
+/* Call FN, passing it the DATA, for every node below NODE, all of
+   which are from SP, following an in-order traversal.  If FN every
+   returns a non-zero value, the iteration ceases immediately, and the
+   value is returned.  Otherwise, this function returns 0.  */
+
+static int
+splay_tree_foreach_helper (splay_tree_node node,
+                           splay_tree_foreach_fn fn, void *data)
+{
+  int val;
+  splay_tree_node *stack;
+  int stack_ptr, stack_size;
+
+  /* A non-recursive implementation is used to avoid filling the stack
+     for large trees.  Splay trees are worst case O(n) in the depth of
+     the tree.  */
+
+#define INITIAL_STACK_SIZE 100
+  stack_size = INITIAL_STACK_SIZE;
+  stack_ptr = 0;
+  stack = XNEWVEC (splay_tree_node, stack_size);
+  val = 0;
+
+  for (;;)
+    {
+      while (node != NULL)
+	{
+	  if (stack_ptr == stack_size)
+	    {
+	      stack_size *= 2;
+	      stack = XRESIZEVEC (splay_tree_node, stack, stack_size);
+	    }
+	  stack[stack_ptr++] = node;
+	  node = node->left;
+	}
+
+      if (stack_ptr == 0)
+	break;
+
+      node = stack[--stack_ptr];
+
+      val = (*fn) (node, data);
+      if (val)
+	break;
+
+      node = node->right;
+    }
+
+  XDELETEVEC (stack);
+  return val;
+}
+
+/* An allocator and deallocator based on xmalloc.  */
+static void *
+splay_tree_xmalloc_allocate (int size, void *data ATTRIBUTE_UNUSED)
+{
+  return (void *) xmalloc (size);
+}
+
+static void
+splay_tree_xmalloc_deallocate (void *object, void *data ATTRIBUTE_UNUSED)
+{
+  free (object);
+}
+
+
+/* Allocate a new splay tree, using COMPARE_FN to compare nodes,
+   DELETE_KEY_FN to deallocate keys, and DELETE_VALUE_FN to deallocate
+   values.  Use xmalloc to allocate the splay tree structure, and any
+   nodes added.  */
+
+splay_tree 
+splay_tree_new (splay_tree_compare_fn compare_fn,
+                splay_tree_delete_key_fn delete_key_fn,
+                splay_tree_delete_value_fn delete_value_fn)
+{
+  return (splay_tree_new_with_allocator
+          (compare_fn, delete_key_fn, delete_value_fn,
+           splay_tree_xmalloc_allocate, splay_tree_xmalloc_deallocate, 0));
+}
+
+
+/* Allocate a new splay tree, using COMPARE_FN to compare nodes,
+   DELETE_KEY_FN to deallocate keys, and DELETE_VALUE_FN to deallocate
+   values.  */
+
+splay_tree 
+splay_tree_new_with_allocator (splay_tree_compare_fn compare_fn,
+                               splay_tree_delete_key_fn delete_key_fn,
+                               splay_tree_delete_value_fn delete_value_fn,
+                               splay_tree_allocate_fn allocate_fn,
+                               splay_tree_deallocate_fn deallocate_fn,
+                               void *allocate_data)
+{
+  return
+    splay_tree_new_typed_alloc (compare_fn, delete_key_fn, delete_value_fn,
+				allocate_fn, allocate_fn, deallocate_fn,
+				allocate_data);
+}
+
+/*
+
+@deftypefn Supplemental splay_tree splay_tree_new_with_typed_alloc @
+(splay_tree_compare_fn @var{compare_fn}, @
+splay_tree_delete_key_fn @var{delete_key_fn}, @
+splay_tree_delete_value_fn @var{delete_value_fn}, @
+splay_tree_allocate_fn @var{tree_allocate_fn}, @
+splay_tree_allocate_fn @var{node_allocate_fn}, @
+splay_tree_deallocate_fn @var{deallocate_fn}, @
+void * @var{allocate_data})
+
+This function creates a splay tree that uses two different allocators
+@var{tree_allocate_fn} and @var{node_allocate_fn} to use for allocating the
+tree itself and its nodes respectively.  This is useful when variables of
+different types need to be allocated with different allocators.
+
+The splay tree will use @var{compare_fn} to compare nodes,
+@var{delete_key_fn} to deallocate keys, and @var{delete_value_fn} to
+deallocate values.
+
+@end deftypefn
+
+*/
+
+splay_tree
+splay_tree_new_typed_alloc (splay_tree_compare_fn compare_fn,
+			    splay_tree_delete_key_fn delete_key_fn,
+			    splay_tree_delete_value_fn delete_value_fn,
+			    splay_tree_allocate_fn tree_allocate_fn,
+			    splay_tree_allocate_fn node_allocate_fn,
+			    splay_tree_deallocate_fn deallocate_fn,
+			    void * allocate_data)
+{
+  splay_tree sp = (splay_tree) (*tree_allocate_fn)
+    (sizeof (struct splay_tree_s), allocate_data);
+
+  sp->root = 0;
+  sp->comp = compare_fn;
+  sp->delete_key = delete_key_fn;
+  sp->delete_value = delete_value_fn;
+  sp->allocate = node_allocate_fn;
+  sp->deallocate = deallocate_fn;
+  sp->allocate_data = allocate_data;
+
+  return sp;
+}
+
+/* Deallocate SP.  */
+
+void 
+splay_tree_delete (splay_tree sp)
+{
+  splay_tree_delete_helper (sp, sp->root);
+  (*sp->deallocate) ((char*) sp, sp->allocate_data);
+}
+
+/* Insert a new node (associating KEY with DATA) into SP.  If a
+   previous node with the indicated KEY exists, its data is replaced
+   with the new value.  Returns the new node.  */
+
+splay_tree_node
+splay_tree_insert (splay_tree sp, splay_tree_key key, splay_tree_value value)
+{
+  int comparison = 0;
+
+  splay_tree_splay (sp, key);
+
+  if (sp->root)
+    comparison = (*sp->comp)(sp->root->key, key);
+
+  if (sp->root && comparison == 0)
+    {
+      /* If the root of the tree already has the indicated KEY, just
+	 replace the value with VALUE.  */
+      if (sp->delete_value)
+	(*sp->delete_value)(sp->root->value);
+      sp->root->value = value;
+    } 
+  else 
+    {
+      /* Create a new node, and insert it at the root.  */
+      splay_tree_node node;
+
+      node = ((splay_tree_node)
+	      (*sp->allocate) (sizeof (struct splay_tree_node_s),
+			       sp->allocate_data));
+      node->key = key;
+      node->value = value;
+      
+      if (!sp->root)
+	node->left = node->right = 0;
+      else if (comparison < 0)
+	{
+	  node->left = sp->root;
+	  node->right = node->left->right;
+	  node->left->right = 0;
+	}
+      else
+	{
+	  node->right = sp->root;
+	  node->left = node->right->left;
+	  node->right->left = 0;
+	}
+
+      sp->root = node;
+    }
+
+  return sp->root;
+}
+
+/* Remove KEY from SP.  It is not an error if it did not exist.  */
+
+void
+splay_tree_remove (splay_tree sp, splay_tree_key key)
+{
+  splay_tree_splay (sp, key);
+
+  if (sp->root && (*sp->comp) (sp->root->key, key) == 0)
+    {
+      splay_tree_node left, right;
+
+      left = sp->root->left;
+      right = sp->root->right;
+
+      /* Delete the root node itself.  */
+      if (sp->delete_value)
+	(*sp->delete_value) (sp->root->value);
+      (*sp->deallocate) (sp->root, sp->allocate_data);
+
+      /* One of the children is now the root.  Doesn't matter much
+	 which, so long as we preserve the properties of the tree.  */
+      if (left)
+	{
+	  sp->root = left;
+
+	  /* If there was a right child as well, hang it off the 
+	     right-most leaf of the left child.  */
+	  if (right)
+	    {
+	      while (left->right)
+		left = left->right;
+	      left->right = right;
+	    }
+	}
+      else
+	sp->root = right;
+    }
+}
+
+/* Lookup KEY in SP, returning VALUE if present, and NULL 
+   otherwise.  */
+
+splay_tree_node
+splay_tree_lookup (splay_tree sp, splay_tree_key key)
+{
+  splay_tree_splay (sp, key);
+
+  if (sp->root && (*sp->comp)(sp->root->key, key) == 0)
+    return sp->root;
+  else
+    return 0;
+}
+
+/* Return the node in SP with the greatest key.  */
+
+splay_tree_node
+splay_tree_max (splay_tree sp)
+{
+  splay_tree_node n = sp->root;
+
+  if (!n)
+    return NULL;
+
+  while (n->right)
+    n = n->right;
+
+  return n;
+}
+
+/* Return the node in SP with the smallest key.  */
+
+splay_tree_node
+splay_tree_min (splay_tree sp)
+{
+  splay_tree_node n = sp->root;
+
+  if (!n)
+    return NULL;
+
+  while (n->left)
+    n = n->left;
+
+  return n;
+}
+
+/* Return the immediate predecessor KEY, or NULL if there is no
+   predecessor.  KEY need not be present in the tree.  */
+
+splay_tree_node
+splay_tree_predecessor (splay_tree sp, splay_tree_key key)
+{
+  int comparison;
+  splay_tree_node node;
+
+  /* If the tree is empty, there is certainly no predecessor.  */
+  if (!sp->root)
+    return NULL;
+
+  /* Splay the tree around KEY.  That will leave either the KEY
+     itself, its predecessor, or its successor at the root.  */
+  splay_tree_splay (sp, key);
+  comparison = (*sp->comp)(sp->root->key, key);
+
+  /* If the predecessor is at the root, just return it.  */
+  if (comparison < 0)
+    return sp->root;
+
+  /* Otherwise, find the rightmost element of the left subtree.  */
+  node = sp->root->left;
+  if (node)
+    while (node->right)
+      node = node->right;
+
+  return node;
+}
+
+/* Return the immediate successor KEY, or NULL if there is no
+   successor.  KEY need not be present in the tree.  */
+
+splay_tree_node
+splay_tree_successor (splay_tree sp, splay_tree_key key)
+{
+  int comparison;
+  splay_tree_node node;
+
+  /* If the tree is empty, there is certainly no successor.  */
+  if (!sp->root)
+    return NULL;
+
+  /* Splay the tree around KEY.  That will leave either the KEY
+     itself, its predecessor, or its successor at the root.  */
+  splay_tree_splay (sp, key);
+  comparison = (*sp->comp)(sp->root->key, key);
+
+  /* If the successor is at the root, just return it.  */
+  if (comparison > 0)
+    return sp->root;
+
+  /* Otherwise, find the leftmost element of the right subtree.  */
+  node = sp->root->right;
+  if (node)
+    while (node->left)
+      node = node->left;
+
+  return node;
+}
+
+/* Call FN, passing it the DATA, for every node in SP, following an
+   in-order traversal.  If FN every returns a non-zero value, the
+   iteration ceases immediately, and the value is returned.
+   Otherwise, this function returns 0.  */
+
+int
+splay_tree_foreach (splay_tree sp, splay_tree_foreach_fn fn, void *data)
+{
+  return splay_tree_foreach_helper (sp->root, fn, data);
+}
+
+/* Splay-tree comparison function, treating the keys as ints.  */
+
+int
+splay_tree_compare_ints (splay_tree_key k1, splay_tree_key k2)
+{
+  if ((int) k1 < (int) k2)
+    return -1;
+  else if ((int) k1 > (int) k2)
+    return 1;
+  else 
+    return 0;
+}
+
+/* Splay-tree comparison function, treating the keys as pointers.  */
+
+int
+splay_tree_compare_pointers (splay_tree_key k1, splay_tree_key k2)
+{
+  if ((char*) k1 < (char*) k2)
+    return -1;
+  else if ((char*) k1 > (char*) k2)
+    return 1;
+  else 
+    return 0;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/stack-limit.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/stack-limit.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/stack-limit.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/stack-limit.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,62 @@
+/* Increase stack size limit if possible.
+   Copyright (C) 2011 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.  This library is free
+software; you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This library 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 GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.
+
+As a special exception, if you link this library with files
+compiled with a GNU compiler to produce an executable, this does not cause
+the resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why
+the executable file might be covered by the GNU General Public License. */
+
+/*
+
+@deftypefn Extension void stack_limit_increase (unsigned long @var{pref})
+
+Attempt to increase stack size limit to @var{pref} bytes if possible.
+
+@end deftypefn
+
+*/
+
+#include "config.h"
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+
+void
+stack_limit_increase (unsigned long pref)
+{
+#if defined(HAVE_SETRLIMIT) && defined(HAVE_GETRLIMIT) \
+    && defined(RLIMIT_STACK) && defined(RLIM_INFINITY)
+  struct rlimit rlim;
+  if (getrlimit (RLIMIT_STACK, &rlim) == 0
+      && rlim.rlim_cur != RLIM_INFINITY
+      && rlim.rlim_cur < pref
+      && (rlim.rlim_max == RLIM_INFINITY || rlim.rlim_cur < rlim.rlim_max))
+    {
+      rlim.rlim_cur = pref;
+      if (rlim.rlim_max != RLIM_INFINITY && rlim.rlim_cur > rlim.rlim_max)
+	rlim.rlim_cur = rlim.rlim_max;
+      setrlimit (RLIMIT_STACK, &rlim);
+    }
+#endif
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/stpcpy.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/stpcpy.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/stpcpy.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/stpcpy.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,43 @@
+/* Implement the stpcpy function.
+   Copyright (C) 2003 Free Software Foundation, Inc.
+   Written by Kaveh R. Ghazi <ghazi@caip.rutgers.edu>.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/*
+
+@deftypefn Supplemental char* stpcpy (char *@var{dst}, const char *@var{src})
+
+Copies the string @var{src} into @var{dst}.  Returns a pointer to
+@var{dst} + strlen(@var{src}).
+
+@end deftypefn
+
+*/
+
+#include <ansidecl.h>
+#include <stddef.h>
+
+extern size_t strlen (const char *);
+extern PTR memcpy (PTR, const PTR, size_t);
+
+char *
+stpcpy (char *dst, const char *src)
+{
+  const size_t len = strlen (src);
+  return (char *) memcpy (dst, src, len + 1) + len;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/stpncpy.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/stpncpy.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/stpncpy.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/stpncpy.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,48 @@
+/* Implement the stpncpy function.
+   Copyright (C) 2003, 2011 Free Software Foundation, Inc.
+   Written by Kaveh R. Ghazi <ghazi@caip.rutgers.edu>.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/*
+
+@deftypefn Supplemental char* stpncpy (char *@var{dst}, const char *@var{src}, @
+  size_t @var{len})
+
+Copies the string @var{src} into @var{dst}, copying exactly @var{len}
+and padding with zeros if necessary.  If @var{len} < strlen(@var{src})
+then return @var{dst} + @var{len}, otherwise returns @var{dst} +
+strlen(@var{src}).
+
+@end deftypefn
+
+*/
+
+#include <ansidecl.h>
+#include <stddef.h>
+
+extern size_t strlen (const char *);
+extern char *strncpy (char *, const char *, size_t);
+
+char *
+stpncpy (char *dst, const char *src, size_t len)
+{
+  size_t n = strlen (src);
+  if (n > len)
+    n = len;
+  return strncpy (dst, src, len) + n;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strcasecmp.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strcasecmp.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strcasecmp.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strcasecmp.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 1987 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific written prior permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ */
+
+/*
+  
+@deftypefn Supplemental int strcasecmp (const char *@var{s1}, const char *@var{s2})
+
+A case-insensitive @code{strcmp}.
+
+@end deftypefn
+
+*/
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)strcasecmp.c	5.5 (Berkeley) 11/24/87";
+#endif /* LIBC_SCCS and not lint */
+
+#include <ansidecl.h>
+#include <stddef.h>
+
+/*
+ * This array is designed for mapping upper and lower case letter
+ * together for a case independent comparison.  The mappings are
+ * based upon ascii character sequences.
+ */
+typedef unsigned char uc;
+static const unsigned char charmap[] = {
+	(uc)'\000',(uc)'\001',(uc)'\002',(uc)'\003',(uc)'\004',(uc)'\005',(uc)'\006',(uc)'\007',
+	(uc)'\010',(uc)'\011',(uc)'\012',(uc)'\013',(uc)'\014',(uc)'\015',(uc)'\016',(uc)'\017',
+	(uc)'\020',(uc)'\021',(uc)'\022',(uc)'\023',(uc)'\024',(uc)'\025',(uc)'\026',(uc)'\027',
+	(uc)'\030',(uc)'\031',(uc)'\032',(uc)'\033',(uc)'\034',(uc)'\035',(uc)'\036',(uc)'\037',
+	(uc)'\040',(uc)'\041',(uc)'\042',(uc)'\043',(uc)'\044',(uc)'\045',(uc)'\046',(uc)'\047',
+	(uc)'\050',(uc)'\051',(uc)'\052',(uc)'\053',(uc)'\054',(uc)'\055',(uc)'\056',(uc)'\057',
+	(uc)'\060',(uc)'\061',(uc)'\062',(uc)'\063',(uc)'\064',(uc)'\065',(uc)'\066',(uc)'\067',
+	(uc)'\070',(uc)'\071',(uc)'\072',(uc)'\073',(uc)'\074',(uc)'\075',(uc)'\076',(uc)'\077',
+	(uc)'\100',(uc)'\141',(uc)'\142',(uc)'\143',(uc)'\144',(uc)'\145',(uc)'\146',(uc)'\147',
+	(uc)'\150',(uc)'\151',(uc)'\152',(uc)'\153',(uc)'\154',(uc)'\155',(uc)'\156',(uc)'\157',
+	(uc)'\160',(uc)'\161',(uc)'\162',(uc)'\163',(uc)'\164',(uc)'\165',(uc)'\166',(uc)'\167',
+	(uc)'\170',(uc)'\171',(uc)'\172',(uc)'\133',(uc)'\134',(uc)'\135',(uc)'\136',(uc)'\137',
+	(uc)'\140',(uc)'\141',(uc)'\142',(uc)'\143',(uc)'\144',(uc)'\145',(uc)'\146',(uc)'\147',
+	(uc)'\150',(uc)'\151',(uc)'\152',(uc)'\153',(uc)'\154',(uc)'\155',(uc)'\156',(uc)'\157',
+	(uc)'\160',(uc)'\161',(uc)'\162',(uc)'\163',(uc)'\164',(uc)'\165',(uc)'\166',(uc)'\167',
+	(uc)'\170',(uc)'\171',(uc)'\172',(uc)'\173',(uc)'\174',(uc)'\175',(uc)'\176',(uc)'\177',
+	(uc)'\200',(uc)'\201',(uc)'\202',(uc)'\203',(uc)'\204',(uc)'\205',(uc)'\206',(uc)'\207',
+	(uc)'\210',(uc)'\211',(uc)'\212',(uc)'\213',(uc)'\214',(uc)'\215',(uc)'\216',(uc)'\217',
+	(uc)'\220',(uc)'\221',(uc)'\222',(uc)'\223',(uc)'\224',(uc)'\225',(uc)'\226',(uc)'\227',
+	(uc)'\230',(uc)'\231',(uc)'\232',(uc)'\233',(uc)'\234',(uc)'\235',(uc)'\236',(uc)'\237',
+	(uc)'\240',(uc)'\241',(uc)'\242',(uc)'\243',(uc)'\244',(uc)'\245',(uc)'\246',(uc)'\247',
+	(uc)'\250',(uc)'\251',(uc)'\252',(uc)'\253',(uc)'\254',(uc)'\255',(uc)'\256',(uc)'\257',
+	(uc)'\260',(uc)'\261',(uc)'\262',(uc)'\263',(uc)'\264',(uc)'\265',(uc)'\266',(uc)'\267',
+	(uc)'\270',(uc)'\271',(uc)'\272',(uc)'\273',(uc)'\274',(uc)'\275',(uc)'\276',(uc)'\277',
+	(uc)'\300',(uc)'\341',(uc)'\342',(uc)'\343',(uc)'\344',(uc)'\345',(uc)'\346',(uc)'\347',
+	(uc)'\350',(uc)'\351',(uc)'\352',(uc)'\353',(uc)'\354',(uc)'\355',(uc)'\356',(uc)'\357',
+	(uc)'\360',(uc)'\361',(uc)'\362',(uc)'\363',(uc)'\364',(uc)'\365',(uc)'\366',(uc)'\367',
+	(uc)'\370',(uc)'\371',(uc)'\372',(uc)'\333',(uc)'\334',(uc)'\335',(uc)'\336',(uc)'\337',
+	(uc)'\340',(uc)'\341',(uc)'\342',(uc)'\343',(uc)'\344',(uc)'\345',(uc)'\346',(uc)'\347',
+	(uc)'\350',(uc)'\351',(uc)'\352',(uc)'\353',(uc)'\354',(uc)'\355',(uc)'\356',(uc)'\357',
+	(uc)'\360',(uc)'\361',(uc)'\362',(uc)'\363',(uc)'\364',(uc)'\365',(uc)'\366',(uc)'\367',
+	(uc)'\370',(uc)'\371',(uc)'\372',(uc)'\373',(uc)'\374',(uc)'\375',(uc)'\376',(uc)'\377',
+};
+
+int
+strcasecmp(const char *s1, const char *s2)
+{
+    register unsigned char u1, u2;
+
+    for (;;) {
+	u1 = (unsigned char) *s1++;
+	u2 = (unsigned char) *s2++;
+	if (charmap[u1] != charmap[u2]) {
+	    return charmap[u1] - charmap[u2];
+	}
+	if (u1 == '\0') {
+	    return 0;
+	}
+    }
+}
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strchr.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strchr.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strchr.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strchr.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,28 @@
+/* Portable version of strchr()
+   This function is in the public domain.  */
+
+/*
+
+@deftypefn Supplemental char* strchr (const char *@var{s}, int @var{c})
+
+Returns a pointer to the first occurrence of the character @var{c} in
+the string @var{s}, or @code{NULL} if not found.  If @var{c} is itself the
+null character, the results are undefined.
+
+@end deftypefn
+
+*/
+
+#include <ansidecl.h>
+
+char *
+strchr (register const char *s, int c)
+{
+  do {
+    if (*s == c)
+      {
+	return (char*)s;
+      }
+  } while (*s++);
+  return (0);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strdup.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strdup.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strdup.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strdup.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,27 @@
+/*
+
+@deftypefn Supplemental char* strdup (const char *@var{s})
+
+Returns a pointer to a copy of @var{s} in memory obtained from
+@code{malloc}, or @code{NULL} if insufficient memory was available.
+
+@end deftypefn
+
+*/
+
+#include <ansidecl.h>
+#include <stddef.h>
+
+extern size_t	strlen (const char*);
+extern PTR	malloc (size_t);
+extern PTR	memcpy (PTR, const PTR, size_t);
+
+char *
+strdup(const char *s)
+{
+  size_t len = strlen (s) + 1;
+  char *result = (char*) malloc (len);
+  if (result == (char*) 0)
+    return (char*) 0;
+  return (char*) memcpy (result, s, len);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strerror.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strerror.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strerror.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strerror.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,809 @@
+/* Extended support for using errno values.
+   Written by Fred Fish.  fnf@cygnus.com
+   This file is in the public domain.  --Per Bothner.  */
+
+#include "config.h"
+
+#ifdef HAVE_SYS_ERRLIST
+/* Note that errno.h (not sure what OS) or stdio.h (BSD 4.4, at least)
+   might declare sys_errlist in a way that the compiler might consider
+   incompatible with our later declaration, perhaps by using const
+   attributes.  So we hide the declaration in errno.h (if any) using a
+   macro. */
+#define sys_nerr sys_nerr__
+#define sys_errlist sys_errlist__
+#endif
+
+#include "ansidecl.h"
+#include "libiberty.h"
+
+#include <stdio.h>
+#include <errno.h>
+
+#ifdef HAVE_SYS_ERRLIST
+#undef sys_nerr
+#undef sys_errlist
+#endif
+
+/*  Routines imported from standard C runtime libraries. */
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#else
+extern PTR malloc ();
+#endif
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+extern PTR memset ();
+#endif
+
+#ifndef MAX
+#  define MAX(a,b) ((a) > (b) ? (a) : (b))
+#endif
+
+static void init_error_tables (void);
+
+/* Translation table for errno values.  See intro(2) in most UNIX systems
+   Programmers Reference Manuals.
+
+   Note that this table is generally only accessed when it is used at runtime
+   to initialize errno name and message tables that are indexed by errno
+   value.
+
+   Not all of these errnos will exist on all systems.  This table is the only
+   thing that should have to be updated as new error numbers are introduced.
+   It's sort of ugly, but at least its portable. */
+
+struct error_info
+{
+  const int value;		/* The numeric value from <errno.h> */
+  const char *const name;	/* The equivalent symbolic value */
+#ifndef HAVE_SYS_ERRLIST
+  const char *const msg;	/* Short message about this value */
+#endif
+};
+
+#ifndef HAVE_SYS_ERRLIST
+#   define ENTRY(value, name, msg)	{value, name, msg}
+#else
+#   define ENTRY(value, name, msg)	{value, name}
+#endif
+
+static const struct error_info error_table[] =
+{
+#if defined (EPERM)
+  ENTRY(EPERM, "EPERM", "Not owner"),
+#endif
+#if defined (ENOENT)
+  ENTRY(ENOENT, "ENOENT", "No such file or directory"),
+#endif
+#if defined (ESRCH)
+  ENTRY(ESRCH, "ESRCH", "No such process"),
+#endif
+#if defined (EINTR)
+  ENTRY(EINTR, "EINTR", "Interrupted system call"),
+#endif
+#if defined (EIO)
+  ENTRY(EIO, "EIO", "I/O error"),
+#endif
+#if defined (ENXIO)
+  ENTRY(ENXIO, "ENXIO", "No such device or address"),
+#endif
+#if defined (E2BIG)
+  ENTRY(E2BIG, "E2BIG", "Arg list too long"),
+#endif
+#if defined (ENOEXEC)
+  ENTRY(ENOEXEC, "ENOEXEC", "Exec format error"),
+#endif
+#if defined (EBADF)
+  ENTRY(EBADF, "EBADF", "Bad file number"),
+#endif
+#if defined (ECHILD)
+  ENTRY(ECHILD, "ECHILD", "No child processes"),
+#endif
+#if defined (EWOULDBLOCK)	/* Put before EAGAIN, sometimes aliased */
+  ENTRY(EWOULDBLOCK, "EWOULDBLOCK", "Operation would block"),
+#endif
+#if defined (EAGAIN)
+  ENTRY(EAGAIN, "EAGAIN", "No more processes"),
+#endif
+#if defined (ENOMEM)
+  ENTRY(ENOMEM, "ENOMEM", "Not enough space"),
+#endif
+#if defined (EACCES)
+  ENTRY(EACCES, "EACCES", "Permission denied"),
+#endif
+#if defined (EFAULT)
+  ENTRY(EFAULT, "EFAULT", "Bad address"),
+#endif
+#if defined (ENOTBLK)
+  ENTRY(ENOTBLK, "ENOTBLK", "Block device required"),
+#endif
+#if defined (EBUSY)
+  ENTRY(EBUSY, "EBUSY", "Device busy"),
+#endif
+#if defined (EEXIST)
+  ENTRY(EEXIST, "EEXIST", "File exists"),
+#endif
+#if defined (EXDEV)
+  ENTRY(EXDEV, "EXDEV", "Cross-device link"),
+#endif
+#if defined (ENODEV)
+  ENTRY(ENODEV, "ENODEV", "No such device"),
+#endif
+#if defined (ENOTDIR)
+  ENTRY(ENOTDIR, "ENOTDIR", "Not a directory"),
+#endif
+#if defined (EISDIR)
+  ENTRY(EISDIR, "EISDIR", "Is a directory"),
+#endif
+#if defined (EINVAL)
+  ENTRY(EINVAL, "EINVAL", "Invalid argument"),
+#endif
+#if defined (ENFILE)
+  ENTRY(ENFILE, "ENFILE", "File table overflow"),
+#endif
+#if defined (EMFILE)
+  ENTRY(EMFILE, "EMFILE", "Too many open files"),
+#endif
+#if defined (ENOTTY)
+  ENTRY(ENOTTY, "ENOTTY", "Not a typewriter"),
+#endif
+#if defined (ETXTBSY)
+  ENTRY(ETXTBSY, "ETXTBSY", "Text file busy"),
+#endif
+#if defined (EFBIG)
+  ENTRY(EFBIG, "EFBIG", "File too large"),
+#endif
+#if defined (ENOSPC)
+  ENTRY(ENOSPC, "ENOSPC", "No space left on device"),
+#endif
+#if defined (ESPIPE)
+  ENTRY(ESPIPE, "ESPIPE", "Illegal seek"),
+#endif
+#if defined (EROFS)
+  ENTRY(EROFS, "EROFS", "Read-only file system"),
+#endif
+#if defined (EMLINK)
+  ENTRY(EMLINK, "EMLINK", "Too many links"),
+#endif
+#if defined (EPIPE)
+  ENTRY(EPIPE, "EPIPE", "Broken pipe"),
+#endif
+#if defined (EDOM)
+  ENTRY(EDOM, "EDOM", "Math argument out of domain of func"),
+#endif
+#if defined (ERANGE)
+  ENTRY(ERANGE, "ERANGE", "Math result not representable"),
+#endif
+#if defined (ENOMSG)
+  ENTRY(ENOMSG, "ENOMSG", "No message of desired type"),
+#endif
+#if defined (EIDRM)
+  ENTRY(EIDRM, "EIDRM", "Identifier removed"),
+#endif
+#if defined (ECHRNG)
+  ENTRY(ECHRNG, "ECHRNG", "Channel number out of range"),
+#endif
+#if defined (EL2NSYNC)
+  ENTRY(EL2NSYNC, "EL2NSYNC", "Level 2 not synchronized"),
+#endif
+#if defined (EL3HLT)
+  ENTRY(EL3HLT, "EL3HLT", "Level 3 halted"),
+#endif
+#if defined (EL3RST)
+  ENTRY(EL3RST, "EL3RST", "Level 3 reset"),
+#endif
+#if defined (ELNRNG)
+  ENTRY(ELNRNG, "ELNRNG", "Link number out of range"),
+#endif
+#if defined (EUNATCH)
+  ENTRY(EUNATCH, "EUNATCH", "Protocol driver not attached"),
+#endif
+#if defined (ENOCSI)
+  ENTRY(ENOCSI, "ENOCSI", "No CSI structure available"),
+#endif
+#if defined (EL2HLT)
+  ENTRY(EL2HLT, "EL2HLT", "Level 2 halted"),
+#endif
+#if defined (EDEADLK)
+  ENTRY(EDEADLK, "EDEADLK", "Deadlock condition"),
+#endif
+#if defined (ENOLCK)
+  ENTRY(ENOLCK, "ENOLCK", "No record locks available"),
+#endif
+#if defined (EBADE)
+  ENTRY(EBADE, "EBADE", "Invalid exchange"),
+#endif
+#if defined (EBADR)
+  ENTRY(EBADR, "EBADR", "Invalid request descriptor"),
+#endif
+#if defined (EXFULL)
+  ENTRY(EXFULL, "EXFULL", "Exchange full"),
+#endif
+#if defined (ENOANO)
+  ENTRY(ENOANO, "ENOANO", "No anode"),
+#endif
+#if defined (EBADRQC)
+  ENTRY(EBADRQC, "EBADRQC", "Invalid request code"),
+#endif
+#if defined (EBADSLT)
+  ENTRY(EBADSLT, "EBADSLT", "Invalid slot"),
+#endif
+#if defined (EDEADLOCK)
+  ENTRY(EDEADLOCK, "EDEADLOCK", "File locking deadlock error"),
+#endif
+#if defined (EBFONT)
+  ENTRY(EBFONT, "EBFONT", "Bad font file format"),
+#endif
+#if defined (ENOSTR)
+  ENTRY(ENOSTR, "ENOSTR", "Device not a stream"),
+#endif
+#if defined (ENODATA)
+  ENTRY(ENODATA, "ENODATA", "No data available"),
+#endif
+#if defined (ETIME)
+  ENTRY(ETIME, "ETIME", "Timer expired"),
+#endif
+#if defined (ENOSR)
+  ENTRY(ENOSR, "ENOSR", "Out of streams resources"),
+#endif
+#if defined (ENONET)
+  ENTRY(ENONET, "ENONET", "Machine is not on the network"),
+#endif
+#if defined (ENOPKG)
+  ENTRY(ENOPKG, "ENOPKG", "Package not installed"),
+#endif
+#if defined (EREMOTE)
+  ENTRY(EREMOTE, "EREMOTE", "Object is remote"),
+#endif
+#if defined (ENOLINK)
+  ENTRY(ENOLINK, "ENOLINK", "Link has been severed"),
+#endif
+#if defined (EADV)
+  ENTRY(EADV, "EADV", "Advertise error"),
+#endif
+#if defined (ESRMNT)
+  ENTRY(ESRMNT, "ESRMNT", "Srmount error"),
+#endif
+#if defined (ECOMM)
+  ENTRY(ECOMM, "ECOMM", "Communication error on send"),
+#endif
+#if defined (EPROTO)
+  ENTRY(EPROTO, "EPROTO", "Protocol error"),
+#endif
+#if defined (EMULTIHOP)
+  ENTRY(EMULTIHOP, "EMULTIHOP", "Multihop attempted"),
+#endif
+#if defined (EDOTDOT)
+  ENTRY(EDOTDOT, "EDOTDOT", "RFS specific error"),
+#endif
+#if defined (EBADMSG)
+  ENTRY(EBADMSG, "EBADMSG", "Not a data message"),
+#endif
+#if defined (ENAMETOOLONG)
+  ENTRY(ENAMETOOLONG, "ENAMETOOLONG", "File name too long"),
+#endif
+#if defined (EOVERFLOW)
+  ENTRY(EOVERFLOW, "EOVERFLOW", "Value too large for defined data type"),
+#endif
+#if defined (ENOTUNIQ)
+  ENTRY(ENOTUNIQ, "ENOTUNIQ", "Name not unique on network"),
+#endif
+#if defined (EBADFD)
+  ENTRY(EBADFD, "EBADFD", "File descriptor in bad state"),
+#endif
+#if defined (EREMCHG)
+  ENTRY(EREMCHG, "EREMCHG", "Remote address changed"),
+#endif
+#if defined (ELIBACC)
+  ENTRY(ELIBACC, "ELIBACC", "Can not access a needed shared library"),
+#endif
+#if defined (ELIBBAD)
+  ENTRY(ELIBBAD, "ELIBBAD", "Accessing a corrupted shared library"),
+#endif
+#if defined (ELIBSCN)
+  ENTRY(ELIBSCN, "ELIBSCN", ".lib section in a.out corrupted"),
+#endif
+#if defined (ELIBMAX)
+  ENTRY(ELIBMAX, "ELIBMAX", "Attempting to link in too many shared libraries"),
+#endif
+#if defined (ELIBEXEC)
+  ENTRY(ELIBEXEC, "ELIBEXEC", "Cannot exec a shared library directly"),
+#endif
+#if defined (EILSEQ)
+  ENTRY(EILSEQ, "EILSEQ", "Illegal byte sequence"),
+#endif
+#if defined (ENOSYS)
+  ENTRY(ENOSYS, "ENOSYS", "Operation not applicable"),
+#endif
+#if defined (ELOOP)
+  ENTRY(ELOOP, "ELOOP", "Too many symbolic links encountered"),
+#endif
+#if defined (ERESTART)
+  ENTRY(ERESTART, "ERESTART", "Interrupted system call should be restarted"),
+#endif
+#if defined (ESTRPIPE)
+  ENTRY(ESTRPIPE, "ESTRPIPE", "Streams pipe error"),
+#endif
+#if defined (ENOTEMPTY)
+  ENTRY(ENOTEMPTY, "ENOTEMPTY", "Directory not empty"),
+#endif
+#if defined (EUSERS)
+  ENTRY(EUSERS, "EUSERS", "Too many users"),
+#endif
+#if defined (ENOTSOCK)
+  ENTRY(ENOTSOCK, "ENOTSOCK", "Socket operation on non-socket"),
+#endif
+#if defined (EDESTADDRREQ)
+  ENTRY(EDESTADDRREQ, "EDESTADDRREQ", "Destination address required"),
+#endif
+#if defined (EMSGSIZE)
+  ENTRY(EMSGSIZE, "EMSGSIZE", "Message too long"),
+#endif
+#if defined (EPROTOTYPE)
+  ENTRY(EPROTOTYPE, "EPROTOTYPE", "Protocol wrong type for socket"),
+#endif
+#if defined (ENOPROTOOPT)
+  ENTRY(ENOPROTOOPT, "ENOPROTOOPT", "Protocol not available"),
+#endif
+#if defined (EPROTONOSUPPORT)
+  ENTRY(EPROTONOSUPPORT, "EPROTONOSUPPORT", "Protocol not supported"),
+#endif
+#if defined (ESOCKTNOSUPPORT)
+  ENTRY(ESOCKTNOSUPPORT, "ESOCKTNOSUPPORT", "Socket type not supported"),
+#endif
+#if defined (EOPNOTSUPP)
+  ENTRY(EOPNOTSUPP, "EOPNOTSUPP", "Operation not supported on transport endpoint"),
+#endif
+#if defined (EPFNOSUPPORT)
+  ENTRY(EPFNOSUPPORT, "EPFNOSUPPORT", "Protocol family not supported"),
+#endif
+#if defined (EAFNOSUPPORT)
+  ENTRY(EAFNOSUPPORT, "EAFNOSUPPORT", "Address family not supported by protocol"),
+#endif
+#if defined (EADDRINUSE)
+  ENTRY(EADDRINUSE, "EADDRINUSE", "Address already in use"),
+#endif
+#if defined (EADDRNOTAVAIL)
+  ENTRY(EADDRNOTAVAIL, "EADDRNOTAVAIL","Cannot assign requested address"),
+#endif
+#if defined (ENETDOWN)
+  ENTRY(ENETDOWN, "ENETDOWN", "Network is down"),
+#endif
+#if defined (ENETUNREACH)
+  ENTRY(ENETUNREACH, "ENETUNREACH", "Network is unreachable"),
+#endif
+#if defined (ENETRESET)
+  ENTRY(ENETRESET, "ENETRESET", "Network dropped connection because of reset"),
+#endif
+#if defined (ECONNABORTED)
+  ENTRY(ECONNABORTED, "ECONNABORTED", "Software caused connection abort"),
+#endif
+#if defined (ECONNRESET)
+  ENTRY(ECONNRESET, "ECONNRESET", "Connection reset by peer"),
+#endif
+#if defined (ENOBUFS)
+  ENTRY(ENOBUFS, "ENOBUFS", "No buffer space available"),
+#endif
+#if defined (EISCONN)
+  ENTRY(EISCONN, "EISCONN", "Transport endpoint is already connected"),
+#endif
+#if defined (ENOTCONN)
+  ENTRY(ENOTCONN, "ENOTCONN", "Transport endpoint is not connected"),
+#endif
+#if defined (ESHUTDOWN)
+  ENTRY(ESHUTDOWN, "ESHUTDOWN", "Cannot send after transport endpoint shutdown"),
+#endif
+#if defined (ETOOMANYREFS)
+  ENTRY(ETOOMANYREFS, "ETOOMANYREFS", "Too many references: cannot splice"),
+#endif
+#if defined (ETIMEDOUT)
+  ENTRY(ETIMEDOUT, "ETIMEDOUT", "Connection timed out"),
+#endif
+#if defined (ECONNREFUSED)
+  ENTRY(ECONNREFUSED, "ECONNREFUSED", "Connection refused"),
+#endif
+#if defined (EHOSTDOWN)
+  ENTRY(EHOSTDOWN, "EHOSTDOWN", "Host is down"),
+#endif
+#if defined (EHOSTUNREACH)
+  ENTRY(EHOSTUNREACH, "EHOSTUNREACH", "No route to host"),
+#endif
+#if defined (EALREADY)
+  ENTRY(EALREADY, "EALREADY", "Operation already in progress"),
+#endif
+#if defined (EINPROGRESS)
+  ENTRY(EINPROGRESS, "EINPROGRESS", "Operation now in progress"),
+#endif
+#if defined (ESTALE)
+  ENTRY(ESTALE, "ESTALE", "Stale NFS file handle"),
+#endif
+#if defined (EUCLEAN)
+  ENTRY(EUCLEAN, "EUCLEAN", "Structure needs cleaning"),
+#endif
+#if defined (ENOTNAM)
+  ENTRY(ENOTNAM, "ENOTNAM", "Not a XENIX named type file"),
+#endif
+#if defined (ENAVAIL)
+  ENTRY(ENAVAIL, "ENAVAIL", "No XENIX semaphores available"),
+#endif
+#if defined (EISNAM)
+  ENTRY(EISNAM, "EISNAM", "Is a named type file"),
+#endif
+#if defined (EREMOTEIO)
+  ENTRY(EREMOTEIO, "EREMOTEIO", "Remote I/O error"),
+#endif
+  ENTRY(0, NULL, NULL)
+};
+
+#ifdef EVMSERR
+/* This is not in the table, because the numeric value of EVMSERR (32767)
+   lies outside the range of sys_errlist[].  */
+static struct { int value; const char *name, *msg; }
+  evmserr = { EVMSERR, "EVMSERR", "VMS-specific error" };
+#endif
+
+/* Translation table allocated and initialized at runtime.  Indexed by the
+   errno value to find the equivalent symbolic value. */
+
+static const char **error_names;
+static int num_error_names = 0;
+
+/* Translation table allocated and initialized at runtime, if it does not
+   already exist in the host environment.  Indexed by the errno value to find
+   the descriptive string.
+
+   We don't export it for use in other modules because even though it has the
+   same name, it differs from other implementations in that it is dynamically
+   initialized rather than statically initialized. */
+
+#ifndef HAVE_SYS_ERRLIST
+
+#define sys_nerr sys_nerr__
+#define sys_errlist sys_errlist__
+static int sys_nerr;
+static const char **sys_errlist;
+
+#else
+
+extern int sys_nerr;
+extern char *sys_errlist[];
+
+#endif
+
+/*
+
+NAME
+
+	init_error_tables -- initialize the name and message tables
+
+SYNOPSIS
+
+	static void init_error_tables ();
+
+DESCRIPTION
+
+	Using the error_table, which is initialized at compile time, generate
+	the error_names and the sys_errlist (if needed) tables, which are
+	indexed at runtime by a specific errno value.
+
+BUGS
+
+	The initialization of the tables may fail under low memory conditions,
+	in which case we don't do anything particularly useful, but we don't
+	bomb either.  Who knows, it might succeed at a later point if we free
+	some memory in the meantime.  In any case, the other routines know
+	how to deal with lack of a table after trying to initialize it.  This
+	may or may not be considered to be a bug, that we don't specifically
+	warn about this particular failure mode.
+
+*/
+
+static void
+init_error_tables (void)
+{
+  const struct error_info *eip;
+  int nbytes;
+
+  /* If we haven't already scanned the error_table once to find the maximum
+     errno value, then go find it now. */
+
+  if (num_error_names == 0)
+    {
+      for (eip = error_table; eip -> name != NULL; eip++)
+	{
+	  if (eip -> value >= num_error_names)
+	    {
+	      num_error_names = eip -> value + 1;
+	    }
+	}
+    }
+
+  /* Now attempt to allocate the error_names table, zero it out, and then
+     initialize it from the statically initialized error_table. */
+
+  if (error_names == NULL)
+    {
+      nbytes = num_error_names * sizeof (char *);
+      if ((error_names = (const char **) malloc (nbytes)) != NULL)
+	{
+	  memset (error_names, 0, nbytes);
+	  for (eip = error_table; eip -> name != NULL; eip++)
+	    {
+	      error_names[eip -> value] = eip -> name;
+	    }
+	}
+    }
+
+#ifndef HAVE_SYS_ERRLIST
+
+  /* Now attempt to allocate the sys_errlist table, zero it out, and then
+     initialize it from the statically initialized error_table. */
+
+  if (sys_errlist == NULL)
+    {
+      nbytes = num_error_names * sizeof (char *);
+      if ((sys_errlist = (const char **) malloc (nbytes)) != NULL)
+	{
+	  memset (sys_errlist, 0, nbytes);
+	  sys_nerr = num_error_names;
+	  for (eip = error_table; eip -> name != NULL; eip++)
+	    {
+	      sys_errlist[eip -> value] = eip -> msg;
+	    }
+	}
+    }
+
+#endif
+
+}
+
+/*
+
+
+@deftypefn Extension int errno_max (void)
+
+Returns the maximum @code{errno} value for which a corresponding
+symbolic name or message is available.  Note that in the case where we
+use the @code{sys_errlist} supplied by the system, it is possible for
+there to be more symbolic names than messages, or vice versa.  In
+fact, the manual page for @code{perror(3C)} explicitly warns that one
+should check the size of the table (@code{sys_nerr}) before indexing
+it, since new error codes may be added to the system before they are
+added to the table.  Thus @code{sys_nerr} might be smaller than value
+implied by the largest @code{errno} value defined in @code{<errno.h>}.
+
+We return the maximum value that can be used to obtain a meaningful
+symbolic name or message.
+
+@end deftypefn
+
+*/
+
+int
+errno_max (void)
+{
+  int maxsize;
+
+  if (error_names == NULL)
+    {
+      init_error_tables ();
+    }
+  maxsize = MAX (sys_nerr, num_error_names);
+  return (maxsize - 1);
+}
+
+#ifndef HAVE_STRERROR
+
+/*
+
+@deftypefn Supplemental char* strerror (int @var{errnoval})
+
+Maps an @code{errno} number to an error message string, the contents
+of which are implementation defined.  On systems which have the
+external variables @code{sys_nerr} and @code{sys_errlist}, these
+strings will be the same as the ones used by @code{perror}.
+
+If the supplied error number is within the valid range of indices for
+the @code{sys_errlist}, but no message is available for the particular
+error number, then returns the string @samp{Error @var{num}}, where
+@var{num} is the error number.
+
+If the supplied error number is not a valid index into
+@code{sys_errlist}, returns @code{NULL}.
+
+The returned string is only guaranteed to be valid only until the
+next call to @code{strerror}.
+
+@end deftypefn
+
+*/
+
+char *
+strerror (int errnoval)
+{
+  const char *msg;
+  static char buf[32];
+
+#ifndef HAVE_SYS_ERRLIST
+
+  if (error_names == NULL)
+    {
+      init_error_tables ();
+    }
+
+#endif
+
+  if ((errnoval < 0) || (errnoval >= sys_nerr))
+    {
+#ifdef EVMSERR
+      if (errnoval == evmserr.value)
+	msg = evmserr.msg;
+      else
+#endif
+      /* Out of range, just return NULL */
+      msg = NULL;
+    }
+  else if ((sys_errlist == NULL) || (sys_errlist[errnoval] == NULL))
+    {
+      /* In range, but no sys_errlist or no entry at this index. */
+      sprintf (buf, "Error %d", errnoval);
+      msg = buf;
+    }
+  else
+    {
+      /* In range, and a valid message.  Just return the message. */
+      msg = (char *) sys_errlist[errnoval];
+    }
+  
+  return (msg);
+}
+
+#endif	/* ! HAVE_STRERROR */
+
+
+/*
+
+@deftypefn Replacement {const char*} strerrno (int @var{errnum})
+
+Given an error number returned from a system call (typically returned
+in @code{errno}), returns a pointer to a string containing the
+symbolic name of that error number, as found in @code{<errno.h>}.
+
+If the supplied error number is within the valid range of indices for
+symbolic names, but no name is available for the particular error
+number, then returns the string @samp{Error @var{num}}, where @var{num}
+is the error number.
+
+If the supplied error number is not within the range of valid
+indices, then returns @code{NULL}.
+
+The contents of the location pointed to are only guaranteed to be
+valid until the next call to @code{strerrno}.
+
+@end deftypefn
+
+*/
+
+const char *
+strerrno (int errnoval)
+{
+  const char *name;
+  static char buf[32];
+
+  if (error_names == NULL)
+    {
+      init_error_tables ();
+    }
+
+  if ((errnoval < 0) || (errnoval >= num_error_names))
+    {
+#ifdef EVMSERR
+      if (errnoval == evmserr.value)
+	name = evmserr.name;
+      else
+#endif
+      /* Out of range, just return NULL */
+      name = NULL;
+    }
+  else if ((error_names == NULL) || (error_names[errnoval] == NULL))
+    {
+      /* In range, but no error_names or no entry at this index. */
+      sprintf (buf, "Error %d", errnoval);
+      name = (const char *) buf;
+    }
+  else
+    {
+      /* In range, and a valid name.  Just return the name. */
+      name = error_names[errnoval];
+    }
+
+  return (name);
+}
+
+/*
+
+@deftypefn Extension int strtoerrno (const char *@var{name})
+
+Given the symbolic name of a error number (e.g., @code{EACCES}), map it
+to an errno value.  If no translation is found, returns 0.
+
+@end deftypefn
+
+*/
+
+int
+strtoerrno (const char *name)
+{
+  int errnoval = 0;
+
+  if (name != NULL)
+    {
+      if (error_names == NULL)
+	{
+	  init_error_tables ();
+	}
+      for (errnoval = 0; errnoval < num_error_names; errnoval++)
+	{
+	  if ((error_names[errnoval] != NULL) &&
+	      (strcmp (name, error_names[errnoval]) == 0))
+	    {
+	      break;
+	    }
+	}
+      if (errnoval == num_error_names)
+	{
+#ifdef EVMSERR
+	  if (strcmp (name, evmserr.name) == 0)
+	    errnoval = evmserr.value;
+	  else
+#endif
+	  errnoval = 0;
+	}
+    }
+  return (errnoval);
+}
+
+
+/* A simple little main that does nothing but print all the errno translations
+   if MAIN is defined and this file is compiled and linked. */
+
+#ifdef MAIN
+
+#include <stdio.h>
+
+int
+main (void)
+{
+  int errn;
+  int errnmax;
+  const char *name;
+  const char *msg;
+  char *strerror ();
+
+  errnmax = errno_max ();
+  printf ("%d entries in names table.\n", num_error_names);
+  printf ("%d entries in messages table.\n", sys_nerr);
+  printf ("%d is max useful index.\n", errnmax);
+
+  /* Keep printing values until we get to the end of *both* tables, not
+     *either* table.  Note that knowing the maximum useful index does *not*
+     relieve us of the responsibility of testing the return pointer for
+     NULL. */
+
+  for (errn = 0; errn <= errnmax; errn++)
+    {
+      name = strerrno (errn);
+      name = (name == NULL) ? "<NULL>" : name;
+      msg = strerror (errn);
+      msg = (msg == NULL) ? "<NULL>" : msg;
+      printf ("%-4d%-18s%s\n", errn, name, msg);
+    }
+
+  return 0;
+}
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strncasecmp.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strncasecmp.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strncasecmp.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strncasecmp.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 1987 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific written prior permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ */
+
+/*
+  
+@deftypefn Supplemental int strncasecmp (const char *@var{s1}, const char *@var{s2})
+
+A case-insensitive @code{strncmp}.
+
+@end deftypefn
+
+*/
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)strcasecmp.c	5.5 (Berkeley) 11/24/87";
+#endif /* LIBC_SCCS and not lint */
+
+#include <ansidecl.h>
+#include <stddef.h>
+
+/*
+ * This array is designed for mapping upper and lower case letter
+ * together for a case independent comparison.  The mappings are
+ * based upon ascii character sequences.
+ */
+static const unsigned char charmap[] = {
+	'\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
+	'\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+	'\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
+	'\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
+	'\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
+	'\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+	'\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+	'\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+	'\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+	'\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+	'\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+	'\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+	'\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+	'\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+	'\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+	'\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
+	'\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
+	'\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
+	'\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+	'\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
+	'\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
+	'\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
+	'\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
+	'\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
+	'\300', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+	'\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+	'\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+	'\370', '\371', '\372', '\333', '\334', '\335', '\336', '\337',
+	'\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+	'\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+	'\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+	'\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377',
+};
+
+int
+strncasecmp(const char *s1, const char *s2, register size_t n)
+{
+    register unsigned char u1, u2;
+
+    for (; n != 0; --n) {
+	u1 = (unsigned char) *s1++;
+	u2 = (unsigned char) *s2++;
+	if (charmap[u1] != charmap[u2]) {
+	    return charmap[u1] - charmap[u2];
+	}
+	if (u1 == '\0') {
+	    return 0;
+	}
+    }
+    return 0;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strncmp.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strncmp.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strncmp.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strncmp.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,34 @@
+/* strncmp -- compare two strings, stop after n bytes.
+   This function is in the public domain.  */
+
+/*
+
+@deftypefn Supplemental int strncmp (const char *@var{s1}, @
+  const char *@var{s2}, size_t @var{n})
+
+Compares the first @var{n} bytes of two strings, returning a value as
+@code{strcmp}.
+
+@end deftypefn
+
+*/
+
+#include <ansidecl.h>
+#include <stddef.h>
+
+int
+strncmp(const char *s1, const char *s2, register size_t n)
+{
+  register unsigned char u1, u2;
+
+  while (n-- > 0)
+    {
+      u1 = (unsigned char) *s1++;
+      u2 = (unsigned char) *s2++;
+      if (u1 != u2)
+	return u1 - u2;
+      if (u1 == '\0')
+	return 0;
+    }
+  return 0;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strndup.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strndup.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strndup.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strndup.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,55 @@
+/* Implement the strndup function.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   Written by Kaveh R. Ghazi <ghazi@caip.rutgers.edu>.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/*
+
+@deftypefn Extension char* strndup (const char *@var{s}, size_t @var{n})
+
+Returns a pointer to a copy of @var{s} with at most @var{n} characters
+in memory obtained from @code{malloc}, or @code{NULL} if insufficient
+memory was available.  The result is always NUL terminated.
+
+@end deftypefn
+
+*/
+
+#include "ansidecl.h"
+#include <stddef.h>
+
+extern size_t	strlen (const char*);
+extern PTR	malloc (size_t);
+extern PTR	memcpy (PTR, const PTR, size_t);
+
+char *
+strndup (const char *s, size_t n)
+{
+  char *result;
+  size_t len = strlen (s);
+
+  if (n < len)
+    len = n;
+
+  result = (char *) malloc (len + 1);
+  if (!result)
+    return 0;
+
+  result[len] = '\0';
+  return (char *) memcpy (result, s, len);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strrchr.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strrchr.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strrchr.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strrchr.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,28 @@
+/* Portable version of strrchr().
+   This function is in the public domain. */
+
+/*
+
+@deftypefn Supplemental char* strrchr (const char *@var{s}, int @var{c})
+
+Returns a pointer to the last occurrence of the character @var{c} in
+the string @var{s}, or @code{NULL} if not found.  If @var{c} is itself the
+null character, the results are undefined.
+
+@end deftypefn
+
+*/
+
+#include <ansidecl.h>
+
+char *
+strrchr (register const char *s, int c)
+{
+  char *rtnval = 0;
+
+  do {
+    if (*s == c)
+      rtnval = (char*) s;
+  } while (*s++);
+  return (rtnval);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strsignal.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strsignal.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strsignal.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strsignal.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,610 @@
+/* Extended support for using signal values.
+   Written by Fred Fish.  fnf@cygnus.com
+   This file is in the public domain.  */
+
+#include "config.h"
+#include "ansidecl.h"
+#include "libiberty.h"
+
+/* We need to declare sys_siglist, because even if the system provides
+   it we can't assume that it is declared in <signal.h> (for example,
+   SunOS provides sys_siglist, but it does not declare it in any
+   header file).  However, we can't declare sys_siglist portably,
+   because on some systems it is declared with const and on some
+   systems it is declared without const.  If we were using autoconf,
+   we could work out the right declaration.  Until, then we just
+   ignore any declaration in the system header files, and always
+   declare it ourselves.  With luck, this will always work.  */
+#define sys_siglist no_such_symbol
+#define sys_nsig sys_nsig__no_such_symbol
+
+#include <stdio.h>
+#include <signal.h>
+
+/*  Routines imported from standard C runtime libraries. */
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#else
+extern PTR malloc ();
+#endif
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+extern PTR memset ();
+#endif
+
+/* Undefine the macro we used to hide the definition of sys_siglist
+   found in the system header files.  */
+#undef sys_siglist
+#undef sys_nsig
+
+#ifndef NULL
+#  define NULL (void *) 0
+#endif
+
+#ifndef MAX
+#  define MAX(a,b) ((a) > (b) ? (a) : (b))
+#endif
+
+static void init_signal_tables (void);
+
+/* Translation table for signal values.
+
+   Note that this table is generally only accessed when it is used at runtime
+   to initialize signal name and message tables that are indexed by signal
+   value.
+
+   Not all of these signals will exist on all systems.  This table is the only
+   thing that should have to be updated as new signal numbers are introduced.
+   It's sort of ugly, but at least its portable. */
+
+struct signal_info
+{
+  const int value;		/* The numeric value from <signal.h> */
+  const char *const name;	/* The equivalent symbolic value */
+#ifndef HAVE_SYS_SIGLIST
+  const char *const msg;	/* Short message about this value */
+#endif
+};
+
+#ifndef HAVE_SYS_SIGLIST
+#   define ENTRY(value, name, msg)	{value, name, msg}
+#else
+#   define ENTRY(value, name, msg)	{value, name}
+#endif
+
+static const struct signal_info signal_table[] =
+{
+#if defined (SIGHUP)
+  ENTRY(SIGHUP, "SIGHUP", "Hangup"),
+#endif
+#if defined (SIGINT)
+  ENTRY(SIGINT, "SIGINT", "Interrupt"),
+#endif
+#if defined (SIGQUIT)
+  ENTRY(SIGQUIT, "SIGQUIT", "Quit"),
+#endif
+#if defined (SIGILL)
+  ENTRY(SIGILL, "SIGILL", "Illegal instruction"),
+#endif
+#if defined (SIGTRAP)
+  ENTRY(SIGTRAP, "SIGTRAP", "Trace/breakpoint trap"),
+#endif
+/* Put SIGIOT before SIGABRT, so that if SIGIOT==SIGABRT then SIGABRT
+   overrides SIGIOT.  SIGABRT is in ANSI and POSIX.1, and SIGIOT isn't. */
+#if defined (SIGIOT)
+  ENTRY(SIGIOT, "SIGIOT", "IOT trap"),
+#endif
+#if defined (SIGABRT)
+  ENTRY(SIGABRT, "SIGABRT", "Aborted"),
+#endif
+#if defined (SIGEMT)
+  ENTRY(SIGEMT, "SIGEMT", "Emulation trap"),
+#endif
+#if defined (SIGFPE)
+  ENTRY(SIGFPE, "SIGFPE", "Arithmetic exception"),
+#endif
+#if defined (SIGKILL)
+  ENTRY(SIGKILL, "SIGKILL", "Killed"),
+#endif
+#if defined (SIGBUS)
+  ENTRY(SIGBUS, "SIGBUS", "Bus error"),
+#endif
+#if defined (SIGSEGV)
+  ENTRY(SIGSEGV, "SIGSEGV", "Segmentation fault"),
+#endif
+#if defined (SIGSYS)
+  ENTRY(SIGSYS, "SIGSYS", "Bad system call"),
+#endif
+#if defined (SIGPIPE)
+  ENTRY(SIGPIPE, "SIGPIPE", "Broken pipe"),
+#endif
+#if defined (SIGALRM)
+  ENTRY(SIGALRM, "SIGALRM", "Alarm clock"),
+#endif
+#if defined (SIGTERM)
+  ENTRY(SIGTERM, "SIGTERM", "Terminated"),
+#endif
+#if defined (SIGUSR1)
+  ENTRY(SIGUSR1, "SIGUSR1", "User defined signal 1"),
+#endif
+#if defined (SIGUSR2)
+  ENTRY(SIGUSR2, "SIGUSR2", "User defined signal 2"),
+#endif
+/* Put SIGCLD before SIGCHLD, so that if SIGCLD==SIGCHLD then SIGCHLD
+   overrides SIGCLD.  SIGCHLD is in POXIX.1 */
+#if defined (SIGCLD)
+  ENTRY(SIGCLD, "SIGCLD", "Child status changed"),
+#endif
+#if defined (SIGCHLD)
+  ENTRY(SIGCHLD, "SIGCHLD", "Child status changed"),
+#endif
+#if defined (SIGPWR)
+  ENTRY(SIGPWR, "SIGPWR", "Power fail/restart"),
+#endif
+#if defined (SIGWINCH)
+  ENTRY(SIGWINCH, "SIGWINCH", "Window size changed"),
+#endif
+#if defined (SIGURG)
+  ENTRY(SIGURG, "SIGURG", "Urgent I/O condition"),
+#endif
+#if defined (SIGIO)
+  /* "I/O pending" has also been suggested, but is misleading since the
+     signal only happens when the process has asked for it, not everytime
+     I/O is pending. */
+  ENTRY(SIGIO, "SIGIO", "I/O possible"),
+#endif
+#if defined (SIGPOLL)
+  ENTRY(SIGPOLL, "SIGPOLL", "Pollable event occurred"),
+#endif
+#if defined (SIGSTOP)
+  ENTRY(SIGSTOP, "SIGSTOP", "Stopped (signal)"),
+#endif
+#if defined (SIGTSTP)
+  ENTRY(SIGTSTP, "SIGTSTP", "Stopped (user)"),
+#endif
+#if defined (SIGCONT)
+  ENTRY(SIGCONT, "SIGCONT", "Continued"),
+#endif
+#if defined (SIGTTIN)
+  ENTRY(SIGTTIN, "SIGTTIN", "Stopped (tty input)"),
+#endif
+#if defined (SIGTTOU)
+  ENTRY(SIGTTOU, "SIGTTOU", "Stopped (tty output)"),
+#endif
+#if defined (SIGVTALRM)
+  ENTRY(SIGVTALRM, "SIGVTALRM", "Virtual timer expired"),
+#endif
+#if defined (SIGPROF)
+  ENTRY(SIGPROF, "SIGPROF", "Profiling timer expired"),
+#endif
+#if defined (SIGXCPU)
+  ENTRY(SIGXCPU, "SIGXCPU", "CPU time limit exceeded"),
+#endif
+#if defined (SIGXFSZ)
+  ENTRY(SIGXFSZ, "SIGXFSZ", "File size limit exceeded"),
+#endif
+#if defined (SIGWIND)
+  ENTRY(SIGWIND, "SIGWIND", "SIGWIND"),
+#endif
+#if defined (SIGPHONE)
+  ENTRY(SIGPHONE, "SIGPHONE", "SIGPHONE"),
+#endif
+#if defined (SIGLOST)
+  ENTRY(SIGLOST, "SIGLOST", "Resource lost"),
+#endif
+#if defined (SIGWAITING)
+  ENTRY(SIGWAITING, "SIGWAITING", "Process's LWPs are blocked"),
+#endif
+#if defined (SIGLWP)
+  ENTRY(SIGLWP, "SIGLWP", "Signal LWP"),
+#endif
+#if defined (SIGDANGER)
+  ENTRY(SIGDANGER, "SIGDANGER", "Swap space dangerously low"),
+#endif
+#if defined (SIGGRANT)
+  ENTRY(SIGGRANT, "SIGGRANT", "Monitor mode granted"),
+#endif
+#if defined (SIGRETRACT)
+  ENTRY(SIGRETRACT, "SIGRETRACT", "Need to relinguish monitor mode"),
+#endif
+#if defined (SIGMSG)
+  ENTRY(SIGMSG, "SIGMSG", "Monitor mode data available"),
+#endif
+#if defined (SIGSOUND)
+  ENTRY(SIGSOUND, "SIGSOUND", "Sound completed"),
+#endif
+#if defined (SIGSAK)
+  ENTRY(SIGSAK, "SIGSAK", "Secure attention"),
+#endif
+  ENTRY(0, NULL, NULL)
+};
+
+/* Translation table allocated and initialized at runtime.  Indexed by the
+   signal value to find the equivalent symbolic value. */
+
+static const char **signal_names;
+static int num_signal_names = 0;
+
+/* Translation table allocated and initialized at runtime, if it does not
+   already exist in the host environment.  Indexed by the signal value to find
+   the descriptive string.
+
+   We don't export it for use in other modules because even though it has the
+   same name, it differs from other implementations in that it is dynamically
+   initialized rather than statically initialized. */
+
+#ifndef HAVE_SYS_SIGLIST
+
+static int sys_nsig;
+static const char **sys_siglist;
+
+#else
+
+#ifdef NSIG
+static int sys_nsig = NSIG;
+#else
+#ifdef _NSIG
+static int sys_nsig = _NSIG;
+#endif
+#endif
+extern const char * const sys_siglist[];
+
+#endif
+
+
+/*
+
+NAME
+
+	init_signal_tables -- initialize the name and message tables
+
+SYNOPSIS
+
+	static void init_signal_tables ();
+
+DESCRIPTION
+
+	Using the signal_table, which is initialized at compile time, generate
+	the signal_names and the sys_siglist (if needed) tables, which are
+	indexed at runtime by a specific signal value.
+
+BUGS
+
+	The initialization of the tables may fail under low memory conditions,
+	in which case we don't do anything particularly useful, but we don't
+	bomb either.  Who knows, it might succeed at a later point if we free
+	some memory in the meantime.  In any case, the other routines know
+	how to deal with lack of a table after trying to initialize it.  This
+	may or may not be considered to be a bug, that we don't specifically
+	warn about this particular failure mode.
+
+*/
+
+static void
+init_signal_tables (void)
+{
+  const struct signal_info *eip;
+  int nbytes;
+
+  /* If we haven't already scanned the signal_table once to find the maximum
+     signal value, then go find it now. */
+
+  if (num_signal_names == 0)
+    {
+      for (eip = signal_table; eip -> name != NULL; eip++)
+	{
+	  if (eip -> value >= num_signal_names)
+	    {
+	      num_signal_names = eip -> value + 1;
+	    }
+	}
+    }
+
+  /* Now attempt to allocate the signal_names table, zero it out, and then
+     initialize it from the statically initialized signal_table. */
+
+  if (signal_names == NULL)
+    {
+      nbytes = num_signal_names * sizeof (char *);
+      if ((signal_names = (const char **) malloc (nbytes)) != NULL)
+	{
+	  memset (signal_names, 0, nbytes);
+	  for (eip = signal_table; eip -> name != NULL; eip++)
+	    {
+	      signal_names[eip -> value] = eip -> name;
+	    }
+	}
+    }
+
+#ifndef HAVE_SYS_SIGLIST
+
+  /* Now attempt to allocate the sys_siglist table, zero it out, and then
+     initialize it from the statically initialized signal_table. */
+
+  if (sys_siglist == NULL)
+    {
+      nbytes = num_signal_names * sizeof (char *);
+      if ((sys_siglist = (const char **) malloc (nbytes)) != NULL)
+	{
+	  memset (sys_siglist, 0, nbytes);
+	  sys_nsig = num_signal_names;
+	  for (eip = signal_table; eip -> name != NULL; eip++)
+	    {
+	      sys_siglist[eip -> value] = eip -> msg;
+	    }
+	}
+    }
+
+#endif
+
+}
+
+
+/*
+
+@deftypefn Extension int signo_max (void)
+
+Returns the maximum signal value for which a corresponding symbolic
+name or message is available.  Note that in the case where we use the
+@code{sys_siglist} supplied by the system, it is possible for there to
+be more symbolic names than messages, or vice versa.  In fact, the
+manual page for @code{psignal(3b)} explicitly warns that one should
+check the size of the table (@code{NSIG}) before indexing it, since
+new signal codes may be added to the system before they are added to
+the table.  Thus @code{NSIG} might be smaller than value implied by
+the largest signo value defined in @code{<signal.h>}.
+
+We return the maximum value that can be used to obtain a meaningful
+symbolic name or message.
+
+@end deftypefn
+
+*/
+
+int
+signo_max (void)
+{
+  int maxsize;
+
+  if (signal_names == NULL)
+    {
+      init_signal_tables ();
+    }
+  maxsize = MAX (sys_nsig, num_signal_names);
+  return (maxsize - 1);
+}
+
+
+/*
+
+@deftypefn Supplemental {const char *} strsignal (int @var{signo})
+
+Maps an signal number to an signal message string, the contents of
+which are implementation defined.  On systems which have the external
+variable @code{sys_siglist}, these strings will be the same as the
+ones used by @code{psignal()}.
+
+If the supplied signal number is within the valid range of indices for
+the @code{sys_siglist}, but no message is available for the particular
+signal number, then returns the string @samp{Signal @var{num}}, where
+@var{num} is the signal number.
+
+If the supplied signal number is not a valid index into
+@code{sys_siglist}, returns @code{NULL}.
+
+The returned string is only guaranteed to be valid only until the next
+call to @code{strsignal}.
+
+@end deftypefn
+
+*/
+
+#ifndef HAVE_STRSIGNAL
+
+char *
+strsignal (int signo)
+{
+  char *msg;
+  static char buf[32];
+
+#ifndef HAVE_SYS_SIGLIST
+
+  if (signal_names == NULL)
+    {
+      init_signal_tables ();
+    }
+
+#endif
+
+  if ((signo < 0) || (signo >= sys_nsig))
+    {
+      /* Out of range, just return NULL */
+      msg = NULL;
+    }
+  else if ((sys_siglist == NULL) || (sys_siglist[signo] == NULL))
+    {
+      /* In range, but no sys_siglist or no entry at this index. */
+      sprintf (buf, "Signal %d", signo);
+      msg = buf;
+    }
+  else
+    {
+      /* In range, and a valid message.  Just return the message.  We
+	 can safely cast away const, since POSIX says the user must
+	 not modify the result.	 */
+      msg = (char *) sys_siglist[signo];
+    }
+
+  return (msg);
+}
+
+#endif /* ! HAVE_STRSIGNAL */
+
+/*
+
+@deftypefn Extension {const char*} strsigno (int @var{signo})
+
+Given an signal number, returns a pointer to a string containing the
+symbolic name of that signal number, as found in @code{<signal.h>}.
+
+If the supplied signal number is within the valid range of indices for
+symbolic names, but no name is available for the particular signal
+number, then returns the string @samp{Signal @var{num}}, where
+@var{num} is the signal number.
+
+If the supplied signal number is not within the range of valid
+indices, then returns @code{NULL}.
+
+The contents of the location pointed to are only guaranteed to be
+valid until the next call to @code{strsigno}.
+
+@end deftypefn
+
+*/
+
+const char *
+strsigno (int signo)
+{
+  const char *name;
+  static char buf[32];
+
+  if (signal_names == NULL)
+    {
+      init_signal_tables ();
+    }
+
+  if ((signo < 0) || (signo >= num_signal_names))
+    {
+      /* Out of range, just return NULL */
+      name = NULL;
+    }
+  else if ((signal_names == NULL) || (signal_names[signo] == NULL))
+    {
+      /* In range, but no signal_names or no entry at this index. */
+      sprintf (buf, "Signal %d", signo);
+      name = (const char *) buf;
+    }
+  else
+    {
+      /* In range, and a valid name.  Just return the name. */
+      name = signal_names[signo];
+    }
+
+  return (name);
+}
+
+
+/*
+
+@deftypefn Extension int strtosigno (const char *@var{name})
+
+Given the symbolic name of a signal, map it to a signal number.  If no
+translation is found, returns 0.
+
+@end deftypefn
+
+*/
+
+int
+strtosigno (const char *name)
+{
+  int signo = 0;
+
+  if (name != NULL)
+    {
+      if (signal_names == NULL)
+	{
+	  init_signal_tables ();
+	}
+      for (signo = 0; signo < num_signal_names; signo++)
+	{
+	  if ((signal_names[signo] != NULL) &&
+	      (strcmp (name, signal_names[signo]) == 0))
+	    {
+	      break;
+	    }
+	}
+      if (signo == num_signal_names)
+	{
+	  signo = 0;
+	}
+    }
+  return (signo);
+}
+
+
+/*
+
+@deftypefn Supplemental void psignal (int @var{signo}, char *@var{message})
+
+Print @var{message} to the standard error, followed by a colon,
+followed by the description of the signal specified by @var{signo},
+followed by a newline.
+
+@end deftypefn
+
+*/
+
+#ifndef HAVE_PSIGNAL
+
+void
+psignal (int signo, char *message)
+{
+  if (signal_names == NULL)
+    {
+      init_signal_tables ();
+    }
+  if ((signo <= 0) || (signo >= sys_nsig))
+    {
+      fprintf (stderr, "%s: unknown signal\n", message);
+    }
+  else
+    {
+      fprintf (stderr, "%s: %s\n", message, sys_siglist[signo]);
+    }
+}
+
+#endif	/* ! HAVE_PSIGNAL */
+
+
+/* A simple little main that does nothing but print all the signal translations
+   if MAIN is defined and this file is compiled and linked. */
+
+#ifdef MAIN
+
+#include <stdio.h>
+
+int
+main (void)
+{
+  int signo;
+  int maxsigno;
+  const char *name;
+  const char *msg;
+
+  maxsigno = signo_max ();
+  printf ("%d entries in names table.\n", num_signal_names);
+  printf ("%d entries in messages table.\n", sys_nsig);
+  printf ("%d is max useful index.\n", maxsigno);
+
+  /* Keep printing values until we get to the end of *both* tables, not
+     *either* table.  Note that knowing the maximum useful index does *not*
+     relieve us of the responsibility of testing the return pointer for
+     NULL. */
+
+  for (signo = 0; signo <= maxsigno; signo++)
+    {
+      name = strsigno (signo);
+      name = (name == NULL) ? "<NULL>" : name;
+      msg = strsignal (signo);
+      msg = (msg == NULL) ? "<NULL>" : msg;
+      printf ("%-4d%-18s%s\n", signo, name, msg);
+    }
+
+  return 0;
+}
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strstr.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strstr.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strstr.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strstr.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,41 @@
+/* Simple implementation of strstr for systems without it.
+   This function is in the public domain.  */
+
+/*
+
+@deftypefn Supplemental char* strstr (const char *@var{string}, const char *@var{sub})
+
+This function searches for the substring @var{sub} in the string
+@var{string}, not including the terminating null characters.  A pointer
+to the first occurrence of @var{sub} is returned, or @code{NULL} if the
+substring is absent.  If @var{sub} points to a string with zero
+length, the function returns @var{string}.
+
+@end deftypefn
+
+
+*/
+
+
+/* FIXME:  The above description is ANSI compiliant.  This routine has not
+   been validated to comply with it.  -fnf */
+
+#include <stddef.h>
+
+extern char *strchr (const char *, int);
+extern int strncmp (const void *, const void *, size_t);
+extern size_t strlen (const char *);
+
+char *
+strstr (const char *s1, const char *s2)
+{
+  const char *p = s1;
+  const size_t len = strlen (s2);
+
+  for (; (p = strchr (p, *s2)) != 0; p++)
+    {
+      if (strncmp (p, s2, len) == 0)
+	return (char *)p;
+    }
+  return (0);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strtod.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strtod.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strtod.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strtod.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,137 @@
+/* Implementation of strtod for systems with atof.
+   Copyright (C) 1991, 1995, 2002, 2011 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.  This library is free
+software; you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This library 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 GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+
+As a special exception, if you link this library with files
+compiled with a GNU compiler to produce an executable, this does not cause
+the resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why
+the executable file might be covered by the GNU General Public License. */
+
+/*
+
+@deftypefn Supplemental double strtod (const char *@var{string}, @
+  char **@var{endptr})
+
+This ISO C function converts the initial portion of @var{string} to a
+@code{double}.  If @var{endptr} is not @code{NULL}, a pointer to the
+character after the last character used in the conversion is stored in
+the location referenced by @var{endptr}.  If no conversion is
+performed, zero is returned and the value of @var{string} is stored in
+the location referenced by @var{endptr}.
+
+@end deftypefn
+
+*/
+
+#include "ansidecl.h"
+#include "safe-ctype.h"
+
+extern double atof (const char *);
+
+/* Disclaimer: this is currently just used by CHILL in GDB and therefore
+   has not been tested well.  It may have been tested for nothing except
+   that it compiles.  */
+
+double
+strtod (char *str, char **ptr)
+{
+  char *p;
+
+  if (ptr == (char **)0)
+    return atof (str);
+  
+  p = str;
+  
+  while (ISSPACE (*p))
+    ++p;
+  
+  if (*p == '+' || *p == '-')
+    ++p;
+
+  /* INF or INFINITY.  */
+  if ((p[0] == 'i' || p[0] == 'I')
+      && (p[1] == 'n' || p[1] == 'N')
+      && (p[2] == 'f' || p[2] == 'F'))
+    {
+      if ((p[3] == 'i' || p[3] == 'I')
+	  && (p[4] == 'n' || p[4] == 'N')
+	  && (p[5] == 'i' || p[5] == 'I')
+	  && (p[6] == 't' || p[6] == 'T')
+	  && (p[7] == 'y' || p[7] == 'Y'))
+	{
+	  *ptr = p + 8;
+	  return atof (str);
+	}
+      else
+	{
+	  *ptr = p + 3;
+	  return atof (str);
+	}
+    }
+
+  /* NAN or NAN(foo).  */
+  if ((p[0] == 'n' || p[0] == 'N')
+      && (p[1] == 'a' || p[1] == 'A')
+      && (p[2] == 'n' || p[2] == 'N'))
+    {
+      p += 3;
+      if (*p == '(')
+	{
+	  ++p;
+	  while (*p != '\0' && *p != ')')
+	    ++p;
+	  if (*p == ')')
+	    ++p;
+	}
+      *ptr = p;
+      return atof (str);
+    }
+
+  /* digits, with 0 or 1 periods in it.  */
+  if (ISDIGIT (*p) || *p == '.')
+    {
+      int got_dot = 0;
+      while (ISDIGIT (*p) || (!got_dot && *p == '.'))
+	{
+	  if (*p == '.')
+	    got_dot = 1;
+	  ++p;
+	}
+
+      /* Exponent.  */
+      if (*p == 'e' || *p == 'E')
+	{
+	  int i;
+	  i = 1;
+	  if (p[i] == '+' || p[i] == '-')
+	    ++i;
+	  if (ISDIGIT (p[i]))
+	    {
+	      while (ISDIGIT (p[i]))
+		++i;
+	      *ptr = p + i;
+	      return atof (str);
+	    }
+	}
+      *ptr = p;
+      return atof (str);
+    }
+  /* Didn't find any digits.  Doesn't look like a number.  */
+  *ptr = str;
+  return 0.0;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strtol.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strtol.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strtol.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strtol.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,165 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. [rescinded 22 July 1999]
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+
+@deftypefn Supplemental {long int} strtol (const char *@var{string}, @
+  char **@var{endptr}, int @var{base})
+@deftypefnx Supplemental {unsigned long int} strtoul (const char *@var{string}, @
+  char **@var{endptr}, int @var{base})
+
+The @code{strtol} function converts the string in @var{string} to a
+long integer value according to the given @var{base}, which must be
+between 2 and 36 inclusive, or be the special value 0.  If @var{base}
+is 0, @code{strtol} will look for the prefixes @code{0} and @code{0x}
+to indicate bases 8 and 16, respectively, else default to base 10.
+When the base is 16 (either explicitly or implicitly), a prefix of
+@code{0x} is allowed.  The handling of @var{endptr} is as that of
+@code{strtod} above.  The @code{strtoul} function is the same, except
+that the converted value is unsigned.
+
+@end deftypefn
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#include <errno.h>
+#ifdef NEED_DECLARATION_ERRNO
+extern int errno;
+#endif
+#include "safe-ctype.h"
+
+/* FIXME: It'd be nice to configure around these, but the include files are too
+   painful.  These macros should at least be more portable than hardwired hex
+   constants. */
+
+#ifndef ULONG_MAX
+#define	ULONG_MAX	((unsigned long)(~0L))		/* 0xFFFFFFFF */
+#endif
+
+#ifndef LONG_MAX
+#define	LONG_MAX	((long)(ULONG_MAX >> 1))	/* 0x7FFFFFFF */
+#endif
+
+#ifndef LONG_MIN
+#define	LONG_MIN	((long)(~LONG_MAX))		/* 0x80000000 */
+#endif
+
+/*
+ * Convert a string to a long integer.
+ *
+ * Ignores `locale' stuff.  Assumes that the upper and lower case
+ * alphabets and digits are each contiguous.
+ */
+long
+strtol(const char *nptr, char **endptr, register int base)
+{
+	register const char *s = nptr;
+	register unsigned long acc;
+	register int c;
+	register unsigned long cutoff;
+	register int neg = 0, any, cutlim;
+
+	/*
+	 * Skip white space and pick up leading +/- sign if any.
+	 * If base is 0, allow 0x for hex and 0 for octal, else
+	 * assume decimal; if base is already 16, allow 0x.
+	 */
+	do {
+		c = *s++;
+	} while (ISSPACE(c));
+	if (c == '-') {
+		neg = 1;
+		c = *s++;
+	} else if (c == '+')
+		c = *s++;
+	if ((base == 0 || base == 16) &&
+	    c == '0' && (*s == 'x' || *s == 'X')) {
+		c = s[1];
+		s += 2;
+		base = 16;
+	}
+	if (base == 0)
+		base = c == '0' ? 8 : 10;
+
+	/*
+	 * Compute the cutoff value between legal numbers and illegal
+	 * numbers.  That is the largest legal value, divided by the
+	 * base.  An input number that is greater than this value, if
+	 * followed by a legal input character, is too big.  One that
+	 * is equal to this value may be valid or not; the limit
+	 * between valid and invalid numbers is then based on the last
+	 * digit.  For instance, if the range for longs is
+	 * [-2147483648..2147483647] and the input base is 10,
+	 * cutoff will be set to 214748364 and cutlim to either
+	 * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated
+	 * a value > 214748364, or equal but the next digit is > 7 (or 8),
+	 * the number is too big, and we will return a range error.
+	 *
+	 * Set any if any `digits' consumed; make it negative to indicate
+	 * overflow.
+	 */
+	cutoff = neg ? -(unsigned long)LONG_MIN : LONG_MAX;
+	cutlim = cutoff % (unsigned long)base;
+	cutoff /= (unsigned long)base;
+	for (acc = 0, any = 0;; c = *s++) {
+		if (ISDIGIT(c))
+			c -= '0';
+		else if (ISALPHA(c))
+			c -= ISUPPER(c) ? 'A' - 10 : 'a' - 10;
+		else
+			break;
+		if (c >= base)
+			break;
+		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
+			any = -1;
+		else {
+			any = 1;
+			acc *= base;
+			acc += c;
+		}
+	}
+	if (any < 0) {
+		acc = neg ? LONG_MIN : LONG_MAX;
+		errno = ERANGE;
+	} else if (neg)
+		acc = -acc;
+	if (endptr != 0)
+		*endptr = (char *) (any ? s - 1 : nptr);
+	return (acc);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strtoul.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strtoul.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strtoul.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strtoul.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 1990 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. [rescinded 22 July 1999]
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#include <errno.h>
+#ifdef NEED_DECLARATION_ERRNO
+extern int errno;
+#endif
+#if 0
+#include <stdlib.h>
+#endif
+#include "ansidecl.h"
+#include "safe-ctype.h"
+
+#ifndef ULONG_MAX
+#define	ULONG_MAX	((unsigned long)(~0L))		/* 0xFFFFFFFF */
+#endif
+
+/*
+ * Convert a string to an unsigned long integer.
+ *
+ * Ignores `locale' stuff.  Assumes that the upper and lower case
+ * alphabets and digits are each contiguous.
+ */
+unsigned long
+strtoul(const char *nptr, char **endptr, register int base)
+{
+	register const char *s = nptr;
+	register unsigned long acc;
+	register int c;
+	register unsigned long cutoff;
+	register int neg = 0, any, cutlim;
+
+	/*
+	 * See strtol for comments as to the logic used.
+	 */
+	do {
+		c = *s++;
+	} while (ISSPACE(c));
+	if (c == '-') {
+		neg = 1;
+		c = *s++;
+	} else if (c == '+')
+		c = *s++;
+	if ((base == 0 || base == 16) &&
+	    c == '0' && (*s == 'x' || *s == 'X')) {
+		c = s[1];
+		s += 2;
+		base = 16;
+	}
+	if (base == 0)
+		base = c == '0' ? 8 : 10;
+	cutoff = (unsigned long)ULONG_MAX / (unsigned long)base;
+	cutlim = (unsigned long)ULONG_MAX % (unsigned long)base;
+	for (acc = 0, any = 0;; c = *s++) {
+		if (ISDIGIT(c))
+			c -= '0';
+		else if (ISALPHA(c))
+			c -= ISUPPER(c) ? 'A' - 10 : 'a' - 10;
+		else
+			break;
+		if (c >= base)
+			break;
+		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
+			any = -1;
+		else {
+			any = 1;
+			acc *= base;
+			acc += c;
+		}
+	}
+	if (any < 0) {
+		acc = ULONG_MAX;
+		errno = ERANGE;
+	} else if (neg)
+		acc = -acc;
+	if (endptr != 0)
+		*endptr = (char *) (any ? s - 1 : nptr);
+	return (acc);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strverscmp.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strverscmp.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/strverscmp.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/strverscmp.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,157 @@
+/* Compare strings while treating digits characters numerically.
+   Copyright (C) 1997, 2002, 2005 Free Software Foundation, Inc.
+   This file is part of the libiberty library.
+   Contributed by Jean-Fran�ois Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
+
+   Libiberty is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   Libiberty 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301 USA.  */
+
+#include "libiberty.h"
+#include "safe-ctype.h"
+
+/* 
+@deftypefun int strverscmp (const char *@var{s1}, const char *@var{s2})
+The @code{strverscmp} function compares the string @var{s1} against
+@var{s2}, considering them as holding indices/version numbers.  Return
+value follows the same conventions as found in the @code{strverscmp}
+function.  In fact, if @var{s1} and @var{s2} contain no digits,
+@code{strverscmp} behaves like @code{strcmp}.
+
+Basically, we compare strings normally (character by character), until
+we find a digit in each string - then we enter a special comparison
+mode, where each sequence of digits is taken as a whole.  If we reach the
+end of these two parts without noticing a difference, we return to the
+standard comparison mode.  There are two types of numeric parts:
+"integral" and "fractional" (those  begin with a '0'). The types
+of the numeric parts affect the way we sort them:
+
+@itemize @bullet
+@item
+integral/integral: we compare values as you would expect.
+
+@item
+fractional/integral: the fractional part is less than the integral one.
+Again, no surprise.
+
+@item
+fractional/fractional: the things become a bit more complex.
+If the common prefix contains only leading zeroes, the longest part is less
+than the other one; else the comparison behaves normally.
+@end itemize
+
+@smallexample
+strverscmp ("no digit", "no digit")
+    @result{} 0    // @r{same behavior as strcmp.}
+strverscmp ("item#99", "item#100")
+    @result{} <0   // @r{same prefix, but 99 < 100.}
+strverscmp ("alpha1", "alpha001")
+    @result{} >0   // @r{fractional part inferior to integral one.}
+strverscmp ("part1_f012", "part1_f01")
+    @result{} >0   // @r{two fractional parts.}
+strverscmp ("foo.009", "foo.0")
+    @result{} <0   // @r{idem, but with leading zeroes only.}
+@end smallexample
+
+This function is especially useful when dealing with filename sorting,
+because filenames frequently hold indices/version numbers.
+@end deftypefun
+
+*/
+
+/* states: S_N: normal, S_I: comparing integral part, S_F: comparing
+           fractional parts, S_Z: idem but with leading Zeroes only */
+#define  S_N    0x0
+#define  S_I    0x4
+#define  S_F    0x8
+#define  S_Z    0xC
+
+/* result_type: CMP: return diff; LEN: compare using len_diff/diff */
+#define  CMP    2
+#define  LEN    3
+
+
+/* Compare S1 and S2 as strings holding indices/version numbers,
+   returning less than, equal to or greater than zero if S1 is less than,
+   equal to or greater than S2 (for more info, see the Glibc texinfo doc).  */
+
+int
+strverscmp (const char *s1, const char *s2)
+{
+  const unsigned char *p1 = (const unsigned char *) s1;
+  const unsigned char *p2 = (const unsigned char *) s2;
+  unsigned char c1, c2;
+  int state;
+  int diff;
+
+  /* Symbol(s)    0       [1-9]   others  (padding)
+     Transition   (10) 0  (01) d  (00) x  (11) -   */
+  static const unsigned int next_state[] =
+    {
+      /* state    x    d    0    - */
+      /* S_N */  S_N, S_I, S_Z, S_N,
+      /* S_I */  S_N, S_I, S_I, S_I,
+      /* S_F */  S_N, S_F, S_F, S_F,
+      /* S_Z */  S_N, S_F, S_Z, S_Z
+    };
+
+  static const int result_type[] =
+    {
+      /* state   x/x  x/d  x/0  x/-  d/x  d/d  d/0  d/-
+                 0/x  0/d  0/0  0/-  -/x  -/d  -/0  -/- */
+
+      /* S_N */  CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
+                 CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
+      /* S_I */  CMP, -1,  -1,  CMP, +1,  LEN, LEN, CMP,
+                 +1,  LEN, LEN, CMP, CMP, CMP, CMP, CMP,
+      /* S_F */  CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
+                 CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
+      /* S_Z */  CMP, +1,  +1,  CMP, -1,  CMP, CMP, CMP,
+                 -1,  CMP, CMP, CMP
+    };
+
+  if (p1 == p2)
+    return 0;
+
+  c1 = *p1++;
+  c2 = *p2++;
+  /* Hint: '0' is a digit too.  */
+  state = S_N | ((c1 == '0') + (ISDIGIT (c1) != 0));
+
+  while ((diff = c1 - c2) == 0 && c1 != '\0')
+    {
+      state = next_state[state];
+      c1 = *p1++;
+      c2 = *p2++;
+      state |= (c1 == '0') + (ISDIGIT (c1) != 0);
+    }
+
+  state = result_type[state << 2 | (((c2 == '0') + (ISDIGIT (c2) != 0)))];
+
+  switch (state)
+    {
+    case CMP:
+      return diff;
+      
+    case LEN:
+      while (ISDIGIT (*p1++))
+	if (!ISDIGIT (*p2++))
+	  return 1;
+      
+      return ISDIGIT (*p2) ? -1 : diff;
+      
+    default:
+      return state;
+    }
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/tmpnam.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/tmpnam.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/tmpnam.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/tmpnam.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,52 @@
+/*
+
+@deftypefn Supplemental char* tmpnam (char *@var{s})
+
+This function attempts to create a name for a temporary file, which
+will be a valid file name yet not exist when @code{tmpnam} checks for
+it.  @var{s} must point to a buffer of at least @code{L_tmpnam} bytes,
+or be @code{NULL}.  Use of this function creates a security risk, and it must
+not be used in new projects.  Use @code{mkstemp} instead.
+
+@end deftypefn
+
+*/
+
+#include <stdio.h>
+
+#ifndef L_tmpnam
+#define L_tmpnam 100
+#endif
+#ifndef P_tmpdir
+#define P_tmpdir "/usr/tmp"
+#endif
+
+static char tmpnam_buffer[L_tmpnam];
+static int tmpnam_counter;
+
+extern int getpid (void);
+
+char *
+tmpnam (char *s)
+{
+  int pid = getpid ();
+
+  if (s == NULL)
+    s = tmpnam_buffer;
+
+  /*  Generate the filename and make sure that there isn't one called
+      it already.  */
+
+  while (1)
+    {
+      FILE *f;
+      sprintf (s, "%s/%s%x.%x", P_tmpdir, "t", pid, tmpnam_counter);
+      f = fopen (s, "r");
+      if (f == NULL)
+	break;
+      tmpnam_counter++;
+      fclose (f);
+    }
+
+  return s;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/unlink-if-ordinary.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/unlink-if-ordinary.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/unlink-if-ordinary.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/unlink-if-ordinary.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,72 @@
+/* unlink-if-ordinary.c - remove link to a file unless it is special
+   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.  This library is free
+software; you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This library 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 GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+
+As a special exception, if you link this library with files
+compiled with a GNU compiler to produce an executable, this does not cause
+the resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why
+the executable file might be covered by the GNU General Public License. */
+
+/*
+
+@deftypefn Supplemental int unlink_if_ordinary (const char*)
+
+Unlinks the named file, unless it is special (e.g. a device file).
+Returns 0 when the file was unlinked, a negative value (and errno set) when
+there was an error deleting the file, and a positive value if no attempt
+was made to unlink the file because it is special.
+
+@end deftypefn
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/types.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
+#include "libiberty.h"
+
+#ifndef S_ISLNK
+#ifdef S_IFLNK
+#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
+#else
+#define S_ISLNK(m) 0
+#define lstat stat
+#endif
+#endif
+
+int
+unlink_if_ordinary (const char *name)
+{
+  struct stat st;
+
+  if (lstat (name, &st) == 0
+      && (S_ISREG (st.st_mode) || S_ISLNK (st.st_mode)))
+    return unlink (name);
+
+  return 1;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/vasprintf.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/vasprintf.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/vasprintf.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/vasprintf.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,197 @@
+/* Like vsprintf but provides a pointer to malloc'd storage, which must
+   be freed by the caller.
+   Copyright (C) 1994, 2003, 2011 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <ansidecl.h>
+#include <stdarg.h>
+#if !defined (va_copy) && defined (__va_copy)
+# define va_copy(d,s)  __va_copy((d),(s))
+#endif
+#include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#else
+extern unsigned long strtoul ();
+extern PTR malloc ();
+#endif
+#include "libiberty.h"
+
+#ifdef TEST
+int global_total_width;
+#endif
+
+/*
+
+@deftypefn Extension int vasprintf (char **@var{resptr}, @
+  const char *@var{format}, va_list @var{args})
+
+Like @code{vsprintf}, but instead of passing a pointer to a buffer,
+you pass a pointer to a pointer.  This function will compute the size
+of the buffer needed, allocate memory with @code{malloc}, and store a
+pointer to the allocated memory in @code{*@var{resptr}}.  The value
+returned is the same as @code{vsprintf} would return.  If memory could
+not be allocated, minus one is returned and @code{NULL} is stored in
+@code{*@var{resptr}}.
+
+@end deftypefn
+
+*/
+
+static int int_vasprintf (char **, const char *, va_list);
+
+static int
+int_vasprintf (char **result, const char *format, va_list args)
+{
+  const char *p = format;
+  /* Add one to make sure that it is never zero, which might cause malloc
+     to return NULL.  */
+  int total_width = strlen (format) + 1;
+  va_list ap;
+
+#ifdef va_copy
+  va_copy (ap, args);
+#else
+  memcpy ((PTR) &ap, (PTR) &args, sizeof (va_list));
+#endif
+
+  while (*p != '\0')
+    {
+      if (*p++ == '%')
+	{
+	  while (strchr ("-+ #0", *p))
+	    ++p;
+	  if (*p == '*')
+	    {
+	      ++p;
+	      total_width += abs (va_arg (ap, int));
+	    }
+	  else
+	    total_width += strtoul (p, (char **) &p, 10);
+	  if (*p == '.')
+	    {
+	      ++p;
+	      if (*p == '*')
+		{
+		  ++p;
+		  total_width += abs (va_arg (ap, int));
+		}
+	      else
+	      total_width += strtoul (p, (char **) &p, 10);
+	    }
+	  while (strchr ("hlL", *p))
+	    ++p;
+	  /* Should be big enough for any format specifier except %s and floats.  */
+	  total_width += 30;
+	  switch (*p)
+	    {
+	    case 'd':
+	    case 'i':
+	    case 'o':
+	    case 'u':
+	    case 'x':
+	    case 'X':
+	    case 'c':
+	      (void) va_arg (ap, int);
+	      break;
+	    case 'f':
+	    case 'e':
+	    case 'E':
+	    case 'g':
+	    case 'G':
+	      (void) va_arg (ap, double);
+	      /* Since an ieee double can have an exponent of 307, we'll
+		 make the buffer wide enough to cover the gross case. */
+	      total_width += 307;
+	      break;
+	    case 's':
+	      total_width += strlen (va_arg (ap, char *));
+	      break;
+	    case 'p':
+	    case 'n':
+	      (void) va_arg (ap, char *);
+	      break;
+	    }
+	  p++;
+	}
+    }
+#ifdef va_copy
+  va_end (ap);
+#endif
+#ifdef TEST
+  global_total_width = total_width;
+#endif
+  *result = (char *) malloc (total_width);
+  if (*result != NULL)
+    return vsprintf (*result, format, args);
+  else
+    return -1;
+}
+
+int
+vasprintf (char **result, const char *format,
+#if defined (_BSD_VA_LIST_) && defined (__FreeBSD__)
+           _BSD_VA_LIST_ args)
+#else
+           va_list args)
+#endif
+{
+  return int_vasprintf (result, format, args);
+}
+
+#ifdef TEST
+static void ATTRIBUTE_PRINTF_1
+checkit (const char *format, ...)
+{
+  char *result;
+  VA_OPEN (args, format);
+  VA_FIXEDARG (args, const char *, format);
+  vasprintf (&result, format, args);
+  VA_CLOSE (args);
+
+  if (strlen (result) < (size_t) global_total_width)
+    printf ("PASS: ");
+  else
+    printf ("FAIL: ");
+  printf ("%d %s\n", global_total_width, result);
+
+  free (result);
+}
+
+extern int main (void);
+
+int
+main (void)
+{
+  checkit ("%d", 0x12345678);
+  checkit ("%200d", 5);
+  checkit ("%.300d", 6);
+  checkit ("%100.150d", 7);
+  checkit ("%s", "jjjjjjjjjiiiiiiiiiiiiiiioooooooooooooooooppppppppppppaa\n\
+777777777777777777333333333333366666666666622222222222777777777777733333");
+  checkit ("%f%s%d%s", 1.0, "foo", 77, "asdjffffffffffffffiiiiiiiiiiixxxxx");
+
+  return 0;
+}
+#endif /* TEST */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/vfork.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/vfork.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/vfork.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/vfork.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,22 @@
+/* Emulate vfork using just plain fork, for systems without a real vfork.
+   This function is in the public domain. */
+
+/*
+
+@deftypefn Supplemental int vfork (void)
+
+Emulates @code{vfork} by calling @code{fork} and returning its value.
+
+@end deftypefn
+
+*/
+
+#include "ansidecl.h"
+
+extern int fork (void);
+
+int
+vfork (void)
+{
+  return (fork ());
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/vfprintf.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/vfprintf.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/vfprintf.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/vfprintf.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,15 @@
+/* Provide a version vfprintf in terms of _doprnt.
+   By Kaveh Ghazi  (ghazi@caip.rutgers.edu)  3/29/98
+   Copyright (C) 1998 Free Software Foundation, Inc.
+ */
+
+#include "ansidecl.h"
+#include <stdarg.h>
+#include <stdio.h>
+#undef vfprintf
+
+int
+vfprintf (FILE *stream, const char *format, va_list ap)
+{
+  return _doprnt (format, ap, stream);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/vprintf.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/vprintf.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/vprintf.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/vprintf.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+
+@deftypefn Supplemental int vprintf (const char *@var{format}, va_list @var{ap})
+@deftypefnx Supplemental int vfprintf (FILE *@var{stream}, @
+  const char *@var{format}, va_list @var{ap})
+@deftypefnx Supplemental int vsprintf (char *@var{str}, @
+  const char *@var{format}, va_list @var{ap})
+
+These functions are the same as @code{printf}, @code{fprintf}, and
+@code{sprintf}, respectively, except that they are called with a
+@code{va_list} instead of a variable number of arguments.  Note that
+they do not call @code{va_end}; this is the application's
+responsibility.  In @libib{} they are implemented in terms of the
+nonstandard but common function @code{_doprnt}.
+
+@end deftypefn
+
+*/
+
+#include <ansidecl.h>
+#include <stdarg.h>
+#include <stdio.h>
+#undef vprintf
+int
+vprintf (const char *format, va_list ap)
+{
+  return vfprintf (stdout, format, ap);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/vsnprintf.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/vsnprintf.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/vsnprintf.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/vsnprintf.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,148 @@
+/* Implement the vsnprintf function.
+   Copyright (C) 2003, 2004, 2005, 2011 Free Software Foundation, Inc.
+   Written by Kaveh R. Ghazi <ghazi@caip.rutgers.edu>.
+
+This file is part of the libiberty library.  This library is free
+software; you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This library 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 GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+
+As a special exception, if you link this library with files
+compiled with a GNU compiler to produce an executable, this does not cause
+the resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why
+the executable file might be covered by the GNU General Public License. */
+
+/*
+
+@deftypefn Supplemental int vsnprintf (char *@var{buf}, size_t @var{n}, @
+  const char *@var{format}, va_list @var{ap})
+
+This function is similar to @code{vsprintf}, but it will write to
+@var{buf} at most @code{@var{n}-1} bytes of text, followed by a
+terminating null byte, for a total of @var{n} bytes.  On error the
+return value is -1, otherwise it returns the number of characters that
+would have been printed had @var{n} been sufficiently large,
+regardless of the actual value of @var{n}.  Note some pre-C99 system
+libraries do not implement this correctly so users cannot generally
+rely on the return value if the system version of this function is
+used.
+
+@end deftypefn
+
+*/
+
+#include "config.h"
+#include "ansidecl.h"
+
+#include <stdarg.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#include "libiberty.h"
+
+/* This implementation relies on a working vasprintf.  */
+int
+vsnprintf (char *s, size_t n, const char *format, va_list ap)
+{
+  char *buf = 0;
+  int result = vasprintf (&buf, format, ap);
+
+  if (!buf)
+    return -1;
+  if (result < 0)
+    {
+      free (buf);
+      return -1;
+    }
+
+  result = strlen (buf);
+  if (n > 0)
+    {
+      if ((long) n > result)
+	memcpy (s, buf, result+1);
+      else
+        {
+	  memcpy (s, buf, n-1);
+	  s[n - 1] = 0;
+	}
+    }
+  free (buf);
+  return result;
+}
+
+#ifdef TEST
+/* Set the buffer to a known state.  */
+#define CLEAR(BUF) do { memset ((BUF), 'X', sizeof (BUF)); (BUF)[14] = '\0'; } while (0)
+/* For assertions.  */
+#define VERIFY(P) do { if (!(P)) abort(); } while (0)
+
+static int ATTRIBUTE_PRINTF_3
+checkit (char *s, size_t n, const char *format, ...)
+{
+  int result;
+  VA_OPEN (ap, format);
+  VA_FIXEDARG (ap, char *, s);
+  VA_FIXEDARG (ap, size_t, n);
+  VA_FIXEDARG (ap, const char *, format);
+  result = vsnprintf (s, n, format, ap);
+  VA_CLOSE (ap);
+  return result;
+}
+
+extern int main (void);
+int
+main (void)
+{
+  char buf[128];
+  int status;
+  
+  CLEAR (buf);
+  status = checkit (buf, 10, "%s:%d", "foobar", 9);
+  VERIFY (status==8 && memcmp (buf, "foobar:9\0XXXXX\0", 15) == 0);
+
+  CLEAR (buf);
+  status = checkit (buf, 9, "%s:%d", "foobar", 9);
+  VERIFY (status==8 && memcmp (buf, "foobar:9\0XXXXX\0", 15) == 0);
+
+  CLEAR (buf);
+  status = checkit (buf, 8, "%s:%d", "foobar", 9);
+  VERIFY (status==8 && memcmp (buf, "foobar:\0XXXXXX\0", 15) == 0);
+
+  CLEAR (buf);
+  status = checkit (buf, 7, "%s:%d", "foobar", 9);
+  VERIFY (status==8 && memcmp (buf, "foobar\0XXXXXXX\0", 15) == 0);
+
+  CLEAR (buf);
+  status = checkit (buf, 6, "%s:%d", "foobar", 9);
+  VERIFY (status==8 && memcmp (buf, "fooba\0XXXXXXXX\0", 15) == 0);
+
+  CLEAR (buf);
+  status = checkit (buf, 2, "%s:%d", "foobar", 9);
+  VERIFY (status==8 && memcmp (buf, "f\0XXXXXXXXXXXX\0", 15) == 0);
+
+  CLEAR (buf);
+  status = checkit (buf, 1, "%s:%d", "foobar", 9);
+  VERIFY (status==8 && memcmp (buf, "\0XXXXXXXXXXXXX\0", 15) == 0);
+
+  CLEAR (buf);
+  status = checkit (buf, 0, "%s:%d", "foobar", 9);
+  VERIFY (status==8 && memcmp (buf, "XXXXXXXXXXXXXX\0", 15) == 0);
+
+  return 0;
+}
+#endif /* TEST */
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/vsprintf.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/vsprintf.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/vsprintf.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/vsprintf.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,56 @@
+/* Simple implementation of vsprintf for systems without it.
+   Highly system-dependent, but should work on most "traditional"
+   implementations of stdio; newer ones should already have vsprintf.
+   Written by Per Bothner of Cygnus Support.
+   Based on libg++'s "form" (written by Doug Lea; dl@rocky.oswego.edu).
+   Copyright (C) 1991, 1995, 2002 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.  This library is free
+software; you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This library 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 GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+
+As a special exception, if you link this library with files
+compiled with a GNU compiler to produce an executable, this does not cause
+the resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why
+the executable file might be covered by the GNU General Public License. */
+
+#include <ansidecl.h>
+#include <stdarg.h>
+#include <stdio.h>
+#undef vsprintf
+
+#if defined _IOSTRG && defined _IOWRT
+
+int
+vsprintf (char *buf, const char *format, va_list ap)
+{
+  FILE b;
+  int ret;
+#ifdef VMS
+  b->_flag = _IOWRT|_IOSTRG;
+  b->_ptr = buf;
+  b->_cnt = 12000;
+#else
+  b._flag = _IOWRT|_IOSTRG;
+  b._ptr = buf;
+  b._cnt = 12000;
+#endif
+  ret = _doprnt(format, ap, &b);
+  putc('\0', &b);
+  return ret;
+
+}
+
+#endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/waitpid.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/waitpid.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/waitpid.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/waitpid.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+
+@deftypefn Supplemental int waitpid (int @var{pid}, int *@var{status}, int)
+
+This is a wrapper around the @code{wait} function.  Any ``special''
+values of @var{pid} depend on your implementation of @code{wait}, as
+does the return value.  The third argument is unused in @libib{}.
+
+@end deftypefn
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "ansidecl.h"
+
+/* On some systems (such as WindISS), you must include <sys/types.h>
+   to get the definition of "pid_t" before you include <sys/wait.h>.  */
+#include <sys/types.h>
+
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
+pid_t
+waitpid (pid_t pid, int *stat_loc, int options ATTRIBUTE_UNUSED)
+{
+  for (;;)
+    {
+      int wpid = wait(stat_loc);
+      if (wpid == pid || wpid == -1)
+	return wpid;
+    }
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/xatexit.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/xatexit.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/xatexit.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/xatexit.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 1990 Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ */
+
+
+/*
+
+@deftypefun int xatexit (void (*@var{fn}) (void))
+
+Behaves as the standard @code{atexit} function, but with no limit on
+the number of registered functions.  Returns 0 on success, or @minus{}1 on
+failure.  If you use @code{xatexit} to register functions, you must use
+@code{xexit} to terminate your program.
+
+@end deftypefun
+
+*/
+
+/* Adapted from newlib/libc/stdlib/{,at}exit.[ch].
+   If you use xatexit, you must call xexit instead of exit.  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "ansidecl.h"
+#include "libiberty.h"
+
+#include <stdio.h>
+
+#include <stddef.h>
+
+#if VMS
+#include <stdlib.h>
+#include <unixlib.h>
+#else
+/* For systems with larger pointers than ints, this must be declared.  */
+PTR malloc (size_t);
+#endif
+
+static void xatexit_cleanup (void);
+
+/* Pointer to function run by xexit.  */
+extern void (*_xexit_cleanup) (void);
+
+#define	XATEXIT_SIZE 32
+
+struct xatexit {
+	struct	xatexit *next;		/* next in list */
+	int	ind;			/* next index in this table */
+	void	(*fns[XATEXIT_SIZE]) (void);	/* the table itself */
+};
+
+/* Allocate one struct statically to guarantee that we can register
+   at least a few handlers.  */
+static struct xatexit xatexit_first;
+
+/* Points to head of LIFO stack.  */
+static struct xatexit *xatexit_head = &xatexit_first;
+
+/* Register function FN to be run by xexit.
+   Return 0 if successful, -1 if not.  */
+
+int
+xatexit (void (*fn) (void))
+{
+  register struct xatexit *p;
+
+  /* Tell xexit to call xatexit_cleanup.  */
+  if (!_xexit_cleanup)
+    _xexit_cleanup = xatexit_cleanup;
+
+  p = xatexit_head;
+  if (p->ind >= XATEXIT_SIZE)
+    {
+      if ((p = (struct xatexit *) malloc (sizeof *p)) == NULL)
+	return -1;
+      p->ind = 0;
+      p->next = xatexit_head;
+      xatexit_head = p;
+    }
+  p->fns[p->ind++] = fn;
+  return 0;
+}
+
+/* Call any cleanup functions.  */
+
+static void
+xatexit_cleanup (void)
+{
+  register struct xatexit *p;
+  register int n;
+
+  for (p = xatexit_head; p; p = p->next)
+    for (n = p->ind; --n >= 0;)
+      (*p->fns[n]) ();
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/xexit.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/xexit.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/xexit.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/xexit.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,52 @@
+/* xexit.c -- Run any exit handlers, then exit.
+   Copyright (C) 1994, 95, 1997 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If not, write
+to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/*
+
+@deftypefn Replacement void xexit (int @var{code})
+
+Terminates the program.  If any functions have been registered with
+the @code{xatexit} replacement function, they will be called first.
+Termination is handled via the system's normal @code{exit} call.
+
+@end deftypefn
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include "libiberty.h"
+
+
+/* This variable is set by xatexit if it is called.  This way, xmalloc
+   doesn't drag xatexit into the link.  */
+void (*_xexit_cleanup) (void);
+
+void
+xexit (int code)
+{
+  if (_xexit_cleanup != NULL)
+    (*_xexit_cleanup) ();
+  exit (code);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/xmalloc.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/xmalloc.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/xmalloc.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/xmalloc.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,184 @@
+/* memory allocation routines with error checking.
+   Copyright 1989, 90, 91, 92, 93, 94 Free Software Foundation, Inc.
+   
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/*
+
+@deftypefn Replacement void* xmalloc (size_t)
+
+Allocate memory without fail.  If @code{malloc} fails, this will print
+a message to @code{stderr} (using the name set by
+@code{xmalloc_set_program_name},
+if any) and then call @code{xexit}.  Note that it is therefore safe for
+a program to contain @code{#define malloc xmalloc} in its source.
+
+@end deftypefn
+
+@deftypefn Replacement void* xrealloc (void *@var{ptr}, size_t @var{size})
+Reallocate memory without fail.  This routine functions like @code{realloc},
+but will behave the same as @code{xmalloc} if memory cannot be found.
+
+@end deftypefn
+
+@deftypefn Replacement void* xcalloc (size_t @var{nelem}, size_t @var{elsize})
+
+Allocate memory without fail, and set it to zero.  This routine functions
+like @code{calloc}, but will behave the same as @code{xmalloc} if memory
+cannot be found.
+
+@end deftypefn
+
+@deftypefn Replacement void xmalloc_set_program_name (const char *@var{name})
+
+You can use this to set the name of the program used by
+@code{xmalloc_failed} when printing a failure message.
+
+@end deftypefn
+
+@deftypefn Replacement void xmalloc_failed (size_t)
+
+This function is not meant to be called by client code, and is listed
+here for completeness only.  If any of the allocation routines fail, this
+function will be called to print an error message and terminate execution.
+
+@end deftypefn
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "ansidecl.h"
+#include "libiberty.h"
+
+#include <stdio.h>
+
+#include <stddef.h>
+
+#if VMS
+#include <stdlib.h>
+#include <unixlib.h>
+#else
+/* For systems with larger pointers than ints, these must be declared.  */
+#  if HAVE_STDLIB_H && HAVE_UNISTD_H && HAVE_DECL_MALLOC \
+      && HAVE_DECL_REALLOC && HAVE_DECL_CALLOC && HAVE_DECL_SBRK
+#    include <stdlib.h>
+#    include <unistd.h>
+#  else
+#    ifdef __cplusplus
+extern "C" {
+#    endif /* __cplusplus */
+void *malloc (size_t);
+void *realloc (void *, size_t);
+void *calloc (size_t, size_t);
+void *sbrk (ptrdiff_t);
+#    ifdef __cplusplus
+}
+#    endif /* __cplusplus */
+#  endif /* HAVE_STDLIB_H ...  */
+#endif /* VMS */
+
+/* The program name if set.  */
+static const char *name = "";
+
+#ifdef HAVE_SBRK
+/* The initial sbrk, set when the program name is set. Not used for win32
+   ports other than cygwin32.  */
+static char *first_break = NULL;
+#endif /* HAVE_SBRK */
+
+void
+xmalloc_set_program_name (const char *s)
+{
+  name = s;
+#ifdef HAVE_SBRK
+  /* Win32 ports other than cygwin32 don't have brk() */
+  if (first_break == NULL)
+    first_break = (char *) sbrk (0);
+#endif /* HAVE_SBRK */
+}
+
+void
+xmalloc_failed (size_t size)
+{
+#ifdef HAVE_SBRK
+  extern char **environ;
+  size_t allocated;
+
+  if (first_break != NULL)
+    allocated = (char *) sbrk (0) - first_break;
+  else
+    allocated = (char *) sbrk (0) - (char *) &environ;
+  fprintf (stderr,
+	   "\n%s%sout of memory allocating %lu bytes after a total of %lu bytes\n",
+	   name, *name ? ": " : "",
+	   (unsigned long) size, (unsigned long) allocated);
+#else /* HAVE_SBRK */
+  fprintf (stderr,
+	   "\n%s%sout of memory allocating %lu bytes\n",
+	   name, *name ? ": " : "",
+	   (unsigned long) size);
+#endif /* HAVE_SBRK */
+  xexit (1);
+}  
+
+PTR
+xmalloc (size_t size)
+{
+  PTR newmem;
+
+  if (size == 0)
+    size = 1;
+  newmem = malloc (size);
+  if (!newmem)
+    xmalloc_failed (size);
+
+  return (newmem);
+}
+
+PTR
+xcalloc (size_t nelem, size_t elsize)
+{
+  PTR newmem;
+
+  if (nelem == 0 || elsize == 0)
+    nelem = elsize = 1;
+
+  newmem = calloc (nelem, elsize);
+  if (!newmem)
+    xmalloc_failed (nelem * elsize);
+
+  return (newmem);
+}
+
+PTR
+xrealloc (PTR oldmem, size_t size)
+{
+  PTR newmem;
+
+  if (size == 0)
+    size = 1;
+  if (!oldmem)
+    newmem = malloc (size);
+  else
+    newmem = realloc (oldmem, size);
+  if (!newmem)
+    xmalloc_failed (size);
+
+  return (newmem);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/xmemdup.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/xmemdup.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/xmemdup.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/xmemdup.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,39 @@
+/* xmemdup.c -- Duplicate a memory buffer, using xcalloc.
+   This trivial function is in the public domain.
+   Jeff Garzik, September 1999.  */
+
+/*
+
+@deftypefn Replacement void* xmemdup (void *@var{input}, @
+  size_t @var{copy_size}, size_t @var{alloc_size})
+
+Duplicates a region of memory without fail.  First, @var{alloc_size} bytes
+are allocated, then @var{copy_size} bytes from @var{input} are copied into
+it, and the new memory is returned.  If fewer bytes are copied than were
+allocated, the remaining memory is zeroed.
+
+@end deftypefn
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "ansidecl.h"
+#include "libiberty.h"
+
+#include <sys/types.h> /* For size_t. */
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+# ifdef HAVE_STRINGS_H
+#  include <strings.h>
+# endif
+#endif
+
+PTR
+xmemdup (const PTR input, size_t copy_size, size_t alloc_size)
+{
+  PTR output = xcalloc (1, alloc_size);
+  return (PTR) memcpy (output, input, copy_size);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/xstrdup.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/xstrdup.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/xstrdup.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/xstrdup.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,36 @@
+/* xstrdup.c -- Duplicate a string in memory, using xmalloc.
+   This trivial function is in the public domain.
+   Ian Lance Taylor, Cygnus Support, December 1995.  */
+
+/*
+
+@deftypefn Replacement char* xstrdup (const char *@var{s})
+
+Duplicates a character string without fail, using @code{xmalloc} to
+obtain memory.
+
+@end deftypefn
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <sys/types.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+# ifdef HAVE_STRINGS_H
+#  include <strings.h>
+# endif
+#endif
+#include "ansidecl.h"
+#include "libiberty.h"
+
+char *
+xstrdup (const char *s)
+{
+  register size_t len = strlen (s) + 1;
+  register char *ret = XNEWVEC (char, len);
+  return (char *) memcpy (ret, s, len);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/xstrerror.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/xstrerror.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/xstrerror.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/xstrerror.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,79 @@
+/* xstrerror.c -- jacket routine for more robust strerror() usage.
+   Fri Jun 16 18:30:00 1995  Pat Rankin  <rankin@eql.caltech.edu>
+   This code is in the public domain.  */
+
+/*
+
+@deftypefn Replacement char* xstrerror (int @var{errnum})
+
+Behaves exactly like the standard @code{strerror} function, but
+will never return a @code{NULL} pointer.
+
+@end deftypefn
+
+*/
+
+#include <stdio.h>
+
+#include "config.h"
+#include "libiberty.h"
+
+#ifdef VMS
+#  include <errno.h>
+#  if !defined (__STRICT_ANSI__) && !defined (__HIDE_FORBIDDEN_NAMES)
+#    ifdef __cplusplus
+extern "C" {
+#    endif /* __cplusplus */
+extern char *strerror (int,...);
+#    define DONT_DECLARE_STRERROR
+#    ifdef __cplusplus
+}
+#    endif /* __cplusplus */
+#  endif
+#endif  /* VMS */
+
+
+#ifndef DONT_DECLARE_STRERROR
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+extern char *strerror (int);
+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */
+#endif
+
+/* If strerror returns NULL, we'll format the number into a static buffer.  */
+
+#define ERRSTR_FMT "undocumented error #%d"
+static char xstrerror_buf[sizeof ERRSTR_FMT + 20];
+
+/* Like strerror, but result is never a null pointer.  */
+
+char *
+xstrerror (int errnum)
+{
+  char *errstr;
+#ifdef VMS
+  char *(*vmslib_strerror) (int,...);
+
+  /* Override any possibly-conflicting declaration from system header.  */
+  vmslib_strerror = (char *(*) (int,...)) strerror;
+  /* Second argument matters iff first is EVMSERR, but it's simpler to
+     pass it unconditionally.  `vaxc$errno' is declared in <errno.h>
+     and maintained by the run-time library in parallel to `errno'.
+     We assume that `errnum' corresponds to the last value assigned to
+     errno by the run-time library, hence vaxc$errno will be relevant.  */
+  errstr = (*vmslib_strerror) (errnum, vaxc$errno);
+#else
+  errstr = strerror (errnum);
+#endif
+
+  /* If `errnum' is out of range, result might be NULL.  We'll fix that.  */
+  if (!errstr)
+    {
+      sprintf (xstrerror_buf, ERRSTR_FMT, errnum);
+      errstr = xstrerror_buf;
+    }
+  return errstr;
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/xstrndup.c sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/xstrndup.c
--- sdcc-3.1.0+dfsg/support/sdbinutils/libiberty/xstrndup.c	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libiberty/xstrndup.c	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,60 @@
+/* Implement the xstrndup function.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   Written by Kaveh R. Ghazi <ghazi@caip.rutgers.edu>.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/*
+
+@deftypefn Replacement char* xstrndup (const char *@var{s}, size_t @var{n})
+
+Returns a pointer to a copy of @var{s} with at most @var{n} characters
+without fail, using @code{xmalloc} to obtain memory.  The result is
+always NUL terminated.
+
+@end deftypefn
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <sys/types.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+# ifdef HAVE_STRINGS_H
+#  include <strings.h>
+# endif
+#endif
+#include "ansidecl.h"
+#include "libiberty.h"
+
+char *
+xstrndup (const char *s, size_t n)
+{
+  char *result;
+  size_t len = strlen (s);
+
+  if (n < len)
+    len = n;
+
+  result = XNEWVEC (char, len + 1);
+
+  result[len] = '\0';
+  return (char *) memcpy (result, s, len);
+}
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/libtool.m4 sdcc-3.2.0+dfsg/support/sdbinutils/libtool.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/libtool.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/libtool.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,7424 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
+
+# serial 56 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from `configure', and `config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain="$ac_aux_dir/ltmain.sh"
+])# _LT_PROG_LTMAIN
+
+
+## ------------------------------------- ##
+## Accumulate code for creating libtool. ##
+## ------------------------------------- ##
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the `libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to `config.status' so that its
+# declaration there will have the same value as in `configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags="_LT_TAGS"dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into `config.status', and then the shell code to quote escape them in
+# for loops in `config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# `#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+\`$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2009 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test $[#] != 0
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try \`$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try \`$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test "$silent" = yes &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  _LT_PROG_XSI_SHELLFNS
+
+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS="$save_LDFLAGS"
+    ])
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES
+# --------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    m4_if([$1], [CXX],
+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX
+# -----------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script which will find a shell with a builtin
+# printf (which we can use as an echo command).
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`print -r -- -n 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*" 
+}
+
+case "$ECHO" in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
+
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  ppc64-*linux*|powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  ppc*-*linux*|powerpc*-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+])# _LT_ENABLE_LOCK
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[AC_CHECK_TOOL(AR, ar, false)
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1])
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line __oline__ "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+void fnord () __attribute__((visibility("default")));
+#endif
+
+void fnord () { int i=42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links="nottested"
+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[123]]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+haiku*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
+    [Run-time system search path for libraries])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program which can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program which can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method == "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  AC_SUBST([DUMPBIN])
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+const struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+AC_MSG_CHECKING([for $compiler option to produce PIC])
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ F* | *Sun*Fortran*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+  ;;
+  cygwin* | mingw* | cegcc*)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  esac
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+      # FIXME: Should let the user specify the lib program.
+      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+        save_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+        AC_LINK_IFELSE(int foo(void) {},
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+        )
+        LDFLAGS="$save_LDFLAGS"
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
+    [[If ld is used when linking, flag to hardcode $libdir into a binary
+    during linking.  This must work even if $libdir does not exist]])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [fix_srcfile_path], [1],
+    [Fix the shell variable $srcfile for the compiler])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report which library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC="$lt_save_CC"
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+        # as there is no search path for DLLs.
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+        _LT_TAGVAR(always_export_symbols, $1)=no
+        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+          # If the export-symbols file already is a .def file (1st line
+          # is EXPORTS), use it as is; otherwise, prepend...
+          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    cp $export_symbols $output_objdir/$soname.def;
+          else
+	    echo EXPORTS > $output_objdir/$soname.def;
+	    cat $export_symbols >> $output_objdir/$soname.def;
+          fi~
+          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        else
+          _LT_TAGVAR(ld_shlibs, $1)=no
+        fi
+        ;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd[[12]]*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      gnu*)
+        ;;
+
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+		$RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+	      '"$_LT_TAGVAR(reload_cmds, $1)"
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)="$GXX"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+])
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       else
+	 prev=
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 case $p in
+	 -L* | -R*)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       ;;
+
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_F77" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  CC=${F77-"f77"}
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$G77"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+fi # test "$_lt_disable_F77" != yes
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_FC" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  CC=${FC-"f95"}
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+fi # test "$_lt_disable_FC" != yes
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC="$lt_save_CC"
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+AC_MSG_RESULT([$xsi_shell])
+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
+
+AC_MSG_CHECKING([whether the shell understands "+="])
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+AC_MSG_RESULT([$lt_shell_append])
+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PROG_XSI_SHELLFNS
+# ---------------------
+# Bourne and XSI compatible variants of some useful shell functions.
+m4_defun([_LT_PROG_XSI_SHELLFNS],
+[case $xsi_shell in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result="${1##*/}"
+}
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+  func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+  # positional parameters, so assign one to ordinary parameter first.
+  func_stripname_result=${3}
+  func_stripname_result=${func_stripname_result#"${1}"}
+  func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=${1%%=*}
+  func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  case ${1} in
+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+    *)    func_lo2o_result=${1} ;;
+  esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=$(( $[*] ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=${#1}
+}
+
+_LT_EOF
+    ;;
+  *) # Bourne compatible functions.
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+}
+
+dnl func_dirname_and_basename
+dnl A portable version of this function is already defined in general.m4sh
+dnl so there is no need for it here.
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+  case ${2} in
+    .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+    *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+}
+
+# sed scripts:
+my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[[^=]]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
+  func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=`expr "$[@]"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
+esac
+
+case $lt_shell_append in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$[1]+=\$[2]"
+}
+_LT_EOF
+    ;;
+  *)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$[1]=\$$[1]\$[2]"
+}
+
+_LT_EOF
+    ;;
+  esac
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/ltgcc.m4 sdcc-3.2.0+dfsg/support/sdbinutils/ltgcc.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/ltgcc.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/ltgcc.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,60 @@
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.  Locally modified to
+# run its tests on C programs, because we cannot link Java programs until
+# we have finished building libjava.
+AC_DEFUN([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=c
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+GCC=yes
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+_LT_TAGVAR(compiler, $1)=${GCJ-gcj}
+AC_LANG_RESTORE
+])# _LT_LANG_GCJ_CONFIG
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/ltmain.sh sdcc-3.2.0+dfsg/support/sdbinutils/ltmain.sh
--- sdcc-3.1.0+dfsg/support/sdbinutils/ltmain.sh	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/ltmain.sh	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,8636 @@
+# Generated from ltmain.m4sh.
+
+# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Usage: $progname [OPTION]... [MODE-ARG]...
+#
+# Provide generalized library-building support services.
+#
+#       --config             show all configuration variables
+#       --debug              enable verbose shell tracing
+#   -n, --dry-run            display commands without modifying any files
+#       --features           display basic configuration information and exit
+#       --mode=MODE          use operation mode MODE
+#       --no-finish          let install mode avoid finish commands
+#       --preserve-dup-deps  don't remove duplicate dependency libraries
+#       --quiet, --silent    don't print informational messages
+#       --no-quiet, --no-silent
+#                            print informational messages (default)
+#       --tag=TAG            use configuration variables from tag TAG
+#   -v, --verbose            print more informational messages than default
+#       --no-verbose         don't print the extra informational messages
+#       --version            print version information
+#   -h, --help, --help-all   print short, long, or detailed help message
+#
+# MODE must be one of the following:
+#
+#         clean              remove files from the build directory
+#         compile            compile a source file into a libtool object
+#         execute            automatically set library path, then run a program
+#         finish             complete the installation of libtool libraries
+#         install            install libraries or executables
+#         link               create a library or an executable
+#         uninstall          remove libraries from an installed directory
+#
+# MODE-ARGS vary depending on the MODE.  When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+#
+# When reporting a bug, please describe a test case to reproduce it and
+# include the following information:
+#
+#         host-triplet:	$host
+#         shell:		$SHELL
+#         compiler:		$LTCC
+#         compiler flags:		$LTCFLAGS
+#         linker:		$LD (gnu? $with_gnu_ld)
+#         $progname:	(GNU libtool 1.3134 2009-11-29) 2.2.7a
+#         automake:	$automake_version
+#         autoconf:	$autoconf_version
+#
+# Report bugs to <bug-libtool@gnu.org>.
+
+PROGRAM=libtool
+PACKAGE=libtool
+VERSION=2.2.7a
+TIMESTAMP=" 1.3134 2009-11-29"
+package_revision=1.3134
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# NLS nuisances: We save the old values to restore during execute mode.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
+lt_user_locale=
+lt_safe_locale=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+          save_$lt_var=\$$lt_var
+          $lt_var=C
+	  export $lt_var
+	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
+	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+	fi"
+done
+
+$lt_unset CDPATH
+
+
+
+
+
+
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+
+
+: ${CP="cp -f"}
+: ${ECHO=$as_echo}
+: ${EGREP="/bin/grep -E"}
+: ${FGREP="/bin/grep -F"}
+: ${GREP="/bin/grep"}
+: ${LN_S="ln -s"}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+: ${Xsed="$SED -e 1s/^X//"}
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+
+exit_status=$EXIT_SUCCESS
+
+# Make sure IFS has a sensible default
+lt_nl='
+'
+IFS=" 	$lt_nl"
+
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,"
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+  func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+}
+
+# Generated shell functions inserted here.
+
+# These SED scripts presuppose an absolute path with a trailing slash.
+pathcar='s,^/\([^/]*\).*$,\1,'
+pathcdr='s,^/[^/]*,,'
+removedotparts=':dotsl
+		s@/\./@/@g
+		t dotsl
+		s,/\.$,/,'
+collapseslashes='s@/\{1,\}@/@g'
+finalslash='s,/*$,/,'
+
+# func_normal_abspath PATH
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+#             value returned in "$func_normal_abspath_result"
+func_normal_abspath ()
+{
+  # Start from root dir and reassemble the path.
+  func_normal_abspath_result=
+  func_normal_abspath_tpath=$1
+  func_normal_abspath_altnamespace=
+  case $func_normal_abspath_tpath in
+    "")
+      # Empty path, that just means $cwd.
+      func_stripname '' '/' "`pwd`"
+      func_normal_abspath_result=$func_stripname_result
+      return
+    ;;
+    # The next three entries are used to spot a run of precisely
+    # two leading slashes without using negated character classes;
+    # we take advantage of case's first-match behaviour.
+    ///*)
+      # Unusual form of absolute path, do nothing.
+    ;;
+    //*)
+      # Not necessarily an ordinary path; POSIX reserves leading '//'
+      # and for example Cygwin uses it to access remote file shares
+      # over CIFS/SMB, so we conserve a leading double slash if found.
+      func_normal_abspath_altnamespace=/
+    ;;
+    /*)
+      # Absolute path, do nothing.
+    ;;
+    *)
+      # Relative path, prepend $cwd.
+      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+    ;;
+  esac
+  # Cancel out all the simple stuff to save iterations.  We also want
+  # the path to end with a slash for ease of parsing, so make sure
+  # there is one (and only one) here.
+  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
+  while :; do
+    # Processed it all yet?
+    if test "$func_normal_abspath_tpath" = / ; then
+      # If we ascended to the root using ".." the result may be empty now.
+      if test -z "$func_normal_abspath_result" ; then
+        func_normal_abspath_result=/
+      fi
+      break
+    fi
+    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcar"`
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcdr"`
+    # Figure out what to do with it
+    case $func_normal_abspath_tcomponent in
+      "")
+        # Trailing empty path component, ignore it.
+      ;;
+      ..)
+        # Parent dir; strip last assembled component from result.
+        func_dirname "$func_normal_abspath_result"
+        func_normal_abspath_result=$func_dirname_result
+      ;;
+      *)
+        # Actual path component, append it.
+        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
+      ;;
+    esac
+  done
+  # Restore leading double-slash if one was found on entry.
+  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+# func_relative_path SRCDIR DSTDIR
+# generates a relative path from SRCDIR to DSTDIR, with a trailing
+# slash if non-empty, suitable for immediately appending a filename
+# without needing to append a separator.
+#             value returned in "$func_relative_path_result"
+func_relative_path ()
+{
+  func_relative_path_result=
+  func_normal_abspath "$1"
+  func_relative_path_tlibdir=$func_normal_abspath_result
+  func_normal_abspath "$2"
+  func_relative_path_tbindir=$func_normal_abspath_result
+
+  # Ascend the tree starting from libdir
+  while :; do
+    # check if we have found a prefix of bindir
+    case $func_relative_path_tbindir in
+      $func_relative_path_tlibdir)
+        # found an exact match
+        func_relative_path_tcancelled=
+        break
+        ;;
+      $func_relative_path_tlibdir*)
+        # found a matching prefix
+        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+        func_relative_path_tcancelled=$func_stripname_result
+        if test -z "$func_relative_path_result"; then
+          func_relative_path_result=.
+        fi
+        break
+        ;;
+      *)
+        func_dirname $func_relative_path_tlibdir
+        func_relative_path_tlibdir=${func_dirname_result}
+        if test "x$func_relative_path_tlibdir" = x ; then
+          # Have to descend all the way to the root!
+          func_relative_path_result=../$func_relative_path_result
+          func_relative_path_tcancelled=$func_relative_path_tbindir
+          break
+        fi
+        func_relative_path_result=../$func_relative_path_result
+        ;;
+    esac
+  done
+
+  # Now calculate path; take care to avoid doubling-up slashes.
+  func_stripname '' '/' "$func_relative_path_result"
+  func_relative_path_result=$func_stripname_result
+  func_stripname '/' '/' "$func_relative_path_tcancelled"
+  if test "x$func_stripname_result" != x ; then
+    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
+  fi
+
+  # Normalisation. If bindir is libdir, return empty string,
+  # else relative path ending with a slash; either way, target
+  # file name can be directly appended.
+  if test ! -z "$func_relative_path_result"; then
+    func_stripname './' '' "$func_relative_path_result/"
+    func_relative_path_result=$func_stripname_result
+  fi
+}
+
+# The name of this program:
+func_dirname_and_basename "$progpath"
+progname=$func_basename_result
+
+# Make sure we have an absolute path for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=$func_dirname_result
+     progdir=`cd "$progdir" && pwd`
+     progpath="$progdir/$progname"
+     ;;
+  *)
+     save_IFS="$IFS"
+     IFS=:
+     for progdir in $PATH; do
+       IFS="$save_IFS"
+       test -x "$progdir/$progname" && break
+     done
+     IFS="$save_IFS"
+     test -n "$progdir" || progdir=`pwd`
+     progpath="$progdir/$progname"
+     ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Re-`\' parameter expansions in output of double_quote_subst that were
+# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
+# in input to double_quote_subst, that '$' was protected from expansion.
+# Since each input `\' is now two `\'s, look for any number of runs of
+# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
+bs='\\'
+bs2='\\\\'
+bs4='\\\\\\\\'
+dollar='\$'
+sed_double_backslash="\
+  s/$bs4/&\\
+/g
+  s/^$bs2$dollar/$bs&/
+  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
+  s/\n//g"
+
+# Standard options:
+opt_dry_run=false
+opt_help=false
+opt_quiet=false
+opt_verbose=false
+opt_warning=:
+
+# func_echo arg...
+# Echo program name prefixed message, along with the current mode
+# name if it has been set yet.
+func_echo ()
+{
+    $ECHO "$progname${mode+: }$mode: $*"
+}
+
+# func_verbose arg...
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+    $opt_verbose && func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
+}
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+# func_error arg...
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+}
+
+# func_warning arg...
+# Echo program name prefixed warning message to standard error.
+func_warning ()
+{
+    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+
+    # bash bug again:
+    :
+}
+
+# func_fatal_error arg...
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+# func_fatal_help arg...
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    func_error ${1+"$@"}
+    func_fatal_error "$help"
+}
+help="Try \`$progname --help' for more information."  ## default
+
+
+# func_grep expression filename
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+    $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_mkdir_p directory-path
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+    my_directory_path="$1"
+    my_dir_list=
+
+    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+
+      # Protect directory names starting with `-'
+      case $my_directory_path in
+        -*) my_directory_path="./$my_directory_path" ;;
+      esac
+
+      # While some portion of DIR does not yet exist...
+      while test ! -d "$my_directory_path"; do
+        # ...make a list in topmost first order.  Use a colon delimited
+	# list incase some portion of path contains whitespace.
+        my_dir_list="$my_directory_path:$my_dir_list"
+
+        # If the last portion added has no slash in it, the list is done
+        case $my_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+      done
+      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+
+      save_mkdir_p_IFS="$IFS"; IFS=':'
+      for my_dir in $my_dir_list; do
+	IFS="$save_mkdir_p_IFS"
+        # mkdir can fail with a `File exist' error if two processes
+        # try to create one of the directories concurrently.  Don't
+        # stop in that case!
+        $MKDIR "$my_dir" 2>/dev/null || :
+      done
+      IFS="$save_mkdir_p_IFS"
+
+      # Bail out if we (or some other process) failed to create a directory.
+      test -d "$my_directory_path" || \
+        func_fatal_error "Failed to create \`$1'"
+    fi
+}
+
+
+# func_mktempdir [string]
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, STRING is the basename for that directory.
+func_mktempdir ()
+{
+    my_template="${TMPDIR-/tmp}/${1-$progname}"
+
+    if test "$opt_dry_run" = ":"; then
+      # Return a directory name, but don't create it in dry-run mode
+      my_tmpdir="${my_template}-$$"
+    else
+
+      # If mktemp works, use that first and foremost
+      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$my_tmpdir"; then
+        # Failing that, at least try and use $RANDOM to avoid a race
+        my_tmpdir="${my_template}-${RANDOM-0}$$"
+
+        save_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$my_tmpdir"
+        umask $save_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$my_tmpdir" || \
+        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+    fi
+
+    $ECHO "$my_tmpdir"
+}
+
+
+# func_quote_for_eval arg
+# Aesthetically quote ARG to be evaled later.
+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
+# is double-quoted, suitable for a subsequent eval, whereas
+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
+# which are still active within double quotes backslashified.
+func_quote_for_eval ()
+{
+    case $1 in
+      *[\\\`\"\$]*)
+	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
+      *)
+        func_quote_for_eval_unquoted_result="$1" ;;
+    esac
+
+    case $func_quote_for_eval_unquoted_result in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting, command substitution and and variable
+      # expansion for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+        ;;
+      *)
+        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+    esac
+}
+
+
+# func_quote_for_expand arg
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+    case $1 in
+      *[\\\`\"]*)
+	my_arg=`$ECHO "$1" | $SED \
+	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+      *)
+        my_arg="$1" ;;
+    esac
+
+    case $my_arg in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting and command substitution for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        my_arg="\"$my_arg\""
+        ;;
+    esac
+
+    func_quote_for_expand_result="$my_arg"
+}
+
+
+# func_show_eval cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
+
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$my_cmd"
+      my_status=$?
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
+      fi
+    fi
+}
+
+
+# func_show_eval_locale cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.  Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
+
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$lt_user_locale
+	    $my_cmd"
+      my_status=$?
+      eval "$lt_safe_locale"
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
+      fi
+    fi
+}
+
+
+
+
+
+# func_version
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $SED -n '/(C)/!b go
+	:more
+	/\./!{
+	  N
+	  s/\n# //
+	  b more
+	}
+	:go
+	/^# '$PROGRAM' (GNU /,/# warranty; / {
+        s/^# //
+	s/^# *$//
+        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
+        p
+     }' < "$progpath"
+     exit $?
+}
+
+# func_usage
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $SED -n '/^# Usage:/,/^#  *-h/ {
+        s/^# //
+	s/^# *$//
+	s/\$progname/'$progname'/
+	p
+    }' < "$progpath"
+    echo
+    $ECHO "run \`$progname --help | more' for full usage"
+    exit $?
+}
+
+# func_help [NOEXIT]
+# Echo long help message to standard output and exit,
+# unless 'noexit' is passed as argument.
+func_help ()
+{
+    $SED -n '/^# Usage:/,/# Report bugs to/ {
+        s/^# //
+	s/^# *$//
+	s*\$progname*'$progname'*
+	s*\$host*'"$host"'*
+	s*\$SHELL*'"$SHELL"'*
+	s*\$LTCC*'"$LTCC"'*
+	s*\$LTCFLAGS*'"$LTCFLAGS"'*
+	s*\$LD*'"$LD"'*
+	s/\$with_gnu_ld/'"$with_gnu_ld"'/
+	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	p
+     }' < "$progpath"
+    ret=$?
+    if test -z "$1"; then
+      exit $ret
+    fi
+}
+
+# func_missing_arg argname
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+    func_error "missing argument for $1"
+    exit_cmd=exit
+}
+
+exit_cmd=:
+
+
+
+
+
+
+magic="%%%MAGIC variable%%%"
+magic_exe="%%%MAGIC EXE variable%%%"
+
+# Global variables.
+# $mode is unset
+nonopt=
+execute_dlfiles=
+preserve_args=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
+
+opt_dry_run=false
+opt_finish=:
+opt_duplicate_deps=false
+opt_silent=false
+opt_debug=:
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+# func_fatal_configuration arg...
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+    func_error ${1+"$@"}
+    func_error "See the $PACKAGE documentation for more information."
+    func_fatal_error "Fatal configuration error."
+}
+
+
+# func_config
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+    re_begincf='^# ### BEGIN LIBTOOL'
+    re_endcf='^# ### END LIBTOOL'
+
+    # Default configuration.
+    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
+    done
+
+    exit $?
+}
+
+# func_features
+# Display the features supported by this script.
+func_features ()
+{
+    echo "host: $host"
+    if test "$build_libtool_libs" = yes; then
+      echo "enable shared libraries"
+    else
+      echo "disable shared libraries"
+    fi
+    if test "$build_old_libs" = yes; then
+      echo "enable static libraries"
+    else
+      echo "disable static libraries"
+    fi
+
+    exit $?
+}
+
+# func_enable_tag tagname
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+  # Global variable:
+  tagname="$1"
+
+  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+  sed_extractcf="/$re_begincf/,/$re_endcf/p"
+
+  # Validate tagname.
+  case $tagname in
+    *[!-_A-Za-z0-9,/]*)
+      func_fatal_error "invalid tag name: $tagname"
+      ;;
+  esac
+
+  # Don't test for the "default" C tag, as we know it's
+  # there but not specially marked.
+  case $tagname in
+    CC) ;;
+    *)
+      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	taglist="$taglist $tagname"
+
+	# Evaluate the configuration.  Be careful to quote the path
+	# and the sed script, to avoid splitting on whitespace, but
+	# also don't use non-portable quotes within backquotes within
+	# quotes we have to do it in 2 steps:
+	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	eval "$extractedcf"
+      else
+	func_error "ignoring unknown tag $tagname"
+      fi
+      ;;
+  esac
+}
+
+# Parse options once, thoroughly.  This comes as soon as possible in
+# the script to make things like `libtool --version' happen quickly.
+{
+
+  # Shorthand for --mode=foo, only valid as the first argument
+  case $1 in
+  clean|clea|cle|cl)
+    shift; set dummy --mode clean ${1+"$@"}; shift
+    ;;
+  compile|compil|compi|comp|com|co|c)
+    shift; set dummy --mode compile ${1+"$@"}; shift
+    ;;
+  execute|execut|execu|exec|exe|ex|e)
+    shift; set dummy --mode execute ${1+"$@"}; shift
+    ;;
+  finish|finis|fini|fin|fi|f)
+    shift; set dummy --mode finish ${1+"$@"}; shift
+    ;;
+  install|instal|insta|inst|ins|in|i)
+    shift; set dummy --mode install ${1+"$@"}; shift
+    ;;
+  link|lin|li|l)
+    shift; set dummy --mode link ${1+"$@"}; shift
+    ;;
+  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+    shift; set dummy --mode uninstall ${1+"$@"}; shift
+    ;;
+  esac
+
+  # Parse non-mode specific arguments:
+  while test "$#" -gt 0; do
+    opt="$1"
+    shift
+
+    case $opt in
+      --config)		func_config					;;
+
+      --debug)		preserve_args="$preserve_args $opt"
+			func_echo "enabling shell trace mode"
+			opt_debug='set -x'
+			$opt_debug
+			;;
+
+      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+			execute_dlfiles="$execute_dlfiles $1"
+			shift
+			;;
+
+      --dry-run | -n)	opt_dry_run=:					;;
+      --features)       func_features					;;
+      --finish)		mode="finish"					;;
+      --no-finish)	opt_finish=false				;;
+
+      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+			case $1 in
+			  # Valid mode arguments:
+			  clean)	;;
+			  compile)	;;
+			  execute)	;;
+			  finish)	;;
+			  install)	;;
+			  link)		;;
+			  relink)	;;
+			  uninstall)	;;
+
+			  # Catch anything else as an error
+			  *) func_error "invalid argument for $opt"
+			     exit_cmd=exit
+			     break
+			     ;;
+		        esac
+
+			mode="$1"
+			shift
+			;;
+
+      --preserve-dup-deps)
+			opt_duplicate_deps=:				;;
+
+      --quiet|--silent)	preserve_args="$preserve_args $opt"
+			opt_silent=:
+			opt_verbose=false
+			;;
+
+      --no-quiet|--no-silent)
+			preserve_args="$preserve_args $opt"
+			opt_silent=false
+			;;
+
+      --verbose| -v)	preserve_args="$preserve_args $opt"
+			opt_silent=false
+			opt_verbose=:
+			;;
+
+      --no-verbose)	preserve_args="$preserve_args $opt"
+			opt_verbose=false
+			;;
+
+      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+			preserve_args="$preserve_args $opt $1"
+			func_enable_tag "$1"	# tagname is set here
+			shift
+			;;
+
+      # Separate optargs to long options:
+      -dlopen=*|--mode=*|--tag=*)
+			func_opt_split "$opt"
+			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+			shift
+			;;
+
+      -\?|-h)		func_usage					;;
+      --help)		opt_help=:					;;
+      --help-all)	opt_help=': help-all'				;;
+      --version)	func_version					;;
+
+      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
+
+      *)		nonopt="$opt"
+			break
+			;;
+    esac
+  done
+
+
+  case $host in
+    *cygwin* | *mingw* | *pw32* | *cegcc*)
+      # don't eliminate duplications in $postdeps and $predeps
+      opt_duplicate_compiler_generated_deps=:
+      ;;
+    *)
+      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
+      ;;
+  esac
+
+  # Having warned about all mis-specified options, bail out if
+  # anything was wrong.
+  $exit_cmd $EXIT_FAILURE
+}
+
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+  if test "$package_revision" != "$macro_revision"; then
+    if test "$VERSION" != "$macro_version"; then
+      if test -z "$macro_version"; then
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      fi
+    else
+      cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+    fi
+
+    exit $EXIT_MISMATCH
+  fi
+}
+
+
+## ----------- ##
+##    Main.    ##
+## ----------- ##
+
+$opt_help || {
+  # Sanity checks first:
+  func_check_version_match
+
+  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+    func_fatal_configuration "not configured to build any kind of library"
+  fi
+
+  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+
+
+  # Darwin sucks
+  eval "std_shrext=\"$shrext_cmds\""
+
+
+  # Only execute mode is allowed to have -dlopen flags.
+  if test -n "$execute_dlfiles" && test "$mode" != execute; then
+    func_error "unrecognized option \`-dlopen'"
+    $ECHO "$help" 1>&2
+    exit $EXIT_FAILURE
+  fi
+
+  # Change the help message to a mode-specific one.
+  generic_help="$help"
+  help="Try \`$progname --help --mode=$mode' for more information."
+}
+
+
+# func_lalib_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+    test -f "$1" &&
+      $SED -e 4q "$1" 2>/dev/null \
+        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs.  To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway.  Works if `file' does not exist.
+func_lalib_unsafe_p ()
+{
+    lalib_p=no
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+	for lalib_p_l in 1 2 3 4
+	do
+	    read lalib_p_line
+	    case "$lalib_p_line" in
+		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+	    esac
+	done
+	exec 0<&5 5<&-
+    fi
+    test "$lalib_p" = yes
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+    func_lalib_p "$1"
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+    func_ltwrapper_exec_suffix=
+    case $1 in
+    *.exe) ;;
+    *) func_ltwrapper_exec_suffix=.exe ;;
+    esac
+    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
+
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+    func_ltwrapper_scriptname_result=""
+    if func_ltwrapper_executable_p "$1"; then
+	func_dirname_and_basename "$1" "" "."
+	func_stripname '' '.exe' "$func_basename_result"
+	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+    fi
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+    $opt_debug
+    save_ifs=$IFS; IFS='~'
+    for cmd in $1; do
+      IFS=$save_ifs
+      eval "cmd=\"$cmd\""
+      func_show_eval "$cmd" "${2-:}"
+    done
+    IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)!  Also, sourcing
+# `FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+    $opt_debug
+    case $1 in
+    */* | *\\*)	. "$1" ;;
+    *)		. "./$1" ;;
+    esac
+}
+
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    $opt_debug
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+        func_quote_for_eval "$arg"
+	CC_quoted="$CC_quoted $func_quote_for_eval_result"
+      done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	      # Double-quote args containing other shell metacharacters.
+	      func_quote_for_eval "$arg"
+	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	    done
+	    CC_expanded=`func_echo_all $CC`
+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
+	    case "$@ " in
+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  func_echo "unable to infer tagged configuration"
+	  func_fatal_error "specify a tag with \`--tag'"
+#	else
+#	  func_verbose "using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=${1}
+    if test "$build_libtool_libs" = yes; then
+      write_lobj=\'${2}\'
+    else
+      write_lobj=none
+    fi
+
+    if test "$build_old_libs" = yes; then
+      write_oldobj=\'${3}\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+      $MV "${write_libobj}T" "${write_libobj}"
+    }
+}
+
+# func_mode_compile arg...
+func_mode_compile ()
+{
+    $opt_debug
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
+    pie_flag=
+
+    for arg
+    do
+      case $arg_mode in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg="$arg"
+	arg_mode=normal
+	;;
+
+      target )
+	libobj="$arg"
+	arg_mode=normal
+	continue
+	;;
+
+      normal )
+	# Accept any command-line options.
+	case $arg in
+	-o)
+	  test -n "$libobj" && \
+	    func_fatal_error "you cannot specify \`-o' more than once"
+	  arg_mode=target
+	  continue
+	  ;;
+
+	-pie | -fpie | -fPIE)
+          pie_flag="$pie_flag $arg"
+	  continue
+	  ;;
+
+	-shared | -static | -prefer-pic | -prefer-non-pic)
+	  later="$later $arg"
+	  continue
+	  ;;
+
+	-no-suppress)
+	  suppress_opt=no
+	  continue
+	  ;;
+
+	-Xcompiler)
+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+	  continue      #  The current "srcfile" will either be retained or
+	  ;;            #  replaced later.  I would guess that would be a bug.
+
+	-Wc,*)
+	  func_stripname '-Wc,' '' "$arg"
+	  args=$func_stripname_result
+	  lastarg=
+	  save_ifs="$IFS"; IFS=','
+	  for arg in $args; do
+	    IFS="$save_ifs"
+	    func_quote_for_eval "$arg"
+	    lastarg="$lastarg $func_quote_for_eval_result"
+	  done
+	  IFS="$save_ifs"
+	  func_stripname ' ' '' "$lastarg"
+	  lastarg=$func_stripname_result
+
+	  # Add the arguments to base_compile.
+	  base_compile="$base_compile $lastarg"
+	  continue
+	  ;;
+
+	*)
+	  # Accept the current argument as the source file.
+	  # The previous "srcfile" becomes the current argument.
+	  #
+	  lastarg="$srcfile"
+	  srcfile="$arg"
+	  ;;
+	esac  #  case $arg
+	;;
+      esac    #  case $arg_mode
+
+      # Aesthetically quote the previous argument.
+      func_quote_for_eval "$lastarg"
+      base_compile="$base_compile $func_quote_for_eval_result"
+    done # for arg
+
+    case $arg_mode in
+    arg)
+      func_fatal_error "you must specify an argument for -Xcompile"
+      ;;
+    target)
+      func_fatal_error "you must specify a target with \`-o'"
+      ;;
+    *)
+      # Get the name of the library object.
+      test -z "$libobj" && {
+	func_basename "$srcfile"
+	libobj="$func_basename_result"
+      }
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    case $libobj in
+    *.[cCFSifmso] | \
+    *.ada | *.adb | *.ads | *.asm | \
+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+      func_xform "$libobj"
+      libobj=$func_xform_result
+      ;;
+    esac
+
+    case $libobj in
+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
+    *)
+      func_fatal_error "cannot determine name of library object from \`$libobj'"
+      ;;
+    esac
+
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	continue
+	;;
+
+      -static)
+	build_libtool_libs=no
+	build_old_libs=yes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=yes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=no
+	continue
+	;;
+      esac
+    done
+
+    func_quote_for_eval "$libobj"
+    test "X$libobj" != "X$func_quote_for_eval_result" \
+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
+      && func_warning "libobj name \`$libobj' may not contain shell special characters."
+    func_dirname_and_basename "$obj" "/" ""
+    objname="$func_basename_result"
+    xdir="$func_dirname_result"
+    lobj=${xdir}$objdir/$objname
+
+    test -z "$base_compile" && \
+      func_fatal_help "you must specify a compilation command"
+
+    # Delete any leftover library objects.
+    if test "$build_old_libs" = yes; then
+      removelist="$obj $lobj $libobj ${libobj}T"
+    else
+      removelist="$lobj $libobj ${libobj}T"
+    fi
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
+      pic_mode=default
+      ;;
+    esac
+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+      # non-PIC code in shared libraries is not supported
+      pic_mode=default
+    fi
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test "$compiler_c_o" = no; then
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
+      lockfile="$output_obj.lock"
+    else
+      output_obj=
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test "$need_locks" = yes; then
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    elif test "$need_locks" = warn; then
+      if test -f "$lockfile"; then
+	$ECHO "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+      removelist="$removelist $output_obj"
+      $ECHO "$srcfile" > "$lockfile"
+    fi
+
+    $opt_dry_run || $RM $removelist
+    removelist="$removelist $lockfile"
+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
+    if test -n "$fix_srcfile_path"; then
+      eval "srcfile=\"$fix_srcfile_path\""
+    fi
+    func_quote_for_eval "$srcfile"
+    qsrcfile=$func_quote_for_eval_result
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test "$build_libtool_libs" = yes; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      if test "$pic_mode" != no; then
+	command="$base_compile $qsrcfile $pic_flag"
+      else
+	# Don't build PIC code
+	command="$base_compile $qsrcfile"
+      fi
+
+      func_mkdir_p "$xdir$objdir"
+
+      if test -z "$output_obj"; then
+	# Place PIC objects in $objdir
+	command="$command -o $lobj"
+      fi
+
+      func_show_eval_locale "$command"	\
+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+	func_show_eval '$MV "$output_obj" "$lobj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+
+      # Allow error messages only from the first compilation.
+      if test "$suppress_opt" = yes; then
+	suppress_output=' >/dev/null 2>&1'
+      fi
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test "$build_old_libs" = yes; then
+      if test "$pic_mode" != yes; then
+	# Don't build PIC code
+	command="$base_compile $qsrcfile$pie_flag"
+      else
+	command="$base_compile $qsrcfile $pic_flag"
+      fi
+      if test "$compiler_c_o" = yes; then
+	command="$command -o $obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      command="$command$suppress_output"
+      func_show_eval_locale "$command" \
+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+	func_show_eval '$MV "$output_obj" "$obj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+    fi
+
+    $opt_dry_run || {
+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+      # Unlock the critical section if it was locked
+      if test "$need_locks" != no; then
+	removelist=$lockfile
+        $RM "$lockfile"
+      fi
+    }
+
+    exit $EXIT_SUCCESS
+}
+
+$opt_help || {
+  test "$mode" = compile && func_mode_compile ${1+"$@"}
+}
+
+func_mode_help ()
+{
+    # We need to display help for each of the modes.
+    case $mode in
+      "")
+        # Generic help is extracted from the usage comments
+        # at the start of this file.
+        func_help
+        ;;
+
+      clean)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      compile)
+      $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -no-suppress      do not suppress compiler output for multiple passes
+  -prefer-pic       try to building PIC objects only
+  -prefer-non-pic   try to building non-PIC objects only
+  -shared           do not build a \`.o' file suitable for static linking
+  -static           only build a \`.o' file suitable for static linking
+  -Wc,FLAG          pass FLAG directly to the compiler
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+        ;;
+
+      execute)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+        ;;
+
+      finish)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the \`--dry-run' option if you just want to see what would be executed."
+        ;;
+
+      install)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the \`install' or \`cp' program.
+
+The following components of INSTALL-COMMAND are treated specially:
+
+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+        ;;
+
+      link)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -bindir BINDIR    specify path to binaries directory (for systems where
+                    libraries must be found in the PATH setting at runtime)
+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -shared           only do dynamic linking of libtool libraries
+  -shrext SUFFIX    override the standard shared library file extension
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+  -weak LIBNAME     declare that the target provides the LIBNAME interface
+  -Wc,FLAG
+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wl,FLAG
+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+        ;;
+
+      uninstall)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      *)
+        func_fatal_help "invalid operation mode \`$mode'"
+        ;;
+    esac
+
+    echo
+    $ECHO "Try \`$progname --help' for more information about other modes."
+}
+
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+  if test "$opt_help" = :; then
+    func_mode_help
+  else
+    {
+      func_help noexit
+      for mode in compile link execute install finish uninstall clean; do
+	func_mode_help
+      done
+    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
+    {
+      func_help noexit
+      for mode in compile link execute install finish uninstall clean; do
+	echo
+	func_mode_help
+      done
+    } |
+    sed '1d
+      /^When reporting/,/^Report/{
+	H
+	d
+      }
+      $x
+      /information about other modes/d
+      /more detailed .*MODE/d
+      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+  fi
+  exit $?
+fi
+
+
+# func_mode_execute arg...
+func_mode_execute ()
+{
+    $opt_debug
+    # The first argument is the command name.
+    cmd="$nonopt"
+    test -z "$cmd" && \
+      func_fatal_help "you must specify a COMMAND"
+
+    # Handle -dlopen flags immediately.
+    for file in $execute_dlfiles; do
+      test -f "$file" \
+	|| func_fatal_help "\`$file' is not a file"
+
+      dir=
+      case $file in
+      *.la)
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$lib' is not a valid libtool archive"
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+	func_source "$file"
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && \
+	    func_warning "\`$file' was not linked with \`-export-dynamic'"
+	  continue
+	fi
+
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  dir="$dir/$objdir"
+	else
+	  if test ! -f "$dir/$dlname"; then
+	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	  fi
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+	;;
+
+      *)
+	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir="$absdir"
+
+      # Now add the directory to shlibpath_var.
+      if eval test -z \"\$$shlibpath_var\"; then
+	eval $shlibpath_var=\$dir
+      else
+	eval $shlibpath_var=\$dir:\$$shlibpath_var
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic="$magic"
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -* | *.la | *.lo ) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if func_ltwrapper_script_p "$file"; then
+	  func_source "$file"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	elif func_ltwrapper_executable_p "$file"; then
+	  func_ltwrapper_scriptname "$file"
+	  func_source "$func_ltwrapper_scriptname_result"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      func_quote_for_eval "$file"
+      args="$args $func_quote_for_eval_result"
+    done
+
+    if test "X$opt_dry_run" = Xfalse; then
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+	      else
+		$lt_unset $lt_var
+	      fi"
+      done
+
+      # Now prepare to actually exec the command.
+      exec_cmd="\$cmd$args"
+    else
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	echo "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test "$mode" = execute && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $opt_debug
+    libdirs="$nonopt"
+    admincmds=
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for dir
+      do
+	libdirs="$libdirs $dir"
+      done
+
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    $opt_silent && exit $EXIT_SUCCESS
+
+    echo "----------------------------------------------------------------------"
+    echo "Libraries have been installed in:"
+    for libdir in $libdirs; do
+      $ECHO "   $libdir"
+    done
+    echo
+    echo "If you ever happen to want to link against installed libraries"
+    echo "in a given directory, LIBDIR, you must either use libtool, and"
+    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+    echo "flag during linking and do at least one of the following:"
+    if test -n "$shlibpath_var"; then
+      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+      echo "     during execution"
+    fi
+    if test -n "$runpath_var"; then
+      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+      echo "     during linking"
+    fi
+    if test -n "$hardcode_libdir_flag_spec"; then
+      libdir=LIBDIR
+      eval "flag=\"$hardcode_libdir_flag_spec\""
+
+      $ECHO "   - use the \`$flag' linker flag"
+    fi
+    if test -n "$admincmds"; then
+      $ECHO "   - have your system administrator run these commands:$admincmds"
+    fi
+    if test -f /etc/ld.so.conf; then
+      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+    fi
+    echo
+
+    echo "See any operating system documentation about shared libraries for"
+    case $host in
+      solaris2.[6789]|solaris2.1[0-9])
+        echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	echo "pages."
+	;;
+      *)
+        echo "more information, such as the ld(1) and ld.so(8) manual pages."
+        ;;
+    esac
+    echo "----------------------------------------------------------------------"
+    exit $EXIT_SUCCESS
+}
+
+test "$mode" = finish && func_mode_finish ${1+"$@"}
+
+
+# func_mode_install arg...
+func_mode_install ()
+{
+    $opt_debug
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+       # Allow the use of GNU shtool's install command.
+       case $nonopt in *shtool*) :;; *) false;; esac; then
+      # Aesthetically quote it.
+      func_quote_for_eval "$nonopt"
+      install_prog="$func_quote_for_eval_result "
+      arg=$1
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    func_quote_for_eval "$arg"
+    install_prog="$install_prog$func_quote_for_eval_result"
+    install_shared_prog=$install_prog
+    case " $install_prog " in
+      *[\\\ /]cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=no
+    stripme=
+    no_mode=:
+    for arg
+    do
+      arg2=
+      if test -n "$dest"; then
+	files="$files $dest"
+	dest=$arg
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=yes ;;
+      -f)
+	if $install_cp; then :; else
+	  prev=$arg
+	fi
+	;;
+      -g | -m | -o)
+	prev=$arg
+	;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*)
+	;;
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
+	    arg2=$install_override_mode
+	    no_mode=false
+	  fi
+	  prev=
+	else
+	  dest=$arg
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      func_quote_for_eval "$arg"
+      install_prog="$install_prog $func_quote_for_eval_result"
+      if test -n "$arg2"; then
+	func_quote_for_eval "$arg2"
+      fi
+      install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
+    done
+
+    test -z "$install_prog" && \
+      func_fatal_help "you must specify an install program"
+
+    test -n "$prev" && \
+      func_fatal_help "the \`$prev' option requires an argument"
+
+    if test -n "$install_override_mode" && $no_mode; then
+      if $install_cp; then :; else
+	func_quote_for_eval "$install_override_mode"
+	install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
+      fi
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	func_fatal_help "no file or destination specified"
+      else
+	func_fatal_help "you must specify a destination"
+      fi
+    fi
+
+    # Strip any trailing slash from the destination.
+    func_stripname '' '/' "$dest"
+    dest=$func_stripname_result
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=yes
+    if test "$isdir" = yes; then
+      destdir="$dest"
+      destname=
+    else
+      func_dirname_and_basename "$dest" "" "."
+      destdir="$func_dirname_result"
+      destname="$func_basename_result"
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files; shift
+      test "$#" -gt 1 && \
+	func_fatal_help "\`$dest' is not a directory"
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  func_fatal_help "\`$destdir' must be an absolute directory name"
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	staticlibs="$staticlibs $file"
+	;;
+
+      *.la)
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$file' is not a valid libtool archive"
+
+	library_names=
+	old_library=
+	relink_command=
+	func_source "$file"
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  esac
+	fi
+
+	func_dirname "$file" "/" ""
+	dir="$func_dirname_result"
+	dir="$dir$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  test "$inst_prefix_dir" = "$destdir" && \
+	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	  fi
+
+	  func_warning "relinking \`$file'"
+	  func_show_eval "$relink_command" \
+	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names; shift
+	if test -n "$1"; then
+	  realname="$1"
+	  shift
+
+	  srcname="$realname"
+	  test -n "$relink_command" && srcname="$realname"T
+
+	  # Install the shared library and build the symlinks.
+	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
+	      'exit $?'
+	  tstripme="$stripme"
+	  case $host_os in
+	  cygwin* | mingw* | pw32* | cegcc*)
+	    case $realname in
+	    *.dll.a)
+	      tstripme=""
+	      ;;
+	    esac
+	    ;;
+	  esac
+	  if test -n "$tstripme" && test -n "$striplib"; then
+	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
+	    for linkname
+	    do
+	      test "$linkname" != "$realname" \
+		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib="$destdir/$realname"
+	  func_execute_cmds "$postinstall_cmds" 'exit $?'
+	fi
+
+	# Install the pseudo-library for information purposes.
+	func_basename "$file"
+	name="$func_basename_result"
+	instname="$dir/$name"i
+	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  func_lo2o "$destfile"
+	  staticdest=$func_lo2o_result
+	  ;;
+	*.$objext)
+	  staticdest="$destfile"
+	  destfile=
+	  ;;
+	*)
+	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	test -n "$destfile" && \
+	  func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+	# Install the old object if enabled.
+	if test "$build_old_libs" = yes; then
+	  # Deduce the name of the old-style object file.
+	  func_lo2o "$file"
+	  staticobj=$func_lo2o_result
+	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+	fi
+	exit $EXIT_SUCCESS
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=""
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      func_stripname '' '.exe' "$file"
+	      file=$func_stripname_result
+	      stripped_ext=".exe"
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin* | *mingw*)
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      wrapper=$func_ltwrapper_scriptname_result
+	    else
+	      func_stripname '' '.exe' "$file"
+	      wrapper=$func_stripname_result
+	    fi
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if func_ltwrapper_script_p "$wrapper"; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  func_source "$wrapper"
+
+	  # Check the variables that should have been set.
+	  test -z "$generated_by_libtool_version" && \
+	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+
+	  finalize=yes
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      func_source "$lib"
+	    fi
+	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      func_warning "\`$lib' has not been installed in \`$libdir'"
+	      finalize=no
+	    fi
+	  done
+
+	  relink_command=
+	  func_source "$wrapper"
+
+	  outputname=
+	  if test "$fast_install" = no && test -n "$relink_command"; then
+	    $opt_dry_run || {
+	      if test "$finalize" = yes; then
+	        tmpdir=`func_mktempdir`
+		func_basename "$file$stripped_ext"
+		file="$func_basename_result"
+	        outputname="$tmpdir/$file"
+	        # Replace the output file specification.
+	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+
+	        $opt_silent || {
+	          func_quote_for_expand "$relink_command"
+		  eval "func_echo $func_quote_for_expand_result"
+	        }
+	        if eval "$relink_command"; then :
+	          else
+		  func_error "error: relink \`$file' with the above command before installing it"
+		  $opt_dry_run || ${RM}r "$tmpdir"
+		  continue
+	        fi
+	        file="$outputname"
+	      else
+	        func_warning "cannot relink \`$file'"
+	      fi
+	    }
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyway
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    func_stripname '' '.exe' "$destfile"
+	    destfile=$func_stripname_result
+	    ;;
+	  esac
+	  ;;
+	esac
+	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+	$opt_dry_run || if test -n "$outputname"; then
+	  ${RM}r "$tmpdir"
+	fi
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      func_basename "$file"
+      name="$func_basename_result"
+
+      # Set up the ranlib parameters.
+      oldlib="$destdir/$name"
+
+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	func_show_eval "$old_striplib $oldlib" 'exit $?'
+      fi
+
+      # Do each command in the postinstall commands.
+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+    done
+
+    test -n "$future_libdirs" && \
+      func_warning "remember to run \`$progname --finish$future_libdirs'"
+
+    if test -n "$current_libdirs" && $opt_finish; then
+      # Maybe just do a dry run.
+      $opt_dry_run && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test "$mode" = install && func_mode_install ${1+"$@"}
+
+
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+    $opt_debug
+    my_outputname="$1"
+    my_originator="$2"
+    my_pic_p="${3-no}"
+    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+    my_dlsyms=
+
+    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	my_dlsyms="${my_outputname}S.c"
+      else
+	func_error "not configured to extract global symbols from dlpreopened files"
+      fi
+    fi
+
+    if test -n "$my_dlsyms"; then
+      case $my_dlsyms in
+      "") ;;
+      *.c)
+	# Discover the nlist of each of the dlfiles.
+	nlist="$output_objdir/${my_outputname}.nm"
+
+	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+	# Parse the name list into a source file.
+	func_verbose "creating $output_objdir/$my_dlsyms"
+
+	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
+/* External symbol declarations for the compiler. */\
+"
+
+	if test "$dlself" = yes; then
+	  func_verbose "generating symbol list for \`$output'"
+
+	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+	  # Add our own program objects to the symbol list.
+	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	  for progfile in $progfiles; do
+	    func_verbose "extracting global C symbols from \`$progfile'"
+	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -n "$exclude_expsyms"; then
+	    $opt_dry_run || {
+	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	      $MV "$nlist"T "$nlist"
+	    }
+	  fi
+
+	  if test -n "$export_symbols_regex"; then
+	    $opt_dry_run || {
+	      $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T
+	      $MV "$nlist"T "$nlist"
+	    }
+	  fi
+
+	  # Prepare the list of exported symbols
+	  if test -z "$export_symbols"; then
+	    export_symbols="$output_objdir/$outputname.exp"
+	    $opt_dry_run || {
+	      $RM $export_symbols
+	      ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols"
+	      case $host in
+	      *cygwin* | *mingw* | *cegcc* )
+                echo EXPORTS > "$output_objdir/$outputname.def"
+                cat "$export_symbols" >> "$output_objdir/$outputname.def"
+	        ;;
+	      esac
+	    }
+	  else
+	    $opt_dry_run || {
+	      ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp"
+	      $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T
+	      $MV "$nlist"T "$nlist"
+	      case $host in
+	        *cygwin* | *mingw* | *cegcc* )
+	          echo EXPORTS > "$output_objdir/$outputname.def"
+	          cat "$nlist" >> "$output_objdir/$outputname.def"
+	          ;;
+	      esac
+	    }
+	  fi
+	fi
+
+	for dlprefile in $dlprefiles; do
+	  func_verbose "extracting global C symbols from \`$dlprefile'"
+	  func_basename "$dlprefile"
+	  name="$func_basename_result"
+	  $opt_dry_run || {
+	    $ECHO ": $name " >> "$nlist"
+	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	  }
+	done
+
+	$opt_dry_run || {
+	  # Make sure we have at least an empty file.
+	  test -f "$nlist" || : > "$nlist"
+
+	  if test -n "$exclude_expsyms"; then
+	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	    $MV "$nlist"T "$nlist"
+	  fi
+
+	  # Try sorting and uniquifying the output.
+	  if $GREP -v "^: " < "$nlist" |
+	      if sort -k 3 </dev/null >/dev/null 2>&1; then
+		sort -k 3
+	      else
+		sort +2
+	      fi |
+	      uniq > "$nlist"S; then
+	    :
+	  else
+	    $GREP -v "^: " < "$nlist" > "$nlist"S
+	  fi
+
+	  if test -f "$nlist"S; then
+	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+	  else
+	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	  fi
+
+	  echo >> "$output_objdir/$my_dlsyms" "\
+
+/* The mapping between symbol names and symbols.  */
+typedef struct {
+  const char *name;
+  void *address;
+} lt_dlsymlist;
+"
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc* )
+	    echo >> "$output_objdir/$my_dlsyms" "\
+/* DATA imports from DLLs on WIN32 con't be const, because
+   runtime relocations are performed -- see ld's documentation
+   on pseudo-relocs.  */"
+	    lt_dlsym_const= ;;
+	  *osf5*)
+	    echo >> "$output_objdir/$my_dlsyms" "\
+/* This system does not cope well with relocations in const data */"
+	    lt_dlsym_const= ;;
+	  *)
+	    lt_dlsym_const=const ;;
+	  esac
+
+	  echo >> "$output_objdir/$my_dlsyms" "\
+extern $lt_dlsym_const lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];
+$lt_dlsym_const lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[] =
+{\
+  { \"$my_originator\", (void *) 0 },"
+
+	  case $need_lib_prefix in
+	  no)
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  *)
+	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  esac
+	  echo >> "$output_objdir/$my_dlsyms" "\
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	} # !$opt_dry_run
+
+	pic_flag_for_symtable=
+	case "$compile_command " in
+	*" -static "*) ;;
+	*)
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+	  *-*-hpux*)
+	    pic_flag_for_symtable=" $pic_flag"  ;;
+	  *)
+	    if test "X$my_pic_p" != Xno; then
+	      pic_flag_for_symtable=" $pic_flag"
+	    fi
+	    ;;
+	  esac
+	  ;;
+	esac
+	symtab_cflags=
+	for arg in $LTCFLAGS; do
+	  case $arg in
+	  -pie | -fpie | -fPIE) ;;
+	  *) symtab_cflags="$symtab_cflags $arg" ;;
+	  esac
+	done
+
+	# Now compile the dynamic symbol file.
+	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+
+	# Clean up the generated files.
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+
+	# Transform the symbol file into the correct name.
+	symfileobj="$output_objdir/${my_outputname}S.$objext"
+	case $host in
+	*cygwin* | *mingw* | *cegcc* )
+	  if test -f "$output_objdir/$my_outputname.def"; then
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	  else
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  fi
+	  ;;
+	*)
+	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  ;;
+	esac
+	;;
+      *)
+	func_fatal_error "unknown suffix for \`$my_dlsyms'"
+	;;
+      esac
+    else
+      # We keep going just in case the user didn't refer to
+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+      # really was required.
+
+      # Nullify the symbol file.
+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
+    fi
+}
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
+func_win32_libid ()
+{
+  $opt_debug
+  win32_libid_type="unknown"
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null |
+       $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+      win32_nmres=`$NM -f posix -A "$1" |
+	$SED -n -e '
+	    1,100{
+		/ I /{
+		    s,.*,import,
+		    p
+		    q
+		}
+	    }'`
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $ECHO "$win32_libid_type"
+}
+
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    $opt_debug
+    f_ex_an_ar_dir="$1"; shift
+    f_ex_an_ar_oldlib="$1"
+    if test "$lock_old_archive_extraction" = yes; then
+      lockfile=$f_ex_an_ar_oldlib.lock
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    fi
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+		   'stat=$?; rm -f "$lockfile"; exit $stat'
+    if test "$lock_old_archive_extraction" = yes; then
+      $opt_dry_run || rm -f "$lockfile"
+    fi
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+    fi
+}
+
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    $opt_debug
+    my_gentop="$1"; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=""
+    my_xlib=""
+    my_xabs=""
+    my_xdir=""
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      func_basename "$my_xlib"
+      my_xlib="$func_basename_result"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  func_arith $extracted_serial + 1
+	  extracted_serial=$func_arith_result
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
+
+      func_mkdir_p "$my_xdir"
+
+      case $host in
+      *-darwin*)
+	func_verbose "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	$opt_dry_run || {
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  darwin_base_archive=`basename "$darwin_archive"`
+	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+	  if test -n "$darwin_arches"; then
+	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches ; do
+	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	      cd "$darwin_curdir"
+	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	    done # $darwin_arches
+            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+	      $LIPO -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    $RM -rf unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd $darwin_orig_dir
+	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	} # !$opt_dry_run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+	;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+    done
+
+    func_extract_archives_result="$my_oldobjs"
+}
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=${1-no}
+
+	$ECHO "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='$sed_quote_subst'
+
+# Be Bourne compatible
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='$macro_version'
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    file=\"\$0\""
+
+    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+    ECHO=\"$qECHO\"
+  fi\
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+    # special case for '.'
+    if test \"\$thisdir\" = \".\"; then
+      thisdir=\`pwd\`
+    fi
+    # remove .libs from thisdir
+    case \"\$thisdir\" in
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    $objdir )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test "$fast_install" = yes; then
+	  $ECHO "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" ||
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $MKDIR \"\$progdir\"
+    else
+      $RM \"\$progdir/\$file\"
+    fi"
+
+	  $ECHO "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then :
+      else
+	$ECHO \"\$relink_command_output\" >&2
+	$RM \"\$progdir/\$file\"
+	exit 1
+      fi
+    fi
+
+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $RM \"\$progdir/\$program\";
+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $RM \"\$progdir/\$file\"
+  fi"
+	else
+	  $ECHO "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$ECHO "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# Export our shlibpath_var if we have one.
+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $ECHO "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	# fixup the dll searchpath if we need to.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	$ECHO "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+"
+	case $host in
+	# Backslashes separate directories on plain windows
+	*-*-mingw | *-*-os2* | *-cegcc*)
+	  $ECHO "\
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+	  ;;
+
+	*)
+	  $ECHO "\
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+	  ;;
+	esac
+	$ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+    fi
+  else
+    # The program doesn't exist.
+    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+}
+
+
+# func_to_host_path arg
+#
+# Convert paths to host format when used with build tools.
+# Intended for use with "native" mingw (where libtool itself
+# is running under the msys shell), or in the following cross-
+# build environments:
+#    $build          $host
+#    mingw (msys)    mingw  [e.g. native]
+#    cygwin          mingw
+#    *nix + wine     mingw
+# where wine is equipped with the `winepath' executable.
+# In the native mingw case, the (msys) shell automatically
+# converts paths for any non-msys applications it launches,
+# but that facility isn't available from inside the cwrapper.
+# Similar accommodations are necessary for $host mingw and
+# $build cygwin.  Calling this function does no harm for other
+# $host/$build combinations not listed above.
+#
+# ARG is the path (on $build) that should be converted to
+# the proper representation for $host. The result is stored
+# in $func_to_host_path_result.
+func_to_host_path ()
+{
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    case $host in
+      *mingw* )
+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+        case $build in
+          *mingw* ) # actually, msys
+            # awkward: cmd appends spaces to result
+            func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
+              $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+            ;;
+          *cygwin* )
+            func_to_host_path_result=`cygpath -w "$1" |
+	      $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          * )
+            # Unfortunately, winepath does not exit with a non-zero
+            # error code, so we are forced to check the contents of
+            # stdout. On the other hand, if the command is not
+            # found, the shell will set an exit code of 127 and print
+            # *an error message* to stdout. So we must check for both
+            # error code of zero AND non-empty stdout, which explains
+            # the odd construction:
+            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
+            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
+              func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
+                $SED -e "$lt_sed_naive_backslashify"`
+            else
+              # Allow warning below.
+              func_to_host_path_result=
+            fi
+            ;;
+        esac
+        if test -z "$func_to_host_path_result" ; then
+          func_error "Could not determine host path corresponding to"
+          func_error "  \`$1'"
+          func_error "Continuing, but uninstalled executables may not work."
+          # Fallback:
+          func_to_host_path_result="$1"
+        fi
+        ;;
+    esac
+  fi
+}
+# end: func_to_host_path
+
+# func_to_host_pathlist arg
+#
+# Convert pathlists to host format when used with build tools.
+# See func_to_host_path(), above. This function supports the
+# following $build/$host combinations (but does no harm for
+# combinations not listed here):
+#    $build          $host
+#    mingw (msys)    mingw  [e.g. native]
+#    cygwin          mingw
+#    *nix + wine     mingw
+#
+# Path separators are also converted from $build format to
+# $host format. If ARG begins or ends with a path separator
+# character, it is preserved (but converted to $host format)
+# on output.
+#
+# ARG is a pathlist (on $build) that should be converted to
+# the proper representation on $host. The result is stored
+# in $func_to_host_pathlist_result.
+func_to_host_pathlist ()
+{
+  func_to_host_pathlist_result="$1"
+  if test -n "$1"; then
+    case $host in
+      *mingw* )
+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+        # Remove leading and trailing path separator characters from
+        # ARG. msys behavior is inconsistent here, cygpath turns them
+        # into '.;' and ';.', and winepath ignores them completely.
+	func_stripname : : "$1"
+        func_to_host_pathlist_tmp1=$func_stripname_result
+        case $build in
+          *mingw* ) # Actually, msys.
+            # Awkward: cmd appends spaces to result.
+            func_to_host_pathlist_result=`
+	      ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
+	      $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+            ;;
+          *cygwin* )
+            func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          * )
+            # unfortunately, winepath doesn't convert pathlists
+            func_to_host_pathlist_result=""
+            func_to_host_pathlist_oldIFS=$IFS
+            IFS=:
+            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
+              IFS=$func_to_host_pathlist_oldIFS
+              if test -n "$func_to_host_pathlist_f" ; then
+                func_to_host_path "$func_to_host_pathlist_f"
+                if test -n "$func_to_host_path_result" ; then
+                  if test -z "$func_to_host_pathlist_result" ; then
+                    func_to_host_pathlist_result="$func_to_host_path_result"
+                  else
+                    func_append func_to_host_pathlist_result ";$func_to_host_path_result"
+                  fi
+                fi
+              fi
+            done
+            IFS=$func_to_host_pathlist_oldIFS
+            ;;
+        esac
+        if test -z "$func_to_host_pathlist_result"; then
+          func_error "Could not determine the host path(s) corresponding to"
+          func_error "  \`$1'"
+          func_error "Continuing, but uninstalled executables may not work."
+          # Fallback. This may break if $1 contains DOS-style drive
+          # specifications. The fix is not to complicate the expression
+          # below, but for the user to provide a working wine installation
+          # with winepath so that path translation in the cross-to-mingw
+          # case works properly.
+          lt_replace_pathsep_nix_to_dos="s|:|;|g"
+          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
+            $SED -e "$lt_replace_pathsep_nix_to_dos"`
+        fi
+        # Now, add the leading and trailing path separators back
+        case "$1" in
+          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
+            ;;
+        esac
+        case "$1" in
+          *: ) func_append func_to_host_pathlist_result ";"
+            ;;
+        esac
+        ;;
+    esac
+  fi
+}
+# end: func_to_host_pathlist
+
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+	cat <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+
+   Currently, it simply execs the wrapper *script* "$SHELL $output",
+   but could eventually absorb all of the scripts functionality and
+   exec $objdir/$outputname directly.
+*/
+EOF
+	    cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+#  include <io.h>
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+/* declarations of non-ANSI functions */
+#if defined(__MINGW32__)
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined(__CYGWIN__)
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined (other platforms) ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined(_MSC_VER)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+# define S_IXUSR _S_IEXEC
+# ifndef _INTPTR_T_DEFINED
+#  define _INTPTR_T_DEFINED
+#  define intptr_t int
+# endif
+#elif defined(__MINGW32__)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+#elif defined(__CYGWIN__)
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined (other platforms) ... */
+#endif
+
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
+
+/* path handling portability macros */
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+  defined (__OS2__)
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
+
+#undef LTWRAPPER_DEBUGPRINTF
+#if defined LT_DEBUGWRAPPER
+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
+static void
+ltwrapper_debugprintf (const char *fmt, ...)
+{
+    va_list args;
+    va_start (args, fmt);
+    (void) vfprintf (stderr, fmt, args);
+    va_end (args);
+}
+#else
+# define LTWRAPPER_DEBUGPRINTF(args)
+#endif
+
+const char *program_name = NULL;
+
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_fatal (const char *message, ...);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
+EOF
+
+	    cat <<EOF
+const char * MAGIC_EXE = "$magic_exe";
+const char * LIB_PATH_VARNAME = "$shlibpath_var";
+EOF
+
+	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_pathlist "$temp_rpath"
+	      cat <<EOF
+const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * LIB_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test -n "$dllsearchpath"; then
+              func_to_host_pathlist "$dllsearchpath:"
+	      cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test "$fast_install" = yes; then
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
+	    else
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
+	    fi
+
+
+	    cat <<"EOF"
+
+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
+
+static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+
+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int  newargc;
+  char *tmp_pathspec;
+  char *actual_cwrapper_path;
+  char *actual_cwrapper_name;
+  char *target_name;
+  char *lt_argv_zero;
+  intptr_t rval = 127;
+
+  int i;
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
+  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
+
+  /* very simple arg parsing; don't want to rely on getopt */
+  for (i = 1; i < argc; i++)
+    {
+      if (strcmp (argv[i], dumpscript_opt) == 0)
+	{
+EOF
+	    case "$host" in
+	      *mingw* | *cygwin* )
+		# make stdout use "unix" line endings
+		echo "          setmode(1,_O_BINARY);"
+		;;
+	      esac
+
+	    cat <<"EOF"
+	  lt_dump_script (stdout);
+	  return 0;
+	}
+    }
+
+  newargz = XMALLOC (char *, argc + 1);
+  tmp_pathspec = find_executable (argv[0]);
+  if (tmp_pathspec == NULL)
+    lt_fatal ("Couldn't find %s", argv[0]);
+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
+			  tmp_pathspec));
+
+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
+			  actual_cwrapper_path));
+  XFREE (tmp_pathspec);
+
+  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+  /* wrapper name transforms */
+  strendzap (actual_cwrapper_name, ".exe");
+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+  XFREE (actual_cwrapper_name);
+  actual_cwrapper_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  /* target_name transforms -- use actual target program name; might have lt- prefix */
+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+  strendzap (target_name, ".exe");
+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+  XFREE (target_name);
+  target_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
+			  target_name));
+EOF
+
+	    cat <<EOF
+  newargz[0] =
+    XMALLOC (char, (strlen (actual_cwrapper_path) +
+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+  strcpy (newargz[0], actual_cwrapper_path);
+  strcat (newargz[0], "$objdir");
+  strcat (newargz[0], "/");
+EOF
+
+	    cat <<"EOF"
+  /* stop here, and copy so we don't have to do this twice */
+  tmp_pathspec = xstrdup (newargz[0]);
+
+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+  strcat (newargz[0], actual_cwrapper_name);
+
+  /* DO want the lt- prefix here if it exists, so use target_name */
+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+  XFREE (tmp_pathspec);
+  tmp_pathspec = NULL;
+EOF
+
+	    case $host_os in
+	      mingw*)
+	    cat <<"EOF"
+  {
+    char* p;
+    while ((p = strchr (newargz[0], '\\')) != NULL)
+      {
+	*p = '/';
+      }
+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+      {
+	*p = '/';
+      }
+  }
+EOF
+	    ;;
+	    esac
+
+	    cat <<"EOF"
+  XFREE (target_name);
+  XFREE (actual_cwrapper_path);
+  XFREE (actual_cwrapper_name);
+
+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal ("Unrecognized option in %s namespace: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
+
+  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
+  for (i = 0; i < newargc; i++)
+    {
+      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
+    }
+
+EOF
+
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+  /* execv doesn't actually work on mingw as expected on unix */
+  newargz = prepare_spawn (newargz);
+  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  if (rval == -1)
+    {
+      /* failed to start process */
+      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
+      return 127;
+    }
+  return rval;
+EOF
+		;;
+	      *)
+		cat <<"EOF"
+  execv (lt_argv_zero, newargz);
+  return rval; /* =127, but avoids unused variable warning */
+EOF
+		;;
+	    esac
+
+	    cat <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void *p = (void *) malloc (num);
+  if (!p)
+    lt_fatal ("Memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+			  string) : NULL;
+}
+
+const char *
+base_name (const char *name)
+{
+  const char *base;
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
+
+int
+check_executable (const char *path)
+{
+  struct stat st;
+
+  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0)
+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+    return 1;
+  else
+    return 0;
+}
+
+int
+make_executable (const char *path)
+{
+  int rval = 0;
+  struct stat st;
+
+  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+  if ((!path) || (!*path))
+    return 0;
+
+  if (stat (path, &st) >= 0)
+    {
+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+    }
+  return rval;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise
+   Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+  int has_slash = 0;
+  const char *p;
+  const char *p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  int tmp_len;
+  char *concat_name;
+
+  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
+			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable (concat_name))
+	return concat_name;
+      XFREE (concat_name);
+    }
+  else
+    {
+#endif
+      if (IS_DIR_SEPARATOR (wrapper[0]))
+	{
+	  concat_name = xstrdup (wrapper);
+	  if (check_executable (concat_name))
+	    return concat_name;
+	  XFREE (concat_name);
+	}
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+    }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+      {
+	has_slash = 1;
+	break;
+      }
+  if (!has_slash)
+    {
+      /* no slashes; search PATH */
+      const char *path = getenv ("PATH");
+      if (path != NULL)
+	{
+	  for (p = path; *p; p = p_next)
+	    {
+	      const char *q;
+	      size_t p_len;
+	      for (q = p; *q; q++)
+		if (IS_PATH_SEPARATOR (*q))
+		  break;
+	      p_len = q - p;
+	      p_next = (*q == '\0' ? q : q + 1);
+	      if (p_len == 0)
+		{
+		  /* empty path: current directory */
+		  if (getcwd (tmp, LT_PATHMAX) == NULL)
+		    lt_fatal ("getcwd failed");
+		  tmp_len = strlen (tmp);
+		  concat_name =
+		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, tmp, tmp_len);
+		  concat_name[tmp_len] = '/';
+		  strcpy (concat_name + tmp_len + 1, wrapper);
+		}
+	      else
+		{
+		  concat_name =
+		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, p, p_len);
+		  concat_name[p_len] = '/';
+		  strcpy (concat_name + p_len + 1, wrapper);
+		}
+	      if (check_executable (concat_name))
+		return concat_name;
+	      XFREE (concat_name);
+	    }
+	}
+      /* not found in PATH; assume curdir */
+    }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal ("getcwd failed");
+  tmp_len = strlen (tmp);
+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable (concat_name))
+    return concat_name;
+  XFREE (concat_name);
+  return NULL;
+}
+
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+  return xstrdup (pathspec);
+#else
+  char buf[LT_PATHMAX];
+  struct stat s;
+  char *tmp_pathspec = xstrdup (pathspec);
+  char *p;
+  int has_symlinks = 0;
+  while (strlen (tmp_pathspec) && !has_symlinks)
+    {
+      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
+			      tmp_pathspec));
+      if (lstat (tmp_pathspec, &s) == 0)
+	{
+	  if (S_ISLNK (s.st_mode) != 0)
+	    {
+	      has_symlinks = 1;
+	      break;
+	    }
+
+	  /* search backwards for last DIR_SEPARATOR */
+	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    p--;
+	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    {
+	      /* no more DIR_SEPARATORS left */
+	      break;
+	    }
+	  *p = '\0';
+	}
+      else
+	{
+	  char *errstr = strerror (errno);
+	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+	}
+    }
+  XFREE (tmp_pathspec);
+
+  if (!has_symlinks)
+    {
+      return xstrdup (pathspec);
+    }
+
+  tmp_pathspec = realpath (pathspec, buf);
+  if (tmp_pathspec == 0)
+    {
+      lt_fatal ("Could not follow symlinks for %s", pathspec);
+    }
+  return xstrdup (tmp_pathspec);
+#endif
+}
+
+char *
+strendzap (char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert (str != NULL);
+  assert (pat != NULL);
+
+  len = strlen (str);
+  patlen = strlen (pat);
+
+  if (patlen <= len)
+    {
+      str += len - patlen;
+      if (strcmp (str, pat) == 0)
+	*str = '\0';
+    }
+  return str;
+}
+
+static void
+lt_error_core (int exit_status, const char *mode,
+	       const char *message, va_list ap)
+{
+  fprintf (stderr, "%s: %s: ", program_name, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+  va_end (ap);
+}
+
+void
+lt_setenv (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    int len = strlen (name) + 1 + strlen (value) + 1;
+    char *str = XMALLOC (char, len);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
+
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      int orig_value_len = strlen (orig_value);
+      int add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
+
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      int len = strlen (new_value);
+      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[len-1] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+EOF
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+   Note that spawn() does not by itself call the command interpreter
+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+         GetVersionEx(&v);
+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+      }) ? "cmd.exe" : "command.com").
+   Instead it simply concatenates the arguments, separated by ' ', and calls
+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+   special way:
+   - Space and tab are interpreted as delimiters. They are not treated as
+     delimiters if they are surrounded by double quotes: "...".
+   - Unescaped double quotes are removed from the input. Their only effect is
+     that within double quotes, space and tab are treated like normal
+     characters.
+   - Backslashes not followed by double quotes are not special.
+   - But 2*n+1 backslashes followed by a double quote become
+     n backslashes followed by a double quote (n >= 0):
+       \" -> "
+       \\\" -> \"
+       \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+  size_t argc;
+  char **new_argv;
+  size_t i;
+
+  /* Count number of arguments.  */
+  for (argc = 0; argv[argc] != NULL; argc++)
+    ;
+
+  /* Allocate new argument vector.  */
+  new_argv = XMALLOC (char *, argc + 1);
+
+  /* Put quoted arguments into the new argument vector.  */
+  for (i = 0; i < argc; i++)
+    {
+      const char *string = argv[i];
+
+      if (string[0] == '\0')
+	new_argv[i] = xstrdup ("\"\"");
+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+	{
+	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+	  size_t length;
+	  unsigned int backslashes;
+	  const char *s;
+	  char *quoted_string;
+	  char *p;
+
+	  length = 0;
+	  backslashes = 0;
+	  if (quote_around)
+	    length++;
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		length += backslashes + 1;
+	      length++;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    length += backslashes + 1;
+
+	  quoted_string = XMALLOC (char, length + 1);
+
+	  p = quoted_string;
+	  backslashes = 0;
+	  if (quote_around)
+	    *p++ = '"';
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		{
+		  unsigned int j;
+		  for (j = backslashes + 1; j > 0; j--)
+		    *p++ = '\\';
+		}
+	      *p++ = c;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    {
+	      unsigned int j;
+	      for (j = backslashes; j > 0; j--)
+		*p++ = '\\';
+	      *p++ = '"';
+	    }
+	  *p = '\0';
+
+	  new_argv[i] = quoted_string;
+	}
+      else
+	new_argv[i] = (char *) string;
+    }
+  new_argv[argc] = NULL;
+
+  return new_argv;
+}
+EOF
+		;;
+	    esac
+
+            cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+	    func_emit_wrapper yes |
+              $SED -e 's/\([\\"]\)/\\\1/g' \
+	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
+
+            cat <<"EOF"
+}
+EOF
+}
+# end: func_emit_cwrapperexe_src
+
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+    $opt_debug
+    case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in
+    *import*) : ;;
+    *) false ;;
+    esac
+}
+
+# func_mode_link arg...
+func_mode_link ()
+{
+    $opt_debug
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # which system we are compiling for in order to pass an extra
+      # flag for every libtool invocation.
+      # allow_undefined=no
+
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll which has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args=$nonopt
+    base_compile="$nonopt $@"
+    compile_command=$nonopt
+    finalize_command=$nonopt
+
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
+    new_inherited_linker_flags=
+
+    avoid_version=no
+    bindir=
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    non_pic_objects=
+    precious_files_regex=
+    prefer_static_libs=no
+    preload=no
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+    weak_libs=
+    single_module="${wl}-single_module"
+    func_infer_tag $base_compile
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	break
+	;;
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
+	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	    func_warning "complete static linking is impossible in this configuration"
+	  fi
+	  if test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	-static)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=built
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
+	build_libtool_libs=no
+	build_old_libs=yes
+	break
+	;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg="$1"
+      shift
+      func_quote_for_eval "$arg"
+      qarg=$func_quote_for_eval_unquoted_result
+      func_append libtool_args " $func_quote_for_eval_result"
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case $prev in
+	output)
+	  func_append compile_command " @OUTPUT@"
+	  func_append finalize_command " @OUTPUT@"
+	  ;;
+	esac
+
+	case $prev in
+	bindir)
+	  bindir="$arg"
+	  prev=
+	  continue
+	  ;;
+	dlfiles|dlprefiles)
+	  if test "$preload" = no; then
+	    # Add the symbol object into the linking commands.
+	    func_append compile_command " @SYMFILE@"
+	    func_append finalize_command " @SYMFILE@"
+	    preload=yes
+	  fi
+	  case $arg in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  force)
+	    if test "$dlself" = no; then
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  self)
+	    if test "$prev" = dlprefiles; then
+	      dlself=yes
+	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+	      dlself=yes
+	    else
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  *)
+	    if test "$prev" = dlfiles; then
+	      dlfiles="$dlfiles $arg"
+	    else
+	      dlprefiles="$dlprefiles $arg"
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  esac
+	  ;;
+	expsyms)
+	  export_symbols="$arg"
+	  test -f "$arg" \
+	    || func_fatal_error "symbol file \`$arg' does not exist"
+	  prev=
+	  continue
+	  ;;
+	expsyms_regex)
+	  export_symbols_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	framework)
+	  case $host in
+	    *-*-darwin*)
+	      case "$deplibs " in
+		*" $qarg.ltframework "*) ;;
+		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+		   ;;
+	      esac
+	      ;;
+	  esac
+	  prev=
+	  continue
+	  ;;
+	inst_prefix)
+	  inst_prefix_dir="$arg"
+	  prev=
+	  continue
+	  ;;
+	objectlist)
+	  if test -f "$arg"; then
+	    save_arg=$arg
+	    moreargs=
+	    for fil in `cat "$save_arg"`
+	    do
+#	      moreargs="$moreargs $fil"
+	      arg=$fil
+	      # A libtool-controlled object.
+
+	      # Check to see that this really is a libtool object.
+	      if func_lalib_unsafe_p "$arg"; then
+		pic_object=
+		non_pic_object=
+
+		# Read the .lo file
+		func_source "$arg"
+
+		if test -z "$pic_object" ||
+		   test -z "$non_pic_object" ||
+		   test "$pic_object" = none &&
+		   test "$non_pic_object" = none; then
+		  func_fatal_error "cannot find name of object for \`$arg'"
+		fi
+
+		# Extract subdirectory from the argument.
+		func_dirname "$arg" "/" ""
+		xdir="$func_dirname_result"
+
+		if test "$pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  pic_object="$xdir$pic_object"
+
+		  if test "$prev" = dlfiles; then
+		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		      dlfiles="$dlfiles $pic_object"
+		      prev=
+		      continue
+		    else
+		      # If libtool objects are unsupported, then we need to preload.
+		      prev=dlprefiles
+		    fi
+		  fi
+
+		  # CHECK ME:  I think I busted this.  -Ossama
+		  if test "$prev" = dlprefiles; then
+		    # Preload the old-style object.
+		    dlprefiles="$dlprefiles $pic_object"
+		    prev=
+		  fi
+
+		  # A PIC object.
+		  func_append libobjs " $pic_object"
+		  arg="$pic_object"
+		fi
+
+		# Non-PIC object.
+		if test "$non_pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  non_pic_object="$xdir$non_pic_object"
+
+		  # A standard non-PIC object
+		  func_append non_pic_objects " $non_pic_object"
+		  if test -z "$pic_object" || test "$pic_object" = none ; then
+		    arg="$non_pic_object"
+		  fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object="$pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+		fi
+	      else
+		# Only an error if not doing a dry-run.
+		if $opt_dry_run; then
+		  # Extract subdirectory from the argument.
+		  func_dirname "$arg" "/" ""
+		  xdir="$func_dirname_result"
+
+		  func_lo2o "$arg"
+		  pic_object=$xdir$objdir/$func_lo2o_result
+		  non_pic_object=$xdir$func_lo2o_result
+		  func_append libobjs " $pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+	        else
+		  func_fatal_error "\`$arg' is not a valid libtool object"
+		fi
+	      fi
+	    done
+	  else
+	    func_fatal_error "link input file \`$arg' does not exist"
+	  fi
+	  arg=$save_arg
+	  prev=
+	  continue
+	  ;;
+	precious_regex)
+	  precious_files_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release="-$arg"
+	  prev=
+	  continue
+	  ;;
+	rpath | xrpath)
+	  # We need an absolute path.
+	  case $arg in
+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  *)
+	    func_fatal_error "only absolute run-paths are allowed"
+	    ;;
+	  esac
+	  if test "$prev" = rpath; then
+	    case "$rpath " in
+	    *" $arg "*) ;;
+	    *) rpath="$rpath $arg" ;;
+	    esac
+	  else
+	    case "$xrpath " in
+	    *" $arg "*) ;;
+	    *) xrpath="$xrpath $arg" ;;
+	    esac
+	  fi
+	  prev=
+	  continue
+	  ;;
+	shrext)
+	  shrext_cmds="$arg"
+	  prev=
+	  continue
+	  ;;
+	weak)
+	  weak_libs="$weak_libs $arg"
+	  prev=
+	  continue
+	  ;;
+	xcclinker)
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xcompiler)
+	  compiler_flags="$compiler_flags $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xlinker)
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $wl$qarg"
+	  prev=
+	  func_append compile_command " $wl$qarg"
+	  func_append finalize_command " $wl$qarg"
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi # test -n "$prev"
+
+      prevarg="$arg"
+
+      case $arg in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  # See comment for -static flag below, for more details.
+	  func_append compile_command " $link_static_flag"
+	  func_append finalize_command " $link_static_flag"
+	fi
+	continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+	;;
+
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
+
+      -bindir)
+	prev=bindir
+	continue
+	;;
+
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
+
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
+
+      -export-dynamic)
+	export_dynamic=yes
+	continue
+	;;
+
+      -export-symbols | -export-symbols-regex)
+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	  func_fatal_error "more than one -exported-symbols argument is not allowed"
+	fi
+	if test "X$arg" = "X-export-symbols"; then
+	  prev=expsyms
+	else
+	  prev=expsyms_regex
+	fi
+	continue
+	;;
+
+      -framework)
+	prev=framework
+	continue
+	;;
+
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+	case $with_gcc/$host in
+	no/*-*-irix* | /*-*-irix*)
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  ;;
+	esac
+	continue
+	;;
+
+      -L*)
+	func_stripname '-L' '' "$arg"
+	dir=$func_stripname_result
+	if test -z "$dir"; then
+	  if test "$#" -gt 0; then
+	    func_fatal_error "require no space between \`-L' and \`$1'"
+	  else
+	    func_fatal_error "need path for \`-L' option"
+	  fi
+	fi
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  absdir=`cd "$dir" && pwd`
+	  test -z "$absdir" && \
+	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
+	  dir="$absdir"
+	  ;;
+	esac
+	case "$deplibs " in
+	*" -L$dir "*) ;;
+	*)
+	  deplibs="$deplibs -L$dir"
+	  lib_search_path="$lib_search_path $dir"
+	  ;;
+	esac
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$dir:"*) ;;
+	  ::) dllsearchpath=$dir;;
+	  *) dllsearchpath="$dllsearchpath:$dir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  esac
+	  ;;
+	esac
+	continue
+	;;
+
+      -l*)
+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # These systems don't actually have a C or math library (as such)
+	    continue
+	    ;;
+	  *-*-os2*)
+	    # These systems don't actually have a C library (as such)
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C and math libraries are in the System framework
+	    deplibs="$deplibs System.ltframework"
+	    continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-linux*)
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  esac
+	elif test "X$arg" = "X-lc_r"; then
+	 case $host in
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	   # Do not include libc_r directly, use -pthread flag.
+	   continue
+	   ;;
+	 esac
+	fi
+	deplibs="$deplibs $arg"
+	continue
+	;;
+
+      -module)
+	module=yes
+	continue
+	;;
+
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      # Darwin uses the -arch flag to determine output architecture.
+      -model|-arch|-isysroot)
+	compiler_flags="$compiler_flags $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	prev=xcompiler
+	continue
+	;;
+
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	compiler_flags="$compiler_flags $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	case "$new_inherited_linker_flags " in
+	    *" $arg "*) ;;
+	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+	esac
+	continue
+	;;
+
+      -multi_module)
+	single_module="${wl}-multi_module"
+	continue
+	;;
+
+      -no-fast-install)
+	fast_install=no
+	continue
+	;;
+
+      -no-install)
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+	  # The PATH hackery in wrapper scripts is required on Windows
+	  # and Darwin in order for the loader to find any dlls it needs.
+	  func_warning "\`-no-install' is ignored for $host"
+	  func_warning "assuming \`-no-fast-install' instead"
+	  fast_install=no
+	  ;;
+	*) no_install=yes ;;
+	esac
+	continue
+	;;
+
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -objectlist)
+	prev=objectlist
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -precious-files-regex)
+	prev=precious_regex
+	continue
+	;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+	prev=rpath
+	continue
+	;;
+
+      -R)
+	prev=xrpath
+	continue
+	;;
+
+      -R*)
+	func_stripname '-R' '' "$arg"
+	dir=$func_stripname_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  func_fatal_error "only absolute run-paths are allowed"
+	  ;;
+	esac
+	case "$xrpath " in
+	*" $dir "*) ;;
+	*) xrpath="$xrpath $dir" ;;
+	esac
+	continue
+	;;
+
+      -shared)
+	# The effects of -shared are defined in a previous loop.
+	continue
+	;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
+      -static | -static-libtool-libs)
+	# The effects of -static are defined in a previous loop.
+	# We used to do the same as -all-static on platforms that
+	# didn't have a PIC flag, but the assumption that the effects
+	# would be equivalent was wrong.  It would break on at least
+	# Digital Unix and AIX.
+	continue
+	;;
+
+      -thread-safe)
+	thread_safe=yes
+	continue
+	;;
+
+      -version-info)
+	prev=vinfo
+	continue
+	;;
+
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
+	;;
+
+      -weak)
+        prev=weak
+	continue
+	;;
+
+      -Wc,*)
+	func_stripname '-Wc,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+          func_quote_for_eval "$flag"
+	  arg="$arg $func_quote_for_eval_result"
+	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
+	done
+	IFS="$save_ifs"
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Wl,*)
+	func_stripname '-Wl,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+          func_quote_for_eval "$flag"
+	  arg="$arg $wl$func_quote_for_eval_result"
+	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
+	  linker_flags="$linker_flags $func_quote_for_eval_result"
+	done
+	IFS="$save_ifs"
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
+
+      -Xlinker)
+	prev=xlinker
+	continue
+	;;
+
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
+      # -msg_* for osf cc
+      -msg_*)
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+
+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+      # +DA*, +DD* enable 64-bit mode on the HP compiler
+      # -q* pass through compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* pass through architecture-specific
+      # compiler args for GCC
+      # -F/path gives path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+      # @file GCC response files
+      # -tp=* Portland pgcc target processor selection
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+        func_append compile_command " $arg"
+        func_append finalize_command " $arg"
+        compiler_flags="$compiler_flags $arg"
+        continue
+        ;;
+
+      # Some other compiler flag.
+      -* | +*)
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+
+      *.$objext)
+	# A standard object.
+	objs="$objs $arg"
+	;;
+
+      *.lo)
+	# A libtool-controlled object.
+
+	# Check to see that this really is a libtool object.
+	if func_lalib_unsafe_p "$arg"; then
+	  pic_object=
+	  non_pic_object=
+
+	  # Read the .lo file
+	  func_source "$arg"
+
+	  if test -z "$pic_object" ||
+	     test -z "$non_pic_object" ||
+	     test "$pic_object" = none &&
+	     test "$non_pic_object" = none; then
+	    func_fatal_error "cannot find name of object for \`$arg'"
+	  fi
+
+	  # Extract subdirectory from the argument.
+	  func_dirname "$arg" "/" ""
+	  xdir="$func_dirname_result"
+
+	  if test "$pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    pic_object="$xdir$pic_object"
+
+	    if test "$prev" = dlfiles; then
+	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		dlfiles="$dlfiles $pic_object"
+		prev=
+		continue
+	      else
+		# If libtool objects are unsupported, then we need to preload.
+		prev=dlprefiles
+	      fi
+	    fi
+
+	    # CHECK ME:  I think I busted this.  -Ossama
+	    if test "$prev" = dlprefiles; then
+	      # Preload the old-style object.
+	      dlprefiles="$dlprefiles $pic_object"
+	      prev=
+	    fi
+
+	    # A PIC object.
+	    func_append libobjs " $pic_object"
+	    arg="$pic_object"
+	  fi
+
+	  # Non-PIC object.
+	  if test "$non_pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    non_pic_object="$xdir$non_pic_object"
+
+	    # A standard non-PIC object
+	    func_append non_pic_objects " $non_pic_object"
+	    if test -z "$pic_object" || test "$pic_object" = none ; then
+	      arg="$non_pic_object"
+	    fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object="$pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  fi
+	else
+	  # Only an error if not doing a dry-run.
+	  if $opt_dry_run; then
+	    # Extract subdirectory from the argument.
+	    func_dirname "$arg" "/" ""
+	    xdir="$func_dirname_result"
+
+	    func_lo2o "$arg"
+	    pic_object=$xdir$objdir/$func_lo2o_result
+	    non_pic_object=$xdir$func_lo2o_result
+	    func_append libobjs " $pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  else
+	    func_fatal_error "\`$arg' is not a valid libtool object"
+	  fi
+	fi
+	;;
+
+      *.$libext)
+	# An archive.
+	deplibs="$deplibs $arg"
+	old_deplibs="$old_deplibs $arg"
+	continue
+	;;
+
+      *.la)
+	# A libtool-controlled library.
+
+	if test "$prev" = dlfiles; then
+	  # This library was specified with -dlopen.
+	  dlfiles="$dlfiles $arg"
+	  prev=
+	elif test "$prev" = dlprefiles; then
+	  # The library was specified with -dlpreopen.
+	  dlprefiles="$dlprefiles $arg"
+	  prev=
+	else
+	  deplibs="$deplibs $arg"
+	fi
+	continue
+	;;
+
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+      fi
+    done # argument parsing loop
+
+    test -n "$prev" && \
+      func_fatal_help "the \`$prevarg' option requires an argument"
+
+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+      eval "arg=\"$export_dynamic_flag_spec\""
+      func_append compile_command " $arg"
+      func_append finalize_command " $arg"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    func_basename "$output"
+    outputname="$func_basename_result"
+    libobjs_save="$libobjs"
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval "sys_lib_search_path=\"$sys_lib_search_path_spec\""
+    eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\""
+
+    func_dirname "$output" "/" ""
+    output_objdir="$func_dirname_result$objdir"
+    # Create the object directory.
+    func_mkdir_p "$output_objdir"
+
+    # Determine the type of output
+    case $output in
+    "")
+      func_fatal_help "you must specify an output file"
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if $opt_duplicate_deps ; then
+	case "$libs " in
+	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	esac
+      fi
+      libs="$libs $deplib"
+    done
+
+    if test "$linkmode" = lib; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if $opt_duplicate_compiler_generated_deps; then
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+	  esac
+	  pre_post_deps="$pre_post_deps $pre_post_dep"
+	done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+
+    case $linkmode in
+    lib)
+	passes="conv dlpreopen link"
+	for file in $dlfiles $dlprefiles; do
+	  case $file in
+	  *.la) ;;
+	  *)
+	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+	    ;;
+	  esac
+	done
+	;;
+    prog)
+	compile_deplibs=
+	finalize_deplibs=
+	alldeplibs=no
+	newdlfiles=
+	newdlprefiles=
+	passes="conv scan dlopen dlpreopen link"
+	;;
+    *)  passes="conv"
+	;;
+    esac
+
+    for pass in $passes; do
+      # The preopen pass in lib mode reverses $deplibs; put it back here
+      # so that -L comes before libs that need it for instance...
+      if test "$linkmode,$pass" = "lib,link"; then
+	## FIXME: Find the place where the list is rebuilt in the wrong
+	##        order, and fix it there properly
+        tmp_deplibs=
+	for deplib in $deplibs; do
+	  tmp_deplibs="$deplib $tmp_deplibs"
+	done
+	deplibs="$tmp_deplibs"
+      fi
+
+      if test "$linkmode,$pass" = "lib,link" ||
+	 test "$linkmode,$pass" = "prog,scan"; then
+	libs="$deplibs"
+	deplibs=
+      fi
+      if test "$linkmode" = prog; then
+	case $pass in
+	dlopen) libs="$dlfiles" ;;
+	dlpreopen) libs="$dlprefiles" ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	esac
+      fi
+      if test "$linkmode,$pass" = "lib,dlpreopen"; then
+	# Collect and forward deplibs of preopened libtool libs
+	for lib in $dlprefiles; do
+	  # Ignore non-libtool-libs
+	  dependency_libs=
+	  case $lib in
+	  *.la)	func_source "$lib" ;;
+	  esac
+
+	  # Collect preopened libtool deplibs, except any this library
+	  # has declared as weak libs
+	  for deplib in $dependency_libs; do
+	    func_basename "$deplib"
+            deplib_base=$func_basename_result
+	    case " $weak_libs " in
+	    *" $deplib_base "*) ;;
+	    *) deplibs="$deplibs $deplib" ;;
+	    esac
+	  done
+	done
+	libs="$dlprefiles"
+      fi
+      if test "$pass" = dlopen; then
+	# Collect dlpreopened libraries
+	save_deplibs="$deplibs"
+	deplibs=
+      fi
+
+      for deplib in $libs; do
+	lib=
+	found=no
+	case $deplib in
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    compiler_flags="$compiler_flags $deplib"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-l*)
+	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+	    func_warning "\`-l' is ignored for archives/objects"
+	    continue
+	  fi
+	  func_stripname '-l' '' "$deplib"
+	  name=$func_stripname_result
+	  if test "$linkmode" = lib; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
+	    for search_ext in .la $std_shrext .so .a; do
+	      # Search the libtool library
+	      lib="$searchdir/lib${name}${search_ext}"
+	      if test -f "$lib"; then
+		if test "$search_ext" = ".la"; then
+		  found=yes
+		else
+		  found=no
+		fi
+		break 2
+	      fi
+	    done
+	  done
+	  if test "$found" != yes; then
+	    # deplib doesn't seem to be a libtool library
+	    if test "$linkmode,$pass" = "prog,link"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
+	  else # deplib is a libtool library
+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+	    # We need to do some special things here, and not later.
+	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if func_lalib_p "$lib"; then
+		  library_names=
+		  old_library=
+		  func_source "$lib"
+		  for l in $old_library $library_names; do
+		    ll="$l"
+		  done
+		  if test "X$ll" = "X$old_library" ; then # only static version available
+		    found=no
+		    func_dirname "$lib" "" "."
+		    ladir="$func_dirname_result"
+		    lib=$ladir/$old_library
+		    if test "$linkmode,$pass" = "prog,link"; then
+		      compile_deplibs="$deplib $compile_deplibs"
+		      finalize_deplibs="$deplib $finalize_deplibs"
+		    else
+		      deplibs="$deplib $deplibs"
+		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		    fi
+		    continue
+		  fi
+		fi
+		;;
+	      *) ;;
+	      esac
+	    fi
+	  fi
+	  ;; # -l
+	*.ltframework)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    deplibs="$deplib $deplibs"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-L*)
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    test "$pass" = conv && continue
+	    newdependency_libs="$deplib $newdependency_libs"
+	    func_stripname '-L' '' "$deplib"
+	    newlib_search_path="$newlib_search_path $func_stripname_result"
+	    ;;
+	  prog)
+	    if test "$pass" = conv; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test "$pass" = scan; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    func_stripname '-L' '' "$deplib"
+	    newlib_search_path="$newlib_search_path $func_stripname_result"
+	    ;;
+	  *)
+	    func_warning "\`-L' is ignored for archives/objects"
+	    ;;
+	  esac # linkmode
+	  continue
+	  ;; # -L
+	-R*)
+	  if test "$pass" = link; then
+	    func_stripname '-R' '' "$deplib"
+	    dir=$func_stripname_result
+	    # Make sure the xrpath contains only unique directories.
+	    case "$xrpath " in
+	    *" $dir "*) ;;
+	    *) xrpath="$xrpath $dir" ;;
+	    esac
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue
+	  ;;
+	*.la) lib="$deplib" ;;
+	*.$libext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  case $linkmode in
+	  lib)
+	    # Linking convenience modules into shared libraries is allowed,
+	    # but linking other static libraries is non-portable.
+	    case " $dlpreconveniencelibs " in
+	    *" $deplib "*) ;;
+	    *)
+	      valid_a_lib=no
+	      case $deplibs_check_method in
+		match_pattern*)
+		  set dummy $deplibs_check_method; shift
+		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+		    | $EGREP "$match_pattern_regex" > /dev/null; then
+		    valid_a_lib=yes
+		  fi
+		;;
+		pass_all)
+		  valid_a_lib=yes
+		;;
+	      esac
+	      if test "$valid_a_lib" != yes; then
+		echo
+		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because the file extensions .$libext of this argument makes me believe"
+		echo "*** that it is just a static archive that I should not use here."
+	      else
+		echo
+		$ECHO "*** Warning: Linking the shared library $output against the"
+		$ECHO "*** static library $deplib is not portable!"
+		deplibs="$deplib $deplibs"
+	      fi
+	      ;;
+	    esac
+	    continue
+	    ;;
+	  prog)
+	    if test "$pass" != link; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    continue
+	    ;;
+	  esac # linkmode
+	  ;; # *.$libext
+	*.lo | *.$objext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	  elif test "$linkmode" = prog; then
+	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	      # If there is no dlopen support or we're linking statically,
+	      # we need to preload.
+	      newdlprefiles="$newdlprefiles $deplib"
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      newdlfiles="$newdlfiles $deplib"
+	    fi
+	  fi
+	  continue
+	  ;;
+	%DEPLIBS%)
+	  alldeplibs=yes
+	  continue
+	  ;;
+	esac # case $deplib
+
+	if test "$found" = yes || test -f "$lib"; then :
+	else
+	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
+	fi
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$lib" \
+	  || func_fatal_error "\`$lib' is not a valid libtool archive"
+
+	func_dirname "$lib" "" "."
+	ladir="$func_dirname_result"
+
+	dlname=
+	dlopen=
+	dlpreopen=
+	libdir=
+	library_names=
+	old_library=
+	inherited_linker_flags=
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variables installed, or shouldnotlink
+	installed=yes
+	shouldnotlink=no
+	avoidtemprpath=
+
+
+	# Read the .la file
+	func_source "$lib"
+
+	# Convert "-framework foo" to "foo.ltframework"
+	if test -n "$inherited_linker_flags"; then
+	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
+	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+	    case " $new_inherited_linker_flags " in
+	      *" $tmp_inherited_linker_flag "*) ;;
+	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+	    esac
+	  done
+	fi
+	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	if test "$linkmode,$pass" = "lib,link" ||
+	   test "$linkmode,$pass" = "prog,scan" ||
+	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+	fi
+
+	if test "$pass" = conv; then
+	  # Only check for convenience libraries
+	  deplibs="$lib $deplibs"
+	  if test -z "$libdir"; then
+	    if test -z "$old_library"; then
+	      func_fatal_error "cannot find name of link library for \`$lib'"
+	    fi
+	    # It is a libtool convenience library, so add in its objects.
+	    convenience="$convenience $ladir/$objdir/$old_library"
+	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+	    func_fatal_error "\`$lib' is not a convenience library"
+	  fi
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    deplibs="$deplib $deplibs"
+	    if $opt_duplicate_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done
+	  continue
+	fi # $pass = conv
+
+
+	# Get the name of the library we link against.
+	linklib=
+	for l in $old_library $library_names; do
+	  linklib="$l"
+	done
+	if test -z "$linklib"; then
+	  func_fatal_error "cannot find name of link library for \`$lib'"
+	fi
+
+	# This library was specified with -dlopen.
+	if test "$pass" = dlopen; then
+	  if test -z "$libdir"; then
+	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
+	  fi
+	  if test -z "$dlname" ||
+	     test "$dlopen_support" != yes ||
+	     test "$build_libtool_libs" = no; then
+	    # If there is no dlname, no dlopen support or we're linking
+	    # statically, we need to preload.  We also need to preload any
+	    # dependent libraries so libltdl's deplib preloader doesn't
+	    # bomb out in the load deplibs phase.
+	    dlprefiles="$dlprefiles $lib $dependency_libs"
+	  else
+	    newdlfiles="$newdlfiles $lib"
+	  fi
+	  continue
+	fi # $pass = dlopen
+
+	# We need an absolute path.
+	case $ladir in
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+	*)
+	  abs_ladir=`cd "$ladir" && pwd`
+	  if test -z "$abs_ladir"; then
+	    func_warning "cannot determine absolute directory name of \`$ladir'"
+	    func_warning "passing it literally to the linker, although it might fail"
+	    abs_ladir="$ladir"
+	  fi
+	  ;;
+	esac
+	func_basename "$lib"
+	laname="$func_basename_result"
+
+	# Find the relevant object directory and library name.
+	if test "X$installed" = Xyes; then
+	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    func_warning "library \`$lib' was moved."
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    libdir="$abs_ladir"
+	  else
+	    dir="$libdir"
+	    absdir="$libdir"
+	  fi
+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+	else
+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    # Remove this search path later
+	    notinst_path="$notinst_path $abs_ladir"
+	  else
+	    dir="$ladir/$objdir"
+	    absdir="$abs_ladir/$objdir"
+	    # Remove this search path later
+	    notinst_path="$notinst_path $abs_ladir"
+	  fi
+	fi # $installed = yes
+	func_stripname 'lib' '.la' "$laname"
+	name=$func_stripname_result
+
+	# This library was specified with -dlpreopen.
+	if test "$pass" = dlpreopen; then
+	  if test -z "$libdir" && test "$linkmode" = prog; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+	  fi
+	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+	  # are required to link).
+	  if test -n "$old_library"; then
+	    newdlprefiles="$newdlprefiles $dir/$old_library"
+	    # Keep a list of preopened convenience libraries to check
+	    # that they are being used correctly in the link pass.
+	    test -z "$libdir" && \
+		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
+	  # Otherwise, use the dlname, so that lt_dlopen finds it.
+	  elif test -n "$dlname"; then
+	    newdlprefiles="$newdlprefiles $dir/$dlname"
+	  else
+	    newdlprefiles="$newdlprefiles $dir/$linklib"
+	  fi
+	fi # $pass = dlpreopen
+
+	if test -z "$libdir"; then
+	  # Link the convenience library
+	  if test "$linkmode" = lib; then
+	    deplibs="$dir/$old_library $deplibs"
+	  elif test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$dir/$old_library $compile_deplibs"
+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+	  else
+	    deplibs="$lib $deplibs" # used for prog,scan pass
+	  fi
+	  continue
+	fi
+
+
+	if test "$linkmode" = prog && test "$pass" != link; then
+	  newlib_search_path="$newlib_search_path $ladir"
+	  deplibs="$lib $deplibs"
+
+	  linkalldeplibs=no
+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
+	     test "$build_libtool_libs" = no; then
+	    linkalldeplibs=yes
+	  fi
+
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    case $deplib in
+	    -L*) func_stripname '-L' '' "$deplib"
+	         newlib_search_path="$newlib_search_path $func_stripname_result"
+		 ;;
+	    esac
+	    # Need to link against all dependency_libs?
+	    if test "$linkalldeplibs" = yes; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      # Need to hardcode shared library paths
+	      # or/and link against static libraries
+	      newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    if $opt_duplicate_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done # for deplib
+	  continue
+	fi # $linkmode = prog...
+
+	if test "$linkmode,$pass" = "prog,link"; then
+	  if test -n "$library_names" &&
+	     { { test "$prefer_static_libs" = no ||
+	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
+	    # We need to hardcode the library path
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+	      # Make sure the rpath contains only unique directories.
+	      case "$temp_rpath:" in
+	      *"$absdir:"*) ;;
+	      *) temp_rpath="$temp_rpath$absdir:" ;;
+	      esac
+	    fi
+
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) compile_rpath="$compile_rpath $absdir"
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) finalize_rpath="$finalize_rpath $libdir"
+	      esac
+	      ;;
+	    esac
+	  fi # $linkmode,$pass = prog,link...
+
+	  if test "$alldeplibs" = yes &&
+	     { test "$deplibs_check_method" = pass_all ||
+	       { test "$build_libtool_libs" = yes &&
+		 test -n "$library_names"; }; }; then
+	    # We only need to search for static libraries
+	    continue
+	  fi
+	fi
+
+	link_static=no # Whether the deplib will be linked statically
+	use_static_libs=$prefer_static_libs
+	if test "$use_static_libs" = built && test "$installed" = yes; then
+	  use_static_libs=no
+	fi
+	if test -n "$library_names" &&
+	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc*)
+	      # No point in relinking DLLs because paths are not encoded
+	      notinst_deplibs="$notinst_deplibs $lib"
+	      need_relink=no
+	    ;;
+	  *)
+	    if test "$installed" = no; then
+	      notinst_deplibs="$notinst_deplibs $lib"
+	      need_relink=yes
+	    fi
+	    ;;
+	  esac
+	  # This is a shared library
+
+	  # Warn about portability, can't link against -module's on some
+	  # systems (darwin).  Don't bleat about dlopened modules though!
+	  dlopenmodule=""
+	  for dlpremoduletest in $dlprefiles; do
+	    if test "X$dlpremoduletest" = "X$lib"; then
+	      dlopenmodule="$dlpremoduletest"
+	      break
+	    fi
+	  done
+	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+	    echo
+	    if test "$linkmode" = prog; then
+	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
+	    else
+	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+	    fi
+	    $ECHO "*** $linklib is not portable!"
+	  fi
+	  if test "$linkmode" = lib &&
+	     test "$hardcode_into_libs" = yes; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) compile_rpath="$compile_rpath $absdir"
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) finalize_rpath="$finalize_rpath $libdir"
+	      esac
+	      ;;
+	    esac
+	  fi
+
+	  if test -n "$old_archive_from_expsyms_cmds"; then
+	    # figure out the soname
+	    set dummy $library_names
+	    shift
+	    realname="$1"
+	    shift
+	    eval "libname=\"$libname_spec\""
+	    # use dlname if we got it. it's perfectly good, no?
+	    if test -n "$dlname"; then
+	      soname="$dlname"
+	    elif test -n "$soname_spec"; then
+	      # bleh windows
+	      case $host in
+	      *cygwin* | mingw* | *cegcc*)
+	        func_arith $current - $age
+		major=$func_arith_result
+		versuffix="-$major"
+		;;
+	      esac
+	      eval "soname=\"$soname_spec\""
+	    else
+	      soname="$realname"
+	    fi
+
+	    # Make a new name for the extract_expsyms_cmds to use
+	    soroot="$soname"
+	    func_basename "$soroot"
+	    soname="$func_basename_result"
+	    func_stripname 'lib' '.dll' "$soname"
+	    newlib=libimp-$func_stripname_result.a
+
+	    # If the library has no export list, then create one now
+	    if test -f "$output_objdir/$soname-def"; then :
+	    else
+	      func_verbose "extracting exported symbol list from \`$soname'"
+	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
+	    fi
+
+	    # Create $newlib
+	    if test -f "$output_objdir/$newlib"; then :; else
+	      func_verbose "generating import library for \`$soname'"
+	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+	    fi
+	    # make sure the library variables are pointing to the new library
+	    dir=$output_objdir
+	    linklib=$newlib
+	  fi # test -n "$old_archive_from_expsyms_cmds"
+
+	  if test "$linkmode" = prog || test "$mode" != relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    lib_linked=yes
+	    case $hardcode_action in
+	    immediate | unsupported)
+	      if test "$hardcode_direct" = no; then
+		add="$dir/$linklib"
+		case $host in
+		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+		    *-*-unixware7*) add_dir="-L$dir" ;;
+		  *-*-darwin* )
+		    # if the lib is a (non-dlopened) module then we can not
+		    # link against it, someone is ignoring the earlier warnings
+		    if /usr/bin/file -L $add 2> /dev/null |
+			 $GREP ": [^:]* bundle" >/dev/null ; then
+		      if test "X$dlopenmodule" != "X$lib"; then
+			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
+			if test -z "$old_library" ; then
+			  echo
+			  echo "*** And there doesn't seem to be a static archive available"
+			  echo "*** The link will probably fail, sorry"
+			else
+			  add="$dir/$old_library"
+			fi
+		      elif test -n "$old_library"; then
+			add="$dir/$old_library"
+		      fi
+		    fi
+		esac
+	      elif test "$hardcode_minus_L" = no; then
+		case $host in
+		*-*-sunos*) add_shlibpath="$dir" ;;
+		esac
+		add_dir="-L$dir"
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = no; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    relink)
+	      if test "$hardcode_direct" = yes &&
+	         test "$hardcode_direct_absolute" = no; then
+		add="$dir/$linklib"
+	      elif test "$hardcode_minus_L" = yes; then
+		add_dir="-L$absdir"
+		# Try looking first in the location we're being installed to.
+		if test -n "$inst_prefix_dir"; then
+		  case $libdir in
+		    [\\/]*)
+		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		      ;;
+		  esac
+		fi
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = yes; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    *) lib_linked=no ;;
+	    esac
+
+	    if test "$lib_linked" != yes; then
+	      func_fatal_configuration "unsupported hardcode properties"
+	    fi
+
+	    if test -n "$add_shlibpath"; then
+	      case :$compile_shlibpath: in
+	      *":$add_shlibpath:"*) ;;
+	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+	      esac
+	    fi
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	      if test "$hardcode_direct" != yes &&
+		 test "$hardcode_minus_L" != yes &&
+		 test "$hardcode_shlibpath_var" = yes; then
+		case :$finalize_shlibpath: in
+		*":$libdir:"*) ;;
+		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+		esac
+	      fi
+	    fi
+	  fi
+
+	  if test "$linkmode" = prog || test "$mode" = relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    # Finalize command for both is simple: just hardcode it.
+	    if test "$hardcode_direct" = yes &&
+	       test "$hardcode_direct_absolute" = no; then
+	      add="$libdir/$linklib"
+	    elif test "$hardcode_minus_L" = yes; then
+	      add_dir="-L$libdir"
+	      add="-l$name"
+	    elif test "$hardcode_shlibpath_var" = yes; then
+	      case :$finalize_shlibpath: in
+	      *":$libdir:"*) ;;
+	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+	      esac
+	      add="-l$name"
+	    elif test "$hardcode_automatic" = yes; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+		add="$inst_prefix_dir$libdir/$linklib"
+	      else
+		add="$libdir/$linklib"
+	      fi
+	    else
+	      # We cannot seem to hardcode it, guess we'll fake it.
+	      add_dir="-L$libdir"
+	      # Try looking first in the location we're being installed to.
+	      if test -n "$inst_prefix_dir"; then
+		case $libdir in
+		  [\\/]*)
+		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		    ;;
+		esac
+	      fi
+	      add="-l$name"
+	    fi
+
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	    fi
+	  fi
+	elif test "$linkmode" = prog; then
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test "$hardcode_direct" != unsupported; then
+	    test -n "$old_library" && linklib="$old_library"
+	    compile_deplibs="$dir/$linklib $compile_deplibs"
+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+	  else
+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+	  fi
+	elif test "$build_libtool_libs" = yes; then
+	  # Not a shared library
+	  if test "$deplibs_check_method" != pass_all; then
+	    # We're trying link a shared library against a static one
+	    # but the system doesn't support it.
+
+	    # Just print a warning and add the library to dependency_libs so
+	    # that the program can be linked against the static library.
+	    echo
+	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
+	    echo "*** I have the capability to make that library automatically link in when"
+	    echo "*** you link to this library.  But I can only do this if you have a"
+	    echo "*** shared version of the library, which you do not appear to have."
+	    if test "$module" = yes; then
+	      echo "*** But as you try to build a module library, libtool will still create "
+	      echo "*** a static module, that should work as long as the dlopening application"
+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      if test -z "$global_symbol_pipe"; then
+		echo
+		echo "*** However, this would only work if libtool was able to extract symbol"
+		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		echo "*** not find such a program.  So, this module is probably useless."
+		echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	      fi
+	      if test "$build_old_libs" = no; then
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  else
+	    deplibs="$dir/$old_library $deplibs"
+	    link_static=yes
+	  fi
+	fi # link shared/static library?
+
+	if test "$linkmode" = lib; then
+	  if test -n "$dependency_libs" &&
+	     { test "$hardcode_into_libs" != yes ||
+	       test "$build_old_libs" = yes ||
+	       test "$link_static" = yes; }; then
+	    # Extract -R from dependency_libs
+	    temp_deplibs=
+	    for libdir in $dependency_libs; do
+	      case $libdir in
+	      -R*) func_stripname '-R' '' "$libdir"
+	           temp_xrpath=$func_stripname_result
+		   case " $xrpath " in
+		   *" $temp_xrpath "*) ;;
+		   *) xrpath="$xrpath $temp_xrpath";;
+		   esac;;
+	      *) temp_deplibs="$temp_deplibs $libdir";;
+	      esac
+	    done
+	    dependency_libs="$temp_deplibs"
+	  fi
+
+	  newlib_search_path="$newlib_search_path $absdir"
+	  # Link against this library
+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  # ... and its dependency_libs
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    newdependency_libs="$deplib $newdependency_libs"
+	    if $opt_duplicate_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done
+
+	  if test "$link_all_deplibs" != no; then
+	    # Add the search paths of all dependency libraries
+	    for deplib in $dependency_libs; do
+	      path=
+	      case $deplib in
+	      -L*) path="$deplib" ;;
+	      *.la)
+	        func_dirname "$deplib" "" "."
+		dir="$func_dirname_result"
+		# We need an absolute path.
+		case $dir in
+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+		*)
+		  absdir=`cd "$dir" && pwd`
+		  if test -z "$absdir"; then
+		    func_warning "cannot determine absolute directory name of \`$dir'"
+		    absdir="$dir"
+		  fi
+		  ;;
+		esac
+		if $GREP "^installed=no" $deplib > /dev/null; then
+		case $host in
+		*-*-darwin*)
+		  depdepl=
+		  deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names" ; then
+		    for tmp in $deplibrary_names ; do
+		      depdepl=$tmp
+		    done
+		    if test -f "$absdir/$objdir/$depdepl" ; then
+		      depdepl="$absdir/$objdir/$depdepl"
+		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+                      if test -z "$darwin_install_name"; then
+                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                      fi
+		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
+		      path=
+		    fi
+		  fi
+		  ;;
+		*)
+		  path="-L$absdir/$objdir"
+		  ;;
+		esac
+		else
+		  libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  test -z "$libdir" && \
+		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+		  test "$absdir" != "$libdir" && \
+		    func_warning "\`$deplib' seems to be moved"
+
+		  path="-L$absdir"
+		fi
+		;;
+	      esac
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$path $deplibs" ;;
+	      esac
+	    done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
+      if test "$pass" = link; then
+	if test "$linkmode" = "prog"; then
+	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+	else
+	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	fi
+      fi
+      dependency_libs="$newdependency_libs"
+      if test "$pass" = dlpreopen; then
+	# Link the dlpreopened libraries before other libraries
+	for deplib in $save_deplibs; do
+	  deplibs="$deplib $deplibs"
+	done
+      fi
+      if test "$pass" != dlopen; then
+	if test "$pass" != conv; then
+	  # Make sure lib_search_path contains only unique directories.
+	  lib_search_path=
+	  for dir in $newlib_search_path; do
+	    case "$lib_search_path " in
+	    *" $dir "*) ;;
+	    *) lib_search_path="$lib_search_path $dir" ;;
+	    esac
+	  done
+	  newlib_search_path=
+	fi
+
+	if test "$linkmode,$pass" != "prog,link"; then
+	  vars="deplibs"
+	else
+	  vars="compile_deplibs finalize_deplibs"
+	fi
+	for var in $vars dependency_libs; do
+	  # Add libraries to $var in reverse order
+	  eval tmp_libs=\$$var
+	  new_libs=
+	  for deplib in $tmp_libs; do
+	    # FIXME: Pedantically, this is the right thing to do, so
+	    #        that some nasty dependency loop isn't accidentally
+	    #        broken:
+	    #new_libs="$deplib $new_libs"
+	    # Pragmatically, this seems to cause very few problems in
+	    # practice:
+	    case $deplib in
+	    -L*) new_libs="$deplib $new_libs" ;;
+	    -R*) ;;
+	    *)
+	      # And here is the reason: when a library appears more
+	      # than once as an explicit dependence of a library, or
+	      # is implicitly linked in more than once by the
+	      # compiler, it is considered special, and multiple
+	      # occurrences thereof are not removed.  Compare this
+	      # with having the same library being listed as a
+	      # dependency of multiple other libraries: in this case,
+	      # we know (pedantically, we assume) the library does not
+	      # need to be listed more than once, so we keep only the
+	      # last copy.  This is not always right, but it is rare
+	      # enough that we require users that really mean to play
+	      # such unportable linking tricks to link the library
+	      # using -Wl,-lname, so that libtool does not consider it
+	      # for duplicate removal.
+	      case " $specialdeplibs " in
+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+	      *)
+		case " $new_libs " in
+		*" $deplib "*) ;;
+		*) new_libs="$deplib $new_libs" ;;
+		esac
+		;;
+	      esac
+	      ;;
+	    esac
+	  done
+	  tmp_libs=
+	  for deplib in $new_libs; do
+	    case $deplib in
+	    -L*)
+	      case " $tmp_libs " in
+	      *" $deplib "*) ;;
+	      *) tmp_libs="$tmp_libs $deplib" ;;
+	      esac
+	      ;;
+	    *) tmp_libs="$tmp_libs $deplib" ;;
+	    esac
+	  done
+	  eval $var=\$tmp_libs
+	done # for var
+      fi
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs ; do
+	case " $predeps $postdeps $compiler_lib_search_path " in
+	*" $i "*)
+	  i=""
+	  ;;
+	esac
+	if test -n "$i" ; then
+	  tmp_libs="$tmp_libs $i"
+	fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test "$linkmode" = prog; then
+      dlfiles="$newdlfiles"
+    fi
+    if test "$linkmode" = prog || test "$linkmode" = lib; then
+      dlprefiles="$newdlprefiles"
+    fi
+
+    case $linkmode in
+    oldlib)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	func_warning "\`-dlopen' is ignored for archives"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for archives" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for archives"
+
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for archives"
+
+      test -n "$vinfo" && \
+	func_warning "\`-version-info/-version-number' is ignored for archives"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for archives"
+
+      test -n "$export_symbols$export_symbols_regex" && \
+	func_warning "\`-export-symbols' is ignored for archives"
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs="$output"
+      objs="$objs$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form `libNAME.la'.
+      case $outputname in
+      lib*)
+	func_stripname 'lib' '.la' "$outputname"
+	name=$func_stripname_result
+	eval "shared_ext=\"$shrext_cmds\""
+	eval "libname=\"$libname_spec\""
+	;;
+      *)
+	test "$module" = no && \
+	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
+
+	if test "$need_lib_prefix" != no; then
+	  # Add the "lib" prefix for modules if required
+	  func_stripname '' '.la' "$outputname"
+	  name=$func_stripname_result
+	  eval "shared_ext=\"$shrext_cmds\""
+	  eval "libname=\"$libname_spec\""
+	else
+	  func_stripname '' '.la' "$outputname"
+	  libname=$func_stripname_result
+	fi
+	;;
+      esac
+
+      if test -n "$objs"; then
+	if test "$deplibs_check_method" != pass_all; then
+	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+	else
+	  echo
+	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+	  $ECHO "*** objects $objs is not portable!"
+	  libobjs="$libobjs $objs"
+	fi
+      fi
+
+      test "$dlself" != no && \
+	func_warning "\`-dlopen self' is ignored for libtool libraries"
+
+      set dummy $rpath
+      shift
+      test "$#" -gt 1 && \
+	func_warning "ignoring multiple \`-rpath's for a libtool library"
+
+      install_libdir="$1"
+
+      oldlibs=
+      if test -z "$rpath"; then
+	if test "$build_libtool_libs" = yes; then
+	  # Building a libtool convenience library.
+	  # Some compilers have problems with a `.al' extension so
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
+
+	test -n "$vinfo" && \
+	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+
+	test -n "$release" && \
+	  func_warning "\`-release' is ignored for convenience libraries"
+      else
+
+	# Parse the version information argument.
+	save_ifs="$IFS"; IFS=':'
+	set dummy $vinfo 0 0 0
+	shift
+	IFS="$save_ifs"
+
+	test -n "$7" && \
+	  func_fatal_help "too many parameters to \`-version-info'"
+
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
+
+	case $vinfo_number in
+	yes)
+	  number_major="$1"
+	  number_minor="$2"
+	  number_revision="$3"
+	  #
+	  # There are really only two kinds -- those that
+	  # use the current revision as the major version
+	  # and those that subtract age and use age as
+	  # a minor version.  But, then there is irix
+	  # which has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  darwin|linux|osf|windows|none)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age="$number_minor"
+	    revision="$number_revision"
+	    ;;
+	  freebsd-aout|freebsd-elf|qnx|sunos)
+	    current="$number_major"
+	    revision="$number_minor"
+	    age="0"
+	    ;;
+	  irix|nonstopux)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age="$number_minor"
+	    revision="$number_minor"
+	    lt_irix_increment=no
+	    ;;
+	  esac
+	  ;;
+	no)
+	  current="$1"
+	  revision="$2"
+	  age="$3"
+	  ;;
+	esac
+
+	# Check that each of the things are valid numbers.
+	case $current in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "CURRENT \`$current' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $revision in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "REVISION \`$revision' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $age in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "AGE \`$age' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	if test "$age" -gt "$current"; then
+	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case $version_type in
+	none) ;;
+
+	darwin)
+	  # Like Linux, but with the current version available in
+	  # verstring for coding it into the library header
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix="$major.$age.$revision"
+	  # Darwin ld doesn't like 0 for these options...
+	  func_arith $current + 1
+	  minor_current=$func_arith_result
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+	  ;;
+
+	freebsd-aout)
+	  major=".$current"
+	  versuffix=".$current.$revision";
+	  ;;
+
+	freebsd-elf)
+	  major=".$current"
+	  versuffix=".$current"
+	  ;;
+
+	irix | nonstopux)
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    func_arith $current - $age
+	  else
+	    func_arith $current - $age + 1
+	  fi
+	  major=$func_arith_result
+
+	  case $version_type in
+	    nonstopux) verstring_prefix=nonstopux ;;
+	    *)         verstring_prefix=sgi ;;
+	  esac
+	  verstring="$verstring_prefix$major.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$revision
+	  while test "$loop" -ne 0; do
+	    func_arith $revision - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring="$verstring_prefix$major.$iface:$verstring"
+	  done
+
+	  # Before this point, $major must not contain `.'.
+	  major=.$major
+	  versuffix="$major.$revision"
+	  ;;
+
+	linux)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix="$major.$age.$revision"
+	  ;;
+
+	osf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=".$current.$age.$revision"
+	  verstring="$current.$age.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test "$loop" -ne 0; do
+	    func_arith $current - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring="$verstring:${iface}.0"
+	  done
+
+	  # Make executables depend on our current version.
+	  verstring="$verstring:${current}.0"
+	  ;;
+
+	qnx)
+	  major=".$current"
+	  versuffix=".$current"
+	  ;;
+
+	sunos)
+	  major=".$current"
+	  versuffix=".$current.$revision"
+	  ;;
+
+	windows)
+	  # Use '-' rather than '.', since we only want one
+	  # extension on DOS 8.3 filesystems.
+	  func_arith $current - $age
+	  major=$func_arith_result
+	  versuffix="-$major"
+	  ;;
+
+	*)
+	  func_fatal_configuration "unknown library version type \`$version_type'"
+	  ;;
+	esac
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring="0.0"
+	    ;;
+	  esac
+	  if test "$need_version" = no; then
+	    versuffix=
+	  else
+	    versuffix=".0.0"
+	  fi
+	fi
+
+	# Remove version info from name if versioning should be avoided
+	if test "$avoid_version" = yes && test "$need_version" = no; then
+	  major=
+	  versuffix=
+	  verstring=""
+	fi
+
+	# Check to see if the archive will have undefined symbols.
+	if test "$allow_undefined" = yes; then
+	  if test "$allow_undefined_flag" = unsupported; then
+	    func_warning "undefined symbols not allowed in $host shared libraries"
+	    build_libtool_libs=no
+	    build_old_libs=yes
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag="$no_undefined_flag"
+	fi
+
+      fi
+
+      func_generate_dlsyms "$libname" "$libname" "yes"
+      libobjs="$libobjs $symfileobj"
+      test "X$libobjs" = "X " && libobjs=
+
+      if test "$mode" != relink; then
+	# Remove our outputs, but don't remove object files since they
+	# may have been created when compiling PIC objects.
+	removelist=
+	tempremovelist=`$ECHO "$output_objdir/*"`
+	for p in $tempremovelist; do
+	  case $p in
+	    *.$objext | *.gcno)
+	       ;;
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+	       if test "X$precious_files_regex" != "X"; then
+		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+		 then
+		   continue
+		 fi
+	       fi
+	       removelist="$removelist $p"
+	       ;;
+	    *) ;;
+	  esac
+	done
+	test -n "$removelist" && \
+	  func_show_eval "${RM}r \$removelist"
+      fi
+
+      # Now set the variables for building old libraries.
+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+      fi
+
+      # Eliminate all temporary directories.
+      #for path in $notinst_path; do
+      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
+      #done
+
+      if test -n "$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  temp_xrpath="$temp_xrpath -R$libdir"
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  esac
+	done
+	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+	  dependency_libs="$temp_xrpath $dependency_libs"
+	fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles="$dlfiles"
+      dlfiles=
+      for lib in $old_dlfiles; do
+	case " $dlprefiles $dlfiles " in
+	*" $lib "*) ;;
+	*) dlfiles="$dlfiles $lib" ;;
+	esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles="$dlprefiles"
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+	case "$dlprefiles " in
+	*" $lib "*) ;;
+	*) dlprefiles="$dlprefiles $lib" ;;
+	esac
+      done
+
+      if test "$build_libtool_libs" = yes; then
+	if test -n "$rpath"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # these systems don't actually have a c library (as such)!
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C library is in the System framework
+	    deplibs="$deplibs System.ltframework"
+	    ;;
+	  *-*-netbsd*)
+	    # Don't link with libc until the a.out ld.so is fixed.
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    ;;
+	  *)
+	    # Add libc to deplibs on all other systems if necessary.
+	    if test "$build_libtool_need_lc" = "yes"; then
+	      deplibs="$deplibs -lc"
+	    fi
+	    ;;
+	  esac
+	fi
+
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# I'm not sure if I'm treating the release correctly.  I think
+	# release should show up in the -l (ie -lgmp5) so we don't want to
+	# add it in twice.  Is that correct?
+	release=""
+	versuffix=""
+	major=""
+	newdeplibs=
+	droppeddeps=no
+	case $deplibs_check_method in
+	pass_all)
+	  # Don't check for shared/static.  Everything works.
+	  # This might be a little naive.  We might want to check
+	  # whether the library exists or not.  But this is on
+	  # osf3 & osf4 and I'm not really sure... Just
+	  # implementing what was already the behavior.
+	  newdeplibs=$deplibs
+	  ;;
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $opt_dry_run || $RM conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $opt_dry_run || $RM conftest
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    newdeplibs="$newdeplibs $i"
+		    i=""
+		    ;;
+		  esac
+		fi
+		if test -n "$i" ; then
+		  eval "libname=\"$libname_spec\""
+		  eval "deplib_matches=\"$library_names_spec\""
+		  set dummy $deplib_matches; shift
+		  deplib_match=$1
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		    newdeplibs="$newdeplibs $i"
+		  else
+		    droppeddeps=yes
+		    echo
+		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		    echo "*** I have the capability to make that library automatically link in when"
+		    echo "*** you link to this library.  But I can only do this if you have a"
+		    echo "*** shared version of the library, which I believe you do not have"
+		    echo "*** because a test_compile did reveal that the linker did not use it for"
+		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
+		fi
+		;;
+	      *)
+		newdeplibs="$newdeplibs $i"
+		;;
+	      esac
+	    done
+	  else
+	    # Error occurred in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		$opt_dry_run || $RM conftest
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		  ldd_output=`ldd conftest`
+		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      newdeplibs="$newdeplibs $i"
+		      i=""
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i" ; then
+		    eval "libname=\"$libname_spec\""
+		    eval "deplib_matches=\"$library_names_spec\""
+		    set dummy $deplib_matches; shift
+		    deplib_match=$1
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		      newdeplibs="$newdeplibs $i"
+		    else
+		      droppeddeps=yes
+		      echo
+		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		      echo "*** I have the capability to make that library automatically link in when"
+		      echo "*** you link to this library.  But I can only do this if you have a"
+		      echo "*** shared version of the library, which you do not appear to have"
+		      echo "*** because a test_compile did reveal that the linker did not use this one"
+		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		    fi
+		  fi
+		else
+		  droppeddeps=yes
+		  echo
+		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+		  echo "*** make it link in!  You will probably need to install it or some"
+		  echo "*** library that it depends on before this library will be fully"
+		  echo "*** functional.  Installing it before continuing would be even better."
+		fi
+		;;
+	      *)
+		newdeplibs="$newdeplibs $i"
+		;;
+	      esac
+	    done
+	  fi
+	  ;;
+	file_magic*)
+	  set dummy $deplibs_check_method; shift
+	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  newdeplibs="$newdeplibs $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		eval "libname=\"$libname_spec\""
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potent_lib" 2>/dev/null |
+			 $GREP " -> " >/dev/null; then
+			continue
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib="$potent_lib"
+		      while test -h "$potlib" 2>/dev/null; do
+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+			case $potliblink in
+			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+			esac
+		      done
+		      if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null |
+			 $SED -e 10q |
+			 $EGREP "$file_magic_regex" > /dev/null; then
+			newdeplibs="$newdeplibs $a_deplib"
+			a_deplib=""
+			break 2
+		      fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a file magic. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      newdeplibs="$newdeplibs $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	match_pattern*)
+	  set dummy $deplibs_check_method; shift
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  newdeplibs="$newdeplibs $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		eval "libname=\"$libname_spec\""
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		    potlib="$potent_lib" # see symlink-check above in file_magic test
+		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+		       $EGREP "$match_pattern_regex" > /dev/null; then
+		      newdeplibs="$newdeplibs $a_deplib"
+		      a_deplib=""
+		      break 2
+		    fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      newdeplibs="$newdeplibs $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	none | unknown | *)
+	  newdeplibs=""
+	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	    for i in $predeps $postdeps ; do
+	      # can't use Xsed below, because $i might contain '/'
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+	    done
+	  fi
+	  case $tmp_deplibs in
+	  *[!\	\ ]*)
+	    echo
+	    if test "X$deplibs_check_method" = "Xnone"; then
+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
+	    else
+	      echo "*** Warning: inter-library dependencies are not known to be supported."
+	    fi
+	    echo "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
+	    ;;
+	  esac
+	  ;;
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	case $host in
+	*-*-rhapsody* | *-*-darwin1.[012])
+	  # On Rhapsody replace the C library with the System framework
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
+	  ;;
+	esac
+
+	if test "$droppeddeps" = yes; then
+	  if test "$module" = yes; then
+	    echo
+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
+	    echo "*** a static module, that should work as long as the dlopening"
+	    echo "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      echo
+	      echo "*** However, this would only work if libtool was able to extract symbol"
+	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      echo "*** not find such a program.  So, this module is probably useless."
+	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test "$build_old_libs" = no; then
+	      oldlibs="$output_objdir/$libname.$libext"
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	  else
+	    echo "*** The inter-library dependencies that have been dropped here will be"
+	    echo "*** automatically added whenever a program is linked with this library"
+	    echo "*** or is declared to -dlopen it."
+
+	    if test "$allow_undefined" = no; then
+	      echo
+	      echo "*** Since this library must not contain undefined symbols,"
+	      echo "*** because either the platform does not support them or"
+	      echo "*** it was explicitly requested with -no-undefined,"
+	      echo "*** libtool will only create a static version of it."
+	      if test "$build_old_libs" = no; then
+		oldlibs="$output_objdir/$libname.$libext"
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  fi
+	fi
+	# Done checking deplibs!
+	deplibs=$newdeplibs
+      fi
+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+      case $host in
+	*-*-darwin*)
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  ;;
+      esac
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $deplibs " in
+	  *" -L$path/$objdir "*)
+	    new_libs="$new_libs -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) new_libs="$new_libs $deplib" ;;
+	  esac
+	  ;;
+	*) new_libs="$new_libs $deplib" ;;
+	esac
+      done
+      deplibs="$new_libs"
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      if test "$build_libtool_libs" = yes; then
+	if test "$hardcode_into_libs" = yes; then
+	  # Hardcode the library paths
+	  hardcode_libdirs=
+	  dep_rpath=
+	  rpath="$finalize_rpath"
+	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+	  for libdir in $rpath; do
+	    if test -n "$hardcode_libdir_flag_spec"; then
+	      if test -n "$hardcode_libdir_separator"; then
+		if test -z "$hardcode_libdirs"; then
+		  hardcode_libdirs="$libdir"
+		else
+		  # Just accumulate the unique libdirs.
+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		    ;;
+		  *)
+		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		    ;;
+		  esac
+		fi
+	      else
+		eval "flag=\"$hardcode_libdir_flag_spec\""
+		dep_rpath="$dep_rpath $flag"
+	      fi
+	    elif test -n "$runpath_var"; then
+	      case "$perm_rpath " in
+	      *" $libdir "*) ;;
+	      *) perm_rpath="$perm_rpath $libdir" ;;
+	      esac
+	    fi
+	  done
+	  # Substitute the hardcoded libdirs into the rpath.
+	  if test -n "$hardcode_libdir_separator" &&
+	     test -n "$hardcode_libdirs"; then
+	    libdir="$hardcode_libdirs"
+	    if test -n "$hardcode_libdir_flag_spec_ld"; then
+	      eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\""
+	    else
+	      eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
+	    fi
+	  fi
+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+	    # We should set the runpath_var.
+	    rpath=
+	    for dir in $perm_rpath; do
+	      rpath="$rpath$dir:"
+	    done
+	    eval $runpath_var=\$rpath\$$runpath_var
+	    export $runpath_var
+	  fi
+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+	fi
+
+	shlibpath="$finalize_shlibpath"
+	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	if test -n "$shlibpath"; then
+	  eval $shlibpath_var=\$shlibpath\$$shlibpath_var
+	  export $shlibpath_var
+	fi
+
+	# Get the real and link names of the library.
+	eval "shared_ext=\"$shrext_cmds\""
+	eval "library_names=\"$library_names_spec\""
+	set dummy $library_names
+	shift
+	realname="$1"
+	shift
+
+	if test -n "$soname_spec"; then
+	  eval "soname=\"$soname_spec\""
+	else
+	  soname="$realname"
+	fi
+	if test -z "$dlname"; then
+	  dlname=$soname
+	fi
+
+	lib="$output_objdir/$realname"
+	linknames=
+	for link
+	do
+	  linknames="$linknames $link"
+	done
+
+	# Use standard objects if they are pic
+	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	test "X$libobjs" = "X " && libobjs=
+
+	delfiles=
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+	  export_symbols="$output_objdir/$libname.uexp"
+	  delfiles="$delfiles $export_symbols"
+	fi
+
+	orig_export_symbols=
+	case $host_os in
+	cygwin* | mingw* | cegcc*)
+	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+	    # exporting using user supplied symfile
+	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+	      # and it's NOT already a .def file. Must figure out
+	      # which of the given symbols are data symbols and tag
+	      # them as such. So, trigger use of export_symbols_cmds.
+	      # export_symbols gets reassigned inside the "prepare
+	      # the list of exported symbols" if statement, so the
+	      # include_expsyms logic still works.
+	      orig_export_symbols="$export_symbols"
+	      export_symbols=
+	      always_export_symbols=yes
+	    fi
+	  fi
+	  ;;
+	esac
+
+	# Prepare the list of exported symbols
+	if test -z "$export_symbols"; then
+	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+	    func_verbose "generating symbol list for \`$libname.la'"
+	    export_symbols="$output_objdir/$libname.exp"
+	    $opt_dry_run || $RM $export_symbols
+	    cmds=$export_symbols_cmds
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd in $cmds; do
+	      IFS="$save_ifs"
+	      eval "cmd=\"$cmd\""
+	      func_len " $cmd"
+	      len=$func_len_result
+	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      else
+		# The command line is too long to execute in one step.
+		func_verbose "using reloadable object file for export list..."
+		skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
+	      fi
+	    done
+	    IFS="$save_ifs"
+	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+	fi
+
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  tmp_export_symbols="$export_symbols"
+	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	  $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
+	fi
+
+	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+	  # The given exports_symbols file has to be filtered, so filter it.
+	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	  # 's' commands which not all seds can handle. GNU sed should be fine
+	  # though. Also, the filter scales superlinearly with the number of
+	  # global variables. join(1) would be nice here, but unfortunately
+	  # isn't a blessed tool.
+	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	  export_symbols=$output_objdir/$libname.def
+	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	fi
+
+	tmp_deplibs=
+	for test_deplib in $deplibs; do
+	  case " $convenience " in
+	  *" $test_deplib "*) ;;
+	  *)
+	    tmp_deplibs="$tmp_deplibs $test_deplib"
+	    ;;
+	  esac
+	done
+	deplibs="$tmp_deplibs"
+
+	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec" &&
+	    test "$compiler_needs_object" = yes &&
+	    test -z "$libobjs"; then
+	    # extract the archives, so we have objects to list.
+	    # TODO: could optimize this to just extract one archive.
+	    whole_archive_flag_spec=
+	  fi
+	  if test -n "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	    eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
+	    test "X$libobjs" = "X " && libobjs=
+	  else
+	    gentop="$output_objdir/${outputname}x"
+	    generated="$generated $gentop"
+
+	    func_extract_archives $gentop $convenience
+	    libobjs="$libobjs $func_extract_archives_result"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	fi
+
+	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+	  eval "flag=\"$thread_safe_flag_spec\""
+	  linker_flags="$linker_flags $flag"
+	fi
+
+	# Make a backup of the uninstalled library when relinking
+	if test "$mode" = relink; then
+	  $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $?
+	fi
+
+	# Do each of the archive commands.
+	if test "$module" = yes && test -n "$module_cmds" ; then
+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	    eval "test_cmds=\"$module_expsym_cmds\""
+	    cmds=$module_expsym_cmds
+	  else
+	    eval "test_cmds=\"$module_cmds\""
+	    cmds=$module_cmds
+	  fi
+	else
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    eval "test_cmds=\"$archive_expsym_cmds\""
+	    cmds=$archive_expsym_cmds
+	  else
+	    eval "test_cmds=\"$archive_cmds\""
+	    cmds=$archive_cmds
+	  fi
+	fi
+
+	if test "X$skipped_export" != "X:" &&
+	   func_len " $test_cmds" &&
+	   len=$func_len_result &&
+	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  :
+	else
+	  # The command line is too long to link in one step, link piecewise
+	  # or, if using GNU ld and skipped_export is not :, use a linker
+	  # script.
+
+	  # Save the value of $output and $libobjs because we want to
+	  # use them later.  If we have whole_archive_flag_spec, we
+	  # want to use save_libobjs as it was before
+	  # whole_archive_flag_spec was expanded, because we can't
+	  # assume the linker understands whole_archive_flag_spec.
+	  # This may have to be revisited, in case too many
+	  # convenience libraries get linked in and end up exceeding
+	  # the spec.
+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	  fi
+	  save_output=$output
+	  func_basename "$output"
+	  output_la=$func_basename_result
+
+	  # Clear the reloadable object creation command queue and
+	  # initialize k to one.
+	  test_cmds=
+	  concat_cmds=
+	  objlist=
+	  last_robj=
+	  k=1
+
+	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
+	    output=${output_objdir}/${output_la}.lnkscript
+	    func_verbose "creating GNU ld script: $output"
+	    echo 'INPUT (' > $output
+	    for obj in $save_libobjs
+	    do
+	      $ECHO "$obj" >> $output
+	    done
+	    echo ')' >> $output
+	    delfiles="$delfiles $output"
+	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
+	    output=${output_objdir}/${output_la}.lnk
+	    func_verbose "creating linker input file list: $output"
+	    : > $output
+	    set x $save_libobjs
+	    shift
+	    firstobj=
+	    if test "$compiler_needs_object" = yes; then
+	      firstobj="$1 "
+	      shift
+	    fi
+	    for obj
+	    do
+	      $ECHO "$obj" >> $output
+	    done
+	    delfiles="$delfiles $output"
+	    output=$firstobj\"$file_list_spec$output\"
+	  else
+	    if test -n "$save_libobjs"; then
+	      func_verbose "creating reloadable object files..."
+	      output=$output_objdir/$output_la-${k}.$objext
+	      eval "test_cmds=\"$reload_cmds\""
+	      func_len " $test_cmds"
+	      len0=$func_len_result
+	      len=$len0
+
+	      # Loop over the list of objects to be linked.
+	      for obj in $save_libobjs
+	      do
+		func_len " $obj"
+		func_arith $len + $func_len_result
+		len=$func_arith_result
+		if test "X$objlist" = X ||
+		   test "$len" -lt "$max_cmd_len"; then
+		  func_append objlist " $obj"
+		else
+		  # The command $test_cmds is almost too long, add a
+		  # command to the queue.
+		  if test "$k" -eq 1 ; then
+		    # The first file doesn't have a previous command to add.
+		    reload_objs=$objlist
+		    eval "concat_cmds=\"$reload_cmds\""
+		  else
+		    # All subsequent reloadable object files will link in
+		    # the last one created.
+		    reload_objs="$objlist $last_robj"
+		    eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\""
+		  fi
+		  last_robj=$output_objdir/$output_la-${k}.$objext
+		  func_arith $k + 1
+		  k=$func_arith_result
+		  output=$output_objdir/$output_la-${k}.$objext
+		  objlist=" $obj"
+		  func_len " $last_robj"
+		  func_arith $len0 + $func_len_result
+		  len=$func_arith_result
+		fi
+	      done
+	      # Handle the remaining objects by creating one last
+	      # reloadable object file.  All subsequent reloadable object
+	      # files will link in the last one created.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      reload_objs="$objlist $last_robj"
+	      eval "concat_cmds=\"\${concat_cmds}$reload_cmds\""
+	      if test -n "$last_robj"; then
+	        eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\""
+	      fi
+	      delfiles="$delfiles $output"
+
+	    else
+	      output=
+	    fi
+
+	    if ${skipped_export-false}; then
+	      func_verbose "generating symbol list for \`$libname.la'"
+	      export_symbols="$output_objdir/$libname.exp"
+	      $opt_dry_run || $RM $export_symbols
+	      libobjs=$output
+	      # Append the command to create the export file.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\""
+	      if test -n "$last_robj"; then
+		eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\""
+	      fi
+	    fi
+
+	    test -n "$save_libobjs" &&
+	      func_verbose "creating a temporary reloadable object file: $output"
+
+	    # Loop through the commands generated above and execute them.
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd in $concat_cmds; do
+	      IFS="$save_ifs"
+	      $opt_silent || {
+		  func_quote_for_expand "$cmd"
+		  eval "func_echo $func_quote_for_expand_result"
+	      }
+	      $opt_dry_run || eval "$cmd" || {
+		lt_exit=$?
+
+		# Restore the uninstalled library and exit
+		if test "$mode" = relink; then
+		  ( cd "$output_objdir" && \
+		    $RM "${realname}T" && \
+		    $MV "${realname}U" "$realname" )
+		fi
+
+		exit $lt_exit
+	      }
+	    done
+	    IFS="$save_ifs"
+
+	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+
+          if ${skipped_export-false}; then
+	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	      tmp_export_symbols="$export_symbols"
+	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	      $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
+	    fi
+
+	    if test -n "$orig_export_symbols"; then
+	      # The given exports_symbols file has to be filtered, so filter it.
+	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	      # 's' commands which not all seds can handle. GNU sed should be fine
+	      # though. Also, the filter scales superlinearly with the number of
+	      # global variables. join(1) would be nice here, but unfortunately
+	      # isn't a blessed tool.
+	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	      export_symbols=$output_objdir/$libname.def
+	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	    fi
+	  fi
+
+	  libobjs=$output
+	  # Restore the value of output.
+	  output=$save_output
+
+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+	    eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	  # Expand the library linking commands again to reset the
+	  # value of $libobjs for piecewise linking.
+
+	  # Do each of the archive commands.
+	  if test "$module" = yes && test -n "$module_cmds" ; then
+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	      cmds=$module_expsym_cmds
+	    else
+	      cmds=$module_cmds
+	    fi
+	  else
+	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	      cmds=$archive_expsym_cmds
+	    else
+	      cmds=$archive_cmds
+	    fi
+	  fi
+	fi
+
+	if test -n "$delfiles"; then
+	  # Append the command to remove temporary files to $cmds.
+	  eval "cmds=\"\$cmds~\$RM $delfiles\""
+	fi
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  generated="$generated $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  libobjs="$libobjs $func_extract_archives_result"
+	  test "X$libobjs" = "X " && libobjs=
+	fi
+
+	save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  eval "cmd=\"$cmd\""
+	  $opt_silent || {
+	    func_quote_for_expand "$cmd"
+	    eval "func_echo $func_quote_for_expand_result"
+	  }
+	  $opt_dry_run || eval "$cmd" || {
+	    lt_exit=$?
+
+	    # Restore the uninstalled library and exit
+	    if test "$mode" = relink; then
+	      ( cd "$output_objdir" && \
+	        $RM "${realname}T" && \
+		$MV "${realname}U" "$realname" )
+	    fi
+
+	    exit $lt_exit
+	  }
+	done
+	IFS="$save_ifs"
+
+	# Restore the uninstalled library and exit
+	if test "$mode" = relink; then
+	  $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $?
+
+	  if test -n "$convenience"; then
+	    if test -z "$whole_archive_flag_spec"; then
+	      func_show_eval '${RM}r "$gentop"'
+	    fi
+	  fi
+
+	  exit $EXIT_SUCCESS
+	fi
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test "$module" = yes || test "$export_dynamic" = yes; then
+	  # On all known operating systems, these are identical.
+	  dlname="$soname"
+	fi
+      fi
+      ;;
+
+    obj)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	func_warning "\`-dlopen' is ignored for objects"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for objects" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for objects"
+
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for objects"
+
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for objects"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for objects"
+
+      case $output in
+      *.lo)
+	test -n "$objs$old_deplibs" && \
+	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+
+	libobj=$output
+	func_lo2o "$libobj"
+	obj=$func_lo2o_result
+	;;
+      *)
+	libobj=
+	obj="$output"
+	;;
+      esac
+
+      # Delete the old objects.
+      $opt_dry_run || $RM $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # reload_cmds runs $LD directly, so let us get rid of
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
+      wl=
+
+      if test -n "$convenience"; then
+	if test -n "$whole_archive_flag_spec"; then
+	  eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\""
+	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	else
+	  gentop="$output_objdir/${obj}x"
+	  generated="$generated $gentop"
+
+	  func_extract_archives $gentop $convenience
+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+	fi
+      fi
+
+      # Create the old-style object.
+      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+      output="$obj"
+      func_execute_cmds "$reload_cmds" 'exit $?'
+
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$build_libtool_libs" != yes; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	# $show "echo timestamp > $libobj"
+	# $opt_dry_run || echo timestamp > $libobj || exit $?
+	exit $EXIT_SUCCESS
+      fi
+
+      if test -n "$pic_flag" || test "$pic_mode" != default; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs $reload_conv_objs"
+	output="$libobj"
+	func_execute_cmds "$reload_cmds" 'exit $?'
+      fi
+
+      if test -n "$gentop"; then
+	func_show_eval '${RM}r "$gentop"'
+      fi
+
+      exit $EXIT_SUCCESS
+      ;;
+
+    prog)
+      case $host in
+	*cygwin*) func_stripname '' '.exe' "$output"
+	          output=$func_stripname_result.exe;;
+      esac
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for programs"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for programs"
+
+      test "$preload" = yes \
+        && test "$dlopen_support" = unknown \
+	&& test "$dlopen_self" = unknown \
+	&& test "$dlopen_self_static" = unknown && \
+	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+	# On Rhapsody replace the C library is the System framework
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	;;
+      esac
+
+      case $host in
+      *-*-darwin*)
+	# Don't allow lazy linking, it breaks C++ global constructors
+	# But is supposedly fixed on 10.4 or later (yay!).
+	if test "$tagname" = CXX ; then
+	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+	    10.[0123])
+	      compile_command="$compile_command ${wl}-bind_at_load"
+	      finalize_command="$finalize_command ${wl}-bind_at_load"
+	    ;;
+	  esac
+	fi
+	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	;;
+      esac
+
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $compile_deplibs " in
+	  *" -L$path/$objdir "*)
+	    new_libs="$new_libs -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $compile_deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) new_libs="$new_libs $deplib" ;;
+	  esac
+	  ;;
+	*) new_libs="$new_libs $deplib" ;;
+	esac
+      done
+      compile_deplibs="$new_libs"
+
+
+      compile_command="$compile_command $compile_deplibs"
+      finalize_command="$finalize_command $finalize_deplibs"
+
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  # This is the magic to use -rpath.
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  esac
+	done
+      fi
+
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval "flag=\"$hardcode_libdir_flag_spec\""
+	    rpath="$rpath $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) perm_rpath="$perm_rpath $libdir" ;;
+	  esac
+	fi
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$libdir:"*) ;;
+	  ::) dllsearchpath=$libdir;;
+	  *) dllsearchpath="$dllsearchpath:$libdir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  esac
+	  ;;
+	esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval "rpath=\" $hardcode_libdir_flag_spec\""
+      fi
+      compile_rpath="$rpath"
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval "flag=\"$hardcode_libdir_flag_spec\""
+	    rpath="$rpath $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$finalize_perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	  esac
+	fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval "rpath=\" $hardcode_libdir_flag_spec\""
+      fi
+      finalize_rpath="$rpath"
+
+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+	# Transform all the library objects into standard objects.
+	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+      fi
+
+      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+
+      # template prelinking step
+      if test -n "$prelink_cmds"; then
+	func_execute_cmds "$prelink_cmds" 'exit $?'
+      fi
+
+      wrappers_required=yes
+      case $host in
+      *cegcc* | *mingw32ce*)
+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+        wrappers_required=no
+        ;;
+      *cygwin* | *mingw* )
+        if test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      *)
+        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      esac
+      if test "$wrappers_required" = no; then
+	# Replace the output file specification.
+	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	link_command="$compile_command$compile_rpath"
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	exit_status=0
+	func_show_eval "$link_command" 'exit_status=$?'
+
+	# Delete the generated files.
+	if test -f "$output_objdir/${outputname}S.${objext}"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+	fi
+
+	exit $exit_status
+      fi
+
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+	if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    rpath="$rpath$dir:"
+	  done
+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+	if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    rpath="$rpath$dir:"
+	  done
+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+      fi
+
+      if test "$no_install" = yes; then
+	# We don't need to create a wrapper script.
+	link_command="$compile_var$compile_command$compile_rpath"
+	# Replace the output file specification.
+	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	# Delete the old output file.
+	$opt_dry_run || $RM $output
+	# Link the executable and exit
+	func_show_eval "$link_command" 'exit $?'
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$hardcode_action" = relink; then
+	# Fast installation is not supported
+	link_command="$compile_var$compile_command$compile_rpath"
+	relink_command="$finalize_var$finalize_command$finalize_rpath"
+
+	func_warning "this platform does not like uninstalled shared libraries"
+	func_warning "\`$output' will be relinked during installation"
+      else
+	if test "$fast_install" != no; then
+	  link_command="$finalize_var$compile_command$finalize_rpath"
+	  if test "$fast_install" = yes; then
+	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+	  else
+	    # fast_install is set to needless
+	    relink_command=
+	  fi
+	else
+	  link_command="$compile_var$compile_command$compile_rpath"
+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
+	fi
+      fi
+
+      # Replace the output file specification.
+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+      # Delete the old output files.
+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+      func_show_eval "$link_command" 'exit $?'
+
+      # Now create the wrapper script.
+      func_verbose "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+	# Preserve any variables that may affect compiler behavior
+	for var in $variables_saved_for_relink; do
+	  if eval test -z \"\${$var+set}\"; then
+	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	  elif eval var_value=\$$var; test -z "$var_value"; then
+	    relink_command="$var=; export $var; $relink_command"
+	  else
+	    func_quote_for_eval "$var_value"
+	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	  fi
+	done
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      fi
+
+      # Only actually do things if not in dry run mode.
+      $opt_dry_run || {
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) func_stripname '' '.exe' "$output"
+	         output=$func_stripname_result ;;
+	esac
+	# test for cygwin because mv fails w/o .exe extensions
+	case $host in
+	  *cygwin*)
+	    exeext=.exe
+	    func_stripname '' '.exe' "$outputname"
+	    outputname=$func_stripname_result ;;
+	  *) exeext= ;;
+	esac
+	case $host in
+	  *cygwin* | *mingw* )
+	    func_dirname_and_basename "$output" "" "."
+	    output_name=$func_basename_result
+	    output_path=$func_dirname_result
+	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
+	    cwrapper="$output_path/$output_name.exe"
+	    $RM $cwrappersource $cwrapper
+	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_cwrapperexe_src > $cwrappersource
+
+	    # The wrapper executable is built using the $host compiler,
+	    # because it contains $host paths and files. If cross-
+	    # compiling, it, like the target executable, must be
+	    # executed on the $host or under an emulation environment.
+	    $opt_dry_run || {
+	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+	      $STRIP $cwrapper
+	    }
+
+	    # Now, create the wrapper script for func_source use:
+	    func_ltwrapper_scriptname $cwrapper
+	    $RM $func_ltwrapper_scriptname_result
+	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+	    $opt_dry_run || {
+	      # note: this script will not be executed, so do not chmod.
+	      if test "x$build" = "x$host" ; then
+		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+	      else
+		func_emit_wrapper no > $func_ltwrapper_scriptname_result
+	      fi
+	    }
+	  ;;
+	  * )
+	    $RM $output
+	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_wrapper no > $output
+	    chmod +x $output
+	  ;;
+	esac
+      }
+      exit $EXIT_SUCCESS
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      if test "$build_libtool_libs" = convenience; then
+	oldobjs="$libobjs_save $symfileobj"
+	addlibs="$convenience"
+	build_libtool_libs=no
+      else
+	if test "$build_libtool_libs" = module; then
+	  oldobjs="$libobjs_save"
+	  build_libtool_libs=no
+	else
+	  oldobjs="$old_deplibs $non_pic_objects"
+	  if test "$preload" = yes && test -f "$symfileobj"; then
+	    oldobjs="$oldobjs $symfileobj"
+	  fi
+	fi
+	addlibs="$old_convenience"
+      fi
+
+      if test -n "$addlibs"; then
+	gentop="$output_objdir/${outputname}x"
+	generated="$generated $gentop"
+
+	func_extract_archives $gentop $addlibs
+	oldobjs="$oldobjs $func_extract_archives_result"
+      fi
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+	cmds=$old_archive_from_new_cmds
+      else
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  generated="$generated $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  oldobjs="$oldobjs $func_extract_archives_result"
+	fi
+
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      func_basename "$obj"
+	      $ECHO "$func_basename_result"
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  echo "copying selected object files to avoid basename conflicts..."
+	  gentop="$output_objdir/${outputname}x"
+	  generated="$generated $gentop"
+	  func_mkdir_p "$gentop"
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    func_basename "$obj"
+	    objbase="$func_basename_result"
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		func_arith $counter + 1
+		counter=$func_arith_result
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      oldobjs="$oldobjs $gentop/$newobj"
+	      ;;
+	    *) oldobjs="$oldobjs $obj" ;;
+	    esac
+	  done
+	fi
+	eval "cmds=\"$old_archive_cmds\""
+
+	func_len " $cmds"
+	len=$func_len_result
+	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  cmds=$old_archive_cmds
+	else
+	  # the command line is too long to link in one step, link in parts
+	  func_verbose "using piecewise archive linking..."
+	  save_RANLIB=$RANLIB
+	  RANLIB=:
+	  objlist=
+	  concat_cmds=
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  # Is there a better way of finding the last object in the list?
+	  for obj in $save_oldobjs
+	  do
+	    last_oldobj=$obj
+	  done
+	  eval "test_cmds=\"$old_archive_cmds\""
+	  func_len " $test_cmds"
+	  len0=$func_len_result
+	  len=$len0
+	  for obj in $save_oldobjs
+	  do
+	    func_len " $obj"
+	    func_arith $len + $func_len_result
+	    len=$func_arith_result
+	    func_append objlist " $obj"
+	    if test "$len" -lt "$max_cmd_len"; then
+	      :
+	    else
+	      # the above command should be used before it gets too long
+	      oldobjs=$objlist
+	      if test "$obj" = "$last_oldobj" ; then
+		RANLIB=$save_RANLIB
+	      fi
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\""
+	      objlist=
+	      len=$len0
+	    fi
+	  done
+	  RANLIB=$save_RANLIB
+	  oldobjs=$objlist
+	  if test "X$oldobjs" = "X" ; then
+	    eval "cmds=\"\$concat_cmds\""
+	  else
+	    eval "cmds=\"\$concat_cmds~\$old_archive_cmds\""
+	  fi
+	fi
+      fi
+      func_execute_cmds "$cmds" 'exit $?'
+    done
+
+    test -n "$generated" && \
+      func_show_eval "${RM}r$generated"
+
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      func_verbose "creating $output"
+
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+	if eval test -z \"\${$var+set}\"; then
+	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	elif eval var_value=\$$var; test -z "$var_value"; then
+	  relink_command="$var=; export $var; $relink_command"
+	else
+	  func_quote_for_eval "$var_value"
+	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      if test "$hardcode_automatic" = yes ; then
+	relink_command=
+      fi
+
+      # Only create the output if not a dry run.
+      $opt_dry_run || {
+	for installed in no yes; do
+	  if test "$installed" = yes; then
+	    if test -z "$install_libdir"; then
+	      break
+	    fi
+	    output="$output_objdir/$outputname"i
+	    # Replace all uninstalled libtool libraries with the installed ones
+	    newdependency_libs=
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      *.la)
+		func_basename "$deplib"
+		name="$func_basename_result"
+		libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$deplib' is not a valid libtool archive"
+		newdependency_libs="$newdependency_libs $libdir/$name"
+		;;
+	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+	      esac
+	    done
+	    dependency_libs="$newdependency_libs"
+	    newdlfiles=
+
+	    for lib in $dlfiles; do
+	      case $lib in
+	      *.la)
+	        func_basename "$lib"
+		name="$func_basename_result"
+		libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		newdlfiles="$newdlfiles $libdir/$name"
+		;;
+	      *) newdlfiles="$newdlfiles $lib" ;;
+	      esac
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+	      *.la)
+		# Only pass preopened files to the pseudo-archive (for
+		# eventual linking with the app. that links it) if we
+		# didn't already link the preopened objects directly into
+		# the library:
+		func_basename "$lib"
+		name="$func_basename_result"
+		libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		newdlprefiles="$newdlprefiles $libdir/$name"
+		;;
+	      esac
+	    done
+	    dlprefiles="$newdlprefiles"
+	  else
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      newdlfiles="$newdlfiles $abs"
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      newdlprefiles="$newdlprefiles $abs"
+	    done
+	    dlprefiles="$newdlprefiles"
+	  fi
+	  $RM $output
+	  # place dlname in correct position for cygwin
+	  # In fact, it would be nice if we could use this code for all target
+	  # systems that can't hard-code library paths into their executables
+	  # and that have no shared library path variable independent of PATH,
+	  # but it turns out we can't easily determine that from inspecting
+	  # libtool variables, so we have to hard-code the OSs to which it
+	  # applies here; at the moment, that means platforms that use the PE
+	  # object format with DLL files.  See the long comment at the top of
+	  # tests/bindir.at for full details.
+	  tdlname=$dlname
+	  case $host,$output,$installed,$module,$dlname in
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+	      # If a -bindir argument was supplied, place the dll there.
+	      if test "x$bindir" != x ;
+	      then
+		func_relative_path "$install_libdir" "$bindir"
+		tdlname=$func_relative_path_result$dlname
+	      else
+		# Otherwise fall back on heuristic.
+		tdlname=../bin/$dlname
+	      fi
+	      ;;
+	  esac
+	  $ECHO > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+	  if test "$installed" = no && test "$need_relink" = yes; then
+	    $ECHO >> $output "\
+relink_command=\"$relink_command\""
+	  fi
+	done
+      }
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
+      ;;
+    esac
+    exit $EXIT_SUCCESS
+}
+
+{ test "$mode" = link || test "$mode" = relink; } &&
+    func_mode_link ${1+"$@"}
+
+
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+    $opt_debug
+    RM="$nonopt"
+    files=
+    rmforce=
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    for arg
+    do
+      case $arg in
+      -f) RM="$RM $arg"; rmforce=yes ;;
+      -*) RM="$RM $arg" ;;
+      *) files="$files $arg" ;;
+      esac
+    done
+
+    test -z "$RM" && \
+      func_fatal_help "you must specify an RM program"
+
+    rmdirs=
+
+    origobjdir="$objdir"
+    for file in $files; do
+      func_dirname "$file" "" "."
+      dir="$func_dirname_result"
+      if test "X$dir" = X.; then
+	objdir="$origobjdir"
+      else
+	objdir="$dir/$origobjdir"
+      fi
+      func_basename "$file"
+      name="$func_basename_result"
+      test "$mode" = uninstall && objdir="$dir"
+
+      # Remember objdir for removal later, being careful to avoid duplicates
+      if test "$mode" = clean; then
+	case " $rmdirs " in
+	  *" $objdir "*) ;;
+	  *) rmdirs="$rmdirs $objdir" ;;
+	esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if { test -L "$file"; } >/dev/null 2>&1 ||
+	 { test -h "$file"; } >/dev/null 2>&1 ||
+	 test -f "$file"; then
+	:
+      elif test -d "$file"; then
+	exit_status=1
+	continue
+      elif test "$rmforce" = yes; then
+	continue
+      fi
+
+      rmfiles="$file"
+
+      case $name in
+      *.la)
+	# Possibly a libtool archive, so verify it.
+	if func_lalib_p "$file"; then
+	  func_source $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    rmfiles="$rmfiles $objdir/$n"
+	  done
+	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+
+	  case "$mode" in
+	  clean)
+	    case "  $library_names " in
+	    # "  " in the beginning catches empty $dlname
+	    *" $dlname "*) ;;
+	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+	    esac
+	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    ;;
+	  uninstall)
+	    if test -n "$library_names"; then
+	      # Do each command in the postuninstall commands.
+	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	    fi
+
+	    if test -n "$old_library"; then
+	      # Do each command in the old_postuninstall commands.
+	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	    fi
+	    # FIXME: should reinstall the best remaining shared library.
+	    ;;
+	  esac
+	fi
+	;;
+
+      *.lo)
+	# Possibly a libtool object, so verify it.
+	if func_lalib_p "$file"; then
+
+	  # Read the .lo file
+	  func_source $dir/$name
+
+	  # Add PIC object to the list of files to remove.
+	  if test -n "$pic_object" &&
+	     test "$pic_object" != none; then
+	    rmfiles="$rmfiles $dir/$pic_object"
+	  fi
+
+	  # Add non-PIC object to the list of files to remove.
+	  if test -n "$non_pic_object" &&
+	     test "$non_pic_object" != none; then
+	    rmfiles="$rmfiles $dir/$non_pic_object"
+	  fi
+	fi
+	;;
+
+      *)
+	if test "$mode" = clean ; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    func_stripname '' '.exe' "$file"
+	    file=$func_stripname_result
+	    func_stripname '' '.exe' "$name"
+	    noexename=$func_stripname_result
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    rmfiles="$rmfiles $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if func_ltwrapper_p "$file"; then
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      relink_command=
+	      func_source $func_ltwrapper_scriptname_result
+	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+	    else
+	      relink_command=
+	      func_source $dir/$noexename
+	    fi
+
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+	    if test "$fast_install" = yes && test -n "$relink_command"; then
+	      rmfiles="$rmfiles $objdir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name" ; then
+	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	    fi
+	  fi
+	fi
+	;;
+      esac
+      func_show_eval "$RM $rmfiles" 'exit_status=1'
+    done
+    objdir="$origobjdir"
+
+    # Try to remove the ${objdir}s in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+	func_show_eval "rmdir $dir >/dev/null 2>&1"
+      fi
+    done
+
+    exit $exit_status
+}
+
+{ test "$mode" = uninstall || test "$mode" = clean; } &&
+    func_mode_uninstall ${1+"$@"}
+
+test -z "$mode" && {
+  help="$generic_help"
+  func_fatal_help "you must specify a MODE"
+}
+
+test -z "$exec_cmd" && \
+  func_fatal_help "invalid operation mode \`$mode'"
+
+if test -n "$exec_cmd"; then
+  eval exec "$exec_cmd"
+  exit $EXIT_FAILURE
+fi
+
+exit $exit_status
+
+
+# The TAGs below are defined such that we never get into a situation
+# in which we disable both kinds of libraries.  Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
+# vi:sw=2
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/ltoptions.m4 sdcc-3.2.0+dfsg/support/sdbinutils/ltoptions.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/ltoptions.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/ltoptions.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,369 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+#   Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option `$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+  		   [_LT_ENABLE_FAST_INSTALL])
+  ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the `shared' and
+# `disable-shared' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the `static' and
+# `disable-static' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the `fast-install'
+# and `disable-fast-install' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# LT_INIT options.
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [pic_mode="$withval"],
+    [pic_mode=default])
+
+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+## ----------------- ##
+## LTDL_INIT Options ##
+## ----------------- ##
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/ltsugar.m4 sdcc-3.2.0+dfsg/support/sdbinutils/ltsugar.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/ltsugar.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/ltsugar.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,123 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59 which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/ltversion.m4 sdcc-3.2.0+dfsg/support/sdbinutils/ltversion.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/ltversion.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/ltversion.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# Generated from ltversion.in.
+
+# serial 3134 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.2.7a])
+m4_define([LT_PACKAGE_REVISION], [1.3134])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.2.7a'
+macro_revision='1.3134'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/lt~obsolete.m4 sdcc-3.2.0+dfsg/support/sdbinutils/lt~obsolete.m4
--- sdcc-3.1.0+dfsg/support/sdbinutils/lt~obsolete.m4	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/lt~obsolete.m4	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,98 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 4 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/makefile.vms sdcc-3.2.0+dfsg/support/sdbinutils/makefile.vms
--- sdcc-3.1.0+dfsg/support/sdbinutils/makefile.vms	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/makefile.vms	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,71 @@
+#
+# makefile for bfd, binutils and gas
+#
+# Created by Klaus K"ampf (kkaempf@rmi.de)
+#
+# You must use Version 3.76 of GNU Make
+#
+#
+
+ifeq ($(ARCH),ALPHA)
+CC = gcc
+GASCC = $(CC)
+else
+CC = cc
+GASCC = gcc
+endif
+
+ifeq ($(CC),cc)
+  CHECK-COMPILER = check_compiler
+else
+  CHECK-COMPILER =
+endif
+
+all:	check_cc $(CHECK-COMPILER) [.binutils]makefile.vms
+	$(CD) [.bfd]
+	@gmake "CC=$(CC)"
+	$(CD) [-.opcodes]
+	@gmake "CC=$(CC)"
+	$(CD) [-.libiberty]
+	@gmake "CC=$(CC)"
+	$(CD) [-.binutils]
+	@gmake "CC=$(CC)"
+	$(CD) [-.gas]
+	@gmake "CC=$(GASCC)"
+	$(CD) [-]
+
+check_cc:
+ifeq ($CC,)
+	@$(ECHO) "Please edit MAKEFILE.VMS and select a C Compiler."
+	stop
+endif
+
+check_compiler:
+	@$(ECHO) "Perform a '$$ @setup' before starting make"
+
+[.binutils]makefile.vms:
+	$(CD) [.binutils]
+	$$ @configure
+	$(CD) [-]
+
+install: all
+	$(CD) [.binutils]
+	@gmake "CC=$(CC)" install
+	$(CD) [-]
+	$(CD) [.gas]
+	@gmake "CC=$(GASCC)" install
+	$(CD) [-]
+
+clean:
+	$(CD) [.bfd]
+	@gmake clean
+	$(CD) [-.opcodes]
+	@gmake clean
+	$(CD) [-.libiberty]
+	@gmake clean
+	$(CD) [-.binutils]
+	@gmake clean
+	$(CD) [-.gas]
+	@gmake clean
+	$(CD) [-]
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/md5.sum sdcc-3.2.0+dfsg/support/sdbinutils/md5.sum
--- sdcc-3.1.0+dfsg/support/sdbinutils/md5.sum	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/md5.sum	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,12857 @@
+59530bdf33659b29e73d4adb9f9f6552  COPYING
+9f604d8a4f8e74f4f5140845a21b6674  COPYING.LIB
+d32239bcb673463ab874e80d47fae504  COPYING3
+6a6a8e020838b23406c81b19c1d46df6  COPYING3.LIB
+2f8e9644db486186e7a4b0ad62c39eab  ChangeLog
+8604252784712dfd4447a5b0183c15d8  MAINTAINERS
+99d9a540fab7b2404f7b1e89bcac0d51  Makefile.def
+92a164cccf605af7736e9c5e85259030  Makefile.in
+02397e834204ac5b5186fb1c23bad302  Makefile.tpl
+07c33a285703b40cd6f93a478e97e03b  README
+72b7803505f14cf31e291a59f538c6c8  README-maintainer-mode
+408ef1462276b75d3708877103c85eb8  bfd/.gitignore
+6fa0d57c29b1872c3829bb251d8898f9  bfd/acinclude.m4
+3381b54a88e28dc216f5a2c7f4d30c32  bfd/aclocal.m4
+d8ddebc6a89593388d3c07405644a845  bfd/aix386-core.c
+b3575c73467ebc45473c2ea0875c1b4e  bfd/aix5ppc-core.c
+c9ec7d24e6be9796656156d1c44d295c  bfd/aout-adobe.c
+20b9909bfd2ddd02d26b99dc37b194fa  bfd/aout-arm.c
+d3a602dd8c8525c314571b8122935fc6  bfd/aout-cris.c
+839d08c624b51cc73a2e2e28741f0fb1  bfd/aout-ns32k.c
+31a4784a448794bed0bf31a191a8d669  bfd/aout-sparcle.c
+b6a4558a2c7d319f6d570a23ce81b1db  bfd/aout-target.h
+22e4eb1022de9eb752738eebd980b1c9  bfd/aout-tic30.c
+a840f061d05ebff08fc9b147c0bd2c3f  bfd/aout0.c
+c13beca7dc743efbb13bd2c0091a2d41  bfd/aout32.c
+e028cead3cc51cc3eb131e35b66c8813  bfd/aout64.c
+1aec204d64d5b321d35def886f46e078  bfd/aoutf1.h
+5a92a9bb5c133fb99f62d2504c8a6437  bfd/aoutx.h
+8087ea866defe89564193c80f6ad2fed  bfd/archive.c
+15c4097aac815e15f674c0609aab3f4e  bfd/archive64.c
+5f4c48c9ba3717caec074caeaf4aa702  bfd/archures.c
+5ed657bb294400d6c36a8c00ee83ad48  bfd/armnetbsd.c
+f651d74c3bff7ce51478ec90f1763bf8  bfd/bfd-in.h
+857e544780d8c41865431f810a442e69  bfd/bfd-in2.h
+eaaca5af5a36653c14b81fa04ef705ae  bfd/bfd.c
+5f01e2a009218852c42c63d1a20bcdb9  bfd/bfd.m4
+7fb120c19da2c4d96d86e53e105ae059  bfd/bfdio.c
+da4c12f9e0f77a2d235b154c536a439a  bfd/bfdwin.c
+91164da037fb2dd5a84678adde4ac3cb  bfd/binary.c
+cea32a666a0713e7835609a9bcc6d907  bfd/bout.c
+86c96e8a5c3afb021ed2bcb18a31675d  bfd/cache.c
+c97717d51efe6661f46119e4e1ea4db4  bfd/cf-i386lynx.c
+18f09a3a9b17fa7bff19b95588827a37  bfd/cf-sparclynx.c
+034104b33e708daea80a68cd7638e76f  bfd/ChangeLog
+daabeea83b81f2707d48d2c04dcc37c4  bfd/ChangeLog-0001
+0a3e33c0b179772334e34175da11b64f  bfd/ChangeLog-0203
+d20549a2f701cd99318d0af070416bf3  bfd/ChangeLog-2004
+aa4c260fc770839ccd0776dec1c2353d  bfd/ChangeLog-2005
+57633b8d529989fe966891285e127e78  bfd/ChangeLog-2006
+6ffeb475fe9699cb8c90e32a25d8e148  bfd/ChangeLog-2007
+6e40d764a9749e6638d7d7c9c1301c76  bfd/ChangeLog-2008
+e343d8f85c4b1f246b783db27f797934  bfd/ChangeLog-2009
+30e074bff91d690e7c55999f9df5edbb  bfd/ChangeLog-2010
+8dcb7ce2e45911e21ceb6e457e69eacf  bfd/ChangeLog-9193
+6d37ec6ee5f57a1188a0717f2fa5deb0  bfd/ChangeLog-9495
+b7ad288235bf6a3e015e01cb6096cbe7  bfd/ChangeLog-9697
+dbb0d89c90d6c0ec79eb003a5b63f923  bfd/ChangeLog-9899
+8501ee115266f28cdb1105eae2f7f520  bfd/cisco-core.c
+a273ad57cbee716afe73dd5b2ebaf817  bfd/coff-alpha.c
+b2c01d9e98c123ddf643f51d22752aff  bfd/coff-apollo.c
+4ed770f7721bc206fd80e8ccf1ba68d1  bfd/coff-arm.c
+aa42b42d63542892d67c2c0ede9dd6f2  bfd/coff-aux.c
+f5b2082a5a1a29c38e706e3d9c0a8af7  bfd/coff-go32.c
+7ddfa118cf2d72e10c168401199d0dd6  bfd/coff-h8300.c
+4a232faf6edb35141b68834d82bb444c  bfd/coff-h8500.c
+227af7ae6cd2d71d3c540cd9c8fa4c55  bfd/coff-i386.c
+5b8269256cd88c3dff19f7fe4d360133  bfd/coff-i860.c
+88c3e03e382595443e0dc771b7f2b8fc  bfd/coff-i960.c
+0a8f5c6759e6065b6819d9a4e6e08d21  bfd/coff-ia64.c
+4c9e31191b7a19aa9472ca3620c5d029  bfd/coff-m68k.c
+f2a7f3c126540e19b45d69c87d18d4e6  bfd/coff-m88k.c
+57fe1aeff47ff2dd8d1cf5c95e8ea7d1  bfd/coff-mcore.c
+e91ded3cde01135aea6fe90387fa6224  bfd/coff-mips.c
+530adaceacad1b71056d11d45b68fa62  bfd/coff-or32.c
+1ec92d761b8a010714f50e07c9ea50cd  bfd/coff-ppc.c
+ea14de11175928a0dd9c002dc5d963a5  bfd/coff-rs6000.c
+3ae7c591751dfaf16f40033b20b1e5b5  bfd/coff-sh.c
+cb5ae8ecdedba094ce170c3d3cb895c9  bfd/coff-sparc.c
+12729aa3dbc470a175f0a1a39b2e9952  bfd/coff-stgo32.c
+d875c398d7e93cf42aec58884a374a37  bfd/coff-svm68k.c
+7069bf46919a4a7c88a33483a2813a40  bfd/coff-tic30.c
+ee9a930e5bc9ca7ec06a7d698d6d3a22  bfd/coff-tic4x.c
+6ab56b6584158b01d2dc3e0460a493bf  bfd/coff-tic54x.c
+308b9b8b5dbf0373f664dab323a75a6f  bfd/coff-tic80.c
+6cd06305505a30c517e919d2e55a1ada  bfd/coff-u68k.c
+81a19edd9de0c77a9148f421d84a2aed  bfd/coff-w65.c
+4f9c0de80ce9266b55bb00bed21c9389  bfd/coff-we32k.c
+76d38bbfad6e0f7805310cb3688073c2  bfd/coff-x86_64.c
+8277a49e1403d5308d984580784a3275  bfd/coff-z80.c
+7d0efdbb284f00939c3d7f6de24235da  bfd/coff-z8k.c
+a193f92a3d6988382254678ca0ed6776  bfd/coff64-rs6000.c
+aae1d6bee1ba23f9b236785eff8ac180  bfd/coffcode.h
+cdf5994c020034d54989025b49d4fb73  bfd/coffgen.c
+046e29da876c15400afefd42e346e61c  bfd/cofflink.c
+8b735739122823a277e225a45fd2fa80  bfd/coffswap.h
+32c9c99c1e104818523f13d4011113e3  bfd/compress.c
+af778e87dc323876819f057b73dc45f7  bfd/config.bfd
+d7a8c5a505ff94107d2f8f53d787283d  bfd/config.in
+dfeaed6167bd65ad197f2d72f80d7747  bfd/configure
+62648cd0ae8a4495a8ccd686cf18e445  bfd/configure.com
+15a3950292cca2571a79f5abf7c01e95  bfd/configure.host
+7a6bb5c152f96f7ab9dbe77c2ee14cd8  bfd/configure.in
+d32239bcb673463ab874e80d47fae504  bfd/COPYING
+0ad57f9869ce6685635952c413d30c3b  bfd/corefile.c
+89ae5a994f899638bc8effdc8bfeac34  bfd/cpu-alpha.c
+3d9623ebd0055cc23a9f84929db2cf0f  bfd/cpu-arc.c
+2704edffe71c370ccbe87e05a4f7cb95  bfd/cpu-arm.c
+af052e4ae39ea5e5ab22aba781f37417  bfd/cpu-avr.c
+e5359870df01083e350eec26574fc25f  bfd/cpu-bfin.c
+6ae40f951ba2fe744d05c06bc8d64f80  bfd/cpu-cr16.c
+e17372c3409e4b59e5448e1e7d3b65b0  bfd/cpu-cr16c.c
+069151362a6520c1de16762c0e32d588  bfd/cpu-cris.c
+560c01c276ce3d26a8a1ec6136889299  bfd/cpu-crx.c
+5926f1162d10b02d270d85e11695e618  bfd/cpu-d10v.c
+f39f657b7b404cedd71c44b3254d4fa8  bfd/cpu-d30v.c
+95ff9999519ba7119f67bb87196b9678  bfd/cpu-dlx.c
+d864f35a009e75e369acd1925a7d1056  bfd/cpu-fr30.c
+8dcd1222ed2acbca6844dc6cfd246310  bfd/cpu-frv.c
+86fbd5e47ed20f51b600f454f2c78600  bfd/cpu-h8300.c
+092d206aa16c5f74936f5dacc4375a4d  bfd/cpu-h8500.c
+b1e25b270596278333ccbe5a8cb86ada  bfd/cpu-hppa.c
+3f79e3c79d70b495d1de3c4e132d60c8  bfd/cpu-i370.c
+4d40f51e511b7105d8586c2a77cc4609  bfd/cpu-i386.c
+826adfd8cdf1ebd3ba4c77f8b84c1654  bfd/cpu-i860.c
+2d8e643f66d80ec33b312b2ccd7476cd  bfd/cpu-i960.c
+5198b542f07fd7f52a9c9c827af5616b  bfd/cpu-ia64-opc.c
+5839e4309c4859d3a174765ed3522a85  bfd/cpu-ia64.c
+4524bde19eeefda082bbccf768e5df5d  bfd/cpu-ip2k.c
+a2acba4eacfcc83d555068c6f0747bfe  bfd/cpu-iq2000.c
+c6206efb34e3f17af565d0d90217d49e  bfd/cpu-k1om.c
+d9b66debce1820c2ebda6ae3d325034f  bfd/cpu-l1om.c
+b44557a52ae7803692123f34d71373d0  bfd/cpu-lm32.c
+8477d902c2e995b5c9c3a6cd7370d100  bfd/cpu-m10200.c
+ca560e934ed5d367ab80dfaa757b7d8d  bfd/cpu-m10300.c
+5d1039c31606332304242ec3758ec79a  bfd/cpu-m32c.c
+774bd19ed65dd7505c28891bd4407b7b  bfd/cpu-m32r.c
+6ab713aa0b98d8a7be5910d74bb75602  bfd/cpu-m68hc11.c
+0266f22c1e79ae970ac54fc740c74147  bfd/cpu-m68hc12.c
+e759187831ad93284a9e4fafa69abe16  bfd/cpu-m68k.c
+6ed4ee0ee7447a9ab467d28742627be5  bfd/cpu-m88k.c
+c30d43d274800c9418fb244acf5b9641  bfd/cpu-mcore.c
+45df80823f40d77dd8495b7d52f1ebab  bfd/cpu-mep.c
+d0466065fbf0bc773645f7dac657355d  bfd/cpu-microblaze.c
+212e2a324d2bfce0548646a3e30f54c9  bfd/cpu-mips.c
+33e393cb256971b30a150f50f9ceba7d  bfd/cpu-mmix.c
+0e566a384c3cb42d225def6d79d9105c  bfd/cpu-moxie.c
+f959ee5623b67d571f8c6ef764638591  bfd/cpu-msp430.c
+d87f62d816eab577e24ed00e8a1dc82b  bfd/cpu-mt.c
+07ba0d23ca8f838e8ba9b1e2f69cec8b  bfd/cpu-ns32k.c
+c204abe1385d8544a04782cd3e547a8e  bfd/cpu-openrisc.c
+6a9152a776286e937d03812caffd06b0  bfd/cpu-or32.c
+5bc8a2a42fd38ca10cd19c8ff17017ee  bfd/cpu-pdp11.c
+fca5332e71878803a9b05ba6d7ba6bcf  bfd/cpu-pj.c
+1fc49dc67fe8b86991f8e70759801a6e  bfd/cpu-plugin.c
+32730f9ced53f4ea96609868534c5024  bfd/cpu-powerpc.c
+639cb93eba287cb8262c9bab69aa1de7  bfd/cpu-rs6000.c
+ecb4883b6df0b09e6a32f0f40b4915f6  bfd/cpu-rx.c
+f5bbc07515c3e51d4c91b68abc89226b  bfd/cpu-s390.c
+749c338af5feda4b61c32ac7cef3c728  bfd/cpu-score.c
+15511c9f15aaea5a8fc8cb8e0616feeb  bfd/cpu-sh.c
+26bd80a3fd973f6d0e39f7d58bbea060  bfd/cpu-sparc.c
+21a1cb9748c501a39e5542af1f33b611  bfd/cpu-spu.c
+0d01e90a8372e857cf93e1915267d99a  bfd/cpu-tic30.c
+5192f963df80aaa7f8f36fcc8d7e1f89  bfd/cpu-tic4x.c
+d7ee6d0c52826b6aa0c140bf6927cdc8  bfd/cpu-tic54x.c
+d25b25f15f2f89a009660d3777f11223  bfd/cpu-tic6x.c
+74924c54241882e67602fa5cf483a8e6  bfd/cpu-tic80.c
+68faf06d37979aae8db77c6c2de50262  bfd/cpu-tilegx.c
+6468a45886e5ff9b0db680d6d6433cae  bfd/cpu-tilepro.c
+948c2e6044fe797fb4e11a1db823b5b9  bfd/cpu-v850.c
+669042112776344f813a6a91ce53a409  bfd/cpu-vax.c
+966c37d73c083aeee8959e51c49f28c9  bfd/cpu-w65.c
+d5271485a1353b275cc69acf7332b4ff  bfd/cpu-we32k.c
+11a6c47e1d51c8bf25715e420f9df31f  bfd/cpu-xc16x.c
+4124b3a9995f1e85b9a3bafe5059b4b9  bfd/cpu-xstormy16.c
+db4d0b1da7361125abfd80f312a43052  bfd/cpu-xtensa.c
+e17e159f98955683b8194c5d5df31e96  bfd/cpu-z80.c
+427e6473e9ad2e878ec987152e3cff2a  bfd/cpu-z8k.c
+1870cebc00e9a18f8aed220ba7c8cef9  bfd/demo64.c
+dad496c68df8395b3cdb8e3187c37eb1  bfd/dep-in.sed
+b1848292a4811cd7301fc6201debe63a  bfd/doc/aoutx.texi
+1ec269e34cd7de48135ce9d4aefb98b6  bfd/doc/archive.texi
+a97dd390d551809a3521ac155ad821a2  bfd/doc/archures.texi
+564650551cd91ba7305a5814bc4f8f4d  bfd/doc/bfd.info
+81652cb38f512353656fd8f29f2e9df6  bfd/doc/bfd.texinfo
+fbccdbd05f0690694c015fba7c392d45  bfd/doc/bfdint.texi
+7edf511939deb638e8291f264c4249e1  bfd/doc/bfdio.texi
+5ee7f8ae8b0ec33c7baf2e004084aaa1  bfd/doc/bfdsumm.texi
+ed2f6de3413bab723db72b9cfba36f85  bfd/doc/bfdt.texi
+8ec611d97620e190243c23b882d8a88e  bfd/doc/bfdver.texi
+236e856bb13ee47adc5d7d253037640d  bfd/doc/bfdwin.texi
+2afdf80182d7d816eb993fe194d378a3  bfd/doc/cache.texi
+1866a5dccdd2353d75ef69ef21077d14  bfd/doc/ChangeLog
+42b5ebab441fcbf65e95c2aa31262147  bfd/doc/ChangeLog-9103
+42b97469de7550820862b7c27dda849b  bfd/doc/chew.c
+232d094e3d6da6e3294d39c0149901d2  bfd/doc/coffcode.texi
+6dd9da257666139a061d6905349d9614  bfd/doc/core.texi
+e67d8b07516154c4ddbee2e3bab3d75e  bfd/doc/doc.str
+51139f6af786e74446d01ec49807fc28  bfd/doc/elf.texi
+d41d8cd98f00b204e9800998ecf8427e  bfd/doc/elfcode.texi
+072910d553f79906db69fa7c0e956bba  bfd/doc/fdl.texi
+930173859dab35d4c1c03efd5ddb18e3  bfd/doc/format.texi
+d2b923f7732c26442570c16fd1dfac5a  bfd/doc/hash.texi
+39f61ac0fb56eced56e6894e7bc47cef  bfd/doc/header.sed
+37ba364fb34b96a1dbb55b0f6f612432  bfd/doc/init.texi
+0fc22c68d543f8dc7cc4548a3fad3557  bfd/doc/libbfd.texi
+ebb7107f0b9aa8607e4fb3af643e6171  bfd/doc/linker.texi
+d2c072a60c85bbcf23800ed64bd45f83  bfd/doc/Makefile.am
+40319bd6a8a254e8a40c97442f5dfff3  bfd/doc/Makefile.in
+5fa24958e8a60b2f879af658e615ccc0  bfd/doc/makefile.vms
+58f9e78e71f2d034a79e172899e792f6  bfd/doc/mmo.texi
+0a434fb4ed336b3267a07a0eee83a714  bfd/doc/opncls.texi
+d7a37304ccd7b245f93df4be02797477  bfd/doc/proto.str
+095a05e08cb77bf7d9f718de19befe84  bfd/doc/reloc.texi
+7cda9a06854f5529e7a27ed951aace6b  bfd/doc/section.texi
+f335289247e38d4dce82697113a6bce5  bfd/doc/syms.texi
+bf5eee2282a29e48a8bea259d0cfc44f  bfd/doc/targets.texi
+35a51081f68984bab0850ecc54b062cc  bfd/dwarf1.c
+f55f39ae32c808e7a091f261e75b7850  bfd/dwarf2.c
+0ce39c90208b12ef2a4c178187c4db54  bfd/ecoff.c
+d2787db8fdda32e6f28c6635fed02cdf  bfd/ecofflink.c
+67df9e1bdfc0782dd9e6ad00f505f687  bfd/ecoffswap.h
+f51b03b3f2dc74522822ae4dc9ff1eac  bfd/elf-attrs.c
+aa93878aeb61a6769ea0459f8c7aaf40  bfd/elf-bfd.h
+eb6e0c9a65e4ef6e60ddb8d84c42fc85  bfd/elf-eh-frame.c
+ab61804e1d5adeef7a190158af639583  bfd/elf-hppa.h
+9cae244d87acec3e44ecb339cd364e13  bfd/elf-ifunc.c
+7b1fa717b0323857568400b252902312  bfd/elf-m10200.c
+8def5a64b51822df5e274b9353cd69b1  bfd/elf-m10300.c
+299214fa9cc7a7bac4c32e3ad1028389  bfd/elf-strtab.c
+42ee16947225b1bc6c90ba81f1869381  bfd/elf-vxworks.c
+558028f73662a4a2a2df3932d23a30b9  bfd/elf-vxworks.h
+c7da7c2abd35705ef7a36abb2f214564  bfd/elf.c
+87f5612eba792da8c039b1c0e59ee24a  bfd/elf32-am33lin.c
+9d03e5cc8b0719b6fdb483746ba834a0  bfd/elf32-arc.c
+0fda5d99f18fc1cd05b655488f70571a  bfd/elf32-arm.c
+8a04ed7a1f6cd6dc97f5448e168f8a90  bfd/elf32-avr.c
+f6846e8628e2f26f82fea28151906429  bfd/elf32-avr.h
+3361a5cdb5fde551b49e908f2204bf42  bfd/elf32-bfin.c
+80c3d3a4891d10d7ad684e8466c1935c  bfd/elf32-cr16.c
+2cb217d76cc527cd60817ecd017cfb10  bfd/elf32-cr16c.c
+f6f189a60ecc9ca0b375cc027830e308  bfd/elf32-cris.c
+4199171d3be10b6d06353d086c2f1a15  bfd/elf32-crx.c
+0778b06b2ee2d9f31f428d7302e95cd4  bfd/elf32-d10v.c
+e9aa232096cc8fe8d530c39db7358897  bfd/elf32-d30v.c
+9dc2c3083007d055584a29f2c4bc0e08  bfd/elf32-dlx.c
+d78a2835c4d0bceffddaa93868b67074  bfd/elf32-fr30.c
+d3feec9d76912557cf2662ff8e5a3cfa  bfd/elf32-frv.c
+2fbdc5d0b99c7ed22cbbc0b5082feb95  bfd/elf32-gen.c
+7b9f8da8c6251fe91c970cfcb78f6482  bfd/elf32-h8300.c
+c887ef4e762be76ab59328bb98de1ea1  bfd/elf32-hppa.c
+0f3b87f69654d5b2726d626a709cc9b3  bfd/elf32-hppa.h
+5a8acd43eb2d3729383c2114eab34050  bfd/elf32-i370.c
+fb381e522c3553f60fc2295b1b58f98e  bfd/elf32-i386.c
+ee57a120f5721538749d61aaf9191a97  bfd/elf32-i860.c
+af76e3dde2241645d746bcb82f2f86ed  bfd/elf32-i960.c
+7135d21aa3600609ccc0d7fa3535013e  bfd/elf32-ip2k.c
+c98d5aea99470a393a8ae31c4980f4d4  bfd/elf32-iq2000.c
+6dc69d4caebdcade1797a640339a7154  bfd/elf32-lm32.c
+07646154bfb59e81a76168ad0a88aabf  bfd/elf32-m32c.c
+e23f17f2cfb0d420b4288611aa0cd8d4  bfd/elf32-m32r.c
+6428c04385c66ae14d4bca296623bac5  bfd/elf32-m68hc11.c
+51df867fbf4d0ae3b47d176786169d58  bfd/elf32-m68hc12.c
+77443960526ec549d2209447c26a1627  bfd/elf32-m68hc1x.c
+494e09c13f3a731ad18d5190e4443db1  bfd/elf32-m68hc1x.h
+55c77bb3024e9a5b3fa6f10791b0e479  bfd/elf32-m68k.c
+24c6dfe183b600fba2f348e08fe8b3c5  bfd/elf32-m88k.c
+21fb6613e678ec26d3b4570c8f2c0cec  bfd/elf32-mcore.c
+51d8efff5c1ef19d9f00d5a3254f0d38  bfd/elf32-mep.c
+88182211b25497f444b6a7afc35acf90  bfd/elf32-microblaze.c
+0c5b2d824b73533f8de8e1998a3eae9c  bfd/elf32-mips.c
+b4fc78e1f9a3a0e45fbd692fdeb30584  bfd/elf32-moxie.c
+624f58a4f62a23ad6acf2ed1ec669282  bfd/elf32-msp430.c
+68f00b7ffa1d86f18e630f7c48693457  bfd/elf32-mt.c
+018af022914aed2c14aea3f6e1b7a8a5  bfd/elf32-openrisc.c
+468e5e58c80e985dfbfa201ce07fe4ba  bfd/elf32-or32.c
+140b65ea1bdd039c81067900b5124da8  bfd/elf32-pj.c
+a517cc13988b19242e8636aa64b3ea47  bfd/elf32-ppc.c
+365a056a6b67a82bc90fd684ae12a82c  bfd/elf32-ppc.h
+632e98e35f700b640df3c454565c729e  bfd/elf32-rx.c
+d35146f1c1fe1ed70cd724eae86983b6  bfd/elf32-s390.c
+8d87a8b0caa7f8f4f48b4f959bd52e49  bfd/elf32-score.c
+0ae85011185c7162178de9dc0acabc90  bfd/elf32-score.h
+b99fa646f5da8708b636b46b8b162faf  bfd/elf32-score7.c
+1452b80dbcae3a156632f017e6a9e1b8  bfd/elf32-sh-relocs.h
+70d7820e62a8d4c8da02a1ce5f0fe3db  bfd/elf32-sh-symbian.c
+0640f3ccfd32f9f69a916c2045c4ed25  bfd/elf32-sh.c
+c3e727bdfb7a73954c1f7ea914d5de0e  bfd/elf32-sh64-com.c
+a1e9a3c25fd579771da3e57df20efbdc  bfd/elf32-sh64.c
+1fa268e389df0b3304de7d965589da01  bfd/elf32-sh64.h
+23b143cc38a09a53a9410a8cea1f96b6  bfd/elf32-sparc.c
+28fa20f7933cb94983ec0f2643e9716b  bfd/elf32-spu.c
+e48841dba20a31a21c00d16af64ee8f8  bfd/elf32-spu.h
+52c5196f2718ad68df91e44bbf7179a2  bfd/elf32-tic6x.c
+e24c26414c8cffc67b83fcb4bcfb2a55  bfd/elf32-tic6x.h
+8d590e9b423120035e03e29ea8ff74c6  bfd/elf32-tilegx.c
+5a56e51411354a0c6dc6fd74f5896da3  bfd/elf32-tilegx.h
+7eda65fbfc21b0c25172b27a2680ed8f  bfd/elf32-tilepro.c
+b1166d035ecbc003403a55552fbda550  bfd/elf32-tilepro.h
+db7c5d5a4b5687078101c68578e80875  bfd/elf32-v850.c
+73b985af7662709f58504440b0a1ddf6  bfd/elf32-vax.c
+1e2e75212cde3fa3a9263dd49dd3a972  bfd/elf32-xc16x.c
+f759e10eba5ac63622f6a60717b69b7f  bfd/elf32-xstormy16.c
+513e93182d83eb04fcf31352b96c31f5  bfd/elf32-xtensa.c
+19711956ec075d032f0d0b894b11a1ce  bfd/elf32.c
+f1ccd1d1b78289cbd32f34aa9e2c9b14  bfd/elf64-alpha.c
+cb5514787c5264ee0bc353a2c981561f  bfd/elf64-gen.c
+30bddabed647a2c091e7d6b1dd59c433  bfd/elf64-hppa.c
+9cff3ac6c428477bd9e305540d95e47a  bfd/elf64-hppa.h
+da0371ca4804af1529f3a72f6d0ac7ec  bfd/elf64-mips.c
+513dd5792664b734fc2b09c3f3ac6fa9  bfd/elf64-mmix.c
+1d3bbb21c0303d3c94c0f18c724eb22a  bfd/elf64-ppc.c
+5596457fac5cbdd67b8c273d8bb890c9  bfd/elf64-ppc.h
+63d9b5308b9c75737792c23f4530e1ff  bfd/elf64-s390.c
+46f04581d21f6927dad1d007109c8694  bfd/elf64-sh64.c
+c4873a109e3134d9a9f2a3784ee34d86  bfd/elf64-sparc.c
+4c71d0b2f5f315b45c6b3319ebb770cf  bfd/elf64-tilegx.c
+fcf3f7fff3f72094447832681d4e23e3  bfd/elf64-tilegx.h
+e1750f4ed4b6ea17e932fee12781160c  bfd/elf64-x86-64.c
+72144adaba3f8c119f115d7af46b2502  bfd/elf64.c
+ac1c1025d0ef7ec8d77e95ce79477c86  bfd/elfcode.h
+16571e24f21c320a2fac42e3b98494de  bfd/elfcore.h
+3e21cbb3432875f08edc1ecebdaefe55  bfd/elflink.c
+564d764e21ddfe77383d3cb95056ff04  bfd/elfn32-mips.c
+6bde5bc7002aa7e1264f3034b55f1cde  bfd/elfnn-ia64.c
+96944bd725981974ba76e887c9dba7a5  bfd/elfxx-ia64.c
+4155caaab977fb465c3e89f068183ee3  bfd/elfxx-ia64.h
+ad915022ae9a3b9ccd4146a03fef412d  bfd/elfxx-mips.c
+b67886d2b2b2684ff187bcbaf9410b0d  bfd/elfxx-mips.h
+e4c75c19d68bcffcf86cd2e91b831c72  bfd/elfxx-sparc.c
+3608d55b3d3531e3572ac1f1acb0df35  bfd/elfxx-sparc.h
+6e620ce23dff38fdedef80039402508b  bfd/elfxx-target.h
+ea5f26b0f97042c651b14a2c2b309ef9  bfd/elfxx-tilegx.c
+2ac78eb0e9567bd2222495c6f4db43c8  bfd/elfxx-tilegx.h
+efebf716233c08ae64f74104709dc5fb  bfd/epoc-pe-arm.c
+e5062a411407a4e8f94cfe0e931990f8  bfd/epoc-pei-arm.c
+422ecc607bdbf1398914705cc25a7b9e  bfd/format.c
+fc8bec4190b9d8fb626bb9395d8c1af0  bfd/freebsd.h
+c3348a714f44a96cc2032f62ee507728  bfd/gen-aout.c
+b0682558ad69d3671cc55f83abebf32d  bfd/genlink.h
+663a6979bd331c91d1385445edeca7b0  bfd/go32stub.h
+6c011e2cc19ef4e5e27d334684ae1fda  bfd/hash.c
+5078b3985212bed5ac3c79b3b9497571  bfd/host-aout.c
+065b0a6c7a8a5427098e677cef40f6ab  bfd/hosts/alphalinux.h
+0c52204c0eb0530561da8699dcfa3452  bfd/hosts/alphavms.h
+b456ff19a38c6a50a7b6fcf23fd9e1f0  bfd/hosts/decstation.h
+2922cfb45e02c6edf595bb1d620ef78c  bfd/hosts/delta68.h
+05c0edd67951513bd03cc042835684b6  bfd/hosts/dpx2.h
+c1e482f851c42ca2f436d33d928fa4a0  bfd/hosts/hp300bsd.h
+76a5586b3812d98ca98bf4c45cce3a55  bfd/hosts/i386bsd.h
+81aeb95fc7b74ab9b9f8c5fc80d0decd  bfd/hosts/i386linux.h
+edaa62376a9b603f40be272ad9a1f8db  bfd/hosts/i386mach3.h
+512b359313f0c3bf22ddde09f931f9ad  bfd/hosts/i386sco.h
+402e13c6d261e86aaf96c67e3b3cc875  bfd/hosts/i860mach3.h
+670afabed36b3d49e3c7e5fee2cdbb99  bfd/hosts/m68kaux.h
+678db628d91ca1b6e6ab88cc57ea0bda  bfd/hosts/m68klinux.h
+bf8a891bfa8c0536883b8922eeab45cb  bfd/hosts/m88kmach3.h
+c02b894dd2e75ac9c268ece62fc47eda  bfd/hosts/mipsbsd.h
+dbaab9a86bc5130ad99189c8ddceea5f  bfd/hosts/mipsmach3.h
+23b460b9b9ee4bbbc5b43b099d39866e  bfd/hosts/news-mips.h
+68f97cde664f22f1ebe7ffce83564ec9  bfd/hosts/news.h
+495f5ce083fe90efb267ffbbe968e20b  bfd/hosts/pc532mach.h
+55b9dd83897834c020f30e2fa4b150cf  bfd/hosts/riscos.h
+9c4e42b51ed4ef3624d6632d97c5680a  bfd/hosts/symmetry.h
+d210f558099621a92ad1d868d9a94618  bfd/hosts/tahoe.h
+e77a36f7eeeee139ec033b09e37ec02f  bfd/hosts/vaxbsd.h
+10456e8f19a2aec712bdfff904c7c7b3  bfd/hosts/vaxlinux.h
+95385f49273928ccd97630efcf35c91f  bfd/hosts/vaxult.h
+95385f49273928ccd97630efcf35c91f  bfd/hosts/vaxult2.h
+59a50941a3ba41d5eeaddfa608ed9155  bfd/hosts/x86-64linux.h
+eb81ed101d0ee1fbe13af6f4e02f7253  bfd/hp300bsd.c
+9a21e2388efe0083ae8b8a00106d205c  bfd/hp300hpux.c
+da4091ca346b311435b728ac95b2f8bc  bfd/hppabsd-core.c
+890ee98a8f03c08fb1f4afa968ae7029  bfd/hpux-core.c
+f7b33e7dcd153dc5e4a4905f65772e08  bfd/i386aout.c
+eb3bd341db7f74b0dca2de96ac2407be  bfd/i386bsd.c
+4f2221b958ece4a1135c89d376459724  bfd/i386dynix.c
+5ea4b70fac02927d272892127e65a114  bfd/i386freebsd.c
+466e000ec97f9ea53439fe3c4a8d648b  bfd/i386linux.c
+55e553007461b9d12c9723738ce6f6a6  bfd/i386lynx.c
+184fcf53ece8dbc8c3e5452ea60fdadc  bfd/i386mach3.c
+c1e79054ff4fb9e6eb269d78759bc544  bfd/i386msdos.c
+5b4ae611feaf9f968c4d95cc67c705bd  bfd/i386netbsd.c
+e56f8de796808ae21194c7f6825d1c6e  bfd/i386os9k.c
+5172fbc7af7cf6e98fa68a89ea5a5a83  bfd/ieee.c
+534dee991a296275abbe2ebd2c4a136c  bfd/ihex.c
+25509065b1ee664694b3e5c37bb433e0  bfd/init.c
+d0ba25f30c1dd2ec685b8dd421d6dac3  bfd/irix-core.c
+291df23cff915aea08424e59437c5b24  bfd/libaout.h
+b2d73d01dc25de76e92c267cf6d34e12  bfd/libbfd-in.h
+27ec1cbe10f1e22f6404da3ce3387f5b  bfd/libbfd.c
+de70bc4e94a5e5a6d75c754a5646ece3  bfd/libbfd.h
+0686ec1e0676bf2876068370968f6ca8  bfd/libcoff-in.h
+d5b97208e105b42e3ca7b913df495523  bfd/libcoff.h
+08ce055f353f29b7dbbd3367cb14d8c3  bfd/libecoff.h
+40fa57a36443af209d40be24fc2507bd  bfd/libhppa.h
+38a0dcec5fb59384c9ff6d11642746e1  bfd/libieee.h
+10927f5450b2e259198eabc163385d8d  bfd/libnlm.h
+f9d7123c139b25de478c6221908315f5  bfd/liboasys.h
+e6d8fbd8d34251787718d47c0f2b8daa  bfd/libpei.h
+bb3cad08f59e273f335a5cbe04404471  bfd/libxcoff.h
+9697e87eaf1aabede0616a88f5e35366  bfd/linker.c
+61146204dd5df9b7bf0a942be89f1676  bfd/lynx-core.c
+47df372ec9d2c9f570e2377a6cd6b2d9  bfd/m68k4knetbsd.c
+bc24228eedac8cd67ef03e2e89c77110  bfd/m68klinux.c
+c2b3e6b9a0227a6fc3d9589f9413aa30  bfd/m68knetbsd.c
+fc231dd7c10b50f7f56316db72781116  bfd/m88kmach3.c
+884aa3acb0cf92f946c86305530c0cde  bfd/m88kopenbsd.c
+10fb1267e73e26f05b0d1edfd65941c7  bfd/mach-o-i386.c
+f32bbf93e8cbbf3d1ce49315a731d643  bfd/mach-o-target.c
+15fb1ab9b1ab6344b9f51d9abda19c46  bfd/mach-o-x86-64.c
+ce1434b55a5438f7bb44b91ad342c05b  bfd/mach-o.c
+9fd5d5727de6a64085985f5e34af1703  bfd/mach-o.h
+d618facc3e8ce8bf3d02ba452e1be6ab  bfd/MAINTAINERS
+43ff191e66ad1e3c9f4388821e873ee4  bfd/Makefile.am
+93a8c8455113e3b10e7466e6a8be3fbf  bfd/Makefile.in
+0a2a01a5564c7bdd57d3c467e570733c  bfd/makefile.vms
+76a44dbc419f39a2d9cdf76d308b370f  bfd/mep-relocs.pl
+7783752d1f86d8464bbfc536d9129d5d  bfd/merge.c
+41c58646711a99f6e4b7b1b49fa91c5c  bfd/mipsbsd.c
+92d188e365097e030b77d3bceb4d4480  bfd/mmo.c
+e728260ba314147c9534085b7c691eb3  bfd/netbsd-core.c
+8d66f1b8531156a8b251161840b2cd5f  bfd/netbsd.h
+5ef760be50db7ca763c85e8a57576b63  bfd/newsos3.c
+2260d5d5b17087621f4d22d664caca17  bfd/nlm-target.h
+ada7e1273c745ce6a3446311be52471d  bfd/nlm.c
+e3a11b8c38f8beb8cb380d2556b1fe88  bfd/nlm32-alpha.c
+6fab17bbbab49e405c5403c74c8666d4  bfd/nlm32-i386.c
+15616141c4d4ce3cffcba9fd5a64af16  bfd/nlm32-ppc.c
+e65fcc0e9242ddf2063b573b70bdddbd  bfd/nlm32-sparc.c
+6f6955a0a5e3d39a2c31c1d5d7d0ba48  bfd/nlm32.c
+a3d3a8f71632020d3d15fbdc0cfbeccf  bfd/nlm64.c
+03ea9182aa386b08ea2c6d5cb852395c  bfd/nlmcode.h
+94288f2695f9ec23df20e5a82861525e  bfd/nlmswap.h
+7d24843968787ccead71cb5da5c21adf  bfd/ns32k.h
+fdbfd6f37c3c732d7b622b8fd5fdee3a  bfd/ns32knetbsd.c
+248874cdb74bb34c98ecea6a77b078b5  bfd/oasys.c
+99e0c11af729fd8dc4c17a2688a7dddc  bfd/opncls.c
+c01a4933892d6b2e269ee599189401b1  bfd/osf-core.c
+b2884774d5204a41e2560319db40bfae  bfd/pc532-mach.c
+8230605678f13811c21ee094ed61ecdd  bfd/pdp11.c
+c730ca7a2061acbed6f26534381508c5  bfd/pe-arm-wince.c
+dc0b454eb5ac0d16f390770f3fb53c4e  bfd/pe-arm.c
+4dafd0eaf2359f8dd74a9ff32ba069c9  bfd/pe-i386.c
+1a13a241161d4f8b7a40597b7bef00b3  bfd/pe-mcore.c
+5036d14edcbb371eed50e4078541b752  bfd/pe-mips.c
+855f5bdc07113a3d76ea41b5a110dd90  bfd/pe-ppc.c
+de5c8e74526c4e815aecf91d0a045549  bfd/pe-sh.c
+c272f56c8b5aa83b6d878809491505d4  bfd/pe-x86_64.c
+12d97ba29117269a1a8cf0ca362de34f  bfd/pef-traceback.h
+5bd6943fcf927aeb8b0f4aa1abda4ea3  bfd/pef.c
+5d711a64601f429fa483785559b743ea  bfd/pef.h
+3b93dbc924bcd6ca464d26c42a679909  bfd/pei-arm-wince.c
+cf952c320bd31f09566ef5512192907b  bfd/pei-arm.c
+42ca288076eb97c9b810f7bd0c769e4e  bfd/pei-i386.c
+a26d0f4cc121b804db0d1296d32436b2  bfd/pei-ia64.c
+99c1d8bb1c1ecacf42ea046353eded35  bfd/pei-mcore.c
+2ab171f6edf98be45f0593435c1b11e4  bfd/pei-mips.c
+315b1fbec795d69ae698d384f1f217bd  bfd/pei-ppc.c
+338d87b0cd2a666095744141782a2337  bfd/pei-sh.c
+6943839a518c640cc96c2afd21dbfbcf  bfd/pei-x86_64.c
+1816aa7338fd2423e01d0b9db2c911dd  bfd/peicode.h
+7a9d44d145a7129525cc428a140d7467  bfd/peXXigen.c
+11680aa1a0255ffb9a1793de6e6c68ad  bfd/plugin.c
+2261c135ccf79ec02dc19864386d2cca  bfd/plugin.h
+90a6c065395a721003b3a801bc4885e6  bfd/po/bfd.pot
+d900f09c506ad5057a3fddd39e3fab7c  bfd/po/BLD-POTFILES.in
+af59cbed52c0a16ed933a2add351b7fd  bfd/po/da.gmo
+f42836fa54a22c3b715c61e6df8973ef  bfd/po/da.po
+428f783cf48b71cb3854cf24914975de  bfd/po/es.gmo
+7d00fa656ac7ba60effa913141f7e3ad  bfd/po/es.po
+e2ea0b79036b74441b0d1669f634d9f9  bfd/po/fi.gmo
+20326bc5faafc2b416d9fe250f801e52  bfd/po/fi.po
+90ed30ac694404cbbf6ac7df992ec725  bfd/po/fr.gmo
+1ec22b922a3dbd420200cac12ce739ab  bfd/po/fr.po
+adde21abfb12b19302e8f830a86a3b71  bfd/po/id.gmo
+c4d865669e1bb9105341359e764bde17  bfd/po/id.po
+94d7a982350d9e5fee01037195be34a5  bfd/po/ja.gmo
+56dbdfd0ca270129f18a46aca978da3d  bfd/po/ja.po
+912c079b0305e916b36d6bbb97438681  bfd/po/Make-in
+844c1ea598f9bcc47870ecf122b15e7d  bfd/po/ro.gmo
+8fc4e95db5a00f800bc30c65a30f8a8a  bfd/po/ro.po
+7acdb654e9f9fd3cd04aaafd0952bb85  bfd/po/ru.gmo
+8a3d9cf14484c113a278af53928bd1ca  bfd/po/ru.po
+e15c998ffa3537ef5f5c5ed225c18279  bfd/po/rw.gmo
+4314f7dc707bdd16e1a3aa6318d52f8a  bfd/po/rw.po
+d6a6933ceb56b969e27e4c977bf6f029  bfd/po/SRC-POTFILES.in
+b04862da8728ddf3c4c8a45b18ee35f7  bfd/po/sv.gmo
+dfe82e26118652583a47b8f4771e7e1c  bfd/po/sv.po
+495dc4f4a2e82ea81d7226370e07294f  bfd/po/tr.gmo
+95bcedd50b1016d3de8c9f543c6b2bb9  bfd/po/tr.po
+03155ac55999ea99fd93db756c85d4fc  bfd/po/vi.gmo
+1bbe9236287bcc2e6d317562dda6aefb  bfd/po/vi.po
+e0ac4c0bbc954826529362c28e86810f  bfd/po/zh_CN.gmo
+1ab81455a3fa63e837709d2924e5f1cf  bfd/po/zh_CN.po
+6455e3c85b31e588ecb75f7d3c945c8d  bfd/PORTING
+724476a2771f3210c19912f442659c5d  bfd/ppcboot.c
+aeadade463fbe3401ef73b3533100208  bfd/ptrace-core.c
+2d6a5be3f5d1b33251fe9a8570e943d8  bfd/README
+1f28839baed96de43492332856fae22d  bfd/reloc.c
+a4d110644df46c682e52deab17df66b8  bfd/reloc16.c
+35a62e7106f6ca762b4afa22ea02edc5  bfd/riscix.c
+390127806fd49f3cbb7ad14ea2456202  bfd/rs6000-core.c
+9441258386e8e125722354c26f1f3494  bfd/sco5-core.c
+b10b07f30f3f775a36ac15c4c0360308  bfd/section.c
+898b0251b29e0d0333b717c5fba85f47  bfd/simple.c
+a1a5148e875195c11059c023e9d903ed  bfd/som.c
+73be612633c59c18a5b744bdb2362978  bfd/som.h
+fcc0333513e11eced6f7caf5c41bdfa7  bfd/sparclinux.c
+a2a46b3d42519728843beb7307727724  bfd/sparclynx.c
+7dba15a9568e388261655fac84be612a  bfd/sparcnetbsd.c
+39a24f4fb73be4ba6b49f262da35691c  bfd/srec.c
+650aac6b1948fc417523f6ab33b335a9  bfd/stab-syms.c
+168eb4e7f79237249cc976f8a3d4f13d  bfd/stabs.c
+1ded054093de910d9786c62bc4fe8cc6  bfd/stamp-h.in
+33b8a6dbb56569cb0b36a073e2630bce  bfd/sunos.c
+92ea3880be875c1b8378bcad7489b928  bfd/syms.c
+7492d6e9f7bdddef8e51b8897b2b20ab  bfd/sysdep.h
+31c81ef39b597a4e47385f2def101168  bfd/targets.c
+53357a9b87dd158b90cf790c316fd438  bfd/targmatch.sed
+ee39822c67ebc0722fe775d2d0d92dec  bfd/tekhex.c
+1d5d2a98584b8f27cd2cba1b7a8aa9fa  bfd/ticoff.h
+cd26654c6eb30680694867e434e40044  bfd/TODO
+f6744dd2c8ed7505ede5614cb352daf8  bfd/trad-core.c
+16d2eaf8a4b6d5a2c90b931c5a1fd41f  bfd/vax1knetbsd.c
+3fe7114f6b98c45afeea1c2030f69b1b  bfd/vaxbsd.c
+35614e9f4a26c44ff67a78f1c2ff108c  bfd/vaxnetbsd.c
+88ef6962a203c349a38631b164f38708  bfd/verilog.c
+c4df6dd675bd3a61a3c3ce1a5da4f280  bfd/versados.c
+7fa91f8c657505b6e0ff0da5d5d5c447  bfd/version.h
+7c23dec4d8799ae0e23659494830fba7  bfd/vms-alpha.c
+1c94de3e3c74fb1e7d31784dcecad4fb  bfd/vms-lib.c
+b87c03c4dbdb7c2469bb565c0695487d  bfd/vms-misc.c
+546ec97623af181c29dec0b2f0a638db  bfd/vms.h
+120cb38c718d121d488f8106cbcdd8d9  bfd/warning.m4
+e3378d2a545225d0a7eceef2efdca7b7  bfd/xcofflink.c
+38d3ff539ce63c1e7096de81bc25dbfa  bfd/xsym.c
+11213bf58c2136189edd119d00671f00  bfd/xsym.h
+f85e635b7ec810c1df6fe8ec9bdad616  bfd/xtensa-isa.c
+fc5a13a797dc463213593a836d4e2edf  bfd/xtensa-modules.c
+bf8744cdc68cbd134717087cf08e0f50  binutils/.gitignore
+faf4c3a35a9cfcfa3bac81cef5e170eb  binutils/aclocal.m4
+15c1cb17f1dd5d7666b49a9c4f273c21  binutils/addr2line.c
+e8ba72588ab0a1d6e8eb190ea778f302  binutils/ar.c
+241e1c3b561bf883d84aa60897595082  binutils/arlex.c
+724d311dc10338d10d27e309fd57b488  binutils/arlex.l
+dad180bcf3810239f066e4fac8c94e34  binutils/arparse.c
+a4cbf0bec6ebfd331903376020268fa3  binutils/arparse.h
+5ef790d0f760b92f754c38165f1ce8fb  binutils/arparse.y
+5cb21f36a0ceb86ba42dcb4920ec8255  binutils/arsup.c
+e77e06e678e92fcc6fe2dc9be940b0cc  binutils/arsup.h
+d276afbfaf6698f8ece1db0ea1f52acb  binutils/bin2c.c
+12df5117000b96a3253221451ed92f55  binutils/binemul.c
+445689c0dcf6a2987caf8dea1b6d9d0c  binutils/binemul.h
+7ade5fa13cebda2c3f4aee8527031287  binutils/BRANCHES
+fae780574c7a02c6a99cf4d3ba70dfbf  binutils/bucomm.c
+74290145b581c48373615df3f0dddd0d  binutils/bucomm.h
+48357d45bd874fc265a6a2c1f3e634bc  binutils/budbg.h
+ef9b7bc647a79db90dab70870b7cffe3  binutils/ChangeLog
+75f03b546abf41db936b3eae9ee79760  binutils/ChangeLog-0001
+ac9c338a84bd8da1d3be610a39a75c38  binutils/ChangeLog-0203
+e3940b38e6baee310a1565e098d2d9ba  binutils/ChangeLog-2004
+1370cb8435695cc4e035b3b9b3256455  binutils/ChangeLog-2005
+109c2ed912ff71f331e7fc64c3fc7e03  binutils/ChangeLog-2006
+443939e0658790fe3c350e6c9d7faafb  binutils/ChangeLog-2007
+8c1aedcc5374a797f183dfb167888ead  binutils/ChangeLog-2008
+55e392564810ccb96f6fda031a105658  binutils/ChangeLog-2009
+865b445de9023b5aa261eda9ab1a137b  binutils/ChangeLog-2010
+3803ba47ff17cbd2c60e0d28334998f8  binutils/ChangeLog-9197
+aba8ead8b90f015b862015d49357b149  binutils/ChangeLog-9899
+b625039f38b32b2d85754ca1b63e9451  binutils/coffdump.c
+227223c6755798edd29c963b11e05d0a  binutils/coffgrok.c
+82bc4db836b3ef52719e637b8873e19b  binutils/coffgrok.h
+fa48d78589932d92531b4de0499d4ce4  binutils/config.in
+0f589d7c257fe7206dae7e7829dce4bf  binutils/configure
+b49a609f6fc5e84955f76f8cb8e62b7e  binutils/configure.com
+e48ff54766c3dffabc9b9b6727f42eae  binutils/configure.in
+f418f9fb640961a24ca2b0ed1b3c2b1c  binutils/configure.tgt
+2f542e3cf9200b7f969e0889623ecf67  binutils/cxxfilt.c
+7f4bd7f49cd521aeff62f483672aa4e2  binutils/debug.c
+862268d63f628bbefd6e1f913e7bf2eb  binutils/debug.h
+0b925eb0eee0e32249b085b3deeab16d  binutils/deflex.c
+4de019a5400a7a46b3c9b8731eea6c8e  binutils/deflex.l
+defc75c765d8658911bbac2e855b7c12  binutils/defparse.c
+ed7d783b950fb29fc4398040c2e43c7a  binutils/defparse.h
+28bfb42bbc63edac3cdce4dfbdc1c183  binutils/defparse.y
+cec602aa7e8925e06a658a3060d42c1b  binutils/dep-in.sed
+914cf3215f82a8cfdea3cf8e24b956bd  binutils/dlltool.c
+d0b84569cd286ab3ab420824d51ef19e  binutils/dlltool.h
+f1109e7fca775039b20e4257af171af1  binutils/dllwrap.c
+aa845f7397bbba0b488d6f2d1e50dc4b  binutils/doc/addr2line.1
+ddf94af086e113cd6500f89126030506  binutils/doc/ar.1
+b2114fcaf98f40028d96a800ea784ae9  binutils/doc/binutils.info
+8ebd5cdcdb1aa5b95ec596bf6b9a1ad8  binutils/doc/binutils.texi
+5205d0ffe051674a485114a2932229b1  binutils/doc/cxxfilt.man
+dcd4d3dc67f260131b7a3b9f4b8a7f6f  binutils/doc/dlltool.1
+78aa8089457308a805057987488ae236  binutils/doc/elfedit.1
+072910d553f79906db69fa7c0e956bba  binutils/doc/fdl.texi
+457443da30398b19ec2156801ec079f2  binutils/doc/Makefile.am
+05118f2e20d47c32c5bd88fd433151d4  binutils/doc/Makefile.in
+44362ff624b6eb8f1f0e337582347904  binutils/doc/nlmconv.1
+bca4f3c54648cfdf15c20d984231f56d  binutils/doc/nm.1
+120c80c30ea1821255ae26412022a751  binutils/doc/objcopy.1
+e6a1b53c8c05120ae0be15808de282c9  binutils/doc/objdump.1
+cd7ec09a0e06048366c3d8cca8f85140  binutils/doc/ranlib.1
+09fe459c423472a2aacdae0710062282  binutils/doc/readelf.1
+5d80da60351c35fa95eeeb4ea3ddd947  binutils/doc/size.1
+b12b71c3df97ffb868182be5b87ec193  binutils/doc/strings.1
+36e1a9c5281c94a00821ce6ea9d997a2  binutils/doc/strip.1
+f3c3440631afe89929b4ce601bccb1f9  binutils/doc/windmc.1
+8c54ae560f528443712f9fcee2bab692  binutils/doc/windres.1
+ce256969905215109ce473eb1b99e26e  binutils/dwarf-mode.el
+5806a38a763c04a07b2bb7919bbf48b6  binutils/dwarf.c
+f442f6b2434bbdcaa750152487ebd959  binutils/dwarf.h
+923094961e0763c075c483da68323b46  binutils/elfcomm.c
+35353481d838811e1cfb43cb2c18331d  binutils/elfcomm.h
+a15674e3b98350f3ae7a9631f66a7d41  binutils/elfedit.c
+8e9d93e95bf05c65cd38b8eb58f547b3  binutils/embedspu.sh
+f4c475327193058e8c173d61eb910ecf  binutils/emul_aix.c
+ec9819c7cd765fd7fdc4b452fbacff63  binutils/emul_vanilla.c
+406c15089c0ef118534921eaf8b2548b  binutils/filemode.c
+7748d0db0a27f4f55f842af1ffd36205  binutils/ieee.c
+e30cdf08d8264e27b35b920b411fc763  binutils/is-ranlib.c
+d2ea7edc9e4d3ca9d85e80972546170c  binutils/is-strip.c
+6594927ec72049c1cbad5546c1dfebba  binutils/MAINTAINERS
+8a9589dd0dc29f7e3f668a78d02218cd  binutils/Makefile.am
+aff8145a28655099b6112e37cd99cda4  binutils/Makefile.in
+1fc2c9f83e824b21e1b4fbf48804361e  binutils/makefile.vms
+84ad11164e15c74fa941f49a2ad0278e  binutils/maybe-ranlib.c
+3e286ed9d2f98e9463da6760db792abb  binutils/maybe-strip.c
+0ea66d70682ec876032a878491019649  binutils/mclex.c
+2898aeb57f849cf68d690b6c825ce7db  binutils/mcparse.c
+2100013c9980b3b1df35509ee0572493  binutils/mcparse.h
+d332f7b72c690e7c24b1b00c92b48b42  binutils/mcparse.y
+839610dceda9891495f29d9e4cfca4b1  binutils/NEWS
+dd9a2a89a4ddf3b33088d49373c2623f  binutils/nlmconv.c
+19c1330925184f21af691f14d7b8cf4e  binutils/nlmconv.h
+6ea3fef39583ce44f08b843d60946b55  binutils/nlmheader.c
+636cedd9104d690e26d20fbd2ec2b9a7  binutils/nlmheader.h
+fb2f05720b46fc09b021f05c8e250bc6  binutils/nlmheader.y
+aa65002eda108d4495d4eec36bf84c55  binutils/nm.c
+41d8556bd279371fb24dd10f370d684b  binutils/not-ranlib.c
+f80bdc8c61ea529f54c93e682505ad79  binutils/not-strip.c
+c1b82941b89f65ad1232a3fce72c5f38  binutils/objcopy.c
+50e9d446a53fa4a93419d69590d986b6  binutils/objdump.c
+f98b9af24f695e5a158294756ba1cca6  binutils/objdump.h
+a8874836f0138c5557dcb5d706bc863a  binutils/od-xcoff.c
+024d27e0e050ecbb5028623014af16aa  binutils/po/bg.gmo
+0e25fd81191af44f98f4df531e559a77  binutils/po/bg.po
+2d34b17ca7dee26e552080df73198757  binutils/po/binutils.pot
+464b47c4d20bc96d8db3946e7c473a20  binutils/po/da.gmo
+cff5d7523393ad62b7247c324aeee56b  binutils/po/da.po
+9638463ad9f240dc22a4b620e565109b  binutils/po/es.gmo
+d97675c3c23f18b1c12510b09ddcb41c  binutils/po/es.po
+36148a48493f59cc4a227ae1e3a9d20a  binutils/po/fi.gmo
+fe7b5752abcdd6ccba618203d7397c1b  binutils/po/fi.po
+66a7c50a91ce3a30ce6124b85d6a45ef  binutils/po/fr.gmo
+8d3a0e6f6857ed860a756c5ba7f44641  binutils/po/fr.po
+6495de85ae4a9bc16de19a933544ee01  binutils/po/id.gmo
+d0fd2da98fa1316894630f06818e15f4  binutils/po/id.po
+aa394ecec1b8465cfe5f170279231efb  binutils/po/ja.gmo
+fe122f75d2b57cf7e7edfc1ac6673b0d  binutils/po/ja.po
+8935ae2870f3d67420c16c4b92796ceb  binutils/po/Make-in
+41946e0202f2493b6cb294800c88402a  binutils/po/POTFILES.in
+7d9d0cc039b5e637e9203e0c1fe8a282  binutils/po/ro.gmo
+048a28aff20f21840e59478819f311cf  binutils/po/ro.po
+f0258240e9b64cf9611e1cd020985e0a  binutils/po/ru.gmo
+0221ef7e48463012a63562d754500ff9  binutils/po/ru.po
+574d299b75e61be9de2b50beda9a138a  binutils/po/rw.gmo
+983ad2a28db3de55195aeb8680aff682  binutils/po/rw.po
+1f61241fcdfa161fa76d4d8728e0ad37  binutils/po/sk.gmo
+47d34295c07b7e482891a5a03cc3c8d0  binutils/po/sk.po
+117dd5c4de6ebc8e658d21aacda82073  binutils/po/sv.gmo
+d643cb6ce7c53550d77a7aae2000eed6  binutils/po/sv.po
+895352681d4358a82bacec4e25a00e70  binutils/po/tr.gmo
+9d11cf1296c72bb6a1189555440ffdef  binutils/po/tr.po
+4bd2869e9a1ff1ccb2a810f590dfc9cf  binutils/po/uk.gmo
+1c8599fb39ca7b86d7c798e31c167500  binutils/po/uk.po
+810261257e415b8d194dfb95a28b5cf3  binutils/po/vi.gmo
+a2065424532df74ed16bcd37c3c8c47b  binutils/po/vi.po
+e4e8cba721856bcf7d5ccf5016a7fdd4  binutils/po/zh_CN.gmo
+42b95da2812ee22e0a980fd9c96d7a1b  binutils/po/zh_CN.po
+d66dc645567221704d9a96af2951ec0f  binutils/po/zh_TW.gmo
+fc31799334330cf7596de77081fcc3dd  binutils/po/zh_TW.po
+5ec1ff01c723ab4ec15f31f697ae2825  binutils/prdbg.c
+253d92247a3802211f202f4fc8d764c9  binutils/ranlib.sh
+5760344d3da073a201b876a2f016ce99  binutils/rclex.c
+65d300feff90dab55877958558676497  binutils/rcparse.c
+5e6a9d25a52382a7c27d837fecec6526  binutils/rcparse.h
+81e87fc12351c3dbca3b8e6bd23c2bf7  binutils/rcparse.y
+6c832b4a8e51d600e29fee3a6e42d510  binutils/rdcoff.c
+697199e5c7baa5f2f1fba82ba6ce05de  binutils/rddbg.c
+8cbb05e84e1fca9e580d66e4205d6ec6  binutils/readelf.c
+513698e6b21989373e4e3af16bf9af83  binutils/README
+16e8266bccbca8900d8916b69971bb6d  binutils/rename.c
+1f7c060a46b5db465b0694b271af7736  binutils/resbin.c
+8e1e7a197ebc7415c66d12d1d80810c1  binutils/rescoff.c
+e7c9d8262c1267f29d0968dc2279ff87  binutils/resrc.c
+5b6a095db450c2034b50652048f91c87  binutils/resres.c
+6c63c0bffa2f22c651ea174b38d604f4  binutils/sanity.sh
+31cb252b9399425c57e9c67473d97856  binutils/size.c
+2dd7641476b40f8f5552fd10fdb258bd  binutils/srconv.c
+5efe36ec18c27590379bb830b0e44c07  binutils/stabs.c
+1ded054093de910d9786c62bc4fe8cc6  binutils/stamp-h.in
+77077460566c339fcbafa5f836e96ff2  binutils/strings.c
+3c5ed03b7572b48a870ae3b0d0f2b12f  binutils/sysdep.h
+4b7e4aee9c1a49ac597bf34a2ddc8087  binutils/sysdump.c
+ed86a52ee28b3e3c0866694570cf24e5  binutils/sysinfo.c
+c3e16b5b96457e7b67e2ff09c8434b4f  binutils/sysinfo.h
+ac5be3005f420e5dbdc1f5079875bd74  binutils/sysinfo.y
+d43e83232485fd75314425affef20a84  binutils/syslex.c
+4204d6eaa85359f8c46f0ce6757f9c17  binutils/syslex.l
+b3669a390c553395b6151cf5173663dd  binutils/sysroff.info
+c47e58a5ce3d88d074da7988605dd271  binutils/testsuite/binutils-all/add-empty-section.d
+c118cd8ac033fa6204640291e2d71922  binutils/testsuite/binutils-all/add-section.d
+24eb345e58fdf80d67e58d68e5bf387a  binutils/testsuite/binutils-all/alias-2.def
+aa7cb333b47f17c932b8e0a902de43ba  binutils/testsuite/binutils-all/alias.def
+128008662cfc653c01537ca8ee55b28e  binutils/testsuite/binutils-all/ar.exp
+f9e394b6e365932e277c92e01c38b76f  binutils/testsuite/binutils-all/arm/objdump.exp
+e4d6bc1d9f91e3dd9fc1bdc748097b83  binutils/testsuite/binutils-all/arm/simple.s
+ce88dbe8fe34d243dc53bd29ad39ad51  binutils/testsuite/binutils-all/arm/thumb2-cond.s
+89e2a629cf9f9bc36672ec97018fe79f  binutils/testsuite/binutils-all/bfin/objdump.exp
+0deee19f6dd6cb7ada1e41b03202e52c  binutils/testsuite/binutils-all/bfin/unknown-mode.s
+34d0ab842ffa4318e8cbe2bba4c565dd  binutils/testsuite/binutils-all/bintest.s
+ad057c5aff09eeebe89f53de09a8d6df  binutils/testsuite/binutils-all/compress.exp
+46f213c0bf7293623c7c95c1ae72c5cc  binutils/testsuite/binutils-all/copy-1.d
+7818c4638e7c83453b51ea5f50b17d62  binutils/testsuite/binutils-all/copy-1.s
+ab57c3ecd68aee03109e529a8e566753  binutils/testsuite/binutils-all/copy-2.d
+9d773d797841500d51b9bf635b3001fe  binutils/testsuite/binutils-all/copy-3.d
+c91b865a87aa795cfb14d707ceee8bb2  binutils/testsuite/binutils-all/copy-4.d
+8a6214b0181ec4a73a402e359daf9034  binutils/testsuite/binutils-all/copytest.s
+02d9d7f279a0984cc41028945f230280  binutils/testsuite/binutils-all/dlltool.exp
+f35a6c09a5cad7ba0fb6d10559676f4c  binutils/testsuite/binutils-all/dumptest.s
+54bcfeb604870285ff25317f9b5482ff  binutils/testsuite/binutils-all/dw2-1.S
+aad696ad9190dbf893ba252118bf626c  binutils/testsuite/binutils-all/dw2-2.S
+290565f99df84c536a06b51c589b5e62  binutils/testsuite/binutils-all/dw2-compressed.S
+c0cf290037aa0f09cb8bf5f4a0308a27  binutils/testsuite/binutils-all/elfedit-1.d
+52af9f53ef810af0017ae91cb1036242  binutils/testsuite/binutils-all/elfedit-2.d
+39f724358668c7476c30e7be614e72ec  binutils/testsuite/binutils-all/elfedit-3.d
+0ce2463e6b1a2625a5fe0c2410fc7b15  binutils/testsuite/binutils-all/elfedit-4.d
+5b1c979b02a008417d2f9e325196b3e2  binutils/testsuite/binutils-all/elfedit.exp
+d41d8cd98f00b204e9800998ecf8427e  binutils/testsuite/binutils-all/empty-file
+bb4a5bfbe0b4ad2e68e63a1765e34a2a  binutils/testsuite/binutils-all/empty.s
+4a5e353c23801ad5d7f1705efc5f42ed  binutils/testsuite/binutils-all/exclude-1.s
+753b3babcd4dddd3c9189fbe0d11d9a9  binutils/testsuite/binutils-all/exclude-1a.d
+258cffb7b9a54b43feb734b692952814  binutils/testsuite/binutils-all/exclude-1b.d
+1f3298e434f53fee397ccdccf71a744f  binutils/testsuite/binutils-all/fastcall.def
+338de0188b3bb5dce910ae34b36ba815  binutils/testsuite/binutils-all/group-2.s
+0a69dc172a9856a7472d8bda038cd021  binutils/testsuite/binutils-all/group-3.s
+b51c995baa976b1e05f7129907249be8  binutils/testsuite/binutils-all/group-4.s
+f1f5e3551c55b9e668394a2bb6c5d369  binutils/testsuite/binutils-all/group-5.d
+0fa93145faaca19a6611f2aa99a43fde  binutils/testsuite/binutils-all/group-5.s
+1d96cb4b074018ab36084fd8fd15ba60  binutils/testsuite/binutils-all/group-6.d
+e36dde2922c493422341c9d5ee07b6ef  binutils/testsuite/binutils-all/group-6.s
+0f7d8b612442e7c8092eda3c7e00daea  binutils/testsuite/binutils-all/group.s
+8e5c9079f46f332db8bbe679b64c878b  binutils/testsuite/binutils-all/hppa/addendbug.s
+d91ecc8b2ba6965842cf206d8144c3e1  binutils/testsuite/binutils-all/hppa/freg.s
+00d3925a24762a0bb33529653d200573  binutils/testsuite/binutils-all/hppa/objdump.exp
+2f6e5da6e4d97181a14d1883d6ec8498  binutils/testsuite/binutils-all/i386/compressed-1.s
+2722595c2ce6393e3f1db29e1158d3da  binutils/testsuite/binutils-all/i386/compressed-1a.d
+0ff8b5036fd017eeed4f4acda7e383a0  binutils/testsuite/binutils-all/i386/compressed-1b.d
+cbd80207d9daa3db659084562e44d315  binutils/testsuite/binutils-all/i386/compressed-1c.d
+a185ea42f87cb0065db5680fe2d445a4  binutils/testsuite/binutils-all/i386/i386.exp
+b51e5445a91784acba357197cc254d5b  binutils/testsuite/binutils-all/libdw2-compressed.out
+a65ca36dd01e93f5ed7e0892d47ef1b4  binutils/testsuite/binutils-all/libdw2.out
+4a62975b0bc7a2cacc7267c73027a6b5  binutils/testsuite/binutils-all/link-order.s
+ab7bdd5c94807ca793bdd422bb7fa8cd  binutils/testsuite/binutils-all/localize-hidden-1.d
+870fb293e265cbdfc0b20e308cf00e1a  binutils/testsuite/binutils-all/localize-hidden-1.s
+3068cdd8622c3158a8d64899452655d7  binutils/testsuite/binutils-all/localize-hidden-2.d
+6074603691f0b0814906a0679bd883ed  binutils/testsuite/binutils-all/localize-hidden-2.s
+6960b342624a796e7a6d83c844087f69  binutils/testsuite/binutils-all/m68k/fnop.s
+170803871c34be39b32958baccaba4b4  binutils/testsuite/binutils-all/m68k/movem.s
+450b6634be2652817af885d09a0c604e  binutils/testsuite/binutils-all/m68k/objdump.exp
+17e871b2195207446783ca653463607c  binutils/testsuite/binutils-all/needed-by-reloc.s
+0b036a1cb1ce19b648badc11f998ddf9  binutils/testsuite/binutils-all/nm.exp
+871cfc4074a74627f70db8b5d65ce372  binutils/testsuite/binutils-all/note-1.d
+047578440668904d8026b1add421113a  binutils/testsuite/binutils-all/objcopy.exp
+2732bcf2c2cdf972a2d87ac79bc1d8fe  binutils/testsuite/binutils-all/objdump.exp
+fd4b0cd07b3cf6a6c47fe8becb569314  binutils/testsuite/binutils-all/objdump.s
+8c956691f6dbfc34fe1a6def794d6adc  binutils/testsuite/binutils-all/objdump.W
+dd7f18f869cb5e18bd47871da2b3b3b2  binutils/testsuite/binutils-all/readelf.exp
+5e74045f7ec0119e86dc43c1fb75531b  binutils/testsuite/binutils-all/readelf.h
+21cb9025a426c8a27de071549d4ef28d  binutils/testsuite/binutils-all/readelf.r
+db24a07247dc8cd58f7d1987a549d485  binutils/testsuite/binutils-all/readelf.r-64
+e1697a4ccd84aea00d3b0f2cbce46bc8  binutils/testsuite/binutils-all/readelf.s
+fb9c19e8a7ecec9f832d28e09d960cd8  binutils/testsuite/binutils-all/readelf.s-64
+d7499e152cf7fd6784399d6286b6f182  binutils/testsuite/binutils-all/readelf.ss
+f837b7f5b7d54a009b6fa58736db5a36  binutils/testsuite/binutils-all/readelf.ss-64
+c0ed249ea41764285d5acfe37df52497  binutils/testsuite/binutils-all/readelf.ss-mips
+1c57d7063c628e546f52d021ae710cee  binutils/testsuite/binutils-all/readelf.ss-tmips
+209039e1a259e87c10a258b37ab50634  binutils/testsuite/binutils-all/readelf.wa
+6e35412e030ef5b40cf67252c19f8715  binutils/testsuite/binutils-all/size.exp
+24f2423955980928aff6f7d49222501b  binutils/testsuite/binutils-all/strip-1.d
+ca7cb6a593cfba58d42c1845a61e0664  binutils/testsuite/binutils-all/strip-10.d
+32197d82e15c9a7194a618fd4cf233f5  binutils/testsuite/binutils-all/strip-2.d
+6ad1b94d328d1c0ff411466ed89ef4f6  binutils/testsuite/binutils-all/strip-3.d
+841a6ca30c94c31c68f61b3ad2036a14  binutils/testsuite/binutils-all/strip-4.d
+3ebf3bf3e2f439e58f1301d695e2783c  binutils/testsuite/binutils-all/strip-5.d
+60c1643408fe80e6b352270eeb5cb520  binutils/testsuite/binutils-all/strip-6.d
+6d22a52a8da8cc1b325db54f34193106  binutils/testsuite/binutils-all/strip-7.d
+0775b758e20e9bb93f74b8aad9a17f18  binutils/testsuite/binutils-all/strip-8.d
+6ca1b0b0c7a48b40c06fe9aea045d97c  binutils/testsuite/binutils-all/strip-9.d
+ceb92b0ac37d5d22d79f180de017e262  binutils/testsuite/binutils-all/testprog.c
+a22fc47e8c73936b6e9735589e065150  binutils/testsuite/binutils-all/testranges-ia64.d
+f78ff1d70f85baa83d18c33c99cab311  binutils/testsuite/binutils-all/testranges-ia64.s
+ae1382214b1ff8199f9b639ecd6fce40  binutils/testsuite/binutils-all/testranges.d
+bcb9ea582b6f21eb03cbe138b7a89f4c  binutils/testsuite/binutils-all/testranges.s
+f61e08dca2771d5b82bafbb000bf6542  binutils/testsuite/binutils-all/unique.s
+96a0eba027bdbce19f3d3e1481212e25  binutils/testsuite/binutils-all/unknown.s
+d9e2cf9793263ff37e8d6c960b280e3b  binutils/testsuite/binutils-all/vax/entrymask.s
+435d0d9407c0453a559b69d029be8540  binutils/testsuite/binutils-all/vax/objdump.exp
+7491a51f44f5a1850c80fbd6b4f2793f  binutils/testsuite/binutils-all/windres/bmp1.bmp
+d5611fb4c5b61e2fe34951ff33fb8418  binutils/testsuite/binutils-all/windres/bmpalign.rc
+e2852a0b6c605f12dedca9103d1c3330  binutils/testsuite/binutils-all/windres/bmpalign.rsd
+c9c4373f416e2d2321e55e88e7de75d8  binutils/testsuite/binutils-all/windres/capstyle.rc
+2cbe0a310f92d1c5c565041be2f5afab  binutils/testsuite/binutils-all/windres/capstyle.rsd
+797b931bd8778c2130cda9fc846bccca  binutils/testsuite/binutils-all/windres/checkbox.rc
+b57be16dc0288e8c81246d1e002b580f  binutils/testsuite/binutils-all/windres/checkbox.rsd
+16dd4d1dd29fc42f543163e45bbe9da3  binutils/testsuite/binutils-all/windres/combobox.rc
+db15330881f47c75db87a417b603999d  binutils/testsuite/binutils-all/windres/combobox.rsd
+ac38823599885e755f2487efa5e214f3  binutils/testsuite/binutils-all/windres/deflang.rc
+ec150037bb58aed9e172b35e56641493  binutils/testsuite/binutils-all/windres/deflang.rsd
+5e29fa118e3e03e87d839cd18fa13f66  binutils/testsuite/binutils-all/windres/dialog0.rc
+ec150037bb58aed9e172b35e56641493  binutils/testsuite/binutils-all/windres/dialog0.rsd
+ac7fafe088ed3f14887a21e8f6c3022e  binutils/testsuite/binutils-all/windres/dialog1.rc
+ec150037bb58aed9e172b35e56641493  binutils/testsuite/binutils-all/windres/dialog1.rsd
+62158f4725046ca58344402cbba883b2  binutils/testsuite/binutils-all/windres/dialogid.rc
+30bb522613334d2795e81237a5a01776  binutils/testsuite/binutils-all/windres/dialogid.rsd
+c3efb314b67227f2ae24c087c3b22716  binutils/testsuite/binutils-all/windres/dialogsignature.rc
+99d0d7339a83b8e7bc1442ad005028e3  binutils/testsuite/binutils-all/windres/dialogsignature.rsd
+bdfda752dd00993588658c343d5db784  binutils/testsuite/binutils-all/windres/dlgfont.rc
+44ded16fd8aa5d243d77021e0c63ee5c  binutils/testsuite/binutils-all/windres/dlgfont.rsd
+cf3cf5daf8d67b4232d6609469405d0a  binutils/testsuite/binutils-all/windres/edittext.rc
+25b9856dd7d85107e7aef77431530639  binutils/testsuite/binutils-all/windres/edittext.rsd
+bd13c4e0cc1c8cf49e20f0f62a5d2ce0  binutils/testsuite/binutils-all/windres/escapea.rc
+75762cb5686cfca0a273cd77d6034a3f  binutils/testsuite/binutils-all/windres/escapea.rsd
+5bb46a57c7767b1f24fe00c394f5288a  binutils/testsuite/binutils-all/windres/escapex-2.rc
+6bec6d3471e372d9a3f93a14a63639e7  binutils/testsuite/binutils-all/windres/escapex-2.rsd
+d89135fb6f7b032a74a47b697e3cea11  binutils/testsuite/binutils-all/windres/escapex.rc
+1abf5fdcd19714aa098f988aba7ff124  binutils/testsuite/binutils-all/windres/escapex.rsd
+c0d302994d587d584483b7126427a11b  binutils/testsuite/binutils-all/windres/html.rc
+a9a27961f5d70ba85af63066155008c9  binutils/testsuite/binutils-all/windres/html.rsd
+8926670e07442451d680f84a644a40a8  binutils/testsuite/binutils-all/windres/html1.hm
+d8e96ae320ba7f82b4526ebcb77669b4  binutils/testsuite/binutils-all/windres/html2.hm
+c6415e3e22d2e645050ff0e0b86f7c12  binutils/testsuite/binutils-all/windres/lang.rc
+9b5e9e1fed319016623963a63e173904  binutils/testsuite/binutils-all/windres/lang.rsd
+65492fa41b4505b7109fe11885084560  binutils/testsuite/binutils-all/windres/listbox.rc
+ffc53241335562ef778e175ba35ddb4e  binutils/testsuite/binutils-all/windres/listbox.rsd
+7ffb700c5df7b8440174158dd7daab95  binutils/testsuite/binutils-all/windres/messagetable.rc
+0554a16331bef10ba6dd0b3784b20ba9  binutils/testsuite/binutils-all/windres/messagetable.rsd
+385792077de0ae3063a7ae1e5d0bb0c8  binutils/testsuite/binutils-all/windres/MSG00001.bin
+9f44ebe6636dbc19b95832ee1163301b  binutils/testsuite/binutils-all/windres/msupdate
+ac38823599885e755f2487efa5e214f3  binutils/testsuite/binutils-all/windres/nocaption.rc
+ec150037bb58aed9e172b35e56641493  binutils/testsuite/binutils-all/windres/nocaption.rsd
+c895fab04cbfecb4fdb0479474afa20b  binutils/testsuite/binutils-all/windres/printstyle.rc
+c9677c01c151e304240fc99f06ef71c2  binutils/testsuite/binutils-all/windres/printstyle.rsd
+b538b353dad0e50d7daec45b6014a7dc  binutils/testsuite/binutils-all/windres/quoteclass.rc
+94a00b0c688c1e2617be2234cb8fa3c0  binutils/testsuite/binutils-all/windres/README
+c39f7a75add2211c8b8b16eaebb95c64  binutils/testsuite/binutils-all/windres/scrollbar.rc
+fce7c71178868b81c2cf1b52493ad277  binutils/testsuite/binutils-all/windres/scrollbar.rsd
+1f7bc9a6f7a05e70001fc557f9cdf976  binutils/testsuite/binutils-all/windres/strtab1.rc
+453c4b4299fb6238d70482f45bd5acae  binutils/testsuite/binutils-all/windres/strtab1.rsd
+97b8c3c6dc29f4c499d2d75577e7ab5d  binutils/testsuite/binutils-all/windres/strtab2.rc
+453c4b4299fb6238d70482f45bd5acae  binutils/testsuite/binutils-all/windres/strtab2.rsd
+c770ff0d872ab99b2c10a936ae3186ff  binutils/testsuite/binutils-all/windres/strtab3.rc
+453c4b4299fb6238d70482f45bd5acae  binutils/testsuite/binutils-all/windres/strtab3.rsd
+a9d96ba138857d78e87ecb5facd8e77c  binutils/testsuite/binutils-all/windres/sublang.rc
+ec150037bb58aed9e172b35e56641493  binutils/testsuite/binutils-all/windres/sublang.rsd
+86ec9f86471d9533bbeb127f3024b643  binutils/testsuite/binutils-all/windres/version.rc
+aa55d0e295b56cb92284198366cb41f4  binutils/testsuite/binutils-all/windres/version.rsd
+25eac986945d394de659acceeae822de  binutils/testsuite/binutils-all/windres/version_cat.rc
+aa55d0e295b56cb92284198366cb41f4  binutils/testsuite/binutils-all/windres/version_cat.rsd
+b9f69a393bed3ce5d9d432f69092a0d3  binutils/testsuite/binutils-all/windres/windres.exp
+6dccc67a6dc85c4ec2c963aca6eceaf4  binutils/testsuite/binutils-all/x86-64/compressed-1.s
+7751d87bde7d74de21b64371ce6816ca  binutils/testsuite/binutils-all/x86-64/compressed-1a.d
+980981b01ab942f4a01283d9d850eba5  binutils/testsuite/binutils-all/x86-64/compressed-1b.d
+e67867a048dbd6ce8aad92503d2b24c8  binutils/testsuite/binutils-all/x86-64/compressed-1c.d
+a2273c64ceaff0e57e46ac75c8fd43f2  binutils/testsuite/binutils-all/x86-64/x86-64.exp
+d1c5665197135db5081abcee29995104  binutils/testsuite/ChangeLog
+5f4416ae47c627699d2fedb9f71be354  binutils/testsuite/ChangeLog-9303
+7d7b53cad398cb2db54997ab03e4f1b7  binutils/testsuite/config/default.exp
+b0bf849c1b988ae9d743f55d6a748197  binutils/testsuite/config/hppa.sed
+214db435855f570f9be4ff3be4196d4a  binutils/testsuite/lib/binutils-common.exp
+63c246e6b7b77b6f3262cd4ac06d5ae9  binutils/testsuite/lib/utils-lib.exp
+af8efe2b1bb2c8456b2fb46d5470484c  binutils/unwind-ia64.c
+6ae90973bb7dbfbe11c6acc29eee0070  binutils/unwind-ia64.h
+6a38ca7e4bdf036b38254910bd521549  binutils/version.c
+7d646742cf214013c7c027c2d58b7ba6  binutils/windint.h
+669843b388bfd74c6840293c52ab8cb1  binutils/windmc.c
+4a301e97590dbfcc2f7e9c2850ba1bff  binutils/windmc.h
+d05f30b8dd7e13c407e2be56257a451d  binutils/windres.c
+906f283c22c019d009b11770338477aa  binutils/windres.h
+e32ea7016e96f326364990709363105b  binutils/winduni.c
+50cc01707c3b40563abe5f438a50021b  binutils/winduni.h
+4be2e642df6bef8d5f051c41f0552ffa  binutils/wrstabs.c
+0d3c238b02b9d0c1c32347dea7fc490d  compile
+0fcd4badfe2a2191778bdf5ab94aa40c  config/acinclude.m4
+731a4c2ef07c06a2a175804e75fadc03  config/acx.m4
+3be755875df9da02eb4b0a9badd414f1  config/bootstrap-debug-big.mk
+1999cda4a81e667104bc146b3968eb4d  config/bootstrap-debug-ckovw.mk
+57284952a449963da5b91c52608abc15  config/bootstrap-debug-lean.mk
+babb6167c05386834412652e8b27239e  config/bootstrap-debug-lib.mk
+9a194b56c06b616528d1e76306aa78e6  config/bootstrap-debug.mk
+3a8fde4ddca4059836ca7c3e22e8ffe3  config/bootstrap-lto.mk
+5c6a030699353abe2ff69294a495e4cd  config/bootstrap-O1.mk
+4d3304310a9b7b17872d6f644e1dd7c8  config/bootstrap-O3.mk
+f466ea6022e6627a2e3d94bb0cc7eeb9  config/bootstrap-time.mk
+5fe078f982a106a97bb7da163f32de55  config/ChangeLog
+4d893e26c58ac075bdc51f3b7fd88cb9  config/cloog.m4
+04bdbef77f5fd2e282f7dee0bde60444  config/codeset.m4
+b5a5c394536a15e50be1998bd341fd02  config/depstand.m4
+c0d1018319b14378fd98c86ba62b3be3  config/dfp.m4
+22671f4914769139799e1f72e36be555  config/elf.m4
+042203b305962ba9a8f8474ef80edeee  config/enable.m4
+15b8d5adf53ad5ec75f055b193a6b1c2  config/extensions.m4
+8e54553a2c063659a749e0ef9e5348e4  config/futex.m4
+d3eafe382a46e6747e3644cf4a55d5cc  config/gc++filt.m4
+1282ef4331970c26224afd363968e276  config/gettext-sister.m4
+2056dbab474e474ab2ae01a42ad5359a  config/gettext.m4
+29c9c3d57667bc9e6f14d625b2cd5894  config/glibc21.m4
+c385066b0fe61ef55d44cf2619e79b26  config/gxx-include-dir.m4
+998940a8ee25ca89805ed7da63536782  config/iconv.m4
+7cdde9f19fc614304e49342c660e2d47  config/intdiv0.m4
+e32906a3177f3b368bcd56f9e86a620c  config/inttypes-pri.m4
+b17ad59a69316040fae6c3b09187bcbc  config/inttypes.m4
+0b63117973333c343e0d0819012b8187  config/inttypes_h.m4
+71bf002195846e85b3a96057f72ad530  config/largefile.m4
+db111161c56fa9d53a03abfb188ad1d0  config/lcmessage.m4
+cbcbd9977ef1239ccac0c5c54d214302  config/ld-symbolic.m4
+1cbbc8830601bf43a3c42ee10a01eecd  config/lead-dot.m4
+77931c860806547ce9fc56097a731c6f  config/lib-ld.m4
+50120e7fff340d87578219756e55a5e3  config/lib-link.m4
+4455537cdae70977a1283180062a2d8d  config/lib-prefix.m4
+534dce34ae221e73e2d67d3ba07f00a3  config/lthostflags.m4
+3fe4a576c2a75736c8da3af1d0824217  config/mh-cygwin
+a2628132e60b0492f8c93ce6ad8c9fea  config/mh-darwin
+625bacc09b9992290d94831bd7506bd0  config/mh-djgpp
+9240a2b84d379e3feff49d8311072dc7  config/mh-interix
+683433c6c1f829d4f0aa007dfa29c880  config/mh-mingw
+cd7034dccd04e50150b14c597dd545a5  config/mh-pa
+48d5107b991a0cdbe7eb7022b0dfecb2  config/mh-pa-hpux10
+59846d5e40c35f67530d476403b5838b  config/mh-ppc-aix
+3755b5b077053b5de54ff0f781ca9295  config/mt-alphaieee
+96289d06809692c31d71e69c4bedb6d7  config/mt-d30v
+945f54294ca11fd14c1aaaecde3ce7da  config/mt-gnu
+1d7419534d43fda437ce0a4f0719ee5f  config/mt-mips-elfoabi
+8d6647b6e881a11ae46d9bcaeaa0bd0f  config/mt-mips-gnu
+e5f16579c830ccc42e238b49e8409e99  config/mt-mips16-compat
+5aa8f75c6588d513ce199e2e44c206e2  config/mt-ospace
+23e56715f4bf1219d8fe216560c4f3ee  config/mt-sde
+9af153786999225732c95595da5ebd52  config/mt-spu
+b2adad0a4a862632ab430160dc6a218c  config/multi.m4
+120ec56e3aa27739a2945bc1c8a2530a  config/nls.m4
+fa22f7e8f43ef5b6e9ab94ec570c2327  config/no-executables.m4
+a251aa127ad38c507c6c5d6462060dfd  config/override.m4
+7632e8393bbd7e57d2e0a58e78521d3f  config/picflag.m4
+734b3558fccbdc3e95eca1f1374b4016  config/plugins.m4
+1e69014355ea3f8f6aa2c91b13a7bb92  config/po.m4
+b2d511a8a77414eda79bdee0daccfea8  config/proginstall.m4
+d3cecf02bb97035177818aefbb0e0833  config/progtest.m4
+cf44bcebf16110e74cc72300706818c9  config/stdint.m4
+761497fd3445beb86a90919955d5aa20  config/stdint_h.m4
+2b708186a72f4b6d7afca4de41ae5448  config/tcl.m4
+36af806073153196c545a5a43f31bbeb  config/tls.m4
+5e1e75893989d0ae3c0452451cf80280  config/uintmax_t.m4
+6b1c349fb182e74fbc464c50c88fe2ee  config/ulonglong.m4
+49305b421244035f19bdccb38a800d5f  config/unwind_ipinfo.m4
+3510459bb8dffa5ea06682a29bcdbfa9  config/warnings.m4
+e249d18c447a8372fd1ed5f084284d6b  config/zlib.m4
+4adca919c67d00b948bf581991b79bbf  config-ml.in
+8385976ed3a37f278f07c10341d53876  config.guess
+040359150cf11493f973a46d8a25b06b  config.rpath
+8bfe314d850cea1b947bffc5b434bf73  config.sub
+3ec784e7d9ba16af7ac3eb99efbc1ee9  configure
+0ab4bdcac62c57137e2ce70f989787f6  configure.ac
+385a8c6e3d59641505e9153668eca8d1  cpu/ChangeLog
+57bb884c7f43b4868dc92a9cdbb51a42  cpu/cris.cpu
+5482fe4be796476228dcef116a5085ea  cpu/fr30.cpu
+b4ecfabcfae65cc11bf52fd29db940bc  cpu/fr30.opc
+2f25728eb6321969c8b21f7ce4bb9fd2  cpu/frv.cpu
+4c260ef104ad0998c6a0f6677fdfc685  cpu/frv.opc
+3e071f0b9c6ed8919fc0cfbd4e2c255a  cpu/ip2k.cpu
+2ec6a978ace41c4f6444cd841689b839  cpu/ip2k.opc
+36a3725cfe5376cf5bbe2ba4ba3af92b  cpu/iq10.cpu
+c9ca560e22cd9a4f6386fa7d81ba9dd1  cpu/iq2000.cpu
+032c5fe3ad082f7151efc1c5fed33c1b  cpu/iq2000.opc
+af81aea42ecf5b05a6177025e94af7d8  cpu/iq2000m.cpu
+4d4be1c663de1008e839d7c600b925b1  cpu/lm32.cpu
+38fbf7cb411f825e5cee1bd6f7e64680  cpu/lm32.opc
+1283a75df6b64b35120fccc4c352a420  cpu/m32c.cpu
+4695535b420da5ea8f9c3240e742539f  cpu/m32c.opc
+9079eaecdbe5e3a0ef3e27e756845a23  cpu/m32r.cpu
+1a19d96dd536cdcdef47e68d897fe639  cpu/m32r.opc
+e9533d2b525577101c8331e26c0625ed  cpu/mep-avc.cpu
+65ee6179eb425bb10ca3078a08b2a976  cpu/mep-avc2.cpu
+e28d4c4ced67f70f91462403eb823e08  cpu/mep-c5.cpu
+ff87656b73d5b97cf0df1ddae9e105e2  cpu/mep-core.cpu
+9c2945e3977156e41da47617175ac64f  cpu/mep-default.cpu
+023d83d84f72b748513f5cb78c179bd5  cpu/mep-ext-cop.cpu
+36dd0633e45fe6482aff65f67346b345  cpu/mep-fmax.cpu
+46bc705e6b0411486ee6e5e29538173e  cpu/mep-h1.cpu
+5c7ab28f06eca9cd5b0fea1c4a80659e  cpu/mep-ivc2.cpu
+a19fd9e8443a64db1dc14972cac446ab  cpu/mep-rhcop.cpu
+26e93da00b3bede6107823e06631c0bc  cpu/mep-sample-ucidsp.cpu
+d534cf9b6b4a7e68f003dcf5d9174cb8  cpu/mep.cpu
+be028971bb0055834c3612ca886b9a0f  cpu/mep.opc
+d131138bbb159cd94a48bbb552beeb1e  cpu/mt.cpu
+5f68403905e01ac34a57ec0bd0654dc4  cpu/mt.opc
+ee0a9dc3f65e1227da3e29a6f2e0b103  cpu/openrisc.cpu
+93a4d6e2606566a4effad67f9d4d4aea  cpu/openrisc.opc
+2ec1c54e8542038a6e1623a6540c6d71  cpu/sh.cpu
+e9b8e80ddc3003dd30c422877d4bb767  cpu/sh.opc
+16f51fbd17b7bbe501733bc197b50717  cpu/sh64-compact.cpu
+3935b10637681bb2478258da8908eccf  cpu/sh64-media.cpu
+d186b867bf5b1d1468f0db54b209a404  cpu/simplify.inc
+948e8928f44c21e4e46631023475d4c8  cpu/xc16x.cpu
+489902d19fb758761a771d924f53612a  cpu/xc16x.opc
+3fe5de5552242be376bc227337bf95fc  cpu/xstormy16.cpu
+8e3b808b3f665daa3a35b5333062ea9e  cpu/xstormy16.opc
+21504de31981a67b5b93b265029d1865  depcomp
+2fbd66ce879b3c1f9dde5a1bb1e4da93  elfcpp/arm.h
+85ce66ba60e725eeb85390bdf0e1618a  elfcpp/ChangeLog
+bbe53a37fc6d5d8be4fb08daf8284581  elfcpp/dwarf.h
+cff7cf2a7a4992ab4d4a21a8c9a1dd3f  elfcpp/elfcpp.h
+6d800de71808f85ef50b71fbda690bf0  elfcpp/elfcpp_file.h
+405a84dd64429083e7a1b6ab06b5dd29  elfcpp/elfcpp_internal.h
+75f2047addd89b7e1d9c0e4eef76a227  elfcpp/elfcpp_swap.h
+5d5536c2c3f21b5d5e4d0b858c32a350  elfcpp/i386.h
+ec96524676323bd37869782ba05e3c4f  elfcpp/powerpc.h
+293fa7cc3195d9c12479108a2a31b5dc  elfcpp/README
+6b1aede3fa632dc16fc154360ca41a3e  elfcpp/sparc.h
+625867cb35c566ef0d4c2fdbad4bc0fe  elfcpp/x86_64.h
+d22506533b932d8c1d49445c4f9889e7  etc/ChangeLog
+a20b40a0a5d3282f6a97c627be1e38c6  etc/configbuild.ein
+570746cd93c4dae506cf2a6153a2a1b3  etc/configbuild.fig
+f97ac2d5e05edeb335b73f8b6beef581  etc/configbuild.jin
+b2851bb6d77822adc89ffc6d323b5fea  etc/configbuild.tin
+e67b330b1ad623f1bd3850483cd4666f  etc/configdev.ein
+c1f7c41d3e596256ab5f5f933a66293f  etc/configdev.fig
+8e14386548b8da4c5072aa2abea55886  etc/configdev.jin
+32fc10cbdbf679bd0ffc8857cf069b43  etc/configdev.tin
+3730d24b1dbe4961124dc2288b6997fc  etc/configure
+04c402a3f17c2e0e5d13e424d617e88a  etc/configure.in
+2e5d03d7e059e2f8b4c14b8bae4b663d  etc/configure.info
+41ad927ae6285207ad5ba60aaa68c84e  etc/configure.texi
+ab0fe311032294b952da80585b8b90e7  etc/fdl.texi
+07570ba317be730a55c952a81d92dcef  etc/gnu-oids.texi
+16d5de91d4a0b2dd0259cbf784de927d  etc/make-stds.texi
+ab62f0847c161211feecf2530c6ba60f  etc/Makefile.in
+416e4db8d33628997a1d97b6fc06335b  etc/standards.info
+2b58a4439cb76a759259bc3341b2f67f  etc/standards.texi
+d5faa80d97899ae08accaff400923890  etc/texi2pod.pl
+df1c60e7555bd16af999e1170e594c29  gas/.gitignore
+0ccf7e1ad0698f58fd8eceb1362ccfbc  gas/acinclude.m4
+f2b796b5a115fc938144622cd5361773  gas/aclocal.m4
+2a5f1d9597be420bdfa50f0a6f689564  gas/app.c
+9d31310c88567b4638f168f6dfc87a38  gas/as.c
+2e9c10ce42cadba51ec8ec0d543adc7d  gas/as.h
+e25637964415c4475a64a2a5c7cb963b  gas/asintl.h
+6c8d6099ae64334a6bb30e8adc4083d8  gas/atof-generic.c
+c6df37b6419ba5ecab16a4c31a82bf20  gas/bfin-lex.c
+57f1e316f19b1f89f4b93940ef13b0a9  gas/bfin-parse.c
+b153c3067dd3c07ca9abb242b372a842  gas/bfin-parse.h
+c8e21390fc2415e6603e21d7e44ce2d8  gas/bignum.h
+c87664d9e05462d25308624a5caf49a6  gas/bit_fix.h
+18447cdc0d8c371154dde574fbbd6503  gas/cgen.c
+495fcb482c46f0e459d40f50000575ab  gas/cgen.h
+18b604a216acce6875adc6a10def053f  gas/ChangeLog
+d92c3865d6ed795c892f2cba004856e1  gas/ChangeLog-0001
+f985628fdd8bed73c8948cc8496a1af1  gas/ChangeLog-0203
+7ee4a40be5732a4dc9b8f09dd534dffa  gas/ChangeLog-2004
+8eedb9e8a38e7ca4e5bb584e1fe0a7cf  gas/ChangeLog-2005
+d92c5b2a557f33fc367e457097257fb8  gas/ChangeLog-2006
+7d03a3dcbf7fb50df66016d49100e59c  gas/ChangeLog-2007
+e9cffe807ab956e45f7cc45bf698e101  gas/ChangeLog-2008
+e8376db1e4e246b2639ee6460adb1e20  gas/ChangeLog-2009
+df53bc3528c9495e3c2db81c95896d6f  gas/ChangeLog-2010
+1341d014bf9d648fff92c7815bbc7596  gas/ChangeLog-9295
+2ca0a735423063fa9757a564336be2f4  gas/ChangeLog-9697
+e6aed0ab8c1b1b6bcfdae6d97862b880  gas/ChangeLog-9899
+0963b41edc7e46fea7d776fcfb2368ed  gas/compress-debug.c
+5b72e9fbef33882696552d87e7ce38a5  gas/compress-debug.h
+7a274ac289093d1a89223fb6ca9c1f95  gas/cond.c
+a7f496f8924be2f4cf8e9c870d7b4fd3  gas/config/aout_gnu.h
+beeae856d74dcefe109aee0059758db4  gas/config/atof-ieee.c
+38f6e7dd8ad06d9b2bdef8019f772f6f  gas/config/atof-vax.c
+a9c44c515e605173ce6298ea81eeb0ea  gas/config/bfin-aux.h
+ec060c6c4a1cbaa48252bff5ecd87b20  gas/config/bfin-defs.h
+9aad513bf660346ab10b41c8c4d5a9c6  gas/config/bfin-lex.l
+704ed8270e50653ac48a6058772b1646  gas/config/bfin-parse.y
+46d27aacfb59fffe2982a15b81323c4a  gas/config/e-crisaout.c
+3fd339133d627c50fe093c3984d4d020  gas/config/e-criself.c
+9a8cfd650220df5369837a3f65ca26f2  gas/config/e-i386aout.c
+991fb4f985c6cb6ffd333849c20a7bc2  gas/config/e-i386coff.c
+b32a87acd5a22a9362fee074ac74c596  gas/config/e-i386elf.c
+55272227032cc7a89abb3c5eba472f50  gas/config/e-mipsecoff.c
+cb10da9eb9531fe5102801f2c8b8c003  gas/config/e-mipself.c
+5c5a38e784e146d5c513fe860f32aa4d  gas/config/itbl-mips.h
+797e197f24c46a767478c28bc5dfece6  gas/config/m68k-parse.h
+82ca3755ce16eb16d66b0cb0d9cbeff6  gas/config/m68k-parse.y
+3829861f76e3e56a4ab283dbb08f9359  gas/config/obj-aout.c
+4e0ffff4eff7f2f318fc985733d520ec  gas/config/obj-aout.h
+9a075d669341ff5235dd7a6e5e7a2255  gas/config/obj-coff-seh.c
+3f8d5676f9f2f63384d1d43a98db7578  gas/config/obj-coff-seh.h
+bec79e69a081f0b8d14f5746fb2e5c16  gas/config/obj-coff.c
+e54ea319c9181941b59617f2d53d9a71  gas/config/obj-coff.h
+6d5a47d0bc8ebd96700201636afa2c96  gas/config/obj-ecoff.c
+2a7022ba7520b4607321abddcdb5139e  gas/config/obj-ecoff.h
+76856e8c2ffa30544cc91d002eb7ccfb  gas/config/obj-elf.c
+d6d612783f54717f1a9c2d8ec1b347b2  gas/config/obj-elf.h
+fb75630f101d8eaf2a553370969c0dae  gas/config/obj-evax.c
+7105d3d5805b5a080b72d39ed47f9f64  gas/config/obj-evax.h
+10ebc9c0079e17d556b7eafc311a472f  gas/config/obj-fdpicelf.c
+3a5af93d62798495841899179308deac  gas/config/obj-fdpicelf.h
+b15bd99506520907633f051cf3a9f485  gas/config/obj-macho.c
+4beaa6bade0bc89ce1ffeb696f01da09  gas/config/obj-macho.h
+09b3f329960521fad6f48800197bd140  gas/config/obj-multi.c
+b76cf25d1c76e6b9b06147c811e7e618  gas/config/obj-multi.h
+e51a0e267c6687a984bb5fbb5ef83e7e  gas/config/obj-som.c
+99b1f3015034ee964bc7348b0d55eb87  gas/config/obj-som.h
+77df13b9b47c6eedd6bfa8035e96e5da  gas/config/rx-defs.h
+80d0d13679e0f68515bef1999feb9a9c  gas/config/rx-parse.y
+55944d51d9928dede6950556ce28fa8a  gas/config/tc-alpha.c
+096c407c69a2ceb0d13006fe1b2f3fc9  gas/config/tc-alpha.h
+2b9925ed3c6565c2802a3c744c787a95  gas/config/tc-arc.c
+11b936fdbc63c624d6713a01be12a049  gas/config/tc-arc.h
+c5b5cd021e37dc9879410aff84c8168c  gas/config/tc-arm.c
+c6aae64d0b921890129826c297cff793  gas/config/tc-arm.h
+a9af3f31fb714e940991c4ddbfa08675  gas/config/tc-avr.c
+85a969a2c5df82c892f3aff0259b19b0  gas/config/tc-avr.h
+de44dc1975bf920bdad2072511968556  gas/config/tc-bfin.c
+408c3d212dd7c8d3e30765b3ca72d678  gas/config/tc-bfin.h
+4085c77671ff4e22b1ee2e3f1b526b97  gas/config/tc-cr16.c
+16e337635d412bdff3d59cbdb9eeb954  gas/config/tc-cr16.h
+2581a3c30987111b1ae59c17d04941ae  gas/config/tc-cris.c
+df9261bbdee1d39086f7ff8048d935bf  gas/config/tc-cris.h
+993fe511fe447b322e6fe5d60704cdda  gas/config/tc-crx.c
+67e306cfe64c96a4797f4e06978647e8  gas/config/tc-crx.h
+f8844cb249dc02eae2a6c4b13fd2cce7  gas/config/tc-d10v.c
+3fd4b8aa4d965c70ef380972d732a70a  gas/config/tc-d10v.h
+4a0aa6b92f7413c7dbd031d8f2b60af4  gas/config/tc-d30v.c
+98d2a1a66b8ace60c1fc95e4065a0f88  gas/config/tc-d30v.h
+f0d4724b115a07c9d3d6dd40e5feb498  gas/config/tc-dlx.c
+77b8d3dd611a1ca44eb35ae7ec9af0a3  gas/config/tc-dlx.h
+4a5a7060ab2a0fecca7b3468dae10abd  gas/config/tc-fr30.c
+3050259b4ee050ac6d58b712674e22ba  gas/config/tc-fr30.h
+30d620d2d0352f47d652e9025d7d32da  gas/config/tc-frv.c
+121f5e4b3d7f5791c347c5308f4f8377  gas/config/tc-frv.h
+1f33bef0e6ba089d1e5952b8acd94747  gas/config/tc-generic.c
+7a2f6a786601e834505449bc5383f854  gas/config/tc-generic.h
+e607a9614b65bbb5ce94c21e0627066a  gas/config/tc-h8300.c
+17190700077711741e7b153827b835fb  gas/config/tc-h8300.h
+a91ea59d7da7ad90f9de893cecd6d2a1  gas/config/tc-hppa.c
+c76a58e2640357f838aea36277d846dc  gas/config/tc-hppa.h
+d61bb07f4418491d1a677c77eae67a86  gas/config/tc-i370.c
+7dccf2b51236e3ef7deeaac89dfa991f  gas/config/tc-i370.h
+4ddd495eadaf535c00f43678adba6c40  gas/config/tc-i386-intel.c
+f907ab64c54e7d2de68b440c358e2ef5  gas/config/tc-i386.c
+49ba887bb6aa570e9bdbec41c1b24fcb  gas/config/tc-i386.h
+41f969a38a7e0814e5b10c4433ae154c  gas/config/tc-i860.c
+1cc39b1b19b8310594c2a43fa39c88ad  gas/config/tc-i860.h
+da1bf97ffec4c08aea1ba64f0faff144  gas/config/tc-i960.c
+5905fb2a619cd2b1915d3b3e0887a2dc  gas/config/tc-i960.h
+f61d1ebef368ec14486ca75a30260164  gas/config/tc-ia64.c
+83e4a795407409441cbf4a5f191ccba8  gas/config/tc-ia64.h
+1b2598a7c7aa4bdeab6fc9376f78ec10  gas/config/tc-ip2k.c
+7dee47fddfc7fe6644c874b61f2ac3ed  gas/config/tc-ip2k.h
+c3b3aa6e915f500aadd5a93d96c506ec  gas/config/tc-iq2000.c
+564d9c7e920d871b650d9ea9ea34b4a6  gas/config/tc-iq2000.h
+03af11ca4e0b1ebc2f62219617cb91ee  gas/config/tc-lm32.c
+c2f3efda51c738051232915d0d7560e9  gas/config/tc-lm32.h
+48a896c6e2d032c64c4aab54c6f434d5  gas/config/tc-m32c.c
+192b78c8854c3618e4730d287f481add  gas/config/tc-m32c.h
+70bccc9b91c9ea7250c52bc94cf131c4  gas/config/tc-m32r.c
+0c0a0407f136882d0321dc1ec4b39516  gas/config/tc-m32r.h
+7725810e321ffec6fd146db9448e63d6  gas/config/tc-m68851.h
+e4e00158e09af8a42b9617f941a39e62  gas/config/tc-m68hc11.c
+0e4cbbc6ceafd46ccc91a6c580325d97  gas/config/tc-m68hc11.h
+b8ef99c69980b6ea33190af8752d75f3  gas/config/tc-m68k.c
+22ebe4d0cc57a8a1af63c924fc23ce8b  gas/config/tc-m68k.h
+02b9ae70fb2f707785a5d5588cc2ced1  gas/config/tc-mcore.c
+22dce6a65547b031a610f2d96397ea87  gas/config/tc-mcore.h
+4578a75756f4ff2a8a62d14de67775e0  gas/config/tc-mep.c
+c1285c2279565713c1eadbb52226c3d6  gas/config/tc-mep.h
+b5abc2a03f5c7cd5bca1cb03a393f1cd  gas/config/tc-microblaze.c
+2e4ae8a651b93205e965a45b872a127f  gas/config/tc-microblaze.h
+b61ac53de640423d39c5902a1201e49e  gas/config/tc-mips.c
+380de0347b8dfbd631d993336b0477c8  gas/config/tc-mips.h
+972749ec51c47a10efea653d23bbaad0  gas/config/tc-mmix.c
+9c9946ef89dc77be99368a225a024803  gas/config/tc-mmix.h
+3a4089a6abed589dc9a4fc1b3962194d  gas/config/tc-mn10200.c
+e1fe4059bc58737d2a1a2cd70b17096c  gas/config/tc-mn10200.h
+8efa4d638dd7b54eb2c7f9247de6c8d4  gas/config/tc-mn10300.c
+b23327a62392758125f64e8d8f071ab6  gas/config/tc-mn10300.h
+e13ba96e47cdfef9dd64a862c8ded7fb  gas/config/tc-moxie.c
+c0f246b1b53d88033b92672a7da7520c  gas/config/tc-moxie.h
+b1248e373226785c89b551989cd8a070  gas/config/tc-msp430.c
+323ddfbcec62e838a1bbf5a068f8a379  gas/config/tc-msp430.h
+f1f171c1f333c606b83da0eae976a844  gas/config/tc-mt.c
+80afaf3938f8136ac4922c3de5e48462  gas/config/tc-mt.h
+906f66f29633dd42a07de0a5d59c968f  gas/config/tc-ns32k.c
+6bcefc8b0dd30c7c12e4349e6fa4fa90  gas/config/tc-ns32k.h
+53c7f067defcff62b1e3ba59585ca56e  gas/config/tc-openrisc.c
+cdc0e43fe4f2e290849b55a28ebcf358  gas/config/tc-openrisc.h
+9418e7f07d513cccac1d2c411a0e6292  gas/config/tc-or32.c
+2352f77e742370578a89ffdca5d719e3  gas/config/tc-or32.h
+4fc0b798fb72cb77461d7f5adf2f1317  gas/config/tc-pdp11.c
+f9cad0069f8a7b2f076a80c6309f2ebb  gas/config/tc-pdp11.h
+e1448d84457dc273ffd42f8a2fbffc82  gas/config/tc-pj.c
+5b7366e23ad26831a0037bd3b93d3e4e  gas/config/tc-pj.h
+8e1e787df618720b9939df091c8b05ee  gas/config/tc-ppc.c
+9026a7159b043505e9be456b6429ecc1  gas/config/tc-ppc.h
+80cc1940ee7334dc40b8a350ad2b2042  gas/config/tc-rx.c
+b8cd6ee2d5c0f91f7e6af6db2d7d8e94  gas/config/tc-rx.h
+361ce8967941556e65b1386c945984c4  gas/config/tc-s390.c
+29f545fc87e1f45334513612a0ddbf40  gas/config/tc-s390.h
+31c153b4b17fdd8af620b96f66c668f3  gas/config/tc-score.c
+8e6d62acf30dfed34157b0ca80896a5e  gas/config/tc-score.h
+fe832840a7da5c61cd39b67af032987b  gas/config/tc-score7.c
+cb570f60972cdcaf185bb0a45dc4c4b1  gas/config/tc-sh.c
+a164375e7e73162eb39b5d2e90f2dfe5  gas/config/tc-sh.h
+bf9ebe18553d7beb7584d08ea2259730  gas/config/tc-sh64.c
+b31ff52a3e0405a9ce018c551399e80a  gas/config/tc-sh64.h
+5a41ce2bc732de21ecec7fca0c30fb5e  gas/config/tc-sparc.c
+965d4e3ca34f2a64e8e445aa638b2d80  gas/config/tc-sparc.h
+4bd2fece53b305234c4b619b8846e8f9  gas/config/tc-spu.c
+7a2c803611ef7ced54ab8c9cfeafc2fa  gas/config/tc-spu.h
+03bbc6fa33cd6ebec70dd5ab061c5751  gas/config/tc-tic30.c
+6ba82f6abe777d7f204c60c923bbd1cb  gas/config/tc-tic30.h
+c19b842b6922bb8eced42872ace677dc  gas/config/tc-tic4x.c
+71fab4042ca37eb10fb831dea6c316f5  gas/config/tc-tic4x.h
+8b58d3b74bf7b4f93cf9357b0601ddcb  gas/config/tc-tic54x.c
+8c571810f8b8b2001882528175733c72  gas/config/tc-tic54x.h
+ece8bcbe81be5d93013d376dc4441497  gas/config/tc-tic6x.c
+bed34a6cd5a73b092afb6d0cd91b99cc  gas/config/tc-tic6x.h
+905dcaa2e32b77ce3b2a0e37f09ed7ef  gas/config/tc-tilegx.c
+8dbb571a5fc7fef82f427d05f30e9727  gas/config/tc-tilegx.h
+4b5ba01dad63eb15b2f7d7245757b077  gas/config/tc-tilepro.c
+c47624a5e236948cba86efa034f1e16f  gas/config/tc-tilepro.h
+2fe941df1111d332e9d176af0afd3f5b  gas/config/tc-v850.c
+0c9681112da2e41d0087b4ecdb56b9c2  gas/config/tc-v850.h
+6bf36860fa16a4d3945d875df3887c64  gas/config/tc-vax.c
+8256b4c41eb2857c423f9a594cf2b3cc  gas/config/tc-vax.h
+754e98e59b3c817eea47508b36db81ac  gas/config/tc-xc16x.c
+b9f7c9d1143c443afd567445063d237a  gas/config/tc-xc16x.h
+5876a94f1c988da28e07ab1a8ddf4889  gas/config/tc-xstormy16.c
+0d07ca8e159011c0d4d15db8d781855f  gas/config/tc-xstormy16.h
+afad24c658c6b7ee98b9dc616a9888b7  gas/config/tc-xtensa.c
+8919498b090fd3ad00b7d0b6698eed0e  gas/config/tc-xtensa.h
+f56fdcd3a739d7a68d02c3b10899650f  gas/config/tc-z80.c
+dda5d59c9501688ba620f7c5c26938ef  gas/config/tc-z80.h
+742550db20b23687f1bc9872fdf5fd2c  gas/config/tc-z8k.c
+654b655e3637d9b3e4976fa4659a3425  gas/config/tc-z8k.h
+846f1bd9e1ac66e299e1f5f2f0a26d28  gas/config/te-386bsd.h
+82978f6c9dd082849f4c4a8ce5195874  gas/config/te-aix5.h
+e901549aefb8b308ab9856c37f823b4b  gas/config/te-armeabi.h
+47acc24c7f9c17376db9206e51d80095  gas/config/te-armlinuxeabi.h
+17d038880ac663d82d0073ce8aaf3611  gas/config/te-dragonfly.h
+89b8eb84b13d921baacba0fb5cc5d94a  gas/config/te-dynix.h
+19a15130d5f27821bd6a33961ee0b746  gas/config/te-epoc-pe.h
+ac2563d347522fa121654ca11fdeea14  gas/config/te-freebsd.h
+ebd37057dfb2465eceb5f25740dc9ebc  gas/config/te-generic.h
+0f429c364757fe87349aee8defe34604  gas/config/te-gnu.h
+34f166f075e66d3e0f5fccc1dedbdb2d  gas/config/te-go32.h
+a888715f1311630c88260a460af84fc2  gas/config/te-hppa.h
+9a256557e990376c03c799f23447d3ad  gas/config/te-hppa64.h
+1dc4b217e7321782918812087dfec497  gas/config/te-hppalinux64.h
+f054729d11e4bdc0d511de0c22771a84  gas/config/te-hpux.h
+482879c6ae606c3b430e6826ebf8dd68  gas/config/te-i386aix.h
+b0bdd8286d474201386f781932f73fa3  gas/config/te-ia64aix.h
+aa8fabcf3d3093365a232271033ff216  gas/config/te-interix.h
+480085f6479825238a1496c74d985737  gas/config/te-irix.h
+35e986b0ca44cc9e79fa57c2d7ab0ead  gas/config/te-linux.h
+95a3614361330b27635b2a3f93d7c6a6  gas/config/te-lnews.h
+7dd69643aa20c8174bf37930d4973eee  gas/config/te-lynx.h
+7a54940f07dbcf6b4eb99ab07e3faa8a  gas/config/te-mach.h
+f1bafdbbf6272e7496725b8302b30e79  gas/config/te-macos.h
+bb0e75e1a1c031bb09a660b4360140a4  gas/config/te-nbsd.h
+ded7737a8aeac92f12c4013bf0d9e453  gas/config/te-nbsd532.h
+8f0bc9c855c33c453250a60b57910b8c  gas/config/te-netware.h
+1b08dadc1695c748f88e7f080ef28f66  gas/config/te-pc532mach.h
+9b79ef8ff3b3c00dabb275eedbc13c0d  gas/config/te-pe.h
+0d376aa34db1e2863f3509f47027dcaf  gas/config/te-pep.h
+5ba13db883834de33b7a3c24116ede95  gas/config/te-psos.h
+3e7327df1df473529e30df0a10a31e65  gas/config/te-riscix.h
+47b89894b5e5cb88a4d4822530c1cbb7  gas/config/te-solaris.h
+b3878236b9488c1a4facd0a31544aa3f  gas/config/te-sparcaout.h
+ddd6bf4b762e74b3b3ac1b928098f09c  gas/config/te-sun3.h
+e884942337b3717dcbad12574a4ba59d  gas/config/te-svr4.h
+03f0de9fd35c141fc5f9905942f03d15  gas/config/te-symbian.h
+0d4337a94ec6ceac928e434d3f5a4c37  gas/config/te-tmips.h
+67360e326453dbac4013ea8bac7c4148  gas/config/te-uclinux.h
+046f5840c299eeb4ebde0f39e7b5ed81  gas/config/te-vms.c
+2a76e2eca66b9d387e5b927987e2681a  gas/config/te-vms.h
+6ab9e45fd87c377872fd3e83abfae703  gas/config/te-vxworks.h
+384a20d298a5bd6577e83e8591fa8a0f  gas/config/te-wince-pe.h
+fc884f4704cef426cd35179c5d922795  gas/config/vax-inst.h
+1bc31c6cab3996a70557f19b791bfd2e  gas/config/xtensa-istack.h
+38fa59f76ece285ac497d958ddae0f1b  gas/config/xtensa-relax.c
+7de6470b79d43c6db28c845e141bdaef  gas/config/xtensa-relax.h
+a557cb7777909ddf98d654b9bba3b485  gas/config.in
+019fadb34c45c331b6badff0440cef52  gas/configure
+7e6b42997f912871798bbfc004339411  gas/configure.com
+de3e615b66769c08efa36fb7b1fedc23  gas/configure.in
+1a106b02440f264426c7d934d85600ec  gas/configure.tgt
+53db0ab868dc9516af2c5ab97a8450f0  gas/CONTRIBUTORS
+d32239bcb673463ab874e80d47fae504  gas/COPYING
+046b766092400d556fe2c48e86605010  gas/debug.c
+36285069bae7f4dca379829241710bd4  gas/dep-in.sed
+d2bc182dd992e21aee661917228a59a3  gas/depend.c
+b452cf27e5b22a158729680670b665b1  gas/doc/all.texi
+2654b2e2a287b73bfe9ba54dbb603c8c  gas/doc/as.1
+dd2194e9baa7fd04953866e12df879eb  gas/doc/as.info
+7358435d0b4801c1c7c92c9033e8085e  gas/doc/as.texinfo
+b452cf27e5b22a158729680670b665b1  gas/doc/asconfig.texi
+b4c9c0f1aa186794ae86366a85cfb7d6  gas/doc/c-alpha.texi
+bc80ddb6294fc82e2ea4f425f38fa672  gas/doc/c-arc.texi
+97e140888e939afce4e1132ff0f55dd6  gas/doc/c-arm.texi
+67dc35ff653d7b8068818b47598980a8  gas/doc/c-avr.texi
+aa9ea84d18e896783f89faa3a90a0fed  gas/doc/c-bfin.texi
+179b2db45d3622eae69f59a6de37e20b  gas/doc/c-cr16.texi
+8f78a32066cbf6a56e8f8c4dd571ae38  gas/doc/c-cris.texi
+dff8832eec63f574612e2eab23deed7e  gas/doc/c-d10v.texi
+eedc75ac8669cec1a86d7ea12d34a0d5  gas/doc/c-d30v.texi
+59d3e64c8f4f965b3aaf283c39c7a22c  gas/doc/c-h8300.texi
+c66d36fa35a14bf3cda80832c130d87e  gas/doc/c-hppa.texi
+737140a2ffd746cdba96fa47fec328a3  gas/doc/c-i370.texi
+9f42ee3142ed56f70c04bc3f5f1cf1f1  gas/doc/c-i386.texi
+9e80d5308b76432b2ba1290eb636268a  gas/doc/c-i860.texi
+fcb8d9d5542c91f40e11dbbb5b0399ee  gas/doc/c-i960.texi
+9553acbdca626eca22306c81d17f5081  gas/doc/c-ia64.texi
+936a09f52577e059778d36472a6413a4  gas/doc/c-ip2k.texi
+eacbb6dc4cb37bb6b8dcb771af41d7bf  gas/doc/c-lm32.texi
+1cc920d421ece763d3ab4ed3857e3e35  gas/doc/c-m32c.texi
+0639d7eaf2dced3275e868a6ddfb759b  gas/doc/c-m32r.texi
+84578142e7b85437ec2d14763de255dd  gas/doc/c-m68hc11.texi
+e824c3e3d9490c07e40b9eef9d1940cc  gas/doc/c-m68k.texi
+16226640ab8e14104d363cdbad5053f5  gas/doc/c-microblaze.texi
+523c4541cfee611cfce8713d1df41f4f  gas/doc/c-mips.texi
+a6314182d1319dd718175347b831f048  gas/doc/c-mmix.texi
+f9605e25ab629d224ed8ccb80f199f00  gas/doc/c-msp430.texi
+baac99e8bc5ff2ccb8dbf425b8fdf69e  gas/doc/c-mt.texi
+ba35f5e8ce25efb33c7de10fe31ac8e8  gas/doc/c-ns32k.texi
+3fe953291dab4fece9848fd397316df4  gas/doc/c-pdp11.texi
+b4410fdbed610cd23fc2fec23ebcbc03  gas/doc/c-pj.texi
+8d7969cab108648c0654099181cba0ff  gas/doc/c-ppc.texi
+90ae7923d96f62d793e94d4835554075  gas/doc/c-rx.texi
+b364e7423a4f7ca7b9bc03c9a0fa23dd  gas/doc/c-s390.texi
+cc1e268ae84dacd9c057111e7ff62e11  gas/doc/c-score.texi
+2c0d773535b9a9d67fc1d97d4557df23  gas/doc/c-sh.texi
+64b14752824bf90ea8475df2daf16b8c  gas/doc/c-sh64.texi
+6f48e99ff8e84d99f1b8847c1473164d  gas/doc/c-sparc.texi
+af8e3c8db47ec3896bc31a494d7de6b0  gas/doc/c-tic54x.texi
+b989dfc942aa8ab980fa6c65b41049b4  gas/doc/c-tic6x.texi
+c275694d2a7d2dd2a31a9a196d0cfdcf  gas/doc/c-tilegx.texi
+ca8af8a1737b3903061b098e5df4ef68  gas/doc/c-tilepro.texi
+4a1d98d11c9cf2ca4461b9a50e5bb008  gas/doc/c-v850.texi
+7af989936deb2e3760522fc162ec9259  gas/doc/c-vax.texi
+f4e50b91977f2ee38355a827220a27e2  gas/doc/c-xc16x.texi
+2c20cb5c3a5f5a5c372125bbb4b3b26a  gas/doc/c-xstormy16.texi
+c7c3fa486b208e927a1fc4bfdd77d840  gas/doc/c-xtensa.texi
+3d2d4c31a8139814c77b20e27e972b09  gas/doc/c-z80.texi
+253f83f4a9674657798fc94b823110d6  gas/doc/c-z8k.texi
+072910d553f79906db69fa7c0e956bba  gas/doc/fdl.texi
+289febda425d8afbd046e348a08dbfff  gas/doc/h8.texi
+8d09e6a6866fb40f7967c09acc404f2b  gas/doc/internals.texi
+11ebd0feb8f394b93ae6d8118c76ab88  gas/doc/Makefile.am
+a2fdf202c246bbe758e967be5223b64a  gas/doc/Makefile.in
+a71cafa5575a99a89cc2d321e3381267  gas/dw2gencfi.c
+40b934c6fc1fcc7b41583850293dcea4  gas/dw2gencfi.h
+7bb9f7555d019c7361a9b7658cc7b337  gas/dwarf2dbg.c
+54364ac0f17fd7b383758cf7ab4dde09  gas/dwarf2dbg.h
+24d9cae5e0cafd887166ab83fc85d67e  gas/ecoff.c
+5188016afd7345ccaf817fe920df1af3  gas/ecoff.h
+ea78433d88fb44e6e068fcaf4a999845  gas/ehopt.c
+92732c078a7acf574af9df1fbc62236b  gas/emul-target.h
+99a7a09433a40a316a830646e1febaba  gas/emul.h
+2e0da825bbc7baca039dcdc94b364041  gas/expr.c
+1a232404fe1e22276ec24ff339ac0920  gas/expr.h
+a8086612007d4b1398bbcd3222491afc  gas/flonum-copy.c
+17e961bd7664effaa115dbe1752cc76a  gas/flonum-konst.c
+67f204a57fdf44aeb64bfe5c900d9c87  gas/flonum-mult.c
+39147fc4f0f972c0c256ff21bbebc855  gas/flonum.h
+ae882e3930e09e078998b8525e50b167  gas/frags.c
+e006dc9f9a1778ed1fb65597a85285d1  gas/frags.h
+ae2f57545b6c7ce4a91fb749513ac6a1  gas/gdbinit.in
+d4b70a92ad2683b4707e5c46e839d9d9  gas/hash.c
+63a7f829b6cd1ba1174831e406a660d2  gas/hash.h
+2df8cc79b06128bb6f9052ea946b98c6  gas/input-file.c
+3cff7b4bbf83194380e69a1edd0e6336  gas/input-file.h
+11964b69924e63a4abebc0f0dc523139  gas/input-scrub.c
+63f82b532c2bd06bce7661f63fc94893  gas/itbl-lex.c
+78dd7d2bc83a9ea1066d5cf81387f9db  gas/itbl-lex.h
+854c41c87d0d90aa26b6ee48f28baadc  gas/itbl-lex.l
+e916586c657a7414b19314f92765f814  gas/itbl-ops.c
+e447a89687ea0ea18139f6bd905b02fa  gas/itbl-ops.h
+4ea7ac4d931713b4c4266bf1e01c540c  gas/itbl-parse.c
+86a928b05e84edab3af35f7aa489f27c  gas/itbl-parse.h
+0153b49dbbcf47a9cfea80fa35b93482  gas/itbl-parse.y
+e441085d852276adfa2fc811df97b807  gas/listing.c
+f281c30f7476482b70817dcabb52e1a2  gas/listing.h
+d3d3be59b37f1add71b4f71bfc46422f  gas/literal.c
+64cd294a7e4390954710090b0b743b49  gas/m68k-parse.c
+2e58478bd61878b077142ca597b92780  gas/macro.c
+bc1cba24dd11574ee28e63c61603cf43  gas/macro.h
+d618facc3e8ce8bf3d02ba452e1be6ab  gas/MAINTAINERS
+6aaf48e988eb44ef0c4af9d5ba0d3b79  gas/Makefile.am
+b47315ea590ddfd558b906dedb7e288e  gas/Makefile.in
+354cf2a2fc74c71e5c771a70f35e7e26  gas/makefile.vms
+c7dca5ffd79185a3d3da0c3c7c3ac80f  gas/messages.c
+7c636624216330e19d033da06fba83f3  gas/NEWS
+37cb1fdcfd13bdeda1527a80ddc1333c  gas/obj.h
+6ce9540be0e657371728a69ecf5ea0e7  gas/output-file.c
+2fa8189fa6fc775e05be73053a0b853d  gas/output-file.h
+9520a6893d16735418796e0fbbb2bd06  gas/po/es.gmo
+74d253813bcfb1c212ddd215e7aa25d5  gas/po/es.po
+20888a4a689d6f09aba59e93261ba117  gas/po/fi.gmo
+2806dc4b95969a5908511d2ab97d1225  gas/po/fi.po
+df112bde534ccee4748328baf62e143c  gas/po/fr.gmo
+b7e846c9e75038d1767c38f03de71485  gas/po/fr.po
+7cd92bef34b0797bbfef6bae91c30d30  gas/po/gas.pot
+9cee2a71c8a685f823334f2345fe6926  gas/po/id.gmo
+d630cc3fe15feab4abff44e37f5d7d3f  gas/po/id.po
+8935ae2870f3d67420c16c4b92796ceb  gas/po/Make-in
+34afbfdf8c0409276df72ff59fa58501  gas/po/POTFILES.in
+e21d5e731a31d115fc5685e7918e1180  gas/po/ru.gmo
+3dc090bd3b622ebd9bdc07bf87868066  gas/po/ru.po
+3e890a0b3ab0fdf3474873d5627b21f4  gas/po/rw.gmo
+ecfefd4ef9c04f3bd2e486e73cc878db  gas/po/rw.po
+f921f25b46f5eda454485a4af9286c90  gas/po/tr.gmo
+39462aa2819407ab236aa02d57ea5a53  gas/po/tr.po
+0bcc05a5f05166cf093b95766dbfc876  gas/read.c
+90ebac1027b1eaaad9f5f1488b66908d  gas/read.h
+7d90db3f78994d389f96376160c78e79  gas/README
+b8add65d8707b4c648594ee377de406f  gas/remap.c
+ac7a361753c382cf1886168bddbbbf97  gas/rx-parse.c
+8c2a82136f9c9030b1da1447f6a4788b  gas/rx-parse.h
+5ff8b777f16712e64fc85e66d3864c8b  gas/sb.c
+66b8e182fc92b3ad837f2c36c39f800e  gas/sb.h
+1b43b8ed2deefd836ecc2321be9a172d  gas/stabs.c
+1ded054093de910d9786c62bc4fe8cc6  gas/stamp-h.in
+f466095ac8a7a01b59cce1a965b3e166  gas/struc-symbol.h
+919587b23bcc5514a7c31d7c363e51eb  gas/subsegs.c
+fb0f91c11edf3d6da54955ca2cd59a7e  gas/subsegs.h
+f1cd96b3465f26c507b0224c5bbbe9b4  gas/symbols.c
+c50cc83daefef2d086e32e09f874b0a7  gas/symbols.h
+5e55a27d8d002eda60e10a4baaa71984  gas/tc.h
+19973f8fea6f93b10dd1bba9a7b7963c  gas/testsuite/ChangeLog
+8f4c98fe241e3d57b357137c666fd4ba  gas/testsuite/ChangeLog-2004
+6e717d4f414fd8ffacb0b5f480256270  gas/testsuite/ChangeLog-2005
+a89405fc1bad7bc620fc00b28bd62f6c  gas/testsuite/ChangeLog-2006
+5de611d822d2546671c06953d8fd538d  gas/testsuite/ChangeLog-2007
+c04dee8bb883614a130ec425bd11909e  gas/testsuite/ChangeLog-2008
+7372b5681e8dccaafca73555adb69e3a  gas/testsuite/ChangeLog-2009
+64f11faad6bab697aecc0a5339bc6544  gas/testsuite/ChangeLog-2010
+f2390f2b8917391da133b1ed67fa8607  gas/testsuite/ChangeLog-9303
+db812b65b8dbbd96d60562df3bc90c2e  gas/testsuite/config/default.exp
+6d40ab26009707974cd97b3f85eba886  gas/testsuite/gas/all/align.d
+a60277af402def6d8b222eb7aa29fd72  gas/testsuite/gas/all/align.s
+e6c304936e9061331bf04ff66f8c1eaa  gas/testsuite/gas/all/align2.d
+16604c070ffc1562842c0a67da3fdc4d  gas/testsuite/gas/all/align2.s
+69e2c29fe0d1168c47d1e8b9657659e8  gas/testsuite/gas/all/altmac2.d
+f0cd1747f8e7af29724f1145a83796ed  gas/testsuite/gas/all/altmac2.s
+e305dbfa90f24603b18216c0f3fd2d49  gas/testsuite/gas/all/altmacro.d
+1da520aefd1b26aaf3d59e3d68d4ccf3  gas/testsuite/gas/all/altmacro.s
+dfded27f5745972797ed960a849888ac  gas/testsuite/gas/all/assign-bad.s
+ffec055967c23ae21dba22a6ac5c9e3e  gas/testsuite/gas/all/assign-ok.s
+48cd3944d00ffc414edc8ab100129683  gas/testsuite/gas/all/assign.d
+c70d12a44da637481d77388d379a4f9f  gas/testsuite/gas/all/assign.s
+8e8b84ccd3bab6d4479f373267c7c935  gas/testsuite/gas/all/byte.d
+0733c957af816c50298d1dd2c58f5a6d  gas/testsuite/gas/all/byte.l
+82e38f239dda10a87d4f131bb1a52b92  gas/testsuite/gas/all/byte.s
+6fdc3af8b63d5c8dd0a98137215d3753  gas/testsuite/gas/all/cofftag.d
+a18dd1c48d82b4324b3e6fe34ed50dda  gas/testsuite/gas/all/cofftag.s
+7642a824a63aa87c0f0c07ebab2ea9ba  gas/testsuite/gas/all/comment.s
+7bbedc3ae9894c93576fd06f35e70535  gas/testsuite/gas/all/cond.l
+91a7dfff6d9b1fd2354096b767db4cea  gas/testsuite/gas/all/cond.s
+7ec8ad8becdaf04c09bde661a8ae427e  gas/testsuite/gas/all/diff1.s
+3725ec8088e01ec8900ad41fb2295381  gas/testsuite/gas/all/equ-bad.s
+b69cfaf78110599c63010ad6d52e3920  gas/testsuite/gas/all/equ-ok.s
+285b5f9762e337f80994b575f235968b  gas/testsuite/gas/all/equiv1.s
+1170e49707759e59d9d43a91bfaff853  gas/testsuite/gas/all/equiv2.s
+772c9ce372b12eec88e8ed48afa8e095  gas/testsuite/gas/all/eqv-bad.s
+be23e497c6b9c82aa5289a1d42165934  gas/testsuite/gas/all/eqv-ok.s
+174595a7641ae3110964493d3087e8b5  gas/testsuite/gas/all/err-1.s
+40bae500b5de820301091838b2dfaf78  gas/testsuite/gas/all/eval.d
+b0d74a67fa0e0140f0f7a98e8a1a4f49  gas/testsuite/gas/all/eval.s
+32b517988d18eebe13e6c54d2e0feb00  gas/testsuite/gas/all/excl.s
+1e473ef749281964d4b71dfe127a5b69  gas/testsuite/gas/all/fastcall.s
+a3ed4c57221d0e6ae68721825604f04d  gas/testsuite/gas/all/float.s
+c86b9077e248e065c0ccdcf220c5243e  gas/testsuite/gas/all/forward.d
+a228b061c0ecb736bad03c969baa7c26  gas/testsuite/gas/all/forward.s
+4200299115c54a121ec66434dab90c6c  gas/testsuite/gas/all/fwdexp.d
+3a1e933959b3eb6875798141fa576771  gas/testsuite/gas/all/fwdexp.s
+89ea9a171ecd4a5acb363ee33c89fd7c  gas/testsuite/gas/all/gas.exp
+a94f64a3485357ae737e79fdbb095859  gas/testsuite/gas/all/incbin.d
+aa088c5c0e59150fbe2283dc31cd8353  gas/testsuite/gas/all/incbin.dat
+3fcc9d1848f57cb6d23cbfe139e2052a  gas/testsuite/gas/all/incbin.s
+ff0067e6fc03e40d69f6d4a3df69c315  gas/testsuite/gas/all/itbl
+382da5059713a0eb1ca0f7a012d9568a  gas/testsuite/gas/all/itbl-test.c
+0a1bc24fd58a8e10476fda0bd5b649ed  gas/testsuite/gas/all/itbl.s
+69bd077c208114555791fb58d4909e98  gas/testsuite/gas/all/octa.d
+495bc721e5af37eafc554b7db83506ef  gas/testsuite/gas/all/octa.s
+b61a6aca515ae31b7be7abda0a152bbc  gas/testsuite/gas/all/p1480.s
+530c3d83c5129c3823692574ff0b07b8  gas/testsuite/gas/all/p2425.s
+20f3d4b257a6efde0445b30b3a02ec98  gas/testsuite/gas/all/quad.d
+94daa7db7daabe1c947773877445172e  gas/testsuite/gas/all/quad.s
+05ad0ca5a64fc9c53152de996bcfb72e  gas/testsuite/gas/all/redef.d
+15dc09b212a01e4b4548748f80ddd95e  gas/testsuite/gas/all/redef.s
+3fd90724c589e390efc701a02af7d3a8  gas/testsuite/gas/all/redef2.d
+b2d210c45393fceb3d931963339d88ff  gas/testsuite/gas/all/redef2.s
+e76a753bf2534357fea9b078ef669a99  gas/testsuite/gas/all/redef3.d
+ffc65f2fa231239465e4f8a7a5f426c3  gas/testsuite/gas/all/redef3.s
+3f3ef7827846424857bf668b4579f90b  gas/testsuite/gas/all/redef4.s
+309d8b7519fa095a1057a32e1947daf7  gas/testsuite/gas/all/redef5.s
+11d49bd9ae2b0f109c94e48fcf851dda  gas/testsuite/gas/all/relax.d
+34fd596eed3825011e6bf9eeedbd85b8  gas/testsuite/gas/all/relax.s
+f87cdc714e46c3d392bb5ace50f5089d  gas/testsuite/gas/all/sleb128.d
+18b960297606054a20f63aa891b7e12a  gas/testsuite/gas/all/sleb128.s
+665502eb0715d91cc960000b623b5f6e  gas/testsuite/gas/all/string.d
+936648e9d1203b9af3233aec673dd9f3  gas/testsuite/gas/all/string.s
+856ac38b9fe37e63d8173f9299961115  gas/testsuite/gas/all/struct.d
+0b2dc0f909d4928a8de943eade54a345  gas/testsuite/gas/all/struct.s
+c1c61584f5902f8d3f424c7c0ab625a7  gas/testsuite/gas/all/test-example.c
+3016ff2229f0cc0ba9e8d952f0cff925  gas/testsuite/gas/all/test-gen.c
+c306f31d167824da1c6b8a24af1af24e  gas/testsuite/gas/all/warn-1.s
+2cb2ab1bd254a01075f23574bcf76cab  gas/testsuite/gas/all/weakref1.d
+2ecea24bd25e45a5b2408288c88922bb  gas/testsuite/gas/all/weakref1.s
+1bfe06f39639f91ea299f15721ff1410  gas/testsuite/gas/all/weakref1g.d
+15be263b669e47327b0ffb9dd01a5001  gas/testsuite/gas/all/weakref1l.d
+54478035dc75589d7990b5cadb636632  gas/testsuite/gas/all/weakref1u.d
+240460ab5e8b7dbfc5d24fcd1d02a76c  gas/testsuite/gas/all/weakref1w.d
+7a2be682df8fc9718f6195658ba1c976  gas/testsuite/gas/all/weakref2.s
+5c3a5451b98a5cfb6c3bec7bc1710139  gas/testsuite/gas/all/weakref3.s
+c244658794f4e2eb27251ec5207b9292  gas/testsuite/gas/all/weakref4.s
+8ba076a868d6d446a4ab1462add54fd3  gas/testsuite/gas/all/x930509.s
+61127e9f70926fe0c0e56a9f2f957051  gas/testsuite/gas/alpha/alpha.exp
+879aa3491dccb8faf8dba627014571e5  gas/testsuite/gas/alpha/auto-align-1.d
+0d60fd9478e783fcfe67951e4ef64d36  gas/testsuite/gas/alpha/auto-align-1.s
+7caf94f0e5c9ee4a654de71ef7acde09  gas/testsuite/gas/alpha/elf-reloc-1.d
+542ba778a8026db8d3b82d45c828970f  gas/testsuite/gas/alpha/elf-reloc-1.s
+44bc975cf505fc614b902b6d05a8cb27  gas/testsuite/gas/alpha/elf-reloc-2.l
+498dd06c38f62a854337eb6e0629f562  gas/testsuite/gas/alpha/elf-reloc-2.s
+8e926ed54e1cfadbf6d620943fe14e9e  gas/testsuite/gas/alpha/elf-reloc-3.l
+cd44e5cf1cf5d7f57c32d759623c16a5  gas/testsuite/gas/alpha/elf-reloc-3.s
+48dca0e100904fd0f5f780221a50e391  gas/testsuite/gas/alpha/elf-reloc-4.d
+bda565c218e80afced8a22ce13e68afa  gas/testsuite/gas/alpha/elf-reloc-4.s
+57d530cc16154b40cdafe2bd35f5fa9f  gas/testsuite/gas/alpha/elf-reloc-5.d
+280fd64660c31ce16cb67a670c130308  gas/testsuite/gas/alpha/elf-reloc-5.s
+337378bf9bcfd622880b55f609cc2d82  gas/testsuite/gas/alpha/elf-reloc-6.l
+f1db0194e78ed6ca547be0ce865e6bb9  gas/testsuite/gas/alpha/elf-reloc-6.s
+ee3c5cca44cbbc8648d233bb9f47f386  gas/testsuite/gas/alpha/elf-reloc-7.d
+9fa3e0a0d38d10c4591002d2a23874e4  gas/testsuite/gas/alpha/elf-reloc-7.s
+5df5463b0a34e0632baddcfebccd5e2e  gas/testsuite/gas/alpha/elf-reloc-8.d
+14ae8981371d4189a9fa78cc86541e42  gas/testsuite/gas/alpha/elf-reloc-8.s
+d9c79c31b22f9f59222c8407686d17bf  gas/testsuite/gas/alpha/elf-tls-1.d
+d3120aefa9f3d74f9a50d96702acb389  gas/testsuite/gas/alpha/elf-tls-1.s
+175819424c6d7ea48da17c33b08145b7  gas/testsuite/gas/alpha/elf-tls-2.l
+46336ae3d40ac88a4f205247b4e36c93  gas/testsuite/gas/alpha/elf-tls-2.s
+ccc1bdfb6a205a1766cf1a6bcabb78fc  gas/testsuite/gas/alpha/elf-tls-3.l
+611202a8cd8fb1dfffbc7f8b9c15c22b  gas/testsuite/gas/alpha/elf-tls-3.s
+dd7ce23c42b5c75b7aaf68091e36ca89  gas/testsuite/gas/alpha/elf-usepv-1.d
+1ecd4c2c9c9f694a311b4018fb4cc630  gas/testsuite/gas/alpha/elf-usepv-1.s
+839b27fcfeb47671d83cc12070cc6538  gas/testsuite/gas/alpha/elf-usepv-2.l
+a89f678c13ee68633c71d6e4f74d7cd8  gas/testsuite/gas/alpha/elf-usepv-2.s
+64b455f29370bedb9edeadf7ad36c07a  gas/testsuite/gas/alpha/fp.d
+a81ea1f138f93fa0d561f5306bd22a4f  gas/testsuite/gas/alpha/fp.s
+af2181269d9de10984a7a36f3ce5e01d  gas/testsuite/gas/alpha/unop.d
+29fe0cde0ac8733c56f2ffef3a1651d4  gas/testsuite/gas/alpha/unop.s
+19197f29a6d87e3e78495e7a47ebf496  gas/testsuite/gas/arc/adc.d
+1b06ceb2288c093be970d894568fa5da  gas/testsuite/gas/arc/adc.s
+65084e57125295318062997e920c19af  gas/testsuite/gas/arc/add.d
+75e6baa15e0d53599edfd7ec770375b6  gas/testsuite/gas/arc/add.s
+4927747f607ee7be7bf50e7fd6ef02ee  gas/testsuite/gas/arc/alias.d
+54f01e033f0d248759b8fc6fb71a06db  gas/testsuite/gas/arc/alias.s
+b8a7885db402fc70652f0410a5820d50  gas/testsuite/gas/arc/and.d
+b8fce093a488f7b1c2e6418f7c31c9e3  gas/testsuite/gas/arc/and.s
+161e452c38e82897a52e50c6887e68df  gas/testsuite/gas/arc/arc.exp
+aa32ccad03a6d294726c0e58e6d2250a  gas/testsuite/gas/arc/asl.d
+af955c8cf38c553fa4221383c64b6b13  gas/testsuite/gas/arc/asl.s
+56384c65539866b6e7fc0a0a05eabce8  gas/testsuite/gas/arc/asr.d
+9887c6e68d8176e71d75b9d91604e914  gas/testsuite/gas/arc/asr.s
+5288b51666fdc9bb0c65a07671c3c9fd  gas/testsuite/gas/arc/b.d
+78b81ebb3355a47d5c478e1e56444ffb  gas/testsuite/gas/arc/b.s
+402522bfb20c4387e1faba27224186ac  gas/testsuite/gas/arc/bic.d
+ab22388e1552b8926d7b8960f9a6fe20  gas/testsuite/gas/arc/bic.s
+ec7abac24fa3c402b31f624a3ff9de77  gas/testsuite/gas/arc/bl.d
+e2c237cc25d1cfc82c9285818858e329  gas/testsuite/gas/arc/bl.s
+1a8de6cbd6b3c02a2a483c8cd6ce42a7  gas/testsuite/gas/arc/branch.d
+8432db29eb95c38348bb4216a28f43a4  gas/testsuite/gas/arc/branch.s
+1165c7d246f9e1a548af4c5b7f4e5f60  gas/testsuite/gas/arc/brk.d
+872c85cca67988958ef95591b4fecb7d  gas/testsuite/gas/arc/brk.s
+acf1eca3b061941ff367bba7654f8a2e  gas/testsuite/gas/arc/extb.d
+0ab2d9abcadcf93d9b6dd8eb0962d7ab  gas/testsuite/gas/arc/extb.s
+93872b12992b5d2775308c2541723a23  gas/testsuite/gas/arc/extensions.d
+8e15242e5c6b199128ef839f8fe14144  gas/testsuite/gas/arc/extensions.s
+cb8963efc4b0412d0cf5f6d2d4412d14  gas/testsuite/gas/arc/extw.d
+e66a84df62389472e90d215276e87384  gas/testsuite/gas/arc/extw.s
+53684f8cb4cc475d5632ffa22555b6c5  gas/testsuite/gas/arc/flag.d
+2b6e2dd0335ebc45bb694de8cc2f4c6b  gas/testsuite/gas/arc/flag.s
+dd35c9020fa1c43318beec05e9d63dd6  gas/testsuite/gas/arc/insn3.d
+c9f07db5b59a1a725b1cb520c7dfffe2  gas/testsuite/gas/arc/insn3.s
+6623a00a22962dfb1afcb24a2f8920bb  gas/testsuite/gas/arc/j.d
+7ee6358f55317d08d08f864238c78515  gas/testsuite/gas/arc/j.s
+431696fbe85080394483a455208af19c  gas/testsuite/gas/arc/jl.d
+4a56cf56903f8e4c25dd7865dd1a92df  gas/testsuite/gas/arc/jl.s
+56a1aeb2d239eb164bc0b0b3570a4d6c  gas/testsuite/gas/arc/ld.d
+3c857571689df36f20267c10d4eb72c0  gas/testsuite/gas/arc/ld.s
+4d7ba9b754c7afdba41dfec82239bc30  gas/testsuite/gas/arc/ld2.d
+28379656fb4f5c37963ed6991c582ed6  gas/testsuite/gas/arc/ld2.s
+af5c07a06b5ab10049b70efc03fe4310  gas/testsuite/gas/arc/lp.d
+657d876ad61daec2d6de3a4269bfeaf3  gas/testsuite/gas/arc/lp.s
+0b801348feff41c1625f9c681af122c5  gas/testsuite/gas/arc/lsr.d
+a9c2ebcafcfc68a8bb7014172813ee2c  gas/testsuite/gas/arc/lsr.s
+ae005c091f26b4ceac5b19e8c13d8835  gas/testsuite/gas/arc/math.d
+c632e7e9e19d65e75557a5e42d513905  gas/testsuite/gas/arc/math.s
+42cc6922491da263d6ab87fca2593794  gas/testsuite/gas/arc/mov.d
+5bbe3186d21f23263b4a3743cfb1c0e5  gas/testsuite/gas/arc/mov.s
+ff9e23ba171eb9fab4ae4bf71ca1964f  gas/testsuite/gas/arc/nop.d
+4b5a9a087212c040ef94e7cfc7c64113  gas/testsuite/gas/arc/nop.s
+c596ab98be90e4fcdb2e92e35e3ca66f  gas/testsuite/gas/arc/or.d
+a9984178263c3d2fdc55aa82c0850038  gas/testsuite/gas/arc/or.s
+152d55e75d6f7079d969d4582e98e32c  gas/testsuite/gas/arc/rlc.d
+7186c231f11739791f407f6ad9bfdfcd  gas/testsuite/gas/arc/rlc.s
+f67f42d8077195a9ed9da2cd3ff93889  gas/testsuite/gas/arc/ror.d
+0f4fa90aec1e6518392567bb89d7420f  gas/testsuite/gas/arc/ror.s
+cce2b1054c09a0d526bc548ea162dc6c  gas/testsuite/gas/arc/rrc.d
+2a33859e8d1450a314390aee1eed985c  gas/testsuite/gas/arc/rrc.s
+7d0b42fa66729b4df6f26c5daa47c6ee  gas/testsuite/gas/arc/sbc.d
+6d4e549168ccb7340e4c87d6c3ca9f06  gas/testsuite/gas/arc/sbc.s
+b0ae0aa5baea6246ee417710ad641653  gas/testsuite/gas/arc/sexb.d
+e3e0516272a27d4fdde6e78fcfc0beae  gas/testsuite/gas/arc/sexb.s
+753f0757cceff8d9fba7da206607b32c  gas/testsuite/gas/arc/sexw.d
+505c87905fe1b3b19909f4ff658880e8  gas/testsuite/gas/arc/sexw.s
+04e291c6c4227ad3ea068b33bcca2bee  gas/testsuite/gas/arc/sleep.d
+4b2c68f86079ddc3738d423a7d9286ec  gas/testsuite/gas/arc/sleep.s
+dd35c9020fa1c43318beec05e9d63dd6  gas/testsuite/gas/arc/sshift.d
+285d03daf381a393d3099a8ff7ad1b92  gas/testsuite/gas/arc/sshift.s
+5f8916d2369e1234cb10b4590db13ad9  gas/testsuite/gas/arc/st.d
+053f3bbfd1d148584af0a8152d94a93b  gas/testsuite/gas/arc/st.s
+e913933835012629d5199008027146f4  gas/testsuite/gas/arc/sub.d
+beca3fc3b72a58cc4eadd2369592d87f  gas/testsuite/gas/arc/sub.s
+f2c956a2c8d124cf6924a93a3b18641d  gas/testsuite/gas/arc/swi.d
+458a27c1ed4ecb3d834bc928af3a1969  gas/testsuite/gas/arc/swi.s
+ca575363e502545e2e5d2a6ab64c6af8  gas/testsuite/gas/arc/warn.exp
+0b65cbe50ce349cd49a0a24641241d3c  gas/testsuite/gas/arc/warn.s
+9020b43e63291859faac20e7065787d9  gas/testsuite/gas/arc/xor.d
+c1a790a7f1cc4e88b2235b226fae54b2  gas/testsuite/gas/arc/xor.s
+b6ee94bbf2780e2c24ebe268b9e3964d  gas/testsuite/gas/arm/abs12.d
+5d4b47a51fe92bb098297010d6ee2d12  gas/testsuite/gas/arm/abs12.s
+db659b6b27540d9316465b1f7e5ac2b9  gas/testsuite/gas/arm/addsw-bad.d
+82dc19e00945086993691c92b587faa3  gas/testsuite/gas/arm/addsw-bad.l
+079c301370561c6e6e981f81ceb66b79  gas/testsuite/gas/arm/addsw-bad.s
+4ef679f3641b0956ed83ba9cd9476c38  gas/testsuite/gas/arm/addthumb2err.d
+a784b42ea52c6aaa2e5b00d9bd8eb734  gas/testsuite/gas/arm/addthumb2err.l
+497e450fc0d6b17d11be385d97a06776  gas/testsuite/gas/arm/addthumb2err.s
+96aa9f595c2e975dbb093e3f28d7540d  gas/testsuite/gas/arm/adr-invalid.d
+6e268d80f9fe0d48bc5a6700a3fdfeed  gas/testsuite/gas/arm/adr-invalid.l
+abbb8901aa59685f604c221386d07186  gas/testsuite/gas/arm/adr-invalid.s
+12179a5c7ba40ddd7495c98be6679420  gas/testsuite/gas/arm/adrl.d
+ecbb507650db5ed7620314d5ca7a13e7  gas/testsuite/gas/arm/adrl.s
+a75692b7568cb2128679dbd5d13eb07e  gas/testsuite/gas/arm/align.d
+b43e7395b9caba63fe7c854672036d5f  gas/testsuite/gas/arm/align.s
+2ec620b70cb1d5e1d39714a2716820ef  gas/testsuite/gas/arm/align64.d
+9c1a82dac001eecac15d1101fcc4423e  gas/testsuite/gas/arm/align64.s
+37497ba60d9a44a935e8038094d3e9c3  gas/testsuite/gas/arm/arch4t-eabi.d
+933fbb0cbf2bfa51d2fe96183743a702  gas/testsuite/gas/arm/arch4t.d
+8ae0560f8be6f8f105a25e08d52d7921  gas/testsuite/gas/arm/arch4t.s
+4040cb5a638a281b3e0e66831c6ad6d0  gas/testsuite/gas/arm/arch5tej.d
+2f96d9641db7f61fb556c70c266efde7  gas/testsuite/gas/arm/arch5tej.s
+06095b99c1fe7b15a2e7f4e2d4d68fb4  gas/testsuite/gas/arm/arch6zk.d
+13ef791859fee922b2d2b2d02a468fb2  gas/testsuite/gas/arm/arch6zk.s
+754004fd4a023249bcadfa965d8feb38  gas/testsuite/gas/arm/arch7.d
+c0d3a679abf206a062b567c14d4a2488  gas/testsuite/gas/arm/arch7.s
+a307c42894f7d574e0b9b8179400c817  gas/testsuite/gas/arm/arch7a-mp.d
+f299d0db02f5148af1274d7b1acfa213  gas/testsuite/gas/arm/arch7ar-mp.s
+b6c97b686c175781e4e853d017c8d335  gas/testsuite/gas/arm/arch7em-bad.d
+f3bd6240c7b580e42201477ea88771cd  gas/testsuite/gas/arm/arch7em-bad.l
+98fa4d342db3f29a7a17b0f43498849b  gas/testsuite/gas/arm/arch7em.d
+581e41cc3b06a129704de3794db9e605  gas/testsuite/gas/arm/arch7em.s
+24fc10e3da6b7ef78f4b55ee0b0cc2e8  gas/testsuite/gas/arm/arch7m-bad.d
+b65df40b5f3e9bda2b19f6bf1fc5dfee  gas/testsuite/gas/arm/arch7m-bad.l
+4066147fea0f34e61ff20bb3953bbcf6  gas/testsuite/gas/arm/arch7m-bad.s
+121de08a231299eb3e817d7386edf5ee  gas/testsuite/gas/arm/arch7r-mp.d
+07fba8591068aa4bc4fba9b9f1aaed0a  gas/testsuite/gas/arm/archv6.d
+b78ab7111d67ca2b1dee92635b3a9fb9  gas/testsuite/gas/arm/archv6.s
+ca34df0a6bb2d547257d6c708341d4a8  gas/testsuite/gas/arm/archv6m.d
+98ea15f6d249e4773d2229e09a2f7516  gas/testsuite/gas/arm/archv6m.s
+6d4aa6cb100db3db9437424a4bce6fcd  gas/testsuite/gas/arm/archv6s-m-bad.d
+d2457d7858ddecb3d78f502f6561b010  gas/testsuite/gas/arm/archv6s-m-bad.l
+d28e54c54ab960d6f26f6ab679dec6b6  gas/testsuite/gas/arm/archv6s-m.d
+eee02ed70936d7bb837c21c90480dd6c  gas/testsuite/gas/arm/archv6s-m.s
+3223e9e789e7275d28af65a561ea4f07  gas/testsuite/gas/arm/archv6t2-bad.d
+a75344a06d3ba8340cfecd4a0b571ea8  gas/testsuite/gas/arm/archv6t2-bad.l
+f5dacfa0fcf2cb53a9fd091240ba1812  gas/testsuite/gas/arm/archv6t2-bad.s
+03a60bc117f358d33f56c57b05e588ce  gas/testsuite/gas/arm/archv6t2.d
+2bfee89072c1c2e798bde7bd4aa79c9a  gas/testsuite/gas/arm/archv6t2.s
+de3d7b25553b98eb142160c289a939de  gas/testsuite/gas/arm/arm-idiv-bad.d
+9a628b19a5dbebd1a55a9bf68cde1614  gas/testsuite/gas/arm/arm-idiv-bad.l
+a663bedc6462af4dab7527c4716a2f18  gas/testsuite/gas/arm/arm-idiv-bad.s
+d40ddbdcb2fbeaca0505b21f2153b67b  gas/testsuite/gas/arm/arm-idiv.d
+e312caaaa4cd32463ed61a3abaa71fff  gas/testsuite/gas/arm/arm-idiv.s
+4c258121b00b8b8e31f5fc106160768b  gas/testsuite/gas/arm/arm-it-auto-2.d
+9f5b000dd66bc7c0db553cb6ce6975e9  gas/testsuite/gas/arm/arm-it-auto-2.s
+138f287347c8ed8f01f0e7a77905dcd2  gas/testsuite/gas/arm/arm-it-auto-3.d
+291da626dfa21707c7fbd22d8fec0ad4  gas/testsuite/gas/arm/arm-it-auto-3.s
+a7c67b1b46b78cd4a635836487e30cbe  gas/testsuite/gas/arm/arm-it-auto.d
+ca845e1f677a847052f021f47accf21f  gas/testsuite/gas/arm/arm-it-auto.s
+d2a0cb15941b397e826744db6e57b539  gas/testsuite/gas/arm/arm-it-bad-2.d
+e7fba9b31f84364a16bcfe7cbab71d84  gas/testsuite/gas/arm/arm-it-bad-2.l
+68a16cb6422527dba38cdd88de01e695  gas/testsuite/gas/arm/arm-it-bad-2.s
+edd144194759d0962f3319228e9b48cf  gas/testsuite/gas/arm/arm-it-bad-3.d
+cc4d24f6d336534b6a1e95e551db5cba  gas/testsuite/gas/arm/arm-it-bad-3.l
+ca7b84f437267d5b13e2b12cc1ae54cf  gas/testsuite/gas/arm/arm-it-bad-3.s
+877b73b29ef4ad64c4fee10d4fa9e4ec  gas/testsuite/gas/arm/arm-it-bad.d
+d5aa4e588ce834c553a20942efe48603  gas/testsuite/gas/arm/arm-it-bad.l
+7e4022d4532c03e0c5cb53cec65d46db  gas/testsuite/gas/arm/arm-it-bad.s
+bae7c0e1fdf04658cdc1e41ddebd46a7  gas/testsuite/gas/arm/arm-it.d
+25071337ea823ccebc86e1552ea4fab7  gas/testsuite/gas/arm/arm-it.s
+d8370e411dfe323a14c671ac6f8ea3b0  gas/testsuite/gas/arm/arm.exp
+8144f94b7fcd31f21441e8953217ccdf  gas/testsuite/gas/arm/arm3-bad.d
+a7333c25d51cfb1d3071778778ededd9  gas/testsuite/gas/arm/arm3-bad.l
+2395435e948692459241f12cbfe49145  gas/testsuite/gas/arm/arm3-bad.s
+37fce175e5247e64b0a51485de338c9a  gas/testsuite/gas/arm/arm3.d
+15137137fbd80fde4552111cbb60d514  gas/testsuite/gas/arm/arm3.s
+5bdeeea8d914a577ca5d9a9cdc3c5872  gas/testsuite/gas/arm/arm6.d
+9f50b26c97c490fdf7b9eabff9978181  gas/testsuite/gas/arm/arm6.s
+55e5246013b06555f68dd4fbfb49954e  gas/testsuite/gas/arm/arm7-bad.d
+89b8f81e6edb1796a4a94ee97728f6e9  gas/testsuite/gas/arm/arm7-bad.l
+91c1460ae10fec6e4df3ddd08f8ecfbf  gas/testsuite/gas/arm/arm7-bad.s
+186f55175eea9818ccea79b9b3f0ec8c  gas/testsuite/gas/arm/arm7dm.d
+be6769c4582638a0a138ed06c26168b7  gas/testsuite/gas/arm/arm7dm.s
+752aefb5b36f970e207157c2feb64185  gas/testsuite/gas/arm/arm7t.d
+feaf27754d47f66044badeec38a0a215  gas/testsuite/gas/arm/arm7t.s
+563a746a696663b7084283c9e0af7a80  gas/testsuite/gas/arm/armv1-bad.d
+0c9b4e79a9913bf3b81c9d83b9cdaf4b  gas/testsuite/gas/arm/armv1-bad.l
+f2c6c508b3eea079bc2448b4e5cf4ecc  gas/testsuite/gas/arm/armv1-bad.s
+07f094e5883aacb59eaa5fdeb3cc4fb8  gas/testsuite/gas/arm/armv1.d
+3744f972effa598f45360d9b42e4a2d3  gas/testsuite/gas/arm/armv1.l
+f31a9037ea3ee4c5f7694a54d8c0246e  gas/testsuite/gas/arm/armv1.s
+78a13200ed91875264033ec7536da9d3  gas/testsuite/gas/arm/armv2-mp-bad.d
+4da5e2bdf60d3348e5b60c794b52788d  gas/testsuite/gas/arm/armv2-mp-bad.l
+fb828a5d097f6f7433923c95754d6150  gas/testsuite/gas/arm/armv7-a+idiv.d
+780afdeacd939d05ceffd163225d383d  gas/testsuite/gas/arm/armv7-a+idiv.s
+3a7bd1000ee1d0747bf818c8c5880af3  gas/testsuite/gas/arm/armv7-a+virt.d
+882955517e934e3ea6804e23836538df  gas/testsuite/gas/arm/armv7-a+virt.s
+541f06e01876973f108324d4c226e6d1  gas/testsuite/gas/arm/attr-cpu-directive.d
+fc6a0392fa077c3145088ec5b821f335  gas/testsuite/gas/arm/attr-cpu-directive.s
+fa3cb637faf7a084161a7fe69bedd151  gas/testsuite/gas/arm/attr-default.d
+fb04b73b1d9a4234da4983828806b008  gas/testsuite/gas/arm/attr-march-all.d
+63b0f5fcbd66dc6069e8cc6dc93991f3  gas/testsuite/gas/arm/attr-march-armv1.d
+cc61127046382229aa35b901418fc379  gas/testsuite/gas/arm/attr-march-armv2.d
+91f2a21b5ca1e423ff64e64f33160ac5  gas/testsuite/gas/arm/attr-march-armv2a.d
+63e21a67abaf2b4f295bd299b7f3b513  gas/testsuite/gas/arm/attr-march-armv2s.d
+a1fa198ed04605444741fb99d6f1c681  gas/testsuite/gas/arm/attr-march-armv3.d
+b53a9610847990bf5aa89f2ac51e1eec  gas/testsuite/gas/arm/attr-march-armv3m.d
+ed35d31f4596bc2cfe5e8ebaec50f425  gas/testsuite/gas/arm/attr-march-armv4.d
+ac0aba16b5be6111861562cbb4fe25bb  gas/testsuite/gas/arm/attr-march-armv4t.d
+9640e4cc7933f0b87c47bb15b358c374  gas/testsuite/gas/arm/attr-march-armv4txm.d
+bbfdd8f69dd7fd1a92d91572f9baecde  gas/testsuite/gas/arm/attr-march-armv4xm.d
+a57afdbada7eb59e41b48f84deb021c0  gas/testsuite/gas/arm/attr-march-armv5.d
+97b0e48a0e7a9bc4707868dde7e01e19  gas/testsuite/gas/arm/attr-march-armv5t.d
+051e92622b6070bb0ae24059d159549c  gas/testsuite/gas/arm/attr-march-armv5te.d
+ed499168c185050c4d0a7f37b036b031  gas/testsuite/gas/arm/attr-march-armv5tej.d
+94f21aa4318794e018e12f756166adc9  gas/testsuite/gas/arm/attr-march-armv5texp.d
+ab5abb426699cb28b7e646dee1638a0e  gas/testsuite/gas/arm/attr-march-armv5txm.d
+ae9e0983ded40838cef1a5eadbff7090  gas/testsuite/gas/arm/attr-march-armv6-m+os.d
+9eb6665a6e31af7178096e3e1b97048f  gas/testsuite/gas/arm/attr-march-armv6-m.d
+c708c05e4e91fe3fc22f77610265eee6  gas/testsuite/gas/arm/attr-march-armv6.d
+734dfd67708486d118585a08cf8d36af  gas/testsuite/gas/arm/attr-march-armv6j.d
+b0d2fa6ea1e90d04246dc8360937f629  gas/testsuite/gas/arm/attr-march-armv6k+sec.d
+e7d2d05ff5b8d8e4f4c4f2d15f766bc3  gas/testsuite/gas/arm/attr-march-armv6k.d
+72b9af3cd77fb0253f20d1938170cd0a  gas/testsuite/gas/arm/attr-march-armv6kt2.d
+9eb6665a6e31af7178096e3e1b97048f  gas/testsuite/gas/arm/attr-march-armv6s-m.d
+99266a6f30b75e2225db961971646277  gas/testsuite/gas/arm/attr-march-armv6t2.d
+7b6b73eb61e074af09192671ea3feb2b  gas/testsuite/gas/arm/attr-march-armv6z.d
+a4bcf60e13c0518ca9b75d89d538249e  gas/testsuite/gas/arm/attr-march-armv6zk.d
+1df728cc2ef805f9732475ea016b1a11  gas/testsuite/gas/arm/attr-march-armv6zkt2.d
+cd3a7b8b6a92bbaf7155d8872fe0b683  gas/testsuite/gas/arm/attr-march-armv6zt2.d
+3fbe27dfe92d3836010f5d8f5ef83063  gas/testsuite/gas/arm/attr-march-armv7-a+idiv.d
+9345aecc05f39d01090ce9238d5dd56b  gas/testsuite/gas/arm/attr-march-armv7-a+mp.d
+722991776f4414db2f3d783310fc9604  gas/testsuite/gas/arm/attr-march-armv7-a+sec+virt.d
+ab75e38ae385c86faee2b7d953cb3069  gas/testsuite/gas/arm/attr-march-armv7-a+sec.d
+cdcb7d80bb1cde93b82208e585eccbeb  gas/testsuite/gas/arm/attr-march-armv7-a+virt.d
+c648eae620c853cb4b64c86bd45f2f79  gas/testsuite/gas/arm/attr-march-armv7-a.d
+d3f89e05aff2b152463825c6e503b6fc  gas/testsuite/gas/arm/attr-march-armv7-m.d
+7c44ba44ecfcc0c1983adaedf9bb5549  gas/testsuite/gas/arm/attr-march-armv7-r+mp.d
+02c0c6eb6a1e48395bf58f85edbac8bc  gas/testsuite/gas/arm/attr-march-armv7-r.d
+eaec858c47ed42167f8bf2e89e22107e  gas/testsuite/gas/arm/attr-march-armv7.d
+4470e004187b572681718beb32c0f1db  gas/testsuite/gas/arm/attr-march-armv7a.d
+0f383a32e226d8dccef2e1c3e4971e18  gas/testsuite/gas/arm/attr-march-armv7em.d
+3eb27be5e93241b435ea922ef313b9d6  gas/testsuite/gas/arm/attr-march-armv7m.d
+292179a0c7aacbeeb1256f0a03dc6dd0  gas/testsuite/gas/arm/attr-march-armv7r.d
+fc3efe03cd1e86314fd81ed1a7fb8cf7  gas/testsuite/gas/arm/attr-march-iwmmxt.d
+f15a5caa02e46a2cde0f7a561c10a443  gas/testsuite/gas/arm/attr-march-iwmmxt2.d
+1406ef71f12ed0f9eb991520c5bda8b6  gas/testsuite/gas/arm/attr-march-xscale.d
+a30d929ac6001a5599b7f1d59dc48a15  gas/testsuite/gas/arm/attr-mcpu.d
+e4ed90abc4ecd6b11a6e37363cdd1384  gas/testsuite/gas/arm/attr-mfpu-arm1020e.d
+83e06b5ada461cd7809ff5868c911f76  gas/testsuite/gas/arm/attr-mfpu-arm1020t.d
+f481afac3c919b889fbe961a3cd719f0  gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d
+25ee69ad72fbe2160866de3c617394e0  gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d
+9974059745134094b759a1d2e9e89c20  gas/testsuite/gas/arm/attr-mfpu-arm7500fe.d
+fd27a1c611e63fcfc0ee697124e032b7  gas/testsuite/gas/arm/attr-mfpu-fpa.d
+57b7c41aa487cd21d16cdf220ed6d4f8  gas/testsuite/gas/arm/attr-mfpu-fpa10.d
+8f22c81f5f456373a96044c41267c310  gas/testsuite/gas/arm/attr-mfpu-fpa11.d
+f4f84519f6dcbf2930d26f5f3697369f  gas/testsuite/gas/arm/attr-mfpu-fpe.d
+0aac60ebb5e8a73ad605d45b33466929  gas/testsuite/gas/arm/attr-mfpu-fpe2.d
+c31c8c86be779952692afb539a767b47  gas/testsuite/gas/arm/attr-mfpu-fpe3.d
+575331c0545d8fdf02933c810ac51f0f  gas/testsuite/gas/arm/attr-mfpu-maverick.d
+c7385e6a22effd2a55f1839bc92f98ae  gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d
+1bff0d55596ed950f222803a72ab92ba  gas/testsuite/gas/arm/attr-mfpu-neon.d
+3262a3d64b64a047f2bc1189847c3bf1  gas/testsuite/gas/arm/attr-mfpu-softfpa.d
+9df122a5f7706a32852fca235ed7da0f  gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d
+6ce1481a36913cea549ade7f8b45df26  gas/testsuite/gas/arm/attr-mfpu-softvfp.d
+6c0f3c9f6bcf4d143312f9a5cea965ac  gas/testsuite/gas/arm/attr-mfpu-vfp.d
+5e0e7737770429ecfa4d63b7d49aab46  gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d
+7fca3ad527115fd92f98bfa7cce285dd  gas/testsuite/gas/arm/attr-mfpu-vfp10.d
+a5fbea5e73ca65aaf9f740afdd2bad5e  gas/testsuite/gas/arm/attr-mfpu-vfp3.d
+cdf5a36f3b217983f417ebdc3a1690d5  gas/testsuite/gas/arm/attr-mfpu-vfp9.d
+832bf9c511f1c57130382dc12241438a  gas/testsuite/gas/arm/attr-mfpu-vfpv2.d
+1a4e953ccba7bfbbf6bc5f5ba785c4ce  gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d
+a061b79bf0f48c6c29ef6eacf3959b03  gas/testsuite/gas/arm/attr-mfpu-vfpv3.d
+197eddee7225ddd7c49fadb08ac2af74  gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d
+a68615abbe6ebf856b481a518f07e952  gas/testsuite/gas/arm/attr-mfpu-vfpv4.d
+61af23e3c095f453e6a4af100b9e84ee  gas/testsuite/gas/arm/attr-mfpu-vfpxd.d
+030c55b4c16b9aae8b3b6085ff53ffa9  gas/testsuite/gas/arm/attr-names.d
+ede62cfb601f53acff505eb51ae3b71c  gas/testsuite/gas/arm/attr-names.s
+267846050222f0109969dc7754265517  gas/testsuite/gas/arm/attr-order.d
+7e50d4600f311abf7cfc8d140b8848df  gas/testsuite/gas/arm/attr-order.s
+81055a8a658f4820d79c34a626864006  gas/testsuite/gas/arm/attr-override-cpu-directive.d
+3e0c9c401d47612961eb7e586be30c68  gas/testsuite/gas/arm/attr-override-cpu-directive.s
+66605596219f9d2d2612462c36e91a8c  gas/testsuite/gas/arm/attr-override-mcpu.d
+11ca779d16cb9160d46a1b1c2d78f048  gas/testsuite/gas/arm/attr-override-mcpu.s
+1c96859328f0906342653fc31a296198  gas/testsuite/gas/arm/attr-syntax.d
+eba3a515fefda58b152eb5da32e9c118  gas/testsuite/gas/arm/attr-syntax.s
+3d673a7cd8ce5c7d9a81c7d77c1cf492  gas/testsuite/gas/arm/backslash-at.d
+19dbb71962cdc1a1cc2956e10ea0e088  gas/testsuite/gas/arm/backslash-at.s
+03b8acb9ec7015d82d4e1f7c65d17cef  gas/testsuite/gas/arm/barrier-bad-thumb.d
+0c497896b96b9bc85448e068e0797696  gas/testsuite/gas/arm/barrier-bad-thumb.l
+9e1b8e33ef6f57f4235c96bf2c3fef6f  gas/testsuite/gas/arm/barrier-bad-thumb.s
+84759cddca9e59c2a14260af33c922e3  gas/testsuite/gas/arm/barrier-bad.d
+8359d13f1e7e2c543c86d477fb527fb2  gas/testsuite/gas/arm/barrier-bad.l
+c8304cea5cd0881c7328c1e0030091e6  gas/testsuite/gas/arm/barrier-bad.s
+faa76c01bc8d09471ea97ab43ffa5c96  gas/testsuite/gas/arm/barrier-thumb.d
+9856fdfeac538f010e78bb07ca9af627  gas/testsuite/gas/arm/barrier-thumb.s
+66f63ac197796c6bfb8c61d92a4555b8  gas/testsuite/gas/arm/barrier.d
+053b4ac1535e3fb5ad6b8cf849ddd95b  gas/testsuite/gas/arm/barrier.s
+233af5c2872f271ed24f36379bfb2cde  gas/testsuite/gas/arm/bignum1.d
+08269632d864fb311787d7c196186ac6  gas/testsuite/gas/arm/bignum1.s
+376a039bac61bd92ae468ba5fed33bb5  gas/testsuite/gas/arm/bl-local-v4t.d
+e59eb4b037d361fe5f48e44b495bd373  gas/testsuite/gas/arm/bl-local-v4t.s
+1632d9677c2b9800feac355724a3d9dc  gas/testsuite/gas/arm/blank.s
+9804b9f9e6ef10da5c59b8fb4d4a45b1  gas/testsuite/gas/arm/blx-bad.d
+0ab8f09787955cd9db7cade3ffa39ae6  gas/testsuite/gas/arm/blx-bad.s
+dede5ad56b863e00e38ff1d45d9130d4  gas/testsuite/gas/arm/blx-local-thumb.l
+50af86ab9b358feed8d802d758d1d830  gas/testsuite/gas/arm/blx-local.d
+849e424049e3d10e64e125f2e370f822  gas/testsuite/gas/arm/blx-local.l
+ff4cfc84703ae62368d353c3dd637989  gas/testsuite/gas/arm/blx-local.s
+1905b4a656a3bc94ed7c9a3c70ece91f  gas/testsuite/gas/arm/branch-reloc.d
+30a90f3df22295b76fd0d6c07a6bf602  gas/testsuite/gas/arm/branch-reloc.l
+ca024a3bc15ec962ca2183508ed14cbe  gas/testsuite/gas/arm/branch-reloc.s
+8c853e4ab689f0984f480b2ef90ed7be  gas/testsuite/gas/arm/copro.d
+885afce47943c3260e90f272e3ca9d7d  gas/testsuite/gas/arm/copro.s
+8b6f864d90b4689f2774bf64c2c35347  gas/testsuite/gas/arm/depr-swp.d
+86501b7c6a9f0a188a2ade55860d4e41  gas/testsuite/gas/arm/depr-swp.l
+a9b7b7c228a4e455b367f46f6d1c513f  gas/testsuite/gas/arm/depr-swp.s
+2eff9e4757131f1caf54b7a17d810148  gas/testsuite/gas/arm/dis-data.d
+3c2bbd856a542eecaa9c1d9da5274465  gas/testsuite/gas/arm/dis-data.s
+3e1ab583e626568568bbe18f0f41c06e  gas/testsuite/gas/arm/dis-data2.d
+4fe3a1cb919bdb5cc446e4677f02906e  gas/testsuite/gas/arm/dis-data2.s
+39f6a2095349080171660f609e57619e  gas/testsuite/gas/arm/dis-data3.d
+88147f4bb308accf954ed1bc63bd6ec2  gas/testsuite/gas/arm/dis-data3.s
+6dc7105413632ace07999564934492d8  gas/testsuite/gas/arm/eabi_attr_1.d
+aecf4a96b2a97e461607c81dfe0751de  gas/testsuite/gas/arm/eabi_attr_1.s
+f8d9340f61f2fdb2bd272e744c4f0942  gas/testsuite/gas/arm/el_segundo.d
+f6b90cae6af764a8e5bf09eac5e3661c  gas/testsuite/gas/arm/el_segundo.s
+0c77a6a3842652ddcb0c68991a005c49  gas/testsuite/gas/arm/float.d
+2e5a285cf87efbbc0d49c33a6148766f  gas/testsuite/gas/arm/float.s
+9177cdd8a4fdca4319bb40da69225b1e  gas/testsuite/gas/arm/fp-save.d
+d4c95e405fbe0aa44ce5d25c653c8132  gas/testsuite/gas/arm/fp-save.s
+496ad498510e325f684023a10725afda  gas/testsuite/gas/arm/fpa-dyadic.d
+c9e2422c9042c8e48eb52239a357011e  gas/testsuite/gas/arm/fpa-dyadic.s
+40f2c330b41c6beb779d8e91016844ca  gas/testsuite/gas/arm/fpa-mem.d
+52472e5003c4d5792b2b9337482d0bba  gas/testsuite/gas/arm/fpa-mem.s
+a02c05e2d4ee9c5b17b5674d6ffa4b9c  gas/testsuite/gas/arm/fpa-monadic.d
+25450ea0b9caf1d0a58522156f083d7f  gas/testsuite/gas/arm/fpa-monadic.s
+25052a4649e2369f3db0f2e4d3bc5fb1  gas/testsuite/gas/arm/got_prel.d
+adf77b53329675daba18c16e17a6520d  gas/testsuite/gas/arm/got_prel.s
+81063c8368dfd8cab51d3b6c2c5504e4  gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.d
+3c1de613f6fd70c6cb782fc4cfb360bc  gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.l
+a50480226cbe9dc31083468a3871d44c  gas/testsuite/gas/arm/group-reloc-alu-encoding-bad.s
+c1e41a71bab8330f1b0002b1ac8746e4  gas/testsuite/gas/arm/group-reloc-alu-parsing-bad.d
+f31bd62f5be6c7689096ee8ee597846a  gas/testsuite/gas/arm/group-reloc-alu-parsing-bad.l
+8e6f3055e4e856d4f5089b8bd32d0d96  gas/testsuite/gas/arm/group-reloc-alu-parsing-bad.s
+8c10ec7b4769272b544aa7d4a19a2221  gas/testsuite/gas/arm/group-reloc-alu.d
+322f8bd2f59eafc92f61844579d1825c  gas/testsuite/gas/arm/group-reloc-alu.s
+96706c8bc19671f7fb05d1804d432728  gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.d
+0a38c63c4ff9883fcb74b046bf4ef2d8  gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.l
+b51e0a85a2968c0874dd84d70ccc7e98  gas/testsuite/gas/arm/group-reloc-ldc-encoding-bad.s
+2e58ab14323fdd088bb5bef0d3a0a903  gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.d
+4095b26ed8e712819b13b4df2398189a  gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.l
+a25ae4630bcfe59c637696af6854d906  gas/testsuite/gas/arm/group-reloc-ldc-parsing-bad.s
+8725f1debe93e13fbfbf2e35e35ee293  gas/testsuite/gas/arm/group-reloc-ldc.d
+e6269dc8201bbc0d7536d63bfc004391  gas/testsuite/gas/arm/group-reloc-ldc.s
+fbcc0b9865a919e2e396b609a38b3140  gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.d
+fd7ae9bc38ba6e3c6124177067dcc11f  gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.l
+5d039ff31e397f54d48d6657301ddaba  gas/testsuite/gas/arm/group-reloc-ldr-encoding-bad.s
+817f41a953364ac010a948905bc55a2b  gas/testsuite/gas/arm/group-reloc-ldr-parsing-bad.d
+8d4a698306b20055783bce14acc999b4  gas/testsuite/gas/arm/group-reloc-ldr-parsing-bad.l
+ddad24055724b08d0b2ad0602eeb085a  gas/testsuite/gas/arm/group-reloc-ldr-parsing-bad.s
+eb70b1e4a002a36f162e5b012444ff22  gas/testsuite/gas/arm/group-reloc-ldr.d
+9470afbf4d15b3e6eda76240e041464b  gas/testsuite/gas/arm/group-reloc-ldr.s
+730f22bb1b759b38fff45191ac10099b  gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.d
+889183bdab1e768427f23e6054a095b6  gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.l
+eb42221f52e86619ffd816975935414d  gas/testsuite/gas/arm/group-reloc-ldrs-encoding-bad.s
+eb9637b1b579d11e322701fa993eb5bd  gas/testsuite/gas/arm/group-reloc-ldrs-parsing-bad.d
+d52a6c83b28c7c5fe61929262035663a  gas/testsuite/gas/arm/group-reloc-ldrs-parsing-bad.l
+99ea8d19fecacf0ac69265933fdc9b7b  gas/testsuite/gas/arm/group-reloc-ldrs-parsing-bad.s
+b3c6f63fd853c217c54d4ecab932a357  gas/testsuite/gas/arm/group-reloc-ldrs.d
+e1adac14a163b6c09a57e5e540610c59  gas/testsuite/gas/arm/group-reloc-ldrs.s
+5e84e674be839da4944a89a6d0b43d0f  gas/testsuite/gas/arm/half-prec-neon.d
+671c6b51557ad268f30b813b355fd1fb  gas/testsuite/gas/arm/half-prec-neon.s
+c411716b53a01dd989ea7ba06c94db33  gas/testsuite/gas/arm/half-prec-psyntax.d
+67400d0f9dcc456dde55b93afc15852b  gas/testsuite/gas/arm/half-prec-psyntax.s
+b638d628916e6ec7e535db106186a0ac  gas/testsuite/gas/arm/half-prec-vfpv3.d
+33a0c3375a31232569556ef4bb009327  gas/testsuite/gas/arm/half-prec-vfpv3.s
+9bcdb2621a218c5c985acd6ee22dc539  gas/testsuite/gas/arm/immed.d
+6b615b131eba5ce2972ceb7452ffcf46  gas/testsuite/gas/arm/immed.s
+9d5b58d931515aa3712ea07723cb7ef6  gas/testsuite/gas/arm/insn-error-a.d
+86fc6b9d858e7d60045ec235e5633360  gas/testsuite/gas/arm/insn-error-a.l
+78ba3194cd769394c50d38358ce909db  gas/testsuite/gas/arm/insn-error-a.s
+a8cf1c4ccc5e140c62ace2674871a087  gas/testsuite/gas/arm/insn-error-t.d
+05938042b303717249601e3d0fc5f888  gas/testsuite/gas/arm/insn-error-t.l
+e1cface84f4bb1ab52fba3267edfd23a  gas/testsuite/gas/arm/insn-error-t.s
+4314753a593a8f8569c706850062f917  gas/testsuite/gas/arm/inst-po-2.d
+948a45af9eb40c1b116c7019e3746a3d  gas/testsuite/gas/arm/inst-po-2.l
+dc784af9b0779c44cfa0e66530550491  gas/testsuite/gas/arm/inst-po-2.s
+2fd671853f73474877a75842379f9fa0  gas/testsuite/gas/arm/inst-po-3.d
+c6fff8965f439fed5799239955763fb7  gas/testsuite/gas/arm/inst-po-3.s
+354c60051fefa7b07f7afcab0bafa57a  gas/testsuite/gas/arm/inst-po-be.d
+470252007be8fe8ca94883b7038d29e2  gas/testsuite/gas/arm/inst-po.d
+b431e65441371eaa623711974386efbd  gas/testsuite/gas/arm/inst-po.s
+18a51073b0babf23b798fb78f28d61fd  gas/testsuite/gas/arm/inst.d
+349fa5f51ab1c1f651b57e3f0ea01bc5  gas/testsuite/gas/arm/inst.s
+816fc29be5cded0d14ec4c91f41aae11  gas/testsuite/gas/arm/itblock.s
+a4d10ec00b5b2d3bd9e0fd9079586d5d  gas/testsuite/gas/arm/iwmmxt-bad.d
+daa0e8793b6d0f7a623982b72d481cdb  gas/testsuite/gas/arm/iwmmxt-bad.l
+0867271152e5ddc12f99cd30be0bcaac  gas/testsuite/gas/arm/iwmmxt-bad.s
+97be31587023ec827b51c6d7ca8e8c3f  gas/testsuite/gas/arm/iwmmxt-bad2.d
+9623aa2f5b29fce8cf1c5b3bffad538d  gas/testsuite/gas/arm/iwmmxt-bad2.l
+0a9b840ecb8d92d33f3fad2172941b36  gas/testsuite/gas/arm/iwmmxt-bad2.s
+f43ad375f120bfa6442c845e08f48798  gas/testsuite/gas/arm/iwmmxt-wldsttbh.d
+fcd9558879996d3702cca14dfbd7b1c2  gas/testsuite/gas/arm/iwmmxt-wldsttbh.s
+07b01bf770dbf7aacf53c7f75486390d  gas/testsuite/gas/arm/iwmmxt.d
+18ef0fae53b1ae71010419104c5eaaa6  gas/testsuite/gas/arm/iwmmxt.s
+a954076b91c04e0a3a1f0d4345ee9dc8  gas/testsuite/gas/arm/iwmmxt2.d
+b6a943febc4facd9e1afe4fa4571c946  gas/testsuite/gas/arm/iwmmxt2.s
+c24d721909407cb044c8e769590ccfa2  gas/testsuite/gas/arm/ld-sp-warn-cortex-m3.d
+7b950dcc29225e439d0b595a80c79d3a  gas/testsuite/gas/arm/ld-sp-warn-cortex-m3.l
+67dc25ceee7eb17c2aea58410a64e749  gas/testsuite/gas/arm/ld-sp-warn-cortex-m4.d
+7b950dcc29225e439d0b595a80c79d3a  gas/testsuite/gas/arm/ld-sp-warn-cortex-m4.l
+6de11a5b58a4668e3471a70e29905de2  gas/testsuite/gas/arm/ld-sp-warn-v7.d
+7b950dcc29225e439d0b595a80c79d3a  gas/testsuite/gas/arm/ld-sp-warn-v7.l
+78e4de149f463ea430f168956c4d52aa  gas/testsuite/gas/arm/ld-sp-warn-v7a.d
+f77cb8d2d15aadd8085a43297cf69873  gas/testsuite/gas/arm/ld-sp-warn-v7a.l
+7b950dcc29225e439d0b595a80c79d3a  gas/testsuite/gas/arm/ld-sp-warn-v7e-m.l
+7d3b9164add42b6e99a821b975dd2203  gas/testsuite/gas/arm/ld-sp-warn-v7em.d
+5ac7b7bd60e7846be41fc8de4649d42c  gas/testsuite/gas/arm/ld-sp-warn-v7m.d
+7b950dcc29225e439d0b595a80c79d3a  gas/testsuite/gas/arm/ld-sp-warn-v7m.l
+0fa4be58d3839f9236503f22605b93a9  gas/testsuite/gas/arm/ld-sp-warn-v7r.d
+f77cb8d2d15aadd8085a43297cf69873  gas/testsuite/gas/arm/ld-sp-warn-v7r.l
+47f606afeb12c4870368c4d4f9703f42  gas/testsuite/gas/arm/ld-sp-warn.d
+7b950dcc29225e439d0b595a80c79d3a  gas/testsuite/gas/arm/ld-sp-warn.l
+793e9588d044f6b38d86fff098dbccc6  gas/testsuite/gas/arm/ld-sp-warn.s
+d187d857a39b9eb1481ab1d06b1e33cd  gas/testsuite/gas/arm/ldconst.d
+ee73fefc2ff67c1f78695ecfb1e38450  gas/testsuite/gas/arm/ldconst.s
+0cf72f9deff31d281b0688b1c51299cb  gas/testsuite/gas/arm/ldr-global.d
+319d68cf023fde2814a3d38caf5a885a  gas/testsuite/gas/arm/ldr-global.s
+21364225f78254b49e7b7a4f17b167bf  gas/testsuite/gas/arm/ldrd-unpredictable.d
+7b3523400eda6b7484d0cd117e593228  gas/testsuite/gas/arm/ldrd-unpredictable.l
+8b2cbf9d4cc96cacf061d0f4474c1e34  gas/testsuite/gas/arm/ldrd-unpredictable.s
+7dabea78544bbb60309b1361fb10e37b  gas/testsuite/gas/arm/ldst-offset0.d
+78beecc505302906be4d478b85d739d1  gas/testsuite/gas/arm/ldst-offset0.s
+8e4e0b15e93a95859b21dde0b25dde4c  gas/testsuite/gas/arm/ldst-pc.d
+f179f690e48f680a8faec8acfe29e71f  gas/testsuite/gas/arm/ldst-pc.s
+1068e8b7a4dcba95cc284038938995ee  gas/testsuite/gas/arm/le-fpconst.d
+01ece05c7a31cb680e04d26a1f7dc281  gas/testsuite/gas/arm/le-fpconst.s
+9819f0435c0c870c8d4da2c16f9c19c2  gas/testsuite/gas/arm/local_function.d
+b455c8e8b4fc02b0b05496d453636d4b  gas/testsuite/gas/arm/local_function.s
+d70f655ff516d305a0992587c4ef9f5e  gas/testsuite/gas/arm/local_label_coff.d
+d14693fceec9906fb4515a0a2255dd3c  gas/testsuite/gas/arm/local_label_coff.s
+4335b82228ceb5129fd7f4273a50393c  gas/testsuite/gas/arm/local_label_elf.d
+6355a44b26e941909f08add117d12aef  gas/testsuite/gas/arm/local_label_elf.s
+0f5de36e674295930c09c998d4ab690b  gas/testsuite/gas/arm/local_label_wince.d
+6355a44b26e941909f08add117d12aef  gas/testsuite/gas/arm/local_label_wince.s
+2bdc7db375674bbd8c962f77c48273df  gas/testsuite/gas/arm/macro1.d
+f94f70714509c698a85f5bfe10dfc5ae  gas/testsuite/gas/arm/macro1.s
+e9aaf90da625f89cd911838e6530e8d3  gas/testsuite/gas/arm/mapdir.d
+465d0a414219012deb1286bf3a46c4ef  gas/testsuite/gas/arm/mapdir.s
+e27d4c340486991879dfa8aa7af571e6  gas/testsuite/gas/arm/mapmisc.d
+9143f4e8bb70c861dcdb22bb9374e909  gas/testsuite/gas/arm/mapmisc.dat
+26b67f2c3bd2569781f276c35c952814  gas/testsuite/gas/arm/mapmisc.s
+92d78ef68895b83f71bbdf4a6afd00dd  gas/testsuite/gas/arm/mapping.d
+b774e08295a0b1ad5b5571f00899b7c1  gas/testsuite/gas/arm/mapping.s
+20220f50cd5168155e8365645a681a19  gas/testsuite/gas/arm/mapping2.d
+476e62a83b24f546978c98500d9829f2  gas/testsuite/gas/arm/mapping2.s
+284d574bec8097e4c941b9ac065dd5af  gas/testsuite/gas/arm/mapping3.d
+dadc1f13b9721b97d37af5ae0fc2f277  gas/testsuite/gas/arm/mapping3.s
+7a947fbd5cc094336fefbcacee93f84e  gas/testsuite/gas/arm/mapping4.d
+87f3e53a18241b91aa9f2cd87a9a20a5  gas/testsuite/gas/arm/mapping4.s
+4ace6eb1a8e0e25e9877810b48c04a38  gas/testsuite/gas/arm/mapsecs.d
+def73f8262f150a831c8979059596787  gas/testsuite/gas/arm/mapsecs.s
+b7fe5a92a5ca41125668f60c493da6fc  gas/testsuite/gas/arm/mapshort-eabi.d
+bf0fcfb3cad05fb2f3596e968ed796a0  gas/testsuite/gas/arm/mapshort-elf.d
+18760336bebeee857996508148bb9dbd  gas/testsuite/gas/arm/mapshort.s
+124d543c4a1a0b5d9a4443bf623badf4  gas/testsuite/gas/arm/maverick.c
+c838211c7da60d6785efa38fbcab5d0f  gas/testsuite/gas/arm/maverick.d
+9733817e8baaf48af49d0ed3436c266d  gas/testsuite/gas/arm/maverick.s
+3eae809452a7e5020933be1912c2a139  gas/testsuite/gas/arm/missing.d
+4e5e9ef32c8f8085bd7604edb5b2fc83  gas/testsuite/gas/arm/missing.l
+988d5dfbf9639a19495aaf38b36fe41d  gas/testsuite/gas/arm/missing.s
+e316c8087a5734c802d718ccf7f36445  gas/testsuite/gas/arm/movw-local.d
+28e02b70f8f2150a3aa28084aa95caba  gas/testsuite/gas/arm/movw-local.s
+84615392c85d7406e8f3e4f3ccdc5385  gas/testsuite/gas/arm/mrs-msr-arm-v6.d
+5582ca092d910139096f6e784a6f9104  gas/testsuite/gas/arm/mrs-msr-arm-v6.s
+6f314f63a905dd252a1ffa63a0df8106  gas/testsuite/gas/arm/mrs-msr-arm-v7-a-bad.d
+9613827c7247508ed08c5a9e0ef82626  gas/testsuite/gas/arm/mrs-msr-arm-v7-a-bad.l
+e7f619829adde372edf6705e5583f2e0  gas/testsuite/gas/arm/mrs-msr-arm-v7-a-bad.s
+bf4626f1c8e2f9a5a95ca3ac2655c2e7  gas/testsuite/gas/arm/mrs-msr-arm-v7-a.d
+37decf43db393705954aedf765d8a731  gas/testsuite/gas/arm/mrs-msr-arm-v7-a.s
+ba06e835aed08d8f688a57a64270af3e  gas/testsuite/gas/arm/mrs-msr-thumb-v6t2.d
+c79b16465cbb552f966777db4be05b5f  gas/testsuite/gas/arm/mrs-msr-thumb-v6t2.s
+9a03994ab61bdb5108ffd3576a876b99  gas/testsuite/gas/arm/mrs-msr-thumb-v7-m-bad.d
+0798c38bb4f3640cacbc74b2a520924b  gas/testsuite/gas/arm/mrs-msr-thumb-v7-m-bad.l
+2de59464eb8191827437c7dc1a805ff5  gas/testsuite/gas/arm/mrs-msr-thumb-v7-m-bad.s
+6a0066095176e9b964b326f87d911e44  gas/testsuite/gas/arm/mrs-msr-thumb-v7-m.d
+02efdb26a8e03140267ae76985e97ea6  gas/testsuite/gas/arm/mrs-msr-thumb-v7-m.s
+6291a36c7f5a52bad759b912f8f9e1d7  gas/testsuite/gas/arm/mrs-msr-thumb-v7e-m.d
+4eb035fd2d7bcf31a2f250939dcc420c  gas/testsuite/gas/arm/mrs-msr-thumb-v7e-m.s
+6058e50be1984cb4f2b8335d7aa26043  gas/testsuite/gas/arm/msr-imm-bad.d
+5cc86bc37d674d6998eccd7d09e18fe1  gas/testsuite/gas/arm/msr-imm-bad.l
+d01c65524ef1105873380d5dad846f8a  gas/testsuite/gas/arm/msr-imm.d
+5cc38bc465b20586d9c07463f4902b5d  gas/testsuite/gas/arm/msr-imm.s
+e61a3696023e90145d275bf0a194b23c  gas/testsuite/gas/arm/msr-reg-bad.d
+379de63e81e79399fb07657d0aed60e9  gas/testsuite/gas/arm/msr-reg-bad.l
+e7a2d5823eca4708658b3d70c01a8f38  gas/testsuite/gas/arm/msr-reg-thumb.d
+c9e26f0d3d2c62175daeb1c6ac26b56f  gas/testsuite/gas/arm/msr-reg.d
+b1552a60b41600a63c1e968923081170  gas/testsuite/gas/arm/msr-reg.s
+11772836f59a495702695b6339fa3b9b  gas/testsuite/gas/arm/mul-overlap-v6.d
+07bda526d2fcbf45a932337f8e29bb57  gas/testsuite/gas/arm/mul-overlap-v6.s
+17fe4133ba0a85c2317831ffb24eeead  gas/testsuite/gas/arm/mul-overlap.d
+6c63bb3ee5fb4b78431f1317a5efcf74  gas/testsuite/gas/arm/mul-overlap.l
+3df6848b00e808f03b76dbd7e9a1c5ce  gas/testsuite/gas/arm/mul-overlap.s
+8e9ab4429f94a012cd267f99ac69ce36  gas/testsuite/gas/arm/neon-addressing-bad.d
+14f6d29877ea48e698e247b59efbcbef  gas/testsuite/gas/arm/neon-addressing-bad.l
+463003ace658b94c7c699ba21caf97aa  gas/testsuite/gas/arm/neon-addressing-bad.s
+10af148cf1ee84ed1a4108165d4ca8f4  gas/testsuite/gas/arm/neon-cond-bad-inc.s
+43280fbe920432be11fb289a2b472259  gas/testsuite/gas/arm/neon-cond-bad.d
+3571b5bf707f406f7576d69865e64524  gas/testsuite/gas/arm/neon-cond-bad.l
+ecfa5a8faacbcc2e01ab275cfc4efdca  gas/testsuite/gas/arm/neon-cond-bad.s
+83bd572087f8783edbe3d1534653eb1c  gas/testsuite/gas/arm/neon-cond-bad_t2.d
+def57c5740ea4531f07f3d31b2c6ddb3  gas/testsuite/gas/arm/neon-cond-bad_t2.s
+2fd46a301d1a952947f37884ba8f3a20  gas/testsuite/gas/arm/neon-cond.d
+8646f4f19a10fbd74846ebbfa837ef8d  gas/testsuite/gas/arm/neon-cond.s
+770e1ae53d7e86878755c333e414175b  gas/testsuite/gas/arm/neon-const.d
+d4a8874be00b937d6d6dca1870280bca  gas/testsuite/gas/arm/neon-const.s
+f8fcf3e00228f36e07ba178c6b0a1ff6  gas/testsuite/gas/arm/neon-cov.d
+f254fbc9f5f4924ab2d00e6d07d1e312  gas/testsuite/gas/arm/neon-cov.s
+49f9699d779171eab1b540d4ad5b7175  gas/testsuite/gas/arm/neon-fma-cov.d
+9503397bcd4a9ca5639ca36a4b242583  gas/testsuite/gas/arm/neon-fma-cov.s
+d6a975348697afc594f48b52b892b8db  gas/testsuite/gas/arm/neon-ldst-align-bad.d
+fd0e96b63c05dd5901918a9cabe1c4da  gas/testsuite/gas/arm/neon-ldst-align-bad.l
+655d7b07a2b3ad09ec2c2f73ef62c42f  gas/testsuite/gas/arm/neon-ldst-align-bad.s
+210f964a54bb8e56eb26150fbbfaf80d  gas/testsuite/gas/arm/neon-ldst-es.d
+c01517e689b7c6a3099d7e7374ec1c78  gas/testsuite/gas/arm/neon-ldst-es.s
+270689c14f1e09a1299f1aee6c42f8e2  gas/testsuite/gas/arm/neon-ldst-rm.d
+4735641e4572ac6285603230a2ab2a8b  gas/testsuite/gas/arm/neon-ldst-rm.s
+4641629ed10dd7a9cd8b5f6f3e364467  gas/testsuite/gas/arm/neon-logic.d
+ac7d622ce54d38f0c8af6c610a71d95f  gas/testsuite/gas/arm/neon-logic.s
+320af88493f5f00fca7702baaf713eb8  gas/testsuite/gas/arm/neon-omit.d
+bbe7f57d3fabe58d17d1ce4a0967add5  gas/testsuite/gas/arm/neon-omit.s
+8f82758d0beadda9e60befd90245b39f  gas/testsuite/gas/arm/neon-psyn.d
+3f378e58bd4cc94bcf47ab8639dcc786  gas/testsuite/gas/arm/neon-psyn.s
+68e69dda3b36f2d23614f7eb214b398b  gas/testsuite/gas/arm/neon-suffix-bad.d
+f359623bc30170386dd676a0d07e9d04  gas/testsuite/gas/arm/neon-suffix-bad.l
+23e7a1c60ea019c51f68e82b361684f9  gas/testsuite/gas/arm/neon-suffix-bad.s
+09c399798b6f6226bc9392701984d84d  gas/testsuite/gas/arm/noarm.d
+61d0f35fda0421e8e186264823772ccf  gas/testsuite/gas/arm/noarm.l
+d49f2e2e554e5254df9e6fcc3fdee549  gas/testsuite/gas/arm/noarm.s
+7919d24207a3acde2d7cf13b18c6a1ac  gas/testsuite/gas/arm/nomapping.d
+98619293650f7b518d3970d82a75702a  gas/testsuite/gas/arm/nomapping.s
+0155561984bac77cfe907a7166529d2a  gas/testsuite/gas/arm/offset-1.d
+0049c9a8b74b07c27b17d86bf286e53f  gas/testsuite/gas/arm/offset-1.s
+2fd68d8a359445574a3003262233736e  gas/testsuite/gas/arm/offset.d
+9e145924181e4df094b49e8f7408747b  gas/testsuite/gas/arm/offset.s
+1dd2705e6f363559a8906edb52cd3853  gas/testsuite/gas/arm/pic.d
+70da6cc98fe9db2ec3da4610ffa695b6  gas/testsuite/gas/arm/pic.s
+7ae6d895867864be78c46c5c71aaa044  gas/testsuite/gas/arm/pic_vxworks.d
+f08cd74620ff8ad2e87677969eb1934d  gas/testsuite/gas/arm/plt-1.d
+10c7bb0182b3ce4fe78482ba8637c3b9  gas/testsuite/gas/arm/plt-1.s
+c680ca444b19d490e7c12858000dbae1  gas/testsuite/gas/arm/pr12198-1.d
+e8db6b50e9fb5ccb7df673d67fb6c458  gas/testsuite/gas/arm/pr12198-1.s
+e2db89380e96cb8c2472aac8d5164853  gas/testsuite/gas/arm/pr12198-2.d
+1262c94cb87cf6c3cb6698383546d633  gas/testsuite/gas/arm/pr12198-2.s
+7d4d163463af6cf79192ecf628e50907  gas/testsuite/gas/arm/pr9722.d
+27f87bc2b727386cd6b95624efbee8fe  gas/testsuite/gas/arm/pr9722.s
+4f3ba7a55b325bf9dc76be29a6d4af52  gas/testsuite/gas/arm/r15-bad.d
+910d4a7c9bdd847365d82f1bce543e44  gas/testsuite/gas/arm/r15-bad.l
+e2af0cc3247b8aca95c4032caaf5a395  gas/testsuite/gas/arm/r15-bad.s
+d66f544c0118480c42bfa1ad12e3462b  gas/testsuite/gas/arm/reg-alias.d
+93863da4986b279dd10d2a60d366bccf  gas/testsuite/gas/arm/reg-alias.s
+f01377397912f2cedecaca64999eaaca  gas/testsuite/gas/arm/relax_branch_align.d
+ca63a1e30168e872a6b13b634ca29ff0  gas/testsuite/gas/arm/relax_branch_align.s
+2221765acd4d7efc589ab8b119dce715  gas/testsuite/gas/arm/relax_load_align.d
+2a7bb5938cb16f6928f3282254ce8fb4  gas/testsuite/gas/arm/relax_load_align.s
+f80b6ebb48a178284a8eb418c9a70da1  gas/testsuite/gas/arm/reloc-bad.d
+d0a219ab37022c81272ec727f7731dec  gas/testsuite/gas/arm/reloc-bad.l
+6f5d9b6a63406edfdb091d5893710641  gas/testsuite/gas/arm/reloc-bad.s
+f4ef829919d79352d5b1baae0bdf2f4c  gas/testsuite/gas/arm/req.d
+f9da5f85d8187f85ae791f2ade434678  gas/testsuite/gas/arm/req.l
+bf2947dcf18be37d50ab6bd60ac3aa2f  gas/testsuite/gas/arm/req.s
+136216f1dc6cd600f5ecfda9f1ff99de  gas/testsuite/gas/arm/shift-bad.d
+a7cdc333198864370212d61140ac2bcd  gas/testsuite/gas/arm/shift-bad.l
+6cba987b724a65c74661976906469ce9  gas/testsuite/gas/arm/shift-bad.s
+c7c42ee91268e697ceece089a8e93eb9  gas/testsuite/gas/arm/sp-pc-usage-t.d
+1141d6b3988e027b5c4f475150fbda53  gas/testsuite/gas/arm/sp-pc-usage-t.s
+a2dc515af8e77f4724ee3790181e6e46  gas/testsuite/gas/arm/sp-pc-validations-bad-t.d
+5de68dc2553cc0eec9d27e7977d29ae2  gas/testsuite/gas/arm/sp-pc-validations-bad-t.l
+4759d227fd0d11878fc2943998caab95  gas/testsuite/gas/arm/sp-pc-validations-bad-t.s
+483a92319c1910ad3b360dde1c651f12  gas/testsuite/gas/arm/sp-pc-validations-bad.d
+44bf3d071e4910657aa73f6022bada47  gas/testsuite/gas/arm/sp-pc-validations-bad.l
+497cc6a93e7d8ddc37895165108e1c25  gas/testsuite/gas/arm/sp-pc-validations-bad.s
+3c2a1f8518fa4c23e18667fd740227a7  gas/testsuite/gas/arm/srs-arm.d
+66e9637554bb4f72218c489224be3177  gas/testsuite/gas/arm/srs-arm.l
+4648a976a8f5e1699596e256a3ce250d  gas/testsuite/gas/arm/srs-arm.s
+dd9d9e9bfd3dd04872435e114a543083  gas/testsuite/gas/arm/srs-t2.d
+7ca3fbcdc2e993283f6116358dc49a0f  gas/testsuite/gas/arm/srs-t2.l
+b31115bcc7a52537ca0342a1a266bd61  gas/testsuite/gas/arm/srs-t2.s
+6806d45994f0599762653bda12f4807b  gas/testsuite/gas/arm/strex-bad-t.d
+703980d4ec521843190bbab82eea1500  gas/testsuite/gas/arm/strex-bad-t.l
+59db60c267064f3b01d351eabbee0d3f  gas/testsuite/gas/arm/strex-bad-t.s
+dd0fd7c207d00fa114e7ef7da8268cef  gas/testsuite/gas/arm/strex-t.d
+1cf69a8a70a52a388c9f9568ec167302  gas/testsuite/gas/arm/strex-t.s
+4877f9ab7469bf9117aa5b838ca527a5  gas/testsuite/gas/arm/svc.d
+cda65a85f8ee8f5cccc5dbf733e26e2e  gas/testsuite/gas/arm/svc.s
+bfb711d24a6452e46fba4e2d16673f36  gas/testsuite/gas/arm/t16-bad.d
+991c316eeeb58d99db3840461d3f7729  gas/testsuite/gas/arm/t16-bad.l
+55ac121d7d32ac4ca72eff5e098bc129  gas/testsuite/gas/arm/t16-bad.s
+517c69649f8714920a56bdd12c6ecc8f  gas/testsuite/gas/arm/t2-branch-global.d
+ec97b7362771c52cce9cff1cddfe4821  gas/testsuite/gas/arm/t2-branch-global.s
+8dfd0e82f441b176be452d05d68dac49  gas/testsuite/gas/arm/target-reloc-1.d
+feb34688c490e07f5f6c5c13ba0d82f8  gas/testsuite/gas/arm/target-reloc-1.s
+9bb4d2487a26e90364475db11862c204  gas/testsuite/gas/arm/tcompat.d
+faa87d86afa097cd8816f747da696107  gas/testsuite/gas/arm/tcompat.s
+060a1e2e0d34128ffdfb7f9943f2d37c  gas/testsuite/gas/arm/tcompat2.d
+a24e1db08e35323e4bc5c9f3b2865dea  gas/testsuite/gas/arm/tcompat2.s
+c20d33cfac995557c3f6160606a66670  gas/testsuite/gas/arm/thumb-b-bad.d
+8e6fe776255925819b636d1b13e16070  gas/testsuite/gas/arm/thumb-b-bad.l
+bef0f733aa2ebe8d5a78972bdbdb723e  gas/testsuite/gas/arm/thumb-b-bad.s
+fa606b48f97478a13b73aafda5ad1eb6  gas/testsuite/gas/arm/thumb-eabi.d
+878d73a3699f79270d470f11f0b83087  gas/testsuite/gas/arm/thumb-nop.d
+d9e9f6a3fd5aeefce3ed1d26a44de904  gas/testsuite/gas/arm/thumb-nop.s
+74f88e1fa42785685687ee1221aaca18  gas/testsuite/gas/arm/thumb-w-bad.d
+b79db477b5f3017d824b3f6520b0e0a4  gas/testsuite/gas/arm/thumb-w-bad.l
+d9d877613eeb9f575af073c4200b56e7  gas/testsuite/gas/arm/thumb-w-bad.s
+bfb87e3b0495eccdb975fc9266b515a2  gas/testsuite/gas/arm/thumb-w-good.d
+f442cec1a0ed93f8b1b514ebaca215e7  gas/testsuite/gas/arm/thumb-w-good.s
+5d64734b41b97cbdfc90c0cd97664b83  gas/testsuite/gas/arm/thumb.d
+d9744626acf306931c7a1fa14863d112  gas/testsuite/gas/arm/thumb.s
+92ba8d4dc031f0ce87c3b519422d7d58  gas/testsuite/gas/arm/thumb1_unified.d
+145492bce7eff0e34f3db6d4074ba8c4  gas/testsuite/gas/arm/thumb1_unified.s
+650e79e78f5b009e1babf78b92e996cf  gas/testsuite/gas/arm/thumb2_add.d
+cc6aac472725e45622aa5069c8595ba5  gas/testsuite/gas/arm/thumb2_add.s
+5f8729154bebe0db4413ec3fac600a95  gas/testsuite/gas/arm/thumb2_bad_reg.d
+a1da677e3965ee864c11630b1f0c5f08  gas/testsuite/gas/arm/thumb2_bad_reg.l
+c1d6e7f9149d704d8d3445318f9b2e86  gas/testsuite/gas/arm/thumb2_bad_reg.s
+8f12f48ba7a793f6e6a2f478e468f32c  gas/testsuite/gas/arm/thumb2_bcond.d
+248a5078599f1f6885f90a9f11048e51  gas/testsuite/gas/arm/thumb2_bcond.s
+776810abf75e22776e2fcdcc8f39762f  gas/testsuite/gas/arm/thumb2_invert.d
+ca60ace6e68f37922d0193a14f4962b0  gas/testsuite/gas/arm/thumb2_invert.s
+adb003113b7b7db6630f7036c3941341  gas/testsuite/gas/arm/thumb2_it.d
+3417601654a28c87e83aed481d35a28b  gas/testsuite/gas/arm/thumb2_it.s
+256698e45231962fafaf3de21b279aac  gas/testsuite/gas/arm/thumb2_it_auto.d
+46e9aa183f311a36def910ba19da47ae  gas/testsuite/gas/arm/thumb2_it_bad.d
+973b9cf4c477d9aecbffaca70f8860b8  gas/testsuite/gas/arm/thumb2_it_bad.l
+5deca957d184efc91f3eb0c6bcb04d0b  gas/testsuite/gas/arm/thumb2_it_bad.s
+6a8d7056c33b8cd068b89aae7448f043  gas/testsuite/gas/arm/thumb2_it_bad_auto.d
+0a2e42584017248fcbe3903ef98f0ac4  gas/testsuite/gas/arm/thumb2_ldmstm.d
+937df075b618d6fcd8101cd7c2130cc3  gas/testsuite/gas/arm/thumb2_ldmstm.s
+fc3e939191cfdc160da1a6ed571d747f  gas/testsuite/gas/arm/thumb2_ldmstm_bad.d
+4d0d002b9e10a4635434345fc8978b40  gas/testsuite/gas/arm/thumb2_ldmstm_bad.l
+0cc1a9dfc66f9de04db2bb30a99381c9  gas/testsuite/gas/arm/thumb2_ldmstm_bad.s
+435c117c9005017199d72237ccbde734  gas/testsuite/gas/arm/thumb2_mul-bad.d
+694b47dcde774bd4511a75d51c03e033  gas/testsuite/gas/arm/thumb2_mul-bad.l
+903a8ffaa5e442332b3b1a79aef20830  gas/testsuite/gas/arm/thumb2_mul-bad.s
+faeff9ef1f517dcbd4fa67b4ab5362f1  gas/testsuite/gas/arm/thumb2_mul.d
+0d39993c01d3e40184dcb4b451129901  gas/testsuite/gas/arm/thumb2_mul.s
+34e4483f8cf6f967bf6ae42c9eb7a72a  gas/testsuite/gas/arm/thumb2_pool.d
+b7d8a3446745fcfbb6007aff4c1513e3  gas/testsuite/gas/arm/thumb2_pool.s
+7d9305fe723d2a6e6bca2555c9ce9d3a  gas/testsuite/gas/arm/thumb2_relax.d
+b3aa4e03076cd20cbc79591775bde8c8  gas/testsuite/gas/arm/thumb2_relax.s
+31a2b98945ece896be9fac14481330a3  gas/testsuite/gas/arm/thumb32.d
+f8b1e727bd11baf8ee45f11d3eb087b7  gas/testsuite/gas/arm/thumb32.l
+d0be248198cc7469196f066ae0b4dc66  gas/testsuite/gas/arm/thumb32.s
+b781f06f863434629a42d7ece4da1dd7  gas/testsuite/gas/arm/thumbrel.d
+381b8be7fa2c2fc62279d1f1c7139d45  gas/testsuite/gas/arm/thumbrel.s
+8536c857bc7e3818604337db4408c29c  gas/testsuite/gas/arm/thumbv6.d
+32c8c68853e9c3714f92d458c22c107b  gas/testsuite/gas/arm/thumbv6.s
+602b437bcb68889786d1cb4f9de7259c  gas/testsuite/gas/arm/thumbv6k.d
+7e0e60be4eec0eaf688f4ebded3519a1  gas/testsuite/gas/arm/thumbv6k.s
+0ae6d6f5f99f95ee07412df57889d2a0  gas/testsuite/gas/arm/thumbver.d
+5c7522af774e96f8d855d83a62490d55  gas/testsuite/gas/arm/thumbver.s
+9d0943617b5b1f1d0df8672b6348dbf1  gas/testsuite/gas/arm/tls.d
+7645c96c57962ba8a6f43ee029d84b7b  gas/testsuite/gas/arm/tls.s
+83daaae25c1c59a430e25610b85a87c1  gas/testsuite/gas/arm/tls_vxworks.d
+81846b97b286d4da80793bf66783dfa5  gas/testsuite/gas/arm/undefined.d
+3e1c1880c7c3b70297d9f4b2abc1c6f9  gas/testsuite/gas/arm/undefined.l
+6890516d1ed282bcd8ffe6badad800fe  gas/testsuite/gas/arm/undefined.s
+c61c8553c23590cad294240c950bc2ab  gas/testsuite/gas/arm/undefined_coff.d
+381c68d752a39fe3b1c8e2502ae6214c  gas/testsuite/gas/arm/undefined_coff.l
+7f9bf611638fd7d0d6c831e6ddf5962e  gas/testsuite/gas/arm/undefined_coff.s
+956183f9e40e5aeb80093622994cb80f  gas/testsuite/gas/arm/unpredictable.d
+9a6fa12ed030e85078ea708f978159f9  gas/testsuite/gas/arm/unpredictable.s
+e6f007ab71c7cd258e23b255eded45d7  gas/testsuite/gas/arm/unwind.d
+2d938cd95d98fc257adbed6d744672d0  gas/testsuite/gas/arm/unwind.s
+27900faafd9458945db813a9fa712ca4  gas/testsuite/gas/arm/unwind_vxworks.d
+33454a43477691a1b3493e7053287e4b  gas/testsuite/gas/arm/v4bx.d
+3328cf20fd05dff9c4dc40267c5c783d  gas/testsuite/gas/arm/v4bx.s
+adb88ddc0d65aa2cfb5c13fb798b445c  gas/testsuite/gas/arm/vcvt-bad.d
+58498e913f66247e663bc80ec46b7848  gas/testsuite/gas/arm/vcvt-bad.l
+69d248ecbe3f47b0eb6c25a5d8b6099b  gas/testsuite/gas/arm/vcvt-bad.s
+b6a84f98e1a19c70ec8ce96888733183  gas/testsuite/gas/arm/vcvt.d
+40e340e69bfe1509c317359844e22098  gas/testsuite/gas/arm/vcvt.s
+ba5e39f1a0404cf679b2d05556a1cff5  gas/testsuite/gas/arm/vfma1.d
+96a659e5f8cb8cc7ec1a210de1c0ab97  gas/testsuite/gas/arm/vfma1.s
+814d0fae55d79302ad95e3a713a8baec  gas/testsuite/gas/arm/vfp-bad.d
+f413ca5d6d3e49dd0a8acf8c2a540003  gas/testsuite/gas/arm/vfp-bad.l
+5c94325ced2602ef362e4436113230a2  gas/testsuite/gas/arm/vfp-bad.s
+96d08206a5c7bcea2ee723cce0052784  gas/testsuite/gas/arm/vfp-bad_t2.d
+bc4cc6a09adc664ab0f7fc0c9a8db159  gas/testsuite/gas/arm/vfp-bad_t2.l
+d559b5f5968972a6c28b8618149a9ec9  gas/testsuite/gas/arm/vfp-bad_t2.s
+d04af89d25e2bb3b8ede4c77a13dd894  gas/testsuite/gas/arm/vfp-fma-arm.d
+6f2e58670d4a8298176c9587b5dc67d8  gas/testsuite/gas/arm/vfp-fma-arm.s
+894f31ac6c674cbf59f52dc02488ed8f  gas/testsuite/gas/arm/vfp-fma-inc.s
+f1a512c9b8271ead5f1d78bfed54f416  gas/testsuite/gas/arm/vfp-fma-thumb.d
+7cb6361ba0e917ed9528dc2c8a81a402  gas/testsuite/gas/arm/vfp-fma-thumb.s
+43114c92e8b7f44df4e63fe5d3db87fd  gas/testsuite/gas/arm/vfp-neon-overlap.d
+49ff879adf72e9b977f885f5fae15b43  gas/testsuite/gas/arm/vfp-neon-overlap.s
+c711bfc8c023c16fdf54e2df13f11803  gas/testsuite/gas/arm/vfp-neon-syntax-inc.s
+a69dac85d469b55d0bc7be7f83394651  gas/testsuite/gas/arm/vfp-neon-syntax.d
+0c57087317ef5cd78c4135033f3309af  gas/testsuite/gas/arm/vfp-neon-syntax.s
+1fa245e852186c3e7958712bcce62b98  gas/testsuite/gas/arm/vfp-neon-syntax_t2.d
+1e47784b14f6ff2a614926bea8e0accd  gas/testsuite/gas/arm/vfp-neon-syntax_t2.s
+55f192542f749e66e6a0762eaa6a9ce9  gas/testsuite/gas/arm/vfp1.d
+e82b842fce34cd77d75a4138a4c504c2  gas/testsuite/gas/arm/vfp1.s
+2b48069ab63774c5732679d105cab6cf  gas/testsuite/gas/arm/vfp1_t2.d
+3d0e2f89aeb8c1d2f335b244a5ff26f8  gas/testsuite/gas/arm/vfp1_t2.s
+13a06e27e989e572477a33af811bd8b4  gas/testsuite/gas/arm/vfp1xD.d
+57aa4bd0017b62016ab6586c12a9e76c  gas/testsuite/gas/arm/vfp1xD.s
+0f0144d8c16795a1ab7bbe2373c8479b  gas/testsuite/gas/arm/vfp1xD_t2.d
+1480da2f991c4b2503ac985e90508781  gas/testsuite/gas/arm/vfp1xD_t2.s
+50ad9da9954eace7f9b268ddb1f6ee93  gas/testsuite/gas/arm/vfp2.d
+bfd6afbdacdf57a886ad9d8530fae3ad  gas/testsuite/gas/arm/vfp2.s
+b49df4f483e8804f4c41dcdcdfa522ce  gas/testsuite/gas/arm/vfp2_t2.d
+6a5f0f0ac922d9ebf53fd12ab0085ac1  gas/testsuite/gas/arm/vfp2_t2.s
+67d563edfa8e90bcc438603701b8e0f2  gas/testsuite/gas/arm/vfpv3-32drs.d
+b4988a9934cfe174162bc72eb0467d52  gas/testsuite/gas/arm/vfpv3-32drs.s
+b22944bb7d38947a499cea5dd8475c0d  gas/testsuite/gas/arm/vfpv3-const-conv.d
+36df2f2463986f5799cb982ce679d2e8  gas/testsuite/gas/arm/vfpv3-const-conv.s
+15e911682d91ef19f9418f94e73142aa  gas/testsuite/gas/arm/vfpv3-d16-bad.d
+7e4f0b5acd8e228fb3428808f82434a3  gas/testsuite/gas/arm/vfpv3-d16-bad.l
+23076fd52504b85239ddcbaeef67b5a4  gas/testsuite/gas/arm/vfpv3xd.d
+d53650f58020c4cfb2ea155c3c67d92e  gas/testsuite/gas/arm/vfpv3xd.s
+35e731ac30c173d5fa873f68e522b748  gas/testsuite/gas/arm/vldm-arm.d
+770d8810f2fbaa102502be7bb07713e6  gas/testsuite/gas/arm/vldm-thumb-bad.d
+dec93ea68b2858b13a7467aeb183e5ae  gas/testsuite/gas/arm/vldm-thumb-bad.l
+7e21099077fa1a9f5bb5c3aab2b304f0  gas/testsuite/gas/arm/vldm.s
+ecd10146f7bb08ad8124934712e30c85  gas/testsuite/gas/arm/vldmw-arm-bad.d
+414fdd3db617268d1358b78646daf962  gas/testsuite/gas/arm/vldmw-bad.l
+6894e0da633e5dcd9797ef7a78ca72a9  gas/testsuite/gas/arm/vldmw-bad.s
+650064cfade1b2d1e0d608e2fbf7e137  gas/testsuite/gas/arm/vldmw-thumb-bad.d
+df37ae8d43864e241863e1f6bee8499f  gas/testsuite/gas/arm/vldr.d
+05c04549362277975864175f7ff8c050  gas/testsuite/gas/arm/vldr.s
+870c99417583f480398818773063e6c7  gas/testsuite/gas/arm/vstr-arm-bad.d
+e67da15cbbe42f4c32940587dda180cf  gas/testsuite/gas/arm/vstr-arm-bad.l
+12345b0b2762761ddbd1b17b3fa98fe4  gas/testsuite/gas/arm/vstr-bad.s
+f896cdd49e74db069bd1092a8ed74be7  gas/testsuite/gas/arm/vstr-thumb-bad.d
+e840d784d5cc8a7e0e62ffc9798ca268  gas/testsuite/gas/arm/vstr-thumb-bad.l
+c47643b23f1901bdd93d2addf127fa5a  gas/testsuite/gas/arm/weakdef-1.d
+3f04291ba97df3690197d442dea32f90  gas/testsuite/gas/arm/weakdef-1.s
+e99d7cf8dd682d42b500568dd4ac9936  gas/testsuite/gas/arm/weakdef-2.d
+7866a81443ff8b59e62809f3d37d6d8a  gas/testsuite/gas/arm/weakdef-2.l
+e690017471e4bbc22a86f9106d5ec084  gas/testsuite/gas/arm/weakdef-2.s
+6db4b707707184c05cb9883ad84f59b9  gas/testsuite/gas/arm/wince.d
+a463e0b33dd0b3291d2af948e4488c30  gas/testsuite/gas/arm/wince.s
+80bd281a78ceaa6ecee1a7ce9f11f084  gas/testsuite/gas/arm/wince_inst.d
+7030fbdc97a88504e0328ae9fcdd4372  gas/testsuite/gas/arm/xscale.d
+66848c515a123077cd3c9ce386e1ff3e  gas/testsuite/gas/arm/xscale.s
+855a3b9ca08ab38bb1ba350b5d6b6b0c  gas/testsuite/gas/bfin/allinsn16.d
+ec9bb025ee497292ec861c57d9c6391f  gas/testsuite/gas/bfin/allinsn16.s
+48601b2595429ff57bac71bff0c1adbb  gas/testsuite/gas/bfin/arith_mode.d
+411ce7b9c39735181cfe6cb9680f67ed  gas/testsuite/gas/bfin/arith_mode.s
+288eb007666feec4c962c5dfaa836c9b  gas/testsuite/gas/bfin/arithmetic.d
+29127b65c16e5e7a549e80c4466786dd  gas/testsuite/gas/bfin/arithmetic.s
+02b15bae7950f8b4b2ea052633a0bee6  gas/testsuite/gas/bfin/bfin.exp
+f596c0af9181f1e480c68fe8f0f2ab9d  gas/testsuite/gas/bfin/bit.d
+2423a518f5d1c6e3b2c2fa7fbe1f1bfd  gas/testsuite/gas/bfin/bit.s
+a9379c30f5de60f2caf528071d06e422  gas/testsuite/gas/bfin/bit2.d
+058c76d275a75499c86d44115f573d9e  gas/testsuite/gas/bfin/bit2.s
+c25eac965192a8961a7543bedc3a2730  gas/testsuite/gas/bfin/cache.d
+1bd724bb8ff4df410a9a84ee255bb018  gas/testsuite/gas/bfin/cache.s
+d4927f98c2c5c1481231dd1e2cfd5781  gas/testsuite/gas/bfin/cache2.d
+1ee626769200af147928f53ff095e2da  gas/testsuite/gas/bfin/cache2.s
+7adc63b3344d644b70239976289bec0e  gas/testsuite/gas/bfin/control_code.d
+d0bb675fcf4f27f96feb8c518907fcc4  gas/testsuite/gas/bfin/control_code.s
+165a574f41080b8c866f7bdee7d62f2f  gas/testsuite/gas/bfin/control_code2.d
+4893b61f4d42730f53bae9093a06e7fb  gas/testsuite/gas/bfin/control_code2.s
+f47c6a798720885598d185fd9ea4ef4e  gas/testsuite/gas/bfin/error.exp
+5298d3a5bf5b960115981f15639302d2  gas/testsuite/gas/bfin/event.d
+1a2bfd331853fc647d79a74468708867  gas/testsuite/gas/bfin/event.s
+aec157b0fd56eda78f8bfba4fa84368d  gas/testsuite/gas/bfin/event2.d
+53f030f3469d4890baa352fc9bbaaf23  gas/testsuite/gas/bfin/event2.s
+3c84ef5957759be4b82c41c18ca145d5  gas/testsuite/gas/bfin/expected_comparison_errors.l
+6635ab1602035b65177208c6d7b2551a  gas/testsuite/gas/bfin/expected_comparison_errors.s
+4be9fbd5ddb23008fc5bebbc72f78ffa  gas/testsuite/gas/bfin/expected_errors.l
+8e47d689b926fa65b7032e9926380af7  gas/testsuite/gas/bfin/expected_errors.s
+57bdb0129fdeb43e2ff729fec8895765  gas/testsuite/gas/bfin/expected_move_errors.l
+e494a66f47146777b7410140f81e77ec  gas/testsuite/gas/bfin/expected_move_errors.s
+bbfbed204eba7aeedbf9c476c1c7538a  gas/testsuite/gas/bfin/flow.d
+3fc4e67254243c40ab5e1c25a6a81f63  gas/testsuite/gas/bfin/flow.s
+b061426129437b38fef226b646ae1901  gas/testsuite/gas/bfin/flow2.d
+09780a8e9ad4e6745f30a8cee292af53  gas/testsuite/gas/bfin/flow2.s
+0df70e67b2899a9f7d9188eefe1430d6  gas/testsuite/gas/bfin/invalid_arith_mode.l
+89e1cc331f3c9d957fab3cb87a11513a  gas/testsuite/gas/bfin/invalid_arith_mode.s
+70e77ee318335724f5c33a06f9bc2abb  gas/testsuite/gas/bfin/line_number.l
+75b3e45d78c9922accca7942cf6e4b0a  gas/testsuite/gas/bfin/line_number.s
+9f94114d4918da2355c1ebc8af88df49  gas/testsuite/gas/bfin/load.d
+d69b6cf2f36e26b037cff1f1cb3ecb3f  gas/testsuite/gas/bfin/load.s
+2de58b5a2db55ca271c16559debcb882  gas/testsuite/gas/bfin/logical.d
+2fe47567e87037449c8434d098bad4ed  gas/testsuite/gas/bfin/logical.s
+c05cd2663b7b1cbc0b462b5487ae25e3  gas/testsuite/gas/bfin/logical2.d
+91fedd260d934e42bac56427b0bb66d9  gas/testsuite/gas/bfin/logical2.s
+898ceb71b8b09c5deb2c73a94233f2b4  gas/testsuite/gas/bfin/loop.d
+9cb1ef9a91cea1ee05c5fe18f7defa51  gas/testsuite/gas/bfin/loop.s
+9e904d074aaaf7a1bb9ca3b5929f8a18  gas/testsuite/gas/bfin/loop2.d
+122a6a3789c071346184055570d6e57b  gas/testsuite/gas/bfin/loop2.s
+52ef261c940962d4442e6ef02d7e724e  gas/testsuite/gas/bfin/loop3.d
+4e1a44b596f5f6481ad4076406df5c35  gas/testsuite/gas/bfin/loop3.s
+f9f09b385cb472027447931e8f0aa68e  gas/testsuite/gas/bfin/loop_label.d
+7526ada3e63eeb4680573f0c0a0df185  gas/testsuite/gas/bfin/loop_label.s
+9c524aea6f6add81b88df552064e15db  gas/testsuite/gas/bfin/loop_label2.d
+d58d75270dbc8daca3425fd79cf03533  gas/testsuite/gas/bfin/loop_label2.s
+82127633d16b7051585bad25006f3c2d  gas/testsuite/gas/bfin/loop_temps.d
+6c61c744e11ef1952e0618f8081b43f6  gas/testsuite/gas/bfin/loop_temps.s
+6b953b46d53958fa7a7ce02232a8f020  gas/testsuite/gas/bfin/misc.d
+10be3b7f88b1ebca1ba82749b1da2f5b  gas/testsuite/gas/bfin/misc.s
+7d7516efd5d3a6f954356e1f3cd42472  gas/testsuite/gas/bfin/move.d
+5d2d08592057d077be163c2b155bb0eb  gas/testsuite/gas/bfin/move.s
+80603951715ce9fd1cdad7a025e8d072  gas/testsuite/gas/bfin/move2.d
+777c285afed0e998dca948f5f4945039  gas/testsuite/gas/bfin/move2.s
+7df6f331af40c8b717a146de35510c58  gas/testsuite/gas/bfin/parallel.d
+01bd82a1d8bdcb4d9dd0de8fc7929b5e  gas/testsuite/gas/bfin/parallel.s
+f192d3af5c598dfc645553e7e6e996c5  gas/testsuite/gas/bfin/parallel2.d
+59d24a38210bb2bcb9900a1693a10c11  gas/testsuite/gas/bfin/parallel2.s
+b1b34fd1286a5cbd3009a309f50da7d9  gas/testsuite/gas/bfin/parallel3.d
+e03ff8c8eeeb9b9d590c88f3d88b1b38  gas/testsuite/gas/bfin/parallel3.s
+c441fbe88c8a366c6f26b3f815606650  gas/testsuite/gas/bfin/parallel4.d
+3cc5b04fef0c761a2d8e679f0c47b097  gas/testsuite/gas/bfin/parallel4.s
+d95bd8c3417107d37edc20237e101a53  gas/testsuite/gas/bfin/parallel5.s
+70aa8fb2636c9fe3e1d0506923efd767  gas/testsuite/gas/bfin/parallel_illegal.d
+c4f71443f481e73a9c6b5ad2b0e61271  gas/testsuite/gas/bfin/parallel_illegal.s
+e37edaea01e81b1b557030e721b41c25  gas/testsuite/gas/bfin/pseudo.d
+1f6139ba7ebdd23bcb8167d4d600ca4b  gas/testsuite/gas/bfin/pseudo.s
+23c14fe93560edbb13f883506ecf9e8a  gas/testsuite/gas/bfin/reloc.d
+5057c84be940f533409912ccb929e32c  gas/testsuite/gas/bfin/reloc.s
+8efd003d71645708cb6062d3ce3cdeb5  gas/testsuite/gas/bfin/resource_conflict.l
+139c46683952dad8d3a391c30327721d  gas/testsuite/gas/bfin/resource_conflict.s
+630be7f8c7f71d6e57e751bf4ba4de9b  gas/testsuite/gas/bfin/shift.d
+60749a1cc7d1b067aec37959e7581b9d  gas/testsuite/gas/bfin/shift.s
+0b4419d8ea2648c0d1c5258d9109cab1  gas/testsuite/gas/bfin/shift2.d
+82334304cbea2a43feea83a2455b9c5c  gas/testsuite/gas/bfin/shift2.s
+50addfc0be6b78f58b42e12d0aa54531  gas/testsuite/gas/bfin/stack.d
+2c0315e6dc7ff72e7ddd35ec60450354  gas/testsuite/gas/bfin/stack.s
+ff3c5e0cdf2bffa239c94495b7a3242d  gas/testsuite/gas/bfin/stack2.d
+73b5e4051236d15608d6ab20d4dea9c4  gas/testsuite/gas/bfin/stack2.s
+a6de01518793db5197c923b41aabf7f1  gas/testsuite/gas/bfin/store.d
+ddcfb10fec3bd4b7831493421c881c22  gas/testsuite/gas/bfin/store.s
+9d624149b67f74bafd7faa7301549e42  gas/testsuite/gas/bfin/vector.d
+aa502219854811389958435e66a260fb  gas/testsuite/gas/bfin/vector.s
+e0baad2674334925da679897215797a3  gas/testsuite/gas/bfin/vector2.d
+4cb6a375f948e1c99ccaf2efdd5d0178  gas/testsuite/gas/bfin/vector2.s
+c8ac0cb1b1e5e8f6f80e3808e437ef99  gas/testsuite/gas/bfin/video.d
+213f9eea8da19afe265602c0c9b123f3  gas/testsuite/gas/bfin/video.s
+fb94a4da1ac483d2879bcc796e329c66  gas/testsuite/gas/bfin/video2.d
+f27e1ab75da775e3a2e41c9b00e31296  gas/testsuite/gas/bfin/video2.s
+066581f156f1219a1aa97c6160cd66a5  gas/testsuite/gas/cfi/cfi-alpha-1.d
+c732145c7ef46cd0a6032f7e2b510061  gas/testsuite/gas/cfi/cfi-alpha-1.s
+2b43ab50e2a1d940f42058f251a26d50  gas/testsuite/gas/cfi/cfi-alpha-2.d
+7a903b0680f5f68cbb334bcfb8f78418  gas/testsuite/gas/cfi/cfi-alpha-2.s
+ff9f9dcd55ee564c573f6d269d66546b  gas/testsuite/gas/cfi/cfi-alpha-3.d
+fb22d6ffbc03e216af699e438247ab89  gas/testsuite/gas/cfi/cfi-alpha-3.s
+6fd2fa86d4b6c8005f8186edf8195cba  gas/testsuite/gas/cfi/cfi-arm-1.d
+27866105927ba075e08a1df3329c1011  gas/testsuite/gas/cfi/cfi-arm-1.s
+4cbc9891a86946b14f7f363f41d2e341  gas/testsuite/gas/cfi/cfi-common-1.d
+ff9a79da6f82cdbf3501bcde9eb478f1  gas/testsuite/gas/cfi/cfi-common-1.s
+e41e4135e7eb851779802342ade53d51  gas/testsuite/gas/cfi/cfi-common-2.d
+4e1d60f8041c1d463b0ab47d28a0b8ed  gas/testsuite/gas/cfi/cfi-common-2.s
+bf08ba0cf412e0416915142b01bdb8fa  gas/testsuite/gas/cfi/cfi-common-3.d
+e38a19aa1e2fe664fe714f357ceafb72  gas/testsuite/gas/cfi/cfi-common-3.s
+8ccd0d722ce1616e66d6e7cf53e64d24  gas/testsuite/gas/cfi/cfi-common-4.d
+d680108d8be37f6a0d454b5622d97001  gas/testsuite/gas/cfi/cfi-common-4.s
+257f5c1149eb931d9701c2ec7f81c022  gas/testsuite/gas/cfi/cfi-common-5.d
+8b67504e3fc661ce66fd7d54427c4987  gas/testsuite/gas/cfi/cfi-common-5.s
+3578dc1e6b6db2bdc2e1176efc159f81  gas/testsuite/gas/cfi/cfi-common-6.d
+8a8f9709b68037c0b396fc1031242b8b  gas/testsuite/gas/cfi/cfi-common-6.s
+da4984a421f8667465e4b54280a3bc0c  gas/testsuite/gas/cfi/cfi-common-7.d
+6ce2b2eed8afc779c2c773961a874930  gas/testsuite/gas/cfi/cfi-common-7.s
+a20cb2990eabbc4a00fde7383f77f52a  gas/testsuite/gas/cfi/cfi-diag-1.l
+d9aa89632b07c90425d877d2c4fe5f21  gas/testsuite/gas/cfi/cfi-diag-1.s
+da3e425a8331d0a520240173284f9c9a  gas/testsuite/gas/cfi/cfi-hppa-1.d
+812d7ee7b3a8d0670e63df68bf345671  gas/testsuite/gas/cfi/cfi-hppa-1.s
+b7da2fc63a9502996bd88622218713a3  gas/testsuite/gas/cfi/cfi-i386-2.d
+439b989fe3ccc39f216269684d8ef849  gas/testsuite/gas/cfi/cfi-i386-2.s
+58ec6ff31643ced32a6edad1108b398a  gas/testsuite/gas/cfi/cfi-i386.d
+8425a0b2af627d17ad56297126ec1ff2  gas/testsuite/gas/cfi/cfi-i386.s
+c1b5e4bb5a02f6477c17757063a0930e  gas/testsuite/gas/cfi/cfi-m68k.d
+ce598e227551ae3fb76ac5ec10f1e08d  gas/testsuite/gas/cfi/cfi-m68k.s
+a1a12c078940cdcf8454152dcc37eb55  gas/testsuite/gas/cfi/cfi-mips-1.d
+8a2867da19dc676c9e3b377876b0f31f  gas/testsuite/gas/cfi/cfi-mips-1.s
+7e1e2f28f4c14c3c387b51691b92c467  gas/testsuite/gas/cfi/cfi-ppc-1.d
+023e0a3711f8bdda382cfe17793857c1  gas/testsuite/gas/cfi/cfi-ppc-1.s
+9b424e0ffcad66335d6d6c8bdc7b74bd  gas/testsuite/gas/cfi/cfi-s390-1.d
+b8507466edac4d850cd795fffec14f30  gas/testsuite/gas/cfi/cfi-s390-1.s
+b41ed0bc3e45e67e153c8d040a586c8e  gas/testsuite/gas/cfi/cfi-s390x-1.d
+e4805f533c9d695511947a95cd44f743  gas/testsuite/gas/cfi/cfi-s390x-1.s
+26dfe0ef330ce08533f32e18c72fb2ea  gas/testsuite/gas/cfi/cfi-sh-1.d
+88c8945be2bfa4de0b3c595656da7dec  gas/testsuite/gas/cfi/cfi-sh-1.s
+430acd77e07efd7adb56b96cffd9fe09  gas/testsuite/gas/cfi/cfi-sparc-1.d
+03d5d698bd1714ce01a3bdf90202dfaf  gas/testsuite/gas/cfi/cfi-sparc-1.s
+f942371542b27947d6163a13ce123cd6  gas/testsuite/gas/cfi/cfi-sparc64-1.d
+a1442421e2bf9301a2dd97cb67e7bb6a  gas/testsuite/gas/cfi/cfi-sparc64-1.s
+faa32ed81d021bd4d67a422db2069d25  gas/testsuite/gas/cfi/cfi-x86_64.d
+945303be8742859327c0a797f590c3b8  gas/testsuite/gas/cfi/cfi-x86_64.s
+f4850c1c1ffe9cdc75a494f9ff382798  gas/testsuite/gas/cfi/cfi.exp
+8fdf465aaf385904a22cebd36470411a  gas/testsuite/gas/cfi/reloc-pe-i386.d
+53141d8552ddcf94bebfbf40a96b756f  gas/testsuite/gas/cfi/reloc-pe-i386.s
+6cbd46d2c6b6998cfbc1416c2dcc5986  gas/testsuite/gas/cr16/add_test.d
+f67591ac56f7d8fa46b0af785918cf00  gas/testsuite/gas/cr16/add_test.s
+3f956abd53e7b9782e157e66d0d174e4  gas/testsuite/gas/cr16/and_test.d
+379fc40517c936b62bed28f7901bce6c  gas/testsuite/gas/cr16/and_test.s
+7d9c505b78a99a457a5cdda77eac7e18  gas/testsuite/gas/cr16/ash_test.d
+0cbd8c17535ef10debf411f97977f625  gas/testsuite/gas/cr16/ash_test.s
+e17c168e80ba015e19fd1a7124baf7e7  gas/testsuite/gas/cr16/bal_test.d
+075c27e1a30eb002f59e0567dab5f8e9  gas/testsuite/gas/cr16/bal_test.s
+7e0dfd2f99b9221cadf84abf76f66945  gas/testsuite/gas/cr16/bcc_test.d
+d042fa6d08f507db0c8499ce33fd1af1  gas/testsuite/gas/cr16/bcc_test.s
+439b60a124267d982b2b0e8cf0cfe40e  gas/testsuite/gas/cr16/beq0_test.d
+8e9b4ca059bbebc851f7e0bc63b9147d  gas/testsuite/gas/cr16/beq0_test.s
+10ffafc185b54ca265c5f83acf74890b  gas/testsuite/gas/cr16/cbitb_test.d
+f43ac50dfcef55cdee7df49759e29169  gas/testsuite/gas/cr16/cbitb_test.s
+b6925985b52da977418671bde14bef75  gas/testsuite/gas/cr16/cbitw_test.d
+acbc5a7921b1289f9da3b9cb2443dabb  gas/testsuite/gas/cr16/cbitw_test.s
+00dced57978e1399956b8741e08de14c  gas/testsuite/gas/cr16/cinv_test.d
+1e040daced19bdf045daadb614911ecf  gas/testsuite/gas/cr16/cinv_test.s
+c9cf0a7dad44d6c08d269667504c5c57  gas/testsuite/gas/cr16/cmp_test.d
+fa1040afb324c21fe1becc32efaebe25  gas/testsuite/gas/cr16/cmp_test.s
+d604132229b24aeb339e5218edd2b587  gas/testsuite/gas/cr16/cr16.exp
+3fee67a2f1b794ac8992b1b9bd80a02f  gas/testsuite/gas/cr16/excp_test.d
+f268d7bd4b306dcffb4d1a736c73d1ee  gas/testsuite/gas/cr16/excp_test.s
+c3e21b8af3492e40c78ed9f3217a8ae5  gas/testsuite/gas/cr16/jal_test.d
+a4c88339cbf41a2a648b8add558e6de3  gas/testsuite/gas/cr16/jal_test.s
+111aee148b8cab1b4be9bd3e50988329  gas/testsuite/gas/cr16/jcc_test.d
+f2cc7af5281128c2becd0b37d355e5a2  gas/testsuite/gas/cr16/jcc_test.s
+5f23fd7b8bee081cd454fc97246353bf  gas/testsuite/gas/cr16/loadb_test.d
+8a58e37d8558992ce9e79f76c6665894  gas/testsuite/gas/cr16/loadb_test.s
+5216cd5f7626019cbc7ecc314dfe8a79  gas/testsuite/gas/cr16/loadd_test.d
+1c5070569732bb257505e91353af07b7  gas/testsuite/gas/cr16/loadd_test.s
+7a274d8efc9b5fcf46388074d94f604c  gas/testsuite/gas/cr16/loadm_test.d
+4401e7860986aa7df7f32936766412bb  gas/testsuite/gas/cr16/loadm_test.s
+7c402fbfb6d1d4863cd14e84bfa820be  gas/testsuite/gas/cr16/loadw_test.d
+73b7f7ebbfbf7ab9063255d54155febc  gas/testsuite/gas/cr16/loadw_test.s
+609079c80e60aaafb706da43b16d3eef  gas/testsuite/gas/cr16/lpsp_test.d
+f7f73c4b947ca273d884b115e295dd13  gas/testsuite/gas/cr16/lpsp_test.s
+bfcfea13614c1bb6b051ecf3fdea23db  gas/testsuite/gas/cr16/lsh_test.d
+f081b89311bdc9bfe4ac860bb299e508  gas/testsuite/gas/cr16/lsh_test.s
+cfb43cab6c74fcaf0c5befa33e9a3128  gas/testsuite/gas/cr16/mov_test.d
+ff5f3527feb5e7f90ce3d62986aa8011  gas/testsuite/gas/cr16/mov_test.s
+38d96dbacf46018b5fffeba5bb084502  gas/testsuite/gas/cr16/mul_test.d
+a9a379d0eeb9dddf7dbba3b974d9c60e  gas/testsuite/gas/cr16/mul_test.s
+904b1d9400008b6c623eea3182ed2a2a  gas/testsuite/gas/cr16/or_test.d
+853bf658ec740a2e9c2a7819dae101ac  gas/testsuite/gas/cr16/or_test.s
+0d78b6997a1c3d8a22f1bdfa9b632553  gas/testsuite/gas/cr16/pic.exp
+e87b687f9789317a5e6e53f538dbc34b  gas/testsuite/gas/cr16/pic1.d
+d9d5fc12841faee1cf258c4f0f5d5a43  gas/testsuite/gas/cr16/pic1.s
+85839a2f7b2dca815908c42acd5d66e4  gas/testsuite/gas/cr16/pic2.d
+7acd81620499416cf1261402ea692cd0  gas/testsuite/gas/cr16/pic2.s
+9068b2585a4a5f9ceadc882cfb12debe  gas/testsuite/gas/cr16/pop_test.d
+6552ddd768381fbbf2341834550f3ce1  gas/testsuite/gas/cr16/pop_test.s
+36664477c638740562de1eda0b61cdc2  gas/testsuite/gas/cr16/popret_test.d
+b306cf2daf9d0524d9a0981b1c39580b  gas/testsuite/gas/cr16/popret_test.s
+994aa0ee10f2e19ea573b9937a1201c3  gas/testsuite/gas/cr16/push_test.d
+05d6aaa617be541a89400ef0c18310ed  gas/testsuite/gas/cr16/push_test.s
+dc5ed93acc4c6749c8ec64f89ef5b7e8  gas/testsuite/gas/cr16/sbitb_test.d
+1d28f8554499bc1827f691671514a227  gas/testsuite/gas/cr16/sbitb_test.s
+31848cb4dd1949e493999c46e29f0634  gas/testsuite/gas/cr16/sbitw_test.d
+cae0eac1fd3b906e12b4ed54eee0c951  gas/testsuite/gas/cr16/sbitw_test.s
+631b33c87ba752b507325aa2894d432c  gas/testsuite/gas/cr16/scc_test.d
+9e4982ccaabd6401072bf7fd3d57f7ed  gas/testsuite/gas/cr16/scc_test.s
+94f0142695a3c1490c41d7f3b7df66a5  gas/testsuite/gas/cr16/storb_test.d
+1fd9fcbce7a1e73ff5bcca0fd8e117a7  gas/testsuite/gas/cr16/storb_test.s
+b1edbea3ed56dcc9e27b2ab790a583e1  gas/testsuite/gas/cr16/stord_test.d
+b1172ecdabc7fb9500e1bfd73d8e816f  gas/testsuite/gas/cr16/stord_test.s
+0b08e39055214b4ae15aaa2194a24a12  gas/testsuite/gas/cr16/storm_test.d
+8befd9713334d89aacb0d4882112f6b3  gas/testsuite/gas/cr16/storm_test.s
+566c244c7b6af7b87bd11161b10fe15c  gas/testsuite/gas/cr16/storw_test.d
+7557b2fbf9968d594d76754862590b8f  gas/testsuite/gas/cr16/storw_test.s
+33e17b2ebadac9ad2e63e732350e3df4  gas/testsuite/gas/cr16/sub_test.d
+39087621c7008f2457ec219a5f45307f  gas/testsuite/gas/cr16/sub_test.s
+ee1c435e9826cd2643f4de5f20f42b75  gas/testsuite/gas/cr16/tbit_test.d
+28d4092049100f26e101ec66816fb501  gas/testsuite/gas/cr16/tbit_test.s
+109f9d4b6c6d8caa490572f923caa00a  gas/testsuite/gas/cr16/tbitb_test.d
+28921a7a006d4bbd78764590fb6d8c8d  gas/testsuite/gas/cr16/tbitb_test.s
+a534687c0dd279e1da4356add0226c4b  gas/testsuite/gas/cr16/tbitw_test.d
+ed50d410cc3b2d6185c3c7a9f0261df2  gas/testsuite/gas/cr16/tbitw_test.s
+060603bb9c6b20292757fa2f26456872  gas/testsuite/gas/cr16/xor_test.d
+9d0817f524a9be5302b574b3d6f18df5  gas/testsuite/gas/cr16/xor_test.s
+18d4c4bc0430b3c84b2302d30d1dc847  gas/testsuite/gas/cris/abs32-1.s
+d37874c6207817f204a1ec750ebb4071  gas/testsuite/gas/cris/addi.d
+6ca0c7c8a4113b4ba0224dcdf4e6717d  gas/testsuite/gas/cris/addi.s
+13a10a503be033d6331a02a0f5ddcc77  gas/testsuite/gas/cris/arch-err-1.s
+0d58f43aece3f51c4ca5026fbf555a14  gas/testsuite/gas/cris/arch-err-2.s
+b6328fb4babda313830b0972ef82e525  gas/testsuite/gas/cris/arch-err-3.s
+45891f0c0c9960eff1a6e2ca99331d0d  gas/testsuite/gas/cris/arch-err-4.s
+44bfb8b3f93389a8c411433c4bef2597  gas/testsuite/gas/cris/arch-err-5.s
+cc7815e98e40d50319297072ed0788d2  gas/testsuite/gas/cris/binop-cmpmove.d
+dc1a9682ed0b829d2af27e82ab20cf6c  gas/testsuite/gas/cris/binop-cmpmovx.d
+cb2d8aeb2cc4a340dbf648056d7c96b3  gas/testsuite/gas/cris/binop-extx.d
+af929eb0019e7cde018a6d96e2c61325  gas/testsuite/gas/cris/binop-segref.s
+725914dadc2fa064588b802c4dd23a15  gas/testsuite/gas/cris/binop.d
+ce4e65752cd8c2657ef0b10cbcc00cde  gas/testsuite/gas/cris/binop.s
+5d7c80786055352c3129a6d9a6e3e6ff  gas/testsuite/gas/cris/bork.d
+67a42ca84f31bc333b785695009221fa  gas/testsuite/gas/cris/bork.s
+358f933cba6c213ef32385fbf17c89e1  gas/testsuite/gas/cris/bound-err-1.s
+6b30f687aeb97de2c6d8cea516cd0351  gas/testsuite/gas/cris/branch-warn-1.s
+0175c9f81673cc5d7f46599955bf7450  gas/testsuite/gas/cris/branch-warn-2.s
+4358a854465b2097d3ee3f0161f65343  gas/testsuite/gas/cris/branch-warn-3.s
+4c86b005ec93ad9aeca855715e595f75  gas/testsuite/gas/cris/branch.d
+caff7842b5ef92ca805daf6782c1e414  gas/testsuite/gas/cris/branch.s
+37e147e4eb514712f5b6f1ce74aaf2fb  gas/testsuite/gas/cris/break.d
+700be97c0689c4196f0da1842abcc231  gas/testsuite/gas/cris/break.s
+67c29fc0a9c79da821c266dbda7689a0  gas/testsuite/gas/cris/brokw-1.d
+c5755e65bfd257cc35eaa9cc22206a73  gas/testsuite/gas/cris/brokw-1.s
+55ea6801fc6ab67be7d04335d28945bd  gas/testsuite/gas/cris/brokw-2.d
+fbe8c57fd8caa459cbd13aed974c0a08  gas/testsuite/gas/cris/brokw-2.s
+cc16707dcac40b6e6acc5ef6ba5f99ae  gas/testsuite/gas/cris/brokw-3.d
+c59672ea2393738a93f000bf6a4f3dd2  gas/testsuite/gas/cris/brokw-3.s
+cee1b959c4e6aa2fb7315c5713d1ba97  gas/testsuite/gas/cris/brokw-3b.s
+fe98cec7789da4690999c41bcdb2d451  gas/testsuite/gas/cris/bwtest-err-1.s
+7557d9513e8793d9d57b3d235f504e1c  gas/testsuite/gas/cris/ccr.d
+93770cdb47d3463657e205bd0fe81db4  gas/testsuite/gas/cris/ccr.s
+381a9ab58435188056b2f25d7ba4357c  gas/testsuite/gas/cris/clear.d
+73e539453e3fd4bd9b6d8993f6552a3c  gas/testsuite/gas/cris/continue.d
+dd8c355ecfa0c88d8d0269609f26da37  gas/testsuite/gas/cris/continue.s
+8194dd2f54a3ec0c012e0dde97171ee1  gas/testsuite/gas/cris/cris.exp
+69fc8204a5ff36146165b8fc3fcea2ac  gas/testsuite/gas/cris/diffexp-ovwr.d
+a4827654925418a4a48b98595a402e1c  gas/testsuite/gas/cris/diffexp-ovwr.s
+3e68a25e4fbaee80f92c36b18f617872  gas/testsuite/gas/cris/fragtest.d
+ac5f31bfb9b56f6b73e251468db85eb0  gas/testsuite/gas/cris/fragtest.s
+dbcb23737c31ce04080a64583b5aa301  gas/testsuite/gas/cris/jump-type.d
+35785b12fb4af7d06e1cb6c176b8d6ff  gas/testsuite/gas/cris/labfloat.d
+193f9aaf255857e1897a82b483b021f9  gas/testsuite/gas/cris/labfloat.s
+81585babaad1f52261151015eb4a967b  gas/testsuite/gas/cris/macroat.d
+c4213b954433bf3aba530e1d0ae31294  gas/testsuite/gas/cris/macroat.s
+ca9c91017df6f851be9fd90a69375669  gas/testsuite/gas/cris/march-err-1.s
+33a5f03480ba14f340dbc635a8d03805  gas/testsuite/gas/cris/march-err-2.s
+b1aed83f188faca64b30a3ea17ed25a7  gas/testsuite/gas/cris/movem-to-reg.d
+16167885542a9a27143ec29a7f6d3e9d  gas/testsuite/gas/cris/mulbug-err-1.s
+d6c6f41d90618cfbc9a6906bc01154c1  gas/testsuite/gas/cris/nosep.d
+3130381f901b0e035d9db56d3cd4a6d4  gas/testsuite/gas/cris/nosep.s
+34c9d4996bda0af5eff68b50336fe1c8  gas/testsuite/gas/cris/oneop-type.d
+ccb7110d35badd69f9adff1c71bbc08a  gas/testsuite/gas/cris/operand-err-1.s
+54190a464de7bc0ea25278f3e116ca6b  gas/testsuite/gas/cris/pic-err-1.s
+a9b04aa6510e199b61e3b6d29435a261  gas/testsuite/gas/cris/pic-err-2.s
+a6c8fcd3276be85611bc7139abeb9a31  gas/testsuite/gas/cris/pic-err-3.s
+4dc221a639f050b33118fee5c2ece649  gas/testsuite/gas/cris/prefix.d
+19af9d100ff80d76593ca93c4119da01  gas/testsuite/gas/cris/prefix.s
+b6aab04b800fd6556fbc8a45196fdbfb  gas/testsuite/gas/cris/push-err-1.s
+b52036a4d66575a330aee0806c2d3331  gas/testsuite/gas/cris/push-err-2.s
+bd84b062c31622e8a00f627566c4e5bc  gas/testsuite/gas/cris/pushpop-byte-sreg.d
+99abd207ab982e6c4b5c538faff1493d  gas/testsuite/gas/cris/pushpop-dcr1-sreg.d
+03b76091d17405f7658174e77dce71fc  gas/testsuite/gas/cris/pushpop-dword-sreg.d
+022fee8710dcfd4dfb14d06be1cd7a68  gas/testsuite/gas/cris/pushpop-word-sreg.d
+61a4f6c943509667980199db013817f7  gas/testsuite/gas/cris/pushpop.d
+1ffbba2b760c1b6319dbc869060db0e4  gas/testsuite/gas/cris/pushpop.s
+b7370a2013b7307040d9751520a13165  gas/testsuite/gas/cris/pushpopv32.s
+8ac4149babbed9ae66a40db6ebe094a0  gas/testsuite/gas/cris/quick-s6.d
+f5b3264bade3e45e54ceea8d9df00c5c  gas/testsuite/gas/cris/quick-u5.d
+2c932ddd6929e90f4a4780ea206b0207  gas/testsuite/gas/cris/quick-u6.d
+aee73b1e0d6b950ee94745e9bc1d8586  gas/testsuite/gas/cris/quick.s
+d199c4beca07600cd7ff05108419cc5e  gas/testsuite/gas/cris/range-err-1.s
+f4b1aa0daf09ff6d724794cbf97c2a31  gas/testsuite/gas/cris/range-err-2.s
+87654b9172aa966303b7116981c57228  gas/testsuite/gas/cris/rd-abs32-1.d
+fbbb8706b858763ee74eea38dae8ede4  gas/testsuite/gas/cris/rd-abs32-2.d
+b06fd1821a11ee736fc8b0420aef36b7  gas/testsuite/gas/cris/rd-arch-1.d
+41e1008449e9ce91acbeb34a4e6df586  gas/testsuite/gas/cris/rd-arch-2.d
+3b9c63265d7fac6d6907b5dc38d34102  gas/testsuite/gas/cris/rd-arch-3.d
+38de3a7dfccae7982fca66e5b07d1e7e  gas/testsuite/gas/cris/rd-bcnst-pic.d
+bb3d776febb87e96a08c591167f933d2  gas/testsuite/gas/cris/rd-bcnst.d
+887cfb53bfffd62076d06c51c121e50a  gas/testsuite/gas/cris/rd-bcnst.s
+53d39e9f53e7244e5ab6634b4a50e038  gas/testsuite/gas/cris/rd-bcnst2-pic.d
+1f40d077f9fb34cd31a87dd4310267fa  gas/testsuite/gas/cris/rd-bcnst2.d
+a41f2e43b3dc0bef72079de14608e205  gas/testsuite/gas/cris/rd-bcnst2.s
+80e0dd503723bf9da8cbcceb422486bf  gas/testsuite/gas/cris/rd-bkw1b.d
+cbd7e8f5a14aaa74c7fb0fd5fb97dbcd  gas/testsuite/gas/cris/rd-bkw2b.d
+02ae58e3a53206f358a097f86db4d126  gas/testsuite/gas/cris/rd-bkw3b.d
+24897332d26e514248bb5c8fe03ea80b  gas/testsuite/gas/cris/rd-bkw4.d
+d6d4622ed39bab9a08a0d0fdef6331df  gas/testsuite/gas/cris/rd-bkw4.s
+1a845c01bef1653f34626e530e307df4  gas/testsuite/gas/cris/rd-bkw4v32.d
+b0e882cf4dc19eeeb123f9ac9fe8b9fc  gas/testsuite/gas/cris/rd-bkw5.d
+f8bd6023b56ddb4c793ffd742c2120d0  gas/testsuite/gas/cris/rd-bkw5.s
+e444bb4d029956336aa111b822e9b189  gas/testsuite/gas/cris/rd-bkw5b.d
+80b267bd21347bdfe9c86ca92ac28a53  gas/testsuite/gas/cris/rd-bkw5bpic.d
+9ff6aa17de0ec6788d228b83d3758899  gas/testsuite/gas/cris/rd-bkw5bv32.d
+4aefdc218caac8de36190a5494e1d554  gas/testsuite/gas/cris/rd-bkw5bv32pic.d
+47a06af17ec80399820a8f657a213ef4  gas/testsuite/gas/cris/rd-bkw5pic.d
+02adeedd3fad5082488198eb80a46ff0  gas/testsuite/gas/cris/rd-bkw5v32.d
+3a75b30844c91863959b9a000f4454ca  gas/testsuite/gas/cris/rd-bkw5v32pic.d
+8fedf55754c77ebf28dad9da1f3bd537  gas/testsuite/gas/cris/rd-bound1.d
+7e268acd25fd255f6fdac6b3aef9e2e7  gas/testsuite/gas/cris/rd-bound1.s
+b718a753c99bd3535fd596957d5c0a29  gas/testsuite/gas/cris/rd-bound2.d
+5a62aa3561a6210f53284a44f43854bd  gas/testsuite/gas/cris/rd-bound3.d
+c15f1340900e4aa4b0b9dfbf6040d603  gas/testsuite/gas/cris/rd-bound4.d
+6cb9399f4097d45bf385f6262b67cf78  gas/testsuite/gas/cris/rd-branch-pic.d
+aeeee72d47d9613e56027bea53449559  gas/testsuite/gas/cris/rd-break32.d
+dbf7c5b8495ec0752f6ac21ddfcc63c6  gas/testsuite/gas/cris/rd-brokw-pic-1.d
+4333de46ebccc54fda3e915e68786e0b  gas/testsuite/gas/cris/rd-brokw-pic-2.d
+77fc8d4f667372a41674a464a69ad830  gas/testsuite/gas/cris/rd-brokw-pic-3.d
+2a43ca4c7bc216eb3a15a2b4b3eca0de  gas/testsuite/gas/cris/rd-dtpoffd1.d
+73ec340e175057c968836d75d36e9331  gas/testsuite/gas/cris/rd-dtpoffd1.s
+f883d81fdb8a7d818e7773cbce82d731  gas/testsuite/gas/cris/rd-dw2-1.d
+b840a286e39f0e9d98c77a3779bbb012  gas/testsuite/gas/cris/rd-dw2-10.d
+469e8c9e4f6d2895184bb8b93cad1918  gas/testsuite/gas/cris/rd-dw2-11.d
+d9be8f970588936acb1cc79984f2e24c  gas/testsuite/gas/cris/rd-dw2-12.d
+4203f32173310ca98c76585f571fff6d  gas/testsuite/gas/cris/rd-dw2-13.d
+9ada8fdf55f357d6eb37784821650ecb  gas/testsuite/gas/cris/rd-dw2-14.d
+bee6f173d0fb62f25524bcf086c444c2  gas/testsuite/gas/cris/rd-dw2-15.d
+4de38ba6681210cc01ccd89bf7f24643  gas/testsuite/gas/cris/rd-dw2-2.d
+99b844d0272174dc06ccfa5e27202251  gas/testsuite/gas/cris/rd-dw2-3.d
+8a39a4a868db728fc820f78d73059ff5  gas/testsuite/gas/cris/rd-dw2-4.d
+89faabe6c550c0248f1a42c0696f8bcb  gas/testsuite/gas/cris/rd-dw2-5.d
+4f3b242744fb959fcb9e929fef31b871  gas/testsuite/gas/cris/rd-dw2-6.d
+1f18d3943be18bc19124a6fef9b62416  gas/testsuite/gas/cris/rd-dw2-7.d
+83bc68a39958ef6bb9d3e546a2d962cf  gas/testsuite/gas/cris/rd-dw2-8.d
+b007b686949c2a85642fb3c7560d713d  gas/testsuite/gas/cris/rd-dw2-9.d
+dd4c2072ef204f706d33f37b94ae1dca  gas/testsuite/gas/cris/rd-fragtest-pic.d
+0c92a0ee53d0e2068874cebbed63046b  gas/testsuite/gas/cris/rd-mulbug-1.d
+ea81ec94bfbecb645cccaa9c380070b2  gas/testsuite/gas/cris/rd-pcplus.d
+fa2429278ecbfd6c9c99686de916d5b7  gas/testsuite/gas/cris/rd-pcplus.s
+e30f7a5b9965662525c1c642c2a98895  gas/testsuite/gas/cris/rd-pcrel1.d
+02ca0e5e43a7c43024f98ee7db1e7957  gas/testsuite/gas/cris/rd-pcrel1.s
+1d7701543665de7bac283a25ca3a6cd5  gas/testsuite/gas/cris/rd-pcrel2.d
+f634c6fbd3de5d44a40b1ecb80f5029f  gas/testsuite/gas/cris/rd-pcrel2.s
+abdd4fe964370e37e0b84586ed7ed513  gas/testsuite/gas/cris/rd-pic-1.d
+ccf5b33dcc1af17dea262cf4412b6a7c  gas/testsuite/gas/cris/rd-pic-1.s
+9997d9085ed3b90ecc7ce23efd068a31  gas/testsuite/gas/cris/rd-pic-2.d
+315455e9aa9c47febc500f958bdb9c4b  gas/testsuite/gas/cris/rd-pic-2.s
+4b6b67d7cdf2d0f9d58ef94e0b27eb14  gas/testsuite/gas/cris/rd-ppv1032.d
+f0f81cdede11543b30a1c53ea71c78a7  gas/testsuite/gas/cris/rd-ppv32.d
+60be0bff36db7d7930a178b2deeb8f2e  gas/testsuite/gas/cris/rd-regprefix-1.d
+483b2b941bdac034989505d636c292bb  gas/testsuite/gas/cris/rd-regprefix-1.s
+1d2c07c7a5bee4af6856d5221f15dae0  gas/testsuite/gas/cris/rd-regprefix-1b.d
+5b25b42b26ce4de5bb0452260411806c  gas/testsuite/gas/cris/rd-spr-1.d
+bc96a6e23e68c6999716695ea7a5de9c  gas/testsuite/gas/cris/rd-spr-1.s
+e6412235713caed6efc0c2fa5e90041c  gas/testsuite/gas/cris/rd-tls-1.d
+2e691298af3f23a0107fedf627cca844  gas/testsuite/gas/cris/rd-tls-1.s
+5a05716ff82e7bbeb15f8f3425874c36  gas/testsuite/gas/cris/rd-tls-2.d
+4200c07d3f74e0618ff211e1c63c70b2  gas/testsuite/gas/cris/rd-tls-2.s
+54359bda6ad5b54ac8da19cf65849a97  gas/testsuite/gas/cris/rd-usp-1.d
+4f9127ae060ba8216e152ef0c71c9645  gas/testsuite/gas/cris/rd-usp-1b.d
+7d2796d5da74d021533e3c535893a004  gas/testsuite/gas/cris/rd-v10_32o-1.d
+9e419f5ca2442c3c2f0fdc758cddd4f6  gas/testsuite/gas/cris/rd-v10_32o-2.d
+141e2cc83b0c4d18262f3f7e5d83034a  gas/testsuite/gas/cris/rd-v10_32o-2.s
+c17b6c607d61d7e88dc9e85bd4e1eae2  gas/testsuite/gas/cris/rd-v32-b1.d
+583d342f4ba5db90881fa7ae5db515b9  gas/testsuite/gas/cris/rd-v32-b1.s
+d33ef2b6c1ae0e563ea77429a5b24a03  gas/testsuite/gas/cris/rd-v32-b2.d
+d75bc4a3b0511679908c915c1bf5abd1  gas/testsuite/gas/cris/rd-v32-b2.s
+2ad59b2c6c8fd6b7a76fefcb8da58368  gas/testsuite/gas/cris/rd-v32-b3.d
+54dc335e99beee975da87ea6aea85343  gas/testsuite/gas/cris/rd-v32-b3.s
+e5241edc51b574e736936eb11fc960ac  gas/testsuite/gas/cris/rd-v32-f1.d
+5a84f8fc85efcbcd6d552b383ba26b93  gas/testsuite/gas/cris/rd-v32-f1.s
+199f57615b3169a9c21c729443e7df42  gas/testsuite/gas/cris/rd-v32-i1.d
+35d23542a164995c117645d63cdcd8ce  gas/testsuite/gas/cris/rd-v32-i1.s
+83b9630e3e01575a01c820893180a62b  gas/testsuite/gas/cris/rd-v32-l1.d
+df1a8ccf1739f6c6fcbcadbbd194eee7  gas/testsuite/gas/cris/rd-v32-l1.s
+496c90e0064eefa0cc3b13fa015aab88  gas/testsuite/gas/cris/rd-v32-l3.d
+de3970326a5fc8c860a8229120a69b38  gas/testsuite/gas/cris/rd-v32-l3.s
+3b2607477ce580eeb6d97109aec5ceb9  gas/testsuite/gas/cris/rd-v32-l4.d
+a1709ba73388e4291e6b5ad8fa0f3fd0  gas/testsuite/gas/cris/rd-v32-l4.s
+d5560ad66ae450b2ae04c8dd91dce5b4  gas/testsuite/gas/cris/rd-v32o-1.d
+036b3afb258126aa97cf84ae4b737da9  gas/testsuite/gas/cris/rd-v32s-1.d
+82aaa096d5b7276e9724221f3e4d9432  gas/testsuite/gas/cris/rd-v32s-2.d
+584be3722f0da53d19568ff08b380304  gas/testsuite/gas/cris/rd-v32s-2.s
+65e72621ee681a2f3a439b65c6e2a6bf  gas/testsuite/gas/cris/rd-v32s-3.d
+c06fa82f8e9e3be58811ce113dd36258  gas/testsuite/gas/cris/rd-v32s-3.s
+417cf8983da991dbfbc61613c962e09d  gas/testsuite/gas/cris/rd-v32s-4.d
+f390e89de781fbc35861705fc43dbba1  gas/testsuite/gas/cris/rd-v32s-4.s
+db856e6fc4ae72ab654b0c4f895fe4f3  gas/testsuite/gas/cris/rd-vao-1.d
+5f67e0e704f6ce290303f00d51ef7c55  gas/testsuite/gas/cris/reg-to-mem.d
+c36b1354d494fa3d14e0f53cbdad14d1  gas/testsuite/gas/cris/regprefix-err-1.s
+a523421fc87b21ff25f964a228e6aac2  gas/testsuite/gas/cris/regreg.d
+8763ceed68b5ad9786d5bb3f89360751  gas/testsuite/gas/cris/regreg.s
+f0fc22a773b1b891a2606a280254433f  gas/testsuite/gas/cris/return.d
+618b1c16f597a8c927d63668befe360c  gas/testsuite/gas/cris/return.s
+b8f8d6862937a6279c42fa72c492b792  gas/testsuite/gas/cris/scc.d
+41907f8e76731a8a8f634b2051a7ba39  gas/testsuite/gas/cris/scc.s
+590ff33c1d17500de6e318d5c5cc182e  gas/testsuite/gas/cris/sep-err-1.s
+fa730ce7e78cb91f38aba30b04251950  gas/testsuite/gas/cris/sep-err-2.s
+3a91d88ae724651f642323a1028dfe19  gas/testsuite/gas/cris/sep-err-3.s
+951d228072201ef134c86189dd1e39cd  gas/testsuite/gas/cris/separator.d
+e929807163f06ba801c4d3d98eef047a  gas/testsuite/gas/cris/separator.s
+4ed019e17046994aef096b29d48b679c  gas/testsuite/gas/cris/shexpr-1.d
+b75dd310987e66aa243a2bdffc008924  gas/testsuite/gas/cris/shexpr-1.s
+0b4ab8bdfecfb175308776f1b30f9267  gas/testsuite/gas/cris/sreg-to-x.d
+79761ddc12c3f3bd14ed8b6133fd670f  gas/testsuite/gas/cris/string-1.d
+ba96569c4c3a69683f9eda2f2e804ac9  gas/testsuite/gas/cris/string-1.s
+9580648fead8dc356cede71f7bfaae5b  gas/testsuite/gas/cris/string-2.d
+6ddd84549c2ae105a7ffc9e339d1e37e  gas/testsuite/gas/cris/string-2.s
+8976b9e2fc8cf3b2f9f2237caaf79ffd  gas/testsuite/gas/cris/test.d
+302d72eb4daf587198a5ff031318e6c3  gas/testsuite/gas/cris/tls-err-1.s
+1531b311c51a36060dafd267f0b96d40  gas/testsuite/gas/cris/tls-err-2.s
+979a0fe73b3772a60d9af523acb7079a  gas/testsuite/gas/cris/tls-err-3.s
+52f4d98cdb0aaf81048821675acc4381  gas/testsuite/gas/cris/unimplemented.d
+9ff0ef66a3c7733fd200cc4317d56ad7  gas/testsuite/gas/cris/unimplemented.s
+4fa062b6659daef0d47160ec64bd62a5  gas/testsuite/gas/cris/unop-mem.d
+65f2499748e491be121588287a7f3e05  gas/testsuite/gas/cris/unop.s
+75063b64ce4c7ce0ccb58e946587b1fb  gas/testsuite/gas/cris/us-err-1.s
+57983a53289a7da6c1ed399d7fe0a3e9  gas/testsuite/gas/cris/us-err-2.s
+89b77f3261be6a0b6f7c2117ec573b35  gas/testsuite/gas/cris/us-err-3.s
+f6b7268bebfffff3bedd6745403a94ad  gas/testsuite/gas/cris/v32-err-1.s
+8d4065621889f2c0f5030cb4a935ba0a  gas/testsuite/gas/cris/v32-err-10.s
+445af9b99d3d33f3f421bb2757e4ff9b  gas/testsuite/gas/cris/v32-err-11.s
+7a56b86ef049cf26c8812cc94991693d  gas/testsuite/gas/cris/v32-err-2.s
+2a130988c660af456beb51f57ee587c7  gas/testsuite/gas/cris/v32-err-3.s
+48167e521e41a2b20e643adaf0fc653a  gas/testsuite/gas/cris/v32-err-4.s
+8590a58794f69782cb98bbc7b4287fd1  gas/testsuite/gas/cris/v32-err-5.s
+e6775fffe200cf9bb051f4155b8d91e3  gas/testsuite/gas/cris/v32-err-6.s
+5b258ee6efc6766cadf23398030e1e79  gas/testsuite/gas/cris/v32-err-7.s
+cac65aedce61344d081bc1f9cbf15806  gas/testsuite/gas/cris/v32-err-8.s
+c2d8c1083f8564bad89df2010a5d253a  gas/testsuite/gas/cris/v32-err-9.s
+2a5f4f6e4b310f1d6d19ddc58bfac9ec  gas/testsuite/gas/cris/x-to-byte-sreg.d
+7577002f17af669f7a8144e7858ce3f1  gas/testsuite/gas/cris/x-to-dcr1-sreg.d
+8281e49c3dd60d6d278fbb9440e43e04  gas/testsuite/gas/cris/x-to-dword-sreg.d
+69a3a4886bef70933479dc77967ea4a4  gas/testsuite/gas/cris/x-to-word-sreg.d
+fd3826ff356aeb79099fe12ef4bfd7a2  gas/testsuite/gas/crx/allinsn.exp
+3e987ea3eacfcf73365affb85a80711e  gas/testsuite/gas/crx/arith_insn.d
+aba23cd9217a02e80972420bccf254e2  gas/testsuite/gas/crx/arith_insn.s
+b124860509067a033fa183b2ad52d2ff  gas/testsuite/gas/crx/beq_insn.d
+cbb2a2a8ebdd76c365b03c090d6cb349  gas/testsuite/gas/crx/beq_insn.s
+7cb7bdb36a00efc14f2d9d7f5e9a4320  gas/testsuite/gas/crx/bit_insn.d
+a9b88867e985c7db06ad15f8aed69fca  gas/testsuite/gas/crx/bit_insn.s
+2b30807be764914b1a7fbbced315558e  gas/testsuite/gas/crx/br_insn.d
+5792c9d2f7ece4e813e9c05f17ad8b50  gas/testsuite/gas/crx/br_insn.s
+a5a2bacc16b436e31ff8f4394ae83a4a  gas/testsuite/gas/crx/cmov_insn.d
+63c662f08a3c53d41bdb1cd589911125  gas/testsuite/gas/crx/cmov_insn.s
+4725fa0812c37cafe5665570eb980a3e  gas/testsuite/gas/crx/cmpbr_insn.d
+5a15f070cce2a4aaa04f05391dc94f07  gas/testsuite/gas/crx/cmpbr_insn.s
+c24edb48e5f07071ef62edc096db1b92  gas/testsuite/gas/crx/cop_insn.d
+8267a9f074d80bef654bc891bfbf3c4e  gas/testsuite/gas/crx/cop_insn.s
+3f31371f16ed2712dff17f56418fe8f1  gas/testsuite/gas/crx/gas-segfault.d
+a4be774abcf6e0707218424a9c203403  gas/testsuite/gas/crx/gas-segfault.s
+5a36de150e79a77e8b5f65751ba36cb6  gas/testsuite/gas/crx/jscond_insn.d
+42a3455c0057de5509e92e528b5634a7  gas/testsuite/gas/crx/jscond_insn.s
+b18f9705c8d99b0d9ee4e2c06aa4c45f  gas/testsuite/gas/crx/list_insn.d
+df6b3c2f77acba7e752cf5a1d0742608  gas/testsuite/gas/crx/list_insn.s
+fc9912552067eac4342d4521f193a797  gas/testsuite/gas/crx/load_stor_insn.d
+2090bee5c0dc703ebbcfb784a806a0ca  gas/testsuite/gas/crx/load_stor_insn.s
+bcdceae61722cbe0b8237640e2467e2d  gas/testsuite/gas/crx/misc_insn.d
+82dc4fb42dcadde5747959f171498f91  gas/testsuite/gas/crx/misc_insn.s
+3e1001d41b139bba1668d84c1e8e6f9c  gas/testsuite/gas/crx/no_op_insn.d
+bc07c25881db9dc098eb887754269119  gas/testsuite/gas/crx/no_op_insn.s
+a154b3ae513a0e46db59528b375bd448  gas/testsuite/gas/crx/shift_insn.d
+3a16320540ca68bf9f993705955f4e7d  gas/testsuite/gas/crx/shift_insn.s
+a6735576ee0c12f574d2b2c059292050  gas/testsuite/gas/d10v/address-001.d
+7d9144fec165ca66fe3ad1a06a5c735d  gas/testsuite/gas/d10v/address-001.s
+7560d23743649b2f31b7508718eb54f7  gas/testsuite/gas/d10v/address-002.l
+948ab3f723a9f6081583dc3dbb570a54  gas/testsuite/gas/d10v/address-002.s
+4ec4f480ca9855c2f3f88eaad03e4ee5  gas/testsuite/gas/d10v/address-003.l
+9bf77c8372dd9b5ea2e9a272454cc74c  gas/testsuite/gas/d10v/address-003.s
+89b79f4f9098b6e93a3936283d1396d8  gas/testsuite/gas/d10v/address-004.l
+4a1380df3b54fe89f70fcca01058e7a6  gas/testsuite/gas/d10v/address-004.s
+7560d23743649b2f31b7508718eb54f7  gas/testsuite/gas/d10v/address-005.l
+fdaa4bfe9faf758e3a0a3ce02fa4bdad  gas/testsuite/gas/d10v/address-005.s
+6ccc5e077b308eb4ead744a09b0f6341  gas/testsuite/gas/d10v/address-006.l
+bb98abbfe16da4e235bd56dbb6a30bae  gas/testsuite/gas/d10v/address-006.s
+89b79f4f9098b6e93a3936283d1396d8  gas/testsuite/gas/d10v/address-007.l
+7b596f346fb988718153666bf5a0895b  gas/testsuite/gas/d10v/address-007.s
+7560d23743649b2f31b7508718eb54f7  gas/testsuite/gas/d10v/address-008.l
+0f45aff1c35f0d1d2f59af79d4ef748c  gas/testsuite/gas/d10v/address-008.s
+6ccc5e077b308eb4ead744a09b0f6341  gas/testsuite/gas/d10v/address-009.l
+b50ad1bd41b6af810bd6b8201d2f46c9  gas/testsuite/gas/d10v/address-009.s
+0a72d08339e166994805d7ab5f2c91c5  gas/testsuite/gas/d10v/address-010.l
+3a4f4f6a0ffa505ba3563f71b05d3a3e  gas/testsuite/gas/d10v/address-010.s
+895f588aa38be710d59bb0c5b04b7de6  gas/testsuite/gas/d10v/address-011.l
+685a24a9aa24fcd5d590933af5b47543  gas/testsuite/gas/d10v/address-011.s
+89b79f4f9098b6e93a3936283d1396d8  gas/testsuite/gas/d10v/address-012.l
+34a95c3e0aea73e7e3b6547fe793efd1  gas/testsuite/gas/d10v/address-012.s
+c19dfccdd9bcb8e8a436d6747079182a  gas/testsuite/gas/d10v/address-013.l
+0b14438b4898eedbf765234cd480d7ff  gas/testsuite/gas/d10v/address-013.s
+1efed80c33066e94fdd64cbbd497fe7e  gas/testsuite/gas/d10v/address-014.l
+aa095fa01b6c38d02cfcc448316e9a6c  gas/testsuite/gas/d10v/address-014.s
+7560d23743649b2f31b7508718eb54f7  gas/testsuite/gas/d10v/address-015.l
+2506f8c079a983cb132717ef73c80fa3  gas/testsuite/gas/d10v/address-015.s
+6ccc5e077b308eb4ead744a09b0f6341  gas/testsuite/gas/d10v/address-016.l
+4f27f1bc67b609681cbfe5f684b11b6a  gas/testsuite/gas/d10v/address-016.s
+0a72d08339e166994805d7ab5f2c91c5  gas/testsuite/gas/d10v/address-017.l
+9262a32c20f38112a0c08e9533b5547b  gas/testsuite/gas/d10v/address-017.s
+895f588aa38be710d59bb0c5b04b7de6  gas/testsuite/gas/d10v/address-018.l
+5cb688834e2f1a9cf56595e1a216e521  gas/testsuite/gas/d10v/address-018.s
+89b79f4f9098b6e93a3936283d1396d8  gas/testsuite/gas/d10v/address-019.l
+4be0863b6f79110432da78f2e973d519  gas/testsuite/gas/d10v/address-019.s
+c19dfccdd9bcb8e8a436d6747079182a  gas/testsuite/gas/d10v/address-020.l
+d371cb2c059fb37c28c157a3f8106622  gas/testsuite/gas/d10v/address-020.s
+1efed80c33066e94fdd64cbbd497fe7e  gas/testsuite/gas/d10v/address-021.l
+4ad7b1e71bf3ac5e7295503ead61a165  gas/testsuite/gas/d10v/address-021.s
+7560d23743649b2f31b7508718eb54f7  gas/testsuite/gas/d10v/address-022.l
+0f63425dd36dc9d0f9003eb66776a0ad  gas/testsuite/gas/d10v/address-022.s
+6ccc5e077b308eb4ead744a09b0f6341  gas/testsuite/gas/d10v/address-023.l
+1f0b933d6ed26d0670764491d57675a1  gas/testsuite/gas/d10v/address-023.s
+89b79f4f9098b6e93a3936283d1396d8  gas/testsuite/gas/d10v/address-024.l
+fedaf4c469f76a0c29d38efb8ca976e9  gas/testsuite/gas/d10v/address-024.s
+7560d23743649b2f31b7508718eb54f7  gas/testsuite/gas/d10v/address-025.l
+067d35e555edcf186ffd68315f215f52  gas/testsuite/gas/d10v/address-025.s
+6ccc5e077b308eb4ead744a09b0f6341  gas/testsuite/gas/d10v/address-026.l
+76917214750d255c71ebdf890b8c56e6  gas/testsuite/gas/d10v/address-026.s
+89b79f4f9098b6e93a3936283d1396d8  gas/testsuite/gas/d10v/address-027.l
+43657705163613ef157c7912c1df27e6  gas/testsuite/gas/d10v/address-027.s
+f10bfd419dd15e2a9cb5a3e58825089d  gas/testsuite/gas/d10v/address-028.l
+a4c4fb94bbb8320b11ec9dd48ae27d2d  gas/testsuite/gas/d10v/address-028.s
+f10bfd419dd15e2a9cb5a3e58825089d  gas/testsuite/gas/d10v/address-029.l
+25a6da12fb57ce20919d3cad3599abe5  gas/testsuite/gas/d10v/address-029.s
+7560d23743649b2f31b7508718eb54f7  gas/testsuite/gas/d10v/address-030.l
+d0c93960ea840e21f8780c52bb442e8f  gas/testsuite/gas/d10v/address-030.s
+6ccc5e077b308eb4ead744a09b0f6341  gas/testsuite/gas/d10v/address-031.l
+97ea79a8423cee83fe06562c647bc94e  gas/testsuite/gas/d10v/address-031.s
+0a72d08339e166994805d7ab5f2c91c5  gas/testsuite/gas/d10v/address-032.l
+d4e7dc3e5820dd6e0996f4893a911409  gas/testsuite/gas/d10v/address-032.s
+895f588aa38be710d59bb0c5b04b7de6  gas/testsuite/gas/d10v/address-033.l
+2d3547a90bf1a21b53a970794821d359  gas/testsuite/gas/d10v/address-033.s
+89b79f4f9098b6e93a3936283d1396d8  gas/testsuite/gas/d10v/address-034.l
+897b7c7073bd4d6031db1db40c95b179  gas/testsuite/gas/d10v/address-034.s
+c19dfccdd9bcb8e8a436d6747079182a  gas/testsuite/gas/d10v/address-035.l
+f081717902bdff5adfb1b5325c01fb12  gas/testsuite/gas/d10v/address-035.s
+1efed80c33066e94fdd64cbbd497fe7e  gas/testsuite/gas/d10v/address-036.l
+575f3a5fd93fe848f910e9addd328afb  gas/testsuite/gas/d10v/address-036.s
+7560d23743649b2f31b7508718eb54f7  gas/testsuite/gas/d10v/address-037.l
+09328faa8faa3c898aca59816c077fd7  gas/testsuite/gas/d10v/address-037.s
+6ccc5e077b308eb4ead744a09b0f6341  gas/testsuite/gas/d10v/address-038.l
+3a9ab467bc5e75d7c5a4ea9492d1810c  gas/testsuite/gas/d10v/address-038.s
+0a72d08339e166994805d7ab5f2c91c5  gas/testsuite/gas/d10v/address-039.l
+a278ead57d83625ded4d92bdad8f2be0  gas/testsuite/gas/d10v/address-039.s
+895f588aa38be710d59bb0c5b04b7de6  gas/testsuite/gas/d10v/address-040.l
+4b42438d94a456bd985090fa4033ad72  gas/testsuite/gas/d10v/address-040.s
+89b79f4f9098b6e93a3936283d1396d8  gas/testsuite/gas/d10v/address-041.l
+e2bf48e0e29a2b3911c5320c140896ec  gas/testsuite/gas/d10v/address-041.s
+96f8269730cb7b20bff497a07ccd22ae  gas/testsuite/gas/d10v/control-001.d
+31e42fb6ff602fa691470418a63bf019  gas/testsuite/gas/d10v/control-001.s
+02b28f15b91168a0ee60fcf058251ebb  gas/testsuite/gas/d10v/d10v.exp
+393b4ca54f7246945a011a41161f4779  gas/testsuite/gas/d10v/error-001.d
+c6fc3df219367e9406b8e9f49afb7691  gas/testsuite/gas/d10v/error-001.s
+b28ba5ae138c1b9870b87d5d552ce19f  gas/testsuite/gas/d10v/error-002.d
+7757def524bdcdf4fb13ed30ea1313c5  gas/testsuite/gas/d10v/error-002.s
+34be3bde4d7abf2a2af2360598f0439e  gas/testsuite/gas/d10v/immediate-001.d
+2f7c161f6a15281d77b748199d7dcdcc  gas/testsuite/gas/d10v/immediate-001.s
+5cfb3cbbf2cda20ef538166610ad042b  gas/testsuite/gas/d10v/immediate-002.d
+d1486aa919e0b677eb9471e433c71e05  gas/testsuite/gas/d10v/immediate-002.s
+68c670aec179411c8fc6692ea96c4340  gas/testsuite/gas/d10v/immediate-003.d
+1694322013c7bff57ff63937eec8cf91  gas/testsuite/gas/d10v/immediate-003.s
+eebde16759c4128196a540f786916288  gas/testsuite/gas/d10v/immediate-004.d
+d554505672cfee59b2b50ce774d85125  gas/testsuite/gas/d10v/immediate-004.s
+9f62d1c8d26587caa11e52225387d546  gas/testsuite/gas/d10v/immediate-005.d
+4c9cfe5e63f84990138cab6bbe7f3800  gas/testsuite/gas/d10v/immediate-005.s
+557b913559a46f6a4ed22bdc33fa0d98  gas/testsuite/gas/d10v/immediate-006.d
+beb3253b69a29d40b68529b496a16925  gas/testsuite/gas/d10v/immediate-006.s
+cae8c0e3d71ef8fecaeac082fc3c9db9  gas/testsuite/gas/d10v/immediate-007.d
+666d4c75265b6bb9d4a07d772c61fc36  gas/testsuite/gas/d10v/immediate-007.s
+0004da131d3e5488db3b4b89bd259250  gas/testsuite/gas/d10v/inst.d
+bbe173f89d3ad611d31b7cf43d88291c  gas/testsuite/gas/d10v/inst.s
+703900315d829359b771c6c7d2ce84dd  gas/testsuite/gas/d10v/instruction_packing-001.d
+a8a4aed02672bf45f5f2ff57b8e2522e  gas/testsuite/gas/d10v/instruction_packing-001.s
+bb8ed73cacebacaa465da8e059b49cd7  gas/testsuite/gas/d10v/instruction_packing-002.d
+eaccafae10a88e66fe63b2519185ecd4  gas/testsuite/gas/d10v/instruction_packing-002.s
+13d85864087099bb01ecd6e55e20d79d  gas/testsuite/gas/d10v/instruction_packing-003.d
+ad736e41ad341cfe730a1fb3e933d09c  gas/testsuite/gas/d10v/instruction_packing-003.s
+f4b3361179e57452f47cf5e0572d27e3  gas/testsuite/gas/d10v/instruction_packing-004.d
+58ecf26d8fe2178ba5532734e55a43b0  gas/testsuite/gas/d10v/instruction_packing-004.s
+c2c630337066f77375fb3628d4c755fc  gas/testsuite/gas/d10v/instruction_packing-005.d
+566863f704902f29a0e831a8abeb4a2c  gas/testsuite/gas/d10v/instruction_packing-005.s
+e6c0acb54a5f28a93b2b45178f4d1584  gas/testsuite/gas/d10v/instruction_packing-006.d
+cc4a736bc152e266c2b882f9204f2022  gas/testsuite/gas/d10v/instruction_packing-006.s
+aa6486f80a5da199434db5ca3215a716  gas/testsuite/gas/d10v/instruction_packing-007.d
+9f04908e67fb3d025225b796d2900c5a  gas/testsuite/gas/d10v/instruction_packing-007.s
+2bbe1f59eea6fcea81003dddb81af982  gas/testsuite/gas/d10v/instruction_packing-008.d
+db8d769826d613ef6002637c9972c97c  gas/testsuite/gas/d10v/instruction_packing-009.d
+d3dcf857bf3c33952c1071f8683fa604  gas/testsuite/gas/d10v/instruction_packing-010.d
+d54202c4d33b6c5958d75017b61e3758  gas/testsuite/gas/d10v/instruction_packing.d
+ed5a04fc691e6a2f4d4c811292306714  gas/testsuite/gas/d10v/instruction_packing.s
+f5ab3a0ce647dd181e77661c66260821  gas/testsuite/gas/d10v/label-001.d
+19e726902a0cd1ec9e5a2d2f9cb0d474  gas/testsuite/gas/d10v/label-001.s
+f7bcb24ed525edb26ec6424d1a242848  gas/testsuite/gas/d10v/warning-001.d
+8c205e27f60d4cdbb9293c8a69d47ac6  gas/testsuite/gas/d10v/warning-001.s
+de9084f1a7e1dc8180d6b8204d46ce35  gas/testsuite/gas/d10v/warning-002.d
+b4bad3f3fb9e81f220e4522b356eb039  gas/testsuite/gas/d10v/warning-002.s
+5043c3c8800c94c125d6b9a1a6351beb  gas/testsuite/gas/d10v/warning-003.d
+ddb47cffbc7242287346181dd0d6da04  gas/testsuite/gas/d10v/warning-003.s
+38c9412fbed21d1b63d464d26266d5e4  gas/testsuite/gas/d10v/warning-004.d
+90659d9da2c0b85164b96fec93415117  gas/testsuite/gas/d10v/warning-004.s
+ad9c8aad9e2e537a648abb7912129b10  gas/testsuite/gas/d10v/warning-005.d
+aa87347e149cf1b8347ea1e86a2c5b3f  gas/testsuite/gas/d10v/warning-005.s
+97b968299e90d656d819df84b9f98fd4  gas/testsuite/gas/d10v/warning-006.d
+6bd930772199c5e812b362dbaf4e19de  gas/testsuite/gas/d10v/warning-006.s
+66834da80e3ee27cefb5a0a9a7312c66  gas/testsuite/gas/d10v/warning-007.d
+aa87347e149cf1b8347ea1e86a2c5b3f  gas/testsuite/gas/d10v/warning-007.s
+c52224928ec9e958cc34fc49bd846467  gas/testsuite/gas/d10v/warning-008.d
+ffb56773428f111baa5d8d04866a3c45  gas/testsuite/gas/d10v/warning-008.s
+99eafcb9a6d69962fc3e9faebe0d6036  gas/testsuite/gas/d10v/warning-009.d
+ee0c3a9bec78dd98e564a69b3ee84854  gas/testsuite/gas/d10v/warning-009.s
+ff2a03040d31cfce536106965db07150  gas/testsuite/gas/d10v/warning-010.d
+f587eb6b2169718f85e6fac4a2bb5741  gas/testsuite/gas/d10v/warning-010.s
+54e69f5600e8a2da615cc33a573d2777  gas/testsuite/gas/d10v/warning-011.d
+09899975395b8d0ca1dcea3ead5a9a09  gas/testsuite/gas/d10v/warning-011.s
+5e1b0ccfbcae985f0372c972168c0c63  gas/testsuite/gas/d10v/warning-012.d
+2b735788395407f53e9cfb276465c6cf  gas/testsuite/gas/d10v/warning-012.s
+3ea377bcaed87eeaba53c80f3f187312  gas/testsuite/gas/d10v/warning-013.d
+e7846e49161841e07c02500c7cb45f9e  gas/testsuite/gas/d10v/warning-013.s
+982847efd277460e4597950f90c52cd8  gas/testsuite/gas/d10v/warning-014.d
+a43dda7cb4b0b5a67a8676b056d0fbd3  gas/testsuite/gas/d10v/warning-014.s
+bb49a7527c2b46bd80f4b02c80183c7b  gas/testsuite/gas/d10v/warning-015.d
+8a64c03c9a5f8060e32a54de143aa1c4  gas/testsuite/gas/d10v/warning-016.d
+9ad455587f29fa070e7fb79919fa9b36  gas/testsuite/gas/d10v/warning-016.s
+70e6bc585c537af6bb111f62376591f0  gas/testsuite/gas/d10v/warning-017.d
+cec23f7775944e94bef9d3c411959c8c  gas/testsuite/gas/d10v/warning-017.s
+75ce932b8d1229797b67ac50709200d4  gas/testsuite/gas/d10v/warning-018.d
+d249a48a68cf1de5657dd22a3abd529f  gas/testsuite/gas/d10v/warning-018.s
+bffc20273f7fc4a8784a60c939f7ac55  gas/testsuite/gas/d10v/warning-019.d
+b889bbac23357064c465d79fbef70546  gas/testsuite/gas/d10v/warning-019.s
+a15d68d40c502f8fb891fb71e6a331b4  gas/testsuite/gas/d30v/align.d
+8ab5843e51782cc8150825c0aed13da9  gas/testsuite/gas/d30v/align.s
+8a9471a2ce14a0c94c7af09fd8cf6f7c  gas/testsuite/gas/d30v/array.d
+afb9ee8fc39b6c6a3b5a607f0958dd2b  gas/testsuite/gas/d30v/array.s
+d7768075c27bdbdff4a1347c6b1746d0  gas/testsuite/gas/d30v/bittest.d
+36ccce5414200c372215e06d70d6aad0  gas/testsuite/gas/d30v/bittest.l
+4b9689db23a80dfeeb4e6217aaf0a8ad  gas/testsuite/gas/d30v/bittest.s
+884aac41a47a3f37d3e9201099de04d7  gas/testsuite/gas/d30v/d30.exp
+d57a8494033a5610ebb1ec72067db1a2  gas/testsuite/gas/d30v/guard-debug.d
+739c4467a3344e1787f7b4bdbf919705  gas/testsuite/gas/d30v/guard-debug.s
+24a691232054571885f6c30112e51658  gas/testsuite/gas/d30v/guard.d
+59254ab788d218d38c2c0d6e71251e76  gas/testsuite/gas/d30v/guard.s
+748040da85ada059191e19f00e2488f6  gas/testsuite/gas/d30v/inst.d
+39cdbdd6bd65bb5930b303daa6d76dcd  gas/testsuite/gas/d30v/inst.s
+02e401be332104808af7c8300005fe7d  gas/testsuite/gas/d30v/label-debug.d
+7f982990c748276d508b09332cdae4f6  gas/testsuite/gas/d30v/label-debug.s
+c483a48ce51ab77c8dee11cfab64b50a  gas/testsuite/gas/d30v/label.d
+7f982990c748276d508b09332cdae4f6  gas/testsuite/gas/d30v/label.s
+26406f9a3cbcac3df375ce96f2bf6d60  gas/testsuite/gas/d30v/mul.d
+d16bd2d8de2333b4d7ee533c7fbdb1c4  gas/testsuite/gas/d30v/mul.s
+3f5d45bfe5794cd78197dab5eba2c4e6  gas/testsuite/gas/d30v/opt.d
+cd67e61c7ea236940d9b65c880a564b4  gas/testsuite/gas/d30v/opt.s
+7ede5044d404df6c8e7e4397218784b3  gas/testsuite/gas/d30v/reloc.d
+2ed511260d2382d512257ccd75e39887  gas/testsuite/gas/d30v/reloc.s
+b37a654d4656a56a2e285628e3dcc39a  gas/testsuite/gas/d30v/serial.l
+26005134b177b676ea077b771aa246cc  gas/testsuite/gas/d30v/serial.s
+d62f3b2cffd953e7c0e21545f7ca1218  gas/testsuite/gas/d30v/serial2.l
+4c96fc10e8ae0de631d7681473ac66eb  gas/testsuite/gas/d30v/serial2.s
+2f580294b862674be54215921b4f726a  gas/testsuite/gas/d30v/serial2O.l
+4c96fc10e8ae0de631d7681473ac66eb  gas/testsuite/gas/d30v/serial2O.s
+7fc2a4f0d0ed0a1e698ef2e351bacd11  gas/testsuite/gas/d30v/warn_oddreg.l
+04cb44d9a5a4e2791243c475947c1dfa  gas/testsuite/gas/d30v/warn_oddreg.s
+e05430230b3286dc1934d1143d7dc0c1  gas/testsuite/gas/dlx/alltests.exp
+127efafe2527347fb64508e20cf7edf6  gas/testsuite/gas/dlx/branch.d
+b975e32977a78732d7f30c7df8a2c435  gas/testsuite/gas/dlx/branch.s
+4bbefc6e223f23c5d05239b6ca0e8332  gas/testsuite/gas/dlx/itype.d
+8465c3b2b019e9a4abb4d73ce4504525  gas/testsuite/gas/dlx/itype.s
+a22e2d08b6e6db063f2da8dbf367a0d8  gas/testsuite/gas/dlx/lhi.d
+39d88e8c2a6293235b494d613a3915b5  gas/testsuite/gas/dlx/lhi.s
+618d2e0a1cd63a9c64d4944ce69905a7  gas/testsuite/gas/dlx/load.d
+d88a4c8eb6d282949b5295d826d76311  gas/testsuite/gas/dlx/load.s
+17da9fc13d8f2ccbe72fc26797011a5c  gas/testsuite/gas/dlx/lohi.d
+7270daf39763944ec620ee05dcf2f778  gas/testsuite/gas/dlx/lohi.s
+7116badc2e0160e1a8333f8995323b08  gas/testsuite/gas/dlx/rtype.d
+628f043cea1680e500b5ac0c309c91e9  gas/testsuite/gas/dlx/rtype.s
+6d63b30eb9f2666bb4ac2456afb427c6  gas/testsuite/gas/dlx/store.d
+336400205f3c98f8a8d2200e3e6e0fc3  gas/testsuite/gas/dlx/store.s
+e8b98e1895ab5aaebf5d318ba94cccc0  gas/testsuite/gas/elf/bad-group.d
+e82fefdb2700a66caf0331e54e36589d  gas/testsuite/gas/elf/bad-group.err
+7b24bff8e309f5262d367217379123b8  gas/testsuite/gas/elf/bad-group.s
+94df0a59f9d8a3fc7dc0b5b45d36060d  gas/testsuite/gas/elf/bad-section-flag.d
+2623eda24a8bcefd26f472707bd1c853  gas/testsuite/gas/elf/bad-section-flag.err
+6430c98b054029e200685848eed745e2  gas/testsuite/gas/elf/bad-section-flag.s
+5cb00dec7f4dbf738104c6107731c51f  gas/testsuite/gas/elf/bad-size.d
+c489049b65777ca07cb885ba8faa82e3  gas/testsuite/gas/elf/bad-size.err
+0b4954500101a4643e67e2187e9d11e4  gas/testsuite/gas/elf/bad-size.s
+69fd0b66a67c0e0762f791bb253fb1c4  gas/testsuite/gas/elf/dwarf2-1.d
+886e868c75eeb4c7c472e9bc2a51671f  gas/testsuite/gas/elf/dwarf2-1.s
+15479241a11880212952fa8603ac6b96  gas/testsuite/gas/elf/dwarf2-2.d
+bef888929f0f1c60b25d843d33691a5b  gas/testsuite/gas/elf/dwarf2-2.s
+c1be095bfef4c59f73de7624ba87ab00  gas/testsuite/gas/elf/dwarf2-3.d
+4b37154778bdd05b2ded6aa8db2e8e7e  gas/testsuite/gas/elf/dwarf2-3.s
+a874534eea08f6e8f44db5bfb2c83533  gas/testsuite/gas/elf/dwarf2-4.d
+b257e9cf74e2c36733ddd286459faf46  gas/testsuite/gas/elf/dwarf2-4.s
+3aa51e33fc3c4fb00d9f02ab8b6c1412  gas/testsuite/gas/elf/ehopt0.d
+67a6ccaa7bc82ccb6a932a7231db4059  gas/testsuite/gas/elf/ehopt0.s
+87c6212516d01685510840b397726b02  gas/testsuite/gas/elf/elf.exp
+ca117d1ef9797c2abe5802d4fa8953c4  gas/testsuite/gas/elf/equ-reloc.d
+c917159b2489776acdf15f164d0905e4  gas/testsuite/gas/elf/equ-reloc.s
+e0e8e71c5b48f21bddb98d7c45e5a583  gas/testsuite/gas/elf/file.d
+70b6289bdadaae1b408e2805dec8f770  gas/testsuite/gas/elf/file.s
+075bcea3ebc7d9e53c3f6ed79210d4bb  gas/testsuite/gas/elf/group0.s
+f3fe13947fc2773e330e76030688e58c  gas/testsuite/gas/elf/group0a.d
+199deab556037b69231c9a2a5fcd7da0  gas/testsuite/gas/elf/group0b.d
+4e43d7c0ca48309f31d3275428a0d06f  gas/testsuite/gas/elf/group0c.d
+21207251ef2eda07347adf8e8edb60ba  gas/testsuite/gas/elf/group1.s
+81308e53a5378b04d84c69d13e1fe5c1  gas/testsuite/gas/elf/group1a.d
+1660e7fd50797e925b14fe48f38e6a8f  gas/testsuite/gas/elf/group1b.d
+9fcd9e2d59191f503d33a601a36c6fc6  gas/testsuite/gas/elf/groupauto.s
+87af60f43e6dd4e7057cffce97b867f3  gas/testsuite/gas/elf/groupautoa.d
+b15f107f41c0ebc724111ee307897879  gas/testsuite/gas/elf/groupautob.d
+8c3d9ac3c4caf973dd6a05a01e0b9876  gas/testsuite/gas/elf/ifunc-1.d
+18ba3548b49775bd97fafca717aea4f2  gas/testsuite/gas/elf/ifunc-1.s
+09604fea2cc552ec3892fddb19ee9bfe  gas/testsuite/gas/elf/pseudo.d
+b7dca28f0b423b0d369fe38bf1111166  gas/testsuite/gas/elf/pseudo.l
+4aa99fb516e06d2680468c67564fd554  gas/testsuite/gas/elf/pseudo.s
+3e5cf7b8de55f655bac59c3a542a01dd  gas/testsuite/gas/elf/redef.d
+080d4cd3dac37ed1af74006cc7d9c39f  gas/testsuite/gas/elf/redef.s
+4e0cecedecf31818ef0d9697bdf9caf1  gas/testsuite/gas/elf/section0.d
+94799bbca15898e61e62e52d81f0bcca  gas/testsuite/gas/elf/section0.s
+d626bedcb06fe46beda865191bb6f8f5  gas/testsuite/gas/elf/section1.d
+b892afd90c0c8f8d9b5486dcd484d815  gas/testsuite/gas/elf/section1.s
+4b340c0af90ecc105a81851e1966f0ba  gas/testsuite/gas/elf/section2.e
+d9725bd7c385eecd7381fbf1345ef172  gas/testsuite/gas/elf/section2.e-armeabi
+02b0b5ec70de7787aea2109fefce87ec  gas/testsuite/gas/elf/section2.e-armelf
+296c7316bca4530074ecc07e84697adf  gas/testsuite/gas/elf/section2.e-m32r
+1c15de91b7de7e91d980379ab5b1753d  gas/testsuite/gas/elf/section2.e-mips
+59905bd5c30a169359abf06bbc009e5c  gas/testsuite/gas/elf/section2.e-miwmmxt
+e2542a5376b2bcbcfb252c7f6e1ecc70  gas/testsuite/gas/elf/section2.e-rx
+ec29409d2983f481160b1ea103fa898b  gas/testsuite/gas/elf/section2.e-score
+3412d0f90f486b30ef4ef1f5f42f22ee  gas/testsuite/gas/elf/section2.e-tic6x
+d9725bd7c385eecd7381fbf1345ef172  gas/testsuite/gas/elf/section2.e-xtensa
+f3e508e3e2bbb1749ab1e9e1c23289af  gas/testsuite/gas/elf/section2.l
+5a42c78c814dadc7e4a11cba2a795f97  gas/testsuite/gas/elf/section2.s
+4db32453c693fea535afeeecfdc98d26  gas/testsuite/gas/elf/section3.d
+ad3086bd2d519f6116efe933469ccf23  gas/testsuite/gas/elf/section3.s
+50efb8918f1cbba284b2e00647f6a312  gas/testsuite/gas/elf/section4.d
+c8f62533d742858880692eebc43aeba6  gas/testsuite/gas/elf/section4.s
+f96c6ef9cb2e1718e696c7c2a7894dc7  gas/testsuite/gas/elf/section5.e
+b2537849a5f8a60a51d11c25ef8b35bb  gas/testsuite/gas/elf/section5.l
+171e7d89c21777c752f738470cc015d4  gas/testsuite/gas/elf/section5.s
+6bd732a352cbb7fba1e53b1e713b19ca  gas/testsuite/gas/elf/section6.d
+c0f115cd31b453f8dc5eea69f31b3559  gas/testsuite/gas/elf/section6.s
+19897bdf9f0a992019b8e84f857df064  gas/testsuite/gas/elf/section7.d
+77a6f78a8e155ff7fd6a7449558288fb  gas/testsuite/gas/elf/section7.s
+e110e825fdacdc63909a469f293a1d24  gas/testsuite/gas/elf/section8.d
+8a9c43fb38d8837da4e10eac0a5e5901  gas/testsuite/gas/elf/section8.s
+e76f1f507faa639c9cb09e133f62bd80  gas/testsuite/gas/elf/section9.d
+a9091ca6f2ad94c418b4c98e99aaf66b  gas/testsuite/gas/elf/section9.s
+f515cccf76165e218e62e79d2281c712  gas/testsuite/gas/elf/struct.d
+6f56598922a76124d2a548fab88ba85b  gas/testsuite/gas/elf/struct.s
+8a03014dc08ca3d66c23a052bda32bcb  gas/testsuite/gas/elf/symtab.d
+f1c6fc0d518739e2c3b35e592d56ec44  gas/testsuite/gas/elf/symtab.s
+416fc65ca0766b5c8ac9bc0ab7a587f6  gas/testsuite/gas/elf/symver.d
+335a17f208c2cc7ba886bde49f02c8ca  gas/testsuite/gas/elf/symver.s
+6b6dbd6e6db2cd6dfa6e62fe49aa2705  gas/testsuite/gas/elf/type-noifunc.e
+7f202b033c0a9f7250c05cb73d767ef0  gas/testsuite/gas/elf/type-noifunc.s
+eb2637faa5af7f65ca063335b2dfe876  gas/testsuite/gas/elf/type.e
+9906d2abeb8c4f046b15b957922e02b2  gas/testsuite/gas/elf/type.s
+a6533781ebde6c5cb83b2aaa3e21e1df  gas/testsuite/gas/elf/warn-2.s
+8f760ce7cf5b0bcea1fd0c123134bc4b  gas/testsuite/gas/fr30/allinsn.d
+f43f517834a1bcead42dab25e75f41d0  gas/testsuite/gas/fr30/allinsn.exp
+fdf34a19cb21c9273e472a9bb4c9e97f  gas/testsuite/gas/fr30/allinsn.s
+4a1055775cc266d1a0458ce050e653d3  gas/testsuite/gas/fr30/fr30.exp
+b0855b80218f5a929ddc68a70763ee63  gas/testsuite/gas/frv/allinsn.d
+860200e9c4ec6ec494622c3114aecd33  gas/testsuite/gas/frv/allinsn.exp
+92314edf2be71ae28723da713527c08c  gas/testsuite/gas/frv/allinsn.s
+456f60acbaf3cd31306a78c6de9d687a  gas/testsuite/gas/frv/fdpic.d
+4a756f9eddacb55c29e7749c7d329fc6  gas/testsuite/gas/frv/fdpic.s
+fbd858a348c03a817f91d1baaf188efa  gas/testsuite/gas/frv/fr405-insn.d
+6c750867adf0ae2771b86d450aaa4c76  gas/testsuite/gas/frv/fr405-insn.l
+33aa70a706c8c1e4947c31bf4d6d7060  gas/testsuite/gas/frv/fr405-insn.s
+72828c0c9b13cc77056a142cd9cd12a7  gas/testsuite/gas/frv/fr450-insn.d
+12c5b76c970eef88a502b59f99ccecf3  gas/testsuite/gas/frv/fr450-insn.l
+37f3a8bb1162bec7a4743a32734fa811  gas/testsuite/gas/frv/fr450-insn.s
+6b0037374ce715d5ea2edf9a2dabcc83  gas/testsuite/gas/frv/fr450-media-issue.l
+736a21f8dda496bd1603011ea7630639  gas/testsuite/gas/frv/fr450-media-issue.s
+d8784a35ef3909a48bd09d1106ccffb3  gas/testsuite/gas/frv/fr450-spr.d
+971a9c1f4690b7a705b50272aeb714a9  gas/testsuite/gas/frv/fr450-spr.s
+c5885c2815100c4a3407a1451cf15e77  gas/testsuite/gas/frv/fr550-pack1.d
+fc5ef29bc53543bbebe47be7f19f68bf  gas/testsuite/gas/frv/fr550-pack1.s
+837f9d1dd1571d4c81bf1766f9f99407  gas/testsuite/gas/frv/reloc1.d
+3a06ca65e67fbb7f94e33c8c7c6b46f2  gas/testsuite/gas/frv/reloc1.s
+2924c535df55b6a32889011860a29689  gas/testsuite/gas/h8300/addsub.s
+8b119bf28b7ba30807a8850b9edf96d3  gas/testsuite/gas/h8300/addsubh.s
+493e1fa4afffc9276ad5d14b0530d6fb  gas/testsuite/gas/h8300/addsubrxcheck.s
+5b8c73d8de33afa02ff707f67065a1ef  gas/testsuite/gas/h8300/addsubs.s
+d86b31775e7398f8bc4d446d9d0a017b  gas/testsuite/gas/h8300/bitops1.s
+15fd0f35907c986489fa36bddebbb526  gas/testsuite/gas/h8300/bitops1h.s
+584a7cd8ad886afe1f0d2f9b5d817467  gas/testsuite/gas/h8300/bitops1s.s
+30ff0841f2e26ebb8e15aa636a64e4a5  gas/testsuite/gas/h8300/bitops2.s
+a741bf520d8175248d8c363dd660cad9  gas/testsuite/gas/h8300/bitops2h.s
+2e137c2f7cf12903edc7dd00bfe6d409  gas/testsuite/gas/h8300/bitops2s.s
+3d15e82abb0f85bdfacdbb653e083999  gas/testsuite/gas/h8300/bitops3.s
+82edeaa989ae932805db0608f8cc235a  gas/testsuite/gas/h8300/bitops3h.s
+f5395cd9806896db584e3fbbdb548389  gas/testsuite/gas/h8300/bitops3s.s
+6249a5e4419949642c98aaa14f3d8b10  gas/testsuite/gas/h8300/bitops4.s
+5a394a0dbef8a7f14e4294b4dcfed8a5  gas/testsuite/gas/h8300/bitops4h.s
+791083648e92754b6c62f3201681ece1  gas/testsuite/gas/h8300/bitops4s.s
+23aecc0c8af29a4bf18f97a9607677d5  gas/testsuite/gas/h8300/branch-coff.s
+e4b78fbf88f2a797780cdbc116842e82  gas/testsuite/gas/h8300/branch-elf.s
+1f02561f75f4c45679ba42b0492cc58a  gas/testsuite/gas/h8300/branchh-coff.s
+1f02561f75f4c45679ba42b0492cc58a  gas/testsuite/gas/h8300/branchh-elf.s
+e251ed292c39572dbd1364f73d5fd32e  gas/testsuite/gas/h8300/branchs-coff.s
+e251ed292c39572dbd1364f73d5fd32e  gas/testsuite/gas/h8300/branchs-elf.s
+f0e5262ac4229fe320614df5a40f35e9  gas/testsuite/gas/h8300/cbranch.s
+30d75e5d8c2ef426fe42a377456bda0b  gas/testsuite/gas/h8300/cbranchh.s
+5fdbcffb87056d813eafd925d9c763f0  gas/testsuite/gas/h8300/cbranchs.s
+ff5dba96cd99c306ec26780fc9069d8a  gas/testsuite/gas/h8300/cmpsi2.s
+3be6267a929c5b26e8f4d69491d0877a  gas/testsuite/gas/h8300/compare.s
+b2030d679f34f4563b5a00cbe2c1d072  gas/testsuite/gas/h8300/compareh.s
+94eec517c2a5cefb40f7bcc8a338a83a  gas/testsuite/gas/h8300/compares.s
+437e6b6cef5f904dd70a700cd486f7ea  gas/testsuite/gas/h8300/decimal.s
+9b32251ca7b543949470558b507ca6b3  gas/testsuite/gas/h8300/decimalh.s
+56fe63d196d46b2f8dc1c4bfca0c351d  gas/testsuite/gas/h8300/decimals.s
+0c35be5ae497429ff49aa3076805fda3  gas/testsuite/gas/h8300/divmul.s
+d37984dfb136ed1c465a17ac6ff8cbb4  gas/testsuite/gas/h8300/divmulh.s
+d37984dfb136ed1c465a17ac6ff8cbb4  gas/testsuite/gas/h8300/divmuls.s
+f813008dac0b658d469085e795844664  gas/testsuite/gas/h8300/extendh.s
+4d7497fb959f22fd9f7b666d4c61eee6  gas/testsuite/gas/h8300/extends.s
+a9838bcffe296065862a083c5cdb2072  gas/testsuite/gas/h8300/ffxx1-coff.d
+1d4afbfb9c48d8842384c1908e31c40f  gas/testsuite/gas/h8300/ffxx1-coff.s
+a4b0d327d0a7cd6348b06fc021bdacce  gas/testsuite/gas/h8300/ffxx1-elf.d
+1d4afbfb9c48d8842384c1908e31c40f  gas/testsuite/gas/h8300/ffxx1-elf.s
+3bce55aac5e784084083b48f3c9c6cdf  gas/testsuite/gas/h8300/h8300-coff.exp
+a2ee2d306e1cf5965164cdb2483bdeed  gas/testsuite/gas/h8300/h8300-elf.exp
+7adb98483f916e844b0109048bae6af7  gas/testsuite/gas/h8300/h8300.exp
+b2c1b7579c1a011689e0f84dee026841  gas/testsuite/gas/h8300/h8sx_disp2.d
+24bfa8fe6c7ea23669a8b7ddbb532df3  gas/testsuite/gas/h8300/h8sx_disp2.s
+55085df87374e05b6ca2887bfdad18f3  gas/testsuite/gas/h8300/h8sx_mov_imm.d
+8de24eb964deaeba9ab216fe5a83ae57  gas/testsuite/gas/h8300/h8sx_mov_imm.s
+180177e9b13daf5c97a907883a3b15df  gas/testsuite/gas/h8300/h8sx_rtsl.d
+cbf4c219011b472494b1c9886803d88b  gas/testsuite/gas/h8300/h8sx_rtsl.s
+d068dc8b49ea5e3a2841052399d04411  gas/testsuite/gas/h8300/incdec.s
+57ef072e39a9e088908da70b650fe6b7  gas/testsuite/gas/h8300/incdech.s
+68127cbf4156b232462ded46fb1eeb96  gas/testsuite/gas/h8300/incdecs.s
+ad670f4be1807bfa3361ea5dfdc0658d  gas/testsuite/gas/h8300/logical.s
+4baf511d4fbb91925e6de834c9b49ea5  gas/testsuite/gas/h8300/logicalh.s
+c4d9cba61beedae407c0c1260e6e1d5d  gas/testsuite/gas/h8300/logicals.s
+3c56ddac8216a69a609103570d7b3e49  gas/testsuite/gas/h8300/macs.s
+fb0d77314633b62d40a4a054311960e8  gas/testsuite/gas/h8300/misc.s
+0474a81ccc5b5408fc54aa171faafb52  gas/testsuite/gas/h8300/misch.s
+11bb474016acda38cc0db95df94487a3  gas/testsuite/gas/h8300/miscs.s
+9193c97fad2ede164c0c90d605b70f46  gas/testsuite/gas/h8300/mov32bug.s
+1883f564d24d685c8dc63486f070f4a6  gas/testsuite/gas/h8300/movb.s
+fcd326aa9537340e99b1100508c3aa5b  gas/testsuite/gas/h8300/movbh.s
+7145f97672f9645e3de195a7fdf55a1b  gas/testsuite/gas/h8300/movbs.s
+d8c9bc7371b9b1d46a2eefb32d90d58d  gas/testsuite/gas/h8300/movlh.s
+0e5f5a058fd24a750a53bfa817b326a5  gas/testsuite/gas/h8300/movls.s
+3674b05426b7d9c23e487af7bb8465e2  gas/testsuite/gas/h8300/movw.s
+75e9728e4f42fb7fbedbba7ed96b11db  gas/testsuite/gas/h8300/movwh.s
+b0068c567a3f9efc6b3b31cf95a5a318  gas/testsuite/gas/h8300/movws.s
+f6cedb831b52df4b3928a3a2f77a26c9  gas/testsuite/gas/h8300/multiples.s
+966c74d143895095ee54889081de41bf  gas/testsuite/gas/h8300/pr3134.d
+a094b8eb92e6398adc065bf2c7ff0a97  gas/testsuite/gas/h8300/pr3134.s
+4393180d58ab1ed9d690f02ff183b6f6  gas/testsuite/gas/h8300/pushpop.s
+4d82e273acc364dfaddc59b3a13ee22e  gas/testsuite/gas/h8300/pushpoph.s
+8ff1c8b35100699d39d44f67e19a5176  gas/testsuite/gas/h8300/pushpops.s
+6cc6731a0e070e666e164d9163629113  gas/testsuite/gas/h8300/rotsh.s
+7bc113956c8ca4ddcd42503e4bd530e3  gas/testsuite/gas/h8300/rotshh.s
+811af24ecd9436d020bfaf84413f5847  gas/testsuite/gas/h8300/rotshs.s
+c1d90a226053f4ce7c7adff387f20b54  gas/testsuite/gas/h8300/symaddgen.s
+ce55a85d73c6a1310de2454624c136e2  gas/testsuite/gas/h8300/t01_mov.exp
+a3cbe564e8d6faf41cbf463811c89e02  gas/testsuite/gas/h8300/t01_mov.s
+241f2fa417c5a917fe083c7190e3b861  gas/testsuite/gas/h8300/t02_mova.exp
+8384c0c60131ab5ec30e614ac5304d36  gas/testsuite/gas/h8300/t02_mova.s
+4372217c1898413da0cb442d8b83774c  gas/testsuite/gas/h8300/t03_add.exp
+b177ab180d26977ff43d8e5c6e38c907  gas/testsuite/gas/h8300/t03_add.s
+6df403b20c72718d5385aaa8de8ec6ed  gas/testsuite/gas/h8300/t04_sub.exp
+26cf1c6a7495448281a2626e9393d099  gas/testsuite/gas/h8300/t04_sub.s
+421f2108c19848bc75c4c2a6a876f86b  gas/testsuite/gas/h8300/t05_cmp.exp
+80158a3d34d939766f837f9e15e8fe2d  gas/testsuite/gas/h8300/t05_cmp.s
+13364c83674e3c7487ec96e9518cda19  gas/testsuite/gas/h8300/t06_ari2.exp
+d9fbbf75a69dc39e28564cd3dfd89e5a  gas/testsuite/gas/h8300/t06_ari2.s
+54e194caef15999a18c006e28d3c8de8  gas/testsuite/gas/h8300/t07_ari3.exp
+fbeccdb5c7220c385d8e4aee4f4c980d  gas/testsuite/gas/h8300/t07_ari3.s
+e0687fc4edbab3948726261d87477db2  gas/testsuite/gas/h8300/t08_or.exp
+49ac32af6d29776560d6c3df80fe3a09  gas/testsuite/gas/h8300/t08_or.s
+5f9e00cc1a79212cd05863950a01d8e7  gas/testsuite/gas/h8300/t09_xor.exp
+a9d861fcb5888bf017b04692c6f95372  gas/testsuite/gas/h8300/t09_xor.s
+9d73fa90207efffe2171ff5a43d4cb3e  gas/testsuite/gas/h8300/t10_and.exp
+1d08d13909be8fd1f1aefa95f62fc34b  gas/testsuite/gas/h8300/t10_and.s
+43ee497fe85e8b3221220a38a10edb69  gas/testsuite/gas/h8300/t11_logs.exp
+036ff295450c4dc80011e85d74bd071f  gas/testsuite/gas/h8300/t11_logs.s
+d8ca7ba717f5fcdd2c32f72bef137c98  gas/testsuite/gas/h8300/t12_bit.exp
+85bdc6caec434dbce8666be195bab7de  gas/testsuite/gas/h8300/t12_bit.s
+2c19c41ef2b05680493db17768a42b35  gas/testsuite/gas/h8300/t13_otr.exp
+1110071293056d18834477e3b461aebe  gas/testsuite/gas/h8300/t13_otr.s
+7b1625a1a6ca53e3c9dd6d06b27ee995  gas/testsuite/gas/hppa/basic/add.s
+e851cf6a3db3347c6f8bd107dbdacedc  gas/testsuite/gas/hppa/basic/add2.s
+57ad58f96f1a781f50c99315319025b2  gas/testsuite/gas/hppa/basic/addi.s
+11a0221d409845a72fa783727e783440  gas/testsuite/gas/hppa/basic/basic.exp
+23cbc90c2d163ffda4b92ac5670374b7  gas/testsuite/gas/hppa/basic/branch.s
+018bafaddc464bf5344056a4a6ba62aa  gas/testsuite/gas/hppa/basic/branch2.s
+2744044afb6af0ffe892e71482c7e83b  gas/testsuite/gas/hppa/basic/comclr.s
+30e98c333c6c3c41f4230609d617d4bd  gas/testsuite/gas/hppa/basic/copr.s
+18c064b287abc57be5f66793ce0a4ed8  gas/testsuite/gas/hppa/basic/coprmem.s
+5b953b17809a50b68718cad20f6b3cd5  gas/testsuite/gas/hppa/basic/dcor.s
+54b1bb4ce869350a6860eea7ef011576  gas/testsuite/gas/hppa/basic/dcor2.s
+7f9d07824ecdd65dce64fdbb8ab88668  gas/testsuite/gas/hppa/basic/deposit.s
+9e7936d6dca987e90acb029a0794e50c  gas/testsuite/gas/hppa/basic/deposit2.s
+4179bc45da0c3f5c674c51bce4f3ef42  gas/testsuite/gas/hppa/basic/deposit3.s
+5532f754b3ee74d823c916f73352f531  gas/testsuite/gas/hppa/basic/ds.s
+ebef581b3abd2e0a860dc45c474dcc77  gas/testsuite/gas/hppa/basic/extract.s
+f0c6b56da1f75e189baf27d8c1f535fe  gas/testsuite/gas/hppa/basic/extract2.s
+51d8fb411be8712bd0c7ce811ad6dc38  gas/testsuite/gas/hppa/basic/extract3.s
+a982fc398cedf2e44201d59012ee7066  gas/testsuite/gas/hppa/basic/fmem.s
+a0babc25ea6d4372cb5eccc0ae3f4825  gas/testsuite/gas/hppa/basic/fmemLRbug.s
+12d638623e2fda0109342643a918858e  gas/testsuite/gas/hppa/basic/fp_comp.s
+9847e0fce8c6da72b7f980b441367739  gas/testsuite/gas/hppa/basic/fp_comp2.s
+698e8f34a3b345696ad42ea0fe3a42dc  gas/testsuite/gas/hppa/basic/fp_conv.s
+50c67d6e1a3d6914794a948be62b14f6  gas/testsuite/gas/hppa/basic/fp_fcmp.s
+67b6a72f5e598098f02c322b08238380  gas/testsuite/gas/hppa/basic/fp_misc.s
+bf748287a3393071018df9ef711ff79e  gas/testsuite/gas/hppa/basic/imem.s
+382400fc1867cc374e7a9a97620ba203  gas/testsuite/gas/hppa/basic/immed.s
+2b4d0bc9df8ca71e1b7c3af01a60d9e0  gas/testsuite/gas/hppa/basic/logical.s
+40808c7e14c9dd94905f168f5bd28a9d  gas/testsuite/gas/hppa/basic/media.s
+3f9890f5f05691d773c5252cca7c3bdb  gas/testsuite/gas/hppa/basic/perf.s
+5cc775342d33290ccc79a2c3392ba59c  gas/testsuite/gas/hppa/basic/purge.s
+585389c4c1113b467f309f8b53564ddf  gas/testsuite/gas/hppa/basic/purge2.s
+bc0a3320065bbb6f8c7226807fa35e7d  gas/testsuite/gas/hppa/basic/sh1add.s
+7682c249ad6ac5dce5a7a0d5c70b9759  gas/testsuite/gas/hppa/basic/sh2add.s
+3976fa98bed24429b469cc702b660e93  gas/testsuite/gas/hppa/basic/sh3add.s
+69cfdc26fc07d25504dfb30978448340  gas/testsuite/gas/hppa/basic/shift.s
+f588468f60d1393a578d3147a655f303  gas/testsuite/gas/hppa/basic/shift2.s
+d35888a201d29276d5f468576ce69678  gas/testsuite/gas/hppa/basic/shift3.s
+1288a8d17a77098169f032cf5dd63455  gas/testsuite/gas/hppa/basic/shladd.s
+8ed6a738a1fd2383dbe99d68c8cf59e4  gas/testsuite/gas/hppa/basic/shladd2.s
+b8f517402a2c82b158d9e1df1a11779a  gas/testsuite/gas/hppa/basic/special.s
+1af275b55a5680b0a941bfdf1e5496e9  gas/testsuite/gas/hppa/basic/spop.s
+4d54a793881d666296b48b0b2ac763e2  gas/testsuite/gas/hppa/basic/sub.s
+f16923e9ababc303530ffa9835a0edf4  gas/testsuite/gas/hppa/basic/sub2.s
+c2fd7d2c7fc3f77c944b5af56ebbcb7d  gas/testsuite/gas/hppa/basic/subi.s
+c8284a379fc4d3b89da889cbd99a4565  gas/testsuite/gas/hppa/basic/system.s
+9dec6c8e5b94b75cb0e0fb27c16ce4ee  gas/testsuite/gas/hppa/basic/system2.s
+179a4ad64c7d1a3faa0d9945c41b5b35  gas/testsuite/gas/hppa/basic/unit.s
+1ed85cf259a78d3d86ea435e74dfcbe6  gas/testsuite/gas/hppa/basic/unit2.s
+03008cde62428d4ff2464bef8cb8bcd2  gas/testsuite/gas/hppa/basic/weird.s
+d93edd3b974fa05de350f6104c63af74  gas/testsuite/gas/hppa/parse/align1.s
+6a7df2ab8d1491f8f64f60fb0a359558  gas/testsuite/gas/hppa/parse/align2.s
+85d6e969f063c0bee9565d096c43657e  gas/testsuite/gas/hppa/parse/appbug.s
+72ae2fe9c7ff74b0267402ab93c59282  gas/testsuite/gas/hppa/parse/badfmpyadd.s
+324e688a23442952378a5807132d00be  gas/testsuite/gas/hppa/parse/block1.s
+44d0164ab1f3f2f8201ca4cac02f0a91  gas/testsuite/gas/hppa/parse/block2.s
+7012f9c767f18688e051c168e218464b  gas/testsuite/gas/hppa/parse/calldatabug.s
+d26fcb5186e8ffda4892557ecf9d836a  gas/testsuite/gas/hppa/parse/callinfobug.s
+36132d401bbf31234a71915b94762a26  gas/testsuite/gas/hppa/parse/defbug.s
+8355f3baa7c8bf6dfdde12165f166988  gas/testsuite/gas/hppa/parse/entrybug.s
+a8c2940c51c368a14265009963ce4a7d  gas/testsuite/gas/hppa/parse/exportbug.s
+0aa9ab25448da72ed059168f45ee4e11  gas/testsuite/gas/hppa/parse/exprbug.s
+464c7378f55821348860da76fd77ed2e  gas/testsuite/gas/hppa/parse/fixup7bug.s
+69d79811f23cb30bd2c536063a29c137  gas/testsuite/gas/hppa/parse/global.s
+eae1949a6363097a7e2ef5bd260b9aa7  gas/testsuite/gas/hppa/parse/labelbug.s
+500906f02f2d8b74365d5c87cf1c4cc4  gas/testsuite/gas/hppa/parse/linesepbug.s
+adf3dd32e97d184fa3a923e977ac0f20  gas/testsuite/gas/hppa/parse/lselbug.s
+e09d99b9bb0cc52546de922bf02a3a13  gas/testsuite/gas/hppa/parse/nosubspace.s
+935cffd940f103074de27bfe5f50d367  gas/testsuite/gas/hppa/parse/parse.exp
+030b7a7332dca245ae8a65a00ab8e169  gas/testsuite/gas/hppa/parse/procbug.s
+ba4a443e4362a957c9eda52f33e9ed56  gas/testsuite/gas/hppa/parse/regpopbug.s
+1e6c961fc9120126cbb70fea5a79b599  gas/testsuite/gas/hppa/parse/space.s
+b19738063af645b6f2231ee644131542  gas/testsuite/gas/hppa/parse/spacebug.s
+16d00a249972a7d82fd5b443a6c006ea  gas/testsuite/gas/hppa/parse/ssbug.s
+6e77c97c02695c15f9f54b9b531a5e2b  gas/testsuite/gas/hppa/parse/stdreg.s
+e4c3228c9e3a74eb9b2170caafd9cf4c  gas/testsuite/gas/hppa/parse/stringer.s
+b91fabc2587cd34b7543fe16032d9c3e  gas/testsuite/gas/hppa/parse/undefbug.s
+ad0e0513effd832ce4787671ac4c5eac  gas/testsuite/gas/hppa/parse/versionbug.s
+7f9b2353d22448012a9435f7b80ccf1a  gas/testsuite/gas/hppa/parse/xmpyubug.s
+73cbb56b2c330327d9c06ea89af0cd91  gas/testsuite/gas/hppa/README
+629e685800d946a73fba78f4f9e2a342  gas/testsuite/gas/hppa/reloc/applybug.s
+e7eccf3a36e653b9312fc78bb40a5022  gas/testsuite/gas/hppa/reloc/blebug.s
+9c8150c0635455986ba2e99432e230ad  gas/testsuite/gas/hppa/reloc/blebug2.s
+cfe88051f0bd644932bc22814216e804  gas/testsuite/gas/hppa/reloc/blebug3.s
+2e83d05979fd4ec0c399182ad7513423  gas/testsuite/gas/hppa/reloc/exitbug.s
+a7ab875345b2ba9a0c1e6aee0c0b23cb  gas/testsuite/gas/hppa/reloc/fixupbug.s
+84f724d5d6335f9367de5e493847499c  gas/testsuite/gas/hppa/reloc/funcrelocbug.s
+8fd8e8d6557a090221c4b9382f712183  gas/testsuite/gas/hppa/reloc/labelopbug.s
+79c490df3cf5ac395769cfd1378b598b  gas/testsuite/gas/hppa/reloc/longcall.s
+6fedcfa10d24c76dde19990cbdb53c1a  gas/testsuite/gas/hppa/reloc/picreloc.s
+a30d0372d62d0a448e374ed80897e3bf  gas/testsuite/gas/hppa/reloc/plabelbug.s
+f2f905140c0955e2a88e451fad681f42  gas/testsuite/gas/hppa/reloc/r_no_reloc.s
+5042b71ae3f83b270fa17a2b7f27fc92  gas/testsuite/gas/hppa/reloc/reduce.s
+bc728b6253b6c770472ed22f5def04e0  gas/testsuite/gas/hppa/reloc/reduce2.s
+45668f4718492900a833f2d3ebe47e57  gas/testsuite/gas/hppa/reloc/reduce3.s
+24778206aa7c2e579232a86fc6416c3f  gas/testsuite/gas/hppa/reloc/reloc.exp
+2813e26c00aa991fb8cc3f67b56ae4f6  gas/testsuite/gas/hppa/reloc/roundmode.s
+c690211a1ccb9ebe1cda17e17b5d1cf4  gas/testsuite/gas/hppa/reloc/selectorbug.s
+c0e4f0dd244fb83332f776ca09756e5b  gas/testsuite/gas/hppa/unsorted/align3.s
+a7b6914341e97c943a5b931b5ff724a1  gas/testsuite/gas/hppa/unsorted/align4.s
+d5ecda3dffcd60591d33b1718f89d02c  gas/testsuite/gas/hppa/unsorted/brlenbug.s
+0854f5ede3fb810256df5394b5d17a6f  gas/testsuite/gas/hppa/unsorted/common.s
+563abc929a52d7539bb83a990fbfcb65  gas/testsuite/gas/hppa/unsorted/fragbug.s
+3c295194b6d3754be9b7b7da67fddcb4  gas/testsuite/gas/hppa/unsorted/globalbug.s
+af9e915b6ea1a8a691914d94bb230546  gas/testsuite/gas/hppa/unsorted/importbug.s
+741867661d59451b7d71d392fc0d7206  gas/testsuite/gas/hppa/unsorted/labeldiffs.s
+0aa46fc17784b72b21d387564dddde36  gas/testsuite/gas/hppa/unsorted/locallabel.s
+f8705df6b564ae8bc51ff8255048afd1  gas/testsuite/gas/hppa/unsorted/ss_align.s
+fd1722938dd9b247d2bc012816b7474f  gas/testsuite/gas/hppa/unsorted/unsorted.exp
+cfbacb867fc23e46eb5cc453b29e996e  gas/testsuite/gas/i386/287.d
+171a2a6a1a526682c97dc638228ac3d2  gas/testsuite/gas/i386/287.s
+1f34c095fb15a02b950b8584dd28d6ab  gas/testsuite/gas/i386/387.d
+16ef730d8dc6335b7e046292d35e13bf  gas/testsuite/gas/i386/387.s
+202a1104702a1ab88cf1155edd6d8555  gas/testsuite/gas/i386/8087.d
+e62b68bf9ccf183fcc4276aa425cfb47  gas/testsuite/gas/i386/8087.s
+24010b9a4f38ef4e53794bbf69dbe9b9  gas/testsuite/gas/i386/absrel.d
+44d1a7733eab035047de0217133c8049  gas/testsuite/gas/i386/absrel.s
+6ca25f25d906ca4e1f42a524d56dedbb  gas/testsuite/gas/i386/addr16.d
+70add2d5b558cddf1c5bc90d4f7e771e  gas/testsuite/gas/i386/addr16.s
+4f73f8a4612da1cb112877293278ca77  gas/testsuite/gas/i386/addr32.d
+74cc2d6dafabdd5075b1cbf0093a970c  gas/testsuite/gas/i386/addr32.s
+75d586d2a364298d7b0ac00b307483d0  gas/testsuite/gas/i386/aes-intel.d
+303189f3b0a196261790b8c9c1a21187  gas/testsuite/gas/i386/aes.d
+3006616545a323ecea7618dbf4a90dc7  gas/testsuite/gas/i386/aes.s
+11975e08de2a2b280f20e23efea011e8  gas/testsuite/gas/i386/amd.d
+490292ab4ea047011bb404ae769deba3  gas/testsuite/gas/i386/amd.s
+a89088c88a88f80e5311c75c676ead59  gas/testsuite/gas/i386/amdfam10.d
+aca65b19ecb300fd23ac54c091aa7c8a  gas/testsuite/gas/i386/amdfam10.s
+4140fffdbe1146a3111d3a455a103600  gas/testsuite/gas/i386/arch-1.d
+4cd49cad88f9a8c0c16e5702f6801b6e  gas/testsuite/gas/i386/arch-1.s
+9029e12df192c6e7dc6f785e547818bc  gas/testsuite/gas/i386/arch-10-1.l
+4c7fbb695ec8e2da9b8a5b5d1285788b  gas/testsuite/gas/i386/arch-10-1.s
+0b1e6cfa37ae0010602cbe92c754f516  gas/testsuite/gas/i386/arch-10-2.l
+4c7fbb695ec8e2da9b8a5b5d1285788b  gas/testsuite/gas/i386/arch-10-2.s
+82b72690964fdc58c48ebd6ac26259ba  gas/testsuite/gas/i386/arch-10-3.l
+4c7fbb695ec8e2da9b8a5b5d1285788b  gas/testsuite/gas/i386/arch-10-3.s
+a471a60b85be8a309e3fce7f7a134810  gas/testsuite/gas/i386/arch-10-4.l
+4c7fbb695ec8e2da9b8a5b5d1285788b  gas/testsuite/gas/i386/arch-10-4.s
+bd79ef4055168d7551dd94ca5a0ad90d  gas/testsuite/gas/i386/arch-10-lzcnt.d
+a1b7af16b68f6d6cda343c479c545cc4  gas/testsuite/gas/i386/arch-10.d
+17bcdf6f34bf0ca39d958879816fc2c1  gas/testsuite/gas/i386/arch-10.s
+55e60d9a0f9c5741095a4e4cd0ff269d  gas/testsuite/gas/i386/arch-11.d
+a0ba0f4ee22157c7b827a05809c74252  gas/testsuite/gas/i386/arch-11.s
+bd5ebc374ccc1141114d427b606893b9  gas/testsuite/gas/i386/arch-12.d
+e33093a9e0e46d682d68f7e8d1879ba5  gas/testsuite/gas/i386/arch-12.s
+42d0f4545615d1ee10e8838c62268b30  gas/testsuite/gas/i386/arch-2.d
+98890f04f76c669902e924263f3a4388  gas/testsuite/gas/i386/arch-2.s
+c643432a697f1eaca5b6c2f04d9f2f59  gas/testsuite/gas/i386/arch-3.d
+51947cf37cd9d6584de752422b3fa7f4  gas/testsuite/gas/i386/arch-3.s
+d715fd01a7c1e2dc76cae1231db9caa3  gas/testsuite/gas/i386/arch-4.d
+dacf75da2d6832e65f00676df7c9a013  gas/testsuite/gas/i386/arch-4.s
+407c9c0c081ad4ed23e3eed383bd1ca6  gas/testsuite/gas/i386/arch-5.d
+881a1d13bb99416017d937e5effa8afe  gas/testsuite/gas/i386/arch-5.s
+7b839f7ef0a473d69e9c928ae299be80  gas/testsuite/gas/i386/arch-6.d
+b3a48fb746350655b78b981634817d9d  gas/testsuite/gas/i386/arch-6.s
+279db54fe3dc1b2ad2706510a0a072d0  gas/testsuite/gas/i386/arch-7.d
+8c0e50647ead9e7958d12dfb9fcf919f  gas/testsuite/gas/i386/arch-7.s
+f6136cb1d84660930a63974fafefe89f  gas/testsuite/gas/i386/arch-9.d
+977c4e7a3894b8727a607b5db85087e5  gas/testsuite/gas/i386/arch-9.s
+d71f7aaa6431d9f97d2f252bf1f598c6  gas/testsuite/gas/i386/arch-avx-1-1.l
+1d3c045b12dca5123c1f1c072760599a  gas/testsuite/gas/i386/arch-avx-1-1.s
+d71f7aaa6431d9f97d2f252bf1f598c6  gas/testsuite/gas/i386/arch-avx-1-2.l
+1d3c045b12dca5123c1f1c072760599a  gas/testsuite/gas/i386/arch-avx-1-2.s
+d71f7aaa6431d9f97d2f252bf1f598c6  gas/testsuite/gas/i386/arch-avx-1-3.l
+1d3c045b12dca5123c1f1c072760599a  gas/testsuite/gas/i386/arch-avx-1-3.s
+3213b3903043c42c1e565d662c165639  gas/testsuite/gas/i386/arch-avx-1-4.l
+1d3c045b12dca5123c1f1c072760599a  gas/testsuite/gas/i386/arch-avx-1-4.s
+438e3620835c28a62d0d40d8fe63b86c  gas/testsuite/gas/i386/arch-avx-1-5.l
+1d3c045b12dca5123c1f1c072760599a  gas/testsuite/gas/i386/arch-avx-1-5.s
+d71f7aaa6431d9f97d2f252bf1f598c6  gas/testsuite/gas/i386/arch-avx-1-6.l
+1d3c045b12dca5123c1f1c072760599a  gas/testsuite/gas/i386/arch-avx-1-6.s
+62fd5a3bf586aa6a49c795ba95dda468  gas/testsuite/gas/i386/arch-avx-1.d
+6fd5639d4ad175fa23bd73487ecedc10  gas/testsuite/gas/i386/arch-avx-1.s
+b03a4e1f362f7544d45d25e4d2bff12e  gas/testsuite/gas/i386/att-regs.d
+cc0d8b6d9603acdb81cc3a3b58cddedf  gas/testsuite/gas/i386/att-regs.s
+204308fdda1295977796d7b583fa7fde  gas/testsuite/gas/i386/avx-gather-intel.d
+512235971837376879c46abbda91fd90  gas/testsuite/gas/i386/avx-gather.d
+067fc780fc1d8a7df5f87f6e8335a561  gas/testsuite/gas/i386/avx-gather.s
+4fc048736a2c084bee1908ed33ad0178  gas/testsuite/gas/i386/avx-intel.d
+a06b8f951f2c69d5430b30c43adac226  gas/testsuite/gas/i386/avx-scalar-intel.d
+3e04e47b54e1889ba607c91443e22ec7  gas/testsuite/gas/i386/avx-scalar.d
+627c851404d1bafd5ae9ce2649b36d44  gas/testsuite/gas/i386/avx-scalar.s
+9a809d4a118138a33a385cbabd9f3efe  gas/testsuite/gas/i386/avx.d
+5edb3797f38fe1008d8dff820bfb17f8  gas/testsuite/gas/i386/avx.s
+63e41ec69ba7585cdf8e6343bd0963ab  gas/testsuite/gas/i386/avx2-intel.d
+8914b2a9fc24d1e24dc3d1d58073a6a5  gas/testsuite/gas/i386/avx2.d
+15c1c4db95335650a57de9d6acf12528  gas/testsuite/gas/i386/avx2.s
+4fff5d800d96f132317a4e11bcab1956  gas/testsuite/gas/i386/avx256int-intel.d
+c64593a8ca631f1937c9ad6a51a9a515  gas/testsuite/gas/i386/avx256int.d
+f14cfb582b15f84852a900686c462ba5  gas/testsuite/gas/i386/avx256int.s
+4e344296641bfd2128a5cc0827f7afba  gas/testsuite/gas/i386/bad-size.d
+2cb02be063b81df1a93f7aacb6e0a209  gas/testsuite/gas/i386/bad-size.s
+b4d3f465c5e64ba8955ca95984516e65  gas/testsuite/gas/i386/bad-size.warn
+c36066b7f07db4fcea92b62c0c8bb715  gas/testsuite/gas/i386/bmi-intel.d
+5851ad2e4711f5eb46857dc958c20394  gas/testsuite/gas/i386/bmi.d
+ff40be471674a3b3290eb9b699614ae5  gas/testsuite/gas/i386/bmi.s
+4a93dfd1586b17c9300f7d4349fad70f  gas/testsuite/gas/i386/bmi2-intel.d
+0d21bb7f0cb7179d7eda89d14fb487b4  gas/testsuite/gas/i386/bmi2.d
+f770ccd7151113d5dd19cdd9f2f1a0e0  gas/testsuite/gas/i386/bmi2.s
+4fcdf4ddc2c648f228400a3349b3cfd2  gas/testsuite/gas/i386/bss.d
+873bd22e2aefafbf190efebc31f90ba8  gas/testsuite/gas/i386/bss.s
+79f73dddb88f227947e29b673f5f6d89  gas/testsuite/gas/i386/clmul-intel.d
+5cbae0d2dc80c2917d1b649cd2cc5819  gas/testsuite/gas/i386/clmul.d
+0bbda8b5cbddb5c69a8259affdefa47d  gas/testsuite/gas/i386/clmul.s
+13eb7a28fbf1022b85287860a4c1e6df  gas/testsuite/gas/i386/compat-intel.d
+946e035f667a16e08ae486622ddfedd1  gas/testsuite/gas/i386/compat.d
+b9dc0897d5efa8fa23e144276af2fda0  gas/testsuite/gas/i386/compat.s
+48ac5ede74694da5a5c30740ae07542b  gas/testsuite/gas/i386/cr-err.l
+682ff4e79cf55bde7df5a585334244f1  gas/testsuite/gas/i386/cr-err.s
+9e528b11bf49b0271e767ce686beafc1  gas/testsuite/gas/i386/crc32-intel.d
+b63fd1728be7f8ab7ad68b43d7859094  gas/testsuite/gas/i386/crc32.d
+8eadf5c51b3ff6e11360e1e46341064b  gas/testsuite/gas/i386/crc32.s
+5fc6911024266e35d7a7c6ddd9d2dcc8  gas/testsuite/gas/i386/crx.d
+cd065840b7ecff5d83aa9701a1479e35  gas/testsuite/gas/i386/crx.s
+94c401fadc8b3eca17a53e475be54b63  gas/testsuite/gas/i386/debug1.d
+fcb662f6083710b2db7e90393ccc75d9  gas/testsuite/gas/i386/debug1.s
+f5eae70842a215bcac877e124765f9b8  gas/testsuite/gas/i386/disp-intel.d
+a31dea706d02991a25bb3fa43e910339  gas/testsuite/gas/i386/disp.d
+2edcd8110d38767edd6cbddbd90cdc3b  gas/testsuite/gas/i386/disp.s
+4e8e7c8aa970e8c747d4a649b8f3a20a  gas/testsuite/gas/i386/disp32.d
+0d2042e6dcbc790ca78032ed45b944d7  gas/testsuite/gas/i386/disp32.s
+189be01fb122304d37ce73bc98f846c0  gas/testsuite/gas/i386/divide.d
+33c0d04dc841d220224f80125d856600  gas/testsuite/gas/i386/divide.s
+c6be67da74ec273b5a95bb1e074c41ba  gas/testsuite/gas/i386/dw2-compress-1.d
+c83938985211abdfda1de50ecadf9db5  gas/testsuite/gas/i386/dw2-compress-1.s
+b04fd5e77f20a41f39d3be429d3193d6  gas/testsuite/gas/i386/dw2-compress-2.d
+6adc5de214dc31900028867a47408dee  gas/testsuite/gas/i386/dw2-compress-2.s
+d5d131a9412b15ede69a454b650832e3  gas/testsuite/gas/i386/ept-intel.d
+33d05ee98f24760dc1781feb775c639e  gas/testsuite/gas/i386/ept.d
+15eaf1303baff77f35818d7933ce2e0e  gas/testsuite/gas/i386/ept.s
+9670cfca7b529cc6b85cfb6bc1fe9bf0  gas/testsuite/gas/i386/equ.d
+6790d514023dc266c846e5e3c2193d49  gas/testsuite/gas/i386/equ.s
+670ca9d041e26d6ad52538f0848e25e0  gas/testsuite/gas/i386/f16c-intel.d
+aea9d80d5ab333f09676da2840d527d2  gas/testsuite/gas/i386/f16c.d
+709ee9724e4ab84481450a7b37995d3a  gas/testsuite/gas/i386/f16c.s
+481a82666e24dd35712ddbe1953070fc  gas/testsuite/gas/i386/float.l
+0df7ab956e3209428d665890983ef957  gas/testsuite/gas/i386/float.s
+3ea2c5bd85f72208e712b4642a1f2d70  gas/testsuite/gas/i386/fma-intel.d
+1b594228cefc4b5c16caad468781b1c7  gas/testsuite/gas/i386/fma-scalar-intel.d
+b744639e88e21d0d19b7ec1319b71be5  gas/testsuite/gas/i386/fma-scalar.d
+67e8d9ebe9297a5f7975087017bc07ca  gas/testsuite/gas/i386/fma-scalar.s
+d8c614d055ecfd66f4ef6ce62f3e4101  gas/testsuite/gas/i386/fma.d
+305dabcbe317bc5f1549fd6d1633f02e  gas/testsuite/gas/i386/fma.s
+7e5e384f1b32b26958f8af641023a2c6  gas/testsuite/gas/i386/fma4.d
+8d76c68f0c2de1fc309442b6c6054271  gas/testsuite/gas/i386/fma4.s
+827d73ef30f7ac676b39933e05215587  gas/testsuite/gas/i386/fp.d
+7bcb8a12861c81cdcb2c0bb7de330f1b  gas/testsuite/gas/i386/fp.s
+6a6f3f219da1517555a2e3c2d1f42c06  gas/testsuite/gas/i386/fsgs-intel.d
+eb3698c46ad08724de91ff7943f743d4  gas/testsuite/gas/i386/fsgs.d
+81a2842104b82fd33309bf1e53ef590f  gas/testsuite/gas/i386/fsgs.s
+8080d881efa149202b251d632f28cb7c  gas/testsuite/gas/i386/general.l
+1db75486be70699071b9a6564e5f843a  gas/testsuite/gas/i386/general.s
+f6f171e3ed5e8b2fb2a22b376eb49f3f  gas/testsuite/gas/i386/gotpc.d
+b518d2eb2658745af0bf58cbd295eec9  gas/testsuite/gas/i386/gotpc.s
+c42f10e9f4ecdddcbd48ea204dec710b  gas/testsuite/gas/i386/i386.d
+b735130773f9b0bb9bfabba433b7de30  gas/testsuite/gas/i386/i386.exp
+8eb567b76b592760d5316213b76a6d85  gas/testsuite/gas/i386/i386.s
+0c804ba116de81860c5b4592ac701919  gas/testsuite/gas/i386/ifunc-2.l
+f5d8fb713f7aa9f005521f9da7af1b08  gas/testsuite/gas/i386/ifunc-2.s
+7eba5b9ca7814406d3c41abb2acc3b3b  gas/testsuite/gas/i386/ifunc-3.d
+df71a69b7aa589034050faedee8d0e44  gas/testsuite/gas/i386/ifunc-3.s
+65dfa028ff8d7a64716f3669cb2f53cb  gas/testsuite/gas/i386/ifunc.d
+82b099704e53725014c0deae97bad932  gas/testsuite/gas/i386/ifunc.s
+3df78821a0064d78577e8535c07ffcea  gas/testsuite/gas/i386/ilp32/cfi/cfi-common-1.d
+ab4bb667cf0e51ef13eaa6213dd84a97  gas/testsuite/gas/i386/ilp32/cfi/cfi-common-2.d
+1174864a74f88e4ef8273b42f8266c8d  gas/testsuite/gas/i386/ilp32/cfi/cfi-common-3.d
+1c6c12c64c446a53b08c7c1aa051dd9d  gas/testsuite/gas/i386/ilp32/cfi/cfi-common-4.d
+79df02eb71bee33baa0e5a488272704e  gas/testsuite/gas/i386/ilp32/cfi/cfi-common-5.d
+97a123c12520f3e4f3c3d3052b430054  gas/testsuite/gas/i386/ilp32/cfi/cfi-common-6.d
+93b0333f2a44ee2f8010c5a178daac22  gas/testsuite/gas/i386/ilp32/cfi/cfi-common-7.d
+edac528bdfbe54e3bef23f6994121c95  gas/testsuite/gas/i386/ilp32/cfi/cfi-x86_64.d
+8b17764a49ed0f93bb8eb1c7bc9c569b  gas/testsuite/gas/i386/ilp32/cfi/ilp32.exp
+5161181167c7011eb0db45cdc71943ff  gas/testsuite/gas/i386/ilp32/elf/ehopt0.d
+3852ff733d92251dc53294d23a41723d  gas/testsuite/gas/i386/ilp32/elf/equ-reloc.d
+0ffd8df241a3aab9936a19f8bb697772  gas/testsuite/gas/i386/ilp32/elf/file.d
+c82aaf4c739e2b0a3bf7a81130c5433f  gas/testsuite/gas/i386/ilp32/elf/group0a.d
+8e5758cc5ae65c6f53d1b7a6f5d9c09b  gas/testsuite/gas/i386/ilp32/elf/group0b.d
+6d366d0c18e682d56ea20e160b7cc05f  gas/testsuite/gas/i386/ilp32/elf/group1a.d
+98b7d2f0672b9946cd3c1fbd1c559117  gas/testsuite/gas/i386/ilp32/elf/group1b.d
+c1e5c6040ea899706e93bbb089a9f7c7  gas/testsuite/gas/i386/ilp32/elf/ifunc-1.d
+8b17764a49ed0f93bb8eb1c7bc9c569b  gas/testsuite/gas/i386/ilp32/elf/ilp32.exp
+67a6bb8ea5ebc16c6bebdd0733290d3d  gas/testsuite/gas/i386/ilp32/elf/redef.d
+dcbf92f6a87febf4150119fb6a024d4d  gas/testsuite/gas/i386/ilp32/elf/section0.d
+da350bef14ac55f68e6891a7839bd793  gas/testsuite/gas/i386/ilp32/elf/section1.d
+bee9d1befc23d5261aae48b05e4fb067  gas/testsuite/gas/i386/ilp32/elf/section3.d
+479fa4a30b1ecb5e1af1560c981e09df  gas/testsuite/gas/i386/ilp32/elf/section4.d
+3194b6c4cc1b10c6c8e9663d18185cfd  gas/testsuite/gas/i386/ilp32/elf/section6.d
+e6fec4e140cf4ff214a7b12b6c2dcc40  gas/testsuite/gas/i386/ilp32/elf/section7.d
+a1ae4a1f79c782124ebc9057fc92aba8  gas/testsuite/gas/i386/ilp32/elf/struct.d
+d02f8c60e09d2949aedf1d1bd2825e0a  gas/testsuite/gas/i386/ilp32/elf/symtab.d
+04d2b37b4d37201b1a9fff9cbbb5ab92  gas/testsuite/gas/i386/ilp32/elf/symver.d
+1d83e568aec28f15a0d64b19cea75685  gas/testsuite/gas/i386/ilp32/ilp32.exp
+64e911f51146d8fa875f91152210a4a0  gas/testsuite/gas/i386/ilp32/immed64.d
+2833ab469120fcf40bab61da9310e585  gas/testsuite/gas/i386/ilp32/immed64.s
+8b17764a49ed0f93bb8eb1c7bc9c569b  gas/testsuite/gas/i386/ilp32/lns/ilp32.exp
+1ec9a904bec40029b6c55a5de818424a  gas/testsuite/gas/i386/ilp32/lns/lns-common-1.d
+51b92f5736b04d44b5f86b1b79413bae  gas/testsuite/gas/i386/ilp32/lns/lns-duplicate.d
+57781fd1330a4fdcf7ffbb2fe82d8c2d  gas/testsuite/gas/i386/ilp32/mixed-mode-reloc64.d
+ba62ade5841d563a4be93312ed80500f  gas/testsuite/gas/i386/ilp32/quad.d
+968510511922ffd73f9ce351e916d5a0  gas/testsuite/gas/i386/ilp32/quad.s
+1ee9180d49c54cf4039608fab7f9728e  gas/testsuite/gas/i386/ilp32/reloc64.d
+0f780e1b02473c26e39590bab2c2736e  gas/testsuite/gas/i386/ilp32/reloc64.l
+67d2922e632ef0c4a4a699ab3ec85d65  gas/testsuite/gas/i386/ilp32/reloc64.s
+94747d62265e52fd21f9768eb257044b  gas/testsuite/gas/i386/ilp32/rex.d
+091bf5f771ed2c13816c82c901569130  gas/testsuite/gas/i386/ilp32/rexw.d
+f7c34f523157cc22bbdb4c173754d118  gas/testsuite/gas/i386/ilp32/svme64.d
+c039cb81629fc6e70e10cde7baaa665f  gas/testsuite/gas/i386/ilp32/x86-64-addr32-intel.d
+6129948fdd6a227a875b5a09294a4f6b  gas/testsuite/gas/i386/ilp32/x86-64-addr32.d
+f837788a5c44c4d5609d78a30a60d527  gas/testsuite/gas/i386/ilp32/x86-64-aes-intel.d
+933b8bc00c5ca2364c797a2833ba3888  gas/testsuite/gas/i386/ilp32/x86-64-aes.d
+d65c86f1f7943a8ee200f514ff5e0f1c  gas/testsuite/gas/i386/ilp32/x86-64-amdfam10.d
+ed625b2e7d464175a5843a38c4ba9c77  gas/testsuite/gas/i386/ilp32/x86-64-arch-1.d
+d544001f61622013efbdc30052fc035e  gas/testsuite/gas/i386/ilp32/x86-64-arch-2.d
+33b1761d7c94802f68eaf6a7a0c077dc  gas/testsuite/gas/i386/ilp32/x86-64-avx-intel.d
+3cbec967b6e302b8ccfe39c892b6a8eb  gas/testsuite/gas/i386/ilp32/x86-64-avx-swap-intel.d
+cabf474b86feb7f08177df00d87743fb  gas/testsuite/gas/i386/ilp32/x86-64-avx-swap.d
+d27cba0e5c504a4643dafcda752c2376  gas/testsuite/gas/i386/ilp32/x86-64-avx.d
+25cb44655988f34bec1f3a50c558f1e2  gas/testsuite/gas/i386/ilp32/x86-64-branch.d
+8051718ed58247a8581c69c6fd35984a  gas/testsuite/gas/i386/ilp32/x86-64-cbw-intel.d
+b13c4d8555f39366287af7684bf2344f  gas/testsuite/gas/i386/ilp32/x86-64-cbw.d
+5e5e11eca24557cc72ada9cbcbfccc5a  gas/testsuite/gas/i386/ilp32/x86-64-clmul-intel.d
+475308c2cf70008ff9857300c2fda523  gas/testsuite/gas/i386/ilp32/x86-64-clmul.d
+a10419265e64f39133663018ac41b3e2  gas/testsuite/gas/i386/ilp32/x86-64-crc32-intel.d
+c6e512e7f347f5f4f9e44dc1250d94c2  gas/testsuite/gas/i386/ilp32/x86-64-crc32.d
+fd89c20e58a5932b7780b428139c3f43  gas/testsuite/gas/i386/ilp32/x86-64-crx-suffix.d
+5ece27a509cd364929b7d08a02ceefa5  gas/testsuite/gas/i386/ilp32/x86-64-crx.d
+683e030f7c5237f6d6ad750654ddddd4  gas/testsuite/gas/i386/ilp32/x86-64-disp-intel.d
+268faa642f40031509fafa4d65b15ccc  gas/testsuite/gas/i386/ilp32/x86-64-disp.d
+310577f2da9b725f5c905a0d5b085691  gas/testsuite/gas/i386/ilp32/x86-64-drx-suffix.d
+3dd53a565bb9d3332d493549bdac46bc  gas/testsuite/gas/i386/ilp32/x86-64-drx.d
+f45268bda416f4f4d43cbb136d40f688  gas/testsuite/gas/i386/ilp32/x86-64-ept-intel.d
+ee3d6adde67cd3af844956e9b01db85e  gas/testsuite/gas/i386/ilp32/x86-64-ept.d
+f711e8466d7397bf9c293e335306610d  gas/testsuite/gas/i386/ilp32/x86-64-fma-intel.d
+74a1273930b2fb5a7e35fc06f0d6ded9  gas/testsuite/gas/i386/ilp32/x86-64-fma.d
+4a8752c77dea49095e2ec253901d5b41  gas/testsuite/gas/i386/ilp32/x86-64-fma4.d
+bae71559c8ddcd78dcdaec3d6c2d58f0  gas/testsuite/gas/i386/ilp32/x86-64-gidt.d
+014193fbdf50f4329bf3ed93939da480  gas/testsuite/gas/i386/ilp32/x86-64-ifunc.d
+2b6b30a70c44b1f6d7b43422cd8a3bdb  gas/testsuite/gas/i386/ilp32/x86-64-intel64.d
+99c2a3675c7456463244fe9c0be245cc  gas/testsuite/gas/i386/ilp32/x86-64-io-intel.d
+2f44168786a80f39e5d76dc4e82b296e  gas/testsuite/gas/i386/ilp32/x86-64-io-suffix.d
+90a62a52d0e2c2359830099f1c69cc0f  gas/testsuite/gas/i386/ilp32/x86-64-io.d
+407553c22d29562717fe64d4168ef21c  gas/testsuite/gas/i386/ilp32/x86-64-localpic.d
+40ede28427b82ae3e4658a49ff8cbeab  gas/testsuite/gas/i386/ilp32/x86-64-mem-intel.d
+9e634631cd34df405fd8be627b1b88d8  gas/testsuite/gas/i386/ilp32/x86-64-mem.d
+703fabc67572478eb6db8a13bd74e916  gas/testsuite/gas/i386/ilp32/x86-64-movbe-intel.d
+49b0f7443931b77dff720c925308a19f  gas/testsuite/gas/i386/ilp32/x86-64-movbe.d
+f826ef0b288ab7dd460a1431d3e24a71  gas/testsuite/gas/i386/ilp32/x86-64-nops-1-core2.d
+d27a265d3f9343ac86560289681486ed  gas/testsuite/gas/i386/ilp32/x86-64-nops-1-k8.d
+b8c04fec6e0a3299b5fa5d0a6bee45d4  gas/testsuite/gas/i386/ilp32/x86-64-nops-1-nocona.d
+fc252e86b680bcaaf1a05091eb822545  gas/testsuite/gas/i386/ilp32/x86-64-nops-1-pentium.d
+26293be853ce56559b8c413379b971df  gas/testsuite/gas/i386/ilp32/x86-64-nops-1.d
+34a7718e4efb6c99e1d994b029a03680  gas/testsuite/gas/i386/ilp32/x86-64-nops-2.d
+523c654317980a0665725745133ee502  gas/testsuite/gas/i386/ilp32/x86-64-nops-3.d
+6def06e86d9a3ab76ad68e77e5569ab9  gas/testsuite/gas/i386/ilp32/x86-64-nops-4-core2.d
+4c19e1081706fe9d4f358757e2d05e41  gas/testsuite/gas/i386/ilp32/x86-64-nops-4-k8.d
+d46f707a4993a3d06765d169d2c89afc  gas/testsuite/gas/i386/ilp32/x86-64-nops-4.d
+e023edc22d6f87af8284abfdfcbfd38f  gas/testsuite/gas/i386/ilp32/x86-64-nops-5-k8.d
+cc0b219a4e7d5fb226806244501edfe4  gas/testsuite/gas/i386/ilp32/x86-64-nops-5.d
+bef2ae89d7d5c9c4f7cd636c14e752c9  gas/testsuite/gas/i386/ilp32/x86-64-nops.d
+df16126acfb56e9c8bfb55cd8828611e  gas/testsuite/gas/i386/ilp32/x86-64-opcode-inval-intel.d
+4259b1cae34a4f696c010cb2a4d87e81  gas/testsuite/gas/i386/ilp32/x86-64-opcode-inval.d
+ca5321f8e0308af417a19cd3e46eba54  gas/testsuite/gas/i386/ilp32/x86-64-opcode.d
+ce941c1b76388d97a77019ce753f996b  gas/testsuite/gas/i386/ilp32/x86-64-opts-intel.d
+787aa21140eadc2cdcfac4e9437c6852  gas/testsuite/gas/i386/ilp32/x86-64-opts.d
+cbc5b15e7fc07f41496aa5e12f93e1d6  gas/testsuite/gas/i386/ilp32/x86-64-pcrel.d
+7f474e4895a09cd83f21b42aee76fbad  gas/testsuite/gas/i386/ilp32/x86-64-pcrel.s
+71f8263c587a46434c7d63a2bed4a543  gas/testsuite/gas/i386/ilp32/x86-64-reg-intel.d
+8394efdd2473ae7f9a00b01cbb21ef0e  gas/testsuite/gas/i386/ilp32/x86-64-reg.d
+3eab8632041a9f795247fe555af55c95  gas/testsuite/gas/i386/ilp32/x86-64-rep-suffix.d
+0cfb959748d2765b026f479492302685  gas/testsuite/gas/i386/ilp32/x86-64-rep.d
+cd4261d448c5661ac2160e41ec5b0995  gas/testsuite/gas/i386/ilp32/x86-64-rip-intel.d
+cb412a6bedcb98fb9dd9eae289f892e9  gas/testsuite/gas/i386/ilp32/x86-64-rip.d
+856a89e2121d0f890ee876875e8483df  gas/testsuite/gas/i386/ilp32/x86-64-sib-intel.d
+4ec74fcd08be7b4b358e8305fd0ef1ad  gas/testsuite/gas/i386/ilp32/x86-64-sib.d
+7a5f2dbac770eba590529953e8f5bfd3  gas/testsuite/gas/i386/ilp32/x86-64-simd-intel.d
+7a96805b21ce30d177bd437f7bdba072  gas/testsuite/gas/i386/ilp32/x86-64-simd-suffix.d
+03126c8bcd434c33341cc6bf9d845a82  gas/testsuite/gas/i386/ilp32/x86-64-simd.d
+81ba2eb302a7cf061a8fec009c4d32f2  gas/testsuite/gas/i386/ilp32/x86-64-sse-check-none.d
+0197094a9385985b1e4eb108844cb639  gas/testsuite/gas/i386/ilp32/x86-64-sse-check-warn.d
+da0a46c46e1c4e1c914162f3ab2de5fe  gas/testsuite/gas/i386/ilp32/x86-64-sse-check.d
+9e066d0ac79e17457e5b950543b39556  gas/testsuite/gas/i386/ilp32/x86-64-sse-noavx.d
+a0d817cab7c5a6e2f03e2f4222ecae5d  gas/testsuite/gas/i386/ilp32/x86-64-sse2avx-opts-intel.d
+2c3ca42ce824461ff18acc9b35d66014  gas/testsuite/gas/i386/ilp32/x86-64-sse2avx-opts.d
+a29da9ac70bf23316f9442ee2207f2e0  gas/testsuite/gas/i386/ilp32/x86-64-sse2avx.d
+82d4f03fde7ebb13d5a960da416fca21  gas/testsuite/gas/i386/ilp32/x86-64-sse3.d
+0e08b57387501efff4dd240707347a13  gas/testsuite/gas/i386/ilp32/x86-64-sse4_1-intel.d
+164b3f3b0bc3cfbc8f9768a0e7ce5538  gas/testsuite/gas/i386/ilp32/x86-64-sse4_1.d
+9f07f2016caed1bb56c294d1f0caaf95  gas/testsuite/gas/i386/ilp32/x86-64-sse4_2-intel.d
+f21e69257b122606ddc99717ccbf50e2  gas/testsuite/gas/i386/ilp32/x86-64-sse4_2.d
+9cbe7bd79644371dd0a0305ad34f0453  gas/testsuite/gas/i386/ilp32/x86-64-ssse3.d
+7d7cb1a556286105ba1b9ed4eb46116a  gas/testsuite/gas/i386/ilp32/x86-64-stack-intel.d
+6220a6c3770ca5d801d2de69c75ace72  gas/testsuite/gas/i386/ilp32/x86-64-stack-suffix.d
+9f282e622001e91deda7eb8014adebfd  gas/testsuite/gas/i386/ilp32/x86-64-stack.d
+a7e456d18941f1aa004c73051332f298  gas/testsuite/gas/i386/ilp32/x86-64-unwind.d
+0362e325ae03f7841c862f1faf6569e2  gas/testsuite/gas/i386/ilp32/x86-64-vmx.d
+34311f9bc61ed6aa88f4278a98d39e9c  gas/testsuite/gas/i386/ilp32/x86-64-xsave-intel.d
+82ccddf4546498fc3ed56ae4ccfa1759  gas/testsuite/gas/i386/ilp32/x86-64-xsave.d
+86b585a4ab87c0059a40cfaccbd4c4bb  gas/testsuite/gas/i386/ilp32/x86-64.d
+558dfa0ff47174a56fdb77cc4abfdda9  gas/testsuite/gas/i386/ilp32/x86-64.s
+ae2e0be16100f21dd7ca822d5d462e4a  gas/testsuite/gas/i386/immed32.d
+87fbc24db5a886748c5a92b86f0bc6b3  gas/testsuite/gas/i386/immed32.s
+6272a52f78a3e539faeeb78c25efe500  gas/testsuite/gas/i386/immed64.d
+1eb96aabc3d1172ecee1c818483d0caf  gas/testsuite/gas/i386/immed64.s
+acad3adc7150a8ab49fae5d753930d85  gas/testsuite/gas/i386/intel-expr.d
+296c27ba04bdeab744e43fd92bbcd60a  gas/testsuite/gas/i386/intel-expr.s
+45f8fb682b27ba478df9f2d637eeb202  gas/testsuite/gas/i386/intel-got32.d
+91a804c847bda059688149ce3e82abe9  gas/testsuite/gas/i386/intel-got32.s
+9e4ec3f3bd3e885fc099fe387573bc0a  gas/testsuite/gas/i386/intel-got64.d
+80a03ddb8d21737a404a109e0db0a111  gas/testsuite/gas/i386/intel-got64.s
+fd0541170c653ad47f1b91eaebe962c0  gas/testsuite/gas/i386/intel-regs.d
+a8909489e3ce4f2f3a6f37415f1931d9  gas/testsuite/gas/i386/intel-regs.s
+cd059a817988d83fac0bb5896c1d5c65  gas/testsuite/gas/i386/intel.d
+a51910f6973ebe550d20e21bb85d34ba  gas/testsuite/gas/i386/intel.e
+fbed5b55122a503ae0da16c4b9a629ac  gas/testsuite/gas/i386/intel.s
+c6d309e665ba7201bb4410be04c96087  gas/testsuite/gas/i386/intel16.d
+8ce11aeb67d3ed972d5eb3c90e5e94f4  gas/testsuite/gas/i386/intel16.s
+ce49e8118193f845b50ca7d4994d5435  gas/testsuite/gas/i386/intelbad.l
+8bec947baed5b06bce4cc4f951d68571  gas/testsuite/gas/i386/intelbad.s
+f3f92d0c3d309edf9ec9a973c3cb08ef  gas/testsuite/gas/i386/intelok.d
+3e05e60b08be317dc957729c0d438e7e  gas/testsuite/gas/i386/intelok.s
+b83a2a0dbc42d7719c1f3773e5ece505  gas/testsuite/gas/i386/intelpic.d
+8555f3b34fdffff6df460123cab004a2  gas/testsuite/gas/i386/intelpic.s
+7d29d7830f6d684717aed5c27411734a  gas/testsuite/gas/i386/inval-avx.l
+a7b6a8c2865124822043ef0e02c71562  gas/testsuite/gas/i386/inval-avx.s
+277eec2e7d58fa65cb3e60587ae96e40  gas/testsuite/gas/i386/inval-crc32.l
+35b185f6b91fb6037ca025d85a808fd0  gas/testsuite/gas/i386/inval-crc32.s
+3f29ec220a7adb3693a3cacb9876e6d4  gas/testsuite/gas/i386/inval-ept.l
+5fc14add67d4bcc3e5622f38ac12a797  gas/testsuite/gas/i386/inval-ept.s
+653c1bfa5acbed73845e9e4f0ac025bf  gas/testsuite/gas/i386/inval-equ-1.l
+ad64e4e52649facd07693d70163a109c  gas/testsuite/gas/i386/inval-equ-1.s
+58126930aef7bbe31b4dc18cb4e80d0d  gas/testsuite/gas/i386/inval-equ-2.l
+9d24aa6584eab0a1186f17bdb964200d  gas/testsuite/gas/i386/inval-equ-2.s
+a450a7a8c4535aaf595b98e8af418639  gas/testsuite/gas/i386/inval-invpcid.l
+0c5fd56b405c29b473c429cff6b6e427  gas/testsuite/gas/i386/inval-invpcid.s
+d78190becdda6021676d5832373afc7f  gas/testsuite/gas/i386/inval-movbe.l
+12f93fc08afaf9bfb6f54089f3511f37  gas/testsuite/gas/i386/inval-movbe.s
+b94377afd7b01cc32db6b37e5ea630d4  gas/testsuite/gas/i386/inval-reg.l
+747f53f51416cff88b86ca5c63e46445  gas/testsuite/gas/i386/inval-reg.s
+f7a89c19a9f1cb3e85637ebe9f67e057  gas/testsuite/gas/i386/inval-seg.l
+f021a269046335d2df67eb196fee389f  gas/testsuite/gas/i386/inval-seg.s
+890cfc8ddc682354d92865b8e02cc0f2  gas/testsuite/gas/i386/inval.l
+380b8be614c2725ff5c127ad3b757848  gas/testsuite/gas/i386/inval.s
+147e701a51e08124a3482e3899c25a71  gas/testsuite/gas/i386/invpcid-intel.d
+c05bfc313bacdcc4774e2dbc4be372ce  gas/testsuite/gas/i386/invpcid.d
+e0ed401fc7e84ee536b96145e21e1bab  gas/testsuite/gas/i386/invpcid.s
+8d968c107e13ba687eb12926719adb44  gas/testsuite/gas/i386/jump.d
+42b0107629a2a3d206a26a157a93e3ff  gas/testsuite/gas/i386/jump.s
+d5ca309d7d4537ef130eb7165376036d  gas/testsuite/gas/i386/jump16.d
+d7d31bb833c5765c095c612d30520833  gas/testsuite/gas/i386/jump16.s
+d7f8400590524bb79c7a8b32e3ebfd94  gas/testsuite/gas/i386/k1om-inval.l
+0f21416e489dae757bb03a5039e498d7  gas/testsuite/gas/i386/k1om-inval.s
+31ce2d117c1ae5bf811a9bc60aba2010  gas/testsuite/gas/i386/k1om.d
+ccf3a80b02bd62f291ff4a473ad72be4  gas/testsuite/gas/i386/katmai.d
+184fb56a639e2576e761632f3fbd4cb9  gas/testsuite/gas/i386/katmai.s
+cee3d19c62cb9bca0ac47a548f30858b  gas/testsuite/gas/i386/l1om-inval.l
+0f21416e489dae757bb03a5039e498d7  gas/testsuite/gas/i386/l1om-inval.s
+314d1b2f054ba21e0c9aaf8bc6d32e96  gas/testsuite/gas/i386/l1om.d
+a39dcd817c512ae873dff25a14c171ff  gas/testsuite/gas/i386/list-1.l
+fc66ec5cd46138f7cd3ead91679c9fa7  gas/testsuite/gas/i386/list-1.s
+a5e2cc20cc32a456cba57a28c13c18e5  gas/testsuite/gas/i386/list-2.l
+ecaf63b5fb174b39641263c157f857fa  gas/testsuite/gas/i386/list-2.s
+52c75ea4e411d04c5971c3e8dec8f013  gas/testsuite/gas/i386/list-3.l
+7466e291420e797a803e9201ef88c039  gas/testsuite/gas/i386/list-3.s
+f25b4b35620c2d7e510e811d37698fbc  gas/testsuite/gas/i386/localpic.d
+4e09ecab41571383910000edd7515775  gas/testsuite/gas/i386/localpic.s
+74720fc7bc721c83eae64f2dc2ba94aa  gas/testsuite/gas/i386/lock-1-intel.d
+fdb142aa76fad022fa423552cde40462  gas/testsuite/gas/i386/lock-1.d
+dfc4ac89a0fb64cc8479dd64a3267692  gas/testsuite/gas/i386/lock-1.s
+bbd99783af207bd5b47b392cb5604825  gas/testsuite/gas/i386/lockbad-1.l
+2ce461380f139daf73afb299c404081b  gas/testsuite/gas/i386/lockbad-1.s
+4438f00ef1c1e53918012bc35389d8b3  gas/testsuite/gas/i386/long-1-intel.d
+4aa1a1e863966181bc432f017fe2243a  gas/testsuite/gas/i386/long-1.d
+ae5cb3ce2d1779fd2f32ceffa6d3a038  gas/testsuite/gas/i386/long-1.s
+0a774e8f1a233946f9bd50c54305c6ac  gas/testsuite/gas/i386/lwp.d
+a51bccb0f43817a150bf55900f995a49  gas/testsuite/gas/i386/lwp.s
+b4d5520a82ffd4a0a13f5c0d2bd8ba62  gas/testsuite/gas/i386/mem-intel.d
+5fe4ae6c810ca1e91f8c8bc7630de456  gas/testsuite/gas/i386/mem.d
+5926795552df7942d593482625c9c50b  gas/testsuite/gas/i386/mem.s
+d004208db701b4e9c43957689eb71dab  gas/testsuite/gas/i386/mixed-mode-reloc.s
+f4d4dceee0d93929433daba8a389ca55  gas/testsuite/gas/i386/mixed-mode-reloc32.d
+397c657036288a4b0e096e37942d74cd  gas/testsuite/gas/i386/mixed-mode-reloc64.d
+d566afc7ce85d649e11306e09c745945  gas/testsuite/gas/i386/modrm.l
+1d1696a1b6db5c16aa2463cdd8b6a045  gas/testsuite/gas/i386/modrm.s
+d66566456198a09537b0816548f065a4  gas/testsuite/gas/i386/movbe-intel.d
+61f6075da202c6dac27b16fa708d6fc9  gas/testsuite/gas/i386/movbe.d
+a91058699397fb64756b3ef31b12f1e3  gas/testsuite/gas/i386/movbe.s
+49e46a5f863be9fdb62ff21a13d0472e  gas/testsuite/gas/i386/naked.d
+b4fe60a42e7f416e8bcfc4c911652c79  gas/testsuite/gas/i386/naked.s
+a222b072dd6dcf34da7d441b99bef225  gas/testsuite/gas/i386/no87-2.l
+6dbfb50008d6f3fce14f55d98ccb5277  gas/testsuite/gas/i386/no87-2.s
+c211c30a2ca8c8af5dfb9de9ed947b54  gas/testsuite/gas/i386/no87.l
+40ffeadf079c8c28a36f6efcc580d508  gas/testsuite/gas/i386/no87.s
+2104665d17640a64efe7b5881e419f6f  gas/testsuite/gas/i386/nops-1-bdver1.d
+79324c17d7a317bdeb38558fdef17d65  gas/testsuite/gas/i386/nops-1-bdver2.d
+05ad0e5841a6d7bf557ff6a439f766f1  gas/testsuite/gas/i386/nops-1-core2.d
+1b6d99fa9f483ca4a983e086c3bfbd86  gas/testsuite/gas/i386/nops-1-i386-i686.d
+390ea68aac15a2de94c241b84fd60d83  gas/testsuite/gas/i386/nops-1-i386.d
+180fb5dfeedfebbed76b3ce02867a7ed  gas/testsuite/gas/i386/nops-1-i686.d
+5c837a002b3c88949c904d1b3b43b25d  gas/testsuite/gas/i386/nops-1-k8.d
+08f3d5ceb9530c9068f2e0fa74f75834  gas/testsuite/gas/i386/nops-1.d
+025026ce822ca51940d7d32199a1ac49  gas/testsuite/gas/i386/nops-1.s
+fc008c47b628e4419701c15a6c1a7663  gas/testsuite/gas/i386/nops-2-core2.d
+b7d7dd981c6a71fe1d9a3e31afe082f6  gas/testsuite/gas/i386/nops-2-i386.d
+8e52edd48c85bf50fd9f345bda7dad2d  gas/testsuite/gas/i386/nops-2.d
+1e88981495159fad22fb66e99c65f80e  gas/testsuite/gas/i386/nops-2.s
+2bb47f6c6770c2c5eae0f0c268350d7b  gas/testsuite/gas/i386/nops-3-i386.d
+f2d0bfc3c44aad2ba8d26f2f0bfaa472  gas/testsuite/gas/i386/nops-3-i686.d
+01ce50d52bd3841b1b4dceda08b12340  gas/testsuite/gas/i386/nops-3.d
+e2e942ec18e872d0b484adccc83ecbf1  gas/testsuite/gas/i386/nops-3.s
+ba2f203a1dfb65d33e88609107e446c7  gas/testsuite/gas/i386/nops-4-i386.d
+0e0158a3a5deb5ae71501c21a65576b5  gas/testsuite/gas/i386/nops-4-i686.d
+1b4aa6eb8ab48e67516865f2bb1d3b8c  gas/testsuite/gas/i386/nops-4.d
+0398244609681bda2062cb83cda985ad  gas/testsuite/gas/i386/nops-4.s
+be8d1c29fe2460cd77dda65b5feec594  gas/testsuite/gas/i386/nops-4a-i686.d
+02e4570b8ca23c5e910fb74faa9ec631  gas/testsuite/gas/i386/nops-5-i686.d
+41ac30746d51e82e4d7aef3e516f1cfc  gas/testsuite/gas/i386/nops-5.d
+8d916471b35b3710cce5fb2721841320  gas/testsuite/gas/i386/nops-5.s
+ff3c1c93f90d9087be51e53d4025ed66  gas/testsuite/gas/i386/nops-6.d
+4615c74bcbd0f731edbd5bae47389ff0  gas/testsuite/gas/i386/nops-6.s
+9eb66d9f6a5447c410317912af428fff  gas/testsuite/gas/i386/nops.d
+49a629575fb35d8e4bf06ac877f30d5e  gas/testsuite/gas/i386/nops.s
+33932fd124b1f4ad06740656ba7247ce  gas/testsuite/gas/i386/nops16-1.d
+f32aad7991cf969bca5f315431ac3318  gas/testsuite/gas/i386/nops16-1.s
+cb9b4ea0047dc619ac8138b43bc36504  gas/testsuite/gas/i386/opcode-intel.d
+3cbc8c1d75684a436f58e3da7d64ae56  gas/testsuite/gas/i386/opcode-suffix.d
+3909078572824bd0fb70e5fa20e5867d  gas/testsuite/gas/i386/opcode.d
+e31d78e87c6aba989be9ce4d285c9ccb  gas/testsuite/gas/i386/opcode.s
+419a77b5e4fee4bf64f776b0e0df2443  gas/testsuite/gas/i386/opts-intel.d
+8df6448b4aba8bfe18866c3541c34fae  gas/testsuite/gas/i386/opts.d
+4727954d4a6c2602077eec2e70077137  gas/testsuite/gas/i386/opts.s
+1c91055fbce0587f02a34bb69c2165bb  gas/testsuite/gas/i386/padlock.d
+e4a72b1d388038cb07dd34cdc0a38452  gas/testsuite/gas/i386/padlock.s
+b71a7c0a1c6237878c6a6c534563445a  gas/testsuite/gas/i386/pcrel.d
+2a069b87359bb962df261b870b939b15  gas/testsuite/gas/i386/pcrel.s
+dd5c556919ef2c377a504fa4d999a8a6  gas/testsuite/gas/i386/pr12589-1.d
+4b6eb108930d23fa1f582b5a91ff251e  gas/testsuite/gas/i386/pr12589-1.s
+beead5b7e8679add4114a22d147ca430  gas/testsuite/gas/i386/prefix.d
+3a00b6ea2b8f8f6b17136c2735787e71  gas/testsuite/gas/i386/prefix.s
+f9363ec16769b2e350e2cdf930d90785  gas/testsuite/gas/i386/rdrnd-intel.d
+a7a3a52e590fab01fcde1b0a17731b7e  gas/testsuite/gas/i386/rdrnd.d
+43766dcc6cb3491e198e4d07c9e9889d  gas/testsuite/gas/i386/rdrnd.s
+85d24187a437cd04fddf138f5495c0e5  gas/testsuite/gas/i386/reg-intel.d
+9664bb4ff4175097f7da9fbea55a7a31  gas/testsuite/gas/i386/reg.d
+dee1fc5bee092a6bfbe376415a1bef6f  gas/testsuite/gas/i386/reg.s
+73fc6f379a60b1c67af137c67709a8ee  gas/testsuite/gas/i386/relax-1.d
+298779399b17b78f52c1fdcf886b46a1  gas/testsuite/gas/i386/relax-1.s
+4fae09334600a881a60a28f2c5dfc2f3  gas/testsuite/gas/i386/relax-2.d
+03950f23a946b75f9accb17e47326341  gas/testsuite/gas/i386/relax-2.s
+88ff146a0aed9dc67489b41b0fb6f3cb  gas/testsuite/gas/i386/relax.d
+af8b77b677b0bd3471e7ca21a60c445a  gas/testsuite/gas/i386/relax.s
+cd3c7378640156c530cbd28aa6ee9e02  gas/testsuite/gas/i386/reloc.d
+785e2743dba0137e0235c3a40f7ed72b  gas/testsuite/gas/i386/reloc.s
+bcce880a7c30b65850e47c08f64f318b  gas/testsuite/gas/i386/reloc32.d
+ce14bb73228ed5e15623e58140110f06  gas/testsuite/gas/i386/reloc32.l
+b4e477ea59987907644527d7bee16e72  gas/testsuite/gas/i386/reloc32.s
+280669dae3c92b261776c12df35ef7e1  gas/testsuite/gas/i386/reloc64.d
+659181965dae7c7eb05fb37e42c3dab8  gas/testsuite/gas/i386/reloc64.l
+c1ef724b0348d32279094b876a0b2d7f  gas/testsuite/gas/i386/reloc64.s
+7147d515916f972e12b9b60c4757f5b2  gas/testsuite/gas/i386/rep-suffix.d
+dc27e5546173842a2a19812f95a809d9  gas/testsuite/gas/i386/rep-suffix.s
+165b35bf517c13862a58bf7133d403e1  gas/testsuite/gas/i386/rep.d
+58db4a5760d1bc9deac225c520b3489d  gas/testsuite/gas/i386/rep.s
+68f136651bb2441af19136053d7f3192  gas/testsuite/gas/i386/rex.d
+fcf6d1c7d088d63ac70f079baf51bae5  gas/testsuite/gas/i386/rex.s
+659ad43e992ab39f00c08bf853cffd61  gas/testsuite/gas/i386/rexw.d
+c73a446ebdac9845f2d0f061e6ce30d3  gas/testsuite/gas/i386/rexw.s
+d72937f5ee7c1feeecf96248fe38b509  gas/testsuite/gas/i386/secrel.d
+ae437b9d8fe2c177c2672e5ca17b9942  gas/testsuite/gas/i386/secrel.s
+49756badbd07c6541f231a7a4a0f869a  gas/testsuite/gas/i386/segment.l
+c31999cdae4d3da1d2eedfd3d840b32c  gas/testsuite/gas/i386/segment.s
+6404e1eb22da46c6a4c172ea467bbef6  gas/testsuite/gas/i386/sib-intel.d
+9a3bcd542318f16d548e4955e4645bc9  gas/testsuite/gas/i386/sib.d
+b66b458374927f587de8154fba02388a  gas/testsuite/gas/i386/sib.s
+a992b3c02920c37bb352e29dd9349769  gas/testsuite/gas/i386/simd-intel.d
+3508f1f7b92e9e7150a9a9993fae168b  gas/testsuite/gas/i386/simd-suffix.d
+030c1b7ab763fc84598d3f520477a33f  gas/testsuite/gas/i386/simd.d
+76e857d973e2cba0a8533b8948f846fb  gas/testsuite/gas/i386/simd.s
+210c38789f8d91dd2bb3e7e7dbed15bd  gas/testsuite/gas/i386/smx.d
+ab961d062b9e42924d1ce445461acdbc  gas/testsuite/gas/i386/smx.s
+c5940fc5532e5f9b71392c5eec523273  gas/testsuite/gas/i386/space1.l
+adb7dc5186c781e6abf5370324bfabe6  gas/testsuite/gas/i386/space1.s
+2acce4070701696412e9818cb64d4a8f  gas/testsuite/gas/i386/sse-check-error.l
+b3107e3ecbe1f95d1979dad18d08e9bd  gas/testsuite/gas/i386/sse-check-error.s
+d5186a3bed5e64b4747f40dfa2482300  gas/testsuite/gas/i386/sse-check-none.d
+002cc480328868c3f768c18a63359ecb  gas/testsuite/gas/i386/sse-check-none.s
+5332e3e8b4b2f145003a96c61d344bea  gas/testsuite/gas/i386/sse-check-warn.d
+b62430479db336d229bd4f5a96753817  gas/testsuite/gas/i386/sse-check-warn.e
+b4427b60d5725e027a564e6286de0161  gas/testsuite/gas/i386/sse-check.d
+d2acfb5cec64db4d416e8802c558aae4  gas/testsuite/gas/i386/sse-check.s
+d4a02ecdf169c29e7b9bc2c179d742ec  gas/testsuite/gas/i386/sse-noavx.d
+a9a2369892572dc748ed0b4fc41a929e  gas/testsuite/gas/i386/sse-noavx.s
+44bd52b79c6f71a7d20853ceb70c6469  gas/testsuite/gas/i386/sse2.d
+526d36a3997a81ba5954ef83a247b2a9  gas/testsuite/gas/i386/sse2.s
+4bce69df6dc7d2ed41562a539bc09b2f  gas/testsuite/gas/i386/sse2avx-opts-intel.d
+692e107b09e32118499d5bf32a9bc193  gas/testsuite/gas/i386/sse2avx-opts.d
+37c21f9ada747da880bfb214da9e6dc6  gas/testsuite/gas/i386/sse2avx.d
+0a94d8e1bb6c4a3c561f519952e1e471  gas/testsuite/gas/i386/sse2avx.s
+e29d70b6aa1e695bd768f8e267849e50  gas/testsuite/gas/i386/sse3.d
+5a1f10a03c575e38b20768f76809e343  gas/testsuite/gas/i386/sse3.s
+a8e1a6346c7e4bc99e311492a78cc5c2  gas/testsuite/gas/i386/sse4_1-intel.d
+33832b995dfbf2925f9d238e5ec3c838  gas/testsuite/gas/i386/sse4_1.d
+b1b71079c7459c816607fb29cbede17a  gas/testsuite/gas/i386/sse4_1.s
+36eb0028140d7c6c47196b2c076723eb  gas/testsuite/gas/i386/sse4_2-intel.d
+93af119559a52ebf85d97cb372ad5eab  gas/testsuite/gas/i386/sse4_2.d
+ec5956da945fcc83b87996dcaabb37cc  gas/testsuite/gas/i386/sse4_2.s
+c10822c38c0829d874e2ab8397c27c4c  gas/testsuite/gas/i386/ssemmx2.d
+e73e0f652b697100e02db9b419b06cd0  gas/testsuite/gas/i386/ssemmx2.s
+b8f4c55f5234aeb290314b2d83edd0a3  gas/testsuite/gas/i386/ssse3.d
+ed0d94e9192c9372bab004595128cbde  gas/testsuite/gas/i386/ssse3.s
+e27241e6070578f0f8cce034161228b0  gas/testsuite/gas/i386/string-bad.l
+e8f03f631e9257f500cf01931f64f707  gas/testsuite/gas/i386/string-bad.s
+e5d93dde85f1490393cb8c822f498d7b  gas/testsuite/gas/i386/string-ok.d
+7841aac9467176a21b691ef1f40adedf  gas/testsuite/gas/i386/string-ok.e
+3d50d86c37dbe01fd17bb4d1218749de  gas/testsuite/gas/i386/string-ok.s
+63e6c02ab5f64af6dd5235e3c374ac08  gas/testsuite/gas/i386/sub.d
+833f164bd60a9f7c4db8ccf2b0bf711b  gas/testsuite/gas/i386/sub.s
+255ecabbcbb774d2b711f9c2a6467c2b  gas/testsuite/gas/i386/suffix.d
+cc898efb930fe1387f95ddbc6c296877  gas/testsuite/gas/i386/suffix.s
+f1360fbb543b1013b19d7262aae59e6f  gas/testsuite/gas/i386/svme.d
+915ae3844040d7de954451e1b08f6a57  gas/testsuite/gas/i386/svme.s
+eee803f12a554f2eb62215d142149b50  gas/testsuite/gas/i386/svme64.d
+16b726a0ab15c9e41d15ea931a8f789e  gas/testsuite/gas/i386/tbm-intel.d
+94e41da3fe5e40f88558b8d684a0c912  gas/testsuite/gas/i386/tbm.d
+e329028a576c858fefba49b0529cc68b  gas/testsuite/gas/i386/tbm.s
+263666276bb58f1bf236a81bdec1b54b  gas/testsuite/gas/i386/tlsd.d
+6276d7a325e095cb7d76ae4bc0664de9  gas/testsuite/gas/i386/tlsd.s
+6b3d04bba181b4c798d810f19600c76c  gas/testsuite/gas/i386/tlsnopic.d
+57fea1ba6cb8614eb9cf26948a633c80  gas/testsuite/gas/i386/tlsnopic.s
+e014b2640b81c8867b9b28162242eccf  gas/testsuite/gas/i386/tlspic.d
+6e8c2126aec7e76808eef1c12cfd676d  gas/testsuite/gas/i386/tlspic.s
+6b5d014a42b77623734a199666d99bb1  gas/testsuite/gas/i386/vmx.d
+f567d2fe791abd9688dd01e4425c5165  gas/testsuite/gas/i386/vmx.s
+5e753c7bc49fa309e62b92585e011e08  gas/testsuite/gas/i386/white.l
+305b7d730a90ea5ac8fb330a3bf13fec  gas/testsuite/gas/i386/white.s
+c3cd7c105b9a66cee5d6bc4e23c37867  gas/testsuite/gas/i386/x86-64-addr32-intel.d
+2cece402fabefaf8c047415710ee45ff  gas/testsuite/gas/i386/x86-64-addr32.d
+4d31d6588877be06398af1634ee64f11  gas/testsuite/gas/i386/x86-64-addr32.s
+896b54b9ab0a9ea541d5fc9b4b82438b  gas/testsuite/gas/i386/x86-64-aes-intel.d
+48a0ebaa8c9aac9ededb58da073622da  gas/testsuite/gas/i386/x86-64-aes.d
+3fb7db5827fe31cc0d16326df78ba65b  gas/testsuite/gas/i386/x86-64-aes.s
+f15f671c7bd802a582f8926994aee1d9  gas/testsuite/gas/i386/x86-64-amdfam10.d
+41c630bb8d9011efd9ed2c5a9865247e  gas/testsuite/gas/i386/x86-64-amdfam10.s
+d511c53578d546bbd365d601bde6f476  gas/testsuite/gas/i386/x86-64-arch-1.d
+5877d9937eb3a902a284a77ee38cbfc1  gas/testsuite/gas/i386/x86-64-arch-1.s
+c18ed88b5b6a6d6ac493aefd79c93d0a  gas/testsuite/gas/i386/x86-64-arch-2-lzcnt.d
+ad3aafd7ed68b4704900f2c062b2e422  gas/testsuite/gas/i386/x86-64-arch-2.d
+9fc9d686e682bea822a026377256278a  gas/testsuite/gas/i386/x86-64-arch-2.s
+3b42f87f3f86bd791bf6f88bab9edb02  gas/testsuite/gas/i386/x86-64-avx-gather-intel.d
+98e74b0a51558787cb0572c38ee07680  gas/testsuite/gas/i386/x86-64-avx-gather.d
+ab783a919c96165d6060c621ea1f369b  gas/testsuite/gas/i386/x86-64-avx-gather.s
+d06958988acae2d053b6192eb478a605  gas/testsuite/gas/i386/x86-64-avx-intel.d
+80954342266c024ec37c5a896698d95d  gas/testsuite/gas/i386/x86-64-avx-scalar-intel.d
+820feabbb8a518d840d2664d1cc119e8  gas/testsuite/gas/i386/x86-64-avx-scalar.d
+172024d18e68679c0b3d1c1e85290d99  gas/testsuite/gas/i386/x86-64-avx-scalar.s
+05e5126338040a91e74a5ce32698e9aa  gas/testsuite/gas/i386/x86-64-avx-swap-intel.d
+376fde462fbfc57f900a79e05d751af4  gas/testsuite/gas/i386/x86-64-avx-swap.d
+791fc7ec51e7b0a8447e4d33ba45fc7f  gas/testsuite/gas/i386/x86-64-avx-swap.s
+9f126e0a184cb48a11fc8afc2c7475d2  gas/testsuite/gas/i386/x86-64-avx.d
+ad1c14483a554397bc4f01ca22f66aa3  gas/testsuite/gas/i386/x86-64-avx.s
+b37b58fe6eef9d307c5306b0f60c8916  gas/testsuite/gas/i386/x86-64-avx2-intel.d
+5313e418221d24e63c58d95f87510bee  gas/testsuite/gas/i386/x86-64-avx2.d
+34febabee466af149b330c64b83bd932  gas/testsuite/gas/i386/x86-64-avx2.s
+a4513f45130ade2b6db37295b2fc5f3e  gas/testsuite/gas/i386/x86-64-avx256int-intel.d
+9ea867de6cd0be10cd7a2cbe621f9e53  gas/testsuite/gas/i386/x86-64-avx256int.d
+683ac44a9918fc498de36dcd30b79395  gas/testsuite/gas/i386/x86-64-avx256int.s
+00374533429542db7db8a7703a57f30a  gas/testsuite/gas/i386/x86-64-bmi-intel.d
+cf123707d0b94f2c2c3d4a752b804ee7  gas/testsuite/gas/i386/x86-64-bmi.d
+a1a05256c61fedaffa9068350c2e649c  gas/testsuite/gas/i386/x86-64-bmi.s
+09eb75575fe2158c1634100977167f15  gas/testsuite/gas/i386/x86-64-bmi2-intel.d
+994b20437eb312a444f54af9e5b2b997  gas/testsuite/gas/i386/x86-64-bmi2.d
+fd4cf2e268fa18ad5c90aadcb0eb95c7  gas/testsuite/gas/i386/x86-64-bmi2.s
+8c319f894375c4bd2f8a12f1924a3001  gas/testsuite/gas/i386/x86-64-branch.d
+c4efdf33b6f56c1fddeba9bde36023a1  gas/testsuite/gas/i386/x86-64-branch.s
+fd4a09f7c9d009aff7f0daf052a5d0d4  gas/testsuite/gas/i386/x86-64-cbw-intel.d
+bab2814cc9341ef0bd1c5836487daafa  gas/testsuite/gas/i386/x86-64-cbw.d
+7cb413e2c9874960869757f756a06f23  gas/testsuite/gas/i386/x86-64-cbw.s
+8a11d39ecd63e330283964f2eafc363a  gas/testsuite/gas/i386/x86-64-clmul-intel.d
+89e93c2801a40b41a71536cb2f480bd1  gas/testsuite/gas/i386/x86-64-clmul.d
+cbcd06603aae8ae9c0cdf2608186957a  gas/testsuite/gas/i386/x86-64-clmul.s
+76361e45fe248ed398757ce9a8c0fa2e  gas/testsuite/gas/i386/x86-64-crc32-intel.d
+fed4ab27f975a72592a414b0047c50be  gas/testsuite/gas/i386/x86-64-crc32.d
+ed77424d334554e3af2ab65b4927029b  gas/testsuite/gas/i386/x86-64-crc32.s
+408a227f72aef795f76d1d6d91d2fb5b  gas/testsuite/gas/i386/x86-64-crx-suffix.d
+c45b4527c3859f718512fd1b7d4d59f2  gas/testsuite/gas/i386/x86-64-crx.d
+c1aefb6d2c81ed0ab02401fe81cef10b  gas/testsuite/gas/i386/x86-64-crx.s
+1032228937b3c89c054aaa3d57409641  gas/testsuite/gas/i386/x86-64-disp-intel.d
+1770f507d85c5d10503e2387e31a86de  gas/testsuite/gas/i386/x86-64-disp.d
+b80fd8ed96178c27c38fd768587671dc  gas/testsuite/gas/i386/x86-64-disp.s
+0320dd76a79dc76c2808ab1b3c969644  gas/testsuite/gas/i386/x86-64-disp32.d
+b8e1d12bcddd07a2b7516cf45a695262  gas/testsuite/gas/i386/x86-64-disp32.s
+7ea4308b329685e530be74addaac7c94  gas/testsuite/gas/i386/x86-64-drx-suffix.d
+601a338970ce4ec3f3105cd754da7d70  gas/testsuite/gas/i386/x86-64-drx.d
+3a07eba6a88df41e1026628ed70fc0f7  gas/testsuite/gas/i386/x86-64-drx.s
+f1f851027fb5e26cd59acde5d67e0be1  gas/testsuite/gas/i386/x86-64-dw2-compress-2.d
+8b4cd73338e8ca5b71d745d09a42ba02  gas/testsuite/gas/i386/x86-64-dw2-compress-2.s
+da3dd52dd882fbeb25b06ac67e7a57c9  gas/testsuite/gas/i386/x86-64-ept-intel.d
+d0bf3bf279651bd316c93ff43c463544  gas/testsuite/gas/i386/x86-64-ept.d
+af5153ea1d101e1a57f06fb8084d0587  gas/testsuite/gas/i386/x86-64-ept.s
+54787e1ae9043a2e9eecf6bb14ba3d23  gas/testsuite/gas/i386/x86-64-f16c-intel.d
+5de961f1b201848fe38c976a0e626450  gas/testsuite/gas/i386/x86-64-f16c.d
+f815bb815cb6b136cd3a3827fa9da925  gas/testsuite/gas/i386/x86-64-f16c.s
+b818e0c05dfcd88bad6f2f6a945fabb7  gas/testsuite/gas/i386/x86-64-fma-intel.d
+3bf22fa11ee637992ee90ffca0330390  gas/testsuite/gas/i386/x86-64-fma-scalar-intel.d
+b62146f5453748b8af305f2d60226bc6  gas/testsuite/gas/i386/x86-64-fma-scalar.d
+5af787ea3662a03228126d86723ad155  gas/testsuite/gas/i386/x86-64-fma-scalar.s
+4b646df079f1155c762a3585445c0370  gas/testsuite/gas/i386/x86-64-fma.d
+4487a492b1ccc7f563936720d6030640  gas/testsuite/gas/i386/x86-64-fma.s
+d225c8cfa138a31d7d590b6e2467f9f4  gas/testsuite/gas/i386/x86-64-fma4.d
+d7a5ee53a09a5ccc309e8e8ab4935d5d  gas/testsuite/gas/i386/x86-64-fma4.s
+bb6f2cb11b9ca6bd7036ce32b1ffd9d1  gas/testsuite/gas/i386/x86-64-fsgs-intel.d
+51e77697056473e2482152a41ef64588  gas/testsuite/gas/i386/x86-64-fsgs.d
+cfdeed03e85153bd0935f7e15031d9b2  gas/testsuite/gas/i386/x86-64-fsgs.s
+40e721419538b1a411f0e4cc4f676926  gas/testsuite/gas/i386/x86-64-fxsave-intel.d
+cd4620df6f7617d5b76aa2787bb83f22  gas/testsuite/gas/i386/x86-64-fxsave.d
+514a99c306d6be131106fffaad17a286  gas/testsuite/gas/i386/x86-64-fxsave.s
+f3980dbba32c8b1971090a7171fc74cf  gas/testsuite/gas/i386/x86-64-gidt.d
+a7520374ab1003bb34da98f1092259f4  gas/testsuite/gas/i386/x86-64-gidt.s
+b991cb403890fff249f739f2c7ffc2b6  gas/testsuite/gas/i386/x86-64-ifunc.d
+3e36e6d86634f92f1f6291467be0f793  gas/testsuite/gas/i386/x86-64-intel64.d
+1a65340d4c294e0fa94570a988000db6  gas/testsuite/gas/i386/x86-64-intel64.s
+b82675e46ad27cc7822c6d6d0a48e496  gas/testsuite/gas/i386/x86-64-inval-avx.l
+d188ad45ca39e2008505d054ac718c20  gas/testsuite/gas/i386/x86-64-inval-avx.s
+a3d6edef82b387f3ca0976ed140df294  gas/testsuite/gas/i386/x86-64-inval-crc32.l
+79aeffa32888a76dda8bec9573539359  gas/testsuite/gas/i386/x86-64-inval-crc32.s
+a2b4be01be260e759dc8d4059dce61cf  gas/testsuite/gas/i386/x86-64-inval-ept.l
+fd4e0c3bbf6678f11083a48810f9fe6a  gas/testsuite/gas/i386/x86-64-inval-ept.s
+8109306ce796d59a855ee2075aff143e  gas/testsuite/gas/i386/x86-64-inval-invpcid.l
+4a1fdd3f2764d0f0eace322c197d5617  gas/testsuite/gas/i386/x86-64-inval-invpcid.s
+f4a31debb295755ed98dcff0d33364e3  gas/testsuite/gas/i386/x86-64-inval-movbe.l
+a310f52211c8a33fa99f7b161f578ab6  gas/testsuite/gas/i386/x86-64-inval-movbe.s
+162538feb667384563ddb3678c76eea7  gas/testsuite/gas/i386/x86-64-inval-seg.l
+aae525360b98db49675b427a0fa29d0f  gas/testsuite/gas/i386/x86-64-inval-seg.s
+6a7952345cc6373e0633ada1849cb761  gas/testsuite/gas/i386/x86-64-inval.l
+df5bd8c1c597a738108b55fca38ba5ce  gas/testsuite/gas/i386/x86-64-inval.s
+f3ef80b96f2260ec2379202332b7ca17  gas/testsuite/gas/i386/x86-64-invpcid-intel.d
+3e53e9dddabf9609e1354c1a4fc6fe13  gas/testsuite/gas/i386/x86-64-invpcid.d
+fa312942aa9bc43bf137f70f5ff62487  gas/testsuite/gas/i386/x86-64-invpcid.s
+207f557c92d6401ba7abc31ef565b3a9  gas/testsuite/gas/i386/x86-64-io-intel.d
+bc0c7c65971adbb31b6578d3735e06f8  gas/testsuite/gas/i386/x86-64-io-suffix.d
+a9ba872efa989a23615d35f5714b4842  gas/testsuite/gas/i386/x86-64-io.d
+b41fdb1ead1f865980afbb60003170e5  gas/testsuite/gas/i386/x86-64-io.s
+a2343b7fb5016a700374004853422f2c  gas/testsuite/gas/i386/x86-64-localpic.d
+72d3840189715b3135f0c0f813173f51  gas/testsuite/gas/i386/x86-64-localpic.s
+bb6a0e9ffcc1b7b608131bb2c950cdbb  gas/testsuite/gas/i386/x86-64-lock-1-intel.d
+f5c2950078d64dec53bdcc74469819ee  gas/testsuite/gas/i386/x86-64-lock-1.d
+f43153fb2619da317aae1ec777a4b319  gas/testsuite/gas/i386/x86-64-lock-1.s
+b8f3cf2cea0a23c51931bb390fefd78a  gas/testsuite/gas/i386/x86-64-lockbad-1.l
+aff509f67e9046da980e945bfbe5497c  gas/testsuite/gas/i386/x86-64-lockbad-1.s
+facc341b4de4956c632ba17a7a3ec338  gas/testsuite/gas/i386/x86-64-long-1-intel.d
+2da4e7265772248a90334877aca7dd12  gas/testsuite/gas/i386/x86-64-long-1.d
+865539e94446ad4efd756579a27fba89  gas/testsuite/gas/i386/x86-64-long-1.s
+f22c6294fbee5a304e5fb648792e73cd  gas/testsuite/gas/i386/x86-64-lwp.d
+65192bf4bfcafd84a2f687d13684141c  gas/testsuite/gas/i386/x86-64-lwp.s
+8c09cea912742744d023e341487caa2c  gas/testsuite/gas/i386/x86-64-mem-intel.d
+26bb425fdbe17360fe2d8ae648dcc112  gas/testsuite/gas/i386/x86-64-mem.d
+b203d4a0600350c32fc158b31b557118  gas/testsuite/gas/i386/x86-64-mem.s
+61e1b53a504761449a119ff583bbd567  gas/testsuite/gas/i386/x86-64-movbe-intel.d
+ee8078df09bdd71739be7304418bb861  gas/testsuite/gas/i386/x86-64-movbe.d
+901ae1e6492d264d4e0f0572ec7385d8  gas/testsuite/gas/i386/x86-64-movbe.s
+fd10486938952d90b3d194faf5d7c9f6  gas/testsuite/gas/i386/x86-64-nops-1-bdver1.d
+4a83154b9dc3a825c1783412e06cbc7b  gas/testsuite/gas/i386/x86-64-nops-1-bdver2.d
+c086871015486490e83c27be83809dfb  gas/testsuite/gas/i386/x86-64-nops-1-core2.d
+07b090b42d825a9705ff6ab76c32f22b  gas/testsuite/gas/i386/x86-64-nops-1-g64.d
+3cc072985433b4982a88772dd6bf139a  gas/testsuite/gas/i386/x86-64-nops-1-k8.d
+af24f4708195e759b01739728c35dc70  gas/testsuite/gas/i386/x86-64-nops-1-nocona.d
+b216e15f6699624ab094d8fb795b3cfb  gas/testsuite/gas/i386/x86-64-nops-1-pentium.d
+8ad0e28a3aebc21f95a3a8b5cad21f2c  gas/testsuite/gas/i386/x86-64-nops-1.d
+ad9e8e0c32e1a6560b062553bac14943  gas/testsuite/gas/i386/x86-64-nops-2.d
+a24b8011ca8a4fc24b90ea2159fbf178  gas/testsuite/gas/i386/x86-64-nops-3.d
+070865f6d6683e1f111d467091298a48  gas/testsuite/gas/i386/x86-64-nops-4-core2.d
+9cef0e02c0747da2fb7231aeb2178020  gas/testsuite/gas/i386/x86-64-nops-4-k8.d
+3c84568dfc6dfa56129674b1242ebcc5  gas/testsuite/gas/i386/x86-64-nops-4.d
+fbb38b9b2bbb0003846c9f8dac33ec41  gas/testsuite/gas/i386/x86-64-nops-5-k8.d
+c31880b461e256399ff73ef4ba47aa5d  gas/testsuite/gas/i386/x86-64-nops-5.d
+c23c056fa6d755b9134cb8da66b25299  gas/testsuite/gas/i386/x86-64-nops.d
+00d30d117160daed04e8aae9b6902e3b  gas/testsuite/gas/i386/x86-64-nops.s
+41de16a767ee52fe8c4b2a6079f3a334  gas/testsuite/gas/i386/x86-64-opcode-inval-intel.d
+683397974ca1a61b3ed636965f138885  gas/testsuite/gas/i386/x86-64-opcode-inval.d
+12f4d57eb3aeae85595763edafcbf4c4  gas/testsuite/gas/i386/x86-64-opcode-inval.s
+0aaf3ce9232975532d630391d0c1ef49  gas/testsuite/gas/i386/x86-64-opcode.d
+73612ec8e104e706a1ec9dcefa329317  gas/testsuite/gas/i386/x86-64-opcode.s
+ece6d2dc04373d49a07edc839f22380b  gas/testsuite/gas/i386/x86-64-opts-intel.d
+3bdcb51cc99a9b8fe0bf3b0f5c4ba0c7  gas/testsuite/gas/i386/x86-64-opts.d
+a9360f523521034d3b2b6eca492e1dff  gas/testsuite/gas/i386/x86-64-opts.s
+fcfa76b77a04ec8990457e98374564ce  gas/testsuite/gas/i386/x86-64-pcrel.d
+0102d6957be1a24ff2c324dbb1b2a850  gas/testsuite/gas/i386/x86-64-pcrel.s
+7fb970b61c4a6637d1160822b9c5a7ba  gas/testsuite/gas/i386/x86-64-rdrnd-intel.d
+5c1b9124898c4b986a1001adfdbc3a51  gas/testsuite/gas/i386/x86-64-rdrnd.d
+cbf9cf7c561c50b0984846d36eae681c  gas/testsuite/gas/i386/x86-64-rdrnd.s
+9b06d374617d60f3a675354cc82f715d  gas/testsuite/gas/i386/x86-64-reg-intel.d
+03b2d7204d96cb46b316c9311b280f4a  gas/testsuite/gas/i386/x86-64-reg.d
+e7a1d00ff46cd6b3c7af47e81b2c71e8  gas/testsuite/gas/i386/x86-64-reg.s
+69ea2f386da120feddc84322100d86e3  gas/testsuite/gas/i386/x86-64-relax-1.d
+08a56d5d3e02804c0a0e6b9654805d64  gas/testsuite/gas/i386/x86-64-relax-1.s
+294a7d75648643e6d32e8e3fc60c900b  gas/testsuite/gas/i386/x86-64-rep-suffix.d
+3ad8098f3d537ceba97b5b8b22a406e3  gas/testsuite/gas/i386/x86-64-rep-suffix.s
+ce4edb0506bfb1937b3a10a7e3e818d6  gas/testsuite/gas/i386/x86-64-rep.d
+0230ea92a85352895e515489f8d1b6e2  gas/testsuite/gas/i386/x86-64-rep.s
+282412e30927c979e7ec80f2ff628621  gas/testsuite/gas/i386/x86-64-rip-intel.d
+fa314cbc7e9de53772c530b30157f65e  gas/testsuite/gas/i386/x86-64-rip.d
+722677b05d3cd317657a418b4f5ff9ed  gas/testsuite/gas/i386/x86-64-rip.s
+8dc4e34c9b1fe8d7582db1437973c356  gas/testsuite/gas/i386/x86-64-segment.l
+93582bffb446e522b0e4c96c89d2d901  gas/testsuite/gas/i386/x86-64-segment.s
+28bbb19963a9f7f45e93c2c272b50fbe  gas/testsuite/gas/i386/x86-64-sib-intel.d
+fac2672f643fdcf2deee16c52eaebaab  gas/testsuite/gas/i386/x86-64-sib.d
+9e14a1b044d5ab4cadce1af8beaff84e  gas/testsuite/gas/i386/x86-64-sib.s
+2afd9a88eca247565be74d977ac1e69d  gas/testsuite/gas/i386/x86-64-simd-intel.d
+b79357dd1880f27de5a407c43d0ac66d  gas/testsuite/gas/i386/x86-64-simd-suffix.d
+27b8c066889fd3aab885c6a79ac40ef0  gas/testsuite/gas/i386/x86-64-simd.d
+932fb4785c354cd5757f408f7488d85a  gas/testsuite/gas/i386/x86-64-simd.s
+2acce4070701696412e9818cb64d4a8f  gas/testsuite/gas/i386/x86-64-sse-check-error.l
+b3107e3ecbe1f95d1979dad18d08e9bd  gas/testsuite/gas/i386/x86-64-sse-check-error.s
+661674d3bc8da3d09f060de41ffea949  gas/testsuite/gas/i386/x86-64-sse-check-none.d
+d5bc96d7fccc04de9b014d9e958edf15  gas/testsuite/gas/i386/x86-64-sse-check-warn.d
+8ec24ada69da5dae7ef3de0d416a3343  gas/testsuite/gas/i386/x86-64-sse-check.d
+71c5eff10e0c5d7af2fc929d131dfd69  gas/testsuite/gas/i386/x86-64-sse-noavx.d
+6e95bf187d1d5a90824236bec3f40f8e  gas/testsuite/gas/i386/x86-64-sse-noavx.s
+07b14f230e4b909755529333b0e9e959  gas/testsuite/gas/i386/x86-64-sse2avx-opts-intel.d
+130bb3f6f6bf30a8f18399e97d0721b6  gas/testsuite/gas/i386/x86-64-sse2avx-opts.d
+65178da268630d21977edc9ad1a27c35  gas/testsuite/gas/i386/x86-64-sse2avx.d
+e737a9cde96e0acc0b05613d5623ff76  gas/testsuite/gas/i386/x86-64-sse2avx.s
+a604d3babf870782b67de50cbd33af9a  gas/testsuite/gas/i386/x86-64-sse3.d
+5d99b531c8604a1e6bc9dbd0d7badd2c  gas/testsuite/gas/i386/x86-64-sse3.s
+06e6a782cf8587c1c694b5d45a4185bd  gas/testsuite/gas/i386/x86-64-sse4_1-intel.d
+82ee7d8d95134bcf793b0ef7dae56246  gas/testsuite/gas/i386/x86-64-sse4_1.d
+2d21a1ac44c06d3cbb312bd577128cd2  gas/testsuite/gas/i386/x86-64-sse4_1.s
+2cc52dd756b84bca3107ad34947a1828  gas/testsuite/gas/i386/x86-64-sse4_2-intel.d
+2009480df2cc1bd49fa9fff12d5a0ab6  gas/testsuite/gas/i386/x86-64-sse4_2.d
+1c30ca3e112d8d50e21868014efe7506  gas/testsuite/gas/i386/x86-64-sse4_2.s
+f7de2a101d07bd6d5badf4f04a54c089  gas/testsuite/gas/i386/x86-64-ssse3.d
+e626aa86fe2d9cd3c1458fcc2326bcb2  gas/testsuite/gas/i386/x86-64-ssse3.s
+bd47dfa2daaf66b78a3540dc95438c2e  gas/testsuite/gas/i386/x86-64-stack-intel.d
+45fe23990bf360d603c91628892aae33  gas/testsuite/gas/i386/x86-64-stack-suffix.d
+9a320248e1c4cf156ebd2eeb4c0ff190  gas/testsuite/gas/i386/x86-64-stack.d
+c1424bba614929e99fa1271fa973035f  gas/testsuite/gas/i386/x86-64-stack.s
+b35fdffa4ab966fce27f87ecee3b1c00  gas/testsuite/gas/i386/x86-64-tbm-intel.d
+908bdffcf04087bb53d54486dbb8b742  gas/testsuite/gas/i386/x86-64-tbm.d
+e3f8369e2b62c2e731f3dd732dbf2980  gas/testsuite/gas/i386/x86-64-tbm.s
+3d44f651eec84e5de4399aeda9d26bf8  gas/testsuite/gas/i386/x86-64-unwind.d
+8d64d6d63476e651d51e8675349b18aa  gas/testsuite/gas/i386/x86-64-unwind.s
+2c6b752faa6d31fd1e4f1e37d70413d1  gas/testsuite/gas/i386/x86-64-vmx.d
+993cb43ba3bb5e400fb34ce7bdec1d05  gas/testsuite/gas/i386/x86-64-vmx.s
+cfe756b9e9133a917d6cde5925f527be  gas/testsuite/gas/i386/x86-64-w64-pcrel.d
+42b0672374dd1e60e36754c4e68fdfb7  gas/testsuite/gas/i386/x86-64-xop.d
+21ccad8f83a34690bde5fb58bdeaa8a3  gas/testsuite/gas/i386/x86-64-xop.s
+6864f95fc602a7e62a8547affd4aa13c  gas/testsuite/gas/i386/x86-64-xsave-intel.d
+96aa878f6092e2a2f81cd569d19ac20d  gas/testsuite/gas/i386/x86-64-xsave.d
+38ccf97adabd0fab3e1b0b9c0151f80c  gas/testsuite/gas/i386/x86-64-xsave.s
+dcb5db4be19f6dac9e7592a8ca287271  gas/testsuite/gas/i386/x86_64.d
+e5f0729957b1ccfe5d1e53627f1ec8c4  gas/testsuite/gas/i386/x86_64.s
+ae4b2b29255e275badc694c9e2a5277a  gas/testsuite/gas/i386/xop.d
+699962e500ee74d43bb5c8a3c5db23b9  gas/testsuite/gas/i386/xop.s
+5fcc3e737c2469401a12f25e608f6146  gas/testsuite/gas/i386/xsave-intel.d
+fcca61b167124ff4360bed7b09de35d2  gas/testsuite/gas/i386/xsave.d
+4c4aebcb24bf60e92bdc02ebee85c740  gas/testsuite/gas/i386/xsave.s
+f5ad41f835f6e2d3ba8795a4f7dec86f  gas/testsuite/gas/i860/bitwise.d
+2b774a4f549067873f0af07fb9de56a3  gas/testsuite/gas/i860/bitwise.s
+9828012860f1606656f7f365218dc2cf  gas/testsuite/gas/i860/branch.d
+f16bd2426aa90da0f32896bd84435eb5  gas/testsuite/gas/i860/branch.s
+7000f335c5d097a92ed25701d3fc6a18  gas/testsuite/gas/i860/bte.d
+117061acc7f7acf1f514a9cd358c9db8  gas/testsuite/gas/i860/bte.s
+0903b2b332fbbbe09878c4169fb4ab10  gas/testsuite/gas/i860/dir-align01.d
+6ae106da9f3a85291506ce9fe6e4e3c6  gas/testsuite/gas/i860/dir-align01.s
+f26e1261c99d19590548ae75623cb7f6  gas/testsuite/gas/i860/dir-intel01.d
+6cc636d75ee8165da9ed09918e3199bf  gas/testsuite/gas/i860/dir-intel01.s
+79272e9295d72e86387d67378781c814  gas/testsuite/gas/i860/dir-intel02.d
+cee730e93b3c40620622b831abb15929  gas/testsuite/gas/i860/dir-intel02.s
+df4b2e4160f4fedf91c0e8fde37b0b21  gas/testsuite/gas/i860/dir-intel03-err.l
+5c611081998a4ada6f2e9b03043f2716  gas/testsuite/gas/i860/dir-intel03-err.s
+c6c428e83407fbf5793d5af32241f564  gas/testsuite/gas/i860/dual01.d
+37fd18f754ecc8344934c71f1392633e  gas/testsuite/gas/i860/dual01.s
+5596264e96a68a24c9be980a60a3a117  gas/testsuite/gas/i860/dual02-err.l
+69f9c17232090c9ff45f1cd69c9d2001  gas/testsuite/gas/i860/dual02-err.s
+19afb4e2d3c77d070c87e221647ac664  gas/testsuite/gas/i860/dual03.d
+fb14098c629da7cb9313e06eed37d807  gas/testsuite/gas/i860/dual03.s
+cadcac169600d1350fcdfcb64b4ad27a  gas/testsuite/gas/i860/fldst01.d
+97321626bfe0c85cdcf948a32397ebb7  gas/testsuite/gas/i860/fldst01.s
+686a13e797f9b6a7fe7ca9f36fd9fc3b  gas/testsuite/gas/i860/fldst02.d
+79878081a47eef91e7f41ae24f200330  gas/testsuite/gas/i860/fldst02.s
+436e4b4af356ae63d02cd500c1f745bb  gas/testsuite/gas/i860/fldst03.d
+02832b2cbfa7efa88955cdf1542081c3  gas/testsuite/gas/i860/fldst03.s
+45eca40b3d986f598c4ebf568268fb66  gas/testsuite/gas/i860/fldst04.d
+fcff1e7676d8160f47d068e2db68819e  gas/testsuite/gas/i860/fldst04.s
+8b2b509a36427ef1cbf6e25e76ea6b6f  gas/testsuite/gas/i860/fldst05.d
+dd6941ef803c746c2c77da5da56b34f8  gas/testsuite/gas/i860/fldst05.s
+2caff1d8ced86429ab5a617b991a3a0f  gas/testsuite/gas/i860/fldst06.d
+54597c78b75cee621a2e62fd38a99dff  gas/testsuite/gas/i860/fldst06.s
+cf7920c9b2405c650856f4aa0374cf25  gas/testsuite/gas/i860/fldst07.d
+eda94c6341d1d271fd45fc529b88d442  gas/testsuite/gas/i860/fldst07.s
+d4ba4327e97b9e951f005588457caaa5  gas/testsuite/gas/i860/fldst08.d
+267d98a7ae79aa3538d5b37255ab9733  gas/testsuite/gas/i860/fldst08.s
+879345c052279235a62534050fe6a506  gas/testsuite/gas/i860/float01.d
+6f259108ec9a42a90991b6de65b6f308  gas/testsuite/gas/i860/float01.s
+bce16a53ba73f7e46f1800374d1876db  gas/testsuite/gas/i860/float02.d
+da9e09037beef0d229289b7719f1d730  gas/testsuite/gas/i860/float02.s
+c6c100da2e2965efaefc00a111af4185  gas/testsuite/gas/i860/float03.d
+07480a0c8c5c69b52a630f94bfbaf582  gas/testsuite/gas/i860/float03.s
+96c3c2fc58836a46fd9a35577da09994  gas/testsuite/gas/i860/float04.d
+4b14215cdbc0a5bfc8c42ab39397164b  gas/testsuite/gas/i860/float04.s
+8776893d98fcb46514ef9f34fa7f0e9c  gas/testsuite/gas/i860/form.d
+25dc56533faa254aa5b6b15fd9469565  gas/testsuite/gas/i860/form.s
+8e37d5473b134e283b76beeb06d48e2f  gas/testsuite/gas/i860/i860.exp
+8369d3b3ff0084e16260cbfcebe66ebe  gas/testsuite/gas/i860/iarith.d
+8309075608d50e06ca4a159b068211f2  gas/testsuite/gas/i860/iarith.s
+ef617fda8f52baa1f59cc4b57469dc8c  gas/testsuite/gas/i860/ldst01.d
+2f8d0b96710ed27d3ebccc9a7c32de92  gas/testsuite/gas/i860/ldst01.s
+9f84376dfdea002935eb41e0ab41e6b3  gas/testsuite/gas/i860/ldst02.d
+3bbfa7720f4dbd2b5d08f284efc9d841  gas/testsuite/gas/i860/ldst02.s
+24948145c80649312afc2f09cba29a6e  gas/testsuite/gas/i860/ldst03.d
+f2d621ee2a971085de0750d7aec9ec94  gas/testsuite/gas/i860/ldst03.s
+27be67914f6cb6832442727bbd91a840  gas/testsuite/gas/i860/ldst04.d
+f24b9098dbb2311dad448ba672986a85  gas/testsuite/gas/i860/ldst04.s
+9abbb1f8a49b98aba5cfa073d915217e  gas/testsuite/gas/i860/ldst05.d
+02bdbd530696cb9509284c97ba6eb99a  gas/testsuite/gas/i860/ldst05.s
+e125965d3c2c889c9753706b7b311b64  gas/testsuite/gas/i860/ldst06.d
+a2f062ff5a39ec0fafeaeffe8f492779  gas/testsuite/gas/i860/ldst06.s
+bacafd03fff48001eeaadf13b60d375f  gas/testsuite/gas/i860/pfam.d
+5440ae594422d037458d87a70fb7708f  gas/testsuite/gas/i860/pfam.s
+389acd95b74da50abf697d8448f75a90  gas/testsuite/gas/i860/pfmam.d
+3f85e5e49191d2039cd11675284eca8c  gas/testsuite/gas/i860/pfmam.s
+8a1d5790ec258d8d574e7c0b948f73d9  gas/testsuite/gas/i860/pfmsm.d
+5ba78d272a0c2d22de071e03aa1b1aaf  gas/testsuite/gas/i860/pfmsm.s
+39851734f26e9eeb49b7548995830e72  gas/testsuite/gas/i860/pfsm.d
+2b691612d72dc03e06b426d719622dc8  gas/testsuite/gas/i860/pfsm.s
+a81a57c63b7130129d02ba0692659392  gas/testsuite/gas/i860/pseudo-ops01.d
+d2572c9521bb99521ffb95f2caecc51f  gas/testsuite/gas/i860/pseudo-ops01.s
+212987111270138069139a2e478d5bc4  gas/testsuite/gas/i860/README.i860
+8f354a029a247621b668ba706c48949f  gas/testsuite/gas/i860/regress01.d
+9653c34da92fa639fc96e13206273aaa  gas/testsuite/gas/i860/regress01.s
+7097eb47e3d70de1cf45f2eb94283dad  gas/testsuite/gas/i860/shift.d
+24e2e5de98632c8c8b900d1592709397  gas/testsuite/gas/i860/shift.s
+d8ac2dcdfd994b9933eae7794a6a1562  gas/testsuite/gas/i860/simd.d
+369369bca7c9a1f488807234c1271ae7  gas/testsuite/gas/i860/simd.s
+94bfbda029352e2eb43710295a07c02d  gas/testsuite/gas/i860/system.d
+b0e13677168237ff8300437ed101e4b4  gas/testsuite/gas/i860/system.s
+8867d533598bda8b5fecaa99354d1d98  gas/testsuite/gas/i860/xp.d
+ade8add590ef6c12e6b3ad21e52cc7c0  gas/testsuite/gas/i860/xp.s
+408b32d880d4fbd661ec530b1bbcde97  gas/testsuite/gas/ia64/alias-ilp32.d
+aa4bb141211ac2dab2144ab4cc61cf95  gas/testsuite/gas/ia64/alias.d
+03b362d40d896c73b7ca83e014e65f54  gas/testsuite/gas/ia64/alias.s
+5fed37c2d4517d6ccdb0b8214e9fbe89  gas/testsuite/gas/ia64/align.d
+2b6aaf64f25203ee6d42b883877b3d29  gas/testsuite/gas/ia64/align.s
+56482f48ecf5d0871055f1032761c296  gas/testsuite/gas/ia64/alloc.l
+465b7817b7039151414335b624f87b50  gas/testsuite/gas/ia64/alloc.s
+e455b8bd8879fe91fbb7e9a9054396c4  gas/testsuite/gas/ia64/bundling.d
+6e8b4d46ad5bc8cf77ae32da0543a189  gas/testsuite/gas/ia64/bundling.s
+5db8eca540fe74cf7a3c2987a4eb9854  gas/testsuite/gas/ia64/dependency-1.d
+1469dfc61e75bd0ff0848df2a3d0491f  gas/testsuite/gas/ia64/dependency-1.s
+5eb8214dbc6a81515361f587403fb112  gas/testsuite/gas/ia64/dv-branch.d
+ec058dd65d1af91fe84f41b725857462  gas/testsuite/gas/ia64/dv-branch.s
+956561267da937b1be0fada7c6ea25c7  gas/testsuite/gas/ia64/dv-entry-err.l
+e635d21d0f94975c7df306096506d41b  gas/testsuite/gas/ia64/dv-entry-err.s
+66c561db454fffc01897c1dc5d51cd8a  gas/testsuite/gas/ia64/dv-imply.d
+a4c835f4336ab0d7bea5c1251fe02f94  gas/testsuite/gas/ia64/dv-imply.s
+719d55382abbfde4dad96f2ab530444a  gas/testsuite/gas/ia64/dv-mutex-err.l
+8af39c8ed0db1166ee73bcc08b4f2c16  gas/testsuite/gas/ia64/dv-mutex-err.s
+aa623148bfa19343f426f1d7594acc0b  gas/testsuite/gas/ia64/dv-mutex.d
+ae4b264474b1d1488371dfba05a807ff  gas/testsuite/gas/ia64/dv-mutex.s
+502fa49f2e1cb1d1c02b4d5a4d9359a4  gas/testsuite/gas/ia64/dv-raw-err.l
+5b0b0943c41ffdf3d4352f4f2e0a1810  gas/testsuite/gas/ia64/dv-raw-err.s
+98c0c365a1901745072e5d9c957e3793  gas/testsuite/gas/ia64/dv-safe.d
+c06a2d45e380eacc79be2946865839ea  gas/testsuite/gas/ia64/dv-safe.s
+cf844a278adf50073cdefda6d28b307d  gas/testsuite/gas/ia64/dv-srlz.d
+fcb5ba635bb6c1bf11217572aed8c194  gas/testsuite/gas/ia64/dv-srlz.s
+47a1c9e8c8d646cb1276022156938aef  gas/testsuite/gas/ia64/dv-war-err.l
+96d62a881175a15f9d0eb1464592de82  gas/testsuite/gas/ia64/dv-war-err.s
+219dc898bb30c667cc0adfdf37d0434e  gas/testsuite/gas/ia64/dv-waw-err.l
+eca51ba28eea7ec14dcf4b65e57b93e9  gas/testsuite/gas/ia64/dv-waw-err.s
+4702e0589d4ecfea81d623654726c865  gas/testsuite/gas/ia64/fixup-dump.pl
+043c181b05ead62073d60fe4f7b5bdef  gas/testsuite/gas/ia64/forward.d
+c8d38e32fb63d2231618bb65b2d95a44  gas/testsuite/gas/ia64/forward.s
+a50ca06a252db2759c2aa74a2cf8d1dc  gas/testsuite/gas/ia64/global.d
+3abe04e058c73f3963c6957c842aa0c7  gas/testsuite/gas/ia64/global.s
+e081822a4d9a8a6577be11efaf490dd7  gas/testsuite/gas/ia64/group-1.d
+ecd81ce660f62c1ab3b2b1b89f5e37e6  gas/testsuite/gas/ia64/group-1.s
+4fa99ed51f2e6df4be16ab164d3643c5  gas/testsuite/gas/ia64/group-2.d
+23fd69f5c2f9e4329d761e82165d2b1c  gas/testsuite/gas/ia64/group-2.s
+ae4cfc6a16703b6c2586c99215ad32e2  gas/testsuite/gas/ia64/hint.b-err.l
+bc38d9bf826a3c9d36e322b0fdc4b1ce  gas/testsuite/gas/ia64/hint.b-err.s
+53d2625d7ca78e2bf4b13272b30ae1e2  gas/testsuite/gas/ia64/hint.b-warn.l
+bc38d9bf826a3c9d36e322b0fdc4b1ce  gas/testsuite/gas/ia64/hint.b-warn.s
+9a5848ee1ab36f03c1079eb789685e4b  gas/testsuite/gas/ia64/ia64.exp
+f2da605500359eb8d432dc726bffd0b3  gas/testsuite/gas/ia64/index.l
+0939d8b0fe59c828407681a0a32a2274  gas/testsuite/gas/ia64/index.s
+daae8c66fb42361d7a68bcacc7b61034  gas/testsuite/gas/ia64/invalid-ar.l
+60080346d8ab041cc302938e65f29808  gas/testsuite/gas/ia64/invalid-ar.s
+f4d82e4423f8b9465e9276e22157086a  gas/testsuite/gas/ia64/label.l
+f87ee9f9d1ba626560bf804ba13165f1  gas/testsuite/gas/ia64/label.s
+ae7aa2fe2ba69fd12fb73ed958f135d1  gas/testsuite/gas/ia64/last.l
+88f1e3a9ef6fa419edb1f9bcae711a4b  gas/testsuite/gas/ia64/last.s
+d45e2dd3f78812fc115b032e13df93bf  gas/testsuite/gas/ia64/ldxmov-1.d
+9d82fbaec119beb2b468c79b0c133608  gas/testsuite/gas/ia64/ldxmov-1.s
+c7d19ca874ed086c03d6b51fcf4e1840  gas/testsuite/gas/ia64/ldxmov-2.l
+277c0508ade20f90c962e8cf59208830  gas/testsuite/gas/ia64/ldxmov-2.s
+393a02369db1631378b57d74a1f99193  gas/testsuite/gas/ia64/ltoff22x-1.d
+aca1c86bea7050f880ec98f303f05f10  gas/testsuite/gas/ia64/ltoff22x-1.s
+3e6d619d427dfee32e76df8e213271b6  gas/testsuite/gas/ia64/ltoff22x-2.d
+64e1de175dcb23ad6dc5580e687f7b7d  gas/testsuite/gas/ia64/ltoff22x-2.s
+47c64f668a7d8b584e9d2179cf9956da  gas/testsuite/gas/ia64/ltoff22x-3.d
+917b987097cafc1ef21e048eb58822c9  gas/testsuite/gas/ia64/ltoff22x-3.s
+1a6d95bfe578be2a2f8b98f63ae32754  gas/testsuite/gas/ia64/ltoff22x-4.d
+fe9dcfc6429f362540004b9bd1144253  gas/testsuite/gas/ia64/ltoff22x-4.s
+77d6d217c1d60250f98082dce2352b31  gas/testsuite/gas/ia64/ltoff22x-5.d
+b8638cad333d86872c59a42fb825ceb0  gas/testsuite/gas/ia64/ltoff22x-5.s
+77e40f73ba5abae861ad0694f63c1590  gas/testsuite/gas/ia64/mov-ar.d
+26a8d20f240ff4a568945caab6f453f5  gas/testsuite/gas/ia64/mov-ar.s
+42f96f97f58a5c2aabc914e6b56e95de  gas/testsuite/gas/ia64/no-fit.l
+147999e5afd9e1f4fcd30dbcad182685  gas/testsuite/gas/ia64/no-fit.s
+ede15f90446f84059e1a9ec36b9b66f6  gas/testsuite/gas/ia64/nop_x.d
+3ac96c6eb59cc7e0ba11f3d1ab36d4a5  gas/testsuite/gas/ia64/nop_x.s
+47072d4d678212573562867320a4b168  gas/testsuite/gas/ia64/nostkreg.d
+8936ee3120b0746e5f3d8f7ac460e9db  gas/testsuite/gas/ia64/nostkreg.s
+5cf1f05daff9171dcf5275963c6acde0  gas/testsuite/gas/ia64/opc-a-err.l
+c10f248c93a66cf00810e181bcf47859  gas/testsuite/gas/ia64/opc-a-err.s
+a8b761b96823d4971f5532faf0b6e808  gas/testsuite/gas/ia64/opc-a.d
+7a4b4b8b83d010b15200291b7428d900  gas/testsuite/gas/ia64/opc-a.pl
+25a4e13b65c5c563854c68b27850ec27  gas/testsuite/gas/ia64/opc-a.s
+26a9c024547dfe3267afa0149e4683c5  gas/testsuite/gas/ia64/opc-b.d
+a6e1c6d4094099abc90c4eddf392cf90  gas/testsuite/gas/ia64/opc-b.pl
+28d8e6ea8a3ec4beed93c2365ca7497d  gas/testsuite/gas/ia64/opc-b.s
+c26da9c6f5e6a73d1b146d094ebbb496  gas/testsuite/gas/ia64/opc-f.d
+e44f587f12c4e939d44570b92b5ca82b  gas/testsuite/gas/ia64/opc-f.pl
+5e132c425eaf71cbab3e7401b4750bf2  gas/testsuite/gas/ia64/opc-f.s
+b9edfed480c2b5f01e2e5ae0cb76be81  gas/testsuite/gas/ia64/opc-i.d
+6df89ea375d396efe8cd150381479c12  gas/testsuite/gas/ia64/opc-i.pl
+15969b5f65383a6c5490609cf4882545  gas/testsuite/gas/ia64/opc-i.s
+0a8ec8b04449de207537d0c935e610e7  gas/testsuite/gas/ia64/opc-m.d
+85878e0564576b3b7bafb3eb82660f7d  gas/testsuite/gas/ia64/opc-m.pl
+8ee1765ede253208db01ce9942f5e248  gas/testsuite/gas/ia64/opc-m.s
+7e3531997644b2ced7b435b593274057  gas/testsuite/gas/ia64/opc-x.d
+254e69bf1897bb4265e21eb488dde3c4  gas/testsuite/gas/ia64/opc-x.s
+e493b86e79cd1b7840768ee7dd17d09b  gas/testsuite/gas/ia64/operand-or.d
+c80613e26ec1eb58b400ecff241c7888  gas/testsuite/gas/ia64/operand-or.s
+b549252aed96485cbe78566d3933da97  gas/testsuite/gas/ia64/operands.l
+324983368e3aa0fb1f6c43d2889be129  gas/testsuite/gas/ia64/operands.s
+2e9a0176afdb932248384cfd21bf0e02  gas/testsuite/gas/ia64/order.d
+8a919a8db6e6db348bb9ee3988ad4793  gas/testsuite/gas/ia64/order.s
+318b8c28644b4dc8b5a6a3b5ad8c2235  gas/testsuite/gas/ia64/pcrel.d
+2802f15229a6741bef0e11984a2ad74e  gas/testsuite/gas/ia64/pcrel.s
+8234b13102e2b89a9b8e480032ba3644  gas/testsuite/gas/ia64/pound.l
+eb163238d1c14067c10cfbdad2862823  gas/testsuite/gas/ia64/pound.s
+31540ad89afaad27718f40ab9f0ec3fd  gas/testsuite/gas/ia64/pr13167.d
+8e0b9e244acda82824979cddb190549a  gas/testsuite/gas/ia64/pr13167.s
+2d77a6a88ef14d7c6a371b09dea5e828  gas/testsuite/gas/ia64/pred-rel.s
+9d7a9d7f3a6b43c525af6c8c836cb80e  gas/testsuite/gas/ia64/proc.l
+68da861b5a85e3dda838bfae4f4268f1  gas/testsuite/gas/ia64/proc.s
+c601f808ca38269043ad1225cb6627ee  gas/testsuite/gas/ia64/pseudo.d
+8faa98b105a425b150f9a6d3c14b46b7  gas/testsuite/gas/ia64/pseudo.s
+2a9394f919186edb77a43fc7accd0490  gas/testsuite/gas/ia64/radix.l
+5e58119bdddd1664dd77c7b8b1f5ca9c  gas/testsuite/gas/ia64/radix.s
+2d512ebbb3a824bfd3015573ceaf138a  gas/testsuite/gas/ia64/real.d
+11b022573ee9135d09a4a6415e44bc9a  gas/testsuite/gas/ia64/real.s
+a59ab6cf70a3161c725bfaefa0746827  gas/testsuite/gas/ia64/reg-err.l
+3e5336a037f53d43a195dd49a885ec59  gas/testsuite/gas/ia64/reg-err.s
+2c784ab89aa2aecdd47ca522eaeaaf1c  gas/testsuite/gas/ia64/regs.d
+5746998fdbaa367bda22d9fa0a7a0d5b  gas/testsuite/gas/ia64/regs.pl
+f5f8e77b8ef2296ae6a175af689b4291  gas/testsuite/gas/ia64/regs.s
+def1a1e264aabe3865f5b91719ac6bb0  gas/testsuite/gas/ia64/regval.l
+3aec93f48ade47b1ba22328aa49a521d  gas/testsuite/gas/ia64/regval.s
+e1fa07919615f734c4e8ffadc711b9df  gas/testsuite/gas/ia64/reloc-bad.l
+ebed991bbb8cac30da10846599d0abf8  gas/testsuite/gas/ia64/reloc-bad.s
+2936fd2043217d53a51e8f059e9a217b  gas/testsuite/gas/ia64/reloc-uw-ilp32.d
+a701045f5a463b1a4e625df26718524b  gas/testsuite/gas/ia64/reloc-uw.d
+f6a87b3768a5c169d53a30d9b37ef686  gas/testsuite/gas/ia64/reloc-uw.s
+e4ee7f44af64e924aa5272bea9c4fed1  gas/testsuite/gas/ia64/reloc.d
+a0141232635833d498f3c634ce9e040a  gas/testsuite/gas/ia64/reloc.s
+f624e9e16c9ea00f80d7f7f8ca3806f3  gas/testsuite/gas/ia64/rotX.l
+84d7e53abab60346dc101441409d2dc3  gas/testsuite/gas/ia64/rotX.s
+05b7e3e645abcd447134fc1679135743  gas/testsuite/gas/ia64/secname-ilp32.d
+d5f6f52389d039016fb3c421f106f981  gas/testsuite/gas/ia64/secname.d
+67e890795ba55b2d84251e903e037f86  gas/testsuite/gas/ia64/secname.s
+d273dc8aa1c413904f1e9bb44b22dcb1  gas/testsuite/gas/ia64/slot2.l
+8515f2db3d0906171c4864bfb4529d63  gas/testsuite/gas/ia64/slot2.s
+d5c8aaa0ac46df82f4b885dcc7db9b77  gas/testsuite/gas/ia64/slotcount.d
+bfc2afe48b96d5505933256ac502852f  gas/testsuite/gas/ia64/slotcount.s
+89ba4b7622e2c68e6d20a22f99cf8b8c  gas/testsuite/gas/ia64/strange.d
+a5d6bfa2c1f6ab988b6d48dc46777280  gas/testsuite/gas/ia64/strange.s
+c3e6542e6b17a77846eacecd2c05178b  gas/testsuite/gas/ia64/tls.d
+97ecd7035c79cd4143cc804ffbab35ea  gas/testsuite/gas/ia64/tls.s
+2fbb049aecd48365579d9cb782030908  gas/testsuite/gas/ia64/unwind-bad.l
+72b9d9dd8acfcca2b9fa80d9c3c0e3eb  gas/testsuite/gas/ia64/unwind-bad.s
+3f56f1eee93d0c7aa2ba06039255ff07  gas/testsuite/gas/ia64/unwind-err.l
+099da3b00ff767938efd408bd9e4494f  gas/testsuite/gas/ia64/unwind-err.s
+0606c4b397212803e71345845703cb26  gas/testsuite/gas/ia64/unwind-ilp32.d
+b473c7b739dba295e4ac12c1e812dd8f  gas/testsuite/gas/ia64/unwind-ok.d
+b30847e1866f172dd9b6b9123228a836  gas/testsuite/gas/ia64/unwind-ok.s
+cdde4f4669d489077d31d8f53c0d743e  gas/testsuite/gas/ia64/unwind.d
+54b7e8d3c7762c7c3c95272c2d0c0b8a  gas/testsuite/gas/ia64/unwind.s
+d6b0de0e58c262ebb157991b42cef765  gas/testsuite/gas/ia64/xdata-ilp32.d
+2ee10569dbfbd5553f167899e75e454a  gas/testsuite/gas/ia64/xdata.d
+0efee14c792c025001d68ffe3c09f7a9  gas/testsuite/gas/ia64/xdata.s
+3cd9cc915e08c2ea2792b9fc2ca95ab5  gas/testsuite/gas/ieee-fp/x930509a.exp
+b0509b0492fd2fc8448b011ae03a41b8  gas/testsuite/gas/ieee-fp/x930509a.s
+a93dccf731a42c0d3faf11b8d3b96979  gas/testsuite/gas/iq2000/allinsn.d
+5fa4d4e98afb53abc8b3e453cf923c5c  gas/testsuite/gas/iq2000/allinsn.exp
+206095bc34484f0f35c4d8624850c5a8  gas/testsuite/gas/iq2000/allinsn.s
+d3cfbfc4a609d152b16632b7a0731679  gas/testsuite/gas/iq2000/hazard0.s
+4090ba0aef5f9561bae85399b661dd03  gas/testsuite/gas/iq2000/hazard1.s
+8096370e741ff2148ba3dbc04d7f6f65  gas/testsuite/gas/iq2000/hazard2.s
+d42820e6042ae5abe8607d7f1123267c  gas/testsuite/gas/iq2000/hazard3.s
+5453db52ad62f96abe48e513f0a1de98  gas/testsuite/gas/iq2000/hazard4.s
+e1977723de2aa2900402d9d49f0fc3a8  gas/testsuite/gas/iq2000/hazard5.s
+a3ef8bdc261d09c6e6e47f3bd7635234  gas/testsuite/gas/iq2000/load-hazards.exp
+d2ca68442ebbf5c76394139ece449352  gas/testsuite/gas/iq2000/nohazard.s
+a0dd34dfd76fa982804ba071ac664ca1  gas/testsuite/gas/iq2000/noyield.s
+09bcfc91a01a1c522b87fa6bdfac41cb  gas/testsuite/gas/iq2000/odd-ldw.exp
+ab2ec0875f6420b97c4a235c0f277a65  gas/testsuite/gas/iq2000/odd-sdw.exp
+e3867e77791054668d1326bec538f841  gas/testsuite/gas/iq2000/oddldw.s
+da5573533b31cbcbe3f4ac6bcdc6ef1b  gas/testsuite/gas/iq2000/oddsdw.s
+8de426a4930bc007a732d0bd48044691  gas/testsuite/gas/iq2000/yield.exp
+d69a091035a2f9e4c062c985c1c3233c  gas/testsuite/gas/iq2000/yield0.s
+1debd376afeb9275adfb489a8339485e  gas/testsuite/gas/iq2000/yield1.s
+4966d212d153760af9a23c515cb72b7e  gas/testsuite/gas/iq2000/yield2.s
+fbac7003d0b47cb3f5a6983acba7475c  gas/testsuite/gas/lm32/all.exp
+ff4502aa7dc77cf08312db254ad91645  gas/testsuite/gas/lm32/csr.d
+417489f15a37a5755508e5e2673ae67e  gas/testsuite/gas/lm32/csr.s
+ed4c78d2b7f6be3b4d8e1e25d53ae2a1  gas/testsuite/gas/lm32/insn.d
+3ae64ee4b2c7163e40b5da7d4e5be673  gas/testsuite/gas/lm32/insn.s
+1dda15251a9f7565eae5b07a6ca2d8f0  gas/testsuite/gas/lns/lns-big-delta.d
+61f9144503868f8a70263764471ecb48  gas/testsuite/gas/lns/lns-big-delta.s
+c94a65a88ad101c3fb42f9f426c0b902  gas/testsuite/gas/lns/lns-common-1-alt.d
+1c6a26bb6f6b79087960114f78b1e053  gas/testsuite/gas/lns/lns-common-1-ia64.s
+cd70f28a0ac0310abfd7bff12d708541  gas/testsuite/gas/lns/lns-common-1.d
+1383f4115f40b84bb075557279ce8e14  gas/testsuite/gas/lns/lns-common-1.s
+a8dbe4ac283be70b5d876b90dca2424d  gas/testsuite/gas/lns/lns-diag-1.l
+be4c80cf566add41e4c6e4f89b90a741  gas/testsuite/gas/lns/lns-diag-1.s
+954850238a93c595a847c807deb9b4cd  gas/testsuite/gas/lns/lns-duplicate.d
+8e96abf784afc033cf7995d6681b2e91  gas/testsuite/gas/lns/lns-duplicate.s
+d53ef790c02dbff0e065b5e31ec07b78  gas/testsuite/gas/lns/lns.exp
+dcba3dd13f89544c92ccc86e5dcccdeb  gas/testsuite/gas/m32r/allinsn.d
+239bb6ea0e35bbe2e8a5939edab2a2cb  gas/testsuite/gas/m32r/allinsn.exp
+5f9b6e2b9934e8a02576ba496d16ab72  gas/testsuite/gas/m32r/allinsn.s
+418ea1f8c144280c2bfa54387e8beba0  gas/testsuite/gas/m32r/error.exp
+d71cb8f6eee3bbdd0ccecaaca513831a  gas/testsuite/gas/m32r/fslot.d
+da6bcd9a061b6fdd7a4ee5b2aec6811a  gas/testsuite/gas/m32r/fslot.s
+da48ccf2513f4723fced3d98ee902eee  gas/testsuite/gas/m32r/fslotx.d
+c81e23eb3020f45236c4ef7e98a14008  gas/testsuite/gas/m32r/fslotx.s
+e0a4e41d1665c5e0c4ca13ec9b548568  gas/testsuite/gas/m32r/high-1.d
+0c257c8a3667fa667e99bb3cb9aff5a7  gas/testsuite/gas/m32r/high-1.s
+873accfff909b6aac6b9a2e8cf961856  gas/testsuite/gas/m32r/interfere.s
+ab5eeb92f7ceecff8accd6105563fb00  gas/testsuite/gas/m32r/m32r.exp
+f8356fa33e1aa40f0f48046e766c07e4  gas/testsuite/gas/m32r/m32r2.d
+cb569d8cd9b19f9c80158a7dcc9641c0  gas/testsuite/gas/m32r/m32r2.exp
+05c2334e103e8a64c1d354b608d9c26f  gas/testsuite/gas/m32r/m32r2.s
+925faf7606bb992896b5d0a3fedac174  gas/testsuite/gas/m32r/m32rx.d
+778e305ed7747652af13150f315591a9  gas/testsuite/gas/m32r/m32rx.exp
+18de980a0f79928c1374c957b0ada6a9  gas/testsuite/gas/m32r/m32rx.s
+c0b5f95ee4eec971ea74dc81435baec8  gas/testsuite/gas/m32r/outofrange.s
+b6ca1e88ef4cd2485fbd0985ecbd4639  gas/testsuite/gas/m32r/parallel-2.d
+f7243334f19988521763b86ec05466af  gas/testsuite/gas/m32r/parallel-2.s
+1a923d7008ef300fe48e715181d60b38  gas/testsuite/gas/m32r/parallel.s
+aa8f2ce59d396c44db841950b4ccbc8e  gas/testsuite/gas/m32r/pic.d
+12fb586950543782bfbb2aebb34d2d1d  gas/testsuite/gas/m32r/pic.exp
+a7a53dd0986080053acfd273280e0cac  gas/testsuite/gas/m32r/pic.s
+5fa25afca5b586459bb9f769c043a10a  gas/testsuite/gas/m32r/pic2.d
+185cde387728a8a52cc89c0f2c62a88b  gas/testsuite/gas/m32r/pic2.s
+9aefae09c6bf69a68813bfe3b9d522c3  gas/testsuite/gas/m32r/rel32-err.s
+ae60ca76e0212930ab00672ebfc161ef  gas/testsuite/gas/m32r/rel32-pic.d
+81e0a14fcf378b9846014f8cdbeeead1  gas/testsuite/gas/m32r/rel32-pic.s
+2a9f12f6cefbb953d8484d4ad6a51eee  gas/testsuite/gas/m32r/rel32.d
+7dde0592afcf5178f27becd62452ca56  gas/testsuite/gas/m32r/rel32.exp
+81e0a14fcf378b9846014f8cdbeeead1  gas/testsuite/gas/m32r/rel32.s
+e35cfe164c66c6df8f9937607e1804f2  gas/testsuite/gas/m32r/rela-1.d
+91da9eadacb178cf7af3b6367b27f076  gas/testsuite/gas/m32r/rela-1.s
+e458c3261d10b7430278bedfbaf77b57  gas/testsuite/gas/m32r/relax-1.d
+ee56272ade0ca1ed891d0bcdc81d1173  gas/testsuite/gas/m32r/relax-1.s
+ffadebffc2057e150da0f56aa0f6d511  gas/testsuite/gas/m32r/relax-2.d
+dfd4ad2ea1d8b29e222e48a671c648e1  gas/testsuite/gas/m32r/relax-2.s
+da3c17f4b7848e845a19d80fa48898ec  gas/testsuite/gas/m32r/seth.d
+a977285fa6cb4bb433ff8d661160802b  gas/testsuite/gas/m32r/seth.s
+5eeabc5a49a2b873a05fdddf449913df  gas/testsuite/gas/m32r/signed-relocs.d
+0d78c451dfb7d578f7b5c1734ee03f3b  gas/testsuite/gas/m32r/signed-relocs.s
+65a3c2ab71799199c7a45459a9a87b1a  gas/testsuite/gas/m32r/uppercase.d
+3ad7dc32e323605aaf71cc84e39717df  gas/testsuite/gas/m32r/uppercase.s
+d21d472754ca0f699e8faf8c95175ec1  gas/testsuite/gas/m32r/wrongsize.s
+34e89680b972896b988178cc4a253dfa  gas/testsuite/gas/m68hc11/abi-m68hc11-16-32.d
+5c60b03593e7a4936417e9cdd732a004  gas/testsuite/gas/m68hc11/abi-m68hc11-16-64.d
+246ec931f4cac7abf9be7788326737e8  gas/testsuite/gas/m68hc11/abi-m68hc11-32-32.d
+438a68daa3fbd0dabbeffcb033a9cc6b  gas/testsuite/gas/m68hc11/abi-m68hc11-32-64.d
+1b0ca1676265b3dd66785e9656ddd199  gas/testsuite/gas/m68hc11/abi.s
+2ab706a9850050b395067c61297153d2  gas/testsuite/gas/m68hc11/all_insns.d
+57022ccbd6cef54a3a8ece7847d6569f  gas/testsuite/gas/m68hc11/all_insns.s
+7f32a49a34b114c05a55da1eeafb4d3b  gas/testsuite/gas/m68hc11/branchs12.d
+17a5e088710208e31860e64eda08f969  gas/testsuite/gas/m68hc11/branchs12.s
+7e59a46e650941fdb70180d8251a289d  gas/testsuite/gas/m68hc11/bug-1825.d
+9cb931f3ec3500c72620a735c8e03c5b  gas/testsuite/gas/m68hc11/bug-1825.s
+ae4a96f35d63157d5133ac82854449eb  gas/testsuite/gas/m68hc11/indexed12.d
+0d2b7ea9c6ed562cfc3566b68729e78b  gas/testsuite/gas/m68hc11/indexed12.s
+9cf492f0689b8eb9d820ec16d72514a4  gas/testsuite/gas/m68hc11/insns-dwarf2.d
+7e1438d4bf83a2c1102470d47fc56846  gas/testsuite/gas/m68hc11/insns.d
+c689de902a3cd3f23889c6e7e81ae737  gas/testsuite/gas/m68hc11/insns.s
+4737eff61ed660da03cfdceac21f0155  gas/testsuite/gas/m68hc11/insns12.d
+141b3a4c374a6000333e228ba3b9e47e  gas/testsuite/gas/m68hc11/insns12.s
+0b1954f09f62ef7435476b0ddc00072f  gas/testsuite/gas/m68hc11/lbranch-dwarf2.d
+ccb57bcbe25baef712b2a96fa9a5a3ce  gas/testsuite/gas/m68hc11/lbranch.d
+270514d96ae94f63ea38a4eb9fccd095  gas/testsuite/gas/m68hc11/lbranch.s
+c1060a813d93b1996f80a1d4862fe7c4  gas/testsuite/gas/m68hc11/m68hc11.exp
+7e3463ce5e0c47ca8bdaaf6f3d443f8d  gas/testsuite/gas/m68hc11/malis-include.s
+39a35b2b1583a2636a92fe70c4d055ba  gas/testsuite/gas/m68hc11/malis.d
+a469d5986f2366e13cba507b0314fdfd  gas/testsuite/gas/m68hc11/malis.s
+7db9f17261e7d7f985b870ce6f2ad9f7  gas/testsuite/gas/m68hc11/movb.d
+585f39e35793807e3fded97c021bd282  gas/testsuite/gas/m68hc11/movb.s
+246a84b3f7ff2215d7479d2c19faa780  gas/testsuite/gas/m68hc11/opers12-dwarf2.d
+dc9b04a98a41dea42bad2049f46223cc  gas/testsuite/gas/m68hc11/opers12.d
+a782d69af0f936aa9fcdfc1ecbac3c57  gas/testsuite/gas/m68hc11/opers12.s
+5ce2e2ebfd1f67275d61be1a00c3680d  gas/testsuite/gas/m68k/all.exp
+2c8cff99738cc49d98ae27854aaf533b  gas/testsuite/gas/m68k/arch-cpu-1.d
+a86d265e30a74bc8fdaa89c1a72e9c16  gas/testsuite/gas/m68k/arch-cpu-1.s
+d36654135443b0740d6b2c78b03ad44b  gas/testsuite/gas/m68k/bitfield.d
+fa19c98907bd173f6de4c396ef9acd45  gas/testsuite/gas/m68k/bitfield.s
+8e7bf83e13e2a12239dba9a08d6863d0  gas/testsuite/gas/m68k/br-isaa.d
+041e7f276b89d95a06712b8b30458aaa  gas/testsuite/gas/m68k/br-isaa.s
+304c7517aff62a47078625f6612ed1ad  gas/testsuite/gas/m68k/br-isab.d
+6f347ccf4e15f7e8e7f0b4820b47aefe  gas/testsuite/gas/m68k/br-isab.s
+6cfb94a0c3a281dd912564c93c0afaaf  gas/testsuite/gas/m68k/br-isac.d
+918b15696e0a972ec6ff5b0b008d6bd2  gas/testsuite/gas/m68k/br-isac.s
+1c229d52fdc1160c9dd9f74b19c1ec69  gas/testsuite/gas/m68k/cas.d
+20e0445e36d8d9f35c6022fa7118a3da  gas/testsuite/gas/m68k/cas.s
+b0368605069653c8c9aa0369b591d66d  gas/testsuite/gas/m68k/cpu32.d
+ca551aa8a506abbc251df076ee45824a  gas/testsuite/gas/m68k/cpu32.s
+0ddad6a07716faf9e725ca91096138a6  gas/testsuite/gas/m68k/ctrl-1.d
+820b9d7dbe0833991c6cedb6fbcdbdc3  gas/testsuite/gas/m68k/ctrl-1.s
+0987622d3d08e015c32e827c55c9a847  gas/testsuite/gas/m68k/ctrl-2.d
+3ee4700b8114f24f7e96d2a8639d2f5f  gas/testsuite/gas/m68k/ctrl-2.s
+96de03f7fc5967e5d267ae957ac508cf  gas/testsuite/gas/m68k/disperr.s
+ed716320dc539ce302d4b42c342d98dc  gas/testsuite/gas/m68k/fido.d
+d271df8524c5abe940b868ec36df598b  gas/testsuite/gas/m68k/fido.s
+26dfd242ac765008271e85e25d9d8446  gas/testsuite/gas/m68k/fmoveml.d
+205a85d6482891f58292e065222b78fa  gas/testsuite/gas/m68k/fmoveml.s
+b14e11a2793fb32f7d471e31e4ecf7b9  gas/testsuite/gas/m68k/link.d
+ea9ee18230b981ada48e2b69bb566220  gas/testsuite/gas/m68k/link.s
+8bbf9a7c8ed981bfdf33164bc8c1795e  gas/testsuite/gas/m68k/mcf-coproc.d
+cc3d620bbd810b86ac329d88356c2293  gas/testsuite/gas/m68k/mcf-coproc.s
+e9d65843e9ff4815317147668bb3eabc  gas/testsuite/gas/m68k/mcf-emac.d
+3b828ef829ca22f8225d76201d49099d  gas/testsuite/gas/m68k/mcf-emac.s
+04174ed46591a66a3724a8669e44bb8c  gas/testsuite/gas/m68k/mcf-fpu.d
+985b81bde386078023cf775e177e8398  gas/testsuite/gas/m68k/mcf-fpu.s
+d4579214757fe915fc67ea05f7e7c699  gas/testsuite/gas/m68k/mcf-mac.d
+98c8243f9c3e6f7b032b5ae0e1051927  gas/testsuite/gas/m68k/mcf-mac.s
+c06fb50473bc5cc2ef7658e6306256bf  gas/testsuite/gas/m68k/mcf-mov3q.d
+dc28098ce202f2d02aeead18ddac25ca  gas/testsuite/gas/m68k/mcf-mov3q.s
+ff2b8dbae08361ab60a5f38c1d20c8ba  gas/testsuite/gas/m68k/mcf-movsr.d
+708a66c1d76c25ececc29a5e21a3eaa7  gas/testsuite/gas/m68k/mcf-movsr.s
+3349dc41612e21d338aaf37aca84e2ad  gas/testsuite/gas/m68k/mcf-trap.d
+2f883f9901e7b4db6f38e516b45b7d75  gas/testsuite/gas/m68k/mcf-trap.s
+f89fe622eac815915a29f397b204e46a  gas/testsuite/gas/m68k/mcf-wdebug.d
+37d85bbc31cec38641d8f89a70e5ec80  gas/testsuite/gas/m68k/mcf-wdebug.s
+6e646c11198f5c995aeef425542bd408  gas/testsuite/gas/m68k/mode5.d
+d4dffd0c1722e83ddbbe8fbb999107df  gas/testsuite/gas/m68k/mode5.s
+85e6de04e2d6138d3b0e1e3e932fc884  gas/testsuite/gas/m68k/op68000.d
+d72997199e7c0cfb9dae24c9bc0347fd  gas/testsuite/gas/m68k/operands.d
+d5012d936b1b45db947e4a29a883fc9d  gas/testsuite/gas/m68k/operands.s
+91aa93e55ee135f07c4262e7cf5c282d  gas/testsuite/gas/m68k/p11673.s
+b334f15354ebeffb3acba502cc1dae67  gas/testsuite/gas/m68k/p2410.s
+ce5152b0da290f444d58c6ef03d48e02  gas/testsuite/gas/m68k/p2663.s
+4983e0937ec21aa3f61107606aa2948a  gas/testsuite/gas/m68k/p3041.d
+ad91a599d1015c362fa6a496fb99c4f3  gas/testsuite/gas/m68k/p3041.s
+6c9fd4e21fb5f16c6d3c7b79cbae935f  gas/testsuite/gas/m68k/p3041data.d
+7c61363a5349ec89742e03a17aee542e  gas/testsuite/gas/m68k/p3041data.s
+55dbfc5435291d0f8fc2904dc7925d41  gas/testsuite/gas/m68k/p3041pcrel.d
+14366dfe4862f354aa3acc8d1d0a4afe  gas/testsuite/gas/m68k/p3041pcrel.s
+9f97c8240a44cb8d55e355b3577f7a7d  gas/testsuite/gas/m68k/pcrel.d
+3bc8cba59ef27f67c6c6e2a67717db04  gas/testsuite/gas/m68k/pcrel.s
+c1fce4f35335083fbf7d4538c5a7230f  gas/testsuite/gas/m68k/pic1.s
+feaf8891278b0160a4e8977a751c9ecf  gas/testsuite/gas/m68k/pr11676.d
+61047c9a4075c1ed3be31b965f0a9dff  gas/testsuite/gas/m68k/pr11676.s
+6ebe1f8291de253ee6ce0e469b3e03aa  gas/testsuite/gas/m68k/t2.d
+ba9a3e851cb31d41e5a33c44dc3ebd13  gas/testsuite/gas/m68k/t2.s
+549aa5394e345619c2985ff6e8965149  gas/testsuite/gas/m68k/tls-gd-3.d
+f10c7fc453a90020e6009ef0796e4815  gas/testsuite/gas/m68k/tls-gd-3.s
+4117edd076cf599f92777cbfea5d59ba  gas/testsuite/gas/m68k-coff/gas.exp
+45f1ecda71b05960409560f553228a2d  gas/testsuite/gas/m68k-coff/p2389.s
+3a162ab2de5525fc4745144a511922c9  gas/testsuite/gas/m68k-coff/p2389a.s
+2c65e9837c0fa5884e6d7aa8ab7f5b27  gas/testsuite/gas/m68k-coff/p2430.s
+29f7789ff1bca9100fda6a1276c73f70  gas/testsuite/gas/m68k-coff/p2430a.s
+9ae5a3f91535cb9ce86b48698e6096b1  gas/testsuite/gas/m68k-coff/t1.s
+acda61b9872f053659f8f970762ebb6a  gas/testsuite/gas/macros/altmacro.d
+f7fe0f7c09603779be48d47927811570  gas/testsuite/gas/macros/altmacro.s
+a7bb771f464a0b5ecf0c4d5ba774593d  gas/testsuite/gas/macros/and.s
+4df56374dec5a1c76dd066c3d729c85d  gas/testsuite/gas/macros/app1.d
+5a379b4af4da66bf04866a810b4de97b  gas/testsuite/gas/macros/app1.s
+33aa8d4b13e498f0d7e15beca1f27ced  gas/testsuite/gas/macros/app2.d
+9d06cd31170f7f48701da42df9632246  gas/testsuite/gas/macros/app2.s
+c0cfe9bcc558ec1eb1f1c3a127e5f4ea  gas/testsuite/gas/macros/app3.d
+a4a1a4a55d0b3203d8ed8dd831826fc3  gas/testsuite/gas/macros/app3.s
+74ba97a7638d2b3a01bbeb4461fb1eb5  gas/testsuite/gas/macros/app4.d
+fdd040aa869c081694e5e2f65100bf19  gas/testsuite/gas/macros/app4.s
+d2f0e95bde22021aa580233d12b5f859  gas/testsuite/gas/macros/app4b.s
+79c4224dcaa95d47119575859a12f052  gas/testsuite/gas/macros/badarg.l
+e7b8d7dc34667abdcad825d3af9e324c  gas/testsuite/gas/macros/badarg.s
+ef4d8ec6d2488a5bb4d83550b40ef6d1  gas/testsuite/gas/macros/dot.l
+3a9f384d6f335d0422e058696f0d491f  gas/testsuite/gas/macros/dot.s
+24acd998ad2fbeeae147bbd23108b9e6  gas/testsuite/gas/macros/end.l
+08af75c12d981d83fc2ddb9976a60205  gas/testsuite/gas/macros/end.s
+06148aa2e0046074be6e05308a79b642  gas/testsuite/gas/macros/err.s
+ab33edd7c59372a1fffccf5d8ec74af4  gas/testsuite/gas/macros/exit.s
+f64593bf9530d575f681a8566ef216c3  gas/testsuite/gas/macros/irp.d
+e284db7fba30dba3218492a95521d6b1  gas/testsuite/gas/macros/irp.s
+5a989ab1c657b34af2f6423b6c25bc15  gas/testsuite/gas/macros/macros.exp
+57f89b0f39596194cda700208502784d  gas/testsuite/gas/macros/paren.d
+645a2095f5f91978eedce3fbf6711923  gas/testsuite/gas/macros/paren.s
+8a89a449aeedd42a670a4edc8c9ee377  gas/testsuite/gas/macros/purge.l
+2878ce4eb08bcf5a66dfc813d10012bd  gas/testsuite/gas/macros/purge.s
+c1ae846d289af2aadf8628fd4065b805  gas/testsuite/gas/macros/redef.l
+4a17dc932e2a386dfd63e54c978ebfdd  gas/testsuite/gas/macros/redef.s
+e01c1559f46ebcc9e71e12bbbe29d50a  gas/testsuite/gas/macros/repeat.d
+c50b4097dfec4d64d80d9d35282be338  gas/testsuite/gas/macros/repeat.s
+b320acc9c113dd9d1967db7ee0857e8a  gas/testsuite/gas/macros/rept.d
+f5abc6437f073dff4af533a36ea9d280  gas/testsuite/gas/macros/rept.s
+4bf4ec50a66311911e2120d1cdc8bbcb  gas/testsuite/gas/macros/semi.d
+16079c6681fc293376e83b74d4b5ffe4  gas/testsuite/gas/macros/semi.s
+4441ddbad8be79e14a096f879b1ece66  gas/testsuite/gas/macros/strings.d
+8990b11a483140af060adb1ff48c4cc5  gas/testsuite/gas/macros/strings.s
+3468ca74d70167a37cf3e040dfedf5ac  gas/testsuite/gas/macros/test1.d
+78d91d34e2f43f8c90923a237fa2004e  gas/testsuite/gas/macros/test1.s
+ac43f2633f23586812df9e1a40627d82  gas/testsuite/gas/macros/test2.d
+c881555cf20f7d8ed8635c1bf0d11b37  gas/testsuite/gas/macros/test2.s
+7e8aafe277f842553e1bf935c32fa0e8  gas/testsuite/gas/macros/test3.d
+1dbcc25102396060274f0b3d1268f47c  gas/testsuite/gas/macros/test3.s
+3b25365dfe02718a9704624a1860b9a5  gas/testsuite/gas/macros/vararg.d
+4dfb839d34233c6e8f4d0873cb7adb02  gas/testsuite/gas/macros/vararg.s
+fe98b2cc453fcf7a781ca1bb78913020  gas/testsuite/gas/mcore/allinsn.d
+3f84389ae5d2fa1891f6db5a66746c47  gas/testsuite/gas/mcore/allinsn.exp
+733e0ea4313c0aae461d17a553aed497  gas/testsuite/gas/mcore/allinsn.s
+0ab81dff36829f3dd7bbd1000ad03faf  gas/testsuite/gas/mep/allinsn.be.d
+5f3c2e7fe192b6e4c616becfbe63a0f0  gas/testsuite/gas/mep/allinsn.exp
+725eb39dcaf4cd62b058ccd8b5efa5fc  gas/testsuite/gas/mep/allinsn.le.d
+96a535cdd38bb7538883d0327d38be12  gas/testsuite/gas/mep/allinsn.s
+5356d87f136bd7bfe2edab640c4728b4  gas/testsuite/gas/mep/branch1.be.d
+1c6c48f29b74dc09f4b0a0c97219a6e5  gas/testsuite/gas/mep/branch1.le.d
+35ca0818d841dc654ce874b0e5de304e  gas/testsuite/gas/mep/branch1.s
+3b3e148b6c63bd6f09e82ddc569ca5d8  gas/testsuite/gas/mep/complex-relocs.exp
+d186d3afc3ee54e09960714a5c1fd68d  gas/testsuite/gas/mep/dj1.be.d
+5b33491fed5eb691c4e00c6c3becd2ef  gas/testsuite/gas/mep/dj1.le.d
+45b36e3d305a2889fbbed26b5e729dc8  gas/testsuite/gas/mep/dj1.s
+957c407a026ec401a7bc9994f8d529ed  gas/testsuite/gas/mep/dj2.be.d
+2da07098a3e20b991b905f02b8bb5a85  gas/testsuite/gas/mep/dj2.le.d
+87c597ad8f492dc4e3e38f48e761e40d  gas/testsuite/gas/mep/dj2.s
+7d315bcdac108aa66f27cf2319d818e9  gas/testsuite/gas/mep/relocs-bad3.s
+beb5219eec5436d53c2b958cba6c341e  gas/testsuite/gas/mep/relocs-junk1.s
+f41d2f0901c9e89c07c0b9420205546f  gas/testsuite/gas/mep/relocs-junk2.s
+739d59546a384a25c2a60ed430171998  gas/testsuite/gas/mep/relocs-refs.s
+8969af38a3bee22a2099c343ca67ebd2  gas/testsuite/gas/mep/relocs-syms.s
+cc2cb034acd8c8f03940a99aa3a9075c  gas/testsuite/gas/mep/relocs.d
+5fdcd8929b031a5442439eaa95b83274  gas/testsuite/gas/mips/24k-branch-delay-1.d
+b765fc592389e7ebc505b7f8993d3dfb  gas/testsuite/gas/mips/24k-branch-delay-1.s
+a0eb6b5c2c7e449beec99672da081297  gas/testsuite/gas/mips/24k-triple-stores-1.d
+144715aea0b56014b54d983879544e2f  gas/testsuite/gas/mips/24k-triple-stores-1.s
+ac3b30f0adfa688567ead81ee3167c1c  gas/testsuite/gas/mips/24k-triple-stores-10.d
+5729b6e78d97fceca29ab2dad1e5277a  gas/testsuite/gas/mips/24k-triple-stores-10.s
+d1bea3bad326c751b5a201c336fe5a9f  gas/testsuite/gas/mips/24k-triple-stores-11.d
+d3acbcfede6e83b6991cd8b768603358  gas/testsuite/gas/mips/24k-triple-stores-11.s
+71e234391af0fba8cc66a063df4ebb08  gas/testsuite/gas/mips/24k-triple-stores-2.d
+8d772867f2e4c03ecae4a5b14c774638  gas/testsuite/gas/mips/24k-triple-stores-2.s
+c4efda54c00c361d6b06621ab2abce3b  gas/testsuite/gas/mips/24k-triple-stores-3.d
+55b44f4e95bcf72ad60d64463bcd7d83  gas/testsuite/gas/mips/24k-triple-stores-3.s
+fe5775611a762e9d8f76d8aa0966a706  gas/testsuite/gas/mips/24k-triple-stores-4.d
+e23a173120673650061005bf637f693e  gas/testsuite/gas/mips/24k-triple-stores-4.s
+e4f053e00dcd85008f7d4562fd552686  gas/testsuite/gas/mips/24k-triple-stores-5.d
+0ed14396e7b4d14a31b50b4653e9eef6  gas/testsuite/gas/mips/24k-triple-stores-5.s
+6acf77ead10d3d947dada3e9b6e074f6  gas/testsuite/gas/mips/24k-triple-stores-6.d
+b06f0c90767ef3eeeb87195ef0c626a2  gas/testsuite/gas/mips/24k-triple-stores-6.s
+84febf75b46904b8bed3dd1ef323aae5  gas/testsuite/gas/mips/24k-triple-stores-7.d
+c2b8d1b4a407ea3f00031335669b1257  gas/testsuite/gas/mips/24k-triple-stores-7.s
+94d7591accec581c1c11618d147b0661  gas/testsuite/gas/mips/24k-triple-stores-8.d
+43094d366c39ecd105bcd55f2cec5e88  gas/testsuite/gas/mips/24k-triple-stores-8.s
+dbef5e69e724f2fcaa24295d9414dde8  gas/testsuite/gas/mips/24k-triple-stores-9.d
+809a9fa5ac03a70596c8b41f3aa61d99  gas/testsuite/gas/mips/24k-triple-stores-9.s
+4185980a1e50b8b935d3ee3b658b36cf  gas/testsuite/gas/mips/abs.d
+93b8bd81a813fed709cc6b5639d4552a  gas/testsuite/gas/mips/abs.s
+f98b54818883ed309062b1cbf40844e3  gas/testsuite/gas/mips/add.d
+3aee944bf3dc58dded8dd88c0ef7e205  gas/testsuite/gas/mips/add.s
+f78397ef61e3d8da80f298878e9283fc  gas/testsuite/gas/mips/aent.d
+da8f8ab41c6a1f9d1b814110b074d73c  gas/testsuite/gas/mips/aent.s
+4861ffe49175e7f09f5bd11de5552347  gas/testsuite/gas/mips/align.d
+e9a5e259296d0f0ccd600d0126e4bcc3  gas/testsuite/gas/mips/align.s
+cc90ff1dfb8c42f725f5672f67df5e5f  gas/testsuite/gas/mips/align2-el.d
+6682916ca021cfdcc7c316b4da832da6  gas/testsuite/gas/mips/align2.d
+a3e19ffb2b473d10cc37328a4fab9623  gas/testsuite/gas/mips/align2.s
+35bef725463dbf1117b375c03b7e0ed8  gas/testsuite/gas/mips/alnv_ps-swap.d
+ddebd3e526fa95fd7a69806746db984b  gas/testsuite/gas/mips/alnv_ps-swap.s
+87fbd1425a84674f2996096bb1887a91  gas/testsuite/gas/mips/and.d
+c22e6aa3e89ed73291d018a5de51a7bb  gas/testsuite/gas/mips/and.s
+e09ea26af6b44682876f3ea4d8e488b7  gas/testsuite/gas/mips/at-1.d
+0afeecd617af15073b4492b76ed2e936  gas/testsuite/gas/mips/at-1.s
+f4b5f3ed67c7aa945bc0dc52a82c9209  gas/testsuite/gas/mips/at-2.l
+5aaeb070968adf05b2730ac4d0f39209  gas/testsuite/gas/mips/at-2.s
+b4cc184c25e23755df2ecda7f5b1e988  gas/testsuite/gas/mips/baddata1.l
+b412b27903c83a7e1d80e6ceadb05db1  gas/testsuite/gas/mips/baddata1.s
+b059d4bf55162ce8ac5d0238565e030f  gas/testsuite/gas/mips/beq.d
+88604f6faddd89f48b7b9a32c0617dba  gas/testsuite/gas/mips/beq.s
+4f314b785a459560acacb3731c25a579  gas/testsuite/gas/mips/bge.d
+240831523e05ebe83934eb2db885b941  gas/testsuite/gas/mips/bge.s
+7d33222ee708dcb6e432682e567d9506  gas/testsuite/gas/mips/bgeu.d
+17a7104bf8f6ef5362b500d8d35103ba  gas/testsuite/gas/mips/bgeu.s
+c49ddf090ddd24f7546b153e4e50ac3b  gas/testsuite/gas/mips/blt.d
+19084048b3a6573d8d8a7360567b5de0  gas/testsuite/gas/mips/blt.s
+5dda29e22a9d387906f0d17f0ed8a3cc  gas/testsuite/gas/mips/bltu.d
+867a78155944ae35d3edd46759c4664d  gas/testsuite/gas/mips/bltu.s
+d872abda04111d7f21451dfd37a93159  gas/testsuite/gas/mips/branch-likely.d
+a429d28dab2e28e92a8ef3f5eb1a2e1e  gas/testsuite/gas/mips/branch-likely.s
+47226f542b146b7fa4a41cbd47427ac5  gas/testsuite/gas/mips/branch-misc-1.d
+9121204cadf61e01caeac35fbbdf4611  gas/testsuite/gas/mips/branch-misc-1.s
+525dbff998fa46471531687a7ae1fc86  gas/testsuite/gas/mips/branch-misc-2-64.d
+d5409d6246f40fa3132d5e4ebd0a0bc6  gas/testsuite/gas/mips/branch-misc-2.d
+5c88646f3e0762f8577328b330cb94e0  gas/testsuite/gas/mips/branch-misc-2.s
+5384713ad00067ea0909fc00a33e38a5  gas/testsuite/gas/mips/branch-misc-2pic-64.d
+b8c0ac3c0d474923637b3c71e8bcf087  gas/testsuite/gas/mips/branch-misc-2pic.d
+c759e7da1ca3460a3f3aecb62d752a57  gas/testsuite/gas/mips/branch-misc-3.d
+03386ef0c29fc9cd797e867b45ccc281  gas/testsuite/gas/mips/branch-misc-3.s
+033ebad4d7f779b189ff05dac2939b5d  gas/testsuite/gas/mips/branch-misc-4-64.d
+cb434a44cac31cf53713c222f9a50d99  gas/testsuite/gas/mips/branch-misc-4.d
+c0f2d806c6c663925b39078acabcc13b  gas/testsuite/gas/mips/branch-misc-4.s
+1a2d5403ca9b20fad9fe48f6a88333dd  gas/testsuite/gas/mips/branch-swap.d
+0a639c15c4cf5d990d1e342faab9013a  gas/testsuite/gas/mips/branch-swap.s
+9019640b31913709f26c121174ed6f31  gas/testsuite/gas/mips/break20.d
+01e30fca71ae643c6acb0e4c3d579f1c  gas/testsuite/gas/mips/break20.s
+f9f3fa4f557fa10b3ea3632e7f2267ad  gas/testsuite/gas/mips/cache.d
+69766c8b19aeb811928ae4d1e97144e5  gas/testsuite/gas/mips/cache.s
+a8d3324ce7f2b736e86b0b37863c3284  gas/testsuite/gas/mips/call-nonpic-1.d
+ab3d77562d7321251bb71cda5b59841a  gas/testsuite/gas/mips/call-nonpic-1.s
+d6fe1f527092210021dfbe21fdc8b348  gas/testsuite/gas/mips/cfi-n64-1.d
+fcbbec6f83a1baf944b58b5e4d5b75e5  gas/testsuite/gas/mips/cfi-n64-1.s
+30612145052e1d2fe5fb72653f2b1c21  gas/testsuite/gas/mips/cp0-names-mips32.d
+f257dc9a16a2d8c1c7fa591ae1367e27  gas/testsuite/gas/mips/cp0-names-mips32r2.d
+85d6bc895e6396d1220b182ee81497d1  gas/testsuite/gas/mips/cp0-names-mips64.d
+3449570fae576b82c519c71630237f7e  gas/testsuite/gas/mips/cp0-names-mips64r2.d
+820045ce9ca1a528b336ed1613fe9ab8  gas/testsuite/gas/mips/cp0-names-numeric.d
+8ccaae0bb0f23368e83025d1a176c246  gas/testsuite/gas/mips/cp0-names-r3000.d
+17c6e4db198bb1467ce086a3497f1cfc  gas/testsuite/gas/mips/cp0-names-r4000.d
+435490224450a34be4dfd2ae5c62d629  gas/testsuite/gas/mips/cp0-names-sb1.d
+0eef2b21d782da076667ee1d1be4c0b1  gas/testsuite/gas/mips/cp0-names.s
+2ceebd2a22d7e2bbbd437ba81930d083  gas/testsuite/gas/mips/cp0sel-names-mips32.d
+efdfebc4309127eac2ecd8db816246c3  gas/testsuite/gas/mips/cp0sel-names-mips32r2.d
+fb2beb4484f7975a92f9d87f55ea7879  gas/testsuite/gas/mips/cp0sel-names-mips64.d
+2fc73a454a98ea1455aa5edf1afc6fb6  gas/testsuite/gas/mips/cp0sel-names-mips64r2.d
+7b656e828f45bcd53f460b5c862af427  gas/testsuite/gas/mips/cp0sel-names-numeric.d
+8c78816fa436c9deae7f7c868033283f  gas/testsuite/gas/mips/cp0sel-names-sb1.d
+1d57095720d3c2d464ceecd3230b0b1d  gas/testsuite/gas/mips/cp0sel-names.s
+5382505c92fbf9f5df6e1da1307d6fc2  gas/testsuite/gas/mips/daddi.d
+17d29a01ad74635f2897df923f3d65a5  gas/testsuite/gas/mips/daddi.s
+03a662feca559831acdbf0a3f76f5c70  gas/testsuite/gas/mips/delay.d
+538610ec904788baaf4b069afb5b75e4  gas/testsuite/gas/mips/delay.s
+6ce614bbef53b14bfaae9d392f25d8e4  gas/testsuite/gas/mips/div-ilocks.d
+ca695be3a404528913fa436b4773fa33  gas/testsuite/gas/mips/div.d
+6da8cc8418138e9b9ee39ac970e437da  gas/testsuite/gas/mips/div.s
+bd708578daa50a1d48a09e757f0cbcd9  gas/testsuite/gas/mips/dli.d
+cd7c76b9945bf3197f55dd60337a2a1c  gas/testsuite/gas/mips/dli.s
+ff1205f20042f44eab860e0933c64965  gas/testsuite/gas/mips/e32-rel2.d
+f1ad67a0879b7afd28bf7364cb0834a3  gas/testsuite/gas/mips/e32-rel4.d
+61726b9e6598707a9acc650e0d3a4a50  gas/testsuite/gas/mips/e32el-rel2.d
+936b705835c37402172a63f006d02014  gas/testsuite/gas/mips/ecoff@ld-forward.d
+ebfb58e498eaf4013d918988693816b2  gas/testsuite/gas/mips/ecoff@ld.d
+d0ced5bb168c9f7d18c43f690480400e  gas/testsuite/gas/mips/ecoff@sd-forward.d
+e47740e421951a741cd23d1c8c7c8b53  gas/testsuite/gas/mips/ecoff@sd.d
+4db6e83621d51e75691a170444580c92  gas/testsuite/gas/mips/elf-consthilo.d
+7d6fc8c3c1f4707ba226b63b085eccc9  gas/testsuite/gas/mips/elf-consthilo.s
+b9095f709ac8275face75cd731c7e345  gas/testsuite/gas/mips/elf-jal.d
+e1a412b36896d1df31ae1a5723d913fc  gas/testsuite/gas/mips/elf-rel-got-n32.d
+b703fb7c98d9ca3ae7188b4ca9f7884f  gas/testsuite/gas/mips/elf-rel-got-n32.s
+dca717c07ec35a9a3c2e120c19509ee8  gas/testsuite/gas/mips/elf-rel-got-n64.d
+c09c6e2e13ec39459171d47a0a1de0dc  gas/testsuite/gas/mips/elf-rel-got-n64.s
+246786fedabd1bc55678a626281d56c1  gas/testsuite/gas/mips/elf-rel-xgot-n32.d
+5e43392b134b49756e570cb8d7c92dd0  gas/testsuite/gas/mips/elf-rel-xgot-n64.d
+b30098857b466696409095e2f291d560  gas/testsuite/gas/mips/elf-rel.d
+502a3f9d5d4d477818aa628da52d9dc7  gas/testsuite/gas/mips/elf-rel.s
+fd815ecb2e693579935d3f7d528f98b3  gas/testsuite/gas/mips/elf-rel10.d
+9edb23aa539a4eb538ab2ae82789cb72  gas/testsuite/gas/mips/elf-rel10.s
+d9a6383654de3b0a3253251fc51545d1  gas/testsuite/gas/mips/elf-rel11.d
+976f6c1629fb9665abfe19081a6e2e77  gas/testsuite/gas/mips/elf-rel11.s
+45839cc4faac9e5feac6a60aea98e8ef  gas/testsuite/gas/mips/elf-rel12.d
+cfbd6623492939a879a8c06ec19c9782  gas/testsuite/gas/mips/elf-rel12.s
+bee5e6e9059c6f9de42a09a56d4c30ad  gas/testsuite/gas/mips/elf-rel13-mips16.d
+5fe1d10ae49768cd2cbf2adf6b284a46  gas/testsuite/gas/mips/elf-rel13-mips16.s
+1a2b7b746c809d850a52b210805534bb  gas/testsuite/gas/mips/elf-rel13.d
+7d15dc149c45847f3da69f237b49f75c  gas/testsuite/gas/mips/elf-rel13.s
+5c320d3cb1beb042486e9a8745b4c2c6  gas/testsuite/gas/mips/elf-rel14.d
+f0b56f0ca5879b02a735a42d59550e96  gas/testsuite/gas/mips/elf-rel14.s
+b1948a758b8a0bfdef54909a790e4548  gas/testsuite/gas/mips/elf-rel15.d
+cd997153f06e3c05746f8d2660b406f3  gas/testsuite/gas/mips/elf-rel15.s
+c8d2800a57b09863e267abbc84d6013b  gas/testsuite/gas/mips/elf-rel16.d
+c84fdf9f052ea8c6520ac0a0b3ad4a53  gas/testsuite/gas/mips/elf-rel16.s
+3cb2a7baa417f6f854b5fba684329ea8  gas/testsuite/gas/mips/elf-rel17.d
+a2e720638aed5afda45f03d004fb6940  gas/testsuite/gas/mips/elf-rel17.s
+7dad2d4e65bdb6c66a8c66b6bad1b9e6  gas/testsuite/gas/mips/elf-rel18.d
+2f9e052ff885274c4e13e6f605cab8d3  gas/testsuite/gas/mips/elf-rel18.s
+3491f79ba615bc3f9bcb54d0713a6aad  gas/testsuite/gas/mips/elf-rel19.d
+af8416449087ed017bdfe9307e1b6500  gas/testsuite/gas/mips/elf-rel19.s
+d749327fe86acaf8385049aa9770bfa9  gas/testsuite/gas/mips/elf-rel2.d
+f7a0c6062a5a8fe838e93a14441b72bc  gas/testsuite/gas/mips/elf-rel2.s
+b044ed458368bf7bd0706a3e4a8ea1c9  gas/testsuite/gas/mips/elf-rel20.d
+982048418bd0153f8c1117b51c685e2f  gas/testsuite/gas/mips/elf-rel20.s
+a13edfcf468e99da0de2514f1e853fdd  gas/testsuite/gas/mips/elf-rel21.d
+701aaa1b0c7d66a1697166b9b854245c  gas/testsuite/gas/mips/elf-rel21.s
+e05a3c34f7cdbed02f3c53dce1fea3d6  gas/testsuite/gas/mips/elf-rel22.d
+d2bbcb6ddb42de18b0f6fdc8faf14780  gas/testsuite/gas/mips/elf-rel22.s
+9be1e5f72ab920ba4f8e5554836b81b2  gas/testsuite/gas/mips/elf-rel23.d
+ac83e63959938893af13b631921cbdf1  gas/testsuite/gas/mips/elf-rel23.s
+a26069fba96baec6f50d247bf7ce5011  gas/testsuite/gas/mips/elf-rel23a.d
+820be43d9775898d155af457141b2dde  gas/testsuite/gas/mips/elf-rel23b.d
+4d58f6bdbdb4b350c49d12d719d3805a  gas/testsuite/gas/mips/elf-rel24.d
+f8e5b9d5e57f774b7426c2834fd2dbc7  gas/testsuite/gas/mips/elf-rel24.s
+b3633d6652d00fab06d8a19f602ca2c3  gas/testsuite/gas/mips/elf-rel25.d
+1c736e711964110cc8f5fc80fba12af6  gas/testsuite/gas/mips/elf-rel25.s
+37e4931f9f5d2b267e03aaecda86d635  gas/testsuite/gas/mips/elf-rel25a.d
+b8a8ddd377f5aab5eb78d68d1a0f140a  gas/testsuite/gas/mips/elf-rel26.d
+25bf5299f9445d2a8b741a37d2dcc94f  gas/testsuite/gas/mips/elf-rel26.s
+29ddd7f71aa6ad863e9569f99e49cfb8  gas/testsuite/gas/mips/elf-rel27.d
+db6328a447bd906e6310a2561a786899  gas/testsuite/gas/mips/elf-rel27.s
+ef6570d063e0f2f9602f6356ccbd637a  gas/testsuite/gas/mips/elf-rel28-n32.d
+6e6bea48787a8d625ab6bc947fceff03  gas/testsuite/gas/mips/elf-rel28-n64.d
+edbe4d68770d26bd52ca17917a51456a  gas/testsuite/gas/mips/elf-rel28.s
+63c3597acf4a86494166dc23ca1b5d76  gas/testsuite/gas/mips/elf-rel3.d
+e410b64c4640b935f6bb831e74cd2870  gas/testsuite/gas/mips/elf-rel3.s
+4b7429259a1a34ec68bd6044981bfd92  gas/testsuite/gas/mips/elf-rel4.d
+1c442eac01601b144d6c4996f135529e  gas/testsuite/gas/mips/elf-rel4.s
+7da48a40b9c65128701389907d56e77b  gas/testsuite/gas/mips/elf-rel5.d
+afc1f5689df1d0e4acbdc2b757e6cb16  gas/testsuite/gas/mips/elf-rel5.s
+5d94a0ffcf8dccff9a47b65329bed287  gas/testsuite/gas/mips/elf-rel6-n32.d
+d646e43e35cbf157d7438aeabcdb02c2  gas/testsuite/gas/mips/elf-rel6-n64.d
+72f5dbd4ceb377d2b7d838cbe58e8b3f  gas/testsuite/gas/mips/elf-rel6.d
+6a31d45f2d668f87dd958a3ec5818dff  gas/testsuite/gas/mips/elf-rel6.s
+5547d261f60275f6c55c3dae337efa6f  gas/testsuite/gas/mips/elf-rel7.d
+b6baa98ec9d4b2adfd3f5d39bbeae554  gas/testsuite/gas/mips/elf-rel7.s
+c7fc4ade739ba6c4251429ad2ca33595  gas/testsuite/gas/mips/elf-rel8-mips16.d
+171e760b94403603a29328cecfe6f02f  gas/testsuite/gas/mips/elf-rel8-mips16.s
+b190c96744ac9f75edb8afcd4eac2508  gas/testsuite/gas/mips/elf-rel8.d
+4e472ae6748e852b7042fa1f4c93adb7  gas/testsuite/gas/mips/elf-rel8.s
+21b3361ec604af7eda9b4b1371806461  gas/testsuite/gas/mips/elf-rel9-mips16.d
+3e7e6755eded083db22a495f9533b414  gas/testsuite/gas/mips/elf-rel9-mips16.s
+0d920384da162c2db2e07d8229712b4d  gas/testsuite/gas/mips/elf-rel9.d
+b2bbff55e0858b353cbab866d75a667e  gas/testsuite/gas/mips/elf-rel9.s
+33497173dfabd65fb6dcdd870c38284e  gas/testsuite/gas/mips/elf_arch_mips1.d
+2f7189968598e85e9a6d9553ad4bd98f  gas/testsuite/gas/mips/elf_arch_mips2.d
+a59ce8a45ea4d62efead35c03e80c946  gas/testsuite/gas/mips/elf_arch_mips3.d
+24a6739368675680e62da8b43229db24  gas/testsuite/gas/mips/elf_arch_mips32.d
+9a87a8c1c1e14c84eed5b0a170fe2f87  gas/testsuite/gas/mips/elf_arch_mips32r2.d
+fabd38587c85d4b0d4d03161e20f80df  gas/testsuite/gas/mips/elf_arch_mips4.d
+1a0323806fc40e26782f9ce94d44aa3d  gas/testsuite/gas/mips/elf_arch_mips5.d
+cd1bdbc63429b93b91d3c926091a21d4  gas/testsuite/gas/mips/elf_arch_mips64.d
+4487722fdd93cd65723774f04e4c62ae  gas/testsuite/gas/mips/elf_arch_mips64r2.d
+823bc814523dbcb0ca578007a4ef6b8d  gas/testsuite/gas/mips/elf_ase_micromips-2.d
+43326b04a96561ff2e11e1fb1a2e3125  gas/testsuite/gas/mips/elf_ase_micromips.d
+f2641b7c748ae9495374e6a8bfc42a8f  gas/testsuite/gas/mips/elf_ase_mips16-2.d
+5c39d0cbad042e1266c9acbf55d98baf  gas/testsuite/gas/mips/elf_ase_mips16.d
+6531d00a109f1e0829eda1178a1b886a  gas/testsuite/gas/mips/elf_e_flags.c
+6bbeff5a2159c064f18894cc7bd9b7ef  gas/testsuite/gas/mips/elf_e_flags.s
+5195b99d09665b7ef9b71e2c53bb8fd6  gas/testsuite/gas/mips/elf_e_flags1.d
+bb39999583f7c2aca308a93651cf8c68  gas/testsuite/gas/mips/elf_e_flags2.d
+f63ed5c3cdbd37ab7940faa40cf8f2b5  gas/testsuite/gas/mips/elf_e_flags3.d
+f63ed5c3cdbd37ab7940faa40cf8f2b5  gas/testsuite/gas/mips/elf_e_flags4.d
+7ed80a5d8b87105ce7c5f0d36faeba6d  gas/testsuite/gas/mips/elfel-rel.d
+617e895ce1525446cfdfd10dd93f0656  gas/testsuite/gas/mips/elfel-rel2.d
+ff629ca128c6d5d661058f5d9a1242a5  gas/testsuite/gas/mips/elfel-rel3.d
+78bc390993b007fb9b0866209d3c30d1  gas/testsuite/gas/mips/empty.s
+e3977ecfe77dc7125c939f3d9b2a12cb  gas/testsuite/gas/mips/eret-1.d
+daa352ee43f9804ee315eff1622faf55  gas/testsuite/gas/mips/eret-1.s
+6ed7a7d5d3d0ac80f3fe3f643778e53f  gas/testsuite/gas/mips/eret-2.d
+6f37c89b983a95bd535c3650c398218f  gas/testsuite/gas/mips/eret-2.s
+5ce75bcb281795ced9c46e74f501fde1  gas/testsuite/gas/mips/eret-3.d
+485d74927d6edab032af9f55a963a6e4  gas/testsuite/gas/mips/eret-3.s
+bcf73183f8949a816b6901d22fbe1162  gas/testsuite/gas/mips/expr1.d
+6fb3005d059cb1b45a4a86e14c56fcac  gas/testsuite/gas/mips/expr1.s
+32922f0496e841aa3a1bd4209a4cd901  gas/testsuite/gas/mips/fpr-names-32.d
+c113920cb549a0af681b07ea67a13218  gas/testsuite/gas/mips/fpr-names-64.d
+4cb09267c5e0b68305e75d7c9d1e4bd5  gas/testsuite/gas/mips/fpr-names-n32.d
+a43e6c1cd7d89b4b715b852927d5135b  gas/testsuite/gas/mips/fpr-names-numeric.d
+824a085f211c176750127e9a311c514d  gas/testsuite/gas/mips/fpr-names.s
+d74dfe4a05aff75e80e09e2afad6ac01  gas/testsuite/gas/mips/gpr-names-32.d
+8ea9e708ff9c7c31e60e3b46e16838aa  gas/testsuite/gas/mips/gpr-names-64.d
+bb6c0c7be041ec5f6406ae33c304c041  gas/testsuite/gas/mips/gpr-names-n32.d
+75457dd316069b8bb3e5afce3748723e  gas/testsuite/gas/mips/gpr-names-numeric.d
+7500fbfda3124c0dbda33a9b704a44f5  gas/testsuite/gas/mips/gpr-names.s
+f415b030a55928482057aea074f309f8  gas/testsuite/gas/mips/hwr-names-mips32r2.d
+862acc414d4dda65d1e20f56cbfaf7c1  gas/testsuite/gas/mips/hwr-names-mips64r2.d
+2b9a455406eb8f66f8f200bcf2ee0466  gas/testsuite/gas/mips/hwr-names-numeric.d
+849a87fc73c7b8b6f65392a02df39104  gas/testsuite/gas/mips/hwr-names.s
+3cc2090a29285939cfefea6406e3ffe4  gas/testsuite/gas/mips/illegal.l
+75704852136f9d0d9888c8899cca307e  gas/testsuite/gas/mips/illegal.s
+b47234477b017d8640d0a583d17b44cb  gas/testsuite/gas/mips/itbl
+3be9cfa967f82e0b4325b152baf0f23a  gas/testsuite/gas/mips/itbl.s
+45f0c80b7327d4d02804ed71299fdc2b  gas/testsuite/gas/mips/jal-mask-1.s
+ef62dd730021f9ba5345eb51787de1d8  gas/testsuite/gas/mips/jal-mask-11.d
+c10b3a20127cde09f5e62be66746ee8e  gas/testsuite/gas/mips/jal-mask-12.d
+ef2ab95e9a7924b784919de105703082  gas/testsuite/gas/mips/jal-mask-2.s
+f04a4ad7e2f310d73b3152d6852d7547  gas/testsuite/gas/mips/jal-mask-21.d
+02ffa077e00411500c80511d7ffdd297  gas/testsuite/gas/mips/jal-mask-22.d
+806671f3ba17b750c415c62f3483b1a8  gas/testsuite/gas/mips/jal-newabi.d
+05fc99b54ef095862bfb5f15fdfdbb59  gas/testsuite/gas/mips/jal-newabi.s
+af73cf131e4217ded49d9937721c78ac  gas/testsuite/gas/mips/jal-range.l
+d37160d514747dbd273f2dae78242675  gas/testsuite/gas/mips/jal-range.s
+9f76abe17eae5e832e3fe8e2561c3a7d  gas/testsuite/gas/mips/jal-svr4pic-noreorder.d
+69acea1a2f0dc70e2298bc9b1c22be97  gas/testsuite/gas/mips/jal-svr4pic-noreorder.s
+2413cb3ebf65878045559e3180a64294  gas/testsuite/gas/mips/jal-svr4pic.d
+496e5c986c5989166eba2d42de91dee3  gas/testsuite/gas/mips/jal-svr4pic.s
+19c8a1209668b1d8b7e9c2dfa5c41223  gas/testsuite/gas/mips/jal-xgot.d
+7d5f55558c4d32d5c46562b22e10b684  gas/testsuite/gas/mips/jal.d
+c91da61468610b71bd8209d11d782b4d  gas/testsuite/gas/mips/jal.s
+0ae9d1d0a0e98ce6040e3939b92a53f4  gas/testsuite/gas/mips/jalr.l
+d740c4cef36b7968eff6955682fafa5f  gas/testsuite/gas/mips/jalr.s
+eaf7641276b663bb8bd51fcb75da2fe8  gas/testsuite/gas/mips/jalr2.d
+e91e123d8da933f0d9cd44baa42fc6bd  gas/testsuite/gas/mips/jalr2.s
+8c9d1af49f7ec6b67cbf99241cab1562  gas/testsuite/gas/mips/l_d-forward-n32.d
+08d422b335a6625653d61fcdd41db149  gas/testsuite/gas/mips/l_d-forward-n64.d
+2764794e60779f3ce4f29e88e30db73a  gas/testsuite/gas/mips/l_d-forward.d
+32d75e50f2ff5ffc25d0779fb6f68cf4  gas/testsuite/gas/mips/l_d-n32.d
+d67ec836c157d20163fbef6a02e69aca  gas/testsuite/gas/mips/l_d-n64.d
+e4e995234f99d6f68349712c6239eaf6  gas/testsuite/gas/mips/l_d.d
+15356c60bcac6e156c5f629a88d92fe0  gas/testsuite/gas/mips/la-svr4pic.d
+45f6ffc8e167946c3e1d44a703cba0e4  gas/testsuite/gas/mips/la-xgot.d
+11e4734b84595954b767eba5d0bb1044  gas/testsuite/gas/mips/la.d
+f479612dc60112156a66a5292a60b205  gas/testsuite/gas/mips/la.s
+cf4d58f62d8c3f7a1bdbfd58ba6cc86b  gas/testsuite/gas/mips/lb-pic.s
+d80e8d1ab0a8aabb265cc4a63fb15a17  gas/testsuite/gas/mips/lb-svr4pic-ilocks.d
+28a1aeb5b798b08aeb8f41952783613e  gas/testsuite/gas/mips/lb-svr4pic.d
+f8212d08fb744582e87e55a54250a46a  gas/testsuite/gas/mips/lb-xgot-ilocks.d
+4226b46737391e95c5b2739382046806  gas/testsuite/gas/mips/lb-xgot.d
+07546687a8afde203d0e83551c213a67  gas/testsuite/gas/mips/lb.d
+e9d35a3d0cdd51294a858378d467574d  gas/testsuite/gas/mips/lb.s
+12bd768f81937939f2f0f8232a2f2dde  gas/testsuite/gas/mips/lca-svr4pic.d
+53cd33ce035fdad5cde09253c9ebb6f1  gas/testsuite/gas/mips/lca-xgot.d
+f23be7fae2a96c3284a681a8e2207752  gas/testsuite/gas/mips/lca.s
+fb73f8a70eb9198026905e3a82eaa01f  gas/testsuite/gas/mips/ld-forward-n32.d
+f46b2bf09beb7b80ddb70b6fbb330de2  gas/testsuite/gas/mips/ld-forward-n64.d
+ac95f8fe4efde5ed904cf5ae177ad821  gas/testsuite/gas/mips/ld-forward.d
+330347418e6fbfbf7884cf95bd5d5ad3  gas/testsuite/gas/mips/ld-n32.d
+c97bff2f3f821b2198610ff968b0acc6  gas/testsuite/gas/mips/ld-n64.d
+1040f7d178a2863a838e2a807fc50f06  gas/testsuite/gas/mips/ld-pic.s
+a48027431f0a603aa97ae1688b56e5ab  gas/testsuite/gas/mips/ld-svr4pic.d
+db420551b3b1124e47242a855b04a348  gas/testsuite/gas/mips/ld-xgot.d
+a5222f51b7aecf12f2e42c9a054293b5  gas/testsuite/gas/mips/ld.d
+c3339588aceb9f9f7f4650b3156b483f  gas/testsuite/gas/mips/ld.s
+002631a74bfdd358e1a48431b6723c1b  gas/testsuite/gas/mips/ldc1-forward-n32.d
+6e35231f7b1a142dec8920d9a346bf20  gas/testsuite/gas/mips/ldc1-forward-n64.d
+d7c7f14bdc9c4f05e823dd0cc196f77f  gas/testsuite/gas/mips/ldc1-forward.d
+71dfc20b34f768a82e9cea826d3648a2  gas/testsuite/gas/mips/ldc1-n32.d
+a98204b0290fe9ed6d5020e8b7219563  gas/testsuite/gas/mips/ldc1-n64.d
+667f9870ef9993dc224342147912693a  gas/testsuite/gas/mips/ldc1.d
+e3c5f4701fa5ef6da67ab162e0701906  gas/testsuite/gas/mips/ldstla-32-1.l
+e715607a1b2e59844473eea6a28b3b3d  gas/testsuite/gas/mips/ldstla-32-1.s
+8f6518564ee0f0b69553f9081bcd8787  gas/testsuite/gas/mips/ldstla-32-mips3-1.l
+bdfff1940f0efbe7e068b5611681b82d  gas/testsuite/gas/mips/ldstla-32-mips3-1.s
+a040703947672deddbb541a293c6b1a6  gas/testsuite/gas/mips/ldstla-32-mips3-shared.d
+db6df3bc2b3ec66f3b66337031f2f3ae  gas/testsuite/gas/mips/ldstla-32-mips3.d
+67cc1f7a7b4b84eaef6c85592ca0942f  gas/testsuite/gas/mips/ldstla-32-mips3.s
+94b885bbc3a86cc92e817d48cd7dceb1  gas/testsuite/gas/mips/ldstla-32-shared.d
+71ee7a5d7dd944b56243a89f9b283fa4  gas/testsuite/gas/mips/ldstla-32.d
+424e9e3a1c37af4b60498276e4e9af35  gas/testsuite/gas/mips/ldstla-32.s
+3d4151db916f1064692db92eb644cbd9  gas/testsuite/gas/mips/ldstla-eabi64.d
+6076b4210a9e688df8fd43c16e493ba2  gas/testsuite/gas/mips/ldstla-n64-shared.d
+3e0fa8e7e5fc151ea9fad9b2bf44c2ad  gas/testsuite/gas/mips/ldstla-n64-sym32.d
+eb30f1d704a4444b9000e819c618424c  gas/testsuite/gas/mips/ldstla-n64.d
+58dae8f6134587e036344a9428ce6586  gas/testsuite/gas/mips/ldstla-n64.s
+e17dbe468d298789464c46b6e6e39d27  gas/testsuite/gas/mips/ldstla-sym32.s
+a37c4b011335b468d1f281815cf5e52d  gas/testsuite/gas/mips/li.d
+04a3780fac2911246ce59f521b91f676  gas/testsuite/gas/mips/li.s
+d5d5aaf1d8ceef401619713a7b82ddde  gas/testsuite/gas/mips/lif-svr4pic.d
+f0a2320bdd6af639af27993f486030bb  gas/testsuite/gas/mips/lif-xgot.d
+a0ca08a8353d2c7bc90c3d3a90ba541c  gas/testsuite/gas/mips/lifloat.d
+50ee76bc3e007e2aea14b01a980091b3  gas/testsuite/gas/mips/lifloat.s
+ed5ce13048b0a45f36cbdc1fcc4d6c19  gas/testsuite/gas/mips/lineno.d
+431d0cb02d76e0cee8af0a855bf15842  gas/testsuite/gas/mips/lineno.s
+021781f724e40caa2371a8f4a3b95137  gas/testsuite/gas/mips/loc-swap-2.d
+f67255606d6ab4fcddc6043232a8fd47  gas/testsuite/gas/mips/loc-swap-2.s
+fd1c9aae935b5d7620cd4c158368f377  gas/testsuite/gas/mips/loc-swap-dis.d
+b33d162eb085ff16398b2519a6e2ad13  gas/testsuite/gas/mips/loc-swap.d
+fc0804db02b9b639ce307981c6c6ce6c  gas/testsuite/gas/mips/loc-swap.s
+2c05d6e0135964a7fb7bff8948ac903b  gas/testsuite/gas/mips/loongson-2e.d
+42be265f01c9dc06f443800d494c0a19  gas/testsuite/gas/mips/loongson-2e.s
+fe089e57a535f00057a2e44959161caf  gas/testsuite/gas/mips/loongson-2f-2.d
+6ed141db25596eecbb21f66874b72440  gas/testsuite/gas/mips/loongson-2f-2.s
+bd1b38ccfe2af5382f95cfce2f0f6c47  gas/testsuite/gas/mips/loongson-2f-3.d
+ed330c6efd79d4a20d7d0c8200d38553  gas/testsuite/gas/mips/loongson-2f-3.s
+c145fc3a2dd8a9f0eefb75f1c80a0488  gas/testsuite/gas/mips/loongson-2f.d
+68b6527ca799c669b744069b7f6167f5  gas/testsuite/gas/mips/loongson-2f.s
+39487ecfd545b9ba745744dfdf4dca3d  gas/testsuite/gas/mips/loongson-3a-2.d
+0ee2ea8a01c42a4d4983bf06eb550038  gas/testsuite/gas/mips/loongson-3a-2.s
+f6c2ac39c9eb72be1c2ad621c3c1a018  gas/testsuite/gas/mips/loongson-3a-3.d
+23f5fc04508fd01556b40bb66974a1c7  gas/testsuite/gas/mips/loongson-3a-3.s
+9f39f193a67802ac320336d4e3a7c2bb  gas/testsuite/gas/mips/loongson-3a.d
+2d2c9d3248200a829ed315a1dd054f40  gas/testsuite/gas/mips/loongson-3a.s
+d8456a592251a715d03edd92470bdf06  gas/testsuite/gas/mips/macro-warn-1-n32.d
+773413904dd1ddfa0cdbd72042dffa1b  gas/testsuite/gas/mips/macro-warn-1-n32.l
+6ee48c6e65d0c8a2f7cea8071bf5c975  gas/testsuite/gas/mips/macro-warn-1.d
+32fa865bbc5c3e7febd1e665068b87ea  gas/testsuite/gas/mips/macro-warn-1.l
+ab66485696c800a8416450e1b36f092a  gas/testsuite/gas/mips/macro-warn-1.s
+c92bb255d0a4b5117dbd3d089b3249fc  gas/testsuite/gas/mips/macro-warn-2-n32.d
+99db57727f1b9241274b974a6688e594  gas/testsuite/gas/mips/macro-warn-2.d
+db8744b3c40056b50c250f4b2787539f  gas/testsuite/gas/mips/macro-warn-2.l
+2709f4454ddc55c88beb2b5fc524755f  gas/testsuite/gas/mips/macro-warn-2.s
+0e2295f4991fc3534fec5e257cfb4042  gas/testsuite/gas/mips/macro-warn-3.d
+16da7d3602a7a6547d4f40c59a2eb5f2  gas/testsuite/gas/mips/macro-warn-3.l
+91289ab33e95282457567256ff70bcfb  gas/testsuite/gas/mips/macro-warn-3.s
+45701b0c9f7fc1cdf218c256905da73b  gas/testsuite/gas/mips/macro-warn-4.d
+e2242cb25647a83087c9035837475bf6  gas/testsuite/gas/mips/macro-warn-4.l
+1a6e68b5c63e3a7fd2c4f55e00b2f543  gas/testsuite/gas/mips/macro-warn-4.s
+bbaf9a8f8265bcdc0ec57be140e791d1  gas/testsuite/gas/mips/mcu.d
+eb476525339ed6d18e69d8f0a8424611  gas/testsuite/gas/mips/mcu.s
+776c309bbe8786388252a44182698677  gas/testsuite/gas/mips/micromips-branch-delay.d
+377b10f234f1bbce4377d5029bceef0c  gas/testsuite/gas/mips/micromips-branch-delay.l
+ccc65118c4fe4fbcc38a1e1a8f5273e6  gas/testsuite/gas/mips/micromips-branch-delay.s
+1e45b83d06ea9ed6ee869c6987bce7ad  gas/testsuite/gas/mips/micromips-branch-relax-pic.d
+a51b698ca9738c1f275bd0804348e950  gas/testsuite/gas/mips/micromips-branch-relax-pic.l
+57bebe5335f7848f68bf73fcbd31ae49  gas/testsuite/gas/mips/micromips-branch-relax.d
+12e064bba9afbff8e7c2093a9623b0b6  gas/testsuite/gas/mips/micromips-branch-relax.l
+98a90a338941b432557487fb9b2612c0  gas/testsuite/gas/mips/micromips-branch-relax.s
+780c2dd67f02a89039063c3367a1e649  gas/testsuite/gas/mips/micromips-size-0.l
+7f33c2a229d0a96f132f6ae0b100b632  gas/testsuite/gas/mips/micromips-size-0.s
+0b619e0246da809e172e62412814b433  gas/testsuite/gas/mips/micromips-size-1.d
+f22c488ff580284a425c2c86c3c3b797  gas/testsuite/gas/mips/micromips-size-1.l
+bfd14976773cf4d84b3d683279dbbb15  gas/testsuite/gas/mips/micromips-size-1.s
+02aa7d519682f03ee271d6c40bbcaa34  gas/testsuite/gas/mips/micromips-trap.d
+0d42022d80b06483539419398aa297a9  gas/testsuite/gas/mips/micromips.d
+7fa796a732cdaad43cb61cefd49b57bc  gas/testsuite/gas/mips/micromips.l
+6ba349895cda3a06a94523118edba070  gas/testsuite/gas/mips/micromips.s
+93dbbdea7f49971fe55c2ea6f5b10e06  gas/testsuite/gas/mips/micromips@abs.d
+bde3ec95a6eb673d6add604fce812e11  gas/testsuite/gas/mips/micromips@add.d
+94362b3d3f6ab04ee6a39d7ad2e774e0  gas/testsuite/gas/mips/micromips@alnv_ps-swap.d
+9d227311d301c41dc435667d23db692b  gas/testsuite/gas/mips/micromips@and.d
+4525247c28fbaa622195e1b724aae7d9  gas/testsuite/gas/mips/micromips@beq.d
+6f3d0a7696d191edfd0438170e3da4c3  gas/testsuite/gas/mips/micromips@bge.d
+e9cb030dd9cf179b6d0d0cc7f239e8b8  gas/testsuite/gas/mips/micromips@bgeu.d
+cca307c64e8710a57428cd3b0ee798d8  gas/testsuite/gas/mips/micromips@blt.d
+e6bb1bf5282d9ad3955bd46901d9f5bf  gas/testsuite/gas/mips/micromips@bltu.d
+149b089b2b937acde6928ba9f78c36d0  gas/testsuite/gas/mips/micromips@branch-likely.d
+78745b81ec52fb53c783a0908da70abd  gas/testsuite/gas/mips/micromips@branch-misc-1.d
+638e5e2bf1ba771296afb2fb5966c2e3  gas/testsuite/gas/mips/micromips@branch-misc-2-64.d
+d0a75d3ede5409809bfa636a011500dd  gas/testsuite/gas/mips/micromips@branch-misc-2.d
+46b95eedafacda78caf4fc84b97e6d2e  gas/testsuite/gas/mips/micromips@branch-misc-2pic-64.d
+c377558df8044fbe3d18bb74213a31d3  gas/testsuite/gas/mips/micromips@branch-misc-2pic.d
+7a16cc8f6cec020b40815f67cb65f8d4  gas/testsuite/gas/mips/micromips@branch-misc-4-64.d
+399294fbae619c7202f9ea840c46606e  gas/testsuite/gas/mips/micromips@branch-misc-4.d
+2c481ca5509f40efa33ddda4daad5a45  gas/testsuite/gas/mips/micromips@branch-self.d
+42fa7746c515b34b1247e6dcf7153252  gas/testsuite/gas/mips/micromips@cache.d
+adf3006245d838f2f3a18b55c9aa8a92  gas/testsuite/gas/mips/micromips@daddi.d
+6d81b59c5dfe3a2eacdc21cd14adafdb  gas/testsuite/gas/mips/micromips@dli.d
+d19b6b342b2549abfc0911cd8dd69f55  gas/testsuite/gas/mips/micromips@elf-jal.d
+926e4c7f24396ffed0e11bf8955761cd  gas/testsuite/gas/mips/micromips@elf-rel2.d
+18ac0da9e7433c2364887abc9ea3fdae  gas/testsuite/gas/mips/micromips@elf-rel4.d
+4a287489ab50b5fe99afe6ce4152e57c  gas/testsuite/gas/mips/micromips@elfel-rel2.d
+3e6195b177a70ae0bc181d911a09b03c  gas/testsuite/gas/mips/micromips@jal-mask-11.d
+e98a1cc4672ad58c154dde8a4622a55d  gas/testsuite/gas/mips/micromips@jal-mask-12.d
+ae39ffcb13472ac744b2ef316cd7be8f  gas/testsuite/gas/mips/micromips@jal-svr4pic-noreorder.d
+7813ea3aa3644a8719b62ad8d391fe6f  gas/testsuite/gas/mips/micromips@jal-svr4pic.d
+dffe5b53f35f0cb35bd502d6ad18cd56  gas/testsuite/gas/mips/micromips@lb-svr4pic-ilocks.d
+3c8ebc042a187303e43e3ed64d3218c3  gas/testsuite/gas/mips/micromips@li.d
+dd4d8a919e4df53674b6b7283b96a713  gas/testsuite/gas/mips/micromips@loc-swap-2.d
+401b0819f70dba35be2ce7c9b1f5f092  gas/testsuite/gas/mips/micromips@loc-swap-dis.d
+081d21c311c8ffa260639e48cdf38015  gas/testsuite/gas/mips/micromips@loc-swap.d
+f5916925a29572a759288446f129668f  gas/testsuite/gas/mips/micromips@mcu.d
+03b6a2facab8afb47537c16dffb2c233  gas/testsuite/gas/mips/micromips@mips1-fp.d
+969019e1ca47382f828354a3dc02ffd8  gas/testsuite/gas/mips/micromips@mips32-cp2.d
+9c9e963126258d4d73d1d9bc3df654b5  gas/testsuite/gas/mips/micromips@mips32-cp2.s
+8f201427eb39109c368b807f0e501a00  gas/testsuite/gas/mips/micromips@mips32-imm.d
+7a777c36c108509ea0d4480b70311159  gas/testsuite/gas/mips/micromips@mips32-imm.s
+a8c7eecbce04c426a00dd194517bb006  gas/testsuite/gas/mips/micromips@mips32-sf32.d
+bc2727ae46b6b19cf7ae1af2e49b4eb2  gas/testsuite/gas/mips/micromips@mips32.d
+582df2797966993d06d0081528b4b10e  gas/testsuite/gas/mips/micromips@mips32r2-cp2.d
+cf2e0f3efff2648195aff4c23997c2e7  gas/testsuite/gas/mips/micromips@mips32r2-cp2.s
+ac8a693b166a6acd4363a896625868ff  gas/testsuite/gas/mips/micromips@mips32r2-fp32.d
+f9e7abb8bd762c2545d34d05ec92f1e6  gas/testsuite/gas/mips/micromips@mips32r2-sync.d
+e7ac49c71c3b2c9f3dba106ddd2360b3  gas/testsuite/gas/mips/micromips@mips32r2.d
+a253d46098cbee8e928d856a35694b2d  gas/testsuite/gas/mips/micromips@mips4-branch-likely.d
+32418bdf8808aad7f44f6250ab1b7cb0  gas/testsuite/gas/mips/micromips@mips4-fp.d
+0bf951f61cd230a1efb45eb07554b926  gas/testsuite/gas/mips/micromips@mips4.d
+adbd1e26b3301dbbbb9bfe13452c0164  gas/testsuite/gas/mips/micromips@mips5-fp.d
+0603107bfbed6ca2f03bccd7a5fde0dc  gas/testsuite/gas/mips/micromips@mips64-cp2.d
+0301477066fe978986865714e775fe25  gas/testsuite/gas/mips/micromips@mips64-cp2.s
+6e85ce8da66e06aadea3327b1a332c5a  gas/testsuite/gas/mips/micromips@mips64.d
+10b3d5a070900cd286fa5243a5477c73  gas/testsuite/gas/mips/micromips@mips64r2.d
+368f104a2080700c9e53cd7d2c18f8d2  gas/testsuite/gas/mips/micromips@pref.d
+69ee1cd13c91d87df2f3bd5e480242db  gas/testsuite/gas/mips/micromips@relax-at.d
+4688c53aea531e25142b98978ee273ab  gas/testsuite/gas/mips/micromips@relax-swap3.d
+bb3799f80211cb38af512a71ef731a48  gas/testsuite/gas/mips/micromips@relax.d
+ba3129228b6551e19233f8c6e23d5b0e  gas/testsuite/gas/mips/micromips@rol-hw.d
+904cb0c3ee6f7d87e9d38ad61d08437f  gas/testsuite/gas/mips/micromips@uld2-eb.d
+f8c212937cc629e0420a53521cd0f31a  gas/testsuite/gas/mips/micromips@uld2-el.d
+7afe371c8a1cf116f658a973fb1302f5  gas/testsuite/gas/mips/micromips@ulh2-eb.d
+1e1bb9897da647388d57ac6f7f51c526  gas/testsuite/gas/mips/micromips@ulh2-el.d
+26b02e61544b76df2e336c755a44e61b  gas/testsuite/gas/mips/micromips@ulw2-eb-ilocks.d
+3eb6a45d16a7fff7b9822f6a77e17d4e  gas/testsuite/gas/mips/micromips@ulw2-el-ilocks.d
+f90e6665ee364e66764ad76ea38d581c  gas/testsuite/gas/mips/mips-abi32-pic.d
+3e79a0a6b17b839dbc4d121dd0bf0472  gas/testsuite/gas/mips/mips-abi32-pic.s
+364a5dc1665c4a2a2806f357e34ff35e  gas/testsuite/gas/mips/mips-abi32-pic2.d
+9a43c32af8a197c8734ea9e2fb371eb1  gas/testsuite/gas/mips/mips-abi32-pic2.s
+219f20a6f3faa15badcbf4b475d92b5c  gas/testsuite/gas/mips/mips-abi32.d
+310ea844ee3e8aced00ea6ee27db05f4  gas/testsuite/gas/mips/mips-abi32.s
+be138003a03404e351e849f06bf1350d  gas/testsuite/gas/mips/mips-double-float-flag.l
+914dd96309b8af020441a45bd3f7bba3  gas/testsuite/gas/mips/mips-double-float-flag.s
+501c37622a3a634443963259b0106b1a  gas/testsuite/gas/mips/mips-gp32-fp32-pic.d
+2b5da35909aae208e59ed71f01f84a00  gas/testsuite/gas/mips/mips-gp32-fp32-pic.s
+ef2849bfb75296b84e13354c7023031d  gas/testsuite/gas/mips/mips-gp32-fp32.d
+38402d7406992c005e3d22c792095906  gas/testsuite/gas/mips/mips-gp32-fp32.s
+caeac07dda2e3ba801d6a62e64ceca30  gas/testsuite/gas/mips/mips-gp32-fp64-pic.d
+6fec84d1a325308f963f9813d5a9df84  gas/testsuite/gas/mips/mips-gp32-fp64-pic.s
+efa5f771ebee275494762b5ca2973274  gas/testsuite/gas/mips/mips-gp32-fp64.d
+795b6fd35774d1b29cefb03bc8f1a04e  gas/testsuite/gas/mips/mips-gp32-fp64.l
+c8b1255a48810ecd5641efd78f9fac67  gas/testsuite/gas/mips/mips-gp32-fp64.s
+87f0e281b0daa59d0050d9130df7c545  gas/testsuite/gas/mips/mips-gp64-fp32-pic.d
+1e84a0631149baa9435b4334b7bcdf97  gas/testsuite/gas/mips/mips-gp64-fp32-pic.l
+2db2ff450b5afa36c19534edab7192b2  gas/testsuite/gas/mips/mips-gp64-fp32-pic.s
+0d651402a5fbbf29f2e52cb3f7cf8f30  gas/testsuite/gas/mips/mips-gp64-fp32.d
+1e6f61d7ae9ac182db762b0e4c8a9271  gas/testsuite/gas/mips/mips-gp64-fp32.l
+0c487b950f2e00c12c4f3bd2d2f597a1  gas/testsuite/gas/mips/mips-gp64-fp32.s
+12cec0f1bd9c11425f4eb5f7bdc5f311  gas/testsuite/gas/mips/mips-gp64-fp64-pic.d
+49eaf79b46ed3df73a7bd49dda0611ed  gas/testsuite/gas/mips/mips-gp64-fp64-pic.s
+79b5f54ad25f04362492f4cef9d315ff  gas/testsuite/gas/mips/mips-gp64-fp64.d
+e6be4d9ff36fe372a5b838c914461929  gas/testsuite/gas/mips/mips-gp64-fp64.l
+0bba7e49525b335ca7a88ea75cb22c73  gas/testsuite/gas/mips/mips-gp64-fp64.s
+fc0703d098b9243ea2771a15a530bc69  gas/testsuite/gas/mips/mips-hard-float-flag.l
+418ef1b98869ee9a5ddbffb48ec88ee6  gas/testsuite/gas/mips/mips-hard-float-flag.s
+75ae19684fdab50c7312caa074a3d93d  gas/testsuite/gas/mips/mips-jalx-2.d
+19c174e7163ffe6a72be560e026bd6b6  gas/testsuite/gas/mips/mips-jalx-2.s
+c0510bc1b6445ec158c3c85f37c19ee4  gas/testsuite/gas/mips/mips-jalx.d
+1f6a560c324971ac8573be14aacc528f  gas/testsuite/gas/mips/mips-jalx.s
+75f06a4cc8efae4d60c9582a87640c8d  gas/testsuite/gas/mips/mips-macro-ill-nofp.l
+cce840b0285e8acb86caa07b81590dfb  gas/testsuite/gas/mips/mips-macro-ill-nofp.s
+deb1c801ef639ed932140d2dba02b95b  gas/testsuite/gas/mips/mips-macro-ill-sfp.l
+066c4e7b6705e4be69dee6e1a61e6aa7  gas/testsuite/gas/mips/mips-macro-ill-sfp.s
+8e4e0c3501ebfef5679e4824e2e730a4  gas/testsuite/gas/mips/mips.exp
+9ebbe8ac1d038076975e33308084d08d  gas/testsuite/gas/mips/mips1-fp.d
+2867b7b4f1e06f673fff3b9f4c1d601e  gas/testsuite/gas/mips/mips1-fp.l
+670af8eb95b87df0e913a4ff9891a9c7  gas/testsuite/gas/mips/mips1-fp.s
+69fcac4647653e47e7cdb109987121cf  gas/testsuite/gas/mips/mips16-64.d
+1f16ab56eccaf7cc655d5642009788f0  gas/testsuite/gas/mips/mips16-dwarf2-n32.d
+d1849362896f01c1adf09da894f75c5f  gas/testsuite/gas/mips/mips16-dwarf2.d
+6b805809a6f9a5b4ff587982aeb3aa57  gas/testsuite/gas/mips/mips16-dwarf2.s
+3d5b6e3da111a5087aeb3b8f3ab690b9  gas/testsuite/gas/mips/mips16-e.d
+4785c49a602347865df48551df7121fc  gas/testsuite/gas/mips/mips16-e.s
+ab3e65486a24379a8ddcfe2ebcf3c1fe  gas/testsuite/gas/mips/mips16-f.d
+7146e7075936aa4a1434864cf7bf6d4e  gas/testsuite/gas/mips/mips16-f.s
+13d5e2e012ad1c97c3227b25539936d6  gas/testsuite/gas/mips/mips16-hilo-match.d
+b570359884087730d05a0aaa6c4644e9  gas/testsuite/gas/mips/mips16-hilo-match.s
+f9406b9f1a2f835edaf26bdf89dd4af5  gas/testsuite/gas/mips/mips16-hilo-n32.d
+67199cb41a90f4e6c33e930c6ac84ccc  gas/testsuite/gas/mips/mips16-hilo.d
+729ccfc0e7f073829ca7f69545469c93  gas/testsuite/gas/mips/mips16-hilo.s
+fdeee05b3addaea3355019b07fc7d8f0  gas/testsuite/gas/mips/mips16-intermix.d
+c2efc9d570972b526a9e277bae42879d  gas/testsuite/gas/mips/mips16-intermix.s
+c0332c4d7395b7941df1e9141cf038f0  gas/testsuite/gas/mips/mips16-jalx.d
+c6f91156b0d13de84854f1c20c862aba  gas/testsuite/gas/mips/mips16-jalx.s
+de7b9c119cbf71d0e12b6643fa5dd37d  gas/testsuite/gas/mips/mips16-vis-1.d
+e2dbdaf3493dfa5a0b7e02e4e0dcb73d  gas/testsuite/gas/mips/mips16-vis-1.s
+30869d85612d49b0966673de6178997c  gas/testsuite/gas/mips/mips16.d
+a686ad0a2da9fe043d717c57b4580d0b  gas/testsuite/gas/mips/mips16.s
+b70bff395055452842cfbfec8b4d9e73  gas/testsuite/gas/mips/mips16@loc-swap-2.d
+fa0e904c14899b96035b80f4fd1ef1f4  gas/testsuite/gas/mips/mips16@loc-swap-dis.d
+f8c23acbceb2f65308019737540696fd  gas/testsuite/gas/mips/mips16@loc-swap.d
+902f307654cca653204de6f67f79f23e  gas/testsuite/gas/mips/mips16@relax-swap3.d
+9ae52f2c47f989d6bc2170949e96e57d  gas/testsuite/gas/mips/mips16e-64.d
+5ad7162a1b6a7cbe775adf4c08063c55  gas/testsuite/gas/mips/mips16e-64.l
+30021283e31eada0b13da587af3bc4eb  gas/testsuite/gas/mips/mips16e-64.s
+d634740f3f4bc17bbf064a5317cb0260  gas/testsuite/gas/mips/mips16e-jrc.d
+ecce530f17dabb5411175579862663fc  gas/testsuite/gas/mips/mips16e-jrc.s
+9a512a5339561a764c8938f5947a90c0  gas/testsuite/gas/mips/mips16e-save.d
+9989e440758c83f4183c998e3f5840dc  gas/testsuite/gas/mips/mips16e-save.s
+8ca4a6199fde7381f7a42d398693af63  gas/testsuite/gas/mips/mips16e.d
+214b27ce6c50ab9b455cb925a9745678  gas/testsuite/gas/mips/mips16e.s
+e1e66a37e6e87b3e986eda3ad5b562a4  gas/testsuite/gas/mips/mips1@ecoff@sd-forward.d
+4bcf3140b90db3a0858a565055acc4e8  gas/testsuite/gas/mips/mips1@ecoff@sd.d
+823c8780c34e6454d4f01ae4e3ea6b6a  gas/testsuite/gas/mips/mips1@jal-svr4pic-noreorder.d
+2d77e7b8cb5805b8bfe19abd8653770c  gas/testsuite/gas/mips/mips1@jal-svr4pic.d
+1cb61742f13c0bec9dfde377d4980f2c  gas/testsuite/gas/mips/mips1@l_d-forward.d
+9e3917e2b60fee8993c2baf23c8b0383  gas/testsuite/gas/mips/mips1@l_d.d
+e1eab5230fb7366e300272d5b084b54f  gas/testsuite/gas/mips/mips1@ld-forward.d
+f9b6fc05c41b9086e807c3fbb033a9de  gas/testsuite/gas/mips/mips1@ld.d
+44b26dcb0f152b51a4bd37acfd78a133  gas/testsuite/gas/mips/mips1@s_d-forward.d
+7032c5e82001f1c7260d8314d034cd21  gas/testsuite/gas/mips/mips1@s_d.d
+ac95f8fe4efde5ed904cf5ae177ad821  gas/testsuite/gas/mips/mips2@ecoff@ld-forward.d
+ec50b9a1794608609e529cfdd4e5b558  gas/testsuite/gas/mips/mips2@ecoff@ld.d
+e1e66a37e6e87b3e986eda3ad5b562a4  gas/testsuite/gas/mips/mips2@ecoff@sd-forward.d
+4bcf3140b90db3a0858a565055acc4e8  gas/testsuite/gas/mips/mips2@ecoff@sd.d
+3ac8c01b5ac399868c084635f6d51e96  gas/testsuite/gas/mips/mips32-cp2.d
+cca58b2b00c7a04c1beca2a664d048d4  gas/testsuite/gas/mips/mips32-cp2.s
+b4bfc16b7383c950c323d556a3f2b526  gas/testsuite/gas/mips/mips32-dsp.d
+9b4d8c0efead7c0250b77d6432a28f15  gas/testsuite/gas/mips/mips32-dsp.s
+90a8ce11aeceb5e8ed29ab6eb6aeddb4  gas/testsuite/gas/mips/mips32-dspr2.d
+bfa27a2156914ea3ace07577e0dcd679  gas/testsuite/gas/mips/mips32-dspr2.s
+114de0ff23260d1eb1bde1fee20b1e71  gas/testsuite/gas/mips/mips32-imm.d
+66b2443546c844ceaf9f00c0d0ab4367  gas/testsuite/gas/mips/mips32-imm.s
+64a28f6acbb4d482836d6340973cfc82  gas/testsuite/gas/mips/mips32-mt.d
+ad88d7cd1ce33d00f4605c2f97d4cd40  gas/testsuite/gas/mips/mips32-mt.s
+2a527714d86f6fdcf069af2c9edbbefa  gas/testsuite/gas/mips/mips32-sf32.d
+fb0d10a030367ce4f9425c74cbe13ffa  gas/testsuite/gas/mips/mips32-sf32.l
+58f9d1e3083cdee930bedb837c1ae488  gas/testsuite/gas/mips/mips32-sf32.s
+e042203402e3536ca64300255432ca85  gas/testsuite/gas/mips/mips32-sync.d
+f977577efe12606bfb0d5034bec79e34  gas/testsuite/gas/mips/mips32-sync.s
+c9f638fb95ff4cc7f7538a49b22324f5  gas/testsuite/gas/mips/mips32.d
+72bfcc15bc68c0e0a52f26c776219335  gas/testsuite/gas/mips/mips32.s
+ac95f8fe4efde5ed904cf5ae177ad821  gas/testsuite/gas/mips/mips32@ecoff@ld-forward.d
+ec50b9a1794608609e529cfdd4e5b558  gas/testsuite/gas/mips/mips32@ecoff@ld.d
+e1e66a37e6e87b3e986eda3ad5b562a4  gas/testsuite/gas/mips/mips32@ecoff@sd-forward.d
+4bcf3140b90db3a0858a565055acc4e8  gas/testsuite/gas/mips/mips32@ecoff@sd.d
+be0eb533ebc0379d9c0babb2185c5f07  gas/testsuite/gas/mips/mips32r2-cp2.d
+43f63601c20612d60d43155640818766  gas/testsuite/gas/mips/mips32r2-cp2.s
+e3a8b21bb26ed5d1b4704477725bb733  gas/testsuite/gas/mips/mips32r2-fp32.d
+d8f9ae302cc28b03add0589217f0015e  gas/testsuite/gas/mips/mips32r2-fp32.l
+fac86714ad2220b1da5bb1a055f7cd8b  gas/testsuite/gas/mips/mips32r2-fp32.s
+d03f555bc073f0038562c3019d0327d6  gas/testsuite/gas/mips/mips32r2-ill-fp64.l
+59658e0b3428861ed4e4ef74205fcd95  gas/testsuite/gas/mips/mips32r2-ill-fp64.s
+d03f555bc073f0038562c3019d0327d6  gas/testsuite/gas/mips/mips32r2-ill-nofp.l
+e73cc5c25e6b3f2e531219ef62595785  gas/testsuite/gas/mips/mips32r2-ill-nofp.s
+4d93dbd622d7b77c4afb1a3e9aa1e5ef  gas/testsuite/gas/mips/mips32r2-ill.l
+e4bf167b7f52ae862811e7b158f205a8  gas/testsuite/gas/mips/mips32r2-ill.s
+6b9fc0eb0902f23169ed72569d9385bc  gas/testsuite/gas/mips/mips32r2-sync.d
+7978aa13d44bd672d20166d47c60bf3e  gas/testsuite/gas/mips/mips32r2-sync.s
+2078bac166b96d97257a938d09d130db  gas/testsuite/gas/mips/mips32r2.d
+c4126d70aba28fe3b9f82f581c71a6e8  gas/testsuite/gas/mips/mips32r2.s
+ac95f8fe4efde5ed904cf5ae177ad821  gas/testsuite/gas/mips/mips32r2@ecoff@ld-forward.d
+ec50b9a1794608609e529cfdd4e5b558  gas/testsuite/gas/mips/mips32r2@ecoff@ld.d
+e1e66a37e6e87b3e986eda3ad5b562a4  gas/testsuite/gas/mips/mips32r2@ecoff@sd-forward.d
+4bcf3140b90db3a0858a565055acc4e8  gas/testsuite/gas/mips/mips32r2@ecoff@sd.d
+9ccc3aa4ff6b2df17149fd1b5f23b389  gas/testsuite/gas/mips/mips4-branch-likely.d
+663815c07b7dc27f751e08e542959898  gas/testsuite/gas/mips/mips4-branch-likely.l
+4b23881c6c4acda288472e518f42f70c  gas/testsuite/gas/mips/mips4-branch-likely.s
+afef3707d4e51fe43a60afbc5bae9617  gas/testsuite/gas/mips/mips4-fp.d
+750ab0efe12f0b9439748323976430d8  gas/testsuite/gas/mips/mips4-fp.l
+53fdf5667fb95d6d2c5983663f1462b1  gas/testsuite/gas/mips/mips4-fp.s
+e474f9b093713dc5babf179126366635  gas/testsuite/gas/mips/mips4.d
+235d83eb54cc54bf8ff8672570adb2c9  gas/testsuite/gas/mips/mips4.s
+525b9feded73ef555e7eb94cd1459dcc  gas/testsuite/gas/mips/mips4010.d
+cd49d59fb8e9057e6313f5ff630015b9  gas/testsuite/gas/mips/mips4010.s
+e1387d3ba60454e12f2fd65e0dc8f0f1  gas/testsuite/gas/mips/mips4100.d
+f864a3faa585a344dde75972a70d1a52  gas/testsuite/gas/mips/mips4100.s
+3987ab6f2aea0552dd948c4dc75be6e4  gas/testsuite/gas/mips/mips4650.d
+5c10900661e0928e9a340c3c925418b1  gas/testsuite/gas/mips/mips4650.s
+f3d31954c8a976ee5879965c3c9604ec  gas/testsuite/gas/mips/mips5-fp.d
+63e8effa871782fd33ecc97d55a2feb2  gas/testsuite/gas/mips/mips5-fp.l
+0e532e8bc0d3c26c91d11ab05bc992a5  gas/testsuite/gas/mips/mips5-fp.s
+351dc5d23c29961553f599c529664d16  gas/testsuite/gas/mips/mips64-cp2.d
+e02ec9472963db2e6ce59b1c34ca245e  gas/testsuite/gas/mips/mips64-cp2.s
+134ae5f0901c0a21a3418223b3d6f4df  gas/testsuite/gas/mips/mips64-dsp.d
+191d27162763bdc3ed4f080cbdcac276  gas/testsuite/gas/mips/mips64-dsp.s
+560bcd3d2db7bc623eb910f984ed146e  gas/testsuite/gas/mips/mips64-mdmx.d
+1febffb6dc592c8a10b7237347f30aa2  gas/testsuite/gas/mips/mips64-mdmx.s
+9145d945fcd903fd77f64bff32cb959d  gas/testsuite/gas/mips/mips64-mips3d-incl.d
+6d0bc31fe00d5d9c9a4fd07e931d6d45  gas/testsuite/gas/mips/mips64-mips3d.d
+f2f60961d3a921f1e20c2d386e782f09  gas/testsuite/gas/mips/mips64-mips3d.l
+c2a456cf65796a255e1b157f0a487e58  gas/testsuite/gas/mips/mips64-mips3d.s
+38754ef857cb66d93893cd6097cd6c31  gas/testsuite/gas/mips/mips64.d
+9d99c971f911bc7cc0cbf3d35545271f  gas/testsuite/gas/mips/mips64.s
+786eb2843ed8ffe47e69bc81724f1c16  gas/testsuite/gas/mips/mips64r2-ill.l
+813b1f7f0ece03c4c2566ee2e85529b0  gas/testsuite/gas/mips/mips64r2-ill.s
+df92f25d4122d36c854f1f375992b9d3  gas/testsuite/gas/mips/mips64r2.d
+bb49ade11c2fd90af659940cd085b04c  gas/testsuite/gas/mips/mips64r2.s
+1fbc2503a07a256c660f271994dd8066  gas/testsuite/gas/mips/mipsel16-e.d
+b92a96c8cebc41672d627eb963464d34  gas/testsuite/gas/mips/mipsel16-f.d
+ef0171001ae8a851199eae2014924bcd  gas/testsuite/gas/mips/mul-ilocks.d
+da8dbb1647cec16e39fdbef014fdc323  gas/testsuite/gas/mips/mul.d
+03190409f6e3f76c2b66c8ab590d10bf  gas/testsuite/gas/mips/mul.s
+bf74a40c246451b61a011e5c879c7612  gas/testsuite/gas/mips/n32-consec.d
+fd247b9288db956e0a2713c9f23b1ce5  gas/testsuite/gas/mips/n32-consec.s
+7dfc6463d7e1cf9f73bfd449ab2b7863  gas/testsuite/gas/mips/noat-1.d
+7050bff7639ba21ec7e51b3895f2c6c7  gas/testsuite/gas/mips/noat-1.s
+95eca9454317755995388cb1dd49e2cf  gas/testsuite/gas/mips/noat-2.l
+b44500553d2ad422012f6078cc100bff  gas/testsuite/gas/mips/noat-2.s
+95eca9454317755995388cb1dd49e2cf  gas/testsuite/gas/mips/noat-3.l
+932b518a8c80d85b280867bba5dc9d4a  gas/testsuite/gas/mips/noat-3.s
+95eca9454317755995388cb1dd49e2cf  gas/testsuite/gas/mips/noat-4.l
+9a876de7280b37f5d9b43e00cb5b2894  gas/testsuite/gas/mips/noat-4.s
+95eca9454317755995388cb1dd49e2cf  gas/testsuite/gas/mips/noat-5.l
+357277a91ad103c38e71855307ea123f  gas/testsuite/gas/mips/noat-5.s
+95eca9454317755995388cb1dd49e2cf  gas/testsuite/gas/mips/noat-6.l
+9969f029155afc0cb5a1e48dbfc0c8ea  gas/testsuite/gas/mips/noat-6.s
+95eca9454317755995388cb1dd49e2cf  gas/testsuite/gas/mips/noat-7.l
+3a02483408099325a9be213dc97b067c  gas/testsuite/gas/mips/noat-7.s
+bc093d7454fb79cc787981a1fda8af1f  gas/testsuite/gas/mips/nodelay.d
+801d14a6810ebae1f5eefda4bac2a4d8  gas/testsuite/gas/mips/nop.s
+47276e7d0842efddcef6af9781e894a9  gas/testsuite/gas/mips/noreorder.d
+fb2bae7dc69d4fa8ef75ea2f12131cb2  gas/testsuite/gas/mips/noreorder.s
+7cb4a3257e850a426d21d4dd1bd4fc1f  gas/testsuite/gas/mips/octeon-ill.l
+f01de68f773c8c0971fec0c8e98bb471  gas/testsuite/gas/mips/octeon-ill.s
+111dd660b24d0af1c03ab82289a6f3a1  gas/testsuite/gas/mips/octeon-pref.d
+127ab9d3e2693f2274f177fa484154a9  gas/testsuite/gas/mips/octeon-pref.s
+a493491c607cfbf665501980826de438  gas/testsuite/gas/mips/octeon.d
+711a87dbbd5705dc78bb3582e4cbbb18  gas/testsuite/gas/mips/octeon.s
+b01faab0afc57debbb4b0fb3e5ec1e3c  gas/testsuite/gas/mips/octeon@mips32r2-sync.d
+5761aa099e32b2fb86dce98a61bf78fc  gas/testsuite/gas/mips/odd-float.d
+95ed2d0da0ad874beed09ec727b4e16b  gas/testsuite/gas/mips/odd-float.s
+244569e0b92ee735e76258141d2a39ff  gas/testsuite/gas/mips/perfcount.d
+5e216e3c77bb4c99c824b308a1617395  gas/testsuite/gas/mips/perfcount.s
+b6e40c562a931b741cd1282c2dc11d2e  gas/testsuite/gas/mips/pr12915.d
+377cb66597b8da088293a65340028f37  gas/testsuite/gas/mips/pr12915.s
+b981910e16055769981d610b35544eec  gas/testsuite/gas/mips/pref.d
+e1e66a37e6e87b3e986eda3ad5b562a4  gas/testsuite/gas/mips/r3000@ecoff@sd-forward.d
+4bcf3140b90db3a0858a565055acc4e8  gas/testsuite/gas/mips/r3000@ecoff@sd.d
+4ca43985c965ed9a9f0ce0ccf74b939f  gas/testsuite/gas/mips/r3000@jal-svr4pic-noreorder.d
+b513db2b66766dc702d2e90438349615  gas/testsuite/gas/mips/r3000@jal-svr4pic.d
+1cb61742f13c0bec9dfde377d4980f2c  gas/testsuite/gas/mips/r3000@l_d-forward.d
+99c2ff79deb5b659bfa390975f2e8393  gas/testsuite/gas/mips/r3000@l_d.d
+2e12b0aa44c03a5d09c97f9ae47df74a  gas/testsuite/gas/mips/r3000@ld-forward.d
+1695b23defb1235e47baf3c17b8d1d8a  gas/testsuite/gas/mips/r3000@ld.d
+44b26dcb0f152b51a4bd37acfd78a133  gas/testsuite/gas/mips/r3000@s_d-forward.d
+4db72c66fa1c2fd7c2af7f4a4f3e2c30  gas/testsuite/gas/mips/r3000@s_d.d
+ac95f8fe4efde5ed904cf5ae177ad821  gas/testsuite/gas/mips/r3900@ecoff@ld-forward.d
+ec50b9a1794608609e529cfdd4e5b558  gas/testsuite/gas/mips/r3900@ecoff@ld.d
+e1e66a37e6e87b3e986eda3ad5b562a4  gas/testsuite/gas/mips/r3900@ecoff@sd-forward.d
+4bcf3140b90db3a0858a565055acc4e8  gas/testsuite/gas/mips/r3900@ecoff@sd.d
+1cb61742f13c0bec9dfde377d4980f2c  gas/testsuite/gas/mips/r3900@l_d-forward.d
+99c2ff79deb5b659bfa390975f2e8393  gas/testsuite/gas/mips/r3900@l_d.d
+44b26dcb0f152b51a4bd37acfd78a133  gas/testsuite/gas/mips/r3900@s_d-forward.d
+4db72c66fa1c2fd7c2af7f4a4f3e2c30  gas/testsuite/gas/mips/r3900@s_d.d
+ceed4836c54a8bf404a1a3d82ce775e7  gas/testsuite/gas/mips/reginfo-1.s
+6c578da9ac01cb3cf02739c3188e7e68  gas/testsuite/gas/mips/reginfo-1a.d
+08bcb6aee0e0506c6cbd10ee558039bb  gas/testsuite/gas/mips/reginfo-1b.d
+b3f57ed00f3b069586a2d4030cffc62b  gas/testsuite/gas/mips/relax-at.d
+c6bcb1b90b7783e34a2a74e43b532d91  gas/testsuite/gas/mips/relax-bposge.l
+114ce5752bffc3cbf668d0883d90f0b2  gas/testsuite/gas/mips/relax-bposge.s
+f4857653176b13a84af6c6343d716c7c  gas/testsuite/gas/mips/relax-swap1-mips1.d
+412554087d305d51108b71c6fc71fae6  gas/testsuite/gas/mips/relax-swap1-mips2.d
+d12b6a49c8eb5ac8dd27fb70f2a1d7c9  gas/testsuite/gas/mips/relax-swap1.l
+ba43b08ac1e83497175b0e8b7a40e18a  gas/testsuite/gas/mips/relax-swap1.s
+17672430609ffd531e4dc027a286f25f  gas/testsuite/gas/mips/relax-swap2.d
+9fd39030ace0cd3480e0c983d878131e  gas/testsuite/gas/mips/relax-swap2.l
+ec1c525167ce7e482502efe31f330243  gas/testsuite/gas/mips/relax-swap2.s
+52161186d7a2a5a2cfce1daa4806e255  gas/testsuite/gas/mips/relax-swap3.d
+4a20cb5523b0ef23d4dc2a4bf918083e  gas/testsuite/gas/mips/relax-swap3.s
+70a72b5d24ef45bab4081623136ad4bb  gas/testsuite/gas/mips/relax.d
+5ac7ad74fdcc363065381dd52adc8e19  gas/testsuite/gas/mips/relax.l
+ef04f6b27acedf43f04f236dc405867f  gas/testsuite/gas/mips/relax.s
+1683fa4d4b6a696380beea3012ab1723  gas/testsuite/gas/mips/rm7000.d
+6e59f1b5da58f7015fa2c48d29c73445  gas/testsuite/gas/mips/rm7000.s
+d95ec21282d79a677dbbade498f21838  gas/testsuite/gas/mips/rol-hw.d
+209795675f9ba233ca89b305f6631b19  gas/testsuite/gas/mips/rol.d
+f5fc4c2b2064d692482dc6c04c4b64c7  gas/testsuite/gas/mips/rol.s
+5f65c9a166dc08f0527a93030918ae2d  gas/testsuite/gas/mips/rol64-hw.d
+a784263fc184c27bd9630f7b5ee7129d  gas/testsuite/gas/mips/rol64.d
+2b7d0f4345402303774e4fd6aa9acfd5  gas/testsuite/gas/mips/rol64.s
+5258ba7786086636397572fbaf57bdd2  gas/testsuite/gas/mips/s_d-forward-n32.d
+4919bbe9009cb11551fa61c7accb2679  gas/testsuite/gas/mips/s_d-forward-n64.d
+61d2b3e6baba6742f3a0c230e5aa78c0  gas/testsuite/gas/mips/s_d-forward.d
+0fe4f63b37df6dbabb3ac44d86361a54  gas/testsuite/gas/mips/s_d-n32.d
+794feaf65f6e45a55c5d41621a43cbc3  gas/testsuite/gas/mips/s_d-n64.d
+d2fbd774ca9c0d447c731fece36767a8  gas/testsuite/gas/mips/s_d.d
+3d26839ae55d7f0a445d21ce0c0a6ca8  gas/testsuite/gas/mips/sb.d
+15410af41b16b3678e11c8c7d4d6d7a7  gas/testsuite/gas/mips/sb.s
+be616c1178a3455eaa497791ecc9048a  gas/testsuite/gas/mips/sb1-ext-mdmx.d
+f803ea0e2f3ddc0f8ee9e48021fcdb97  gas/testsuite/gas/mips/sb1-ext-mdmx.s
+3805f0fb2ef9beb840e865a88acfaf29  gas/testsuite/gas/mips/sb1-ext-ps.d
+2614c94e549a3ad9a0a0aa2ea8a351bd  gas/testsuite/gas/mips/sb1-ext-ps.s
+dd4fb82bb446e6ee108b64752eeb0fe1  gas/testsuite/gas/mips/sd-forward-n32.d
+b2253aca46772d9bb27b28bdea9defae  gas/testsuite/gas/mips/sd-forward-n64.d
+e1e66a37e6e87b3e986eda3ad5b562a4  gas/testsuite/gas/mips/sd-forward.d
+fa7437542d4aef669710063a2926e92b  gas/testsuite/gas/mips/sd-n32.d
+87d71bc3fa496aee97088759d60903cf  gas/testsuite/gas/mips/sd-n64.d
+5880c6e94a3765d0b348b66d53ce341c  gas/testsuite/gas/mips/sd.d
+5672bc2ab0c07f19403beeb3efb7dbf2  gas/testsuite/gas/mips/sdc1-forward-n32.d
+d90262acbdb4dd25cfbbb0922f7d5541  gas/testsuite/gas/mips/sdc1-forward-n64.d
+5ae1786b22b9c5213e2828f89d469ed0  gas/testsuite/gas/mips/sdc1-forward.d
+c3c713a2f3fef70c4669aa33571d85d8  gas/testsuite/gas/mips/sdc1-n32.d
+969daae3ea1d02d9e213534bdc1700c0  gas/testsuite/gas/mips/sdc1-n64.d
+5966d368ce31b1011c90f4e187725813  gas/testsuite/gas/mips/sdc1.d
+61e0b7643c32dabdde089aadf8f77e83  gas/testsuite/gas/mips/set-arch.d
+9bd9d69167ebd4fd9f8479644f983776  gas/testsuite/gas/mips/set-arch.l
+99703d8a479f56f255c88de6b9e4aad5  gas/testsuite/gas/mips/set-arch.s
+07e4b7c46d6e7f1efa76f09aed05b729  gas/testsuite/gas/mips/smartmips.d
+6302eb2a242d1bc67c42ed4e285702f4  gas/testsuite/gas/mips/smartmips.s
+5c695a603e00085a7b10d1bba40797fc  gas/testsuite/gas/mips/sync.d
+ffcef95bbefaf3a59e62285fe39bda76  gas/testsuite/gas/mips/sync.s
+b4313e24f964607fe9300e864defaddc  gas/testsuite/gas/mips/tls-ill.l
+18b2a1f39231651953b79b9d00a78cc7  gas/testsuite/gas/mips/tls-ill.s
+9f54485c542c260c134cd55e3eaaa225  gas/testsuite/gas/mips/tls-o32.d
+63d081834c2f6458bb42a7cba5d64585  gas/testsuite/gas/mips/tls-o32.s
+b4b76f2a25aa887e2f997e5494bdc4ee  gas/testsuite/gas/mips/tmips16-e.d
+716d43b55d294bf024b0ff1ec6280187  gas/testsuite/gas/mips/tmips16-f.d
+a0de20c8d7285243fe357bed568d89cb  gas/testsuite/gas/mips/tmipsel16-e.d
+0afcc057897c5e8af6d8a1e7bea9785b  gas/testsuite/gas/mips/tmipsel16-f.d
+c6faf677ae575fdd8391967f98b55d74  gas/testsuite/gas/mips/trap20.d
+f7d1e998d2057f17dfa22040879794f5  gas/testsuite/gas/mips/trap20.s
+cab593c0de28116e5e1f095538ad94d2  gas/testsuite/gas/mips/trunc.d
+6206de0006f0d3b3552c2c4de6d4d40c  gas/testsuite/gas/mips/trunc.s
+2f5b7d1678cf1b6e1165a4b867e8dff9  gas/testsuite/gas/mips/uld.d
+4dfc3d5c85518711401b4a15122c6cea  gas/testsuite/gas/mips/uld.s
+9ce58dbafe045ce8413548e10bdb9463  gas/testsuite/gas/mips/uld2-eb.d
+99e062d0d9c5f975f916ea3b3a0661fc  gas/testsuite/gas/mips/uld2-el.d
+e28802806bd5ef68b52dd91e1920e9cd  gas/testsuite/gas/mips/uld2.s
+42668d2b953e17216dad9ff5b51a11b8  gas/testsuite/gas/mips/ulh-pic.s
+c35b62f79f0859a346aa71ff356d81f1  gas/testsuite/gas/mips/ulh-svr4pic.d
+71ad3063c1e7c793ed4ab3721bb8c010  gas/testsuite/gas/mips/ulh-xgot.d
+6b4a6661af69823228f094c7320aaaad  gas/testsuite/gas/mips/ulh.d
+d4c1e8e91b66176d0dd73baa903929d9  gas/testsuite/gas/mips/ulh.s
+09b2c179d09dcf2b7efe3a1bc1242d55  gas/testsuite/gas/mips/ulh2-eb.d
+96c237c1e09d8b1c26630c300f5544ae  gas/testsuite/gas/mips/ulh2-el.d
+1a9824601df339b12b2b6b333d9736e5  gas/testsuite/gas/mips/ulh2.s
+421b8bf53bb68929c956dd5dd46b1e87  gas/testsuite/gas/mips/ulw.d
+ed019962f9d9264d80ac0a3ec29faaf3  gas/testsuite/gas/mips/ulw.s
+114a410a05c97c0c8fe619c65636c92e  gas/testsuite/gas/mips/ulw2-eb-ilocks.d
+6ad67afaca99229225f074045961238d  gas/testsuite/gas/mips/ulw2-eb.d
+4c5dc6056ad1d321bc9c6e61e0e4a37f  gas/testsuite/gas/mips/ulw2-el-ilocks.d
+f7ea6b4feb2825b1d09522cb95ff16c9  gas/testsuite/gas/mips/ulw2-el.d
+912b64752da5c9169377e7a2cb776ab1  gas/testsuite/gas/mips/ulw2.s
+b199151899739fe3da4095dd802a0ace  gas/testsuite/gas/mips/usd.d
+c4f723634a0f69013515468922c55a04  gas/testsuite/gas/mips/usd.s
+fe1d1ac2ee009fc930cc33e7fffe4bc4  gas/testsuite/gas/mips/ush.d
+fa20601e0c404bd38a90edf5f43077bb  gas/testsuite/gas/mips/ush.s
+4e63b49d94ab23228fcb90c6349e8f39  gas/testsuite/gas/mips/usw.d
+59b429c3b2d1ea0daf2377204cbdfdca  gas/testsuite/gas/mips/usw.s
+3edd410a5aa5b9f5d758b1adc1f49fb9  gas/testsuite/gas/mips/vr4111.d
+30e841daffadd416efdc8d69e610f1c0  gas/testsuite/gas/mips/vr4111.s
+630a9c9515c3337805d3eeb106ffc5a2  gas/testsuite/gas/mips/vr4120-2.d
+5cb0c12ce626a0552294c07722d422ea  gas/testsuite/gas/mips/vr4120-2.s
+839e011f47b7731b49c02091ac9af98c  gas/testsuite/gas/mips/vr4120.d
+1e3c30fb569bbfc45123d1bd5e8fad0a  gas/testsuite/gas/mips/vr4120.s
+0ad5fb6419e64d84ea516918fa2dadb9  gas/testsuite/gas/mips/vr4130.d
+2891c907beff2e31797795d557c22731  gas/testsuite/gas/mips/vr4130.s
+ee28818ae758acdf2c080395529c25aa  gas/testsuite/gas/mips/vr5400.d
+786e24034bb7f726b0b9a2c655602ee4  gas/testsuite/gas/mips/vr5400.s
+609370d69163331ef4f43a6c87fd4dcb  gas/testsuite/gas/mips/vr5500.d
+288a96b264d206269b98bac834ca2eac  gas/testsuite/gas/mips/vr5500.s
+bd571532865b58cabf0532fd93b135d8  gas/testsuite/gas/mips/vxworks1-el.d
+7214aef9a23acc2ebca1e68761edc8e5  gas/testsuite/gas/mips/vxworks1-xgot-el.d
+3e2660b36dd36e1e9b6f89dc54f33109  gas/testsuite/gas/mips/vxworks1-xgot.d
+49d8ecc14ff63470df46a1a1a006e6a8  gas/testsuite/gas/mips/vxworks1.d
+c967b7a1e8670a369febcfcd753e2278  gas/testsuite/gas/mips/vxworks1.s
+6e9fe7b2712a73f0a416254ee174cb9e  gas/testsuite/gas/mips/xlr-ext.d
+1aa62a7471838fa8aa62563674ec1e31  gas/testsuite/gas/mips/xlr-ext.s
+128cd247dc9b5fc1e4095be0175c68b3  gas/testsuite/gas/mmix/1cjmp1b-n.d
+74c43d2897673eba56f848f3c9e582e9  gas/testsuite/gas/mmix/1cjmp1b-r.d
+82a7b6f8756a9c25cf63220f51d50894  gas/testsuite/gas/mmix/1cjmp1b.d
+89f0c4732be8764cdb492101c5e133fb  gas/testsuite/gas/mmix/1cjmp1b.l
+881ba3c8d1533c13a83890a3cf4e81ac  gas/testsuite/gas/mmix/1cjmp1b.s
+0c469f8d44281c440d85bce259e57c30  gas/testsuite/gas/mmix/1cjmp1brn.d
+2f9164da7cf8c6ebdfd5bcdc577e240d  gas/testsuite/gas/mmix/1hjmp1b.d
+66b71f9ca4e8ab891eceb33d8b70edea  gas/testsuite/gas/mmix/1hjmp1b.l
+1fdbcd1b5b2d1e8ac693bc3930a280ef  gas/testsuite/gas/mmix/1hjmp1b.s
+31f69a67b9b7e148d0d728174b9bafad  gas/testsuite/gas/mmix/align-1.d
+539e37c235abebf695117c2a7aac792b  gas/testsuite/gas/mmix/align-1.s
+3d4c45f5bc305c6a14f64435f7a9ae85  gas/testsuite/gas/mmix/basep-1.d
+9ff16f3fd803fbd6de4ec3c4fc1b91d5  gas/testsuite/gas/mmix/basep-1.s
+fd1e7e6eee81c3d8c509281af313b55e  gas/testsuite/gas/mmix/basep-10.d
+1ba8130d377a89330e9a2961035698d3  gas/testsuite/gas/mmix/basep-10.s
+7f349e2b425f77806eae81d24f051542  gas/testsuite/gas/mmix/basep-11.d
+9df5d5188edfe9b7ecdc684ffb4bbcc9  gas/testsuite/gas/mmix/basep-11.s
+c2b0896cf0de5c5865b3117e6e9a04ee  gas/testsuite/gas/mmix/basep-1b.d
+afc588fb075a882468e4c3298fa3d1e8  gas/testsuite/gas/mmix/basep-2.d
+41ee35510d8e57395b691de4dc61af2c  gas/testsuite/gas/mmix/basep-2.s
+df421621dc5559b5e55c1a0648273539  gas/testsuite/gas/mmix/basep-2b.d
+7157178c9b964e7bef9ba57fa4bb5ea0  gas/testsuite/gas/mmix/basep-3.d
+574cafac4ef562c1d5504795856b02c8  gas/testsuite/gas/mmix/basep-3.s
+2347f514fe5c947dbe8baa6623bb02fd  gas/testsuite/gas/mmix/basep-3b.d
+287b843c8f84ddac104ebad25e7f7b1a  gas/testsuite/gas/mmix/basep-4.d
+7796faaec560c84b3ef2e985ff22da9a  gas/testsuite/gas/mmix/basep-5.d
+fa2a52315eac56422ec4731ba486a318  gas/testsuite/gas/mmix/basep-6.d
+f2ed48da2536f27d417ee6dd44afe132  gas/testsuite/gas/mmix/basep-7.d
+f928a5ad8bf3feaf6e0012a112d43fb9  gas/testsuite/gas/mmix/basep-8.d
+05d195120b5515ee53b3684af0886c8f  gas/testsuite/gas/mmix/basep-8.s
+a868944a5fb6ba375aeb1ff7a162ada8  gas/testsuite/gas/mmix/basep-9.d
+a6c575e157fa1cc3b59fe0673bfdb774  gas/testsuite/gas/mmix/basep-9.s
+b2ccf513d3e172062ef36001bd19004b  gas/testsuite/gas/mmix/bspec-1.d
+3b3451908e6ec6497534ad8235de53ed  gas/testsuite/gas/mmix/bspec-1.s
+16f4ef3b0b253022999a04e9fe6cf611  gas/testsuite/gas/mmix/bspec-2.d
+f179d58461561c9d5fe4a315ba7279be  gas/testsuite/gas/mmix/bspec-2.s
+9f493737447c1fe99300fe898e942dac  gas/testsuite/gas/mmix/builtin1.d
+686fcfd029e0d7ae40eb9d1ebd2a555f  gas/testsuite/gas/mmix/builtin1.s
+6c65a8e088aecf2bb80cb6ace221eb80  gas/testsuite/gas/mmix/builtin2.d
+783e769408bbf34e0bf246ba16be1a10  gas/testsuite/gas/mmix/builtin3.d
+9c4981a2ff3306cbfd4a6350a0e2f201  gas/testsuite/gas/mmix/byte-1.d
+213a0515cb4eabca23e4b8085a9a1541  gas/testsuite/gas/mmix/byte-1.s
+02b986dd3dfa5073b6bbbaee237d17a0  gas/testsuite/gas/mmix/bz-c.d
+19eb7e29b6312fb84cd4b8369206e437  gas/testsuite/gas/mmix/bz-c.s
+5895af0967fa9047e444e0e99736f87d  gas/testsuite/gas/mmix/comment-1.d
+2b581d9ded37c949d0f9cd141cedde94  gas/testsuite/gas/mmix/comment-1.s
+4dadef05d27959743a4924d0f7f7924d  gas/testsuite/gas/mmix/comment-2.d
+d9246d1719c9b5d96f744ae8a5d335a0  gas/testsuite/gas/mmix/comment-2.s
+62ee5afe80f72260d3faadfd4639d5ff  gas/testsuite/gas/mmix/comment-3.d
+74e34ff3097862ae06dbfd8c742ef966  gas/testsuite/gas/mmix/comment-3.s
+e44938b0115eb4a01f1c6045416ff2a8  gas/testsuite/gas/mmix/cons-1.d
+0f36dac5b63ac65c4efae27fefd1a5b0  gas/testsuite/gas/mmix/cons-1.s
+68dc1c1251793e1f023eacb74d2d1aab  gas/testsuite/gas/mmix/cons-2.d
+818d889dd03c1058405e86e7843d6a6c  gas/testsuite/gas/mmix/cons-2.s
+ae68ba46ad3fd3d3b84e2caebb37e266  gas/testsuite/gas/mmix/err-bpo1.s
+1275b4e1c37d61021d17ce82415846ba  gas/testsuite/gas/mmix/err-bpo2.s
+5a8e1cadcb9e90eed7439e0a216627e2  gas/testsuite/gas/mmix/err-bpo3.s
+74b2268a44f4615c6644eeefe45fb86b  gas/testsuite/gas/mmix/err-bpo4.s
+8283e195bad143522dc6644924732ee1  gas/testsuite/gas/mmix/err-bpo5.s
+8fa6fbacee3649b1add139c544bed44d  gas/testsuite/gas/mmix/err-bpo6.s
+6316596656e1df8f51a8e6bdbcfeb5be  gas/testsuite/gas/mmix/err-bspec-1.s
+662ecee5325d52a264c4bb079d0a5fb4  gas/testsuite/gas/mmix/err-bspec-2.s
+fda06bc9042df00a4a79d696fc4f7c16  gas/testsuite/gas/mmix/err-bspec-3.s
+a651af237184e7463946f57a60d6be60  gas/testsuite/gas/mmix/err-bspec-4.s
+adc04c51cb3a3f504e288ee68f7debc7  gas/testsuite/gas/mmix/err-bspec-5.s
+b2f1d968f9de4a9e15a68e57335a2c24  gas/testsuite/gas/mmix/err-builtin.s
+f3cda197e002842b0c3ce05aa49d7fca  gas/testsuite/gas/mmix/err-byte1.s
+8539931858377bd48fe6cf3c2ca912d8  gas/testsuite/gas/mmix/err-byte2.s
+9d5e96de1ac7e0aaae3a4efdf6d78679  gas/testsuite/gas/mmix/err-case.s
+59c8d12a69e35db0f258ad6bc61b0f1f  gas/testsuite/gas/mmix/err-fb-1.s
+ac70409b365e20a8d76cd491151b1910  gas/testsuite/gas/mmix/err-greg1.s
+ba8862575d249330cf0798f6a1b4d001  gas/testsuite/gas/mmix/err-insn.s
+7a3d8d8405a5b30c635a3b477d625cb4  gas/testsuite/gas/mmix/err-is-1.s
+fdac5781e3da1a1ae49cac9fc82a9c5e  gas/testsuite/gas/mmix/err-loc-1.s
+c8d723f14ad9f6d4aa2a5e17d597a0bc  gas/testsuite/gas/mmix/err-loc-10.s
+549875cfbefa9e91ace5418b8c2e4685  gas/testsuite/gas/mmix/err-loc-2.s
+fae8e890f6ec60834383086e4512c99d  gas/testsuite/gas/mmix/err-loc-3.s
+e485810c615531746f6ed3e9bc68fbc7  gas/testsuite/gas/mmix/err-loc-4.s
+f0aebec806255dc6887a2874de66292b  gas/testsuite/gas/mmix/err-loc-5.s
+08b3644351e747e28015f9d078b3bbc2  gas/testsuite/gas/mmix/err-loc-6.s
+e66b98b1e174189295e48a180225ccaf  gas/testsuite/gas/mmix/err-loc-7.s
+fc1de659115cb734fbff9eab020ec4ae  gas/testsuite/gas/mmix/err-loc-8.s
+7f7691babb2bd47ef0a700eb700e51d5  gas/testsuite/gas/mmix/err-loc-9.s
+b148a5329404e262c827ea25df4a6152  gas/testsuite/gas/mmix/err-local1.s
+2f3e9b4550f4465d96e5483ae03be2e7  gas/testsuite/gas/mmix/err-local2.s
+4f1054a028c3a46a2d585d9e412ab7df  gas/testsuite/gas/mmix/err-ser-1.s
+0f418d2c4355113cc9dcd588493ef24f  gas/testsuite/gas/mmix/err-set.s
+8d1de4b18d36ebaffcc7ea7d6333b891  gas/testsuite/gas/mmix/err-swym1.s
+b107b4f8542a6d9d1c062c1c6421dc18  gas/testsuite/gas/mmix/expr-1.d
+ac2ab6118a2572de016beab5067f2b5a  gas/testsuite/gas/mmix/expr-1.s
+7698e6b9d14deb45266bb0ea05239c05  gas/testsuite/gas/mmix/fb-1.d
+bb7f46033941ffb2e1cc3877a0da5320  gas/testsuite/gas/mmix/fb-1.s
+1069e96f41887e614d981c612f1c7b7a  gas/testsuite/gas/mmix/fb-2.d
+4af0f1f0e1f787f3398b118b30868b8f  gas/testsuite/gas/mmix/fb-2.s
+3be4957a0437d6bce8245a8ab812aa37  gas/testsuite/gas/mmix/get-op-r.d
+e38f71e500ffcaf19723536468a223d6  gas/testsuite/gas/mmix/get-op.d
+b45d4ccee0f87bfba2e0f97d93789362  gas/testsuite/gas/mmix/get-op.l
+11e3fca7cf0cb9cbdc42277fc2eee4e6  gas/testsuite/gas/mmix/get-op.s
+0f58bfd23d1021aec899fc7d1ba314be  gas/testsuite/gas/mmix/geta-c.d
+6c55f79cc4e6ac3df0fbb2ce3b207431  gas/testsuite/gas/mmix/geta-c.s
+25e0b5f18f5465d009fec57744a869a4  gas/testsuite/gas/mmix/geta-op-r.d
+2fe216ed1abb558c66d43e1c16437aa5  gas/testsuite/gas/mmix/geta-op.d
+b657bbecda4773680389a4c4bd9b6902  gas/testsuite/gas/mmix/geta-op.l
+7c7f7a7f7171c12c7210fa2b8e80ccc5  gas/testsuite/gas/mmix/geta-op.s
+4221d993bd9f8353c290f497b488d372  gas/testsuite/gas/mmix/geta-opn.d
+0014085389ed74190a50d06229cac927  gas/testsuite/gas/mmix/geta-oprn.d
+1873fa761a9a364894a226fa79b74cdd  gas/testsuite/gas/mmix/greg1.d
+4dcdef09957ba93c577caa743a2c96ed  gas/testsuite/gas/mmix/greg1.s
+b59a6a7c02ac8c7c5efca4c3e68af2ec  gas/testsuite/gas/mmix/greg1a.d
+1873fa761a9a364894a226fa79b74cdd  gas/testsuite/gas/mmix/greg2.d
+650cd7ff2e361240741dad80b02caa44  gas/testsuite/gas/mmix/greg2.s
+13ba3aa7e3a9b720e3144e0e31688403  gas/testsuite/gas/mmix/greg2a.d
+66863b0cc43aaa3cdd1e0a7a4f5d7ebf  gas/testsuite/gas/mmix/greg3.d
+fbccd7f708d3c8019c9ea83addc1fe52  gas/testsuite/gas/mmix/greg3.s
+dcc3a1a5751220ab763ffa79d41d6e6f  gas/testsuite/gas/mmix/greg4.d
+cb7cc10a15aa6c6e59f1363ed8d9c289  gas/testsuite/gas/mmix/greg4.s
+f17175fc300e10669f8fe527ae44dfc0  gas/testsuite/gas/mmix/greg5.d
+c916fda34b8833bb842b3632f4f7f7d1  gas/testsuite/gas/mmix/greg5.s
+bf0ab68484f4dd0159b9a0d4c08d818f  gas/testsuite/gas/mmix/greg6.d
+5225ff7b64ac1f436e34063b599fc14b  gas/testsuite/gas/mmix/greg6.s
+2e13249dba8af8235b9098457a446bba  gas/testsuite/gas/mmix/greg7.d
+942dd6a809b486ff9d5fe222a392e858  gas/testsuite/gas/mmix/greg7.s
+45a8a180a1168cddd351fc14c1ae938e  gas/testsuite/gas/mmix/greg8.d
+4c2bdf546eec695fc77da75ea4ee00eb  gas/testsuite/gas/mmix/greg8.s
+10157ad0e4001dd9fa08a15848ab3b75  gas/testsuite/gas/mmix/greg9.d
+9a7a1d211583d6a01c010c74d7d6bc56  gas/testsuite/gas/mmix/greg9.s
+f75e30a43a1cf086fcb98936ddc8448d  gas/testsuite/gas/mmix/hex-r.d
+8c4fbc467f6b4539cd2cb9be8da3c582  gas/testsuite/gas/mmix/hex.d
+cd4e8dca887b719af2fb05753a02cc10  gas/testsuite/gas/mmix/hex.l
+18f0bccec0ea1ebbc96c0cc73f0b0d54  gas/testsuite/gas/mmix/hex.s
+ffef9d561521432621d7d3755077ddb1  gas/testsuite/gas/mmix/hex2.d
+5abe2a4e4b7f785802c6c1b4d23c5206  gas/testsuite/gas/mmix/hex2.s
+c06a1dff5b48b8064fd1bd062449e9ed  gas/testsuite/gas/mmix/is-1.d
+e4e256dd068fdf987f8acbdb99aa434f  gas/testsuite/gas/mmix/is-1.s
+98bbfda658e53f01fcb8ce24f14a4b72  gas/testsuite/gas/mmix/jmp-op-n.d
+0cad9077ab17ccf0569686e9df692e06  gas/testsuite/gas/mmix/jmp-op-r.d
+2ebb9cde592cebd83ee28e5f0f67fa1a  gas/testsuite/gas/mmix/jmp-op.d
+b393cff736e29e563b062f5ea5685b21  gas/testsuite/gas/mmix/jmp-op.l
+46c5951d3b2fc15eedc95ef05851280c  gas/testsuite/gas/mmix/jmp-op.s
+3259465258c4c0be7a905496dacf85bd  gas/testsuite/gas/mmix/jmp-oprn.d
+8896b95a48e891268d9ec6f5c2c6db2b  gas/testsuite/gas/mmix/jump-c.d
+a9884fc1a72db8aa308ec235f4e563bf  gas/testsuite/gas/mmix/jump-c.s
+bdf70a3557efcad03bd8cee4f05d0ef3  gas/testsuite/gas/mmix/list-in-n.d
+329782e004db82b64e4c10c64d7eb1c7  gas/testsuite/gas/mmix/list-in-r.d
+5e22741d4a07ac3c73798b525fa107dc  gas/testsuite/gas/mmix/list-in-rn.d
+2fe1ce272754ce0e6570de1acea60dda  gas/testsuite/gas/mmix/list-insns.d
+0c73a39e078a7740205f49c6c1d35d1e  gas/testsuite/gas/mmix/list-insns.l
+b9ffc6c91ccb57078a96ba9d4ca6ccb9  gas/testsuite/gas/mmix/list-insns.s
+336901c2592954e7b98195b2b0dc0af6  gas/testsuite/gas/mmix/list-pseudoints.l
+d3f1df27ab65809fcf90d66c9e1dca47  gas/testsuite/gas/mmix/list-pseudoints.s
+d3ba5e5a432a80e318dbbf7c1ffcaeba  gas/testsuite/gas/mmix/list-textfirst
+ea622b544f91c9cac4f4c0eccb074384  gas/testsuite/gas/mmix/list-textfirst.l
+cbb1d5ec86a35f9c9fb9a65cb509bbfb  gas/testsuite/gas/mmix/list-textfirst.s
+f3b3bc86c4b76d8c3bbee0ee678139eb  gas/testsuite/gas/mmix/loc-1.d
+63f7de75c9a5e51ff9ab0ad7fdb0b9f4  gas/testsuite/gas/mmix/loc-1.s
+1add4b42756c41e8fba548ab513e2dd5  gas/testsuite/gas/mmix/loc-2.d
+df7a8704912ff84da190cf6c74cde8bf  gas/testsuite/gas/mmix/loc-2.s
+337d5e73fc389f901c875ba1578f1961  gas/testsuite/gas/mmix/loc-3.d
+46d704c994c961cdf0e42ed4d102473f  gas/testsuite/gas/mmix/loc-3.s
+611bac92266b0f73088d10ad61ce5993  gas/testsuite/gas/mmix/loc-4.d
+c0be6d63230ab4cc233cb7639712a703  gas/testsuite/gas/mmix/loc-4.s
+a7a91321cf3a4b8030fada3cb782c89f  gas/testsuite/gas/mmix/loc-5.d
+a40ae1e12f135a531776202e96ca056c  gas/testsuite/gas/mmix/loc-5.s
+b0c0526e93df70f14736854c7a164206  gas/testsuite/gas/mmix/loc-6.d
+a012f6a9d738c51806bc9069c6ecc233  gas/testsuite/gas/mmix/loc-6.s
+ea0084c7135c97a97a7817cb2c434b00  gas/testsuite/gas/mmix/loc-7.d
+502e95ffb524e5c5d3a16b6fbf217eec  gas/testsuite/gas/mmix/loc-7.s
+6231c6e8b6d3ef4a6f029e4d901bb605  gas/testsuite/gas/mmix/local-1.d
+34c218e4cb651e644775be70e617677a  gas/testsuite/gas/mmix/local-1.s
+213cb0057034d949a2fce44fcb4fc6f5  gas/testsuite/gas/mmix/locall1.d
+06034183f0a150f972e5ae0729f907ed  gas/testsuite/gas/mmix/locall1.s
+ed4a9ed51e658c2c1d27a461a043501e  gas/testsuite/gas/mmix/mmix-err.exp
+b62d9cfb0d03ebcb0ff4649069792a81  gas/testsuite/gas/mmix/mmix-list.exp
+e3f4cb38a6356be19d3d6e53eac7959a  gas/testsuite/gas/mmix/mmix.exp
+441c50bf582f978db4380515d9918898  gas/testsuite/gas/mmix/odd-1.d
+2f7a35c2988104cc8ffc49e6b00f82a1  gas/testsuite/gas/mmix/odd-1.s
+bc215b49fb312e4642d2aeaa0ba2a87f  gas/testsuite/gas/mmix/op-0-1.d
+241721593347f7d44d9dad3757aa4208  gas/testsuite/gas/mmix/op-0-1.s
+962835a331b121a3b659bf2c199119e4  gas/testsuite/gas/mmix/op-0-1s.d
+d80eac57925f764b03531287d930d748  gas/testsuite/gas/mmix/op-0-2.d
+8974b44d390a07de5f2f06f48073d69f  gas/testsuite/gas/mmix/pop-op-r.d
+62ab5bcab4914622624e9df6a32563d9  gas/testsuite/gas/mmix/pop-op.d
+5a01a6f993695b312673cef6eff040f5  gas/testsuite/gas/mmix/pop-op.l
+5bed8bb92bcee70e3b7048f34f88abb8  gas/testsuite/gas/mmix/pop-op.s
+820396b2a50c73167dca87af0bd9bc42  gas/testsuite/gas/mmix/prefix1.d
+0e79466a08de17dab3a0e33a92e3fd71  gas/testsuite/gas/mmix/prefix1.s
+fdbf170ea94d3f39f6e336345f309992  gas/testsuite/gas/mmix/prefix2.d
+15ab43fbfcc930a1b55ddf5ef7479cbe  gas/testsuite/gas/mmix/prefix2.s
+2d8032487109e24b8140e4bef8d022a1  gas/testsuite/gas/mmix/prefix3.d
+8d09c63b0c427cdcd918872021f32ac5  gas/testsuite/gas/mmix/prefix3.s
+7a1f96374983984f58d50db393350e25  gas/testsuite/gas/mmix/pseudo-1.d
+79522ead0cb1ef910b010d2a11f5aa50  gas/testsuite/gas/mmix/pseudo-1.s
+dc644b1202b89dde4c55ad43b6918a08  gas/testsuite/gas/mmix/pushgo-op-r.d
+bd8593ef76058b289d20304526f35630  gas/testsuite/gas/mmix/pushgo-op.d
+69440a759f9bf3db92cef5d2b24cee49  gas/testsuite/gas/mmix/pushgo-op.l
+131b9ee7dd3d141c6952e6ac02988e1b  gas/testsuite/gas/mmix/pushgo-op.s
+e61f87906afcf2c1ebd413ded69362d3  gas/testsuite/gas/mmix/pushj-c.d
+2d9d62c614612030d82a5c36d3fb377d  gas/testsuite/gas/mmix/pushj-c.s
+a0c20764ef7e0b1ceb5b94bfe1bbceea  gas/testsuite/gas/mmix/pushj-cs.d
+fb4aae82df74f1b81679cb764bb2e597  gas/testsuite/gas/mmix/put-op-r.d
+a775433aabbc28f4de55ff967b901687  gas/testsuite/gas/mmix/put-op.d
+f92f56bf4cc05890b07040f5cfe025f2  gas/testsuite/gas/mmix/put-op.l
+018bb9b0e95057b4decb22f5c9feacf1  gas/testsuite/gas/mmix/put-op.s
+8f1f6562a9da6870378512529f91f48e  gas/testsuite/gas/mmix/reg-op-r.d
+f89d0ea15d7a2d1eab2840c7a9d49eaf  gas/testsuite/gas/mmix/reg-op.d
+582d2a7b84f54c5d54653cfbf1c0d3d1  gas/testsuite/gas/mmix/reg-op.l
+745990eee9776b12c4a897d6bc3c6d6e  gas/testsuite/gas/mmix/reg-op.s
+c8f2963976ac4f7ce95a3495cbe28015  gas/testsuite/gas/mmix/reg3-op-r.d
+e28cd26f439118017f4693c5c41863b1  gas/testsuite/gas/mmix/reg3-op.d
+cbfaf1d2c8ba3064c58bbf7574f04fa6  gas/testsuite/gas/mmix/reg3-op.l
+172f1341911863bdff4d2a6a239801a1  gas/testsuite/gas/mmix/reg3-op.s
+5b4ce8d1dd2320e060206a1a1ee3f852  gas/testsuite/gas/mmix/regt-op-r.d
+1acef71c452293140a6d5f7e97a87706  gas/testsuite/gas/mmix/regt-op.d
+0850ed03f3ffa8434f98d0d681229d11  gas/testsuite/gas/mmix/regt-op.l
+e302ca8bef6a6b0acf0334aaf0faf9ec  gas/testsuite/gas/mmix/regt-op.s
+e868589e4d591b2e298076f91c052340  gas/testsuite/gas/mmix/regx-op-r.d
+c977b2c8ccbac2c67faf49d13b23b655  gas/testsuite/gas/mmix/regx-op.d
+980378185cf82f1e38a36e783428455a  gas/testsuite/gas/mmix/regx-op.l
+90c16cb8a8af0c6a70adb99659f96766  gas/testsuite/gas/mmix/regx-op.s
+69a6e5487f3416bf43b2aa2278977e72  gas/testsuite/gas/mmix/regy-op-r.d
+8a395f5e533d5b4230a5144a41df4194  gas/testsuite/gas/mmix/regy-op.d
+0272aed229ff57d24aa8a7c0b3469543  gas/testsuite/gas/mmix/regy-op.l
+2507661cd901f97d1609ff4d932eb789  gas/testsuite/gas/mmix/regy-op.s
+5a29d8701884532f845385ba34eab024  gas/testsuite/gas/mmix/relax1-n.d
+d1c04da647167a2cfc16623ad19e9ddc  gas/testsuite/gas/mmix/relax1-r.d
+57169c96a3bee990d8e03003644ac129  gas/testsuite/gas/mmix/relax1-rn.d
+d29b5176b1a13ddd482cc59101e9e9c3  gas/testsuite/gas/mmix/relax1.d
+38ac570097c9cdda8d8eecaf04092601  gas/testsuite/gas/mmix/relax1.l
+587232b031ce2501a918dc361c8406e1  gas/testsuite/gas/mmix/relax1.s
+448d4c29937e946865b434f0f5efd21d  gas/testsuite/gas/mmix/relax2.d
+417ae7c1e0d143bfd2163eb33f2e5d0e  gas/testsuite/gas/mmix/relax2.s
+d65f74eb228073ca8269c2ae8efc41b4  gas/testsuite/gas/mmix/reloc16-n.d
+0e68f5aeb91077a2ef1f0a5482675db6  gas/testsuite/gas/mmix/reloc16-r.d
+863f07fe1c4e926ae8bd783966f4311b  gas/testsuite/gas/mmix/reloc16.d
+75561a53cf10f62341b7ca23fba9a7cc  gas/testsuite/gas/mmix/reloc16.l
+51355d73d525e07d1956c845b71481c9  gas/testsuite/gas/mmix/reloc16.s
+b436025a6918a74cf9ca753e04ad72ca  gas/testsuite/gas/mmix/reloc8-r.d
+88ab983d053a9aff9ec04afa37b23c05  gas/testsuite/gas/mmix/reloc8.d
+989a380fe8b838e5c80a53908e40971d  gas/testsuite/gas/mmix/reloc8.l
+b74d47dfcb362faa2f510011378cca7c  gas/testsuite/gas/mmix/reloc8.s
+4884296463db88343efd6f8a54838429  gas/testsuite/gas/mmix/relocl-n.d
+a876c35b97351eb3d69074dde61e08b5  gas/testsuite/gas/mmix/reloclab-r.d
+83e613f897714a4c8531742f7e350d87  gas/testsuite/gas/mmix/reloclab-rs.d
+088218002fb1ecb82172820dd678e1af  gas/testsuite/gas/mmix/reloclab-s.d
+d5539f113c067f66a439de11e059f532  gas/testsuite/gas/mmix/reloclab.d
+966ca1ba7f8f17bee81c63682a596aa5  gas/testsuite/gas/mmix/reloclab.l
+f4c3a919a430c75cb8be68f5cd7c3fc3  gas/testsuite/gas/mmix/reloclab.s
+173d401cb28062237e5b1560e4600f02  gas/testsuite/gas/mmix/reloclrn.d
+1d9a899c4d72757bf6b0b9b6a71f1044  gas/testsuite/gas/mmix/relocxrn.d
+10449c3a7fd6cc8d0594c9e6f8f5521a  gas/testsuite/gas/mmix/resume-op-r.d
+9a0517a889e73842824013ab2d618f69  gas/testsuite/gas/mmix/resume-op.d
+c97820027f0575acea8ed1087337b7d8  gas/testsuite/gas/mmix/resume-op.l
+cfcbf81639741ae8db615671a48cde7d  gas/testsuite/gas/mmix/resume-op.s
+56f09db3c3a16b368d12a64ed52f10d5  gas/testsuite/gas/mmix/round2-op-r.d
+f44e6dfcdba0773b16440711f17ef80b  gas/testsuite/gas/mmix/round2-op.d
+1aef9aa7620ec2177d66895af5488615  gas/testsuite/gas/mmix/round2-op.l
+30d227deb194d05c613d9f4b26a9a3f3  gas/testsuite/gas/mmix/round2-op.s
+02af45b86e2f31a0b42e0a74bc9c8055  gas/testsuite/gas/mmix/roundi-op-r.d
+85d7513fec13879d3cc3fa4c962c7fc3  gas/testsuite/gas/mmix/roundi-op.d
+2badf0c4966760eb25394dc6c58357cc  gas/testsuite/gas/mmix/roundi-op.l
+161db8f66e10dc2b57c677be95904a77  gas/testsuite/gas/mmix/roundi-op.s
+002d7c47d1e264de3378e4b672234fc1  gas/testsuite/gas/mmix/roundr-op-r.d
+674ded804328a5865b1a8dcea25b4dc7  gas/testsuite/gas/mmix/roundr-op.d
+04d09bbbab585fdb54c69b919576bde4  gas/testsuite/gas/mmix/roundr-op.l
+d166315a18bdcd867def21596f0e6bf2  gas/testsuite/gas/mmix/roundr-op.s
+4bd440c1a61accbe310ffa5861d020d0  gas/testsuite/gas/mmix/save-op-r.d
+9a299ee55c14d36ac1e13fd7e21b7b5b  gas/testsuite/gas/mmix/save-op.d
+78c603b16a7e5be2c1ebdbccc0d9a1fb  gas/testsuite/gas/mmix/save-op.l
+999db326e26e668c1ba94d31d55ccee4  gas/testsuite/gas/mmix/save-op.s
+0fdb19b2dc462b298af175eb285d2898  gas/testsuite/gas/mmix/set-r.d
+7c171ada0e52fa57483a77bdcbfd1125  gas/testsuite/gas/mmix/set.d
+8dff7be7e45d5eb791c4b5e27264cd34  gas/testsuite/gas/mmix/set.l
+11f3a945d2d4e214bf4888fdd5c6b56b  gas/testsuite/gas/mmix/set.s
+a8c21be21f3bced6a45be5d01a88f780  gas/testsuite/gas/mmix/swym-op-r.d
+bc60c7fcffe92acf0775a1f4304bee64  gas/testsuite/gas/mmix/swym-op.d
+7612ba4cbb41c0bb297608198b8475f6  gas/testsuite/gas/mmix/swym-op.l
+c266e0350f0a98e0f59ddf449a51bb63  gas/testsuite/gas/mmix/swym-op.s
+b99245530dc2e11af83c3aad154c3ead  gas/testsuite/gas/mmix/swym-opreg1.d
+84a56d4349b75f1311b85c3a6974d28c  gas/testsuite/gas/mmix/swym-opreg1.s
+afb30c789d4c23ed647e32277051cac6  gas/testsuite/gas/mmix/swym-opreg2.d
+98350e39352e863aa7c97decb3af66d9  gas/testsuite/gas/mmix/swym-opreg2.s
+69082e0d2ad1c1f54cb86d6892cb63d6  gas/testsuite/gas/mmix/sym-1.d
+0ffe574581a6090acc3369be14ded4d4  gas/testsuite/gas/mmix/sym-1.s
+098846e2a99f9013d95ef10e6ec50839  gas/testsuite/gas/mmix/sync-op-r.d
+040bd52ba089ab30f6291e9d3c4e278d  gas/testsuite/gas/mmix/sync-op.d
+e93db32d7d2c78650597fd5ed2ad7b6d  gas/testsuite/gas/mmix/sync-op.l
+c79a98acc47d182f9630727f61ca34f3  gas/testsuite/gas/mmix/sync-op.s
+0ed09fdc04112dbc6311ad68a08c0c5f  gas/testsuite/gas/mmix/two-op-r.d
+406103963689254a6b360a5f1a449d6e  gas/testsuite/gas/mmix/two-op.d
+ca6a23d92e67c5494c7b63f332b05226  gas/testsuite/gas/mmix/two-op.l
+434868110d14ace5244b3ae9dfc75a5d  gas/testsuite/gas/mmix/two-op.s
+5e004b78b5149d38f3c432b9ae264238  gas/testsuite/gas/mmix/unsave-op-r.d
+91dbac2579bdc75ab5d604fa49c278f0  gas/testsuite/gas/mmix/unsave-op.d
+5b91809e619a66d9cee34dd2280bfaee  gas/testsuite/gas/mmix/unsave-op.l
+f5d6823ab550c4ea97a04f14883a0c0d  gas/testsuite/gas/mmix/unsave-op.s
+7030c201bb92111a1da35bc8b48c84d1  gas/testsuite/gas/mmix/weak1-s.d
+7124dcb9a6f4203ee9433df1cccbc17e  gas/testsuite/gas/mmix/weak1.d
+64ee02ee7066364e0eadac9c2c9508d6  gas/testsuite/gas/mmix/weak1.s
+126c93f26971e35435da3ff524100936  gas/testsuite/gas/mmix/zerop-1.d
+f2a213b73ea27ef622ba39f9ec2987ec  gas/testsuite/gas/mmix/zerop-1.s
+c58581edb3ac95b306f040bbc2c16678  gas/testsuite/gas/mn10200/add.s
+5acee31afe42e7665198639d3ec8a999  gas/testsuite/gas/mn10200/basic.exp
+9411b8190fac3aad748696ea30bba5b0  gas/testsuite/gas/mn10200/bcc.s
+efa2232339233fab01e2fe7ca6c2f3cf  gas/testsuite/gas/mn10200/bccx.s
+aabf4d8010190b4ebadb4d4dce938282  gas/testsuite/gas/mn10200/bit.s
+3f51363ea969316f726dc5529904888e  gas/testsuite/gas/mn10200/cmp.s
+874b6bc0f155eecbaffecb93a5642416  gas/testsuite/gas/mn10200/ext.s
+b117e36f812c2eb416156d441f26185e  gas/testsuite/gas/mn10200/logical.s
+ea8599975d89b01f9aaba3b664947565  gas/testsuite/gas/mn10200/mov1.s
+3386b14210f3cd873dde20c6166162c6  gas/testsuite/gas/mn10200/mov2.s
+a0b70b1cc9ec5e2783428dcc483ee86d  gas/testsuite/gas/mn10200/mov3.s
+6e62837e492b9688e29de9625549b402  gas/testsuite/gas/mn10200/mov4.s
+e37e1b13a06659d005a650675dcf3935  gas/testsuite/gas/mn10200/movb.s
+f6ce44141165b449c3cb51ebe486e98e  gas/testsuite/gas/mn10200/movbu.s
+32dfde7ae5c5361c03c746481b7aee8d  gas/testsuite/gas/mn10200/movx.s
+1ff17a9ade34cc243a67f4e5afb1873e  gas/testsuite/gas/mn10200/muldiv.s
+723c642cba806a6ce6dda8c3881ef233  gas/testsuite/gas/mn10200/other.s
+21b9f1644f5a62fdc603b218708648f3  gas/testsuite/gas/mn10200/shift.s
+7ac2864fac53b6b778c4aba3efb1a2e1  gas/testsuite/gas/mn10200/sub.s
+02ba050389aba06e510285db97af882b  gas/testsuite/gas/mn10300/add.s
+5eef807cd489dde2f30b1632fd6afbfe  gas/testsuite/gas/mn10300/am33-2.c
+07dafb504919d0d5fa6316d1dd0340b5  gas/testsuite/gas/mn10300/am33-2.d
+57ded92cab96f53eab4d7545c5da40f4  gas/testsuite/gas/mn10300/am33-2.s
+3bb44c38f4fbab75c570123d255c57f8  gas/testsuite/gas/mn10300/am33.s
+3c5d635c4e529ba743b2062006ab8a00  gas/testsuite/gas/mn10300/am33_2.s
+dfe221c89fe65738a2360f231c2b6794  gas/testsuite/gas/mn10300/am33_3.s
+593bbef9992d2f23b91f4ea176b28957  gas/testsuite/gas/mn10300/am33_4.s
+62ae8325beee2a8180a39e125355ba2b  gas/testsuite/gas/mn10300/am33_5.s
+90dcb58c5eb364963271d465adac73ef  gas/testsuite/gas/mn10300/am33_6.s
+ae77079066eabaa0cc3b0db53f95500b  gas/testsuite/gas/mn10300/am33_7.s
+631a649907d27d317cee70928c6c27fc  gas/testsuite/gas/mn10300/am33_8.s
+58a3b61a4e5b2332b7ccfc3345aeaca7  gas/testsuite/gas/mn10300/basic.exp
+9411b8190fac3aad748696ea30bba5b0  gas/testsuite/gas/mn10300/bcc.s
+b15e3790182c7ba25b21a4185f2a55e6  gas/testsuite/gas/mn10300/bit.s
+647a9c89d56b470cb3fef7839a32834d  gas/testsuite/gas/mn10300/cmp.s
+3828018d3809076328223d9d3c1e48c5  gas/testsuite/gas/mn10300/ext.s
+f6db4622ff4a88bc9ebf44aec56bc245  gas/testsuite/gas/mn10300/extend.s
+f2b5260884e40bc35f8694403da505f8  gas/testsuite/gas/mn10300/logical.s
+d3d15560536638ff0e38a1cd6bea678a  gas/testsuite/gas/mn10300/loop.s
+e554261a6559698fe2722b841dd1b5e3  gas/testsuite/gas/mn10300/mov1.s
+1453d74ea0d60c24e054f9443aa26fe4  gas/testsuite/gas/mn10300/mov2.s
+8d091f8bc50686881c4104f6dc9b6ab7  gas/testsuite/gas/mn10300/mov3.s
+e5df57ebcca23c27b6c2399780e9a146  gas/testsuite/gas/mn10300/mov4.s
+93c07b147a466794f87711cdcf29260b  gas/testsuite/gas/mn10300/mov5.s
+384122880cfa3e6fa4a8b08c350c62a8  gas/testsuite/gas/mn10300/movbu.s
+075a3ba2756f3cf09ac1926492ccf614  gas/testsuite/gas/mn10300/movhu.s
+155d5bd225998f0bf8a65d543230adc5  gas/testsuite/gas/mn10300/movm.s
+c5809213cfc952d8ef5a1ba5dc19ac45  gas/testsuite/gas/mn10300/movpc.l
+5ecbbe391a24afd44dd2bcb121f73a34  gas/testsuite/gas/mn10300/movpc.s
+aa222b2f903cde208e2be8c3972e3c8a  gas/testsuite/gas/mn10300/muldiv.s
+9cbe29313848966be970cdecdc09e7b2  gas/testsuite/gas/mn10300/other.s
+dfc3d45f9e6158dc60df0f11f0a5fcd8  gas/testsuite/gas/mn10300/pr11973.d
+652b95875e861a99061ca410b572e2d4  gas/testsuite/gas/mn10300/pr11973.s
+84f424dbb966962121e979865351bc32  gas/testsuite/gas/mn10300/pr997.l
+6d91b72c1022fe9177282cbf4177a861  gas/testsuite/gas/mn10300/pr997.s
+6fbf563cb5f0417f1854771c757bcc2d  gas/testsuite/gas/mn10300/relax.d
+db8f508c818806185ed645d0f3cc9b2d  gas/testsuite/gas/mn10300/relax.s
+293fa500fcb2e85940176a545801b046  gas/testsuite/gas/mn10300/shift.s
+ed9edfd6a0eea176f6974376bd321b10  gas/testsuite/gas/mn10300/sub.s
+961a51d51720b650cb383a6aa510d4d9  gas/testsuite/gas/mn10300/udf.s
+5ffc5b9af8cd82e8ff721a39d583a9cb  gas/testsuite/gas/mri/char.d
+016f8a629209b7d7313c4a4e3c37c909  gas/testsuite/gas/mri/char.s
+4b259d611c94c789b73572d5b0863a5b  gas/testsuite/gas/mri/comment.d
+84c565776c727a1f5986b5d8d39ba13e  gas/testsuite/gas/mri/comment.s
+aca62962ea755bbc1aaeb56b32c53974  gas/testsuite/gas/mri/common.d
+7b6bfc157de809b518bb8820f293f78c  gas/testsuite/gas/mri/common.s
+c3db4a831aaf5f148abfde517fff14f2  gas/testsuite/gas/mri/constants.d
+df9ad2212b59618793c7080d043c14e4  gas/testsuite/gas/mri/constants.s
+2258c0445fb6b2005828c77b96c0520a  gas/testsuite/gas/mri/empty.s
+78ea402a49a07c1a325a03a28be37678  gas/testsuite/gas/mri/equ.d
+83843a1d515852848a6fc1054a984792  gas/testsuite/gas/mri/equ.s
+ceec8399c07b39bee0a4ea07eece6d2f  gas/testsuite/gas/mri/expr.d
+21255a47a57f7e00246072b10af9b641  gas/testsuite/gas/mri/expr.s
+bc4dc43acfdddf49f994908c7e26abe6  gas/testsuite/gas/mri/float.d
+4f7756364607bd924587f3689b8b16b7  gas/testsuite/gas/mri/float.s
+913e1698712694951d89ee24192adc91  gas/testsuite/gas/mri/for.d
+70d33f74b91d862f9f9b6c4dd173ce58  gas/testsuite/gas/mri/for.s
+ca4307ea874afdb8a107b9d4c044ce26  gas/testsuite/gas/mri/if.d
+ba2ce35b0663f91570cc0725695f2f0f  gas/testsuite/gas/mri/if.s
+4b03ed946465a72d469e2aeff2ddd6f5  gas/testsuite/gas/mri/immconst.d
+f1f5c0c93c39409b9a82cf956d42e39e  gas/testsuite/gas/mri/label.d
+ed17ca77ec65b8492a436ad06a222487  gas/testsuite/gas/mri/label.s
+0a83209c98b7595f7f0746456efa0243  gas/testsuite/gas/mri/moveml.d
+4e57586c117d02856b0a1e2fe1e199cb  gas/testsuite/gas/mri/moveml.s
+18b692b0e34dbcf4e04942615cd0d9f0  gas/testsuite/gas/mri/mri.exp
+8efb23fdda5c25b88340a543cfeac30f  gas/testsuite/gas/mri/repeat.d
+1684df3330c24639ae41d526858b2a80  gas/testsuite/gas/mri/repeat.s
+67ebccbf76d5002534361af491abfddf  gas/testsuite/gas/mri/semi.d
+da1cdabe1af1adb9735d5d609dccca32  gas/testsuite/gas/mri/semi.s
+f1f4f19cd59ca00cd8ba1bac7a168d5f  gas/testsuite/gas/mri/while.d
+cdd1ad74d4bb0147f32931b83c7383be  gas/testsuite/gas/mri/while.s
+3f1f7f6d07db2c788e7151606795585a  gas/testsuite/gas/msp430/msp430.exp
+9bf928c45624dccd08f6738ba89d135e  gas/testsuite/gas/msp430/opcode.d
+7aac268e1d72f0297f919284f1fb3502  gas/testsuite/gas/msp430/opcode.s
+d7a16a3bc92230b4d592bbd4e87380c1  gas/testsuite/gas/mt/allinsn.d
+7a4c57d16a6d86c35116aed72b075942  gas/testsuite/gas/mt/allinsn.s
+3d9e0c76ac292498ab35ea0982abb1d6  gas/testsuite/gas/mt/badinsn.s
+4d2dcdb363d2f27fbf8abe1f2ebbf5b0  gas/testsuite/gas/mt/badinsn1.s
+3e442cb56c28162e51fc72327dc01c3c  gas/testsuite/gas/mt/badoffsethigh.s
+348a658fb73a449ee0f05dc7a0a5e66d  gas/testsuite/gas/mt/badoffsetlow.s
+e0b8e33d55f0908382ec2958e56746ac  gas/testsuite/gas/mt/badorder.s
+7341f098f821fb2bbff60760e71c69c8  gas/testsuite/gas/mt/badreg.s
+be8f979079c42cd218688a06a69d5952  gas/testsuite/gas/mt/badsignedimmhigh.s
+be6d01290eae0b220a95cb29c6b33459  gas/testsuite/gas/mt/badsignedimmlow.s
+205b6842294d5db7cdcd6989b2ce5d0c  gas/testsuite/gas/mt/badsyntax.s
+7130385ceb73e9687e0f84ffc49049dc  gas/testsuite/gas/mt/badsyntax1.s
+fa2cf99574f4fe9a7bc377642eeb8a3c  gas/testsuite/gas/mt/badunsignedimmhigh.s
+421ee6bb49c170add850a3fee23441f0  gas/testsuite/gas/mt/badunsignedimmlow.s
+876d751b737fa5d5b633f219294cfdc3  gas/testsuite/gas/mt/errors.exp
+bc9b891086b60b59c357a0d853aa022f  gas/testsuite/gas/mt/ldst.s
+4f8e71e8cf331137c3f336aa91c6ad45  gas/testsuite/gas/mt/misc.d
+5b80d5b239649f291fea8d4dd2a7c9d0  gas/testsuite/gas/mt/misc.s
+715cbc3a022f4cab8186ef1649526e8e  gas/testsuite/gas/mt/ms1-16-003.d
+3aebdfcb7a46df06bea5ada46f5aecce  gas/testsuite/gas/mt/ms1-16-003.s
+79eea58fd131fc4a04503206807045f4  gas/testsuite/gas/mt/ms2.d
+7581af9f6edce4220949225f386bd96b  gas/testsuite/gas/mt/ms2.s
+29bfbb076d69ac98656871de79c8dd02  gas/testsuite/gas/mt/msys.d
+ed7cc04edf600fa086f611443fde050e  gas/testsuite/gas/mt/msys.s
+cb2ddf46ed713e3cee1a889a471db947  gas/testsuite/gas/mt/mt.exp
+ce4f15550816f84e686171c52ab4caba  gas/testsuite/gas/mt/relocs.d
+42a48f92eaf736f7bdca950d44b5bc4e  gas/testsuite/gas/mt/relocs.exp
+72a6accb16fa3045da840a35c403c8af  gas/testsuite/gas/mt/relocs1.s
+9f35d2e0a5e23346e97fb52443fd3ee0  gas/testsuite/gas/mt/relocs2.s
+0f4b7bc9edd01dc9fb590e23e45d45ba  gas/testsuite/gas/openrisc/addi.d
+805e669e897b3dc1b7062edc45f09d7f  gas/testsuite/gas/openrisc/addi.s
+745fc0a057d8ba007c88fffe2c0bb434  gas/testsuite/gas/openrisc/allinsn.d
+a55077cac843dd6c1af5269546a2ab6b  gas/testsuite/gas/openrisc/allinsn.exp
+f3d8381e0e379835553db59cba908711  gas/testsuite/gas/openrisc/allinsn.s
+974b82bc6b25c55d65c70bbd83a8d41a  gas/testsuite/gas/openrisc/lohi.d
+d906479f52be5937ccbcb6b59e18d265  gas/testsuite/gas/openrisc/lohi.s
+c9192e457e9a372b6ee3168d396ecc69  gas/testsuite/gas/openrisc/store.d
+1b1f6769e09f9c308a211891e04ff8c8  gas/testsuite/gas/openrisc/store.s
+279b16c6aed695ea2c29a0f6073cf85b  gas/testsuite/gas/pdp11/absreloc.d
+15748007ed4702c3c820d16fe8946c98  gas/testsuite/gas/pdp11/absreloc.s
+e25229a10a540fcfadebf33b23951dce  gas/testsuite/gas/pdp11/opcode.d
+4a2b0b7305e0d85696a3d5761dc2ace5  gas/testsuite/gas/pdp11/opcode.s
+1b954c5cd69de5059a2972ddda82ae7c  gas/testsuite/gas/pdp11/pdp11.exp
+f87710fc72b7634b268501b2b519b7e2  gas/testsuite/gas/pe/aligncomm-a.d
+4b69133546e836426d88e02b2beda29d  gas/testsuite/gas/pe/aligncomm-a.s
+b01266334ed3408665a7c3989d570a6e  gas/testsuite/gas/pe/aligncomm-b.d
+18f2ca846a66a7f8e4cec8dfa893b24c  gas/testsuite/gas/pe/aligncomm-b.s
+e5850882d7661e18312b7adad553ba84  gas/testsuite/gas/pe/aligncomm-c.d
+022aa068d648739647e467cd768f603f  gas/testsuite/gas/pe/aligncomm-c.s
+d3a74136f06cb60020d9d8662b5b9702  gas/testsuite/gas/pe/aligncomm-d.d
+87202c1ee6ceb1e831ae1b57d2506121  gas/testsuite/gas/pe/aligncomm-d.s
+8db13f60b148d508907272f47f73a247  gas/testsuite/gas/pe/pe.exp
+14b5e450c7b52ba42af8e3f5b122d024  gas/testsuite/gas/pe/peseh-x64-2.d
+c83a67346c3e46e5611a265a633a5a22  gas/testsuite/gas/pe/peseh-x64-2.s
+b0753685dfb74e4bb7f0be57ed939f47  gas/testsuite/gas/pe/peseh-x64-3.d
+43f4160b55994ea4fa63fb39f7d16287  gas/testsuite/gas/pe/peseh-x64-3.s
+8519bb15460ddbec27adeaccea61eb55  gas/testsuite/gas/pe/peseh-x64-4.d
+ab50d587344a92b5d17ec3f25a41456d  gas/testsuite/gas/pe/peseh-x64-4.s
+491ebe2ffdd55231ea9b442af7bf51f3  gas/testsuite/gas/pe/peseh-x64-5.d
+d64bddbfb416d9c12eac3c17f91e120b  gas/testsuite/gas/pe/peseh-x64-6.d
+00fa72a6fef11012e7948717b2524dfc  gas/testsuite/gas/pe/peseh-x64.d
+4f321b37833fe37deb73da16942735d3  gas/testsuite/gas/pe/peseh-x64.s
+cf1138a294ab7d6e8d2ff734630730dc  gas/testsuite/gas/pe/section-align-1.d
+5ab659a1d28d273669e669582aa5474f  gas/testsuite/gas/pe/section-align-1.s
+914530c1307708d7330b54a2f5e1b113  gas/testsuite/gas/pe/section-align-3.d
+579e63be19d5a83aa3edeebbcaf0d852  gas/testsuite/gas/pe/section-align-3.s
+4f21032e12b25c725ee4802b8f48158e  gas/testsuite/gas/pe/seh-x64-err-1.l
+7ea8bc872bacd31fbb83e507025e3e1b  gas/testsuite/gas/pe/seh-x64-err-1.s
+f3a7124485548781ba12a81c18199e29  gas/testsuite/gas/pj/ops.d
+308d2177ed3b3b087d977e46c924fc0c  gas/testsuite/gas/pj/ops.s
+a6667ed6fc7b116477f95ef897bc5444  gas/testsuite/gas/pj/pj.exp
+7998e80131b20ddc9a87ffcbc55296e6  gas/testsuite/gas/ppc/476.d
+615b428c516fa68eba4e68423890d0d6  gas/testsuite/gas/ppc/476.s
+783f255e9001b203c80913c86e2fa05a  gas/testsuite/gas/ppc/a2.d
+ae55fc8dcb8fb87afb6d4db30c00bda3  gas/testsuite/gas/ppc/a2.s
+995494cc71eaac0de2d6d0df022d432e  gas/testsuite/gas/ppc/aix.exp
+1144f1624f81b2bf57bc44af8e76f9bb  gas/testsuite/gas/ppc/align.s
+78ff04d1b9877427fac95abb3a2c09c2  gas/testsuite/gas/ppc/altivec.d
+da75a2b442b5537342a3fb0ae74a0510  gas/testsuite/gas/ppc/altivec.s
+5bb0cea3beaab672ecd7271c2d380d8d  gas/testsuite/gas/ppc/altivec_and_spe.d
+25f7266b7d2018e3d6ada872b8781bec  gas/testsuite/gas/ppc/altivec_and_spe.s
+a4f8e829f2bbb753b664451a0431cb97  gas/testsuite/gas/ppc/altivec_xcoff.d
+01ef4fa1c9223585909c1314f1412a43  gas/testsuite/gas/ppc/altivec_xcoff.s
+75d993b58f0b561c72c03e42b6c041b3  gas/testsuite/gas/ppc/altivec_xcoff64.d
+87d11cb66e10ea7d6a07293cb45e8799  gas/testsuite/gas/ppc/altivec_xcoff64.s
+172a30768ef125e522380000282ea0c7  gas/testsuite/gas/ppc/astest.d
+5254d1fc440f434a46e97eb96b2735c1  gas/testsuite/gas/ppc/astest.s
+8f377d927ab1a25ef74a404f9da39852  gas/testsuite/gas/ppc/astest2.d
+679686746eeffb584f428b319e1d60e7  gas/testsuite/gas/ppc/astest2.s
+7f23c4ac16d5164a642a0d9250d4d57e  gas/testsuite/gas/ppc/astest2_64.d
+144fe63958860bc4f47e29e6d334f7de  gas/testsuite/gas/ppc/astest2_64.s
+aa6e3da11bbf146a7269f12df1e53c48  gas/testsuite/gas/ppc/astest64.d
+7b85234004920f7134df77e2f1931c13  gas/testsuite/gas/ppc/astest64.s
+814b9384e012ee9f649e6512cd5bc73d  gas/testsuite/gas/ppc/booke.d
+882fec9b42306ecf5c5ca234dd38c7d4  gas/testsuite/gas/ppc/booke.s
+b965e2e9b08bb26c920ddbca2d3ceae3  gas/testsuite/gas/ppc/booke_xcoff.d
+2a6d0fd8f30dbe6f0a2ee6e441b5073f  gas/testsuite/gas/ppc/booke_xcoff.s
+fbe1c4c6def5d4e68a43405632093a2b  gas/testsuite/gas/ppc/cell.d
+53a63b8602866480769f214b0d02de49  gas/testsuite/gas/ppc/cell.s
+6615dec72032153ab2d1c2c0ab15cc17  gas/testsuite/gas/ppc/common.d
+4d4a527779dba30e1417156fe5750979  gas/testsuite/gas/ppc/common.s
+5a245bc1775a0187259ad57ec31020e3  gas/testsuite/gas/ppc/e500.d
+8cae9a555b49d3b88b9fa9e41c384edc  gas/testsuite/gas/ppc/e500.s
+6bbc9dfd706bc2ac8993f34dbabc5691  gas/testsuite/gas/ppc/e500mc.d
+709c5b7abcd10261e08338d6148c307d  gas/testsuite/gas/ppc/e500mc.s
+05271d9cdd13ebcebd7662d04285d5af  gas/testsuite/gas/ppc/generate.sh
+c587e1022ddcd82f029387d1a0a27562  gas/testsuite/gas/ppc/machine.d
+ff408fd5be06ddf91987583d7e49c157  gas/testsuite/gas/ppc/machine.s
+889666cde90be418b342903e4c6da6d2  gas/testsuite/gas/ppc/power4.d
+7e32750fd4d73ca95fc2905868e37cf0  gas/testsuite/gas/ppc/power4.s
+c730a7c1697ce1b178e7ca65e6335a45  gas/testsuite/gas/ppc/power4_32.d
+5db471f78c7a217e8f43a9e38e1e66de  gas/testsuite/gas/ppc/power4_32.s
+073d34c5f86176192cdc9c7912a3c885  gas/testsuite/gas/ppc/power6.d
+2edeead6e85ba8e901425779110950cd  gas/testsuite/gas/ppc/power6.s
+29187993668e409cb616c535a22f339f  gas/testsuite/gas/ppc/power7.d
+d708d009c1d3702668c49c3373a7ed92  gas/testsuite/gas/ppc/power7.s
+5292ae05d49968dd862bed7e3bb35f25  gas/testsuite/gas/ppc/ppc.exp
+9f2fd57e7d204e3e0cd75d1987a95e78  gas/testsuite/gas/ppc/ppc750ps.d
+8199ee4187314431099549660ceee5a1  gas/testsuite/gas/ppc/ppc750ps.s
+b136c48de02880f92600e15502079cbd  gas/testsuite/gas/ppc/range.l
+437da5d8021d72cd229eb7b18d244451  gas/testsuite/gas/ppc/range.s
+a2fd6cc4d110fec6262d9c0a97e193c1  gas/testsuite/gas/ppc/range64.l
+db560f88366d3c0e44c52d438bf7fa47  gas/testsuite/gas/ppc/range64.s
+adbd495a100eb239848aea6e37340a88  gas/testsuite/gas/ppc/regnames.d
+b318f99332cc8875eeb2b1e63205efa4  gas/testsuite/gas/ppc/regnames.s
+afc3d3ec2754e8dc184c562e4de77a4a  gas/testsuite/gas/ppc/reloc.d
+e2ca5089c4db50f97a3bec4e6f71854f  gas/testsuite/gas/ppc/reloc.s
+d2e3625ca66a7c30b9270f806c67c877  gas/testsuite/gas/ppc/simpshft.d
+b09f6e7ab2e1416379f9512d1abe3afc  gas/testsuite/gas/ppc/simpshft.s
+52c2f10e54b1b94b494715da3c2a71f2  gas/testsuite/gas/ppc/test1elf.asm
+c6c389f73289209973a4a40e2f7af221  gas/testsuite/gas/ppc/test1elf32.d
+69b9dc5b20503079be857e83ad7e6d24  gas/testsuite/gas/ppc/test1elf32.s
+c6ae7aea99b8f7d5b690081c72f616f4  gas/testsuite/gas/ppc/test1elf64.d
+a8ab8683a00320673194096739412def  gas/testsuite/gas/ppc/test1elf64.s
+6b5dede6da756c49ce5fc9127d0a6510  gas/testsuite/gas/ppc/test1xcoff.asm
+f34f706916a8b93f41cf7f809563ddee  gas/testsuite/gas/ppc/test1xcoff32.d
+68e09cd1bae67cb9bdbb378d986ebc5b  gas/testsuite/gas/ppc/test1xcoff32.s
+7d26a371daee8844b9a874ea29f62b16  gas/testsuite/gas/ppc/textalign-xcoff-001.d
+b60a4ad89a80b60d95fc5d73ec5e02d9  gas/testsuite/gas/ppc/textalign-xcoff-001.s
+b0f0a0f307149b00c01eb907197dd91e  gas/testsuite/gas/ppc/textalign-xcoff-002.d
+74b87caae3a9839dbb0d84ac48ebbb93  gas/testsuite/gas/ppc/titan.d
+2717127e5f63eb13a54799851eedf836  gas/testsuite/gas/ppc/titan.s
+5bcbd729e2c0f44f2afd013db1ba0dee  gas/testsuite/gas/ppc/vsx.d
+521a68b0b766533df40b6a6a6ec922bd  gas/testsuite/gas/ppc/vsx.s
+08ea62f057fad4130ab4496b10773187  gas/testsuite/gas/ppc/xcoff-branch-1-32.d
+8e884141661fddd367c49211824ec4dc  gas/testsuite/gas/ppc/xcoff-branch-1-64.d
+80d642f21d1d3f314901cc58bd518132  gas/testsuite/gas/ppc/xcoff-branch-1.s
+f5c9bc0a18773d1bf7f99806a00efdfb  gas/testsuite/gas/ppc/xcoff-dwsect-1-32.d
+d6eaed6c0ca0de13aa3cee67f499030b  gas/testsuite/gas/ppc/xcoff-dwsect-1-64.d
+ac5681bad739dbc93a0593b34dd4e884  gas/testsuite/gas/ppc/xcoff-dwsect-1.s
+1f3ca01c9d7afa8a580c73ee371fee03  gas/testsuite/gas/ppc/xcoff-ref-1.l
+1e195c4e7e61cabafec65c9c47e4a7ad  gas/testsuite/gas/ppc/xcoff-ref-1.s
+71c5f6565eae6138dec18a7c3133bbd8  gas/testsuite/gas/rx/abs.d
+57914b62441aa5b32fb9760c2935321f  gas/testsuite/gas/rx/abs.sm
+b048d3c4304a81e88a3b8a664ba02721  gas/testsuite/gas/rx/adc.d
+2d6940166d3de253abc100cd9a1282a6  gas/testsuite/gas/rx/adc.sm
+ae3b6977397e67d3a744df524e8c7e11  gas/testsuite/gas/rx/add.d
+7aa990f49aa4148434319eeb8d257d4d  gas/testsuite/gas/rx/add.sm
+99dc23f583f78027f3f212f87a56a59b  gas/testsuite/gas/rx/and.d
+ed68765a3d896b4aaa9120e4424f9665  gas/testsuite/gas/rx/and.sm
+169174d211e0c66b6ce470293348a3aa  gas/testsuite/gas/rx/bclr.d
+deb0d8eeb4cb7fb3edea5dc757efcf32  gas/testsuite/gas/rx/bclr.sm
+a89fd288ed65b1f109da51e63f86c1f9  gas/testsuite/gas/rx/bcnd.d
+1b11c559ec4f7c09813f3f35310677e4  gas/testsuite/gas/rx/bcnd.sm
+00749ad683564469b6ab3c84992a2b53  gas/testsuite/gas/rx/bmcnd.d
+f17cd72c85ff80e16b8331c8ac2514d6  gas/testsuite/gas/rx/bmcnd.sm
+bebb6132c423435536a0ae7c8f23055f  gas/testsuite/gas/rx/bnot.d
+bece335b9a213f01289e78a9905553c6  gas/testsuite/gas/rx/bnot.sm
+ceb6c219e179ccba72ce842356e0230b  gas/testsuite/gas/rx/bra.d
+bcf0d139b5a7d7bf5d286921b40e8eb8  gas/testsuite/gas/rx/bra.sm
+56fdc89391eed35b67c1b581225759d9  gas/testsuite/gas/rx/brk.d
+210e06f27c91dfeea0b15367be8182a5  gas/testsuite/gas/rx/brk.sm
+7364258a2f719f9fa11522149936caa5  gas/testsuite/gas/rx/bset.d
+3803c911b7f99eef6a1188ad241d1fca  gas/testsuite/gas/rx/bset.sm
+cfd26e005712b4c8e6e251655444018e  gas/testsuite/gas/rx/bsr.d
+bcfdf7c9037623b2dc2c2f55f78ab388  gas/testsuite/gas/rx/bsr.sm
+ac735f1b1f0a1634a620828ba0452aa4  gas/testsuite/gas/rx/btst.d
+123735debe669e405d26224fded45a1f  gas/testsuite/gas/rx/btst.sm
+2070f1a4655835c842b156d761a4c3e0  gas/testsuite/gas/rx/clrpsw.d
+53b580f3aaf8e173e7b407a118197ce3  gas/testsuite/gas/rx/clrpsw.sm
+72434b2d6197ac4eb874435654876efc  gas/testsuite/gas/rx/cmp.d
+9d246f343ff85cf0e39313bc3e66f1d4  gas/testsuite/gas/rx/cmp.sm
+d3d99191bf101ab81a2c5b0396b0d67b  gas/testsuite/gas/rx/dbt.d
+80958735878b351e5540a9e704d545f3  gas/testsuite/gas/rx/dbt.sm
+897f3f117c7e9246cf52f8344349fb2a  gas/testsuite/gas/rx/div.d
+7aa068444f2b8c9065aa84c29d7bf4a4  gas/testsuite/gas/rx/div.sm
+a5a172166694021dee0536abb39cfbb4  gas/testsuite/gas/rx/divu.d
+c0fe0690acf56e1ebb2a20fcf080951b  gas/testsuite/gas/rx/divu.sm
+64ca82295b3e3527237595d64e2ec4fd  gas/testsuite/gas/rx/emul.d
+e156d3cf3cefbd71e2b94bb584f14057  gas/testsuite/gas/rx/emul.sm
+4be3fb5bc2da577668fa279a0e5379ca  gas/testsuite/gas/rx/emulu.d
+da20d6937cb0a93d404a7f36552f598d  gas/testsuite/gas/rx/emulu.sm
+9a46e594c4281388165045e550e192cb  gas/testsuite/gas/rx/explode
+be77a9ce9fe0f3fc98b9c1a5f9dee598  gas/testsuite/gas/rx/fadd.d
+ec80bf2c13f161e0e1d0eea3071b4d6d  gas/testsuite/gas/rx/fadd.sm
+344785c6f3789972a52648efcefe1298  gas/testsuite/gas/rx/fcmp.d
+2e68fcf2ff2194fd41c776e5be3847be  gas/testsuite/gas/rx/fcmp.sm
+25fe18b9673181e8607c9c9a8c5a4cb7  gas/testsuite/gas/rx/fdiv.d
+ce2676a80a637f40d5a58122d2fefbac  gas/testsuite/gas/rx/fdiv.sm
+d8a840ad93bca4bab75e270a700dae51  gas/testsuite/gas/rx/fmul.d
+4f5f04b4bbb87ea99a0b7d6dc2fd7f5f  gas/testsuite/gas/rx/fmul.sm
+bdf7fbc45d7f9d9aef69c185a3f006ac  gas/testsuite/gas/rx/fsub.d
+6d8e744da2e3789c27474f208e6bcd90  gas/testsuite/gas/rx/fsub.sm
+fd84cd91b0196c3ad5911af7a61f5d2e  gas/testsuite/gas/rx/ftoi.d
+cc153bcbcc2613a0b294874d83bb8801  gas/testsuite/gas/rx/ftoi.sm
+483f744974cf5b30c0caaa2d4185b78a  gas/testsuite/gas/rx/gprel.d
+0b959340efd688ecd7efa4df2c1ee387  gas/testsuite/gas/rx/gprel.sm
+a55f487298c5289bf22dc2c2b40aa283  gas/testsuite/gas/rx/int.d
+932b876ccb68e904a163f31c112d48af  gas/testsuite/gas/rx/int.sm
+dd8aeadae1a4c0c09404fd8829d03b33  gas/testsuite/gas/rx/itof.d
+1aa0d64b0c977f357d50740b93e1825a  gas/testsuite/gas/rx/itof.sm
+fa0e692161f88294c9da57e1dd50c6a8  gas/testsuite/gas/rx/jmp.d
+50581a2620e3e6750c81bd889311e643  gas/testsuite/gas/rx/jmp.sm
+d3f51b064682737990930c85a49607cf  gas/testsuite/gas/rx/jsr.d
+875b577c5716ea80ac37b10a7409b9f3  gas/testsuite/gas/rx/jsr.sm
+4cadb514c54d054ee5c48964aed8fdad  gas/testsuite/gas/rx/machi.d
+9d0b79ce54c30af9142a81e05389ae2d  gas/testsuite/gas/rx/machi.sm
+716c4a0604a903373c7b8c75a0973984  gas/testsuite/gas/rx/maclo.d
+80245ef6485b99eb515fa280ec4c9932  gas/testsuite/gas/rx/maclo.sm
+80e574bf0a58a211c77e6bd24a40bd24  gas/testsuite/gas/rx/macros.inc
+47d54c96fb80856510f0ff8bf6866fa2  gas/testsuite/gas/rx/make-d
+9a862758ff038db92ecba963bc9e8f2b  gas/testsuite/gas/rx/max.d
+acea9f2e9d6300fe32b280ceab296313  gas/testsuite/gas/rx/max.sm
+682159cd39cb1f88595265c178857b92  gas/testsuite/gas/rx/min.d
+d95dfd96010938f9f79c939540f18015  gas/testsuite/gas/rx/min.sm
+d9054381f9affe93f65ab35e05869af1  gas/testsuite/gas/rx/mov.d
+12ad788223244fffa744ad446f307fb7  gas/testsuite/gas/rx/mov.sm
+b6220779ac3784c717f342f0ae4d9779  gas/testsuite/gas/rx/movu.d
+17304b659a294283fee0bb2172ea3fe6  gas/testsuite/gas/rx/movu.sm
+62023c9742713644bc372ff9f67688fa  gas/testsuite/gas/rx/mul.d
+62a850c704ad34ca760c68500b6305bd  gas/testsuite/gas/rx/mul.sm
+39925b5c6445ece419613bd42466f521  gas/testsuite/gas/rx/mulhi.d
+815b1ab028634144eb289a39c716a26a  gas/testsuite/gas/rx/mulhi.sm
+cae0c70f270750dbc742a6b048c513c5  gas/testsuite/gas/rx/mullo.d
+b849b163a8607d5c65ba288da3115365  gas/testsuite/gas/rx/mullo.sm
+b59bdded2bfff2e6484a2295683b2743  gas/testsuite/gas/rx/mvfachi.d
+a0f4216e57978ee5c9c4d3036d381cd1  gas/testsuite/gas/rx/mvfachi.sm
+8252622aaf2585e46949d0b5ab78cc72  gas/testsuite/gas/rx/mvfaclo.d
+f3216eb5860608c49c1170d136b71b43  gas/testsuite/gas/rx/mvfaclo.sm
+8aa008b398f233f643a3d5b45993d654  gas/testsuite/gas/rx/mvfacmi.d
+30dfdae83b5a43f60e426edba343a3ee  gas/testsuite/gas/rx/mvfacmi.sm
+733e3b0d08ef962d3f8ae4ac4e834499  gas/testsuite/gas/rx/mvfc.d
+5654b52fb25c6f0f20155e424fdce749  gas/testsuite/gas/rx/mvfc.sm
+61de9c081ecf4f86ebc420bc49279a00  gas/testsuite/gas/rx/mvfcp.d
+7b3a558f817438f0501d9c73e39d2921  gas/testsuite/gas/rx/mvfcp.sm
+06cb093e7c94c7afc81b3e3b171ae61d  gas/testsuite/gas/rx/mvtachi.d
+9d499f4b523c571b1cbacd616c46af92  gas/testsuite/gas/rx/mvtachi.sm
+731c1ae090efecb2187429ae52a3c618  gas/testsuite/gas/rx/mvtaclo.d
+2a35618a002a919c1059cd66a198486e  gas/testsuite/gas/rx/mvtaclo.sm
+f31110ab1204c74f0b4ed17459e220bb  gas/testsuite/gas/rx/mvtc.d
+ed6e831528d0d66abae516ca14078779  gas/testsuite/gas/rx/mvtc.sm
+61de9c081ecf4f86ebc420bc49279a00  gas/testsuite/gas/rx/mvtcp.d
+b64e28358653987bc6d67e565b758aa5  gas/testsuite/gas/rx/mvtcp.sm
+9c34af5aca08eaba86077ba8cf6fcf93  gas/testsuite/gas/rx/neg.d
+1205defe5bc999ba88485b040317aeb4  gas/testsuite/gas/rx/neg.sm
+c812ce4deb3e2378b3e0cb7cd22124c8  gas/testsuite/gas/rx/nop.d
+801d14a6810ebae1f5eefda4bac2a4d8  gas/testsuite/gas/rx/nop.sm
+7a5b7e56ad16b8d009c329b60dc95fc0  gas/testsuite/gas/rx/not.d
+4d9e9ddd2a666f58f3ecdcc1d6cda308  gas/testsuite/gas/rx/not.sm
+61de9c081ecf4f86ebc420bc49279a00  gas/testsuite/gas/rx/opecp.d
+aabdfcba99ffe44bc380af93936e8bfc  gas/testsuite/gas/rx/opecp.sm
+702baf9aa1860abbb87465367e7fbf0b  gas/testsuite/gas/rx/or.d
+02b41e6c1928b870b5e5b218bc7a22b9  gas/testsuite/gas/rx/or.sm
+086361006f946fe5b451edcb72340bc4  gas/testsuite/gas/rx/pop.d
+a2d84a508769af38cd42c65899b90f4c  gas/testsuite/gas/rx/pop.sm
+84375b4f4560924448fcfeaad8ab4845  gas/testsuite/gas/rx/popc.d
+d8dc76e252c3f2d9f914ab95f785f243  gas/testsuite/gas/rx/popc.sm
+63dff8e2578028f02d0a2cf1f47be845  gas/testsuite/gas/rx/popm.d
+c5feb43571cf9c69b2ede29b85cc229d  gas/testsuite/gas/rx/popm.sm
+1798ab935ea0e36f5e2adaf7e9b25f05  gas/testsuite/gas/rx/push.d
+5fd4b35ac45d14b26132e893546309a7  gas/testsuite/gas/rx/push.sm
+3789e0e50d71498be10ac56ab47a73b7  gas/testsuite/gas/rx/pushc.d
+31c549753fc2cdafe0b1ea22381995d4  gas/testsuite/gas/rx/pushc.sm
+897fce7adc397e67ace678380d76edf9  gas/testsuite/gas/rx/pushm.d
+31e6424c05fa0118196e58df84d46c33  gas/testsuite/gas/rx/pushm.sm
+fa888390f54df9caaefe5a0e6f5a7ed2  gas/testsuite/gas/rx/r-bcc.d
+1a99d1947bcae0662631069327fabcf0  gas/testsuite/gas/rx/r-bcc.sm
+71f21938bb576c7f6141843eb87a4456  gas/testsuite/gas/rx/r-bra.d
+c6a84826af465f62a588c342941868dc  gas/testsuite/gas/rx/r-bra.sm
+622c76c337dbac3fb25bb7556ac1af86  gas/testsuite/gas/rx/racw.d
+b115d0aa01f0ea984757c3cc45658d7a  gas/testsuite/gas/rx/racw.sm
+fed07e594602888169bc89562f51057f  gas/testsuite/gas/rx/revl.d
+c892f2d179c9e3a054792b3dd33118ab  gas/testsuite/gas/rx/revl.sm
+7fce081688df6feb995457faa6c75606  gas/testsuite/gas/rx/revw.d
+e5a36a930e316c17e8575fbe75063ba2  gas/testsuite/gas/rx/revw.sm
+474c11d100134fdd86a1d10b46c1f0de  gas/testsuite/gas/rx/rmpa.d
+08d26b967c211f2348569c1628ceb2a6  gas/testsuite/gas/rx/rmpa.sm
+4b6b8909375e6c66164f0c76c54a4ca8  gas/testsuite/gas/rx/rolc.d
+7265865f4ad692797331c14cab6c7789  gas/testsuite/gas/rx/rolc.sm
+b399a4666515a870afd9747d32060bbc  gas/testsuite/gas/rx/rorc.d
+0553eb6304233f40fb5b12e8427bb104  gas/testsuite/gas/rx/rorc.sm
+9ba511a30afbb28ae983871316ec4072  gas/testsuite/gas/rx/rotl.d
+ef57b6a0c7da62c2bbf0e86fe184c808  gas/testsuite/gas/rx/rotl.sm
+276f4fb95cff7811f4eeef74b387ebe9  gas/testsuite/gas/rx/rotr.d
+06945679975a1cbd6bb75438fdfd0fb1  gas/testsuite/gas/rx/rotr.sm
+a15fa81374d772b26ee907aabf411da4  gas/testsuite/gas/rx/round.d
+0cf45b8285e5d4295f80ad8f3f7e2154  gas/testsuite/gas/rx/round.sm
+e644c19442ae5298ce9b32a0221fee44  gas/testsuite/gas/rx/rte.d
+2540473fb6034a8e1b586afff89ba600  gas/testsuite/gas/rx/rte.sm
+4c62eafb55176b1936291784407f4609  gas/testsuite/gas/rx/rtfi.d
+8edf85ae4c675d6a1585f65e5812f11a  gas/testsuite/gas/rx/rtfi.sm
+438cada13e53ab9998cf620935b49eb7  gas/testsuite/gas/rx/rts.d
+d142e6a1ea2d9b2f64a0439381469c73  gas/testsuite/gas/rx/rts.sm
+1a764aa7e92058ebc617c88ceb5a13f9  gas/testsuite/gas/rx/rtsd.d
+9bc425e1e24ba5dd89eed1ed408a1d0f  gas/testsuite/gas/rx/rtsd.sm
+bb0ff34c3ab9c2a478cb7b8b61139a78  gas/testsuite/gas/rx/rx-asm-bad.l
+61936a3f5fbdd9820e618749640e504a  gas/testsuite/gas/rx/rx-asm-bad.s
+335f82bc634a376dc49da142a9562b7c  gas/testsuite/gas/rx/rx-asm-good.d
+fa505b9a2a2bd46a898da5124274132a  gas/testsuite/gas/rx/rx-asm-good.inc
+7431b0d36df683582ac103ddf6cc3bc0  gas/testsuite/gas/rx/rx-asm-good.s
+30e661a36185d8069e8c71902d8f641e  gas/testsuite/gas/rx/rx.exp
+b2a174be9eab23d04fdd7e2b9ac22f60  gas/testsuite/gas/rx/sat.d
+b91e0dcd4df17a9f34e22ae004d71823  gas/testsuite/gas/rx/sat.sm
+2a34fc5a5c2e863b3bc464e00bddd7dc  gas/testsuite/gas/rx/satr.d
+45f2eb6f90d369713a4d41cf25b7c841  gas/testsuite/gas/rx/satr.sm
+f07335a0fd889644fa6a5129ef81b609  gas/testsuite/gas/rx/sbb.d
+c18b15801487432cf19c5cc1f9e2e257  gas/testsuite/gas/rx/sbb.sm
+215c2af504c8c549b51d5921ed7ec14e  gas/testsuite/gas/rx/sccnd.d
+7850ea31940e63fa1ef45abff25a89e4  gas/testsuite/gas/rx/sccnd.sm
+45ffc89b0c059abfc7655ebd17945b2d  gas/testsuite/gas/rx/scmpu.d
+2148e7ba72bb63ff13a079c5523a610c  gas/testsuite/gas/rx/scmpu.sm
+d7f29b311ef64a754e51311e3ed78f38  gas/testsuite/gas/rx/setpsw.d
+5d7d7b65407c898b6e132ddb9a30519a  gas/testsuite/gas/rx/setpsw.sm
+db59e893fde1f4f78ba4fcac475c5c6b  gas/testsuite/gas/rx/shar.d
+18fa908f4688b2ffd620e2d43aca938a  gas/testsuite/gas/rx/shar.sm
+bad9e0177093d623d9e011d7cfdf703c  gas/testsuite/gas/rx/shll.d
+9a55f7ee3f5f8dcb605c6191142ff73d  gas/testsuite/gas/rx/shll.sm
+faf9726fad02245d00b56cd0c48c8ab0  gas/testsuite/gas/rx/shlr.d
+2c696e1e741fa0886eaacce00c4053a3  gas/testsuite/gas/rx/shlr.sm
+5f52c9e47c7801611c9f05a5450538b0  gas/testsuite/gas/rx/smovb.d
+9925cd0ed493e324ddc0717a3162e41e  gas/testsuite/gas/rx/smovb.sm
+2178875bb875b5ff557e40b29e8ad3ae  gas/testsuite/gas/rx/smovf.d
+64ce003ba8a54aa405b7013c1b0c0aa0  gas/testsuite/gas/rx/smovf.sm
+62ab149d6ea0bdf5954a82b875c2f78f  gas/testsuite/gas/rx/smovu.d
+c450ecc9e30aaecdffab682b4a0d34a7  gas/testsuite/gas/rx/smovu.sm
+649a7431df0ef24c61e6b53c677110f6  gas/testsuite/gas/rx/sstr.d
+51aefed80127887cd629d888dc527fe3  gas/testsuite/gas/rx/sstr.sm
+ae8608b6ebb97f867c43f55ea2517abe  gas/testsuite/gas/rx/stnz.d
+9fbb8be3e0e696a884133506073c80b2  gas/testsuite/gas/rx/stnz.sm
+77b2c62de607bcec7c251c77997aba48  gas/testsuite/gas/rx/stz.d
+e2553dbd60352f13ec9a377985d3fa28  gas/testsuite/gas/rx/stz.sm
+368b8c160b4ec95a989ea8b4dc88ba0e  gas/testsuite/gas/rx/sub.d
+1b02e8cb4fe0984e50e625accddd8e47  gas/testsuite/gas/rx/sub.sm
+63a20cd3d9aa6ea043777cc3000637d1  gas/testsuite/gas/rx/suntil.d
+18f454dc532d9c87732d7a505ed9f15e  gas/testsuite/gas/rx/suntil.sm
+c3cbfcc3e2dd463a7384a818c39c7da7  gas/testsuite/gas/rx/swhile.d
+bbdc61efa10ce63739970dbc071c623c  gas/testsuite/gas/rx/swhile.sm
+d6d3a369df3952b8be1297bab047884f  gas/testsuite/gas/rx/tst.d
+e55278f40c448972bacf359a3e83f3e4  gas/testsuite/gas/rx/tst.sm
+beb0ade7b33e10c7f58571302ff64be5  gas/testsuite/gas/rx/wait.d
+bb63d5a084fb1b0b55cb7a81dfde1244  gas/testsuite/gas/rx/wait.sm
+93d86c44b26f0577648177fa7e89e017  gas/testsuite/gas/rx/xchg.d
+84a1ad4883556028255c67db6c8fd83d  gas/testsuite/gas/rx/xchg.sm
+f43607cd0da97a35bf26d20aa651083e  gas/testsuite/gas/rx/xor.d
+1126037c4c2e5c7aec115d5a3cfe082d  gas/testsuite/gas/rx/xor.sm
+1b76c401c6cd50032e66cf61af09dc3f  gas/testsuite/gas/s390/esa-g5.d
+2289221f9f2f5966a51af63b25032174  gas/testsuite/gas/s390/esa-g5.s
+049e09aef849c8721bc128ebba592aa9  gas/testsuite/gas/s390/esa-operands.d
+0c35dd354b63c1f0f41821e01f0ea870  gas/testsuite/gas/s390/esa-operands.s
+91fa53d723e9af491ea1e2d5226521c6  gas/testsuite/gas/s390/esa-reloc.d
+837bc16ac99b9589f59da79225edfbfb  gas/testsuite/gas/s390/esa-reloc.s
+00b3e601216c9640b79e439522ec3e19  gas/testsuite/gas/s390/esa-z9-109.d
+ffa2cb40d426d45f26754536ff6c55c7  gas/testsuite/gas/s390/esa-z9-109.s
+d41597300ce4a636bda3d29a48ce744b  gas/testsuite/gas/s390/esa-z900.d
+34ed2f2e243cd65867ae7eead4937234  gas/testsuite/gas/s390/esa-z900.s
+41ed835e38fe9d1793972b837d21af76  gas/testsuite/gas/s390/esa-z990.d
+1db311482c3a68452e62bc6faa121e74  gas/testsuite/gas/s390/esa-z990.s
+89a9f4b81b75562d70751cb289ea6103  gas/testsuite/gas/s390/s390.exp
+9058bbee5af8d3b3cec81bf0b4dce4a3  gas/testsuite/gas/s390/zarch-machine.d
+1581b062c50becf7b85a232069e4e7d8  gas/testsuite/gas/s390/zarch-machine.s
+8ba9907de5d21ef3b208cfe32af15bc0  gas/testsuite/gas/s390/zarch-operands.d
+4e6e317e3db9c6d28907c3c6c431ace1  gas/testsuite/gas/s390/zarch-operands.s
+dd37fb6426063522f96f61085b4353f1  gas/testsuite/gas/s390/zarch-reloc.d
+0eef4465981789eff7ee6d934128da4b  gas/testsuite/gas/s390/zarch-reloc.s
+ae7c0030f3a9f473e069dae58e318bdd  gas/testsuite/gas/s390/zarch-z10.d
+686c25255de2f035d4cb2d7fad54a977  gas/testsuite/gas/s390/zarch-z10.s
+b78428880fa7c322e5d333a7473db26f  gas/testsuite/gas/s390/zarch-z196.d
+e61751b9ee411f88b550a70a3f4a97dc  gas/testsuite/gas/s390/zarch-z196.s
+d5ceeba8087f472509c745613dece0de  gas/testsuite/gas/s390/zarch-z9-109.d
+4208ff65cd0fb1b7f866eb68311b318d  gas/testsuite/gas/s390/zarch-z9-109.s
+4e03839ebe73d46d14c2af98220f9e90  gas/testsuite/gas/s390/zarch-z9-ec.d
+81c218c7eab8f08b1613d2589cedcfbc  gas/testsuite/gas/s390/zarch-z9-ec.s
+a29a94bd7596d9ab4070c61f6ee00445  gas/testsuite/gas/s390/zarch-z900.d
+886cc452d745a53a15f7b8ad3ab18325  gas/testsuite/gas/s390/zarch-z900.s
+d4b89460c301fd7f61c3281c368e5d9a  gas/testsuite/gas/s390/zarch-z990.d
+8150bdbf42298de02f4a1c8eb9989161  gas/testsuite/gas/s390/zarch-z990.s
+8a1c89adbb047693ca8a9e34ec23645b  gas/testsuite/gas/score/addi.d
+9f807c9d5872de3135bb10ec78c03d55  gas/testsuite/gas/score/addi.s
+cd16adfc5cd30ec14014a689aab4ebd9  gas/testsuite/gas/score/arith_32-lt.d
+5ae5ddfd989865f0275cfcad530608d1  gas/testsuite/gas/score/arith_32.d
+f39662493a5a5fe1605406d4bd00a0ee  gas/testsuite/gas/score/arith_32.s
+09be25b16639d5258b0a231a7924cb12  gas/testsuite/gas/score/b.d
+9e5400dd46eb0e0bdcddce1b68c603aa  gas/testsuite/gas/score/b.s
+f78a758787e84cd17a6b11c7ad5e0ea0  gas/testsuite/gas/score/bit_32-lt.d
+8e56be3955cc9c17609bb4aed76bebd4  gas/testsuite/gas/score/bit_32.d
+e1ba46344102ed4c52059505b90a0c43  gas/testsuite/gas/score/bit_32.s
+59674b6578113897a840babf4a58ff44  gas/testsuite/gas/score/bittst.d
+7ebe5068ea1b457f8a2b1e5590321485  gas/testsuite/gas/score/bittst.s
+d39d9c89aff5ba9a319d63429367c58f  gas/testsuite/gas/score/br.d
+dbf50132189f8223e3192fc4ab7023c9  gas/testsuite/gas/score/br.s
+491e4d3453ea79f21ea01b140b6880be  gas/testsuite/gas/score/branch_32-lt.d
+fa0db79e835f839731cbfdb6fcf4fa4f  gas/testsuite/gas/score/branch_32.d
+3bc4ee7caa6c938f5987fd12159fb776  gas/testsuite/gas/score/branch_32.s
+973fd2449a69da20c46a7c2e2c1b79e6  gas/testsuite/gas/score/cmp_32-lt.d
+6db2b6be738a4a1b8a7871f6763316cd  gas/testsuite/gas/score/cmp_32.d
+7e52c312976135824736792385b593ac  gas/testsuite/gas/score/cmp_32.s
+1ff1246a2c0f29f56b1469d28e2e5621  gas/testsuite/gas/score/ldi.d
+17af7bab7eae4003148984673d54c4cb  gas/testsuite/gas/score/ldi.s
+b8ad1458cd3016f9d7bf119701eaa4ef  gas/testsuite/gas/score/load_store_32-lt.d
+0b798b22162b0ec1790a362fbeac2bfb  gas/testsuite/gas/score/load_store_32.d
+9f1cdff0d54b789b6651f3c5b5add09d  gas/testsuite/gas/score/load_store_32.s
+c72322cf27238e40202a7438b9f0fb4a  gas/testsuite/gas/score/logical_32-lt.d
+5c13a0409663f407b2e3f5d2da3da581  gas/testsuite/gas/score/logical_32.d
+a6504948ee7984768746e8a6da48c74c  gas/testsuite/gas/score/logical_32.s
+0c7ff0a53c30985ff824d658386dc73c  gas/testsuite/gas/score/ls32ls16.d
+b14eba6473ab67646bac7791a891137f  gas/testsuite/gas/score/ls32ls16.s
+eee4d8c816dcb23112fbc920272b8c09  gas/testsuite/gas/score/ls32ls16p.d
+1b1164c85d52444e0be834538542bbcc  gas/testsuite/gas/score/ls32ls16p.s
+8a39e6a858081de923317e08781fa778  gas/testsuite/gas/score/move.d
+3b389721a2fb77af1dc9d313397538b9  gas/testsuite/gas/score/move.s
+a550b1a71ab9b27245cb27e9a11c0f3d  gas/testsuite/gas/score/mv_32-lt.d
+1abdfe7d99f2ee01c17e044411b70ee0  gas/testsuite/gas/score/mv_32.d
+01ae572b8fc5e87722e959c9c1167aa8  gas/testsuite/gas/score/mv_32.s
+dd5b1ea842a48583633881aec13854cc  gas/testsuite/gas/score/nop.d
+3828587e6ac2f22ab8e87adaaaa6aa47  gas/testsuite/gas/score/nop.s
+bf200398eee9c775a2ff37110c043cd1  gas/testsuite/gas/score/postlw.d
+5b77f1b87e8245cc9a37d570894914a6  gas/testsuite/gas/score/postlw.s
+e3062e05f17810c0b22c38d11fd2bcc8  gas/testsuite/gas/score/presw.d
+7bf99e258cb450b00e7a03e9d733ed91  gas/testsuite/gas/score/presw.s
+a2f278ba771fd7c290800f2228997c7f  gas/testsuite/gas/score/rD_rA.d
+6d7afb0614ec0f3b9bac11969a035948  gas/testsuite/gas/score/rD_rA.s
+617c6c5b76e2a5ef4c70688263172042  gas/testsuite/gas/score/rD_rA_BN.d
+2bd56b39ff74c73344c61cb6c5e4d7a5  gas/testsuite/gas/score/rD_rA_BN.s
+f903eb0b8485b2afada9efefcae85deb  gas/testsuite/gas/score/rD_rA_rB.d
+51c3f04ef872ee6bd9f2461bff0c3a3e  gas/testsuite/gas/score/rD_rA_rB.s
+592a9514216fe1e841b427b8f4696bf5  gas/testsuite/gas/score/relax.exp
+317927209aa3e0afd2d5988e55ba86ff  gas/testsuite/gas/score/relax_32.exp
+700303f88910ab7c3d4ca2244d4b4bb9  gas/testsuite/gas/score/relaxation_macro.h
+53e6b7f4b785a41009e6b205d5d9e883  gas/testsuite/gas/score/shift_32-lt.d
+b93417d720a444980d78911c82d85e5a  gas/testsuite/gas/score/shift_32.d
+9362659ffd0fff9876685ec35f19cc53  gas/testsuite/gas/score/shift_32.s
+83623afc38654251f9190992f737167e  gas/testsuite/gas/score/syscontrol_32-lt.d
+250d349607a8b4890e1e45396b57c7cd  gas/testsuite/gas/score/syscontrol_32.d
+38150bf39bb92b2182170dbb598e6345  gas/testsuite/gas/score/syscontrol_32.s
+6ef2563969fd066b1b920c087c2beb6f  gas/testsuite/gas/score/tcond.d
+15ce7ca423c876d27acb4bd78e298fef  gas/testsuite/gas/score/tcond.s
+496db8c96a1a44ae75bc8773ebbd88ae  gas/testsuite/gas/sh/arch/arch.exp
+9c9f92d72af037d87d5f68baa46e1b63  gas/testsuite/gas/sh/arch/arch_expected.txt
+557989b111b9dab8e12592d4468c3e37  gas/testsuite/gas/sh/arch/sh-dsp.s
+fad623280164b76e8e26f3fefeb21456  gas/testsuite/gas/sh/arch/sh.s
+d4b973efa0a1174ecf7403b949d8fef5  gas/testsuite/gas/sh/arch/sh2.s
+902449247a1f51fe8d542285c15186fe  gas/testsuite/gas/sh/arch/sh2a-nofpu-or-sh3-nommu.s
+597181c5e888fec077372304556c6b14  gas/testsuite/gas/sh/arch/sh2a-nofpu-or-sh4-nommu-nofpu.s
+c99858e0fe821ffaa35d9f79326782be  gas/testsuite/gas/sh/arch/sh2a-nofpu.s
+001175cf372c9958c8edbd1a9c673896  gas/testsuite/gas/sh/arch/sh2a-or-sh3e.s
+fcd26cad36753392667255e1206d9023  gas/testsuite/gas/sh/arch/sh2a-or-sh4.s
+a58353e9d1a147699f4b511c583787f7  gas/testsuite/gas/sh/arch/sh2a.s
+66b8534721a9a4642d334ca7ffaf493f  gas/testsuite/gas/sh/arch/sh2e.s
+ba99caf1cf49cc62487f954f25421850  gas/testsuite/gas/sh/arch/sh3-dsp.s
+29d33f8568c4725231c2987e265a2368  gas/testsuite/gas/sh/arch/sh3-nommu.s
+c49644b7b8370e6427f9feaf80e70b2b  gas/testsuite/gas/sh/arch/sh3.s
+4d36649f1200dcdb4901e2551b378729  gas/testsuite/gas/sh/arch/sh3e.s
+0e5fbe5b90dc04d700fc142c0bf211ad  gas/testsuite/gas/sh/arch/sh4-nofpu.s
+abc2ec66346c95fa67fa4e92cbd18a02  gas/testsuite/gas/sh/arch/sh4-nommu-nofpu.s
+e3ad9d8364abb400e720c763f2015f49  gas/testsuite/gas/sh/arch/sh4.s
+b70176213702cb636c0e11124483c6c9  gas/testsuite/gas/sh/arch/sh4a-nofpu.s
+38e54ba4a93b881e8d378cc0e93e99e4  gas/testsuite/gas/sh/arch/sh4a.s
+08b3726b81639384ea64661f7b57faad  gas/testsuite/gas/sh/arch/sh4al-dsp.s
+03049005440a99fbf0886c408d64336f  gas/testsuite/gas/sh/basic.exp
+5587c33a91c8d806a2e2974a9ef6ec69  gas/testsuite/gas/sh/dsp.d
+4a91ff56c55784feb5b426e1873c1b72  gas/testsuite/gas/sh/dsp.s
+83d353a7646413b74d2087aa22fae13b  gas/testsuite/gas/sh/err-1.s
+a0ad5112c5f2c5b716feadb70e9b9b75  gas/testsuite/gas/sh/err-at.s
+3d3e9ab1c01d5068d93f52aa77f72eb5  gas/testsuite/gas/sh/err-be.s
+2c810a3f6741effd3db6c1a9ac7f312d  gas/testsuite/gas/sh/err-le.s
+1791836ba27d0f15037d2e77eb2d0c58  gas/testsuite/gas/sh/err-mova.s
+f816019c871b5e6adcc42febdfb003ff  gas/testsuite/gas/sh/err-sh4a-fp.s
+d828b6f7773dbd15941f186102f3f6b8  gas/testsuite/gas/sh/err-sh4a.s
+331a6e02a9da0ad1ec9a54be37b5bd1d  gas/testsuite/gas/sh/err-sh4al-dsp.s
+ed7c19de1dc911e216af593e3b2ca574  gas/testsuite/gas/sh/err.exp
+5988292c3f4864af1512190686d2e22b  gas/testsuite/gas/sh/fdpic.d
+7a3473b5856b9ead9a8a884dc0ce9d55  gas/testsuite/gas/sh/fdpic.s
+70b8c1e3f6395cf992292993dcbdf601  gas/testsuite/gas/sh/fp.s
+f240f299c103126b672ea24bfab01fd1  gas/testsuite/gas/sh/pcrel-coff.d
+0935a11b35249a2ef563467f6e77b5f1  gas/testsuite/gas/sh/pcrel-coff.s
+7f46ac79bd9ca52a2105f00ffab0c4a1  gas/testsuite/gas/sh/pcrel-hms.d
+1161c6b191d101ba7565ec2de44d7856  gas/testsuite/gas/sh/pcrel.d
+bcfb9e14ef9619580a5b5245103eb424  gas/testsuite/gas/sh/pcrel.l
+823af07829673a6bdd394804057aa053  gas/testsuite/gas/sh/pcrel.s
+e9f94174ec8961010b05df00914d6846  gas/testsuite/gas/sh/pcrel2.d
+8f223941cff6690661e5bdf8244c4698  gas/testsuite/gas/sh/pcrel2.s
+aa856567dcbacd54c74725b54745760d  gas/testsuite/gas/sh/pic.d
+22eafa66b3775951b6e619a3e2e5c0e0  gas/testsuite/gas/sh/pic.s
+bf92958f1e9c80b352a33f8c09edb46a  gas/testsuite/gas/sh/reg-prefix.d
+5188e7fe2ea21d2ddb6b7c16949ca6e0  gas/testsuite/gas/sh/reg-prefix.s
+8f268462c23e1ff53e57ff0cf5782a49  gas/testsuite/gas/sh/renesas-1.d
+136ece0d6cadeaeef5d23bc103357880  gas/testsuite/gas/sh/renesas-1.s
+dfdcb4d6177fdba54fa0b33d2cf0d55e  gas/testsuite/gas/sh/sh2a-pic.d
+6ae8401f913088baefba363e4938f8e3  gas/testsuite/gas/sh/sh2a-pic.s
+f0665e0d668ec16d2fb188dfad1d3454  gas/testsuite/gas/sh/sh2a.d
+0906d437e44d69cbce59163bac3d6431  gas/testsuite/gas/sh/sh2a.s
+f4c2ad14cd9d20c194b57df39f544a9d  gas/testsuite/gas/sh/sh4a-dsp.d
+676ee564dee670f1ca81c2c18d3475a0  gas/testsuite/gas/sh/sh4a-dsp.s
+fb4380450ed880975ee81e7ae9bdea17  gas/testsuite/gas/sh/sh4a-fp.d
+db8b098c222e3c21f69d415642a75b3e  gas/testsuite/gas/sh/sh4a-fp.s
+d7ca60046a60171eeea814558a0561a8  gas/testsuite/gas/sh/sh4a.d
+deb4a9d8191424a3b2c1ab3bf2ec6dd2  gas/testsuite/gas/sh/sh4a.s
+9798df68f545e2f72e6cbbcdea0edd6f  gas/testsuite/gas/sh/sh4al-dsp.d
+487eb47915254c0f5d9a9eed6ea79d3c  gas/testsuite/gas/sh/sh4al-dsp.s
+44470af9404b0991f0a8de53aaeb5961  gas/testsuite/gas/sh/sh64/abi-32.d
+0749692ff0242f9f07bb4fedb31c8733  gas/testsuite/gas/sh/sh64/abi-32.s
+3eb436b712f4fa178b0dd638bc6c1744  gas/testsuite/gas/sh/sh64/abi-64.d
+06245a59e3a5b739e18ecbb319af197f  gas/testsuite/gas/sh/sh64/abi-64.s
+6aa899f57c5766b03146255ef6239d48  gas/testsuite/gas/sh/sh64/basic-1.d
+1e6f51fad3cd1b1d5ab2c45eea796556  gas/testsuite/gas/sh/sh64/basic-1.s
+c1f445c9c11eb4488bc89f51fe050f0e  gas/testsuite/gas/sh/sh64/case-1.d
+2b296b90afe0943f8333698c664fcf49  gas/testsuite/gas/sh/sh64/case-1.s
+0235887659edff3be08bb5d027ddeafa  gas/testsuite/gas/sh/sh64/case-noexp-1.d
+b81ca12af382f0818d84ddbc86fc4c40  gas/testsuite/gas/sh/sh64/crange1-1.d
+8b7d4def4f8a0794ea8afafc05807b08  gas/testsuite/gas/sh/sh64/crange1-2.d
+d0c5cb7872cd00006024e62ef6167c91  gas/testsuite/gas/sh/sh64/crange1.s
+2bedb9bdf5f758f990b1510797e5d8ea  gas/testsuite/gas/sh/sh64/crange2-1.d
+2330c6f137034bb0654cd57edab0fe66  gas/testsuite/gas/sh/sh64/crange2-2.d
+760d6157b530940b62c20ddcf087fc10  gas/testsuite/gas/sh/sh64/crange2-noexp-1.d
+74b54c2a8026893d9b508971db63013d  gas/testsuite/gas/sh/sh64/crange2.s
+ab06bd154d96e763a48d1017a0a24b2f  gas/testsuite/gas/sh/sh64/crange3-1.d
+dddce6ad991b22d2a332fde254163f0f  gas/testsuite/gas/sh/sh64/crange3.s
+618bdbf3046c133bdb19d489b1fbd20d  gas/testsuite/gas/sh/sh64/crange4-1.d
+c7a9cf3f74ff694be740e78caef2ac27  gas/testsuite/gas/sh/sh64/crange4.s
+eebbf27928bc7a11690f561255962650  gas/testsuite/gas/sh/sh64/crange5-1.d
+0364881d49d33cbe2fe09bc51a8d6c96  gas/testsuite/gas/sh/sh64/crange5.s
+edcb28050f43b6494d13e9c69b9dac5e  gas/testsuite/gas/sh/sh64/creg-1.d
+322b2608922b8e4aa4a24dcb41bce231  gas/testsuite/gas/sh/sh64/creg-1.s
+21efc2fb414915b801d5726c6466ac26  gas/testsuite/gas/sh/sh64/creg-2.d
+e43ba692ffe7c41968b358f642fbe269  gas/testsuite/gas/sh/sh64/creg-2.s
+841d2514094c765db5d9e6d7dba608f7  gas/testsuite/gas/sh/sh64/datal-1.s
+9052931d984dcc499b11d89706a8e954  gas/testsuite/gas/sh/sh64/datal-2.d
+cb0045841d83f37f4eb400eedc84bd88  gas/testsuite/gas/sh/sh64/datal-2.s
+8bcac43832f5c6bfeb52f53fb371c3a2  gas/testsuite/gas/sh/sh64/datal-3.s
+9ee5c29701a8d086d1009ff641ca0ed6  gas/testsuite/gas/sh/sh64/datal32-1.d
+19427ccccb932e285f3237284e2e0d8c  gas/testsuite/gas/sh/sh64/datal32-3.d
+e9690169872c2de7dcd749d8ab3f1b7d  gas/testsuite/gas/sh/sh64/datal64-1.d
+e2eacd79ed4a1860c3796eb83d0beda2  gas/testsuite/gas/sh/sh64/datal64-3.d
+e79cf2cd84e64f89bdf83480399ee871  gas/testsuite/gas/sh/sh64/eh-1.d
+1073be6cfae9cdafff43809c055de36c  gas/testsuite/gas/sh/sh64/eh-1.s
+8c114620f0ef14cf3de9fdbe132b6121  gas/testsuite/gas/sh/sh64/endian-1.d
+5e4c7d2bf96d59c028edefdbafb057a8  gas/testsuite/gas/sh/sh64/endian-1.s
+4344249ac44ce11b32909e0627ff3f8a  gas/testsuite/gas/sh/sh64/endian-2.d
+5e4c7d2bf96d59c028edefdbafb057a8  gas/testsuite/gas/sh/sh64/endian-2.s
+5f1257702ef4f1cf2aa7b45773be88b5  gas/testsuite/gas/sh/sh64/err-1.s
+9aae56187a70428a96c3f8b63f0b298e  gas/testsuite/gas/sh/sh64/err-2.s
+65d1645ea1b20153be5b8f7835b6a8a1  gas/testsuite/gas/sh/sh64/err-3.s
+1b65e948107dc0338e992bd9514546e6  gas/testsuite/gas/sh/sh64/err-4.s
+71c4c7e159664025065628ccf021f714  gas/testsuite/gas/sh/sh64/err-abi-32.s
+2b150650d4db3e862adc6a56be595791  gas/testsuite/gas/sh/sh64/err-abi-64.s
+8abc3ab97b785a7ebfd4275a97b348ca  gas/testsuite/gas/sh/sh64/err-dsp.s
+08dc6b9013499ecd50a548efb48466fc  gas/testsuite/gas/sh/sh64/err-movi-noexp-1.s
+8f8f3efdf43bf2d38efd13d8553ecfbc  gas/testsuite/gas/sh/sh64/err-noexp-cmd1.s
+74d8b483a9ca10e22a81becf75f93688  gas/testsuite/gas/sh/sh64/err-pt-1.s
+d8d83758870e2005c9ee8016fc5fd919  gas/testsuite/gas/sh/sh64/err-pt32-cmd1.s
+394ffd725133deb9202ca31ee4b1affd  gas/testsuite/gas/sh/sh64/err-pt32-cmd2.s
+ce241d95818d7925a626fd2bb67af1b0  gas/testsuite/gas/sh/sh64/err-pt32-cmd3.s
+fe313ea51eecd9687f6c9b1ea1ad437d  gas/testsuite/gas/sh/sh64/err-ptb-1.s
+53467e7f7bd3ee54d509f1abf897bb7b  gas/testsuite/gas/sh/sh64/err-ptb-2.s
+652957f30edf944c4fa37ec078dee284  gas/testsuite/gas/sh/sh64/err.exp
+a302ce857f60bb21d3b5ab167c701392  gas/testsuite/gas/sh/sh64/immexpr1.s
+1e551fd277888b925aa72edcc9b47245  gas/testsuite/gas/sh/sh64/immexpr2.s
+c778a3f14d70c99360fd986af0cb6328  gas/testsuite/gas/sh/sh64/immexpr32-1.d
+33114323bf4032165ef36d2d065df31d  gas/testsuite/gas/sh/sh64/immexpr32-2.d
+014665cdf46430e77619b873139aaeb0  gas/testsuite/gas/sh/sh64/immexpr64-1.d
+49306968516a75177497a629cf099124  gas/testsuite/gas/sh/sh64/immexpr64-2.d
+5336236826c97b8654780279b7c822c7  gas/testsuite/gas/sh/sh64/lineno.d
+1906fe63cf773b8ac3eb075401c8b72a  gas/testsuite/gas/sh/sh64/lineno.s
+95cbdbb1e8917c7545652de0a3ec238f  gas/testsuite/gas/sh/sh64/localcom-1.d
+c70e2eb58f1fe991dd7d3908cbaa951d  gas/testsuite/gas/sh/sh64/localcom-1.s
+656cf6fdc90218a6795ca05018d54b7a  gas/testsuite/gas/sh/sh64/mix-1.d
+e50f90df0b060272483afbd16c103c5a  gas/testsuite/gas/sh/sh64/mix-1.s
+c1ce2a4b462e4d334b16320deba64423  gas/testsuite/gas/sh/sh64/mix-noexp-1.d
+23823dcdcf05139e4d7252959e4fb5a9  gas/testsuite/gas/sh/sh64/movi-1.s
+b80a38885a06fc68ff405564a6a9f570  gas/testsuite/gas/sh/sh64/movi-2.s
+6f41450ee68e54256fa18e24b33d05ae  gas/testsuite/gas/sh/sh64/movi-3.d
+12ae1cdfb0bbdaaf3a126ee70fe789ab  gas/testsuite/gas/sh/sh64/movi-3.s
+e76eb1e8a1a9db6b1f7fd80febdd28b4  gas/testsuite/gas/sh/sh64/movi32-1.d
+5047d114f091d4508aaf5e889100cd37  gas/testsuite/gas/sh/sh64/movi32-2.d
+08fa128e90a5638d3165265047ba109a  gas/testsuite/gas/sh/sh64/movi32-noexp-2.d
+9dff88384cf4e1318198df8076e59801  gas/testsuite/gas/sh/sh64/movi64-1.d
+716e0122742f29659bad2c2d9c95c4de  gas/testsuite/gas/sh/sh64/movi64-2.d
+b20bbf68d1532d1a7dceed831201b105  gas/testsuite/gas/sh/sh64/movi64-2.s
+b5f8911ff2187db6f3487e67c6f46ec5  gas/testsuite/gas/sh/sh64/movi64-3.d
+fd1344ac02580b0051598095547d35df  gas/testsuite/gas/sh/sh64/movi64-noexp-2.d
+b239a01074851fb2e4ff1114bc99f20c  gas/testsuite/gas/sh/sh64/pt-1.d
+977a0fa9b8369db70c3b38ac06f12780  gas/testsuite/gas/sh/sh64/pt-1.s
+75eda68c6a7031aa1c65acd62c33c3ec  gas/testsuite/gas/sh/sh64/pt-2.s
+e8a236e070173d72dba8a9ff9e8ff1c4  gas/testsuite/gas/sh/sh64/pt-noexp-1.d
+c9cc5ca087461fc49f082527050abe73  gas/testsuite/gas/sh/sh64/pt32-1.d
+4e7e7e9fdcde076652de7863f805d749  gas/testsuite/gas/sh/sh64/pt32-noexp-2.d
+4fd6da9845ac06905af82d15b4001bef  gas/testsuite/gas/sh/sh64/pt64-1.d
+0f8e3e9d84479a1d0f21710af01df50c  gas/testsuite/gas/sh/sh64/pt64-32-1.d
+c89849efcae55b728a13215ba3a74201  gas/testsuite/gas/sh/sh64/pt64-32-2.d
+abdf3ef94d02116c3b7999acd6ec653c  gas/testsuite/gas/sh/sh64/pt64-noexp-2.d
+1a87cdae03956757559ed10057f2e640  gas/testsuite/gas/sh/sh64/ptc-1.s
+487b2b8f76b946228dad904a1959c47f  gas/testsuite/gas/sh/sh64/ptc32-1.d
+9727dd27cc82ffc3eef1d1a6ac8a3a1e  gas/testsuite/gas/sh/sh64/ptc32-noexp-1.d
+3366054bae21b384dfd86d777627ad05  gas/testsuite/gas/sh/sh64/ptc64-1.d
+841daec09a7f42a2e3a63931752c046b  gas/testsuite/gas/sh/sh64/ptc64-32-1.d
+ab2cea95b143e19a9c0e4ff3bd330316  gas/testsuite/gas/sh/sh64/ptc64-noexp-1.d
+96cbd019d7ec79b3c16cda800f382b89  gas/testsuite/gas/sh/sh64/ptext-1.s
+eb804d1481a46c64b61804d9c8e4f209  gas/testsuite/gas/sh/sh64/ptext32-1.d
+e57efa406ea16084d014e1c26afa9d36  gas/testsuite/gas/sh/sh64/ptext32-noexp-1.d
+cac5ed29c9ac5a6a0a61b7dfc7689d71  gas/testsuite/gas/sh/sh64/ptext64-1.d
+5fc5a89754ea5477a34cef60004ee32a  gas/testsuite/gas/sh/sh64/ptext64-32-1.d
+11101bcf2008ecaec3be09cae2f8a4cc  gas/testsuite/gas/sh/sh64/ptext64-noexp-1.d
+4f4382a6dfe422af2b72650213c5a60e  gas/testsuite/gas/sh/sh64/rel-1.s
+8abb4dfaebbb20b16c4b2883b5ab7dd0  gas/testsuite/gas/sh/sh64/rel-2.s
+57efdd6672d3ea92ea66001b514338df  gas/testsuite/gas/sh/sh64/rel-3.s
+2e0d9b5d634a0eabdcd0b15a8974c0f0  gas/testsuite/gas/sh/sh64/rel-4.s
+c05e67e392648f4cb7b8f9eade0b7e3d  gas/testsuite/gas/sh/sh64/rel-5.s
+4228e9087a58f128e96836eeff0668f3  gas/testsuite/gas/sh/sh64/rel32-1.d
+4bb108397bc9fb4eea10c4a38c448eac  gas/testsuite/gas/sh/sh64/rel32-2.d
+d70065fcafbe4927e41a5b4a48f8c058  gas/testsuite/gas/sh/sh64/rel32-3.d
+14a03f44258d33c2a4128c092157650d  gas/testsuite/gas/sh/sh64/rel32-4.d
+bb0b20da50325efadd908400439ff59b  gas/testsuite/gas/sh/sh64/rel32-5.d
+ba7e5d433860b10e57d491ffa1e3ac03  gas/testsuite/gas/sh/sh64/rel64-1.d
+abb7346f1a3066cfc0a2db0c26283ecd  gas/testsuite/gas/sh/sh64/rel64-2.d
+3fe577d87923cb4195c1579430b8b6c6  gas/testsuite/gas/sh/sh64/rel64-3.d
+fd2c887a32ccb111e7311a9861d43e10  gas/testsuite/gas/sh/sh64/rel64-4.d
+95340ee9c1127c68385d432dbd3cae3b  gas/testsuite/gas/sh/sh64/rel64-5.d
+740521b18881de028fee6b20f7ccd04b  gas/testsuite/gas/sh/sh64/relax-1.d
+839efefe10184f6e37271a4994b1b941  gas/testsuite/gas/sh/sh64/relax-1.s
+51da503e7bf63bc0bd9c8a4d7303405c  gas/testsuite/gas/sh/sh64/relax-2.d
+ee117757e571098c2541629a6137fd5a  gas/testsuite/gas/sh/sh64/relax-2.s
+91af884eb0b22a4650ec8d6f8b510931  gas/testsuite/gas/sh/sh64/relax-3.d
+3ee39c26dd95bfe4989cc95050a00c9c  gas/testsuite/gas/sh/sh64/relax-3.s
+fd4e253acf6902089f7a2387d50ca4e3  gas/testsuite/gas/sh/sh64/sh64.exp
+29020352f23aeea0372f8703f586d6d1  gas/testsuite/gas/sh/sh64/shift-1.s
+1faf64608ba2f0f11fbd637c7a656434  gas/testsuite/gas/sh/sh64/shift-2.s
+54edab02d0536f97c10efa96cc9450da  gas/testsuite/gas/sh/sh64/shift-3.s
+6e742f214357147914baae64b4922857  gas/testsuite/gas/sh/sh64/shift32-1.d
+b4a03634321906a242a3b4631f6f67fd  gas/testsuite/gas/sh/sh64/shift32-3.d
+7f046c3dabb15b56c116801e9aa80a81  gas/testsuite/gas/sh/sh64/shift32-noexp-3.d
+bfa64daf3064cdd58c52e2889935c4e7  gas/testsuite/gas/sh/sh64/shift64-1.d
+2c1e84f74b7a62d407c1d3cf67c37777  gas/testsuite/gas/sh/sh64/shift64-2.d
+d09a37937d32f557434bdf59087e2209  gas/testsuite/gas/sh/sh64/shift64-3.d
+fc0d9fcb04df441c84d2ddb4381a1193  gas/testsuite/gas/sh/sh64/shift64-noexp-3.d
+a3d2bc97437c69b7d539eb7048f861d1  gas/testsuite/gas/sh/sh64/syntax-1.d
+3ff1ccb03a52bb73654895d9c1dd091c  gas/testsuite/gas/sh/sh64/syntax-1.s
+55c187e1043e792fb85ad05e1f2cd446  gas/testsuite/gas/sh/sh64/syntax-2.d
+386f5facef43a6f08df831f880a377ba  gas/testsuite/gas/sh/sh64/syntax-2.s
+f34ab08c5b50ac4e4f124b5ecba5ab19  gas/testsuite/gas/sh/sh64/ua-1.s
+bea89df02c11369585780e6764904b5b  gas/testsuite/gas/sh/sh64/ua32-1.d
+99e5ceaf74ff9bfe84f74d42ecb6ac04  gas/testsuite/gas/sh/sh64/ua64-1.d
+184df89aa90dea6bd7b312ab1f7178fe  gas/testsuite/gas/sh/sign-extension.d
+f84dabd7fffc2ac91ab7ef40494d1348  gas/testsuite/gas/sh/sign-extension.s
+17982698d458ba03872085040ba1a817  gas/testsuite/gas/sh/tlsd.d
+1a5dbdc955c0f79813f64148ddcd8353  gas/testsuite/gas/sh/tlsd.s
+805b98d070093e9a4b8b5d92f396cc22  gas/testsuite/gas/sh/tlsnopic.d
+0c7a54cecb95b9959ececc358af7d5db  gas/testsuite/gas/sh/tlsnopic.s
+49f0c3f99f207b7cab4a5e3554774b8e  gas/testsuite/gas/sh/tlspic.d
+ccef24743254119bfb0a1c84283253a9  gas/testsuite/gas/sh/tlspic.s
+b22d0748affc550308490e73c740db0f  gas/testsuite/gas/sh/too_large.d
+314ff5a57af40c641f3b7a2ceb003074  gas/testsuite/gas/sh/too_large.s
+392efaa6637a8734d3ab35e579615a53  gas/testsuite/gas/sparc/asi.d
+8f35c68aef641d7cc35698d67a32557e  gas/testsuite/gas/sparc/asi.s
+ef3fe6155d6cd4134bc1b70632ba3312  gas/testsuite/gas/sparc/gotop32.d
+5d533036b1e4c0a34a86f3595294aca5  gas/testsuite/gas/sparc/gotop32.s
+80c7f659aa406ac9b5fda38c766b7827  gas/testsuite/gas/sparc/gotop64.d
+4633f014f6e73296c124390a4c0c84fc  gas/testsuite/gas/sparc/gotop64.s
+b016659d4ba6d4c4f31841b8c46fd680  gas/testsuite/gas/sparc/hpcvis3.d
+5ecb9537aba3f95a8c5513a2891fd5ee  gas/testsuite/gas/sparc/hpcvis3.s
+eb20cec37ba75b64cfb66ba2ef4c7248  gas/testsuite/gas/sparc/imm-plus-rreg.d
+baf0d8acc429d839d582782ba995fb86  gas/testsuite/gas/sparc/imm-plus-rreg.s
+4b815d3da1c2d2bceeb98994c659c492  gas/testsuite/gas/sparc/membar.d
+521b5671f3aa6bae70f78b5f3d37de1a  gas/testsuite/gas/sparc/membar.s
+12b5e618325d4a4bc80cb8766bbfc064  gas/testsuite/gas/sparc/mism-1.s
+706c79f848f389921b20f0f64dde1ecd  gas/testsuite/gas/sparc/mismatch.exp
+3d4fc17a8ac5ea6103ec7b199573aca6  gas/testsuite/gas/sparc/pc2210.d
+a9d9b9652c9c9d90702f7be6097672a1  gas/testsuite/gas/sparc/pc2210.s
+44169c5563a88510bc703438a7eae8f4  gas/testsuite/gas/sparc/pcrel.d
+6065405af8fda4de18e07e1863d3e6dc  gas/testsuite/gas/sparc/pcrel.s
+b1342d8f5d0190f0c50f2e9321f4e58e  gas/testsuite/gas/sparc/pcrel64.d
+8c92147ad9a6ef778b5ccbf101ae253e  gas/testsuite/gas/sparc/pcrel64.s
+22d75f06f968a1d689517b3271434c7c  gas/testsuite/gas/sparc/plt.d
+830651a18c39323a5169f284cecfc66a  gas/testsuite/gas/sparc/plt.s
+8c5e60de8c40ab24b01121661c24beac  gas/testsuite/gas/sparc/plt64.d
+02b176ee41fceeab10ef800c7c2a8c7e  gas/testsuite/gas/sparc/plt64.s
+353df91c8b350e8582ada2d2e2c816e2  gas/testsuite/gas/sparc/pr4587.l
+014d3e1694269604d495f7333dee9e0e  gas/testsuite/gas/sparc/pr4587.s
+d85c226fa388a66bd2689ba3efedf5e4  gas/testsuite/gas/sparc/prefetch.d
+0b615422f6c8ad3fe5c42f2a8c7af1e4  gas/testsuite/gas/sparc/prefetch.s
+3f120e259bb733ce1ef75f0a68342cc0  gas/testsuite/gas/sparc/rdhpr.d
+2f411297453660c0100a244389bf7798  gas/testsuite/gas/sparc/rdhpr.s
+d77dc9121f8c4bca412d9a7f3ed35361  gas/testsuite/gas/sparc/rdpr.d
+3b1796f1e8b5020c05aa9f29aeba3967  gas/testsuite/gas/sparc/rdpr.s
+78517d2fce6c7707fd2f09689ebc3d72  gas/testsuite/gas/sparc/reloc64.d
+7d56aec0e050e09c004a33abd25a9293  gas/testsuite/gas/sparc/reloc64.s
+8ba4542c7545b40e466048feedaf6a62  gas/testsuite/gas/sparc/save-args.d
+cb23fd033ae0f3402a115de7507758ca  gas/testsuite/gas/sparc/save-args.s
+08afa18cf165a3043a6b92153526c876  gas/testsuite/gas/sparc/set64.d
+1facb5655fe83c44ac900776c563e717  gas/testsuite/gas/sparc/set64.s
+115f1e093e29655563d1f9fda905cd27  gas/testsuite/gas/sparc/sparc.exp
+3564e46bcf53613a512e32f2633c3d05  gas/testsuite/gas/sparc/splet-2.d
+69817b445f39a0e3cf591de872fa74e5  gas/testsuite/gas/sparc/splet-2.s
+5fa3fb7a059f3fd315df0af21e0c9619  gas/testsuite/gas/sparc/splet.d
+6236b0423a317e0a2340bdb317c54d1e  gas/testsuite/gas/sparc/splet.s
+a6b1a41bb26dc70e130bc42ef7133cc7  gas/testsuite/gas/sparc/synth.d
+0e0dead95b89c31c1ed49b21c430bc1a  gas/testsuite/gas/sparc/synth.s
+b041cafa83c1f1f131ca949780217e54  gas/testsuite/gas/sparc/synth64.d
+0303005116e0116e28f1dd473ca39f28  gas/testsuite/gas/sparc/synth64.s
+5bce6170ac4dfffcad902214096c98ab  gas/testsuite/gas/sparc/ticc-imm-reg.d
+2dd64c66c5621c4848bc214ddf855e05  gas/testsuite/gas/sparc/ticc-imm-reg.s
+d9387e1243975789897f80338801920f  gas/testsuite/gas/sparc/unalign.d
+4f0d12b16f8afe39a387c14fd41d4382  gas/testsuite/gas/sparc/unalign.s
+e35e63553e1c720e4d7c4563d2f38a05  gas/testsuite/gas/sparc/v8-movwr-imm.d
+eb879ffcaa07471db4ecd7754ff059c7  gas/testsuite/gas/sparc/v8-movwr-imm.s
+bfd9b03ccd61839b71e47459eb40cbe0  gas/testsuite/gas/sparc/v9branch1.d
+096c1cdf2aeeaa59bfcb5df0e6036889  gas/testsuite/gas/sparc/v9branch1.s
+66779138a109c8fbbdd70da3f137c15d  gas/testsuite/gas/sparc/v9branch2.d
+fe8f31f9d59c9508c0a5b8318b3e47f1  gas/testsuite/gas/sparc/v9branch2.s
+3e49e6c4b27c8e16bcd4fd910abba527  gas/testsuite/gas/sparc/v9branch3.d
+4fe9de8c112ff4fea5a6570502ac4b6d  gas/testsuite/gas/sparc/v9branch3.s
+825979884774a5fad2259b6c7d1f11f0  gas/testsuite/gas/sparc/v9branch4.d
+ff8d44d6fdff4d2ca0508c3b281373eb  gas/testsuite/gas/sparc/v9branch4.s
+573b3edad98d877cbcd9aa7a7ff0c744  gas/testsuite/gas/sparc/v9branch5.d
+ef34f726612640b58a20eacaea77c88e  gas/testsuite/gas/sparc/v9branch5.s
+31b399c66449684fd71cf29e4947afe2  gas/testsuite/gas/sparc/vxworks-pic.d
+a3f26463209f0178d369c6a83b31f1cb  gas/testsuite/gas/sparc/vxworks-pic.s
+7ce6d9aeae268f49a69d0988ace42ee6  gas/testsuite/gas/sparc/window.d
+156e5bb3b40ebb2c46988c64270e5137  gas/testsuite/gas/sparc/window.s
+9128a03ea2a83074a28f191ca90e896b  gas/testsuite/gas/sparc/wrhpr.d
+7b8495e86ce639aa561385f702e67e4f  gas/testsuite/gas/sparc/wrhpr.s
+8c901935caf906883529422755d1a4bf  gas/testsuite/gas/sparc/wrpr.d
+ad65b667840b0c204c3c8379a0b38b8c  gas/testsuite/gas/sparc/wrpr.s
+f65f40edb42735b8af3a4baaacd662f5  gas/testsuite/gas/sparc-solaris/addend.exp
+7dd4467acc1dda3c1753ebcbfeeead33  gas/testsuite/gas/sparc-solaris/addend.s
+dd2ab79e6bd90288569274206313966b  gas/testsuite/gas/sparc-solaris/gas.exp
+b2d813e248b8ec085ca8d551271274bf  gas/testsuite/gas/sparc-solaris/sol-cc.s
+2e927e8072e145441bb882a01e3ac8cd  gas/testsuite/gas/sparc-solaris/sol-gcc.s
+54a6b727f437bf7989e266329d0dd875  gas/testsuite/gas/sun4/addend.d
+b648f70387617b14507805caeea0b6d6  gas/testsuite/gas/sun4/addend.exp
+7dd4467acc1dda3c1753ebcbfeeead33  gas/testsuite/gas/sun4/addend.s
+3453866e3d5ff2c0b47520e5c1bfe756  gas/testsuite/gas/symver/symver.exp
+85f57708f7d8db6957900a6fb76ab4fb  gas/testsuite/gas/symver/symver0.d
+7f2d42503901978e4eb5bab37fd01df2  gas/testsuite/gas/symver/symver0.s
+9107b44387b3b0e9184504449d6e4d84  gas/testsuite/gas/symver/symver1.d
+1d6eb4d5a6cbf6ac541ca7d4c561b74f  gas/testsuite/gas/symver/symver1.s
+719196efd607fc7ec9ba9c876bf2f00d  gas/testsuite/gas/symver/symver2.l
+7214f11688ed0284f53c3c060fa973bf  gas/testsuite/gas/symver/symver2.s
+d37568e052e76a50c9d4775eede01585  gas/testsuite/gas/symver/symver3.l
+7f58a39bd0e6eda06fa15260adaa1044  gas/testsuite/gas/symver/symver3.s
+aaf2746f913c7c81f487786bd9b99543  gas/testsuite/gas/symver/symver4.l
+ff40f84c77b398ca408422048eb1684e  gas/testsuite/gas/symver/symver4.s
+c2401f7310b24ae252e1905a90fbb133  gas/testsuite/gas/symver/symver5.l
+ed56c563fc819e4c50c4160a17f8abae  gas/testsuite/gas/symver/symver5.s
+a3a92a55022c0edb85d34af1d1739ee8  gas/testsuite/gas/symver/symver6.l
+73c983230d1435795774501e7247e78c  gas/testsuite/gas/symver/symver6.s
+218ceddbec7e4efdd63a6186a62fded9  gas/testsuite/gas/template
+8ea79039a765caf02b0270c41d2aecea  gas/testsuite/gas/tic4x/addressing.s
+1d1cd32af19bf411056f0e5dc6793704  gas/testsuite/gas/tic4x/addressing_c3x.d
+3a9747d4c737fcaa03d48bfb244c65d1  gas/testsuite/gas/tic4x/addressing_c4x.d
+87791d8e703ba0e4a6f558667ae0b37b  gas/testsuite/gas/tic4x/allopcodes.S
+759572024f59fdd5f644cf67e6f534bb  gas/testsuite/gas/tic4x/data.d
+9d1169a0d03a6cf2c75cd4ee202a28d6  gas/testsuite/gas/tic4x/data.s
+1eeee4f18eb831980279d37275498be8  gas/testsuite/gas/tic4x/float.d
+7e1d0515d6c0d58e786c6eba115d7f18  gas/testsuite/gas/tic4x/float.s
+edd930af223500ae3f3c8a6235859f7e  gas/testsuite/gas/tic4x/opclasses.h
+3f4860301a631779c7ce027dfe991eea  gas/testsuite/gas/tic4x/opcodes.s
+5dc32889ee5cceadaa36ed8edaa74110  gas/testsuite/gas/tic4x/opcodes_c3x.d
+1897a6f02cf723ddd4767fd6d08f92dc  gas/testsuite/gas/tic4x/opcodes_c4x.d
+9143bb67c8b4f9c4981c736c09ad8d0e  gas/testsuite/gas/tic4x/opcodes_new.d
+925a40c20b5622660b057bbe1607939d  gas/testsuite/gas/tic4x/rebuild.sh
+749edd66d0478c88fb2fe6dbe1e43a6a  gas/testsuite/gas/tic4x/registers.s
+298a8cba1f2f8117ba5d67e272c9f965  gas/testsuite/gas/tic4x/registers_c3x.d
+3bfcecd5b33adf2bd9b8d7def7786678  gas/testsuite/gas/tic4x/registers_c4x.d
+bc620bbcb914996a6b20eb637ffcaa1d  gas/testsuite/gas/tic4x/tic4x.exp
+eefd3d89495af1e2d0bb45ba859d9481  gas/testsuite/gas/tic4x/zeros.d
+95dc276c67e715e06ef1690e2cc33bec  gas/testsuite/gas/tic4x/zeros.s
+3445e4e0e63e380c58fa9a238a67aee5  gas/testsuite/gas/tic54x/address.d
+78c05303f9f0cbc1a4610cafd8684961  gas/testsuite/gas/tic54x/address.s
+1c273453dd66e3fe0b42ac96860cfe1c  gas/testsuite/gas/tic54x/addrfar.d
+04728b4642409775852f79c1d68c4f54  gas/testsuite/gas/tic54x/align.d
+f705542096afe413c7ab6ffa17469af7  gas/testsuite/gas/tic54x/align.s
+7d55407efacfaa48a63c6f33ce4096bf  gas/testsuite/gas/tic54x/all-opcodes.d
+16b138265d758ee38dbf89a41696f4b4  gas/testsuite/gas/tic54x/all-opcodes.s
+fade7483f79e5beef3973e1dd59c5713  gas/testsuite/gas/tic54x/asg.d
+64c9ec95e386f8e5d0040c26fee7321c  gas/testsuite/gas/tic54x/asg.s
+d7b5d8e349a3f2f2b36167d8aad33d40  gas/testsuite/gas/tic54x/cons.d
+671f83be79acf4e42032f33d828864ac  gas/testsuite/gas/tic54x/cons.s
+720ded5513845bac8bffaba11faa1bda  gas/testsuite/gas/tic54x/consfar.d
+9d9a1c4f120f6ce8f3bd03ee0986c9c2  gas/testsuite/gas/tic54x/extaddr.d
+1eff597d688aedce62a361714b4bb6aa  gas/testsuite/gas/tic54x/extaddr.s
+802b686cf4ec88db9eb851402427de50  gas/testsuite/gas/tic54x/field.d
+534ff025c4a332a0b3a4811c889d9637  gas/testsuite/gas/tic54x/field.s
+e8334221e9d81711a8120983fc654f4b  gas/testsuite/gas/tic54x/in_mlib.asm
+1af2989af2066c93fd7ebc8b607b8fd2  gas/testsuite/gas/tic54x/labels.d
+aae9f04acb5f59969bf1f0465d7c78bd  gas/testsuite/gas/tic54x/labels.inc
+398343a46a08804051ef4cb0fcd926b1  gas/testsuite/gas/tic54x/labels.s
+8734a1dfc7dd3bb849fe422776e761e2  gas/testsuite/gas/tic54x/loop.d
+4a609e1f44de00f164f48203d5df870b  gas/testsuite/gas/tic54x/loop.s
+59a9b26dade4493634167731704fc899  gas/testsuite/gas/tic54x/lp.d
+2c650e0c313376b80d7a6950039ff3b4  gas/testsuite/gas/tic54x/lp.s
+816673a798bddfbface0f02c77beca0d  gas/testsuite/gas/tic54x/macro.d
+d76d2e7a0d946a16279b4eeafcfa0cc7  gas/testsuite/gas/tic54x/macro.s
+09c277ba1f7d69551c473cd20cbb14bd  gas/testsuite/gas/tic54x/macro1.s
+ddbfc019917d779c19002992f3929367  gas/testsuite/gas/tic54x/macros.lib
+0649dee6b4c28e25ae3db473f82bc0f2  gas/testsuite/gas/tic54x/math.d
+1ff7d6cd1fb20b8cde42e82ea5e38dfa  gas/testsuite/gas/tic54x/math.s
+fb2be21a90949c70f748c2c937d6efa9  gas/testsuite/gas/tic54x/opcodes.d
+03c7d9751c849b0f4a04ce24d181e494  gas/testsuite/gas/tic54x/opcodes.s
+6680a6234b1ad893200ab5eb9360bc4d  gas/testsuite/gas/tic54x/sections.d
+fe46811cda30294230b15a91c5b47d07  gas/testsuite/gas/tic54x/sections.s
+3a8e6d194159fe413ec370a0d8802c6f  gas/testsuite/gas/tic54x/set.d
+cdf1f13fafc4d4abd831567cdda40eff  gas/testsuite/gas/tic54x/set.s
+48c074b199687a4265e4bafcd7d35c9d  gas/testsuite/gas/tic54x/struct.d
+28bcc7e09d20e59e1ccb70e318f45324  gas/testsuite/gas/tic54x/struct.s
+4563812083147c039c2b6048cdfe8b73  gas/testsuite/gas/tic54x/subsym.d
+a6d4e40952285da31a31a7146766dc04  gas/testsuite/gas/tic54x/subsym.s
+a3547e6b13dd61f04ad639ae18c38bb3  gas/testsuite/gas/tic54x/subsym1.s
+b2df4dd8056e7236407bbc4c60b27b02  gas/testsuite/gas/tic54x/tic54x.exp
+0292691d7ef542a74d2a551262b84974  gas/testsuite/gas/tic6x/align-1-be.d
+314ab4f7826e2b1b4cd56d1f6ad60a0a  gas/testsuite/gas/tic6x/align-1.d
+e1678ba77aa41ef725bef04500901f57  gas/testsuite/gas/tic6x/align-1.s
+b830b1544d7da3d16c21d0df428f2602  gas/testsuite/gas/tic6x/align-2.d
+07e4448e8f279316c990d98671c88b5d  gas/testsuite/gas/tic6x/align-2.s
+f6979aac6dd228b4ac8a1bd63662f2bf  gas/testsuite/gas/tic6x/arch-invalid-1.d
+0f2b68b263d8e79b628903c269788099  gas/testsuite/gas/tic6x/arch-invalid-1.l
+452d718dbef6464e6191eb06892962c1  gas/testsuite/gas/tic6x/arch-invalid-2.d
+2566b7ba35e8d8294d37617ed6fe0833  gas/testsuite/gas/tic6x/arch-invalid-2.l
+da531320ba80965ddd10e2106a5fb286  gas/testsuite/gas/tic6x/arch-invalid-2.s
+20fddf24334ba240950cd76d0f712c7c  gas/testsuite/gas/tic6x/attr-arch-directive-1.d
+43aca16807762a815a07fedcba994d19  gas/testsuite/gas/tic6x/attr-arch-directive-1.s
+5a7218a825f5aab2a5ce42669816fb0d  gas/testsuite/gas/tic6x/attr-arch-directive-2.d
+ae4ef03990822b8f56e27f2374e2ca1d  gas/testsuite/gas/tic6x/attr-arch-directive-2.s
+7f5f58d419517314fa89ea872db44769  gas/testsuite/gas/tic6x/attr-arch-directive-3.d
+1bab1da2b97874f2baab1c1626f40a28  gas/testsuite/gas/tic6x/attr-arch-directive-3.s
+c8865c853bc62a8707cc34b50f23ef46  gas/testsuite/gas/tic6x/attr-arch-directive-4.d
+5eb713d19630d7601ce377575f99a766  gas/testsuite/gas/tic6x/attr-arch-directive-4.s
+80599d828502a8e988bef81205eb299d  gas/testsuite/gas/tic6x/attr-arch-directive-5.d
+4ad91d0e9b23d9ddf8ad4e8c9a57e908  gas/testsuite/gas/tic6x/attr-arch-directive-5.s
+56a2eec68fa61fa7fa42673aec41e2db  gas/testsuite/gas/tic6x/attr-arch-opts-c62x.d
+dee3dce64c246b022086b6c7add381ec  gas/testsuite/gas/tic6x/attr-arch-opts-c64x+.d
+3bd9b6ed4d8653ff669f06fbd5e2e490  gas/testsuite/gas/tic6x/attr-arch-opts-c64x.d
+1b3e69b1f9e5dce56882e55436e0f3d8  gas/testsuite/gas/tic6x/attr-arch-opts-c674x.d
+163cb9553f068b014ca2d521c5e534bf  gas/testsuite/gas/tic6x/attr-arch-opts-c67x+.d
+c759dfb7a3f7fa5685a8c86a4f53e8e8  gas/testsuite/gas/tic6x/attr-arch-opts-c67x.d
+d4e4241ef156b64966ab65ac1c460378  gas/testsuite/gas/tic6x/attr-arch-opts-none-1.d
+ac66c3f7977b2e4103b2f9980da4eb13  gas/testsuite/gas/tic6x/attr-arch-opts-none-2.d
+3733df8484393aaa4d319d44c59d398c  gas/testsuite/gas/tic6x/attr-arch-opts-override-1.d
+a19ca6bb8768df1addd2d37680c2701c  gas/testsuite/gas/tic6x/attr-arch-opts-override-2.d
+1c29bc10eacc8c10f1ddb82331e5b439  gas/testsuite/gas/tic6x/attr-array-directive-1.d
+f0dba8bccb09da415b94992e06e7a47b  gas/testsuite/gas/tic6x/attr-array-directive-1.s
+9a8df67f82c662c19995a762e603321b  gas/testsuite/gas/tic6x/attr-array-directive-2.d
+080f97096e28a9f53d92a8843d5791aa  gas/testsuite/gas/tic6x/attr-array-directive-2.s
+2351b5e02a4c1f13a438b69b68424549  gas/testsuite/gas/tic6x/attr-array-directive-3.d
+2c802bb2185db576f2be694c37e499c1  gas/testsuite/gas/tic6x/attr-array-directive-3.s
+310fc5993638cad29117cf39d51f0df5  gas/testsuite/gas/tic6x/attr-array-directive-4.d
+ebc4b14180dde8322060c1244d3c1c3e  gas/testsuite/gas/tic6x/attr-array-directive-4.s
+d30fb58251e5d7739115b085a3d75844  gas/testsuite/gas/tic6x/attr-compatibility-directive-1.d
+e886896ee5d42dc31876cf12dc9d1778  gas/testsuite/gas/tic6x/attr-compatibility-directive-1.s
+6b99bbe72ede1c6dfe593a5884bc8fe8  gas/testsuite/gas/tic6x/attr-compatibility-directive-2.d
+ad27bb702cd8f6c4b104296f586f9ecc  gas/testsuite/gas/tic6x/attr-compatibility-directive-2.s
+f7cd95e99308c8fa460e51350747b2ab  gas/testsuite/gas/tic6x/attr-conformance-directive-1.d
+786f3635b154df9fe6c29bab350fd463  gas/testsuite/gas/tic6x/attr-conformance-directive-1.s
+d22e95764d190c4e07a30ff0d932669a  gas/testsuite/gas/tic6x/attr-conformance-directive-2.d
+b1680f78350f20794eb9f9541aa51b35  gas/testsuite/gas/tic6x/attr-conformance-directive-2.s
+bdef20c6246f3fbdcd6690a83a5df983  gas/testsuite/gas/tic6x/attr-dsbt-directive-1.d
+0fe070a48c2c9bf2fac7196d52429a66  gas/testsuite/gas/tic6x/attr-dsbt-directive-1.s
+bdef20c6246f3fbdcd6690a83a5df983  gas/testsuite/gas/tic6x/attr-dsbt-directive-2.d
+2b17ebffb20409aecabde431c3c9e421  gas/testsuite/gas/tic6x/attr-dsbt-directive-2.s
+a3fa82ff1a51e048e375ac6b09de7aba  gas/testsuite/gas/tic6x/attr-dsbt-opts-mdsbt.d
+d5665f6a524c2ee75129d009fd8e2972  gas/testsuite/gas/tic6x/attr-dsbt-opts-mno-dsbt.d
+4ada588fa359b7cff746e20182329713  gas/testsuite/gas/tic6x/attr-pic-directive-1.d
+5d079c56a0ee00da96bf9adad4fb16b7  gas/testsuite/gas/tic6x/attr-pic-directive-1.s
+9270470e6d0eb89e68f54a9782755f4d  gas/testsuite/gas/tic6x/attr-pic-directive-2.d
+6e9d8a9b241c7184b807b840650d0466  gas/testsuite/gas/tic6x/attr-pic-directive-2.s
+b25801987b41d9518083b238ad7e6fd0  gas/testsuite/gas/tic6x/attr-pic-opts-mno-pic.d
+a3be0fcc77f4854e562db86a0483c0c1  gas/testsuite/gas/tic6x/attr-pic-opts-mpic.d
+2f585e5b5e480285bca1e4cd944a90a6  gas/testsuite/gas/tic6x/attr-pid-directive-1.d
+c2ad71377c6220dbae8be6cc4eacfdaf  gas/testsuite/gas/tic6x/attr-pid-directive-1.s
+a71701b4e667d244494733acac80fb92  gas/testsuite/gas/tic6x/attr-pid-directive-2.d
+ecaa62bb2c3e34c1c187a59ba8a1e452  gas/testsuite/gas/tic6x/attr-pid-directive-2.s
+11f3a10ccbfd254d8d0dc595f1a9aac7  gas/testsuite/gas/tic6x/attr-pid-opts-mpid-far.d
+dc3b7b460615e562f02dcc460fc56d05  gas/testsuite/gas/tic6x/attr-pid-opts-mpid-near.d
+68958d93c98213ba914771927c60efc7  gas/testsuite/gas/tic6x/attr-pid-opts-mpid-no.d
+ea849d8ff266b8adbb9caf2a82a32931  gas/testsuite/gas/tic6x/attr-stack-directive-1.d
+27a7b1ccb09fb00e3d53c4d5c9de9c4e  gas/testsuite/gas/tic6x/attr-stack-directive-1.s
+f4bd95ee7b9a368df91e877d0989d188  gas/testsuite/gas/tic6x/attr-stack-directive-2.d
+6cd602df51d60bf4569cd9e9956d810f  gas/testsuite/gas/tic6x/attr-stack-directive-2.s
+76844e58a66dae09a3976bcc562e1ed9  gas/testsuite/gas/tic6x/attr-wchar-directive-1.d
+f4d640b4b71b7f6f09646f92e39c5eba  gas/testsuite/gas/tic6x/attr-wchar-directive-1.s
+a29cc1380e1b855fad6079a461f01312  gas/testsuite/gas/tic6x/attr-wchar-directive-2.d
+aa079f042cbb63c970da97194d81bc5e  gas/testsuite/gas/tic6x/attr-wchar-directive-2.s
+1720cc96b91b1e8b80471a1cf755dec1  gas/testsuite/gas/tic6x/data-reloc.d
+0e8fc10d4de5d1f2d9a3e1d8379ac44d  gas/testsuite/gas/tic6x/data-reloc.s
+90a95ea3d2fa2ccc2cfefbbd78aa78c2  gas/testsuite/gas/tic6x/dir-junk.d
+a42e9541540ca650f814df716ca8924a  gas/testsuite/gas/tic6x/dir-junk.l
+37a0d6199b4eee9314d83459337152b4  gas/testsuite/gas/tic6x/dir-junk.s
+62b3eedee55ca149b115e7fd92ddce54  gas/testsuite/gas/tic6x/dummy.s
+307a9041af515f39eb2213be1d49c4a0  gas/testsuite/gas/tic6x/empty.s
+5a56af2d02f2f2ccaf0fb65567120165  gas/testsuite/gas/tic6x/endian-1.d
+dd5451103f901909b04672109f64767f  gas/testsuite/gas/tic6x/endian-2.d
+5d859821871298e682cc9bf9acc22c6c  gas/testsuite/gas/tic6x/endian-3.d
+a6a9f82e951ca61a4ebd8b7455c387a9  gas/testsuite/gas/tic6x/got-reloc.d
+8248d8e0809a86aa4471b561448d75b2  gas/testsuite/gas/tic6x/got-reloc.s
+a38f9b25ead59a336717d9302e831eaa  gas/testsuite/gas/tic6x/insns-atomic.d
+dbef2d1637ad40cf1f9ce546861f0c5b  gas/testsuite/gas/tic6x/insns-atomic.s
+c2447fff290d2bdc8fdf9637e6cbe07e  gas/testsuite/gas/tic6x/insns-bad-1.d
+f2b8be95bf18b62391b23f49fc86b7ba  gas/testsuite/gas/tic6x/insns-bad-1.l
+86e1db7b882a49c3629f650d2becaca3  gas/testsuite/gas/tic6x/insns-bad-1.s
+173d499230b240e5527a0c17914bbad6  gas/testsuite/gas/tic6x/insns-bad-2.d
+87f671addae18926aa640abce60ffaf3  gas/testsuite/gas/tic6x/insns-bad-2.l
+a40fd236a95340d2dfa534a86b6e369a  gas/testsuite/gas/tic6x/insns-bad-2.s
+f78b9e4f68c8215a7488f5ee30931781  gas/testsuite/gas/tic6x/insns-c674x-pcrel.d
+a557e1c7cb560f21c16e399772dae3ba  gas/testsuite/gas/tic6x/insns-c674x-pcrel.s
+7e04b71a0f2d922ed5b571b19711146e  gas/testsuite/gas/tic6x/insns-c674x-reloc.d
+348f97e32f4441c73c72e9112f0b52f8  gas/testsuite/gas/tic6x/insns-c674x-reloc.s
+661acb955ac7369905391334fd33abe7  gas/testsuite/gas/tic6x/insns-c674x-sploop.d
+3805027efd5ca5d8c0187e065dad0a0a  gas/testsuite/gas/tic6x/insns-c674x-sploop.s
+b49da0d78c8900e4c02c2a7961dc4c18  gas/testsuite/gas/tic6x/insns-c674x.d
+92a255490de4241753bc11152b831e31  gas/testsuite/gas/tic6x/insns-c674x.s
+7d7f7de4b59638a56e8b196b42be479e  gas/testsuite/gas/tic6x/insns-parallel-be.d
+0ba16ba6bd3ee7790759af2b6afaeee6  gas/testsuite/gas/tic6x/insns-parallel-le.d
+e51b5004cb21d29d610392037e0d8e88  gas/testsuite/gas/tic6x/insns-parallel-multi.d
+c722408d039a0eb6d616c6b1ecb98fcd  gas/testsuite/gas/tic6x/insns-parallel-multi.s
+459ad66f53e9cc5c8e5a5c6a6fd1e6f7  gas/testsuite/gas/tic6x/insns-parallel.s
+f5267472ca3a19c098ee201ff786ce61  gas/testsuite/gas/tic6x/insns-predicate.d
+a70f660f28fa4488a39e43503d4f6ee0  gas/testsuite/gas/tic6x/insns-predicate.s
+f5a3a284999c79808681b012508d84ca  gas/testsuite/gas/tic6x/parallel-bad-1.d
+d809a198cfdf69218576cc69577bc652  gas/testsuite/gas/tic6x/parallel-bad-1.l
+f36413f9e5ec3461f551fcaa51686887  gas/testsuite/gas/tic6x/parallel-bad-1.s
+df65ded8be67b1c50e781d11ab4fd0bd  gas/testsuite/gas/tic6x/parallel-bad-2.d
+74ab5f162a462fb31f06af5f269322ed  gas/testsuite/gas/tic6x/parallel-bad-2.l
+1d85516e09e5177b4a27aa3c2c8a650c  gas/testsuite/gas/tic6x/parallel-bad-2.s
+a60003f468f96155173d0038e096b0a4  gas/testsuite/gas/tic6x/parallel-bad-3.d
+278faa1dc9675aa435650f2e54b1a53d  gas/testsuite/gas/tic6x/parallel-bad-3.l
+207a432af1d51fef4ed7510997d7a417  gas/testsuite/gas/tic6x/parallel-bad-3.s
+bd8e7dfb3d414df29defc15bdad94e2b  gas/testsuite/gas/tic6x/parallel-bad-4.d
+6673ba5cef14483e723c006f4b58161a  gas/testsuite/gas/tic6x/parallel-bad-4.l
+b4116db61c069c104754eac5ef709cca  gas/testsuite/gas/tic6x/parallel-bad-4.s
+c7d737c37a1a0e0271b72bc0e3e2e925  gas/testsuite/gas/tic6x/pcr-relocs-undef.d
+149af792629a558aa749ee68fdc1c866  gas/testsuite/gas/tic6x/pcr-relocs-undef.s
+340b81e4c642f9902866420556fa8d3b  gas/testsuite/gas/tic6x/pcr-relocs.d
+4c748bfffa7033a3c4eea2d24dc98a2c  gas/testsuite/gas/tic6x/pcr-relocs.s
+a37d644d05b070755dd5a6f02e893647  gas/testsuite/gas/tic6x/predicate-bad-1.d
+5bf15cf1d8344ea46bef6b2b33784577  gas/testsuite/gas/tic6x/predicate-bad-1.l
+e96f3d394d750cecab51ab53fe16f771  gas/testsuite/gas/tic6x/predicate-bad-1.s
+844d491506d593cb40a9ddc61241532a  gas/testsuite/gas/tic6x/predicate-bad-2.d
+e8d102e3737270245af7a30b4ddde075  gas/testsuite/gas/tic6x/predicate-bad-2.l
+6603efc1d375e70988c31322b3c72eba  gas/testsuite/gas/tic6x/predicate-bad-2.s
+f9ed74292532f3f71c62831cbfbe210d  gas/testsuite/gas/tic6x/predicate-bad-3.d
+8a9f49b2f4ce1e3d62cbb13031f518b2  gas/testsuite/gas/tic6x/predicate-bad-3.l
+0f3f6808d72b6cf1c872bb3f6733d72d  gas/testsuite/gas/tic6x/predicate-bad-3.s
+e6a9692f4ababe4217f7c53eaa61ea18  gas/testsuite/gas/tic6x/reloc-bad-1.d
+3c0d41c058bcd25fd4afa6b7b60e493e  gas/testsuite/gas/tic6x/reloc-bad-1.l
+a92fb62ec7720d4e9c944f64015d85ad  gas/testsuite/gas/tic6x/reloc-bad-1.s
+1fcf20be09eba994a39187ddc9e1e674  gas/testsuite/gas/tic6x/reloc-bad-2.d
+b5cb2f8bf7756524e68077e29982cf57  gas/testsuite/gas/tic6x/reloc-bad-2.l
+7329e886d201b3a516b575d747bd13dd  gas/testsuite/gas/tic6x/reloc-bad-2.s
+d2a29898101577ad60df9faa6bfaf89e  gas/testsuite/gas/tic6x/reloc-bad-3.d
+8691f48c0e751b835bea2b8b1ff07052  gas/testsuite/gas/tic6x/reloc-bad-3.l
+661f07caa4741fcb8c4cc32862bd5d8e  gas/testsuite/gas/tic6x/reloc-bad-3.s
+6d8d853f4454fe22d2bc73f21d478f19  gas/testsuite/gas/tic6x/reloc-bad-4.d
+5bf30d493bdc35c6bdc3a064fb9eca50  gas/testsuite/gas/tic6x/reloc-bad-4.l
+633c7c4826bfff06f579048d64d850d9  gas/testsuite/gas/tic6x/reloc-bad-4.s
+15af7c03daf11c8003dbe770bd60282c  gas/testsuite/gas/tic6x/reloc-bad-5.d
+8bf61094a5f8c36b905ac232a888afb0  gas/testsuite/gas/tic6x/reloc-bad-5.l
+5cfc742bec771868c4872e4072824ace  gas/testsuite/gas/tic6x/reloc-bad-5.s
+8b083b96669141fb8e4aafd4384cf86e  gas/testsuite/gas/tic6x/reloc-bad-6.d
+3b67ac0816b1a93a56bea2973819068e  gas/testsuite/gas/tic6x/reloc-bad-6.l
+63ae8145d338102f2029f8c3820206f8  gas/testsuite/gas/tic6x/reloc-bad-6.s
+319f1a8820a16f4d740bf087c222794d  gas/testsuite/gas/tic6x/resource-func-unit-1.d
+5234e446a5e922291e1729d6aabe3453  gas/testsuite/gas/tic6x/resource-func-unit-1.l
+942f6857cdca34e758b9cfa46e6e72c1  gas/testsuite/gas/tic6x/resource-func-unit-1.s
+04ea445a4735bb4bb8294a8707b4565e  gas/testsuite/gas/tic6x/resource-func-unit-2.d
+50429ccd3bea99a635218d10b35eb9bc  gas/testsuite/gas/tic6x/resource-func-unit-2.l
+063bec4468dad620804c43a003d442e5  gas/testsuite/gas/tic6x/resource-func-unit-2.s
+8c1cfc99e396e9519813244c9ea0b511  gas/testsuite/gas/tic6x/scomm-directive-1.d
+16a38e48c689f24e9ffa1f32d33588e3  gas/testsuite/gas/tic6x/scomm-directive-1.s
+7138bca3184590cb1ebedde478ffbb2a  gas/testsuite/gas/tic6x/scomm-directive-2.d
+8db1061bb9068179a2d25ede2e3bf9c0  gas/testsuite/gas/tic6x/scomm-directive-2.s
+5ac54992e1a475fc8760567206b0218f  gas/testsuite/gas/tic6x/scomm-directive-3.d
+ab884915e5f858e9433896d4db7c8ced  gas/testsuite/gas/tic6x/scomm-directive-3.s
+e7e3d15939e37b77676b50983c892735  gas/testsuite/gas/tic6x/scomm-directive-4.d
+0ca18b7b621d2bc1146d651ee98705b6  gas/testsuite/gas/tic6x/scomm-directive-4.s
+2d8d6e42de1587c21ce823c0a26b930e  gas/testsuite/gas/tic6x/scomm-directive-5.d
+2bfba7dbc8c3c09a7fcc47fa8125a199  gas/testsuite/gas/tic6x/scomm-directive-5.s
+cd74dca6ee482cf6302ab0fe5af6edc7  gas/testsuite/gas/tic6x/scomm-directive-6.d
+6bccd6ec9c63322b63fa4b4077fa76cb  gas/testsuite/gas/tic6x/scomm-directive-6.s
+83d935abbccea7045b6994c30bd0fbb0  gas/testsuite/gas/tic6x/scomm-directive-7.d
+183f90899ca987840dd25a1e9fcf915b  gas/testsuite/gas/tic6x/scomm-directive-7.s
+7d39f97e822caf4f2e5e1d2fdd4a68c8  gas/testsuite/gas/tic6x/scomm-directive-8.d
+5e8d7ca08115be47412fa2917584f787  gas/testsuite/gas/tic6x/scomm-directive-8.s
+d438c15d99c89ecf97e58dc6a88e0fc8  gas/testsuite/gas/tic6x/sploop-bad-1.d
+e64fd235ab54cd4e183bcf6fa0b612fd  gas/testsuite/gas/tic6x/sploop-bad-1.l
+dc5e79a0720607dd86bba0b739835b53  gas/testsuite/gas/tic6x/sploop-bad-1.s
+001726ba669b3f22952bda6da259a372  gas/testsuite/gas/tic6x/sploop-bad-2.d
+918ec190e57cb54530e80a5740345f8e  gas/testsuite/gas/tic6x/sploop-bad-2.l
+452b48e0f430ae7a0f9eeaa66cc04058  gas/testsuite/gas/tic6x/sploop-bad-2.s
+42819d33d0098bf3dfc4583cadcbcc09  gas/testsuite/gas/tic6x/sploop-bad-3.d
+ef260649f39e1fe49eb15ce708627e47  gas/testsuite/gas/tic6x/sploop-bad-3.l
+5b1df4b9f9f66941a478a4fcafc42aa7  gas/testsuite/gas/tic6x/sploop-bad-3.s
+20303d99e8f8df5b5b00dac2983221d9  gas/testsuite/gas/tic6x/sploop-bad-4.d
+7828bf28b034b422f7aba840482b457a  gas/testsuite/gas/tic6x/sploop-bad-4.l
+5d912fb61a36c62334cfc2eb7ef33197  gas/testsuite/gas/tic6x/sploop-bad-4.s
+d2f1ebe6d4a2b0873e69e64cb76a141e  gas/testsuite/gas/tic6x/sploop-bad-5.d
+0a0c272ee31f594c05de8a03a2ccb671  gas/testsuite/gas/tic6x/sploop-bad-5.l
+41912b22aa2f441fd37d51b065a209be  gas/testsuite/gas/tic6x/sploop-bad-5.s
+d8e8c7cc5d21465f80ee188aa9c46f7e  gas/testsuite/gas/tic6x/sploop-bad-6.d
+f9475a6b38fe3c22d830b209a968aae7  gas/testsuite/gas/tic6x/sploop-bad-6.l
+a68011cf3c6829ecdb38fb481e833959  gas/testsuite/gas/tic6x/sploop-bad-6.s
+f173a1672f1736d22fa60aec50716d92  gas/testsuite/gas/tic6x/sploop-bad-7.d
+2e0455de0927f225035de61e37c159a2  gas/testsuite/gas/tic6x/sploop-bad-7.l
+08d8027f46982627fb96f729aac156c7  gas/testsuite/gas/tic6x/sploop-bad-7.s
+a3c602f713f339f45a3115d08131de85  gas/testsuite/gas/tic6x/syntax.d
+622f074e9750f32b1b3049caf28bf022  gas/testsuite/gas/tic6x/syntax.s
+05cd90abed0f22506361adfc1f0c1bca  gas/testsuite/gas/tic6x/tic6x.exp
+7de248ac3020a9455de02a7bbdf7d195  gas/testsuite/gas/tic6x/unwind-1.d
+52f861d4eb5237992dd629e51c064d54  gas/testsuite/gas/tic6x/unwind-1.s
+fece3517007eb4f9306e99377e172a85  gas/testsuite/gas/tic6x/unwind-2.d
+6aaeaa764a1d0bb49b97b297e2d66fdf  gas/testsuite/gas/tic6x/unwind-2.s
+08171ee03b37cff8afa367b15eade18b  gas/testsuite/gas/tic6x/unwind-3.d
+9f274d7c18497faa9fdff643efc85942  gas/testsuite/gas/tic6x/unwind-3.s
+3cf151ca4cd641205959c21da387056f  gas/testsuite/gas/tic6x/unwind-bad-1.d
+1a546443bfdae63539184169e5d30ab1  gas/testsuite/gas/tic6x/unwind-bad-1.l
+733fa46a8b460a1b397f5cfc097238b9  gas/testsuite/gas/tic6x/unwind-bad-1.s
+4004feb44851aecf3ab90dc47f9461f4  gas/testsuite/gas/tic6x/unwind-bad-2.d
+5356e3641cb596ee28dff24a9eacd21f  gas/testsuite/gas/tic6x/unwind-bad-2.l
+e31d5b10f3d263459ed7d6db8e4079da  gas/testsuite/gas/tic6x/unwind-bad-2.s
+4dc38895f0191487e8fb6e1e83be4ed7  gas/testsuite/gas/tilegx/t_insns.d
+cfcc8d0fa3c49333c4c2661613f2fc05  gas/testsuite/gas/tilegx/t_insns.s
+b0a5f5ee47ae8c2e5b01678b945df479  gas/testsuite/gas/tilegx/tilegx.exp
+7517e1f64362b3580d0049ab73d26abe  gas/testsuite/gas/tilepro/t_constants.d
+23d4d2ce8eeacebfeed51686a24116cd  gas/testsuite/gas/tilepro/t_constants.s
+6ad3aebff6418f5b057cd2d052487d90  gas/testsuite/gas/tilepro/t_insns.d
+04b0ea6a3eba9a7a2e11225c13bb2bdd  gas/testsuite/gas/tilepro/t_insns.s
+e81f5fbb964adeb73c4f2156d55d78cf  gas/testsuite/gas/tilepro/tilepro.exp
+b3daff1073feeab915c5d25268ab1d71  gas/testsuite/gas/v850/arith.s
+e578aefe805ee5ad3ee58d0ef2832b18  gas/testsuite/gas/v850/basic.exp
+fd5263cb3409650f6bb2e9b610eab2d9  gas/testsuite/gas/v850/bit.s
+d33db5351243bff28f76ada8284737dc  gas/testsuite/gas/v850/branch.s
+e3d311e55349338e4876c3711ed91c46  gas/testsuite/gas/v850/compare.s
+986292c2ba21464166aa337ab580a139  gas/testsuite/gas/v850/fepsw.s
+5f8e79e5bec30791f19218a7ad23040d  gas/testsuite/gas/v850/hilo.s
+f7d87df456dee97f2d28be5a29afde0a  gas/testsuite/gas/v850/hilo2.s
+36254aabdcf9005f2dd8e7fba47de388  gas/testsuite/gas/v850/jumps.s
+ee5a6da54e89a759bccef5da2ce4747e  gas/testsuite/gas/v850/logical.s
+79263247214c7d46c383e26aafc74d31  gas/testsuite/gas/v850/mem.s
+2db16d6b7c2aa2cc17e621ac1da852eb  gas/testsuite/gas/v850/misc.s
+8c5fd0446e831223f93adebecec8a2b2  gas/testsuite/gas/v850/move.s
+90c3465d11f275837ad5b9cac2dd51c4  gas/testsuite/gas/v850/range.s
+10e8b025bce8af1b59c395fc5799236c  gas/testsuite/gas/v850/reloc.s
+378cfe25e8ce273611d7d2f43d70cfe9  gas/testsuite/gas/v850/split-lo16.d
+eee775291469641dfa761921ed942688  gas/testsuite/gas/v850/split-lo16.s
+4508b29270952dbf4203e35db3d39dbe  gas/testsuite/gas/v850/v850e1.d
+eedf6270a3f4501ed56b62c6a386ca44  gas/testsuite/gas/v850/v850e1.s
+97c4b5a719430010c15bae2299ce58fe  gas/testsuite/gas/vax/elf-rel.d
+93d331c520e6b5b5b63f7010f800b523  gas/testsuite/gas/vax/elf-rel.s
+c8557b4b40ce9690c81d77b9502a959c  gas/testsuite/gas/vax/flonum.d
+2cf8b02a3bf0517e18f9e972f496f396  gas/testsuite/gas/vax/flonum.s
+aa03dd0743c96363f2bbd4a8d6bf5930  gas/testsuite/gas/vax/quad.s
+b5281ff49f97d0836ede49ab60f0b84e  gas/testsuite/gas/vax/quad_elf.s
+5573f76fbd39f4ef631b12ccfe26082e  gas/testsuite/gas/vax/vax.exp
+b898eb8de608f2a58e457819a18fc6b5  gas/testsuite/gas/xc16x/add.s
+5f315bec363a06d8c499bfef6a910ae4  gas/testsuite/gas/xc16x/add_test.s
+1dc4db7d28ad50d346642f6dbf5df632  gas/testsuite/gas/xc16x/addb.s
+d301d0d9a87958794c84ad7da238c117  gas/testsuite/gas/xc16x/addc.s
+cbc27d426e01a6b1787ca0874a40ec64  gas/testsuite/gas/xc16x/addcb.s
+ec736a95397739f0e5d7ebebad55f68d  gas/testsuite/gas/xc16x/and.s
+901d19e05a01c914be683e6ef837e9d3  gas/testsuite/gas/xc16x/andb.s
+f4f8565d3423ec279b25c291c489ac5f  gas/testsuite/gas/xc16x/bfldl.s
+7abe30bd4385dc6cc9991dee613c31b6  gas/testsuite/gas/xc16x/bit.s
+72072eaeb0ce024c58e07b6821e122f3  gas/testsuite/gas/xc16x/calla.s
+c4432ec0aeee6567803279d86b2ed6c1  gas/testsuite/gas/xc16x/calli.s
+81a7564b23206ef107f01041892f1a9a  gas/testsuite/gas/xc16x/cmp.s
+1a42e3b54e1c1f12cb59756592a4e4bd  gas/testsuite/gas/xc16x/cmp_test.s
+b3db7ee9fa74afda3c5a7c4563500151  gas/testsuite/gas/xc16x/cmpb.s
+2c9832a9dbde30032fb81ddbd0c7e6f6  gas/testsuite/gas/xc16x/cmpi.s
+af0d2186664faa9760fdd9c9b96e6237  gas/testsuite/gas/xc16x/cpl.s
+fb689b8eb0e2d2948c81871e4437eb55  gas/testsuite/gas/xc16x/div.s
+39a90f3f13cb6ebd7bbf254f53b1f06e  gas/testsuite/gas/xc16x/jmpa.s
+393bd96fab3a174b68fa2a11698517ac  gas/testsuite/gas/xc16x/jmpi.s
+344ed28d4ba4d16c75b7c3b3804c222e  gas/testsuite/gas/xc16x/jmpr.s
+78fe1a285b5a9300fd6870afc8d7a624  gas/testsuite/gas/xc16x/mov.s
+14e2e5dda69ea4c34dad7fc422218333  gas/testsuite/gas/xc16x/mov_test.s
+568a5a3459bce6973680b30bac821450  gas/testsuite/gas/xc16x/movb.s
+84938c2fa9619b926b0cbaf47c0bad1f  gas/testsuite/gas/xc16x/movbs.s
+606f31c66b3eb70c5535a0d5d3c5269b  gas/testsuite/gas/xc16x/movbz.s
+c171a5c5b96d9090fb5c0abf5f9cdc06  gas/testsuite/gas/xc16x/mul.s
+94af5bd0dbfab715edd926f4b6386997  gas/testsuite/gas/xc16x/neg.s
+112290437259ed40e1d74b876e21f444  gas/testsuite/gas/xc16x/nop.s
+4027f70a69e5ee51af01107f742db8db  gas/testsuite/gas/xc16x/or.s
+39ebd060389b04ee9b451b65d48aabdb  gas/testsuite/gas/xc16x/orb.s
+191945b9ed36a3dd3a8350289f1eec47  gas/testsuite/gas/xc16x/prior.s
+d3d778fd4c04043cf34b85499dd25b44  gas/testsuite/gas/xc16x/pushpop.s
+1b77424053fd88917ab756f4aa5b126b  gas/testsuite/gas/xc16x/ret.s
+06da10d686c4a6de64553c6208c87d1a  gas/testsuite/gas/xc16x/scxt.s
+d9d7113ce6edc188b99ac7ea87402cf7  gas/testsuite/gas/xc16x/shlrol.s
+adc7510e48e55d117ea82b69328d15b4  gas/testsuite/gas/xc16x/sub.s
+deaa94ee201bb59e369f29f575a897d8  gas/testsuite/gas/xc16x/sub_test.s
+bd05476dae49fa2a7bbbf86e7a5c60a1  gas/testsuite/gas/xc16x/subb.s
+cc52ade9bcdf936042ef42b922f19105  gas/testsuite/gas/xc16x/subc.s
+49f7f3fcf66ba02d15f5ee099ac4625f  gas/testsuite/gas/xc16x/subcb.s
+1a0cbe2eff7809873f2845c05a13b284  gas/testsuite/gas/xc16x/syscontrol1.s
+76c8d37a5a3e663f33e7899beac2bcc1  gas/testsuite/gas/xc16x/syscontrol2.s
+6e499f9be2aff00b249bd7e2b8fa3454  gas/testsuite/gas/xc16x/trap.s
+7d10540fbf64a1d6db6b7f179eed4b3a  gas/testsuite/gas/xc16x/xc16x.exp
+396543dd8f02cd8bd81a9b0a8d8358b6  gas/testsuite/gas/xc16x/xor.s
+235321f531fc18a5f7156f103c618fc5  gas/testsuite/gas/xc16x/xorb.s
+9bd3cbd5df41ccea979773da1a06d25e  gas/testsuite/gas/xstormy16/allinsn.d
+7389542aad96c9680c2964c5585bd7e1  gas/testsuite/gas/xstormy16/allinsn.exp
+0578374b0231a4f3a76bceecd452af8c  gas/testsuite/gas/xstormy16/allinsn.s
+1e5f1e10cec9b3c80aebd2d85bf9f4ab  gas/testsuite/gas/xstormy16/allinsn.sh
+424739d1d4a83c8dd312ff4a255fe33a  gas/testsuite/gas/xstormy16/gcc.d
+34eb714356686c594ea470d037ff980d  gas/testsuite/gas/xstormy16/gcc.s
+2bab00917391fa8fe1dda5938f6ad558  gas/testsuite/gas/xstormy16/gcc.sh
+497560cde7dc6be28345811a294871c8  gas/testsuite/gas/xstormy16/reloc-1.d
+7b2f6fd28e4136ed51af9fa15bfbc87c  gas/testsuite/gas/xstormy16/reloc-1.s
+e2364d93d941960a57bdec88bca95f47  gas/testsuite/gas/xstormy16/reloc-2.d
+688ac14ef52d1f032c6e360b5e8d2607  gas/testsuite/gas/xstormy16/reloc-2.s
+14ad1e88c9c24f7a3ec9eb738af6685f  gas/testsuite/gas/xtensa/all.exp
+febb407b84d25094205ffd8a82c8f3f8  gas/testsuite/gas/xtensa/entry_align.s
+047b105217cfb35f7b85b27982de9ee0  gas/testsuite/gas/xtensa/entry_misalign.s
+98754ef2b2ad4579570fc6cff9e5f465  gas/testsuite/gas/xtensa/entry_misalign2.s
+b2aff7acb77401a9e680b20148109634  gas/testsuite/gas/xtensa/err-pcrel.s
+feb6bdf09b3344bce0d6638dc2c34d25  gas/testsuite/gas/xtensa/j_too_far.s
+70b6a1943f31e85e4a40c7106205d6cc  gas/testsuite/gas/xtensa/jlong.d
+e910c7d2ee2aa41e6baf7c2eccedbecf  gas/testsuite/gas/xtensa/jlong.s
+ab9272fb92c36f6cc58921de84c4a0eb  gas/testsuite/gas/xtensa/loop_align.s
+89c5bc675c0f6e4d485383908be47831  gas/testsuite/gas/xtensa/loop_misalign.s
+2c16b47ffb1bdf68123ae890f0a53d90  gas/testsuite/gas/xtensa/pcrel.d
+836acd098dba389006887f1032de1d0d  gas/testsuite/gas/xtensa/pcrel.s
+89136e7c8b9eff77fbcb58c94a361f37  gas/testsuite/gas/xtensa/short_branch_offset.d
+3050cc891aa6dc3b721df7adcc1e9e9f  gas/testsuite/gas/xtensa/short_branch_offset.s
+caa3c813d0d190a10143bb1726af402b  gas/testsuite/gas/xtensa/weak-call.d
+e9cbcae183da4f3236cf8e232960c533  gas/testsuite/gas/xtensa/weak-call.s
+0b94f1ec5d4daeb9620ac56e7a5c9832  gas/testsuite/gas/xtensa/xtensa-err.exp
+76096e7df8eeb0c73bd5aa7bfb34255e  gas/testsuite/gas/z80/arith.d
+8118fc03539fde92b0de9cae6188372c  gas/testsuite/gas/z80/arith.s
+e0dc1a059c74faaac5ad2ee2ccb3e36d  gas/testsuite/gas/z80/atend.d
+c9633957effeec0ed1dad46964e975ab  gas/testsuite/gas/z80/atend.s
+950e301bffae63b183aca2c8f224cb7f  gas/testsuite/gas/z80/bit.d
+cc6040323b82ab0d7e368abd06c1ad7b  gas/testsuite/gas/z80/bit.s
+21f5b15722fce227204cb650accda912  gas/testsuite/gas/z80/block.d
+5a511ead974b283bdda5668428c09393  gas/testsuite/gas/z80/block.s
+cb3c6c56e18d6f2710326d97939c4768  gas/testsuite/gas/z80/branch.d
+8c45e2c4272f9169f12025386f007298  gas/testsuite/gas/z80/branch.s
+9d9964701252eee897f484dee8ce307c  gas/testsuite/gas/z80/equ.d
+585c2593f699832516b10888efcb3501  gas/testsuite/gas/z80/equ.s
+57f344303eafeb80a995d32b81411fb8  gas/testsuite/gas/z80/inout.d
+90a1576adecaca86f780c1550872ea47  gas/testsuite/gas/z80/inout.s
+2aeaecb345eaead5b7d3c61fa873603b  gas/testsuite/gas/z80/ld-group.d
+32f329efa727bf528ccce3f380573caf  gas/testsuite/gas/z80/ld-group.s
+e315baa412368a90c904c56bfd495f2f  gas/testsuite/gas/z80/misc.d
+68084a742592799b5a051ffbb6ee140e  gas/testsuite/gas/z80/misc.s
+408cc9b5ff8576a0af9a6303a060a84a  gas/testsuite/gas/z80/offset.d
+34d65c390eed4096165f7b9589edf9a9  gas/testsuite/gas/z80/offset.s
+ed248a2dc8a185797dd5ccacae58d6bf  gas/testsuite/gas/z80/quotes.d
+968a4dd849f36bf8929291ec2ddb7575  gas/testsuite/gas/z80/quotes.s
+6f4f086c484747ed4ddb587e56797097  gas/testsuite/gas/z80/redef.d
+15faccb7602127c05c2ae5fafe5a2227  gas/testsuite/gas/z80/redef.s
+fb219e51df0e277f3ac3c62283ae9cbf  gas/testsuite/gas/z80/rotate.d
+1b4b12e40cc8a7fc2c7dfdeb15b7e7c0  gas/testsuite/gas/z80/rotate.s
+fb0806d8887b68b7f863f42c7a45a645  gas/testsuite/gas/z80/suffix.d
+a738f0cca1753ef4b1c78743e366ffc3  gas/testsuite/gas/z80/suffix.s
+80dc5223661a959b82224eb6067f0e3f  gas/testsuite/gas/z80/z80.exp
+b49428eb4ba63d8dac5690c08355ebc2  gas/testsuite/gas/z8k/calr-backf.s
+6e4950abd9e763001ccc0bbc0babaf23  gas/testsuite/gas/z8k/calr-forwf.s
+86577ff2937c59bafae28abe1bbb9baf  gas/testsuite/gas/z8k/calr.d
+541f7c8179a6e454326ce7b21bf8d7d2  gas/testsuite/gas/z8k/calr.s
+b17b39612ad59025b551ce2038897c79  gas/testsuite/gas/z8k/ctrl-names.d
+9af934d7ef4cc61120ac722bd3447044  gas/testsuite/gas/z8k/ctrl-names.s
+28483e5b3cf53bc3ba9a9901f6f43cdd  gas/testsuite/gas/z8k/dec.s
+c1e81cc8fc32752bf759d6cb3f4077d5  gas/testsuite/gas/z8k/decbf.s
+92c0157129bceb932434c0c3bd500365  gas/testsuite/gas/z8k/decf.s
+570b5ee7aa92ae18483423aeafaf4c54  gas/testsuite/gas/z8k/djnz-backf.s
+a3fe9dfe1ae7aa5b675bbaff933a172c  gas/testsuite/gas/z8k/djnz-backf2.s
+6bfbbe34e06a02f656a19b014d287c62  gas/testsuite/gas/z8k/djnz.d
+bdae045f9b33f16fe1fa345ed1725848  gas/testsuite/gas/z8k/djnz.s
+b305ef7b6f6709032524f6568266ec54  gas/testsuite/gas/z8k/eidi.s
+17135d7105f96ceb57f7d2df1ceaf288  gas/testsuite/gas/z8k/eidif.s
+ed322b14e46464bec51ecb589c340dc5  gas/testsuite/gas/z8k/inc.s
+1b718e47798f82cc751183fb7bd1570d  gas/testsuite/gas/z8k/incbf.s
+5c236b616e7830fe0e367398a9126d18  gas/testsuite/gas/z8k/incf.s
+cb0eeef7fe997388c62e67c9fcb4516e  gas/testsuite/gas/z8k/inout.d
+bc612d839839a7edd8a6edb414fcaece  gas/testsuite/gas/z8k/inout.s
+71c54c4ae22dbe8878b1227d49606aac  gas/testsuite/gas/z8k/jmp-cc.d
+31118c0ac719666949c9ca49fa349d0b  gas/testsuite/gas/z8k/jmp-cc.s
+fe1ac4303fe3baf72c7f534c7df60cf7  gas/testsuite/gas/z8k/jr-back.d
+30a99e6ef53c4f50d1a33c8a96b24515  gas/testsuite/gas/z8k/jr-back.s
+c8d698d13dfb162e769f8802fd9b0d74  gas/testsuite/gas/z8k/jr-backf.s
+539854b970b0949b0aeed74e7bc5b3c3  gas/testsuite/gas/z8k/jr-forw.d
+1e22a5e25eae4439cc2d1642fe4c25d7  gas/testsuite/gas/z8k/jr-forw.s
+2e9d4668c8f7269b9d013e5f6acb866e  gas/testsuite/gas/z8k/jr-forwf.s
+e2882e18046d6c5e38967bd4a873a424  gas/testsuite/gas/z8k/ldk.s
+67a6618ad1b858a214e45638cf227a5a  gas/testsuite/gas/z8k/ldkf.s
+0fb8a216833a93af0c8a0e5dab536925  gas/testsuite/gas/z8k/reglabel.d
+98c23d4ff5397fcd6c075b365b0f8712  gas/testsuite/gas/z8k/reglabel.s
+caf6a6138b956da27b9b42beabea1c2d  gas/testsuite/gas/z8k/ret-cc.d
+f23b1d6008927d7ae445999b7f5f0bf3  gas/testsuite/gas/z8k/ret-cc.s
+a8db3b4208084b45c4116081711019fb  gas/testsuite/gas/z8k/z8k.exp
+5725f8e58e03bd6026f3e2721e1db22e  gas/testsuite/lib/doboth
+133e9f8bb4d12ac7e498f0ac5d0246c0  gas/testsuite/lib/doobjcmp
+aad4965bf0067bf9fb71acc19f7877d4  gas/testsuite/lib/dostriptest
+bdf5e4dee40167a92f0a45965b0375b7  gas/testsuite/lib/dotest
+af650aab07403b5a05623713b613856f  gas/testsuite/lib/dounsreloc
+30764ced5c424e3c2c384059cbe2a227  gas/testsuite/lib/dounssym
+454ecc6320ae2b041609bc729dcb6bf2  gas/testsuite/lib/gas-defs.exp
+b4a303f3223f3695d37e231d7e691500  gas/testsuite/lib/gas-dg.exp
+fa15c7b10accc66a51aef7768472e371  gas/write.c
+3b955fb7ab2ef082f90865d180ed0ef5  gas/write.h
+920138da7dbc4f3ef4ba32e27f2886a9  gold/aclocal.m4
+cfb2f43a125170e66c90d7170bbca885  gold/archive.cc
+ae2022764dc7407a210d4bd795f4054a  gold/archive.h
+e9a57934d59bf0fb1770c13e36bffc86  gold/arm-reloc-property.cc
+ae313dff2413bd2819f4ab0f6e0d0cb3  gold/arm-reloc-property.h
+0c8fa104bc816e2bb99c31e3a3a04a76  gold/arm-reloc.def
+3f304928f9da5dd7194793bddeff5888  gold/arm.cc
+c4bdb95759b2562e84e2e3ae745bf9b9  gold/attributes.cc
+106b7b5a4a9cc14109c6e36f9fbd0bce  gold/attributes.h
+443debdf67a99cfafda83df5229fc05f  gold/binary.cc
+db3d9c5c5950fe999accc7ea1c5b659a  gold/binary.h
+dbcabe17c3375de8e45bce5bbe0d1a70  gold/ChangeLog
+bbfe76b7753e98622f708aa3fffd0c3b  gold/common.cc
+6fdb26c4e334a794349d0bf97a3ca52c  gold/common.h
+22d1af5b1f164c50043ae43a0e5dfa1d  gold/compressed_output.cc
+cf591901128363a830ef32628ca6b897  gold/compressed_output.h
+fac10aec1128d2b5aceadd073972bea5  gold/config.in
+ca0321fb64d97dfef14b178f4792bd14  gold/configure
+62137e9f53aae20fb701180dca73e4ef  gold/configure.ac
+3be298db81c4436a57939f940ba0c51d  gold/configure.tgt
+9f638a42370a8550f31bc9ba277bc9fb  gold/copy-relocs.cc
+65af0f3de57eba50bfa65b4bb351721d  gold/copy-relocs.h
+359ce2e8c11d71f261e9033704859e50  gold/cref.cc
+7f252be444e9576bda4a3496216280d1  gold/cref.h
+1a17a3a8e4d700beb6624384b67653a7  gold/debug.h
+deea133840491c307096f770a4e7cb84  gold/defstd.cc
+a76f48603de929b8ed7a7a656ba630b0  gold/defstd.h
+51aa13f4c42e0c49266e38716b9f40ff  gold/descriptors.cc
+8f1817f08b09eb28b618e3b5a8983ae6  gold/descriptors.h
+498a015c853882a7db3f60c18d4d2263  gold/dirsearch.cc
+76814987cdbef988686518ad901349e2  gold/dirsearch.h
+e8eafdf68ee7aecb5c5d9d94abed2491  gold/dwarf_reader.cc
+f0fc9ac6b6999ece3dfeb0eb0cf65120  gold/dwarf_reader.h
+b27404aa89d6155a7e09c48161676246  gold/dynobj.cc
+012314e00730338b1f1792bc6dea5267  gold/dynobj.h
+178087b6c80f243c7d8716c889d31940  gold/ehframe.cc
+08ca553efd91c9aa852f8ec8f01c9391  gold/ehframe.h
+6b230b219482ec1881e61bd2fefb6c28  gold/errors.cc
+502f1f3e8db45d063449d815b408ac3a  gold/errors.h
+fc5109bfa612a13c5d17b3a71641f08b  gold/expression.cc
+0d16fb621ed6640e97dbbbdf9be676e7  gold/ffsll.c
+c623b09362766dc4444b8c926fc258d3  gold/fileread.cc
+57aa1c270d4f542d72ef143fd1552c60  gold/fileread.h
+310a31b0e99dfae0c2c96dc810033ac8  gold/freebsd.h
+76b1ff3cb93502be702953b2ed781993  gold/ftruncate.c
+42a796cf816f168b25e699ece6e79b82  gold/gc.cc
+0f730d0302ae9d61af6fd154dd5f5977  gold/gc.h
+08fc5a346abbe8bf5949c93911bf798d  gold/gold-threads.cc
+debf2f81aed982206e3480926240ca46  gold/gold-threads.h
+a5843f95b51889701783274d1c39d7a1  gold/gold.cc
+bb7785887b2d637ba758bc74de64d95d  gold/gold.h
+2815749b39a66699b1171db54f4cbad7  gold/i386.cc
+50da54a753bb24a26a5295eb4e459aed  gold/icf.cc
+350f34e563eeb79e3c0cac57dc5e422b  gold/icf.h
+dde2d0915d47c2927b1ac1d26fa8fb6a  gold/incremental-dump.cc
+2c234bc06bcad20a4e8fb4b01fc26b04  gold/incremental.cc
+da6e4c29aa8052bda1d1344db723a1f4  gold/incremental.h
+61a997f99180a69371fb830efe2e575d  gold/int_encoding.cc
+884bd8912c1eda493a1f05d26086f1fe  gold/int_encoding.h
+bed39fe37a1fbbbd0a0820def0335399  gold/layout.cc
+32f22b82f014418d043e7385a4239f0e  gold/layout.h
+2e6d13e4a9ddfb02d86e35926ffdc745  gold/main.cc
+4c6d7c49559bbdf6dbd6a279370b6698  gold/Makefile.am
+79f21660f61562f063a819bd5bb824c9  gold/Makefile.in
+f6c7da31fb8c70fa4cdcfc5922b61809  gold/mapfile.cc
+be05d404cabe66f01ab7133085791763  gold/mapfile.h
+0c2d358d5ed3faaed479e871f3e400a6  gold/merge.cc
+50d803537d079c668db7d6cb45f8ff6a  gold/merge.h
+1bb3bbab24172b571b72c7fb127e2b3c  gold/mremap.c
+d6d999c5dc1e4cc4032ee874d917f984  gold/NEWS
+045f126a4a656a4188cb5b349e33708e  gold/object.cc
+f105a9f6e7b4948abfdc94d6be0ce2ad  gold/object.h
+f5777ed1ffc04741b6468ccdba5cc498  gold/options.cc
+62e78dd665221763629d3085ac3cfc47  gold/options.h
+f444561088c5564729f1e1ff452a6258  gold/output.cc
+1f90c1b2e32fb14616b69d7bfc12614c  gold/output.h
+a961cd014f34ef80b3a3c86045823d1d  gold/parameters.cc
+63209f69ed52a0b0542d50f1b65a66cc  gold/parameters.h
+afbedc5f3aaa3cc3413fb629a716a853  gold/plugin.cc
+00197e1366b23a0d9ff3506cf2eb1cfc  gold/plugin.h
+f5d465c1def148c3688d691b6676f6a1  gold/po/es.gmo
+e51f6cc3911ee1349c59c6661da4e6db  gold/po/es.po
+e872d3ee22824820ca7746144ab3eedc  gold/po/fi.gmo
+922ee405bf33ff9b7e96969b86c8b927  gold/po/fi.po
+2b7ec11aad5f113736fd4e91b78f3bf8  gold/po/gold.pot
+7103bf2876d97b9e71f3e6b20e3a16e7  gold/po/id.gmo
+b4492d1a0779dc0b6da2911fd1bcccf7  gold/po/id.po
+e2216e0ba2da7ea411d167673d7009a0  gold/po/Make-in
+232ba86994f5d311461c2f71232f9ff2  gold/po/POTFILES.in
+0952fb13719f896dee741e4dd733e6a5  gold/po/vi.gmo
+c5ec0edbb404e147aeaea802372fa8a1  gold/po/vi.po
+56858b341a0d327563af83ac257b1ef3  gold/powerpc.cc
+c423652afda43455ca78c502b716405e  gold/pread.c
+5f7f19cf26bc8107507cabe85cf27a51  gold/README
+c02555882a81e8e5e20cba8bc2159c9f  gold/readsyms.cc
+f7fd13e96623b8a1b40354922397a8d6  gold/readsyms.h
+ea0f1898029ac031868a6d029105d16e  gold/reduced_debug_output.cc
+f5564bad622af448481d52505f289cc1  gold/reduced_debug_output.h
+c0e5fe55ab808bdd8cb47edd4786aceb  gold/reloc-types.h
+89614c5630f8fb5c447861ab9a62b56a  gold/reloc.cc
+0871e7463f1218ff84d364850a893614  gold/reloc.h
+4fee05a6178b729688ab4200d9ea19eb  gold/resolve.cc
+46267ceb3ae8dc1be4267823e81ec980  gold/script-c.h
+4169a516b6d6924432669e728c08ea4b  gold/script-sections.cc
+6db36bd21f208d6fa3f0990c3d7da9b1  gold/script-sections.h
+0f2108e0079a1c2933614ac94951056d  gold/script.cc
+89c5d078ec9e3cc9b1c0a1c6c8aeda03  gold/script.h
+0ce7f7dbf461652175b6e9e4df27ab10  gold/sparc.cc
+f595f00790530b9d393df99edc6807a8  gold/stringpool.cc
+2bdda92ce7e34717260a1d26bdcb517d  gold/stringpool.h
+22706de3ea04bd7b974b9dbff15aa5e4  gold/symtab.cc
+764f7045526cc89c06199ac495685aba  gold/symtab.h
+c8e3f77291b633610ba2cd8acd642c27  gold/target-reloc.h
+af45e3feab8afda96001e46b148f4869  gold/target-select.cc
+32f344ac69843866c71a5205243e2e64  gold/target-select.h
+73ca989c92338dc42965d2b2d6d1b98f  gold/target.cc
+255d45e3ef131663da5d2062f0c6f2e7  gold/target.h
+80b509c91549c14b2bf6a55edd4d2143  gold/testsuite/arm_abs_global.s
+eb46a49b940ea9c372ab29281d3d4946  gold/testsuite/arm_abs_global.sh
+9ac09610a2d87c662a5ceeaf1b025d15  gold/testsuite/arm_abs_lib.s
+80018cea4a4d102d59fcc1e8fa6f28eb  gold/testsuite/arm_attr_merge.sh
+20754945d78d1f5638f26634b47e8f59  gold/testsuite/arm_attr_merge_6a.s
+66df9ecd840e9fe0126a9852dbee3e3e  gold/testsuite/arm_attr_merge_6b.s
+4c155f3e2d74bfaaee87bf34c5f9370a  gold/testsuite/arm_attr_merge_7a.s
+8383d587d80276d4b6a8dd6bab556839  gold/testsuite/arm_attr_merge_7b.s
+e347b22d67c811662c5d61834f924831  gold/testsuite/arm_bl_in_range.s
+4b002882f3ce289d3e92d29404bd773b  gold/testsuite/arm_bl_out_of_range.s
+3f97a52ef33dc972c572d4533ef92f90  gold/testsuite/arm_branch_in_range.sh
+af46825e07ac2bdd6427457997a7d57e  gold/testsuite/arm_branch_out_of_range.sh
+e9ff846223ed2bbeb803610a3ca91c1f  gold/testsuite/arm_branch_range.t
+b2b7a67ff2a1cf5d62db786501507dd5  gold/testsuite/arm_cortex_a8.sh
+652d0cde19d3d66a1725d54fc2a5b91c  gold/testsuite/arm_cortex_a8_b.s
+7f068ed6006aa356331a5aebfcb2b4fc  gold/testsuite/arm_cortex_a8_b_cond.s
+d94bd04b915e0260ae7f85bd883faf67  gold/testsuite/arm_cortex_a8_b_local.s
+3aa21fc062ab2dffd7db4d368bf0a907  gold/testsuite/arm_cortex_a8_bl.s
+40ddb04f944f422900dccd988911d365  gold/testsuite/arm_cortex_a8_blx.s
+f8361e5ebf0488807385746412b86a21  gold/testsuite/arm_cortex_a8_local.s
+1dbff22390a0dd9f90d8b32a0947f0e8  gold/testsuite/arm_cortex_a8_local_reloc.s
+998e450377cb15c7882b4287b1df80d3  gold/testsuite/arm_exidx_test.s
+714ea4e5bb09a41ae492683f4143b1f5  gold/testsuite/arm_exidx_test.sh
+83d80a7ef45408d267162af94a007143  gold/testsuite/arm_farcall_arm_arm.s
+0b96c24216f4074132f7937594b94859  gold/testsuite/arm_farcall_arm_arm.sh
+feafda34a355cec86381a9424c1923e0  gold/testsuite/arm_farcall_arm_thumb.s
+0ef25a2e00c3770723c30e71a6053af3  gold/testsuite/arm_farcall_arm_thumb.sh
+938e05203cf88a8f3d61328da7f40b6f  gold/testsuite/arm_farcall_thumb_arm.s
+809e9caae992873fdeff43cbd844e699  gold/testsuite/arm_farcall_thumb_arm.sh
+1748da76b5b6995c5e5246beaf550c89  gold/testsuite/arm_farcall_thumb_thumb.s
+b0eacfe2d4b3e8ea6a38ff5bdf53f3b5  gold/testsuite/arm_farcall_thumb_thumb.sh
+e0c37a2fccb6d4aeea259944dd0507e9  gold/testsuite/arm_fix_1176.s
+1c6a16b232cb814b1d10258e768931b2  gold/testsuite/arm_fix_1176.sh
+863a1a2ed16aabfcf03175997f5861a2  gold/testsuite/arm_fix_v4bx.s
+b9847ccd3bf1bf55d364499f0d4d0b1b  gold/testsuite/arm_fix_v4bx.sh
+8c177688e29dbba293d61890595593bd  gold/testsuite/arm_thm_jump11.s
+f8f4052351a5f8078bb4b3ac8bbf9bf6  gold/testsuite/arm_thm_jump11.t
+b1d476427b02fb14b51fac920bae98ea  gold/testsuite/arm_thm_jump8.s
+8eaf6d4826efe781c387711e5e0c7eab  gold/testsuite/arm_thm_jump8.t
+9c97f80983fba914f9dea285bb54c38f  gold/testsuite/arm_unaligned_reloc.s
+ba4482d8c1ff810e16aa0635f07b9613  gold/testsuite/arm_unaligned_reloc.sh
+86ebe14fc53f726766fd6094c1762d17  gold/testsuite/basic_test.cc
+3b0f70d2cd5589a910279456f68336df  gold/testsuite/binary.in
+25bc594a25d9f7b4cbdb47b027baf133  gold/testsuite/binary_test.cc
+6a820f1483951e06232a40197daac6e4  gold/testsuite/binary_unittest.cc
+b1ac1067b03972c85e0d1d49c900bca7  gold/testsuite/common_test_1.c
+e20717f09bcc933dd470474d72c0e446  gold/testsuite/common_test_1_v1.c
+d3a9dd16d78f5ebce76ad1e50121d236  gold/testsuite/common_test_1_v2.c
+0e6373efe5a79c8c395b1d2ee593e9a9  gold/testsuite/common_test_2.c
+8fdd7fcccb703cb70d67418105f7a4da  gold/testsuite/common_test_3.c
+5b81b33dbafa5458aa9ac274b163c884  gold/testsuite/constructor_test.cc
+3420133aec5fd8fc5887def3d4cd1c7c  gold/testsuite/copy_test.cc
+7612b383879374076b3110cc006d8224  gold/testsuite/copy_test_1.cc
+b3a44a7dbf5812854ae0d89dd447bd38  gold/testsuite/copy_test_2.cc
+4cd88b3578712ac527d0613a5ee0e728  gold/testsuite/copy_test_v1.cc
+6a8b9e7eacaff9ef2c252ead48e2f148  gold/testsuite/debug_msg.cc
+8f95430c9cf2ad73430cd70162f02d0b  gold/testsuite/debug_msg.sh
+5b358034ecf1505d8675495e4e624623  gold/testsuite/discard_locals_relocatable_test.c
+e04c1316bcdeb97e0a8595dbe92d780f  gold/testsuite/discard_locals_test.c
+fa32967cc44d43d4e1c73aad0f6b621d  gold/testsuite/discard_locals_test.sh
+c9db537eb345d2e8155e17958d9d019a  gold/testsuite/dyn_weak_ref.sh
+f6a22adb5ec303edd3b35c489bb0d1d3  gold/testsuite/dyn_weak_ref_1.c
+a04a49c0115a84e4324919da8a59d6fe  gold/testsuite/dyn_weak_ref_2.c
+2fecf188d24d7c64c08c68483dd38473  gold/testsuite/dynamic_list.sh
+c0e08db807c4397f49bed99938e507db  gold/testsuite/dynamic_list.t
+d84823c386b251a50d30b84626f2f182  gold/testsuite/exception_test.h
+2db52f66cd4624f76c03bc7744e557aa  gold/testsuite/exception_test_1.cc
+0ad98b0e6bf2e6817f843782512e0bb0  gold/testsuite/exception_test_2.cc
+2f5a4607c092a09d1088dbf423981b23  gold/testsuite/exception_test_main.cc
+e64b239526003ae455fc6a2944d34ce5  gold/testsuite/exclude_libs_test.c
+5e751e6115ac8ee739e510325fc360e4  gold/testsuite/exclude_libs_test.sh
+740e416c0b6d2930d485ba5105130ce0  gold/testsuite/exclude_libs_test_1.c
+4b3c9863720fc755f063974fbaabd4be  gold/testsuite/exclude_libs_test_2.c
+893351b0ec9cbfa21e0f884fcfeebf54  gold/testsuite/exclude_libs_test_3.c
+d9925bfa0462085af12a2f6fd97862c7  gold/testsuite/final_layout.cc
+97bfae757dbd15e1a7428f2225222833  gold/testsuite/final_layout.sh
+ff6b8a56847ee596ced08c23e49c1e17  gold/testsuite/gc_comdat_test.sh
+2fa43e0e436bcc6299fe05771aa1bb8c  gold/testsuite/gc_comdat_test_1.cc
+7cec6896b02d316149aa526a082b359f  gold/testsuite/gc_comdat_test_2.cc
+e61998214250c4a64e0ee91e66679999  gold/testsuite/gc_orphan_section_test.cc
+0505de398c8a3a820bb025ebb35f5eea  gold/testsuite/gc_orphan_section_test.sh
+4dd1d6984551b2598df7d7f6220fa565  gold/testsuite/gc_tls_test.cc
+dedc8fae056b79820e781eec66f44334  gold/testsuite/gc_tls_test.sh
+97f6e21a09bed87161b94ce25951bb50  gold/testsuite/hidden_test.sh
+7307261e8720367aba744859958b1700  gold/testsuite/hidden_test_1.c
+db4a336c6c9c6120f5c0ff04097b7061  gold/testsuite/hidden_test_main.c
+39cc2487a8aa8d07cd43237a02d18c81  gold/testsuite/icf_keep_unique_test.cc
+6d707279237ff0073212cf18c1f63220  gold/testsuite/icf_keep_unique_test.sh
+eba7bf7e0a5fb9ae780f7c255a28abfe  gold/testsuite/icf_preemptible_functions_test.cc
+974b10045822dcf27c1da02ead7e2277  gold/testsuite/icf_preemptible_functions_test.sh
+dbe37f764ab9d017bcb0cf9080b88426  gold/testsuite/icf_safe_so_test.cc
+d87cca5952715bab965e5ba705cc05c8  gold/testsuite/icf_safe_so_test.sh
+894868f60fd41765a92d882d77d357ed  gold/testsuite/icf_safe_test.cc
+aa2529b30aec0cd7c305b9bbc5604a55  gold/testsuite/icf_safe_test.sh
+7bf16735ca553cf8c8d4f2110f581e94  gold/testsuite/icf_sht_rel_addend_test.sh
+c072acfe20a945d106bd1616dc126258  gold/testsuite/icf_sht_rel_addend_test_1.cc
+9aeda08248fb32af6fbaedc786c9b7e7  gold/testsuite/icf_sht_rel_addend_test_2.cc
+e79ceba2f1f4bee0c058fd9cd4ba6aa2  gold/testsuite/icf_string_merge_test.cc
+e3cc6d79af13ecc1f7bba5336d151b0c  gold/testsuite/icf_string_merge_test.sh
+ead6454590ffb78112089ee878e99040  gold/testsuite/icf_test.cc
+5836f93b421f3a20bccd239587234dd6  gold/testsuite/icf_test.sh
+ad8de88fb33fe0412f4003774aabf0bf  gold/testsuite/icf_virtual_function_folding_test.cc
+b21ad12a2ad23a55c7cd878016e3df6a  gold/testsuite/ifunc-sel.h
+86a84ae9d37784b4fd773b0fa913e75e  gold/testsuite/ifuncdep2.c
+36105ea36ae78f1358061b5cafe4f049  gold/testsuite/ifuncmain1.c
+3223fc2f00c6328c56e1eef47619091c  gold/testsuite/ifuncmain1vis.c
+7a9dc0727592c03f021d90ec4b8d7fa6  gold/testsuite/ifuncmain2.c
+52b232060dd2ed88ff3fe9a1c80206fb  gold/testsuite/ifuncmain3.c
+35c4dfe83d3aaa038b62d46203f84396  gold/testsuite/ifuncmain4.c
+d35d19a47708945bd834852e319bbb8f  gold/testsuite/ifuncmain5.c
+db6ee45d78f8e4e03f54bcfa642978a0  gold/testsuite/ifuncmain6pie.c
+101daa6b653909395b9cbb4c597e93ed  gold/testsuite/ifuncmain7.c
+3e078803e18828d03059de73cba7ba1c  gold/testsuite/ifuncmod1.c
+7c02df556b86d56318f50afa8533aa27  gold/testsuite/ifuncmod3.c
+c97a7d851dfb9625975c8b6e35b32279  gold/testsuite/ifuncmod5.c
+06f48e84f9eb7409965eaadbde00af5b  gold/testsuite/ifuncmod6.c
+26c7bea4cf5e792bca4e2592e4cba375  gold/testsuite/ifuncvar1.c
+93105bfafdabb199590707af7a834ffc  gold/testsuite/ifuncvar2.c
+7450022de20fad74520e5baa717f5e3c  gold/testsuite/ifuncvar3.c
+a34bee1d1a7b4c41cb6effbf77f97ee8  gold/testsuite/incr_comdat_test_1.cc
+b10259c8bf00761efc8701d17580cb30  gold/testsuite/incr_comdat_test_2_v1.cc
+50fbe3aca10cb9fdc08b4c04a362e07e  gold/testsuite/incr_comdat_test_2_v2.cc
+637fc5ee63af1f2f527b80020e3b6197  gold/testsuite/incr_comdat_test_2_v3.cc
+045b6eb30ab2bb2b9bf3f78ec15de004  gold/testsuite/incremental_test.sh
+564d56618041450f346ab976eaa61c7f  gold/testsuite/incremental_test_1.c
+26ebfc5653a661a125f378a2c3d1a4d9  gold/testsuite/incremental_test_2.c
+9581f14249af0949a34b805eca2c220c  gold/testsuite/initpri1.c
+a2724cd18628c0d98d8f5beee833acbd  gold/testsuite/initpri2.c
+32d55772fd511b95d87ade4373a30b89  gold/testsuite/initpri3.c
+066dfe40c23c09af4ceb1975b9012583  gold/testsuite/justsyms.t
+367168b4efa520b855148ce3f598a8f4  gold/testsuite/justsyms_1.cc
+c60367832efe45fa6723dd66e9ac5b05  gold/testsuite/justsyms_2.cc
+12d0f03a590433b78d1551a220c9a4ce  gold/testsuite/justsyms_exec.c
+4ae956afa49ee72ad6f1df0694d1edb1  gold/testsuite/justsyms_lib.c
+f56a346fc9a2bcb6a4f0cc8f11c9a982  gold/testsuite/large.c
+349094e7d3a8b7733f1ddb6dd7e9163b  gold/testsuite/Makefile.am
+53ab2814e7934bfdae92180956b38037  gold/testsuite/Makefile.in
+4fdd47206bc0385125e6d021aa14307a  gold/testsuite/many_sections_test.cc
+583bee06b7ae8e1ebd4785762bb24bf8  gold/testsuite/memory_test.s
+6531523bfc4f5ff52f3cef93263ed798  gold/testsuite/memory_test.sh
+e82261fb2abdba3fd5af311575ad8443  gold/testsuite/memory_test.t
+b33adf188e54ec8bf8a8cefe2a33db59  gold/testsuite/no_version_test.c
+58be382ca4285cfee5767dc4eb27cb0c  gold/testsuite/no_version_test.sh
+10c717dd95cada8753723d2e9a973437  gold/testsuite/object_unittest.cc
+30c3b467ce9d7551092d7f3c13886bc8  gold/testsuite/odr_header1.h
+810b515797a1ae720dbe559c96f6f8aa  gold/testsuite/odr_header2.h
+d2cd4073d022541e7fba3162c7aa540b  gold/testsuite/odr_violation1.cc
+d64b7cfb04ba4e60eac6db5fa9309eba  gold/testsuite/odr_violation2.cc
+6a6f92c7fd2e7212418adb9095d72267  gold/testsuite/plugin_common_test_1.c
+d05a8a5aea99e607efcf0ba1ed948914  gold/testsuite/plugin_common_test_2.c
+f3465fa6136d73af4bd00205b504308c  gold/testsuite/plugin_test.c
+c57bb784354b0cdffe1b6b057259a294  gold/testsuite/plugin_test_1.sh
+fa4b4ad9be3db3e90a35d2831867508d  gold/testsuite/plugin_test_2.sh
+35b2bf95e682aa0e452aa96723c43db3  gold/testsuite/plugin_test_3.sh
+bca6113628db0717e20e2c1d9c0f857d  gold/testsuite/plugin_test_4.sh
+babd41199703733916a4dcee04cd5a66  gold/testsuite/plugin_test_6.sh
+261da0c226d78509c9dd1af8638f6af3  gold/testsuite/plugin_test_7.sh
+127d7782cc0229bcbce7010945937695  gold/testsuite/plugin_test_7_1.c
+c18af6e29a62fb91d780c7429cc9075d  gold/testsuite/plugin_test_7_2.c
+8fc0a654e08f79cd998b0aeefaacd13c  gold/testsuite/pr12826.sh
+f67205103ab4ed24d22d1ee8600ab7a8  gold/testsuite/pr12826_1.s
+4950cb58ee8f6195869df0249101e45b  gold/testsuite/pr12826_2.s
+a07e5eb89ec20de023a18d3682bae916  gold/testsuite/protected_1.cc
+5dbdaa63cf9fea403a320f846563b01f  gold/testsuite/protected_2.cc
+228f14b040be1541678cefab27814a39  gold/testsuite/protected_3.cc
+647a519351194b76e6d0bef0de0214f7  gold/testsuite/protected_4.cc
+7af79e8f5d339223d69a8a762941643c  gold/testsuite/protected_main_1.cc
+859efb322e32dee1f4f8f21c6e5fb6bf  gold/testsuite/protected_main_2.cc
+b35d87a1a4f5b3dfe3d864916e042967  gold/testsuite/protected_main_3.cc
+5cc488b6518c24ca2409d55a3cc923a1  gold/testsuite/relro_script_test.t
+a37bc67f4dbcd87bcaa6c6b220c27513  gold/testsuite/relro_test.cc
+ec6697af4def9dd74a3fa4dde6e34a0d  gold/testsuite/relro_test.sh
+88b854e0c2b0c5319da258766af03284  gold/testsuite/relro_test_main.cc
+271248ad882f12684eee0b6dbf55bce8  gold/testsuite/retain_symbols_file_test.sh
+39180a068348fd1c1215a38b8d633068  gold/testsuite/script_test_1.cc
+3a563adb4df0d719dd6a800daf329277  gold/testsuite/script_test_1.t
+4210035cfd18d6e9d68b2718a18f8b27  gold/testsuite/script_test_10.s
+c56033af9c8c34196fac9eed159b9115  gold/testsuite/script_test_10.sh
+085d6ddaef797dcea9d2e1707ee361bf  gold/testsuite/script_test_10.t
+4411366032ece98b7c55998549f53a5c  gold/testsuite/script_test_2.cc
+953d49b1bfd051dd9d9f69a183443d26  gold/testsuite/script_test_2.t
+19451d78fa1163268664f188e9211b78  gold/testsuite/script_test_2a.cc
+7b0e5b1d445feea506abb7da9d8ef168  gold/testsuite/script_test_2b.cc
+2939fbff7932bb95bf296d3e610585bd  gold/testsuite/script_test_3.sh
+885b1f4a24902b0c2ad06c4fb9d27196  gold/testsuite/script_test_3.t
+689ea70c4e0d8f011b321a088b5323eb  gold/testsuite/script_test_4.sh
+d8a46620baae25402bfe41a40188362e  gold/testsuite/script_test_4.t
+14b92c452d67ab355f99b9525dcc9224  gold/testsuite/script_test_5.cc
+066d211a0717c0d74a5eb91307d14794  gold/testsuite/script_test_5.sh
+8d3e985a53460e7e9fb7ace265876e40  gold/testsuite/script_test_5.t
+3c91f257078cfecb860ee6a1c64591ff  gold/testsuite/script_test_6.sh
+c1668bd6f86d1cff885b5e5a138d1f89  gold/testsuite/script_test_6.t
+391f5ddcd92576f694447b94d92c9aef  gold/testsuite/script_test_7.sh
+7619a9f323c97a923fb675befc13a305  gold/testsuite/script_test_7.t
+ade28ed2703c3b34f9e3d6810191363f  gold/testsuite/script_test_8.sh
+4e78bec9aba83de38c35529d4bde606b  gold/testsuite/script_test_9.cc
+edd3e81ed58f2029416bd36a17ac28e2  gold/testsuite/script_test_9.sh
+059c878a569b3bfde82fb9f6877c2e5e  gold/testsuite/script_test_9.t
+8c915430abad523a698b45f495830f44  gold/testsuite/searched_file_test.cc
+d25ad22662e92621bbd7ffc1497a76fe  gold/testsuite/searched_file_test_lib.cc
+5f9efd4bba4273c4f1f93c8dff3690bb  gold/testsuite/split_i386.sh
+92c11cdb9aea842d594b9424e9b2e3d0  gold/testsuite/split_i386_1.s
+66bd8fa6475d58e4d5c1250282207149  gold/testsuite/split_i386_2.s
+519c8104a43ce535996d4e2a1e1f24e8  gold/testsuite/split_i386_3.s
+99f5475ec63903df570d418a0b08c728  gold/testsuite/split_i386_4.s
+77b0a399acc870bc90a5338a92e2a599  gold/testsuite/split_i386_n.s
+e1d576034c0c7dbc847f4c7e3df553d1  gold/testsuite/split_x86_64.sh
+f63fdcb4a6e54aa57f88de09c817b52f  gold/testsuite/split_x86_64_1.s
+b60c470795e496998f11ece6956a2002  gold/testsuite/split_x86_64_2.s
+85b4c26998b04b65acd6f6fd7801651e  gold/testsuite/split_x86_64_3.s
+c3580b83ac55e873bf841065173dd2e3  gold/testsuite/split_x86_64_4.s
+b0c0742e6df0a34955d20797a071639a  gold/testsuite/split_x86_64_n.s
+fce9bf62d81837159afeea4fafac82f2  gold/testsuite/start_lib_test_1.c
+c749fece8a8c8ad552933c2cdba1b73d  gold/testsuite/start_lib_test_2.c
+3e26e8637b2167de82f07c5258d6379a  gold/testsuite/start_lib_test_3.c
+b46a3e843a80ba9375dab2cfc3164a9e  gold/testsuite/start_lib_test_main.c
+04d742ae16a0f5f8f3213ec68971c51d  gold/testsuite/strong_ref_weak_def.sh
+7462c5f25ccd406fc6f9b0451cfd9b50  gold/testsuite/strong_ref_weak_def_1.c
+b5addfc24c12a59a153f149fd7e34d06  gold/testsuite/strong_ref_weak_def_2.c
+92a2f788eba64b331755cc0579f783c2  gold/testsuite/test.cc
+61a1a39977549e93f347220686ce4f9d  gold/testsuite/test.h
+865cc6d89aee65b3ec22f99a866c5c34  gold/testsuite/testfile.cc
+7918d8c7bd159119eedbb2aad20da05c  gold/testsuite/testfile.h
+5e680f660da830eeb807e760d248c887  gold/testsuite/testmain.cc
+df8a86dbed6dfbb59ea786b9c22f0c10  gold/testsuite/thin_archive_main.cc
+b3255ee5cd1b3c111c3c116d2f3ea14e  gold/testsuite/thin_archive_test_1.cc
+a6c10c3b107a5fa9b54f467bac65c5c5  gold/testsuite/thin_archive_test_2.cc
+797d9b9004a5862e433154b6a19b80c0  gold/testsuite/thin_archive_test_3.cc
+da392c8e272fcca3d22c3a6bc4063a0e  gold/testsuite/thin_archive_test_4.cc
+bf756e1012d336150378b6cfc9dfd081  gold/testsuite/thumb2_branch_range.t
+9362c778a05845384fe2994a2892e9e4  gold/testsuite/thumb_bl_in_range.s
+c3f11553ea12931497c562c3864aa594  gold/testsuite/thumb_bl_out_of_range.s
+c8ea5705d6e982f8268f8f9a4137c150  gold/testsuite/thumb_bl_out_of_range_local.s
+7d6754aa40903fb37d2b2624a193417d  gold/testsuite/thumb_blx_in_range.s
+f94fc31d77082d754091a1f272948813  gold/testsuite/thumb_blx_out_of_range.s
+3731e95f245e102e1d863250a054b537  gold/testsuite/thumb_branch_range.t
+314cac0f6d51d09ff576a5afc1445a36  gold/testsuite/tls_test.cc
+e82ff898000bc8e949ed124b65de6aaf  gold/testsuite/tls_test.h
+2e21e4374970271ac4a65291bac0a597  gold/testsuite/tls_test_c.c
+0330239e0c853bbc74e926bcc2c226ad  gold/testsuite/tls_test_file2.cc
+fb2c02bee4360a3c68dd84cc13e402a0  gold/testsuite/tls_test_main.cc
+c0779b92c2034e44017e299b8439bd0b  gold/testsuite/two_file_shared.sh
+5215960d6afbb41b8e45ee0a37a19719  gold/testsuite/two_file_test.h
+90b895eaa66266a27d57763d2adce03f  gold/testsuite/two_file_test_1.cc
+5978286c8c2ab7fc747a768c45579a52  gold/testsuite/two_file_test_1_v1.cc
+bd95fd9d6127f3e1294207665cf52370  gold/testsuite/two_file_test_1b.cc
+4e30b6566dfd5650fe87774ed84cbaf9  gold/testsuite/two_file_test_1b_v1.cc
+d8fa3345100ea2e8255d8a16f329efb7  gold/testsuite/two_file_test_2.cc
+a455fd0eb4200e45799517762de553c3  gold/testsuite/two_file_test_2_v1.cc
+5b56f88017fc47926f1d9c3f5989c1e3  gold/testsuite/two_file_test_main.cc
+268e374cc74b6a5ef4552288dc23daca  gold/testsuite/undef_symbol.cc
+3dd33a4f5afe7dd9271b34b797d0d84b  gold/testsuite/undef_symbol.sh
+5715070e84f62d6ee8e377046e63e366  gold/testsuite/undef_symbol_main.cc
+bc58a234c75219d474aaa67e22656566  gold/testsuite/ver_matching_def.cc
+a60ce5a99c12565ed5c40ddd820dd951  gold/testsuite/ver_matching_test.sh
+beffa956f70cbc4a1732fa99fe909fc3  gold/testsuite/ver_test.h
+384ef699a55216bb312602b164af8ca8  gold/testsuite/ver_test_1.cc
+7e5064c7006e2d231f09ff08dac42c29  gold/testsuite/ver_test_1.sh
+03748fb27f0867c9a57807cf993d21cd  gold/testsuite/ver_test_10.script
+6cab80863aca6054b92129e369543636  gold/testsuite/ver_test_10.sh
+d11105a86e14720017b1e2c269c7953d  gold/testsuite/ver_test_2.cc
+c6c16debe9c8cc965791617baa2f47ec  gold/testsuite/ver_test_2.script
+06f65e3a91f1371690f279c37f3053a1  gold/testsuite/ver_test_2.sh
+2fcdc5d9214ded2426b4e40af8f6d499  gold/testsuite/ver_test_3.cc
+068472b6093f7e002925d6efbe499d0c  gold/testsuite/ver_test_4.cc
+b2d01290dcbd043c7af43d3755d6fd7c  gold/testsuite/ver_test_4.script
+c3a654287019a6cbefe256d2b437b8cc  gold/testsuite/ver_test_4.sh
+f44eab73816b100fe90be7878e8d9203  gold/testsuite/ver_test_5.cc
+ebe0c7c7674f000cd9681763cc254431  gold/testsuite/ver_test_5.script
+56969f9f537a373c1027bc9c1047f491  gold/testsuite/ver_test_5.sh
+910f0387b9b174a4f772c8a480cd9291  gold/testsuite/ver_test_6.c
+e4d053bdeedc7136f86dbccb3f4143f6  gold/testsuite/ver_test_7.cc
+447c7a6d3ef5dba00f56f4a3617de313  gold/testsuite/ver_test_7.sh
+b78ed4c062f3af1aa2d7d8e0af109b64  gold/testsuite/ver_test_8.script
+dc1f223d30a0a313893471d6cdb65410  gold/testsuite/ver_test_9.cc
+3ff3ea044c805be646385eeaab979e07  gold/testsuite/ver_test_main.cc
+f05fb8eff1750298a54b0484490a571f  gold/testsuite/ver_test_main_2.cc
+aebe07d6e28f2c7ee5cec8d74b63dd54  gold/testsuite/version_script.map
+5bf5e9fc880e5b7e93b7d8d964a900a4  gold/testsuite/weak_alias_test.script
+5a714657e1f0769154be3d12f4d30473  gold/testsuite/weak_alias_test_1.cc
+fe9f3172d0ed0fb2ae23ae0b142b9c5f  gold/testsuite/weak_alias_test_2.cc
+5d5efae0d256bb2f467ada9a855911b1  gold/testsuite/weak_alias_test_3.cc
+36c37c602257cd02876083e428f56384  gold/testsuite/weak_alias_test_4.cc
+b0df37e2239b69770ce3eafa9e9973e4  gold/testsuite/weak_alias_test_5.cc
+43d9f83948e1689acdf6b7f7cd91b6c7  gold/testsuite/weak_alias_test_main.cc
+e629f6c0e53c86f603909e751e690f9a  gold/testsuite/weak_plt.sh
+6931c792306748004ca9badc85818bfd  gold/testsuite/weak_plt_main.cc
+2cf9ee7eb929562a3275234d5ed8da59  gold/testsuite/weak_plt_shared.cc
+75c3f8bbad7bbd41407f745a912a96bf  gold/testsuite/weak_test.cc
+2dbbc97ed424629b8db4d3edec61a0d6  gold/testsuite/weak_undef.h
+eee2f2336dbd6872707ff8583eb1a5d3  gold/testsuite/weak_undef_file1.cc
+8ae4b91e1cfa5b8944a13b22b6024081  gold/testsuite/weak_undef_file2.cc
+fc26afb96f348fd06e66eab4f0eb5576  gold/testsuite/weak_undef_test.cc
+8d96d1fbfa1c61fad71e0d371a16b067  gold/timer.cc
+7e6cb7703266905dc977ccd2fc2fdf61  gold/timer.h
+fb2f2b23678fd9fe40ce267f45866747  gold/tls.h
+9dc53739bd66ed923d6aab774d2fbf9b  gold/TODO
+4e24824b3b6dcaff1d88e01e658f6d54  gold/token.h
+d5ad2a6b0e7a516c8289b050fe442c6a  gold/version.cc
+2dc56f3a7a1ef7b914952877de97bd6e  gold/workqueue-internal.h
+15304cbcde24f8a4428f965b57853ea3  gold/workqueue-threads.cc
+b15e7f397216d5a51dd46201ebd53567  gold/workqueue.cc
+224da8f6a03c481c61cb746bafc9f401  gold/workqueue.h
+6b11dc3372330d0627453f26fbce346a  gold/x86_64.cc
+046741ffdf19b6092e26040b060a6f3a  gold/yyscript.y
+b167dc5dcf583c07feecea0f8003e647  gprof/.gdbinit
+8257446e682118e49bf3006a90c44bd9  gprof/.gitignore
+c25e30ce37ff2c7dec4c9416e9def020  gprof/aclocal.m4
+b7f3f1dbdb1af21fadd9bad6efebe8c0  gprof/alpha.c
+7a5e6b6d3e5f41055c94ac0c2aba4686  gprof/basic_blocks.c
+68337233c4fbbae70f0c91b14ac23771  gprof/basic_blocks.h
+f28a2937af419e630b9fa9fa69f92220  gprof/bb_exit_func.c
+bb4081da1d9c7c6f056ec52fe9bc2ac6  gprof/bbconv.pl
+5bbcdaebdace1394d7b9a9e664af5ccd  gprof/bsd_callg_bl.c
+cadeef23b67be4bb67efb8d51c426a84  gprof/bsd_callg_bl.m
+dba6b3485060a9752a60203a681f9eb8  gprof/call_graph.c
+5a84abf379cae2ccd9ce443822e8ca88  gprof/call_graph.h
+d49a8ea21b682aa7157b90da9d415692  gprof/cg_arcs.c
+e8684da93359ad97b5c235bab5c5474d  gprof/cg_arcs.h
+dd5eca848b88b6d2fe6f0eaa280c0fe1  gprof/cg_dfn.c
+a1f9f8c6502a23c0f11956f1854376a8  gprof/cg_dfn.h
+397aa6fdcf671321fa19cb131b76ab72  gprof/cg_print.c
+7d0374db6f692e7a6e1fd69f2b7311e0  gprof/cg_print.h
+93ca5d4377944b7ed291c35b59cc3bcd  gprof/ChangeLog
+a160966de58352bbe3351ef84b65cc5f  gprof/ChangeLog-2004
+59394b05b4e06d2a4e779bf09e828a79  gprof/ChangeLog-2005
+6910e91285ad062c6c924f5a1dc9ca2f  gprof/ChangeLog-2006
+b87ba12a146472b54416b46f18fa371d  gprof/ChangeLog-2007
+40e0bc6ec4ffd8dbd114f18ce6a2abac  gprof/ChangeLog-2008
+557f36e4287947ab6630317f0424188e  gprof/ChangeLog-2009
+bd58b6671500d3bc2d84204f35b6a643  gprof/ChangeLog-2010
+7be7f2cec102ed4a91aba8985a704085  gprof/ChangeLog-9203
+745ff1b458c66a2bdcc3d275761355c9  gprof/config.texi
+f1e822f1c45291c7ec965337ae5d543b  gprof/configure
+ccfe0b08eafef379d243a00d97e9d473  gprof/configure.in
+16a778434d1cd5848765ca6ab255fbbe  gprof/corefile.c
+b0ce8fa6fde924d0e1883ade40c89573  gprof/corefile.h
+cec602aa7e8925e06a658a3060d42c1b  gprof/dep-in.sed
+072910d553f79906db69fa7c0e956bba  gprof/fdl.texi
+6b0c66b9f8ad2f32fed0575bc4f10bbd  gprof/flat_bl.c
+d6498bb2d3ec24087785cd109c215067  gprof/flat_bl.m
+845df53b262986e413ab8333f3b60463  gprof/fsf_callg_bl.c
+609bbce6f5cedf6b0c8d25c3061b582a  gprof/fsf_callg_bl.m
+b908740cf1594cdb62130cb966e0a79d  gprof/gconfig.in
+2b39bf82ecbb857963231a1da2b79977  gprof/gen-c-prog.awk
+15df93a147b06f0f0d8cf05f2939ba4f  gprof/gmon.h
+f7577744dca93e5dc3fd833e4db52c38  gprof/gmon_io.c
+bc9603fc7f31fc94bb1d3f9bd69faa51  gprof/gmon_io.h
+90584e94b238bb26c1dd5af55a09033c  gprof/gmon_out.h
+ba427b1fe36ebc7769b7b9d6df88dbff  gprof/gprof.1
+4c25239e032ba1183b18941e47af0b20  gprof/gprof.c
+ef2f65f1bb0fa0c98a044942eb493e15  gprof/gprof.h
+5b39d86670cb03213d45f18559d5063d  gprof/gprof.info
+8bcf7676f463ff82f243c9c5f0a2570b  gprof/gprof.texi
+78367cd648e22d38195bb574293e3be5  gprof/hertz.c
+24db7d8a9df2b0b4bf64f282fc3035a9  gprof/hertz.h
+f9d86d11e63224ffa1dfc385797e872b  gprof/hist.c
+b0a33ff164aac1e9f56550c1194993bd  gprof/hist.h
+a6429d3de563eb0422db7c58555a7b0b  gprof/i386.c
+d618facc3e8ce8bf3d02ba452e1be6ab  gprof/MAINTAINERS
+f43a7ce0699f7a7e7bb15cd62bee00c9  gprof/Makefile.am
+ed79995a32be351e6fb317e1dc76217b  gprof/Makefile.in
+92a358204dc90732f5c3ffc4d16ef9dc  gprof/mips.c
+5e484f64f2a4e94587e5a5b34a051608  gprof/po/bg.gmo
+b55b2ff070169006067a250ee0221783  gprof/po/bg.po
+48e64f6435b31c4a0cd11c906a0d206b  gprof/po/da.gmo
+8eaf82a729b46891007cb58e3028f90f  gprof/po/da.po
+f1c150dcdb59dfcf53610b240c629ba7  gprof/po/de.gmo
+852de791b4a6f1ea1af26a44aff56361  gprof/po/de.po
+0b53f02ce3a8eb7bb21dedc5b9d9a6e4  gprof/po/eo.gmo
+ad78a013a4bb557eb02c0a4c68e3a0aa  gprof/po/eo.po
+3bd53d1b01f6bd62d97d53f552a56cf7  gprof/po/es.gmo
+c64dcbad3d4cf13bfb95824e7f948f4a  gprof/po/es.po
+871b46017f0b1344ca87d65b49f1db6e  gprof/po/fi.gmo
+bedf2b91236742150e4a4b618ed9d2f4  gprof/po/fi.po
+42e353d68b836d3e53533f27ca76e83b  gprof/po/fr.gmo
+c5e27689bcbf9e35ab33c5c495dbd242  gprof/po/fr.po
+82d1a6e0345a6dc65b323f04ea1f1375  gprof/po/ga.gmo
+c46ba65e8300569e05946980c1c7c9a2  gprof/po/ga.po
+242b1947c33a01da9b769561d24bb37d  gprof/po/gprof.pot
+c45783507056bc5710c73362dbe5fb8f  gprof/po/id.gmo
+24c804330a015a44c58c8d307a2a3947  gprof/po/id.po
+b6b3fdee1867107468c837cd28e9f2cc  gprof/po/Make-in
+7dfd99c4a1fcd67218ddf18e17d82cbf  gprof/po/ms.gmo
+9b3ec05fd4e9a4a07b6c64a7bcf9266c  gprof/po/ms.po
+8fbf0eb42cbc660fa4f531e95ea0827f  gprof/po/nl.gmo
+07e0b8bdd5cf9ccfafc671d8a18e9860  gprof/po/nl.po
+954b09a7062a564dc338de22ef52c6e2  gprof/po/POTFILES.in
+e3fddb2aecf0942f7a13aa5348ddd11a  gprof/po/pt_BR.gmo
+161f4f55fce356f7094d855fc8e5b792  gprof/po/pt_BR.po
+4f7dcbcf961a162151794fbd0be3da7d  gprof/po/ro.gmo
+84b22161acbbfc32b35dcf3c9a4d7efa  gprof/po/ro.po
+4ccf806f6741dd20dbd51ad675cf4877  gprof/po/ru.gmo
+6577e9d3a420b1c2a584846bca2771a5  gprof/po/ru.po
+6caef4d7466f584c8a1833f08dda3a5d  gprof/po/rw.gmo
+d324bc814fd81a744f853d48ca2f8807  gprof/po/rw.po
+6f3be1926b6465af05884a7bbef70084  gprof/po/sv.gmo
+660a4c733d22fd06cafe2e5f2c75874a  gprof/po/sv.po
+e8a064faa7431c3994490313f73d4823  gprof/po/tr.gmo
+ecb9cfdafed941c2fecc6273f53ea575  gprof/po/tr.po
+6672c85403a880ff77896d264d4e1dd6  gprof/po/vi.gmo
+604e0ce442e10d12a8e1b6c5c3318cfd  gprof/po/vi.po
+43648972d2edef291b8576a493fba059  gprof/README
+b37c1ae4e02c17078cb33f195df6c840  gprof/search_list.c
+45b40bf6f6d8e8ee594f0fbbacdb5626  gprof/search_list.h
+82eeae5aca49920314ef3f149e5ea5a7  gprof/source.c
+f5bcd857626c6d9c14653f57431c36b7  gprof/source.h
+54d3572d0937665e0916878d1dc5130f  gprof/sparc.c
+1ded054093de910d9786c62bc4fe8cc6  gprof/stamp-h.in
+49efc7499c1ec4be045bc78c1948f7f0  gprof/sym_ids.c
+6ee9f7aad26dd9bd38036a6c7988f9c1  gprof/sym_ids.h
+ebaa562f8fe94865131c9b04734f0c91  gprof/symtab.c
+8978a1f6bb28ebf3d289f6a0b4294e43  gprof/symtab.h
+737ea860b5dfbf959e6788867f07bb33  gprof/tahoe.c
+84c06350a03466660f0f691ed1220657  gprof/TEST
+6ad1234ccac48218eab0cd8e116d7a63  gprof/TODO
+d2e2755377f12d1da4af0a2232cdea8f  gprof/utils.c
+69a2b7efd7466aeadfda109d360f088c  gprof/utils.h
+f6a3f0884b4107faf0b7000f6236e4db  gprof/vax.c
+34a574860b19567290ef5380ad1a2add  include/alloca-conf.h
+9032b8a915f567d2b568e53ac7ac5b7a  include/ansidecl.h
+9bf143ae20d22d602af1d3639222e405  include/aout/adobe.h
+95a11765956c61fab8c3a8df4512c2cd  include/aout/aout64.h
+2dc6a66df1da224f7494f46a56dbf0dd  include/aout/ar.h
+d6a0eb4eb539859174c017274cf514a3  include/aout/ChangeLog
+0c11e5e02f70aedc75c45feb5691d993  include/aout/dynix3.h
+5843207325783c921dcad8f11c9fa94f  include/aout/encap.h
+5535a653d8c4500b71c03d39cfe0ff18  include/aout/host.h
+ccbe8dbbe26ecc468e56817063dca616  include/aout/hp.h
+017739730907b82915851f547d340b24  include/aout/hp300hpux.h
+d82993bf02befd5682dcd44b076ad991  include/aout/hppa.h
+843da52f6f139f2b0136b5d9e0648ca5  include/aout/ranlib.h
+4a3bdd2dd23d30f487baf5432c8d1b20  include/aout/reloc.h
+f82e6a620da3f1ed5a372941cb8aaa60  include/aout/stab.def
+300c0f2ae0122d204d21af15364632c6  include/aout/stab_gnu.h
+60533ae00228889f83a45c3d05e3e14f  include/aout/sun4.h
+1db71a14c0f6670060e4d92570413cbd  include/bfdlink.h
+8899f3b1094aed581ee5ce21fb77eeb5  include/binary-io.h
+f3c1e3130022d959443585d2333df0e8  include/bout.h
+290ba69831c663db0eba93c8df043251  include/cgen/basic-modes.h
+1fc7474f7dcecfd367aca58685f80784  include/cgen/basic-ops.h
+a952fcdbcbee3972d46d86c07c7d2c24  include/cgen/bitset.h
+03c05a0d9d58b7b3ba805b3565ae6667  include/cgen/ChangeLog
+3945456b78c6641d130fd7cc156b13c9  include/ChangeLog
+4263432a72ff47ed8bf420208ee7eea5  include/ChangeLog-9103
+b912255f6e27ae91ad42e1d7ac095574  include/coff/alpha.h
+76473e99ea362a19e104ac2974ddf083  include/coff/apollo.h
+e4635227d1ae2326c3a255390699d71a  include/coff/arm.h
+3c016550ca6af194ea1339c2e6ba372e  include/coff/aux-coff.h
+ef82b5f6eb836c079d0ec9f2423d6878  include/coff/ChangeLog
+3bad510fca185cf87d7b28b5e6bfe35a  include/coff/ChangeLog-9103
+21aafdfa874270a0c1cd5fe8814e5636  include/coff/ecoff.h
+a7846784c562274dd60548b6f6982a3a  include/coff/external.h
+16c0cbff134e50e9d1a22b00bd14ecba  include/coff/go32exe.h
+ee904ce85485ac8f14171530b1a8eda2  include/coff/h8300.h
+68864eac4f79619d079902f9d024f771  include/coff/h8500.h
+48a80341899d6027eff2eee34ed64bf4  include/coff/i386.h
+4076f5d389f96789d30dafcf7bba4259  include/coff/i860.h
+865b4970180497b50c10cf0d42d1971d  include/coff/i960.h
+b4230ed90450294aa5dfe15948e8e0a8  include/coff/ia64.h
+dd821a767d324f8a5f78fa1db1267387  include/coff/internal.h
+390c06c0c15fbd71ea17660f5b725895  include/coff/m68k.h
+2e9bd273421296554e8e7bdaf30783d0  include/coff/m88k.h
+bd63cdac412c78bd01e66d080f8db24d  include/coff/mcore.h
+c7f00e9cf8b40362a1d6d53ac5f72b3f  include/coff/mips.h
+e39fcff9b9b037210d4179939c2e5440  include/coff/mipspe.h
+e04cd0508f438882b386e0d4a3ba03ac  include/coff/or32.h
+1df66128b6ccf64c7cee7b686fb30bef  include/coff/pe.h
+a455fbd246f05ebb0bf66f690adb5a25  include/coff/powerpc.h
+61b3f01f01ee967546a45fc90decbf92  include/coff/rs6000.h
+88ecd5e08c4c3f1a4bf9c85dcf9e6b5b  include/coff/rs6k64.h
+b2fe38acbabcd74e21ebb084348c6a40  include/coff/sh.h
+47e28de596b5c484de7fd948f55b1d0b  include/coff/sparc.h
+49952fda1e759e5aa659f8f78d7e0ba0  include/coff/sym.h
+9548a06f2a9fb6be7f272df74ead65b7  include/coff/symconst.h
+5599c91440707355b854aded6fa13295  include/coff/ti.h
+6cc38eec1b5b24b287ad375e9ae20d24  include/coff/tic30.h
+f96b617a9b423ceffcb9ec89d921eac2  include/coff/tic4x.h
+cef5a0d8b9fa08040372dcbeb9a44b20  include/coff/tic54x.h
+d702c6ecd4ab88caaeefab21c1d47fdf  include/coff/tic80.h
+ac0cc9e33ae81d7800e1edb4a68be73f  include/coff/w65.h
+aaf4db02e2d234613e8c89ee80bff7b6  include/coff/we32k.h
+c9ca24217769549d3b1a88ae2d219412  include/coff/x86_64.h
+adb495746480cf5e4bec3fe6c3d3bceb  include/coff/xcoff.h
+2abcef5d0d6f17bc50116ce28c2a9c79  include/coff/z80.h
+598577f829ade2923058b3aa70fbac61  include/coff/z8k.h
+59530bdf33659b29e73d4adb9f9f6552  include/COPYING
+d32239bcb673463ab874e80d47fae504  include/COPYING3
+552d5fee651e1276d17c0ad69e6e2364  include/demangle.h
+00b2d16b5f1a99fc74893b0eaae554b0  include/dis-asm.h
+5550f59655329d720b345cf218922666  include/dwarf2.h
+7e968442c6c0231dfe2def312758e765  include/dyn-string.h
+a0be754e05a23a8ec6b90db035b264fa  include/elf/alpha.h
+07b373cba191d679f95f44fb56ee2f62  include/elf/arc.h
+f0fec15cd5722ca40e791ceb6fff0864  include/elf/arm.h
+cd6e7c61fd149a7c60a81e3f3172ab6c  include/elf/avr.h
+6cdc5aea929775d124edd759932f0f21  include/elf/bfin.h
+fb94fb544380d87e639028d2cb08d8a2  include/elf/ChangeLog
+98f9c5b892b53edff47e277ff7d497f8  include/elf/ChangeLog-9103
+c7a329af90a38c1db550ad7c283cd51d  include/elf/common.h
+833f67e93dfac42af486802c610b6e50  include/elf/cr16.h
+d557cb1da86b222f1d446100b403e863  include/elf/cr16c.h
+4a1fffce3fb4620d590f27cc8f28fe6e  include/elf/cris.h
+2f58e940dabc8b46822bcbcd5d53a341  include/elf/crx.h
+155a903657d20855f461c6f75a3739c3  include/elf/d10v.h
+9be4d2fdbc9d1360c58311cdcbb3baa2  include/elf/d30v.h
+019dee3ec6de49f6d0ced447a205a765  include/elf/dlx.h
+3c1229f9c0cf59c62e1008761089fa45  include/elf/dwarf.h
+e13648b26b8f4455ba86c4762dcbd5bd  include/elf/external.h
+ddcfe806124573919c45e574654f1aa3  include/elf/fr30.h
+f88e15682bbe1e7510da3cd862bca8f7  include/elf/frv.h
+a6628d3c5a0e2814931c9dbedc3817c6  include/elf/h8.h
+ab421f84fd2c6ba63f16f7b4f64636d3  include/elf/hppa.h
+9b18946aff312ca641ac8e1fc613a389  include/elf/i370.h
+46664d765c43e353af19ca90fe69034b  include/elf/i386.h
+1aff1942cbf7aad0cc528362d5462b53  include/elf/i860.h
+bd1fb91bd2d5525fc0387aa51f12061f  include/elf/i960.h
+a6df09804468c631260d4aae50f383aa  include/elf/ia64.h
+c77ae174f27c7490e252c18e2c04ef1f  include/elf/internal.h
+6eb429b4b795c777073550debb618c03  include/elf/ip2k.h
+2232e60b45500e60610102768597b74b  include/elf/iq2000.h
+c419f9feca3ab0795a69b694858b8508  include/elf/lm32.h
+adc2d9020e08eaab707704eec6c20168  include/elf/m32c.h
+9cf7dfeb398922addf1273a9ed9a1cb8  include/elf/m32r.h
+b79cab44748c89662f9ba4c8eeb5e016  include/elf/m68hc11.h
+405a16584c84e60c8b230c7d1f449fa4  include/elf/m68k.h
+acd354050b83b2aecf2c78e0c2fc3b12  include/elf/mcore.h
+d81e7a0dca173a1ba09c1999fba38b56  include/elf/mep.h
+f330b5f3671b02e554c928157c1edd6b  include/elf/microblaze.h
+45dd9dc4045aa4cd9019837bc8f163d9  include/elf/mips.h
+b841c8ba42956d6f7e17537ce63236c8  include/elf/mmix.h
+7ed67b249c64a72d05d9b4d87554dc18  include/elf/mn10200.h
+ccc949431c77de0330ee3c20548b7e67  include/elf/mn10300.h
+71e4a33766312419df99b0e62c39e445  include/elf/moxie.h
+eb3d9aab50e9c9fb6e18ad4812db0118  include/elf/msp430.h
+bbbd9d7f4e8f79f4d93e007aa07bf778  include/elf/mt.h
+b63470ef405cd3627e8a4fbff6bfd5e9  include/elf/openrisc.h
+8eabdfbd28ae6198beccb31177efe06e  include/elf/or32.h
+8adb19e5cc46d08bd2e4956e35270751  include/elf/pj.h
+7c23650992c8b40893751f297da52275  include/elf/ppc.h
+831ad133be87ebb0c334458ac71e9b28  include/elf/ppc64.h
+b465c7a7c9368125ccd6102fafe986c5  include/elf/reloc-macros.h
+ee51909dc0566fac5333286a96f7c57d  include/elf/rx.h
+ed1da1299b5bfacd5d3fedda42866edd  include/elf/s390.h
+31572c17886e82b32afee52ddac4b8c7  include/elf/score.h
+fdf0c78b30e3def4265b84749ac7636b  include/elf/sh.h
+4d28901c9577fde21e67f7ce7c60e0d4  include/elf/sparc.h
+14a24081c6a435663296024c32f2aaea  include/elf/spu.h
+da1403a10c2f7da13868f1995ed765f8  include/elf/tic6x-attrs.h
+5d85ecbb50678de258bdfedad761475e  include/elf/tic6x.h
+ce8fb71e4fd9470fdc0b3c6ca2a6d620  include/elf/tilegx.h
+d134e5d222ab02346e1bdc467076c9c5  include/elf/tilepro.h
+668ad953ff79fab28ea63be3c5e77db9  include/elf/v850.h
+cad5c91a81e838b439e530d350909b47  include/elf/vax.h
+08fba636fe2637ddc5176ab120cce6f0  include/elf/vxworks.h
+d12111ea734fb1577739f855f8ca6fec  include/elf/x86-64.h
+4bc7ecb76afcc22d26fa3b926b6daada  include/elf/xc16x.h
+08c0eb5204c37ddb199cbe638ff33c53  include/elf/xstormy16.h
+05ae7083595b682022f2dc9eecff9877  include/elf/xtensa.h
+6cd2afc8e147c2eed4404d0845dfa47a  include/fibheap.h
+bf41284ba32805344a0d778b39b0220c  include/filenames.h
+5029c34a63aebe10502a4059ffd7e427  include/floatformat.h
+7d6baaede380aa3344526a4bbf8a294f  include/fnmatch.h
+b2cd17a9267bc2e92df461d3170cb15c  include/fopen-bin.h
+87444b5c85b3c2bc734f8b86157b15db  include/fopen-same.h
+90ae66560d6f5a60f2be1493783f4256  include/fopen-vms.h
+76e89e58bf3bcb64a9a124ca1f6f79c9  include/gdb/callback.h
+b06a09b21304623717f5d965810d8d74  include/gdb/ChangeLog
+88890aba9ba9a379347fc0f13ad20e87  include/gdb/fileio.h
+762106ad7714870a3ddaf6dd0dab581d  include/gdb/remote-sim.h
+1a0caaf47b41137becfee497016350db  include/gdb/signals.def
+7ff71ed6a6d28fa5e33ed9fb65fea692  include/gdb/signals.h
+a66d1966247983edead93b50886aa02f  include/gdb/sim-arm.h
+3dbba30001272224cfba8454d542deb6  include/gdb/sim-bfin.h
+2648dd616f0b5fa37b24d72c54986c6c  include/gdb/sim-cr16.h
+6568bb778a0a88e4d6cff2360d383eca  include/gdb/sim-d10v.h
+0a293f5480904f2f5a50fc03b8bd440e  include/gdb/sim-frv.h
+e2c61423df92fac36a88dbdcb259bec3  include/gdb/sim-h8300.h
+657d71193f5feb019a2d4a45e60581da  include/gdb/sim-lm32.h
+def9cb2b62622a79033963dad3747b0c  include/gdb/sim-m32c.h
+ee09f0399e70412f1ea7e35060c572e4  include/gdb/sim-ppc.h
+b5f795033999cf7d38f696d21da22c63  include/gdb/sim-rx.h
+3e4ad006c2a0987f4bb3aa22bc71ff8b  include/gdb/sim-sh.h
+c6c79c7650e939987e61782932471d6f  include/gdbm.h
+2df953364d736c4cc07d3f3b0ff63714  include/getopt.h
+b14b5907a8d21fe886487feead7161c8  include/hashtab.h
+27e2b82efdf39b6ec9889dcc03468d28  include/hp-symtab.h
+97a8767b7f95bd5bb7207d0215541d10  include/ieee.h
+05580593c4144ecc727aec0ba59701b0  include/libiberty.h
+741cac90249849bb61230ecd5fb777de  include/lto-symtab.h
+3835b04e73ad824ae9a82745d6a9a310  include/mach-o/ChangeLog
+e47902a1febdb36ba352b012fac028b4  include/mach-o/external.h
+bc5266173f3a7c58944d74ccd77ab9c1  include/mach-o/loader.h
+a3be11cb068f8f33831c6f1233d92056  include/mach-o/reloc.h
+246ec9592b8643e0436200783361dda0  include/mach-o/x86-64.h
+d618facc3e8ce8bf3d02ba452e1be6ab  include/MAINTAINERS
+e994d64a5f8fff3c81791b6d8a1d09b7  include/md5.h
+8987130f1c1fc6547fc26cc7dbafe0aa  include/nlm/alpha-ext.h
+b3429a1bc8a629a099df6e98ab939602  include/nlm/ChangeLog
+daee4cce32528154a2b851cf0d306c8f  include/nlm/common.h
+c5c9d05c1d16379fb9f96c8ec954c5c9  include/nlm/external.h
+978d7523b06b3abf40b17dfc4f5ce74e  include/nlm/i386-ext.h
+09f97c76b2c744131a200bdc7fa33c35  include/nlm/internal.h
+ba3e2410c85ea661024a7d27360afb80  include/nlm/ppc-ext.h
+555d624236f77f04e2063d455fdd3c97  include/nlm/sparc32-ext.h
+9086b04095940294729fa4cb1525a519  include/oasys.h
+44b3dbe9efa457af0cf4f032193dd1f5  include/objalloc.h
+55eaec63943895d6e0b02bfdf96108cf  include/obstack.h
+deaf0df0e2d6c5a7bf0ee9caba4305b1  include/opcode/alpha.h
+cee84b6ac4bf5ac5b70f37c43a47f8ec  include/opcode/arc.h
+7394461a9415dc18f047497f1cf3ea2b  include/opcode/arm.h
+a0c8eec19b02cdfe7360b3a4a8677ea2  include/opcode/avr.h
+3f33fd3299b17a72ced502e07febd074  include/opcode/bfin.h
+15a2fb48bf2c3ad804768e1e0d592960  include/opcode/cgen.h
+8fede7d5fa6ded6ce0c1b72fe8204f63  include/opcode/ChangeLog
+422ec9ceff6284c1c213760d8d847ace  include/opcode/ChangeLog-9103
+fa4047908e1aff4811fe77680065510e  include/opcode/convex.h
+a02c23db91d70feb3bbcfd667aa8dc73  include/opcode/cr16.h
+48bf08b1c7e518e2051141f5e241c998  include/opcode/cris.h
+e1e2463dfebecacab2cd54043b6ad31d  include/opcode/crx.h
+7a4987744ef7a7f4078c5a8c576336b7  include/opcode/d10v.h
+2aab9f5c7ac5de630a5ab61dffee686b  include/opcode/d30v.h
+f84b076cad9f87a270aa56cbea14f9ba  include/opcode/dlx.h
+7f63cf5dfc5ef1fc339d6c7a6fee0056  include/opcode/h8300.h
+6b85b43c12d0761473e2d612dcd3d695  include/opcode/hppa.h
+54cbff9b5d02dc47b71ed655ef7737ff  include/opcode/i370.h
+0427f68f546cb52b130235c1f6102f09  include/opcode/i386.h
+df8f12dfd8d0b1451ed5c2046312ddf6  include/opcode/i860.h
+a56f5898179c9fc902c6c327c783bb53  include/opcode/i960.h
+482b5385aadd9b8108be5ddf3b830368  include/opcode/ia64.h
+82ceedf44931bbd1f53e43446c16d98c  include/opcode/m68hc11.h
+de8665a54a36f8c24293459b0600a29b  include/opcode/m68k.h
+a7767c170cf4c03cfe45af922a9f4712  include/opcode/m88k.h
+a4fa648b79bd0c6d04e4ad66f450c3e8  include/opcode/mips.h
+5dcba87aeb69d978d0a18f90273f64b7  include/opcode/mmix.h
+f05383f2385be4bb45c21332d96ba6fd  include/opcode/mn10200.h
+ea6d3f479e270d1b495da19cf71531a2  include/opcode/mn10300.h
+3cddcdeee0062df87a49ac336f06564e  include/opcode/moxie.h
+1ee43c765dde8f3c0b837e7539a4a8a2  include/opcode/msp430.h
+420f975d9f61718b373e729f0828ead2  include/opcode/np1.h
+f098e4fee2a748c41d6d98adbf2400eb  include/opcode/ns32k.h
+a20e9cd3cfdfd503ebc3832e99ce2d3d  include/opcode/or32.h
+24f31cdc90efabd60c1b495ee36b4645  include/opcode/pdp11.h
+59f34e20ddfb8380dd5e14669903eac4  include/opcode/pj.h
+904930a6da216d930ed050e8fda269b4  include/opcode/pn.h
+ce376e5c05e5f11002c2b2aff453f585  include/opcode/ppc.h
+7bfc43cfb0a7db8606357492e077735c  include/opcode/pyr.h
+d13912548d0ed599b86d03326e8bc298  include/opcode/rx.h
+3029b0bba5889b9f818db8e3e1d7cbdc  include/opcode/s390.h
+df0c40d81329409d82344b6d266a8de9  include/opcode/score-datadep.h
+608ebdcc4ac46872571bfbe2d970d329  include/opcode/score-inst.h
+568c45ae2814c0396720e01f4dd2573a  include/opcode/sparc.h
+4723833e3e62f9e982b99c58abb15b5d  include/opcode/spu-insns.h
+c14771870a5df1b422affd75b5d38086  include/opcode/spu.h
+c69e19287023c929ac20ee5311acfadc  include/opcode/tahoe.h
+029618d1a95331f166da6eb773a843c6  include/opcode/tic30.h
+8a9b5e28c9ab7622ebf89fc848ad12d4  include/opcode/tic4x.h
+d7e7baabb2b1b56ff3d4d69f65d10b99  include/opcode/tic54x.h
+a7e14cb11a0a5ac2e7c8d8c83c3202cb  include/opcode/tic6x-control-registers.h
+c5a881e7ef0b1a02009742c2020a9e60  include/opcode/tic6x-insn-formats.h
+26df5941f5530c412ae5e078fa2e11c1  include/opcode/tic6x-opcode-table.h
+7185a3931c3f8698b9174b081caa875f  include/opcode/tic6x.h
+908392f63074afd6f59631782b74b286  include/opcode/tic80.h
+3bb1feae07579ad29b706d73b1f9dfe7  include/opcode/tilegx.h
+6d3b86739c74f1047e9589ae4b52d9a5  include/opcode/tilepro.h
+1735b8cb5147cc087b956bf9f0025f84  include/opcode/v850.h
+b611a308a75056c2a8186199b92d8751  include/opcode/vax.h
+10cbf87ea52bafe84a696ec172e072d5  include/os9k.h
+b212dcdaf1121bd8a14b03ebb2ce5ce1  include/partition.h
+f09eca32351413c6ede8d270c2944078  include/plugin-api.h
+31582c91154fd42d85121c9b7dfa4404  include/progress.h
+f407187879a6cc40877c4b38ee717349  include/safe-ctype.h
+34b05c11cce7bd2bcc461549eb34bd09  include/sha1.h
+c2d8ea6a0bcacf3a3d5128a916291424  include/simple-object.h
+629ae8ac3ef91fc03af64dd1e2fbd58a  include/som/aout.h
+c43947b0b5de54a75109c4cee325b363  include/som/ChangeLog
+085e076342ef6bf2062ba033f466ceae  include/som/clock.h
+652226dcecf615295764cf795a829111  include/som/internal.h
+b35975811a6a1bad6e65ffcd2f5d122e  include/som/lst.h
+0cf7926687d5ac13f2db7e083d428f38  include/som/reloc.h
+ffc879400e93c3be7e8727262ff65700  include/sort.h
+a137d3d4edba8fab397dddb9f3d5ccdb  include/splay-tree.h
+4b6357d1d36b0981d1f437ab787cfa51  include/symcat.h
+3068b9fda8210770794c36af6e3b7b5b  include/vms/ChangeLog
+a99f59546afadbe9e0cbb4ab49cb870a  include/vms/dcx.h
+7055098b5e32e0622dc5b1c498523310  include/vms/dmt.h
+cb5b98595f89e309e206e03ebe3fca2a  include/vms/dsc.h
+7d8b8feabfab97743446f9c3e9c5060c  include/vms/dst.h
+c9fb0b5a672ac34a6c7e4f967c5bbaad  include/vms/eeom.h
+e4f3e837078643449d52c0826d48f3f3  include/vms/egps.h
+13b57f463b5faf0b3f7c55b948c525b5  include/vms/egsd.h
+d77a65a171afa2f593aafcbfab318d42  include/vms/egst.h
+b011050578d8e742464c9247bf280a7b  include/vms/egsy.h
+8fb6638fa6841c62014ceb7c27c9d4e7  include/vms/eiaf.h
+6e71d8901c5602633401887b010cdcfa  include/vms/eicp.h
+2d802b0d38c9165e355c45147340311c  include/vms/eidc.h
+46f2e728a1afb77bbec7f47cb668f750  include/vms/eiha.h
+16f9ceefbe1ab3c514890bfe75c572db  include/vms/eihd.h
+7cc0a6acf771711b080d46228d2e8c3d  include/vms/eihi.h
+14cff957d4170ea49ad7343a0ab1d629  include/vms/eihs.h
+925fb21d25b357ff5c4f716c9b42520e  include/vms/eihvn.h
+d0ab99fa0a52f72bdcfc0dd8b833d765  include/vms/eisd.h
+a2b404dab5a3727c454c6757ce9336d9  include/vms/emh.h
+692c1da832e19b2524efeed122cb45d0  include/vms/eobjrec.h
+8582b500db6cab6d094dcc8527ea0b54  include/vms/esdf.h
+9f00644503ffd148bf547d27ff76eb3c  include/vms/esdfm.h
+6686e0302854bbfa6bad267730bd2d4a  include/vms/esdfv.h
+e1d4167d1da2a83946c0ed659ed17b7b  include/vms/esgps.h
+886d6690946661bd6f445390cceb1dff  include/vms/esrf.h
+eb03a3ab596017df4e6a454f550d2b0d  include/vms/etir.h
+53f453335384805ad41365ad4cced40d  include/vms/internal.h
+fd11cc047dbcc31cf234ee7f8a267896  include/vms/lbr.h
+b7f74b9489772248d46d28e6406d77b0  include/vms/prt.h
+96729d6fd64637a732ffd525e5a3a514  include/vms/shl.h
+53bdfdb5cd3c0c7831611602041cda52  include/xregex.h
+0294cecbb1f66d640ccba3a5d862d05b  include/xregex2.h
+f648a66ed08e079e26a24c4346a3ba03  include/xtensa-config.h
+e3093b56a6dcb6d5b1407a44b0cbd002  include/xtensa-isa-internal.h
+919313164b5496f9ba6d24a99fc06ea8  include/xtensa-isa.h
+0afce91a3daa1fdc32ee36370c1129dd  install-sh
+29ff905e8545642c89a94848f0bb8fed  intl/aclocal.m4
+d4abe82ea322701d2385778a2fcd0804  intl/bindtextdom.c
+65b9dbdad96dc624307590d3c44cb870  intl/ChangeLog
+56f6438cd2c28d67b1bfa7e076f63acd  intl/config.h.in
+8a751062d7db9b6e8163667e5626fcb5  intl/config.intl.in
+993b4622136b4ffceda016da629a45fc  intl/configure
+13576a23b957f53b84954feaf7908d49  intl/configure.ac
+ff5c358b1507e45a2106b23b7e6c70a3  intl/dcgettext.c
+81b58accbd88cd8159471d322723c42d  intl/dcigettext.c
+0cfc94e602bc20d958f014c77ebf357c  intl/dcngettext.c
+c8501675ab40fcf8fe39364ab9de0e42  intl/dgettext.c
+45bd4be597b118d4bbbff6c9c6958e87  intl/dngettext.c
+6e671cf01cbb93dedaf7b3688062d7b8  intl/eval-plural.h
+1e4b5d6e86db4708199e0b7b61d06232  intl/explodename.c
+6f008e715086ccfb7e8e44c007fc7bc9  intl/finddomain.c
+24c6e42d8020a8759b3c8b13e0c37493  intl/gettext.c
+27f0efcc3ff8493519140cb36aeead2a  intl/gettextP.h
+c6620ffc92d5853137d3ac11300de38a  intl/gmo.h
+049ba34a0c8d1fe665e8119e579dce4c  intl/hash-string.h
+7b5af5c4e777690b9851b3e85603bcc8  intl/intl-compat.c
+9f41e951f166a5aedcc25268c161d1da  intl/l10nflist.c
+2cc2d036d8f77ec0243b3eaf942398ec  intl/libgnuintl.h
+0ad4083e3b5df1f764bb605dcf657b88  intl/loadinfo.h
+d8e3733cf513bbf862ca090cf6403edf  intl/loadmsgcat.c
+0ff7bc241f5ea36688cf8bb6ac801b5d  intl/localcharset.c
+4d8b75dcdafb699870e4133fba5b58f0  intl/localcharset.h
+bb9312cab68737125445f5932ae7140a  intl/locale.alias
+bdad874b80d29c70bb040f2ddeb67c5d  intl/localealias.c
+8179cdac0affac17e1f1ed2087b4595a  intl/localename.c
+78672e3784df9ceba75d1d004d6a1f78  intl/log.c
+cad1d6fab2274517783de7433c0faa74  intl/Makefile.in
+040acf17db43770b3eeab4337e031fc0  intl/ngettext.c
+506ef276b14575f52af7a6982d58e666  intl/osdep.c
+12ff40e8c89d99dc7b704bac9434124a  intl/plural-exp.c
+4109118983200f4aa853bf0cb466c586  intl/plural-exp.h
+0f3d1bb596252bdacce100082392dedf  intl/plural.c
+d50a8c6c5b41089930accbdce767d3c0  intl/plural.y
+6ec998bb4716c744bf8185e607f69301  intl/README
+b4758a0194e3e41362b939911472ce62  intl/relocatable.c
+bedade7bcfc3bc5eb09a2c6844f637f3  intl/relocatable.h
+43f287d082528203fc85c1d2d81bf30d  intl/textdomain.c
+76ca170a525d5b84d90f0478fe788931  intl/VERSION
+da73aad6396daa6072d443c12133ee0f  ld/.gitignore
+92d9cf05210424df1cabbde6fe85d4e9  ld/aclocal.m4
+f36fb12a33c0e28469853b14555bfe68  ld/ChangeLog
+7ca725ba584a0477922ca681df841a08  ld/ChangeLog-0001
+1844c5088cd03b9246ecf58008c41d76  ld/ChangeLog-0203
+249882f8f7dd773b47dcbbe3f2aa56cc  ld/ChangeLog-2004
+83dc7a007b7325a27e6f2d659558e999  ld/ChangeLog-2005
+d908d825fa1d2cd2d060d8ec9c7794d7  ld/ChangeLog-2006
+23f9e36aac04dff384e32f05281bd288  ld/ChangeLog-2007
+0175d1813c9ba7a591df78c204ce35b3  ld/ChangeLog-2008
+6b73307328980a2f623d982db89af0b8  ld/ChangeLog-2009
+bbf55c5a56e9ad5e17e15518aa95de92  ld/ChangeLog-2010
+8958c5b05a66e6b252f6978095132f7c  ld/ChangeLog-9197
+b73f002c7cc445237e97e9ed358922e6  ld/ChangeLog-9899
+7b3e65b02c0a165963246bc205b3ee3c  ld/config.in
+7f3de5527703e20cf2da845997c4e36a  ld/configdoc.texi
+615bf04b4db284d47c5128f82a9e32f9  ld/configure
+448f247b772b9cf7f703d44d2818cd15  ld/configure.host
+95d5c2b300b625d3f338e9c0910e1adc  ld/configure.in
+4fc0e6539a5f9507c4b552c086690c52  ld/configure.tgt
+b116956a62582d5a8ef1e1737d173eda  ld/deffile.h
+6a22d6c744c42d279da5b22a36f82cf7  ld/deffilep.c
+b9ca5771abd362fd290e3cebfd920693  ld/deffilep.h
+c055ff7b56d40b00a335738f9b7f0cef  ld/deffilep.y
+8d416c7b17011478442ba22d85f20c89  ld/dep-in.sed
+5161fad0ffdf3b72b12a39147e1300ee  ld/elf-hints-local.h
+2c75cfcc19fb0ff973bddcbe5b567803  ld/emulparams/aix5ppc.sh
+afb6d2ea1df283801db141ab81692a24  ld/emulparams/aix5rs6.sh
+169b54f770bbc257d39ea459f48f2b00  ld/emulparams/aixppc.sh
+ebbb1119f11559e515e510c9587c780a  ld/emulparams/aixrs6.sh
+29fda341c48f8b90fbf258b6d475867e  ld/emulparams/alpha.sh
+afd41d5b0484fb3c045bfd81ce15307a  ld/emulparams/alphavms.sh
+33a22a81f481989316591b168206ae74  ld/emulparams/arcelf.sh
+e6e4692ccff9621ebe97fb3896227b05  ld/emulparams/arm_epoc_pe.sh
+dbe3a08e6123cf6d11f5eedae27a31db  ld/emulparams/arm_wince_pe.sh
+46cdfce2fec96767f9833e7b95dff674  ld/emulparams/armaoutb.sh
+db71752ff717b79212036e0ab57043eb  ld/emulparams/armaoutl.sh
+d7a431dc9e8878378179623ccf9bfb47  ld/emulparams/armcoff.sh
+52a90d4b2874ec239d6f5efc7ac6a5ac  ld/emulparams/armelf.sh
+85031385ab0663ce2a9113945a9e1185  ld/emulparams/armelf_fbsd.sh
+54f5793d97990666c0f63ae1e47d9f16  ld/emulparams/armelf_linux.sh
+9a8401cd572759b89d491cd7575fcaf5  ld/emulparams/armelf_linux_eabi.sh
+a83364fa7d65bd11812312c8d92ca64f  ld/emulparams/armelf_nbsd.sh
+704ee604923d8f958cd72b8f9349a629  ld/emulparams/armelf_vxworks.sh
+2b5ea6fb0c548fe7f0a3903f843eef0a  ld/emulparams/armelfb.sh
+908d061ee41ccefcae22c23644d0bcf1  ld/emulparams/armelfb_linux.sh
+de800cd350aed911b0515f2d8c6676ba  ld/emulparams/armelfb_linux_eabi.sh
+31ef6d790e43f46c99d521132f670b0e  ld/emulparams/armelfb_nbsd.sh
+a291ae3e8e735c25c2d4e86c55844730  ld/emulparams/armnbsd.sh
+e9e8e61e01fdc6a50835c277658eb02e  ld/emulparams/armnto.sh
+5988d9ce7e8e4e5f20dc86deb1a8d5c0  ld/emulparams/armpe.sh
+c6ddf82dd7dd437d00502069197dd871  ld/emulparams/armsymbian.sh
+839084c3678686dacecfcfeffe2f479c  ld/emulparams/avr1.sh
+c74004fd5fdf15a2acac505446b5c4be  ld/emulparams/avr2.sh
+1356869a833a254e4ed4489493417b1b  ld/emulparams/avr25.sh
+06305da975da19253161abf7e7ecff06  ld/emulparams/avr3.sh
+9947a5ecd1a931f1f54f424ebb681b39  ld/emulparams/avr31.sh
+6d7abb647d96bfb0659e4e26e80b6dc3  ld/emulparams/avr35.sh
+4e9564b0d40e69defa34a84e1caaae57  ld/emulparams/avr4.sh
+0a4f5fa88510cc67fde1e1ec512f5e9c  ld/emulparams/avr5.sh
+4233da9ae9d1af991d81dc610e34a787  ld/emulparams/avr51.sh
+b6c40b35e6a63b17ac7a46ebe7de143a  ld/emulparams/avr6.sh
+d0931fa9ab67d0f48df11ffbda9c4854  ld/emulparams/avrxmega1.sh
+27e3af2c4491628ac2b4b4a4ac72d539  ld/emulparams/avrxmega2.sh
+a4fd8920de8b91fdcb3468005224a1b0  ld/emulparams/avrxmega3.sh
+6cedeab34a47c82db7252f5294b4ca17  ld/emulparams/avrxmega4.sh
+101fc9d40672370f2807279d085743ce  ld/emulparams/avrxmega5.sh
+d347e9fababef7f46786ac43a6289e64  ld/emulparams/avrxmega6.sh
+754e0415f37a441e2fa6ac510f31b885  ld/emulparams/avrxmega7.sh
+74a02cad5e562cbcc31626c09dbd3108  ld/emulparams/bfin.sh
+14c25a651ee75f6ff6e2c101836342fb  ld/emulparams/coff_i860.sh
+7db190f5aef5799d9eb885e714b1ca3a  ld/emulparams/coff_sparc.sh
+a28dfb57b8e1c89a1020ad7105f0cae1  ld/emulparams/crisaout.sh
+b647b233dae359c31f0ae40c4884fe52  ld/emulparams/criself.sh
+bacb8de12b3d71d0f165c95eade69a97  ld/emulparams/crislinux.sh
+0a5a4e98354a68189a2fd28cad8a232e  ld/emulparams/d10velf.sh
+f03004d323541a267e123681bd285621  ld/emulparams/d30v_e.sh
+0cc51d61ed4bc75ebd7222fd67bbf6da  ld/emulparams/d30v_o.sh
+038ce1ccec333e2db731a4ef0773525a  ld/emulparams/d30velf.sh
+162d7cba8938432d260e1e9321bf43ce  ld/emulparams/delta68.sh
+281ede04930040c8b5cdaaf27fc387c8  ld/emulparams/elf32_dlx.sh
+93e6170e112854a25f6d0a7348325ccd  ld/emulparams/elf32_i860.sh
+6ca6c1e45e29690877676e1cfce40f6c  ld/emulparams/elf32_i960.sh
+14d93f840884457614e1b01da72425c6  ld/emulparams/elf32_sparc.sh
+41c681403d8bd4b3dc8c258f83d115c8  ld/emulparams/elf32_sparc_sol2.sh
+b4bb140a4f6f1e022fcf40cb7421607a  ld/emulparams/elf32_sparc_vxworks.sh
+c0c3b7d8380176026e4095e8d0f0653c  ld/emulparams/elf32_spu.sh
+9fc991f39d21a2723758fac65a848fc7  ld/emulparams/elf32_tic6x_be.sh
+d0195b47edce309c3c06dead70f09855  ld/emulparams/elf32_tic6x_elf_be.sh
+5c2936c518f586b301b336c4e8fc5e96  ld/emulparams/elf32_tic6x_elf_le.sh
+5a274fc1e18a69b0670c8f922ce96333  ld/emulparams/elf32_tic6x_le.sh
+e134c77e1df463b8a776c2d656739603  ld/emulparams/elf32_tic6x_linux_be.sh
+90f3aa62a249159ed5b2d73957fc7209  ld/emulparams/elf32_tic6x_linux_le.sh
+05aa4a49e9631ac91399e07043c57747  ld/emulparams/elf32_x86_64.sh
+19fcb6f5bc2579ed99ee62162f7be002  ld/emulparams/elf32am33lin.sh
+a19f32e62df659289a168c3b8bf91a26  ld/emulparams/elf32b4300.sh
+f6767450cf9114d5f988594a59a0f315  ld/emulparams/elf32bfinfd.sh
+82c6911967f15d544655a3b397e83ed2  ld/emulparams/elf32bmip.sh
+9f509fd2413f065cdc1ddd40c4bcf870  ld/emulparams/elf32bmipn32-defs.sh
+1d35ec6cf83a2f822b3b324cf61e7544  ld/emulparams/elf32bmipn32.sh
+3f6bfa22dd4022cbc1b663f666405094  ld/emulparams/elf32bsmip.sh
+7bf0051b2c15332bed387e0a7ede2ac4  ld/emulparams/elf32btsmip.sh
+30d00579fda108701694e15ad202df85  ld/emulparams/elf32btsmip_fbsd.sh
+9d25d42b83902e4b3c270b0076e00ab9  ld/emulparams/elf32btsmipn32.sh
+085872893d41d25ac76a47801e321737  ld/emulparams/elf32btsmipn32_fbsd.sh
+8e67420dbe22309e4b8920b42bc25432  ld/emulparams/elf32cr16.sh
+ec222a2a5a57e2a67110a4a98903dc52  ld/emulparams/elf32cr16c.sh
+fd0c54397da835fb1e4a9c1389ee368e  ld/emulparams/elf32crx.sh
+030179c4b8058c64aac3f9eb16c049a2  ld/emulparams/elf32ebmip.sh
+3194fd357ff2d0fffd4eee6c41623782  ld/emulparams/elf32ebmipvxworks.sh
+add91307fb4132685623c0895d6c9cca  ld/emulparams/elf32elmip.sh
+3c7a2a63628dd038dc17fde980df3f42  ld/emulparams/elf32elmipvxworks.sh
+a2b5068c613c7030fe332e96decdd114  ld/emulparams/elf32fr30.sh
+395e9319d9a7240b466fa7c40eaaf29b  ld/emulparams/elf32frv.sh
+c2e687126a2d9e6ee13cab2b6126a89c  ld/emulparams/elf32frvfd.sh
+2db7ce792a3d945d2cedf73fc3a5a0d8  ld/emulparams/elf32i370.sh
+d7c61952d5f3ffbe6b9b6c3eaa30a52a  ld/emulparams/elf32ip2k.sh
+7d512f0f06ad5a37f6752d575a9f3aa1  ld/emulparams/elf32iq10.sh
+a3d9317241b1de1ee98a1ef1db0fd484  ld/emulparams/elf32iq2000.sh
+ecd586db2a0021421401571e654fea1f  ld/emulparams/elf32l4300.sh
+4d4025c885ffbed823c0ccb7e9af4ab3  ld/emulparams/elf32lm32.sh
+93bb669752491e62440a2bf79ee28c1f  ld/emulparams/elf32lm32fd.sh
+61e10da892c21325ede0f1bee9358ad0  ld/emulparams/elf32lmip.sh
+6be422cbcb87234b6276db46559955e6  ld/emulparams/elf32lppc.sh
+7ef8f635c484537cc3265c9f9a254575  ld/emulparams/elf32lppcnto.sh
+0f1aa1d48d4fd1423bd74e566a9c774d  ld/emulparams/elf32lppcsim.sh
+39123a7e34db239ef585e08f2ada9159  ld/emulparams/elf32lsmip.sh
+c85d16c23057685613ac3c770175421e  ld/emulparams/elf32ltsmip.sh
+c2640a7d40d90413ddf7120400b7323d  ld/emulparams/elf32ltsmip_fbsd.sh
+6524015c1e2e591fa0bb19f87f93151a  ld/emulparams/elf32ltsmipn32.sh
+86016fb4e97f6dad75c7d282b3d83157  ld/emulparams/elf32ltsmipn32_fbsd.sh
+e4e39855d3ec1ad061c91ec9bf481016  ld/emulparams/elf32m32c.sh
+b308a0ea260bd6c2df2158f0981520bd  ld/emulparams/elf32mb_linux.sh
+bd60bab0227b259fa0ef82986655cbd1  ld/emulparams/elf32mcore.sh
+b8edc45b52edec8507574609822d9245  ld/emulparams/elf32mep.sh
+1ea7a1c2c097d50dc05cefd47d51a630  ld/emulparams/elf32microblaze.sh
+1f512f809ac3a1ed6a7a3d8821047e83  ld/emulparams/elf32mipswindiss.sh
+a02b2f0bb1fe8e2040c70b3ace22f434  ld/emulparams/elf32moxie.sh
+2cd4f7e87711443ac0b3c0895804ef74  ld/emulparams/elf32mt.sh
+6537ae56ab1c8dbd3a13d6e77f4f2835  ld/emulparams/elf32openrisc.sh
+2b65c14e03c9354106a84acac55855a9  ld/emulparams/elf32ppc.sh
+e670625a198b1d6ef4813cc1131ef31b  ld/emulparams/elf32ppc_fbsd.sh
+38bf9e30856b996dff2e9f7ef135a0b3  ld/emulparams/elf32ppccommon.sh
+e96923ed2cfd947005b4f2e01656094e  ld/emulparams/elf32ppclinux.sh
+afe686ca1924108e64de174304e8ed13  ld/emulparams/elf32ppcnto.sh
+e6dc727c9b2f7c7a71c6076d46912861  ld/emulparams/elf32ppcsim.sh
+ff63cb22df9592464516a4fb36e511a6  ld/emulparams/elf32ppcvxworks.sh
+b2d4bd5d0c711e6b9372053f85303ad7  ld/emulparams/elf32ppcwindiss.sh
+cff0ae9d8fb3bf6ad12b075ce79f7414  ld/emulparams/elf32rx.sh
+7fdee88dfb8da06c4bd21c131f7c759b  ld/emulparams/elf32tilegx.sh
+d6be6f81c5f218c06cbe1f428c47e6d1  ld/emulparams/elf32tilepro.sh
+86e5165609b36a444c0e3969b4495d8d  ld/emulparams/elf32vax.sh
+485af2face9b02bf0fa49843691af836  ld/emulparams/elf32xc16x.sh
+57c65a0982bea3c70f8796e567990b6e  ld/emulparams/elf32xc16xl.sh
+ee26e3e7d51c35186d4177393fe7dbda  ld/emulparams/elf32xc16xs.sh
+4c1ee8cfc760d7253ebc5d80dc3650ef  ld/emulparams/elf32xstormy16.sh
+e59def63f76fe88b1c463cd095639ef9  ld/emulparams/elf32xtensa.sh
+4bbff852e871cbef260a9b6b36fc424d  ld/emulparams/elf64_aix.sh
+88a7fec714dc3c29ff9ab3602fff1873  ld/emulparams/elf64_ia64.sh
+a04b0f94c285057c4328da812b709ef5  ld/emulparams/elf64_ia64_fbsd.sh
+10dc541828463de1538cecccddecfcaa  ld/emulparams/elf64_s390.sh
+bcaf1c0bb6008669b5e0b7a03ee83047  ld/emulparams/elf64_sparc.sh
+d2fba26c990c98b231a5d2d73d489965  ld/emulparams/elf64_sparc_fbsd.sh
+19ae478b4af6b7673eb0d5a6526e2db6  ld/emulparams/elf64_sparc_sol2.sh
+451a3b8e55d6665546582cf10855b48a  ld/emulparams/elf64alpha.sh
+05b020ea8c063d832c43502bbf25a583  ld/emulparams/elf64alpha_fbsd.sh
+5ba3708f410eee98bd62896166a9f542  ld/emulparams/elf64alpha_nbsd.sh
+1b96840cab57c0e99d5cdaa3d33805c5  ld/emulparams/elf64bmip-defs.sh
+227184294d26af42ab50d948642ebd5c  ld/emulparams/elf64bmip.sh
+45c8a91846eee7402bfb681984c0ebd6  ld/emulparams/elf64btsmip.sh
+119a650d6fe2c70509b59a4d88b18abf  ld/emulparams/elf64btsmip_fbsd.sh
+03a3e4cc59750603e7edf00024b28531  ld/emulparams/elf64hppa.sh
+d969989e47badd85ab444fefa84656eb  ld/emulparams/elf64lppc.sh
+5b2cfd0917902083166727b03fbd07c2  ld/emulparams/elf64ltsmip.sh
+072aac14506526ff6444c9d7eb6efe0f  ld/emulparams/elf64ltsmip_fbsd.sh
+5b79366aa223913e714e04f4303594fc  ld/emulparams/elf64mmix.sh
+7eede8d71c27b69ae9aa14766b377926  ld/emulparams/elf64ppc.sh
+879ef6b88a4346fa857bff264b2794e4  ld/emulparams/elf64tilegx.sh
+261c3ee23f1baba72638358c8121b622  ld/emulparams/elf_fbsd.sh
+f8a2111f9f189b492c833ead98a79e6d  ld/emulparams/elf_i386.sh
+9d2ba4f316494a2bc26e467db70950f4  ld/emulparams/elf_i386_be.sh
+51f54951cbef8732065f16b6e250a0b6  ld/emulparams/elf_i386_chaos.sh
+df1ac3a0c604e72b025d24417ca1444a  ld/emulparams/elf_i386_fbsd.sh
+0151824d82deaf4aeffa7b5f78bf1b60  ld/emulparams/elf_i386_ldso.sh
+22bc954c7382ad8ac04ce89b96ddcfc8  ld/emulparams/elf_i386_sol2.sh
+a284d97c3b89ab4c69706f18caa3efec  ld/emulparams/elf_i386_vxworks.sh
+6f21c5e81a6a2e1ef8c31ec8230d1435  ld/emulparams/elf_k1om.sh
+70088dbfe7e6ea410bde8360f3b791c4  ld/emulparams/elf_k1om_fbsd.sh
+82eaa27d44e440f931bce0dd5c61b97c  ld/emulparams/elf_l1om.sh
+136375a3d9165c866bf7074b12f2e24d  ld/emulparams/elf_l1om_fbsd.sh
+9565483cf23ab9768056de0d3e35a9de  ld/emulparams/elf_s390.sh
+7e289cfa68c6cfd257f54e9f019fb08f  ld/emulparams/elf_x86_64.sh
+da938f85dc50f8f17dee922772db163b  ld/emulparams/elf_x86_64_fbsd.sh
+df7d3c451969de5d9633859f4f185db9  ld/emulparams/elf_x86_64_sol2.sh
+f32127527a05a962f2608260b6989d2a  ld/emulparams/gld960.sh
+9e9a98ed6d60b81d3c02fcaff209e48e  ld/emulparams/gld960coff.sh
+87e6b58221679e6f984210beed2b30ea  ld/emulparams/h8300.sh
+9b599accad5c3e7fdefeda498bd7fbb4  ld/emulparams/h8300elf.sh
+38e60b173489d53692974c5b6a04cfb9  ld/emulparams/h8300h.sh
+a6bc102b9076b326ed7f5d455a28ac90  ld/emulparams/h8300helf.sh
+6ddecfbf7937f059d93259f716d61d6d  ld/emulparams/h8300hn.sh
+4a7f2b46d388252aabee2d2c52f6dfb8  ld/emulparams/h8300hnelf.sh
+f9d708a8c553ed19183a1f638fe633b4  ld/emulparams/h8300s.sh
+7034b51cf218f8977ba97e1131ac50cb  ld/emulparams/h8300self.sh
+12989f4121fea14e6fc290662753febe  ld/emulparams/h8300sn.sh
+29871377f4c035e1e74d454a3e62272f  ld/emulparams/h8300snelf.sh
+7ff8cec0e8d6c8ff1e1c87372ebdbdb7  ld/emulparams/h8300sx.sh
+511bcbd2d3fe01774624774b25cdadeb  ld/emulparams/h8300sxelf.sh
+15655df939874c463eff61983c973c90  ld/emulparams/h8300sxn.sh
+b870624012b66c296b1928232395b5f9  ld/emulparams/h8300sxnelf.sh
+b3b0d0be943fd5517fbc171778f63de0  ld/emulparams/h8500.sh
+6dabd6ffde56b2445c38969243d3575e  ld/emulparams/h8500b.sh
+6d71814235108ce0faa35813c1959495  ld/emulparams/h8500c.sh
+e8b9174ddad38feceda59af2dbec0d09  ld/emulparams/h8500m.sh
+f0a112f331b4c6bfbfbb1895cdd63eff  ld/emulparams/h8500s.sh
+54b7e862187330b80b6314b2c1c1b05e  ld/emulparams/hp300bsd.sh
+4bbb1b67f14d1e124683aecbd19e69cf  ld/emulparams/hp3hpux.sh
+3f03d94dd5a21e066de9e24fbd565113  ld/emulparams/hppa64linux.sh
+7af6e1ad74bc71f864b9c04412f1bebc  ld/emulparams/hppaelf.sh
+361bce4513491c8a3189d414f3279f67  ld/emulparams/hppalinux.sh
+191811b4e0d736f8cea0156126b8a8cd  ld/emulparams/hppanbsd.sh
+077c0ed6da091c491ec9e7046cd626dd  ld/emulparams/hppaobsd.sh
+ce79eacf5f726c9c068a8f7265617861  ld/emulparams/i386aout.sh
+5ed1f528a6752f2ed12d48977cc43da1  ld/emulparams/i386beos.sh
+1ae0b0429ea988f07f3030f9b32daefc  ld/emulparams/i386bsd.sh
+d05a50688386622b8ad4e4c1f2286662  ld/emulparams/i386coff.sh
+17f4c71862e163f04d7d090d954dbe33  ld/emulparams/i386go32.sh
+1feb75a206e03a8f90f86ae7a8116344  ld/emulparams/i386linux.sh
+677f9fe5ab33ec64ad5700337fa418ef  ld/emulparams/i386lynx.sh
+7ccc33d344e06889c1a5ce446dc4f32a  ld/emulparams/i386mach.sh
+8ec60ace7f9279b8b584e59bd6583fbd  ld/emulparams/i386moss.sh
+2bfeb760ea387887b4d7cdb735a8e8c2  ld/emulparams/i386msdos.sh
+fd44b883579ad95580bf3cae88bd91b4  ld/emulparams/i386nbsd.sh
+db82cac7b140e1aa2bc1383d9bf58477  ld/emulparams/i386nto.sh
+7735ddb4fefb33a6fa7a1799d7aedae7  ld/emulparams/i386nw.sh
+c15181d7923108bc59c1898d2fa2a436  ld/emulparams/i386pe.sh
+8621077c937c52c0d192b76b507ad83a  ld/emulparams/i386pe_posix.sh
+a670046af207e1887d4baf88075531f0  ld/emulparams/i386pep.sh
+8c809011235ff8bd5e0a1d9ba085ee46  ld/emulparams/lnk960.sh
+6435fc04027f0caf3844f0d3d6e88fe3  ld/emulparams/m32relf.sh
+beb5ec2ad3d2ca98aef07d55d5c479ef  ld/emulparams/m32relf_linux.sh
+4caea040768fd3f34eb29f616a64f6d1  ld/emulparams/m32rlelf.sh
+ef322baa3cadee776415875de38be1a8  ld/emulparams/m32rlelf_linux.sh
+049218c3ff85b972beee9ab88e1b9fd9  ld/emulparams/m68hc11elf.sh
+cabb1e9932de933a5d006b14e50f41c3  ld/emulparams/m68hc11elfb.sh
+99f9a9c7dbc4e5d16cd7c346de7c8daa  ld/emulparams/m68hc12elf.sh
+e6b6fc6ccd03411b402f3a6072588bad  ld/emulparams/m68hc12elfb.sh
+7f51d23517a73cea7b0c13fea29d9030  ld/emulparams/m68k4knbsd.sh
+3d2234e0fc82b67e234d790ae94dbaac  ld/emulparams/m68kaout.sh
+00b17c39c4dcf1058751dc07f30dbea3  ld/emulparams/m68kaux.sh
+f0580d8a518bcc77032874c9cb72809d  ld/emulparams/m68kcoff.sh
+e5482539582a4e8b00f28dfca6676587  ld/emulparams/m68kelf.sh
+d5ca0a9aeac878263aa6caf077fa1826  ld/emulparams/m68kelfnbsd.sh
+0f785269424f5deab4437f29fc3fb1c2  ld/emulparams/m68klinux.sh
+1715e52513257034b76793cee27559ec  ld/emulparams/m68knbsd.sh
+33685d637a1cce6d622232b066197510  ld/emulparams/m68kpsos.sh
+83963319b0e9d1a26022d42c1ded3dfd  ld/emulparams/m88kbcs.sh
+9445dc4bcff8b854185fa5215b74f9b9  ld/emulparams/mcorepe.sh
+6c5efc2d80801d3ab24a03f11d108e39  ld/emulparams/mipsbig.sh
+8589776726fb0a88568b9dbda5660c35  ld/emulparams/mipsbsd.sh
+18c4e0d8ca8ec6e02035b574cb8b9844  ld/emulparams/mipsidt.sh
+c320c6fc627c281bc28fcfc7a9bcad5b  ld/emulparams/mipsidtl.sh
+60661603c73c5ec9883d1f65e561e2d6  ld/emulparams/mipslit.sh
+8cb42fe6977ca6c642cb7b96a9b0fda0  ld/emulparams/mipslnews.sh
+9faffafc9a8c3244ba97da25c5082a56  ld/emulparams/mipspe.sh
+4ae7b44c630b4c5f2ab982d81f1df8f6  ld/emulparams/mmo.sh
+145049c7f07b5f03972e986b1d119603  ld/emulparams/mn10200.sh
+6305ae286ec175ee2d4c96f85a1371c9  ld/emulparams/mn10300.sh
+9519af2786e0d04b5608f84239418fac  ld/emulparams/msp430all.sh
+49337298ecef7c4e2569237b614c9675  ld/emulparams/news.sh
+91f9caf89990024398fd3c30d545f77c  ld/emulparams/ns32knbsd.sh
+7d4c113f2900a29c3d25a4ba5e00d8f0  ld/emulparams/or32.sh
+dfc530c215e98898cf75c555e374a3ab  ld/emulparams/or32elf.sh
+520ec8503cf2ff801a48395e338729aa  ld/emulparams/pc532macha.sh
+456a880b2bf36d968e2f2af383cc1abf  ld/emulparams/pdp11.sh
+aaf0d6c989a8e24b28f8106c195874f1  ld/emulparams/pjelf.sh
+dcb56a623dfddf98dddac81206fabbf1  ld/emulparams/pjlelf.sh
+6f8d170c60825e65e555b527324c82bc  ld/emulparams/plt_unwind.sh
+f8fe27e4766e815b076ccedba3821ee6  ld/emulparams/ppclynx.sh
+120c2ee7cc0cea78311c4d9e980e939a  ld/emulparams/ppcmacos.sh
+52f9da7df47411bc7ee5dd90a1883114  ld/emulparams/ppcnw.sh
+59c040c18e2b3a9fc6fb06d435d05bdd  ld/emulparams/ppcpe.sh
+2e897117043ad88f2c7bcf35a606d76b  ld/emulparams/README
+ff7570d6bf2e39ba10e74a394052028b  ld/emulparams/riscix.sh
+f0faf13830257f4689cae383838580d7  ld/emulparams/scoreelf.sh
+908fd348c9d3fd9c12647643d88b31c3  ld/emulparams/sh.sh
+55e7361b8eca765040b9c62d173fefa7  ld/emulparams/shelf.sh
+5bcbbb59a566bd8395d41bd8323e3a61  ld/emulparams/shelf32.sh
+291331616850dd83790ab2c24f992c2c  ld/emulparams/shelf32_linux.sh
+622331d976e1c07c7d48e5c6ac03c2f1  ld/emulparams/shelf32_nbsd.sh
+32518a86aec278581dbb4174838aef74  ld/emulparams/shelf64.sh
+d31180db1f9253b62c3d9e1c121366cf  ld/emulparams/shelf64_nbsd.sh
+145e7853413a3ef62c62a5b58414f422  ld/emulparams/shelf_fd.sh
+4b61937c3bfb4a5470c72eeb0bfd224b  ld/emulparams/shelf_linux.sh
+39e939a626d83705198fc70fe5ecad12  ld/emulparams/shelf_nbsd.sh
+1bbc2f89e23821f9cc79898ab5586cb9  ld/emulparams/shelf_nto.sh
+7e5793bdfb27513e159f608cea15c050  ld/emulparams/shelf_uclinux.sh
+bb746254c72382f1234d821ad5580a9f  ld/emulparams/shelf_vxworks.sh
+c7ccb5f7fe5f62d92dca7e1a71b02aff  ld/emulparams/shl.sh
+a8e5e931e19cca314ba30a312884c2d5  ld/emulparams/shlelf.sh
+147ddbb0207d4b730f3ff45851cc3022  ld/emulparams/shlelf32.sh
+50e34d968b4ce95745e97ca5e24ee2c9  ld/emulparams/shlelf32_linux.sh
+414d3af83e84f7afd6dcc3afa2184fa7  ld/emulparams/shlelf32_nbsd.sh
+90c225b85052cd8cdf4ab8871bda1b20  ld/emulparams/shlelf64.sh
+2169ae2a71b4a6875eaa305168d042d1  ld/emulparams/shlelf64_nbsd.sh
+8cb196945623a9ffdbb37ac046644c09  ld/emulparams/shlelf_fd.sh
+ff9adc94a91c76bb6d8a113595061171  ld/emulparams/shlelf_linux.sh
+744f886f4baf1d4fe15ce1d0595dfc84  ld/emulparams/shlelf_nbsd.sh
+9b599e50c1edc57824ecfa5b37a55839  ld/emulparams/shlelf_nto.sh
+162898060928e895f8ab2a3452cab99c  ld/emulparams/shlelf_vxworks.sh
+2b7af20012f444e77e36fe2340b966b2  ld/emulparams/shlsymbian.sh
+0e5bf12ecd3b1de4e0690b57870afb1a  ld/emulparams/shpe.sh
+9df098ef8ecb368874c44df7fb248538  ld/emulparams/solaris2.sh
+34bc316904c6401355d6970a04f2574d  ld/emulparams/sparcaout.sh
+a42336688d6d1fa719478caa5efc6e2d  ld/emulparams/sparclinux.sh
+957bd3e925d255ac965dde1aa7303f40  ld/emulparams/sparcnbsd.sh
+8f86834d923d64e45861594e4dc8c457  ld/emulparams/st2000.sh
+34fa41ca09712e70f3719053d3d82ab2  ld/emulparams/sun3.sh
+b8f001f8578debcd12f5b61634f002ec  ld/emulparams/sun4.sh
+5d10f221cc393b1ae1719132de13f3da  ld/emulparams/tic30aout.sh
+4fc903e37671053625509f7486c63816  ld/emulparams/tic30coff.sh
+62d8066c77800eafa442197f8f07cade  ld/emulparams/tic3xcoff.sh
+7bb0ad11ce41e9dfc28e690468c0770d  ld/emulparams/tic3xcoff_onchip.sh
+e2ba12f737f075c7e880925f10dc19ec  ld/emulparams/tic4xcoff.sh
+aead097a3385a27cba7210470e150a10  ld/emulparams/tic54xcoff.sh
+91cc82ae46f2254281e38817caa9f141  ld/emulparams/tic80coff.sh
+420ddfcb9cd84cd0898880dd72280f8e  ld/emulparams/v850.sh
+829acdbee172341c4342095d82e19511  ld/emulparams/vanilla.sh
+4e93bfd2da37b36233e047a4bf15854e  ld/emulparams/vax.sh
+7daece209bea326cdc906d0640ea017e  ld/emulparams/vaxnbsd.sh
+ba6f9f82315ce20a64ec93bf3c2bee0d  ld/emulparams/vsta.sh
+ff0ee3ea192be9116c08ca656cdc1337  ld/emulparams/vxworks.sh
+7efc4f8c9d1eca2e14084bcd65535b9a  ld/emulparams/w65.sh
+88233c4b283975ba080bbb9738aa0a23  ld/emulparams/z80.sh
+cd93ec9e7e74cadfaf8044cca1581111  ld/emulparams/z8001.sh
+8890ef4fad0e25044c8d3200a9e77ee7  ld/emulparams/z8002.sh
+85712545e9dbaf7ed269122bbb77c375  ld/emultempl/aix.em
+a9d1ff6c62567cfe7f30bf671cd68a6b  ld/emultempl/alphaelf.em
+605d6b9f4f0bdeb87945a943d27b0a18  ld/emultempl/armcoff.em
+f14927baf7693df53ddfdf25b3c64398  ld/emultempl/armelf.em
+995bbfc228460e4eef6eef52a09384a9  ld/emultempl/astring.sed
+b195c43933289b93e4d4ba8055964c81  ld/emultempl/avrelf.em
+4aff627620fbde4c8db9445bd04f0cc6  ld/emultempl/beos.em
+902891733be879da00dd41609bb3f2b4  ld/emultempl/bfin.em
+8c3a0d70721c730524a506a441c45155  ld/emultempl/cr16elf.em
+ce7d0f0b14a3b63a2cb10afc74da0999  ld/emultempl/crxelf.em
+8c679290e5df491294d8a4ec33c62b0a  ld/emultempl/elf-generic.em
+6824ba103343f743721a20623c751881  ld/emultempl/elf32.em
+f161d20c137eedc9ebd1c716caff30a9  ld/emultempl/genelf.em
+8b1bb9cf0fdceee86785eb3f506855e8  ld/emultempl/generic.em
+38e9f8cb1a488c36bdf32df4caca8ec5  ld/emultempl/gld960.em
+18878e88fadd0c0124973091bd92e77a  ld/emultempl/gld960c.em
+8fbc592f1b86f19c7341f566d9d11a56  ld/emultempl/hppaelf.em
+b567d5e4180bdf03e99d43beae69af51  ld/emultempl/ia64elf.em
+2ddf12b7a7e85f5260b019279bb00043  ld/emultempl/irix.em
+3a368fe9b04f91683dfa77c3e97debe7  ld/emultempl/linux.em
+558fc9279afea8366e8660167b813b72  ld/emultempl/lnk960.em
+4424030548811ff3cf002d324030e8b6  ld/emultempl/m68hc1xelf.em
+0f7dfd260376aff557939f9f9b0026ca  ld/emultempl/m68kcoff.em
+907245fc4d9760679ec286585649b64d  ld/emultempl/m68kelf.em
+b0ecbf9661634fe1d0b3153429b7d673  ld/emultempl/mipsecoff.em
+2cc2271a6594e680b581357e9f9e3173  ld/emultempl/mipself.em
+5d0343ade251326184c3a72f45360574  ld/emultempl/mmix-elfnmmo.em
+571de72fe5a66d0b44af003775cbebc5  ld/emultempl/mmixelf.em
+655a476a4517b93c050c4cfb5fde1fed  ld/emultempl/mmo.em
+c027ffd86e4d75fc1df32edbd78ab8d3  ld/emultempl/needrelax.em
+7fd72a36cbd152af568f6c4dcc7a778f  ld/emultempl/netbsd.em
+a8190e4a0b5cca5b8677d8bb2d39940f  ld/emultempl/ostring.sed
+e8724f22a01df60528b910d27cef982e  ld/emultempl/pe.em
+55ba4a985dfaf146af43af1cc8d0f044  ld/emultempl/pep.em
+3c27aed68da5d0374498d7a2e32d9b4c  ld/emultempl/ppc32elf.em
+f7ae6fc7c9358ea0ba353ecae92a628b  ld/emultempl/ppc64elf.em
+b812a798c37d8d5f5901f1821a8a648a  ld/emultempl/README
+f9c5b909500dd0fe865f60f2c81c5319  ld/emultempl/rxelf.em
+ce0094a0aa88fefe12182d071d67d646  ld/emultempl/scoreelf.em
+8890876ee133f90c0426c4fc8ea83b5c  ld/emultempl/sh64elf.em
+8c18b038e264514d353c5b109b68b080  ld/emultempl/solaris2.em
+218eb0caab01d73df5711094091dadb8  ld/emultempl/spu_icache.o_c
+93aab45b5b187873b67c127f02649429  ld/emultempl/spu_icache.S
+cb3ac7332c931570c921fe527c188d83  ld/emultempl/spu_ovl.o_c
+297ab6cf12270790536a64ec0ab49fbb  ld/emultempl/spu_ovl.S
+7fd9d3c4a23b1ddb27d0e46ad0d048a1  ld/emultempl/spuelf.em
+b81a8a2926af643ec1359eb1a451e824  ld/emultempl/sunos.em
+f5e65d5d7173c6cd2a7d2bd83e5e12c7  ld/emultempl/tic6xdsbt.em
+a1e44428a80727b027cf3e187d094e33  ld/emultempl/ticoff.em
+2b93c5dc10438986805d040f0edf4b11  ld/emultempl/vanilla.em
+c5fd6427ee3885ffb9b9950457bee53a  ld/emultempl/vms.em
+f539dfe654d52ba0f332048373d2355e  ld/emultempl/vxworks.em
+fdb26042471456f3e3d990ab3ee89785  ld/emultempl/xtensaelf.em
+7fbba22460bb83ff451daf49d80fcd96  ld/emultempl/z80.em
+ab0fe311032294b952da80585b8b90e7  ld/fdl.texi
+7f3de5527703e20cf2da845997c4e36a  ld/gen-doc.texi
+351c85fba3e46d48e9752dc51e2a0cac  ld/genscrba.sh
+797aec8b606b9b48533c39356e3782a6  ld/genscripts.sh
+981d9fc565e24a50734af5902eb7c52e  ld/h8-doc.texi
+c214b5973e81e2bbd397d3553a4b22e4  ld/ld.1
+59b3d878cf4fa65f9258cbc666c2e1b9  ld/ld.h
+79af4d31c25b791ac087898b07687999  ld/ld.info
+f6137f35adb067065dc34727fd512d8b  ld/ld.texinfo
+67dde8616fb18b7af1fae96a239a52a9  ld/ldcref.c
+dff9a89bd49eb0176843e49c7ad7c0e2  ld/ldctor.c
+84414136f84aeaab8033428d4a0a330a  ld/ldctor.h
+861dc78a5f1f967c0df792cb5736a150  ld/ldemul.c
+73feb06b0b17d058db587d5d6a5b3104  ld/ldemul.h
+6b4d33ab6e6612d92ededc353a37e4cc  ld/ldexp.c
+fd7a51bab2155b9993d9968dc72ecc9f  ld/ldexp.h
+c250222eb5e10657518baa64004bb173  ld/ldfile.c
+a6206a9e784f5dfa829372e92aa1eef7  ld/ldfile.h
+9687977fba92f6d94db6ae99347f847e  ld/ldgram.c
+214d3eab15ebab9e5c1dfa92eb917f00  ld/ldgram.h
+9510f5190778fe5c725444c786eb839c  ld/ldgram.y
+0973631ee12d99daed3e97216545aa9f  ld/ldint.texinfo
+6b9cc202bd835fbdbb177d88887a78b6  ld/ldlang.c
+ab3a3a76c192957d4acb76c1f77636b2  ld/ldlang.h
+c9360e41eeba0f5febd651e1298c4c0b  ld/ldlex-wrapper.c
+b348e41ce74d00d873495cde61e5bb94  ld/ldlex.c
+baeb3e241736fb852f797a5cbf9c163b  ld/ldlex.h
+f8da75f665e0da400d43b5b609c2f37c  ld/ldlex.l
+21b458ca5d2381eea4c87a6832d9bac3  ld/ldmain.c
+d80bce31760c2ec2d4ccf3499d8df452  ld/ldmain.h
+f668a8604f5ceb810e6c5ee78754587b  ld/ldmisc.c
+a2bbb9a3e5ce870051999d5cbd4ffc22  ld/ldmisc.h
+6a03fbfc2360f93eb8e515d1728d564a  ld/ldver.c
+f1d1d110b9e89a17eca7116545d66e79  ld/ldver.h
+66147726a96c958a6a63918d709d1a93  ld/ldwrite.c
+1d0ab77dd5d124786b3142aea0d9e88b  ld/ldwrite.h
+0c112748c0e348937034915404256427  ld/lexsup.c
+d618facc3e8ce8bf3d02ba452e1be6ab  ld/MAINTAINERS
+d75e83897707519666d34e55790eb45e  ld/Makefile.am
+5c20ef99fab04255b7301c6c05476689  ld/Makefile.in
+942ad1e3f0e1e190714d2b7fda53bc4f  ld/mri.c
+32569346651ca50342ad97f07baca5cf  ld/mri.h
+40bc9bd51a44806f688c04c68ed6e897  ld/NEWS
+c8cc1a5a500ff6785ebc6e94f3ab2ad2  ld/pe-dll.c
+763a817ac4bf83bc5064f4dec8ac3f0d  ld/pe-dll.h
+8b087227bfd826e425b9bc88f9a9c2e6  ld/pep-dll.c
+416b818dfa9c359535b00117ae94659a  ld/pep-dll.h
+4f3fb0fe6f84a1808da36048c32cd85a  ld/plugin.c
+36af6eb06e6aa087e9d75190fa942649  ld/plugin.h
+f6d8f46230eb87af11b5ec0b6b5b399d  ld/po/bg.gmo
+5097dc0ebfb7addda287833496c3b348  ld/po/bg.po
+aa3f5b6b19d37fd67dae7c5f9d67c868  ld/po/da.gmo
+cdfef74e675d16fda762c677f6757811  ld/po/da.po
+a137a04abad2a023cb269e774e1d4a63  ld/po/es.gmo
+de24056abf1e2efb772e30aedbd01d08  ld/po/es.po
+b594a802f243ab42bf3ff5a27c39a22b  ld/po/fi.gmo
+cab5733f1ae1160fd730552487201a8f  ld/po/fi.po
+d5a10269096e204ee0ba6696952df9f4  ld/po/fr.gmo
+4e69484f40b02ed13933f43c576538fd  ld/po/fr.po
+fc40639db7883536c193350b81dd7cc8  ld/po/ga.gmo
+6b597ac040f231ea3ed037773cf89082  ld/po/ga.po
+53c1557e853cab0747c7be2c851a7a36  ld/po/id.gmo
+8e978c7b22e7d2345dfaef2c4cbddd92  ld/po/id.po
+593c3d8483eeaffa54d5ac135f45f219  ld/po/ja.gmo
+94fbae08f056207fde9be4c61ed7561b  ld/po/ja.po
+d4d9ac5897a4fd2b4228f52282dfeeb4  ld/po/ld.pot
+7cb7553c50642d63ccb14f30f66ca155  ld/po/Make-in
+7a287179b7f4c67f1b618821002ad5b9  ld/po/POTFILES.in
+1458a539ab520ec9ecde71e95b38d325  ld/po/sv.gmo
+6c881a8bbe72addbfc0267a9efda3850  ld/po/sv.po
+3d1ef990f300fb1817b57310a731db3e  ld/po/tr.gmo
+a44c2934ddeb120e2f08ca74572a7573  ld/po/tr.po
+a5d95d7d9cb740c6063a10a39d0d38e5  ld/po/vi.gmo
+b7ef0492eef2d663197efdfdaba9aac4  ld/po/vi.po
+3efd8d4a930e84f4ad64bb4ccfab32aa  ld/po/zh_CN.gmo
+e7c8a19b119746a607460fe98af06531  ld/po/zh_CN.po
+83c6d4c200b0dbaca4a92d64305ef342  ld/po/zh_TW.gmo
+a3966a60cb929bb5b812c3914663d7a6  ld/po/zh_TW.po
+305f3d03c641bc73c2e6ba871fdfe318  ld/README
+51b49fc4acb5799b7561eff69cdfc5de  ld/scripttempl/aix.sc
+cca3acb2dbc409fd6ff5f17da85f0478  ld/scripttempl/alpha.sc
+b7af2fe723d10d9f922854eb3d14a056  ld/scripttempl/alphavms.sc
+11e720b2d4fbd6b8ad9ce26f980acd6a  ld/scripttempl/aout.sc
+a354ffa3178f947e907c1d89c536fd8c  ld/scripttempl/armaout.sc
+f9df9b9a472c5c7e214261e210b944fb  ld/scripttempl/armbpabi.sc
+d95bfff20786bc2880153aec35544b13  ld/scripttempl/armcoff.sc
+299f28c30f8a19322df6025800766709  ld/scripttempl/avr.sc
+8980da56643d667c0ff54d23919a5cf3  ld/scripttempl/crisaout.sc
+206c75cbd7e5185b3ee0c11b5528baa1  ld/scripttempl/delta68.sc
+756f010bc1fcebe9cb08b1c8afa66389  ld/scripttempl/dlx.sc
+2e61c0376f967446aaeeab33c5298c29  ld/scripttempl/elf.sc
+2fbe76192c4153c98b995e8cbd0bb119  ld/scripttempl/elf32cr16.sc
+8222028cb2706153489bff8d5a823387  ld/scripttempl/elf32cr16c.sc
+03fa4a27215925af3a39d23023313935  ld/scripttempl/elf32crx.sc
+8563cd5ab5a5691bb99f61ac3b1c0649  ld/scripttempl/elf32msp430.sc
+40a02e3a1d0c83fd555f3089ccf49196  ld/scripttempl/elf32msp430_3.sc
+31577e0de0f8f3f08c1cca134a808d14  ld/scripttempl/elf32sh-symbian.sc
+1f4f2ecf763c7a8cae379d44080d27ce  ld/scripttempl/elf32xc16x.sc
+26183dc800d2445fc9783faeb7f4a09c  ld/scripttempl/elf32xc16xl.sc
+26183dc800d2445fc9783faeb7f4a09c  ld/scripttempl/elf32xc16xs.sc
+f7c5795424490af39b3e6207e3f6c5c8  ld/scripttempl/elf64hppa.sc
+55c48d31a367874103ee640d1b8cad38  ld/scripttempl/elf_chaos.sc
+5fa4ee9418f39438deec99573812c3ab  ld/scripttempl/elfd10v.sc
+2c41bd1ff6d91d6076eb31134dac238c  ld/scripttempl/elfd30v.sc
+9b243fb72fdcbb010fd362927abd9bd0  ld/scripttempl/elfi370.sc
+1b3554b76eba2a91dfc4b4148839e92e  ld/scripttempl/elfm68hc11.sc
+1388afffa87dba99cc3d42eaed3c5e73  ld/scripttempl/elfm68hc12.sc
+15697433a3af5d3bd995697fc56ef15b  ld/scripttempl/elfmicroblaze.sc
+e4f897aa6f97dc7696d6cffd5f38ea77  ld/scripttempl/elfxtensa.sc
+558cf311f2393d6785ca38f20dac542e  ld/scripttempl/epocpe.sc
+cda2a85ad5bebf3d42b9f0219e185d42  ld/scripttempl/h8300.sc
+a31cc1aeff826b4f48605fae2c9e7a17  ld/scripttempl/h8300h.sc
+c544c999740a0943c5c0fa48d43fd036  ld/scripttempl/h8300hn.sc
+0c68b8546d6279b5f564ce2dea8b915f  ld/scripttempl/h8300s.sc
+ebc60b1d61cbb77823d945dec94d0d7a  ld/scripttempl/h8300sn.sc
+381ce17048d5d91f113654cc4e8a29f5  ld/scripttempl/h8300sx.sc
+541328f18c8ae4ac182784e817c54b99  ld/scripttempl/h8300sxn.sc
+6c57b9f11a6f50c46ecce9df62061dbf  ld/scripttempl/h8500.sc
+39da8240aa7f5aca7b23d93bcf243bb8  ld/scripttempl/h8500b.sc
+a1235b4e692307533adc69d75c98da06  ld/scripttempl/h8500c.sc
+45c5f295e421e663e1843207ae13951a  ld/scripttempl/h8500m.sc
+b6ce335a288c23cf897c944a84aafe3b  ld/scripttempl/h8500s.sc
+345bdda73fb357a6ae58654860af5778  ld/scripttempl/hppaelf.sc
+9cabd59c88eccf17f3ba4aed399fb8cc  ld/scripttempl/i386beos.sc
+b83d2090c526ea76244fb001060b87aa  ld/scripttempl/i386coff.sc
+781996f0bc02303778e28cca826ead23  ld/scripttempl/i386go32.sc
+dd4667c5e75a68e5bcc4b0769830974b  ld/scripttempl/i386msdos.sc
+0acb5ea28c8feeee6aae68de5fb62a67  ld/scripttempl/i860coff.sc
+f14aed79776fb856704487766477ef6b  ld/scripttempl/i960.sc
+56c554544d555716dbaa542dd8be6141  ld/scripttempl/ip2k.sc
+dc5d4ade67ff549a0ee0a727075a5d93  ld/scripttempl/iq2000.sc
+e540fae4addb8cf1d5c85f7e2386ccb3  ld/scripttempl/m68kaux.sc
+0acb5ea28c8feeee6aae68de5fb62a67  ld/scripttempl/m68kcoff.sc
+c6b7f25c2a22e109fe31d19e927a904c  ld/scripttempl/m88kbcs.sc
+7145b5d7ef97d4349ec0a4ab8dfc4cb4  ld/scripttempl/mcorepe.sc
+5b68eb3b0430d858ea927ccb39b009e4  ld/scripttempl/mep.sc
+60543996ddabef7bf15c4e659e4715cc  ld/scripttempl/mips.sc
+756f010bc1fcebe9cb08b1c8afa66389  ld/scripttempl/mipsbsd.sc
+511fa627b86fe9c3a20302b16b398e38  ld/scripttempl/mmo.sc
+5e33868aa49cdc31363e63450fa7cbb8  ld/scripttempl/moxie.sc
+ca0b5bbcf601b895d149c90dc54be768  ld/scripttempl/nw.sc
+fdcbfdd0b93aa6b73e1b73127b28bdae  ld/scripttempl/or32.sc
+2b85ea488dec1f2ab3e4ad4af324e891  ld/scripttempl/pe.sc
+e43c1377e62f7ccf7c3b09e9e89d6ade  ld/scripttempl/pep.sc
+47e02e8254495a858dbef6c19c1ac173  ld/scripttempl/pj.sc
+34e9e3ff43defb7975f446f017511ab8  ld/scripttempl/ppcpe.sc
+ab0f8d8220dc084233dee358c5e57433  ld/scripttempl/psos.sc
+01c6e3598e372d510730e381dd25c2cd  ld/scripttempl/README
+1ca280b61dcc707ecc1128cfa80b8243  ld/scripttempl/riscix.sc
+e492e9686199c4307073777a09fe3652  ld/scripttempl/sh.sc
+9a6c27dca93759ca536b40f12d4d5ba6  ld/scripttempl/sparccoff.sc
+6277ea502afc8c184eeccce4362d538b  ld/scripttempl/st2000.sc
+f9f56c0b4c0548aadba5f30ee7f105fe  ld/scripttempl/tic30aout.sc
+581d4b5a31b2f67b8274aa96b201af92  ld/scripttempl/tic30coff.sc
+daa356e0072cd7638fa0b155ce9c5f52  ld/scripttempl/tic4xcoff.sc
+8b0583aa9c80a4bad0ee29ec99696b02  ld/scripttempl/tic54xcoff.sc
+55bb06a75d32be990c5e17654403970c  ld/scripttempl/tic80coff.sc
+8aa6f8d6effa49d2f288870329e485cc  ld/scripttempl/v850.sc
+922fccd6995f0a119365fd7ceb7b25ce  ld/scripttempl/vanilla.sc
+9ef634e16ac4537117ea157867e85207  ld/scripttempl/w65.sc
+ad6aabb9d8a04c2828a9cd3a4005658e  ld/scripttempl/xstormy16.sc
+40b944db8315cb484a442a7e3447da39  ld/scripttempl/z80.sc
+60b2f678a8887cae18760d0013bffa20  ld/scripttempl/z8000.sc
+1ded054093de910d9786c62bc4fe8cc6  ld/stamp-h.in
+436d69f69f4db1ef1fa178674525e4cf  ld/sysdep.h
+4e3baa769dc8f858b1fc3ecf8e11fbe0  ld/testplug.c
+06262c57474646fa1934cd2e6c143e26  ld/testsuite/ChangeLog
+43821ec3e01aa56c69d031c9cb7aaac6  ld/testsuite/ChangeLog-2004
+0593940197fddd34e72d34ad4681e18d  ld/testsuite/ChangeLog-2005
+13ed49b06cc49649e67f1df2f524946a  ld/testsuite/ChangeLog-2006
+fdc85b5e1c70442c643dfd0338ef699f  ld/testsuite/ChangeLog-2007
+aae40f3c4e2976bcc04690dcafecaee5  ld/testsuite/ChangeLog-2008
+ea60b8fb6103ed796041aa41c43334e3  ld/testsuite/ChangeLog-2009
+c74a5ff0059033a1ac5e743ee5e70ed9  ld/testsuite/ChangeLog-2010
+f6131533875b285cb0449a348fffaeea  ld/testsuite/ChangeLog-9303
+94afe0fe97944ac401236e398bdb28e4  ld/testsuite/config/default.exp
+18325ab257cc940dcb70d61b6715538c  ld/testsuite/ld-alpha/align.s
+cd84bd576f301ddb989ca9704571ab38  ld/testsuite/ld-alpha/alpha.exp
+8bf554efdd7f5c93133dfc8ba7151052  ld/testsuite/ld-alpha/emptygot.nm
+0149a5d2fce532f4a8e6476f1b999d7a  ld/testsuite/ld-alpha/emptygot.s
+c4730c79b491970b9e7aa8e9bbe6c317  ld/testsuite/ld-alpha/tlsbin.dd
+2a7f751ec3b31fbc8706caf61ae3d95f  ld/testsuite/ld-alpha/tlsbin.rd
+e4cc0945bf729834783cc392d04e8929  ld/testsuite/ld-alpha/tlsbin.s
+471ff630e1eb88135b396eb8077cf101  ld/testsuite/ld-alpha/tlsbin.sd
+0fdd3c7d51da0c6a74ad3818834ed2b6  ld/testsuite/ld-alpha/tlsbin.td
+f54f88a171d4a1a0502508fb4ba08259  ld/testsuite/ld-alpha/tlsbinpic.s
+556976926e9d8990df2467c2cbcf11d0  ld/testsuite/ld-alpha/tlsbinr.dd
+3bba5d5864c7a1727faea16a4f7372d6  ld/testsuite/ld-alpha/tlsbinr.rd
+d625489891d77ff8c6310f5f05486c77  ld/testsuite/ld-alpha/tlsbinr.sd
+4a8162da94dcca517a86059466c554ff  ld/testsuite/ld-alpha/tlsg.s
+643df4e4ff122f2f6a1804aff730c793  ld/testsuite/ld-alpha/tlsg.sd
+b87c24c0e610b3ccf34b009a7280eefa  ld/testsuite/ld-alpha/tlslib.s
+a802cac9f534fb99d25bc95cfc9a2ad3  ld/testsuite/ld-alpha/tlspic.dd
+4a90eb141aa0b858f420ee35ab0fc5dc  ld/testsuite/ld-alpha/tlspic.rd
+d799d7afe5a44a1032c8a7b495b71f3b  ld/testsuite/ld-alpha/tlspic.sd
+fa4f4d2a9aa095262c026d8b386826ce  ld/testsuite/ld-alpha/tlspic.td
+66fa8fd9968bb830ab985fbaf9e9a7b2  ld/testsuite/ld-alpha/tlspic1.s
+1be6d8e1547c710f7bc12028c6522832  ld/testsuite/ld-alpha/tlspic2.s
+0c939da922c88b31326633cd4ac9b0b9  ld/testsuite/ld-arm/abs-call-1.d
+bc7a0100095ba568f92c5b4cb573c76e  ld/testsuite/ld-arm/abs-call-1.s
+7895b15c6266c18505e625262eea54f0  ld/testsuite/ld-arm/arch-v6.s
+6aa37e1d35526c4d4eb5629eafe109e8  ld/testsuite/ld-arm/arch-v6k.s
+e1e08792660eae6fa0f4165f8320c73b  ld/testsuite/ld-arm/arch-v6t2.s
+77d705dc1cb85b55d60a1a5ef372dda1  ld/testsuite/ld-arm/arm-app-abs32.d
+565634b571c9c9e088fb3416a62705f0  ld/testsuite/ld-arm/arm-app-abs32.r
+abe5df1b29a8c0085e2b425276030a2b  ld/testsuite/ld-arm/arm-app-abs32.s
+44189b55bc98f5f1bde3d79507cc5877  ld/testsuite/ld-arm/arm-app-movw.s
+0e012f2cb1efd99af6b30be23fdade93  ld/testsuite/ld-arm/arm-app.d
+b0831c8e38b6165af9e9d82e1a242fbd  ld/testsuite/ld-arm/arm-app.r
+20303773d7a50761a78fb7a3536407b5  ld/testsuite/ld-arm/arm-app.s
+5f2a54452016678abd05e0456b6a9e77  ld/testsuite/ld-arm/arm-be8.d
+9bd7893b6bd0aaee2575654eeb7b2806  ld/testsuite/ld-arm/arm-be8.s
+d7525ccd8931c32c432a3f3aa14174c5  ld/testsuite/ld-arm/arm-call.d
+a787400b6bcc43f49aa58957d81b56b9  ld/testsuite/ld-arm/arm-call1.s
+5e27a3edfbfbf3a12d65e227fab0c447  ld/testsuite/ld-arm/arm-call2.s
+62568113ccbc67acbec0b553c0ac27d9  ld/testsuite/ld-arm/arm-dyn.ld
+330686e07cf77888b9215b639186aa3c  ld/testsuite/ld-arm/arm-elf.exp
+2a3abc273f1a81034c2252c1593c803a  ld/testsuite/ld-arm/arm-lib-plt-2.dd
+57b6eb19e18b93ead28a446db8622778  ld/testsuite/ld-arm/arm-lib-plt-2.rd
+24d760eeef99d12b084bcad76b2f82c9  ld/testsuite/ld-arm/arm-lib-plt-2a.s
+73bf22104860bd41102419e3a4695235  ld/testsuite/ld-arm/arm-lib-plt-2b.s
+b04b3e1b69a55141a0ebfd7ae824ef8c  ld/testsuite/ld-arm/arm-lib-plt32.d
+a167e469316cdd1ed8af41301205f0a0  ld/testsuite/ld-arm/arm-lib-plt32.r
+72d35e1785ba54a876601fb0dbeeab24  ld/testsuite/ld-arm/arm-lib-plt32.s
+14268c6b6cc4a710e8a2982a44641441  ld/testsuite/ld-arm/arm-lib.d
+0708cc1adcc6baf63231589c4ec9d60e  ld/testsuite/ld-arm/arm-lib.ld
+cf684a9a844dd5b8f1e9e0059bd54fd1  ld/testsuite/ld-arm/arm-lib.r
+c4c6f3c32d459e57dbc71322834068c1  ld/testsuite/ld-arm/arm-lib.s
+f278856f60aa2e92fef6f8efcb95cd87  ld/testsuite/ld-arm/arm-movwt.d
+b426a92fe21a99c3863c6101c2313fdf  ld/testsuite/ld-arm/arm-movwt.s
+d8a05038cb85c454ed420fb6915da278  ld/testsuite/ld-arm/arm-pic-veneer.d
+899b6abee6b02dc13cce6c0ddccd883e  ld/testsuite/ld-arm/arm-pic-veneer.s
+c4ff75c0232f3b2256bc7aafc3bc8e40  ld/testsuite/ld-arm/arm-rel31.d
+8cebae8ee9a229083227e603191c0391  ld/testsuite/ld-arm/arm-rel31.s
+09ee606ddacc2f55cc25902f2a6d5515  ld/testsuite/ld-arm/arm-rel32.d
+1e2ce4555be8588f9ae73d3d59424e5c  ld/testsuite/ld-arm/arm-rel32.s
+9fc3aef29b8fbf55de40dd3dc788b94c  ld/testsuite/ld-arm/arm-static-app.d
+31e63d6e3b7ba27e293f96df500359d9  ld/testsuite/ld-arm/arm-static-app.r
+bf32a1e13602b56dbc2ccd6d3cc7075a  ld/testsuite/ld-arm/arm-static-app.s
+a69a7159f61904208e6b1cc0d5b3c263  ld/testsuite/ld-arm/arm-target1-abs.d
+9614e4d603f01aa481ea9b010921613d  ld/testsuite/ld-arm/arm-target1-rel.d
+4f25ab9246a0db32d11a546d9125b081  ld/testsuite/ld-arm/arm-target1.s
+db7bf3b0f71d8c6db5ba1593a29e2e4c  ld/testsuite/ld-arm/arm-target2-abs.d
+bafd45e2fb70ed3e7636147857fb38a6  ld/testsuite/ld-arm/arm-target2-got-rel.d
+3450245b99e8b9ad0a7c1faa69461146  ld/testsuite/ld-arm/arm-target2-rel.d
+9cf9947ecc7d9790a8559eaf8ae700d4  ld/testsuite/ld-arm/arm-target2.s
+fe849e07c75e05d399efc326b296c435  ld/testsuite/ld-arm/arm.ld
+44893e5a5afc38ad27167c030ee5c958  ld/testsuite/ld-arm/armthumb-lib.d
+2bc49ee8cf149c8a9ee254d14f8385c0  ld/testsuite/ld-arm/armthumb-lib.sym
+efbfb53e4bea0790c927b2a3e318ca43  ld/testsuite/ld-arm/armv4-bx.d
+e2dadb7d750471c27af1efd41b48a882  ld/testsuite/ld-arm/armv4-bx.s
+e3663adf291034687f2310d8c36235a6  ld/testsuite/ld-arm/attr-merge-2.attr
+5f12936f87e1ed4b81d2a70331d30421  ld/testsuite/ld-arm/attr-merge-2a.s
+c8bd90e167a02533a37e59f8c5e4dbe2  ld/testsuite/ld-arm/attr-merge-2b.s
+4a5365fbbe1c0ebf6ef9b9716a8f862d  ld/testsuite/ld-arm/attr-merge-3.attr
+1ba5e1d384cc9aff15613343d46585d4  ld/testsuite/ld-arm/attr-merge-3a.s
+08eb07a082249955d132e6c7039848de  ld/testsuite/ld-arm/attr-merge-3b.s
+6da714aa56c470a02600e1d60c412e28  ld/testsuite/ld-arm/attr-merge-4.attr
+6f0ae206678ea57ff2000af1db378299  ld/testsuite/ld-arm/attr-merge-4a.s
+899f45463773d5eb3c444646029ce5f9  ld/testsuite/ld-arm/attr-merge-4b.s
+702d1f2815531ce86e0d10e88be0aa5b  ld/testsuite/ld-arm/attr-merge-5.attr
+62f80cb0667f1f4f15b674a8af29dab4  ld/testsuite/ld-arm/attr-merge-5.s
+76c3e5190262fcaabbcd8a47e791c7b9  ld/testsuite/ld-arm/attr-merge-6.attr
+072e2bbfcbf5398506cd91cf59cfd204  ld/testsuite/ld-arm/attr-merge-6a.s
+92105a7efb116e4e72d261e1127a711c  ld/testsuite/ld-arm/attr-merge-6b.s
+76c3e5190262fcaabbcd8a47e791c7b9  ld/testsuite/ld-arm/attr-merge-7.attr
+2e18644e38bb3e56b3f8810232878f50  ld/testsuite/ld-arm/attr-merge-7a.s
+43be1b33b4ba036cc07b070486447a6e  ld/testsuite/ld-arm/attr-merge-7b.s
+a6f56cbf4b9ff50c842051a67ddc4114  ld/testsuite/ld-arm/attr-merge-arch-1.attr
+079f1aaeb79045c44b450ae046ad70bf  ld/testsuite/ld-arm/attr-merge-arch-2.attr
+fe15ddce74851e7fbc2865200b34df67  ld/testsuite/ld-arm/attr-merge-incompatible.d
+fc3daa1b534d41b11840efff5c4c170a  ld/testsuite/ld-arm/attr-merge-incompatiblea.s
+62f80cb0667f1f4f15b674a8af29dab4  ld/testsuite/ld-arm/attr-merge-incompatibleb.s
+0d80c6d12051d67b1b304bea1cdbbf55  ld/testsuite/ld-arm/attr-merge-unknown-1.d
+a0de730b63d5dfb48cf9cd87a0b7cb08  ld/testsuite/ld-arm/attr-merge-unknown-1.s
+564fc214fee68b50a10fe6c7617eee8c  ld/testsuite/ld-arm/attr-merge-unknown-2.d
+e6d53a8df83263f9ddb77d774170ab4d  ld/testsuite/ld-arm/attr-merge-unknown-2.s
+7b754df1f42c142b78e720da0ba254e2  ld/testsuite/ld-arm/attr-merge-unknown-2r.d
+cd4290118ac4cc3d77ec922696ca8d2b  ld/testsuite/ld-arm/attr-merge-unknown-3.d
+bb7873ee1d585090f26689eb2c4014c7  ld/testsuite/ld-arm/attr-merge-vfp-1.d
+2eb41ed7bed45aad91bcdeacce7a8aa0  ld/testsuite/ld-arm/attr-merge-vfp-1r.d
+4e9dbd7dc5c977f7fd9dd43ec933d7e3  ld/testsuite/ld-arm/attr-merge-vfp-2.d
+f8b0584fc86faffed19d1130fc34dc93  ld/testsuite/ld-arm/attr-merge-vfp-2.s
+6741b604f0d2859db4903a2b8bec0828  ld/testsuite/ld-arm/attr-merge-vfp-2r.d
+f28af5c6a13398cbeac6f0c860d2dcd6  ld/testsuite/ld-arm/attr-merge-vfp-3-d16.s
+d52893c369f5394c56e38f653de48e8d  ld/testsuite/ld-arm/attr-merge-vfp-3.d
+4c48ddba2fcd22187f0226a2012d5595  ld/testsuite/ld-arm/attr-merge-vfp-3.s
+2187bb1f951eded643ff496f0331c598  ld/testsuite/ld-arm/attr-merge-vfp-3r.d
+285bf2f43dcf84d9d2b6c39f34b357c4  ld/testsuite/ld-arm/attr-merge-vfp-4-d16.s
+d19dddc8dddc6e7b80627c63d2494f84  ld/testsuite/ld-arm/attr-merge-vfp-4.d
+8de7869cf10231747ddf8ead86b8b046  ld/testsuite/ld-arm/attr-merge-vfp-4.s
+44ee3543f69e1831b0a3f448abe0c85d  ld/testsuite/ld-arm/attr-merge-vfp-4r.d
+02452b478b79db96253056986747ee16  ld/testsuite/ld-arm/attr-merge-vfp-5.d
+32cc70e21f3b5675d8a8f8ec8e4c2fce  ld/testsuite/ld-arm/attr-merge-vfp-5r.d
+668996480394f949a3943b906b482feb  ld/testsuite/ld-arm/attr-merge-vfp-6.d
+ab1d0c0d11a1d914975b7ae8200f7364  ld/testsuite/ld-arm/attr-merge-vfp-6r.d
+c50abc378811fb009b68ec103f8be197  ld/testsuite/ld-arm/attr-merge-vfpv3xd.s
+b4360e3265d2af1e542fed5b6fbccd53  ld/testsuite/ld-arm/attr-merge-wchar-0.s
+7fb29658bd9bc28063a58d7e8d570f92  ld/testsuite/ld-arm/attr-merge-wchar-00-nowarn.d
+f0f1d81df0769ada7748d424d85f0f97  ld/testsuite/ld-arm/attr-merge-wchar-00.d
+2b4a11110a04738d50457042148c288f  ld/testsuite/ld-arm/attr-merge-wchar-02-nowarn.d
+d339f951c00ab9f2676ece4477d16a5b  ld/testsuite/ld-arm/attr-merge-wchar-02.d
+d5448e3d00cfb657ae55ccaeb13654d9  ld/testsuite/ld-arm/attr-merge-wchar-04-nowarn.d
+d74677e3dd4e57f22e01e609be12e4de  ld/testsuite/ld-arm/attr-merge-wchar-04.d
+2c296cb445843717d76f0e456347e416  ld/testsuite/ld-arm/attr-merge-wchar-2.s
+ecf839ea72713f6d3465f5f06c30ce4c  ld/testsuite/ld-arm/attr-merge-wchar-20-nowarn.d
+844b927260ce385379bf83c79d6d83f5  ld/testsuite/ld-arm/attr-merge-wchar-20.d
+3b27a22c667e04291a9a80bcb68a437d  ld/testsuite/ld-arm/attr-merge-wchar-22-nowarn.d
+766d16be48c8d68ce16c0b30b0dc4e00  ld/testsuite/ld-arm/attr-merge-wchar-22.d
+958586afae8bb2eff5887a4a09a85375  ld/testsuite/ld-arm/attr-merge-wchar-24-nowarn.d
+797c7798987c3a88b6728b08baa1d289  ld/testsuite/ld-arm/attr-merge-wchar-24.d
+e25c78be043d14cf8a3025dfafec8d7a  ld/testsuite/ld-arm/attr-merge-wchar-4.s
+dd65ac98876c9fbfbbe7a9560a18d516  ld/testsuite/ld-arm/attr-merge-wchar-40-nowarn.d
+6d52dd393e397056682f562957478b23  ld/testsuite/ld-arm/attr-merge-wchar-40.d
+66b391040463dfa7c28843537b17ef4f  ld/testsuite/ld-arm/attr-merge-wchar-42-nowarn.d
+d64d5b8c690cbc57d414656ea5259b4b  ld/testsuite/ld-arm/attr-merge-wchar-42.d
+bdc41fca047e0ae8d657d30f9c2ef64c  ld/testsuite/ld-arm/attr-merge-wchar-44-nowarn.d
+295dd091a506a3e4b1770cc8b7b9c8d5  ld/testsuite/ld-arm/attr-merge-wchar-44.d
+1d5222dd7f07618dae4fe1d52728376d  ld/testsuite/ld-arm/attr-merge.attr
+8769cbbf0c802d7f2c4b4364ba841b4b  ld/testsuite/ld-arm/attr-merge.s
+1632d9677c2b9800feac355724a3d9dc  ld/testsuite/ld-arm/blank.s
+ba2e9f916e17ba98c1ce3d06e3221320  ld/testsuite/ld-arm/callweak-2.d
+1ff473794b52b3c0372dde027b120ebb  ld/testsuite/ld-arm/callweak-2.s
+48ac319a0e3e64039e9fede6a80e386d  ld/testsuite/ld-arm/callweak.d
+2e3b64e093e12c6da2f693266d058577  ld/testsuite/ld-arm/callweak.s
+7e22f1277033cc08b8fa53289b0779c6  ld/testsuite/ld-arm/cortex-a8-arm-target.s
+bab664f9cbbe460a870357a8fa8c8245  ld/testsuite/ld-arm/cortex-a8-far-1.s
+be27d10903245210f7ba901f98244343  ld/testsuite/ld-arm/cortex-a8-far-2.s
+6302f37d4b07b405a0d1741b0398365a  ld/testsuite/ld-arm/cortex-a8-far-3.s
+948af81f56a6ef8c3f4872264f6d087f  ld/testsuite/ld-arm/cortex-a8-far.d
+1ffe502271a5f68dc515a82af764d8fa  ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d
+b50c2ae6aba4a0202cc17ff8e8b775ca  ld/testsuite/ld-arm/cortex-a8-fix-b-plt.s
+01bba47886edfb28947408e14f5ec8f7  ld/testsuite/ld-arm/cortex-a8-fix-b-rel-arm.d
+045519d3c449489440e9ea52dae4e515  ld/testsuite/ld-arm/cortex-a8-fix-b-rel-thumb.d
+6b22eb67a82b0807b682a0e71c5502ca  ld/testsuite/ld-arm/cortex-a8-fix-b-rel.s
+fb6ef44a33f7e0761ddaeae2c30ead18  ld/testsuite/ld-arm/cortex-a8-fix-b.d
+36631979a7237c784288b48a4d7d4d32  ld/testsuite/ld-arm/cortex-a8-fix-b.s
+0890156477a2ae6fd8c2650be3031f0d  ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d
+2adbba2039a01ab3a6d57086fd991b78  ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.s
+11f72b8789056c492dc9c8b8d359e304  ld/testsuite/ld-arm/cortex-a8-fix-bcc-rel-thumb.d
+e451296a2ef78f15f6cf2fddb05237da  ld/testsuite/ld-arm/cortex-a8-fix-bcc-rel.s
+d617939309f9ba77893f0621bbaf14d2  ld/testsuite/ld-arm/cortex-a8-fix-bcc.d
+6ef3522d14ec39cd532099e0302784f3  ld/testsuite/ld-arm/cortex-a8-fix-bcc.s
+28823d7677e078fe67736d3bc47bffec  ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d
+e6c4fa37fc21418e2a20576d38ef0347  ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.s
+f4045f402dfc1b574e9ca159f55d841c  ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-arm.d
+cd0e6988625aed95688ccbc5339306f7  ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d
+73aaf1bc6445754cbb9abbf7f2f92e73  ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-thumb.d
+475faa739e8d5a8a44e123dc086001d0  ld/testsuite/ld-arm/cortex-a8-fix-bl-rel.s
+c94c625b4d0121a79118a8d8b96b4b02  ld/testsuite/ld-arm/cortex-a8-fix-bl.d
+2181cf399ebb5a864e48ad9199a00ec1  ld/testsuite/ld-arm/cortex-a8-fix-bl.s
+0dc55dd25c8252492a84ed229e7250da  ld/testsuite/ld-arm/cortex-a8-fix-blx-bcond.d
+291f8743a6f9543a45f9bcd3638abd25  ld/testsuite/ld-arm/cortex-a8-fix-blx-bcond.s
+28823d7677e078fe67736d3bc47bffec  ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d
+790d8a4a3d218060ad43a77255798379  ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.s
+f4045f402dfc1b574e9ca159f55d841c  ld/testsuite/ld-arm/cortex-a8-fix-blx-rel-arm.d
+73aaf1bc6445754cbb9abbf7f2f92e73  ld/testsuite/ld-arm/cortex-a8-fix-blx-rel-thumb.d
+af72dc49b413d92ed9667b4d63ed9ddf  ld/testsuite/ld-arm/cortex-a8-fix-blx-rel.s
+6873878cb2ebaa1bf46010dabc5727f7  ld/testsuite/ld-arm/cortex-a8-fix-blx.d
+1e25975b509deb838f6e0d2254ff499f  ld/testsuite/ld-arm/cortex-a8-fix-blx.s
+ce7c7287491dece28e98da1c3efe773d  ld/testsuite/ld-arm/cortex-a8-fix-hdr.d
+48784d08956228e0d16b89ac340ea6ab  ld/testsuite/ld-arm/cortex-a8-fix-hdr.s
+864221fec407b2c37533593c55894f02  ld/testsuite/ld-arm/cortex-a8-fix-hdr.t
+80854a8a9c4500cc20738d200a77b006  ld/testsuite/ld-arm/cortex-a8-fix-plt.ld
+a9dac8d0925445e9d10ce4f596b22e2a  ld/testsuite/ld-arm/cortex-a8-thumb-target.s
+b88dcc9e56e2728d412f0d5743d028b0  ld/testsuite/ld-arm/data-only-map.d
+3e5794d866ad28c00e03cfc572e2c705  ld/testsuite/ld-arm/data-only-map.ld
+eb5f0ce3abd8b00466907d473b245d54  ld/testsuite/ld-arm/data-only-map.s
+560401691ef9f717d32d73bc749fbe16  ld/testsuite/ld-arm/discard-unwind.ld
+d3572717a33b9984a0736abd439301fb  ld/testsuite/ld-arm/emit-relocs1-vxworks.d
+dc068f97c1fa2716277fa6e58f1b3fee  ld/testsuite/ld-arm/emit-relocs1.d
+060f69d9ec279b88a035babbd2638197  ld/testsuite/ld-arm/emit-relocs1.s
+cd4c31e1aa87e9987fe51b559459c8a9  ld/testsuite/ld-arm/exec-got-1.d
+4a6620f5ffdf80120288d531181e52f9  ld/testsuite/ld-arm/exec-got-1a.s
+b434422e46503615e91cf825c828c2f5  ld/testsuite/ld-arm/exec-got-1b.s
+90320e8531ecf52267551ed492347720  ld/testsuite/ld-arm/farcall-arm-arm-pic-veneer.d
+759037c784bbc000f3fb6494333fdd34  ld/testsuite/ld-arm/farcall-arm-arm.d
+83d80a7ef45408d267162af94a007143  ld/testsuite/ld-arm/farcall-arm-arm.s
+da263ec380f531417f9934070f7d83d5  ld/testsuite/ld-arm/farcall-arm-thumb-blx-pic-veneer.d
+37ac132fdbf7a1e97348862517ba5412  ld/testsuite/ld-arm/farcall-arm-thumb-blx.d
+da263ec380f531417f9934070f7d83d5  ld/testsuite/ld-arm/farcall-arm-thumb-pic-veneer.d
+612fa477003bb6c3d2fd4305c8590242  ld/testsuite/ld-arm/farcall-arm-thumb.d
+feafda34a355cec86381a9424c1923e0  ld/testsuite/ld-arm/farcall-arm-thumb.s
+aed25e01070077e10df302eb4d39259a  ld/testsuite/ld-arm/farcall-data.d
+77a25d7840b7eea965802b011cce6bf7  ld/testsuite/ld-arm/farcall-data.s
+bc8342bacca85509c43a781286219175  ld/testsuite/ld-arm/farcall-group-limit.d
+2f5489361a2dcfadb6f944f9cca65ae6  ld/testsuite/ld-arm/farcall-group-size2.d
+a0a58aad96873c94862b773f4af7c5df  ld/testsuite/ld-arm/farcall-group.d
+dfaec37784ca0c2f25d2f04ebb05fdf9  ld/testsuite/ld-arm/farcall-group.s
+d61430b77747464e5d48aa940be39580  ld/testsuite/ld-arm/farcall-group2.s
+349d0f252076dfdc0de2b81a072b940f  ld/testsuite/ld-arm/farcall-group3.s
+3cbbaa21c86c5e0cbf97d31c735740b8  ld/testsuite/ld-arm/farcall-group4.s
+fa28a8361a3595002a208780a18848d0  ld/testsuite/ld-arm/farcall-mix.d
+1017db2c56473761890b4d633b7f8699  ld/testsuite/ld-arm/farcall-mix.s
+38454c9e76cf1a3878147a0ba367ce6e  ld/testsuite/ld-arm/farcall-mix2.d
+a90dede13396e671d72c9d9fa580deeb  ld/testsuite/ld-arm/farcall-mix2.s
+8264d6b2f5abd02c1bc753d150d54fdc  ld/testsuite/ld-arm/farcall-mixed-app-v5.d
+cbcb7b567114381e559938f0020cfbac  ld/testsuite/ld-arm/farcall-mixed-app.d
+8655055d07990ff809303c4475e4a434  ld/testsuite/ld-arm/farcall-mixed-app.r
+c889e945f1869d0b5ed8ef8f51a83da2  ld/testsuite/ld-arm/farcall-mixed-app.s
+0a6c2d1e1c9c4b9b9e5ab3c83be5820e  ld/testsuite/ld-arm/farcall-mixed-app.sym
+3828f51461c36d5c623d2cb4c99ffb19  ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d
+90afc5525996d122c0b23a31f4f43096  ld/testsuite/ld-arm/farcall-mixed-lib.d
+38b363bcc83b5cef3b3f8f2a9a434185  ld/testsuite/ld-arm/farcall-mixed-lib.r
+b459c568af8f35839ef4077ae253512a  ld/testsuite/ld-arm/farcall-mixed-lib1.s
+686cbdd2bd1f1c30c9631b49c25ebf43  ld/testsuite/ld-arm/farcall-mixed-lib2.s
+12c6cdcef0c645a44f0f118ce884014a  ld/testsuite/ld-arm/farcall-section.d
+3c4d686c3c049de14838a526694239a1  ld/testsuite/ld-arm/farcall-section.s
+be48864e107495efc288f0640e224e3b  ld/testsuite/ld-arm/farcall-thumb-arm-blx-pic-veneer.d
+e09e2081dad65507e45d9528b05d6954  ld/testsuite/ld-arm/farcall-thumb-arm-blx.d
+0dc2d82344eaac7fec38a680a346f5df  ld/testsuite/ld-arm/farcall-thumb-arm-pic-veneer.d
+cec9550efcffd7c281d7370ee105f3a5  ld/testsuite/ld-arm/farcall-thumb-arm-short.d
+60c1e55d3ce000d9efab15dad7d9c387  ld/testsuite/ld-arm/farcall-thumb-arm-short.s
+d3b1918fe27953b249ca9e60b9a3ac23  ld/testsuite/ld-arm/farcall-thumb-arm.d
+938e05203cf88a8f3d61328da7f40b6f  ld/testsuite/ld-arm/farcall-thumb-arm.s
+06fb862ae70622ddd9eae326873a6ee6  ld/testsuite/ld-arm/farcall-thumb-thumb-blx-pic-veneer.d
+389328084a5f337f3e8a4a519c58f0ca  ld/testsuite/ld-arm/farcall-thumb-thumb-blx.d
+cea8612792533d221576548b5aa3d717  ld/testsuite/ld-arm/farcall-thumb-thumb-m-pic-veneer.d
+22a1e68933b8eec505a19b19d88950f5  ld/testsuite/ld-arm/farcall-thumb-thumb-m.d
+62776a7479e8115771ae878aaa1aa860  ld/testsuite/ld-arm/farcall-thumb-thumb-pic-veneer.d
+9a04dc62282034e81d8ab40d6fbbaba6  ld/testsuite/ld-arm/farcall-thumb-thumb.d
+1748da76b5b6995c5e5246beaf550c89  ld/testsuite/ld-arm/farcall-thumb-thumb.s
+5301164970cf5b3dfa9ebd66c1df0ae1  ld/testsuite/ld-arm/fix-arm1176-off.d
+9a783801d73e0f6e6756c32781e5a34c  ld/testsuite/ld-arm/fix-arm1176-on.d
+e0c37a2fccb6d4aeea259944dd0507e9  ld/testsuite/ld-arm/fix-arm1176.s
+8c02ba56f0c8f3588233afedca05a14f  ld/testsuite/ld-arm/gc-thumb-lib.s
+1c765050a71f5bf432d17b21156bfc2f  ld/testsuite/ld-arm/gc-thumb.d
+6ffb0ee4ab2aa38ab7bcb4c8c3be6c1e  ld/testsuite/ld-arm/gc-thumb.s
+bbcf9d024d1ee8f2d47abb91f42ba9e8  ld/testsuite/ld-arm/gc-unwind.d
+4bbe9404ed0e79bc734d7271a6635aad  ld/testsuite/ld-arm/gc-unwind.s
+fcd7254515aeb9da7a9cc34316757871  ld/testsuite/ld-arm/group-relocs-alu-bad.d
+76c773939a0441f44c6bc6dbc081815d  ld/testsuite/ld-arm/group-relocs-alu-bad.s
+00b5026469825891d84525fc4a61a2b4  ld/testsuite/ld-arm/group-relocs-ldc-bad.d
+bb9334a2ba26dcdce07f514ab138ae31  ld/testsuite/ld-arm/group-relocs-ldc-bad.s
+8ef803d391e047e300b8b10b635802b2  ld/testsuite/ld-arm/group-relocs-ldr-bad.d
+e96fa91669ff6054ee35c92122768211  ld/testsuite/ld-arm/group-relocs-ldr-bad.s
+28fa43dc8bcb87721103002b3f58673f  ld/testsuite/ld-arm/group-relocs-ldrs-bad.d
+9693aef33aa3f5ee3818dc2204efce12  ld/testsuite/ld-arm/group-relocs-ldrs-bad.s
+ee4ef770572061ed1059a6c047237cfe  ld/testsuite/ld-arm/group-relocs.d
+03e7c32feaf0a78ccde5ee5389ffffbd  ld/testsuite/ld-arm/group-relocs.s
+a6710411b398ee9595e1ccc85c5ca1da  ld/testsuite/ld-arm/ifunc-1.dd
+8df0f6d6af5f8ad2dd377e406417421c  ld/testsuite/ld-arm/ifunc-1.gd
+aab57a58ead091719749e52bc9b0288f  ld/testsuite/ld-arm/ifunc-1.rd
+0d4de4218e3ca91dc988e8e6b1e3ef20  ld/testsuite/ld-arm/ifunc-1.s
+baa3d9d8f85b5dbf35255f3f724ae6dd  ld/testsuite/ld-arm/ifunc-10.dd
+91f972e1fd57d1b97f1e99c455bf6679  ld/testsuite/ld-arm/ifunc-10.gd
+0494c06eeb2dac556c5f489089760eb8  ld/testsuite/ld-arm/ifunc-10.rd
+476d1fd97b14dfc080a90d893793b963  ld/testsuite/ld-arm/ifunc-10.s
+d3e16de902b7a18de2d6a590a5ee1a37  ld/testsuite/ld-arm/ifunc-11.dd
+b02712f5fc11e5b12588309428dbdb6f  ld/testsuite/ld-arm/ifunc-11.gd
+73211ce48cb17600d2cde81afbe05b59  ld/testsuite/ld-arm/ifunc-11.rd
+5189107445e618cf2d459e80c0f442c1  ld/testsuite/ld-arm/ifunc-11.s
+d3e16de902b7a18de2d6a590a5ee1a37  ld/testsuite/ld-arm/ifunc-12.dd
+58d38e6171844a187d90880c6efa541c  ld/testsuite/ld-arm/ifunc-12.gd
+c5111eeaec95bafdf37189a7edfbd675  ld/testsuite/ld-arm/ifunc-12.rd
+27565857472e6dfb6f5f0d1e0eb9e9ed  ld/testsuite/ld-arm/ifunc-12.s
+4c083076902479b27c6858c33f1015de  ld/testsuite/ld-arm/ifunc-13.dd
+874a3e56ccc429ffcb496aff0ece4869  ld/testsuite/ld-arm/ifunc-13.gd
+1f2a12faccac07fa4906d13ef08aa104  ld/testsuite/ld-arm/ifunc-13.rd
+177a35974fd1f166319b424bed1614da  ld/testsuite/ld-arm/ifunc-13.s
+bc3819b9826ba589526f8b2f19f27a07  ld/testsuite/ld-arm/ifunc-14.dd
+2c5d3d9cfe517b28252071905c6089ee  ld/testsuite/ld-arm/ifunc-14.gd
+be9dd722aa5e320899f179719896127e  ld/testsuite/ld-arm/ifunc-14.rd
+ece4f00edd71c05270d18832b1860afa  ld/testsuite/ld-arm/ifunc-14.s
+6db8d15204bc93456ae8e630c92c0be4  ld/testsuite/ld-arm/ifunc-15.dd
+2c5d3d9cfe517b28252071905c6089ee  ld/testsuite/ld-arm/ifunc-15.gd
+be9dd722aa5e320899f179719896127e  ld/testsuite/ld-arm/ifunc-15.rd
+3deab62a36968e37b8c2fa75f8ff1862  ld/testsuite/ld-arm/ifunc-15.s
+f9487bea5bfb6cd151ef0977ed0835f2  ld/testsuite/ld-arm/ifunc-16.dd
+2f2d8fb64449091818ddd90679ee69ad  ld/testsuite/ld-arm/ifunc-16.gd
+30eb42b09208249590397a29ede51b06  ld/testsuite/ld-arm/ifunc-16.rd
+1c0566c3d09e6f8041e6d59f9d8b62aa  ld/testsuite/ld-arm/ifunc-16.s
+3be7270b7005ce0311c6e3a1357637e3  ld/testsuite/ld-arm/ifunc-2.dd
+0a17cc422e125bab358d4cf57732391e  ld/testsuite/ld-arm/ifunc-2.gd
+9ab6e95fe2bf2c9c3ea298f8acd5b80b  ld/testsuite/ld-arm/ifunc-2.rd
+ffe494ca12faae825c0c61d3cb152ab2  ld/testsuite/ld-arm/ifunc-2.s
+061b687be09f2437889f98675a3234a2  ld/testsuite/ld-arm/ifunc-3.dd
+57d6988d83210075134bb6cfe13f32f9  ld/testsuite/ld-arm/ifunc-3.gd
+3af3806cb0fff3a84a1c5647d28f4b78  ld/testsuite/ld-arm/ifunc-3.rd
+422cfa798bbc5f772caf833c9e3d6c47  ld/testsuite/ld-arm/ifunc-3.s
+54955a7c2c7776a91bb8e359948f671e  ld/testsuite/ld-arm/ifunc-4.dd
+da59c76249f34e3da4c0c7fbddc7b271  ld/testsuite/ld-arm/ifunc-4.gd
+ab54c17ae17ff0a5d5e2a9665e45cb38  ld/testsuite/ld-arm/ifunc-4.rd
+1294b3289faaf0f4a2a491c0701146cd  ld/testsuite/ld-arm/ifunc-4.s
+5921f04a50e20e64d364b50dd3b39a83  ld/testsuite/ld-arm/ifunc-5.dd
+67d3344e3680aeecf7e07d9a241de09a  ld/testsuite/ld-arm/ifunc-5.gd
+aab57a58ead091719749e52bc9b0288f  ld/testsuite/ld-arm/ifunc-5.rd
+185ce84137e9ca77d9f7f71b210b3af5  ld/testsuite/ld-arm/ifunc-5.s
+b9553f59feafdc8563558df5aa7f25b1  ld/testsuite/ld-arm/ifunc-6.dd
+80c067d92a3d84f410aa67cda4706699  ld/testsuite/ld-arm/ifunc-6.gd
+058fcecb8256e8885de3e6f8d0e433d6  ld/testsuite/ld-arm/ifunc-6.rd
+7d16c8d83ce6606675deb0f74ecc1176  ld/testsuite/ld-arm/ifunc-6.s
+41c4a428caf69fb31ac3aeb1f5f01200  ld/testsuite/ld-arm/ifunc-7.dd
+509a265d4fe0d75472a1cdf9d96b69e1  ld/testsuite/ld-arm/ifunc-7.gd
+e7a45e746b52e017922d8165e5093419  ld/testsuite/ld-arm/ifunc-7.rd
+200eae4c0be923c69e3840550fbc6c13  ld/testsuite/ld-arm/ifunc-7.s
+8e1cc904545be437d63158cf44f97442  ld/testsuite/ld-arm/ifunc-8.dd
+ef63be7f0b9483d7cdf79f030ec57c77  ld/testsuite/ld-arm/ifunc-8.gd
+b5cf2a0d3f6dfc9c7abf18e554ee7f56  ld/testsuite/ld-arm/ifunc-8.rd
+d6a1afb52dcb2f346938856b0de9b605  ld/testsuite/ld-arm/ifunc-8.s
+6b9e131e4ad668348819d153a1a528f5  ld/testsuite/ld-arm/ifunc-9.dd
+814d8b7972b856563e6c355ab0356864  ld/testsuite/ld-arm/ifunc-9.gd
+477a9683c43e87d8cfa6d746ee74f25b  ld/testsuite/ld-arm/ifunc-9.rd
+62f7d0a0298f7800c2f674e364db1222  ld/testsuite/ld-arm/ifunc-9.s
+d597cf67123031a82eee9b1da9f869c1  ld/testsuite/ld-arm/ifunc-dynamic.ld
+101b4e65b6bc57296c808833b2ec7f82  ld/testsuite/ld-arm/ifunc-static.ld
+bb5e58349f11b25d307ad765a8a87a5b  ld/testsuite/ld-arm/jump-reloc-veneers-long.d
+5119a2190ddc593f4a8bf5950b7f6f0d  ld/testsuite/ld-arm/jump-reloc-veneers-short1.d
+7620283ae66569c459a5b78921e6a0b5  ld/testsuite/ld-arm/jump-reloc-veneers-short2.d
+c3a49e9c9c7b1a702e6ab9c83690636c  ld/testsuite/ld-arm/jump-reloc-veneers.s
+aaeacb4c7723efa0592090d8e28aa38b  ld/testsuite/ld-arm/jump19.d
+5fdb667b4eeed2b5a5e365f6157f7f53  ld/testsuite/ld-arm/jump19.s
+df7218912027fcf0e0f3f4faadca956e  ld/testsuite/ld-arm/mixed-app-v5.d
+8151f417c87740a964fe3c72a4045469  ld/testsuite/ld-arm/mixed-app.d
+aefaac7192d3e47c827da951f89d2bae  ld/testsuite/ld-arm/mixed-app.r
+7b3c6bc9827724b36f7df270af0ec4f5  ld/testsuite/ld-arm/mixed-app.s
+fc0e72844d705d53a0759effb558cc33  ld/testsuite/ld-arm/mixed-app.sym
+cf233c6eea8b0a23470d56a668f7c16f  ld/testsuite/ld-arm/mixed-lib.d
+5ca1ed7123c1056cecf2efef0273bab5  ld/testsuite/ld-arm/mixed-lib.r
+d01eec610829680bb4e52a46bed255bc  ld/testsuite/ld-arm/mixed-lib.s
+4b64293ae091d7fd6a1bf20ce11c3050  ld/testsuite/ld-arm/mixed-lib.sym
+20050f6942c1fc5bfdfdcd1b03dbfa8b  ld/testsuite/ld-arm/movw-merge.d
+b79bc8448d795012b328ada735e12bee  ld/testsuite/ld-arm/movw-merge.s
+53c96f044e7c3b502316c9f7f71e4bff  ld/testsuite/ld-arm/movw-shared-1.d
+0bb28944ba6ceccc86437d91e86f7e26  ld/testsuite/ld-arm/movw-shared-1.s
+44c6dee9296cd27e5715b8175d18a234  ld/testsuite/ld-arm/movw-shared-2.d
+0a3da298be90f8c762211f45c7b68480  ld/testsuite/ld-arm/movw-shared-2.s
+98075e266e56c001a5e76a193b4a5241  ld/testsuite/ld-arm/movw-shared-3.d
+b943013da10e5665a271e33dbb520a58  ld/testsuite/ld-arm/movw-shared-3.s
+1aeba25e0021ee087a2b313ad603c0d2  ld/testsuite/ld-arm/movw-shared-4.d
+26671559674ff919a52ed229aadcb0c5  ld/testsuite/ld-arm/movw-shared-4.s
+4e3e9b2de84e9e9e6e81f7a3b2343cf4  ld/testsuite/ld-arm/preempt-app.s
+b63a115e69a4b335d3861f55c8f19568  ld/testsuite/ld-arm/preempt-app.sym
+38f453d1542cd24062978039b7c38765  ld/testsuite/ld-arm/reloc-boundaries.d
+baff38a8a30acb8c72fd4e7acafc2360  ld/testsuite/ld-arm/reloc-boundaries.s
+0c32e8b3b51d8548cdf9c775ee4797ca  ld/testsuite/ld-arm/rodata-merge-map.ld
+1dfbf8ddc172e11c1d7dea588d0dcb28  ld/testsuite/ld-arm/rodata-merge-map.sym
+c1d6d8c92f02883092e4e8e85637ae8d  ld/testsuite/ld-arm/rodata-merge-map1.s
+4a214a61ded90df27f5185a5ccffc5bf  ld/testsuite/ld-arm/rodata-merge-map2.s
+bd696fad986a54fe1a3319d818b2ccf5  ld/testsuite/ld-arm/rodata-merge-map3.s
+ad5f1e26b66959f573e3bafa40758fd0  ld/testsuite/ld-arm/script-type.ld
+1d6496cff1fd71f774eb4cd7314249ac  ld/testsuite/ld-arm/script-type.s
+1037f3c433338a4151ab923181aa8cb3  ld/testsuite/ld-arm/script-type.sym
+4efee958adfc0ada1f44fe3586a51db0  ld/testsuite/ld-arm/symbian-seg1.d
+2408cc9c760cf2059e964dff9f670006  ld/testsuite/ld-arm/symbian-seg1.s
+73ca4e992f5c70fb94a749aa53dbfb0d  ld/testsuite/ld-arm/thumb-entry.d
+d4dd7676d18d8440e8dc78137276c2ba  ld/testsuite/ld-arm/thumb-entry.s
+b0c5e71c9db3f59925be321612cf76dd  ld/testsuite/ld-arm/thumb-rel32.d
+7f7c412a10dcd39feff7bfecbf3f875d  ld/testsuite/ld-arm/thumb-rel32.s
+c5f7da09b76dfa38dc2ec27d2c83aeb0  ld/testsuite/ld-arm/thumb1-bl.d
+03eb0ba2c48ae2667d7a6ca898ea3beb  ld/testsuite/ld-arm/thumb1-bl.s
+fa468fe009f1677ac87319602ae33155  ld/testsuite/ld-arm/thumb2-b-interwork.d
+ea814a50dd2b1f41b064d29387e4334f  ld/testsuite/ld-arm/thumb2-b-interwork.s
+84a965aac564bb8b945b73ea75d6be8f  ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad-noeabi.d
+aec7fd23eaaa64face2517c737c668a2  ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d
+892983309cd404fe52d55aa6979846fa  ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.s
+84a965aac564bb8b945b73ea75d6be8f  ld/testsuite/ld-arm/thumb2-bl-bad-noeabi.d
+22ec46a0ec640631ff7fa0088354ede6  ld/testsuite/ld-arm/thumb2-bl-bad.d
+ddfacb39f8a0959e97c0d694a9f8c315  ld/testsuite/ld-arm/thumb2-bl-bad.s
+e6163d43f2569f249ff2b44adb24cd88  ld/testsuite/ld-arm/thumb2-bl-blx-interwork.d
+f637f4d61a039a90caa5d1aff2d1976d  ld/testsuite/ld-arm/thumb2-bl-blx-interwork.s
+49fb48a76716c00fe6475c76c647c986  ld/testsuite/ld-arm/thumb2-bl-undefweak.d
+ba0a6eb7d3d568f8fe1d9293b5420aea  ld/testsuite/ld-arm/thumb2-bl-undefweak.s
+ea21f941569b3de3ec0437495eefc779  ld/testsuite/ld-arm/thumb2-bl-undefweak1.d
+98fad64aa58fb2a2eb75d6eb58917adb  ld/testsuite/ld-arm/thumb2-bl-undefweak1.s
+48deddf7c68baac25325992849fe5814  ld/testsuite/ld-arm/thumb2-bl.d
+9aba264c21b5441d2084b6e18b0aeaca  ld/testsuite/ld-arm/thumb2-bl.s
+f0cc25e5eb5c416520f7c835abd1f32d  ld/testsuite/ld-arm/tls-app.d
+d56bf5cfb58a3c8990894de5e0e0a5bc  ld/testsuite/ld-arm/tls-app.r
+bc4dc7515cb97050d78993226b2fedb8  ld/testsuite/ld-arm/tls-app.s
+e48dc88517162bab90d0825db6b298c8  ld/testsuite/ld-arm/tls-descrelax-be32.d
+e26ad13f6391672c2cf17129d383bc92  ld/testsuite/ld-arm/tls-descrelax-be32.s
+5240c9e8d92aab0f960a67e693ef800a  ld/testsuite/ld-arm/tls-descrelax-be8.d
+55af24eb165c542fdcb17f75e4c05af3  ld/testsuite/ld-arm/tls-descrelax-be8.s
+5240c9e8d92aab0f960a67e693ef800a  ld/testsuite/ld-arm/tls-descrelax-v7.d
+55af24eb165c542fdcb17f75e4c05af3  ld/testsuite/ld-arm/tls-descrelax-v7.s
+6374aa68ce57f26b79d5d1dfd141cbb0  ld/testsuite/ld-arm/tls-descrelax.d
+1a44773a87c9dd55baf70236b7f36bbf  ld/testsuite/ld-arm/tls-descrelax.s
+e9941c02499b4c5cee6880b1e04f3bd9  ld/testsuite/ld-arm/tls-descseq.d
+eea69985e64d1d536f68be2a4b0d2805  ld/testsuite/ld-arm/tls-descseq.r
+10beea88b85a552ae9434a9c77c6feb2  ld/testsuite/ld-arm/tls-descseq.s
+1cd746b24bf84348bebb78feecb93f9b  ld/testsuite/ld-arm/tls-gdesc-got.d
+4e23daed336ff2ba1865770eec0ef661  ld/testsuite/ld-arm/tls-gdesc-got.s
+e81c93c74608053df30afa8a74f43f8c  ld/testsuite/ld-arm/tls-gdesc-nlazy.g
+2192d8df89dfa1b5c93d4ad23a4e6586  ld/testsuite/ld-arm/tls-gdesc-nlazy.s
+9d0b90cbe9c9d3b2527695568edfe6c7  ld/testsuite/ld-arm/tls-gdesc.d
+bef27081b67787e0d42ae61f07b70849  ld/testsuite/ld-arm/tls-gdesc.r
+26f4d32f325082f087b8db9c219114c1  ld/testsuite/ld-arm/tls-gdesc.s
+65464899069a5af5f066f76718f13be6  ld/testsuite/ld-arm/tls-gdierelax.d
+cf62b197248ab9d838409e15d6ee2f30  ld/testsuite/ld-arm/tls-gdierelax.s
+ba4e19d10bceac591a7eeee7d11eacc6  ld/testsuite/ld-arm/tls-gdierelax2.d
+3b489e07b4e5e83033c20e1a75fb9370  ld/testsuite/ld-arm/tls-gdierelax2.s
+a18d98fc16de076317a8c50b7a75b8d5  ld/testsuite/ld-arm/tls-gdlerelax.d
+21143a3750a8bdadde7606fc95c357dc  ld/testsuite/ld-arm/tls-gdlerelax.s
+15871e53d47bb4d23b2b187ac59e3cfa  ld/testsuite/ld-arm/tls-lib-loc.d
+a944a12e800e231aa6cd77fe3275c993  ld/testsuite/ld-arm/tls-lib-loc.r
+4117623b509f123c9d526ac1afe9696f  ld/testsuite/ld-arm/tls-lib-loc.s
+3c149ee6b006a1d5257be8b708f437ea  ld/testsuite/ld-arm/tls-lib.d
+a3b71f6b593b007133a9d485c840d289  ld/testsuite/ld-arm/tls-lib.r
+b938da503cc6ccc3e40f0fd0651aeecf  ld/testsuite/ld-arm/tls-lib.s
+2481238e1b7c2aa834c7cc697cb58c39  ld/testsuite/ld-arm/tls-longplt-lib.d
+4968ac3a96a401547e95a5a259caeca8  ld/testsuite/ld-arm/tls-longplt-lib.s
+30b46a546a6bec9f6c8a88b66f6afe1c  ld/testsuite/ld-arm/tls-longplt.d
+72558e033ac20ff5f99511c5209bd01b  ld/testsuite/ld-arm/tls-longplt.s
+870dd314c9f6decb751fc33626b65ad0  ld/testsuite/ld-arm/tls-mixed.r
+8d8c37619852fada3b1c587ce2548776  ld/testsuite/ld-arm/tls-mixed.s
+181d153cf20c1c761349a3c0d340f0b3  ld/testsuite/ld-arm/tls-thumb1.d
+24eed11e2f5ae18adb26a781288e0783  ld/testsuite/ld-arm/tls-thumb1.s
+d6c5be1332f3c510766e9c2e60f8dccf  ld/testsuite/ld-arm/unresolved-1-dyn.d
+4d6f6ddc10a1b7d5c359a0ba2b1cb60e  ld/testsuite/ld-arm/unresolved-1.d
+814783ce65d5180dbc97af88aa6ef3c2  ld/testsuite/ld-arm/unresolved-1.s
+98155639616ff023b84fc16a39af4d68  ld/testsuite/ld-arm/unwind-1.d
+a08d4fbc9da6302600541688e261923b  ld/testsuite/ld-arm/unwind-1.s
+5d6f851cedb14ff9b6c9f767cb12111a  ld/testsuite/ld-arm/unwind-2.d
+138558e0008e2e92277834247000ecd7  ld/testsuite/ld-arm/unwind-2.s
+92a18d52f70c07434af5a6b84a535f43  ld/testsuite/ld-arm/unwind-3.d
+6802a9d6b277b3b6a1fdf5e742ac5ede  ld/testsuite/ld-arm/unwind-3.s
+4ae8b36ad194d5d581a09f41c0980fa4  ld/testsuite/ld-arm/unwind-4.d
+64efc6e0e87353b819851d03aa3d7b79  ld/testsuite/ld-arm/unwind-4.s
+9988e93507bcb10423cf8ecd2f1522cf  ld/testsuite/ld-arm/unwind-5.d
+d428b81188e7ad0fefeacd7cd445f162  ld/testsuite/ld-arm/unwind-5.s
+fb429475715715627aafc8a32e2320f1  ld/testsuite/ld-arm/use-thumb-lib.s
+04931de298951b43360f67418be6ac25  ld/testsuite/ld-arm/use-thumb-lib.sym
+d05cf65a4bf68d1269500f3c0a331561  ld/testsuite/ld-arm/vfp11-fix-none.d
+5fd7b4a3fe5eb83c567f709b955c8469  ld/testsuite/ld-arm/vfp11-fix-none.s
+077270d01ab3ff154291a1c6bd576600  ld/testsuite/ld-arm/vfp11-fix-scalar.d
+cfa0eb1c39adcd6d90a8a20419966b3b  ld/testsuite/ld-arm/vfp11-fix-scalar.s
+c49f3775666d12290e32b7ec2839acbc  ld/testsuite/ld-arm/vfp11-fix-vector.d
+a843e8a871249735f03a3e0e9ed4514a  ld/testsuite/ld-arm/vfp11-fix-vector.s
+a92f6f2d81ed7ababe27bb765db07789  ld/testsuite/ld-arm/vxworks1-lib.dd
+e79bf538427185b3ca75d00211102266  ld/testsuite/ld-arm/vxworks1-lib.nd
+ec444a82eab88a95636abf290c7ac6b7  ld/testsuite/ld-arm/vxworks1-lib.rd
+5f4070589555cbed355250f9deb0093f  ld/testsuite/ld-arm/vxworks1-lib.s
+6dbdc5d4346169b9a3af98707d77be72  ld/testsuite/ld-arm/vxworks1-lib.td
+57e13e14adacc62cab22da622bbcb01e  ld/testsuite/ld-arm/vxworks1-static.d
+6ab0beb8dd54b101c447b75ed090a3b2  ld/testsuite/ld-arm/vxworks1.dd
+ff6cb82bd3dda9cb4328b50f2d88614e  ld/testsuite/ld-arm/vxworks1.ld
+b2237cabfb8182cf4769e450cb67a95f  ld/testsuite/ld-arm/vxworks1.rd
+045aed3105ae55b645a8715f198c3860  ld/testsuite/ld-arm/vxworks1.s
+165ed1561458c0973255f985be876845  ld/testsuite/ld-arm/vxworks2-static.sd
+e191cf28ec5e3f69a0d89dd051130471  ld/testsuite/ld-arm/vxworks2.s
+7afb4e2fc8be35ad985dcb2e21b7cbef  ld/testsuite/ld-arm/vxworks2.sd
+0b6c7ae053acc7186dacf752dd1dc367  ld/testsuite/ld-auto-import/auto-import.exp
+870d0c9532413d40575e2e793eaf0f48  ld/testsuite/ld-auto-import/client.c
+bc025b399dc1bf0e5fe050e08b235dff  ld/testsuite/ld-auto-import/dll.c
+19339110affdee3fe8f8341e17989a1f  ld/testsuite/ld-bootstrap/bootstrap.exp
+4b9f7ea09166acbf0b5d72c88c5b3956  ld/testsuite/ld-cdtest/cdtest-bar.cc
+74c52f98695bf1f3c1a15e820e785464  ld/testsuite/ld-cdtest/cdtest-foo.cc
+0329b786063f247527a5f98c53a3ea66  ld/testsuite/ld-cdtest/cdtest-foo.h
+42bc325afd7f1f937f20faa53c9f1490  ld/testsuite/ld-cdtest/cdtest-main.cc
+cc8e7cf87148e04a2dd8f166c3f3cfaa  ld/testsuite/ld-cdtest/cdtest-nrv.dat
+cfb423f4424fe65c2fe45d99c49ff558  ld/testsuite/ld-cdtest/cdtest.dat
+c858af1140e2f6b05a7c89c75cb910c3  ld/testsuite/ld-cdtest/cdtest.exp
+328c5cac80b76bd422b0b77d5517d175  ld/testsuite/ld-checks/asm.s
+6903795a135ff658efd5d5e470d27451  ld/testsuite/ld-checks/checks.exp
+536a4d2e63692344109849b984f9da06  ld/testsuite/ld-checks/script
+028a3391ab77669d3571d4f6756e6e24  ld/testsuite/ld-cris/badgotr1.d
+330f51428dc34d1de15e854517e1db7e  ld/testsuite/ld-cris/comref1.s
+87ee1f75d0ce21f1354697084feafac9  ld/testsuite/ld-cris/cris.exp
+bd2d934b7debc19ede2cb90e437186e7  ld/testsuite/ld-cris/def2.d
+aa4bf9d2db3ecc2102472e46f0495504  ld/testsuite/ld-cris/def3.d
+0ecfc29d8b495c3dbade6c4ec9e66613  ld/testsuite/ld-cris/dso-1.s
+8f2d8ccdebc59ed5edeed9a38532f222  ld/testsuite/ld-cris/dso-1b.s
+f73d09ac7bd8fdc83362c30cec088e28  ld/testsuite/ld-cris/dso-2.s
+0963170a19c851b655a44c694bdc09d2  ld/testsuite/ld-cris/dso-3.s
+555778245510ec8cd1e0fe59059905d5  ld/testsuite/ld-cris/dso12-pltdis.d
+9b4414953bd917a57878326c0303aebb  ld/testsuite/ld-cris/dsofnf.s
+d7d2a11598bb675c9e852af7bf18f915  ld/testsuite/ld-cris/dsofnf2.s
+77b561688e2547f8d68e5cd9260c172e  ld/testsuite/ld-cris/dsov32-1.s
+b3d1c880e11c1d592e10fb5aedb655f5  ld/testsuite/ld-cris/dsov32-2.s
+434758c86f0a616b126186d73a6895f7  ld/testsuite/ld-cris/dsov32-3.s
+bba3177ca04b5c1a8fab36de034931e1  ld/testsuite/ld-cris/dsov32-4.s
+5e0cd72ef03ae66100a223c3ac1ff509  ld/testsuite/ld-cris/euwref1.s
+5918576f278343302911679d578b1f23  ld/testsuite/ld-cris/expalltst3
+1023eb64e4465edf00138aaf8d7280ca  ld/testsuite/ld-cris/expdref1.s
+c4996b40bccabdff3eb66c4ed510bd21  ld/testsuite/ld-cris/expdref2.s
+107917d9538f44957dfa2240c5ec058e  ld/testsuite/ld-cris/expdref3.s
+ed035711171f1f7d20f0d20828fe5e50  ld/testsuite/ld-cris/expdref4.s
+f66bb017aa48f260a1111b20ff3b2ed0  ld/testsuite/ld-cris/expdyn1.d
+b40cfb11612986fe52121f5141810bb3  ld/testsuite/ld-cris/expdyn1.s
+eec3aa679c6a20c50efb060106717e8f  ld/testsuite/ld-cris/expdyn1w.s
+a5cd0b3efb27eaa4893540fec9130357  ld/testsuite/ld-cris/expdyn2.d
+53bdb4432f1b5bf2af64a42900a59fbf  ld/testsuite/ld-cris/expdyn2.s
+b136e897cab9add18604fa48cd5e6462  ld/testsuite/ld-cris/expdyn3.d
+47647f67fceb63ae3022ecdd1272680f  ld/testsuite/ld-cris/expdyn4.d
+c59ef5bb4570c9ab1da147ed9c4e8a78  ld/testsuite/ld-cris/expdyn5.d
+531df4286483200742350c41e7fa25e2  ld/testsuite/ld-cris/expdyn6.d
+195c4ab4f311be98df9f88092201e9a7  ld/testsuite/ld-cris/expdyn7.d
+5e78e7ddf1b5aa917ea617a17235447f  ld/testsuite/ld-cris/globsym1ref.s
+7d59c2f5e9279b6ace5aa4a9b7ad4db5  ld/testsuite/ld-cris/globsymw1.s
+bbdcdd1bad770e5eb3cf979eda64fa56  ld/testsuite/ld-cris/globsymw2.s
+5c651c2af895d93abf210b3ab6171465  ld/testsuite/ld-cris/got7.s
+680f085d12e3a89850ae59aeea73309c  ld/testsuite/ld-cris/gotplt1.d
+c7799e2cd7102cb6c0575d9d85567503  ld/testsuite/ld-cris/gotplt2.d
+86bb0aa4b5c096a2ffdf95982b1fd2ea  ld/testsuite/ld-cris/gotplt3.d
+beb4c53051cda32749a8b4628fb19f16  ld/testsuite/ld-cris/gotrel1.s
+16ac0aa5032e8dc85780bb8073131840  ld/testsuite/ld-cris/gotrel2.s
+d39e08b23d313014d2f12c4d29cb7e8a  ld/testsuite/ld-cris/hiddef1.d
+2aeafbfc344edf57eff2027c2cfbe1d7  ld/testsuite/ld-cris/hiddef1.s
+0a2c0b67fcb79af873992b8aa6721e5b  ld/testsuite/ld-cris/hide1
+5ba5524fb07f1ca49873a2746cab764a  ld/testsuite/ld-cris/hidedsofns2468
+dcfc7b3526cca37684a42864dee9ed18  ld/testsuite/ld-cris/hidrefgotplt1.s
+fb1117b690962188968b5f2eb57211b8  ld/testsuite/ld-cris/init.s
+d0a2619e753e772735ce264e008ae124  ld/testsuite/ld-cris/ldsym1.d
+1ed92df704f4d4b8981af6c0a96b6da9  ld/testsuite/ld-cris/libdso-1.d
+757a5599ed4e5b03bf2defff6d25cbb1  ld/testsuite/ld-cris/libdso-10.d
+49bd70b15a95ac22ab5b3d8cd6f660de  ld/testsuite/ld-cris/libdso-11.d
+4b4cb09269c192dda508bc10c140e903  ld/testsuite/ld-cris/libdso-12.d
+da70ad049e99c494df72e4635cfc5bc9  ld/testsuite/ld-cris/libdso-12b.d
+e896fe8c9f77152e2e3e0a1d5a1ed4aa  ld/testsuite/ld-cris/libdso-12c.d
+5dc6af549ead00e0438dffdb7081a7a7  ld/testsuite/ld-cris/libdso-13.d
+00e56354e0d53d7c1aedc4f0f31d851d  ld/testsuite/ld-cris/libdso-13b.d
+a8c3eedaaf75d72b3d2f58fa1e737ef8  ld/testsuite/ld-cris/libdso-14.d
+11740ef0d10f19c9cf5e51f5f38c889c  ld/testsuite/ld-cris/libdso-15.d
+e7dff018a7d4e890e31c9b048c280178  ld/testsuite/ld-cris/libdso-15b.d
+08d349d68dae38f19732600cb6f2c92c  ld/testsuite/ld-cris/libdso-1b.d
+1d92d10ce3151f36e6b0ffc0eeab1e11  ld/testsuite/ld-cris/libdso-1c.d
+0aff47ebdec98ce75841046c25913506  ld/testsuite/ld-cris/libdso-1d.d
+9b34e20b935565486f8345974db5db02  ld/testsuite/ld-cris/libdso-2.d
+aab518362b600fa763c58722941fa94e  ld/testsuite/ld-cris/libdso-3.d
+3c92543c2f334c154ac36ccf470b0ef1  ld/testsuite/ld-cris/libdso-4.d
+592765f9d065627f0d3b5791347a54f0  ld/testsuite/ld-cris/locref1.d
+390593b2a658117399e7dbea69f03f64  ld/testsuite/ld-cris/locref1.s
+7814db4a10eb8a2c258605bdf2795e27  ld/testsuite/ld-cris/locref2.d
+fc2217195f7483a3ca55f8e9c1b05ee0  ld/testsuite/ld-cris/locref2.s
+689a0e95a0903b7673ee4db103ac323f  ld/testsuite/ld-cris/move-1.s
+bc987ce36b491f13c24922047c76a1a3  ld/testsuite/ld-cris/nodyn4.d
+938de1a906afab6b795f7c4b709adc72  ld/testsuite/ld-cris/nodyn5.d
+7713000ae79494a9864d233f100b51d8  ld/testsuite/ld-cris/noglob1.d
+a4f4d34c69e2ee06e8e6cd8f6d564f9c  ld/testsuite/ld-cris/noglob1.s
+8aa847fbe970d2b7c0eb26e36c0cac6f  ld/testsuite/ld-cris/noov.d
+fb7be150fec11a8e315c5a9e92434af9  ld/testsuite/ld-cris/noov.s
+b35b21ec86ab9f821fae71a3888db73b  ld/testsuite/ld-cris/pcrelcp-1.d
+f05b5e947853c848ce3b16ea72f89956  ld/testsuite/ld-cris/pcrelcp-1.s
+60783e487d9ed3277baed67d9a3ff8a2  ld/testsuite/ld-cris/pic-gc-72.d
+2e9ff32adf3155417cb25ee10251e6ec  ld/testsuite/ld-cris/pic-gc-72.s
+15f4451f37cab28561dc61aca124ee3b  ld/testsuite/ld-cris/pic-gc-73.d
+3096bcd8f2a8aac9637f270fcc05ea83  ld/testsuite/ld-cris/pic-gc-73.s
+30b9687806ce0305c161bb5c7128bd48  ld/testsuite/ld-cris/pv32-1.d
+151fbc0352fdf4668c9973dd14737265  ld/testsuite/ld-cris/pv32.s
+e589a68be11f502a3cf9e1d56fc8bca2  ld/testsuite/ld-cris/stabs1.s
+393141b1e937eeaf51caf8f49c50c3a8  ld/testsuite/ld-cris/start1.s
+302d5ad7fcd24be5673cddacba2f5303  ld/testsuite/ld-cris/tls-commx.s
+64cec56cb5f36b713d11787bae5d2a48  ld/testsuite/ld-cris/tls-dso-dtpoffd2.d
+33be652cd4e71798bf35fc31a113a311  ld/testsuite/ld-cris/tls-dso-dtpoffd4.d
+f500c9e0c1fc83ca25df07e515eca113  ld/testsuite/ld-cris/tls-dso-x1x2-1.d
+dc6a7771a81b22e57b5cc2723dd73819  ld/testsuite/ld-cris/tls-dso-xz-1.d
+d812a514a905d85452cb5d34e99c0b69  ld/testsuite/ld-cris/tls-dtpoffdx.s
+3da8008017f62a902040791e3996d1e3  ld/testsuite/ld-cris/tls-dtprelm.s
+da2557694d5684950af27d35ac4183a8  ld/testsuite/ld-cris/tls-e-20.d
+6ff1dec1d7491654e5dde42cbca47d3d  ld/testsuite/ld-cris/tls-e-20a.d
+550a13c4e70ae123db6f471fbcb96ca1  ld/testsuite/ld-cris/tls-e-21.d
+23f2ffdceafd751d6db07fda526ef9a4  ld/testsuite/ld-cris/tls-e-22.d
+5699e4ea4ad88563da8ae26484bd289e  ld/testsuite/ld-cris/tls-e-23.d
+45680291556e5a4ba2313535a7d73029  ld/testsuite/ld-cris/tls-e-66.d
+f8a9f502d5519161ef4d2ee8ab111e17  ld/testsuite/ld-cris/tls-e-80.d
+20471f1fcc2d0ae22084287775c19148  ld/testsuite/ld-cris/tls-e-dtpoffd1.d
+bfe76a492985c63a7ab23578af135953  ld/testsuite/ld-cris/tls-e-dtpoffd3.d
+7d282e67cadfe47360fd57b5f93b84c4  ld/testsuite/ld-cris/tls-e-tpoffcomm1.d
+50342aefaed14ebfd9238897c30e7168  ld/testsuite/ld-cris/tls-e-tpoffcomm1.s
+d25fd14c85c538cf35c5ff8f326d580f  ld/testsuite/ld-cris/tls-err-20x.d
+fd84a9d934bc33bf2a0899abb35119ea  ld/testsuite/ld-cris/tls-err-24.d
+ac2f392c56e121a2992568a8ec5685b9  ld/testsuite/ld-cris/tls-err-25.d
+249ae728a964f72799d794decaf0f97e  ld/testsuite/ld-cris/tls-err-26.d
+2000384372d793465e8407a01dede5f1  ld/testsuite/ld-cris/tls-err-27.d
+e75648da1cb679edcd6097b483c69f38  ld/testsuite/ld-cris/tls-err-28.d
+40aba2abf4871c67fe605c2e3f524f6b  ld/testsuite/ld-cris/tls-err-29.d
+0a6bdf8b30dc849717d88df3d2285ea5  ld/testsuite/ld-cris/tls-err-31.d
+cc6455910643b8309875795ef56a889f  ld/testsuite/ld-cris/tls-err-33.d
+82a5120fd71f8d7f0e55082587f6ba46  ld/testsuite/ld-cris/tls-err-35.d
+cb48040bea3a21299a82197556b490eb  ld/testsuite/ld-cris/tls-err-37.d
+a23c3ae051822709a0240ef9dd6e4bae  ld/testsuite/ld-cris/tls-err-39.d
+ea9218010773966f0e2e804756f2727e  ld/testsuite/ld-cris/tls-err-40.d
+8e04344e983d9443faa4f128ac989355  ld/testsuite/ld-cris/tls-err-41.d
+8feda78e2647cc3ad4e72bc5401e251e  ld/testsuite/ld-cris/tls-err-43.d
+7669ac8d48e9a4647a9bd55efc25fa8e  ld/testsuite/ld-cris/tls-err-44.d
+7407258e4f28144cc60d17ca52b18568  ld/testsuite/ld-cris/tls-err-45.d
+a900fae48f50140f33938acc5d2a8098  ld/testsuite/ld-cris/tls-err-47.d
+7fb36c6ab26bc63467d44558268235b9  ld/testsuite/ld-cris/tls-err-48.d
+a845720bddc125b9d3b668ef7d6e0662  ld/testsuite/ld-cris/tls-err-49.d
+9925f0c8c091f67358d5df5ccaecc3a0  ld/testsuite/ld-cris/tls-err-51.d
+efbc061f20d37c11c641f7b5a9f469bf  ld/testsuite/ld-cris/tls-err-52.d
+1ae5a636fd8f939babf5e4791a634ea0  ld/testsuite/ld-cris/tls-err-53.d
+d1e2c235bd6da8173eca1754c937cfa8  ld/testsuite/ld-cris/tls-err-55.d
+d94645c2ec7630ea559ffdfb83353bfb  ld/testsuite/ld-cris/tls-err-55.s
+6d9956249704da51d6f7bb503173e034  ld/testsuite/ld-cris/tls-err-56.d
+e886bfad99234c127ce82d391daac54c  ld/testsuite/ld-cris/tls-err-56.s
+cd50a67b19a87416f40193b60c8c8825  ld/testsuite/ld-cris/tls-err-62.d
+9cea49f0088bd8d2226d69c83c8172d4  ld/testsuite/ld-cris/tls-err-62.s
+b9f4c772858366872f8725bab1f38a94  ld/testsuite/ld-cris/tls-err-65.d
+df2f4c172fbf7f7cb669fe49f1ccceee  ld/testsuite/ld-cris/tls-err-67.d
+2b7b5d592cce606b75e3080ce6aef07c  ld/testsuite/ld-cris/tls-err-77.d
+20655696d21d18bef060b7bd00099498  ld/testsuite/ld-cris/tls-gc-68.d
+80929f16eabf0d775b863ef38ba1b236  ld/testsuite/ld-cris/tls-gc-69.d
+23457c141d1f55486946097916b66566  ld/testsuite/ld-cris/tls-gc-70.d
+5dfc1223fc31c9204e1dfc27bbdb86e7  ld/testsuite/ld-cris/tls-gc-71.d
+1d334e4fd0ce9bb55b12f88888b5a502  ld/testsuite/ld-cris/tls-gc-71.s
+43a06d9019d1442de0ecbaa62c2eefa1  ld/testsuite/ld-cris/tls-gc-75.d
+4d0e9b1919f2a65d32cf9f8fa23d4069  ld/testsuite/ld-cris/tls-gc-76.d
+77931d8d14cb883d864cf6f6eeb28aeb  ld/testsuite/ld-cris/tls-gc-76.s
+9ffeef549454abf1fc505765aef024ef  ld/testsuite/ld-cris/tls-gc-79.d
+9dbcc4e2aa2a2bfadcc47e3aabb4821d  ld/testsuite/ld-cris/tls-gd-1.d
+a2271e5313c908cec57856570e5ce4ec  ld/testsuite/ld-cris/tls-gd-1.s
+bcc014751d82a34435b277d6d103e0d1  ld/testsuite/ld-cris/tls-gd-1h.d
+013ab22b01c3a2e7addabc40ccfdd635  ld/testsuite/ld-cris/tls-gd-2.d
+0928af50e393da67c7675370e241fd4b  ld/testsuite/ld-cris/tls-gd-2.s
+2f488f3319797e402be4a9e9d5770e17  ld/testsuite/ld-cris/tls-gd-2h.d
+5aef151f40a450075aac047e3c9b2a25  ld/testsuite/ld-cris/tls-gd-3.d
+858c4140c6d2cde73e0219c69448aafb  ld/testsuite/ld-cris/tls-gd-3.s
+82ba41c6703cd9b4800d512ac9c0b348  ld/testsuite/ld-cris/tls-gd-3h.d
+cb0345dba3852c34c011ac9b6da4f6b2  ld/testsuite/ld-cris/tls-gdgotrelm.s
+3db5f93b09db85fabad8b000e3748640  ld/testsuite/ld-cris/tls-global-74.d
+6518ab26a2deb12bbb04f8289b9c24a4  ld/testsuite/ld-cris/tls-gottprelm.s
+f2bf540024ba0fe56c607163131bc430  ld/testsuite/ld-cris/tls-hx.s
+668cd5cd04546080138484945ce7cecf  ld/testsuite/ld-cris/tls-hx1x2.s
+adf684bb117f6d02cdb37445d5f7f232  ld/testsuite/ld-cris/tls-ie-10.d
+e207125a60e56c2e4c8101e668efe438  ld/testsuite/ld-cris/tls-ie-10.s
+e63067ed8857e6876262122ddc1d10cd  ld/testsuite/ld-cris/tls-ie-11.d
+ccc553a960af1b2e18aa479f63b11980  ld/testsuite/ld-cris/tls-ie-11.s
+e4e75df63a89532bfde872582fd69378  ld/testsuite/ld-cris/tls-ie-78.d
+db1276dec83b53fda274ef3fd7d6e91f  ld/testsuite/ld-cris/tls-ie-8.d
+ad0737dc62f589dcdcd74c47eee58e47  ld/testsuite/ld-cris/tls-ie-8.s
+fc54d68c890df7735b5e1e8c4990fd0b  ld/testsuite/ld-cris/tls-ie-8e.s
+0583bc0aaf5bb2d6824ca8b08e83471d  ld/testsuite/ld-cris/tls-ie-8e1.d
+26540a7b797011e40c4be2e7e37a1b4b  ld/testsuite/ld-cris/tls-ie-9.d
+c25a5e09a76b70b58e92c63f7d752a29  ld/testsuite/ld-cris/tls-ie-9.s
+f1a3d405e57145ffb9e5efa444f4d490  ld/testsuite/ld-cris/tls-js1.d
+098d95ca99ad85464ddbbf22aac5245f  ld/testsuite/ld-cris/tls-ld-4.d
+6d1a352e54fc0c6b169cc21bb0772013  ld/testsuite/ld-cris/tls-ld-4.s
+f0b3914545cae5bbad6b39b763369725  ld/testsuite/ld-cris/tls-ld-5.d
+6bced6cf5e82a90f165749c584a55261  ld/testsuite/ld-cris/tls-ld-5.s
+4320d87e90254c722a99c3c898b2cac1  ld/testsuite/ld-cris/tls-ld-6.d
+7e58dc96f6a97a2274d7c716bf7c15e7  ld/testsuite/ld-cris/tls-ld-6.s
+530cb9100fc390888b5b76d08480a5f0  ld/testsuite/ld-cris/tls-ld-7.d
+894b89a4cffadd26d735eaa3366bd014  ld/testsuite/ld-cris/tls-ld-7.s
+4f58d5b9672cebff975bed7a0c21dc8e  ld/testsuite/ld-cris/tls-ldgd-14.d
+679fc1b710b09d032741fd6731445578  ld/testsuite/ld-cris/tls-ldgd-14.s
+96ce57b0500c9cbe580671d5cfe04dae  ld/testsuite/ld-cris/tls-ldgd-15.d
+9797d6ca1f85e6324277c45b4a58601d  ld/testsuite/ld-cris/tls-ldgd-15.s
+d973bab15935e4e25edced51c1f5a01f  ld/testsuite/ld-cris/tls-ldgde-14.d
+0cd1e25768b29a2a5747b0bb6cad0651  ld/testsuite/ld-cris/tls-ldgde-15.d
+3fa67c64792bec501fb1db6e84bd34e1  ld/testsuite/ld-cris/tls-ldgdex-14.d
+0e7a22ba54362bde08475773967bb6a6  ld/testsuite/ld-cris/tls-ldgdex-15.d
+72f8b3d05ca40293b779dedb62650d95  ld/testsuite/ld-cris/tls-ldgdx-14.d
+0c27b3f4594dc269931e211405d20e35  ld/testsuite/ld-cris/tls-ldgdx-15.d
+d88ce0a5efe8a0b8cfe57e055411488c  ld/testsuite/ld-cris/tls-le-12.d
+4640724276d2f40c90d12dffdc45ddd9  ld/testsuite/ld-cris/tls-le-12.s
+9972aa58ba49c913b16b5edde9b55dc0  ld/testsuite/ld-cris/tls-le-12s.d
+c1560db52d7629b28cacb1185f5a2711  ld/testsuite/ld-cris/tls-le-12s.s
+def01c8bde71ee583cba402a7a0508c9  ld/testsuite/ld-cris/tls-le-13.d
+d2772b6bc8dc511b37e72de179c8b901  ld/testsuite/ld-cris/tls-le-13.s
+1b1dece4a94a821d039c77258129116f  ld/testsuite/ld-cris/tls-le-13s.d
+b48f5cda2e4bc1a02b0c0ec83363bef6  ld/testsuite/ld-cris/tls-le-13s.s
+cfd5ca14d3b9c67630913f6f556f6e01  ld/testsuite/ld-cris/tls-legd-16.d
+924ef2d81181b9a2870dd90a113a9723  ld/testsuite/ld-cris/tls-legd-16.s
+2691dca3d6824a6b26fd7722f8ee4740  ld/testsuite/ld-cris/tls-legd-17.d
+1b1167930e705405da3c2773e86dede1  ld/testsuite/ld-cris/tls-legdx-16.d
+7371c767359bead9ea2a9916193d8750  ld/testsuite/ld-cris/tls-legdx-17.d
+79d00e807ecfa98de4d7fe40d03a6925  ld/testsuite/ld-cris/tls-leie-18.d
+14265ec140d4a3e86f2ac5ff3c9d401e  ld/testsuite/ld-cris/tls-leie-19.d
+3b30fa40c56ef891e60237ed38036a76  ld/testsuite/ld-cris/tls-leie-19.s
+74d9462640882b9e83c1056cc84edfa5  ld/testsuite/ld-cris/tls-local-54.d
+0fb2c91adbdcb3206ae06870de126ede  ld/testsuite/ld-cris/tls-local-54.s
+27ccd8d59b26dff43911763c80597c65  ld/testsuite/ld-cris/tls-local-57.d
+7357194b45b00da3f4a3368f07173709  ld/testsuite/ld-cris/tls-local-57.s
+d5dd9368c65533e2ee958588cf4310e2  ld/testsuite/ld-cris/tls-local-58.d
+fc4152ffcff2e383c0c9423036a9ebdd  ld/testsuite/ld-cris/tls-local-58.s
+578ae53d358085af655d374f1b423f7d  ld/testsuite/ld-cris/tls-local-59.d
+43fae325509d5bb8b3bde1f46d313005  ld/testsuite/ld-cris/tls-local-59.s
+b1f59664795255cb3e72cdac9091703c  ld/testsuite/ld-cris/tls-local-60.d
+0d00ea75131fd21f76af0443680d851d  ld/testsuite/ld-cris/tls-local-61.d
+5377cb16b287b10ca274e216e76ee017  ld/testsuite/ld-cris/tls-local-63.d
+e3c2d64ec9c60dfc5e1f4380c2e643ba  ld/testsuite/ld-cris/tls-local-64.d
+5fe92b73df12285d048b84b49011ef26  ld/testsuite/ld-cris/tls-ok-30.d
+5266df748d476261b3f50375e9deb7f3  ld/testsuite/ld-cris/tls-ok-32.d
+9d01f78de61c3ef6018352be477b0908  ld/testsuite/ld-cris/tls-ok-34.d
+703573ed2b2da6077075e1337da0b36e  ld/testsuite/ld-cris/tls-ok-36.d
+a186fd4a36652812640d662133184bc2  ld/testsuite/ld-cris/tls-tbss64.s
+f98cb18cd863da89209e9351870421da  ld/testsuite/ld-cris/tls-tprelm.s
+229a5d7ef3ce59d55cd458cdd9bc7382  ld/testsuite/ld-cris/tls-und-38.d
+7f27376ee3b1492321f4129cc0e3b3c6  ld/testsuite/ld-cris/tls-und-42.d
+a27afaec9ec9e1f38ca71a877ba2ab2a  ld/testsuite/ld-cris/tls-und-46.d
+87c6780c84b2dc48348b4f84c4fcdab5  ld/testsuite/ld-cris/tls-und-50.d
+310058ccfc4424f5887c50144e3aff6e  ld/testsuite/ld-cris/tls-x.s
+b7b2951b01f82a9fa108819ab29d15bd  ld/testsuite/ld-cris/tls-x1x2.s
+20188daeeb47edbf2abda804d72c772d  ld/testsuite/ld-cris/tls-z.s
+e10d3dcc56b936d6f1b62a178b0b3222  ld/testsuite/ld-cris/tls128.s
+9b5f4ba7330d0b65a374ce4ef37f5852  ld/testsuite/ld-cris/tls128g.s
+0397aade193de820b7a3d2012e71655e  ld/testsuite/ld-cris/undef1.d
+c58ca745186c4bece924a88f288b02ec  ld/testsuite/ld-cris/undef2.d
+5fd3e1533841a223eaf9fbd36b233b79  ld/testsuite/ld-cris/undef3.d
+2e48731f84bdc880610e6ca843b9d5b5  ld/testsuite/ld-cris/v10-v32.d
+4f95b9c42d7d9f9fbc0b62acc6b5883b  ld/testsuite/ld-cris/v10-va.d
+af80ea10a64ea1db2e3e175cc54f4e9c  ld/testsuite/ld-cris/v32-ba-1.d
+6fe1978274028b15612b8c29e55094e1  ld/testsuite/ld-cris/v32-ba-1.s
+aacc56a9cf2df86d1248ccc8017e9047  ld/testsuite/ld-cris/v32-bin-1.d
+6e1f1a177b0ddee8ddefc3d445d9c7d8  ld/testsuite/ld-cris/v32-bin-1.s
+4dd961002adb00a33b78ea6803442126  ld/testsuite/ld-cris/v32-v10.d
+752f3b5be6be178266b8316a9a88a82d  ld/testsuite/ld-cris/v32-va.d
+ba34a95bf2c66e449608ee6617642633  ld/testsuite/ld-cris/va-v10.d
+48af179aaf1af4fec96516a80cc9c6cf  ld/testsuite/ld-cris/va-v32.d
+b9288b16a367283e15a37e333fd97297  ld/testsuite/ld-cris/warn1.d
+d45bec3bf85d2aaf4821b0ffdccc0d12  ld/testsuite/ld-cris/warn2.d
+3a166d60129bbd19c207498e3844c09f  ld/testsuite/ld-cris/warn3.d
+5df413483daafe5459511b97199f9511  ld/testsuite/ld-cris/warn4.d
+15419c07897ceba2e7f39ea0f173b12e  ld/testsuite/ld-cris/weakhid.s
+47a48ebba48a5cb8d360306f283a9de4  ld/testsuite/ld-cris/weakhiddso.d
+0327bbd232bb585aea5c5461b9ffae26  ld/testsuite/ld-cris/weakref1.d
+98dd707805424be642ace5cb35055b58  ld/testsuite/ld-cris/weakref2.d
+c33fb1a1e0bd8782eadd7ee557666f5d  ld/testsuite/ld-cris/weakref3.d
+0d1059f8894c2b812e0bb921a5b8ffb0  ld/testsuite/ld-cris/weakref4.d
+6886655aeb07410f4a344e7cf7c65447  ld/testsuite/ld-crx/crx.exp
+158760ac80129c2252f3042fef109f0c  ld/testsuite/ld-crx/crx.ld
+e53f074773b19a4eccc59cb8a6a1d047  ld/testsuite/ld-crx/reloc-abs32.d
+af866ead95f29dac5b4f5c611888f53d  ld/testsuite/ld-crx/reloc-abs32.s
+07ec95f0bb08e6c659d2057d79dcdeb6  ld/testsuite/ld-crx/reloc-imm16.d
+0084b8ad872c12e2a7be00eb8f98e91d  ld/testsuite/ld-crx/reloc-imm16.s
+a5c9c0b54cad1488e914499c55278eb7  ld/testsuite/ld-crx/reloc-imm32.d
+1922ef2f5dc94a1fa330ac39838d1344  ld/testsuite/ld-crx/reloc-imm32.s
+94eba9a936aa6c422ad4e1145ae6ba30  ld/testsuite/ld-crx/reloc-num16.d
+182190b715b027b5a6c1d540c2f30f5c  ld/testsuite/ld-crx/reloc-num16.s
+a3c38f5bef3c4f3393d89706ee257d8e  ld/testsuite/ld-crx/reloc-num32.d
+3b171daa66954b0e4275a2553b3f7dcb  ld/testsuite/ld-crx/reloc-num32.s
+06ecce975fa9296eefa5ae4808018565  ld/testsuite/ld-crx/reloc-num8.d
+e0d78086742196af5f70b2913df4ab9a  ld/testsuite/ld-crx/reloc-num8.s
+09c4cacdf1025cc747cc0f35d7b64572  ld/testsuite/ld-crx/reloc-regrel12.d
+e7856861e2f6965e4e5064f21c4174c5  ld/testsuite/ld-crx/reloc-regrel12.s
+77b86ca3fc51bee6fd5b373482720500  ld/testsuite/ld-crx/reloc-regrel22.d
+12321019a8582ea1cf50f6e3af92d803  ld/testsuite/ld-crx/reloc-regrel22.s
+5f5e518bb54cbdbd53ec30c650984a73  ld/testsuite/ld-crx/reloc-regrel28.d
+cb3159e28c00f922bb551d0ed9d3bde1  ld/testsuite/ld-crx/reloc-regrel28.s
+44b40e9c2c37bb33120070a689253204  ld/testsuite/ld-crx/reloc-regrel32.d
+6a88a24f0d02fbca35b2ce3298b7ac38  ld/testsuite/ld-crx/reloc-regrel32.s
+01f6f4551c686de2fb0d397e8a4e6bf4  ld/testsuite/ld-crx/reloc-rel16.d
+dbb4d600f3ba3c9f8dc5581043812869  ld/testsuite/ld-crx/reloc-rel16.s
+8b8b1af61b3d471ef8bcb8df5bbf4494  ld/testsuite/ld-crx/reloc-rel24.d
+70b11bcd4b6100b4b4f459fd6cf683da  ld/testsuite/ld-crx/reloc-rel24.s
+703d4e4e2ea36d634a0022cc44592335  ld/testsuite/ld-crx/reloc-rel32.d
+84ef401fcde006c9458e73efe2bdc3fe  ld/testsuite/ld-crx/reloc-rel32.s
+0bb2340f51e8e31790c044611073539d  ld/testsuite/ld-crx/reloc-rel4.d
+0474e638123f267f7c77bf7e6859e94f  ld/testsuite/ld-crx/reloc-rel4.s
+952af075711bf5c0bd635ce9720648cb  ld/testsuite/ld-crx/reloc-rel8-cmp.d
+d9692a48c3da7fe1f9e0454e2eaa3269  ld/testsuite/ld-crx/reloc-rel8-cmp.s
+2727f9d73da1e140e5d505f435359009  ld/testsuite/ld-crx/reloc-rel8.d
+817521c14f843019d77ce0d52fd53b5d  ld/testsuite/ld-crx/reloc-rel8.s
+94efa5919eebf89b70f9a718d325c3bd  ld/testsuite/ld-cygwin/exe-export.exp
+af0825aade69062e48c52ae8282d8834  ld/testsuite/ld-cygwin/testdll.c
+63d1aac1b038020ed973cfc29569732e  ld/testsuite/ld-cygwin/testdll.def
+db019a3fc1cb1f9f59a6edfb1f73e957  ld/testsuite/ld-cygwin/testexe.c
+5f86698b1509034bc4f87f7d258217e9  ld/testsuite/ld-cygwin/testexe.def
+996184474b07558d10f2d05d6a69b592  ld/testsuite/ld-d10v/d10v.exp
+b4ead20b861eba109050533ef40db394  ld/testsuite/ld-d10v/default_layout.d
+c59c68825ca903db1904078c8e77f033  ld/testsuite/ld-d10v/linktest-001.s
+260cb1183491105181eded4c34963a9f  ld/testsuite/ld-d10v/linktest-002.lt
+7232ced2d73d4bac32cf583a3d9d7a5a  ld/testsuite/ld-d10v/linktest-002.s
+de046023db57d12594a89878e1caa893  ld/testsuite/ld-d10v/regression-001.lt
+01ffcb3c21fda44963dfafbd75b79da2  ld/testsuite/ld-d10v/regression-001.s
+4cdae0fb3d013dbd49153b555db35e74  ld/testsuite/ld-d10v/reloc-001.d
+a9cbb2de1956f46bf23bdbf3a39fb6b2  ld/testsuite/ld-d10v/reloc-001.ld
+96aac4fa15afbb40824d52d7f616aed1  ld/testsuite/ld-d10v/reloc-001.s
+22382460f767a35f7e3ee3e29082eb14  ld/testsuite/ld-d10v/reloc-002.d
+dcb59cfd3bc1ddd9661c33cec7111e62  ld/testsuite/ld-d10v/reloc-002.ld
+0b5fffa79db80b241c0c58105932d9bb  ld/testsuite/ld-d10v/reloc-003.d
+3befa2048653d125ef17be9bcc94806b  ld/testsuite/ld-d10v/reloc-003.ld
+89b112cc2cd58ae58999a5a105c33f5b  ld/testsuite/ld-d10v/reloc-004.d
+bad4f70dce484b364577b7793db92505  ld/testsuite/ld-d10v/reloc-004.ld
+065a76f098ef26e7b2fe5f84a56f4193  ld/testsuite/ld-d10v/reloc-005.d
+5ff2e76a04204073ea7c50ee788a7034  ld/testsuite/ld-d10v/reloc-005.ld
+823a84ae7b851b134c9b94ab71d6f21a  ld/testsuite/ld-d10v/reloc-005.s
+46dbf37acbdf0eadb8cc31ac2d3034f1  ld/testsuite/ld-d10v/reloc-006.d
+52632233b997a5226faff15567653f35  ld/testsuite/ld-d10v/reloc-006.ld
+e1b026019516bd1813ea6b33b3035ac8  ld/testsuite/ld-d10v/reloc-007.d
+ae9e1f771120fc9bad087de039bd10ad  ld/testsuite/ld-d10v/reloc-007.ld
+aec120339e7ea93d7cba32b3be3c3899  ld/testsuite/ld-d10v/reloc-008.d
+c36d03bdbe812d34d81baa1df645be0f  ld/testsuite/ld-d10v/reloc-008.ld
+4074889b9455b4f68f6e5fc23f265b32  ld/testsuite/ld-d10v/reloc-009.d
+5357ca9e709865a49021a2ad944f735e  ld/testsuite/ld-d10v/reloc-009.ld
+778af85308c7cf5e618819f1089919bd  ld/testsuite/ld-d10v/reloc-009.s
+2a269a1b6b912fbc838d30338721c4ce  ld/testsuite/ld-d10v/reloc-010.d
+320d8cb2224a8c0d770c6c53fe56fa2a  ld/testsuite/ld-d10v/reloc-010.ld
+c0db32e1b6970df36a2e01fc22a687c8  ld/testsuite/ld-d10v/reloc-011.d
+e4281f7304f32d7f2e355b4acdfa0f11  ld/testsuite/ld-d10v/reloc-011.ld
+d41b0a45b441f5bf3249edf3b2ffba89  ld/testsuite/ld-d10v/reloc-012.d
+36e865b7fd1320f476f20033b26aa23c  ld/testsuite/ld-d10v/reloc-012.ld
+d1e67034df65b21f46e22414411a58bc  ld/testsuite/ld-d10v/reloc-013.d
+88128837f15e0d761f24263bf4edf04a  ld/testsuite/ld-d10v/reloc-013.ld
+4f315c84a8e4f35a0440568f2663eb87  ld/testsuite/ld-d10v/reloc-014.d
+f947210d3beb88287ce8b83f4ea0be06  ld/testsuite/ld-d10v/reloc-014.ld
+8ddc5315682698be2ec3a1c97299feac  ld/testsuite/ld-d10v/reloc-015.d
+12e0f6ef50e603dd29670a80de467f0d  ld/testsuite/ld-d10v/reloc-015.ld
+a07c508b520b6b9d14acc43aee99e066  ld/testsuite/ld-d10v/reloc-016.d
+24c58a8fa81d8b23eef3d2df94588713  ld/testsuite/ld-d10v/reloc-016.ld
+643376f9cf25b4ffa2a621b4ac850ff5  ld/testsuite/ld-d10v/simple.s
+d6e1861b929db9d7308a678c4f4f49a7  ld/testsuite/ld-discard/discard.exp
+74f98f91da03fdfbe4b598fa78509f21  ld/testsuite/ld-discard/discard.ld
+ad7a2ef376a2dbe50a1bbd332e0b351e  ld/testsuite/ld-discard/exit.s
+c45aefbefada85ceaa983f3a2b9f4096  ld/testsuite/ld-discard/extern.d
+7db75ecbbac3202bb8ac52c4f75c4f4d  ld/testsuite/ld-discard/extern.s
+db8d2d2a6b691737c9f546b83a907438  ld/testsuite/ld-discard/start.d
+859d4022d83abdfea3a6baa088067abd  ld/testsuite/ld-discard/start.s
+594c1c727bd7a02d324d651dcd0d85c9  ld/testsuite/ld-discard/static.d
+f7164cd0e6027fe322ff8cc52dfaed98  ld/testsuite/ld-discard/static.s
+289a67ba76925e77ad96a6353f218680  ld/testsuite/ld-discard/zero-range.d
+b3aacae2cdc875e2ed0d13a699e8e27f  ld/testsuite/ld-discard/zero-range.s
+d5a71e32cf583a65c3a8dca272678c04  ld/testsuite/ld-discard/zero-rel.d
+cdabdc56ea5e0ca66839a132e07d3f3f  ld/testsuite/ld-discard/zero-rel.s
+f76b8ca85a9264bd80251fa2d31f50ab  ld/testsuite/ld-elf/audit.exp
+d127dfb9d3bee4b01447fd7973244ac2  ld/testsuite/ld-elf/audit.rd
+5201888d2abb62612325556e633e001d  ld/testsuite/ld-elf/begin.c
+500602556f86e18553ceb755366463be  ld/testsuite/ld-elf/beginwarn.c
+5049b9807b5a7785f2482e385d7b668f  ld/testsuite/ld-elf/binutils.exp
+b2ad7b75694dfd051322ff022289bf11  ld/testsuite/ld-elf/comm1.c
+62a6c175439b573fa477ec9d02c926c0  ld/testsuite/ld-elf/commonpage1.d
+e8c77fb65c093cf6d134a26be7ccca0b  ld/testsuite/ld-elf/commonpage2.d
+effe3963d5b9a8ea4327d030aad908a9  ld/testsuite/ld-elf/compress.exp
+a01319306da910cb4d132877d84ae79a  ld/testsuite/ld-elf/compress1.s
+24e773742b2290d1dedd7d19dcdf0cf5  ld/testsuite/ld-elf/compress1a.d
+dcf933a6a39b4cf2e648408d13399f21  ld/testsuite/ld-elf/compress1b.d
+0eb33d24f26607d364dfce52b8f63f15  ld/testsuite/ld-elf/compress1c.d
+deaa743c21343d50005ce2368a63da9f  ld/testsuite/ld-elf/data1.c
+a89103ea5407b5013209fbcbec167652  ld/testsuite/ld-elf/data1.h
+92bc82dae4c7e3bcb8dc60d1fe19f914  ld/testsuite/ld-elf/del.cc
+95839eb1016346ee2559c3e5333d0fe3  ld/testsuite/ld-elf/depaudit.rd
+ee4280d9cc3ebd6a311813a827af1ab3  ld/testsuite/ld-elf/depaudit2.rd
+2346a5689cb09476d36961aaacb75bf6  ld/testsuite/ld-elf/discard.ld
+0aa8bc44a09aebea4521d19f6d677af3  ld/testsuite/ld-elf/discard1.d
+7276479d5b8d77364a20783c42127ba1  ld/testsuite/ld-elf/discard1.s
+5d9d3815f29613d5c4b4e3eec4b09d63  ld/testsuite/ld-elf/discard2.d
+050c530dc76004b149d0774320823d11  ld/testsuite/ld-elf/discard2.s
+241ee2db60ad7e0095c63dbcc15597cf  ld/testsuite/ld-elf/discard3.d
+3cc896db0a5c046306e8f59d6e338b61  ld/testsuite/ld-elf/dl1.c
+a55c99379e6cc8b409bf78abfd503b06  ld/testsuite/ld-elf/dl1.list
+d36f8f9425c4a8000ad9c4a97185aca5  ld/testsuite/ld-elf/dl1.out
+533e1f48c93d2fb02d9bd9e13e6c7b0d  ld/testsuite/ld-elf/dl1main.c
+f8635969b890926291bedaf59dfa6339  ld/testsuite/ld-elf/dl2.c
+3e3a30a7d2c4bc161dfbcabd0da3eddf  ld/testsuite/ld-elf/dl2.list
+1b6856433525ea3368fe34b038dac9e7  ld/testsuite/ld-elf/dl2a.list
+1e62995e8f12105c3d0644164029a52a  ld/testsuite/ld-elf/dl2a.out
+acec79ecf3be622edb219306d94e8d9e  ld/testsuite/ld-elf/dl2b.out
+34ec9767ef0c38cceec85498ae831565  ld/testsuite/ld-elf/dl2main.c
+d3ea46a01e213097cc0cdfe32b2e2b40  ld/testsuite/ld-elf/dl2xxx.c
+92b988475bdc3be9578c6763845493a9  ld/testsuite/ld-elf/dl2xxx.list
+ca356d17104d231717f47294765a3426  ld/testsuite/ld-elf/dl3.cc
+01a200fcbd530ec075bce1c4ed6dfb62  ld/testsuite/ld-elf/dl3.list
+d36f8f9425c4a8000ad9c4a97185aca5  ld/testsuite/ld-elf/dl3a.out
+f27833e18c477308ac846ff6d845c9ff  ld/testsuite/ld-elf/dl3b.out
+7e432ad95bb69e76cd8603cdeab45021  ld/testsuite/ld-elf/dl3header.h
+2b4c778842950d5668e79d84f7ff883e  ld/testsuite/ld-elf/dl3main.cc
+423147404239d19016eac8564a27dc64  ld/testsuite/ld-elf/dl4.c
+fa0611727f18b1ff9fddbe7223e534ba  ld/testsuite/ld-elf/dl4.list
+094e83b0e8a3bac549e59194f55b5747  ld/testsuite/ld-elf/dl4a.out
+cc0424b00e5ffac450f7ea94766f8f6b  ld/testsuite/ld-elf/dl4b.out
+aecc359e727f1b704b0c8ef5009f00c4  ld/testsuite/ld-elf/dl4main.c
+e8f2fdaed4cd6335fcd46c96509c0002  ld/testsuite/ld-elf/dl4xxx.c
+6a46a6e4b285e54db50cc2ca5034c64b  ld/testsuite/ld-elf/dl4xxx.list
+5086c214d0535229169bcfba11ea7354  ld/testsuite/ld-elf/dl5.cc
+32c0be4fb7f3030bf9c74c0a836d4f2e  ld/testsuite/ld-elf/dl5.out
+a4eca8bb3aa1f7e3c370f372e05c734b  ld/testsuite/ld-elf/dl6.c
+3710cccd088c153f04dd7c488c39fd72  ld/testsuite/ld-elf/dl6a.out
+9558d14ff0a86e0f246c0fcc5a42d572  ld/testsuite/ld-elf/dl6amain.c
+1bcbfa290fbebc90d1ef73c5cb502c35  ld/testsuite/ld-elf/dl6b.out
+bf078a4b794fc06301fe8be1d2f084c8  ld/testsuite/ld-elf/dl6bmain.c
+453f7a0d46db3f224fe0727d1c676272  ld/testsuite/ld-elf/dl6cmain.c
+70de1cbbabd01c363da28133752d0e2f  ld/testsuite/ld-elf/dl6dmain.c
+d7e6a283405222184227df7278927181  ld/testsuite/ld-elf/dummy.c
+9cc77b49f8fb5963d7f789a4d47d0127  ld/testsuite/ld-elf/dwarf.exp
+b7e6c2837b679948cb3f9c13b128ca7b  ld/testsuite/ld-elf/dwarf1.c
+e5c2a68d935b5a0f16a8862d9f8b1710  ld/testsuite/ld-elf/dwarf1.h
+d36f8f9425c4a8000ad9c4a97185aca5  ld/testsuite/ld-elf/dwarf1.out
+4453124c8ea473d5979542ecf254fc4c  ld/testsuite/ld-elf/dwarf1main.c
+7fde0888ca02f48d9564fb66438db1cb  ld/testsuite/ld-elf/dynamic1.d
+9527e1fa3e8f91ecd8d5763cf1b783bb  ld/testsuite/ld-elf/dynamic1.ld
+f13be5703a6443b8b437e8b19da77d90  ld/testsuite/ld-elf/dynamic1.s
+7cb82de908ccd7e34102a6f59bf6cf85  ld/testsuite/ld-elf/dynbss1.c
+b206cae2bd509b452dfa45efa2588c9a  ld/testsuite/ld-elf/dynsym1.d
+ff532fbbc995fb84bfa5f75487292d64  ld/testsuite/ld-elf/eh-frame-hdr.d
+1a78e931c5f561f9da30149889d4475d  ld/testsuite/ld-elf/eh-frame-hdr.s
+103ebd89774fd14b8d18184ecc16759a  ld/testsuite/ld-elf/eh-group.exp
+164c878d499cc8bbd09205f9d97e1201  ld/testsuite/ld-elf/eh-group1.s
+aaf2beebc700bda44248ece6cf722c87  ld/testsuite/ld-elf/eh-group2.s
+1cf82d74f5ee2530c06088223323c16f  ld/testsuite/ld-elf/eh1.d
+b5fd9f6ef9840069748fe7913c2cc775  ld/testsuite/ld-elf/eh1.s
+febb082ba0de2ef03a9e8320a6ff1651  ld/testsuite/ld-elf/eh1a.s
+8bb11f090c5268476f25fc5e46098cdd  ld/testsuite/ld-elf/eh2.d
+bc78ade1174bc87302d5ae6f3c9b04a4  ld/testsuite/ld-elf/eh2a.s
+ca3c2dc459e167d6c6a6714a0891589c  ld/testsuite/ld-elf/eh3.d
+601c783a8ec20e9f09a919e68b46827c  ld/testsuite/ld-elf/eh3.s
+f7edc6e0e0f66ffc923349b2a8c8a074  ld/testsuite/ld-elf/eh3a.s
+fcd105eeb574c28c886f5816b409c084  ld/testsuite/ld-elf/eh4.d
+f67e8b62d5d54fa2dc0b56021cd809d7  ld/testsuite/ld-elf/eh4.s
+f7edc6e0e0f66ffc923349b2a8c8a074  ld/testsuite/ld-elf/eh4a.s
+47cd5ff6c10d2faff913171db99bff3e  ld/testsuite/ld-elf/eh5.d
+5b52059e5372224dfa7a7f020b6e1f12  ld/testsuite/ld-elf/eh5.s
+4487cbe51165a079690c15647948b499  ld/testsuite/ld-elf/eh5a.s
+097b4882179741247a872e38c2d84818  ld/testsuite/ld-elf/eh5b.s
+a106c5d2246e737fba1638c6b9c601f9  ld/testsuite/ld-elf/eh6.d
+302f5f1ee4503ca80d2eaa839c11e690  ld/testsuite/ld-elf/eh6.s
+628cd6f3a9e8d1319d2761b536f0cb1c  ld/testsuite/ld-elf/elf.exp
+26b29b567247fd1f09aac7f76458d0ce  ld/testsuite/ld-elf/empty.d
+9882073b563bb0a8e90d2902ebe358d7  ld/testsuite/ld-elf/empty.s
+bb2c54879ba74bae7e28696fb6c69d46  ld/testsuite/ld-elf/empty2.d
+ee46964160f0308864b3c9f673805ae4  ld/testsuite/ld-elf/empty2.s
+76a20654ee65488dea99f04f2245411f  ld/testsuite/ld-elf/end.c
+09ad7a4b25e4d3a09e491665034b9e42  ld/testsuite/ld-elf/endhidden.c
+cd3620335344d83a9021beb69e1c5148  ld/testsuite/ld-elf/endprotected.c
+aed2239d5850bff270478a0044dc16d3  ld/testsuite/ld-elf/exclude.exp
+1cd4e62a9fc5452a45960a19f3e1f006  ld/testsuite/ld-elf/exclude1.s
+8226b1db9eb7e3f6257547fba8c4f6a2  ld/testsuite/ld-elf/exclude2.s
+4a5e353c23801ad5d7f1705efc5f42ed  ld/testsuite/ld-elf/exclude3.s
+d46cb8ede74aa1da2a09041b9c352c80  ld/testsuite/ld-elf/exclude3a.d
+87bad70ffa3162708a50da90ce75dc44  ld/testsuite/ld-elf/exclude3b.d
+1222a0ac943a41a7c63e3196a4f5b6f0  ld/testsuite/ld-elf/exclude3c.d
+f6895fc216226ff34a085e826903203b  ld/testsuite/ld-elf/exclude3d.d
+11a332bd6a41c9a9a278fbd0467e6d2c  ld/testsuite/ld-elf/expr1.d
+12f308c92a57632db3ba119e9a8746a5  ld/testsuite/ld-elf/expr1.s
+5444084211e53b093674d4082c0d2707  ld/testsuite/ld-elf/expr1.t
+ee6a88046a68a434d178bc8cf8a19a1e  ld/testsuite/ld-elf/extract-symbol-1.ld
+363de60328a3b2317105dc82c255a74c  ld/testsuite/ld-elf/extract-symbol-1.s
+12275c75e6d7ffb03b76c871d2627b90  ld/testsuite/ld-elf/extract-symbol-1sec.d
+97b10ffd2ce490b280ca09b4f9e97f0b  ld/testsuite/ld-elf/extract-symbol-1sym.d
+b9312be0ac0540e1bed7c423d7e86b7e  ld/testsuite/ld-elf/fini.c
+6c870ef46ccd9128eef86ca8e23210f2  ld/testsuite/ld-elf/fini.out
+21b885380fd780b267b3b9b55e39189b  ld/testsuite/ld-elf/flags1.d
+6d00ee0db5f5c13af13b690b2c33d642  ld/testsuite/ld-elf/flags1.ld
+7ac5a670ed46639acca959e753f7bb73  ld/testsuite/ld-elf/flags1.s
+e23b8d902b46d50011563346bcdef9cd  ld/testsuite/ld-elf/foo.c
+b6c669a20974ba5592c2d3d61ca7139f  ld/testsuite/ld-elf/foo.map
+f4a6c767448cc547d98cde1846c53b8d  ld/testsuite/ld-elf/frame.exp
+849fea883bafed1cbcbaebbe323e7783  ld/testsuite/ld-elf/frame.s
+f5eb79eb13454634e50e29bfcf9127c8  ld/testsuite/ld-elf/func1.c
+c7759dae9e015b9ae60e349a19e57b8c  ld/testsuite/ld-elf/group.ld
+0a972894292670bfc69c455a635cf111  ld/testsuite/ld-elf/group1.d
+d55510177d6c0bc3366c5a7a9f5b2bbf  ld/testsuite/ld-elf/group10.d
+ee3a05cb416c169218e9a5a0cbdf2e93  ld/testsuite/ld-elf/group10.s
+1ec9a1e59acd27511474e69e4055d7e0  ld/testsuite/ld-elf/group1a.s
+d9f1334c22ad7c92426c95b7aa8a3049  ld/testsuite/ld-elf/group1b.s
+9d7adfffe33ba6445be5804bb5915cc4  ld/testsuite/ld-elf/group2.d
+e8f102e04a371d81bde7078c089fae5f  ld/testsuite/ld-elf/group3a.d
+1de0968c385d41dca2452b5833f6a681  ld/testsuite/ld-elf/group3a.s
+d7c54a9b5cc48ca845828718fc515fd8  ld/testsuite/ld-elf/group3b.d
+57519cc08ef99dc4ef115ccc182382f0  ld/testsuite/ld-elf/group3b.s
+51760003b97fbb46fad9a7616ce4710d  ld/testsuite/ld-elf/group4.d
+d9c70323dfd104f347d45b6ed4352925  ld/testsuite/ld-elf/group5.d
+23c9e928e2f6ef30893e1473f2084654  ld/testsuite/ld-elf/group6.d
+b8ffc5b4d4f9a053dea025d80a0226c3  ld/testsuite/ld-elf/group7.d
+558795e9087cb1bbd0ec5e825d26cc71  ld/testsuite/ld-elf/group8.s
+1a8c19fe7dbb384c45d35f9741745cb1  ld/testsuite/ld-elf/group8a.d
+df228f039cdaf757741fb9912b9d7b70  ld/testsuite/ld-elf/group8b.d
+48c8a06528948d58b5e80f4694c29fe1  ld/testsuite/ld-elf/group9.s
+b479c3d799754a4afdd1707fa3277f5e  ld/testsuite/ld-elf/group9a.d
+88e0d80b525c08fbd1678f70e02e6f67  ld/testsuite/ld-elf/group9b.d
+d541c1b0473dadc5fe3632cae0051b7a  ld/testsuite/ld-elf/hash.d
+b7e0a7a1b2d167a4459dcb79f6390efb  ld/testsuite/ld-elf/header.d
+d20a232b867adf1bef08b4ce03cf1430  ld/testsuite/ld-elf/header.s
+9982da84d54af70ca2e81e3979251435  ld/testsuite/ld-elf/header.t
+89178798ccc30d52ff0924e01b5571bd  ld/testsuite/ld-elf/hidden.out
+366c57f43172b2e431b341fbadf9892b  ld/testsuite/ld-elf/init-fini-arrays.d
+39a2d240cb93d759b09a1dcf1f11d270  ld/testsuite/ld-elf/init-fini-arrays.s
+c014b107d3fe11b47a8b6033b9f97cfe  ld/testsuite/ld-elf/init-mixed.c
+d36f8f9425c4a8000ad9c4a97185aca5  ld/testsuite/ld-elf/init-mixed.out
+95bcdb1f797589520105dd68e9af0c58  ld/testsuite/ld-elf/init.c
+f2e75103bd836ab4be11fd869823de13  ld/testsuite/ld-elf/init.out
+d2d2837a4a4461ffab6f30eaebe973d9  ld/testsuite/ld-elf/linkonce1.d
+5fe9a69bec87726ba46817b8f1ee2b75  ld/testsuite/ld-elf/linkonce1a.s
+ebb33a94c7a5b164956799b79385ca91  ld/testsuite/ld-elf/linkonce1b.s
+d93b0136e812b175d99e9de8d2d0f2db  ld/testsuite/ld-elf/linkonce2.d
+74cfe401f62645cd60e07cf0480e9267  ld/testsuite/ld-elf/linkoncerdiff.d
+fe5bf27901db70ca55ed14c19833aa69  ld/testsuite/ld-elf/linkoncerdiff1.s
+f91dea4c322a581acfb738c6c194bef4  ld/testsuite/ld-elf/linkoncerdiff2.s
+5888bd99973e3054a85bc8270d625989  ld/testsuite/ld-elf/lma.lnk
+40dadc4124e56bdb402d4fd07200b825  ld/testsuite/ld-elf/lma.s
+afe8fcb284e3648437d0ab70fa59fcc3  ld/testsuite/ld-elf/loadaddr.s
+50559945e0e551693b7fc52a088bad25  ld/testsuite/ld-elf/loadaddr.t
+a4c87a4c61451a9fbadb42642ced68b5  ld/testsuite/ld-elf/loadaddr1.d
+40b0e64bed68782eeafc8dc4c92789f5  ld/testsuite/ld-elf/loadaddr1.t
+bd0d2a4f71e65e78f4011cb2dee33d75  ld/testsuite/ld-elf/loadaddr2.d
+6209e66373cc8cd7c4f45d2bd747037f  ld/testsuite/ld-elf/loadaddr2.t
+97b5e122b2d1ad02ea731a7a0f1ba0f1  ld/testsuite/ld-elf/loadaddr3.t
+422cf93ab84a15f4fed963a32957e4ab  ld/testsuite/ld-elf/loadaddr3a.d
+653cbbbc2a1d3baa3a0c7be0706645e5  ld/testsuite/ld-elf/loadaddr3b.d
+aeaf80a937a99f8af20a6a70cf83f86d  ld/testsuite/ld-elf/local1.d
+6af340a84430524a5da1d524826433e6  ld/testsuite/ld-elf/local1.map
+d1d4e30dbf8ca0ca0ae2856357fd2a25  ld/testsuite/ld-elf/local1.s
+32c581c1cb0e39759bf16610383605ec  ld/testsuite/ld-elf/main.c
+25b8360b78c9d21fc1365a3bf9a56008  ld/testsuite/ld-elf/maxpage1.d
+8e4fb0c70c9656f2c5a45b27727c46ca  ld/testsuite/ld-elf/maxpage1.s
+95c6bf0eb1c1167c17739beb16812bde  ld/testsuite/ld-elf/maxpage2.d
+f6c21b3d32c6aad6eba30f7e1f1b72a2  ld/testsuite/ld-elf/maxpage3.t
+ddfae0f52a1467975b1d3af6131b6268  ld/testsuite/ld-elf/maxpage3a.d
+e6697a3f5c6e26d60fb02ae070b455c2  ld/testsuite/ld-elf/maxpage3b.d
+a549e03f399fa2b8f48f28b0c7d30dbf  ld/testsuite/ld-elf/maxpage3c.d
+27b3b015586e17eb3be7d5aef05d908d  ld/testsuite/ld-elf/maxpage4.d
+e472066dbdc81546104875b2c59d5d17  ld/testsuite/ld-elf/maxpage4.t
+5a98fc137e3f3e38b4dd537407a8ca93  ld/testsuite/ld-elf/merge.d
+3adca40a51e300bbf27293c07b0b899b  ld/testsuite/ld-elf/merge.ld
+4595be81b4985c3114128c2c50497ed7  ld/testsuite/ld-elf/merge.s
+c8f0bcccda3a4893d6ecf1e3acd7dfdd  ld/testsuite/ld-elf/merge2.d
+82b53a1be4af0e7b9932bc4bac4a1f5b  ld/testsuite/ld-elf/merge2.s
+dab8d983f764005be0d56e5e71c6d74b  ld/testsuite/ld-elf/multibss1.d
+95739864db0e20752f2a8621045e2770  ld/testsuite/ld-elf/multibss1.s
+87b1cd84b94813d3f879e4bb66307a93  ld/testsuite/ld-elf/new.cc
+737e07c9b710b026cd01c38105c450b2  ld/testsuite/ld-elf/nobits-1.d
+1448d0c396a7540c385a6c24427dc8a8  ld/testsuite/ld-elf/nobits-1.s
+e933fe9c4ee897ce8767297ecd0f2676  ld/testsuite/ld-elf/nobits-1.t
+530a4ea166a9a853590f63c768d79a5f  ld/testsuite/ld-elf/noload-1.d
+3171f16ade59868ff70aab3502f42649  ld/testsuite/ld-elf/noload-1.s
+68efb3156c20aeb9a95bcc40d679299f  ld/testsuite/ld-elf/noload-1.t
+a7cdc4a0d7968b7b51299f35b4421fdd  ld/testsuite/ld-elf/noload-2.d
+03e9267b196ec4b40bcc056e48f97851  ld/testsuite/ld-elf/noload-3.d
+cde0fc55cbb25aa66ccde74b87aa1a3a  ld/testsuite/ld-elf/noload-3.s
+29cfe39333ea541949c52fa3568a7195  ld/testsuite/ld-elf/noload-3.t
+401fcac11c36214cce1f28d56bbf5fe8  ld/testsuite/ld-elf/normal.out
+a6dcf60520567b2d37489b9b13e0b287  ld/testsuite/ld-elf/note-1.d
+629568b7f4d00dcae1c48feb55a7efd5  ld/testsuite/ld-elf/note-1.s
+399dc17ec028793197a0e19a2dabda3c  ld/testsuite/ld-elf/note-1.t
+1ac47c89082509561450496d0e4dcf36  ld/testsuite/ld-elf/note-2.d
+40682549e4c351b892bdb471e60b6a3c  ld/testsuite/ld-elf/note-2.s
+5b3a8506065e6ef3b6b0098889c249b4  ld/testsuite/ld-elf/note-2.t
+c5006d0ccbb0c2aee724238c81fd084e  ld/testsuite/ld-elf/note-3.l
+cc1ff6f126e817e915075e36dd88d7c0  ld/testsuite/ld-elf/note-3.s
+76fa31ee0dd00d4807f0ae9347046f23  ld/testsuite/ld-elf/note-3.t
+2b9125b2b5c18f81dedfacfeda5e58e5  ld/testsuite/ld-elf/orphan-region.d
+63fc2bb84bbec40616f2976aec073894  ld/testsuite/ld-elf/orphan-region.ld
+7edf13f9914b682c83f9d0cfa6ef7430  ld/testsuite/ld-elf/orphan-region.s
+24a338e873b210f2f1726c828a0ab1fd  ld/testsuite/ld-elf/orphan.d
+d53032637c8ece91ff80d8c48b8d39c1  ld/testsuite/ld-elf/orphan.ld
+e10c2d6fb7b1862d72e784b3d68cad31  ld/testsuite/ld-elf/orphan.s
+65b282379c61547c696f167a12ca56e5  ld/testsuite/ld-elf/orphan2.d
+e7a16e18e2efc9cfdbbe32abaab5edca  ld/testsuite/ld-elf/orphan2.s
+57569c6d1b06b57547c826a7facc2894  ld/testsuite/ld-elf/orphan3.d
+6154f0eca898629c83b18499fab900c5  ld/testsuite/ld-elf/orphan3a.s
+84b13c2a26dd0d005bde1604e5b2d19a  ld/testsuite/ld-elf/orphan3b.s
+1e655a7d980456f14cf24ce85540cb81  ld/testsuite/ld-elf/orphan3c.s
+9a466c84001ebb48e1aaa0a73ae388f4  ld/testsuite/ld-elf/orphan3d.s
+0027c0b1504bc8b51d1caeebd687dd8c  ld/testsuite/ld-elf/orphan3e.s
+d93b5a03df564c13648d5c4dc1104ba2  ld/testsuite/ld-elf/orphan3f.s
+3b2265dab8325ee291177829d4f62bf0  ld/testsuite/ld-elf/orphan4.d
+24f21dc4791f0eec749a165fbff9bb24  ld/testsuite/ld-elf/orphan4.ld
+299c87c84cff73c8fd133b27164d9ea1  ld/testsuite/ld-elf/orphan4.s
+8485c54fabb0e82155e1ee7a3c2ef43d  ld/testsuite/ld-elf/overlay.d
+d4820191dbce8256c3f1f80984b67160  ld/testsuite/ld-elf/overlay.s
+2d997de1ae57807bbab493d208ca44ac  ld/testsuite/ld-elf/overlay.t
+32c0be4fb7f3030bf9c74c0a836d4f2e  ld/testsuite/ld-elf/pass.out
+93810c21d02634b47e6b0d68d8e2fbc6  ld/testsuite/ld-elf/pr11138-1.c
+2945ea31a0113cc212d6f38d344705a7  ld/testsuite/ld-elf/pr11138-1.map
+6d2633d6710838d2e3ea63c0b0ecec47  ld/testsuite/ld-elf/pr11138-2.c
+8d55e3e0f15eb6dd48dfa18a00f9efd4  ld/testsuite/ld-elf/pr11138-2.map
+b5a8b50ff530cdd3d3d9967312e02ab9  ld/testsuite/ld-elf/pr11138.out
+066dc12b5611d379e3f138ca0c0304a3  ld/testsuite/ld-elf/pr11304.d
+59a4b624ca0384784b4c88c5cbcbeaed  ld/testsuite/ld-elf/pr11304a.s
+59a4b624ca0384784b4c88c5cbcbeaed  ld/testsuite/ld-elf/pr11304b.s
+c83ddb75c46a371e1185f84f36d8dc97  ld/testsuite/ld-elf/pr12851.d
+a0e306b2e7e71bfcd446864ba0f72536  ld/testsuite/ld-elf/pr12851.s
+a2ea691d0ea70e481e7eee9079490d58  ld/testsuite/ld-elf/pr12975.d
+f1b24564683b83c422576e0762aaebcc  ld/testsuite/ld-elf/pr12975.s
+db23ab87a9e5dd863e49d869df40bb2d  ld/testsuite/ld-elf/pr12975.t
+8a1b43bb1b98d47569c87c7daeccf062  ld/testsuite/ld-elf/pr13195.c
+32cce9b7862b5c4d5f52e2256f1bc58b  ld/testsuite/ld-elf/pr13195.d
+54cac995f6b307c9e6627262b3c5b979  ld/testsuite/ld-elf/pr13195.s
+bf1422584b0f4807d623c533360a3ae8  ld/testsuite/ld-elf/pr13195.t
+dfd511b4a96937c4de97a99a639288a4  ld/testsuite/ld-elf/pr13250-1.c
+8bfedd08090446f98f5d9ed8fd45a49e  ld/testsuite/ld-elf/pr13250-2.c
+cfb926b6ab195c2cc31097e3cab41c87  ld/testsuite/ld-elf/pr13250-3.c
+9eaa52574b09fc06a3a9133e8ab494af  ld/testsuite/ld-elf/pr349-1.s
+603b78df700993f74de4efe8300dea2c  ld/testsuite/ld-elf/pr349-2.s
+815000c1d4742e802b83a8da90950409  ld/testsuite/ld-elf/pr349.d
+bd6e47747c9d2c55f67637c0cb446316  ld/testsuite/ld-elf/pr9676-1.c
+3cfd62244d92db0a1323beb5487ad025  ld/testsuite/ld-elf/pr9676-2.c
+f7a17bf2af3c100c51c7cc8bdba25530  ld/testsuite/ld-elf/pr9676-3.c
+779db82e3b226d53a48c1530a626c4eb  ld/testsuite/ld-elf/pr9676-4.c
+d5e659c345d1806a8333d24938bc677b  ld/testsuite/ld-elf/pr9676.rd
+4d9088ef903809d06d118353352bb3f3  ld/testsuite/ld-elf/pr9679-1.c
+01403fc34f8a10bf3c815d5d76fa6b38  ld/testsuite/ld-elf/pr9679-2.c
+d5e659c345d1806a8333d24938bc677b  ld/testsuite/ld-elf/pr9679.rd
+9e0d2e1541e26e362a40a3d869af16d9  ld/testsuite/ld-elf/preinit.c
+2f7e06fc320d375e4bef8dad7a69e6e8  ld/testsuite/ld-elf/preinit.out
+39629aca7739c945da31396959581688  ld/testsuite/ld-elf/relocatable.d
+3dfb6f0bb7b61490710f87231b84a61a  ld/testsuite/ld-elf/relocatable.t
+c4aa34f3eee6d09ecaa75450e25d2f78  ld/testsuite/ld-elf/relro1.s
+4e4b53efdd5a66a8f66f78fd45cddaed  ld/testsuite/ld-elf/relro2.s
+7e91a461691ba9fd341b5767b14e2b22  ld/testsuite/ld-elf/sec-to-seg-script-adjoining-pages.t
+c1ac88f05a284d2ee7032528375ea0c0  ld/testsuite/ld-elf/sec-to-seg-script-disjoint-pages.t
+0a5529647d14f9b30d5bdfb3f622e3a2  ld/testsuite/ld-elf/sec-to-seg-script-same-page.t
+bddbe3cf3633af8f745bc173c9266f58  ld/testsuite/ld-elf/sec-to-seg.exp
+4feab35f04a5962d0f6f6642609234b3  ld/testsuite/ld-elf/sec-to-seg1.s
+484ab9249c42669aae8eaa5ce0073831  ld/testsuite/ld-elf/sec-to-seg2.s
+1d68645c6f5875e03f98bcf79bef64c0  ld/testsuite/ld-elf/sec64k.exp
+2172991a0be7bbcc919dd018cb3e1984  ld/testsuite/ld-elf/seg.d
+366d0c0a5413780d911830f52009bd84  ld/testsuite/ld-elf/seg.s
+33df9bb4b3d304089bbc3721861a181b  ld/testsuite/ld-elf/seg.t
+d58dc176d4f19648ce82e752c715ec3f  ld/testsuite/ld-elf/shared.exp
+6f4d84a169cac8e0dd19b4b396d69de4  ld/testsuite/ld-elf/simple.s
+bca204cb5e2f9dfd81723b0cf322fa76  ld/testsuite/ld-elf/stab.d
+3767ef0dfe3d8e6020018b6b438224be  ld/testsuite/ld-elf/start.s
+f968d87a813716b366294f2338d3efb6  ld/testsuite/ld-elf/symbol1ref.s
+118d8abd984db821efeff9e387685685  ld/testsuite/ld-elf/symbol1w.s
+feb641ceead5630278338f34271c3f70  ld/testsuite/ld-elf/symbol2ref.s
+12ae3af7465ed5e608619f85e3bb1511  ld/testsuite/ld-elf/symbol2w.s
+bf10f94f4c2a0f312297f582b20fd617  ld/testsuite/ld-elf/symbol3.s
+348983f305353d8771aa5757ebc71baf  ld/testsuite/ld-elf/symbol3w.s
+3726d33be7e71970731526d25c45b15b  ld/testsuite/ld-elf/table.s
+2e5f0a039d8fe3b31bcbb1d924874abd  ld/testsuite/ld-elf/tbss.s
+1814ada7f088af77312ac0b0da7df970  ld/testsuite/ld-elf/tbss1.s
+eb37b66eb5d253b3c2e97b3eea174ecd  ld/testsuite/ld-elf/tbss2.s
+905e900305dc6bc49814c3d1f538ec90  ld/testsuite/ld-elf/tbss3.s
+a71ab05c910f1f346324725f36681373  ld/testsuite/ld-elf/tdata1.s
+1090d6567927a64cfb2f53974769536a  ld/testsuite/ld-elf/tdata2.s
+e9da8cae86b12f3c9ffc28179dbebf76  ld/testsuite/ld-elf/tdata3.s
+e8cbccbf4eaaeadb30a740ca3a93d1af  ld/testsuite/ld-elf/textaddr1.d
+81744aa1bb9f760ee8b5389a3149e744  ld/testsuite/ld-elf/textaddr2.d
+6a9cb314edd45ee5b4ae406daae14c22  ld/testsuite/ld-elf/textaddr3.d
+b61f2f154a3214936b06381ca0c1b987  ld/testsuite/ld-elf/textaddr4.d
+171deb77778587c381207a1fdf5eeca2  ld/testsuite/ld-elf/textaddr5.d
+912a76ba6752015a5860a43f7308049d  ld/testsuite/ld-elf/textaddr6.d
+c5c1369478ecb9fdcd459a621d15c5af  ld/testsuite/ld-elf/textaddr7.d
+231d80716b4f61bff66d55a981ee3ae3  ld/testsuite/ld-elf/tls_common.exp
+acfdcd6f073b4107aaf9525474caad57  ld/testsuite/ld-elf/tls_common.s
+08635fd0f8e8bfe1f48dfe1dcb64b8de  ld/testsuite/ld-elf/tls_gc.s
+22d8dd6f061259f9e320ed5854e01cf5  ld/testsuite/ld-elf/unknown.d
+09ddd4fa5b27a4db72b0736b1ece2f51  ld/testsuite/ld-elf/unknown2.d
+5006410a4ea18cc1dde77669583c65c9  ld/testsuite/ld-elf/unknown2.s
+adda635e6bdb4ef98fa0edbeb39fe7f6  ld/testsuite/ld-elf/warn.out
+77cc2c6e2782ff44b42d0ecfeff62515  ld/testsuite/ld-elf/warn1.d
+5966c2b7435a8b360b573ccbf546b81f  ld/testsuite/ld-elf/warn2.d
+ede420b2b8f9080185eef75d653326fc  ld/testsuite/ld-elf/warn3.d
+f36aba062ff28f6008dc3639314814f5  ld/testsuite/ld-elf/weak-dyn-1.ld
+50dca04d1d979e25a207fb8b53cc5151  ld/testsuite/ld-elf/weak-dyn-1.rd
+5c7ae357b88eb28f90e2d856ed0714a0  ld/testsuite/ld-elf/weak-dyn-1a.s
+f77d9b90ac5ac50068dcf529303593e1  ld/testsuite/ld-elf/weak-dyn-1b.s
+24e3ead9346194e7d47603837170d315  ld/testsuite/ld-elf/wrap.exp
+a3f498bb3a5ca268b09eba5569b0f1ee  ld/testsuite/ld-elf/wrap1.c
+b93d3de03fbdd2161586328bec0b9432  ld/testsuite/ld-elf/wrap1.out
+3bc7f7c7c0704dbeba179115cf844dcc  ld/testsuite/ld-elf/wrap1a.c
+f1d243e2bd35acde0bfbdfcd126a2635  ld/testsuite/ld-elf/wrap1b.c
+4fd4394e0fffbea332fd110afa670884  ld/testsuite/ld-elfcomm/common1a.c
+1ded50eb4cc3807ba226bca7ed76082c  ld/testsuite/ld-elfcomm/common1b.c
+0020d419b9a31d00ed6998fb7fb4b885  ld/testsuite/ld-elfcomm/elfcomm.exp
+8eb6a8cf48d79df5287e9493d40cf94d  ld/testsuite/ld-elfcomm/sort-common.s
+011baf0e22ddb7097cb9f386b4bd2082  ld/testsuite/ld-elfvers/vers.exp
+4270927e9c2f6165646a82d996632ab2  ld/testsuite/ld-elfvers/vers.h
+d58a9a73fbbd753a66bbcca36dfc8cf4  ld/testsuite/ld-elfvers/vers1.c
+3671b7ddb61a0544b750dbb786402454  ld/testsuite/ld-elfvers/vers1.dsym
+e313fc6c0ab900457222aee483b85e3e  ld/testsuite/ld-elfvers/vers1.map
+f5eb2d61f488f5c5d5a4867498b488db  ld/testsuite/ld-elfvers/vers1.sym
+3adb6c27dcdea2d455db59cb811ccf1b  ld/testsuite/ld-elfvers/vers1.ver
+ca85484e74a669868fc7e52fe11d7fb4  ld/testsuite/ld-elfvers/vers13.asym
+7457753bd762dab50560ce3773e3d987  ld/testsuite/ld-elfvers/vers15.c
+82a2ab777efc2bae6e2170f8a62f02d1  ld/testsuite/ld-elfvers/vers15.dsym
+543e6abbef56d4d71820bf2d7f7ff433  ld/testsuite/ld-elfvers/vers15.sym
+f13a39514754b4838f1309e21b00fe48  ld/testsuite/ld-elfvers/vers15.ver
+d71d95fe36a6bc2f88c952ac37cb990a  ld/testsuite/ld-elfvers/vers16.c
+20063b9a96b0498c3363934929a47134  ld/testsuite/ld-elfvers/vers16.dsym
+d057681641b9fc14e87f35c677b6243d  ld/testsuite/ld-elfvers/vers16.map
+92e6d0ae0c0aef2c17de9ef04d6bf7f2  ld/testsuite/ld-elfvers/vers16a.c
+f09fff1d10d49e948f5794e9d02b0f2a  ld/testsuite/ld-elfvers/vers16a.dsym
+ba77ee63cb0c9441745f678371e8c573  ld/testsuite/ld-elfvers/vers16a.ver
+a2e06e03cf5f45c27839f309a5388b81  ld/testsuite/ld-elfvers/vers17.c
+fb96a6647ba7b667f7d36ea828bd35f1  ld/testsuite/ld-elfvers/vers17.dsym
+db62e32b4b422023390633f11005c406  ld/testsuite/ld-elfvers/vers17.map
+3f61673d5b6aded9b54d5a6d50bbe9db  ld/testsuite/ld-elfvers/vers17.ver
+3eba3e7c2f298addf831ff2dda5ce4e5  ld/testsuite/ld-elfvers/vers18.c
+879ada875b24b80dda514c7e2e2af7b3  ld/testsuite/ld-elfvers/vers18.dsym
+ff664f0bcb51460658f2bd68559e58ce  ld/testsuite/ld-elfvers/vers18.map
+29ff86c9e1e6ef2c71260ba2d1469708  ld/testsuite/ld-elfvers/vers18.sym
+922422137a8d9727622d676c21a89be5  ld/testsuite/ld-elfvers/vers18.ver
+039a925919afb81dc1ee342704f38935  ld/testsuite/ld-elfvers/vers19.c
+cf3aefa02697e84e0e6c2868b6f5c680  ld/testsuite/ld-elfvers/vers19.dsym
+8b010e222b5e868705f82bbb23e9ecae  ld/testsuite/ld-elfvers/vers19.ver
+0a2838d86e28cda599478f48e5b5bdfd  ld/testsuite/ld-elfvers/vers2.c
+9e68402a4985b7a4b4dc5ba50b229992  ld/testsuite/ld-elfvers/vers2.dsym
+0f243904b21ec2e5cda0083a35f9708e  ld/testsuite/ld-elfvers/vers2.map
+74f7411e32fe765dc6a26a1b8b0fb023  ld/testsuite/ld-elfvers/vers2.ver
+4469f357ebf3ae54a6b7d3ac4dd45e02  ld/testsuite/ld-elfvers/vers20.c
+5ea20d0221b73c72bb641c79065d08ea  ld/testsuite/ld-elfvers/vers20.dsym
+8bc8f7d4944729dc8b93a7411039edab  ld/testsuite/ld-elfvers/vers20.map
+32f1fbc9d25386a28a726ba8213b0c50  ld/testsuite/ld-elfvers/vers20.ver
+46d437dd2ea257791fdff7e14e326256  ld/testsuite/ld-elfvers/vers20a.ver
+302adc31b972ff2d933201c8f4b84abe  ld/testsuite/ld-elfvers/vers21.c
+bbfcf81776040e057fce57d60d68d5c1  ld/testsuite/ld-elfvers/vers21.dsym
+1d171dba2a073a9f452c6dc9738d9ab5  ld/testsuite/ld-elfvers/vers21.map
+1c785fd67664055b80771ed6cdd5825c  ld/testsuite/ld-elfvers/vers21.sym
+9502301f11d072e0021a4c36a6a55871  ld/testsuite/ld-elfvers/vers21.ver
+f14e2a97a506acb8ccb16ae8169e02f0  ld/testsuite/ld-elfvers/vers22.c
+a3d23562ca52431974f3fa10acc9942e  ld/testsuite/ld-elfvers/vers22.dsym
+73bdadb2bf334d7215bed4b3bbf79386  ld/testsuite/ld-elfvers/vers22.map
+5d2c09668da017aaa1a398b2866f7651  ld/testsuite/ld-elfvers/vers22.ver
+5422f7f0e7ee89007aa881bf34744156  ld/testsuite/ld-elfvers/vers22a.c
+cace02d0bb3e824647423b833370b72e  ld/testsuite/ld-elfvers/vers22a.dsym
+0248e44186a26078d64b6f395b97fffc  ld/testsuite/ld-elfvers/vers22a.sym
+d2dbe45f18e4edc221fa05515c8f87f3  ld/testsuite/ld-elfvers/vers22a.ver
+4f7246f39713bbd895f864c0575ba407  ld/testsuite/ld-elfvers/vers22b.c
+3de0eddf476f0be654f0e5918cb4e757  ld/testsuite/ld-elfvers/vers22b.dsym
+23a2621b4322026f42215399979cf422  ld/testsuite/ld-elfvers/vers22b.ver
+bbc9fc509cd541c3693ee9eccfbd5b9d  ld/testsuite/ld-elfvers/vers23.c
+a5ebf070c6fc1bf2f3db91018bc1f649  ld/testsuite/ld-elfvers/vers23.dsym
+633a3d837043afb4e2e529e4c3e90935  ld/testsuite/ld-elfvers/vers23.ver
+fae2a28abdecb1706f8f3011f441045a  ld/testsuite/ld-elfvers/vers23a.c
+744cd1ebd356a20b1ea8a90ee2947990  ld/testsuite/ld-elfvers/vers23a.dsym
+8343a077e30c61911ce93c6effc40152  ld/testsuite/ld-elfvers/vers23a.map
+0248e44186a26078d64b6f395b97fffc  ld/testsuite/ld-elfvers/vers23a.sym
+68dbe79c82488593a3a00c5d4f254629  ld/testsuite/ld-elfvers/vers23a.ver
+60fc3d9c482fe99a2b93cb18e7e80609  ld/testsuite/ld-elfvers/vers23b.c
+3de0eddf476f0be654f0e5918cb4e757  ld/testsuite/ld-elfvers/vers23b.dsym
+73bdadb2bf334d7215bed4b3bbf79386  ld/testsuite/ld-elfvers/vers23b.map
+97b6652b41cf7947f6d77856bc082c38  ld/testsuite/ld-elfvers/vers23b.ver
+a3c80128cbd69d851c37fc62d70a1bbe  ld/testsuite/ld-elfvers/vers23c.ver
+6df1e37b6ca916c4d1c8ec5813eaf507  ld/testsuite/ld-elfvers/vers23d.dsym
+e9fda16fba73fb7725109a8dbc9b602b  ld/testsuite/ld-elfvers/vers24.map
+b8aafc5a20dfe2e23b770ee2e59bcc2c  ld/testsuite/ld-elfvers/vers24.rd
+dcd045d4d5696948726cd1964a9817a7  ld/testsuite/ld-elfvers/vers24a.c
+9a260b109ac2c5d9b67c179a743164d2  ld/testsuite/ld-elfvers/vers24b.c
+793997d59be62b943c1aae95eaef6b99  ld/testsuite/ld-elfvers/vers24c.c
+0523f9af999af91bcc588cad64caa834  ld/testsuite/ld-elfvers/vers25a.c
+59aa7f567e00c4925219abdc39e1de42  ld/testsuite/ld-elfvers/vers25a.dsym
+57f961fd2476ec908ae22cca5bdc232d  ld/testsuite/ld-elfvers/vers25a.map
+81e3c1cf35a071eb13a27e374dec7221  ld/testsuite/ld-elfvers/vers25a.ver
+12e05f0c04c3fe45dd5f8a9ce22f9f78  ld/testsuite/ld-elfvers/vers25b.c
+7d2a38f57ff8f9292dd32d86db3f1465  ld/testsuite/ld-elfvers/vers25b.dsym
+b8347f91cfb6122afdab80b966752a2c  ld/testsuite/ld-elfvers/vers25b.ver
+e98c326ae1d6de1a6f02bbec6be09dd9  ld/testsuite/ld-elfvers/vers26a.c
+59aa7f567e00c4925219abdc39e1de42  ld/testsuite/ld-elfvers/vers26a.dsym
+57f961fd2476ec908ae22cca5bdc232d  ld/testsuite/ld-elfvers/vers26a.map
+1a56e75735dd914b028707398606d9f1  ld/testsuite/ld-elfvers/vers26a.ver
+47bb2e0fbb87fcb4c863dfa911a22aec  ld/testsuite/ld-elfvers/vers26b.c
+b8347f91cfb6122afdab80b966752a2c  ld/testsuite/ld-elfvers/vers26b.dsym
+b8347f91cfb6122afdab80b966752a2c  ld/testsuite/ld-elfvers/vers26b.ver
+0523f9af999af91bcc588cad64caa834  ld/testsuite/ld-elfvers/vers27a.c
+59aa7f567e00c4925219abdc39e1de42  ld/testsuite/ld-elfvers/vers27a.dsym
+57f961fd2476ec908ae22cca5bdc232d  ld/testsuite/ld-elfvers/vers27a.map
+d60856e7654583644f69d753c28b6ff5  ld/testsuite/ld-elfvers/vers27a.ver
+5266024b8076b5b26794b09939d37166  ld/testsuite/ld-elfvers/vers27b.c
+b8347f91cfb6122afdab80b966752a2c  ld/testsuite/ld-elfvers/vers27b.dsym
+b8347f91cfb6122afdab80b966752a2c  ld/testsuite/ld-elfvers/vers27b.ver
+12e05f0c04c3fe45dd5f8a9ce22f9f78  ld/testsuite/ld-elfvers/vers27c.c
+b8347f91cfb6122afdab80b966752a2c  ld/testsuite/ld-elfvers/vers27c.dsym
+b8347f91cfb6122afdab80b966752a2c  ld/testsuite/ld-elfvers/vers27c.ver
+829aae1ccec6537f91efd3ea305f9e66  ld/testsuite/ld-elfvers/vers27d.dsym
+6b4020e10fb889eb3c832588997c8b67  ld/testsuite/ld-elfvers/vers27d.sym
+9f6f5bf5a47965e44de4c07fdc6660d5  ld/testsuite/ld-elfvers/vers27d.ver
+83c538703e21419330e9a2a91572dc38  ld/testsuite/ld-elfvers/vers27d1.c
+1ceed1e236c346112bd60a798bc5bee1  ld/testsuite/ld-elfvers/vers27d2.c
+88a2654d0eec5305a3c68d0592b793a7  ld/testsuite/ld-elfvers/vers27d3.c
+a5ebf070c6fc1bf2f3db91018bc1f649  ld/testsuite/ld-elfvers/vers27d4.dsym
+174698c458f46bd70b8accf50820f3d2  ld/testsuite/ld-elfvers/vers27d4.ver
+0523f9af999af91bcc588cad64caa834  ld/testsuite/ld-elfvers/vers28a.c
+b8347f91cfb6122afdab80b966752a2c  ld/testsuite/ld-elfvers/vers28a.dsym
+b8347f91cfb6122afdab80b966752a2c  ld/testsuite/ld-elfvers/vers28a.ver
+149133883cb0fb36026df232ff8a23d1  ld/testsuite/ld-elfvers/vers28b.c
+0569b27808decda4fbcdf7717e617d4a  ld/testsuite/ld-elfvers/vers28b.dsym
+57f961fd2476ec908ae22cca5bdc232d  ld/testsuite/ld-elfvers/vers28b.map
+72effba67ac2aab0b4eb6b36ef25358f  ld/testsuite/ld-elfvers/vers28b.ver
+48737299e30907008d88fa0f1990de62  ld/testsuite/ld-elfvers/vers28c.c
+c50f9e28fc0fec9c7924fc471430c0aa  ld/testsuite/ld-elfvers/vers28c.dsym
+9c5cf2b1eb3f0c7e801b91829ef5081b  ld/testsuite/ld-elfvers/vers28c.ver
+47fef54f84aa89c6c41f11914aee3d65  ld/testsuite/ld-elfvers/vers29.c
+9f70d4b1ea9dbb73b07733538f41189a  ld/testsuite/ld-elfvers/vers29.dsym
+40722f8e631cbf28b20f03c5cbfe38b9  ld/testsuite/ld-elfvers/vers29.ver
+2198856c8569cc7494ffe89650a9e63b  ld/testsuite/ld-elfvers/vers3.c
+cf3aefa02697e84e0e6c2868b6f5c680  ld/testsuite/ld-elfvers/vers3.dsym
+8a491b80ca3b80c98fb3ef4b89144e65  ld/testsuite/ld-elfvers/vers3.ver
+f5c281cfb038224a4d4d58aef1722ea5  ld/testsuite/ld-elfvers/vers30.c
+7d31903e73639c4d55b43ad71b54bae8  ld/testsuite/ld-elfvers/vers30.dsym
+80c39498d585c4ed1e673c9913baad4c  ld/testsuite/ld-elfvers/vers30.map
+5c50a408e839ce394d6afefc99c05f03  ld/testsuite/ld-elfvers/vers30.ver
+6e5a4cce520eb1d178d64b496ff8ecdb  ld/testsuite/ld-elfvers/vers31.c
+b8b281ab353872a431ea8acefc969c08  ld/testsuite/ld-elfvers/vers31.dsym
+16b25cba9740f9d81f00ccd060795fb5  ld/testsuite/ld-elfvers/vers31.map
+4e6cd894f98b3986f8186c14b0f2e3d7  ld/testsuite/ld-elfvers/vers31.ver
+6b0b0fa55c95439cd34b997ab63b1d4a  ld/testsuite/ld-elfvers/vers32.map
+95828e8bc4f7404dbf7526fb7bd0f192  ld/testsuite/ld-elfvers/vers32a.c
+a2d7608047175f1f9985a2f3b55fa352  ld/testsuite/ld-elfvers/vers32a.dsym
+11069de249c4f4a64927901070167be9  ld/testsuite/ld-elfvers/vers32a.ver
+a863ef5f1c11831afdaf974a863a0a63  ld/testsuite/ld-elfvers/vers32b.c
+4ca14c34fad7aee9f54ba020f0783562  ld/testsuite/ld-elfvers/vers32b.dsym
+db9c79e40e7fdca3d52eebe59cabf8af  ld/testsuite/ld-elfvers/vers32b.ver
+ccd32291f12843a2fa3eef56c741404e  ld/testsuite/ld-elfvers/vers4.c
+19bfa47f645607d5e10812a1da0f90f1  ld/testsuite/ld-elfvers/vers4.sym
+e3993b8a2e4f48f58b5d0ada10ba4561  ld/testsuite/ld-elfvers/vers4a.dsym
+19bfa47f645607d5e10812a1da0f90f1  ld/testsuite/ld-elfvers/vers4a.sym
+ce2400c96d4fc6123be2ef21d26463f5  ld/testsuite/ld-elfvers/vers4a.ver
+d1cfe9c70723b380ef055a682437ba30  ld/testsuite/ld-elfvers/vers5.c
+fc0867daf0fa30de46d2abacb8f9235f  ld/testsuite/ld-elfvers/vers6.c
+89061a89d2c9496e0e97880d8c8c8c71  ld/testsuite/ld-elfvers/vers6.dsym
+5efeda74a14424e32fa46037c5d20d0d  ld/testsuite/ld-elfvers/vers6.sym
+c6dda7839f06ae8858d0d413c6b436dc  ld/testsuite/ld-elfvers/vers6.ver
+8c6338ab91836afb2918ef463e5e899a  ld/testsuite/ld-elfvers/vers7.c
+9a7ae246a7154e67158fc0cdcda850d8  ld/testsuite/ld-elfvers/vers7.map
+141ee51799ca768deea7fb6747fbbfa2  ld/testsuite/ld-elfvers/vers7a.c
+3c7917b4f34e11502212e2c2ff5df713  ld/testsuite/ld-elfvers/vers7a.dsym
+0816eae48bb08edb4157eca3adf87f8e  ld/testsuite/ld-elfvers/vers7a.sym
+ef725ba6c6212223dd638cc330f8ea07  ld/testsuite/ld-elfvers/vers7a.ver
+258f61144bcd39b444b75dba182129e6  ld/testsuite/ld-elfvers/vers8.c
+5eadb3d448dc734491d4524e07f15f63  ld/testsuite/ld-elfvers/vers8.map
+d7293eed499f910aaea96045a2ed2802  ld/testsuite/ld-elfvers/vers8.ver
+b4a26e17bd6950fc9e4bb0ab58b328fb  ld/testsuite/ld-elfvers/vers9.c
+46706cabbc61aa28af8cc4e10e8ff65b  ld/testsuite/ld-elfvers/vers9.dsym
+b376f4050a07745b5a27d5745e95135b  ld/testsuite/ld-elfvers/vers9.sym
+98b81d902db96eca605162be67983d1f  ld/testsuite/ld-elfvers/vers9.ver
+e7c2a2db4675513e62d8ffee0261114b  ld/testsuite/ld-elfvsb/common.c
+4bb9ca85a1469d2af2ac23d7a8f540a0  ld/testsuite/ld-elfvsb/define.s
+ab58dd4aea8894af968cae07e98cce1c  ld/testsuite/ld-elfvsb/elf-offset.ld
+311acb2b4478311b5dd7d43553e4167c  ld/testsuite/ld-elfvsb/elfvsb.dat
+76478eabb555fa06acded5c157d6523b  ld/testsuite/ld-elfvsb/elfvsb.exp
+77ac30a27063e4b52eabf74341e5a86e  ld/testsuite/ld-elfvsb/hidden0.d
+976bd30c73849900caaed88cfb7244d7  ld/testsuite/ld-elfvsb/hidden1.d
+7a01224f5809d7cd3febff67ae8a633c  ld/testsuite/ld-elfvsb/hidden2.d
+ab59f9746bcefe5b7366026573457d50  ld/testsuite/ld-elfvsb/hidden2.ld
+89ab48379336c8ecd7ea7cffdfe97ad3  ld/testsuite/ld-elfvsb/hidden2.s
+4bbbe82c403526fec859f0d13515aed8  ld/testsuite/ld-elfvsb/internal0.d
+6dd8cfa1fff25df3562ce03a8f44c837  ld/testsuite/ld-elfvsb/internal1.d
+c6bb503e50cc239732b047b2a912e731  ld/testsuite/ld-elfvsb/main.c
+66d400efff5fb93230ad8fcffe2bb186  ld/testsuite/ld-elfvsb/protected0.d
+facb8b5e9d55edeccf6658623ff6f56e  ld/testsuite/ld-elfvsb/protected1.d
+61b7dea099eb11429588869780156a37  ld/testsuite/ld-elfvsb/sh1.c
+90812ab2b20216b53074ec98d6b410c3  ld/testsuite/ld-elfvsb/sh2.c
+164bf9fa3225c27578caf6a12ecc5779  ld/testsuite/ld-elfvsb/sh3.c
+44ad79da0c181cbfb55b2f36aac6a201  ld/testsuite/ld-elfvsb/test.c
+2f0256a43da423922ed1929bea438972  ld/testsuite/ld-elfvsb/undef.s
+046e158fe0af59748019e9d9d86bad4d  ld/testsuite/ld-elfweak/bar.c
+96221199fd09def3e578f62aaa264c39  ld/testsuite/ld-elfweak/bar1a.c
+0e4106aabff604c09aa201ce238d54dd  ld/testsuite/ld-elfweak/bar1b.c
+9f3b2607071ce0deb9d70f4e65b9cf9e  ld/testsuite/ld-elfweak/bar1c.c
+e6ea1a4e59b88aef8402a40810ee14d7  ld/testsuite/ld-elfweak/dso.dsym
+ea0dc3c0c096c41a760230c1dbba5b5b  ld/testsuite/ld-elfweak/dsodata.dsym
+671a2a5813ffb5b60a15d52b169f774f  ld/testsuite/ld-elfweak/dsow.dsym
+494629f57fb3c0f4ca6336a5971875ef  ld/testsuite/ld-elfweak/dsowdata.dsym
+a5217834af746e0716006ecdbab2c370  ld/testsuite/ld-elfweak/elfweak.exp
+0675dd6a498ed0fe35607abf03517c33  ld/testsuite/ld-elfweak/foo.c
+61ce595ea3b7dda0bed97536cc50991f  ld/testsuite/ld-elfweak/foo1a.c
+d999331c477d9e594cdbe6642952da5a  ld/testsuite/ld-elfweak/foo1b.c
+8ab030ac10dd0340d51ce6e293aa31b0  ld/testsuite/ld-elfweak/main.c
+d082bc04bb367593bf0d9403824584ac  ld/testsuite/ld-elfweak/main1.c
+c0710d6b4f15dfa88f600b0e6b624077  ld/testsuite/ld-elfweak/size.dat
+ca873fa02ef818fdf7cadbf28d5830e9  ld/testsuite/ld-elfweak/size2.d
+7f8709337349165a691bfb796d9ba358  ld/testsuite/ld-elfweak/size2a.s
+3d27e4cedeb4cd50d6a3f4f56d3c6f6f  ld/testsuite/ld-elfweak/size2b.s
+bb8fccf253fe11bdc128fb40ec1a1821  ld/testsuite/ld-elfweak/size_bar.c
+007464380f12ed6e882f8074a930292c  ld/testsuite/ld-elfweak/size_foo.c
+79bafe4b4c71963e9efe1a2a99474fc6  ld/testsuite/ld-elfweak/size_main.c
+6ff9ed6df35266db3df63a42222569ff  ld/testsuite/ld-elfweak/strong.dat
+60ee89049e15280964cd994ae23f4656  ld/testsuite/ld-elfweak/strong.sym
+7c19a4469f1f8e7fdf4bb5baa9a90223  ld/testsuite/ld-elfweak/strongcomm.sym
+5a6dd36b14499e59820a074213e6c5df  ld/testsuite/ld-elfweak/strongdata.dat
+ca112024604c5006b1e1079eb9a110eb  ld/testsuite/ld-elfweak/strongdata.sym
+dcf5e53a281f26dbad477cdba407e168  ld/testsuite/ld-elfweak/weak.dat
+671a2a5813ffb5b60a15d52b169f774f  ld/testsuite/ld-elfweak/weak.dsym
+40040714fbc533439a8346bed87f39be  ld/testsuite/ld-elfweak/weakdata.dat
+494629f57fb3c0f4ca6336a5971875ef  ld/testsuite/ld-elfweak/weakdata.dsym
+740e6c75a141a24eb7156f293adc9c31  ld/testsuite/ld-fastcall/export.s
+85fb1bcd5f2d2732164c14cee7ad5fa1  ld/testsuite/ld-fastcall/fastcall.exp
+398cd605e80d06f2edbaa7bb1b81ee32  ld/testsuite/ld-fastcall/import.s
+cc41507ba2036874052bbab955b769b6  ld/testsuite/ld-frv/fdpic-pie-1.d
+c6a403fab71ad34af64723536c018756  ld/testsuite/ld-frv/fdpic-pie-2.d
+036f2e58a8bbbf45a822e963824e9eef  ld/testsuite/ld-frv/fdpic-pie-5.d
+968734d40a8c4556b11608cedf60bc2d  ld/testsuite/ld-frv/fdpic-pie-6-fail.d
+6e95984441beeca5f56bf0910b606fab  ld/testsuite/ld-frv/fdpic-pie-6.d
+e288de935e2088c24012d910539e7aa8  ld/testsuite/ld-frv/fdpic-pie-7.d
+de5c6fce807f3bf3ea05d72e64847dc6  ld/testsuite/ld-frv/fdpic-pie-8.d
+e38d66851473ccb9acdb382ddf545173  ld/testsuite/ld-frv/fdpic-shared-1.d
+44f78d9d02ec25a226af8a0153d7f3ca  ld/testsuite/ld-frv/fdpic-shared-2-fail.d
+2b1ecf50cb0ae530f538e41e534257e0  ld/testsuite/ld-frv/fdpic-shared-2.d
+cbb3d2f0bceb9c3d430f15b8157ac36a  ld/testsuite/ld-frv/fdpic-shared-3.d
+c64f1ffc25ddabf83b05145828e6d973  ld/testsuite/ld-frv/fdpic-shared-4.d
+9eff95cea03ee8944f5ec4e22dc373bf  ld/testsuite/ld-frv/fdpic-shared-5.d
+47129de7d81b57da3a558829c929a0e8  ld/testsuite/ld-frv/fdpic-shared-6-fail.d
+51002d66ea2bf42abadad053904a7dbe  ld/testsuite/ld-frv/fdpic-shared-6.d
+3736ec9bc2505562d566f737de13d335  ld/testsuite/ld-frv/fdpic-shared-7.d
+df883e86ef4001df59397b1deddf779b  ld/testsuite/ld-frv/fdpic-shared-8-fail.d
+4b0caf7ae0d50f59f001dd47aa8f791e  ld/testsuite/ld-frv/fdpic-shared-8.d
+9400d6cc06da7cc32296226e84c3ff78  ld/testsuite/ld-frv/fdpic-shared-local-2.d
+d3d29fa692ee1b23ef350080de143c23  ld/testsuite/ld-frv/fdpic-shared-local-8.d
+ab6c75ef5e03df3b89c91ea68fbc803f  ld/testsuite/ld-frv/fdpic-static-1.d
+62ce6d41d5c5e6ef2bd5852a7f173d41  ld/testsuite/ld-frv/fdpic-static-2.d
+38da2b407d6a293dcf365cac941194c8  ld/testsuite/ld-frv/fdpic-static-5.d
+7995cc7e9cd3d51c1854028567ddbd0e  ld/testsuite/ld-frv/fdpic-static-6.d
+cc1097db4cd49675213230866ee591af  ld/testsuite/ld-frv/fdpic-static-7.d
+930cf511857f462a346d097c88f7ffa0  ld/testsuite/ld-frv/fdpic-static-8.d
+2b882da98beaf0e3f6be9af4b2413dc3  ld/testsuite/ld-frv/fdpic.exp
+05e4f28acb84feeaf5710145293999db  ld/testsuite/ld-frv/fdpic1.s
+c6d87683d1fa4888efa7ddc918099749  ld/testsuite/ld-frv/fdpic2.ldv
+cfa8675017dda6a3ec48235022d86a36  ld/testsuite/ld-frv/fdpic2.s
+d3a945e4376ce0ad93d1099a8dd3d1fc  ld/testsuite/ld-frv/fdpic2min.ldv
+e455be96f7634ac1d9e36603b080db76  ld/testsuite/ld-frv/fdpic3.s
+63a031ad889a71153cb467efe899eb91  ld/testsuite/ld-frv/fdpic4.s
+cfb53b605cad0eede6f786417b40363d  ld/testsuite/ld-frv/fdpic5.s
+5b6860c160aff69dfaedc50d8a0a6391  ld/testsuite/ld-frv/fdpic6.ldv
+a395bf06c37a4615ba0d0bcce7da833b  ld/testsuite/ld-frv/fdpic6.s
+88ba83aa62acc75b0d9b601f2176e799  ld/testsuite/ld-frv/fdpic7.s
+d2006465db117fb02c0c9f1b5f6bd73c  ld/testsuite/ld-frv/fdpic8.ldv
+ef0ec67da07de5b9741c96073f814175  ld/testsuite/ld-frv/fdpic8.s
+906b49e106ec05d8fd119a49bba35044  ld/testsuite/ld-frv/fdpic8min.ldv
+2aab41e05d636fa2c0c57d293674e41b  ld/testsuite/ld-frv/fr450-link.d
+801d14a6810ebae1f5eefda4bac2a4d8  ld/testsuite/ld-frv/fr450-linka.s
+801d14a6810ebae1f5eefda4bac2a4d8  ld/testsuite/ld-frv/fr450-linkb.s
+801d14a6810ebae1f5eefda4bac2a4d8  ld/testsuite/ld-frv/fr450-linkc.s
+08403deb1fd72dd5f15a32a7d3d13503  ld/testsuite/ld-frv/frv-elf.exp
+98f770864b645ad0c0d7446ea2e654c8  ld/testsuite/ld-frv/tls-1-dep.s
+6237447698468c17c8cd3726671adc56  ld/testsuite/ld-frv/tls-1-shared.lds
+37fdb5cb8586d27c2d5465cd79a92132  ld/testsuite/ld-frv/tls-1.s
+e1f7b6df59d7016724ec121bb551bf0d  ld/testsuite/ld-frv/tls-2.s
+f865508510be9a71fc6c039e3b113f7d  ld/testsuite/ld-frv/tls-3.s
+44ba36d385d1535f2d4d3afc6924af55  ld/testsuite/ld-frv/tls-dynamic-1.d
+0a2cf2f8a22dd44afbd789b6dd0d9cee  ld/testsuite/ld-frv/tls-dynamic-2.d
+2467f5b3a52c414033a73ca4b7b5de5e  ld/testsuite/ld-frv/tls-dynamic-3.d
+e4c7efbfa45749da4fb80c9315bb4a5d  ld/testsuite/ld-frv/tls-initial-shared-2.d
+840cf4a069daac4120e1b9f98aad9849  ld/testsuite/ld-frv/tls-pie-1.d
+f1685e112150f1c7e45762585ada9951  ld/testsuite/ld-frv/tls-pie-3.d
+8961a52a62db16458dc6252a46f492db  ld/testsuite/ld-frv/tls-relax-dynamic-1.d
+cb0936e98f159cbf53a17c09049496e5  ld/testsuite/ld-frv/tls-relax-dynamic-2.d
+4c18cc9e6ebf9a3f2033bed06ad75b08  ld/testsuite/ld-frv/tls-relax-dynamic-3.d
+fc1ffa5981afb282539567848710be83  ld/testsuite/ld-frv/tls-relax-initial-shared-2.d
+d1d3a8cb2105a3fb2e6c55f91c1e8d7b  ld/testsuite/ld-frv/tls-relax-pie-1.d
+ad57d800fd5554dea9ad46d4b417f6d8  ld/testsuite/ld-frv/tls-relax-pie-3.d
+1cc0150eec83ecbdc031b76cb7e26e8b  ld/testsuite/ld-frv/tls-relax-shared-1.d
+abe458eed1c73c883f8d2a27a66fbb30  ld/testsuite/ld-frv/tls-relax-shared-2.d
+8a695eaaed5f713bb697bf511ffb9964  ld/testsuite/ld-frv/tls-relax-shared-3.d
+ae1bf958e55ae4c6f551d37a4b266e97  ld/testsuite/ld-frv/tls-relax-static-1.d
+dd8c28c9d4492ceca5c3ded82cc0921a  ld/testsuite/ld-frv/tls-relax-static-3.d
+1ec18ca37d8187658f5a325dc3a6615a  ld/testsuite/ld-frv/tls-shared-1-fail.d
+d9b11cc2a0549b9c6d4395d70a2267c1  ld/testsuite/ld-frv/tls-shared-1.d
+8874cc86dfb3de63a6861db32ab47bb0  ld/testsuite/ld-frv/tls-shared-2.d
+90b3609662b7b159ba82919e26480ca4  ld/testsuite/ld-frv/tls-shared-3.d
+6d6ed8c232b234daad8364fc28448526  ld/testsuite/ld-frv/tls-static-1.d
+ed3ef3320f222fa04b4b169e2476dd46  ld/testsuite/ld-frv/tls-static-3.d
+9c8894ae8e7c235c0285eb19d023557d  ld/testsuite/ld-frv/tls.exp
+113edf8cd0e33b158a7971a13258deaf  ld/testsuite/ld-gc/abi-note.d
+3fad837915c245c79835b1ee410092cd  ld/testsuite/ld-gc/abi-note.s
+8374b35f68412379bade5bfa6ce108b2  ld/testsuite/ld-gc/dummy.s
+1280581bf96a5504b9f5b4c53f3eac57  ld/testsuite/ld-gc/gc.c
+8b398b7bbec6acc0aac9a98fb75962e4  ld/testsuite/ld-gc/gc.exp
+f358a4953dab53dfdbcd4468252eede5  ld/testsuite/ld-gc/noent.d
+6e9525f24877a300540fc764dc060c83  ld/testsuite/ld-gc/noent.s
+3bb07aab20b4927ea79436574a2cca57  ld/testsuite/ld-gc/pr11218-1.c
+f26c8add3dcc0793d01755e5bbb03024  ld/testsuite/ld-gc/pr11218-2.c
+d9baed37c81f7b2c2afe56409a56aa7b  ld/testsuite/ld-gc/pr11218.d
+98e4b933ed2f369f8e11ef7283dd7a9e  ld/testsuite/ld-gc/start.d
+d4b6668928d4109f8367ed06994cd9bd  ld/testsuite/ld-gc/start.s
+98c4a6fd6872bcd109e317822e8a76b0  ld/testsuite/ld-h8300/gcsection.d
+6fe0410a922b80e1abc7ca25bf822f97  ld/testsuite/ld-h8300/gcsection.s
+cecd4ded0bc74aea9ffbb21f55ff43f1  ld/testsuite/ld-h8300/h8300.exp
+e6a00aab6e0b5068195989a402c44d69  ld/testsuite/ld-h8300/relax-2.d
+4f488bd30141b1f3cea35bd59a56bc2d  ld/testsuite/ld-h8300/relax-2.s
+dfb37fd13b0c076c375d173f915b344d  ld/testsuite/ld-h8300/relax-3-coff.d
+97c8bdda98b7d9c79d9c8fda62d56489  ld/testsuite/ld-h8300/relax-3.d
+a2e9dec4641c7321bc8b3a2425a2ef4e  ld/testsuite/ld-h8300/relax-3.s
+6695dd115983f75263961b8f46393d1d  ld/testsuite/ld-h8300/relax-4-coff.d
+5792d761c4b0c3456a39001785b73f87  ld/testsuite/ld-h8300/relax-4.d
+1dba717565a0240b28da4a5ad6ea175d  ld/testsuite/ld-h8300/relax-4.s
+8e23d5349b426ea3bd58b6461dbfa3f0  ld/testsuite/ld-h8300/relax-5-coff.d
+d461ec778d28c967a8d80eb4453ffe04  ld/testsuite/ld-h8300/relax-5.d
+e99729d992d349d8efacc4be17ffc728  ld/testsuite/ld-h8300/relax-5.s
+6fc6e5f4f2d011f032d967d2c5c47a9b  ld/testsuite/ld-h8300/relax-6-coff.d
+f03ce5f2426f3b9c3712d3ba8f266e30  ld/testsuite/ld-h8300/relax-6.d
+71494a5071587d58c44881ddba8f98b8  ld/testsuite/ld-h8300/relax-6.s
+a6d0a3d0032213f8a5f6a37259b4dad1  ld/testsuite/ld-h8300/relax.d
+cf8d1ef781c6a11ee4c2c65408f52849  ld/testsuite/ld-h8300/relax.s
+4eab08278dc62388fa451c0d215263f0  ld/testsuite/ld-i386/abs.d
+4223c02660ef295874b7f46e534bb756  ld/testsuite/ld-i386/abs.s
+abbd4c0e6060fa01f7f17ecdddf529b9  ld/testsuite/ld-i386/alloc.d
+170462078f6b736209d66144d5298673  ld/testsuite/ld-i386/alloc.s
+2a89bceef227b5ae12bb10f9d0904a4c  ld/testsuite/ld-i386/alloc.t
+3514d60eeebcfc8f7d93239d00a042fa  ld/testsuite/ld-i386/combreloc.d
+bfad8fd9caab1c503c3e547132bba8e3  ld/testsuite/ld-i386/combreloc.s
+3d3179e084e0db2e7dfa246916ca8b9f  ld/testsuite/ld-i386/compressed1.d
+09a2601cf50aa61814ade41b8f3bc213  ld/testsuite/ld-i386/compressed1.s
+315a02c2a12f88930a0356cb4c14212d  ld/testsuite/ld-i386/discarded1.d
+abd0b94a0fe91990730795e06e681e3b  ld/testsuite/ld-i386/discarded1.s
+932839e2d4e600dcdc966010e4965a31  ld/testsuite/ld-i386/discarded1.t
+6a24bf2c11edfd744205734d0d2776f1  ld/testsuite/ld-i386/emit-relocs.d
+47a609aa14618023c1317f741f3810de  ld/testsuite/ld-i386/emit-relocs.s
+e0b4ac393b55aa6dde9eeb2eac8dd281  ld/testsuite/ld-i386/hidden1.d
+d3e5ca870e218a1b1dcb656e0bfaa3ce  ld/testsuite/ld-i386/hidden1.s
+fd28ba522821f5d534e85cafc8e5eac4  ld/testsuite/ld-i386/hidden2.d
+ecab80f3eb47cc5bc5871e947f9b395e  ld/testsuite/ld-i386/hidden2.s
+e0b4ac393b55aa6dde9eeb2eac8dd281  ld/testsuite/ld-i386/hidden3.d
+d9d64e8ca2b43c851eacaa021767eafa  ld/testsuite/ld-i386/hidden3.s
+051f784ea9318b8e384a43f178c1208a  ld/testsuite/ld-i386/i386.exp
+74112f5d00b1bc8acfb9165b1b9ddd0c  ld/testsuite/ld-i386/nogot1.d
+6578c6fdcd635f9a6f10174cc27f5125  ld/testsuite/ld-i386/nogot1.s
+1fe6ae6b1583214e2d42d6b94b234708  ld/testsuite/ld-i386/nogot2.d
+adf3d3417bacbbbbd44af52a3a9d1879  ld/testsuite/ld-i386/nogot2.s
+55da47cb01da3536927b36f6abf83bbc  ld/testsuite/ld-i386/pcrel16.d
+86c55cbae78801844b5fbab4a5134989  ld/testsuite/ld-i386/pcrel16.s
+b5c9f63c2f1ee687e18c29a5560da724  ld/testsuite/ld-i386/pcrel16abs.d
+c28929bb26afb7e6e572ea7a94b2c468  ld/testsuite/ld-i386/pcrel16abs.s
+4d55687220a930ac78d5153b16fa70ad  ld/testsuite/ld-i386/pcrel8.d
+72a801ea2498c750a89388b264ee332f  ld/testsuite/ld-i386/pcrel8.s
+588029a62ada206efa182d3931deb519  ld/testsuite/ld-i386/pr12627.d
+01fbdaad0c2dd99a3c9a5aed298331b7  ld/testsuite/ld-i386/pr12627.s
+6efefb3ab9456a4a3f199f20488107fb  ld/testsuite/ld-i386/pr12627.t
+aaea65b76e9800110d84072052355f06  ld/testsuite/ld-i386/pr12718.d
+f2aa8181f8bb6e72317ba9cf91579fa6  ld/testsuite/ld-i386/pr12718.s
+e3d30671954e979de708a6c0ef1b3dc6  ld/testsuite/ld-i386/pr12921.d
+9bc8273e473647c31df4d698250c1af1  ld/testsuite/ld-i386/pr12921.s
+92de073b153a3be8e4c2e986b9bc785d  ld/testsuite/ld-i386/protected1.d
+538ea3fd8f05afd6d0dc78414f610d00  ld/testsuite/ld-i386/protected1.s
+339ba4f5757c67ee3e47afe85ecb3617  ld/testsuite/ld-i386/protected2.d
+3c225f378aa9175db095f949d3da69ee  ld/testsuite/ld-i386/protected2.s
+e674277f637c3f35089da7167f4af13f  ld/testsuite/ld-i386/protected3.d
+1a8d3bf27adc1c5b4d3a8332787b13d8  ld/testsuite/ld-i386/protected3.s
+d582159967d9ddbb79a87bedf04bfb45  ld/testsuite/ld-i386/reloc.d
+ee1b7cbb64cf7c75b90dc73e1c708915  ld/testsuite/ld-i386/reloc.s
+17cf5ec4f90f397f7ec1cb7bb8e9fac0  ld/testsuite/ld-i386/tlsbin.dd
+ee38fb15d66d91ca144cf419142bc1ad  ld/testsuite/ld-i386/tlsbin.rd
+f1f22d7f610addfd37d52a7882ff0f9e  ld/testsuite/ld-i386/tlsbin.s
+592ac2866623f1aaaede2fb4fbd4ca8f  ld/testsuite/ld-i386/tlsbin.sd
+c918c7d05392fcad4b7ce29e9dee9bd2  ld/testsuite/ld-i386/tlsbin.td
+72e94d1daa0ef284f9d26c200f42fa52  ld/testsuite/ld-i386/tlsbindesc.dd
+19cff7f0908f26e8d80fb4b574a40bff  ld/testsuite/ld-i386/tlsbindesc.rd
+c8e339bd9d5127a625f86dbf904aae86  ld/testsuite/ld-i386/tlsbindesc.s
+a1972e936a45133bfe60151ad66506a6  ld/testsuite/ld-i386/tlsbindesc.sd
+7106b1457d00c4cf9d6c8b6999843711  ld/testsuite/ld-i386/tlsbindesc.td
+f9c933eed17694eb542d9e7f42100728  ld/testsuite/ld-i386/tlsbinpic.s
+1d1a8f085cb88f347e6437da6ee8d8bf  ld/testsuite/ld-i386/tlsdesc.dd
+56e48a5bc09a2b38419fca204ead7f0c  ld/testsuite/ld-i386/tlsdesc.rd
+4ec4e709a96a11f0ed0cf6be12ab5fff  ld/testsuite/ld-i386/tlsdesc.s
+1b77cde328a2a4224b9c5beebb573b18  ld/testsuite/ld-i386/tlsdesc.sd
+40510d27f6f5e766cdd9c4881e958ced  ld/testsuite/ld-i386/tlsdesc.td
+4bb8cd4266640900774fe1b4ea80b868  ld/testsuite/ld-i386/tlsg.s
+52f26819c8f6efd2cd9d5b378518d949  ld/testsuite/ld-i386/tlsg.sd
+534ab7075af497c71c5d52d741b2955b  ld/testsuite/ld-i386/tlsgd1.dd
+63026313b9fbc91347fd5886a87bc353  ld/testsuite/ld-i386/tlsgd1.s
+9ed97b84890d783b4d7831dd37adf3d5  ld/testsuite/ld-i386/tlsgd2.d
+2d9d0b02593ede41b0a823be4445cc9b  ld/testsuite/ld-i386/tlsgd2.s
+0f868a0a5f9cae4adb6a4d76e88940fa  ld/testsuite/ld-i386/tlsgdesc.dd
+38914ff1571c535bfd90c870b4feab08  ld/testsuite/ld-i386/tlsgdesc.rd
+085d73ea85a181ebdc323e641e36d1cb  ld/testsuite/ld-i386/tlsgdesc.s
+a8274a590c125fa47d4c01ad12097b05  ld/testsuite/ld-i386/tlsie1.dd
+4d5c62f626a9092729a89456caef56e5  ld/testsuite/ld-i386/tlsie1.s
+0c53cf2b848a225ea05de9ce327469ea  ld/testsuite/ld-i386/tlsie2.d
+305f1b6124b40a0bd5d46380336613bb  ld/testsuite/ld-i386/tlsie2.s
+2ebeb06b9e469679c1137f8dd88648e5  ld/testsuite/ld-i386/tlsie3.d
+4f8063ce23f7412837909b1679da6002  ld/testsuite/ld-i386/tlsie3.s
+3c1230917a4bd2133b4fd0e4392ba5eb  ld/testsuite/ld-i386/tlsie4.d
+be1c017c2ef4b96e45141b7623f44f25  ld/testsuite/ld-i386/tlsie4.s
+2472189eb7d10de2b023266f3cd2b430  ld/testsuite/ld-i386/tlsie5.d
+bfb250693eb4f19f41d0e22612740f41  ld/testsuite/ld-i386/tlsie5.s
+2e74682a19e57586b9823e31ecf73198  ld/testsuite/ld-i386/tlsindntpoff.dd
+eb49cc94ea6fe44f33898f97f42637f2  ld/testsuite/ld-i386/tlsindntpoff.s
+a2258ef6fa985a63e188695313feafc2  ld/testsuite/ld-i386/tlsld1.dd
+8c31e6d117eb25b1940b227863d86626  ld/testsuite/ld-i386/tlsld1.s
+1bdd583619347d5963aaad2762e13865  ld/testsuite/ld-i386/tlslib.s
+131b46a77cfbdd6dca5bcc9fa4988cdd  ld/testsuite/ld-i386/tlsnopic.dd
+d323de8df6f10c7acdd9b6d9e94a01f5  ld/testsuite/ld-i386/tlsnopic.rd
+f74baa6eb70c0242343eeeb2ddba7017  ld/testsuite/ld-i386/tlsnopic.sd
+fd79d8e39eadeb4103c9d00fe0db5fe0  ld/testsuite/ld-i386/tlsnopic1.s
+aaa7d0d4d8b25c5f3462865cc7574b49  ld/testsuite/ld-i386/tlsnopic2.s
+458d207e2a9c36e3c4140f9fa80d6f09  ld/testsuite/ld-i386/tlspic.dd
+0682da90f3e1a1a3719df380835feec0  ld/testsuite/ld-i386/tlspic.rd
+a87e2c1b0b73ba2e42e339c317f289ba  ld/testsuite/ld-i386/tlspic.sd
+4e485196fb484d720e6512187e28dfc4  ld/testsuite/ld-i386/tlspic.td
+4b385578f91c4d3a011c1b67e781f755  ld/testsuite/ld-i386/tlspic1.s
+1be6d8e1547c710f7bc12028c6522832  ld/testsuite/ld-i386/tlspic2.s
+e20febaba77d2da3c9261f1e3d8a84c3  ld/testsuite/ld-i386/tlspie1.d
+bf844d037f8c9ed6f64a640bfb1598fc  ld/testsuite/ld-i386/tlspie1.s
+1d373c4f9365fedc0b3ab9009f548c82  ld/testsuite/ld-i386/tlspie2.d
+7eacd5087c13cbe24eb858f83a9be514  ld/testsuite/ld-i386/tlspie2.s
+b7f82843784cba881b7ea4785c86f790  ld/testsuite/ld-i386/vxworks1-lib.dd
+e79bf538427185b3ca75d00211102266  ld/testsuite/ld-i386/vxworks1-lib.nd
+a0819073ff1965a830139df2e13fed37  ld/testsuite/ld-i386/vxworks1-lib.rd
+5c0f0bd45acc45bbd63ef60c5c244d8f  ld/testsuite/ld-i386/vxworks1-lib.s
+6dbdc5d4346169b9a3af98707d77be72  ld/testsuite/ld-i386/vxworks1-lib.td
+57e13e14adacc62cab22da622bbcb01e  ld/testsuite/ld-i386/vxworks1-static.d
+8240644ff6e564425c5c3ed86538e298  ld/testsuite/ld-i386/vxworks1.dd
+fe0833150ad45b3187eaec9f4ee96ccd  ld/testsuite/ld-i386/vxworks1.ld
+1f702480f27e22a8cae404bd9288c974  ld/testsuite/ld-i386/vxworks1.rd
+94b6da333cef7b619c459007a7afbbe5  ld/testsuite/ld-i386/vxworks1.s
+165ed1561458c0973255f985be876845  ld/testsuite/ld-i386/vxworks2-static.sd
+3f44beb3168341e8a45bfef5bb7e4076  ld/testsuite/ld-i386/vxworks2.s
+7afb4e2fc8be35ad985dcb2e21b7cbef  ld/testsuite/ld-i386/vxworks2.sd
+75d3de90ae0af66942afe3c19de40dfd  ld/testsuite/ld-i386/warn1.d
+cdf75144fa202701e59c77afe5e9adae  ld/testsuite/ld-i386/warn1.s
+3a4d9e7d99555e90d70ca58fb8d82cd1  ld/testsuite/ld-i386/zero.s
+1909c12b33ef9687eb6af854ae5fb6bf  ld/testsuite/ld-ia64/ia64.exp
+ef16f67383acdaaea0d59b046f51d940  ld/testsuite/ld-ia64/line.exp
+f58ac156c302a4a37579dd871018c503  ld/testsuite/ld-ia64/link-order.d
+6d0f24ad075bbdb8e8f0c39bd9eafbc0  ld/testsuite/ld-ia64/local1.d
+9f911aada66fa0c166c34664d8ae58c6  ld/testsuite/ld-ia64/local1.map
+45c2ee7ef4a936af8792999bc0ccf44d  ld/testsuite/ld-ia64/local1.s
+06ef53a0168a0c91bb4c68dc3afc293b  ld/testsuite/ld-ia64/merge1.d
+beb0c44acd970fe4c427256cd7d831a2  ld/testsuite/ld-ia64/merge1.s
+98e0b78c20d0cd7801cb7e515c3a68e5  ld/testsuite/ld-ia64/merge2.d
+a868b7b0681c6c238417e4bec0633bd2  ld/testsuite/ld-ia64/merge2.s
+d83f6380e0e28fdd3a1fbbbe7ad4bdcb  ld/testsuite/ld-ia64/merge3.d
+3d3e06880036e684aeed1a68d7ef0f95  ld/testsuite/ld-ia64/merge3.s
+c9dd12b089e1aeb0c0a88a1a294f8576  ld/testsuite/ld-ia64/merge4.d
+f508927ed0b65390c57a6a996644a8eb  ld/testsuite/ld-ia64/merge4.s
+b2b540be1a334a363a1fc9c8a40173f9  ld/testsuite/ld-ia64/merge5.d
+7fb26d27806c80c93a886bfbf89daeda  ld/testsuite/ld-ia64/merge5.s
+8ec174d922ffce784b6c99f95dda9d3c  ld/testsuite/ld-ia64/tlsbin.dd
+717ad7a3d785354a0f72a2273b7ce6f5  ld/testsuite/ld-ia64/tlsbin.rd
+e493af684ae154e5de6c44ac33c9b9bf  ld/testsuite/ld-ia64/tlsbin.s
+1dd796f756e270667007008752d2e9ee  ld/testsuite/ld-ia64/tlsbin.sd
+5425837cb644916b8fe5160eb7cac50a  ld/testsuite/ld-ia64/tlsbin.td
+6351909433c62754cacb97095fbce3cb  ld/testsuite/ld-ia64/tlsbinpic.s
+e0b0a05afe5e6efd10bc9fa42a6a0731  ld/testsuite/ld-ia64/tlsg.s
+7dbb29f667fa0797b82d97e60dea87ba  ld/testsuite/ld-ia64/tlsg.sd
+1b26633dd00cb298fda05dd396fa6d88  ld/testsuite/ld-ia64/tlslib.s
+c3768bbbc35442a51b419997baf497da  ld/testsuite/ld-ia64/tlspic.dd
+afea8bcec5e1cb7941be064ba247f43e  ld/testsuite/ld-ia64/tlspic.rd
+1bac51ec2817188e77fcf070995210c7  ld/testsuite/ld-ia64/tlspic.sd
+4a995a6ff0cbe574e7514ac741408eac  ld/testsuite/ld-ia64/tlspic.td
+0d107c5a1c032fcfa98538191696c5d4  ld/testsuite/ld-ia64/tlspic1.s
+1be6d8e1547c710f7bc12028c6522832  ld/testsuite/ld-ia64/tlspic2.s
+cb7eab87f6359afcce07348873f889ef  ld/testsuite/ld-ia64/undefined.s
+54a3f0e6956e0ba92dc756b923be63c7  ld/testsuite/ld-ifunc/binutils.exp
+9cc79490ef74911c65bf9175cf722c6f  ld/testsuite/ld-ifunc/ifunc-1-local-x86.d
+ace31ba9f2c7654cf96162af09051cf6  ld/testsuite/ld-ifunc/ifunc-1-local-x86.s
+d0464020e48e8dc0eaed21fefd1e659f  ld/testsuite/ld-ifunc/ifunc-1-x86.d
+1ef34c7eba10038c97f00445717c80f7  ld/testsuite/ld-ifunc/ifunc-1-x86.s
+944d8592dc4a7c764677faf63a207602  ld/testsuite/ld-ifunc/ifunc-10-i386.d
+a8ed4afd6fad414bee6c05ed27794fc5  ld/testsuite/ld-ifunc/ifunc-10-i386.s
+2e5476a79546fb8c24820be4a316ab81  ld/testsuite/ld-ifunc/ifunc-10-x86-64.d
+bea1bb1dfc873471c7aaa3c88618d5a6  ld/testsuite/ld-ifunc/ifunc-10-x86-64.s
+944d8592dc4a7c764677faf63a207602  ld/testsuite/ld-ifunc/ifunc-11-i386.d
+1a0b0e1d75aaa2649329fa1a7d30c2ce  ld/testsuite/ld-ifunc/ifunc-11-i386.s
+2e5476a79546fb8c24820be4a316ab81  ld/testsuite/ld-ifunc/ifunc-11-x86-64.d
+1b0289afa3a43a53b5f79d2f3bf4d73a  ld/testsuite/ld-ifunc/ifunc-11-x86-64.s
+1571bc7a00b4b6a6c842e0c18680ea21  ld/testsuite/ld-ifunc/ifunc-12-i386.d
+51f087f6b851251109eaaedf229d49eb  ld/testsuite/ld-ifunc/ifunc-12-i386.s
+0379f2fafebec90c929c970bc893ca04  ld/testsuite/ld-ifunc/ifunc-12-x86-64.d
+c5d904e46a444774c06e39c03bec94e5  ld/testsuite/ld-ifunc/ifunc-12-x86-64.s
+e3665cae20b295a927e787bae8b9c017  ld/testsuite/ld-ifunc/ifunc-13-i386.d
+fb55cd07e81221f0233e3efc7e83e88b  ld/testsuite/ld-ifunc/ifunc-13-x86-64.d
+8f25b51a30ab1a2d47a6699bf6a7de72  ld/testsuite/ld-ifunc/ifunc-13a-i386.s
+b9572b418294bff5a7551c45d1485af9  ld/testsuite/ld-ifunc/ifunc-13a-x86-64.s
+a064bb4c91988373ef0548639f5e689f  ld/testsuite/ld-ifunc/ifunc-13b-i386.s
+a064bb4c91988373ef0548639f5e689f  ld/testsuite/ld-ifunc/ifunc-13b-x86-64.s
+d0f1714e4d80e23af3d3fc28e6c72b4c  ld/testsuite/ld-ifunc/ifunc-14-i386.d
+d9883f726e8bbfbd7203affe7233db8a  ld/testsuite/ld-ifunc/ifunc-14-x86-64.d
+fb6d109c14fc66d6234c2c7c539fe095  ld/testsuite/ld-ifunc/ifunc-14a.s
+b5aff5ef073fa09a0dbbfd555e4ff66c  ld/testsuite/ld-ifunc/ifunc-14b.s
+3196233b7dd59c8abf0a4d102348d8c5  ld/testsuite/ld-ifunc/ifunc-15-i386.d
+ddb73d1cd99a95fe800cc099a7f627da  ld/testsuite/ld-ifunc/ifunc-15-i386.s
+975ba252afac4003cc5afb81e8341b3e  ld/testsuite/ld-ifunc/ifunc-15-x86-64.d
+24590608e6a9d6df360f4a007924b8ed  ld/testsuite/ld-ifunc/ifunc-15-x86-64.s
+b14911e14aa4147c7e48720c958dd9fd  ld/testsuite/ld-ifunc/ifunc-2-i386.d
+5450011e55e527e9c41f747e20d93356  ld/testsuite/ld-ifunc/ifunc-2-i386.s
+b14911e14aa4147c7e48720c958dd9fd  ld/testsuite/ld-ifunc/ifunc-2-local-i386.d
+0ed85769aaa30ec681de3f44e8b763b1  ld/testsuite/ld-ifunc/ifunc-2-local-i386.s
+ea70d3f901e675db719d68d665efc0f3  ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d
+1c39b0c1b74d581411debed0c6eb67e6  ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.s
+ea70d3f901e675db719d68d665efc0f3  ld/testsuite/ld-ifunc/ifunc-2-x86-64.d
+1c39b0c1b74d581411debed0c6eb67e6  ld/testsuite/ld-ifunc/ifunc-2-x86-64.s
+cec051f23f977dd374cdf989a646d79d  ld/testsuite/ld-ifunc/ifunc-3-x86.s
+31905fb416818a1606133ae70d675464  ld/testsuite/ld-ifunc/ifunc-3a-x86.d
+6e0c8a146aeb44cdd145452d5884e9e3  ld/testsuite/ld-ifunc/ifunc-3b-x86.d
+330efae2c2c55b0bb8cd97893a7768cb  ld/testsuite/ld-ifunc/ifunc-4-local-x86.d
+0d74f7f1a3e809fa3c19babc8e826e2e  ld/testsuite/ld-ifunc/ifunc-4-local-x86.s
+330efae2c2c55b0bb8cd97893a7768cb  ld/testsuite/ld-ifunc/ifunc-4-x86.d
+24e5b658bf605597f36312d4d57c1d52  ld/testsuite/ld-ifunc/ifunc-4-x86.s
+46a17e657ce4e8c7105e7f96aeb8809d  ld/testsuite/ld-ifunc/ifunc-4a-x86.d
+b6f602ca474976d6c3a5f501303fa026  ld/testsuite/ld-ifunc/ifunc-5-i386.s
+19fe7c13fb1d09f10a797eb2ef7b614a  ld/testsuite/ld-ifunc/ifunc-5-local-i386.s
+34166ca01692e76c29f009ceb28cf455  ld/testsuite/ld-ifunc/ifunc-5-local-x86-64.s
+cb32ce224186652e3e17cc21090aa914  ld/testsuite/ld-ifunc/ifunc-5-x86-64.s
+4c7e11d13f7849ad3843d8c5843e1dec  ld/testsuite/ld-ifunc/ifunc-5a-i386.d
+68b83eafc3e282540f275a94ef698316  ld/testsuite/ld-ifunc/ifunc-5a-local-i386.d
+00d3f6b3a8d2647bf9caab9474572c4f  ld/testsuite/ld-ifunc/ifunc-5a-local-x86-64.d
+ab6453df0fcce699fa14e3f16ac08764  ld/testsuite/ld-ifunc/ifunc-5a-x86-64.d
+40a7b582f5f0ae2d19ddaafe9eaa9d97  ld/testsuite/ld-ifunc/ifunc-5b-i386.d
+6d16ccf06c97a5c7727e397aa7bfcfbc  ld/testsuite/ld-ifunc/ifunc-5b-local-i386.d
+103356fa54f7510ebb11e1796d3fe237  ld/testsuite/ld-ifunc/ifunc-5b-local-x86-64.d
+3d1a94dda9922568a16ad8b32c3664b9  ld/testsuite/ld-ifunc/ifunc-5b-x86-64.d
+0a6d3eff262d42539ba730775a9b40e2  ld/testsuite/ld-ifunc/ifunc-5r-local-i386.d
+a4c4f736d7099b3cd5aaf89d1d354677  ld/testsuite/ld-ifunc/ifunc-5r-local-x86-64.d
+c33bd20b84debeef306fbac51829d907  ld/testsuite/ld-ifunc/ifunc-6-i386.s
+fcb22cf8a1f82a48942ed7db399e8991  ld/testsuite/ld-ifunc/ifunc-6-x86-64.s
+9e9cddc515d5c76e1d37ada15625ac4f  ld/testsuite/ld-ifunc/ifunc-6a-i386.d
+dd69dff6d6f29a2fb47fb84bef86d39e  ld/testsuite/ld-ifunc/ifunc-6a-x86-64.d
+aa56268b6d3699099403c9671116b33b  ld/testsuite/ld-ifunc/ifunc-6b-i386.d
+982979daf8108fdd178362630417119a  ld/testsuite/ld-ifunc/ifunc-6b-x86-64.d
+d2bc7a98e1ad3f5facb4df516e58643f  ld/testsuite/ld-ifunc/ifunc-7-i386.s
+6e017e80c10f7b0ceb5e6d93357a836a  ld/testsuite/ld-ifunc/ifunc-7-x86-64.s
+b0367de66362fb419d7d15833b4171ed  ld/testsuite/ld-ifunc/ifunc-7a-i386.d
+ad222808f38f3f529802c8bfd986c915  ld/testsuite/ld-ifunc/ifunc-7a-x86-64.d
+f071da74779f564eb421eaf7ee0f294c  ld/testsuite/ld-ifunc/ifunc-7b-i386.d
+2509498bbd43a843b1912cefd2b9d3e9  ld/testsuite/ld-ifunc/ifunc-7b-x86-64.d
+a08d86190092c51c1e03fab075dfdda6  ld/testsuite/ld-ifunc/ifunc-8-i386.d
+8ceeb8e10866511cd86eff1fc0de5c3b  ld/testsuite/ld-ifunc/ifunc-8-x86-64.d
+ff52b26ccf21a1a818028ec0c49d21b0  ld/testsuite/ld-ifunc/ifunc-8a-i386.s
+c33bfa83931c45521c6e26ea02d5210c  ld/testsuite/ld-ifunc/ifunc-8a-x86-64.s
+4b342a6f2f139f8ee1cdd8467c882b33  ld/testsuite/ld-ifunc/ifunc-8b-i386.s
+4b342a6f2f139f8ee1cdd8467c882b33  ld/testsuite/ld-ifunc/ifunc-8b-x86-64.s
+44a06231c791259992a3a242397c2b69  ld/testsuite/ld-ifunc/ifunc-9-x86.d
+b8920736ffb9e4c897a1c81ab98b35f0  ld/testsuite/ld-ifunc/ifunc-9-x86.s
+d12ae37b8e1f5b9019c1e3e2afb8153f  ld/testsuite/ld-ifunc/ifunc.exp
+8a7b88909ed4d84e3d7f3062637e9b79  ld/testsuite/ld-ifunc/lib.c
+701455d51e8774d020b357d1c3b38367  ld/testsuite/ld-ifunc/prog.c
+a6407fc06c5f396064f2b3438cdbc266  ld/testsuite/ld-ifunc/test-1.c
+b5cd1bbd02a9b99f7f210a24255ffd0c  ld/testsuite/ld-ifunc/test-2.c
+5e692e5e97c771d0e2e5048b44fd0854  ld/testsuite/ld-libs/lib-1.s
+ebb73d4ce0e23c5f2bd2771f10f3505b  ld/testsuite/ld-libs/lib-2.d
+dbb96155f844adc2ad44b4cb85c1fd97  ld/testsuite/ld-libs/lib-2.s
+fc7d5109e6b60e7d53e9cccb81d1d359  ld/testsuite/ld-libs/libs.exp
+05a3d3ea0d652f9bc4bc1d813e085927  ld/testsuite/ld-linkonce/linkonce.exp
+5193ef30618a2f1f3af9019b7f4f62de  ld/testsuite/ld-linkonce/x.s
+0f2ec669dedf9925f6ae0db3b1a43506  ld/testsuite/ld-linkonce/y.s
+525c44e6b03ce4357317f7dd3731d299  ld/testsuite/ld-linkonce/zeroeh.ld
+3402fd8f52353a44ac4a9011314bbdbf  ld/testsuite/ld-linkonce/zeroehl32.d
+d4849e6542dd8b7ca3142e235d2b144b  ld/testsuite/ld-m68hc11/adj-brset.d
+d064b67c8fa10a7c428de1ea6b9a1834  ld/testsuite/ld-m68hc11/adj-brset.s
+23949bf947540228ba8d72007abbd334  ld/testsuite/ld-m68hc11/adj-jump.d
+f8a56fc695e6ebcf52992449c5d76123  ld/testsuite/ld-m68hc11/adj-jump.s
+f2536953f333e9c10fd61191bd035e1b  ld/testsuite/ld-m68hc11/bug-1403.d
+062e1dc7481f152c9b001e94f92b296a  ld/testsuite/ld-m68hc11/bug-1403.s
+f3d845900cf3e345e78e8c3bec1ba8d1  ld/testsuite/ld-m68hc11/bug-1417.d
+4f8edafd4ad832f9189f7314a7b5f362  ld/testsuite/ld-m68hc11/bug-1417.s
+9d7f22b8c0e82bbde0bac7d72d89c4f6  ld/testsuite/ld-m68hc11/bug-3331.d
+6c76f540acdb2c2c1146f9445b6d85a7  ld/testsuite/ld-m68hc11/bug-3331.s
+1a8ffcaad7f9e84c1a1d1bd304ad8557  ld/testsuite/ld-m68hc11/far-hc11.d
+1361ee4f406e378eadeb5c629ba2d8a3  ld/testsuite/ld-m68hc11/far-hc11.s
+8aa3bad7129045a65da13eb15c286a54  ld/testsuite/ld-m68hc11/far-hc12.d
+abab65605cd8069cfb12e2bfb6ed0d7a  ld/testsuite/ld-m68hc11/far-hc12.ld
+c66bf3caa9a73d1c7af542339777d150  ld/testsuite/ld-m68hc11/far-hc12.s
+062d67e556aa82cb73f9c74135511aed  ld/testsuite/ld-m68hc11/link-hc12.s
+21f1eac8547085190c61077bf5de4016  ld/testsuite/ld-m68hc11/link-hcs12.d
+8f9300e38e9f0e03d41c02ab51a6fe94  ld/testsuite/ld-m68hc11/link-hcs12.s
+1c5d08d78e010248731f156f853fa4c4  ld/testsuite/ld-m68hc11/m68hc11.exp
+bdfe2be8c102635c96318d5b5a441e70  ld/testsuite/ld-m68hc11/relax-direct.d
+4b6225fc6c3bd84cfb4756daa73871b0  ld/testsuite/ld-m68hc11/relax-direct.s
+7d4b0b484e170fa223129467648ce61c  ld/testsuite/ld-m68hc11/relax-group.d
+5f6185c53d79c83c661fbf096788bf1b  ld/testsuite/ld-m68hc11/relax-group.s
+bd0d77a42707a1a30aa30a4d4cba1fce  ld/testsuite/ld-m68k/got-1.d
+cc5e380add576706205ea6d7ff57ea74  ld/testsuite/ld-m68k/got-1.s
+c9743fc977113ae4f3981ea8bf789e03  ld/testsuite/ld-m68k/got-multigot-12-13-14-34-35-ok.d
+64597ba24c8a3a527ab4d86cea9071db  ld/testsuite/ld-m68k/got-multigot-14-ok.d
+d1a55a1211bde7cc2542b745250bc4e0  ld/testsuite/ld-m68k/got-multigot-15-er.d
+295cec24b15d83ee5ea92ddfb240602c  ld/testsuite/ld-m68k/got-negative-12-13-14-34-ok.d
+d73589a3a0e02601aa50066f14028cc1  ld/testsuite/ld-m68k/got-negative-12-13-14-35-er.d
+295cec24b15d83ee5ea92ddfb240602c  ld/testsuite/ld-m68k/got-negative-14-ok.d
+681d4d181a9e9d1c1b34ebf47bdd8381  ld/testsuite/ld-m68k/got-negative-15-er.d
+5d1e61d3323d8e159922912c824ac209  ld/testsuite/ld-m68k/got-single-12-ok.d
+7603fdc8f523e8e5b1a2609688aa400f  ld/testsuite/ld-m68k/got-single-13-er.d
+be898d22bfd9f57e761859dee750a7ba  ld/testsuite/ld-m68k/got-xgot-12-13-14-15-34-35-ok.d
+4bcbba04fa72a8cf0c4d36e5cf41c655  ld/testsuite/ld-m68k/got-xgot-15-ok.d
+3d66b1dcb169ee2296a57f40470d3d03  ld/testsuite/ld-m68k/isaa-mac.d
+fd09cc020dd5e6330dfdc9b18283bc6d  ld/testsuite/ld-m68k/isaa-mac.s
+7788f747bf8978d7dd787ec4e3a64c4e  ld/testsuite/ld-m68k/isaa-nodiv.s
+70ebca0c69ece585152b92e085c7a2c4  ld/testsuite/ld-m68k/isaa.d
+bc863c4af78043879d4732211b98990f  ld/testsuite/ld-m68k/isaa.s
+e1ea1dd9c58d7c05a5afa9ed9060a960  ld/testsuite/ld-m68k/isaaplus.d
+59604ffeea6bd5959eebc26fcfca4007  ld/testsuite/ld-m68k/isaaplus.s
+fbf6b20c03d4581ffadd57ad9d4b37df  ld/testsuite/ld-m68k/isab-float.d
+40046811c312fa8b71a312e12c0a9d70  ld/testsuite/ld-m68k/isab-float.s
+4dc937ce9efa1cbfe790ec4319865ab9  ld/testsuite/ld-m68k/isab-nousp.s
+00af175e146ef2a68df76cfebb4842b8  ld/testsuite/ld-m68k/isab.d
+1941399b05bb80ea485c3ea8d1fba8ff  ld/testsuite/ld-m68k/isab.s
+c8ad52290dc7441c67fa1ff519a5da46  ld/testsuite/ld-m68k/m68k-got.exp
+14c2b62e1ad6eb34f775d126fa1608aa  ld/testsuite/ld-m68k/m68k.exp
+f2230989919c0fb529bad36510c345d2  ld/testsuite/ld-m68k/merge-error-1a.d
+d142e6a1ea2d9b2f64a0439381469c73  ld/testsuite/ld-m68k/merge-error-1a.s
+dbcf9fdd939e827f4f1858c21dfa0e8c  ld/testsuite/ld-m68k/merge-error-1b.d
+d142e6a1ea2d9b2f64a0439381469c73  ld/testsuite/ld-m68k/merge-error-1b.s
+336f5a8bee8267818dfe299f1fdf4a73  ld/testsuite/ld-m68k/merge-error-1c.d
+1bf9feb7409956c01a54844d96a4bffd  ld/testsuite/ld-m68k/merge-error-1d.d
+2177520e7c8602f768de1624768bc451  ld/testsuite/ld-m68k/merge-error-1e.d
+ea81ec679d10bdfb7d108ac2b9f7a14a  ld/testsuite/ld-m68k/merge-ok-1a.d
+4abb166e0b29817f7db4f89b7596fc84  ld/testsuite/ld-m68k/merge-ok-1b.d
+6017935bb4fcfb908ca563c4d8b0e76c  ld/testsuite/ld-m68k/merge-ok-1c.d
+1748e88a9ed6471d81aaf84f8f11480f  ld/testsuite/ld-m68k/merge.ld
+86d0bd6729da092642038e3ba4125135  ld/testsuite/ld-m68k/plt1-68020.d
+446754b2bdb238ef7e6f47acdcc42358  ld/testsuite/ld-m68k/plt1-cpu32.d
+843ed92b08210cb34ef543decc158313  ld/testsuite/ld-m68k/plt1-empty.s
+95b5c59d6c7572a1116b51c8d576799b  ld/testsuite/ld-m68k/plt1-isab.d
+40e382a0efaf53c44faf348d84cdc7e5  ld/testsuite/ld-m68k/plt1-isac.d
+d76b655b64da150400465e7439eeb011  ld/testsuite/ld-m68k/plt1.ld
+b4b0a11671663569fc42bc967928eaff  ld/testsuite/ld-m68k/plt1.s
+21a9da34bb8287450f9f555a65e648f8  ld/testsuite/ld-m68k/tls-def-1.d
+32e644a0075a072f97f55ab5ca949e68  ld/testsuite/ld-m68k/tls-def-1.s
+f2d632d504e939807d932a7e3757533e  ld/testsuite/ld-m68k/tls-gd-1.d
+365b9991f1c8d86f60a630da61fb3428  ld/testsuite/ld-m68k/tls-gd-1.d2
+d43277a919b054856cd85f8613256ab2  ld/testsuite/ld-m68k/tls-gd-1.d3
+8acb4be54e9fee56736afe1b4ed98fe1  ld/testsuite/ld-m68k/tls-gd-1.s
+71bc92ab15ef0972288548b39ceb1aa8  ld/testsuite/ld-m68k/tls-gd-2.d
+dee8f41e45f307bb18b81cd60b76d4b2  ld/testsuite/ld-m68k/tls-gd-2.s
+ea47f7f63370018679732154c0be8d23  ld/testsuite/ld-m68k/tls-gd-3.d
+c27927fb3d8790f40e5a4f1a1e77dd44  ld/testsuite/ld-m68k/tls-gd-3.s
+ba928ec8b9212d44ec4cb469f5cf33b2  ld/testsuite/ld-m68k/tls-gd-ie-1.d
+51230d2891dc4d2aafa75b9d9d5cd85c  ld/testsuite/ld-m68k/tls-gd-ie-1.s
+c6c19d50f1adf38984593e5f5451520a  ld/testsuite/ld-m68k/tls-ie-1.d
+2cb92a892bc92a77abef6336ba5bbf3c  ld/testsuite/ld-m68k/tls-ie-1.s
+50b3f81fc20aa4d8575dd10f2fb68b16  ld/testsuite/ld-m68k/tls-ld-1.d
+8116727480004c58ce0214cbf6578e85  ld/testsuite/ld-m68k/tls-ld-1.s
+0b2a3c63cb7f0e6a6393f77c6f496033  ld/testsuite/ld-m68k/tls-ld-2.d
+b7323a3d641be4410896a46800c93169  ld/testsuite/ld-m68k/tls-ld-2.s
+09e69e02f38846954cca2fa11957f2ac  ld/testsuite/ld-m68k/tls-le-1.s
+cc0dc2a05a96e8112c810ca453b05c07  ld/testsuite/ld-m68k/tls-main-1.d
+cce0a9f3976a215a65ada87c775006b5  ld/testsuite/ld-m68k/tls-main-1.s
+31387110658a3d1fa295871df8e7fe4d  ld/testsuite/ld-m68k/tls-no-1.s
+c466907d99c3f78545808a0e0e1a20e3  ld/testsuite/ld-mep/mep.exp
+d20b99dce905a2312874fa91b13336f3  ld/testsuite/ld-mep/mep1.ld
+1793b72c9eb6d9aba1a29c524673b1de  ld/testsuite/ld-mep/mep1.s
+eaab780bec027c6ef6ac334619ba2b18  ld/testsuite/ld-mips-elf/attr-gnu-4-0.s
+b164f9c15b6a8b4c06a300710e728fdd  ld/testsuite/ld-mips-elf/attr-gnu-4-00.d
+863ad8cfba6fb8589a69ad00a90cea56  ld/testsuite/ld-mips-elf/attr-gnu-4-01.d
+a183f9aeacdb839c9570848ea62877b4  ld/testsuite/ld-mips-elf/attr-gnu-4-02.d
+3d26e1a9bdd16a3576c0ff42075721a6  ld/testsuite/ld-mips-elf/attr-gnu-4-03.d
+13cf2bf7c8d4c906b47e8e98fbbc24d9  ld/testsuite/ld-mips-elf/attr-gnu-4-04.d
+295bd66ae2d39f17210c3da92b24d5aa  ld/testsuite/ld-mips-elf/attr-gnu-4-05.d
+018b97f0a56402eb7f0edfcc26b8cd1d  ld/testsuite/ld-mips-elf/attr-gnu-4-1.s
+cc93c85d1686dafa0b5c435b1fee7a26  ld/testsuite/ld-mips-elf/attr-gnu-4-10.d
+d0b748e08daab28b520a79ec87cb90dc  ld/testsuite/ld-mips-elf/attr-gnu-4-11.d
+6e817802a60026e48c4e3378e709049e  ld/testsuite/ld-mips-elf/attr-gnu-4-12.d
+3da861eed3fe21344d4b2c49810916a9  ld/testsuite/ld-mips-elf/attr-gnu-4-13.d
+7e9c2cdf5ec01a659d2f59d45e9a4e91  ld/testsuite/ld-mips-elf/attr-gnu-4-14.d
+070b8382d6efd13336a5a9f7ded3de2b  ld/testsuite/ld-mips-elf/attr-gnu-4-15.d
+eac9dfdfc46cc5dd33f029ec52ee6793  ld/testsuite/ld-mips-elf/attr-gnu-4-2.s
+b610c8981ebcf1fec15126ac7bfeccef  ld/testsuite/ld-mips-elf/attr-gnu-4-20.d
+1a5e16d50a54250400809fbf9e06783a  ld/testsuite/ld-mips-elf/attr-gnu-4-21.d
+817ac60707ec06f10501520d8a734499  ld/testsuite/ld-mips-elf/attr-gnu-4-22.d
+6c016688b2dfbc7357c868b789bb4c0f  ld/testsuite/ld-mips-elf/attr-gnu-4-23.d
+72a6905754eca80e73876a16fe59966f  ld/testsuite/ld-mips-elf/attr-gnu-4-24.d
+b3c2d69ab3d55c11d024f47dac76dcab  ld/testsuite/ld-mips-elf/attr-gnu-4-25.d
+7fd562a8f705fa9e3d082842773a9fd7  ld/testsuite/ld-mips-elf/attr-gnu-4-3.s
+2cab259c1924ac7329f6f5ebba5d0588  ld/testsuite/ld-mips-elf/attr-gnu-4-30.d
+205972f6d1a117960675cd65448502d0  ld/testsuite/ld-mips-elf/attr-gnu-4-31.d
+889deb9006c21284a8a8d1920826ca48  ld/testsuite/ld-mips-elf/attr-gnu-4-32.d
+f5b41bd73f8127f5def3a3a96bf6fe2e  ld/testsuite/ld-mips-elf/attr-gnu-4-33.d
+080c5281707b74db7fc2ccd811e79fc8  ld/testsuite/ld-mips-elf/attr-gnu-4-34.d
+2d1f48cfe6cbbb0b81cb5e411d9ae4cd  ld/testsuite/ld-mips-elf/attr-gnu-4-35.d
+bd99d860c5949dcff583df0a100a0ab3  ld/testsuite/ld-mips-elf/attr-gnu-4-4.s
+275e6f85cd22392edc20ccb85051dbc5  ld/testsuite/ld-mips-elf/attr-gnu-4-40.d
+416240e316cfc790fd260645c90c80bd  ld/testsuite/ld-mips-elf/attr-gnu-4-41.d
+0f60ca57e348fe60fa213c9bcec4d0da  ld/testsuite/ld-mips-elf/attr-gnu-4-42.d
+e2e3335d240655d0b7012f2c920c3b29  ld/testsuite/ld-mips-elf/attr-gnu-4-43.d
+8445e0be7fa62bf2092053d873aa0d4a  ld/testsuite/ld-mips-elf/attr-gnu-4-44.d
+90e19887141bf237b75245459136e874  ld/testsuite/ld-mips-elf/attr-gnu-4-45.d
+45482e1b49bd87067a3336f5f3c22c8b  ld/testsuite/ld-mips-elf/attr-gnu-4-5.s
+92a344630c8ce051d1d15829aedfadd8  ld/testsuite/ld-mips-elf/attr-gnu-4-51.d
+1e32a0a0418596e4b5f7a413d7c5a3da  ld/testsuite/ld-mips-elf/branch-misc-1.d
+6724eb67d96033cd62f6f0bbb0ba0357  ld/testsuite/ld-mips-elf/dyn-sec64.d
+a2e54355612fa6e667578c480a23b2ba  ld/testsuite/ld-mips-elf/dyn-sec64.ld
+38213eb1f211f160b6ccc4e962fea3d7  ld/testsuite/ld-mips-elf/dyn-sec64.s
+1187adc6c3afe730321bec7d7cfa8cb9  ld/testsuite/ld-mips-elf/eh-frame1-n32.d
+aec5a394a5d64425e1a7d8d392a45606  ld/testsuite/ld-mips-elf/eh-frame1-n64.d
+6533ce16a794d9ef136aa92cc3fe72c5  ld/testsuite/ld-mips-elf/eh-frame1.ld
+e6e05cd9d53743932b95addc3b98a8d8  ld/testsuite/ld-mips-elf/eh-frame1.s
+af9ffb598ffd241e5518223b8351ea66  ld/testsuite/ld-mips-elf/eh-frame2-n32.d
+b82d1135c4cb8e6a0660e3aeca4f0567  ld/testsuite/ld-mips-elf/eh-frame2-n64.d
+f675e0b8a1309bdc2c534f69597abc5f  ld/testsuite/ld-mips-elf/eh-frame3.d
+e1c0b3a142460f9e96bb95d86709a813  ld/testsuite/ld-mips-elf/eh-frame4.d
+df75730bfb47ed23d00d0275a59fc88e  ld/testsuite/ld-mips-elf/eh-frame5.d
+c9d3ca0439a89dfe4bc3ab7145f30fbe  ld/testsuite/ld-mips-elf/eh-frame5.ld
+35773ee20ada8ff563ed5b30a96e76fc  ld/testsuite/ld-mips-elf/eh-frame5.s
+845d1331d4ff9abf9b039b5df0c5e9bf  ld/testsuite/ld-mips-elf/elf-rel-got-n32.d
+2f1a2aac8769aa32876e430a94b53f3b  ld/testsuite/ld-mips-elf/elf-rel-got-n64-linux.d
+cbde251997630b9d83f7ef3505e886aa  ld/testsuite/ld-mips-elf/elf-rel-got-n64.d
+a8c10403e44be8caf8560c95471b3353  ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d
+1437216c9c999f056a639d9d277761ac  ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-linux.d
+f781c834948bf54e9a88db3a1e4ccdb6  ld/testsuite/ld-mips-elf/elf-rel-xgot-n64.d
+1c056f99cf7b167a12a16c864667d56a  ld/testsuite/ld-mips-elf/emit-relocs-1.d
+68726c174e72036ac5088bf9b1f81f96  ld/testsuite/ld-mips-elf/emit-relocs-1.ld
+9070e987231eb3b31f390146b225c6d6  ld/testsuite/ld-mips-elf/emit-relocs-1a.s
+04aea5d092fa2db166839099d0bc5491  ld/testsuite/ld-mips-elf/emit-relocs-1b.s
+54a45de7a7c51616578a54ecb6ef8c45  ld/testsuite/ld-mips-elf/got-dump-1.d
+b8d3e047cf470489e6c153167577b516  ld/testsuite/ld-mips-elf/got-dump-1.ld
+525b1ae7d8a1a97cc8f1bfcc6dc920f3  ld/testsuite/ld-mips-elf/got-dump-1.s
+0f8c9b9c799944f80acb18a157e2d453  ld/testsuite/ld-mips-elf/got-dump-2.d
+9fcd4b8fef5231301f105b69b472f41c  ld/testsuite/ld-mips-elf/got-dump-2.ld
+fa6b3d99eefa3a6aa98b71a637eefe35  ld/testsuite/ld-mips-elf/got-dump-2.s
+6fcc05e871317e5207248b70d9705422  ld/testsuite/ld-mips-elf/got-page-1.d
+a04d9e05c18665e618d7955d0144c4be  ld/testsuite/ld-mips-elf/got-page-1.ld
+f776dca2e6f11f44989f2005ecb58c2f  ld/testsuite/ld-mips-elf/got-page-1.s
+d1e4058580919ef3d515f1610569e646  ld/testsuite/ld-mips-elf/got-page-2.d
+7798b57c7ebb2cab4e917c7e4b1cc989  ld/testsuite/ld-mips-elf/got-page-2.s
+5e2545fe4e4a7f2876696a309f7a9cca  ld/testsuite/ld-mips-elf/got-page-3.d
+ed4f44b1dfbf7c5261938737527f3f7e  ld/testsuite/ld-mips-elf/got-page-3a.s
+1c026072dacc0d7337f714103bd5f946  ld/testsuite/ld-mips-elf/got-page-3b.s
+0507b477c2a903398fa809ab11cdaf1d  ld/testsuite/ld-mips-elf/got-page-3c.s
+59ae2f3f0063c59ae3fbb5a7b4bdbf36  ld/testsuite/ld-mips-elf/got-vers-1.dd
+bc27bd383137bf4d9952e46f5687659b  ld/testsuite/ld-mips-elf/got-vers-1.rd
+5b03f8316a8828f397651f1b1202d608  ld/testsuite/ld-mips-elf/got-vers-1.sd
+5e8c20a9046a75510e6dcc5c44d828fd  ld/testsuite/ld-mips-elf/got-vers-1.ver
+1df2d1e1679f721b863066c708fde7e0  ld/testsuite/ld-mips-elf/got-vers-1a.s
+c5f62e7b8a40978cfca1c566b1c91d0e  ld/testsuite/ld-mips-elf/got-vers-1b.s
+801d14a6810ebae1f5eefda4bac2a4d8  ld/testsuite/ld-mips-elf/hash1.s
+5b31b1eb31a18306ebe610d93aaa547c  ld/testsuite/ld-mips-elf/hash1a.d
+e0e0a1c03d1c09706bb585fa0b7607b4  ld/testsuite/ld-mips-elf/hash1b.d
+4099340571fa39b3c75cf24ea3bab07d  ld/testsuite/ld-mips-elf/hash1c.d
+fa9a8631c53e918392527840fab7e3b6  ld/testsuite/ld-mips-elf/jalbal.d
+f37571577f21fbd2380b2d67bec2003c  ld/testsuite/ld-mips-elf/jalbal.s
+1e46ae19324e1987c86e98f4d23952d2  ld/testsuite/ld-mips-elf/jaloverflow-2.d
+0f97678bd905b0f04380729e167f36ba  ld/testsuite/ld-mips-elf/jaloverflow-2.s
+3e51ac18ee129575a0a23f91113cf311  ld/testsuite/ld-mips-elf/jaloverflow.d
+00610e4306ae3ff6e932f3554c8bbb0c  ld/testsuite/ld-mips-elf/jaloverflow.s
+1538f1355aa100216daf62bcbf585535  ld/testsuite/ld-mips-elf/jalx-1.d
+2c106983bca32c56265a2e006793b712  ld/testsuite/ld-mips-elf/jalx-1.ld
+624a4512f6e70a1e07a4af46a74b84f8  ld/testsuite/ld-mips-elf/jalx-1.s
+9a24eb94b7e65a6dc1a373aad8d55341  ld/testsuite/ld-mips-elf/jalx-2-ex.s
+93b27f7f26409214bf2834dc33f8e296  ld/testsuite/ld-mips-elf/jalx-2-main.s
+6aaef432cfe83553dcf6814d5c74771a  ld/testsuite/ld-mips-elf/jalx-2-printf.s
+438cb0c7848d2350dcb0911f7adf442e  ld/testsuite/ld-mips-elf/jalx-2.dd
+25987c1715acb5400f204c95574a0cb7  ld/testsuite/ld-mips-elf/jalx-2.ld
+8afcb555ac802fbc018887f8f4ae23d3  ld/testsuite/ld-mips-elf/jr-to-b-1.d
+30792c630ceace95d660dde6e00dd8f2  ld/testsuite/ld-mips-elf/jr-to-b-1.s
+432f84db6dae443d96e55bdcaf87963f  ld/testsuite/ld-mips-elf/jr-to-b-2.d
+016b338411caa57dffb40e8ef3431cf2  ld/testsuite/ld-mips-elf/jr-to-b-2.s
+01cd283c225235f48e77375210951566  ld/testsuite/ld-mips-elf/jr.s
+aab541cd224ffdc668cde05593710d3c  ld/testsuite/ld-mips-elf/mips-dyn.ld
+760db145de029bfc7dff35652e11585f  ld/testsuite/ld-mips-elf/mips-elf-flags.exp
+c35bd2fc7cf0d5dc9c9e56bec1e91404  ld/testsuite/ld-mips-elf/mips-elf.exp
+368075c3db254e6302fcf5b9e9d1ec7d  ld/testsuite/ld-mips-elf/mips-lib.ld
+92f2128a15a5d4593d402ff9d7023bcd  ld/testsuite/ld-mips-elf/mips16-1.d
+bda3e92a35c420f4d0cf101be022eb7e  ld/testsuite/ld-mips-elf/mips16-1a.s
+785be539d405d32d87e61e6719da890d  ld/testsuite/ld-mips-elf/mips16-1b.s
+440ab43a0b0b2ee2de48388555a628f8  ld/testsuite/ld-mips-elf/mips16-and-micromips.d
+7c0dc0f214de744dfb19ad53e6d15562  ld/testsuite/ld-mips-elf/mips16-call-global-1.s
+261041546ae359e0cc90968f8ded97c8  ld/testsuite/ld-mips-elf/mips16-call-global-2.s
+83396521c10e6e0eaa1894df2fdb4837  ld/testsuite/ld-mips-elf/mips16-call-global-3.s
+bb7450279b5abaafc0cf67515d6bbeb1  ld/testsuite/ld-mips-elf/mips16-call-global.d
+e692a3c6a1d69cb438a1e5c1868af8f0  ld/testsuite/ld-mips-elf/mips16-hilo-n32.d
+09cde5e4cfc3ffba30c68e880df660d3  ld/testsuite/ld-mips-elf/mips16-hilo.d
+545fcec307a4e45f2b26b40ce0700269  ld/testsuite/ld-mips-elf/mips16-hilo.ld
+b3e4b204fc6c603a0ea6eb1ce3c29fae  ld/testsuite/ld-mips-elf/mips16-hilo.s
+06d124f197762fbed190c66d11bc6921  ld/testsuite/ld-mips-elf/mips16-intermix-1.s
+8646625108bdd2dcc23ad1e1a5d501a7  ld/testsuite/ld-mips-elf/mips16-intermix-2.s
+bdd2151726a6ac27b61020851bfc90e0  ld/testsuite/ld-mips-elf/mips16-intermix.d
+dbecde5b6f77ded6a957039faf0f1067  ld/testsuite/ld-mips-elf/mips16-local-stubs-1.d
+2241ceca1ee392127d41dbc282fbfa1d  ld/testsuite/ld-mips-elf/mips16-local-stubs-1.s
+81d37d76ce20ba52b220318eddd5e03f  ld/testsuite/ld-mips-elf/mips16-pic-1-dummy.s
+dfc2b6f52de2391e2e17693253d33e9e  ld/testsuite/ld-mips-elf/mips16-pic-1.dd
+c1e7ade5eafb7acd1602588df4c246a9  ld/testsuite/ld-mips-elf/mips16-pic-1.gd
+49625eea24fe06727d25b1d58bca504b  ld/testsuite/ld-mips-elf/mips16-pic-1.inc
+ad35d0afe62d0d68963b08a08fd8ad32  ld/testsuite/ld-mips-elf/mips16-pic-1.ld
+863b5b5184faaa52d04a96ad41cdc0f1  ld/testsuite/ld-mips-elf/mips16-pic-1a.s
+5aa79de6989506714f0c1ac7b7eba4da  ld/testsuite/ld-mips-elf/mips16-pic-1b.s
+8e557fb7902b49ce9b26de7f8b85e34f  ld/testsuite/ld-mips-elf/mips16-pic-2.ad
+3dd7d7801ff75d5e6560e3160b6138e9  ld/testsuite/ld-mips-elf/mips16-pic-2.dd
+3faf2dd2ece00efcf0e37044825927af  ld/testsuite/ld-mips-elf/mips16-pic-2.gd
+25c144f6871cc08cc46f488caac42d00  ld/testsuite/ld-mips-elf/mips16-pic-2.nd
+cc3510c0142aff6f61ff5013f5843fcd  ld/testsuite/ld-mips-elf/mips16-pic-2.rd
+4ede35108518b6b38ff791576a5ef2cf  ld/testsuite/ld-mips-elf/mips16-pic-2a.s
+b912c77f560fdec4351994c7f9513d5e  ld/testsuite/ld-mips-elf/mips16-pic-2b.s
+b543eacce1d2bec3d10693f2055d2ace  ld/testsuite/ld-mips-elf/mips16-pic-3.dd
+842060d2f54ac6bcef9e9f0bea9b6dec  ld/testsuite/ld-mips-elf/mips16-pic-3.gd
+489813beddf523f1092a863c1708ac0b  ld/testsuite/ld-mips-elf/mips16-pic-3.inc
+121a964d1332fe5cc9add7791515ddf9  ld/testsuite/ld-mips-elf/mips16-pic-3.rd
+a7e494cd288947d2c18fef7be4faebc8  ld/testsuite/ld-mips-elf/mips16-pic-3a.s
+203c5259e6bfec00f0a0c8fb8553ce21  ld/testsuite/ld-mips-elf/mips16-pic-3b.s
+46f23a15e7425e67aabacb465dab31e5  ld/testsuite/ld-mips-elf/mips16-pic-4.ver
+c491ed165d94555361d6fab5d010db01  ld/testsuite/ld-mips-elf/mips16-pic-4a.dd
+6e2b8bebe6cb536361b58a7f520a8ce0  ld/testsuite/ld-mips-elf/mips16-pic-4a.gd
+4b0f332e30127295e94516f41ca78ba3  ld/testsuite/ld-mips-elf/mips16-pic-4a.nd
+229965c1b80e1827c7e9b2e6bd080f23  ld/testsuite/ld-mips-elf/mips16-pic-4a.s
+fa8e0bdd2a55b5385e0a4af39c21b510  ld/testsuite/ld-mips-elf/mips16-pic-4b.dd
+9a6f8118e779f27cc3aa197cf3a2c608  ld/testsuite/ld-mips-elf/mips16-pic-4b.s
+8ebf7377448e525d7f43a2bff0f51dbd  ld/testsuite/ld-mips-elf/mips16-pic-4c.s
+2d378cca3ffbc36424f9f2837589e911  ld/testsuite/ld-mips-elf/mode-change-error-1.d
+d862a9d3c5154d7d8a0f685e9b500cfc  ld/testsuite/ld-mips-elf/mode-change-error-1a.s
+7155073aa28e0464fe88d592604e583b  ld/testsuite/ld-mips-elf/mode-change-error-1b.s
+ae026e1e5ffd2a267ebfe4d636059d42  ld/testsuite/ld-mips-elf/multi-got-1-1.s
+547edd71875ed91b371f99af69c969fb  ld/testsuite/ld-mips-elf/multi-got-1-2.s
+6bd9212db2700881be03f65cdc1f60cb  ld/testsuite/ld-mips-elf/multi-got-1.d
+da39823dd9ec88c55b245d79fcbb19bc  ld/testsuite/ld-mips-elf/multi-got-hidden-1.d
+9eb8263a7b17cc5f8f3f268cab6fd731  ld/testsuite/ld-mips-elf/multi-got-hidden-1.s
+0dfb48236919cce7fd8eb1d3aef98489  ld/testsuite/ld-mips-elf/multi-got-hidden-2.d
+99c68de31a553ed4556f6440f19f8615  ld/testsuite/ld-mips-elf/multi-got-hidden-2.s
+b0180cb7263b7943ec787e18ef17c0f5  ld/testsuite/ld-mips-elf/multi-got-no-shared-1.s
+ce39cc1939c286dd4991e0cfb54f9304  ld/testsuite/ld-mips-elf/multi-got-no-shared-2.s
+efbed788948cb30382ba0515961aad34  ld/testsuite/ld-mips-elf/multi-got-no-shared.d
+30a8a2f767dd0f081b746172c00544d5  ld/testsuite/ld-mips-elf/no-shared-1-n32.d
+c01d7a4c05171314b95ddfd8a7807f74  ld/testsuite/ld-mips-elf/no-shared-1-n64.d
+75f385bfa7b2c0ea116ab7dfd9c9d0e7  ld/testsuite/ld-mips-elf/no-shared-1-n64.s
+aadfbb91d834f9dea1576463eb929f1e  ld/testsuite/ld-mips-elf/no-shared-1-o32.d
+a60f9d4df6e56988bab95b2e313efbc0  ld/testsuite/ld-mips-elf/no-shared-1-o32.s
+9a0eb2758e0aeb72d632e46fb01f9fd4  ld/testsuite/ld-mips-elf/no-shared-1.ld
+b349d3e330560678a5e33c7dab0433f7  ld/testsuite/ld-mips-elf/pic-and-nonpic-1-rel.dd
+e53d909c95b7ecefacb3a8f7161cc866  ld/testsuite/ld-mips-elf/pic-and-nonpic-1-rel.nd
+5f361d6c916ff126b290651084d08fe6  ld/testsuite/ld-mips-elf/pic-and-nonpic-1.dd
+2e247c0a2b5057df818fcd3d0556982d  ld/testsuite/ld-mips-elf/pic-and-nonpic-1.ld
+6df59b03045bb5d0e4e98907336897bf  ld/testsuite/ld-mips-elf/pic-and-nonpic-1.nd
+636df59b96847177efff7e4dbf85fe12  ld/testsuite/ld-mips-elf/pic-and-nonpic-1a.s
+8f8066be39378af8ecd26b5d8ac11753  ld/testsuite/ld-mips-elf/pic-and-nonpic-1b.s
+35d5a8331571e5d69489dd665ece02ff  ld/testsuite/ld-mips-elf/pic-and-nonpic-2.d
+0234a0ddb572718f66bae8d63fc6d021  ld/testsuite/ld-mips-elf/pic-and-nonpic-2a.s
+6764e6db67e3a914ad463c69f2915f86  ld/testsuite/ld-mips-elf/pic-and-nonpic-2b.s
+326ab1fd4f743f19e06207587fb1ab7e  ld/testsuite/ld-mips-elf/pic-and-nonpic-3-error.d
+7ed0f6f4892ec292b505a22877575215  ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.dd
+4df312642c14c7d3bdf98c604d5c97b6  ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.gd
+06a5efd6ffd2d5633435531309eaf936  ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.ld
+ed84c5b0970802fd5cc5c1d58892c646  ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.s
+5dbd2e45c4dd3c3c5dc4a73e5effc8a7  ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd
+e5233a5bca870fc6f5452a9a175b94ef  ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.ad
+3076d15d6c14e03911b70a8d9b2b6023  ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.dd
+9a72343289dbd65e5b1f8626fba1992d  ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.gd
+575fea85123a8c2803e6cfe73aadea02  ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.ld
+99e1951a1a3cdfdfd3f928c10fe220c9  ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.nd
+a62c39fed21d31568febb508114eedce  ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.pd
+888172a03e85765eeca2c9aae3b2b9f7  ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.rd
+ebfedb2c710e4bc2d7114f3615babf07  ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.s
+be1b9b9a4a7a7db1453b66c93484ad0a  ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd
+67d0fe8c82542da8c2e095051647ed6a  ld/testsuite/ld-mips-elf/pic-and-nonpic-4-error.d
+c5beb74efb5aab7afb9cd4179bc54ed6  ld/testsuite/ld-mips-elf/pic-and-nonpic-4a.s
+41ffc74513f399800903d28bd0fd726c  ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.ad
+c94b0c21bf21e4f106db3e3b83263a77  ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.dd
+788c0d0e591998726ecc5518ab48488d  ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.gd
+1986c5ae746dd9168359eb2f172b4590  ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.ld
+32f332d8fee124c1be3ea91206b9e23c  ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.nd
+39731da008f5bb0a2bb0c77802a0370a  ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.rd
+eaf6964fc9fa4386f24c396a561f9a0f  ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.s
+a364f769d45910b0bfc71fccee583053  ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd
+98398b97dd636c86168f01e369af97d5  ld/testsuite/ld-mips-elf/pic-and-nonpic-5a.s
+be45e58a2b688c1cc6cdd351a316d75b  ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.ad
+3488ff77fadbcbc985e404479884c659  ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.dd
+1603051c5bb87ab95bb42bb0e3e78a82  ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.gd
+02e4fadf6cae47bd2b71ff68c831ece4  ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.ld
+93ebab355919ce36b53b4d3fad38e600  ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.nd
+c0561a7f93214272ba5a10ad0eb58f28  ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.pd
+43e52f191e4bf227cc00c4dcc4ed1ba7  ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.rd
+4def8c8a21ee2da9282483648295fd88  ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.s
+1f59d8393264a23e75648fd64f332dcf  ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd
+830a2fbfb96054d5b6816f42c946f580  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.ad
+64f9532f113d349bc895577f6e5ef3e9  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.dd
+7a5634a4e2ea01989208cb48f32a8d8e  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.gd
+3bf64cf9feb417fbd8c9999f2e467e3c  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.nd
+ad99d90f41c2c466855f2632fb06c209  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.pd
+d6b199287e84a6690bcba1fe9203ab52  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.rd
+8aaa1d586c63c85d8901aed5d53b5e33  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd
+34dd5961805d999d712253770313d077  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32a.s
+bb52fe4127e0c17d6de7e6ead15511c4  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32b.s
+3d69c8ab5a72235e7b60bb18f8f40b15  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32c.s
+377485f8e8164931b1d04e7c3a2fe543  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.ad
+f3094954aa7472f0d4fe695159938882  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.dd
+0011c68b572e93e49d96a05ff81a93e7  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.gd
+6ae475c23b08901a546b6753ba4cbc7f  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.nd
+a78f62b8afe08a2be5646bdfd9f25ceb  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.pd
+78690a72d4db7b219a4405edf2aaf39c  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.rd
+030ad44ee088b245c526bb1cb8ecfdae  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd
+34dd5961805d999d712253770313d077  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64a.s
+103c17ccd1c838002f3de6e9803012d9  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64b.s
+3d69c8ab5a72235e7b60bb18f8f40b15  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64c.s
+830a2fbfb96054d5b6816f42c946f580  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.ad
+1f143938c970a5143219dc4c7cf3dc3f  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.dd
+7a5634a4e2ea01989208cb48f32a8d8e  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.gd
+3bf64cf9feb417fbd8c9999f2e467e3c  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.nd
+ad99d90f41c2c466855f2632fb06c209  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.pd
+d6b199287e84a6690bcba1fe9203ab52  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.rd
+8aaa1d586c63c85d8901aed5d53b5e33  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd
+34dd5961805d999d712253770313d077  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32a.s
+c77015d0f24de1fcbaa8a703ce6f3479  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32b.s
+3d69c8ab5a72235e7b60bb18f8f40b15  ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32c.s
+a63578b0085dfd84d8e6f929f44c1eeb  ld/testsuite/ld-mips-elf/pic-and-nonpic-6.ld
+7520418cc156dc2eb353a7c527d0b7bc  ld/testsuite/ld-mips-elf/region1.d
+8bddba546baafcfd0c720e84198b224a  ld/testsuite/ld-mips-elf/region1.t
+19a77e97e16088a5a83b3916b5c9406f  ld/testsuite/ld-mips-elf/region1a.s
+dbaca5ab0c56146533bcb91837e1ec4c  ld/testsuite/ld-mips-elf/region1b.s
+d70bf451f5570cc8a71f1b92aab421d2  ld/testsuite/ld-mips-elf/rel32-n32.d
+0b2322ea91cf1abe07305e4afaacc2d7  ld/testsuite/ld-mips-elf/rel32-o32.d
+ddaac36abb5634e6b2fd1ed710875f2a  ld/testsuite/ld-mips-elf/rel32.s
+c7aebba022efb0ce03977ce3ef07d756  ld/testsuite/ld-mips-elf/rel64.d
+36bb8fc0b193491dbdcab5452d411825  ld/testsuite/ld-mips-elf/rel64.s
+37f70b74c9562c8a28c72145a36a9893  ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d
+ee55093b6504613d255c4fd06ff46d20  ld/testsuite/ld-mips-elf/relax-jalr-n32.d
+c9b07aa5eb8bc72ee659dd6aded85554  ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d
+73f2e464c48afdd595353e7de102e014  ld/testsuite/ld-mips-elf/relax-jalr-n64.d
+f5a605435fe5054c5d7563852b8f52c6  ld/testsuite/ld-mips-elf/relax-jalr.s
+3e150097276b85ca1b466977321bd2eb  ld/testsuite/ld-mips-elf/reloc-1-n32.d
+7d89dbf41e9f1db0ec7acf3a45ab20ea  ld/testsuite/ld-mips-elf/reloc-1-n64.d
+616ac739ba5a655d578f1d1962761589  ld/testsuite/ld-mips-elf/reloc-1-rel.d
+35fedd85b8edee7ba5015139e03d7345  ld/testsuite/ld-mips-elf/reloc-1a.s
+db2a8158231f72fdc62917388227398c  ld/testsuite/ld-mips-elf/reloc-1b.s
+ca8216c82884ad811b7edb3e9fbe9d72  ld/testsuite/ld-mips-elf/reloc-2.d
+ea87f337407d724f0873ca78cf340d58  ld/testsuite/ld-mips-elf/reloc-2.ld
+0adb1722a72e9a9a054f9a6b92b56e8d  ld/testsuite/ld-mips-elf/reloc-2a.s
+f051089b05fc01590658e2bc45fa6cf1  ld/testsuite/ld-mips-elf/reloc-2b.s
+299f6c59760876195ff15972265c1c64  ld/testsuite/ld-mips-elf/reloc-3-n32.d
+30b4b2b4144a328e31d9ceebfc7c4e3f  ld/testsuite/ld-mips-elf/reloc-3.d
+3ac472addfc5eb7cb6ec433e5644e6b4  ld/testsuite/ld-mips-elf/reloc-4.d
+d9d108ea9d1774ea9146f17ec8820099  ld/testsuite/ld-mips-elf/reloc-4.s
+f1dd265eb61abcd9887f645d33a22134  ld/testsuite/ld-mips-elf/reloc-5.d
+69f27006c1fefb9a60d0b877402a74ef  ld/testsuite/ld-mips-elf/reloc-5.s
+5ecb4e10cfd2f6b4de9ee74c1ea2c975  ld/testsuite/ld-mips-elf/reloc-6a.s
+e1fdd53bd7febfd655245d57cdaf8962  ld/testsuite/ld-mips-elf/reloc-6b.s
+819a1ac49e774ccc8b68332aed02026e  ld/testsuite/ld-mips-elf/reloc-estimate-1.d
+32f73a472ac5388b9e5554712552cd10  ld/testsuite/ld-mips-elf/reloc-estimate-1.ld
+6263ce38363c899a10f2cd9c833103ae  ld/testsuite/ld-mips-elf/reloc-estimate-1a.s
+c5f62e7b8a40978cfca1c566b1c91d0e  ld/testsuite/ld-mips-elf/reloc-estimate-1b.s
+5e53d69afb16b0aa1111842113ab9a4d  ld/testsuite/ld-mips-elf/reloc-merge-lo16.d
+9053fa49eb5a350f5eb6ff68429b4b1c  ld/testsuite/ld-mips-elf/reloc-merge-lo16.ld
+ca0f2383e1abaa4194db6d328616a283  ld/testsuite/ld-mips-elf/reloc-merge-lo16.s
+1d6f7a3dc089864de5e234e81880f984  ld/testsuite/ld-mips-elf/stub-dynsym-1-10000.d
+88f241289f9c5dbb15595f56e3bcbf6e  ld/testsuite/ld-mips-elf/stub-dynsym-1-2fe80.d
+82b76bfd94c016f538e5a45536840144  ld/testsuite/ld-mips-elf/stub-dynsym-1-7fff.d
+019989e23ec375399af67c17ec061cd1  ld/testsuite/ld-mips-elf/stub-dynsym-1-8000.d
+ace95ceba6066d15c02d749bccb5c35a  ld/testsuite/ld-mips-elf/stub-dynsym-1-fff0.d
+17472fd6bd43f7e0a0bbee7bec4b56d1  ld/testsuite/ld-mips-elf/stub-dynsym-1.ld
+771e5b7a77527a92c59bb09aacc2245b  ld/testsuite/ld-mips-elf/stub-dynsym-1.s
+593b58531898d49f21950b0f1cb0028e  ld/testsuite/ld-mips-elf/textrel-1.d
+5018b9cc7ffa201db975a01c554aa5d3  ld/testsuite/ld-mips-elf/textrel-1.s
+3366b6a082b650516fd6734b3f96d391  ld/testsuite/ld-mips-elf/tls-hidden2-got.d
+d0d03e116e69348f69f764e7cf07f65c  ld/testsuite/ld-mips-elf/tls-hidden2.d
+8da4ca44d8d4d64da2f924f77f16ebff  ld/testsuite/ld-mips-elf/tls-hidden2a.s
+28ebb08fa8f0f0384c6f6e94b017b6c4  ld/testsuite/ld-mips-elf/tls-hidden2b.s
+17a7c0117e9da22a28096e807e8f7a1a  ld/testsuite/ld-mips-elf/tls-hidden3.d
+32e7a2e0848cd82eec644f4a53f3d82f  ld/testsuite/ld-mips-elf/tls-hidden3.got
+4eeb160900459146ef2406dac1677b38  ld/testsuite/ld-mips-elf/tls-hidden3.ld
+987684d120f6213287cfe205e0bd173b  ld/testsuite/ld-mips-elf/tls-hidden3.r
+596cb16541a279aea4116f695673985c  ld/testsuite/ld-mips-elf/tls-hidden3a.s
+29d61123d595b387ed26211c5aeac27d  ld/testsuite/ld-mips-elf/tls-hidden3b.s
+59bff5c0e2b3a11aa1872751d5200f00  ld/testsuite/ld-mips-elf/tls-hidden4.got
+6605a99a8dccc8e3b31db4d74deff5a7  ld/testsuite/ld-mips-elf/tls-hidden4.r
+18ce86b8cf6084e6197d64c86b95d9ad  ld/testsuite/ld-mips-elf/tls-hidden4a.s
+bb0771146a19efa38c6dbab03a6677c5  ld/testsuite/ld-mips-elf/tls-hidden4b.s
+dcf6ae3878ee8bbe288194214b1cf4b8  ld/testsuite/ld-mips-elf/tls-multi-got-1-1.s
+e27dfdf2d9f50b3a1c3405c0928464f9  ld/testsuite/ld-mips-elf/tls-multi-got-1-2.s
+750508d078ee33a8416b8c61d31a6983  ld/testsuite/ld-mips-elf/tls-multi-got-1.d
+41bea7f9e24f1cf8d870aec4a3173ca0  ld/testsuite/ld-mips-elf/tls-multi-got-1.got
+586bb1ee2c39286e5309a52593be34cd  ld/testsuite/ld-mips-elf/tls-multi-got-1.r
+3e3447a7625350bcb3a358526e3153a1  ld/testsuite/ld-mips-elf/tlsbin-o32.d
+c86a9ef2529736cdad96e9ca05707688  ld/testsuite/ld-mips-elf/tlsbin-o32.got
+c792434d81806a231d8c427cb4080159  ld/testsuite/ld-mips-elf/tlsbin-o32.s
+5e0d7ec5909fe5c8c577a04021165e39  ld/testsuite/ld-mips-elf/tlsdyn-o32-1.d
+c42a07f58b0fe77cd7af1f56818a28f2  ld/testsuite/ld-mips-elf/tlsdyn-o32-1.got
+530965bd6a985f0e94ecd0855dd5625d  ld/testsuite/ld-mips-elf/tlsdyn-o32-2.d
+b2f5027a892621ff983a13f2c3240f5b  ld/testsuite/ld-mips-elf/tlsdyn-o32-2.got
+fbdeab37b3ee0ec10ee1ef69f15c2fff  ld/testsuite/ld-mips-elf/tlsdyn-o32-2.s
+00e982c2e86055bb322802c5add3c93c  ld/testsuite/ld-mips-elf/tlsdyn-o32-3.d
+cc5c4d0ef65b6c81033d3d7769c8f29f  ld/testsuite/ld-mips-elf/tlsdyn-o32-3.got
+b5d101e6cbeb4474a32c50f41d3d1ad8  ld/testsuite/ld-mips-elf/tlsdyn-o32.d
+1697af6e7fa1e547babbba1eedf80a32  ld/testsuite/ld-mips-elf/tlsdyn-o32.got
+2f7c87e5cb0941155de927c09a22f82a  ld/testsuite/ld-mips-elf/tlsdyn-o32.s
+e04425f26450dde17dc78fd219a95744  ld/testsuite/ld-mips-elf/tlslib-hidden.ver
+70026058b0f598790d0b531c5982fb07  ld/testsuite/ld-mips-elf/tlslib-o32-hidden.got
+6d6da92087e5b37926abe8594d6b9175  ld/testsuite/ld-mips-elf/tlslib-o32-ver.got
+f486d96c706505877702cf6738edd6c4  ld/testsuite/ld-mips-elf/tlslib-o32.d
+f129dd016866df5151e6306b69af6f09  ld/testsuite/ld-mips-elf/tlslib-o32.got
+73d7902bba1b0277980dd7077187132d  ld/testsuite/ld-mips-elf/tlslib-o32.s
+e79ddbda95735cce0f98745385b37e44  ld/testsuite/ld-mips-elf/tlslib.ver
+2836095ce053cfc7a2375672903484a6  ld/testsuite/ld-mips-elf/undefined.d
+74e832da3c27e918dcc12f23c88d7653  ld/testsuite/ld-mips-elf/undefined.s
+c28e9ba79d2a44a6345b6091aff6964c  ld/testsuite/ld-mips-elf/vxworks-forced-local-1.d
+575c413b96d44bb8ec8ff7ac576ed0d8  ld/testsuite/ld-mips-elf/vxworks-forced-local-1.s
+73733e00bc2f549dd17e11ddcf5977a5  ld/testsuite/ld-mips-elf/vxworks-forced-local-1.ver
+135c05a549bb6dad013ee2ad7266feeb  ld/testsuite/ld-mips-elf/vxworks1-lib.dd
+b074b2bbf5dfaf1b0c748786aaa5d748  ld/testsuite/ld-mips-elf/vxworks1-lib.nd
+5f45b6c9413d7836dfca685969f1955b  ld/testsuite/ld-mips-elf/vxworks1-lib.rd
+32b8872e821ae6654c0b8b93831b090b  ld/testsuite/ld-mips-elf/vxworks1-lib.s
+6dbdc5d4346169b9a3af98707d77be72  ld/testsuite/ld-mips-elf/vxworks1-lib.td
+2430b3e2167b5d1d1b8d6a75435a9522  ld/testsuite/ld-mips-elf/vxworks1-static.d
+45ff6994e80bfdd76f565ab15bd740fc  ld/testsuite/ld-mips-elf/vxworks1.dd
+6eda7ca5e2b8a998f716b2914d22ca4c  ld/testsuite/ld-mips-elf/vxworks1.ld
+d2de293548a76b5b287297fa26f82bdb  ld/testsuite/ld-mips-elf/vxworks1.rd
+82bc233897ef8651545c08a78fc4199a  ld/testsuite/ld-mips-elf/vxworks1.s
+165ed1561458c0973255f985be876845  ld/testsuite/ld-mips-elf/vxworks2-static.sd
+d0f1c70f160b4a40447679957bb43902  ld/testsuite/ld-mips-elf/vxworks2.s
+7afb4e2fc8be35ad985dcb2e21b7cbef  ld/testsuite/ld-mips-elf/vxworks2.sd
+75e57156fec82444f8b081057aa3dd34  ld/testsuite/ld-misc/defsym.exp
+29b85abb584c499fb7c6e3c7d7c8d1ad  ld/testsuite/ld-misc/defsym1.d
+68b329da9893e34099c7d8ad5cb9c940  ld/testsuite/ld-misc/dummy.s
+d3e2facb8eb14eb25571b0ba1978a5f2  ld/testsuite/ld-misc/foo.s
+8b7d482ede3ffef086e697dc7758e45c  ld/testsuite/ld-misc/start.s
+29bbc00fcf8488cdcda5c967947c9abd  ld/testsuite/ld-mmix/a.s
+832fb8cae0b098878fed53d48e807ce5  ld/testsuite/ld-mmix/areg-256.s
+92c2c53d6e192bf5692ce25b44285e67  ld/testsuite/ld-mmix/areg-t.s
+9c3467333c3017bb3487458a63a6a443  ld/testsuite/ld-mmix/aregm.s
+bbc12b910148056242b16ac06ffe658e  ld/testsuite/ld-mmix/b-badfil1.d
+5757a79cbdb495ad2ebdb65ae1baee63  ld/testsuite/ld-mmix/b-badfil1.s
+d3539629793229e1bedc30fca7ebab4e  ld/testsuite/ld-mmix/b-badfil2.d
+4d945d415b8a0b5d0d1960ae0aad8dd5  ld/testsuite/ld-mmix/b-badfil2.s
+6d361444d04985a9d6ffcd79ab0d9102  ld/testsuite/ld-mmix/b-badfixo.d
+696b375abc32c3e05c78864742e8ed0f  ld/testsuite/ld-mmix/b-badfixo.s
+0ecd244dbb6bfba1aab4fd1c9ba36fed  ld/testsuite/ld-mmix/b-badloc.d
+ca07c72cc90fe7958c01e45d0b299c07  ld/testsuite/ld-mmix/b-badloc.s
+03b06dbe7e50760382702f5cf5506e83  ld/testsuite/ld-mmix/b-badlop.d
+c0eda3287e093d9baa1a9976fc611109  ld/testsuite/ld-mmix/b-badlop.s
+cfa814a7c613f75d100f82cf82cd6082  ld/testsuite/ld-mmix/b-badm.d
+bece4f048fbf06e4397d09a0e8cf3f84  ld/testsuite/ld-mmix/b-badm2.s
+308e34a5c6526b3bc77c958a0be05e0f  ld/testsuite/ld-mmix/b-badmain.s
+d372faf0a14a0dfcc1553deb051f94db  ld/testsuite/ld-mmix/b-badquot.d
+27a23d67dc01f3c9ead4adb018ca1754  ld/testsuite/ld-mmix/b-badquot.s
+3f655a8b08008f054fdfa2a96de54a40  ld/testsuite/ld-mmix/b-badrx1.d
+b6dd30dc8691d22e1f65f4021f05c56b  ld/testsuite/ld-mmix/b-badrx1.s
+cb9c0accff2b737374ca055f980dbe13  ld/testsuite/ld-mmix/b-badrx2.d
+93f541fd556713ab6d8d21db803d1b66  ld/testsuite/ld-mmix/b-badrx2.s
+c379ff543ab01fedc4ad86f98bbb5273  ld/testsuite/ld-mmix/b-badrx3.d
+bf429322a5db6134c31b0ad125e1fe47  ld/testsuite/ld-mmix/b-badrx3.s
+5d616c70e041440600527855ebae7cae  ld/testsuite/ld-mmix/b-bend.s
+5ef90eb6d01c9c1e1f2a0d2262ae6b2e  ld/testsuite/ld-mmix/b-bend1.d
+43b9f66679d171e04c8cd8945a8c9072  ld/testsuite/ld-mmix/b-bend2.d
+c6cded6f15b9f640cbdab924ee44c4e7  ld/testsuite/ld-mmix/b-bend3.d
+19278040a3ad12dfbb86423a42ee4944  ld/testsuite/ld-mmix/b-bstab1.d
+7f057b266c6e915c24c78e4914988a18  ld/testsuite/ld-mmix/b-bstab1.s
+6648449ade42be2fa0b9bfd929d0be34  ld/testsuite/ld-mmix/b-fixo2.d
+afd9d7783cf499b4bb54e673aa66cc9b  ld/testsuite/ld-mmix/b-fixo2.s
+c70f1e9df4056a081a049a5e574504b7  ld/testsuite/ld-mmix/b-goodmain.s
+821bd78c586bcbbfcd74404cf57bb857  ld/testsuite/ld-mmix/b-loc64k.d
+22737b84a0ff00ce8bbbac51ba455171  ld/testsuite/ld-mmix/b-loc64k.s
+c6b46403437c6ee2562708fa1c475313  ld/testsuite/ld-mmix/b-nosym.d
+38dd1c80284932429686552b07d13ffb  ld/testsuite/ld-mmix/b-nosym.s
+8d063312ad02da3debded99026386d32  ld/testsuite/ld-mmix/b-offloc.s
+3f86c44e8b8817e5c663f2d27f3bd115  ld/testsuite/ld-mmix/b-post1.s
+86f53aed3df4b314f3ed60fc1bc5390c  ld/testsuite/ld-mmix/b-twoinsn.s
+19e58b2f38b76337bcaf380353b8b083  ld/testsuite/ld-mmix/b-widec.s
+be278fd0e2be7d211f9b9f01e9da153f  ld/testsuite/ld-mmix/b-widec1.d
+b5acafcf483d63a9f77a5bfd3aa6268c  ld/testsuite/ld-mmix/b-widec2.d
+c611d61d69d4f6525b97bf73f8ceb803  ld/testsuite/ld-mmix/b-widec2.s
+b0e738d0cadbba73f2fcb8d0e5db1017  ld/testsuite/ld-mmix/b-widec3.d
+538c648f35ef9b9744f3451d4b634614  ld/testsuite/ld-mmix/b-widec3.s
+0e3bd5d365022be3c1548dd5777bfcaa  ld/testsuite/ld-mmix/bpo-1.d
+727b1769bece675574da8a7fe3fd7c78  ld/testsuite/ld-mmix/bpo-1.s
+a4bc144eea63cbf4af7e585bd0edc95e  ld/testsuite/ld-mmix/bpo-10.d
+7806bfb4f80d0b995147abaef5043324  ld/testsuite/ld-mmix/bpo-10.s
+57d5eda861d87af042f47186f145543a  ld/testsuite/ld-mmix/bpo-11.d
+6ffe6aa6c222b341fd60298d70f6c096  ld/testsuite/ld-mmix/bpo-11.s
+77b4f4eb49346620239ae760d080a897  ld/testsuite/ld-mmix/bpo-12.d
+8de7a3ef3b7bd942d63c83ee837ab9ef  ld/testsuite/ld-mmix/bpo-12m.d
+3dedc8a556ca8e2e36516b6d401573ec  ld/testsuite/ld-mmix/bpo-13.d
+548c55bffd4c89b7677633e176ce7642  ld/testsuite/ld-mmix/bpo-13m.d
+02f65eea305cdd049de3449497f212a2  ld/testsuite/ld-mmix/bpo-14.d
+c643669175f64da8335666d98707d371  ld/testsuite/ld-mmix/bpo-14m.d
+8f6569e3f528d5faa6667c06e373d4e6  ld/testsuite/ld-mmix/bpo-15.d
+98df5bb5f63901bb65b4da989825bee6  ld/testsuite/ld-mmix/bpo-15m.d
+6ec318d675955648a56a6831e299dc72  ld/testsuite/ld-mmix/bpo-16.d
+46c733f1f9d6891c280bd33a7a8ee49e  ld/testsuite/ld-mmix/bpo-16m.d
+85d2f23d3507c87f82c322191238a7be  ld/testsuite/ld-mmix/bpo-17.d
+2bd56eebb6f7f2557192b4218267e936  ld/testsuite/ld-mmix/bpo-17m.d
+53defe5eff096dddb5b90166160c491f  ld/testsuite/ld-mmix/bpo-18.d
+75e497cf13bf228105b337ee5c9e4812  ld/testsuite/ld-mmix/bpo-18m.d
+b997daa1845ef49de1c27ae192a667eb  ld/testsuite/ld-mmix/bpo-19.d
+2ab4fef8dc7d80065a78ea7b0e9ed0b3  ld/testsuite/ld-mmix/bpo-19m.d
+b2f2ffc9ebee61c08b8536ee393bf60d  ld/testsuite/ld-mmix/bpo-1m.d
+60145581d35cf70b131bfb05287a92af  ld/testsuite/ld-mmix/bpo-2.d
+941fdc1afbccc34132056c79cffd53a7  ld/testsuite/ld-mmix/bpo-2.s
+0fb61489c12f3b583e2c08ade6e8d653  ld/testsuite/ld-mmix/bpo-20.d
+fffb35a7fced3331a800461bc1ce9094  ld/testsuite/ld-mmix/bpo-20m.d
+5e8683bae8c6b6898f64e06e23abbccd  ld/testsuite/ld-mmix/bpo-21.d
+73573410160cb6b280768902b3043b90  ld/testsuite/ld-mmix/bpo-21m.d
+c5d01652ee53ab129f2e03e352231dce  ld/testsuite/ld-mmix/bpo-22.d
+263c76b6afbb38eab584434d4d6c6c2b  ld/testsuite/ld-mmix/bpo-2m.d
+1b5307afa9a6f06cc02330c659d3365b  ld/testsuite/ld-mmix/bpo-3.d
+18a744b115278b7722c291d0ffb50d7f  ld/testsuite/ld-mmix/bpo-3.s
+bcdf1e512c4aee70c59fdd3660145af7  ld/testsuite/ld-mmix/bpo-3m.d
+b780d689f2a2f70c22fd43aa91fef18b  ld/testsuite/ld-mmix/bpo-4.d
+27298e0392d3668044115ab5ab2d8f96  ld/testsuite/ld-mmix/bpo-4.s
+dd0d4ed3e462ccc4d407b1bf742d14be  ld/testsuite/ld-mmix/bpo-4m.d
+8e5a3e3f230fc8f92300d241fd828acb  ld/testsuite/ld-mmix/bpo-5.d
+7dbb13569ce91e34215372124be85954  ld/testsuite/ld-mmix/bpo-5.s
+ee7b15e113e1e43245843f5a67e4bd06  ld/testsuite/ld-mmix/bpo-5m.d
+7df5351a845c3b49a88cc8e98bdbd6c9  ld/testsuite/ld-mmix/bpo-6.d
+f2cceac4fc47fe392c8e4dc429f07561  ld/testsuite/ld-mmix/bpo-6.s
+2d7d7f08884d9c6f8b665361608621a0  ld/testsuite/ld-mmix/bpo-6m.d
+8bf2119bfa9a8f8ab1ad3a31ecc33e99  ld/testsuite/ld-mmix/bpo-7.d
+2baded74ed785888b38d2327cf0b292c  ld/testsuite/ld-mmix/bpo-7.s
+973234218e86e5019e31fe579e3771f3  ld/testsuite/ld-mmix/bpo-7m.d
+4015cf8cce9a13b50227b5182b063c63  ld/testsuite/ld-mmix/bpo-8.d
+ebfa497b551fca4227045bd9c52591d7  ld/testsuite/ld-mmix/bpo-8.s
+1cb46b3bff8a3455f444bf47be753ebe  ld/testsuite/ld-mmix/bpo-8m.d
+6a4bad3d3d3e7e47472c8bca3a180413  ld/testsuite/ld-mmix/bpo-9.d
+e6417328f720ed4af73d532d5578d4dc  ld/testsuite/ld-mmix/bpo-9.s
+3f41674c05910b601b6428d93d075bf8  ld/testsuite/ld-mmix/bpo-9m.d
+31df213f14a88392ba820c0d322b2bf1  ld/testsuite/ld-mmix/bpo64addr.ld
+2f86e0f2ab9bdae57aa1cfff6e2bd250  ld/testsuite/ld-mmix/bspec1.d
+819de3680e13af74f5cc05450ba88c45  ld/testsuite/ld-mmix/bspec1.s
+9e65233ea9e683673fca19c9a7ac4146  ld/testsuite/ld-mmix/bspec1m.d
+b5287dc1f7bb2c618fb338cd51552771  ld/testsuite/ld-mmix/bspec2.d
+39f50619e3525dbc7bb1a57004fa7af8  ld/testsuite/ld-mmix/bspec2.s
+2264252fbee703755ad9ef0a84805b6e  ld/testsuite/ld-mmix/bspec2m.d
+bf1d3c052201115389f9bf0d72b01dd1  ld/testsuite/ld-mmix/bspec801.s
+11b7fccb5486483850799cc7f3531c75  ld/testsuite/ld-mmix/bspec802.s
+22de3233920da1dfe5c1a59869059167  ld/testsuite/ld-mmix/bspec803.s
+48aa9f881a98497446e5127b530cbc0b  ld/testsuite/ld-mmix/bspec804.s
+ef5ba77ef818567f2363a64a61136d07  ld/testsuite/ld-mmix/bspec805.s
+17e99c51f9fa5ef8f9dbf96b77ceb859  ld/testsuite/ld-mmix/bspec806.s
+f410482e950d36d3493dbde6ac0fa801  ld/testsuite/ld-mmix/bspec807.s
+0ef3802570112a82a32152b8615812a1  ld/testsuite/ld-mmix/bspec808.s
+a085e5ee962603b54dc4f79c8c194ee8  ld/testsuite/ld-mmix/bza-1b.d
+14eb18f6d6f609ada3232e30185e6ecd  ld/testsuite/ld-mmix/bza-1f.d
+27f3762fa59df67c0890e5450cd4e2d5  ld/testsuite/ld-mmix/bza-2b.d
+2dde578feed1feed4f3d2656dc5cc096  ld/testsuite/ld-mmix/bza-2f.d
+89e214c7b44550c8c6e0516a73136d24  ld/testsuite/ld-mmix/bza-7b.d
+bacb69bdb70ce627aa3b9616c163501d  ld/testsuite/ld-mmix/bza-7f.d
+6d9d599df19d65dd9733089fdcbd49ec  ld/testsuite/ld-mmix/bza-8b.d
+12f488f003ac547001f13eaaa119da19  ld/testsuite/ld-mmix/bza-8f.d
+9da6a6460ebe9fa4649bf1066400630c  ld/testsuite/ld-mmix/bza.s
+1174557b17ce40bbf65d516763faa9f5  ld/testsuite/ld-mmix/data1.s
+3c6cb0cb624868efe21dcb90b2a234ff  ld/testsuite/ld-mmix/dloc1.s
+139ef9ed9aeef66b603b49b28a4b7cd3  ld/testsuite/ld-mmix/dloc2.s
+232026219508f7b71f6ee431840c6433  ld/testsuite/ld-mmix/ext1-254.s
+3a7cd12a9f3c4885d04f1c0813847708  ld/testsuite/ld-mmix/ext1.s
+7da77ff68e0bf805f728c01fe4970428  ld/testsuite/ld-mmix/ext1g.s
+c00696319193078a3f54bee1e3c13245  ld/testsuite/ld-mmix/ext1l.s
+f778d456be4ce9d20cc4f82b909cc799  ld/testsuite/ld-mmix/getaa-1b.d
+81cbf4605355e835ff6909c9499c8932  ld/testsuite/ld-mmix/getaa-1f.d
+4ac2b7156cc86e1da126405840d6a77c  ld/testsuite/ld-mmix/getaa-2b.d
+0171fc55ec2e6b96fa7449ded4308e9d  ld/testsuite/ld-mmix/getaa-2f.d
+ec5e997656fa82a54deace1a49af4006  ld/testsuite/ld-mmix/getaa-4b.d
+4e33bb67a21b0925e2f67da6b497667a  ld/testsuite/ld-mmix/getaa-4f.d
+57065ae45a55d7b177b6c7e570143f37  ld/testsuite/ld-mmix/getaa-6b.d
+fcb94cf8adc18ff997bb67111d93fd38  ld/testsuite/ld-mmix/getaa-6f.d
+03d4176debdd643f4346b38381232e95  ld/testsuite/ld-mmix/getaa-7b.d
+603f2f3a78e12c0e620b56e4af943053  ld/testsuite/ld-mmix/getaa-7f.d
+6493dd727ad7957aa7cbd84f2042e569  ld/testsuite/ld-mmix/getaa-8b.d
+3ea37a2af736602c0607e73aebf6f32b  ld/testsuite/ld-mmix/getaa-8f.d
+db60b0f96a0ecc05d8b34582430930cf  ld/testsuite/ld-mmix/getaa.s
+cd9b942d75b2cd9f16f3e2a97421cf30  ld/testsuite/ld-mmix/getaa12b.d
+955393ce5664bd2add2eb31ba04ad921  ld/testsuite/ld-mmix/getaa12f.d
+55735ac048b10ea2324d0dd89d4802bc  ld/testsuite/ld-mmix/getaa14b.d
+3a66b9fccc865bc6698401aec03638da  ld/testsuite/ld-mmix/getaa14f.d
+d15a667ae769b6fdb599e2fafcf18901  ld/testsuite/ld-mmix/greg-1.d
+09bdeabfdc8bad2aa2102a69f2acec6c  ld/testsuite/ld-mmix/greg-1.s
+3e8753750bd03d1b8cc47973bf0c5fa8  ld/testsuite/ld-mmix/greg-10.d
+52fbd6227f7f3e5728b8350c69d33742  ld/testsuite/ld-mmix/greg-11.d
+6fe8e51b99e9625c021dc8b50da3f7e8  ld/testsuite/ld-mmix/greg-11b.d
+c08a75bfc1dbf3d5076fc4e61dfcf362  ld/testsuite/ld-mmix/greg-12.d
+7462e0377d376b0bd47753854a6a407f  ld/testsuite/ld-mmix/greg-13.d
+0f5ca7c06e9079441da2c7a84b922e76  ld/testsuite/ld-mmix/greg-14.d
+7e20aba7bfc285ad4569f7dbf995f575  ld/testsuite/ld-mmix/greg-14s.d
+172c9bc30b96bbc7f5d47dc3f2c3d7fb  ld/testsuite/ld-mmix/greg-15.d
+a3ff1f310992ee435c7e2635d8d29460  ld/testsuite/ld-mmix/greg-16.d
+d01503c2c69d7f452f4eefacaa68899d  ld/testsuite/ld-mmix/greg-17.d
+b11ff19d10f01e1e3f56e46144a2221f  ld/testsuite/ld-mmix/greg-18.d
+467ea26fedbd20ac06f1f535006faa9a  ld/testsuite/ld-mmix/greg-19.d
+4547d19a8920b5f63dccc18e0b02b270  ld/testsuite/ld-mmix/greg-2.d
+d32fe386de0bb7cbeae911f55b74f28c  ld/testsuite/ld-mmix/greg-2.s
+f7a8dad75521d024520597ea106b9aea  ld/testsuite/ld-mmix/greg-20.d
+13fe89a7dd43832d54cc0db06cb5b99d  ld/testsuite/ld-mmix/greg-3.d
+fd8c230efbb1e8e9644f278fc55956d1  ld/testsuite/ld-mmix/greg-3.s
+620f140d5c613e86521a64ff9b30ff09  ld/testsuite/ld-mmix/greg-4.d
+ca83717a845f3471de058678cd3d768d  ld/testsuite/ld-mmix/greg-4.s
+517a41ee10b02ecbe9842f014bc4a895  ld/testsuite/ld-mmix/greg-5.d
+6480362111f72bcd1075662b96302bda  ld/testsuite/ld-mmix/greg-5.s
+9935d0deb3efa07e81f8b2c5a6b7380b  ld/testsuite/ld-mmix/greg-5s.d
+ce16f9bb5d81df7ab48c501599413eac  ld/testsuite/ld-mmix/greg-6.d
+418b000655af054b390b8bb2b874c60e  ld/testsuite/ld-mmix/greg-7.d
+59e0e7eb634040c0b9cbd93f668ccc98  ld/testsuite/ld-mmix/greg-8.d
+d93fac49ebe47c54143f6d735cbd0d2b  ld/testsuite/ld-mmix/greg-9.d
+52303123f40dff47906913e8da9c286e  ld/testsuite/ld-mmix/gregbza1.s
+7f3142883e0933aff11c0c1cb95a77fa  ld/testsuite/ld-mmix/gregget1.s
+2cb7950e0a1953d2b987a9f8cc7c4512  ld/testsuite/ld-mmix/gregget2.s
+e550195681ad09a232fe5aee1377329d  ld/testsuite/ld-mmix/gregldo1.s
+ca8df40c1626e176553bb89a9e763fdb  ld/testsuite/ld-mmix/gregpsj1.s
+9ab537a0341b7c4352c8611cceea62ef  ld/testsuite/ld-mmix/hdr-1.d
+947dee63abfc6e1d2189ad4fd9b66eb6  ld/testsuite/ld-mmix/jumpa-1b.d
+d584fc102026b000a7fc6b96d9963230  ld/testsuite/ld-mmix/jumpa-1f.d
+c40d746d73d8ea03d1af670cf0396d1a  ld/testsuite/ld-mmix/jumpa-2b.d
+e1307a32eda7c8432b3f989be35b6b8c  ld/testsuite/ld-mmix/jumpa-2f.d
+f0604395727a87a9f44e5f3a2022ae6f  ld/testsuite/ld-mmix/jumpa-3b.d
+de6787c0fa3a5822645c9842f381bcd9  ld/testsuite/ld-mmix/jumpa-3f.d
+df9824fc96665a5167b94df1372d7d66  ld/testsuite/ld-mmix/jumpa-4b.d
+414791dc7016ab49289b99a78cb6e102  ld/testsuite/ld-mmix/jumpa-4f.d
+296124a282e0d1c7b934f6ed800ecdaa  ld/testsuite/ld-mmix/jumpa-5b.d
+beac115e902f66a613fbbf078136347b  ld/testsuite/ld-mmix/jumpa-5f.d
+130046ec10144296bd85ff47bcca6dae  ld/testsuite/ld-mmix/jumpa-6b.d
+f4ca5428c16dc7044eba616c88060283  ld/testsuite/ld-mmix/jumpa-6f.d
+883c0287f9033fab6803c32c4eda1c69  ld/testsuite/ld-mmix/jumpa-7b.d
+4b126c7bae3abfc161abbf89974ee8c5  ld/testsuite/ld-mmix/jumpa-7f.d
+c30b409fdc294bae9f080af0c0f0e2ff  ld/testsuite/ld-mmix/jumpa-8b.d
+2a744a21150001b4cd0ede5b110709ae  ld/testsuite/ld-mmix/jumpa-8f.d
+f00db713cea505b97fbb93faa65e3d45  ld/testsuite/ld-mmix/jumpa-9b.d
+e53bb3803346e92f0ec97bbc784c1eac  ld/testsuite/ld-mmix/jumpa-9f.d
+1d6c21fd3ef1c8d793380a2691b6eb7c  ld/testsuite/ld-mmix/jumpa.s
+7153d676cf0b92abceb49b341d0853ea  ld/testsuite/ld-mmix/jumpa12b.d
+8462c80cfea74bf25bcf6f8c278db269  ld/testsuite/ld-mmix/jumpa12f.d
+01b18bcede2c8d9ef1d4e69be534211e  ld/testsuite/ld-mmix/jumpa13b.d
+ddb26bcaaaaa6d50847383e563b4d3bc  ld/testsuite/ld-mmix/jumpa13f.d
+5c43f0af321e1389d47b9006502018e1  ld/testsuite/ld-mmix/jumpa14b.d
+0e314b43bc6d623eff2df40b7a85c520  ld/testsuite/ld-mmix/jumpa14f.d
+3cdf6375ecfea7039ec8dfa92143a20d  ld/testsuite/ld-mmix/loc1.d
+b56a23c50b6ddbff1f3794283f3277f1  ld/testsuite/ld-mmix/loc1.s
+6408168fece5456b214bc70c861189a5  ld/testsuite/ld-mmix/loc10.d
+7f5b22219f4a9814515a346f6cdc5c27  ld/testsuite/ld-mmix/loc10.s
+986e92c55c1c527e3a8f5a9bd0d80a13  ld/testsuite/ld-mmix/loc10m.d
+fb75bea1a25c34bbf8e30d990a432d97  ld/testsuite/ld-mmix/loc1m.d
+2df3f3c439ce03002c2bcb3ec3e46a8e  ld/testsuite/ld-mmix/loc2.d
+3c356ecff8149f5f58b96419632abe2d  ld/testsuite/ld-mmix/loc2.s
+499e0b02ab9cde3ceb84ef08a360c969  ld/testsuite/ld-mmix/loc2m.d
+86cc9188574d2dfc8219e7b500e816a9  ld/testsuite/ld-mmix/loc3.d
+d57db0d8ece842d7e871c26f0165ace0  ld/testsuite/ld-mmix/loc3m.d
+9fcbe63857ba71b4e0f7c6d0ffddd504  ld/testsuite/ld-mmix/loc4.d
+0ca8c4e7244194dc55fa159ebee2778f  ld/testsuite/ld-mmix/loc4m.d
+6bce3b0517b052d03c4c4f6ff493fa86  ld/testsuite/ld-mmix/loc5.d
+b5bb17720ffd70fe284c562e7302dd3f  ld/testsuite/ld-mmix/loc5m.d
+51a32dda96fb3b78968d38a7388776cb  ld/testsuite/ld-mmix/loc6.d
+10b39e63d1856e7c9fd0bfc29a04160b  ld/testsuite/ld-mmix/loc6m.d
+82f045e44234bb0c8c17b511462c5ea9  ld/testsuite/ld-mmix/loc7.d
+9c15aa64a5b8f8693882f01d28db4ef0  ld/testsuite/ld-mmix/loc7m.d
+539b8691781ad828f208654d832c709c  ld/testsuite/ld-mmix/loc8.d
+b5663cc70c64e49e309a75a50c829297  ld/testsuite/ld-mmix/loc8.s
+5bc559fd76d2eefd610ad12f54cc7b94  ld/testsuite/ld-mmix/loc8m.d
+a952551f22addd80069b6c3d3a02ada3  ld/testsuite/ld-mmix/loc9.d
+f884ac0f1a4e95b1b472092333f11075  ld/testsuite/ld-mmix/loc9.s
+4946a9228800b29bef3d2ae70cb063d6  ld/testsuite/ld-mmix/loc9m.d
+c508652e70247edc0d111d3659682447  ld/testsuite/ld-mmix/local1.d
+d707f849fbe9f63a5f2c01fd2566e038  ld/testsuite/ld-mmix/local1.s
+7ece63c1f6d1bf57eb22577253170a37  ld/testsuite/ld-mmix/local10.d
+04997ac752692c6b8804cd4e39a0ea58  ld/testsuite/ld-mmix/local10m.d
+099da77c40cba26141817d4091e7db2c  ld/testsuite/ld-mmix/local11.d
+d325c8975956aa1752219b1a535cf285  ld/testsuite/ld-mmix/local11m.d
+05be1f62230e543b5b8c655ab9caecc0  ld/testsuite/ld-mmix/local12.d
+a5a00cd4518d7bd4241630424826ff15  ld/testsuite/ld-mmix/local12m.d
+2092cd703c3f9100f9e0ff053d8ce46a  ld/testsuite/ld-mmix/local1m.d
+509fc476ca1023f3ccf69f809616de98  ld/testsuite/ld-mmix/local2.d
+e162c55691230b3ef6099eace547e1b4  ld/testsuite/ld-mmix/local2.s
+f9779e43410c476cfa2b2450f8b2639d  ld/testsuite/ld-mmix/local2m.d
+8c64e08c74d8b411548eb5bde2c2c6a0  ld/testsuite/ld-mmix/local3.d
+84414c509524b98f37bc39f6bcb0403c  ld/testsuite/ld-mmix/local3m.d
+18cc28d324964767918c7071b53b80df  ld/testsuite/ld-mmix/local4.d
+06f51156a11dc9114232e16ea38ee99a  ld/testsuite/ld-mmix/local4m.d
+3679ef1e0f41dcab5034cd1aa0f41700  ld/testsuite/ld-mmix/local5.d
+f025bba412c428db6d7fe5d4e90528c4  ld/testsuite/ld-mmix/local5m.d
+eb4d717d242d7cd8ccc98b6350c95fd2  ld/testsuite/ld-mmix/local6.d
+f355a139634c881acf82d620115d829a  ld/testsuite/ld-mmix/local6m.d
+b27ac036cc770615c18abb33e871301e  ld/testsuite/ld-mmix/local7.d
+b7ed816019fd284d6e048ebfd47420dc  ld/testsuite/ld-mmix/local7m.d
+099f86d65a29acd85ad462039776b43f  ld/testsuite/ld-mmix/local8.d
+d779355656462b041e143cc4e2b98726  ld/testsuite/ld-mmix/local8m.d
+133c44093006e1390646457d69e680c5  ld/testsuite/ld-mmix/local9.d
+ab244ec4c684d78029caca3dc30d9bfb  ld/testsuite/ld-mmix/local9m.d
+74c39421284fcce93a5401326a5b0999  ld/testsuite/ld-mmix/locdo-1.d
+d6727f0db8cd2c9e50ae8bf7b22eaeaa  ld/testsuite/ld-mmix/locdo.s
+25d6ea5c55773af722fd4b86198207e0  ld/testsuite/ld-mmix/loct-1.d
+022fa8e6f9b0b5e7125cf1ef50101a2b  ld/testsuite/ld-mmix/loct.s
+b68fbe623d9d44bb2a01d70e3de91be9  ld/testsuite/ld-mmix/locto-1.d
+3d1a25d72e6ab244d8e39098981c9740  ld/testsuite/ld-mmix/locto.s
+64980a23a389e2541da0ffe38b717379  ld/testsuite/ld-mmix/main1.s
+329fb8a6ca411733a8dcdcbe27e81a5d  ld/testsuite/ld-mmix/mmix.exp
+d20704a169ec8e219c96ad37791c9b78  ld/testsuite/ld-mmix/mmohdr1.ld
+09f5e63cab9e137df35586cc1751ed89  ld/testsuite/ld-mmix/mmosec1.ld
+b1edc5d09d1437afe67f3b9acce38480  ld/testsuite/ld-mmix/mmosec2.ld
+c862b5cb256b14f3b80a3b0cb6fb8308  ld/testsuite/ld-mmix/nop123.s
+bf8eb179f03ef8f7b10763e10511c52d  ld/testsuite/ld-mmix/pad16.s
+be8023f28e5f203322f381ff7d58ae34  ld/testsuite/ld-mmix/pad2p18m32.s
+81b17ca511569ebb10d6a6830d2a2cd3  ld/testsuite/ld-mmix/pad2p26m32.s
+3a61e1bd72b667553611dd950a466a58  ld/testsuite/ld-mmix/pad4.s
+cb2e36a26f1c70b8b7448540e0daeeb6  ld/testsuite/ld-mmix/pr12815-1.d
+af8b064d3035251407d3a70749af564e  ld/testsuite/ld-mmix/pr12815-1.ld
+3eb5638b02efe71633e3369d2d3c7ffb  ld/testsuite/ld-mmix/pr12815-1.s
+a7d5729c66b793a8f645459563b5c4ef  ld/testsuite/ld-mmix/pr12815-2.d
+fb6449a01ff11bbe2faa5f300096de2c  ld/testsuite/ld-mmix/pr12815-2.s
+3dc512ff8407897ee38c5fa85a492dee  ld/testsuite/ld-mmix/pushja.s
+5020f79a75091e672b04c38fc0c0f632  ld/testsuite/ld-mmix/pushja1b-s.d
+b3669a0c5355bdb89bec1e20bd818192  ld/testsuite/ld-mmix/pushja1b.d
+41a518887b979d1cb707e16a62a07fa3  ld/testsuite/ld-mmix/pushja1f-s.d
+a28b0ed5b9bcc826918ca21a220931bc  ld/testsuite/ld-mmix/pushja1f.d
+0469afb2478be33584e0a39b366e21f9  ld/testsuite/ld-mmix/pushja2b.d
+f36af7e7017293f1a8ef06c21db3defd  ld/testsuite/ld-mmix/pushja2f.d
+cf60b693a7c7300bd2fdfea2840f4c32  ld/testsuite/ld-mmix/pushja7b-s.d
+a51c4d52b6009de0529b462bd331b056  ld/testsuite/ld-mmix/pushja7b.d
+a93ceca5e988078b6cfd5bb87488b00f  ld/testsuite/ld-mmix/pushja7f-s.d
+7ca3d6d32d8bf1fe0c0fa2dfd5d3bac7  ld/testsuite/ld-mmix/pushja7f.d
+5ca57868e3251f1d3266878cf4bd9c86  ld/testsuite/ld-mmix/pushja8b.d
+55ef82ed26376647664ab8be845439a5  ld/testsuite/ld-mmix/pushja8f.d
+f0291d64464843bb9d1c20f11491fd76  ld/testsuite/ld-mmix/pushjs1.d
+6136250bae3eb327a6b4dc10bf7311a8  ld/testsuite/ld-mmix/pushjs1b.d
+229b0052b5762f655f800004f8f9131d  ld/testsuite/ld-mmix/pushjs1bm.d
+4b21f4f0f21ed691e0e4abe3fd290f98  ld/testsuite/ld-mmix/pushjs1m.d
+3263ef0b06f7a6789787e0ae26cf778d  ld/testsuite/ld-mmix/pushjs1r.d
+8dc08526c346b0c2949d717f026727be  ld/testsuite/ld-mmix/pushjs2.d
+f1474c6fb67624c679b9c63365b92657  ld/testsuite/ld-mmix/pushjs2b.d
+00442b5dd5c4b626b5e9e629dec76b65  ld/testsuite/ld-mmix/pushjs2bm.d
+4661fb2fc41eeeef64b817711af25a25  ld/testsuite/ld-mmix/pushjs2m.d
+cc7873bb5868cb9695805db68cbc67e4  ld/testsuite/ld-mmix/pushjs2r.d
+c117c4fe9906809ffca078ffbc48d163  ld/testsuite/ld-mmix/pushjs3.d
+3007b0afe39473c82e78365f4da3c488  ld/testsuite/ld-mmix/pushjs3b.d
+e828e56802bbbfd1a3b53cff43fb28b3  ld/testsuite/ld-mmix/pushjs3bm.d
+697593e94a267bf2aba1f02e529854ae  ld/testsuite/ld-mmix/pushjs3m.d
+c6552b7876f5c1928de731cc7608a507  ld/testsuite/ld-mmix/pushjs3r.d
+3a51c60a88ee993a8af188406df050d2  ld/testsuite/ld-mmix/pushjs4.d
+8339f07bf2171e19c82569c0783f9ea3  ld/testsuite/ld-mmix/pushjs4b.d
+6367bb7d4d3761e60d40bb6d91361498  ld/testsuite/ld-mmix/pushjs4bm.d
+883382cfd9016d49f7bb6f3d4febc771  ld/testsuite/ld-mmix/pushjs4m.d
+8218b27d50327ef3dcf53ec0f747a724  ld/testsuite/ld-mmix/pushjs4r.d
+21d7dbfa3ce2bb14bf3a09c65ed670eb  ld/testsuite/ld-mmix/reg-1.d
+f5826a00432ff4882e1366d68db516c4  ld/testsuite/ld-mmix/reg-1m.d
+0c57becb827f2718163d3834ac0eda1e  ld/testsuite/ld-mmix/reg-2.d
+2dc0d2fad390f27aced1bb6b2d605948  ld/testsuite/ld-mmix/reg-2m.d
+23286b28cfff45deec5e81c3e9002928  ld/testsuite/ld-mmix/regext1.s
+69e4b9f6bebc733c9d115ffe73073757  ld/testsuite/ld-mmix/sec-1.d
+1b441f0c92b01fbf76e01724e766206c  ld/testsuite/ld-mmix/sec-1.s
+d75bbbc9b76652e82c593e8021a788a5  ld/testsuite/ld-mmix/sec-2.d
+6d236a9289815d56433dcd7178318aeb  ld/testsuite/ld-mmix/sec-2.s
+ced9dd7695a2b6ba5af87f739be18165  ld/testsuite/ld-mmix/sec-3.d
+c2fe6cf6eac2927c283a454b0b86cbab  ld/testsuite/ld-mmix/sec-4.d
+5a0ea2f638ec8f036edca789bba8451b  ld/testsuite/ld-mmix/sec-5.d
+f44baed1e2692684d280f4f87721efec  ld/testsuite/ld-mmix/sec-6.d
+d843e0c48ae3ee12a22ec7d31b8f06df  ld/testsuite/ld-mmix/sec-6.s
+779977e27f6f62a9d866cb5910d827a0  ld/testsuite/ld-mmix/sec-6m.d
+33c42176cf1ac4503f9bde3425413478  ld/testsuite/ld-mmix/sec-7a.s
+844abe2f3679b2af13e8e7f44914f609  ld/testsuite/ld-mmix/sec-7b.s
+bfabfa85f8df5f46a04fcc6e84d66e62  ld/testsuite/ld-mmix/sec-7c.s
+f57ffaf24002d2183b8ac914845be685  ld/testsuite/ld-mmix/sec-7d.s
+8a1740e8f0a98d2b3eba20aee81ff409  ld/testsuite/ld-mmix/sec-7e.s
+18c464e2b826280b8be2267a9ffe91d5  ld/testsuite/ld-mmix/sec-7m.d
+46fe8846ab4dcf70c53008ef4b13298a  ld/testsuite/ld-mmix/sec-8a.s
+384f320ac9806b341089b1d9c0e07831  ld/testsuite/ld-mmix/sec-8b.s
+7d0699e43412bf704bd591e4dcc37cf0  ld/testsuite/ld-mmix/sec-8d.s
+9f11ec06925dc6056aa786981c8e21e2  ld/testsuite/ld-mmix/sec-8m.d
+19025901dfe14ecc1734484e58975bca  ld/testsuite/ld-mmix/sec-8m.s
+6b54cd31a1680ed2811f6a6cfda9db6e  ld/testsuite/ld-mmix/sec-9.d
+ce62b12138d3784ec93a3a8240dba2e5  ld/testsuite/ld-mmix/spec801.d
+1e856c201fa2a4cbec995adebafe098e  ld/testsuite/ld-mmix/spec802.d
+1236260a16fea1321acac9742be6406d  ld/testsuite/ld-mmix/spec803.d
+2b52ae4ff8779df81116bacf67daaaa4  ld/testsuite/ld-mmix/spec804.d
+870d203eabbeb05b6e7f11f5698d7f38  ld/testsuite/ld-mmix/spec805.d
+53cbba5fe3fc3f7555eafbf029a83290  ld/testsuite/ld-mmix/spec806.d
+6f72403f26862050d862b991a32859b1  ld/testsuite/ld-mmix/spec807.d
+4e3034fe7c34cb8275c7ec8ef88b93e3  ld/testsuite/ld-mmix/spec808.d
+eef70afe74e16e078ccf5dbf2dab0eff  ld/testsuite/ld-mmix/start-1.d
+4be3976267833ea3c34b0f798a8c1485  ld/testsuite/ld-mmix/start-2.d
+be36292d5a752d8e3594c19f02c2438a  ld/testsuite/ld-mmix/start.s
+c99cb759a47ad31cda97850838a8521d  ld/testsuite/ld-mmix/start2.s
+b98323b2049052463fe47f60a1d71402  ld/testsuite/ld-mmix/start3.s
+d97c85895c64e2800341eb264ec6c712  ld/testsuite/ld-mmix/start4.s
+837a9fc70319cce38647e27afea26552  ld/testsuite/ld-mmix/sym-1.d
+d6f7823c96d07d63eff9a4377a3d1197  ld/testsuite/ld-mmix/sym-2.d
+5a3543a015c57b95e141c3e542415ad7  ld/testsuite/ld-mmix/sym-2.s
+6da9e787afba836a409158b5e1f05682  ld/testsuite/ld-mmix/undef-1.d
+6ac82fe0ffb7d83ec7d663b5d78e8a33  ld/testsuite/ld-mmix/undef-1.s
+a4e3f736b38cbe5268a76e8290aecfc0  ld/testsuite/ld-mmix/undef-1m.d
+442d8e36bccc5a0b2c509ae050688162  ld/testsuite/ld-mmix/undef-2.d
+a41b27d14532da2a3129fcc4caf5c055  ld/testsuite/ld-mmix/undef-2.s
+8f55b70c5902ca731fa760d513930a89  ld/testsuite/ld-mmix/undef-2m.d
+c05df34ccf0e6e24e899048bf055c71a  ld/testsuite/ld-mmix/undef-3.d
+0c0fa2fe0d0853b92b35546f57987868  ld/testsuite/ld-mmix/undef-3m.d
+7f9adc03c95979a593ef1a63b3eb0185  ld/testsuite/ld-mmix/x.s
+9eb68df78fb71ad881ebdbaabcbe9e64  ld/testsuite/ld-mmix/y.s
+eec04ab77a221898170a779328cf4470  ld/testsuite/ld-mmix/zeroeh.ld
+23ef0a6ffc77b189f325690c67cd44ab  ld/testsuite/ld-mmix/zeroehelf.d
+4ead9079acee42775e41e21b02bcf7f1  ld/testsuite/ld-mmix/zeroehmmo.d
+27f159f029022aef43fbd30384995471  ld/testsuite/ld-mn10300/i112045-1.d
+44360d9de8d834a50e42eae4e472367b  ld/testsuite/ld-mn10300/i112045-1.s
+a8484f9973bea2ff58705fa33b4920ee  ld/testsuite/ld-mn10300/i112045-2.d
+ee1e79eaa54d07274b6d42fda10523a4  ld/testsuite/ld-mn10300/i112045-2.s
+9a79c8b3a779faf10b6e78c95f8dd5b9  ld/testsuite/ld-mn10300/i112045-3.d
+37537d7a6464bc0ac12d91db7182d6b2  ld/testsuite/ld-mn10300/i112045-3.s
+6cd608b8ae1960cd3c52237e87bb867d  ld/testsuite/ld-mn10300/i126256-1.c
+7fef111f3c90cfa4bec9e66625627376  ld/testsuite/ld-mn10300/i126256-2.c
+ea54ef98068eca5fa0d02ad0731e36a2  ld/testsuite/ld-mn10300/i127740.d
+5cad82902fb28333769ac6429ef2edcd  ld/testsuite/ld-mn10300/i127740.s
+4b90148c5bdaf10fd4cb3221bcf2d6bd  ld/testsuite/ld-mn10300/i135409-1.d
+3fa3331eafa989b61dbc8ec6b14b1e38  ld/testsuite/ld-mn10300/i135409-1.s
+f476bf2dcfc8f0cb48030527695a9bf0  ld/testsuite/ld-mn10300/i135409-2.d
+4496e0bce8d72f30a840f131da99f2d5  ld/testsuite/ld-mn10300/i135409-2.s
+da646c61848b8482377e536ee568a678  ld/testsuite/ld-mn10300/i135409-3.d
+4db30e5d483cbea98f48fd574f8c6a8b  ld/testsuite/ld-mn10300/i135409-3.s
+34163fdd45bf946f3bda2b70bbdc8546  ld/testsuite/ld-mn10300/i135409-4.d
+da40960452ce9a0d687ecf6dfccfa7d3  ld/testsuite/ld-mn10300/i135409-4.s
+bd852f419af093869c324a1c8b703f1a  ld/testsuite/ld-mn10300/i135409-4.t
+50da2909e7609ec153f370302fa7d112  ld/testsuite/ld-mn10300/i135409-5.d
+6e9e360a2e7379f68cd59fff6509686b  ld/testsuite/ld-mn10300/i135409-5.s
+ce143e60b2aeee5790b0e617dbb14fb9  ld/testsuite/ld-mn10300/i135409-5.t
+d8cea70ea6dc1b040e19c7ee1dc89991  ld/testsuite/ld-mn10300/i143317.d
+7f187c7d458b688d75a746755011f384  ld/testsuite/ld-mn10300/i143317.s
+5213998d7ac3670a20fb4917ca5386a1  ld/testsuite/ld-mn10300/i143317.t
+2f5dfdc78602f4589b91011586bbee08  ld/testsuite/ld-mn10300/i36434-2.s
+7a83647077d83988424e2cda3284621a  ld/testsuite/ld-mn10300/i36434.d
+c26780f90e85d894b5be292c4ce1f2d3  ld/testsuite/ld-mn10300/i36434.s
+4cdd20d24214ce1cba693f2581332765  ld/testsuite/ld-mn10300/mn10300.exp
+8ac7120f192bc4249e36b8d5f2e07412  ld/testsuite/ld-pe/aligncomm-1.c
+1ed11da2764b5effe30755ad549c3915  ld/testsuite/ld-pe/aligncomm-2.c
+c66da35da31a929199359aa772b7bf9f  ld/testsuite/ld-pe/aligncomm-3.c
+96b2b3c2e438bbfab2caf084a81581c6  ld/testsuite/ld-pe/aligncomm-4.c
+4876910c8e205ffa2f0dc314fedf08be  ld/testsuite/ld-pe/aligncomm.d
+8cbc3f7e387846b7dc11a49431b3498b  ld/testsuite/ld-pe/basefile1.s
+425a249a4b3d03149936d01e197fd44e  ld/testsuite/ld-pe/cfi.d
+0330f9e9e0a2298753b743e6ad494ba3  ld/testsuite/ld-pe/cfi32.d
+50bd2f2922a50e4110eebcd79dabeb7e  ld/testsuite/ld-pe/cfia.s
+728380297572aa28bb93922358a3fa82  ld/testsuite/ld-pe/cfib.s
+48d3b3bc21dc061eca7594f0d592379b  ld/testsuite/ld-pe/direct2_client.c
+071ad6aff7e8b6037c283aa608e73191  ld/testsuite/ld-pe/direct2_dll.c
+51a6ee1bf718258f33ea39a8c0a805a7  ld/testsuite/ld-pe/direct2_dll.def
+04b6a5d2a9436d64c0b254e9477df3f9  ld/testsuite/ld-pe/direct_client.c
+2ee4aa16665e7dac812ddcfcdfa898d2  ld/testsuite/ld-pe/direct_dll.c
+03562dddef0ae3b65968e86ac10d94aa  ld/testsuite/ld-pe/export_dynamic_warning.d
+508afe660308a34e7b5a4c0577da2c42  ld/testsuite/ld-pe/export_dynamic_warning.s
+4398638dc02ea6a1283779ffedcb2ff0  ld/testsuite/ld-pe/exports.d
+63895f68d2f6c0b605b27975378f8101  ld/testsuite/ld-pe/exports.s
+013993ec18b595fec0c2c2b9da23d635  ld/testsuite/ld-pe/exports64.d
+9d6429fb0bed32ab4f21b92e58af9e76  ld/testsuite/ld-pe/image_size.d
+bfdf01cbcdcc47293ad59e8ead5fbb51  ld/testsuite/ld-pe/image_size.s
+62eb5a4d84b6685b97571577a518f44f  ld/testsuite/ld-pe/image_size.t
+2e2af98f972cfcea63aa373f9c84ea86  ld/testsuite/ld-pe/longsecn-1.d
+5ded97bd96ae772c83818e16a0a062fb  ld/testsuite/ld-pe/longsecn-2.d
+cf525ed0245ed796222e8ae6542f191d  ld/testsuite/ld-pe/longsecn-3.d
+d649c9769f98d66f95553f610e5f0e34  ld/testsuite/ld-pe/longsecn-4.d
+5bb4e76cfba0a8ca65b0c41c05f23159  ld/testsuite/ld-pe/longsecn-5.d
+483193dc97d2131b375e5a3782d0a21d  ld/testsuite/ld-pe/longsecn.d
+0a2abc0eb25882699c7cb00521f36122  ld/testsuite/ld-pe/longsecn.s
+892d645217319214a646ada0d5d309d7  ld/testsuite/ld-pe/non-c-lang-syms.d
+1dea19421cfb9f1a5874ac9f8b073c5a  ld/testsuite/ld-pe/non-c-lang-syms.s
+c4bdcbcfed3d4ba8a7c10e355f198f42  ld/testsuite/ld-pe/orphan.d
+841430a2f57ec958fdaac4cfa1194b31  ld/testsuite/ld-pe/orphan_nu.d
+cf0d8bce642b4fa4a75fd5d41a9a03d7  ld/testsuite/ld-pe/orphana.s
+b9eb88417dbdaa3dbbd3803aa0312c4f  ld/testsuite/ld-pe/orphana_nu.s
+f38c9ff46a607c6d053bd1bcc5769d3c  ld/testsuite/ld-pe/orphanb.s
+969af8da47cb3c0f1eea7219d39366c6  ld/testsuite/ld-pe/orphand.s
+4c6643fbe84663ac33cc7925b67714aa  ld/testsuite/ld-pe/orphane.s
+d2fa93bd92732445cd9213dc133633c0  ld/testsuite/ld-pe/pe-compile.exp
+24a8c439f77b8b1765c78c92a8c04e25  ld/testsuite/ld-pe/pe-run.exp
+a1325eb2ba48dde18c8a6ea12c7244ed  ld/testsuite/ld-pe/pe-run2.exp
+7128de19cd6e146eb1225e3e9cf9930a  ld/testsuite/ld-pe/pe.exp
+11d410b535f9ff474c475dc0a1f85115  ld/testsuite/ld-pe/secrel.d
+ae437b9d8fe2c177c2672e5ca17b9942  ld/testsuite/ld-pe/secrel1.s
+819c1330d03d03cf5d7201562b28b589  ld/testsuite/ld-pe/secrel2.s
+cd518cd34e7a57806204a62d5574772a  ld/testsuite/ld-pe/secrel_64.d
+3ede606ef91fcb4122b82978940e43cc  ld/testsuite/ld-pe/tlssec.s
+860c233449c16465d94991686fc08335  ld/testsuite/ld-pe/tlssec32.d
+fd9c5ae6eca86b7b841e08641e1199f5  ld/testsuite/ld-pe/tlssec64.d
+96fb34184ce8ecd9dc8d6f48d0a3c8c1  ld/testsuite/ld-pe/vers-script-1.d
+720e7fb1c57e0b2e4ad729a33ea9077e  ld/testsuite/ld-pe/vers-script-1.ver
+d41d8cd98f00b204e9800998ecf8427e  ld/testsuite/ld-pe/vers-script-2.d
+1084f86390f69166e2d7c825eec7a20e  ld/testsuite/ld-pe/vers-script-2.ver
+c790ee9582d666570b5a431c381875fc  ld/testsuite/ld-pe/vers-script-3.d
+13fc127864a775b5feed8f9c90cef50f  ld/testsuite/ld-pe/vers-script-3.ver
+c790ee9582d666570b5a431c381875fc  ld/testsuite/ld-pe/vers-script-4.d
+c920dab590e529f9847e35df7d95646c  ld/testsuite/ld-pe/vers-script-4.ver
+6448c7b3e321945b8f898f09bd7078bf  ld/testsuite/ld-pe/vers-script-dll.c
+8a1b43bb1b98d47569c87c7daeccf062  ld/testsuite/ld-pie/pie.c
+0a05ace6d4ddf25938ada7e2c9ae1857  ld/testsuite/ld-pie/pie.exp
+978f320127c9134b539647f14ba3b730  ld/testsuite/ld-pie/start.d
+0aa89fa11067e1cf8802e998bf394ec0  ld/testsuite/ld-pie/start.s
+359398aa508714182f5126243220aef5  ld/testsuite/ld-pie/weakundef-data.c
+b0684fc70a8cbc0afdcb316aafcc024b  ld/testsuite/ld-pie/weakundef.c
+15de982d1dc99ce52d089868a579de34  ld/testsuite/ld-pie/weakundef.out
+dc4d9b0657141afdfd01a9dfb03d9c3e  ld/testsuite/ld-plugin/func.c
+e6f0c2a8972646b01ce62774b99d26c3  ld/testsuite/ld-plugin/main.c
+fb31ad0f6fc416467c52448e09a6ed0d  ld/testsuite/ld-plugin/plugin-1.d
+28c7b559aee809b24c5dad11f763e833  ld/testsuite/ld-plugin/plugin-10.d
+8b3ee384b0c95292a0028ba41c07cf45  ld/testsuite/ld-plugin/plugin-11.d
+1ab5c99c40a35f2bc5efe3360f1235b2  ld/testsuite/ld-plugin/plugin-12.d
+ba527e9546ed402c82aa2d22b86236ba  ld/testsuite/ld-plugin/plugin-2.d
+dd2a4e0fce19c8632dbc3ac8ebc2fa96  ld/testsuite/ld-plugin/plugin-3.d
+9ba70ecfadb8125e25978153f892168c  ld/testsuite/ld-plugin/plugin-4.d
+ca9d90be38d69cca59a3ff326d8b741e  ld/testsuite/ld-plugin/plugin-5.d
+2dfd3cbce76916d83f9279a40e5032ff  ld/testsuite/ld-plugin/plugin-6.d
+dcea5cc67a08002b575339520b77d6c8  ld/testsuite/ld-plugin/plugin-7.d
+62b6584dc254c60e32f1559a5b038685  ld/testsuite/ld-plugin/plugin-8.d
+30fc063d93e8867c473add20ef7ff9d5  ld/testsuite/ld-plugin/plugin-9.d
+48f18574de4fff28a22869be67319452  ld/testsuite/ld-plugin/plugin-vis-1.d
+3a47945536988c5881e695e9f71028eb  ld/testsuite/ld-plugin/plugin.exp
+72544f1d7add23af2c711066174c8423  ld/testsuite/ld-plugin/text.c
+2056fa7643066f49946ba8d45630009d  ld/testsuite/ld-powerpc/aix-abs-branch-1.dd
+d3b07384d113edec49eaa6238ad5ff00  ld/testsuite/ld-powerpc/aix-abs-branch-1.ex
+ca3964932af48f40a9f48fc85e8f513d  ld/testsuite/ld-powerpc/aix-abs-branch-1.im
+aae7827ef2c1c6392ae6c362e7201589  ld/testsuite/ld-powerpc/aix-abs-branch-1.nd
+875bb8d63ebec84d15bd3e3f0ad53bb7  ld/testsuite/ld-powerpc/aix-abs-branch-1.s
+d3b07384d113edec49eaa6238ad5ff00  ld/testsuite/ld-powerpc/aix-abs-reloc-1.ex
+9fd2efd79e26dd704a262391abfbd37c  ld/testsuite/ld-powerpc/aix-abs-reloc-1.im
+d4578c2dd6929a44a9dd1b6b630c9885  ld/testsuite/ld-powerpc/aix-abs-reloc-1.nd
+37de35f964e0f7eb7fb312f31eab3394  ld/testsuite/ld-powerpc/aix-abs-reloc-1.od
+a585648b05335ce9c7cfdd1201a98265  ld/testsuite/ld-powerpc/aix-abs-reloc-1.s
+d3b07384d113edec49eaa6238ad5ff00  ld/testsuite/ld-powerpc/aix-core-sec-1.ex
+d2b3cf652e19c6f173e6ceadeccbe145  ld/testsuite/ld-powerpc/aix-core-sec-1.hd
+46728f3c273cf2d3fb2fe7f3362d1f98  ld/testsuite/ld-powerpc/aix-core-sec-1.s
+d3b07384d113edec49eaa6238ad5ff00  ld/testsuite/ld-powerpc/aix-core-sec-2.ex
+020d961bc2bd12358e53b141b9b25aa4  ld/testsuite/ld-powerpc/aix-core-sec-2.hd
+97c6402a48ec2effe24d4cec14311c3d  ld/testsuite/ld-powerpc/aix-core-sec-2.s
+d3b07384d113edec49eaa6238ad5ff00  ld/testsuite/ld-powerpc/aix-core-sec-3.ex
+598bf428e975d5338cc63cc0dcbffbe3  ld/testsuite/ld-powerpc/aix-core-sec-3.hd
+ac4da05215010119028f4a88dbe82413  ld/testsuite/ld-powerpc/aix-core-sec-3.s
+892dc50861c06e15d06e4a9a5e7bfb70  ld/testsuite/ld-powerpc/aix-export-1-all.dd
+b47146af1a449575aa5f1dc04f7a3cd1  ld/testsuite/ld-powerpc/aix-export-1-full.dd
+efebc89e74f58c173184ae6ec08a3871  ld/testsuite/ld-powerpc/aix-export-1a.s
+e4be8450cada8f513c4415abef021c68  ld/testsuite/ld-powerpc/aix-export-1b.s
+da869956a689192845cf202356a38b7f  ld/testsuite/ld-powerpc/aix-export-2.nd
+8d9dfe3f3af5571d02728bebdc85aed3  ld/testsuite/ld-powerpc/aix-export-2.s
+db020c9f352b71cf48739e2b629a8eb2  ld/testsuite/ld-powerpc/aix-gc-1-32.dd
+661a3654fa373008a8d4521cccaa599b  ld/testsuite/ld-powerpc/aix-gc-1-64.dd
+f5954e709b76aa5882eb2e5dd8e90a41  ld/testsuite/ld-powerpc/aix-gc-1.ex
+29c8a25c59d0dd1b825d3f9d06d7f47a  ld/testsuite/ld-powerpc/aix-gc-1.nd
+2954aa54466f09a5b6e0df1abd5254f4  ld/testsuite/ld-powerpc/aix-gc-1.s
+1b843204f845302062a05189aecb4b29  ld/testsuite/ld-powerpc/aix-glink-1-32.d
+95af44d4ebc06505379fc0d20e130182  ld/testsuite/ld-powerpc/aix-glink-1-32.dd
+6c8d4e83517afc5b6bc62fe71fa7b375  ld/testsuite/ld-powerpc/aix-glink-1-64.d
+1258981d11030d426a9b638267e1a2bf  ld/testsuite/ld-powerpc/aix-glink-1-64.dd
+5918d3170fd91d138640e5fe9e016f7e  ld/testsuite/ld-powerpc/aix-glink-1.ex
+644cee7428b3d6ed0d84a6da92f02fb3  ld/testsuite/ld-powerpc/aix-glink-1.s
+62234ddf0b3034af7ed1d468d2eaf012  ld/testsuite/ld-powerpc/aix-glink-2-32.dd
+909532b05b88cb16852f12103b254d75  ld/testsuite/ld-powerpc/aix-glink-2-64.dd
+a78cf83e5427170c21b55ba4a1106454  ld/testsuite/ld-powerpc/aix-glink-2a.ex
+41836333e421268f5c945cad02181c4d  ld/testsuite/ld-powerpc/aix-glink-2a.s
+866f7aaf0441b9006bdd636a86074a8d  ld/testsuite/ld-powerpc/aix-glink-2b.s
+cbf3c02328a6322b59037fc4837edcb4  ld/testsuite/ld-powerpc/aix-glink-2c.ex
+aaab138c73a56e0d51a845129e531690  ld/testsuite/ld-powerpc/aix-glink-2c.s
+d3c9a419b5e0dfe645f6cb581879d7e6  ld/testsuite/ld-powerpc/aix-glink-2d.s
+9fca27bf59573703866b04c76ca122c9  ld/testsuite/ld-powerpc/aix-glink-3-32.d
+b005bf2cee284894bc19d339789bbbbf  ld/testsuite/ld-powerpc/aix-glink-3-64.d
+1277e97ff2a6e720d7495a403bf2cab4  ld/testsuite/ld-powerpc/aix-glink-3.dd
+45e865ab7bf05bfca290bba1bb66d8e6  ld/testsuite/ld-powerpc/aix-glink-3.s
+e5dbc2d619226db19ee0af91d94c0e0f  ld/testsuite/ld-powerpc/aix-glink-3a.s
+3ea5b3e158ff935afa068f59addbb208  ld/testsuite/ld-powerpc/aix-glink-3b.s
+bbd7e73e7e570476791242f63e0c2d71  ld/testsuite/ld-powerpc/aix-lineno-1.s
+865a609d25ae921a90e55a8694faecdd  ld/testsuite/ld-powerpc/aix-lineno-1.txt
+b94eb10e645ddbec7c212988a90c0bf6  ld/testsuite/ld-powerpc/aix-lineno-1a.dd
+cfec9e3308bb2d6ae7fa2e85b8fea04c  ld/testsuite/ld-powerpc/aix-lineno-1a.nd
+cb66c732360a0e5c19be21538f028089  ld/testsuite/ld-powerpc/aix-lineno-1b.dd
+d49ecdc3e607c266e7f5e7d80105de69  ld/testsuite/ld-powerpc/aix-lineno-1b.nd
+e0ea0cb320a3c7db3dd1701cc2719c93  ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso.dnd
+74e7cdcfcc462b2c8ff8ef932821593d  ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso.drd
+354b92ddc596eac96df0a47192b56add  ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso.nd
+ba9aab21b2c3be0d32cd1ee743d573d0  ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso.rd
+58bb3bd507ae3ad020445678a4177257  ld/testsuite/ld-powerpc/aix-no-dup-syms-1-rel.nd
+425a8cff195f7c50810e3bd888c8abb1  ld/testsuite/ld-powerpc/aix-no-dup-syms-1-rel.rd
+f0ad8727f2f07b861e795c4cfe1013af  ld/testsuite/ld-powerpc/aix-no-dup-syms-1.ex
+d3b07384d113edec49eaa6238ad5ff00  ld/testsuite/ld-powerpc/aix-no-dup-syms-1.im
+88e303b5f362d2bed5a0b9ac890b55a6  ld/testsuite/ld-powerpc/aix-no-dup-syms-1a.s
+c8af874076ad726683033347509fa7ac  ld/testsuite/ld-powerpc/aix-no-dup-syms-1b.s
+995efaf46f9360c2de42cc707df57cbe  ld/testsuite/ld-powerpc/aix-ref-1-32.od
+4125c347dab35b4ee206d2634f9a0011  ld/testsuite/ld-powerpc/aix-ref-1-64.od
+5604bf2bd9a113169fbaf5ef75e7a56d  ld/testsuite/ld-powerpc/aix-ref-1.s
+d976c55ada460fa272497cc689c6e36f  ld/testsuite/ld-powerpc/aix-rel-1.od
+55a6057fd2b9eb2daa176789f35e3b68  ld/testsuite/ld-powerpc/aix-rel-1.s
+4237df48b26069a7f09cc9c38b10844e  ld/testsuite/ld-powerpc/aix-toc-1-32.dd
+0d68cec016043bfcf7aca4b10bd602d0  ld/testsuite/ld-powerpc/aix-toc-1-64.dd
+60cdcd95a55e7d16dafb9d6bc2ecb69a  ld/testsuite/ld-powerpc/aix-toc-1.ex
+2150ba398cab0572cc59e49a82fb2773  ld/testsuite/ld-powerpc/aix-toc-1a.s
+c4e0f5ac18cb5e7ae52026f8e5f2cc81  ld/testsuite/ld-powerpc/aix-toc-1b.s
+86b105fc9e69dff5ae3e4fca87255d64  ld/testsuite/ld-powerpc/aix-weak-1-dso.dnd
+7b18007de5e106eda4406e6843114ae6  ld/testsuite/ld-powerpc/aix-weak-1-dso.hd
+14606039aa1d861835e0f15f6e834651  ld/testsuite/ld-powerpc/aix-weak-1-dso.nd
+2f56cfa02e5c35436905ce2039a1ece2  ld/testsuite/ld-powerpc/aix-weak-1-gcdso.dnd
+b8a7a968f1738ff42345b75945f4b122  ld/testsuite/ld-powerpc/aix-weak-1-gcdso.hd
+1d608a8199923e08585e21915785d613  ld/testsuite/ld-powerpc/aix-weak-1-gcdso.nd
+2e7db668e32486f08f1854b6fb5df933  ld/testsuite/ld-powerpc/aix-weak-1-rel.hd
+8acd8ea8c67e5be3946058ca30146544  ld/testsuite/ld-powerpc/aix-weak-1-rel.nd
+3915237e72677da8915c41d8235f3852  ld/testsuite/ld-powerpc/aix-weak-1.ex
+8f33bad768aa59fc27214ef339e320eb  ld/testsuite/ld-powerpc/aix-weak-1a.s
+8a580e9b39f76b71f777a41fdf62c3b1  ld/testsuite/ld-powerpc/aix-weak-1b.s
+7762baf695abf911054e8619e19c3940  ld/testsuite/ld-powerpc/aix-weak-2a.ex
+221290f732e87dafc314eb0daeb648b8  ld/testsuite/ld-powerpc/aix-weak-2a.nd
+262475e31ed62d489a26dcd389be840f  ld/testsuite/ld-powerpc/aix-weak-2a.s
+70842d820c3e29ae7eae1f297de1e806  ld/testsuite/ld-powerpc/aix-weak-2b.nd
+39c0dd3f29505cb6855a5ea501b1b29f  ld/testsuite/ld-powerpc/aix-weak-2b.s
+d3b07384d113edec49eaa6238ad5ff00  ld/testsuite/ld-powerpc/aix-weak-2c.ex
+748dbeb15f66cfd60128c9ac65a2a55a  ld/testsuite/ld-powerpc/aix-weak-2c.nd
+def2f718936bb8a76625b2d10ca3212a  ld/testsuite/ld-powerpc/aix-weak-2c.od
+586e92b7b58010225fd38b1d426343d2  ld/testsuite/ld-powerpc/aix-weak-2c.s
+006645063f102b6c7a297d4a7c4f6386  ld/testsuite/ld-powerpc/aix-weak-3-32.d
+58828abbaffd055354277ec238820a7f  ld/testsuite/ld-powerpc/aix-weak-3-32.dd
+56deffed984fd9131dd96226aea2091d  ld/testsuite/ld-powerpc/aix-weak-3-64.d
+123061df52af683bb91dcb4a84c3d83c  ld/testsuite/ld-powerpc/aix-weak-3-64.dd
+be4252948c7ed64eb66b79344e1653af  ld/testsuite/ld-powerpc/aix-weak-3a.ex
+374aa6a557b88260efd096cf5efb9daf  ld/testsuite/ld-powerpc/aix-weak-3a.s
+009520053b00386d1173f3988c55d192  ld/testsuite/ld-powerpc/aix-weak-3b.ex
+e9279b52fb9ad49703e8c667bc97c2f6  ld/testsuite/ld-powerpc/aix-weak-3b.s
+19847f90e5f5e4ed64aac571cd9e9a57  ld/testsuite/ld-powerpc/aix52.exp
+ee62f5cb3e7690e27455b15c3a57634f  ld/testsuite/ld-powerpc/apuinfo-nul.rd
+519a83f6661f4e92b4f1cd2404e97f90  ld/testsuite/ld-powerpc/apuinfo-nul.s
+3cebbf08302b7c7cddff45df86c79629  ld/testsuite/ld-powerpc/apuinfo-nul1.s
+010e15de7d73110844ad854708e55cec  ld/testsuite/ld-powerpc/apuinfo.rd
+787da85c4090a2cd214e445bf01ed784  ld/testsuite/ld-powerpc/apuinfo1.s
+122c70dca18f0a00814d752c8ac134bf  ld/testsuite/ld-powerpc/apuinfo2.s
+88f68a8288d53e408300f8b822bbbae4  ld/testsuite/ld-powerpc/attr-gnu-12-1.s
+562248d60d1c84e7abdb186ffc6aadfe  ld/testsuite/ld-powerpc/attr-gnu-12-11.d
+a6c72ffd9c53e62bc4800c6b5ce6f7a6  ld/testsuite/ld-powerpc/attr-gnu-12-2.s
+c4e457c71ba66d0ce624a03b507ee5aa  ld/testsuite/ld-powerpc/attr-gnu-12-21.d
+eaab780bec027c6ef6ac334619ba2b18  ld/testsuite/ld-powerpc/attr-gnu-4-0.s
+a8680b3b7cad2d388fabcc5994a00076  ld/testsuite/ld-powerpc/attr-gnu-4-00.d
+48a6491909160de24ed692f6f1e2ee2d  ld/testsuite/ld-powerpc/attr-gnu-4-01.d
+35b0780c5391a8ad2fb0bafb93826996  ld/testsuite/ld-powerpc/attr-gnu-4-02.d
+e6d088a574710ce388eb63689c8ee78f  ld/testsuite/ld-powerpc/attr-gnu-4-03.d
+018b97f0a56402eb7f0edfcc26b8cd1d  ld/testsuite/ld-powerpc/attr-gnu-4-1.s
+c2bacf49b6e6a98768dd05f4db91d1b5  ld/testsuite/ld-powerpc/attr-gnu-4-10.d
+07aadb81c2adc048aa6fc92c1d591068  ld/testsuite/ld-powerpc/attr-gnu-4-11.d
+6e61359374a55284e9083895aa00196c  ld/testsuite/ld-powerpc/attr-gnu-4-12.d
+417988625e2bef49e568497fe0753583  ld/testsuite/ld-powerpc/attr-gnu-4-13.d
+c6bbc186b1a46762256a92672c76c43d  ld/testsuite/ld-powerpc/attr-gnu-4-14.d
+eac9dfdfc46cc5dd33f029ec52ee6793  ld/testsuite/ld-powerpc/attr-gnu-4-2.s
+ab1b8c9d73249300efb3b0e79494fbcb  ld/testsuite/ld-powerpc/attr-gnu-4-20.d
+a4a11190c7363d8aa1f641d8072110b7  ld/testsuite/ld-powerpc/attr-gnu-4-21.d
+353d68e8db93ad913fa7c72ee33e1e2f  ld/testsuite/ld-powerpc/attr-gnu-4-22.d
+dd77181fcbba065c28b5711b2ed015d6  ld/testsuite/ld-powerpc/attr-gnu-4-23.d
+8b43b66063286aa42c897efb8775ea8f  ld/testsuite/ld-powerpc/attr-gnu-4-24.d
+7fd562a8f705fa9e3d082842773a9fd7  ld/testsuite/ld-powerpc/attr-gnu-4-3.s
+baa8db7def2ab7e74508e42246b79d98  ld/testsuite/ld-powerpc/attr-gnu-4-31.d
+5a339372f1afc9d7daab5c77e414b319  ld/testsuite/ld-powerpc/attr-gnu-4-32.d
+2f679e4a6ceef1fbb873ab57e8fa12cb  ld/testsuite/ld-powerpc/attr-gnu-4-33.d
+0cb23b2934471b6640dcf76aa298dcae  ld/testsuite/ld-powerpc/attr-gnu-4-34.d
+bd99d860c5949dcff583df0a100a0ab3  ld/testsuite/ld-powerpc/attr-gnu-4-4.s
+69daeab8e5bdf7168f9657661f8a0281  ld/testsuite/ld-powerpc/attr-gnu-4-41.d
+78d5b5b1579969eeb0c2adc4435ceba6  ld/testsuite/ld-powerpc/attr-gnu-8-1.s
+1dc00156e17bc28841f31d0ac1135be9  ld/testsuite/ld-powerpc/attr-gnu-8-11.d
+02808fe5f9efcbe94fa262dcef9ea031  ld/testsuite/ld-powerpc/attr-gnu-8-2.s
+7c19ff4820069ee6b10040038b621ead  ld/testsuite/ld-powerpc/attr-gnu-8-23.d
+786fb2f305ce54b247bea7cdfc29b5a9  ld/testsuite/ld-powerpc/attr-gnu-8-3.s
+39d9306ef744cdecdf7376c38241d3fc  ld/testsuite/ld-powerpc/attr-gnu-8-31.d
+d10db0d5e0fc0f02abcba0a28e1b4f1a  ld/testsuite/ld-powerpc/oldtlslib.s
+f0a3eb083d43ce486aa5db8c7d4e2e57  ld/testsuite/ld-powerpc/plt1.d
+427bc64abfbbca294d753753cf4b3573  ld/testsuite/ld-powerpc/plt1.s
+2d7168f016d466361a0f37058520f2fa  ld/testsuite/ld-powerpc/powerpc.exp
+3cc62e496eb86a99bc9232546628fb3a  ld/testsuite/ld-powerpc/relax.d
+fb7e959e27d0729bfa5e91a3d4c082a7  ld/testsuite/ld-powerpc/relax.s
+b74f226a07844cd8969ed2e84a1b7d25  ld/testsuite/ld-powerpc/relaxr.d
+f541ad37869dde03dc5885dd50c1481b  ld/testsuite/ld-powerpc/relbrlt.d
+fed89963c6094ee31776b29c918d6a24  ld/testsuite/ld-powerpc/relbrlt.s
+d0c078412690065f88a1d02ceafdeccf  ld/testsuite/ld-powerpc/reloc.d
+53652025c67e058e17ee2f5b68f62577  ld/testsuite/ld-powerpc/reloc.s
+faf25052dc4eb831cb4cbdcc617eaa51  ld/testsuite/ld-powerpc/sdadyn.d
+b11b5807e7a6fa381d608f06a71e0bb1  ld/testsuite/ld-powerpc/sdadyn.s
+4291ceef5a9a5101e6b9694d18484709  ld/testsuite/ld-powerpc/sdalib.s
+d87aa302fd5305f712767b6d3679220b  ld/testsuite/ld-powerpc/symtocbase-1.s
+495885b7a4b9c45d264ac690a0196b22  ld/testsuite/ld-powerpc/symtocbase-2.s
+aa5f4942eac1d2661d7d178713906bcd  ld/testsuite/ld-powerpc/symtocbase.d
+bfecc74ae4a9b993f413069c788cd0ac  ld/testsuite/ld-powerpc/tls.d
+863594542395bb4a79591b3639d5f63c  ld/testsuite/ld-powerpc/tls.g
+8301929a8722e78f7597ceda20b84e87  ld/testsuite/ld-powerpc/tls.s
+bd2bacee052020afd7dac82cf8d2d3f3  ld/testsuite/ld-powerpc/tls.t
+1913f185dc8a5675aea58c1ac7f3c2da  ld/testsuite/ld-powerpc/tls32.d
+e49d066c8c8b5e3295e1b525859e5660  ld/testsuite/ld-powerpc/tls32.g
+bea8413d63541a8a7dbdc303790f9127  ld/testsuite/ld-powerpc/tls32.s
+c0ef4eee1944a09ab22b782d89a8c699  ld/testsuite/ld-powerpc/tls32.t
+e13035e08ed4a1bc79222b5d4e2540af  ld/testsuite/ld-powerpc/tlsexe.d
+c527d11b8f61281657a889bc9c0b2e0b  ld/testsuite/ld-powerpc/tlsexe.g
+5f828b678ab7a002f54f02e4a7b938d7  ld/testsuite/ld-powerpc/tlsexe.r
+646bb364341f301973ce098ae2f8039c  ld/testsuite/ld-powerpc/tlsexe.t
+7ba76e58197f73d6a0ae1fa7a6260fab  ld/testsuite/ld-powerpc/tlsexe32.d
+c1c88919bd566096b68d8f9bfc9e52a7  ld/testsuite/ld-powerpc/tlsexe32.g
+e020efe9a1c03e9100d8fc456193163f  ld/testsuite/ld-powerpc/tlsexe32.r
+f97543e5816cc551d4a2213ec82f0f70  ld/testsuite/ld-powerpc/tlsexe32.t
+08450fa24f4f7560b2530d570ec848cd  ld/testsuite/ld-powerpc/tlsexetoc.d
+6a5da004bb4e186a7426471e71c5f3b2  ld/testsuite/ld-powerpc/tlsexetoc.g
+78b985c3ef30729e9c8262265d64ce77  ld/testsuite/ld-powerpc/tlsexetoc.r
+4a7fe05f8c468454f0be009dec3fdc19  ld/testsuite/ld-powerpc/tlsexetoc.t
+9a42b93947f1b17acefde9b84ece4632  ld/testsuite/ld-powerpc/tlslib.s
+a6dccb915f964db461b164a90787e0aa  ld/testsuite/ld-powerpc/tlslib32.s
+65400fa0ec0a37bff5dec4387ec01d43  ld/testsuite/ld-powerpc/tlsmark.d
+405adb1e2e31fe70c4f643fb942f78f4  ld/testsuite/ld-powerpc/tlsmark.s
+530e96abe77e8ec63d1ead037b890f6e  ld/testsuite/ld-powerpc/tlsmark32.d
+09a50a7db03c8b6bae854c9426b8ee51  ld/testsuite/ld-powerpc/tlsmark32.s
+5a0d7616ccb01ee8d0a04f5743c62922  ld/testsuite/ld-powerpc/tlsopt1.d
+218a7083014093b0da1ec318e619b074  ld/testsuite/ld-powerpc/tlsopt1.s
+99a7359245ecf7421bc80aa951fd6d93  ld/testsuite/ld-powerpc/tlsopt1_32.d
+f724bd21a670becef25deb108ba036f3  ld/testsuite/ld-powerpc/tlsopt1_32.s
+e6ca35bbc098f95517d65a56320e5e20  ld/testsuite/ld-powerpc/tlsopt2.d
+e9f2f43970c51117c39bd368b6b78be4  ld/testsuite/ld-powerpc/tlsopt2.s
+e739949354e3c1961c599a0c371fbb1b  ld/testsuite/ld-powerpc/tlsopt2_32.d
+4a3264168519b972800f38adf985b35f  ld/testsuite/ld-powerpc/tlsopt2_32.s
+3cb4e439af9f0d7c9b32ec4ec05399cd  ld/testsuite/ld-powerpc/tlsopt3.d
+51add6cacf0d82d46cbd6945a39f8ee3  ld/testsuite/ld-powerpc/tlsopt3.s
+e1cb5270ff6cbcf16668b353138f3c24  ld/testsuite/ld-powerpc/tlsopt3_32.d
+d44c161b121d1b249d5b05533020a54f  ld/testsuite/ld-powerpc/tlsopt3_32.s
+a681f7ee9504ec5cef0c5e77f56d1ed0  ld/testsuite/ld-powerpc/tlsopt4.d
+f3f4d3a1dd2ecf6f44b5bc3333d2d79f  ld/testsuite/ld-powerpc/tlsopt4.s
+b658e6cf2cde708a36242d0fd23745d4  ld/testsuite/ld-powerpc/tlsopt4_32.d
+9f34854a67102932713ec55fc2f3f3c6  ld/testsuite/ld-powerpc/tlsopt4_32.s
+0a8ee8073547fc6d62a9430071960505  ld/testsuite/ld-powerpc/tlsso.d
+1a433ed6c72afabe588d99e37cb9e39d  ld/testsuite/ld-powerpc/tlsso.g
+83aebe87e90bdfb8bc83d007fd5e5116  ld/testsuite/ld-powerpc/tlsso.r
+f036e7b2b51f16236c81590e2e4a6697  ld/testsuite/ld-powerpc/tlsso.t
+9b010d01487d7fb0663b61c712d6035c  ld/testsuite/ld-powerpc/tlsso32.d
+c0ebc9ec6eca79f46f5819ed66ba577a  ld/testsuite/ld-powerpc/tlsso32.g
+5dd404684085c860d6acb89fb0b3fb98  ld/testsuite/ld-powerpc/tlsso32.r
+33abdf51a1e378a2087e888d309f988b  ld/testsuite/ld-powerpc/tlsso32.t
+cd04cfbb301f112f9090369d128f2688  ld/testsuite/ld-powerpc/tlstoc.d
+bd5eec94c235419cf306a2c7fe11e11b  ld/testsuite/ld-powerpc/tlstoc.g
+4891ee12248bc36790947b84a88cd9c0  ld/testsuite/ld-powerpc/tlstoc.s
+38d558bbfd10a333ed6122dc7123571b  ld/testsuite/ld-powerpc/tlstoc.t
+c533cac4281a599096475aa6b2970916  ld/testsuite/ld-powerpc/tlstocso.d
+be2d0e53f3a73ddb42037f1fb7bedaf9  ld/testsuite/ld-powerpc/tlstocso.g
+87aa0d9262a14b02c8303bd3a6116a5c  ld/testsuite/ld-powerpc/tlstocso.r
+dc1545b0e1300fa2e532d355d1023452  ld/testsuite/ld-powerpc/tlstocso.t
+69d0f49425b3c4da6d33725f2bdadf91  ld/testsuite/ld-powerpc/tocopt.d
+42cea1c68584019b5b89d2f03cddc1ce  ld/testsuite/ld-powerpc/tocopt.out
+6bb54eb5b47043ad92883d4858f7def2  ld/testsuite/ld-powerpc/tocopt.s
+c9a4c6fd1b8b63a309ce1dfc89f6b78c  ld/testsuite/ld-powerpc/tocopt2.d
+03ec73a6aa0f52943bef08d648f2cefb  ld/testsuite/ld-powerpc/tocopt2.out
+b6ea6463608234d456d35f3cc9c372a9  ld/testsuite/ld-powerpc/tocopt2.s
+c9a4c6fd1b8b63a309ce1dfc89f6b78c  ld/testsuite/ld-powerpc/tocopt3.d
+33e083640e64441f7c796d89634b81e7  ld/testsuite/ld-powerpc/tocopt3.s
+a1a754c4ee7caf10faee283860f8f552  ld/testsuite/ld-powerpc/tocopt4.d
+702b412d8c6002e9efbe7b9760029306  ld/testsuite/ld-powerpc/tocopt4a.s
+a807e3ff17c2c9d22ae7d46cf7ccbb4c  ld/testsuite/ld-powerpc/tocopt4b.s
+e721d782b4f3267f9933b0b804cd8b9f  ld/testsuite/ld-powerpc/tocopt5.d
+7c769079034dfee8d28d7d7292311d4e  ld/testsuite/ld-powerpc/tocopt5.s
+ea572ffd48301e37ce8ff8863793697c  ld/testsuite/ld-powerpc/vxworks-relax-2.rd
+756b1282ce6a23e3b07addc9a54392ab  ld/testsuite/ld-powerpc/vxworks-relax-2.s
+846faeee15c72e202fd5132030173f42  ld/testsuite/ld-powerpc/vxworks-relax.rd
+a5e5962ef075b6977f71f32a74dcbd72  ld/testsuite/ld-powerpc/vxworks-relax.s
+dabafb6400d1624b1bf5d0e7599ceb2c  ld/testsuite/ld-powerpc/vxworks1-lib.dd
+acca061d87c83f585ea88472d89d554d  ld/testsuite/ld-powerpc/vxworks1-lib.nd
+b99f04c5e9db566e3653b61070ef62c7  ld/testsuite/ld-powerpc/vxworks1-lib.rd
+986a11fc7eac3ba90472ab1c8a1ad3d4  ld/testsuite/ld-powerpc/vxworks1-lib.s
+b5760134e083c35f414fe5e4308a070e  ld/testsuite/ld-powerpc/vxworks1-lib.sd
+6dbdc5d4346169b9a3af98707d77be72  ld/testsuite/ld-powerpc/vxworks1-lib.td
+ac0b4d23d8c88db1538c122df4279799  ld/testsuite/ld-powerpc/vxworks1-static.d
+6498ea121cb6fe7240ffc9e254fe6f09  ld/testsuite/ld-powerpc/vxworks1.dd
+20cf5642bf6ad5bc6d0b0abb0afe4b75  ld/testsuite/ld-powerpc/vxworks1.ld
+020c5534bb71fa061939f607193cebf6  ld/testsuite/ld-powerpc/vxworks1.rd
+66e3ac39954536d122375680de218509  ld/testsuite/ld-powerpc/vxworks1.s
+70a3a63caaa6294e72a21f3af93d802c  ld/testsuite/ld-powerpc/vxworks2-static.sd
+59945c589f97dc856c251f390437b5ec  ld/testsuite/ld-powerpc/vxworks2.s
+a59d05b41e3dd040fb4e12e434cff21d  ld/testsuite/ld-powerpc/vxworks2.sd
+2f7e5f1bf217d02d323ef077dd5cf1d8  ld/testsuite/ld-s390/s390.exp
+c40e8c0331c6d98637583ea1e30e91e9  ld/testsuite/ld-s390/tlsbin.dd
+b9a52eb541a7a4d08bc53674954b18da  ld/testsuite/ld-s390/tlsbin.rd
+dfc5a09a574f7db9aa5c609b2b61d663  ld/testsuite/ld-s390/tlsbin.s
+129de764f451a6e38ff8e91c1de856e1  ld/testsuite/ld-s390/tlsbin.sd
+2e6c6964734ec81f6ed203568d2cf8bc  ld/testsuite/ld-s390/tlsbin.td
+88e1883b94e53d199350ed7be57f1db5  ld/testsuite/ld-s390/tlsbin_64.dd
+fdea4789d34d342352c5790d964666c7  ld/testsuite/ld-s390/tlsbin_64.rd
+92972a9e8ed73263fe9dd260a972a00f  ld/testsuite/ld-s390/tlsbin_64.s
+5083c5af007cc9a18444cba7aec7d685  ld/testsuite/ld-s390/tlsbin_64.sd
+ec34e31021e910030b56a53077269534  ld/testsuite/ld-s390/tlsbin_64.td
+df1bb4542623cb92c3544cf083bd0d40  ld/testsuite/ld-s390/tlsbinpic.s
+b6275de1b0e1a08a2b3fa24ee85d230c  ld/testsuite/ld-s390/tlsbinpic_64.s
+63d5514386005c2b68e0f502e0deda14  ld/testsuite/ld-s390/tlslib.s
+63d5514386005c2b68e0f502e0deda14  ld/testsuite/ld-s390/tlslib_64.s
+5eb0a3c451edc240fc5eda47dd557769  ld/testsuite/ld-s390/tlspic.dd
+fa04b281fb074f8b4ad08a0075a92854  ld/testsuite/ld-s390/tlspic.rd
+bcbc04334a471aca9e71c0cc99c7e131  ld/testsuite/ld-s390/tlspic.sd
+54dbf2b658b06137f674825d8474c8af  ld/testsuite/ld-s390/tlspic.td
+7db72b84a4c88ca6b985e09ddcdbf995  ld/testsuite/ld-s390/tlspic1.s
+ec81ab04e19a45347ef1a423d9ddbfd7  ld/testsuite/ld-s390/tlspic1_64.s
+1be6d8e1547c710f7bc12028c6522832  ld/testsuite/ld-s390/tlspic2.s
+1be6d8e1547c710f7bc12028c6522832  ld/testsuite/ld-s390/tlspic2_64.s
+979c84647c473fedcc1a6511336d84dd  ld/testsuite/ld-s390/tlspic_64.dd
+8970de00cc92bb403d233f310ea3f521  ld/testsuite/ld-s390/tlspic_64.rd
+ab9872b24c3c97aaf099a081de993709  ld/testsuite/ld-s390/tlspic_64.sd
+2f047623197dae3f539aea80b15120e4  ld/testsuite/ld-s390/tlspic_64.td
+b8b9611632f9b31fc9d8d68da9320c31  ld/testsuite/ld-scripts/align.exp
+8a219a0fc5ea21ec757cf630c69f6bf6  ld/testsuite/ld-scripts/align.s
+efeb8e6f0a3f40f9920e2030bf854b18  ld/testsuite/ld-scripts/align.t
+1bc6194419a61faf0aaf28eb2c343962  ld/testsuite/ld-scripts/align2.t
+a19364e9d2dc7c585b2d91c72cd806b3  ld/testsuite/ld-scripts/align2a.d
+aab55ad4c7de88d6b2781ab6e273346a  ld/testsuite/ld-scripts/align2a.s
+528c3b955e569ae445d0ba4e712b7fe8  ld/testsuite/ld-scripts/align2b.d
+aab55ad4c7de88d6b2781ab6e273346a  ld/testsuite/ld-scripts/align2b.s
+7c3f8de8c952c3a5d74b76e5e9b08f96  ld/testsuite/ld-scripts/align2c.d
+aab55ad4c7de88d6b2781ab6e273346a  ld/testsuite/ld-scripts/align2c.s
+60c07eeb2d012d17b5df27e2f32d98e8  ld/testsuite/ld-scripts/alignof.exp
+efd86cba421ee94f32bacfa0d471a45b  ld/testsuite/ld-scripts/alignof.s
+b4aa3cb7bf860b7a59b6479a93814279  ld/testsuite/ld-scripts/alignof.t
+7534c8f58680bbd0c85a46bb89e5f21c  ld/testsuite/ld-scripts/assert.exp
+68b329da9893e34099c7d8ad5cb9c940  ld/testsuite/ld-scripts/assert.s
+0b8d03508f04bd878e18f47361a77a91  ld/testsuite/ld-scripts/assert.t
+d976d3bb48e57b0a7bd099c01e5efef0  ld/testsuite/ld-scripts/assert2.d
+d5fdb2d409325be02826cf16b82b5816  ld/testsuite/ld-scripts/assert2.t
+e882253a7b0f660986d5794a36239b1b  ld/testsuite/ld-scripts/cross1.c
+8bcf5c1294efdc1276b8ecd0820dba3b  ld/testsuite/ld-scripts/cross1.t
+2bad1250e1d3998f3c2d678b1b90d275  ld/testsuite/ld-scripts/cross2.c
+8688dcf616adf0952098881c826c77b8  ld/testsuite/ld-scripts/cross2.t
+6cda0a6cae6d6fe585c175aa49c2578e  ld/testsuite/ld-scripts/cross3.c
+24ca67fb6299b75886b829db50f09f18  ld/testsuite/ld-scripts/cross3.t
+be2d98503c3e3a02a41eca2fe813a310  ld/testsuite/ld-scripts/cross4.c
+fa086879d31c4e72e572178185ad8379  ld/testsuite/ld-scripts/crossref.exp
+2b95fbcecb9b6b61edab9de8fb73d139  ld/testsuite/ld-scripts/data.d
+d6d0e0bdcb41b6dd1efcce7dce8bcb9b  ld/testsuite/ld-scripts/data.exp
+68b329da9893e34099c7d8ad5cb9c940  ld/testsuite/ld-scripts/data.s
+0731e98ca5673229486cfcf5058fec31  ld/testsuite/ld-scripts/data.t
+8cca496097801b6515c7a5b518d6afe6  ld/testsuite/ld-scripts/default-script.exp
+dab92d62194ce975a2a9b09cbf5bd62d  ld/testsuite/ld-scripts/default-script.s
+1f054fba217a65109aca9010a3afad97  ld/testsuite/ld-scripts/default-script.t
+b063b394ee6c4ec1fe0878ff0a5cdd66  ld/testsuite/ld-scripts/default-script1.d
+743d87bab1e74e0c640c260273c79367  ld/testsuite/ld-scripts/default-script2.d
+c7a8b8fabda933b7d2707867c228f333  ld/testsuite/ld-scripts/default-script3.d
+def46387fdbd4736a39b973f982486da  ld/testsuite/ld-scripts/default-script4.d
+eb19f866cc44d6d2535b7f86e692f939  ld/testsuite/ld-scripts/defined.exp
+19b93ed474627147af50ef5dd4913b3d  ld/testsuite/ld-scripts/defined.s
+d3b1800f46a71805045a3a5732fd42bc  ld/testsuite/ld-scripts/defined.t
+898a5ade6aa8f7eaf68f1f700d64799b  ld/testsuite/ld-scripts/defined2.d
+44e50acb685e014b85b6f6d140487f89  ld/testsuite/ld-scripts/defined2.t
+9e5f7ff90002487a36c98aab00769086  ld/testsuite/ld-scripts/defined3.d
+0117741095baa2e563ab8014b71135c3  ld/testsuite/ld-scripts/defined3.t
+1aa7e13d84c9ab15c53fb91aca325ba5  ld/testsuite/ld-scripts/defined4.d
+80bc9c86d1e83e005c3f08ed5c6e5d94  ld/testsuite/ld-scripts/defined4.s
+efbb1e72751b5c74e87643442098d38e  ld/testsuite/ld-scripts/defined4.t
+a8f026788510671d09d2cf62cfcd2123  ld/testsuite/ld-scripts/defined5.d
+fa2a527dcfdfa14594c3fbe845724ad5  ld/testsuite/ld-scripts/defined5.s
+634c89f141d8740d7641be42e6a938b9  ld/testsuite/ld-scripts/defined5.t
+dbaca5ab0c56146533bcb91837e1ec4c  ld/testsuite/ld-scripts/dynamic-sections-1.s
+0f1ac5c77c696c7314db13212177296a  ld/testsuite/ld-scripts/dynamic-sections-2.s
+31258b14a9fe381a3b20a81aa0943441  ld/testsuite/ld-scripts/dynamic-sections.d
+efbbd41c97599d90deba7f4e41c9ab3e  ld/testsuite/ld-scripts/dynamic-sections.exp
+cda22c60c0c5a23d00b019cc2a1deeb8  ld/testsuite/ld-scripts/dynamic-sections.t
+782d1e1185e81a64808009b693496f87  ld/testsuite/ld-scripts/empty-address-1.d
+37e305b6a8b6a5992478afb73a0aa3ef  ld/testsuite/ld-scripts/empty-address-1.s
+5a2f0df9be51622946dbb43e056c8d2d  ld/testsuite/ld-scripts/empty-address-1.t
+f6eaab7211c7a02da0c2d639e9d065fb  ld/testsuite/ld-scripts/empty-address-2.s
+15cc5bcae78e4aa1bdaaf794acf5c9b5  ld/testsuite/ld-scripts/empty-address-2a.d
+441c812f4a1779b8fc7130f7f50f4a41  ld/testsuite/ld-scripts/empty-address-2a.t
+cad53ff86321fee6771dc7a2f11ff323  ld/testsuite/ld-scripts/empty-address-2b.d
+5c9c456d2657e87e99a29c87617299e0  ld/testsuite/ld-scripts/empty-address-2b.t
+e41e9eb346bd6a273d3689973089af39  ld/testsuite/ld-scripts/empty-address-3.s
+5b85a1298326abae8a4d46b0a3038e7c  ld/testsuite/ld-scripts/empty-address-3a.d
+229a146cac0eb2ae6f520113b1a8e3bb  ld/testsuite/ld-scripts/empty-address-3a.t
+960f13391ac4f8a45700c5d286aecbab  ld/testsuite/ld-scripts/empty-address-3b.d
+61b68acf1d4c0bbd5a0a9958746cc568  ld/testsuite/ld-scripts/empty-address-3b.t
+314a6abe67053be2de44e65b2e212ffd  ld/testsuite/ld-scripts/empty-address-3c.d
+f19afb7f2928a588627868fd9f746c94  ld/testsuite/ld-scripts/empty-address-3c.t
+9c11b3f87746abae2592133a0f2b78de  ld/testsuite/ld-scripts/empty-address.exp
+9eb676e81d317240bcb8eb272286acba  ld/testsuite/ld-scripts/empty-aligned.d
+e213ecad495055cff4ee37775f8b893f  ld/testsuite/ld-scripts/empty-aligned.exp
+c95f2f24f30fd409b48e6c65aed7e7b8  ld/testsuite/ld-scripts/empty-aligned.s
+cadba576e289814de613ad9a36e37b28  ld/testsuite/ld-scripts/empty-aligned.t
+4ec32cb171d7c5decdeda38902757e89  ld/testsuite/ld-scripts/empty-orphan.d
+8923667f51cc724d30750fff98be3010  ld/testsuite/ld-scripts/empty-orphan.exp
+2b91402df2ee759463e5c198571e9067  ld/testsuite/ld-scripts/empty-orphan.s
+1f2cc701ae44978ae698ba85fb7ab2d1  ld/testsuite/ld-scripts/empty-orphan.t
+0d5079fdad6823f9b5dc902a1c20c1ba  ld/testsuite/ld-scripts/expr.exp
+53b5c57797ed048cf0081b27f6f6ad43  ld/testsuite/ld-scripts/expr1.d
+c026c9f5a94ccb87670ef9454c4b4457  ld/testsuite/ld-scripts/expr1.s
+72dc3d110471195e8c2c2e12890a63a0  ld/testsuite/ld-scripts/expr1.t
+4b54037586964b45440c1d83b1df28d4  ld/testsuite/ld-scripts/expr2.d
+80bc9c86d1e83e005c3f08ed5c6e5d94  ld/testsuite/ld-scripts/expr2.s
+5e2872afc8e941664adda38529c2728f  ld/testsuite/ld-scripts/expr2.t
+2af50d4a4afc61c7cbb803aad3c1826b  ld/testsuite/ld-scripts/extern.exp
+77c5ad60254674e9c8dc4adb9885680d  ld/testsuite/ld-scripts/extern.s
+33b9171e28d59c070a8ea1a1f023eaae  ld/testsuite/ld-scripts/extern.t
+b53c8d61e9a04a89474e9a9ade3b7e2f  ld/testsuite/ld-scripts/include-1.d
+81982091322b6f1040ad5e943560a629  ld/testsuite/ld-scripts/include-1.t
+faf7d431f075db11ad96dcb61da5ff94  ld/testsuite/ld-scripts/include-data.t
+12c329294118963ae97cbf0acea91b73  ld/testsuite/ld-scripts/include-mem.t
+ce9fd1b956119308237b29b59314a492  ld/testsuite/ld-scripts/include-ram.t
+5c3b2699f5da90ad83b0f80ffa47ef1d  ld/testsuite/ld-scripts/include-sections.t
+c25b58f6e971a5d5e2ffd9acaeba5c2c  ld/testsuite/ld-scripts/include-subdata.t
+f1e343b6a00b81ad3b7739b7f636df0c  ld/testsuite/ld-scripts/include.exp
+d82eab8a7c540b70a9d42c4d5f8ad5e9  ld/testsuite/ld-scripts/include.s
+dad1d5a88aa3057b44cab5ed057bd0f8  ld/testsuite/ld-scripts/map-address.d
+d0445e0d3c4c74f8dae6be662ceb2208  ld/testsuite/ld-scripts/map-address.exp
+ee9133459395cc83547a90f71607a2e7  ld/testsuite/ld-scripts/map-address.t
+38b10c0ac2168cabc2e2136b06641345  ld/testsuite/ld-scripts/memory.t
+69f8c2a613c10d3d7240ba41dce31d86  ld/testsuite/ld-scripts/overlay-size-map.d
+c13d85cd086921f0c99d9096753d5b59  ld/testsuite/ld-scripts/overlay-size.d
+49eff27234370d5b4a3ee64be5a6b6ed  ld/testsuite/ld-scripts/overlay-size.exp
+2b01a21989d86f594965069b9db1a687  ld/testsuite/ld-scripts/overlay-size.s
+465efb6158dbe625e28635d490c72e06  ld/testsuite/ld-scripts/overlay-size.t
+9bb28244ed6f1001e8a6ebcf98c11621  ld/testsuite/ld-scripts/phdrs.exp
+9af38df1b2580b0ee309b0acfb185537  ld/testsuite/ld-scripts/phdrs.s
+56a4859269de48bfbf859d4d0a327e9f  ld/testsuite/ld-scripts/phdrs.t
+50797575ad3ddcd8fae40e26f7b93679  ld/testsuite/ld-scripts/phdrs2.exp
+bbdb3e701421ecc295aca863f590193b  ld/testsuite/ld-scripts/phdrs2.s
+10ce00070bb4eb5f81bcde7d2f448717  ld/testsuite/ld-scripts/phdrs2.t
+777551924a367d55841a9eeb6a7f84c5  ld/testsuite/ld-scripts/phdrs3.d
+5dfa5ca91a88f2134aae004411e57863  ld/testsuite/ld-scripts/phdrs3.exp
+6bbc947df54c8d075812ecb6de0e6dde  ld/testsuite/ld-scripts/phdrs3.t
+b0df290c73d331897b616c5e6cc13b17  ld/testsuite/ld-scripts/phdrs3a.d
+b2f3e21cb331ff60113f9a54794a600a  ld/testsuite/ld-scripts/phdrs3a.t
+e9fefb7de97b4937234f4f72ed5b3406  ld/testsuite/ld-scripts/provide-1.d
+252d36bfea703ce0d2506e236f2f3db3  ld/testsuite/ld-scripts/provide-1.s
+a29f1a3f99b5fca57b47a0c79e570c44  ld/testsuite/ld-scripts/provide-1.t
+54dbd4232cd3eac2e29209e757f7782e  ld/testsuite/ld-scripts/provide-2.d
+11d70d7ac52d4044cec8d6e9f12c754d  ld/testsuite/ld-scripts/provide-2.s
+c75f381e3417a08d872ae204c2b8627f  ld/testsuite/ld-scripts/provide-2.t
+0f2e46274037262a991b96738b30a16e  ld/testsuite/ld-scripts/provide-3.d
+252d36bfea703ce0d2506e236f2f3db3  ld/testsuite/ld-scripts/provide-3.s
+f78db69d068819fd77beecf6ee3b91b0  ld/testsuite/ld-scripts/provide-3.t
+6a2f60d04dcb58a2c16747768a94c647  ld/testsuite/ld-scripts/provide.exp
+fb6c05c867db1b969daca1d830f3bb17  ld/testsuite/ld-scripts/region-alias-1.t
+53f2c50706ceb0f728816e769ad766dd  ld/testsuite/ld-scripts/region-alias-2.t
+24c24801461d9cec5d704b5c208afb3f  ld/testsuite/ld-scripts/region-alias-3.t
+dc1f50c60034f324016cbf789f431836  ld/testsuite/ld-scripts/region-alias-4.t
+f0a2370e05e263570d85f04b36bf3a18  ld/testsuite/ld-scripts/rgn-at.exp
+da2cb6b70163cfb23cef6b1908f923f5  ld/testsuite/ld-scripts/rgn-at.s
+8857d53753ad8a9a69ac2f457a6ff830  ld/testsuite/ld-scripts/rgn-at1.d
+e56df4116cc3a635ace207e3e189c58d  ld/testsuite/ld-scripts/rgn-at1.t
+a3dd4b1b3b059ff5a43e4f5c980d111a  ld/testsuite/ld-scripts/rgn-at2.d
+0b77db3e0cc95ef37de335174d35a3e2  ld/testsuite/ld-scripts/rgn-at2.t
+589aaa26a4c3fd5279ab20d6ef88af91  ld/testsuite/ld-scripts/rgn-at3.d
+942fe0360820a3e6618ad426317ed940  ld/testsuite/ld-scripts/rgn-at3.t
+f7d1da70dc15a99802d5d100357c5552  ld/testsuite/ld-scripts/rgn-at4.d
+d3e36eb38d25f61fe0e7e199b81cc839  ld/testsuite/ld-scripts/rgn-at4.t
+54ad9a22cc4ab9cb41a011f1d2fdfb27  ld/testsuite/ld-scripts/rgn-at5.d
+583bee06b7ae8e1ebd4785762bb24bf8  ld/testsuite/ld-scripts/rgn-at5.s
+e82261fb2abdba3fd5af311575ad8443  ld/testsuite/ld-scripts/rgn-at5.t
+afdffd4c10488414310425809494d1f1  ld/testsuite/ld-scripts/rgn-over.exp
+7a2042cc7b75ed2d99c10434557fe53b  ld/testsuite/ld-scripts/rgn-over.s
+7b762eac6aaa4c6717a4851629ec430a  ld/testsuite/ld-scripts/rgn-over1.d
+d042ba15e789862844d3567d5c34590e  ld/testsuite/ld-scripts/rgn-over1.t
+2929ff5083173e3e630305962837185c  ld/testsuite/ld-scripts/rgn-over2.d
+633f6209ac58ff68f2ce07a1f49abad3  ld/testsuite/ld-scripts/rgn-over2.t
+319193fbf2749b42b1fcc0cbb1ac3f21  ld/testsuite/ld-scripts/rgn-over3.d
+249d6556eb3a260814ad9c300ed93ce0  ld/testsuite/ld-scripts/rgn-over3.t
+34ab8cad75650ce6463f5c4ba36b96f5  ld/testsuite/ld-scripts/rgn-over4.d
+a70a2128a6e2c1726f52556fbb83b44b  ld/testsuite/ld-scripts/rgn-over4.t
+dab2d9e3e6ce1aee26cc40017cbfce3e  ld/testsuite/ld-scripts/rgn-over5.d
+f2331c87b67cdcfad3af88986f0bb5d5  ld/testsuite/ld-scripts/rgn-over5.t
+f52439f1c6d6f9b03c330137a3c49ed3  ld/testsuite/ld-scripts/rgn-over6.d
+ea1b5252b852c1614f04e6cadc34cd75  ld/testsuite/ld-scripts/rgn-over6.t
+7d862740a9220373229b5385d5f0fe54  ld/testsuite/ld-scripts/rgn-over7.d
+bfe38970de830574ee079fb1c710c517  ld/testsuite/ld-scripts/rgn-over7.t
+f0e3279ba6ca61906e6cbea50d2b5c91  ld/testsuite/ld-scripts/rgn-over8-ok.d
+3dd2c945738f89259e8b3482e3e6c3dd  ld/testsuite/ld-scripts/rgn-over8.s
+748d4af6cc8c930a5c83de09e5a524c4  ld/testsuite/ld-scripts/rgn-over8.t
+1cb29be0c0615225fb7a56f862fe1b78  ld/testsuite/ld-scripts/sane1.d
+032ac062bfb635fe38448d913cca4766  ld/testsuite/ld-scripts/sane1.t
+4dc72a7b31fb891e5ac50c49358b4d92  ld/testsuite/ld-scripts/script.exp
+8ef222fed2cbd6222ef9c4bfb5caceb3  ld/testsuite/ld-scripts/script.s
+b9bc56b095f61ceef7cb9a948be41609  ld/testsuite/ld-scripts/script.t
+a673788e6a586931f65fee9d8964d0b8  ld/testsuite/ld-scripts/scriptm.t
+9d3529fa043f75f30a4e2990493956c4  ld/testsuite/ld-scripts/section-flags-1.s
+d7487d8924eab1630b0d8131069345f9  ld/testsuite/ld-scripts/section-flags-1.t
+9d3529fa043f75f30a4e2990493956c4  ld/testsuite/ld-scripts/section-flags-2.s
+c019b57229b0871f58f68f5688133ff1  ld/testsuite/ld-scripts/section-flags-2.t
+468e21a078b40951fcc68f05a671153f  ld/testsuite/ld-scripts/section-flags.exp
+df1bf4fee3afe7e9a4e97c14692d7522  ld/testsuite/ld-scripts/section-match-1.d
+755dfef5103770186ec46d3a94537c65  ld/testsuite/ld-scripts/section-match-1.s
+9256bc51ef1b557e1c8c629dd3cb2dfc  ld/testsuite/ld-scripts/section-match-1.t
+c99e63386e43db3aa484eaccc80f34af  ld/testsuite/ld-scripts/section-match.exp
+e2756a97ddf7bb419a571e8d4b429770  ld/testsuite/ld-scripts/size-1.d
+17de08fa9310489af79bed8573e8580f  ld/testsuite/ld-scripts/size-1.s
+ba30176f3ba8f8598896e2af7928cbdc  ld/testsuite/ld-scripts/size-1.t
+de78df3229d27e6b870edaf7151a9d69  ld/testsuite/ld-scripts/size-2.d
+e578260bc547df59e5b871c5024c0dbf  ld/testsuite/ld-scripts/size-2.s
+00e961a746e3d2e2b5f03d09c95fcf32  ld/testsuite/ld-scripts/size-2.t
+31a18bc9a5835ced1936b274703597c7  ld/testsuite/ld-scripts/size.exp
+9cbd10fa233d61e42b3f7c85ddf6b2f0  ld/testsuite/ld-scripts/sizeof.exp
+de2cf65f9506880e63f0fdd46bb23c12  ld/testsuite/ld-scripts/sizeof.s
+feffaafc250ae18dfdd493f8a6c4f2c6  ld/testsuite/ld-scripts/sizeof.t
+dbff5d620a5e5c880adc1bbc3dda0bdb  ld/testsuite/ld-scripts/sort.exp
+0c8a78259c126ecd88cda54315baa73b  ld/testsuite/ld-scripts/sort.t
+5536ed80165d30d382a59d846a58b1e3  ld/testsuite/ld-scripts/sort_b_a-1.d
+14683b60bd34c5a064bcc88222128e22  ld/testsuite/ld-scripts/sort_b_a-1.s
+da4242bab81d89c1682637ca128c27fb  ld/testsuite/ld-scripts/sort_b_a.d
+2a7ba0612ef2af4e245c31f61df233c7  ld/testsuite/ld-scripts/sort_b_a.s
+36cc8d4f65a52fb4e1eaf36bc7bbe44a  ld/testsuite/ld-scripts/sort_b_a.t
+2a0f1118c7d3cb58105b2afd481ad0e7  ld/testsuite/ld-scripts/sort_b_a_a-1.d
+2b902d918a3dd70faf4f2ca72ed0a4df  ld/testsuite/ld-scripts/sort_b_a_a-2.d
+df004b656eab6b649c18a0fa872836e7  ld/testsuite/ld-scripts/sort_b_a_a-3.d
+d473185f8d72002be55218833f37bcf4  ld/testsuite/ld-scripts/sort_b_a_a.t
+4f0d46f4163b36e3be334118dec07c6b  ld/testsuite/ld-scripts/sort_b_a_n-1.d
+4ba7f5856092bbc604d90a25a82d9002  ld/testsuite/ld-scripts/sort_b_a_n-2.d
+06945d92dab23a6ad33325b013714ea0  ld/testsuite/ld-scripts/sort_b_a_n-3.d
+6f540fc89fed53206b9f9733abe128e6  ld/testsuite/ld-scripts/sort_b_a_n.t
+43f980803c99479bf2938b422a890450  ld/testsuite/ld-scripts/sort_b_n-1.d
+a1bbd77fcfc41ef745c58d9c4c81d609  ld/testsuite/ld-scripts/sort_b_n-1.s
+7eeadbe2fcb152148ec269ae0dc79844  ld/testsuite/ld-scripts/sort_b_n.d
+c55eb84613680619dda395823061937a  ld/testsuite/ld-scripts/sort_b_n.s
+40cea4acf0dfcb3e6815b18b86f34abb  ld/testsuite/ld-scripts/sort_b_n.t
+111e404949e70caf1b806b4d3448a598  ld/testsuite/ld-scripts/sort_b_n_a-1.d
+0024b8b67af6d9e9a8a558a9c2d73c26  ld/testsuite/ld-scripts/sort_b_n_a-2.d
+6a88ea9875b61ef99419c6fb888420bf  ld/testsuite/ld-scripts/sort_b_n_a-3.d
+1a767732a300cd1c1ed8f4a7f8460d60  ld/testsuite/ld-scripts/sort_b_n_a.t
+18a68bd595fd68ed40f09c6676b5b878  ld/testsuite/ld-scripts/sort_b_n_n-1.d
+4760dad5a36247b10293d1c4b54697a2  ld/testsuite/ld-scripts/sort_b_n_n-2.d
+b50d7df963ca79009ad9aaa5991eddda  ld/testsuite/ld-scripts/sort_b_n_n-3.d
+84b350ab758b1aa07651cf48b7be57f9  ld/testsuite/ld-scripts/sort_b_n_n.t
+b78a0c1ba0c480990053d50a6b85174a  ld/testsuite/ld-scripts/sort_n_a-a.s
+8f250dd3d26296f2f6783e2c554ad5db  ld/testsuite/ld-scripts/sort_n_a-b.s
+fede375092520c3488fd72b37a015940  ld/testsuite/ld-scripts/sort_no-1.d
+259f809dfa3e7cc13b023f5997a33377  ld/testsuite/ld-scripts/sort_no-2.d
+dd867dcc221b34eac130495d74555792  ld/testsuite/ld-scripts/sort_no.t
+f3706a7d96cddce61177e371c3dd08cb  ld/testsuite/ld-scripts/weak.exp
+3591b42540bac07bfbb66f7f0ce59d88  ld/testsuite/ld-scripts/weak.t
+409c80a8100bab5cf2d2e4d49d270eff  ld/testsuite/ld-scripts/weak1.s
+6907d9f57513ed7b3a49ea61ba43b270  ld/testsuite/ld-scripts/weak2.s
+3f6043e6b6bd49e760b9e753b6aaf9ac  ld/testsuite/ld-selective/1.c
+237d849095a360c8cad108dd7c84812b  ld/testsuite/ld-selective/2.c
+33a18955ad41f28b49c5cbe7a8ec6f90  ld/testsuite/ld-selective/3.cc
+7a88a85be95ddb758a06f65387cf61e3  ld/testsuite/ld-selective/4.cc
+30057150e6799981d84c149803078de1  ld/testsuite/ld-selective/5.cc
+76de65cf7643a5a9d830781a6ddb4ec2  ld/testsuite/ld-selective/keepdot.d
+271e265ec183206674aa523fd3758fe8  ld/testsuite/ld-selective/keepdot.ld
+ee25e606252413aba69f02431147ff1c  ld/testsuite/ld-selective/keepdot.s
+d38b74170368286b6fd747373a2ecdf5  ld/testsuite/ld-selective/keepdot0.d
+cd27e66eaeaab29aa416b21a3aeb060d  ld/testsuite/ld-selective/keepdot0.ld
+a8872b0001c7265e2af69fe8fb5ca4e8  ld/testsuite/ld-selective/sel-dump.exp
+47e014d02b1864575790fb78782f08d7  ld/testsuite/ld-selective/selective.exp
+73a915d57966bbb8dcc25ced0576fc29  ld/testsuite/ld-sh/arch/arch.exp
+78ec6e7ed56d41b67e395d890b2b9a19  ld/testsuite/ld-sh/arch/arch_expected.txt
+557989b111b9dab8e12592d4468c3e37  ld/testsuite/ld-sh/arch/sh-dsp.s
+fad623280164b76e8e26f3fefeb21456  ld/testsuite/ld-sh/arch/sh.s
+d4b973efa0a1174ecf7403b949d8fef5  ld/testsuite/ld-sh/arch/sh2.s
+902449247a1f51fe8d542285c15186fe  ld/testsuite/ld-sh/arch/sh2a-nofpu-or-sh3-nommu.s
+597181c5e888fec077372304556c6b14  ld/testsuite/ld-sh/arch/sh2a-nofpu-or-sh4-nommu-nofpu.s
+c99858e0fe821ffaa35d9f79326782be  ld/testsuite/ld-sh/arch/sh2a-nofpu.s
+001175cf372c9958c8edbd1a9c673896  ld/testsuite/ld-sh/arch/sh2a-or-sh3e.s
+fcd26cad36753392667255e1206d9023  ld/testsuite/ld-sh/arch/sh2a-or-sh4.s
+a58353e9d1a147699f4b511c583787f7  ld/testsuite/ld-sh/arch/sh2a.s
+66b8534721a9a4642d334ca7ffaf493f  ld/testsuite/ld-sh/arch/sh2e.s
+ba99caf1cf49cc62487f954f25421850  ld/testsuite/ld-sh/arch/sh3-dsp.s
+29d33f8568c4725231c2987e265a2368  ld/testsuite/ld-sh/arch/sh3-nommu.s
+c49644b7b8370e6427f9feaf80e70b2b  ld/testsuite/ld-sh/arch/sh3.s
+4d36649f1200dcdb4901e2551b378729  ld/testsuite/ld-sh/arch/sh3e.s
+0e5fbe5b90dc04d700fc142c0bf211ad  ld/testsuite/ld-sh/arch/sh4-nofpu.s
+abc2ec66346c95fa67fa4e92cbd18a02  ld/testsuite/ld-sh/arch/sh4-nommu-nofpu.s
+e3ad9d8364abb400e720c763f2015f49  ld/testsuite/ld-sh/arch/sh4.s
+b70176213702cb636c0e11124483c6c9  ld/testsuite/ld-sh/arch/sh4a-nofpu.s
+38e54ba4a93b881e8d378cc0e93e99e4  ld/testsuite/ld-sh/arch/sh4a.s
+08b3726b81639384ea64661f7b57faad  ld/testsuite/ld-sh/arch/sh4al-dsp.s
+08e0e7cab61e86f66674a1cfeee1569a  ld/testsuite/ld-sh/fdpic-funcdesc-shared.d
+b7ca2c0d25ef8ea5c7ebd3219fc3c046  ld/testsuite/ld-sh/fdpic-funcdesc-shared.s
+8f05b64441d35be356191cf18922185e  ld/testsuite/ld-sh/fdpic-funcdesc-static.d
+00c8da60675cafd24c971037bfdd388f  ld/testsuite/ld-sh/fdpic-funcdesc-static.s
+3144f0b16f27b5b9a646595be2e6b38c  ld/testsuite/ld-sh/fdpic-gotfuncdesc-shared.d
+1f703764ffec03825caa562c9bef63f7  ld/testsuite/ld-sh/fdpic-gotfuncdesc-shared.s
+ccb5b7420339c46917d9dd3144649fed  ld/testsuite/ld-sh/fdpic-gotfuncdesc-static.d
+68061bb5d09636f5a5becd032d4def35  ld/testsuite/ld-sh/fdpic-gotfuncdesc-static.s
+d5f2eee9ddf9a7fcf42a3791856621f1  ld/testsuite/ld-sh/fdpic-gotfuncdesci20-shared.d
+f32fddd42f500422533c2386817df2a4  ld/testsuite/ld-sh/fdpic-gotfuncdesci20-shared.s
+53f10f89b608a1ec9adaed658eea0cd7  ld/testsuite/ld-sh/fdpic-gotfuncdesci20-static.d
+2995890abbe703706e5efe71973b4277  ld/testsuite/ld-sh/fdpic-gotfuncdesci20-static.s
+173607afdfc9f75cca209a1711e93755  ld/testsuite/ld-sh/fdpic-goti20-shared.d
+21b52dcd8978b83fea8dc4bb36ff357f  ld/testsuite/ld-sh/fdpic-goti20-shared.s
+12b7d3aae861169f0415bef32883169a  ld/testsuite/ld-sh/fdpic-goti20-static.d
+fee031495d05dba39b0f59202b343ec1  ld/testsuite/ld-sh/fdpic-goti20-static.s
+d4366fdad6611f79acccbd05a876aab5  ld/testsuite/ld-sh/fdpic-gotofffuncdesc-shared.d
+753be37534a209985aaa37f31c17f892  ld/testsuite/ld-sh/fdpic-gotofffuncdesc-shared.s
+e9c0ab7fc9e3dbe37f7c4f80113e0743  ld/testsuite/ld-sh/fdpic-gotofffuncdesc-static.d
+3304f51acbfd50a4009764b5b2830dac  ld/testsuite/ld-sh/fdpic-gotofffuncdesc-static.s
+9cf60942cb1c0f498dc2799b02151299  ld/testsuite/ld-sh/fdpic-gotofffuncdesci20-shared.d
+a919fef130c2da2de8ddd7a1ba67cd88  ld/testsuite/ld-sh/fdpic-gotofffuncdesci20-shared.s
+b4ac940b1b06970c887dd3d365c694d0  ld/testsuite/ld-sh/fdpic-gotofffuncdesci20-static.d
+eee2a25c20104abb341d7b72b569ddc6  ld/testsuite/ld-sh/fdpic-gotofffuncdesci20-static.s
+59fd22efb0f5253c17c4c627faae4e2b  ld/testsuite/ld-sh/fdpic-gotoffi20-shared.d
+cd08a3ae64807ed0c93b91a753390983  ld/testsuite/ld-sh/fdpic-gotoffi20-shared.s
+4339ea2ee1513cbb54e7f0430e057975  ld/testsuite/ld-sh/fdpic-gotoffi20-static.d
+5d49bfa39d2a669ae7efd38d4240f8d5  ld/testsuite/ld-sh/fdpic-gotoffi20-static.s
+79c5c77b067370eab8005cf02f649cc1  ld/testsuite/ld-sh/fdpic-plt-be.d
+54bfceff3d3d49f509d1dc3eff7b68bf  ld/testsuite/ld-sh/fdpic-plt-le.d
+8d75b12c5e4608c97885a53fc27f2e25  ld/testsuite/ld-sh/fdpic-plt.s
+a75fec2fd070c93a53aaf2380a1c229a  ld/testsuite/ld-sh/fdpic-plti20-be.d
+280c5f991a4027dcfcf53788a913a9d4  ld/testsuite/ld-sh/fdpic-plti20-le.d
+b967c170071a0f150a82ff19d16f128b  ld/testsuite/ld-sh/fdpic-stack-default.d
+46e4de8ad6e333029397cb1d9e8d889f  ld/testsuite/ld-sh/fdpic-stack-size.d
+a9cc0bc39eb06a4ce1b7c4d1312e2ed4  ld/testsuite/ld-sh/fdpic-stack.s
+43e8d60f2a62e4ece8534aea455162a4  ld/testsuite/ld-sh/ld-r-1.d
+fcbd70b5e55afc67cf17a5dba6a0290f  ld/testsuite/ld-sh/ldr1.s
+6217cc9778d5febfad3e5024c6962262  ld/testsuite/ld-sh/ldr2.s
+f993034a5f3b4230308fa7a3ec1db5b1  ld/testsuite/ld-sh/rd-sh.exp
+e9e3ce39a4375e74b04f76bc399e99d9  ld/testsuite/ld-sh/refdbg-0-dso.d
+c2ba4cf7fc6b62779e73289f6f51a673  ld/testsuite/ld-sh/refdbg-1.d
+0d52d82e4d568ef945cfa6703f03abd7  ld/testsuite/ld-sh/refdbg.s
+b82d1cf4ae77e96d5e1e611ee68c70f1  ld/testsuite/ld-sh/refdbglib.s
+19d71cb628de2ed19de5d64c8b26c11f  ld/testsuite/ld-sh/reloc1.d
+7d4b394df1b77a9a50bf939780228499  ld/testsuite/ld-sh/reloc1.s
+c382624fa00089b4604f1650402f70e3  ld/testsuite/ld-sh/sh-vxworks.exp
+fdf3c2cc461c1e384d1530fe5c3dea97  ld/testsuite/ld-sh/sh.exp
+1480d5643c4a3a7456700440e9f108dc  ld/testsuite/ld-sh/sh1.s
+4a6b928d31480c42bc368db1a2d729b3  ld/testsuite/ld-sh/sh2.c
+0c9bfb09d4093045c3990998fa1df825  ld/testsuite/ld-sh/sh64/abi32.sd
+c0ace4859c99c559854cbf35c20ac9ed  ld/testsuite/ld-sh/sh64/abi32.xd
+d343449d8a4c030206c31db085d733fd  ld/testsuite/ld-sh/sh64/abi64.sd
+8bf79bf1db98c6439cdd28c89f52d143  ld/testsuite/ld-sh/sh64/abi64.xd
+7388fb47e1ddc604bc9d87535eb410a7  ld/testsuite/ld-sh/sh64/abixx-noexp.sd
+ad7ca775ab56187b50c88f7a58466375  ld/testsuite/ld-sh/sh64/cmpct1.sd
+d60df39955633a62106ca5a322f314f0  ld/testsuite/ld-sh/sh64/cmpct1.xd
+c73961a0fad1d2fd62629de1fe0c70b1  ld/testsuite/ld-sh/sh64/crange-1.s
+328b703c9b5066d401795ff6de9bc0bd  ld/testsuite/ld-sh/sh64/crange-2a.s
+e69fa9d1375fcd6ccd984389dba319ce  ld/testsuite/ld-sh/sh64/crange-2b.s
+3b4485d90727fe240d30e5a24bc087e5  ld/testsuite/ld-sh/sh64/crange-2c.s
+ae8e3795860a4b62529c938fee840d4e  ld/testsuite/ld-sh/sh64/crange-2d.s
+27c04cbc6a54fa6b2ca6457bb17afd6c  ld/testsuite/ld-sh/sh64/crange-2e.s
+06ec994967c3e725e37aebb6fb2b54c4  ld/testsuite/ld-sh/sh64/crange-2f.s
+e38d05441f7886533954e1385c29387c  ld/testsuite/ld-sh/sh64/crange-2g.s
+9689bde27dc2484a1a938f1fef07ded9  ld/testsuite/ld-sh/sh64/crange-2h.s
+1462c3fa6661a753105fe81a4c6db1dc  ld/testsuite/ld-sh/sh64/crange-2i.s
+960bca806da7375f03d5e11ec2c1c13a  ld/testsuite/ld-sh/sh64/crange1.rd
+675205a897d5cf02f4d964e047712436  ld/testsuite/ld-sh/sh64/crange2.rd
+bb0d93f60c79043447e61cff26d6a538  ld/testsuite/ld-sh/sh64/crange3-cmpct.rd
+b14b3dd3637dca6b1b32875e1d2d887e  ld/testsuite/ld-sh/sh64/crange3-media.rd
+3ffebeae6c08139aa36e21265106298e  ld/testsuite/ld-sh/sh64/crange3.dd
+81a3531cd9b16acc87fe347db72a11c0  ld/testsuite/ld-sh/sh64/crange3.rd
+58e072dfd80d2cd694d4ad0f0f97acbd  ld/testsuite/ld-sh/sh64/crangerel1.rd
+2d94cdec959aa9069ba61085ea176a2e  ld/testsuite/ld-sh/sh64/crangerel2.rd
+f94546e3da61ec674a5b48991732a50c  ld/testsuite/ld-sh/sh64/dlsection-1.s
+e2633ad84cbe5531e77222843f9fd304  ld/testsuite/ld-sh/sh64/dlsection.sd
+60b3ba2f0c4a5ca923893a894a582ac9  ld/testsuite/ld-sh/sh64/endian.dbd
+41884e5b1b3e647fe52be17cf58e47ad  ld/testsuite/ld-sh/sh64/endian.dld
+439a304e3df929f85ebb3859142504f2  ld/testsuite/ld-sh/sh64/endian.ld
+5e4c7d2bf96d59c028edefdbafb057a8  ld/testsuite/ld-sh/sh64/endian.s
+3f58d6c1b5b4570ad625f96257c7c075  ld/testsuite/ld-sh/sh64/endian.sbd
+0261b327b1e190bd7466855c6c73d527  ld/testsuite/ld-sh/sh64/endian.sld
+21c057a0221ab44ce372fe73e1c317e6  ld/testsuite/ld-sh/sh64/gotplt.d
+647197c48fed383b904f232572a2bb5b  ld/testsuite/ld-sh/sh64/gotplt.map
+ccb113dc467f4239cc25eb43b6adfd80  ld/testsuite/ld-sh/sh64/gotplt.s
+76ed01a76f418c6db9d67d67b3074643  ld/testsuite/ld-sh/sh64/init-cmpct.d
+3188da7e8915725e3af3ff13f57e02b7  ld/testsuite/ld-sh/sh64/init-media.d
+22383ca3faac1674e7e8421c0ba7112f  ld/testsuite/ld-sh/sh64/init.s
+66f1379b6447cac03fea20a698e2eba1  ld/testsuite/ld-sh/sh64/init64.d
+b2901603c0c019a5d4cf0b7ed51b006c  ld/testsuite/ld-sh/sh64/mix1-noexp.sd
+5c7c4d0f5810013fb5c35ad744d6feb2  ld/testsuite/ld-sh/sh64/mix1.sd
+6f19d7165de8745c558390ef2d42d3ca  ld/testsuite/ld-sh/sh64/mix1.xd
+46b3cfa7c4d7934f4097735882648405  ld/testsuite/ld-sh/sh64/mix2-noexp.sd
+67bf07be014e835273718d75e3e00949  ld/testsuite/ld-sh/sh64/mix2.sd
+b1fc40b02731641c993b9d2786b63422  ld/testsuite/ld-sh/sh64/mix2.xd
+dea5072d0a6835059b328f8cf0189d72  ld/testsuite/ld-sh/sh64/rd-sh64.exp
+1166b5637fcaa5ab2f65d7604c8e0dea  ld/testsuite/ld-sh/sh64/rel-1.s
+dc52fd286f5e3e3ba2a0453bb7be7cf8  ld/testsuite/ld-sh/sh64/rel-2.s
+009b175a14c6322db0227ded1bf1bbe9  ld/testsuite/ld-sh/sh64/rel32.xd
+88aeed77160b92aad6fb63d90847cf49  ld/testsuite/ld-sh/sh64/rel64.xd
+027d20a3fba198f5cf9416edcbb018a2  ld/testsuite/ld-sh/sh64/relax.exp
+ad76cea000fec5b3c623528c4f90f28f  ld/testsuite/ld-sh/sh64/relax1.s
+82c91e0d07cc0794161fd6919925329c  ld/testsuite/ld-sh/sh64/relax2.s
+558087d48e4ae36850b1b6c8b769e0f2  ld/testsuite/ld-sh/sh64/relax3.s
+a2dffd9f6049f25cbf6c6daf57da3672  ld/testsuite/ld-sh/sh64/relax4.s
+428b3202ce30a114bbb92ece7d8fcc86  ld/testsuite/ld-sh/sh64/reldl-1.s
+861e2f1ff73cc48552826aa5b007ccf8  ld/testsuite/ld-sh/sh64/reldl-2.s
+7bbce83842ce15d9355f8134c959aaa7  ld/testsuite/ld-sh/sh64/reldl32.rd
+991f96b93383296bd226439a5a17f01a  ld/testsuite/ld-sh/sh64/reldl64.rd
+3c1b9582e5213c1da0868e346fb303aa  ld/testsuite/ld-sh/sh64/relfail.exp
+dcb15c3eaafdd677a4bed69b52d8fd20  ld/testsuite/ld-sh/sh64/relfail.s
+4a9f958e1de298410352eacfc2790042  ld/testsuite/ld-sh/sh64/sh64-1.s
+e57b411a1bd1e2c3492480270ab84327  ld/testsuite/ld-sh/sh64/sh64-2.s
+883f632ee1028b121dd01c1346117aac  ld/testsuite/ld-sh/sh64/sh64.exp
+6d672ac557ea34ee06eb8cb94b8f78d4  ld/testsuite/ld-sh/sh64/shcmp-1.s
+92a5607059e99b0b7a7121305ce083e7  ld/testsuite/ld-sh/sh64/shdl-1.s
+70a7a20b4381c32e89e9dd7615393ec2  ld/testsuite/ld-sh/sh64/shdl-2.s
+c605c8c517ccebb827b1c819a77d95a9  ld/testsuite/ld-sh/sh64/shdl32.xd
+2d4cbb3a76469076a359f59724cf3dcb  ld/testsuite/ld-sh/sh64/shdl64.sd
+f237169788ef3bb7c9a0ea485b3cb05a  ld/testsuite/ld-sh/sh64/shdl64.xd
+225a060f4b88eb8436ca23e73d7e06ec  ld/testsuite/ld-sh/sh64/shmix-1.s
+19c270c7b2605695a6fb613668c202c8  ld/testsuite/ld-sh/sh64/shmix-2.s
+faf5405f3d08893ba5e6a20f7f9928b0  ld/testsuite/ld-sh/sh64/shmix-3.s
+b0ab0fbf8d440fa329d565a5ccbba1e1  ld/testsuite/ld-sh/sh64/stobin-0-dso.d
+6771e1b630e85e22e0634aa1d166e81c  ld/testsuite/ld-sh/sh64/stobin-1.d
+2e309ebf433520a9f601ac736fdacb9d  ld/testsuite/ld-sh/sh64/stobin.s
+51780faee227e3a457101e3a7d2fde0e  ld/testsuite/ld-sh/sh64/stolib.s
+cacd2a6c0809a38683c3ebcf941eb098  ld/testsuite/ld-sh/shared-1.d
+af8dee7b2a6f9c36b48c981da8fd4ef3  ld/testsuite/ld-sh/shared-2.d
+486895674299bb2c523133e56a567c1f  ld/testsuite/ld-sh/start.s
+6bc448baf0ba7a42eb02cb25dcffbce2  ld/testsuite/ld-sh/sub2l-1.d
+e28a2e0da19c4548dff752131cc9c4ef  ld/testsuite/ld-sh/sub2l.s
+f7e4c5f7cd622652943bd47ebc9a5a23  ld/testsuite/ld-sh/textrel1.s
+68cf0838e9de11a99ab1720e6d05fc00  ld/testsuite/ld-sh/textrel2.s
+452b14908770e945a2bce149204fc59a  ld/testsuite/ld-sh/tlsbin-0-dso.d
+da0a5cefe3b71f1b9090aaa7da861753  ld/testsuite/ld-sh/tlsbin-1.d
+29c061857bc4b38869b3a7db8f589978  ld/testsuite/ld-sh/tlsbin-2.d
+94528c95120b315ec999bfdf77044934  ld/testsuite/ld-sh/tlsbin-3.d
+158222b1966ec79c1ece1a6f9721207c  ld/testsuite/ld-sh/tlsbin-4.d
+ad4606e3e2ff81551d474deb3bc1f9bd  ld/testsuite/ld-sh/tlsbin.s
+34f93fd97a11c009cae4ff7574890043  ld/testsuite/ld-sh/tlsbinpic.s
+ec3e44acc84eb03c62466be835ee927f  ld/testsuite/ld-sh/tlslib.s
+653138b34fe1965b2b01867cf1599306  ld/testsuite/ld-sh/tlspic-1.d
+0cdf8200d895d533006ae6c7468bff48  ld/testsuite/ld-sh/tlspic-2.d
+0fba19a4394a0643eff7462e9ca89d6e  ld/testsuite/ld-sh/tlspic-3.d
+d37960962cb3bc48f6638db2bb7353a0  ld/testsuite/ld-sh/tlspic-4.d
+a97a184577f5d28dd41b482b6f128426  ld/testsuite/ld-sh/tlspic1.s
+e43032ce8828ef5065ea1bb6480a92fe  ld/testsuite/ld-sh/tlspic2.s
+ea63dd2c251319d01e9e2fbe165f3e3d  ld/testsuite/ld-sh/tlstpoff-1.d
+06496514e5705479dc0185db500a3d19  ld/testsuite/ld-sh/tlstpoff-2.d
+eaf0ef9de13413ca33a79cb688c72a2f  ld/testsuite/ld-sh/tlstpoff1.s
+21e7feeb0b7856ed94bc352c7169925a  ld/testsuite/ld-sh/tlstpoff2.s
+1e03ac52aa0f8ed98dcb600cd74ede8a  ld/testsuite/ld-sh/vxworks1-le.dd
+cc8c72280792e66cb1fd8a2cd81f4d11  ld/testsuite/ld-sh/vxworks1-lib-le.dd
+9d59315c381b523e07e2e39cd84d99aa  ld/testsuite/ld-sh/vxworks1-lib.dd
+2ed93b7c8314a1e06fb6a3b7d652f4ca  ld/testsuite/ld-sh/vxworks1-lib.nd
+9d066d0b81f0652e2477b47374c4f001  ld/testsuite/ld-sh/vxworks1-lib.rd
+f6abfedd8af59f438fcd169e2f34c389  ld/testsuite/ld-sh/vxworks1-lib.s
+6dbdc5d4346169b9a3af98707d77be72  ld/testsuite/ld-sh/vxworks1-lib.td
+b9df1b5a4946b883b92ea5354df78679  ld/testsuite/ld-sh/vxworks1-static.d
+1af56805c06364621dd866e34a4e573d  ld/testsuite/ld-sh/vxworks1.dd
+ff6cb82bd3dda9cb4328b50f2d88614e  ld/testsuite/ld-sh/vxworks1.ld
+99596da509153a5dfb0d4dd0e1e7ec33  ld/testsuite/ld-sh/vxworks1.rd
+6de131fbfcb4ab6079a4ec80394d8b6b  ld/testsuite/ld-sh/vxworks1.s
+165ed1561458c0973255f985be876845  ld/testsuite/ld-sh/vxworks2-static.sd
+9ffae98b2aab1eed51a33b3b0bcdcb1d  ld/testsuite/ld-sh/vxworks2.s
+7afb4e2fc8be35ad985dcb2e21b7cbef  ld/testsuite/ld-sh/vxworks2.sd
+87e691828effe17e730b1515714437df  ld/testsuite/ld-sh/vxworks3-le.dd
+1067992266f34cef766f380d7fc1ead7  ld/testsuite/ld-sh/vxworks3-lib-le.dd
+14fa3604ffe3103ad305a399f975b0ea  ld/testsuite/ld-sh/vxworks3-lib.dd
+109d3f60a868184e51e6885ef65907c2  ld/testsuite/ld-sh/vxworks3-lib.s
+47350b95b323a67ada1c85af73dea2c8  ld/testsuite/ld-sh/vxworks3.dd
+9f85716a9ae373e4e73bf7ee89fc5e01  ld/testsuite/ld-sh/vxworks3.s
+b56ed270ed90ba5b27712d7984f7959b  ld/testsuite/ld-sh/vxworks4.d
+af10740ee3a0625ebcbc85074ad64b11  ld/testsuite/ld-sh/vxworks4a.s
+d5d5e008f55ee9e9e2574ed81e76f7fe  ld/testsuite/ld-sh/vxworks4b.s
+f4202fe02285184a2211e0467471ddb3  ld/testsuite/ld-sh/weak1.d
+89c396121b4c938815e9d8009f25ee37  ld/testsuite/ld-sh/weak1.s
+ddd798dc8d3f3ac1d32ac854229d259d  ld/testsuite/ld-shared/elf-offset.ld
+b3eebcd693dc11f3c180628d1ac95de6  ld/testsuite/ld-shared/main.c
+20161dcba239652c4c9434662685a545  ld/testsuite/ld-shared/sh1.c
+63f2b4674ec691e3ec08f14f48fb1eb5  ld/testsuite/ld-shared/sh2.c
+7ac9ed1cf3e4b23bd77743315f0560d5  ld/testsuite/ld-shared/shared.dat
+470a83a634408ccc558a2cf3580c9836  ld/testsuite/ld-shared/shared.exp
+8b38128b19d7be0a9f143a3fae14669f  ld/testsuite/ld-shared/sun4.dat
+e8d8c5ef094b26b46377375f8ef076c3  ld/testsuite/ld-shared/symbolic.dat
+bf16787cbff593c9377800bda68bc12b  ld/testsuite/ld-shared/xcoff.dat
+a15f70e96ad2a54e081863c040468da9  ld/testsuite/ld-sparc/gotop32.dd
+a9e4db33afb06eb11e404411744aeda8  ld/testsuite/ld-sparc/gotop32.rd
+01c8d6c8a11f0671d2138c7359ed9060  ld/testsuite/ld-sparc/gotop32.s
+3bbe5dbb9d0b1ecdb97f16d55f587ef8  ld/testsuite/ld-sparc/gotop32.sd
+a319e3cc93a6858774e449a4ea8d5a62  ld/testsuite/ld-sparc/gotop32.td
+342f2bebf768aca33754cf700d772318  ld/testsuite/ld-sparc/gotop64.dd
+4f5157e16bd71200aa9479ad2845ba59  ld/testsuite/ld-sparc/gotop64.rd
+68eff3160bb0e8b5437674b29637cfa2  ld/testsuite/ld-sparc/gotop64.s
+cb763c8c9d111eacfe9a31279c1df6cd  ld/testsuite/ld-sparc/gotop64.sd
+2ee5cbf57479046f5a4f68e9324d6de5  ld/testsuite/ld-sparc/gotop64.td
+c08cd49224f7e0291eec92677d5bc316  ld/testsuite/ld-sparc/sparc.exp
+f2cc7e2a6d73ba0523e4152cfca6b713  ld/testsuite/ld-sparc/tlsg32.s
+b129627f00eb462a2166203641df5770  ld/testsuite/ld-sparc/tlsg32.sd
+bd716e9b7672e56e96e7f293350410c2  ld/testsuite/ld-sparc/tlsg64.s
+3610c4fe70c3ab356210a60748475f43  ld/testsuite/ld-sparc/tlsg64.sd
+f45983dd004da37020dc6f85bff8d99e  ld/testsuite/ld-sparc/tlslib.s
+2edea12bda9f42749ee9ae86f8fb3f7f  ld/testsuite/ld-sparc/tlsnopic.s
+236a8f451d38469c389f471b4529d5c3  ld/testsuite/ld-sparc/tlspic.s
+9189506eedfeac2033b0e7c4de0a2680  ld/testsuite/ld-sparc/tlssunbin32.dd
+4a296b942cbb139ca89f7e0025080617  ld/testsuite/ld-sparc/tlssunbin32.rd
+36f2e351f3a028ca81a679221131a0cd  ld/testsuite/ld-sparc/tlssunbin32.s
+16aeb0a48713e4bf89d2065bfe20839f  ld/testsuite/ld-sparc/tlssunbin32.sd
+176ea661341925d2f0f24b88dcc219dd  ld/testsuite/ld-sparc/tlssunbin32.td
+7749b2785b0d78eccdcbf916e72da0e7  ld/testsuite/ld-sparc/tlssunbin64.dd
+0114d03caccfe739efa177a4e208f973  ld/testsuite/ld-sparc/tlssunbin64.rd
+9b23cbeb85df66899de9aa841d41a6d8  ld/testsuite/ld-sparc/tlssunbin64.s
+bd37fb5e377d86212f801b19c152989a  ld/testsuite/ld-sparc/tlssunbin64.sd
+ed39d3a0f0c9b484064abda9325c770b  ld/testsuite/ld-sparc/tlssunbin64.td
+2d0ba1b70aa80b977b1153e86a41eda2  ld/testsuite/ld-sparc/tlssunbinpic32.s
+4f54433140a83203f9612a17f1f68a7c  ld/testsuite/ld-sparc/tlssunbinpic64.s
+a503661ad3d089c3b0bcf3982ad2faea  ld/testsuite/ld-sparc/tlssunnopic32.dd
+f2696cb7fbe45db35c94226f923123e7  ld/testsuite/ld-sparc/tlssunnopic32.rd
+163ff743ffacb4dd2e35ff15849a0ea4  ld/testsuite/ld-sparc/tlssunnopic32.s
+cb3ff5e802147194875afde5b1d146b1  ld/testsuite/ld-sparc/tlssunnopic32.sd
+53bb5587a45c84b08d869098aa8c3912  ld/testsuite/ld-sparc/tlssunnopic64.dd
+c2008aa26f4dff2b66c2da02bfa59817  ld/testsuite/ld-sparc/tlssunnopic64.rd
+a6c8ed5af43f5482d3d7bcf74e7684e5  ld/testsuite/ld-sparc/tlssunnopic64.s
+2c3b7a1c1531fe831d15b7180461e338  ld/testsuite/ld-sparc/tlssunnopic64.sd
+517c35cd6001117a10cb2eb311736018  ld/testsuite/ld-sparc/tlssunpic32.dd
+c838fd83ba4d0459926a81002d73a5cb  ld/testsuite/ld-sparc/tlssunpic32.rd
+e103f3b429288a84d8e5c47bdbd5697e  ld/testsuite/ld-sparc/tlssunpic32.s
+957929ffafe2d2cee185a0841b0d1ec7  ld/testsuite/ld-sparc/tlssunpic32.sd
+79ba66a090beb7c8eb24102878fcd2b8  ld/testsuite/ld-sparc/tlssunpic32.td
+a3d9018bb1ed11cd7b2db3d50d7a6304  ld/testsuite/ld-sparc/tlssunpic64.dd
+e08d551d645c65077e7909ae17fbb511  ld/testsuite/ld-sparc/tlssunpic64.rd
+92725610c233ff43c7684b099ad1f63c  ld/testsuite/ld-sparc/tlssunpic64.s
+f85a523e8c664433001e7ba2591ef011  ld/testsuite/ld-sparc/tlssunpic64.sd
+d09d4fbfa24bef5a3f4fd2efab45a217  ld/testsuite/ld-sparc/tlssunpic64.td
+d4b99a8da6449380ef31dd03ebdbf4e1  ld/testsuite/ld-sparc/vxworks1-lib.dd
+4d0018309d753aeb7489523e8fc2b582  ld/testsuite/ld-sparc/vxworks1-lib.nd
+516cca5142fcc8be501d6b4aa6365c34  ld/testsuite/ld-sparc/vxworks1-lib.rd
+d7d3679cbd81499e584cf78e950e72d6  ld/testsuite/ld-sparc/vxworks1-lib.s
+6dbdc5d4346169b9a3af98707d77be72  ld/testsuite/ld-sparc/vxworks1-lib.td
+57e13e14adacc62cab22da622bbcb01e  ld/testsuite/ld-sparc/vxworks1-static.d
+eff6bd323ed07e997b4d697536a4994b  ld/testsuite/ld-sparc/vxworks1.dd
+65436e479e11025c3b995c7941bb58a3  ld/testsuite/ld-sparc/vxworks1.ld
+012a01423074a17c346bf377a74264ba  ld/testsuite/ld-sparc/vxworks1.rd
+8c0216be7e3b38ae166e4359b6338008  ld/testsuite/ld-sparc/vxworks1.s
+70a3a63caaa6294e72a21f3af93d802c  ld/testsuite/ld-sparc/vxworks2-static.sd
+01ec404ce50fbffc8aa2a12f3466b101  ld/testsuite/ld-sparc/vxworks2.s
+a59d05b41e3dd040fb4e12e434cff21d  ld/testsuite/ld-sparc/vxworks2.sd
+f49e2394e1cca686fa3327d81c64e3fa  ld/testsuite/ld-spu/ear.d
+117a909e130058b91afa95f31fbb874e  ld/testsuite/ld-spu/ear.s
+2b4ac0f83f0ff5440c950826eac5dcbb  ld/testsuite/ld-spu/embed.rd
+b8b915bffd8bf82ae39b363cd5b39e0b  ld/testsuite/ld-spu/fixup.d
+8c1c476f04f50f0a472450b0226854bb  ld/testsuite/ld-spu/fixup.s
+cd48872ab912171ef6a74a2371b52c3b  ld/testsuite/ld-spu/icache1.d
+5069a040bb8d323b66a5d86773cf3c66  ld/testsuite/ld-spu/icache1.s
+a2ccc6efb582f7a9225c555243e82014  ld/testsuite/ld-spu/ovl.d
+f518e3aa7768f47c7594b2b03ec51b5d  ld/testsuite/ld-spu/ovl.lnk
+d4c871b26497cb32152f49127636d300  ld/testsuite/ld-spu/ovl.s
+644ddc01ba535fe2a7028f00bb31f66e  ld/testsuite/ld-spu/ovl1.lnk
+9fed82e10b9fe30f4742d8aecc46ecc8  ld/testsuite/ld-spu/ovl2.d
+e4fd482d44defe77b13f0d97531f80f1  ld/testsuite/ld-spu/ovl2.lnk
+26a2105b677352ed3b8bafca0f88185b  ld/testsuite/ld-spu/ovl2.s
+2cb2d6f1f9d0d193ac2f3af869291120  ld/testsuite/ld-spu/pic.d
+751c3e3f4a8dfb43f4977a58962f3d11  ld/testsuite/ld-spu/pic.s
+eda70149d50ac85c7dc96fc3d5ed4202  ld/testsuite/ld-spu/picdef.s
+705aed57b1a7feaf1366598911bafd29  ld/testsuite/ld-spu/spu.exp
+ff2b78b0df3a6bc56644e35ec4f068bd  ld/testsuite/ld-srec/sr1.c
+6524623299b50b9299f4b3fca543b0fa  ld/testsuite/ld-srec/sr2.c
+76a4cb76d59f235af5e567ccb024de2c  ld/testsuite/ld-srec/sr3.cc
+90187dd7d22e3638e585172693019489  ld/testsuite/ld-srec/srec.exp
+2095186b157bb04030b2974b68c47ade  ld/testsuite/ld-tic6x/attr-arch-c62x-c62x.d
+012b48c308ed21b346ffca5a22f9a921  ld/testsuite/ld-tic6x/attr-arch-c62x-c64x+.d
+c1c54aafeb5ef8674bd033cd5d98b087  ld/testsuite/ld-tic6x/attr-arch-c62x-c64x.d
+3268a53c624163e76b1bc03aa377fae4  ld/testsuite/ld-tic6x/attr-arch-c62x-c674x.d
+9375d10ff6b18685b695c7725ded2e71  ld/testsuite/ld-tic6x/attr-arch-c62x-c67x+.d
+90877dbc04d4915268b530427afe0db2  ld/testsuite/ld-tic6x/attr-arch-c62x-c67x.d
+a4ed1a052c2e13035ff7dba21686c279  ld/testsuite/ld-tic6x/attr-arch-c62x.s
+e3e12b151e736a071c96b21b96af62ec  ld/testsuite/ld-tic6x/attr-arch-c64x+-c62x.d
+da5586e6af1edbd7c442c93d455176f9  ld/testsuite/ld-tic6x/attr-arch-c64x+-c64x+.d
+e33e2c5ed2db16176028b082fd315664  ld/testsuite/ld-tic6x/attr-arch-c64x+-c64x.d
+6ca936a62504bb81209dbb450c2f2920  ld/testsuite/ld-tic6x/attr-arch-c64x+-c674x.d
+d7c24e2f39a5318cc7357f9b6cca0229  ld/testsuite/ld-tic6x/attr-arch-c64x+-c67x+.d
+dad6c70af119a8b34de4d3dde6f73109  ld/testsuite/ld-tic6x/attr-arch-c64x+-c67x.d
+d68127136817bb75c3169bb32ad35f2b  ld/testsuite/ld-tic6x/attr-arch-c64x+.s
+77915fb8e7fd14c9bc48873083b7f5fe  ld/testsuite/ld-tic6x/attr-arch-c64x-c62x.d
+3d2ddd7611c691b4fbb978e37c8db824  ld/testsuite/ld-tic6x/attr-arch-c64x-c64x+.d
+e926a9331f3642af87f44cfd6eae0ff7  ld/testsuite/ld-tic6x/attr-arch-c64x-c64x.d
+cc484259a527b7c6940e2825454e441f  ld/testsuite/ld-tic6x/attr-arch-c64x-c674x.d
+7c4237632cbc92020308c55f1a5ffcee  ld/testsuite/ld-tic6x/attr-arch-c64x-c67x+.d
+b2361276ac56389b62a27138d39c9bdf  ld/testsuite/ld-tic6x/attr-arch-c64x-c67x.d
+204750fa68714136532941c335706af8  ld/testsuite/ld-tic6x/attr-arch-c64x.s
+cf9d5a445a0bdaf06898e9aae73f7e13  ld/testsuite/ld-tic6x/attr-arch-c674x-c62x.d
+447e335686baf213f6a75c49ad7b1c9e  ld/testsuite/ld-tic6x/attr-arch-c674x-c64x+.d
+4d2849bd8721c0cc128fa94141219638  ld/testsuite/ld-tic6x/attr-arch-c674x-c64x.d
+167ea510f35eb92767df1296bdc25a7f  ld/testsuite/ld-tic6x/attr-arch-c674x-c674x.d
+6aa28cd9f614b4a89f970492b0c037eb  ld/testsuite/ld-tic6x/attr-arch-c674x-c67x+.d
+77c9c86fe6dbe86385bfa1a2589fdac3  ld/testsuite/ld-tic6x/attr-arch-c674x-c67x.d
+309b44b71f7cba00f581434aae06f203  ld/testsuite/ld-tic6x/attr-arch-c674x.s
+e73f79b702cc91084c8e20b55cd20d45  ld/testsuite/ld-tic6x/attr-arch-c67x+-c62x.d
+0899a878f81fde629575e58a16215f8e  ld/testsuite/ld-tic6x/attr-arch-c67x+-c64x+.d
+a056fe881ed3770f974afb5db6285ab2  ld/testsuite/ld-tic6x/attr-arch-c67x+-c64x.d
+70ea92797e684dac70923921f67a6720  ld/testsuite/ld-tic6x/attr-arch-c67x+-c674x.d
+70499b06f97ef16839f2feb5efb2163c  ld/testsuite/ld-tic6x/attr-arch-c67x+-c67x+.d
+fe0044a62b4dfcebcd68d7e9c19816d2  ld/testsuite/ld-tic6x/attr-arch-c67x+-c67x.d
+1b3c629121eece9c6b5ecfc676e5fbad  ld/testsuite/ld-tic6x/attr-arch-c67x+.s
+839ffebb6e3758a0c80efeeb0144bad5  ld/testsuite/ld-tic6x/attr-arch-c67x-c62x.d
+836edc087c9fca83e68ad8153e6dbcbd  ld/testsuite/ld-tic6x/attr-arch-c67x-c64x+.d
+8d78b2368daaefc055156c313cbebd52  ld/testsuite/ld-tic6x/attr-arch-c67x-c64x.d
+c26b0412869122cb91a5d63be54db50d  ld/testsuite/ld-tic6x/attr-arch-c67x-c674x.d
+436c2a27d1278ac1a1f80dfdd55393c5  ld/testsuite/ld-tic6x/attr-arch-c67x-c67x+.d
+02d52b08b67b4a67759028ae39156617  ld/testsuite/ld-tic6x/attr-arch-c67x-c67x.d
+a36dea43f43314aa5cdd90e4863bcd6a  ld/testsuite/ld-tic6x/attr-arch-c67x.s
+97f9c37b51f068f860f107ea9f2e063a  ld/testsuite/ld-tic6x/attr-array-16-16.d
+7a819fdc22499bbe43bae2549987022a  ld/testsuite/ld-tic6x/attr-array-16-4.d
+2cb63358cee1c3f03379a921a61df357  ld/testsuite/ld-tic6x/attr-array-16-416.d
+0f0907ba405cd8e646dbcc50984fdefa  ld/testsuite/ld-tic6x/attr-array-16-48.d
+c96433474ea9167d49fd61086d3500b4  ld/testsuite/ld-tic6x/attr-array-16-8.d
+5005a2e968ac02bca5e1887bd9700df2  ld/testsuite/ld-tic6x/attr-array-16-816.d
+930335b39411d1b89cde4a13b3580d9c  ld/testsuite/ld-tic6x/attr-array-16.s
+6decf37396de9d2666137d8446096cac  ld/testsuite/ld-tic6x/attr-array-4-16.d
+17ae392d4690b3ac0b74fd9f9798f785  ld/testsuite/ld-tic6x/attr-array-4-4.d
+aa683ee23dc1888c3beb34dfd8315be9  ld/testsuite/ld-tic6x/attr-array-4-416.d
+58b564dcda58ffff77a0d4b355b72dba  ld/testsuite/ld-tic6x/attr-array-4-48.d
+d8497f196fabf1e8a70492d444927f5a  ld/testsuite/ld-tic6x/attr-array-4-8.d
+9b6f92d1d8c143983043efc9f058a328  ld/testsuite/ld-tic6x/attr-array-4-816.d
+7825d4fdc3f5cda3097cda6b363dbba0  ld/testsuite/ld-tic6x/attr-array-4.s
+9a8e935f8b0ae45968700829016db6ed  ld/testsuite/ld-tic6x/attr-array-416-16.d
+1a61e40c386028757618c7e178f1cf06  ld/testsuite/ld-tic6x/attr-array-416-4.d
+3c0c6ae87c348da908ac5a13ce9a0a83  ld/testsuite/ld-tic6x/attr-array-416-416.d
+44069d969eedda0bdf89efbd5723e5e8  ld/testsuite/ld-tic6x/attr-array-416-48.d
+5d7b52d4fe0840f2b08cd0b67fea67de  ld/testsuite/ld-tic6x/attr-array-416-8.d
+d25da551430eb8a3d37951f6bb1eb63c  ld/testsuite/ld-tic6x/attr-array-416-816.d
+607d01b7ed543f177c914bf149f75aa8  ld/testsuite/ld-tic6x/attr-array-416.s
+5e9fb086e962d004895a2192be66403e  ld/testsuite/ld-tic6x/attr-array-48-16.d
+0cc6e4aba094efb4fcd56e4b6e3045cb  ld/testsuite/ld-tic6x/attr-array-48-4.d
+cd694dd4953bfe0b560f4336cf44185e  ld/testsuite/ld-tic6x/attr-array-48-416.d
+6a69f5dd066f760013534ef20326bd56  ld/testsuite/ld-tic6x/attr-array-48-48.d
+656bd55abd838fc9553534c478e4ea5a  ld/testsuite/ld-tic6x/attr-array-48-8.d
+cdfd6eaf81c6bc30d10edbb29da86c85  ld/testsuite/ld-tic6x/attr-array-48-816.d
+a5d5d29a61d47b5db4ac41c2b996e877  ld/testsuite/ld-tic6x/attr-array-48.s
+e00970b4d00522b59ff5e97fd4110ab2  ld/testsuite/ld-tic6x/attr-array-8-16.d
+bbe0573378e2829db9b4d97c735c6f09  ld/testsuite/ld-tic6x/attr-array-8-4.d
+90f63065325bf42e2aa13c4d8a85342f  ld/testsuite/ld-tic6x/attr-array-8-416.d
+23425f82a69a7b4b2b2a6f30bc34b53b  ld/testsuite/ld-tic6x/attr-array-8-48.d
+3cdd17b922aadf3c47037b37cb218b09  ld/testsuite/ld-tic6x/attr-array-8-8.d
+c8b24bf510abeb089237e711cc1e6ac7  ld/testsuite/ld-tic6x/attr-array-8-816.d
+be23a53c3c0480fef62fa6e2c93c91d6  ld/testsuite/ld-tic6x/attr-array-8.s
+e0d12c45ebf303530548e01bc79588f1  ld/testsuite/ld-tic6x/attr-array-816-16.d
+3922aa0f799247fc4d5b149d5ace2c50  ld/testsuite/ld-tic6x/attr-array-816-4.d
+b0d60627f1f756ddd194644ef7cbd2a3  ld/testsuite/ld-tic6x/attr-array-816-416.d
+54ca87257305b54e0e9f2a70169ed5e4  ld/testsuite/ld-tic6x/attr-array-816-48.d
+e8508f0060e3e647d744233aa5a83127  ld/testsuite/ld-tic6x/attr-array-816-8.d
+07366a3f3a512fd9a9af1c41cd743d4f  ld/testsuite/ld-tic6x/attr-array-816-816.d
+63cc4286156149f61345e9a4d6d0e135  ld/testsuite/ld-tic6x/attr-array-816.s
+701fb32b48aea036671fcead441ad6e9  ld/testsuite/ld-tic6x/attr-compatibility-gnu-gnu.d
+605f6f4df607c64b295d4ef4e9e48d4d  ld/testsuite/ld-tic6x/attr-compatibility-gnu-other.d
+e886896ee5d42dc31876cf12dc9d1778  ld/testsuite/ld-tic6x/attr-compatibility-gnu.s
+90af5c84f170125ecac17eb34932266f  ld/testsuite/ld-tic6x/attr-compatibility-other-gnu.d
+fdf7dbc1065ac3f9d5934e28a73dca56  ld/testsuite/ld-tic6x/attr-compatibility-other-other.d
+49881bed5369cb91c8adb7d3a77a1c0a  ld/testsuite/ld-tic6x/attr-compatibility-other.s
+2450b1a313c0c9aeab2509a72aeb6992  ld/testsuite/ld-tic6x/attr-conformance-10-10.d
+0f7db5d7006c24e55ed21bab45448641  ld/testsuite/ld-tic6x/attr-conformance-10-11.d
+beb12c8149f332043a5dd1a194a82c42  ld/testsuite/ld-tic6x/attr-conformance-10-none.d
+786f3635b154df9fe6c29bab350fd463  ld/testsuite/ld-tic6x/attr-conformance-10.s
+be1111fc9736aa21b54a1dc3f2991fb1  ld/testsuite/ld-tic6x/attr-conformance-11-10.d
+ac50be9f18745ac07e16850dd8804c6b  ld/testsuite/ld-tic6x/attr-conformance-11-11.d
+d0535910f89cba304f17106f97efe8f3  ld/testsuite/ld-tic6x/attr-conformance-11-none.d
+3d0661294fa0c18373f613652a91dcde  ld/testsuite/ld-tic6x/attr-conformance-11.s
+42de3358520aaf852ffd5d5970d3e190  ld/testsuite/ld-tic6x/attr-conformance-none-10.d
+0c6921058ce49cb26f154edb60512ffc  ld/testsuite/ld-tic6x/attr-conformance-none-11.d
+e278efdec59748d93fa819c5273f4c1d  ld/testsuite/ld-tic6x/attr-conformance-none-none.d
+5a9361fe09df01504f9bfffcffd8ff16  ld/testsuite/ld-tic6x/attr-conformance-none.s
+28e41d90503bb829beeee240264d61b8  ld/testsuite/ld-tic6x/attr-dsbt-0.s
+e6bdebca3543f33e8ed79b08e36f1ae0  ld/testsuite/ld-tic6x/attr-dsbt-00.d
+67f918b2f20d282dff0ce7eaff39ca21  ld/testsuite/ld-tic6x/attr-dsbt-01.d
+39b5e11207a1ec8b8be558f8234fa15b  ld/testsuite/ld-tic6x/attr-dsbt-1.s
+c10015eaead1f3f33f5f757b49758ac3  ld/testsuite/ld-tic6x/attr-dsbt-10.d
+356eab6b0a2625c3736ee30bbd69a525  ld/testsuite/ld-tic6x/attr-dsbt-11.d
+ffac3d7a0022b35e98fb6d940051071f  ld/testsuite/ld-tic6x/attr-pic-0.s
+195c1e87a92f45ef578c4c884b6b8330  ld/testsuite/ld-tic6x/attr-pic-00.d
+929109db7540b8d2d1cfea40587e9745  ld/testsuite/ld-tic6x/attr-pic-01.d
+5d079c56a0ee00da96bf9adad4fb16b7  ld/testsuite/ld-tic6x/attr-pic-1.s
+6b4d02c9327924c237eb9dd26c3fea9e  ld/testsuite/ld-tic6x/attr-pic-10.d
+ebe3291ae4d1eef2c6a664d7eb93608b  ld/testsuite/ld-tic6x/attr-pic-11.d
+9b207ba5eaa5de6c35327e8229301c44  ld/testsuite/ld-tic6x/attr-pid-0.s
+508aae2035e3febb6135380ddbfc3cc5  ld/testsuite/ld-tic6x/attr-pid-00.d
+0bfeecceac3cc39a9613129bcd8479cc  ld/testsuite/ld-tic6x/attr-pid-01.d
+e50f7c2ed6d403cbe0064e8f1ea2a868  ld/testsuite/ld-tic6x/attr-pid-02.d
+c2ad71377c6220dbae8be6cc4eacfdaf  ld/testsuite/ld-tic6x/attr-pid-1.s
+b5235148c5d3ff2ea79c4468a9cda651  ld/testsuite/ld-tic6x/attr-pid-10.d
+db0edd7dd62ce0186bb5347e7cd30f5d  ld/testsuite/ld-tic6x/attr-pid-11.d
+efccc8254d6b34e0a5797e4afd6c4a73  ld/testsuite/ld-tic6x/attr-pid-12.d
+5a539bf30c7b0c32070e73a43d513d2f  ld/testsuite/ld-tic6x/attr-pid-2.s
+0fdbab51ef9789e9fd6fb58a5a8e769f  ld/testsuite/ld-tic6x/attr-pid-20.d
+0d2ed2afc641129b22979e79ab9b0794  ld/testsuite/ld-tic6x/attr-pid-21.d
+278bb771d688a11dfc504ac1da095072  ld/testsuite/ld-tic6x/attr-pid-22.d
+2716191a442fe258113bb9b2747b8a11  ld/testsuite/ld-tic6x/attr-stack-16-16.d
+2c6708d3d0f53ed6f93ebcf6b08cdb5e  ld/testsuite/ld-tic6x/attr-stack-16-8.d
+05d225947aa564bdd18504946e768796  ld/testsuite/ld-tic6x/attr-stack-16-816.d
+7b230e2538e7b7c9b479f328708c1fa2  ld/testsuite/ld-tic6x/attr-stack-16.s
+b7c16a3c69e24b77af8cc04a25568c63  ld/testsuite/ld-tic6x/attr-stack-8-16.d
+74e762204c994bf9c7daa299733a2c12  ld/testsuite/ld-tic6x/attr-stack-8-8.d
+46247074e6474cb3862b290e53ad971f  ld/testsuite/ld-tic6x/attr-stack-8-816.d
+3b57dcaa29fb001f6a3acb4cb50d9c03  ld/testsuite/ld-tic6x/attr-stack-8.s
+27c91ae2ca3eeead25545874b2c1dd90  ld/testsuite/ld-tic6x/attr-stack-816-16.d
+9430f0595c0cdce3e960b16a258d5e23  ld/testsuite/ld-tic6x/attr-stack-816-8.d
+a23308722fb5567ec72b0336b7d17055  ld/testsuite/ld-tic6x/attr-stack-816-816.d
+27a7b1ccb09fb00e3d53c4d5c9de9c4e  ld/testsuite/ld-tic6x/attr-stack-816.s
+3b1a6ba9d1467cd48b3391ee5ab1d682  ld/testsuite/ld-tic6x/attr-unknown-1.d
+da34c8ed4ae878957b0e96db7e90c71a  ld/testsuite/ld-tic6x/attr-unknown-1000-1.s
+2976774dbe83171a934099ff00f47e20  ld/testsuite/ld-tic6x/attr-unknown-1000-2.s
+9414cb9180f54845eee9fcee767d0099  ld/testsuite/ld-tic6x/attr-unknown-1024-1.s
+a917a22a566f5148e60143fdd2f646de  ld/testsuite/ld-tic6x/attr-unknown-2.d
+a73f2ffa82ec19174019e75149136ba6  ld/testsuite/ld-tic6x/attr-unknown-3.d
+2f7a2e3c495c3609fbd6c0c1d9a89c4b  ld/testsuite/ld-tic6x/attr-unknown-4.d
+f4aee681dd34592fb7b484b0236ef5bc  ld/testsuite/ld-tic6x/attr-unknown-5.d
+c9034d478156fc343f2e099e40e1fdef  ld/testsuite/ld-tic6x/attr-unknown-54-1.s
+5e9ad35eaa0f045cf5e46a35d5a77ab9  ld/testsuite/ld-tic6x/attr-unknown-55-a.s
+44ef8370faf31736281dd89fdc2b1aa1  ld/testsuite/ld-tic6x/attr-unknown-6.d
+cba4da524c4a94bd8c4b919e7b7a54ac  ld/testsuite/ld-tic6x/attr-unknown-7.d
+3b6e96a9d515f5a2b4cf9a7a55e24409  ld/testsuite/ld-tic6x/attr-unknown-71-a.s
+81f955fcdc30386866f74711da5cf9f0  ld/testsuite/ld-tic6x/attr-unknown-71-b.s
+354d6e7ea3615fa9c80c22d33a6c1f1a  ld/testsuite/ld-tic6x/attr-wchar-0.s
+a56a93fb1fb2fbf749c42da84307beff  ld/testsuite/ld-tic6x/attr-wchar-00.d
+885239ffa9ae00edfc08624e088afbfa  ld/testsuite/ld-tic6x/attr-wchar-01.d
+9b506e7d4b1dfa337fb09cf1322d8fe8  ld/testsuite/ld-tic6x/attr-wchar-02.d
+f4d640b4b71b7f6f09646f92e39c5eba  ld/testsuite/ld-tic6x/attr-wchar-1.s
+8b214bd1a71846e43080f71f02f4a777  ld/testsuite/ld-tic6x/attr-wchar-10.d
+21ec5b719b6f48a5a851c49c8da4c58d  ld/testsuite/ld-tic6x/attr-wchar-11.d
+1afe79866f10a55f794e9a84d195bc01  ld/testsuite/ld-tic6x/attr-wchar-12.d
+371427a7cd66a6a87159187cba7ccef1  ld/testsuite/ld-tic6x/attr-wchar-2.s
+0bb7e3a85adab6dd8d1828cdc614760b  ld/testsuite/ld-tic6x/attr-wchar-20.d
+de4224ed1dafc03dbb373f71da912b36  ld/testsuite/ld-tic6x/attr-wchar-21.d
+cd5216a6ee3f5948dd2880f29a52f2fd  ld/testsuite/ld-tic6x/attr-wchar-22.d
+1011fd5f483ec81317355c1c557a9670  ld/testsuite/ld-tic6x/common.d
+aaf614bf94d1d62caab60fcd7a483fc6  ld/testsuite/ld-tic6x/common.ld
+fa6ea6c51cd6801c8fa4835d759a2d39  ld/testsuite/ld-tic6x/common.s
+33fbc3e345f78369897dd6fab2382465  ld/testsuite/ld-tic6x/data-reloc-global-rel.d
+8fea45b8f5c430a4a5c9f7874b9a727a  ld/testsuite/ld-tic6x/data-reloc-global-rel.s
+0aded1595e05f1a9ded13c758d3455ec  ld/testsuite/ld-tic6x/data-reloc-global.d
+c0afbeeb06e26caa4efbb07357b4e68b  ld/testsuite/ld-tic6x/data-reloc-global.s
+7543bc1ad4960d1f70db0ea56744584b  ld/testsuite/ld-tic6x/data-reloc-local-1.s
+2a9af063994a3e5d821dc497e7276d7d  ld/testsuite/ld-tic6x/data-reloc-local-2.s
+5ab068bc7d8f61b401ed34a8a3ab92df  ld/testsuite/ld-tic6x/data-reloc-local-r-rel.d
+7cfc3444f62beda302b625330b72f496  ld/testsuite/ld-tic6x/data-reloc-local-r.d
+3534c00a3340865bc29cf4c2548f48d5  ld/testsuite/ld-tic6x/data-reloc-local-rel.d
+5eca75d03c0abd15030f7b33be0a4152  ld/testsuite/ld-tic6x/data-reloc-local.d
+2880f188d82b99d45623121c3d066df7  ld/testsuite/ld-tic6x/discard-unwind.ld
+789ef98e0566260f8d28d7f3f907952a  ld/testsuite/ld-tic6x/dsbt-be.ld
+64924d882820c0a879cd164397754f9e  ld/testsuite/ld-tic6x/dsbt-index-error.d
+16a80b53f8ee6be4d2bc24d0730ece8d  ld/testsuite/ld-tic6x/dsbt-index.d
+b47ee20e6509551cbd89995077d6af97  ld/testsuite/ld-tic6x/dsbt-index.s
+31367c26dbcd2e4a2230f13c68ecbec3  ld/testsuite/ld-tic6x/dsbt-inrange.ld
+ce018c5adb55cd79c07d578d7814268e  ld/testsuite/ld-tic6x/dsbt-overflow.ld
+4362bea56b3d89c28f9e266e7ad6cddc  ld/testsuite/ld-tic6x/dsbt.ld
+a2254599887554c5e41e2535ff768fdb  ld/testsuite/ld-tic6x/ehtype-reloc-1-rel.d
+61a1c6ba089b629ebbdae0b82ea584f1  ld/testsuite/ld-tic6x/ehtype-reloc-1.d
+33aa7605231a5cacc4f4ed0e80466f3a  ld/testsuite/ld-tic6x/ehtype-reloc-1.s
+b2d8147fea67ffe57dbf9d62a6b03d1c  ld/testsuite/ld-tic6x/generic.ld
+df16d82e20441cad7ed2a5c3115cf298  ld/testsuite/ld-tic6x/got-reloc-global-addend-1.d
+7ce854f84204786ba0119cecf3bbcbcb  ld/testsuite/ld-tic6x/got-reloc-global-addend-1.s
+408cb51c863f72f91d69e7b2d22a8b13  ld/testsuite/ld-tic6x/got-reloc-global-addend-2.d
+f7a9b5790f74f89d13de47423765da43  ld/testsuite/ld-tic6x/got-reloc-global-addend-2.s
+d338ad5c93944f759749b39c3c067955  ld/testsuite/ld-tic6x/got-reloc-global.s
+c1929202c643382983c24604c0acab3b  ld/testsuite/ld-tic6x/got-reloc-inrange.d
+9723cf61d99cf99852804c60e5914e29  ld/testsuite/ld-tic6x/got-reloc-local-1.s
+9e172205e8b9a6943cf33e04178bbfe4  ld/testsuite/ld-tic6x/got-reloc-local-2.s
+7020fd7c0190636b5b87f613df09595a  ld/testsuite/ld-tic6x/got-reloc-local-r.d
+edf23d6269586ce76e7d72a0123e1ba6  ld/testsuite/ld-tic6x/got-reloc-overflow.d
+d664da78e92f42a29b7e372f32d76682  ld/testsuite/ld-tic6x/mvk-reloc-global-rel.d
+0947c5318e69241421e3412e238c1524  ld/testsuite/ld-tic6x/mvk-reloc-global-rel.s
+41b8e12437671a229cc5e9071130ccaf  ld/testsuite/ld-tic6x/mvk-reloc-global.d
+537d94935f90baca59527fc7454ae47e  ld/testsuite/ld-tic6x/mvk-reloc-global.s
+51ef912513eb1a90dba94ac032206348  ld/testsuite/ld-tic6x/mvk-reloc-local-1-rel.s
+0cf64db7c8c80d4be06a90c8248709f5  ld/testsuite/ld-tic6x/mvk-reloc-local-1.s
+cb834a6428f5a5b17e8ad426615007d9  ld/testsuite/ld-tic6x/mvk-reloc-local-2-rel.s
+48a17611d607a358d1c635cc9e61863f  ld/testsuite/ld-tic6x/mvk-reloc-local-2.s
+859328ca90c059a3f896c53b45ce9642  ld/testsuite/ld-tic6x/mvk-reloc-local-r-rel.d
+2a6661150feecda288aebd9986e62a54  ld/testsuite/ld-tic6x/mvk-reloc-local-r.d
+729dcb93d55525932e57cf33b6c87292  ld/testsuite/ld-tic6x/mvk-reloc-local-rel.d
+b97245c038cf8104c43c9e59ceb4fc7c  ld/testsuite/ld-tic6x/mvk-reloc-local.d
+6316bbbe723e245116bea366b1e92565  ld/testsuite/ld-tic6x/pcr-reloc.d
+6e1541d8e9790877f4a14d41e35952d9  ld/testsuite/ld-tic6x/pcr-reloc.s
+e9cb5844280604078e73fc7686313723  ld/testsuite/ld-tic6x/pcrel-reloc-global-rel.d
+823c2c691c9b69e50d9797d295b52724  ld/testsuite/ld-tic6x/pcrel-reloc-global.d
+98f2fb54d954e3fbaea9a0407e2e152c  ld/testsuite/ld-tic6x/pcrel-reloc-global.s
+b8ca5c31624033f3f34ab9daddf39d4f  ld/testsuite/ld-tic6x/pcrel-reloc-local-1.s
+ef1ea1d68bc2d28b733c06a6fa9ca9ba  ld/testsuite/ld-tic6x/pcrel-reloc-local-2.s
+1e92207a794d9f947d8187965206eaf9  ld/testsuite/ld-tic6x/pcrel-reloc-local-r-rel-rela.d
+7561d47eaea1890d4d563ddd7674a32f  ld/testsuite/ld-tic6x/pcrel-reloc-local-r-rel.d
+4e2cb3d5ec6bc665bc1a8462c10bf83f  ld/testsuite/ld-tic6x/pcrel-reloc-local-r.d
+d8244bfae014091f2ec49deee3ab3738  ld/testsuite/ld-tic6x/pcrel-reloc-local-rel.d
+eb2797e490905d72604c6deb53127301  ld/testsuite/ld-tic6x/pcrel-reloc-local.d
+02a22274cbf121c8a3bf72341480b9e1  ld/testsuite/ld-tic6x/reloc-overflow-abs-s16-1.d
+5c263460b87cc93fde685056d353ffb4  ld/testsuite/ld-tic6x/reloc-overflow-abs-s16-2.d
+0961aa23957f931be8bdfda5bd8c5abf  ld/testsuite/ld-tic6x/reloc-overflow-abs-s16.s
+68b0d21b341d0180ac466a2dbf93a5c3  ld/testsuite/ld-tic6x/reloc-overflow-abs16-1.d
+ddf8f8a3573a4b2f95c92c7c8b192e78  ld/testsuite/ld-tic6x/reloc-overflow-abs16-2.d
+efeb4e75c03171a37a444dcd75801489  ld/testsuite/ld-tic6x/reloc-overflow-abs16.s
+862fc957cde77b31235ff88d2a627b01  ld/testsuite/ld-tic6x/reloc-overflow-abs8-1.d
+241ecc9f1d1c0916e75393651313c670  ld/testsuite/ld-tic6x/reloc-overflow-abs8-2.d
+0b6af80e4bb13f712dc494cdaca78eea  ld/testsuite/ld-tic6x/reloc-overflow-abs8.s
+e7d495ccbccf8c38c09f253f167e9b6e  ld/testsuite/ld-tic6x/reloc-overflow-pcr-s10-1.d
+87d9f31fbca0e117600cc152d03c4f6a  ld/testsuite/ld-tic6x/reloc-overflow-pcr-s10-2.d
+a0948ab8df6a5c1f288d88fe19b0905a  ld/testsuite/ld-tic6x/reloc-overflow-pcr-s10.s
+9b92d263995f327f72968a90c01aeed4  ld/testsuite/ld-tic6x/reloc-overflow-pcr-s12-1.d
+0afde406a50d87f1ab64aef3fa5f5d3a  ld/testsuite/ld-tic6x/reloc-overflow-pcr-s12-2.d
+68597677c4b5c279e7d533fe58a988ab  ld/testsuite/ld-tic6x/reloc-overflow-pcr-s12.s
+80db5907f425dc8085b2fe7a819a5108  ld/testsuite/ld-tic6x/reloc-overflow-pcr-s21-1.d
+213da08f023a5de9377ad1d4f3a1d515  ld/testsuite/ld-tic6x/reloc-overflow-pcr-s21-2.d
+b2ebf6a670f9a191498e3fd0bff15b15  ld/testsuite/ld-tic6x/reloc-overflow-pcr-s21.s
+a30e14936c45357bb591a38fc1bb9681  ld/testsuite/ld-tic6x/reloc-overflow-pcr-s7-1.d
+de23aaaf7afde769a90e5a887181bc3e  ld/testsuite/ld-tic6x/reloc-overflow-pcr-s7-2.d
+04cb3565676d6c958b937f720dc98fef  ld/testsuite/ld-tic6x/reloc-overflow-pcr-s7.s
+c4238f86c0471a7750dd516613b1110e  ld/testsuite/ld-tic6x/reloc-overflow-sbr-s16-1.d
+bfa1923dd3c44eb30e87029ec332ab6c  ld/testsuite/ld-tic6x/reloc-overflow-sbr-s16-2.d
+3c0521528fc06ccb4e157992933a86b7  ld/testsuite/ld-tic6x/reloc-overflow-sbr-s16.s
+40e2d847b0f3480fbeaa9b4744c79817  ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-b-1.d
+01ef15b94458363c2600be293f1bde39  ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-b-2.d
+57286ec40cedfb47d5244590b7f6cde5  ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-b.s
+604196f474b1f2612c19159982cb7348  ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-h-1.d
+ce330bdd3d5902af146a6eae5f58f84b  ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-h-2.d
+d8e097b52d0d093376f2561bf30facb8  ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-h.s
+c40bdfab5e944064ef0965a477f34e4c  ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-w-1.d
+d67d7f6a38f096152db2be9b450ccc8c  ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-w-2.d
+92fdc5018a201aa37b9e2aa2e0703043  ld/testsuite/ld-tic6x/reloc-overflow-sbr-u15-w.s
+f500736e14e627105a01f829a4aa09df  ld/testsuite/ld-tic6x/sbr-reloc-global-rel.d
+59653767d6a2a1dba26b429484aab39e  ld/testsuite/ld-tic6x/sbr-reloc-global-rel.s
+46c65d33d39108197b6e8518ba19b428  ld/testsuite/ld-tic6x/sbr-reloc-global.d
+e6bbc0afaa76d74d1ff472fd9e11de80  ld/testsuite/ld-tic6x/sbr-reloc-global.s
+cafb4943bf9f15e245fcda7cf895e44b  ld/testsuite/ld-tic6x/sbr-reloc-local-1-rel.s
+192bb3e35463eab658966d8e0986fdaf  ld/testsuite/ld-tic6x/sbr-reloc-local-1.s
+15159bee3511e902f60dc83a353b72a9  ld/testsuite/ld-tic6x/sbr-reloc-local-2-rel.s
+6a609669201a8ac39e16a8e7dd33b5ec  ld/testsuite/ld-tic6x/sbr-reloc-local-2.s
+bfe54ed0fa4772855132a681e10158b8  ld/testsuite/ld-tic6x/sbr-reloc-local-r-rel.d
+a4d4ed6e46ae2863082a9f6de88d6729  ld/testsuite/ld-tic6x/sbr-reloc-local-r.d
+9a160dc098db8e4a9cf72faf7d56f583  ld/testsuite/ld-tic6x/sbr-reloc-local-rel.d
+4e800a563b8dd4f46bf50388c39d1fcf  ld/testsuite/ld-tic6x/sbr-reloc-local.d
+c7d209ff13ff769c856a163fd8419482  ld/testsuite/ld-tic6x/sbr.ld
+5a8931d6a711d7c493425f1542a21ce7  ld/testsuite/ld-tic6x/shared-nopic.d
+a1a282f3dd336cb819d5210dc5829622  ld/testsuite/ld-tic6x/shared-nopid.d
+2c49ea81bc2fa5a7a8ce750064bc4864  ld/testsuite/ld-tic6x/shlib-1.dd
+9c926db12a207e70ce319094ef7c7f15  ld/testsuite/ld-tic6x/shlib-1.rd
+ba4c2781f1aae7da41b38a35ad80b413  ld/testsuite/ld-tic6x/shlib-1.s
+534837d58ddf0a6c4ca5d4d9e1d7a850  ld/testsuite/ld-tic6x/shlib-1.sd
+94e947b5a8445420da44ceaa1ba32499  ld/testsuite/ld-tic6x/shlib-1b.dd
+9c926db12a207e70ce319094ef7c7f15  ld/testsuite/ld-tic6x/shlib-1b.rd
+315b9de6afe4b72f2d2f47c370b23a53  ld/testsuite/ld-tic6x/shlib-1b.sd
+22a8336d7f90a3805ab2d7442d6fecc4  ld/testsuite/ld-tic6x/shlib-1r.dd
+9c926db12a207e70ce319094ef7c7f15  ld/testsuite/ld-tic6x/shlib-1r.rd
+9988713ff06d8cecfc28c2119088cca7  ld/testsuite/ld-tic6x/shlib-1r.sd
+c4527e90119335709d1b0c21949263b4  ld/testsuite/ld-tic6x/shlib-1rb.dd
+9c926db12a207e70ce319094ef7c7f15  ld/testsuite/ld-tic6x/shlib-1rb.rd
+19570627a419c6b0cfc6612710233ad6  ld/testsuite/ld-tic6x/shlib-1rb.sd
+e6d71ec8092d8de0f0b2ecce74129061  ld/testsuite/ld-tic6x/shlib-2.s
+825cb3781cf865a84a7d9ddd25edfb7b  ld/testsuite/ld-tic6x/shlib-app-1.dd
+9c09ceb4e36bc18874fe14d70fddc865  ld/testsuite/ld-tic6x/shlib-app-1.od
+d2097e515dcb3c5c2ef355d205ffc012  ld/testsuite/ld-tic6x/shlib-app-1.rd
+18be9f62ac9c98015a30527cf96e3b51  ld/testsuite/ld-tic6x/shlib-app-1.s
+358195e0793db1b0395665d0e26d6017  ld/testsuite/ld-tic6x/shlib-app-1.sd
+2ee7cfe401113b0de53189068050ca2e  ld/testsuite/ld-tic6x/shlib-app-1b.dd
+7862c745e8dd65709c6993d6d696b566  ld/testsuite/ld-tic6x/shlib-app-1b.od
+1fc458f83e2e4348acc1f3a1fdddf932  ld/testsuite/ld-tic6x/shlib-app-1b.rd
+7c01a3346cc95f8b3a8cebce79c703df  ld/testsuite/ld-tic6x/shlib-app-1b.sd
+511fc6118b9630cd65d0825927bc0f2c  ld/testsuite/ld-tic6x/shlib-app-1r.dd
+cbf3e063b2f27590c62561db0b8a5b3a  ld/testsuite/ld-tic6x/shlib-app-1r.od
+46bfc8f947f196f1bcd22b3e6ea3b53f  ld/testsuite/ld-tic6x/shlib-app-1r.rd
+52736411fbb219b0fa608bfea5462432  ld/testsuite/ld-tic6x/shlib-app-1r.s
+e47dbf089371dac82b2ea945238a4264  ld/testsuite/ld-tic6x/shlib-app-1r.sd
+2106d1ff4e16914ddcefb6d657ea00de  ld/testsuite/ld-tic6x/shlib-app-1rb.dd
+fd5e5c77f06813387a997ade1a061370  ld/testsuite/ld-tic6x/shlib-app-1rb.od
+2e56ce49ca5d94683a5e442bd4686435  ld/testsuite/ld-tic6x/shlib-app-1rb.rd
+74403975b77d3b4361a3b4295b137b81  ld/testsuite/ld-tic6x/shlib-app-1rb.sd
+1e0ffb0ee7b6cf509b7b0f88513c2542  ld/testsuite/ld-tic6x/shlib-noindex.dd
+260312cb690f6754ac5c8d3162998617  ld/testsuite/ld-tic6x/shlib-noindex.rd
+785fba189962e01b3de350de26e70ab7  ld/testsuite/ld-tic6x/shlib-noindex.sd
+62d0396522a95cf63b22bec16951397b  ld/testsuite/ld-tic6x/static-app-1.dd
+dcaf6b12df26c19fd395d81e3e201b7b  ld/testsuite/ld-tic6x/static-app-1.od
+5098b7022b265751a682860a902e8af5  ld/testsuite/ld-tic6x/static-app-1.rd
+3bc09e4d8a44306d74257808cabe705d  ld/testsuite/ld-tic6x/static-app-1.sd
+8dcb89e19ae6fba3c53ec81267c6c399  ld/testsuite/ld-tic6x/static-app-1b.dd
+c0fde86098efc73ea20b1b29f5e100ac  ld/testsuite/ld-tic6x/static-app-1b.od
+5098b7022b265751a682860a902e8af5  ld/testsuite/ld-tic6x/static-app-1b.rd
+b3abfdc8907a4c2e2ed9ad8a20d1c00e  ld/testsuite/ld-tic6x/static-app-1b.sd
+a40282934b10bc99ea12c3434564f57a  ld/testsuite/ld-tic6x/static-app-1r.dd
+949bea92e1d78bf237a3d4427bcfa2ed  ld/testsuite/ld-tic6x/static-app-1r.od
+cadef7ed576d4cf05f8174a6552e7c40  ld/testsuite/ld-tic6x/static-app-1r.rd
+c8af2b7255507d3df4ac1eff73ba9153  ld/testsuite/ld-tic6x/static-app-1r.sd
+5a6414112339a134a300283c090071fe  ld/testsuite/ld-tic6x/static-app-1rb.dd
+8043c4e442024b039371f383d3494a20  ld/testsuite/ld-tic6x/static-app-1rb.od
+cadef7ed576d4cf05f8174a6552e7c40  ld/testsuite/ld-tic6x/static-app-1rb.rd
+087a16baa670ac7cadadfdd3828bf545  ld/testsuite/ld-tic6x/static-app-1rb.sd
+46c374ec3fae0a2d599f56d5f8d8f7e3  ld/testsuite/ld-tic6x/tic6x.exp
+5494c33057bd10c5bc47c1510f6968d8  ld/testsuite/ld-tic6x/unwind-1.d
+76e30dbae2eaf3ccace1dde7d557205c  ld/testsuite/ld-tic6x/unwind-1.s
+5494c33057bd10c5bc47c1510f6968d8  ld/testsuite/ld-tic6x/unwind-2.d
+5c8efaa157056ec372adcc746b6e3ad3  ld/testsuite/ld-tic6x/unwind-2.s
+c80224aaf4cf91c99e3744b5c23ea6f9  ld/testsuite/ld-tic6x/unwind-3.d
+58266d35ac486fe1184dae719b5a0279  ld/testsuite/ld-tic6x/unwind-3.s
+3776325134f6a06c368eeb47ad29ecfa  ld/testsuite/ld-tic6x/unwind-4.d
+bcda87b5776c051590e80e33f8c2912b  ld/testsuite/ld-tic6x/unwind-4.s
+9988e93507bcb10423cf8ecd2f1522cf  ld/testsuite/ld-tic6x/unwind-5.d
+86f4bc21f549263c0e7fc3c79ade02e7  ld/testsuite/ld-tic6x/unwind-5.s
+694ecdecc1b3700980be429c8d625322  ld/testsuite/ld-tic6x/unwind-6.d
+dd28a8d24d461e137e251a18225d37e5  ld/testsuite/ld-tic6x/unwind.ld
+c61f908e229f41f73556fbf66c58eaaa  ld/testsuite/ld-tic6x/weak-be.d
+adb17e705ba8c21190b76ac749fa605a  ld/testsuite/ld-tic6x/weak-data.d
+7c312ff79166b1e46786bd9a69bab054  ld/testsuite/ld-tic6x/weak.d
+365596105c86ec044029367238a9a6ac  ld/testsuite/ld-tic6x/weak.s
+d94104e66d3658e489574c123c4ddf87  ld/testsuite/ld-tilegx/external.s
+ae6c82a20eb6419a56c445af79168199  ld/testsuite/ld-tilegx/reloc.d
+4452ac066a7386a9e85937b209d6b062  ld/testsuite/ld-tilegx/reloc.s
+bd0588f3e1ab2827f5fb6a914a4d0c59  ld/testsuite/ld-tilegx/tilegx.exp
+948e95e71afa6e4d3d074f44816ecc40  ld/testsuite/ld-tilepro/external.s
+bd3a4811eee54388e211bb94fc012130  ld/testsuite/ld-tilepro/reloc.d
+0a36ef1e9b323ee31dc60e5f4186f625  ld/testsuite/ld-tilepro/reloc.s
+5fd5b0f48b093ef694cf1bec5c5b2c95  ld/testsuite/ld-tilepro/tilepro.exp
+f68dabffc8ec3de820f924c2ed2c8f14  ld/testsuite/ld-undefined/dummy.s
+2cab6ca246439db5767314636708f4a6  ld/testsuite/ld-undefined/entry-1.d
+e97dbb10a457815908608a1bcfe1bb9a  ld/testsuite/ld-undefined/entry-2.d
+7ed08e64ed6ef0a7a0b2398921233bc7  ld/testsuite/ld-undefined/entry-3.d
+46d3ba31998cc4fa75342fb7694c7004  ld/testsuite/ld-undefined/entry-4.d
+0ba68826a2effe4beeedf04d422533db  ld/testsuite/ld-undefined/entry-5.d
+3a0153f11f590f1f89778082ee7c726c  ld/testsuite/ld-undefined/entry-6.d
+5b546b08a024613ce3ebbcc5df960d1b  ld/testsuite/ld-undefined/entry-7.d
+48f8ad0c56fe32ee613a6203fb3d330d  ld/testsuite/ld-undefined/entry.exp
+0aa89fa11067e1cf8802e998bf394ec0  ld/testsuite/ld-undefined/entry.s
+b619c6e42cb950ef08a2be4baed7e558  ld/testsuite/ld-undefined/undefined.c
+48720358775cc5a0e0c9b6d98bdf3849  ld/testsuite/ld-undefined/undefined.exp
+06823040cd3afcca3a129392190cd666  ld/testsuite/ld-undefined/weak-undef.exp
+7453216dfa4d1a7223a1d7b7064c1242  ld/testsuite/ld-undefined/weak-undef.s
+ff2b7f892a6ef004c2076f2bab575ec0  ld/testsuite/ld-undefined/weak-undef.t
+6ef80b197e0a25a9ebde7d78d531cc57  ld/testsuite/ld-unique/unique.exp
+29d5f69aca84db5516a20b67b284b7ea  ld/testsuite/ld-unique/unique.s
+e619cad10e65613353ffa73b0d5171e5  ld/testsuite/ld-unique/unique_empty.s
+b0c9c3a174140a79739bb028541bac8d  ld/testsuite/ld-unique/unique_shared.s
+0a7542c4cd6da2ebfeb36c7394f7e9bd  ld/testsuite/ld-v850/split-lo16.d
+ed0ddb6caa20106cbc5b60ab5e9aac8e  ld/testsuite/ld-v850/split-lo16.ld
+087975db2e2095342de4570a8829f4bf  ld/testsuite/ld-v850/split-lo16.s
+cbdd08a087899b24d673cccf878f3be9  ld/testsuite/ld-v850/v850.exp
+a3dd5e83356444e20dfff2b6986f9701  ld/testsuite/ld-versados/t1-1.ro
+20fa39afdcf19846ef54b8c8a63c09fa  ld/testsuite/ld-versados/t1-2.ro
+750043b1377753643d66f2ea010d1d64  ld/testsuite/ld-versados/t1.ld
+1ea1a397873490e5a225282b08911b79  ld/testsuite/ld-versados/t1.ook
+b73a148ff92b3b9f50118dedddc8e9aa  ld/testsuite/ld-versados/t2-1.ro
+6521d61c4bf4f500cb868ded9a47044e  ld/testsuite/ld-versados/t2-2.ro
+ed2b6b448335acf507dc34b5a01710d8  ld/testsuite/ld-versados/t2-3.ro
+7020c6c2928c89ca798f517226862f1c  ld/testsuite/ld-versados/t2.ld
+fb1e9ddf26ad5af0d34950d762f68ed9  ld/testsuite/ld-versados/t2.ook
+3415c5263545bdf01296e35ee86fecfa  ld/testsuite/ld-versados/versados.exp
+0ac6d96980ebb6b81c69774ffc697c63  ld/testsuite/ld-vxworks/plt-mips1.d
+357d34584d0ce544d104968913d82663  ld/testsuite/ld-vxworks/plt-mips1.s
+0ceeb13aa35a9b3f811619f9e81b008c  ld/testsuite/ld-vxworks/rpath-1.d
+926d3c71162f104f484e498814083cd8  ld/testsuite/ld-vxworks/rpath-1.s
+158dba230909371ac9a0a10d47d5dffd  ld/testsuite/ld-vxworks/tls-1.d
+029facb94904524927ba5651a93ff46a  ld/testsuite/ld-vxworks/tls-1.s
+266b4c711778e9a25f4e7e1de3ba1c8a  ld/testsuite/ld-vxworks/tls-2.d
+029facb94904524927ba5651a93ff46a  ld/testsuite/ld-vxworks/tls-2.s
+d37080e69a6df409c1d42f3cf866fd19  ld/testsuite/ld-vxworks/tls-3.d
+6d47989df8b18f1c4fc1a3f75da74605  ld/testsuite/ld-vxworks/tls-3.s
+502197b67c0367179cc75e2c5729d119  ld/testsuite/ld-vxworks/vxworks.exp
+9a6d2be9e1eec47f9eae75552f420bbf  ld/testsuite/ld-x86-64/abs-k1om.d
+151f4eb16cb1586fe6ede9ac93f9614e  ld/testsuite/ld-x86-64/abs-l1om.d
+cef5f0e760808d3d311df39bc5c74a7d  ld/testsuite/ld-x86-64/abs.d
+91a199ecf6afe1be369939ed9c9e78d2  ld/testsuite/ld-x86-64/compressed1.d
+f05168212b4b926d40f433c53fba8a2b  ld/testsuite/ld-x86-64/compressed1.s
+babdbe781c8d5be6c3dbbff7d988aef8  ld/testsuite/ld-x86-64/discarded1.d
+1bfcc1f21b66eca2b04e589e1e4d8d78  ld/testsuite/ld-x86-64/discarded1.s
+932839e2d4e600dcdc966010e4965a31  ld/testsuite/ld-x86-64/discarded1.t
+8374b35f68412379bade5bfa6ce108b2  ld/testsuite/ld-x86-64/dummy.s
+64f2c2f7de3c7a2d635a5cb20953a723  ld/testsuite/ld-x86-64/dwarfreloc.exp
+0fa0abb32b3a08f7d4064c80ea7b2dfc  ld/testsuite/ld-x86-64/dwarfreloc.rd
+7f5acf37270de8f8b40fabdf0012b323  ld/testsuite/ld-x86-64/dwarfreloc1.s
+9ef00e83851b860927383972f8a30bba  ld/testsuite/ld-x86-64/dwarfreloc2.s
+9b4555015075d610d1ab4a1d5b0a8365  ld/testsuite/ld-x86-64/foo.s
+8aee9f93efb12b66efb79d5f29dac642  ld/testsuite/ld-x86-64/hidden1.d
+4e2a98726d8bfdb8233e273a0eac2a98  ld/testsuite/ld-x86-64/hidden1.s
+62daaced3e457349cb516b978b27d7d4  ld/testsuite/ld-x86-64/hidden2.d
+ecab80f3eb47cc5bc5871e947f9b395e  ld/testsuite/ld-x86-64/hidden2.s
+8aee9f93efb12b66efb79d5f29dac642  ld/testsuite/ld-x86-64/hidden3.d
+567392b63521a6cd13dda8dd82746f26  ld/testsuite/ld-x86-64/hidden3.s
+1eccb618d95e721641240b74ed62c642  ld/testsuite/ld-x86-64/ia32-1.d
+e1af01c2db8c562a357a68a604928342  ld/testsuite/ld-x86-64/ia32-2.d
+38b012e85b1add2a7c3212cbd0d79a3b  ld/testsuite/ld-x86-64/ia32-3.d
+b101982f5a86318d2375f4f4da017759  ld/testsuite/ld-x86-64/ilp32-1.d
+268bc1942a1e755cd3c654d0e508b92f  ld/testsuite/ld-x86-64/ilp32-2.d
+bcb275308c6dfdac7471864d730d5c52  ld/testsuite/ld-x86-64/ilp32-3.d
+651d8691eecc472a06e578e4beee5864  ld/testsuite/ld-x86-64/ilp32-4.d
+d7079a3fd5a0a111ba2ea5dd55616d3d  ld/testsuite/ld-x86-64/ilp32-5.d
+7954dde5079359f5cd824b28d50a9196  ld/testsuite/ld-x86-64/ilp32-5.s
+8b506013901cb32409281cd64fb392cb  ld/testsuite/ld-x86-64/ilp32-6.d
+ec4b4e4478b21427988b01b59820265e  ld/testsuite/ld-x86-64/ilp32-6.s
+8b506013901cb32409281cd64fb392cb  ld/testsuite/ld-x86-64/ilp32-7.d
+76ecf90c40aca9fca8981605664c59d5  ld/testsuite/ld-x86-64/ilp32-7.s
+bf21ba63bd85e5adf70cae5b669acbf5  ld/testsuite/ld-x86-64/ilp32-8.d
+8ccd01fe31d327e874036b52261bd457  ld/testsuite/ld-x86-64/ilp32-8.s
+da5feba68009b050645270242e4012bb  ld/testsuite/ld-x86-64/ilp32-9.d
+c5f029cfbe1c37c21600a3f33317e23c  ld/testsuite/ld-x86-64/ilp32-9.s
+146038f22f812e2e9950a251d511ecda  ld/testsuite/ld-x86-64/line.exp
+8b905a91280feb6457ea181fd73a323e  ld/testsuite/ld-x86-64/lp64-1.d
+d420a618c8e584b2e5f144dc4a758b26  ld/testsuite/ld-x86-64/lp64-2.d
+4f05291bce52713286c80fdd0addaec0  ld/testsuite/ld-x86-64/lp64-3.d
+d2cc20922f8c13552d8408937c0dc359  ld/testsuite/ld-x86-64/mixed1a.s
+4d0dbcb04007c40051f880f7284a923c  ld/testsuite/ld-x86-64/mixed1b.s
+abdcc69d97f8ebee73023595bce7025b  ld/testsuite/ld-x86-64/mixed2a.s
+798ce3b5d7f9cb57bb5e96b3b872b894  ld/testsuite/ld-x86-64/mixed2b.s
+a956e939a802d200c7d34d52a64a10ca  ld/testsuite/ld-x86-64/nogot1.d
+b87c72722f3341ed9b3757e163aedca4  ld/testsuite/ld-x86-64/nogot1.s
+14e17be79014d34039412c205d75a578  ld/testsuite/ld-x86-64/nogot2.d
+648f81bd49c5e890089548cbd33b3da4  ld/testsuite/ld-x86-64/nogot2.s
+af0ad14af8840e67e77697fb7d8be877  ld/testsuite/ld-x86-64/pcrel16.d
+21deaf5784d704c09916457834ccb87a  ld/testsuite/ld-x86-64/pcrel8.d
+0b512eff08b19c348d6537b2c39f78cd  ld/testsuite/ld-x86-64/pr12718.d
+f2aa8181f8bb6e72317ba9cf91579fa6  ld/testsuite/ld-x86-64/pr12718.s
+765aaf0af5e659d562db0e513f9f3fc1  ld/testsuite/ld-x86-64/pr12921.d
+9bc8273e473647c31df4d698250c1af1  ld/testsuite/ld-x86-64/pr12921.s
+ae9d4260c075a5b000efe2347793b99e  ld/testsuite/ld-x86-64/pr13082-1.s
+827689a23417745c409460a8e2f2e7c5  ld/testsuite/ld-x86-64/pr13082-1a.d
+32f55c0d58b44ead4c720f62c8cbe64e  ld/testsuite/ld-x86-64/pr13082-1b.d
+fb16aff9e960af23796cfca20399c98b  ld/testsuite/ld-x86-64/pr13082-2.s
+9a6519aa5b01812fe791fca2b4175faf  ld/testsuite/ld-x86-64/pr13082-2a.d
+73452a50c642ee8c9d5d855cbca7b27f  ld/testsuite/ld-x86-64/pr13082-2b.d
+6b1f8ceeebdaa745f4e0ae66ee8a1376  ld/testsuite/ld-x86-64/pr13082-3.s
+644a943e0c220c3d0d4e8fdaacead4b1  ld/testsuite/ld-x86-64/pr13082-3a.d
+f4af2676d566c059ed73c98171df7137  ld/testsuite/ld-x86-64/pr13082-3b.d
+a1b3726a623a9e74441e9582fdcd9e46  ld/testsuite/ld-x86-64/pr13082-4.s
+3aa77baad0c9bfe54851369dfbbb6fbe  ld/testsuite/ld-x86-64/pr13082-4a.d
+410dba88987e77744c3308292d1cefb9  ld/testsuite/ld-x86-64/pr13082-4b.d
+efc1aac9c36a384bba00eee40d3d59ed  ld/testsuite/ld-x86-64/pr13082-5.s
+97a42d3b47757ae5be6874e3ef88fd9b  ld/testsuite/ld-x86-64/pr13082-5a.d
+0cb0e2c204b4698305726329007e19cc  ld/testsuite/ld-x86-64/pr13082-5b.d
+2a7869db05a1555203636430f48fc788  ld/testsuite/ld-x86-64/pr13082-6.s
+dfb5e1f1422ba64d52cc62b45b04c97d  ld/testsuite/ld-x86-64/pr13082-6a.d
+3bf4af4b7fc51ffdd1caa35e99d98f1e  ld/testsuite/ld-x86-64/pr13082-6b.d
+5a16c8b33f7fc14a778a75390211d675  ld/testsuite/ld-x86-64/protected1.d
+72464b10c9ddf08d601e6e1981160a76  ld/testsuite/ld-x86-64/protected1.s
+799b5e6cfeb966e6f8ab5e471149673f  ld/testsuite/ld-x86-64/protected2-k1om.d
+bca876ebf90770ff539ec16381261433  ld/testsuite/ld-x86-64/protected2-l1om.d
+78fffea07873d857eb20ff893f9b5514  ld/testsuite/ld-x86-64/protected2.d
+3c225f378aa9175db095f949d3da69ee  ld/testsuite/ld-x86-64/protected2.s
+27707fa0dff0b02118f4264682383999  ld/testsuite/ld-x86-64/protected3-k1om.d
+56d19515835d0e1768a8bdbad75b69e7  ld/testsuite/ld-x86-64/protected3-l1om.d
+7ec2436cba802c53cccdb664a1ec2d7a  ld/testsuite/ld-x86-64/protected3.d
+b048982979e3a6bf526c3d15561c82dd  ld/testsuite/ld-x86-64/protected3.s
+85c94ea018000b40db5b1d5f4918e69f  ld/testsuite/ld-x86-64/simple.c
+124c1bc62998388d007a06a440c61b1a  ld/testsuite/ld-x86-64/split-by-file.rd
+a25bbb47f09f886630069fa0ede05e01  ld/testsuite/ld-x86-64/split-by-file1.s
+092551c720d9237b2142c771156f85bc  ld/testsuite/ld-x86-64/split-by-file2.s
+603c560dc71d0192f0a9f4ffb1ed9f5e  ld/testsuite/ld-x86-64/start.s
+de7c811fe61d3d4236ccc56a2ac59b4b  ld/testsuite/ld-x86-64/tlsbin.dd
+7624337f6af913251d93230cd6039df3  ld/testsuite/ld-x86-64/tlsbin.rd
+075abf636588564a63ffebddb4678817  ld/testsuite/ld-x86-64/tlsbin.s
+f61a7f8b7d85d67804e36cd0d3058fe3  ld/testsuite/ld-x86-64/tlsbin.sd
+cdb541667d6d911d35375bf3330da611  ld/testsuite/ld-x86-64/tlsbin.td
+3d672e3839bbd66e086ca684f48af482  ld/testsuite/ld-x86-64/tlsbindesc.dd
+18e9de9ffe6472d4be5936c2de7d7274  ld/testsuite/ld-x86-64/tlsbindesc.rd
+28cd3b7eae777449d9f558eb5822d108  ld/testsuite/ld-x86-64/tlsbindesc.s
+6f53084d69c6d7685024742940045abf  ld/testsuite/ld-x86-64/tlsbindesc.sd
+a1fd1ad23666d0e4fa820ff948af0c3e  ld/testsuite/ld-x86-64/tlsbindesc.td
+5f275de647d9dd02072a59dd6c4dd2cf  ld/testsuite/ld-x86-64/tlsbinpic.s
+fd6b4b2c38dafc8b42436dea4454b440  ld/testsuite/ld-x86-64/tlsdesc.dd
+b0ef250d81116456b7baf3ce9a3d3c5b  ld/testsuite/ld-x86-64/tlsdesc.pd
+2af7661e23605750c2c876c7dfdc6275  ld/testsuite/ld-x86-64/tlsdesc.rd
+a247554344f5bad8c449d63434ac20e5  ld/testsuite/ld-x86-64/tlsdesc.s
+6d5ccbf7a53882f245ede0f0ad0724b5  ld/testsuite/ld-x86-64/tlsdesc.sd
+012b54770105b042c8227783f5520292  ld/testsuite/ld-x86-64/tlsdesc.td
+62d4929ce74fe4c87164c5548e80d3cf  ld/testsuite/ld-x86-64/tlsg.s
+6ae3f3a98488e4cba405bf68cc7b742a  ld/testsuite/ld-x86-64/tlsg.sd
+63883ee90e3d4bc6bb43145575b8d379  ld/testsuite/ld-x86-64/tlsgd1.dd
+40f13ae560cff413e2572c65c56318f9  ld/testsuite/ld-x86-64/tlsgd1.s
+5b7629fd8f67ca705fea4869a164779c  ld/testsuite/ld-x86-64/tlsgd2.d
+f0cdbf9cc3ba566313b4bc11de68a57d  ld/testsuite/ld-x86-64/tlsgd2.s
+5c83de12625c5c81b84b67dbc775e8c2  ld/testsuite/ld-x86-64/tlsgd3.d
+1c1c53433eb7999c0e421cfcdd4f3448  ld/testsuite/ld-x86-64/tlsgd3.s
+ad977355db53c511e88846e4014a9f7e  ld/testsuite/ld-x86-64/tlsgd4.dd
+934257c43f7852f50a49aa497e98cd34  ld/testsuite/ld-x86-64/tlsgd4.s
+4aa08273fde18fe9f922bb53e1fff0cb  ld/testsuite/ld-x86-64/tlsgd5.dd
+1be55a9c7f6158dfe9dccd5bda9cead2  ld/testsuite/ld-x86-64/tlsgd5a.s
+473c03031e2c7147bdc54b0b4c7f0b72  ld/testsuite/ld-x86-64/tlsgd5b.s
+ed7c309fc96ff106114984ab2ea3987a  ld/testsuite/ld-x86-64/tlsgd6.dd
+3e764b037d14a88f8038f643a6838d1b  ld/testsuite/ld-x86-64/tlsgd6a.s
+473c03031e2c7147bdc54b0b4c7f0b72  ld/testsuite/ld-x86-64/tlsgd6b.s
+c162fb4f43877c4341fc5b070390ab07  ld/testsuite/ld-x86-64/tlsgdesc.dd
+e51142d067f71f748e2d50482644491d  ld/testsuite/ld-x86-64/tlsgdesc.rd
+210b96ca733b3982a77955970b126e5f  ld/testsuite/ld-x86-64/tlsgdesc.s
+7080a1e97e7d1681e5a1e9da28ccc65e  ld/testsuite/ld-x86-64/tlsie1.dd
+4732b2d3b38a90890896eccd0356a0f7  ld/testsuite/ld-x86-64/tlsie1.s
+e9d4de113c5b49a3bdc4cf5e3ba9e5a7  ld/testsuite/ld-x86-64/tlsie2.d
+d9240622cc20d0919532be278ad7402e  ld/testsuite/ld-x86-64/tlsie2.s
+e5bceeea7613b8d9c157210660cadcb1  ld/testsuite/ld-x86-64/tlsie3.d
+c7b4057f12b94f3abf30c4f84a54854e  ld/testsuite/ld-x86-64/tlsie3.s
+9ce9e68f90fbdcca31155898a8108198  ld/testsuite/ld-x86-64/tlsie4.dd
+a37c4da98dcec520ab5444678bcd3456  ld/testsuite/ld-x86-64/tlsie4.s
+7b60a69b4c2ca65fccc94ef6cc2be2bb  ld/testsuite/ld-x86-64/tlsld1.dd
+0556743c96e0ca791f9e7cf0d8afaf39  ld/testsuite/ld-x86-64/tlsld1.s
+48210a07f215c11eed171deaa6001619  ld/testsuite/ld-x86-64/tlsld2.dd
+0556743c96e0ca791f9e7cf0d8afaf39  ld/testsuite/ld-x86-64/tlsld2.s
+bddcc18e778b7c77d37c46fd8e45378b  ld/testsuite/ld-x86-64/tlsle1.d
+263b1c7934263353824c403da30eb39f  ld/testsuite/ld-x86-64/tlsle1.s
+8c2ec5a661ed74565c24b65f22a230ad  ld/testsuite/ld-x86-64/tlslib.s
+5f50aa593bd6af28fd745c7332ba9401  ld/testsuite/ld-x86-64/tlspic.dd
+21498fa99df841710b17f18bea0547d2  ld/testsuite/ld-x86-64/tlspic.rd
+38e156962136c462ac355e9bab80be2c  ld/testsuite/ld-x86-64/tlspic.sd
+550560267d7a0f6a31490ee4c9c7603f  ld/testsuite/ld-x86-64/tlspic.td
+ee7691553eed047cd215df33232e3a67  ld/testsuite/ld-x86-64/tlspic1.s
+1be6d8e1547c710f7bc12028c6522832  ld/testsuite/ld-x86-64/tlspic2.s
+5bbecf9422892b0498f9640c06054e11  ld/testsuite/ld-x86-64/tlspie1.d
+86983dbba838659fbfb4cbdfdb7c0324  ld/testsuite/ld-x86-64/tlspie1.s
+f7cb6b2e0f6ec97f125fe2d8345e0263  ld/testsuite/ld-x86-64/undefined.s
+4a99ed2c60633e8c95293670abbb1d6a  ld/testsuite/ld-x86-64/unique1.d
+e0d78f0f8725bde6333bcd56ccb083b8  ld/testsuite/ld-x86-64/unique1.s
+6c5efb94140f6bea6d1e05ddd22d9ce3  ld/testsuite/ld-x86-64/x86-64-x32.rd
+53bc305eeb616ce59cdd20b57de52534  ld/testsuite/ld-x86-64/x86-64.exp
+6f577583952be3de543260d5fb8bbb16  ld/testsuite/ld-xc16x/absrel.d
+3998ca79d045f299d12bbd0cf1e6205f  ld/testsuite/ld-xc16x/absrel.s
+01a0b5ff12180f56fd3e59aca1729442  ld/testsuite/ld-xc16x/offset.d
+1f6dbcccb182d6b602c350c41af6da1b  ld/testsuite/ld-xc16x/offset.s
+c79d7034cdc00b1ef5f6063eb95f5c0c  ld/testsuite/ld-xc16x/pcreloc.d
+7aefa0a8f34a16164d08456ec76b6fc3  ld/testsuite/ld-xc16x/pcreloc.s
+049fad93eab7776029ac7ce488ac7ea0  ld/testsuite/ld-xc16x/pcrelocl.d
+7cdd42697f1d7b6cc687e770974595e3  ld/testsuite/ld-xc16x/xc16x.exp
+c672c9391c0476202146864913baf1cf  ld/testsuite/ld-xstormy16/external.s
+3105964d5d4b7fb1c6827105fc30d4f6  ld/testsuite/ld-xstormy16/pcrel.d
+a8dbf5f9838a94e3e1d6bb3ac1ffb031  ld/testsuite/ld-xstormy16/pcrel.s
+73ab4af181f6f013c8f6a9ec508d4884  ld/testsuite/ld-xstormy16/xstormy16.exp
+9832dc58c2691b416bbfb53c352fc610  ld/testsuite/ld-xtensa/coalesce.exp
+f242f65208286ce6c777e52159a52efe  ld/testsuite/ld-xtensa/coalesce.t
+86df88ae4915f743772325ebdb29c512  ld/testsuite/ld-xtensa/coalesce1.s
+ebdcd6e72a4579e5cecbc5bea6ff3410  ld/testsuite/ld-xtensa/coalesce2.s
+3de3229a4a332e3e139cb39f0eeb068d  ld/testsuite/ld-xtensa/lcall.exp
+f242f65208286ce6c777e52159a52efe  ld/testsuite/ld-xtensa/lcall.t
+94cc8713eb0fe35038d64fdd1b12cb88  ld/testsuite/ld-xtensa/lcall1.s
+f3bb78e2bbd6bac90e08899f09dab316  ld/testsuite/ld-xtensa/lcall2.s
+ec444c64504b1bc179bc2dad83c7a2ba  ld/testsuite/ld-xtensa/tlsbin.dd
+222173cad9ca2b0795c7a472c79b73cc  ld/testsuite/ld-xtensa/tlsbin.rd
+2585ef8283af0fca55d9284792e5ec0a  ld/testsuite/ld-xtensa/tlsbin.s
+19584892dff40a9a565a9368496b4172  ld/testsuite/ld-xtensa/tlsbin.sd
+bc01f211012e4da49bef7d1f6fe1fd60  ld/testsuite/ld-xtensa/tlsbin.td
+451eacc338064e33179318c085a7c7a1  ld/testsuite/ld-xtensa/tlslib.s
+ebcd7d779b67f5256d84598e2a1c34d7  ld/testsuite/ld-xtensa/tlspic.dd
+6c72b6411a86d2641e0b997d3c099454  ld/testsuite/ld-xtensa/tlspic.rd
+9a499e239e3af1548836ce06df663d4d  ld/testsuite/ld-xtensa/tlspic.sd
+af6ef4c448967808937e6f2fcd6fa1f0  ld/testsuite/ld-xtensa/tlspic.td
+4708405ca88b87cf00e84d231c449689  ld/testsuite/ld-xtensa/tlspic1.s
+74dc12cdbe5ac4b2c634e5dc8b770127  ld/testsuite/ld-xtensa/tlspic2.s
+2f4d300c622bfb7444899f021a279fae  ld/testsuite/ld-xtensa/xtensa.exp
+dcac57a49ba303c93e673658c261be6e  ld/testsuite/lib/ld-lib.exp
+01627b664c7e61ab5dc202bb72913e0a  ld/TODO
+99c2e5e712b990ee07be10f53e41f3fb  libiberty/.gitignore
+8797cb1a6faa84f3c7fe3d12164a4b13  libiberty/_doprnt.c
+9e0fa3abcd04ba6712cbd50ec7ea1bb8  libiberty/aclocal.m4
+e60c2e7c5dcdd19510066c13f1a527d3  libiberty/alloca.c
+e5732ad77f36bdaa7590cb9e822b78ab  libiberty/argv.c
+1ff1c82c53060dceecc901cf0b63c950  libiberty/asprintf.c
+a16ea056b95fd70c21333db132da14ff  libiberty/at-file.texi
+c34119797a13e71989722851c14b711b  libiberty/atexit.c
+ab8d4cd68aa4892e2318d2c71864cc56  libiberty/basename.c
+17a1f1d7f5acf01ce922d98210067542  libiberty/bcmp.c
+a707d2e5daa09d204d4441e8713048ca  libiberty/bcopy.c
+76888d9a6ed315d1e12029016d96672e  libiberty/bsearch.c
+4a0acb9356a52f3bcfd67efa26997b58  libiberty/bzero.c
+5bd055836a440051d7c561a9f591ecbb  libiberty/calloc.c
+99353c8570e7b21e3e74461782ae7c8b  libiberty/ChangeLog
+c67a6e0ba850ef5fb86522ddb2e87e5c  libiberty/choose-temp.c
+a8391a5d7431a4e11f61be41386a3356  libiberty/clock.c
+5d5d14621573984e4b94b1ceb9299fc3  libiberty/concat.c
+4004fdcde347fda58406b4b84a995c66  libiberty/config/mh-aix
+7b65854f594c84e80295173de277b3dc  libiberty/config/mh-cxux7
+044204f5b4bcac5eae2face0602129ae  libiberty/config/mh-fbsd21
+904bdcd9daf97fa55a9ca8901ffe7435  libiberty/config/mh-openedition
+38e76da568ab25260754fdb9d5080513  libiberty/config/mh-windows
+83565a31c7f296b3013daf383cd03ee9  libiberty/config.h-vms
+44d9a67ca74e0a4744f9c751d345b849  libiberty/config.in
+b112c3ae14be9d020a1cdd185bcc9099  libiberty/configure
+5d9a5592c3884692916e7456817c0a72  libiberty/configure.ac
+5824bd0f9be9f4fa74bb3bdc7fd9431c  libiberty/configure.com
+a8959f1d1758eb14819753023f89d199  libiberty/copying-lib.texi
+a916467b91076e631dd8edb7424769c7  libiberty/COPYING.LIB
+fe053283d3559af3ec5cac45f8ead009  libiberty/copysign.c
+38c8a79391576c3fb3d7a0578505a598  libiberty/cp-demangle.c
+4aaee5f46bac9e50f23fabebe62cded5  libiberty/cp-demangle.h
+6af921a6efcb5621c06ff9b2a8769b01  libiberty/cp-demint.c
+37193048466b1b0934121905ff3f534f  libiberty/cplus-dem.c
+7c69a6c6a36925e0ca6f068473e6d858  libiberty/crc32.c
+d31a55379aa2dc43eb6858a26c4a6c76  libiberty/dyn-string.c
+d7cc74911527c672bba716c9a793ed94  libiberty/fdmatch.c
+0c2635175b975823b40980974dfc2110  libiberty/ffs.c
+14fdd881914e69080c65de413c7b6ecd  libiberty/fibheap.c
+1c0244e5edb10602e11b34716b1edff7  libiberty/filename_cmp.c
+c324184243607652409c3844f262f040  libiberty/floatformat.c
+aa0f79d836563e6a0cd92ab678b07aaf  libiberty/fnmatch.c
+145debe2f28f470878f95b1255f5537c  libiberty/fnmatch.txh
+5bc3cf9b5b331ec27790ba0599f2875f  libiberty/fopen_unlocked.c
+dd3cd06b4589a4a3b3ea8b7a14bedb8d  libiberty/functions.texi
+8b8ae14c1fbedeb88355f09bc7a7ecfc  libiberty/gather-docs
+754c5ef42440c5d1b62146174a6636e4  libiberty/getcwd.c
+eb843075f87d187630f6a3d849b93e64  libiberty/getopt.c
+7c932073da197aa34eb3383960a114fd  libiberty/getopt1.c
+bb0043d92c716691cc17b80c845c336b  libiberty/getpagesize.c
+5e520e600636a692f52e62dcfb01921c  libiberty/getpwd.c
+5c0eb869d31323424849c0aab9247722  libiberty/getruntime.c
+0c70ad1e35bb090b52ed593865025741  libiberty/gettimeofday.c
+171e310576a238212ac4b6ac6ec3ccaa  libiberty/hashtab.c
+048d9004ba3a2badb7abe6e0afd8f663  libiberty/hex.c
+4d485e7735be430b22aea0abb4938e26  libiberty/index.c
+9d0471286f21d9027bbf1b7c67b87856  libiberty/insque.c
+5b4506ce60bb3446f083b9542af3fce0  libiberty/lbasename.c
+9905223327acad708d5b0a28e8047cdc  libiberty/libiberty.texi
+2c56f9552603480f87b7136972894128  libiberty/lrealpath.c
+fe4e25fb7df7cacdc921eaf39ce595af  libiberty/maint-tool
+661dd1cfd866f16a426aafedaae4523a  libiberty/make-relative-prefix.c
+0172f6488e44155e35d94e3f2c5c3c5c  libiberty/make-temp-file.c
+4e7c755ba4f1af30dd32d8ecde424293  libiberty/Makefile.in
+379561229f99437be05ede87fbcf8533  libiberty/makefile.vms
+87d1087d1cd8bdec7e57bcdf147a9cc5  libiberty/md5.c
+de9bd20436bf2cb64d8c374c110ce315  libiberty/memchr.c
+33320d312ab390ca0eb5c43c9e349d57  libiberty/memcmp.c
+c90c2f09bdcbd65b4732a4be25a56d12  libiberty/memcpy.c
+abdf0787024ad239a36f6c8377a8c29e  libiberty/memmem.c
+99bfeaeb76e8e725dd8766f33810ccb1  libiberty/memmove.c
+ac4d94d7fedc8abaa75b57da06101b03  libiberty/mempcpy.c
+c44adc5ac09bdc782a8e13086ffa9367  libiberty/memset.c
+3c555b2960666ff51ab2faa4fb9ed0d5  libiberty/mkstemps.c
+7897e43bedd2def4beb6eb73003efa68  libiberty/msdos.c
+684ab2f5de6b46501aac279f2bd2f92b  libiberty/objalloc.c
+ab0f43a6703e0705b4e8bac274635b56  libiberty/obstack.c
+100e19ca9daa12d591302f5292108378  libiberty/obstacks.texi
+f4ec5461a2fdb28214092b95b39ef186  libiberty/partition.c
+96a77c36aeb901544290055a6c9afd0f  libiberty/pex-common.c
+91d9c98c4feb994b1f62f5fd7124fe41  libiberty/pex-common.h
+9c9f332011572cd3bc1b606c878bd707  libiberty/pex-djgpp.c
+581ca82c700722ff2cdd7fd93c0a0c11  libiberty/pex-msdos.c
+d67a9b0906ffa961fdc411aa936fdfb1  libiberty/pex-one.c
+452d4245168d96c6e66637ad1f9a382f  libiberty/pex-unix.c
+8228d61a0df6bccc7444c1e331bd6fd2  libiberty/pex-win32.c
+fa294b254945587548ca6b32d7922d03  libiberty/pexecute.c
+a6b1581efa83a4072727b38d6fef4230  libiberty/pexecute.txh
+af9bee5d1912e623defe1a7ee0ebc296  libiberty/physmem.c
+f7e45d3f23f83574372065030595efa7  libiberty/putenv.c
+94f22680349b4ae73ad658495d2eb542  libiberty/random.c
+c68dbf7834af4281ebd84caa3fd54680  libiberty/README
+cb83524b0a7871563f11d52efec54a62  libiberty/regex.c
+24eab3d83825c3be13549dc62b6d63d6  libiberty/rename.c
+74850488731148a9c9f410042144f37d  libiberty/rindex.c
+b91dd39a7b9d4c9d03edc8a6cdf81978  libiberty/safe-ctype.c
+67aa86d16c993dddfdf9c2d91b910578  libiberty/setenv.c
+5cce049df0e7ecfbe8d9f43dec4f9110  libiberty/setproctitle.c
+7e177a54e64c2b7cead1b03ef3354e91  libiberty/sha1.c
+cafcb336a6d21898592c5cdaa7c5a3a7  libiberty/sigsetmask.c
+98b261f5b750c15964376543f20ce838  libiberty/simple-object-coff.c
+46cc2dd9ee3647f96b12b4147a56ea3d  libiberty/simple-object-common.h
+6a644ae380b64c2263b8c5070340c1ee  libiberty/simple-object-elf.c
+505f7cf4bc24a21d7ade77a8c84cfcbb  libiberty/simple-object-mach-o.c
+5038f5b200deaf5a04ba42e010085d5d  libiberty/simple-object.c
+4863a11e04a2021af582edf86f156954  libiberty/simple-object.txh
+e34c9d634af52457ef9c7973d9879d48  libiberty/snprintf.c
+32ea90e5aded75d1cbed83fc52123753  libiberty/sort.c
+2a636db0be7babf70662b1387ae73354  libiberty/spaces.c
+60612038a3f96d55b6be45cb8b5cf217  libiberty/splay-tree.c
+8ee69b2d3c5fac2cf556666eb0c26b9e  libiberty/stack-limit.c
+bac20c1a198662917e6bc775ad9bd0cf  libiberty/stpcpy.c
+6d8293add4026ed6717d39608786d5f6  libiberty/stpncpy.c
+0c900e9180d750a26ac0ddb237151832  libiberty/strcasecmp.c
+13cce636dd9882e42c9fc5d607351f4f  libiberty/strchr.c
+9f681e91439ac44c9df8e1b1deef33b5  libiberty/strdup.c
+b3aaeed201f3c6fd293e9f9618350bfe  libiberty/strerror.c
+2d414e20c053293f373a5306192db8f5  libiberty/strncasecmp.c
+cc534c2ea00ea0b5e49ba8f61c6e467d  libiberty/strncmp.c
+2d92725e49581d86d7cf06fb40def19d  libiberty/strndup.c
+5b0eb0000c746fc4c1854f00bb80b53d  libiberty/strrchr.c
+f214096086d1747033efa505022dd89c  libiberty/strsignal.c
+e2f3721273c7ef1ab0194aad78ffa3aa  libiberty/strstr.c
+0cf8d9985fc4c93d80dd1b0f95431a96  libiberty/strtod.c
+c9bd3841bbde6d8ae680f62523f00ab0  libiberty/strtol.c
+26196a9a92fae743a06d65f0e081084b  libiberty/strtoul.c
+9e1bb6fe95ebb6415672ddf1da29ec65  libiberty/strverscmp.c
+3f2a11482f621359c5a0fd1c59fc294c  libiberty/testsuite/demangle-expected
+8f24f8939540ed6d58ad0dcdf1132562  libiberty/testsuite/Makefile.in
+85c7215f6a2d5dde81ab2e8211a4becc  libiberty/testsuite/test-demangle.c
+d4cc425bb97dbff240fe7c804bdc00f4  libiberty/testsuite/test-expandargv.c
+e9e958dbfc45a08dbbbbe48c83d3987e  libiberty/testsuite/test-pexecute.c
+6b513119d8c36af928821e8ec24265d7  libiberty/tmpnam.c
+fed47804d20d26873d480f5166e7d864  libiberty/unlink-if-ordinary.c
+39c4dae2cfe62dd9172b48cbbb969d93  libiberty/vasprintf.c
+8e71982d77e91c0e3c57ca86c8a1b548  libiberty/vfork.c
+dc973aeb02b4545e42f179263612a4d6  libiberty/vfprintf.c
+28af0a1bf222ed2a5a87d9e170ef4a46  libiberty/vprintf.c
+88518587b4d0a0245a21ef3ae29de3bf  libiberty/vsnprintf.c
+9e789d58cebe756b96be30941debb05e  libiberty/vsprintf.c
+9c22926d0b260822786460b98e517ad8  libiberty/waitpid.c
+f32b581d10bcc500277b6f4b4f923a4e  libiberty/xatexit.c
+22389f4e282e4b739e0c1d70cba66cc1  libiberty/xexit.c
+cdc140ce93944c5bb2ac62cd3dfd86d6  libiberty/xmalloc.c
+72b25900bd3d95decf7ff7990061ef29  libiberty/xmemdup.c
+4746095b1b67693ab6e78ed72ead1235  libiberty/xstrdup.c
+6f774a92661ca4a067f1691a7925524b  libiberty/xstrerror.c
+c6e7ef53b4ff115a136d917511222656  libiberty/xstrndup.c
+d65d47d2ff82eaf7b39fbf26d000eb96  libtool.m4
+247597a3fcc5b5aa8bd923351c59d853  ltgcc.m4
+01d0921596c9fa4d9a7add89fd6fc1f1  ltmain.sh
+dee72a6a60e99528b0d17bf3ff9a1e15  ltoptions.m4
+bc2f6032c98896249eadb56177c7d357  ltsugar.m4
+c30cd33c496505f13d9fbdb6970c7c33  ltversion.m4
+293853a13b7e218e3a4342cf85fbbf25  lt~obsolete.m4
+734690a438420e8479e15d8ee6971792  makefile.vms
+9d9668fb32d0542b712be2c34ca79bd7  missing
+fbe2467afef81c41c166173adeb0ee20  mkdep
+766574f467c38d27fc7604ca8eb6734c  mkinstalldirs
+f1fff2ea196cbf6fe4634bc3edc5af4d  move-if-change
+ef6602b963f2a903ab9c81134c6b8d29  opcodes/.gitignore
+1eabaeb9aa44234d9977c09f3ed932e5  opcodes/aclocal.m4
+0d183fbfd7a3b3bbb706594c41604ace  opcodes/alpha-dis.c
+b2c7455ac27ff79f81ccb4aee922e6a1  opcodes/alpha-opc.c
+f7637eb4db64ff973cf56bc4e2ca4d06  opcodes/arc-dis.c
+6d22b958c28df865e858391b44aa0532  opcodes/arc-dis.h
+c68a361ec50354fc6b61bf73aaf01acf  opcodes/arc-ext.c
+b3d65ebfe89e547896663c61def89981  opcodes/arc-ext.h
+e016668afed76e3602ac2c0b9c8c5f9d  opcodes/arc-opc.c
+552442f3ef866c85329850b942ed0fc9  opcodes/arm-dis.c
+6556c6c47ae03ad7481e97718ca99152  opcodes/avr-dis.c
+f26dec5aa530f30f80b4f22c96391719  opcodes/bfin-dis.c
+45cea674fa428a0345e51f278752257c  opcodes/cgen-asm.c
+d92cf67612895b65ff62ddb82f9b5543  opcodes/cgen-asm.in
+2e26c2d5bcab8c834c3f8748325f7367  opcodes/cgen-bitset.c
+4ffab65c39d688bd5e8078e10b92df4c  opcodes/cgen-dis.c
+3f344b4342a0f690134a85b456e303e0  opcodes/cgen-dis.in
+a270403bead8816e5e9a909aa991e2b1  opcodes/cgen-ibld.in
+3f509397dc42868fd6b3b4369364f3c6  opcodes/cgen-opc.c
+bc080d7ab00992593cfa8b975cd771a9  opcodes/cgen.sh
+09f0226ee274cb289f0046634c0c6f63  opcodes/ChangeLog
+1b4b8646bdc7ad5a2f9071d8ac8b024e  opcodes/ChangeLog-0001
+83ac14eead5eda1862cc926b82d35cea  opcodes/ChangeLog-0203
+d4cca6dd9882292b6f2e17604bed6cbd  opcodes/ChangeLog-2004
+95966cf6bc7711aae732addbfd33ce65  opcodes/ChangeLog-2005
+7ba43e2b6e32ab09a694143b260d7f93  opcodes/ChangeLog-2006
+066e38fddf56239fcd4ab773798695c3  opcodes/ChangeLog-2007
+aaf7e24e3596c794e506477ee65123ab  opcodes/ChangeLog-2008
+caa6c6acfe99f77e960674fab34611f2  opcodes/ChangeLog-2009
+9f388ebefba474c0479df23b8458d128  opcodes/ChangeLog-2010
+568db2b4641150f46a18da55529d8d3b  opcodes/ChangeLog-9297
+fc3adcd099179b77d2adb79ada21a89c  opcodes/ChangeLog-9899
+42a395f87f37d432f30615448f2e9dde  opcodes/config.in
+ddd88b6577a9126dec274d4a3eb91412  opcodes/configure
+70a452d27d058e90c3d5ea0c77390d74  opcodes/configure.com
+6c6e3727ea511308f0d72b6c9a45ae39  opcodes/configure.in
+d5ffc6e2dece475d856226677a75965e  opcodes/cr16-dis.c
+8e6fb5d34ee9e13ea581ba43962baeef  opcodes/cr16-opc.c
+35feef6702a5237816c99597b77a40bd  opcodes/cris-dis.c
+24a976b6e3d0dedc20abd0ff680ae63a  opcodes/cris-opc.c
+e079337376f6eb8d13442f65b8b9e2c8  opcodes/crx-dis.c
+78cb9b6b05693f19de9e7f6f5c7c5922  opcodes/crx-opc.c
+9f37ca078c8fbbc619657203997c305d  opcodes/d10v-dis.c
+d32690dc533892cbdede583b5e166b0f  opcodes/d10v-opc.c
+9706bc2f17f3927f1b59e09a3ab3acee  opcodes/d30v-dis.c
+fa8f5111930e274b56b6ca49e0304e7f  opcodes/d30v-opc.c
+574537d9972c9161d297dcfd7eca0282  opcodes/dep-in.sed
+0b5893bc5b9e2225c5271f9c177863f0  opcodes/dis-buf.c
+ece66b3e9256a52ed11137f296b8ae2c  opcodes/dis-init.c
+10380118f891b962fb4691d5d65c5a98  opcodes/disassemble.c
+750e7500febd896381af0445f2d2f671  opcodes/dlx-dis.c
+8a86519ed6859aefa53d5775a34e8efc  opcodes/fr30-asm.c
+cfe6923b5d541653e2f44ab124d2ed29  opcodes/fr30-desc.c
+5e78b4e732da2ec165862f1bbcda6ae0  opcodes/fr30-desc.h
+ed406e7ae99699b9d4dd8e53aad11c4a  opcodes/fr30-dis.c
+9a83bbdb6f1c0816a6a03cd4180bb438  opcodes/fr30-ibld.c
+dce3dc85831bd7368b85f6fb4c5ca93d  opcodes/fr30-opc.c
+006ba74072ac247a26a5dca66fa99eb7  opcodes/fr30-opc.h
+e4ff1a5a63af8bb51dcad7eeb1c890dc  opcodes/frv-asm.c
+432f09661ca978fdfd790d2d314e01b4  opcodes/frv-desc.c
+5339efb6ca9f1055b0e07064fa64db35  opcodes/frv-desc.h
+8b55d5b3e9d33d047e4649446acfce1b  opcodes/frv-dis.c
+cfabe82140ce4eb2addfcb21b986c86a  opcodes/frv-ibld.c
+8d6fe830106fcbda822c06a6763b1f28  opcodes/frv-opc.c
+ed96c9379698ac3715e6440ae6d9c3fb  opcodes/frv-opc.h
+977f791ef7c4744f7e86948ef4c81d16  opcodes/h8300-dis.c
+7dc426bed3d4409dfde9c431f5351994  opcodes/h8500-dis.c
+a90d1cf88e8ca000d2fe045d2757c929  opcodes/h8500-opc.h
+2d54299521f9bd96064004cec7c26523  opcodes/hppa-dis.c
+c86a545a6e8fe8ac8cec0f3d8d09a82d  opcodes/i370-dis.c
+218308bad0ffc625fd4598939457dc2e  opcodes/i370-opc.c
+a8b862ba2c3876144ff22aedb3b38ebc  opcodes/i386-dis.c
+a5caede2127e3720973c2017499ecdb7  opcodes/i386-gen.c
+dce9f1d2e3c3c2eb460b101e3b3f3062  opcodes/i386-init.h
+b349e449b7242ffccadc2905ba3bf302  opcodes/i386-opc.c
+ea0debad6159115c95c8dc4103de2b26  opcodes/i386-opc.h
+961c33d947e88722a4883a2fa688ebef  opcodes/i386-opc.tbl
+d916194e78f00cc94c8d848e6f64b8ef  opcodes/i386-reg.tbl
+3af24642c732155e8f291832760e30b4  opcodes/i386-tbl.h
+d332fee7f16c258c245719be4e3b42d2  opcodes/i860-dis.c
+6f95da0087252987fc36375464b53b25  opcodes/i960-dis.c
+0ccdc17aead3327c15b4fa800790d302  opcodes/ia64-asmtab.c
+71ba420c878d2fd0eb4d2ac36e8970e0  opcodes/ia64-asmtab.h
+2249ba833158c5faccc1ee90e2c43906  opcodes/ia64-dis.c
+9c2874445493c3819b8e1d09897c590c  opcodes/ia64-gen.c
+3ba50a7c1fd5801e7580330288cc725d  opcodes/ia64-ic.tbl
+8f9a2aed093833e5731816035917e414  opcodes/ia64-opc-a.c
+4f8035ad5d22b8fbcc34d2e25f7ab579  opcodes/ia64-opc-b.c
+361797efc92da6617137cf96553b9ed1  opcodes/ia64-opc-d.c
+f2d2c6a73919ad50bfe2e45fe88ee660  opcodes/ia64-opc-f.c
+13cb7cd8ba9ed01df363cb584a2ba842  opcodes/ia64-opc-i.c
+06a95f9a4099de3fe81b2f60baf5d2cd  opcodes/ia64-opc-m.c
+a1ce2021835faa950844ba29d355ce5f  opcodes/ia64-opc-x.c
+479a02992c0c32054c66a67a595bd60f  opcodes/ia64-opc.c
+34c13118bf7c1f27ed2413588449c811  opcodes/ia64-opc.h
+53c4ff8b528feccdd43a51b2031d9855  opcodes/ia64-raw.tbl
+b3d7452b4310332b7974b34b09f65a6d  opcodes/ia64-war.tbl
+43d7bb09153ca5484f9e163a618c6328  opcodes/ia64-waw.tbl
+98fe5aa93bfef9588406f7ddc7358e27  opcodes/ip2k-asm.c
+5cabeff9c6311270be353a97ab451778  opcodes/ip2k-desc.c
+ac2bf5a1711a374e124bebc7b77d7036  opcodes/ip2k-desc.h
+f1f09223557d8405ccd6038f82064488  opcodes/ip2k-dis.c
+0e81286d5ab261cd87d46aaf4b3fa03d  opcodes/ip2k-ibld.c
+948f39ae51c9ddcc8f4e328cc4425106  opcodes/ip2k-opc.c
+4306a0e1c37315e842a079af635e19e3  opcodes/ip2k-opc.h
+73fc04e2f5f07cd6843ed32752302727  opcodes/iq2000-asm.c
+27c50d1d8efc7d958b8357d69cd47fd1  opcodes/iq2000-desc.c
+8578971c11de4eac82b6a23613e78b9f  opcodes/iq2000-desc.h
+9e6df7320c072abd0d962139ef7391ab  opcodes/iq2000-dis.c
+a65e9e23415bc5162f3fdf569015da48  opcodes/iq2000-ibld.c
+71b3368e10ef92e6bbc551b0d20db82e  opcodes/iq2000-opc.c
+a7fcc51b1065248503975116e60ee28d  opcodes/iq2000-opc.h
+82dbf3fedabee96a990f4096c9836a44  opcodes/lm32-asm.c
+0edaac3c0e63e8f7d9515103eea20f53  opcodes/lm32-desc.c
+ccced39416c4bc64fee833c133213b66  opcodes/lm32-desc.h
+796bf959dd98214bb8a3b1110e3c2670  opcodes/lm32-dis.c
+3e7e949d979ea280c1c6ba53550fafbe  opcodes/lm32-ibld.c
+5601b608a19d4e7c19b134a458df22d7  opcodes/lm32-opc.c
+4040795b40e856e403a736b7203f8c00  opcodes/lm32-opc.h
+465fca89973240988d539b7965f54034  opcodes/lm32-opinst.c
+6cd99590cdb5cc96648741f375819ee1  opcodes/m10200-dis.c
+2537fd35553e9abc7f73b09a9dcc8448  opcodes/m10200-opc.c
+6fa875346f1ecf4d6769949d0b077238  opcodes/m10300-dis.c
+3d215d208dbcadd93eeb6081f02f430c  opcodes/m10300-opc.c
+06bb0f0061213535accab5622a35f351  opcodes/m32c-asm.c
+fa21aa9c6fa0ee3c65707a2107f4a8d7  opcodes/m32c-desc.c
+0fb3ac51dae47688313a569d8de4f428  opcodes/m32c-desc.h
+0496693c42f793ba7937f31550e43ed9  opcodes/m32c-dis.c
+018c5daa636e0f4d8314c9b28d8a53ba  opcodes/m32c-ibld.c
+4748be6f2f7d4d7a235f63cc4811c0ed  opcodes/m32c-opc.c
+e5988e4840e03c87f4d66d0b39795c13  opcodes/m32c-opc.h
+3243c0c46a1d3e2fd24774a641e1e55e  opcodes/m32r-asm.c
+96aed3db7a72a80f1ec90ac29ef8e1a8  opcodes/m32r-desc.c
+c4a5df1a398db76fa7547a9aff9897bf  opcodes/m32r-desc.h
+2468ce49a9c806bdfbaf94ba8c7902c9  opcodes/m32r-dis.c
+2f35ebaa942b414631c2b55aedc1531c  opcodes/m32r-ibld.c
+64ae4f82595cb61b72149e7e22a42f27  opcodes/m32r-opc.c
+4f37bce53e8b1a1d85fb3ed8b9b7cf15  opcodes/m32r-opc.h
+9485c677e8907524837c1e6064a50a31  opcodes/m32r-opinst.c
+c884a02c786bb9ae35cc4e436b6b882c  opcodes/m68hc11-dis.c
+59906efbf7a9eee5f8382a8b30e133da  opcodes/m68hc11-opc.c
+e579c07b45c41fee680a1eafdb382f04  opcodes/m68k-dis.c
+a80c93744c8a702c60a837c98f209c9e  opcodes/m68k-opc.c
+a8a5e99b9b9176f9a932a252fd9ab2a1  opcodes/m88k-dis.c
+d618facc3e8ce8bf3d02ba452e1be6ab  opcodes/MAINTAINERS
+cd3de51e510afe3a415518fd34e10df3  opcodes/Makefile.am
+a06b6c979978772beb0aca907b746289  opcodes/Makefile.in
+3efef7dad61a0eb561346d3047fb7ed8  opcodes/makefile.vms
+5e74f56bfccffa3c7f07f1c90582ca00  opcodes/mcore-dis.c
+4f2dbdd0a873c6ed42373f53f8b07d15  opcodes/mcore-opc.h
+ec40300857408c1294bd36197498f6aa  opcodes/mep-asm.c
+cf75c26734d23b64b24c1f601bec1aa1  opcodes/mep-desc.c
+cb47a206279475ce8c1c2c04b6323556  opcodes/mep-desc.h
+c16e1131cccd650b8d653acfff29cf86  opcodes/mep-dis.c
+cf295dec03869cdad4c38f0398ce247e  opcodes/mep-ibld.c
+49b8de9d8d114222ce4160bea178d4fa  opcodes/mep-opc.c
+053b324ec00ecbe2657583171b8ee60e  opcodes/mep-opc.h
+88aeb8fc5a60fbd8eb32f42fa1964a7d  opcodes/microblaze-dis.c
+adf720ae7611c9ed19989e9d6428f638  opcodes/microblaze-dis.h
+6e58e9f9e87531e0295d9277266f25b4  opcodes/microblaze-opc.h
+2146cb07dc8b4c05bc3dad6bc04dcc72  opcodes/microblaze-opcm.h
+8a663e1e504f6a221cb006c8db847d63  opcodes/micromips-opc.c
+f5624a1c2820f12f6f69cd427f7f56a9  opcodes/mips-dis.c
+661e2777783e3a3e925d0e4595ac223a  opcodes/mips-opc.c
+4d4dad5b6ae89dc8c2b4398b1f4d9bdd  opcodes/mips16-opc.c
+70059e50d54f0a65c674d08a3c5650e0  opcodes/mmix-dis.c
+5d3ce00c0af1e8be47a84b7a0b24b237  opcodes/mmix-opc.c
+7d36a0b59192414bfc95f9f924f9fa7f  opcodes/moxie-dis.c
+a026dda6f88b66ca94ba83599b8f717c  opcodes/moxie-opc.c
+e7ce22020a7dbebf739b04a1aaf94967  opcodes/msp430-dis.c
+d51d9a5a27aabe5c992e2bda4657b73f  opcodes/mt-asm.c
+67a08e35431b47d3fd02fa6672e87b52  opcodes/mt-desc.c
+c50d1471d263342c49d33f6d4237c703  opcodes/mt-desc.h
+e4f21e1b452a0c14ca01c65f181531ad  opcodes/mt-dis.c
+e1a2f3897ca5248d5c164e47f725b20f  opcodes/mt-ibld.c
+c18b2d837279ebf8a89ab05db8b952b3  opcodes/mt-opc.c
+9892e9aa135881086dae669b8bc3d733  opcodes/mt-opc.h
+38cff44b34c951a39dc2e3cff10595f2  opcodes/ns32k-dis.c
+15666d286846ee3492843dcb4642df12  opcodes/opc2c.c
+6311a9f7c625e9f417286a3490f39d4d  opcodes/openrisc-asm.c
+a636d91f3e2b5c8340fa91e4eb11a8d5  opcodes/openrisc-desc.c
+3ce025c4ac4f565d5decc09b2965d5fe  opcodes/openrisc-desc.h
+3bd3592ada34ee1b8c9c1fc1b9a3d8bc  opcodes/openrisc-dis.c
+99aac5d9a6a4263c8bf14244df8b1a7e  opcodes/openrisc-ibld.c
+b703a698570619af12334f30eeffd41c  opcodes/openrisc-opc.c
+a0ba79c35d1a39d977e6019ba1cedfd9  opcodes/openrisc-opc.h
+ddb3324288d8b89a8d21cc42936fd320  opcodes/opintl.h
+e1ef1b7be22c0bb600c200c402a1ca03  opcodes/or32-dis.c
+084b26c55650090e5ea056ea4364a16e  opcodes/or32-opc.c
+2e878a17084801b0c09d6edae4e65862  opcodes/pdp11-dis.c
+546f13ebe3df55e2efcbca2e76695a7c  opcodes/pdp11-opc.c
+7c044dbd081ea712eb68d6fbffe19b00  opcodes/pj-dis.c
+f9282da1105aa1d5aaa561bad2ec6e31  opcodes/pj-opc.c
+40631143014bf28aa6c4c18fb42c7e3f  opcodes/po/da.gmo
+08644663c098c4faa0a75ef257ff85de  opcodes/po/da.po
+6881ecf19052fe945c5dfefc588207ab  opcodes/po/de.gmo
+baba2506d17c4e2214d6fdd5868e6699  opcodes/po/de.po
+4fc385a3d1a922817163a002c5351ffc  opcodes/po/es.gmo
+7572cc997d245129c25487fe7540d0ac  opcodes/po/es.po
+ea02e3cbcae7924813b49db479c2faf0  opcodes/po/fi.gmo
+c7a095e4298b4afc1a68ca0a32e9c636  opcodes/po/fi.po
+0354d8ebde8359a359d0703d9d897ba8  opcodes/po/fr.gmo
+8784d443527b3837ccdbd6baab60763a  opcodes/po/fr.po
+aaa7913c4672954f5afe196a57bea399  opcodes/po/ga.gmo
+a5961a0281569011fb2468afebe4c4d8  opcodes/po/ga.po
+bbdc560c49ae729616af290d86d1801a  opcodes/po/id.gmo
+9b0083cb5b9854569bfd39fb4e432099  opcodes/po/id.po
+ae6d82cae94b6dbf83af04ece662faf8  opcodes/po/Make-in
+6b7f6db13ec1f340c587ccd58c898e8b  opcodes/po/nl.gmo
+55b6639559777f04aadc075e51744b12  opcodes/po/nl.po
+46e9a8a86e5042957d02f97f1a74fd4a  opcodes/po/opcodes.pot
+05992528e39c82065c58f8a092b34b54  opcodes/po/POTFILES.in
+1b79e075af1926ef6736fa317f054702  opcodes/po/pt_BR.gmo
+30f5fa421474edf39ae99a8985bd42e9  opcodes/po/pt_BR.po
+e216f1583ca03a04f8849dfb96b59c3f  opcodes/po/ro.gmo
+27e9fec6ee5c546b5d5f4afb80b287ed  opcodes/po/ro.po
+d7c42d78dd00ae4c8b71fecb736fd17c  opcodes/po/sv.gmo
+45db317868bfb202300160e0657f06ea  opcodes/po/sv.po
+179cd41f0e8af51dd577fd5d7ab36c79  opcodes/po/tr.gmo
+8ddcec300546b39bc1d9a13098637b64  opcodes/po/tr.po
+d47776e427a062eaf76832cfe02c122b  opcodes/po/vi.gmo
+0205ef8d6d910165612939b103d9ccf7  opcodes/po/vi.po
+6e7ae21e20fe177fba4c9c7fe8afa55a  opcodes/po/zh_CN.gmo
+0928658424d3439f5dcaa21464ac43b6  opcodes/po/zh_CN.po
+6a498da450dd7dd90801d79074190f23  opcodes/ppc-dis.c
+62fdb8d0bc7f57c922dfb073678818e6  opcodes/ppc-opc.c
+8c4cce1349402f40f44be6d6967d9c7f  opcodes/rx-decode.c
+fad0cf8f9da36f320dd8a4c56a9f6743  opcodes/rx-decode.opc
+dc4ea6e70e4d38be3e566aae78971374  opcodes/rx-dis.c
+7c424942718f1a04585a8fdbb5ff7744  opcodes/s390-dis.c
+056a82808818c3d02e5220f1604304f1  opcodes/s390-mkopc.c
+db37da8a908aea2ec57ee6cec5757fed  opcodes/s390-opc.c
+e9dde8054000defabe4827d4191bf107  opcodes/s390-opc.txt
+9dc03a304cf6c2651ec5edcf970ee417  opcodes/score-dis.c
+84efbd963f1573bab84ce05f7ad4e58d  opcodes/score-opc.h
+a91452ca1d7ab6a941a364d974149852  opcodes/score7-dis.c
+87f89485f60a37d02ce5c4df842ecb26  opcodes/sh-dis.c
+aea44dd53e979c11216c7c3fc7848fe0  opcodes/sh-opc.h
+a4ff1ccc184718e2866819ee8abd273b  opcodes/sh64-dis.c
+ba68ff46225ffa4fc3cf57c14bc5d09e  opcodes/sh64-opc.c
+4500a9749b3a81ef89fb50be85a4bedf  opcodes/sh64-opc.h
+25038d14a858f8b0c89c550c67e1fe08  opcodes/sparc-dis.c
+abd258660a482d4f53178ccabf20202e  opcodes/sparc-opc.c
+d46eddeb5c24a897ece9911d8e7775f3  opcodes/spu-dis.c
+d2cd7ae58ae776e075b0d64bb18a5f76  opcodes/spu-opc.c
+1ded054093de910d9786c62bc4fe8cc6  opcodes/stamp-h.in
+e8ec6515ba869ddb5a4f64987448830e  opcodes/sysdep.h
+b6c8df366df6d1bf517368283a3e83bc  opcodes/tic30-dis.c
+d8bd324a75e601ace2b2d2eb4a525e52  opcodes/tic4x-dis.c
+e9fab875e373c0f0509849a0c4311a22  opcodes/tic54x-dis.c
+ea7d1d4700e2cc534f624f3ae366117d  opcodes/tic54x-opc.c
+d8b41e742a6b046ccffae75f9d22f1cf  opcodes/tic6x-dis.c
+0b799451ba231a6be1a404f1d6b2be41  opcodes/tic80-dis.c
+0bffeecc20e5f0456dc2f1ba689d9fa9  opcodes/tic80-opc.c
+0c2c4900730316dfad0cc55b494d85c3  opcodes/tilegx-dis.c
+8361ba1f35dd1f074e3eb46d2e900807  opcodes/tilegx-opc.c
+43a724eca5dc465cb67a13338f93d68d  opcodes/tilepro-dis.c
+bd957ced2786a05389ebf9156ac2b2ac  opcodes/tilepro-opc.c
+c290d133df7afa3924a02d6db20e2fb0  opcodes/v850-dis.c
+5f4f1836a2c8fcc24a3d1ce5304c150b  opcodes/v850-opc.c
+0f83318013675dffa18582b207263449  opcodes/vax-dis.c
+4760e70a223de43a1a22033ca2e21dda  opcodes/w65-dis.c
+072127e2c22b9ea5599f349c097ebbc1  opcodes/w65-opc.h
+9760faa524bc333d3d8ea4cbff08e2aa  opcodes/xc16x-asm.c
+61ee16ff3ea71974250aa3f3b6fbddc1  opcodes/xc16x-desc.c
+d2d8d28ec86ecb0ad1138e8bbc71a99e  opcodes/xc16x-desc.h
+7d4951c78448cb3d3f7d85842a619153  opcodes/xc16x-dis.c
+f1a8c5a5233adec0f43885f0967f5c5c  opcodes/xc16x-ibld.c
+886733cd9cd944bd6b70785e53b0f69b  opcodes/xc16x-opc.c
+0483c849ed60ff25db78f503bd8a84e0  opcodes/xc16x-opc.h
+3a6f9d4b824578571fcd952ffbfe589b  opcodes/xstormy16-asm.c
+41ee4e0a4f42e0d396adfce5d0ca7d5f  opcodes/xstormy16-desc.c
+10713cd53a68ad189219343ae17bb441  opcodes/xstormy16-desc.h
+2156873e893b64e765646887bb056324  opcodes/xstormy16-dis.c
+18d5a80d2b4910d879a88197eb1627ad  opcodes/xstormy16-ibld.c
+953957d3d7b43d96528448b2044227c4  opcodes/xstormy16-opc.c
+099f445cf3df0fb0724aaf81ab3a3ff9  opcodes/xstormy16-opc.h
+05434a9d71725aeef1d877bbf65fee25  opcodes/xtensa-dis.c
+48a1de2a08d81135c59cce49900c06bd  opcodes/z80-dis.c
+b73735f570dac4f2ad37d5e3848d01a0  opcodes/z8k-dis.c
+e349344d63e18942681c442ad564c34c  opcodes/z8k-opc.h
+d41e0b39d53a131bb560583587e3dadf  opcodes/z8kgen.c
+9ded84c8fb1840e68c467da08880fe07  setup.com
+9bb037294df2451327cdaf73d040a851  src-release
+cf2baa0854f564a7785307e79f155efc  symlink-tree
+6ffd0f415aea2960cac41434e6d904bb  texinfo/texinfo.tex
+69678e72941d681665c3731bfb3044ab  ylwrap
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/missing sdcc-3.2.0+dfsg/support/sdbinutils/missing
--- sdcc-3.1.0+dfsg/support/sdbinutils/missing	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/missing	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,376 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+
+scriptversion=2009-04-28.21; # UTC
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case $1 in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
+  ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# normalize program name to check for.
+program=`echo "$1" | sed '
+  s/^gnu-//; t
+  s/^gnu//; t
+  s/^g//; t'`
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).  This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+  lex*|yacc*)
+    # Not GNU programs, they don't have --version.
+    ;;
+
+  tar*)
+    if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       exit 1
+    fi
+    ;;
+
+  *)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
+    fi
+    ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+  aclocal*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case $f in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+
+  automake*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te*)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
+    ;;
+
+  bison*|yacc*)
+    echo 1>&2 "\
+WARNING: \`$1' $msg.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if test $# -ne 1; then
+        eval LASTARG="\${$#}"
+	case $LASTARG in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if test ! -f y.tab.h; then
+	echo >y.tab.h
+    fi
+    if test ! -f y.tab.c; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex*|flex*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if test $# -ne 1; then
+        eval LASTARG="\${$#}"
+	case $LASTARG in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if test ! -f lex.yy.c; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit $?
+    fi
+    ;;
+
+  makeinfo*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    # The file to touch is that specified with -o ...
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -z "$file"; then
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* \([^ ]*\) *$/\1/
+	  p
+	  q
+	}' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
+    touch $file
+    ;;
+
+  tar*)
+    shift
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar "$@" && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar "$@" && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case $firstarg in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+	case $firstarg in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequisites for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/mkdep sdcc-3.2.0+dfsg/support/sdbinutils/mkdep
--- sdcc-3.1.0+dfsg/support/sdbinutils/mkdep	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/mkdep	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,87 @@
+#!/bin/sh -
+#
+# Copyright (c) 1987 Regents of the University of California.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms are permitted
+# provided that the above copyright notice and this paragraph are
+# duplicated in all such forms and that any documentation,
+# advertising materials, and other materials related to such
+# distribution and use acknowledge that the software was developed
+# by the University of California, Berkeley.  The name of the
+# University may not be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+#
+#	@(#)mkdep.sh	5.12 (Berkeley) 6/30/88
+#
+
+MAKE=Makefile			# default makefile name is "Makefile"
+
+while :
+	do case "$1" in
+		# -f allows you to select a makefile name
+		-f)
+			MAKE=$2
+			shift; shift ;;
+
+		# the -p flag produces "program: program.c" style dependencies
+		# so .o's don't get produced
+		-p)
+			SED='s;\.o;;'
+			shift ;;
+		*)
+			break ;;
+	esac
+done
+
+if [ $# = 0 ] ; then
+	echo 'usage: mkdep [-p] [-f makefile] [flags] file ...'
+	exit 1
+fi
+
+if [ ! -w $MAKE ]; then
+	echo "mkdep: no writeable file \"$MAKE\""
+	exit 1
+fi
+
+TMP=/tmp/mkdep$$
+
+trap 'rm -f $TMP ; exit 1' 1 2 3 13 15
+
+cp $MAKE ${MAKE}.bak
+
+sed -e '/DO NOT DELETE THIS LINE/,$d' < $MAKE > $TMP
+
+cat << _EOF_ >> $TMP
+# DO NOT DELETE THIS LINE -- mkdep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+_EOF_
+
+# If your compiler doesn't have -M, add it.  If you can't, the next two
+# lines will try and replace the "cc -M".  The real problem is that this
+# hack can't deal with anything that requires a search path, and doesn't
+# even try for anything using bracket (<>) syntax.
+#
+# egrep '^#include[ 	]*".*"' /dev/null $* |
+# sed -e 's/:[^"]*"\([^"]*\)".*/: \1/' -e 's/\.c/.o/' |
+
+gcc -MM $* |
+sed "
+	s; \./; ;g
+	$SED" >> $TMP
+
+cat << _EOF_ >> $TMP
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+_EOF_
+
+# copy to preserve permissions
+cp $TMP $MAKE
+rm -f ${MAKE}.bak $TMP
+exit 0
+
+
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/mkinstalldirs sdcc-3.2.0+dfsg/support/sdbinutils/mkinstalldirs
--- sdcc-3.1.0+dfsg/support/sdbinutils/mkinstalldirs	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/mkinstalldirs	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,162 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+
+scriptversion=2009-04-28.21; # UTC
+
+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain.
+#
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+IFS=" ""	$nl"
+errstatus=0
+dirmode=
+
+usage="\
+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
+
+Create each directory DIR (with mode MODE, if specified), including all
+leading file name components.
+
+Report bugs to <bug-automake@gnu.org>."
+
+# process command line arguments
+while test $# -gt 0 ; do
+  case $1 in
+    -h | --help | --h*)         # -h for help
+      echo "$usage"
+      exit $?
+      ;;
+    -m)                         # -m PERM arg
+      shift
+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
+      dirmode=$1
+      shift
+      ;;
+    --version)
+      echo "$0 $scriptversion"
+      exit $?
+      ;;
+    --)                         # stop option processing
+      shift
+      break
+      ;;
+    -*)                         # unknown option
+      echo "$usage" 1>&2
+      exit 1
+      ;;
+    *)                          # first non-opt arg
+      break
+      ;;
+  esac
+done
+
+for file
+do
+  if test -d "$file"; then
+    shift
+  else
+    break
+  fi
+done
+
+case $# in
+  0) exit 0 ;;
+esac
+
+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
+# mkdir -p a/c at the same time, both will detect that a is missing,
+# one will create a, then the other will try to create a and die with
+# a "File exists" error.  This is a problem when calling mkinstalldirs
+# from a parallel make.  We use --version in the probe to restrict
+# ourselves to GNU mkdir, which is thread-safe.
+case $dirmode in
+  '')
+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+      echo "mkdir -p -- $*"
+      exec mkdir -p -- "$@"
+    else
+      # On NextStep and OpenStep, the `mkdir' command does not
+      # recognize any option.  It will interpret all options as
+      # directories to create, and then abort because `.' already
+      # exists.
+      test -d ./-p && rmdir ./-p
+      test -d ./--version && rmdir ./--version
+    fi
+    ;;
+  *)
+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+       test ! -d ./--version; then
+      echo "mkdir -m $dirmode -p -- $*"
+      exec mkdir -m "$dirmode" -p -- "$@"
+    else
+      # Clean up after NextStep and OpenStep mkdir.
+      for d in ./-m ./-p ./--version "./$dirmode";
+      do
+        test -d $d && rmdir $d
+      done
+    fi
+    ;;
+esac
+
+for file
+do
+  case $file in
+    /*) pathcomp=/ ;;
+    *)  pathcomp= ;;
+  esac
+  oIFS=$IFS
+  IFS=/
+  set fnord $file
+  shift
+  IFS=$oIFS
+
+  for d
+  do
+    test "x$d" = x && continue
+
+    pathcomp=$pathcomp$d
+    case $pathcomp in
+      -*) pathcomp=./$pathcomp ;;
+    esac
+
+    if test ! -d "$pathcomp"; then
+      echo "mkdir $pathcomp"
+
+      mkdir "$pathcomp" || lasterr=$?
+
+      if test ! -d "$pathcomp"; then
+	errstatus=$lasterr
+      else
+	if test ! -z "$dirmode"; then
+	  echo "chmod $dirmode $pathcomp"
+	  lasterr=
+	  chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+	  if test ! -z "$lasterr"; then
+	    errstatus=$lasterr
+	  fi
+	fi
+      fi
+    fi
+
+    pathcomp=$pathcomp/
+  done
+done
+
+exit $errstatus
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/mlog.txt sdcc-3.2.0+dfsg/support/sdbinutils/mlog.txt
--- sdcc-3.1.0+dfsg/support/sdbinutils/mlog.txt	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/mlog.txt	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,395 @@
+make[1]: Entering directory `/home/borutr/svn_snpashots/sdcc/sdcc/sdbinutils'
+Configuring in ./libiberty
+configure: loading cache ./config.cache
+checking whether to enable maintainer-specific portions of Makefiles... no
+checking for makeinfo... (cached) makeinfo --split-size=5000000
+checking for perl... (cached) perl
+checking build system type... (cached) x86_64-unknown-linux-gnu
+checking host system type... (cached) x86_64-unknown-linux-gnu
+checking for x86_64-unknown-linux-gnu-ar... (cached) ar
+checking for x86_64-unknown-linux-gnu-ranlib... (cached) ranlib
+checking for x86_64-unknown-linux-gnu-gcc... (cached) gcc
+checking for C compiler default output file name... a.out
+checking whether the C compiler works... yes
+checking whether we are cross compiling... no
+checking for suffix of executables... 
+checking for suffix of object files... (cached) o
+checking whether we are using the GNU C compiler... (cached) yes
+checking whether gcc accepts -g... (cached) yes
+checking for gcc option to accept ISO C89... (cached) none needed
+checking for special C compiler options needed for large files... (cached) no
+checking for _FILE_OFFSET_BITS value needed for large files... (cached) no
+checking how to run the C preprocessor... (cached) gcc -E
+checking whether gcc supports -W... (cached) yes
+checking whether gcc supports -Wall... (cached) yes
+checking whether gcc supports -Wwrite-strings... (cached) yes
+checking whether gcc supports -Wc++-compat... (cached) yes
+checking whether gcc supports -Wstrict-prototypes... (cached) yes
+checking whether gcc supports -pedantic ... (cached) yes
+checking whether gcc and cc understand -c and -o together... (cached) yes
+checking for an ANSI C-conforming const... (cached) yes
+checking for inline... (cached) inline
+checking for grep that handles long lines and -e... (cached) /bin/grep
+checking for egrep... (cached) /bin/grep -E
+checking for ANSI C header files... (cached) yes
+checking for sys/types.h... (cached) yes
+checking for sys/stat.h... (cached) yes
+checking for stdlib.h... (cached) yes
+checking for string.h... (cached) yes
+checking for memory.h... (cached) yes
+checking for strings.h... (cached) yes
+checking for inttypes.h... (cached) yes
+checking for stdint.h... (cached) yes
+checking for unistd.h... (cached) yes
+checking whether byte ordering is bigendian... (cached) no
+checking for a BSD-compatible install... /usr/bin/install -c
+checking for sys/file.h... (cached) yes
+checking for sys/param.h... (cached) yes
+checking for limits.h... (cached) yes
+checking for stdlib.h... (cached) yes
+checking for malloc.h... (cached) yes
+checking for string.h... (cached) yes
+checking for unistd.h... (cached) yes
+checking for strings.h... (cached) yes
+checking for sys/time.h... (cached) yes
+checking for time.h... (cached) yes
+checking for sys/resource.h... (cached) yes
+checking for sys/stat.h... (cached) yes
+checking for sys/mman.h... (cached) yes
+checking for fcntl.h... (cached) yes
+checking for alloca.h... (cached) yes
+checking for sys/pstat.h... (cached) no
+checking for sys/sysmp.h... (cached) no
+checking for sys/sysinfo.h... (cached) yes
+checking for machine/hal_sysinfo.h... (cached) no
+checking for sys/table.h... (cached) no
+checking for sys/sysctl.h... (cached) yes
+checking for sys/systemcfg.h... (cached) no
+checking for stdint.h... (cached) yes
+checking for stdio_ext.h... (cached) yes
+checking for process.h... (cached) no
+checking for sys/prctl.h... (cached) yes
+checking for sys/wait.h that is POSIX.1 compatible... (cached) yes
+checking whether time.h and sys/time.h may both be included... (cached) yes
+checking whether errno must be declared... (cached) no
+checking size of int... (cached) 4
+checking for a 64-bit type... (cached) uint64_t
+checking for intptr_t... (cached) yes
+checking for uintptr_t... (cached) yes
+checking for ssize_t... (cached) yes
+checking for pid_t... (cached) yes
+checking for library containing strerror... (cached) none required
+checking for asprintf... (cached) yes
+checking for atexit... (cached) yes
+checking for basename... (cached) yes
+checking for bcmp... (cached) yes
+checking for bcopy... (cached) yes
+checking for bsearch... (cached) yes
+checking for bzero... (cached) yes
+checking for calloc... (cached) yes
+checking for clock... (cached) yes
+checking for ffs... (cached) yes
+checking for getcwd... (cached) yes
+checking for getpagesize... (cached) yes
+checking for gettimeofday... (cached) yes
+checking for index... (cached) yes
+checking for insque... (cached) yes
+checking for memchr... (cached) yes
+checking for memcmp... (cached) yes
+checking for memcpy... (cached) yes
+checking for memmem... (cached) yes
+checking for memmove... (cached) yes
+checking for mempcpy... (cached) yes
+checking for memset... (cached) yes
+checking for mkstemps... (cached) yes
+checking for putenv... (cached) yes
+checking for random... (cached) yes
+checking for rename... (cached) yes
+checking for rindex... (cached) yes
+checking for setenv... (cached) yes
+checking for snprintf... (cached) yes
+checking for sigsetmask... (cached) yes
+checking for stpcpy... (cached) yes
+checking for stpncpy... (cached) yes
+checking for strcasecmp... (cached) yes
+checking for strchr... (cached) yes
+checking for strdup... (cached) yes
+checking for strncasecmp... (cached) yes
+checking for strndup... (cached) yes
+checking for strrchr... (cached) yes
+checking for strstr... (cached) yes
+checking for strtod... (cached) yes
+checking for strtol... (cached) yes
+checking for strtoul... (cached) yes
+checking for strverscmp... (cached) yes
+checking for tmpnam... (cached) yes
+checking for vasprintf... (cached) yes
+checking for vfprintf... (cached) yes
+checking for vprintf... (cached) yes
+checking for vsnprintf... (cached) yes
+checking for vsprintf... (cached) yes
+checking for waitpid... (cached) yes
+checking for setproctitle... (cached) no
+checking whether alloca needs Cray hooks... (cached) no
+checking stack direction for C alloca... (cached) -1
+checking for vfork.h... (cached) no
+checking for fork... (cached) yes
+checking for vfork... (cached) yes
+checking for working fork... (cached) yes
+checking for working vfork... (cached) yes
+checking for _doprnt... (cached) no
+checking for sys_errlist... (cached) yes
+checking for sys_nerr... (cached) yes
+checking for sys_siglist... (cached) yes
+checking for external symbol _system_configuration... no
+checking for __fsetlocking... (cached) yes
+checking for canonicalize_file_name... (cached) yes
+checking for dup3... (cached) yes
+checking for getrlimit... (cached) yes
+checking for getrusage... (cached) yes
+checking for getsysinfo... (cached) no
+checking for gettimeofday... (cached) yes
+checking for on_exit... (cached) yes
+checking for psignal... (cached) yes
+checking for pstat_getdynamic... (cached) no
+checking for pstat_getstatic... (cached) no
+checking for realpath... (cached) yes
+checking for setrlimit... (cached) yes
+checking for sbrk... (cached) yes
+checking for spawnve... (cached) no
+checking for spawnvpe... (cached) no
+checking for strerror... (cached) yes
+checking for strsignal... (cached) yes
+checking for sysconf... (cached) yes
+checking for sysctl... (cached) yes
+checking for sysmp... (cached) no
+checking for table... (cached) no
+checking for times... (cached) yes
+checking for wait3... (cached) yes
+checking for wait4... (cached) yes
+checking whether basename is declared... (cached) no
+checking whether ffs is declared... (cached) yes
+checking whether asprintf is declared... (cached) no
+checking whether vasprintf is declared... (cached) no
+checking whether snprintf is declared... (cached) yes
+checking whether vsnprintf is declared... (cached) yes
+checking whether calloc is declared... (cached) yes
+checking whether getenv is declared... (cached) yes
+checking whether getopt is declared... (cached) yes
+checking whether malloc is declared... (cached) yes
+checking whether realloc is declared... (cached) yes
+checking whether sbrk is declared... (cached) yes
+checking whether strverscmp is declared... (cached) no
+checking whether canonicalize_file_name must be declared... (cached) yes
+checking for stdlib.h... (cached) yes
+checking for unistd.h... (cached) yes
+checking for getpagesize... (cached) yes
+checking for working mmap... (cached) yes
+checking for working strncmp... (cached) yes
+configure: creating ./config.status
+config.status: creating Makefile
+config.status: creating testsuite/Makefile
+config.status: creating config.h
+config.status: executing default commands
+Configuring in ./bfd
+configure: loading cache ./config.cache
+checking build system type... (cached) x86_64-unknown-linux-gnu
+checking host system type... (cached) x86_64-unknown-linux-gnu
+checking target system type... (cached) x86_64-unknown-linux-gnu
+checking for x86_64-unknown-linux-gnu-gcc... (cached) gcc
+checking for C compiler default output file name... a.out
+checking whether the C compiler works... yes
+checking whether we are cross compiling... no
+checking for suffix of executables... 
+checking for suffix of object files... (cached) o
+checking whether we are using the GNU C compiler... (cached) yes
+checking whether gcc accepts -g... (cached) yes
+checking for gcc option to accept ISO C89... (cached) none needed
+checking for library containing strerror... (cached) none required
+checking for a BSD-compatible install... /usr/bin/install -c
+checking whether build environment is sane... yes
+checking for a thread-safe mkdir -p... (cached) /bin/mkdir -p
+checking for gawk... (cached) gawk
+checking whether make sets $(MAKE)... (cached) yes
+checking for style of include used by make... GNU
+checking dependency style of gcc... (cached) gcc3
+checking for x86_64-unknown-linux-gnu-ar... (cached) ar
+checking for x86_64-unknown-linux-gnu-ranlib... (cached) ranlib
+checking for x86_64-unknown-linux-gnu-gcc... (cached) gcc
+checking whether we are using the GNU C compiler... (cached) yes
+checking whether gcc accepts -g... (cached) yes
+checking for gcc option to accept ISO C89... (cached) none needed
+checking how to run the C preprocessor... (cached) gcc -E
+checking for grep that handles long lines and -e... (cached) /bin/grep
+checking for egrep... (cached) /bin/grep -E
+checking for ANSI C header files... (cached) yes
+checking for sys/types.h... (cached) yes
+checking for sys/stat.h... (cached) yes
+checking for stdlib.h... (cached) yes
+checking for string.h... (cached) yes
+checking for memory.h... (cached) yes
+checking for strings.h... (cached) yes
+checking for inttypes.h... (cached) yes
+checking for stdint.h... (cached) yes
+checking for unistd.h... (cached) yes
+checking for minix/config.h... (cached) no
+checking whether it is safe to define __EXTENSIONS__... (cached) yes
+checking how to print strings... printf
+checking for a sed that does not truncate output... (cached) /bin/sed
+checking for fgrep... (cached) /bin/grep -F
+checking for ld used by gcc... (cached) ld
+checking if the linker (ld) is GNU ld... (cached) yes
+checking for BSD- or MS-compatible name lister (nm)... (cached) nm
+checking the name lister (nm) interface... (cached) BSD nm
+checking whether ln -s works... yes
+checking the maximum length of command line arguments... (cached) 3458764513820540925
+checking whether the shell understands some XSI constructs... yes
+checking whether the shell understands "+="... yes
+checking for ld option to reload object files... (cached) -r
+checking for x86_64-unknown-linux-gnu-objdump... (cached) objdump
+checking how to recognize dependent libraries... (cached) pass_all
+checking for x86_64-unknown-linux-gnu-ar... (cached) ar
+checking for x86_64-unknown-linux-gnu-strip... no
+checking for strip... (cached) strip
+checking for x86_64-unknown-linux-gnu-ranlib... (cached) ranlib
+checking command to parse nm output from gcc object... (cached) ok
+checking for dlfcn.h... (cached) yes
+checking for objdir... (cached) .libs
+checking if gcc supports -fno-rtti -fno-exceptions... (cached) no
+checking for gcc option to produce PIC... -fPIC -DPIC
+checking if gcc PIC flag -fPIC -DPIC works... (cached) yes
+checking if gcc static flag -static works... (cached) yes
+checking if gcc supports -c -o file.o... (cached) yes
+checking if gcc supports -c -o file.o... (cached) yes
+checking whether the gcc linker (ld -m elf_x86_64) supports shared libraries... yes
+checking dynamic linker characteristics... (cached) GNU/Linux ld.so
+checking how to hardcode library paths into programs... immediate
+checking for shl_load... (cached) no
+checking for shl_load in -ldld... (cached) no
+checking for dlopen... (cached) no
+checking for dlopen in -ldl... (cached) yes
+checking whether a program can dlopen itself... (cached) yes
+checking whether a statically linked program can dlopen itself... (cached) no
+checking whether stripping libraries is possible... yes
+checking if libtool supports shared libraries... yes
+checking whether to build shared libraries... no
+checking whether to build static libraries... yes
+checking for special C compiler options needed for large files... (cached) no
+checking for _FILE_OFFSET_BITS value needed for large files... (cached) no
+Setting warning flags = -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Werror
+checking whether to enable maintainer-specific portions of Makefiles... no
+checking whether to install libbfd... yes
+checking whether NLS is requested... no
+checking whether NLS is requested... yes
+checking for msgfmt... (cached) /usr/bin/msgfmt
+checking for gmsgfmt... (cached) /usr/bin/msgfmt
+checking for xgettext... (cached) /usr/bin/xgettext
+checking for msgmerge... (cached) /usr/bin/msgmerge
+checking size of long long... (cached) 8
+checking size of void *... (cached) 8
+checking size of long... (cached) 8
+checking for alloca.h... (cached) yes
+checking for stddef.h... (cached) yes
+checking for string.h... (cached) yes
+checking for strings.h... (cached) yes
+checking for stdlib.h... (cached) yes
+checking for time.h... (cached) yes
+checking for unistd.h... (cached) yes
+checking for fcntl.h... (cached) yes
+checking for sys/file.h... (cached) yes
+checking for sys/time.h... (cached) yes
+checking for sys/stat.h... (cached) yes
+looking for a compliant stdint.h in stdint.h, checking for uintmax_t... yes
+checking for uintptr_t... yes
+checking for int_least32_t... yes
+checking for int_fast32_t... yes
+checking for uint64_t... yes
+checking what to include in bfd_stdint.h... stdint.h (already complete)
+checking whether time.h and sys/time.h may both be included... (cached) yes
+checking for dirent.h that defines DIR... (cached) yes
+checking for library containing opendir... (cached) none required
+checking whether string.h and strings.h may both be included... (cached) yes
+checking for fcntl... (cached) yes
+checking for getpagesize... (cached) yes
+checking for setitimer... (cached) yes
+checking for sysconf... (cached) yes
+checking for fdopen... (cached) yes
+checking for getuid... (cached) yes
+checking for getgid... (cached) yes
+checking for fileno... (cached) yes
+checking for strtoull... (cached) yes
+checking whether basename is declared... (cached) yes
+checking whether ftello is declared... (cached) yes
+checking whether ftello64 is declared... (cached) yes
+checking whether fseeko is declared... (cached) yes
+checking whether fseeko64 is declared... (cached) yes
+checking whether ffs is declared... (cached) yes
+checking whether free is declared... (cached) yes
+checking whether getenv is declared... (cached) yes
+checking whether malloc is declared... (cached) yes
+checking whether realloc is declared... (cached) yes
+checking whether stpcpy is declared... (cached) yes
+checking whether strstr is declared... (cached) yes
+checking whether snprintf is declared... (cached) yes
+checking whether vsnprintf is declared... (cached) yes
+checking for library containing zlibVersion... (cached) -lz
+checking for zlib.h... (cached) yes
+checking for sys/procfs.h... (cached) yes
+checking for prstatus_t in sys/procfs.h... (cached) yes
+checking for prstatus32_t in sys/procfs.h... (cached) no
+checking for prstatus_t.pr_who in sys/procfs.h... (cached) no
+checking for prstatus32_t.pr_who in sys/procfs.h... (cached) no
+checking for pstatus_t in sys/procfs.h... (cached) no
+checking for pxstatus_t in sys/procfs.h... (cached) no
+checking for pstatus32_t in sys/procfs.h... (cached) no
+checking for prpsinfo_t in sys/procfs.h... (cached) yes
+checking for prpsinfo_t.pr_pid in sys/procfs.h... (cached) yes
+checking for prpsinfo32_t in sys/procfs.h... (cached) no
+checking for prpsinfo32_t.pr_pid in sys/procfs.h... (cached) no
+checking for psinfo_t in sys/procfs.h... (cached) no
+checking for psinfo_t.pr_pid in sys/procfs.h... (cached) no
+checking for psinfo32_t in sys/procfs.h... (cached) no
+checking for psinfo32_t.pr_pid in sys/procfs.h... (cached) no
+checking for lwpstatus_t in sys/procfs.h... (cached) no
+checking for lwpxstatus_t in sys/procfs.h... (cached) no
+checking for lwpstatus_t.pr_context in sys/procfs.h... (cached) no
+checking for lwpstatus_t.pr_reg in sys/procfs.h... (cached) no
+checking for lwpstatus_t.pr_fpreg in sys/procfs.h... (cached) no
+checking for win32_pstatus_t in sys/procfs.h... (cached) no
+checking linker --as-needed support... (cached) yes
+checking for cos in -lm... (cached) yes
+checking for gcc version with buggy 64-bit support... no
+checking for ftello... (cached) yes
+checking for ftello64... (cached) yes
+checking for fseeko... (cached) yes
+checking for fseeko64... (cached) yes
+checking for fopen64... (cached) yes
+checking size of off_t... (cached) 8
+checking file_ptr type... BFD_HOST_64_BIT
+checking for stdlib.h... (cached) yes
+checking for unistd.h... (cached) yes
+checking for getpagesize... (cached) yes
+checking for working mmap... (cached) yes
+checking for madvise... (cached) yes
+checking for mprotect... (cached) yes
+configure: creating ./config.status
+config.status: creating Makefile
+config.status: creating doc/Makefile
+config.status: creating bfd-in3.h
+config.status: creating po/Makefile.in
+config.status: creating config.h
+config.status: config.h is unchanged
+config.status: executing depfiles commands
+config.status: executing libtool commands
+config.status: executing default-1 commands
+config.status: executing bfd_stdint.h commands
+config.status: executing default commands
+make[2]: Entering directory `/home/borutr/svn_snpashots/sdcc/sdcc/sdbinutils/libiberty'
+if [ x"" != x ] && [ ! -d pic ]; then \
+	  mkdir pic; \
+	else true; fi
+touch stamp-picdir
+if [ x"" != x ]; then \
+	  gcc -c -DHAVE_CONFIG_H -g -O2  -I. -I./../include  -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -pedantic   ./regex.c -o pic/regex.o; \
+	else true; fi
+gcc -c -DHAVE_CONFIG_H -g -O2  -I. -I./../include  -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -pedantic  ./regex.c -o regex.o
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/move-if-change sdcc-3.2.0+dfsg/support/sdbinutils/move-if-change
--- sdcc-3.1.0+dfsg/support/sdbinutils/move-if-change	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/move-if-change	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,83 @@
+#!/bin/sh
+# Like mv $1 $2, but if the files are the same, just delete $1.
+# Status is zero if successful, nonzero otherwise.
+
+VERSION='2011-01-28 20:09'; # UTC
+# The definition above must lie within the first 8 lines in order
+# for the Emacs time-stamp write hook (at end) to update it.
+# If you change this file with Emacs, please let the write hook
+# do its job.  Otherwise, update this string manually.
+
+# Copyright (C) 2002-2007, 2009-2011 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+usage="usage: $0 SOURCE DEST"
+
+help="$usage
+  or:  $0 OPTION
+If SOURCE is different than DEST, then move it to DEST; else remove SOURCE.
+
+  --help     display this help and exit
+  --version  output version information and exit
+
+The variable CMPPROG can be used to specify an alternative to \`cmp'.
+
+Report bugs to <bug-gnulib@gnu.org>."
+
+version=`expr "$VERSION" : '\([^ ]*\)'`
+version="move-if-change (gnulib) $version
+Copyright (C) 2011 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law."
+
+cmpprog=${CMPPROG-cmp}
+
+for arg
+do
+  case $arg in
+    --help | --hel | --he | --h)
+      exec echo "$help" ;;
+    --version | --versio | --versi | --vers | --ver | --ve | --v)
+      exec echo "$version" ;;
+    --)
+      shift
+      break ;;
+    -*)
+      echo "$0: invalid option: $arg" >&2
+      exit 1 ;;
+    *)
+      break ;;
+  esac
+done
+
+test $# -eq 2 || { echo "$0: $usage" >&2; exit 1; }
+
+if test -r "$2" && $cmpprog -- "$1" "$2" >/dev/null; then
+  rm -f -- "$1"
+else
+  if mv -f -- "$1" "$2"; then :; else
+    # Ignore failure due to a concurrent move-if-change.
+    test -r "$2" && $cmpprog -- "$1" "$2" >/dev/null && rm -f -- "$1"
+  fi
+fi
+
+## Local Variables:
+## eval: (add-hook 'write-file-hooks 'time-stamp)
+## time-stamp-start: "VERSION='"
+## time-stamp-format: "%:y-%02m-%02d %02H:%02M"
+## time-stamp-time-zone: "UTC"
+## time-stamp-end: "'; # UTC"
+## End:
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/setup.com sdcc-3.2.0+dfsg/support/sdbinutils/setup.com
--- sdcc-3.1.0+dfsg/support/sdbinutils/setup.com	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/setup.com	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,51 @@
+$!
+$! Build procedure
+$!
+$! Note: you need a DCL-compatible gnu make.
+$ MAKE="make381"
+$ OPT=""
+$!
+$ if (P1 .EQS. "CONFIGURE") .OR. (P1 .EQS. "ALL")
+$ then
+$    set def [.bfd]
+$    @configure
+$    set def [-.libiberty]
+$    @configure
+$    set def [-.opcodes]
+$    @configure
+$    set def [-.binutils]
+$    @configure
+$    set def [-.gas]
+$    @configure
+$    set def [-]
+$ endif
+$ if (P1 .EQS. "BUILD") .OR. (P1 .EQS. "ALL")
+$ then
+$   set def [.bfd]
+$   @build
+$   set def [-.libiberty]
+$   @build
+$   set def [-.opcodes]
+$   @build
+$   set def [-.binutils]
+$   @build
+$   set def [-.gas]
+$   @build
+$   set def [-]
+$ endif
+$ if P1 .EQS. "MAKE"
+$ then
+$   ARCH=F$GETSYI("ARCH_NAME")
+$   ARCH=F$EDIT(arch,"UPCASE")
+$   set def [.bfd]
+$   'MAKE "ARCH=''ARCH'" "OPT=''OPT'"
+$   set def [-.libiberty]
+$   'MAKE "ARCH=''ARCH'" "OPT=''OPT'"
+$   set def [-.opcodes]
+$   'MAKE "ARCH=''ARCH'" "OPT=''OPT'"
+$   set def [-.binutils]
+$   'MAKE "ARCH=''ARCH'" "OPT=''OPT'"
+$   set def [-.gas]
+$   'MAKE "ARCH=''ARCH'" "OPT=''OPT'"
+$   set def [-]
+$ endif
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/src-release sdcc-3.2.0+dfsg/support/sdbinutils/src-release
--- sdcc-3.1.0+dfsg/support/sdbinutils/src-release	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/src-release	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,296 @@
+#   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+#   1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+
+# This Makefile contains release scripts for gdb, binutils, and other
+# packages which live in src.  It used to be part of the top level Makefile,
+# but that turned out to be very messy and hard to maintain.
+
+# This stuff really ought to be cleaned up and turned into something other
+# than a Makefile.  As it is it's heavily recursive.
+
+# This is the name of this script (!).  Needed due to horrible recursion.
+SELF = src-release
+
+SHELL = /bin/sh
+
+BZIPPROG = bzip2
+MD5PROG = md5sum
+
+# (Default to avoid splitting info files by setting the threshold high.)
+MAKEINFOFLAGS = --split-size=5000000
+
+# pwd command to use.  Allow user to override default by setting PWDCMD in
+# the environment to account for automounters.  The make variable must not
+# be called PWDCMD, otherwise the value set here is passed to make
+# subprocesses and overrides the setting from the user's environment.
+PWD = $${PWDCMD-pwd}
+
+#
+# Support for building net releases
+
+# Files in devo used in any net release.
+DEVO_SUPPORT= README Makefile.in configure configure.ac \
+	config.guess config.sub config move-if-change \
+	COPYING COPYING.LIB install-sh config-ml.in symlink-tree \
+	mkinstalldirs ltmain.sh missing ylwrap \
+	libtool.m4 ltsugar.m4 ltversion.m4 ltoptions.m4 \
+	Makefile.def Makefile.tpl src-release config.rpath \
+	ChangeLog MAINTAINERS README-maintainer-mode \
+	lt~obsolete.m4 ltgcc.m4 depcomp mkdep compile \
+	COPYING3 COPYING3.LIB
+
+# Files in devo/etc used in any net release.
+ETC_SUPPORT= Makefile.in configure configure.in standards.texi \
+	make-stds.texi standards.info* configure.texi configure.info* \
+	ChangeLog configbuild.* configdev.* fdl.texi texi2pod.pl gnu-oids.texi
+
+
+# When you use `make setup-dirs' or `make taz' you should always redefine
+# this macro.
+SUPPORT_FILES = list-of-support-files-for-tool-in-question
+
+# NOTE: No double quotes in the below.  It is used within shell script
+# as VER="$(VER)"
+VER = `	if grep 'AM_INIT_AUTOMAKE.*BFD_VERSION' $(TOOL)/configure.in >/dev/null 2>&1; then \
+	  sed < bfd/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
+	elif grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \
+	  sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
+	elif test -f $(TOOL)/version.in; then \
+	  head -1 $(TOOL)/version.in; \
+	elif grep VERSION $(TOOL)/Makefile.in > /dev/null 2>&1; then \
+	  sed < $(TOOL)/Makefile.in -n 's/^VERSION *= *//p'; \
+	else \
+	  echo VERSION; \
+	fi`
+PACKAGE = $(TOOL)
+
+.PHONY: taz
+taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
+	$(MAKE) -f $(SELF) do-proto-toplev \
+		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(SUPPORT_FILES)"
+	$(MAKE) -f $(SELF) do-md5sum \
+		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(SUPPORT_FILES)"
+	$(MAKE) -f $(SELF) do-tar \
+		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(SUPPORT_FILES)"
+	$(MAKE) -f $(SELF) do-bz2 \
+		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(SUPPORT_FILES)"
+
+.PHONY: gdb-tar
+gdb-tar: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
+	$(MAKE) -f $(SELF) do-proto-toplev \
+		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(SUPPORT_FILES)"
+	$(MAKE) -f $(SELF) do-md5sum \
+		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(SUPPORT_FILES)"
+	$(MAKE) -f $(SELF) do-djunpack \
+		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(SUPPORT_FILES)"
+	$(MAKE) -f $(SELF) do-tar \
+		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(SUPPORT_FILES)"
+
+.PHONY: gdb-taz
+gdb-taz: gdb-tar $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
+	$(MAKE) -f $(SELF) gdb-tar \
+		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(SUPPORT_FILES)"
+	$(MAKE) -f $(SELF) do-bz2 \
+		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(SUPPORT_FILES)"
+
+.PHONY: do-proto-toplev
+do-proto-toplev: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
+	echo "==> Making $(PACKAGE)-$(VER)/"
+	# Take out texinfo from a few places.
+	sed -e '/^all\.normal: /s/\all-texinfo //' \
+	    -e '/^	install-texinfo /d' \
+	<Makefile.in >tmp
+	mv -f tmp Makefile.in
+	#
+	./configure i686-pc-linux-gnu
+	$(MAKE) configure-host configure-target \
+	    ALL_GCC="" ALL_GCC_C="" ALL_GCC_CXX="" \
+	    CC_FOR_TARGET="$(CC)" CXX_FOR_TARGET="$(CXX)"
+	# Make links, and run "make diststuff" or "make info" when needed.
+	rm -rf proto-toplev ; mkdir proto-toplev
+	set -e ; dirs="$(DEVO_SUPPORT) $(SUPPORT_FILES) $(TOOL)" ; \
+	for d in $$dirs ; do \
+	  if [ -d $$d ]; then \
+	    if [ ! -f $$d/Makefile ] ; then true ; \
+	    elif grep '^diststuff:' $$d/Makefile >/dev/null ; then \
+		(cd $$d ; $(MAKE) MAKEINFOFLAGS="$(MAKEINFOFLAGS)" \
+			  diststuff ) || exit 1 ; \
+	    elif grep '^info:' $$d/Makefile >/dev/null ; then \
+		(cd $$d ; $(MAKE) MAKEINFOFLAGS="$(MAKEINFOFLAGS)" \
+			  info ) || exit 1 ; \
+	    fi ; \
+	    if [ -d $$d/proto-$$d.dir ]; then \
+	      ln -s ../$$d/proto-$$d.dir proto-toplev/$$d ; \
+	    else \
+	      ln -s ../$$d proto-toplev/$$d ; \
+	    fi ; \
+	  else ln -s ../$$d proto-toplev/$$d ; fi ; \
+	done
+	cd etc && $(MAKE) MAKEINFOFLAGS="$(MAKEINFOFLAGS)" info
+	$(MAKE) distclean
+	# Kludge for pr gdb/857.  intl/Makefile.in lacks a couple
+	# of files in the distclean rule.  Zack W is planning to make
+	# the gcc version of intl/ the master version and then push
+	# that version to src soon.  See:
+	#   http://sources.redhat.com/ml/binutils/2003-07/msg00032.html
+	# After the src version of intl/ is upgraded, we can look at
+	# moving this logic into intl/Makefile.in distclean rule
+	# if it is still needed.  -- chastain 2003-09-12
+	rm -f intl/config.cache
+	rm -f intl/config.status
+	rm -f intl/config.h
+	rm -f intl/stamp-h
+	#
+	mkdir proto-toplev/etc
+	(cd proto-toplev/etc; \
+	 for i in $(ETC_SUPPORT); do \
+		ln -s ../../etc/$$i . ; \
+	 done)
+	#
+	# Take out texinfo from configurable dirs
+	rm proto-toplev/configure.ac
+	sed -e '/^host_tools=/s/texinfo //' \
+	    <configure.ac >proto-toplev/configure.ac
+	#
+	mkdir proto-toplev/texinfo
+	ln -s ../../texinfo/texinfo.tex		proto-toplev/texinfo/
+	if test -r texinfo/util/tex3patch ; then \
+	  mkdir proto-toplev/texinfo/util && \
+	  ln -s ../../../texinfo/util/tex3patch	proto-toplev/texinfo/util ; \
+	else true; fi
+	chmod -R og=u . || chmod og=u `find . -print`
+	#
+	# Create .gmo files from .po files.
+	for f in `find . -name '*.po' -type f -print`; do \
+	     msgfmt -o `echo $$f | sed -e 's/\.po$$/.gmo/'` $$f ; \
+	done
+	#
+	-rm -f $(PACKAGE)-$(VER)
+	ln -s proto-toplev $(PACKAGE)-$(VER)
+
+CVS_NAMES= \( -name CVS -o -name '.cvsignore' \)
+
+.PHONY: do-tar
+do-tar:
+	echo "==> Making $(PACKAGE)-$(VER).tar"
+	-rm -f $(PACKAGE)-$(VER).tar
+	find $(PACKAGE)-$(VER) -follow $(CVS_NAMES) -prune \
+			-o -type f -print \
+		| tar cTfh - $(PACKAGE)-$(VER).tar
+
+.PHONY: do-bz2
+do-bz2:
+	echo "==> Bzipping $(PACKAGE)-$(VER).tar.bz2"
+	-rm -f $(PACKAGE)-$(VER).tar.bz2
+	$(BZIPPROG) -v -9 $(PACKAGE)-$(VER).tar
+
+.PHONY: do-md5sum
+do-md5sum:
+	echo "==> Adding md5 checksum to top-level directory"
+	cd proto-toplev && find * -follow $(CVS_NAMES) -prune \
+			-o -type f -print \
+		| xargs $(MD5PROG) > ../md5.new
+	-rm -f proto-toplev/md5.sum
+	mv md5.new proto-toplev/md5.sum
+
+.PHONY: do-djunpack
+do-djunpack:
+	echo "==> Adding updated djunpack.bat to top-level directory"
+	echo - 's /gdb-[0-9\.]*/$(PACKAGE)-'"$(VER)"'/'
+	sed < djunpack.bat > djunpack.new \
+		-e 's/gdb-[0-9][0-9\.]*/$(PACKAGE)-'"$(VER)"'/'
+	-rm -f proto-toplev/djunpack.bat
+	mv djunpack.new proto-toplev/djunpack.bat
+
+TEXINFO_SUPPORT= texinfo/texinfo.tex
+DIST_SUPPORT= $(DEVO_SUPPORT) $(TEXINFO_SUPPORT)
+
+.PHONY: gas.tar.bz2
+GAS_SUPPORT_DIRS= bfd include libiberty opcodes intl setup.com makefile.vms mkdep
+gas.tar.bz2: $(DIST_SUPPORT) $(GAS_SUPPORT_DIRS) gas
+	$(MAKE) -f $(SELF) taz TOOL=gas \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(GAS_SUPPORT_DIRS)"
+
+# The FSF "binutils" release includes gprof and ld.
+.PHONY: binutils.tar.bz2
+BINUTILS_SUPPORT_DIRS= bfd gas include libiberty opcodes ld elfcpp gold gprof intl setup.com makefile.vms cpu
+binutils.tar.bz2: $(DIST_SUPPORT) $(BINUTILS_SUPPORT_DIRS) binutils
+	$(MAKE) -f $(SELF) taz TOOL=binutils \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(BINUTILS_SUPPORT_DIRS)"
+
+.PHONY: gas+binutils.tar.bz2
+GASB_SUPPORT_DIRS= $(GAS_SUPPORT_DIRS) binutils ld gprof
+gas+binutils.tar.bz2: $(DIST_SUPPORT) $(GASB_SUPPORT_DIRS) gas
+	$(MAKE) -f $(SELF) taz TOOL=gas \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(GASB_SUPPORT_DIRS)"
+
+GNATS_SUPPORT_DIRS=include libiberty send-pr
+gnats.tar.bz2: $(DIST_SUPPORT) $(GNATS_SUPPORT_DIRS) gnats
+	$(MAKE) -f  $(SELF) taz TOOL=gnats \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(GNATS_SUPPORT_DIRS)"
+
+.PHONY: gdb.tar.bz2
+GDB_SUPPORT_DIRS= bfd include libiberty opcodes readline sim intl libdecnumber cpu
+gdb.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
+	$(MAKE) -f $(SELF) gdb-taz TOOL=gdb \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(GDB_SUPPORT_DIRS)"
+.PHONY: gdb.tar
+gdb.tar: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
+	$(MAKE) -f $(SELF) gdb-tar TOOL=gdb \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(GDB_SUPPORT_DIRS)"
+
+.PHONY: insight.tar.bz2
+INSIGHT_SUPPORT_DIRS= $(GDB_SUPPORT_DIRS) tcl tk itcl libgui
+insight.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
+	$(MAKE) -f $(SELF) gdb-taz TOOL=gdb PACKAGE=insight \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(INSIGHT_SUPPORT_DIRS)"
+.PHONY: insight.tar
+insight.tar: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
+	$(MAKE) -f $(SELF) gdb-tar TOOL=gdb PACKAGE=insight \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(INSIGHT_SUPPORT_DIRS)"
+
+.NOEXPORT:
+MAKEOVERRIDES=
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/symlink-tree sdcc-3.2.0+dfsg/support/sdbinutils/symlink-tree
--- sdcc-3.1.0+dfsg/support/sdbinutils/symlink-tree	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/symlink-tree	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,78 @@
+#!/bin/sh
+# Create a symlink tree.
+#
+# Copyright (C) 1995, 2000, 2003  Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+#
+# Please report bugs to <gcc-bugs@gnu.org>
+# and send patches to <gcc-patches@gnu.org>.
+
+# Syntax: symlink-tree srcdir "ignore1 ignore2 ..."
+#
+# where srcdir is the directory to create a symlink tree to,
+# and "ignoreN" is a list of files/directories to ignore.
+
+prog=$0
+srcdir=$1
+ignore="$2"
+
+if test $# -lt 1; then
+  echo "symlink-tree error:  Usage: symlink-tree srcdir \"ignore1 ignore2 ...\""
+  exit 1
+fi
+
+ignore_additional=". .. CVS"
+
+# If we were invoked with a relative path name, adjust ${prog} to work
+# in subdirs.
+case ${prog} in
+/* | [A-Za-z]:[\\/]*) ;;
+*) prog=../${prog} ;;
+esac
+
+# Set newsrcdir to something subdirectories can use.
+case ${srcdir} in
+/* | [A-Za-z]:[\\/]*) newsrcdir=${srcdir} ;;
+*) newsrcdir=../${srcdir} ;;
+esac
+
+for f in `ls -a ${srcdir}`; do
+  if [ -d ${srcdir}/$f ]; then
+    found=
+    for i in ${ignore} ${ignore_additional}; do
+      if [ "$f" = "$i" ]; then
+	found=yes
+      fi
+    done
+    if [ -z "${found}" ]; then
+      echo "$f		..working in"
+      if [ -d $f ]; then true; else mkdir $f; fi
+      (cd $f; ${prog} ${newsrcdir}/$f "${ignore}")
+    fi
+  else
+    echo "$f		..linked"
+    rm -f $f
+    ln -s ${srcdir}/$f .
+  fi
+done
+
+exit 0
diff -Nru sdcc-3.1.0+dfsg/support/sdbinutils/ylwrap sdcc-3.2.0+dfsg/support/sdbinutils/ylwrap
--- sdcc-3.1.0+dfsg/support/sdbinutils/ylwrap	1970-01-01 00:00:00.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdbinutils/ylwrap	2012-02-10 10:16:50.000000000 +0000
@@ -0,0 +1,222 @@
+#! /bin/sh
+# ylwrap - wrapper for lex/yacc invocations.
+
+scriptversion=2009-04-28.21; # UTC
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
+# 2007, 2009 Free Software Foundation, Inc.
+#
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case "$1" in
+  '')
+    echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
+    exit 1
+    ;;
+  --basedir)
+    basedir=$2
+    shift 2
+    ;;
+  -h|--h*)
+    cat <<\EOF
+Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
+
+Wrapper for lex/yacc invocations, renaming files as desired.
+
+  INPUT is the input file
+  OUTPUT is one file PROG generates
+  DESIRED is the file we actually want instead of OUTPUT
+  PROGRAM is program to run
+  ARGS are passed to PROG
+
+Any number of OUTPUT,DESIRED pairs may be used.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v|--v*)
+    echo "ylwrap $scriptversion"
+    exit $?
+    ;;
+esac
+
+
+# The input.
+input="$1"
+shift
+case "$input" in
+  [\\/]* | ?:[\\/]*)
+    # Absolute path; do nothing.
+    ;;
+  *)
+    # Relative path.  Make it absolute.
+    input="`pwd`/$input"
+    ;;
+esac
+
+pairlist=
+while test "$#" -ne 0; do
+  if test "$1" = "--"; then
+    shift
+    break
+  fi
+  pairlist="$pairlist $1"
+  shift
+done
+
+# The program to run.
+prog="$1"
+shift
+# Make any relative path in $prog absolute.
+case "$prog" in
+  [\\/]* | ?:[\\/]*) ;;
+  *[\\/]*) prog="`pwd`/$prog" ;;
+esac
+
+# FIXME: add hostname here for parallel makes that run commands on
+# other machines.  But that might take us over the 14-char limit.
+dirname=ylwrap$$
+trap "cd '`pwd`'; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
+mkdir $dirname || exit 1
+
+cd $dirname
+
+case $# in
+  0) "$prog" "$input" ;;
+  *) "$prog" "$@" "$input" ;;
+esac
+ret=$?
+
+if test $ret -eq 0; then
+  set X $pairlist
+  shift
+  first=yes
+  # Since DOS filename conventions don't allow two dots,
+  # the DOS version of Bison writes out y_tab.c instead of y.tab.c
+  # and y_tab.h instead of y.tab.h. Test to see if this is the case.
+  y_tab_nodot="no"
+  if test -f y_tab.c || test -f y_tab.h; then
+    y_tab_nodot="yes"
+  fi
+
+  # The directory holding the input.
+  input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
+  # Quote $INPUT_DIR so we can use it in a regexp.
+  # FIXME: really we should care about more than `.' and `\'.
+  input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
+
+  while test "$#" -ne 0; do
+    from="$1"
+    # Handle y_tab.c and y_tab.h output by DOS
+    if test $y_tab_nodot = "yes"; then
+      if test $from = "y.tab.c"; then
+    	from="y_tab.c"
+      else
+    	if test $from = "y.tab.h"; then
+    	  from="y_tab.h"
+    	fi
+      fi
+    fi
+    if test -f "$from"; then
+      # If $2 is an absolute path name, then just use that,
+      # otherwise prepend `../'.
+      case "$2" in
+    	[\\/]* | ?:[\\/]*) target="$2";;
+    	*) target="../$2";;
+      esac
+
+      # We do not want to overwrite a header file if it hasn't
+      # changed.  This avoid useless recompilations.  However the
+      # parser itself (the first file) should always be updated,
+      # because it is the destination of the .y.c rule in the
+      # Makefile.  Divert the output of all other files to a temporary
+      # file so we can compare them to existing versions.
+      if test $first = no; then
+	realtarget="$target"
+	target="tmp-`echo $target | sed s/.*[\\/]//g`"
+      fi
+      # Edit out `#line' or `#' directives.
+      #
+      # We don't want the resulting debug information to point at
+      # an absolute srcdir; it is better for it to just mention the
+      # .y file with no path.
+      #
+      # We want to use the real output file name, not yy.lex.c for
+      # instance.
+      #
+      # We want the include guards to be adjusted too.
+      FROM=`echo "$from" | sed \
+            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
+            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
+      TARGET=`echo "$2" | sed \
+            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
+            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
+
+      sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
+          -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
+
+      # Check whether header files must be updated.
+      if test $first = no; then
+	if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
+	  echo "$2" is unchanged
+	  rm -f "$target"
+	else
+          echo updating "$2"
+          mv -f "$target" "$realtarget"
+        fi
+      fi
+    else
+      # A missing file is only an error for the first file.  This
+      # is a blatant hack to let us support using "yacc -d".  If -d
+      # is not specified, we don't want an error when the header
+      # file is "missing".
+      if test $first = yes; then
+        ret=1
+      fi
+    fi
+    shift
+    shift
+    first=no
+  done
+else
+  ret=$?
+fi
+
+# Remove the directory.
+cd ..
+rm -rf $dirname
+
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -Nru sdcc-3.1.0+dfsg/support/sdranlib/Makefile.in sdcc-3.2.0+dfsg/support/sdranlib/Makefile.in
--- sdcc-3.1.0+dfsg/support/sdranlib/Makefile.in	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdranlib/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-VPATH        = @srcdir@
-srcdir       = @srcdir@
-top_builddir = @top_builddir@
-
-include $(top_builddir)/Makefile.common
-
-CFLAGS          += -I$(srcdir)/../../sdas/linksrc
-
-OBJECTS         = sdranlib.o
-
-SOURCES         = $(patsubst %.o,%.c,$(OBJECTS))
-
-TARGET          = $(top_builddir)/bin/sdranlib$(EXEEXT)
-
-all: $(TARGET)
-
-install: all installdirs
-	$(INSTALL) $(TARGET) `echo $(DESTDIR)$(bindir)/sdranlib$(EXEEXT)|sed '$(transform)'`
-	$(STRIP) `echo $(DESTDIR)$(bindir)/sdranlib$(EXEEXT)|sed '$(transform)'`
-
-# Deleting all the installed files
-# --------------------------------
-uninstall:
-	rm -f $(DESTDIR)$(bindir)/sdranlib$(EXEEXT)
-
-# Performing self-test
-# --------------------
-check:
-
-
-# Performing installation test
-# ----------------------------
-installcheck:
-
-
-# Creating installation directories
-# ---------------------------------
-installdirs:
-	$(INSTALL) -d $(DESTDIR)$(bindir)
-
-
-# Creating dependencies
-# ---------------------
-dep:
-
-$(TARGET): $(OBJECTS) dbuf.o dbuf_string.o
-	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) dbuf.o dbuf_string.o
-
-dbuf.o: $(srcdir)/../../support/util/dbuf.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
-
-dbuf_string.o: $(srcdir)/../../support/util/dbuf_string.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
-
-.c.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
-
-
-checkconf:
-
-clean:
-	rm -f *core *[%~] *.[oa] *.output
-	rm -f .[a-z]*~ \#*
-	rm -f $(top_builddir)/bin/sdranlib$(EXEEXT)
-
-distclean realclean: clean
-	rm -f Makefile
diff -Nru sdcc-3.1.0+dfsg/support/sdranlib/sdranlib.c sdcc-3.2.0+dfsg/support/sdranlib/sdranlib.c
--- sdcc-3.1.0+dfsg/support/sdranlib/sdranlib.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdranlib/sdranlib.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,872 +0,0 @@
-/* sdranlib.c - ranlib for asxxxx arvhives
-   version 1.0.0, April 27th, 2008
-
-   Copyright (C) 2008-2010 Borut Razem, borut dot razem at siol dot net
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <time.h>
-#include <sys/stat.h>
-#include "dbuf_string.h"
-#include "lkar.h"
-
-#ifdef _WIN32
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#define NELEM(x)  (sizeof (x) / sizeof (*x))
-
-
-static int verbose = 0;
-static int list = 0;
-static int print_index = 0;
-
-int
-is_ar (FILE * libfp)
-{
-  char buf[SARMAG];
-  int ret;
-
-  if (!(ret = fread (buf, 1, sizeof (buf), libfp) == sizeof (buf) && memcmp (buf, ARMAG, SARMAG) == 0))
-    rewind (libfp);
-
-  return ret;
-}
-
-static char *sym_tab;
-static int sym_tab_size;
-
-char *
-get_member_name (char *name, size_t *p_size, int allocate, FILE * libfp)
-{
-  *p_size = 0;
-
-  if (0 == memcmp (name, "#1/", 3))
-    {
-      char *p;
-      size_t len = strtoul (&name [3], &p, 10);
-      if (p > &name [3])
-        {
-          /* BSD appends real file name to the file header */
-          if (p_size != NULL)
-            *p_size = len;
-
-          if (allocate)
-            {
-              char *n = (char *) malloc (len);
-              if (fread (n, 1, len, libfp) != len)
-                {
-                  /* not an ar archive or broken ar archive */
-                  return NULL;
-                }
-              else
-                return n;
-            }
-          else
-            {
-              /* just advance the file pointer */
-              fseek (libfp, len, SEEK_CUR);
-              return NULL;
-            }
-        }
-      else
-        {
-          /* not an ar archive or broken ar archive */
-          return NULL;
-        }
-    }
-  else if (allocate)
-    {
-      if (name[0] == '/')
-        {
-          if (NULL != sym_tab)
-            {
-              char *p;
-
-              int name_offset = strtol (++name, &p, 0);
-              if (p != name && name_offset < sym_tab_size)
-                {
-                  int len = p - name + 1;
-                  while (len < AR_NAME_LEN && name[len++] == ' ')
-                    ;
-                  if (len == AR_NAME_LEN)
-                    {
-                      char *n;
-
-                      /* long name: get it from the symbol table */
-                      name = &sym_tab[name_offset];
-                      for (p = name; *p != '/' && *p != '\n'; ++p)
-                        assert (p < &sym_tab[sym_tab_size]);
-
-                      if (p[0] != '/' || p[1] != '\n')
-                        while (*++p != '\n')
-                          assert (p < &sym_tab[sym_tab_size]);
-
-                      n = (char *) malloc (p - name + 1);
-                      memcpy (n, name, p - name);
-                      n[p - name] = '\0';
-                      return n;
-                    }
-                }
-            }
-        }
-      else
-        {
-          char *p = strrchr (name, '/');
-
-          if (NULL != p)
-            {
-              int len = p - name;
-              while (name[++len] == ' ')
-                ;
-              if (len == AR_NAME_LEN)
-                {
-                  char *n = (char *) malloc (p - name + 1);
-                  memcpy (n, name, p - name);
-                  n[p - name] = '\0';
-                  return n;
-                }
-            }
-          else
-            {
-              /* BSD formed member name:
-                 trim trailing spaces */
-              char *n;
-
-              p = name + AR_NAME_LEN;
-              while (*--p == ' ' && p >= name)
-                ;
-              ++p;
-              n = (char *) malloc (p - name + 1);
-              memcpy (n, name, p - name);
-              n[p - name] = '\0';
-              return n;
-            }
-        }
-
-      /* bad formed member name:
-       just return it */
-
-      return strdup (name);
-    }
-  else
-    return NULL;
-}
-
-size_t
-ar_get_header (struct ar_hdr *hdr, FILE * libfp, char **p_obj_name)
-{
-  char header[ARHDR_LEN];
-  char buf[AR_DATE_LEN + 1];
-  char *obj_name;
-  size_t size;
-
-  if (fread (header, 1, sizeof (header), libfp) != sizeof (header)
-      || memcmp (header + AR_FMAG_OFFSET, ARFMAG, AR_FMAG_LEN) != 0)
-    {
-      /* not an ar archive */
-      return 0;
-    }
-
-  memcpy (hdr->ar_name, &header[AR_NAME_OFFSET], AR_NAME_LEN);
-  hdr->ar_name[AR_NAME_LEN] = '\0';
-
-  memcpy (buf, &header[AR_DATE_OFFSET], AR_DATE_LEN);
-  buf[AR_DATE_LEN] = '\0';
-  hdr->ar_date = strtol (buf, NULL, 0);
-
-  memcpy (buf, &header[AR_UID_OFFSET], AR_GID_LEN);
-  buf[AR_GID_LEN] = '\0';
-  hdr->ar_uid = (uid_t) strtol (buf, NULL, 0);
-
-  memcpy (buf, &header[AR_GID_OFFSET], AR_DATE_LEN);
-  buf[AR_DATE_LEN] = '\0';
-  hdr->ar_gid = (gid_t) strtol (buf, NULL, 0);
-
-  memcpy (buf, &header[AR_MODE_OFFSET], AR_MODE_LEN);
-  buf[AR_MODE_LEN] = '\0';
-  hdr->ar_mode = (mode_t) strtoul (buf, NULL, 0);
-
-  memcpy (buf, &header[AR_SIZE_OFFSET], AR_SIZE_LEN);
-  buf[AR_SIZE_LEN] = '\0';
-  hdr->ar_size = strtol (buf, NULL, 0);
-
-  if (NULL == (obj_name = get_member_name (hdr->ar_name, &size, p_obj_name != NULL, libfp)) && p_obj_name != NULL)
-    {
-      /* Malformed archive */
-      return 0;
-    }
-
-  if (p_obj_name != NULL)
-    *p_obj_name = obj_name;
-
-  /* treat BSD appended real file name as a part of the header */
-  hdr->ar_size -= size;
-
-  return size + ARHDR_LEN;
-}
-
-static char *
-get_member_name_by_offset (FILE * fp, long offset)
-{
-  struct ar_hdr hdr;
-  char *name;
-
-  fseek (fp, offset, SEEK_SET);
-  return (ar_get_header (&hdr, fp, &name) != 0) ? name : NULL;
-}
-
-struct symbol_s
-  {
-    const char *name;
-    size_t offset;
-    struct symbol_s *next;
-  };
-
-struct symbol_s *symlist, *lastsym;
-unsigned int offset, first_member_offset;
-
-int
-add_symbol (const char *sym, void *param)
-{
-  struct symbol_s *s;
-
-  if ((s = (struct symbol_s *) malloc (sizeof (struct symbol_s))) == NULL)
-    return 0;
-
-  if (verbose)
-    printf ("%s\n", sym);
-
-  s->name = strdup (sym);
-  s->offset = offset - first_member_offset;
-  s->next = NULL;
-
-  if (NULL == symlist)
-    {
-      lastsym = symlist = s;
-    }
-  else
-    {
-      lastsym->next = s;
-      lastsym = s;
-    }
-
-  return 0;
-}
-
-int
-is_rel (FILE * libfp)
-{
-  int c;
-  long pos = ftell (libfp);
-  int ret = 0;
-
-  /* [XDQ][HL][234] */
-  if (((c = getc (libfp)) == 'X' || c == 'D' || c == 'Q') && ((c = getc (libfp)) == 'H' || c == 'L'))
-    {
-      switch (getc (libfp))
-        {
-        case '2':
-        case '3':
-        case '4':
-          switch (getc (libfp))
-            {
-            case '\r':
-              if (getc (libfp) == '\n')
-                ret = 1;
-              break;
-
-            case '\n':
-              ret = 1;
-            }
-          break;
-
-        case '\r':
-          if (getc (libfp) == '\n')
-            ret = 1;
-          break;
-
-        case '\n':
-          ret = 1;
-        }
-    }
-  else if (c == ';')
-    {
-      char buf[6];
-
-      if (fread (buf, 1, sizeof (buf), libfp) == sizeof (buf) && memcmp (buf, "!FILE ", 6) == 0)
-        ret = 1;
-    }
-  fseek (libfp, pos, SEEK_SET);
-  return ret;
-}
-
-int
-enum_symbols (FILE * fp, long size, int (*func) (const char *sym, void *param), void *param)
-{
-  long end;
-  struct dbuf_s buf;
-  struct dbuf_s symname;
-
-  assert (func != NULL);
-
-  dbuf_init (&buf, 512);
-  dbuf_init (&symname, 32);
-
-  end = (size >= 0) ? ftell (fp) + size : -1;
-
-  /*
-   * Read in the object file.  Look for lines that
-   * begin with "S" and end with "D".  These are
-   * symbol table definitions.  If we find one, see
-   * if it is our symbol.  Make sure we only read in
-   * our object file and don't go into the next one.
-   */
-
-  while (end < 0 || ftell (fp) < end)
-    {
-      const char *p;
-
-      dbuf_set_length (&buf, 0);
-      if (dbuf_getline (&buf, fp) == 0)
-        break;
-
-      p = dbuf_c_str (&buf);
-
-      if ('T' == p[0])
-        break;
-
-      /*
-       * Skip everything that's not a symbol record.
-       */
-      if ('S' == p[0] && ' ' == p[1])
-        {
-          dbuf_set_length (&symname, 0);
-
-          for (p += 2; *p && ' ' != *p; ++p)
-            dbuf_append_char (&symname, *p);
-
-          /* If it's an actual symbol, record it */
-          if (' ' == p[0] && 'D' == p[1])
-            if (func != NULL)
-              if ((*func) (dbuf_c_str (&symname), NULL))
-                return 1;
-        }
-    }
-
-  dbuf_destroy (&buf);
-  dbuf_destroy (&symname);
-
-  return 0;
-}
-
-static int
-process_symbol_table (struct ar_hdr *hdr, FILE *fp)
-{
-  long pos = ftell (fp);
-
-  if (print_index)
-    {
-      char *buf, *po, *ps;
-      int i;
-      long nsym;
-
-      printf ("Archive index:\n");
-
-      buf = (char *) malloc (hdr->ar_size);
-
-      if (fread (buf, 1, hdr->ar_size, fp) != hdr->ar_size)
-        {
-          free (buf);
-          return 0;
-        }
-
-      nsym = sgetl (buf);
-
-      po = buf + 4;
-      ps = po + nsym * 4;
-
-      for (i = 0; i < nsym; ++i)
-        {
-          char *obj;
-
-          offset = sgetl (po);
-          po += 4;
-
-          if (NULL == (obj = get_member_name_by_offset (fp, offset))) /* member name */
-            {
-              free (buf);
-              return 0;
-            }
-
-          printf ("%s in %s", ps, obj);
-          if (verbose)
-            printf (" at 0x%04x\n", offset);
-          else
-            putchar ('\n');
-          free (obj);
-
-          ps += strlen(ps) + 1;
-        }
-      free (buf);
-
-      fseek (fp, pos, SEEK_SET);
-
-      putchar ('\n');
-    }
-
-  /* skip the symbol table */
-  fseek (fp, pos + hdr->ar_size + (hdr->ar_size & 1), SEEK_SET);
-
-  return 1;
-}
-
-static int
-process_bsd_symbol_table (struct ar_hdr *hdr, FILE *fp)
-{
-  long pos = ftell (fp);
-
-  if (print_index)
-    {
-      char *buf, *po, *ps;
-      int i;
-      long tablesize;
-      long nsym;
-
-      printf ("Archive index:\n");
-
-      buf = (char *) malloc (hdr->ar_size);
-
-      if (fread (buf, 1, hdr->ar_size, fp) != hdr->ar_size)
-        {
-          free (buf);
-          return 0;
-        }
-
-      tablesize = sgetl (buf);
-      nsym = tablesize / 8;
-
-      po = buf + 4;
-
-      ps = po + tablesize + 4;
-
-      for (i = 0; i < nsym; ++i)
-        {
-          char *obj;
-          long sym;
-
-          sym = sgetl (po);
-          po += 4;
-          offset = sgetl (po);
-          po += 4;
-
-          printf ("%s in ", ps + sym);
-
-          if (NULL == (obj = get_member_name_by_offset (fp, offset))) /* member name */
-            return 0;
-
-          printf ("%s\n", obj);
-          free (obj);
-        }
-      free (buf);
-      putchar ('\n');
-    }
-
-  /* skip the symbol table */
-  fseek (fp, pos + hdr->ar_size + (hdr->ar_size & 1), SEEK_SET);
-
-  return 1;
-}
-
-int
-get_symbols (FILE * fp, const char *archive)
-{
-  struct ar_hdr hdr;
-  size_t hdr_len;
-  char *name;
-
-  if (!is_ar (fp) || !(hdr_len = ar_get_header (&hdr, fp, &name)))
-    {
-      free (name);
-
-      return 0;
-    }
-
-  if (AR_IS_SYMBOL_TABLE (name))
-    {
-      free (name);
-
-      if (!process_symbol_table (&hdr, fp))
-        return 0;
-
-      if (feof (fp))
-        return 1;
-      else if (!(hdr_len = ar_get_header (&hdr, fp, (verbose || list) ? &name : NULL)))
-        return 0;
-    }
-  else if (AR_IS_BSD_SYMBOL_TABLE (name))
-    {
-      free (name);
-
-      if (!process_bsd_symbol_table (&hdr, fp))
-        return 0;
-
-      if (feof (fp))
-        return 1;
-      else if (!(hdr_len = ar_get_header (&hdr, fp, (verbose || list) ? &name : NULL)))
-        return 0;
-    }
-  else if (!verbose && !list)
-    free (name);
-
-  first_member_offset = ftell (fp) - hdr_len;
-
-  /* walk trough all archive members */
-  do
-    {
-      if (is_rel (fp))
-        {
-          if (verbose || list)
-            {
-              printf ("%s%s\n", name, verbose ? ":" : "");
-              free (name);
-            }
-
-          if (!list)
-            {
-              long mdule_offset = ftell (fp);
-
-              offset = mdule_offset - hdr_len;
-
-              enum_symbols (fp, hdr.ar_size, add_symbol, NULL);
-
-              fseek (fp, mdule_offset + hdr.ar_size + (hdr.ar_size & 1), SEEK_SET);
-            }
-
-          if (verbose)
-            putchar ('\n');
-        }
-      else
-        {
-          if (verbose || list)
-            {
-              fprintf (stderr, "sdranlib: %s: File format not recognized\n", name);
-              free (name);
-            }
-
-          /* skip if the member is not a .REL format */
-          fseek (fp, hdr.ar_size + (hdr.ar_size & 1), SEEK_CUR);
-        }
-    }
-  while ((hdr_len = ar_get_header (&hdr, fp, (verbose || list) ? &name : NULL)));
-
-  return feof (fp) ? 1 : 0;
-}
-
-void
-do_ranlib (const char *archive)
-{
-  FILE *infp;
-
-  if (NULL == (infp = fopen (archive, "rb")))
-    {
-      fprintf (stderr, "sdranlib: %s: ", archive);
-      perror (NULL);
-      exit (1);
-    }
-
-  if (!get_symbols (infp, archive))
-    {
-      fprintf (stderr, "sdranlib: %s: Malformed archive\n", archive);
-      fclose (infp);
-      exit (1);
-    }
-  else if (!list && !print_index)
-    {
-      FILE *outfp;
-      struct symbol_s *symp;
-      char buf[4];
-      int str_length;
-      int pad;
-      int nsym;
-      int symtab_size;
-      char tmpfile[] = "arXXXXXX";
-      struct stat stat_buf;
-      int can_stat;
-
-#ifdef _WIN32
-      if (NULL == _mktemp (tmpfile) || NULL == (outfp = fopen (tmpfile, "wb")))
-        {
-          fclose (infp);
-          fprintf (stderr, "sdranlib: %s: ", tmpfile);
-          perror (NULL);
-          exit (1);
-        }
-#else
-      if ((pad = mkstemp (tmpfile)) < 0)
-        {
-          fclose (infp);
-          fprintf (stderr, "sdranlib: %s: ", tmpfile);
-          perror (NULL);
-          exit (1);
-        }
-
-      if (NULL == (outfp = fdopen (pad, "wb")))
-        {
-          close (pad);
-          fclose (infp);
-          perror ("sdranlib");
-          exit (1);
-        }
-#endif
-
-      /* calculate the size of symbol table */
-      for (str_length = 0, nsym = 0, symp = symlist; symp; ++nsym, symp = symp->next)
-        {
-          str_length += strlen (symp->name) + 1;
-        }
-
-      symtab_size = 4 + 4 * nsym + str_length;
-
-      fprintf (outfp, ARMAG AR_SYMBOL_TABLE_NAME "%-12d%-6d%-6d%-8d%-10d" ARFMAG, (int) time (NULL), 0, 0, 0, symtab_size);
-
-      if (symtab_size & 1)
-        {
-          pad = 1;
-          ++symtab_size;
-        }
-      else
-        pad = 0;
-
-      symtab_size += SARMAG + ARHDR_LEN;
-
-      sputl (nsym, buf);
-      fwrite (buf, 1, sizeof (buf), outfp);
-
-      for (symp = symlist; symp; symp = symp->next)
-        {
-          sputl (symp->offset + symtab_size, buf);
-          fwrite (buf, 1, sizeof (buf), outfp);
-        }
-
-      for (symp = symlist; symp; symp = symp->next)
-        {
-          fputs (symp->name, outfp);
-          putc ('\0', outfp);
-        }
-
-      if (pad)
-        putc ('\n', outfp);
-
-      fseek (infp, first_member_offset, SEEK_SET);
-
-      while (EOF != (pad = getc (infp)))
-        putc (pad, outfp);
-
-      fclose (outfp);
-
-      if (0 != fstat(fileno(infp), &stat_buf))
-        {
-          fprintf (stderr, "sdranlib: can't stat %s: ", archive);
-          perror (NULL);
-          can_stat = 0;
-        }
-      else
-        can_stat = 1;
-
-      fclose (infp);
-
-      if (0 != remove (archive))
-        {
-          fprintf (stderr, "sdranlib: can't remove %s: ", archive);
-          perror (NULL);
-        }
-      else if (0 != rename (tmpfile, archive))
-        {
-          fprintf (stderr, "sdranlib: can't rename %s to %s: ", tmpfile, archive);
-          perror (NULL);
-        }
-      else if (!can_stat || 0 != chmod (archive, stat_buf.st_mode))
-        {
-          fprintf (stderr, "sdranlib: can't chmod %s: ", archive);
-          perror (NULL);
-        }
-    }
-  else
-    fclose (infp);
-}
-
-void
-do_verbose (void)
-{
-  verbose = 1;
-}
-
-void
-print_version (void)
-{
-  printf ("SDCC asxxxx ranlib 1.0.0 $Revision: 6991 $\n");
-  exit (0);
-}
-
-void
-do_list (void)
-{
-  list = 1;
-}
-
-void
-print_armap (void)
-{
-  print_index = 1;
-}
-
-void usage (void);
-
-struct opt_s
-  {
-    char short_opt;
-    const char *long_opt;
-    void (*optfnc) (void);
-    const char *comment;
-  }
-opts[] =
-  {
-    { 'v', "verbose", &do_verbose, "Be more verbose about the operation" },
-    { 'V', "version", &print_version, "Print version information" },
-    { 'h', "help", &usage, "Print this help message" },
-    { 't', "list", &do_list, "List the contents of an archive" },
-    { 's', "print-armap", &print_armap, "Print the archive index" },
-  };
-
-void
-usage (void)
-{
-  int i;
-
-  printf ("Usage: sdranlib [options] archive\n"
-    " Generate an index to speed access to archives\n"
-    " The options are:\n");
-
-  for (i = 0; i < NELEM (opts); ++i)
-    {
-      int len = 5;
-      if ('\0' != opts[i].short_opt)
-        printf ("  -%c ", opts[i].short_opt);
-      else
-        printf ("     ");
-
-      if (NULL != opts[i].long_opt)
-        {
-          printf ("--%s ", opts[i].long_opt);
-          len += strlen (opts[i].long_opt);
-        }
-
-      while (len++ < 30)
-        putchar (' ');
-      printf ("%s\n", opts[i].comment);
-    }
-
-  printf ("sdranlib: supported targets: asxxxx\n");
-
-  exit (1);
-}
-
-int
-main (int argc, char *argv[])
-{
-  char **argp;
-  int noopts = 0;
-  int narch = 0;
-
-  for (argp = argv + 1; *argp; ++argp)
-    {
-      if (!noopts && (*argp)[0] == '-')
-        {
-          int i;
-
-          if ((*argp)[1] == '-')
-            {
-              if ((*argp)[2] == '\0')
-                {
-                  /* end of options */
-                  noopts = 1;
-                  continue;
-                }
-              else
-                {
-                  /* long option */
-                  for (i = 0; i < NELEM (opts); ++i)
-                    {
-                      if (0 == strcmp (&(*argp)[2], opts[i].long_opt))
-                        {
-                          if (NULL != opts[i].optfnc)
-                            {
-                              (*opts[i].optfnc) ();
-                              break;
-                            }
-                        }
-                    }
-                  if (i >= NELEM (opts))
-                    {
-                      fprintf (stderr, "sdranlib: unrecognized option `%s'\n", *argp);
-                      usage ();
-                    }
-                }
-            }
-          else
-            {
-              char *optp;
-
-              /* short option */
-              for (optp = &(*argp)[1]; *optp != '\0'; ++optp)
-                {
-                  for (i = 0; i < NELEM (opts); ++i)
-                    {
-                      if (*optp == opts[i].short_opt)
-                        {
-                          if (NULL != opts[i].optfnc)
-                            {
-                              (*opts[i].optfnc) ();
-                              break;
-                            }
-                        }
-                    }
-                  if (i >= NELEM (opts))
-                    {
-                      fprintf (stderr, "sdranlib: invalid option -- %c\n", *optp);
-                      usage ();
-                    }
-                }
-            }
-        }
-      else
-        {
-          /* not an option */
-          do_ranlib (*argp);
-          ++narch;
-        }
-    }
-
-  if (!narch)
-    usage ();
-
-  return 0;
-}
diff -Nru sdcc-3.1.0+dfsg/support/sdranlib/sdranlib.vcxproj sdcc-3.2.0+dfsg/support/sdranlib/sdranlib.vcxproj
--- sdcc-3.1.0+dfsg/support/sdranlib/sdranlib.vcxproj	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdranlib/sdranlib.vcxproj	1970-01-01 00:00:00.000000000 +0000
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{58C6355B-ED8A-4F0D-8911-D8A77E7E2096}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin_vc\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin_vc\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <TypeLibraryName>.\Release/sdranlib.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../sdas/linksrc;../../support/util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\Release/sdranlib.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
-      <ObjectFileName>.\Release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0424</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\bin_vc\$(TargetFileName)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ProgramDatabaseFile>.\Release/sdranlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release/sdranlib.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <TypeLibraryName>.\Debug/sdranlib.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../sdas/linksrc;../../support/util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\Debug/sdranlib.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
-      <ObjectFileName>.\Debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0424</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\bin_vc\$(TargetFileName)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\Debug/sdranlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug/sdranlib.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="sdranlib.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\support\util\dbuf.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\support\util\dbuf_string.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\support\util\dbuf.h" />
-    <ClInclude Include="..\..\support\util\dbuf_string.h" />
-    <ClInclude Include="..\linksrc\lkar.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\config.vcxproj">
-      <Project>{2f87ba6f-8ee1-48d0-9817-6ba30bddb3c1}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff -Nru sdcc-3.1.0+dfsg/support/sdranlib/sdranlib.vcxproj.filters sdcc-3.2.0+dfsg/support/sdranlib/sdranlib.vcxproj.filters
--- sdcc-3.1.0+dfsg/support/sdranlib/sdranlib.vcxproj.filters	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/sdranlib/sdranlib.vcxproj.filters	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{b6fb0371-5b00-4ef4-b25b-45f86e2ef628}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{3bd78a95-2026-4753-86c6-7c27ab499485}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="sdranlib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\support\util\dbuf.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\support\util\dbuf_string.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\support\util\dbuf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\support\util\dbuf_string.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\linksrc\lkar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
diff -Nru sdcc-3.1.0+dfsg/support/util/dbuf_string.c sdcc-3.2.0+dfsg/support/util/dbuf_string.c
--- sdcc-3.1.0+dfsg/support/util/dbuf_string.c	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/util/dbuf_string.c	2012-03-20 14:01:24.000000000 +0000
@@ -1,8 +1,8 @@
 /*
   dbuf_string.c - Append formatted string to the dynamic buffer
-  version 1.2.0, February 10th, 2008
+  version 1.2.2, March 20th, 2012
 
-  Copyright (c) 2002-2008 Borut Razem
+  Copyright (c) 2002-2012 Borut Razem
 
   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
@@ -249,16 +249,16 @@
  * It returns the total number of characters removed.
  */
 
-int
+size_t
 dbuf_chomp (struct dbuf_s *dbuf)
 {
   size_t i = dbuf->len;
-  int ret;
+  size_t ret;
 
-  if ('\n' == ((char *)dbuf->buf)[i - 1])
+  if (i != 0 && '\n' == ((char *)dbuf->buf)[i - 1])
     {
       --i;
-      if ('\r' == ((char *)dbuf->buf)[i - 1])
+      if (i != 0 && '\r' == ((char *)dbuf->buf)[i - 1])
         {
           --i;
         }
diff -Nru sdcc-3.1.0+dfsg/support/util/dbuf_string.h sdcc-3.2.0+dfsg/support/util/dbuf_string.h
--- sdcc-3.1.0+dfsg/support/util/dbuf_string.h	2012-04-09 07:49:31.000000000 +0000
+++ sdcc-3.2.0+dfsg/support/util/dbuf_string.h	2012-03-20 14:01:24.000000000 +0000
@@ -1,8 +1,8 @@
 /*
   dbuf_string.h - Append formatted string to the dynamic buffer
-  version 1.2.1, August 9th, 2000
+  version 1.2.2, March 20th, 2012
 
-  Copyright (c) 2002-2009 Borut Razem
+  Copyright (c) 2002-2012 Borut Razem
 
   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
@@ -56,7 +56,7 @@
 int dbuf_vprintf(struct dbuf_s *dbuf, const char *format, va_list args);
 int dbuf_printf (struct dbuf_s *dbuf, const char *format, ...) ATTRIBUTE_PRINTF(2, 3);
 size_t dbuf_getline(struct dbuf_s *dbuf, FILE *infp);
-int dbuf_chomp (struct dbuf_s *dbuf);
+size_t dbuf_chomp (struct dbuf_s *dbuf);
 void dbuf_write (struct dbuf_s *dbuf, FILE *dest);
 void dbuf_write_and_destroy (struct dbuf_s *dbuf, FILE *dest);